From b466e1564f13f9e80a3f286286adcf86ca621b75 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 28 Feb 2011 22:37:41 +0100
Subject: [PATCH 0001/6849] news.html: add 2011.02 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index f642024e17..45e28f5744 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>The stable 2011.02 release is out - Thanks to everyone
     contributing and testing the release candidates. See the
     <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.02">CHANGES</a>
-    file for more details,
+    file for more details, read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2011-February/041662.html">announcement</a>
     and go to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2011.02.tar.bz2">2011.02 release</a>.</p>
 

From 1ff216b789067d58c96775d8d1db2c11a7fda31e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 28 Feb 2011 21:54:58 +0100
Subject: [PATCH 0002/6849] pkg-stats: support CMAKETARGETS and update list of
 .mk to ignore

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 scripts/pkg-stats | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/scripts/pkg-stats b/scripts/pkg-stats
index 01af89de09..9607da2bde 100755
--- a/scripts/pkg-stats
+++ b/scripts/pkg-stats
@@ -53,6 +53,7 @@ tr.correct td {
 <td rowspan=\"2\">Package</td>
 <td colspan=\"2\" class=\"centered\">AUTOTARGETS</td>
 <td colspan=\"2\" class=\"centered\">GENTARGETS</td>
+<td colspan=\"2\" class=\"centered\">CMAKETARGETS</td>
 <td colspan=\"2\" class=\"centered\">manual</td>
 <td rowspan=\"2\" class=\"centered\">Actions</td>
 </tr>
@@ -63,6 +64,8 @@ tr.correct td {
 <td class=\"centered\">target</td>
 <td class=\"centered\">host</td>
 <td class=\"centered\">target</td>
+<td class=\"centered\">host</td>
+<td class=\"centered\">target</td>
 </tr>"
 
 convert_to_generic_target=0
@@ -71,14 +74,13 @@ convert_to_autotools=0
 cnt=1
 for i in $(find package/ -name '*.mk') ; do
 
-    if test $i = "package/mtd/mtd.mk" -o \
+    if test \
 	$i = "package/java/java.mk" -o \
-	$i = "package/database/database.mk" -o \
-	$i = "package/editors/editors.mk" -o \
 	$i = "package/games/games.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \
 	$i = "package/customize/customize.mk" -o \
 	$i = "package/gnuconfig/gnuconfig.mk" -o \
+	$i = "package/matchbox/matchbox.mk" -o \
 	$i = "package/x11r7/x11r7.mk" ; then
 	echo "skipping $i" 1>&2
 	continue
@@ -88,6 +90,8 @@ for i in $(find package/ -name '*.mk') ; do
 
     is_auto_host=0
     is_auto_target=0
+    is_cmake_host=0
+    is_cmake_target=0
     is_pkg_target=0
     is_pkg_host=0
     is_manual_target=0
@@ -109,6 +113,14 @@ for i in $(find package/ -name '*.mk') ; do
 	is_pkg_target=1
     fi
 
+    if grep -E "\(call CMAKETARGETS,[^,]*,[^,]*,host\)" $i > /dev/null ; then
+	is_cmake_host=1
+    fi
+
+    if grep -E "\(call CMAKETARGETS,[^,]*,[^,]*(,target|)\)" $i > /dev/null ; then
+	is_cmake_target=1
+    fi
+
     pkg=$(basename $i)
     pkg=${pkg%.mk}
 
@@ -116,7 +128,7 @@ for i in $(find package/ -name '*.mk') ; do
 	is_manual_host=1
     fi
 
-    if test $is_pkg_target -eq 0 -a $is_auto_target -eq 0 ; then
+    if test $is_pkg_target -eq 0 -a $is_auto_target -eq 0 -a $is_cmake_target -eq 0; then
 	is_manual_target=1
     fi
 
@@ -183,6 +195,22 @@ for i in $(find package/ -name '*.mk') ; do
     fi
     echo "</td>"
 
+    echo "<td class=\"centered\">"
+    if [ $is_cmake_host -eq 1 ] ; then
+	echo "<b>YES</b>"
+    else
+	echo "NO"
+    fi
+    echo "</td>"
+
+    echo "<td class=\"centered\">"
+    if [ $is_cmake_target -eq 1 ] ; then
+	echo "<b>YES</b>"
+    else
+	echo "NO"
+    fi
+    echo "</td>"
+
     echo "<td class=\"centered\">"
     if [ $is_manual_host -eq 1 ] ; then
 	echo "<b>YES</b>"

From b927b5f3020918b574474b5fd80969fad023a837 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 28 Feb 2011 22:09:20 +0100
Subject: [PATCH 0003/6849] pkg-stats: add statistics about number of patches
 per package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 scripts/pkg-stats | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/scripts/pkg-stats b/scripts/pkg-stats
index 9607da2bde..7bb292830b 100755
--- a/scripts/pkg-stats
+++ b/scripts/pkg-stats
@@ -51,6 +51,7 @@ tr.correct td {
 <tr>
 <td rowspan=\"2\">Id</td>
 <td rowspan=\"2\">Package</td>
+<td>Patch count</td>
 <td colspan=\"2\" class=\"centered\">AUTOTARGETS</td>
 <td colspan=\"2\" class=\"centered\">GENTARGETS</td>
 <td colspan=\"2\" class=\"centered\">CMAKETARGETS</td>
@@ -71,6 +72,7 @@ tr.correct td {
 convert_to_generic_target=0
 convert_to_generic_host=0
 convert_to_autotools=0
+total_patch_count=0
 cnt=1
 for i in $(find package/ -name '*.mk') ; do
 
@@ -163,6 +165,22 @@ for i in $(find package/ -name '*.mk') ; do
     echo "<td>$cnt</td>"
     echo "<td>$i</td>"
 
+    package_dir=$(dirname $i)
+    patch_count=$(find ${package_dir} -name '*.patch' | wc -l)
+    total_patch_count=$(($total_patch_count+$patch_count))
+
+    if test $patch_count -lt 1 ; then
+	patch_count_color="#00ff00"
+    elif test $patch_count -lt 5 ; then
+	patch_count_color="#ffc600"
+    else
+	patch_count_color="#ff0000"
+    fi
+
+    echo "<td class=\"centered\" style=\"color: $patch_count_color; font-weight: bold;\">"
+    echo $patch_count
+    echo "</td>"
+
     echo "<td class=\"centered\">"
     if [ $is_auto_host -eq 1 ] ; then
 	echo "<b>YES</b>"
@@ -256,6 +274,10 @@ echo "<td>Packages to convert to host autotools</td>"
 echo "<td>$convert_to_host_autotools</td>"
 echo "</tr>"
 echo "<tr>"
+echo "<td>Number of patches in all packages</td>"
+echo "<td>$total_patch_count</td>"
+echo "</tr>"
+echo "<tr>"
 echo "<td>TOTAL</td>"
 echo "<td>$cnt</td>"
 echo "</tr>"

From da5e5a5aa23a727ffc7cd3a2eb8cd268ef2f8d06 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Mar 2011 14:13:06 +0100
Subject: [PATCH 0004/6849] kickoff 2011.05 development cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 9ee4cd6e7b..e9d9a2eb95 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2011.05, Not released yet:
+
 2011.02, Released February 28th, 2011:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 8046763216..7ae3787bd7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.02
+export BR2_VERSION:=2011.05-git
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:

From 75adc4ab5c5833c9afda04d9a0eaf947130c539f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Mar 2011 14:13:56 +0100
Subject: [PATCH 0005/6849] avahi: bump version, remove dbus workaround

This is now fixed upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 63215572cb..13ae85fc07 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
 # either version 2.1 of the License, or (at your option) any
 # later version.
 
-AVAHI_VERSION = 0.6.27
+AVAHI_VERSION = 0.6.28
 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
 AVAHI_INSTALL_STAGING = YES
@@ -160,19 +160,8 @@ define AVAHI_INSTALL_DAEMON_INITSCRIPT
 	$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
 endef
 
-# avahi build sys erroneously only installs dbus service if systemd is enabled
-define AVAHI_INSTALL_DAEMON_DBUS_SERVICE
-	$(INSTALL) -m 0644 -D $(@D)/avahi-daemon/org.freedesktop.Avahi.service \
-		$(TARGET_DIR)/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
-endef
-
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT
-
-ifeq ($(BR2_PACKAGE_DBUS),y)
-AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_DBUS_SERVICE
-endif
-
 endif
 
 $(eval $(call AUTOTARGETS,package,avahi))

From 6b46297675cd01cb18b499880f1bb5423278733c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Mar 2011 17:08:42 +0100
Subject: [PATCH 0006/6849] qt: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...hread_getattr_np.patch => qt-4.7.2-pthread_getattr_np.patch} | 0
 ...np_webkit.patch => qt-4.7.2-pthread_getattr_np_webkit.patch} | 0
 package/qt/qt.mk                                                | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename package/qt/{qt-4.7.1-pthread_getattr_np.patch => qt-4.7.2-pthread_getattr_np.patch} (100%)
 rename package/qt/{qt-4.7.1-pthread_getattr_np_webkit.patch => qt-4.7.2-pthread_getattr_np_webkit.patch} (100%)

diff --git a/package/qt/qt-4.7.1-pthread_getattr_np.patch b/package/qt/qt-4.7.2-pthread_getattr_np.patch
similarity index 100%
rename from package/qt/qt-4.7.1-pthread_getattr_np.patch
rename to package/qt/qt-4.7.2-pthread_getattr_np.patch
diff --git a/package/qt/qt-4.7.1-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch
similarity index 100%
rename from package/qt/qt-4.7.1-pthread_getattr_np_webkit.patch
rename to package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index cc90190df7..e8fff73c4b 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION:=4.7.1
+QT_VERSION:=4.7.2
 QT_SOURCE:=qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE:=http://get.qt.nokia.com/qt/source
 QT_CAT:=$(ZCAT)

From 26ca282bc94d84fe705f48f3231035484ac9c6f1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Mar 2011 23:20:16 +0100
Subject: [PATCH 0007/6849] website: add google analytics for statistics

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/header.html b/docs/header.html
index beb85e98a7..c8cb135f55 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -15,6 +15,21 @@
      td.c2 {font-family: arial, helvetica, sans-serif; font-size: 80%}
      td.c1 {font-family: lucida, helvetica; font-size: 248%}
     </style>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-21761074-1']);
+  _gaq.push(['_setDomainName', 'none']);
+  _gaq.push(['_setAllowLinker', true]);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
   </head>
 
   <body>

From 0eafc69b0aadba53a3784365532be530e28d2757 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 2 Mar 2011 08:50:58 +0100
Subject: [PATCH 0008/6849] xerces: bump version, convert to autotargets

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xerces/Config.in |   1 -
 package/xerces/xerces.mk | 125 +++++----------------------------------
 2 files changed, 14 insertions(+), 112 deletions(-)

diff --git a/package/xerces/Config.in b/package/xerces/Config.in
index b77794d772..374729a466 100644
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XERCES
 	bool "xerces-c++"
 	depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Xerces-C++ is a validating XML parser written in portable C++.
 
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 6e84e64a84..9a22499437 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -3,116 +3,19 @@
 # xerces
 #
 #############################################################
-XERCES_VERSION:=3.0.1
-XERCES_SOURCE:=xerces-c-$(XERCES_VERSION).tar.gz
-XERCES_SITE:=http://archive.apache.org/dist/xerces/c/3/sources/
-XERCES_CAT:=$(ZCAT)
-XERCES_DIR:=$(BUILD_DIR)/xerces-c-$(XERCES_VERSION)
-LIBXERCES_BINARY:=libxerces-c-3.0.so
-
-# XERCES-C will install a number of applications
-# in $(STAGING_DIR)/usr/bin
-# We may want to copy these to the target
-
-XERCES_APPS:= \
-	CreateDOMDocument	\
-	DOMCount		\
-	DOMPrint		\
-	EnumVal			\
-	MemParse		\
-	PParse			\
-	PSVIWriter		\
-	Redirect		\
-	SAX2Count		\
-	SAX2Print		\
-	SAXCount		\
-	SAXPrint		\
-	SCMPrint		\
-	SEnumVal		\
-	StdInParse
-
-# XERCES-C installs a 4.2MB worth of "*.hpp" files
-# in the
-#	"dom", "framework", "internal", "parsers",
-#	"sax", "sax2", "util", "validators", "xinclude"
-# directories
-
-XERCES_INCLUDES:=/usr/include/xercesc
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
-XERCES_MAKE_OPT=LIBS="-liconv"
+XERCES_VERSION = 3.1.1
+XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.gz
+XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources/
+XERCES_MAKE = $(MAKE1)
+XERCES_INSTALL_STAGING = YES
+XERCES_CONF_OPT = --enable-shared \
+		  --disable-threads \
+		  --disable-network \
+		  --with-gnu-ld
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+XERCES_CONF_ENV += LIBS=-liconv
+XERCES_DEPENDENCIES += libiconv
 endif
 
-$(DL_DIR)/$(XERCES_SOURCE):
-	 $(call DOWNLOAD,$(XERCES_SITE),$(XERCES_SOURCE))
-
-xerces-source: $(DL_DIR)/$(XERCES_SOURCE)
-
-$(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE)
-	$(XERCES_CAT) $(DL_DIR)/$(XERCES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-# toolchain/patch-kernel.sh $(XERCES_DIR) package/xerces/ \*.patch*
-	touch $(XERCES_DIR)/.unpacked
-
-#	Support for the following should be added later
-#		--with-curl=
-#		--with-icu=
-#		--with-pkgconfigdir=
-
-$(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
-	(cd $(XERCES_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		./configure		\
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr		\
-		--libdir=/usr/lib	\
-		--libexecdir=/usr/lib	\
-		--sysconfdir=/etc	\
-		--localstatedir=/var	\
-		--enable-shared		\
-		--disable-threads	\
-		--disable-network	\
-		--with-gnu-ld		\
-	)
-	touch $@
-
-$(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY): $(XERCES_DIR)/.configured
-	$(MAKE1) $(TARGET_CONFIGURE_OPTS) $(XERCES_MAKE_OPT) -C $(XERCES_DIR)
-
-$(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY): $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \
-		-C $(XERCES_DIR) install
-	$(INSTALL) -c $(XERCES_DIR)/src/.libs/libxerces-c.lai	\
-		$(STAGING_DIR)/usr/lib/libxerces-c.la
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libxerces-c.la
-
-$(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY): $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
-	cp -a $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)* $(TARGET_DIR)/usr/lib
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces: $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-bin: $(XERCES_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-tbin: $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-unpacked: $(XERCES_DIR)/.unpacked
-
-xerces-clean:
-	rm -rf $(STAGING_DIR)/usr/include/xercesc
-	rm -f $(STAGING_DIR)/lib/libxerces*
-	rm -f $(TARGET_DIR)/usr/lib/libxerces*
-	-$(MAKE) -C $(XERCES_DIR) clean
-
-xerces-dirclean:
-	rm -rf $(XERCES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XERCES),y)
-TARGETS+=xerces
-endif
+$(eval $(call AUTOTARGETS,package,xerces))

From 764d844fbc20721b7be0c3b9328cbe130079a0ef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 2 Mar 2011 11:56:03 +0100
Subject: [PATCH 0009/6849] xerces: add optional libcurl support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xerces/xerces.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 9a22499437..ffd874bf0b 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -10,7 +10,6 @@ XERCES_MAKE = $(MAKE1)
 XERCES_INSTALL_STAGING = YES
 XERCES_CONF_OPT = --enable-shared \
 		  --disable-threads \
-		  --disable-network \
 		  --with-gnu-ld
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
@@ -18,4 +17,11 @@ XERCES_CONF_ENV += LIBS=-liconv
 XERCES_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+XERCES_CONF_OPT += --enable-netaccessor-curl
+XERCES_DEPENDENCIES += libcurl
+else
+XERCES_CONF_OPT += --disable-network
+endif
+
 $(eval $(call AUTOTARGETS,package,xerces))

From 313c3d0f39e19e08499a529c73875841d7ddff98 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 3 Mar 2011 11:49:57 +0100
Subject: [PATCH 0010/6849] squashfs: bump version

The EXTRA_CFLAGS patch is now upstream, but we need a fix for !gzip builds
instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/squashfs/squashfs.mk                       |   2 +-
 .../squashfs-4.1-build-system-fix.patch       | 102 ------------------
 .../squashfs/squashfs-4.2-no-gzip-fix.patch   |  26 +++++
 package/squashfs/squashfs.mk                  |   4 +-
 4 files changed, 29 insertions(+), 105 deletions(-)
 delete mode 100644 package/squashfs/squashfs-4.1-build-system-fix.patch
 create mode 100644 package/squashfs/squashfs-4.2-no-gzip-fix.patch

diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index 7efe979e85..91a7534de3 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -11,7 +11,7 @@ ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
 ROOTFS_SQUASHFS_ARGS += -comp lzo
 else
 ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y)
-ROOTFS_SQUASHFS_ARGS += -comp lzma
+ROOTFS_SQUASHFS_ARGS += -comp xz
 else
 ROOTFS_SQUASHFS_ARGS += -comp gzip
 endif
diff --git a/package/squashfs/squashfs-4.1-build-system-fix.patch b/package/squashfs/squashfs-4.1-build-system-fix.patch
deleted file mode 100644
index 709f1de1e7..0000000000
--- a/package/squashfs/squashfs-4.1-build-system-fix.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-[PATCH]: allow custom EXTRA_CFLAGS/LDFLAGS/*_SUPPORT on the make cmd line
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- squashfs-tools/Makefile |   26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-Index: squashfs4.1/squashfs-tools/Makefile
-===================================================================
---- squashfs4.1.orig/squashfs-tools/Makefile
-+++ squashfs4.1/squashfs-tools/Makefile
-@@ -87,11 +87,11 @@ MKSQUASHFS_OBJS = mksquashfs.o read_fs.o
- UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
- 	unsquash-4.o swap.o compressor.o
- 
--CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
--	-D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\"  -O2 -Wall
-+CFLAGS = $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-+	-D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -Wall
- 
- LIBS =
--ifdef GZIP_SUPPORT
-+ifeq ($(GZIP_SUPPORT),1)
- CFLAGS += -DGZIP_SUPPORT
- MKSQUASHFS_OBJS += gzip_wrapper.o
- UNSQUASHFS_OBJS += gzip_wrapper.o
-@@ -99,7 +99,7 @@ LIBS += -lz
- COMPRESSORS += gzip
- endif
- 
--ifdef LZMA_SUPPORT
-+ifeq ($(LZMA_SUPPORT),1)
- LZMA_OBJS = $(LZMA_DIR)/C/Alloc.o $(LZMA_DIR)/C/LzFind.o \
- 	$(LZMA_DIR)/C/LzmaDec.o $(LZMA_DIR)/C/LzmaEnc.o $(LZMA_DIR)/C/LzmaLib.o
- INCLUDEDIR += -I$(LZMA_DIR)/C
-@@ -109,7 +109,7 @@ UNSQUASHFS_OBJS += lzma_wrapper.o $(LZMA
- COMPRESSORS += lzma
- endif
- 
--ifdef XZ_SUPPORT
-+ifeq ($(XZ_SUPPORT),1)
- CFLAGS += -DLZMA_SUPPORT
- MKSQUASHFS_OBJS += xz_wrapper.o
- UNSQUASHFS_OBJS += xz_wrapper.o
-@@ -117,7 +117,7 @@ LIBS += -llzma
- COMPRESSORS += lzma
- endif
- 
--ifdef LZO_SUPPORT
-+ifeq ($(LZO_SUPPORT),1)
- CFLAGS += -DLZO_SUPPORT
- ifdef LZO_DIR
- INCLUDEDIR += -I$(LZO_DIR)/include
-@@ -129,8 +129,8 @@ LIBS += $(LZO_LIBDIR) -llzo2
- COMPRESSORS += lzo
- endif
- 
--ifdef XATTR_SUPPORT
--ifdef XATTR_DEFAULT
-+ifeq ($(XATTR_SUPPORT),1)
-+ifeq ($(XATTR_DEFAULT),1)
- CFLAGS += -DXATTR_SUPPORT -DXATTR_DEFAULT
- else
- CFLAGS += -DXATTR_SUPPORT
-@@ -142,7 +142,7 @@ endif
- #
- # If LZMA_SUPPORT is specified then LZO_DIR must be specified too
- #
--ifdef LZMA_SUPPORT
-+ifeq ($(LZMA_SUPPORT),1)
- ifndef LZMA_DIR
- $(error "LZMA_SUPPORT requires LZMA_DIR to be also defined")
- endif
-@@ -151,8 +151,8 @@ endif
- #
- # Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified
- #
--ifdef XZ_SUPPORT
--ifdef LZMA_SUPPORT
-+ifeq ($(XZ_SUPPORT),1)
-+ifeq ($(LZMA_SUPPORT),1)
- $(error "Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified")
- endif
- endif
-@@ -175,7 +175,7 @@ endif
- all: mksquashfs unsquashfs
- 
- mksquashfs: $(MKSQUASHFS_OBJS)
--	$(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
-+	$(CC) $(EXTRA_LDFLAGS) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
- 
- mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
- 	squashfs_swap.h xattr.h
-@@ -195,7 +195,7 @@ xattr.o: xattr.h
- read_xattrs.o: xattr.h
- 
- unsquashfs: $(UNSQUASHFS_OBJS)
--	$(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
-+	$(CC) $(EXTRA_LDFLAGS) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
- 
- unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \
- 	squashfs_compat.h global.h xattr.h
diff --git a/package/squashfs/squashfs-4.2-no-gzip-fix.patch b/package/squashfs/squashfs-4.2-no-gzip-fix.patch
new file mode 100644
index 0000000000..4cb5f50cb5
--- /dev/null
+++ b/package/squashfs/squashfs-4.2-no-gzip-fix.patch
@@ -0,0 +1,26 @@
+[PATCH] squashfs-tools: unbreak builds without gzip support
+
+The initialization of gzip_comp_ops if gzip support is disabled is
+missing 2 null pointers, causing the id element to be initialized to 0
+rather than ZLIB_COMPRESSION, which breaks all the compressor functions
+as they loop until finding the correct element or id = 0.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ squashfs-tools/compressor.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: squashfs4.2/squashfs-tools/compressor.c
+===================================================================
+--- squashfs4.2.orig/squashfs-tools/compressor.c
++++ squashfs4.2/squashfs-tools/compressor.c
+@@ -27,7 +27,8 @@
+ 
+ #ifndef GZIP_SUPPORT
+ static struct compressor gzip_comp_ops =  {
+-	NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
++	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION,
++	"gzip", 0
+ };
+ #else
+ extern struct compressor gzip_comp_ops;
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 50e8964ca9..5000a8cb40 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -1,4 +1,4 @@
-SQUASHFS_VERSION=4.1
+SQUASHFS_VERSION=4.2
 SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
 SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
 
@@ -7,7 +7,7 @@ SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
 SQUASHFS_DEPENDENCIES += xz
-SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=lzma
+SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
 else
 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
 endif

From 194ac2d5496d7895980252059d9e133b218cf170 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Mar 2011 11:10:14 -0300
Subject: [PATCH 0011/6849] squashfs: re-add legacy lzma support

Readd legacy LZMA support since older patched kernels might be using it.
Introduce an XZ target filesystem option for the new format.

[Peter: add a seperate xz target for squashfs-target as well]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/squashfs/Config.in        |  3 +++
 fs/squashfs/squashfs.mk      |  4 ++++
 package/squashfs/Config.in   |  6 ++++++
 package/squashfs/squashfs.mk | 12 ++++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index 85416becbb..f13410a1ce 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -37,5 +37,8 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA
 config BR2_TARGET_ROOTFS_SQUASHFS4_LZO
        bool "lzo"
 
+config BR2_TARGET_ROOTFS_SQUASHFS4_XZ
+       bool "xz"
+
 endchoice
 endif
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index 91a7534de3..a680dae0f0 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -11,11 +11,15 @@ ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
 ROOTFS_SQUASHFS_ARGS += -comp lzo
 else
 ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y)
+ROOTFS_SQUASHFS_ARGS += -comp lzma
+else
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y)
 ROOTFS_SQUASHFS_ARGS += -comp xz
 else
 ROOTFS_SQUASHFS_ARGS += -comp gzip
 endif
 endif
+endif
 
 else
 ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 6730708620..7d0fc71c02 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -28,6 +28,12 @@ config BR2_PACKAGE_SQUASHFS_LZO
        help
          Support LZO compression algorithm
 
+config BR2_PACKAGE_SQUASHFS_XZ
+       bool "xz support"
+       select BR2_PACKAGE_XZ
+       help
+         Support XZ compression algorithm
+
 endif
 
 comment "squashfs requires a toolchain with LARGEFILE support"
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 5000a8cb40..7aa8ca9080 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -2,11 +2,18 @@ SQUASHFS_VERSION=4.2
 SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
 SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
 
-# no libattr/xz in BR
+# no libattr in BR
 SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
 SQUASHFS_DEPENDENCIES += xz
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 COMP_DEFAULT=lzma
+else
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=0
+endif
+
+ifeq ($(BR2_PACKAGE_SQUASHFS_XZ),y)
+SQUASHFS_DEPENDENCIES += xz
 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
 else
 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
@@ -34,7 +41,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
 	XATTR_SUPPORT=0 \
 	XZ_SUPPORT=1    \
 	GZIP_SUPPORT=1  \
-	LZO_SUPPORT=1
+	LZO_SUPPORT=1	\
+	LZMA_XZ_SUPPORT=1
 
 define SQUASHFS_BUILD_CMDS
  $(TARGET_MAKE_ENV) $(MAKE)    \

From 8296cf6c7ffa920ee9d37ac4695d52966fd1ecff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 5 Mar 2011 15:04:44 +0100
Subject: [PATCH 0012/6849] xz: fix build without wchar support

xz itself works without wchar support, but the C99 test in configure
fails when it isn't available. Fix it by providing a cached value for
the test.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xz/xz.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 2da8fcb949..dfc0638ccc 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -7,6 +7,7 @@ XZ_VERSION = 5.0.0
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES
+XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
 $(eval $(call AUTOTARGETS,package,xz))
 $(eval $(call AUTOTARGETS,package,xz,host))

From 7bdbdd3c38a4ad2c8273039bb17d0cd2ec664f82 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 11:34:00 -0300
Subject: [PATCH 0013/6849] qt: add option for system sqlite

Add an option to use the system sqlite library.
Also drop sqlite2 stub since it's pointless.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.sql.in | 30 +++++++++++++++++++++---------
 package/qt/qt.mk         |  7 ++++++-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in
index b982fdb4da..eceb15d643 100644
--- a/package/qt/Config.sql.in
+++ b/package/qt/Config.sql.in
@@ -34,16 +34,28 @@ config BR2_PACKAGE_QT_PSQL
 	  Build PostgreSQL driver
 	  If unsure, say n.
 
-config BR2_PACKAGE_QT_SQLITE
-	bool "SQLite 3 Driver"
+choice
+	prompt "SQLite 3 support"
+	default BR2_PACKAGE_QT_SQLITE_NONE
 	help
-	  Build SQLite driver
-	  If unsure, say n.
+	  Select SQLite support.
 
-config BR2_PACKAGE_QT_SQLITE2
-	bool "SQLite 2 Driver"
-	depends on BROKEN # sqlite2 not in BR
+config BR2_PACKAGE_QT_SQLITE_NONE
+	bool "No sqlite support"
 	help
-	  Build SQLite 2 driver
-	  If unsure, say n.
+	  Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT_SQLITE_QT
+	bool "Qt SQLite"
+	help
+	  Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT_SQLITE_SYSTEM
+	bool "System SQLite"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Use system SQLite.
+
+endchoice
+
 endif
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e8fff73c4b..6974b2f1f9 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -295,11 +295,16 @@ endif
 ifeq ($(BR2_PACKAGE_QT_PSQL),y)
 QT_CONFIGURE+= -qt-sql-psql
 endif
-ifeq ($(BR2_PACKAGE_QT_SQLITE),y)
+ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
 QT_CONFIGURE+= -qt-sql-sqlite
 else
+ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
+QT_CONFIGURE+= -system-sqlite
+QT_DEP_LIBS+= sqlite
+else
 QT_CONFIGURE+= -no-sql-sqlite
 endif
+endif
 ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
 QT_CONFIGURE+= -qt-sql-sqlite2
 endif

From a3cd2e7671521d60f1a281400d8eca7188bff225 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Mar 2011 11:22:25 -0300
Subject: [PATCH 0014/6849] samba: add security fix for CVE-2011-0719

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../samba/samba-3.3.14-CVE-2011-0719.patch    | 613 ++++++++++++++++++
 1 file changed, 613 insertions(+)
 create mode 100644 package/samba/samba-3.3.14-CVE-2011-0719.patch

diff --git a/package/samba/samba-3.3.14-CVE-2011-0719.patch b/package/samba/samba-3.3.14-CVE-2011-0719.patch
new file mode 100644
index 0000000000..1cb8580aab
--- /dev/null
+++ b/package/samba/samba-3.3.14-CVE-2011-0719.patch
@@ -0,0 +1,613 @@
+From 724e44eed299c618066dec411530aa9f156119ec Mon Sep 17 00:00:00 2001
+From: Karolin Seeger <kseeger@samba.org>
+Date: Sun, 27 Feb 2011 18:28:29 +0100
+Subject: [PATCH] Fix denial of service - memory corruption.
+
+CVE-2011-0719
+
+Fix bug #7949 (DoS in Winbind and smbd with many file descriptors open).
+
+All current released versions of Samba are vulnerable to
+a denial of service caused by memory corruption. Range
+checks on file descriptors being used in the FD_SET macro
+were not present allowing stack corruption. This can cause
+the Samba code to crash or to loop attempting to select
+on a bad file descriptor set.
+
+A connection to a file share, or a local account is needed
+to exploit this problem, either authenticated or unauthenticated
+(guest connection).
+
+Currently we do not believe this flaw is exploitable
+beyond a crash or causing the code to loop, but on the
+advice of our security reviewers we are releasing fixes
+in case an exploit is discovered at a later date.
+---
+ source/client/client.c          |    4 +++-
+ source/client/dnsbrowse.c       |   12 ++++++++++++
+ source/lib/events.c             |   13 +++++++++++++
+ source/lib/packet.c             |    5 +++++
+ source/lib/readline.c           |    5 +++++
+ source/lib/select.c             |    6 ++++++
+ source/lib/util_sock.c          |   11 +++++++++--
+ source/libaddns/dnssock.c       |    6 +++++-
+ source/libsmb/nmblib.c          |    5 +++++
+ source/nmbd/nmbd_packets.c      |   24 ++++++++++++++++++++++--
+ source/nsswitch/wb_common.c     |   22 ++++++++++++++++++++--
+ source/printing/printing.c      |    5 +++++
+ source/smbd/dnsregister.c       |    6 ++++++
+ source/smbd/oplock.c            |    5 ++++-
+ source/smbd/oplock_irix.c       |    5 +++++
+ source/smbd/process.c           |    2 +-
+ source/smbd/server.c            |   29 +++++++++++++++++++++--------
+ source/utils/smbfilter.c        |    8 ++++++--
+ source/winbindd/winbindd.c      |   12 +++++++++++-
+ source/winbindd/winbindd_dual.c |    7 +++++++
+ 20 files changed, 171 insertions(+), 21 deletions(-)
+
+diff --git a/source/client/client.c b/source/client/client.c
+index 53bd9e6..a989441 100644
+--- a/source/client/client.c
++++ b/source/client/client.c
+@@ -4379,8 +4379,10 @@ static void readline_callback(void)
+ 
+  again:
+ 
+-	if (cli->fd == -1)
++	if (cli->fd < 0 || cli->fd >= FD_SETSIZE) {
++		errno = EBADF;
+ 		return;
++	}
+ 
+ 	FD_ZERO(&fds);
+ 	FD_SET(cli->fd,&fds);
+diff --git a/source/client/dnsbrowse.c b/source/client/dnsbrowse.c
+index 5e3a4de..aa2fb22 100644
+--- a/source/client/dnsbrowse.c
++++ b/source/client/dnsbrowse.c
+@@ -81,6 +81,11 @@ static void do_smb_resolve(struct mdns_smbsrv_result *browsesrv)
+ 			TALLOC_FREE(fdset);
+ 		}
+ 
++		if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
++			errno = EBADF;
++			break;
++		}
++
+ 		fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
+ 		fdset = TALLOC_ZERO(ctx, fdsetsz);
+ 		FD_SET(mdnsfd, fdset);
+@@ -183,6 +188,13 @@ int do_smb_browse(void)
+ 
+ 		fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
+ 		fdset = TALLOC_ZERO(ctx, fdsetsz);
++
++		if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
++			errno = EBADF;
++			TALLOC_FREE(ctx);
++			return 1;
++		}
++
+ 		FD_SET(mdnsfd, fdset);
+ 
+ 		tv.tv_sec = 1;
+diff --git a/source/lib/events.c b/source/lib/events.c
+index cd20ceb..2ddbab7 100644
+--- a/source/lib/events.c
++++ b/source/lib/events.c
+@@ -140,6 +140,11 @@ struct fd_event *event_add_fd(struct event_context *event_ctx,
+ {
+ 	struct fd_event *fde;
+ 
++	if (fd < 0 || fd >= FD_SETSIZE) {
++		errno = EBADF;
++		return NULL;
++	}
++
+ 	if (!(fde = TALLOC_P(mem_ctx, struct fd_event))) {
+ 		return NULL;
+ 	}
+@@ -190,6 +195,14 @@ bool event_add_to_select_args(struct event_context *event_ctx,
+ 	bool ret = False;
+ 
+ 	for (fde = event_ctx->fd_events; fde; fde = fde->next) {
++		if (fde->fd < 0 || fde->fd >= FD_SETSIZE) {
++			/* We ignore here, as it shouldn't be
++			   possible to add an invalid fde->fd
++			   but we don't want FD_SET to see an
++			   invalid fd. */
++			continue;
++		}
++
+ 		if (fde->flags & EVENT_FD_READ) {
+ 			FD_SET(fde->fd, read_fds);
+ 			ret = True;
+diff --git a/source/lib/packet.c b/source/lib/packet.c
+index e048616..512c7f2 100644
+--- a/source/lib/packet.c
++++ b/source/lib/packet.c
+@@ -106,6 +106,11 @@ NTSTATUS packet_fd_read_sync(struct packet_context *ctx)
+ 	int res;
+ 	fd_set r_fds;
+ 
++	if (ctx->fd < 0 || ctx->fd >= FD_SETSIZE) {
++		errno = EBADF;
++		return map_nt_error_from_unix(errno);
++	}
++
+ 	FD_ZERO(&r_fds);
+ 	FD_SET(ctx->fd, &r_fds);
+ 
+diff --git a/source/lib/readline.c b/source/lib/readline.c
+index 34867aa..70a82f2 100644
+--- a/source/lib/readline.c
++++ b/source/lib/readline.c
+@@ -91,6 +91,11 @@ static char *smb_readline_replacement(const char *prompt, void (*callback)(void)
+ 		timeout.tv_sec = 5;
+ 		timeout.tv_usec = 0;
+ 
++		if (fd < 0 || fd >= FD_SETSIZE) {
++			errno = EBADF;
++			break;
++		}
++
+ 		FD_ZERO(&fds);
+ 		FD_SET(fd,&fds);
+ 
+diff --git a/source/lib/select.c b/source/lib/select.c
+index c3da6a9..2d5f02c 100644
+--- a/source/lib/select.c
++++ b/source/lib/select.c
+@@ -61,6 +61,11 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
+ 		if (pipe(select_pipe) == -1)
+ 			smb_panic("Could not create select pipe");
+ 
++		if (select_pipe[0] < 0 || select_pipe[0] >= FD_SETSIZE) {
++			errno = EBADF;
++			return -1;
++		}
++
+ 		/*
+ 		 * These next two lines seem to fix a bug with the Linux
+ 		 * 2.0.x kernel (and probably other UNIXes as well) where
+@@ -87,6 +92,7 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
+ 		readfds2 = &readfds_buf;
+ 		FD_ZERO(readfds2);
+ 	}
++
+ 	FD_SET(select_pipe[0], readfds2);
+ 
+ 	errno = 0;
+diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
+index 650bd13..8aa2c97 100644
+--- a/source/lib/util_sock.c
++++ b/source/lib/util_sock.c
+@@ -960,6 +960,11 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
+ 	timeout.tv_usec = (long)(1000 * (time_out % 1000));
+ 
+ 	for (nread=0; nread < mincnt; ) {
++		if (fd < 0 || fd >= FD_SETSIZE) {
++			errno = EBADF;
++			return map_nt_error_from_unix(EBADF);
++		}
++
+ 		FD_ZERO(&fds);
+ 		FD_SET(fd,&fds);
+ 
+@@ -1492,7 +1497,7 @@ bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
+ 
+ 	for (i=0; i<num_addrs; i++) {
+ 		sockets[i] = socket(addrs[i].ss_family, SOCK_STREAM, 0);
+-		if (sockets[i] < 0)
++		if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE)
+ 			goto done;
+ 		set_blocking(sockets[i], false);
+ 	}
+@@ -1541,8 +1546,10 @@ bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
+ 	FD_ZERO(&r_fds);
+ 
+ 	for (i=0; i<num_addrs; i++) {
+-		if (sockets[i] == -1)
++		if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE) {
++			/* This cannot happen - ignore if so. */
+ 			continue;
++		}
+ 		FD_SET(sockets[i], &wr_fds);
+ 		FD_SET(sockets[i], &r_fds);
+ 		if (sockets[i]>maxfd)
+diff --git a/source/libaddns/dnssock.c b/source/libaddns/dnssock.c
+index 7c8bd41..f427bd5 100644
+--- a/source/libaddns/dnssock.c
++++ b/source/libaddns/dnssock.c
+@@ -218,7 +218,11 @@ static DNS_ERROR read_all(int fd, uint8 *data, size_t len)
+ 	while (total < len) {
+ 		ssize_t ret;
+ 		int fd_ready;
+-		
++
++		if (fd < 0 || fd >= FD_SETSIZE) {
++			return ERROR_DNS_SOCKET_ERROR;
++		}
++
+ 		FD_ZERO( &rfds );
+ 		FD_SET( fd, &rfds );
+ 
+diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
+index bfe5e7b..768e54d 100644
+--- a/source/libsmb/nmblib.c
++++ b/source/libsmb/nmblib.c
+@@ -1097,6 +1097,11 @@ struct packet_struct *receive_packet(int fd,enum packet_type type,int t)
+ 	struct timeval timeout;
+ 	int ret;
+ 
++	if (fd < 0 || fd >= FD_SETSIZE) {
++		errno = EBADF;
++		return NULL;
++	}
++
+ 	FD_ZERO(&fds);
+ 	FD_SET(fd,&fds);
+ 	timeout.tv_sec = t/1000;
+diff --git a/source/nmbd/nmbd_packets.c b/source/nmbd/nmbd_packets.c
+index 4b97819..03e5362 100644
+--- a/source/nmbd/nmbd_packets.c
++++ b/source/nmbd/nmbd_packets.c
+@@ -1683,7 +1683,7 @@ static bool create_listen_fdset(fd_set **ppset, int **psock_array, int *listen_n
+ 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
+ 		count++;
+ 
+-	if((count*2) + 2 > FD_SETSIZE) {
++	if((count*2) + 2 >= FD_SETSIZE) {
+ 		DEBUG(0,("create_listen_fdset: Too many file descriptors needed (%d). We can \
+ only use %d.\n", (count*2) + 2, FD_SETSIZE));
+ 		SAFE_FREE(pset);
+@@ -1699,24 +1699,44 @@ only use %d.\n", (count*2) + 2, FD_SETSIZE));
+ 	FD_ZERO(pset);
+ 
+ 	/* Add in the broadcast socket on 137. */
++	if (ClientNMB < 0 || ClientNMB >= FD_SETSIZE) {
++		errno = EBADF;
++		SAFE_FREE(pset);
++		return True;
++	}
++
+ 	FD_SET(ClientNMB,pset);
+ 	sock_array[num++] = ClientNMB;
+ 	*maxfd = MAX( *maxfd, ClientNMB);
+ 
+ 	/* Add in the 137 sockets on all the interfaces. */
+ 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
++		if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) {
++			/* We have to ignore sockets outside FD_SETSIZE. */
++			continue;
++		}
+ 		FD_SET(subrec->nmb_sock,pset);
+ 		sock_array[num++] = subrec->nmb_sock;
+ 		*maxfd = MAX( *maxfd, subrec->nmb_sock);
+ 	}
+ 
+ 	/* Add in the broadcast socket on 138. */
++	if (ClientDGRAM < 0 || ClientDGRAM >= FD_SETSIZE) {
++		errno = EBADF;
++		SAFE_FREE(pset);
++		return True;
++	}
++
+ 	FD_SET(ClientDGRAM,pset);
+ 	sock_array[num++] = ClientDGRAM;
+ 	*maxfd = MAX( *maxfd, ClientDGRAM);
+ 
+ 	/* Add in the 138 sockets on all the interfaces. */
+ 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
++		if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) {
++			/* We have to ignore sockets outside FD_SETSIZE. */
++			continue;
++		}
+ 		FD_SET(subrec->dgram_sock,pset);
+ 		sock_array[num++] = subrec->dgram_sock;
+ 		*maxfd = MAX( *maxfd, subrec->dgram_sock);
+@@ -1767,7 +1787,7 @@ bool listen_for_packets(bool run_election)
+ 
+ #ifndef SYNC_DNS
+ 	dns_fd = asyncdns_fd();
+-	if (dns_fd != -1) {
++	if (dns_fd >= 0 && dns_fd < FD_SETSIZE) {
+ 		FD_SET(dns_fd, &r_fds);
+ 		maxfd = MAX( maxfd, dns_fd);
+ 	}
+diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
+index a164621..4f76bd0 100644
+--- a/source/nsswitch/wb_common.c
++++ b/source/nsswitch/wb_common.c
+@@ -240,6 +240,12 @@ static int winbind_named_pipe_sock(const char *dir)
+ 
+ 		switch (errno) {
+ 			case EINPROGRESS:
++
++				if (fd < 0 || fd >= FD_SETSIZE) {
++					errno = EBADF;
++					goto error_out;
++				}
++
+ 				FD_ZERO(&w_fds);
+ 				FD_SET(fd, &w_fds);
+ 				tv.tv_sec = CONNECT_TIMEOUT - wait_time;
+@@ -383,7 +389,13 @@ int winbind_write_sock(void *buffer, int count, int recursing, int need_priv)
+ 	while(nwritten < count) {
+ 		struct timeval tv;
+ 		fd_set r_fds;
+-		
++
++		if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
++			errno = EBADF;
++			winbind_close_sock();
++			return -1;
++		}
++
+ 		/* Catch pipe close on other end by checking if a read()
+ 		   call would not block by calling select(). */
+ 
+@@ -443,7 +455,13 @@ int winbind_read_sock(void *buffer, int count)
+ 	while(nread < count) {
+ 		struct timeval tv;
+ 		fd_set r_fds;
+-		
++
++		if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
++			errno = EBADF;
++			winbind_close_sock();
++			return -1;
++		}
++
+ 		/* Catch pipe close on other end by checking if a read()
+ 		   call would not block by calling select(). */
+ 
+diff --git a/source/printing/printing.c b/source/printing/printing.c
+index a9272eb..c3b8c61 100644
+--- a/source/printing/printing.c
++++ b/source/printing/printing.c
+@@ -1407,6 +1407,11 @@ void start_background_queue(void)
+ 		exit(1);
+ 	}
+ 
++	if (pause_pipe[1] < 0 || pause_pipe[1] >= FD_SETSIZE) {
++		DEBUG(5,("start_background_queue: pipe fd out of range.\n"));
++		exit(1);
++	}
++
+ 	background_lpq_updater_pid = sys_fork();
+ 
+ 	if (background_lpq_updater_pid == -1) {
+diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
+index f02739e..3c689b9 100644
+--- a/source/smbd/dnsregister.c
++++ b/source/smbd/dnsregister.c
+@@ -125,6 +125,9 @@ void dns_register_smbd(struct dns_reg_state ** dns_state_ptr,
+ 	 */
+ 	if (dns_state->srv_ref != NULL) {
+ 		mdnsd_conn_fd = DNSServiceRefSockFD(dns_state->srv_ref);
++		if (mdnsd_conn_fd < 0 || mdnsd_conn_fd >= FD_SETSIZE) {
++			return;
++		}
+ 		FD_SET(mdnsd_conn_fd, listen_set);
+ 		return;
+ 	}
+@@ -156,6 +159,9 @@ void dns_register_smbd(struct dns_reg_state ** dns_state_ptr,
+ 	}
+ 
+ 	mdnsd_conn_fd = DNSServiceRefSockFD(dns_state->srv_ref);
++	if (mdnsd_conn_fd < 0 || mdnsd_conn_fd >= FD_SETSIZE) {
++		return;
++	}
+ 	FD_SET(mdnsd_conn_fd, listen_set);
+ 	*maxfd = MAX(*maxfd, mdnsd_conn_fd);
+ 	*timeout = timeval_zero();
+diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
+index a07d05d..5ae3fdf 100644
+--- a/source/smbd/oplock.c
++++ b/source/smbd/oplock.c
+@@ -241,7 +241,10 @@ bool downgrade_oplock(files_struct *fsp)
+ int oplock_notify_fd(void)
+ {
+ 	if (koplocks) {
+-		return koplocks->notification_fd;
++		int fd = koplocks->notification_fd;
++		if (fd < 0 || fd >= FD_SETSIZE) {
++			return -1;
++		}
+ 	}
+ 
+ 	return -1;
+diff --git a/source/smbd/oplock_irix.c b/source/smbd/oplock_irix.c
+index 8c287c9..6e86fac 100644
+--- a/source/smbd/oplock_irix.c
++++ b/source/smbd/oplock_irix.c
+@@ -284,6 +284,11 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void)
+ 		return False;
+ 	}
+ 
++	if (pfd[0] < 0 || pfd[0] >= FD_SETSIZE) {
++		DEBUG(0,("setup_kernel_oplock_pipe: fd out of range.\n"));
++		return False;
++	}
++
+ 	oplock_pipe_read = pfd[0];
+ 	oplock_pipe_write = pfd[1];
+ 
+diff --git a/source/smbd/process.c b/source/smbd/process.c
+index 403c7c6..9b8f29b 100644
+--- a/source/smbd/process.c
++++ b/source/smbd/process.c
+@@ -698,7 +698,7 @@ static void async_processing(fd_set *pfds)
+ 
+ static int select_on_fd(int fd, int maxfd, fd_set *fds)
+ {
+-	if (fd != -1) {
++	if (fd != -1 && fd < FD_SETSIZE) {
+ 		FD_SET(fd, fds);
+ 		maxfd = MAX(maxfd, fd);
+ 	}
+diff --git a/source/smbd/server.c b/source/smbd/server.c
+index 5129484..a670334 100644
+--- a/source/smbd/server.c
++++ b/source/smbd/server.c
+@@ -209,7 +209,13 @@ static bool open_sockets_inetd(void)
+ 	/* Started from inetd. fd 0 is the socket. */
+ 	/* We will abort gracefully when the client or remote system 
+ 	   goes away */
+-	smbd_set_server_fd(dup(0));
++	int fd = dup(0);
++
++	if (fd < 0 || fd >= FD_SETSIZE) {
++		return false;
++	}
++
++	smbd_set_server_fd(fd);
+ 	
+ 	/* close our standard file descriptors */
+ 	close_low_fds(False); /* Don't close stderr */
+@@ -436,7 +442,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
+ 							num_sockets == 0 ? 0 : 2,
+ 							ifss,
+ 							true);
+-				if(s == -1) {
++				if(s < 0 || s >= FD_SETSIZE) {
++					close(s);
+ 					continue;
+ 				}
+ 
+@@ -516,7 +523,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
+ 						num_sockets == 0 ? 0 : 2,
+ 						&ss,
+ 						true);
+-				if (s == -1) {
++				if (s < 0 || s >= FD_SETSIZE) {
+ 					continue;
+ 				}
+ 
+@@ -709,6 +716,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
+ 			struct sockaddr addr;
+ 			socklen_t in_addrlen = sizeof(addr);
+ 			pid_t child = 0;
++			int fd;
+ 
+ 			s = -1;
+ 			for(i = 0; i < num_sockets; i++) {
+@@ -721,16 +729,21 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
+ 				}
+ 			}
+ 
+-			smbd_set_server_fd(accept(s,&addr,&in_addrlen));
+-
+-			if (smbd_server_fd() == -1 && errno == EINTR)
++			fd = accept(s,&addr,&in_addrlen);
++			if (fd == -1 && errno == EINTR)
+ 				continue;
+-
+-			if (smbd_server_fd() == -1) {
++			if (fd == -1) {
+ 				DEBUG(2,("open_sockets_smbd: accept: %s\n",
+ 					 strerror(errno)));
+ 				continue;
+ 			}
++			if (fd < 0 || fd >= FD_SETSIZE) {
++				DEBUG(2,("open_sockets_smbd: bad fd %d\n",
++					fd ));
++				continue;
++			}
++
++			smbd_set_server_fd(fd);
+ 
+ 			/* Ensure child is set to blocking mode */
+ 			set_blocking(smbd_server_fd(),True);
+diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c
+index 1e22a40..45f9207 100644
+--- a/source/utils/smbfilter.c
++++ b/source/utils/smbfilter.c
+@@ -162,8 +162,8 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
+ 		int num;
+ 		
+ 		FD_ZERO(&fds);
+-		if (s != -1) FD_SET(s, &fds);
+-		if (c != -1) FD_SET(c, &fds);
++		if (s >= 0 && s < FD_SETSIZE) FD_SET(s, &fds);
++		if (c >= 0 && c < FD_SETSIZE) FD_SET(c, &fds);
+ 
+ 		num = sys_select_intr(MAX(s+1, c+1),&fds,NULL,NULL,NULL);
+ 		if (num <= 0) continue;
+@@ -235,6 +235,10 @@ static void start_filter(char *desthost)
+ 		struct sockaddr_storage ss;
+ 		socklen_t in_addrlen = sizeof(ss);
+ 		
++		if (s < 0 || s >= FD_SETSIZE) {
++			break;
++		}
++
+ 		FD_ZERO(&fds);
+ 		FD_SET(s, &fds);
+ 
+diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
+index 1d618e2..6b5c251 100644
+--- a/source/winbindd/winbindd.c
++++ b/source/winbindd/winbindd.c
+@@ -836,7 +836,8 @@ static void process_loop(void)
+ 	listen_sock = open_winbindd_socket();
+ 	listen_priv_sock = open_winbindd_priv_socket();
+ 
+-	if (listen_sock == -1 || listen_priv_sock == -1) {
++	if (listen_sock < 0 || listen_sock >= FD_SETSIZE ||
++			listen_priv_sock < 0 || listen_priv_sock >= FD_SETSIZE) {
+ 		perror("open_winbind_socket");
+ 		exit(1);
+ 	}
+@@ -861,6 +862,9 @@ static void process_loop(void)
+ 
+ 	FD_ZERO(&r_fds);
+ 	FD_ZERO(&w_fds);
++
++	/* We check the range for listen_sock and
++	   listen_priv_sock above. */
+ 	FD_SET(listen_sock, &r_fds);
+ 	FD_SET(listen_priv_sock, &r_fds);
+ 
+@@ -890,6 +894,12 @@ static void process_loop(void)
+ 	}
+ 
+ 	for (ev = fd_events; ev; ev = ev->next) {
++		if (ev->fd < 0 || ev->fd >= FD_SETSIZE) {
++			/* Ignore here - event_add_to_select_args
++			   should make this impossible. */
++			continue;
++		}
++
+ 		if (ev->flags & EVENT_FD_READ) {
+ 			FD_SET(ev->fd, &r_fds);
+ 			maxfd = MAX(ev->fd, maxfd);
+diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
+index ff004f2..b30ec20 100644
+--- a/source/winbindd/winbindd_dual.c
++++ b/source/winbindd/winbindd_dual.c
+@@ -1250,6 +1250,12 @@ static bool fork_domain_child(struct winbindd_child *child)
+ 		return False;
+ 	}
+ 
++	if (fdpair[0] < 0 || fdpair[0] >= FD_SETSIZE) {
++		DEBUG(0, ("fork_domain_child: bad fd range (%d)\n", fdpair[0]));
++		errno = EBADF;
++		return False;
++	}
++
+ 	ZERO_STRUCT(state);
+ 	state.pid = sys_getpid();
+ 
+@@ -1405,6 +1411,7 @@ static bool fork_domain_child(struct winbindd_child *child)
+ 		message_dispatch(winbind_messaging_context());
+ 
+ 		FD_ZERO(&read_fds);
++		/* We check state.sock against FD_SETSIZE above. */
+ 		FD_SET(state.sock, &read_fds);
+ 
+ 		ret = sys_select(state.sock + 1, &read_fds, NULL, NULL, tp);
+-- 
+1.6.4.2
+

From baa8b69303a3f05b75fa183d62847bc97160cd2e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Mar 2011 11:22:26 -0300
Subject: [PATCH 0015/6849] dropbear: bump to version 0.53.1

Changelog @ http://matt.ucc.asn.au/dropbear/CHANGES

Since some build-time defaults have changed that make dropbear somewhat
bigger we introduce a new option to optimize dropbear for size.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/Config.in   | 10 ++++++++++
 package/dropbear/dropbear.mk | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index e47ba45457..4bc0e3e1b0 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -13,3 +13,13 @@ config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS
 	  Disable reverse DNS lookups on connection. This can be handy
 	  on systems without working DNS, as connections otherwise
 	  stall until DNS times out.
+
+config BR2_PACKAGE_DROPBEAR_SMALL
+	bool "optimize for size"
+	default y
+	depends on BR2_PACKAGE_DROPBEAR
+	help
+	  Compile dropbear for the smallest possible binary size.
+
+	  Tradeoffs are slower hashes and ciphers, and disabling of the
+	  blowfish cipher.
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index b07cb6333c..fab7c96789 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DROPBEAR_VERSION = 0.52
+DROPBEAR_VERSION = 0.53.1
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_DEPENDENCIES = zlib
@@ -27,10 +27,25 @@ define DROPBEAR_DISABLE_REVERSE_DNS
 	$(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h
 endef
 
+define DROPBEAR_BUILD_SMALL
+	echo "#define DROPBEAR_SMALL_CODE" >>$(@D)/options.h
+	echo "#define NO_FAST_EXPTMOD" >>$(@D)/options.h
+endef
+
+define DROPBEAR_BUILD_FEATURED
+	echo "#define DROPBEAR_BLOWFISH" >>$(@D)/options.h
+endef
+
 ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS
 endif
 
+ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
+else
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
+endif
+
 define DROPBEAR_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear
 	for f in $(DROPBEAR_TARGET_BINS); do \

From 66d36e67083d8390cd15e3d76f8891172fd7e103 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 13:19:58 -0300
Subject: [PATCH 0016/6849] mpg123: bump to version 1.13.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index f6eaddb24a..a22ef18d78 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.13.1
+MPG123_VERSION = 1.13.2
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From c2bcce4a59f7baa0266300ec35d13fe04500d229 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 13:19:59 -0300
Subject: [PATCH 0017/6849] file: bump to version 5.05

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file-nocxx.patch | 31 -------------------------------
 package/file/file.mk          |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 package/file/file-nocxx.patch

diff --git a/package/file/file-nocxx.patch b/package/file/file-nocxx.patch
deleted file mode 100644
index 3b0eec6c9e..0000000000
--- a/package/file/file-nocxx.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 126fcb5d08d69693eb4c6e5f5c3d1082b6910121 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 7 Jun 2010 11:40:04 -0300
-Subject: [PATCH] Disable configure script from checking for CXX since it's not needed
-
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index a6e812b..ac2587f 100755
---- a/configure
-+++ b/configure
-@@ -6136,10 +6136,8 @@ if $ac_preproc_ok; then
-   :
- else
-   { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+   { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
- 
- ac_ext=cpp
--- 
-1.6.4.4
-
diff --git a/package/file/file.mk b/package/file/file.mk
index b8281d02bf..d405c26e0a 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FILE_VERSION = 5.04
+FILE_VERSION = 5.05
 FILE_SITE = ftp://ftp.astron.com/pub/file/
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib

From 1b269dd5524c76e339a4ca966b59854dfec075b0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 13:20:00 -0300
Subject: [PATCH 0018/6849] ffmpeg: bump to version 0.6.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/Config.in           |  5 ++--
 .../ffmpeg-0.5.2-fix-sdl-config-search.patch  | 17 ------------
 .../multimedia/ffmpeg/ffmpeg-sdlconfig.patch  | 17 ++++++++++++
 package/multimedia/ffmpeg/ffmpeg.mk           | 26 ++++++++++++++-----
 4 files changed, 40 insertions(+), 25 deletions(-)
 delete mode 100644 package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch
 create mode 100644 package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch

diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index 2f9499101a..7a9513c092 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -1,9 +1,10 @@
-comment "ffmpeg requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
 
 menuconfig BR2_PACKAGE_FFMPEG
 	bool "ffmpeg"
 	depends on BR2_LARGEFILE
+	depends on BR2_INET_IPV6
 	help
          FFmpeg is a complete, cross-platform solution to record, convert
          and stream audio and video.
diff --git a/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch b/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch
deleted file mode 100644
index 58d08aa28a..0000000000
--- a/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Allow FFmpeg's ./configure script to use a custom sdl-config command.
-
-Inspired from:
-http://www.mail-archive.com/uclinux-dist-commits@blackfin.uclinux.org/msg01099.html
-
-diff -u ffmpeg-0.5.2-orig/configure ffmpeg-0.5.2/configure
---- a/configure
-+++ b/configure
-@@ -2066,7 +2066,7 @@
- 
- disable sdl_too_old
- disable sdl
--SDL_CONFIG="${cross_prefix}sdl-config"
-+SDL_CONFIG="${SDL_CONFIG-${cross_prefix}sdl-config}"
- if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
-     sdl_cflags=`"${SDL_CONFIG}" --cflags`
-     temp_cflags $sdl_cflags
diff --git a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
new file mode 100644
index 0000000000..de2c004c66
--- /dev/null
+++ b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
@@ -0,0 +1,17 @@
+We need to pass the location sdl-config so that ffmpeg picks it up.
+So just pass the whole string to make things simpler.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura ffmpeg-0.6.1/configure ffmpeg-0.6.1.sdl/configure
+--- ffmpeg-0.6.1/configure	2010-06-15 16:44:30.000000000 -0300
++++ ffmpeg-0.6.1.sdl/configure	2011-02-25 17:13:12.979168176 -0300
+@@ -2640,7 +2640,7 @@
+     die "ERROR: No version of libdc1394 found "
+ fi
+ 
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${SDL_CONFIG}"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+     sdl_cflags=$("${SDL_CONFIG}" --cflags)
+     sdl_libs=$("${SDL_CONFIG}" --libs)
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b37ac901e7..1e8f09a302 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -3,17 +3,16 @@
 # ffmpeg
 #
 #############################################################
-FFMPEG_VERSION := 0.5.2
-FFMPEG_SOURCE := ffmpeg-$(FFMPEG_VERSION).tar.bz2
-FFMPEG_SITE := http://ffmpeg.org/releases
+
+FFMPEG_VERSION = 0.6.1
+FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
+FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
-FFMPEG_INSTALL_TARGET = YES
 
 FFMPEG_CONF_OPT = \
 	--prefix=/usr		\
 	--enable-shared 	\
 	--disable-avfilter	\
-	--disable-vhook		\
 
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 FFMPEG_CONF_OPT += --enable-gpl
@@ -129,6 +128,21 @@ ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pent
 FFMPEG_CONF_OPT += --disable-mmx
 endif
 
+# ARM defaults to v5: clear if less, add extra if more
+ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
+FFMPEG_CONF_OPT += --disable-armv5te
+endif
+ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)
+FFMPEG_CONF_OPT += --enable-armv6
+endif
+ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a8)$(BR2_cortex_a9),y)
+FFMPEG_CONF_OPT += --enable-armvfp
+endif
+# NEON is optional for A9
+ifeq ($(BR2_cortex_a8),y)
+FFMPEG_CONF_OPT += --enable-neon
+endif
+
 FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
@@ -143,8 +157,8 @@ define FFMPEG_CONFIGURE_CMDS
 		--sysroot=$(STAGING_DIR) \
 		--host-cc="$(HOSTCC)" \
 		--arch=$(BR2_ARCH) \
+		--target-os=linux \
 		--extra-cflags=-fPIC \
-		$(DISABLE_IPV6) \
 		$(FFMPEG_CONF_OPT) \
 	)
 endef

From 0a064b48c9d1044b05aee65272f5af7f28879473 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 13:20:01 -0300
Subject: [PATCH 0019/6849] gst-ffmpeg: bump to version 0.10.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-ffmpeg/Config.in     | 6 +++---
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
index 17873f0518..537101e695 100644
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ b/package/multimedia/gst-ffmpeg/Config.in
@@ -2,16 +2,16 @@ config BR2_PACKAGE_GST_FFMPEG
 	bool "gst-ffmpeg"
 	depends on BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
-	select BR2_PACKAGE_LIBOIL
 	select BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FFMPEG_GPL
 	select BR2_PACKAGE_FFMPEG_POSTPROC
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	depends on BR2_LARGEFILE
+	depends on BR2_INET_IPV6
 	help
 	  GStreamer plugin using FFmpeg.
 
 	  http://gstreamer.freedesktop.org/
 
-comment "gst-ffmpeg requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index 6e91ad5970..ebe87dcb78 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -3,11 +3,12 @@
 # gst-ffmpeg
 #
 #############################################################
-GST_FFMPEG_VERSION = 0.10.9
+
+GST_FFMPEG_VERSION = 0.10.11
 GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
 GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
 GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg liboil
+GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
 GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)

From 50e73c6f783d38c17d7bafc4bcfd9a6e826b0d73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Dec 2010 18:21:35 +0100
Subject: [PATCH 0020/6849] imagemagick: remove *-config scripts from
 TARGET_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/imagemagick/imagemagick.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 97c00410f2..7955db7f5d 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -80,4 +80,14 @@ else
 IMAGEMAGICK_CONF_OPT += --without-tiff
 endif
 
+define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,	\
+		   $(addsuffix -config,			\
+		     Magick MagickCore MagickWand Wand Magick++))
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+IMAGEMAGICK_POST_INSTALL_TARGET_HOOKS += IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,imagemagick))

From 7ec08dab2879be9745ea0750cfb5fca7c13e48df Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Dec 2010 18:22:02 +0100
Subject: [PATCH 0021/6849] neon: remove neon-config script from TARGET_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/neon/neon.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index c570fc1dac..0c237dcaf5 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -45,4 +45,12 @@ else
 NEON_CONF_OPT+=--without-ssl
 endif
 
+define NEON_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/neon-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,neon))

From 99175e43be4a7ad19c04364d3fe91db26853af33 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Dec 2010 18:22:49 +0100
Subject: [PATCH 0022/6849] libdnet: remove dnet-config script from TARGET_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libdnet/libdnet.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index eb67b055a5..6dfecf90c9 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -31,4 +31,12 @@ endef
 
 LIBDNET_POST_EXTRACT_HOOKS += LIBDNET_FIXUP_ACINCLUDE_M4
 
+define LIBDNET_REMOVE_CONFIG_SCRIPT
+	$(RM) -f $(TARGET_DIR)/usr/bin/dnet-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT
+endif
+
 $(eval $(call AUTOTARGETS,package,libdnet))

From ac7dbcf925e084a4c2e1d22d53d5d7bdb829d4d6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Dec 2010 18:23:11 +0100
Subject: [PATCH 0023/6849] libpng: remove libpng*-config scripts from
 TARGET_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libpng/libpng.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 699561b9ab..e64989dffd 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -22,5 +22,14 @@ endef
 
 LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
 
+define LIBPNG_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config \
+		 $(TARGET_DIR)/usr/bin/libpng-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,libpng))
 $(eval $(call AUTOTARGETS,package,libpng,host))

From c08e016efad74b087b71df09b028f615eb5453db Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Dec 2010 18:23:39 +0100
Subject: [PATCH 0024/6849] libxml2: remove xml2-config script from TARGET_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libxml2/libxml2.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index d07f631a88..2a267b2f9e 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -30,6 +30,14 @@ HOST_LIBXML2_CONF_OPT = \
 		--enable-shared --without-debugging --without-python \
 		--without-threads
 
+define LIBXML2_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,libxml2))
 $(eval $(call AUTOTARGETS,package,libxml2,host))
 

From efeebdbd427906fecf404e9a71066398d144f082 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Dec 2010 18:23:55 +0100
Subject: [PATCH 0025/6849] libxslt: remove xslt-config script from TARGET_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libxslt/libxslt.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 5fa2f4ce4f..1efdcf8c25 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -39,5 +39,13 @@ endef
 
 LIBXSLT_POST_INSTALL_STAGING_HOOKS += LIBXSLT_XSLT_CONFIG_FIXUP
 
+define LIBXSLT_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/xslt-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,libxslt))
 $(eval $(call AUTOTARGETS,package,libxslt,host))

From f6409520ce44a498eec3cbca214b17470aa7b839 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 14:09:58 +0000
Subject: [PATCH 0026/6849] gnuconfig: Remove old checkout of GNU config.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuconfig/CVS/Entries                 |   14 -
 package/gnuconfig/CVS/Repository              |    1 -
 package/gnuconfig/CVS/Root                    |    1 -
 package/gnuconfig/ChangeLog                   | 1996 -----------------
 package/gnuconfig/Makefile                    |   15 -
 package/gnuconfig/testsuite/.cvsignore        |    1 -
 package/gnuconfig/testsuite/CVS/Entries       |    7 -
 package/gnuconfig/testsuite/CVS/Repository    |    1 -
 package/gnuconfig/testsuite/CVS/Root          |    1 -
 package/gnuconfig/testsuite/config-guess.data |   34 -
 package/gnuconfig/testsuite/config-guess.sh   |   47 -
 package/gnuconfig/testsuite/config-sub.data   |  117 -
 package/gnuconfig/testsuite/config-sub.sh     |   35 -
 package/gnuconfig/testsuite/uname.in          |    9 -
 package/gnuconfig/uname                       |   11 -
 15 files changed, 2290 deletions(-)
 delete mode 100644 package/gnuconfig/CVS/Entries
 delete mode 100644 package/gnuconfig/CVS/Repository
 delete mode 100644 package/gnuconfig/CVS/Root
 delete mode 100644 package/gnuconfig/ChangeLog
 delete mode 100644 package/gnuconfig/Makefile
 delete mode 100644 package/gnuconfig/testsuite/.cvsignore
 delete mode 100644 package/gnuconfig/testsuite/CVS/Entries
 delete mode 100644 package/gnuconfig/testsuite/CVS/Repository
 delete mode 100644 package/gnuconfig/testsuite/CVS/Root
 delete mode 100644 package/gnuconfig/testsuite/config-guess.data
 delete mode 100644 package/gnuconfig/testsuite/config-guess.sh
 delete mode 100644 package/gnuconfig/testsuite/config-sub.data
 delete mode 100644 package/gnuconfig/testsuite/config-sub.sh
 delete mode 100755 package/gnuconfig/testsuite/uname.in
 delete mode 100755 package/gnuconfig/uname

diff --git a/package/gnuconfig/CVS/Entries b/package/gnuconfig/CVS/Entries
deleted file mode 100644
index 07ca106ed8..0000000000
--- a/package/gnuconfig/CVS/Entries
+++ /dev/null
@@ -1,14 +0,0 @@
-D/doc////
-D/lib////
-D/m4////
-D/patches////
-D/po////
-D/scripts////
-D/src////
-D/tests////
-D/testsuite////
-/Makefile/1.6/Mon Sep 26 07:33:33 2005//
-/ChangeLog/1.387/Thu Sep 20 16:47:12 2007//
-/config.guess/1.368/Thu Sep 20 16:47:12 2007//
-/config.sub/1.356/Thu Sep 20 16:47:05 2007//
-/uname/1.5/Tue Aug 21 18:37:34 2007//
diff --git a/package/gnuconfig/CVS/Repository b/package/gnuconfig/CVS/Repository
deleted file mode 100644
index 04204c7c9d..0000000000
--- a/package/gnuconfig/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-config
diff --git a/package/gnuconfig/CVS/Root b/package/gnuconfig/CVS/Root
deleted file mode 100644
index 192e02e93c..0000000000
--- a/package/gnuconfig/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@cvs.savannah.gnu.org:/cvsroot/config
diff --git a/package/gnuconfig/ChangeLog b/package/gnuconfig/ChangeLog
deleted file mode 100644
index 2bba73eb51..0000000000
--- a/package/gnuconfig/ChangeLog
+++ /dev/null
@@ -1,1996 +0,0 @@
-2007-07-25  Mike Frysinger  <vapier@gentoo.org>
-
-	* testsuite/config-guess.sh (run_config_guess): Do not prefix with
-	"function" as this is not permitted by POSIX.
-	* testsuite/config-sub.sh (run_config_sub): Likewise.
-
-2007-07-24  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Remove trailing whitespace.
-
-2007-07-22  Ben Elliston  <bje@gnu.org>
-
-	Reported by Luke Mewburn <luke@mewburn.net>:
-	* config.guess: Fix typo ix86xen -> i86xen.
-
-2007-06-28  Ben Elliston  <bje@gnu.org>
-
-	From M R Swami Reddy <MR.Swami.Reddy@nsc.com>:
-	* config.sub: Rename cr16c to cr16.
-
-2007-05-17  Ben Elliston  <bje@gnu.org>
-
-	From Luke Mewburn <luke@mewburn.net>:
-	* config.guess (i86xen:SunOS:5.*:*): New.
-	* testsuite/config-guess.data: Add test case.
-
-2007-04-29  Ben Elliston  <bje@gnu.org>
-
-	From Pedro Alves <pedro_alves@portugalmail.pt>:
-	* config.sub (mingw32ce): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2007-03-06  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (*:Interix*:[3456]*): Consolidate all machine
-	possibilities into a single entry with a case statement that
-	examines ${UNAME_MACHINE}. Suggested by <jerker.back@telia.com>.
-
-2007-01-18  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-sub.data: Add MeP test cases.
-
-	From Dave Brolley  <brolley@redhat.com>
-	2001-03-19  Ben Elliston  <bje@redhat.com>
-
-	* config.sub (mep, mep-*): Add.
-
-2007-01-15  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (SX-8R:SUPER-UX:*:*): New.
-	* testsuite/config-guess.data: Add a test case.
-
-2007-01-04  Ben Elliston  <bje@gnu.org>
-
-	From Alexander Boettcher <alex@kaffe.org> via Dalibor Topic:
-	* config.sub: Recognise -drops*.
-	* testsuite/config-sub.data: Add a test.
-
-2006-12-22  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (i*:MINGW:*:*): Rename from this ..
-	(*:MINGW:*:*): .. to this.
-	* testsuite/config-guess.data: Add test cases.
-
-2006-12-08  Bob Wilson  <bob.wilson@acm.org>
-
-	* config.guess (xtensa:Linux:*:*): New.
-	* testsuite/config-guess.data: Add test case.
-	* testsuite/config-sub.data: Add xtensa-elf and xtensa-linux.
-
-2006-12-08  Kazu Hirata  <kazu@codesourcery.com>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.sub: Recognize fido and fido-*.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-11-30  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (SX-7:SUPER-UX:*:*): New.
-	* testsuite/config-guess.data: Add test case.
-
-2006-11-15  Ben Elliston  <bje@gnu.org>
-
-	From Josselin Mouette <joss@debian.org>:
-	* config.guess (SX-8:SUPER-UX:*:*): New.
-	* testsuite/config-guess.data: Add test case.
-
-2006-11-08  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (authenticamd:Interix*:[3456]*): Another AMD64.
-	* testsuite/config-guess.data: Add test case.
-
-2006-11-07  Steve Woodford  <scw@NetBSD.org>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.guess (*:NetBSD:*:*): Handle sh5el arch.
-	* config.sub (sh5el): New basic_machine.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-09-20  Ben Elliston  <bje@gnu.org>
-
-	* config.sub (score, score-*): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-08-14  Thiemo Seufer  <ths@mips.com>
-	    Nigel Stephens  <nigel@mips.com>
-	    David Ung  <davidu@mips.com>
-
-	* config.sub (sde): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-08-14  Vijay K. Munjal <vijaykumarm1@KPITCummins.com>
-
-	* config.sub (xc16x, xc16x-*): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-07-02  Masaki MURANAKA  <monaka@monami-software.com>
-
-	* config.sub (toppers-*): New.
-	* testsuite/config-sub.data: Add test case.
-
-2006-07-02  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (macppc:MirBSD:*:*): Fix typo.
-	* testsuite/config-guess.data: Add test case.
-
-2006-07-02  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Handle Interix 6.
-	* testsuite/config-guess.data: Add test case.
-
-2006-06-06  Ben Elliston  <bje@gnu.org>
-
-	From H??vard Skinnemoen <hskinnemoen@atmel.com>:
-	* config.guess (avr32*:Linux:*:*): New.
-	* config.sub (avr32, avr32-*): Likewise.
-	* testsuite/config-guess.data: Add test case.
-	* testsuite/config-sub.data: Likewise.
-
-2006-05-13  Ben Elliston  <bje@gnu.org>
-
-	* config.sub: Specify -elf as the default OS for spu.
-	(c4x-* | tic4x-*): Tidy formatting.
-	* testsuite/config-sub.data: Update tests.
-
-2006-05-13  Bruno Haible  <bruno@clisp.org>
-
-	* config.guess: Change support for Sun C/C++ 5.9 on Linux/x86 to
-	use compiler-specific predefines other than __sun.
-
-2006-05-12  Ben Elliston  <bje@gnu.org>
-
-	* config.sub (spu): New.
-	* testsuite/config-sub.data: Add test case.
-
-2006-05-12  Ben Elliston  <bje@gnu.org>
-
-	* config.sub (m32c, m32c-*): Fold into the standard case.
-
-2006-04-26  Bruno Haible  <bruno@clisp.org>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.guess (amd64:FreeBSD:*:*) Detect as x86_64.
-	* testsuite/config-guess.data: Add test case.
-
-2006-03-13  Ben Elliston  <bje@gnu.org>
-
-	Revert these patches at Earnie Boyd's request:
-
-	* testsuite/config-guess.data: Tweak MSYS_NT-5.1 test.
-
-	* config.guess: Handle i*:MSYS_NT-*:*:* for MSYS/Mingw.
-	* testsuite/config-guess.data: Add test case.
-
-2006-03-07  Mike Frysinger  <vapier@gentoo.org>
-
-        * config.sub (sheb, sheb-*): Handle these in addition to shbe.
-        * testsuite/config-sub.data: Add test case.
-
-2006-03-06  Ben Elliston  <bje@gnu.org>
-
-	* uname: Exit with exit code 0.
-
-2006-02-27  David S. Miller  <davem@sunset.davemloft.net>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.sub (sparcv9v, sparc64v): Recognise SUN4V-based SPARCs.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-02-27  Ben Elliston  <bje@gnu.org>
-
-	* config.guess, config.sub: Add 2006 to copyright years.
-
-2006-02-23  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (EM64T:Interix:*:*): New case.
-	* testsuite/config-guess.data: Add test case.
-
-2006-02-23  Mike Frysinger  <vapier@gentoo.org>
-
-	* config.sub (nios, nios2): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2006-02-23  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (x86:Interix*:[345]*): Retain full Interix version.
-	* testsuite/config-guess.data: Update Interix test(s).
-
-2006-02-23  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-guess.data: Tweak MSYS_NT-5.1 test.
-
-2006-02-23  Dan Nicolaescu  <dann@ics.uci.edu>
-
-	* config.guess (i*86:Linux:*:*): Recognise the Sun Studio compiler
-	by handling #if defined(__sun).
-
-2006-02-23  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Handle i*:MSYS_NT-*:*:* for MSYS/Mingw.
-	* testsuite/config-guess.data: Add test case.
-
-2006-01-30  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
-	* config.guess: Don't use semicolons to separate sed commands, as
-	POSIX says it's not portable.
-	Noted by Paul Eggert <eggert@cs.ucla.edu>.
-
-2006-01-30  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
-	* config.guess (set_cc_for_build): Do not pass `-q' to mktemp.
-	Reported by Bruce Korb <bkorb@gnu.org>.
-
-2006-01-19  Robert Millan  <robertmh@gnu.org>
-
-	* testsuite/config-guess.data: Add test case for GNU/kFreeBSD.
-	* testsuite/config-sub.data: Add test case for amd64-kfreebsd5.4-gnu.
-
-2006-01-02  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (*:SolidBSD:*:*): New.
-	* config.sub (-solidbsd*): New.
-	* testsuite/config-guess.data: Add test case.
-	* testsuite/config-sub.data: Ditto.
-
-2005-12-23  Ben Elliston  <bje@gnu.org>
-
-	From Takahashi Yoshihiro <nyan@jp.FreeBSD.org>:
-	* config.guess (pc98:FreeBSD:*:*) Add special case.
-	* config.sub (pc98, pc98-*): New.
-	* testsuite/config-guess.data: Add test case.
-	* testsuite/config-sub.data: Ditto.
-
-2005-12-22  Ben Elliston  <bje@gnu.org>
-
-	From John Williams <jwilliams@itee.uq.edu.au>:
-	* config.sub (mb, microblaze): New basic_machine.
-	* testsuite/config-sub.data: New tests.
-
-2005-12-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
-	* config.guess (mips:Linux:*:*, mips64:Linux:*:*, i*86:Linux:*:*):
-	Fix quoting of eval command line, allow for preprocessor to insert
-	white space between C tokens.
-	(i*86:Linux:*:*): Handle Portland Group pgcc like Intel icc; it
-	doesn't define __ELF__ either.
-
-2005-12-11  Ben Elliston  <bje@gnu.org>
-
-	From Shaun Jackman <sjackman@gmail.com>:
-	* config.sub: Add the KERNEL-OS combination linux-newlib*.
-	* testsuite/config-sub.data: Add a test for i386-linux-newlib.
-
-2005-12-11  Ben Elliston  <bje@gnu.org>
-
-	Reported by Leif Ekblad <leif@rdos.net>:
-	* config.guess (i*86:rdos:*:*): New.
-	* config.sub: Handle rdos.
-	* testsuite/config-guess.data: Add test case for RDOS.
-	* testsuite/config-sub.data: Likewise.
-
-2005-12-09  Ben Elliston  <bje@gnu.org>
-
-	Reported by Jan-Benedict Glaw <jbglaw@lug-owl.de>:
-	* config.guess (vax:Linux:*:): Detect as vax-dec-linux-gnu.
-	* testsuite/config-guess.data: Add test.
-
-2005-12-09  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* config.sub (mt): Rename from ms1.
-	(ms1): Alias it to mt for backward compatibility.
-	* testsuite/config-sub.data: Update testsuite.
-
-2005-11-13  Kean Johnston  <jkj@sco.com>
-
-	* config.sub: Allow -sco6 and -sco5v6 to be aliases for SCO
-	OpenServer 6.
-	* testsuite/config-sub.data: New tests.
-
-2005-11-11  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-guess.data: Add test case for Linux PPC64.
-
-2005-11-11  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (x86:Interix*:[345]*): Handle Interix version 5.
-	* testsuite/config-guess.data: Add test case.
-
-2005-09-19  Gerben Wierda <Gerben.Wierda@rna.nl>
-
-	* config.guess (*:Darwin:*:*): Don't treat *86 specifically.
-
-2005-08-03  Ben Elliston  <bje@gnu.org>
-
-	Reported by Kulkin Alexey <kulkin@yandex.ru>:
-	* config.guess (x86_64:CYGWIN*:*:*): New case.
-	* testsuite/config-guess.data: Add test case.
-
-2005-07-14  Robert Millan  <robertmh@gnu.org>
-
-	* config.guess (or32:Linux:*:*): Detect.
-	* testsuite/config-guess.data: Add test case.
-
-2005-07-08  Michael Haubenwallner  <michael.haubenwallner@salomon.at>
-
-	* config.guess: Let set_cc_for_build evaluate only once to avoid
-	creation of more than one tmpdir without removing the old one.
-
-2005-07-08  Ben Elliston  <bje@gnu.org>
-
-	* config.sub: Add support for Haiku.
-	* testsuite/config-sub.data: Add test cases for i386, SPARC and
-	PowerPC Haiku.
-
-2005-07-08  Ben Elliston  <bje@gnu.org>
-
-	* Makefile (SHELL): Remove override.
-
-2005-07-04  Ben Elliston  <bje@gnu.org>
-	    Paul Mundt  <lethal@linux-sh.org>
-
-	* config.sub: Handle sh2a/sh4a.
-	* testsuite/config-sub.data: Add test cases.
-
-2005-07-01  Robert Millan  <robertmh@gnu.org>
-
-	* config.sub: Deprecate "openrisc" in favour of "or32".
-	Do not default the OS field to "coff".
-	* testsuite/config-sub.data: Add a test case.
-
-2005-06-30  Ben Elliston  <bje@gnu.org>
-
-	* config.sub (sh64): Remove duplicate entry.
-	* testsuite/config-sub.data: Add test case for sh64.
-
-2005-06-30  Mike Frysinger <vapier@gentoo.org>
-
-	* config.sub (mips64vr5900, mips64vr5900el): New machines.
-	* testsuite/config-sub.data: Add test cases.
-
-2005-06-30  Brad Smith  <brad@comstyle.com>
-
-	* config.guess: Simplify OpenBSD support.
-
-2005-06-02  Aldy Hernandez  <aldyh@redhat.com>
-
-	* config.sub (ms1, ms1-*): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2005-06-02  Jim Blandy  <jimb@redhat.com>
-
-	* config.sub (m32c, m32c-*): New.
-	* testsuite/config-sub.data: Add test cases.
-
-2005-05-27  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (i*:windows32*:*): uname -m includes "-pc", so no
-	need to emit it additionally.
-	* testsuite/config-guess.data: Update test case.
-
-2005-05-15  Ben Elliston  <bje@gnu.org>
-
-	Reported by Sam Steingold <sds@gnu.org>:
-	* config.guess (i*:windows32*:*): New.
-	* testsuite/config-guess.data: Add a corresponding test case.
-
-2005-05-15  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* config.guess: Fix remaining problematic uses of "exit 0" (and
-	one problematic use of "&& exit").
-
-2005-05-12  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Update Free Software Foundation address.
-	* config.sub: Likewise.
-
-2005-05-12  Ben Elliston  <bje@gnu.org>
-
-	* uname: Similar to the last change, remove all exit commands and
-	let the script exit with the exit code of the last command.
-
-2005-05-12  Paul Eggert  <eggert@CS.UCLA.EDU>
-
-	Explanation for this subtle change:
-
-	From: Paul Eggert <eggert@CS.UCLA.EDU>
-	To: config-patches@gnu.org
-	Subject: config.guess, config.sub misdiagnose write errors
-	
-	config.guess and config.sub sometimes mishandle write errors to
-	stdout: they either ignore the errors, or output invalid
-	diagnostics when they occur.  For a simple (albeit unrealistic)
-	example, on my Solaris 8 (sparc) host, the command "config.guess
-	>&-" exits with status 0; it should exit with status 1, due to the
-	write failure.
-	
-	* config.guess: Don't exit with an explicit exit code of 0.
-	* config.sub: Likewise.
-
-2005-05-12  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (i*86:skyos:*:*): New.
-	* config.sub (case $os): Handle "-skyos*" as a valid OS.
-	* testsuite/config-guess.data: Add a test case.
-	* testsuite/config-sub.data: Likewise.
-
-2005-05-12  Tim Rice  <tim@multitalents.net>
-
-	* config.guess: Add support for SCO OpenServer 6.
-
-2005-05-12  Noah Misch  <noah@cs.caltech.edu>
-
-	* config.guess (9000/[34678]??:HP-UX:*:*): Discard stderr of `cc
-	-E -'; HP `cc' emits an error for it but still preprocesses
-	standard input as expected.  Add comment.
-
-2005-05-12  Nick Burrett  <nick@sqrt.co.uk>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.guess (arm:riscos:*:*): New configuration.
-	* testsuite/config-sub.data: New tests.
-	* testsuite/config-guess.data: Likewise.
-
-2005-05-12  Nick Burrett  <nick@sqrt.co.uk>
-
-	* config.guess: Add a missing newline to arm-acorn-riscix string.
-
-2005-04-22  Paul Green  <Paul.Green@stratus.com>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Add Stratus VOS IA32 systems.
-	* testsuite/config-guess.data: Add a testcase.
-
-2005-04-22  Ben Elliston  <bje@gnu.org>
-	    Bernd Schmidt  <bernds_cb1@t-online.de>
-
-	* config.sub (bfin): New target.
-	* testsuite/config-sub.data: Test bfin-elf.
-
-2005-04-22  Ben Elliston  <bje@gnu.org>
-	    Dave Miller  <davem@davemloft.net>
-
-	* config.sub (sparc64b): Handle.
-	* testsuite/config-sub.data: Test sparc64-linux, sparc64b-linux.
-
-2005-03-24  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* config.guess: Update URL for script location.
-	Problem reported by Bruno Haible.
-
-2005-02-10  Ben Elliston  <bje@gnu.org>
-	    J Shepherd  <jashepherd@usa.net>
-
-	* config.guess (NSE-?:NONSTOP_KERNEL:*:*): New.
-	* testsuite/config-guess.data: Test for nse-tandem-nsk.
-
-2005-02-10  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-guess.data: Add craynv-cray-unicosmp2.5.X case.
-
-2005-02-10  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-sub.sh (run_config_sub): New function. Compute
-	$rc within the function and return it.
-	* testsuite/config-guess.sh (run_config_guess): Likewise.
-
-2005-02-10  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (amd64:CYGWIN*:*:*): New.
-	* testsuite/config-sub.data: Add amd64-cygwin, x86_64-cygwin.
-	* testsuite/config-guess.data: Add x86_64-unknown-cygwin test.
-
-2005-02-10  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Update copyright years.
-	* config.sub: Likewise.
-
-2005-01-11  Inderpreet Singh  <inderpreetb@noida.hcltech.com>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.sub: Handle maxq target.
-	* testsuite/config-sub.data: Add maxq and maxq-elf tests.
-
-2004-11-30  Melissa Mears  <asterisk@graces.dricas.com>
-
-	* config.sub: Handle xbox alias.
-	* testsuite/config-sub.data: Add xbox case.
-
-2004-11-17  Ian Lance Taylor  <ian@wasabisystems.com>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.sub: Recognize xscalee[bl].
-	* testsuite/config-sub.data: Add xscale, xscalee[bl] cases.
-
-2004-11-12  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (*:z/VM:*:*): Add new case.
-	* config.sub (os): Add case for -zvmoe.
-	* testsuite/config-guess.data: Add a test case.
-	* testsuite/config-sub.data: Likewise.
-
-2004-11-12  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-guess.sh: Use , and not / as the sed delimiter.
-
-2004-11-12  Andris Pavenis <pavenis@latnet.lv>
-
-	* config.sub (djgpp): Alias to i586-pc-msdosdjgpp.
-	* testsuite/config-sub.data: Add a test case.
-	
-2004-10-25  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-guess.sh: Reduce recurring tabs into a single
-	tab, to allow the test data to be better aligned in columns.
-
-2004-10-25  Ben Elliston  <bje@gnu.org>
-
-	Reported by Monty Solomon <monty@roscom.com>:
-	* config.guess (*:XENIX:*:SysV): New.
-	* testsuite/config-guess.data: Add a test case.
-
-2004-10-25  Ben Elliston  <bje@gnu.org>
-
-	Reported by Martin Hammer <martin.hammer@siemens.com>:
-	* config.guess (DRS?6000:isis:4.2*:7*): New pattern.
-
-2004-09-07  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (frv:Linux:*:*): New.
-	* testsuite/config-sub.data: Add cris-linux, frv-linux.
-	* testsuite/config-guess.data: Add frv-linux-unknown-gnu case.
-
-2004-08-27  Hans-Peter Nilsson  <hp@axis.com>
-
-	* config.sub: Handle crisv32, alias etraxfs.
-	* config.guess (crisv32:Linux:*:*): Handle.
-	* testsuite/config-sub.data: Add test case.
-	* testsuite/config-guess.data: Likewise.
-
-2004-08-22  Ben Elliston  <bje@gnu.org>
-
-	* Makefile (check): Run config-guess.sh tests as well.
-	* testsuite/config-guess.sh: New test.
-	* testsuite/config-guess.data: New file.
-	* testsuite/uname.in: Likewise.
-	* testsuite/config-sub.data (amd64-unknown-freebsd5.2): New case.
-
-2004-08-13  Brad Smith  <brad@comstyle.com>
-
-	* config.guess (*:OpenBSD:*:*): Remove defunct MIPS machines.
-	(sgi:OpenBSD:*:*): Emit mips64, not mipseb.
-
-2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* config.guess (*:Darwin:*:*): If uname -p reports "unknown",
-	assume the processor is a powerpc.  This is because coreutils
-	uname (at least versions 4.5.7 through 5.2.1) outputs "unknown"
-	in this case, due to a MacOS X bug that causes
-	sysctl ((int[]) {CTL_HW, HW_MACHINE_ARCH}, 2, buffer, &bufsize, 0, 0)
-	to return a negative number.
-	Problem reported by Petter Reinholdtsen in:
-	http://lists.gnu.org/archive/html/bug-gnu-utils/2003-02/msg00201.html
-
-2004-07-19  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (S7501:*:4.0:3.0): Handle NCR System V UNIX machine.
-
-2004-07-02  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-sub.data: Add i386-elf to i786-elf.
-
-2004-06-30  Ben Elliston  <bje@gnu.org>
-
-	* testsuite/config-sub.data: Add more new tests.
-
-2004-06-25  Ben Elliston  <bje@gnu.org>
-
-	* Makefile (check): New target.
-	* testsuite/config-sub.sh: New test.
-	* testsuite/config-sub.data: New file.
-
-2004-06-24  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Update copyright years.
-	* config.sub: Likewise.
-
-2004-06-22  Robert Millan  <robertmh@gnu.org>
-
-	* config.guess (*:FreeBSD:*:*): Remove check for glibc (unneeded
-	since GNU/kFreeBSD systems match *:GNU/*:*:* instead).
-
-2004-06-22  Stanley F. Quayle <stan@stanq.com>
-
-	* config.guess (*:*VMS:*:*): New entry. Replaces
-	Alpha:OpenVMS:*. Recognize and advertise all VMS flavors as dec
-	manufacturer.
-
-2004-06-22  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Cray fixes from Wendy Palm <wendyp@cray.com>.
-	* config.sub: Likewise.
-
-2004-06-22  Ben Elliston  <bje@gnu.org>
-
-	Reported by Hans-Peter Nilsson <hp@bitrange.com>:
-	* config.sub: Correctly handle mmix-knuth and mmix-knuth-mmixware.
-
-2004-06-21  Ben Elliston  <bje@gnu.org>
-
-	* Makefile: New file.
-
-2004-06-11  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (pegasos:OpenBSD:*:*): Remove.
-
-2004-06-11  Ben Elliston  <bje@gnu.org>
-
-	From Wouter Verhelst <wouter@grep.be>:
-	* config.guess (M68*:*:R3V[5678]:*): Detect R3V8.
-
-2004-06-11  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (luna88k:OpenBSD:*:*): New.
-
-2004-03-12  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
-
-	* config.guess (m32r*:Linux:*:*): New case.
-	* config.sub: Handle m32rle.
-
-2004-03-12  Ben Elliston  <bje@wasabisystems.com>
-
-	From Jens Petersen  <petersen@redhat.com>:
-	* config.sub: Handle sparcv8.
-
-2004-03-03  Ben Elliston  <bje@wasabisystems.com>
-
-	From Tom Smith <smith@cag.lkg.hp.com>:
-	* config.guess: Version suffixes are equally significant on Tru64
-	V4.* and V5.*, so do not ignore them on V5.*.  Handle a version
-	prefix of "P" (patched kernel).
-
-2004-02-23  Tal Agmon  <Tal.Agmon@nsc.com>
-
-	* config.sub: Add support for National Semiconductor CRX target.
-
-2004-02-16  Thorsten Glaser  <x86@ePost.de>
-
-	* config.guess (*:MirBSD:*:*, macppc:MirBSD:*:*): Handle.
-	* config.sub: Handle -mirbsd*.
-
-2004-02-16  Brad Smith  <brad@comstyle.com>
-
-	* config.guess: Recognize OpenBSD on AMD64 and CATS hardware.
-
-2004-02-11  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.sub (abacus): Add.
-
-2004-02-11  Galit Heller  <Galit.Heller@nsc.com>
-
-	* config.sub: Add support for National Semiconductor CR16C target.
-
-2004-02-02  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess (*:ekkoBSD:*:*): Handle.
-	* config.guess: Handle -ekkobsd*.
-
-2004-01-30  Ben Elliston  <bje@wasabisystems.com>
-
-	* NEWS: Remove.
-
-2004-01-24  Ben Elliston  <bje@wasabisystems.com>
-
-	From Brett E. Wynkoop <wynkoop@wynn.com>:
-	* config.guess (m68k:machten:*:*): Handle.
-
-2004-01-20  Jeroen Ruigrok van der Werven  <asmodai@dragonflybsd.org>
-
-	* config.guess: Fix DragonFly entry to really work.
-
-2004-01-05  Ben Elliston  <bje@wasabisystems.com>
-	    Joachim Schmitz  <schmitz@hp.com>
-
-	* config.guess: Handle NSR-? to accept any CPU type.
-
-2004-01-05  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.sub: Handle amd64-*.
-
-2003-11-20  Kristian Van Der Vliet  <vanders@liqwyd.com>
-
-	* config.guess (i*86:syllable:*:*): New.
-	* config.sub (-syllable*): Likewise.
-
-2003-11-18  Jeroen Ruigrok van der Werven  <asmodai@dragonflybsd.org>
-
-	* config.guess (*:DRAGONFLY:*:*): New.
-	* config.sub (-dragonfly*): Likewise.
-
-2003-11-03  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess: Detect OpenBSD on Pegasos I hardware.
-
-2003-11-03  Jim Tison  <jtison@us.ibm.com>
-	    Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* config.sub (tpf, -tpf*): Recognize.
-
-2003-10-16  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess (5000:UNIX_System_V:4.*:*): Detect the Fujitsu
-	VPP5000.  Reported by Naoki Yoshida <naoki@th.nao.ac.jp>.
-
-2003-10-16  Bernardo Innocenti  <bernie@develer.com>
-
-	* config.sub (linux-uclibc, uclinux-uclibc): Handle.
-
-2003-10-16  Ben Elliston  <bje@wasabisystems.com>
-
-	Reported by Todd Humphrey <thump@isl.net>:
-	* config.guess (*:OS400:*:*): Detect OS/400 on AS/400 machines.
-	* config.sub (os400, -os400*): Recognise.
-
-2003-10-07  Robert Millan  <robertmh@gnu.org>
-	    Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess (*:GNU/*:*:*): New. Generic check for systems with
-	GNU libc and userland (matches GNU/KFreeBSD and GNU/KNetBSD).
-	(*:GNU/FreeBSD:*:*): Remove, superceeded by GNU/*.
-	* config.sub: Handle -knetbsd*.
-
-2003-10-07  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess (3[345]??:*:4.0:3.0): Expand pattern to match 3526.
-
-2003-10-03  Chris Demetriou  <cgd@broadcom.com>
-
-	* config.sub (mipsisa64r2*): Add.
-
-2003-10-03  Ben Elliston  <bje@wasabisystems.com>
-	    Joachim Schmitz  <schmitz@hp.com>
-
-	* config.guess (NSR-*:NONSTOP_KERNEL:*:*): Recognise NSR-Y.
-
-2003-08-18  Andreas Krennmair <krennmair@lizenzfrei.at>
-
-	* config.guess: Add detection for diet libc.
-	* config.sub: Handle linux-dietlibc.
-
-2003-07-29  Ben Elliston  <bje@wasabisystems.com>
-
-	* NEWS: New draft file.
-
-2003-07-17  Ben Elliston  <bje@wasabisystems.com>
-
-	Reported as missing by Doug Evans:
-	* config.sub: Handle iq2000 and iq2000-*.
-
-2003-07-15  Alexandre Oliva  <aoliva@redhat.com>
-
-	* config.sub: Add am33_2.0 machine.
-
-2003-07-04  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.sub: Handle -kfreebsd*. From Robert Millan.
-
-2003-07-02  Robert Millan  <rmh@debian.org>
-
-	* config.guess (*:GNU/FreeBSD:*:*): Prefix GNU/FreeBSD triplet
-	with a "k" to indicate the system is based on FreeBSD's kernel and
-	not the whole OS.
-
-2003-06-17  Ben Elliston  <bje@wasabisystems.com>
-
-	From by Stephen Thomas <stephen.thomas@superh.com>:
-	* config.guess (sh64*:*:*:Linux): New case.
-	* config.sub (sh64): Map to sh64-unknown.
-
-2003-06-17  Ben Elliston  <bje@wasabisystems.com>
-
-	Reported by Dennis Grevenstein <dennis@pcde.inka.de>:
-	* config.guess (sei:*:*:seiux): Detect SEIUX running on MIPS-based
-	workstations manufactured by Sumitomo Electric Industries.
-	* config.sub (sei, -sei*): Handle.
-
-2003-06-13  Svein E. Seldal  <Svein.Seldal@solidas.com>
-
-	* config.sub (c4x, tic4x): Re-arrange and fix.
-
-2003-06-12  Bernard Giroud  <bernard.giroud@creditlyonnais.ch>
-
-	* config.guess (Alpha*:OpenVMS:*:*): New entry.
-
-2003-06-06  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.sub: Recognise pentium3 and pentium4.  From Kelley Cook
-	<kcook34@ford.com>.
-
-2003-06-06  Douglas B Rupp  <rupp@gnat.com>
-
-	* config.guess: Recognize Interix 4.
-
-2003-06-04  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess (set_cc_for_build): Allow insecure temporary
-	filenames to be generated on systems without mktemp(1) or $RANDOM,
-	but issue a warning to standard error.  Suggested by Hans-Peter
-	Nilsson.
-
-2003-05-24  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.sub: Handle $os values of -nx6 and -nx7.
-
-2003-05-22  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess: Detect ICL NX version 6 running on ICL/Fujitsu DRS
-	6000 machines. Reported by <alpha1@alpha1teclabs.com>.
-
-2003-05-19  Hans-Peter Nilsson  <hp@axis.com>
-
-	* config.guess (cris:Linux:*:*): New case.
-
-2003-05-09  Ben Elliston  <bje@wasabisystems.com>
-
-	* config.guess (SHG2:*:4.0:3.0): Handle NCR System V UNIX machine.
-	Reported by Raj Mannar <rajman@ureach.com>.
-
-2003-05-09  Andreas Jaeger  <aj@suse.de>
-
-	* config.sub (maybe_os): Add alias amd64 for x86_64.
-
-2003-05-09  Ben Elliston  <bje@wasabisystems.com>
-
-	From Robert Millan <zeratul2@wanadoo.es>
-	* config.guess (*:GNU/FreeBSD:*:*): Handle.
-
-2003-02-22  Ben Elliston  <bje@redhat.com>
-
-	Revert the following due to the demise of MicroBSD:
-
-        2003-01-03  Scott Kamp  <dingo@microbsd.net>
-	* config.guess: Detect MicroBSD operating system on i386 CPUs.
-	* config.sub: Handle aliases for such.
-
-2003-02-03  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle -kaos*.
-
-2003-02-03  Charles Lepple  <clepple@ghz.cc>
-
-	* config.sub: Handle TI tic55x-* and tic6x-* targets.
-
-2003-01-30  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (alpha:OSF1:*:*): Use /usr/sbin/psrinfo -v to
-	detect the Alpha CPU type, not an assembled program requiring
-	$CC_FOR_BUILD.
-
-2003-01-28  Nick Clifton  <nickc@redhat.com>
-
-	* config.sub: Add sh2e support.
-
-2003-01-22  Fabio Alemagna  <falemagn@aros.org>
-
-	* config.sub: Handle -aros*.
-
-2003-01-10  Stuart Hastings  <stuart@apple.com>
-
-	* config.guess: Make i686 the default for Darwin/x86.
-
-2003-01-03  Scott Kamp  <dingo@microbsd.net>
-
-	* config.guess: Detect MicroBSD operating system on i386 CPUs.
-	* config.sub: Handle aliases for such.
-
-2003-01-02  Ben Elliston  <bje@redhat.com>
-
-	From Wendy Palm <wendyp@cray.com>:
-	* config.guess (CRAY*T3D:*:*:*): Remove.
-	(*:UNICOS/mp:*:*): New system.
-	* config.sub (t3d): Remove.
-	(nv1): Add.
-
-2003-01-02  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Fix mipstx39-* and mipstx39el-* handling (typo).
-
-2003-01-02  Ben Elliston  <bje@redhat.com>
-
-	From Dmitry Diky <diwil@mail.ru>:
-	* config.sub (basic_machine): Add msp430 and msp430-*.
-
-2003-01-02  Chris Demetriou  <cgd@broadcom.com>
-
-	* config.sub (mipsisa32r2*): Add.
-
-2002-12-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (set_cc_for_build): Rework to do more secure tmp
-	directory creation.  Remove temporary files and tmp directory on
-	exit; remove redundant rm(1) and rmdir(1) commands throughout.
-
-2002-12-17  John David Anglin  <dave@hiauly1.hia.nrc.ca>
-
-	* config.guess (hppa*): Remove tmpdir when CC_FOR_BUILD is set.
-
-2002-12-11  Ben Elliston  <bje@redhat.com>
-	    Dave Anglin  <dave.anglin@nrc.ca>
-	    Ross Alexander  <ross.alexander@uk.neceur.com>
-
-	* config.guess (*:HP-UX:*:*): Detect 64-bit compiler.
-
-2002-11-30  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* config.sub (-nto-qnx*): New $os pattern.
-	(-nto*): Preserve OS version when converting to -nto-qnx*.
-
-2002-11-30  Ben Elliston  <bje@redhat.com>
-
-	From Stefan Neis <neis@kobil.de>:
-	* config.guess: Reorder entries so that hosts with a different
-	operating system won't be misdetected as System V simply because
-	their version number happens to be 3.2, 4.* or 5.  This is needed
-	for OS/2, at least, which is currently at version 4.52.
-
-2002-11-30  Ben Elliston  <bje@redhat.com>
-
-	From Joel Baker <lucifer@lightbearer.com>:
-	* config.guess: Append "-gnu" to triplet on Debian/NetBSD systems.
-	* config.sub: Recognise netbsd*-gnu*.
-
-2002-11-30  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
-
-	* config.guess (mips64:Linux:*:*): Recognize.
-	(mips:Linux:*:*): Recognize as mips-unknown-linux-gnu instead of
-	mips-pc-linux-gnu.
-
-2002-11-30  Douglas B Rupp  <rupp@gnat.com>
-
-	* config.guess: Make default Interix arch "i586".
-
-2002-11-30  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Add "SDS2" to machines that run NCR System V UNIX.
-	Reported by <agustinsanchez@prodigy.net.mx>.
-
-2002-11-13  Ben Elliston  <bje@redhat.com>
-
-	* config.sub (windows32): Remove bad idea.
-
-2002-11-13  Werner Lemberg  <wl@gnu.org>
-
-	* config.sub: Add -mks*.
-
-2002-11-13  Jeff Conrad  <jeff_conrad@msn.com>
-
-	* config.guess: Detect MKS running on Windows {95,98,NT}.
-
-2002-11-13  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect PowerMAX OS on Concurrent Synergy machines.
-	Reported by Sam Williams <sam.williams@hs.utc.com>.
-
-2002-11-08  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect m68k-diab-dnix.
-	* config.sub: Handle -dnix*.
-
-2002-10-21  Paul Eggert  <eggert@twinsun.com>
-
-	* config.guess (CC_FOR_BUILD): Put "-o outputfile" before any
-	operands.  POSIX 1003.1-2001 says that "c99 file.c -o file" is not
-	supported; you must put all options before all operands, e.g. "c99
-	-o file file.c".
-
-2002-09-05  Svein E. Seldal  <Svein.Seldal@solidas.com>
-
-	* config.sub: Add tic4x target.
-
-2002-09-03  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect NSR-D machines for nsr-tandem-nsk.
-	Reported by <Duncan_Stodart@insession.com>.
-
-2002-08-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Concurrent PowerMaxion.
-	Reported by Lloyd Goldston <lloyd.goldston@sed.redstone.army.mil>.
-
-	* config.guess: Detect Convergent 3B1 machines (running AT&T UNIX).
-	Reported by Bruce Lilly <blilly@erols.com>.
-
-2002-08-22  Urs Janßen <urs@akk.org>
-
-	* config.sub: Cosmetic whitespace fixes.
-
-2002-08-20  Phil Edwards  <pme@gcc.gnu.org>
-
-	* config.sub: Accept athlon_* patterns as synonyms for i686-pc.
-
-2002-08-20  Ben Elliston  <bje@redhat.com>
-
-	From Chris Demetriou <cgd@broadcom.com>:
-	* config.sub (sb1, sb1el): Treat these machines as
-	mipsisa64sb1-unknown and mipsisa64sb1el-unknown, respectively.
-
-2002-08-19  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Super-UX on NEC SX-6.
-	Reported by Joachim Worringen <joachim@ccrl-nece.de>.
-
-2002-08-16  Eric Christopher  <echristo@redhat.com>
-
-	* config.sub (mipsisa64sr71k*, mips64vr*): Add.
-
-2002-07-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect alphaev7.  Reported by urs@akk.org.
-
-2002-07-03  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Use umask to create temporary directly safely.
-	Using mkdir and chmod introduces a race.
-
-2002-07-03  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect ICL NX version 7 running on ICL/Fujitsu DRS
-	6000 machines. Reported by Henrik N. Spuur Hansen <hnsh@mera.dk>.
-
-2002-07-03  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Execute $dummy, not ./$dummy, throughout.
-
-	* config.guess (set_cc_for_build): Create a chmod 700 directory in
-	/tmp (or $TMPDIR, if set) to store temporary files generated for
-	use by the C compiler. This should resist the /tmp symbolic link
-	race vulnerability reported by Lawrence Teo.
-
-2002-07-03  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle freebsd*. From Bruno Haible.
-
-2002-07-01  Bruno Haible  <bruno@clisp.org>
-
-	* config.guess: For FreeBSD systems using glibc, add suffix "-gnu".
-	* config.sub: Accept freebsd-gnu system name.
-
-2002-06-21  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* config.sub: Add support for sh[12], sh3e, sh[1234]le, sh3ele,
-	shle, sh[1234]le, sh3ele.
-
-2002-06-21  Dave Brolley  <brolley@redhat.com>
-
-	* config.sub: Add support for frv.
-
-2002-06-20  Chris Demetriou  <cgd@broadcom.com>
-
-	* config.sub: Add Broadcom SiByte SB-1 processor support
-	(mipsisa64sb1, mipsisa64sb1el).  Add little-endian variants of
-	mipsisa32 and mipsisa64 (mipsisa32el and mipsisa64el,
-	respectively).  Sort MIPS entries and split their lines a bit more
-	logically.  Make sure that all of the MIPS entries in the "without
-	company name" target list are echoed in the "with company name"
-	list.
-
-2002-06-19  Denis Chertykov  <denisc@overta.ru>
-
-	*  (config.sub): Add ip2k support.
-
-2002-06-19  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* config.sub: Accept sh64le and sh64le-*.
-
-2002-05-29  Paul Eggert  <eggert@twinsun.com>
-
-	* config.guess: Don't use egrep, as POSIX 1003.1-2001 no longer
-	requires egrep.  Use grep instead.
-
-2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
-
-	* config.sub: Add DLX support.
-
-2002-05-22  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* config.guess: Add case for "armeb" in NetBSD section.
-	* config.sub: Allow "armeb" as a valid CPU type.
-
-2002-05-16  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect PowerMAX OS on Concurrent Night Hawk.
-	* config.sub: Handle -powermax*.
-
-2002-05-02  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Add "4400" to machines that run NCR System V UNIX.
-
-2002-04-25  Mark Mitchell <mark@codesourcery.com>
-
-	* config.sub (*-wrs-windiss): New targets.
-
-2002-03-20  Keith Thompson  <kst@sdsc.edu>
-
-	* config.guess (ia64:Linux:*:*): Output "ia64-unknown-linux-gnu".
-
-2002-03-20  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (set_cc_for_build): Add c99 to list of candidates.
-
-2002-03-12  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* config.guess: Add OS release to QNX config strings.
-
-2002-03-06  Chris Demetriou  <cgd@broadcom.com>
-
-	* config.sub: Add support for mipsisa64.
-
-2002-03-04  Ben Elliston  <bje@redhat.com>
-
-	From Kevin Ryde <user42@zip.com.au>:
-	* config.sub (sparclet-*-*): Accept any vendor.
-	(sparc86x): Expand to sparc86x-unknown-none.
-
-2002-03-04  Adrian Bunk  <bunk@fs.tum.de>
-
-	* config.guess (*:NetBSD:*:*): Use "sysctl -n hw.machine_arch"
-	instead of "uname -p" to get UNAME_MACHINE_ARCH.
-
-2002-02-22  Ben Elliston  <bje@redhat.com>
-	    Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-
-	* config.sub (case $basic_machine): Add mips and clean up other
-	Linux specific cases. Now `config.sub mips` yields mips-unknown-elf.
-
-2002-02-22  Ben Elliston  <bje@redhat.com>
-
-	From Kevin Ryde <user42@zip.com.au>:
-	* config.sub (sv1-*, ymp-*, c90-*): Preserve CPU type in output.
-	(t3d-*, t3e-*): Canonicalize to alpha and alphaev5.
-
-2002-02-18  Jim Meyering  <meyering@lucent.com>
-
-	* config.guess: Don't use `head -1'; it's no longer portable.
-	Use `sed 1q' instead.
-
-2002-02-15  Ben Elliston  <bje@redhat.com>
-
-	* config.sub (rtmk*, rtmk-nova*): Recognise.
-	From Johan Rydberg <jrydberg@rtmk.org>.
-
-2002-02-15  Wendy Palm  <wendyp@cray.com>
-
-	* config.guess (CRAY*X-MP:*:*:*, CRAY-2:*:*:*): Remove, as we know
-	they no longer exist in the field.
-	* config.sub (cray2, xmp): Likewise.
-	(cray, ymp, [cj]90-cray): basic_machine is now j90-cray.
-	(sv1-cray, cray-t3e, cray-t3d, cray-t90): New basic machine patterns.
-
-2002-02-15  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Accept m68060.
-
-2002-02-12  Ben Elliston  <bje@redhat.com>
-
-	* config.sub (sx?-*, superux*): New basic_machine and os.
-	From Len Makin <Len.Makin@csiro.au>.
-
-2002-02-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Set LC_ALL, not LANG, when running ld --help.
-	From Nicola Pero <nicola@brainstorm.co.uk>.
-
-2002-02-01  Ben Elliston  <bje@redhat.com>
-
-	* config.sub (sh64, sh64-*): Add new machine.
-
-2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
-
-	* config.sub: Add support for or32.
-
-2002-01-26  Andy Olson  <andrew.olson@lmco.com>
-
-	* config.guess (*:QNX:*:*): Report i386-* rather than x86pc-*.
-	Discussed with and approved by <peterv@qnx.com>.
-
-2002-01-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (i*86:Linux:*:*): Specifically handle the Intel icc
-	compiler, which doesn't define __ELF__.  Submitted by Erik Lindahl
-	<lindahl@stanford.edu>.
-
-2002-01-22  Nicola Pero  <nicola@brainstorm.co.uk>
-
-	* config.guess (i*86:Linux:*:*): Fixed: export LANG=C before
-	running ld so that linker output can be assumed to be in English,
-	and it works with non-default locales.
-
-2002-01-10  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Update Per Bothner's mail address.
-
-2002-01-02  Douglas B. Rupp  <rupp@gnat.com>
-
-	* config.sub (alpha64*): New basic_machine.
-
-2002-01-02  Ben Elliston  <bje@redhat.com>
-
-	From Sigbjorn Skjaeret <cisc@c2i.net>.
-	* config.guess: Add detection for MorphOS.
-	* config.sub: Handle morphos*.
-
-2002-01-02  H.J. Lu  <hjl@gnu.org>
-
-	* config.guess (mips:Linux:*:*): Undef CPU, mips and mipsel first.
-
-2001-12-13  Douglas B. Rupp  <rupp@gnat.com>
-
-	* config.guess: Recognize x86 Interix version 3.
-
-2001-12-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (i*86:Linux:*:*): Minor simplification: have the
-	preprocessor emit shell assignments and just eval the output.
-
-2001-12-12  H.J. Lu  <hjl@gnu.org>
-
-	* config.guess (mips:Linux:*:*): Re-work.
-
-2001-12-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (i*86:Linux:*:*): Speed up detection of x86 Linux
-	systems by using just the C preprocessor rather than assembling
-	and linking a final executable.
-
-2001-12-12  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* config.guess: Simplify assignment of machine for NetBSD targets,
-	and make it match the convention that NetBSD uses.  List all
-	NetBSD architectures that require "elf" at the end of the OS name.
-
-2001-12-10  Lars Brinkhoff  <lars@nocrew.org>
-
-	* config.sub: Recognize a few PDP-10 aliases.
-
-2001-12-03  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise the Nucleus family of operating systems.
-	From <Takahiko_Kawasaki@cii.csk.co.jp>.
-
-2001-12-03  Bob Wilson  <bwilson@tensilica.com>
-
-	* config.sub: Add support for Xtensa targets.
-
-2001-11-30  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise NEC v850e. From Miles Bader
-	<miles@lsi.nec.co.jp>.
-
-2001-11-26  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (nsr-tandem-nsk): Detect all known NSR processor
-	types. Contributed by Kjetil Barvik <kjetil.barvik@bbs.no>.
-
-2001-11-16  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Accept "-atheos*" as a valid OS.
-	From Taco Witte <T.C.Witte@phys.uu.nl>.
-
-2001-11-08  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle 3487/3488 machines for NCR SysV UNIX.
-	Contributed by Melvin M. Bagaforo <mbagaforo@makro.com.ph>.
-
-2001-11-07  Adrian von Bidder  <avbidder@acter.ch>
-
-	* config.sub: Accept "-uclinux*" as a valid OS.
-
-2001-11-07  D.J. Barrow  <djbarrow@de.ibm.com>
-
-        * config.sub: Added S/390 31 and 64 bit target.
-
-2001-11-06  John Marshall  <jmarshall@acm.org>
-
-	* config.sub: Accept "-palmos*" as a valid OS.
-
-2001-11-07  Geoffrey Keating  <geoffk@redhat.com>
-
-	* config.sub: Change 'stormy16' to 'xstormy16' in the two places
-	it appears.
-
-2001-10-05  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Add "SKA40" as a machine type for NCR SysV UNIX.
-	From Rudi Heitbaum <rheitbaum@tattersalls.com.au>.
-
-2001-10-05  Rodney Brown  <rbrown64@csc.com.au>
-
-	* config.guess (9000/[34678]??:HP-UX:*:*): Unconditionally try
-	/usr/bin/getconf which is available on HP-UX 10.20. Reindent.
-
-2001-10-04  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle viac3 as an i586-class CPU.
-
-	* config.sub: Handle simso-wrs (Wind River's VxWorks Solaris
-	simulator target). From dpovey@dstc.qut.edu.au.
-
-2001-09-14  H.J. Lu  <hjl@gnu.org>
-
-	* config.sub: Support avr-vendor-*.
-
-2001-09-13  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (*-*-openbsd): Reorganise and clean up.
-	Contributed by brad@openbsd.org.
-
-2001-09-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (sparc*-*-netbsd): Properly match 32-bit NetBSD/sparc64
-	as sparc-unknown-netbsd. From Matthew Green <mrg@eterna.com.au>.
-
-2001-09-07  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Add mipseb-* alias (whoops).
-
-2001-09-04  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Add mipseb alias.
-
-2001-09-04  Eric Christopher  <echristo@redhat.com>
-	    Jason Eckhardt  <jle@redhat.com>
-
-	* config.sub: Add support for mipsisa32.
-
-2001-09-04  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Move eval $set_cc_for_build in most cases, to
-	prevent this script fragment from cloberring a previously
-	constructed C program in $dummy.c.
-
-2001-08-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect AtheOS on x86 systems.
-	Based on info provided by Taco Witte <tcwitte@wish.net>.
-
-2001-08-23  Geoffrey Keating  <geoffk@redhat.com>
-
-	* config.sub: Add stormy16-elf.
-
-2001-08-21  matthew green  <mrg@eterna.com.au>
-
-	* config.guess (sparc*:NetBSD:*): Use $MACHINE_ARCH, not $MACHINE.
-
-2001-08-13  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle complete system name for elxsi.
-	From Zack Weinberg <zackw@panix.com>.
-
-2001-08-09  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Alpha ev68 on OSF/1 and Linux.
-	From Ken Whaley <ken@believe.com>.
-
-2001-08-04  Darrell Hamilton  <Darrell_Hamilton@labcorp.com>
-
-	* config.guess: Unisys places the host id in ${UNAME_SYSTEM}
-	which is too unique to flag this system.  Detect it with *
-	instead.
-
-2001-08-02  Alan Modra  <amodra@bigpond.net.au>
-
-	* config.sub: Sort basic cpu patterns.  Combine hppa patterns.
-
-2001-08-01  Alan Modra  <amodra@bigpond.net.au>
-
-	* config.sub: Recognise powerpc64, powerpc64le, ppc64 variations.
-
-2001-07-31  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Stratus VOS operating system.
-	* config.sub: Handle aliases for such.
-
-2001-07-30  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect STOP operating system on x86 CPUs.
-	From Hans Edwards <Hans.Edwards@getronicsgov.com>.
-
-2001-07-27  Niibe Yutaka  <gniibe@m17n.org>
-
-        * config.sub: Recognize sh3eb and sh4eb (big endian) aliases.
-
-2001-07-19  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Linux on the PPC64 architecture.
-
-2001-07-12  Keith Thompson  <kst@sdsc.edu>
-
-	* config.guess: Strip trailing sub-version number from
-	$UNAME_RELEASE on Cray YMP or Cray [A-Z]90 models.
-
-2001-07-09  Mark Klein  <mklein@dis.com>
-
-	* config.guess: Update MPE/iX to handle A and N class HPe3000.
-
-2001-07-02  Graham Stott  <grahams@redhat.com>
-
-	* config.sub (basic_machine): Fix typo for mips64vr5000el.
-
-2001-06-29  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Remove stale libc1 tests on PowerPC Linux.
-
-2001-06-29  John Wolfe  <jlw@sco.com>
-
-	* config.guess: Correct UnixWare 7 and Open UNIX 8.0 change;
-	test for i586 must be a string that ends with "Pentium".
-
-2001-06-28  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: On Alpha Linux, use /proc/cpuinfo to determine
-	the CPU model, rather than assembling a small test program.
-
-2001-06-27  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Do not unconditionally run the script fragment
-	to set $CC_FOR_BUILD. Put the script in the shell variable
-	$set_cc_for_build and only evaluate it before $CC_FOR_BUILD is
-	referenced. (Poor man's function inlining!)
-
-	In future, the goal will be to reduce the dependence on a C
-	compiler to detect system types by utilising other means.
-
-2001-06-26  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: On MIPS Linux, use /proc/cpuinfo to determine
-	the endian mode of the CPU, rather than compiling and running
-	a small C program.
-
-2001-06-12  John Wolfe  <jlw@sco.com>
-
-	* config.guess: Standardize triplet for UnixWare 7 and Open
-	UNIX 8.0, improve processor detection and maintain "sysv5"
-	prefix on third segment.
-
-2001-06-08  Christopher Faylor  <cgf@redhat.com>
-
-	* config.sub: Add support for Sun Chorus.
-
-2001-06-05  Tomislav Greguric  <greguric@stud.uni-frankfurt.de>
-
-	* config.guess: Add 2001 to copyright notice issued for -v.
-
-2001-06-01  Ben Elliston  <bje@redhat.com>
-
-	* config.guess (i*86:Linux:*:*): Examine the list of supported
-	targets, not the list of supported emulations when capturing
-	the output of "ld --help".  This causes problems on systems
-	where GNU ld is built with support for all targets. Adjust
-	cases in the switch accordingly.
-
-	* config.guess: Other small Linux cleanups. Remove unnecessary
-	logic for setting $VENDOR, since UNAME_MACHINE will always be
-	i*86 in this case.
-
-2001-05-30  Mo DeJong  <mdejong@redhat.com>
-
-	* config.sub: Handle windows32 and runtimes.
-
-2001-05-24  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Remove duplicate z8k entry.
-
-2001-05-11  Yaegashi Takeshi  <t@keshi.org>
-
-	* config.sub: Handle sh[34]-* and sh[34]eb-*.
-
-2001-05-09  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle z8k-coff.
-	From Christian Groessler <cpg@aladdin.de>.
-
-2001-04-20  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle sparcv9b.
-	From Dave Miller <davem@redhat.com>.
-
-	* config.guess: Detect PowerMAX OS on PowerPC.
-
-2001-04-20  Tyson Dowd  <trd@cs.mu.oz.au>
-	    Fergus Henderson  <fjh@cs.mu.oz.au>
-
-	* config.guess: Replace i?86 with i*86 to match newer Pentiums.
-	* config.sub: Likewise.
-
-2001-03-30  Peter Buckingham  <pbuckingham@lnxw.com>
-
-	* config.guess: Update LynxOS version numbers.
-
-2001-03-30  Alexandre Oliva  <aoliva@redhat.com>
-
-	* config.sub: Make sure to match an already-canonicalized
-	machine name (eg. mn10300-unknown-elf).
-
-2001-03-19  Philip Blundell  <philb@gnu.org>
-
-	* config.sub: Allow tic80 as machine type.  Allow company name for
-	h8500 and pj targets; add `unknown' component when canonicalising
-	h8500-*, pj-* and pjl-*.
-
-2001-03-16  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Linux on SPARC64.
-
-2001-03-14  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect ELF-based m68k Linux systems. Reported by
-	Michael Fedrowitz <michael.fedrowitz@informatik.uni-ulm.de>.
-
-2001-03-09  H.J. Lu  <hjl@gnu.org>
-
-	* config.sub: Recognize s390/s390x as valid $basic_machine.
-
-2001-03-05  Pavel Roskin  <proski@gnu.org>
-
-	* config.guess: Never use `rm' without `-f' since it may be
-	interactive.
-
-2001-02-24  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Match Linux x86 systems explicitly.  Allow unknown
-	architectures to fall through to the default case.
-
-2001-02-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: More Linux cleanup. Match more in the top-level
-	case statement and less by groking the output of ld.
-
-2001-02-16  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise [cjt]90-*. From Kevin Ryde.
-
-2001-02-13  David Edelsohn  <edelsohn@gnu.org>
-
-	* config.guess (ia64:AIX): New case.
-	(*:AIX): Expand AIX V4 case to include V5.  Remove unnecessary `H'
-	option from lsattr.  Check for string "POWER" with prepended space
-	to distinguish from PowerPC_POWER3.  Use ${UNAME_VERSION} instead
-	of assuming "4" to match the expanded case.
-
-2001-02-13  Kevin Ryde  <user42@zip.com.au>
-
-	* config.sub: Recognise t90, c90, j90 without -cray. Preserve t90
-	and j90--don't transform to c90.
-
-2001-02-13  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: More Linux cleanup.
-
-2001-02-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>
-
-	* config.guess: Add Linux target for S/390x.
-	* config.sub: Likewise.
-
-2001-02-13  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Rework detection of many Linux platforms, where
-	detection is straightforward.
-
-2001-01-31  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle hppa64-linux systems. From Alan Modra
-	<alan@linuxcare.com.au>.
-
-2001-01-29  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
-
-	* config.guess: Specifically identify 4.3BSD and 4.3BSD-Reno in
-	the original VAX UNIX detection logic based on the BSD define in
-	<sys/param.h>.
-
-2001-01-17  Pavel Roskin  <proski@gnu.org>
-
-	* config.sub: Removed cases that cannot match. Vendor changed
-	from "unknown" to "pc" for "mingw", "msdos" and "go32".
-
-2001-01-17  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect HI-UX on Hitachi SR8000 machines. It has
-	been difficult to discover what type of CPU is in this machine,
-	so we'll punt on hppa1.1 for now.
-
-2001-01-14  Pavel Roskin  <proski@gnu.org>
-
-	* config.guess: Don't use $version in the error message. Use
-	$timestamp instead. Minor changes in the error text.
-
-2001-01-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Delete $dummy.rel after compiling test programs on
-	PDP-10 systems whose compilers produce this output file. From Lars
-	Brinkhoff <lars@nocrew.org>.
-
-	* config.sub: Handle EMX on OS/2. From Pavel Roskin.
-
-2001-01-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect common kernels running on various PDP-10
-	architectures. Contributed by Lars Brinkhoff <lars@nocrew.org>.
-	* config.sub: Handle PDP-10.
-
-2001-01-10  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect LynxOS 3.x on PowerPC architectures.
-
-2001-01-07  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise openrisc-*-*.
-
-2000-12-21  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect HP-UX on IA-64 hosts.  From Jonathan
-	Thackray <jon@thackray.org>.
-
-2000-12-20  Pavel Roskin  <proski@gnu.org>
-
-	* config.sub: Handle mint with version number as recognized OS.
-	Contributed by Tomas Berndtsson <tomas@nocrew.org>.
-
-2000-12-20  Pavel Roskin  <proski@gnu.org>
-
-	* config.guess: Detect Fujitsu f700 machines.
-	* config.sub: Handle f700 and f700-fujitsu.
-
-2000-12-15  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect AIX version 5. Contributed by
-	Dan McNichol <mcnichol@austin.ibm.com>.
-
-	* config.sub: Accept f301 for Fujitsu machines.
-	Reported by Pavel Roskin <proski@gnu.org>.
-
-2000-12-07  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Add more detail to version information.
-	* config.guess: Likewise.
-
-2000-12-06  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Add --version option.
-	* config.guess: Likewise.
-
-2000-12-02  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Only append "elf" to "netbsd" for platforms that
-	have switched to the ELF object file format in recent history.
-	From Matthew Green <mrg@eterna.com.au>.
-
-2000-11-24  Nick Clifton  <nickc@redhat.com>
-
-	* config.sub: Add xscale as a recognised CPU name.
-
-2000-11-23  Ben Elliston  <bje@redhat.com>
-
-	Patches from Akim Demaille <akim@epita.fr>.
-	* config.sub (version): Rename from this ..
-	(timestamp): .. to this.
-	(usage): Replace --version with --time-stamp. Add additional help
-	and copyleft notice.
-	(time-stamp-start): Replace with "timestamp=".
-	* config.guess (version): Rename from this ..
-	(timestamp): .. to this.
-	(usage): Replace --version with --time-stamp. Add additional help
-	and copyleft notice.
-	(CC_FOR_BUILD): Rework this logic.
-	(time-stamp-start): Replace with "timestamp=".
-
-2000-11-21  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect EMX on OS/2. Reported by Ilya Zakharevich
-	<ilya@math.ohio-state.edu>.
-
-2000-11-16  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Use getconf(1) on HP-UX 11.x systems (when
-	available) to eliminate the need for compiling a small test
-	program. From Neil Schellenberger <nschelle@crosskeys.com>.
-
-2000-11-15  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Expand `power' to `power-ibm-aix' for consistency.
-	From Kevin Ryde.
-
-	* config.guess: Differentiate Cray T3D and T3E. From Kevin Ryde
-	<user42@zip.com.au>.
-
-2000-11-10  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Map pentiumpro and pentiumii aliases onto i686-pc.
-	From Kevin Ryde <user42@zip.com.au>.
-
-	* config.guess: Search for a working C compiler if CC_FOR_BUILD is
-	not specified. From Kevin Ryde.
-
-	* config.guess: Set CPU architecture to "hppa" by default, in case
-	tests fail to produce a result. From Kevin Ryde.
-
-2000-11-08  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect sparc-unknown-linux-gnu. Reported by Peter
-	Storkey <pstorkey@primex.com>.
-
-2000-11-02  Per Lundberg  <plundis@chaosdev.org>
-
-	* config.sub: Add support for the *-storm-chaos OS.
-
-2000-10-25  Ed Satterthwaite  <ehs@sibyte.com>
-
-	* config.sub: NexGen, not nexen, is the x86 CPU clone
-	manufacturer.
-
-2000-10-23  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect NonStop-UX on Compaq MIPS machines.
-	* config.sub: Handle aliases for mips-compaq-nonstopux.
-	From Tom Bates <tom.bates@compaq.com>.
-
-2000-10-12  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect GNU/Linux on HP PA-RISC systems.
-	From David Huggins-Daines <dhd@linuxcare.com>.
-
-2000-10-09  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Typo fix for sh{3,4} case.
-
-2000-10-08  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle 8-way NCR 4300s -- uname(1) returns 3446A.
-	From Ken Cormack <kcormack@acs.roadway.com>.
-
-2000-10-03  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Do not hold ld's output in a shell variable; feed
-	the output directly into the command pipline to avoid a limitation
-	in variable lengths in ash(1). From Pavel Roskin <proski@gnu.org>.
-
-2000-09-11  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle nsk*.
-
-2000-09-11  Philip Blundell  <philb@gnu.org>
-
-	* config.sub: Fix mistake in change of 2000-08-06.
-
-2000-09-05  Andreas Jaeger  <aj@suse.de>
-
-	* config.sub (maybe_os): Recognise AMD x86-64 as x86_64.
-	* config.guess: Detect x86_64-unknown-linux-gnu.
-
-2000-09-05  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle Tandem NSR-K machines.
-	Reported by Andres Junge <ajunge@adexus.cl>.
-
-2000-09-05  Paul Sokolovsky  <Paul.Sokolovsky@technologist.com>
-
-	* config.guess: Detect the PW32 POSIX-on-Win32 environment.
-	* config.sub: Handle pw32 aliases.
-
-2000-08-31  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Correctly detect Sony NEWS-OS 6.x.
-	From Kimio Ishii <ishii@sm.sony.co.jp>.
-
-2000-08-06  Philip Blundell  <philb@gnu.org>
-
-	* config.sub: Accept `-conix*' as a valid OS.  Accept `armv*' as a
-	valid CPU without a company name.
-
-2000-07-31  Mark Kettenis  <kettenis@gnu.org>
-
-	* config.guess: Restore detection of libc version for x86
-	Linux/GNU ELF systems, but fall back on tentative name based on ld
-	emulation.  Use i?86-pc-linux-gnu as tentative name since that's
-	the canonical name.
-
-2000-07-27  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Use "unknown" for the manufacturer field of Amiga
-	systems, not "cbm". Contributed by Ruediger Kuhlmann
-	<ruediger.kuhlmann@stud.uni-karlsruhe.de>.
-	* config.sub: Likewise.
-
-2000-07-24  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Plan 9.
-
-2000-07-06  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* config.sub: Recognise d30v as a valid basic_machine.
-
-2000-06-28  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise Motorola 68HC11/12 targets. From Stephane
-	Carrez <Stephane.Carrez@worldnet.fr>.
-
-2000-06-20  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise tic54x (Texas Instruments TMS320C54x) and
-	c54x (IBM C54XDSP). From Tim Wall <twall@cygnus.com>.
-
-2000-06-13  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Minix on x86 machines.
-	* config.sub: Recognise i286. From <michael@moria.de>.
-
-	* config.sub: Recognise sh3 and sh4 aliases. From Kazumoto Kojima
-	<kkojima@rr.iij4u.or.jp>.
-
-	* config.sub: Per Bothner is not the author.
-
-2000-06-10  Hans-Peter Nilsson  <hp@axis.com>
-
-	* config.sub (os): Recognize axis as manufacturer.
-	(basic_machine): Recognize cris and etrax* as cris-axis.
-
-2000-05-31  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Accept athlon as an i686 variant. From Philipp
-	Thomas <pthomas@suse.de>.
-
-2000-05-30  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Re-word some output.
-	* config.sub: Fix a syntax error introduced by yesterday's
-	changes. Correct a spelling mistake. From Steven G. Johnson
-	<stevenj@alum.mit.edu>.
-
-2000-05-02  Akim Demaille  <akim@epita.fr>
-
-	* config.guess: Add --help and --version options. Add Emacs hooks.
-	* config.sub: Likewise.
-
-2000-05-27  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle GNU/Linux on Hitachi SuperH. From Niibe
-	Yutaka <gniibe@chroot.org>.
-
-2000-05-19  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise hppa64 as a valid cpu type. From Jeff Law.
-
-2000-05-10  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Recognise bs2000-siemens as a basic_machine type.
-	From Jean-Frederic Clere <jfrederic.clere@fujitsu.siemens.se>.
-
-2000-05-07  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Mac OS X will never return "Mac OS" as a uname
-	value, so remove these cases and punt to the "Darwin" case.
-	From Wilfredo Sanchez <wsanchez@apple.com>.
-
-2000-04-30  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle Fujitsu UXP/DS. From Fu-Chuan Tsai
-	<fchtsai@ms23.hinet.net>.
-
-2000-04-26  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle an ld emulation of elf_i?86. From Bruce
-	Korb <bkorb@sco.com>.
-
-2000-04-22  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Do not differentiate FreeBSD systems that use the
-	ELF object file format. From David O'Brien <obrien@freebsd.org>.
-
-2000-04-22  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Siemens BS2000 machines. From Jean-Frederic
-	Clere <jfrederic.clere@fujitsu.siemens.se>.
-
-2000-04-22  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Fix a syntax error in the DG/UX test.
-
-2000-04-06  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Define _HPUX_SOURCE for the HP-UX test program.
-	From Bruno Haible <haible@ilog.fr>.
-
-2000-04-06  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Apple's Darwin operating system.
-	* config.sub: Handle an appropriate alias. From Assar Westerlund.
-
-2000-03-27  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect Ascend Embedded/OS, which is really BSDI.
-	From Assar Westerlund <assar@sics.se>.
-
-2000-03-20  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Detect the NonStop Kernel on Tandem
-	machines. Suggested by Kelly F. Hickel <kfh@mqsoftware.com>.
-	* config.sub: Handle nsr-tandem and -nsk aliases.
-
-2000-02-29  Peter van der Veen  <peterv@qnx.com>
-
-	* config.guess: Add support for QNX Neutrino.
-	* config.sub: Improve support for QNX Neutrino.
-
-2000-02-29  Ossama Othman  <ossama@ece.uci.edu>
-
-	* config.sub: Add support for QNX Neutrino.
-
-2000-02-24  Nick Clifton  <nickc@cygnus.com>
-
-	* config.sub: Support an OS of "wince".
-
-2000-02-15  Andrew Cagney  <cagney@cygnus.com>
-
-	* config.guess: Rewrite NetBSD code.  Return *-*-netbsdelf* for
-	ELF systems and *-*-netbsd* for all others.  Provide a guideline
-	for how to match a NetBSD tuple.
-
-2000-02-15  Richard Henderson  <rth@cygnus.com>
-
-	* config.guess (alpha-osf, alpha-linux): Detect ev67.
-	* config.sub: Accept alphaev6[78], alphaev8.
-
-2000-02-15  Philip Blundell  <philb@gnu.org>
-
-	* config.guess: Distinguish arm-*-linux-gnuoldld from
-	arm*-linux-gnu.
-
-2000-02-15  Ben Elliston  <bje@redhat.com>
-
-	* config.sub: Handle avr. From Denis Chertykov <denisc@overta.ru>.
-
-	* config.guess: Detect GNU/Linux on IBM S/390 machines.
-	* config.sub: Handle s390-*. From Adam J. Thornton
-	<adam@phoenix.princeton.edu>.
-
-	* config.guess: Detect MacOS X on PowerPC and other machines.
-	From Stephen G. Johnson <stephenj@gil-galad.mit.edu>.
-
-2000-02-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* config.sub: Recognize sv1-cray as a basic_machine type.
-
-2000-02-07  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Replace sub-minor system version number with an
-	`X' on certain Cray platforms. From Keith Thompson <kst@sdsc.edu>.
-
-	* config.sub: Add support for mmix and mmixware. From Hans-Peter
-	Nilsson <hp@bitrange.com>.
-
-2000-02-06  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Include <stdio.h> when compiling test programs
-	with a C++ compiler.  Function prototypes are mandatory in C++.
-	From Ossama Othman <othman@cs.wustl.edu>.
-
-	* config.guess: Fix a regression in PowerPC Linux detection.
-	From Franz Sirl.
-
-2000-02-03  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Handle versions of DJGPP's uname(1) command which
-	return the exact machine type and not just `pc'. From Laurynas
-	Biveinis <lauras@softhome.net>.
-
-	* config.guess: Import from autoconf source tree.
-	* config.sub: Likewise.
diff --git a/package/gnuconfig/Makefile b/package/gnuconfig/Makefile
deleted file mode 100644
index ca366a98bd..0000000000
--- a/package/gnuconfig/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-UPLOAD=ftp://ftp-upload.gnu.org/incoming/ftp/
-
-all:
-	@echo "Type 'make upload' to upload to the GNU FTP server."
-
-upload:
-	gpg --detach-sign config.guess
-	gpg --detach-sign config.sub
-	echo "directory: config" | gpg --clearsign > config.guess.directive.asc
-	cp config.guess.directive.asc config.sub.directive.asc
-	ftp -a -u $(UPLOAD) config.{guess,sub}{,.sig,.directive.asc}
-	rm config.{guess,sub}{.sig,.directive.asc}
-
-check:
-	cd testsuite && (sh config-sub.sh; sh config-guess.sh) && rm uname
diff --git a/package/gnuconfig/testsuite/.cvsignore b/package/gnuconfig/testsuite/.cvsignore
deleted file mode 100644
index e4dcdcfaf6..0000000000
--- a/package/gnuconfig/testsuite/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-uname
diff --git a/package/gnuconfig/testsuite/CVS/Entries b/package/gnuconfig/testsuite/CVS/Entries
deleted file mode 100644
index 31b14765cd..0000000000
--- a/package/gnuconfig/testsuite/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-/.cvsignore/1.1/Mon Sep 26 07:33:33 2005//
-/uname.in/1.1/Mon Sep 26 07:33:33 2005//
-/config-guess.data/1.38/Thu Sep 20 16:47:13 2007//
-/config-guess.sh/1.5/Thu Sep 20 16:47:13 2007//
-/config-sub.data/1.47/Tue Aug 21 18:37:33 2007//
-/config-sub.sh/1.3/Thu Sep 20 16:47:13 2007//
-D
diff --git a/package/gnuconfig/testsuite/CVS/Repository b/package/gnuconfig/testsuite/CVS/Repository
deleted file mode 100644
index 5337292add..0000000000
--- a/package/gnuconfig/testsuite/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-config/testsuite
diff --git a/package/gnuconfig/testsuite/CVS/Root b/package/gnuconfig/testsuite/CVS/Root
deleted file mode 100644
index 192e02e93c..0000000000
--- a/package/gnuconfig/testsuite/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@cvs.savannah.gnu.org:/cvsroot/config
diff --git a/package/gnuconfig/testsuite/config-guess.data b/package/gnuconfig/testsuite/config-guess.data
deleted file mode 100644
index 0d8210da6c..0000000000
--- a/package/gnuconfig/testsuite/config-guess.data
+++ /dev/null
@@ -1,34 +0,0 @@
-crisv32	2.6.6			Linux		ignored	crisv32-axis-linux-gnu
-frv	2.4.24			Linux		ignored	frv-unknown-linux-gnu
-3	2.3.3			XENIX		SysV	i386-pc-xenix
-2064	ignored			z/VM		ignored	s390-ibm-zvmoe
-amd64	1.5.12(0.116/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
-crayx1	2.5.20			UNICOS/mp	ignored	craynv-cray-unicosmp2.5.X
-NSE-N	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
-i386	ignored			VOS		ignored	i386-stratus-vos
-arm	ignored			RISCOS		ignored	arm-unknown-riscos
-arm	ignored			riscos		ignored	arm-unknown-riscos
-i586	5.0.0			skyos		ignored	i586-pc-skyos5.0.0
-i786-pc	ignored			windows32	ignored	i786-pc-mingw32
-or32	ignored			Linux		ignored	or32-unknown-linux-gnu
-x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
-x86	5.2			Interix		ignored	i586-pc-interix5.2
-ppc64	2.6.9-22		Linux		ignored	powerpc64-unknown-linux-gnu
-vax	2.6.15			Linux		ignored	vax-dec-linux-gnu
-i586	ignored			rdos		ignored	i586-pc-rdos
-pc98	7.0			FreeBSD		ignored	i386-unknown-freebsd7.0
-i586	1.0			SolidBSD	ignored	i586-unknown-solidbsd1.0
-i686	5.4-1-686		GNU/kFreeBSD	ignored	i686-unknown-kfreebsd5.4-gnu
-EM64T	5.2			Interix		ignored	x86_64-unknown-interix5.2
-amd64	5.2			FreeBSD		ignored	x86_64-unknown-freebsd5.2
-avr32	2.6.15			Linux		ignored	avr32-unknown-linux-gnu
-x86	6.0			Interix		ignored	i586-pc-interix6.0
-macppc	1.0			MirBSD		ignored	powerpc-unknown-mirbsd1.0
-authenticamd	6.0		Interix		ignored	x86_64-unknown-interix6.0
-SX-8	1.0			SUPER-UX	ignored	sx8-nec-superux1.0
-SX-7	1.0			SUPER-UX	ignored	sx7-nec-superux1.0
-xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu
-x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
-i386	1.0			MINGW		ignored	i386-pc-mingw32
-SX-8R	1.0			SUPER-UX	ignored	sx8r-nec-superux1.0
-i86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
diff --git a/package/gnuconfig/testsuite/config-guess.sh b/package/gnuconfig/testsuite/config-guess.sh
deleted file mode 100644
index 324f275e38..0000000000
--- a/package/gnuconfig/testsuite/config-guess.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004, 2005 Free Software Foundation, Inc.
-# Contributed by Ben Elliston <bje@gnu.org>.
-#
-# This test reads 5-tuples from config-guess.data: the components of
-# the simulated uname(1) output and the expected GNU system triplet.
-
-verbose=false
-export PATH=`pwd`:$PATH
-IFS="	" # tab
-
-run_config_guess ()
-{
-    rc=0
-    while read machine release system version triplet ; do
-	sed \
-	    -e "s,@MACHINE@,$machine," \
-	    -e "s,@RELEASE@,$release," \
-	    -e "s,@SYSTEM@,$system," \
-	    -e "s,@VERSION@,$version," < uname.in > uname
-	chmod +x uname
-	output=`sh ../config.guess 2>/dev/null`
-	if test $? != 0 ; then
-	    echo "FAIL: unable to guess $machine:$release:$system:$version"
-	    rc=1
-	    continue
-	fi
-	if test $output != $triplet ; then
-	    echo "FAIL: $output (expected $triplet)"
-	    rc=1
-	    continue
-	fi
-	$verbose && echo "PASS: $triplet"
-    done
-    return $rc
-}
-
-sed 's/		*/	/g' < config-guess.data | run_config_guess
-rc=$?
-if test $rc -eq 0 ; then
-  $verbose || echo "PASS: config.guess checks"
-else
-  test $rc -eq 1 && echo "Unexpected failures."
-fi
-
-exit $rc
diff --git a/package/gnuconfig/testsuite/config-sub.data b/package/gnuconfig/testsuite/config-sub.data
deleted file mode 100644
index 2a5e1f1ebc..0000000000
--- a/package/gnuconfig/testsuite/config-sub.data
+++ /dev/null
@@ -1,117 +0,0 @@
-arm-coff			arm-unknown-coff
-arm-elf				arm-unknown-elf
-sun3				m68k-sun-sunos4.1.1
-sun4 				sparc-sun-sunos4.1.1
-ibm				i370-ibm-aix
-i386-os2			i386-pc-os2
-os400				powerpc-ibm-os400
-mmix				mmix-knuth-mmixware
-mmix-elf			mmix-knuth-elf
-i386-linux			i386-pc-linux-gnu
-i386-netbsd			i386-pc-netbsd
-i386-openbsd			i386-pc-openbsd
-i386-freebsd			i386-pc-freebsd
-pc98-freebsd			i386-pc-freebsd
-i386-elf			i386-pc-elf
-i486-elf			i486-pc-elf
-i586-elf			i586-pc-elf
-i686-elf			i686-pc-elf
-i786-elf			i786-pc-elf
-amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2
-cris-linux			cris-axis-linux-gnu
-crisv32-linux			crisv32-axis-linux-gnu
-frv-linux			frv-unknown-linux-gnu
-djgpp				i586-pc-msdosdjgpp
-s390-ibm-zvmoe			s390-ibm-zvmoe
-xscale				xscale-unknown-none
-xscaleeb			xscaleeb-unknown-none
-xscaleel			xscaleel-unknown-none
-xbox				i686-pc-mingw32
-maxq				maxq-unknown-none
-maxq-elf			maxq-unknown-elf
-amd64-cygwin			x86_64-pc-cygwin
-x86_64-cygwin			x86_64-pc-cygwin
-sparc64-linux			sparc64-unknown-linux-gnu
-sparc64b-linux			sparc64b-unknown-linux-gnu
-bfin-elf			bfin-unknown-elf
-bfin				bfin-unknown-none
-arm-riscos			arm-unknown-riscos
-arm-unknown-riscos		arm-unknown-riscos
-i586-skyos			i586-pc-skyos
-m32c				m32c-unknown-none
-m32c-elf			m32c-unknown-elf
-ms1				mt-unknown-none
-ms1-elf				mt-unknown-elf
-mips64vr5900-elf		mips64vr5900-unknown-elf
-mips64vr5900el-elf		mips64vr5900el-unknown-elf
-mips64vr5900			mips64vr5900-unknown-elf
-mips64vr5900el			mips64vr5900el-unknown-elf
-sh64				sh64-unknown-none
-sh64-elf			sh64-unknown-elf
-openrisc-linux			or32-unknown-linux-gnu
-or32-linux			or32-unknown-linux-gnu
-sh-elf				sh-unknown-elf
-sh1-elf				sh1-unknown-elf
-sh2-elf				sh2-unknown-elf
-sh3-elf				sh3-unknown-elf
-sh4-elf				sh4-unknown-elf
-sh2a-elf			sh2a-unknown-elf
-sh4a-elf			sh4a-unknown-elf
-sh2e-elf			sh2e-unknown-elf
-sh3e-elf			sh3e-unknown-elf
-sh3eb-elf			sh3eb-unknown-elf
-sh4eb-elf			sh4eb-unknown-elf
-sheb-elf			sheb-unknown-elf
-shbe-elf			shbe-unknown-elf
-shle-elf			shle-unknown-elf
-sh1le-elf			sh1le-unknown-elf
-sh2le-elf			sh2le-unknown-elf
-sh3le-elf			sh3le-unknown-elf
-sh4le-elf			sh4le-unknown-elf
-sh3ele-elf			sh3ele-unknown-elf
-i386-haiku			i386-pc-haiku
-sparc-haiku			sparc-unknown-haiku
-powerpc-haiku			powerpc-unknown-haiku
-i386-pc-sco6			i386-pc-sco5v6
-i386-pc-sco5v6			i386-pc-sco5v6
-mt				mt-unknown-none
-mt-elf				mt-unknown-elf
-rdos				i386-pc-rdos
-i586-rdos			i586-pc-rdos
-i386-linux-newlib		i386-pc-linux-newlib
-mb-elf				mb-unknown-elf
-microblaze-elf			microblaze-unknown-elf
-i386-solidbsd			i386-pc-solidbsd
-amd64-kfreebsd5.4-gnu		x86_64-pc-kfreebsd5.4-gnu
-nios				nios-unknown-none
-nios2				nios2-unknown-none
-nios-elf			nios-unknown-elf
-nios2-elf			nios2-unknown-elf
-sparcv9v-elf			sparcv9v-unknown-elf
-sparc64v-elf			sparc64v-unknown-elf
-sparcv9v-solaris2.9		sparcv9v-unknown-solaris2.9
-sparc64v-solaris2.9		sparc64v-unknown-solaris2.9
-sh-toppers			sh-unknown-toppers
-spu				spu-unknown-elf
-spu-elf				spu-unknown-elf
-spu-linux			spu-unknown-linux-gnu
-avr32				avr32-unknown-none
-avr32-linux			avr32-unknown-linux-gnu
-xc16x				xc16x-unknown-none
-xc16x-elf			xc16x-unknown-elf
-sde-elf				mipsisa32-sde-elf
-mips-sde-elf			mips-sde-elf
-score				score-unknown-elf
-score-elf			score-unknown-elf
-sh5el-elf			sh5le-unknown-elf
-sh5el-netbsd			sh5le-unknown-netbsd
-fido-elf			fido-unknown-elf
-fido				fido-unknown-none
-xtensa-elf			xtensa-unknown-elf
-xtensa-linux			xtensa-unknown-linux-gnu
-xtensa_dc232b-linux		xtensa_dc232b-unknown-linux-gnu
-i386-drops1.0			i386-pc-drops1.0
-mep				mep-unknown-elf
-mep-elf				mep-unknown-elf
-mingw32ce			arm-unknown-mingw32ce	
-arm-mingw32ce			arm-unknown-mingw32ce
diff --git a/package/gnuconfig/testsuite/config-sub.sh b/package/gnuconfig/testsuite/config-sub.sh
deleted file mode 100644
index ab5d7ff667..0000000000
--- a/package/gnuconfig/testsuite/config-sub.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004, 2005 Free Software Foundation, Inc.
-# Contributed by Ben Elliston <bje@gnu.org>.
-#
-# This test reads pairs from config-sub.data: an alias and its
-# canonical triplet.  The config.sub scripts is invoked and the test
-# checks that the alias expands to the expected canonical triplet.
-
-verbose=false
-
-run_config_sub ()
-{
-    rc=0
-    while read alias canonical ; do
-	output=`sh ../config.sub $alias`
-	if test $output != $canonical ; then
-	    echo "FAIL: $alias -> $output, but expected $canonical"
-	    rc=1
-	else
-	    $verbose && echo "PASS: $alias"
-	fi
-    done < config-sub.data
-    return $rc
-}
-
-run_config_sub
-rc=$?
-if test $rc -eq 0 ; then
-    $verbose || echo "PASS: config.sub checks"
-else
-    test $rc -eq 1 && echo "Unexpected failures."
-fi
-
-exit $rc
diff --git a/package/gnuconfig/testsuite/uname.in b/package/gnuconfig/testsuite/uname.in
deleted file mode 100755
index d44d15f041..0000000000
--- a/package/gnuconfig/testsuite/uname.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# uname(1) simulator, inspired by Pavel Roskin.
-
-[ $# -ne 1 ] && exec sh $0 -s
-[ $1 = -m ] && echo "@MACHINE@" && exit 0
-[ $1 = -r ] && echo "@RELEASE@" && exit 0
-[ $1 = -s ] && echo "@SYSTEM@" && exit 0
-[ $1 = -v ] && echo "@VERSION@" && exit 0
-[ $1 = -p ] && echo "Pentium III(TM)-ISA/PCI"
diff --git a/package/gnuconfig/uname b/package/gnuconfig/uname
deleted file mode 100755
index 0627f8204c..0000000000
--- a/package/gnuconfig/uname
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# uname(1) simulator, inspired by Pavel Roskin.
-
-[ $# -ne 1 ] && exec sh $0 -s
-[ $1 = -m ] && echo 4400
-[ $1 = -r ] && echo 4.0
-[ $1 = -s ] && echo iainfo2
-[ $1 = -v ] && echo 3.0
-[ $1 = -p ] && echo "Pentium III(TM)-ISA/PCI"
-
-exit 0

From 9b4c7d88b61f70c07dae4dcb3864b17677b5a22e Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 14:10:36 +0000
Subject: [PATCH 0027/6849] gnuconfig: Remove GNU Hurd patch as it is no longer
 supported.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../patches/config.sub.gnuhurd-uclibc.patch   | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch

diff --git a/package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch b/package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch
deleted file mode 100644
index 6fcdf811f5..0000000000
--- a/package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: config.sub
-===================================================================
---- config.sub	(revision 20153)
-+++ config.sub	(working copy)
-@@ -121,6 +121,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  gnu*-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1237,6 +1238,7 @@
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -gnu*-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

From d5168539c5d56657e27c2c8940ef5ac069d68733 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 14:11:23 +0000
Subject: [PATCH 0028/6849] gnuconfig: Remove gnuconfig patch as it has been
 merged upstream.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../patches/config.xtensa.glob.patch          | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 package/gnuconfig/patches/config.xtensa.glob.patch

diff --git a/package/gnuconfig/patches/config.xtensa.glob.patch b/package/gnuconfig/patches/config.xtensa.glob.patch
deleted file mode 100644
index 4b37aa77f8..0000000000
--- a/package/gnuconfig/patches/config.xtensa.glob.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -rNdup config-orig/config.guess config/config.guess
---- config-orig/config.guess	2007-11-13 16:31:20.000000000 -0800
-+++ config/config.guess	2007-11-14 00:26:39.000000000 -0800
-@@ -954,8 +954,8 @@ EOF
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
- 	exit ;;
--    xtensa:Linux:*:*)
--    	echo xtensa-unknown-linux-gnu
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-diff -rNdup config-orig/config.sub config/config.sub
---- config-orig/config.sub	2007-11-13 16:31:20.000000000 -0800
-+++ config/config.sub	2007-11-14 00:48:37.000000000 -0800
-@@ -369,10 +369,14 @@ case $basic_machine in
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
- 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
--	| xstormy16-* | xtensa-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-diff -rNdup config-orig/testsuite/config-sub.data config/testsuite/config-sub.data
---- config-orig/testsuite/config-sub.data	2007-11-13 15:56:17.000000000 -0800
-+++ config/testsuite/config-sub.data	2007-11-14 00:31:22.000000000 -0800
-@@ -109,6 +109,7 @@ fido-elf			fido-unknown-elf
- fido				fido-unknown-none
- xtensa-elf			xtensa-unknown-elf
- xtensa-linux			xtensa-unknown-linux-gnu
-+xtensa_dc232b-linux		xtensa_dc232b-unknown-linux-gnu
- i386-drops1.0			i386-pc-drops1.0
- mep				mep-unknown-elf
- mep-elf				mep-unknown-elf

From 7fb5445d30cbad11b97ed14ae6dc686b85fe3af7 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 15:29:05 +0000
Subject: [PATCH 0029/6849] gnuconfig: Remove sh patch.

A similar patch appears to have been applied upstream.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuconfig/patches/config.sub.sh.patch | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 package/gnuconfig/patches/config.sub.sh.patch

diff --git a/package/gnuconfig/patches/config.sub.sh.patch b/package/gnuconfig/patches/config.sub.sh.patch
deleted file mode 100644
index c8727dff19..0000000000
--- a/package/gnuconfig/patches/config.sub.sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-gnuconfig seems intent on only supporting superfluous targets that don't
-represent any real hardware (such as sh2a LE). GCC in its infinite wisdom is
-also incapable of supporting tuning for other variants in a sensible fashion.
-
-As such, we still need to be able to support such useful targets as
-sh2a_nofpueb in order to not only get the byte order right, but also to
-support -m2a-nofpu tuning from the kernel (though we tend to do this through
--Wa,-isa= instead, as the binutils people do a much better job of not screwing
-up their config code every other day. Way to go config.gcc..).
-
-The fact that the sh variant matching is the ugliest out of any of the other
-architectures doesn't seem to deter GCC folk from their well thought out and
-brilliantly managed config target list.
-
-Index: config.sub
-===================================================================
-RCS file: /cvsroot/config/config/config.sub,v
-retrieving revision 1.356
-diff -u -r1.356 config.sub
---- config.sub	28 Jun 2007 06:56:43 -0000	1.356
-+++ config.sub	9 Jul 2007 17:38:48 -0000
-@@ -277,7 +277,7 @@
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -358,7 +358,7 @@
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \

From 3d299feb3a18ec0796d3ccfb190856a37810ff40 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 17:06:02 +0000
Subject: [PATCH 0030/6849] gnuconfig: Update config.{sub,guess} to 2011-02-02
 version.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuconfig/config.guess | 510 ++++++++++++++++-----------------
 package/gnuconfig/config.sub   | 239 ++++++++++-----
 2 files changed, 407 insertions(+), 342 deletions(-)

diff --git a/package/gnuconfig/config.guess b/package/gnuconfig/config.guess
index ced32b63a1..187cd54edd 100755
--- a/package/gnuconfig/config.guess
+++ b/package/gnuconfig/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-07-24'
+timestamp='2011-02-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-07-24'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,23 +140,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-	eval $set_cc_for_build
-	cat << EOF > $dummy.c
-	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
-	LIBC=uclibc
-	# endif
-	#else
-	LIBC=gnu
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -187,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -197,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -240,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -286,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -312,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -341,14 +328,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -392,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -478,8 +484,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -492,7 +498,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -549,7 +555,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -592,52 +598,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -657,7 +663,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -728,22 +734,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -767,14 +773,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -802,24 +808,30 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -849,196 +861,128 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-${LIBC}
+	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
-		exit ;;
-	esac
-	# This should get integrated into the C code below, but now we hack
-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1046,11 +990,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1067,7 +1011,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1082,7 +1026,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1110,10 +1054,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1148,8 +1095,18 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1162,7 +1119,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1182,10 +1139,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1211,11 +1168,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1225,6 +1182,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1252,6 +1212,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1267,6 +1237,9 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1312,13 +1285,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1333,6 +1306,9 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1355,11 +1331,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
@@ -1493,9 +1469,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/package/gnuconfig/config.sub b/package/gnuconfig/config.sub
index efbb230f47..0ef29b072e 100755
--- a/package/gnuconfig/config.sub
+++ b/package/gnuconfig/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2007-06-28'
+timestamp='2011-02-24'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2007-06-28'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,9 +124,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  gnu*-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -149,10 +154,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -167,10 +175,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -245,18 +253,21 @@ case $basic_machine in
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx | dvp \
+	| d10v | d30v | dlx | dsp16xx \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -269,28 +280,41 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -321,7 +345,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -330,14 +354,17 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -352,27 +379,30 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -394,7 +424,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -440,6 +470,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -448,10 +482,35 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -480,7 +539,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -519,6 +578,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -673,6 +736,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -684,6 +755,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -699,24 +773,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsEE* | ee | ps2)
-		basic_machine=mips64r5900el-scei
-		case $os in
-		    -linux*)
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
-	iop)
-		basic_machine=mipsel-scei
-		os=-irx
-		;;
-	dvp)
-		basic_machine=dvp-scei
-		os=-elf
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -806,6 +862,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -836,6 +898,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1032,17 +1102,14 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
+	# This must be matched before tile*.
+	tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
@@ -1119,6 +1186,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1157,7 +1228,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1204,9 +1275,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1227,10 +1301,11 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1239,10 +1314,10 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -gnu*-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1250,7 +1325,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1289,7 +1364,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1338,7 +1413,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1380,6 +1455,11 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1402,10 +1482,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1417,8 +1497,17 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1445,7 +1534,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1472,7 +1561,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1577,7 +1666,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)

From 74842f8026c3bb619731c565eadc050bb3ec4e15 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 17:15:32 +0000
Subject: [PATCH 0031/6849] gnuconfig: Update patches to apply to 2011-02-02
 version.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../patches/config.guess.uclibc.patch         | 137 +++++++-----------
 .../gnuconfig/patches/config.sub.ps2.patch    |  19 +--
 2 files changed, 61 insertions(+), 95 deletions(-)

diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/package/gnuconfig/patches/config.guess.uclibc.patch
index 69d88a35af..85f9b89661 100644
--- a/package/gnuconfig/patches/config.guess.uclibc.patch
+++ b/package/gnuconfig/patches/config.guess.uclibc.patch
@@ -1,11 +1,6 @@
-Index: config.guess
-===================================================================
-RCS file: /cvsroot/config/config/config.guess,v
-retrieving revision 1.366
-diff -u -r1.366 config.guess
---- config.guess	17 May 2007 06:28:53 -0000	1.366
-+++ config.guess	9 Jul 2007 17:32:18 -0000
-@@ -139,6 +139,23 @@
+--- config.guess
++++ config.guess
+@@ -140,6 +141,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -29,12 +24,25 @@ diff -u -r1.366 config.guess
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -833,28 +850,28 @@
- 	echo ${UNAME_MACHINE}-pc-minix
+@@ -872,33 +890,32 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+ 	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ 	fi
  	exit ;;
      avr32*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -49,8 +57,16 @@ diff -u -r1.366 config.guess
 +	echo crisv32-axis-linux-${LIBC}
  	exit ;;
      frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
-+    	echo frv-unknown-linux-${LIBC}
+-	echo frv-unknown-linux-gnu
++	echo frv-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#ifdef __dietlibc__
+@@ -909,13 +926,13 @@ EOF
+ 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -64,21 +80,12 @@ diff -u -r1.366 config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -877,7 +894,7 @@
- 		s: ::g
- 		p
- 	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- 	;;
-     mips64:Linux:*:*)
+     mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -900,16 +917,16 @@
- 		s: ::g
- 		p
- 	    }'`"
+@@ -934,10 +951,10 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
@@ -86,25 +93,9 @@ diff -u -r1.366 config.guess
 -	echo or32-unknown-linux-gnu
 +	echo or32-unknown-linux-${LIBC}
  	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -922,40 +939,40 @@
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+@@ -948,40 +965,40 @@ EOF
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -116,15 +107,19 @@ diff -u -r1.366 config.guess
 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
  	esac
  	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-${LIBC}
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
  	exit ;;
      sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      sh*:Linux:*:*)
@@ -135,6 +130,9 @@ diff -u -r1.366 config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
+     tile*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-tilera-linux-gnu
+ 	exit ;;
      vax:Linux:*:*)
 -	echo ${UNAME_MACHINE}-dec-linux-gnu
 +	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
@@ -143,36 +141,9 @@ diff -u -r1.366 config.guess
 -	echo x86_64-unknown-linux-gnu
 +	echo x86_64-unknown-linux-${LIBC}
  	exit ;;
-     xtensa:Linux:*:*)
--    	echo xtensa-unknown-linux-gnu
-+    	echo xtensa-unknown-linux-${LIBC}
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -970,20 +987,22 @@
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		;;
- 	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
- 		exit ;;
- 	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
- 		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
- 		exit ;;
- 	esac
-+	# This should get integrated into the C code below, but now we hack
-+	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
diff --git a/package/gnuconfig/patches/config.sub.ps2.patch b/package/gnuconfig/patches/config.sub.ps2.patch
index ac8dbc68ad..57d09dcf2b 100644
--- a/package/gnuconfig/patches/config.sub.ps2.patch
+++ b/package/gnuconfig/patches/config.sub.ps2.patch
@@ -1,11 +1,6 @@
-Index: config.sub
-===================================================================
-RCS file: /cvsroot/config/config/config.sub,v
-retrieving revision 1.356
-diff -u -r1.356 config.sub
---- config.sub	28 Jun 2007 06:56:43 -0000	1.356
-+++ config.sub	9 Jul 2007 17:43:32 -0000
-@@ -244,7 +244,7 @@
+--- config.sub
++++ config.sub
+@@ -253,7 +253,7 @@ case $basic_machine in
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  	| bfin \
  	| c4x | clipper \
@@ -14,7 +9,7 @@ diff -u -r1.356 config.sub
  	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
-@@ -694,6 +694,24 @@
+@@ -773,6 +773,24 @@ case $basic_machine in
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -39,12 +34,12 @@ diff -u -r1.356 config.sub
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -1226,7 +1244,7 @@
+@@ -1325,7 +1343,7 @@ case $os in
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -irx*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)

From a13143fb2204411c8fce805df7797cdc2ccbcf31 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 17:16:39 +0000
Subject: [PATCH 0032/6849] gnuconfig: Apply patches to config.{sub,guess}.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuconfig/config.guess | 64 +++++++++++++++++++++-------------
 package/gnuconfig/config.sub   | 22 ++++++++++--
 2 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/package/gnuconfig/config.guess b/package/gnuconfig/config.guess
index 187cd54edd..40cf0af79d 100755
--- a/package/gnuconfig/config.guess
+++ b/package/gnuconfig/config.guess
@@ -140,6 +140,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+	eval $set_cc_for_build
+	cat << EOF > $dummy.c
+	#include <features.h>
+	#ifdef __UCLIBC__
+	# ifdef __UCLIBC_CONFIG_VERSION__
+	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+	# else
+	LIBC=uclibc
+	# endif
+	#else
+	LIBC=gnu
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+fi
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -872,33 +889,32 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo cris-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo crisv32-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#ifdef __dietlibc__
@@ -909,13 +925,13 @@ EOF
 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -934,10 +950,10 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo or32-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -948,40 +964,40 @@ EOF
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
 	echo ${UNAME_MACHINE}-tilera-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
diff --git a/package/gnuconfig/config.sub b/package/gnuconfig/config.sub
index 0ef29b072e..8ad167cbc6 100755
--- a/package/gnuconfig/config.sub
+++ b/package/gnuconfig/config.sub
@@ -253,7 +253,7 @@ case $basic_machine in
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx | dvp \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
@@ -773,6 +773,24 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+	mipsEE* | ee | ps2)
+		basic_machine=mips64r5900el-scei
+		case $os in
+		    -linux*)
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
+	iop)
+		basic_machine=mipsel-scei
+		os=-irx
+		;;
+	dvp)
+		basic_machine=dvp-scei
+		os=-elf
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -1325,7 +1343,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -irx*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)

From 314ff6e54b671c4659a933ed91f99ae905ec4890 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 25 Feb 2011 17:17:37 +0000
Subject: [PATCH 0033/6849] gnuconfig: Update README.buildroot.

GNU config is now managed in git so we cannot use the old method
of doing a cvs up to get the latest changes.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuconfig/README.buildroot | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/gnuconfig/README.buildroot b/package/gnuconfig/README.buildroot
index 521f120b9b..fd43a68c87 100644
--- a/package/gnuconfig/README.buildroot
+++ b/package/gnuconfig/README.buildroot
@@ -8,8 +8,12 @@ To use, just add this to your unpack rule in the package.mk:
 $(CONFIG_UPDATE) $(PACKAGE_DIR)/
 
 --- UPDATE ---
-This is a CVS checkout of the config project, so just run `cvs up` 
-to get the latest config.sub / config.guess files.
+GNU config is now managed in git, so to update:
+
+# git clone git://git.savannah.gnu.org/config.git
+# cp config/config.* .
+# for p in $(ls patches/*.patch); do patch -p0 < $p; done
+# rm -rf config
 
 A few local customizations are used to support uClibc so you may
 have to make sure they're still needed.  The patches are broken 

From 820a07365b508c81a35a41cd9fc82512d0d7657b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 8 Mar 2011 14:56:26 +0100
Subject: [PATCH 0034/6849] kernel-headers: bump 2.6.37.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 087549f2c3..da9f3ffe36 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -47,6 +47,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.34.8"	if BR2_KERNEL_HEADERS_2_6_34
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
-	default "2.6.37.2"	if BR2_KERNEL_HEADERS_2_6_37
+	default "2.6.37.3"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 034b92c6855a917b99d1e37b1f5cdaefd3c4a594 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 Mar 2011 08:58:54 +0100
Subject: [PATCH 0035/6849] avahi: bump version

Mainly bugfixes.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 13ae85fc07..dc04869e74 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
 # either version 2.1 of the License, or (at your option) any
 # later version.
 
-AVAHI_VERSION = 0.6.28
+AVAHI_VERSION = 0.6.29
 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
 AVAHI_INSTALL_STAGING = YES

From 117a8ea0eaabec72d7637f80f7a55fbba9ce67bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 10 Mar 2011 11:36:18 +0100
Subject: [PATCH 0036/6849] pkg-config: only prepend sysroot to includedir /
 libdir

Only append sysroot to includedir / libdir, and not to other variables,
when a variable is requested (--variable=<name>), similar to how it
is done for the -I / -L flags in cflags/ldflags.

The problem is that pkg-config doesn't have any explicit cross compilation
support, so there's some confusion about what are host paths and what are
target ones.  Includedir / libdir are paths for the (cross) compiler, so
those should normally have sysroot prepended, but other variables might
refer to target paths instead.

This fixes the installation of the xfonts-* packages, which uses
pkg-config --variable=fontrootdir fontutil to figure out the target
installation location for fonts.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../pkg-config-0.25-fix-variable.patch         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/package/pkg-config/pkg-config-0.25-fix-variable.patch b/package/pkg-config/pkg-config-0.25-fix-variable.patch
index 46b262bbcb..0b1d4a9d88 100644
--- a/package/pkg-config/pkg-config-0.25-fix-variable.patch
+++ b/package/pkg-config/pkg-config-0.25-fix-variable.patch
@@ -1,26 +1,28 @@
-[PATCH] prefix sysroot to path variables
+[PATCH] prefix sysroot to include/libdir path variables
 
-Prefix path values with sysroot if a variable is requested
-(--varable=<name>), similar to how it's done for -I / -L flags.
+Prefix includedir / libdir variable values with sysroot if a variable is
+requested (--variable=<name>), similar to how it's done for -I / -L flags.
 
 This is sometimes used to find header files (E.G. in gst-plugins configure),
 so ensure the sysroot'ed files are used.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 ---
- main.c |    3 +++
- 1 file changed, 3 insertions(+)
+ main.c |    5 +++++
+ 1 file changed, 5 insertions(+)
 
 Index: pkg-config-0.25/main.c
 ===================================================================
 --- pkg-config-0.25.orig/main.c
 +++ pkg-config-0.25/main.c
-@@ -695,6 +695,9 @@ main (int argc, char **argv)
+@@ -700,6 +700,11 @@
    if (variable_name)
      {
        char *str = packages_get_var (packages, variable_name);
-+      /* path variable? */
-+      if (pcsysrootdir && str[0] == '/')
++      /* include/lib variable? */
++      if (pcsysrootdir &&
++          (!strcmp(variable_name, "includedir") ||
++           !strcmp(variable_name, "libdir")))
 +          printf ("%s/", pcsysrootdir);
        printf ("%s", str);
        g_free (str);

From 723f276ffdb2308323649b74401270b7f3451673 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Mar 2011 09:25:02 -0300
Subject: [PATCH 0037/6849] xorg-server: point localstatedir to /var

We don't want logs to end up in /usr/var/log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 6dc1705bde..0311483904 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -60,7 +60,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--disable-xnest --disable-xephyr --disable-xvfb \
 		--with-builder-addr=buildroot@uclibc.org \
 		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
-		--with-fontdir=/usr/share/fonts/X11/
+		--with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var
 
 ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg

From 6f7187d11d6246539f2c98f40f6df5556e513f1d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Mar 2011 09:25:03 -0300
Subject: [PATCH 0038/6849] xz: bump to version 5.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xz/xz.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index dfc0638ccc..1d8c7ee6ed 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -3,7 +3,7 @@
 # xz-utils
 #
 #############################################################
-XZ_VERSION = 5.0.0
+XZ_VERSION = 5.0.1
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES

From eb2ebf949007b8a608d0624c764a67a2fbcb9fd6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Mar 2011 09:25:04 -0300
Subject: [PATCH 0039/6849] busybox 1.18.3: add patches for klogd and
 menuconfig

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.18.3/busybox-1.18.3-klogd.patch | 45 +++++++++++++++++++
 .../busybox-1.18.3-menuconfig.patch           | 11 +++++
 2 files changed, 56 insertions(+)
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch

diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
new file mode 100644
index 0000000000..2272cd0030
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
@@ -0,0 +1,45 @@
+--- busybox-1.18.3/sysklogd/klogd.c
++++ busybox-1.18.3-klogd/sysklogd/klogd.c
+@@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, ch
+ 	 */
+ 	klogd_open();
+ 	openlog("kernel", 0, LOG_KERN);
++	/*
++	 * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER
++	 * above. The logic behind this is that standard
++	 * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html
++	 * says the following about openlog and syslog:
++	 * "LOG_USER
++	 *  Messages generated by arbitrary processes.
++	 *  This is the default facility identifier if none is specified."
++	 *
++	 * I believe glibc misinterpreted this text as "if openlog's
++	 * third parameter is 0 (=LOG_KERN), treat it as LOG_USER".
++	 * Whereas it was meant to say "if *syslog* is called with facility
++	 * 0 in its 1st parameter without prior call to openlog, then perform
++	 * implicit openlog(LOG_USER)".
++	 *
++	 * As a result of this, eh, feature, standard klogd was forced
++	 * to open-code its own openlog and syslog implementation (!).
++	 *
++	 * Note that prohibiting openlog(LOG_KERN) on libc level does not
++	 * add any security: any process can open a socket to "/dev/log"
++	 * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message"
++	 *
++	 * Google code search tells me there is no widespread use of
++	 * openlog("foo", 0, 0), thus fixing glibc won't break userspace.
++	 *
++	 * The bug against glibc was filed:
++	 * bugzilla.redhat.com/show_bug.cgi?id=547000
++	 */
+ 
+ 	if (i)
+ 		klogd_setloglevel(i);
+ 
+-	bb_signals(BB_FATAL_SIGS, record_signo);
+ 	signal(SIGHUP, SIG_IGN);
++	/* We want klogd_read to not be restarted, thus _norestart: */
++	bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
+ 
+ 	syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
+ 
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
new file mode 100644
index 0000000000..3fc3edab73
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
@@ -0,0 +1,11 @@
+--- busybox-1.18.3/scripts/kconfig/mconf.c
++++ busybox-1.18.3-menuconfig/scripts/kconfig/mconf.c
+@@ -256,7 +256,7 @@ search_help[] = N_(
+ 	"          USB$ => find all CONFIG_ symbols ending with USB\n"
+ 	"\n");
+ 
+-static char buf[4096], *bufptr = buf;
++static char buf[4096*10], *bufptr = buf;
+ static char input_buf[4096];
+ static const char filename[] = ".config";
+ static char *args[1024], **argptr = args;

From a1c305c8a7011305b326aca1ad350c3be5a6db11 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Thu, 10 Mar 2011 10:20:47 +0000
Subject: [PATCH 0040/6849] toolchain/gcc/4.2.4: Remove libstdc++ uClibc locale
 patches

These patches do not build with more recent versions of uClibc
going back as far as at least 2008. More recent compiler versions
seem to do fine without these patches, so lets remove them so
libstdc++ locale support will actually build for gcc 4.2.4.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.2.4/200-uclibc-locale.patch   | 2790 -----------------
 .../gcc/4.2.4/203-uclibc-locale-no__x.patch   |  213 --
 .../4.2.4/204-uclibc-locale-wchar_fix.patch   |   48 -
 .../gcc/4.2.4/205-uclibc-locale-update.patch  |  347 --
 .../gcc/4.2.4/306-libstdc++-namespace.patch   |   36 -
 5 files changed, 3434 deletions(-)
 delete mode 100644 toolchain/gcc/4.2.4/200-uclibc-locale.patch
 delete mode 100644 toolchain/gcc/4.2.4/203-uclibc-locale-no__x.patch
 delete mode 100644 toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch
 delete mode 100644 toolchain/gcc/4.2.4/205-uclibc-locale-update.patch
 delete mode 100644 toolchain/gcc/4.2.4/306-libstdc++-namespace.patch

diff --git a/toolchain/gcc/4.2.4/200-uclibc-locale.patch b/toolchain/gcc/4.2.4/200-uclibc-locale.patch
deleted file mode 100644
index ea21388b75..0000000000
--- a/toolchain/gcc/4.2.4/200-uclibc-locale.patch
+++ /dev/null
@@ -1,2790 +0,0 @@
---- gcc/libstdc++-v3/acinclude.m4
-+++ gcc/libstdc++-v3/acinclude.m4
-@@ -1369,7 +1369,7 @@
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
-   GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
-     [use MODEL for target locale package],
--    [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+    [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
- 
-   # Deal with gettext issues.  Default to not using it (=no) until we detect
-   # support for it later.  Let the user turn it off via --e/d, but let that
-@@ -1385,6 +1385,9 @@
-   # Default to "generic".
-   if test $enable_clocale_flag = auto; then
-     case ${target_os} in
-+      *-uclibc*)
-+        enable_clocale_flag=uclibc
-+        ;;
-       linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-         AC_EGREP_CPP([_GLIBCXX_ok], [
-         #include <features.h>
-@@ -1528,6 +1531,40 @@
-       CTIME_CC=config/locale/generic/time_members.cc
-       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-       ;;
-+    uclibc)
-+      AC_MSG_RESULT(uclibc)
-+
-+      # Declare intention to use gettext, and add support for specific
-+      # languages.
-+      # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+      ALL_LINGUAS="de fr"
-+
-+      # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+      AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
-+      if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+        USE_NLS=yes
-+      fi
-+      # Export the build objects.
-+      for ling in $ALL_LINGUAS; do \
-+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+      done
-+      AC_SUBST(glibcxx_MOFILES)
-+      AC_SUBST(glibcxx_POFILES)
-+
-+      CLOCALE_H=config/locale/uclibc/c_locale.h
-+      CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+      CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+      CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+      CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+      CMESSAGES_H=config/locale/uclibc/messages_members.h
-+      CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+      CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+      CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+      CTIME_H=config/locale/uclibc/time_members.h
-+      CTIME_CC=config/locale/uclibc/time_members.cc
-+      CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+      ;;
-   esac
- 
-   # This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-@@ -0,0 +1,63 @@
-+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
-+
-+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+// Written by Jakub Jelinek <jakub@redhat.com>
-+
-+#include <bits/c++config.h>
-+#include <clocale>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning clean this up
-+#endif
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+                                                  
-+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
-+extern "C" __typeof(strcoll_l) __strcoll_l;
-+extern "C" __typeof(strftime_l) __strftime_l;
-+extern "C" __typeof(strtod_l) __strtod_l;
-+extern "C" __typeof(strtof_l) __strtof_l;
-+extern "C" __typeof(strtold_l) __strtold_l;
-+extern "C" __typeof(strxfrm_l) __strxfrm_l;
-+extern "C" __typeof(newlocale) __newlocale;
-+extern "C" __typeof(freelocale) __freelocale;
-+extern "C" __typeof(duplocale) __duplocale;
-+extern "C" __typeof(uselocale) __uselocale;
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+extern "C" __typeof(iswctype_l) __iswctype_l;
-+extern "C" __typeof(towlower_l) __towlower_l;
-+extern "C" __typeof(towupper_l) __towupper_l;
-+extern "C" __typeof(wcscoll_l) __wcscoll_l;
-+extern "C" __typeof(wcsftime_l) __wcsftime_l;
-+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
-+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif 
-+
-+#endif // GLIBC 2.3 and later
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.8  Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <cerrno>  // For errno
-+#include <locale>
-+#include <stdexcept>
-+#include <langinfo.h>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
-+#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
-+#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
-+#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
-+#define __strtof_l(S, E, L)         strtof((S), (E))
-+#define __strtod_l(S, E, L)         strtod((S), (E))
-+#define __strtold_l(S, E, L)        strtold((S), (E))
-+#warning should dummy __newlocale check for C|POSIX ?
-+#define __newlocale(a, b, c)        NULL
-+#define __freelocale(a)             ((void)0)
-+#define __duplocale(a)              __c_locale()
-+#endif
-+
-+namespace std 
-+{
-+  template<>
-+    void
-+    __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 
-+		   const __c_locale& __cloc)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  char* __sanity;
-+	  errno = 0;
-+	  float __f = __strtof_l(__s, &__sanity, __cloc);
-+          if (__sanity != __s && errno != ERANGE)
-+	    __v = __f;
-+	  else
-+	    __err |= ios_base::failbit;
-+	}
-+    }
-+
-+  template<>
-+    void
-+    __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 
-+		   const __c_locale& __cloc)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  char* __sanity;
-+	  errno = 0;
-+	  double __d = __strtod_l(__s, &__sanity, __cloc);
-+          if (__sanity != __s && errno != ERANGE)
-+	    __v = __d;
-+	  else
-+	    __err |= ios_base::failbit;
-+	}
-+    }
-+
-+  template<>
-+    void
-+    __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
-+		   const __c_locale& __cloc)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  char* __sanity;
-+	  errno = 0;
-+	  long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+          if (__sanity != __s && errno != ERANGE)
-+	    __v = __ld;
-+	  else
-+	    __err |= ios_base::failbit;
-+	}
-+    }
-+
-+  void
-+  locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, 
-+				    __c_locale __old)
-+  {
-+    __cloc = __newlocale(1 << LC_ALL, __s, __old);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    if (!__cloc)
-+      {
-+	// This named locale is not supported by the underlying OS.
-+	__throw_runtime_error(__N("locale::facet::_S_create_c_locale "
-+			      "name not valid"));
-+      }
-+#endif
-+  }
-+  
-+  void
-+  locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-+  {
-+    if (_S_get_c_locale() != __cloc)
-+      __freelocale(__cloc); 
-+  }
-+
-+  __c_locale
-+  locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-+  { return __duplocale(__cloc); }
-+} // namespace std
-+
-+namespace __gnu_cxx
-+{
-+  const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-+    {
-+      "LC_CTYPE", 
-+      "LC_NUMERIC",
-+      "LC_TIME", 
-+      "LC_COLLATE", 
-+      "LC_MONETARY",
-+      "LC_MESSAGES", 
-+#if _GLIBCXX_NUM_CATEGORIES != 0
-+      "LC_PAPER", 
-+      "LC_NAME", 
-+      "LC_ADDRESS",
-+      "LC_TELEPHONE", 
-+      "LC_MEASUREMENT", 
-+      "LC_IDENTIFICATION" 
-+#endif
-+    };
-+}
-+
-+namespace std
-+{
-+  const char* const* const locale::_S_categories = __gnu_cxx::category_names;
-+}  // namespace std
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
-@@ -0,0 +1,117 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.8  Standard locale categories.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifndef _C_LOCALE_H
-+#define _C_LOCALE_H 1
-+
-+#pragma GCC system_header
-+
-+#include <cstring>              // get std::strlen
-+#include <cstdio>               // get std::snprintf or std::sprintf
-+#include <clocale>
-+#include <langinfo.h>		// For codecvt
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this
-+#endif
-+#ifdef __UCLIBC_HAS_LOCALE__
-+#include <iconv.h>		// For codecvt using iconv, iconv_t
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#include <libintl.h> 		// For messages
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning what is _GLIBCXX_C_LOCALE_GNU for
-+#endif
-+#define _GLIBCXX_C_LOCALE_GNU 1
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix categories
-+#endif
-+// #define _GLIBCXX_NUM_CATEGORIES 6
-+#define _GLIBCXX_NUM_CATEGORIES 0
-+ 
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+namespace __gnu_cxx
-+{
-+  extern "C" __typeof(uselocale) __uselocale;
-+}
-+#endif
-+
-+namespace std
-+{
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+  typedef __locale_t		__c_locale;
-+#else
-+  typedef int*			__c_locale;
-+#endif
-+
-+  // Convert numeric value of type _Tv to string and return length of
-+  // string.  If snprintf is available use it, otherwise fall back to
-+  // the unsafe sprintf which, in general, can be dangerous and should
-+  // be avoided.
-+  template<typename _Tv>
-+    int
-+    __convert_from_v(char* __out, 
-+		     const int __size __attribute__ ((__unused__)),
-+		     const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+		     _Tv __v, const __c_locale& __cloc, int __prec)
-+    {
-+      __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-+#else
-+		     _Tv __v, const __c_locale&, int __prec)
-+    {
-+# ifdef __UCLIBC_HAS_LOCALE__
-+      char* __old = std::setlocale(LC_ALL, NULL);
-+      char* __sav = new char[std::strlen(__old) + 1];
-+      std::strcpy(__sav, __old);
-+      std::setlocale(LC_ALL, "C");
-+# endif
-+#endif
-+
-+      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-+      __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+      std::setlocale(LC_ALL, __sav);
-+      delete [] __sav;
-+#endif
-+      return __ret;
-+    }
-+}
-+
-+#endif
---- gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-@@ -0,0 +1,306 @@
-+// std::codecvt implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+namespace std
-+{
-+  // Specializations.
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  codecvt_base::result
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_out(state_type& __state, const intern_type* __from, 
-+	 const intern_type* __from_end, const intern_type*& __from_next,
-+	 extern_type* __to, extern_type* __to_end,
-+	 extern_type*& __to_next) const
-+  {
-+    result __ret = ok;
-+    state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+    // wcsnrtombs is *very* fast but stops if encounters NUL characters:
-+    // in case we fall back to wcrtomb and then continue, in a loop.
-+    // NB: wcsnrtombs is a GNU extension
-+    for (__from_next = __from, __to_next = __to;
-+	 __from_next < __from_end && __to_next < __to_end
-+	 && __ret == ok;)
-+      {
-+	const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
-+						      __from_end - __from_next);
-+	if (!__from_chunk_end)
-+	  __from_chunk_end = __from_end;
-+
-+	__from = __from_next;
-+	const size_t __conv = wcsnrtombs(__to_next, &__from_next,
-+					 __from_chunk_end - __from_next,
-+					 __to_end - __to_next, &__state);
-+	if (__conv == static_cast<size_t>(-1))
-+	  {
-+	    // In case of error, in order to stop at the exact place we
-+	    // have to start again from the beginning with a series of
-+	    // wcrtomb.
-+	    for (; __from < __from_next; ++__from)
-+	      __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
-+	    __state = __tmp_state;
-+	    __ret = error;
-+	  }
-+	else if (__from_next && __from_next < __from_chunk_end)
-+	  {
-+	    __to_next += __conv;
-+	    __ret = partial;
-+	  }
-+	else
-+	  {
-+	    __from_next = __from_chunk_end;
-+	    __to_next += __conv;
-+	  }
-+
-+	if (__from_next < __from_end && __ret == ok)
-+	  {
-+	    extern_type __buf[MB_LEN_MAX];
-+	    __tmp_state = __state;
-+	    const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
-+	    if (__conv > static_cast<size_t>(__to_end - __to_next))
-+	      __ret = partial;
-+	    else
-+	      {
-+		memcpy(__to_next, __buf, __conv);
-+		__state = __tmp_state;
-+		__to_next += __conv;
-+		++__from_next;
-+	      }
-+	  }
-+      }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+
-+    return __ret; 
-+  }
-+  
-+  codecvt_base::result
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_in(state_type& __state, const extern_type* __from, 
-+	const extern_type* __from_end, const extern_type*& __from_next,
-+	intern_type* __to, intern_type* __to_end,
-+	intern_type*& __to_next) const
-+  {
-+    result __ret = ok;
-+    state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+    // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+    // in case we store a L'\0' and then continue, in a loop.
-+    // NB: mbsnrtowcs is a GNU extension
-+    for (__from_next = __from, __to_next = __to;
-+	 __from_next < __from_end && __to_next < __to_end
-+	 && __ret == ok;)
-+      {
-+	const extern_type* __from_chunk_end;
-+	__from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
-+								  __from_end
-+								  - __from_next));
-+	if (!__from_chunk_end)
-+	  __from_chunk_end = __from_end;
-+
-+	__from = __from_next;
-+	size_t __conv = mbsnrtowcs(__to_next, &__from_next,
-+				   __from_chunk_end - __from_next,
-+				   __to_end - __to_next, &__state);
-+	if (__conv == static_cast<size_t>(-1))
-+	  {
-+	    // In case of error, in order to stop at the exact place we
-+	    // have to start again from the beginning with a series of
-+	    // mbrtowc.
-+	    for (;; ++__to_next, __from += __conv)
-+	      {
-+		__conv = mbrtowc(__to_next, __from, __from_end - __from,
-+				 &__tmp_state);
-+		if (__conv == static_cast<size_t>(-1)
-+		    || __conv == static_cast<size_t>(-2))
-+		  break;
-+	      }
-+	    __from_next = __from;
-+	    __state = __tmp_state;	    
-+	    __ret = error;
-+	  }
-+	else if (__from_next && __from_next < __from_chunk_end)
-+	  {
-+	    // It is unclear what to return in this case (see DR 382). 
-+	    __to_next += __conv;
-+	    __ret = partial;
-+	  }
-+	else
-+	  {
-+	    __from_next = __from_chunk_end;
-+	    __to_next += __conv;
-+	  }
-+
-+	if (__from_next < __from_end && __ret == ok)
-+	  {
-+	    if (__to_next < __to_end)
-+	      {
-+		// XXX Probably wrong for stateful encodings
-+		__tmp_state = __state;		
-+		++__from_next;
-+		*__to_next++ = L'\0';
-+	      }
-+	    else
-+	      __ret = partial;
-+	  }
-+      }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+
-+    return __ret; 
-+  }
-+
-+  int 
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_encoding() const throw()
-+  {
-+    // XXX This implementation assumes that the encoding is
-+    // stateless and is either single-byte or variable-width.
-+    int __ret = 0;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+    if (MB_CUR_MAX == 1)
-+      __ret = 1;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return __ret;
-+  }  
-+
-+  int 
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_max_length() const throw()
-+  {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+    // XXX Probably wrong for stateful encodings.
-+    int __ret = MB_CUR_MAX;
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return __ret;
-+  }
-+  
-+  int 
-+  codecvt<wchar_t, char, mbstate_t>::
-+  do_length(state_type& __state, const extern_type* __from,
-+	    const extern_type* __end, size_t __max) const
-+  {
-+    int __ret = 0;
-+    state_type __tmp_state(__state);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
-+#endif
-+
-+    // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
-+    // in case we advance past it and then continue, in a loop.
-+    // NB: mbsnrtowcs is a GNU extension
-+  
-+    // A dummy internal buffer is needed in order for mbsnrtocws to consider
-+    // its fourth parameter (it wouldn't with NULL as first parameter).
-+    wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) 
-+							   * __max));
-+    while (__from < __end && __max)
-+      {
-+	const extern_type* __from_chunk_end;
-+	__from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
-+								  __end
-+								  - __from));
-+	if (!__from_chunk_end)
-+	  __from_chunk_end = __end;
-+
-+	const extern_type* __tmp_from = __from;
-+	size_t __conv = mbsnrtowcs(__to, &__from,
-+				   __from_chunk_end - __from,
-+				   __max, &__state);
-+	if (__conv == static_cast<size_t>(-1))
-+	  {
-+	    // In case of error, in order to stop at the exact place we
-+	    // have to start again from the beginning with a series of
-+	    // mbrtowc.
-+	    for (__from = __tmp_from;; __from += __conv)
-+	      {
-+		__conv = mbrtowc(NULL, __from, __end - __from,
-+				 &__tmp_state);
-+		if (__conv == static_cast<size_t>(-1)
-+		    || __conv == static_cast<size_t>(-2))
-+		  break;
-+	      }
-+	    __state = __tmp_state;
-+	    __ret += __from - __tmp_from;
-+	    break;
-+	  }
-+	if (!__from)
-+	  __from = __from_chunk_end;
-+	
-+	__ret += __from - __tmp_from;
-+	__max -= __conv;
-+
-+	if (__from < __end && __max)
-+	  {
-+	    // XXX Probably wrong for stateful encodings
-+	    __tmp_state = __state;
-+	    ++__from;
-+	    ++__ret;
-+	    --__max;
-+	  }
-+      }
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+
-+    return __ret; 
-+  }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc
-@@ -0,0 +1,80 @@
-+// std::collate implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.4.1.2  collate virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
-+#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
-+#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
-+#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
-+#endif
-+
-+namespace std
-+{
-+  // These are basically extensions to char_traits, and perhaps should
-+  // be put there instead of here.
-+  template<>
-+    int 
-+    collate<char>::_M_compare(const char* __one, const char* __two) const
-+    { 
-+      int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
-+      return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+    }
-+  
-+  template<>
-+    size_t
-+    collate<char>::_M_transform(char* __to, const char* __from, 
-+				size_t __n) const 
-+    { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    int 
-+    collate<wchar_t>::_M_compare(const wchar_t* __one, 
-+				 const wchar_t* __two) const
-+    {
-+      int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
-+      return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
-+    }
-+  
-+  template<>
-+    size_t
-+    collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
-+				   size_t __n) const
-+    { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-@@ -0,0 +1,300 @@
-+// std::ctype implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.1.1.2  ctype virtual functions.
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __wctype_l(S, L)           wctype((S))
-+#define __towupper_l(C, L)         towupper((C))
-+#define __towlower_l(C, L)         towlower((C))
-+#define __iswctype_l(C, M, L)      iswctype((C), (M))
-+#endif
-+
-+namespace std
-+{
-+  // NB: The other ctype<char> specializations are in src/locale.cc and
-+  // various /config/os/* files.
-+  template<>
-+    ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+    : ctype<char>(0, false, __refs) 
-+    { 		
-+      if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+	{
-+	  this->_S_destroy_c_locale(this->_M_c_locale_ctype);
-+	  this->_S_create_c_locale(this->_M_c_locale_ctype, __s); 
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
-+	  this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
-+	  this->_M_table = this->_M_c_locale_ctype->__ctype_b;
-+#endif
-+	}
-+    }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T  
-+  ctype<wchar_t>::__wmask_type
-+  ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
-+  {
-+    __wmask_type __ret;
-+    switch (__m)
-+      {
-+      case space:
-+	__ret = __wctype_l("space", _M_c_locale_ctype);
-+	break;
-+      case print:
-+	__ret = __wctype_l("print", _M_c_locale_ctype);
-+	break;
-+      case cntrl:
-+	__ret = __wctype_l("cntrl", _M_c_locale_ctype);
-+	break;
-+      case upper:
-+	__ret = __wctype_l("upper", _M_c_locale_ctype);
-+	break;
-+      case lower:
-+	__ret = __wctype_l("lower", _M_c_locale_ctype);
-+	break;
-+      case alpha:
-+	__ret = __wctype_l("alpha", _M_c_locale_ctype);
-+	break;
-+      case digit:
-+	__ret = __wctype_l("digit", _M_c_locale_ctype);
-+	break;
-+      case punct:
-+	__ret = __wctype_l("punct", _M_c_locale_ctype);
-+	break;
-+      case xdigit:
-+	__ret = __wctype_l("xdigit", _M_c_locale_ctype);
-+	break;
-+      case alnum:
-+	__ret = __wctype_l("alnum", _M_c_locale_ctype);
-+	break;
-+      case graph:
-+	__ret = __wctype_l("graph", _M_c_locale_ctype);
-+	break;
-+      default:
-+	__ret = __wmask_type();
-+      }
-+    return __ret;
-+  }
-+  
-+  wchar_t
-+  ctype<wchar_t>::do_toupper(wchar_t __c) const
-+  { return __towupper_l(__c, _M_c_locale_ctype); }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
-+  {
-+    while (__lo < __hi)
-+      {
-+        *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
-+        ++__lo;
-+      }
-+    return __hi;
-+  }
-+  
-+  wchar_t
-+  ctype<wchar_t>::do_tolower(wchar_t __c) const
-+  { return __towlower_l(__c, _M_c_locale_ctype); }
-+  
-+  const wchar_t*
-+  ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
-+  {
-+    while (__lo < __hi)
-+      {
-+        *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
-+        ++__lo;
-+      }
-+    return __hi;
-+  }
-+
-+  bool
-+  ctype<wchar_t>::
-+  do_is(mask __m, wchar_t __c) const
-+  { 
-+    // Highest bitmask in ctype_base == 10, but extra in "C"
-+    // library for blank.
-+    bool __ret = false;
-+    const size_t __bitmasksize = 11; 
-+    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+      if (__m & _M_bit[__bitcur]
-+	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+	{
-+	  __ret = true;
-+	  break;
-+	}
-+    return __ret;    
-+  }
-+  
-+  const wchar_t* 
-+  ctype<wchar_t>::
-+  do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
-+  {
-+    for (; __lo < __hi; ++__vec, ++__lo)
-+      {
-+	// Highest bitmask in ctype_base == 10, but extra in "C"
-+	// library for blank.
-+	const size_t __bitmasksize = 11; 
-+	mask __m = 0;
-+	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+	  if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
-+	    __m |= _M_bit[__bitcur];
-+	*__vec = __m;
-+      }
-+    return __hi;
-+  }
-+  
-+  const wchar_t* 
-+  ctype<wchar_t>::
-+  do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
-+  {
-+    while (__lo < __hi && !this->do_is(__m, *__lo))
-+      ++__lo;
-+    return __lo;
-+  }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::
-+  do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-+  {
-+    while (__lo < __hi && this->do_is(__m, *__lo) != 0)
-+      ++__lo;
-+    return __lo;
-+  }
-+
-+  wchar_t
-+  ctype<wchar_t>::
-+  do_widen(char __c) const
-+  { return _M_widen[static_cast<unsigned char>(__c)]; }
-+
-+  const char* 
-+  ctype<wchar_t>::
-+  do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
-+  {
-+    while (__lo < __hi)
-+      {
-+	*__dest = _M_widen[static_cast<unsigned char>(*__lo)];
-+	++__lo;
-+	++__dest;
-+      }
-+    return __hi;
-+  }
-+
-+  char
-+  ctype<wchar_t>::
-+  do_narrow(wchar_t __wc, char __dfault) const
-+  {
-+    if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
-+      return _M_narrow[__wc];
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+    const int __c = wctob(__wc);
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return (__c == EOF ? __dfault : static_cast<char>(__c)); 
-+  }
-+
-+  const wchar_t*
-+  ctype<wchar_t>::
-+  do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, 
-+	    char* __dest) const
-+  {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+    if (_M_narrow_ok)
-+      while (__lo < __hi)
-+	{
-+	  if (*__lo >= 0 && *__lo < 128)
-+	    *__dest = _M_narrow[*__lo];
-+	  else
-+	    {
-+	      const int __c = wctob(*__lo);
-+	      *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+	    }
-+	  ++__lo;
-+	  ++__dest;
-+	}
-+    else
-+      while (__lo < __hi)
-+	{
-+	  const int __c = wctob(*__lo);
-+	  *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
-+	  ++__lo;
-+	  ++__dest;
-+	}
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+    return __hi;
-+  }
-+
-+  void
-+  ctype<wchar_t>::_M_initialize_ctype()
-+  {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __c_locale __old = __uselocale(_M_c_locale_ctype);
-+#endif
-+    wint_t __i;
-+    for (__i = 0; __i < 128; ++__i)
-+      {
-+	const int __c = wctob(__i);
-+	if (__c == EOF)
-+	  break;
-+	else
-+	  _M_narrow[__i] = static_cast<char>(__c);
-+      }
-+    if (__i == 128)
-+      _M_narrow_ok = true;
-+    else
-+      _M_narrow_ok = false;
-+    for (size_t __j = 0;
-+	 __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
-+      _M_widen[__j] = btowc(__j);
-+
-+    for (size_t __k = 0; __k <= 11; ++__k)
-+      { 
-+	_M_bit[__k] = static_cast<mask>(_ISbit(__k));
-+	_M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
-+      }
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+    __uselocale(__old);
-+#endif
-+  }
-+#endif //  _GLIBCXX_USE_WCHAR_T
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc
-@@ -0,0 +1,100 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2  messages virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix gettext stuff
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__dcgettext(const char *domainname,
-+			     const char *msgid, int category);
-+#undef gettext
-+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#else
-+#undef gettext
-+#define gettext(msgid) (msgid)
-+#endif
-+
-+namespace std
-+{
-+  // Specializations.
-+  template<>
-+    string
-+    messages<char>::do_get(catalog, int, int, const string& __dfault) const
-+    {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+      __c_locale __old = __uselocale(_M_c_locale_messages);
-+      const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
-+      __uselocale(__old);
-+      return string(__msg);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_messages);
-+      const char* __msg = gettext(__dfault.c_str());
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+      return string(__msg);
-+#else
-+      const char* __msg = gettext(__dfault.c_str());
-+      return string(__msg);
-+#endif
-+    }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    wstring
-+    messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
-+    {
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+      __c_locale __old = __uselocale(_M_c_locale_messages);
-+      char* __msg = gettext(_M_convert_to_char(__dfault));
-+      __uselocale(__old);
-+      return _M_convert_from_char(__msg);
-+# elif defined __UCLIBC_HAS_LOCALE__
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_messages);
-+      char* __msg = gettext(_M_convert_to_char(__dfault));
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+      return _M_convert_from_char(__msg);
-+# else
-+      char* __msg = gettext(_M_convert_to_char(__dfault));
-+      return _M_convert_from_char(__msg);
-+# endif
-+    }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -0,0 +1,118 @@
-+// std::messages implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.7.1.2  messages functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix prototypes for *textdomain funcs
-+#endif
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+extern "C" char *__textdomain(const char *domainname);
-+extern "C" char *__bindtextdomain(const char *domainname,
-+				  const char *dirname);
-+#else
-+#undef __textdomain
-+#undef __bindtextdomain
-+#define __textdomain(D)           ((void)0)
-+#define __bindtextdomain(D,P)     ((void)0)
-+#endif
-+
-+  // Non-virtual member functions.
-+  template<typename _CharT>
-+     messages<_CharT>::messages(size_t __refs)
-+     : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), 
-+     _M_name_messages(_S_get_c_name())
-+     { }
-+
-+  template<typename _CharT>
-+     messages<_CharT>::messages(__c_locale __cloc, const char* __s, 
-+				size_t __refs) 
-+     : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
-+     _M_name_messages(__s)
-+     {
-+       char* __tmp = new char[std::strlen(__s) + 1];
-+       std::strcpy(__tmp, __s);
-+       _M_name_messages = __tmp;
-+     }
-+
-+  template<typename _CharT>
-+    typename messages<_CharT>::catalog 
-+    messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
-+			   const char* __dir) const
-+    { 
-+      __bindtextdomain(__s.c_str(), __dir);
-+      return this->do_open(__s, __loc); 
-+    }
-+
-+  // Virtual member functions.
-+  template<typename _CharT>
-+    messages<_CharT>::~messages()
-+    { 
-+      if (_M_name_messages != _S_get_c_name())
-+	delete [] _M_name_messages;
-+      _S_destroy_c_locale(_M_c_locale_messages); 
-+    }
-+
-+  template<typename _CharT>
-+    typename messages<_CharT>::catalog 
-+    messages<_CharT>::do_open(const basic_string<char>& __s, 
-+			      const locale&) const
-+    { 
-+      // No error checking is done, assume the catalog exists and can
-+      // be used.
-+      __textdomain(__s.c_str());
-+      return 0;
-+    }
-+
-+  template<typename _CharT>
-+    void    
-+    messages<_CharT>::do_close(catalog) const 
-+    { }
-+
-+   // messages_byname
-+   template<typename _CharT>
-+     messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-+     : messages<_CharT>(__refs) 
-+     { 
-+       if (this->_M_name_messages != locale::facet::_S_get_c_name())
-+	 delete [] this->_M_name_messages;
-+       char* __tmp = new char[std::strlen(__s) + 1];
-+       std::strcpy(__tmp, __s);
-+       this->_M_name_messages = __tmp;
-+
-+       if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-+	 {
-+	   this->_S_destroy_c_locale(this->_M_c_locale_messages);
-+	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
-+	 }
-+     }
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-@@ -0,0 +1,692 @@
-+// std::moneypunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.6.3.2  moneypunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning optimize this for uclibc
-+#warning tailor for stub locale support
-+#endif
-+
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+  // Construct and return valid pattern consisting of some combination of:
-+  // space none symbol sign value
-+  money_base::pattern
-+  money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
-+  { 
-+    pattern __ret;
-+
-+    // This insanely complicated routine attempts to construct a valid
-+    // pattern for use with monyepunct. A couple of invariants:
-+
-+    // if (__precedes) symbol -> value
-+    // else value -> symbol
-+    
-+    // if (__space) space
-+    // else none
-+
-+    // none == never first
-+    // space never first or last
-+
-+    // Any elegant implementations of this are welcome.
-+    switch (__posn)
-+      {
-+      case 0:
-+      case 1:
-+	// 1 The sign precedes the value and symbol.
-+	__ret.field[0] = sign;
-+	if (__space)
-+	  {
-+	    // Pattern starts with sign.
-+	    if (__precedes)
-+	      {
-+		__ret.field[1] = symbol;
-+		__ret.field[3] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = value;
-+		__ret.field[3] = symbol;
-+	      }
-+	    __ret.field[2] = space;
-+	  }
-+	else
-+	  {
-+	    // Pattern starts with sign and ends with none.
-+	    if (__precedes)
-+	      {
-+		__ret.field[1] = symbol;
-+		__ret.field[2] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = value;
-+		__ret.field[2] = symbol;
-+	      }
-+	    __ret.field[3] = none;
-+	  }
-+	break;
-+      case 2:
-+	// 2 The sign follows the value and symbol.
-+	if (__space)
-+	  {
-+	    // Pattern either ends with sign.
-+	    if (__precedes)
-+	      {
-+		__ret.field[0] = symbol;
-+		__ret.field[2] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[0] = value;
-+		__ret.field[2] = symbol;
-+	      }
-+	    __ret.field[1] = space;
-+	    __ret.field[3] = sign;
-+	  }
-+	else
-+	  {
-+	    // Pattern ends with sign then none.
-+	    if (__precedes)
-+	      {
-+		__ret.field[0] = symbol;
-+		__ret.field[1] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[0] = value;
-+		__ret.field[1] = symbol;
-+	      }
-+	    __ret.field[2] = sign;
-+	    __ret.field[3] = none;
-+	  }
-+	break;
-+      case 3:
-+	// 3 The sign immediately precedes the symbol.
-+	if (__precedes)
-+	  {
-+	    __ret.field[0] = sign;
-+	    __ret.field[1] = symbol;	    
-+	    if (__space)
-+	      {
-+		__ret.field[2] = space;
-+		__ret.field[3] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[2] = value;		
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	else
-+	  {
-+	    __ret.field[0] = value;
-+	    if (__space)
-+	      {
-+		__ret.field[1] = space;
-+		__ret.field[2] = sign;
-+		__ret.field[3] = symbol;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = sign;
-+		__ret.field[2] = symbol;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	break;
-+      case 4:
-+	// 4 The sign immediately follows the symbol.
-+	if (__precedes)
-+	  {
-+	    __ret.field[0] = symbol;
-+	    __ret.field[1] = sign;
-+	    if (__space)
-+	      {
-+		__ret.field[2] = space;
-+		__ret.field[3] = value;
-+	      }
-+	    else
-+	      {
-+		__ret.field[2] = value;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	else
-+	  {
-+	    __ret.field[0] = value;
-+	    if (__space)
-+	      {
-+		__ret.field[1] = space;
-+		__ret.field[2] = symbol;
-+		__ret.field[3] = sign;
-+	      }
-+	    else
-+	      {
-+		__ret.field[1] = symbol;
-+		__ret.field[2] = sign;
-+		__ret.field[3] = none;
-+	      }
-+	  }
-+	break;
-+      default:
-+	;
-+      }
-+    return __ret;
-+  }
-+
-+  template<> 
-+    void
-+    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, 
-+						     const char*)
-+    {
-+      if (!_M_data)
-+	_M_data = new __moneypunct_cache<char, true>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = '.';
-+	  _M_data->_M_thousands_sep = ',';
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = "";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = "";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = "";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 
-+							__cloc));
-+	  _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 
-+							__cloc));
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	  _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+	  char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+	  if (!__nposn)
-+	    _M_data->_M_negative_sign = "()";
-+	  else
-+	    _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, 
-+							__cloc);
-+	  _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+	  // _Intl == true
-+	  _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+	  _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 
-+						      __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
-+							__pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
-+							__nposn);
-+	}
-+    }
-+
-+  template<> 
-+    void
-+    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, 
-+						      const char*)
-+    {
-+      if (!_M_data)
-+	_M_data = new __moneypunct_cache<char, false>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = '.';
-+	  _M_data->_M_thousands_sep = ',';
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = "";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = "";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = "";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 
-+							__cloc));
-+	  _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 
-+							__cloc));
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	  _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
-+
-+	  char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+	  if (!__nposn)
-+	    _M_data->_M_negative_sign = "()";
-+	  else
-+	    _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
-+							__cloc);
-+	  _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
-+
-+	  // _Intl == false
-+	  _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+	  _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
-+							__pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
-+							__nposn);
-+	}
-+    }
-+
-+  template<> 
-+    moneypunct<char, true>::~moneypunct()
-+    { delete _M_data; }
-+
-+  template<> 
-+    moneypunct<char, false>::~moneypunct()
-+    { delete _M_data; }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<> 
-+    void
-+    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, 
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+							const char*)
-+#else
-+							const char* __name)
-+#endif
-+    {
-+      if (!_M_data)
-+	_M_data = new __moneypunct_cache<wchar_t, true>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = L'.';
-+	  _M_data->_M_thousands_sep = L',';
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = L"";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = L"";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = L"";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  // Use ctype::widen code without the facet...
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] =
-+	      static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+	}
-+      else
-+	{
-+	  // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __c_locale __old = __uselocale(__cloc);
-+#else
-+	  // Switch to named locale so that mbsrtowcs will work.
-+	  char* __old = strdup(setlocale(LC_ALL, NULL));
-+	  setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+	  union { char *__s; wchar_t __w; } __u;
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+	  _M_data->_M_decimal_point = __u.__w;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+	  _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+	  const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+	  const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-+
-+	  wchar_t* __wcs_ps = 0;
-+	  wchar_t* __wcs_ns = 0;
-+	  const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-+	  try
-+	    {
-+	      mbstate_t __state;
-+	      size_t __len = strlen(__cpossign);
-+	      if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ps = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+		  _M_data->_M_positive_sign = __wcs_ps;
-+		}
-+	      else
-+		_M_data->_M_positive_sign = L"";
-+	      _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+	      
-+	      __len = strlen(__cnegsign);
-+	      if (!__nposn)
-+		_M_data->_M_negative_sign = L"()";
-+	      else if (__len)
-+		{ 
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ns = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+		  _M_data->_M_negative_sign = __wcs_ns;
-+		}
-+	      else
-+		_M_data->_M_negative_sign = L"";
-+	      _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+	      
-+	      // _Intl == true.
-+	      __len = strlen(__ccurr);
-+	      if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  wchar_t* __wcs = new wchar_t[__len];
-+		  mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+		  _M_data->_M_curr_symbol = __wcs;
-+		}
-+	      else
-+		_M_data->_M_curr_symbol = L"";
-+	      _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+	    }
-+	  catch (...)
-+	    {
-+	      delete _M_data;
-+	      _M_data = 0;
-+	      delete __wcs_ps;
-+	      delete __wcs_ns;	      
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	      __uselocale(__old);
-+#else
-+	      setlocale(LC_ALL, __old);
-+	      free(__old);
-+#endif
-+	      __throw_exception_again;
-+	    } 
-+	  
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 
-+						      __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
-+							__pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
-+							__nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __uselocale(__old);
-+#else
-+	  setlocale(LC_ALL, __old);
-+	  free(__old);
-+#endif
-+	}
-+    }
-+
-+  template<> 
-+  void
-+  moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+						       const char*)
-+#else
-+                                                       const char* __name)
-+#endif
-+  {
-+    if (!_M_data)
-+      _M_data = new __moneypunct_cache<wchar_t, false>;
-+
-+    if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_decimal_point = L'.';
-+	  _M_data->_M_thousands_sep = L',';
-+	  _M_data->_M_grouping = "";
-+          _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_curr_symbol = L"";
-+	  _M_data->_M_curr_symbol_size = 0;
-+	  _M_data->_M_positive_sign = L"";
-+	  _M_data->_M_positive_sign_size = 0;
-+	  _M_data->_M_negative_sign = L"";
-+	  _M_data->_M_negative_sign_size = 0;
-+	  _M_data->_M_frac_digits = 0;
-+	  _M_data->_M_pos_format = money_base::_S_default_pattern;
-+	  _M_data->_M_neg_format = money_base::_S_default_pattern;
-+
-+	  // Use ctype::widen code without the facet...
-+	  for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-+	    _M_data->_M_atoms[__i] =
-+	      static_cast<wchar_t>(money_base::_S_atoms[__i]);
-+	}
-+      else
-+	{
-+	  // Named locale.
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __c_locale __old = __uselocale(__cloc);
-+#else
-+	  // Switch to named locale so that mbsrtowcs will work.
-+	  char* __old = strdup(setlocale(LC_ALL, NULL));
-+	  setlocale(LC_ALL, __name);
-+#endif
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be monetary
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# else
-+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
-+          union { char *__s; wchar_t __w; } __u;
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-+	  _M_data->_M_decimal_point = __u.__w;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
-+	  _M_data->_M_thousands_sep = __u.__w;
-+#endif
-+	  _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-+          _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+
-+	  const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-+	  const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-+	  const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-+
-+	  wchar_t* __wcs_ps = 0;
-+	  wchar_t* __wcs_ns = 0;
-+	  const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-+	  try
-+            {
-+              mbstate_t __state;
-+              size_t __len;
-+              __len = strlen(__cpossign);
-+              if (__len)
-+                {
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ps = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
-+		  _M_data->_M_positive_sign = __wcs_ps;
-+		}
-+	      else
-+		_M_data->_M_positive_sign = L"";
-+              _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
-+	      
-+	      __len = strlen(__cnegsign);
-+	      if (!__nposn)
-+		_M_data->_M_negative_sign = L"()";
-+	      else if (__len)
-+		{ 
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  __wcs_ns = new wchar_t[__len];
-+		  mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
-+		  _M_data->_M_negative_sign = __wcs_ns;
-+		}
-+	      else
-+		_M_data->_M_negative_sign = L"";
-+              _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
-+
-+	      // _Intl == true.
-+	      __len = strlen(__ccurr);
-+	      if (__len)
-+		{
-+		  ++__len;
-+		  memset(&__state, 0, sizeof(mbstate_t));
-+		  wchar_t* __wcs = new wchar_t[__len];
-+		  mbsrtowcs(__wcs, &__ccurr, __len, &__state);
-+		  _M_data->_M_curr_symbol = __wcs;
-+		}
-+	      else
-+		_M_data->_M_curr_symbol = L"";
-+              _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
-+	    }
-+          catch (...)
-+	    {
-+	      delete _M_data;
-+              _M_data = 0;
-+	      delete __wcs_ps;
-+	      delete __wcs_ns;	      
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	      __uselocale(__old);
-+#else
-+	      setlocale(LC_ALL, __old);
-+	      free(__old);
-+#endif
-+              __throw_exception_again;
-+	    }
-+
-+	  _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-+	  char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-+	  char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-+	  char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-+	  _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
-+	                                                __pposn);
-+	  char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-+	  char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-+	  _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
-+	                                                __nposn);
-+
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+	  __uselocale(__old);
-+#else
-+	  setlocale(LC_ALL, __old);
-+	  free(__old);
-+#endif
-+	}
-+    }
-+
-+  template<> 
-+    moneypunct<wchar_t, true>::~moneypunct()
-+    {
-+      if (_M_data->_M_positive_sign_size)
-+	delete [] _M_data->_M_positive_sign;
-+      if (_M_data->_M_negative_sign_size
-+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+	delete [] _M_data->_M_negative_sign;
-+      if (_M_data->_M_curr_symbol_size)
-+	delete [] _M_data->_M_curr_symbol;
-+      delete _M_data;
-+    }
-+
-+  template<> 
-+    moneypunct<wchar_t, false>::~moneypunct()
-+    {
-+      if (_M_data->_M_positive_sign_size)
-+	delete [] _M_data->_M_positive_sign;
-+      if (_M_data->_M_negative_sign_size
-+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
-+	delete [] _M_data->_M_negative_sign;
-+      if (_M_data->_M_curr_symbol_size)
-+	delete [] _M_data->_M_curr_symbol;
-+      delete _M_data;
-+    }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-@@ -0,0 +1,160 @@
-+// std::numpunct implementation details, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.3.1.2  numpunct virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#define _LIBC
-+#include <locale>
-+#undef _LIBC
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+  template<> 
-+    void
-+    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __numpunct_cache<char>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_use_grouping = false;
-+
-+	  _M_data->_M_decimal_point = '.';
-+	  _M_data->_M_thousands_sep = ',';
-+
-+	  for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+	    _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
-+
-+	  for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+	    _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, 
-+							__cloc));
-+	  _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, 
-+							__cloc));
-+
-+	  // Check for NULL, which implies no grouping.
-+	  if (_M_data->_M_thousands_sep == '\0')
-+	    _M_data->_M_grouping = "";
-+	  else
-+	    _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	}
-+
-+      // NB: There is no way to extact this info from posix locales.
-+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+      _M_data->_M_truename = "true";
-+      _M_data->_M_truename_size = 4;
-+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+      _M_data->_M_falsename = "false";
-+      _M_data->_M_falsename_size = 5;
-+    }
-+ 
-+  template<> 
-+    numpunct<char>::~numpunct()
-+    { delete _M_data; }
-+   
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<> 
-+    void
-+    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __numpunct_cache<wchar_t>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_data->_M_grouping = "";
-+	  _M_data->_M_grouping_size = 0;
-+	  _M_data->_M_use_grouping = false;
-+
-+	  _M_data->_M_decimal_point = L'.';
-+	  _M_data->_M_thousands_sep = L',';
-+
-+	  // Use ctype::widen code without the facet...
-+	  for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-+	    _M_data->_M_atoms_out[__i] =
-+	      static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
-+
-+	  for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
-+	    _M_data->_M_atoms_in[__j] =
-+	      static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
-+	}
-+      else
-+	{
-+	  // Named locale.
-+	  // NB: In the GNU model wchar_t is always 32 bit wide.
-+	  union { char *__s; wchar_t __w; } __u;
-+	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
-+	  _M_data->_M_decimal_point = __u.__w;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
-+	  _M_data->_M_thousands_sep = __u.__w;
-+
-+	  if (_M_data->_M_thousands_sep == L'\0')
-+	    _M_data->_M_grouping = "";
-+	  else
-+	    _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-+	  _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
-+	}
-+
-+      // NB: There is no way to extact this info from posix locales.
-+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-+      _M_data->_M_truename = L"true";
-+      _M_data->_M_truename_size = 4;
-+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-+      _M_data->_M_falsename = L"false";
-+      _M_data->_M_falsename_size = 5;
-+    }
-+
-+  template<> 
-+    numpunct<wchar_t>::~numpunct()
-+    { delete _M_data; }
-+ #endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc
-@@ -0,0 +1,406 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+#include <locale>
-+#include <bits/c++locale_internal.h>
-+
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning tailor for stub locale support
-+#endif
-+#ifndef __UCLIBC_HAS_XLOCALE__
-+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
-+#endif
-+
-+namespace std
-+{
-+  template<>
-+    void
-+    __timepunct<char>::
-+    _M_put(char* __s, size_t __maxlen, const char* __format, 
-+	   const tm* __tm) const
-+    {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+      const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
-+					_M_c_locale_timepunct);
-+#else
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_timepunct);
-+      const size_t __len = strftime(__s, __maxlen, __format, __tm);
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+#endif
-+      // Make sure __s is null terminated.
-+      if (__len == 0)
-+	__s[0] = '\0';
-+    }
-+
-+  template<> 
-+    void
-+    __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __timepunct_cache<char>;
-+
-+      if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_c_locale_timepunct = _S_get_c_locale();
-+
-+	  _M_data->_M_date_format = "%m/%d/%y";
-+	  _M_data->_M_date_era_format = "%m/%d/%y";
-+	  _M_data->_M_time_format = "%H:%M:%S";
-+	  _M_data->_M_time_era_format = "%H:%M:%S";
-+	  _M_data->_M_date_time_format = "";
-+	  _M_data->_M_date_time_era_format = "";
-+	  _M_data->_M_am = "AM";
-+	  _M_data->_M_pm = "PM";
-+	  _M_data->_M_am_pm_format = "";
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  _M_data->_M_day1 = "Sunday";
-+	  _M_data->_M_day2 = "Monday";
-+	  _M_data->_M_day3 = "Tuesday";
-+	  _M_data->_M_day4 = "Wednesday";
-+	  _M_data->_M_day5 = "Thursday";
-+	  _M_data->_M_day6 = "Friday";
-+	  _M_data->_M_day7 = "Saturday";
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  _M_data->_M_aday1 = "Sun";
-+	  _M_data->_M_aday2 = "Mon";
-+	  _M_data->_M_aday3 = "Tue";
-+	  _M_data->_M_aday4 = "Wed";
-+	  _M_data->_M_aday5 = "Thu";
-+	  _M_data->_M_aday6 = "Fri";
-+	  _M_data->_M_aday7 = "Sat";
-+
-+	  // Month names, starting with "C"'s January.
-+	  _M_data->_M_month01 = "January";
-+	  _M_data->_M_month02 = "February";
-+	  _M_data->_M_month03 = "March";
-+	  _M_data->_M_month04 = "April";
-+	  _M_data->_M_month05 = "May";
-+	  _M_data->_M_month06 = "June";
-+	  _M_data->_M_month07 = "July";
-+	  _M_data->_M_month08 = "August";
-+	  _M_data->_M_month09 = "September";
-+	  _M_data->_M_month10 = "October";
-+	  _M_data->_M_month11 = "November";
-+	  _M_data->_M_month12 = "December";
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  _M_data->_M_amonth01 = "Jan";
-+	  _M_data->_M_amonth02 = "Feb";
-+	  _M_data->_M_amonth03 = "Mar";
-+	  _M_data->_M_amonth04 = "Apr";
-+	  _M_data->_M_amonth05 = "May";
-+	  _M_data->_M_amonth06 = "Jun";
-+	  _M_data->_M_amonth07 = "Jul";
-+	  _M_data->_M_amonth08 = "Aug";
-+	  _M_data->_M_amonth09 = "Sep";
-+	  _M_data->_M_amonth10 = "Oct";
-+	  _M_data->_M_amonth11 = "Nov";
-+	  _M_data->_M_amonth12 = "Dec";
-+	}
-+      else
-+	{
-+	  _M_c_locale_timepunct = _S_clone_c_locale(__cloc); 
-+
-+	  _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
-+	  _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
-+	  _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
-+	  _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
-+	  _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
-+	  _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
-+							     __cloc);
-+	  _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
-+	  _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
-+	  _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
-+	  _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
-+	  _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
-+	  _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
-+	  _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
-+	  _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
-+	  _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
-+	  _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
-+	  _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
-+	  _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
-+	  _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
-+	  _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
-+	  _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
-+
-+	  // Month names, starting with "C"'s January.
-+	  _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
-+	  _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
-+	  _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
-+	  _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
-+	  _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
-+	  _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
-+	  _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
-+	  _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
-+	  _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
-+	  _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
-+	  _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
-+	  _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
-+	  _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
-+	  _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
-+	  _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
-+	  _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
-+	  _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
-+	  _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
-+	  _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
-+	  _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
-+	  _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
-+	  _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
-+	  _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
-+	}
-+    }
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+  template<>
-+    void
-+    __timepunct<wchar_t>::
-+    _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, 
-+	   const tm* __tm) const
-+    {
-+#ifdef __UCLIBC_HAS_XLOCALE__
-+      __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
-+      const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
-+					_M_c_locale_timepunct);
-+#else
-+      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      setlocale(LC_ALL, _M_name_timepunct);
-+      const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
-+      setlocale(LC_ALL, __old);
-+      free(__old);
-+#endif
-+      // Make sure __s is null terminated.
-+      if (__len == 0)
-+	__s[0] = L'\0';
-+    }
-+
-+  template<> 
-+    void
-+    __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
-+    {
-+      if (!_M_data)
-+	_M_data = new __timepunct_cache<wchar_t>;
-+
-+#warning wide time stuff
-+//       if (!__cloc)
-+	{
-+	  // "C" locale
-+	  _M_c_locale_timepunct = _S_get_c_locale();
-+
-+	  _M_data->_M_date_format = L"%m/%d/%y";
-+	  _M_data->_M_date_era_format = L"%m/%d/%y";
-+	  _M_data->_M_time_format = L"%H:%M:%S";
-+	  _M_data->_M_time_era_format = L"%H:%M:%S";
-+	  _M_data->_M_date_time_format = L"";
-+	  _M_data->_M_date_time_era_format = L"";
-+	  _M_data->_M_am = L"AM";
-+	  _M_data->_M_pm = L"PM";
-+	  _M_data->_M_am_pm_format = L"";
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  _M_data->_M_day1 = L"Sunday";
-+	  _M_data->_M_day2 = L"Monday";
-+	  _M_data->_M_day3 = L"Tuesday";
-+	  _M_data->_M_day4 = L"Wednesday";
-+	  _M_data->_M_day5 = L"Thursday";
-+	  _M_data->_M_day6 = L"Friday";
-+	  _M_data->_M_day7 = L"Saturday";
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  _M_data->_M_aday1 = L"Sun";
-+	  _M_data->_M_aday2 = L"Mon";
-+	  _M_data->_M_aday3 = L"Tue";
-+	  _M_data->_M_aday4 = L"Wed";
-+	  _M_data->_M_aday5 = L"Thu";
-+	  _M_data->_M_aday6 = L"Fri";
-+	  _M_data->_M_aday7 = L"Sat";
-+
-+	  // Month names, starting with "C"'s January.
-+	  _M_data->_M_month01 = L"January";
-+	  _M_data->_M_month02 = L"February";
-+	  _M_data->_M_month03 = L"March";
-+	  _M_data->_M_month04 = L"April";
-+	  _M_data->_M_month05 = L"May";
-+	  _M_data->_M_month06 = L"June";
-+	  _M_data->_M_month07 = L"July";
-+	  _M_data->_M_month08 = L"August";
-+	  _M_data->_M_month09 = L"September";
-+	  _M_data->_M_month10 = L"October";
-+	  _M_data->_M_month11 = L"November";
-+	  _M_data->_M_month12 = L"December";
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  _M_data->_M_amonth01 = L"Jan";
-+	  _M_data->_M_amonth02 = L"Feb";
-+	  _M_data->_M_amonth03 = L"Mar";
-+	  _M_data->_M_amonth04 = L"Apr";
-+	  _M_data->_M_amonth05 = L"May";
-+	  _M_data->_M_amonth06 = L"Jun";
-+	  _M_data->_M_amonth07 = L"Jul";
-+	  _M_data->_M_amonth08 = L"Aug";
-+	  _M_data->_M_amonth09 = L"Sep";
-+	  _M_data->_M_amonth10 = L"Oct";
-+	  _M_data->_M_amonth11 = L"Nov";
-+	  _M_data->_M_amonth12 = L"Dec";
-+	}
-+#if 0
-+      else
-+	{
-+	  _M_c_locale_timepunct = _S_clone_c_locale(__cloc); 
-+
-+	  union { char *__s; wchar_t *__w; } __u;
-+
-+	  __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
-+	  _M_data->_M_date_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
-+	  _M_data->_M_date_era_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
-+	  _M_data->_M_time_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
-+	  _M_data->_M_time_era_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
-+	  _M_data->_M_date_time_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
-+	  _M_data->_M_date_time_era_format = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
-+	  _M_data->_M_am = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
-+	  _M_data->_M_pm = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
-+	  _M_data->_M_am_pm_format = __u.__w;
-+
-+	  // Day names, starting with "C"'s Sunday.
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
-+	  _M_data->_M_day1 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
-+	  _M_data->_M_day2 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
-+	  _M_data->_M_day3 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
-+	  _M_data->_M_day4 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
-+	  _M_data->_M_day5 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
-+	  _M_data->_M_day6 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
-+	  _M_data->_M_day7 = __u.__w;
-+
-+	  // Abbreviated day names, starting with "C"'s Sun.
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
-+	  _M_data->_M_aday1 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
-+	  _M_data->_M_aday2 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
-+	  _M_data->_M_aday3 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
-+	  _M_data->_M_aday4 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
-+	  _M_data->_M_aday5 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
-+	  _M_data->_M_aday6 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
-+	  _M_data->_M_aday7 = __u.__w;
-+
-+	  // Month names, starting with "C"'s January.
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
-+	  _M_data->_M_month01 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
-+	  _M_data->_M_month02 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
-+	  _M_data->_M_month03 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
-+	  _M_data->_M_month04 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
-+	  _M_data->_M_month05 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
-+	  _M_data->_M_month06 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
-+	  _M_data->_M_month07 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
-+	  _M_data->_M_month08 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
-+	  _M_data->_M_month09 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
-+	  _M_data->_M_month10 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
-+	  _M_data->_M_month11 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
-+	  _M_data->_M_month12 = __u.__w;
-+
-+	  // Abbreviated month names, starting with "C"'s Jan.
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
-+	  _M_data->_M_amonth01 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
-+	  _M_data->_M_amonth02 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
-+	  _M_data->_M_amonth03 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
-+	  _M_data->_M_amonth04 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
-+	  _M_data->_M_amonth05 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
-+	  _M_data->_M_amonth06 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
-+	  _M_data->_M_amonth07 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
-+	  _M_data->_M_amonth08 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
-+	  _M_data->_M_amonth09 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
-+	  _M_data->_M_amonth10 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
-+	  _M_data->_M_amonth11 = __u.__w;
-+	  __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
-+	  _M_data->_M_amonth12 = __u.__w;
-+	}
-+#endif // 0
-+    }
-+#endif
-+}
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h
-@@ -0,0 +1,68 @@
-+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-+
-+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 2, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING.  If not, write to the Free
-+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// USA.
-+
-+// As a special exception, you may use this file as part of a free software
-+// library without restriction.  Specifically, if other files instantiate
-+// templates or use macros or inline functions from this file, or you compile
-+// this file and link it with other files to produce an executable, this
-+// file does not by itself cause the resulting executable to be covered by
-+// the GNU General Public License.  This exception does not however
-+// invalidate any other reasons why the executable file might be covered by
-+// the GNU General Public License.
-+
-+//
-+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-+//
-+
-+// Written by Benjamin Kosnik <bkoz@redhat.com>
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::__timepunct(size_t __refs) 
-+    : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
-+    _M_name_timepunct(_S_get_c_name())
-+    { _M_initialize_timepunct(); }
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 
-+    : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), 
-+    _M_name_timepunct(_S_get_c_name())
-+    { _M_initialize_timepunct(); }
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-+				     size_t __refs) 
-+    : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
-+    _M_name_timepunct(__s)
-+    { 
-+      char* __tmp = new char[std::strlen(__s) + 1];
-+      std::strcpy(__tmp, __s);
-+      _M_name_timepunct = __tmp;
-+      _M_initialize_timepunct(__cloc); 
-+    }
-+
-+  template<typename _CharT>
-+    __timepunct<_CharT>::~__timepunct()
-+    { 
-+      if (_M_name_timepunct != _S_get_c_name())
-+	delete [] _M_name_timepunct;
-+      delete _M_data; 
-+      _S_destroy_c_locale(_M_c_locale_timepunct); 
-+    }
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -5764,7 +5764,7 @@
-   enableval="$enable_clocale"
- 
-       case "$enableval" in
--       generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
-+       generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
-        *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
- echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
-    { (exit 1); exit 1; }; } ;;
-@@ -5789,6 +5789,9 @@
-   # Default to "generic".
-   if test $enable_clocale_flag = auto; then
-     case ${target_os} in
-+      linux-uclibc*)
-+        enable_clocale_flag=uclibc
-+	;;
-       linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6019,6 +6022,76 @@
-       CTIME_CC=config/locale/generic/time_members.cc
-       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-       ;;
-+    uclibc)
-+      echo "$as_me:$LINENO: result: uclibc" >&5
-+echo "${ECHO_T}uclibc" >&6
-+
-+      # Declare intention to use gettext, and add support for specific
-+      # languages.
-+      # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
-+      ALL_LINGUAS="de fr"
-+
-+      # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
-+      # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$check_msgfmt"; then
-+  ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_check_msgfmt="yes"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
-+fi
-+fi
-+check_msgfmt=$ac_cv_prog_check_msgfmt
-+if test -n "$check_msgfmt"; then
-+  echo "$as_me:$LINENO: result: $check_msgfmt" >&5
-+echo "${ECHO_T}$check_msgfmt" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+      if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
-+        USE_NLS=yes
-+      fi
-+      # Export the build objects.
-+      for ling in $ALL_LINGUAS; do \
-+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
-+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
-+      done
-+
-+
-+
-+      CLOCALE_H=config/locale/uclibc/c_locale.h
-+      CLOCALE_CC=config/locale/uclibc/c_locale.cc
-+      CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
-+      CCOLLATE_CC=config/locale/uclibc/collate_members.cc
-+      CCTYPE_CC=config/locale/uclibc/ctype_members.cc
-+      CMESSAGES_H=config/locale/uclibc/messages_members.h
-+      CMESSAGES_CC=config/locale/uclibc/messages_members.cc
-+      CMONEY_CC=config/locale/uclibc/monetary_members.cc
-+      CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
-+      CTIME_H=config/locale/uclibc/time_members.h
-+      CTIME_CC=config/locale/uclibc/time_members.cc
-+      CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
-+      ;;
-   esac
- 
-   # This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/include/c_compatibility/wchar.h
-+++ gcc/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -101,7 +101,9 @@
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
- 
- #if _GLIBCXX_USE_C99
- using std::wcstold;
---- gcc/libstdc++-v3/include/c_std/std_cwchar.h
-+++ gcc/libstdc++-v3/include/c_std/std_cwchar.h
-@@ -182,7 +182,9 @@
-   using ::wcscoll;
-   using ::wcscpy;
-   using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
-   using ::wcsftime;
-+#endif
-   using ::wcslen;
-   using ::wcsncat;
-   using ::wcsncmp;
diff --git a/toolchain/gcc/4.2.4/203-uclibc-locale-no__x.patch b/toolchain/gcc/4.2.4/203-uclibc-locale-no__x.patch
deleted file mode 100644
index 6ba47003b3..0000000000
--- a/toolchain/gcc/4.2.4/203-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,213 +0,0 @@
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2006-03-10 15:32:37 +0100
-@@ -60,4 +60,49 @@
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif 
- 
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+#  define __iswctype_l iswctype_l
-+#  define __towlower_l towlower_l
-+#  define __towupper_l towupper_l
-+#  define __wcscoll_l wcscoll_l
-+#  define __wcsftime_l wcsftime_l
-+#  define __wcsxfrm_l wcsxfrm_l
-+#  define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L)       nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
-+# define __strtod_l(S, E, L)         strtod((S), (E))
-+# define __strtof_l(S, E, L)         strtof((S), (E))
-+# define __strtold_l(S, E, L)        strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c)        NULL
-+# define __freelocale(a)             ((void)0)
-+# define __duplocale(a)              __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+#  define __iswctype_l(C, M, L)       iswctype((C), (M))
-+#  define __towlower_l(C, L)          towlower((C))
-+#  define __towupper_l(C, L)          towupper((C))
-+#  define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
-+//#  define __wcsftime_l(S, M, F, T, L)  wcsftime((S), (M), (F), (T)) 
-+#  define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
-+#  define __wctype_l(S, L)            wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc	2006-03-10 15:32:37 +0100
-@@ -39,20 +39,6 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
--#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
--#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
--#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
--#define __strtof_l(S, E, L)         strtof((S), (E))
--#define __strtod_l(S, E, L)         strtod((S), (E))
--#define __strtold_l(S, E, L)        strtold((S), (E))
--#warning should dummy __newlocale check for C|POSIX ?
--#define __newlocale(a, b, c)        NULL
--#define __freelocale(a)             ((void)0)
--#define __duplocale(a)              __c_locale()
--#endif
--
- namespace std 
- {
-   template<>
---- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc	2006-03-10 15:32:37 +0100
-@@ -36,13 +36,6 @@
- #include <locale>
- #include <bits/c++locale_internal.h>
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
--#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
--#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
--#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
--#endif
--
- namespace std
- {
-   // These are basically extensions to char_traits, and perhaps should
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:32:37 +0100
-@@ -43,10 +43,6 @@
- #warning tailor for stub locale support
- #endif
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L)         nl_langinfo((N))
--#endif
--
- namespace std
- {
-   // Construct and return valid pattern consisting of some combination of:
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:32:37 +0100
-@@ -41,9 +41,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L)         nl_langinfo((N))
--#endif
- 
- namespace std
- {
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc	2006-03-10 15:32:37 +0100
-@@ -40,9 +40,6 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning tailor for stub locale support
- #endif
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __nl_langinfo_l(N, L)         nl_langinfo((N))
--#endif
- 
- namespace std
- {
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2006-03-10 15:32:37 +0100
-@@ -38,13 +38,6 @@
- #undef _LIBC
- #include <bits/c++locale_internal.h>
- 
--#ifndef __UCLIBC_HAS_XLOCALE__
--#define __wctype_l(S, L)           wctype((S))
--#define __towupper_l(C, L)         towupper((C))
--#define __towlower_l(C, L)         towlower((C))
--#define __iswctype_l(C, M, L)      iswctype((C), (M))
--#endif
--
- namespace std
- {
-   // NB: The other ctype<char> specializations are in src/locale.cc and
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc	2006-03-10 15:32:37 +0100
-@@ -39,13 +39,10 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix gettext stuff
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__dcgettext(const char *domainname,
--			     const char *msgid, int category);
- #undef gettext
--#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
- 
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-03-10 15:32:37 +0100
-@@ -36,15 +36,11 @@
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--extern "C" char *__textdomain(const char *domainname);
--extern "C" char *__bindtextdomain(const char *domainname,
--				  const char *dirname);
--#else
--#undef __textdomain
--#undef __bindtextdomain
--#define __textdomain(D)           ((void)0)
--#define __bindtextdomain(D,P)     ((void)0)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D)           ((void)0)
-+#define bindtextdomain(D,P)     ((void)0)
- #endif
- 
-   // Non-virtual member functions.
-@@ -70,7 +66,7 @@
-     messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
- 			   const char* __dir) const
-     { 
--      __bindtextdomain(__s.c_str(), __dir);
-+      bindtextdomain(__s.c_str(), __dir);
-       return this->do_open(__s, __loc); 
-     }
- 
-@@ -90,7 +86,7 @@
-     { 
-       // No error checking is done, assume the catalog exists and can
-       // be used.
--      __textdomain(__s.c_str());
-+      textdomain(__s.c_str());
-       return 0;
-     }
- 
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h	2006-03-10 15:32:37 +0100
-@@ -68,6 +68,7 @@
- {
-   extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
- 
- namespace std
diff --git a/toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch b/toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 160ab35bb3..0000000000
--- a/toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100
-@@ -401,7 +401,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
-@@ -556,7 +556,7 @@
- # ifdef __UCLIBC_HAS_XLOCALE__
- 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# elif defined __UCLIBC_HAS_LOCALE__
- 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
- # endif
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:37:27 +0100
-@@ -127,12 +127,25 @@
- 	{
- 	  // Named locale.
- 	  // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#endif
-+#ifdef __UCLIBC__
-+# ifdef __UCLIBC_HAS_XLOCALE__
-+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
-+# elif defined __UCLIBC_HAS_LOCALE__
-+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
-+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
-+# endif
-+#else
- 	  union { char *__s; wchar_t __w; } __u;
- 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
- 	  _M_data->_M_decimal_point = __u.__w;
- 
- 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
- 	  _M_data->_M_thousands_sep = __u.__w;
-+#endif
- 
- 	  if (_M_data->_M_thousands_sep == L'\0')
- 	    _M_data->_M_grouping = "";
diff --git a/toolchain/gcc/4.2.4/205-uclibc-locale-update.patch b/toolchain/gcc/4.2.4/205-uclibc-locale-update.patch
deleted file mode 100644
index 86b2844554..0000000000
--- a/toolchain/gcc/4.2.4/205-uclibc-locale-update.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200_update~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc	2006-03-10 15:39:14 +0100
-@@ -46,16 +47,13 @@
-     __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  float __f = __strtof_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __f;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      float __f = __strtof_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __f;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   template<>
-@@ -63,16 +61,13 @@
-     __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  double __d = __strtod_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __d;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      double __d = __strtod_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __d;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   template<>
-@@ -80,16 +75,13 @@
-     __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  long double __ld = __strtold_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __ld;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      long double __ld = __strtold_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __ld;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   void
-@@ -110,7 +102,7 @@
-   void
-   locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-   {
--    if (_S_get_c_locale() != __cloc)
-+    if (__cloc && _S_get_c_locale() != __cloc)
-       __freelocale(__cloc); 
-   }
- 
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200_update~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- namespace std
-@@ -138,20 +143,34 @@
-   ctype<wchar_t>::
-   do_is(mask __m, wchar_t __c) const
-   { 
--    // Highest bitmask in ctype_base == 10, but extra in "C"
--    // library for blank.
-+    // The case of __m == ctype_base::space is particularly important,
-+    // due to its use in many istream functions.  Therefore we deal with
-+    // it first, exploiting the knowledge that on GNU systems _M_bit[5]
-+    // is the mask corresponding to ctype_base::space.  NB: an encoding
-+    // change would not affect correctness!
-     bool __ret = false;
--    const size_t __bitmasksize = 11; 
--    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
--      if (__m & _M_bit[__bitcur]
--	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
--	{
--	  __ret = true;
--	  break;
--	}
-+    if (__m == _M_bit[5])
-+      __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
-+    else
-+      {
-+	// Highest bitmask in ctype_base == 10, but extra in "C"
-+	// library for blank.
-+	const size_t __bitmasksize = 11;
-+	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+	  if (__m & _M_bit[__bitcur])
-+	    {
-+	      if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+		{
-+		  __ret = true;
-+		  break;
-+		}
-+	      else if (__m == _M_bit[__bitcur])
-+		break;
-+	    }
-+      }
-     return __ret;    
-   }
--  
-+
-   const wchar_t* 
-   ctype<wchar_t>::
-   do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200_update~	2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-03-10 15:39:14 +0100
-@@ -47,18 +47,21 @@
-   template<typename _CharT>
-      messages<_CharT>::messages(size_t __refs)
-      : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), 
--     _M_name_messages(_S_get_c_name())
-+       _M_name_messages(_S_get_c_name())
-      { }
- 
-   template<typename _CharT>
-      messages<_CharT>::messages(__c_locale __cloc, const char* __s, 
- 				size_t __refs) 
--     : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
--     _M_name_messages(__s)
-+     : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
-      {
--       char* __tmp = new char[std::strlen(__s) + 1];
--       std::strcpy(__tmp, __s);
-+       const size_t __len = std::strlen(__s) + 1;
-+       char* __tmp = new char[__len];
-+       std::memcpy(__tmp, __s, __len);
-        _M_name_messages = __tmp;
-+
-+       // Last to avoid leaking memory if new throws.
-+       _M_c_locale_messages = _S_clone_c_locale(__cloc);
-      }
- 
-   template<typename _CharT>
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_update~	2006-03-10 15:37:27 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@
- 	  }
- 	break;
-       default:
--	;
-+	__ret = pattern();
-       }
-     return __ret;
-   }
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_update~	2006-03-10 15:37:27 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.h.uclibc200_update~	2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h	2006-03-10 15:39:14 +0100
-@@ -37,25 +37,33 @@
-   template<typename _CharT>
-     __timepunct<_CharT>::__timepunct(size_t __refs) 
-     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
--    _M_name_timepunct(_S_get_c_name())
-+      _M_name_timepunct(_S_get_c_name())
-     { _M_initialize_timepunct(); }
- 
-   template<typename _CharT>
-     __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 
-     : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), 
--    _M_name_timepunct(_S_get_c_name())
-+      _M_name_timepunct(_S_get_c_name())
-     { _M_initialize_timepunct(); }
- 
-   template<typename _CharT>
-     __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
- 				     size_t __refs) 
-     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
--    _M_name_timepunct(__s)
-+      _M_name_timepunct(NULL)
-     { 
--      char* __tmp = new char[std::strlen(__s) + 1];
--      std::strcpy(__tmp, __s);
-+      const size_t __len = std::strlen(__s) + 1;
-+      char* __tmp = new char[__len];
-+      std::memcpy(__tmp, __s, __len);
-       _M_name_timepunct = __tmp;
--      _M_initialize_timepunct(__cloc); 
-+
-+      try
-+	{ _M_initialize_timepunct(__cloc); }
-+      catch(...)
-+	{
-+	  delete [] _M_name_timepunct;
-+	  __throw_exception_again;
-+	}
-     }
- 
-   template<typename _CharT>
---- gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h.old	2006-09-28 11:39:00.000000000 +0200
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h	2006-09-28 12:10:41.000000000 +0200
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
- 
- #include <cstring>              // get std::strlen
--#include <cstdio>               // get std::snprintf or std::sprintf
-+#include <cstdio>               // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h>		// For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h>		// For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> 		// For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h>		// For messages
- #endif
-+#include <cstdarg>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
- 
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
-- 
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@
-   typedef int*			__c_locale;
- #endif
- 
--  // Convert numeric value of type _Tv to string and return length of
--  // string.  If snprintf is available use it, otherwise fall back to
--  // the unsafe sprintf which, in general, can be dangerous and should
-+  // Convert numeric value of type double to string and return length of
-+  // string.  If vsnprintf is available use it, otherwise fall back to
-+  // the unsafe vsprintf which, in general, can be dangerous and should
-   // be avoided.
--  template<typename _Tv>
--    int
--    __convert_from_v(char* __out, 
--		     const int __size __attribute__ ((__unused__)),
--		     const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
--		     _Tv __v, const __c_locale& __cloc, int __prec)
-+    inline int
-+    __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+					__cloc __attribute__ ((__unused__))
-+#endif
-+		     ,
-+		     char* __out,
-+		     const int __size,
-+		     const char* __fmt, ...)
-     {
-+      va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-       __c_locale __old = __gnu_cxx::__uselocale(__cloc);
- #else
--		     _Tv __v, const __c_locale&, int __prec)
--    {
- # ifdef __UCLIBC_HAS_LOCALE__
-       char* __old = std::setlocale(LC_ALL, NULL);
-       char* __sav = new char[std::strlen(__old) + 1];
-@@ -103,7 +107,9 @@
- # endif
- #endif
- 
--      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+      va_start(__args, __fmt);
-+      const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+      va_end(__args);
- 
- #ifdef __UCLIBC_HAS_XCLOCALE__
-       __gnu_cxx::__uselocale(__old);
diff --git a/toolchain/gcc/4.2.4/306-libstdc++-namespace.patch b/toolchain/gcc/4.2.4/306-libstdc++-namespace.patch
deleted file mode 100644
index 69587ca63a..0000000000
--- a/toolchain/gcc/4.2.4/306-libstdc++-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h
---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 13:06:56.000000000 +0100
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 15:23:41.000000000 +0100
-@@ -32,7 +32,8 @@
- //
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
- 	 }
-      }
-+}
-diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h
---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 13:06:56.000000000 +0100
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 15:20:31.000000000 +0100
-@@ -33,7 +33,8 @@
- //
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
-   template<typename _CharT>
-     __timepunct<_CharT>::__timepunct(size_t __refs) 
-     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
-@@ -74,3 +75,4 @@
-       delete _M_data; 
-       _S_destroy_c_locale(_M_c_locale_timepunct); 
-     }
-+}

From 9c35b09873f4d73fcadf7efdcd05b78b49477a55 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 11 Mar 2011 23:06:16 +0100
Subject: [PATCH 0041/6849] samba: rename CVE-2011-0719 patch so other patches
 gets applied as well

Otherwise the build breaks during configure with the AC_TRY_RUN test for
getgrouplist.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...samba-3.3.14-CVE-2011-0719.patch => samba-CVE-2011-0719.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/samba/{samba-3.3.14-CVE-2011-0719.patch => samba-CVE-2011-0719.patch} (100%)

diff --git a/package/samba/samba-3.3.14-CVE-2011-0719.patch b/package/samba/samba-CVE-2011-0719.patch
similarity index 100%
rename from package/samba/samba-3.3.14-CVE-2011-0719.patch
rename to package/samba/samba-CVE-2011-0719.patch

From 03a5df1353f7f154f26edaac1d60d30976774656 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 12 Mar 2011 00:03:52 +0100
Subject: [PATCH 0042/6849] busybox: 1.18.3 cksum fix

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch

diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
new file mode 100644
index 0000000000..97b05a080a
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
@@ -0,0 +1,10 @@
+--- busybox-1.18.3/coreutils/cksum.c
++++ busybox-1.18.3-cksum/coreutils/cksum.c
+@@ -38,6 +38,7 @@ int cksum_main(int argc UNUSED_PARAM, ch
+ 
+ #define read_buf bb_common_bufsiz1
+ 		while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
++			length += bytes_read;
+ 			crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
+ 		}
+ 		close(fd);

From 05955603ce67259d8adfcea6f43033279a13dbae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 12 Mar 2011 20:38:30 +0100
Subject: [PATCH 0043/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index e9d9a2eb95..adc92987af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 2011.05, Not released yet:
 
+	Updated/fixed packages: avahi, busybox, dropbear, ffmpeg,
+	file, gnuconfig, gst-ffmpeg, imagemagick, libdnet, libpng,
+	libxml2, libxslt, mpg123, pkg-config, qt, samba, squashfs,
+	xerces, xorg-server, xz
+
 2011.02, Released February 28th, 2011:
 
 	Fixes all over the tree.

From 7266ed46535c4195e2f5cbd644bc5745992b043e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 12 Mar 2011 22:10:56 +0100
Subject: [PATCH 0044/6849] Makefile.package.in: make <pkg>_SOURCE optional

For packages where the sources are included in buildroot (E.G. makedevs).
We unfortunately already use no <pkg>_SOURCE to mean <pkg>_<version>.tar.gz,
in several packages (and for git/svn/bzr support), so you need to
define <pkg>_SOURCE to the empty string to use it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 92ce4e22f8..84687d58ec 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -232,7 +232,7 @@ ifeq ($(DL_MODE),DOWNLOAD)
 		(test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \
 		$(call MESSAGE,"Downloading")
 endif
-	$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))
+	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)))
 	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
 ifeq ($(DL_MODE),DOWNLOAD)
 	$(Q)mkdir -p $(@D)
@@ -243,8 +243,8 @@ endif
 $(BUILD_DIR)/%/.stamp_extracted:
 	@$(call MESSAGE,"Extracting")
 	$(Q)mkdir -p $(@D)
-	$(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
-	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+	$(Q)$(if $($(PKG)_SOURCE),$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
+	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -)
 # some packages have messed up permissions inside
 	$(Q)chmod -R ug+rw $(@D)
 	$(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))

From 3d0a569412545d2ce650a7d38df15faf1e2137cd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 12 Mar 2011 22:19:37 +0100
Subject: [PATCH 0045/6849] makedevs: convert to GENTARGETS format

And at the same time fix target build (used host compiler, didn't add
to TARGETS).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/makedevs/makedevs.mk | 46 +++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index eee635efba..b7c9343e66 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -4,34 +4,32 @@
 #
 #############################################################
 
-MAKEDEVS_DIR=$(BUILD_DIR)/makedevs
+# source included in buildroot
+MAKEDEVS_SOURCE =
+HOST_MAKEDEVS_SOURCE =
 
-$(MAKEDEVS_DIR)/makedevs.c:
-	rm -rf $(MAKEDEVS_DIR)
-	mkdir $(MAKEDEVS_DIR)
-	cp package/makedevs/makedevs.c $(MAKEDEVS_DIR)
+define MAKEDEVS_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		package/makedevs/makedevs.c -o $(@D)/makedevs
+endef
 
-$(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)/makedevs.c
-	$(CC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $@
+define MAKEDEVS_INSTALL_TARGET_CMDS
+	install -D -m 755 $(@D)/makedevs $(TARGET_DIR)/usr/sbin/makedevs
+endef
 
-$(TARGET_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs
-	$(INSTALL) -m 755 $^ $@
+define MAKEDEVS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/makedevs
+endef
 
-makedevs: $(TARGET_DIR)/usr/bin/makedevs
-makedevs-source:
 
-HOST_MAKEDEVS_DIR=$(BUILD_DIR)/host-makedevs
+define HOST_MAKEDEVS_BUILD_CMDS
+	$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+		package/makedevs/makedevs.c -o $(@D)/makedevs
+endef
 
-$(HOST_MAKEDEVS_DIR)/makedevs.c:
-	rm -rf $(HOST_MAKEDEVS_DIR)
-	mkdir $(HOST_MAKEDEVS_DIR)
-	cp package/makedevs/makedevs.c $(HOST_MAKEDEVS_DIR)
+define HOST_MAKEDEVS_INSTALL_CMDS
+	install -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs
+endef
 
-$(HOST_MAKEDEVS_DIR)/makedevs: $(HOST_MAKEDEVS_DIR)/makedevs.c
-	$(CC) -Wall -Werror -O2 $(HOST_MAKEDEVS_DIR)/makedevs.c -o $@
-
-$(HOST_DIR)/usr/bin/makedevs: $(HOST_MAKEDEVS_DIR)/makedevs
-	$(INSTALL) -m 755 $^ $@
-
-host-makedevs: $(HOST_DIR)/usr/bin/makedevs
-host-makedevs-source:
+$(eval $(call GENTARGETS,package,makedevs))
+$(eval $(call GENTARGETS,package,makedevs,host))

From 707dc469aa4f51a85a62b2587ac57ef2a4db7873 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 12 Mar 2011 22:24:34 +0100
Subject: [PATCH 0046/6849] makedevs: don't call /bin/sync after creating nodes

Closes #3475

There's no real reason to sync after creating the device nodes,
and it slows down the file system image creating quite a lot on
busy systems, so get rid of it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                     | 8 ++++++--
 package/makedevs/makedevs.c | 3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index adc92987af..eafa2016b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,12 @@
 
 	Updated/fixed packages: avahi, busybox, dropbear, ffmpeg,
 	file, gnuconfig, gst-ffmpeg, imagemagick, libdnet, libpng,
-	libxml2, libxslt, mpg123, pkg-config, qt, samba, squashfs,
-	xerces, xorg-server, xz
+	libxml2, libxslt, makedevs, mpg123, pkg-config, qt, samba,
+	squashfs, xerces, xorg-server, xz
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#3475: Calling sync on large filesystems when not always necessary
 
 2011.02, Released February 28th, 2011:
 
diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c
index 79cfc609be..9fc71af54d 100644
--- a/package/makedevs/makedevs.c
+++ b/package/makedevs/makedevs.c
@@ -536,8 +536,5 @@ int main(int argc, char **argv)
 	}
 	fclose(table);
 
-	if (system("/bin/sync"))
-		bb_error_msg("sync failed, continuing anyway");
-
 	return 0;
 }

From 27c152db06d018f120e2da50fa982bbd6dedfd71 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 13 Mar 2011 21:08:26 +0100
Subject: [PATCH 0047/6849] busybox: bump 1.18.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |  2 +-
 .../busybox-1.18.3-buildsys.patch             | 10 ---
 .../busybox-1.18.3/busybox-1.18.3-cksum.patch | 10 ---
 .../busybox-1.18.3/busybox-1.18.3-klogd.patch | 45 ------------
 .../busybox-1.18.3-menuconfig.patch           | 11 ---
 .../busybox-1.18.3/busybox-1.18.3-wget.patch  | 69 -------------------
 6 files changed, 1 insertion(+), 146 deletions(-)
 delete mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
 delete mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
 delete mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
 delete mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
 delete mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index ecb3d4004d..8e432021a0 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -40,7 +40,7 @@ config BR2_BUSYBOX_VERSION
 	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
-	default "1.18.3"	if BR2_BUSYBOX_VERSION_1_18_X
+	default "1.18.4"	if BR2_BUSYBOX_VERSION_1_18_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
deleted file mode 100644
index 330b73fbb8..0000000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.18.3/Config.in
-+++ busybox-1.18.3-buildsys/Config.in
-@@ -126,7 +126,6 @@ config FEATURE_INSTALLER
- config INSTALL_NO_USR
- 	bool "Don't use /usr"
- 	default n
--	depends on FEATURE_INSTALLER
- 	help
- 	  Disable use of /usr. busybox --install and "make install"
- 	  will install applets only to /bin and /sbin,
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
deleted file mode 100644
index 97b05a080a..0000000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-cksum.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.18.3/coreutils/cksum.c
-+++ busybox-1.18.3-cksum/coreutils/cksum.c
-@@ -38,6 +38,7 @@ int cksum_main(int argc UNUSED_PARAM, ch
- 
- #define read_buf bb_common_bufsiz1
- 		while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
-+			length += bytes_read;
- 			crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
- 		}
- 		close(fd);
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
deleted file mode 100644
index 2272cd0030..0000000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- busybox-1.18.3/sysklogd/klogd.c
-+++ busybox-1.18.3-klogd/sysklogd/klogd.c
-@@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, ch
- 	 */
- 	klogd_open();
- 	openlog("kernel", 0, LOG_KERN);
-+	/*
-+	 * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER
-+	 * above. The logic behind this is that standard
-+	 * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html
-+	 * says the following about openlog and syslog:
-+	 * "LOG_USER
-+	 *  Messages generated by arbitrary processes.
-+	 *  This is the default facility identifier if none is specified."
-+	 *
-+	 * I believe glibc misinterpreted this text as "if openlog's
-+	 * third parameter is 0 (=LOG_KERN), treat it as LOG_USER".
-+	 * Whereas it was meant to say "if *syslog* is called with facility
-+	 * 0 in its 1st parameter without prior call to openlog, then perform
-+	 * implicit openlog(LOG_USER)".
-+	 *
-+	 * As a result of this, eh, feature, standard klogd was forced
-+	 * to open-code its own openlog and syslog implementation (!).
-+	 *
-+	 * Note that prohibiting openlog(LOG_KERN) on libc level does not
-+	 * add any security: any process can open a socket to "/dev/log"
-+	 * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message"
-+	 *
-+	 * Google code search tells me there is no widespread use of
-+	 * openlog("foo", 0, 0), thus fixing glibc won't break userspace.
-+	 *
-+	 * The bug against glibc was filed:
-+	 * bugzilla.redhat.com/show_bug.cgi?id=547000
-+	 */
- 
- 	if (i)
- 		klogd_setloglevel(i);
- 
--	bb_signals(BB_FATAL_SIGS, record_signo);
- 	signal(SIGHUP, SIG_IGN);
-+	/* We want klogd_read to not be restarted, thus _norestart: */
-+	bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
- 
- 	syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
- 
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
deleted file mode 100644
index 3fc3edab73..0000000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.18.3/scripts/kconfig/mconf.c
-+++ busybox-1.18.3-menuconfig/scripts/kconfig/mconf.c
-@@ -256,7 +256,7 @@ search_help[] = N_(
- 	"          USB$ => find all CONFIG_ symbols ending with USB\n"
- 	"\n");
- 
--static char buf[4096], *bufptr = buf;
-+static char buf[4096*10], *bufptr = buf;
- static char input_buf[4096];
- static const char filename[] = ".config";
- static char *args[1024], **argptr = args;
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
deleted file mode 100644
index c7ea7365db..0000000000
--- a/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- busybox-1.18.3/networking/wget.c
-+++ busybox-1.18.3-wget/networking/wget.c
-@@ -446,7 +446,7 @@ static FILE* prepare_ftp_session(FILE **
- 
- static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
- {
--	char buf[512];
-+	char buf[4*1024]; /* made bigger to speed up local xfers */
- #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
- # if ENABLE_FEATURE_WGET_TIMEOUT
- 	unsigned second_cnt;
-@@ -506,8 +506,11 @@ static void NOINLINE retrieve_file_data(
- 			G.transferred += n;
- 			progress_meter(PROGRESS_BUMP);
- #endif
--			if (G.got_clen)
-+			if (G.got_clen) {
- 				G.content_len -= n;
-+				if (G.content_len == 0)
-+					break;
-+			}
- 		}
- 
- 		if (!G.chunked)
-@@ -706,6 +709,11 @@ int wget_main(int argc UNUSED_PARAM, cha
- 		fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
- 			target.host, user_agent);
- 
-+		/* Ask server to close the connection as soon as we are done
-+		 * (IOW: we do not intend to send more requests)
-+		 */
-+		fprintf(sfp, "Connection: close\r\n");
-+
- #if ENABLE_FEATURE_WGET_AUTHENTICATION
- 		if (target.user) {
- 			fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
-@@ -719,22 +727,25 @@ int wget_main(int argc UNUSED_PARAM, cha
- 
- 		if (G.beg_range)
- 			fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
-+
- #if ENABLE_FEATURE_WGET_LONG_OPTIONS
- 		if (extra_headers)
- 			fputs(extra_headers, sfp);
- 
- 		if (opt & WGET_OPT_POST_DATA) {
- 			char *estr = URL_escape(post_data);
--			fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");
--			fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",
--					(int) strlen(estr), estr);
--			/*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/
--			/*fprintf(sfp, "%s\r\n", estr);*/
-+			fprintf(sfp,
-+				"Content-Type: application/x-www-form-urlencoded\r\n"
-+				"Content-Length: %u\r\n"
-+				"\r\n"
-+				"%s",
-+				(int) strlen(estr), estr
-+			);
- 			free(estr);
- 		} else
- #endif
--		{ /* If "Connection:" is needed, document why */
--			fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");
-+		{
-+			fprintf(sfp, "\r\n");
- 		}
- 
- 		fflush(sfp);

From 308bc537919e0ea4dfbeda0889de9e6c14a73640 Mon Sep 17 00:00:00 2001
From: Hector Oron <hector.oron@gmail.com>
Date: Sun, 13 Mar 2011 21:28:18 +0100
Subject: [PATCH 0048/6849] fakeroot: fix download URL

Closes #3451

The Debian package snapshot service moved to an official debian.org
address last year (http://www.debian.org/News/2010/20100412) with a
slightly different URL structure, so adjust the download URL to match.

Signed-off-by: Hector Oron <hector.oron@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                      | 9 +++++----
 package/fakeroot/fakeroot.mk | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index eafa2016b4..9f5ad597c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,13 @@
 2011.05, Not released yet:
 
-	Updated/fixed packages: avahi, busybox, dropbear, ffmpeg,
-	file, gnuconfig, gst-ffmpeg, imagemagick, libdnet, libpng,
-	libxml2, libxslt, makedevs, mpg123, pkg-config, qt, samba,
-	squashfs, xerces, xorg-server, xz
+	Updated/fixed packages: avahi, busybox, dropbear, fakeroot,
+	ffmpeg, file, gnuconfig, gst-ffmpeg, imagemagick, libdnet,
+	libpng, libxml2, libxslt, makedevs, mpg123, pkg-config, qt,
+	samba, squashfs, xerces, xorg-server, xz
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3451: fakeroot package: wrong FAKEROOT_SITE variable
 	#3475: Calling sync on large filesystems when not always necessary
 
 2011.02, Released February 28th, 2011:
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 347a6410a3..a67280486f 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -5,7 +5,7 @@
 #############################################################
 FAKEROOT_VERSION:=1.9.5
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
-FAKEROOT_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/f/fakeroot/
+FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
 
 define FAKEROOT_PATCH_FAKEROOT_IN
 	# If using busybox getopt, make it be quiet.

From 39aafe84c1be0d267f87dc98015ae7fbb62394e2 Mon Sep 17 00:00:00 2001
From: Hector Oron <hector.oron@gmail.com>
Date: Sun, 13 Mar 2011 21:33:53 +0100
Subject: [PATCH 0049/6849] alsamixergui: fix download URL

Closes #3457

The Debian package snapshot service moved to an official debian.org
address last year (http://www.debian.org/News/2010/20100412) with a
slightly different URL structure, so adjust the download URL to match.

Signed-off-by: Hector Oron <hector.oron@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                              | 10 ++++++----
 package/alsamixergui/alsamixergui.mk |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9f5ad597c4..a6d18f9f28 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,15 @@
 2011.05, Not released yet:
 
-	Updated/fixed packages: avahi, busybox, dropbear, fakeroot,
-	ffmpeg, file, gnuconfig, gst-ffmpeg, imagemagick, libdnet,
-	libpng, libxml2, libxslt, makedevs, mpg123, pkg-config, qt,
-	samba, squashfs, xerces, xorg-server, xz
+	Updated/fixed packages: alsamixergui, avahi, busybox,
+	dropbear, fakeroot, ffmpeg, file, gnuconfig, gst-ffmpeg,
+	imagemagick, libdnet, libpng, libxml2, libxslt, makedevs,
+	mpg123, pkg-config, qt, samba, squashfs, xerces, xorg-server,
+	xz
 
 	Issues resolved (http://bugs.uclibc.org):
 
 	#3451: fakeroot package: wrong FAKEROOT_SITE variable
+	#3457: alsamixergui: broken URL
 	#3475: Calling sync on large filesystems when not always necessary
 
 2011.02, Released February 28th, 2011:
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index 374e9e33da..a8ed0ef660 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -5,10 +5,8 @@
 #############################################################
 ALSAMIXERGUI_VERSION = 0.9.0rc2-1
 ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
-ALSAMIXERGUI_SITE = http://snapshot.debian.net/archive/2008/03/19/debian/pool/main/a/alsamixergui
+ALSAMIXERGUI_SITE = http://snapshot.debian.org/archive/debian/20080319T000000Z/pool/main/a/alsamixergui/
 ALSAMIXERGUI_AUTORECONF = YES
-ALSAMIXERGUI_INSTALL_STAGING = NO
-ALSAMIXERGUI_INSTALL_TARGET = YES
 
 ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
 			ac_cv_lib_fltk_fl_numericsort=yes \

From 950ee4585b7d941c264cbe2b597845fcb5e3eef8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 13 Mar 2011 21:42:06 +0100
Subject: [PATCH 0050/6849] grub: fix download URL

The Debian package snapshot service moved to an official debian.org
address last year (http://www.debian.org/News/2010/20100412) with a
slightly different URL structure, so adjust the download URL to match.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/grub/grub.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 401d346406..9461d1cbde 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -5,7 +5,7 @@
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
 GRUB_PATCH:=grub_0.97-35.diff.gz
-GRUB_SITE:=http://snapshot.debian.net/archive/2008/03/29/debian/pool/main/g/grub/
+GRUB_SITE:=http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/
 GRUB_PATCH_SITE:=$(GRUB_SITE)
 GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97

From b698051d599206a9b90e425a8fc54225410dd762 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 13 Mar 2011 23:46:54 +0100
Subject: [PATCH 0051/6849] fakeroot: use --program-prefix rather than manually
 renaming binaries

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fakeroot/fakeroot.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index a67280486f..8061443d78 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -6,6 +6,7 @@
 FAKEROOT_VERSION:=1.9.5
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
+FAKEROOT_CONF_OPT = --program-prefix=''
 
 define FAKEROOT_PATCH_FAKEROOT_IN
 	# If using busybox getopt, make it be quiet.
@@ -15,14 +16,5 @@ endef
 
 FAKEROOT_POST_PATCH_HOOKS += FAKEROOT_PATCH_FAKEROOT_IN
 
-define FAKEROOT_RENAME_TARGET_BINARIES
-	-mv $(TARGET_DIR)/usr/bin/$(ARCH)-*-faked \
-		$(TARGET_DIR)/usr/bin/faked
-	-mv $(TARGET_DIR)/usr/bin/$(ARCH)-*-fakeroot \
-		$(TARGET_DIR)/usr/bin/fakeroot
-endef
-
-FAKEROOT_POST_INSTALL_TARGET_HOOKS += FAKEROOT_RENAME_TARGET_BINARIES
-
 $(eval $(call AUTOTARGETS,package,fakeroot))
 $(eval $(call AUTOTARGETS,package,fakeroot,host))

From 915ad4cdbba1a52e6f88b9a39d030632a1901f86 Mon Sep 17 00:00:00 2001
From: Chih-Min Chao <cmchao@gmail.com>
Date: Fri, 11 Mar 2011 16:13:27 +0800
Subject: [PATCH 0052/6849] alsa-lib : bump to 1.0.24.1

Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/alsa-lib/alsa-lib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 2085a972de..317e78fa4a 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -3,7 +3,7 @@
 # alsa-lib
 #
 #############################################################
-ALSA_LIB_VERSION = 1.0.23
+ALSA_LIB_VERSION = 1.0.24.1
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
 ALSA_LIB_INSTALL_STAGING = YES

From 8ddc9da39ca0eaf67dbf458e8d6799bc78169a53 Mon Sep 17 00:00:00 2001
From: Chih-Min Chao <cmchao@gmail.com>
Date: Fri, 11 Mar 2011 16:13:28 +0800
Subject: [PATCH 0053/6849] alsa-utils: bump to 1.0.24.2

[Peter: fix exp10 breakage on uClibc]
Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../alsa-utils-exp10-workaround.patch         | 33 +++++++++++++++++++
 package/multimedia/alsa-utils/alsa-utils.mk   |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch

diff --git a/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch b/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch
new file mode 100644
index 0000000000..f4a520a5c3
--- /dev/null
+++ b/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch
@@ -0,0 +1,33 @@
+From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 14 Mar 2011 09:19:18 +0100
+Subject: [PATCH] alsamixer: fix build on uClibc
+
+exp10 is a glibc extension, which isn't supported on uClibc. Luckily,
+exp10() is trivial to compute based on exp(), so add a wrapper for
+the uClibc case.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ alsamixer/volume_mapping.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c
+index 9cacad8..1c0d7c4 100644
+--- a/alsamixer/volume_mapping.c
++++ b/alsamixer/volume_mapping.c
+@@ -37,6 +37,11 @@
+ #include <stdbool.h>
+ #include "volume_mapping.h"
+ 
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
++
+ #define MAX_LINEAR_DB_SCALE	24
+ 
+ static inline bool use_linear_dB_scale(long dBmin, long dBmax)
+-- 
+1.7.2.3
+
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 4ab49d3d63..26c270bac4 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -3,7 +3,7 @@
 # alsa-utils
 #
 #############################################################
-ALSA_UTILS_VERSION = 1.0.23
+ALSA_UTILS_VERSION = 1.0.24.2
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
 ALSA_UTILS_INSTALL_STAGING = YES

From 9e1c8ad85edb69735da151276e086b599d77e2ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Mar 2011 21:17:21 +0100
Subject: [PATCH 0054/6849] gst-plugins-good: bump version

Fixes v4l2src building with 2.6.38-rc1+ kernel headers.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/gst-plugins-good.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 10044e7d8a..8fbd120a91 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -3,7 +3,7 @@
 # gst-plugins-good
 #
 #############################################################
-GST_PLUGINS_GOOD_VERSION = 0.10.27
+GST_PLUGINS_GOOD_VERSION = 0.10.28
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 

From 25e5ee52c018d2f9f811d61711682ff1a1fd2477 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Mar 2011 10:44:32 -0300
Subject: [PATCH 0055/6849] xterm: fix dependencies and bump to version 267

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xterm/Config.in | 1 +
 package/xterm/xterm.mk  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/xterm/Config.in b/package/xterm/Config.in
index 9473fad85e..99c89cfc78 100644
--- a/package/xterm/Config.in
+++ b/package/xterm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XTERM
 	bool "xterm"
+	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_XLIB_LIBXAW
 	depends on BR2_PACKAGE_XORG7
 	help
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index 8952e24dfc..ab3fc10bdc 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-XTERM_VERSION:=262
-XTERM_SOURCE:=xterm-$(XTERM_VERSION).tgz
-XTERM_SITE:=ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = xserver_xorg-server xlib_libXaw
+XTERM_VERSION = 267
+XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
+XTERM_SITE = ftp://invisible-island.net/xterm
+XTERM_DEPENDENCIES = ncurses xserver_xorg-server xlib_libXaw
 XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 $(eval $(call AUTOTARGETS,package,xterm))

From b05c54daf0066f29bd2542bea637f646a7fbb4d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Mar 2011 23:36:12 +0100
Subject: [PATCH 0056/6849] xterm: fix dependencies

xterm doesn't need the xserver to build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xterm/xterm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index ab3fc10bdc..d5d193d742 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -7,7 +7,7 @@
 XTERM_VERSION = 267
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
 XTERM_SITE = ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = ncurses xserver_xorg-server xlib_libXaw
+XTERM_DEPENDENCIES = ncurses xlib_libXaw
 XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 $(eval $(call AUTOTARGETS,package,xterm))

From 6eaedac150c9cf9c6d11beb9278adf60a1a83e6c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Mar 2011 23:59:10 +0100
Subject: [PATCH 0057/6849] alsa-utils: fix dependencies

Most alsa utilites depend on specific alsa-lib options, so ensure those
are selected. Arecord is furthermore just a symlink to aplay these days,
so get rid of the option.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/alsa-utils/Config.in     | 16 ++++++++++++----
 package/multimedia/alsa-utils/alsa-utils.mk |  3 +--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
index b85ff7e558..c65e33f83d 100644
--- a/package/multimedia/alsa-utils/Config.in
+++ b/package/multimedia/alsa-utils/Config.in
@@ -27,6 +27,7 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
 	select BR2_PACKAGE_NCURSES_TARGET_PANEL
 	select BR2_PACKAGE_NCURSES_TARGET_FORM
 	select BR2_PACKAGE_NCURSES_TARGET_MENU
+	select BR2_PACKAGE_ALSA_LIB_MIXER
 	depends on BR2_USE_WCHAR
 	default y
 
@@ -34,36 +35,43 @@ comment "alsamixer requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
 
 config BR2_PACKAGE_ALSA_UTILS_AMIDI
+	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
 	bool "amidi"
 
 config BR2_PACKAGE_ALSA_UTILS_AMIXER
+	select BR2_PACKAGE_ALSA_LIB_MIXER
 	bool "amixer"
 
 config BR2_PACKAGE_ALSA_UTILS_APLAY
-	bool "aplay"
-
-config BR2_PACKAGE_ALSA_UTILS_ARECORD
-	bool "arecord"
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	bool "aplay/arecord"
 
 config BR2_PACKAGE_ALSA_UTILS_IECSET
+	select BR2_PACKAGE_ALSA_LIB_PCM
 	bool "iecset"
 
 config BR2_PACKAGE_ALSA_UTILS_ACONNECT
+	select BR2_PACKAGE_ALSA_LIB_SEQ
 	bool "aconnect"
 
 config BR2_PACKAGE_ALSA_UTILS_APLAYMIDI
+	select BR2_PACKAGE_ALSA_LIB_SEQ
 	bool "aplaymidi"
 
 config BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI
+	select BR2_PACKAGE_ALSA_LIB_SEQ
 	bool "arecordmidi"
 
 config BR2_PACKAGE_ALSA_UTILS_ASEQDUMP
+	select BR2_PACKAGE_ALSA_LIB_SEQ
 	bool "aseqdump"
 
 config BR2_PACKAGE_ALSA_UTILS_ASEQNET
+	select BR2_PACKAGE_ALSA_LIB_SEQ
 	bool "aseqnet"
 
 config BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST
+	select BR2_PACKAGE_ALSA_LIB_PCM
 	bool "speaker-test"
 
 endmenu
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 26c270bac4..d5c34d3074 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -26,8 +26,7 @@ ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIXER) += usr/bin/amixer
-ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay
-ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORD) += usr/bin/arecord
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay usr/bin/arecord
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_IECSET) += usr/bin/iecset
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAYMIDI) += usr/bin/aplaymidi

From 05e9c80832cc035efe3c52da9263b094803dc876 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 Mar 2011 00:01:39 +0100
Subject: [PATCH 0058/6849] kernel-headers: bump 2.6.37.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index da9f3ffe36..71498361b8 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -47,6 +47,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.34.8"	if BR2_KERNEL_HEADERS_2_6_34
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
-	default "2.6.37.3"	if BR2_KERNEL_HEADERS_2_6_37
+	default "2.6.37.4"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From cfde89c0972ceed774bac9658a0138f55a2d61f6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 Mar 2011 00:02:55 +0100
Subject: [PATCH 0059/6849] linux: bump 2.6.37.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9d514c55dc..bdfdf9a644 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_37
 
 config BR2_LINUX_KERNEL_2_6_37
-	bool "2.6.37.2"
+	bool "2.6.37.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.37" if BR2_LINUX_KERNEL_2_6_37
+	default "2.6.37.4" if BR2_LINUX_KERNEL_2_6_37
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From aa08cb6f57a2bb979fb98ee76c9f8d0ecfe02d87 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 Mar 2011 09:09:32 +0100
Subject: [PATCH 0060/6849] kernel-headers: add 2.6.38, remove 2.6.34.x

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in            | 13 ++--
 toolchain/kernel-headers/kernel-headers.mk    |  2 +-
 ...s-for-headers-exported-to-user-space.patch | 59 -------------------
 3 files changed, 7 insertions(+), 67 deletions(-)
 delete mode 100644 toolchain/kernel-headers/linux-2.6.34.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 71498361b8..3bb7470068 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_2_6_37
+	default BR2_KERNEL_HEADERS_2_6_38
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -15,10 +15,6 @@ choice
 	  For the snapshot, you have to provide the
 	  linux-2.6.tar.bz2 tarball in your download dir.
 
-	config BR2_KERNEL_HEADERS_2_6_34
-		depends on BR2_DEPRECATED
-		bool "Linux 2.6.34.x kernel headers"
-
 	config BR2_KERNEL_HEADERS_2_6_35
 		bool "Linux 2.6.35.x kernel headers"
 
@@ -28,6 +24,9 @@ choice
 	config BR2_KERNEL_HEADERS_2_6_37
 		bool "Linux 2.6.37.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_2_6_38
+		bool "Linux 2.6.38.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -40,13 +39,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 	depends on BR2_KERNEL_HEADERS_VERSION
 	help
 	  Specify the version you want to use.
-	  E.G.: 2.6.37
+	  E.G.: 2.6.38
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.34.8"	if BR2_KERNEL_HEADERS_2_6_34
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.4"	if BR2_KERNEL_HEADERS_2_6_37
+	default "2.6.38"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 7d2e45bf5e..079497ae31 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -33,7 +33,7 @@ LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION)
 LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux
 
 # long term support kernels are stored in a longterm/v2.6.x subdir
-ifeq ($(BR2_KERNEL_HEADERS_2_6_34)$(BR2_KERNEL_HEADERS_2_6_35),y)
+ifeq ($(BR2_KERNEL_HEADERS_2_6_35),y)
 DEFAULT_KERNEL_HEADERS_MAJOR := \
 	$(shell echo $(DEFAULT_KERNEL_HEADERS) | sed 's/\.[0-9]*$$//')
 # += adds a space between
diff --git a/toolchain/kernel-headers/linux-2.6.34.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.34.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
deleted file mode 100644
index 1089c71067..0000000000
--- a/toolchain/kernel-headers/linux-2.6.34.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 27 Nov 2009 11:20:54 +0100
-Subject: [PATCH] scsi: use __uX types for headers exported to user space
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
-in include/scsi to user space, but didn't change the uX types to the
-userspace-compatible __uX types. Without that you'll get compile errors
-when including them - E.G.:
-
-/tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
-before ‘u8’
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/scsi/scsi.h         |    8 ++++----
- include/scsi/scsi_netlink.h |    4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
-index 8b4deca..ec3053e 100644
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
-diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
-index 536752c..58ce8fe 100644
---- a/include/scsi/scsi_netlink.h
-+++ b/include/scsi/scsi_netlink.h
-@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
-  *    PCI :  ID data is the 16 bit PCI Registered Vendor ID
-  */
- #define SCSI_NL_VID_TYPE_SHIFT		56
--#define SCSI_NL_VID_TYPE_MASK		((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
--#define SCSI_NL_VID_TYPE_PCI		((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
-+#define SCSI_NL_VID_TYPE_MASK		((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
-+#define SCSI_NL_VID_TYPE_PCI		((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
- #define SCSI_NL_VID_ID_MASK		(~ SCSI_NL_VID_TYPE_MASK)
- 
- 
--- 
-1.7.0
-

From ffec8419f7847868505177d78fb67de17321365d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 Mar 2011 09:10:50 +0100
Subject: [PATCH 0061/6849] linux: use 2.6.38 by default

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index bdfdf9a644..75e574f458 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_2_6_37
+	default BR2_LINUX_KERNEL_2_6_38
 
-config BR2_LINUX_KERNEL_2_6_37
-	bool "2.6.37.4"
+config BR2_LINUX_KERNEL_2_6_38
+	bool "2.6.38"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.37.2"
+	default "2.6.38"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.37.4" if BR2_LINUX_KERNEL_2_6_37
+	default "2.6.38" if BR2_LINUX_KERNEL_2_6_38
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 2ea83e9688e084c55fdba18a1e6047512af533aa Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 16 Mar 2011 10:46:49 +0100
Subject: [PATCH 0062/6849] socat: bump to version 2.0.0-b4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socat/socat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 5714b8fb0f..b110790b84 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SOCAT_VERSION = 2.0.0-b2
+SOCAT_VERSION = 2.0.0-b4
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
 SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \

From b922f6404dfc64259077f1ef7b7f545b99397413 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 16 Mar 2011 22:28:13 +0100
Subject: [PATCH 0063/6849] uClibc: bump 0.9.32-rc version

To -rc3 and update defconfig to match.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in            | 4 ++--
 toolchain/uClibc/uClibc-0.9.32.config | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 3b31900a44..c264ba282c 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -21,7 +21,7 @@ choice
 		bool "uClibc 0.9.31.x"
 
 	config BR2_UCLIBC_VERSION_0_9_32
-		bool "uClibc 0.9.32-rc2"
+		bool "uClibc 0.9.32-rc3"
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
@@ -40,7 +40,7 @@ config BR2_UCLIBC_VERSION_STRING
 	default 0.9.29		if BR2_UCLIBC_VERSION_0_9_29
 	default 0.9.30.3	if BR2_UCLIBC_VERSION_0_9_30
 	default 0.9.31		if BR2_UCLIBC_VERSION_0_9_31
-	default 0.9.32-rc2	if BR2_UCLIBC_VERSION_0_9_32
+	default 0.9.32-rc3	if BR2_UCLIBC_VERSION_0_9_32
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config
index 9c83d68140..aa00680033 100644
--- a/toolchain/uClibc/uClibc-0.9.32.config
+++ b/toolchain/uClibc/uClibc-0.9.32.config
@@ -28,6 +28,7 @@
 # TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
+# TARGET_c6x is not set
 
 # CONFIG_GENERIC_ARM is not set
 # CONFIG_ARM610 is not set
@@ -109,6 +110,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set

From f7abec2d1d1e52f49f7d95c48165cde8cf41edb6 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 16 Mar 2011 17:07:08 +0100
Subject: [PATCH 0064/6849] fetch/git: clone the repository as bare

This will reduce the space used and speed up the clone as it is only
used to generate an archive, which doesn't need the git working tree.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 84687d58ec..bf4e1b49a3 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -105,7 +105,7 @@ endif
 define DOWNLOAD_GIT
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	$(GIT) clone $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
+	$(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
 	pushd $($(PKG)_BASE_NAME) > /dev/null && \
 	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
 		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \

From 5a8c7934bd704e7ff1f39b6c0c0f8e1b541f87d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 17 Mar 2011 09:13:42 +0100
Subject: [PATCH 0065/6849] icu: fix parallel builds

The icu build system seems to have a race condition, which gets triggered
by high BR2_JLEVEL settings, so disable parallel builds.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/icu/icu.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 4eddb11a3c..c1d4d00556 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -12,6 +12,7 @@ ICU_INSTALL_STAGING = YES
 ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
 		--disable-tests
 HOST_ICU_CONF_OPT = --disable-samples --disable-tests
+ICU_MAKE = $(MAKE1)
 ICU_SUBDIR = source
 HOST_ICU_SUBDIR = source
 

From 851c9b56e81eee992293c98a1843e7bcda3e3a9c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 17 Mar 2011 12:10:08 +0100
Subject: [PATCH 0066/6849] ethtool: bump version, use new upstream location

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 1fc2315260..53bbb6776e 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 2.6.35
-ETHTOOL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gkernel/
+ETHTOOL_VERSION = 2.6.38
+ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool/
 
 $(eval $(call AUTOTARGETS,package,ethtool))

From 91c4ff298cf91cd6782f5ba5c3f9e51d902d1b7a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Mar 2011 13:26:48 +0100
Subject: [PATCH 0067/6849] mtd: bump version

Fixes flash_erase argument handling (start should be in bytes, not blocks).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 8a819fa053..6b8f2c7367 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION:=1.4.2
+MTD_VERSION:=1.4.3
 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

From 24c7a24797ca7cb230da09cc7f2789206bea7a60 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 24 Mar 2011 13:11:52 +0100
Subject: [PATCH 0068/6849] kernel-headers: bump 2.6.37.x / 2.6.38.x stable
 versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 3bb7470068..85093a1990 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -45,7 +45,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
-	default "2.6.37.4"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.37.5"	if BR2_KERNEL_HEADERS_2_6_37
+	default "2.6.38.1"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 808f98e3ebc0bce5f96052fa0557ff68d33659d5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 25 Mar 2011 22:12:32 +0100
Subject: [PATCH 0069/6849] qt: dbus module doesn't depend on gui support

Seems I somehow got this wrong back in December (bff5248202).

At the same time fix a typo in the comment.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 3cc04f4cae..2eb05e4ecb 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -285,8 +285,9 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 	help
 	  Build the platform Phonon plugin.
 	  If unsure, say n.
+endif
 
-comment "Qt DBbus module not available (need dbus)"
+comment "Qt Dbus module not available (needs dbus)"
 	depends on !BR2_PACKAGE_DBUS
 
 config BR2_PACKAGE_QT_DBUS
@@ -294,7 +295,6 @@ config BR2_PACKAGE_QT_DBUS
 	depends on BR2_PACKAGE_DBUS
 	help
 	  Build the Qt DBus module.
-endif
 
 config BR2_PACKAGE_QT_XML
 	bool "XML Module"

From 6a86dd9c8eb0238a4bb8ffdd0fb04e62c12739fb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 27 Mar 2011 21:20:04 +0200
Subject: [PATCH 0070/6849] pkg-config: add usr/share/pkgconfig to search path
 as well

A few packages (like xlib_xtrans) install their .pc files here, and
upstream pkg-config defaults to searching both /usr/lib/pkgconfig and
/usr/share/pkgconfig, so add it as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in              | 2 +-
 package/pkg-config/pkg-config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index ef2c591cd6..e1ffe158b5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -241,7 +241,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_SYSROOT_DIR="/" \
-		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl" \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
 
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index bb52db87d2..7189c91aa4 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -12,7 +12,7 @@ PKG_CONFIG_DEPENDENCIES = libglib2
 PKG_CONFIG_CONF_OPT = --with-installed-glib
 
 HOST_PKG_CONFIG_CONF_OPT = \
-		--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig" \
 		--with-sysroot="$(STAGING_DIR)" \
 		--disable-static
 

From 1990a9cb926cfe41de482ae803d8e6d8c396ec6c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 27 Mar 2011 21:48:30 +0200
Subject: [PATCH 0071/6849] xlib_xtrans: drop pkgconfig patch now we're search
 usr/share/pkgconfig

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch         | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch

diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch b/package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch
deleted file mode 100644
index e8270c9bb2..0000000000
--- a/package/x11r7/xlib_xtrans/xlib_xtrans-1.2.5-fix_pkgconfig_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xlib_xtrans-1.2.5/Makefile.in.orig	2010-01-23 16:24:25.287333323 +0200
-+++ xlib_xtrans-1.2.5/Makefile.in	2010-01-23 16:25:06.336331430 +0200
-@@ -222,7 +222,7 @@ Xtransinclude_HEADERS = \
- 
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = xtrans.m4
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = xtrans.pc
- EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog Xtrans.mm
- MAINTAINERCLEANFILES = ChangeLog

From 07c469ed169e3ac8b6038a9699bc930de457405c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 27 Mar 2011 22:09:07 +0200
Subject: [PATCH 0072/6849] webkit: prefer X11 backend if both directfb and x11
 are available

This shouldn't happen with any sane configuration, but is possible with
randpackageconfig builds, where it breaks the build as libgtk would prefer
X11 and webkit directfb, causing it to fail with:

No package 'gtk+-directfb-2.0' found

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 6ab609bf26..8483c0dc35 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -14,9 +14,7 @@ WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	WEBKIT_CONF_OPT += --with-target=x11
 	WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt
-endif
-
-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+else
 	WEBKIT_CONF_OPT += --with-target=directfb
 	WEBKIT_DEPENDENCIES += directfb
 endif

From c53f5ddc7a7ce3ae980ea97eddb07762ac198cd1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 23 Mar 2011 19:42:50 -0400
Subject: [PATCH 0073/6849] ncurses: version bump to 5.8

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 0a498874dd..362f3edda4 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -23,7 +23,7 @@
 # USA
 
 # TARGETS
-NCURSES_VERSION = 5.7
+NCURSES_VERSION = 5.8
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_INSTALL_STAGING = YES

From 0c9a64dae18ffdea38feca966fa36959dc0c2b3a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 13:18:09 -0300
Subject: [PATCH 0074/6849] netsnmp: bump to version 5.6.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index e8d77881e5..edb1704f71 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.6
+NETSNMP_VERSION = 5.6.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES

From 4c5ca3d27d510146f2e7c4a7c36c1c1d632909e9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 Mar 2011 13:18:11 -0300
Subject: [PATCH 0075/6849] dnsmasq: bump to version 2.57

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 976e1d611b..d8f4d77e30 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.55
+DNSMASQ_VERSION = 2.57
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
@@ -25,7 +25,7 @@ endif
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
 	DNSMASQ_MAKE_OPT += all-i18n
 	DNSMASQ_DEPENDENCIES += libidn libintl
-	DNSMASQ_MAKE_ENV += LDFLAGS+="-lintl"
+	DNSMASQ_MAKE_ENV += LDFLAGS+="-lintl -lidn"
 endif
 
 ifneq ($(BR2_LARGEFILE),y)

From 421cda1fd078f5fa7902f05bd1d2021fd101d9ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Mar 2011 15:19:12 +0100
Subject: [PATCH 0076/6849] qt: convert to the GENTARGETS infrastructure

In addition to converting the qt package to the GENTARGETS
infrastructure, this commit also does the following (related) things
in the Qt package:

 * Create a BR2_PACKAGE_QT_CONFIG_FILE option, which can be used to
   pass a custom Qt configuration file, such as the ones found in
   src/corelib/global/qconfig-*.h. This used to be possible, but
   required changing qt.mk directly, which isn't really how we
   configure things in Buildroot.

 * Remove the BR2_PACKAGE_QT_EMB_PLATFORM option, the embedded
   platform name is now computed directly in qt.mk.

 * The QT_CONFIGURE variable, which hosted all ./configure options,
   has been renamed to QT_CONFIGURE_OPTS, for consistency with what we
   do in the AUTOTARGETS infrastructure.

 * The QT_DEP_LIBS variable has been renamed to QT_DEPENDENCIES, so
   that dependencies are properly handled by the GENTARGETS
   infrastructures.

 * The QT_QMAKE_SET macro (used to adjust the path/flags of the
   compiler/linker) has been extended with an additional argument,
   which allows to pass the source directory of Qt.

 * All the installation procedure has been rewritten to fit within the
   GENTARGETS mechanism.

[Peter: fixed minor issues pointed out by Will]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Will Wagner <willw@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in |  33 +--
 package/qt/qt.mk     | 625 ++++++++++++++++++++-----------------------
 2 files changed, 302 insertions(+), 356 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 2eb05e4ecb..b223772cfe 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -55,6 +55,19 @@ config BR2_PACKAGE_QT_LICENSE_APPROVED
 	  LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html
 	  GPL  v3.0: http://doc.trolltech.com/4.5/gpl.html
 
+config BR2_PACKAGE_QT_CONFIG_FILE
+	string "Config file"
+	help
+	  Configure options allow to set which modules are being
+	  compiled or not in Qt, but Qt also provide a more
+	  fine-grained mechanism to configure which features should be
+	  enabled or disabled, through a header file. Examples of such
+	  header files can be found in src/corelib/global/qconfig-*.h
+	  in the Qt sources.
+
+	  This option allows to set the path of such a configuration
+	  file, which Buildroot will give to Qt at compile time.
+
 config BR2_PACKAGE_QT_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	depends on BR2_PACKAGE_QT_GUI_MODULE
@@ -240,26 +253,6 @@ config BR2_PACKAGE_QT_SYSTEMZLIB
 	  Use the shared zlib from the system.
 endchoice
 
-config BR2_PACKAGE_QT_EMB_PLATFORM
-	string "The embedded platform we are making Qt for"
-	default "arm"	if BR2_arm
-	default "arm"	if BR2_armeb
-	default "avr32"	if BR2_avr32
-	default "x86"	if BR2_i386
-	default "x86_64"	if BR2_x86_64
-	default "mips"	if BR2_mips
-	default "mips"	if BR2_mipsel
-	default "powerpc"	if BR2_powerpc
-# Not that I really believe these will work..
-	default "generic"	if BR2_alpha
-	default "generic"	if BR2_chris
-	default "generic"	if BR2_m68k
-	default "generic"	if BR2_sh
-	default "generic"	if BR2_sh64
-	default "generic"	if BR2_sparc
-	help
-	  The target platform.
-
 source "package/qt/Config.sql.in"
 if BR2_PACKAGE_QT_GUI_MODULE
 source "package/qt/Config.gfx.in"
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 6974b2f1f9..8569f7d517 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,51 +12,43 @@
 #
 ######################################################################
 
-QT_VERSION:=4.7.2
-QT_SOURCE:=qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE:=http://get.qt.nokia.com/qt/source
-QT_CAT:=$(ZCAT)
-QT_TARGET_DIR:=$(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VERSION)
+QT_VERSION = 4.7.2
+QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
+QT_SITE    = http://get.qt.nokia.com/qt/source
 
-QT_CONFIGURE:=#empty
+QT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
-QT_CONFIGURE += -opensource -confirm-license
+QT_CONFIGURE_OPTS += -opensource -confirm-license
 endif
 
-# If you want extra tweaking you can copy
-# $(QT_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
-# to the qt packages directory (where this .mk file is) and
-# remove the comment.
-# QT_QCONFIG_COMMAND:=-qconfig myfile
-#
-# For the options you can set in this file, look at
-# $(QT_TARGET_DIR)/src/corelib/global/qfeatures.txt
-#
-QT_QCONFIG_FILE:=package/qt/qconfig-myfile.h
-QT_QCONFIG_FILE_LOCATION:=/src/corelib/global/
+QT_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
+
+ifneq ($(QT_CONFIG_FILE),)
+QT_CONFIGURE_OPTS += -config buildroot
+endif
 
 ifeq ($(BR2_LARGEFILE),y)
-QT_CONFIGURE+= -largefile
+QT_CONFIGURE_OPTS += -largefile
 else
-QT_CONFIGURE+= -no-largefile
+QT_CONFIGURE_OPTS += -no-largefile
 endif
 
 ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_CONFIGURE+= -qt3support
+QT_CONFIGURE_OPTS += -qt3support
 else
-QT_CONFIGURE+= -no-qt3support
+QT_CONFIGURE_OPTS += -no-qt3support
 endif
 
 ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-QT_CONFIGURE+= -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos
+QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos
 else
-QT_CONFIGURE+= -nomake examples -nomake demos
+QT_CONFIGURE_OPTS += -nomake examples -nomake demos
 endif
 
 # ensure glib is built first if enabled for Qt's glib support
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-QT_DEP_LIBS+=libglib2
+QT_DEPENDENCIES += libglib2
 endif
 
 
@@ -90,168 +82,189 @@ ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)
 QT_PIXEL_DEPTHS += 32
 endif
 ifneq ($(QT_PIXEL_DEPTHS),)
-QT_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
+QT_CONFIGURE_OPTS += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
 endif
 
 ### Display drivers
 ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
-QT_CONFIGURE += -qt-gfx-linuxfb
+QT_CONFIGURE_OPTS += -qt-gfx-linuxfb
 else
-QT_CONFIGURE += -no-gfx-linuxfb
+QT_CONFIGURE_OPTS += -no-gfx-linuxfb
 endif
 ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
-QT_CONFIGURE += -qt-gfx-transformed
+QT_CONFIGURE_OPTS += -qt-gfx-transformed
 else
-QT_CONFIGURE += -no-gfx-transformed
+QT_CONFIGURE_OPTS += -no-gfx-transformed
 endif
 ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
-QT_CONFIGURE += -qt-gfx-qvfb
+QT_CONFIGURE_OPTS += -qt-gfx-qvfb
 else
-QT_CONFIGURE += -no-gfx-qvfb
+QT_CONFIGURE_OPTS += -no-gfx-qvfb
 endif
 ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
-QT_CONFIGURE += -qt-gfx-vnc
+QT_CONFIGURE_OPTS += -qt-gfx-vnc
 else
-QT_CONFIGURE += -no-gfx-vnc
+QT_CONFIGURE_OPTS += -no-gfx-vnc
 endif
 ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
-QT_CONFIGURE += -qt-gfx-multiscreen
+QT_CONFIGURE_OPTS += -qt-gfx-multiscreen
 else
-QT_CONFIGURE += -no-gfx-multiscreen
+QT_CONFIGURE_OPTS += -no-gfx-multiscreen
 endif
 ifeq ($(BR2_PACKAGE_QT_GFX_DIRECTFB),y)
-QT_CONFIGURE += -qt-gfx-directfb
-QT_DEP_LIBS+=directfb
+QT_CONFIGURE_OPTS += -qt-gfx-directfb
+QT_DEPENDENCIES += directfb
 else
-QT_CONFIGURE += -no-gfx-directfb
+QT_CONFIGURE_OPTS += -no-gfx-directfb
 endif
 
 
 ### Mouse drivers
 ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
-QT_CONFIGURE += -qt-mouse-pc
+QT_CONFIGURE_OPTS += -qt-mouse-pc
 else
-QT_CONFIGURE += -no-mouse-pc
+QT_CONFIGURE_OPTS += -no-mouse-pc
 endif
 ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
-QT_CONFIGURE += -qt-mouse-linuxtp
+QT_CONFIGURE_OPTS += -qt-mouse-linuxtp
 else
-QT_CONFIGURE += -no-mouse-linuxtp
+QT_CONFIGURE_OPTS += -no-mouse-linuxtp
 endif
 ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXINPUT),y)
-QT_CONFIGURE += -qt-mouse-linuxinput
+QT_CONFIGURE_OPTS += -qt-mouse-linuxinput
 else
-QT_CONFIGURE += -no-mouse-linuxinput
+QT_CONFIGURE_OPTS += -no-mouse-linuxinput
 endif
 ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
-QT_CONFIGURE += -qt-mouse-tslib
-QT_DEP_LIBS+=tslib
+QT_CONFIGURE_OPTS += -qt-mouse-tslib
+QT_DEPENDENCIES += tslib
 else
-QT_CONFIGURE += -no-mouse-tslib
+QT_CONFIGURE_OPTS += -no-mouse-tslib
 endif
 ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
-QT_CONFIGURE += -qt-mouse-qvfb
+QT_CONFIGURE_OPTS += -qt-mouse-qvfb
 else
-QT_CONFIGURE += -no-mouse-qvfb
+QT_CONFIGURE_OPTS += -no-mouse-qvfb
 endif
 ifeq ($(BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR),y)
-QT_CONFIGURE+= -D QT_NO_QWS_CURSOR
+QT_CONFIGURE_OPTS += -D QT_NO_QWS_CURSOR
 endif
 
 ### Keyboard drivers
 ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
-QT_CONFIGURE += -qt-kbd-tty
+QT_CONFIGURE_OPTS += -qt-kbd-tty
 else
-QT_CONFIGURE += -no-kbd-tty
+QT_CONFIGURE_OPTS += -no-kbd-tty
 endif
 ifeq ($(BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT),y)
-QT_CONFIGURE += -qt-kbd-linuxinput
+QT_CONFIGURE_OPTS += -qt-kbd-linuxinput
 else
-QT_CONFIGURE += -no-kbd-linuxinput
+QT_CONFIGURE_OPTS += -no-kbd-linuxinput
 endif
 ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y)
-QT_CONFIGURE += -qt-kbd-qvfb
+QT_CONFIGURE_OPTS += -qt-kbd-qvfb
 else
-QT_CONFIGURE += -no-kbd-qvfb
+QT_CONFIGURE_OPTS += -no-kbd-qvfb
 endif
 
 ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
-QT_CONFIGURE+= -debug
+QT_CONFIGURE_OPTS += -debug
 else
-QT_CONFIGURE+= -release
+QT_CONFIGURE_OPTS += -release
 endif
 
 ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-QT_CONFIGURE+= -shared
+QT_CONFIGURE_OPTS += -shared
 else
-QT_CONFIGURE+= -static
+QT_CONFIGURE_OPTS += -static
 endif
 
 ifeq ($(BR2_ENDIAN),"LITTLE")
-QT_CONFIGURE+= -little-endian
+QT_CONFIGURE_OPTS += -little-endian
 else
-QT_CONFIGURE+= -big-endian
+QT_CONFIGURE_OPTS += -big-endian
 endif
 
+ifeq ($(BR2_arm),y)
+QT_EMB_PLATFORM = arm
+else ifeq ($(BR2_armeb),y)
+QT_EMB_PLATFORM = arm
+else ifeq ($(BR2_avr32),y)
+QT_EMB_PLATFORM = avr32
+else ifeq ($(BR2_i386),y)
+QT_EMB_PLATFORM = x86
+else ifeq ($(BR2_x86_64),y)
+QT_EMB_PLATFORM = x86_64
+else ifeq ($(BR2_mips),y)
+QT_EMB_PLATFORM = mips
+else ifeq ($(BR2_mipsel),y)
+QT_EMB_PLATFORM = mips
+else ifeq ($(BR2_powerpc),y)
+QT_EMB_PLATFORM = powerpc
+else
+QT_EMB_PLATFORM = generic
+endif
+
+QT_CONFIGURE_OPTS += -embedded $(QT_EMB_PLATFORM)
+
 ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_CONFIGURE+= -no-gui
+QT_CONFIGURE_OPTS += -no-gui
 endif
 
 ifeq ($(BR2_PACKAGE_QT_GIF),y)
-QT_CONFIGURE+= -qt-gif
+QT_CONFIGURE_OPTS += -qt-gif
 else
-QT_CONFIGURE+= -no-gif
+QT_CONFIGURE_OPTS += -no-gif
 endif
 
 ifeq ($(BR2_PACKAGE_QT_LIBMNG),y)
-QT_CONFIGURE+= -qt-libmng
+QT_CONFIGURE_OPTS += -qt-libmng
 else
-QT_CONFIGURE+= -no-libmng
+QT_CONFIGURE_OPTS += -no-libmng
 endif
 
 ifeq ($(BR2_PACKAGE_QT_QTZLIB),y)
-QT_CONFIGURE+= -qt-zlib
+QT_CONFIGURE_OPTS += -qt-zlib
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
-QT_CONFIGURE+= -system-zlib
-QT_DEP_LIBS+=zlib
+QT_CONFIGURE_OPTS += -system-zlib
+QT_DEPENDENCIES   += zlib
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QT_QTJPEG),y)
-QT_CONFIGURE+= -qt-libjpeg
+QT_CONFIGURE_OPTS += -qt-libjpeg
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
-QT_CONFIGURE+= -system-libjpeg
-QT_DEP_LIBS+=jpeg
+QT_CONFIGURE_OPTS += -system-libjpeg
+QT_DEPENDENCIES   += jpeg
 else
-QT_CONFIGURE+= -no-libjpeg
+QT_CONFIGURE_OPTS += -no-libjpeg
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QT_QTPNG),y)
-QT_CONFIGURE+= -qt-libpng
+QT_CONFIGURE_OPTS += -qt-libpng
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
-QT_CONFIGURE+= -system-libpng
-QT_DEP_LIBS+=libpng
+QT_CONFIGURE_OPTS += -system-libpng
+QT_DEPENDENCIES   += libpng
 else
-QT_CONFIGURE+= -no-libpng
+QT_CONFIGURE_OPTS += -no-libpng
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QT_QTTIFF),y)
-QT_CONFIGURE+= -qt-libtiff
+QT_CONFIGURE_OPTS += -qt-libtiff
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
-QT_CONFIGURE+= -system-libtiff
-QT_DEP_LIBS+=tiff
+QT_CONFIGURE_OPTS += -system-libtiff
+QT_DEPENDENCIES   += tiff
 else
-QT_CONFIGURE+= -no-libtiff
+QT_CONFIGURE_OPTS += -no-libtiff
 endif
 endif
 
-
 QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
 	   $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
 	   $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \
@@ -259,272 +272,206 @@ QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
 	   $(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \
 	   $(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont)))
 
-
 ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)
-QT_CONFIGURE+= -qt-freetype
+QT_CONFIGURE_OPTS += -qt-freetype
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
-QT_CONFIGURE+= -system-freetype
-QT_CONFIGURE+= -I $(STAGING_DIR)/usr/include/freetype2/
-QT_DEP_LIBS+=freetype
+QT_CONFIGURE_OPTS += -system-freetype
+QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
+QT_DEPENDENCIES   += freetype
 else
-QT_CONFIGURE+= -no-freetype
+QT_CONFIGURE_OPTS += -no-freetype
 endif
 endif
 
+ifeq ($(BR2_PACKAGE_QT_DBUS),y)
+QT_DEPENDENCIES   += dbus
+endif
 
 ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
-QT_CONFIGURE+= -openssl
-QT_DEP_LIBS+=openssl
+QT_CONFIGURE_OPTS += -openssl
+QT_DEPENDENCIES   += openssl
 else
-QT_CONFIGURE+= -no-openssl
+QT_CONFIGURE_OPTS += -no-openssl
 endif
 
 # Qt SQL Drivers
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
 ifeq ($(BR2_PACKAGE_QT_IBASE),y)
-QT_CONFIGURE+= -qt-sql-ibase
+QT_CONFIGURE_OPTS += -qt-sql-ibase
 endif
 ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
-QT_CONFIGURE+= -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT_DEP_LIBS+=mysql_client
+QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
+QT_DEPENDENCIES   += mysql_client
 endif
 ifeq ($(BR2_PACKAGE_QT_ODBC),y)
-QT_CONFIGURE+= -qt-sql-odbc
+QT_CONFIGURE_OPTS += -qt-sql-odbc
 endif
 ifeq ($(BR2_PACKAGE_QT_PSQL),y)
-QT_CONFIGURE+= -qt-sql-psql
+QT_CONFIGURE_OPTS += -qt-sql-psql
 endif
 ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
-QT_CONFIGURE+= -qt-sql-sqlite
+QT_CONFIGURE_OPTS += -qt-sql-sqlite
 else
 ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
-QT_CONFIGURE+= -system-sqlite
-QT_DEP_LIBS+= sqlite
+QT_CONFIGURE_OPTS += -system-sqlite
+QT_DEPENDENCIES   += sqlite
 else
-QT_CONFIGURE+= -no-sql-sqlite
+QT_CONFIGURE_OPTS += -no-sql-sqlite
 endif
 endif
 ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
-QT_CONFIGURE+= -qt-sql-sqlite2
+QT_CONFIGURE_OPTS += -qt-sql-sqlite2
 endif
 else
 # By default, no SQL driver is turned on by configure.
-# but it seams sqlite isn't disabled despite what says
+# but it seems sqlite isn't disabled despite what says
 # configure --help
-QT_CONFIGURE+= -no-sql-sqlite
+QT_CONFIGURE_OPTS += -no-sql-sqlite
 endif
 
 ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_CONFIGURE+= -xmlpatterns -exceptions
+QT_CONFIGURE_OPTS += -xmlpatterns -exceptions
 else
-QT_CONFIGURE+= -no-xmlpatterns
+QT_CONFIGURE_OPTS += -no-xmlpatterns
 endif
 
 ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_CONFIGURE+= -multimedia
+QT_CONFIGURE_OPTS += -multimedia
 else
-QT_CONFIGURE+= -no-multimedia
+QT_CONFIGURE_OPTS += -no-multimedia
 endif
 
 ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
-QT_CONFIGURE+= -audio-backend
-QT_DEP_LIBS+=alsa-lib
+QT_CONFIGURE_OPTS += -audio-backend
+QT_DEPENDENCIES   += alsa-lib
 else
-QT_CONFIGURE+= -no-audio-backend
+QT_CONFIGURE_OPTS += -no-audio-backend
 endif
 
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_CONFIGURE+= -phonon
-QT_DEP_LIBS+=gstreamer gst-plugins-base
+QT_CONFIGURE_OPTS += -phonon
+QT_DEPENDENCIES   += gstreamer gst-plugins-base
 else
-QT_CONFIGURE+= -no-phonon
+QT_CONFIGURE_OPTS += -no-phonon
 endif
 
 ifeq ($(BR2_PACKAGE_QT_PHONON_BACKEND),y)
-QT_CONFIGURE+= -phonon-backend
+QT_CONFIGURE_OPTS += -phonon-backend
 else
-QT_CONFIGURE+= -no-phonon-backend
+QT_CONFIGURE_OPTS += -no-phonon-backend
 endif
 
 ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_CONFIGURE+= -svg
+QT_CONFIGURE_OPTS += -svg
 else
-QT_CONFIGURE+= -no-svg
+QT_CONFIGURE_OPTS += -no-svg
 endif
 
 ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_CONFIGURE+= -webkit
+QT_CONFIGURE_OPTS += -webkit
 else
-QT_CONFIGURE+= -no-webkit
+QT_CONFIGURE_OPTS += -no-webkit
 endif
 
 ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_CONFIGURE+= -script
+QT_CONFIGURE_OPTS += -script
 else
-QT_CONFIGURE+= -no-script
+QT_CONFIGURE_OPTS += -no-script
 endif
 
 ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_CONFIGURE+= -scripttools
+QT_CONFIGURE_OPTS += -scripttools
 else
-QT_CONFIGURE+= -no-scripttools
+QT_CONFIGURE_OPTS += -no-scripttools
 endif
 
 ifeq ($(BR2_PACKAGE_QT_JAVASCRIPTCORE),y)
-QT_CONFIGURE+= -javascript-jit
+QT_CONFIGURE_OPTS += -javascript-jit
 else
-QT_CONFIGURE+= -no-javascript-jit
+QT_CONFIGURE_OPTS += -no-javascript-jit
 endif
 
 ifeq ($(BR2_PACKAGE_QT_STL),y)
-QT_CONFIGURE+= -stl
+QT_CONFIGURE_OPTS += -stl
 else
-QT_CONFIGURE+= -no-stl
+QT_CONFIGURE_OPTS += -no-stl
 endif
 
 # ccache and precompiled headers don't play well together
 ifeq ($(BR2_CCACHE),y)
-QT_CONFIGURE += -no-pch
+QT_CONFIGURE_OPTS += -no-pch
 endif
 
-BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
-
 # x86x86fix
 # Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
 # host. It's unclear if this would happen on other hosts.
 ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
-ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)
-QT_CONFIGURE+= -platform linux-g++
+ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),)
+QT_CONFIGURE_OPTS += -platform linux-g++
 endif
 endif
 # End of workaround.
 
-# Figure out what libs to install in the target
-QT_LIBS=#empty
-ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_LIBS+= qt-gui  
-endif
-ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-QT_LIBS+= qt-sql
-endif
-ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_LIBS+= qt-multimedia
-endif
-ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_LIBS+= qt-phonon
-endif
-ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_LIBS+= qt-svg
-endif
-ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-QT_LIBS+= qt-network
-endif
-ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_LIBS+= qt-webkit
-endif
-ifeq ($(BR2_PACKAGE_QT_XML),y)
-QT_LIBS+= qt-xml
-endif
-ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_LIBS+= qt-dbus
-QT_DEP_LIBS+= dbus
-endif
-ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_LIBS+= qt-xmlpatterns
-endif
-ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_LIBS+= qt-script
-endif
-ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_LIBS+= qt-scripttools
-endif
-ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_LIBS+= qt-qt3support
-endif
-
-QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
-
 # Variable for other Qt applications to use
-QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
+QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
 
 ################################################################################
 # QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
-# QT_QMAKE_CONF. Will remove existing variable declaration if available.
+# the qmake.conf file. Will remove existing variable declaration if
+# available.
 #
 # Argument 1 is the variable name (without QMAKE_)
 # Argument 2 is the value to set variable to
+# Argument 3 is the base source directory of Qt
 #
 # E.G. use like this:
-# $(call QT_QMAKE_SET,variable,value)
+# $(call QT_QMAKE_SET,variable,value,directory)
 ################################################################################
 define QT_QMAKE_SET
-	$(SED) '/QMAKE_$(1)/d' $(QT_QMAKE_CONF)
-	$(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QT_QMAKE_CONF)
+	$(SED) '/QMAKE_$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
 endef
 
-################################################################################
-# QT_INSTALL_PLUGINS -- helper macro to install Qt plugins to target and 
-# strip them
-#
-# Argument 1 is the plugin folder
-# 
-# E.G. use like this to install plugins/sqldrivers:
-# $(call QT_INSTALL_PLUGINS,sqldrivers)
-# ################################################################################
-define QT_INSTALL_PLUGINS
-        if [ -d $(STAGING_DIR)/usr/plugins/$(1) ]; then \
-                mkdir -p $(TARGET_DIR)/usr/plugins; \
-                cp -dpfr $(STAGING_DIR)/usr/plugins/$(1) $(TARGET_DIR)/usr/plugins/; \
-                $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/$(1)/*; \
-        fi
+ifneq ($(BR2_INET_IPV6),y)
+define QT_CONFIGURE_IPV6
+	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(@D)/configure
+	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(@D)/configure
 endef
+endif
 
-$(DL_DIR)/$(QT_SOURCE):
-	$(call DOWNLOAD,$(QT_SITE),$(QT_SOURCE))
-
-qt-source: $(DL_DIR)/$(QT_SOURCE)
-
-
-$(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
-	$(QT_CAT) $(DL_DIR)/$(QT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(QT_TARGET_DIR) package/qt/ \
-		qt-$(QT_VERSION)-\*.patch \
-		qt-$(QT_VERSION)-\*.patch.$(ARCH)
-	touch $@
-
-$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked
-	-[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean
-ifneq ($(BR2_INET_IPV6),y)
-	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
-	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
+ifneq ($(QT_CONFIG_FILE),)
+define QT_CONFIGURE_CONFIG_FILE
+	cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
+endef
 endif
+
+define QT_CONFIGURE_CMDS
+	-[ -f $(@D)/Makefile ] && $(MAKE) -C $(@D) confclean
+	$(QT_CONFIGURE_IPV6)
+	$(QT_CONFIGURE_CONFIG_FILE)
 	# Fix compiler path
-	$(call QT_QMAKE_SET,CC,$(filter-out --sysroot=%,$(TARGET_CC)))
-	$(call QT_QMAKE_SET,CXX,$(filter-out --sysroot=%,$(TARGET_CXX)))
-	$(call QT_QMAKE_SET,LINK,$(TARGET_CXX))
-	$(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX))
-	$(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs)
-	$(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY))
-	$(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB))
-	$(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP))
-	$(call QT_QMAKE_SET,CFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CFLAGS))
-	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CXXFLAGS))
-	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS))
-	-[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \
-		$(QT_TARGET_DIR)/$(QT_QCONFIG_FILE_LOCATION)
+	$(call QT_QMAKE_SET,CC,$(filter-out --sysroot=%,$(TARGET_CC)),$(@D))
+	$(call QT_QMAKE_SET,CXX,$(filter-out --sysroot=%,$(TARGET_CXX)),$(@D))
+	$(call QT_QMAKE_SET,LINK,$(TARGET_CXX),$(@D))
+	$(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX),$(@D))
+	$(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs,$(@D))
+	$(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY),$(@D))
+	$(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB),$(@D))
+	$(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP),$(@D))
+	$(call QT_QMAKE_SET,CFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CFLAGS),$(@D))
+	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CXXFLAGS),$(@D))
+	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS),$(@D))
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.
-	(cd $(QT_TARGET_DIR); \
+	(cd $(@D); \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		./configure \
 		$(if $(VERBOSE),-verbose,-silent) \
 		-force-pkg-config \
-		-embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \
-		$(QT_QCONFIG_COMMAND) \
-		$(QT_CONFIGURE) \
+		$(QT_CONFIGURE_OPTS) \
 		-no-gfx-qnx \
 		-no-kbd-qnx \
 		-no-mouse-qnx \
@@ -538,133 +485,139 @@ endif
 		-fast \
 		-no-rpath \
 	)
-	touch $@
-
-$(QT_TARGET_DIR)/.compiled: $(QT_TARGET_DIR)/.configured
-	$(MAKE) -C $(QT_TARGET_DIR)
-	touch $@
-
-$(HOST_DIR)/usr/bin/qt.conf:
-	mkdir -p $(dir $@)
-	echo "[Paths]" > $@
-	echo "Prefix=$(HOST_DIR)/usr" >> $@
-	echo "Headers=$(STAGING_DIR)/usr/include" >> $@
-	echo "Libraries=$(STAGING_DIR)/usr/lib" >> $@
-	echo "Data=$(HOST_DIR)/usr" >> $@
-	echo "Binaries=$(HOST_DIR)/usr/bin" >> $@
-
-$(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled $(HOST_DIR)/usr/bin/qt.conf
-	$(MAKE) -C $(QT_TARGET_DIR) install
-	# Move host programs and spec files to the host directory. The
-	# generated qt.conf file will tell qmake where everything is.
-	mv $(addprefix $(STAGING_DIR)/usr/bin/,moc rcc qmake lrelease) $(HOST_DIR)/usr/bin
+endef
+
+define QT_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+
+# Build the list of libraries and plugins to install to the target
+
+QT_INSTALL_LIBS    += QtCore
+QT_HOST_PROGRAMS   += moc rcc qmake lrelease
+
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-	mv $(STAGING_DIR)/usr/bin/uic $(HOST_DIR)/usr/bin
+QT_INSTALL_LIBS    += QtGui
+QT_INSTALL_PLUGINS += imageformats
+QT_HOST_PROGRAMS   += uic
 endif
-	mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
-
-qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
-	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-ifneq ($(QT_FONTS),)
-	cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
+ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
+QT_INSTALL_LIBS    += QtSql
+QT_INSTALL_PLUGINS += sqldrivers
 endif
-ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
+ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
+QT_INSTALL_LIBS    += QtMultimedia
 endif
-	# Install image plugins if they are built
-	$(call QT_INSTALL_PLUGINS,imageformats)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_PHONON),y)
+QT_INSTALL_LIBS    += phonon
+QT_INSTALL_PLUGINS += phonon_backend
 endif
-
-qt-sql: $(STAGING_DIR)/usr/lib/libQtCore.la
-	$(call QT_INSTALL_PLUGINS,sqldrivers)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_SVG),y)
+QT_INSTALL_LIBS    += QtSvg
+QT_INSTALL_PLUGINS += iconengines
 endif
-
-qt-multimedia: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtMultimedia.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
+QT_INSTALL_LIBS    += QtNetwork
 endif
-
-qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la
-	$(call QT_INSTALL_PLUGINS,phonon_backend)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
+QT_INSTALL_LIBS    += QtWebKit
 endif
-
-qt-svg: $(STAGING_DIR)/usr/lib/libQtCore.la
-	$(call QT_INSTALL_PLUGINS,iconengines)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtSvg.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_XML),y)
+QT_INSTALL_LIBS    += QtXml
 endif
-
-qt-network: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_DBUS),y)
+QT_INSTALL_LIBS    += QtDBus
 endif
-
-qt-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
+QT_INSTALL_LIBS    += QtXmlPatterns
 endif
-
-qt-xml: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
+QT_INSTALL_LIBS    += QtScript
 endif
-
-qt-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
+QT_INSTALL_LIBS    += QtScriptTools
 endif
+ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
+QT_INSTALL_LIBS    += libQt3Support
+endif
+
+QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
+
+# Since host programs and spec files have been moved to $(HOST_DIR),
+# we need to tell qmake the new location of the various elements,
+# through a qt.conf file.
+define QT_INSTALL_QT_CONF
+	mkdir -p $(dir $(QT_CONF_FILE))
+	echo "[Paths]"                             > $(QT_CONF_FILE)
+	echo "Prefix=$(HOST_DIR)/usr"             >> $(QT_CONF_FILE)
+	echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE)
+	echo "Libraries=$(STAGING_DIR)/usr/lib"   >> $(QT_CONF_FILE)
+	echo "Data=$(HOST_DIR)/usr"               >> $(QT_CONF_FILE)
+	echo "Binaries=$(HOST_DIR)/usr/bin"       >> $(QT_CONF_FILE)
+endef
 
-qt-dbus: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtDBus.so.* $(TARGET_DIR)/usr/lib/
-endif
+# After running Qt normal installation process (which installs
+# everything in the STAGING_DIR), we move host programs such as qmake,
+# rcc or uic to the HOST_DIR so that they are available at the usual
+# location. A qt.conf file is generated to make sure that all host
+# programs still find all files they need.
+define QT_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) install
+	mkdir -p $(HOST_DIR)/usr/bin
+	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
+	rm -rf $(HOST_DIR)/usr/mkspecs
+	mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
+	$(QT_INSTALL_QT_CONF)
+endef
 
-qt-script: $(STAGING_DIR)/usr/lib/libQtCore.la
+# Library installation
 ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/
+define QT_INSTALL_TARGET_LIBS
+	for lib in $(QT_INSTALL_LIBS); do \
+		cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \
+	done
+endef
 endif
 
-qt-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
-endif
+# Plugin installation
+define QT_INSTALL_TARGET_PLUGINS
+	for plugin in $(QT_INSTALL_PLUGINS); do \
+		mkdir -p $(TARGET_DIR)/usr/plugins ; \
+		cp -dpfr $(STAGING_DIR)/usr/plugins/$$plugin $(TARGET_DIR)/usr/plugins/; \
+	done
+endef
 
-qt-qt3support: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt3Support.so.* $(TARGET_DIR)/usr/lib/
+# Fonts installation
+ifneq ($(QT_FONTS),)
+define QT_INSTALL_TARGET_FONTS
+	mkdir -p $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
+endef
 endif
 
-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-	# Strip all installed libs
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
+ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
+define QT_INSTALL_TARGET_FONTS_TTF
+	mkdir -p $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
+endef
 endif
 
-qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
+define QT_INSTALL_TARGET_CMDS
+	$(QT_INSTALL_TARGET_LIBS)
+	$(QT_INSTALL_TARGET_PLUGINS)
+	$(QT_INSTALL_TARGET_FONTS)
+	$(QT_INSTALL_TARGET_FONTS_TTF)
+endef
+
+define QT_CLEAN_CMDS
+	-$(MAKE) -C $(@D) clean
+endef
 
-qt-clean:
-	-$(MAKE) -C $(QT_TARGET_DIR) clean
+define QT_UNINSTALL_TARGET_CMDS
 	-rm -rf $(TARGET_DIR)/usr/lib/fonts
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
 	-rm $(TARGET_DIR)/usr/lib/libQt*.so.*
 	-rm $(TARGET_DIR)/usr/lib/libphonon.so.*
-endif
-
-qt-dirclean:
-	rm -rf $(QT_TARGET_DIR)
+endef
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_QT),y)
-TARGETS+=qt
-endif
+$(eval $(call GENTARGETS,package,qt))

From 9b87631e34a7e430799d16506c6aa4f981253f36 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 28 Mar 2011 00:13:28 +0200
Subject: [PATCH 0077/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index a6d18f9f28..e4da26c0d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,12 @@
 2011.05, Not released yet:
 
-	Updated/fixed packages: alsamixergui, avahi, busybox,
-	dropbear, fakeroot, ffmpeg, file, gnuconfig, gst-ffmpeg,
+	Updated/fixed packages: alsa-lib, alsa-utils, alsamixergui,
+	avahi, busybox, dnsmasq, dropbear, ethtool, fakeroot, ffmpeg,
+	file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
 	imagemagick, libdnet, libpng, libxml2, libxslt, makedevs,
-	mpg123, pkg-config, qt, samba, squashfs, xerces, xorg-server,
-	xz
+	mpg123, mtd-utils, ncurses, netsnmp, pkg-config, qt, samba,
+	socat, squashfs, webkit, xerces, xlib_xtrans, xorg-server,
+	xterm, xz
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 5d6ff452add2d4e902409ed35accfa59adba37f2 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Thu, 10 Mar 2011 19:12:41 +0800
Subject: [PATCH 0078/6849] external toolchain: Only prefix path if specified

Only prefix the external toolchain calls with its absolute path if
BR2_TOOLCHAIN_EXTERNAL_PATH is set, otherwise just assume it will
be available in the path.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index e1ffe158b5..f98b3e7922 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -115,7 +115,11 @@ TOOLCHAIN_EXTERNAL_LOCATION=$(TOOLCHAIN_EXTERNAL_DIR)
 else
 TOOLCHAIN_EXTERNAL_LOCATION=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 endif
+ifneq ($(TOOLCHAIN_EXTERNAL_LOCATION),)
 TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_LOCATION)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
+else
+TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PREFIX)-
+endif
 endif
 
 # Quotes are needed for spaces et al in path components.

From 0df02e1233c5990391c030f40ab4263cfaa83a40 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 28 Mar 2011 03:18:47 -0400
Subject: [PATCH 0079/6849] hostcc/hostcxx: fix noccache variant setting

The current code accidentally sets up HOSTCC_NOCCACHE and HOSTCXX_NOCCACHE
only when the respective HOSTCC or HOSTCXX values are not set.  So if you
do something like:
	make HOSTCC=gcc menuconfig
The build fails because HOSTCC_NOCCACHE is not set anywhere.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7ae3787bd7..9aa7399f1d 100644
--- a/Makefile
+++ b/Makefile
@@ -126,13 +126,13 @@ endif
 ifndef HOSTCC
 HOSTCC:=gcc
 HOSTCC:=$(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
-HOSTCC_NOCCACHE:=$(HOSTCC)
 endif
+HOSTCC_NOCCACHE:=$(HOSTCC)
 ifndef HOSTCXX
 HOSTCXX:=g++
 HOSTCXX:=$(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
-HOSTCXX_NOCCACHE:=$(HOSTCXX)
 endif
+HOSTCXX_NOCCACHE:=$(HOSTCXX)
 ifndef HOSTFC
 HOSTFC:=gfortran
 endif

From 2c97608387f586f361e81a242d8838b9481369f7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 28 Mar 2011 21:33:26 +0200
Subject: [PATCH 0080/6849] busybox: ensure source gets
 downloaded/extracted/patched before -menuconfig

Closes #3511

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                    | 1 +
 package/busybox/busybox.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e4da26c0d8..09088041ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@
 	#3451: fakeroot package: wrong FAKEROOT_SITE variable
 	#3457: alsamixergui: broken URL
 	#3475: Calling sync on large filesystems when not always necessary
+	#3511: make busybox-menuconfig does not download busybox package
 
 2011.02, Released February 28th, 2011:
 
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 5583bc6f32..ffd66679ea 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -150,7 +150,7 @@ endef
 
 $(eval $(call GENTARGETS,package,busybox))
 
-busybox-menuconfig:	$(BUSYBOX_DIR)/.stamp_extracted
+busybox-menuconfig: busybox-patch
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) menuconfig
 	rm -f $(BUSYBOX_DIR)/.stamp_built
 	rm -f $(BUSYBOX_DIR)/.stamp_target_installed

From f055b266f11f8b72c60cf3b46bf081aaf97f5f6d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 28 Mar 2011 21:45:06 +0200
Subject: [PATCH 0081/6849] Makefile.autotools.in: add libtool v2.4 support

Packages (like avahi) are now using libtool 2.4, so extend the libtool
handling to support those as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in        |  2 ++
 package/buildroot-libtool-v2.4.patch | 47 ++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 package/buildroot-libtool-v2.4.patch

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index d445348d2b..88a06ea223 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -145,6 +145,8 @@ define LIBTOOL_PATCH_HOOK
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+			elif test $$$${ltmain_version} = "2.4"; then\
+				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi
diff --git a/package/buildroot-libtool-v2.4.patch b/package/buildroot-libtool-v2.4.patch
new file mode 100644
index 0000000000..d82d610624
--- /dev/null
+++ b/package/buildroot-libtool-v2.4.patch
@@ -0,0 +1,47 @@
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1416,8 +1416,8 @@
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+-	  func_echo "unable to infer tagged configuration"
+-	  func_fatal_error "specify a tag with \`--tag'"
++	  func_echo "defaulting to \`CC'"
++	  func_echo "if this is not correct, specify a tag with \`--tag'"
+ #	else
+ #	  func_verbose "using $tagname tagged configuration"
+ 	fi
+@@ -2962,8 +2962,11 @@
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # test "$inst_prefix_dir" = "$destdir" && \
++	  #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -6683,7 +6686,7 @@
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      func_append notinst_deplibs " $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -9257,6 +9260,10 @@
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++              # Replacing uninstalled with installed can easily break crosscompilation,
++              # since the installed path is generally the wrong architecture.  -CL
++              newdependency_libs="$newdependency_libs $deplib"
++              continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"

From 187ca32ae4a1c5661f0ae5a0b25403535748069a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 Mar 2011 13:34:25 +0200
Subject: [PATCH 0082/6849] qt: fix qt3 support target install

"lib" shouldn't be prefixed, otherwise the make file tries to install
liblibQt3Support.so.*.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 8569f7d517..bdc32d9559 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -539,7 +539,7 @@ ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
 QT_INSTALL_LIBS    += QtScriptTools
 endif
 ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_INSTALL_LIBS    += libQt3Support
+QT_INSTALL_LIBS    += Qt3Support
 endif
 
 QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf

From 10f9ef7081d9d99c2910361c9089774ab03dc0f7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 Mar 2011 22:19:49 +0200
Subject: [PATCH 0083/6849] kernel-headers: bump 2.6.37.x / 2.6.38.x stable
 versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 85093a1990..1da6d53382 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -45,7 +45,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
-	default "2.6.37.5"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.1"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
+	default "2.6.38.2"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 3ef31b16c1ad68eaa8ceb34f38333e12b4ab8871 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 30 Mar 2011 20:51:48 +0200
Subject: [PATCH 0084/6849] package/config; br2_symbol_printer(): fix off-by-1
 in string handling

Based on patch by bbj17@gmx.de.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/config/patches/08-make-write-deps.patch | 6 +++---
 package/config/util.c                           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/config/patches/08-make-write-deps.patch b/package/config/patches/08-make-write-deps.patch
index 0f9c7e308f..b69daad6ed 100644
--- a/package/config/patches/08-make-write-deps.patch
+++ b/package/config/patches/08-make-write-deps.patch
@@ -16,12 +16,12 @@ Index: config/util.c
 +	char *ret;
 +	if (len < 1)
 +		return NULL;
-+	ret = malloc(len);
++	ret = malloc(len+1);
 +	if (!ret) {
 +		printf("Out of memory!");
 +		exit(1);
 +	}
-+	memset(ret, 0, len);
++	memset(ret, 0, len+1);
 +	i = j = 0;
 +	if (strncmp("BR2_", in, 4) == 0)
 +		i += 4;
@@ -34,7 +34,7 @@ Index: config/util.c
 +	return ret;
 +}
 +
-+/* write dependencies of the infividual config-symbols */
++/* write dependencies of the individual config-symbols */
 +static int write_make_deps(const char *name)
 +{
 +	char *str;
diff --git a/package/config/util.c b/package/config/util.c
index 5fc36c7d26..f962cef311 100644
--- a/package/config/util.c
+++ b/package/config/util.c
@@ -35,12 +35,12 @@ static char* br2_symbol_printer(const char * const in)
 	char *ret;
 	if (len < 1)
 		return NULL;
-	ret = malloc(len);
+	ret = malloc(len+1);
 	if (!ret) {
 		printf("Out of memory!");
 		exit(1);
 	}
-	memset(ret, 0, len);
+	memset(ret, 0, len+1);
 	i = j = 0;
 	if (strncmp("BR2_", in, 4) == 0)
 		i += 4;
@@ -53,7 +53,7 @@ static char* br2_symbol_printer(const char * const in)
 	return ret;
 }
 
-/* write dependencies of the infividual config-symbols */
+/* write dependencies of the individual config-symbols */
 static int write_make_deps(const char *name)
 {
 	char *str;

From f5626851ab1a1e51cdcc6153b5913ba19dac79d3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Mar 2011 10:44:35 -0300
Subject: [PATCH 0085/6849] midori: bump to version 0.3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/midori/midori.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index af227d4eb1..5f6315fd8b 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-MIDORI_VERSION = 0.2.9
+MIDORI_VERSION = 0.3.2
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
-MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
+MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
 MIDORI_INSTALL_TARGET = YES
 
 MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2

From 0a70aa0cc5d0980e72677869d9d87e0e4e35e483 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Mar 2011 10:44:34 -0300
Subject: [PATCH 0086/6849] webkit: bump to version 1.2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 8483c0dc35..3a06f433c6 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WEBKIT_VERSION = 1.2.6
+WEBKIT_VERSION = 1.2.7
 WEBKIT_SITE = http://www.webkitgtk.org
 WEBKIT_INSTALL_STAGING = YES
 WEBKIT_DEPENDENCIES = host-flex host-gperf icu libcurl libxml2 libxslt \

From 06002a58b53e27da33b2e32697e07058b5f3b9b8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 31 Mar 2011 22:44:24 +0200
Subject: [PATCH 0087/6849] rsync: bump version

Fixes CVE-2011-1097 and various other issues, see NEWS for details:

http://rsync.samba.org/ftp/rsync/src/rsync-3.0.8-NEWS

At the same time get rid of unneeded install / install-strip handling.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rsync/rsync.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 5ffbfbb3ef..5030faeb19 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -4,19 +4,11 @@
 #
 #############################################################
 
-RSYNC_VERSION := 3.0.7
+RSYNC_VERSION := 3.0.8
 RSYNC_SOURCE := rsync-$(RSYNC_VERSION).tar.gz
 RSYNC_SITE := http://rsync.samba.org/ftp/rsync/src
 RSYNC_INSTALL_STAGING = NO
-RSYNC_INSTALL_TARGET = YES
 RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
-ifeq ($(BR2_ENABLE_DEBUG),y)
-RSYNC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
-			  install
-else
-RSYNC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
-			  STRIPPROG="$(TARGET_STRIP)" install-strip
-endif
 RSYNC_CONF_OPT = --with-included-popt
 
 $(eval $(call AUTOTARGETS,package,rsync))

From e2ed6c8e77fb810915a0f45d5f711d678469511f Mon Sep 17 00:00:00 2001
From: Martin Hicks <mort@bork.org>
Date: Mon, 21 Mar 2011 13:39:43 -0400
Subject: [PATCH 0088/6849] linux: Add support to specify special Kernel Image
 make target

This is useful for ARCHes like PowerPC that have a whole lot of
special targets for each different board.  The kernel image target
tells make which OpenFirmware machine description file is combined into
the kernel binary.

[Peter: fix long lines]
Signed-Off-By:  Martin Hicks <mort@bork.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 18 ++++++++++++++++++
 linux/linux.mk  |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 75e574f458..f7d7f88ec1 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -133,8 +133,26 @@ config BR2_LINUX_KERNEL_VMLINUX
 	bool "vmlinux"
 	depends on BR2_mips || BR2_mipsel
 
+config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
+	bool "custom target"
+	help
+	  For certain cases a board-specific target image must be
+	  used.  For example, on powerPC where the OpenFirmware
+	  description is attached in a board-specific kernel image
+	  target like 'cuImage.mpc8379_rdb'.
+
+	  Select this option and specify the make target in "Kernel
+	  image target name".
+
 endchoice
 
+config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
+	string "Kernel image target name"
+	depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
+	help
+	  Specify the kernel make target to build the kernel that you
+	  need.
+
 endif # BR2_LINUX_KERNEL
 
 endmenu
diff --git a/linux/linux.mk b/linux/linux.mk
index 9076fb917d..90dc1dcb98 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -30,6 +30,9 @@ LINUX26_MAKE_FLAGS = \
 # going to be installed in the target filesystem.
 LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease)
 
+ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
+LINUX26_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+else
 ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
 ifeq ($(KERNEL_ARCH),blackfin)
 # a uImage, but with a different file name
@@ -47,6 +50,7 @@ LINUX26_IMAGE_NAME=vmlinux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
 LINUX26_IMAGE_NAME=vmlinux
 endif
+endif
 
 # Compute the arch path, since i386 and x86_64 are in arch/x86 and not
 # in arch/$(KERNEL_ARCH). Even if the kernel creates symbolic links

From 887d210986da45191dcb14647b93fea20b5ddb3e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Apr 2011 15:51:28 -0300
Subject: [PATCH 0089/6849] mpd: bump to version 0.16.2 and bugfix

Bump mpd server to version 0.6.12
Also make ffmpeg support conditional on IPv6 since the new ffmpeg
version requires it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/Config.in | 4 ++--
 package/multimedia/mpd/mpd.mk    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index b3491f22e4..a6ded1337e 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -64,8 +64,8 @@ config BR2_PACKAGE_MPD_FFMPEG
 	  Enable ffmpeg input support.
 	  Select this if you want to play back files supported by ffmpeg.
 
-comment "ffmpeg support requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
 
 config BR2_PACKAGE_MPD_LAME
 	bool "lame"
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index d6658aee5d..3f5057c878 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.1
+MPD_VERSION = 0.16.2
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_DEPENDENCIES = host-pkg-config libglib2
 

From 6bbd5367a59b9b98b48e06c3b489476834cfb220 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Apr 2011 15:51:29 -0300
Subject: [PATCH 0090/6849] quagga: security bump to version 0.99.18

Fixes for vulnerabilities CVE-2010-1674 and CVE-2010-1675.

Additional patches for build-time breakage of the new version.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/quagga-fix-no-ipv6.patch |  48 +++++++++
 package/quagga/quagga-fix-opaque.patch  | 127 ++++++++++++++++++++++++
 package/quagga/quagga-zlog.patch        |  43 ++++++++
 package/quagga/quagga.mk                |   6 +-
 4 files changed, 221 insertions(+), 3 deletions(-)
 create mode 100644 package/quagga/quagga-fix-no-ipv6.patch
 create mode 100644 package/quagga/quagga-fix-opaque.patch
 create mode 100644 package/quagga/quagga-zlog.patch

diff --git a/package/quagga/quagga-fix-no-ipv6.patch b/package/quagga/quagga-fix-no-ipv6.patch
new file mode 100644
index 0000000000..acf8fec387
--- /dev/null
+++ b/package/quagga/quagga-fix-no-ipv6.patch
@@ -0,0 +1,48 @@
+From 3bde17f1af635c9ca19df0b3516cb8ad0376e6d3 Mon Sep 17 00:00:00 2001
+From: Paul Jakma <paul@quagga.net>
+Date: Wed, 23 Mar 2011 10:30:30 +0000
+Subject: [PATCH 1/1] bgpd: Fix compile failure if IPv6 build was disabled.
+
+* bgp_route.c: ({no_,}ipv6_bgp_network_ttl_cmd) depends on ipv6_bgp_network
+  which is HAVE_IPV6, so these should be too.
+  (bgp_route_init) and the installs should be similarly ifdefed
+---
+ bgpd/bgp_route.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
+index 8c05ba6..5c516f0 100644
+--- a/bgpd/bgp_route.c
++++ b/bgpd/bgp_route.c
+@@ -4327,6 +4327,7 @@ ALIAS_DEPRECATED (no_bgp_network_mask_natural,
+        "Specify a BGP backdoor route\n"
+        "AS-Path hopcount limit attribute\n"
+        "AS-Pathlimit TTL, in number of AS-Path hops\n")
++#ifdef HAVE_IPV6
+ ALIAS_DEPRECATED (ipv6_bgp_network,
+        ipv6_bgp_network_ttl_cmd,
+        "network X:X::X:X/M pathlimit <0-255>",
+@@ -4342,6 +4343,7 @@ ALIAS_DEPRECATED (no_ipv6_bgp_network,
+        "IPv6 prefix <network>/<length>\n"
+        "AS-Path hopcount limit attribute\n"
+        "AS-Pathlimit TTL, in number of AS-Path hops\n")
++#endif /* HAVE_IPV6 */
+ 
+ /* Aggreagete address:
+ 
+@@ -12958,9 +12960,11 @@ bgp_route_init (void)
+   install_element (BGP_IPV4M_NODE, &no_bgp_network_backdoor_ttl_cmd);
+   install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_backdoor_ttl_cmd);
+   install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_backdoor_ttl_cmd);
+-  
++
++#ifdef HAVE_IPV6
+   install_element (BGP_IPV6_NODE, &ipv6_bgp_network_ttl_cmd);
+   install_element (BGP_IPV6_NODE, &no_ipv6_bgp_network_ttl_cmd);
++#endif
+ }
+ 
+ void
+-- 
+1.7.4
+
diff --git a/package/quagga/quagga-fix-opaque.patch b/package/quagga/quagga-fix-opaque.patch
new file mode 100644
index 0000000000..17a970e163
--- /dev/null
+++ b/package/quagga/quagga-fix-opaque.patch
@@ -0,0 +1,127 @@
+From d71ea65270408a45e4bec036671ec73b24b994b4 Mon Sep 17 00:00:00 2001
+From: Paul Jakma <paul@quagga.net>
+Date: Tue, 22 Mar 2011 15:23:55 +0000
+Subject: [PATCH 1/1] ospfd: Compile fix for opaque support
+
+* ospfd: Refresher logic cleanup broke OSPF opaque, which does its own thing
+  with regard to refresher logic and which also, in the protocol, requires
+  implementations to keep state of which OI an LSA is received on (rather
+  than providing information in the LSA to allow it to be looked up - as
+  other LSAs requiring such assocation were careful to do).
+* ospf_lsa.h: (struct ospf_interface) Add back the pointer to oi, but only
+  for type-9 now.
+* ospf_nsm.c: (ospf_db_summary_add) check the oi actually exists first -
+  doesn't obviate the need for opaque to ensure oi pointers get cleaned up
+  when ospf_interfaces disappear.
+* ospf_opaque.{c,h}: (ospf_opaque_functab,ospf_opaque_lsa_refresh) Refresher
+  LSA functions now need to return the LSA to the general refresh logic,
+  to indicate whether the LSA was refreshed.
+---
+ ospfd/ospf_lsa.h    |    3 +++
+ ospfd/ospf_nsm.c    |    2 +-
+ ospfd/ospf_opaque.c |   13 +++++++------
+ ospfd/ospf_opaque.h |    4 ++--
+ 4 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/ospfd/ospf_lsa.h b/ospfd/ospf_lsa.h
+index fee3470..72e2f8a 100644
+--- a/ospfd/ospf_lsa.h
++++ b/ospfd/ospf_lsa.h
+@@ -114,6 +114,9 @@ struct ospf_lsa
+ 
+   /* Refreshement List or Queue */
+   int refresh_list;
++  
++  /* For Type-9 Opaque-LSAs */
++  struct ospf_interface *oi;
+ };
+ 
+ /* OSPF LSA Link Type. */
+diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
+index 279d2a0..cbc3171 100644
+--- a/ospfd/ospf_nsm.c
++++ b/ospfd/ospf_nsm.c
+@@ -216,7 +216,7 @@ ospf_db_summary_add (struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
+     {
+     case OSPF_OPAQUE_LINK_LSA:
+       /* Exclude type-9 LSAs that does not have the same "oi" with "nbr". */
+-      if (lsa->oi != nbr->oi)
++      if (nbr->oi && ospf_if_exists (lsa->oi) != nbr->oi)
+           return 0;
+       break;
+     case OSPF_OPAQUE_AREA_LSA:
+diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
+index 6e90011..aa126e1 100644
+--- a/ospfd/ospf_opaque.c
++++ b/ospfd/ospf_opaque.c
+@@ -251,7 +251,7 @@ struct ospf_opaque_functab
+   void (* config_write_debug )(struct vty *vty);
+   void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa);
+   int  (* lsa_originator)(void *arg);
+-  void (* lsa_refresher )(struct ospf_lsa *lsa);
++  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa);
+   int (* new_lsa_hook)(struct ospf_lsa *lsa);
+   int (* del_lsa_hook)(struct ospf_lsa *lsa);
+ };
+@@ -354,7 +354,7 @@ ospf_register_opaque_functab (
+   void (* config_write_debug )(struct vty *vty),
+   void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa),
+   int  (* lsa_originator)(void *arg),
+-  void (* lsa_refresher )(struct ospf_lsa *lsa),
++  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa),
+   int (* new_lsa_hook)(struct ospf_lsa *lsa),
+   int (* del_lsa_hook)(struct ospf_lsa *lsa))
+ {
+@@ -1608,12 +1608,13 @@ out:
+   return new;
+ }
+ 
+-void
++struct ospf_lsa *
+ ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
+ {
+   struct ospf *ospf;
+   struct ospf_opaque_functab *functab;
+-
++  struct ospf_lsa *new = NULL;
++  
+   ospf = ospf_lookup ();
+ 
+   if ((functab = ospf_opaque_functab_lookup (lsa)) == NULL
+@@ -1633,9 +1634,9 @@ ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
+       ospf_lsa_flush (ospf, lsa);
+     }
+   else
+-    (* functab->lsa_refresher)(lsa);
++    new = (* functab->lsa_refresher)(lsa);
+ 
+-  return;
++  return new;
+ }
+ 
+ /*------------------------------------------------------------------------*
+diff --git a/ospfd/ospf_opaque.h b/ospfd/ospf_opaque.h
+index f49fe46..2273064 100644
+--- a/ospfd/ospf_opaque.h
++++ b/ospfd/ospf_opaque.h
+@@ -120,7 +120,7 @@ ospf_register_opaque_functab (
+   void (* config_write_debug )(struct vty *vty),
+   void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa),
+   int  (* lsa_originator)(void *arg),
+-  void (* lsa_refresher )(struct ospf_lsa *lsa),
++  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa),
+   int (* new_lsa_hook)(struct ospf_lsa *lsa),
+   int (* del_lsa_hook)(struct ospf_lsa *lsa)
+ );
+@@ -143,7 +143,7 @@ extern void ospf_opaque_lsa_originate_schedule (struct ospf_interface *oi,
+ 						int *init_delay);
+ extern struct ospf_lsa *ospf_opaque_lsa_install (struct ospf_lsa *,
+ 						 int rt_recalc);
+-extern void ospf_opaque_lsa_refresh (struct ospf_lsa *lsa);
++extern struct ospf_lsa *ospf_opaque_lsa_refresh (struct ospf_lsa *lsa);
+ 
+ extern void ospf_opaque_lsa_reoriginate_schedule (void *lsa_type_dependent,
+ 						  u_char lsa_type,
+-- 
+1.7.4
+
diff --git a/package/quagga/quagga-zlog.patch b/package/quagga/quagga-zlog.patch
new file mode 100644
index 0000000000..ad75bfef6d
--- /dev/null
+++ b/package/quagga/quagga-zlog.patch
@@ -0,0 +1,43 @@
+From fc95186c30884c96543aecfc56cfe5b08774525b Mon Sep 17 00:00:00 2001
+From: Christian Hammers <ch@debian.org>
+Date: Wed, 23 Mar 2011 13:07:55 +0300
+Subject: [PATCH] lib: fix more format warnings (#637)
+
+The following patch was also neccessary to compile.
+
+* command.c: (config_logmsg_cmd) use "%s" format spec
+* if.c: (connected_log) ditto
+---
+ lib/command.c |    2 +-
+ lib/if.c      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/command.c b/lib/command.c
+index 5a13f39..264e0f7 100644
+--- a/lib/command.c
++++ b/lib/command.c
+@@ -3056,7 +3056,7 @@ DEFUN (config_logmsg,
+   if ((level = level_match(argv[0])) == ZLOG_DISABLED)
+     return CMD_ERR_NO_MATCH;
+ 
+-  zlog(NULL, level, ((message = argv_concat(argv, argc, 1)) ? message : ""));
++  zlog(NULL, level, "%s", ((message = argv_concat(argv, argc, 1)) ? message : ""));
+   if (message)
+     XFREE(MTYPE_TMP, message);
+   return CMD_SUCCESS;
+diff --git a/lib/if.c b/lib/if.c
+index b61bdbf..86f754b 100644
+--- a/lib/if.c
++++ b/lib/if.c
+@@ -664,7 +664,7 @@ connected_log (struct connected *connected, char *str)
+       strncat (logbuf, inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
+ 	       BUFSIZ - strlen(logbuf));
+     }
+-  zlog (NULL, LOG_INFO, logbuf);
++  zlog (NULL, LOG_INFO, "%s", logbuf);
+ }
+ 
+ /* If two connected address has same prefix return 1. */
+-- 
+1.7.4
+
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index a807f0f4a7..eb3b301012 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -3,9 +3,9 @@
 # quagga suite
 #
 #############################################################
-QUAGGA_VERSION:=0.99.17
-QUAGGA_SOURCE:=quagga-$(QUAGGA_VERSION).tar.gz
-QUAGGA_SITE:=http://www.quagga.net/download/
+
+QUAGGA_VERSION = 0.99.18
+QUAGGA_SITE = http://www.quagga.net/download
 
 QUAGGA_DEPENDENCIES = host-gawk
 QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink

From 47736c88c3dcc7ec4906bbb80acb194d2211b0c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Mar 2011 14:33:48 -0300
Subject: [PATCH 0091/6849] openssl: fix compilation for i386

Closes #3445.

OpenSSL emits bswap instructions when building for i386 targets which
unfortunately is only available on 486+ class processors.
Since the normal workaround is detected at build time and we are cross
compiling we need to specify this.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                    | 7 ++++---
 package/openssl/openssl.mk | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 09088041ea..c22d0b6ca8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,12 +4,13 @@
 	avahi, busybox, dnsmasq, dropbear, ethtool, fakeroot, ffmpeg,
 	file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
 	imagemagick, libdnet, libpng, libxml2, libxslt, makedevs,
-	mpg123, mtd-utils, ncurses, netsnmp, pkg-config, qt, samba,
-	socat, squashfs, webkit, xerces, xlib_xtrans, xorg-server,
-	xterm, xz
+	mpg123, mtd-utils, ncurses, netsnmp, openssl, pkg-config, qt,
+	samba, socat, squashfs, webkit, xerces, xlib_xtrans,
+	xorg-server, xterm, xz
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3445: Not working openssl-10.0.0d on 386sx
 	#3451: fakeroot package: wrong FAKEROOT_SITE variable
 	#3457: alsamixergui: broken URL
 	#3475: Calling sync on large filesystems when not always necessary
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 7bf347ad87..0163ef8470 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -39,6 +39,11 @@ ifeq ($(ARCH),x86_64)
 	OPENSSL_TARGET_ARCH = x86_64
 endif
 
+# Workaround for bug #3445
+ifeq ($(BR2_x86_i386),y)
+	OPENSSL_TARGET_ARCH = generic32 386
+endif
+
 define OPENSSL_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_ARGS) \

From 94ed034cf2f669d1af37f8f08e70e123519e4c62 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 1 Apr 2011 22:05:01 +0200
Subject: [PATCH 0092/6849] copas: select lua shared library support

Needed by luasocket.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/copas/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/copas/Config.in b/package/copas/Config.in
index 9969c8f9a4..36abcc19ca 100644
--- a/package/copas/Config.in
+++ b/package/copas/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_COPAS
 	bool "copas"
 	select BR2_PACKAGE_COXPCALL
 	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_LUA_SHARED_LIBRARY # for luasocket
 	help
 	  Copas is a dispatcher based on coroutines that
 	  can be used by TCP/IP servers.

From 99df35d9a5246751a4a751f4b4b5c5cdbc78bc6a Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 3 Mar 2011 14:53:30 +0100
Subject: [PATCH 0093/6849] buildroot: Add webdav support to lighttpd.

[Peter: needs host-pkg-config]
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/Config.in   | 8 ++++++++
 package/lighttpd/lighttpd.mk | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index b56d66b4cf..49877e4181 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -42,5 +42,13 @@ config BR2_PACKAGE_LIGHTTPD_PCRE
 	help
 	  Enable PCRE support. Needed to support mod_rewrite
 
+config BR2_PACKAGE_LIGHTTPD_WEBDAV
+	bool "webdav"
+	depends on BR2_PACKAGE_LIGHTTPD
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_SQLITE
+	help
+	  Enable webdav support. Needed to support mod_webdav
+
 endmenu
 endif
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 67cd272419..5901801536 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -6,7 +6,7 @@
 
 LIGHTTPD_VERSION = 1.4.28
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
-
+LIGHTTPD_DEPENDENCIES = host-pkg-config
 LIGHTTPD_CONF_OPT = \
 	--libdir=/usr/lib/lighttpd \
 	--libexecdir=/usr/lib \
@@ -43,6 +43,13 @@ else
 LIGHTTPD_CONF_OPT += --without-pcre
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y)
+LIGHTTPD_DEPENDENCIES += libxml2 sqlite
+LIGHTTPD_CONF_OPT += --with-webdav-props --with-webdav-locks
+else
+LIGHTTPD_CONF_OPT += ---without-webdav-props --without-webdav-locks
+endif
+
 define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/lighttpd
 	rm -f $(TARGET_DIR)/usr/sbin/lighttpd-angel

From 252d9a20a16c5b15d8754d6dd20b89c18bdcbe30 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 1 Apr 2011 23:06:11 +0200
Subject: [PATCH 0094/6849] lighttpd: cleanup sub options

Get rid of extra packages submenu and tweak the option descriptions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/Config.in | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 49877e4181..a822d9021d 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -12,43 +12,36 @@ config BR2_PACKAGE_LIGHTTPD
 	  http://www.lighttpd.net/
 
 if BR2_PACKAGE_LIGHTTPD
-menu "lighttpd packages"
 
 config BR2_PACKAGE_LIGHTTPD_OPENSSL
-	bool "lighttpd openssl support"
-	depends on BR2_PACKAGE_LIGHTTPD
+	bool "openssl support"
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Enable OpenSSL support for lighttpd.
 
 config BR2_PACKAGE_LIGHTTPD_ZLIB
-	bool "lighttpd zlib support"
-	depends on BR2_PACKAGE_LIGHTTPD
+	bool "zlib support"
 	select BR2_PACKAGE_ZLIB
 	help
 	  Enable zlib support for lighttpd mod_compress.
 
 config BR2_PACKAGE_LIGHTTPD_BZIP2
-	bool "lighttpd bzip2 support"
-	depends on BR2_PACKAGE_LIGHTTPD
+	bool "bzip2 support"
 	select BR2_PACKAGE_BZIP2
 	help
 	  Enable bzip2 support for lighttpd mod_compress.
 
 config BR2_PACKAGE_LIGHTTPD_PCRE
-	bool "pcre"
-	depends on BR2_PACKAGE_LIGHTTPD
+	bool "pcre support"
 	select BR2_PACKAGE_PCRE
 	help
 	  Enable PCRE support. Needed to support mod_rewrite
 
 config BR2_PACKAGE_LIGHTTPD_WEBDAV
-	bool "webdav"
-	depends on BR2_PACKAGE_LIGHTTPD
+	bool "webdav support"
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_SQLITE
 	help
 	  Enable webdav support. Needed to support mod_webdav
 
-endmenu
 endif

From 4bc1041db6ce805a8d96f653e50ce06eb6849d4b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 2 Apr 2011 10:24:59 +0200
Subject: [PATCH 0095/6849] lighttpd: fix build without webdav support

Fix a typo in the --without-webdav-* handling.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/lighttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 5901801536..332afe7a1b 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -47,7 +47,7 @@ ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y)
 LIGHTTPD_DEPENDENCIES += libxml2 sqlite
 LIGHTTPD_CONF_OPT += --with-webdav-props --with-webdav-locks
 else
-LIGHTTPD_CONF_OPT += ---without-webdav-props --without-webdav-locks
+LIGHTTPD_CONF_OPT += --without-webdav-props --without-webdav-locks
 endif
 
 define LIGHTTPD_UNINSTALL_TARGET_CMDS

From c729829c6c3f7c5bccf2a4370f8df853642b23b8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Apr 2011 18:44:36 +0200
Subject: [PATCH 0096/6849] Fix ccache handling

When ccache support is enabled and 'make silentoldconfig' is being
started from the following rule:

$(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig

then, the Makefile in package/config inherits from HOSTCC/HOSTCXX
values with the ccache prefix. However, if we start from a cleaned
build (after make clean), ccache is not compiled yet, so things break.

To solve this, we pass a noccache variant of HOSTCC/HOSTCXX down to
the package/config Makefile.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9aa7399f1d..2e698cc18c 100644
--- a/Makefile
+++ b/Makefile
@@ -367,7 +367,7 @@ dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 $(BASE_TARGETS): dirs $(O)/toolchainfile.cmake
 
 $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
-	$(MAKE) $(EXTRAMAKEARGS) silentoldconfig
+	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
 
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 

From b864790383b1cb8d51e5202bb750c0a6601b21ab Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 23 Mar 2011 19:42:55 -0400
Subject: [PATCH 0097/6849] readline: link directly against ncurses

Fixes link issues on uClibc for applications using libreadline.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/readline/readline-6.1-curses-link.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/readline/readline-6.1-curses-link.patch

diff --git a/package/readline/readline-6.1-curses-link.patch b/package/readline/readline-6.1-curses-link.patch
new file mode 100644
index 0000000000..56b4770220
--- /dev/null
+++ b/package/readline/readline-6.1-curses-link.patch
@@ -0,0 +1,16 @@
+link readline directly to ncurses since it needs symbols from it
+
+upstream readline does this on purpose (no direct linking), but
+it doesn't make much sense in a Linux world
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -42,7 +42,7 @@
+ SHOBJ_LIBS=
+ 
+ SHLIB_XLDFLAGS=
+-SHLIB_LIBS=
++SHLIB_LIBS=-lncurses
+ 
+ SHLIB_DOT='.'
+ SHLIB_LIBPREF='lib'

From 070e9e2bea7c38148c696694fe8474f6b348bf22 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Apr 2011 08:16:13 +0200
Subject: [PATCH 0098/6849] qemu/x86: linux: tweak config

Enable correct driver for qemu's rtl8139 emulation (8139cp), enable
CONFIG_PACKET so DHCP works and enable 8250 driver for serial console.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/linux-2.6.36.config | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/board/qemu/x86/linux-2.6.36.config b/board/qemu/x86/linux-2.6.36.config
index 6b57aff509..a578041bd2 100644
--- a/board/qemu/x86/linux-2.6.36.config
+++ b/board/qemu/x86/linux-2.6.36.config
@@ -1,8 +1,9 @@
+CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
+CONFIG_RCU_FANOUT=32
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_COMPAT_BRK is not set
-# CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
@@ -13,8 +14,8 @@
 # CONFIG_MTRR_SANITIZER is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_RELOCATABLE is not set
-# CONFIG_COMPAT_VDSO is not set
 CONFIG_NET=y
+CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
@@ -36,7 +37,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_NET_PCI=y
 CONFIG_NE2K_PCI=y
-CONFIG_8139TOO=y
+CONFIG_8139CP=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_WLAN is not set
@@ -44,6 +45,8 @@ CONFIG_8139TOO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
@@ -60,6 +63,7 @@ CONFIG_NFS_FS=y
 CONFIG_ROOT_NFS=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set

From c10b2291e8a65d45bef8988147ed45effa5b3fda Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Apr 2011 20:00:09 +0200
Subject: [PATCH 0099/6849] qemu_x86_defconfig: run getty on ttyS0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 2e7d813aa7..04314c2da0 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -2,6 +2,9 @@
 BR2_i386=y
 BR2_x86_pentiumpro=y
 
+# system
+BR2_TARGET_GENERIC_GETTY=y
+
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set

From e37804807e8afdbf0d7aebbb954adc774c6f2d3d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Apr 2011 20:01:53 +0200
Subject: [PATCH 0100/6849] qemu_arm_versatile_defconfig: run getty on ttyAMA0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 4d8233d19f..9c990fb518 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -2,6 +2,10 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# system
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set

From 9fd85d8168ccc210a03682dff844cca5fbb35349 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Apr 2011 17:19:00 +0200
Subject: [PATCH 0101/6849] qt: fix plugin installation and change plugin path

Since the conversion of Qt to GENTARGETS in
421cda1fd078f5fa7902f05bd1d2021fd101d9ea, plugin installation could
break in some situations, for example if SQL support was enabled, but
without any SQL driver: the sql plugin directory doesn't exist, but
our qt.mk wanted to copy it.

This patches simplifies the plugin handling a bit, and basically
copies all Qt plugins installed in the $(STAGING_DIR) to the
$(TARGET_DIR), assuming Qt has only built and installed the needed
plugins.

Moreover, instead of installing plugins to usr/plugins, which is a odd
location, we install them in usr/lib/qt/plugins. This requires a small
patch to Qt ./configure script so that even when -hostprefix is used,
the -plugindir option is taken into account.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-4.7.2-configure.patch | 48 +++++++++++++++++++++++++++++
 package/qt/qt.mk                    | 15 ++++-----
 2 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 package/qt/qt-4.7.2-configure.patch

diff --git a/package/qt/qt-4.7.2-configure.patch b/package/qt/qt-4.7.2-configure.patch
new file mode 100644
index 0000000000..cef53e3faf
--- /dev/null
+++ b/package/qt/qt-4.7.2-configure.patch
@@ -0,0 +1,48 @@
+Fix -hostprefix behaviour
+
+When -hostprefix ./configure option is used, Qt installs all its
+headers, libraries and binaries inside the given host prefix, instead
+of the prefix. This is used by Buildroot to make sure that all Qt
+libraries and headers are installed in $(STAGING_DIR).
+
+Qt ./configure script also allows to tune the installation location of
+various elements, for examples the plugins through the -plugindir
+option. Unfortunately, this option only impact the installation path
+on the target, but not on the host when -hostprefix is used.
+
+This patch modifies Qt ./configure script so that HOST_*PATH_STR
+variables are composed of the host prefix concatenated with the path
+of installation on the target. This way, the plugin installation local
+in the $(STAGING_DIR) and on the target remains the same.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qt-4.7.2/configure
+===================================================================
+--- qt-4.7.2.orig/configure	2011-03-31 22:28:16.530647168 +0200
++++ qt-4.7.2/configure	2011-03-31 22:29:38.908081695 +0200
+@@ -4456,15 +4456,15 @@
+
+
+ if [ ! -z "$QT_HOST_PREFIX" ]; then
+-    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
+-    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
+-    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
+-    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
+-    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
+-    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
+-    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
+-    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
+-    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
++    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX/$QT_INSTALL_PREFIX"`
++    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/$QT_INSTALL_DOCS"`
++    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/$QT_INSTALL_HEADERS"`
++    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/$QT_INSTALL_LIBS"`
++    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/$QT_INSTALL_BINS"`
++    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/$QT_INSTALL_PLUGINS"`
++    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/$QT_INSTALL_IMPORTS"`
++    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX/$QT_INSTALL_DATA"`
++    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/$QT_INSTALL_TRANSLATIONS"`
+     HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
+     HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
+     HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index bdc32d9559..32dc574d5b 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -481,7 +481,8 @@ define QT_CONFIGURE_CMDS
 		-no-accessibility \
 		-no-separate-debug-info \
 		-prefix /usr \
-		-hostprefix $(STAGING_DIR)/usr \
+		-plugindir /usr/lib/qt/plugins \
+		-hostprefix $(STAGING_DIR) \
 		-fast \
 		-no-rpath \
 	)
@@ -499,23 +500,19 @@ QT_HOST_PROGRAMS   += moc rcc qmake lrelease
 
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
 QT_INSTALL_LIBS    += QtGui
-QT_INSTALL_PLUGINS += imageformats
 QT_HOST_PROGRAMS   += uic
 endif
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
 QT_INSTALL_LIBS    += QtSql
-QT_INSTALL_PLUGINS += sqldrivers
 endif
 ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
 QT_INSTALL_LIBS    += QtMultimedia
 endif
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
 QT_INSTALL_LIBS    += phonon
-QT_INSTALL_PLUGINS += phonon_backend
 endif
 ifeq ($(BR2_PACKAGE_QT_SVG),y)
 QT_INSTALL_LIBS    += QtSvg
-QT_INSTALL_PLUGINS += iconengines
 endif
 ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
 QT_INSTALL_LIBS    += QtNetwork
@@ -582,10 +579,10 @@ endif
 
 # Plugin installation
 define QT_INSTALL_TARGET_PLUGINS
-	for plugin in $(QT_INSTALL_PLUGINS); do \
-		mkdir -p $(TARGET_DIR)/usr/plugins ; \
-		cp -dpfr $(STAGING_DIR)/usr/plugins/$$plugin $(TARGET_DIR)/usr/plugins/; \
-	done
+	if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \
+		mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \
+		cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \
+	fi
 endef
 
 # Fonts installation

From a219ed3f7b81b93b4ed394451e7dbf862f678ec1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Apr 2011 17:19:01 +0200
Subject: [PATCH 0102/6849] qt: speed up qmake build

qmake is built during the execution of Qt ./configure script, so it is
built just with a normal make, not taking advantage of parallel
compilation. Passing MAKEFLAGS=-j$(BR2_JLEVEL) allows to speed up the
qmake compilation process quite a bit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 32dc574d5b..8d7238eab5 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -468,7 +468,7 @@ define QT_CONFIGURE_CMDS
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-		./configure \
+		MAKEFLAGS="$(MAKEFLAGS) -j$(BR2_JLEVEL)" ./configure \
 		$(if $(VERBOSE),-verbose,-silent) \
 		-force-pkg-config \
 		$(QT_CONFIGURE_OPTS) \

From 4d1118e2d83bcb3d5777f86e560086eaf60b0322 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Apr 2011 22:51:54 +0200
Subject: [PATCH 0103/6849] mpd: fix build with tremor support

Tremor needs the common ogg support (in _ogg_common.c) to get built,
similar to how it is done when libvorbis is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mpd-0.16.2-tremor-needs-ogg_common.patch  | 20 +++++++++++++++++++
 package/multimedia/mpd/mpd.mk                 |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch

diff --git a/package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch b/package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch
new file mode 100644
index 0000000000..d315f146d3
--- /dev/null
+++ b/package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch
@@ -0,0 +1,20 @@
+[PATCH] configure: tremor needs common ogg support just like libvorbis does
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: mpd-0.16.2/configure.ac
+===================================================================
+--- mpd-0.16.2.orig/configure.ac
++++ mpd-0.16.2/configure.ac
+@@ -1081,7 +1081,7 @@
+ fi
+ 
+ AM_CONDITIONAL(HAVE_OGG_COMMON,
+-	  test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
++	  test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
+ 
+ AM_CONDITIONAL(HAVE_FLAC_COMMON,
+ 	  test x$enable_flac = xyes || test x$enable_oggflac = xyes)
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 3f5057c878..d418f61d68 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -6,6 +6,7 @@
 
 MPD_VERSION = 0.16.2
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
+MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2
 
 # Some options need an explicit --disable or --enable

From d1cba6e3268890d0592e0f2bc33efec05dd07b6c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Apr 2011 23:32:43 +0200
Subject: [PATCH 0104/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index c22d0b6ca8..aa48a567d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,13 @@
 2011.05, Not released yet:
 
 	Updated/fixed packages: alsa-lib, alsa-utils, alsamixergui,
-	avahi, busybox, dnsmasq, dropbear, ethtool, fakeroot, ffmpeg,
-	file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
-	imagemagick, libdnet, libpng, libxml2, libxslt, makedevs,
-	mpg123, mtd-utils, ncurses, netsnmp, openssl, pkg-config, qt,
-	samba, socat, squashfs, webkit, xerces, xlib_xtrans,
-	xorg-server, xterm, xz
+	avahi, busybox, copas, dnsmasq, dropbear, ethtool, fakeroot,
+	ffmpeg, file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
+	imagemagick, libdnet, libpng, libxml2, libxslt, lighttpd,
+	makedevs, midori, mpg123, mpd, mtd-utils, ncurses, netsnmp,
+	openssl, pkg-config, qt, quagga, readline, rsync, samba,
+	socat, squashfs, webkit, xerces, xlib_xtrans, xorg-server,
+	xterm, xz
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 01931cc26499e5003582a7bc52f489019e706d4d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Apr 2011 14:50:35 +0200
Subject: [PATCH 0105/6849] avahi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index dc04869e74..4dfa3547aa 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
 # either version 2.1 of the License, or (at your option) any
 # later version.
 
-AVAHI_VERSION = 0.6.29
+AVAHI_VERSION = 0.6.30
 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
 AVAHI_INSTALL_STAGING = YES

From f894e85e8537ec8b54abe40db21bd8281cedd245 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Apr 2011 15:44:35 +0200
Subject: [PATCH 0106/6849] Makefile: remove extra quotes around host linker
 flags for cygwin

Closes #3541

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 1 +
 Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index aa48a567d2..d0a61ebc4d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@
 	#3457: alsamixergui: broken URL
 	#3475: Calling sync on large filesystems when not always necessary
 	#3511: make busybox-menuconfig does not download busybox package
+	#3541: Quotes in the top Makefile:217 break buildroot/kernel config...
 
 2011.02, Released February 28th, 2011:
 
diff --git a/Makefile b/Makefile
index 2e698cc18c..02a5c366ad 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@ ifneq ($(findstring cygwin,$(GNU_HOST_NAME)),)
 HOST_EXEEXT:=.exe
 HOST_LIBEXT:=.lib
 HOST_SHREXT:=.dll
-HOST_LOADLIBES="-lcurses -lintl"
+HOST_LOADLIBES=-lcurses -lintl
 export HOST_LOADLIBES
 endif
 ifneq ($(findstring mingw,$(GNU_HOST_NAME)),)

From 7bb008d43fca26b76f98fa3e5c03293603886524 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 4 Apr 2011 10:32:05 -0700
Subject: [PATCH 0107/6849] mtd: bump version

Bump mtd-utils version to 1.4.4 which contains the
flash_eraseall -j bug-fix.

http://lists.infradead.org/pipermail/linux-mtd/2011-March/034505.html

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 6b8f2c7367..a957441e33 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION:=1.4.3
+MTD_VERSION:=1.4.4
 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

From b90b9cc70a88c52ed618ed2fb15853a779b3bbd6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Apr 2011 22:18:34 +0200
Subject: [PATCH 0108/6849] docs: add favicon / robots.txt

In the past, these files of the buildroot website weren't under git
version control, but rather were static files added to the git checkout
used by the webserver.

This is no longer the case, so add them to git - And at the same time
use the Buildroot logo for the favicon, rather than reusing the busybox
one.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/favicon.ico | Bin 0 -> 2238 bytes
 docs/robots.txt  |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 docs/favicon.ico
 create mode 100644 docs/robots.txt

diff --git a/docs/favicon.ico b/docs/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..fa9d24079be70cfff5e014e0ecd1f4236deb7ab6
GIT binary patch
literal 2238
zcmeH}YfMvT7{~uiRD=oCb*L2q3!}v{R;-m;yFyD#LFCeMsgwg!q|gHG1lm*Nw02Qr
zW(W*3QCW;v1TRxTam&<gganzoi?`sSvN>;ao5^k;G*e-3!DTM$l6_eAVSCPb&U4QH
z_gqfS`+hip4>=+tK(2n+?FWPa;1eejl8AftQS$|+1dKTmy#V7fY{<yTfxMssK}HY8
z7dHdNn-N;J5<wO>BxX0lmes&kRe=yYg9Lj$VB3R&dIs#}EeNo;Bf`B3Q{BzbGp}Q!
zdo!Y3Z3tYo77cC&Z>+Fm?us^qu5Lo&>PGmlc^ebl$1rYXHxkx1A+%{d1gnpLYJ3xM
zjk_RRw+V^s)&px#!MCLci{4s~$*l*$ZS4YDK1Eh*I||y`P`_~l46U8Oh5>Bc)C%R6
zZUk)|fOtnYu<aCDw`_%QYcC?V4<KUKG1TwuK=bxa6z}MPaocgs>3k3R_Txy~(*?_}
z!?1V0gEhN5u(P8b*gJ&%dr91P3o!>i1NXonWc$yO=N~Ys`x3Ty?L+pVeh7L_qvPE}
zK+n(UKGK8eqeIws^aJ!BJq)~m4><M<>>r&$Sl{>fu&)<wCr$zb!#Fw6hon>Apy>1v
z+6KNr|HmgV_(>lG=WiqM+(Y2PFd{G9$HB9M=s$ZNpPxGeTpotx;sc~zyo<|&=YXpZ
zVZL$~hO0j!>iRH}u93R$hM~PVj4!|b3OBC};m-9-NGIBrTel$l=~vvieG_-Sy@8T@
z4`I7I0@wWq7#SJ)-~Yqk!14Et@!DUM<i)2LERJWTxOCHB^n1?7e_Be>(^8l`31u=>
zRWFS6^O<J&(-iMarZkbFsIuy+@=BAQ?UOR9ky+k1GLl#-Bh_W)<)%uL$z;<ka1mg!
z7*#r*K^O1HONpDEC7+v=nOP%G%}SNeF&kAXa;oC}Evl(H>%73&8L_ck<qL~nTe4I>
zV-DA)Q^gyms^X10i@{j5ATnY4gjorZvn8{&X*oGL#X5$xHJTk(nz0r+&B4AiX9_gw
zg6MRuHeW-jWi*{<Wn9i=4l6^+dY*)dlS5fytN@;drxvo+qS8c-!l@7{qxgJ&_)FR0
zEMH$1o6X_GXw_o1m?un>NYYBv7Alk(;e09I{K~}f!Be8yJYI}mEEcL|vNTC{L3V1P
zGAf+=GT}-u7qDYuV)W{Ko?4+05w1%ultyrp`AWW-KgxL=&U{KN600R*nM5R!suL7a
zDW4n1&7Cx1d>BWg31G>qMf3F{p`=tMl*+VXWk`tB#W-9Um>d+Lp{nL4Ez{(S7tM1r
zwAE!5m1J|{EM#q5g+alSSekNsRMay0{DMWgu}zX}W@wjpA(`xP(dqeARdwwOkEg+w
znm5L2FB>&_R<xGzTD!;NsWD}iF8>`oiq2P~^C?qpZN10it}D;|qwo=@a|MLgczHuz
zanV@&$9vEV(<zg!#_evXvlTiYCu8@tSwopBE9;0Yu|A0%4rhs;Y%7A7nxB|Hn(r*h
nr))Oc(u${aA5EYa7gU#3Jrg?|G))tK+VFo&8~ZW%_pZMIo4Cp}

literal 0
HcmV?d00001

diff --git a/docs/robots.txt b/docs/robots.txt
new file mode 100644
index 0000000000..1b425ee0f5
--- /dev/null
+++ b/docs/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /cgi-bin/

From 6fd58dfcf58206e10e101dbfca5f7368bb425861 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 28 Mar 2011 21:14:23 +0200
Subject: [PATCH 0109/6849] tslib: bump version

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 3ca40c50db..ef77dac64b 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -3,7 +3,7 @@
 # tslib
 #
 #############################################################
-TSLIB_VERSION:=860d69ca
+TSLIB_VERSION:=412d99d8b92c
 TSLIB_SITE:=git://github.com/kergoth/tslib.git
 TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES

From 3110e81773aeba9bb78e1fb54a0e8547ce882159 Mon Sep 17 00:00:00 2001
From: Klaus Schwarzkopf <schwarzkopf@sensortherm.de>
Date: Mon, 7 Mar 2011 18:21:18 +0100
Subject: [PATCH 0110/6849] libv4l: Add new package libv4l

[Peter: move to hw section]
Signed-off-by: Klaus Schwarzkopf <schwarzkopf@sensortherm.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libv4l/Config.in | 11 +++++++++++
 package/libv4l/libv4l.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/libv4l/Config.in
 create mode 100644 package/libv4l/libv4l.mk

diff --git a/package/Config.in b/package/Config.in
index f459c1bd83..ea39570417 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -179,6 +179,7 @@ source "package/input-tools/Config.in"
 source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
+source "package/libv4l/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lsuio/Config.in"
 source "package/lvm2/Config.in"
diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
new file mode 100644
index 0000000000..1620b93a33
--- /dev/null
+++ b/package/libv4l/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBV4L
+	bool "libv4l"
+	depends on BR2_LARGEFILE
+	help
+	  libv4l is an accompanying collection of libraries that adds a thin
+	  abstraction layer on top of video4linux2 (V4L2) devices.
+
+	  http://freshmeat.net/projects/libv4l
+
+comment "libv4l requires a toolchain with LARGEFILE support"
+        depends on !BR2_LARGEFILE
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
new file mode 100644
index 0000000000..a72320ee67
--- /dev/null
+++ b/package/libv4l/libv4l.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# libv4l
+#
+#############################################################
+LIBV4L_VERSION = 0.8.3
+LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
+LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils/
+LIBV4L_INSTALL_STAGING = YES
+LIBV4L_MAKE_OPTS = PREFIX=/usr
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+	LIBV4L_MAKE_OPTS += LINKTYPE=static
+endif
+
+define LIBV4L_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib $(LIBV4L_MAKE_OPTS)
+endef
+
+define LIBV4L_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D)/lib DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install
+endef
+
+define LIBV4L_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/lib DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install
+endef
+
+$(eval $(call GENTARGETS,package,libv4l))
+

From 54f33b3865a88002c06abf8da1c4529d43cd07c8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Apr 2011 12:05:08 +0200
Subject: [PATCH 0111/6849] libv4l: add options to install utilites

These have extra deps though (C++ for some, argp.h for others which is not
available on uClibc).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/Config.in | 50 ++++++++++++++++++++++++++++++++++++++++
 package/libv4l/libv4l.mk | 19 ++++++++++++---
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index 1620b93a33..1e5eec642d 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -7,5 +7,55 @@ config BR2_PACKAGE_LIBV4L
 
 	  http://freshmeat.net/projects/libv4l
 
+if BR2_PACKAGE_LIBV4L
+
+config BR2_PACKAGE_LIBV4L_DECODE_TM6000
+	bool "decode_tm6000"
+	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc
+	help
+	  Tool to decode tm6000 proprietary format streams
+
+comment "decode_tm6000 requires a GLIBC based toolchain"
+	depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc)
+
+config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
+	bool "ir-keytable"
+	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc
+	help
+	  Tool to alter keymaps of Remote Controller devices
+
+comment "ir-keytable requires a GLIBC based toolchain"
+	depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc)
+
+config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
+	bool "v4l2-compliance"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Tool to test v4l2 API compliance of drivers
+
+comment "v4l2-compliance requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_LIBV4L_V4L2_CTL
+	bool "v4l2-ctl"
+	depends on BR2_INSTALL_LIBSTDCPP
+	default y
+	help
+	  Tool to configure v4l2 controls from the cmdline
+
+comment "v4l2-ctl requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_LIBV4L_V4L2_DBG
+	bool "v4l2-dbg"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Tool to directly get and set registers of v4l2 devices
+
+comment "v4l2-dbg requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+endif
+
 comment "libv4l requires a toolchain with LARGEFILE support"
         depends on !BR2_LARGEFILE
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index a72320ee67..1ea859aa32 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -9,20 +9,33 @@ LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils/
 LIBV4L_INSTALL_STAGING = YES
 LIBV4L_MAKE_OPTS = PREFIX=/usr
 
+LIBV4L_DIRS_y += lib
+LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_DECODE_TM6000)	+= utils/decode_tm6000
+LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_IR_KEYTABLE)	+= utils/keytable
+LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE) += utils/v4l2-compliance
+LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_CTL)	+= utils/v4l2-ctl
+LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_DBG)	+= utils/v4l2-dbg
+
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 	LIBV4L_MAKE_OPTS += LINKTYPE=static
 endif
 
 define LIBV4L_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib $(LIBV4L_MAKE_OPTS)
+	for i in $(LIBV4L_DIRS_y); do \
+		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$$i \
+			$(LIBV4L_MAKE_OPTS); done
 endef
 
 define LIBV4L_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D)/lib DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install
+	for i in $(LIBV4L_DIRS_y); do \
+		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$$i \
+			DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install; done
 endef
 
 define LIBV4L_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D)/lib DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install
+	for i in $(LIBV4L_DIRS_y); do \
+		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$$i \
+			DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install; done
 endef
 
 $(eval $(call GENTARGETS,package,libv4l))

From 4d651b4d12eaddb6cc49645d1db001f1e1269364 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Apr 2011 12:31:22 +0200
Subject: [PATCH 0112/6849] ncurses: don't build tests

Slows down build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 362f3edda4..91ab97a941 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -34,6 +34,7 @@ NCURSES_CONF_OPT = \
 	--without-cxx-binding \
 	--without-ada \
 	--without-progs \
+	--without-tests \
 	--disable-big-core \
 	--without-profile \
 	--disable-rpath \

From ce6d09bdac0a343c380370bf95761f9640abfeac Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Apr 2011 22:16:52 +0200
Subject: [PATCH 0113/6849] procps: bump version, convert to GENTARGETS

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/procps/procps.mk | 56 ++++++++++------------------------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/package/procps/procps.mk b/package/procps/procps.mk
index 3add243f63..a27998751b 100644
--- a/package/procps/procps.mk
+++ b/package/procps/procps.mk
@@ -3,51 +3,21 @@
 # procps
 #
 #############################################################
-PROCPS_VERSION:=3.2.7
-PROCPS_SOURCE:=procps-$(PROCPS_VERSION).tar.gz
-PROCPS_SITE:=http://procps.sourceforge.net/
-PROCPS_DIR:=$(BUILD_DIR)/procps-$(PROCPS_VERSION)
-PROCPS_BINARY:=ps/ps
-PROCPS_TARGET_BINARY:=usr/bin/vmstat
 
-$(DL_DIR)/$(PROCPS_SOURCE):
-	$(call DOWNLOAD,$(PROCPS_SITE),$(PROCPS_SOURCE))
+PROCPS_VERSION = 3.2.8
+PROCPS_SITE = http://procps.sourceforge.net/
 
-$(PROCPS_DIR)/.source: $(DL_DIR)/$(PROCPS_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(PROCPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(PROCPS_DIR) package/procps/ procps\*.patch
-	touch $(PROCPS_DIR)/.source
+PROCPS_DEPENDENCIES = ncurses
 
-$(PROCPS_DIR)/$(PROCPS_BINARY): $(PROCPS_DIR)/.source
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(PROCPS_DIR)
+define PROCPS_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
 
-$(TARGET_DIR)/$(PROCPS_TARGET_BINARY): $(PROCPS_DIR)/$(PROCPS_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
-		install='install -D' -C $(PROCPS_DIR) lib64=/lib \
-		ldconfig='/bin/true' install
-	rm -Rf $(TARGET_DIR)/usr/share/man
+define PROCPS_INSTALL_TARGET_CMDS
+	mkdir -p $(addprefix $(TARGET_DIR)/,usr/bin bin sbin) \
+		 $(addprefix $(TARGET_DIR)/usr/share/man/,man1 man5 man8)
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) lib64=lib install=install \
+		ldconfig=true install
+endef
 
-procps: ncurses $(TARGET_DIR)/$(PROCPS_TARGET_BINARY)
-
-procps-source: $(DL_DIR)/$(PROCPS_SOURCE)
-
-procps-clean:
-	for bin in uptime tload free w \
-		   top vmstat watch skill \
-		   snice kill sysctl pmap \
-		   pgrep pkill slabtop; do \
-		rm -f $(TARGET_DIR)/usr/bin/$${bin}; \
-	done
-	rm -f $(TARGET_DIR)/lib/libproc*
-
-procps-dirclean:
-	rm -rf $(PROCPS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_PROCPS),y)
-TARGETS+=procps
-endif
+$(eval $(call GENTARGETS,package,procps))

From 64b351f6252f27dc5c21b9b4b6c62fd2676837f2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Apr 2011 22:20:48 +0200
Subject: [PATCH 0114/6849] procps: fix build with make 3.82

Based on patch by Bruce Bushby.

Issue with make include order. For more details, see:
http://old.nabble.com/make-3.81.91---procps-3.2.8-td29281048.html

Equivalent to upstream fix:
http://procps.cvs.sourceforge.net/viewvc/procps/procps/Makefile?r1=1.70&r2=1.71

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/procps/procps-make-3.82.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/procps/procps-make-3.82.patch

diff --git a/package/procps/procps-make-3.82.patch b/package/procps/procps-make-3.82.patch
new file mode 100644
index 0000000000..2a563561bf
--- /dev/null
+++ b/package/procps/procps-make-3.82.patch
@@ -0,0 +1,23 @@
+[PATCH] procps: fix build with make 3.82
+
+Equivalent to upstream fix:
+http://procps.cvs.sourceforge.net/viewvc/procps/procps/Makefile?r1=1.70&r2=1.71
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: procps-3.2.8/Makefile
+===================================================================
+--- procps-3.2.8.orig/Makefile
++++ procps-3.2.8/Makefile
+@@ -174,7 +174,7 @@
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+ 
+--include */module.mk
++-include proc/module.mk ps/module.mk
+ 
+ do_all:    $(ALL)
+ 

From 7fa9c251956577058142b001464bbc0ae67a763a Mon Sep 17 00:00:00 2001
From: Andy Kennedy <Andy.Kennedy@adtran.com>
Date: Mon, 28 Mar 2011 13:47:58 -0500
Subject: [PATCH 0115/6849] package: add htop package

Changes made based upon e-mails with Mike Frysinger and Gerhard Heift. The
autoreconf change is important for anyone using uClibc as there is no widely
available backtrace (yet).

[Peter: fix Config.in indentation, autoreconf, patch]
Signed-off-by:  Andy Kennedy <Andy.Kennedy@AdTran.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  3 ++
 package/htop/Config.in  |  8 +++++
 package/htop/htop.mk    | 13 +++++++
 package/htop/htop.patch | 75 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 package/htop/Config.in
 create mode 100644 package/htop/htop.mk
 create mode 100644 package/htop/htop.patch

diff --git a/package/Config.in b/package/Config.in
index ea39570417..014c2c08e3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -477,6 +477,9 @@ endmenu
 menu "System tools"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
+endif
+source "package/htop/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"
diff --git a/package/htop/Config.in b/package/htop/Config.in
new file mode 100644
index 0000000000..55b4b151fc
--- /dev/null
+++ b/package/htop/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HTOP
+	bool "htop"
+	select BR2_PACKAGE_NCURSES
+	help
+	  htop is an interactive text-mode process viewer for Linux.
+	  It aims to be a better top.
+
+	  http://htop.sf.net
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
new file mode 100644
index 0000000000..3f27b3e9b9
--- /dev/null
+++ b/package/htop/htop.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# htop
+#
+#############################################################
+
+HTOP_VERSION = 0.9
+HTOP_SOURCE = htop-$(HTOP_VERSION).tar.gz
+HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERSION)
+HTOP_DEPENDENCIES = ncurses
+HTOP_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS,package,htop))
diff --git a/package/htop/htop.patch b/package/htop/htop.patch
new file mode 100644
index 0000000000..776561468f
--- /dev/null
+++ b/package/htop/htop.patch
@@ -0,0 +1,75 @@
+# This patch removes the hard dependency on backtrace by checking for
+# it at compile time and adds a cross-compile /proc check.
+# Patch given to me by Hisham <hisham.hm@gmail.com> (htop-general)
+#
+# This patch is taken from upstream svn (r213, r215)
+#
+# Signed-off-by: Andy Kennedy <Andy.Kennedy@adtran.com>
+diff -Naur a/CRT.c b/CRT.c
+--- a/CRT.c    2010-11-23 09:56:32.000000000 -0600
++++ b/CRT.c    2011-03-21 17:08:21.000000000 -0500
+@@ -11,7 +11,9 @@
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+
+ #include "String.h"
+
+@@ -125,12 +127,14 @@
+    CRT_done();
+    #if __linux
+    fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n");
+-   #else
+-   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
+-   #endif
++   #ifdef HAVE_EXECINFO_H
+    size_t size = backtrace(backtraceArray, sizeof(backtraceArray));
+    fprintf(stderr, "Backtrace: \n");
+    backtrace_symbols_fd(backtraceArray, size, 2);
++   #endif
++   #else
++   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
++   #endif
+    abort();
+ }
+
+diff -Naur a/CRT.h b/CRT.h
+--- a/CRT.h    2010-11-23 09:56:32.000000000 -0600
++++ b/CRT.h    2011-03-21 17:06:16.000000000 -0500
+@@ -14,7 +14,9 @@
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+
+ #include "String.h"
+
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac    2010-11-23 09:56:32.000000000 -0600
++++ b/configure.ac    2011-03-21 17:06:16.000000000 -0500
+@@ -25,6 +25,7 @@
+ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
+   missing_headers="$missing_headers $ac_header"
+ ])
++AC_CHECK_HEADERS([execinfo.h],[:],[:])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+@@ -99,10 +100,10 @@
+   AC_MSG_ERROR([missing headers: $missing_headers])
+ fi
+
+-
+-
++if test "$cross_compiling" = "no"; then
+ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
+ AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
++fi
+
+ AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes")
+ PLPA_INCLUDED

From 2af9541e2cdc4eaafb9a0766b9dd5b1012ef91f4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Apr 2011 14:11:35 +0200
Subject: [PATCH 0116/6849] toolchain/gcc: bump 4.4.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.4.5 => 4.4.6}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.4.5 => 4.4.6}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.4.5 => 4.4.6}/302-c99-snprintf.patch           | 0
 .../gcc/{4.4.5 => 4.4.6}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.4.5 => 4.4.6}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.4.5 => 4.4.6}/950-sparc-leon.patch             | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/950-sparc-leon.patch (100%)
 rename toolchain/gcc/{4.4.5 => 4.4.6}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.4.5/100-uclibc-conf.patch b/toolchain/gcc/4.4.6/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.4.5/100-uclibc-conf.patch
rename to toolchain/gcc/4.4.6/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.4.5/301-missing-execinfo_h.patch b/toolchain/gcc/4.4.6/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.4.5/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.4.6/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.4.5/302-c99-snprintf.patch b/toolchain/gcc/4.4.6/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.4.5/302-c99-snprintf.patch
rename to toolchain/gcc/4.4.6/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.4.5/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.4.6/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.4.5/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.4.6/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.4.5/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.4.6/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.4.5/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.4.6/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.4.5/950-sparc-leon.patch b/toolchain/gcc/4.4.6/950-sparc-leon.patch
similarity index 100%
rename from toolchain/gcc/4.4.5/950-sparc-leon.patch
rename to toolchain/gcc/4.4.6/950-sparc-leon.patch
diff --git a/toolchain/gcc/4.4.5/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.4.6/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.4.5/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.4.6/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7a1905fb55..cf3687815b 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -52,7 +52,7 @@ config BR2_GCC_VERSION
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
 	default "4.3.5"     if BR2_GCC_VERSION_4_3_X
-	default "4.4.5"     if BR2_GCC_VERSION_4_4_X
+	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.2"     if BR2_GCC_VERSION_4_5_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 

From a29731c4c3441b33f3eb8b75f580039c8285ffed Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Apr 2011 16:52:35 +0200
Subject: [PATCH 0117/6849] kernel-headers: bump 2.6.38.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 1da6d53382..92798d8b3d 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -46,6 +46,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.2"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.38.3"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From b4f976f28b6b95ade6b87525f95ab406b78aef87 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Apr 2011 22:46:04 +0200
Subject: [PATCH 0118/6849] crosstool-ng: fix target libc install after
 s/sys-root/sysroot/ rename

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index edd643baae..2c5829cb2d 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -60,7 +60,7 @@ endif
 $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 	$(Q)mkdir -p $(TARGET_DIR)/lib
 	$(Q)CTNG_TUPLE="$$( $(call ctng,show-tuple) )";                     \
-	    CTNG_SYSROOT="$(HOST_DIR)/usr/$${CTNG_TUPLE}/sys-root";        \
+	    CTNG_SYSROOT="$(HOST_DIR)/usr/$${CTNG_TUPLE}/sysroot";          \
 	    echo "CTNG_TUPLE='$${CTNG_TUPLE}'";                             \
 	    echo "CTNG_SYSROOT='$${CTNG_SYSROOT}'";                         \
 	    echo "Copy external toolchain libraries to target...";          \

From d9124d0da9caa35b1b99f11b14131ad3428f8eb5 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 19 Apr 2011 23:02:21 +0200
Subject: [PATCH 0119/6849] toolchain/crosstool-NG: fix sysroot name

We have to ensure that the sysroot created while building the
toolchain will be the one we later search for libraries. So:
 - hide the sysroot name prompt from the ct-ng menu.
 - force the sysroot name to be 'sysroot'.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../002-no-sysroot-prompt-in-backend.patch           | 12 ++++++++++++
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk     |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch

diff --git a/toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch b/toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch
new file mode 100644
index 0000000000..4c3426aa5a
--- /dev/null
+++ b/toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch
@@ -0,0 +1,12 @@
+diff --git a/config/toolchain.in b/config/toolchain.in
+--- a/config/toolchain.in
++++ b/config/toolchain.in
+@@ -20,7 +20,7 @@
+ 
+ config SYSROOT_NAME
+     string
+-    prompt "sysroot directory name"
++    prompt "sysroot directory name" if ! BACKEND
+     depends on USE_SYSROOT
+     default "sysroot"
+     help
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 2c5829cb2d..c57876e48a 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -257,6 +257,7 @@ endif
 # And the specials for paths
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_PREFIX_DIR)=.*:\1="$(HOST_DIR)/usr":;
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LOCAL_TARBALLS_DIR)=.*:\1="$(DL_DIR)":;
+CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_NAME)=.*:\1="sysroot":;
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
 
 #--------------

From f98c8d65bd2d7cfb9d3372f083baeb966377ef36 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 19 Apr 2011 23:02:22 +0200
Subject: [PATCH 0120/6849] toolchain/crosstool-NG: bump version to 1.10.1

At the same time, also use the new upstream location.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index c57876e48a..e52bdee25d 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -14,8 +14,8 @@ uclibc: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
 # Internal variables
 
 # Crostool-NG hard-coded configuration options
-CTNG_VERSION:=1.10.0
-CTNG_SITE:=http://ymorin.is-a-geek.org/download/crosstool-ng/
+CTNG_VERSION:=1.10.1
+CTNG_SITE:=http://crosstool-ng.org/download/crosstool-ng/
 CTNG_SOURCE:=crosstool-ng-$(CTNG_VERSION).tar.bz2
 CTNG_DIR:=$(BUILD_DIR)/crosstool-ng-$(CTNG_VERSION)
 CTNG_CAT:=bzcat

From 23f3b883ee6c4e1309557c1310af98855f171869 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 20 Apr 2011 14:41:54 -0300
Subject: [PATCH 0121/6849] iproute2: bump to version 2.6.38

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-2.6.37-optional-ipv6.patch => iproute2-optional-ipv6.patch} | 0
 package/iproute2/iproute2.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/iproute2/{iproute2-2.6.37-optional-ipv6.patch => iproute2-optional-ipv6.patch} (100%)

diff --git a/package/iproute2/iproute2-2.6.37-optional-ipv6.patch b/package/iproute2/iproute2-optional-ipv6.patch
similarity index 100%
rename from package/iproute2/iproute2-2.6.37-optional-ipv6.patch
rename to package/iproute2/iproute2-optional-ipv6.patch
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index dfb841063a..630fab4c5a 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 2.6.37
+IPROUTE2_VERSION = 2.6.38
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
 IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc

From 7d75acdbee2d3dc3f611c67ac0d3a05c544b8ca2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Apr 2011 10:27:17 +0200
Subject: [PATCH 0122/6849] package: add can-utils

Add SocketCAN utilities.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/can-utils/Config.in    |  8 ++++++++
 package/can-utils/can-utils.mk | 11 +++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/can-utils/Config.in
 create mode 100644 package/can-utils/can-utils.mk

diff --git a/package/Config.in b/package/Config.in
index 014c2c08e3..ce39edd699 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -373,6 +373,7 @@ endif
 source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
+source "package/can-utils/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cups/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/can-utils/Config.in b/package/can-utils/Config.in
new file mode 100644
index 0000000000..79c1459464
--- /dev/null
+++ b/package/can-utils/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CAN_UTILS
+	bool "can-utils"
+	help
+	  SocketCAN is a set of open source CAN drivers and a
+	  networking stack.
+	  This package provides various tools for this stack.
+
+	  http://developer.berlios.de/projects/socketcan/
diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
new file mode 100644
index 0000000000..f602490bda
--- /dev/null
+++ b/package/can-utils/can-utils.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# can-utils
+#
+#############################################################
+
+CAN_UTILS_VERSION = 1235
+CAN_UTILS_SITE = svn://svn.berlios.de/socketcan/trunk/can-utils
+CAN_UTILS_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS,package,can-utils))

From 36449d1f2aaf67cf377d0b7eb49840b10cbec903 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 20 Apr 2011 14:41:59 -0300
Subject: [PATCH 0123/6849] toolchain: bump 2.6.35 kernel headers to 2.6.35.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                              | 2 +-
 ...csi-use-__uX-types-for-headers-exported-to-user-space.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/kernel-headers/{linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 92798d8b3d..68151d051d 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -43,7 +43,7 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.35.11"	if BR2_KERNEL_HEADERS_2_6_35
+	default "2.6.35.12"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.3"	if BR2_KERNEL_HEADERS_2_6_38
diff --git a/toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
rename to toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

From c5aee2a346d27ab8197ab3f7fb37e1b18a9868d1 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Thu, 21 Apr 2011 10:29:27 +0800
Subject: [PATCH 0124/6849] New package: bwm-ng

Add new package: bwm-ng

Bandwidth Monitor NG is a small and console-based live network and
disk-io bandwidth monitor for Linux, BSD, Solaris, Mac OS X and others.

[Peter: move to net, fix Config.in line length, remove unused make var]
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/bwm-ng/Config.in |  8 ++++++++
 package/bwm-ng/bwm-ng.mk | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/bwm-ng/Config.in
 create mode 100644 package/bwm-ng/bwm-ng.mk

diff --git a/package/Config.in b/package/Config.in
index ce39edd699..76b20769ec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -373,6 +373,7 @@ endif
 source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
+source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cups/Config.in"
diff --git a/package/bwm-ng/Config.in b/package/bwm-ng/Config.in
new file mode 100644
index 0000000000..25e7cbe8f7
--- /dev/null
+++ b/package/bwm-ng/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_BWM_NG
+	bool "bwm-ng"
+	help
+	  Bandwidth Monitor NG is a small and console-based live
+	  network and disk-io bandwidth monitor for Linux, BSD,
+	  Solaris, Mac OS X and others.
+
+	  http://sourceforge.net/projects/bwmng/
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
new file mode 100644
index 0000000000..a33f4f211e
--- /dev/null
+++ b/package/bwm-ng/bwm-ng.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# bwm-ng
+#
+#############################################################
+
+BWM_NG_VERSION = 0.6
+BWM_NG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/
+BWM_NG_CONF_OPT = --with-procnetdev --with-diskstats
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+BWM_NG_CONF_OPT += --with-ncurses
+BWM_NG_DEPENDENCIES += ncurses
+endif
+
+$(eval $(call AUTOTARGETS,package,bwm-ng))

From 67be03806fe7c9b047b2d505c6c0fc27cef447ca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Apr 2011 11:09:20 -0300
Subject: [PATCH 0125/6849] less: bump to version 443

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/less/less.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/less/less.mk b/package/less/less.mk
index 6f985ed94a..2379c8f260 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LESS_VERSION = 436
+LESS_VERSION = 443
 LESS_SITE = http://www.greenwoodsoftware.com/less
 LESS_DEPENDENCIES = ncurses
 

From 8b695c44840cec1b48c52f9c8b4d42250d007494 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Apr 2011 11:09:21 -0300
Subject: [PATCH 0126/6849] libpng: bump to version 1.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpng/libpng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index e64989dffd..657ba45f8e 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,7 +3,7 @@
 # libpng (Portable Network Graphic library)
 #
 #############################################################
-LIBPNG_VERSION = 1.4.5
+LIBPNG_VERSION = 1.4.7
 LIBPNG_SERIES = 14
 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2

From 95d8da26124418dfa38901fc8839f4480b97b538 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Apr 2011 11:09:23 -0300
Subject: [PATCH 0127/6849] linux: bump kernel to 2.6.38.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index f7d7f88ec1..d6bb790e4d 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_38
 
 config BR2_LINUX_KERNEL_2_6_38
-	bool "2.6.38"
+	bool "2.6.38.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.38"
+	default "2.6.38.3"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.38" if BR2_LINUX_KERNEL_2_6_38
+	default "2.6.38.3" if BR2_LINUX_KERNEL_2_6_38
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From dfc7b95c492c51771bae906921122ac1f145d616 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Apr 2011 11:09:24 -0300
Subject: [PATCH 0128/6849] squid: bump to version 3.1.12

Bump squid to version 3.1.12
Also disable strict error checking since this breaks with gcc 4.6.0+

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index e410bd174d..9427a797cd 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.11
+SQUID_VERSION = 3.1.12
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_AUTORECONF = YES
@@ -15,7 +15,7 @@ SQUID_CONF_OPT =	--enable-wccp --enable-wccpv2 --enable-async-io=8 \
 			--enable-htcp --enable-snmp --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \
 			--with-filedescriptors=1024 --disable-ident-lookups \
-			--enable-auth="digest" \
+			--enable-auth="digest" --disable-strict-error-checking \
 			--enable-digest-auth-helpers="password" \
 			--enable-external-acl-helpers="ip_user"
 

From 3510193460d7eb9eca2b944212ee84cabe4996a6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Apr 2011 23:52:45 +0200
Subject: [PATCH 0129/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index d0a61ebc4d..5d29693445 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,11 +3,13 @@
 	Updated/fixed packages: alsa-lib, alsa-utils, alsamixergui,
 	avahi, busybox, copas, dnsmasq, dropbear, ethtool, fakeroot,
 	ffmpeg, file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
-	imagemagick, libdnet, libpng, libxml2, libxslt, lighttpd,
-	makedevs, midori, mpg123, mpd, mtd-utils, ncurses, netsnmp,
-	openssl, pkg-config, qt, quagga, readline, rsync, samba,
-	socat, squashfs, webkit, xerces, xlib_xtrans, xorg-server,
-	xterm, xz
+	imagemagick, iproute2, less, libdnet, libpng, libxml2,
+	libxslt, lighttpd, makedevs, midori, mpg123, mpd, mtd-utils,
+	ncurses, netsnmp, openssl, pkg-config, procps, qt, quagga,
+	readline, rsync, samba, squid, socat, squashfs, tslib, webkit,
+	xerces, xlib_xtrans, xorg-server, xterm, xz
+
+	New packages: can-utils, htop, libv4l
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 983158e225c2947010e078bcd2f62205d9ee6911 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Apr 2011 11:45:27 +0200
Subject: [PATCH 0130/6849] target-generic-hostname: add /etc/hosts entry as
 well

Some applications (like proftpd) tries to resolve hostname at startup,
so add it to /etc/hosts.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/generic/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in
index 3a750c3b44..ba6e4b0602 100644
--- a/target/generic/Makefile.in
+++ b/target/generic/Makefile.in
@@ -6,6 +6,8 @@ TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE
 target-generic-hostname:
 	mkdir -p $(TARGET_DIR)/etc
 	echo "$(TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
+	$(SED) '$$a \127.0.1.1\t$(TARGET_GENERIC_HOSTNAME)' \
+		-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts
 
 target-generic-issue:
 	mkdir -p $(TARGET_DIR)/etc

From af6b3ecf401935edfe613c2d90423f34bc38460e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Apr 2011 13:27:14 +0200
Subject: [PATCH 0131/6849] proftpd: remove UseIPv6 option from sample config
 if built without IPv6

proftpd refuses to start if it finds a UseIPv6 option in the configuration
file (even if set to off) when built without IPv6 support, so comment out
line.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proftpd/proftpd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 191f611497..75ab930ff6 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -31,6 +31,7 @@ define PROFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
 	@if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \
 		$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
+		$(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \
 	fi
 	$(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d
 endef

From cffe3b1895f3b0b1e0cb36e1f209794a9ac9557b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Apr 2011 14:07:23 +0200
Subject: [PATCH 0132/6849] fs/skeleton: add ftp user/group

Needed by E.G. proftpd for the default (anonymous ftp) config.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/group             | 1 +
 fs/skeleton/etc/passwd            | 1 +
 fs/skeleton/etc/shadow            | 1 +
 fs/skeleton/home/{ => ftp}/.empty | 0
 4 files changed, 3 insertions(+)
 rename fs/skeleton/home/{ => ftp}/.empty (100%)

diff --git a/fs/skeleton/etc/group b/fs/skeleton/etc/group
index df12dbae3f..311a455167 100644
--- a/fs/skeleton/etc/group
+++ b/fs/skeleton/etc/group
@@ -12,6 +12,7 @@ staff:x:50:
 haldaemon:x:68:
 dbus:x:81:
 netdev:x:82:
+ftp:x:83
 nobody:x:99:
 nogroup:x:99:
 users:x:100:
diff --git a/fs/skeleton/etc/passwd b/fs/skeleton/etc/passwd
index 377d4df5b4..ed7006a29c 100644
--- a/fs/skeleton/etc/passwd
+++ b/fs/skeleton/etc/passwd
@@ -10,6 +10,7 @@ backup:x:34:34:backup:/var/backups:/bin/sh
 operator:x:37:37:Operator:/var:/bin/sh
 haldaemon:x:68:68:hald:/:/bin/sh
 dbus:x:81:81:dbus:/var/run/dbus:/bin/sh
+ftp:x:83:83:ftp:/home/ftp:/bin/sh
 nobody:x:99:99:nobody:/home:/bin/sh
 sshd:x:103:99:Operator:/var:/bin/sh
 default:x:1000:1000:Default non-root user:/home/default:/bin/sh
diff --git a/fs/skeleton/etc/shadow b/fs/skeleton/etc/shadow
index 4941a1ac53..67b67c1960 100644
--- a/fs/skeleton/etc/shadow
+++ b/fs/skeleton/etc/shadow
@@ -8,5 +8,6 @@ shutdown:*:10933:0:99999:7:::
 halt:*:10933:0:99999:7:::
 uucp:*:10933:0:99999:7:::
 operator:*:10933:0:99999:7:::
+ftp:*:10933:0:99999:7:::
 nobody:*:10933:0:99999:7:::
 default::10933:0:99999:7:::
diff --git a/fs/skeleton/home/.empty b/fs/skeleton/home/ftp/.empty
similarity index 100%
rename from fs/skeleton/home/.empty
rename to fs/skeleton/home/ftp/.empty

From 8071f81f3de49b4f1e7d10dcdc3d9fda09f0b6f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Apr 2011 13:43:25 +0200
Subject: [PATCH 0133/6849] qemu/arm-versatile: enable tmpfs support in kernel

Needed for /tmp.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-versatile/linux-2.6.36.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/board/qemu/arm-versatile/linux-2.6.36.config b/board/qemu/arm-versatile/linux-2.6.36.config
index ac58e1afcd..597fd234cb 100644
--- a/board/qemu/arm-versatile/linux-2.6.36.config
+++ b/board/qemu/arm-versatile/linux-2.6.36.config
@@ -69,6 +69,7 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_EXT2_FS=y
 CONFIG_VFAT_FS=m
+CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_CRAMFS=y
 CONFIG_MINIX_FS=y

From f550c1bdbb22df15d297303599e85c2a7511a8ff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Apr 2011 15:11:02 +0200
Subject: [PATCH 0134/6849] qemu/arm-versatile: use 2.6.38.3 kernel

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{linux-2.6.36.config => linux-2.6.38.config}              | 4 ++--
 configs/qemu_arm_versatile_defconfig                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/arm-versatile/{linux-2.6.36.config => linux-2.6.38.config} (97%)

diff --git a/board/qemu/arm-versatile/linux-2.6.36.config b/board/qemu/arm-versatile/linux-2.6.38.config
similarity index 97%
rename from board/qemu/arm-versatile/linux-2.6.36.config
rename to board/qemu/arm-versatile/linux-2.6.38.config
index 597fd234cb..5f58b973a4 100644
--- a/board/qemu/arm-versatile/linux-2.6.36.config
+++ b/board/qemu/arm-versatile/linux-2.6.38.config
@@ -8,12 +8,13 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MACH_VERSATILE_AB=y
 CONFIG_PCI=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=1f03 mem=32M"
-CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_PM=y
 CONFIG_NET=y
@@ -35,7 +36,6 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_ARM_INTEGRATOR=y
 CONFIG_BLK_DEV_RAM=y
-CONFIG_EEPROM_LEGACY=m
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SYM53C8XX_2=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 9c990fb518..6b3d9547a0 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.36.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From cd58efbac7040c58429b765853306c3e8052e984 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Apr 2011 22:34:50 +0200
Subject: [PATCH 0135/6849] popt: bump version, use alternative upstream
 location

Closes #3643

rpm5.org seems to be gone/down, so use linuxfromscratch mirror instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES              | 7 ++++---
 package/popt/popt.mk | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5d29693445..07e4935126 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,9 +5,9 @@
 	ffmpeg, file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
 	imagemagick, iproute2, less, libdnet, libpng, libxml2,
 	libxslt, lighttpd, makedevs, midori, mpg123, mpd, mtd-utils,
-	ncurses, netsnmp, openssl, pkg-config, procps, qt, quagga,
-	readline, rsync, samba, squid, socat, squashfs, tslib, webkit,
-	xerces, xlib_xtrans, xorg-server, xterm, xz
+	ncurses, netsnmp, openssl, pkg-config, popt, procps, qt,
+	quagga, readline, rsync, samba, squid, socat, squashfs, tslib,
+	webkit, xerces, xlib_xtrans, xorg-server, xterm, xz
 
 	New packages: can-utils, htop, libv4l
 
@@ -19,6 +19,7 @@
 	#3475: Calling sync on large filesystems when not always necessary
 	#3511: make busybox-menuconfig does not download busybox package
 	#3541: Quotes in the top Makefile:217 break buildroot/kernel config...
+	#3643: popt source url is not responding
 
 2011.02, Released February 28th, 2011:
 
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index 0f9d313dcf..4fdc01d4d4 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -3,11 +3,10 @@
 # popt
 #
 #############################################################
-POPT_VERSION:=1.15
-POPT_SITE:=http://rpm5.org/files/popt
+POPT_VERSION = 1.16
+# rpm5.org down
+POPT_SITE = http://anduin.linuxfromscratch.org/sources/BLFS/svn/p/
 POPT_INSTALL_STAGING = YES
-POPT_INSTALL_TARGET = YES
-
 
 POPT_CONF_ENV = ac_cv_va_copy=yes
 

From 4b4e5827a24d8a517038741b681dc077c2f28cf1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 23 Apr 2011 18:18:34 +0200
Subject: [PATCH 0136/6849] toolchain/crosstool-NG: correctly copy the dynamic
 linker

Depending on some setting (which? Arch? Others?), the dynamic linker
can get different names. Some times, it is named ld-linux.something.so,
other times, it is ld.so.1, and maybe other variants as well...

The fix is to always copy ls*.so, even if it is a symlink: we create
the destination file by its SONAME, and if ld*.so matches more than
one file, that's no issue, as they would all get the same SONAME (being
symlinks ones to the others).

Split long lines at the same time.

Reported-by: Ettore Campion <ecampion@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index e52bdee25d..015cd13e63 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -36,13 +36,14 @@ endef
 
 #--------------
 # The generic system libraries (in /lib)
-CTNG_LIBS_LIB := libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libpthread.so libresolv.so librt.so libutil.so
+CTNG_LIBS_LIB := ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so    \
+                 libnsl.so libpthread.so libresolv.so librt.so libutil.so
 
 #--------------
 # The libc-specific system libraries (in /lib)
 # Note: it may be needed to tweak the NSS libs in the glibc and eglibc cases...
-CTNG_LIBS_uClibc := ld-uClibc.so
-CTNG_LIBS_glibc  := ld-linux.so libnss_files.so libnss_dns.so
+CTNG_LIBS_uClibc :=
+CTNG_LIBS_glibc  := libnss_files.so libnss_dns.so
 CTNG_LIBS_eglibc := $(CTNG_LIBS_glibc)
 
 #--------------

From 7d584285c8b32d8a419f8a5fb40efce66e8e5e24 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 20 Apr 2011 14:41:58 -0300
Subject: [PATCH 0137/6849] ncurses: roll back to version 5.7

ncurses 5.8 and 5.9 segfault with some applications so roll back to
version 5.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 91ab97a941..ae3f3fb70a 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -23,9 +23,8 @@
 # USA
 
 # TARGETS
-NCURSES_VERSION = 5.8
+NCURSES_VERSION = 5.7
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
-NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_INSTALL_STAGING = YES
 
 NCURSES_CONF_OPT = \

From 36d1a7a5a3b78e278a0576d9856e6fb7ed1fe5c6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 20 Apr 2011 14:41:55 -0300
Subject: [PATCH 0138/6849] haserl: bump dev version to 0.9.28

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/Config.in |  2 +-
 package/haserl/haserl.mk | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 23101c43fd..ad9a8e91e7 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -38,4 +38,4 @@ endchoice
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.27"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.28"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index a8585e827b..c62b344a33 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -4,13 +4,20 @@
 #
 #############################################################
 
-HASERL_VERSION:=$(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
-HASERL_AUTORECONF:=NO
-HASERL_INSTALL_TARGET:=YES
+HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
+HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
 
 # force haserl 0.8.0 to use install-sh so stripping works
 HASERL_CONF_ENV = ac_cv_path_install=./install-sh
+
+# lua2c is only needed when haserl_lualib.inc is older than haserl_lualib.lua
+# So avoid having a host-lua just for this
+define HASERL_NO_LUA2C
+	$(SED) 's/haserl_lualib.lua lua2c/haserl_lualib.lua/' \
+		$(@D)/src/Makefile.in
+endef
+HASERL_POST_EXTRACT_HOOKS += HASERL_NO_LUA2C
+
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
 		--with-lua-headers=$(STAGING_DIR)

From f3de6d578bc3f522ed066bd829cddafb6e31f22c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Apr 2011 23:26:00 +0200
Subject: [PATCH 0139/6849] u-boot: remove extra CFLAGS / LDFLAGS handling

TARGET_CONFIGURE_FLAGS already contain CFLAGS/LDFLAGS, so no point in
setting them explicitly.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/u-boot/u-boot.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk
index a86819b5d8..2f839c53c9 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/u-boot/u-boot.mk
@@ -129,8 +129,6 @@ endif # BR2_TARGET_UBOOT_NETWORK
 # Build U-Boot itself
 $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
 	$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(U_BOOT_CONFIGURE_OPTS) \
 		$(MAKE) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
 		$(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR)

From cdd4a7a06184ec1a322ac43f633b5f15f991de54 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Apr 2011 23:32:46 +0200
Subject: [PATCH 0140/6849] u-boot: fix target build of fw_printenv

Closes #3571

The current approach for building fw_printenv for the target fails on
some configurations, so use the upstream make target (which works)
instead.

At the same time get rid of the unneeded stripping.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES               |  1 +
 boot/u-boot/u-boot.mk | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 07e4935126..19d2cc518f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@
 	#3475: Calling sync on large filesystems when not always necessary
 	#3511: make busybox-menuconfig does not download busybox package
 	#3541: Quotes in the top Makefile:217 break buildroot/kernel config...
+	#3571: u-boot: fw_printenv does not build
 	#3643: popt source url is not responding
 
 2011.02, Released February 28th, 2011:
diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk
index 2f839c53c9..ff3f65e96a 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/u-boot/u-boot.mk
@@ -159,15 +159,11 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
 		$(U_BOOT_DIR)/tools/os_support.c \
 		$(wildcard $(U_BOOT_DIR)/libfdt/fdt*.c $(U_BOOT_DIR)/lib/libfdt/fdt*.c)
 
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-
 # Build manually fw_printenv for the target
 $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured
-	mkdir -p $(@D)
-	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \
-		-DUSE_HOSTCC -o $@ \
-		$(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/lib*/crc32.c
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
+	$(TARGET_CONFIGURE_OPTS) \
+		$(MAKE) HOSTCC="$(TARGET_CC)" -C $(U_BOOT_DIR) env
+	$(INSTALL) -m 0755 -D $(U_BOOT_DIR)/tools/env/fw_printenv $@
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 
 u-boot: $(U_BOOT_TARGETS)

From 31fb724fd2c271fcaf204abcdc26e4afe82618ac Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 8 Apr 2011 16:46:23 +0200
Subject: [PATCH 0141/6849] u-boot: add 2011.03 release

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/u-boot/Config.in | 6 +++++-
 boot/u-boot/u-boot.mk | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in
index 3ba1ef3a92..00a4a5f246 100644
--- a/boot/u-boot/Config.in
+++ b/boot/u-boot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2010_12
+	default BR2_TARGET_UBOOT_2011_03
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2011_03
+	bool "2011.03"
+
 config BR2_TARGET_UBOOT_2010_12
 	bool "2010.12"
 
@@ -42,6 +45,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2011.03"	if BR2_TARGET_UBOOT_2011_03
 	default "2010.12"	if BR2_TARGET_UBOOT_2010_12
 	default "2010.09"	if BR2_TARGET_UBOOT_2010_09
 	default "2010.06"	if BR2_TARGET_UBOOT_2010_06
diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk
index ff3f65e96a..047f2c87e2 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/u-boot/u-boot.mk
@@ -11,7 +11,7 @@ U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 # pick some random stable U-Boot version that will be used just to
 # build mkimage.
 ifeq ($(U_BOOT_VERSION),)
-U_BOOT_VERSION=2010.12
+U_BOOT_VERSION=2011.03
 endif
 
 ifeq ($(U_BOOT_VERSION),custom)

From 7edfd3c1b4fed7d7211024ae5f5a428a5187ea4d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Apr 2011 23:54:28 +0200
Subject: [PATCH 0142/6849] lockfile-progs: fix make dependency

Based on patch by Sergio Monteiro Basto <sergio@sergiomb.no-ip.org>.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lockfile-progs/lockfile-progs.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index f8d8ceeca1..031712e4f4 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -6,6 +6,7 @@
 LOCKFILE_PROGS_VERSION = 0.1.15
 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
 LOCKFILE_PROGS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
+LOCKFILE_PROGS_DEPENDENCIES = liblockfile
 
 LOCKFILE_BINS = \
 	$(addprefix lockfile-,check create remove touch) \

From b052862f02f94eaca39fcd576971a84a13b865be Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Apr 2011 00:00:23 +0200
Subject: [PATCH 0143/6849] Makefile: remove outdated make targets

busybox and linux26 no longer have a -config target, and prepatch only makes
sense for a very specific configuration (BR toolchain with GDB enabled).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Makefile b/Makefile
index 02a5c366ad..98cc09f932 100644
--- a/Makefile
+++ b/Makefile
@@ -637,10 +637,6 @@ ifeq ($(O),output)
 endif
 	rm -rf $(CONFIG_DIR)/.config $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps
 
-configured: dirs kernel-headers uclibc-config busybox-config linux26-config
-
-prepatch:	gcc-patched gdb-patched uclibc-patched
-
 cross: $(BASE_TARGETS)
 
 help:
@@ -665,7 +661,6 @@ help:
 	@echo '  randpackageconfig      - New config with random answer to package options'
 	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
 	@echo '  allnopackageconfig     - New config where package options are answered with no'
-	@echo '  configured             - make {uclibc/busybox/linux26}-config'
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'

From 4bb33dce49245ed36137c7028a9d170d8f4fe8ff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Apr 2011 00:10:45 +0200
Subject: [PATCH 0144/6849] Makefile: make help: show
 busybox/ctng/linux/uclibc-menuconfig if enabled

For this we need to read .config.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 98cc09f932..d4f5e15137 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
 	defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	source-check help
+	source-check
 
 # Strip quotes and then whitespaces
 qstrip=$(strip $(subst ",,$(1)))
@@ -661,6 +661,18 @@ help:
 	@echo '  randpackageconfig      - New config with random answer to package options'
 	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
 	@echo '  allnopackageconfig     - New config where package options are answered with no'
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	@echo '  busybox-menuconfig     - Run BusyBox menuconfig'
+endif
+ifeq ($(BR2_LINUX_KERNEL),y)
+	@echo '  linux-menuconfig       - Run Linux kernel menuconfig'
+endif
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+	@echo '  uclibc-menuconfig      - Run uClibc menuconfig'
+endif
+ifeq ($(BR2_TOOLCHAIN_CTNG),y)
+	@echo '  ctng-menuconfig        - Run crosstool-NG menuconfig'
+endif
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'

From 648d33d6142329151ca1ef61b50649477574c684 Mon Sep 17 00:00:00 2001
From: Heiko Zuerker <smiley73@users.sourceforge.net>
Date: Mon, 25 Apr 2011 08:13:58 -0500
Subject: [PATCH 0145/6849] dhcp: allow IPv6 to be turned on

Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 64472c9e89..58fd47c8ad 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -13,8 +13,11 @@ DHCP_CONF_OPT = \
 	--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
 	--with-srv-pid-file=/var/run/dhcpd.pid \
 	--with-cli-pid-file=/var/run/dhclient.pid \
-	--with-relay-pid-file=/var/run/dhcrelay.pid \
-	--disable-dhcpv6
+	--with-relay-pid-file=/var/run/dhcrelay.pid
+
+ifneq ($(BR2_INET_IPV6),y)
+        DHCP_CONF_OPT += --disable-dhcpv6
+endif
 
 ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
 define DHCP_INSTALL_SERVER

From 7d5a772f63660b84c7c755518fd91cb1a7c7d0c7 Mon Sep 17 00:00:00 2001
From: Malte Starostik <m-starostik@versanet.de>
Date: Sun, 27 Feb 2011 16:19:45 +0100
Subject: [PATCH 0146/6849] New package: gdisk

This includes two separately configurable parition manipulation
utilities: gdsik and sgdisk are to GPT disks what fdisk and sfdisk are
in MBR land.

[Peter: patch source, fix typos, fix partial build, pass correct flags]
Signed-off-by: Malte Starostik <m-starostik@versanet.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                       |  1 +
 package/gdisk/Config.in                 | 34 +++++++++++++++++++++
 package/gdisk/gdisk-0.6.14-uuid.h.patch | 22 ++++++++++++++
 package/gdisk/gdisk.mk                  | 39 +++++++++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 package/gdisk/Config.in
 create mode 100644 package/gdisk/gdisk-0.6.14-uuid.h.patch
 create mode 100644 package/gdisk/gdisk.mk

diff --git a/package/Config.in b/package/Config.in
index 76b20769ec..46ecbcb327 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -165,6 +165,7 @@ source "package/eeprog/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
 source "package/gadgetfs-test/Config.in"
+source "package/gdisk/Config.in"
 source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
 source "package/gpsd/Config.in"
diff --git a/package/gdisk/Config.in b/package/gdisk/Config.in
new file mode 100644
index 0000000000..0daec5d5a6
--- /dev/null
+++ b/package/gdisk/Config.in
@@ -0,0 +1,34 @@
+config BR2_PACKAGE_GDISK
+	bool "gdisk"
+	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+	help
+	  GPT fdisk (consisting of the gdisk and sgdisk programs) is a
+	  text-mode partitioning tool that works on Globally Unique Identifier
+	  (GUID) Partition Table (GPT) disks, rather than on the more common
+	  (through 2010) Master Boot Record (MBR) partition tables.
+
+	  http://www.rodsbooks.com/gdisk/
+
+config BR2_PACKAGE_GDISK_GDISK
+	bool "interactive gdisk"
+	depends on BR2_PACKAGE_GDISK
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_E2FSPROGS_LIBUUID
+	help
+	  Install the interactive GUID partition table (GPT) manipulator
+	  /usr/sbin/gdisk which is modelled after and quite similar in use
+	  to the traditional MBR based fdisk tool.
+
+config BR2_PACKAGE_GDISK_SGDISK
+	bool "command line sgdisk"
+	depends on BR2_PACKAGE_GDISK
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_E2FSPROGS_LIBUUID
+	select BR2_PACKAGE_POPT
+	help
+	  Install the command-line GUID partition table (GPT) manipulator
+	  /usr/sbin/sgdisk which is named after the traditional MBR based
+	  sfdisk tool albeit with an entirely different option syntax.
+
+comment "gdisk requires a toolchain with LARGEFILE and C++ support enabled"
+	depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gdisk/gdisk-0.6.14-uuid.h.patch b/package/gdisk/gdisk-0.6.14-uuid.h.patch
new file mode 100644
index 0000000000..ba447a1c32
--- /dev/null
+++ b/package/gdisk/gdisk-0.6.14-uuid.h.patch
@@ -0,0 +1,22 @@
+[PATCH] Don't hardcode uuid.h location
+
+Breaks cross compilation.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ guid.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gdisk-0.6.14/guid.h
+===================================================================
+--- gdisk-0.6.14.orig/guid.h
++++ gdisk-0.6.14/guid.h
+@@ -22,7 +22,7 @@
+ #ifdef _WIN32
+ typedef unsigned char my_uuid_t[16];
+ #else
+-#include </usr/include/uuid/uuid.h>
++#include <uuid/uuid.h>
+ typedef uuid_t my_uuid_t;
+ #endif
+ 
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
new file mode 100644
index 0000000000..ef4627d8e6
--- /dev/null
+++ b/package/gdisk/gdisk.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# gdisk
+#
+#############################################################
+
+GDISK_VERSION = 0.6.14
+GDISK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gptfdisk
+GDISK_SOURCE = gdisk-$(GDISK_VERSION).tgz
+
+GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk
+GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk
+
+ifneq ($(GDISK_TARGETS_y),)
+
+GDISK_DEPENDENCIES += e2fsprogs
+ifeq ($(BR2_PACKAGE_GDISK_SGDISK),y)
+    GDISK_DEPENDENCIES += popt
+endif
+
+
+define GDISK_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
+		-C $(@D) $(GDISK_TARGETS_y)
+endef
+
+define GDISK_INSTALL_TARGET_CMDS
+	for i in $(GDISK_TARGETS_y); do \
+	    $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
+	done
+endef
+
+define GDISK_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GDISK_TARGETS_y))
+endef
+
+endif
+
+$(eval $(call GENTARGETS,package,gdisk))

From 1445e1455e1d80da7d9e8e4d90f7e38903440e07 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@free.fr>
Date: Tue, 26 Apr 2011 10:00:15 +0200
Subject: [PATCH 0147/6849] package: add libexif

[Peter: fix Config.in indentation, source URL]
Signed-off-by: Guillaume Gardet <guillaume.gardet@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libexif/Config.in  |  9 +++++++++
 package/libexif/libexif.mk | 14 ++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libexif/Config.in
 create mode 100644 package/libexif/libexif.mk

diff --git a/package/Config.in b/package/Config.in
index 46ecbcb327..71dc0a80a4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -275,6 +275,7 @@ source "package/gtk2-themes/Config.in"
 source "package/jpeg/Config.in"
 source "package/libart/Config.in"
 source "package/libdrm/Config.in"
+source "package/libexif/Config.in"
 source "package/libgail/Config.in"
 source "package/libglade/Config.in"
 source "package/gdk-pixbuf/Config.in"
diff --git a/package/libexif/Config.in b/package/libexif/Config.in
new file mode 100644
index 0000000000..9c89df4102
--- /dev/null
+++ b/package/libexif/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBEXIF
+	bool "libexif"
+	help
+	  Most digital cameras produce EXIF files, which are JPEG
+	  files with extra tags that contain information about the
+	  image.  The EXIF library allows you to parse an EXIF file
+	  and read the data from those tags.
+
+	  http://libexif.sf.net
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
new file mode 100644
index 0000000000..17c44aff9d
--- /dev/null
+++ b/package/libexif/libexif.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libexif
+#
+#############################################################
+
+LIBEXIF_VERSION = 0.6.20
+LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
+LIBEXIF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
+LIBEXIF_INSTALL_STAGING = YES
+LIBEXIF_CONF_OPT = --disable-docs
+LIBEXIF_DEPENDENCIES = host-pkg-config
+
+$(eval $(call AUTOTARGETS,package,libexif))

From 4bc799856b3ba9378b1d03dac7069d15500cbeeb Mon Sep 17 00:00:00 2001
From: Martin Hicks <mort@bork.org>
Date: Mon, 31 Jan 2011 15:32:06 -0500
Subject: [PATCH 0148/6849] package: add bonnie++

Closes #3379

A good filesystem performance benchmark program

Signed-off-by: Martin Hicks <mort@bork.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                  |  3 ++-
 package/Config.in        |  1 +
 package/bonnie/Config.in | 10 ++++++++++
 package/bonnie/bonnie.mk | 18 ++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 package/bonnie/Config.in
 create mode 100644 package/bonnie/bonnie.mk

diff --git a/CHANGES b/CHANGES
index 19d2cc518f..0b1189861c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,10 +9,11 @@
 	quagga, readline, rsync, samba, squid, socat, squashfs, tslib,
 	webkit, xerces, xlib_xtrans, xorg-server, xterm, xz
 
-	New packages: can-utils, htop, libv4l
+	New packages: bonnie++, can-utils, htop, libv4l
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3379: New Package: bonnie++
 	#3445: Not working openssl-10.0.0d on 386sx
 	#3451: fakeroot package: wrong FAKEROOT_SITE variable
 	#3457: alsamixergui: broken URL
diff --git a/package/Config.in b/package/Config.in
index 71dc0a80a4..b5a1ee4f6c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -17,6 +17,7 @@ source "package/xz/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
+source "package/bonnie/Config.in"
 source "package/dhrystone/Config.in"
 source "package/dmalloc/Config.in"
 source "package/kexec/Config.in"
diff --git a/package/bonnie/Config.in b/package/bonnie/Config.in
new file mode 100644
index 0000000000..9dda4b6cd1
--- /dev/null
+++ b/package/bonnie/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_BONNIE
+	bool "bonnie++"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Filesystem tester
+
+	  http://www.coker.com.au/bonnie++/
+
+comment "bonnie++ requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
new file mode 100644
index 0000000000..9a6188fa40
--- /dev/null
+++ b/package/bonnie/bonnie.mk
@@ -0,0 +1,18 @@
+#
+# bonnie++
+#
+
+BONNIE_VERSION = 1.03e
+BONNIE_SOURCE = bonnie++-$(BONNIE_VERSION).tgz
+BONNIE_SITE = http://www.coker.com.au/bonnie++/
+
+define BONNIE_INSTALL_TARGET_CMDS
+	install -D -m 755 $(@D)/bonnie++ $(TARGET_DIR)/usr/sbin/bonnie++
+	install -D -m 755 $(@D)/zcav $(TARGET_DIR)/usr/sbin/zcav
+endef
+
+define BONNIE_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/bonnie++ $(TARGET_DIR)/usr/sbin/zcav
+endef
+
+$(eval $(call AUTOTARGETS,package,bonnie))

From 5dd48b983d3dcf09d10720519ad9919ec4aa3e9c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Apr 2011 13:23:02 +0200
Subject: [PATCH 0149/6849] barebox: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 09deb5cd29..7a2e02e447 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BAREBOX_VERSION:=2011.01.0
+BAREBOX_VERSION:=2011.04.0
 BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE:=http://www.barebox.org/download/
 BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION)

From 7536aeea8a581ad06a49be095347de359be38eb0 Mon Sep 17 00:00:00 2001
From: Chih-Min Chao <cmchao@gmail.com>
Date: Fri, 11 Mar 2011 16:13:34 +0800
Subject: [PATCH 0150/6849] package: add libraw package

[Peter: use ' = ' rather than ':=' in .mk]
Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libraw/Config.in | 10 ++++++++++
 package/libraw/libraw.mk | 16 ++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/libraw/Config.in
 create mode 100644 package/libraw/libraw.mk

diff --git a/package/Config.in b/package/Config.in
index b5a1ee4f6c..8e78f0faed 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -282,6 +282,7 @@ source "package/libglade/Config.in"
 source "package/gdk-pixbuf/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
+source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
diff --git a/package/libraw/Config.in b/package/libraw/Config.in
new file mode 100644
index 0000000000..4378ccd3da
--- /dev/null
+++ b/package/libraw/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBRAW
+	bool "libraw"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  libraw is a raw image manipulation library
+
+	  http://www.libraw.org/
+
+comment "libraw requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
new file mode 100644
index 0000000000..b76fbbe569
--- /dev/null
+++ b/package/libraw/libraw.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# libraw
+#
+#############################################################
+
+LIBRAW_VERSION = 0.13.1
+LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
+LIBRAW_SITE = http://www.libraw.org/data/
+
+LIBRAW_INSTALL_STAGING = YES
+LIBRAW_CONF_OPT += --disable-examples --disable-lcms \
+			--disable-openmp --disable-demosaic-pack-gpl2 \
+			--disable-demosaic-pack-gpl3
+
+$(eval $(call AUTOTARGETS,package,libraw))

From a6c692160207df2e0416bef0a4099724fa65e58b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Apr 2011 15:03:49 +0200
Subject: [PATCH 0151/6849] libraw: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libraw/libraw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index b76fbbe569..7d03f40f41 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBRAW_VERSION = 0.13.1
+LIBRAW_VERSION = 0.13.4
 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
 LIBRAW_SITE = http://www.libraw.org/data/
 

From ffa7b997235ca1a6494d976cd05f173fe438a37a Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Wed, 9 Mar 2011 11:40:03 +0000
Subject: [PATCH 0152/6849] sh: Fix displayed name of CodeSourcery toolchain

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2ed65bf305..d9a00349b8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -87,7 +87,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
             - 970 glibc hard-float, 64 bits
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
-	bool "CodeSoucery PowerPC 2010.09"
+	bool "CodeSoucery SH 2010.09"
 	depends on BR2_sh
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
@@ -98,7 +98,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	  the following variants:
             - SH4A, glibc, little endian
             - SH4A, glibc, big endian
-	    - SH4A, uClibc, little endian
+            - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM

From e5448c8e77688d846f5a56fd96c16f4d3ca5bf00 Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Wed, 9 Mar 2011 11:40:04 +0000
Subject: [PATCH 0153/6849] Add Renesas ttySC* devices

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/generic/device_table.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt
index 15132f9a84..38fe1e8e32 100644
--- a/target/generic/device_table.txt
+++ b/target/generic/device_table.txt
@@ -76,6 +76,7 @@
 /dev/ttyCPM	c	666	0	0	204	46	0	1	4
 /dev/ttyAMA	c	666	0	0	204	64	0	1	4
 /dev/ttySAC	c	666	0	0	204	64	0	1	4
+/dev/ttySC	c	666	0	0	204	8	0	1	6
 /dev/ttyPSC	c	666	0	0	204	148	0	1	4
 /dev/ttyUL	c	666	0	0	204	187	0	1	4
 /dev/ttymxc	c	666	0	0	207	16	0	1	3

From efae605c88deb15d9c50fd67bdd80f46a78b06c1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Apr 2011 11:56:48 -0300
Subject: [PATCH 0154/6849] libcap: bump to version 2.20

Bump libcap to version 2.20 and adjust style to match buildroot's
defacto standard.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...m.patch => libcap-2.20-build-system.patch} | 41 ++++++++-----------
 package/libcap/libcap.mk                      | 30 +++++++++-----
 2 files changed, 38 insertions(+), 33 deletions(-)
 rename package/libcap/{libcap-2.19-build-system.patch => libcap-2.20-build-system.patch} (57%)

diff --git a/package/libcap/libcap-2.19-build-system.patch b/package/libcap/libcap-2.20-build-system.patch
similarity index 57%
rename from package/libcap/libcap-2.19-build-system.patch
rename to package/libcap/libcap-2.20-build-system.patch
index f548726e76..397aff2a60 100644
--- a/package/libcap/libcap-2.19-build-system.patch
+++ b/package/libcap/libcap-2.20-build-system.patch
@@ -1,9 +1,14 @@
-diff -Nura libcap-2.19.orig/Make.Rules libcap-2.19/Make.Rules
---- libcap-2.19.orig/Make.Rules	2010-01-13 23:04:58.000000000 -0300
-+++ libcap-2.19/Make.Rules	2010-12-28 16:44:18.164052748 -0300
-@@ -45,25 +45,26 @@
+Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
+Also install the shared lib +x
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules
+--- libcap-2.20/Make.Rules	2011-01-19 02:06:44.000000000 -0300
++++ libcap-2.20-build/Make.Rules	2011-04-19 14:07:53.544903094 -0300
+@@ -47,25 +47,25 @@
  KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+ IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  
 -CC := gcc
 -CFLAGS := -O2
@@ -13,12 +18,12 @@ diff -Nura libcap-2.19.orig/Make.Rules libcap-2.19/Make.Rules
 -RANLIB := ranlib
 +CC ?= gcc
 +CFLAGS ?= -O2
-+CC_FOR_BUILD ?= $(CC)
-+CFLAGS_FOR_BUILD ?= $(CFLAGS)
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
 +AR ?= ar
 +RANLIB ?= ranlib
  DEBUG = -g #-DDEBUG
- WARNINGS=-fPIC -Wall -Wwrite-strings \
+ WARNINGS=-Wall -Wwrite-strings \
          -Wpointer-arith -Wcast-qual -Wcast-align \
          -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline -Wshadow
@@ -29,25 +34,15 @@ diff -Nura libcap-2.19.orig/Make.Rules libcap-2.19/Make.Rules
  SYSTEM_HEADERS = /usr/include
  INCS=$(topdir)/libcap/include/sys/capability.h
  LDFLAGS += -L$(topdir)/libcap
- CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
+ CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
 -PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
-+CFLAGS_FOR_BUILD += $(IPATH)
-+PAM_CAP := no
++PAM_CAP = no
  INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
  LIBATTR := yes
-diff -Nura libcap-2.19.orig/libcap/Makefile libcap-2.19/libcap/Makefile
---- libcap-2.19.orig/libcap/Makefile	2008-12-04 05:03:12.000000000 -0200
-+++ libcap-2.19/libcap/Makefile	2010-12-28 16:44:33.457052750 -0300
-@@ -33,7 +33,7 @@
- endif
- 
- _makenames: _makenames.c cap_names.list.h
--	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
- 
- cap_names.h: _makenames
- 	./_makenames > cap_names.h
+diff -Nura libcap-2.20/libcap/Makefile libcap-2.20-build/libcap/Makefile
+--- libcap-2.20/libcap/Makefile	2010-08-08 19:26:04.000000000 -0300
++++ libcap-2.20-build/libcap/Makefile	2011-04-19 14:08:29.377146094 -0300
 @@ -65,7 +65,7 @@
  	install -m 0644 include/sys/capability.h $(INCDIR)/sys
  	mkdir -p -m 0755 $(LIBDIR)
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index d4f8f17397..458f8e8115 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -1,27 +1,37 @@
-LIBCAP_VERSION=2.19
-LIBCAP_SOURCE=libcap-$(LIBCAP_VERSION).tar.bz2
-LIBCAP_SITE=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
-LIBCAP_INSTALL_STAGING=YES
+#############################################################
+#
+# libcap
+#
+#############################################################
+
+LIBCAP_VERSION = 2.20
+LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
+LIBCAP_DEPENDENCIES = host-libcap
+LIBCAP_INSTALL_STAGING = YES
 
 define LIBCAP_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		LIBATTR=no BUILD_CC="$(HOSTCC)" BUILD_CFLAGS="$(HOST_CFLAGS)"
 endef
 
 define LIBCAP_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) \
+		prefix=/usr lib=lib install
 endef
 
 define LIBCAP_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
- rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \
+		prefix=/usr lib=lib install
+	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps)
 endef
 
 define HOST_LIBCAP_BUILD_CMDS
- $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
 endef
 
 define HOST_LIBCAP_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) prefix=/usr lib=lib install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) \
+		prefix=/usr lib=lib install
 endef
 
 $(eval $(call GENTARGETS,package,libcap))

From 20c32937a7524f025d885e75c561daedbef7a01b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Apr 2011 11:56:49 -0300
Subject: [PATCH 0155/6849] readline: bump to version 6.2pl1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...k.patch => readline-6.2-curses-link.patch} |  0
 package/readline/readline-6.2-pl1.patch       | 29 +++++++++++++++++++
 package/readline/readline.mk                  |  3 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 rename package/readline/{readline-6.1-curses-link.patch => readline-6.2-curses-link.patch} (100%)
 create mode 100644 package/readline/readline-6.2-pl1.patch

diff --git a/package/readline/readline-6.1-curses-link.patch b/package/readline/readline-6.2-curses-link.patch
similarity index 100%
rename from package/readline/readline-6.1-curses-link.patch
rename to package/readline/readline-6.2-curses-link.patch
diff --git a/package/readline/readline-6.2-pl1.patch b/package/readline/readline-6.2-pl1.patch
new file mode 100644
index 0000000000..9ef0e48208
--- /dev/null
+++ b/package/readline/readline-6.2-pl1.patch
@@ -0,0 +1,29 @@
+Bug-Reported-by:	Clark J. Wang <dearvoid@gmail.com>
+Bug-Reference-ID:	<AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
+
+diff -Nura readline-6.2/callback.c readline-6.2-pl1/callback.c
+--- readline-6.2/callback.c	2010-06-06 13:18:58.000000000 -0300
++++ readline-6.2-pl1/callback.c	2011-04-19 14:20:00.269829168 -0300
+@@ -148,6 +148,9 @@
+ 	  eof = _rl_vi_domove_callback (_rl_vimvcxt);
+ 	  /* Should handle everything, including cleanup, numeric arguments,
+ 	     and turning off RL_STATE_VIMOTION */
++	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
++	   _rl_internal_char_cleanup ();
++
+ 	  return;
+ 	}
+ #endif
+diff -Nura readline-6.2/vi_mode.c readline-6.2-pl1/vi_mode.c
+--- readline-6.2/vi_mode.c	2010-11-20 21:51:39.000000000 -0300
++++ readline-6.2-pl1/vi_mode.c	2011-04-19 14:19:24.510586785 -0300
+@@ -1114,7 +1114,7 @@
+       rl_beg_of_line (1, c);
+       _rl_vi_last_motion = c;
+       RL_UNSETSTATE (RL_STATE_VIMOTION);
+-      return (0);
++      return (vidomove_dispatch (m));
+     }
+ #if defined (READLINE_CALLBACKS)
+   /* XXX - these need to handle rl_universal_argument bindings */
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 9e25e04a13..e34c6506d7 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -3,7 +3,8 @@
 # build GNU readline
 #
 #############################################################
-READLINE_VERSION = 6.1
+
+READLINE_VERSION = 6.2
 READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
 READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES

From 49b6be29b07a1ffce55dc1070c196dab1886bb25 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Apr 2011 11:56:50 -0300
Subject: [PATCH 0156/6849] usbutils: bump to version 002

Bump to version 002, no longer needs libusb-compat

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/Config.in   | 1 -
 package/usbutils/usbutils.mk | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index 0aabc4ab3b..fbd712b86d 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_USBUTILS
 	bool "usbutils"
 	depends on BR2_PROGRAM_INVOCATION
 	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
 	  USB enumeration utilities
 
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 46c889eff3..bd50a5f309 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-USBUTILS_VERSION = 0.91
+USBUTILS_VERSION = 002
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
-USBUTILS_DEPENDENCIES = host-pkg-config libusb-compat
+USBUTILS_DEPENDENCIES = host-pkg-config libusb
 
 ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
 	USBUTILS_DEPENDENCIES += zlib

From 4732f7aa822b70f4e5c4ba34f725a5968fb1e9a2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Apr 2011 16:01:52 -0300
Subject: [PATCH 0157/6849] u-boot 2011.03: fix mkimage build failure when
 u-boot isn't configured

When mkimage is built without the rest of u-boot (for kernel uImage
support), u-boot doesn't get configured for a specific board, so config.h
isn't created and the build breaks.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/u-boot/u-boot-2011.03-drop-configh.patch | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 boot/u-boot/u-boot-2011.03-drop-configh.patch

diff --git a/boot/u-boot/u-boot-2011.03-drop-configh.patch b/boot/u-boot/u-boot-2011.03-drop-configh.patch
new file mode 100644
index 0000000000..bf524c9a38
--- /dev/null
+++ b/boot/u-boot/u-boot-2011.03-drop-configh.patch
@@ -0,0 +1,27 @@
+"make tools-all" should allow building tools such as mkimage and the new
+imximage without any config, but imximage.c currently fails to build
+with:
+imximage.h:27:20: error: config.h: No such file or directory
+
+config.h is not needed in imximage.h nor in imximage.c, and imximage.h
+is only included from imximage.c, so drop this include to fix the build.
+
+Signed-off-by: Lo?c Minier <loic.minier@linaro.org>
+---
+ tools/imximage.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/tools/imximage.h b/tools/imximage.h
+index 38ca6be..d126a46 100644
+--- a/tools/imximage.h
++++ b/tools/imximage.h
+@@ -24,8 +24,6 @@
+ #ifndef _IMXIMAGE_H_
+ #define _IMXIMAGE_H_
+ 
+-#include <config.h>
+-
+ #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
+ #define MAX_HW_CFG_SIZE_V1 60  /* Max number of registers imx can set for v1 */
+ #define APP_CODE_BARKER	0xB1
+-- 1.7.2.3

From 10446c02475a96233f10a036cec7ab08b479839b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:23 -0300
Subject: [PATCH 0158/6849] toolchain: bump mpfr to version 3.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr-3.0.0-p8.patch | 1950 ------------------------------
 package/mpfr/mpfr.mk             |    2 +-
 2 files changed, 1 insertion(+), 1951 deletions(-)
 delete mode 100644 package/mpfr/mpfr-3.0.0-p8.patch

diff --git a/package/mpfr/mpfr-3.0.0-p8.patch b/package/mpfr/mpfr-3.0.0-p8.patch
deleted file mode 100644
index e521b2e90d..0000000000
--- a/package/mpfr/mpfr-3.0.0-p8.patch
+++ /dev/null
@@ -1,1950 +0,0 @@
-This is the cumulative patch available at http://www.mpfr.org/mpfr-3.0.0/
-It's recommended by upstream
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-06-23 11:02:49.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-06-23 11:03:36.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_out_str
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-06-23 11:03:20.000000000 +0000
-@@ -1 +1 @@
--3.0.0
-+3.0.0-p1
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-06-23 11:03:20.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0"
-+#define MPFR_VERSION_STRING "3.0.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/mpfr.texi mpfr-3.0.0-b/mpfr.texi
---- mpfr-3.0.0-a/mpfr.texi	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.texi	2010-06-23 11:03:12.000000000 +0000
-@@ -2050,7 +2050,7 @@
- are printed. If @var{base} is greater than 10, @samp{@@} will be used
- instead of @samp{e} as exponent delimiter.
- 
--Return the number of bytes written, or if an error occurred, return 0.
-+Return the number of characters written, or if an error occurred, return 0.
- @end deftypefun
- 
- @deftypefun size_t mpfr_inp_str (mpfr_t @var{rop}, FILE *@var{stream}, int @var{base}, mpfr_rnd_t @var{rnd})
-diff -Naurd mpfr-3.0.0-a/out_str.c mpfr-3.0.0-b/out_str.c
---- mpfr-3.0.0-a/out_str.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/out_str.c	2010-06-23 11:03:12.000000000 +0000
-@@ -22,6 +22,16 @@
- 
- #include "mpfr-impl.h"
- 
-+/* Warning! S should not contain "%". */
-+#define OUT_STR_RET(S)                          \
-+  do                                            \
-+    {                                           \
-+      int r;                                    \
-+      r = fprintf (stream, (S));                \
-+      return r < 0 ? 0 : r;                     \
-+    }                                           \
-+  while (0)
-+
- size_t
- mpfr_out_str (FILE *stream, int base, size_t n_digits, mpfr_srcptr op,
-               mpfr_rnd_t rnd_mode)
-@@ -29,6 +39,7 @@
-   char *s, *s0;
-   size_t l;
-   mpfr_exp_t e;
-+  int err;
- 
-   MPFR_ASSERTN (base >= 2 && base <= 62);
- 
-@@ -36,37 +47,16 @@
-   if (stream == NULL)
-     stream = stdout;
- 
--  if (MPFR_IS_NAN(op))
--    {
--      fprintf (stream, "@NaN@");
--      return 3;
--    }
--
--  if (MPFR_IS_INF(op))
--    {
--      if (MPFR_SIGN(op) > 0)
--        {
--          fprintf (stream, "@Inf@");
--          return 3;
--        }
--      else
--        {
--          fprintf (stream, "-@Inf@");
--          return 4;
--        }
--    }
--
--  if (MPFR_IS_ZERO(op))
-+  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (op)))
-     {
--      if (MPFR_SIGN(op) > 0)
--        {
--          fprintf(stream, "0");
--          return 1;
--        }
-+      if (MPFR_IS_NAN (op))
-+        OUT_STR_RET ("@NaN@");
-+      else if (MPFR_IS_INF (op))
-+        OUT_STR_RET (MPFR_IS_POS (op) ? "@Inf@" : "-@Inf@");
-       else
-         {
--          fprintf(stream, "-0");
--          return 2;
-+          MPFR_ASSERTD (MPFR_IS_ZERO (op));
-+          OUT_STR_RET (MPFR_IS_POS (op) ? "0" : "-0");
-         }
-     }
- 
-@@ -77,21 +67,31 @@
- 
-   l = strlen (s) + 1; /* size of allocated block returned by mpfr_get_str
-                          - may be incorrect, as only an upper bound? */
--  if (*s == '-')
--    fputc (*s++, stream);
- 
--  /* outputs mantissa */
--  fputc (*s++, stream); e--; /* leading digit */
--  fputc ((unsigned char) MPFR_DECIMAL_POINT, stream);
--  fputs (s, stream);         /* rest of mantissa */
-+  /* outputs possible sign and significand */
-+  err = (*s == '-' && fputc (*s++, stream) == EOF)
-+    || fputc (*s++, stream) == EOF  /* leading digit */
-+    || fputc ((unsigned char) MPFR_DECIMAL_POINT, stream) == EOF
-+    || fputs (s, stream) == EOF;     /* trailing significand */
-   (*__gmp_free_func) (s0, l);
-+  if (MPFR_UNLIKELY (err))
-+    return 0;
-+
-+  e--;  /* due to the leading digit */
- 
-   /* outputs exponent */
-   if (e)
-     {
-+      int r;
-+
-       MPFR_ASSERTN(e >= LONG_MIN);
-       MPFR_ASSERTN(e <= LONG_MAX);
--      l += fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
-+
-+      r = fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
-+      if (MPFR_UNLIKELY (r < 0))
-+        return 0;
-+
-+      l += r;
-     }
- 
-   return l;
-diff -Naurd mpfr-3.0.0-a/tests/tout_str.c mpfr-3.0.0-b/tests/tout_str.c
---- mpfr-3.0.0-a/tests/tout_str.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tout_str.c	2010-06-23 11:03:12.000000000 +0000
-@@ -46,22 +46,54 @@
- special (void)
- {
-   mpfr_t x;
-+  unsigned int n;
- 
-   mpfr_init (x);
- 
-   mpfr_set_nan (x);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 5)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, NaN, MPFR_RNDN) wrote %u "
-+              "characters instead of 5.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_inf (x, 1);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 5)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, +Inf, MPFR_RNDN) wrote %u "
-+               "characters instead of 5.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_inf (x, -1);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 6)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, -Inf, MPFR_RNDN) wrote %u "
-+               "characters instead of 6.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_ui (x, 0, MPFR_RNDN);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 1)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, +0, MPFR_RNDN) wrote %u "
-+               "characters instead of 1.\n", n);
-+      exit (1);
-+    }
-+
-   mpfr_neg (x, x, MPFR_RNDN);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 2)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, -0, MPFR_RNDN) wrote %u "
-+               "characters instead of 2.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_clear (x);
- }
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-06-23 11:03:20.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0";
-+  return "3.0.0-p1";
- }
-diff -Naurd mpfr-3.0.0-a/Makefile.in mpfr-3.0.0-b/Makefile.in
---- mpfr-3.0.0-a/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-+++ mpfr-3.0.0-b/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-@@ -239,6 +239,7 @@
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-06-23 11:03:36.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-06-25 13:23:13.000000000 +0000
-@@ -0,0 +1 @@
-+alloca
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-06-25 13:23:13.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p1
-+3.0.0-p2
-diff -Naurd mpfr-3.0.0-a/acinclude.m4 mpfr-3.0.0-b/acinclude.m4
---- mpfr-3.0.0-a/acinclude.m4	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/acinclude.m4	2010-06-10 11:00:14.000000000 +0000
-@@ -59,6 +59,9 @@
- dnl sys/fpu.h - MIPS specific
- AC_CHECK_HEADERS([sys/time.h sys/fpu.h])
- 
-+dnl Check how to get `alloca'
-+AC_FUNC_ALLOCA
-+
- dnl SIZE_MAX macro
- gl_SIZE_MAX
- 
-diff -Naurd mpfr-3.0.0-a/configure mpfr-3.0.0-b/configure
---- mpfr-3.0.0-a/configure	2010-06-10 11:00:51.000000000 +0000
-+++ mpfr-3.0.0-b/configure	2010-06-25 13:23:05.000000000 +0000
-@@ -783,6 +783,7 @@
- OBJDUMP
- DLLTOOL
- AS
-+ALLOCA
- MPFR_LIBM
- ANSI2KNR
- U
-@@ -5622,6 +5623,197 @@
- done
- 
- 
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments.  Useless!
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-+$as_echo_n "checking for working alloca.h... " >&6; }
-+if test "${ac_cv_working_alloca_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <alloca.h>
-+int
-+main ()
-+{
-+char *p = (char *) alloca (2 * sizeof (int));
-+			  if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_working_alloca_h=yes
-+else
-+  ac_cv_working_alloca_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-+$as_echo "$ac_cv_working_alloca_h" >&6; }
-+if test $ac_cv_working_alloca_h = yes; then
-+
-+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-+$as_echo_n "checking for alloca... " >&6; }
-+if test "${ac_cv_func_alloca_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+#  include <malloc.h>
-+#  define alloca _alloca
-+# else
-+#  ifdef HAVE_ALLOCA_H
-+#   include <alloca.h>
-+#  else
-+#   ifdef _AIX
-+ #pragma alloca
-+#   else
-+#    ifndef alloca /* predefined by HP cc +Olibcalls */
-+char *alloca ();
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+int
-+main ()
-+{
-+char *p = (char *) alloca (1);
-+				    if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_alloca_works=yes
-+else
-+  ac_cv_func_alloca_works=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-+$as_echo "$ac_cv_func_alloca_works" >&6; }
-+
-+if test $ac_cv_func_alloca_works = yes; then
-+
-+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-+
-+else
-+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-+# that cause trouble.  Some versions do not even contain alloca or
-+# contain a buggy version.  If you still want to use their alloca,
-+# use ar to extract alloca.o from them instead of compiling alloca.c.
-+
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-+
-+$as_echo "#define C_ALLOCA 1" >>confdefs.h
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-+if test "${ac_cv_os_cray+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#if defined CRAY && ! defined CRAY2
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "webecray" >/dev/null 2>&1; then :
-+  ac_cv_os_cray=yes
-+else
-+  ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-+$as_echo "$ac_cv_os_cray" >&6; }
-+if test $ac_cv_os_cray = yes; then
-+  for ac_func in _getb67 GETB67 getb67; do
-+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CRAY_STACKSEG_END $ac_func
-+_ACEOF
-+
-+    break
-+fi
-+
-+  done
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-+$as_echo_n "checking stack direction for C alloca... " >&6; }
-+if test "${ac_cv_c_stack_direction+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_c_stack_direction=0
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+find_stack_direction ()
-+{
-+  static char *addr = 0;
-+  auto char dummy;
-+  if (addr == 0)
-+    {
-+      addr = &dummy;
-+      return find_stack_direction ();
-+    }
-+  else
-+    return (&dummy > addr) ? 1 : -1;
-+}
-+
-+int
-+main ()
-+{
-+  return find_stack_direction () < 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_c_stack_direction=1
-+else
-+  ac_cv_c_stack_direction=-1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-+$as_echo "$ac_cv_c_stack_direction" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define STACK_DIRECTION $ac_cv_c_stack_direction
-+_ACEOF
-+
-+
-+fi
-+
-+
- 
-   for ac_header in stdint.h
- do :
-@@ -7564,13 +7756,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:7567: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:7759: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:7570: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:7762: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:7573: output\"" >&5)
-+  (eval echo "\"\$as_me:7765: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -8772,7 +8964,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 8775 "configure"' > conftest.$ac_ext
-+  echo '#line 8967 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -10032,11 +10224,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10035: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10227: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10039: \$? = $ac_status" >&5
-+   echo "$as_me:10231: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10371,11 +10563,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10374: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10566: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10378: \$? = $ac_status" >&5
-+   echo "$as_me:10570: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10476,11 +10668,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10479: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10483: \$? = $ac_status" >&5
-+   echo "$as_me:10675: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10531,11 +10723,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10534: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10726: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10538: \$? = $ac_status" >&5
-+   echo "$as_me:10730: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12915,7 +13107,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12918 "configure"
-+#line 13110 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13011,7 +13203,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13014 "configure"
-+#line 13206 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-06-25 13:23:13.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p1"
-+#define MPFR_VERSION_STRING "3.0.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/Makefile.in mpfr-3.0.0-b/tests/Makefile.in
---- mpfr-3.0.0-a/tests/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-+++ mpfr-3.0.0-b/tests/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-@@ -960,6 +960,7 @@
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-06-25 13:23:13.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p1";
-+  return "3.0.0-p2";
- }
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-07-10 00:11:19.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-07-10 00:12:50.000000000 +0000
-@@ -0,0 +1 @@
-+gamma_underflow
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-07-10 00:11:53.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p2
-+3.0.0-p3
-diff -Naurd mpfr-3.0.0-a/gamma.c mpfr-3.0.0-b/gamma.c
---- mpfr-3.0.0-a/gamma.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/gamma.c	2010-07-10 00:11:46.000000000 +0000
-@@ -274,7 +274,7 @@
-       /* we want an upper bound for x * [log(2-x)-1].
-          since x < 0, we need a lower bound on log(2-x) */
-       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
--      mpfr_log (xp, xp, MPFR_RNDD);
-+      mpfr_log2 (xp, xp, MPFR_RNDD);
-       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
-       mpfr_mul (xp, xp, x, MPFR_RNDU);
- 
-@@ -303,8 +303,8 @@
-         {
-           mpfr_sub (tmp, tmp, tmp2, MPFR_RNDZ); /* low bnd on |sin(Pi*(2-x))| */
-           mpfr_ui_div (tmp, 12, tmp, MPFR_RNDU); /* upper bound */
--          mpfr_log (tmp, tmp, MPFR_RNDU);
--          mpfr_add (tmp, tmp, xp, MPFR_RNDU);
-+          mpfr_log2 (tmp, tmp, MPFR_RNDU);
-+          mpfr_add (xp, tmp, xp, MPFR_RNDU);
-           underflow = mpfr_cmp_si (xp, expo.saved_emin - 2) <= 0;
-         }
- 
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-07-10 00:11:53.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p2"
-+#define MPFR_VERSION_STRING "3.0.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/tgamma.c mpfr-3.0.0-b/tests/tgamma.c
---- mpfr-3.0.0-a/tests/tgamma.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tgamma.c	2010-07-10 00:11:46.000000000 +0000
-@@ -461,6 +461,20 @@
-   mpfr_clear (x);
- }
- 
-+/* bug found by Stathis, only occurs on 32-bit machines */
-+static void
-+test20100709 (void)
-+{
-+  mpfr_t x;
-+  int inex;
-+
-+  mpfr_init2 (x, 100);
-+  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
-+  inex = mpfr_gamma (x, x, MPFR_RNDN);
-+  MPFR_ASSERTN(MPFR_IS_ZERO(x) && MPFR_IS_NEG(x) && inex > 0);
-+  mpfr_clear (x);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -471,6 +485,7 @@
-   test_generic (2, 100, 2);
-   gamma_integer ();
-   test20071231 ();
-+  test20100709 ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-07-10 00:11:53.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p2";
-+  return "3.0.0-p3";
- }
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-09-07 08:44:01.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-09-07 08:48:46.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_cmp/set_ui/si
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-07-10 00:11:53.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-09-07 08:46:06.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p3
-+3.0.0-p4
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-07-10 00:11:53.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-09-07 08:46:06.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p3"
-+#define MPFR_VERSION_STRING "3.0.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -798,35 +798,45 @@
-      anyway. Checking with other ICC versions is needed. Possibly detect
-      whether warnings are produced or not with a configure test.
-    + Remove C++ too, since it complains too much. */
-+/* Added casts to improve robustness in case of undefined behavior and
-+   compiler extensions based on UB (in particular -fwrapv). MPFR doesn't
-+   use such extensions, but these macros will be used by 3rd-party code,
-+   where such extensions may be required.
-+   Moreover casts to unsigned long have been added to avoid warnings in
-+   programs that use MPFR and are compiled with -Wconversion; such casts
-+   are OK since if X is a constant expression, then (unsigned long) X is
-+   also a constant expression, so that the optimizations still work. */
- #if defined (__GNUC__) && !defined(__ICC) && !defined(__cplusplus)
- #if (__GNUC__ >= 2)
- #undef mpfr_cmp_ui
--/* We use the fact that mpfr_sgn on NaN sets the erange flag and returns 0. */
--#define mpfr_cmp_ui(_f,_u)                 \
-- (__builtin_constant_p (_u) && (_u) == 0 ? \
--   mpfr_sgn (_f) :                         \
--   mpfr_cmp_ui_2exp ((_f),(_u),0))
-+/* We use the fact that mpfr_sgn on NaN sets the erange flag and returns 0.
-+   But warning! mpfr_sgn is specified as a macro in the API, thus the macro
-+   mustn't be used if side effects are possible, like here. */
-+#define mpfr_cmp_ui(_f,_u)                                      \
-+  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+   (mpfr_sgn) (_f) :                                            \
-+   mpfr_cmp_ui_2exp ((_f), (unsigned long) (_u), 0))
- #undef mpfr_cmp_si
--#define mpfr_cmp_si(_f,_s)                 \
-- (__builtin_constant_p (_s) && (_s) >= 0 ? \
--   mpfr_cmp_ui ((_f), (_s)) :              \
--   mpfr_cmp_si_2exp ((_f), (_s), 0))
-+#define mpfr_cmp_si(_f,_s)                              \
-+  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?      \
-+   mpfr_cmp_ui ((_f), (unsigned long) (long) (_s)) :    \
-+   mpfr_cmp_si_2exp ((_f), (long) (_s), 0))
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #undef mpfr_set_ui
--#define mpfr_set_ui(_f,_u,_r)              \
-- (__builtin_constant_p (_u) && (_u) == 0 ? \
--   __extension__ ({                        \
--     mpfr_ptr _p = (_f);                   \
--     _p->_mpfr_sign = 1;                   \
--     _p->_mpfr_exp = __MPFR_EXP_ZERO;      \
--     (void) (_r); 0; }) :                  \
--   mpfr_set_ui_2exp ((_f), (_u), 0, (_r)))
-+#define mpfr_set_ui(_f,_u,_r)                                   \
-+  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+   __extension__ ({                                             \
-+       mpfr_ptr _p = (_f);                                      \
-+       _p->_mpfr_sign = 1;                                      \
-+       _p->_mpfr_exp = __MPFR_EXP_ZERO;                         \
-+       (void) (_r); 0; }) :                                     \
-+   mpfr_set_ui_2exp ((_f), (unsigned long) (_u), 0, (_r)))
- #endif
- #undef mpfr_set_si
--#define mpfr_set_si(_f,_s,_r)              \
-- (__builtin_constant_p (_s) && (_s) >= 0 ? \
--   mpfr_set_ui ((_f), (_s), (_r)) :        \
--   mpfr_set_si_2exp ((_f), (_s), 0, (_r)))
-+#define mpfr_set_si(_f,_s,_r)                                   \
-+  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?              \
-+   mpfr_set_ui ((_f), (unsigned long) (long) (_s), (_r)) :      \
-+   mpfr_set_si_2exp ((_f), (long) (_s), 0, (_r)))
- #endif
- #endif
- 
-diff -Naurd mpfr-3.0.0-a/tests/tcmp_ui.c mpfr-3.0.0-b/tests/tcmp_ui.c
---- mpfr-3.0.0-a/tests/tcmp_ui.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tcmp_ui.c	2010-09-07 08:45:12.000000000 +0000
-@@ -88,6 +88,126 @@
-   mpfr_clear (x);
- }
- 
-+/* Since mpfr_cmp_ui and mpfr_cmp_si are also implemented by a macro
-+   with __builtin_constant_p for GCC, check that side effects are
-+   handled correctly. */
-+static void
-+check_macros (void)
-+{
-+  mpfr_t x;
-+  int c;
-+
-+  mpfr_init2 (x, 32);
-+
-+  c = 0;
-+  mpfr_set_ui (x, 17, MPFR_RNDN);
-+  if (mpfr_cmp_ui (x, 17) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_ui(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_ui (x, (c++, 17)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_ui(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 1)
-+    {
-+      printf ("Error 3 on mpfr_cmp_ui(x,17) in check_macros\n"
-+              "(c = %d instead of 1)\n", c);
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, 17) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_si(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, (c++, 17)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_si(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 2)
-+    {
-+      printf ("Error 3 on mpfr_cmp_si(x,17) in check_macros\n"
-+              "(c = %d instead of 2)\n", c);
-+      exit (1);
-+    }
-+
-+  c = 0;
-+  mpfr_set_ui (x, 0, MPFR_RNDN);
-+  if (mpfr_cmp_ui (x, 0) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_ui(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_ui (x, (c++, 0)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_ui(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 1)
-+    {
-+      printf ("Error 3 on mpfr_cmp_ui(x,0) in check_macros\n"
-+              "(c = %d instead of 1)\n", c);
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, 0) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_si(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, (c++, 0)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_si(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 2)
-+    {
-+      printf ("Error 3 on mpfr_cmp_si(x,0) in check_macros\n"
-+              "(c = %d instead of 2)\n", c);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+}
-+
-+/* Bug in r7114 */
-+static void
-+test_macros (void)
-+{
-+  mpfr_t x[3];
-+  mpfr_ptr p;
-+
-+  mpfr_inits (x[0], x[1], x[2], (mpfr_ptr) 0);
-+  mpfr_set_ui (x[0], 0, MPFR_RNDN);
-+  p = x[0];
-+  if (mpfr_cmp_ui (p++, 0) != 0)
-+    {
-+      printf ("Error in mpfr_cmp_ui macro: result should be 0.\n");
-+      exit (1);
-+    }
-+  if (p != x[1])
-+    {
-+      printf ("Error in mpfr_cmp_ui macro: p - x[0] = %d (expecting 1)\n",
-+              (int) (p - x[0]));
-+      exit (1);
-+    }
-+  p = x[0];
-+  if (mpfr_cmp_si (p++, 0) != 0)
-+    {
-+      printf ("Error in mpfr_cmp_si macro: result should be 0.\n");
-+      exit (1);
-+    }
-+  if (p != x[1])
-+    {
-+      printf ("Error in mpfr_cmp_si macro: p - x[0] = %d (expecting 1)\n",
-+              (int) (p - x[0]));
-+      exit (1);
-+    }
-+  mpfr_clears (x[0], x[1], x[2], (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -216,6 +336,8 @@
-   mpfr_clear (x);
- 
-   check_nan ();
-+  check_macros ();
-+  test_macros ();
- 
-   tests_end_mpfr ();
-   return 0;
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-07-10 00:11:53.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-09-07 08:46:06.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p3";
-+  return "3.0.0-p4";
- }
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-10-21 20:28:38.000000000 +0000
-@@ -0,0 +1 @@
-+tcan_round
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-09-07 08:46:06.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-10-21 20:28:38.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p4
-+3.0.0-p5
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-09-07 08:46:06.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-10-21 20:28:38.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p4"
-+#define MPFR_VERSION_STRING "3.0.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/tcan_round.c mpfr-3.0.0-b/tests/tcan_round.c
---- mpfr-3.0.0-a/tests/tcan_round.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tcan_round.c	2010-10-21 20:28:38.000000000 +0000
-@@ -41,7 +41,7 @@
-       /* avoid mpn_random which leaks memory */
-       for (i = 0; i < n; i++)
-         buf[i] = randlimb ();
--      p = (mpfr_prec_t) randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN;
-+      p = randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN;
-       err = p + randlimb () % GMP_NUMB_BITS;
-       r1 = mpfr_round_p (buf, n, err, p);
-       r2 = mpfr_can_round_raw (buf, n, MPFR_SIGN_POS, err,
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-09-07 08:46:06.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-10-21 20:28:38.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p4";
-+  return "3.0.0-p5";
- }
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-10-21 20:59:32.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_sub1
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-10-21 20:59:32.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p5
-+3.0.0-p6
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-10-21 20:59:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p5"
-+#define MPFR_VERSION_STRING "3.0.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/sub1.c mpfr-3.0.0-b/sub1.c
---- mpfr-3.0.0-a/sub1.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/sub1.c	2010-10-21 20:59:32.000000000 +0000
-@@ -37,7 +37,9 @@
-   mp_size_t cancel2, an, bn, cn, cn0;
-   mp_limb_t *ap, *bp, *cp;
-   mp_limb_t carry, bb, cc, borrow = 0;
--  int inexact, shift_b, shift_c, is_exact = 1, down = 0, add_exp = 0;
-+  int inexact, shift_b, shift_c, add_exp = 0;
-+  int cmp_low = 0; /* used for rounding to nearest: 0 if low(b) = low(c),
-+                      negative if low(b) < low(c), positive if low(b)>low(c) */
-   int sh, k;
-   MPFR_TMP_DECL(marker);
- 
-@@ -196,7 +198,8 @@
-     }
- 
- #ifdef DEBUG
--  printf ("shift_b=%d shift_c=%d diffexp=%lu\n", shift_b, shift_c,
-+  printf ("rnd=%s shift_b=%d shift_c=%d diffexp=%lu\n",
-+          mpfr_print_rnd_mode (rnd_mode), shift_b, shift_c,
-           (unsigned long) diff_exp);
- #endif
- 
-@@ -307,17 +310,18 @@
-     {
-       if (MPFR_LIKELY(sh))
-         {
--          is_exact = (carry == 0);
-           /* can decide except when carry = 2^(sh-1) [middle]
-              or carry = 0 [truncate, but cannot decide inexact flag] */
--          down = (carry < (MPFR_LIMB_ONE << (sh - 1)));
-           if (carry > (MPFR_LIMB_ONE << (sh - 1)))
-             goto add_one_ulp;
--          else if ((0 < carry) && down)
-+          else if ((0 < carry) && (carry < (MPFR_LIMB_ONE << (sh - 1))))
-             {
-               inexact = -1; /* result if smaller than exact value */
-               goto truncate;
-             }
-+          /* now carry = 2^(sh-1), in which case cmp_low=2,
-+             or carry = 0, in which case cmp_low=0 */
-+          cmp_low = (carry == 0) ? 0 : 2;
-         }
-     }
-   else /* directed rounding: set rnd_mode to RNDZ iff toward zero */
-@@ -344,12 +348,32 @@
-   cn -= (long int) an + cancel2;
- 
- #ifdef DEBUG
--  printf ("last %d bits from a are %lu, bn=%ld, cn=%ld\n",
-+  printf ("last sh=%d bits from a are %lu, bn=%ld, cn=%ld\n",
-           sh, (unsigned long) carry, (long) bn, (long) cn);
- #endif
- 
-+  /* for rounding to nearest, we couldn't conclude up to here in the following
-+     cases:
-+     1. sh = 0, then cmp_low=0: we can either truncate, subtract one ulp
-+        or add one ulp: -1 ulp < low(b)-low(c) < 1 ulp
-+     2. sh > 0 but the low sh bits from high(b)-high(c) equal 2^(sh-1):
-+        -0.5 ulp <= -1/2^sh < low(b)-low(c)-0.5 < 1/2^sh <= 0.5 ulp
-+        we can't decide the rounding, in that case cmp_low=2:
-+        either we truncate and flag=-1, or we add one ulp and flag=1
-+     3. the low sh>0 bits from high(b)-high(c) equal 0: we know we have to
-+        truncate but we can't decide the ternary value, here cmp_low=0:
-+        -0.5 ulp <= -1/2^sh < low(b)-low(c) < 1/2^sh <= 0.5 ulp
-+        we always truncate and inexact can be any of -1,0,1
-+  */
-+
-+  /* note: here cn might exceed cn0, in which case we consider a zero limb */
-   for (k = 0; (bn > 0) || (cn > 0); k = 1)
-     {
-+      /* if cmp_low < 0, we know low(b) - low(c) < 0
-+         if cmp_low > 0, we know low(b) - low(c) > 0
-+            (more precisely if cmp_low = 2, low(b) - low(c) = 0.5 ulp so far)
-+         if cmp_low = 0, so far low(b) - low(c) = 0 */
-+
-       /* get next limbs */
-       bb = (bn > 0) ? bp[--bn] : 0;
-       if ((cn > 0) && (cn-- <= cn0))
-@@ -357,76 +381,115 @@
-       else
-         cc = 0;
- 
--      /* down is set when low(b) < low(c) */
--      if (down == 0)
--        down = (bb < cc);
-+      /* cmp_low compares low(b) and low(c) */
-+      if (cmp_low == 0) /* case 1 or 3 */
-+        cmp_low = (bb < cc) ? -2+k : (bb > cc) ? 1 : 0;
-+
-+      /* Case 1 for k=0 splits into 7 subcases:
-+         1a: bb > cc + half
-+         1b: bb = cc + half
-+         1c: 0 < bb - cc < half
-+         1d: bb = cc
-+         1e: -half < bb - cc < 0
-+         1f: bb - cc = -half
-+         1g: bb - cc < -half
-+
-+         Case 2 splits into 3 subcases:
-+         2a: bb > cc
-+         2b: bb = cc
-+         2c: bb < cc
-+
-+         Case 3 splits into 3 subcases:
-+         3a: bb > cc
-+         3b: bb = cc
-+         3c: bb < cc
-+      */
- 
-       /* the case rounding to nearest with sh=0 is special since one couldn't
-          subtract above 1/2 ulp in the trailing limb of the result */
--      if ((rnd_mode == MPFR_RNDN) && sh == 0 && k == 0)
-+      if (rnd_mode == MPFR_RNDN && sh == 0 && k == 0) /* case 1 for k=0 */
-         {
-           mp_limb_t half = MPFR_LIMB_HIGHBIT;
- 
--          is_exact = (bb == cc);
--
-           /* add one ulp if bb > cc + half
-              truncate if cc - half < bb < cc + half
-              sub one ulp if bb < cc - half
-           */
- 
--          if (down)
-+          if (cmp_low < 0) /* bb < cc: -1 ulp < low(b) - low(c) < 0,
-+                              cases 1e, 1f and 1g */
-             {
-               if (cc >= half)
-                 cc -= half;
--              else
-+              else /* since bb < cc < half, bb+half < 2*half */
-                 bb += half;
-+              /* now we have bb < cc + half:
-+                 we have to subtract one ulp if bb < cc,
-+                 and truncate if bb > cc */
-             }
--          else /* bb >= cc */
-+          else if (cmp_low >= 0) /* bb >= cc, cases 1a to 1d */
-             {
-               if (cc < half)
-                 cc += half;
--              else
-+              else /* since bb >= cc >= half, bb - half >= 0 */
-                 bb -= half;
-+              /* now we have bb > cc - half: we have to add one ulp if bb > cc,
-+                 and truncate if bb < cc */
-+              if (cmp_low > 0)
-+                cmp_low = 2;
-             }
-         }
- 
- #ifdef DEBUG
--      printf ("    bb=%lu cc=%lu down=%d is_exact=%d\n",
--              (unsigned long) bb, (unsigned long) cc, down, is_exact);
-+      printf ("k=%u bb=%lu cc=%lu cmp_low=%d\n", k,
-+              (unsigned long) bb, (unsigned long) cc, cmp_low);
- #endif
--      if (bb < cc)
-+      if (cmp_low < 0) /* low(b) - low(c) < 0: either truncate or subtract
-+                          one ulp */
-         {
-           if (rnd_mode == MPFR_RNDZ)
--            goto sub_one_ulp;
-+            goto sub_one_ulp; /* set inexact=-1 */
-           else if (rnd_mode != MPFR_RNDN) /* round away */
-             {
-               inexact = 1;
-               goto truncate;
-             }
--          else /* round to nearest: special case here since for sh=k=0
--                  bb = bb0 - MPFR_LIMB_HIGHBIT */
-+          else /* round to nearest */
-             {
--              if (is_exact && sh == 0)
--                {
--                  /* For k=0 we can't decide exactness since it may depend
--                     from low order bits.
--                     For k=1, the first low limbs matched: low(b)-low(c)<0. */
--                  if (k)
--                    {
--                      inexact = 1;
--                      goto truncate;
--                    }
--                }
--              else if (down && sh == 0)
--                goto sub_one_ulp;
--              else
--                {
--                  inexact = (is_exact) ? 1 : -1;
-+              /* If cmp_low < 0 and bb > cc, then -0.5 ulp < low(b)-low(c) < 0,
-+                 whatever the value of sh.
-+                 If sh>0, then cmp_low < 0 implies that the initial neglected
-+                 sh bits were 0 (otherwise cmp_low=2 initially), thus the
-+                 weight of the new bits is less than 0.5 ulp too.
-+                 If k > 0 (and sh=0) this means that either the first neglected
-+                 limbs bb and cc were equal (thus cmp_low was 0 for k=0),
-+                 or we had bb - cc = -0.5 ulp or 0.5 ulp.
-+                 The last case is not possible here since we would have
-+                 cmp_low > 0 which is sticky.
-+                 In the first case (where we have cmp_low = -1), we truncate,
-+                 whereas in the 2nd case we have cmp_low = -2 and we subtract
-+                 one ulp.
-+              */
-+              if (bb > cc || sh > 0 || cmp_low == -1)
-+                {  /* -0.5 ulp < low(b)-low(c) < 0,
-+                      bb > cc corresponds to cases 1e and 1f1
-+                      sh > 0 corresponds to cases 3c and 3b3
-+                      cmp_low = -1 corresponds to case 1d3 (also 3b3) */
-+                  inexact = 1;
-                   goto truncate;
-                 }
-+              else if (bb < cc) /* here sh = 0 and low(b)-low(c) < -0.5 ulp,
-+                                   this corresponds to cases 1g and 1f3 */
-+                goto sub_one_ulp;
-+              /* the only case where we can't conclude is sh=0 and bb=cc,
-+                 i.e., we have low(b) - low(c) = -0.5 ulp (up to now), thus
-+                 we don't know if we must truncate or subtract one ulp.
-+                 Note: for sh=0 we can't have low(b) - low(c) = -0.5 ulp up to
-+                 now, since low(b) - low(c) > 1/2^sh */
-             }
-         }
--      else if (bb > cc)
-+      else if (cmp_low > 0) /* 0 < low(b) - low(c): either truncate or
-+                               add one ulp */
-         {
-           if (rnd_mode == MPFR_RNDZ)
-             {
-@@ -437,34 +500,70 @@
-             goto add_one_ulp;
-           else /* round to nearest */
-             {
--              if (is_exact)
-+              if (bb > cc)
-                 {
--                  inexact = -1;
--                  goto truncate;
-+                  /* if sh=0, then bb>cc means that low(b)-low(c) > 0.5 ulp,
-+                     and similarly when cmp_low=2 */
-+                  if (cmp_low == 2) /* cases 1a, 1b1, 2a and 2b1 */
-+                    goto add_one_ulp;
-+                  /* sh > 0 and cmp_low > 0: this implies that the sh initial
-+                     neglected bits were 0, and the remaining low(b)-low(c)>0,
-+                     but its weight is less than 0.5 ulp */
-+                  else /* 0 < low(b) - low(c) < 0.5 ulp, this corresponds to
-+                          cases 3a, 1d1 and 3b1 */
-+                    {
-+                      inexact = -1;
-+                      goto truncate;
-+                    }
-                 }
--              else if (down)
-+              else if (bb < cc) /* 0 < low(b) - low(c) < 0.5 ulp, cases 1c,
-+                                   1b3, 2b3 and 2c */
-                 {
--                  inexact = 1;
-+                  inexact = -1;
-                   goto truncate;
-                 }
--              else
--                goto add_one_ulp;
-+              /* the only case where we can't conclude is bb=cc, i.e.,
-+                 low(b) - low(c) = 0.5 ulp (up to now), thus we don't know
-+                 if we must truncate or add one ulp. */
-             }
-         }
-+      /* after k=0, we cannot conclude in the following cases, we split them
-+         according to the values of bb and cc for k=1:
-+         1b. sh=0 and cmp_low = 1 and bb-cc = half [around 0.5 ulp]
-+             1b1. bb > cc: add one ulp, inex = 1
-+             1b2: bb = cc: cannot conclude
-+             1b3: bb < cc: truncate, inex = -1
-+         1d. sh=0 and cmp_low = 0 and bb-cc = 0 [around 0]
-+             1d1: bb > cc: truncate, inex = -1
-+             1d2: bb = cc: cannot conclude
-+             1d3: bb < cc: truncate, inex = +1
-+         1f. sh=0 and cmp_low = -1 and bb-cc = -half [around -0.5 ulp]
-+             1f1: bb > cc: truncate, inex = +1
-+             1f2: bb = cc: cannot conclude
-+             1f3: bb < cc: sub one ulp, inex = -1
-+         2b. sh > 0 and cmp_low = 2 and bb=cc [around 0.5 ulp]
-+             2b1. bb > cc: add one ulp, inex = 1
-+             2b2: bb = cc: cannot conclude
-+             2b3: bb < cc: truncate, inex = -1
-+         3b. sh > 0 and cmp_low = 0 [around 0]
-+             3b1. bb > cc: truncate, inex = -1
-+             3b2: bb = cc: cannot conclude
-+             3b3: bb < cc: truncate, inex = +1
-+      */
-     }
- 
--  if ((rnd_mode == MPFR_RNDN) && !is_exact)
-+  if ((rnd_mode == MPFR_RNDN) && cmp_low != 0)
-     {
-       /* even rounding rule */
-       if ((ap[0] >> sh) & 1)
-         {
--          if (down)
-+          if (cmp_low < 0)
-             goto sub_one_ulp;
-           else
-             goto add_one_ulp;
-         }
-       else
--        inexact = (down) ? 1 : -1;
-+        inexact = (cmp_low > 0) ? -1 : 1;
-     }
-   else
-     inexact = 0;
-diff -Naurd mpfr-3.0.0-a/tests/tfma.c mpfr-3.0.0-b/tests/tfma.c
---- mpfr-3.0.0-a/tests/tfma.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tfma.c	2010-10-21 20:59:32.000000000 +0000
-@@ -337,6 +337,94 @@
-   mpfr_clears (x, y, z, r, (mpfr_ptr) 0);
- }
- 
-+static void
-+bug20101018 (void)
-+{
-+  mpfr_t x, y, z, t, u;
-+  int i;
-+
-+  mpfr_init2 (x, 64);
-+  mpfr_init2 (y, 64);
-+  mpfr_init2 (z, 64);
-+  mpfr_init2 (t, 64);
-+  mpfr_init2 (u, 64);
-+
-+  mpfr_set_str (x, "0xf.fffffffffffffffp-14766", 16, MPFR_RNDN);
-+  mpfr_set_str (y, "-0xf.fffffffffffffffp+317", 16, MPFR_RNDN);
-+  mpfr_set_str (z, "0x8.3ffffffffffe3ffp-14443", 16, MPFR_RNDN);
-+  mpfr_set_str (t, "0x8.7ffffffffffc7ffp-14444", 16, MPFR_RNDN);
-+  i = mpfr_fma (u, x, y, z, MPFR_RNDN);
-+  if (mpfr_cmp (u, t) != 0)
-+    {
-+      printf ("Wrong result in bug20101018 (a)\n");
-+      printf ("Expected ");
-+      mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN);
-+      printf ("\nGot      ");
-+      mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+  if (i <= 0)
-+    {
-+      printf ("Wrong ternary value in bug20101018 (a)\n");
-+      printf ("Expected > 0\n");
-+      printf ("Got      %d\n", i);
-+      exit (1);
-+    }
-+
-+  mpfr_set_str (x, "-0xf.fffffffffffffffp-11420", 16, MPFR_RNDN);
-+  mpfr_set_str (y, "0xf.fffffffffffffffp+9863", 16, MPFR_RNDN);
-+  mpfr_set_str (z, "0x8.fffff80ffffffffp-1551", 16, MPFR_RNDN);
-+  mpfr_set_str (t, "0x9.fffff01ffffffffp-1552", 16, MPFR_RNDN);
-+  i = mpfr_fma (u, x, y, z, MPFR_RNDN);
-+  if (mpfr_cmp (u, t) != 0)
-+    {
-+      printf ("Wrong result in bug20101018 (b)\n");
-+      printf ("Expected ");
-+      mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN);
-+      printf ("\nGot      ");
-+      mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+  if (i <= 0)
-+    {
-+      printf ("Wrong ternary value in bug20101018 (b)\n");
-+      printf ("Expected > 0\n");
-+      printf ("Got      %d\n", i);
-+      exit (1);
-+    }
-+
-+  mpfr_set_str (x, "0xf.fffffffffffffffp-2125", 16, MPFR_RNDN);
-+  mpfr_set_str (y, "-0xf.fffffffffffffffp-6000", 16, MPFR_RNDN);
-+  mpfr_set_str (z, "0x8p-8119", 16, MPFR_RNDN);
-+  mpfr_set_str (t, "0x8.000000000000001p-8120", 16, MPFR_RNDN);
-+  i = mpfr_fma (u, x, y, z, MPFR_RNDN);
-+  if (mpfr_cmp (u, t) != 0)
-+    {
-+      printf ("Wrong result in bug20101018 (c)\n");
-+      printf ("Expected ");
-+      mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN);
-+      printf ("\nGot      ");
-+      mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+  if (i <= 0)
-+    {
-+      printf ("Wrong ternary value in bug20101018 (c)\n");
-+      printf ("Expected > 0\n");
-+      printf ("Got      %d\n", i);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+  mpfr_clear (z);
-+  mpfr_clear (t);
-+  mpfr_clear (u);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -345,6 +433,8 @@
- 
-   tests_start_mpfr ();
- 
-+  bug20101018 ();
-+
-   mpfr_init (x);
-   mpfr_init (s);
-   mpfr_init (y);
-diff -Naurd mpfr-3.0.0-a/tests/tsub.c mpfr-3.0.0-b/tests/tsub.c
---- mpfr-3.0.0-a/tests/tsub.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tsub.c	2010-10-21 20:59:32.000000000 +0000
-@@ -201,6 +201,8 @@
-   if (mpfr_cmp (z, x))
-     {
-       printf ("Error in mpfr_sub (2)\n");
-+      printf ("Expected "); mpfr_print_binary (x); puts ("");
-+      printf ("Got      "); mpfr_print_binary (z); puts ("");
-       exit (1);
-     }
-   mpfr_set_str_binary (x, "1.1110111011110001110111011111111111101000011001011100101100101101");
-@@ -478,6 +480,156 @@
-   mpfr_clear (u);
- }
- 
-+/* Bug found by Jakub Jelinek
-+ * http://bugzilla.redhat.com/643657
-+ * https://gforge.inria.fr/tracker/index.php?func=detail&aid=11301
-+ * The consequence can be either an assertion failure (i = 2 in the
-+ * testcase below, in debug mode) or an incorrectly rounded value.
-+ */
-+static void
-+bug20101017 (void)
-+{
-+  mpfr_t a, b, c;
-+  int inex;
-+  int i;
-+
-+  mpfr_init2 (a, GMP_NUMB_BITS * 2);
-+  mpfr_init2 (b, GMP_NUMB_BITS);
-+  mpfr_init2 (c, GMP_NUMB_BITS);
-+
-+  /* a = 2^(2N) + k.2^(2N-1) + 2^N and b = 1
-+     with N = GMP_NUMB_BITS and k = 0 or 1.
-+     c = a - b should round to the same value as a. */
-+
-+  for (i = 2; i <= 3; i++)
-+    {
-+      mpfr_set_ui_2exp (a, i, GMP_NUMB_BITS - 1, MPFR_RNDN);
-+      mpfr_add_ui (a, a, 1, MPFR_RNDN);
-+      mpfr_mul_2ui (a, a, GMP_NUMB_BITS, MPFR_RNDN);
-+      mpfr_set_ui (b, 1, MPFR_RNDN);
-+      inex = mpfr_sub (c, a, b, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (! mpfr_equal_p (c, b))
-+        {
-+          printf ("Error in bug20101017 for i = %d.\n", i);
-+          printf ("Expected ");
-+          mpfr_out_str (stdout, 16, 0, b, MPFR_RNDN);
-+          putchar ('\n');
-+          printf ("Got      ");
-+          mpfr_out_str (stdout, 16, 0, c, MPFR_RNDN);
-+          putchar ('\n');
-+          exit (1);
-+        }
-+      if (inex >= 0)
-+        {
-+          printf ("Error in bug20101017 for i = %d: bad inex value.\n", i);
-+          printf ("Expected negative, got %d.\n", inex);
-+          exit (1);
-+        }
-+    }
-+
-+  mpfr_set_prec (a, 64);
-+  mpfr_set_prec (b, 129);
-+  mpfr_set_prec (c, 2);
-+  mpfr_set_str_binary (b, "0.100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001E65");
-+  mpfr_set_str_binary (c, "0.10E1");
-+  inex = mpfr_sub (a, b, c, MPFR_RNDN);
-+  if (mpfr_cmp_ui_2exp (a, 1, 64) != 0 || inex >= 0)
-+    {
-+      printf ("Error in mpfr_sub for b-c for b=2^64+1+2^(-64), c=1\n");
-+      printf ("Expected result 2^64 with inex < 0\n");
-+      printf ("Got "); mpfr_print_binary (a);
-+      printf (" with inex=%d\n", inex);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+}
-+
-+/* hard test of rounding */
-+static void
-+check_rounding (void)
-+{
-+  mpfr_t a, b, c, res;
-+  mpfr_prec_t p;
-+  long k, l;
-+  int i;
-+
-+#define MAXKL (2 * GMP_NUMB_BITS)
-+  for (p = MPFR_PREC_MIN; p <= GMP_NUMB_BITS; p++)
-+    {
-+      mpfr_init2 (a, p);
-+      mpfr_init2 (res, p);
-+      mpfr_init2 (b, p + 1 + MAXKL);
-+      mpfr_init2 (c, MPFR_PREC_MIN);
-+
-+      /* b = 2^p + 1 + 2^(-k), c = 2^(-l) */
-+      for (k = 0; k <= MAXKL; k++)
-+        for (l = 0; l <= MAXKL; l++)
-+          {
-+            mpfr_set_ui_2exp (b, 1, p, MPFR_RNDN);
-+            mpfr_add_ui (b, b, 1, MPFR_RNDN);
-+            mpfr_mul_2ui (b, b, k, MPFR_RNDN);
-+            mpfr_add_ui (b, b, 1, MPFR_RNDN);
-+            mpfr_div_2ui (b, b, k, MPFR_RNDN);
-+            mpfr_set_ui_2exp (c, 1, -l, MPFR_RNDN);
-+            i = mpfr_sub (a, b, c, MPFR_RNDN);
-+            /* b - c = 2^p + 1 + 2^(-k) - 2^(-l), should be rounded to
-+               2^p for l <= k, and 2^p+2 for l < k */
-+            if (l <= k)
-+              {
-+                if (mpfr_cmp_ui_2exp (a, 1, p) != 0)
-+                  {
-+                    printf ("Wrong result in check_rounding\n");
-+                    printf ("p=%lu k=%ld l=%ld\n", p, k, l);
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("Expected 2^%lu\n", p);
-+                    printf ("Got      "); mpfr_print_binary (a); puts ("");
-+                    exit (1);
-+                  }
-+                if (i >= 0)
-+                  {
-+                    printf ("Wrong ternary value in check_rounding\n");
-+                    printf ("p=%lu k=%ld l=%ld\n", p, k, l);
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("a="); mpfr_print_binary (a); puts ("");
-+                    printf ("Expected < 0, got %d\n", i);
-+                    exit (1);
-+                  }
-+              }
-+            else /* l < k */
-+              {
-+                mpfr_set_ui_2exp (res, 1, p, MPFR_RNDN);
-+                mpfr_add_ui (res, res, 2, MPFR_RNDN);
-+                if (mpfr_cmp (a, res) != 0)
-+                  {
-+                    printf ("Wrong result in check_rounding\n");
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("Expected "); mpfr_print_binary (res); puts ("");
-+                    printf ("Got      "); mpfr_print_binary (a); puts ("");
-+                    exit (1);
-+                  }
-+                if (i <= 0)
-+                  {
-+                    printf ("Wrong ternary value in check_rounding\n");
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("Expected > 0, got %d\n", i);
-+                    exit (1);
-+                  }
-+              }
-+          }
-+
-+      mpfr_clear (a);
-+      mpfr_clear (res);
-+      mpfr_clear (b);
-+      mpfr_clear (c);
-+    }
-+}
-+
- #define TEST_FUNCTION test_sub
- #define TWO_ARGS
- #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
-@@ -491,6 +643,8 @@
- 
-   tests_start_mpfr ();
- 
-+  bug20101017 ();
-+  check_rounding ();
-   check_diverse ();
-   check_inexact ();
-   bug_ddefour ();
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-10-21 20:59:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p5";
-+  return "3.0.0-p6";
- }
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-10-21 21:18:26.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_set_ld
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-10-21 21:18:26.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p6
-+3.0.0-p7
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-10-21 21:18:26.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p6"
-+#define MPFR_VERSION_STRING "3.0.0-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/set_ld.c mpfr-3.0.0-b/set_ld.c
---- mpfr-3.0.0-a/set_ld.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/set_ld.c	2010-10-21 21:18:26.000000000 +0000
-@@ -102,21 +102,25 @@
-             {
-               x /= div13; /* exact */
-               shift_exp += 8192;
-+              mpfr_div_2si (t, t, 8192, MPFR_RNDZ);
-             }
-           if (ABS (x) >= div12)
-             {
-               x /= div12; /* exact */
-               shift_exp += 4096;
-+              mpfr_div_2si (t, t, 4096, MPFR_RNDZ);
-             }
-           if (ABS (x) >= div11)
-             {
-               x /= div11; /* exact */
-               shift_exp += 2048;
-+              mpfr_div_2si (t, t, 2048, MPFR_RNDZ);
-             }
-           if (ABS (x) >= div10)
-             {
-               x /= div10; /* exact */
-               shift_exp += 1024;
-+              mpfr_div_2si (t, t, 1024, MPFR_RNDZ);
-             }
-           /* warning: we may have DBL_MAX=2^1024*(1-2^(-53)) < x < 2^1024,
-              therefore we have one extra exponent reduction step */
-@@ -124,9 +128,10 @@
-             {
-               x /= div9; /* exact */
-               shift_exp += 512;
-+              mpfr_div_2si (t, t, 512, MPFR_RNDZ);
-             }
-         } /* Check overflow of double */
--      else
-+      else /* no overflow on double */
-         {
-           long double div9, div10, div11;
- 
-@@ -149,29 +154,34 @@
-                 {
-                   x /= div13; /* exact */
-                   shift_exp -= 8192;
-+                  mpfr_mul_2si (t, t, 8192, MPFR_RNDZ);
-                 }
-               if (ABS (x) <= div12)
-                 {
-                   x /= div12; /* exact */
-                   shift_exp -= 4096;
-+                  mpfr_mul_2si (t, t, 4096, MPFR_RNDZ);
-                 }
-               if (ABS (x) <= div11)
-                 {
-                   x /= div11; /* exact */
-                   shift_exp -= 2048;
-+                  mpfr_mul_2si (t, t, 2048, MPFR_RNDZ);
-                 }
-               if (ABS (x) <= div10)
-                 {
-                   x /= div10; /* exact */
-                   shift_exp -= 1024;
-+                  mpfr_mul_2si (t, t, 1024, MPFR_RNDZ);
-                 }
-               if (ABS(x) <= div9)
-                 {
-                   x /= div9;  /* exact */
-                   shift_exp -= 512;
-+                  mpfr_mul_2si (t, t, 512, MPFR_RNDZ);
-                 }
-             }
--          else
-+          else /* no underflow */
-             {
-               inexact = mpfr_set_d (u, (double) x, MPFR_RNDZ);
-               MPFR_ASSERTD (inexact == 0);
-diff -Naurd mpfr-3.0.0-a/tests/tset_ld.c mpfr-3.0.0-b/tests/tset_ld.c
---- mpfr-3.0.0-a/tests/tset_ld.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tset_ld.c	2010-10-21 21:18:26.000000000 +0000
-@@ -147,12 +147,39 @@
- test_fixed_bugs (void)
- {
-   mpfr_t x;
--  long double d;
-+  long double l, m;
- 
-   /* bug found by Steve Kargl (2009-03-14) */
-   mpfr_init2 (x, 64);
-   mpfr_set_ui_2exp (x, 1, -16447, MPFR_RNDN);
--  d = mpfr_get_ld (x, MPFR_RNDN);  /* an assertion failed in init2.c:50 */
-+  mpfr_get_ld (x, MPFR_RNDN);  /* an assertion failed in init2.c:50 */
-+
-+  /* bug reported by Jakub Jelinek (2010-10-17)
-+     https://gforge.inria.fr/tracker/?func=detail&aid=11300 */
-+  mpfr_set_prec (x, MPFR_LDBL_MANT_DIG);
-+  /* l = 0x1.23456789abcdef0123456789abcdp-914L; */
-+  l = 8.215640181713713164092636634579e-276;
-+  mpfr_set_ld (x, l, MPFR_RNDN);
-+  m = mpfr_get_ld (x, MPFR_RNDN);
-+  if (m != l)
-+    {
-+      printf ("Error in get_ld o set_ld for l=%Le\n", l);
-+      printf ("Got m=%Le instead of l\n", m);
-+      exit (1);
-+    }
-+
-+  /* another similar test which failed with extended double precision and the
-+     generic code for mpfr_set_ld */
-+  /* l = 0x1.23456789abcdef0123456789abcdp-968L; */
-+  l = 4.560596445887084662336528403703e-292;
-+  mpfr_set_ld (x, l, MPFR_RNDN);
-+  m = mpfr_get_ld (x, MPFR_RNDN);
-+  if (m != l)
-+    {
-+      printf ("Error in get_ld o set_ld for l=%Le\n", l);
-+      printf ("Got m=%Le instead of l\n", m);
-+      exit (1);
-+    }
- 
-   mpfr_clear (x);
- }
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-10-21 21:18:26.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p6";
-+  return "3.0.0-p7";
- }
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-11-09 15:15:07.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-11-09 15:15:07.000000000 +0000
-@@ -0,0 +1 @@
-+macros
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-11-09 15:15:07.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p7
-+3.0.0-p8
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-11-09 15:15:07.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p7"
-+#define MPFR_VERSION_STRING "3.0.0-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -67,6 +67,16 @@
- # define _MPFR_H_HAVE_INTMAX_T 1
- #endif
- 
-+/* Avoid some problems with macro expansion if the user defines macros
-+   with the same name as keywords. By convention, identifiers and macro
-+   names starting with mpfr_ are reserved by MPFR. */
-+typedef void            mpfr_void;
-+typedef int             mpfr_int;
-+typedef unsigned int    mpfr_uint;
-+typedef long            mpfr_long;
-+typedef unsigned long   mpfr_ulong;
-+typedef size_t          mpfr_size_t;
-+
- /* Definition of rounding modes (DON'T USE MPFR_RNDNA!).
-    Warning! Changing the contents of this enum should be seen as an
-    interface change since the old and the new types are not compatible
-@@ -136,7 +146,7 @@
- typedef mp_exp_t     mpfr_exp_t;
- 
- /* Definition of the standard exponent limits */
--#define MPFR_EMAX_DEFAULT ((mpfr_exp_t) (((unsigned long) 1 << 30) - 1))
-+#define MPFR_EMAX_DEFAULT ((mpfr_exp_t) (((mpfr_ulong) 1 << 30) - 1))
- #define MPFR_EMIN_DEFAULT (-(MPFR_EMAX_DEFAULT))
- 
- /* Definition of the main structure */
-@@ -725,13 +735,13 @@
-    unexpected results with future compilers and aggressive optimisations.
-    Why not working only with signed types, using INT_MIN and LONG_MIN? */
- #if __GMP_MP_SIZE_T_INT
--#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+2))
--#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+1))
--#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+3))
-+#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+2))
-+#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+1))
-+#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+3))
- #else
--#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+2))
--#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+1))
--#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+3))
-+#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+2))
-+#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+1))
-+#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+3))
- #endif
- 
- /* Define MPFR_USE_EXTENSION to avoid "gcc -pedantic" warnings. */
-@@ -760,9 +770,9 @@
- #define mpfr_inf_p(_x)      ((_x)->_mpfr_exp == __MPFR_EXP_INF)
- #define mpfr_zero_p(_x)     ((_x)->_mpfr_exp == __MPFR_EXP_ZERO)
- #define mpfr_regular_p(_x)  ((_x)->_mpfr_exp >  __MPFR_EXP_INF)
--#define mpfr_sgn(_x)                                          \
--  ((_x)->_mpfr_exp < __MPFR_EXP_INF ?                         \
--   (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (void) 0), 0 : \
-+#define mpfr_sgn(_x)                                               \
-+  ((_x)->_mpfr_exp < __MPFR_EXP_INF ?                              \
-+   (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \
-    MPFR_SIGN (_x))
- 
- /* Prevent them from using as lvalues */
-@@ -805,7 +815,19 @@
-    Moreover casts to unsigned long have been added to avoid warnings in
-    programs that use MPFR and are compiled with -Wconversion; such casts
-    are OK since if X is a constant expression, then (unsigned long) X is
--   also a constant expression, so that the optimizations still work. */
-+   also a constant expression, so that the optimizations still work. The
-+   warnings are probably related to the following two bugs:
-+     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=4210
-+     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38470 (possibly a variant)
-+   and the casts could be removed once these bugs are fixed.
-+   Casts shouldn't be used on the generic calls (to the ..._2exp functions),
-+   where implicit conversions are performed. Indeed, having at least one
-+   implicit conversion in the macro allows the compiler to emit diagnostics
-+   when normally expected, for instance in the following call:
-+     mpfr_set_ui (x, "foo", MPFR_RNDN);
-+   If this is not possible (for future macros), one of the tricks described
-+   on http://groups.google.com/group/comp.std.c/msg/e92abd24bf9eaf7b could
-+   be used. */
- #if defined (__GNUC__) && !defined(__ICC) && !defined(__cplusplus)
- #if (__GNUC__ >= 2)
- #undef mpfr_cmp_ui
-@@ -813,45 +835,45 @@
-    But warning! mpfr_sgn is specified as a macro in the API, thus the macro
-    mustn't be used if side effects are possible, like here. */
- #define mpfr_cmp_ui(_f,_u)                                      \
--  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+  (__builtin_constant_p (_u) && (mpfr_ulong) (_u) == 0 ?        \
-    (mpfr_sgn) (_f) :                                            \
--   mpfr_cmp_ui_2exp ((_f), (unsigned long) (_u), 0))
-+   mpfr_cmp_ui_2exp ((_f), (_u), 0))
- #undef mpfr_cmp_si
--#define mpfr_cmp_si(_f,_s)                              \
--  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?      \
--   mpfr_cmp_ui ((_f), (unsigned long) (long) (_s)) :    \
--   mpfr_cmp_si_2exp ((_f), (long) (_s), 0))
-+#define mpfr_cmp_si(_f,_s)                                      \
-+  (__builtin_constant_p (_s) && (mpfr_long) (_s) >= 0 ?         \
-+   mpfr_cmp_ui ((_f), (mpfr_ulong) (mpfr_long) (_s)) :          \
-+   mpfr_cmp_si_2exp ((_f), (_s), 0))
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #undef mpfr_set_ui
- #define mpfr_set_ui(_f,_u,_r)                                   \
--  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+  (__builtin_constant_p (_u) && (mpfr_ulong) (_u) == 0 ?        \
-    __extension__ ({                                             \
-        mpfr_ptr _p = (_f);                                      \
-        _p->_mpfr_sign = 1;                                      \
-        _p->_mpfr_exp = __MPFR_EXP_ZERO;                         \
--       (void) (_r); 0; }) :                                     \
--   mpfr_set_ui_2exp ((_f), (unsigned long) (_u), 0, (_r)))
-+       (mpfr_void) (_r); 0; }) :                                \
-+   mpfr_set_ui_2exp ((_f), (_u), 0, (_r)))
- #endif
- #undef mpfr_set_si
- #define mpfr_set_si(_f,_s,_r)                                   \
--  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?              \
--   mpfr_set_ui ((_f), (unsigned long) (long) (_s), (_r)) :      \
--   mpfr_set_si_2exp ((_f), (long) (_s), 0, (_r)))
-+  (__builtin_constant_p (_s) && (mpfr_long) (_s) >= 0 ?         \
-+   mpfr_set_ui ((_f), (mpfr_ulong) (mpfr_long) (_s), (_r)) :    \
-+   mpfr_set_si_2exp ((_f), (_s), 0, (_r)))
- #endif
- #endif
- 
- /* Macro version of mpfr_stack interface for fast access */
--#define mpfr_custom_get_size(p) ((size_t)                            \
-+#define mpfr_custom_get_size(p) ((mpfr_size_t)                          \
-        (((p)+GMP_NUMB_BITS-1)/GMP_NUMB_BITS*sizeof (mp_limb_t)))
- #define mpfr_custom_init(m,p) do {} while (0)
--#define mpfr_custom_get_significand(x) ((void*)((x)->_mpfr_d))
-+#define mpfr_custom_get_significand(x) ((mpfr_void*)((x)->_mpfr_d))
- #define mpfr_custom_get_exp(x) ((x)->_mpfr_exp)
- #define mpfr_custom_move(x,m) do { ((x)->_mpfr_d = (mp_limb_t*)(m)); } while (0)
- #define mpfr_custom_init_set(x,k,e,p,m) do {                   \
-   mpfr_ptr _x = (x);                                           \
-   mpfr_exp_t _e;                                               \
-   mpfr_kind_t _t;                                              \
--  int _s, _k;                                                  \
-+  mpfr_int _s, _k;                                             \
-   _k = (k);                                                    \
-   if (_k >= 0)  {                                              \
-     _t = (mpfr_kind_t) _k;                                     \
-@@ -868,11 +890,13 @@
-   _x->_mpfr_exp  = _e;                                         \
-   _x->_mpfr_d    = (mp_limb_t*) (m);                           \
-  } while (0)
--#define mpfr_custom_get_kind(x)                                              \
--  ( (x)->_mpfr_exp >  __MPFR_EXP_INF ? (int)MPFR_REGULAR_KIND*MPFR_SIGN (x) \
--  : (x)->_mpfr_exp == __MPFR_EXP_INF ? (int)MPFR_INF_KIND*MPFR_SIGN (x)     \
--  : (x)->_mpfr_exp == __MPFR_EXP_NAN ? (int)MPFR_NAN_KIND                   \
--  : (int) MPFR_ZERO_KIND * MPFR_SIGN (x) )
-+#define mpfr_custom_get_kind(x)                                         \
-+  ( (x)->_mpfr_exp >  __MPFR_EXP_INF ?                                  \
-+    (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (x)                        \
-+  : (x)->_mpfr_exp == __MPFR_EXP_INF ?                                  \
-+    (mpfr_int) MPFR_INF_KIND * MPFR_SIGN (x)                            \
-+  : (x)->_mpfr_exp == __MPFR_EXP_NAN ? (mpfr_int) MPFR_NAN_KIND         \
-+  : (mpfr_int) MPFR_ZERO_KIND * MPFR_SIGN (x) )
- 
- 
- #endif /* MPFR_USE_NO_MACRO */
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-11-09 15:15:07.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p7";
-+  return "3.0.0-p8";
- }
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 15ee48ad57..0aeecbe9be 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPFR_VERSION = 3.0.0
+MPFR_VERSION = 3.0.1
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
 MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_INSTALL_STAGING = YES

From 2fed71e3de9ebca27afe5efa55a6dc308156983b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:24 -0300
Subject: [PATCH 0159/6849] toolchain: bump mpc to version 0.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpc/mpc-0.9-configure.patch | 69 +++++++++++++++++++++++++++++
 package/mpc/mpc.mk                  |  4 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 package/mpc/mpc-0.9-configure.patch

diff --git a/package/mpc/mpc-0.9-configure.patch b/package/mpc/mpc-0.9-configure.patch
new file mode 100644
index 0000000000..21dd242eae
--- /dev/null
+++ b/package/mpc/mpc-0.9-configure.patch
@@ -0,0 +1,69 @@
+
+Issue http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html
+Upstream patch https://gforge.inria.fr/scm/viewvc.php/trunk/configure.ac?root=mpc&r1=932&r2=936
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- trunk/configure.ac	2011/02/21 12:18:31	932
++++ trunk/configure.ac	2011/02/21 16:41:09	936
+@@ -33,7 +33,7 @@
+ AC_CANONICAL_HOST
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-dnl Extra arguments to configure
++# Extra arguments to configure
+ AC_ARG_WITH([mpfr_include],
+             [AC_HELP_STRING([--with-mpfr-include=DIR],
+                             [MPFR include directory])],
+@@ -85,18 +85,19 @@
+              )
+ 
+ 
+-dnl Setup CC and CFLAGS
++# Setup CC and CFLAGS
++AC_PROG_CC
++AC_LANG(C)
+ 
+-dnl Check for user specification of CC or CFLAGS
++# Set up LibTool
++AC_PROG_LIBTOOL
++
++# Check for user specification of CC or CFLAGS
+ if test -n "$CFLAGS" || test -n "$CC" ; then
+    user_redefine_cc=yes
+ fi
+ 
+-# Check for programs
+-AC_PROG_CC
+-AC_LANG(C)
+-
+-dnl Check GMP Header
++# Check GMP Header
+ AC_MSG_CHECKING(for gmp.h)
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include "gmp.h"
+@@ -105,22 +106,19 @@
+  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
+ ])
+ 
+-dnl Check for GMP CFLAGS in gmp.h
++# Check for GMP CFLAGS in gmp.h
+ if test -z "$user_redefine_cc" ; then
+    MPC_GMP_CC_CFLAGS
+ fi
+ 
+ 
+-dnl Configs for Windows DLLs
++# Configs for Windows DLLs
+ case $host in
+   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      MPC_WINDOWS
+ esac
+ 
+ 
+-dnl Finally set up LibTool
+-AC_PROG_LIBTOOL
+-
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 8c6d4861ce..b344f2862f 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-MPC_VERSION = 0.8.2
+MPC_VERSION = 0.9
 MPC_SITE = http://www.multiprecision.org/mpc/download
 MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
+MPC_AUTORECONF = YES
+HOST_MPC_AUTORECONF = YES
 HOST_MPC_DEPENDENCIES = host-gmp host-mpfr
 
 $(eval $(call AUTOTARGETS,package,mpc))

From 86afa1ed6ea6b921c357cd7b551dde2c0d5bed53 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:25 -0300
Subject: [PATCH 0160/6849] toolchain: update uClibc snapshot config to avoid
 build stalls

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-snapshot.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index 9c83d68140..aa00680033 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -28,6 +28,7 @@
 # TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
+# TARGET_c6x is not set
 
 # CONFIG_GENERIC_ARM is not set
 # CONFIG_ARM610 is not set
@@ -109,6 +110,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set

From 99c1547124d7f410a3e3db66aa5816e53a96c156 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:26 -0300
Subject: [PATCH 0161/6849] toolchain: add SOCK_CLOEXEC and SOCK_NONBLOCK
 support to uclibc 0.9.31

Add SOCK_CLOEXEC and SOCK_NONBLOCK support to uclibc 0.9.31.
Required for modern versions of udev.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uClibc-0.9.31-add-sock-cloexec.patch      | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch b/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch
new file mode 100644
index 0000000000..a7089a98ac
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch
@@ -0,0 +1,43 @@
+From 83333e9c873e4eca6b2c945f7770b1f5373b0427 Mon Sep 17 00:00:00 2001
+From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Date: Tue, 1 Jun 2010 20:02:39 +0400
+Subject: [PATCH] bits/socket.h: add SOCK_CLOEXEC and SOCK_NONBLOCK support
+
+This patch adds support for SOCK_CLOEXEC and SOCK_NONBLOCK socket
+descriptor flags, which are introduced since Linux 2.6.27
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/socket.h |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
+index ac5a433..11f6e97 100644
+--- a/libc/sysdeps/linux/common/bits/socket.h
++++ b/libc/sysdeps/linux/common/bits/socket.h
+@@ -53,10 +53,20 @@ enum __socket_type
+   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
+ 				   datagrams of fixed maximum length.  */
+ #define SOCK_SEQPACKET SOCK_SEQPACKET
+-  SOCK_PACKET = 10		/* Linux specific way of getting packets
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
+ 				   at the dev level.  For writing rarp and
+ 				   other similar things on the user level. */
+ #define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair and
++     used for the flags parameter of paccept.  */
++
++  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 04000		/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
+ };
+ 
+ /* Protocol families.  */
+-- 
+1.7.3.4
+

From 4cf6ec229fe2876f058779f56ae735fe55125a03 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:27 -0300
Subject: [PATCH 0162/6849] toolchain: add inotify_init1 syscall support to
 uclibc 0.9.31

Add inotify_init1 system call support to uclibc 0.9.31.
Required for modern versions of udev.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uClibc-0.9.31-add-inotify-init1.patch     | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch b/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch
new file mode 100644
index 0000000000..cbec426238
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch
@@ -0,0 +1,64 @@
+From a2e5630af426f85fdd8721b2820786d9bd2aa695 Mon Sep 17 00:00:00 2001
+From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Date: Tue, 1 Jun 2010 20:02:54 +0400
+Subject: [PATCH] inotify: add inotify_init1 system call support
+
+This patch introduces support for inotify_init1 system call, found
+since Linux 2.6.27.
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/inotify.c     |    4 ++++
+ libc/sysdeps/linux/common/sys/inotify.h |   13 +++++++++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c
+index e5a6120..e35f043 100644
+--- a/libc/sysdeps/linux/common/inotify.c
++++ b/libc/sysdeps/linux/common/inotify.c
+@@ -15,6 +15,10 @@
+ _syscall0(int, inotify_init)
+ #endif
+ 
++#ifdef __NR_inotify_init1
++_syscall1(int, inotify_init1, int, flags)
++#endif
++
+ #ifdef __NR_inotify_add_watch
+ _syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask)
+ #endif
+diff --git a/libc/sysdeps/linux/common/sys/inotify.h b/libc/sysdeps/linux/common/sys/inotify.h
+index 0131db9..dc4e19d 100644
+--- a/libc/sysdeps/linux/common/sys/inotify.h
++++ b/libc/sysdeps/linux/common/sys/inotify.h
+@@ -22,6 +22,16 @@
+ #include <stdint.h>
+ 
+ 
++/* Flags for the parameter of inotify_init1.  */
++enum
++  {
++    IN_CLOEXEC = 02000000,
++#define IN_CLOEXEC IN_CLOEXEC
++    IN_NONBLOCK = 04000
++#define IN_NONBLOCK IN_NONBLOCK
++  };
++
++
+ /* Structure describing an inotify event.  */
+ struct inotify_event
+ {
+@@ -79,6 +89,9 @@ __BEGIN_DECLS
+ /* Create and initialize inotify instance.  */
+ extern int inotify_init (void) __THROW;
+ 
++/* Create and initialize inotify instance.  */
++extern int inotify_init1 (int __flags) __THROW;
++
+ /* Add watch of object NAME to inotify instance FD.  Notify about
+    events specified by MASK.  */
+ extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
+-- 
+1.7.3.4
+

From 4612aeec57ee5356a535727cf578e072649447ba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:22 -0300
Subject: [PATCH 0163/6849] toolchain: reorganize target gcc options

* Move target gcc language selections to the package menu.
* Disable objc & fortran options unless target gcc is selected.
* Rename the "native toolchain" option to gcc.
* Disable target gcc unless we're using a buildroot toolchain.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in   | 12 ------------
 toolchain/gcc/Config.in.2 | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cf3687815b..7fce640c25 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -62,18 +62,6 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	help
 	  Any additional gcc configure options you may want to include....
 
-config BR2_GCC_CROSS_OBJC
-	bool "Objective-C cross-compiler support"
-	depends on !BR2_avr32
-	help
-	  Build an Objective-C cross-compiler
-
-config BR2_GCC_CROSS_FORTRAN
-	bool "Fortran cross-compiler support"
-	depends on !BR2_avr32
-	help
-	  Build a Fortran cross-compiler
-
 config BR2_GCC_CROSS_JAVA
        bool
 
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index 705506b689..886e99b2b3 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GCC_TARGET
-	bool "native toolchain in the target filesystem"
-	depends on BR2_HAVE_DEVFILES
+	bool "gcc"
+	depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
 	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_BINUTILS_TARGET
 	select BR2_PACKAGE_MPC if BR2_GCC_VERSION_4_5_X
@@ -10,6 +10,18 @@ config BR2_PACKAGE_GCC_TARGET
 	  If you want the target system to be able to run
 	  binutils/gcc and compile native code, say Y here.
 
+config BR2_GCC_CROSS_FORTRAN
+	bool "fortran support"
+	depends on !BR2_avr32 && BR2_PACKAGE_GCC_TARGET
+	help
+	  Build a Fortran compiler
+
+config BR2_GCC_CROSS_OBJC
+	bool "objective-c support"
+	depends on !BR2_avr32 && BR2_PACKAGE_GCC_TARGET
+	help
+	  Build an Objective-C compiler
+
 config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
 	string "Additional target gcc options"
 	default ""
@@ -19,5 +31,5 @@ config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
 	  Including, but not limited to --disable-checking etc.
 	  Refer to */configure in your gcc sources.
 
-comment "native toolchain needs development files in target filesystem"
-	depends on !BR2_HAVE_DEVFILES
+comment "gcc needs development files in target filesystem"
+	depends on !BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT

From 243e4edc748b26f9a713bc268e5b7a6ff7d15956 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:28 -0300
Subject: [PATCH 0164/6849] toolchain: make target gcc a working option

Make target gcc a more usable option.

* Nuke duplicate libgcc_s*.so* in /usr/lib since it confuses target gcc
* Copy *crt*.o files to the target system to unbreak gcc

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 96bebd616c..04b21e9f11 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -550,12 +550,17 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
 		cp -f $(HOST_DIR)/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h \
 			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/; \
 	fi
+
 	# Make sure we have 'cc'.
 	if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \
 		ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \
 	fi
+
+	# Copy C runtime initialization object files
+	cp -f $(STAGING_DIR)/usr/lib/*crt*.o $(TARGET_DIR)/usr/lib
+
 	# These are in /lib, so...
-	#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
+	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
 	touch -c $@
 
 gcc_target: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc

From f8fe67e12ebe3429ac5bb9b8e0be6d2e30cc1449 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Apr 2011 13:29:29 -0300
Subject: [PATCH 0165/6849] toolchain: add gcc 4.6.0

Add gcc 4.6.0 to the toolchain repertoire:

Target gcc is known to be broken in some scenarios.

This version is considered experimental so things may break.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.6.0/100-uclibc-conf.patch     |  33 +++++
 .../gcc/4.6.0/301-missing-execinfo_h.patch    |  11 ++
 toolchain/gcc/4.6.0/302-c99-snprintf.patch    |  13 ++
 .../4.6.0/305-libmudflap-susv3-legacy.patch   |  49 +++++++
 .../gcc/4.6.0/810-arm-softfloat-libgcc.patch  |  38 ++++++
 .../gcc/4.6.0/820-arm-unbreak-armv4t.patch    |  14 ++
 ...werpc-link-with-math-lib.patch.conditional | 125 ++++++++++++++++++
 toolchain/gcc/Config.in                       |   5 +
 toolchain/gcc/Config.in.2                     |   2 +-
 toolchain/gcc/gcc-uclibc-4.x.mk               |  23 +++-
 10 files changed, 310 insertions(+), 3 deletions(-)
 create mode 100644 toolchain/gcc/4.6.0/100-uclibc-conf.patch
 create mode 100644 toolchain/gcc/4.6.0/301-missing-execinfo_h.patch
 create mode 100644 toolchain/gcc/4.6.0/302-c99-snprintf.patch
 create mode 100644 toolchain/gcc/4.6.0/305-libmudflap-susv3-legacy.patch
 create mode 100644 toolchain/gcc/4.6.0/810-arm-softfloat-libgcc.patch
 create mode 100644 toolchain/gcc/4.6.0/820-arm-unbreak-armv4t.patch
 create mode 100644 toolchain/gcc/4.6.0/powerpc-link-with-math-lib.patch.conditional

diff --git a/toolchain/gcc/4.6.0/100-uclibc-conf.patch b/toolchain/gcc/4.6.0/100-uclibc-conf.patch
new file mode 100644
index 0000000000..cca8c82292
--- /dev/null
+++ b/toolchain/gcc/4.6.0/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
++++ gcc/contrib/regression/objs-gcc.sh
+@@ -105,6 +105,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- gcc/libjava/classpath/ltconfig
++++ gcc/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1251,7 +1251,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/toolchain/gcc/4.6.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.6.0/301-missing-execinfo_h.patch
new file mode 100644
index 0000000000..0e2092f3fb
--- /dev/null
+++ b/toolchain/gcc/4.6.0/301-missing-execinfo_h.patch
@@ -0,0 +1,11 @@
+--- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
++++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
+@@ -500,7 +500,7 @@
+ #ifdef __linux__
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/toolchain/gcc/4.6.0/302-c99-snprintf.patch b/toolchain/gcc/4.6.0/302-c99-snprintf.patch
new file mode 100644
index 0000000000..ba51a0e1d4
--- /dev/null
+++ b/toolchain/gcc/4.6.0/302-c99-snprintf.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.3.0/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- gcc-4.3.0/libstdc++-v3/include/c_global/cstdio	(revision 129202)
++++ gcc-4.3.0/libstdc++-v3/include/c_global/cstdio	(working copy)
+@@ -144,7 +144,7 @@
+ 
+ _GLIBCXX_END_NAMESPACE
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/toolchain/gcc/4.6.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.6.0/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 0000000000..374b1f8659
--- /dev/null
+++ b/toolchain/gcc/4.6.0/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,49 @@
+Index: gcc-4.2/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)
++++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)
+@@ -427,7 +427,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -437,7 +437,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -447,7 +447,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -456,7 +456,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -465,7 +465,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/toolchain/gcc/4.6.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.6.0/810-arm-softfloat-libgcc.patch
new file mode 100644
index 0000000000..e6a30a3f00
--- /dev/null
+++ b/toolchain/gcc/4.6.0/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,38 @@
+[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ gcc/config/arm/t-linux     |    6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+Index: gcc-4.4.0/gcc/config/arm/t-linux
+===================================================================
+--- gcc-4.4.0.orig/gcc/config/arm/t-linux
++++ gcc-4.4.0/gcc/config/arm/t-linux
+@@ -4,7 +4,11 @@
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
+Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
+===================================================================
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
diff --git a/toolchain/gcc/4.6.0/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.6.0/820-arm-unbreak-armv4t.patch
new file mode 100644
index 0000000000..8651afcd86
--- /dev/null
+++ b/toolchain/gcc/4.6.0/820-arm-unbreak-armv4t.patch
@@ -0,0 +1,14 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+diff -Nura gcc-4.5.1.orig/gcc/config/arm/linux-eabi.h gcc-4.5.1/gcc/config/arm/linux-eabi.h
+--- gcc-4.5.1.orig/gcc/config/arm/linux-eabi.h	2009-10-30 17:03:09.000000000 -0300
++++ gcc-4.5.1/gcc/config/arm/linux-eabi.h	2010-11-02 15:38:25.792208500 -0300
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/toolchain/gcc/4.6.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.6.0/powerpc-link-with-math-lib.patch.conditional
new file mode 100644
index 0000000000..7e75e87f23
--- /dev/null
+++ b/toolchain/gcc/4.6.0/powerpc-link-with-math-lib.patch.conditional
@@ -0,0 +1,125 @@
+http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
+
+On glibc the libc.so carries a copy of the math function copysignl() but
+on uClibc math functions like copysignl() live in libm. Since libgcc_s
+contains unresolved symbols, any attempt to link against libgcc_s
+without explicitely specifying -lm fails, resulting in a broken
+bootstrap of the compiler.
+
+Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.5.1/gcc/config/t-slibgcc-elf-ver
+--- gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:08.644904042 -0300
++++ gcc-4.5.1/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:56.332904024 -0300
+@@ -27,7 +27,7 @@
+ SHLIB_OBJS = @shlib_objs@
+ SHLIB_DIR = @multilib_dir@
+ SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
+-SHLIB_LC = -lc
++SHLIB_LC = @libgcc_libm@ -lc
+ SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
+ 	$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+diff -Nura gcc-4.5.1.orig/libgcc/Makefile.in gcc-4.5.1/libgcc/Makefile.in
+--- gcc-4.5.1.orig/libgcc/Makefile.in	2010-11-03 14:32:44.272904042 -0300
++++ gcc-4.5.1/libgcc/Makefile.in	2010-11-03 14:37:03.893904042 -0300
+@@ -39,6 +39,7 @@
+ decimal_float = @decimal_float@
+ enable_decimal_float = @enable_decimal_float@
+ fixed_point = @fixed_point@
++LIBGCC_LIBM = @LIBGCC_LIBM@
+ 
+ host_noncanonical = @host_noncanonical@
+ 
+@@ -798,9 +799,10 @@
+ 		@multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_objs@,$(objects),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
++		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
+ 		@shlib_map_file@,$(mapfile),$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
+-		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
++		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
+ 
+ libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
+ 	# @multilib_flags@ is still needed because this may use
+diff -Nura gcc-4.5.1.orig/libgcc/configure gcc-4.5.1/libgcc/configure
+--- gcc-4.5.1.orig/libgcc/configure	2010-11-03 14:32:44.283904042 -0300
++++ gcc-4.5.1/libgcc/configure	2010-11-03 14:39:48.685904042 -0300
+@@ -557,6 +557,7 @@
+ extra_parts
+ tmake_file
+ set_use_emutls
++LIBGCC_LIBM
+ set_have_cc_tls
+ vis_hide
+ fixed_point
+@@ -3847,6 +3848,37 @@
+   set_use_emutls="-DUSE_EMUTLS"
+ fi
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++echo "$as_me:$LINENO: checking for library containing copysignl" >&5
++echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
++if test "${libgcc_cv_copysignl_lib+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++
++fi
++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
+ 
+ # Conditionalize the makefile for this target machine.
+ tmake_file_=
+diff -Nura gcc-4.5.1.orig/libgcc/configure.ac gcc-4.5.1/libgcc/configure.ac
+--- gcc-4.5.1.orig/libgcc/configure.ac	2010-11-03 14:32:44.735904042 -0300
++++ gcc-4.5.1/libgcc/configure.ac	2010-11-03 14:42:11.278904045 -0300
+@@ -238,6 +238,27 @@
+ fi
+ AC_SUBST(set_have_cc_tls)
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++AC_CACHE_CHECK
++  libgcc_cv_copysignl_lib,
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++  ])
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
++AC_SUBST(LIBGCC_LIBM)
++
+ # See if we have emulated thread-local storage.
+ GCC_CHECK_EMUTLS
+ set_use_emutls=
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7fce640c25..31f715070e 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -30,6 +30,10 @@ choice
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.5.x"
 
+	config BR2_GCC_VERSION_4_6_X
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		bool "gcc 4.6.x"
+
 	config BR2_GCC_VERSION_SNAP
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc snapshot"
@@ -54,6 +58,7 @@ config BR2_GCC_VERSION
 	default "4.3.5"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.2"     if BR2_GCC_VERSION_4_5_X
+	default "4.6.0"     if BR2_GCC_VERSION_4_6_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index 886e99b2b3..7a49068a75 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GCC_TARGET
 	depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
 	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_BINUTILS_TARGET
-	select BR2_PACKAGE_MPC if BR2_GCC_VERSION_4_5_X
+	select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X)
 	select BR2_PACKAGE_MPFR
 	select BR2_PACKAGE_GMP
 	help
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 04b21e9f11..ebcca53522 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -53,6 +53,11 @@ else
 GCC_OPTSPACE=--enable-target-optspace
 endif
 
+# gcc 4.6.x quadmath requires wchar
+ifneq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
+GCC_QUADMATH=--disable-libquadmath
+endif
+
 #############################################################
 #
 # Setup some initial stuff
@@ -107,24 +112,33 @@ ifeq ($(BR2_INSTALL_FORTRAN),y)
 GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran
 endif
 
+# GCC 4.x prerequisites
 GCC_WITH_HOST_GMP = --with-gmp=$(HOST_DIR)/usr
 GCC_WITH_HOST_MPFR = --with-mpfr=$(HOST_DIR)/usr
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 HOST_SOURCE += host-gmp-source host-mpfr-source
 endif
 GCC_HOST_PREREQ = host-gmp host-mpfr
+GCC_TARGET_PREREQ += mpfr gmp
 
+# GCC 4.5.x prerequisites
 ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
 GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
+GCC_TARGET_PREREQ += mpc
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 HOST_SOURCE += host-mpc-source
 endif
 GCC_HOST_PREREQ += host-mpc
 endif
 
-GCC_TARGET_PREREQ += mpfr gmp
-ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
+# GCC 4.6.x prerequisites
+ifeq ($(findstring x4.6.,x$(GCC_VERSION)),x4.6.)
+GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
 GCC_TARGET_PREREQ += mpc
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+HOST_SOURCE += host-mpc-source
+endif
+GCC_HOST_PREREQ += host-mpc
 endif
 
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
@@ -219,6 +233,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
+		$(GCC_QUADMATH) \
 		--with-gnu-ld \
 		--disable-shared \
 		--disable-libssp \
@@ -285,6 +300,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
+		$(GCC_QUADMATH) \
 		--with-gnu-ld \
 		--enable-shared \
 		--disable-libssp \
@@ -362,6 +378,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		$(BR2_CONFIGURE_BUILD_TOOLS) \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
+		$(GCC_QUADMATH) \
 		--with-gnu-ld \
 		--disable-libssp \
 		--disable-multilib \
@@ -504,6 +521,8 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		--enable-languages=$(GCC_TARGET_LANGUAGES) \
 		--with-gxx-include-dir=/usr/include/c++ \
 		--disable-__cxa_atexit \
+		$(GCC_OPTSPACE) \
+		$(GCC_QUADMATH) \
 		--with-gnu-ld \
 		--disable-libssp \
 		--disable-multilib \

From 66fec73cb6a7cdcf029f45b6af3ed57be62574a9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 14:16:53 -0300
Subject: [PATCH 0166/6849] toolchain: bump 2.6.38 kernel headers to 2.6.38.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 68151d051d..e3f6b4618f 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -46,6 +46,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.35.12"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.3"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.38.4"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 63690434d9ba897ff213c255c9f97585df586482 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 14:16:54 -0300
Subject: [PATCH 0167/6849] linux: bump 2.6.38 kernel to 2.6.38.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index d6bb790e4d..3b0fa62518 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_38
 
 config BR2_LINUX_KERNEL_2_6_38
-	bool "2.6.38.3"
+	bool "2.6.38.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.38.3"
+	default "2.6.38.4"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.38.3" if BR2_LINUX_KERNEL_2_6_38
+	default "2.6.38.4" if BR2_LINUX_KERNEL_2_6_38
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 8cce9414f3ba57e729d3d77249134e5dfe2d8914 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 14:16:55 -0300
Subject: [PATCH 0168/6849] qemu/arm-versatile: use 2.6.38.4 kernel to match
 headers

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 6b3d9547a0..ba323276b8 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From eac3475c4723e9e37aaaacb42003794dfbcd4184 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 14:16:56 -0300
Subject: [PATCH 0169/6849] toolchain: update uClibc snapshot config again to
 avoid build stalls

Update uClibc snapshot version config to avoid build stalls.

This time we take care of the new UCLIBC_HAS_FTS and
UCLIBC_HAS_BACKTRACE options.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-snapshot.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index aa00680033..34ec0ff01f 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -220,6 +220,7 @@ UCLIBC_HAS_FNMATCH=y
 # UCLIBC_HAS_WORDEXP is not set
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FTS is not set
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
@@ -260,6 +261,7 @@ DOSTRIP=y
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set

From 2c200d5b369378876f85afc222ba7f14b120bbc6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 15:05:09 -0300
Subject: [PATCH 0170/6849] kismet: bump to version 2011-03-R2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/kismet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 482c7dbec5..b143ef3816 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-KISMET_VERSION = 2010-07-R1
+KISMET_VERSION = 2011-03-R2
 KISMET_SITE = http://www.kismetwireless.net/code
 KISMET_DEPENDENCIES = libpcap ncurses
 

From f1d88a96ca865f828d1efadd8de0898819453373 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 15:05:10 -0300
Subject: [PATCH 0171/6849] openvpn: bump to version 2.2.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...envpn-fix-build-with-disable-crypto.patch} |  0
 package/openvpn/openvpn-fix-tmpdir.patch      | 39 +++++++++++++++++++
 package/openvpn/openvpn.mk                    | 10 +----
 3 files changed, 41 insertions(+), 8 deletions(-)
 rename package/openvpn/{openvpn-2.1.3-fix-build-with-disable-crypto.patch => openvpn-fix-build-with-disable-crypto.patch} (100%)
 create mode 100644 package/openvpn/openvpn-fix-tmpdir.patch

diff --git a/package/openvpn/openvpn-2.1.3-fix-build-with-disable-crypto.patch b/package/openvpn/openvpn-fix-build-with-disable-crypto.patch
similarity index 100%
rename from package/openvpn/openvpn-2.1.3-fix-build-with-disable-crypto.patch
rename to package/openvpn/openvpn-fix-build-with-disable-crypto.patch
diff --git a/package/openvpn/openvpn-fix-tmpdir.patch b/package/openvpn/openvpn-fix-tmpdir.patch
new file mode 100644
index 0000000000..919d49bf23
--- /dev/null
+++ b/package/openvpn/openvpn-fix-tmpdir.patch
@@ -0,0 +1,39 @@
+From b70d99fb617350b252c8bde2f1f2d81d3f5b7955 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 27 Apr 2011 18:43:50 +0200
+Subject: [PATCH] Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto
+
+The tmp_dir string is required in the options struct regardless of options
+so spin it out of #if conditionals.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Acked-by: David Sommerseth <dazo@users.sourceforge.net>
+Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
+---
+ options.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/options.h b/options.h
+index a9c6a94..8a51502 100644
+--- a/options.h
++++ b/options.h
+@@ -369,6 +369,8 @@ struct options
+   struct plugin_option_list *plugin_list;
+ #endif
+ 
++  const char *tmp_dir;
++
+ #if P2MP
+ 
+ #if P2MP_SERVER
+@@ -409,7 +411,6 @@ struct options
+   const char *client_connect_script;
+   const char *client_disconnect_script;
+   const char *learn_address_script;
+-  const char *tmp_dir;
+   const char *client_config_dir;
+   bool ccd_exclusive;
+   bool disable;
+-- 
+1.7.0.1
+
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 89118b12b5..27a9a553d4 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,15 +4,9 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.1.4
+OPENVPN_VERSION = 2.2.0
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
-OPENVPN_CONF_OPT = --enable-small
-
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-	OPENVPN_CONF_OPT += --enable-pthread
-else
-	OPENVPN_CONF_OPT += --disable-pthread
-endif
+OPENVPN_CONF_OPT = --enable-small --disable-plugins
 
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
 	OPENVPN_DEPENDENCIES += lzo

From fc8b7766355ed3776f454cd8fbb180150bd627f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Apr 2011 22:13:48 +0200
Subject: [PATCH 0172/6849] toolchain/gcc: FINEGRAINEDMTUNE: remove checks for
 unused/outdated versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 31f715070e..17b21b8ce3 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -41,7 +41,7 @@ endchoice
 
 config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 	bool
-	default y if !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+	default y if !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 
 config BR2_GCC_SNAP_DATE
 	string "GCC snapshot date"

From 2405fa26a8a081bc79548b3444cb1b3bffde5296 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Apr 2011 08:56:33 +0200
Subject: [PATCH 0173/6849] kernel-headers: bump 2.6.35.x longterm version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                              | 2 +-
 ...csi-use-__uX-types-for-headers-exported-to-user-space.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/kernel-headers/{linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.35.13-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index e3f6b4618f..d35f0266a6 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -43,7 +43,7 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.35.12"	if BR2_KERNEL_HEADERS_2_6_35
+	default "2.6.35.13"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.4"	if BR2_KERNEL_HEADERS_2_6_38
diff --git a/toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.13-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
rename to toolchain/kernel-headers/linux-2.6.35.13-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

From 06c1d1001e912800cae76b2db0a332da067fdf65 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Apr 2011 11:15:44 +0200
Subject: [PATCH 0174/6849] uClibc: add linuxthreads/errno fix for 0.9.31 /
 0.9.32-rc3

See uclibc #2089 for details.

This is still not included upstream, but lets include it anyway as
several people have been running into the issue.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...uClibc-0.9.31-linuxthreads-errno-fix.patch | 98 +++++++++++++++++++
 ...bc-0.9.32-rc3-linuxthreads-errno-fix.patch | 70 +++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch
new file mode 100644
index 0000000000..c49821bde7
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch
@@ -0,0 +1,98 @@
+From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Jul 2010 14:08:17 +0200
+Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
+
+Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
+
+__errno_location / __h_errno_location access has to go through the PLT
+like malloc/free, so the linuxthread variants gets used instead when
+compiling with -pthread.
+
+Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/netdb.h                               |    1 -
+ libc/misc/internals/__errno_location.c        |    3 ---
+ libc/misc/internals/__h_errno_location.c      |    1 -
+ libc/misc/internals/__uClibc_main.c           |    2 --
+ libc/sysdeps/linux/common/bits/errno.h        |    1 -
+ libc/sysdeps/linux/common/bits/uClibc_errno.h |    3 ---
+ 6 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/include/netdb.h b/include/netdb.h
+index 9d3807d..ac411ab 100644
+--- a/include/netdb.h
++++ b/include/netdb.h
+@@ -59,7 +59,6 @@ __BEGIN_DECLS
+ 
+ /* Function to get address of global `h_errno' variable.  */
+ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__h_errno_location)
+ 
+ /* Macros for accessing h_errno from inside libc.  */
+ #ifdef _LIBC
+diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
+index 487a9c2..0620860 100644
+--- a/libc/misc/internals/__errno_location.c
++++ b/libc/misc/internals/__errno_location.c
+@@ -11,6 +11,3 @@ int * weak_const_function __errno_location (void)
+ {
+     return &errno;
+ }
+-#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
+-libc_hidden_weak(__errno_location)
+-#endif
+diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
+index 213d398..235df4e 100644
+--- a/libc/misc/internals/__h_errno_location.c
++++ b/libc/misc/internals/__h_errno_location.c
+@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
+ {
+     return &h_errno;
+ }
+-libc_hidden_weak(__h_errno_location)
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index 6e520fa..f4a9ebb 100644
+--- a/libc/misc/internals/__uClibc_main.c
++++ b/libc/misc/internals/__uClibc_main.c
+@@ -64,9 +64,7 @@ void internal_function _dl_aux_init (ElfW(auxv_t) *av);
+  * Prototypes.
+  */
+ extern int *weak_const_function __errno_location(void);
+-libc_hidden_proto(__errno_location)
+ extern int *weak_const_function __h_errno_location(void);
+-libc_hidden_proto(__h_errno_location)
+ 
+ extern void weak_function _stdio_init(void) attribute_hidden;
+ #ifdef __UCLIBC_HAS_LOCALE__
+diff --git a/libc/sysdeps/linux/common/bits/errno.h b/libc/sysdeps/linux/common/bits/errno.h
+index 0bf6354..de9688a 100644
+--- a/libc/sysdeps/linux/common/bits/errno.h
++++ b/libc/sysdeps/linux/common/bits/errno.h
+@@ -43,7 +43,6 @@
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__errno_location)
+ 
+ #  ifdef __UCLIBC_HAS_THREADS__
+ /* When using threads, errno is a per-thread value.  */
+diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
+index 9c15618..79eb7e6 100644
+--- a/libc/sysdeps/linux/common/bits/uClibc_errno.h
++++ b/libc/sysdeps/linux/common/bits/uClibc_errno.h
+@@ -33,9 +33,6 @@ extern int *__errno_location (void) __THROW __attribute__ ((__const__))
+ ;
+ # if defined __UCLIBC_HAS_THREADS__
+ #  include <tls.h>
+-#  if defined USE___THREAD && USE___THREAD
+-libc_hidden_proto(__errno_location)
+-#  endif
+ # endif
+ 
+ #endif /* !__ASSEMBLER__ */
+-- 
+1.7.1
+
diff --git a/toolchain/uClibc/uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch
new file mode 100644
index 0000000000..73351737e2
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch
@@ -0,0 +1,70 @@
+From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Jul 2010 14:08:17 +0200
+Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
+
+Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
+
+__errno_location / __h_errno_location access has to go through the PLT
+like malloc/free, so the linuxthread variants gets used instead when
+compiling with -pthread.
+
+Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/netdb.h                               |    1 -
+ libc/misc/internals/__errno_location.c        |    3 ---
+ libc/misc/internals/__h_errno_location.c      |    1 -
+ libc/sysdeps/linux/common/bits/errno.h        |    1 -
+ 6 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/include/netdb.h b/include/netdb.h
+index 9d3807d..ac411ab 100644
+--- a/include/netdb.h
++++ b/include/netdb.h
+@@ -59,7 +59,6 @@ __BEGIN_DECLS
+ 
+ /* Function to get address of global `h_errno' variable.  */
+ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__h_errno_location)
+ 
+ /* Macros for accessing h_errno from inside libc.  */
+ #ifdef _LIBC
+diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
+index 487a9c2..0620860 100644
+--- a/libc/misc/internals/__errno_location.c
++++ b/libc/misc/internals/__errno_location.c
+@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void)
+ {
+     return &errno;
+ }
+-#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
+-libc_hidden_weak(__errno_location)
+-#endif
+diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
+index 213d398..235df4e 100644
+--- a/libc/misc/internals/__h_errno_location.c
++++ b/libc/misc/internals/__h_errno_location.c
+@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
+ {
+     return &h_errno;
+ }
+-libc_hidden_weak(__h_errno_location)
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index 6e520fa..f4a9ebb 100644
+--- a/libc/sysdeps/linux/common/bits/errno.h
++++ b/libc/sysdeps/linux/common/bits/errno.h
+@@ -43,7 +43,6 @@
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__errno_location)
+ 
+ #  ifdef __UCLIBC_HAS_THREADS__
+ /* When using threads, errno is a per-thread value.  */
+diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
+index 9c15618..79eb7e6 100644
+-- 
+1.7.1
+

From 8b370e63806fa2ab064cd2b30d627914cc5c0a43 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Apr 2011 13:25:37 +0200
Subject: [PATCH 0175/6849] toolchain-external: remove extra space in RPC
 option string

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index d9a00349b8..1cbf554110 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
 	  will tell you if it's correct or not.
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
-	bool "Toolchain has RPC support ?"
+	bool "Toolchain has RPC support?"
 	select BR2_INET_RPC
 	help
 	  Select this option if your external toolchain supports

From 7e3e8ec040b06d6e2fb69e55c004f1ebc02c76d0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Apr 2011 15:40:58 +0200
Subject: [PATCH 0176/6849] package/Makefile.in: CFLAGS/LDFLAGS: don't add -I /
 -L args for STAGING_DIR

Now that we use sysroot for all toolchains, the explicit -I / -L arguments
in CFLAGS / LDFLAGS aren't needed anymore (And having them makes the build
quite noisy for certain packages as STAGING_DIR/include normally doesn't
exist).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index f98b3e7922..7811d51d46 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -98,11 +98,6 @@ ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-endif
-
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR)
 

From 96984e3b80607428bb32f3930d533911abbd436a Mon Sep 17 00:00:00 2001
From: Heiko Zuerker <smiley73@users.sourceforge.net>
Date: Sun, 1 May 2011 08:00:14 -0500
Subject: [PATCH 0177/6849] usbutils: install into staging directory (needed by
 udev)

Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index bd50a5f309..a034ddcd29 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -7,6 +7,7 @@
 USBUTILS_VERSION = 002
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkg-config libusb
+USBUTILS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
 	USBUTILS_DEPENDENCIES += zlib

From d2b325c1f02f4579cbc7488a3321d313d7bd2239 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Apr 2011 17:21:09 -0300
Subject: [PATCH 0178/6849] uClibc: add linuxthreads/errno fix for snapshot
 version

See uclibc #2089 for details.

This is still not included upstream, but lets include it anyway as
several people have been running into the issue.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libc.snapshot.linuxthreads-errno-fix.patch | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch

diff --git a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
new file mode 100644
index 0000000000..73351737e2
--- /dev/null
+++ b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
@@ -0,0 +1,70 @@
+From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Jul 2010 14:08:17 +0200
+Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
+
+Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
+
+__errno_location / __h_errno_location access has to go through the PLT
+like malloc/free, so the linuxthread variants gets used instead when
+compiling with -pthread.
+
+Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/netdb.h                               |    1 -
+ libc/misc/internals/__errno_location.c        |    3 ---
+ libc/misc/internals/__h_errno_location.c      |    1 -
+ libc/sysdeps/linux/common/bits/errno.h        |    1 -
+ 6 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/include/netdb.h b/include/netdb.h
+index 9d3807d..ac411ab 100644
+--- a/include/netdb.h
++++ b/include/netdb.h
+@@ -59,7 +59,6 @@ __BEGIN_DECLS
+ 
+ /* Function to get address of global `h_errno' variable.  */
+ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__h_errno_location)
+ 
+ /* Macros for accessing h_errno from inside libc.  */
+ #ifdef _LIBC
+diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
+index 487a9c2..0620860 100644
+--- a/libc/misc/internals/__errno_location.c
++++ b/libc/misc/internals/__errno_location.c
+@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void)
+ {
+     return &errno;
+ }
+-#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
+-libc_hidden_weak(__errno_location)
+-#endif
+diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
+index 213d398..235df4e 100644
+--- a/libc/misc/internals/__h_errno_location.c
++++ b/libc/misc/internals/__h_errno_location.c
+@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
+ {
+     return &h_errno;
+ }
+-libc_hidden_weak(__h_errno_location)
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index 6e520fa..f4a9ebb 100644
+--- a/libc/sysdeps/linux/common/bits/errno.h
++++ b/libc/sysdeps/linux/common/bits/errno.h
+@@ -43,7 +43,6 @@
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__errno_location)
+ 
+ #  ifdef __UCLIBC_HAS_THREADS__
+ /* When using threads, errno is a per-thread value.  */
+diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
+index 9c15618..79eb7e6 100644
+-- 
+1.7.1
+

From d1b42b24b88cc15a825d20221b2199bce4f2e6aa Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 12:36:05 -0300
Subject: [PATCH 0179/6849] net-snmp: fixup paths in net-snmp-config

Exposed by commit 7e3e8ec040b06d6e2fb69e55c004f1ebc02c76d0
net-snmp-config goes for -L/usr/lib thus things break since this wins
over the sysroot if we have a host net-snmp library around when we build
packages that link against net-snmp.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index edb1704f71..5704327444 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -68,4 +68,14 @@ define NETSNMP_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/libnetsnmp*
 endef
 
+define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
+		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
+		$(STAGING_DIR)/usr/bin/net-snmp-config
+endef
+
+NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
+
 $(eval $(call AUTOTARGETS,package,netsnmp))

From 0a2af382bbc11d6fd787c247b0384faee91f8f9f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 15:13:01 -0300
Subject: [PATCH 0180/6849] toolchain: bump gcc 4.5 series to verion 4.5.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.5.2/850-arm-pr44392.patch     | 70 -------------------
 .../{4.5.2 => 4.5.3}/100-uclibc-conf.patch    |  0
 .../301-missing-execinfo_h.patch              |  0
 .../{4.5.2 => 4.5.3}/302-c99-snprintf.patch   |  0
 .../305-libmudflap-susv3-legacy.patch         |  0
 .../810-arm-softfloat-libgcc.patch            |  0
 .../820-arm-unbreak-armv4t.patch              |  0
 .../{4.5.2 => 4.5.3}/830-arm-pr43440.patch    |  0
 ...werpc-link-with-math-lib.patch.conditional |  0
 toolchain/gcc/Config.in                       |  2 +-
 toolchain/gcc/gcc-uclibc-4.x.mk               |  2 +-
 11 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 toolchain/gcc/4.5.2/850-arm-pr44392.patch
 rename toolchain/gcc/{4.5.2 => 4.5.3}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/820-arm-unbreak-armv4t.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/830-arm-pr43440.patch (100%)
 rename toolchain/gcc/{4.5.2 => 4.5.3}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.5.2/850-arm-pr44392.patch b/toolchain/gcc/4.5.2/850-arm-pr44392.patch
deleted file mode 100644
index 4ad6c448d9..0000000000
--- a/toolchain/gcc/4.5.2/850-arm-pr44392.patch
+++ /dev/null
@@ -1,70 +0,0 @@
->From d0557763b0713a4c006bd2405eede3924569cafd Mon Sep 17 00:00:00 2001
-From: Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
-Date: Mon, 5 Jul 2010 11:28:49 +0100
-Subject: [PATCH 2/2] Fix PR44392
-
----
- gcc/config/arm/arm.md |   43 +++++++++++++++++++------------------------
- 1 files changed, 19 insertions(+), 24 deletions(-)
-
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 2096ec6..f0348f3 100644
---- a/gcc/config/arm/arm.md
-+++ b/gcc/config/arm/arm.md
-@@ -11318,34 +11318,29 @@
- (define_expand "bswapsi2"
-   [(set (match_operand:SI 0 "s_register_operand" "=r")
-   	(bswap:SI (match_operand:SI 1 "s_register_operand" "r")))]
--"TARGET_EITHER"
-+"TARGET_EITHER && (arm_arch6 || !optimize_size)"
- "
--  if (!arm_arch6)
--    {
--      if (!optimize_size)
--	{
--	  rtx op2 = gen_reg_rtx (SImode);
--	  rtx op3 = gen_reg_rtx (SImode);
-+    if (!arm_arch6)
-+      {
-+	rtx op2 = gen_reg_rtx (SImode);
-+	rtx op3 = gen_reg_rtx (SImode);
- 
--	  if (TARGET_THUMB)
--	    {
--	      rtx op4 = gen_reg_rtx (SImode);
--	      rtx op5 = gen_reg_rtx (SImode);
-+	if (TARGET_THUMB)
-+	  {
-+	    rtx op4 = gen_reg_rtx (SImode);
-+	    rtx op5 = gen_reg_rtx (SImode);
- 
--	      emit_insn (gen_thumb_legacy_rev (operands[0], operands[1],
--					       op2, op3, op4, op5));
--	    }
--	  else
--	    {
--	      emit_insn (gen_arm_legacy_rev (operands[0], operands[1],
--					     op2, op3));
--	    }
-+	    emit_insn (gen_thumb_legacy_rev (operands[0], operands[1],
-+					     op2, op3, op4, op5));
-+	  }
-+	else
-+	  {
-+	    emit_insn (gen_arm_legacy_rev (operands[0], operands[1],
-+					   op2, op3));
-+	  }
- 
--	  DONE;
--	}
--      else
--	FAIL;
--    }
-+	DONE;
-+      }
-   "
- )
- 
--- 
-1.6.2
-
diff --git a/toolchain/gcc/4.5.2/100-uclibc-conf.patch b/toolchain/gcc/4.5.3/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/100-uclibc-conf.patch
rename to toolchain/gcc/4.5.3/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.5.2/301-missing-execinfo_h.patch b/toolchain/gcc/4.5.3/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.5.3/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.5.2/302-c99-snprintf.patch b/toolchain/gcc/4.5.3/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/302-c99-snprintf.patch
rename to toolchain/gcc/4.5.3/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.5.2/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.5.3/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.5.3/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.5.3/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.5.3/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.5.2/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.5.3/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/820-arm-unbreak-armv4t.patch
rename to toolchain/gcc/4.5.3/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.5.2/830-arm-pr43440.patch b/toolchain/gcc/4.5.3/830-arm-pr43440.patch
similarity index 100%
rename from toolchain/gcc/4.5.2/830-arm-pr43440.patch
rename to toolchain/gcc/4.5.3/830-arm-pr43440.patch
diff --git a/toolchain/gcc/4.5.2/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.5.3/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.5.2/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.5.3/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 17b21b8ce3..fcdcc198cf 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -57,7 +57,7 @@ config BR2_GCC_VERSION
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
 	default "4.3.5"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
-	default "4.5.2"     if BR2_GCC_VERSION_4_5_X
+	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.0"     if BR2_GCC_VERSION_4_6_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index ebcca53522..568aa1a84e 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -44,7 +44,7 @@ EXTRA_GCC_CONFIG_OPTIONS+=--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
 endif
 
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43810
-# Workaround until it's fixed in 4.5.2 or later
+# Workaround until it's fixed in 4.5.4 or later
 ifeq ($(ARCH),powerpc)
 ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
 GCC_OPTSPACE=--disable-target-optspace

From 0073143087989caf4e4406a9ee3c80097684c9f3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 15:16:41 -0300
Subject: [PATCH 0181/6849] toolchain/gcc: add openmp support option

Add OpenMP support in gcc as an option instead of dynamically enabling
it when threads are present.
Also fix it up since we never installed libgomp to the target or staging
thus it was never really functional.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in         |  6 ++++++
 toolchain/gcc/gcc-uclibc-4.x.mk | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index fcdcc198cf..437b86bb7d 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -109,3 +109,9 @@ config BR2_GCC_ENABLE_TLS
 	help
 	  Enable the compiler to generate code for accessing
 	  thread local storage variables
+
+config BR2_GCC_ENABLE_OPENMP
+	bool "Enable compiler OpenMP support"
+	depends on !BR2_PTHREADS_NONE && !BR2_avr32
+	help
+	  Enable OpenMP support for the compiler
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 568aa1a84e..9b8bf685cc 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -147,6 +147,12 @@ else
 GCC_SHARED_LIBGCC:=--disable-shared
 endif
 
+ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
+GCC_ENABLE_OPENMP:=--enable-libgomp
+else
+GCC_ENABLE_OPENMP:=--disable-libgomp
+endif
+
 ifeq ($(BR2_GCC_ENABLE_TLS),y)
 GCC_TLS:=--enable-tls
 else
@@ -154,7 +160,7 @@ GCC_TLS:=--disable-tls
 endif
 
 ifeq ($(BR2_PTHREADS_NONE),y)
-THREADS:=--disable-threads --disable-libgomp
+THREADS:=--disable-threads
 else
 THREADS:=--enable-threads
 endif
@@ -234,6 +240,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
+		$(GCC_ENABLE_OPENMP) \
 		--with-gnu-ld \
 		--disable-shared \
 		--disable-libssp \
@@ -301,6 +308,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
+		$(GCC_ENABLE_OPENMP) \
 		--with-gnu-ld \
 		--enable-shared \
 		--disable-libssp \
@@ -379,6 +387,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
+		$(GCC_ENABLE_OPENMP) \
 		--with-gnu-ld \
 		--disable-libssp \
 		--disable-multilib \
@@ -469,6 +478,11 @@ ifeq ($(BR2_INSTALL_LIBGCJ),y)
 	cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \
 		$(TARGET_DIR)/usr/lib/security/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgcj.so*
+endif
+ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
+	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(STAGING_DIR)/usr/lib/
+	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(TARGET_DIR)/usr/lib/
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgomp.so*
 endif
 	mkdir -p $(@D)
 	touch $@
@@ -523,6 +537,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
+		$(GCC_ENABLE_OPENMP) \
 		--with-gnu-ld \
 		--disable-libssp \
 		--disable-multilib \

From 48a00cc2ce165e70acc5c327b3c6415dde5c794b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 16:08:21 -0300
Subject: [PATCH 0182/6849] toolchain: mark mklibs as broken

mklibs is a broken option, so mark it as so pending a proper fixup or
punting it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/mklibs/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/mklibs/Config.in b/toolchain/mklibs/Config.in
index 2298a3e515..c0658661b9 100644
--- a/toolchain/mklibs/Config.in
+++ b/toolchain/mklibs/Config.in
@@ -1,5 +1,6 @@
 config BR2_MKLIBS
 	bool "Run mklibs on the built root filesystem"
+	depends on BROKEN
 	help
 	  Recompiles all the shared libraries to only include the
 	  symbols actually needed to run the binaries on the target

From 874b6e4e87cf5835b2121750372046cbae9624b2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 16:08:22 -0300
Subject: [PATCH 0183/6849] libxml2: fixup configure options

Some configure options changed so adjust.
Forcibly disabling threads isn't good and also it's detected by
configure when there are no threads.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/libxml2.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 2a267b2f9e..8f2878d656 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -12,10 +12,7 @@ ifneq ($(BR2_LARGEFILE),y)
 LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
 endif
 
-LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
-		--enable-static \
-		--without-debugging --without-python \
-		--without-threads
+LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug
 
 define LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
@@ -26,9 +23,7 @@ LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
 
 HOST_LIBXML2_DEPENDENCIES = host-pkg-config
 
-HOST_LIBXML2_CONF_OPT = \
-		--enable-shared --without-debugging --without-python \
-		--without-threads
+HOST_LIBXML2_CONF_OPT = --without-debug --without-python
 
 define LIBXML2_REMOVE_CONFIG_SCRIPTS
 	$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config

From 28cdaaee5236d0cbe3a6afde808f5eef260e7c33 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 16:08:23 -0300
Subject: [PATCH 0184/6849] libxslt: fixup configure options

Some configure options changed so adjust.
Forcibly disabling threads isn't good and also it's detected by
configure when there are no threads.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxslt/libxslt.mk | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 1efdcf8c25..07f669787b 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -15,19 +15,12 @@ else
 LIBXSLT_XTRA_CONF_OPT = --without-crypto
 endif
 
-LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \
-		--enable-static $(LIBXSLT_XTRA_CONF_OPT) \
-		--without-debugging --without-python \
-		--without-threads \
-		--with-libxml-prefix=$(STAGING_DIR)/usr/
+LIBXSLT_CONF_OPT = --with-gnu-ld $(LIBXSLT_XTRA_CONF_OPT) --without-debug \
+		--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
 
 LIBXSLT_DEPENDENCIES = libxml2 $(LIBXSLT_DEPENDENCIES_EXTRA)
 
-HOST_LIBXSLT_CONF_OPT = --enable-shared \
-			--without-debugging \
-			--without-python \
-			--without-threads \
-			--without-crypto
+HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto
 
 HOST_LIBXSLT_DEPENDENCIES = host-libxml2
 

From 1db3939ad91e88d420bc8983b4708ee65d3c91e2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 May 2011 17:38:27 -0300
Subject: [PATCH 0185/6849] toolchain: update gcc snapshot version

* Make mpc mandatory since we are probably building bleeding-edge
* Change snapshot naming convention to match the source

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in         | 12 +++++++++---
 toolchain/gcc/Config.in.2       |  2 +-
 toolchain/gcc/gcc-uclibc-4.x.mk | 11 +++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 437b86bb7d..f11c80fab2 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -45,11 +45,17 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 
 config BR2_GCC_SNAP_DATE
 	string "GCC snapshot date"
-	default "20070921"
+	default "4.7-20110430"
 	depends on BR2_GCC_VERSION_SNAP
 	help
-	  Enter snapshot date to use for gcc.  Format is:
-	  YYYYMMDD
+	  Enter snapshot date to use for gcc.
+	  Format is: A.B-YYYYMMDD
+
+	  A is GCC major version, for example 4.
+	  B is GCC minor version, for example 7.
+	  YYYYMMDD is snapshot date, for example 20110430.
+
+	  This way we'd get version 4.7-20110430
 
 config BR2_GCC_VERSION
 	string
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index 7a49068a75..c76d125832 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GCC_TARGET
 	depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
 	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_BINUTILS_TARGET
-	select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X)
+	select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X || BR2_GCC_VERSION_SNAP)
 	select BR2_PACKAGE_MPFR
 	select BR2_PACKAGE_GMP
 	help
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 9b8bf685cc..7123615495 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -141,6 +141,17 @@ endif
 GCC_HOST_PREREQ += host-mpc
 endif
 
+# GCC snapshot prerequisites
+# Since we don't know and it can be quite new just ask for everything known
+ifneq ($(GCC_SNAP_DATE),)
+GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
+GCC_TARGET_PREREQ += mpc
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+HOST_SOURCE += host-mpc-source
+endif
+GCC_HOST_PREREQ += host-mpc
+endif
+
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 GCC_SHARED_LIBGCC:=--enable-shared
 else

From 69282a2928ad909b81b86d9601b53da8b863c96e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 09:57:59 +0200
Subject: [PATCH 0186/6849] dbus-glib: use normal autoreconf instead of patch

Nowadays normal autoreconf works fine for dbus-glib, so use that instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus-glib/dbus-glib-autoreconf.patch | 215 -------------------
 package/dbus-glib/dbus-glib.mk               |   2 +-
 2 files changed, 1 insertion(+), 216 deletions(-)
 delete mode 100644 package/dbus-glib/dbus-glib-autoreconf.patch

diff --git a/package/dbus-glib/dbus-glib-autoreconf.patch b/package/dbus-glib/dbus-glib-autoreconf.patch
deleted file mode 100644
index 1ac8c55876..0000000000
--- a/package/dbus-glib/dbus-glib-autoreconf.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-dbus-glib: result of autoreconf after the --with-dbus-binding-tool addition
-
-autoreconf on dbus-glib fails with the autoconf version we currently have
-in BR, so do it in patch form instead.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure                              |   14 ++++++++++++++
- dbus/Makefile.in                       |    1 +
- dbus/examples/Makefile.in              |    5 +++--
- dbus/examples/statemachine/Makefile.in |    5 +++--
- test/core/Makefile.in                  |    7 ++++---
- test/interfaces/Makefile.in            |   13 +++++++------
- tools/Makefile.in                      |    3 ++-
- 7 files changed, 34 insertions(+), 14 deletions(-)
-
-Index: dbus-glib-0.80/configure
-===================================================================
---- dbus-glib-0.80.orig/configure
-+++ dbus-glib-0.80/configure
-@@ -882,6 +882,7 @@
- SED
- DBUS_BUILD_TESTS_FALSE
- DBUS_BUILD_TESTS_TRUE
-+DBUS_BINDING_TOOL
- DBUS_BASH_COMPLETION_FALSE
- DBUS_BASH_COMPLETION_TRUE
- EGREP
-@@ -1003,6 +1004,7 @@
- enable_bash_completion
- with_test_socket_dir
- with_introspect_xml
-+with_dbus_binding_tool
- enable_shared
- enable_static
- enable_fast_install
-@@ -1696,6 +1698,8 @@
-                           Pass in a pregenerated dbus daemon introspection xml
-                           file (as generated by 'dbus-daemon --introspect') to
-                           use instead of querying the installed dbus daemon
-+  --with-dbus-binding-tool=filename
-+                          Use external dbus-binding-tool program
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
-@@ -5174,6 +5178,16 @@
- fi
- 
- 
-+# Check whether --with-dbus-binding-tool was given.
-+if test "${with_dbus_binding_tool+set}" = set; then
-+  withval=$with_dbus_binding_tool; DBUS_BINDING_TOOL=$withval
-+else
-+  DBUS_BINDING_TOOL=\$\(top_builddir\)/dbus/dbus-binding-tool
-+fi
-+
-+
-+
-+
-  if test x$enable_tests = xyes; then
-   DBUS_BUILD_TESTS_TRUE=
-   DBUS_BUILD_TESTS_FALSE='#'
-Index: dbus-glib-0.80/dbus/examples/Makefile.in
-===================================================================
---- dbus-glib-0.80.orig/dbus/examples/Makefile.in
-+++ dbus-glib-0.80/dbus/examples/Makefile.in
-@@ -114,6 +114,7 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
- DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
- DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
- DBUS_CFLAGS = @DBUS_CFLAGS@
-@@ -668,10 +669,10 @@
- 
- 
- example-service-glue.h: example-service.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
- 
- example-signal-emitter-glue.h: example-signal-emitter.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-Index: dbus-glib-0.80/dbus/examples/statemachine/Makefile.in
-===================================================================
---- dbus-glib-0.80.orig/dbus/examples/statemachine/Makefile.in
-+++ dbus-glib-0.80/dbus/examples/statemachine/Makefile.in
-@@ -87,6 +87,7 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
- DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
- DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
- DBUS_CFLAGS = @DBUS_CFLAGS@
-@@ -529,10 +530,10 @@
- 
- 
- statemachine-server-glue.h: statemachine-server.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_server --mode=glib-server --output=$@ $<
- 
- statemachine-glue.h: statemachine.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $<
- 
- sm-marshal.c: Makefile sm-marshal.list
- 	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
-Index: dbus-glib-0.80/test/core/Makefile.in
-===================================================================
---- dbus-glib-0.80.orig/test/core/Makefile.in
-+++ dbus-glib-0.80/test/core/Makefile.in
-@@ -175,6 +175,7 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
- DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
- DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
- DBUS_CFLAGS = @DBUS_CFLAGS@
-@@ -767,13 +768,13 @@
- 
- 
- @DBUS_BUILD_TESTS_TRUE@test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
- 
- @DBUS_BUILD_TESTS_TRUE@my-object-marshal.c: Makefile my-object-marshal.list
- @DBUS_BUILD_TESTS_TRUE@	@GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c
-Index: dbus-glib-0.80/test/interfaces/Makefile.in
-===================================================================
---- dbus-glib-0.80.orig/test/interfaces/Makefile.in
-+++ dbus-glib-0.80/test/interfaces/Makefile.in
-@@ -104,6 +104,7 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
- DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
- DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
- DBUS_CFLAGS = @DBUS_CFLAGS@
-@@ -637,22 +638,22 @@
- 
- 
- @DBUS_BUILD_TESTS_TRUE@test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-song-bindings.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-hello-glue.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-hello-bindings.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-goodbye-glue.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
- 
- @DBUS_BUILD_TESTS_TRUE@test-goodbye-bindings.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
--@DBUS_BUILD_TESTS_TRUE@	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
-+@DBUS_BUILD_TESTS_TRUE@	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
- 
- ### not building tests
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-Index: dbus-glib-0.80/tools/Makefile.in
-===================================================================
---- dbus-glib-0.80.orig/tools/Makefile.in
-+++ dbus-glib-0.80/tools/Makefile.in
-@@ -77,6 +77,7 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
- DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
- DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
- DBUS_CFLAGS = @DBUS_CFLAGS@
-@@ -481,7 +482,7 @@
- 
- 
- dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
--	$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
-+	$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
- 
- @USE_INTROSPECT_XML_TRUE@dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
- @USE_INTROSPECT_XML_TRUE@	cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml
-Index: dbus-glib-0.80/dbus/Makefile.in
-===================================================================
---- dbus-glib-0.80.orig/dbus/Makefile.in
-+++ dbus-glib-0.80/dbus/Makefile.in
-@@ -158,6 +158,7 @@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
- DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
- DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
- DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 302d1b1b8b..ca15f1a061 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -6,8 +6,8 @@
 DBUS_GLIB_VERSION = 0.80
 DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib/
+DBUS_GLIB_AUTORECONF = YES
 DBUS_GLIB_INSTALL_STAGING = YES
-DBUS_GLIB_INSTALL_TARGET = YES
 
 DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \
 		ac_cv_func_posix_getpwnam_r=yes \

From 3178a20550565833b8a2a8f6af9fd3c7ae4811d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 10:01:28 +0200
Subject: [PATCH 0187/6849] Makefile.autotools.in: add libtool 2.4 support for
 autoreconf case as well

Was missing from f055b266 (Makefile.autotools.in: add libtool v2.4 support).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 88a06ea223..61fcfcfa2c 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -170,6 +170,8 @@ define AUTORECONF_HOOK
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+			elif test $$$${ltmain_version} = "2.4"; then\
+				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi

From cab3a3b3df799dc77567569851ca329d5f26f4f7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 12:04:55 +0200
Subject: [PATCH 0188/6849] dbus-glib: bump version

dbus-binding-tool patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dbus-glib-dbus-binding-tool.patch         | 140 ------------------
 package/dbus-glib/dbus-glib.mk                |   3 +-
 2 files changed, 1 insertion(+), 142 deletions(-)
 delete mode 100644 package/dbus-glib/dbus-glib-dbus-binding-tool.patch

diff --git a/package/dbus-glib/dbus-glib-dbus-binding-tool.patch b/package/dbus-glib/dbus-glib-dbus-binding-tool.patch
deleted file mode 100644
index b5879cbed5..0000000000
--- a/package/dbus-glib/dbus-glib-dbus-binding-tool.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-[PATCH]: add --with-dbus-binding-tool option to use an external dbus-binding-tool
-
-Cross compilation fix. dbus-binding-tool needs to run on the host, but gets
-compiled for the target. Add an option to use an external program
-(host version) instead.
-
-Based on similar patch in ptxdist.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac                           |    5 +++++
- dbus/examples/Makefile.am              |    4 ++--
- dbus/examples/statemachine/Makefile.am |    4 ++--
- test/core/Makefile.am                  |    6 +++---
- test/interfaces/Makefile.am            |   12 ++++++------
- tools/Makefile.am                      |    2 +-
- 6 files changed, 19 insertions(+), 14 deletions(-)
-
-Index: dbus-glib-0.80/configure.ac
-===================================================================
---- dbus-glib-0.80.orig/configure.ac
-+++ dbus-glib-0.80/configure.ac
-@@ -70,6 +70,11 @@
-     AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
- fi
- 
-+AC_ARG_WITH(dbus-binding-tool,
-+  AS_HELP_STRING([--with-dbus-binding-tool=[filename]],[Use external dbus-binding-tool program]),
-+  [DBUS_BINDING_TOOL=$withval],[DBUS_BINDING_TOOL=\$\(top_builddir\)/dbus/dbus-binding-tool])
-+AC_SUBST(DBUS_BINDING_TOOL)
-+
- 
- dnl DBUS_BUILD_TESTS controls unit tests built in to .c files 
- dnl and also some stuff in the test/ subdir
-Index: dbus-glib-0.80/dbus/examples/Makefile.am
-===================================================================
---- dbus-glib-0.80.orig/dbus/examples/Makefile.am
-+++ dbus-glib-0.80/dbus/examples/Makefile.am
-@@ -21,7 +21,7 @@
- BUILT_SOURCES = example-service-glue.h
- 
- example-service-glue.h: example-service.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
- 
- 
- ## Makefile.am bits for another client/server pair
-@@ -37,7 +37,7 @@
- BUILT_SOURCES += example-signal-emitter-glue.h
- 
- example-signal-emitter-glue.h: example-signal-emitter.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
-Index: dbus-glib-0.80/dbus/examples/statemachine/Makefile.am
-===================================================================
---- dbus-glib-0.80.orig/dbus/examples/statemachine/Makefile.am
-+++ dbus-glib-0.80/dbus/examples/statemachine/Makefile.am
-@@ -26,10 +26,10 @@
- BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h
- 
- statemachine-server-glue.h: statemachine-server.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_server --mode=glib-server --output=$@ $<
- 
- statemachine-glue.h: statemachine.xml
--	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $<
- 
- sm-marshal.c: Makefile sm-marshal.list
- 	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
-Index: dbus-glib-0.80/test/core/Makefile.am
-===================================================================
---- dbus-glib-0.80.orig/test/core/Makefile.am
-+++ dbus-glib-0.80/test/core/Makefile.am
-@@ -63,13 +63,13 @@
- test_service_glib_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la $(DBUS_GLIB_THREADS_LIBS) 
- 
- test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
-+	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
- 
- test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
-+	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
- 
- test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
-+	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
- 
- my-object-marshal.c: Makefile my-object-marshal.list
- 	@GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c
-Index: dbus-glib-0.80/test/interfaces/Makefile.am
-===================================================================
---- dbus-glib-0.80.orig/test/interfaces/Makefile.am
-+++ dbus-glib-0.80/test/interfaces/Makefile.am
-@@ -47,22 +47,22 @@
- 	test-goodbye-bindings.h
- 
- test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
-+	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
- 
- test-song-bindings.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
-+	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
- 
- test-hello-glue.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
-+	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
- 
- test-hello-bindings.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
-+	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
- 
- test-goodbye-glue.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
-+	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
- 
- test-goodbye-bindings.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
--	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
-+	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
- 
- 
- CLEANFILES = \
-Index: dbus-glib-0.80/tools/Makefile.am
-===================================================================
---- dbus-glib-0.80.orig/tools/Makefile.am
-+++ dbus-glib-0.80/tools/Makefile.am
-@@ -4,7 +4,7 @@
- libdbus_glibdir = $(includedir)/dbus-1.0/dbus
- 
- dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
--	$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
-+	$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
- 
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
- 
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index ca15f1a061..fac5f2b947 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -3,10 +3,9 @@
 # dbus-glib
 #
 #############################################################
-DBUS_GLIB_VERSION = 0.80
+DBUS_GLIB_VERSION = 0.92
 DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib/
-DBUS_GLIB_AUTORECONF = YES
 DBUS_GLIB_INSTALL_STAGING = YES
 
 DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \

From 743208349966f76748a8017ffc394ad531825e20 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 13:12:01 +0200
Subject: [PATCH 0189/6849] libglade: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglade/libglade.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 67e621b346..df62039050 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -3,7 +3,7 @@
 # libglade
 #
 #############################################################
-LIBGLADE_VERSION = 2.6.3
+LIBGLADE_VERSION = 2.6.4
 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
 LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/
 LIBGLADE_INSTALL_STAGING = YES

From 08f0746a83c21e9ff4c4831f5df54a5b01b5f25a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 13:57:40 +0200
Subject: [PATCH 0190/6849] gamin: remove unused patch

Doesn't get applied because of the 0.1.10 patch, doesn't seem important
and hasn't been updated since it got added back in 2008.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gamin/gamin-0.1.9-debug.patch | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 package/gamin/gamin-0.1.9-debug.patch

diff --git a/package/gamin/gamin-0.1.9-debug.patch b/package/gamin/gamin-0.1.9-debug.patch
deleted file mode 100644
index 14cc0507d7..0000000000
--- a/package/gamin/gamin-0.1.9-debug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/server/gam_poll_basic.c	2007-07-04 09:46:29.000000000 -0400
-+++ b/server/gam_poll_basic.c	2008-02-13 15:04:57.000000000 -0500
-@@ -343,9 +343,9 @@ gam_poll_basic_poll_file(GamNode * node)
- #ifdef VERBOSE_POLL
- 		GAM_DEBUG(DEBUG_INFO, "Poll: poll_file %s unchanged\n", path);
- #ifdef ST_MTIM_NSEC
--		GAM_DEBUG(DEBUG_INFO, "%d %d : %d %d\n", node->sbuf.st_mtim.tv_sec, node->sbuf.st_mtim.tv_nsec, sbuf.st_mtim.tv_sec, sbuf.st_mtim.tv_nsec);
-+//		GAM_DEBUG(DEBUG_INFO, "%d %d : %d %d\n", node->sbuf.st_mtim.tv_sec, node->sbuf.st_mtim.tv_nsec, sbuf.st_mtim.tv_sec, sbuf.st_mtim.tv_nsec);
- #else
--		GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtim.tv_nsec);
-+//		GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtim.tv_nsec);
- #endif /* ST_MTIM_NSEC */
- #endif /* VERBOSE_POLL */
- 	}

From 8fa1a0ea7595935d3f02c9528c46f63f159961a0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 14:07:16 +0200
Subject: [PATCH 0191/6849] gamin: autoreconf rather than patching configure

Patch from openembedded.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gamin/gamin-0.1.10-configure.patch    | 103 ------------------
 .../gamin-0.1.10-no-abstract-sockets.patch    |  61 +++++++++++
 package/gamin/gamin.mk                        |   3 +-
 3 files changed, 62 insertions(+), 105 deletions(-)
 delete mode 100644 package/gamin/gamin-0.1.10-configure.patch
 create mode 100644 package/gamin/gamin-0.1.10-no-abstract-sockets.patch

diff --git a/package/gamin/gamin-0.1.10-configure.patch b/package/gamin/gamin-0.1.10-configure.patch
deleted file mode 100644
index b4e45039e3..0000000000
--- a/package/gamin/gamin-0.1.10-configure.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/configure.fixed	2009-08-02 18:00:54.000000000 +0200
-+++ b/configure	2008-11-24 16:23:27.000000000 +0100
-@@ -23581,100 +23581,6 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <sys/types.h>
--#include <stdlib.h>
--#include <string.h>
--#include <stdio.h>
--#include <sys/socket.h>
--#include <sys/un.h>
--#include <errno.h>
--
--int
--main ()
--{
--
--  int listen_fd;
--  struct sockaddr_un addr;
--
--  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
--
--  if (listen_fd < 0)
--    {
--      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
--      exit (1);
--    }
--
--  memset (&addr, '\0', sizeof (addr));
--  addr.sun_family = AF_UNIX;
--  strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
--  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
--
--  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
--    {
--       fprintf (stderr, "Abstract socket namespace bind() failed: %s\n",
--                strerror (errno));
--       exit (1);
--    }
--  else
--    exit (0);
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  have_abstract_sockets=yes
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--have_abstract_sockets=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
- { echo "$as_me:$LINENO: result: $have_abstract_sockets" >&5
- echo "${ECHO_T}$have_abstract_sockets" >&6; }
- 
diff --git a/package/gamin/gamin-0.1.10-no-abstract-sockets.patch b/package/gamin/gamin-0.1.10-no-abstract-sockets.patch
new file mode 100644
index 0000000000..3d659015ec
--- /dev/null
+++ b/package/gamin/gamin-0.1.10-no-abstract-sockets.patch
@@ -0,0 +1,61 @@
+[PATCH]: Remove abstract socket namespace check breaking cross compilation
+
+Taken from openembedded:
+
+http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/gamin/files/no-abstract-sockets.patch
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+--- /tmp/configure.in	2007-04-30 13:08:49.000000000 +0200
++++ gamin-0.1.8/configure.in	2007-04-30 13:10:53.285251000 +0200
+@@ -354,51 +354,6 @@
+     AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure])
+ fi
+ 
+-#### Abstract sockets
+-
+-AC_MSG_CHECKING(abstract socket namespace)
+-AC_LANG_PUSH(C)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdio.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <errno.h>
+-]],
+-[[
+-  int listen_fd;
+-  struct sockaddr_un addr;
+-  
+-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
+-  
+-  if (listen_fd < 0)
+-    {
+-      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
+-      exit (1);
+-    }
+-
+-  memset (&addr, '\0', sizeof (addr));
+-  addr.sun_family = AF_UNIX;
+-  strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
+-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
+-  
+-  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
+-    {
+-       fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", 
+-                strerror (errno));
+-       exit (1);
+-    }
+-  else 
+-    exit (0);
+-]])],
+-              [have_abstract_sockets=yes],
+-              [have_abstract_sockets=no])
+-AC_LANG_POP(C)
+-AC_MSG_RESULT($have_abstract_sockets)
+-
+ if test x$enable_abstract_sockets = xyes; then
+     if test x$have_abstract_sockets = xno; then
+ 	AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index f0600b27c4..d691f6043a 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -6,9 +6,8 @@
 GAMIN_VERSION = 0.1.10
 GAMIN_SOURCE = gamin-$(GAMIN_VERSION).tar.gz
 GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
-GAMIN_AUTORECONF = NO
+GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
-GAMIN_INSTALL_TARGET = YES
 
 GAMIN_CONF_OPT = --program-prefix="" --disable-debug
 

From 928a901cb059116cf893890bbd9d00cd1c3b2f61 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 May 2011 10:01:28 -0300
Subject: [PATCH 0192/6849] linux: bump to version 2.6.38.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 3b0fa62518..cfef5bbe7b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_38
 
 config BR2_LINUX_KERNEL_2_6_38
-	bool "2.6.38.4"
+	bool "2.6.38.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.38.4"
+	default "2.6.38.5"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.38.4" if BR2_LINUX_KERNEL_2_6_38
+	default "2.6.38.5" if BR2_LINUX_KERNEL_2_6_38
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From c96e483ced00330f0c3925dd585e3b2ffbc7c900 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 May 2011 10:01:29 -0300
Subject: [PATCH 0193/6849] toolchain: bump 2.6.38 kernel headers to 2.6.38.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d35f0266a6..6bf4d6fe37 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -46,6 +46,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.35.13"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.4"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.38.5"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From a2e724a05b5c9a8ef8dadfb2154d1fd996f16fef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 May 2011 10:01:30 -0300
Subject: [PATCH 0194/6849] qemu/arm-versatile: use 2.6.38.5 kernel to match
 headers

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index ba323276b8..1a1a0ff1cc 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 6246704008ef219257f30a824903855d0e00cffb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 May 2011 15:23:40 +0200
Subject: [PATCH 0195/6849] package/Makefile.in: ensure libtool doesn't search
 host dirs for libraries

Commit 7e3e8ec040b (CFLAGS/LDFLAGS: don't add -I / -L args for STAGING_DIR)
exposed a lingering libtool problem.

Unless instructed otherwise (using -L) libtool will search its built in
system path for libraries, and use those instead if found. The default
search path is '/usr/lib, /lib, /usr/local/lib', which is no good for
cross compilation.

Fix it by setting the system search path to the empty string, effectively
disabling this feature.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index 7811d51d46..391777ead9 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -284,6 +284,7 @@ TARGET_CONFIGURE_ARGS= \
 	ac_cv_func_malloc_0_nonnull=yes \
 	ac_cv_func_calloc_0_nonnull=yes \
 	ac_cv_func_realloc_0_nonnull=yes \
+	lt_cv_sys_lib_search_path_spec="" \
 	$(BR2_AC_CV_C_BIGENDIAN)
 
 #######################################################################

From 57d131dd9677cb066c8aa54a5e25061dddee8875 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 May 2011 13:22:24 -0300
Subject: [PATCH 0196/6849] mpg123: bump to version 0.13.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index a22ef18d78..8eeb56daa5 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.13.2
+MPG123_VERSION = 1.13.3
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From dd0dfd0ec136c6c7300407d7e8a9713967be0efb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 May 2011 13:22:25 -0300
Subject: [PATCH 0197/6849] qemu/mipsel-malta: switch to kernel 2.6.38.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mipsel-malta/{linux-2.6.36.config => linux-2.6.38.config} | 0
 configs/qemu_mipsel_malta_defconfig                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/mipsel-malta/{linux-2.6.36.config => linux-2.6.38.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-2.6.36.config b/board/qemu/mipsel-malta/linux-2.6.38.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-2.6.36.config
rename to board/qemu/mipsel-malta/linux-2.6.38.config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index ea3ba88048..0523a14519 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-2.6.36.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-2.6.38.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 6780d0ba04ecf4cf4bf2ec1dc9f13c78868cf95c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 May 2011 15:33:42 -0300
Subject: [PATCH 0198/6849] bind: security bump to version 9.6-ESV-R4

Bump bind to version 9.6-ESV-R4 since the 9.5 series is no longer
supported.
While at it switch to the ESV (Extended Support Version) branch instead
of going for the latest.

Also adjust the package to build against OpenSSL when available for
proper DNSSEC support and libxml2 too.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index ff0ec04d2c..e3341bdb69 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,26 +4,32 @@
 #
 #############################################################
 
-BIND_VERSION = 9.5.2-P4
+BIND_VERSION = 9.6-ESV-R4
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
-BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen
-BIND_TARGET_SBINS += dnssec-keygen dnssec-signzone
+BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen dnssec-dsfromkey
+BIND_TARGET_SBINS += dnssec-keyfromlabel dnssec-keygen dnssec-signzone
 BIND_TARGET_BINS = dig host nslookup nsupdate
-BIND_TARGET_LIBS = libbind9.* libdns.* libisccc.* libisccfg.* libisc.* liblwres.*
-BIND_MAKE = $(MAKE1)
+BIND_TARGET_LIBS = libbind9.* libdns.* libisc.* libisccc.* libisccfg.* liblwres.*
 BIND_CONF_ENV =	BUILD_CC="$(TARGET_CC)" \
 		BUILD_CFLAGS="$(TARGET_CFLAGS)"
-BIND_CONF_OPT =	\
-		--sysconfdir=/etc \
+BIND_CONF_OPT =	--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-randomdev=/dev/urandom \
-		--with-openssl=no \
-		--with-libxml2=no \
-		--with-pic \
-		--with-libtool \
-		--disable-epoll \
-		--disable-threads
+		--enable-epoll --with-libtool
+
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+	BIND_CONF_OPT += --with-libxml2=$(STAGING_DIR)/usr
+	BIND_DEPENDENCIES += libxml2
+else
+	BIND_CONF_OPT += --with-libxml2=no
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	BIND_DEPENDENCIES += openssl
+else
+	BIND_CONF_OPT += --with-openssl=no
+endif
 
 define BIND_TARGET_INSTALL_FIXES
 	rm -f $(TARGET_DIR)/usr/bin/isc-config.sh

From b05f23b933018c2ccce890620a6bdbb6619001ce Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 20 Apr 2011 14:41:53 -0300
Subject: [PATCH 0199/6849] alsa-utils: make /var/lib/alsa directory in target

alsactl needs /var/lib/alsa to store asound.state when saving mixer
settings so make it in the target.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/alsa-utils/alsa-utils.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index d5c34d3074..f3954200e5 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -36,6 +36,7 @@ ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQNET) += usr/bin/aseqnet
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-test
 
 define ALSA_UTILS_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/var/lib/alsa
 	for i in $(ALSA_UTILS_TARGETS_y); do \
 		install -D -m 755 $(STAGING_DIR)/$$i $(TARGET_DIR)/$$i; \
 	done

From c17f4134384666e1ae6116a08b2ce92da633abef Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Thu, 21 Apr 2011 10:30:09 +0800
Subject: [PATCH 0200/6849] New package: input-event-daemon

Add new package: input-event-daemon

input-event-daemon -  input event handling daemon for linux.

[Peter: minor tweaks, use v0.1.3 tag, pass LDFLAGS, combine install step]
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/input-event-daemon/Config.in          |  8 ++++
 .../input-event-daemon/S99input-event-daemon  | 39 +++++++++++++++++++
 .../input-event-daemon/input-event-daemon.mk  | 36 +++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 package/input-event-daemon/Config.in
 create mode 100755 package/input-event-daemon/S99input-event-daemon
 create mode 100644 package/input-event-daemon/input-event-daemon.mk

diff --git a/package/Config.in b/package/Config.in
index 8e78f0faed..6f3384c736 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -177,6 +177,7 @@ source "package/hdparm/Config.in"
 endif
 source "package/hwdata/Config.in"
 source "package/i2c-tools/Config.in"
+source "package/input-event-daemon/Config.in"
 source "package/input-tools/Config.in"
 source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
diff --git a/package/input-event-daemon/Config.in b/package/input-event-daemon/Config.in
new file mode 100644
index 0000000000..edf2886095
--- /dev/null
+++ b/package/input-event-daemon/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_INPUT_EVENT_DAEMON
+	bool "input-event-daemon"
+	help
+	  input-event-daemon is a daemon which executes
+	  a user-defined command on input events, such as
+	  keys, mouse buttons and switches.
+
+	  http://github.com/gandro/input-event-daemon
diff --git a/package/input-event-daemon/S99input-event-daemon b/package/input-event-daemon/S99input-event-daemon
new file mode 100755
index 0000000000..3a82b06ca1
--- /dev/null
+++ b/package/input-event-daemon/S99input-event-daemon
@@ -0,0 +1,39 @@
+#! /bin/sh
+
+[ -f /usr/bin/input-event-daemon ] || exit 0
+
+start() {
+	echo -n "Starting input-event-daemon: "
+	input-event-daemon
+	echo "done"
+}
+
+
+stop() {
+	echo -n "Stopping input-event-daemon: "
+	killall input-event-daemon
+	echo "done"
+}
+
+restart() {
+	stop
+	start
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|reload|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
new file mode 100644
index 0000000000..c335be3fc4
--- /dev/null
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -0,0 +1,36 @@
+#############################################################
+#
+# input-event-daemon
+#
+#############################################################
+
+INPUT_EVENT_DAEMON_VERSION = v0.1.3
+INPUT_EVENT_DAEMON_SITE = git://github.com/gandro/input-event-daemon.git
+
+define INPUT_EVENT_DAEMON_BUILD_CMDS
+	touch  $(@D)/input-event-table.h
+	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
+
+define INPUT_EVENT_DAEMON_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/input-event-daemon \
+		$(TARGET_DIR)/usr/bin/input-event-daemon
+	[ -f $(TARGET_DIR)/etc/input-event-daemon.conf ] || \
+		$(INSTALL) -m 644 -D $(@D)/docs/sample.conf \
+			$(TARGET_DIR)/etc/input-event-daemon.conf
+	[ -f $(TARGET_DIR)/etc/init.d/S99input-event-daemon ] || \
+		$(INSTALL) -m 0755 -D package/input-event-daemon/S99input-event-daemon \
+			$(TARGET_DIR)/etc/init.d/S99input-event-daemon
+endef
+
+define INPUT_EVENT_DAEMON_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+define INPUT_EVENT_DAEMON_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/input-event-daemon
+	rm -f $(TARGET_DIR)/etc/input-event-daemon.conf
+endef
+
+$(eval $(call GENTARGETS,package,input-event-daemon))

From 6721878972275695e74b4976f9d0779b5cb77e4e Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Thu, 5 May 2011 13:17:23 +0100
Subject: [PATCH 0201/6849] sh: Fix CodeSourcery toolchain prefix

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 1cbf554110..ca9892b10a 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -137,7 +137,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
-	default "sh4-linux-gnu"          if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
+	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 

From 85dc57f6fd2755d8f5b193f369dad35796e764c2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Apr 2011 13:09:26 +0200
Subject: [PATCH 0202/6849] Add toolchain wrapper for external toolchains

Add a simple toolchain wrapper for external toolchains, which forces the
correct sysroot/march/mtune/floating point options needed to use it
with buildroot.

With this in place the external toolchain behaves similar to the internal
ones, and the special handling can be removed. This also means that the
toolchain is usable outside buildroot without having to pass any special
compiler flags.

Also adjust the downloadable external toolchain support to install under
HOST_DIR so it can be used after the temporary build files are removed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                      |  4 +-
 package/Makefile.in                           | 12 +--
 toolchain/toolchain-external/ext-tool.mk      | 84 +++++++++++++++++--
 .../ext-toolchain-wrapper.c                   | 75 +++++++++++++++++
 4 files changed, 154 insertions(+), 21 deletions(-)
 create mode 100644 toolchain/toolchain-external/ext-toolchain-wrapper.c

diff --git a/Makefile b/Makefile
index d4f5e15137..2c5aefe2a8 100644
--- a/Makefile
+++ b/Makefile
@@ -284,7 +284,6 @@ STAMP_DIR:=$(BASE_DIR)/stamps
 BINARIES_DIR:=$(BASE_DIR)/images
 TARGET_DIR:=$(BASE_DIR)/target
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
-TOOLCHAIN_EXTERNAL_DIR=$(BASE_DIR)/external-toolchain
 TARGET_SKELETON=$(TOPDIR)/fs/skeleton
 
 BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
@@ -625,8 +624,7 @@ endif
 
 clean:
 	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
-		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR) $(BASE_DIR)/staging \
-		$(TOOLCHAIN_EXTERNAL_DIR)
+		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR) $(BASE_DIR)/staging
 
 distclean: clean
 ifeq ($(DL_DIR),$(TOPDIR)/dl)
diff --git a/package/Makefile.in b/package/Makefile.in
index 391777ead9..faab365f43 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -103,18 +103,8 @@ TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR)
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-TOOLCHAIN_EXTERNAL_PREFIX=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
-TOOLCHAIN_EXTERNAL_LOCATION=$(TOOLCHAIN_EXTERNAL_DIR)
 else
-TOOLCHAIN_EXTERNAL_LOCATION=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
-endif
-ifneq ($(TOOLCHAIN_EXTERNAL_LOCATION),)
-TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_LOCATION)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
-else
-TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PREFIX)-
-endif
+TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
 endif
 
 # Quotes are needed for spaces et al in path components.
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index f6249ef9c9..0034ddfb3b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -41,8 +41,16 @@
 #  packages when using external toolchains. So in the end, only the
 #  cross-compiler binaries remains external, all libraries and headers
 #  are imported into the Buildroot tree.
+#
+#  4. Build a toolchain wrapper which executes the external toolchain
+#  with a number of arguments (sysroot/march/mtune/..) hardcoded,
+#  so we're sure the correct configuration is always used and the
+#  toolchain behaves similar to an internal toolchain.
+#  This toolchain wrapper and symlinks are installed into
+#  $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest
+#  of Buildroot is handled identical for the 2 toolchain types.
 
-uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed
+uclibc: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
 
 LIB_EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
@@ -97,7 +105,51 @@ endif # ! no threads
 # present in the main sysroot, and only the libraries are available in
 # each variant-specific sysroot directory.
 
-TARGET_CC_NO_SYSROOT=$(filter-out --sysroot=%,$(TARGET_CC_NOCCACHE))
+
+TOOLCHAIN_EXTERNAL_PREFIX=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
+TOOLCHAIN_EXTERNAL_DIR=$(HOST_DIR)/opt/ext-toolchain
+else
+TOOLCHAIN_EXTERNAL_DIR=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
+endif
+
+ifeq ($(TOOLCHAIN_EXTERNAL_DIR),)
+# if no path set, figure it out from path
+TOOLCHAIN_EXTERNAL_BIN:=$(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
+else
+TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/bin
+endif
+
+TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
+TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \
+	-DBR_CROSS_PATH='"$(TOOLCHAIN_EXTERNAL_BIN)/"' \
+	-DBR_SYSROOT='"$(STAGING_DIR)"'
+
+# march/mtune/floating point mode needs to be passed to the external toolchain
+# to select the right multilib variant
+ifneq ($(CC_TARGET_TUNE_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mtune=$(CC_TARGET_TUNE_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_TUNE='"$(CC_TARGET_TUNE_)"'
+endif
+ifneq ($(CC_TARGET_ARCH_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"'
+endif
+ifneq ($(CC_TARGET_ABI_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
+endif
+
+ifeq ($(BR2_SOFT_FLOAT),y)
+TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
+endif
+
+ifeq ($(BR2_VFP_FLOAT),y)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=vfp
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_VFPFLOAT=1
+endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
@@ -146,9 +198,9 @@ $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 $(STAMP_DIR)/ext-toolchain-checked:
 	@echo "Checking external toolchain settings"
 	$(Q)$(call check_cross_compiler_exists)
-	$(Q)SYSROOT_DIR=`$(TARGET_CC_NO_SYSROOT) -print-sysroot 2>/dev/null` ; \
+	$(Q)SYSROOT_DIR=`$(TOOLCHAIN_EXTERNAL_CC) -print-sysroot 2>/dev/null` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
-		SYSROOT_DIR=`readlink -f $$(LANG=C $(TARGET_CC_NO_SYSROOT) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
+		SYSROOT_DIR=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
 	fi ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
@@ -172,15 +224,15 @@ $(STAMP_DIR)/ext-toolchain-checked:
 # the $(TARGET_DIR) and copy the whole sysroot (libraries and headers)
 # to $(STAGING_DIR).
 $(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
-	$(Q)SYSROOT_DIR=`$(TARGET_CC_NO_SYSROOT) -print-sysroot 2>/dev/null` ; \
+	$(Q)SYSROOT_DIR=`$(TOOLCHAIN_EXTERNAL_CC) -print-sysroot 2>/dev/null` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
-		SYSROOT_DIR=`readlink -f $$(LANG=C $(TARGET_CC_NO_SYSROOT) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
+		SYSROOT_DIR=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
 	fi ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
-	ARCH_SUBDIR=`$(TARGET_CC_NO_SYSROOT) $(TARGET_CFLAGS) -print-multi-directory` ; \
+	ARCH_SUBDIR=`$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-multi-directory` ; \
 	ARCH_SYSROOT_DIR=$${SYSROOT_DIR}/$${ARCH_SUBDIR} ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
 	echo "Copy external toolchain libraries to target..." ; \
@@ -196,3 +248,21 @@ $(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 		$(call create_lib64_symlinks) ; \
 	fi ; \
 	touch $@
+
+# Build toolchain wrapper for preprocessor, C and C++ compiler, and setup
+# symlinks for everything else
+$(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
+	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
+	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
+		case "$$i" in \
+		*cc|*cc-*|*++|*++-*|*cpp) \
+			base=$${i##*/}; \
+			ln -sf $(@F) $$base; \
+			;; \
+		*) \
+			ln -sf $$i .; \
+			;; \
+		esac; \
+	done ;
+	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s \
+		toolchain/toolchain-external/ext-toolchain-wrapper.c -o $@
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
new file mode 100644
index 0000000000..a485e740d0
--- /dev/null
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -0,0 +1,75 @@
+/**
+ * Buildroot wrapper for external toolchains. This simply executes the real
+ * toolchain with a number of arguments (sysroot/arch/..) hardcoded,
+ * to ensure the external toolchain uses the correct configuration.
+ *
+ * (C) 2011 Peter Korsgaard <jacmet@sunsite.dk>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
+#include <unistd.h>
+
+#define MAXARGS 1000
+
+static char path[PATH_MAX] = BR_CROSS_PATH;
+
+static char *args[MAXARGS] = {
+	path,
+	"--sysroot", BR_SYSROOT,
+#ifdef BR_ARCH
+	"-march=" BR_ARCH,
+#endif /* BR_ARCH */
+#ifdef BR_TUNE
+	"-mtune=" BR_TUNE,
+#endif /* BR_TUNE */
+#ifdef BR_ABI
+	"-mabi=" BR_ABI,
+#endif
+#ifdef BR_SOFTFLOAT
+	"-msoft-float",
+#endif /* BR_SOFTFLOAT */
+#ifdef BR_VFPFLOAT
+	"-mfpu=vfp",
+#endif /* BR_VFPFLOAT */
+};
+
+static const char *get_basename(const char *name)
+{
+	const char *base;
+
+	base = strrchr(name, '/');
+	if (base)
+		base++;
+	else
+		base = name;
+
+	return base;
+}
+
+int main(int argc, char **argv)
+{
+	int i;
+
+	for (i=0; args[i]; i++);
+
+	if ((argc+i) >= MAXARGS) {
+		fputs("Too many arguments\n", stderr);
+		return 1;
+	}
+
+	/* forward args */
+	memcpy(&args[i], &argv[1], sizeof(argv[0]) * (argc - 1));
+
+	strcat(path, get_basename(argv[0]));
+
+	if (execv(path, args))
+		perror(path);
+
+	return 2;
+}

From 125e2558b2ec253d255bf3a1fb2950efc358c8d2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 May 2011 23:58:20 +0200
Subject: [PATCH 0203/6849] Get rid of unneeded CFLAGS

Now that we use a wrapper for external toolchains (and internal ones
default to the correct setting), we no longer need to explicitly pass
sysroot/march/mtune/mabi/floating point mode in TARGET_CFLAGS.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                 |  8 ++---
 package/Makefile.in                      | 41 +++---------------------
 package/qt/qt.mk                         |  8 ++---
 toolchain/toolchain-external/ext-tool.mk |  4 +++
 4 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/Makefile b/Makefile
index 2c5aefe2a8..5f61b93270 100644
--- a/Makefile
+++ b/Makefile
@@ -375,10 +375,10 @@ world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
 $(O)/toolchainfile.cmake:
 	@echo -en "\
 	set(CMAKE_SYSTEM_NAME Linux)\n\
-	set(CMAKE_C_COMPILER $(CMAKE_TARGET_CC))\n\
-	set(CMAKE_CXX_COMPILER $(CMAKE_TARGET_CXX))\n\
-	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(CMAKE_TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
-	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(CMAKE_TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
+	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
+	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
+	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
+	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
 	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
 	set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\
 	set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\
diff --git a/package/Makefile.in b/package/Makefile.in
index faab365f43..31a963920e 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -62,34 +62,12 @@ endif
 
 TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
-CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
-CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
-CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
-
-ifneq ($(CC_TARGET_TUNE_),)
-TARGET_CFLAGS+=-mtune=$(CC_TARGET_TUNE_)
-endif
-ifneq ($(CC_TARGET_ARCH_),)
-TARGET_CFLAGS+=-march=$(CC_TARGET_ARCH_)
-endif
-ifneq ($(CC_TARGET_ABI_),)
-TARGET_CFLAGS+=-mabi=$(CC_TARGET_ABI_)
-endif
-
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 ifeq ($(BR2_x86_64),y)
 TARGET_CFLAGS+=-fPIC -DPIC
 endif # PIC for dynamic objects on x86_64
 endif
 
-ifeq ($(BR2_SOFT_FLOAT),y)
-TARGET_CFLAGS+=-msoft-float
-endif
-
-ifeq ($(BR2_VFP_FLOAT),y)
-TARGET_CFLAGS+=-mfpu=vfp
-endif
-
 ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy)
 TARGET_CFLAGS+=-fno-pic -mno-abicalls
 endif
@@ -99,7 +77,6 @@ TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
-TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR)
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
@@ -114,11 +91,11 @@ TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(PATH)"
 # including the --sysroot option where necessary.
 TARGET_AR       = $(TARGET_CROSS)ar
 TARGET_AS       = $(TARGET_CROSS)as
-TARGET_CC       = $(TARGET_CROSS)gcc $(TARGET_SYSROOT_OPT)
-TARGET_CPP      = $(TARGET_CROSS)cpp $(TARGET_SYSROOT_OPT)
-TARGET_CXX      = $(TARGET_CROSS)g++ $(TARGET_SYSROOT_OPT)
-TARGET_FC       = $(TARGET_CROSS)gfortran $(TARGET_SYSROOT_OPT)
-TARGET_LD       = $(TARGET_CROSS)ld $(TARGET_SYSROOT_OPT)
+TARGET_CC       = $(TARGET_CROSS)gcc
+TARGET_CPP      = $(TARGET_CROSS)cpp
+TARGET_CXX      = $(TARGET_CROSS)g++
+TARGET_FC       = $(TARGET_CROSS)gfortran
+TARGET_LD       = $(TARGET_CROSS)ld
 TARGET_NM       = $(TARGET_CROSS)nm
 TARGET_RANLIB   = $(TARGET_CROSS)ranlib
 TARGET_OBJCOPY  = $(TARGET_CROSS)objcopy
@@ -132,14 +109,6 @@ TARGET_CC  := $(CCACHE) $(TARGET_CC)
 TARGET_CXX := $(CCACHE) $(TARGET_CXX)
 endif
 
-# * CMake doesn't support having the --sysroot option directly in the
-#   compiler path, so move this option to CFLAGS/CXXFLAGS variables.
-# * Don't use ccache because then CMake will fail to detect compiler.
-CMAKE_TARGET_CC = $(filter-out --sysroot=%,$(TARGET_CC_NOCCACHE))
-CMAKE_TARGET_CXX = $(filter-out --sysroot=%,$(TARGET_CXX_NOCCACHE))
-CMAKE_TARGET_CFLAGS = $(filter --sysroot=%,$(TARGET_CC_NOCCACHE)) $(TARGET_CFLAGS)
-CMAKE_TARGET_CXXFLAGS = $(filter --sysroot=%,$(TARGET_CXX_NOCCACHE)) $(TARGET_CXXFLAGS)
-
 ifeq ($(BR2_STRIP_strip),y)
 STRIP_DISCARD_ALL:=--discard-all
 STRIP_STRIP_UNNEEDED:=--strip-unneeded
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 8d7238eab5..7ec7ccc5ed 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -451,16 +451,16 @@ define QT_CONFIGURE_CMDS
 	$(QT_CONFIGURE_IPV6)
 	$(QT_CONFIGURE_CONFIG_FILE)
 	# Fix compiler path
-	$(call QT_QMAKE_SET,CC,$(filter-out --sysroot=%,$(TARGET_CC)),$(@D))
-	$(call QT_QMAKE_SET,CXX,$(filter-out --sysroot=%,$(TARGET_CXX)),$(@D))
+	$(call QT_QMAKE_SET,CC,$(TARGET_CC),$(@D))
+	$(call QT_QMAKE_SET,CXX,$(TARGET_CXX),$(@D))
 	$(call QT_QMAKE_SET,LINK,$(TARGET_CXX),$(@D))
 	$(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX),$(@D))
 	$(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs,$(@D))
 	$(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY),$(@D))
 	$(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB),$(@D))
 	$(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP),$(@D))
-	$(call QT_QMAKE_SET,CFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CFLAGS),$(@D))
-	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CXXFLAGS),$(@D))
+	$(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS),$(@D))
+	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS),$(@D))
 	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS),$(@D))
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 0034ddfb3b..328f9088fa 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -126,6 +126,10 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \
 	-DBR_CROSS_PATH='"$(TOOLCHAIN_EXTERNAL_BIN)/"' \
 	-DBR_SYSROOT='"$(STAGING_DIR)"'
 
+CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
+CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
+
 # march/mtune/floating point mode needs to be passed to the external toolchain
 # to select the right multilib variant
 ifneq ($(CC_TARGET_TUNE_),)

From ee3f31b536965d5419d6e437cb4e241ece84587f Mon Sep 17 00:00:00 2001
From: Fabien Marteau <fabien.marteau@armadeus.com>
Date: Fri, 6 May 2011 11:23:33 +0200
Subject: [PATCH 0204/6849] package: Adding Next Generation IRC deamon ngircd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: drop explicit documentation removal]
Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Signed-off-by: Fabien Marteau <fabien.marteau@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/ngircd/Config.in |  7 +++++++
 package/ngircd/ngircd.mk | 11 +++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/ngircd/Config.in
 create mode 100644 package/ngircd/ngircd.mk

diff --git a/package/Config.in b/package/Config.in
index 6f3384c736..5e48ab7ee0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -416,6 +416,7 @@ source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/nfs-utils/Config.in"
+source "package/ngircd/Config.in"
 source "package/ntp/Config.in"
 source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in
new file mode 100644
index 0000000000..e8fc3d0569
--- /dev/null
+++ b/package/ngircd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_NGIRCD
+	bool "ngircd"
+	select BR2_PACKAGE_ZLIB
+	help
+	  Next Generation IRC server deamon.
+
+	  http://ngircd.barton.de
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
new file mode 100644
index 0000000000..d2aed23a3f
--- /dev/null
+++ b/package/ngircd/ngircd.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# ngIRCd: Next Generation IRC Daemon
+#
+#############################################################
+
+NGIRCD_VERSION = 17.1
+NGIRCD_SITE = ftp://ftp.berlios.de/pub/ngircd/
+NGIRCD_DEPENDENCIES = zlib
+
+$(eval $(call AUTOTARGETS,package,ngircd))

From e46ba3c65bb76de30e6534a5552db7562c354d3a Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Fri, 6 May 2011 08:47:55 +0100
Subject: [PATCH 0205/6849] sh: Only use the CodeSourcery toolchain for SH4A
 devices

The CodeSourcery toolchain listed is only for SH4A devices.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ca9892b10a..c95945f9e8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -88,7 +88,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "CodeSoucery SH 2010.09"
-	depends on BR2_sh
+	depends on BR2_sh4 || BR2_sh4eb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help

From 8451c2329e000baf64c986889e8d5b3ac1c8d698 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 6 May 2011 16:14:54 +0200
Subject: [PATCH 0206/6849] CHANGES: #2131 is resolved

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 0b1189861c..3678d235ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#2131: Add OpenMP support to the toolchain
 	#3379: New Package: bonnie++
 	#3445: Not working openssl-10.0.0d on 386sx
 	#3451: fakeroot package: wrong FAKEROOT_SITE variable

From c59d0247541a85c62227b79d4fdb77405c4e6c99 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 8 May 2011 18:52:27 +0200
Subject: [PATCH 0207/6849] external-toolchain: fix support

The recent commit adding the external toolchain wrapper has broken the
support for external toolchain. The check_arm_eabi, check_cplusplus
and check_cross_compiler_exists functions were using TARGET_CC, which
points to the toolchain wrapper, but at the moment those functions are
called, the wrapper hasn't been generated yet.

We fix this by passing to these functions the path to the C or C++
compiler they should use for their tests.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk                     | 17 +++++++++++++----
 toolchain/toolchain-external/ext-tool.mk |  7 ++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index db7c7f1c5f..13dbebbee8 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -201,8 +201,11 @@ check_uclibc = \
 # Check that the Buildroot configuration of the ABI matches the
 # configuration of the external toolchain.
 #
+# $1: cross-gcc path
+#
 check_arm_abi = \
-	EXT_TOOLCHAIN_TARGET=$(shell LANG=C $(TARGET_CC) -v 2>&1 | grep ^Target | cut -f2 -d ' ') ; \
+	__CROSS_CC=$(strip $1) ; \
+	EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \
 	if echo $${EXT_TOOLCHAIN_TARGET} | grep -q 'eabi$$' ; then \
 		EXT_TOOLCHAIN_ABI="eabi" ; \
 	else \
@@ -220,8 +223,11 @@ check_arm_abi = \
 #
 # Check that the external toolchain supports C++
 #
+# $1: cross-g++ path
+#
 check_cplusplus = \
-	$(TARGET_CXX) -v > /dev/null 2>&1 ; \
+	__CROSS_CXX=$(strip $1) ; \
+	$${__CROSS_CXX} -v > /dev/null 2>&1 ; \
 	if test $$? -ne 0 ; then \
 		echo "C++ support is selected but is not available in external toolchain" ; \
 		exit 1 ; \
@@ -230,9 +236,12 @@ check_cplusplus = \
 #
 # Check that the cross-compiler given in the configuration exists
 #
+# $1: cross-gcc path
+#
 check_cross_compiler_exists = \
-	$(TARGET_CC) -v > /dev/null 2>&1 ; \
+	__CROSS_CC=$(strip $1) ; \
+	$${__CROSS_CC} -v > /dev/null 2>&1 ; \
 	if test $$? -ne 0 ; then \
-		echo "Cannot execute cross-compiler '$(TARGET_CC)'" ; \
+		echo "Cannot execute cross-compiler '$${__CROSS_CC}'" ; \
 		exit 1 ; \
 	fi
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 328f9088fa..6f5de81ebb 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -122,6 +122,7 @@ endif
 
 TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
+TOOLCHAIN_EXTERNAL_CXX=$(TOOLCHAIN_EXTERNAL_CROSS)g++
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \
 	-DBR_CROSS_PATH='"$(TOOLCHAIN_EXTERNAL_BIN)/"' \
 	-DBR_SYSROOT='"$(STAGING_DIR)"'
@@ -201,7 +202,7 @@ $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 # type of C library and all C library features.
 $(STAMP_DIR)/ext-toolchain-checked:
 	@echo "Checking external toolchain settings"
-	$(Q)$(call check_cross_compiler_exists)
+	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)SYSROOT_DIR=`$(TOOLCHAIN_EXTERNAL_CC) -print-sysroot 2>/dev/null` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		SYSROOT_DIR=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
@@ -211,10 +212,10 @@ $(STAMP_DIR)/ext-toolchain-checked:
 		exit 1 ; \
 	fi ; \
 	if test x$(BR2_arm) == x"y" ; then \
-		$(call check_arm_abi) ; \
+		$(call check_arm_abi,$(TOOLCHAIN_EXTERNAL_CC)) ; \
 	fi ; \
 	if test x$(BR2_INSTALL_LIBSTDCPP) == x"y" ; then \
-		$(call check_cplusplus) ; \
+		$(call check_cplusplus,$(TOOLCHAIN_EXTERNAL_CXX)) ; \
 	fi ; \
 	if test x$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC) == x"y" ; then \
 		$(call check_uclibc,$${SYSROOT_DIR}) ; \

From 726b15f64a10b2886c9b1bfe484f4cc7a71ea79e Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Thu, 30 Sep 2010 14:57:53 +0200
Subject: [PATCH 0208/6849] Create menu entry to select device creation method

Four methods for the creation of device files in /dev are now
proposed:

 - static method uses device table as before
 - devtmpfs method enables this feature in kernel
 - mdev method adds mdev starting script to the file system
    and selects mdev itself for installation
 - udev method selects udev for installation

All dynamic methods are based on devtmpfs, so one doesn't need to care
about /dev folder.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/Config.in               | 33 +++++++++++++++++++++++++++------
 linux/linux.mk             |  7 +++++++
 package/busybox/S10mdev    | 20 ++++++++++++++++++++
 package/busybox/busybox.mk | 15 +++++++++++++++
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 package/busybox/S10mdev

diff --git a/fs/Config.in b/fs/Config.in
index 188e8155be..9ac3accd82 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -15,13 +15,34 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
 	  only argument. Make sure the exit code of that script is 0,
 	  otherwise make will stop after calling it.
 
+choice
+	prompt "/dev management"
+	default BR2_ROOTFS_DEVICE_CREATION_STATIC
+
+config BR2_ROOTFS_DEVICE_CREATION_STATIC
+	bool "Static using device table"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
+	bool "Dynamic using devtmpfs only"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
+	bool "Dynamic using mdev"
+	select BR2_PACKAGE_BUSYBOX
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	bool "Dynamic using udev"
+	select BR2_PACKAGE_UDEV
+
+endchoice
+
 config BR2_ROOTFS_DEVICE_TABLE
-       string "Path to the device table"
-       default "target/generic/device_table.txt"
-       help
-         Specify the location of a device table, that will be passed
-         to the makedevs utility to create all the special device
-         files in the target filesystem.
+	string "Path to the device table"
+	depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
+	default "target/generic/device_table.txt"
+	help
+	  Specify the location of a device table, that will be passed
+	  to the makedevs utility to create all the special device
+	  files in the target filesystem.
 
 choice
 	prompt "Root FS skeleton"
diff --git a/linux/linux.mk b/linux/linux.mk
index 90dc1dcb98..43ca87b9f7 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -133,6 +133,13 @@ ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 	$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
 	$(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
+endif
+ifneq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)
+endif
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
+	$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
 endif
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
 	$(Q)touch $@
diff --git a/package/busybox/S10mdev b/package/busybox/S10mdev
new file mode 100644
index 0000000000..d2643d0234
--- /dev/null
+++ b/package/busybox/S10mdev
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Start mdev....
+#
+
+case "$1" in
+  start)
+	echo "Starting mdev..."
+	/sbin/mdev -s
+	;;
+  stop)
+	;;
+  restart|reload)
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index ffd66679ea..711d11b0f7 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -28,6 +28,19 @@ ifndef BUSYBOX_CONFIG_FILE
 	BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
 endif
 
+# If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
+define BUSYBOX_INSTALL_MDEV_SCRIPT
+	install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d
+endef
+define BUSYBOX_SET_MDEV
+	$(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
 # If we have external syslogd, force busybox to use it
 ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
 define BUSYBOX_SET_SYSKLOGD
@@ -122,6 +135,7 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_SET_IPV6)
 	$(BUSYBOX_SET_RPC)
 	$(BUSYBOX_PREFER_STATIC)
+	$(BUSYBOX_SET_MDEV)
 	$(BUSYBOX_NETKITBASE)
 	$(BUSYBOX_NETKITTELNET)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -138,6 +152,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
 		$(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
 			$(TARGET_DIR)/usr/share/udhcpc/default.script; \
 	fi
+	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
 endef
 
 define BUSYBOX_UNINSTALL_TARGET_CMDS

From ca520507fc15a8213334a76339a3e6d567e91ea0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Mar 2011 14:52:37 +0100
Subject: [PATCH 0209/6849] Simplify udev startup script

The S10udev startup script did useless things such as mounting sysfs,
mounting a tmpfs filesystem in /dev/, etc. Those things are already
done during in the default inittab.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/S10udev | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/package/udev/S10udev b/package/udev/S10udev
index 6418f63cbc..0d2a23afa5 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -16,12 +16,6 @@
 #	/dev/zero, /dev/null -- that's needed to boot and run this script.
 #
 
-# old kernels don't use udev
-case $(uname -r) in
-    2.6*|2.7*)	;;
-    *)		exit 0;;
-esac
-
 # Check for missing binaries
 UDEV_BIN=/sbin/udevd
 test -x $UDEV_BIN || exit 5
@@ -33,41 +27,13 @@ UDEV_CONFIG=/etc/udev/udev.conf
 test -r $UDEV_CONFIG || exit 6
 . $UDEV_CONFIG
 
-# Directory where sysfs is mounted
-SYSFS_DIR=/sys
-
 case "$1" in
     start)
-        # mount sysfs if it's not yet mounted
-        if [ ! -d $SYSFS_DIR ]; then
-	    echo "${0}: SYSFS_DIR \"$SYSFS_DIR\" not found"
-	    exit 1
-        fi
-        grep -q "^sysfs $SYSFS_DIR" /proc/mounts ||
-	mount -t sysfs /sys /sys ||
-	exit 1
-
-        # mount $udev_root as ramfs if it's not yet mounted
-        # we know 2.6 kernels always support ramfs
-        if [ ! -d $udev_root ]; then
-	    echo "${0}: udev_root \"$udev_root\" not found"
-	    exit 1
-        fi
-        grep -q "^udev $udev_root" /proc/mounts ||
-	mount -t ramfs udev $udev_root ||
-	exit 1
-
-        mkdir $udev_root/pts $udev_root/shm
         mknod -m 0666 /dev/null c 1 3
-        mknod -m 0666 /dev/zero c 1 5
-        mknod -m 0600 /dev/console c 5 1
-
-        # populate /dev (normally)
         echo -n "Populating $udev_root using udev: "
         echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
         $UDEV_BIN -d || (echo "FAIL" && exit 1)
 	$UDEVSTART_BIN || (echo "FAIL" && exit 1)
-	mount -t devpts /dev/pts /dev/pts || (echo "FAIL" && exit 1)
         echo "done"
         ;;
     stop)

From 4e005c47e535fcde9bff04699774bde36f358b38 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Mar 2011 14:52:54 +0100
Subject: [PATCH 0210/6849] Allow several device tables and split in two parts
 our device table

This allows to have a device table for all directories/files and
another device table for the device files themselves. Both are needed
for static /dev, but only the first one is needed when
devtmpfs/mdev/udev are used.

We take this opportunity to move the documentation of the device table
format in a common location, package/makedevs/README.

[Peter: simplify code slightly, fix indentation]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/Config.in                        |  20 ++-
 fs/common.mk                        |  10 +-
 package/makedevs/README             |  35 ++++++
 target/generic/device_table.txt     | 187 ++--------------------------
 target/generic/device_table_dev.txt | 143 +++++++++++++++++++++
 5 files changed, 209 insertions(+), 186 deletions(-)
 create mode 100644 package/makedevs/README
 create mode 100644 target/generic/device_table_dev.txt

diff --git a/fs/Config.in b/fs/Config.in
index 9ac3accd82..6f0f82ba2f 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -36,13 +36,21 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 endchoice
 
 config BR2_ROOTFS_DEVICE_TABLE
-	string "Path to the device table"
-	depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
-	default "target/generic/device_table.txt"
+	string "Path to the device tables"
+	default "target/generic/device_table.txt target/generic/device_table_dev.txt" \
+		if BR2_ROOTFS_DEVICE_CREATION_STATIC
+	default "target/generic/device_table.txt" \
+		if (BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV || \
+		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
+		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS)
 	help
-	  Specify the location of a device table, that will be passed
-	  to the makedevs utility to create all the special device
-	  files in the target filesystem.
+	  Specify a space-separated list of device table locations,
+	  that will be passed to the makedevs utility to create all
+	  the special device files and assign correct owners and
+	  permissions on various files in the target filesystem.
+
+	  See package/makedevs/README for details on the usage and
+	  syntax of these files.
 
 choice
 	prompt "Root FS skeleton"
diff --git a/fs/common.mk b/fs/common.mk
index 92be00cc0c..4d5051460d 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -32,7 +32,8 @@
 # macro will automatically generate a compressed filesystem image.
 
 FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
-ROOTFS_DEVICE_TABLE = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
+FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
+ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
 
 define ROOTFS_TARGET_INTERNAL
 
@@ -46,13 +47,14 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	touch $(BUILD_DIR)/.fakeroot.00000
 	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
-ifneq ($(ROOTFS_DEVICE_TABLE),)
-	echo "$(HOST_DIR)/usr/bin/makedevs -d $(ROOTFS_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+ifneq ($(ROOTFS_DEVICE_TABLES),)
+	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
+	echo "$(HOST_DIR)/usr/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 endif
 	echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)
 	chmod a+x $(FAKEROOT_SCRIPT)
 	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
-	-@rm -f $(FAKEROOT_SCRIPT)
+	-@rm -f $(FAKEROOT_SCRIPT) $(FULL_DEVICE_TABLE)
 	$(foreach hook,$(ROOTFS_$(2)_POST_GEN_HOOKS),$(call $(hook))$(sep))
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
 	gzip -9 -c $$@ > $$@.gz
diff --git a/package/makedevs/README b/package/makedevs/README
new file mode 100644
index 0000000000..6c54052ee2
--- /dev/null
+++ b/package/makedevs/README
@@ -0,0 +1,35 @@
+When building a target filesystem, it is desirable to not have to
+become root and then run 'mknod' a thousand times.  Using a device
+table you can create device nodes and directories "on the fly".
+
+You can do all sorts of interesting things with a device table file.
+For example, if you want to adjust the permissions on a particular
+file you can just add an entry like:
+
+  /sbin/foobar        f       2755    0       0       -       -       -       -       -
+
+and (assuming the file /sbin/foobar exists) it will be made setuid
+root (regardless of what its permissions are on the host filesystem.
+
+Furthermore, you can use a single table entry to create a many device
+minors.  For example, if I wanted to create /dev/hda and
+/dev/hda[0-15] I could just use the following two table entries:
+
+  /dev/hda    b       640     0       0       3       0       0       0       -
+  /dev/hda    b       640     0       0       3       1       1       1       15
+
+Device table entries take the form of:
+
+<name>    <type>      <mode>  <uid>   <gid>   <major> <minor> <start> <inc>   <count>
+
+where name is the file name,  type can be one of:
+
+      f       A regular file
+      d       Directory
+      c       Character special device file
+      b       Block special device file
+      p       Fifo (named pipe)
+
+uid is the user id for the target file, gid is the group id for the
+target file.  The rest of the entries (major, minor, etc) apply only
+to device special files.
diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt
index 38fe1e8e32..12f35b2755 100644
--- a/target/generic/device_table.txt
+++ b/target/generic/device_table.txt
@@ -1,44 +1,15 @@
-# When building a target filesystem, it is desirable to not have to
-# become root and then run 'mknod' a thousand times.  Using a device 
-# table you can create device nodes and directories "on the fly".
+# See package/makedevs/README for details
 #
-# This is a sample device table file for use with genext2fs.  You can
-# do all sorts of interesting things with a device table file.  For
-# example, if you want to adjust the permissions on a particular file
-# you can just add an entry like:
-#   /sbin/foobar        f       2755    0       0       -       -       -       -       -
-# and (assuming the file /sbin/foobar exists) it will be made setuid
-# root (regardless of what its permissions are on the host filesystem.
-# Furthermore, you can use a single table entry to create a many device
-# minors.  For example, if I wanted to create /dev/hda and /dev/hda[0-15]
-# I could just use the following two table entries:
-#   /dev/hda    b       640     0       0       3       0       0       0       -
-#   /dev/hda    b       640     0       0       3       1       1       1       15
-# 
-# Device table entries take the form of:
-# <name>    <type>      <mode>  <uid>   <gid>   <major> <minor> <start> <inc>   <count>
-# where name is the file name,  type can be one of: 
-#       f       A regular file
-#       d       Directory
-#       c       Character special device file
-#       b       Block special device file
-#       p       Fifo (named pipe)
-# uid is the user id for the target file, gid is the group id for the
-# target file.  The rest of the entries (major, minor, etc) apply only 
-# to device special files.
-
-# Have fun
-# -Erik Andersen <andersen@codepoet.org>
+# This device table is used to assign proper ownership and permissions
+# on various files. It doesn't create any device file, as it is used
+# in both static device configurations (where /dev/ is static) and in
+# dynamic configurations (where devtmpfs, mdev or udev are used).
 #
-
-#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-/dev		d	755	0	0	-	-	-	-	-
-/dev/pts	d	755	0	0	-	-	-	-	-
-/dev/shm	d	755	0	0	-	-	-	-	-
-/tmp		d	1777	0	0	-	-	-	-	-
-/etc		d	755	0	0	-	-	-	-	-
-/home/default	d	2755	1000	1000	-	-	-	-	-
-#<name>					<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
+# <name>				<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
+/dev					d	755	0	0	-	-	-	-	-
+/tmp					d	1777	0	0	-	-	-	-	-
+/etc					d	755	0	0	-	-	-	-	-
+/home/default				d	2755	1000	1000	-	-	-	-	-
 /bin/busybox				f	4755	0	0	-	-	-	-	-
 /etc/shadow				f	600	0	0	-	-	-	-	-
 /etc/passwd				f	644	0	0	-	-	-	-	-
@@ -48,140 +19,4 @@
 /etc/network/if-post-down.d		d	755	0	0	-	-	-	-	-
 /usr/share/udhcpc/default.script	f	755	0	0	-	-	-	-	-
 # uncomment this to allow starting x as non-root
-#/usr/X11R6/bin/Xfbdev		f	4755	0	0	-	-	-	-	-
-# Normal system devices
-/dev/mem	c	640	0	0	1	1	0	0	-
-/dev/kmem	c	640	0	0	1	2	0	0	-
-/dev/null	c	666	0	0	1	3	0	0	-
-/dev/zero	c	666	0	0	1	5	0	0	-
-/dev/random	c	666	0	0	1	8	0	0	-
-/dev/urandom	c	666	0	0	1	9	0	0	-
-/dev/ram	b	640	0	0	1	1	0	0	-
-/dev/ram	b	640	0	0	1	0	0	1	4
-/dev/loop	b	640	0	0	7	0	0	1	2
-/dev/rtc	c	640	0	0	10	135	-	-	-
-/dev/console	c	666	0	0	5	1	-	-	-
-/dev/tty	c	666	0	0	5	0	-	-	-
-/dev/tty	c	666	0	0	4	0	0	1	8
-/dev/ttyp	c	666	0	0	3	0	0	1	10
-/dev/ptyp	c       666     0       0       2       0       0       1       10
-/dev/ptmx	c	666	0	0	5	2	-	-	-
-/dev/ttyP	c	666	0	0	57	0	0	1	4
-/dev/ttyS	c	666	0	0	4	64	0	1	4
-/dev/fb		c	640	0	5	29	0	0	1	4
-#/dev/ttySA	c	666	0	0	204	5	0	1	3
-/dev/psaux	c	666	0	0	10	1	0	0	-
-#/dev/ppp	c	666	0	0	108	0	-	-	-
-/dev/ttyAM	c	666	0	0	204	16	0	1	3
-/dev/ttyCPM	c	666	0	0	204	46	0	1	4
-/dev/ttyAMA	c	666	0	0	204	64	0	1	4
-/dev/ttySAC	c	666	0	0	204	64	0	1	4
-/dev/ttySC	c	666	0	0	204	8	0	1	6
-/dev/ttyPSC	c	666	0	0	204	148	0	1	4
-/dev/ttyUL	c	666	0	0	204	187	0	1	4
-/dev/ttymxc	c	666	0	0	207	16	0	1	3
-
-# Input stuff
-/dev/input		d	755	0	0	-	-	-	-	-
-/dev/input/mice		c	640	0	0	13	63	0	0	-
-/dev/input/mouse	c	660	0	0	13	32	0	1	4
-/dev/input/event	c	660	0	0	13	64	0	1	4
-#/dev/input/js		c	660	0	0	13	0	0	1	4
-
-
-# MTD stuff
-/dev/mtd	c	640	0	0	90	0	0	2	4
-/dev/mtdblock	b	640	0	0	31	0	0	1	4
-
-#Tun/tap driver
-/dev/net	d	755	0	0	-	-	-	-	-
-/dev/net/tun	c	660	0	0	10	200	-	-	-
-
-# Audio stuff
-#/dev/audio	c	666	0	29	14	4	-	-	-
-#/dev/audio1	c	666	0	29	14	20	-	-	-
-#/dev/dsp	c	666	0	29	14	3	-	-	-
-#/dev/dsp1	c	666	0	29	14	19	-	-	-
-#/dev/sndstat	c	666	0	29	14	6	-	-	-
-
-# User-mode Linux stuff
-#/dev/ubda	b	640	0	0	98	0	0	0	-
-#/dev/ubda	b	640	0	0	98	1	1	1	15
-
-# IDE Devices
-/dev/hda	b	640	0	0	3	0	0	0	-
-/dev/hda	b	640	0	0	3	1	1	1	15
-/dev/hdb	b	640	0	0	3	64	0	0	-
-/dev/hdb	b	640	0	0	3	65	1	1	15
-#/dev/hdc	b	640	0	0	22	0	0	0	-
-#/dev/hdc	b	640	0	0	22	1	1	1	15
-#/dev/hdd	b	640	0	0	22	64	0	0	-
-#/dev/hdd	b	640	0	0	22	65	1	1	15
-#/dev/hde	b	640	0	0	33	0	0	0	-
-#/dev/hde	b	640	0	0	33	1	1	1	15
-#/dev/hdf	b	640	0	0	33	64	0	0	-
-#/dev/hdf	b	640	0	0	33	65	1	1	15
-#/dev/hdg	b	640	0	0	34	0	0	0	-
-#/dev/hdg	b	640	0	0	34	1	1	1	15
-#/dev/hdh	b	640	0	0	34	64	0	0	-
-#/dev/hdh	b	640	0	0	34	65	1	1	15
-
-# SCSI Devices
-/dev/sda	b	640	0	0	8	0	0	0	-
-/dev/sda	b	640	0	0	8	1	1	1	15
-/dev/sdb	b	640	0	0	8	16	0	0	-
-/dev/sdb	b	640	0	0	8	17	1	1	15
-#/dev/sdc	b	640	0	0	8	32	0	0	-
-#/dev/sdc	b	640	0	0	8	33	1	1	15
-#/dev/sdd	b	640	0	0	8	48	0	0	-
-#/dev/sdd	b	640	0	0	8	49	1	1	15
-#/dev/sde	b	640	0	0	8	64	0	0	-
-#/dev/sde	b	640	0	0	8	65	1	1	15
-#/dev/sdf	b	640	0	0	8	80	0	0	-
-#/dev/sdf	b	640	0	0	8	81	1	1	15
-#/dev/sdg	b	640	0	0	8	96	0	0	-
-#/dev/sdg	b	640	0	0	8	97	1	1	15
-#/dev/sdh	b	640	0	0	8	112	0	0	-
-#/dev/sdh	b	640	0	0	8	113	1	1	15
-#/dev/sg	c	640	0	0	21	0	0	1	15
-#/dev/scd	b	640	0	0	11	0	0	1	15
-#/dev/st	c	640	0	0	9	0	0	1	8
-#/dev/nst	c	640	0	0	9	128	0	1	8
-#/dev/st	c	640	0	0	9	32	1	1	4
-#/dev/st	c	640	0	0	9	64	1	1	4
-#/dev/st	c	640	0	0	9	96	1	1	4
-
-# USB block devices (ub driver)
-/dev/uba	b	640	0	0	180	0	0	0	-
-/dev/uba	b	640	0	0	180	1	1	1	6
-/dev/ubb	b	640	0	0	180	8	0	0	-
-/dev/ubb	b	640	0	0	180	65	1	1	6
-
-# Floppy disk devices
-#/dev/fd	b	640	0	0	2	0	0	1	2
-#/dev/fd0d360	b	640	0	0	2	4	0	0	-
-#/dev/fd1d360	b	640	0	0	2	5	0	0	-
-#/dev/fd0h1200	b	640	0	0	2	8	0	0	-
-#/dev/fd1h1200	b	640	0	0	2	9	0	0	-
-#/dev/fd0u1440	b	640	0	0	2	28	0	0	-
-#/dev/fd1u1440	b	640	0	0	2	29	0	0	-
-#/dev/fd0u2880	b	640	0	0	2	32	0	0	-
-#/dev/fd1u2880	b	640	0	0	2	33	0	0	-
-
-# All the proprietary cdrom devices in the world
-#/dev/aztcd	b	640	0	0	29	0	0	0	-
-#/dev/bpcd	b	640	0	0	41	0	0	0	-
-#/dev/capi20	c	640	0	0	68	0	0	1	2
-#/dev/cdu31a	b	640	0	0	15	0	0	0	-
-#/dev/cdu535	b	640	0	0	24	0	0	0	-
-#/dev/cm206cd	b	640	0	0	32	0	0	0	-
-#/dev/sjcd	b	640	0	0	18	0	0	0	-
-#/dev/sonycd	b	640	0	0	15	0	0	0	-
-#/dev/gscd	b	640	0	0	16	0	0	0	-
-#/dev/sbpcd	b	640	0	0	25	0	0	0	-
-#/dev/sbpcd	b	640	0	0	25	0	0	1	4
-#/dev/mcd	b	640	0	0	23	0	0	0	-
-#/dev/optcd	b	640	0	0	17	0	0	0	-
-
-# I2C device nodes
-/dev/i2c-	c	666	0	0	89	0	0	1	4
+#/usr/X11R6/bin/Xfbdev		     	f	4755	0	0	-	-	-	-	-
diff --git a/target/generic/device_table_dev.txt b/target/generic/device_table_dev.txt
new file mode 100644
index 0000000000..a3d53d460a
--- /dev/null
+++ b/target/generic/device_table_dev.txt
@@ -0,0 +1,143 @@
+# See package/makedevs/README for details
+#
+# This device table is used only to create device files when a static
+# device configuration is used (entries in /dev are static).
+#
+# <name>	<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
+
+# Normal system devices
+/dev/mem	c	640	0	0	1	1	0	0	-
+/dev/kmem	c	640	0	0	1	2	0	0	-
+/dev/null	c	666	0	0	1	3	0	0	-
+/dev/zero	c	666	0	0	1	5	0	0	-
+/dev/random	c	666	0	0	1	8	0	0	-
+/dev/urandom	c	666	0	0	1	9	0	0	-
+/dev/ram	b	640	0	0	1	1	0	0	-
+/dev/ram	b	640	0	0	1	0	0	1	4
+/dev/loop	b	640	0	0	7	0	0	1	2
+/dev/rtc	c	640	0	0	10	135	-	-	-
+/dev/console	c	666	0	0	5	1	-	-	-
+/dev/tty	c	666	0	0	5	0	-	-	-
+/dev/tty	c	666	0	0	4	0	0	1	8
+/dev/ttyp	c	666	0	0	3	0	0	1	10
+/dev/ptyp	c       666     0       0       2       0       0       1       10
+/dev/ptmx	c	666	0	0	5	2	-	-	-
+/dev/ttyP	c	666	0	0	57	0	0	1	4
+/dev/ttyS	c	666	0	0	4	64	0	1	4
+/dev/fb		c	640	0	5	29	0	0	1	4
+#/dev/ttySA	c	666	0	0	204	5	0	1	3
+/dev/psaux	c	666	0	0	10	1	0	0	-
+#/dev/ppp	c	666	0	0	108	0	-	-	-
+/dev/ttyAM	c	666	0	0	204	16	0	1	3
+/dev/ttyCPM	c	666	0	0	204	46	0	1	4
+/dev/ttyAMA	c	666	0	0	204	64	0	1	4
+/dev/ttySAC	c	666	0	0	204	64	0	1	4
+/dev/ttySC	c	666	0	0	204	8	0	1	6
+/dev/ttyPSC	c	666	0	0	204	148	0	1	4
+/dev/ttyUL	c	666	0	0	204	187	0	1	4
+/dev/ttymxc	c	666	0	0	207	16	0	1	3
+
+# Input stuff
+/dev/input		d	755	0	0	-	-	-	-	-
+/dev/input/mice		c	640	0	0	13	63	0	0	-
+/dev/input/mouse	c	660	0	0	13	32	0	1	4
+/dev/input/event	c	660	0	0	13	64	0	1	4
+#/dev/input/js		c	660	0	0	13	0	0	1	4
+
+
+# MTD stuff
+/dev/mtd	c	640	0	0	90	0	0	2	4
+/dev/mtdblock	b	640	0	0	31	0	0	1	4
+
+#Tun/tap driver
+/dev/net	d	755	0	0	-	-	-	-	-
+/dev/net/tun	c	660	0	0	10	200	-	-	-
+
+# Audio stuff
+#/dev/audio	c	666	0	29	14	4	-	-	-
+#/dev/audio1	c	666	0	29	14	20	-	-	-
+#/dev/dsp	c	666	0	29	14	3	-	-	-
+#/dev/dsp1	c	666	0	29	14	19	-	-	-
+#/dev/sndstat	c	666	0	29	14	6	-	-	-
+
+# User-mode Linux stuff
+#/dev/ubda	b	640	0	0	98	0	0	0	-
+#/dev/ubda	b	640	0	0	98	1	1	1	15
+
+# IDE Devices
+/dev/hda	b	640	0	0	3	0	0	0	-
+/dev/hda	b	640	0	0	3	1	1	1	15
+/dev/hdb	b	640	0	0	3	64	0	0	-
+/dev/hdb	b	640	0	0	3	65	1	1	15
+#/dev/hdc	b	640	0	0	22	0	0	0	-
+#/dev/hdc	b	640	0	0	22	1	1	1	15
+#/dev/hdd	b	640	0	0	22	64	0	0	-
+#/dev/hdd	b	640	0	0	22	65	1	1	15
+#/dev/hde	b	640	0	0	33	0	0	0	-
+#/dev/hde	b	640	0	0	33	1	1	1	15
+#/dev/hdf	b	640	0	0	33	64	0	0	-
+#/dev/hdf	b	640	0	0	33	65	1	1	15
+#/dev/hdg	b	640	0	0	34	0	0	0	-
+#/dev/hdg	b	640	0	0	34	1	1	1	15
+#/dev/hdh	b	640	0	0	34	64	0	0	-
+#/dev/hdh	b	640	0	0	34	65	1	1	15
+
+# SCSI Devices
+/dev/sda	b	640	0	0	8	0	0	0	-
+/dev/sda	b	640	0	0	8	1	1	1	15
+/dev/sdb	b	640	0	0	8	16	0	0	-
+/dev/sdb	b	640	0	0	8	17	1	1	15
+#/dev/sdc	b	640	0	0	8	32	0	0	-
+#/dev/sdc	b	640	0	0	8	33	1	1	15
+#/dev/sdd	b	640	0	0	8	48	0	0	-
+#/dev/sdd	b	640	0	0	8	49	1	1	15
+#/dev/sde	b	640	0	0	8	64	0	0	-
+#/dev/sde	b	640	0	0	8	65	1	1	15
+#/dev/sdf	b	640	0	0	8	80	0	0	-
+#/dev/sdf	b	640	0	0	8	81	1	1	15
+#/dev/sdg	b	640	0	0	8	96	0	0	-
+#/dev/sdg	b	640	0	0	8	97	1	1	15
+#/dev/sdh	b	640	0	0	8	112	0	0	-
+#/dev/sdh	b	640	0	0	8	113	1	1	15
+#/dev/sg	c	640	0	0	21	0	0	1	15
+#/dev/scd	b	640	0	0	11	0	0	1	15
+#/dev/st	c	640	0	0	9	0	0	1	8
+#/dev/nst	c	640	0	0	9	128	0	1	8
+#/dev/st	c	640	0	0	9	32	1	1	4
+#/dev/st	c	640	0	0	9	64	1	1	4
+#/dev/st	c	640	0	0	9	96	1	1	4
+
+# USB block devices (ub driver)
+/dev/uba	b	640	0	0	180	0	0	0	-
+/dev/uba	b	640	0	0	180	1	1	1	6
+/dev/ubb	b	640	0	0	180	8	0	0	-
+/dev/ubb	b	640	0	0	180	65	1	1	6
+
+# Floppy disk devices
+#/dev/fd	b	640	0	0	2	0	0	1	2
+#/dev/fd0d360	b	640	0	0	2	4	0	0	-
+#/dev/fd1d360	b	640	0	0	2	5	0	0	-
+#/dev/fd0h1200	b	640	0	0	2	8	0	0	-
+#/dev/fd1h1200	b	640	0	0	2	9	0	0	-
+#/dev/fd0u1440	b	640	0	0	2	28	0	0	-
+#/dev/fd1u1440	b	640	0	0	2	29	0	0	-
+#/dev/fd0u2880	b	640	0	0	2	32	0	0	-
+#/dev/fd1u2880	b	640	0	0	2	33	0	0	-
+
+# All the proprietary cdrom devices in the world
+#/dev/aztcd	b	640	0	0	29	0	0	0	-
+#/dev/bpcd	b	640	0	0	41	0	0	0	-
+#/dev/capi20	c	640	0	0	68	0	0	1	2
+#/dev/cdu31a	b	640	0	0	15	0	0	0	-
+#/dev/cdu535	b	640	0	0	24	0	0	0	-
+#/dev/cm206cd	b	640	0	0	32	0	0	0	-
+#/dev/sjcd	b	640	0	0	18	0	0	0	-
+#/dev/sonycd	b	640	0	0	15	0	0	0	-
+#/dev/gscd	b	640	0	0	16	0	0	0	-
+#/dev/sbpcd	b	640	0	0	25	0	0	0	-
+#/dev/sbpcd	b	640	0	0	25	0	0	1	4
+#/dev/mcd	b	640	0	0	23	0	0	0	-
+#/dev/optcd	b	640	0	0	17	0	0	0	-
+
+# I2C device nodes
+/dev/i2c-	c	666	0	0	89	0	0	1	4

From 6e850246252e4978d93469a8998bf8343bab0340 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 10 May 2011 23:43:00 +0200
Subject: [PATCH 0211/6849] haserl: bump 0.9.x version

Fixes off-by-1 buffer overflow.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index ad9a8e91e7..7710fa1c3b 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -38,4 +38,4 @@ endchoice
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.28"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.29"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

From 5db57b7ac9fc8c5bd0bec6e06166443f04870a3a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 12 May 2011 17:07:15 +0200
Subject: [PATCH 0212/6849] qt: hide shared library option if
 BR2_PREFER_STATIC_LIB

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index b223772cfe..eafc855a44 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -23,12 +23,12 @@ config BR2_PACKAGE_QT_DEMOS
 
 choice
 	prompt "Library type"
-	default BR2_PACKAGE_QT_SHARED
 	help
 	  Selects the library type: Shared or Static
 
 config BR2_PACKAGE_QT_SHARED
 	bool "Shared library"
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  Create and use shared Qt libraries.
 	  If you have multiple programs that depend on Qt or intend to use

From 7d9d09db673abbedc1cc865c213b742e0450268d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 12 May 2011 17:15:36 +0200
Subject: [PATCH 0213/6849] target/generic: only show getty port option if
 default skeleton is used

The special marker in etc/inittab might not be present with a custom
skeleton. At the same time make the option always active, remove the
hardcoded tty1/tty2 gettys and reword the option description slightly.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/inittab    | 4 ----
 target/generic/Config.in   | 9 +++------
 target/generic/Makefile.in | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/fs/skeleton/etc/inittab b/fs/skeleton/etc/inittab
index 873db29c7e..b1e5c164e6 100644
--- a/fs/skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
@@ -22,10 +22,6 @@ null::sysinit:/bin/hostname -F /etc/hostname
 # now run any rc scripts
 ::sysinit:/etc/init.d/rcS
 
-# Set up a couple of getty's
-tty1::respawn:/sbin/getty 38400 tty1
-tty2::respawn:/sbin/getty 38400 tty2
-
 # Put a getty on the serial port
 #ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL
 
diff --git a/target/generic/Config.in b/target/generic/Config.in
index c624ba8725..2d2ad4423d 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -12,13 +12,10 @@ config BR2_TARGET_GENERIC_ISSUE
        help
          Select system banner (/etc/issue) to be displayed at login.
 
-menuconfig BR2_TARGET_GENERIC_GETTY
-	bool "Generic serial port config"
-
-if BR2_TARGET_GENERIC_GETTY
+if BR2_ROOTFS_SKELETON_DEFAULT
 
 config BR2_TARGET_GENERIC_GETTY_PORT
-	string "Serial port to run a getty on"
+	string "Port to run a getty (login prompt) on"
 	default "ttyS0"
 	help
 	  Specify a port to run a getty (login prompt) on.
@@ -52,6 +49,6 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
 	default "57600"		if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600
 	default "115200"	if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
 
-endif # BR2_TARGET_GENERIC_GETTY
+endif # BR2_ROOTFS_SKELETON_DEFAULT
 
 endmenu
diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in
index ba6e4b0602..ce07ecfd0f 100644
--- a/target/generic/Makefile.in
+++ b/target/generic/Makefile.in
@@ -31,7 +31,7 @@ ifneq ($(TARGET_GENERIC_ISSUE),)
 TARGETS += target-generic-issue
 endif
 
-ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
+ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
 ifeq ($(BR2_PACKAGE_SYSVINIT),y)
 TARGETS += target-generic-getty-sysvinit
 else

From 8f9537ff5a7148c7a9412ace55c96c6b6a9a3a68 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 May 2011 09:40:26 -0300
Subject: [PATCH 0214/6849] linux: bump 2.6.38 kernel to 2.6.38.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index cfef5bbe7b..ea04c7d97b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_38
 
 config BR2_LINUX_KERNEL_2_6_38
-	bool "2.6.38.5"
+	bool "2.6.38.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.38.5"
+	default "2.6.38.6"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.38.5" if BR2_LINUX_KERNEL_2_6_38
+	default "2.6.38.6" if BR2_LINUX_KERNEL_2_6_38
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 8e92c2dc65e79bd889c30e6cf14900d0c4335b3c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 May 2011 09:39:43 -0300
Subject: [PATCH 0215/6849] toolchain: bump 2.6.38 headers to 2.6.38.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 6bf4d6fe37..da6f1c3fc7 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -46,6 +46,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.35.13"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.5"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.38.6"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From c7fbb8bc89649947abb8588c21b00676f40bd03f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 May 2011 09:39:44 -0300
Subject: [PATCH 0216/6849] configs: bump 2.6.38 kernels to 2.6.38.6

Bump kernel versions of qemu/mips-malta and qemu/arm-versatile sample
configuration files to 2.6.38.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 configs/qemu_mipsel_malta_defconfig  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 1a1a0ff1cc..6274b686c0 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 0523a14519..64ce976cd5 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-2.6.38.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 635b6a17ddd407c8c099752d6cc6950d4da26d88 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 12 May 2011 21:41:53 +0200
Subject: [PATCH 0217/6849] dropbear: remove shared config.cache workaround

Now that the shared config.cache handling has been removed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index fab7c96789..b36c278a29 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -9,11 +9,6 @@ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_DEPENDENCIES = zlib
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
-# configure misdetects this as no, but the result is not used for
-# anything. Unfortunately it breaks the build for other packages also
-# checking for struct sockaddr_storage when using a shared config
-# cache, so force it to yes
-DROPBEAR_CONF_ENV = ac_cv_type_struct_sockaddr_storage=yes
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \
 		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
 

From e23a4bc752e1f95ba6c2e504124aac8aecb0faf7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 12 May 2011 23:37:35 +0200
Subject: [PATCH 0218/6849] Move rootfs content options under system
 configuration

Instead of the current mix between system config and filesystem menus.

At the same time rename 'Target filesystem options' menu to
'Filesystem images' as it now only contains options about image formats.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/Config.in             | 77 +---------------------------------------
 target/generic/Config.in | 75 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/fs/Config.in b/fs/Config.in
index 6f0f82ba2f..94154ea811 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -1,79 +1,4 @@
-menu "Target filesystem options"
-
-config BR2_ROOTFS_POST_BUILD_SCRIPT
-	string "Custom script to run before packing files"
-	default ""
-	help
-	  Specify a script to be run after the build has finished and before
-	  the BR2 starts packing the files into selected packages.
-
-	  This gives users the oportunity to do board-specific cleanups,
-	  add-ons and the like, so the generated files can be used directly
-	  without further processing.
-
-	  The script is called with the target directory name as first and
-	  only argument. Make sure the exit code of that script is 0,
-	  otherwise make will stop after calling it.
-
-choice
-	prompt "/dev management"
-	default BR2_ROOTFS_DEVICE_CREATION_STATIC
-
-config BR2_ROOTFS_DEVICE_CREATION_STATIC
-	bool "Static using device table"
-
-config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
-	bool "Dynamic using devtmpfs only"
-
-config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
-	bool "Dynamic using mdev"
-	select BR2_PACKAGE_BUSYBOX
-
-config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
-	bool "Dynamic using udev"
-	select BR2_PACKAGE_UDEV
-
-endchoice
-
-config BR2_ROOTFS_DEVICE_TABLE
-	string "Path to the device tables"
-	default "target/generic/device_table.txt target/generic/device_table_dev.txt" \
-		if BR2_ROOTFS_DEVICE_CREATION_STATIC
-	default "target/generic/device_table.txt" \
-		if (BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV || \
-		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
-		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS)
-	help
-	  Specify a space-separated list of device table locations,
-	  that will be passed to the makedevs utility to create all
-	  the special device files and assign correct owners and
-	  permissions on various files in the target filesystem.
-
-	  See package/makedevs/README for details on the usage and
-	  syntax of these files.
-
-choice
-	prompt "Root FS skeleton"
-
-config BR2_ROOTFS_SKELETON_DEFAULT
-	bool "default target skeleton"
-	help
-	  Use default target skeleton
-
-config BR2_ROOTFS_SKELETON_CUSTOM
-	bool "custom target skeleton"
-	help
-	  Use custom target skeleton.
-
-endchoice
-
-if BR2_ROOTFS_SKELETON_CUSTOM
-config BR2_ROOTFS_SKELETON_CUSTOM_PATH
-	string "custom target skeleton path"
-	default "fs/skeleton"
-	help
-	  Path custom target skeleton.
-endif
+menu "Filesystem images"
 
 source "fs/cramfs/Config.in"
 source "fs/cloop/Config.in"
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 2d2ad4423d..4969fcdc44 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -12,6 +12,66 @@ config BR2_TARGET_GENERIC_ISSUE
        help
          Select system banner (/etc/issue) to be displayed at login.
 
+choice
+	prompt "/dev management"
+	default BR2_ROOTFS_DEVICE_CREATION_STATIC
+
+config BR2_ROOTFS_DEVICE_CREATION_STATIC
+	bool "Static using device table"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
+	bool "Dynamic using devtmpfs only"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
+	bool "Dynamic using mdev"
+	select BR2_PACKAGE_BUSYBOX
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	bool "Dynamic using udev"
+	select BR2_PACKAGE_UDEV
+
+endchoice
+
+config BR2_ROOTFS_DEVICE_TABLE
+	string "Path to the device tables"
+	default "target/generic/device_table.txt target/generic/device_table_dev.txt" \
+		if BR2_ROOTFS_DEVICE_CREATION_STATIC
+	default "target/generic/device_table.txt" \
+		if (BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV || \
+		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
+		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS)
+	help
+	  Specify a space-separated list of device table locations,
+	  that will be passed to the makedevs utility to create all
+	  the special device files and assign correct owners and
+	  permissions on various files in the target filesystem.
+
+	  See package/makedevs/README for details on the usage and
+	  syntax of these files.
+
+choice
+	prompt "Root FS skeleton"
+
+config BR2_ROOTFS_SKELETON_DEFAULT
+	bool "default target skeleton"
+	help
+	  Use default target skeleton
+
+config BR2_ROOTFS_SKELETON_CUSTOM
+	bool "custom target skeleton"
+	help
+	  Use custom target skeleton.
+
+endchoice
+
+if BR2_ROOTFS_SKELETON_CUSTOM
+config BR2_ROOTFS_SKELETON_CUSTOM_PATH
+	string "custom target skeleton path"
+	default "fs/skeleton"
+	help
+	  Path custom target skeleton.
+endif
+
 if BR2_ROOTFS_SKELETON_DEFAULT
 
 config BR2_TARGET_GENERIC_GETTY_PORT
@@ -51,4 +111,19 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
 
 endif # BR2_ROOTFS_SKELETON_DEFAULT
 
+config BR2_ROOTFS_POST_BUILD_SCRIPT
+	string "Custom script to run before creating filesystem images"
+	default ""
+	help
+	  Specify a script to be run after the build has finished and before
+	  Buildroot starts packing the files into selected filesystem images.
+
+	  This gives users the oportunity to do board-specific cleanups,
+	  add-ons and the like, so the generated files can be used directly
+	  without further processing.
+
+	  The script is called with the target directory name as first and
+	  only argument. Make sure the exit code of that script is 0,
+	  otherwise make will stop after calling it.
+
 endmenu

From b9d4ab0056c3b8135fc89c25995e16dd937b99db Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 13 May 2011 09:30:41 +0200
Subject: [PATCH 0219/6849] avahi: ensure locale data is installed into
 /usr/share, not /usr/lib v2

Was fixed in 0201ffcd1624, but nowadays avahi uses DATADIRNAME rather
than DATADIR.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 4dfa3547aa..fdf039086a 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -64,7 +64,7 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
 		jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no \
 		avahi_cv_sys_cxx_works=yes \
-		DATADIR=share
+		DATADIRNAME=share
 
 AVAHI_CONF_OPT = --localstatedir=/var \
 		--disable-qt3 \

From e89b2626797bc25c415914491339b14defc091e7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 13 May 2011 11:38:43 +0200
Subject: [PATCH 0220/6849] external-toolchain: Add ARM CodeSourcery 2011.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c95945f9e8..8e3f7989cf 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,20 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
+	bool "CodeSourcery ARM 2011.03"
+	depends on BR2_arm
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the ARM architecture, from CodeSourcery. It
+	  uses gcc 4.5.2, binutils 2.20.51, glibc 2.13 and gdb 7.2.50,
+	  kernel headers 2.6.38. It has support for the following
+	  variants:
+            - ARMv5TE, little endian, soft-float, glibc
+            - ARMv4T, little endian, soft-float, glibc
+            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	bool "CodeSourcery ARM 2010.09"
 	depends on BR2_arm
@@ -135,6 +149,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
+	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6f5de81ebb..53fff614c6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -171,6 +171,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package7851/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
+TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package8739/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From e7e0d0771c3e6d962fc4a336e1fa7a709e6635b0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 13 May 2011 11:41:40 +0200
Subject: [PATCH 0221/6849] external-toolchain: Add MIPS CodeSourcery 2011.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 24 ++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 8e3f7989cf..079c097aa6 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -59,6 +59,29 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
+	bool "CodeSourcery MIPS 2011.03"
+	depends on BR2_mips || BR2_mipsel
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the MIPS architecture, from CodeSourcery. It
+	  uses gcc 4.5.2, binutils 2.20.51, glibc 2.13, uClibc 0.9.30
+	  and gdb 7.2.50, kernel headers 2.6.38. It has support for
+	  the following variants:
+            - MIPS32 O32 big endian glibc
+            - MIPS32 O32 little endian glibc
+            - MIPS32 big endian soft float glibc
+            - MIPS32 little endian soft float glibc
+            - MIPS32 big endian microMIPS glibc
+            - MIPS32 little endian microMIPS glibc
+            - MIPS32 big endian soft float microMIPS glibc
+            - MIPS32 little endian soft float microMIPS glibc
+            - MIPS32 big endian uclibc
+            - MIPS32 little endian uclibc
+            - MIPS32 big endian soft float uclibc
+            - MIPS32 little endian soft float uclibc
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	bool "CodeSourcery MIPS 4.4"
 	depends on BR2_mips || BR2_mipsel
@@ -151,6 +174,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
+	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 53fff614c6..6d12ba7d3a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -177,6 +177,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
+TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/mips/portal/package8715/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-53-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From b8e52c47d7dd992595de0177d332323162313735 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sun, 1 May 2011 14:37:42 +0200
Subject: [PATCH 0222/6849] dropbear: fix static link for version 0.53.1

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dropbear-0.53.1-static_build_fix.patch    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/dropbear/dropbear-0.53.1-static_build_fix.patch

diff --git a/package/dropbear/dropbear-0.53.1-static_build_fix.patch b/package/dropbear/dropbear-0.53.1-static_build_fix.patch
new file mode 100644
index 0000000000..0e0a91a27e
--- /dev/null
+++ b/package/dropbear/dropbear-0.53.1-static_build_fix.patch
@@ -0,0 +1,26 @@
+dropbear: fix static build
+
+the -lcrypt is missing during the link
+
+svr-authpasswd.o: In function `svr_auth_password':
+svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
+collect2: ld returned 1 exit status
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -77,7 +77,7 @@ STRIP=@STRIP@
+ INSTALL=@INSTALL@
+ CPPFLAGS=@CPPFLAGS@
+ CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+-LIBS+=@LIBS@
++LIBS+=@CRYPTLIB@ @LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
+ EXEEXT=@EXEEXT@

From 7fec8e8b753a77f4635dfa74819bb75354b90ee1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 13 May 2011 12:04:10 +0200
Subject: [PATCH 0223/6849] dropbear: link statically if BR2_PREFER_STATIC_LIB

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index b36c278a29..d73e993466 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -12,6 +12,10 @@ DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \
 		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+DROPBEAR_MAKE += STATIC=1
+endif
+
 define DROPBEAR_FIX_XAUTH
 	$(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h
 endef

From 29a07684527d922d3896b70a832f16c6c2b763a3 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Thu, 12 May 2011 16:12:40 -0400
Subject: [PATCH 0224/6849] ffmpeg: disable altivec optimizations for PPC CPUs
 lacking it

[Peter: use positive logic]
Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 1e8f09a302..1c6e734d14 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -142,6 +142,14 @@ endif
 ifeq ($(BR2_cortex_a8),y)
 FFMPEG_CONF_OPT += --enable-neon
 endif
+# Set powerpc altivec appropriately
+ifeq ($(BR2_powerpc),y)
+ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)
+FFMPEG_CONF_OPT -= --enable-altivec
+else
+FFMPEG_CONF_OPT += --disable-altivec
+endif
+endif
 
 FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 

From 7ed1f1e3cd12b38dd4defc2f33744df40d772705 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Thu, 12 May 2011 16:47:18 -0400
Subject: [PATCH 0225/6849] ffmpeg: ffmpeg binary requires swscale

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index 7a9513c092..d11233e947 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -27,6 +27,7 @@ config BR2_PACKAGE_FFMPEG_NONFREE
 
 config BR2_PACKAGE_FFMPEG_FFMPEG
 	bool "Build ffmpeg (the command line application)"
+	select BR2_PACKAGE_FFMPEG_SWSCALE
 	default y
 	help
          FFmpeg is a very fast video and audio converter.

From dcad5235a944c2c675f35ac918ada767a4149bee Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 13 May 2011 15:12:25 +0200
Subject: [PATCH 0226/6849] ffmpeg: only build documentation if requested

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 1c6e734d14..2c82da84b4 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -13,6 +13,7 @@ FFMPEG_CONF_OPT = \
 	--prefix=/usr		\
 	--enable-shared 	\
 	--disable-avfilter	\
+	$(if $(BR2_HAVE_DOCUMENTATION),,--disable-doc)
 
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 FFMPEG_CONF_OPT += --enable-gpl

From 120f093fd2d4761acdbfaf2f5d86fe1210fde628 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Fri, 13 May 2011 08:54:05 -0400
Subject: [PATCH 0227/6849] ffmpeg: Version bump to 0.6.3

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 2c82da84b4..172bfc0f3b 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FFMPEG_VERSION = 0.6.1
+FFMPEG_VERSION = 0.6.3
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From 80eff666607300578090b8eee5dcd33d947dec82 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 15 May 2011 00:07:28 +0200
Subject: [PATCH 0228/6849] barebox: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7a2e02e447..f3e769f4cf 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BAREBOX_VERSION:=2011.04.0
+BAREBOX_VERSION:=2011.05.0
 BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE:=http://www.barebox.org/download/
 BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION)

From fec53c73cf64106bf7f9d3ec6eb518f08479c6b7 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Thu, 28 Apr 2011 14:15:41 +0200
Subject: [PATCH 0229/6849] kismet: add support for libnl-3.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/kismet-libnl-30-support.patch | 123 +++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 package/kismet/kismet-libnl-30-support.patch

diff --git a/package/kismet/kismet-libnl-30-support.patch b/package/kismet/kismet-libnl-30-support.patch
new file mode 100644
index 0000000000..cf3c845f66
--- /dev/null
+++ b/package/kismet/kismet-libnl-30-support.patch
@@ -0,0 +1,123 @@
+---
+ configure |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 78 insertions(+), 1 deletion(-)
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -601,6 +601,8 @@
+ libnl1_CFLAGS
+ libnl20_LIBS
+ libnl20_CFLAGS
++libnl30_LIBS
++libnl30_CFLAGS
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
+ PKG_CONFIG
+@@ -712,6 +714,8 @@
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
++libnl30_CFLAGS
++libnl30_LIBS
+ libnl20_CFLAGS
+ libnl20_LIBS
+ libnl1_CFLAGS
+@@ -1361,6 +1365,10 @@
+               directories to add to pkg-config's search path
+   PKG_CONFIG_LIBDIR
+               path overriding pkg-config's built-in search path
++  libnl30_CFLAGS
++              C compiler flags for libnl30, overriding pkg-config
++  libnl30_LIBS
++              linker flags for libnl30, overriding pkg-config
+   libnl20_CFLAGS
+               C compiler flags for libnl20, overriding pkg-config
+   libnl20_LIBS
+@@ -6760,6 +6768,75 @@
+ 	fi
+ fi
+
++#libnl-3.0
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl30" >&5
++$as_echo_n "checking for libnl30... " >&6; }
++
++if test -n "$libnl30_CFLAGS"; then
++    pkg_cv_libnl20_CFLAGS="$libnl30_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_libnl30_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++if test -n "$libnl30_LIBS"; then
++    pkg_cv_libnl20_LIBS="$libnl30_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_libnl30_LIBS=`$PKG_CONFIG --libs "libnl-3.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++
++if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        libnl30_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0" 2>&1`
++        else
++	        libnl30_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$libnl30_PKG_ERRORS" >&5
++
++	libnl30=no
++elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	libnl30=no
++else
++	libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS
++	libnl30_LIBS=$pkg_cv_libnl30_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	libnl30=yes
++fi
++
++# libnl-2.0
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5
+ $as_echo_n "checking for libnl20... " >&6; }
+@@ -6897,7 +6974,7 @@
+ $as_echo "yes" >&6; }
+ 	libnl1=yes
+ fi
+-	if test "$libnl20" = "yes"; then
++	if test "$libnl20" = "yes" -o "$libnl30" = "yes"; then
+
+ $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
+
+

From 644d8808d274018a2cc67b35b781dff64d66d3a6 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Thu, 28 Apr 2011 09:23:51 +0200
Subject: [PATCH 0230/6849] iw: add support for libnl-3.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw-libnl-30-support.patch | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/iw/iw-libnl-30-support.patch

diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
new file mode 100644
index 0000000000..48a179fb28
--- /dev/null
+++ b/package/iw/iw-libnl-30-support.patch
@@ -0,0 +1,47 @@
+---
+ Makefile |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -24,6 +24,7 @@
+
+ NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
+ NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
++NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
+
+ ifeq ($(NL1FOUND),Y)
+ NLLIBNAME = libnl-1
+@@ -35,6 +36,12 @@
+ NLLIBNAME = libnl-2.0
+ endif
+
++ifeq ($(NL3FOUND),Y)
++CFLAGS += -DCONFIG_LIBNL20
++LIBS += -lnl-genl
++NLLIBNAME = libnl-3.0
++endif
++
+ ifeq ($(NLLIBNAME),)
+ $(error Cannot find development files for any supported version of libnl)
+ endif
+@@ -53,6 +60,8 @@
+ all: version_check $(ALL)
+
+ version_check:
++ifeq ($(NL3FOUND),Y)
++else
+ ifeq ($(NL2FOUND),Y)
+ else
+ ifeq ($(NL1FOUND),Y)
+@@ -60,6 +69,7 @@
+ 	$(error No libnl found)
+ endif
+ endif
++endif
+
+
+ VERSION_OBJS := $(filter-out version.o, $(OBJS))
+

From 83672c4869251935ffb103fe7e46108b4ae20e93 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 27 Apr 2011 14:59:58 +0200
Subject: [PATCH 0231/6849] libnl: bump to version 3.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl-1.1-flags.patch           | 36 -----------------
 package/libnl/libnl-1.1-minor-leaks.patch     | 40 -------------------
 .../libnl/libnl-1.1-netlink-local-fix.patch   | 19 ---------
 package/libnl/libnl.mk                        |  4 +-
 4 files changed, 2 insertions(+), 97 deletions(-)
 delete mode 100644 package/libnl/libnl-1.1-flags.patch
 delete mode 100644 package/libnl/libnl-1.1-minor-leaks.patch
 delete mode 100644 package/libnl/libnl-1.1-netlink-local-fix.patch

diff --git a/package/libnl/libnl-1.1-flags.patch b/package/libnl/libnl-1.1-flags.patch
deleted file mode 100644
index 8c376dfc75..0000000000
--- a/package/libnl/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f124a6ff6a19d5c6b6709d38dd2ffa8275abbd5f Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 18 Oct 2010 12:16:27 -0300
-Subject: [PATCH] Make libnl.so mode 0755 when installing, and respect LDFLAGS
-
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- lib/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 0bf8af7..0098906 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -48,7 +48,7 @@ all:
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- 	@echo "  LD $(OUT_SLIB)"; \
--	$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- 	@echo "  LN $(OUT_SLIB) $(LN1_SLIB)"; \
- 	rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- 	@echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \
-@@ -65,7 +65,7 @@ distclean:
- 
- install:
- 	mkdir -p $(DESTDIR)$(libdir)/
--	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
-+	install -m 0755 $(OUT_SLIB) $(DESTDIR)$(libdir)
- 	rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
- 	$(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
- 	rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)
--- 
-1.7.2.2
-
diff --git a/package/libnl/libnl-1.1-minor-leaks.patch b/package/libnl/libnl-1.1-minor-leaks.patch
deleted file mode 100644
index 855a6ab391..0000000000
--- a/package/libnl/libnl-1.1-minor-leaks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:49 +0000 (+0100)
-Subject: [LIBNL]: Fix minor memleaks on exit
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=b64f15d6f947839236fa276d473d238f8c9b9d57;hp=e91bb2ffb090955d443e643a25b250bf3d33534a
-
-[LIBNL]: Fix minor memleaks on exit
-
-Make valgrind happy ...
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
-index a12d169..1386cda 100644
---- a/lib/route/route_utils.c
-+++ b/lib/route/route_utils.c
-@@ -63,6 +63,11 @@ static void __init init_routing_table_names(void)
- 	add_routing_table_name(RT_TABLE_LOCAL, "local");
- };
- 
-+static void __exit release_routing_table_names(void)
-+{
-+	__trans_list_clear(&table_names);
-+}
-+
- int rtnl_route_read_table_names(const char *path)
- {
- 	__trans_list_clear(&table_names);
-@@ -104,6 +109,11 @@ static void __init init_proto_names(void)
- 	add_proto_name(RTPROT_STATIC, "static");
- };
- 
-+static void __exit release_proto_names(void)
-+{
-+	__trans_list_clear(&proto_names);
-+}
-+
- int rtnl_route_read_protocol_names(const char *path)
- {
- 	__trans_list_clear(&proto_names);
diff --git a/package/libnl/libnl-1.1-netlink-local-fix.patch b/package/libnl/libnl-1.1-netlink-local-fix.patch
deleted file mode 100644
index 79cda2850f..0000000000
--- a/package/libnl/libnl-1.1-netlink-local-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes the ULONG_MAX definition problem:
-
-In file included from cache.c:43:
-../include/netlink-local.h: In function '__str2type':../include/netlink-local.h:218: error: 'ULONG_MAX' undeclared (first use in this function)
-
-Patch borrowed from OpenEmbedded, recipes/libnl/files/netlink-local-fix.patch.
-
-Index: libnl-1.1/include/netlink-local.h
-===================================================================
---- libnl-1.1.orig/include/netlink-local.h	2009-06-18 15:28:32.614209645 +0400
-+++ libnl-1.1/include/netlink-local.h	2009-06-18 15:28:44.094190518 +0400
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 54b9ff2760..767e957e5f 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-LIBNL_VERSION = 1.1
+LIBNL_VERSION = 3.0
 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
-LIBNL_SITE = http://distfiles.gentoo.org/distfiles
+LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES
 
 define LIBNL_UNINSTALL_TARGET_CMDS

From 3a7495c2fbd1ddc923dcc7074f690ffc1d81c82e Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 27 Apr 2011 10:26:39 +0200
Subject: [PATCH 0232/6849] hostapd: add support for libnl-2.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 4c9506670f..f097e75e68 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -10,6 +10,10 @@ HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
 
+define HOSTAPD_LIBNL_CONFIG
+	echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG)
+endef
+
 define HOSTAPD_CRYPTO_CONFIG
 	echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG)
 	echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG)
@@ -82,6 +86,7 @@ define HOSTAPD_CONFIGURE_CMDS
 	$(HOSTAPD_RADIUS_IPV6_CONFIG)
 	$(HOSTAPD_EAP_CONFIG)
 	$(HOSTAPD_WPS_CONFIG)
+	$(HOSTAPD_LIBNL_CONFIG)
 endef
 
 define HOSTAPD_INSTALL_TARGET_CMDS

From 59af9a8947ccb38ed4eefc02b54efcb1b1c363dd Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 27 Apr 2011 10:28:31 +0200
Subject: [PATCH 0233/6849] wpa_supplicant: add support for libnl-2.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 698e365228..443a358532 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -16,6 +16,7 @@ ifeq ($(BR2_PACKAGE_LIBNL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += libnl
 define WPA_SUPPLICANT_LIBNL_CONFIG
 	$(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
+	echo "CONFIG_LIBNL20=y" >>$(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 

From 80830a198ea80c2afd9f06b1b9bdaba23956e93a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 15 May 2011 21:55:02 +0200
Subject: [PATCH 0234/6849] uClibc: remove AVR32 patches for 0.9.29

The 0.9.29 version of uClibc can no longer be selected on AVR32 since
December 2009 (b642f7eefbf8c7f0111d74528390de31aaacf203). Therefore,
those two patches are now completely useless.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../uClibc/uClibc-0.9.29-arch.patch.avr32     | 3546 -----------------
 .../uClibc-0.9.29-fix-sa_onstack.patch.avr32  |   31 -
 2 files changed, 3577 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-arch.patch.avr32
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-fix-sa_onstack.patch.avr32

diff --git a/toolchain/uClibc/uClibc-0.9.29-arch.patch.avr32 b/toolchain/uClibc/uClibc-0.9.29-arch.patch.avr32
deleted file mode 100644
index d275ac2302..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-arch.patch.avr32
+++ /dev/null
@@ -1,3546 +0,0 @@
-diff --git a/Rules.mak b/Rules.mak
-index d054bbb..55381cf 100644
---- a/Rules.mak
-+++ b/Rules.mak
-@@ -313,6 +313,12 @@ ifeq ($(TARGET_ARCH),frv)
- 	UCLIBC_LDSO=ld.so.1
- endif
- 
-+ifeq ($(strip $(TARGET_ARCH)),avr32)
-+	CPU_CFLAGS-$(CONFIG_AVR32_AP7)	+= -march=ap
-+	CPU_CFLAGS-$(CONFIG_LINKRELAX)	+= -mrelax
-+	CPU_LDFLAGS-$(CONFIG_LINKRELAX)	+= --relax
-+endif
-+
- # Keep the check_gcc from being needlessly executed
- ifndef PIEFLAG
- ifneq ($(UCLIBC_BUILD_PIE),y)
-diff --git a/extra/Configs/Config.avr32 b/extra/Configs/Config.avr32
-new file mode 100644
-index 0000000..8d70e6e
---- /dev/null
-+++ b/extra/Configs/Config.avr32
-@@ -0,0 +1,31 @@
-+#
-+# For a description of the syntax of this configuration file,
-+# see extra/config/Kconfig-language.txt
-+#
-+
-+config TARGET_ARCH
-+	string
-+	default "avr32"
-+
-+config FORCE_OPTIONS_FOR_ARCH
-+	bool
-+	default y
-+	select ARCH_BIG_ENDIAN
-+	select FORCE_SHAREABLE_TEXT_SEGMENTS
-+
-+config ARCH_CFLAGS
-+	string
-+
-+choice
-+	prompt "Target CPU Type"
-+	default CONFIG_AVR32_AP7
-+
-+config CONFIG_AVR32_AP7
-+	bool "AVR32 AP7"
-+	select ARCH_HAS_MMU
-+
-+endchoice
-+
-+config LINKRELAX
-+	bool "Enable linker optimizations"
-+	default y
-diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
-index 8eab394..10c9f7b 100644
---- a/extra/Configs/Config.in
-+++ b/extra/Configs/Config.in
-@@ -16,6 +16,9 @@ config TARGET_alpha
- config TARGET_arm
- 	bool "arm"
- 
-+config TARGET_avr32
-+	bool "avr32"
-+
- config TARGET_bfin
- 	bool "bfin"
- 
-@@ -92,6 +95,10 @@ if TARGET_arm
- source "extra/Configs/Config.arm"
- endif
- 
-+if TARGET_avr32
-+source "extra/Configs/Config.avr32"
-+endif
-+
- if TARGET_bfin
- source "extra/Configs/Config.bfin"
- endif
-diff --git a/extra/Configs/defconfigs/avr32 b/extra/Configs/defconfigs/avr32
-new file mode 100644
-index 0000000..0b890a2
---- /dev/null
-+++ b/extra/Configs/defconfigs/avr32
-@@ -0,0 +1 @@
-+TARGET_avr32=y
-diff --git a/include/elf.h b/include/elf.h
-index 19805d7..ab90160 100644
---- a/include/elf.h
-+++ b/include/elf.h
-@@ -354,6 +354,8 @@ typedef struct
- /* NIOS magic number - no EABI available.  */
- #define EM_NIOS32	0xFEBB
- 
-+#define EM_AVR32	0x18ad
-+
- /* V850 backend magic number.  Written in the absense of an ABI.  */
- #define EM_CYGNUS_V850 0x9080
- 
-@@ -2828,6 +2830,55 @@ typedef Elf32_Addr Elf32_Conflict;
- /* Keep this the last entry.  */
- #define R_V850_NUM		25
- 
-+/* Atmel AVR32 relocations.  */
-+#define R_AVR32_NONE		0
-+#define R_AVR32_32		1
-+#define R_AVR32_16		2
-+#define R_AVR32_8		3
-+#define R_AVR32_32_PCREL	4
-+#define R_AVR32_16_PCREL	5
-+#define R_AVR32_8_PCREL		6
-+#define R_AVR32_DIFF32		7
-+#define R_AVR32_DIFF16		8
-+#define R_AVR32_DIFF8		9
-+#define R_AVR32_GOT32		10
-+#define R_AVR32_GOT16		11
-+#define R_AVR32_GOT8		12
-+#define R_AVR32_21S		13
-+#define R_AVR32_16U		14
-+#define R_AVR32_16S		15
-+#define R_AVR32_8S		16
-+#define R_AVR32_8S_EXT		17
-+#define R_AVR32_22H_PCREL	18
-+#define R_AVR32_18W_PCREL	19
-+#define R_AVR32_16B_PCREL	20
-+#define R_AVR32_16N_PCREL	21
-+#define R_AVR32_14UW_PCREL	22
-+#define R_AVR32_11H_PCREL	23
-+#define R_AVR32_10UW_PCREL	24
-+#define R_AVR32_9H_PCREL	25
-+#define R_AVR32_9UW_PCREL	26
-+#define R_AVR32_HI16		27
-+#define R_AVR32_LO16		28
-+#define R_AVR32_GOTPC		29
-+#define R_AVR32_GOTCALL		30
-+#define R_AVR32_LDA_GOT		31
-+#define R_AVR32_GOT21S		32
-+#define R_AVR32_GOT18SW		33
-+#define R_AVR32_GOT16S		34
-+#define R_AVR32_GOT7UW		35
-+#define R_AVR32_32_CPENT	36
-+#define R_AVR32_CPCALL		37
-+#define R_AVR32_16_CP		38
-+#define R_AVR32_9W_CP		39
-+#define R_AVR32_RELATIVE	40
-+#define R_AVR32_GLOB_DAT	41
-+#define R_AVR32_JMP_SLOT	42
-+#define R_AVR32_ALIGN		43
-+#define R_AVR32_NUM		44
-+
-+/* AVR32 dynamic tags */
-+#define DT_AVR32_GOTSZ		0x70000001 /* Total size of GOT in bytes */
- 
- /* Renesas H8/300 Relocations */
- #define R_H8_NONE       0
-diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
-index 32c5bf8..eb43bd9 100644
---- a/ldso/include/dl-string.h
-+++ b/ldso/include/dl-string.h
-@@ -285,7 +285,8 @@ static __always_inline char * _dl_simple_ltoahex(char * local, unsigned long i)
- /* On some arches constant strings are referenced through the GOT.
-  * This requires that load_addr must already be defined... */
- #if defined(mc68000)  || defined(__arm__) || defined(__thumb__) || \
--    defined(__mips__) || defined(__sh__)  || defined(__powerpc__)
-+    defined(__mips__) || defined(__sh__)  || defined(__powerpc__) || \
-+	defined(__avr32__)
- # define CONSTANT_STRING_GOT_FIXUP(X) \
- 	if ((X) < (const char *) load_addr) (X) += load_addr
- # define NO_EARLY_SEND_STDERR
-diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
-index b42416a..4404219 100644
---- a/ldso/include/dl-syscall.h
-+++ b/ldso/include/dl-syscall.h
-@@ -55,69 +55,69 @@
-    dynamic linking at all, so we cannot return any error codes.
-    We just punt if there is an error. */
- #define __NR__dl_exit __NR_exit
--static inline _syscall1(void, _dl_exit, int, status);
-+static __always_inline _syscall1(void, _dl_exit, int, status);
- 
- #define __NR__dl_close __NR_close
--static inline _syscall1(int, _dl_close, int, fd);
-+static __always_inline _syscall1(int, _dl_close, int, fd);
- 
- #define __NR__dl_open __NR_open
--static inline _syscall3(int, _dl_open, const char *, fn, int, flags,
-+static __always_inline _syscall3(int, _dl_open, const char *, fn, int, flags,
-                         __kernel_mode_t, mode);
- 
- #define __NR__dl_write __NR_write
--static inline _syscall3(unsigned long, _dl_write, int, fd,
-+static __always_inline _syscall3(unsigned long, _dl_write, int, fd,
-                         const void *, buf, unsigned long, count);
- 
- #define __NR__dl_read __NR_read
--static inline _syscall3(unsigned long, _dl_read, int, fd,
-+static __always_inline _syscall3(unsigned long, _dl_read, int, fd,
-                         const void *, buf, unsigned long, count);
- 
- #define __NR__dl_mprotect __NR_mprotect
--static inline _syscall3(int, _dl_mprotect, const void *, addr,
-+static __always_inline _syscall3(int, _dl_mprotect, const void *, addr,
-                         unsigned long, len, int, prot);
- 
- #define __NR__dl_stat __NR_stat
--static inline _syscall2(int, _dl_stat, const char *, file_name,
-+static __always_inline _syscall2(int, _dl_stat, const char *, file_name,
-                         struct stat *, buf);
- 
- #define __NR__dl_fstat __NR_fstat
--static inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf);
-+static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf);
- 
- #define __NR__dl_munmap __NR_munmap
--static inline _syscall2(int, _dl_munmap, void *, start, unsigned long, length);
-+static __always_inline _syscall2(int, _dl_munmap, void *, start, unsigned long, length);
- 
- #ifdef __NR_getxuid
- # define __NR_getuid __NR_getxuid
- #endif
- #define __NR__dl_getuid __NR_getuid
--static inline _syscall0(uid_t, _dl_getuid);
-+static __always_inline _syscall0(uid_t, _dl_getuid);
- 
- #ifndef __NR_geteuid
- # define __NR_geteuid __NR_getuid
- #endif
- #define __NR__dl_geteuid __NR_geteuid
--static inline _syscall0(uid_t, _dl_geteuid);
-+static __always_inline _syscall0(uid_t, _dl_geteuid);
- 
- #ifdef __NR_getxgid
- # define __NR_getgid __NR_getxgid
- #endif
- #define __NR__dl_getgid __NR_getgid
--static inline _syscall0(gid_t, _dl_getgid);
-+static __always_inline _syscall0(gid_t, _dl_getgid);
- 
- #ifndef __NR_getegid
- # define __NR_getegid __NR_getgid
- #endif
- #define __NR__dl_getegid __NR_getegid
--static inline _syscall0(gid_t, _dl_getegid);
-+static __always_inline _syscall0(gid_t, _dl_getegid);
- 
- #ifdef __NR_getxpid
- # define __NR_getpid __NR_getxpid
- #endif
- #define __NR__dl_getpid __NR_getpid
--static inline _syscall0(gid_t, _dl_getpid);
-+static __always_inline _syscall0(gid_t, _dl_getpid);
- 
- #define __NR__dl_readlink __NR_readlink
--static inline _syscall3(int, _dl_readlink, const char *, path, char *, buf,
-+static __always_inline _syscall3(int, _dl_readlink, const char *, path, char *, buf,
-                         size_t, bufsiz);
- 
- #ifdef __UCLIBC_HAS_SSP__
-@@ -146,14 +146,14 @@ static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv,
- #if defined(__UCLIBC_MMAP_HAS_6_ARGS__) && defined(__NR_mmap)
- 
- # define __NR__dl_mmap __NR_mmap
--static inline _syscall6(void *, _dl_mmap, void *, start, size_t, length,
-+static __always_inline _syscall6(void *, _dl_mmap, void *, start, size_t, length,
-                         int, prot, int, flags, int, fd, off_t, offset);
- 
- /* then try mmap2() */
- #elif defined(__NR_mmap2)
- 
- # define __NR___syscall_mmap2       __NR_mmap2
--static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len,
-+static __always_inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len,
-                         int, prot, int, flags, int, fd, off_t, offset);
- 
- /* Some architectures always use 12 as page shift for mmap2() eventhough the
-@@ -164,7 +164,7 @@ static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len,
- # define MMAP2_PAGE_SHIFT 12
- #endif
- 
--static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
-+static __always_inline void * _dl_mmap(void * addr, unsigned long size, int prot,
-                               int flags, int fd, unsigned long offset)
- {
- 	if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
-@@ -177,8 +177,8 @@ static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
- #elif defined(__NR_mmap)
- 
- # define __NR__dl_mmap_real __NR_mmap
--static inline _syscall1(void *, _dl_mmap_real, unsigned long *, buffer);
--static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
-+static __always_inline _syscall1(void *, _dl_mmap_real, unsigned long *, buffer);
-+static __always_inline void * _dl_mmap(void * addr, unsigned long size, int prot,
-                               int flags, int fd, unsigned long offset)
- {
- 	unsigned long buffer[6];
-diff --git a/ldso/ldso/avr32/dl-debug.h b/ldso/ldso/avr32/dl-debug.h
-new file mode 100644
-index 0000000..fe35539
---- /dev/null
-+++ b/ldso/ldso/avr32/dl-debug.h
-@@ -0,0 +1,45 @@
-+/*
-+ * AVR32 ELF shared libary loader support
-+ *
-+ * Copyright (C) 2005-2007 Atmel Corporation
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. The name of the above contributors may not be
-+ *    used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+static const char *_dl_reltypes_tab[] = {
-+    "R_AVR32_NONE",
-+    "R_AVR32_32", "R_AVR32_16", "R_AVR32_8",
-+    "R_AVR32_32_PCREL", "R_AVR32_16_PCREL", "R_AVR32_8_PCREL",
-+    "R_AVR32_DIFF32", "R_AVR32_DIFF16", "R_AVR32_DIFF8",
-+    "R_AVR32_GOT32", "R_AVR32_GOT16", "R_AVR32_GOT8",
-+    "R_AVR32_21S", "R_AVR32_16U", "R_AVR32_16S", "R_AVR32_8S", "R_AVR32_8S_EXT",
-+    "R_AVR32_22H_PCREL", "R_AVR32_18W_PCREL", "R_AVR32_16B_PCREL",
-+    "R_AVR32_16N_PCREL", "R_AVR32_14UW_PCREL", "R_AVR32_11H_PCREL",
-+    "R_AVR32_10UW_PCREL", "R_AVR32_9H_PCREL", "R_AVR32_9UW_PCREL",
-+    "R_AVR32_HI16", "R_AVR32_LO16",
-+    "R_AVR32_GOTPC", "R_AVR32_GOTCALL", "R_AVR32_LDA_GOT",
-+    "R_AVR32_GOT21S", "R_AVR32_GOT18SW", "R_AVR32_GOT16S", "R_AVR32_GOT7UW",
-+    "R_AVR32_32_CPENT", "R_AVR32_CPCALL", "R_AVR32_16_CP", "R_AVR32_9W_CP",
-+    "R_AVR32_RELATIVE", "R_AVR32_GLOB_DAT", "R_AVR32_JMP_SLOT",
-+    "R_AVR32_ALIGN",
-+};
-diff --git a/ldso/ldso/avr32/dl-startup.h b/ldso/ldso/avr32/dl-startup.h
-new file mode 100644
-index 0000000..3b9a641
---- /dev/null
-+++ b/ldso/ldso/avr32/dl-startup.h
-@@ -0,0 +1,112 @@
-+/*
-+ * Architecture specific code used by dl-startup.c
-+ *
-+ * Copyright (C) 2005-2007 Atmel Corporation
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+/* This is the library loader's main entry point. Let _dl_boot2 do its
-+ * initializations and jump to the application's entry point
-+ * afterwards. */
-+asm(	"	.text\n"
-+	"	.global	_start\n"
-+	"	.type	_start,@function\n"
-+	"_start:\n"
-+	/* All arguments are on the stack initially */
-+	"	mov	r12, sp\n"
-+	"	rcall	_dl_start\n"
-+	/* Returns user entry point in r12. Save it. */
-+	"	mov	r0, r12\n"
-+	/* We're PIC, so get the Global Offset Table */
-+	"	lddpc	r6, .L_GOT\n"
-+	".L_RGOT:\n"
-+	"	rsub	r6, pc\n"
-+	/* Adjust argc and argv according to _dl_skip_args */
-+	"	ld.w	r1, r6[_dl_skip_args@got]\n"
-+	"	ld.w	r1, r1[0]\n"
-+	"	ld.w	r2, sp++\n"
-+	"	sub	r2, r1\n"
-+	"	add	sp, sp, r1 << 2\n"
-+	"	st.w	--sp, r2\n"
-+	/* Load the finalizer function */
-+	"	ld.w	r12, r6[_dl_fini@got]\n"
-+	/* Jump to the user's entry point */
-+	"	mov	pc, r0\n\n"
-+
-+	"	.align	2\n"
-+	".L_GOT:"
-+	"	.long	.L_RGOT - _GLOBAL_OFFSET_TABLE_\n"
-+	"	.size	_start, . - _start\n"
-+	"	.previous\n");
-+
-+/* Get a pointer to the argv array.  On many platforms this can be just
-+ * the address if the first argument, on other platforms we need to
-+ * do something a little more subtle here. */
-+#define GET_ARGV(ARGVP, ARGS) ARGVP = ((unsigned long *)ARGS + 1)
-+
-+
-+/* We can't call functions before the GOT has been initialized */
-+#define NO_FUNCS_BEFORE_BOOTSTRAP
-+
-+/*
-+ * Relocate the GOT during dynamic loader bootstrap.  This will add
-+ * the load address to all entries in the GOT, which is necessary
-+ * because the linker doesn't generate R_AVR32_RELATIVE relocs for the
-+ * GOT.
-+ */
-+static __always_inline
-+void PERFORM_BOOTSTRAP_GOT(struct elf_resolve *tpnt)
-+{
-+	Elf32_Addr i, nr_got;
-+	register Elf32_Addr *__r6 __asm__("r6");
-+	Elf32_Addr *got = __r6;
-+
-+	nr_got = tpnt->dynamic_info[DT_AVR32_GOTSZ_IDX] / sizeof(*got);
-+	for (i = 2; i < nr_got; i++)
-+		got[i] += tpnt->loadaddr;
-+}
-+
-+#define PERFORM_BOOTSTRAP_GOT(tpnt) PERFORM_BOOTSTRAP_GOT(tpnt)
-+
-+/* Handle relocation of the symbols in the dynamic loader. */
-+static __always_inline
-+void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr,
-+			     unsigned long symbol_addr,
-+			     unsigned long load_addr, Elf32_Sym *symtab)
-+{
-+	switch(ELF32_R_TYPE(rpnt->r_info)) {
-+	case R_AVR32_NONE:
-+		break;
-+	case R_AVR32_GLOB_DAT:
-+	case R_AVR32_JMP_SLOT:
-+		*reloc_addr = symbol_addr;
-+		break;
-+	case R_AVR32_RELATIVE:
-+		SEND_STDERR_DEBUG("Applying RELATIVE relocation: ");
-+		SEND_ADDRESS_STDERR_DEBUG(load_addr, 0);
-+		SEND_STDERR_DEBUG(" + ");
-+		SEND_ADDRESS_STDERR_DEBUG(rpnt->r_addend, 1);
-+		*reloc_addr = load_addr + rpnt->r_addend;
-+		break;
-+	default:
-+		SEND_STDERR("BOOTSTRAP_RELOC: unhandled reloc_type ");
-+		SEND_NUMBER_STDERR(ELF32_R_TYPE(rpnt->r_info), 1);
-+		SEND_STDERR("REL, SYMBOL, LOAD: ");
-+		SEND_ADDRESS_STDERR(reloc_addr, 0);
-+		SEND_STDERR(", ");
-+		SEND_ADDRESS_STDERR(symbol_addr, 0);
-+		SEND_STDERR(", ");
-+		SEND_ADDRESS_STDERR(load_addr, 1);
-+		_dl_exit(1);
-+	}
-+}
-+
-+/* Transfer control to the user's application, once the dynamic loader
-+ * is done. This routine has to exit the current function, then call
-+ * the _dl_elf_main function.
-+ *
-+ * Since our _dl_boot will simply call whatever is returned by
-+ * _dl_boot2, we can just return the address we're supposed to
-+ * call.  */
-+#define START()	return _dl_elf_main;
-diff --git a/ldso/ldso/avr32/dl-syscalls.h b/ldso/ldso/avr32/dl-syscalls.h
-new file mode 100644
-index 0000000..996bb87
---- /dev/null
-+++ b/ldso/ldso/avr32/dl-syscalls.h
-@@ -0,0 +1,6 @@
-+/* We can't use the real errno in ldso, since it has not yet
-+ * been dynamicly linked in yet. */
-+#include "sys/syscall.h"
-+extern int _dl_errno;
-+#undef __set_errno
-+#define __set_errno(X) {(_dl_errno) = (X);}
-diff --git a/ldso/ldso/avr32/dl-sysdep.h b/ldso/ldso/avr32/dl-sysdep.h
-new file mode 100644
-index 0000000..1a30172
---- /dev/null
-+++ b/ldso/ldso/avr32/dl-sysdep.h
-@@ -0,0 +1,105 @@
-+/*
-+ * Various assembly language/system dependent hacks that are required
-+ * so that we can minimize the amount of platform specific code.
-+ *
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+/* Define this if the system uses RELOCA. */
-+#define ELF_USES_RELOCA
-+
-+#include <elf.h>
-+
-+#define ARCH_NUM 1
-+#define DT_AVR32_GOTSZ_IDX	(DT_NUM + OS_NUM)
-+
-+#define ARCH_DYNAMIC_INFO(dpnt, dynamic, debug_addr)			\
-+	do {								\
-+		if (dpnt->d_tag == DT_AVR32_GOTSZ)			\
-+			dynamic[DT_AVR32_GOTSZ_IDX] = dpnt->d_un.d_val;	\
-+	} while (0)
-+
-+/* Initialization sequence for the application/library GOT. */
-+#define INIT_GOT(GOT_BASE,MODULE)					\
-+	do {								\
-+		unsigned long i, nr_got;				\
-+									\
-+		GOT_BASE[0] = (unsigned long) _dl_linux_resolve;	\
-+		GOT_BASE[1] = (unsigned long) MODULE;			\
-+									\
-+		/* Add load address displacement to all GOT entries */	\
-+		nr_got = MODULE->dynamic_info[DT_AVR32_GOTSZ_IDX] / 4;	\
-+		for (i = 2; i < nr_got; i++)				\
-+			GOT_BASE[i] += (unsigned long)MODULE->loadaddr;	\
-+	} while (0)
-+
-+#define do_rem(result, n, base)	((result) = (n) % (base))
-+
-+/* Here we define the magic numbers that this dynamic loader should accept */
-+#define MAGIC1 EM_AVR32
-+#undef MAGIC2
-+
-+/* Used for error messages */
-+#define ELF_TARGET "AVR32"
-+
-+unsigned long _dl_linux_resolver(unsigned long got_offset, unsigned long *got);
-+
-+/* 4096 bytes alignment */
-+#define PAGE_ALIGN 0xfffff000
-+#define ADDR_ALIGN 0xfff
-+#define OFFS_ALIGN 0x7ffff000
-+
-+#define elf_machine_type_class(type)				\
-+	((type == R_AVR32_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
-+
-+/* AVR32 doesn't need any COPY relocs */
-+#define DL_NO_COPY_RELOCS
-+
-+/* Return the link-time address of _DYNAMIC.  Conveniently, this is the
-+   first element of the GOT.  This must be inlined in a function which
-+   uses global data.  */
-+static inline Elf32_Addr
-+elf_machine_dynamic (void)
-+{
-+	register Elf32_Addr *got asm ("r6");
-+	return *got;
-+}
-+
-+/* Return the run-time load address of the shared object.  */
-+static inline Elf32_Addr
-+elf_machine_load_address (void)
-+{
-+	extern void __dl_start asm("_dl_start");
-+	Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
-+	Elf32_Addr pcrel_addr;
-+
-+	asm   ("	lddpc	%0, 2f\n"
-+	       "1:	add	%0, pc\n"
-+	       "	rjmp	3f\n"
-+	       "	.align	2\n"
-+	       "2:	.long	_dl_start - 1b\n"
-+	       "3:\n"
-+	       : "=r"(pcrel_addr) : : "cc");
-+
-+	return pcrel_addr - got_addr;
-+}
-+
-+/*
-+ * Perform any RELATIVE relocations specified by DT_RELCOUNT.
-+ * Currently, we don't use that tag, but we might in the future as
-+ * this would reduce the startup time somewhat (although probably not by much).
-+ */
-+static inline void
-+elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
-+		      Elf32_Word relative_count)
-+{
-+	Elf32_Rela *rpnt = (void *)rel_addr;
-+
-+	do {
-+		Elf32_Addr *reloc_addr;
-+		reloc_addr = (void *)(load_off + (rpnt++)->r_offset);
-+		*reloc_addr = load_off + rpnt->r_addend;
-+	} while (--relative_count);
-+}
-diff --git a/ldso/ldso/avr32/elfinterp.c b/ldso/ldso/avr32/elfinterp.c
-new file mode 100644
-index 0000000..196292b
---- /dev/null
-+++ b/ldso/ldso/avr32/elfinterp.c
-@@ -0,0 +1,191 @@
-+/*
-+ * AVR32 ELF shared library loader suppport
-+ *
-+ * Copyright (C) 2004-2006 Atmel Corporation
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. The name of the above contributors may not be
-+ *    used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+unsigned long _dl_linux_resolver(unsigned long got_offset, unsigned long *got)
-+{
-+	struct elf_resolve *tpnt = (struct elf_resolve *)got[1];
-+	Elf32_Sym *sym;
-+	unsigned long local_gotno;
-+	unsigned long gotsym;
-+	unsigned long new_addr;
-+	char *strtab, *symname;
-+	unsigned long *entry;
-+	unsigned long sym_index = got_offset / 4;
-+
-+#if 0
-+	local_gotno = tpnt->dynamic_info[DT_AVR32_LOCAL_GOTNO];
-+	gotsym = tpnt->dynamic_info[DT_AVR32_GOTSYM];
-+
-+	sym = ((Elf32_Sym *)(tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr))
-+		+ sym_index;
-+	strtab = (char *)(tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
-+	symname = strtab + sym->st_name;
-+
-+#if 0
-+	new_addr = (unsigned long) _dl_find_hash(strtab + sym->st_name,
-+						 tpnt->symbol_scope, tpnt,
-+						 resolver);
-+#endif
-+
-+	entry = (unsigned long *)(got + local_gotno + sym_index - gotsym);
-+	*entry = new_addr;
-+#endif
-+
-+	return new_addr;
-+}
-+
-+static int
-+_dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
-+	  unsigned long rel_addr, unsigned long rel_size,
-+	  int (*reloc_func)(struct elf_resolve *tpnt, struct dyn_elf *scope,
-+			    Elf32_Rela *rpnt, Elf32_Sym *symtab, char *strtab))
-+{
-+	Elf32_Sym *symtab;
-+	Elf32_Rela *rpnt;
-+	char *strtab;
-+	int i;
-+
-+	rpnt = (Elf32_Rela *)rel_addr;
-+	rel_size /= sizeof(Elf32_Rela);
-+	symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB];
-+	strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
-+
-+	for (i = 0; i < rel_size; i++, rpnt++) {
-+		int symtab_index, res;
-+
-+		symtab_index = ELF32_R_SYM(rpnt->r_info);
-+
-+		debug_sym(symtab, strtab, symtab_index);
-+		debug_reloc(symtab, strtab, rpnt);
-+
-+		res = reloc_func(tpnt, scope, rpnt, symtab, strtab);
-+
-+		if (res == 0)
-+			continue;
-+
-+		_dl_dprintf(2, "\n%s: ", _dl_progname);
-+
-+		if (symtab_index)
-+			_dl_dprintf(2, "symbol '%s': ",
-+				    strtab + symtab[symtab_index].st_name);
-+
-+		if (res < 0) {
-+			int reloc_type = ELF32_R_TYPE(rpnt->r_info);
-+#if defined(__SUPPORT_LD_DEBUG__)
-+			_dl_dprintf(2, "can't handle reloc type %s\n",
-+				    _dl_reltypes(reloc_type));
-+#else
-+			_dl_dprintf(2, "can't handle reloc type %x\n",
-+				    reloc_type);
-+#endif
-+			_dl_exit(-res);
-+		} else {
-+			_dl_dprintf(2, "can't resolve symbol\n");
-+			return res;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
-+			Elf32_Rela *rpnt, Elf32_Sym *symtab, char *strtab)
-+{
-+	int reloc_type;
-+	int symtab_index;
-+	char *symname;
-+	unsigned long *reloc_addr;
-+	unsigned long symbol_addr;
-+#if defined(__SUPPORT_LD_DEBUG__)
-+	unsigned long old_val;
-+#endif
-+
-+	reloc_addr = (unsigned long *)(tpnt->loadaddr + rpnt->r_offset);
-+	reloc_type = ELF32_R_TYPE(rpnt->r_info);
-+	symtab_index = ELF32_R_SYM(rpnt->r_info);
-+	symbol_addr = 0;
-+	symname = strtab + symtab[symtab_index].st_name;
-+
-+	if (symtab_index) {
-+		symbol_addr = (unsigned long)
-+			_dl_find_hash(strtab + symtab[symtab_index].st_name,
-+				      tpnt->symbol_scope, tpnt,
-+				      elf_machine_type_class(reloc_type));
-+
-+		/* Allow undefined references to weak symbols */
-+		if (!symbol_addr &&
-+		    ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK) {
-+			_dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
-+				    _dl_progname, symname);
-+			return 0;
-+		}
-+	}
-+
-+#if defined(__SUPPORT_LD_DEBUG__)
-+	old_val = *reloc_addr;
-+#endif
-+	switch (reloc_type) {
-+	case R_AVR32_NONE:
-+		break;
-+	case R_AVR32_GLOB_DAT:
-+	case R_AVR32_JMP_SLOT:
-+		*reloc_addr = symbol_addr + rpnt->r_addend;
-+		break;
-+	case R_AVR32_RELATIVE:
-+		*reloc_addr = (unsigned long)tpnt->loadaddr
-+			+ rpnt->r_addend;
-+		break;
-+	default:
-+		return -1;
-+	}
-+
-+#if defined(__SUPPORT_LD_DEBUG__)
-+	if (_dl_debug_reloc && _dl_debug_detail)
-+		_dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n",
-+			    old_val, *reloc_addr);
-+#endif
-+
-+	return 0;
-+}
-+
-+void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
-+					   unsigned long rel_addr,
-+					   unsigned long rel_size)
-+{
-+	/* TODO: Might want to support this in order to get faster
-+	 * startup times... */
-+}
-+
-+int _dl_parse_relocation_information(struct dyn_elf *rpnt,
-+				     unsigned long rel_addr,
-+				     unsigned long rel_size)
-+{
-+	return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size,
-+			 _dl_do_reloc);
-+}
-diff --git a/ldso/ldso/avr32/resolve.S b/ldso/ldso/avr32/resolve.S
-new file mode 100644
-index 0000000..e3cb7f4
---- /dev/null
-+++ b/ldso/ldso/avr32/resolve.S
-@@ -0,0 +1,28 @@
-+/*
-+ * Linux dynamic resolving code for AVR32. Fixes up the GOT entry as
-+ * indicated in register r12 and jumps to the resolved address.
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ *
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ */
-+
-+#define ip r5
-+
-+	.text
-+	.global	_dl_linux_resolve
-+	.type	_dl_linux_resolve,@function
-+_dl_linux_resolve:
-+	/* The PLT code pushed r8 for us. It contains the address of this
-+	   function's GOT entry, that is entry 0. ip contains the address
-+	   of the GOT entry of the function we wanted to call. */
-+	stm	--sp, r9-r12, lr
-+	mov	r11, r8
-+	sub	r12, ip, r8
-+	rcall	_dl_linux_resolver
-+	mov	ip, r12
-+	popm	r8-r12,lr
-+	mov	pc, ip
-+	.size	_dl_linux_resolve, . - _dl_linux_resolve
-diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
-index 5cf1d04..d4294ec 100644
---- a/ldso/ldso/dl-startup.c
-+++ b/ldso/ldso/dl-startup.c
-@@ -217,7 +217,9 @@ DL_START(unsigned long args)
- 	/* some arches (like MIPS) we have to tweak the GOT before relocations */
- 	PERFORM_BOOTSTRAP_GOT(tpnt);
- 
--#else
-+#endif
-+
-+#if !defined(PERFORM_BOOTSTRAP_GOT) || defined(__avr32__)
- 
- 	/* OK, now do the relocations.  We do not do a lazy binding here, so
- 	   that once we are done, we have considerably more flexibility. */
-diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index f4e6cac..9cdc3fe 100644
---- a/libc/inet/resolv.c
-+++ b/libc/inet/resolv.c
-@@ -1643,7 +1643,7 @@ int attribute_hidden __read_etc_hosts_r(FILE * fp, const char * name, int type,
- 			*result=result_buf;
- 			ret=NETDB_SUCCESS;
- #ifdef __UCLIBC_HAS_IPV6__
--        } else if (type == AF_INET6 && inet_pton(AF_INET6, alias[0], in6) > 0) {
-+		} else if (type == AF_INET6 && inet_pton(AF_INET6, alias[0], in6) > 0) {
- 			DPRINTF("Found INET6\n");
- 			addr_list6[0] = in6;
- 			addr_list6[1] = 0;
-@@ -1658,8 +1658,8 @@ int attribute_hidden __read_etc_hosts_r(FILE * fp, const char * name, int type,
- 		} else {
- 			DPRINTF("Error\n");
- 			ret=TRY_AGAIN;
--			break; /* bad ip address */
--        }
-+			continue; /* bad ip address, keep searching */
-+		}
- 
- 		if (action!=GETHOSTENT) {
- 			fclose(fp);
-diff --git a/libc/string/avr32/Makefile b/libc/string/avr32/Makefile
-new file mode 100644
-index 0000000..e19e9d9
---- /dev/null
-+++ b/libc/string/avr32/Makefile
-@@ -0,0 +1,26 @@
-+# Makefile for uClibc
-+#
-+# Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
-+#
-+# This program is free software; you can redistribute it and/or modify it under
-+# the terms of the GNU Library General Public License as published by the Free
-+# Software Foundation; either version 2 of the License, or (at your option) any
-+# later version.
-+#
-+# This program is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-+# details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this program; if not, write to the Free Software Foundation, Inc.,
-+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+
-+top_srcdir	:= ../../../
-+top_builddir	:= ../../../
-+
-+all: objs
-+
-+include $(top_builddir)Rules.mak
-+include ../Makefile.in
-+include $(top_srcdir)Makerules
-diff --git a/libc/string/avr32/bcopy.S b/libc/string/avr32/bcopy.S
-new file mode 100644
-index 0000000..87c1e04
---- /dev/null
-+++ b/libc/string/avr32/bcopy.S
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#include <features.h>
-+
-+#ifdef __UCLIBC_SUSV3_LEGACY__
-+
-+	.text
-+	.global bcopy
-+	.type	bcopy, @function
-+	.align	1
-+bcopy:
-+	/* Swap the first two arguments */
-+	eor	r11, r12
-+	eor	r12, r11
-+	eor	r11, r12
-+	rjmp	__GI_memmove
-+
-+	.size	bcopy, . - bcopy
-+
-+#endif /* __UCLIBC_SUSV3_LEGACY__ */
-diff --git a/libc/string/avr32/bzero.S b/libc/string/avr32/bzero.S
-new file mode 100644
-index 0000000..c999e65
---- /dev/null
-+++ b/libc/string/avr32/bzero.S
-@@ -0,0 +1,22 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#ifdef __UCLIBC_SUSV3_LEGACY__
-+
-+	.text
-+	.global bzero
-+	.type	bzero, @function
-+	.align	1
-+bzero:
-+	mov	r10, r11
-+	mov	r11, 0
-+	rjmp	__memset
-+
-+	.size	bzero, . - bzero
-+
-+#endif /* __UCLIBC_SUSV3_LEGACY__ */
-diff --git a/libc/string/avr32/memcmp.S b/libc/string/avr32/memcmp.S
-new file mode 100644
-index 0000000..ae6cc91
---- /dev/null
-+++ b/libc/string/avr32/memcmp.S
-@@ -0,0 +1,61 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#include <features.h>
-+
-+#define s1 r12
-+#define s2 r11
-+#define len r10
-+
-+	.text
-+	.global memcmp
-+	.type	memcmp, @function
-+	.align	1
-+memcmp:
-+	sub	len, 4
-+	brlt	.Lless_than_4
-+
-+1:	ld.w	r8, s1++
-+	ld.w	r9, s2++
-+	cp.w	r8, r9
-+	brne	.Lfound_word
-+	sub	len, 4
-+	brge	1b
-+
-+.Lless_than_4:
-+	sub	len, -4
-+	reteq	0
-+
-+1:	ld.ub	r8, s1++
-+	ld.ub	r9, s2++
-+	sub	r8, r9
-+	retne	r8
-+	sub	len, 1
-+	brgt	1b
-+
-+	retal	0
-+
-+.Lfound_word:
-+	mov	len, 4
-+
-+2:	bfextu	r11, r9, 24, 8
-+	bfextu	r12, r8, 24, 8
-+	sub	r12, r11
-+	retne	r12
-+	lsl	r8, 8
-+	lsl	r9, 8
-+	sub	len, 1
-+	brne	2b
-+	retal	r12
-+
-+	.size	memcmp, . - memcmp
-+
-+libc_hidden_def(memcmp)
-+#ifdef __UCLIBC_SUSV3_LEGACY__
-+strong_alias(memcmp,bcmp)
-+#endif
-diff --git a/libc/string/avr32/memcpy.S b/libc/string/avr32/memcpy.S
-new file mode 100644
-index 0000000..bf091ab
---- /dev/null
-+++ b/libc/string/avr32/memcpy.S
-@@ -0,0 +1,111 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+/* Don't use r12 as dst since we must return it unmodified */
-+#define dst r9
-+#define src r11
-+#define len r10
-+
-+	.text
-+	.global	memcpy
-+	.type	memcpy, @function
-+memcpy:
-+	pref	src[0]
-+	mov	dst, r12
-+
-+	/* If we have less than 32 bytes, don't do anything fancy */
-+	cp.w	len, 32
-+	brge	.Lmore_than_31
-+
-+	sub	len, 1
-+	retlt	r12
-+1:	ld.ub	r8, src++
-+	st.b	dst++, r8
-+	sub	len, 1
-+	brge	1b
-+	retal	r12
-+
-+.Lmore_than_31:
-+	pushm	r0-r7, lr
-+
-+	/* Check alignment */
-+	mov	r8, src
-+	andl	r8, 31, COH
-+	brne	.Lunaligned_src
-+	mov	r8, dst
-+	andl	r8, 3, COH
-+	brne	.Lunaligned_dst
-+
-+.Laligned_copy:
-+	sub	len, 32
-+	brlt	.Lless_than_32
-+
-+1:	/* Copy 32 bytes at a time */
-+	ldm	src, r0-r7
-+	sub	src, -32
-+	stm	dst, r0-r7
-+	sub	dst, -32
-+	sub	len, 32
-+	brge	1b
-+
-+.Lless_than_32:
-+	/* Copy 16 more bytes if possible */
-+	sub	len, -16
-+	brlt	.Lless_than_16
-+	ldm	src, r0-r3
-+	sub	src, -16
-+	sub	len, 16
-+	stm	dst, r0-r3
-+	sub	dst, -16
-+
-+.Lless_than_16:
-+	/* Do the remaining as byte copies */
-+	neg	len
-+	add	pc, pc, len << 2
-+	.rept	15
-+	ld.ub	r0, src++
-+	st.b	dst++, r0
-+	.endr
-+
-+	popm	r0-r7, pc
-+
-+.Lunaligned_src:
-+	/* Make src cacheline-aligned. r8 = (src & 31) */
-+	rsub	r8, r8, 32
-+	sub	len, r8
-+1:	ld.ub	r0, src++
-+	st.b	dst++, r0
-+	sub	r8, 1
-+	brne	1b
-+
-+	/* If dst is word-aligned, we're ready to go */
-+	pref	src[0]
-+	mov	r8, 3
-+	tst	dst, r8
-+	breq	.Laligned_copy
-+
-+.Lunaligned_dst:
-+	/* src is aligned, but dst is not. Expect bad performance */
-+	sub	len, 4
-+	brlt	2f
-+1:	ld.w	r0, src++
-+	st.w	dst++, r0
-+	sub	len, 4
-+	brge	1b
-+
-+2:	neg	len
-+	add	pc, pc, len << 2
-+	.rept	3
-+	ld.ub	r0, src++
-+	st.b	dst++, r0
-+	.endr
-+
-+	popm	r0-r7, pc
-+	.size	memcpy, . - memcpy
-+
-+libc_hidden_def(memcpy)
-diff --git a/libc/string/avr32/memmove.S b/libc/string/avr32/memmove.S
-new file mode 100644
-index 0000000..98287c5
---- /dev/null
-+++ b/libc/string/avr32/memmove.S
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#define dst r12
-+#define src r11
-+#define len r10
-+
-+	.text
-+	.global memmove
-+	.type	memmove, @function
-+memmove:
-+	cp.w	src, dst
-+	brge	__GI_memcpy
-+
-+	add	dst, len
-+	add	src, len
-+	pref	src[-1]
-+
-+	/*
-+	 * The rest is basically the same as in memcpy.S except that
-+	 * the direction is reversed.
-+	 */
-+	cp.w	len, 32
-+	brge	.Lmore_than_31
-+
-+	sub	len, 1
-+	retlt	r12
-+1:	ld.ub	r8, --src
-+	st.b	--dst, r8
-+	sub	len, 1
-+	brge	1b
-+	retal	r12
-+
-+.Lmore_than_31:
-+	pushm	r0-r7, lr
-+
-+	/* Check alignment */
-+	mov	r8, src
-+	andl	r8, 31, COH
-+	brne	.Lunaligned_src
-+	mov	r8, r12
-+	andl	r8, 3, COH
-+	brne	.Lunaligned_dst
-+
-+.Laligned_copy:
-+	sub	len, 32
-+	brlt	.Lless_than_32
-+
-+1:	/* Copy 32 bytes at a time */
-+	sub	src, 32
-+	ldm	src, r0-r7
-+	sub	dst, 32
-+	sub	len, 32
-+	stm	dst, r0-r7
-+	brge	1b
-+
-+.Lless_than_32:
-+	/* Copy 16 more bytes if possible */
-+	sub	len, -16
-+	brlt	.Lless_than_16
-+	sub	src, 16
-+	ldm	src, r0-r3
-+	sub	dst, 16
-+	sub	len, 16
-+	stm	dst, r0-r3
-+
-+.Lless_than_16:
-+	/* Do the remaining as byte copies */
-+	sub	len, -16
-+	breq	2f
-+1:	ld.ub	r0, --src
-+	st.b	--dst, r0
-+	sub	len, 1
-+	brne	1b
-+
-+2:	popm	r0-r7, pc
-+
-+.Lunaligned_src:
-+	/* Make src cacheline-aligned. r8 = (src & 31) */
-+	sub	len, r8
-+1:	ld.ub	r0, --src
-+	st.b	--dst, r0
-+	sub	r8, 1
-+	brne	1b
-+
-+	/* If dst is word-aligned, we're ready to go */
-+	pref	src[-4]
-+	mov	r8, 3
-+	tst	dst, r8
-+	breq	.Laligned_copy
-+
-+.Lunaligned_dst:
-+	/* src is aligned, but dst is not. Expect bad performance */
-+	sub	len, 4
-+	brlt	2f
-+1:	ld.w	r0, --src
-+	st.w	--dst, r0
-+	sub	len, 4
-+	brge	1b
-+
-+2:	neg	len
-+	add	pc, pc, len << 2
-+	.rept	3
-+	ld.ub	r0, --src
-+	st.b	--dst, r0
-+	.endr
-+
-+	popm	r0-r7, pc
-+	.size	memmove, . - memmove
-+
-+libc_hidden_def(memmove)
-diff --git a/libc/string/avr32/memset.S b/libc/string/avr32/memset.S
-new file mode 100644
-index 0000000..33cfaed
---- /dev/null
-+++ b/libc/string/avr32/memset.S
-@@ -0,0 +1,70 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#include <features.h>
-+
-+#define s r12
-+#define c r11
-+#define n r10
-+
-+	.text
-+	.global memset
-+	.type	memset, @function
-+
-+	.global	__memset
-+	.hidden	__memset
-+	.type	__memset, @function
-+
-+	.align	1
-+memset:
-+__memset:
-+	cp.w	n, 32
-+	mov	r9, s
-+	brge	.Llarge_memset
-+
-+	sub	n, 1
-+	retlt	s
-+1:	st.b	s++, c
-+	sub	n, 1
-+	brge	1b
-+
-+	retal	r9
-+
-+.Llarge_memset:
-+	mov	r8, r11
-+	mov	r11, 3
-+	bfins	r8, r8, 8, 8
-+	bfins	r8, r8, 16, 16
-+	tst	s, r11
-+	breq	2f
-+
-+1:	st.b	s++, r8
-+	sub	n, 1
-+	tst	s, r11
-+	brne	1b
-+
-+2:	mov	r11, r9
-+	mov	r9, r8
-+	sub	n, 8
-+
-+3:	st.d	s++, r8
-+	sub	n, 8
-+	brge	3b
-+
-+	/* If we are done, n == -8 and we'll skip all st.b insns below */
-+	neg	n
-+	lsl	n, 1
-+	add	pc, n
-+	.rept	7
-+	st.b	s++, r8
-+	.endr
-+	retal	r11
-+
-+	.size	memset, . - memset
-+
-+libc_hidden_def(memset)
-diff --git a/libc/string/avr32/strcmp.S b/libc/string/avr32/strcmp.S
-new file mode 100644
-index 0000000..f73bd43
---- /dev/null
-+++ b/libc/string/avr32/strcmp.S
-@@ -0,0 +1,91 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#include <features.h>
-+
-+#define s1 r12
-+#define s2 r11
-+#define len r10
-+
-+	.text
-+	.global strcmp
-+	.type	strcmp, @function
-+	.align	1
-+strcmp:
-+	mov	r8, 3
-+	tst	s1, r8
-+	brne	.Lunaligned_s1
-+	tst	s2, r8
-+	brne	.Lunaligned_s2
-+
-+1:	ld.w	r8, s1++
-+	ld.w	r9, s2++
-+	cp.w	r8, r9
-+	brne	2f
-+	tnbz	r8
-+	brne	1b
-+	retal	0
-+
-+2:	bfextu	r12, r8, 24, 8
-+	bfextu	r11, r9, 24, 8
-+	sub	r12, r11
-+	retne	r12
-+	cp.w	r11, 0
-+	reteq	0
-+	bfextu	r12, r8, 16, 8
-+	bfextu	r11, r9, 16, 8
-+	sub	r12, r11
-+	retne	r12
-+	cp.w	r11, 0
-+	reteq	0
-+	bfextu	r12, r8, 8, 8
-+	bfextu	r11, r9, 8, 8
-+	sub	r12, r11
-+	retne	r12
-+	cp.w	r11, 0
-+	reteq	0
-+	bfextu	r12, r8, 0, 8
-+	bfextu	r11, r9, 0, 8
-+	sub	r12, r11
-+	retal	r12
-+
-+.Lunaligned_s1:
-+3:	tst	s1, r8
-+	breq	4f
-+	ld.ub	r10, s1++
-+	ld.ub	r9, s2++
-+	sub	r10, r9
-+	retne	r10
-+	cp.w	r9, 0
-+	brne	3b
-+	retal	r10
-+
-+4:	tst	s2, r8
-+	breq	1b
-+
-+.Lunaligned_s2:
-+	/*
-+	 * s1 and s2 can't both be aligned, and unaligned word loads
-+	 * can trigger spurious exceptions if we cross a page boundary.
-+	 * Do it the slow way...
-+	 */
-+1:	ld.ub	r8, s1++
-+	ld.ub	r9, s2++
-+	sub	r8, r9
-+	retne	r8
-+	cp.w	r9, 0
-+	brne	1b
-+	retal	0
-+
-+	.size	strcmp, . - strcmp
-+
-+libc_hidden_def(strcmp)
-+#ifndef __UCLIBC_HAS_LOCALE__
-+strong_alias(strcmp, strcoll)
-+libc_hidden_def(strcoll)
-+#endif
-diff --git a/libc/string/avr32/strlen.S b/libc/string/avr32/strlen.S
-new file mode 100644
-index 0000000..5223e53
---- /dev/null
-+++ b/libc/string/avr32/strlen.S
-@@ -0,0 +1,62 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#include <features.h>
-+
-+#define str r12
-+
-+	.text
-+	.global strlen
-+	.type	strlen, @function
-+strlen:
-+	mov	r11, r12
-+
-+	mov	r9, str
-+	andl	r9, 3, COH
-+	brne	.Lunaligned_str
-+
-+1:	ld.w	r8, str++
-+	tnbz	r8
-+	brne	1b
-+
-+	sub	r12, r11
-+	bfextu	r9, r8, 24, 8
-+	cp.w	r9, 0
-+	subeq	r12, 4
-+	reteq	r12
-+	bfextu	r9, r8, 16, 8
-+	cp.w	r9, 0
-+	subeq	r12, 3
-+	reteq	r12
-+	bfextu	r9, r8, 8, 8
-+	cp.w	r9, 0
-+	subeq	r12, 2
-+	reteq	r12
-+	sub	r12, 1
-+	retal	r12
-+
-+.Lunaligned_str:
-+	add	pc, pc, r9 << 3
-+	sub	r0, r0, 0	/* 4-byte nop */
-+	ld.ub	r8, str++
-+	sub	r8, r8, 0
-+	breq	1f
-+	ld.ub	r8, str++
-+	sub	r8, r8, 0
-+	breq	1f
-+	ld.ub	r8, str++
-+	sub	r8, r8, 0
-+	brne	1b
-+
-+1:	sub	r12, 1
-+	sub	r12, r11
-+	retal	r12
-+
-+	.size	strlen, . - strlen
-+
-+libc_hidden_def(strlen)
-diff --git a/libc/sysdeps/linux/avr32/Makefile b/libc/sysdeps/linux/avr32/Makefile
-new file mode 100644
-index 0000000..338abc0
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/Makefile
-@@ -0,0 +1,25 @@
-+# Makefile for uClibc
-+#
-+# Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
-+#
-+# This program is free software; you can redistribute it and/or modify it under
-+# the terms of the GNU Library General Public License as published by the Free
-+# Software Foundation; either version 2 of the License, or (at your option) any
-+# later version.
-+#
-+# This program is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-+# details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this program; if not, write to the Free Software Foundation, Inc.,
-+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+
-+top_srcdir=../../../../
-+top_builddir=../../../../
-+all: objs
-+
-+include $(top_builddir)Rules.mak
-+include Makefile.arch
-+include $(top_srcdir)Makerules
-diff --git a/libc/sysdeps/linux/avr32/Makefile.arch b/libc/sysdeps/linux/avr32/Makefile.arch
-new file mode 100644
-index 0000000..44fc01e
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/Makefile.arch
-@@ -0,0 +1,13 @@
-+# Makefile for uClibc
-+#
-+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-+#
-+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+#
-+
-+CSRC	:= brk.c clone.c mmap.c sigaction.c
-+
-+SSRC	:= __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S	\
-+		sigrestorer.S syscall.S vfork.S
-+
-+include $(top_srcdir)/libc/sysdeps/linux/Makefile.commonarch
-diff --git a/libc/sysdeps/linux/avr32/__longjmp.S b/libc/sysdeps/linux/avr32/__longjmp.S
-new file mode 100644
-index 0000000..6154bb2
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/__longjmp.S
-@@ -0,0 +1,21 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+	.global	__longjmp
-+	.type	__longjmp,"function"
-+	.align	1
-+__longjmp:
-+	ldm	r12++, r0-r8,sp,lr
-+	mustr	r8		/* restore status register (lower half) */
-+	cp	r11, 0		/* can't return zero */
-+	frs
-+	moveq	r11, 1
-+	retal	r11
-+	.size	__longjmp, . - __longjmp
-+
-+libc_hidden_def(__longjmp)
-diff --git a/libc/sysdeps/linux/avr32/bits/atomic.h b/libc/sysdeps/linux/avr32/bits/atomic.h
-new file mode 100644
-index 0000000..e6be41f
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/atomic.h
-@@ -0,0 +1,120 @@
-+/*
-+ * Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#ifndef _AVR32_BITS_ATOMIC_H
-+#define _AVR32_BITS_ATOMIC_H 1
-+
-+#include <inttypes.h>
-+
-+typedef int32_t atomic32_t;
-+typedef uint32_t uatomic32_t;
-+typedef int_fast32_t atomic_fast32_t;
-+typedef uint_fast32_t uatomic_fast32_t;
-+
-+typedef intptr_t atomicptr_t;
-+typedef uintptr_t uatomicptr_t;
-+typedef intmax_t atomic_max_t;
-+typedef uintmax_t uatomic_max_t;
-+
-+#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval)	\
-+	(abort(), 0)
-+
-+#define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval)	\
-+	(abort(), 0)
-+
-+#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
-+	({								\
-+		__typeof__(*(mem)) __prev;				\
-+		__asm__ __volatile__(					\
-+			"/* __arch_compare_and_exchange_val_32_acq */\n" \
-+			"1:	ssrf	5\n"				\
-+			"	ld.w	%[result], %[m]\n"		\
-+			"	cp.w	%[result], %[old]\n"		\
-+			"	brne	2f\n"				\
-+			"	stcond	%[m], %[new]\n"			\
-+			"	brne	1b\n"				\
-+			"2:"						\
-+			: [result] "=&r"(__result), [m] "=m"(*(mem))	\
-+			: "m"(*(mem)), [old] "ir"(oldval),		\
-+			  [new] "r"(newval)				\
-+			: "memory", "cc");				\
-+		__prev;							\
-+	})
-+
-+#define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval)	\
-+	(abort(), 0)
-+
-+#define __arch_exchange_32_acq(mem, newval)				\
-+	({								\
-+		__typeof__(*(mem)) __oldval;				\
-+		__asm__ __volatile__(					\
-+			"/*__arch_exchange_32_acq */\n"			\
-+			"	xchg	%[old], %[m], %[new]"		\
-+			: [old] "=&r"(__oldval)				\
-+			: [m] "r"(mem), [new] "r"(newval)		\
-+			: "memory");					\
-+		__oldval;						\
-+	})
-+
-+#define __arch_atomic_exchange_and_add_32(mem, value)			\
-+	({								\
-+		__typeof__(*(mem)) __oldval, __tmp;			\
-+		__asm__ __volatile__(					\
-+			"/* __arch_atomic_exchange_and_add_32 */\n"	\
-+			"1:	ssrf	5\n"				\
-+			"	ld.w	%[old], %[m]\n"			\
-+			"	add	%[tmp], %[old], %[val]\n"	\
-+			"	stcond	%[m], %[tmp]\n"			\
-+			"	brne	1b"				\
-+			: [old] "=&r"(__oldval), [tmp] "=&r"(__tmp),	\
-+			  [m] "=m"(*(mem))				\
-+			: "m"(*(mem)), [val] "r"(value)			\
-+			: "memory", "cc");				\
-+		__oldval;						\
-+	})
-+
-+#define __arch_atomic_decrement_if_positive_32(mem)			\
-+	({								\
-+		__typeof__(*(mem)) __oldval, __tmp;			\
-+		__asm__ __volatile__(					\
-+			"/* __arch_atomic_decrement_if_positive_32 */\n" \
-+			"1:	ssrf	5\n"				\
-+			"	ld.w	%[old], %[m]\n"			\
-+			"	sub	%[tmp], %[old], 1\n"		\
-+			"	brlt	2f\n"				\
-+			"	stcond	%[m], %[tmp]\n"			\
-+			"	brne	1b"				\
-+			"2:"						\
-+			: [old] "=&r"(__oldval), [tmp] "=&r"(__tmp),	\
-+			  [m] "=m"(*(mem))				\
-+			: "m"(*(mem))					\
-+			: "memory", "cc");				\
-+		__oldval;						\
-+	})
-+
-+#define atomic_exchange_acq(mem, newval)				\
-+	({								\
-+		if (sizeof(*(mem)) != 4)				\
-+			abort();					\
-+		__arch_exchange_32_acq(mem, newval);			\
-+	})
-+
-+#define atomic_exchange_and_add(mem, newval)				\
-+	({								\
-+		if (sizeof(*(mem)) != 4)				\
-+			abort();					\
-+		__arch_atomic_exchange_and_add_32(mem, newval);		\
-+	})
-+
-+#define atomic_decrement_if_positive(mem)				\
-+	({								\
-+		if (sizeof(*(mem)) != 4)				\
-+			abort();					\
-+		__arch_atomic_decrement_if_positive_32(mem);		\
-+	})
-+
-+#endif /* _AVR32_BITS_ATOMIC_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/byteswap.h b/libc/sysdeps/linux/avr32/bits/byteswap.h
-new file mode 100644
-index 0000000..1c030b9
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/byteswap.h
-@@ -0,0 +1,70 @@
-+/*
-+ * Copyright (C) 2005 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
-+# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
-+#endif
-+
-+#ifndef _BITS_BYTESWAP_H
-+#define _BITS_BYTESWAP_H 1
-+
-+/* Swap bytes in 16 bit value.  */
-+#if defined __GNUC__
-+# define __bswap_16(x) (__extension__ __builtin_bswap_16(x))
-+#else
-+/* This is better than nothing.  */
-+static __inline unsigned short int
-+__bswap_16 (unsigned short int __bsx)
-+{
-+	return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8));
-+}
-+#endif
-+
-+/* Swap bytes in 32 bit value.  */
-+#if defined __GNUC__
-+# define __bswap_32(x) (__extension__ __builtin_bswap_32(x))
-+#else
-+static __inline unsigned int
-+__bswap_32 (unsigned int __bsx)
-+{
-+  return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >>  8) |
-+	  (((__bsx) & 0x0000ff00) <<  8) | (((__bsx) & 0x000000ff) << 24));
-+}
-+#endif
-+
-+#if defined __GNUC__
-+/* Swap bytes in 64 bit value.  */
-+# define __bswap_constant_64(x)				\
-+	((((x) & 0xff00000000000000ull) >> 56)		\
-+	 | (((x) & 0x00ff000000000000ull) >> 40)	\
-+	 | (((x) & 0x0000ff0000000000ull) >> 24)	\
-+	 | (((x) & 0x000000ff00000000ull) >> 8)		\
-+	 | (((x) & 0x00000000ff000000ull) << 8)		\
-+	 | (((x) & 0x0000000000ff0000ull) << 24)	\
-+	 | (((x) & 0x000000000000ff00ull) << 40)	\
-+	 | (((x) & 0x00000000000000ffull) << 56))
-+
-+# define __bswap_64(x)							\
-+	(__extension__							\
-+	 ({								\
-+		 union {						\
-+			 __extension__ unsigned long long int __ll;	\
-+			 unsigned int __l[2];				\
-+		 } __w, __r;						\
-+		 if (__builtin_constant_p(x))				\
-+			 __r.__ll = __bswap_constant_64(x);		\
-+		 else {							\
-+			 __w.__ll = (x);				\
-+			 __r.__l[0] = __bswap_32(__w.__l[1]);		\
-+			 __r.__l[1] = __bswap_32(__w.__l[0]);		\
-+		 }							\
-+		 __r.__ll;						\
-+	 }))
-+#endif
-+
-+#endif /* _BITS_BYTESWAP_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/endian.h b/libc/sysdeps/linux/avr32/bits/endian.h
-new file mode 100644
-index 0000000..7bb6358
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/endian.h
-@@ -0,0 +1,7 @@
-+/* AVR32 is big-endian */
-+
-+#ifndef _ENDIAN_H
-+# error "Never use <bits/endian.h> directly; include <endian.h> instead."
-+#endif
-+
-+#define __BYTE_ORDER __BIG_ENDIAN
-diff --git a/libc/sysdeps/linux/avr32/bits/fcntl.h b/libc/sysdeps/linux/avr32/bits/fcntl.h
-new file mode 100644
-index 0000000..1abff17
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/fcntl.h
-@@ -0,0 +1,165 @@
-+#ifndef _FCNTL_H
-+# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
-+#endif
-+
-+#include <sys/types.h>
-+
-+/*
-+ * open/fcntl - O_SYNC is only implemented on blocks devices and on files
-+ * located on an ext2 file system
-+ */
-+#define O_ACCMODE	00000003
-+#define O_RDONLY	00000000
-+#define O_WRONLY	00000001
-+#define O_RDWR		00000002
-+#define O_CREAT		00000100	/* not fcntl */
-+#define O_EXCL		00000200	/* not fcntl */
-+#define O_NOCTTY	00000400	/* not fcntl */
-+#define O_TRUNC		00001000	/* not fcntl */
-+#define O_APPEND	00002000
-+#define O_NONBLOCK	00004000
-+#define O_NDELAY	O_NONBLOCK
-+#define O_SYNC		00010000
-+#define O_ASYNC		00020000
-+
-+#ifdef __USE_GNU
-+# define O_DIRECT	00040000	/* must be a directory */
-+# define O_DIRECTORY	00200000	/* direct disk access */
-+# define O_NOFOLLOW	00400000	/* don't follow links */
-+# define O_NOATIME	01000000	/* don't set atime */
-+#endif
-+
-+#ifdef __USE_LARGEFILE64
-+# define O_LARGEFILE	00100000
-+#endif
-+
-+/* For now Linux has synchronisity options for data and read operations.
-+   We define the symbols here but let them do the same as O_SYNC since
-+   this is a superset.	*/
-+#if defined __USE_POSIX199309 || defined __USE_UNIX98
-+# define O_DSYNC	O_SYNC	/* Synchronize data.  */
-+# define O_RSYNC	O_SYNC	/* Synchronize read operations.	 */
-+#endif
-+
-+#define F_DUPFD		0	/* dup */
-+#define F_GETFD		1	/* get close_on_exec */
-+#define F_SETFD		2	/* set/clear close_on_exec */
-+#define F_GETFL		3	/* get file->f_flags */
-+#define F_SETFL		4	/* set file->f_flags */
-+
-+#ifndef __USE_FILE_OFFSET64
-+# define F_GETLK	5
-+# define F_SETLK	6
-+# define F_SETLKW	7
-+#else
-+# define F_GETLK	F_GETLK64
-+# define F_SETLK	F_SETLK64
-+# define F_SETLKW	F_SETLKW64
-+#endif
-+#define F_GETLK64	12	/*  using 'struct flock64' */
-+#define F_SETLK64	13
-+#define F_SETLKW64	14
-+
-+#if defined __USE_BSD || defined __USE_XOPEN2K
-+# define F_SETOWN	8	/*  for sockets. */
-+# define F_GETOWN	9	/*  for sockets. */
-+#endif
-+
-+#ifdef __USE_GNU
-+# define F_SETSIG	10	/*  for sockets. */
-+# define F_GETSIG	11	/*  for sockets. */
-+#endif
-+
-+#ifdef __USE_GNU
-+# define F_SETLEASE	1024	/* Set a lease.	 */
-+# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-+# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
-+#endif
-+
-+/* for F_[GET|SET]FL */
-+#define FD_CLOEXEC	1	/* actually anything with low bit set goes */
-+
-+/* for posix fcntl() and lockf() */
-+#define F_RDLCK		0
-+#define F_WRLCK		1
-+#define F_UNLCK		2
-+
-+/* for old implementation of bsd flock () */
-+#define F_EXLCK		4	/* or 3 */
-+#define F_SHLCK		8	/* or 4 */
-+
-+/* for leases */
-+#define F_INPROGRESS	16
-+
-+#ifdef __USE_BSD
-+/* operations for bsd flock(), also used by the kernel implementation */
-+# define LOCK_SH	1	/* shared lock */
-+# define LOCK_EX	2	/* exclusive lock */
-+# define LOCK_NB	4	/* or'd with one of the above to prevent
-+				   blocking */
-+# define LOCK_UN	8	/* remove lock */
-+#endif
-+
-+#ifdef __USE_GNU
-+# define LOCK_MAND	32	/* This is a mandatory flock */
-+# define LOCK_READ	64	/* ... Which allows concurrent
-+				       read operations */
-+# define LOCK_WRITE	128	/* ... Which allows concurrent
-+				       write operations */
-+# define LOCK_RW	192	/* ... Which allows concurrent
-+				       read & write ops */
-+#endif
-+
-+#ifdef __USE_GNU
-+/* Types of directory notifications that may be requested with F_NOTIFY.  */
-+# define DN_ACCESS	0x00000001	/* File accessed.  */
-+# define DN_MODIFY	0x00000002	/* File modified.  */
-+# define DN_CREATE	0x00000004	/* File created.  */
-+# define DN_DELETE	0x00000008	/* File removed.  */
-+# define DN_RENAME	0x00000010	/* File renamed.  */
-+# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
-+# define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
-+#endif
-+
-+struct flock {
-+	short		l_type;
-+	short		l_whence;
-+#ifndef __USE_FILE_OFFSET64
-+	__off_t		l_start;
-+	__off_t		l_len;
-+#else
-+	__off64_t	l_start;
-+	__off64_t	l_len;
-+#endif
-+	__pid_t		l_pid;
-+};
-+
-+#ifdef __USE_LARGEFILE64
-+struct flock64 {
-+	short		l_type;
-+	short		l_whence;
-+	__off64_t	l_start;
-+	__off64_t	l_len;
-+	__pid_t		l_pid;
-+};
-+#endif
-+
-+/* Define some more compatibility macros to be backward compatible with
-+ *    BSD systems which did not managed to hide these kernel macros.  */
-+#ifdef  __USE_BSD
-+# define FAPPEND        O_APPEND
-+# define FFSYNC         O_FSYNC
-+# define FASYNC         O_ASYNC
-+# define FNONBLOCK      O_NONBLOCK
-+# define FNDELAY        O_NDELAY
-+#endif /* Use BSD.  */
-+
-+/* Advise to `posix_fadvise'.  */
-+#ifdef __USE_XOPEN2K
-+# define POSIX_FADV_NORMAL      0 /* No further special treatment.  */
-+# define POSIX_FADV_RANDOM      1 /* Expect random page references.  */
-+# define POSIX_FADV_SEQUENTIAL  2 /* Expect sequential page references.  */
-+# define POSIX_FADV_WILLNEED    3 /* Will need these pages.  */
-+# define POSIX_FADV_DONTNEED    4 /* Don't need these pages.  */
-+# define POSIX_FADV_NOREUSE     5 /* Data will be accessed once.  */
-+#endif
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_stat.h b/libc/sysdeps/linux/avr32/bits/kernel_stat.h
-new file mode 100644
-index 0000000..f97d23b
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/kernel_stat.h
-@@ -0,0 +1,67 @@
-+#ifndef _BITS_STAT_STRUCT_H
-+#define _BITS_STAT_STRUCT_H
-+
-+#ifndef _LIBC
-+#error bits/kernel_stat.h is for internal uClibc use only!
-+#endif
-+
-+/*
-+ * This file provides struct stat, taken from kernel 2.6.4. Verified
-+ * to match kernel 2.6.22.
-+ */
-+
-+struct kernel_stat {
-+        unsigned long		st_dev;
-+        unsigned long		st_ino;
-+        unsigned short		st_mode;
-+        unsigned short		st_nlink;
-+        unsigned short		st_uid;
-+        unsigned short		st_gid;
-+        unsigned long		st_rdev;
-+        unsigned long		st_size;
-+        unsigned long		st_blksize;
-+        unsigned long		st_blocks;
-+        unsigned long		st_atime;
-+        unsigned long		st_atime_nsec;
-+        unsigned long		st_mtime;
-+        unsigned long		st_mtime_nsec;
-+        unsigned long		st_ctime;
-+        unsigned long		st_ctime_nsec;
-+        unsigned long		__unused4;
-+        unsigned long		__unused5;
-+};
-+
-+#define STAT_HAVE_NSEC 1
-+
-+struct kernel_stat64 {
-+	unsigned long long	st_dev;
-+
-+	unsigned long long	st_ino;
-+	unsigned int		st_mode;
-+	unsigned int		st_nlink;
-+
-+	unsigned long		st_uid;
-+	unsigned long		st_gid;
-+
-+	unsigned long long	st_rdev;
-+
-+	long long		st_size;
-+	unsigned long		__pad1;
-+	unsigned long		st_blksize;
-+
-+	unsigned long long	st_blocks;
-+
-+	unsigned long		st_atime;
-+	unsigned long		st_atime_nsec;
-+
-+	unsigned long		st_mtime;
-+	unsigned long		st_mtime_nsec;
-+
-+	unsigned long		st_ctime;
-+	unsigned long		st_ctime_nsec;
-+
-+	unsigned long		__unused1;
-+	unsigned long		__unused2;
-+};
-+
-+#endif /* _BITS_STAT_STRUCT_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-new file mode 100644
-index 0000000..f7d8b52
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-@@ -0,0 +1,55 @@
-+/* Note that we use the exact same include guard #define names
-+ * as asm/posix_types.h.  This will avoid gratuitous conflicts
-+ * with the posix_types.h kernel header, and will ensure that
-+ * our private content, and not the kernel header, will win.
-+ *  -Erik
-+ */
-+#ifndef __ASM_AVR32_POSIX_TYPES_H
-+#define __ASM_AVR32_POSIX_TYPES_H
-+
-+/*
-+ * This file is generally used by user-level software, so you need to
-+ * be a little careful about namespace pollution etc.  Also, we cannot
-+ * assume GCC is being used.
-+ */
-+
-+typedef unsigned long		__kernel_dev_t;
-+typedef unsigned long		__kernel_ino_t;
-+typedef unsigned short		__kernel_mode_t;
-+typedef unsigned short		__kernel_nlink_t;
-+typedef long			__kernel_off_t;
-+typedef int			__kernel_pid_t;
-+typedef unsigned short		__kernel_ipc_pid_t;
-+typedef unsigned int		__kernel_uid_t;
-+typedef unsigned int		__kernel_gid_t;
-+typedef unsigned long		__kernel_size_t;
-+typedef long			__kernel_ssize_t;
-+typedef int			__kernel_ptrdiff_t;
-+typedef long			__kernel_time_t;
-+typedef long			__kernel_suseconds_t;
-+typedef long			__kernel_clock_t;
-+typedef int			__kernel_timer_t;
-+typedef int			__kernel_clockid_t;
-+typedef int			__kernel_daddr_t;
-+typedef char *			__kernel_caddr_t;
-+typedef unsigned short		__kernel_uid16_t;
-+typedef unsigned short		__kernel_gid16_t;
-+typedef unsigned int		__kernel_uid32_t;
-+typedef unsigned int		__kernel_gid32_t;
-+typedef unsigned short		__kernel_old_uid_t;
-+typedef unsigned short		__kernel_old_gid_t;
-+typedef unsigned short		__kernel_old_dev_t;
-+
-+#ifdef __GNUC__
-+typedef long long		__kernel_loff_t;
-+#endif
-+
-+typedef struct {
-+#if defined(__USE_ALL)
-+	int	val[2];
-+#else
-+	int	__val[2];
-+#endif
-+} __kernel_fsid_t;
-+
-+#endif /* __ASM_AVR32_POSIX_TYPES_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/mman.h b/libc/sysdeps/linux/avr32/bits/mman.h
-new file mode 100644
-index 0000000..5f6e3c3
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/mman.h
-@@ -0,0 +1,103 @@
-+/* Definitions for POSIX memory map interface.  Linux/AVR32 version.
-+   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SYS_MMAN_H
-+# error "Never include this file directly.  Use <sys/mman.h> instead"
-+#endif
-+
-+/* The following definitions basically come from the kernel headers.
-+   But the kernel header is not namespace clean.  */
-+
-+
-+/* Protections are chosen from these bits, OR'd together.  The
-+   implementation does not necessarily support PROT_EXEC or PROT_WRITE
-+   without PROT_READ.  The only guarantees are that no writing will be
-+   allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */
-+
-+#define PROT_READ	0x1		/* Page can be read.  */
-+#define PROT_WRITE	0x2		/* Page can be written.  */
-+#define PROT_EXEC	0x4		/* Page can be executed.  */
-+#define PROT_NONE	0x0		/* Page can not be accessed.  */
-+#define PROT_GROWSDOWN	0x01000000	/* Extend change to start of
-+					   growsdown vma (mprotect only).  */
-+#define PROT_GROWSUP	0x02000000	/* Extend change to start of
-+					   growsup vma (mprotect only).  */
-+
-+/* Sharing types (must choose one and only one of these).  */
-+#define MAP_SHARED	0x01		/* Share changes.  */
-+#define MAP_PRIVATE	0x02		/* Changes are private.  */
-+#ifdef __USE_MISC
-+# define MAP_TYPE	0x0f		/* Mask for type of mapping.  */
-+#endif
-+
-+/* Other flags.  */
-+#define MAP_FIXED	0x10		/* Interpret addr exactly.  */
-+#ifdef __USE_MISC
-+# define MAP_FILE	0
-+# define MAP_ANONYMOUS	0x20		/* Don't use a file.  */
-+# define MAP_ANON	MAP_ANONYMOUS
-+#endif
-+
-+/* These are Linux-specific.  */
-+#ifdef __USE_MISC
-+# define MAP_GROWSDOWN	0x0100		/* Stack-like segment.  */
-+# define MAP_DENYWRITE	0x0800		/* ETXTBSY */
-+# define MAP_EXECUTABLE	0x1000		/* Mark it as an executable.  */
-+# define MAP_LOCKED	0x2000		/* Lock the mapping.  */
-+# define MAP_NORESERVE	0x4000		/* Don't check for reservations.  */
-+# define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */
-+# define MAP_NONBLOCK	0x10000		/* do not block on IO */
-+#endif
-+
-+/* Flags to `msync'.  */
-+#define MS_ASYNC	1		/* Sync memory asynchronously.  */
-+#define MS_SYNC		4		/* Synchronous memory sync.  */
-+#define MS_INVALIDATE	2		/* Invalidate the caches.  */
-+
-+/* Flags for `mlockall'.  */
-+#define MCL_CURRENT	1		/* Lock all currently mapped pages.  */
-+#define MCL_FUTURE	2		/* Lock all additions to address
-+					   space.  */
-+
-+/* Flags for `mremap'.  */
-+#ifdef __USE_GNU
-+# define MREMAP_MAYMOVE	1
-+# define MREMAP_FIXED	2
-+#endif
-+
-+/* Advise to `madvise'.  */
-+#ifdef __USE_BSD
-+# define MADV_NORMAL	 0	/* No further special treatment.  */
-+# define MADV_RANDOM	 1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	 3	/* Will need these pages.  */
-+# define MADV_DONTNEED	 4	/* Don't need these pages.  */
-+# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+#endif
-+
-+/* The POSIX people had to invent similar names for the same things.  */
-+#ifdef __USE_XOPEN2K
-+# define POSIX_MADV_NORMAL	0 /* No further special treatment.  */
-+# define POSIX_MADV_RANDOM	1 /* Expect random page references.  */
-+# define POSIX_MADV_SEQUENTIAL	2 /* Expect sequential page references.  */
-+# define POSIX_MADV_WILLNEED	3 /* Will need these pages.  */
-+# define POSIX_MADV_DONTNEED	4 /* Don't need these pages.  */
-+#endif
-diff --git a/libc/sysdeps/linux/avr32/bits/setjmp.h b/libc/sysdeps/linux/avr32/bits/setjmp.h
-new file mode 100644
-index 0000000..78348a3
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/setjmp.h
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (C) 2004-2005 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#ifndef _BITS_SETJMP_H
-+#define _BITS_SETJMP_H	1
-+
-+#if !defined _SETJMP_H && !defined _PTHREAD_H
-+# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
-+#endif
-+
-+#ifndef _ASM
-+/*
-+ * The jump buffer contains r0-r7, sr, sp and lr. Other registers are
-+ * not saved.
-+ */
-+typedef int __jmp_buf[11];
-+#endif
-+
-+#define __JMP_BUF_SP	4
-+
-+/* Test if longjmp to JMPBUF would unwind the frame containing a local
-+   variable at ADDRESS.  */
-+#define _JMPBUF_UNWINDS(jmpbuf, address) \
-+  ((void *)(address) < (void *)(jmpbuf[__JMP_BUF_SP]))
-+
-+#endif /* _BITS_SETJMP_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/stackinfo.h b/libc/sysdeps/linux/avr32/bits/stackinfo.h
-new file mode 100644
-index 0000000..29b8452
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/stackinfo.h
-@@ -0,0 +1,28 @@
-+/* Copyright (C) 1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* This file contains a bit of information about the stack allocation
-+   of the processor.  */
-+
-+#ifndef _STACKINFO_H
-+#define _STACKINFO_H	1
-+
-+/* On AVR32 the stack grows down. */
-+#define _STACK_GROWS_DOWN	1
-+
-+#endif	/* stackinfo.h */
-diff --git a/libc/sysdeps/linux/avr32/bits/syscalls.h b/libc/sysdeps/linux/avr32/bits/syscalls.h
-new file mode 100644
-index 0000000..22ac059
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/syscalls.h
-@@ -0,0 +1,143 @@
-+#ifndef _BITS_SYSCALLS_H
-+#define _BITS_SYSCALLS_H
-+#ifndef _SYSCALL_H
-+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
-+#endif
-+
-+/*
-+ * This includes the `__NR_<name>' syscall numbers taken from the
-+ * Linux kernel header files. It also defines the traditional
-+ * `SYS_<name>' macros for older programs.
-+ */
-+#include <bits/sysnum.h>
-+
-+#ifndef __ASSEMBLER__
-+
-+#include <errno.h>
-+
-+#define SYS_ify(syscall_name) (__NR_##syscall_name)
-+
-+#undef _syscall0
-+#define _syscall0(type,name)				\
-+	type name(void)					\
-+	{						\
-+		return (type)(INLINE_SYSCALL(name, 0));	\
-+	}
-+
-+#undef _syscall1
-+#define _syscall1(type,name,type1,arg1)				\
-+	type name(type1 arg1)					\
-+	{							\
-+		return (type)(INLINE_SYSCALL(name, 1, arg1));	\
-+	}
-+
-+#undef _syscall2
-+#define _syscall2(type,name,type1,arg1,type2,arg2)			\
-+	type name(type1 arg1, type2 arg2)				\
-+	{								\
-+		return (type)(INLINE_SYSCALL(name, 2, arg1, arg2));	\
-+	}
-+
-+#undef _syscall3
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)		\
-+	type name(type1 arg1, type2 arg2, type3 arg3)			\
-+	{								\
-+		return (type)(INLINE_SYSCALL(name, 3, arg1,		\
-+					     arg2, arg3));		\
-+	}
-+
-+#undef _syscall4
-+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,		\
-+		  type4,arg4)						\
-+	type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4)	\
-+	{								\
-+		return (type)(INLINE_SYSCALL(name, 4, arg1, arg2,	\
-+					     arg3, arg4));		\
-+	}
-+
-+#undef _syscall5
-+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,		\
-+		  type4,arg4,type5,arg5)				\
-+	type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4,	\
-+		  type5 arg5)						\
-+	{								\
-+		return (type)(INLINE_SYSCALL(name, 5, arg1, arg2,	\
-+					     arg3, arg4, arg5));	\
-+	}
-+
-+#undef _syscall6
-+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,		\
-+		  type4,arg4,type5,arg5,type6,arg6)			\
-+	type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4,	\
-+		  type5 arg5, type6 arg6)				\
-+	{								\
-+		return (type)(INLINE_SYSCALL(name, 6, arg1, arg2, arg3,	\
-+					     arg4, arg5, arg6));	\
-+	}
-+
-+#undef unlikely
-+#define unlikely(x) __builtin_expect((x), 0)
-+
-+#undef INLINE_SYSCALL
-+#define INLINE_SYSCALL(name, nr, args...)				\
-+	({								\
-+		unsigned _sys_result = INTERNAL_SYSCALL(name, , nr, args); \
-+		if (unlikely(INTERNAL_SYSCALL_ERROR_P(_sys_result, ))) { \
-+			__set_errno(INTERNAL_SYSCALL_ERRNO(_sys_result, )); \
-+			_sys_result = (unsigned int) -1;		\
-+		}							\
-+		(int) _sys_result;					\
-+	})
-+
-+#undef INTERNAL_SYSCALL_DECL
-+#define INTERNAL_SYSCALL_DECL(err) do { } while(0)
-+
-+#undef INTERNAL_SYSCALL
-+#define INTERNAL_SYSCALL(name, err, nr, args...)			\
-+	({								\
-+		register int _a1 asm ("r12");				\
-+		register int _scno asm("r8") = SYS_ify(name);		\
-+		LOAD_ARGS_##nr (args);					\
-+		asm volatile ("scall	/* syscall " #name " */"	\
-+			      : "=r" (_a1)				\
-+			      : "r"(_scno) ASM_ARGS_##nr		\
-+			      : "cc", "memory");			\
-+		_a1;							\
-+	})
-+
-+#undef INTERNAL_SYSCALL_ERROR_P
-+#define INTERNAL_SYSCALL_ERROR_P(val, err)		\
-+	((unsigned int)(val) >= 0xfffff001U)
-+
-+#undef INTERNAL_SYSCALL_ERRNO
-+#define INTERNAL_SYSCALL_ERRNO(val, errr) (-(val))
-+
-+#define LOAD_ARGS_0() do { } while(0)
-+#define ASM_ARGS_0
-+#define LOAD_ARGS_1(a1)					\
-+	_a1 = (int) (a1);				\
-+	LOAD_ARGS_0()
-+#define ASM_ARGS_1	ASM_ARGS_0, "r"(_a1)
-+#define LOAD_ARGS_2(a1, a2)				\
-+	register int _a2 asm("r11") = (int)(a2);	\
-+	LOAD_ARGS_1(a1)
-+#define ASM_ARGS_2	ASM_ARGS_1, "r"(_a2)
-+#define LOAD_ARGS_3(a1, a2, a3)				\
-+	register int _a3 asm("r10") = (int)(a3);	\
-+	LOAD_ARGS_2(a1, a2)
-+#define ASM_ARGS_3	ASM_ARGS_2, "r"(_a3)
-+#define LOAD_ARGS_4(a1, a2, a3, a4)			\
-+	register int _a4 asm("r9") = (int)(a4);		\
-+	LOAD_ARGS_3(a1, a2, a3)
-+#define ASM_ARGS_4	ASM_ARGS_3, "r"(_a4)
-+#define LOAD_ARGS_5(a1, a2, a3, a4, a5)			\
-+	register int _a5 asm("r5") = (int)(a5);		\
-+	LOAD_ARGS_4(a1, a2, a3, a4)
-+#define ASM_ARGS_5	ASM_ARGS_4, "r"(_a5)
-+#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)		\
-+	register int _a6 asm("r3") = (int)(a6);		\
-+	LOAD_ARGS_5(a1, a2, a3, a4, a5)
-+#define ASM_ARGS_6	ASM_ARGS_5, "r"(_a6)
-+
-+#endif /* __ASSEMBLER__ */
-+#endif /* _BITS_SYSCALLS_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h b/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h
-new file mode 100644
-index 0000000..e95e8a5
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h
-@@ -0,0 +1,45 @@
-+/*
-+ * Track misc arch-specific features that aren't config options
-+ */
-+
-+#ifndef _BITS_UCLIBC_ARCH_FEATURES_H
-+#define _BITS_UCLIBC_ARCH_FEATURES_H
-+
-+/* instruction used when calling abort() to kill yourself */
-+/* trigger illegal instruction exception, same as BUG in Linux */
-+#define __UCLIBC_ABORT_INSTRUCTION__ ".short 0x5df0"
-+
-+/* can your target use syscall6() for mmap ? */
-+#define __UCLIBC_MMAP_HAS_6_ARGS__
-+
-+/* does your target use syscall4() for truncate64 ? (32bit arches only) */
-+#undef __UCLIBC_TRUNCATE64_HAS_4_ARGS__
-+
-+/* does your target have a broken create_module() ? */
-+#undef __UCLIBC_BROKEN_CREATE_MODULE__
-+
-+/* does your target have to worry about older [gs]etrlimit() ? */
-+#undef __UCLIBC_HANDLE_OLDER_RLIMIT__
-+
-+/* does your target prefix all symbols with an _ ? */
-+#define __UCLIBC_NO_UNDERSCORES__
-+
-+/* does your target have an asm .set ? */
-+#define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
-+
-+/* define if target doesn't like .global */
-+#undef __UCLIBC_ASM_GLOBAL_DIRECTIVE__
-+
-+/* define if target supports .weak */
-+#define __UCLIBC_HAVE_ASM_WEAK_DIRECTIVE__
-+
-+/* define if target supports .weakext */
-+#undef __UCLIBC_HAVE_ASM_WEAKEXT_DIRECTIVE__
-+
-+/* needed probably only for ppc64 */
-+#undef __UCLIBC_HAVE_ASM_GLOBAL_DOT_NAME__
-+
-+/* define if target supports IEEE signed zero floats */
-+#define __UCLIBC_HAVE_SIGNED_ZERO__
-+
-+#endif /* _BITS_UCLIBC_ARCH_FEATURES_H */
-diff --git a/libc/sysdeps/linux/avr32/bits/wordsize.h b/libc/sysdeps/linux/avr32/bits/wordsize.h
-new file mode 100644
-index 0000000..1b5842a
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bits/wordsize.h
-@@ -0,0 +1 @@
-+#define __WORDSIZE	32
-diff --git a/libc/sysdeps/linux/avr32/brk.c b/libc/sysdeps/linux/avr32/brk.c
-new file mode 100644
-index 0000000..a54b49a
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/brk.c
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/syscall.h>
-+
-+libc_hidden_proto(brk)
-+
-+void *__curbrk attribute_hidden = 0;
-+
-+int brk (void *addr)
-+{
-+	void *newbrk;
-+
-+	newbrk = (void *)INLINE_SYSCALL(brk, 1, addr);
-+
-+	__curbrk = newbrk;
-+
-+	if (newbrk < addr) {
-+		__set_errno (ENOMEM);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+libc_hidden_def(brk)
-diff --git a/libc/sysdeps/linux/avr32/bsd-_setjmp.S b/libc/sysdeps/linux/avr32/bsd-_setjmp.S
-new file mode 100644
-index 0000000..be66a10
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bsd-_setjmp.S
-@@ -0,0 +1,16 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+	/* This just does a tail-call to __sigsetjmp(env, 0) */
-+	.global	_setjmp
-+	.type	_setjmp,"function"
-+	.align	1
-+_setjmp:
-+	mov	r11, 0
-+	bral	__GI___sigsetjmp
-+	.size	_setjmp, . - _setjmp
-diff --git a/libc/sysdeps/linux/avr32/bsd-setjmp.S b/libc/sysdeps/linux/avr32/bsd-setjmp.S
-new file mode 100644
-index 0000000..4635eeb
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/bsd-setjmp.S
-@@ -0,0 +1,16 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+	/* This just does a tail-call to __sigsetjmp(env, 1) */
-+	.global	setjmp
-+	.type	setjmp,"function"
-+	.align	1
-+setjmp:
-+	mov	r11, 1
-+	bral	__GI___sigsetjmp
-+	.size	setjmp, . - setjmp
-diff --git a/libc/sysdeps/linux/avr32/clone.c b/libc/sysdeps/linux/avr32/clone.c
-new file mode 100644
-index 0000000..e43b0f3
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/clone.c
-@@ -0,0 +1,41 @@
-+/*
-+ * Copyright (C) 2004 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#include <errno.h>
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+
-+/*
-+ * I don't know if we can be absolutely certain that the fn and arg
-+ * parameters are preserved when returning as the child. If the
-+ * compiler stores them in registers (r0-r7), they should be.
-+ */
-+int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg)
-+{
-+	register int (*_fn)(void *arg) = fn;
-+	register void *_arg = arg;
-+	int err;
-+
-+	/* Sanity check the arguments */
-+	err = -EINVAL;
-+	if (!fn)
-+		goto syscall_error;
-+	if (!child_stack)
-+		goto syscall_error;
-+
-+	err = INLINE_SYSCALL(clone, 2, flags, child_stack);
-+	if (err < 0)
-+		goto syscall_error;
-+	else if (err != 0)
-+		return err;
-+
-+	_exit(_fn(_arg));
-+
-+syscall_error:
-+	__set_errno (-err);
-+	return -1;
-+}
-diff --git a/libc/sysdeps/linux/avr32/crt1.S b/libc/sysdeps/linux/avr32/crt1.S
-new file mode 100644
-index 0000000..ca1fa7a
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/crt1.S
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ *
-+ * When we enter _start, the stack looks like this:
-+ *	argc		argument counter
-+ *	argv[0]		pointer to program name
-+ *	argv[1..argc-1]	pointers to program args
-+ *	NULL
-+ *	env[0..N]	pointers to environment variables
-+ *	NULL
-+ *
-+ * r12 contains a function pointer to be registered with `atexit'.
-+ * This is how the dynamic linker arranges to have DT_FINI functions
-+ * called for shared libraries that have been loaded before this
-+ * code runs.
-+ *
-+ * We're going to call the following function:
-+ * __uClibc_main(int (*main)(int, char **, char **), int argc,
-+ *		 char **argv, void (*app_init)(void), void (*app_fini)(void),
-+ *		 void (*rtld_fini)(void), void *stack_end)
-+ *
-+ * So we need to set up things as follows:
-+ *	r12 = address of main
-+ *	r11 = argc
-+ *	r10 = &argv[0]
-+ *	r9  = address of _init
-+ *	r8  = address of _fini
-+ *	sp[0] = whatever we got passed in r12
-+ */
-+
-+#include <features.h>
-+
-+	.text
-+	.global _start
-+	.type	_start, @function
-+_start:
-+	/* Clear the frame pointer and link register since this is the outermost frame.  */
-+	mov	r7, 0
-+	mov	lr, 0
-+
-+	ld.w	r11, sp++		/* argc		*/
-+	mov	r10, sp			/* &argv[0]	*/
-+
-+	st.w	--sp, r10		/* stack_end */
-+	st.w	--sp, r12		/* rtld_fini */
-+
-+#ifdef __PIC__
-+	lddpc	r6, .L_GOT
-+.L_RGOT:
-+	rsub	r6, pc
-+	lda.w	r9, _init
-+	lda.w	r8, _fini
-+	lda.w	r12, main
-+
-+	/* Ok, now run uClibc's main() -- should not return */
-+	call	__uClibc_main
-+
-+	.align	2
-+.L_GOT:
-+	.long	.L_RGOT - _GLOBAL_OFFSET_TABLE_
-+#else
-+	lddpc	r9, __init_addr		/* app_init */
-+	lddpc	r8, __fini_addr		/* app_fini */
-+	lddpc	r12, __main_addr	/* main */
-+
-+	/* Ok, now run uClibc's main() -- should not return */
-+	lddpc	pc, ___uClibc_main_addr
-+
-+	.align	2
-+__init_addr:
-+	.long	_init
-+__fini_addr:
-+	.long	_fini
-+__main_addr:
-+	.long	main
-+___uClibc_main_addr:
-+	.long	__uClibc_main
-+#endif
-+	.size	_start, . - _start
-+
-+	/*
-+	 * The LSB says we need this.
-+	 */
-+	.section ".note.ABI-tag", "a"
-+	.align	4
-+	.long	2f - 1f		/* namesz */
-+	.long	4f - 3f		/* descsz */
-+	.long	1		/* type   */
-+1:	.asciz	"GNU"		/* name */
-+2:	.align	4
-+3:	.long	0		/* Linux executable */
-+	.long	2,6,0		/* Earliest compatible kernel */
-+4:	.align	4
-diff --git a/libc/sysdeps/linux/avr32/crti.S b/libc/sysdeps/linux/avr32/crti.S
-new file mode 100644
-index 0000000..660f47c
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/crti.S
-@@ -0,0 +1,26 @@
-+
-+	.section .init
-+	.align	2
-+	.global	_init
-+	.type	_init, @function
-+_init:
-+	stm	--sp, r6, lr
-+	lddpc	r6, 2f
-+1:	rsub	r6, pc
-+	rjmp	3f
-+	.align	2
-+2:	.long	1b - _GLOBAL_OFFSET_TABLE_
-+3:
-+
-+	.section .fini
-+	.align	2
-+	.global	_fini
-+	.type	_fini, @function
-+_fini:
-+	stm	--sp, r6, lr
-+	lddpc	r6, 2f
-+1:	rsub	r6, pc
-+	rjmp	3f
-+	.align	2
-+2:	.long	1b - _GLOBAL_OFFSET_TABLE_
-+3:
-diff --git a/libc/sysdeps/linux/avr32/crtn.S b/libc/sysdeps/linux/avr32/crtn.S
-new file mode 100644
-index 0000000..f7d1040
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/crtn.S
-@@ -0,0 +1,14 @@
-+
-+	.section .init
-+	.align	2
-+	.global	_init
-+	.type	_init, @function
-+	ldm	sp++, r6, pc
-+	.size	_init, . - _init
-+
-+	.section .fini
-+	.align	2
-+	.global _fini
-+	.type	_fini, @function
-+	ldm	sp++, r6, pc
-+	.size	_fini, . - _fini
-diff --git a/libc/sysdeps/linux/avr32/mmap.c b/libc/sysdeps/linux/avr32/mmap.c
-new file mode 100644
-index 0000000..2ee025a
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/mmap.c
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/mman.h>
-+#include <sys/syscall.h>
-+
-+libc_hidden_proto(mmap)
-+
-+static _syscall6(__ptr_t, mmap2, __ptr_t, addr, size_t, len, int, prot,
-+		 int, flags, int, fd, __off_t, pgoff);
-+
-+__ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
-+{
-+	unsigned long page_size = sysconf(_SC_PAGESIZE);
-+	unsigned long pgoff;
-+
-+	if (offset & (page_size - 1)) {
-+		__set_errno(EINVAL);
-+		return MAP_FAILED;
-+	}
-+
-+	pgoff = (unsigned long)offset >> (31 - __builtin_clz(page_size));
-+
-+	return mmap2(addr, len, prot, flags, fd, pgoff);
-+}
-+libc_hidden_def(mmap)
-diff --git a/libc/sysdeps/linux/avr32/setjmp.S b/libc/sysdeps/linux/avr32/setjmp.S
-new file mode 100644
-index 0000000..7d0354b
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/setjmp.S
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#define _SETJMP_H
-+#define _ASM
-+#include <bits/setjmp.h>
-+
-+	.text
-+
-+	.global	__sigsetjmp
-+	.type	__sigsetjmp,"function"
-+
-+	.align	1
-+__sigsetjmp:
-+	mustr	r8
-+	stm	r12, r0,r1,r2,r3,r4,r5,r6,r7,r8,sp,lr
-+
-+	/*
-+	 * Make a tail call to __sigjmp_save; it takes the same args
-+	 * and is hidden so we don't need to mess around with the GOT.
-+	 */
-+	rjmp	__sigjmp_save
-+	.size	__sigsetjmp, . - __sigsetjmp
-+
-+libc_hidden_def(__sigsetjmp)
-diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c
-new file mode 100644
-index 0000000..a97ff3d
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/sigaction.c
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#include <errno.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <sys/syscall.h>
-+#include <bits/kernel_sigaction.h>
-+
-+#define SA_RESTORER	0x04000000
-+extern void __default_rt_sa_restorer(void);
-+
-+libc_hidden_proto(memcpy)
-+
-+/*
-+ * If act is not NULL, change the action for sig to *act.
-+ * If oact is not NULL, put the old action for sig in *oact.
-+ */
-+int __libc_sigaction(int signum, const struct sigaction *act,
-+		     struct sigaction *oldact)
-+{
-+	struct kernel_sigaction kact, koact;
-+	int result;
-+
-+	if (act) {
-+		kact.k_sa_handler = act->sa_handler;
-+		memcpy(&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
-+		kact.sa_flags = act->sa_flags;
-+		if (kact.sa_flags & (SA_RESTORER | SA_ONSTACK))
-+			kact.sa_restorer = act->sa_restorer;
-+		else
-+			kact.sa_restorer = __default_rt_sa_restorer;
-+		kact.sa_flags |= SA_RESTORER;
-+	}
-+
-+	result = __syscall_rt_sigaction(signum, act ? __ptrvalue(&kact) : NULL,
-+					oldact ? __ptrvalue(&koact) : NULL,
-+					_NSIG / 8);
-+
-+	if (oldact && result >= 0) {
-+		oldact->sa_handler = koact.k_sa_handler;
-+		memcpy(&oldact->sa_mask, &koact.sa_mask,
-+		       sizeof(oldact->sa_mask));
-+		oldact->sa_flags = koact.sa_flags;
-+		oldact->sa_restorer = koact.sa_restorer;
-+	}
-+
-+	return result;
-+}
-+
-+#ifndef LIBC_SIGACTION
-+libc_hidden_proto(sigaction)
-+weak_alias(__libc_sigaction, sigaction)
-+libc_hidden_weak(sigaction)
-+#endif
-diff --git a/libc/sysdeps/linux/avr32/sigrestorer.S b/libc/sysdeps/linux/avr32/sigrestorer.S
-new file mode 100644
-index 0000000..df6a1ba
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/sigrestorer.S
-@@ -0,0 +1,15 @@
-+/*
-+ * Copyright (C) 2004 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#include <sys/syscall.h>
-+
-+	.global	__default_rt_sa_restorer
-+	.type	__default_rt_sa_restorer,"function"
-+	.align	1
-+__default_rt_sa_restorer:
-+	mov	r8, __NR_rt_sigreturn
-+	scall
-diff --git a/libc/sysdeps/linux/avr32/sys/elf.h b/libc/sysdeps/linux/avr32/sys/elf.h
-new file mode 100644
-index 0000000..faa7310
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/sys/elf.h
-@@ -0,0 +1,26 @@
-+/* Copyright (C) 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SYS_ELF_H
-+#define _SYS_ELF_H	1
-+
-+#warning "This header is obsolete; use <sys/procfs.h> instead."
-+
-+#include <sys/procfs.h>
-+
-+#endif	/* sys/elf.h */
-diff --git a/libc/sysdeps/linux/avr32/sys/procfs.h b/libc/sysdeps/linux/avr32/sys/procfs.h
-new file mode 100644
-index 0000000..3b37363
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/sys/procfs.h
-@@ -0,0 +1,123 @@
-+/* Copyright (C) 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SYS_PROCFS_H
-+#define _SYS_PROCFS_H	1
-+
-+/* This is somewhat modelled after the file of the same name on SVR4
-+   systems.  It provides a definition of the core file format for ELF
-+   used on Linux.  It doesn't have anything to do with the /proc file
-+   system, even though Linux has one.
-+
-+   Anyway, the whole purpose of this file is for GDB and GDB only.
-+   Don't read too much into it.  Don't use it for anything other than
-+   GDB unless you know what you are doing.  */
-+
-+#include <features.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/user.h>
-+
-+__BEGIN_DECLS
-+
-+/* Type for a general-purpose register.  */
-+typedef unsigned long elf_greg_t;
-+
-+/* And the whole bunch of them.  We could have used `struct
-+   user_regs' directly in the typedef, but tradition says that
-+   the register set is an array, which does have some peculiar
-+   semantics, so leave it that way.  */
-+#define ELF_NGREG (sizeof (struct user_regs) / sizeof(elf_greg_t))
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+
-+/* Register set for the floating-point registers.  */
-+typedef struct user_fpregs elf_fpregset_t;
-+
-+/* Signal info.  */
-+struct elf_siginfo
-+  {
-+    int si_signo;			/* Signal number.  */
-+    int si_code;			/* Extra code.  */
-+    int si_errno;			/* Errno.  */
-+  };
-+
-+/* Definitions to generate Intel SVR4-like core files.  These mostly
-+   have the same names as the SVR4 types with "elf_" tacked on the
-+   front to prevent clashes with Linux definitions, and the typedef
-+   forms have been avoided.  This is mostly like the SVR4 structure,
-+   but more Linuxy, with things that Linux does not support and which
-+   GDB doesn't really use excluded.  */
-+
-+struct elf_prstatus
-+  {
-+    struct elf_siginfo pr_info;		/* Info associated with signal.  */
-+    short int pr_cursig;		/* Current signal.  */
-+    unsigned long int pr_sigpend;	/* Set of pending signals.  */
-+    unsigned long int pr_sighold;	/* Set of held signals.  */
-+    __pid_t pr_pid;
-+    __pid_t pr_ppid;
-+    __pid_t pr_pgrp;
-+    __pid_t pr_sid;
-+    struct timeval pr_utime;		/* User time.  */
-+    struct timeval pr_stime;		/* System time.  */
-+    struct timeval pr_cutime;		/* Cumulative user time.  */
-+    struct timeval pr_cstime;		/* Cumulative system time.  */
-+    elf_gregset_t pr_reg;		/* GP registers.  */
-+    int pr_fpvalid;			/* True if math copro being used.  */
-+  };
-+
-+
-+#define ELF_PRARGSZ     (80)    /* Number of chars for args.  */
-+
-+struct elf_prpsinfo
-+  {
-+    char pr_state;			/* Numeric process state.  */
-+    char pr_sname;			/* Char for pr_state.  */
-+    char pr_zomb;			/* Zombie.  */
-+    char pr_nice;			/* Nice val.  */
-+    unsigned long int pr_flag;		/* Flags.  */
-+    unsigned short int pr_uid;
-+    unsigned short int pr_gid;
-+    int pr_pid, pr_ppid, pr_pgrp, pr_sid;
-+    /* Lots missing */
-+    char pr_fname[16];			/* Filename of executable.  */
-+    char pr_psargs[ELF_PRARGSZ];	/* Initial part of arg list.  */
-+  };
-+
-+/* The rest of this file provides the types for emulation of the
-+   Solaris <proc_service.h> interfaces that should be implemented by
-+   users of libthread_db.  */
-+
-+/* Addresses.  */
-+typedef void *psaddr_t;
-+
-+/* Register sets.  Linux has different names.  */
-+typedef elf_gregset_t prgregset_t;
-+typedef elf_fpregset_t prfpregset_t;
-+
-+/* We don't have any differences between processes and threads,
-+   therefore have only one PID type.  */
-+typedef __pid_t lwpid_t;
-+
-+/* Process status and info.  In the end we do provide typedefs for them.  */
-+typedef struct elf_prstatus prstatus_t;
-+typedef struct elf_prpsinfo prpsinfo_t;
-+
-+__END_DECLS
-+
-+#endif	/* sys/procfs.h */
-diff --git a/libc/sysdeps/linux/avr32/sys/ucontext.h b/libc/sysdeps/linux/avr32/sys/ucontext.h
-new file mode 100644
-index 0000000..82c7fe2
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/sys/ucontext.h
-@@ -0,0 +1,90 @@
-+/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Linux/AVR32 ABI compliant context switching support.  */
-+
-+#ifndef _SYS_UCONTEXT_H
-+#define _SYS_UCONTEXT_H	1
-+
-+#include <features.h>
-+#include <signal.h>
-+#include <sys/procfs.h>
-+#include <bits/sigcontext.h>
-+
-+typedef int greg_t;
-+
-+/* Number of general registers.  */
-+#define NGREG	16
-+
-+/* Container for all general registers.  */
-+typedef elf_gregset_t gregset_t;
-+
-+/* Number of each register is the `gregset_t' array.  */
-+enum
-+{
-+  R0 = 0,
-+#define R0	R0
-+  R1 = 1,
-+#define R1	R1
-+  R2 = 2,
-+#define R2	R2
-+  R3 = 3,
-+#define R3	R3
-+  R4 = 4,
-+#define R4	R4
-+  R5 = 5,
-+#define R5	R5
-+  R6 = 6,
-+#define R6	R6
-+  R7 = 7,
-+#define R7	R7
-+  R8 = 8,
-+#define R8	R8
-+  R9 = 9,
-+#define R9	R9
-+  R10 = 10,
-+#define R10	R10
-+  R11 = 11,
-+#define R11	R11
-+  R12 = 12,
-+#define R12	R12
-+  R13 = 13,
-+#define R13	R13
-+  R14 = 14,
-+#define R14	R14
-+  R15 = 15
-+#define R15	R15
-+};
-+
-+/* Structure to describe FPU registers.  */
-+typedef elf_fpregset_t	fpregset_t;
-+
-+/* Context to describe whole processor state.  */
-+typedef struct sigcontext mcontext_t;
-+
-+/* Userlevel context.  */
-+typedef struct ucontext
-+{
-+	unsigned long	uc_flags;
-+	struct ucontext	*uc_link;
-+	stack_t		uc_stack;
-+	mcontext_t	uc_mcontext;
-+	sigset_t	uc_sigmask;   /* mask last for extensibility */
-+} ucontext_t;
-+
-+#endif /* sys/ucontext.h */
-diff --git a/libc/sysdeps/linux/avr32/sys/user.h b/libc/sysdeps/linux/avr32/sys/user.h
-new file mode 100644
-index 0000000..c0b3d38
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/sys/user.h
-@@ -0,0 +1,46 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+struct user_fpregs
-+{
-+
-+};
-+
-+struct user_regs
-+{
-+	unsigned long sr;
-+	unsigned long pc;
-+	unsigned long lr;
-+	unsigned long sp;
-+	unsigned long r12;
-+	unsigned long r11;
-+	unsigned long r10;
-+	unsigned long r9;
-+	unsigned long r8;
-+	unsigned long r7;
-+	unsigned long r6;
-+	unsigned long r5;
-+	unsigned long r4;
-+	unsigned long r3;
-+	unsigned long r2;
-+	unsigned long r1;
-+	unsigned long r0;
-+	unsigned long r12_orig;
-+};
-+
-+struct user
-+{
-+	struct user_regs	regs;		/* general registers */
-+	size_t			u_tsize;	/* text size (pages) */
-+	size_t			u_dsize;	/* data size (pages) */
-+	size_t			u_ssize;	/* stack size (pages) */
-+	unsigned long		start_code;	/* text starting address */
-+	unsigned long		start_data;	/* data starting address */
-+	unsigned long		start_stack;	/* stack starting address */
-+	long int		signal;		/* signal causing core dump */
-+	struct user_regs *	u_ar0;		/* help gdb find registers */
-+	unsigned long		magic;		/* identifies a core file */
-+	char			u_comm[32];	/* user command name */
-+};
-+
-+#endif /* _SYS_USER_H */
-diff --git a/libc/sysdeps/linux/avr32/syscall.S b/libc/sysdeps/linux/avr32/syscall.S
-new file mode 100644
-index 0000000..55c1b1f
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/syscall.S
-@@ -0,0 +1,71 @@
-+/*
-+ * Copyright (C) 2004-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#include <features.h>
-+
-+	.text
-+
-+	/*
-+	 * long int syscall(long int sysno, ...)
-+	 */
-+	.global	syscall
-+	.type	syscall, @function
-+	.align	2
-+syscall:
-+	stm	--sp, r3,r5,r6,lr
-+	sub	lr, sp, -16
-+	mov	r8, r12
-+	ldm	lr, r3,r5,r9-r12
-+	scall
-+	cp.w	r12, -4095
-+	brlo	.Ldone
-+
-+#ifdef __PIC__
-+	lddpc	r6, .Lgot
-+.Lgotcalc:
-+	rsub	r6, pc
-+# ifdef __UCLIBC_HAS_THREADS__
-+	rsub	r3, r12, 0
-+	mcall	r6[__errno_location@got]
-+	st.w	r12[0], r3
-+# else
-+	ld.w	r3, r6[errno@got]
-+	neg	r12
-+	st.w	r3[0], r12
-+# endif
-+#else
-+# ifdef __UCLIBC_HAS_THREADS__
-+	rsub	r3, r12, 0
-+	mcall	.Lerrno_location
-+	st.w	r12[0], r3
-+# else
-+	lddpc	r3, .Lerrno
-+	neg	r12
-+	st.w	r3[0], r12
-+# endif
-+#endif
-+	mov	r12, -1
-+
-+.Ldone:
-+	ldm	sp++, r3,r5,r6,pc
-+
-+	.align	2
-+#ifdef __PIC__
-+.Lgot:
-+	.long	.Lgotcalc - _GLOBAL_OFFSET_TABLE_
-+#else
-+# ifdef __UCLIBC_HAS_THREADS__
-+.Lerrno_location:
-+	.long	__errno_location
-+# else
-+.Lerrno:
-+	.long	errno
-+# endif
-+#endif
-+
-+
-+	.size	syscall, . - syscall
-diff --git a/libc/sysdeps/linux/avr32/vfork.S b/libc/sysdeps/linux/avr32/vfork.S
-new file mode 100644
-index 0000000..03ca99f
---- /dev/null
-+++ b/libc/sysdeps/linux/avr32/vfork.S
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (C) 2005 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+/*
-+ * Clone the process without copying the address space.  The
-+ * calling process is suspended until the child either exits
-+ * or calls execve.
-+ *
-+ * This all means that we cannot rely on the stack to store
-+ * away registers, since they will be overwritten by the child
-+ * as soon as it makes another function call (e.g. execve()).
-+ * Fortunately, the Linux kernel preserves LR across system calls.
-+ */
-+
-+#include <features.h>
-+#include <sys/syscall.h>
-+
-+	.global	__vfork
-+	.type	__vfork,@function
-+	.align	1
-+__vfork:
-+	mov	r8, __NR_vfork
-+	scall
-+	cp.w	r12, -4096
-+	retls	r12
-+
-+	/* vfork failed, so we may use the stack freely */
-+	pushm	r4-r7,lr
-+#ifdef __PIC__
-+	lddpc	r6, .L_GOT
-+	rsub	r4, r12, 0
-+.L_RGOT:
-+	rsub	r6, pc
-+	mcall	r6[__errno_location@got]
-+#else
-+	rsub	r4, r12, 0
-+	mcall	.L__errno_location
-+#endif
-+	st.w	r12[0], r4
-+	popm	r4-r7,pc,r12=-1
-+
-+	.align	2
-+#ifdef __PIC__
-+.L_GOT:
-+	.long	.L_RGOT - _GLOBAL_OFFSET_TABLE_
-+#else
-+.L__errno_location:
-+	.long	__errno_location
-+#endif
-+	.size	__vfork, . - __vfork
-+
-+weak_alias(__vfork,vfork)
-+libc_hidden_weak(vfork)
-diff --git a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
-new file mode 100644
-index 0000000..eccf329
---- /dev/null
-+++ b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
-@@ -0,0 +1,73 @@
-+/* Machine-dependent pthreads configuration and inline functions.
-+ *
-+ * Copyright (C) 2005-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#ifndef _PT_MACHINE_H
-+#define _PT_MACHINE_H   1
-+
-+#include <features.h>
-+
-+static inline int
-+_test_and_set (int *p, int v)
-+{
-+	int result;
-+
-+	__asm__ __volatile__(
-+		"/* Inline test and set */\n"
-+		"	xchg	%[old], %[mem], %[new]"
-+		: [old] "=&r"(result)
-+		: [mem] "r"(p), [new] "r"(v)
-+		: "memory");
-+
-+	return result;
-+}
-+
-+#ifndef PT_EI
-+# define PT_EI extern inline
-+#endif
-+
-+extern long int testandset (int *spinlock);
-+extern int __compare_and_swap (long int *p, long int oldval, long int newval);
-+
-+/* Spinlock implementation; required.  */
-+PT_EI long int
-+testandset (int *spinlock)
-+{
-+	return _test_and_set(spinlock, 1);
-+}
-+
-+
-+/* Get some notion of the current stack.  Need not be exactly the top
-+   of the stack, just something somewhere in the current frame.  */
-+#define CURRENT_STACK_FRAME  stack_pointer
-+register char * stack_pointer __asm__ ("sp");
-+
-+/* Compare-and-swap for semaphores. */
-+
-+#define HAS_COMPARE_AND_SWAP
-+PT_EI int
-+__compare_and_swap(long int *p, long int oldval, long int newval)
-+{
-+	long int result;
-+
-+	__asm__ __volatile__(
-+		"/* Inline compare and swap */\n"
-+		"1:	ssrf	5\n"
-+		"	ld.w	%[result], %[mem]\n"
-+		"	eor	%[result], %[old]\n"
-+		"	brne	2f\n"
-+		"	stcond	%[mem], %[new]\n"
-+		"	brne	1b\n"
-+		"2:"
-+		: [result] "=&r"(result), [mem] "=m"(*p)
-+		: "m"(*p), [new] "r"(newval), [old] "r"(oldval)
-+		: "cc", "memory");
-+
-+	return result == 0;
-+}
-+
-+#endif /* pt-machine.h */
-diff --git a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h
-new file mode 100644
-index 0000000..fe12bf8
---- /dev/null
-+++ b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h
-@@ -0,0 +1,73 @@
-+/* Machine-dependent pthreads configuration and inline functions.
-+ *
-+ * Copyright (C) 2005-2007 Atmel Corporation
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+#ifndef _PT_MACHINE_H
-+#define _PT_MACHINE_H   1
-+
-+#include <features.h>
-+
-+static inline int
-+_test_and_set (int *p, int v) __THROW
-+{
-+	int result;
-+
-+	__asm__ __volatile__(
-+		"/* Inline test and set */\n"
-+		"	xchg	%[old], %[mem], %[new]"
-+		: [old] "=&r"(result)
-+		: [mem] "r"(p), [new] "r"(v)
-+		: "memory");
-+
-+	return result;
-+}
-+
-+#ifndef PT_EI
-+# define PT_EI extern inline
-+#endif
-+
-+extern long int testandset (int *spinlock);
-+extern int __compare_and_swap (long int *p, long int oldval, long int newval);
-+
-+/* Spinlock implementation; required.  */
-+PT_EI long int
-+testandset (int *spinlock)
-+{
-+	return _test_and_set(spinlock, 1);
-+}
-+
-+
-+/* Get some notion of the current stack.  Need not be exactly the top
-+   of the stack, just something somewhere in the current frame.  */
-+#define CURRENT_STACK_FRAME  stack_pointer
-+register char * stack_pointer __asm__ ("sp");
-+
-+/* Compare-and-swap for semaphores. */
-+
-+#define HAS_COMPARE_AND_SWAP
-+PT_EI int
-+__compare_and_swap(long int *p, long int oldval, long int newval)
-+{
-+	int result;
-+
-+	__asm__ __volatile__(
-+		"/* Inline compare and swap */\n"
-+		"1:	ssrf	5\n"
-+		"	ld.w	%[result], %[mem]\n"
-+		"	eor	%[result], %[old]\n"
-+		"	brne	2f\n"
-+		"	stcond	%[mem], %[new]\n"
-+		"	brne	1b\n"
-+		"2:"
-+		: [result] "=&r"(result), [mem] "=m"(*p)
-+		: "m"(*p), [new] "r"(newval), [old] "r"(oldval)
-+		: "cc", "memory");
-+
-+	return result == 0;
-+}
-+
-+#endif /* pt-machine.h */
-diff --git a/utils/ldd.c b/utils/ldd.c
-index 75ad628..e34acd9 100644
---- a/utils/ldd.c
-+++ b/utils/ldd.c
-@@ -44,6 +44,11 @@
- #define ELFCLASSM	ELFCLASS32
- #endif
- 
-+#if defined(__avr32__)
-+#define MATCH_MACHINE(x) (x == EM_AVR32)
-+#define ELFCLASSM	ELFCLASS32
-+#endif
-+
- #if defined(__s390__)
- #define MATCH_MACHINE(x) (x == EM_S390)
- #define ELFCLASSM	ELFCLASS32
diff --git a/toolchain/uClibc/uClibc-0.9.29-fix-sa_onstack.patch.avr32 b/toolchain/uClibc/uClibc-0.9.29-fix-sa_onstack.patch.avr32
deleted file mode 100644
index 722decdbd7..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-fix-sa_onstack.patch.avr32
+++ /dev/null
@@ -1,31 +0,0 @@
-From 974a769cc135bcfb1ea751db34a84ed6b5ceb509 Mon Sep 17 00:00:00 2001
-From: Haavard Skinnemoen <hskinnemoen@atmel.com>
-Date: Fri, 7 Dec 2007 14:02:19 +0100
-Subject: [PATCH] AVR32: Fix sa_restorer when SA_ONSTACK is set
-
-I don't remember exactly why we decided to pick the caller's value of
-sa_restorer when SA_ONSTACK is set, but it seems to break LTP's
-sigaltstack testcase. Some users have reported problems with
-sigaltstack as well; hopefully this will fix it.
-
-Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
----
- libc/sysdeps/linux/avr32/sigaction.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c
-index a97ff3d..6dcca91 100644
---- a/libc/sysdeps/linux/avr32/sigaction.c
-+++ b/libc/sysdeps/linux/avr32/sigaction.c
-@@ -30,7 +30,7 @@ int __libc_sigaction(int signum, const struct sigaction *act,
- 		kact.k_sa_handler = act->sa_handler;
- 		memcpy(&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
- 		kact.sa_flags = act->sa_flags;
--		if (kact.sa_flags & (SA_RESTORER | SA_ONSTACK))
-+		if (kact.sa_flags & SA_RESTORER)
- 			kact.sa_restorer = act->sa_restorer;
- 		else
- 			kact.sa_restorer = __default_rt_sa_restorer;
--- 
-1.5.3.4
-

From 7c46868238a1a6b937419f8db94e2459155b7cb0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 15 May 2011 21:58:50 +0200
Subject: [PATCH 0235/6849] gcc: remove references to
 arm-softfloat.patch.conditional

The arm-softfloat.patch.conditional patches are no longer in Buildroot
since 9af188d883b2657bd967e6621011d4bbe1bb3441 (October 2009), which
removed support for gcc 3.x and 4.0.x.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 7123615495..94613fadde 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -210,19 +210,6 @@ ifneq ($(wildcard $(GCC_PATCH_DIR)),)
 	toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
 endif
 
-	# Note: The soft float situation has improved considerably with gcc 3.4.x.
-	# We can dispense with the custom spec files, as well as libfloat for the arm case.
-	# However, we still need a patch for arm. There's a similar patch for gcc 3.3.x
-	# which needs to be integrated so we can kill of libfloat for good, except for
-	# anyone (?) who might still be using gcc 2.95. mjn3
-ifeq ($(BR2_SOFT_FLOAT),y)
-ifeq ("$(strip $(ARCH))","arm")
-	toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional
-endif
-ifeq ("$(strip $(ARCH))","armeb")
-	toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional
-endif
-endif
 ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
 ifneq ($(BR2_SOFT_FLOAT),)
 	toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional

From 91b2ec27a7b06c603f7c2f1bce3e7f422fb6b776 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 10:08:38 +0200
Subject: [PATCH 0236/6849] haserl: fix lua support after 0.9.29 bump

haserl no longer ships haserl_lualib.inc so our lua2c hack didn't work
anymore.

Fix is by adding a patch to re-add it and move the Makefile.in changes
to here rather than with sed.

Longer term we should probably add host-lua support instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../haserl-0.9.29-add-haserl_lualib.inc.patch | 136 ++++++++++++++++++
 package/haserl/haserl.mk                      |   8 --
 2 files changed, 136 insertions(+), 8 deletions(-)
 create mode 100644 package/haserl/haserl-0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch

diff --git a/package/haserl/haserl-0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch b/package/haserl/haserl-0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch
new file mode 100644
index 0000000000..2870b8b103
--- /dev/null
+++ b/package/haserl/haserl-0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch
@@ -0,0 +1,136 @@
+[HACK] add preprocessed lualib file so host-lua isn't needed
+
+Haserl no longer ships with haserl_lualib.inc, causing lua2c (which needs
+host-lua support) to be built to generate it.
+
+Re-add .inc file from 0.9.28 so we don't need host-lua.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/Makefile.in       |    3 -
+ src/haserl_lualib.inc |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+), 2 deletions(-)
+
+Index: haserl-0.9.29/src/haserl_lualib.inc
+===================================================================
+--- /dev/null
++++ haserl-0.9.29/src/haserl_lualib.inc
+@@ -0,0 +1,97 @@
++/* This file was automatically generated from haserl_lualib.lua. DO NOT EDIT */
++
++static const unsigned char haserl_lualib[] = { 
++   27, 76,117, 97, 81,  0,  1,  4,  4,  4,  8,  0, 19,  0,  0,  0,
++   64,104, 97,115,101,114,108, 95,108,117, 97,108,105, 98, 46,108,
++  117, 97,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  7, 24,
++    0,  0,  0, 10,  0,  0,  0, 74,  0,  0,  0,138,  0,  0,  0,202,
++    0,  0,  0, 10,  1,  0,  0, 74,  1,  0,  0,138,  1,  0,  0,135,
++  129,  1,  0, 71, 65,  1,  0,  7,  1,  1,  0,199,192,  0,  0,135,
++  128,  0,  0, 71, 64,  0,  0,  7,  0,  0,  0,  5,  0,  0,  0,100,
++    0,  0,  0,  9, 64,128,131,  5,  0,  0,  0,100, 64,  0,  0,  9,
++   64,  0,132,  5,  0,  0,  0,100,128,  0,  0,  9, 64,128,132, 30,
++    0,128,  0, 10,  0,  0,  0,  4,  7,  0,  0,  0,104, 97,115,101,
++  114,108,  0,  4,  5,  0,  0,  0, 70, 79, 82, 77,  0,  4,  4,  0,
++    0,  0, 69, 78, 86,  0,  4,  7,  0,  0,  0, 67, 79, 79, 75, 73,
++   69,  0,  4,  7,  0,  0,  0, 72, 65, 83, 69, 82, 76,  0,  4,  4,
++    0,  0,  0, 71, 69, 84,  0,  4,  5,  0,  0,  0, 80, 79, 83, 84,
++    0,  4,  9,  0,  0,  0,115,101,116,102,105,101,108,100,  0,  4,
++    9,  0,  0,  0,103,101,116,102,105,101,108,100,  0,  4,  9,  0,
++    0,  0,109,121,112,117,116,101,110,118,  0,  3,  0,  0,  0,  0,
++    0,  0,  0, 22,  0,  0,  0, 36,  0,  0,  0,  0,  2,  0, 10, 29,
++    0,  0,  0,133,  0,  0,  0,197, 64,  0,  0,198,128,192,  1,  0,
++    1,  0,  0, 65,193,  0,  0,220,  0,129,  1, 22,128,  4,128,  5,
++    2,  1,  0, 64,  2,  0,  3, 28,130,  0,  1, 26,  2,  0,  0, 22,
++  192,  0,128,  5,  2,  1,  0, 64,  2,  0,  3, 28,130,  0,  1,128,
++    1,  0,  4, 23, 64,193,  3, 22,128,  1,128,  6,130,  1,  1, 26,
++   66,  0,  0, 22,  0,  0,128, 10,  2,  0,  0,137,  0,  2,  3,134,
++  128,  1,  1, 22,  0,  0,128,137, 64,  0,  3,225,128,  0,  0, 22,
++  128,250,127, 30,  0,128,  0,  6,  0,  0,  0,  4,  3,  0,  0,  0,
++   95, 71,  0,  4,  7,  0,  0,  0,115,116,114,105,110,103,  0,  4,
++    6,  0,  0,  0,103,102,105,110,100,  0,  4, 15,  0,  0,  0, 40,
++   91, 37,119, 95, 37, 45, 93, 43, 41, 40, 46, 63, 41,  0,  4,  9,
++    0,  0,  0,116,111,110,117,109, 98,101,114,  0,  4,  2,  0,  0,
++    0, 46,  0,  0,  0,  0,  0, 29,  0,  0,  0, 24,  0,  0,  0, 25,
++    0,  0,  0, 25,  0,  0,  0, 25,  0,  0,  0, 25,  0,  0,  0, 25,
++    0,  0,  0, 25,  0,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0, 26,
++    0,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0, 27,  0,  0,  0, 27,
++    0,  0,  0, 27,  0,  0,  0, 27,  0,  0,  0, 29,  0,  0,  0, 29,
++    0,  0,  0, 30,  0,  0,  0, 30,  0,  0,  0, 30,  0,  0,  0, 30,
++    0,  0,  0, 30,  0,  0,  0, 31,  0,  0,  0, 31,  0,  0,  0, 33,
++    0,  0,  0, 25,  0,  0,  0, 34,  0,  0,  0, 36,  0,  0,  0,  8,
++    0,  0,  0,  2,  0,  0,  0,102,  0,  0,  0,  0,  0, 28,  0,  0,
++    0,  2,  0,  0,  0,118,  0,  0,  0,  0,  0, 28,  0,  0,  0,  2,
++    0,  0,  0,116,  0,  1,  0,  0,  0, 28,  0,  0,  0, 16,  0,  0,
++    0, 40,102,111,114, 32,103,101,110,101,114, 97,116,111,114, 41,
++    0,  6,  0,  0,  0, 28,  0,  0,  0, 12,  0,  0,  0, 40,102,111,
++  114, 32,115,116, 97,116,101, 41,  0,  6,  0,  0,  0, 28,  0,  0,
++    0, 14,  0,  0,  0, 40,102,111,114, 32, 99,111,110,116,114,111,
++  108, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0,  2,  0,  0,  0,119,
++    0,  7,  0,  0,  0, 26,  0,  0,  0,  2,  0,  0,  0,100,  0,  7,
++    0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,
++    0,  0,  0, 44,  0,  0,  0,  0,  1,  0,  8, 12,  0,  0,  0, 69,
++    0,  0,  0,133, 64,  0,  0,134,128, 64,  1,192,  0,  0,  0,  1,
++  193,  0,  0,156,  0,129,  1, 22,  0,  0,128, 70, 64,129,  0,161,
++   64,  0,  0, 22,  0,255,127, 94,  0,  0,  1, 30,  0,128,  0,  4,
++    0,  0,  0,  4,  3,  0,  0,  0, 95, 71,  0,  4,  7,  0,  0,  0,
++  115,116,114,105,110,103,  0,  4,  6,  0,  0,  0,103,102,105,110,
++  100,  0,  4,  7,  0,  0,  0, 91, 37,119, 95, 93, 43,  0,  0,  0,
++    0,  0, 12,  0,  0,  0, 39,  0,  0,  0, 40,  0,  0,  0, 40,  0,
++    0,  0, 40,  0,  0,  0, 40,  0,  0,  0, 40,  0,  0,  0, 40,  0,
++    0,  0, 41,  0,  0,  0, 40,  0,  0,  0, 41,  0,  0,  0, 43,  0,
++    0,  0, 44,  0,  0,  0,  6,  0,  0,  0,  2,  0,  0,  0,102,  0,
++    0,  0,  0,  0, 11,  0,  0,  0,  2,  0,  0,  0,118,  0,  1,  0,
++    0,  0, 11,  0,  0,  0, 16,  0,  0,  0, 40,102,111,114, 32,103,
++  101,110,101,114, 97,116,111,114, 41,  0,  6,  0,  0,  0, 10,  0,
++    0,  0, 12,  0,  0,  0, 40,102,111,114, 32,115,116, 97,116,101,
++   41,  0,  6,  0,  0,  0, 10,  0,  0,  0, 14,  0,  0,  0, 40,102,
++  111,114, 32, 99,111,110,116,114,111,108, 41,  0,  6,  0,  0,  0,
++   10,  0,  0,  0,  2,  0,  0,  0,119,  0,  7,  0,  0,  0,  8,  0,
++    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46,  0,  0,  0, 52,  0,
++    0,  0,  0,  2,  0,  6, 20,  0,  0,  0,133,  0,  0,  0,134, 64,
++   64,  1,192,  0,  0,  0,  1,129,  0,  0, 65,193,  0,  0,156,128,
++    0,  2,  0,  0,  0,  1,133,  0,  0,  0,134, 64, 64,  1,192,  0,
++    0,  0,  1,  1,  1,  0, 65,193,  0,  0,156,128,  0,  2,  0,  0,
++    0,  1,133, 64,  1,  0,134,128, 65,  1,192,  0,  0,  0,  0,  1,
++  128,  0,156, 64,128,  1, 30,  0,128,  0,  7,  0,  0,  0,  4,  7,
++    0,  0,  0,115,116,114,105,110,103,  0,  4,  5,  0,  0,  0,103,
++  115,117, 98,  0,  4,  7,  0,  0,  0, 91, 92, 93, 92, 91, 93,  0,
++    4,  2,  0,  0,  0, 46,  0,  4,  6,  0,  0,  0, 91, 92, 46, 93,
++   43,  0,  4,  7,  0,  0,  0,104, 97,115,101,114,108,  0,  4,  9,
++    0,  0,  0,115,101,116,102,105,101,108,100,  0,  0,  0,  0,  0,
++   20,  0,  0,  0, 48,  0,  0,  0, 48,  0,  0,  0, 48,  0,  0,  0,
++   48,  0,  0,  0, 48,  0,  0,  0, 48,  0,  0,  0, 48,  0,  0,  0,
++   49,  0,  0,  0, 49,  0,  0,  0, 49,  0,  0,  0, 49,  0,  0,  0,
++   49,  0,  0,  0, 49,  0,  0,  0, 49,  0,  0,  0, 51,  0,  0,  0,
++   51,  0,  0,  0, 51,  0,  0,  0, 51,  0,  0,  0, 51,  0,  0,  0,
++   52,  0,  0,  0,  2,  0,  0,  0,  4,  0,  0,  0,107,101,121,  0,
++    0,  0,  0,  0, 19,  0,  0,  0,  6,  0,  0,  0,118, 97,108,117,
++  101,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0, 24,  0,
++    0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 20,  0,
++    0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 20,  0,
++    0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 20,  0,
++    0,  0, 20,  0,  0,  0, 20,  0,  0,  0, 22,  0,  0,  0, 36,  0,
++    0,  0, 22,  0,  0,  0, 38,  0,  0,  0, 44,  0,  0,  0, 38,  0,
++    0,  0, 46,  0,  0,  0, 52,  0,  0,  0, 46,  0,  0,  0, 52,  0,
++    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
++};
+Index: haserl-0.9.29/src/Makefile.in
+===================================================================
+--- haserl-0.9.29.orig/src/Makefile.in
++++ haserl-0.9.29/src/Makefile.in
+@@ -32,7 +32,6 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
+ @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
+ @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
+ bin_PROGRAMS = haserl$(EXEEXT)
+@@ -515,7 +514,7 @@
+ @USE_LUA_TRUE@	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
+ @USE_LUA_TRUE@		-o $@ $^ $(LIBS)
+ 
+-@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
++@USE_LUA_TRUE@haserl_lualib.inc :
+ @USE_LUA_TRUE@	if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
+ @USE_LUA_TRUE@		rm $@; \
+ @USE_LUA_TRUE@		exit 1 ;\
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index c62b344a33..ff3c924570 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -10,14 +10,6 @@ HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ha
 # force haserl 0.8.0 to use install-sh so stripping works
 HASERL_CONF_ENV = ac_cv_path_install=./install-sh
 
-# lua2c is only needed when haserl_lualib.inc is older than haserl_lualib.lua
-# So avoid having a host-lua just for this
-define HASERL_NO_LUA2C
-	$(SED) 's/haserl_lualib.lua lua2c/haserl_lualib.lua/' \
-		$(@D)/src/Makefile.in
-endef
-HASERL_POST_EXTRACT_HOOKS += HASERL_NO_LUA2C
-
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
 		--with-lua-headers=$(STAGING_DIR)

From efce5be9af5c026bb1136cb2876c36edaaaba49a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 10:13:19 +0200
Subject: [PATCH 0237/6849] haserl: remove 0.8.0 install workaround

Not needed anymore as stripping is handled on a global level.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/haserl.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index ff3c924570..605cbfcd53 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -7,9 +7,6 @@
 HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
 HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
 
-# force haserl 0.8.0 to use install-sh so stripping works
-HASERL_CONF_ENV = ac_cv_path_install=./install-sh
-
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
 		--with-lua-headers=$(STAGING_DIR)

From b1f31142536770df278bf195d545173810f248eb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 14:09:42 +0200
Subject: [PATCH 0238/6849] qt: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qt/{qt-4.7.2-configure.patch => qt-4.7.3-configure.patch}   | 0
 ...hread_getattr_np.patch => qt-4.7.3-pthread_getattr_np.patch} | 0
 ...np_webkit.patch => qt-4.7.3-pthread_getattr_np_webkit.patch} | 0
 package/qt/qt.mk                                                | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename package/qt/{qt-4.7.2-configure.patch => qt-4.7.3-configure.patch} (100%)
 rename package/qt/{qt-4.7.2-pthread_getattr_np.patch => qt-4.7.3-pthread_getattr_np.patch} (100%)
 rename package/qt/{qt-4.7.2-pthread_getattr_np_webkit.patch => qt-4.7.3-pthread_getattr_np_webkit.patch} (100%)

diff --git a/package/qt/qt-4.7.2-configure.patch b/package/qt/qt-4.7.3-configure.patch
similarity index 100%
rename from package/qt/qt-4.7.2-configure.patch
rename to package/qt/qt-4.7.3-configure.patch
diff --git a/package/qt/qt-4.7.2-pthread_getattr_np.patch b/package/qt/qt-4.7.3-pthread_getattr_np.patch
similarity index 100%
rename from package/qt/qt-4.7.2-pthread_getattr_np.patch
rename to package/qt/qt-4.7.3-pthread_getattr_np.patch
diff --git a/package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
similarity index 100%
rename from package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch
rename to package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 7ec7ccc5ed..8bcbd3fef8 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION = 4.7.2
+QT_VERSION = 4.7.3
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://get.qt.nokia.com/qt/source
 

From f5a106e22abd4142c95687f440c99befda4f4d45 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 14:27:24 +0200
Subject: [PATCH 0239/6849] qt: fix build when script+dbus are enabled, but gui
 isn't

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qt/qt-4.7.3-script-qtdbus-no-gui.patch    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/qt/qt-4.7.3-script-qtdbus-no-gui.patch

diff --git a/package/qt/qt-4.7.3-script-qtdbus-no-gui.patch b/package/qt/qt-4.7.3-script-qtdbus-no-gui.patch
new file mode 100644
index 0000000000..e29e9e4a1b
--- /dev/null
+++ b/package/qt/qt-4.7.3-script-qtdbus-no-gui.patch
@@ -0,0 +1,22 @@
+[PATCH] fix build with script+dbus enabled, but no gui
+
+The script/qtdbus plugin doesn't need gui support, so don't try to
+link it against libQtGui.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/plugins/script/qtdbus/qtdbus.pro |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro
+===================================================================
+--- qt-4.7.3.orig/src/plugins/script/qtdbus/qtdbus.pro
++++ qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro
+@@ -1,6 +1,6 @@
+ TARGET  = qtscriptdbus
+ include(../../qpluginbase.pri)
+-QT = core gui script
++QT = core script
+ CONFIG += qdbus
+ 
+ SOURCES += main.cpp

From 023481efe2f69ca99870677112483e92c641aba9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 14:43:17 +0200
Subject: [PATCH 0240/6849] bison: add host package

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 8849030a28..93026e9d38 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -14,3 +14,4 @@ endef
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
 $(eval $(call AUTOTARGETS,package,bison))
+$(eval $(call AUTOTARGETS,package,bison,host))

From 5c22f20f4b12395a34ce47c1aba608fccaf1fbe0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 14:43:51 +0200
Subject: [PATCH 0241/6849] libnl: depend on host-bison

libnl build breaks with bison <2.4 with:

bison -y -d  -o route/cls/ematch_syntax.c route/cls/ematch_syntax.y
route/cls/ematch_syntax.y:31.9-16: syntax error, unexpected
identifier, expecting string

So build our own known good version and use instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 767e957e5f..8d3b9ade79 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -8,6 +8,7 @@ LIBNL_VERSION = 3.0
 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES
+LIBNL_DEPENDENCIES = host-bison
 
 define LIBNL_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/libnl.so*

From b976f37d305b8eeceef15fe9c1148a36fb8e2c5b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 May 2011 09:52:29 -0300
Subject: [PATCH 0242/6849] openssh: bump to version 5.8p2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 104977e48b..7a6cc90c99 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSH_VERSION = 5.8p1
+OPENSSH_VERSION = 5.8p2
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \

From e860d5f5d169d609c644d9e5d0e8c0a46a7bb68c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 May 2011 09:52:30 -0300
Subject: [PATCH 0243/6849] busybox: add hush patch for version 1.18.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.18.4/busybox-1.18.4-hush.patch  | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch

diff --git a/package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch b/package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch
new file mode 100644
index 0000000000..4e995afee2
--- /dev/null
+++ b/package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch
@@ -0,0 +1,160 @@
+--- busybox-1.18.4/shell/hush.c
++++ busybox-1.18.4-hush/shell/hush.c
+@@ -427,6 +427,15 @@ enum {
+ /* Used for initialization: o_string foo = NULL_O_STRING; */
+ #define NULL_O_STRING { NULL }
+ 
++#ifndef debug_printf_parse
++static const char *const assignment_flag[] = {
++	"MAYBE_ASSIGNMENT",
++	"DEFINITELY_ASSIGNMENT",
++	"NOT_ASSIGNMENT",
++	"WORD_IS_KEYWORD",
++};
++#endif
++
+ /* I can almost use ordinary FILE*.  Is open_memstream() universally
+  * available?  Where is it documented? */
+ typedef struct in_str {
+@@ -2885,24 +2894,24 @@ static const struct reserved_combo* matc
+ 	 */
+ 	static const struct reserved_combo reserved_list[] = {
+ # if ENABLE_HUSH_IF
+-		{ "!",     RES_NONE,  NOT_ASSIGNMENT , 0 },
+-		{ "if",    RES_IF,    WORD_IS_KEYWORD, FLAG_THEN | FLAG_START },
+-		{ "then",  RES_THEN,  WORD_IS_KEYWORD, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
+-		{ "elif",  RES_ELIF,  WORD_IS_KEYWORD, FLAG_THEN },
+-		{ "else",  RES_ELSE,  WORD_IS_KEYWORD, FLAG_FI   },
+-		{ "fi",    RES_FI,    NOT_ASSIGNMENT , FLAG_END  },
++		{ "!",     RES_NONE,  NOT_ASSIGNMENT  , 0 },
++		{ "if",    RES_IF,    MAYBE_ASSIGNMENT, FLAG_THEN | FLAG_START },
++		{ "then",  RES_THEN,  MAYBE_ASSIGNMENT, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
++		{ "elif",  RES_ELIF,  MAYBE_ASSIGNMENT, FLAG_THEN },
++		{ "else",  RES_ELSE,  MAYBE_ASSIGNMENT, FLAG_FI   },
++		{ "fi",    RES_FI,    NOT_ASSIGNMENT  , FLAG_END  },
+ # endif
+ # if ENABLE_HUSH_LOOPS
+-		{ "for",   RES_FOR,   NOT_ASSIGNMENT , FLAG_IN | FLAG_DO | FLAG_START },
+-		{ "while", RES_WHILE, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
+-		{ "until", RES_UNTIL, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
+-		{ "in",    RES_IN,    NOT_ASSIGNMENT , FLAG_DO   },
+-		{ "do",    RES_DO,    WORD_IS_KEYWORD, FLAG_DONE },
+-		{ "done",  RES_DONE,  NOT_ASSIGNMENT , FLAG_END  },
++		{ "for",   RES_FOR,   NOT_ASSIGNMENT  , FLAG_IN | FLAG_DO | FLAG_START },
++		{ "while", RES_WHILE, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
++		{ "until", RES_UNTIL, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
++		{ "in",    RES_IN,    NOT_ASSIGNMENT  , FLAG_DO   },
++		{ "do",    RES_DO,    MAYBE_ASSIGNMENT, FLAG_DONE },
++		{ "done",  RES_DONE,  NOT_ASSIGNMENT  , FLAG_END  },
+ # endif
+ # if ENABLE_HUSH_CASE
+-		{ "case",  RES_CASE,  NOT_ASSIGNMENT , FLAG_MATCH | FLAG_START },
+-		{ "esac",  RES_ESAC,  NOT_ASSIGNMENT , FLAG_END  },
++		{ "case",  RES_CASE,  NOT_ASSIGNMENT  , FLAG_MATCH | FLAG_START },
++		{ "esac",  RES_ESAC,  NOT_ASSIGNMENT  , FLAG_END  },
+ # endif
+ 	};
+ 	const struct reserved_combo *r;
+@@ -2968,6 +2977,7 @@ static int reserved_word(o_string *word,
+ 	ctx->ctx_res_w = r->res;
+ 	ctx->old_flag = r->flag;
+ 	word->o_assignment = r->assignment_flag;
++	debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
+ 
+ 	if (ctx->old_flag & FLAG_END) {
+ 		struct parse_context *old;
+@@ -3034,18 +3044,6 @@ static int done_word(o_string *word, str
+ 		debug_printf_parse("word stored in rd_filename: '%s'\n", word->data);
+ 		ctx->pending_redirect = NULL;
+ 	} else {
+-		/* If this word wasn't an assignment, next ones definitely
+-		 * can't be assignments. Even if they look like ones. */
+-		if (word->o_assignment != DEFINITELY_ASSIGNMENT
+-		 && word->o_assignment != WORD_IS_KEYWORD
+-		) {
+-			word->o_assignment = NOT_ASSIGNMENT;
+-		} else {
+-			if (word->o_assignment == DEFINITELY_ASSIGNMENT)
+-				command->assignment_cnt++;
+-			word->o_assignment = MAYBE_ASSIGNMENT;
+-		}
+-
+ #if HAS_KEYWORDS
+ # if ENABLE_HUSH_CASE
+ 		if (ctx->ctx_dsemicolon
+@@ -3065,8 +3063,9 @@ static int done_word(o_string *word, str
+ 		 && ctx->ctx_res_w != RES_CASE
+ # endif
+ 		) {
+-			debug_printf_parse("checking '%s' for reserved-ness\n", word->data);
+-			if (reserved_word(word, ctx)) {
++			int reserved = reserved_word(word, ctx);
++			debug_printf_parse("checking for reserved-ness: %d\n", reserved);
++			if (reserved) {
+ 				o_reset_to_empty_unquoted(word);
+ 				debug_printf_parse("done_word return %d\n",
+ 						(ctx->ctx_res_w == RES_SNTX));
+@@ -3087,6 +3086,23 @@ static int done_word(o_string *word, str
+ 					"groups and arglists don't mix\n");
+ 			return 1;
+ 		}
++
++		/* If this word wasn't an assignment, next ones definitely
++		 * can't be assignments. Even if they look like ones. */
++		if (word->o_assignment != DEFINITELY_ASSIGNMENT
++		 && word->o_assignment != WORD_IS_KEYWORD
++		) {
++			word->o_assignment = NOT_ASSIGNMENT;
++		} else {
++			if (word->o_assignment == DEFINITELY_ASSIGNMENT) {
++				command->assignment_cnt++;
++				debug_printf_parse("++assignment_cnt=%d\n", command->assignment_cnt);
++			}
++			debug_printf_parse("word->o_assignment was:'%s'\n", assignment_flag[word->o_assignment]);
++			word->o_assignment = MAYBE_ASSIGNMENT;
++		}
++		debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
++
+ 		if (word->has_quoted_part
+ 		 /* optimization: and if it's ("" or '') or ($v... or `cmd`...): */
+ 		 && (word->data[0] == '\0' || word->data[0] == SPECIAL_VAR_SYMBOL)
+@@ -4105,6 +4121,7 @@ static struct pipe *parse_stream(char **
+ 			 && is_well_formed_var_name(dest.data, '=')
+ 			) {
+ 				dest.o_assignment = DEFINITELY_ASSIGNMENT;
++				debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
+ 			}
+ 			continue;
+ 		}
+@@ -4154,6 +4171,7 @@ static struct pipe *parse_stream(char **
+ 					heredoc_cnt = 0;
+ 				}
+ 				dest.o_assignment = MAYBE_ASSIGNMENT;
++				debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
+ 				ch = ';';
+ 				/* note: if (is_blank) continue;
+ 				 * will still trigger for us */
+@@ -4203,6 +4221,7 @@ static struct pipe *parse_stream(char **
+ 			}
+ 			done_pipe(&ctx, PIPE_SEQ);
+ 			dest.o_assignment = MAYBE_ASSIGNMENT;
++			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
+ 			/* Do we sit outside of any if's, loops or case's? */
+ 			if (!HAS_KEYWORDS
+ 			 IF_HAS_KEYWORDS(|| (ctx.ctx_res_w == RES_NONE && ctx.old_flag == 0))
+@@ -4309,6 +4328,7 @@ static struct pipe *parse_stream(char **
+ 			/* ch is a special char and thus this word
+ 			 * cannot be an assignment */
+ 			dest.o_assignment = NOT_ASSIGNMENT;
++			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
+ 		}
+ 
+ 		/* Note: nommu_addchr(&ctx.as_string, ch) is already done */
+@@ -4406,6 +4426,7 @@ static struct pipe *parse_stream(char **
+ 			/* We just finished a cmd. New one may start
+ 			 * with an assignment */
+ 			dest.o_assignment = MAYBE_ASSIGNMENT;
++			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
+ 			break;
+ 		case '&':
+ 			if (done_word(&dest, &ctx)) {

From 668c357fec27d6b02c9201de5764bb8d1bdd67c2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 May 2011 22:18:35 +0200
Subject: [PATCH 0244/6849] sdl: fix directfb driver build if host has
 directfb-config

Ensure our cross directfb-config is used, so the right linker paths
as passed to the compiler.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 8d9d8ae9e7..99488a60b4 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -6,8 +6,8 @@
 SDL_VERSION:=1.2.14
 SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
 SDL_SITE:=http://www.libsdl.org/release
-
 SDL_INSTALL_STAGING = YES
+SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
 
 ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
 SDL_CONF_OPT+=--enable-video-fbcon=yes

From 12cdabeeb5ad18f27ce415c18d8a5896699bee41 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon, 16 May 2011 18:10:48 +0300
Subject: [PATCH 0245/6849] xlib_libX11: don't build docs for host

It depends on utils provided by host system, and
they sometimes are missing.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 1acc35c0e1..7ecc368562 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -18,6 +18,9 @@ XLIB_LIBX11_CONF_OPT = \
 	--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
 	--disable-specs
 
+HOST_XLIB_LIBX11_CONF_OPT = \
+	--disable-specs
+
 HOST_XLIB_LIBX11_DEPENDENCIES = host-xproto_xextproto host-libxcb host-xutil_util-macros host-xlib_xtrans host-xlib_libXau host-xlib_libXdmcp host-xproto_kbproto host-xproto_xproto host-xproto_xextproto host-xproto_inputproto host-xproto_xf86bigfontproto xproto_bigreqsproto host-xproto_xcmiscproto
 
 # src/util/makekeys is executed at build time to generate ks_tables.h, so

From 5276dec0e053c3dfd667281f037fa4221a9d6148 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon, 16 May 2011 18:10:49 +0300
Subject: [PATCH 0246/6849] font-misc-misc: Don't pull fonts encodings from
 host system

Use encodings from staging dir.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index f6a5564938..64e14d2837 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -12,5 +12,11 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+define XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
+	$(SED) 's|UTIL_DIR = |UTIL_DIR = $(STAGING_DIR)|' $(@D)/Makefile
+endef
+
+XFONT_FONT_MISC_MISC_POST_CONFIGURE_HOOKS += XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
+
 $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-misc))
 

From 017e3061fdd62d42ffb851057b67e6d96b1fd47a Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon, 16 May 2011 18:10:50 +0300
Subject: [PATCH 0247/6849] xlib_libXfont: don't build devel documentation for
 host

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXfont/xlib_libXfont.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 3cb52c3b0d..a91999c06b 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -12,6 +12,7 @@ XLIB_LIBXFONT_INSTALL_STAGING = YES
 XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
 XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static --disable-devel-docs
 
+HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 HOST_XLIB_LIBXFONT_DEPENDENCIES = host-freetype host-xlib_libfontenc host-xlib_xtrans host-xproto_fontcacheproto host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont))

From a7e78f974e4536c23904cb5714ce1a917b3f420e Mon Sep 17 00:00:00 2001
From: Alexander Clouter <alex@digriz.org.uk>
Date: Mon, 16 May 2011 22:41:54 +0200
Subject: [PATCH 0248/6849] dropbear: disable zlib support when built with
 small option

Closes #3733

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                      | 1 +
 package/dropbear/Config.in   | 4 ++--
 package/dropbear/dropbear.mk | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3678d235ef..a60a898b49 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@
 	#3541: Quotes in the top Makefile:217 break buildroot/kernel config...
 	#3571: u-boot: fw_printenv does not build
 	#3643: popt source url is not responding
+	#3733: dropbear: make zlib optional
 
 2011.02, Released February 28th, 2011:
 
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 4bc0e3e1b0..c30228f202 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DROPBEAR
 	bool "dropbear"
-	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
 	help
 	  A small SSH 2 server designed for small memory environments.
 
@@ -22,4 +22,4 @@ config BR2_PACKAGE_DROPBEAR_SMALL
 	  Compile dropbear for the smallest possible binary size.
 
 	  Tradeoffs are slower hashes and ciphers, and disabling of the
-	  blowfish cipher.
+	  blowfish cipher and zlib.
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index d73e993466..6ef5dec44e 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -7,7 +7,6 @@
 DROPBEAR_VERSION = 0.53.1
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
-DROPBEAR_DEPENDENCIES = zlib
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \
 		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
@@ -41,8 +40,10 @@ endif
 
 ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
+DROPBEAR_CONF_OPT += --disable-zlib
 else
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
+DROPBEAR_DEPENDENCIES += zlib
 endif
 
 define DROPBEAR_INSTALL_TARGET_CMDS

From f890debb30c0ce920bc44e7d74f1d5d4280d4625 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 May 2011 11:18:26 -0300
Subject: [PATCH 0249/6849] libnl: minor package fixes

* libnl fails to build with multiple jobs so keep make at -j1
* Multiple libraries are installed so update uninstall target for this

[Peter: remove libnl/libnl-*.* to catch subdir + any new libs in the future]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 8d3b9ade79..6edb1f8e5f 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -9,9 +9,11 @@ LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison
+LIBNL_MAKE = $(MAKE1)
 
 define LIBNL_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/lib/libnl.so*
+	rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.*
+	rm -rf $(TARGET_DIR)/usr/lib/libnl
 endef
 
 $(eval $(call AUTOTARGETS,package,libnl))

From ce1ae872aa72547bb291cc9e70adfe1b065cd2a8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 May 2011 10:00:01 +0200
Subject: [PATCH 0250/6849] Makefile.autotools.in: default to same <pkg>_MAKE
 setting for host and target

Similar to how it is done for _SOURCE, _PATCH, _SITE and _SUBDIR.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 61fcfcfa2c..917600ca0b 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -57,9 +57,16 @@ ifndef $(2)_LIBTOOL_PATCH
  endif
 endif
 
+ifndef $(2)_MAKE
+ ifdef $(3)_MAKE
+  $(2)_MAKE = $($(3)_MAKE)
+ else
+  $(2)_MAKE ?= $(MAKE)
+ endif
+endif
+
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
-$(2)_MAKE			?= $(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_AUTORECONF			?= NO

From e3bf4de3298ec01cf6d91bc55758b4e605b52b88 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 May 2011 20:06:28 +0200
Subject: [PATCH 0251/6849] festival: remove packages

Festival does not build, nobody cared since a long time, and they have
been marked deprecated since quite some time.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/Config.in                  |  1 -
 package/multimedia/festival/Config.in         | 27 -----
 package/multimedia/festival/festival.mk       |  4 -
 .../festival/festival-1.96-beta-doc.patch     | 23 -----
 .../festival-1.96-beta-etcsiteinit.patch      | 55 -----------
 .../festival/festival-1.96-beta-libdir.patch  | 10 --
 .../festival-1.96-beta-speechtools-dir.patch  | 11 ---
 .../multimedia/festival/festival/festival.mk  | 21 ----
 .../multimedia/festival/lexicons/Config.in    | 20 ----
 .../multimedia/festival/lexicons/festlex.mk   | 46 ---------
 .../festival/speech-tools/Config.in           | 10 --
 .../speech-tools-1.2.96-beta-install.patch    | 47 ---------
 .../festival/speech-tools/speech-tools.mk     | 31 ------
 package/multimedia/festival/voices/Config.in  | 63 ------------
 package/multimedia/festival/voices/festvox.mk | 99 -------------------
 15 files changed, 468 deletions(-)
 delete mode 100644 package/multimedia/festival/Config.in
 delete mode 100644 package/multimedia/festival/festival.mk
 delete mode 100644 package/multimedia/festival/festival/festival-1.96-beta-doc.patch
 delete mode 100644 package/multimedia/festival/festival/festival-1.96-beta-etcsiteinit.patch
 delete mode 100644 package/multimedia/festival/festival/festival-1.96-beta-libdir.patch
 delete mode 100644 package/multimedia/festival/festival/festival-1.96-beta-speechtools-dir.patch
 delete mode 100644 package/multimedia/festival/festival/festival.mk
 delete mode 100644 package/multimedia/festival/lexicons/Config.in
 delete mode 100644 package/multimedia/festival/lexicons/festlex.mk
 delete mode 100644 package/multimedia/festival/speech-tools/Config.in
 delete mode 100644 package/multimedia/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
 delete mode 100644 package/multimedia/festival/speech-tools/speech-tools.mk
 delete mode 100644 package/multimedia/festival/voices/Config.in
 delete mode 100644 package/multimedia/festival/voices/festvox.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index b8a0f21172..b3d1e073a7 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -40,7 +40,6 @@ source "package/multimedia/python-mad/Config.in"
 source "package/multimedia/speex/Config.in"
 source "package/multimedia/swfdec/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
-source "package/multimedia/festival/Config.in"
 source "package/multimedia/taglib/Config.in"
 source "package/multimedia/tremor/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
diff --git a/package/multimedia/festival/Config.in b/package/multimedia/festival/Config.in
deleted file mode 100644
index e05fde9c16..0000000000
--- a/package/multimedia/festival/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-menuconfig BR2_PACKAGE_FESTIVAL
-	bool "festival text-to-speech system"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BROKEN # doesn't build
-	select BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_SPEECH_TOOLS
-	help
-	  Text to speech system for Linux
-
-if BR2_PACKAGE_FESTIVAL
-
-	menu "speech tools"
-		source "package/multimedia/festival/speech-tools/Config.in"
-	endmenu
-
-	menu "festival lexicons"
-		source "package/multimedia/festival/lexicons/Config.in"
-	endmenu
-
-	menu "festival voices"
-		source "package/multimedia/festival/voices/Config.in"
-	endmenu
-
-endif
-
-comment "festival requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/festival/festival.mk b/package/multimedia/festival/festival.mk
deleted file mode 100644
index 445dbc7895..0000000000
--- a/package/multimedia/festival/festival.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-include package/multimedia/festival/speech-tools/speech-tools.mk
-include package/multimedia/festival/festival/festival.mk
-include package/multimedia/festival/voices/festvox.mk
-include package/multimedia/festival/lexicons/festlex.mk
diff --git a/package/multimedia/festival/festival/festival-1.96-beta-doc.patch b/package/multimedia/festival/festival/festival-1.96-beta-doc.patch
deleted file mode 100644
index 583cf6e561..0000000000
--- a/package/multimedia/festival/festival/festival-1.96-beta-doc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/doc/Makefile	2008-04-02 15:13:28.000000000 -0400
-+++ b/doc/Makefile	2008-04-02 15:13:09.000000000 -0400
-@@ -64,7 +64,7 @@ MANPAGES = festival.head festival.tail \
- FILES=Makefile $(MANPAGES) festival.texi $(SGMLFILES) refcard.tex  $(DOCXXFILES)
- LOCAL_CLEAN = *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr
- 
--ALL = festival.1 festival_client.1
-+#ALL = festival.1 festival_client.1
- 
- include $(TOP)/config/common_make_rules
- include $(EST)/config/rules/doc.mak
-@@ -72,9 +72,9 @@ include $(EST)/config/rules/doc.mak
- %.1 : %.head %.options %.tail 
- 	cat $^ >$@
- %.options : $(TOP)/src/main/%
--	$(TOP)/bin/$* -man_options >$@
-+#	$(TOP)/bin/$* -man_options >$@
- %.options : $(TOP)/src/main/%.exe
--	$(TOP)/bin/$* -man_options >$@
-+#	$(TOP)/bin/$* -man_options >$@
- 
- festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi
- 	@ if [ ! -d info ] ; \
diff --git a/package/multimedia/festival/festival/festival-1.96-beta-etcsiteinit.patch b/package/multimedia/festival/festival/festival-1.96-beta-etcsiteinit.patch
deleted file mode 100644
index 8e21acede6..0000000000
--- a/package/multimedia/festival/festival/festival-1.96-beta-etcsiteinit.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur festival.orig/lib/init.scm festival/lib/init.scm
---- festival.orig/lib/init.scm	2004-07-15 19:03:04.000000000 -0400
-+++ festival/lib/init.scm	2007-03-15 11:58:09.000000000 -0400
-@@ -55,6 +55,10 @@
- (if (probe_file (path-append libdir "sitevars.scm"))
-     (load (path-append libdir "sitevars.scm")))
- 
-+(if (probe_file "/etc/festival/sitevars.scm")
-+    (load "/etc/festival/sitevars.scm"))
-+
-+
- ;;; CSTR siod extensions
- (require 'cstr)
- 
-@@ -98,7 +102,7 @@
-  (t  ;; can't find direct support so guess that /dev/audio for 8k ulaw exists
-   (Parameter.def 'Audio_Method 'sunaudio)))
- ;;;  If you have an external program to play audio add its definition
--;;;  in siteinit.scm
-+;;;  in ~/.festivalrc or /etc/festival/siteinit.scm
- 
- ;;; The audio spooler doesn't work under Windows so redefine audio_mode
- (if (member 'mplayeraudio *modules*)
-@@ -135,9 +139,13 @@
- ;;;
- ;;;  Local site initialization, if the file exists load it
- ;;;
-+
- (if (probe_file (path-append libdir "siteinit.scm"))
-     (load (path-append libdir "siteinit.scm")))
- 
-+(if (probe_file "/etc/festival/siteinit.scm")
-+    (load "/etc/festival/siteinit.scm"))
-+
- ;;;  User initialization, if a user has a personal customization
- ;;;  file loaded it
- (if (probe_file (path-append home-directory ".siodrc"))
-diff -ur festival.orig/lib/voices.scm festival/lib/voices.scm
---- festival.orig/lib/voices.scm	2005-05-02 10:20:37.000000000 -0400
-+++ festival/lib/voices.scm	2007-03-15 12:00:19.000000000 -0400
-@@ -45,12 +45,12 @@
- (defvar system-voice-path '( )
-   "system-voice-path
-    Additional directory not near the load path where voices can be
--   found, this can be redefined in lib/sitevars.scm if desired.")
-+   found, this can be redefined in /etc/festival/sitevars.scm if desired.")
- 
- (defvar system-voice-path-multisyn '( )
-   "system-voice-path-multisyn
-    Additional directory not near the load path where multisyn voices can be
--   found, this can be redefined in lib/sitevars.scm if desired.")
-+   found, this can be redefined in /etc/festival/sitevars.scm if desired.")
- 
- (defvar voice-path 
-   (remove-duplicates
diff --git a/package/multimedia/festival/festival/festival-1.96-beta-libdir.patch b/package/multimedia/festival/festival/festival-1.96-beta-libdir.patch
deleted file mode 100644
index b076ad9477..0000000000
--- a/package/multimedia/festival/festival/festival-1.96-beta-libdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/config/project.mak	2005-05-02 10:21:29.000000000 -0400
-+++ b/config/project.mak	2008-04-01 14:22:01.000000000 -0400
-@@ -113,6 +113,6 @@ PROJECT_JAVA_ROOT=$(TOP)/src/modules/jav
- DOCXX_DIRS = $(TOP)/src 
- MODULE_TO_DOCXX = perl $(TOP)/src/modules/utilities/extract_module_doc++.prl
- 
--FTLIBDIR = $(FESTIVAL_HOME)/lib 
-+FTLIBDIR = /usr/share/festival/lib 
- 
- 
diff --git a/package/multimedia/festival/festival/festival-1.96-beta-speechtools-dir.patch b/package/multimedia/festival/festival/festival-1.96-beta-speechtools-dir.patch
deleted file mode 100644
index 874d1f662d..0000000000
--- a/package/multimedia/festival/festival/festival-1.96-beta-speechtools-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config/config.in	2008-03-31 15:20:02.000000000 -0400
-+++ b/config/config.in	2008-03-31 15:26:09.000000000 -0400
-@@ -10,7 +10,7 @@
- ###########################################################################
- ## Which speech tools to use
- 
--EST=$(TOP)/../speech_tools
-+EST=$(TOP)/../speech-tools-1.2.96-beta
- 
- ###########################################################################
- ## Where the festival tree will be installed.
diff --git a/package/multimedia/festival/festival/festival.mk b/package/multimedia/festival/festival/festival.mk
deleted file mode 100644
index 4c270d4478..0000000000
--- a/package/multimedia/festival/festival/festival.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#############################################################
-#
-# festival
-#
-#############################################################
-FESTIVAL_VERSION = 1.96-beta
-FESTIVAL_SOURCE = festival-$(FESTIVAL_VERSION).tar.gz
-FESTIVAL_SITE = http://festvox.org/packed/festival/1.96
-FESTIVAL_AUTORECONF = NO
-FESTIVAL_INSTALL_STAGING = NO
-FESTIVAL_INSTALL_TARGET = YES
-FESTIVAL_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
-
-FESTIVAL_CONF_OPT = --prefix=/usr --libdir=/usr/share/festival/lib
-
-FESTIVAL_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)"
-
-FESTIVAL_DEPENDENCIES = alsa-lib speech-tools
-
-$(eval $(call AUTOTARGETS,package/multimedia/festival,festival))
-
diff --git a/package/multimedia/festival/lexicons/Config.in b/package/multimedia/festival/lexicons/Config.in
deleted file mode 100644
index 6d92883b32..0000000000
--- a/package/multimedia/festival/lexicons/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config BR2_PACKAGE_FESTLEX_CMU
-	bool "Carnegie Mellon University"
-	help
-	  Lexicon for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTLEX_OALD
-	bool "Oxford Advanced Learners dictionary"
-	help
-	  Lexicon for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTLEX_POS
-	bool "POSLEX"
-	help
-	  Lexicon for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
diff --git a/package/multimedia/festival/lexicons/festlex.mk b/package/multimedia/festival/lexicons/festlex.mk
deleted file mode 100644
index 80d37d5959..0000000000
--- a/package/multimedia/festival/lexicons/festlex.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################
-#
-# festival lexicons
-#
-#############################################################
-LEX1 = festlex_CMU.tar.gz
-LEX2 = festlex_OALD.tar.gz
-LEX3 = festlex_POSLEX.tar.gz
-FESTLEX_STATUS_DIR = $(BUILD_DIR)/festival_lexicons
-FESTLEX_INSTALL_DIR = $(TARGET_DIR)/usr/share
-
-$(FESTLEX_STATUS_DIR)/.downloaded:
-	mkdir -p $(FESTLEX_STATUS_DIR)
-ifeq ($(BR2_PACKAGE_FESTLEX_CMU),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX1))
-endif
-ifeq ($(BR2_PACKAGE_FESTLEX_OALD),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX2))
-endif
-ifeq ($(BR2_PACKAGE_FESTLEX_POS),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX3))
-endif
-	touch $@
-
-$(FESTLEX_STATUS_DIR)/.installed: $(FESTLEX_STATUS_DIR)/.downloaded
-ifeq ($(BR2_PACKAGE_FESTLEX_CMU),y)
-	tar -xvf $(DL_DIR)/$(LEX1) --directory $(FESTLEX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTLEX_OALD),y)
-	tar -xvf $(DL_DIR)/$(LEX2) --directory $(FESTLEX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTLEX_POS),y)
-	tar -xvf $(DL_DIR)/$(LEX3) --directory $(FESTLEX_INSTALL_DIR)
-endif
-	touch $@
-
-festlex: $(FESTLEX_STATUS_DIR)/.installed
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FESTIVAL),y)
-TARGETS+=festlex
-endif
diff --git a/package/multimedia/festival/speech-tools/Config.in b/package/multimedia/festival/speech-tools/Config.in
deleted file mode 100644
index e82ea1e555..0000000000
--- a/package/multimedia/festival/speech-tools/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_SPEECH_TOOLS
-	bool "speech tools for festival"
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	  Speech tools for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-comment "speech tools requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/festival/speech-tools/speech-tools-1.2.96-beta-install.patch b/package/multimedia/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
deleted file mode 100644
index 3cc47d3445..0000000000
--- a/package/multimedia/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/config/rules/install.mak	2001-04-04 07:55:32.000000000 -0400
-+++ b/config/rules/install.mak	2008-04-03 12:37:45.000000000 -0400
-@@ -50,9 +50,9 @@ ifneq ($(SHARED),0)
- endif
- endif
- 
--ifeq ($(PROJECT_HOME_PATH), $(PROJECT_TOP_PATH))
--    TO_INSTALL=make_bin
--else
-+#ifeq ($(PROJECT_HOME_PATH), $(PROJECT_TOP_PATH))
-+#    TO_INSTALL=make_bin
-+#else
- 
-     TO_INSTALL= \
- 	make_installed_exec$(S) \
-@@ -62,7 +62,7 @@ else
-     INSTALLED_LIB=$(shell (cd $($(PROJECT_PREFIX)_HOME); pwd))/lib
-     INSTALLED_PRIVATE_LIB=$(INSTALLED_LIB)/$(shell echo $(PROJECT_PREFIX)| tr A-Z a-z)
-     INSTALLED_BIN=$(shell (cd $($(PROJECT_PREFIX)_HOME); pwd))/bin
--endif
-+#endif
- 
- install: $(TO_INSTALL)
- 
---- a/config/rules/bin_process.mak	2004-01-27 18:56:39.000000000 -0500
-+++ b/config/rules/bin_process.mak	2008-04-03 12:37:31.000000000 -0400
-@@ -69,10 +69,17 @@ endif
- 	    do \
- 	    b=`basename "$$i"`;\
- 	    $(ECHO_N) " $$b";\
--	    $(INSTALL_PROG) -s "$$main/$$i" "$(subst TOP,$(TOP),$(BIN))/$$b";\
-+	    $(INSTALL_PROG) "$$main/$$i" "$(DESTDIR)/usr/bin/$$b";\
-+		$(STRIP) "$(DESTDIR)/usr/bin/$$b";\
- 	done
--	@echo
--
-+	@$(ECHO_N) "Install Scheme Libraries:"
-+	@main=`pwd` ;\
-+	mkdir -p "$(DESTDIR)/usr/share/festival"; cp -a "$$main/../../lib" "$(DESTDIR)/usr/share/festival";\
-+	for i in `find "$(DESTDIR)/usr/share/festival/lib" -name Makefile`;\
-+		do \
-+		rm "$$i"; \
-+	done
-+ 
- .link_main: 
- 	@$(MAKE) MADE_FROM_ABOVE=1 --no-print-directory -C '$(PROJECT_MAIN_DIR)' BIN=TOP/$(DIRNAME) LIBDIR=MAIN/TOP/$(PROJECT_LIBRARY_DIR) MAIN='$($(PROJECT_PREFIX)_HOME)' .link_main$(S)
- 
diff --git a/package/multimedia/festival/speech-tools/speech-tools.mk b/package/multimedia/festival/speech-tools/speech-tools.mk
deleted file mode 100644
index 66bd3080bf..0000000000
--- a/package/multimedia/festival/speech-tools/speech-tools.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#############################################################
-#
-# speech-tools
-#
-#############################################################
-
-SPEECH_TOOLS_VERSION = 1.2.96~beta
-SPEECH_TOOLS_SOURCE = speech-tools_$(SPEECH_TOOLS_VERSION).orig.tar.gz
-SPEECH_TOOLS_PATCH = speech-tools_$(SPEECH_TOOLS_VERSION)-6.diff.gz
-SPEECH_TOOLS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/speech-tools/
-SPEECH_TOOLS_AUTORECONF = NO
-SPEECH_TOOLS_INSTALL_STAGING = NO
-SPEECH_TOOLS_INSTALL_TARGET = YES
-SPEECH_TOOLS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
-
-SPEECH_TOOLS_CONF_OPT =
-SPEECH_TOOLS_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)"
-
-define SPEECH_TOOLS_DEBIAN_PATCH_APPLY
-	# Use the order of the quilt patch series to apply the patches
-	for p in $$(cat $(@D)/debian/patches/series) ; do \
-                toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches $$p; \
-        done
-endef
-
-SPEECH_TOOLS_POST_PATCH_HOOKS += SPEECH_TOOLS_DEBIAN_PATCH_APPLY
-
-SPEECH_TOOLS_DEPENDENCIES = ncurses
-
-$(eval $(call AUTOTARGETS,package/multimedia/festival,speech-tools))
-
diff --git a/package/multimedia/festival/voices/Config.in b/package/multimedia/festival/voices/Config.in
deleted file mode 100644
index b0a1cc0b1c..0000000000
--- a/package/multimedia/festival/voices/Config.in
+++ /dev/null
@@ -1,63 +0,0 @@
-config BR2_PACKAGE_FESTVOX_AWB
-	bool "Alan Scottish English"
-	help
-	  Scottish English voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_BDL
-	bool "Brian US English"
-	help
-	  US English male voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_JMK
-	bool "John Canadian English"
-	help
-	  Canadian English voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_SLT
-	bool "Stephanie US English"
-	help
-	  US English female voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_AWB_MULTISYN
-	bool "Alan multisyn (big file)"
-	help
-	  voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_JMK_MULTISYN
-	bool "John multisyn (big file)"
-	help
-	  voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_KAL_SIXTEENK
-	bool "Kevin diphone US English 16k"
-	help
-	  diphone voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_KED_EIGHTK
-	bool "Kurt diphone American English 8k"
-	help
-	  diphone voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
-config BR2_PACKAGE_FESTVOX_KED_SIXTEENK
-	bool "Kurt diphone American English 16k"
-	help
-	  diphone voice for the festival text to speech system
-
-	  http://festvox.org/packed/festival/latest
-
diff --git a/package/multimedia/festival/voices/festvox.mk b/package/multimedia/festival/voices/festvox.mk
deleted file mode 100644
index a2ee169f3d..0000000000
--- a/package/multimedia/festival/voices/festvox.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#############################################################
-#
-# festival voices
-#
-#############################################################
-VOICE1 = festvox_cmu_us_awb_arctic_hts.tar.gz
-VOICE2 = festvox_cmu_us_bdl_arctic_hts.tar.gz
-VOICE3 = festvox_cmu_us_jmk_arctic_hts.tar.gz
-VOICE4 = festvox_cmu_us_slt_arctic_hts.tar.gz
-VOICE5 = festvox_cstr_us_awb_arctic_multisyn-1.0.tar.gz
-VOICE6 = festvox_cstr_us_jmk_arctic_multisyn-1.0.tar.gz
-VOICE7 = festvox_kallpc16k.tar.gz
-VOICE8 = festvox_kedlpc8k.tar.gz
-VOICE9 = festvox_kedlpc16k.tar.gz
-FRONTEND1 = festvox_us1.tar.gz
-FRONTEND2 = festvox_us2.tar.gz
-FRONTEND3 = festvox_us3.tar.gz
-FESTVOX_STATUS_DIR = $(BUILD_DIR)/festival_voices
-FESTVOX_INSTALL_DIR = $(TARGET_DIR)/usr/share
-
-$(FESTVOX_STATUS_DIR)/.downloaded:
-	mkdir -p $(FESTVOX_STATUS_DIR)
-ifeq ($(BR2_PACKAGE_FESTVOX_AWB),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE1))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_BDL),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE2))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_JMK),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE3))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_SLT),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE4))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_AWB_MULTISYN),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE5))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_JMK_MULTISYN),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE6))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_KAL_SIXTEENK),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE7))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_KED_EIGHTK),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE8))
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_KED_SIXTEENK),y)
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE9))
-endif
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND1))
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND2))
-	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND3))
-
-	touch $@
-
-$(FESTVOX_STATUS_DIR)/.installed: $(FESTVOX_STATUS_DIR)/.downloaded
-ifeq ($(BR2_PACKAGE_FESTVOX_AWB),y)
-	tar -xvf $(DL_DIR)/$(VOICE1) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_BDL),y)
-	tar -xvf $(DL_DIR)/$(VOICE2) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_JMK),y)
-	tar -xvf $(DL_DIR)/$(VOICE3) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_SLT),y)
-	tar -xvf $(DL_DIR)/$(VOICE4) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_AWB_MULTISYN),y)
-	tar -xvf $(DL_DIR)/$(VOICE5) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_JMK_MULTISYN),y)
-	tar -xvf $(DL_DIR)/$(VOICE6) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_KAL_SIXTEENK),y)
-	tar -xvf $(DL_DIR)/$(VOICE7) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_KED_EIGHTK),y)
-	tar -xvf $(DL_DIR)/$(VOICE8) --directory $(FESTVOX_INSTALL_DIR)
-endif
-ifeq ($(BR2_PACKAGE_FESTVOX_KED_SIXTEENK),y)
-	tar -xvf $(DL_DIR)/$(VOICE9) --directory $(FESTVOX_INSTALL_DIR)
-endif
-	tar -xvf $(DL_DIR)/$(FRONTEND1) --directory $(FESTVOX_INSTALL_DIR)
-	tar -xvf $(DL_DIR)/$(FRONTEND2) --directory $(FESTVOX_INSTALL_DIR)
-	tar -xvf $(DL_DIR)/$(FRONTEND3) --directory $(FESTVOX_INSTALL_DIR)
-
-	touch $@
-
-festvox: $(FESTVOX_STATUS_DIR)/.installed
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FESTIVAL),y)
-TARGETS+=festvox
-endif

From 95cf21ef8c098369a54e8bd2ec97f1b56433c928 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 May 2011 20:22:29 +0200
Subject: [PATCH 0252/6849] dhcpdump: move as a proper package, bump version

dhcpdump 1.7 required tcpdump, but version 1.8 now uses libpcap
instead. Also version 1.8 is no longer autotools based, but just a
simple Makefile.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/dhcpdump/Config.in                    |  5 ++
 .../dhcpdump-1.8-use-non-bsd-structures.patch | 23 +++++++
 package/dhcpdump/dhcpdump.mk                  | 21 +++++++
 package/tcpdump/Config.in                     |  6 --
 package/tcpdump/dhcpdump.mk                   | 62 -------------------
 6 files changed, 50 insertions(+), 68 deletions(-)
 create mode 100644 package/dhcpdump/Config.in
 create mode 100644 package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch
 create mode 100644 package/dhcpdump/dhcpdump.mk
 delete mode 100644 package/tcpdump/dhcpdump.mk

diff --git a/package/Config.in b/package/Config.in
index 5e48ab7ee0..1d3c0ccbb5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -385,6 +385,7 @@ source "package/cups/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
+source "package/dhcpdump/Config.in"
 source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ethtool/Config.in"
diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in
new file mode 100644
index 0000000000..1840e3428f
--- /dev/null
+++ b/package/dhcpdump/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_DHCPDUMP
+	bool "dhcpdump"
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  A tool for monitoring dhcp requests using tcpdump.
diff --git a/package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch b/package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch
new file mode 100644
index 0000000000..40115fb640
--- /dev/null
+++ b/package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch
@@ -0,0 +1,23 @@
+The udphdr structure has uh_* fields when _FAVOR_BSD is
+defined. Otherwise, the fields are just named source, dest, len and
+check. See <netinet/udp.h>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: dhcpdump-1.8/dhcpdump.c
+===================================================================
+--- dhcpdump-1.8.orig/dhcpdump.c	2011-05-17 20:20:46.506980003 +0200
++++ dhcpdump-1.8/dhcpdump.c	2011-05-17 20:20:59.338979999 +0200
+@@ -163,10 +163,10 @@
+ 	strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src));
+ 	strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst));
+ 
+-	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen)))
++	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len)))
+ 		return;
+ 
+-	printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen));
++	printdata((u_char *)(sp + offset), ntohs(udp->len));
+ }
+ 
+ // check for matching CHADDR (Peter Apian-Bennewitz <apian@ise.fhg.de>)
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
new file mode 100644
index 0000000000..cca6749842
--- /dev/null
+++ b/package/dhcpdump/dhcpdump.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# dhcpdump
+#
+#############################################################
+
+DHCPDUMP_VERSION = 1.8
+DHCPDUMP_SITE    = http://www.mavetju.org/download/
+DHCPDUMP_SOURCE  = dhcpdump-$(DHCPDUMP_VERSION).tar.gz
+
+DHCPDUMP_DEPENDENCIES = libpcap
+
+define DHCPDUMP_BUILD_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)"
+endef
+
+define DHCPDUMP_INSTALL_TARGET_CMDS
+	install -m 0755 -D $(@D)/dhcpdump $(TARGET_DIR)/usr/bin/dhcpdump
+endef
+
+$(eval $(call GENTARGETS,package,dhcpdump))
diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in
index 09e2740a06..c28439893c 100644
--- a/package/tcpdump/Config.in
+++ b/package/tcpdump/Config.in
@@ -11,9 +11,3 @@ config BR2_PACKAGE_TCPDUMP_SMB
 	depends on BR2_PACKAGE_TCPDUMP
 	help
 	  enable possibly-buggy SMB printer
-
-config BR2_PACKAGE_DHCPDUMP
-	bool "dhcpdump"
-	select BR2_PACKAGE_LIBPCAP
-	help
-	  A tool for monitoring dhcp requests using tcpdump.
diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk
deleted file mode 100644
index 0b2d64ace0..0000000000
--- a/package/tcpdump/dhcpdump.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#############################################################
-#
-# dhcpdump
-#
-#############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
-
-DHCPDUMP_VERSION:=1.7
-DHCPDUMP_DIR:=$(BUILD_DIR)/dhcpdump-$(DHCPDUMP_VERSION)
-DHCPDUMP_SITE:=http://www.mavetju.org/download/
-DHCPDUMP_SOURCE:=dhcpdump-$(DHCPDUMP_VERSION).tar.gz
-DHCPDUMP_CAT:=$(ZCAT)
-
-$(DL_DIR)/$(DHCPDUMP_SOURCE):
-	 $(call DOWNLOAD,$(DHCPDUMP_SITE),$(DHCPDUMP_SOURCE))
-
-dhcpdump-source: $(DL_DIR)/$(DHCPDUMP_SOURCE)
-
-$(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE)
-	$(DHCPDUMP_CAT) $(DL_DIR)/$(DHCPDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-$(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked
-	(cd $(DHCPDUMP_DIR); rm -f config.cache; \
-		BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)" \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-	)
-	touch $@
-
-$(DHCPDUMP_DIR)/dhcpdump: $(DHCPDUMP_DIR)/.configured
-	$(MAKE) CC="$(TARGET_CC)" -C $(DHCPDUMP_DIR)
-
-$(TARGET_DIR)/usr/sbin/dhcpdump: $(DHCPDUMP_DIR)/dhcpdump
-	cp -af $< $@
-
-dhcpdump: zlib libpcap $(TARGET_DIR)/usr/sbin/dhcpdump
-
-dhcpdump-clean:
-	rm -f $(TARGET_DIR)/usr/sbin/dhcpdump
-	-$(MAKE) -C $(DHCPDUMP_DIR) clean
-
-dhcpdump-dirclean:
-	rm -rf $(DHCPDUMP_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DHCPDUMP),y)
-TARGETS+=dhcpdump
-endif

From 7a1115b3c14554f260f2db2c1a490891a6160920 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 May 2011 20:56:46 +0200
Subject: [PATCH 0253/6849] sudo: bump and convert to AUTOTARGETS

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sudo/sudo-1.6.8p12-001-ubuntu6.patch  |  3994 ------
 ...sudo-1.6.8p12-002-no-cxx-configcheck.patch |    22 -
 .../sudo-1.6.8p12-003-cross-compile.patch     | 10219 ----------------
 package/sudo/sudo.mk                          |    96 +-
 4 files changed, 11 insertions(+), 14320 deletions(-)
 delete mode 100644 package/sudo/sudo-1.6.8p12-001-ubuntu6.patch
 delete mode 100644 package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch
 delete mode 100644 package/sudo/sudo-1.6.8p12-003-cross-compile.patch

diff --git a/package/sudo/sudo-1.6.8p12-001-ubuntu6.patch b/package/sudo/sudo-1.6.8p12-001-ubuntu6.patch
deleted file mode 100644
index a370bd06cc..0000000000
--- a/package/sudo/sudo-1.6.8p12-001-ubuntu6.patch
+++ /dev/null
@@ -1,3994 +0,0 @@
---- sudo-1.6.8p12.orig/sudoers.man.in
-+++ sudo-1.6.8p12/sudoers.man.in
-@@ -759,7 +759,7 @@
- .IP "exempt_group" 12
- .IX Item "exempt_group"
- Users in this group are exempt from password and \s-1PATH\s0 requirements.
--This is not set by default.
-+On Debian systems, this is set to the group 'sudo' by default. 
- .IP "verifypw" 12
- .IX Item "verifypw"
- This option controls when a password will be required when a user runs
---- sudo-1.6.8p12.orig/sudo.man.in
-+++ sudo-1.6.8p12/sudo.man.in
-@@ -185,8 +185,7 @@
- \&\fBsudo\fR determines who is an authorized user by consulting the file
- \&\fI@sysconfdir@/sudoers\fR.  By giving \fBsudo\fR the \fB\-v\fR flag a user
- can update the time stamp without running a \fIcommand.\fR The password
--prompt itself will also time out if the user's password is not
--entered within \f(CW\*(C`@password_timeout@\*(C'\fR minutes (unless overridden via
-+prompt itself will not time out in Debian's version (unless overridden via
- \&\fIsudoers\fR).
- .PP
- If a user who is not listed in the \fIsudoers\fR file tries to run a
---- sudo-1.6.8p12.orig/parse.yacc
-+++ sudo-1.6.8p12/parse.yacc
-@@ -120,6 +120,7 @@
- 	} \
- 	match[top].user   = UNSPEC; \
- 	match[top].cmnd   = UNSPEC; \
-+	match[top].cmndall= UNSPEC; \
- 	match[top].host   = UNSPEC; \
- 	match[top].runas  = UNSPEC; \
- 	match[top].nopass = def_authenticate ? UNSPEC : TRUE; \
-@@ -135,6 +136,7 @@
- 	} \
- 	match[top].user   = match[top-1].user; \
- 	match[top].cmnd   = match[top-1].cmnd; \
-+	match[top].cmndall= match[top-1].cmndall; \
- 	match[top].host   = match[top-1].host; \
- 	match[top].runas  = match[top-1].runas; \
- 	match[top].nopass = match[top-1].nopass; \
-@@ -675,6 +677,7 @@
- 				}
- 			    }
- 
-+			    SETMATCH(cmnd_all, TRUE);
- 			    $$ = TRUE;
- 			}
- 		|	ALIAS {
-@@ -705,6 +708,7 @@
- 				$$ = NOMATCH;
- 			    }
- 			    free($1);
-+			    SETMATCH(cmnd_all, FALSE);
- 			}
- 		|	 COMMAND {
- 			    if (printmatches == TRUE) {
-@@ -730,6 +734,7 @@
- 			    free($1.cmnd);
- 			    if ($1.args)
- 				free($1.args);
-+			    SETMATCH(cmnd_all, FALSE);
- 			}
- 		;
- 
---- sudo-1.6.8p12.orig/env.c
-+++ sudo-1.6.8p12/env.c
-@@ -77,7 +77,7 @@
- /*
-  * Prototypes
-  */
--char **rebuild_env		__P((char **, int, int));
-+char **rebuild_env		__P((char **, int, int, int));
- char **zero_env			__P((char **));
- static void insert_env		__P((char *, int));
- static char *format_env		__P((char *, ...));
-@@ -89,6 +89,8 @@
- static const char *initial_badenv_table[] = {
-     "IFS",
-     "CDPATH",
-+    "SHELLOPTS",
-+    "PS4",
-     "LOCALDOMAIN",
-     "RES_OPTIONS",
-     "HOSTALIASES",
-@@ -140,6 +142,12 @@
-     "LC_*",
-     "LANG",
-     "LANGUAGE",
-+    "TERM",
-+    "HOME",
-+    "LOGNAME",
-+    "DISPLAY",
-+    "XAUTHORITY",
-+    "XAUTHORIZATION",
-     NULL
- };
- 
-@@ -321,10 +329,11 @@
-  * Also adds sudo-specific variables (SUDO_*).
-  */
- char **
--rebuild_env(envp, sudo_mode, noexec)
-+rebuild_env(envp, sudo_mode, noexec, noclean)
-     char **envp;
-     int sudo_mode;
-     int noexec;
-+    int noclean;
- {
-     char **ep, *cp, *ps1;
-     int okvar, iswild, didvar;
-@@ -429,7 +438,7 @@
- 	 * env_check.
- 	 */
- 	for (ep = envp; *ep; ep++) {
--	    okvar = 1;
-+	    okvar = noclean;
- 
- 	    /* Skip variables with values beginning with () (bash functions) */
- 	    if ((cp = strchr(*ep, '=')) != NULL) {
-@@ -438,6 +447,7 @@
- 	    }
- 
- 	    /* Skip anything listed in env_delete. */
-+#if 0
- 	    for (cur = def_env_delete; cur && okvar; cur = cur->next) {
- 		len = strlen(cur->value);
- 		/* Deal with '*' wildcard */
-@@ -451,9 +461,10 @@
- 		    okvar = 0;
- 		}
- 	    }
-+#endif
- 
- 	    /* Check certain variables for '%' and '/' characters. */
--	    for (cur = def_env_check; cur && okvar; cur = cur->next) {
-+	    for (cur = def_env_check; cur; cur = cur->next) {
- 		len = strlen(cur->value);
- 		/* Deal with '*' wildcard */
- 		if (cur->value[len - 1] == '*') {
-@@ -463,8 +474,24 @@
- 		    iswild = 0;
- 		if (strncmp(cur->value, *ep, len) == 0 &&
- 		    (iswild || (*ep)[len] == '=') &&
--		    strpbrk(*ep, "/%")) {
--		    okvar = 0;
-+		    strpbrk(*ep, "/%") == NULL) {
-+		    okvar = 1;
-+		}
-+	    }
-+
-+	    /* keep variables in env_keep */
-+	    for (cur = def_env_keep; cur; cur = cur->next) {
-+		len = strlen(cur->value);
-+		/* Deal with '*' wildcard */
-+		if (cur->value[len - 1] == '*') {
-+		    len--;
-+		    iswild = 1;
-+		} else
-+		    iswild = 0;
-+		if (strncmp(cur->value, *ep, len) == 0 &&
-+		    (iswild || (*ep)[len] == '=')) {
-+		    okvar = 1;
-+		    break;
- 		}
- 	    }
- 
---- sudo-1.6.8p12.orig/sudoers.pod
-+++ sudo-1.6.8p12/sudoers.pod
-@@ -93,7 +93,7 @@
- 
-  Cmnd_Alias ::= NAME '=' Cmnd_List
- 
-- NAME ::= [A-Z]([A-Z][0-9]_)*
-+ NAME ::= [A-Z]([a-z][A-Z][0-9]_)*
- 
- Each I<alias> definition is of the form
- 
-@@ -568,7 +568,7 @@
- 
- =item C<%%>
- 
--two consecutive C<%> characters are collaped into a single C<%> character
-+two consecutive C<%> characters are collapsed into a single C<%> character
- 
- =back
- 
-@@ -669,8 +669,8 @@
- 
- =item exempt_group
- 
--Users in this group are exempt from password and PATH requirements.
--This is not set by default.
-+Users in this group are exempt from password and PATH requirements.  This
-+option is turned on for Debian.
- 
- =item verifypw
- 
---- sudo-1.6.8p12.orig/ins_classic.h
-+++ sudo-1.6.8p12/ins_classic.h
-@@ -32,7 +32,7 @@
-     "Where did you learn to type?",
-     "Are you on drugs?",
-     "My pet ferret can type better than you!",
--    "You type like i drive.",
-+    "You type like I drive.",
-     "Do you think like you type?",
-     "Your mind just hasn't been the same since the electro-shock, has it?",
- 
---- sudo-1.6.8p12.orig/config.guess
-+++ sudo-1.6.8p12/config.guess
-@@ -1,11 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
--#
--# $Sudo: config.guess,v 1.10 2004/08/09 23:04:35 millert Exp $
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2002-11-30'
-+timestamp='2005-08-03'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -19,13 +17,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Originally written by Per Bothner <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -55,7 +55,7 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -68,11 +68,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -100,14 +100,18 @@
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
- 
--# This shell variable is my proudest work .. or something. --bje
-+# Portable tmp directory creation inspired by the Autoconf team.
- 
--set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
--(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
--   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
--dummy=$tmpdir/dummy ;
--files="$dummy.c $dummy.o $dummy.rel $dummy" ;
--trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-  ,,)    echo "int x;" > $dummy.c ;
- 	for c in cc gcc c89 c99 ; do
-@@ -115,15 +119,13 @@
- 	     CC_FOR_BUILD="$c"; break ;
- 	  fi ;
- 	done ;
--	rm -f $files ;
- 	if test x"$CC_FOR_BUILD" = x ; then
- 	  CC_FOR_BUILD=no_compiler_found ;
- 	fi
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;
--unset files'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -196,104 +198,109 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
- 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	eval $set_cc_for_build
--	cat <<EOF >$dummy.s
--	.data
--\$Lformat:
--	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
--
--	.text
--	.globl main
--	.align 4
--	.ent main
--main:
--	.frame \$30,16,\$26,0
--	ldgp \$29,0(\$27)
--	.prologue 1
--	.long 0x47e03d80 # implver \$0
--	lda \$2,-1
--	.long 0x47e20c21 # amask \$2,\$1
--	lda \$16,\$Lformat
--	mov \$0,\$17
--	not \$1,\$18
--	jsr \$26,printf
--	ldgp \$29,0(\$26)
--	mov 0,\$16
--	jsr \$26,exit
--	.end main
--EOF
--	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
--	if test "$?" = 0 ; then
--		case `$dummy` in
--			0-0)
--				UNAME_MACHINE="alpha"
--				;;
--			1-0)
--				UNAME_MACHINE="alphaev5"
--				;;
--			1-1)
--				UNAME_MACHINE="alphaev56"
--				;;
--			1-101)
--				UNAME_MACHINE="alphapca56"
--				;;
--			2-303)
--				UNAME_MACHINE="alphaev6"
--				;;
--			2-307)
--				UNAME_MACHINE="alphaev67"
--				;;
--			2-1307)
--				UNAME_MACHINE="alphaev68"
--				;;
--			3-1307)
--				UNAME_MACHINE="alphaev7"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy && rmdir $tmpdir
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -301,29 +308,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
--    DRS?6000:UNIX_SV:4.2*:7*)
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -332,10 +342,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -347,10 +357,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -361,37 +371,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -415,33 +428,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--	rm -f $dummy.c $dummy && rmdir $tmpdir
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -457,29 +470,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -487,7 +500,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -502,15 +515,18 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--		rm -f $dummy.c $dummy && rmdir $tmpdir
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:[45])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-@@ -524,28 +540,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -602,16 +618,36 @@
-               }
- EOF
- 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
--		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
--		    rm -f $dummy.c $dummy && rmdir $tmpdir
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
- 		fi ;;
- 	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -639,149 +675,166 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--	rm -f $dummy.c $dummy && rmdir $tmpdir
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
--    CRAY*T3D:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
--	# Determine whether the default compiler uses glibc.
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#if __GLIBC__ >= 2
--	LIBC=gnu
--	#else
--	LIBC=
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c && rmdir $tmpdir
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
--    x86:Interix*:3*)
--	echo i586-pc-interix3
--	exit 0 ;;
-+	exit ;;
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -799,8 +852,7 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	rm -f $dummy.c && rmdir $tmpdir
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -819,15 +871,17 @@
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	rm -f $dummy.c && rmdir $tmpdir
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -841,7 +895,7 @@
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -849,22 +903,25 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -882,15 +939,15 @@
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
-+		exit ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
-+		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
- 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
-+		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -913,18 +970,23 @@
- 	LIBC=gnuaout
- 	#endif
- 	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c && rmdir $tmpdir
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -932,24 +994,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -957,15 +1022,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -983,73 +1049,73 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
--    M68*:*:R3V[567]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1057,64 +1123,73 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
--	echo `uname -p`-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    *86) UNAME_PROCESSOR=i686 ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1122,22 +1197,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
--    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1148,25 +1226,44 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1198,7 +1295,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1287,12 +1384,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--rm -f $dummy.c $dummy && rmdir $tmpdir
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1301,22 +1398,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
-@@ -1327,7 +1424,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--    ftp://ftp.gnu.org/pub/gnu/config/
-+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+and
-+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
---- sudo-1.6.8p12.orig/config.sub
-+++ sudo-1.6.8p12/config.sub
-@@ -1,11 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
--#
--# $Sudo: config.sub,v 1.11 2003/01/20 21:07:51 millert Exp $
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2002-11-30'
-+timestamp='2005-07-08'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -23,14 +21,15 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
- # diff and a properly formatted ChangeLog entry.
- #
-@@ -72,7 +71,7 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -85,11 +84,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -101,7 +100,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -120,7 +119,8 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -146,7 +146,7 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis | -sr2201*)
-+	-apple | -axis | -knuth | -cray)
- 		os=
- 		basic_machine=$1
- 		;;
-@@ -230,14 +230,16 @@
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
--	| clipper \
-+	| bfin \
-+	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
- 	| fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
--	| ip2k \
--	| m32r | m68000 | m68k | m88k | mcore \
-+	| ip2k | iq2000 \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
-@@ -246,28 +248,37 @@
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
- 	| mipsisa64sb1 | mipsisa64sb1el \
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| ms1 \
-+	| msp430 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b \
- 	| strongarm \
--	| tahoe | thumb | tic80 | tron \
-+	| tahoe | thumb | tic4x | tic80 | tron \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xstormy16 | xtensa \
-+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-@@ -295,19 +306,19 @@
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* \
--	| bs2000-* \
--	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
--	| clipper-* | cydra-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
- 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
--	| ip2k-* \
--	| m32r-* \
-+	| ip2k-* | iq2000-* \
-+	| m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
-@@ -316,29 +327,40 @@
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
- 	| mipsisa64sb1-* | mipsisa64sb1el-* \
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
--	| mipstx39 | mipstx39el \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| ms1-* \
-+	| msp430-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
--	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--	| xtensa-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa-* \
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	m32c-*)
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -355,6 +377,9 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -434,12 +459,27 @@
- 		basic_machine=j90-cray
- 		os=-unicos
- 		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16c)
-+		basic_machine=cr16c-unknown
-+		os=-elf
-+		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
-@@ -462,6 +502,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -515,10 +559,6 @@
- 		basic_machine=h8500-hitachi
- 		os=-hms
- 		;;
--	sr2201*)
--		basic_machine=harp1e-hitachi
--		os=-hiuxmpp
--		;;
- 	harris)
- 		basic_machine=m88k-harris
- 		os=-sysv3
-@@ -644,10 +684,6 @@
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
--	mmix*)
--		basic_machine=mmix-knuth
--		os=-mmixware
--		;;
- 	monitor)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -735,9 +771,12 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
- 		;;
- 	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
-@@ -770,18 +809,24 @@
- 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
--	pentiumii | pentium2)
-+	pentiumii | pentium2 | pentiumiii | pentium3)
- 		basic_machine=i686-pc
- 		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
- 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumii-* | pentium2-*)
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
-@@ -840,6 +885,10 @@
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -847,6 +896,9 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
- 	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
-@@ -913,10 +965,6 @@
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
--	t3d)
--		basic_machine=alpha-cray
--		os=-unicos
--		;;
- 	t3e)
- 		basic_machine=alphaev5-cray
- 		os=-unicos
-@@ -925,14 +973,18 @@
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
--        tic4x | c4x*)
--		basic_machine=tic4x-unknown
--		os=-coff
--		;;
- 	tic54x | c54x*)
- 		basic_machine=tic54x-unknown
- 		os=-coff
- 		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -946,6 +998,10 @@
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
- 	udi29k)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -989,6 +1045,10 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1019,6 +1079,9 @@
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
-@@ -1035,13 +1098,10 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
--	sparc | sparcv9 | sparcv9b)
-+	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1114,19 +1174,21 @@
- 	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1144,12 +1206,15 @@
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
- 		os=`echo $os | sed -e 's|mac|macos|'`
- 		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -1162,6 +1227,9 @@
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
- 	-wince*)
- 		os=-wince
- 		;;
-@@ -1183,6 +1251,9 @@
- 	-atheos*)
- 		os=-atheos
- 		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
-@@ -1205,6 +1276,9 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
-@@ -1235,6 +1309,15 @@
- 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- 		os=-mint
- 		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1266,6 +1349,9 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-@@ -1309,9 +1395,15 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1444,9 +1536,15 @@
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
- 			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
-@@ -1471,7 +1569,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
---- sudo-1.6.8p12.orig/sudoers
-+++ sudo-1.6.8p12/sudoers
-@@ -1,10 +1,17 @@
- # sudoers file.
- #
- # This file MUST be edited with the 'visudo' command as root.
-+# 'visudo' edits the suoders file in a safe fashion. visudo
-+# locks the sudoers file against multiple simultaneous edits,
-+# provides basic sanity checks, and checks for syntax errors. If
-+# the sudoers file is currently being edited you will receive a 
-+# message to try again later.
- #
- # See the sudoers man page for the details on how to write a sudoers file.
- #
- 
-+# Defaults syslog=auth, secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-+
- # Host alias specification
- 
- # User alias specification
---- sudo-1.6.8p12.orig/debian/dirs
-+++ sudo-1.6.8p12/debian/dirs
-@@ -0,0 +1,7 @@
-+etc/pam.d
-+usr/bin
-+usr/share/man/man8
-+usr/share/man/man5
-+usr/sbin
-+usr/share/doc/sudo/examples
-+usr/share/lintian/overrides
---- sudo-1.6.8p12.orig/debian/docs
-+++ sudo-1.6.8p12/debian/docs
-@@ -0,0 +1,9 @@
-+debian/OPTIONS 
-+BUGS 
-+RUNSON 
-+UPGRADE 
-+PORTING
-+TODO 
-+HISTORY 
-+README 
-+TROUBLESHOOTING
---- sudo-1.6.8p12.orig/debian/sudo-ldap.init.d
-+++ sudo-1.6.8p12/debian/sudo-ldap.init.d
-@@ -0,0 +1,31 @@
-+#! /bin/sh
-+
-+### BEGIN INIT INFO
-+# Provides:          sudu
-+# Required-Start:    $local_fs $remote_fs
-+# Required-Stop:
-+# Default-Start:     S 1 2 3 4 5
-+# Default-Stop:      0 6
-+### END INIT INFO
-+
-+N=/etc/init.d/sudo
-+
-+set -e
-+
-+case "$1" in
-+  start)
-+	# make sure privileges don't persist across reboots
-+	if [ -d /var/run/sudo ]
-+	then
-+                find /var/run/sudo -type f -exec touch -t 198501010000 '{}' \;
-+	fi
-+	;;
-+  stop|reload|restart|force-reload)
-+	;;
-+  *)
-+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-+	exit 1
-+	;;
-+esac
-+
-+exit 0
---- sudo-1.6.8p12.orig/debian/control
-+++ sudo-1.6.8p12/debian/control
-@@ -0,0 +1,32 @@
-+Source: sudo
-+Section: admin
-+Priority: optional
-+Maintainer: Bdale Garbee <bdale@gag.com>
-+Build-Depends: debhelper (>= 5), libpam0g-dev, libldap2-dev
-+Standards-Version: 3.6.2.1
-+
-+Package: sudo
-+Architecture: any
-+Depends: ${shlibs:Depends}, libpam-modules
-+Conflicts: sudo-ldap
-+Replaces: sudo-ldap
-+Description: Provide limited super user privileges to specific users
-+ Sudo is a program designed to allow a sysadmin to give limited root
-+ privileges to users and log root activity.  The basic philosophy is to give
-+ as few privileges as possible but still allow people to get their work done.
-+ .
-+ This version is built with minimal shared library dependencies, use the
-+ sudo-ldap package instead if you need LDAP support.
-+
-+Package: sudo-ldap
-+Architecture: any
-+Depends: ${shlibs:Depends}, libpam-modules
-+Conflicts: sudo
-+Replaces: sudo
-+Provides: sudo
-+Description: Provide limited super user privileges to specific users
-+ Sudo is a program designed to allow a sysadmin to give limited root
-+ privileges to users and log root activity.  The basic philosophy is to give
-+ as few privileges as possible but still allow people to get their work done.
-+ .
-+ This version is built with LDAP support.
---- sudo-1.6.8p12.orig/debian/sudo-ldap.postrm
-+++ sudo-1.6.8p12/debian/sudo-ldap.postrm
-@@ -0,0 +1,21 @@
-+#! /bin/sh
-+
-+set -e
-+
-+case "$1" in
-+       purge)
-+	rm -f /etc/sudoers
-+        ;;
-+
-+       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-+        ;;
-+
-+    *)
-+        echo "postrm called with unknown argument \`$1'" >&2
-+        exit 1
-+
-+esac
-+
-+#DEBHELPER#
-+
-+exit 0
---- sudo-1.6.8p12.orig/debian/prerm
-+++ sudo-1.6.8p12/debian/prerm
-@@ -0,0 +1,37 @@
-+#!/bin/sh
-+
-+set -e
-+
-+check_password() {
-+   if [ ! "$SUDO_FORCE_REMOVE" = "yes" ]; then
-+        # let's check whether the root account is locked.
-+        # if it is, we're not going another step. No Sirreee!
-+        passwd=$(getent shadow root|cut -f2 -d:)
-+        if [ "$passwd" = "*" -o "$passwd" = "!" ]; then
-+            # yup, password is locked
-+            echo "You have asked that the sudo package be removed,"
-+            echo "but no root password has been set."
-+            echo "Without sudo, you may not be able to gain administrative privileges."
-+            echo
-+            echo "If you would prefer to access the root account with su(1)"
-+            echo "or by logging in directly,"
-+            echo "you must set a root password with \"sudo passwd\"."
-+            echo 
-+            echo "If you have arranged other means to access the root account,"
-+            echo "and you are sure this is what you want,"
-+            echo "you may bypass this check by setting an environment variable "
-+            echo "(export SUDO_FORCE_REMOVE=yes)."
-+            echo
-+            echo "Refusing to remove sudo."
-+            exit 1
-+        fi
-+   fi
-+}
-+        
-+case $1 in
-+        remove)
-+                check_password;
-+                ;;
-+        *)
-+                ;;
-+esac
---- sudo-1.6.8p12.orig/debian/rules
-+++ sudo-1.6.8p12/debian/rules
-@@ -0,0 +1,140 @@
-+#!/usr/bin/make -f
-+
-+export DH_VERBOSE=1
-+
-+CFLAGS = -O2 -Wall -Wno-comment
-+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-+CFLAGS += -g
-+endif
-+export CFLAGS
-+
-+build: config-stamp
-+config-stamp:
-+	dh_testdir
-+
-+	# simple version
-+	mkdir -p build-simple
-+	cd build-simple && ../configure --prefix=/usr -v \
-+		--with-all-insults \
-+		--with-exempt=sudo --with-pam --with-fqdn \
-+		--with-logging=syslog --with-logfac=authpriv \
-+		--with-env-editor --with-editor=/usr/bin/editor \
-+		--with-timeout=15 --with-password-timeout=0 \
-+		--disable-root-mailer --disable-setresuid \
-+		--with-sendmail=/usr/sbin/sendmail \
-+		--without-lecture \
-+		--with-secure-path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-+
-+	# LDAP version
-+	mkdir -p build-ldap
-+	cd build-ldap && ../configure --prefix=/usr -v \
-+		--with-all-insults \
-+		--with-exempt=sudo --with-pam --with-ldap --with-fqdn \
-+		--with-logging=syslog --with-logfac=authpriv \
-+		--with-env-editor --with-editor=/usr/bin/editor \
-+		--with-timeout=15 --with-password-timeout=0 \
-+		--disable-root-mailer --disable-setresuid \
-+		--with-sendmail=/usr/sbin/sendmail \
-+		--with-ldap-conf-file=/etc/ldap/ldap.conf \
-+		--with-secure-path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-+
-+	touch config-stamp
-+
-+build: build-stamp
-+build-stamp: config-stamp
-+	dh_testdir
-+
-+	-$(MAKE) -C build-simple
-+	-$(MAKE) -C build-ldap
-+
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f config-stamp build-stamp
-+	rm -rf build-simple build-ldap
-+	rm -f config.cache
-+
-+	-test -r /usr/share/misc/config.sub && \
-+		cp -f /usr/share/misc/config.sub config.sub
-+	-test -r /usr/share/misc/config.guess && \
-+		cp -f /usr/share/misc/config.guess config.guess
-+
-+	dh_clean
-+
-+install: build-stamp
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	# simple version
-+	install -o root -g root -m 4755 -s build-simple/sudo debian/sudo/usr/bin/sudo
-+	ln -sf sudo debian/sudo/usr/bin/sudoedit
-+	install -o root -g root -m 0755 -s build-simple/visudo \
-+		debian/sudo/usr/sbin/visudo
-+	install -o root -g root -m 0644 build-simple/sudo.man \
-+		debian/sudo/usr/share/man/man8/sudo.8 
-+	ln -sf sudo.8 debian/sudo/usr/share/man/man8/sudoedit.8
-+	install -o root -g root -m 0644 build-simple/visudo.man \
-+		debian/sudo/usr/share/man/man8/visudo.8 
-+	install -o root -g root -m 0644 build-simple/sudoers.man \
-+		debian/sudo/usr/share/man/man5/sudoers.5 
-+	install -o root -g root -m 0644 sample.sudoers \
-+		debian/sudo/usr/share/doc/sudo/examples/sudoers
-+	install -o root -g root -m 0644 debian/sudo.pam \
-+		debian/sudo/etc/pam.d/sudo
-+
-+	install -o root -g root -m 0644 debian/sudo.lintian \
-+		debian/sudo/usr/share/lintian/overrides/sudo
-+
-+	install -o root -g root -m 0644 debian/sudo_root.8 \
-+		debian/sudo/usr/share/man/man8/sudo_root.8 
-+
-+	# LDAP version
-+	install -o root -g root -m 4755 -s build-ldap/sudo debian/sudo-ldap/usr/bin/sudo
-+	ln -sf sudo debian/sudo-ldap/usr/bin/sudoedit
-+	install -o root -g root -m 0755 -s build-ldap/visudo debian/sudo-ldap/usr/sbin/visudo
-+	install -o root -g root -m 0644 build-ldap/sudo.man \
-+		debian/sudo-ldap/usr/share/man/man8/sudo.8 
-+	ln -sf sudo.8 debian/sudo-ldap/usr/share/man/man8/sudoedit.8
-+	install -o root -g root -m 0644 build-ldap/visudo.man \
-+		debian/sudo-ldap/usr/share/man/man8/visudo.8 
-+	install -o root -g root -m 0644 build-ldap/sudoers.man \
-+		debian/sudo-ldap/usr/share/man/man5/sudoers.5 
-+	install -o root -g root -m 0644 sample.sudoers \
-+		debian/sudo-ldap/usr/share/doc/sudo-ldap/examples/sudoers
-+	install -o root -g root -m 0644 debian/sudo.pam \
-+		debian/sudo-ldap/etc/pam.d/sudo
-+
-+	install -o root -g root -m 0644 debian/sudo-ldap.lintian \
-+		debian/sudo-ldap/usr/share/lintian/overrides/sudo-ldap
-+
-+	install -o root -g root -m 0644 debian/sudo_root.8 \
-+		debian/sudo/usr/share/man/man8/sudo_root.8 
-+
-+binary-indep: build install
-+
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installdocs
-+	dh_installexamples -A
-+#	dh_installinit -psudo -psudo-ldap
-+	dh_installmanpages fnmatch.3
-+	dh_installinfo -A
-+	dh_installchangelogs CHANGES
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	chown root.root debian/sudo/usr/bin/sudo debian/sudo-ldap/usr/bin/sudo
-+	chmod 4755 debian/sudo/usr/bin/sudo debian/sudo-ldap/usr/bin/sudo
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
---- sudo-1.6.8p12.orig/debian/changelog
-+++ sudo-1.6.8p12/debian/changelog
-@@ -0,0 +1,769 @@
-+sudo (1.6.8p12-1ubuntu6) dapper; urgency=low
-+
-+  * env.c: Preserve additional environment variables for non-almighty sudoers:
-+    HOME, LOGNAME, DISPLAY, XAUTHORITY, XAUTHORIZATION. Closes: LP#44500
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 17 May 2006 09:29:15 +0200
-+
-+sudo (1.6.8p12-1ubuntu5) dapper; urgency=low
-+
-+  * env.c: Unbreak the env_keep option. Closes: LP#31690
-+  * sudoers: Add some explanatory text why it is a REALLY good idea to use
-+    visudo. Closes: LP#11620
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 28 Mar 2006 18:52:24 +0200
-+
-+sudo (1.6.8p12-1ubuntu4) dapper; urgency=low
-+
-+  * Remove the init script, it only cleans up /var/run which is a tmpfs.
-+
-+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 22 Feb 2006 16:28:42 +0000
-+
-+sudo (1.6.8p12-1ubuntu3) dapper; urgency=low
-+
-+  * Add debian/sudo_root.8: Introduction about root handling in ubuntu with
-+    sudo.
-+  * debian/rules: Install that new manpage into sudo and sudo-ldap.
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed,  8 Feb 2006 17:01:50 +0100
-+
-+sudo (1.6.8p12-1ubuntu2) dapper; urgency=low
-+
-+  * sudo.c: If the user successfully authenticated and he is in the 'admin'
-+    group, then create a stamp ~/.sudo_as_admin_successful. A future
-+    /etc/profile will evaluate this flag to display a short help about how to
-+    execute things as root.
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 18 Jan 2006 09:32:02 +0100
-+
-+sudo (1.6.8p12-1ubuntu1) dapper; urgency=low
-+
-+  * Resynchronise with Debian, clean up cruft from Ubuntu diff.
-+  * debian/postinst: Do not set env_reset flag in newly created sudoers files;
-+    it's incompatible with upgrades.
-+  * Clean up environment variable handling to fix vulns like CVE-2005-4158 and
-+    CVE-2006-0151 once and for all: Only keep known-good variables if user has
-+    limited sudo privileges (blacklist -> whitelist) and keep them all for
-+    users with unlimited command privileges (to not drive admins and
-+    developers up the wall which actually need to pass env variables from time
-+    to time).
-+    - parse.h, parse.yacc:
-+      + Add a new flag 'cmdall' to the matchstack, and a new macro 'cmnd_all'
-+        to access it.
-+      + In the "cmnd" grammar rule: Set cmdall to TRUE if command specifier is
-+        'ALL', otherwise to FALSE.
-+    - sudo.tab.cc: Re-yaccified to match changes to parse.yacc.
-+    - sudo.h: Add new sudoers_lookup() return flag FLAG_CMND_ALL.
-+    - parse.c, sudoers_lookup(): Set flag FLAG_CMND_ALL if cmnd_all matched.
-+    - ldap.c:
-+      + sudo_ldap_check_command(): Add return parameter all, set to true
-+        if command specifier is 'ALL'.
-+      + sudo_ldap_check(): Set flag FLAG_CMND_ALL if sudo_ldap_check_command()
-+        returned all=1.
-+    - env.c:
-+      + Apply Martin Schulze's patch to switch from blacklist to whitelist
-+        environment cleaning.
-+      + Add parameter 'noclean' to rebuild_env(); if it is != 0, environment
-+        variables are not cleaned.
-+    - sudo.c: Call rebuild_env() with noclean=1 if FLAG_CMND_ALL is set.
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 17 Jan 2006 10:03:05 +0100
-+
-+sudo (1.6.8p12-1) unstable; urgency=low
-+
-+  * new upstream version, closes: #342948 (CVE-2005-4158)
-+  * add env_reset to the sudoers file we create if none already exists,
-+    as a further precaution in response to discussion about CVS-2005-4158
-+  * split ldap support into a new sudo-ldap package.  I was trying to avoid
-+    doing this, but the impact of going from 4 to 17 linked shlibs on the 
-+    autobuilder chroots is sufficient motivation for me.
-+    closes: #344034
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed, 28 Dec 2005 13:49:10 -0700
-+
-+sudo (1.6.8p9-4) unstable; urgency=low
-+
-+  * enable ldap support, deliver README.LDAP and sudoers2ldif, closes: #283231 
-+  * merge patch from Martin Pitt / Ubuntu to be more robust about resetting
-+    timestamps in the init.d script, closes: #330868
-+  * add dependency header to init.d script, closes: #332849
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 10 Dec 2005 07:47:07 -0800
-+
-+sudo (1.6.8p9-3ubuntu4) dapper; urgency=low
-+
-+  * Revert addition of sudo -t, i. e. revert to version 1.6.8p9-3ubuntu1. As
-+    per TB discussion, we will not use sudo for implementing
-+    https://wiki.ubuntu.com/HideAdminToolsToUsers.
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 29 Nov 2005 23:27:42 +0100
-+
-+sudo (1.6.8p9-3ubuntu3) dapper; urgency=low
-+
-+  * sudo.c: Log failures even in test mode, to avoid the possibility of
-+    silently poking around for interesting sudo privileges. This will generate
-+    a lot of auth log clutter in the desktop case, but will not change sudo
-+    semantics where it matters (on servers).
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 17 Nov 2005 10:35:04 +0100
-+
-+sudo (1.6.8p9-3ubuntu2) dapper; urgency=low
-+
-+  * Add option -t which only tests whether the given command can be executed
-+    and does not require a password. This is required for the
-+    https://wiki.ubuntu.com/HideAdminToolsToUsers spec.
-+  * sudo.h: Add MODE_TESTONLY mode.
-+  * sudo.c: Add -t parsing and do not actually run the command in test mode,
-+    just return success or failure. Also, add the new option to the "usage"
-+    output.
-+  * sudo.pod: Document new -t option.
-+  * Put patch into debian/ubuntu-patches/sudo.add-test-option.patch to have
-+    it separate for future merges (requires a manual "make sudo.man.in" to
-+    actually run pod2man).
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed,  9 Nov 2005 17:40:43 -0500
-+
-+sudo (1.6.8p9-3ubuntu1) dapper; urgency=low
-+
-+  * Resynchronise with Debian.
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed,  9 Nov 2005 17:12:06 -0500
-+
-+sudo (1.6.8p9-3) unstable; urgency=high
-+
-+  * update debhelper compatibility level from 2 to 4
-+  * add man page symlink for sudoedit
-+  * Clean SHELLOPTS and PS4 from the environment before executing programs
-+    with sudo permissions [env.c, CAN-2005-2959]
-+  * fix typo in manpage pointed out by Moray Allen, closes: #285995
-+  * fix paths in sample complex sudoers file, closes: #303542
-+  * fix type in sudoers man page, closes: #311244
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed, 28 Sep 2005 01:18:04 -0600
-+
-+sudo (1.6.8p9-2ubuntu2) breezy; urgency=low
-+
-+  * debian/init.d: When resetting the timestamps of the tty tags, actually
-+    touch the files, not the per-user directories. Since bootclean.sh removes
-+    /var/run/* anyway, this is no big deal, but clean it up anyway for the
-+    sake of correctness. (Ubuntu #16594)
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 30 Sep 2005 09:52:27 +0200
-+
-+sudo (1.6.8p9-2ubuntu1) breezy; urgency=low
-+
-+  * Resynchronise with Debian, resolve merging conflicts and unscramble
-+    changelog.
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  7 Jul 2005 09:01:48 +0000
-+
-+sudo (1.6.8p9-2) unstable; urgency=high
-+
-+  * merge the NMU fix for sudoedit symlink problem that was in 1.6.8p7-1.1,
-+    closes: #305735
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 28 Jun 2005 16:18:47 -0400
-+
-+sudo (1.6.8p9-1) unstable; urgency=high
-+
-+  * new upstream version, fixes a race condition in sudo's pathname
-+    validation, which is a security issue (CAN-2005-1993), 
-+    closes: #315115, #315718
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 28 Jun 2005 15:33:11 -0400
-+
-+sudo (1.6.8p7-1) unstable; urgency=low
-+
-+  * new upstream version, closes: #299585
-+  * update lintian overrides to squelch the postinst warning
-+  * change sudoedit from a hard to a soft link, closes: #296896
-+  * fix regex doc in sudoers man page, closes: #300361
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 26 Mar 2005 22:18:34 -0700
-+
-+sudo (1.6.8p5-1ubuntu3) breezy; urgency=low
-+
-+  * SECURITY UPDATE: Fix privilege escalation.
-+  * sudo.c, parse.yacc: safe_cmd contains the actually executed program which
-+    is normally taken from /etc/sudoers. However, if sudoers contains "ALL"
-+    entries that follow the matching entry, safe_cmd was overwritten with the
-+    path the user specified on the command line, which opens up the
-+    possibility of executing arbitrary commands by generating symlinks to
-+    them.
-+  * References:
-+    CAN-2005-1993
-+    http://www.securityfocus.com/archive/1/402741
-+
-+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 21 Jun 2005 13:41:05 +0200
-+
-+sudo (1.6.8p5-1ubuntu2) hoary; urgency=low
-+
-+  * Add !fqdn to the Defaults so we don't die horribly when localhost doesn't
-+    resolve (Ubuntu: 2772)
-+
-+ -- Thom May <thom@ubuntu.com>  Wed,  2 Mar 2005 20:34:20 +0000
-+
-+sudo (1.6.8p5-1ubuntu1) hoary; urgency=low
-+
-+  * Resync with Debian
-+
-+ -- LaMont Jones <lamont@canonical.com>  Mon,  6 Dec 2004 09:31:28 -0700
-+
-+sudo (1.6.8p5-1) unstable; urgency=high
-+
-+  * new upstream version
-+  * restores ability to use config tuples without a value, which was causing
-+    problems on upgrade closes: #283306
-+  * deliver sudoedit, closes: #283078
-+  * marking urgency high since 283306 is a serious upgrade incompatibility
-+
-+ -- Bdale Garbee <bdale@gag.com>  Fri,  3 Dec 2004 10:11:16 -0700
-+
-+sudo (1.6.8p3-2) unstable; urgency=high
-+
-+  * update pam.d deliverable so ldap works again, closes: #282191
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon, 22 Nov 2004 11:44:46 -0700
-+
-+sudo (1.6.8p3-1) unstable; urgency=high
-+
-+  * new upstream version, fixes a flaw in sudo's environment sanitizing that 
-+    could allow a malicious user with permission to run a shell script that 
-+    utilized the bash shell to run arbitrary commands, closes: #281665
-+  * patch the sample sudoers to have the proper path for kill on Debian
-+    systems, closes: #263486
-+  * patch the sudo manpage to reflect Debian's choice of exempt_group 
-+    default setting, closes: #236465
-+  * patch the sudo manpage to reflect Debian's choice of no timeout on the
-+    password prompt, closes: #271194
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 16 Nov 2004 23:23:41 -0700
-+
-+sudo (1.6.7p5-2ubuntu2) hoary; urgency=low
-+
-+  * SECURITY UPDATE: fix input validation flaw
-+  * env.c, rebuild_env(): skip variables with values beginnig with "()" to
-+    ignore exported bash functions in the sudo environment; this prevents
-+    introducing malicious functions with the name of commands that are
-+    executed without full path
-+  * References:
-+    http://www.sudo.ws/sudo/alerts/bash_functions.html
-+
-+ -- Martin Pitt <martin.pitt@canonical.com>  Wed, 17 Nov 2004 18:54:30 +0100
-+
-+sudo (1.6.7p5-2ubuntu1) hoary; urgency=low
-+
-+  * Resynchronise with Debian.
-+
-+ -- Scott James Remnant <scott@canonical.com>  Wed, 27 Oct 2004 15:06:39 +0100
-+
-+sudo (1.6.7p5-2) unstable; urgency=low
-+
-+  * Jeff Bailey reports that seteuid works on current sparc systems, so we
-+    no longer need the "grosshack" stuff in the sudo rules file
-+  * add a postrm that removes /etc/sudoers on purge.  don't do this with the
-+    normal conffile mechanism since it would generate noise on every upgrade,
-+    closes: #245405
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 20 Jul 2004 12:29:48 -0400
-+
-+sudo (1.6.7p5-1ubuntu4) warty; urgency=low
-+
-+  * Disable lecture by default. (Warty #987)
-+
-+ -- Thom May <thom@canonical.com>  Wed,  6 Oct 2004 14:31:31 +0100
-+
-+sudo (1.6.7p5-1ubuntu3) warty; urgency=low
-+
-+  * Refuse to remove sudo if the root password is not set and the user is
-+    running us via sudo
-+
-+ -- Thom May <thom@canonical.com>  Mon, 27 Sep 2004 15:30:09 +0100
-+
-+sudo (1.6.7p5-1ubuntu2) warty; urgency=low
-+
-+  * Add 'Defaults !lecture,tty_tickets' to initial sudoers file.
-+
-+ -- Colin Watson <cjwatson@flatline.org.uk>  Mon, 23 Aug 2004 21:03:15 +0100
-+
-+sudo (1.6.7p5-1ubuntu1) warty; urgency=low
-+
-+  * Remove /etc/sudoers on purge. (Closes: #245405)
-+
-+ -- Fabio M. Di Nitto <fabbione@fabbione.net>  Mon, 19 Jul 2004 09:42:04 +0200
-+
-+sudo (1.6.7p5-1) unstable; urgency=low
-+
-+  * new upstream version, closes: #190265, #193222, #197244
-+  * change from '.' to ':' in postinst chown call, closes: #208369
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue,  2 Sep 2003 21:27:06 -0600
-+
-+sudo (1.6.7p3-2) unstable; urgency=low
-+
-+  * add --disable-setresuid to configure call since 2.2 kernels don't support
-+    setresgid, closes: #189044
-+  * cosmetic cleanups to debian/rules as long as I'm there
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 15 Apr 2003 16:04:48 -0600
-+
-+sudo (1.6.7p3-1) unstable; urgency=low
-+
-+  * new upstream version
-+  * add overrides to quiet lintian about things it doesn't understand,
-+    except the source one that can't be overridden until 129510 is fixed
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon,  7 Apr 2003 17:34:05 -0600
-+
-+sudo (1.6.6-3) unstable; urgency=low
-+
-+  * add code to rules file to update config.sub/guess, closes: #164501
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 12 Oct 2002 15:35:22 -0600
-+
-+sudo (1.6.6-2) unstable; urgency=low
-+
-+  * adopt suggestion from Marcus Brinkmann to feed --with-sendmail option to
-+    configure, and lose the build dependency on mail-transport-agent
-+  * incorporate changes from LaMont's NMU, closes: #144665, #144737
-+  * update init.d to not try and set time on nonexistent timestamp files, 
-+    closes: #132616
-+  * build with --with-all-insults, admin must edit sudoers to turn insults 
-+    on at runtime if desired, closes: #135374
-+  * stop setting /usr/doc symlink in postinst
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 12 Oct 2002 01:54:24 -0600
-+
-+sudo (1.6.6-1.1) unstable; urgency=high
-+
-+  * NMU - patch from Colin Watson <cjwatson@debian.org>, in bts.
-+  * Revert patch to auth/pam.c that left pass uninitialized, causing a
-+    segfault (Closes: #144665).
-+
-+ -- LaMont Jones <lamont@debian.org>  Fri, 26 Apr 2002 22:36:04 -0600
-+
-+sudo (1.6.6-1) unstable; urgency=high
-+
-+  * new upstream version, fixes security problem with crafty prompts, 
-+    closes: #144540
-+
-+ -- Bdale Garbee <bdale@gag.com>  Thu, 25 Apr 2002 12:45:49 -0600
-+
-+sudo (1.6.5p1-4) unstable; urgency=high
-+
-+  * apply patch for auth/pam.c to fix yet another way to make sudo segfault
-+    if ctrl/C'ed at password prompt, closes: #131235
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun,  3 Mar 2002 23:18:56 -0700
-+
-+sudo (1.6.5p1-3) unstable; urgency=high
-+
-+  * ugly hack to add --disable-saved-ids when building on sparc in response 
-+    to 131592, which will be reassigned to glibc for a real fix
-+  * urgency high since the sudo currently in testing for sparc is worthless
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 17 Feb 2002 22:42:10 -0700
-+
-+sudo (1.6.5p1-2) unstable; urgency=high
-+
-+  * patch from upstream to fix seg faults caused by versions of pam that
-+    follow a NULL pointer, closes: #129512
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 22 Jan 2002 01:50:13 -0700
-+
-+sudo (1.6.5p1-1) unstable; urgency=high
-+
-+  * new upstream version
-+  * add --disable-root-mailer option supported by new version to configure 
-+    call in rules file, closes: #129648
-+
-+ -- Bdale Garbee <bdale@gag.com>  Fri, 18 Jan 2002 11:29:37 -0700
-+
-+sudo (1.6.4p1-1) unstable; urgency=high
-+
-+  * new upstream version, with fix for segfaulting problem in 1.6.4
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon, 14 Jan 2002 20:09:46 -0700
-+
-+sudo (1.6.4-1) unstable; urgency=high
-+
-+  * new upstream version, includes an important security fix, closes: #127576
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon, 14 Jan 2002 09:35:48 -0700
-+
-+sudo (1.6.3p7-5) unstable; urgency=low
-+
-+  * only touch /var/run/sudo/* if /var/run/sudo is there, closes: #126872
-+  * fix spelling error in init.d, closes: #126847
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 29 Dec 2001 11:21:43 -0700
-+
-+sudo (1.6.3p7-4) unstable; urgency=medium
-+
-+  * use touch to set status files to an ancient date instead of removing them
-+    outright on reboot.  this achieves the desired effect of keeping elevated 
-+    privs from living across reboots, without forcing everyone to see the 
-+    new-sudo-user lecture after every reboot.  pick a time that's 'old enough'
-+    for systems with good clocks, and 'recent enough' that broken PC hardware
-+    setting the clock to commonly-seen bogus dates trips over the "don't trust
-+    future timestamps" rule.  closes: #76529, #123559
-+  * apply patch from Steve Langasek to fix seg faults due to interaction with
-+    PAM code.  upstream confirms the problem, and says they're fixing this 
-+    differently for their next release... but this should be useful in the 
-+    meantime, and would be good to get into woody.  closes: #119147
-+  * only run the init.d at boot, not on each runlevel change... and don't run
-+    it during package configure.  closes: #125935
-+  * add DEB_BUILD_OPTIONS support to rules file, closes: #94952
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed, 26 Dec 2001 12:40:44 -0700
-+
-+sudo (1.6.3p7-3) unstable; urgency=low
-+
-+  * apply patch from Fumitoshi UKAI that fixes segfaults when hostname not 
-+    resolvable, closes: #86062, #69430, #77852, #82744, #55716, #56718,
-+  * fix a typo in the manpage, closes: #97368
-+  * apply patch to configure.in and run autoconf to fix problem building on
-+    the hurd, closes: #96325
-+  * add an init.d to clean out /var/run/sudo at boot, so privs are guaranteed
-+    to not last across reboots, closes: #76529
-+  * clean up lintian-noticed cosmetic packaging issues
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat,  1 Dec 2001 02:59:52 -0700
-+
-+sudo (1.6.3p7-2) unstable; urgency=low
-+
-+  * update config.sub/guess for hppa support
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 22 Apr 2001 23:23:42 -0600
-+
-+sudo (1.6.3p7-1) unstable; urgency=low
-+
-+  * new upstream version
-+  * add build dependency on mail-transport-agent, closes: #90685
-+
-+ -- Bdale Garbee <bdale@gag.com>  Thu, 12 Apr 2001 17:02:42 -0600
-+
-+sudo (1.6.3p6-1) unstable; urgency=high
-+
-+  * new upstream version, fixes buffer overflow problem, 
-+    closes: #87259, #87278, #87263
-+  * revert to using --with-secure-path option at build time, since the option
-+    available in sudoers is parsed too late to be useful, and upstream says
-+    it won't get fixed quickly.  This reopens 85123, which I will mark as
-+    forwarded.  Closes: #86199, #86117, #85676
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon, 26 Feb 2001 11:02:51 -0700
-+
-+sudo (1.6.3p5-2) unstable; urgency=low
-+
-+  * lose the dh_suidregister call since it's obsolete
-+  * stop using the --with-secure-path option at build time, and instead show
-+    how to set it in sudoers.  Closes: #85123
-+  * freshen config.sub and config.guess for ia64 and hppa
-+  * update sudoers man page to indicate exempt_group is on by default, 
-+    closes: #70847
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 10 Feb 2001 02:05:17 -0700
-+
-+sudo (1.6.3p5-1) unstable; urgency=low
-+
-+  * new upstream version, closes: #63940, #59175, #61817, #64652, #65743
-+  * this version restores core dumps before the exec, while leaving them
-+    disabled during sudo's internal execution, closes: #58289
-+  * update debhelper calls in rules file
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed, 16 Aug 2000 00:13:15 -0600
-+
-+sudo (1.6.2p2-1) frozen unstable; urgency=medium
-+
-+  * new upstream source resulting from direct collaboration with the upstream
-+    author to fix ugly pam-related problems on Debian in 1.6.1 and later.
-+    Closes: #56129, #55978, #55979, #56550, #56772
-+  * include more upstream documentation, closes: #55054
-+  * pam.d fragment update, closes: #56129
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 27 Feb 2000 11:48:48 -0700
-+
-+sudo (1.6.1-1) unstable; urgency=low
-+
-+  * new upstream source, closes: #52750
-+
-+ -- Bdale Garbee <bdale@gag.com>  Fri,  7 Jan 2000 21:01:42 -0700
-+
-+sudo (1.6-2) unstable; urgency=low
-+
-+  * drop suidregister support for this package.  The sudo executable is 
-+    essentially worthless unless it is setuid root, and making suidregister
-+    work involves shipping a non-setuid executable in the .deb and setting the
-+    perms in the postinst.  On a long upgrade run, this can leave the sudo
-+    executable 'broken' for a long time, which is unacceptable.  With this
-+    version, we ship the executable setuid root in the .deb.  Closes: #51742
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed,  1 Dec 1999 19:59:44 -0700
-+
-+sudo (1.6-1) unstable; urgency=low
-+
-+  * new upstream version, many options previously set at compile-time are now
-+    configurable at runtime.  
-+    Closes: #39255, #20996, #29812, #50705, #49148, #48435, #47190, #45639
-+  * FHS support
-+
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 23 Nov 1999 16:51:22 -0700
-+
-+sudo (1.5.9p4-1) unstable; urgency=low
-+
-+  * new upstream version, closes: #43464
-+  * empty password handling was fixed in 1.5.8, closes: #31863
-+
-+ -- Bdale Garbee <bdale@gag.com>  Thu, 26 Aug 1999 00:00:57 -0600
-+
-+sudo (1.5.9p1-1) unstable; urgency=low
-+
-+  * new upstream version
-+
-+ -- Bdale Garbee <bdale@gag.com>  Thu, 15 Apr 1999 22:43:29 -0600
-+
-+sudo (1.5.8p1-1) unstable; urgency=medium
-+
-+  * new upstream version, closes 33690
-+  * add dependency on libpam-modules, closes 34215, 33432
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon,  8 Mar 1999 10:27:42 -0700
-+
-+sudo (1.5.7p4-2) unstable; urgency=medium
-+
-+  * update the pam fragment provided so that sudo works with latest pam bits,
-+    closes 33432
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 21 Feb 1999 00:22:44 -0700
-+
-+sudo (1.5.7p4-1) unstable; urgency=low
-+
-+  * new upstream release
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 27 Dec 1998 16:13:53 -0700               
-+
-+sudo (1.5.6p5-1) unstable; urgency=low
-+
-+  * new upstream patch release
-+  * add PAM support, closes 28594
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon,  2 Nov 1998 00:00:24 -0700               
-+
-+sudo (1.5.6p2-2) unstable; urgency=low
-+
-+  * update copyright file, closes 24136
-+  * review and close forwarded bugs believed fixed in this upstream version,
-+    closes 17606, 15786.
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon,  5 Oct 1998 22:30:43 -0600               
-+
-+sudo (1.5.6p2-1) unstable; urgency=low
-+
-+  * new upstream release
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon,  5 Oct 1998 22:30:43 -0600               
-+
-+sudo (1.5.4-4) frozen unstable; urgency=low
-+
-+  * update postinst to use groupadd, closes 21403
-+  * move the suidregister stuff earlier in postinst to ensure it always runs
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 19 Apr 1998 22:07:45 -0600               
-+
-+sudo (1.5.4-3) frozen unstable; urgency=low
-+
-+  * change /etc/sudoers from a conffile to being handled in postinst, 
-+    closes 18219
-+  * add suidmanager support, closes 15711
-+  * add '-Wno-comment' to quiet warnings from gcc upstream maintainer is
-+    unlikely to ever fix, and which just don't matter.  closes 17146
-+  * fix FSF address in copyright file, and submit exception for lintian
-+    warning about sudo being setuid root
-+
-+ -- Bdale Garbee <bdale@gag.com>  Thu,  9 Apr 1998 23:59:11 -0600               
-+
-+sudo (1.5.4-2) unstable; urgency=high
-+ 
-+  * patch from upstream author correcting/improving security fix
-+  
-+ -- Bdale Garbee <bdale@gag.com>  Tue, 13 Jan 1998 10:39:35 -0700               
-+
-+sudo (1.5.4-1) unstable; urgency=high
-+
-+  * new upstream version, includes a security fix
-+  * change default editor from /bin/ae to /usr/bin/editor
-+
-+ -- Bdale Garbee <bdale@gag.com>  Mon, 12 Jan 1998 23:36:41 -0700
-+
-+sudo (1.5.3-1) unstable; urgency=medium
-+
-+  * new upstream version, closes bug 15911.
-+  * rules file reworked to use debhelper
-+  * implement a really gross hack to force use of the sudo-provided 
-+    lsearch(), since the one in libc6 is broken!  This closes bugs
-+    12552, 12557, 14881, 15259, 15916.  
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat,  3 Jan 1998 20:39:23 -0700
-+
-+sudo (1.5.2-6) unstable; urgency=LOW
-+
-+  * don't install INSTALL in the doc directory, closes bug 13195.
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 21 Sep 1997 17:10:40 -0600
-+
-+sudo (1.5.2-5) unstable; urgency=LOW
-+
-+  * libc6
-+
-+ -- Bdale Garbee <bdale@gag.com>  Fri,  5 Sep 1997 00:06:22 -0600
-+
-+sudo (1.5.2-4) unstable; urgency=LOW
-+
-+  * change TIMEOUT (how long before you have to type your password again)
-+    to 15 mins, disable PASSWORD_TIMEOUT.  This makes building large Debian
-+    packages on slower machines much more tolerable.  Closes bug 9076.
-+  * touch debian/suid before debstd.  Closes bug 8709.
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sat, 26 Apr 1997 00:48:01 -0600
-+
-+sudo (1.5.2-3) frozen unstable; urgency=LOW
-+
-+  * patch from upstream maintainer to close Bug 6828
-+  * add a debian/suid file to get debstd to leave my perl postinst alone
-+
-+ -- Bdale Garbee <bdale@gag.com>  Fri, 11 Apr 1997 23:09:55 -0600
-+
-+sudo (1.5.2-2) frozen unstable; urgency=LOW
-+
-+  * change rules to use -O2 -Wall as per standards
-+
-+ -- Bdale Garbee <bdale@gag.com>  Sun, 6 Apr 1997 12:48:53 -0600
-+
-+sudo (1.5.2-1) unstable; urgency=LOW
-+
-+  * new upstream version
-+  * cosmetic changes to debian package control files
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed, 30 Oct 1996 09:50:00 -0700
-+
-+sudo (1.5-2) unstable; urgency=LOW
-+
-+  * add /usr/X11R6/bin to the end of the secure path... this makes it
-+    much easier to run xmkmf, etc., during package builds.  To the extent
-+    that /usr/local/sbin and /usr/local/bin were already included, I see
-+    no security reasons not to add this.
-+
-+ -- Bdale Garbee <bdale@gag.com>  Wed, 30 Oct 1996 09:44:58 -0700
-+
-+sudo (1.5-1) unstable; urgency=LOW
-+
-+  * New upstream version
-+  * New maintainer
-+  * New packaging format
-+
-+ -- Bdale Garbee <bdale@gag.com>  Thu, 29 Aug 1996 11:44:22 +0200
-+
-+Tue Mar  5 09:36:41 MET 1996 Michael Meskes <meskes@informatik.rwth-aachen.de>
-+
-+        sudo (1.4.1-1):
-+
-+        * hard code SECURE_PATH to:
-+		"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-+
-+	* enable ENV_EDITOR
-+
-+	* enabled EXEMPTGROUP "sudo"
-+
-+	* moved timestamp dir to /var/log/sudo
-+
-+	* changed parser to check for long and short filenames (Bug#1162)
-+
-+Wed Apr 17 13:03:31 MET DST 1996 Michael Meskes <meskes@informatik.rwth-aachen.de>
-+
-+        sudo (1.4.2-1):
-+
-+	* New upstream source
-+
-+	* Fixed postinst script
-+		(thanks to Peter Tobis <tobias@et-inf.fho-emden.de>)
-+
-+	* Removed special shadow binary. This version works with and without
-+	  shadow password file.
-+
-+Mon May 20 09:35:22 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.2-2):
-+
-+	* Corrected editor path to /bin/ae (Bug#3062)
-+
-+	* Set file permission to 4755 for sudo and 755 for visudo (Bug#3063)
-+
-+Mon Jun 17 12:06:41 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-1):
-+
-+	* New upstream version
-+
-+	* Changed sudoers permission to 440 (owner root, group root) to make
-+	  sudo usable via NFS
-+
-+Wed Jun 19 10:56:54 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-2):
-+
-+	* Applied upstream patch 1
-+
-+Thu Jun 20 09:02:57 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-3):
-+
-+        * Applied upstream patch 2
-+
-+Fri Jun 28 12:49:40 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-4):
-+
-+        * Applied upstream patch 3 (fixes problems with an NFS-mounted
-+          sudoers file)
-+
-+
-+Sun Jun 30 13:02:44 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-5):
-+
-+	* Corrected postinst to use /usr/bin/perl instead of /bin/perl
-+	  [Reported by jdassen@wi.leidenuniv.nl (J.H.M.Dassen)]
-+
-+Wed Jul 10 12:44:33 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-6):
-+
-+	* Applied upstream patch 4 (fixes several bugs)
-+
-+	* Changed priority to optional
-+
-+Thu Jul 11 19:23:52 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.3-7):
-+
-+	* Corrected postinst to create correct permission for /etc/sudoers
-+	  (Bug#3749)
-+
-+Fri Aug  2 10:50:53 MET DST 1996 Michael Meskes <meskes@debian.org>
-+
-+        sudo (1.4.4-1):
-+
-+	* New upstream version
-+
-+
-+sudo (1.4.4-2) admin; urgency=HIGH
-+
-+	* Fixed major security bug reported by Peter Tobias
-+	  <tobias@et-inf.fho-emden.de>
-+	* Added dchanges support to debian.rules
-+
-+sudo (1.4.5-1) admin; urgency=LOW
-+
-+	* New upstream version
-+	* Minor changes to debian.rules
---- sudo-1.6.8p12.orig/debian/sudo_root.8
-+++ sudo-1.6.8p12/debian/sudo_root.8
-@@ -0,0 +1,135 @@
-+.TH sudo_root 8 "February 8, 2006"
-+
-+.SH NAME
-+sudo_root \- How to run administrative commands
-+
-+.SH SYNOPSIS
-+
-+.B sudo
-+.I command
-+
-+.B sudo \-i
-+
-+.SH INTRODUCTION
-+
-+By default, the password for the user "root" (the system
-+administrator) is locked. This means you cannot login as root or use
-+su. Instead, the installer will set up sudo to allow the user that is
-+created during install to run all administrative commands.
-+
-+This means that in the terminal you can use sudo for commands that
-+require root privileges. All programs in the menu will use a graphical
-+sudo to prompt for a password. When sudo asks for a password, it needs
-+.B your password, 
-+this means that a root password is not needed.
-+
-+To run a command which requires root privileges in a terminal, simply
-+prepend 
-+.B sudo
-+in front of it. To get an interactive root shell, use
-+.B sudo \-i\fR.
-+
-+.SH ALLOWING OTHER USERS TO RUN SUDO
-+
-+By default, only the user who installed the system is permitted to run
-+sudo. To add more administrators, i. e. users who can run sudo, you
-+have to add these users to the group 'admin' by doing one of the
-+following steps:
-+
-+.IP * 2
-+In a shell, do
-+
-+.RS 4
-+.B sudo adduser
-+.I username
-+.B admin
-+.RE
-+
-+.IP * 2
-+Use the graphical "Users & Groups" program in the "System settings"
-+menu to add the new user to the
-+.B admin
-+group.
-+
-+.SH BENEFITS OF USING SUDO
-+
-+The benefits of leaving root disabled by default include the following:
-+
-+.IP * 2
-+Users do not have to remember an extra password, which they are likely to forget.
-+.IP * 2
-+The installer is able to ask fewer questions.
-+.IP * 2
-+It avoids the "I can do anything" interactive login by default \- you
-+will be prompted for a password before major changes can happen, which
-+should make you think about the consequences of what you are doing.
-+.IP * 2
-+Sudo adds a log entry of the command(s) run (in \fB/var/log/auth.log\fR).
-+.IP * 2
-+Every attacker trying to brute\-force their way into your box will
-+know it has an account named root and will try that first. What they
-+do not know is what the usernames of your other users are.
-+.IP * 2
-+Allows easy transfer for admin rights, in a short term or long term
-+period, by adding and removing users from the admin group, while not
-+compromising the root account.
-+.IP * 2
-+sudo can be set up with a much more fine\-grained security policy.
-+
-+.SH DOWNSIDES OF USING SUDO
-+
-+Although for desktops the benefits of using sudo are great, there are
-+possible issues which need to be noted:
-+
-+.IP * 2
-+Redirecting the output of commands run with sudo can be confusing at
-+first. For instance consider
-+
-+.RS 4
-+.B sudo ls > /root/somefile
-+.RE
-+
-+.RS 2
-+will not work since it is the shell that tries to write to that file. You can use 
-+.RE
-+
-+.RS 4
-+.B ls | sudo tee /root/somefile
-+.RE
-+
-+.RS 2
-+to get the behaviour you want.
-+.RE
-+
-+.IP * 2
-+In a lot of office environments the ONLY local user on a system is
-+root. All other users are imported using NSS techniques such as
-+nss\-ldap. To setup a workstation, or fix it, in the case of a network
-+failure where nss\-ldap is broken, root is required. This tends to
-+leave the system unusable. An extra local user, or an enabled root
-+password is needed here.
-+
-+.SH GOING BACK TO A TRADITIONAL ROOT ACCOUNT
-+
-+.B This is not recommended!
-+
-+To enable the root account (i.e. set a password) use:
-+
-+.RS 4
-+.B sudo passwd root
-+.RE
-+
-+Afterwards, edit
-+.B /etc/sudoers
-+and comment out the line
-+
-+.RS 4
-+%admin  ALL=(ALL) ALL
-+.RE
-+
-+to disable sudo access to members of the admin group.
-+
-+.SH SEE ALSO
-+.BR sudo (8),
-+.B https://wiki.ubuntu.com/RootSudo
-+
---- sudo-1.6.8p12.orig/debian/sudo-ldap.postinst
-+++ sudo-1.6.8p12/debian/sudo-ldap.postinst
-@@ -0,0 +1,62 @@
-+#!/usr/bin/perl
-+
-+# remove old link
-+
-+unlink ("/etc/alternatives/sudo") if ( -l "/etc/alternatives/sudo");
-+
-+# make sure we have a sudoers file
-+if ( ! -f "/etc/sudoers") {
-+
-+	print "No /etc/sudoers found... creating one for you.\n";
-+
-+	open (SUDOERS, "> /etc/sudoers");
-+	print SUDOERS "# /etc/sudoers\n",
-+	  "#\n",
-+	  "# This file MUST be edited with the 'visudo' command as root.\n",
-+	  "#\n",
-+	  "# See the man page for details on how to write a sudoers file.\n",
-+	  "#\n\nDefaults\tenv_reset\n\n",
-+	  "# Host alias specification\n\n",
-+	  "# User alias specification\n\n",
-+	  "# Cmnd alias specification\n\n",
-+	  "# User privilege specification\nroot\tALL=(ALL) ALL\n";
-+	close SUDOERS;
-+
-+}
-+
-+# make sure sudoers has the correct permissions and owner/group
-+system ('chown root:root /etc/sudoers');
-+system ('chmod 440 /etc/sudoers');
-+
-+# must do a remove first to un-do the "bad" links created by previous version
-+system ('update-rc.d -f sudo remove >/dev/null 2>&1');
-+
-+#system ('update-rc.d sudo start 75 S . >/dev/null');
-+
-+# make sure we have a sudo group
-+
-+exit 0 if getgrnam("sudo"); # we're finished if there is a group sudo
-+
-+$gid = 27;                 # start searcg with gid 27
-+setgrent;
-+while (getgrgid($gid)) {
-+	++$gid;
-+}
-+endgrent;
-+
-+if ($gid != 27) {
-+	print "On Debian we normally use gid 27 for 'sudo'.\n";
-+	$gname = getgrgid(27);
-+	print "However, on your system gid 27 is group '$gname'.\n\n";
-+	print "Would you like me to stop configuring sudo so that you can change this? [n] "; 
-+	$ans = <STDIN>;
-+        if ($ans =~ m/^[yY].*/) {
-+		print "'dpkg --pending --configure' will restart the configuration.\n\n\n";
-+		exit 1;
-+	}
-+}
-+
-+print "Creating group 'sudo' with gid = $gid\n";
-+system("groupadd -g $gid sudo");
-+
-+print "";
---- sudo-1.6.8p12.orig/debian/sudo.lintian
-+++ sudo-1.6.8p12/debian/sudo.lintian
-@@ -0,0 +1,3 @@
-+sudo: setuid-binary usr/bin/sudo 4755 root/root
-+sudo: postrm-contains-additional-updaterc.d-calls /etc/init.d/sudo
-+sudo: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/sudo
---- sudo-1.6.8p12.orig/debian/postinst
-+++ sudo-1.6.8p12/debian/postinst
-@@ -0,0 +1,62 @@
-+#!/usr/bin/perl
-+
-+# remove old link
-+
-+unlink ("/etc/alternatives/sudo") if ( -l "/etc/alternatives/sudo");
-+
-+# make sure we have a sudoers file
-+if ( ! -f "/etc/sudoers") {
-+
-+	print "No /etc/sudoers found... creating one for you.\n";
-+
-+	open (SUDOERS, "> /etc/sudoers");
-+	print SUDOERS "# /etc/sudoers\n",
-+	  "#\n",
-+	  "# This file MUST be edited with the 'visudo' command as root.\n",
-+	  "#\n",
-+	  "# See the man page for details on how to write a sudoers file.\n",
-+	  "# Host alias specification\n\n",
-+	  "# User alias specification\n\n",
-+	  "# Cmnd alias specification\n\n",
-+	  "# Defaults\n\nDefaults\t!lecture,tty_tickets,!fqdn\n\n",
-+	  "# User privilege specification\nroot\tALL=(ALL) ALL\n";
-+	close SUDOERS;
-+
-+}
-+
-+# make sure sudoers has the correct permissions and owner/group
-+system ('chown root:root /etc/sudoers');
-+system ('chmod 440 /etc/sudoers');
-+
-+# must do a remove first to un-do the "bad" links created by previous version
-+system ('update-rc.d -f sudo remove >/dev/null 2>&1');
-+
-+#system ('update-rc.d sudo start 75 S . >/dev/null');
-+
-+# make sure we have a sudo group
-+
-+exit 0 if getgrnam("sudo"); # we're finished if there is a group sudo
-+
-+$gid = 27;                 # start searcg with gid 27
-+setgrent;
-+while (getgrgid($gid)) {
-+	++$gid;
-+}
-+endgrent;
-+
-+if ($gid != 27) {
-+	print "On Debian we normally use gid 27 for 'sudo'.\n";
-+	$gname = getgrgid(27);
-+	print "However, on your system gid 27 is group '$gname'.\n\n";
-+	print "Would you like me to stop configuring sudo so that you can change this? [n] "; 
-+	$ans = <STDIN>;
-+        if ($ans =~ m/^[yY].*/) {
-+		print "'dpkg --pending --configure' will restart the configuration.\n\n\n";
-+		exit 1;
-+	}
-+}
-+
-+print "Creating group 'sudo' with gid = $gid\n";
-+system("groupadd -g $gid sudo");
-+
-+print "";
---- sudo-1.6.8p12.orig/debian/compat
-+++ sudo-1.6.8p12/debian/compat
-@@ -0,0 +1 @@
-+4
---- sudo-1.6.8p12.orig/debian/init.d
-+++ sudo-1.6.8p12/debian/init.d
-@@ -0,0 +1,31 @@
-+#! /bin/sh
-+
-+### BEGIN INIT INFO
-+# Provides:          sudu
-+# Required-Start:    $local_fs $remote_fs
-+# Required-Stop:
-+# Default-Start:     S 1 2 3 4 5
-+# Default-Stop:      0 6
-+### END INIT INFO
-+
-+N=/etc/init.d/sudo
-+
-+set -e
-+
-+case "$1" in
-+  start)
-+	# make sure privileges don't persist across reboots
-+	if [ -d /var/run/sudo ]
-+	then
-+                find /var/run/sudo -type f -exec touch -t 198501010000 '{}' \;
-+	fi
-+	;;
-+  stop|reload|restart|force-reload)
-+	;;
-+  *)
-+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-+	exit 1
-+	;;
-+esac
-+
-+exit 0
---- sudo-1.6.8p12.orig/debian/sudo-ldap.lintian
-+++ sudo-1.6.8p12/debian/sudo-ldap.lintian
-@@ -0,0 +1,3 @@
-+sudo-ldap: setuid-binary usr/bin/sudo 4755 root/root
-+sudo-ldap: postrm-contains-additional-updaterc.d-calls /etc/init.d/sudo-ldap
-+sudo-ldap: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/sudo-ldap
---- sudo-1.6.8p12.orig/debian/sudo-ldap.dirs
-+++ sudo-1.6.8p12/debian/sudo-ldap.dirs
-@@ -0,0 +1,7 @@
-+etc/pam.d
-+usr/bin
-+usr/share/man/man8
-+usr/share/man/man5
-+usr/sbin
-+usr/share/doc/sudo-ldap/examples
-+usr/share/lintian/overrides
---- sudo-1.6.8p12.orig/debian/sudo-ldap.docs
-+++ sudo-1.6.8p12/debian/sudo-ldap.docs
-@@ -0,0 +1,11 @@
-+debian/OPTIONS 
-+BUGS 
-+RUNSON 
-+UPGRADE 
-+PORTING
-+TODO 
-+HISTORY 
-+README 
-+README.LDAP 
-+TROUBLESHOOTING
-+sudoers2ldif
---- sudo-1.6.8p12.orig/debian/postrm
-+++ sudo-1.6.8p12/debian/postrm
-@@ -0,0 +1,21 @@
-+#! /bin/sh
-+
-+set -e
-+
-+case "$1" in
-+       purge)
-+	rm -f /etc/sudoers
-+        ;;
-+
-+       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-+        ;;
-+
-+    *)
-+        echo "postrm called with unknown argument \`$1'" >&2
-+        exit 1
-+
-+esac
-+
-+#DEBHELPER#
-+
-+exit 0
---- sudo-1.6.8p12.orig/debian/OPTIONS
-+++ sudo-1.6.8p12/debian/OPTIONS
-@@ -0,0 +1,61 @@
-+The following options were used to configure sudo for Debian GNU/Linux.
-+
-+  --with-exempt=sudo 
-+
-+	Any user in group 'sudo' will not need to type their password.  It
-+	is strongly recommended that no users be put in group sudo, and that
-+	instead the NOPASSWD option in the sudoers file be used if desired.
-+
-+  --with-pam 
-+	
-+	Support for pluggable authentication modules.
-+
-+  --with-ldap
-+
-+	Support for LDAP authentication.
-+
-+  --with-fqdn 
-+
-+	Allow use of fully qualified domain names in the sudoers file.
-+
-+  --disable-root-mailer
-+
-+	Send mail as the invoking user, not as root.
-+
-+  --with-logging=syslog
-+  --with-logfac=authpriv 
-+
-+	Where logging information goes.
-+
-+  --with-env-editor 
-+  --with-editor=/usr/bin/editor 
-+
-+	Honor the EDITOR and VISUAL environment variables.  If they are not
-+	present, default to the Debian default system editor.
-+
-+  --with-timeout=15 
-+  --with-password-timeout=0 
-+
-+	Allow 15 minutes before a user has to re-type their passord, versus
-+	the sudo usual default of 5.  Never time out while waiting for a
-+	password to be typed, this is a seriously big deal for Debian package
-+	developers using 'dpkg-buildpackage -rsudo'.
-+
-+  --with-secure-path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:\
-+	/sbin:/bin:/usr/X11R6/bin"  
-+
-+	Give a reasonable default path for commands run as root via sudo.
-+
-+  --with-all-insults
-+
-+	Include all the insults in the binary, won't be enabled unless turned
-+	on in the sudoers file.
-+
-+  --with-sendmail=/usr/sbin/sendmail
-+
-+	Use Debian policy to know the location of sendmail instead of trying 
-+	to detect it at build time.
-+
-+  --disable-setresuid
-+
-+	Linux 2.2 kernels don't support setresgid.
---- sudo-1.6.8p12.orig/debian/copyright
-+++ sudo-1.6.8p12/debian/copyright
-@@ -0,0 +1,72 @@
-+This is the Debian GNU/Linux prepackaged version of sudo.  sudo is
-+used to provide limited super user privileges to specific users.
-+
-+This package was put together by Bdale Garbee <bdale@gag.com> using sources
-+from 
-+	ftp://ftp.cs.colorado.edu/pub/sudo/
-+
-+Sudo is distributed under the following BSD-style license:
-+
-+   Copyright (c) 1994-1996,1998-2002 Todd C. Miller <Todd.Miller@courtesan.com>
-+   All rights reserved.
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   1. Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+
-+   2. Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+
-+   3. The name of the author may not be used to endorse or promote products
-+      derived from this software without specific prior written permission
-+      from the author.
-+
-+   4. Products derived from this software may not be called "Sudo" nor
-+      may "Sudo" appear in their names without specific prior written
-+      permission from the author.
-+
-+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-+   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-+   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+Additionally, lsearch.c, fnmatch.c, getcwd.c, snprintf.c, strcasecmp.c
-+and fnmatch.3 bear the following UCB license:
-+
-+   Copyright (c) 1987, 1989, 1990, 1991, 1993, 1994
-+	The Regents of the University of California.  All rights reserved.
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+   1. Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+   2. Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+   3. Neither the name of the University nor the names of its contributors
-+      may be used to endorse or promote products derived from this software
-+      without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+   ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+   SUCH DAMAGE.
---- sudo-1.6.8p12.orig/debian/sudo.pam
-+++ sudo-1.6.8p12/debian/sudo.pam
-@@ -0,0 +1,4 @@
-+#%PAM-1.0
-+
-+@include common-auth
-+@include common-account
---- sudo-1.6.8p12.orig/debian/source.lintian-overrides
-+++ sudo-1.6.8p12/debian/source.lintian-overrides
-@@ -0,0 +1 @@
-+sudo source: maintainer-script-lacks-debhelper-token debian/postinst
---- sudo-1.6.8p12.orig/sample.sudoers
-+++ sudo-1.6.8p12/sample.sudoers
-@@ -35,16 +35,16 @@
- # Cmnd alias specification
- ##
- Cmnd_Alias	DUMPS = /usr/sbin/dump, /usr/sbin/rdump, /usr/sbin/restore, \
--			/usr/sbin/rrestore, /usr/bin/mt
--Cmnd_Alias	KILL = /usr/bin/kill
-+			/usr/sbin/rrestore, /bin/mt
-+Cmnd_Alias	KILL = /bin/kill
- Cmnd_Alias	PRINTING = /usr/sbin/lpc, /usr/bin/lprm
--Cmnd_Alias	SHUTDOWN = /usr/sbin/shutdown
--Cmnd_Alias	HALT = /usr/sbin/halt
--Cmnd_Alias	REBOOT = /usr/sbin/reboot
--Cmnd_Alias	SHELLS = /sbin/sh, /usr/bin/sh, /usr/bin/csh, /usr/bin/ksh, \
--			 /usr/local/bin/tcsh, /usr/bin/rsh, \
--			 /usr/local/bin/zsh
--Cmnd_Alias	SU = /usr/bin/su
-+Cmnd_Alias	SHUTDOWN = /sbin/shutdown
-+Cmnd_Alias	HALT = /sbin/halt
-+Cmnd_Alias	REBOOT = /sbin/reboot
-+Cmnd_Alias	SHELLS = /sbin/sh, /bin/sh, /bin/csh, /usr/bin/ksh, \
-+			 /usr/bin/tcsh, /usr/bin/rsh, \
-+			 /usr/bin/zsh
-+Cmnd_Alias	SU = /bin/su
- Cmnd_Alias	VIPW = /usr/sbin/vipw, /usr/bin/passwd, /usr/bin/chsh, \
- 		       /usr/bin/chfn
- 
-@@ -82,7 +82,7 @@
- 		sudoedit /etc/printcap, /usr/oper/bin/
- 
- # joe may su only to operator
--joe		ALL = /usr/bin/su operator
-+joe		ALL = /bin/su operator
- 
- # pete may change passwords for anyone but root on the hp snakes
- pete		HPPA = /usr/bin/passwd [A-z]*, !/usr/bin/passwd root
-@@ -96,13 +96,13 @@
- 
- # users in the secretaries netgroup need to help manage the printers
- # as well as add and remove users
--+secretaries	ALL = PRINTING, /usr/bin/adduser, /usr/bin/rmuser
-++secretaries	ALL = PRINTING, /usr/sbin/adduser, /usr/bin/rmuser
- 
- # fred can run commands as oracle or sybase without a password
- fred		ALL = (DB) NOPASSWD: ALL
- 
- # on the alphas, john may su to anyone but root and flags are not allowed
--john		ALPHA = /usr/bin/su [!-]*, !/usr/bin/su *root*
-+john		ALPHA = /bin/su [!-]*, !/bin/su *root*
- 
- # jen can run anything on all machines except the ones
- # in the "SERVERS" Host_Alias
---- sudo-1.6.8p12.orig/sudo.tab.c
-+++ sudo-1.6.8p12/sudo.tab.c
-@@ -138,6 +138,7 @@
- 	} \
- 	match[top].user   = UNSPEC; \
- 	match[top].cmnd   = UNSPEC; \
-+	match[top].cmndall= UNSPEC; \
- 	match[top].host   = UNSPEC; \
- 	match[top].runas  = UNSPEC; \
- 	match[top].nopass = def_authenticate ? UNSPEC : TRUE; \
-@@ -153,6 +154,7 @@
- 	} \
- 	match[top].user   = match[top-1].user; \
- 	match[top].cmnd   = match[top-1].cmnd; \
-+	match[top].cmndall= match[top-1].cmndall; \
- 	match[top].host   = match[top-1].host; \
- 	match[top].runas  = match[top-1].runas; \
- 	match[top].nopass = match[top-1].nopass; \
-@@ -1739,6 +1741,7 @@
- 				}
- 			    }
- 
-+			    SETMATCH(cmnd_all, TRUE);
- 			    yyval.BOOLEAN = TRUE;
- 			}
- break;
-@@ -1769,6 +1772,7 @@
- 					YYERROR;
- 				    }
- 				}
-+				SETMATCH(cmnd_all, FALSE);
- 				yyval.BOOLEAN = NOMATCH;
- 			    }
- 			    free(yyvsp[0].string);
-@@ -1800,6 +1804,7 @@
- 			    free(yyvsp[0].command.cmnd);
- 			    if (yyvsp[0].command.args)
- 				free(yyvsp[0].command.args);
-+			    SETMATCH(cmnd_all, FALSE);
- 			}
- break;
- case 65:
---- sudo-1.6.8p12.orig/ldap.c
-+++ sudo-1.6.8p12/ldap.c
-@@ -256,9 +256,10 @@
-  * Walks through search result and returns true if we have a
-  * command match
-  */
--int sudo_ldap_check_command(ld,entry)
-+int sudo_ldap_check_command(ld,entry,all)
-   LDAP *ld;
-   LDAPMessage *entry;
-+  int* all;
- {
-   char **v=NULL;
-   char **p=NULL;
-@@ -267,6 +268,8 @@
-   int  ret=0;
-   int  foundbang;
- 
-+  *all=0;
-+
-   if (!entry) return ret;
- 
-   v=ldap_get_values(ld,entry,"sudoCommand");
-@@ -277,6 +280,7 @@
- 
-     /* Match against ALL ? */
-     if (!strcasecmp(*p,"ALL")) {
-+      *all=1;
-       ret=1;
-       if (ldap_conf.debug>1) printf(" MATCH!\n");
-       continue;
-@@ -711,6 +715,7 @@
-   /* flags */
-   int ldap_user_matches=0;
-   int ldap_host_matches=0;
-+  int command_all=0;
- 
-   if (!sudo_ldap_read_config())  return VALIDATE_ERROR;
- 
-@@ -896,7 +901,7 @@
-           /* add matches for listing later */
-           sudo_ldap_add_match(ld,entry) &&
-           /* verify command match */
--          sudo_ldap_check_command(ld,entry) &&
-+          sudo_ldap_check_command(ld,entry,&command_all) &&
-           /* verify runas match */
-           sudo_ldap_check_runas(ld,entry)
-       )
-@@ -907,6 +912,7 @@
-         sudo_ldap_parse_options(ld,entry);
-         /* make sure we dont reenter loop */
-         ret=VALIDATE_OK;
-+        if(command_all) SET(ret,FLAG_CMND_ALL);
-         /* break from inside for loop */
-         break;
-       }
---- sudo-1.6.8p12.orig/sudo.c
-+++ sudo-1.6.8p12/sudo.c
-@@ -106,10 +106,11 @@
- static void set_loginclass		__P((struct passwd *));
- static void usage			__P((int));
- static void usage_excl			__P((int));
-+static void create_admin_success_flag   __P((void));
- static struct passwd *get_authpw	__P((void));
- extern int sudo_edit			__P((int, char **));
- extern void list_matches		__P((void));
--extern char **rebuild_env		__P((char **, int, int));
-+extern char **rebuild_env		__P((char **, int, int, int));
- extern char **zero_env			__P((char **));
- extern struct passwd *sudo_getpwnam	__P((const char *));
- extern struct passwd *sudo_getpwuid	__P((uid_t));
-@@ -368,11 +369,15 @@
- 
-     /* Build a new environment that avoids any nasty bits if we have a cmnd. */
-     if (ISSET(sudo_mode, MODE_RUN))
--	new_environ = rebuild_env(envp, sudo_mode, ISSET(validated, FLAG_NOEXEC));
-+	new_environ = rebuild_env(envp, sudo_mode, ISSET(validated, FLAG_NOEXEC), ISSET(validated, FLAG_CMND_ALL));
-     else
- 	new_environ = envp;
- 
-     if (ISSET(validated, VALIDATE_OK)) {
-+	/* If the user is in the admin group, create a dotfile to signal that
-+	 * sudo was executed successfully. */
-+	create_admin_success_flag();
-+
- 	/* Finally tell the user if the command did not exist. */
- 	if (cmnd_status == NOT_FOUND_DOT) {
- 	    warnx("ignoring `%s' found in '.'\nUse `sudo ./%s' if this is the `%s' you wish to run.", user_cmnd, user_cmnd, user_cmnd);
-@@ -1156,3 +1161,46 @@
-     putchar('\n');
-     exit(exit_val);
- }
-+
-+static void create_admin_success_flag(void)
-+{
-+    struct group* admin;
-+    char** g;
-+    int is_admin;
-+    char flagfile[PATH_MAX];
-+    int f;
-+
-+    if (!sudo_user.pw || !sudo_user.pw->pw_name || !sudo_user.pw->pw_dir)
-+	return;
-+
-+    /* check whether the user is in the admin group */
-+    admin = getgrnam("admin");
-+    if (!admin || !admin->gr_mem)
-+	return;
-+    is_admin = 0;
-+    for (g = admin->gr_mem; *g; ++g) {
-+	if (!strcmp(*g, sudo_user.pw->pw_name)) {
-+	    is_admin = 1;
-+	    break;
-+	}
-+    }
-+    if (!is_admin)
-+	return;
-+
-+    /* build path to flag file */
-+    snprintf(flagfile, sizeof(flagfile), "%s/.sudo_as_admin_successful",
-+	    sudo_user.pw->pw_dir);
-+    if (strlen(flagfile) >= sizeof(flagfile)-1)
-+	return;
-+
-+    /* do nothing if the file already exists */
-+    if (!access(flagfile, F_OK))
-+	return;
-+
-+    /* create file */
-+    f = open(flagfile, O_CREAT|O_WRONLY|O_EXCL, 0644);
-+    if(f >= 0) {
-+	fchown(f, sudo_user.pw->pw_uid, sudo_user.pw->pw_gid);
-+	close(f);
-+    }
-+}
---- sudo-1.6.8p12.orig/sudo.h
-+++ sudo-1.6.8p12/sudo.h
-@@ -65,6 +65,7 @@
- #define FLAG_NO_HOST		0x080
- #define FLAG_NO_CHECK		0x100
- #define FLAG_NOEXEC		0x200
-+#define FLAG_CMND_ALL           0x400
- 
- /*
-  * Pseudo-boolean values
---- sudo-1.6.8p12.orig/parse.c
-+++ sudo-1.6.8p12/parse.c
-@@ -200,7 +200,8 @@
- 		    set_perms(PERM_ROOT);
- 		    return(VALIDATE_OK |
- 			(no_passwd == TRUE ? FLAG_NOPASS : 0) |
--			(no_execve == TRUE ? FLAG_NOEXEC : 0));
-+			(no_execve == TRUE ? FLAG_NOEXEC : 0) |
-+                        (cmnd_all == TRUE ? FLAG_CMND_ALL : 0));
- 		} else if ((runas_matches == TRUE && cmnd_matches == FALSE) ||
- 		    (runas_matches == FALSE && cmnd_matches == TRUE)) {
- 		    /*
---- sudo-1.6.8p12.orig/parse.h
-+++ sudo-1.6.8p12/parse.h
-@@ -29,6 +29,7 @@
- struct matchstack {
- 	int user;
- 	int cmnd;
-+	int cmndall;
- 	int host;
- 	int runas;
- 	int nopass;
-@@ -46,6 +47,7 @@
- 
- #define user_matches	(match[top-1].user)
- #define cmnd_matches	(match[top-1].cmnd)
-+#define cmnd_all	(match[top-1].cmndall)
- #define host_matches	(match[top-1].host)
- #define runas_matches	(match[top-1].runas)
- #define no_passwd	(match[top-1].nopass)
diff --git a/package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch b/package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch
deleted file mode 100644
index 0a0b0a46ab..0000000000
--- a/package/sudo/sudo-1.6.8p12-002-no-cxx-configcheck.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u sudo-1.6.8p12.orig/configure sudo-1.6.8p12/configure
---- sudo-1.6.8p12.orig/configure	2006-12-21 12:06:02.000000000 +0100
-+++ sudo-1.6.8p12/configure	2006-12-21 12:12:06.000000000 +0100
-@@ -6072,7 +6072,8 @@
- fi
- 
- done
--
-+if test -n "$CXX"
-+then
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6654,7 +6655,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--
-+fi
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
diff --git a/package/sudo/sudo-1.6.8p12-003-cross-compile.patch b/package/sudo/sudo-1.6.8p12-003-cross-compile.patch
deleted file mode 100644
index f8ba17338e..0000000000
--- a/package/sudo/sudo-1.6.8p12-003-cross-compile.patch
+++ /dev/null
@@ -1,10219 +0,0 @@
-diff -ur sudo-1.6.8p9/aclocal.m4 sudo-1.6.8p9-patched/aclocal.m4
---- sudo-1.6.8p9/aclocal.m4	2004-09-07 12:14:51.000000000 -0500
-+++ sudo-1.6.8p9-patched/aclocal.m4	2006-05-26 13:05:14.000000000 -0500
-@@ -220,13 +220,13 @@
- AC_TRY_RUN([#include <fnmatch.h>
- main() { exit(fnmatch("/*/bin/echo *", "/usr/bin/echo just a test", FNM_CASEFOLD)); }
- ], sudo_cv_func_fnmatch=yes, sudo_cv_func_fnmatch=no,
--  sudo_cv_func_fnmatch=no)
-+  sudo_cv_func_fnmatch=no,[true])
- rm -f core core.* *.core])dnl
- AC_MSG_RESULT($sudo_cv_func_fnmatch)
- if test $sudo_cv_func_fnmatch = yes; then
--  [$1]
-+  $1
- else
--  [$2]
-+  $2
- fi
- ])
- 
-@@ -256,7 +256,7 @@
- s.sa_len = 0;
- exit(0);
- }], sudo_cv_sock_sa_len=yes, sudo_cv_sock_sa_len=no,
--  sudo_cv_sock_sa_len=no)
-+  sudo_cv_sock_sa_len=no,[true])
- rm -f core core.* *.core])dnl
- AC_MSG_RESULT($sudo_cv_sock_sa_len)
- if test $sudo_cv_sock_sa_len = yes; then
-@@ -292,7 +292,7 @@
-   (void) fprintf(f, "%d\n", strlen(b));
-   (void) fclose(f);
-   exit(0);
--}], sudo_cv_uid_t_len=`cat conftestdata`, sudo_cv_uid_t_len=10)
-+}], sudo_cv_uid_t_len=`cat conftestdata`, sudo_cv_uid_t_len=10,[true])
- ])
- rm -f conftestdata
- AC_MSG_RESULT($sudo_cv_uid_t_len)
-@@ -305,7 +305,7 @@
- dnl
- AC_DEFUN(SUDO_LONG_LONG, [AC_MSG_CHECKING(for long long support)
- AC_TRY_LINK(, [long long foo = 1000; foo /= 10;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.])
--[AC_TRY_RUN([main() {if (sizeof(long long) == sizeof(long)) exit(0); else exit(1);}], AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]))]
-+[AC_TRY_RUN([main() {if (sizeof(long long) == sizeof(long)) exit(0); else exit(1);}], AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]),[true],[true])]
- AC_MSG_RESULT(yes), AC_MSG_RESULT(no))])
- 
- dnl
-diff -ur sudo-1.6.8p9/configure sudo-1.6.8p9-patched/configure
---- sudo-1.6.8p9/configure	2004-11-26 14:04:30.000000000 -0600
-+++ sudo-1.6.8p9-patched/configure	2006-05-26 13:05:14.000000000 -0500
-@@ -1,9 +1,8 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.57 for sudo 1.6.8.
-+# Generated by GNU Autoconf 2.59 for sudo 1.6.8.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -20,9 +19,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-   set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
-@@ -41,7 +41,7 @@
-   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-   LC_TELEPHONE LC_TIME
- do
--  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     $as_unset $as_var
-@@ -218,16 +218,17 @@
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
- else
-+  test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
- fi
- 
- as_executable_p="test -f"
- 
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
- # IFS
-@@ -560,7 +561,7 @@
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-       *) ac_optarg=yes ;;
-     esac
--    eval enable_$ac_feature='$ac_optarg' ;;
-+    eval "enable_$ac_feature='$ac_optarg'" ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -742,7 +743,7 @@
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-       *) ac_optarg=yes ;;
-     esac
--    eval with_$ac_package='$ac_optarg' ;;
-+    eval "with_$ac_package='$ac_optarg'" ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -816,7 +817,7 @@
- 
- # Be sure to have absolute paths.
- for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--              localstatedir libdir includedir oldincludedir infodir mandir
-+	      localstatedir libdir includedir oldincludedir infodir mandir
- do
-   eval ac_val=$`echo $ac_var`
-   case $ac_val in
-@@ -856,10 +857,10 @@
-   # Try the directory containing this script, then its parent.
-   ac_confdir=`(dirname "$0") 2>/dev/null ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$0" : 'X\(//\)[^/]' \| \
--         X"$0" : 'X\(//\)$' \| \
--         X"$0" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(//\)[^/]' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$0" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -971,9 +972,9 @@
-   cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--                          [$ac_default_prefix]
-+			  [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--                          [PREFIX]
-+			  [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -987,7 +988,7 @@
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
-   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
--  --sysconfdir=DIR       read-only single-machine data [/etc]
-+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-@@ -1167,12 +1168,45 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
- 
-     cd $ac_dir
-     # Check for guested configure; otherwise get Cygnus style configure.
-@@ -1183,13 +1217,13 @@
-       echo
-       $SHELL $ac_srcdir/configure  --help=recursive
-     elif test -f $ac_srcdir/configure.ac ||
--           test -f $ac_srcdir/configure.in; then
-+	   test -f $ac_srcdir/configure.in; then
-       echo
-       $ac_configure --help
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd $ac_popdir
-+    cd "$ac_popdir"
-   done
- fi
- 
-@@ -1197,10 +1231,9 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- sudo configure 1.6.8
--generated by GNU Autoconf 2.57
-+generated by GNU Autoconf 2.59
- 
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1212,7 +1245,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by sudo $as_me 1.6.8, which was
--generated by GNU Autoconf 2.57.  Invocation command line was
-+generated by GNU Autoconf 2.59.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1289,21 +1322,21 @@
-     2)
-       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-       if test $ac_must_keep_next = true; then
--        ac_must_keep_next=false # Got value, back to normal.
-+	ac_must_keep_next=false # Got value, back to normal.
-       else
--        case $ac_arg in
--          *=* | --config-cache | -C | -disable-* | --disable-* \
--          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
--          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
--          | -with-* | --with-* | -without-* | --without-* | --x)
--            case "$ac_configure_args0 " in
--              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
--            esac
--            ;;
--          -* ) ac_must_keep_next=true ;;
--        esac
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-       fi
--      ac_configure_args="$ac_configure_args$ac_sep\"$ac_arg\""
-+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-       # Get rid of the leading space.
-       ac_sep=" "
-       ;;
-@@ -1335,12 +1368,12 @@
-     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-     *ac_space=\ *)
-       sed -n \
--        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-       ;;
-     *)
-       sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-       ;;
-     esac;
- }
-@@ -1369,7 +1402,7 @@
-       for ac_var in $ac_subst_files
-       do
- 	eval ac_val=$`echo $ac_var`
--        echo "$ac_var='"'"'$ac_val'"'"'"
-+	echo "$ac_var='"'"'$ac_val'"'"'"
-       done | sort
-       echo
-     fi
-@@ -1388,7 +1421,7 @@
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core core.* *.core &&
-+  rm -f core *.core &&
-   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
-      ' 0
-@@ -1468,7 +1501,7 @@
- # value.
- ac_cache_corrupted=false
- for ac_var in `(set) 2>&1 |
--               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
-   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-@@ -1485,13 +1518,13 @@
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
--        ac_cache_corrupted=:
-+	ac_cache_corrupted=:
-       fi;;
-   esac
-   # Pass precious variables to config.status.
-@@ -3866,7 +3899,6 @@
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3886,8 +3918,8 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output" >&5
--echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-@@ -3907,23 +3939,23 @@
-   test -f "$ac_file" || continue
-   case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
--        ;;
-+	;;
-     conftest.$ac_ext )
--        # This is the source file.
--        ;;
-+	# This is the source file.
-+	;;
-     [ab].out )
--        # We found the default executable, but exeext='' is most
--        # certainly right.
--        break;;
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-     *.* )
--        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--        # FIXME: I believe we export ac_cv_exeext for Libtool,
--        # but it would be cool to find out if it's true.  Does anybody
--        # maintain Libtool? --akim.
--        export ac_cv_exeext
--        break;;
-+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	# FIXME: I believe we export ac_cv_exeext for Libtool,
-+	# but it would be cool to find out if it's true.  Does anybody
-+	# maintain Libtool? --akim.
-+	export ac_cv_exeext
-+	break;;
-     * )
--        break;;
-+	break;;
-   esac
- done
- else
-@@ -3997,8 +4029,8 @@
-   case $ac_file in
-     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--          export ac_cv_exeext
--          break;;
-+	  export ac_cv_exeext
-+	  break;;
-     * ) break;;
-   esac
- done
-@@ -4023,7 +4055,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4074,7 +4105,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4094,11 +4124,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4111,7 +4150,7 @@
- 
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
-@@ -4127,7 +4166,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4144,11 +4182,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4161,7 +4208,7 @@
- 
- ac_cv_prog_cc_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -4188,7 +4235,6 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4216,6 +4262,16 @@
-   va_end (v);
-   return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std1 is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std1.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -4242,11 +4298,20 @@
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4259,7 +4324,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext
-+rm -f conftest.err conftest.$ac_objext
- done
- rm -f conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
-@@ -4287,19 +4352,27 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
-+   '' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -4307,14 +4380,13 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <stdlib.h>
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -4325,11 +4397,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4342,9 +4423,8 @@
- 
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4361,11 +4441,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4377,7 +4466,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -4391,7 +4480,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4407,7 +4496,6 @@
-   ac_func_search_save_LIBS=$LIBS
- ac_cv_search_strerror=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4431,11 +4519,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4447,12 +4544,12 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_strerror" = no; then
-   for ac_lib in cposix; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4476,11 +4573,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4493,7 +4599,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_save_LIBS
-@@ -4534,7 +4641,6 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4545,7 +4651,7 @@
- #else
- # include <assert.h>
- #endif
--                     Syntax error
-+		     Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -4557,6 +4663,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -4577,7 +4684,6 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4595,6 +4701,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -4641,7 +4748,6 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4652,7 +4758,7 @@
- #else
- # include <assert.h>
- #endif
--                     Syntax error
-+		     Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -4664,6 +4770,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -4684,7 +4791,6 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4702,6 +4808,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -5419,7 +5526,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 5422 "configure"' > conftest.$ac_ext
-+  echo '#line 5529 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -5516,7 +5623,6 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-      cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5533,11 +5639,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5550,7 +5665,8 @@
- 
- lt_cv_cc_needs_belf=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5578,7 +5694,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5599,11 +5714,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5616,12 +5740,11 @@
- 
- ac_cv_header_stdc=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5643,7 +5766,6 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5668,7 +5790,6 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5680,9 +5801,9 @@
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
- # define ISLOWER(c) \
--                   (('a' <= (c) && (c) <= 'i') \
--                     || ('j' <= (c) && (c) <= 'r') \
--                     || ('s' <= (c) && (c) <= 'z'))
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
- 
-@@ -5693,7 +5814,7 @@
-   int i;
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
--        || toupper (i) != TOUPPER (i))
-+	|| toupper (i) != TOUPPER (i))
-       exit(2);
-   exit (0);
- }
-@@ -5718,7 +5839,7 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
-@@ -5743,7 +5864,7 @@
- 
- 
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--                  inttypes.h stdint.h unistd.h
-+		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -5752,7 +5873,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5764,11 +5884,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5781,7 +5910,7 @@
- 
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -5812,7 +5941,6 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5823,11 +5951,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5840,7 +5977,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -5848,7 +5985,6 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5866,6 +6002,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -5885,33 +6022,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -5922,7 +6058,7 @@
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -6056,7 +6192,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6076,11 +6211,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6093,7 +6237,7 @@
- 
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
-@@ -6109,7 +6253,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6126,11 +6269,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6143,7 +6295,7 @@
- 
- ac_cv_prog_cxx_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-@@ -6163,8 +6315,7 @@
-   fi
- fi
- for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
-+   '' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -6172,14 +6323,13 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <stdlib.h>
- $ac_declaration
-+#include <stdlib.h>
- int
- main ()
- {
-@@ -6190,11 +6340,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6207,9 +6366,8 @@
- 
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6226,11 +6384,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6242,7 +6409,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -6281,7 +6448,6 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6292,7 +6458,7 @@
- #else
- # include <assert.h>
- #endif
--                     Syntax error
-+		     Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -6304,6 +6470,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6324,7 +6491,6 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6342,6 +6508,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6388,7 +6555,6 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6399,7 +6565,7 @@
- #else
- # include <assert.h>
- #endif
--                     Syntax error
-+		     Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -6411,6 +6577,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6431,7 +6598,6 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6449,6 +6615,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -6493,7 +6660,7 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-+  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -6535,7 +6702,7 @@
- fi
- if test -z "$F77"; then
-   ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-+  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -6580,7 +6747,7 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:6583:" \
-+echo "$as_me:6750:" \
-      "checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -6598,9 +6765,10 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-+rm -f a.out
- 
- # If we don't use `.F' as extension, the preprocessor is not run on the
--# input file.
-+# input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
- echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-@@ -6618,11 +6786,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6635,14 +6812,13 @@
- 
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
- echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
- ac_ext=$ac_save_ext
--G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
-@@ -6659,11 +6835,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6676,7 +6861,7 @@
- 
- ac_cv_prog_f77_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-@@ -6684,18 +6869,20 @@
- if test "$ac_test_FFLAGS" = set; then
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
--  if test "$G77" = yes; then
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-     FFLAGS="-g -O2"
-   else
-     FFLAGS="-g"
-   fi
- else
--  if test "$G77" = yes; then
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-     FFLAGS="-O2"
-   else
-     FFLAGS=
-   fi
- fi
-+
-+G77=`test $ac_compiler_gnu = yes && echo yes`
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7589,11 +7776,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7592: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7596: \$? = $ac_status" >&5
-+   echo "$as_me:7783: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-@@ -7821,11 +8008,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7824: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8011: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7828: \$? = $ac_status" >&5
-+   echo "$as_me:8015: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-@@ -7888,11 +8075,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8078: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7895: \$? = $ac_status" >&5
-+   echo "$as_me:8082: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8228,7 +8415,6 @@
- 	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8245,11 +8431,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -8266,7 +8461,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8279,7 +8475,6 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8296,11 +8491,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -8317,7 +8521,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9384,7 +9589,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9408,11 +9612,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9425,7 +9638,8 @@
- 
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -9449,21 +9663,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shl_load (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef shl_load
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -9494,11 +9715,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9511,7 +9741,8 @@
- 
- ac_cv_func_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-@@ -9526,7 +9757,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9550,11 +9780,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9567,7 +9806,8 @@
- 
- ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-@@ -9581,21 +9821,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlopen (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef dlopen
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -9626,11 +9873,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9643,7 +9899,8 @@
- 
- ac_cv_func_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -9658,7 +9915,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9682,11 +9938,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9699,7 +9964,8 @@
- 
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -9715,7 +9981,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9739,11 +10004,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9756,7 +10030,8 @@
- 
- ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-@@ -9772,7 +10047,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9796,11 +10070,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -9813,7 +10096,8 @@
- 
- ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-@@ -9868,7 +10152,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9871 "configure"
-+#line 10155 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -9966,7 +10250,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9969 "configure"
-+#line 10253 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11002,7 +11286,6 @@
-       allow_undefined_flag_CXX='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11019,11 +11302,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -11040,7 +11332,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11054,7 +11347,6 @@
-       else
- 	# Determine the default libpath from the value encoded in an empty executable.
- 	cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11071,11 +11363,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -11092,7 +11393,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12102,11 +12404,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12105: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12407: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12109: \$? = $ac_status" >&5
-+   echo "$as_me:12411: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-@@ -12169,11 +12471,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12172: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12474: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12176: \$? = $ac_status" >&5
-+   echo "$as_me:12478: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12889,7 +13191,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -12913,11 +13214,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -12930,7 +13240,8 @@
- 
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -12954,21 +13265,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shl_load (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef shl_load
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -12999,11 +13317,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13016,7 +13343,8 @@
- 
- ac_cv_func_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-@@ -13031,7 +13359,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13055,11 +13382,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13072,7 +13408,8 @@
- 
- ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-@@ -13086,21 +13423,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlopen (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef dlopen
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -13131,11 +13475,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13148,7 +13501,8 @@
- 
- ac_cv_func_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -13163,7 +13517,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13187,11 +13540,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13204,7 +13566,8 @@
- 
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -13220,7 +13583,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13244,11 +13606,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13261,7 +13632,8 @@
- 
- ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-@@ -13277,7 +13649,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13301,11 +13672,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13318,7 +13698,8 @@
- 
- ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-@@ -13373,7 +13754,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 13376 "configure"
-+#line 13757 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13471,7 +13852,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 13474 "configure"
-+#line 13855 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -14293,11 +14674,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14296: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14677: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14300: \$? = $ac_status" >&5
-+   echo "$as_me:14681: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-@@ -14360,11 +14741,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14363: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14744: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14367: \$? = $ac_status" >&5
-+   echo "$as_me:14748: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14706,11 +15087,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -14727,7 +15117,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -14746,11 +15137,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -14767,7 +15167,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -16272,11 +16673,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16275: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16676: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16279: \$? = $ac_status" >&5
-+   echo "$as_me:16680: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-@@ -16504,11 +16905,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16507: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16908: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16511: \$? = $ac_status" >&5
-+   echo "$as_me:16912: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
-@@ -16571,11 +16972,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16574: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16975: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16578: \$? = $ac_status" >&5
-+   echo "$as_me:16979: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16911,7 +17312,6 @@
- 	allow_undefined_flag_GCJ='-berok'
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16928,11 +17328,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -16949,7 +17358,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -16962,7 +17372,6 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an empty executable.
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16979,11 +17388,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -17000,7 +17418,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -18067,7 +18486,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -18091,11 +18509,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18108,7 +18535,8 @@
- 
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -18132,21 +18560,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shl_load innocuous_shl_load
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shl_load (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef shl_load
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -18177,11 +18612,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18194,7 +18638,8 @@
- 
- ac_cv_func_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
- echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-@@ -18209,7 +18654,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -18233,11 +18677,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18250,7 +18703,8 @@
- 
- ac_cv_lib_dld_shl_load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-@@ -18264,21 +18718,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlopen (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef dlopen
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -18309,11 +18770,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18326,7 +18796,8 @@
- 
- ac_cv_func_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
- echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -18341,7 +18812,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -18365,11 +18835,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18382,7 +18861,8 @@
- 
- ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -18398,7 +18878,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -18422,11 +18901,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18439,7 +18927,8 @@
- 
- ac_cv_lib_svld_dlopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-@@ -18455,7 +18944,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -18479,11 +18967,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -18496,7 +18993,8 @@
- 
- ac_cv_lib_dld_dld_link=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-@@ -18551,7 +19049,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 18554 "configure"
-+#line 19052 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -18649,7 +19147,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 18652 "configure"
-+#line 19150 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -19834,21 +20332,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -19879,11 +20384,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -19896,7 +20410,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -19938,7 +20453,6 @@
- 		    O_LDFLAGS="$LDFLAGS"
- 		    LDFLAGS="$LDFLAGS -Wl,-blibpath:/usr/lib:/lib"
- 		    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -19955,11 +20469,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -19983,7 +20506,8 @@
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- 		fi
- 		LDFLAGS="$O_LDFLAGS"
- 		;;
-@@ -19997,7 +20521,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20021,11 +20544,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20038,7 +20570,8 @@
- 
- ac_cv_lib_sec_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
-@@ -20057,7 +20590,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsecurity  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20081,11 +20613,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20098,7 +20639,8 @@
- 
- ac_cv_lib_security_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
-@@ -20156,21 +20698,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -20201,11 +20750,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20218,7 +20776,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -20251,7 +20810,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20275,11 +20833,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20292,7 +20859,8 @@
- 
- ac_cv_lib_sec_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
-@@ -20309,7 +20877,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20333,11 +20900,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20350,7 +20926,8 @@
- 
- ac_cv_lib_sec_iscomsec=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_iscomsec" >&5
-@@ -20377,7 +20954,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20401,11 +20977,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20418,7 +21003,8 @@
- 
- ac_cv_lib_sec_getspnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
-@@ -20473,21 +21059,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define sia_ses_init to an innocuous variant, in case <limits.h> declares sia_ses_init.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define sia_ses_init innocuous_sia_ses_init
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char sia_ses_init (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef sia_ses_init
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -20518,11 +21111,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20535,7 +21137,8 @@
- 
- ac_cv_func_sia_ses_init=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_sia_ses_init" >&5
- echo "${ECHO_T}$ac_cv_func_sia_ses_init" >&6
-@@ -20561,7 +21164,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsecurity  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20585,11 +21187,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20602,7 +21213,8 @@
- 
- ac_cv_lib_security_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
-@@ -20630,21 +21242,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -20675,11 +21294,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20692,7 +21320,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -20716,21 +21345,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -20761,11 +21397,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20778,7 +21423,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -20801,7 +21447,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldb  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20825,11 +21470,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20842,7 +21496,8 @@
- 
- ac_cv_lib_db_dbopen=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbopen" >&5
-@@ -20863,21 +21518,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -20908,11 +21570,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20925,7 +21596,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -20940,7 +21612,6 @@
- 		    echo "$as_me:$LINENO: checking for broken /usr/include/prot.h" >&5
- echo $ECHO_N "checking for broken /usr/include/prot.h... $ECHO_C" >&6
- 		    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20961,11 +21632,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -20982,7 +21662,7 @@
- 		    sed 's:<acl.h>:<sys/acl.h>:g' < /usr/include/prot.h > prot.h
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 		elif test "$CHECKSIA" = "true"; then
- 		    with_passwd=no
- 		    AUTH_OBJS="sia.o"
-@@ -21020,7 +21700,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsun  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21044,11 +21723,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21061,7 +21749,8 @@
- 
- ac_cv_lib_sun_getpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sun_getpwnam" >&5
-@@ -21087,21 +21776,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -21132,11 +21828,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21149,7 +21854,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -21167,7 +21873,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lshadow  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21191,11 +21896,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21208,7 +21922,8 @@
- 
- ac_cv_lib_shadow_getspnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_shadow_getspnam" >&5
-@@ -21244,7 +21959,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21268,11 +21982,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21285,7 +22008,8 @@
- 
- ac_cv_lib_sec_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
-@@ -21311,7 +22035,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lauth  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21335,11 +22058,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21352,7 +22084,8 @@
- 
- ac_cv_lib_auth_getauthuid=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_auth_getauthuid" >&5
-@@ -21389,7 +22122,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21413,11 +22145,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21430,7 +22171,8 @@
- 
- ac_cv_lib_sec_getspnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
-@@ -21451,13 +22193,12 @@
- 		if test "$CHECKSHADOW" = "true"; then
- 		    echo "$as_me:$LINENO: checking for getprpwnam in -lprot" >&5
- echo $ECHO_N "checking for getprpwnam in -lprot... $ECHO_C" >&6
--if test "${ac_cv_lib_prot_getprpwnam_lx+set}" = set; then
-+if test "${ac_cv_lib_prot_getprpwnam+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lprot -lx $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21481,29 +22222,39 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_prot_getprpwnam_lx=yes
-+  ac_cv_lib_prot_getprpwnam=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_prot_getprpwnam_lx=no
-+ac_cv_lib_prot_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_prot_getprpwnam_lx" >&5
--echo "${ECHO_T}$ac_cv_lib_prot_getprpwnam_lx" >&6
--if test $ac_cv_lib_prot_getprpwnam_lx = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_prot_getprpwnam" >&5
-+echo "${ECHO_T}$ac_cv_lib_prot_getprpwnam" >&6
-+if test $ac_cv_lib_prot_getprpwnam = yes; then
-   cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETPRPWNAM 1
- _ACEOF
-@@ -21518,7 +22269,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21542,11 +22292,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21559,7 +22318,8 @@
- 
- ac_cv_lib_gen_getspnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
-@@ -21592,7 +22352,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21616,11 +22375,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21633,7 +22401,8 @@
- 
- ac_cv_lib_sec_getspnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
-@@ -21660,7 +22429,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc89  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21684,11 +22452,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21701,7 +22478,8 @@
- 
- ac_cv_lib_c89_strcasecmp=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_c89_strcasecmp" >&5
-@@ -21839,21 +22617,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -21884,11 +22669,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21901,7 +22695,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -21919,7 +22714,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21943,11 +22737,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -21960,7 +22763,8 @@
- 
- ac_cv_lib_gen_getspnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
-@@ -21983,21 +22787,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define getprpwnam to an innocuous variant, in case <limits.h> declares getprpwnam.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getprpwnam innocuous_getprpwnam
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char getprpwnam (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef getprpwnam
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -22028,11 +22839,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22045,7 +22865,8 @@
- 
- ac_cv_func_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_getprpwnam" >&5
- echo "${ECHO_T}$ac_cv_func_getprpwnam" >&6
-@@ -22061,7 +22882,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsec  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22085,11 +22905,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22102,7 +22931,8 @@
- 
- ac_cv_lib_sec_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getprpwnam" >&5
-@@ -22121,7 +22951,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsecurity  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22145,11 +22974,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22162,7 +23000,8 @@
- 
- ac_cv_lib_security_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
-@@ -22181,7 +23020,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lprot  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22205,11 +23043,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22222,7 +23069,8 @@
- 
- ac_cv_lib_prot_getprpwnam=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_prot_getprpwnam" >&5
-@@ -22250,7 +23098,6 @@
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22270,7 +23117,6 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22300,7 +23146,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22363,11 +23208,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22380,7 +23234,7 @@
- 
- ac_cv_c_const=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
-@@ -22398,7 +23252,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22417,11 +23270,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22434,7 +23296,7 @@
- 
- ac_cv_c_volatile=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
- echo "${ECHO_T}$ac_cv_c_volatile" >&6
-@@ -22686,7 +23548,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22707,11 +23568,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22724,12 +23594,11 @@
- 
- ac_cv_header_stdc=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22751,7 +23620,6 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22776,7 +23644,6 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22788,9 +23655,9 @@
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
- # define ISLOWER(c) \
--                   (('a' <= (c) && (c) <= 'i') \
--                     || ('j' <= (c) && (c) <= 'r') \
--                     || ('s' <= (c) && (c) <= 'z'))
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
- 
-@@ -22801,7 +23668,7 @@
-   int i;
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
--        || toupper (i) != TOUPPER (i))
-+	|| toupper (i) != TOUPPER (i))
-       exit(2);
-   exit (0);
- }
-@@ -22826,7 +23693,7 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
-@@ -22854,7 +23721,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22874,11 +23740,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22891,7 +23766,7 @@
- 
- eval "$as_ac_Header=no"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -22914,7 +23789,6 @@
-   ac_func_search_save_LIBS=$LIBS
- ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22938,11 +23812,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22954,12 +23837,12 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_opendir" = no; then
-   for ac_lib in dir; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22983,11 +23866,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23000,7 +23892,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_save_LIBS
-@@ -23021,7 +23914,6 @@
-   ac_func_search_save_LIBS=$LIBS
- ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23045,11 +23937,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23061,12 +23962,12 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_opendir" = no; then
-   for ac_lib in x; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23090,11 +23991,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23107,7 +24017,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_save_LIBS
-@@ -23144,7 +24055,6 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23155,11 +24065,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23172,7 +24091,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -23180,7 +24099,6 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23198,6 +24116,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -23217,33 +24136,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -23254,7 +24172,7 @@
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -23286,7 +24204,6 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23297,11 +24214,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23314,7 +24240,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -23322,7 +24248,6 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23340,6 +24265,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -23359,33 +24285,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -23396,7 +24321,7 @@
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -23408,7 +24333,14 @@
- _ACEOF
- 
- else
--  LIBOBJS="$LIBOBJS err.$ac_objext"
-+  case $LIBOBJS in
-+    "err.$ac_objext"   | \
-+  *" err.$ac_objext"   | \
-+    "err.$ac_objext "* | \
-+  *" err.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS err.$ac_objext" ;;
-+esac
-+
- fi
- 
- done
-@@ -23420,7 +24352,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23441,11 +24372,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23458,7 +24398,8 @@
- 
- ac_cv_sys_posix_termios=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_sys_posix_termios" >&5
- echo "${ECHO_T}$ac_cv_sys_posix_termios" >&6
-@@ -23486,7 +24427,6 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23497,11 +24437,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23514,7 +24463,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -23522,7 +24471,6 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23540,6 +24488,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -23559,33 +24508,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -23596,7 +24544,7 @@
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -23631,7 +24579,6 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23642,11 +24589,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23659,7 +24615,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -23667,7 +24623,6 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23685,6 +24640,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -23704,33 +24660,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -23741,7 +24696,7 @@
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -23771,7 +24726,6 @@
- echo "$as_me:$LINENO: checking bsd_auth.h usability" >&5
- echo $ECHO_N "checking bsd_auth.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23782,11 +24736,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23799,7 +24762,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -23807,7 +24770,6 @@
- echo "$as_me:$LINENO: checking bsd_auth.h presence" >&5
- echo $ECHO_N "checking bsd_auth.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23825,6 +24787,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -23844,33 +24807,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: bsd_auth.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: bsd_auth.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: bsd_auth.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: bsd_auth.h: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: bsd_auth.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: bsd_auth.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: bsd_auth.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: bsd_auth.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: bsd_auth.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: bsd_auth.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: bsd_auth.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: bsd_auth.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: bsd_auth.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: bsd_auth.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: bsd_auth.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: bsd_auth.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: bsd_auth.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: bsd_auth.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: bsd_auth.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: bsd_auth.h: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -23904,7 +24866,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23924,11 +24885,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23941,7 +24911,7 @@
- 
- ac_cv_type_mode_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
- echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-@@ -23961,7 +24931,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24000,7 +24969,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24022,11 +24990,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24039,7 +25016,7 @@
- 
- ac_cv_type_sig_atomic_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
- echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
-@@ -24063,7 +25040,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24085,11 +25061,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24102,7 +25087,7 @@
- 
- ac_cv_type_sigaction_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_sigaction_t" >&5
- echo "${ECHO_T}$ac_cv_type_sigaction_t" >&6
-@@ -24124,7 +25109,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24147,11 +25131,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24164,7 +25157,7 @@
- 
- ac_cv_type_struct_timespec=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_struct_timespec" >&5
- echo "${ECHO_T}$ac_cv_type_struct_timespec" >&6
-@@ -24181,7 +25174,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24221,7 +25213,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24261,7 +25252,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24301,7 +25291,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24338,7 +25327,6 @@
- echo "$as_me:$LINENO: checking for full void implementation" >&5
- echo $ECHO_N "checking for full void implementation... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24356,11 +25344,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24384,7 +25381,7 @@
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- echo "$as_me:$LINENO: checking max length of uid_t" >&5
- echo $ECHO_N "checking max length of uid_t... $ECHO_C" >&6
-@@ -24393,14 +25390,9 @@
- else
-   rm -f conftestdata
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  true
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24445,7 +25437,7 @@
- ( exit $ac_status )
- sudo_cv_uid_t_len=10
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- fi
-@@ -24462,7 +25454,6 @@
- echo "$as_me:$LINENO: checking for long long support" >&5
- echo $ECHO_N "checking for long long support... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24479,11 +25470,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24495,14 +25495,9 @@
- _ACEOF
- 
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  true
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24531,8 +25526,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+( exit $ac_status )
-+true
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -24543,7 +25540,8 @@
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for sa_len field in struct sockaddr" >&5
- echo $ECHO_N "checking for sa_len field in struct sockaddr... $ECHO_C" >&6
- if test "${sudo_cv_sock_sa_len+set}" = set; then
-@@ -24553,7 +25551,6 @@
-   sudo_cv_sock_sa_len=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24587,7 +25584,7 @@
- ( exit $ac_status )
- sudo_cv_sock_sa_len=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f core core.* *.core
- fi
-@@ -24609,7 +25606,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -24636,11 +25632,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24653,7 +25658,7 @@
- 
- ac_cv_type_signal=int
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
-@@ -24686,21 +25691,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -24731,11 +25743,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24748,7 +25769,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -24770,21 +25792,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -24815,11 +25844,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24832,7 +25870,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -24860,21 +25899,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -24905,11 +25951,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24922,7 +25977,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -24946,21 +26002,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -24991,11 +26054,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25008,7 +26080,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25032,21 +26105,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25077,11 +26157,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25094,7 +26183,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25112,21 +26202,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25157,11 +26254,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25174,7 +26280,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25203,21 +26310,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25248,11 +26362,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25265,7 +26388,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25289,21 +26413,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25334,11 +26465,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25351,7 +26491,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25361,7 +26502,14 @@
- _ACEOF
- 
- else
--  LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-+  case $LIBOBJS in
-+    "$ac_func.$ac_objext"   | \
-+  *" $ac_func.$ac_objext"   | \
-+    "$ac_func.$ac_objext "* | \
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-+esac
-+
- fi
- done
- 
-@@ -25378,21 +26526,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25423,11 +26578,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25440,7 +26604,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25463,21 +26628,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25508,11 +26680,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25525,7 +26706,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25548,21 +26730,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25593,11 +26782,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25610,7 +26808,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25628,21 +26827,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25673,11 +26879,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25690,7 +26905,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25715,21 +26931,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25760,11 +26983,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25777,7 +27009,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25795,7 +27028,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcompat  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -25819,11 +27051,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25836,7 +27077,8 @@
- 
- ac_cv_lib_compat_lsearch=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_compat_lsearch" >&5
-@@ -25848,7 +27090,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -25866,6 +27107,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -25890,12 +27132,26 @@
- _ACEOF
-  LIBS="${LIBS} -lcompat"
- else
--  LIBOBJS="$LIBOBJS lsearch.$ac_objext"
-+  case $LIBOBJS in
-+    "lsearch.$ac_objext"   | \
-+  *" lsearch.$ac_objext"   | \
-+    "lsearch.$ac_objext "* | \
-+  *" lsearch.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS lsearch.$ac_objext" ;;
-+esac
-+
- fi
- 
- 
- else
--  LIBOBJS="$LIBOBJS lsearch.$ac_objext"
-+  case $LIBOBJS in
-+    "lsearch.$ac_objext"   | \
-+  *" lsearch.$ac_objext"   | \
-+    "lsearch.$ac_objext "* | \
-+  *" lsearch.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS lsearch.$ac_objext" ;;
-+esac
-+
- fi
- 
- fi
-@@ -25911,21 +27167,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -25956,11 +27219,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -25973,7 +27245,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -25992,21 +27265,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -26037,11 +27317,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26054,7 +27343,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -26077,21 +27367,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -26122,11 +27419,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26139,7 +27445,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -26150,7 +27457,14 @@
- 
- fi
- done
-- LIBOBJS="$LIBOBJS utimes.$ac_objext"
-+ case $LIBOBJS in
-+    "utimes.$ac_objext"   | \
-+  *" utimes.$ac_objext"   | \
-+    "utimes.$ac_objext "* | \
-+  *" utimes.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS utimes.$ac_objext" ;;
-+esac
-+
- fi
- done
- 
-@@ -26164,7 +27478,6 @@
-   sudo_cv_func_fnmatch=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26194,7 +27507,7 @@
- ( exit $ac_status )
- sudo_cv_func_fnmatch=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f core core.* *.core
- fi
-@@ -26206,7 +27519,14 @@
- _ACEOF
- 
- else
--  LIBOBJS="$LIBOBJS fnmatch.$ac_objext"
-+  case $LIBOBJS in
-+    "fnmatch.$ac_objext"   | \
-+  *" fnmatch.$ac_objext"   | \
-+    "fnmatch.$ac_objext "* | \
-+  *" fnmatch.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS fnmatch.$ac_objext" ;;
-+esac
-+
- fi
- 
- echo "$as_me:$LINENO: checking for isblank" >&5
-@@ -26215,7 +27535,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26232,11 +27551,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26249,7 +27577,8 @@
- 
- sudo_cv_func_isblank=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $sudo_cv_func_isblank" >&5
- echo "${ECHO_T}$sudo_cv_func_isblank" >&6
-@@ -26277,21 +27606,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -26322,11 +27658,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26339,7 +27684,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -26349,7 +27695,14 @@
- _ACEOF
- 
- else
--  LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-+  case $LIBOBJS in
-+    "$ac_func.$ac_objext"   | \
-+  *" $ac_func.$ac_objext"   | \
-+    "$ac_func.$ac_objext "* | \
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-+esac
-+
- fi
- done
- 
-@@ -26367,21 +27720,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -26412,11 +27772,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26429,7 +27798,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -26450,7 +27820,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26469,11 +27838,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26485,7 +27863,6 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26504,11 +27881,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26521,9 +27907,9 @@
- 
- ac_cv_member_struct_stat_st_mtim=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
- echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6
-@@ -26539,7 +27925,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26558,11 +27943,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26574,7 +27968,6 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26593,11 +27986,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26610,9 +28012,9 @@
- 
- ac_cv_member_struct_stat_st_mtimespec=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec" >&5
- echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtimespec" >&6
-@@ -26628,7 +28030,6 @@
-     echo "$as_me:$LINENO: checking for two-parameter timespecsub" >&5
- echo $ECHO_N "checking for two-parameter timespecsub... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26651,11 +28052,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26674,10 +28084,9 @@
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26695,11 +28104,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26714,7 +28132,6 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26732,11 +28149,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26751,11 +28177,20 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- if test -n "$NEED_SNPRINTF"; then
--    LIBOBJS="$LIBOBJS snprintf.$ac_objext"
-+    case $LIBOBJS in
-+    "snprintf.$ac_objext"   | \
-+  *" snprintf.$ac_objext"   | \
-+    "snprintf.$ac_objext "* | \
-+  *" snprintf.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" ;;
-+esac
-+
- fi
- if test -z "$LIB_CRYPT" -a "$with_pam" != "yes"; then
-     echo "$as_me:$LINENO: checking for crypt" >&5
-@@ -26764,21 +28199,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define crypt to an innocuous variant, in case <limits.h> declares crypt.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define crypt innocuous_crypt
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char crypt (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef crypt
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -26809,11 +28251,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26826,7 +28277,8 @@
- 
- ac_cv_func_crypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
- echo "${ECHO_T}$ac_cv_func_crypt" >&6
-@@ -26841,7 +28293,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcrypt  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26865,11 +28316,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26882,7 +28342,8 @@
- 
- ac_cv_lib_crypt_crypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-@@ -26898,7 +28359,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcrypt_d  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26922,11 +28382,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26939,7 +28408,8 @@
- 
- ac_cv_lib_crypt_d_crypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_d_crypt" >&5
-@@ -26955,7 +28425,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lufc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -26979,11 +28448,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -26996,7 +28474,8 @@
- 
- ac_cv_lib_ufc_crypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ufc_crypt" >&5
-@@ -27018,21 +28497,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define socket to an innocuous variant, in case <limits.h> declares socket.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define socket innocuous_socket
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char socket (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef socket
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -27063,11 +28549,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27080,7 +28575,8 @@
- 
- ac_cv_func_socket=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
- echo "${ECHO_T}$ac_cv_func_socket" >&6
-@@ -27095,7 +28591,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27119,11 +28614,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27136,7 +28640,8 @@
- 
- ac_cv_lib_socket_socket=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-@@ -27152,7 +28657,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27176,11 +28680,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27193,7 +28706,8 @@
- 
- ac_cv_lib_inet_socket=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_inet_socket" >&5
-@@ -27205,13 +28719,12 @@
- echo "$as_me: WARNING: unable to find socket() trying -lsocket -lnsl" >&2;}
- echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
- echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
--if test "${ac_cv_lib_socket_socket_lnsl+set}" = set; then
-+if test "${ac_cv_lib_socket_socket+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket -lnsl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27235,29 +28748,39 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_socket_socket_lnsl=yes
-+  ac_cv_lib_socket_socket=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_socket_socket_lnsl=no
-+ac_cv_lib_socket_socket=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket_lnsl" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_socket_lnsl" >&6
--if test $ac_cv_lib_socket_socket_lnsl = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+if test $ac_cv_lib_socket_socket = yes; then
-   NET_LIBS="${NET_LIBS} -lsocket -lnsl"; LIBS="${LIBS} -lsocket -lnsl"
- fi
- 
-@@ -27273,21 +28796,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define inet_addr to an innocuous variant, in case <limits.h> declares inet_addr.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define inet_addr innocuous_inet_addr
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char inet_addr (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef inet_addr
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -27318,11 +28848,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27335,7 +28874,8 @@
- 
- ac_cv_func_inet_addr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_inet_addr" >&5
- echo "${ECHO_T}$ac_cv_func_inet_addr" >&6
-@@ -27348,21 +28888,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define __inet_addr to an innocuous variant, in case <limits.h> declares __inet_addr.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define __inet_addr innocuous___inet_addr
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char __inet_addr (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef __inet_addr
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -27393,11 +28940,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27410,7 +28966,8 @@
- 
- ac_cv_func___inet_addr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func___inet_addr" >&5
- echo "${ECHO_T}$ac_cv_func___inet_addr" >&6
-@@ -27425,7 +28982,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27449,11 +29005,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27466,7 +29031,8 @@
- 
- ac_cv_lib_nsl_inet_addr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_addr" >&5
-@@ -27482,7 +29048,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27506,11 +29071,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27523,7 +29097,8 @@
- 
- ac_cv_lib_inet_inet_addr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_inet_inet_addr" >&5
-@@ -27535,13 +29110,12 @@
- echo "$as_me: WARNING: unable to find inet_addr() trying -lsocket -lnsl" >&2;}
- echo "$as_me:$LINENO: checking for inet_addr in -lsocket" >&5
- echo $ECHO_N "checking for inet_addr in -lsocket... $ECHO_C" >&6
--if test "${ac_cv_lib_socket_inet_addr_lnsl+set}" = set; then
-+if test "${ac_cv_lib_socket_inet_addr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket -lnsl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27565,29 +29139,39 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_socket_inet_addr_lnsl=yes
-+  ac_cv_lib_socket_inet_addr=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_socket_inet_addr_lnsl=no
-+ac_cv_lib_socket_inet_addr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_inet_addr_lnsl" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_inet_addr_lnsl" >&6
--if test $ac_cv_lib_socket_inet_addr_lnsl = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_inet_addr" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_inet_addr" >&6
-+if test $ac_cv_lib_socket_inet_addr = yes; then
-   NET_LIBS="${NET_LIBS} -lsocket -lnsl"; LIBS="${LIBS} -lsocket -lnsl"
- fi
- 
-@@ -27605,21 +29189,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define syslog to an innocuous variant, in case <limits.h> declares syslog.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define syslog innocuous_syslog
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char syslog (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef syslog
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -27650,11 +29241,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27667,7 +29267,8 @@
- 
- ac_cv_func_syslog=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_syslog" >&5
- echo "${ECHO_T}$ac_cv_func_syslog" >&6
-@@ -27682,7 +29283,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27706,11 +29306,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27723,7 +29332,8 @@
- 
- ac_cv_lib_socket_syslog=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_socket_syslog" >&5
-@@ -27739,7 +29349,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27763,11 +29372,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27780,7 +29398,8 @@
- 
- ac_cv_lib_nsl_syslog=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_syslog" >&5
-@@ -27796,7 +29415,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27820,11 +29438,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27837,7 +29464,8 @@
- 
- ac_cv_lib_inet_syslog=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_inet_syslog" >&5
-@@ -27861,7 +29489,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27878,11 +29505,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27895,7 +29531,8 @@
- 
- ac_cv_working_alloca_h=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
- echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-@@ -27913,7 +29550,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27950,11 +29586,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27967,7 +29612,8 @@
- 
- ac_cv_func_alloca_works=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
- echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-@@ -27997,7 +29643,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28030,21 +29675,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -28075,11 +29727,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28092,7 +29753,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -28117,7 +29779,6 @@
-   ac_cv_c_stack_direction=0
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28163,7 +29824,7 @@
- ( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-@@ -28187,21 +29848,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -28232,11 +29900,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28249,7 +29926,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -28267,7 +29945,6 @@
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28284,11 +29961,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28301,7 +29987,8 @@
- 
- sudo_cv___progname=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- 
-     if test "$sudo_cv___progname" = "yes"; then
-@@ -28310,7 +29997,14 @@
- _ACEOF
- 
-     else
--	LIBOBJS="$LIBOBJS getprogname.$ac_objext"
-+	case $LIBOBJS in
-+    "getprogname.$ac_objext"   | \
-+  *" getprogname.$ac_objext"   | \
-+    "getprogname.$ac_objext "* | \
-+  *" getprogname.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS getprogname.$ac_objext" ;;
-+esac
-+
-     fi
-     echo "$as_me:$LINENO: result: $sudo_cv___progname" >&5
- echo "${ECHO_T}$sudo_cv___progname" >&6
-@@ -28342,6 +30036,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -28394,7 +30089,6 @@
- echo "$as_me:$LINENO: checking krb.h usability" >&5
- echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28405,11 +30099,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28422,7 +30125,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -28430,7 +30133,6 @@
- echo "$as_me:$LINENO: checking krb.h presence" >&5
- echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28448,6 +30150,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -28467,33 +30170,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: krb.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: krb.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: krb.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -28531,7 +30233,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldes  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28555,11 +30256,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28572,7 +30282,8 @@
- 
- ac_cv_lib_des_des_cbc_encrypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
-@@ -28589,7 +30300,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldes425  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28613,11 +30323,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28630,7 +30349,8 @@
- 
- ac_cv_lib_des425_des_cbc_encrypt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
-@@ -28647,7 +30367,6 @@
-                 echo "$as_me:$LINENO: checking whether we are using KTH Kerberos IV" >&5
- echo $ECHO_N "checking whether we are using KTH Kerberos IV... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28664,11 +30383,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28686,7 +30414,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lroken  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28704,11 +30431,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28721,7 +30457,8 @@
- 
- ac_cv_lib_roken_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_roken_main" >&5
-@@ -28741,17 +30478,15 @@
- 
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--                as_ac_Lib=`echo "ac_cv_lib_krb_main$K4LIBS" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for main in -lkrb" >&5
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+                echo "$as_me:$LINENO: checking for main in -lkrb" >&5
- echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+if test "${ac_cv_lib_krb_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lkrb $K4LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28769,42 +30504,50 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  eval "$as_ac_Lib=yes"
-+  ac_cv_lib_krb_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Lib=no"
-+ac_cv_lib_krb_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_krb_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb_main" >&6
-+if test $ac_cv_lib_krb_main = yes; then
-   K4LIBS="-lkrb $K4LIBS"
- else
- 
--	as_ac_Lib=`echo "ac_cv_lib_krb4_main$K4LIBS" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for main in -lkrb4" >&5
-+	echo "$as_me:$LINENO: checking for main in -lkrb4" >&5
- echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+if test "${ac_cv_lib_krb4_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lkrb4 $K4LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28822,29 +30565,39 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  eval "$as_ac_Lib=yes"
-+  ac_cv_lib_krb4_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Lib=no"
-+ac_cv_lib_krb4_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6
-+if test $ac_cv_lib_krb4_main = yes; then
-   K4LIBS="-lkrb4 $K4LIBS"
- else
-   K4LIBS="-lkrb $K4LIBS"
-@@ -28909,7 +30662,6 @@
- 				echo "$as_me:$LINENO: checking whether we are using Heimdal" >&5
- echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -28926,11 +30678,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28950,7 +30711,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
- fi
- if test -n "$with_kerb5" -a -z "$KRB5CONFIG"; then
-@@ -28976,6 +30737,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -29014,7 +30776,6 @@
-                 echo "$as_me:$LINENO: checking whether we are using Heimdal" >&5
- echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29031,11 +30792,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29057,7 +30827,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lroken  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29075,11 +30844,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29092,7 +30870,8 @@
- 
- ac_cv_lib_roken_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_roken_main" >&5
-@@ -29113,7 +30892,7 @@
- 
- 
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-     AUTH_OBJS="${AUTH_OBJS} kerb5.o"
- fi
- 
-@@ -29126,7 +30905,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29144,11 +30922,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29161,7 +30948,8 @@
- 
- ac_cv_lib_dl_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
-@@ -29190,7 +30978,6 @@
- echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29201,11 +30988,20 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29218,7 +31014,7 @@
- 
- ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
-@@ -29226,7 +31022,6 @@
- echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29244,6 +31039,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -29263,33 +31059,32 @@
- echo "${ECHO_T}$ac_header_preproc" >&6
- 
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-     ;;
--  no:yes )
-+  no:yes:* )
-     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
-+## ------------------------------- ##
-+## Report this to the sudo lists.  ##
-+## ------------------------------- ##
- _ASBOX
-     ) |
-       sed "s/^/$as_me: WARNING:     /" >&2
-@@ -29300,7 +31095,7 @@
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=$ac_header_preproc"
-+  eval "$as_ac_Header=\$ac_header_preproc"
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -29412,6 +31207,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -29445,6 +31241,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -29498,7 +31295,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lskey  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29516,11 +31312,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29533,7 +31338,8 @@
- 
- ac_cv_lib_skey_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_skey_main" >&5
-@@ -29553,7 +31359,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lskey  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29577,11 +31382,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29594,7 +31408,8 @@
- 
- ac_cv_lib_skey_skeyaccess=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_skey_skeyaccess" >&5
-@@ -29647,6 +31462,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -29680,6 +31496,7 @@
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -29733,7 +31550,6 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lopie  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29751,11 +31567,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29768,7 +31593,8 @@
- 
- ac_cv_lib_opie_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_opie_main" >&5
-@@ -29809,7 +31635,7 @@
-     #
-     echo "$as_me:$LINENO: checking for SD_Init in -laceclnt" >&5
- echo $ECHO_N "checking for SD_Init in -laceclnt... $ECHO_C" >&6
--if test "${ac_cv_lib_aceclnt_SD_Init_______lpthread_______+set}" = set; then
-+if test "${ac_cv_lib_aceclnt_SD_Init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -29818,7 +31644,6 @@
- 
-      $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29842,29 +31667,39 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_aceclnt_SD_Init_______lpthread_______=yes
-+  ac_cv_lib_aceclnt_SD_Init=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_aceclnt_SD_Init_______lpthread_______=no
-+ac_cv_lib_aceclnt_SD_Init=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_aceclnt_SD_Init_______lpthread_______" >&5
--echo "${ECHO_T}$ac_cv_lib_aceclnt_SD_Init_______lpthread_______" >&6
--if test $ac_cv_lib_aceclnt_SD_Init_______lpthread_______ = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_aceclnt_SD_Init" >&5
-+echo "${ECHO_T}$ac_cv_lib_aceclnt_SD_Init" >&6
-+if test $ac_cv_lib_aceclnt_SD_Init = yes; then
- 
- 	    AUTH_OBJS="securid5.o"
- 	    SUDO_LIBS="${SUDO_LIBS} -laceclnt -lpthread"
-@@ -29950,7 +31785,6 @@
- 	LIBS="${LIBS} $l"
- 	LDAP_LIBS="${LDAP_LIBS} $l"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -29969,11 +31803,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29985,7 +31828,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-     done
-         if test "$found" = "no"; then
- 	LDAP_LIBS=" -ldap"
-@@ -29998,7 +31842,6 @@
-         echo "$as_me:$LINENO: checking whether lber.h is needed" >&5
- echo $ECHO_N "checking whether lber.h is needed... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -30016,11 +31859,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -30040,7 +31892,8 @@
- _ACEOF
- 
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- 
- 
- 
-@@ -30053,21 +31906,28 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
-+
-+#undef $ac_func
-+
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-@@ -30098,11 +31958,20 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+  (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -30115,7 +31984,8 @@
- 
- eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -30295,13 +32165,13 @@
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
-       sed -n \
--        "s/'/'\\\\''/g;
--    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-       ;;
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
-       sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-       ;;
-     esac;
- } |
-@@ -30331,13 +32201,13 @@
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
- s/:*\$(srcdir):*/:/;
- s/:*\${srcdir}:*/:/;
- s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ 	]*\):*/\1/;
-+s/^\([^=]*=[	 ]*\):*/\1/;
- s/:*$//;
--s/^[^=]*=[ 	]*$//;
-+s/^[^=]*=[	 ]*$//;
- }'
- fi
- 
-@@ -30348,7 +32218,7 @@
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_i=`echo "$ac_i" |
--         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-   # 2. Add them.
-   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-@@ -30392,9 +32262,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-   set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
-@@ -30413,7 +32284,7 @@
-   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-   LC_TELEPHONE LC_TIME
- do
--  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     $as_unset $as_var
-@@ -30592,16 +32463,17 @@
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
- else
-+  test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
- fi
- 
- as_executable_p="test -f"
- 
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
- # IFS
-@@ -30628,7 +32500,7 @@
- cat >&5 <<_CSEOF
- 
- This file was extended by sudo $as_me 1.6.8, which was
--generated by GNU Autoconf 2.57.  Invocation command line was
-+generated by GNU Autoconf 2.59.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -30672,9 +32544,9 @@
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
-   --file=FILE[:TEMPLATE]
--                   instantiate the configuration file FILE
-+		   instantiate the configuration file FILE
-   --header=FILE[:TEMPLATE]
--                   instantiate the configuration header FILE
-+		   instantiate the configuration header FILE
- 
- Configuration files:
- $config_files
-@@ -30688,11 +32560,10 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- sudo config.status 1.6.8
--configured by $0, generated by GNU Autoconf 2.57,
-+configured by $0, generated by GNU Autoconf 2.59,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- srcdir=$srcdir
-@@ -31000,9 +32871,9 @@
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -31020,21 +32891,21 @@
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case $ac_file in
-   - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	cat >$tmp/stdin
-+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
-   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_file" : 'X\(//\)[^/]' \| \
--         X"$ac_file" : 'X\(//\)$' \| \
--         X"$ac_file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31050,10 +32921,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$as_dir" : 'X\(//\)[^/]' \| \
--         X"$as_dir" : 'X\(//\)$' \| \
--         X"$as_dir" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31091,20 +32962,48 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
- 
- 
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -31114,7 +33013,7 @@
-     configure_input="$ac_file.  "
-   fi
-   configure_input=$configure_input"Generated from `echo $ac_file_in |
--                                     sed 's,.*/,,'` by configure."
-+				     sed 's,.*/,,'` by configure."
- 
-   # First look for the input files in the build tree, otherwise in the
-   # src tree.
-@@ -31123,26 +33022,32 @@
-       case $f in
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 # Absolute (can't be DOS-style, as IFS=:)
-+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         echo $f;;
-+	 echo "$f";;
-       *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 if test -f "$f"; then
-+	   # Build tree
-+	   echo "$f"
-+	 elif test -f "$srcdir/$f"; then
-+	   # Source tree
-+	   echo "$srcdir/$f"
-+	 else
-+	   # /dev/null tree
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         fi;;
-+	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-+
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-@@ -31181,12 +33086,12 @@
- # NAME is the cpp macro being defined and VALUE is the value it is being given.
- #
- # ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
--ac_dB='[ 	].*$,\1#\2'
-+ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-+ac_dB='[	 ].*$,\1#\2'
- ac_dC=' '
- ac_dD=',;t'
- # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
- ac_uB='$,\1#\2define\3'
- ac_uC=' '
- ac_uD=',;t'
-@@ -31195,11 +33100,11 @@
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case $ac_file in
-   - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	cat >$tmp/stdin
-+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
-@@ -31213,28 +33118,29 @@
-       case $f in
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 # Absolute (can't be DOS-style, as IFS=:)
-+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         echo $f;;
-+	 # Do quote $f, to prevent DOS paths from being IFS'd.
-+	 echo "$f";;
-       *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+	 if test -f "$f"; then
-+	   # Build tree
-+	   echo "$f"
-+	 elif test -f "$srcdir/$f"; then
-+	   # Source tree
-+	   echo "$srcdir/$f"
-+	 else
-+	   # /dev/null tree
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
--         fi;;
-+	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-   # Remove the trailing spaces.
--  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
-+  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
- 
- _ACEOF
- 
-@@ -31257,9 +33163,9 @@
- s,[\\$`],\\&,g
- t clear
- : clear
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
- t end
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
- : end
- _ACEOF
- # If some macros were called several times there might be several times
-@@ -31273,13 +33179,13 @@
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- cat >>conftest.undefs <<\_ACEOF
--s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
- _ACEOF
- 
- # Break up conftest.defines because some shells have a limit on the size
- # of here documents, and old seds have small limits too (100 cmds).
- echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-+echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
- echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
- echo '  :' >>$CONFIG_STATUS
- rm -f conftest.tail
-@@ -31288,7 +33194,7 @@
-   # Write a limited-size here document to $tmp/defines.sed.
-   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-   # Speed up: don't consider the non `#define' lines.
--  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
-+  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-   # Work around the forget-to-reset-the-flag bug.
-   echo 't clr' >>$CONFIG_STATUS
-   echo ': clr' >>$CONFIG_STATUS
-@@ -31315,7 +33221,7 @@
-   # Write a limited-size here document to $tmp/undefs.sed.
-   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-   # Speed up: don't consider the non `#undef'
--  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
-+  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-   # Work around the forget-to-reset-the-flag bug.
-   echo 't clr' >>$CONFIG_STATUS
-   echo ': clr' >>$CONFIG_STATUS
-@@ -31349,10 +33255,10 @@
-     else
-       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_file" : 'X\(//\)[^/]' \| \
--         X"$ac_file" : 'X\(//\)$' \| \
--         X"$ac_file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -31368,10 +33274,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$as_dir" : 'X\(//\)[^/]' \| \
--         X"$as_dir" : 'X\(//\)$' \| \
--         X"$as_dir" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-diff -ur sudo-1.6.8p9/configure.in sudo-1.6.8p9-patched/configure.in
---- sudo-1.6.8p9/configure.in	2004-11-25 11:31:20.000000000 -0600
-+++ sudo-1.6.8p9-patched/configure.in	2006-05-26 13:05:14.000000000 -0500
-@@ -1703,9 +1703,9 @@
- AC_CHECK_FUNCS(lockf flock, [break])
- AC_CHECK_FUNCS(waitpid wait3, [break])
- AC_CHECK_FUNCS(innetgr _innetgr, [AC_CHECK_FUNCS(getdomainname) [break]])
--AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, AC_CHECK_HEADER(search.h, AC_DEFINE(HAVE_LSEARCH) [LIBS="${LIBS} -lcompat"], AC_LIBOBJ(lsearch), -), AC_LIBOBJ(lsearch))])
-+AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, [AC_CHECK_HEADER(search.h, AC_DEFINE(HAVE_LSEARCH) [LIBS="${LIBS} -lcompat"], [AC_LIBOBJ(lsearch)], -)], [AC_LIBOBJ(lsearch)])])
- AC_CHECK_FUNCS(utimes, [AC_CHECK_FUNCS(futimes futimesat, [break])], [AC_CHECK_FUNCS(futime) AC_LIBOBJ(utimes)])
--SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH), AC_LIBOBJ(fnmatch))
-+SUDO_FUNC_FNMATCH(AC_DEFINE(HAVE_FNMATCH), [AC_LIBOBJ(fnmatch)])
- SUDO_FUNC_ISBLANK
- AC_REPLACE_FUNCS(strerror strcasecmp sigaction strlcpy strlcat closefrom)
- AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf, , [NEED_SNPRINTF=1])
-diff -ur sudo-1.6.8p9/Makefile.in sudo-1.6.8p9-patched/Makefile.in
---- sudo-1.6.8p9/Makefile.in	2005-06-19 15:03:50.000000000 -0500
-+++ sudo-1.6.8p9-patched/Makefile.in	2006-05-26 13:04:20.000000000 -0500
-@@ -301,11 +301,13 @@
- 	    $(DESTDIR)$(noexecdir)
- 
- install-binaries: $(PROGS)
--	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo
-+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 sudo $(DESTDIR)$(sudodir)/sudo
-+	$(STRIP) $(DESTDIR)$(sudodir)/sudo
- 	rm -f $(DESTDIR)$(sudodir)/sudoedit
- 	ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
- 
--	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
-+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
-+	$(STRIP) $(DESTDIR)$(visudodir)/visudo
- 
- install-noexec: sudo_noexec.la
- 	$(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 5c1028dbb5..fde4b77117 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,97 +4,23 @@
 #
 #############################################################
 
-SUDO_VERSION:=1.6.8p12
-SUDO_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sudo
-SUDO_SOURCE:=sudo_$(SUDO_VERSION).orig.tar.gz
+SUDO_VERSION = 1.7.4p6
+SUDO_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sudo
+SUDO_SOURCE  = sudo_$(SUDO_VERSION).orig.tar.gz
 
-#SUDO_VERSION:=1.7.0
-#SUDO_SITE:=http://www.courtesan.com/sudo/dist
-# 1.7.0 Needs update Cross-Compiler patches
-# SUDO_SOURCE:=sudo-$(SUDO_VERSION).tar.gz
-
-SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VERSION)
-SUDO_UNZIP:=$(ZCAT)
-
-$(DL_DIR)/$(SUDO_SOURCE):
-	 $(call DOWNLOAD,$(SUDO_SITE),$(SUDO_SOURCE))
-
-sudo-source: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_CONFIG_FILE)
-
-$(SUDO_DIR)/.unpacked: $(DL_DIR)/$(SUDO_SOURCE)
-	$(SUDO_UNZIP) $(DL_DIR)/$(SUDO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(SUDO_DIR) package/sudo sudo-$(SUDO_VERSION)\*.patch
-	$(CONFIG_UPDATE) $(SUDO_DIR)
-	touch $@
-
-$(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE)
-	(cd $(SUDO_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_LARGEFILE) \
+SUDO_CONF_OPT = \
 		--without-lecture \
 		--without-sendmail \
 		--without-umask \
 		--with-logging=syslog \
 		--without-interfaces \
 		--disable-authentication \
-		$(SUDO_EXTRA_CONFIG) \
-	)
-
-	touch $@
-
-$(SUDO_DIR)/sudo: $(SUDO_DIR)/.configured
-	$(MAKE) -C $(SUDO_DIR)
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/sudo: $(SUDO_DIR)/sudo
-	rm -f $(TARGET_DIR)/usr/bin/sudo
-	rm -f $(TARGET_DIR)/usr/sbin/visudo
-	rm -f $(TARGET_DIR)/etc/sudoers
-	$(INSTALL) -m 0777 -D $(SUDO_DIR)/sudo $(TARGET_DIR)/usr/bin/sudo
-	$(INSTALL) -m 0777 -D $(SUDO_DIR)/visudo $(TARGET_DIR)/usr/sbin/visudo
-	$(STRIPCMD) $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/usr/sbin/visudo
-	chmod 4555  $(TARGET_DIR)/usr/bin/sudo
-	chmod 0555  $(TARGET_DIR)/usr/sbin/visudo
-	$(INSTALL) -m 0440 -D $(SUDO_DIR)/sudoers $(TARGET_DIR)/etc/sudoers
-	touch -c $(TARGET_DIR)/usr/bin/sudo
+		--without-pam
 
-sudo: $(TARGET_DIR)/usr/bin/sudo
-
-sudo-unpacked: $(SUDO_DIR)/.unpacked
-
-sudo-clean:
-	rm -f $(TARGET_DIR)/usr/bin/sudo $(TARGET_DIR)/etc/sudoers \
-		$(TARGET_DIR)/usr/sbin/visudo
-	-$(MAKE) -C $(SUDO_DIR) clean
-
-sudo-dirclean:
-	rm -rf $(SUDO_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SUDO),y)
-TARGETS+=sudo
-endif
+define SUDO_INSTALL_TARGET_CMDS
+	install -m 4555 -D $(@D)/sudo $(TARGET_DIR)/usr/bin/sudo
+	install -m 0555 -D $(@D)/visudo $(TARGET_DIR)/usr/sbin/visudo
+	install -m 0440 -D $(@D)/sudoers $(TARGET_DIR)/etc/sudoers
+endef
 
-ifeq ($(BR2_PACKAGE_LIBPAM),y)
-SUDO_EXTRA_CONFIG=--enable-pam
-sudo: libpam
-endif
+$(eval $(call AUTOTARGETS,package,sudo))
\ No newline at end of file

From 2cadc46dd949061f01bc9547a7ed77418496c3d9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 11:55:30 +0200
Subject: [PATCH 0254/6849] atk: bump to 1.33.6

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/atk/atk.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 0ac9b77409..ad95f9944b 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -3,8 +3,8 @@
 # atk
 #
 #############################################################
-ATK_VERSION_MAJOR = 1.30
-ATK_VERSION = $(ATK_VERSION_MAJOR).0
+ATK_VERSION_MAJOR = 1.33
+ATK_VERSION = $(ATK_VERSION_MAJOR).6
 ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
 ATK_INSTALL_STAGING = YES

From a058eedbf57cc5c94ba67ee4e2503a12e01e12fe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 11:55:54 +0200
Subject: [PATCH 0255/6849] libglib2: bump to 2.28.6

The patch libglib2-mkenums-nowarn.patch is removed, since it has been
merged upstream.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libglib2/libglib2-mkenums-nowarn.patch | 14 --------------
 package/libglib2/libglib2.mk                   |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 package/libglib2/libglib2-mkenums-nowarn.patch

diff --git a/package/libglib2/libglib2-mkenums-nowarn.patch b/package/libglib2/libglib2-mkenums-nowarn.patch
deleted file mode 100644
index d92183e7a2..0000000000
--- a/package/libglib2/libglib2-mkenums-nowarn.patch
+++ /dev/null
@@ -1,14 +0,0 @@
----
- gobject/glib-mkenums.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: glib-2.26.0/gobject/glib-mkenums.in
-===================================================================
---- glib-2.26.0.orig/gobject/glib-mkenums.in
-+++ glib-2.26.0/gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#!@PERL_PATH@ -w
-+#!@PERL_PATH@
- 
- use File::Basename;
- use Safe;
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 57facfc4df..828af2109c 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,8 +3,8 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.26
-LIBGLIB2_VERSION_MINOR = 1
+LIBGLIB2_VERSION_MAJOR = 2.28
+LIBGLIB2_VERSION_MINOR = 6
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)

From ffaf13cfbf648dfc067630fe562739dd1624a4b2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 12:02:55 +0200
Subject: [PATCH 0256/6849] pango: bump to 1.28.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pango/pango.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 0556896791..1ccda5f387 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 PANGO_VERSION_MAJOR = 1.28
-PANGO_VERSION_MINOR = 2
+PANGO_VERSION_MINOR = 4
 PANGO_VERSION = $(PANGO_VERSION_MAJOR).$(PANGO_VERSION_MINOR)
 
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2

From 6d795f12c542bd9d954e28c1d048014d8e3d0843 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 11:59:31 +0200
Subject: [PATCH 0257/6849] libgtk2: bump to 2.24.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgtk2/libgtk2.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 6e14d275ac..98b27ae148 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -3,8 +3,8 @@
 # libgtk2.0
 #
 #############################################################
-LIBGTK2_VERSION_MAJOR:=2.22
-LIBGTK2_VERSION_MINOR:=0
+LIBGTK2_VERSION_MAJOR:=2.24
+LIBGTK2_VERSION_MINOR:=4
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2

From e3d389d6d609c60afa31f179bdf8e04901d95ae6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 11:59:46 +0200
Subject: [PATCH 0258/6849] libgtk2: change download site

Use the Gnome FTP server as the download site, like we do for other
components of the Gtk stack.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgtk2/libgtk2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 98b27ae148..3586c86b21 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -8,7 +8,7 @@ LIBGTK2_VERSION_MINOR:=4
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
-LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/$(LIBGTK2_VERSION_MAJOR)
+LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR)
 LIBGTK2_AUTORECONF = NO
 LIBGTK2_INSTALL_STAGING = YES
 LIBGTK2_INSTALL_TARGET = YES

From 0710636813dfceea3299b40983863fb0fbc0f566 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 12:00:16 +0200
Subject: [PATCH 0259/6849] libgtk2: add option to install the gtk-demo program

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgtk2/Config.in  | 7 +++++++
 package/libgtk2/libgtk2.mk | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 38b0b47e0d..efaf12f334 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -16,5 +16,12 @@ config BR2_PACKAGE_LIBGTK2
 
 	  http://www.gtk.org/
 
+config BR2_PACKAGE_LIBGTK2_DEMO
+	bool "Install libgtk2 demo program"
+	depends on BR2_PACKAGE_LIBGTK2
+	help
+	  The GTK+ source base contains a gtk-demo program. This
+	  option allows to install this program to the target.
+
 comment "libgtk2 requires a toolchain with WCHAR and C++ support"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 3586c86b21..169ef97453 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -114,11 +114,13 @@ else
 LIBGTK2_CONF_OPT += --disable-cups
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGTK2_DEMO),)
 define LIBGTK2_POST_INSTALL_TWEAKS
 	rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo
 endef
 
 LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK2_POST_INSTALL_TWEAKS
+endif
 
 # We do not build a full version of libgtk2 for the host, because that
 # requires compiling Cairo, Pango, ATK and X.org for the

From 1e8539797032940eddcba98b3949d730e593b63e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 May 2011 12:01:24 +0200
Subject: [PATCH 0260/6849] gtk2-engines: bump, rename config option and
 convert to AUTOTARGETS

gtk2-engines is bumped from 2.9.1 to 2.20.2 (the latest available
version compatible with Gtk2). The package is converted to the
AUTOTARGETS infrastructure.

The config option is renamed so that it matches the package name
(gtk2-engines instead of libgtk2-engines).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gtk2-engines/Config.in       |  2 +-
 package/gtk2-engines/gtk2-engines.mk | 86 +++-------------------------
 2 files changed, 10 insertions(+), 78 deletions(-)

diff --git a/package/gtk2-engines/Config.in b/package/gtk2-engines/Config.in
index 265f80564b..756a7d00f1 100644
--- a/package/gtk2-engines/Config.in
+++ b/package/gtk2-engines/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LIBGTK2_ENGINES
+config BR2_PACKAGE_GTK2_ENGINES
 	bool "gtk engines"
 	depends on BR2_PACKAGE_LIBGTK2
 	help
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index f188188dcc..aa9e4c3baa 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -3,16 +3,13 @@
 # gtk2-engines.0
 #
 #############################################################
-GTK2_ENGINES_VERSION:=2.9.1
-GTK2_ENGINES_SOURCE:=gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
-GTK2_ENGINES_SITE:=http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.9
-GTK2_ENGINES_CAT:=$(BZCAT)
-GTK2_ENGINES_DIR:=$(BUILD_DIR)/gtk-engines-$(GTK2_ENGINES_VERSION)
-GTK2_ENGINES_BINARY:=libclearlooks.so
+GTK2_ENGINES_VERSION = 2.20.2
+GTK2_ENGINES_SOURCE  = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
+GTK2_ENGINES_SITE    = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.20
 
-GTK2_ENGINES_BUILD_ENV= \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
+GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool
+
+GTK2_ENGINES_CONF_ENV = \
 		ac_cv_func_posix_getpwuid_r=yes \
 		glib_cv_stack_grows=no \
 		glib_cv_uscore=no \
@@ -65,37 +62,7 @@ GTK2_ENGINES_BUILD_ENV= \
 		gl_cv_c_restrict=no \
 		ac_cv_path_CUPS_CONFIG=no
 
-
-$(DL_DIR)/$(GTK2_ENGINES_SOURCE):
-	 $(call DOWNLOAD,$(GTK2_ENGINES_SITE),$(GTK2_ENGINES_SOURCE))
-
-gtk2-engines-source: $(DL_DIR)/$(GTK2_ENGINES_SOURCE)
-
-$(GTK2_ENGINES_DIR)/.unpacked: $(DL_DIR)/$(GTK2_ENGINES_SOURCE)
-	$(GTK2_ENGINES_CAT) $(DL_DIR)/$(GTK2_ENGINES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(GTK2_ENGINES_DIR) package/gtk2-engines/ \*.patch*
-	$(CONFIG_UPDATE) $(GTK2_ENGINES_DIR)
-	touch $(GTK2_ENGINES_DIR)/.unpacked
-
-$(GTK2_ENGINES_DIR)/.configured: $(GTK2_ENGINES_DIR)/.unpacked
-	(cd $(GTK2_ENGINES_DIR); rm -rf config.cache; \
-		$(GTK2_ENGINES_BUILD_ENV) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+GTK2_ENGINES_CONF_OPT = \
 		--with-x \
 		--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib \
@@ -114,41 +81,6 @@ $(GTK2_ENGINES_DIR)/.configured: $(GTK2_ENGINES_DIR)/.unpacked
 		--enable-animation \
 		--disable-development \
 		--disable-paranoia \
-		--disable-deprecated \
-	)
-	touch $(GTK2_ENGINES_DIR)/.configured
-
-$(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY): $(GTK2_ENGINES_DIR)/.configured
-	$(GTK2_ENGINES_BUILD_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(GTK2_ENGINES_DIR)
-	touch -c $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY)
-
-$(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY): $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY)
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(GTK2_ENGINES_DIR) install
-	touch -c $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY)
-
-$(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY): $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY)
-	mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines
-	cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \
-		$(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/
-	mkdir -p $(TARGET_DIR)/usr/usr/share/themes
-	cp -a $(STAGING_DIR)/usr/share/themes/Clearlooks \
-		$(TARGET_DIR)/usr/share/themes/
-	touch -c $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY)
+		--disable-deprecated
 
-gtk2-engines: libgtk2 $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY)
-
-gtk2-engines-clean:
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(GTK2_ENGINES_DIR) uninstall
-	-$(MAKE) -C $(GTK2_ENGINES_DIR) clean
-
-gtk2-engines-dirclean:
-	rm -rf $(GTK2_ENGINES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_GTK2_ENGINES),y)
-TARGETS+=gtk2-engines
-endif
+$(eval $(call AUTOTARGETS,package,gtk2-engines))

From 7234c23967fa70b760c64700e56bb1778019fbeb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 May 2011 21:02:30 +0200
Subject: [PATCH 0261/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index a60a898b49..9155e00ce6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,15 +1,50 @@
 2011.05, Not released yet:
 
+	Fixes all over the tree and new features.
+
+	External toolchain improvements: We now build a binary
+	toolchain wrapper and install it into HOST_DIR/usr/bin, which
+	enforces the correct compiler arguments, making an external
+	toolchain as easy to use outside of Buildroot as the internal
+	ones are. This also brought a cleanup of CFLAGS, making the
+	Buildroot build output easier to read.
+
+	Rootfs device handling improvements: Choice between static
+	/dev, devtmpfs and devtmpfs with either mdev or udev.
+
+	Toolchain: More preconfigured codesourcery external
+	toolchains, improved Crosstool-NG support, fix for GCC
+	snapshot versions, GCC 4.4.6 / 4.5.3, experimental GCC 4.6.0
+	support, target-GCC fixes, uClibc fixes, 0.9.32-rc3 support.
+
+	Bootloaders: U-boot 2011.03, Barebox 2011.05.0
+
+	Linux: support for custom kernel image targets, E.G. for
+	powerpc builds with embedded device trees.
+
+	Misc fixes for qemu defconfigs, ensuring correct serial
+	terminal setup out of the box.
+
+	Misc gentarget / autotools handling fixes.
+
 	Updated/fixed packages: alsa-lib, alsa-utils, alsamixergui,
-	avahi, busybox, copas, dnsmasq, dropbear, ethtool, fakeroot,
-	ffmpeg, file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
-	imagemagick, iproute2, less, libdnet, libpng, libxml2,
-	libxslt, lighttpd, makedevs, midori, mpg123, mpd, mtd-utils,
-	ncurses, netsnmp, openssl, pkg-config, popt, procps, qt,
-	quagga, readline, rsync, samba, squid, socat, squashfs, tslib,
-	webkit, xerces, xlib_xtrans, xorg-server, xterm, xz
-
-	New packages: bonnie++, can-utils, htop, libv4l
+	atk, avahi, bind, bison, busybox, copas, dbus-glib, dhcp,
+	dhcpdump, dnsmasq, dropbear, ethtool, fakeroot, ffmpeg, file,
+	gamin, gnuconfig, gst-ffmpeg, gst-plugins-good, gtk2-engines,
+	haserl, hostapd, icu, imagemagick, iproute2, iw, kismet, less,
+	libcap, libdnet, libglade, libglib2, libgtk2, libnl, libpng,
+	libxml2, libxml2, libxslt, lighttpd, lockfile-progs, makedevs,
+	midori, mpg123, mpc, mpd, mpfr, mtd-utils, ncurses, netsnmp,
+	openssh, openssl, openvpn, pango, pkg-config, popt, procps,
+	proftpd, qt, quagga, readline, rsync, samba, sdl, socat,
+	squashfs, squid, sudo, tslib, udev, usbutils, webkit,
+	wpa_supplicant, xerces, xfont_font-misc-misc, xlib_libX11,
+	xlib_libXfont, xlib_xtrans, xorg-server, xterm, xz
+
+	New packages: bonnie++, can-utils, gdisk, htop,
+	input-event-daemon, libexif, libraw, libv4l, ngircd
+
+	Removed packages: festival
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 8b4f5f241071bbe71229e989b563c7817dc6da5f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 May 2011 22:03:27 +0200
Subject: [PATCH 0262/6849] mplayer: fix libmad check

Closes #3757

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                               | 9 +++++----
 package/multimedia/mplayer/mplayer.mk | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9155e00ce6..a15689bfbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,10 +34,10 @@
 	haserl, hostapd, icu, imagemagick, iproute2, iw, kismet, less,
 	libcap, libdnet, libglade, libglib2, libgtk2, libnl, libpng,
 	libxml2, libxml2, libxslt, lighttpd, lockfile-progs, makedevs,
-	midori, mpg123, mpc, mpd, mpfr, mtd-utils, ncurses, netsnmp,
-	openssh, openssl, openvpn, pango, pkg-config, popt, procps,
-	proftpd, qt, quagga, readline, rsync, samba, sdl, socat,
-	squashfs, squid, sudo, tslib, udev, usbutils, webkit,
+	midori, mpg123, mpc, mpd, mpfr, mplayer, mtd-utils, ncurses,
+	netsnmp, openssh, openssl, openvpn, pango, pkg-config, popt,
+	procps, proftpd, qt, quagga, readline, rsync, samba, sdl,
+	socat, squashfs, squid, sudo, tslib, udev, usbutils, webkit,
 	wpa_supplicant, xerces, xfont_font-misc-misc, xlib_libX11,
 	xlib_libXfont, xlib_xtrans, xorg-server, xterm, xz
 
@@ -59,6 +59,7 @@
 	#3571: u-boot: fw_printenv does not build
 	#3643: popt source url is not responding
 	#3733: dropbear: make zlib optional
+	#3757: Buildroot can't build mplayer with libmad
 
 2011.02, Released February 28th, 2011:
 
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 7d4596008a..f735464d1b 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -69,7 +69,7 @@ MPLAYER_DEPENDENCIES += tremor
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
 endif
 
-ifeq ($(BR2_PACKAGE_MAD),y)
+ifeq ($(BR2_PACKAGE_LIBMAD),y)
 MPLAYER_DEPENDENCIES += libmad
 else
 MPLAYER_CONF_OPTS += --disable-mad

From 137a4d7e92baf57e46e35280feb5c0fddfb49af1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 May 2011 21:47:48 +0200
Subject: [PATCH 0263/6849] Update for 2011.05-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index a15689bfbe..b0ac653056 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2011.05, Not released yet:
+2011.05-rc1, Released May 18th, 2011:
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 5f61b93270..d803a5c072 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.05-git
+export BR2_VERSION:=2011.05-rc1
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index de7b98000f..6d0a2ec529 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,15 +13,15 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.02.tar.bz2">buildroot-2011.02.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2011.02-rc2</b>, which can be
+
+The latest release candidate is <b>2011.05-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.02-rc2.tar.gz">buildroot-2011.02-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2011.05-rc1.tar.gz">buildroot-2011.05-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.02-rc2.tar.bz2">buildroot-2011.02-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.05-rc1.tar.bz2">buildroot-2011.05-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 45e28f5744..227034033b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>18 May 2011 -- 2011.05-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.05_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.05-rc1.tar.bz2">2011.05-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>28 February 2011 -- 2011.02 released</b>
 
     <p>The stable 2011.02 release is out - Thanks to everyone

From 8c30b67b31b5f378ae27cf1c64086aec39bffb4f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 May 2011 23:07:08 +0200
Subject: [PATCH 0264/6849] news.html: add 2011.05-rc1 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 227034033b..acec32a1d7 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.05_rc1">CHANGES</a>
-    file for details.
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2011-May/043317.html">announcement</a>.
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2011.05-rc1.tar.bz2">2011.05-rc1

From a02cfbf1f4a82ee6582e2bf7622b2bf105359ea9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 19 May 2011 19:23:29 +0200
Subject: [PATCH 0265/6849] bind: give path to OpenSSL when OpenSSL is enabled

bind needs to be specifically told where OpenSSL is, otherwise, the
build fails with:

checking for OpenSSL library... configure: error: OpenSSL was not found in any of /usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw; use --with-openssl=/path
If you don't want OpenSSL, use --without-openssl

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index e3341bdb69..2df6ae8e33 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -27,6 +27,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	BIND_DEPENDENCIES += openssl
+	BIND_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
 else
 	BIND_CONF_OPT += --with-openssl=no
 endif

From f5268b171a04e9fe286d88117d9590d7e68df754 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 22 May 2011 00:05:40 +0200
Subject: [PATCH 0266/6849] toolchain/crosstool-NG: bundle one CT-NG config
 file for each libc familly

Currently, the bundled CT-NG config file has no C library configured.
It is quite complex to add and/or munge options in this case.

Now, with one config file per libc familly, it becomes easier.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/Config.in    |  11 +-
 .../crosstool-ng.config-eglibc                | 457 ++++++++++++++++++
 .../crosstool-ng.config-glibc                 | 457 ++++++++++++++++++
 ...l-ng.config => crosstool-ng.config-uClibc} | 107 +++-
 .../toolchain-crosstool-ng/crosstool-ng.mk    |  18 +-
 5 files changed, 1019 insertions(+), 31 deletions(-)
 create mode 100644 toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
 create mode 100644 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
 rename toolchain/toolchain-crosstool-ng/{crosstool-ng.config => crosstool-ng.config-uClibc} (76%)

diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 1a1041630b..3cac8088af 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -38,12 +38,15 @@ config BR2_TOOLCHAIN_CTNG_LIBC
 
 config BR2_TOOLCHAIN_CTNG_CONFIG
 	string "crosstool-NG configuration file to use"
-	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config"
+	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc" if BR2_TOOLCHAIN_CTNG_uClibc
+	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc" if BR2_TOOLCHAIN_CTNG_eglibc
+	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc"  if BR2_TOOLCHAIN_CTNG_glibc
 	help
 	  Enter here the crosstool-NG's .config file to use.
-	  If unsure, use the default.
-	  To finetune your toolchain, you can also call:
-	  make ctng-menuconfig
+	  To fine-tune your toolchain, you can also call:
+	    make ctng-menuconfig
+
+	  If unsure, keep the default value.
 
 if BR2_TOOLCHAIN_CTNG_uClibc
 
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
new file mode 100644
index 0000000000..83af9e7ecb
--- /dev/null
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -0,0 +1,457 @@
+#
+# Automatically generated make config: don't edit
+# crosstool-NG version: 1.10.1
+# Sun Apr 24 23:38:08 2011
+#
+CT_BACKEND=y
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+# CT_OBSOLETE is not set
+# CT_EXPERIMENTAL is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR=""
+CT_SAVE_TARBALLS=y
+CT_WORK_DIR="${CT_TOP_DIR}/.build"
+CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
+CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_REMOVE_DOCS=y
+# CT_INSTALL_DIR_RO is not set
+# CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
+
+#
+# Downloading
+#
+# CT_FORBID_DOWNLOAD is not set
+# CT_FORCE_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
+CT_CONNECT_TIMEOUT=10
+# CT_ONLY_DOWNLOAD is not set
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
+# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
+CT_PATCH_ORDER="bundled"
+# CT_PATCH_SINGLE is not set
+# CT_PATCH_USE_LOCAL is not set
+
+#
+# Build behavior
+#
+
+#
+# Build options hiden
+#
+CT_PARALLEL_JOBS=1
+CT_LOAD=0
+CT_USE_PIPES=y
+CT_CONFIG_SHELL="custom"
+CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+# CT_LOG_INFO is not set
+# CT_LOG_EXTRA is not set
+CT_LOG_ALL=y
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="ALL"
+# CT_LOG_SEE_TOOLS_WARN is not set
+CT_LOG_TO_FILE=y
+CT_LOG_FILE_COMPRESS=y
+
+#
+# Target options
+#
+CT_ARCH="arm"
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORT_ARCH=y
+# CT_ARCH_SUPPORT_ABI is not set
+CT_ARCH_SUPPORT_CPU=y
+CT_ARCH_SUPPORT_TUNE=y
+CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_DEFAULT_HAS_MMU=y
+# CT_ARCH_DEFAULT_BE is not set
+CT_ARCH_DEFAULT_LE=y
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
+CT_ARCH_ARCH=""
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_FPU=""
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
+CT_ARCH_32=y
+# CT_ARCH_64 is not set
+CT_ARCH_BITNESS=32
+CT_ARCH_FLOAT_HW=y
+# CT_ARCH_FLOAT_SW is not set
+CT_TARGET_CFLAGS=""
+CT_TARGET_LDFLAGS=""
+
+#
+# General target options
+#
+# CT_ARCH_alpha is not set
+CT_ARCH_arm=y
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_m68k is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_x86 is not set
+CT_ARCH_alpha_AVAILABLE=y
+CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_USE_MMU=y
+
+#
+# arm other options
+#
+CT_ARCH_ARM_MODE="arm"
+CT_ARCH_ARM_MODE_ARM=y
+# CT_ARCH_ARM_MODE_THUMB is not set
+CT_ARCH_ARM_EABI=y
+
+#
+# Target optimisations
+#
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_FORCE_SYSROOT=y
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="unknown"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS=""
+
+#
+# Toolchain type
+#
+# CT_NATIVE is not set
+CT_CROSS=y
+# CT_CROSS_NATIVE is not set
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Operating System
+#
+# CT_BARE_METAL is not set
+# CT_MINGW32 is not set
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+CT_KERNEL="linux"
+CT_KERNEL_VERSION="2.6.37"
+# CT_KERNEL_bare_metal is not set
+CT_KERNEL_linux=y
+# CT_KERNEL_mingw32 is not set
+CT_KERNEL_bare_metal_AVAILABLE=y
+CT_KERNEL_linux_AVAILABLE=y
+CT_KERNEL_LINUX_INSTALL=y
+CT_KERNEL_V_2_6_37=y
+# CT_KERNEL_V_2_6_36_3 is not set
+# CT_KERNEL_V_2_6_36_2 is not set
+# CT_KERNEL_V_2_6_36_1 is not set
+# CT_KERNEL_V_2_6_36 is not set
+# CT_KERNEL_V_2_6_35_10 is not set
+# CT_KERNEL_V_2_6_34_8 is not set
+# CT_KERNEL_V_2_6_33_7 is not set
+# CT_KERNEL_V_2_6_32_28 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_57 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_KERNEL_LINUX_INSTALL_CHECK=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_mingw32_AVAILABLE=y
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+# CT_ARCH_BINFMT_FLAT is not set
+# CT_ARCH_BINFMT_FDPIC is not set
+
+#
+# GNU binutils
+#
+# CT_BINUTILS_V_2_21 is not set
+# CT_BINUTILS_V_2_20_1 is not set
+CT_BINUTILS_V_2_20=y
+# CT_BINUTILS_V_2_19_1 is not set
+# CT_BINUTILS_V_2_19 is not set
+# CT_BINUTILS_V_2_18 is not set
+# CT_BINUTILS_V_2_17 is not set
+# CT_BINUTILS_V_2_16_1 is not set
+CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_EXTRA_CONFIG=""
+
+#
+# C compiler
+#
+CT_CC="gcc"
+CT_CC_VERSION="4.4.3"
+CT_CC_gcc=y
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+# CT_CC_V_4_4_5 is not set
+# CT_CC_V_4_4_4 is not set
+CT_CC_V_4_4_3=y
+# CT_CC_V_4_4_2 is not set
+# CT_CC_V_4_4_1 is not set
+# CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_5 is not set
+# CT_CC_V_4_3_4 is not set
+# CT_CC_V_4_3_3 is not set
+# CT_CC_V_4_3_2 is not set
+# CT_CC_V_4_3_1 is not set
+# CT_CC_V_4_2_4 is not set
+# CT_CC_V_4_2_3 is not set
+# CT_CC_V_4_2_2 is not set
+# CT_CC_V_4_2_1 is not set
+# CT_CC_V_4_2_0 is not set
+# CT_CC_V_4_1_2 is not set
+# CT_CC_V_4_0_4 is not set
+# CT_CC_V_3_4_6 is not set
+CT_CC_GCC_4_2_or_later=y
+CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4_or_later=y
+# CT_CC_GCC_4_5_or_later is not set
+CT_CC_GCC_HAS_GRAPHITE=y
+# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_USE_GMP_MPFR=y
+CT_CC_GCC_USE_PPL_CLOOG=y
+# CT_CC_GCC_USE_MPC is not set
+# CT_CC_GCC_USE_LIBELF is not set
+CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
+CT_CC_BUGURL=""
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG=""
+CT_CC_EXTRA_CONFIG=""
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_JAVA=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+
+#
+# Additional supported languages:
+#
+# CT_CC_LANG_CXX is not set
+# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JAVA is not set
+
+#
+# gcc other options
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
+CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_STATIC_LIBSTDCXX=y
+# CT_CC_GCC_LIBMUDFLAP is not set
+# CT_CC_GCC_LIBGOMP is not set
+# CT_CC_GCC_LIBSSP is not set
+
+#
+# Misc. obscure options.
+#
+CT_CC_CXA_ATEXIT=y
+# CT_CC_GCC_DISABLE_PCH is not set
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+
+#
+# C-library
+#
+CT_LIBC="eglibc"
+CT_LIBC_VERSION="2_10"
+CT_LIBC_eglibc=y
+# CT_LIBC_glibc is not set
+# CT_LIBC_mingw is not set
+# CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
+# CT_LIBC_uClibc is not set
+CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_EGLIBC_V_2_12 is not set
+# CT_LIBC_EGLIBC_V_2_11 is not set
+CT_LIBC_EGLIBC_V_2_10=y
+# CT_LIBC_EGLIBC_V_2_9 is not set
+# CT_LIBC_EGLIBC_V_2_8 is not set
+# CT_LIBC_EGLIBC_V_2_7 is not set
+# CT_LIBC_EGLIBC_V_2_6 is not set
+# CT_LIBC_EGLIBC_V_2_5 is not set
+# CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_EGLIBC_REVISION="HEAD"
+# CT_EGLIBC_CHECKOUT is not set
+# CT_EGLIBC_OPT_SIZE is not set
+# CT_EGLIBC_CUSTOM_CONFIG is not set
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
+
+#
+# glibc/eglibc common options
+#
+CT_LIBC_GLIBC_EXTRA_CONFIG=""
+CT_LIBC_GLIBC_CONFIGPARMS=""
+CT_LIBC_GLIBC_EXTRA_CFLAGS=""
+CT_LIBC_EXTRA_CC_ARGS=""
+# CT_LIBC_DISABLE_VERSIONING is not set
+CT_LIBC_OLDEST_ABI=""
+# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+CT_LIBC_GLIBC_USE_PORTS=y
+CT_LIBC_ADDONS_LIST=""
+
+#
+# WARNING !!!                                            
+#
+
+#
+#   For glibc >= 2.8, it can happen that the tarballs    
+#
+
+#
+#   for the addons are not available for download.       
+#
+
+#
+#   If that happens, bad luck... Try a previous version  
+#
+
+#
+#   or try again later... :-(                            
+#
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.37"
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+# CT_LIBC_SUPPORT_WIN32THREADS is not set
+# CT_LIBC_SUPPORT_THREADS_NONE is not set
+CT_THREADS="nptl"
+
+#
+# Common C library options
+#
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
+# CT_THREADS_WIN32THREADS is not set
+# CT_THREADS_NONE is not set
+CT_LIBC_XLDD=y
+
+#
+# Debug facilities
+#
+# CT_DEBUG_gdb is not set
+
+#
+# Companion libraries
+#
+CT_COMPLIBS_NEEDED=y
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_PPL_NEEDED=y
+CT_CLOOG_NEEDED=y
+# CT_MPC_NEEDED is not set
+# CT_LIBELF_NEEDED is not set
+CT_COMPLIBS=y
+# CT_WRAPPER_NEEDED is not set
+CT_GMP=y
+CT_MPFR=y
+CT_PPL=y
+CT_CLOOG=y
+# CT_GMP_V_5_0_1 is not set
+CT_GMP_V_4_3_2=y
+# CT_GMP_V_4_3_1 is not set
+# CT_GMP_V_4_3_0 is not set
+# CT_GMP_V_4_2_4 is not set
+# CT_GMP_V_4_2_2 is not set
+CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_0_0 is not set
+CT_MPFR_V_2_4_2=y
+# CT_MPFR_V_2_4_1 is not set
+# CT_MPFR_V_2_4_0 is not set
+# CT_MPFR_V_2_3_2 is not set
+# CT_MPFR_V_2_3_1 is not set
+CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11 is not set
+CT_PPL_V_0_10_2=y
+CT_PPL_VERSION="0.10.2"
+# CT_CLOOG_V_0_15_10 is not set
+CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_8 is not set
+# CT_CLOOG_V_0_15_7 is not set
+# CT_CLOOG_V_0_15_6 is not set
+CT_CLOOG_VERSION="0.15.9"
+
+#
+# Companion libraries common options
+#
+CT_COMPLIBS_BACKUP=y
+# CT_COMPLIBS_CHECK is not set
+# CT_COMPLIBS_SHARED is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
new file mode 100644
index 0000000000..737429dc26
--- /dev/null
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -0,0 +1,457 @@
+#
+# Automatically generated make config: don't edit
+# crosstool-NG version: 1.10.1
+# Sun Apr 24 23:37:30 2011
+#
+CT_BACKEND=y
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+# CT_OBSOLETE is not set
+# CT_EXPERIMENTAL is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR=""
+CT_SAVE_TARBALLS=y
+CT_WORK_DIR="${CT_TOP_DIR}/.build"
+CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
+CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_REMOVE_DOCS=y
+# CT_INSTALL_DIR_RO is not set
+# CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
+
+#
+# Downloading
+#
+# CT_FORBID_DOWNLOAD is not set
+# CT_FORCE_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
+CT_CONNECT_TIMEOUT=10
+# CT_ONLY_DOWNLOAD is not set
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
+# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
+CT_PATCH_ORDER="bundled"
+# CT_PATCH_SINGLE is not set
+# CT_PATCH_USE_LOCAL is not set
+
+#
+# Build behavior
+#
+
+#
+# Build options hiden
+#
+CT_PARALLEL_JOBS=1
+CT_LOAD=0
+CT_USE_PIPES=y
+CT_CONFIG_SHELL="custom"
+CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+# CT_LOG_INFO is not set
+# CT_LOG_EXTRA is not set
+CT_LOG_ALL=y
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="ALL"
+# CT_LOG_SEE_TOOLS_WARN is not set
+CT_LOG_TO_FILE=y
+CT_LOG_FILE_COMPRESS=y
+
+#
+# Target options
+#
+CT_ARCH="arm"
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORT_ARCH=y
+# CT_ARCH_SUPPORT_ABI is not set
+CT_ARCH_SUPPORT_CPU=y
+CT_ARCH_SUPPORT_TUNE=y
+CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_DEFAULT_HAS_MMU=y
+# CT_ARCH_DEFAULT_BE is not set
+CT_ARCH_DEFAULT_LE=y
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
+CT_ARCH_ARCH=""
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_FPU=""
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
+CT_ARCH_32=y
+# CT_ARCH_64 is not set
+CT_ARCH_BITNESS=32
+CT_ARCH_FLOAT_HW=y
+# CT_ARCH_FLOAT_SW is not set
+CT_TARGET_CFLAGS=""
+CT_TARGET_LDFLAGS=""
+
+#
+# General target options
+#
+# CT_ARCH_alpha is not set
+CT_ARCH_arm=y
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_m68k is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_x86 is not set
+CT_ARCH_alpha_AVAILABLE=y
+CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_USE_MMU=y
+
+#
+# arm other options
+#
+CT_ARCH_ARM_MODE="arm"
+CT_ARCH_ARM_MODE_ARM=y
+# CT_ARCH_ARM_MODE_THUMB is not set
+CT_ARCH_ARM_EABI=y
+
+#
+# Target optimisations
+#
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_FORCE_SYSROOT=y
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="unknown"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS=""
+
+#
+# Toolchain type
+#
+# CT_NATIVE is not set
+CT_CROSS=y
+# CT_CROSS_NATIVE is not set
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Operating System
+#
+# CT_BARE_METAL is not set
+# CT_MINGW32 is not set
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+CT_KERNEL="linux"
+CT_KERNEL_VERSION="2.6.37"
+# CT_KERNEL_bare_metal is not set
+CT_KERNEL_linux=y
+# CT_KERNEL_mingw32 is not set
+CT_KERNEL_bare_metal_AVAILABLE=y
+CT_KERNEL_linux_AVAILABLE=y
+CT_KERNEL_LINUX_INSTALL=y
+CT_KERNEL_V_2_6_37=y
+# CT_KERNEL_V_2_6_36_3 is not set
+# CT_KERNEL_V_2_6_36_2 is not set
+# CT_KERNEL_V_2_6_36_1 is not set
+# CT_KERNEL_V_2_6_36 is not set
+# CT_KERNEL_V_2_6_35_10 is not set
+# CT_KERNEL_V_2_6_34_8 is not set
+# CT_KERNEL_V_2_6_33_7 is not set
+# CT_KERNEL_V_2_6_32_28 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_57 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_KERNEL_LINUX_INSTALL_CHECK=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_mingw32_AVAILABLE=y
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+# CT_ARCH_BINFMT_FLAT is not set
+# CT_ARCH_BINFMT_FDPIC is not set
+
+#
+# GNU binutils
+#
+# CT_BINUTILS_V_2_21 is not set
+# CT_BINUTILS_V_2_20_1 is not set
+CT_BINUTILS_V_2_20=y
+# CT_BINUTILS_V_2_19_1 is not set
+# CT_BINUTILS_V_2_19 is not set
+# CT_BINUTILS_V_2_18 is not set
+# CT_BINUTILS_V_2_17 is not set
+# CT_BINUTILS_V_2_16_1 is not set
+CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_EXTRA_CONFIG=""
+
+#
+# C compiler
+#
+CT_CC="gcc"
+CT_CC_VERSION="4.4.3"
+CT_CC_gcc=y
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+# CT_CC_V_4_4_5 is not set
+# CT_CC_V_4_4_4 is not set
+CT_CC_V_4_4_3=y
+# CT_CC_V_4_4_2 is not set
+# CT_CC_V_4_4_1 is not set
+# CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_5 is not set
+# CT_CC_V_4_3_4 is not set
+# CT_CC_V_4_3_3 is not set
+# CT_CC_V_4_3_2 is not set
+# CT_CC_V_4_3_1 is not set
+# CT_CC_V_4_2_4 is not set
+# CT_CC_V_4_2_3 is not set
+# CT_CC_V_4_2_2 is not set
+# CT_CC_V_4_2_1 is not set
+# CT_CC_V_4_2_0 is not set
+# CT_CC_V_4_1_2 is not set
+# CT_CC_V_4_0_4 is not set
+# CT_CC_V_3_4_6 is not set
+CT_CC_GCC_4_2_or_later=y
+CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4_or_later=y
+# CT_CC_GCC_4_5_or_later is not set
+CT_CC_GCC_HAS_GRAPHITE=y
+# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_USE_GMP_MPFR=y
+CT_CC_GCC_USE_PPL_CLOOG=y
+# CT_CC_GCC_USE_MPC is not set
+# CT_CC_GCC_USE_LIBELF is not set
+CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
+CT_CC_BUGURL=""
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG=""
+CT_CC_EXTRA_CONFIG=""
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_JAVA=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+
+#
+# Additional supported languages:
+#
+# CT_CC_LANG_CXX is not set
+# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JAVA is not set
+
+#
+# gcc other options
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
+CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_STATIC_LIBSTDCXX=y
+# CT_CC_GCC_LIBMUDFLAP is not set
+# CT_CC_GCC_LIBGOMP is not set
+# CT_CC_GCC_LIBSSP is not set
+
+#
+# Misc. obscure options.
+#
+CT_CC_CXA_ATEXIT=y
+# CT_CC_GCC_DISABLE_PCH is not set
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+
+#
+# C-library
+#
+CT_LIBC="glibc"
+CT_LIBC_VERSION="2.9"
+# CT_LIBC_eglibc is not set
+CT_LIBC_glibc=y
+# CT_LIBC_mingw is not set
+# CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
+# CT_LIBC_uClibc is not set
+CT_LIBC_eglibc_AVAILABLE=y
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_GLIBC_TARBALL=y
+# CT_LIBC_GLIBC_V_2_12_2 is not set
+# CT_LIBC_GLIBC_V_2_12_1 is not set
+# CT_LIBC_GLIBC_V_2_11_1 is not set
+# CT_LIBC_GLIBC_V_2_11 is not set
+# CT_LIBC_GLIBC_V_2_10_1 is not set
+CT_LIBC_GLIBC_V_2_9=y
+# CT_LIBC_GLIBC_V_2_8 is not set
+# CT_LIBC_GLIBC_V_2_7 is not set
+# CT_LIBC_GLIBC_V_2_6_1 is not set
+# CT_LIBC_GLIBC_V_2_6 is not set
+# CT_LIBC_GLIBC_V_2_5_1 is not set
+# CT_LIBC_GLIBC_V_2_5 is not set
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
+
+#
+# glibc/eglibc common options
+#
+CT_LIBC_GLIBC_EXTRA_CONFIG=""
+CT_LIBC_GLIBC_CONFIGPARMS=""
+CT_LIBC_GLIBC_EXTRA_CFLAGS=""
+CT_LIBC_EXTRA_CC_ARGS=""
+# CT_LIBC_DISABLE_VERSIONING is not set
+CT_LIBC_OLDEST_ABI=""
+# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+CT_LIBC_GLIBC_USE_PORTS=y
+CT_LIBC_ADDONS_LIST=""
+
+#
+# WARNING !!!                                            
+#
+
+#
+#   For glibc >= 2.8, it can happen that the tarballs    
+#
+
+#
+#   for the addons are not available for download.       
+#
+
+#
+#   If that happens, bad luck... Try a previous version  
+#
+
+#
+#   or try again later... :-(                            
+#
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.37"
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+# CT_LIBC_SUPPORT_LINUXTHREADS is not set
+# CT_LIBC_SUPPORT_WIN32THREADS is not set
+# CT_LIBC_SUPPORT_THREADS_NONE is not set
+CT_THREADS="nptl"
+
+#
+# Common C library options
+#
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
+# CT_THREADS_WIN32THREADS is not set
+# CT_THREADS_NONE is not set
+CT_LIBC_XLDD=y
+
+#
+# Debug facilities
+#
+# CT_DEBUG_gdb is not set
+
+#
+# Companion libraries
+#
+CT_COMPLIBS_NEEDED=y
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_PPL_NEEDED=y
+CT_CLOOG_NEEDED=y
+# CT_MPC_NEEDED is not set
+# CT_LIBELF_NEEDED is not set
+CT_COMPLIBS=y
+# CT_WRAPPER_NEEDED is not set
+CT_GMP=y
+CT_MPFR=y
+CT_PPL=y
+CT_CLOOG=y
+# CT_GMP_V_5_0_1 is not set
+CT_GMP_V_4_3_2=y
+# CT_GMP_V_4_3_1 is not set
+# CT_GMP_V_4_3_0 is not set
+# CT_GMP_V_4_2_4 is not set
+# CT_GMP_V_4_2_2 is not set
+CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_0_0 is not set
+CT_MPFR_V_2_4_2=y
+# CT_MPFR_V_2_4_1 is not set
+# CT_MPFR_V_2_4_0 is not set
+# CT_MPFR_V_2_3_2 is not set
+# CT_MPFR_V_2_3_1 is not set
+CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11 is not set
+CT_PPL_V_0_10_2=y
+CT_PPL_VERSION="0.10.2"
+# CT_CLOOG_V_0_15_10 is not set
+CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_8 is not set
+# CT_CLOOG_V_0_15_7 is not set
+# CT_CLOOG_V_0_15_6 is not set
+CT_CLOOG_VERSION="0.15.9"
+
+#
+# Companion libraries common options
+#
+CT_COMPLIBS_BACKUP=y
+# CT_COMPLIBS_CHECK is not set
+# CT_COMPLIBS_SHARED is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
similarity index 76%
rename from toolchain/toolchain-crosstool-ng/crosstool-ng.config
rename to toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 5f6aefed12..f25172687c 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.10.0
-# Mon Feb  7 14:03:32 2011
+# crosstool-NG version: 1.10.1
+# Sun Apr 24 23:37:50 2011
 #
 CT_BACKEND=y
 CT_MODULES=y
@@ -84,9 +84,9 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="blackfin"
-# CT_ARCH_SUPPORTS_BOTH_MMU is not set
-# CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH="arm"
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
 # CT_ARCH_SUPPORTS_64 is not set
 CT_ARCH_SUPPORT_ARCH=y
@@ -94,7 +94,7 @@ CT_ARCH_SUPPORT_ARCH=y
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
 CT_ARCH_SUPPORT_FPU=y
-# CT_ARCH_DEFAULT_HAS_MMU is not set
+CT_ARCH_DEFAULT_HAS_MMU=y
 # CT_ARCH_DEFAULT_BE is not set
 CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
@@ -103,6 +103,8 @@ CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
 CT_ARCH_FPU=""
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
 CT_ARCH_32=y
 # CT_ARCH_64 is not set
 CT_ARCH_BITNESS=32
@@ -115,9 +117,9 @@ CT_TARGET_LDFLAGS=""
 # General target options
 #
 # CT_ARCH_alpha is not set
-# CT_ARCH_arm is not set
+CT_ARCH_arm=y
 # CT_ARCH_avr32 is not set
-CT_ARCH_blackfin=y
+# CT_ARCH_blackfin is not set
 # CT_ARCH_m68k is not set
 # CT_ARCH_mips is not set
 # CT_ARCH_powerpc is not set
@@ -134,7 +136,15 @@ CT_ARCH_powerpc_AVAILABLE=y
 CT_ARCH_s390_AVAILABLE=y
 CT_ARCH_sh_AVAILABLE=y
 CT_ARCH_x86_AVAILABLE=y
-# CT_ARCH_USE_MMU is not set
+CT_ARCH_USE_MMU=y
+
+#
+# arm other options
+#
+CT_ARCH_ARM_MODE="arm"
+CT_ARCH_ARM_MODE_ARM=y
+# CT_ARCH_ARM_MODE_THUMB is not set
+CT_ARCH_ARM_EABI=y
 
 #
 # Target optimisations
@@ -178,17 +188,18 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-CT_BARE_METAL=y
+# CT_BARE_METAL is not set
 # CT_MINGW32 is not set
-# CT_KERNEL_SUPPORTS_SHARED_LIBS is not set
-CT_KERNEL="bare-metal"
-CT_KERNEL_bare_metal=y
-# CT_KERNEL_linux is not set
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+CT_KERNEL="linux"
+CT_KERNEL_VERSION="2.6.37"
+# CT_KERNEL_bare_metal is not set
+CT_KERNEL_linux=y
 # CT_KERNEL_mingw32 is not set
 CT_KERNEL_bare_metal_AVAILABLE=y
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_LINUX_INSTALL is not set
-# CT_KERNEL_V_2_6_37 is not set
+CT_KERNEL_LINUX_INSTALL=y
+CT_KERNEL_V_2_6_37=y
 # CT_KERNEL_V_2_6_36_3 is not set
 # CT_KERNEL_V_2_6_36_2 is not set
 # CT_KERNEL_V_2_6_36_1 is not set
@@ -200,15 +211,18 @@ CT_KERNEL_linux_AVAILABLE=y
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_57 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
-# CT_KERNEL_LINUX_VERBOSITY_0 is not set
+CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_KERNEL_LINUX_INSTALL_CHECK=y
 # CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
 CT_KERNEL_mingw32_AVAILABLE=y
 
 #
 # Common kernel options
 #
+CT_SHARED_LIBS=y
 
 #
 # Binary utilities
@@ -229,6 +243,7 @@ CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_17 is not set
 # CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
 CT_BINUTILS_EXTRA_CONFIG=""
 
 #
@@ -273,6 +288,7 @@ CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
 CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
 CT_CC_CORE_EXTRA_CONFIG=""
+CT_CC_EXTRA_CONFIG=""
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -284,6 +300,8 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
+# CT_CC_LANG_FORTRAN is not set
+# CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
@@ -298,31 +316,72 @@ CT_CC_STATIC_LIBSTDCXX=y
 #
 # Misc. obscure options.
 #
+CT_CC_CXA_ATEXIT=y
 # CT_CC_GCC_DISABLE_PCH is not set
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
 CT_CC_GCC_LDBL_128=m
 
 #
 # C-library
 #
-CT_LIBC="none"
+CT_LIBC="uClibc"
+CT_LIBC_VERSION="0.9.30.3"
 # CT_LIBC_eglibc is not set
 # CT_LIBC_glibc is not set
 # CT_LIBC_mingw is not set
 # CT_LIBC_newlib is not set
-CT_LIBC_none=y
-# CT_LIBC_uClibc is not set
+# CT_LIBC_none is not set
+CT_LIBC_uClibc=y
 CT_LIBC_eglibc_AVAILABLE=y
 CT_LIBC_glibc_AVAILABLE=y
 CT_LIBC_mingw_AVAILABLE=y
 CT_LIBC_newlib_AVAILABLE=y
 CT_LIBC_none_AVAILABLE=y
 CT_LIBC_uClibc_AVAILABLE=y
-# CT_LIBC_SUPPORT_THREADS_ANY is not set
+# CT_LIBC_UCLIBC_V_0_9_31 is not set
+CT_LIBC_UCLIBC_V_0_9_30_3=y
+# CT_LIBC_UCLIBC_V_0_9_30_2 is not set
+# CT_LIBC_UCLIBC_V_0_9_30_1 is not set
+# CT_LIBC_UCLIBC_V_0_9_30 is not set
+# CT_LIBC_UCLIBC_V_0_9_29 is not set
+# CT_LIBC_UCLIBC_V_0_9_28_3 is not set
+# CT_LIBC_UCLIBC_V_snapshot is not set
+# CT_LIBC_UCLIBC_V_specific_date is not set
+CT_LIBC_UCLIBC_0_9_30_or_later=y
+CT_LIBC_UCLIBC_PARALLEL=y
+CT_LIBC_UCLIBC_VERBOSITY_0=y
+# CT_LIBC_UCLIBC_VERBOSITY_1 is not set
+# CT_LIBC_UCLIBC_VERBOSITY_2 is not set
+CT_LIBC_UCLIBC_VERBOSITY=""
+CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
+# CT_LIBC_UCLIBC_DEBUG_LEVEL_1 is not set
+# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
+CT_LIBC_UCLIBC_DEBUG_LEVEL=0
+CT_LIBC_UCLIBC_CONFIG_FILE=""
+CT_LIBC_SUPPORT_THREADS_ANY=y
 # CT_LIBC_SUPPORT_NPTL is not set
-# CT_LIBC_SUPPORT_LINUXTHREADS is not set
+CT_LIBC_SUPPORT_LINUXTHREADS=y
 # CT_LIBC_SUPPORT_WIN32THREADS is not set
-# CT_LIBC_SUPPORT_THREADS_NONE is not set
-CT_THREADS="none"
+CT_LIBC_SUPPORT_THREADS_NONE=y
+CT_THREADS="linuxthreads"
+
+#
+# Common C library options
+#
+# CT_THREADS_NPTL is not set
+CT_THREADS_LINUXTHREADS=y
+# CT_THREADS_WIN32THREADS is not set
+# CT_THREADS_NONE is not set
+CT_LIBC_XLDD=y
+
+#
+# uClibc other options
+#
+CT_LIBC_UCLIBC_LNXTHRD_OLD=y
+# CT_LIBC_UCLIBC_LNXTHRD_NEW is not set
+CT_LIBC_UCLIBC_LNXTHRD="old"
+# CT_LIBC_UCLIBC_LOCALES is not set
+# CT_LIBC_UCLIBC_WCHAR is not set
 
 #
 # Debug facilities
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 015cd13e63..ed7f7c60aa 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -20,9 +20,10 @@ CTNG_SOURCE:=crosstool-ng-$(CTNG_VERSION).tar.bz2
 CTNG_DIR:=$(BUILD_DIR)/crosstool-ng-$(CTNG_VERSION)
 CTNG_CAT:=bzcat
 CTNG_PATCH_DIR:=toolchain/toolchain-crosstool-ng
-CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/toolchain-crosstool-ng/uClibc.config
 
+CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
+
 # Hack! ct-ng is in fact a Makefile script. As such, it accepts all
 # make options, such as -C, which makes it uneeded to chdir prior
 # to calling ct-ng.
@@ -349,13 +350,24 @@ endef
 # Default configuration
 # Depends on top-level .config because it has options we have to shoe-horn
 # into crosstool-NG's .config
-# Only copy the original .config file if we don't have one already
+# Only copy the original .config file if we don't have one already.
+# Check that given config file matches selected C library.
 # We need to call oldconfig twice in a row to ensure the options
 # are correctly set ( eg. if an option is new, then the initial sed
 # can't do anything about it ) Ideally, this should go in oldconfig
 # itself, but it's much easier to handle here.
 $(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(CTNG_DIR)/ct-ng $(CONFIG_DIR)/.config
-	$(Q)[ -f $@ ] && cp -a $@ $@.timestamp || cp -f $< $@
+	$(Q)if [ ! -f $@ ]; then                                                        \
+	        libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }' "$<")";            \
+	        if [ "$${libc}" != "$(BR2_TOOLCHAIN_CTNG_LIBC)" ]; then                 \
+	            echo "* Inconsistency in crosstool-NG config file '$<'";            \
+	            echo "* - buildroot configured for '$(BR2_TOOLCHAIN_CTNG_LIBC)'";   \
+	            echo "* - given config file for '$${libc}'";                        \
+	            exit 1;                                                             \
+	        fi;                                                                     \
+	        cp -f $< $@;                                                            \
+	    fi
+	$(Q)cp -a $@ $@.timestamp
 	$(call ctng-oldconfig,$@)
 	$(call ctng-oldconfig,$@)
 	$(call ctng-check-config-changed,$@,$@.timestamp)

From 4943afcc912bcdd0f5ba869fa5fc57ffae8e96f1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 22 May 2011 00:05:41 +0200
Subject: [PATCH 0267/6849] toolchain/crosstool-NG: update to 1.11.3

1.11.3 is the latest stable version, and it has a few improvements
we'll find usefull. For example, it hasa a boolean option for
disabling the {,e}glibc fortified build (instead of requiring us
to shoehorn it in extra cflags.

Update the config files.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../002-no-sysroot-prompt-in-backend.patch    |  12 --
 .../crosstool-ng.config-eglibc                | 127 +++++++++++-------
 .../crosstool-ng.config-glibc                 | 126 ++++++++++-------
 .../crosstool-ng.config-uClibc                | 122 +++++++++++------
 .../toolchain-crosstool-ng/crosstool-ng.mk    |   2 +-
 5 files changed, 242 insertions(+), 147 deletions(-)
 delete mode 100644 toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch

diff --git a/toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch b/toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch
deleted file mode 100644
index 4c3426aa5a..0000000000
--- a/toolchain/toolchain-crosstool-ng/002-no-sysroot-prompt-in-backend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/config/toolchain.in b/config/toolchain.in
---- a/config/toolchain.in
-+++ b/config/toolchain.in
-@@ -20,7 +20,7 @@
- 
- config SYSROOT_NAME
-     string
--    prompt "sysroot directory name"
-+    prompt "sysroot directory name" if ! BACKEND
-     depends on USE_SYSROOT
-     default "sysroot"
-     help
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 83af9e7ecb..5902d40043 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.10.1
-# Sun Apr 24 23:38:08 2011
+# crosstool-NG version: 1.11.3
+# Sat May 21 22:35:30 2011
 #
 CT_BACKEND=y
 CT_MODULES=y
@@ -112,10 +112,6 @@ CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-
-#
-# General target options
-#
 # CT_ARCH_alpha is not set
 CT_ARCH_arm=y
 # CT_ARCH_avr32 is not set
@@ -125,6 +121,7 @@ CT_ARCH_arm=y
 # CT_ARCH_powerpc is not set
 # CT_ARCH_s390 is not set
 # CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
 # CT_ARCH_x86 is not set
 CT_ARCH_alpha_AVAILABLE=y
 CT_ARCH_arm_AVAILABLE=y
@@ -135,9 +132,18 @@ CT_ARCH_mips_AVAILABLE=y
 CT_ARCH_powerpc_AVAILABLE=y
 CT_ARCH_s390_AVAILABLE=y
 CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
 CT_ARCH_x86_AVAILABLE=y
+
+#
+# Generic target options
+#
 CT_ARCH_USE_MMU=y
 
+#
+# Target optimisations
+#
+
 #
 # arm other options
 #
@@ -146,10 +152,6 @@ CT_ARCH_ARM_MODE_ARM=y
 # CT_ARCH_ARM_MODE_THUMB is not set
 CT_ARCH_ARM_EABI=y
 
-#
-# Target optimisations
-#
-
 #
 # Toolchain options
 #
@@ -192,37 +194,43 @@ CT_BUILD_SUFFIX=""
 # CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.37"
+CT_KERNEL_VERSION="2.6.38.4"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 # CT_KERNEL_mingw32 is not set
-CT_KERNEL_bare_metal_AVAILABLE=y
+# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
+# CT_KERNEL_mingw32_AVAILABLE is not set
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# linux other options
+#
 CT_KERNEL_LINUX_INSTALL=y
-CT_KERNEL_V_2_6_37=y
-# CT_KERNEL_V_2_6_36_3 is not set
-# CT_KERNEL_V_2_6_36_2 is not set
-# CT_KERNEL_V_2_6_36_1 is not set
-# CT_KERNEL_V_2_6_36 is not set
-# CT_KERNEL_V_2_6_35_10 is not set
-# CT_KERNEL_V_2_6_34_8 is not set
-# CT_KERNEL_V_2_6_33_7 is not set
-# CT_KERNEL_V_2_6_32_28 is not set
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_V_2_6_38_4=y
+# CT_KERNEL_V_2_6_38_3 is not set
+# CT_KERNEL_V_2_6_38_2 is not set
+# CT_KERNEL_V_2_6_38_1 is not set
+# CT_KERNEL_V_2_6_38 is not set
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_9 is not set
+# CT_KERNEL_V_2_6_33_12 is not set
+# CT_KERNEL_V_2_6_32_39 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_57 is not set
+# CT_KERNEL_V_2_6_27_58 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
 CT_KERNEL_LINUX_VERBOSE_LEVEL=0
 CT_KERNEL_LINUX_INSTALL_CHECK=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
 
 #
 # Binary utilities
@@ -244,6 +252,13 @@ CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_FORCE_LD_BFD=y
+CT_BINUTILS_LINKER_LD=y
+# CT_BINUTILS_LINKER_GOLD is not set
+# CT_BINUTILS_LINKER_LD_GOLD is not set
+# CT_BINUTILS_LINKER_GOLD_LD is not set
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
 CT_BINUTILS_EXTRA_CONFIG=""
 
 #
@@ -252,9 +267,14 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
+# CT_CC_V_linaro_4_6_2011_04_0 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_linaro_4_5_2011_04_0 is not set
 # CT_CC_V_4_5_2 is not set
 # CT_CC_V_4_5_1 is not set
 # CT_CC_V_4_5_0 is not set
+# CT_CC_V_linaro_4_4_2011_02_0 is not set
+# CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
 CT_CC_V_4_4_3=y
@@ -274,21 +294,22 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_1_2 is not set
 # CT_CC_V_4_0_4 is not set
 # CT_CC_V_3_4_6 is not set
+# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
+# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
+# CT_CC_GCC_4_5 is not set
 # CT_CC_GCC_4_5_or_later is not set
+# CT_CC_GCC_4_6 is not set
+# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
 # CT_CC_GCC_HAS_LTO is not set
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
 # CT_CC_GCC_USE_MPC is not set
 # CT_CC_GCC_USE_LIBELF is not set
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -306,9 +327,22 @@ CT_CC_SUPPORT_OBJCXX=y
 #
 # gcc other options
 #
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
+CT_CC_BUGURL=""
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG=""
+CT_CC_EXTRA_CONFIG=""
 CT_CC_STATIC_LIBSTDCXX=y
+
+#
+# Optimisation features
+#
+CT_CC_GCC_USE_GRAPHITE=y
+
+#
+# Settings for libraries running on target
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 # CT_CC_GCC_LIBMUDFLAP is not set
 # CT_CC_GCC_LIBGOMP is not set
 # CT_CC_GCC_LIBSSP is not set
@@ -333,6 +367,7 @@ CT_LIBC_eglibc=y
 # CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
 CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_EGLIBC_V_2_13 is not set
 # CT_LIBC_EGLIBC_V_2_12 is not set
 # CT_LIBC_EGLIBC_V_2_11 is not set
 CT_LIBC_EGLIBC_V_2_10=y
@@ -346,11 +381,12 @@ CT_EGLIBC_REVISION="HEAD"
 # CT_EGLIBC_CHECKOUT is not set
 # CT_EGLIBC_OPT_SIZE is not set
 # CT_EGLIBC_CUSTOM_CONFIG is not set
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
+# CT_LIBC_glibc_AVAILABLE is not set
+# CT_LIBC_mingw_AVAILABLE is not set
+# CT_LIBC_newlib_AVAILABLE is not set
+# CT_LIBC_none_AVAILABLE is not set
+# CT_LIBC_uClibc_AVAILABLE is not set
+CT_LIBC_glibc_familly=y
 
 #
 # glibc/eglibc common options
@@ -387,7 +423,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.37"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.4"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_NPTL=y
 CT_LIBC_SUPPORT_LINUXTHREADS=y
@@ -420,7 +456,6 @@ CT_CLOOG_NEEDED=y
 # CT_MPC_NEEDED is not set
 # CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
-# CT_WRAPPER_NEEDED is not set
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
@@ -439,9 +474,13 @@ CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_3_2 is not set
 # CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
 # CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
+# CT_PPL_0_11 is not set
+# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
@@ -452,6 +491,4 @@ CT_CLOOG_VERSION="0.15.9"
 #
 # Companion libraries common options
 #
-CT_COMPLIBS_BACKUP=y
 # CT_COMPLIBS_CHECK is not set
-# CT_COMPLIBS_SHARED is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 737429dc26..f7c0de738c 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.10.1
-# Sun Apr 24 23:37:30 2011
+# crosstool-NG version: 1.11.3
+# Sat May 21 22:36:05 2011
 #
 CT_BACKEND=y
 CT_MODULES=y
@@ -112,10 +112,6 @@ CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-
-#
-# General target options
-#
 # CT_ARCH_alpha is not set
 CT_ARCH_arm=y
 # CT_ARCH_avr32 is not set
@@ -125,6 +121,7 @@ CT_ARCH_arm=y
 # CT_ARCH_powerpc is not set
 # CT_ARCH_s390 is not set
 # CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
 # CT_ARCH_x86 is not set
 CT_ARCH_alpha_AVAILABLE=y
 CT_ARCH_arm_AVAILABLE=y
@@ -135,9 +132,18 @@ CT_ARCH_mips_AVAILABLE=y
 CT_ARCH_powerpc_AVAILABLE=y
 CT_ARCH_s390_AVAILABLE=y
 CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
 CT_ARCH_x86_AVAILABLE=y
+
+#
+# Generic target options
+#
 CT_ARCH_USE_MMU=y
 
+#
+# Target optimisations
+#
+
 #
 # arm other options
 #
@@ -146,10 +152,6 @@ CT_ARCH_ARM_MODE_ARM=y
 # CT_ARCH_ARM_MODE_THUMB is not set
 CT_ARCH_ARM_EABI=y
 
-#
-# Target optimisations
-#
-
 #
 # Toolchain options
 #
@@ -192,37 +194,43 @@ CT_BUILD_SUFFIX=""
 # CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.37"
+CT_KERNEL_VERSION="2.6.38.4"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 # CT_KERNEL_mingw32 is not set
-CT_KERNEL_bare_metal_AVAILABLE=y
+# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
+# CT_KERNEL_mingw32_AVAILABLE is not set
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# linux other options
+#
 CT_KERNEL_LINUX_INSTALL=y
-CT_KERNEL_V_2_6_37=y
-# CT_KERNEL_V_2_6_36_3 is not set
-# CT_KERNEL_V_2_6_36_2 is not set
-# CT_KERNEL_V_2_6_36_1 is not set
-# CT_KERNEL_V_2_6_36 is not set
-# CT_KERNEL_V_2_6_35_10 is not set
-# CT_KERNEL_V_2_6_34_8 is not set
-# CT_KERNEL_V_2_6_33_7 is not set
-# CT_KERNEL_V_2_6_32_28 is not set
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_V_2_6_38_4=y
+# CT_KERNEL_V_2_6_38_3 is not set
+# CT_KERNEL_V_2_6_38_2 is not set
+# CT_KERNEL_V_2_6_38_1 is not set
+# CT_KERNEL_V_2_6_38 is not set
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_9 is not set
+# CT_KERNEL_V_2_6_33_12 is not set
+# CT_KERNEL_V_2_6_32_39 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_57 is not set
+# CT_KERNEL_V_2_6_27_58 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
 CT_KERNEL_LINUX_VERBOSE_LEVEL=0
 CT_KERNEL_LINUX_INSTALL_CHECK=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
 
 #
 # Binary utilities
@@ -244,6 +252,13 @@ CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_FORCE_LD_BFD=y
+CT_BINUTILS_LINKER_LD=y
+# CT_BINUTILS_LINKER_GOLD is not set
+# CT_BINUTILS_LINKER_LD_GOLD is not set
+# CT_BINUTILS_LINKER_GOLD_LD is not set
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
 CT_BINUTILS_EXTRA_CONFIG=""
 
 #
@@ -252,9 +267,14 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
+# CT_CC_V_linaro_4_6_2011_04_0 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_linaro_4_5_2011_04_0 is not set
 # CT_CC_V_4_5_2 is not set
 # CT_CC_V_4_5_1 is not set
 # CT_CC_V_4_5_0 is not set
+# CT_CC_V_linaro_4_4_2011_02_0 is not set
+# CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
 CT_CC_V_4_4_3=y
@@ -274,21 +294,22 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_1_2 is not set
 # CT_CC_V_4_0_4 is not set
 # CT_CC_V_3_4_6 is not set
+# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
+# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
+# CT_CC_GCC_4_5 is not set
 # CT_CC_GCC_4_5_or_later is not set
+# CT_CC_GCC_4_6 is not set
+# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
 # CT_CC_GCC_HAS_LTO is not set
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
 # CT_CC_GCC_USE_MPC is not set
 # CT_CC_GCC_USE_LIBELF is not set
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -306,9 +327,22 @@ CT_CC_SUPPORT_OBJCXX=y
 #
 # gcc other options
 #
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
+CT_CC_BUGURL=""
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG=""
+CT_CC_EXTRA_CONFIG=""
 CT_CC_STATIC_LIBSTDCXX=y
+
+#
+# Optimisation features
+#
+CT_CC_GCC_USE_GRAPHITE=y
+
+#
+# Settings for libraries running on target
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 # CT_CC_GCC_LIBMUDFLAP is not set
 # CT_CC_GCC_LIBGOMP is not set
 # CT_CC_GCC_LIBSSP is not set
@@ -332,7 +366,7 @@ CT_LIBC_glibc=y
 # CT_LIBC_newlib is not set
 # CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
-CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_eglibc_AVAILABLE is not set
 CT_LIBC_glibc_AVAILABLE=y
 CT_LIBC_GLIBC_TARBALL=y
 # CT_LIBC_GLIBC_V_2_12_2 is not set
@@ -347,10 +381,11 @@ CT_LIBC_GLIBC_V_2_9=y
 # CT_LIBC_GLIBC_V_2_6 is not set
 # CT_LIBC_GLIBC_V_2_5_1 is not set
 # CT_LIBC_GLIBC_V_2_5 is not set
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
+# CT_LIBC_mingw_AVAILABLE is not set
+# CT_LIBC_newlib_AVAILABLE is not set
+# CT_LIBC_none_AVAILABLE is not set
+# CT_LIBC_uClibc_AVAILABLE is not set
+CT_LIBC_glibc_familly=y
 
 #
 # glibc/eglibc common options
@@ -387,7 +422,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.37"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.4"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_NPTL=y
 # CT_LIBC_SUPPORT_LINUXTHREADS is not set
@@ -420,7 +455,6 @@ CT_CLOOG_NEEDED=y
 # CT_MPC_NEEDED is not set
 # CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
-# CT_WRAPPER_NEEDED is not set
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
@@ -439,9 +473,13 @@ CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_3_2 is not set
 # CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
 # CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
+# CT_PPL_0_11 is not set
+# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
@@ -452,6 +490,4 @@ CT_CLOOG_VERSION="0.15.9"
 #
 # Companion libraries common options
 #
-CT_COMPLIBS_BACKUP=y
 # CT_COMPLIBS_CHECK is not set
-# CT_COMPLIBS_SHARED is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index f25172687c..5728e0812b 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.10.1
-# Sun Apr 24 23:37:50 2011
+# crosstool-NG version: 1.11.3
+# Sat May 21 22:36:24 2011
 #
 CT_BACKEND=y
 CT_MODULES=y
@@ -112,10 +112,6 @@ CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-
-#
-# General target options
-#
 # CT_ARCH_alpha is not set
 CT_ARCH_arm=y
 # CT_ARCH_avr32 is not set
@@ -125,6 +121,7 @@ CT_ARCH_arm=y
 # CT_ARCH_powerpc is not set
 # CT_ARCH_s390 is not set
 # CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
 # CT_ARCH_x86 is not set
 CT_ARCH_alpha_AVAILABLE=y
 CT_ARCH_arm_AVAILABLE=y
@@ -135,9 +132,18 @@ CT_ARCH_mips_AVAILABLE=y
 CT_ARCH_powerpc_AVAILABLE=y
 CT_ARCH_s390_AVAILABLE=y
 CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
 CT_ARCH_x86_AVAILABLE=y
+
+#
+# Generic target options
+#
 CT_ARCH_USE_MMU=y
 
+#
+# Target optimisations
+#
+
 #
 # arm other options
 #
@@ -146,10 +152,6 @@ CT_ARCH_ARM_MODE_ARM=y
 # CT_ARCH_ARM_MODE_THUMB is not set
 CT_ARCH_ARM_EABI=y
 
-#
-# Target optimisations
-#
-
 #
 # Toolchain options
 #
@@ -192,37 +194,43 @@ CT_BUILD_SUFFIX=""
 # CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.37"
+CT_KERNEL_VERSION="2.6.38.4"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 # CT_KERNEL_mingw32 is not set
-CT_KERNEL_bare_metal_AVAILABLE=y
+# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
+# CT_KERNEL_mingw32_AVAILABLE is not set
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# linux other options
+#
 CT_KERNEL_LINUX_INSTALL=y
-CT_KERNEL_V_2_6_37=y
-# CT_KERNEL_V_2_6_36_3 is not set
-# CT_KERNEL_V_2_6_36_2 is not set
-# CT_KERNEL_V_2_6_36_1 is not set
-# CT_KERNEL_V_2_6_36 is not set
-# CT_KERNEL_V_2_6_35_10 is not set
-# CT_KERNEL_V_2_6_34_8 is not set
-# CT_KERNEL_V_2_6_33_7 is not set
-# CT_KERNEL_V_2_6_32_28 is not set
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_V_2_6_38_4=y
+# CT_KERNEL_V_2_6_38_3 is not set
+# CT_KERNEL_V_2_6_38_2 is not set
+# CT_KERNEL_V_2_6_38_1 is not set
+# CT_KERNEL_V_2_6_38 is not set
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_9 is not set
+# CT_KERNEL_V_2_6_33_12 is not set
+# CT_KERNEL_V_2_6_32_39 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_57 is not set
+# CT_KERNEL_V_2_6_27_58 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
 CT_KERNEL_LINUX_VERBOSE_LEVEL=0
 CT_KERNEL_LINUX_INSTALL_CHECK=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
 
 #
 # Binary utilities
@@ -244,6 +252,12 @@ CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_LINKER_LD=y
+# CT_BINUTILS_LINKER_GOLD is not set
+# CT_BINUTILS_LINKER_LD_GOLD is not set
+# CT_BINUTILS_LINKER_GOLD_LD is not set
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
 CT_BINUTILS_EXTRA_CONFIG=""
 
 #
@@ -252,9 +266,14 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
+# CT_CC_V_linaro_4_6_2011_04_0 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_linaro_4_5_2011_04_0 is not set
 # CT_CC_V_4_5_2 is not set
 # CT_CC_V_4_5_1 is not set
 # CT_CC_V_4_5_0 is not set
+# CT_CC_V_linaro_4_4_2011_02_0 is not set
+# CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
 CT_CC_V_4_4_3=y
@@ -274,21 +293,22 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_1_2 is not set
 # CT_CC_V_4_0_4 is not set
 # CT_CC_V_3_4_6 is not set
+# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
+# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
+# CT_CC_GCC_4_5 is not set
 # CT_CC_GCC_4_5_or_later is not set
+# CT_CC_GCC_4_6 is not set
+# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
 # CT_CC_GCC_HAS_LTO is not set
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
 # CT_CC_GCC_USE_MPC is not set
 # CT_CC_GCC_USE_LIBELF is not set
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -306,9 +326,22 @@ CT_CC_SUPPORT_OBJCXX=y
 #
 # gcc other options
 #
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
+CT_CC_BUGURL=""
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG=""
+CT_CC_EXTRA_CONFIG=""
 CT_CC_STATIC_LIBSTDCXX=y
+
+#
+# Optimisation features
+#
+CT_CC_GCC_USE_GRAPHITE=y
+
+#
+# Settings for libraries running on target
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 # CT_CC_GCC_LIBMUDFLAP is not set
 # CT_CC_GCC_LIBGOMP is not set
 # CT_CC_GCC_LIBSSP is not set
@@ -332,11 +365,11 @@ CT_LIBC_VERSION="0.9.30.3"
 # CT_LIBC_newlib is not set
 # CT_LIBC_none is not set
 CT_LIBC_uClibc=y
-CT_LIBC_eglibc_AVAILABLE=y
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
+# CT_LIBC_eglibc_AVAILABLE is not set
+# CT_LIBC_glibc_AVAILABLE is not set
+# CT_LIBC_mingw_AVAILABLE is not set
+# CT_LIBC_newlib_AVAILABLE is not set
+# CT_LIBC_none_AVAILABLE is not set
 CT_LIBC_uClibc_AVAILABLE=y
 # CT_LIBC_UCLIBC_V_0_9_31 is not set
 CT_LIBC_UCLIBC_V_0_9_30_3=y
@@ -399,7 +432,6 @@ CT_CLOOG_NEEDED=y
 # CT_MPC_NEEDED is not set
 # CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
-# CT_WRAPPER_NEEDED is not set
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
@@ -418,9 +450,13 @@ CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_3_2 is not set
 # CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
 # CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
+# CT_PPL_0_11 is not set
+# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
@@ -431,6 +467,4 @@ CT_CLOOG_VERSION="0.15.9"
 #
 # Companion libraries common options
 #
-CT_COMPLIBS_BACKUP=y
 # CT_COMPLIBS_CHECK is not set
-# CT_COMPLIBS_SHARED is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index ed7f7c60aa..b5066517b1 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -14,7 +14,7 @@ uclibc: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
 # Internal variables
 
 # Crostool-NG hard-coded configuration options
-CTNG_VERSION:=1.10.1
+CTNG_VERSION:=1.11.3
 CTNG_SITE:=http://crosstool-ng.org/download/crosstool-ng/
 CTNG_SOURCE:=crosstool-ng-$(CTNG_VERSION).tar.bz2
 CTNG_DIR:=$(BUILD_DIR)/crosstool-ng-$(CTNG_VERSION)

From 40a203f2548f7445f01e7fb84676c87c313d7884 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 22 May 2011 00:05:42 +0200
Subject: [PATCH 0268/6849] toolchain/crosstool-NG: fix up ct-ng config file to
 saner defaults

Peter on IRC reported some build failures for different targets.
They were of two kinds:
 - missing/unknown stack unwinding support
 - missing *_chk functions

The first is about configure not being able to automagically determine
if stack unwinding support is available for the target. The second is
about fortified build forgetting to build the fortified functions.
This applies to both glibc and eglibc.

After some discussions on IRC with Jacmet, it appears that we can
safely assume both of the following:
 - virtually all targets of buildroot will have stack unwinding support
 - we do not care about fortified builds (so far)

So, update the bundled crosstool-NG .config file to saner defaults:
 - force unwind support
 - disable fortified builds

[Peter: fix 'force non-fortified build' sed invocation]
Reported-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index b5066517b1..2d1b51c685 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -327,6 +327,18 @@ $(CTNG_DIR)/libc.config: $(CTNG_UCLIBC_CONFIG_FILE) $(CONFIG_DIR)/.config
 
 endif # LIBC is uClibc
 
+#--------------
+# glibc/eglibc specific options
+ifeq ($(BR2_TOOLCHAIN_CTNG_glibc)$(BR2_TOOLCHAIN_CTNG_eglibc),y)
+
+# Force unwind support
+CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_GLIBC_FORCE_UNWIND) is not set:\1=y:;
+
+# Force non-fortified build
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_ENABLE_FORTIFIED_BUILD)=y:\# \1 is not set:;
+
+endif # LIBC is glibc or eglibc
+
 #--------------
 # Small functions to shoe-horn the above into crosstool-NG's .config
 

From f066ed70cd6939838d4057f66798cbc1d972cc73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 21 May 2011 17:47:49 +0200
Subject: [PATCH 0269/6849] psmisc: fix build by linking against libintl when
 needed

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../psmisc/psmisc-link-against-libintl.patch  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/psmisc/psmisc-link-against-libintl.patch

diff --git a/package/psmisc/psmisc-link-against-libintl.patch b/package/psmisc/psmisc-link-against-libintl.patch
new file mode 100644
index 0000000000..985e232779
--- /dev/null
+++ b/package/psmisc/psmisc-link-against-libintl.patch
@@ -0,0 +1,43 @@
+Link against libintl if needed
+
+When built against a C library that has locale support, but for which
+intl support is provided by an external libintl library, psmisc
+forgets to link against this library, even though the configure script
+properly checks that.
+
+This patch therefore ensure that we link against libintl when needed,
+thanks to the @INTLLIBS@ variable provided by the configure script.
+
+We do not modify the Makefile.am file, because autoreconfiguring this
+package doesn't work: because of its usage of gettext, it wants to run
+the "autopoint" program, which itself depends on CVS being installed,
+for some strange reasons. That's the reason why we fall back to the
+hacky solution of modifying the Makefile.in file.
+
+It replaces a hack which was mistakenly removed by commit
+542fbe8520c981f9c96705a57e4263f34f2ab2e6.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: psmisc-22.13/src/Makefile.in
+===================================================================
+--- psmisc-22.13.orig/src/Makefile.in	2011-05-21 15:12:17.212412293 +0200
++++ psmisc-22.13/src/Makefile.in	2011-05-21 16:08:50.220326032 +0200
+@@ -216,12 +216,15 @@
+ 	$(am__append_4) $(am__append_6) $(am__append_8) \
+ 	$(am__append_10)
+ fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
++fuser_LDADD = @INTLLIBS@
+ killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
+-killall_LDADD = @SELINUX_LIB@
++killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
+ peekfd_SOURCES = peekfd.c
++peekfd_LDADD = @INTLLIBS@
+ pstree_SOURCES = pstree.c comm.h i18n.h
+-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
++pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
+ prtstat_SOURCES = prtstat.c prtstat.h
++prtstat_LDADD = @INTLLIBS@
+ BUILT_SOURCES = signames.h
+ EXTRA_DIST = signames.c 
+ CLEANFILES = signames.h

From 9868d2419021a3362d55963b022d18d57438c164 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 21 May 2011 17:47:50 +0200
Subject: [PATCH 0270/6849] psmisc: do not install pstree.x11 symbolic link

The psmisc-no-__progname.patch removes the usage of __progname, which
removes any difference between pstree and pstree.x11. Therefore, we
make sure to not create the pstree.x11 symbolic link in the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/psmisc/psmisc-no-__progname.patch | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/package/psmisc/psmisc-no-__progname.patch b/package/psmisc/psmisc-no-__progname.patch
index 063b120eef..51096571cb 100644
--- a/package/psmisc/psmisc-no-__progname.patch
+++ b/package/psmisc/psmisc-no-__progname.patch
@@ -5,10 +5,12 @@ stuff isn't that critical, so just disable it.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c
---- psmisc-22.13.orig/src/pstree.c	2010-07-12 08:10:03.000000000 -0300
-+++ psmisc-22.13/src/pstree.c	2011-01-07 15:02:41.902741728 -0300
+Index: psmisc-22.13/src/pstree.c
+===================================================================
+--- psmisc-22.13.orig/src/pstree.c	2010-07-12 13:10:03.000000000 +0200
++++ psmisc-22.13/src/pstree.c	2011-05-21 16:33:37.456530775 +0200
 @@ -49,8 +49,6 @@
  #include <selinux/selinux.h>
  #endif                                /*WITH_SELINUX */
@@ -28,3 +30,18 @@ diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c
      /*
       * Attempt to figure out a good default symbol set.  Will be overriden by
       * command-line options, if given.
+Index: psmisc-22.13/src/Makefile.in
+===================================================================
+--- psmisc-22.13.orig/src/Makefile.in	2011-05-21 16:33:42.748530777 +0200
++++ psmisc-22.13/src/Makefile.in	2011-05-21 16:33:47.360530782 +0200
+@@ -557,10 +557,6 @@
+ 		grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
+ 		  { rm -f signames.h; exit 1; }
+ 
+-install-exec-hook:
+-		cd $(DESTDIR)$(bindir) && \
+-			( [ -h pstree.x11 ]  || $(LN_S) pstree pstree.x11)
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

From 5c8c02a0c6747357ecc3f4884b065cf08bf2395a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 May 2011 10:53:40 +0200
Subject: [PATCH 0271/6849] qt: scripttools needs gui

The QtScriptTools library depends on the QtGui library, as can be seen
in the src/src.pro file of the Qt sources :

!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools

If the scripttools are enabled in the Qt configuration, but not the
gui, then the scripttools library is not built by Qt, and the
Buildroot build process fails with:

cp: cannot stat `/home/test/outputs/test-502/host/usr/sh4-unknown-linux-gnu/sysroot/usr/lib/libQtScriptTools.so.*': No such file or directory

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index eafc855a44..4a3945c82b 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -373,6 +373,7 @@ config BR2_PACKAGE_QT_SCRIPT
 config BR2_PACKAGE_QT_SCRIPTTOOLS
 	bool "Script Tools Module"
 	depends on BR2_PACKAGE_QT_SCRIPT
+	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  Build the Qt Script Tools module.
 	  if unsure, say n.

From 75c0a454887cb650f6fc049c8d12848a7cc6f3cc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 May 2011 13:56:08 +0200
Subject: [PATCH 0272/6849] fakeroot: disallow selection for the target

fakeroot for the target fails to build against glibc, due to largefile
related problems :

libtool: link: /home/test/outputs/test-503/host/usr/bin/powerpc-linux-gnu-gcc -pipe -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o faked faked.o  ./.libs/libcommunicate.a -ldl
{standard input}: Assembler messages:
{standard input}:2592: Error: symbol `__fxstatat64' is already defined
{standard input}:2627: Error: symbol `__fxstat64' is already defined
{standard input}:2663: Error: symbol `__xstat64' is already defined
{standard input}:2698: Error: symbol `__lxstat64' is already defined
make[3]: *** [libfakeroot.lo] Error 1

As fakeroot for the target is not really needed, and was only added
when we packaged fakeroot for the host, just make fakeroot not
selectable for the target.

We have to keep the AUTOTARGETS call for fakeroot on the target,
because the host variant does not work otherwise, due to issues in the
package infrastructure (that will be fixed post-2011.05).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            | 1 -
 package/fakeroot/Config.in   | 6 ------
 package/fakeroot/fakeroot.mk | 3 +++
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 package/fakeroot/Config.in

diff --git a/package/Config.in b/package/Config.in
index 1d3c0ccbb5..40f523de25 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -48,7 +48,6 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/diffutils/Config.in"
 endif
 source "package/distcc/Config.in"
-source "package/fakeroot/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/findutils/Config.in"
 endif
diff --git a/package/fakeroot/Config.in b/package/fakeroot/Config.in
deleted file mode 100644
index 186b717d4e..0000000000
--- a/package/fakeroot/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_FAKEROOT
-	bool "fakeroot"
-	help
-	  Run commands in an environment faking root privileges.
-
-	  http://joostje.op.het.net/fakeroot/
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 8061443d78..29e9e5beb6 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -16,5 +16,8 @@ endef
 
 FAKEROOT_POST_PATCH_HOOKS += FAKEROOT_PATCH_FAKEROOT_IN
 
+# The package for the target cannot be selected (build problems when
+# largefile is enabled), but is needed for the host package to work
+# due to deficiencies in the package infrastructure.
 $(eval $(call AUTOTARGETS,package,fakeroot))
 $(eval $(call AUTOTARGETS,package,fakeroot,host))

From 383074a6335d310918aa11430341614dc79580a5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 May 2011 16:32:49 +0200
Subject: [PATCH 0273/6849] kbd: make sure to link against libintl when needed

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kbd/Config.in                      |  2 ++
 package/kbd/kbd-link-against-libintl.patch | 34 ++++++++++++++++++++++
 package/kbd/kdb.mk                         |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 package/kbd/kbd-link-against-libintl.patch

diff --git a/package/kbd/Config.in b/package/kbd/Config.in
index b6d13b587d..1fe4dff838 100644
--- a/package/kbd/Config.in
+++ b/package/kbd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_KBD
 	bool "kbd"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Keytable files and keyboard utilities.
 
diff --git a/package/kbd/kbd-link-against-libintl.patch b/package/kbd/kbd-link-against-libintl.patch
new file mode 100644
index 0000000000..39fd461cc4
--- /dev/null
+++ b/package/kbd/kbd-link-against-libintl.patch
@@ -0,0 +1,34 @@
+Make sure we link against libintl if needed
+
+We modify directly the Makefile.in so that we don't have to
+autoreconfigure the package, which doesn't work because packages using
+gettext need the autopoint tool for their autoregeneration step and
+this thing doesn't work (yet) in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: kbd-1.15.2/src/Makefile.am
+===================================================================
+--- kbd-1.15.2.orig/src/Makefile.am	2011-05-22 16:08:51.144530776 +0200
++++ kbd-1.15.2/src/Makefile.am	2011-05-22 16:09:09.892530778 +0200
+@@ -5,6 +5,8 @@
+ AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(WARNINGS) \
+ 	-funit-at-a-time
+ 
++LDADD = @INTLLIBS@
++
+ OLDPROGS = mapscrn loadunimap
+ PROGS = \
+ 	dumpkeys loadkeys showkey setfont showconsolefont \
+Index: kbd-1.15.2/src/Makefile.in
+===================================================================
+--- kbd-1.15.2.orig/src/Makefile.in	2011-05-22 16:10:27.540530777 +0200
++++ kbd-1.15.2/src/Makefile.in	2011-05-22 16:10:51.172530778 +0200
+@@ -26,6 +26,7 @@
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+ INSTALL_HEADER = $(INSTALL_DATA)
++LDADD = @INTLLIBS@
+ transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
diff --git a/package/kbd/kdb.mk b/package/kbd/kdb.mk
index 526e1ffb05..ec67c5f037 100644
--- a/package/kbd/kdb.mk
+++ b/package/kbd/kdb.mk
@@ -2,4 +2,6 @@ KBD_VERSION = 1.15.2
 KBD_SOURCE = kbd-$(KBD_VERSION).tar.gz
 KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 
+KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+
 $(eval $(call AUTOTARGETS,package,kbd))

From 4b3e8a71c14c2442670299c8d75356b747c4b157 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 May 2011 16:32:50 +0200
Subject: [PATCH 0274/6849] kbd: rename the makefile so that it's named the
 same as the package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kbd/{kdb.mk => kbd.mk} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/kbd/{kdb.mk => kbd.mk} (100%)

diff --git a/package/kbd/kdb.mk b/package/kbd/kbd.mk
similarity index 100%
rename from package/kbd/kdb.mk
rename to package/kbd/kbd.mk

From 1eda3a5c890645887f7ab36a7fbf850432279eb6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 May 2011 17:03:14 +0200
Subject: [PATCH 0275/6849] kernel-headers: bump 2.6.38.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index da6f1c3fc7..d60cea0a2c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -46,6 +46,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.35.13"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.6"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.38.7"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 596fe25ea7441f238707ddc263fd50ccdf7f644b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 May 2011 17:04:06 +0200
Subject: [PATCH 0276/6849] linux: bump 2.6.38.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index ea04c7d97b..e7d1bd8b8d 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_38
 
 config BR2_LINUX_KERNEL_2_6_38
-	bool "2.6.38.6"
+	bool "2.6.38.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.38.6"
+	default "2.6.38.7"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.38.6" if BR2_LINUX_KERNEL_2_6_38
+	default "2.6.38.7" if BR2_LINUX_KERNEL_2_6_38
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 572529a43c3b7e637adff025dabdf335bd100403 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 May 2011 17:04:47 +0200
Subject: [PATCH 0277/6849] defconfigs: bump 2.6.38.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 configs/qemu_mipsel_malta_defconfig  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 6274b686c0..faf55e33aa 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 64ce976cd5..3f54cefc84 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-2.6.38.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 66e94f96f466b2ed6dc9be80031aef850947748c Mon Sep 17 00:00:00 2001
From: Klaus Schwarzkopf <schwarzkopf@sensortherm.de>
Date: Mon, 23 May 2011 18:19:30 +0200
Subject: [PATCH 0278/6849] ext-toolchain: fix download url / add cs 2009q3

* fixed: external toolchain CODESOURCERY ARM2009Q1 downloaded version ARM2009Q3
* add CODESOURCERY ARM2009Q1 for ti dvsdk 3.10.

Signed-off-by: Klaus Schwarzkopf <schwarzkopf@sensortherm.de>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 14 ++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 079c097aa6..84e8ef83bc 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -45,6 +45,20 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
              - ARMv4T, little endian, soft-float, glibc
              - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
+	bool "CodeSourcery ARM 2009q3"
+	depends on BR2_arm
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the ARM architecture, from CodeSourcery. It
+	  uses gcc 4.4.1, binutils 2.19, glibc 2.10 and gdb 6.8 and
+	  kernel headers 2.6.30. It has support for the following
+	  variants:
+            - ARMv5T, little endian, soft-float, glibc
+            - ARMv4T, little endian, soft-float, glibc
+            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
 	bool "CodeSourcery ARM 2009q1"
 	depends on BR2_arm
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6d12ba7d3a..9171e85b44 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -163,6 +163,9 @@ TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(STAMP_DIR)/ext-toolchain-checked
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1),y)
+TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package4571/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q1-203-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package5383/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q3-67-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1),y)

From effcc9a2a2a6678dbc04d3c5b6957df3987dccc6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 May 2011 15:02:23 +0200
Subject: [PATCH 0279/6849] Update for 2011.05-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 11 +++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index b0ac653056..eb41128e10 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+2011.05-rc2, Released May 24th, 2011:
+
+	Fixes all over the tree.
+
+	Toolchain: Code sourcery ARM 2009q1 download URL fixed /
+	2009q3 external toolchains added. Crosstool-NG bumped to
+	1.11.3, eglic/glibc configuration fixes. Linux kernel 2.6.38.x
+	bumped to 2.6.38.7.
+
+	Updated/fixed packages: bind, fakeroot, kbd, psmisc, qt
+
 2011.05-rc1, Released May 18th, 2011:
 
 	Fixes all over the tree and new features.
diff --git a/Makefile b/Makefile
index d803a5c072..9be7f1c0d6 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.05-rc1
+export BR2_VERSION:=2011.05-rc2
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index 6d0a2ec529..ec0685bdfb 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2011.02.tar.bz2">buildroot-2011.02.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2011.05-rc1</b>, which can be
+The latest release candidate is <b>2011.05-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.05-rc1.tar.gz">buildroot-2011.05-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2011.05-rc2.tar.gz">buildroot-2011.05-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.05-rc1.tar.bz2">buildroot-2011.05-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.05-rc2.tar.bz2">buildroot-2011.05-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index acec32a1d7..99e9aa3be0 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>24 May 2011 -- 2011.05-rc2 released</b>
+
+    <p>RC2 is out with more bugfixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.05_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.05-rc2.tar.bz2">2011.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>18 May 2011 -- 2011.05-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 99ead3c2ead605d6504b9abad111778dc2a93ae6 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 25 May 2011 14:31:41 +0200
Subject: [PATCH 0280/6849] makedevs: minor fix to command's help

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/makedevs/makedevs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c
index 9fc71af54d..95c079a9fe 100644
--- a/package/makedevs/makedevs.c
+++ b/package/makedevs/makedevs.c
@@ -328,7 +328,7 @@ void bb_show_usage(void)
 	fprintf(stderr, "%s: [-d device_table] rootdir\n\n", bb_applet_name);
 	fprintf(stderr, "Creates a batch of special files as specified in a device table.\n");
 	fprintf(stderr, "Device table entries take the form of:\n");
-	fprintf(stderr, "type mode user group major minor start increment count\n\n");
+	fprintf(stderr, "name type mode user group major minor start increment count\n\n");
 	fprintf(stderr, "Where name is the file name,  type can be one of:\n");
 	fprintf(stderr, "      f       A regular file\n");
 	fprintf(stderr, "      d       Directory\n");

From cff599de0816704be966c5f9da36bfab14d9dcaa Mon Sep 17 00:00:00 2001
From: "f8cfe@free.fr" <f8cfe@free.fr>
Date: Wed, 25 May 2011 21:10:55 +0200
Subject: [PATCH 0281/6849] setlocalversion: fix svn revision l10n-ism

Fixed an l10n-ism in retrieval of the svn revision.

Signed-off-by: Stephane Fillod <fillods@users.sf.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 scripts/setlocalversion | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index cc2c128f0a..8d6fe909f9 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -56,9 +56,9 @@ if hgid=`hg id 2>/dev/null`; then
 fi
 
 # Check for svn and a svn repo.
-if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
+if rev=`LANG=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
 	rev=`echo $rev | awk '{print $NF}'`
-	changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l`
+	changes=`LANG=C svn status 2>/dev/null | grep '^[AMD]' | wc -l`
 
 	# Are there uncommitted changes?
 	if [ $changes != 0 ]; then

From 9ab73b51e8f0f30e1720639d40732fa20aab9d1a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 27 May 2011 16:18:21 +0200
Subject: [PATCH 0282/6849] Update for 2011.05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  4 ++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  8 ++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index eb41128e10..5607317815 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2011.05, Released May 27th, 2011:
+
+	Updated/fixed packages: makedevs
+
 2011.05-rc2, Released May 24th, 2011:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 9be7f1c0d6..893921bcc8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.05-rc2
+export BR2_VERSION:=2011.05
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index ec0685bdfb..a70bfb35ab 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2011.02</b>, which can be downloaded
+The latest stable release is <b>2011.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2011.02.tar.gz">buildroot-2011.02.tar.gz</a>
+<a href="/downloads/buildroot-2011.05.tar.gz">buildroot-2011.05.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.02.tar.bz2">buildroot-2011.02.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.05.tar.bz2">buildroot-2011.05.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2011.05-rc2</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.05-rc2.tar.bz2">buildroot-2011.05-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 99e9aa3be0..4d79bf2a74 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,14 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>27 May 2011 -- 2011.05 released</b>
+
+    <p>The stable 2011.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.05">CHANGES</a>
+    file for more details, and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.05.tar.bz2">2011.05 release</a>.</p>
+
   <li><b>24 May 2011 -- 2011.05-rc2 released</b>
 
     <p>RC2 is out with more bugfixes. See the <a

From 0a5e7905a63f39ddba9c66db53ff1c8b8d4f19b6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Jun 2011 13:36:55 +0200
Subject: [PATCH 0283/6849] kickoff 2011.08 development cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 5607317815..a10fa18f82 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2011.08, Not released yet:
+
 2011.05, Released May 27th, 2011:
 
 	Updated/fixed packages: makedevs
diff --git a/Makefile b/Makefile
index 893921bcc8..f3bdf3b800 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.05
+export BR2_VERSION:=2011.08-git
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:

From d79d9a501dbdc20de0ca1a92994d4b63b3ec7249 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Jun 2011 13:37:23 +0200
Subject: [PATCH 0284/6849] gst-plugins-bad: ensure cross sdl-config is used
 for sdl plugin

Otherwise we end up linking against host libraries.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 357acf3b35..31d998f9b2 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -348,6 +348,7 @@ GST_PLUGINS_BAD_CONF_OPT += --disable-oss4
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y)
+GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
 GST_PLUGINS_BAD_CONF_OPT += --enable-sdl
 GST_PLUGINS_BAD_DEPENDENCIES += sdl
 else

From ab251cfe2b636fc3041fce8773d9a6c43c316446 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Jun 2011 13:45:25 +0200
Subject: [PATCH 0285/6849] libmpeg2: ensure cross sdl-config is used for sdl
 plugin

Otherwise we end up linking against host libraries.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libmpeg2/libmpeg2.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/multimedia/libmpeg2/libmpeg2.mk
index cd8ac89262..8bcc99967b 100644
--- a/package/multimedia/libmpeg2/libmpeg2.mk
+++ b/package/multimedia/libmpeg2/libmpeg2.mk
@@ -10,6 +10,7 @@ LIBMPEG2_INSTALL_STAGING = YES
 LIBMPEG2_CONF_OPT = --without-x --disable-directx
 
 ifeq ($(BR2_PACKAGE_SDL),y)
+LIBMPEG2_CONF_ENV += ac_cv_prog_SDLCONFIG=$(STAGING_DIR)/usr/bin/sdl-config
 LIBMPEG2_CONF_OPT += --enable-sdl
 LIBMPEG2_DEPENDENCIES += sdl
 else

From 92ab7428e85027d8155855e67e8e03bb80c93a94 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 Jun 2011 13:03:24 +0200
Subject: [PATCH 0286/6849] sudo: bump version, use official upstream, don't
 disable auth

sudo without authentication doesn't make much sense, and it has very
limited impact on binary size.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/Config.in | 2 ++
 package/sudo/sudo.mk   | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/sudo/Config.in b/package/sudo/Config.in
index a1b596bbe2..fc0a175ec9 100644
--- a/package/sudo/Config.in
+++ b/package/sudo/Config.in
@@ -5,3 +5,5 @@ config BR2_PACKAGE_SUDO
 	  limited root privileges to users and log root activity.  The
 	  basic philosophy is to give as few privileges as possible
 	  but still allow people to get their work done.
+
+	  http://www.sudo.ws/sudo/
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index fde4b77117..688df16437 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.7.4p6
-SUDO_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sudo
-SUDO_SOURCE  = sudo_$(SUDO_VERSION).orig.tar.gz
+SUDO_VERSION = 1.7.6p2
+SUDO_SITE    = http://www.sudo.ws/sudo/dist
 
 SUDO_CONF_OPT = \
 		--without-lecture \
@@ -14,7 +13,6 @@ SUDO_CONF_OPT = \
 		--without-umask \
 		--with-logging=syslog \
 		--without-interfaces \
-		--disable-authentication \
 		--without-pam
 
 define SUDO_INSTALL_TARGET_CMDS

From 3eb9a36aa351ed8a5cc93665985fed2824e1efe5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Jun 2011 10:18:05 +0200
Subject: [PATCH 0287/6849] uClibc: bump 0.9.31.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |  2 +-
 ...libc-0.9.31-dnslookup-use-after-free.patch | 36 -------------------
 ...0.9.31.1-add-bsd-endian-conversions.patch} |  0
 ...> uClibc-0.9.31.1-add-inotify-init1.patch} |  0
 ...=> uClibc-0.9.31.1-add-sock-cloexec.patch} |  0
 ...ibc-0.9.31.1-fix-error-locale-utf-8.patch} |  0
 ...31.1-fix-fcntl64-for-64-bit-targets.patch} |  0
 ...ibc-0.9.31.1-linuxthreads-errno-fix.patch} |  0
 ...9.31.1-more-workarounds-GCC-PR32219.patch} |  0
 ... uClibc-0.9.31.1-powerpc-ptrace-fix.patch} |  0
 ...ch => uClibc-0.9.31.1-quad-routines.patch} |  0
 ...ibc-0.9.31.1-workaround-GCC-PR32219.patch} |  0
 12 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch
 rename toolchain/uClibc/{uClibc-0.9.31-add-bsd-endian-conversions.patch => uClibc-0.9.31.1-add-bsd-endian-conversions.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-add-inotify-init1.patch => uClibc-0.9.31.1-add-inotify-init1.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-add-sock-cloexec.patch => uClibc-0.9.31.1-add-sock-cloexec.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-fix-error-locale-utf-8.patch => uClibc-0.9.31.1-fix-error-locale-utf-8.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-fix-fcntl64-for-64-bit-targets.patch => uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-linuxthreads-errno-fix.patch => uClibc-0.9.31.1-linuxthreads-errno-fix.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-more-workarounds-GCC-PR32219.patch => uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-powerpc-ptrace-fix.patch => uClibc-0.9.31.1-powerpc-ptrace-fix.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-quad-routines.patch => uClibc-0.9.31.1-quad-routines.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.31-workaround-GCC-PR32219.patch => uClibc-0.9.31.1-workaround-GCC-PR32219.patch} (100%)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index c264ba282c..36b18a7569 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -39,7 +39,7 @@ config BR2_UCLIBC_VERSION_STRING
 	string
 	default 0.9.29		if BR2_UCLIBC_VERSION_0_9_29
 	default 0.9.30.3	if BR2_UCLIBC_VERSION_0_9_30
-	default 0.9.31		if BR2_UCLIBC_VERSION_0_9_31
+	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32-rc3	if BR2_UCLIBC_VERSION_0_9_32
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
diff --git a/toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch b/toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch
deleted file mode 100644
index 9956d591a0..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From eb1d8c8289f466ba3ad10b9a88ab2e426b8a9dc7 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Tue, 6 Apr 2010 09:55:19 +0200
-Subject: [PATCH] Fix use-after-free bug in __dns_lookup
-
-If the type of the first answer does not match with the requested type,
-then the dotted name was freed. If there are no further answers in
-the DNS reply, this pointer was used later on in the same function.
-Additionally it is passed to the caller, and caused strange
-behaviour.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/inet/resolv.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index 056539f..9459199 100644
---- a/libc/inet/resolv.c
-+++ b/libc/inet/resolv.c
-@@ -1517,10 +1517,8 @@ int attribute_hidden __dns_lookup(const char *name,
- 				memcpy(a, &ma, sizeof(ma));
- 				if (a->atype != T_SIG && (NULL == a->buf || (type != T_A && type != T_AAAA)))
- 					break;
--				if (a->atype != type) {
--					free(a->dotted);
-+				if (a->atype != type)
- 					continue;
--				}
- 				a->add_count = h.ancount - j - 1;
- 				if ((a->rdlength + sizeof(struct in_addr*)) * a->add_count > a->buflen)
- 					break;
--- 
-1.7.0
-
diff --git a/toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-fix-error-locale-utf-8.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-fix-error-locale-utf-8.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-fix-fcntl64-for-64-bit-targets.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-fix-fcntl64-for-64-bit-targets.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-more-workarounds-GCC-PR32219.patch b/toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-more-workarounds-GCC-PR32219.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-powerpc-ptrace-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-powerpc-ptrace-fix.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-quad-routines.patch b/toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-quad-routines.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch
diff --git a/toolchain/uClibc/uClibc-0.9.31-workaround-GCC-PR32219.patch b/toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.31-workaround-GCC-PR32219.patch
rename to toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch

From 339687aa2e27e95e8e98d25f3e73f98d291e2b4e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Jun 2011 10:34:12 +0200
Subject: [PATCH 0288/6849] uClibc: bump 0.9.32 version, use as default

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                                  | 6 +++---
 ...fix.patch => uClibc-0.9.32-linuxthreads-errno-fix.patch} | 0
 toolchain/uClibc/uClibc-0.9.32.config                       | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename toolchain/uClibc/{uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch => uClibc-0.9.32-linuxthreads-errno-fix.patch} (100%)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 36b18a7569..7f0f87519b 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,7 +5,7 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_0_9_31
+	default BR2_UCLIBC_VERSION_0_9_32
 	help
 	  Select the version of uClibc you wish to use.
 
@@ -21,7 +21,7 @@ choice
 		bool "uClibc 0.9.31.x"
 
 	config BR2_UCLIBC_VERSION_0_9_32
-		bool "uClibc 0.9.32-rc3"
+		bool "uClibc 0.9.32.x"
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
@@ -40,7 +40,7 @@ config BR2_UCLIBC_VERSION_STRING
 	default 0.9.29		if BR2_UCLIBC_VERSION_0_9_29
 	default 0.9.30.3	if BR2_UCLIBC_VERSION_0_9_30
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
-	default 0.9.32-rc3	if BR2_UCLIBC_VERSION_0_9_32
+	default 0.9.32		if BR2_UCLIBC_VERSION_0_9_32
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
diff --git a/toolchain/uClibc/uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32-rc3-linuxthreads-errno-fix.patch
rename to toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config
index aa00680033..5a7b52a9a2 100644
--- a/toolchain/uClibc/uClibc-0.9.32.config
+++ b/toolchain/uClibc/uClibc-0.9.32.config
@@ -220,6 +220,7 @@ UCLIBC_HAS_FNMATCH=y
 # UCLIBC_HAS_WORDEXP is not set
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
@@ -260,6 +261,7 @@ DOSTRIP=y
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set

From d72dc424c0c76574640eb2eb7985e6af0c1a9441 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Jun 2011 10:35:39 +0200
Subject: [PATCH 0289/6849] kernel-headers: bump 2.6.38.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d60cea0a2c..6bf73cd3c3 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -46,6 +46,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.35.13"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.7"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 0d0c5269db65bcbb3ce9cd91b6fb468a112ad791 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Jun 2011 10:36:21 +0200
Subject: [PATCH 0290/6849] kernel-headers: add 2.6.39.x, use as default

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 6bf73cd3c3..4c551a2412 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_2_6_38
+	default BR2_KERNEL_HEADERS_2_6_39
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -27,6 +27,9 @@ choice
 	config BR2_KERNEL_HEADERS_2_6_38
 		bool "Linux 2.6.38.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_2_6_39
+		bool "Linux 2.6.39.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -47,5 +50,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
+	default "2.6.39.1"	if BR2_KERNEL_HEADERS_2_6_39
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 7d4f51dd447a189b5eadc752c958471bdfa48845 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Jun 2011 10:37:32 +0200
Subject: [PATCH 0291/6849] linux: default to 2.6.39.1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index e7d1bd8b8d..e461a536e4 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_2_6_38
+	default BR2_LINUX_KERNEL_2_6_39
 
-config BR2_LINUX_KERNEL_2_6_38
-	bool "2.6.38.7"
+config BR2_LINUX_KERNEL_2_6_39
+	bool "2.6.39.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.38.7"
+	default "2.6.39.1"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.38.7" if BR2_LINUX_KERNEL_2_6_38
+	default "2.6.39.1" if BR2_LINUX_KERNEL_2_6_39
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From c2f22200883db892f4f25e3c2caa48f7ab8c3ad9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Jun 2011 12:26:28 +0200
Subject: [PATCH 0292/6849] uClibc: use NPTL by default for 0.9.32 / snapshot

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 3fd433ac44..b5ecbc1c45 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -78,6 +78,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 choice
 	prompt "Thread library implementation"
+	default BR2_PTHREADS_NATIVE if BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation

From e446aa072a9504906dc01070847a9048410e218f Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Thu, 9 Jun 2011 14:19:41 +0200
Subject: [PATCH 0293/6849] ethtool: bump to 2.6.39

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 53bbb6776e..d3f578c7e8 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 2.6.38
+ETHTOOL_VERSION = 2.6.39
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool/
 
 $(eval $(call AUTOTARGETS,package,ethtool))

From c324cf05be628b5506a1077a711a59a7a501b24d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Jun 2011 14:15:48 +0200
Subject: [PATCH 0294/6849] package: add sredird

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/sredird/Config.in  |  6 ++++++
 package/sredird/sredird.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/sredird/Config.in
 create mode 100644 package/sredird/sredird.mk

diff --git a/package/Config.in b/package/Config.in
index 40f523de25..a03896a6bf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -202,6 +202,7 @@ endif
 source "package/smartmontools/Config.in"
 source "package/squashfs/Config.in"
 source "package/squashfs3/Config.in"
+source "package/sredird/Config.in"
 source "package/sshfs/Config.in"
 source "package/sysstat/Config.in"
 source "package/udev/Config.in"
diff --git a/package/sredird/Config.in b/package/sredird/Config.in
new file mode 100644
index 0000000000..463269a751
--- /dev/null
+++ b/package/sredird/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_SREDIRD
+	bool "sredird"
+	help
+	  Sredird is a serial port redirector that is compliant with
+	  the RFC 2217 "Telnet Com Port Control Option" protocol. This
+	  protocol lets you share a serial port through the network.
diff --git a/package/sredird/sredird.mk b/package/sredird/sredird.mk
new file mode 100644
index 0000000000..ad91f6a412
--- /dev/null
+++ b/package/sredird/sredird.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# sredird
+#
+#############################################################
+
+SREDIRD_VERSION = 2.2.1-1.1
+SREDIRD_SOURCE = sredird_$(SREDIRD_VERSION).tar.gz
+SREDIRD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sredird
+
+define SREDIRD_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define SREDIRD_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/sredird $(TARGET_DIR)/usr/sbin/sredird
+endef
+
+define SREDIRD_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/sredird
+endef
+
+define SREDIRD_CLEAN_CMDS
+	rm -f $(@D)/sredird
+endef
+
+$(eval $(call GENTARGETS,package,sredird))

From aae534c504555b35f0ae40898b00106a84e17bec Mon Sep 17 00:00:00 2001
From: Francis Mendes <francis.mendes@gmail.com>
Date: Sun, 12 Jun 2011 10:50:34 +0200
Subject: [PATCH 0295/6849] package: add statserial

Signed-off-by: Francis M. de P. Mendes <francis.mendes@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/statserial/Config.in     | 11 +++++++++++
 package/statserial/statserial.mk | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/statserial/Config.in
 create mode 100644 package/statserial/statserial.mk

diff --git a/package/Config.in b/package/Config.in
index a03896a6bf..10d435c178 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -204,6 +204,7 @@ source "package/squashfs/Config.in"
 source "package/squashfs3/Config.in"
 source "package/sredird/Config.in"
 source "package/sshfs/Config.in"
+source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
 source "package/udev/Config.in"
 source "package/usb_modeswitch/Config.in"
diff --git a/package/statserial/Config.in b/package/statserial/Config.in
new file mode 100644
index 0000000000..4db5eb1aa7
--- /dev/null
+++ b/package/statserial/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_STATSERIAL
+	bool "statserial"
+	select BR2_PACKAGE_NCURSES
+	help
+	  Displays a table of the signals on a standard
+	  9-pin or 25-pin serial port, and indicates the
+	  status of the handshaking lines. It can be
+	  useful for debugging problems with serial
+	  ports or modems.
+
+	  https://sites.google.com/site/tranter/software
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
new file mode 100644
index 0000000000..b6a8a0fc2a
--- /dev/null
+++ b/package/statserial/statserial.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# statserial
+#
+#############################################################
+STATSERIAL_VERSION = 1.1
+STATSERIAL_SOURCE = statserial-$(STATSERIAL_VERSION).tar.gz
+STATSERIAL_SITE = http://www.ibiblio.org/pub/Linux/system/serial/
+STATSERIAL_DEPENDENCIES = ncurses
+
+define STATSERIAL_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
+
+define STATSERIAL_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/statserial $(TARGET_DIR)/usr/bin/statserial
+endef
+
+$(eval $(call GENTARGETS,package,statserial))

From 47d8534c1208e81ec45196599ea15a087432f52b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Jun 2011 20:41:57 +0200
Subject: [PATCH 0296/6849] busybox: bump 1.18.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |   2 +-
 .../busybox-1.18.4/busybox-1.18.4-hush.patch  | 160 ------------------
 2 files changed, 1 insertion(+), 161 deletions(-)
 delete mode 100644 package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 8e432021a0..283e59f569 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -40,7 +40,7 @@ config BR2_BUSYBOX_VERSION
 	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
-	default "1.18.4"	if BR2_BUSYBOX_VERSION_1_18_X
+	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch b/package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch
deleted file mode 100644
index 4e995afee2..0000000000
--- a/package/busybox/busybox-1.18.4/busybox-1.18.4-hush.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- busybox-1.18.4/shell/hush.c
-+++ busybox-1.18.4-hush/shell/hush.c
-@@ -427,6 +427,15 @@ enum {
- /* Used for initialization: o_string foo = NULL_O_STRING; */
- #define NULL_O_STRING { NULL }
- 
-+#ifndef debug_printf_parse
-+static const char *const assignment_flag[] = {
-+	"MAYBE_ASSIGNMENT",
-+	"DEFINITELY_ASSIGNMENT",
-+	"NOT_ASSIGNMENT",
-+	"WORD_IS_KEYWORD",
-+};
-+#endif
-+
- /* I can almost use ordinary FILE*.  Is open_memstream() universally
-  * available?  Where is it documented? */
- typedef struct in_str {
-@@ -2885,24 +2894,24 @@ static const struct reserved_combo* matc
- 	 */
- 	static const struct reserved_combo reserved_list[] = {
- # if ENABLE_HUSH_IF
--		{ "!",     RES_NONE,  NOT_ASSIGNMENT , 0 },
--		{ "if",    RES_IF,    WORD_IS_KEYWORD, FLAG_THEN | FLAG_START },
--		{ "then",  RES_THEN,  WORD_IS_KEYWORD, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
--		{ "elif",  RES_ELIF,  WORD_IS_KEYWORD, FLAG_THEN },
--		{ "else",  RES_ELSE,  WORD_IS_KEYWORD, FLAG_FI   },
--		{ "fi",    RES_FI,    NOT_ASSIGNMENT , FLAG_END  },
-+		{ "!",     RES_NONE,  NOT_ASSIGNMENT  , 0 },
-+		{ "if",    RES_IF,    MAYBE_ASSIGNMENT, FLAG_THEN | FLAG_START },
-+		{ "then",  RES_THEN,  MAYBE_ASSIGNMENT, FLAG_ELIF | FLAG_ELSE | FLAG_FI },
-+		{ "elif",  RES_ELIF,  MAYBE_ASSIGNMENT, FLAG_THEN },
-+		{ "else",  RES_ELSE,  MAYBE_ASSIGNMENT, FLAG_FI   },
-+		{ "fi",    RES_FI,    NOT_ASSIGNMENT  , FLAG_END  },
- # endif
- # if ENABLE_HUSH_LOOPS
--		{ "for",   RES_FOR,   NOT_ASSIGNMENT , FLAG_IN | FLAG_DO | FLAG_START },
--		{ "while", RES_WHILE, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
--		{ "until", RES_UNTIL, WORD_IS_KEYWORD, FLAG_DO | FLAG_START },
--		{ "in",    RES_IN,    NOT_ASSIGNMENT , FLAG_DO   },
--		{ "do",    RES_DO,    WORD_IS_KEYWORD, FLAG_DONE },
--		{ "done",  RES_DONE,  NOT_ASSIGNMENT , FLAG_END  },
-+		{ "for",   RES_FOR,   NOT_ASSIGNMENT  , FLAG_IN | FLAG_DO | FLAG_START },
-+		{ "while", RES_WHILE, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
-+		{ "until", RES_UNTIL, MAYBE_ASSIGNMENT, FLAG_DO | FLAG_START },
-+		{ "in",    RES_IN,    NOT_ASSIGNMENT  , FLAG_DO   },
-+		{ "do",    RES_DO,    MAYBE_ASSIGNMENT, FLAG_DONE },
-+		{ "done",  RES_DONE,  NOT_ASSIGNMENT  , FLAG_END  },
- # endif
- # if ENABLE_HUSH_CASE
--		{ "case",  RES_CASE,  NOT_ASSIGNMENT , FLAG_MATCH | FLAG_START },
--		{ "esac",  RES_ESAC,  NOT_ASSIGNMENT , FLAG_END  },
-+		{ "case",  RES_CASE,  NOT_ASSIGNMENT  , FLAG_MATCH | FLAG_START },
-+		{ "esac",  RES_ESAC,  NOT_ASSIGNMENT  , FLAG_END  },
- # endif
- 	};
- 	const struct reserved_combo *r;
-@@ -2968,6 +2977,7 @@ static int reserved_word(o_string *word,
- 	ctx->ctx_res_w = r->res;
- 	ctx->old_flag = r->flag;
- 	word->o_assignment = r->assignment_flag;
-+	debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
- 
- 	if (ctx->old_flag & FLAG_END) {
- 		struct parse_context *old;
-@@ -3034,18 +3044,6 @@ static int done_word(o_string *word, str
- 		debug_printf_parse("word stored in rd_filename: '%s'\n", word->data);
- 		ctx->pending_redirect = NULL;
- 	} else {
--		/* If this word wasn't an assignment, next ones definitely
--		 * can't be assignments. Even if they look like ones. */
--		if (word->o_assignment != DEFINITELY_ASSIGNMENT
--		 && word->o_assignment != WORD_IS_KEYWORD
--		) {
--			word->o_assignment = NOT_ASSIGNMENT;
--		} else {
--			if (word->o_assignment == DEFINITELY_ASSIGNMENT)
--				command->assignment_cnt++;
--			word->o_assignment = MAYBE_ASSIGNMENT;
--		}
--
- #if HAS_KEYWORDS
- # if ENABLE_HUSH_CASE
- 		if (ctx->ctx_dsemicolon
-@@ -3065,8 +3063,9 @@ static int done_word(o_string *word, str
- 		 && ctx->ctx_res_w != RES_CASE
- # endif
- 		) {
--			debug_printf_parse("checking '%s' for reserved-ness\n", word->data);
--			if (reserved_word(word, ctx)) {
-+			int reserved = reserved_word(word, ctx);
-+			debug_printf_parse("checking for reserved-ness: %d\n", reserved);
-+			if (reserved) {
- 				o_reset_to_empty_unquoted(word);
- 				debug_printf_parse("done_word return %d\n",
- 						(ctx->ctx_res_w == RES_SNTX));
-@@ -3087,6 +3086,23 @@ static int done_word(o_string *word, str
- 					"groups and arglists don't mix\n");
- 			return 1;
- 		}
-+
-+		/* If this word wasn't an assignment, next ones definitely
-+		 * can't be assignments. Even if they look like ones. */
-+		if (word->o_assignment != DEFINITELY_ASSIGNMENT
-+		 && word->o_assignment != WORD_IS_KEYWORD
-+		) {
-+			word->o_assignment = NOT_ASSIGNMENT;
-+		} else {
-+			if (word->o_assignment == DEFINITELY_ASSIGNMENT) {
-+				command->assignment_cnt++;
-+				debug_printf_parse("++assignment_cnt=%d\n", command->assignment_cnt);
-+			}
-+			debug_printf_parse("word->o_assignment was:'%s'\n", assignment_flag[word->o_assignment]);
-+			word->o_assignment = MAYBE_ASSIGNMENT;
-+		}
-+		debug_printf_parse("word->o_assignment='%s'\n", assignment_flag[word->o_assignment]);
-+
- 		if (word->has_quoted_part
- 		 /* optimization: and if it's ("" or '') or ($v... or `cmd`...): */
- 		 && (word->data[0] == '\0' || word->data[0] == SPECIAL_VAR_SYMBOL)
-@@ -4105,6 +4121,7 @@ static struct pipe *parse_stream(char **
- 			 && is_well_formed_var_name(dest.data, '=')
- 			) {
- 				dest.o_assignment = DEFINITELY_ASSIGNMENT;
-+				debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 			}
- 			continue;
- 		}
-@@ -4154,6 +4171,7 @@ static struct pipe *parse_stream(char **
- 					heredoc_cnt = 0;
- 				}
- 				dest.o_assignment = MAYBE_ASSIGNMENT;
-+				debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 				ch = ';';
- 				/* note: if (is_blank) continue;
- 				 * will still trigger for us */
-@@ -4203,6 +4221,7 @@ static struct pipe *parse_stream(char **
- 			}
- 			done_pipe(&ctx, PIPE_SEQ);
- 			dest.o_assignment = MAYBE_ASSIGNMENT;
-+			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 			/* Do we sit outside of any if's, loops or case's? */
- 			if (!HAS_KEYWORDS
- 			 IF_HAS_KEYWORDS(|| (ctx.ctx_res_w == RES_NONE && ctx.old_flag == 0))
-@@ -4309,6 +4328,7 @@ static struct pipe *parse_stream(char **
- 			/* ch is a special char and thus this word
- 			 * cannot be an assignment */
- 			dest.o_assignment = NOT_ASSIGNMENT;
-+			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 		}
- 
- 		/* Note: nommu_addchr(&ctx.as_string, ch) is already done */
-@@ -4406,6 +4426,7 @@ static struct pipe *parse_stream(char **
- 			/* We just finished a cmd. New one may start
- 			 * with an assignment */
- 			dest.o_assignment = MAYBE_ASSIGNMENT;
-+			debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
- 			break;
- 		case '&':
- 			if (done_word(&dest, &ctx)) {

From 32a0dcea5c77719b79b04000af0125afde2ba5aa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:56:56 +0200
Subject: [PATCH 0297/6849] blackfin: support external toolchains provided by
 blackfin.uclibc.org

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++
 toolchain/toolchain-external/ext-tool.mk | 37 ++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 84e8ef83bc..1d8f561edd 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -152,6 +152,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
+	bool "Blackfin.uclinux.org 2010RC1"
+	depends on BR2_bfin
+	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_INET_RPC
+	select BR2_USE_WCHAR
+	select BR2_PROGRAM_INVOCATION
+	select BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Toolchain for the Blackfin architecture, from
+	  http://blackfin.uclinux.org.
+
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM
        bool "Custom toolchain"
        help
@@ -191,6 +206,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 9171e85b44..ef71ce04d6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -189,6 +189,11 @@ TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-g
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
+TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
+TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8386/
+TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2010R1-RC4.i386.tar.bz2
 else
 # A value must be set (even if unused), otherwise the
 # $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main
@@ -196,6 +201,37 @@ else
 TOOLCHAIN_EXTERNAL_SOURCE=none
 endif
 
+# Special handling for Blackfin toolchain, because of the split in two
+# tarballs, and the organization of tarball contents. The tarballs
+# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
+# which themselves contain the toolchain. This is why we strip more
+# components than usual.
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
+$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1),$(TOOLCHAIN_EXTERNAL_SOURCE_1))
+
+$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2),$(TOOLCHAIN_EXTERNAL_SOURCE_2))
+
+$(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
+	mkdir -p $(@D)
+	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_1))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
+	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_2))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2) | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
+ifeq ($(TOOLCHAIN_EXTERNAL_PREFIX),bfin-uclinux)
+	rm -rf $(TOOLCHAIN_EXTERNAL_DIR)/bfin-linux-uclibc
+	mv $(TOOLCHAIN_EXTERNAL_DIR)/bfin-uclinux $(TOOLCHAIN_EXTERNAL_DIR)/tmp
+	mv $(TOOLCHAIN_EXTERNAL_DIR)/tmp/* $(TOOLCHAIN_EXTERNAL_DIR)/
+	rmdir $(TOOLCHAIN_EXTERNAL_DIR)/tmp
+else
+	rm -rf $(TOOLCHAIN_EXTERNAL_DIR)/bfin-uclinux
+	mv $(TOOLCHAIN_EXTERNAL_DIR)/bfin-linux-uclibc $(TOOLCHAIN_EXTERNAL_DIR)/tmp
+	mv $(TOOLCHAIN_EXTERNAL_DIR)/tmp/* $(TOOLCHAIN_EXTERNAL_DIR)/
+	rmdir $(TOOLCHAIN_EXTERNAL_DIR)/tmp
+endif
+	$(Q)touch $@
+else
 # Download and extraction of a toolchain
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE),$(TOOLCHAIN_EXTERNAL_SOURCE))
@@ -204,6 +240,7 @@ $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 	mkdir -p $(@D)
 	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 	$(Q)touch $@
+endif
 
 # Checks for an already installed toolchain: check the toolchain
 # location, check that it supports sysroot, and then verify that it

From b9882925a438824b2e34b196cd7ef5382d1fb9cb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:56:57 +0200
Subject: [PATCH 0298/6849] toolchain: introduce
 BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS

Unfortunately, the official Blackfin toolchains are built without the
shadow password support, so our default Busybox configuration fails to
build.

Therefore, we introduce a new hidden knob
BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS, which is set to yes for Buildroot
internal toolchain, for toolchains generated by the Crosstool-NG
backend, for Glibc external toolchains and for Uclibc custom external
toolchains. It is left unset by the Blackfin toolchain profile.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in                    | 2 ++
 toolchain/toolchain-common.in          | 3 +++
 toolchain/toolchain-external/Config.in | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 8baa0c14ca..5ff2a91523 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,6 +10,7 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
@@ -20,6 +21,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	help
 	  Say 'y' if you want to generate the toolchain with crosstool-NG
 	  ( http://ymorin.is-a-geek.org/projects/crosstool )
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index a641785e64..4a2f3795b1 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -29,6 +29,9 @@ config BR2_INSTALL_LIBSTDCPP
 config BR2_TOOLCHAIN_HAS_THREADS
 	bool
 
+config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	bool
+
 config BR2_ENABLE_LOCALE_PURGE
 	bool "Purge unwanted locales"
 	help
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 1d8f561edd..04bd20745b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -220,6 +220,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_ENABLE_LOCALE
 	select BR2_PROGRAM_INVOCATION
 	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	bool
@@ -233,6 +234,9 @@ choice
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 	bool "uClibc"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	# For the time being, we assume that all custom external
+	# toolchains have shadow password support.
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
 	bool "glibc"

From 837a85e70c47fbd65a233f690a8c633de15f147c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:56:58 +0200
Subject: [PATCH 0299/6849] busybox: tune config according to
 BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 711d11b0f7..ca963c167f 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -125,6 +125,14 @@ define BUSYBOX_COPY_CONFIG
 	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
 endef
 
+# Disable shadow passwords support if unsupported by the C library
+ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),)
+define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
+	$(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
 # We do this here to avoid busting a modified .config in configure
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
@@ -138,6 +146,7 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_SET_MDEV)
 	$(BUSYBOX_NETKITBASE)
 	$(BUSYBOX_NETKITTELNET)
+	$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
 		-C $(@D) oldconfig
 endef

From 85e54a6b772ac7423286f6fa6a1a59e761edba54 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:56:59 +0200
Subject: [PATCH 0300/6849] busybox: adjust configuration for non-MMU targets

The swaponoff applet doesn't build (and doesn't make sense) on non-MMU
platforms.

The ash shell cannot build on non-MMU platforms (because it uses
fork()), so select the hush shell instead.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index ca963c167f..b77880ca7d 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -133,6 +133,14 @@ define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
 endef
 endif
 
+ifeq ($(BR2_USE_MMU),)
+define BUSYBOX_DISABLE_MMU_APPLETS
+	$(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
 # We do this here to avoid busting a modified .config in configure
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
@@ -147,6 +155,7 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_NETKITBASE)
 	$(BUSYBOX_NETKITTELNET)
 	$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
+	$(BUSYBOX_DISABLE_MMU_APPLETS)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
 		-C $(@D) oldconfig
 endef

From d6993ef3d0aa971ff8349b7c8073a22b215bec51 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:57:00 +0200
Subject: [PATCH 0301/6849] Mark some packages as not usable on non-MMU systems

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/Config.in               | 2 ++
 package/input-event-daemon/Config.in | 2 ++
 package/kbd/Config.in                | 2 ++
 package/setserial/Config.in          | 2 ++
 package/sysstat/Config.in            | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 5e60bb0d67..d387abdd91 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_GPSD
 	bool "gpsd"
+	# Uses fork()
+	depends on BR2_USE_MMU
 	help
 	  gpsd is a service daemon that monitors one or more GPSes or AIS
 	  receivers attached to a host computer through serial or USB ports,
diff --git a/package/input-event-daemon/Config.in b/package/input-event-daemon/Config.in
index edf2886095..84177fd8f2 100644
--- a/package/input-event-daemon/Config.in
+++ b/package/input-event-daemon/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_INPUT_EVENT_DAEMON
 	bool "input-event-daemon"
+	# Uses fork()
+	depends on BR2_USE_MMU
 	help
 	  input-event-daemon is a daemon which executes
 	  a user-defined command on input events, such as
diff --git a/package/kbd/Config.in b/package/kbd/Config.in
index 1fe4dff838..a23b70a81f 100644
--- a/package/kbd/Config.in
+++ b/package/kbd/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_KBD
 	bool "kbd"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	# Uses fork()
+	depends on BR2_USE_MMU
 	help
 	  Keytable files and keyboard utilities.
 
diff --git a/package/setserial/Config.in b/package/setserial/Config.in
index 2f6d6eea82..cffe50ef0e 100644
--- a/package/setserial/Config.in
+++ b/package/setserial/Config.in
@@ -1,4 +1,6 @@
 config BR2_PACKAGE_SETSERIAL
 	bool "setserial"
+	# Uses fork()
+	depends on BR2_USE_MMU
 	help
 	     Setserial : configuration of serial ports
diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in
index 28274d93e0..6e62ff1584 100644
--- a/package/sysstat/Config.in
+++ b/package/sysstat/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_SYSSTAT
 	bool "sysstat"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	# Uses fork()
+	depends on BR2_USE_MMU
 	help
           The sysstat utilities are a collection of performance
           monitoring tools for Linux. These include sar, sadf, mpstat,

From 97fafb9adc0fc8a3610fe28e8394accf96ad0a9c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:57:01 +0200
Subject: [PATCH 0302/6849] Remove unused variable definitions

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Makefile b/Makefile
index f3bdf3b800..20dd707103 100644
--- a/Makefile
+++ b/Makefile
@@ -223,16 +223,6 @@ HOST_LIBEXT:=.lib
 HOST_SHREXT:=.dll
 endif
 
-# The preferred type of libs we build for the target
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBTGTEXT=.a
-#PREFERRED_LIB_FLAGS:=--disable-shared --enable-static
-else
-LIBTGTEXT=.so
-#PREFERRED_LIB_FLAGS:=--disable-static --enable-shared
-endif
-PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
-
 ##############################################################
 #
 # The list of stuff to build for the target toolchain

From 009d8fceab4db7815502e4b0565fe0ef531d512c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:57:02 +0200
Subject: [PATCH 0303/6849] package/autotools: add
 --{enable,disable}-{shared,static} automatically

For target packages, depending on BR2_PREFER_STATIC_LIB, add the
correct combination of --{enable,disable}-{shared,static} flags to
./configure calls.

  * When BR2_PREFER_STATIC_LIB is enabled, we pass --enable-static
  --disable-shared.

  * When BR2_PREFER_STATIC_LIB is disabled, we pass --enable-static
  --enable-shared. We enable static libraries since they can still be
  useful to statically link applications against some libraries
  (sometimes it is useful for size reasons). Static libraries are
  anyway only installed in the STAGING_DIR, so it doesn't increase in
  any way the size of the TARGET_DIR.

For host packages, always pass --enable-shared and --disable-static.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 2 ++
 package/Makefile.in           | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 917600ca0b..46ab861c13 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -104,6 +104,7 @@ define $(2)_CONFIGURE_CMDS
 		$$(DISABLE_NLS) \
 		$$(DISABLE_LARGEFILE) \
 		$$(DISABLE_IPV6) \
+		$$(SHARED_STATIC_LIBS_OPTS) \
 		$$(QUIET) $$($$(PKG)_CONF_OPT) \
 	)
 endef
@@ -119,6 +120,7 @@ define $(2)_CONFIGURE_CMDS
 		./configure \
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
+		--enable-shared --disable-static \
 		$$($$(PKG)_CONF_OPT) \
 	)
 endef
diff --git a/package/Makefile.in b/package/Makefile.in
index 31a963920e..8e9637ce8d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -276,6 +276,12 @@ else
 ENABLE_DEBUG:=
 endif
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared
+else
+SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
+endif
+
 include package/Makefile.autotools.in
 include package/Makefile.cmake.in
 include package/Makefile.package.in

From 0a5e5534cbf831c575b8cc3d0155f4f440e8a0b9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 May 2011 23:57:03 +0200
Subject: [PATCH 0304/6849] packages: remove --{enable,disable}-{shared,static}
 from autotools packages

Now that those values are passed at the autotools infrastructure
level, there's no need for every package to pass inconsistent values.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk                                          | 6 +-----
 package/berkeleydb/berkeleydb.mk                            | 1 -
 package/directfb/directfb.mk                                | 4 ----
 package/expat/expat.mk                                      | 2 --
 package/fltk/fltk.mk                                        | 2 +-
 package/fuse/libfuse.mk                                     | 2 --
 package/gpsd/gpsd.mk                                        | 1 -
 package/java/classpath/classpath.mk                         | 3 +--
 package/java/jamvm/jamvm.mk                                 | 3 +--
 package/libconfuse/libconfuse.mk                            | 2 +-
 package/libdnet/libdnet.mk                                  | 2 --
 package/libelf/libelf.mk                                    | 2 +-
 package/libgail/libgail.mk                                  | 3 ---
 package/libglib2/libglib2.mk                                | 5 -----
 package/libgtk2/libgtk2.mk                                  | 4 +---
 package/libidn/libidn.mk                                    | 2 +-
 package/liblockfile/liblockfile.mk                          | 2 +-
 package/librsync/librsync.mk                                | 1 -
 package/libsoup/libsoup.mk                                  | 2 --
 package/lzo/lzo.mk                                          | 2 --
 package/multimedia/alsa-lib/alsa-lib.mk                     | 4 +---
 package/multimedia/ffmpeg/ffmpeg.mk                         | 1 -
 package/multimedia/flac/flac.mk                             | 1 -
 package/neon/neon.mk                                        | 2 +-
 package/pango/pango.mk                                      | 3 +--
 package/samba/samba.mk                                      | 2 --
 package/sqlite/sqlite.mk                                    | 4 +---
 package/tcl/tcl.mk                                          | 1 -
 package/tiff/tiff.mk                                        | 2 --
 package/tslib/tslib.mk                                      | 1 -
 package/x11r7/xapp_xman/xapp_xman.mk                        | 4 +---
 .../xdriver_xf86-video-openchrome.mk                        | 1 -
 package/x11r7/xlib_libFS/xlib_libFS.mk                      | 2 +-
 package/x11r7/xlib_libICE/xlib_libICE.mk                    | 1 -
 package/x11r7/xlib_libSM/xlib_libSM.mk                      | 2 +-
 package/x11r7/xlib_libX11/xlib_libX11.mk                    | 2 --
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk      | 2 +-
 package/x11r7/xlib_libXau/xlib_libXau.mk                    | 2 --
 package/x11r7/xlib_libXaw/xlib_libXaw.mk                    | 2 +-
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk      | 1 -
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk            | 1 -
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk            | 1 -
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                | 2 --
 package/x11r7/xlib_libXext/xlib_libXext.mk                  | 2 +-
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk              | 1 -
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                | 2 +-
 package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk      | 2 +-
 package/x11r7/xlib_libXft/xlib_libXft.mk                    | 1 -
 package/x11r7/xlib_libXi/xlib_libXi.mk                      | 2 +-
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk          | 2 +-
 package/x11r7/xlib_libXmu/xlib_libXmu.mk                    | 1 -
 package/x11r7/xlib_libXp/xlib_libXp.mk                      | 2 +-
 package/x11r7/xlib_libXpm/xlib_libXpm.mk                    | 1 -
 .../x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk    | 1 -
 package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk      | 1 -
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk              | 2 +-
 package/x11r7/xlib_libXrender/xlib_libXrender.mk            | 2 +-
 package/x11r7/xlib_libXres/xlib_libXres.mk                  | 2 +-
 package/x11r7/xlib_libXt/xlib_libXt.mk                      | 2 +-
 package/x11r7/xlib_libXtst/xlib_libXtst.mk                  | 2 --
 package/x11r7/xlib_libXv/xlib_libXv.mk                      | 2 +-
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                  | 2 +-
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk          | 2 +-
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk            | 2 +-
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                    | 2 +-
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk            | 1 -
 package/x11r7/xlib_liboldX/xlib_liboldX.mk                  | 2 +-
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk        | 1 -
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk            | 2 --
 package/x11r7/xlib_libxkbui/xlib_libxkbui.mk                | 1 -
 package/xerces/xerces.mk                                    | 3 +--
 71 files changed, 35 insertions(+), 108 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index ad95f9944b..9ea8a9094a 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -39,9 +39,7 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
 		jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
 		gl_cv_c_restrict=no ac_cv_prog_F77=no
 
-ATK_CONF_OPT =  --enable-shared \
-		--enable-static \
-		--disable-glibtest --enable-explicit-deps=no \
+ATK_CONF_OPT =  --disable-glibtest --enable-explicit-deps=no \
 		--disable-debug
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
@@ -57,8 +55,6 @@ ATK_DEPENDENCIES = libglib2 host-pkg-config
 HOST_ATK_DEPENDENCIES = host-libglib2 host-pkg-config
 
 HOST_ATK_CONF_OPT = \
-		--enable-shared \
-		--disable-static \
 		--disable-glibtest
 
 $(eval $(call AUTOTARGETS,package,atk))
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 1b9d092462..1bac745b29 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -33,7 +33,6 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-gnu-ld \
-		--enable-shared \
 		--disable-cxx \
 		--disable-java \
 		--disable-rpc \
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 98590cc716..5af65d7e34 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -11,8 +11,6 @@ DIRECTFB_AUTORECONF = YES
 DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \
-	--enable-static \
-	--enable-shared \
 	--disable-explicit-deps \
 	--program-prefix='' \
 	--enable-zlib \
@@ -123,8 +121,6 @@ endif
 
 HOST_DIRECTFB_DEPENDENCIES = host-pkg-config host-libpng
 HOST_DIRECTFB_CONF_OPT = \
-		--enable-shared \
-		--disable-static \
 		--disable-debug \
 		--disable-multi \
 		--enable-png \
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 03b13037ef..e7185e2936 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -12,8 +12,6 @@ EXPAT_INSTALL_TARGET = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
 
-EXPAT_CONF_OPT = --enable-shared
-
 EXPAT_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS,package,expat))
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index b323c59e1a..41bb6786c6 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -14,7 +14,7 @@ FLTK_INSTALL_TARGET = YES
 FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 
-FLTK_CONF_OPT = --enable-shared --enable-threads --with-x
+FLTK_CONF_OPT = --enable-threads --with-x
 
 FLTK_DEPENDENCIES = xserver_xorg-server xlib_libXt
 
diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk
index 5a86e84b00..13a5194032 100644
--- a/package/fuse/libfuse.mk
+++ b/package/fuse/libfuse.mk
@@ -10,8 +10,6 @@ LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/f
 
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_CONF_OPT= --program-prefix="" \
-		--enable-shared \
-		--enable-static \
 		--disable-nls \
 		--disable-example \
 		--disable-kernel-module \
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 60f884b3d6..b47e4d0b7b 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -7,7 +7,6 @@
 GPSD_VERSION = 2.95
 GPSD_SITE = http://download.berlios.de/gpsd
 GPSD_INSTALL_STAGING = YES
-GPSD_CONF_OPT = --disable-static
 GPSD_TARGET_BINS = cgps gpsctl gpsdecode gpsmon gpspipe gpxlogger lcdgps
 
 # Build libgpsmm if we've got C++
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 338cf016b9..5832c704bf 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -43,8 +43,7 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 CLASSPATH_CONF_OPT = \
 		--libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \
-		--infodir=/usr/info --enable-shared \
-		--enable-static \
+		--infodir=/usr/info \
 		--disable-glibtest --enable-explicit-deps=no \
 		--disable-debug \
 		--disable-gconf-peer --disable-examples --disable-plugin \
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index e7796bbc73..da999ce5e7 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -40,8 +40,7 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 JAMVM_CONF_OPT = \
 		--libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \
-		--infodir=/usr/info --enable-shared \
-		--enable-static \
+		--infodir=/usr/info \
 		--disable-glibtest --enable-explicit-deps=no \
 		--disable-debug --with-classpath-install-dir=/usr
 
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index 2665c7a0ab..03aa0bcd57 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -10,6 +10,6 @@ LIBCONFUSE_AUTORECONF:=NO
 LIBCONFUSE_INSTALL_STAGING:=YES
 LIBCONFUSE_INSTALL_TARGET:=YES
 
-LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath
+LIBCONFUSE_CONF_OPT:=--disable-rpath
 
 $(eval $(call AUTOTARGETS,package,libconfuse))
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 6dfecf90c9..649db31286 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -12,8 +12,6 @@ LIBDNET_INSTALL_TARGET = YES
 LIBDNET_AUTORECONF = YES
 LIBDNET_CONF_OPT = \
 	--with-gnu-ld \
-	--enable-shared \
-	--enable-static \
 	--with-check=no
 
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 2a7d066ac5..853b7da22c 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -14,7 +14,7 @@ LIBELD_CONF_ENV = libelf_cv_working_memmove=yes \
 		mr_cv_target_elf=yes \
 		libelf_64bit=yes
 
-LIBELF_CONF_OPT = --enable-shared --disable-sanity-checks \
+LIBELF_CONF_OPT = --disable-sanity-checks \
 		$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
 		$(if $(BR2_LARGEFILE),--enable-elf64)
 
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index 7e498f1d2b..006e0d8e3c 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -13,9 +13,6 @@ LIBGAIL_AUTORECONF = YES
 LIBGAIL_INSTALL_STAGING = YES
 LIBGAIL_INSTALL_TARGET = YES
 
-LIBGAIL_CONF_OPT = --enable-shared \
-		--enable-static
-
 ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 LIBGAIL_CONF_OPT += --disable-x
 endif
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 828af2109c..cf2665e7fd 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -44,12 +44,7 @@ LIBGLIB2_CONF_ENV =	\
 		ac_cv_func_posix_getgrgid_r=no \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
-LIBGLIB2_CONF_OPT = --enable-shared \
-		--enable-static
-
 HOST_LIBGLIB2_CONF_OPT = \
-		--enable-shared \
-		--disable-static \
 		--disable-gtk-doc \
 		--enable-debug=no \
 
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 169ef97453..33ed727b42 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -66,9 +66,7 @@ LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_prog_F77=no \
 		ac_cv_path_CUPS_CONFIG=no
 
-LIBGTK2_CONF_OPT = --enable-shared \
-		--enable-static \
-		--disable-glibtest \
+LIBGTK2_CONF_OPT = --disable-glibtest \
 		--enable-explicit-deps=no \
 		--disable-debug
 
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index cc8c08f369..7b6abbb666 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -8,7 +8,7 @@ LIBIDN_VERSION = 1.19
 LIBIDN_SITE = http://ftp.gnu.org/gnu/libidn/
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"
-LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no
+LIBIDN_CONF_OPT = --disable-java --enable-csharp=no
 LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 define LIBIDN_REMOVE_BINARY
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index bd14fafe0a..2b635658d4 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -9,7 +9,7 @@ LIBLOCKFILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libl/liblockfile/
 LIBLOCKFILE_PATCH:=liblockfile_$(LIBLOCKFILE_VERSION)-4.debian.tar.bz2
 
 LIBLOCKFILE_INSTALL_STAGING = YES
-LIBLOCKFILE_CONF_OPT = --enable-shared --mandir=/usr/share/man
+LIBLOCKFILE_CONF_OPT = --mandir=/usr/share/man
 
 define LIBLOCKFILE_INSTALL_STAGING_CMDS
 	mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3)
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index 3db4625c8d..31b1aa0af8 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -8,7 +8,6 @@ LIBRSYNC_SOURCE:=librsync-$(LIBRSYNC_VERSION).tar.gz
 LIBRSYNC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/librsync/
 LIBRSYNC_INSTALL_STAGING = YES
 LIBRSYNC_INSTALL_TARGET = YES
-LIBRSYNC_CONF_OPT = --enable-shared
 
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 132ea34a9e..6ec0882fec 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -17,8 +17,6 @@ LIBSOUP_CONF_ENV += soup_cv_ipv6=no
 endif
 
 LIBSOUP_CONF_OPT = \
-	--enable-shared		\
-	--enable-static		\
 	--disable-explicit-deps \
 	--disable-glibtest	\
 	--disable-ssl		\
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 5cbd458fb3..bfa66792db 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -6,8 +6,6 @@
 LZO_VERSION:=2.03
 LZO_SOURCE:=lzo-$(LZO_VERSION).tar.gz
 LZO_SITE:=http://www.oberhumer.com/opensource/lzo/download
-LZO_CONF_OPT = --enable-shared
-HOST_LZO_CONF_OPT = --enable-shared
 LZO_AUTORECONF = NO
 
 # lzo's configure was generated by an old autoconf, and the
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 317e78fa4a..9374037e06 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -11,9 +11,7 @@ ALSA_LIB_INSTALL_TARGET = YES
 
 ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
 
-ALSA_LIB_CONF_OPT = --enable-shared \
-		    --enable-static \
-		    --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
+ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
 		    --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
 		    --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
 		    --without-versioned
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 172bfc0f3b..babb16a3df 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -11,7 +11,6 @@ FFMPEG_INSTALL_STAGING = YES
 
 FFMPEG_CONF_OPT = \
 	--prefix=/usr		\
-	--enable-shared 	\
 	--disable-avfilter	\
 	$(if $(BR2_HAVE_DOCUMENTATION),,--disable-doc)
 
diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk
index dbaf2e9ef5..4c278b4a0f 100644
--- a/package/multimedia/flac/flac.mk
+++ b/package/multimedia/flac/flac.mk
@@ -10,7 +10,6 @@ FLAC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/flac
 FLAC_INSTALL_STAGING = YES
 
 FLAC_CONF_OPT = \
-	--enable-shared \
 	--disable-cpplibs \
 	--disable-xmms-plugin
 
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 0c237dcaf5..87eb9829d9 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -6,7 +6,7 @@
 NEON_VERSION:=0.28.3
 NEON_SITE:=http://www.webdav.org/neon/
 NEON_INSTALL_STAGING:=YES
-NEON_CONF_OPT:=--enable-shared --without-gssapi --disable-rpath
+NEON_CONF_OPT:=--without-gssapi --disable-rpath
 
 NEON_DEPENDENCIES:=host-pkg-config
 
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 1ccda5f387..5636b73df4 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,8 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 
-PANGO_CONF_OPT = --enable-shared --enable-static \
-		--enable-explicit-deps=no --disable-debug
+PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
 
 PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 cairo
 
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index f61444d372..a3bd63cb77 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -45,8 +45,6 @@ SAMBA_CONF_OPT = \
 	--with-privatedir=/etc/samba \
 	\
 	--disable-cups \
-	--disable-static \
-	--enable-shared \
 	--enable-shared-libs \
 	--disable-pie \
 	--disable-relro \
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 30e75a24fe..da5f53a261 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -16,9 +16,7 @@ ifneq ($(BR2_LARGEFILE),y)
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
 endif
 
-SQLITE_CONF_OPT =	--enable-shared \
-			--enable-static \
-			--enable-tempstore=yes \
+SQLITE_CONF_OPT =	--enable-tempstore=yes \
 			--enable-threadsafe \
 			--enable-releasemode \
 			--disable-tcl \
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index cf46811ccd..532cacfa08 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -8,7 +8,6 @@ TCL_SOURCE:=tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
 TCL_SUBDIR = unix
 TCL_CONF_OPT = \
-		--enable-shared \
 		--disable-symbols \
 		--disable-langinfo \
 		--disable-framework
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 55acf249f9..84e5a5fdc1 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -9,8 +9,6 @@ TIFF_SOURCE:=tiff-$(TIFF_VERSION).tar.gz
 TIFF_INSTALL_STAGING = YES
 TIFF_INSTALL_TARGET = YES
 TIFF_CONF_OPT = \
-	--enable-shared \
-	--enable-static \
 	--disable-cxx \
 	--without-x \
 
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index ef77dac64b..23c1f5bac4 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -11,7 +11,6 @@ TSLIB_INSTALL_TARGET = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 TSLIB_CONF_OPT = \
-	--enable-shared	\
 	--prefix=/usr	\
 	--sysconfdir=/etc
 
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index d9729d4ef0..8ef0a1fd2c 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -13,8 +13,6 @@ XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
 		ac_cv_file__etc_man_config=no \
 		ac_cv_file__etc_manpath_config=no
 
-XAPP_XMAN_CONF_OPT = --enable-shared \
-		--disable-static \
-		--disable-IPv6
+XAPP_XMAN_CONF_OPT = --disable-IPv6
 
 $(eval $(call AUTOTARGETS,package/x11r7,xapp_xman))
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 87c519378c..19d67cc6ae 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -23,6 +23,5 @@ XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
 
 
 XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_OPENCHROME_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-openchrome))
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index e7a92e63a8..f121f246ea 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -10,6 +10,6 @@ XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFS_AUTORECONF = NO
 XLIB_LIBFS_INSTALL_STAGING = YES
 XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
-XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libFS))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 99cb11b4ef..168f899f22 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -10,6 +10,5 @@ XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBICE_AUTORECONF = NO
 XLIB_LIBICE_INSTALL_STAGING = YES
 XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
-XLIB_LIBICE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libICE))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index 5aeb42d355..e22c04b5a0 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -10,6 +10,6 @@ XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBSM_AUTORECONF = NO
 XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
-XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static --without-libuuid
+XLIB_LIBSM_CONF_OPT = --without-libuuid
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libSM))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 7ecc368562..95b1483508 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -13,8 +13,6 @@ XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib
 XLIB_LIBX11_CONF_OPT = \
 	--disable-malloc0returnsnull \
 	--with-xcb \
-	--enable-shared \
-	--disable-static \
 	--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
 	--disable-specs
 
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index ee459488c7..4b60fdc50e 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -10,6 +10,6 @@ XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXSCRNSAVER_AUTORECONF = NO
 XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
 XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
-XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXScrnSaver))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index af4dde897b..2b008e9c25 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -10,10 +10,8 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_AUTORECONF = NO
 XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
-XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
 
 HOST_XLIB_LIBXAU_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
-HOST_XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau,host))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index ac8c5f8282..d06ff6ed9a 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -9,6 +9,6 @@ XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
-XLIB_LIBXAW_CONF_OPT = --enable-shared --disable-static --disable-docs
+XLIB_LIBXAW_CONF_OPT = --disable-docs
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXaw))
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index 64b98d4af0..e1a1852a56 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -10,6 +10,5 @@ XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCOMPOSITE_AUTORECONF = NO
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
 XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
-XLIB_LIBXCOMPOSITE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcomposite))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index abe823b1ec..a6bbcc8754 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -10,6 +10,5 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCURSOR_AUTORECONF = NO
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
-XLIB_LIBXCURSOR_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcursor))
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 92f92e5800..3240355932 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -10,6 +10,5 @@ XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDAMAGE_AUTORECONF = NO
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
 XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
-XLIB_LIBXDAMAGE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdamage))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 1a11ea6601..8d03fc8aef 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -10,10 +10,8 @@ XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_AUTORECONF = NO
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
-XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
 
 HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
-HOST_XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp))
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp,host))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 0db96267cd..6b60042e2f 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -10,6 +10,6 @@ XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXEXT_AUTORECONF = NO
 XLIB_LIBXEXT_INSTALL_STAGING = YES
 XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
-XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXext))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index f2fd1f8166..2d07d69570 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -10,6 +10,5 @@ XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFIXES_AUTORECONF = NO
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
-XLIB_LIBXFIXES_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfixes))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index a91999c06b..b30a88c06a 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -10,7 +10,7 @@ XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONT_AUTORECONF = YES
 XLIB_LIBXFONT_INSTALL_STAGING = YES
 XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
-XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static --disable-devel-docs
+XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 
 HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 HOST_XLIB_LIBXFONT_DEPENDENCIES = host-freetype host-xlib_libfontenc host-xlib_xtrans host-xproto_fontcacheproto host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index a0d924bfec..bf64a4dbde 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -10,6 +10,6 @@ XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONTCACHE_AUTORECONF = NO
 XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
 XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
-XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfontcache))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index eaef1ba558..942b9a62a1 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -10,6 +10,5 @@ XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
-XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXft))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index c1da9c67e7..3cca1e6b3c 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -10,6 +10,6 @@ XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXI_AUTORECONF = NO
 XLIB_LIBXI_INSTALL_STAGING = YES
 XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
-XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXi))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index 4c43e79e76..fe7c5ede7a 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -10,6 +10,6 @@ XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXINERAMA_AUTORECONF = NO
 XLIB_LIBXINERAMA_INSTALL_STAGING = YES
 XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
-XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXinerama))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index 8ad72800a1..c1c9503e6f 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -10,6 +10,5 @@ XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXMU_AUTORECONF = NO
 XLIB_LIBXMU_INSTALL_STAGING = YES
 XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
-XLIB_LIBXMU_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXmu))
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index c462eee4b8..f030082e2a 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -10,6 +10,6 @@ XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXP_AUTORECONF = NO
 XLIB_LIBXP_INSTALL_STAGING = YES
 XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
-XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXp))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 00180b45a9..459a299381 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -10,6 +10,5 @@ XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPM_AUTORECONF = NO
 XLIB_LIBXPM_INSTALL_STAGING = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
-XLIB_LIBXPM_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXpm))
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index c3d2b989b3..f98059497a 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -10,6 +10,5 @@ XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPRINTAPPUTIL_AUTORECONF = NO
 XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-XLIB_LIBXPRINTAPPUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintAppUtil))
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index 9df0153b08..ed801ff389 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -10,6 +10,5 @@ XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPRINTUTIL_AUTORECONF = NO
 XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
-XLIB_LIBXPRINTUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintUtil))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 08fbaa4ad0..20b61d1119 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -10,6 +10,6 @@ XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRANDR_AUTORECONF = NO
 XLIB_LIBXRANDR_INSTALL_STAGING = YES
 XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
-XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrandr))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index fe5acf3174..1148a6cbd7 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -10,6 +10,6 @@ XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRENDER_AUTORECONF = NO
 XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
-XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrender))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 155cbfbe64..51451a08f8 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -10,6 +10,6 @@ XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRES_AUTORECONF = NO
 XLIB_LIBXRES_INSTALL_STAGING = YES
 XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
-XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXres))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index c1cdb15160..41bf26d6f1 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -10,6 +10,6 @@ XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXT_AUTORECONF = YES
 XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
-XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static --disable-install-makestrs
+XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXt))
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index 935d034ef3..dd1cfd01ac 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -15,6 +15,4 @@ XLIB_LIBXTST_DEPENDENCIES = \
 	xlib_libXi \
 	xproto_recordproto
 
-XLIB_LIBXTST_CONF_OPT = --enable-shared --disable-static
-
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXtst))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index df47f797c8..c827938a18 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -10,6 +10,6 @@ XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXV_AUTORECONF = NO
 XLIB_LIBXV_INSTALL_STAGING = YES
 XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
-XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXv))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index aaa87a771f..e2a5aed3e9 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -10,6 +10,6 @@ XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXVMC_AUTORECONF = NO
 XLIB_LIBXVMC_INSTALL_STAGING = YES
 XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
-XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXvMC))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index e2e3d1545a..2a8ef9fbe2 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -10,6 +10,6 @@ XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86DGA_AUTORECONF = NO
 XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
 XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
-XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86dga))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index b35c492a83..a73ba6b55b 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -10,6 +10,6 @@ XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86VM_AUTORECONF = NO
 XLIB_LIBXXF86VM_INSTALL_STAGING = YES
 XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
-XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86vm))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index e7c7837e09..073005ca18 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -10,6 +10,6 @@ XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBDMX_AUTORECONF = NO
 XLIB_LIBDMX_INSTALL_STAGING = YES
 XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
-XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libdmx))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index a2ba2d79cc..c2ce11f105 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -10,7 +10,6 @@ XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFONTENC_AUTORECONF = NO
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
-XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static
 
 HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
 
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 2e6d53f3e1..94a38fabef 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -10,6 +10,6 @@ XLIB_LIBOLDX_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBOLDX_AUTORECONF = NO
 XLIB_LIBOLDX_INSTALL_STAGING = YES
 XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
-XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_liboldX))
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index c42f35da8b..5929a62fd6 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -8,6 +8,5 @@ XLIB_LIBPCIACCESS_VERSION = 0.11.0
 XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
-XLIB_LIBPCIACCESS_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index e71b36b83a..96420c3a37 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -10,10 +10,8 @@ XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBFILE_AUTORECONF = NO
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
-XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
 
 HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
-HOST_XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile))
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile,host))
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index 31e87e7d4f..8253ac59d8 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -10,6 +10,5 @@ XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBUI_AUTORECONF = NO
 XLIB_LIBXKBUI_INSTALL_STAGING = YES
 XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
-XLIB_LIBXKBUI_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbui))
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index ffd874bf0b..305fee336e 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -8,8 +8,7 @@ XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.gz
 XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources/
 XERCES_MAKE = $(MAKE1)
 XERCES_INSTALL_STAGING = YES
-XERCES_CONF_OPT = --enable-shared \
-		  --disable-threads \
+XERCES_CONF_OPT = --disable-threads \
 		  --with-gnu-ld
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)

From 3790e3ceed72f13767cdc41f8c05188d487c3a5e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 Jun 2011 08:49:00 +0200
Subject: [PATCH 0305/6849] synergy: ensure cross X11 headers / libraries are
 used

Otherwise configure would check for Xtst support on the host.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/synergy/synergy.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index ce3f2141a7..d56bd3e8f3 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -7,9 +7,8 @@
 SYNERGY_VERSION = 1.3.1
 SYNERGY_SOURCE = synergy-$(SYNERGY_VERSION).tar.gz
 SYNERGY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/synergy2/
-SYNERGY_AUTORECONF = NO
-SYNERGY_INSTALL_STAGING = NO
-SYNERGY_INSTALL_TARGET = YES
+SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+                   --x-libraries=$(STAGING_DIR)/usr/lib
 
 SYNERGY_DEPENDENCIES = xserver_xorg-server xlib_libXtst
 

From 587863b039d3e9f1daabcada723450d633333473 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 17 Jun 2011 09:10:29 +0200
Subject: [PATCH 0306/6849] bmon: link dynamically unless explicitly requested
 otherwise

Commit 009d8fceab4d (add --{enable,disable}-{shared,static} automatically)
caused us to pass --enable-static in the normal (non-static) case as well,
which bmon interpretes as a request to link the bmon program statically,
bloating the image.

Fix it by passing an extra --disable-static to bmon configure to nullify
this.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bmon/bmon.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index e9b10b0147..97d4b0231e 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -9,6 +9,11 @@ BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
 BMON_SITE = http://distfiles.gentoo.org/distfiles
 BMON_DEPENDENCIES = ncurses
 
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+# link dynamically unless explicitly requested otherwise
+BMON_CONF_OPT += --disable-static
+endif
+
 define BMON_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/bmon
 endef

From 6533b1e362e3514c29e32f1c5bb46df693423fc2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 17 Jun 2011 09:15:42 +0200
Subject: [PATCH 0307/6849] bmon: make ncurses dependency optional

bmon can be built without ncurses support (needs a small patch though),
so don't enforce it in kconfig.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bmon/Config.in         |  1 -
 package/bmon/bmon-curses.patch | 26 ++++++++++++++++++++++++++
 package/bmon/bmon.mk           |  7 ++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 package/bmon/bmon-curses.patch

diff --git a/package/bmon/Config.in b/package/bmon/Config.in
index 667788bc0a..9692118005 100644
--- a/package/bmon/Config.in
+++ b/package/bmon/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_BMON
 	bool "bmon"
 	depends on BR2_INET_IPV6
-	select BR2_PACKAGE_NCURSES
 	help
 	  Linux bandwidth monitor
 
diff --git a/package/bmon/bmon-curses.patch b/package/bmon/bmon-curses.patch
new file mode 100644
index 0000000000..0eb164e323
--- /dev/null
+++ b/package/bmon/bmon-curses.patch
@@ -0,0 +1,26 @@
+[PATCH] fix build without curses
+
+bmon supports a --disable-curses configure option, but still #error
+out if curses wasn't detected, even though the rest of the code is
+written to work without curses support.
+
+Fix it by removing the bogus #error line.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/bmon/config.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: bmon-2.1.0/include/bmon/config.h
+===================================================================
+--- bmon-2.1.0.orig/include/bmon/config.h
++++ bmon-2.1.0/include/bmon/config.h
+@@ -118,8 +118,6 @@
+ #  endif /* !HAVE_CURSES */
+ #elif defined HAVE_CURSES
+ #  include <curses.h>
+-#else
+-#  error "*** ERROR: Neither ncurses nor curses is present on your system. ***"
+ #endif /* HAVE_[N]CURSES */
+ 
+ #if defined HAVE_RRD
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index 97d4b0231e..aa097fbe02 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -7,7 +7,12 @@
 BMON_VERSION = 2.1.0
 BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
 BMON_SITE = http://distfiles.gentoo.org/distfiles
-BMON_DEPENDENCIES = ncurses
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+BMON_DEPENDENCIES += ncurses
+else
+BMON_CONF_OPT += --disable-curses
+endif
 
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 # link dynamically unless explicitly requested otherwise

From 85aed3e325e953025426fdde0447359ab7a4c8a6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 17 Jun 2011 09:17:16 +0200
Subject: [PATCH 0308/6849] bmon: add optional alsa support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bmon/bmon.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index aa097fbe02..ef2dcf0481 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -14,6 +14,12 @@ else
 BMON_CONF_OPT += --disable-curses
 endif
 
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+BMON_DEPENDENCIES += alsa-lib
+else
+BMON_CONF_OPT += --disable-asound
+endif
+
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 # link dynamically unless explicitly requested otherwise
 BMON_CONF_OPT += --disable-static

From 377b2785c136e7439ac4f4a6e4509bc5c9fe3015 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 31 May 2011 18:16:34 +0200
Subject: [PATCH 0309/6849] Qt: add config option to build libQtDeclarative
 module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 7 +++++++
 package/qt/qt.mk     | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 4a3945c82b..214f140904 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -378,4 +378,11 @@ config BR2_PACKAGE_QT_SCRIPTTOOLS
 	  Build the Qt Script Tools module.
 	  if unsure, say n.
 
+config BR2_PACKAGE_QT_DECLARATIVE
+	bool "Declarative module"
+	depends on BR2_PACKAGE_QT_GUI_MODULE
+	help
+	  Build the Qt Declarative Module for qml support
+	  if unsure, say n.
+
 endif # BR2_PACKAGE_QT
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 8bcbd3fef8..e8b7a49641 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -398,6 +398,12 @@ else
 QT_CONFIGURE_OPTS += -no-stl
 endif
 
+ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
+QT_CONFIGURE_OPTS += -declarative
+else
+QT_CONFIGURE_OPTS += -no-declarative
+endif
+
 # ccache and precompiled headers don't play well together
 ifeq ($(BR2_CCACHE),y)
 QT_CONFIGURE_OPTS += -no-pch
@@ -535,6 +541,9 @@ endif
 ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
 QT_INSTALL_LIBS    += QtScriptTools
 endif
+ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
+QT_INSTALL_LIBS    += QtDeclarative
+endif
 ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
 QT_INSTALL_LIBS    += Qt3Support
 endif

From 21438ec500ca0962fa0f2572a6212786674d5e32 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 00:01:34 +0200
Subject: [PATCH 0310/6849] libdnet: fix python module build

Ensure the correct compiler/linker flags are used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdnet/libdnet-002-python-makefile.patch | 12 +++++++++---
 package/libdnet/libdnet.mk                        |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/libdnet/libdnet-002-python-makefile.patch b/package/libdnet/libdnet-002-python-makefile.patch
index 4c8729ddcd..fb41e43e35 100644
--- a/package/libdnet/libdnet-002-python-makefile.patch
+++ b/package/libdnet/libdnet-002-python-makefile.patch
@@ -1,10 +1,16 @@
---- a/python/Makefile.am	2006-01-15 18:08:23.000000000 +1100
-+++ b/python/Makefile.am	2008-09-04 15:25:52.000000000 +1000
+---
+ python/Makefile.am |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: libdnet-1.11/python/Makefile.am
+===================================================================
+--- libdnet-1.11.orig/python/Makefile.am
++++ libdnet-1.11/python/Makefile.am
 @@ -11,6 +11,7 @@
  	pyrexc $(srcdir)/dnet.pyx
  
  python-build: $(srcdir)/dnet.c
-+	CC="$(CC)" LDSHARED="$(CC) -shared" $(PYTHON) setup.py build_ext -I$(PYINCDIR)
++	CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR)
  	$(PYTHON) setup.py build
  	touch python-build
  
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 649db31286..ae4c9ff16d 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -17,7 +17,7 @@ LIBDNET_CONF_OPT = \
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
 LIBDNET_DEPENDENCIES = python
 LIBDNET_CONF_OPT += --with-python
-LIBDNET_MAKE_OPT = PYTHON=python$(PYTHON_VERSION_MAJOR) PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+LIBDNET_MAKE_OPT = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
 LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
 LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
 endif

From 3c9dbb3c680d15fb143db3df8ce6795eff675a9c Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Mon, 30 May 2011 20:24:38 +0200
Subject: [PATCH 0311/6849] packages: dbus: use version 1.4.8

The exisiting br2 patch can be dropped.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dbus-1.2.12-launch-helper-xml-fix.patch   | 33 -------------------
 package/dbus/dbus.mk                          |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch

diff --git a/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch b/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch
deleted file mode 100644
index bf6b4ae6b1..0000000000
--- a/package/dbus/dbus-1.2.12-launch-helper-xml-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-dbus-daemon-launch-helper: fix build with libxml
-
-dbus-daemon-launch-helper links with the trival config parser, which
-doesn't provide bus_config_parser_check_doctype(), like the big parser does.
-The libxml loader unfortunately wants to call it, so this breaks the build.
-
-Fix it by including a dummy bus_config_parser_check_doctype() in the trivial
-config parser.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- bus/config-parser-trivial.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: dbus-1.2.12/bus/config-parser-trivial.c
-===================================================================
---- dbus-1.2.12.orig/bus/config-parser-trivial.c
-+++ dbus-1.2.12/bus/config-parser-trivial.c
-@@ -310,6 +310,14 @@
-   return &parser->service_dirs;
- }
- 
-+dbus_bool_t
-+bus_config_parser_check_doctype (BusConfigParser   *parser,
-+                                 const char        *doctype,
-+                                 DBusError         *error)
-+{
-+    return TRUE;
-+}
-+
- #ifdef DBUS_BUILD_TESTS
- #include <stdio.h>
- #include "test.h"
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 153e72b721..7d75ca821f 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,7 +3,7 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.2.24
+DBUS_VERSION = 1.4.8
 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES

From 7a5d51cbdf49c69641f1cedfeb76ecbffe578e9f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 11:34:49 +0200
Subject: [PATCH 0312/6849] dbus-glib: nowadays works with libxml2 backend as
 well

So get rid of expat dependency.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus-glib/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index c019be73b2..f1dab43924 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_DBUS_GLIB
 	bool "dbus-glib"
 	depends on BR2_PACKAGE_DBUS
-	depends on BR2_DBUS_EXPAT
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
@@ -9,8 +8,5 @@ config BR2_PACKAGE_DBUS_GLIB
 
 	  http://www.freedesktop.org/software/dbus
 
-comment "dbus-glib needs dbus to be compiled with expat support"
-	depends on BR2_PACKAGE_DBUS && !BR2_DBUS_EXPAT
-
 comment "dbus-glib requires a toolchain with WCHAR support"
 	depends on BR2_PACKAGE_DBUS && !BR2_USE_WCHAR

From 619b26d4ef012655bf9c64526d9eb14990bd712b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 11:39:37 +0200
Subject: [PATCH 0313/6849] dbus: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 7d75ca821f..7c2bdddb86 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,7 +3,7 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.4.8
+DBUS_VERSION = 1.4.10
 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES

From e46df26e11a790da253de2d4c8ae99b4768b684a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 21 Jun 2011 11:55:14 +0200
Subject: [PATCH 0314/6849] usbutils: bump to 003

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index a034ddcd29..1ddadbeecb 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USBUTILS_VERSION = 002
+USBUTILS_VERSION = 003
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkg-config libusb
 USBUTILS_INSTALL_STAGING = YES

From 0a78829e0a0d781a95a040435e22ec0d155c59ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 13:15:04 +0200
Subject: [PATCH 0315/6849] qt: QtDeclarative needs script support as well

Otherwise configure errors out with:

Error: QtDeclarative was requested, but it can't be built due to
QtScript or QtGui being disabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 214f140904..ab231d9bd0 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -380,6 +380,7 @@ config BR2_PACKAGE_QT_SCRIPTTOOLS
 
 config BR2_PACKAGE_QT_DECLARATIVE
 	bool "Declarative module"
+	depends on BR2_PACKAGE_QT_SCRIPT
 	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  Build the Qt Declarative Module for qml support

From 97a429667eb6b09f027099b850003703a47ccff5 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 20 Jun 2011 17:59:54 +0200
Subject: [PATCH 0316/6849] ffmpeg: fix build of shared libraries

009d8fceab4 and 0a5e5534cbf8 moved the --enable-static configure flag
from package files to the default _CONFIGURE_CMDS in
package/Makefile.autotools.in.
This broke Autotools packages that override _CONFIGURE_CMDS.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index babb16a3df..b50503b05c 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -167,6 +167,7 @@ define FFMPEG_CONFIGURE_CMDS
 		--arch=$(BR2_ARCH) \
 		--target-os=linux \
 		--extra-cflags=-fPIC \
+		$(SHARED_STATIC_LIBS_OPTS) \
 		$(FFMPEG_CONF_OPT) \
 	)
 endef

From b1d02f73146731ce1f14ee81a2e92e3f8ab4d317 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 20 Jun 2011 17:59:55 +0200
Subject: [PATCH 0317/6849] berkeleydb: fix build of shared libraries

009d8fceab4 and 0a5e5534cbf8 moved the --enable-static configure flag
from package files to the default _CONFIGURE_CMDS in
package/Makefile.autotools.in.
This broke Autotools packages that override _CONFIGURE_CMDS.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 1bac745b29..e80f66f60f 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -38,6 +38,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--disable-rpc \
 		--disable-tcl \
 		--disable-compat185 \
+		$(SHARED_STATIC_LIBS_OPTS) \
 		--with-pic \
 	)
 	$(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile

From 353ebfd0b10caf48a9e7d446860f98507936a426 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 13:46:34 +0200
Subject: [PATCH 0318/6849] berkeleydb: target install cleanup

Install into /usr/lib and use the normal make install target instead of
manually messing around with symlinks and .so versions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index e80f66f60f..eb20ba9ca6 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -4,10 +4,8 @@
 #
 #############################################################
 BERKELEYDB_VERSION:=4.4.20
-BERKELEYDB_SO_VERSION:=4.4
 BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
-BERKELEYDB_SHARLIB:=libdb-$(BERKELEYDB_SO_VERSION).so
 BERKELEYDB_SUBDIR=build_unix
 BERKELEYDB_INSTALL_STAGING = YES
 
@@ -24,7 +22,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
-		--libdir=/lib \
+		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
@@ -44,20 +42,14 @@ define BERKELEYDB_CONFIGURE_CMDS
 	$(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile
 endef
 
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define BERKELEYDB_INSTALL_TARGET_DEVFILES_CMDS
-	cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/
-	cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/
-endef
-endif
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 
-define BERKELEYDB_INSTALL_TARGET_CMDS
-	rm -rf $(TARGET_DIR)/lib/libdb*
-	cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/
-	rm -f $(addprefix $(TARGET_DIR)/lib/,libdb.so libdb.la libdb.a)
-	(cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(BERKELEYDB_SHARLIB) libdb.so)
-	$(BERKELEYDB_INSTALL_TARGET_DEVFILES_CMDS)
+define BERKELEYDB_REMOVE_DOCS
+	rm -rf $(TARGET_DIR)/usr/docs
 endef
 
+BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
+
+endif
+
 $(eval $(call AUTOTARGETS,package,berkeleydb))

From a9f637383d1c4fc5161494460a0ce2d04f9066a9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 17:12:45 +0200
Subject: [PATCH 0319/6849] package: add yajl

yajl is Yet Another JSON Library.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  3 ++-
 package/yajl/Config.in |  8 ++++++++
 package/yajl/yajl.mk   | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 package/yajl/Config.in
 create mode 100644 package/yajl/yajl.mk

diff --git a/package/Config.in b/package/Config.in
index 10d435c178..85d50ec83f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -354,13 +354,14 @@ source "package/readline/Config.in"
 source "package/slang/Config.in"
 endmenu
 
-menu "XML"
+menu "JSON/XML"
 source "package/expat/Config.in"
 source "package/ezxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/xerces/Config.in"
+source "package/yajl/Config.in"
 endmenu
 
 endmenu
diff --git a/package/yajl/Config.in b/package/yajl/Config.in
new file mode 100644
index 0000000000..be2c133f43
--- /dev/null
+++ b/package/yajl/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_YAJL
+	bool "yajl"
+	help
+	  Yet Another JSON Library. YAJL is a small event-driven
+	  (SAX-style) JSON parser written in ANSI C, and a small
+	  validating JSON generator.
+
+	  http://lloyd.github.com/yajl/
diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk
new file mode 100644
index 0000000000..e67a7dadfe
--- /dev/null
+++ b/package/yajl/yajl.mk
@@ -0,0 +1,11 @@
+################################################################################
+#
+# yajl
+#
+################################################################################
+
+YAJL_VERSION = 2.0.2
+YAJL_SITE = git://github.com/lloyd/yajl.git
+YAJL_INSTALL_STAGING = YES
+
+$(eval $(call CMAKETARGETS,package,yajl))

From da7d572897b82b8ae2044e64835895233844f66c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 21 Jun 2011 23:20:42 +0200
Subject: [PATCH 0320/6849] configs: add defconfig for sheevaplug

http://en.wikipedia.org/wiki/SheevaPlug

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/sheevaplug_defconfig | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 configs/sheevaplug_defconfig

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
new file mode 100644
index 0000000000..757e1f5b37
--- /dev/null
+++ b/configs/sheevaplug_defconfig
@@ -0,0 +1,24 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# system
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+
+# filesystem
+BR2_TARGET_ROOTFS_JFFS2=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="sheevaplug"
+BR2_TARGET_UBOOT_FORMAT_KWB=y
+# BR2_TARGET_UBOOT_NETWORK is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.1"
+BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
+BR2_LINUX_KERNEL_UIMAGE=y

From e8c46b118b011c766511c44fa9232e074ad6bcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Nystr=C3=B6m?= <daniel.nystrom@timeterminal.se>
Date: Tue, 21 Jun 2011 21:54:27 +0200
Subject: [PATCH 0321/6849] ext-toolchain-wrapper.c: Handle an arbitrary amount
 of arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Even though MAXARGS 1000 seems large, it wasn't enough for at least
QtWebKit package. This new version does not have any predefined limits.

Closes #3907

Many thanks to Thomas for tracing the source of the build error.

[Peter: Return rather than abort()]
Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Reported-by: Thomas Björk <thomas.bjork@home.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../ext-toolchain-wrapper.c                   | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index a485e740d0..3e23061610 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -4,6 +4,7 @@
  * to ensure the external toolchain uses the correct configuration.
  *
  * (C) 2011 Peter Korsgaard <jacmet@sunsite.dk>
+ * (C) 2011 Daniel Nyström <daniel.nystrom@timeterminal.se>
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
@@ -14,12 +15,11 @@
 #include <string.h>
 #include <limits.h>
 #include <unistd.h>
-
-#define MAXARGS 1000
+#include <stdlib.h>
 
 static char path[PATH_MAX] = BR_CROSS_PATH;
 
-static char *args[MAXARGS] = {
+static char *predef_args[] = {
 	path,
 	"--sysroot", BR_SYSROOT,
 #ifdef BR_ARCH
@@ -54,22 +54,31 @@ static const char *get_basename(const char *name)
 
 int main(int argc, char **argv)
 {
-	int i;
-
-	for (i=0; args[i]; i++);
+	char **args, **cur;
 
-	if ((argc+i) >= MAXARGS) {
-		fputs("Too many arguments\n", stderr);
-		return 1;
+	cur = args = malloc(sizeof(predef_args) + (sizeof(char *) * argc));
+	if (args == NULL) {
+		perror(__FILE__ ": malloc");
+		return 2;
 	}
 
-	/* forward args */
-	memcpy(&args[i], &argv[1], sizeof(argv[0]) * (argc - 1));
+	/* start with predefined args */
+	memcpy(cur, predef_args, sizeof(predef_args));
+	cur += sizeof(predef_args) / sizeof(predef_args[0]);
+
+	/* append forward args */
+	memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));
+	cur += argc - 1;
+
+	/* finish with NULL termination */
+	*cur = NULL;
 
 	strcat(path, get_basename(argv[0]));
 
 	if (execv(path, args))
 		perror(path);
 
+	free(args);
+
 	return 2;
 }

From 489692fcde8477ac7b949d32a424bded815b360c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 22 Jun 2011 17:08:55 +0200
Subject: [PATCH 0322/6849] yajl: fix link issue on uClibc

We need to link with -lm for isnan() / isinf().

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/yajl/yajl-2.0.2-math-link.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/yajl/yajl-2.0.2-math-link.patch

diff --git a/package/yajl/yajl-2.0.2-math-link.patch b/package/yajl/yajl-2.0.2-math-link.patch
new file mode 100644
index 0000000000..355a24856f
--- /dev/null
+++ b/package/yajl/yajl-2.0.2-math-link.patch
@@ -0,0 +1,24 @@
+[PATCH] fix json_reformat linking on uClibc
+
+json_reformat calls yajl_gen_* functions, which internally use isnan() /
+isinf(). On Glibc, these are provided by libc, but on uClibc you need to
+link with -lm (like the spec says), so ensure we do so.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ reformatter/CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: yajl-2.0.2/reformatter/CMakeLists.txt
+===================================================================
+--- yajl-2.0.2.orig/reformatter/CMakeLists.txt
++++ yajl-2.0.2/reformatter/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ 
+ ADD_EXECUTABLE(json_reformat ${SRCS})
+ 
+-TARGET_LINK_LIBRARIES(json_reformat yajl_s)
++TARGET_LINK_LIBRARIES(json_reformat yajl_s m)
+ 
+ # copy the binary into the output directory
+ GET_TARGET_PROPERTY(binPath json_reformat LOCATION)

From 417df559ad1781829d5d57405d7379059e158f04 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 22 Jun 2011 21:58:46 +0200
Subject: [PATCH 0323/6849] qt: update pthread_getattr_np patches for uClibc
 0.9.32

And only when linuxthreads.old is used, as the other thread implementations
don't need it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-4.7.3-pthread_getattr_np.patch        | 7 ++++---
 package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package/qt/qt-4.7.3-pthread_getattr_np.patch b/package/qt/qt-4.7.3-pthread_getattr_np.patch
index 5cbd7d2038..4b20bb2320 100644
--- a/package/qt/qt-4.7.3-pthread_getattr_np.patch
+++ b/package/qt/qt-4.7.3-pthread_getattr_np.patch
@@ -5,7 +5,7 @@ Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webki
 Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
 --- qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	2010-02-11 16:55:20.000000000 +0100
 +++ qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	2010-05-23 10:49:29.000000000 +0200
-@@ -75,6 +75,22 @@
+@@ -75,6 +75,23 @@
  #endif
  #include <unistd.h>
  
@@ -14,11 +14,12 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
 +#endif
 +
 +#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.31 and below do not have
++// versions of uClibc 0.9.32 and below with linuxthreads.old do not have
 +// pthread_getattr_np or pthread_attr_getstack.
 +#if __UCLIBC_MAJOR__ == 0 && \
 +    (__UCLIBC_MINOR__ < 9 || \
-+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
++    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \
++    defined(__LINUXTHREADS_OLD__)
 +#define UCLIBC_USE_PROC_SELF_MAPS 1
 +#include <stdio_ext.h>
 +extern int *__libc_stack_end;
diff --git a/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
index e2bc18843e..dc078adbd6 100644
--- a/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
+++ b/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
@@ -1,15 +1,16 @@
 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-09-10 11:05:22.000000000 +0200
 +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-11-15 16:39:53.000000000 +0100
-@@ -70,6 +70,18 @@
+@@ -70,6 +70,19 @@
  #endif
  #include <unistd.h>
 
 +#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.31 and below do not have
++// versions of uClibc 0.9.32 with linuxthreads.old and below do not have
 +// pthread_getattr_np or pthread_attr_getstack.
 +#if __UCLIBC_MAJOR__ == 0 && \
 +    (__UCLIBC_MINOR__ < 9 || \
-+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
++    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) &&
++    defined(__LINUXTHREADS_OLD__)
 +#define UCLIBC_USE_PROC_SELF_MAPS 1
 +#include <stdio_ext.h>
 +extern int* __libc_stack_end;

From ec61799c338f939adc9ca830fdab6cb07bd1c1cd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 24 Jun 2011 11:06:35 +0200
Subject: [PATCH 0324/6849] webkit: update pthread_getattr_np patches for
 uClibc 0.9.32

Similar to how it is done for qt.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit-pthread_getattr_np.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/webkit/webkit-pthread_getattr_np.patch b/package/webkit/webkit-pthread_getattr_np.patch
index b71c8789e6..8027e37060 100644
--- a/package/webkit/webkit-pthread_getattr_np.patch
+++ b/package/webkit/webkit-pthread_getattr_np.patch
@@ -13,16 +13,17 @@ Index: webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp
 ===================================================================
 --- webkit-1.2.3.orig/JavaScriptCore/runtime/Collector.cpp	2010-07-22 17:16:19.000000000 +0200
 +++ webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp	2010-07-22 17:25:02.000000000 +0200
-@@ -75,6 +75,18 @@
+@@ -75,6 +75,19 @@
  #endif
  #include <unistd.h>
  
 +#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.31 and below do not have
++// versions of uClibc 0.9.32 and below with linuxthreads.old do not have
 +// pthread_getattr_np or pthread_attr_getstack.
 +#if __UCLIBC_MAJOR__ == 0 &&					\
 +  (__UCLIBC_MINOR__ < 9 ||					\
-+   (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
++   (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) &&	\
++   defined(__LINUXTHREADS_OLD__)
 +#define UCLIBC_USE_PROC_SELF_MAPS 1
 +#include <stdio_ext.h>
 +extern int *__libc_stack_end;

From b72b806f364a49688c478d849b6da6d01f47fbcf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 24 Jun 2011 11:33:42 +0200
Subject: [PATCH 0325/6849] kernel-headers: bump 2.6.39.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 4c551a2412..2a5cf5c290 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -50,6 +50,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
-	default "2.6.39.1"	if BR2_KERNEL_HEADERS_2_6_39
+	default "2.6.39.2"	if BR2_KERNEL_HEADERS_2_6_39
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From d7a4ffa77d5f6957789455acb0cd801100b6d35d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 24 Jun 2011 11:34:24 +0200
Subject: [PATCH 0326/6849] linux: bump 2.6.39.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index e461a536e4..1f1a69c44e 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_39
 
 config BR2_LINUX_KERNEL_2_6_39
-	bool "2.6.39.1"
+	bool "2.6.39.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.39.1"
+	default "2.6.39.2"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.39.1" if BR2_LINUX_KERNEL_2_6_39
+	default "2.6.39.2" if BR2_LINUX_KERNEL_2_6_39
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From b93c609f118aa8e7c9c0b489f5f124507bdaf6e2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 24 Jun 2011 11:34:48 +0200
Subject: [PATCH 0327/6849] sheevaplug_defconfig: bump kernel version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/sheevaplug_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 757e1f5b37..305aadd5af 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -19,6 +19,6 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.2"
 BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
 BR2_LINUX_KERNEL_UIMAGE=y

From f7fcfbfa9d1e571672877da8d85f838329713825 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 Jun 2011 09:12:52 +0200
Subject: [PATCH 0328/6849] mtd: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index a957441e33..78ab7659c7 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION:=1.4.4
+MTD_VERSION:=1.4.5
 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

From 86885771d445daf47003aee6b2a9325dc62299ba Mon Sep 17 00:00:00 2001
From: Mike Williams <mwilli60@harris.com>
Date: Wed, 11 May 2011 16:19:56 -0400
Subject: [PATCH 0329/6849] package: Added Live555 RTSP Server package

[Peter: misc fixes, use real version, correct compile/link flags]
Signed-off-by: Mike Williams <mwilli60@harris.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in          |  1 +
 package/multimedia/live555/Config.in  | 33 ++++++++++++++++++
 package/multimedia/live555/live555.mk | 48 +++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 package/multimedia/live555/Config.in
 create mode 100644 package/multimedia/live555/live555.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index b3d1e073a7..79c601c572 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -31,6 +31,7 @@ source "package/multimedia/libsamplerate/Config.in"
 source "package/multimedia/libsndfile/Config.in"
 source "package/multimedia/libtheora/Config.in"
 source "package/multimedia/libvorbis/Config.in"
+source "package/multimedia/live555/Config.in"
 source "package/multimedia/madplay/Config.in"
 source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
diff --git a/package/multimedia/live555/Config.in b/package/multimedia/live555/Config.in
new file mode 100644
index 0000000000..610fafc1a8
--- /dev/null
+++ b/package/multimedia/live555/Config.in
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_LIVE555
+	bool "live555"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  LIVE555 Streaming Media forms a set of C++ libraries for multimedia
+	  streaming, using open standard protocols (RTP/RTCP, RTSP, SIP).
+
+	  http://www.live555.com/liveMedia/
+
+config BR2_PACKAGE_LIVE555_OPENRTSP
+	bool "OpenRTSP"
+	depends on BR2_PACKAGE_LIVE555
+	default y
+	help
+	  Live555 RTSP Client.
+
+config BR2_PACKAGE_LIVE555_MEDIASERVER
+	bool "live555MediaServer"
+	depends on BR2_PACKAGE_LIVE555
+	default y
+	help
+	  RTSP Server. Supports numerous media formats such as H.264 and MPEG2.
+
+config BR2_PACKAGE_LIVE555_MPEG2_INDEXER
+	bool "MPEG2TransportStreamIndexer"
+	depends on BR2_PACKAGE_LIVE555
+	default y
+	help
+	  MPEG2 Transport Stream Indexer. Provides indexes allowing 'trick play'
+	  operation in the Live555MediaServer.
+
+comment "Live555 needs C++ compiler"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
new file mode 100644
index 0000000000..45a037582a
--- /dev/null
+++ b/package/multimedia/live555/live555.mk
@@ -0,0 +1,48 @@
+#############################################################
+#
+# live555 streaming media
+#
+#############################################################
+
+LIVE555_VERSION = 2011.06.16
+LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
+LIVE555_SITE = http://www.live555.com/liveMedia/public/
+LIVE555_INSTALL_TARGET = YES
+
+define LIVE555_CONFIGURE_CMDS
+	echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(TARGET_CFLAGS)' >> $(@D)/config.linux
+	echo 'C_COMPILER = $(TARGET_CC)' >> $(@D)/config.linux
+	echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux
+	echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux
+	echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux
+	(cd $(@D); ./genMakefiles linux)
+endef
+
+define LIVE555_BUILD_CMDS
+	$(MAKE) -C $(@D) all
+endef
+
+define LIVE555_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+LIVE555_FILES_TO_INSTALL- =
+LIVE555_FILES_TO_INSTALL-y =
+LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP
+LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live555MediaServer
+LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer
+LIVE555_FILES_TO_INSTALL- += $(LIVE555_FILES_TO_INSTALL-y)
+
+define LIVE555_INSTALL_TARGET_CMDS
+	for i in $(LIVE555_FILES_TO_INSTALL-y); do \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i`; \
+	done
+endef
+
+define LIVE555_UNINSTALL_TARGET_CMDS
+	for i in $(LIVE555_FILES_TO_INSTALL-); do \
+		rm -f $(addprefix $(TARGET_DIR)/usr/bin/, `basename $$i`); \
+	done
+endef
+
+$(eval $(call GENTARGETS,package/multimedia,live555))

From 94ad0667ded7dd4c5c7c44df329f9eabe46314bd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 Jun 2011 23:07:01 +0200
Subject: [PATCH 0330/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGES b/CHANGES
index a10fa18f82..341959003a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,20 @@
 2011.08, Not released yet:
 
+	Fixes all over the tree and new features.
+
+	Toolchain: uClibc 0.9.32 / NPTL support, ext-toolchain-wrapper
+	improvements, improved non-MMU support.
+
+	Updated/fixed packages: berkeleydb, bmon, busybox, dbus,
+	dbus-glib, ethtool, ffmpeg, gst-plugins-bad, libdnet,
+	libmpeg2, mtd-utils, qt, sudo, synergy, usbutils, webkit
+
+	New packages: live555, sredird, statserial, yajl
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#3907: 2011.05 - Qt 4.7.3 not building on ARM
+
 2011.05, Released May 27th, 2011:
 
 	Updated/fixed packages: makedevs

From 001949a1e0aafc6d5dec384f20ccd9059142f774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Mauduit?= <benoit.mauduit@gmail.com>
Date: Sun, 15 May 2011 10:50:49 +0200
Subject: [PATCH 0331/6849] oprofile: Bump to version 0.9.6

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/oprofile/oprofile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 42bf0e2571..4522cda487 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -3,7 +3,7 @@
 # oprofile
 #
 #############################################################
-OPROFILE_VERSION := 0.9.4
+OPROFILE_VERSION := 0.9.6
 OPROFILE_CONF_OPT :=	--localstatedir=/var \
 			--with-kernel-support
 

From 24d498dadf35db72a1a8d173c071def9b0c66361 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Wed, 18 May 2011 18:08:27 +0200
Subject: [PATCH 0332/6849] package: Add libiqrf package

Libiqrf is library written in C which implement specific iqrf
protocol to communicate with iqrf usb devices (http://iqrf.org).

[Peter: select libusb, fix Config.in indentation]
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libiqrf/Config.in  | 10 ++++++++++
 package/libiqrf/libiqrf.mk | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/libiqrf/Config.in
 create mode 100644 package/libiqrf/libiqrf.mk

diff --git a/package/Config.in b/package/Config.in
index 85d50ec83f..8f1f030ebc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -299,6 +299,7 @@ source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
 source "package/libhid/Config.in"
+source "package/libiqrf/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/python-serial/Config.in"
diff --git a/package/libiqrf/Config.in b/package/libiqrf/Config.in
new file mode 100644
index 0000000000..aa25010979
--- /dev/null
+++ b/package/libiqrf/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBIQRF
+	bool "libiqrf"
+	select BR2_PACKAGE_LIBUSB
+	help
+	  This library implement specific protocol
+	  which is used for communicating with iqrf devices
+	  (http://iqrf.org) over usb. For usb access is used
+	  libusb library.
+
+	  https://github.com/nandra/libiqrf
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
new file mode 100644
index 0000000000..e3c4bb1da2
--- /dev/null
+++ b/package/libiqrf/libiqrf.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libiqrf library
+#
+#############################################################
+
+LIBIQRF_VERSION = v0.1.0
+LIBIQRF_SITE = git://github.com/nandra/libiqrf.git
+LIBIQRF_INSTALL_STAGING = YES
+
+LIBIQRF_DEPENDENCIES = libusb
+
+$(eval $(call AUTOTARGETS,package,libiqrf))
+

From 36f8b40d22ce68155744124d75489dc15b5ff34c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 27 Jun 2011 10:28:00 +0200
Subject: [PATCH 0333/6849] qt: fix typo in webkit pthread_getattr_np patch

Missing continuation (\) character in #if check.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
index dc078adbd6..934c332f47 100644
--- a/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
+++ b/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
@@ -9,7 +9,7 @@
 +// pthread_getattr_np or pthread_attr_getstack.
 +#if __UCLIBC_MAJOR__ == 0 && \
 +    (__UCLIBC_MINOR__ < 9 || \
-+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) &&
++    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \
 +    defined(__LINUXTHREADS_OLD__)
 +#define UCLIBC_USE_PROC_SELF_MAPS 1
 +#include <stdio_ext.h>

From 7e4d47593850851d6fcaa6068258c16cc8761ab5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 27 Jun 2011 11:56:11 +0200
Subject: [PATCH 0334/6849] qt: fix webkit/sqlite build without largefile
 support

The embedded sqlite module forces FILE_OFFSET_BITS=64 unless
SQLITE_DISABLE_LFS is defined, breaking the build for !largefile toolchains.
Webkit internally builds sqlite, so that's affected as well.

Fix it by passing -DSQLITE_DISABLE_LFS in C/CXXFLAGS for !largefile
builds, similar to how we do it for the standalone sqlite package.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e8b7a49641..ff67058c43 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -28,10 +28,21 @@ ifneq ($(QT_CONFIG_FILE),)
 QT_CONFIGURE_OPTS += -config buildroot
 endif
 
+QT_CFLAGS = $(TARGET_CFLAGS)
+QT_CXXFLAGS = $(TARGET_CXXFLAGS)
+
 ifeq ($(BR2_LARGEFILE),y)
 QT_CONFIGURE_OPTS += -largefile
 else
 QT_CONFIGURE_OPTS += -no-largefile
+
+# embedded sqlite module forces FILE_OFFSET_BITS=64 unless this is defined
+# webkit internally uses this module as well
+ifneq ($(BR2_PACKAGE_QT_SQLITE_QT)$(BR2_PACKAGE_QT_WEBKIT),)
+QT_CFLAGS += -DSQLITE_DISABLE_LFS
+QT_CXXFLAGS += -DSQLITE_DISABLE_LFS
+endif
+
 endif
 
 ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
@@ -465,8 +476,8 @@ define QT_CONFIGURE_CMDS
 	$(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY),$(@D))
 	$(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB),$(@D))
 	$(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP),$(@D))
-	$(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS),$(@D))
-	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS),$(@D))
+	$(call QT_QMAKE_SET,CFLAGS,$(QT_CFLAGS),$(@D))
+	$(call QT_QMAKE_SET,CXXFLAGS,$(QT_CXXFLAGS),$(@D))
 	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS),$(@D))
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.

From ca71de8ea71c8579a2e3d58867b9a52f5581f7b5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 28 Jun 2011 15:13:59 +0200
Subject: [PATCH 0335/6849] toolchain/gcc: bump 4.3.x version to 4.3.6

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.3.5 => 4.3.6}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.3.5 => 4.3.6}/104-gnuhurd-uclibc-conf.patch    | 0
 toolchain/gcc/{4.3.5 => 4.3.6}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.3.5 => 4.3.6}/302-c99-snprintf.patch           | 0
 .../gcc/{4.3.5 => 4.3.6}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.3.5 => 4.3.6}/810-arm-softfloat-libgcc.patch   | 0
 .../{4.3.5 => 4.3.6}/993-arm_insn-opinit-RTX_CODE-fixup.patch   | 0
 .../gcc/{4.3.5 => 4.3.6}/998-gcc-4.3.0-fix-header.00.patch      | 0
 .../gcc/{4.3.5 => 4.3.6}/999-4.3.2-armeabi-aapcs-linux.patch    | 0
 .../gcc/{4.3.5 => 4.3.6}/999-4.3.3-arm-fix-for-bug-37436.patch  | 0
 .../999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch         | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/104-gnuhurd-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/993-arm_insn-opinit-RTX_CODE-fixup.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/998-gcc-4.3.0-fix-header.00.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/999-4.3.2-armeabi-aapcs-linux.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/999-4.3.3-arm-fix-for-bug-37436.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch (100%)
 rename toolchain/gcc/{4.3.5 => 4.3.6}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.3.5/100-uclibc-conf.patch b/toolchain/gcc/4.3.6/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/100-uclibc-conf.patch
rename to toolchain/gcc/4.3.6/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.3.5/104-gnuhurd-uclibc-conf.patch b/toolchain/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/104-gnuhurd-uclibc-conf.patch
rename to toolchain/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch
diff --git a/toolchain/gcc/4.3.5/301-missing-execinfo_h.patch b/toolchain/gcc/4.3.6/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.3.6/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.3.5/302-c99-snprintf.patch b/toolchain/gcc/4.3.6/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/302-c99-snprintf.patch
rename to toolchain/gcc/4.3.6/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.3.5/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.3.6/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.3.6/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.3.5/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.3.6/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.3.6/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.3.5/993-arm_insn-opinit-RTX_CODE-fixup.patch b/toolchain/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/993-arm_insn-opinit-RTX_CODE-fixup.patch
rename to toolchain/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch
diff --git a/toolchain/gcc/4.3.5/998-gcc-4.3.0-fix-header.00.patch b/toolchain/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/998-gcc-4.3.0-fix-header.00.patch
rename to toolchain/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch
diff --git a/toolchain/gcc/4.3.5/999-4.3.2-armeabi-aapcs-linux.patch b/toolchain/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/999-4.3.2-armeabi-aapcs-linux.patch
rename to toolchain/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch
diff --git a/toolchain/gcc/4.3.5/999-4.3.3-arm-fix-for-bug-37436.patch b/toolchain/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/999-4.3.3-arm-fix-for-bug-37436.patch
rename to toolchain/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch
diff --git a/toolchain/gcc/4.3.5/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch b/toolchain/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch
similarity index 100%
rename from toolchain/gcc/4.3.5/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch
rename to toolchain/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch
diff --git a/toolchain/gcc/4.3.5/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.3.5/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f11c80fab2..da16bdfef1 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -61,7 +61,7 @@ config BR2_GCC_VERSION
 	string
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
-	default "4.3.5"     if BR2_GCC_VERSION_4_3_X
+	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.0"     if BR2_GCC_VERSION_4_6_X

From c80224a3a05e41af5a32e1c663fd3853f313382b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 28 Jun 2011 15:19:13 +0200
Subject: [PATCH 0336/6849] toolchain/gcc: bump 4.6.x version to 4.6.1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.6.0 => 4.6.1}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.6.0 => 4.6.1}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.6.0 => 4.6.1}/302-c99-snprintf.patch           | 0
 .../gcc/{4.6.0 => 4.6.1}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.6.0 => 4.6.1}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.6.0 => 4.6.1}/820-arm-unbreak-armv4t.patch     | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/820-arm-unbreak-armv4t.patch (100%)
 rename toolchain/gcc/{4.6.0 => 4.6.1}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.6.0/100-uclibc-conf.patch b/toolchain/gcc/4.6.1/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.6.0/100-uclibc-conf.patch
rename to toolchain/gcc/4.6.1/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.6.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.6.1/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.6.0/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.6.1/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.6.0/302-c99-snprintf.patch b/toolchain/gcc/4.6.1/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.6.0/302-c99-snprintf.patch
rename to toolchain/gcc/4.6.1/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.6.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.6.1/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.6.0/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.6.1/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.6.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.6.1/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.6.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.6.1/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.6.0/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.6.1/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.6.0/820-arm-unbreak-armv4t.patch
rename to toolchain/gcc/4.6.1/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.6.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.6.1/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.6.0/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.6.1/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index da16bdfef1..cfc7aec1b5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -64,7 +64,7 @@ config BR2_GCC_VERSION
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
-	default "4.6.0"     if BR2_GCC_VERSION_4_6_X
+	default "4.6.1"     if BR2_GCC_VERSION_4_6_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

From 49d359ff7b62f83c5525208437cd2bf12af73aff Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 29 Jun 2011 14:47:50 +0200
Subject: [PATCH 0337/6849] sqlite: update to version 3.7.6.3

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index da5f53a261..de2e499fcb 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3070500
+SQLITE_VERSION = 3070603
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From 22fde22e35f98f7830c2f8955465532328348cd1 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 Jun 2011 15:46:16 +0200
Subject: [PATCH 0338/6849] Create and mount /dev/shm

The /dev/shm directory is neither created nor mounted as tmpfs as boot
time. This will cause troubles when using named semaphores on the
system.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/fstab   | 1 +
 fs/skeleton/etc/inittab | 1 +
 2 files changed, 2 insertions(+)

diff --git a/fs/skeleton/etc/fstab b/fs/skeleton/etc/fstab
index 87d9da08ee..a2f56ffa65 100644
--- a/fs/skeleton/etc/fstab
+++ b/fs/skeleton/etc/fstab
@@ -4,5 +4,6 @@
 /dev/root       /              ext2	rw,noauto         0      1
 proc		/proc	       proc     defaults	  0	 0
 devpts		/dev/pts       devpts   defaults,gid=5,mode=620	  0	 0
+tmpfs           /dev/shm       tmpfs    mode=0777         0      0
 tmpfs           /tmp           tmpfs    defaults          0      0
 sysfs		/sys	       sysfs    defaults	  0	 0
diff --git a/fs/skeleton/etc/inittab b/fs/skeleton/etc/inittab
index b1e5c164e6..0e504679b0 100644
--- a/fs/skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
@@ -17,6 +17,7 @@
 null::sysinit:/bin/mount -t proc proc /proc
 null::sysinit:/bin/mount -o remount,rw /
 null::sysinit:/bin/mkdir -p /dev/pts
+null::sysinit:/bin/mkdir -p /dev/shm
 null::sysinit:/bin/mount -a
 null::sysinit:/bin/hostname -F /etc/hostname
 # now run any rc scripts

From 266c5cdaeb1c27fec4b72b43200162b30bf356da Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 Jun 2011 15:46:17 +0200
Subject: [PATCH 0339/6849] package: add stunnel

Stunnel is an SSL tunnelling proxy.

[Peter: misc fixes, Config.in, allow skeleton override of stunnel.conf]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/stunnel/Config.in  |  8 ++++++++
 package/stunnel/S50stunnel | 36 ++++++++++++++++++++++++++++++++++++
 package/stunnel/stunnel.mk | 25 +++++++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 package/stunnel/Config.in
 create mode 100644 package/stunnel/S50stunnel
 create mode 100644 package/stunnel/stunnel.mk

diff --git a/package/Config.in b/package/Config.in
index 8f1f030ebc..1a4815adc6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -441,6 +441,7 @@ source "package/ser2net/Config.in"
 source "package/socat/Config.in"
 source "package/spawn-fcgi/Config.in"
 source "package/squid/Config.in"
+source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
 source "package/tcpreplay/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/stunnel/Config.in b/package/stunnel/Config.in
new file mode 100644
index 0000000000..b1977ed175
--- /dev/null
+++ b/package/stunnel/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_STUNNEL
+	bool "stunnel"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Stunnel is a program that wraps any TCP connection with an SSL
+	  connection.
+
+	  http://www.stunnel.org/
diff --git a/package/stunnel/S50stunnel b/package/stunnel/S50stunnel
new file mode 100644
index 0000000000..5033e96375
--- /dev/null
+++ b/package/stunnel/S50stunnel
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Starts stunnel
+#
+
+start() {
+	echo -n "Starting stunnel: "
+	start-stop-daemon -S -q -p /var/run/stunnel.pid --exec /usr/bin/stunnel
+	echo "OK"
+}
+stop() {
+	echo -n "Stopping stunnel: "
+	start-stop-daemon -K -q -p /var/run/stunnel.pid
+	echo "OK"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
new file mode 100644
index 0000000000..9b31fd2ee5
--- /dev/null
+++ b/package/stunnel/stunnel.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# stunnel
+#
+#############################################################
+
+STUNNEL_VERSION = 4.36
+STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/obsolete/4.x/
+STUNNEL_DEPENDENCIES = openssl
+
+STUNNEL_CONF_OPT += \
+	--with-ssl=$(STAGING_DIR)/usr \
+	--with-threads=fork
+
+define STUNNEL_INSTALL_CONF_SCRIPT
+	$(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel
+	[ -f $(TARGET_DIR)/etc/stunnel/stunnel.conf ] || \
+		$(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \
+			$(TARGET_DIR)/etc/stunnel/stunnel.conf
+	rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample
+endef
+
+STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF_SCRIPT
+
+$(eval $(call AUTOTARGETS,package,stunnel))

From 90cdd7d925553c63fff3e208e8fd4a4e178603cf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Jul 2011 22:41:20 +0200
Subject: [PATCH 0340/6849] lighttpd: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/lighttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 332afe7a1b..45941eb0c4 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIGHTTPD_VERSION = 1.4.28
+LIGHTTPD_VERSION = 1.4.29
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_DEPENDENCIES = host-pkg-config
 LIGHTTPD_CONF_OPT = \

From f1e4aac40ec1271aae5c056243cdc9e2b0b6f2bf Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 Jun 2011 15:46:18 +0200
Subject: [PATCH 0341/6849] busybox: remove quirk for old unsupported versions

This code is no longer useful, since the oldest version supported by
Builroot is 1.16.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b77880ca7d..034801ec5e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -49,17 +49,6 @@ define BUSYBOX_SET_SYSKLOGD
 endef
 endif
 
-# id applet breaks on >=1.13.0 with old uclibc unless the bb pwd routines are used
-ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_BUSYBOX_VERSION_1_14_X)$(BR2_UCLIBC_VERSION_0_9_29),yy)
-define BUSYBOX_SET_BB_PWD
-	if grep -q 'CONFIG_ID=y' $(BUSYBOX_BUILD_CONFIG); \
-	then \
-		echo 'warning: CONFIG_ID needs BB_PWD_GRP with old uclibc, enabling' >&2;\
-		$(SED) "s/^.*CONFIG_USE_BB_PWD_GRP.*/CONFIG_USE_BB_PWD_GRP=y/;" $(BUSYBOX_BUILD_CONFIG); \
-	fi
-endef
-endif
-
 ifeq ($(BR2_LARGEFILE),y)
 define BUSYBOX_SET_LARGEFILE
 	$(call KCONFIG_ENABLE_OPT,CONFIG_LFS,$(BUSYBOX_BUILD_CONFIG))

From 31f5268b3dff62bc414b719c556b61923a4601b0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jul 2011 10:15:37 +0200
Subject: [PATCH 0342/6849] toolchain/uClibc: remove 0.9.29, mark 0.9.30 as
 deprecated

0.9.29 doesn't seem to build anymore with the toolchain versions in BR
and is very old, so remove it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |   8 +-
 .../uClibc/uClibc-0.9.29-001-fix-mmap.patch   |  91 ----
 ...bc-0.9.29-conditional-sched_affinity.patch |  53 ---
 ....29-filter-gnu99-from-assembly-flags.patch |  12 -
 .../uClibc/uClibc-0.9.29-fix-fget_putc.diff   | 396 ------------------
 ...9.29-fix-gethostent_r-failure-retval.patch |  12 -
 ....29-fix-internal_function-definition.patch |  51 ---
 .../uClibc/uClibc-0.9.29-linuxthreads.patch   | 145 -------
 .../uClibc/uClibc-0.9.29-rm-whitespace.patch  |  86 ----
 toolchain/uClibc/uClibc-0.9.29.config         | 207 ---------
 10 files changed, 1 insertion(+), 1060 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-001-fix-mmap.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-conditional-sched_affinity.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-filter-gnu99-from-assembly-flags.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-fix-fget_putc.diff
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-fix-gethostent_r-failure-retval.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-fix-internal_function-definition.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-linuxthreads.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29-rm-whitespace.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.29.config

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 7f0f87519b..16b2be415f 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -9,12 +9,8 @@ choice
 	help
 	  Select the version of uClibc you wish to use.
 
-	config BR2_UCLIBC_VERSION_0_9_29
-		depends on !BR2_avr32
-		depends on BR2_DEPRECATED
-		bool "uClibc 0.9.29"
-
 	config BR2_UCLIBC_VERSION_0_9_30
+		depends on BR2_DEPRECATED
 		bool "uClibc 0.9.30.x"
 
 	config BR2_UCLIBC_VERSION_0_9_31
@@ -37,7 +33,6 @@ config BR2_USE_UCLIBC_SNAPSHOT
 
 config BR2_UCLIBC_VERSION_STRING
 	string
-	default 0.9.29		if BR2_UCLIBC_VERSION_0_9_29
 	default 0.9.30.3	if BR2_UCLIBC_VERSION_0_9_30
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32		if BR2_UCLIBC_VERSION_0_9_32
@@ -45,7 +40,6 @@ config BR2_UCLIBC_VERSION_STRING
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
-	default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29
 	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30
 	default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31
 	default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
diff --git a/toolchain/uClibc/uClibc-0.9.29-001-fix-mmap.patch b/toolchain/uClibc/uClibc-0.9.29-001-fix-mmap.patch
deleted file mode 100644
index 4775e8c332..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-001-fix-mmap.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- uClibc-0.9.29.oorig/test/mmap/mmap2.c	(revision 0)
-+++ uClibc-0.9.29/test/mmap/mmap2.c	(revision 18616)
-@@ -0,0 +1,41 @@
-+/* When trying to map /dev/mem with offset 0xFFFFF000 on the ARM platform, mmap
-+ * returns -EOVERFLOW.
-+ *
-+ * Since off_t is defined as a long int and the sign bit is set in the address,
-+ * the shift operation shifts in ones instead of zeroes
-+ * from the left. This results the offset sent to the kernel function becomes
-+ * 0xFFFFFFFF instead of 0x000FFFFF with MMAP2_PAGE_SHIFT set to 12.
-+ */
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/mman.h>
-+
-+#define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \
-+  __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0)
-+
-+#define MAP_SIZE 4096UL
-+#define MAP_MASK (MAP_SIZE - 1)
-+
-+int main(int argc, char **argv) {
-+    void* map_base = 0;
-+    int fd;
-+    off_t target = 0xfffff000;
-+    if((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1) FATAL;
-+    printf("/dev/mem opened.\n");
-+    fflush(stdout);
-+
-+   /* Map one page */
-+    map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
-+                        fd, target & ~MAP_MASK);
-+    if(map_base == (void *) -1) FATAL;
-+    printf("Memory mapped at address %p.\n", map_base);
-+    fflush(stdout);
-+    if(munmap(map_base, MAP_SIZE) == -1) FATAL;
-+    close(fd);
-+    return 0;
-+}
---- uClibc-0.9.29.oorig/libc/sysdeps/linux/arm/mmap.c	(revision 18615)
-+++ uClibc-0.9.29/libc/sysdeps/linux/arm/mmap.c	(revision 18616)
-@@ -27,7 +27,6 @@ __ptr_t mmap(__ptr_t addr, size_t len, i
- 
- #elif defined  (__NR_mmap2)
- #define __NR__mmap __NR_mmap2
--
- #ifndef MMAP2_PAGE_SHIFT
- # define MMAP2_PAGE_SHIFT 12
- #endif
-@@ -39,9 +38,17 @@ __ptr_t mmap(__ptr_t addr, size_t len, i
- {
-   /* check if offset is page aligned */
-     if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
-+    {
-+        __set_errno(EINVAL);
-         return MAP_FAILED;
-+    }
-+#ifdef __USE_FILE_OFFSET64
-+  return (__ptr_t) _mmap (addr, len, prot, flags,
-+						  fd,((__u_quad_t) offset >> MMAP2_PAGE_SHIFT));
-+#else
-   return (__ptr_t) _mmap (addr, len, prot, flags,
--						  fd,(off_t) (offset >> MMAP2_PAGE_SHIFT));
-+                          fd,((__u_long) offset >> MMAP2_PAGE_SHIFT));
-+#endif
- }
- #elif defined (__NR_mmap)
- # define __NR__mmap __NR_mmap
---- uClibc-0.9.29.oorig/libc/sysdeps/linux/common/mmap64.c	(revision 18615)
-+++ uClibc-0.9.29/libc/sysdeps/linux/common/mmap64.c	(revision 18616)
-@@ -58,8 +58,13 @@ __ptr_t mmap64(__ptr_t addr, size_t len,
- 		__set_errno(EINVAL);
- 		return MAP_FAILED;
- 	}
--
--	return __syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT));
-+#ifdef __USE_FILE_OFFSET64
-+  return __syscall_mmap2(addr, len, prot, flags,
-+                         fd,((__u_quad_t)offset >> MMAP2_PAGE_SHIFT));
-+#else
-+   return __syscall_mmap2(addr, len, prot, flags,
-+                          fd,((__u_long)offset >> MMAP2_PAGE_SHIFT));
-+#endif
- }
- 
- # endif
diff --git a/toolchain/uClibc/uClibc-0.9.29-conditional-sched_affinity.patch b/toolchain/uClibc/uClibc-0.9.29-conditional-sched_affinity.patch
deleted file mode 100644
index 509c42af52..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-conditional-sched_affinity.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_getaffinity.c uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_getaffinity.c
---- uClibc-0.9.29/libc/sysdeps/linux/common/sched_getaffinity.c	2007-02-12 16:52:32.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_getaffinity.c	2007-05-09 18:05:09.397411811 -0500
-@@ -29,6 +29,7 @@
- #include <sys/param.h>
- #include <sys/types.h>
- 
-+#ifdef __NR_sched_getaffinity
- libc_hidden_proto(memset)
- 
- #define __NR___syscall_sched_getaffinity __NR_sched_getaffinity
-@@ -48,5 +49,15 @@
- 	}
- 	return res;
- }
-+#else
-+/*
-+int sched_getaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *cpuset)
-+{
-+	__set_errno(ENOSYS);
-+	return -1;
-+}
-+*/
- #endif
- #endif
-+
-+#endif
-diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_setaffinity.c uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_setaffinity.c
---- uClibc-0.9.29/libc/sysdeps/linux/common/sched_setaffinity.c	2007-02-12 16:52:32.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_setaffinity.c	2007-05-09 18:05:09.397411811 -0500
-@@ -31,6 +31,7 @@
- #include <sys/types.h>
- #include <alloca.h>
- 
-+#ifdef __NR_sched_setaffinity
- libc_hidden_proto(getpid)
- 
- #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity
-@@ -74,5 +75,14 @@
- 
- 	return INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
- }
-+#else
-+/*
-+int sched_setaffinity(pid_t pid, size_t cpusetsize, const cpu_set_t *cpuset)
-+{
-+	__set_errno(ENOSYS);
-+	return -1;
-+}
-+*/
-+#endif
- #endif
- #endif
diff --git a/toolchain/uClibc/uClibc-0.9.29-filter-gnu99-from-assembly-flags.patch b/toolchain/uClibc/uClibc-0.9.29-filter-gnu99-from-assembly-flags.patch
deleted file mode 100644
index d1a7e3ac41..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-filter-gnu99-from-assembly-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur uClibc-0.9.29/Makerules uClibc-0.9.29-patched/Makerules
---- uClibc-0.9.29/Makerules	2006-12-10 18:25:23.000000000 -0600
-+++ uClibc-0.9.29-patched/Makerules	2008-01-26 17:04:50.965699518 -0600
-@@ -96,7 +96,7 @@
- disp_ld        = $($(DISP)_disp_ld)
- 
- cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(^D)))) $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))
--cmd_compile.S = $(cmd_compile.c) -D__ASSEMBLER__ $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
-+cmd_compile.S = $(filter-out -std=gnu99, $(cmd_compile.c)) -D__ASSEMBLER__ $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
- cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
- cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@))
- cmd_strip     = $(STRIPTOOL) $(STRIP_FLAGS) $^
diff --git a/toolchain/uClibc/uClibc-0.9.29-fix-fget_putc.diff b/toolchain/uClibc/uClibc-0.9.29-fix-fget_putc.diff
deleted file mode 100644
index 15d61490b3..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-fix-fget_putc.diff
+++ /dev/null
@@ -1,396 +0,0 @@
-diff -ur uClibc-0.9.29/libc/inet/rpc/rcmd.c uClibc-0.9.29-patched/libc/inet/rpc/rcmd.c
---- uClibc-0.9.29/libc/inet/rpc/rcmd.c	2007-01-10 11:46:19.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/inet/rpc/rcmd.c	2007-05-09 18:05:21.638421151 -0500
-@@ -126,7 +126,7 @@
- libc_hidden_proto(listen)
- libc_hidden_proto(sigsetmask)
- libc_hidden_proto(getc_unlocked)
--libc_hidden_proto(__fgetc_unlocked)
-+//libc_hidden_proto(fgetc_unlocked)
- libc_hidden_proto(fopen)
- libc_hidden_proto(fclose)
- libc_hidden_proto(fprintf)
-diff -ur uClibc-0.9.29/libc/inet/rpc/ruserpass.c uClibc-0.9.29-patched/libc/inet/rpc/ruserpass.c
---- uClibc-0.9.29/libc/inet/rpc/ruserpass.c	2006-03-23 05:14:16.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/inet/rpc/ruserpass.c	2007-05-09 18:05:21.638421151 -0500
-@@ -63,7 +63,7 @@
- libc_hidden_proto(fopen)
- libc_hidden_proto(fclose)
- libc_hidden_proto(getc_unlocked)
--libc_hidden_proto(__fgetc_unlocked)
-+//libc_hidden_proto(__fgetc_unlocked)
- 
- #define _(X)  (X)
- /* #include "ftp_var.h" */
-diff -ur uClibc-0.9.29/libc/misc/error/error.c uClibc-0.9.29-patched/libc/misc/error/error.c
---- uClibc-0.9.29/libc/misc/error/error.c	2006-05-04 09:44:13.000000000 -0500
-+++ uClibc-0.9.29-patched/libc/misc/error/error.c	2007-05-09 18:05:21.646421810 -0500
-@@ -30,11 +30,14 @@
- libc_hidden_proto(strerror)
- libc_hidden_proto(fprintf)
- libc_hidden_proto(exit)
-+//#undef putc
- libc_hidden_proto(putc)
-+libc_hidden_proto(fputc)
- libc_hidden_proto(vfprintf)
- libc_hidden_proto(fflush)
--libc_hidden_proto(fputc)
--libc_hidden_proto(__fputc_unlocked)
-+//#ifdef __UCLIBC_HAS_STDIO_PUTC_MACRO__
-+libc_hidden_proto(fputc_unlocked)
-+//#endif
- 
- /* This variable is incremented each time `error' is called.  */
- unsigned int error_message_count = 0;
-diff -ur uClibc-0.9.29/libc/misc/ttyent/getttyent.c uClibc-0.9.29-patched/libc/misc/ttyent/getttyent.c
---- uClibc-0.9.29/libc/misc/ttyent/getttyent.c	2006-12-07 17:24:02.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/misc/ttyent/getttyent.c	2007-05-09 18:05:21.646421810 -0500
-@@ -44,8 +44,10 @@
- libc_hidden_proto(__fsetlocking)
- libc_hidden_proto(rewind)
- libc_hidden_proto(fgets_unlocked)
-+//#undef getc_unlocked
- libc_hidden_proto(getc_unlocked)
--libc_hidden_proto(__fgetc_unlocked)
-+//#undef fgetc_unlocked
-+libc_hidden_proto(fgetc_unlocked)
- libc_hidden_proto(fopen)
- libc_hidden_proto(fclose)
- libc_hidden_proto(abort)
-diff -ur uClibc-0.9.29/libc/pwd_grp/pwd_grp.c uClibc-0.9.29-patched/libc/pwd_grp/pwd_grp.c
---- uClibc-0.9.29/libc/pwd_grp/pwd_grp.c	2007-04-13 03:32:18.000000000 -0500
-+++ uClibc-0.9.29-patched/libc/pwd_grp/pwd_grp.c	2007-05-09 18:05:21.638421151 -0500
-@@ -43,11 +43,12 @@
- libc_hidden_proto(strtoul)
- libc_hidden_proto(rewind)
- libc_hidden_proto(fgets_unlocked)
--libc_hidden_proto(__fputc_unlocked)
- libc_hidden_proto(sprintf)
- libc_hidden_proto(fopen)
- libc_hidden_proto(fclose)
- libc_hidden_proto(fprintf)
-+//#undef fputc_unlocked
-+libc_hidden_proto(fputc_unlocked)
- #ifdef __UCLIBC_HAS_XLOCALE__
- libc_hidden_proto(__ctype_b_loc)
- #elif __UCLIBC_HAS_CTYPE_TABLES__
-@@ -801,7 +802,7 @@
- 
- 			do {
- 				if (!*m) {
--					if (__fputc_unlocked('\n', f) >= 0) {
-+					if (fputc_unlocked('\n', f) >= 0) {
- 						rv = 0;
- 					}
- 					break;
-@@ -867,7 +868,7 @@
- 		goto DO_UNLOCK;
- 	}
- 
--	if (__fputc_unlocked('\n', stream) > 0) {
-+	if (fputc_unlocked('\n', stream) > 0) {
- 		rv = 0;
- 	}
- 
-diff -ur uClibc-0.9.29/libc/stdio/_scanf.c uClibc-0.9.29-patched/libc/stdio/_scanf.c
---- uClibc-0.9.29/libc/stdio/_scanf.c	2007-01-20 12:32:10.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/_scanf.c	2007-05-09 18:05:21.642421481 -0500
-@@ -86,7 +86,8 @@
- libc_hidden_proto(vsscanf)
- libc_hidden_proto(fclose)
- libc_hidden_proto(getc_unlocked)
--libc_hidden_proto(__fgetc_unlocked)
-+//#undef fgetc_unlocked
-+libc_hidden_proto(fgetc_unlocked)
- #ifdef __UCLIBC_HAS_WCHAR__
- libc_hidden_proto(wcslen)
- libc_hidden_proto(vfwscanf)
-diff -ur uClibc-0.9.29/libc/stdio/fgetc.c uClibc-0.9.29-patched/libc/stdio/fgetc.c
---- uClibc-0.9.29/libc/stdio/fgetc.c	2006-01-15 16:41:03.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/fgetc.c	2007-05-09 18:05:21.642421481 -0500
-@@ -13,13 +13,13 @@
- #undef getc
- #undef getc_unlocked
- 
--libc_hidden_proto(__fgetc_unlocked)
-+libc_hidden_proto(fgetc_unlocked)
- 
- #ifdef __DO_UNLOCKED
- 
- libc_hidden_proto(fflush_unlocked)
- 
--int __fgetc_unlocked(FILE *stream)
-+int fgetc_unlocked(FILE *stream)
- {
- 	__STDIO_STREAM_VALIDATE(stream);
- 
-@@ -73,26 +73,22 @@
- 
- 	return EOF;
- }
--libc_hidden_def(__fgetc_unlocked)
--
--libc_hidden_proto(fgetc_unlocked)
--strong_alias(__fgetc_unlocked,fgetc_unlocked)
- libc_hidden_def(fgetc_unlocked)
- 
- //libc_hidden_proto(__getc_unlocked)
--//strong_alias(__fgetc_unlocked,__getc_unlocked)
-+//strong_alias(fgetc_unlocked,__getc_unlocked)
- //libc_hidden_def(__getc_unlocked)
- 
- libc_hidden_proto(getc_unlocked)
--strong_alias(__fgetc_unlocked,getc_unlocked)
-+strong_alias(fgetc_unlocked,getc_unlocked)
- libc_hidden_def(getc_unlocked)
- 
- #ifndef __UCLIBC_HAS_THREADS__
- libc_hidden_proto(fgetc)
--strong_alias(__fgetc_unlocked,fgetc)
-+strong_alias(fgetc_unlocked,fgetc)
- libc_hidden_def(fgetc)
- 
--strong_alias(__fgetc_unlocked,getc)
-+strong_alias(fgetc_unlocked,getc)
- #endif
- 
- #elif defined __UCLIBC_HAS_THREADS__
-diff -ur uClibc-0.9.29/libc/stdio/fgets.c uClibc-0.9.29-patched/libc/stdio/fgets.c
---- uClibc-0.9.29/libc/stdio/fgets.c	2006-01-15 16:41:03.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/fgets.c	2007-05-09 18:05:21.638421151 -0500
-@@ -10,8 +10,7 @@
- libc_hidden_proto(fgets_unlocked)
- 
- #ifdef __DO_UNLOCKED
--
--libc_hidden_proto(__fgetc_unlocked)
-+libc_hidden_proto(fgetc_unlocked)
- 
- char *fgets_unlocked(char *__restrict s, int n,
- 					   register FILE * __restrict stream)
-@@ -38,7 +37,7 @@
- 				break;
- 			}
- 		} else {
--			if ((c = __fgetc_unlocked(stream)) == EOF) {
-+			if ((c = fgetc_unlocked(stream)) == EOF) {
- 				if (__FERROR_UNLOCKED(stream)) {
- 					goto ERROR;
- 				}
-diff -ur uClibc-0.9.29/libc/stdio/fputc.c uClibc-0.9.29-patched/libc/stdio/fputc.c
---- uClibc-0.9.29/libc/stdio/fputc.c	2007-04-14 12:03:18.000000000 -0500
-+++ uClibc-0.9.29-patched/libc/stdio/fputc.c	2007-05-09 20:50:51.350629927 -0500
-@@ -16,7 +16,7 @@
- 
- #ifdef __DO_UNLOCKED
- 
--int __fputc_unlocked(int c, register FILE *stream)
-+int fputc_unlocked(int c, register FILE *stream)
- {
- 	__STDIO_STREAM_VALIDATE(stream);
- 
-@@ -70,22 +70,22 @@
-  BAD:
- 	return EOF;
- }
--libc_hidden_def(__fputc_unlocked)
-+libc_hidden_def(fputc_unlocked)
- 
- /* exposing these would be fundamentally *wrong*! fix you, instead! */
- /* libc_hidden_proto(fputc_unlocked) */
--strong_alias(__fputc_unlocked,fputc_unlocked)
-+/* strong_alias(__fputc_unlocked,fputc_unlocked) */
- /* exposing these would be fundamentally *wrong*! fix you, instead! */
- /* libc_hidden_def(fputc_unlocked) */
- 
- libc_hidden_proto(putc_unlocked)
--strong_alias(__fputc_unlocked,putc_unlocked)
-+strong_alias(fputc_unlocked,putc_unlocked)
- libc_hidden_def(putc_unlocked)
- #ifndef __UCLIBC_HAS_THREADS__
--strong_alias(__fputc_unlocked,fputc)
-+strong_alias(fputc_unlocked,fputc)
- 
- libc_hidden_proto(putc)
--strong_alias(__fputc_unlocked,putc)
-+strong_alias(fputc_unlocked,putc)
- libc_hidden_def(putc)
- #endif
- 
-diff -ur uClibc-0.9.29/libc/stdio/getchar.c uClibc-0.9.29-patched/libc/stdio/getchar.c
---- uClibc-0.9.29/libc/stdio/getchar.c	2006-12-19 22:30:25.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/getchar.c	2007-05-09 18:05:21.642421481 -0500
-@@ -7,7 +7,8 @@
- 
- #include "_stdio.h"
- 
--libc_hidden_proto(__fgetc_unlocked)
-+//#undef fgetc_unlocked
-+libc_hidden_proto(fgetc_unlocked)
- 
- #undef getchar
- #ifdef __DO_UNLOCKED
-diff -ur uClibc-0.9.29/libc/stdio/getdelim.c uClibc-0.9.29-patched/libc/stdio/getdelim.c
---- uClibc-0.9.29/libc/stdio/getdelim.c	2006-02-13 02:52:46.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/getdelim.c	2007-05-09 18:05:21.642421481 -0500
-@@ -11,8 +11,8 @@
- #include "_stdio.h"
- 
- libc_hidden_proto(getdelim)
--
--libc_hidden_proto(__fgetc_unlocked)
-+//#undef fgetc_unlocked
-+libc_hidden_proto(fgetc_unlocked)
- 
- /* Note: There is a defect in this function.  (size_t vs ssize_t). */
- 
-diff -ur uClibc-0.9.29/libc/stdio/old_vfprintf.c uClibc-0.9.29-patched/libc/stdio/old_vfprintf.c
---- uClibc-0.9.29/libc/stdio/old_vfprintf.c	2006-01-22 13:35:08.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/old_vfprintf.c	2007-05-09 18:05:21.642421481 -0500
-@@ -149,7 +149,8 @@
- libc_hidden_proto(strnlen)
- libc_hidden_proto(memcpy)
- libc_hidden_proto(putc_unlocked)
--libc_hidden_proto(__fputc_unlocked)
-+//#undef fputc_unlocked
-+libc_hidden_proto(fputc_unlocked)
- libc_hidden_proto(__glibc_strerror_r)
- 
- /*  #undef __UCLIBC_HAS_FLOATS__ */
-diff -ur uClibc-0.9.29/libc/stdio/putchar.c uClibc-0.9.29-patched/libc/stdio/putchar.c
---- uClibc-0.9.29/libc/stdio/putchar.c	2006-01-13 18:58:03.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/putchar.c	2007-05-09 18:05:21.642421481 -0500
-@@ -7,7 +7,8 @@
- 
- #include "_stdio.h"
- 
--libc_hidden_proto(__fputc_unlocked)
-+//#undef fputc_unlocked
-+libc_hidden_proto(fputc_unlocked)
- 
- #undef putchar
- #ifdef __DO_UNLOCKED
-diff -ur uClibc-0.9.29/libc/stdio/puts.c uClibc-0.9.29-patched/libc/stdio/puts.c
---- uClibc-0.9.29/libc/stdio/puts.c	2006-01-13 18:58:03.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/puts.c	2007-05-09 18:05:21.642421481 -0500
-@@ -7,7 +7,8 @@
- 
- #include "_stdio.h"
- 
--libc_hidden_proto(__fputc_unlocked)
-+//#undef fputc_unlocked
-+libc_hidden_proto(fputc_unlocked)
- libc_hidden_proto(fputs_unlocked)
- 
- int puts(register const char * __restrict s)
-@@ -25,7 +26,7 @@
- 	/* Note: Nonportable as fputs need only return nonnegative on success. */
- 	if ((n = fputs_unlocked(s, stream)) != EOF) {
- 		++n;
--		if (__fputc_unlocked('\n', stream) == EOF) {
-+		if (fputc_unlocked('\n', stream) == EOF) {
- 			n = EOF;
- 		}
- 	}
-diff -ur uClibc-0.9.29/libc/stdio/putwchar.c uClibc-0.9.29-patched/libc/stdio/putwchar.c
---- uClibc-0.9.29/libc/stdio/putwchar.c	2006-01-14 14:16:19.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/stdio/putwchar.c	2007-05-09 18:05:21.642421481 -0500
-@@ -22,7 +22,8 @@
- 
- #elif defined __UCLIBC_HAS_THREADS__
- 
--libc_hidden_proto(__fputc_unlocked)
-+//#undef fputc_unlocked
-+libc_hidden_proto(fputc_unlocked)
- /* psm: should this be fputwc? */
- libc_hidden_proto(fputc)
- 
-diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/bits/uClibc_stdio.h uClibc-0.9.29-patched/libc/sysdeps/linux/common/bits/uClibc_stdio.h
---- uClibc-0.9.29/libc/sysdeps/linux/common/bits/uClibc_stdio.h	2007-01-28 07:16:58.000000000 -0600
-+++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/bits/uClibc_stdio.h	2007-05-09 20:56:02.408110608 -0500
-@@ -381,33 +381,29 @@
- # define __FEOF(__stream)		__FEOF_UNLOCKED(__stream)
- #endif
- 
--extern int __fgetc_unlocked(FILE *__stream);
--extern int __fputc_unlocked(int __c, FILE *__stream);
--
- /* First define the default definitions.
-    They are overridden below as necessary. */
--#define __FGETC_UNLOCKED(__stream)		(__fgetc_unlocked)((__stream))
-+#define __FGETC_UNLOCKED(__stream)		(fgetc_unlocked)((__stream))
- #define __FGETC(__stream)			(fgetc)((__stream))
--#define __GETC_UNLOCKED_MACRO(__stream)		(__fgetc_unlocked)((__stream))
--#define __GETC_UNLOCKED(__stream)		(__fgetc_unlocked)((__stream))
-+#define __GETC_UNLOCKED_MACRO(__stream)		(fgetc_unlocked)((__stream))
-+#define __GETC_UNLOCKED(__stream)		(fgetc_unlocked)((__stream))
- #define __GETC(__stream)			(fgetc)((__stream))
- 
--#define __FPUTC_UNLOCKED(__c, __stream)		(__fputc_unlocked)((__c),(__stream))
-+#define __FPUTC_UNLOCKED(__c, __stream)		(fputc_unlocked)((__c),(__stream))
- #define __FPUTC(__c, __stream)			(fputc)((__c),(__stream))
--#define __PUTC_UNLOCKED_MACRO(__c, __stream)	(__fputc_unlocked)((__c),(__stream))
--#define __PUTC_UNLOCKED(__c, __stream)		(__fputc_unlocked)((__c),(__stream))
-+#define __PUTC_UNLOCKED_MACRO(__c, __stream)	(fputc_unlocked)((__c),(__stream))
-+#define __PUTC_UNLOCKED(__c, __stream)		(fputc_unlocked)((__c),(__stream))
- #define __PUTC(__c, __stream)			(fputc)((__c),(__stream))
- 
- 
- #ifdef __STDIO_GETC_MACRO
--
- extern FILE *__stdin;			/* For getchar() macro. */
- 
- # undef  __GETC_UNLOCKED_MACRO
- # define __GETC_UNLOCKED_MACRO(__stream)				\
- 		( ((__stream)->__bufpos < (__stream)->__bufgetc_u)	\
- 		  ? (*(__stream)->__bufpos++)				\
--		  : __fgetc_unlocked(__stream) )
-+		  : fgetc_unlocked(__stream) )
- 
- # if 0
- 	/* Classic macro approach.  getc{_unlocked} can have side effects. */
-@@ -453,20 +449,17 @@
- #  endif
- # endif
- 
--#else
--
- #endif /* __STDIO_GETC_MACRO */
- 
- 
- #ifdef __STDIO_PUTC_MACRO
--
- extern FILE *__stdout;			/* For putchar() macro. */
- 
- # undef  __PUTC_UNLOCKED_MACRO
- # define __PUTC_UNLOCKED_MACRO(__c, __stream)				\
- 		( ((__stream)->__bufpos < (__stream)->__bufputc_u)	\
- 		  ? (*(__stream)->__bufpos++) = (__c)			\
--		  : __fputc_unlocked((__c),(__stream)) )
-+		  : (fputc_unlocked((__c),(__stream)) )
- 
- # if 0
- 	/* Classic macro approach.  putc{_unlocked} can have side effects.*/
-@@ -489,7 +482,8 @@
- 		}) )
- 
- #  undef  __PUTC_UNLOCKED
--#  define __PUTC_UNLOCKED(__c, __stream)	__FPUTC_UNLOCKED((__c), (__stream))
-+#  define __PUTC_UNLOCKED(__c, __stream)				\
-+					__FPUTC_UNLOCKED((__c), (__stream))
- 
- #  ifdef __UCLIBC_HAS_THREADS__
- #   undef  __FPUTC
-diff -ur uClibc-0.9.29/libc/unistd/getpass.c uClibc-0.9.29-patched/libc/unistd/getpass.c
---- uClibc-0.9.29/libc/unistd/getpass.c	2006-07-05 05:58:38.000000000 -0500
-+++ uClibc-0.9.29-patched/libc/unistd/getpass.c	2007-05-09 18:05:21.642421481 -0500
-@@ -36,7 +36,8 @@
- libc_hidden_proto(fputs)
- libc_hidden_proto(fputc)
- libc_hidden_proto(putc)
--libc_hidden_proto(__fputc_unlocked)
-+//#undef fputc_unlocked
-+libc_hidden_proto(fputc_unlocked)
- 
- /* It is desirable to use this bit on systems that have it.
-    The only bit of terminal state we want to twiddle is echoing, which is
diff --git a/toolchain/uClibc/uClibc-0.9.29-fix-gethostent_r-failure-retval.patch b/toolchain/uClibc/uClibc-0.9.29-fix-gethostent_r-failure-retval.patch
deleted file mode 100644
index 7b246c1ad7..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-fix-gethostent_r-failure-retval.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur uClibc-0.9.29/libc/inet/resolv.c uClibc-0.9.29-patched/libc/inet/resolv.c
---- uClibc-0.9.29/libc/inet/resolv.c	2007-04-23 12:01:05.000000000 -0500
-+++ uClibc-0.9.29-patched/libc/inet/resolv.c	2007-05-09 18:05:33.563404419 -0500
-@@ -1700,7 +1700,7 @@
- int gethostent_r(struct hostent *result_buf, char *buf, size_t buflen,
- 	struct hostent **result, int *h_errnop)
- {
--    int ret;
-+    int ret = HOST_NOT_FOUND;
- 
-     __UCLIBC_MUTEX_LOCK(mylock);
-     if (__gethostent_fp == NULL) {
diff --git a/toolchain/uClibc/uClibc-0.9.29-fix-internal_function-definition.patch b/toolchain/uClibc/uClibc-0.9.29-fix-internal_function-definition.patch
deleted file mode 100644
index 9b88d826f1..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-fix-internal_function-definition.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h
-===================================================================
---- uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h	(revision 18898)
-+++ uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h	(working copy)
-@@ -42,6 +42,8 @@
- /* define if target supports IEEE signed zero floats */
- #define __UCLIBC_HAVE_SIGNED_ZERO__
- 
-+#if defined _LIBC
- #define internal_function __attribute__ ((regparm (3), stdcall))
-+#endif
- 
- #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */
-Index: uClibc/include/libc-symbols.h
-===================================================================
---- uClibc/include/libc-symbols.h	(revision 18898)
-+++ uClibc/include/libc-symbols.h	(working copy)
-@@ -22,6 +22,16 @@
- #ifndef _LIBC_SYMBOLS_H
- #define _LIBC_SYMBOLS_H	1
- 
-+/* This is defined for the compilation of all C library code.  features.h
-+   tests this to avoid inclusion of stubs.h while compiling the library,
-+   before stubs.h has been generated.  Some library code that is shared
-+   with other packages also tests this symbol to see if it is being
-+   compiled as part of the C library.  We must define this before including
-+   config.h, because it makes some definitions conditional on whether libc
-+   itself is being compiled, or just some generator program.  */
-+#define _LIBC	1
-+
-+
- /* This file's macros are included implicitly in the compilation of every
-    file in the C library by -imacros.
- 
-@@ -40,16 +50,6 @@
- 
- #include <bits/uClibc_arch_features.h>
- 
--
--/* This is defined for the compilation of all C library code.  features.h
--   tests this to avoid inclusion of stubs.h while compiling the library,
--   before stubs.h has been generated.  Some library code that is shared
--   with other packages also tests this symbol to see if it is being
--   compiled as part of the C library.  We must define this before including
--   config.h, because it makes some definitions conditional on whether libc
--   itself is being compiled, or just some generator program.  */
--#define _LIBC	1
--
- /* Enable declarations of GNU extensions, since we are compiling them.  */
- #define _GNU_SOURCE	1
- 
diff --git a/toolchain/uClibc/uClibc-0.9.29-linuxthreads.patch b/toolchain/uClibc/uClibc-0.9.29-linuxthreads.patch
deleted file mode 100644
index 8ce2439b46..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-linuxthreads.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- a/libpthread/linuxthreads.old/attr.c	2006-01-24 12:41:01.000000000 -0500
-+++ b/libpthread/linuxthreads.old/attr.c	2008-02-10 11:35:32.000000000 -0500
-@@ -25,6 +25,14 @@
- #include "pthread.h"
- #include "internals.h"
- 
-+#include <sys/resource.h>
-+#include <inttypes.h>
-+#include <stdio.h>
-+#include <stdio_ext.h>
-+#include <stdlib.h>
-+#include <sys/resource.h>
-+
-+
- /* NOTE: With uClibc I don't think we need this versioning stuff.
-  * Therefore, define the function pthread_attr_init() here using
-  * a strong symbol. */
-@@ -209,4 +217,94 @@ int __pthread_attr_getstacksize(const pt
-   *stacksize = attr->__stacksize;
-   return 0;
- }
-+
-+
-+extern int *__libc_stack_end;
-+
- weak_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize)
-+void* pthread_getattr_np(pthread_t thread, pthread_attr_t *attr)
-+{
-+    static void *stackBase = 0;
-+    static size_t stackSize = 0;
-+    int ret = 0;
-+    /* Stack size limit.  */
-+    struct rlimit rl;
-+
-+    /* The safest way to get the top of the stack is to read
-+    /proc/self/maps and locate the line into which
-+    __libc_stack_end falls.  */
-+    FILE *fp = fopen("/proc/self/maps", "rc");
-+    if (fp == NULL)
-+        ret = errno;
-+    /* We need the limit of the stack in any case.  */
-+    else if (getrlimit (RLIMIT_STACK, &rl) != 0)
-+        ret = errno;
-+    else {
-+        /* We need no locking.  */
-+        __fsetlocking (fp, FSETLOCKING_BYCALLER);
-+
-+        /* Until we found an entry (which should always be the case)
-+        mark the result as a failure.  */
-+        ret = ENOENT;
-+
-+        char *line = NULL;
-+        size_t linelen = 0;
-+        uintptr_t last_to = 0;
-+
-+        while (! feof_unlocked (fp)) {
-+            if (getdelim (&line, &linelen, '\n', fp) <= 0)
-+                break;
-+
-+            uintptr_t from;
-+            uintptr_t to;
-+            if (sscanf (line, "%x-%x", &from, &to) != 2)
-+                continue;
-+            if (from <= (uintptr_t) __libc_stack_end
-+            && (uintptr_t) __libc_stack_end < to) {
-+                /* Found the entry.  Now we have the info we need.  */
-+                attr->__stacksize = rl.rlim_cur;
-+#ifdef _STACK_GROWS_UP
-+                /* Don't check to enforce a limit on the __stacksize */
-+                attr->__stackaddr = (void *) from;
-+#else
-+                attr->__stackaddr = (void *) to;
-+
-+                /* The limit might be too high.  */
-+                if ((size_t) attr->__stacksize > (size_t) attr->__stackaddr - last_to)
-+                    attr->__stacksize = (size_t) attr->__stackaddr - last_to;
-+#endif
-+
-+                /* We succeed and no need to look further.  */
-+                ret = 0;
-+                break;
-+            }
-+            last_to = to;
-+        }
-+
-+        fclose (fp);
-+        free (line);
-+    }
-+#ifndef _STACK_GROWS_UP
-+    stackBase = (char *) attr->__stackaddr - attr->__stacksize;
-+#else
-+    stackBase = attr->__stackaddr;
-+#endif
-+    stackSize = attr->__stacksize;
-+    return (void*)(stackBase + stackSize);
-+}
-+
-+int __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
-+			     size_t *stacksize)
-+{
-+  /* XXX This function has a stupid definition.  The standard specifies
-+     no error value but what is if no stack address was set?  We simply
-+     return the value we have in the member.  */
-+#ifndef _STACK_GROWS_UP
-+  *stackaddr = (char *) attr->__stackaddr - attr->__stacksize;
-+#else
-+  *stackaddr = attr->__stackaddr;
-+#endif
-+  *stacksize = attr->__stacksize;
-+  return 0;
-+}
-+weak_alias (__pthread_attr_getstack, pthread_attr_getstack)
-
---- a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h	2006-12-07 22:19:36.000000000 -0500
-+++ b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h	2008-02-10 11:42:35.000000000 -0500
-@@ -288,15 +288,11 @@ extern int pthread_attr_getstacksize (__
- 				      __attr, size_t *__restrict __stacksize)
-      __THROW;
- 
--#if 0
--/* Not yet implemented in uClibc! */
--
- #ifdef __USE_GNU
- /* Initialize thread attribute *ATTR with attributes corresponding to the
-    already running thread TH.  It shall be called on unitialized ATTR
-    and destroyed with pthread_attr_destroy when no longer needed.  */
--extern int pthread_getattr_np (pthread_t __th, pthread_attr_t *__attr) __THROW;
--#endif
-+extern void* pthread_getattr_np(pthread_t thread, pthread_attr_t *attr);
- #endif
- 
- /* Functions for scheduling control.  */
-@@ -599,6 +595,11 @@ extern int pthread_cancel (pthread_t __c
-    cancelled.  */
- extern void pthread_testcancel (void);
- 
-+/* Return the previously set address for the stack.  */
-+extern int pthread_attr_getstack (__const pthread_attr_t *__restrict __attr,
-+				  void **__restrict __stackaddr,
-+				  size_t *__restrict __stacksize) __THROW;
-+
- 
- /* Install a cleanup handler: ROUTINE will be called with arguments ARG
-    when the thread is cancelled or calls pthread_exit.  ROUTINE will also
-
diff --git a/toolchain/uClibc/uClibc-0.9.29-rm-whitespace.patch b/toolchain/uClibc/uClibc-0.9.29-rm-whitespace.patch
deleted file mode 100644
index 6004f91e32..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29-rm-whitespace.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h
---- uClibc-0.9.29-0rig/include/assert.h	2005-11-03 23:42:46.000000000 +0100
-+++ uClibc-0.9.29/include/assert.h	2007-08-13 19:10:57.000000000 +0200
-@@ -31,7 +31,7 @@
- #define	_ASSERT_H	1
- #include <features.h>
- 
--#if defined __cplusplus && __GNUC_PREREQ (2,95)
-+#if defined __cplusplus && __GNUC_PREREQ(2,95)
- # define __ASSERT_VOID_CAST static_cast<void>
- #else
- # define __ASSERT_VOID_CAST (void)
-@@ -59,13 +59,17 @@
-   (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
- 		       (__assert (__STRING(expr), __FILE__, __LINE__,    \
- 				       __ASSERT_FUNCTION), 0)))
--  
-+
-+/* Define some temporaries to workaround tinyx makedepend bug */
-+#define	__GNUC_PREREQ_2_6	__GNUC_PREREQ(2, 6)
-+#define	__GNUC_PREREQ_2_4	__GNUC_PREREQ(2, 4)
- /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
-    which contains the name of the function currently being defined.
-    This is broken in G++ before version 2.6.
-    C9x has a similar variable called __func__, but prefer the GCC one since
-    it demangles C++ function names.  */
--# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
-+
-+# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4
- #   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
- # else
- #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-diff -urN uClibc-0.9.29-0rig/include/complex.h uClibc-0.9.29/include/complex.h
---- uClibc-0.9.29-0rig/include/complex.h	2002-05-09 10:15:21.000000000 +0200
-+++ uClibc-0.9.29/include/complex.h	2007-08-13 17:55:29.000000000 +0200
-@@ -33,7 +33,7 @@
- /* We might need to add support for more compilers here.  But since ISO
-    C99 is out hopefully all maintained compilers will soon provide the data
-    types `float complex' and `double complex'.  */
--#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
-+#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97)
- # define _Complex __complex__
- #endif
- 
-diff -urN uClibc-0.9.29-0rig/include/features.h uClibc-0.9.29/include/features.h
---- uClibc-0.9.29-0rig/include/features.h	2006-11-29 22:10:04.000000000 +0100
-+++ uClibc-0.9.29/include/features.h	2007-08-13 17:55:51.000000000 +0200
-@@ -143,7 +143,7 @@
- 
- /* Convenience macros to test the versions of glibc and gcc.
-    Use them like this:
--   #if __GNUC_PREREQ (2,8)
-+   #if __GNUC_PREREQ(2,8)
-    ... code requiring gcc 2.8 or later ...
-    #endif
-    Note - they won't work for gcc1 or glibc1, since the _MINOR macros
-@@ -297,7 +297,7 @@
- /* uClibc does not support _FORTIFY_SOURCE */
- #undef _FORTIFY_SOURCE
- #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
--    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
-+    && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
- # if _FORTIFY_SOURCE > 1
- #  define __USE_FORTIFY_LEVEL 2
- # else
-@@ -366,7 +366,7 @@
- #endif	/* !ASSEMBLER */
- 
- /* Decide whether we can define 'extern inline' functions in headers.  */
--#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
-+#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \
-     && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__
- # define __USE_EXTERN_INLINES	1
- #endif
-diff -urN uClibc-0.9.29-0rig/include/tgmath.h uClibc-0.9.29/include/tgmath.h
---- uClibc-0.9.29-0rig/include/tgmath.h	2002-05-09 10:15:21.000000000 +0200
-+++ uClibc-0.9.29/include/tgmath.h	2007-08-13 17:56:17.000000000 +0200
-@@ -34,7 +34,7 @@
-    do not try this for now and instead concentrate only on GNU CC.  Once
-    we have more information support for other compilers might follow.  */
- 
--#if __GNUC_PREREQ (2, 7)
-+#if __GNUC_PREREQ(2, 7)
- 
- # ifdef __NO_LONG_DOUBLE_MATH
- #  define __tgml(fct) fct
diff --git a/toolchain/uClibc/uClibc-0.9.29.config b/toolchain/uClibc/uClibc-0.9.29.config
deleted file mode 100644
index 3e43059e9f..0000000000
--- a/toolchain/uClibc/uClibc-0.9.29.config
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="none"
-FORCE_OPTIONS_FOR_ARCH=y
-# ARCH_LITTLE_ENDIAN is not set
-# ARCH_BIG_ENDIAN is not set
-# ARCH_WANTS_LITTLE_ENDIAN is not set
-# ARCH_WANTS_BIG_ENDIAN is not set
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_SOURCE="/usr/src/linux"
-KERNEL_HEADERS="/usr/src/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# LINKRELAX is not set
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-BUILD_UCLIBC_LDSO=y
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-# DL_FINI_CRT_COMPAT is not set
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-HAS_SHADOW=y
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-# UNIX98PTY_ONLY is not set
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-# UCLIBC_USE_NETLINK is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-# UCLIBC_HAS_GETTEXT_AWARENESS is not set
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-# UCLIBC_HAS_WORDEXP is not set
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-
-#
-# uClibc security related options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
-# SSP_QUICK_CANARY is not set
-PROPOLICE_BLOCK_ABRT=y
-# PROPOLICE_BLOCK_SEGV is not set
-# UCLIBC_BUILD_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
-
-# USE_BX is not set
-

From 7d814728ae38c5479ddb8b519eeb182f756f4291 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 Jun 2011 15:46:19 +0200
Subject: [PATCH 0343/6849] Remove obsolete code in busybox.mk

Remove this quirk since the tested code is no longer present in busybox
since 1.10.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 034801ec5e..d2ba22625a 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -41,14 +41,6 @@ define BUSYBOX_SET_MDEV
 endef
 endif
 
-# If we have external syslogd, force busybox to use it
-ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
-define BUSYBOX_SET_SYSKLOGD
-	@$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" \
-		$(BUSYBOX_DIR)/init/init.c
-endef
-endif
-
 ifeq ($(BR2_LARGEFILE),y)
 define BUSYBOX_SET_LARGEFILE
 	$(call KCONFIG_ENABLE_OPT,CONFIG_LFS,$(BUSYBOX_BUILD_CONFIG))

From ad501b6634dc9d974da7e86299041fe441d58088 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 Jun 2011 15:46:20 +0200
Subject: [PATCH 0344/6849] Rework the logging daemons startup

The logging mechanism startup being in inittab, it isn't easy to
overcharge the default policy. With this patch, the startup of the
syslog daemon is moved to an init.d script, that can easily be
overwritten.

[Peter: use install -D]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/inittab    |  2 --
 package/busybox/S01logging | 26 ++++++++++++++++++++++++++
 package/busybox/busybox.mk |  6 ++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 package/busybox/S01logging

diff --git a/fs/skeleton/etc/inittab b/fs/skeleton/etc/inittab
index 0e504679b0..191c52590d 100644
--- a/fs/skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
@@ -28,8 +28,6 @@ null::sysinit:/bin/hostname -F /etc/hostname
 
 # Logging junk
 null::sysinit:/bin/touch /var/log/messages
-null::respawn:/sbin/syslogd -n -m 0
-null::respawn:/sbin/klogd -n
 tty3::respawn:/usr/bin/tail -f /var/log/messages
 
 # Stuff to do for the 3-finger salute
diff --git a/package/busybox/S01logging b/package/busybox/S01logging
new file mode 100644
index 0000000000..6badebe1ab
--- /dev/null
+++ b/package/busybox/S01logging
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Start logging
+#
+
+case "$1" in
+  start)
+	echo -n "Starting logging :"
+	start-stop-daemon -S -q -p /var/run/syslog.pid --exec /sbin/syslogd -- -m 0
+	start-stop-daemon -S -q -p /var/run/klogd.pid --exec /sbin/klogd
+	echo "OK"
+	;;
+  stop)
+	echo -n "Stopping logging :"
+	start-stop-daemon -K -q -p /var/run/syslog.pid
+	start-stop-daemon -K -q -p /var/run/klogd.pid
+	echo "OK"
+	;;
+  restart|reload)
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d2ba22625a..4931b0744c 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -122,6 +122,11 @@ define BUSYBOX_DISABLE_MMU_APPLETS
 endef
 endif
 
+define BUSYBOX_INSTALL_LOGGING_SCRIPT
+	$(INSTALL) -m 0755 -D package/busybox/S01logging \
+		$(TARGET_DIR)/etc/init.d/S01logging
+endef
+
 # We do this here to avoid busting a modified .config in configure
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
@@ -152,6 +157,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
 			$(TARGET_DIR)/usr/share/udhcpc/default.script; \
 	fi
 	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
+	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
 endef
 
 define BUSYBOX_UNINSTALL_TARGET_CMDS

From abf7af17e95855e9fe2535729f7d83fce603463f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jul 2011 21:03:37 +0200
Subject: [PATCH 0345/6849] busybox: only install S01logging if syslogd applet
 is enabled

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4931b0744c..509c3bb9f1 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -123,8 +123,10 @@ endef
 endif
 
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
-	$(INSTALL) -m 0755 -D package/busybox/S01logging \
-		$(TARGET_DIR)/etc/init.d/S01logging
+	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
+		$(INSTALL) -m 0755 -D package/busybox/S01logging \
+			$(TARGET_DIR)/etc/init.d/S01logging; \
+	else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
 endef
 
 # We do this here to avoid busting a modified .config in configure

From 348e07c88d4c79e78b26dab3745f75da2c2d6b9a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jul 2011 21:44:28 +0200
Subject: [PATCH 0346/6849] skeleton: inittab: remove /var/log/messages log on
 tty3

Hardcodes policy, is not critical, and people might not have tty3
(E.G. virtual consoles) available.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/inittab | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fs/skeleton/etc/inittab b/fs/skeleton/etc/inittab
index 191c52590d..4f3bb965d2 100644
--- a/fs/skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
@@ -26,10 +26,6 @@ null::sysinit:/bin/hostname -F /etc/hostname
 # Put a getty on the serial port
 #ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL
 
-# Logging junk
-null::sysinit:/bin/touch /var/log/messages
-tty3::respawn:/usr/bin/tail -f /var/log/messages
-
 # Stuff to do for the 3-finger salute
 ::ctrlaltdel:/sbin/reboot
 

From 6e53e059c82ba0ac235a5ca732a40b8999a7e65e Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 Jun 2011 15:46:21 +0200
Subject: [PATCH 0347/6849] package: add rsyslog

Rsyslog is a powerful and flexible syslog daemon.

[Peter: whitespace, rename initscript, allow platform override of conf file]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/rsyslog/Config.in  |  6 ++++++
 package/rsyslog/S01rsyslog | 38 ++++++++++++++++++++++++++++++++++++++
 package/rsyslog/rsyslog.mk | 26 ++++++++++++++++++++++++++
 4 files changed, 71 insertions(+)
 create mode 100644 package/rsyslog/Config.in
 create mode 100644 package/rsyslog/S01rsyslog
 create mode 100644 package/rsyslog/rsyslog.mk

diff --git a/package/Config.in b/package/Config.in
index 1a4815adc6..b06c669e13 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -496,6 +496,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"
+source "package/rsyslog/Config.in"
 source "package/sysklogd/Config.in"
 source "package/sysvinit/Config.in"
 source "package/util-linux/Config.in"
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
new file mode 100644
index 0000000000..2503f711f5
--- /dev/null
+++ b/package/rsyslog/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_RSYSLOG
+	bool "rsyslog"
+	help
+	  Rsyslog is a powerful and flexible syslog implementation
+
+	  http://www.rsyslog.com
diff --git a/package/rsyslog/S01rsyslog b/package/rsyslog/S01rsyslog
new file mode 100644
index 0000000000..8c28e02f57
--- /dev/null
+++ b/package/rsyslog/S01rsyslog
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Starts rsyslog.
+#
+
+start() {
+	echo -n "Starting rsyslog daemon: "
+	umask 077
+	start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
+	echo "OK"
+}
+stop() {
+	echo -n "Stopping rsyslog daemon: "
+	start-stop-daemon -K -q -p /var/run/rsyslogd.pid
+	echo "OK"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
+
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
new file mode 100644
index 0000000000..af7ac2ed8e
--- /dev/null
+++ b/package/rsyslog/rsyslog.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# rsyslog
+#
+#############################################################
+RSYSLOG_VERSION = 5.8.0
+RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog/
+RSYSLOG_DEPENDENCIES = zlib
+
+# Build after Busybox
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	RSYSLOG_DEPENDENCIES += busybox
+endif
+
+define RSYSLOG_INSTALL_CONF_SCRIPT
+	$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
+		$(TARGET_DIR)/etc/init.d/S01rsyslog
+	[ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \
+		$(INSTALL) -m 0644 -D $(@D)/rsyslog.conf \
+			$(TARGET_DIR)/etc/rsyslog.conf
+	mkdir -p $(TARGET_DIR)/etc/rsyslog.d
+endef
+
+RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF_SCRIPT
+
+$(eval $(call AUTOTARGETS,package,rsyslog))

From fef54db1a14b7e7eed4e0e75b3bf2330a11207da Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Jul 2011 08:56:49 +0200
Subject: [PATCH 0348/6849] toolchain/uClibc: NPTL needs i486+ for cmpxchgl
 instruction

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index b5ecbc1c45..0c3a5100cf 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -102,6 +102,7 @@ choice
 		bool "Native POSIX Threading (NPTL)"
 	        select BR2_TOOLCHAIN_HAS_THREADS
 		depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32
+		depends on !BR2_x86_i386
 endchoice
 
 source "toolchain/elf2flt/Config.in"

From 1fa6b1c276bc3e8e957c3442cdca68bd893ce552 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Jul 2011 09:23:46 +0200
Subject: [PATCH 0349/6849] target: default to i586 for x86

The i586 was introduced almost 20 years ago, and some software
(NPTL, libstdc++, ..) doesn't work nicely with i386 anymore, so
it is time to move on.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 7c80945f5c..23946e8772 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -232,7 +232,7 @@ endchoice
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_i386
-	default BR2_x86_i386
+	default BR2_x86_i586
 	help
 	  Specific CPU variant to use
 

From 0387830b2e6c6cb2513802b8abe86914d49f605c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Jul 2011 14:58:20 +0200
Subject: [PATCH 0350/6849] lame: fix build if host has libgtk12-dev
 (gtk-config)

Lame contains an optional gtk12 based frame analyzer application, which
will be built if gtk12 is detected (using gtk-config). We no longer
have support for (the obsolete) gtk12 in BR, but the host might have
gtk-config, so forcible disable it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/lame/lame.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index 841cbffb02..281c1e865b 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -8,6 +8,7 @@ LAME_VERSION = 3.98.4
 LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lame
 LAME_DEPENDENCIES = host-pkg-config
 LAME_INSTALL_STAGING = YES
+LAME_CONF_ENV = GTK_CONFIG=/bin/false
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 LAME_DEPENDENCIES += libsndfile

From 76b128f11c07d62654928e597747fe972c079ca7 Mon Sep 17 00:00:00 2001
From: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Date: Fri, 24 Jun 2011 14:09:46 +0200
Subject: [PATCH 0351/6849] infrastructure: remove leftover of old style hooks

Commit ae2be8d (infrastructure: remove support for old style hooks)
forgot to update an uninstall rule.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index bf4e1b49a3..4bd40ba530 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -324,7 +324,7 @@ $(BUILD_DIR)/%/.stamp_uninstalled:
 	$($(PKG)_UNINSTALL_STAGING_CMDS)
 	rm -f $($(PKG)_TARGET_INSTALL_STAGING)
 	$($(PKG)_UNINSTALL_TARGET_CMDS)
-	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
+	rm -f $($(PKG)_TARGET_INSTALL_TARGET)
 
 # Remove package sources
 $(BUILD_DIR)/%/.stamp_dircleaned:

From 920dd594ed39c982f62ca71948c63ce6d7f2c4dd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 7 Jul 2011 00:53:04 +0200
Subject: [PATCH 0352/6849] uClibc: fix 0.9.32 build on x86

Patch from uClibc git.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...c_epoll_pwait-compile-failure-on-x86.patch | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch

diff --git a/toolchain/uClibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/toolchain/uClibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
new file mode 100644
index 0000000000..8cda4f902c
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
@@ -0,0 +1,43 @@
+From 8245f3b4638fdff2011c2657af1bb211def704bc Mon Sep 17 00:00:00 2001
+From: Phil Blundell <pb@pbcl.net>
+Date: Sat, 11 Jun 2011 01:10:46 -0400
+Subject: [PATCH] Fix __libc_epoll_pwait compile failure on x86
+
+This prevents "memory input 7 is not directly addressable" errors.
+
+| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait':
+| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable
+| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable
+| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1
+| make: *** Waiting for unfinished jobs....
+
+Signed-off-by: Phil Blundell <pb@pbcl.net>
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/epoll.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
+index 85b0cfd..ab3e73b 100644
+--- a/libc/sysdeps/linux/common/epoll.c
++++ b/libc/sysdeps/linux/common/epoll.c
+@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
+ int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
+ 						int timeout, const sigset_t *set)
+ {
++    int nsig = _NSIG / 8;
+ 	if (SINGLE_THREAD_P)
+-		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ 	else {
+ 		int oldtype = LIBC_CANCEL_ASYNC ();
+-		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ 		LIBC_CANCEL_RESET (oldtype);
+ 		return result;
+ 	}
+-- 
+1.7.5.4
+

From a78063a616d43d854f0984a0ffaeb694227e41af Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 7 Jul 2011 08:37:19 +0200
Subject: [PATCH 0353/6849] ruby: fix build with openssl 1.0

Patch from Debian bug #620998

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby-openssl1.0-fix.patch | 53 ++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 package/ruby/ruby-openssl1.0-fix.patch

diff --git a/package/ruby/ruby-openssl1.0-fix.patch b/package/ruby/ruby-openssl1.0-fix.patch
new file mode 100644
index 0000000000..5591d998ea
--- /dev/null
+++ b/package/ruby/ruby-openssl1.0-fix.patch
@@ -0,0 +1,53 @@
+From b983e73adf7a7d3fd07fdf493eee51c22881a6e6 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date: Wed, 6 Apr 2011 02:28:09 +0900
+Subject: [PATCH] Add option which enable SSLv2 support
+
+From openssl 1.0, SSLv2 becomes disable by default.
+If you want to use SSLv2 in ruby, you need config with --enable-opensslv2.
+The SSLv2 support is disable by default.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+---
+ ext/openssl/extconf.rb |    8 ++++++++
+ ext/openssl/ossl_ssl.c |    2 ++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
+index b1f2d88..89c6f19 100644
+--- a/ext/openssl/extconf.rb
++++ b/ext/openssl/extconf.rb
+@@ -33,6 +33,14 @@ if with_config("debug") or enable_config("debug")
+   end
+ end
+ 
++## 
++## From openssl 1.0, SSLv2 becomes disable by default.
++## If you want to use SSLv2 in ruby, you need config with --enable-opensslv2.
++##
++if enable_config("opensslv2")
++  $defs << "-DENABLE_OPENSSLV2"
++end
++
+ message "=== Checking for system dependent stuff... ===\n"
+ have_library("nsl", "t_open")
+ have_library("socket", "socket")
+diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
+index d8951fb..d0c9059 100644
+--- a/ext/openssl/ossl_ssl.c
++++ b/ext/openssl/ossl_ssl.c
+@@ -107,9 +107,11 @@ struct {
+     OSSL_SSL_METHOD_ENTRY(TLSv1),
+     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
+     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
++#if defined(ENABLE_OPENSSLV2)
+     OSSL_SSL_METHOD_ENTRY(SSLv2),
+     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
+     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
++#endif
+     OSSL_SSL_METHOD_ENTRY(SSLv3),
+     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
+     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
+-- 
+1.7.4.1
+

From 2f2542595f69734d61d208bfbf1094901be5432f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 7 Jul 2011 10:53:18 +0200
Subject: [PATCH 0354/6849] Makefile.package.in: extract: only ensure r/w
 access for user

There's no reason to make the source files writable for everyone.

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 4bd40ba530..6b63bae080 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -246,7 +246,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 	$(Q)$(if $($(PKG)_SOURCE),$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
 	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -)
 # some packages have messed up permissions inside
-	$(Q)chmod -R ug+rw $(@D)
+	$(Q)chmod -R +rw $(@D)
 	$(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 

From e67b65eed8f5e4551a527a07948e7ecc74764da3 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 7 Jul 2011 09:39:00 +0200
Subject: [PATCH 0355/6849] gst-plugins-base: add option for dependency-less
 plugin

Make the build of the dependency-less plugin 'encoding' optional.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-base/Config.in           | 3 +++
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 09c243cb6f..3ac4dac085 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -30,6 +30,9 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC
 	bool "audiotestsrc"
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING
+	bool "encoding"
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE
 	bool "ffmpegcolorspace (mandatory for video playback)"
 	default y
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 1d0b19dd61..72188736c5 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -69,6 +69,12 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-encoding
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-encoding
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-ffmpegcolorspace
 else

From e04026794b5112576f7eaf902e1f9fc57afb2f26 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 7 Jul 2011 09:39:01 +0200
Subject: [PATCH 0356/6849] gst-plugins: ivborbis (aka tremor) moved to
 gst-plugins-base

The integer vorbis decoder moved from gst-plugins-bad to
gst-plugins-base.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in            | 4 ----
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk   | 7 -------
 package/multimedia/gst-plugins-base/Config.in           | 4 ++++
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 7 +++++++
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index e25b756dfe..23d59162d4 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -192,10 +192,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
 	select BR2_PACKAGE_SDL
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR
-	bool "tremor"
-	select BR2_PACKAGE_TREMOR
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
 	bool "vcd"
 
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 31d998f9b2..5bbb53a786 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -355,13 +355,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-ivorbis
-GST_PLUGINS_BAD_DEPENDENCIES += tremor
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-ivorbis
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
 else
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 3ac4dac085..851337b05f 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -86,6 +86,10 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
 	bool "theora (*.ogg video)"
 	select BR2_PACKAGE_LIBTHEORA
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR
+	bool "tremor"
+	select BR2_PACKAGE_TREMOR
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS
 	bool "vorbis (*.ogg audio)"
 	select BR2_PACKAGE_LIBVORBIS
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 72188736c5..79ced3004a 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -156,6 +156,13 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-theora
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST_PLUGINS_BASE_DEPENDENCIES += tremor
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-vorbis
 GST_PLUGINS_BASE_DEPENDENCIES += libvorbis

From 82a56c1bff4b102c4a845e284353eace654cdb5b Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 7 Jul 2011 09:39:02 +0200
Subject: [PATCH 0357/6849] gst-plugins-bad: clean up configuration

Remove obsoleted configurations and add options for new
dependency-less plugins.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in  |  87 +++++++---
 .../gst-plugins-bad/gst-plugins-bad.mk        | 161 +++++++++++++-----
 2 files changed, 180 insertions(+), 68 deletions(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 23d59162d4..5ccaa1639b 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -12,14 +12,14 @@ if BR2_PACKAGE_GST_PLUGINS_BAD
 
 comment "dependency-less plugins"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AACPARSE
-	bool "aacparse"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC
+	bool "adpcmdec"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFFPARSE
-	bool "aiffparse"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC
+	bool "adpcmenc"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AMRPARSE
-	bool "amrparse"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF
+	bool "aiff"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX
 	bool "asfmux"
@@ -28,12 +28,21 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
 	bool "apexsink"
 	select BR2_PACKAGE_OPENSSL
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS
+	bool "audioparsers"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT
 	bool "autoconvert"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN
 	bool "camerabin"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS
+	bool "coloreffects"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE
+	bool "colorspace"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE
 	bool "legacyresample"
 
@@ -47,6 +56,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE
 	bool "cdxaparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC
+	bool "dataurisrc"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP
 	bool "dccp"
 
@@ -56,13 +68,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
 	bool "dtmf"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDNAV
-	bool "dvdnav"
-	depends on BR2_LARGEFILE # libdvdread
-	select BR2_PACKAGE_LIBDVDNAV
-
-comment "dvdnav requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
+	bool "dvdsuboverlay"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU
 	bool "dvdspu"
@@ -76,12 +83,36 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R
 	bool "frei0r"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS
+	bool "gaudieffects"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM
+	bool "geometrictransform"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS
+	bool "gsettings"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE
 	bool "h264parse"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE
 	bool "hdvparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE
+	bool "interlace"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE
+	bool "invtelecine"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE
+	bool "ivfparse"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR
+	bool "jp2kdecimator"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT
+	bool "jpegformat"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB
 	bool "librfb"
 
@@ -91,6 +122,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX
 	bool "mpegdemux"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX
+	bool "mpegpsmux"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX
 	bool "mpegtsmux"
 
@@ -115,6 +149,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE
 	bool "pcapparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM
+	bool "pnm"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_QTMUX
 	bool "qtmux"
 
@@ -124,9 +161,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL
 	bool "real"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMANAGER
-	bool "rtpmanager"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX
 	bool "rtpmux"
 
@@ -136,11 +170,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP
 	bool "sdp"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SELECTOR
-	bool "selector"
-
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SHAPEWIPE
-	bool "shapewipe"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP
+	bool "segmentclip"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN
 	bool "siren"
@@ -157,8 +188,11 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA
 	bool "tta"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VALVE
-	bool "valve"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE
+	bool "videomaxrate"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
+	bool "videomeasure"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
 	bool "videosignal"
@@ -166,8 +200,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC
 	bool "vmnc"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_XDGMIME
-	bool "xdgmime"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
+	bool "y4m"
 
 comment "plugins with external dependencies (there may be more available)"
 
@@ -185,9 +219,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON
 	bool "neon"
 	select BR2_PACKAGE_NEON
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OSS4
-	bool "oss4"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
 	select BR2_PACKAGE_SDL
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 5bbb53a786..5012be2e00 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -12,22 +12,26 @@ GST_PLUGINS_BAD_CONF_OPT = \
 
 GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AACPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-aacparse
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST_PLUGINS_BAD_DEPENDENCIES += orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-aacparse
+GST_PLUGINS_BAD_CONF_OPT += --disable-adpcmdec
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFFPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-aiffparse
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-adpcmenc
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-aiffparse
+GST_PLUGINS_BAD_CONF_OPT += --disable-adpcmenc
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AMRPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-amrparse
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-aiff
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-amrparse
+GST_PLUGINS_BAD_CONF_OPT += --disable-aiff
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX),y)
@@ -43,6 +47,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-apexsink
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-audioparsers
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-audioparsers
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
 else
@@ -55,6 +65,18 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-colorspace
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-colorspace
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-legacyresample
 else
@@ -80,6 +102,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-dataurisrc
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-dataurisrc
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-dccp
 else
@@ -98,11 +126,10 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-dtmf
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDNAV),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvdnav
-GST_PLUGINS_BAD_DEPENDENCIES += libdvdnav
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvdnav
+GST_PLUGINS_BAD_CONF_OPT += --disable-dvbsuboverlay
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU),y)
@@ -129,6 +156,24 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-frei0r
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-gaudieffects
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-gaudieffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-geometrictransform
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-geometrictransform
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-gsettings
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-gsettings
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-h264parse
 else
@@ -141,6 +186,42 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-interlace
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-interlace
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-invtelecine
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-invtelecine
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-invtelecine
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-invtelecine
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-ivfparse
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-jp2kdecimator
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-jpegformat
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-librfb
 else
@@ -159,6 +240,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-mpegdemux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-mpegpsmux
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
 else
@@ -207,6 +294,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-pcapparse
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-pnm
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-pnm
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_QTMUX),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-qtmux
 else
@@ -225,12 +318,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-real
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMANAGER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rtpmanager
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rtpmanager
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
 else
@@ -249,16 +336,10 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-sdp
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SELECTOR),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-selector
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-selector
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SHAPEWIPE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-shapewipe
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-segmentclip
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-shapewipe
+GST_PLUGINS_BAD_CONF_OPT += --disable-segmentclip
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN),y)
@@ -291,10 +372,16 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-tta
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VALVE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-valve
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-videomaxrate
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-videomaxrate
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-videomeasure
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-valve
+GST_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
@@ -309,10 +396,10 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-vmnc
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_XDGMIME),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-xdgmime
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-y4m
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-xdgmime
+GST_PLUGINS_BAD_CONF_OPT += --disable-y4m
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
@@ -341,12 +428,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-neon
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OSS4),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-oss4
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-oss4
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y)
 GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
 GST_PLUGINS_BAD_CONF_OPT += --enable-sdl

From f4889573af6f43cc87c963fa4eae7f1ce29a46c2 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium - Mind)" <arnout@mind.be>
Date: Mon, 4 Jul 2011 16:37:20 +0200
Subject: [PATCH 0358/6849] BR2_ARCH definition was missing for 32-bit AMD
 architecture variants.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 23946e8772..91956ec011 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -478,6 +478,13 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_pentiumpro
 	default "i686"		if BR2_x86_nocona
 	default "i686"		if BR2_x86_core2
+	default "i686"		if BR2_x86_opteron
+	default "i686"		if BR2_x86_opteron_sse3
+	default "i686"		if BR2_x86_barcelona
+	default "i686"		if BR2_x86_k6
+	default "i686"		if BR2_x86_k6_2
+	default "i686"		if BR2_x86_athlon
+	default "i686"		if BR2_x86_athlon_4
 	default "m68k"		if BR2_m68k
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel

From 6cfba49169f72d49d4ddfe27a1ed2f90eb3bff6d Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 7 Jul 2011 13:07:22 +0100
Subject: [PATCH 0359/6849] package: add libnspr

Add a package for the Netscape Portable Runtime library.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libnspr/Config.in  | 13 +++++++++++++
 package/libnspr/libnspr.mk | 17 +++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/libnspr/Config.in
 create mode 100644 package/libnspr/libnspr.mk

diff --git a/package/Config.in b/package/Config.in
index b06c669e13..09aa76abc0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -338,6 +338,7 @@ source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
+source "package/libnspr/Config.in"
 source "package/liboil/Config.in"
 source "package/libsigc/Config.in"
 source "package/startup-notification/Config.in"
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
new file mode 100644
index 0000000000..53086f0730
--- /dev/null
+++ b/package/libnspr/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBNSPR
+	bool "libnspr"
+	depends on BR2_LARGEFILE
+	help
+	  NSPR is the Netscape Portable Runtime library which provides
+	  a platform-neutral API for system level and libc like
+	  functions. The library is used by the Mozilla project as well
+	  as others.
+
+	  http://www.mozilla.org/projects/nspr/
+
+comment "libnspr requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
new file mode 100644
index 0000000000..9ba7431219
--- /dev/null
+++ b/package/libnspr/libnspr.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# libnspr
+#
+#############################################################
+LIBNSPR_VERSION = 4.8.7
+LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
+LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/
+LIBNSPR_SUBDIR = mozilla/nsprpub
+LIBNSPR_INSTALL_STAGING = YES
+# Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly
+LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
+		   HOST_LDFLAGS="-lc"
+# NSPR mixes up --build and --host
+LIBNSPR_CONF_OPT = --host=$(GNU_HOST_NAME)
+
+$(eval $(call AUTOTARGETS,package,libnspr))

From c4d57780be46770f9b9374a85c1e790f54e9e5f2 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Tue, 5 Jul 2011 21:53:52 +0200
Subject: [PATCH 0360/6849] Makefile.package.in: Makes it possible to override
 the default extract commands

When using GENTARGETS (or macroes depending on it), there is no way of
specifying a custom extraction procedure. When using the patch one can
simply define $(PACKAGE_NAME)_EXTRACT_CMDS which will override the
default. If non is defined it will fall back to the default extract
procedure.

An example could look like this:

=== PACKAGE BEGIN ===
FGLRX_VERSION=11-3
FGLRX_SOURCE:=ati-driver-installer-$(FGLRX_VERSION)-x86.x86_64.run
FGLRX_SITE:=http://www2.ati.com/drivers/linux/

define FGLRX_EXTRACT_CMDS
	sh $(DL_DIR)/$(FGLRX_SOURCE) --extract $(@D)
endef

$(eval $(call GENTARGETS,package,fglrx))
=== PACKAGE END ===

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Cc: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 6b63bae080..c20d12c4a6 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -243,8 +243,7 @@ endif
 $(BUILD_DIR)/%/.stamp_extracted:
 	@$(call MESSAGE,"Extracting")
 	$(Q)mkdir -p $(@D)
-	$(Q)$(if $($(PKG)_SOURCE),$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
-	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -)
+	$($(PKG)_EXTRACT_CMDS)
 # some packages have messed up permissions inside
 	$(Q)chmod -R +rw $(@D)
 	$(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))
@@ -425,6 +424,10 @@ $(2)_TARGET_UNINSTALL =		$$($(2)_DIR)/.stamp_uninstalled
 $(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
 $(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
 
+# default extract command
+$(2)_EXTRACT_CMDS ?= $(if $($(2)_SOURCE),$(INFLATE$(suffix $($(2)_SOURCE))) $(DL_DIR)/$($(2)_SOURCE) | \
+	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $$($(2)_DIR) $(TAR_OPTIONS) -)
+
 # post-steps hooks
 $(2)_POST_EXTRACT_HOOKS         ?=
 $(2)_POST_PATCH_HOOKS           ?=

From 4ca599360235ac16cea940bdb2aa9dc3393dbce3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:53:53 +0200
Subject: [PATCH 0361/6849] Fix quoting in default extract command

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index c20d12c4a6..5b2e389e91 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -425,7 +425,8 @@ $(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
 $(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
 
 # default extract command
-$(2)_EXTRACT_CMDS ?= $(if $($(2)_SOURCE),$(INFLATE$(suffix $($(2)_SOURCE))) $(DL_DIR)/$($(2)_SOURCE) | \
+$(2)_EXTRACT_CMDS ?= \
+	$$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $(DL_DIR)/$$($(2)_SOURCE) | \
 	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $$($(2)_DIR) $(TAR_OPTIONS) -)
 
 # post-steps hooks

From eff25f4cca89d816665de469b7164267aaf52d4b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:53:54 +0200
Subject: [PATCH 0362/6849] linux: make it possible to install the kernel in
 /boot

[Peter: always copy to output/images as requested by Luca]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 8 ++++++++
 linux/linux.mk  | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 1f1a69c44e..bdfa5b7ef5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -153,6 +153,14 @@ config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
 	  Specify the kernel make target to build the kernel that you
 	  need.
 
+config BR2_LINUX_KERNEL_INSTALL_TARGET
+	bool "Install kernel image to /boot in target"
+	depends on !BR2_TARGET_ROOTFS_INITRAMFS
+	help
+	  Select this option to have the kernel image installed to
+	  /boot in the target root filesystem, as is typically done on
+	  x86/x86_64 systems.
+
 endif # BR2_LINUX_KERNEL
 
 endmenu
diff --git a/linux/linux.mk b/linux/linux.mk
index 43ca87b9f7..a5b9b8e2e7 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -157,6 +157,9 @@ $(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured $(LINUX26_DIR)/
 # Installation
 $(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
 	@$(call MESSAGE,"Installing kernel")
+ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
+	install -m 0644 -D $(LINUX26_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX26_IMAGE_NAME)
+endif
 	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target

From ce03b89881571e9dd3a5c83430f1d32a6a6307c3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 7 Jul 2011 23:40:09 +0200
Subject: [PATCH 0363/6849] linux: simplify modules check

No need to mix make and shell code.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index a5b9b8e2e7..f9fe4545f4 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -149,7 +149,7 @@ endif
 $(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured $(LINUX26_DIR)/.config
 	@$(call MESSAGE,"Compiling kernel")
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
-	@if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then 	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi
 	$(Q)touch $@
@@ -163,7 +163,7 @@ endif
 	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
-	@if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then 	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) 		\
 			DEPMOD="$(HOST_DIR)/usr/sbin/depmod" modules_install ;		\
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/build ;	\

From 2985998f2810fb3b45af4e1ee46eaec993959edb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:53:56 +0200
Subject: [PATCH 0364/6849] package: add infrastructure to install things in
 images/

This will allow the bootloader makefiles and the kernel makefile to
rely on the GENTARGETS infrastructure.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 5b2e389e91..f79359a584 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -304,6 +304,13 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 	$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 
+# Install to images dir
+$(BUILD_DIR)/%/.stamp_images_installed:
+	@$(call MESSAGE,'Installing to images directory')
+	$($(PKG)_INSTALL_IMAGES_CMDS)
+	$(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
 # Install to target dir
 $(BUILD_DIR)/%/.stamp_target_installed:
 	@$(call MESSAGE,"Installing to target")
@@ -408,12 +415,14 @@ endif
 
 $(2)_DEPENDENCIES		?=
 $(2)_INSTALL_STAGING		?= NO
+$(2)_INSTALL_IMAGES		?= NO
 $(2)_INSTALL_TARGET		?= YES
 $(2)_DIR_PREFIX			= $(if $(4),$(4),$(TOP_SRCDIR)/package)
 
 # define sub-target stamps
 $(2)_TARGET_INSTALL_TARGET =	$$($(2)_DIR)/.stamp_target_installed
 $(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
+$(2)_TARGET_INSTALL_IMAGES =	$$($(2)_DIR)/.stamp_images_installed
 $(2)_TARGET_INSTALL_HOST =      $$($(2)_DIR)/.stamp_host_installed
 $(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
 $(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
@@ -438,6 +447,7 @@ $(2)_POST_BUILD_HOOKS           ?=
 $(2)_POST_INSTALL_HOOKS         ?=
 $(2)_POST_INSTALL_STAGING_HOOKS ?=
 $(2)_POST_INSTALL_TARGET_HOOKS  ?=
+$(2)_POST_INSTALL_IMAGES_HOOKS  ?=
 
 # human-friendly targets and target sequencing
 $(1):			$(1)-install
@@ -445,7 +455,7 @@ $(1):			$(1)-install
 ifeq ($$($(2)_TYPE),host)
 $(1)-install:	        $(1)-install-host
 else
-$(1)-install:		$(1)-install-staging $(1)-install-target
+$(1)-install:		$(1)-install-staging $(1)-install-target $(1)-install-images
 endif
 
 ifeq ($$($(2)_INSTALL_TARGET),YES)
@@ -462,6 +472,13 @@ else
 $(1)-install-staging:
 endif
 
+ifeq ($$($(2)_INSTALL_IMAGES),YES)
+$(1)-install-images:	$(1)-build \
+			$$($(2)_TARGET_INSTALL_IMAGES)
+else
+$(1)-install-images:
+endif
+
 $(1)-install-host:      $(1)-build $$($(2)_TARGET_INSTALL_HOST)
 
 $(1)-build:		$(1)-configure \
@@ -493,6 +510,7 @@ $(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)
 # uppercase package variable prefix
 $$($(2)_TARGET_INSTALL_TARGET):		PKG=$(2)
 $$($(2)_TARGET_INSTALL_STAGING):	PKG=$(2)
+$$($(2)_TARGET_INSTALL_IMAGES):		PKG=$(2)
 $$($(2)_TARGET_INSTALL_HOST):           PKG=$(2)
 $$($(2)_TARGET_BUILD):			PKG=$(2)
 $$($(2)_TARGET_CONFIGURE):		PKG=$(2)

From 7a41cbf938d6a189109b8b15dc2cef8638c5a0c2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:53:57 +0200
Subject: [PATCH 0365/6849] package: fix patching procedure for host packages

The patching procedure was using $($(NOHOSTPKG)_NAME) to find the name
of the package without the host- prefix for host packages, which is
needed to find the package directory and the prefix of the patches.

However, this $($(NOHOSTPKG)_NAME) variable is empty when there is
only an host variant for the package and no target variant for it.

Therefore, instead of using this $($(NOHOSTPKG)_NAME) variable, we now
use a new $(RAWNAME) variable, which is always the name of the package
without the host- prefix, even for host packages.

Thanks to Yann E. Morin for providing the tip on using patsubst
instead of subst.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index f79359a584..8b5657b2dd 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -251,23 +251,21 @@ $(BUILD_DIR)/%/.stamp_extracted:
 
 # Patch
 #
-# The NOHOSTPKG variable is the uppercased package name, without the
-# HOST_ prefix, even for host packages. This allows to find the
-# patches in the package directory, because $($(NOHOSTPKG)_NAME)
-# expands to the package directory name.
-#
-$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(NOHOSTPKG)_NAME)-$($(PKG)_VERSION)
+# The RAWNAME variable is the lowercased package name, which allows to
+# find the package directory (typically package/<pkgname>) and the
+# prefix of the patches
+$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
 $(BUILD_DIR)/%/.stamp_patched:
-	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
+	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
 	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
 	$(Q)( \
-	if test -d $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME); then \
-	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME)/$(NAMEVER)*.patch*)"; then \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
+	if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
+	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
+	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
 	  else \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) $($(NOHOSTPKG)_NAME)\*.patch $($(NOHOSTPKG)_NAME)\*.patch.$(ARCH) || exit 1; \
-	    if test -d $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME)/$(NAMEVER); then \
-	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
+	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
+	    if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \
+	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
 	    fi; \
 	  fi; \
 	fi; \
@@ -515,7 +513,7 @@ $$($(2)_TARGET_INSTALL_HOST):           PKG=$(2)
 $$($(2)_TARGET_BUILD):			PKG=$(2)
 $$($(2)_TARGET_CONFIGURE):		PKG=$(2)
 $$($(2)_TARGET_PATCH):			PKG=$(2)
-$$($(2)_TARGET_PATCH):			NOHOSTPKG=$(3)
+$$($(2)_TARGET_PATCH):			RAWNAME=$(patsubst host-%,%,$(1))
 $$($(2)_TARGET_EXTRACT):		PKG=$(2)
 $$($(2)_TARGET_SOURCE):			PKG=$(2)
 $$($(2)_TARGET_UNINSTALL):		PKG=$(2)

From c94224930cbb2dd4377f9c0a061828fcc637b0e4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 8 Jul 2011 14:17:39 +0200
Subject: [PATCH 0366/6849] libgtk2: fix host build after 7a41cbf938d (fix
 patching procedure for host packages)

NOHOSTPKG is no more, use RAWNAME instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/libgtk2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 33ed727b42..be4531ecbe 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -139,7 +139,7 @@ HOST_LIBGTK2_CONF_OPT = \
 		--disable-debug
 
 define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
- toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) host-*.patch
+ toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
 endef
 
 HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK

From 1ff88054a84f1fd6a28465aad4e6bed241e431d9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:53:59 +0200
Subject: [PATCH 0367/6849] barebox: convert to GENTARGETS

[Peter: add ':=' -> '=' change]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 68 +++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index f3e769f4cf..34ec5dadf2 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,12 +4,16 @@
 #
 #############################################################
 
-BAREBOX_VERSION:=2011.05.0
-BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2
-BAREBOX_SITE:=http://www.barebox.org/download/
-BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION)
-BAREBOX_CAT:=$(BZCAT)
-BAREBOX_BOARD_DEFCONFIG:=$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))
+BAREBOX_VERSION = 2011.05.0
+BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
+BAREBOX_SITE = http://www.barebox.org/download/
+
+BAREBOX_INSTALL_IMAGES = YES
+ifneq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
+BAREBOX_INSTALL_TARGET = NO
+endif
+
+BAREBOX_BOARD_DEFCONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))
 
 ifeq ($(KERNEL_ARCH),i386)
 BAREBOX_ARCH=x86
@@ -21,41 +25,33 @@ endif
 
 BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
 
-$(DL_DIR)/$(BAREBOX_SOURCE):
-	 $(call DOWNLOAD,$(BAREBOX_SITE),$(BAREBOX_SOURCE))
-
-$(BAREBOX_DIR)/.unpacked: $(DL_DIR)/$(BAREBOX_SOURCE)
-	mkdir -p $(@D)
-	$(INFLATE$(suffix $(BAREBOX_SOURCE))) $(DL_DIR)/$(BAREBOX_SOURCE) \
-		| tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-	touch $@
+define BAREBOX_CONFIGURE_CMDS
+	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) $(BAREBOX_BOARD_DEFCONFIG)_defconfig
+endef
 
-$(BAREBOX_DIR)/.patched: $(BAREBOX_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(BAREBOX_DIR) boot/barebox \
-		barebox-$(BAREBOX_VERSION)-\*.patch \
-		barebox-$(BAREBOX_VERSION)-\*.patch.$(ARCH)
-	touch $@
-
-$(BAREBOX_DIR)/.configured: $(BAREBOX_DIR)/.patched
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) $(BAREBOX_BOARD_DEFCONFIG)_defconfig
-	touch $@
+ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
+define BAREBOX_BUILD_BAREBOXENV_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $(@D)/bareboxenv \
+		$(@D)/scripts/bareboxenv.c
+endef
+endif
 
-$(BAREBOX_DIR)/.built: $(BAREBOX_DIR)/.configured
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR)
-	touch $@
+define BAREBOX_BUILD_CMDS
+	$(BAREBOX_BUILD_BAREBOXENV_CMDS)
+	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D)
+endef
 
-$(BAREBOX_DIR)/.installed: $(BAREBOX_DIR)/.built
-	cp $(BAREBOX_DIR)/barebox.bin $(BINARIES_DIR)
-	touch $@
+define BAREBOX_INSTALL_IMAGES_CMDS
+	cp $(@D)/barebox.bin $(BINARIES_DIR)
+endef
 
-# bareboxenv for the target
-$(TARGET_DIR)/usr/bin/bareboxenv: $(BAREBOX_DIR)/.configured
-	mkdir -p $(@D)
-	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $@ \
-		$(BAREBOX_DIR)/scripts/bareboxenv.c
+ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
+define BAREBOX_INSTALL_TARGET_CMDS
+	cp $(@D)/bareboxenv $(TARGET_DIR)/usr/bin
+endef
+endif
 
-barebox: $(BAREBOX_DIR)/.installed \
-	$(if $(BR2_TARGET_BAREBOX_BAREBOXENV),$(TARGET_DIR)/usr/bin/bareboxenv)
+$(eval $(call GENTARGETS,boot,barebox))
 
 ifeq ($(BR2_TARGET_BAREBOX),y)
 TARGETS+=barebox

From df9624b73feeb5e0dda0ed4772efcce1679add5b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:00 +0200
Subject: [PATCH 0368/6849] at91bootstrap: convert to GENTARGETS

[Peter: add ':=' -> '=' change]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk | 57 ++++++++++-------------------
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 3d4308edfa..37f8ac70c4 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -3,50 +3,33 @@
 # at91bootstrap
 #
 #############################################################
-AT91BOOTSTRAP_VERSION:=1.16
-AT91BOOTSTRAP_NAME:=AT91Bootstrap$(AT91BOOTSTRAP_VERSION)
-AT91BOOTSTRAP_SITE:=http://www.atmel.com/dyn/resources/prod_documents/
-AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).zip
-AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/at91bootstrap-$(AT91BOOTSTRAP_VERSION)
+AT91BOOTSTRAP_VERSION = 1.16
+AT91BOOTSTRAP_SITE = http://www.atmel.com/dyn/resources/prod_documents/
+AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip
 
-AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
-AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
-AT91BOOTSTRAP_BINARY:=$(AT91BOOTSTRAP_MEMORY)_$(AT91BOOTSTRAP_BOARD).bin
-AT91BOOTSTRAP_BUILD_DIR:=$(AT91BOOTSTRAP_DIR)/board/$(AT91BOOTSTRAP_BOARD)/$(AT91BOOTSTRAP_MEMORY)
-AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_BUILD_DIR)/$(AT91BOOTSTRAP_BINARY)
+AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
+AT91BOOTSTRAP_MEMORY = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
+AT91BOOTSTRAP_MAKE_SUBDIR = board/$(AT91BOOTSTRAP_BOARD)/$(AT91BOOTSTRAP_MEMORY)
+AT91BOOTSTRAP_BINARY = $(AT91BOOTSTRAP_MAKE_SUBDIR)/$(AT91BOOTSTRAP_MEMORY)_$(AT91BOOTSTRAP_BOARD).bin
 
-$(DL_DIR)/$(AT91BOOTSTRAP_SOURCE):
-	 $(call DOWNLOAD,$(AT91BOOTSTRAP_SITE),$(AT91BOOTSTRAP_SOURCE))
+AT91BOOTSTRAP_INSTALL_IMAGES = YES
+AT91BOOTSTRAP_INSTALL_TARGET = NO
 
-$(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
-	mkdir -p $(BUILD_DIR)
+define AT91BOOTSTRAP_EXTRACT_CMDS
 	unzip -d $(BUILD_DIR) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
-	mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION) $(AT91BOOTSTRAP_DIR)
-	touch $@
+	mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D)
+	rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)
+endef
 
-$(AT91BOOTSTRAP_DIR)/.patched: $(AT91BOOTSTRAP_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) boot/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch
-	touch $@
+define AT91BOOTSTRAP_BUILD_CMDS
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR)
+endef
 
-$(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.patched
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
-		-C $(AT91BOOTSTRAP_BUILD_DIR)
+define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS
+	cp $(@D)/$(AT91BOOTSTRAP_BINARY) $(BINARIES_DIR)
+endef
 
-$(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET)
-	mkdir -p $(dir $@)
-	cp $^ $@
-
-at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-
-at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
-
-at91bootstrap-unpacked: $(AT91BOOTSTRAP_DIR)/.unpacked
-
-at91bootstrap-clean:
-	make -C $(AT91BOOTSTRAP_BUILD_DIR) clean
-
-at91bootstrap-dirclean:
-	rm -rf $(AT91BOOTSTRAP_DIR)
+$(eval $(call GENTARGETS,boot,at91bootstrap))
 
 #############################################################
 #

From 4346902ca9a0e91e915ba40a50a66d66941d3c67 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:02 +0200
Subject: [PATCH 0369/6849] at91dataflashboot: convert to GENTARGETS

This commit converts the at91dataflashboot bootloader build process to
GENTARGETS. It also does the following changes :

 * As the package directory name is at91dataflashboot, the
   configuration options and make variables are renamed to
   AT91DATAFLASHBOOT instead of DATAFLASHBOOT.

 * Since the board selection in Kconfig wasn't used anywhere, get rid
   of it. at91dataflashboot is only for AT91RM9200 apparently anyway.

[Peter: add ':=' -> '=' change]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91dataflashboot/Config.in            | 24 +-----------
 boot/at91dataflashboot/at91dataflashboot.mk | 43 +++++++--------------
 2 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index 25b9723c85..88cd058f58 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,25 +1,3 @@
-menuconfig BR2_TARGET_DATAFLASHBOOT
+menuconfig BR2_TARGET_AT91DATAFLASHBOOT
        depends on BR2_arm
        bool "AT91 DataFlashBoot"
-
-if BR2_TARGET_DATAFLASHBOOT
-
-choice
-	prompt "Target Architecture"
-	default BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-	help
-	  Select Chip for which Dataflash boot should be built
-	  Currently only AT91RM9200 Supported
-
-config BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-	bool "AT91RM9200"
-
-config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261
-	bool "AT91SAM9261"
-
-config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261S
-	bool "AT91SAM9261S"
-
-endchoice
-
-endif # BR2_TARGET_DATAFLASHBOOT
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 32591f79f3..9b6cf21166 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -3,44 +3,29 @@
 # DataFlashBoot
 #
 #############################################################
-DATAFLASHBOOT_VERSION:=1.05
-DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION)
-DATAFLASHBOOT_SITE:=ftp://www.at91.com/pub/buildroot/
-DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2
-DATAFLASHBOOT_DIR:=$(BUILD_DIR)/at91dataflashboot-$(DATAFLASHBOOT_VERSION)
-DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin
 
-$(DL_DIR)/$(DATAFLASHBOOT_SOURCE):
-	 $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE))
+AT91DATAFLASHBOOT_VERSION = 1.05
+AT91DATAFLASHBOOT_SOURCE = DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).tar.bz2
+AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot/
 
-$(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	mkdir -p $(@D)
-	$(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-	touch $@
+AT91DATAFLASHBOOT_INSTALL_TARGET = NO
+AT91DATAFLASHBOOT_INSTALL_IMAGES = YES
 
-$(DATAFLASHBOOT_DIR)/.patched: $(DATAFLASHBOOT_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(@D) boot/at91dataflashboot \
-		at91dataflashboot-$(DATAFLASHBOOT_VERSION)-\*.patch
-	touch $@
+define AT91DATAFLASHBOOT_BUILD_CMDS
+	make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS)
+endef
 
-$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.patched
-	ls $(DATAFLASHBOOT_DIR)/.unpacked
-	make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
+define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
+	cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR)
+endef
 
-dataflashboot-clean:
-	make -C $(DATAFLASHBOOT_DIR) clean
-
-dataflashboot-dirclean:
-	rm -rf $(DATAFLASHBOOT_DIR)
-
-dataflash:	 $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
-	cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR)
+$(eval $(call GENTARGETS,boot,at91dataflashboot))
 
 #############################################################
 #
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
-TARGETS+=dataflash
+ifeq ($(BR2_TARGET_AT91DATAFLASHBOOT),y)
+TARGETS+=at91dataflashboot
 endif

From 5391de7771b1d8f9d6f6f6fad7bb8a39247e31e9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:04 +0200
Subject: [PATCH 0370/6849] syslinux: convert to GENTARGETS

Moreover, the installation of pxelinux and/or isolinux is now handled
as suboptions, like we traditionally do for other packages. This allows
to have a single option (BR2_TARGET_SYSLINUX) that enables the
syslinux package.

[Peter: drop basename in install step]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/syslinux/Config.in   | 14 +++++++----
 boot/syslinux/syslinux.mk | 50 +++++++++++++--------------------------
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index 5650f91ba9..60f3b8f9cd 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -5,8 +5,12 @@ config BR2_TARGET_SYSLINUX
 	  The syslinux bootloader for x86 systems.
 	  This includes: syslinux, pxelinux, extlinux.
 
-config BR2_TARGET_PXELINUX
-	bool "pxelinux"
-	depends on BR2_i386 || BR2_x86_64
-	help
-	  The pxelinux loader for x86 systems.
+config BR2_TARGET_SYSLINUX_ISOLINUX
+	bool "Install isolinux"
+	depends on BR2_TARGET_SYSLINUX
+	default y
+
+config BR2_TARGET_SYSLINUX_PXELINUX
+	bool "Install pxelinux"
+	depends on BR2_TARGET_SYSLINUX
+	default y
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 192e90502c..e9c32b6409 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,42 +4,29 @@
 #
 #############################################################
 
-SYSLINUX_VERSION:=3.85
-SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
-SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
-SYSLINUX_CAT:=$(BZCAT)
-SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
+SYSLINUX_VERSION = 3.85
+SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
+SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
 
-$(DL_DIR)/$(SYSLINUX_SOURCE):
-	 $(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE))
+SYSLINUX_INSTALL_TARGET = NO
+SYSLINUX_INSTALL_IMAGES = YES
 
-syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE)
+SYSLINUX_DEPENDENCIES = host-nasm
 
-$(SYSLINUX_DIR)/.unpacked: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
-	mkdir -p $(@D)
-	$(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(@D) boot/syslinux/ \*.patch
-	touch -c $@
+define SYSLINUX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(@D)
+endef
 
-$(SYSLINUX_DIR)/.compiled: $(SYSLINUX_DIR)/.unpacked
-	$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
-	touch -c $@
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += pxelinux.bin
 
-$(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled
-	cp -a $(SYSLINUX_DIR)/core/isolinux.bin $@
+define SYSLINUX_INSTALL_IMAGES_CMDS
+	for i in $(SYSLINUX_IMAGES-y); do \
+		$(INSTALL) -D -m 0755 $(@D)/core/$$i $(BINARIES_DIR)/$$i; \
+	done
+endef
 
-$(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled
-	cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@
-
-syslinux: host-nasm $(BINARIES_DIR)/isolinux.bin
-pxelinux: host-nasm $(BINARIES_DIR)/pxelinux.bin
-
-pxelinux-clean syslinux-clean:
-	rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin
-	-$(MAKE) -C $(SYSLINUX_DIR) clean
-
-pxelinux-dirclean syslinux-dirclean:
-	rm -rf $(SYSLINUX_DIR)
+$(eval $(call GENTARGETS,boot,syslinux))
 
 #############################################################
 #
@@ -49,6 +36,3 @@ pxelinux-dirclean syslinux-dirclean:
 ifeq ($(BR2_TARGET_SYSLINUX),y)
 TARGETS+=syslinux
 endif
-ifeq ($(BR2_TARGET_PXELINUX),y)
-TARGETS+=pxelinux
-endif

From a4f58506ac7b120f3c2414e1f4034965b7c57b4e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:05 +0200
Subject: [PATCH 0371/6849] grub: convert to AUTOTARGETS

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/grub/grub.500-build-fix.patch |  14 ++++
 boot/grub/grub.mk                  | 102 +++++++++++------------------
 2 files changed, 53 insertions(+), 63 deletions(-)
 create mode 100644 boot/grub/grub.500-build-fix.patch

diff --git a/boot/grub/grub.500-build-fix.patch b/boot/grub/grub.500-build-fix.patch
new file mode 100644
index 0000000000..b096b7b80f
--- /dev/null
+++ b/boot/grub/grub.500-build-fix.patch
@@ -0,0 +1,14 @@
+--- grub-0.97.orig/netboot/main.c       2004-05-21 00:19:33.000000000 +0200
++++ grub-0.97/netboot/main.c    2007-07-20 02:31:28.000000000 +0200
+@@ -54,9 +54,9 @@
+ 
+ static int vendorext_isvalid;
+ static unsigned long netmask;
+-static struct bootpd_t bootp_data;
++struct bootpd_t bootp_data;
+ static unsigned long xid;
+-static unsigned char *end_of_rfc1533 = NULL;
++unsigned char *end_of_rfc1533 = NULL;
+
+ #ifndef        NO_DHCP_SUPPORT
+ #endif /* NO_DHCP_SUPPORT */
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 9461d1cbde..49384169f1 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -3,23 +3,17 @@
 # grub
 #
 #############################################################
-GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-35.diff.gz
-GRUB_SITE:=http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/
-GRUB_PATCH_SITE:=$(GRUB_SITE)
-GRUB_CAT:=$(ZCAT)
-GRUB_DIR:=$(BUILD_DIR)/grub-0.97
-GRUB_BINARY:=grub/grub
-GRUB_TARGET_BINARY:=sbin/grub
-GRUB_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
+GRUB_VERSION = 0.97
+GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
+GRUB_PATCH  = grub_$(GRUB_VERSION)-35.diff.gz
+GRUB_SITE   = http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/
 
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV
 ifeq ($(BR2_LARGEFILE),)
 GRUB_CFLAGS+=-U_FILE_OFFSET_BITS
 endif
 
-
 GRUB_CONFIG-$(BR2_TARGET_GRUB_SPLASH) += --enable-graphics
 GRUB_CONFIG-$(BR2_TARGET_GRUB_DISKLESS) += --enable-diskless
 GRUB_CONFIG-$(BR2_TARGET_GRUB_3c595) += --enable-3c595
@@ -44,69 +38,51 @@ GRUB_CONFIG-$(BR2_TARGET_GRUB_undi) += --enable-undi
 GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine
 GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
 
-$(DL_DIR)/$(GRUB_SOURCE):
-	 $(call DOWNLOAD,$(GRUB_SITE),$(GRUB_SOURCE))
-
-$(DL_DIR)/$(GRUB_PATCH):
-	 $(call DOWNLOAD,$(GRUB_PATCH_SITE),$(GRUB_PATCH))
+define GRUB_DEBIAN_PATCHES
+	# Apply the patches from the Debian patch
+	(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \
+		cat debian/patches/$$f | patch -p1 ; \
+	done)
+endef
 
-grub-source: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
+GRUB_POST_PATCH_HOOKS += GRUB_DEBIAN_PATCHES
 
-$(GRUB_DIR)/.unpacked: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
-	$(GRUB_CAT) $(DL_DIR)/$(GRUB_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	toolchain/patch-kernel.sh $(GRUB_DIR) $(DL_DIR) $(GRUB_PATCH)
-	for i in `grep -v "^#" $(GRUB_DIR)/debian/patches/00list`; do \
-		cat $(GRUB_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB_DIR); \
-	done
-	toolchain/patch-kernel.sh $(GRUB_DIR) boot/grub grub.\*.patch{,.bz2}
-	touch $@
+GRUB_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) $(GRUB_CFLAGS)"
 
-$(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked
-	(cd $(GRUB_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(GRUB_CFLAGS)" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/ \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-auto-linux-mem-opt \
-		$(GRUB_CONFIG-y) \
-	)
-	touch $@
+GRUB_CONF_OPT = \
+	--disable-auto-linux-mem-opt \
+	$(GRUB_CONFIG-y)
 
-$(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured
-	$(MAKE) CC="$(TARGET_CC)" -C $(GRUB_DIR)
-	rm -f $(GRUB_DIR)/$(GRUB_BINARY)
-	$(MAKE) CC="$(TARGET_CC)" CFLAGS+=-static -C $(GRUB_DIR)/grub grub
-	mkdir -p $(dir $(STAGING_DIR)/$(GRUB_TARGET_BINARY))
-	mv $(GRUB_DIR)/$(GRUB_BINARY) $(STAGING_DIR)/$(GRUB_TARGET_BINARY).static
-	$(MAKE) CC="$(TARGET_CC)" -C $(GRUB_DIR)/grub
+define GRUB_INSTALL_STAGING_CMDS
+	install -m 0755 -D $(@D)/grub/grub $(STAGING_DIR)/sbin/grub
+endef
 
-$(GRUB_DIR)/.installed: $(GRUB_DIR)/$(GRUB_BINARY)
-	cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/$(GRUB_TARGET_BINARY)
-	test -d $(TARGET_DIR)/boot/grub || mkdir -p $(TARGET_DIR)/boot/grub
-	cp $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage2/*1_5 $(GRUB_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub/
 ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
-	test -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) || \
-		cp $(GRUB_SPLASHIMAGE) $(TARGET_DIR)/boot/grub/
+define GRUB_INSTALL_SPLASH
+	cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/
+endef
 endif
-	touch $@
 
-grub: $(GRUB_DIR)/.installed
+define GRUB_INSTALL_TARGET_CMDS
+	install -m 0755 -D $(@D)/grub/grub $(TARGET_DIR)/sbin/grub
+	mkdir -p $(TARGET_DIR)/boot/grub
+	cp $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub
+	cp $(@D)/stage2/*1_5   $(TARGET_DIR)/boot/grub
+	cp $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub
+	$(GRUB_INSTALL_SPLASH)
+endef
+
+define GRUB_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/sbin/grub
+endef
 
-grub-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(GRUB_DIR) uninstall
-	-$(MAKE) -C $(GRUB_DIR) clean
-	rm -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) \
-		$(TARGET_DIR)/sbin/$(GRUB_BINARY) \
-		$(TARGET_DIR)/boot/grub/{stage{1,2},*1_5}
+define GRUB_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/sbin/grub
+	rm -rf $(TARGET_DIR)/boot/grub
+endef
 
-grub-dirclean:
-	rm -rf $(GRUB_DIR)
+$(eval $(call AUTOTARGETS,boot,grub))
 
 #############################################################
 #

From a5dc0cdced48522938ac7f6be1ba6763bc7a6afc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:06 +0200
Subject: [PATCH 0372/6849] grub2: remove package

Grub 2 has been marked BROKEN in June 2010, and nobody cared to fix it
since then.

At that time, it was marked broken because the build process needed a
Ruby interpreter available on the host, and it's really a pain that
building a bootloader needs such a thing.

I've tried to upgrade the package to Grub2 1.99-rcX, and now it does
not need a Ruby interpreter anymore, but instead requires a tool
called "autogen", which itself needs the Guile Scheme interpreter.

Since we haven't heard any complaints about Grub2 being marked broken,
and since it's such a pain to package, let's get rid of it. Of course,
anybody interested in Grub2 is invited to contribute a working
package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/Config.in       |  1 -
 boot/grub2/Config.in |  9 -----
 boot/grub2/grub2.mk  | 93 --------------------------------------------
 3 files changed, 103 deletions(-)
 delete mode 100644 boot/grub2/Config.in
 delete mode 100644 boot/grub2/grub2.mk

diff --git a/boot/Config.in b/boot/Config.in
index 6bcc98af54..67ab8aca4e 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -2,7 +2,6 @@ menu "Bootloaders"
 
 source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
-source "boot/grub2/Config.in"
 source "boot/syslinux/Config.in"
 source "boot/u-boot/Config.in"
 source "boot/at91bootstrap/Config.in"
diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
deleted file mode 100644
index 1301b5b80d..0000000000
--- a/boot/grub2/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_TARGET_GRUB2
-	bool "grub2"
-	# Only supports PC, Mac (Power, x86 and x86-64), Pegasos
-	depends on BR2_i386 || BR2_powerpc
-	# Build process is broken (./configure doesn't work, Ruby
-	# required, etc.)
-	depends on BROKEN
-	help
-	  The GRand Unified Bootloader for x86 systems, take #2.
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
deleted file mode 100644
index f939d9a435..0000000000
--- a/boot/grub2/grub2.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#############################################################
-#
-# grub2
-#
-# TODO
-#
-#  * grub2's autogen uses ruby, which isn't part of the core Debian
-#    installation. So either decide it is a requirement for Buildroot,
-#    or build it for the host.
-#
-#  * improve the installation procedure. For the moment, it just
-#    installs everything in $(TARGET_DIR).
-#
-#############################################################
-GRUB2_SOURCE:=grub2_1.98.orig.tar.gz
-GRUB2_PATCH:=grub2_1.98-1.diff.gz
-GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
-GRUB2_PATCH_SITE:=$(GRUB2_SITE)
-GRUB2_CAT:=$(ZCAT)
-GRUB2_DIR:=$(BUILD_DIR)/grub-1.98
-
-GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
-ifeq ($(BR2_LARGEFILE),)
-GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
-endif
-
-$(DL_DIR)/$(GRUB2_SOURCE):
-	 $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE))
-
-$(DL_DIR)/$(GRUB2_PATCH):
-	 $(call DOWNLOAD,$(GRUB2_PATCH_SITE),$(GRUB2_PATCH))
-
-grub2-source: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
-
-$(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
-	mkdir -p $(@D)
-	$(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) -xvf -
-	toolchain/patch-kernel.sh $(@D) $(DL_DIR) $(GRUB2_PATCH)
-	for i in `grep -v "^#" $(@D)/debian/patches/00list`; do \
-		cat $(@D)/debian/patches/$$i | patch -p1 -d $(@D); \
-	done
-	toolchain/patch-kernel.sh $(@D) boot/grub2 grub-\*.patch
-	touch $@
-
-$(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
-	(cd $(GRUB2_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) ; \
-		./autogen.sh ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CPPFLAGS="$(GRUB2_CFLAGS)" \
-		grub_cv_i386_check_nested_functions=no \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/ \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-grub-mkfont \
-		--disable-grub-fstest \
-		--disable-grub-emu-usb \
-		--disable-werror \
-		$(DISABLE_LARGEFILE) \
-		$(GRUB2_CONFIG-y) \
-	)
-	touch $@
-
-$(GRUB2_DIR)/.compiled: $(GRUB2_DIR)/.configured
-	$(MAKE) CC="$(TARGET_CC)" -C $(@D)
-	touch $@
-
-$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/.compiled
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
-	touch $@
-
-grub2: host-automake host-autoconf $(GRUB2_DIR)/.installed
-
-grub2-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(GRUB2_DIR) uninstall
-	-$(MAKE) -C $(GRUB2_DIR) clean
-
-grub2-dirclean:
-	rm -rf $(GRUB2_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_GRUB2),y)
-TARGETS+=grub2
-endif

From ec0b51648b68de94f715fadef9a3a9085c15e22a Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 10 Jul 2011 16:30:33 +0300
Subject: [PATCH 0373/6849] libarchive: bump to version 2.8.4

The libxml2 dependency is new in this version, and does not behave nicely with
cross compile. The configure script looks for the host xml2-config. Add
'--disable-xml2' as a workaround for now.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libarchive/libarchive.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 0038cd3510..563c9d7bc0 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -3,7 +3,7 @@
 # libarchive (reusable C library for archive formats)
 #
 #############################################################
-LIBARCHIVE_VERSION = 2.7.1
+LIBARCHIVE_VERSION = 2.8.4
 LIBARCHIVE_SITE = http://libarchive.googlecode.com/files/
 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz
 LIBARCHIVE_INSTALL_STAGING = YES
@@ -14,6 +14,7 @@ LIBARCHIVE_DEPENDENCIES = zlib
 endif
 
 LIBARCHIVE_CONF_OPT = \
+	--without-xml2 \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDTAR),--enable-bsdtar,--disable-bsdtar) \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),--enable-bsdcpio,--disable-bsdcpio)
 

From 9eb70889bc7ec28790ac488a8edf5cd4404c2467 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jul 2011 19:52:52 +0200
Subject: [PATCH 0374/6849] libarchive: add optional libxml2 support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libarchive/libarchive.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 563c9d7bc0..d53904768d 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -14,8 +14,14 @@ LIBARCHIVE_DEPENDENCIES = zlib
 endif
 
 LIBARCHIVE_CONF_OPT = \
-	--without-xml2 \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDTAR),--enable-bsdtar,--disable-bsdtar) \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),--enable-bsdcpio,--disable-bsdcpio)
 
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+LIBARCHIVE_DEPENDENCIES += libxml2
+LIBARCHIVE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
+else
+LIBARCHIVE_CONF_OPT += --without-xml2
+endif
+
 $(eval $(call AUTOTARGETS,package,libarchive))

From db52b63005b623c37975a2b42c905c3cbd7c8c1c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jul 2011 20:38:56 +0200
Subject: [PATCH 0375/6849] kernel-headers: bump 2.6.39.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 2a5cf5c290..774810f5d9 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -50,6 +50,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
-	default "2.6.39.2"	if BR2_KERNEL_HEADERS_2_6_39
+	default "2.6.39.3"	if BR2_KERNEL_HEADERS_2_6_39
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From a315ee3c662cfb9165ee959aa78b86f61177d6a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jul 2011 20:39:44 +0200
Subject: [PATCH 0376/6849] linux: bump 2.6.39.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index bdfa5b7ef5..bf16ddf2b7 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_39
 
 config BR2_LINUX_KERNEL_2_6_39
-	bool "2.6.39.2"
+	bool "2.6.39.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.39.2"
+	default "2.6.39.3"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.39.2" if BR2_LINUX_KERNEL_2_6_39
+	default "2.6.39.3" if BR2_LINUX_KERNEL_2_6_39
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e82604ccdd38aa3ee2884d4f143d8be7106fdbd9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:07 +0200
Subject: [PATCH 0377/6849] u-boot: convert to GENTARGETS

The feature of building mkimage for the target is removed, it wasn't
building with current U-Boot, and doesn't make a lot of sense (mkimage
is needed only to prepare a kernel image, or an U-Boot script).

The feature of building mkimage for the host is moved to a proper
package. It duplicates a few things (U-Boot URL, etc.) but it makes
things a lot cleaner than having it handled by boot/u-boot/u-boot.mk.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/u-boot/Config.in |   5 -
 boot/u-boot/u-boot.mk | 218 ++++++++++++++----------------------------
 2 files changed, 74 insertions(+), 149 deletions(-)

diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in
index 00a4a5f246..aada346e72 100644
--- a/boot/u-boot/Config.in
+++ b/boot/u-boot/Config.in
@@ -77,11 +77,6 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 
 endchoice
 
-config BR2_TARGET_UBOOT_TOOL_MKIMAGE
-	bool "mkimage tool in target"
-	help
-	  Install mkimage tool in target.
-
 config BR2_TARGET_UBOOT_TOOL_ENV
 	bool "fw_printenv tool in target"
 	help
diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk
index 047f2c87e2..215b1c71bf 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/u-boot/u-boot.mk
@@ -3,43 +3,31 @@
 # U-Boot
 #
 #############################################################
-U_BOOT_VERSION:=$(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
-U_BOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
-
-# U-Boot may not be selected in the configuration, but mkimage might
-# be needed to build/prepare a kernel image. In this case, we just
-# pick some random stable U-Boot version that will be used just to
-# build mkimage.
-ifeq ($(U_BOOT_VERSION),)
-U_BOOT_VERSION=2011.03
-endif
+U_BOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+U_BOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+
+U_BOOT_INSTALL_IMAGES = YES
 
 ifeq ($(U_BOOT_VERSION),custom)
 # Handle custom U-Boot tarballs as specified by the configuration
-U_BOOT_TARBALL=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
-U_BOOT_SITE:=$(dir $(U_BOOT_TARBALL))
-U_BOOT_SOURCE:=$(notdir $(U_BOOT_TARBALL))
+U_BOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
+U_BOOT_SITE    = $(dir $(U_BOOT_TARBALL))
+U_BOOT_SOURCE  = $(notdir $(U_BOOT_TARBALL))
 else
 # Handle stable official U-Boot versions
-U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot
-U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
+U_BOOT_SITE    = ftp://ftp.denx.de/pub/u-boot
+U_BOOT_SOURCE  = u-boot-$(U_BOOT_VERSION).tar.bz2
 endif
 
-U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
-U_BOOT_CAT:=$(BZCAT)
-
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
-U_BOOT_BIN:=u-boot.kwb
-U_BOOT_MAKE_OPT:=$(U_BOOT_BIN)
+U_BOOT_BIN          = u-boot.kwb
+U_BOOT_MAKE_TARGET  = $(U_BOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
-U_BOOT_BIN:=u-boot.ldr
+U_BOOT_BIN          = u-boot.ldr
 else
-U_BOOT_BIN:=u-boot.bin
+U_BOOT_BIN          = u-boot.bin
 endif
 
-MKIMAGE:=$(HOST_DIR)/usr/bin/mkimage
-
-U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(MKIMAGE)
 U_BOOT_ARCH=$(KERNEL_ARCH)
 
 # u-boot in the past used arch=ppc for powerpc
@@ -47,139 +35,81 @@ ifneq ($(findstring x2010.03,x$(U_BOOT_VERSION)),)
 U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
 endif
 
-U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
-
-ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
-U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
-endif
-ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
-endif
-
 U_BOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
-
-# Define a helper function
+U_BOOT_MAKE_OPTS += \
+	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+	ARCH=$(U_BOOT_ARCH)
+
+# Helper function to fill the U-Boot config.h file.
+# Argument 1: option name
+# Argument 2: option value
+# If the option value is empty, this function does nothing.
 define insert_define
-@echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
-@echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
-@echo "#endif" >> $(U_BOOT_INC_CONF_FILE)
-@echo '#define $(strip $(1)) $(call qstrip,$(2))' >> $(U_BOOT_INC_CONF_FILE)
+$(if $(call qstrip,$(2)),
+	@echo "#ifdef $(strip $(1))" >> $(@D)/include/config.h
+	@echo "#undef $(strip $(1))" >> $(@D)/include/config.h
+	@echo "#endif" >> $(@D)/include/config.h
+	@echo '#define $(strip $(1)) $(call qstrip,$(2))' >> $(@D)/include/config.h)
 endef
 
-$(DL_DIR)/$(U_BOOT_SOURCE):
-	 $(call DOWNLOAD,$(U_BOOT_SITE),$(U_BOOT_SOURCE))
-
-$(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE)
-	mkdir -p $(@D)
-	$(INFLATE$(suffix $(U_BOOT_SOURCE))) $(DL_DIR)/$(U_BOOT_SOURCE) \
-		| tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-	touch $@
-
-$(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \
-		u-boot-$(U_BOOT_VERSION)-\*.patch \
-		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
 ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch
-endif
-	touch $@
+define U_BOOT_APPLY_CUSTOM_PATCHES
+	toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
+		u-boot-$(U_BOOT_VERSION)-\*.patch
+endef
 
-$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
-ifeq ($(U_BOOT_BOARD_NAME),)
-	$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
+U_BOOT_POST_PATCH_HOOKS += U_BOOT_APPLY_CUSTOM_PATCHES
 endif
-	$(TARGET_CONFIGURE_OPTS)		\
-		$(U_BOOT_CONFIGURE_OPTS) \
-		$(MAKE) -C $(U_BOOT_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
+
+define U_BOOT_CONFIGURE_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(U_BOOT_CONFIGURE_OPTS) 	\
+		$(MAKE) -C $(@D) $(U_BOOT_MAKE_OPTS)		\
 		$(U_BOOT_BOARD_NAME)_config
-	touch $@
-
-$(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured
-	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)
-ifdef BR2_TARGET_UBOOT_NETWORK
-	@echo >> $(U_BOOT_INC_CONF_FILE)
-	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)
-	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
-	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
-	$(call insert_define, DATE, $(DATE))
-	$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
-ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
-	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
-	$(call insert_define, CONFIG_GATEWAYIP, $(BR2_TARGET_UBOOT_GATEWAY))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_NETMASK)),"")
-	$(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
-	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"")
-	$(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
-	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
-endif
-	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
-endif # BR2_TARGET_UBOOT_NETWORK
-	touch $@
-
-# Build U-Boot itself
-$(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
-	$(TARGET_CONFIGURE_OPTS) \
-		$(U_BOOT_CONFIGURE_OPTS) \
-		$(MAKE) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
-		$(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR)
-
-# Copy the result to the images/ directory
-$(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
-	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
-	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/
-
-# Build just mkimage for the host. It might have already been built by
-# the U-Boot build procedure, but mkimage may also be needed even if
-# U-Boot isn't selected in the configuration, to generate a kernel
-# uImage.
-$(MKIMAGE): $(U_BOOT_DIR)/.patched
-	mkdir -p $(@D)
-	$(MAKE) -C $(U_BOOT_DIR) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) tools
-	cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D)
-
-# Build manually mkimage for the target
-$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
-	mkdir -p $(@D)
-	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
-		-DUSE_HOSTCC -o $@ \
-		$(U_BOOT_DIR)/common/image.c \
-		$(wildcard $(addprefix $(U_BOOT_DIR)/tools/,default_image.c \
-			fit_image.c imximage.c kwbimage.c mkimage.c)) \
-		$(addprefix $(U_BOOT_DIR)/lib*/,crc32.c md5.c sha1.c) \
-		$(U_BOOT_DIR)/tools/os_support.c \
-		$(wildcard $(U_BOOT_DIR)/libfdt/fdt*.c $(U_BOOT_DIR)/lib/libfdt/fdt*.c)
-
-# Build manually fw_printenv for the target
-$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) \
-		$(MAKE) HOSTCC="$(TARGET_CC)" -C $(U_BOOT_DIR) env
-	$(INSTALL) -m 0755 -D $(U_BOOT_DIR)/tools/env/fw_printenv $@
-	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
+	@echo >> $(@D)/include/config.h
+	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
+	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
+	@echo "#define __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
+	$(call insert_define,DATE,$(DATE))
+	$(call insert_define,CONFIG_LOAD_SCRIPTS,1)
+	$(call insert_define,CONFIG_IPADDR,$(BR2_TARGET_UBOOT_IPADDR))
+	$(call insert_define,CONFIG_GATEWAYIP,$(BR2_TARGET_UBOOT_GATEWAY))
+	$(call insert_define,CONFIG_NETMASK,$(BR2_TARGET_UBOOT_NETMASK))
+	$(call insert_define,CONFIG_SERVERIP,$(BR2_TARGET_UBOOT_SERVERIP))
+	$(call insert_define,CONFIG_ETHADDR,$(BR2_TARGET_UBOOT_ETHADDR))
+	$(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
+	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
+endef
 
-u-boot: $(U_BOOT_TARGETS)
+ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
+define U_BOOT_BUILD_TARGET_ENV_UTILS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) HOSTCC="$(TARGET_CC)" -C $(@D) env
+endef
+endif
 
-u-boot-clean:
-	-$(MAKE) -C $(U_BOOT_DIR) clean
-	rm -f $(MKIMAGE)
+define U_BOOT_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(U_BOOT_CONFIGURE_OPTS) 	\
+		$(MAKE) -C $(@D) $(U_BOOT_MAKE_OPTS) 		\
+		$(U_BOOT_MAKE_TARGET)
+	$(U_BOOT_BUILD_TARGET_ENV_UTILS)
+endef
 
-u-boot-dirclean:
-	rm -rf $(U_BOOT_DIR)
+define U_BOOT_INSTALL_IMAGES_CMDS
+	cp -dpf $(@D)/$(U_BOOT_BIN) $(BINARIES_DIR)/
+endef
 
-u-boot-source: $(DL_DIR)/$(U_BOOT_SOURCE)
+ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
+define U_BOOT_INSTALL_TARGET_ENV_UTILS
+	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv \
+		$(TARGET_DIR)/usr/sbin/fw_printenv
+	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
+endef
+endif
 
-u-boot-unpacked: $(U_BOOT_DIR)/.patched
+define U_BOOT_INSTALL_TARGET_CMDS
+	$(U_BOOT_INSTALL_TARGET_ENV_UTILS)
+endef
 
-u-boot-configured: $(U_BOOT_DIR)/.header_modified
+$(eval $(call GENTARGETS,boot,u-boot))
 
 #############################################################
 #

From 5e0d46138fbba1197f4f9cef4b96c7b87f42a5a1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:08 +0200
Subject: [PATCH 0378/6849] uboot-mkimage: new package

The mkimage for the host is now built by a package, so that
boot/u-boot/u-boot.mk is no longer responsible for doing this. It
makes things a lot easier to handle, as linux/linux.mk now simply
depends on host-uboot-mkimage.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uboot-mkimage-2011.03-drop-configh.patch     |  0
 package/uboot-mkimage/uboot-mkimage.mk           | 16 ++++++++++++++++
 2 files changed, 16 insertions(+)
 rename boot/u-boot/u-boot-2011.03-drop-configh.patch => package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch (100%)
 create mode 100644 package/uboot-mkimage/uboot-mkimage.mk

diff --git a/boot/u-boot/u-boot-2011.03-drop-configh.patch b/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch
similarity index 100%
rename from boot/u-boot/u-boot-2011.03-drop-configh.patch
rename to package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch
diff --git a/package/uboot-mkimage/uboot-mkimage.mk b/package/uboot-mkimage/uboot-mkimage.mk
new file mode 100644
index 0000000000..055348c3cb
--- /dev/null
+++ b/package/uboot-mkimage/uboot-mkimage.mk
@@ -0,0 +1,16 @@
+UBOOT_MKIMAGE_VERSION = 2011.03
+UBOOT_MKIMAGE_SOURCE  = u-boot-$(UBOOT_MKIMAGE_VERSION).tar.bz2
+UBOOT_MKIMAGE_SITE    = ftp://ftp.denx.de/pub/u-boot
+
+define HOST_UBOOT_MKIMAGE_BUILD_CMDS
+	$(MAKE) -C $(@D) 			\
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH=$(U_BOOT_ARCH) 		\
+		tools
+endef
+
+define HOST_UBOOT_MKIMAGE_INSTALL_CMDS
+	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(call GENTARGETS,package,uboot-mkimage,host))

From 7b819c32f8830676433764eb2fd7af6851bb5034 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jul 2011 21:59:54 +0200
Subject: [PATCH 0379/6849] uboot-mkimage: use correct host compiler/flags

As used elswwhere in BR.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...mage-2011.03-hostcflags-override-fix.patch | 29 +++++++++++++++++++
 package/uboot-mkimage/uboot-mkimage.mk        |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch

diff --git a/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch b/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch
new file mode 100644
index 0000000000..0202eda9b4
--- /dev/null
+++ b/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch
@@ -0,0 +1,29 @@
+[PATCH] Fix tools build with custom HOSTCFLAGS
+
+We always need to append HOSTCPPFLAGS, even if HOSTCFLAGS have been
+overridden on the cmdline.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ config.mk |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: u-boot-2011.03/config.mk
+===================================================================
+--- u-boot-2011.03.orig/config.mk
++++ u-boot-2011.03/config.mk
+@@ -46,10 +46,12 @@
+ 
+ #########################################################################
+ 
+-HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \
+-		  $(HOSTCPPFLAGS)
++HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTSTRIP	= strip
+ 
++# append CPPFLAGS even if CFLAGS has been overridden on cmdline
++override HOSTCFLAGS += $(HOSTCPPFLAGS)
++
+ #
+ # Mac OS X / Darwin's C preprocessor is Apple specific.  It
+ # generates numerous errors and warnings.  We want to bypass it
diff --git a/package/uboot-mkimage/uboot-mkimage.mk b/package/uboot-mkimage/uboot-mkimage.mk
index 055348c3cb..b8f2ee5de7 100644
--- a/package/uboot-mkimage/uboot-mkimage.mk
+++ b/package/uboot-mkimage/uboot-mkimage.mk
@@ -4,8 +4,9 @@ UBOOT_MKIMAGE_SITE    = ftp://ftp.denx.de/pub/u-boot
 
 define HOST_UBOOT_MKIMAGE_BUILD_CMDS
 	$(MAKE) -C $(@D) 			\
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH=$(U_BOOT_ARCH) 		\
+		HOSTCC="$(HOSTCC)"		\
+		HOSTCFLAGS="$(HOST_CFLAGS)"	\
+		HOSTLDFLAGS="$(HOST_LDFLAGS)"	\
 		tools
 endef
 

From bd40fcec77c8977730013e84538221a5cc32f910 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jul 2011 22:11:09 +0200
Subject: [PATCH 0380/6849] uboot-mkimage: add target support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/uboot-mkimage/Config.in        |  7 +++++++
 package/uboot-mkimage/uboot-mkimage.mk | 14 ++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/uboot-mkimage/Config.in

diff --git a/package/Config.in b/package/Config.in
index 09aa76abc0..9a73998df2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -206,6 +206,7 @@ source "package/sredird/Config.in"
 source "package/sshfs/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
+source "package/uboot-mkimage/Config.in"
 source "package/udev/Config.in"
 source "package/usb_modeswitch/Config.in"
 source "package/usbmount/Config.in"
diff --git a/package/uboot-mkimage/Config.in b/package/uboot-mkimage/Config.in
new file mode 100644
index 0000000000..e1dec53798
--- /dev/null
+++ b/package/uboot-mkimage/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_UBOOT_MKIMAGE
+	bool "uboot-mkimage"
+	help
+	  The mkimage tool from Das U-Boot bootloader, which allows
+	  generation of U-Boot images in various formats.
+
+	  http://www.denx.de/wiki/U-Boot/WebHome
diff --git a/package/uboot-mkimage/uboot-mkimage.mk b/package/uboot-mkimage/uboot-mkimage.mk
index b8f2ee5de7..d8a8fbbe9c 100644
--- a/package/uboot-mkimage/uboot-mkimage.mk
+++ b/package/uboot-mkimage/uboot-mkimage.mk
@@ -2,6 +2,19 @@ UBOOT_MKIMAGE_VERSION = 2011.03
 UBOOT_MKIMAGE_SOURCE  = u-boot-$(UBOOT_MKIMAGE_VERSION).tar.bz2
 UBOOT_MKIMAGE_SITE    = ftp://ftp.denx.de/pub/u-boot
 
+define UBOOT_MKIMAGE_BUILD_CMDS
+	$(MAKE) -C $(@D) 			\
+		HOSTCC="$(TARGET_CC)"		\
+		HOSTCFLAGS="$(TARGET_CFLAGS)"	\
+		HOSTLDFLAGS="$(TARGET_LDFLAGS)"	\
+		HOSTSTRIP=true			\
+		tools
+endef
+
+define UBOOT_MKIMAGE_INSTALL_CMDS
+	install -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin
+endef
+
 define HOST_UBOOT_MKIMAGE_BUILD_CMDS
 	$(MAKE) -C $(@D) 			\
 		HOSTCC="$(HOSTCC)"		\
@@ -14,4 +27,5 @@ define HOST_UBOOT_MKIMAGE_INSTALL_CMDS
 	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
 endef
 
+$(eval $(call GENTARGETS,package,uboot-mkimage))
 $(eval $(call GENTARGETS,package,uboot-mkimage,host))

From c917550361feb0858e5cc479273f46af136d8347 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Jul 2011 21:54:11 +0200
Subject: [PATCH 0381/6849] package: add support for post-download hooks

This will be needed for the Linux kernel package, which needs to
download patches in a custom way.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 8b5657b2dd..aa5c0d7e81 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -234,6 +234,7 @@ ifeq ($(DL_MODE),DOWNLOAD)
 endif
 	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)))
 	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
+	$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
 ifeq ($(DL_MODE),DOWNLOAD)
 	$(Q)mkdir -p $(@D)
 	$(Q)touch $@
@@ -437,6 +438,7 @@ $(2)_EXTRACT_CMDS ?= \
 	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $$($(2)_DIR) $(TAR_OPTIONS) -)
 
 # post-steps hooks
+$(2)_POST_DOWNLOAD_HOOKS        ?=
 $(2)_POST_EXTRACT_HOOKS         ?=
 $(2)_POST_PATCH_HOOKS           ?=
 $(2)_PRE_CONFIGURE_HOOKS        ?=

From 36b4b852eea02a95f6162cba4ed5e7f3079637c0 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Sun, 3 Jul 2011 12:56:03 +0200
Subject: [PATCH 0382/6849] fs/skeleton: allow rootfs not to be remounted
 read-write

[Peter: prefix option with TARGET_GENERIC_]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/inittab    |  2 +-
 package/sysvinit/inittab   |  2 +-
 target/generic/Config.in   | 11 +++++++++++
 target/generic/Makefile.in | 13 +++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/fs/skeleton/etc/inittab b/fs/skeleton/etc/inittab
index 4f3bb965d2..ac410d6e4e 100644
--- a/fs/skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
@@ -15,7 +15,7 @@
 
 # Startup the system
 null::sysinit:/bin/mount -t proc proc /proc
-null::sysinit:/bin/mount -o remount,rw /
+null::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW
 null::sysinit:/bin/mkdir -p /dev/pts
 null::sysinit:/bin/mkdir -p /dev/shm
 null::sysinit:/bin/mount -a
diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab
index a4bcf82d33..afa0dc35c9 100644
--- a/package/sysvinit/inittab
+++ b/package/sysvinit/inittab
@@ -5,7 +5,7 @@
 id:1:initdefault:
 
 proc::sysinit:/bin/mount -t proc proc /proc
-rwmo::sysinit:/bin/mount -o remount,rw /
+rwmo::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW
 dpts::sysinit:/bin/mkdir -p /dev/pts
 moun::sysinit:/bin/mount -a
 host::sysinit:/bin/hostname -F /etc/hostname
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 4969fcdc44..7961beccc8 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -109,6 +109,17 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
 	default "57600"		if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600
 	default "115200"	if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
 
+config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
+	bool "remount root filesystem read-write during boot"
+	default y
+	help
+	  The root filesystem is typically mounted read-only at boot.
+	  By default, buildroot remounts it in read-write mode early during the
+	  boot process.
+	  Say no here if you would rather like your root filesystem to remain
+	  read-only.
+	  If unsure, say Y.
+
 endif # BR2_ROOTFS_SKELETON_DEFAULT
 
 config BR2_ROOTFS_POST_BUILD_SCRIPT
diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in
index ce07ecfd0f..4185202b73 100644
--- a/target/generic/Makefile.in
+++ b/target/generic/Makefile.in
@@ -23,6 +23,14 @@ target-generic-getty-sysvinit:
 	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) vt100 #~' \
 		$(TARGET_DIR)/etc/inittab
 
+# Find commented line, if any, and remove leading '#'s
+target-generic-do-remount-rw:
+	$(SED) '/^#.*# REMOUNT_ROOTFS_RW$$/s~^#\+~~' $(TARGET_DIR)/etc/inittab
+
+# Find uncommented line, if any, and add a leading '#'
+target-generic-dont-remount-rw:
+	$(SED) '/^[^#].*# REMOUNT_ROOTFS_RW$$/s~^~#~' $(TARGET_DIR)/etc/inittab
+
 ifneq ($(TARGET_GENERIC_HOSTNAME),)
 TARGETS += target-generic-hostname
 endif
@@ -37,4 +45,9 @@ TARGETS += target-generic-getty-sysvinit
 else
 TARGETS += target-generic-getty-busybox
 endif
+ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
+TARGETS += target-generic-do-remount-rw
+else
+TARGETS += target-generic-dont-remount-rw
+endif
 endif

From 2016db44e815ddd5fc92ceea35ba439839d8c8b3 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Fri, 8 Jul 2011 14:19:16 +0100
Subject: [PATCH 0383/6849] package: add libnss

NSS is the Network Security Services library developed as part of
the Mozilla project. It provides similar functions to OpenSSL but
allows MPL, GPL and LGPL licensing.

[Peter: fix target install]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/libnss/Config.in           | 17 ++++++++
 package/libnss/libnss-cross.patch  | 27 ++++++++++++
 package/libnss/libnss-uclibc.patch | 19 +++++++++
 package/libnss/libnss.mk           | 67 ++++++++++++++++++++++++++++++
 5 files changed, 131 insertions(+)
 create mode 100644 package/libnss/Config.in
 create mode 100644 package/libnss/libnss-cross.patch
 create mode 100644 package/libnss/libnss-uclibc.patch
 create mode 100644 package/libnss/libnss.mk

diff --git a/package/Config.in b/package/Config.in
index 9a73998df2..e58254b454 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -250,6 +250,7 @@ menu "Crypto"
 source "package/beecrypt/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/libnss/Config.in"
 source "package/openssl/Config.in"
 endmenu
 
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
new file mode 100644
index 0000000000..55928a427b
--- /dev/null
+++ b/package/libnss/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LIBNSS
+	bool "libnss"
+	select BR2_PACKAGE_LIBNSPR
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ZLIB
+	depends on BR2_LARGEFILE
+	help
+	  Network Security Services (NSS) is a set of libraries designed
+	  to support development of security-enabled client and server
+	  applications. Applications built with NSS can support SSL v2
+	  and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME,
+	  and X.509 v3 certificates.
+
+	  http://www.mozilla.org/projects/security/pki/nss/
+
+comment "libnss requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnss/libnss-cross.patch b/package/libnss/libnss-cross.patch
new file mode 100644
index 0000000000..8a5cd102ab
--- /dev/null
+++ b/package/libnss/libnss-cross.patch
@@ -0,0 +1,27 @@
+
+This patch allows us to set a value for the cross compiler via TARGETCC without
+setting CC on the command line. CC is used for host tools as well as cross
+compiled code so we cannot define it on the command line without breaking
+the host tools build.
+
+Signed-off-by: Will Newton <will.newton@imgtec.com>
+
+--- libnss-3.12.9.old/mozilla/security/coreconf/Linux.mk	2011-03-01 10:31:21.517847183 +0000
++++ libnss-3.12.9/mozilla/security/coreconf/Linux.mk	2011-03-01 10:33:42.688648237 +0000
+@@ -46,9 +46,13 @@
+ 	IMPL_STRATEGY = _PTH
+ endif
+ 
+-CC			= gcc
+-CCC			= g++
+-RANLIB			= ranlib
++TARGETCC		= gcc
++TARGETCCC		= g++
++TARGETRANLIB		= ranlib
++
++CC			= $(TARGETCC)
++CCC			= $(TARGETCCC)
++RANLIB			= $(TARGETRANLIB)
+ 
+ DEFAULT_COMPILER = gcc
+ 
diff --git a/package/libnss/libnss-uclibc.patch b/package/libnss/libnss-uclibc.patch
new file mode 100644
index 0000000000..17e8080840
--- /dev/null
+++ b/package/libnss/libnss-uclibc.patch
@@ -0,0 +1,19 @@
+
+uCLibc does not define RTLD_NOLOAD.
+
+Signed-off-by: Will Newton <will.newton@imgtec.com>
+
+--- nss-3.12.9.old/mozilla/security/nss/lib/freebl/stubs.c	2011-07-08 13:32:54.964338355 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/freebl/stubs.c	2011-07-08 13:33:57.255337490 +0100
+@@ -535,6 +535,11 @@
+     return SECSuccess;
+ }
+ 
++/* uClibc does not define RTLD_NOLOAD. */
++#ifndef RTLD_NOLOAD
++#define RTLD_NOLOAD 0
++#endif
++
+ /*
+  * fetch the library if it's loaded. For NSS it should already be loaded
+  */
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
new file mode 100644
index 0000000000..3f7642f899
--- /dev/null
+++ b/package/libnss/libnss.mk
@@ -0,0 +1,67 @@
+#############################################################
+#
+# libnss
+#
+#############################################################
+LIBNSS_VERSION = 3.12.9
+LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
+LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION))
+LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src/
+LIBNSS_SUBDIR = mozilla/security
+LIBNSS_DISTDIR = mozilla/dist
+LIBNSS_INSTALL_STAGING = YES
+LIBNSS_DEPENDENCIES = libnspr sqlite zlib
+
+LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
+		NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
+		NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
+		BUILD_OPT=1 \
+		NS_USE_GCC=1 \
+		OPTIMIZER="$(TARGET_CFLAGS)" \
+		NSS_USE_SYSTEM_SQLITE=1 \
+		NSS_ENABLE_ECC=1 \
+		NATIVE_CC="$(HOSTCC)" \
+		TARGETCC="$(TARGET_CC)" \
+		TARGETCCC="$(TARGET_CXX)" \
+		TARGETRANLIB="$(TARGET_RANLIB)" \
+		OS_ARCH="Linux" \
+		OS_RELEASE="2.6" \
+		OS_TEST="$(ARCH)"
+
+
+define LIBNSS_BUILD_CMDS
+	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_coreconf build_dbm all \
+			SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
+			DIST=$(@D)/$(LIBNSS_DISTDIR) \
+			CHECKLOC= \
+			$(LIBNSS_BUILD_VARS)
+endef
+
+define LIBNSS_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib/ \
+		$(@D)/$(LIBNSS_DISTDIR)/lib/*.so
+	$(INSTALL) -m 755 -d $(STAGING_DIR)/usr/include/nss
+	$(INSTALL) -m 644 -t $(STAGING_DIR)/usr/include/nss \
+		$(@D)/$(LIBNSS_DISTDIR)/public/nss/*
+	$(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib/ \
+		$(@D)/$(LIBNSS_DISTDIR)/lib/*.a
+endef
+
+define LIBNSS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/lib/ \
+		$(@D)/$(LIBNSS_DISTDIR)/lib/*.so
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/include/nss
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/include/nss \
+		$(@D)/$(LIBNSS_DISTDIR)/public/nss/*
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/lib/ \
+		$(@D)/$(LIBNSS_DISTDIR)/lib/*.a
+endef
+
+define LIBNSS_CLEAN_CMDS
+	-$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR) clobber \
+					clobber_dbm \
+					clobber_coreconf \
+					BUILD_OPT=1
+endef
+
+$(eval $(call GENTARGETS,package,libnss))

From bd76bc5f80b963570e8eda92efc961e683264402 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 11 Jul 2011 07:44:24 +0200
Subject: [PATCH 0384/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 341959003a..4c29ffe3f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,17 +2,23 @@
 
 	Fixes all over the tree and new features.
 
-	Toolchain: uClibc 0.9.32 / NPTL support, ext-toolchain-wrapper
-	improvements, improved non-MMU support.
+	Toolchain: uClibc 0.9.32 / NPTL support, 0.9.29 removed,
+	ext-toolchain-wrapper improvements, improved non-MMU
+	support. GCC 4.3.6 / 4.6.1.
 
 	Updated/fixed packages: berkeleydb, bmon, busybox, dbus,
-	dbus-glib, ethtool, ffmpeg, gst-plugins-bad, libdnet,
-	libmpeg2, mtd-utils, qt, sudo, synergy, usbutils, webkit
+	dbus-glib, ethtool, ffmpeg, gst-plugins-bad, gst-plugins-base,
+	lame, libarchive, libdnet, libgtk2, libmpeg2, lighttpd,
+	mtd-utils, oprofile, qt, ruby, sudo, sqlite, synergy,
+	usbutils, webkit
 
-	New packages: live555, sredird, statserial, yajl
+	New packages: libiqrf, libnspr, libnss, live555, rsyslog,
+	sredird, statserial, stunnel, yajl
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3559: libnspr: Add new package
+	#3565: libnss: Add new package
 	#3907: 2011.05 - Qt 4.7.3 not building on ARM
 
 2011.05, Released May 27th, 2011:

From fc71f7e6f27829a389dacc38622eb687109133f6 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 11 Jul 2011 12:25:51 +0200
Subject: [PATCH 0385/6849] busybox: provide /etc/mdev.conf if mdev is used

Without an mdev.conf file installed, mdev generates some /dev entries in
an incorrect or non-standard way. Some examples:
 1. /dev/null has permissions 660, but it should be accessible to normal
    users;
 2. alsa devices get created in /dev, not /dev/snd as is more common,
    and as the default value of BR2_PACKAGE_ALSA_LIB_DEVDIR suggests;
 3. event<N> files are created in /dev, not /dev/input.

This mdev.conf is a selection from the examples provided in the busybox
sources with minor tweaks.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk |  6 ++++++
 package/busybox/mdev.conf  | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 package/busybox/mdev.conf

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 509c3bb9f1..8998ca083c 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -33,6 +33,11 @@ ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 define BUSYBOX_INSTALL_MDEV_SCRIPT
 	install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d
 endef
+define BUSYBOX_INSTALL_MDEV_CONF
+	[ -f $(TARGET_DIR)/etc/mdev.conf ] || \
+		install -D -m 0644 package/busybox/mdev.conf \
+			$(TARGET_DIR)/etc/mdev.conf
+endef
 define BUSYBOX_SET_MDEV
 	$(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG))
 	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG))
@@ -159,6 +164,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
 			$(TARGET_DIR)/usr/share/udhcpc/default.script; \
 	fi
 	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
+	$(BUSYBOX_INSTALL_MDEV_CONF)
 	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
 endef
 
diff --git a/package/busybox/mdev.conf b/package/busybox/mdev.conf
new file mode 100644
index 0000000000..247c0ed02d
--- /dev/null
+++ b/package/busybox/mdev.conf
@@ -0,0 +1,35 @@
+# null may already exist; therefore ownership has to be changed with command
+null		root:root 666 @chmod 666 $MDEV
+zero		root:root 666
+full		root:root 666
+random		root:root 444
+urandom		root:root 444
+hwrandom	root:root 444
+grsec		root:root 660
+
+kmem		root:root 640
+mem		root:root 640
+port		root:root 640
+# console may already exist; therefore ownership has to be changed with command
+console		root:tty 600 @chmod 600 $MDEV
+ptmx		root:tty 666
+pty.*		root:tty 660
+
+# Typical devices
+tty		root:tty 666
+tty[0-9]*	root:tty 660
+vcsa*[0-9]*	root:tty 660
+ttyS[0-9]*	root:root 660
+
+# alsa sound devices
+pcm.*		root:audio 660 =snd/
+control.*	root:audio 660 =snd/
+midi.*		root:audio 660 =snd/
+seq		root:audio 660 =snd/
+timer		root:audio 660 =snd/
+
+# input stuff
+event[0-9]+	root:root 640 =input/
+mice		root:root 640 =input/
+mouse[0-9]	root:root 640 =input/
+ts[0-9]		root:root 600 =input/

From a8041c0973528f4ef15e1a67cc1d3baf08261b4f Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 11 Jul 2011 17:33:31 +0300
Subject: [PATCH 0386/6849] ebtables: new package

[Peter: add ipv6 dependency]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/ebtables/Config.in   | 10 ++++++++++
 package/ebtables/ebtables.mk | 30 ++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/ebtables/Config.in
 create mode 100644 package/ebtables/ebtables.mk

diff --git a/package/Config.in b/package/Config.in
index e58254b454..d87dcd8fc1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -394,6 +394,7 @@ endif
 source "package/dhcpdump/Config.in"
 source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
+source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
 source "package/hostapd/Config.in"
 source "package/ifplugd/Config.in"
diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
new file mode 100644
index 0000000000..40bc45c028
--- /dev/null
+++ b/package/ebtables/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_EBTABLES
+	bool "ebtables"
+	depends on BR2_INET_IPV6
+	help
+	  Ethernet bridge frame table administration
+
+	  http://ebtables.sourceforge.net
+
+comment "ebtables requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
new file mode 100644
index 0000000000..67c0d92466
--- /dev/null
+++ b/package/ebtables/ebtables.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# ebtables
+#
+#############################################################
+EBTABLES_VERSION = 2.0.10-1
+EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
+EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
+
+define EBTABLES_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables -C $(@D)
+endef
+
+define EBTABLES_INSTALL_TARGET_CMDS
+	for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \
+		$(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \
+		do \
+		$(INSTALL) -m 0755 -D $${so} \
+			$(TARGET_DIR)/lib/ebtables/`basename $${so}`; \
+	done
+	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
+		$(TARGET_DIR)/sbin/ebtables
+endef
+
+define EBTABLES_UNINSTALL_TARGET_CMDS
+	rm -rf $(TARGET_DIR)/lib/ebtables
+	rm -f $(TARGET_DIR)/sbin/ebtables
+endef
+
+$(eval $(call GENTARGETS,package,ebtables))

From afabcb63816806aa8c971000c486f4e108aeb117 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:17:16 +0200
Subject: [PATCH 0387/6849] valgrind: bump to 3.6.1 and add support for ARMv7

We removed the shell script that wrapped valgrind (not nice to install
such non-standard things), and will let the user use the uclibc.supp
suppression file if needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/valgrind/Config.in                    |   3 +-
 .../valgrind/valgrind-3.6.1-largefile.patch   |  56 +++++
 ...patch => valgrind-3.6.1-more-ioctls.patch} | 198 +++++++++---------
 package/valgrind/valgrind-largefile.patch     |  27 ---
 package/valgrind/valgrind.mk                  |  99 ++-------
 package/valgrind/valgrind.sh                  |  10 -
 6 files changed, 176 insertions(+), 217 deletions(-)
 create mode 100644 package/valgrind/valgrind-3.6.1-largefile.patch
 rename package/valgrind/{valgrind.patch => valgrind-3.6.1-more-ioctls.patch} (83%)
 delete mode 100644 package/valgrind/valgrind-largefile.patch
 delete mode 100755 package/valgrind/valgrind.sh

diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
index db1bc3b190..0f656dc112 100644
--- a/package/valgrind/Config.in
+++ b/package/valgrind/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_VALGRIND
 	bool "valgrind"
-	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_i386 || BR2_x86_64 || BR2_cortex_a8 || \
+		   BR2_cortex_a9 || BR2_powerpc
 	help
 	  Tool for debugging and profiling Linux programs.
 
diff --git a/package/valgrind/valgrind-3.6.1-largefile.patch b/package/valgrind/valgrind-3.6.1-largefile.patch
new file mode 100644
index 0000000000..d04877bd64
--- /dev/null
+++ b/package/valgrind/valgrind-3.6.1-largefile.patch
@@ -0,0 +1,56 @@
+[PATCH] valgrind: don't enable largefile support unconditionally on uClibc
+
+uClibc can be compiled without largefile support (and errors out if
+_FILE_OFFSET_BITS is set to 64), so don't define it if that combination
+is detected.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+
+Index: valgrind-3.6.1/coregrind/m_initimg/initimg-linux.c
+===================================================================
+--- valgrind-3.6.1.orig/coregrind/m_initimg/initimg-linux.c	2011-07-06 09:45:10.203070009 +0200
++++ valgrind-3.6.1/coregrind/m_initimg/initimg-linux.c	2011-07-06 09:45:17.343070005 +0200
+@@ -54,7 +54,11 @@
+ 
+ /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
+ #define _GNU_SOURCE
++#include <features.h>
++/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
+ #define _FILE_OFFSET_BITS 64
++#endif
+ /* This is for ELF types etc, and also the AT_ constants. */
+ #include <elf.h>
+ /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
+Index: valgrind-3.6.1/coregrind/m_main.c
+===================================================================
+--- valgrind-3.6.1.orig/coregrind/m_main.c	2011-07-06 09:44:22.203070033 +0200
++++ valgrind-3.6.1/coregrind/m_main.c	2011-07-06 09:44:42.803070024 +0200
+@@ -2797,7 +2797,11 @@
+ 
+ /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
+ #define _GNU_SOURCE
++#include <features.h>
++/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
+ #define _FILE_OFFSET_BITS 64
++#endif
+ /* This is in order to get AT_NULL and AT_PAGESIZE. */
+ #include <elf.h>
+ /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
+Index: valgrind-3.6.1/coregrind/m_ume/elf.c
+===================================================================
+--- valgrind-3.6.1.orig/coregrind/m_ume/elf.c	2011-07-06 09:44:51.343070018 +0200
++++ valgrind-3.6.1/coregrind/m_ume/elf.c	2011-07-06 09:44:58.833070015 +0200
+@@ -48,7 +48,11 @@
+ 
+ /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
+ #define _GNU_SOURCE
++#include <features.h>
++/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
+ #define _FILE_OFFSET_BITS 64
++#endif
+ /* This is for ELF types etc, and also the AT_ constants. */
+ #include <elf.h>
+ /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
diff --git a/package/valgrind/valgrind.patch b/package/valgrind/valgrind-3.6.1-more-ioctls.patch
similarity index 83%
rename from package/valgrind/valgrind.patch
rename to package/valgrind/valgrind-3.6.1-more-ioctls.patch
index afdd53efc8..62f013528e 100644
--- a/package/valgrind/valgrind.patch
+++ b/package/valgrind/valgrind-3.6.1-more-ioctls.patch
@@ -1,92 +1,14 @@
---- valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c.orig	2006-08-02 16:51:51.000000000 -0600
-+++ valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c	2006-08-02 16:53:19.000000000 -0600
-@@ -1124,7 +1124,7 @@
-    GENXY(__NR_times,             sys_times),          // 100 
-    PLAXY(__NR_ptrace,            sys_ptrace),         // 101 
-    GENX_(__NR_getuid,            sys_getuid),         // 102 
--   //   (__NR_syslog,            sys_syslog),         // 103 
-+   LINXY(__NR_syslog,            sys_syslog),         // 103 
-    GENX_(__NR_getgid,            sys_getgid),         // 104 
- 
-    GENX_(__NR_setuid,            sys_setuid),         // 105 
---- valgrind/include/vki-linux.h.orig	2006-08-02 18:22:21.000000000 -0600
-+++ valgrind/include/vki-linux.h	2006-08-02 18:38:02.000000000 -0600
-@@ -1556,7 +1556,9 @@
- 
- #define VKI_BLKROSET   _VKI_IO(0x12,93)	/* set device read-only (0 = read-write) */
- #define VKI_BLKROGET   _VKI_IO(0x12,94)	/* get read-only status (0 = read_write) */
-+#define VKI_BLKRRPART  _VKI_IO(0x12,95) /* re-read partition table */
- #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
-+#define VKI_BLKFLSBUF  _VKI_IO(0x12,97) /* flush buffer cache */
- #define VKI_BLKRASET   _VKI_IO(0x12,98)	/* set read ahead for block device */
- #define VKI_BLKRAGET   _VKI_IO(0x12,99)	/* get current read ahead setting */
- #define VKI_BLKFRASET  _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-@@ -1631,6 +1633,54 @@
- //#define SG_GET_COMMAND_Q 0x2270   /* Yields 0 (queuing off) or 1 (on) */
- #define VKI_SG_SET_COMMAND_Q 0x2271   /* Change queuing state with 0 or 1 */
- 
-+
-+typedef struct vki_scsi_idlun
-+{
-+    int mux4;
-+    int host_unique_id;
-+
-+} vki_scsi_idlun_t;
-+#define VKI_SCSI_IOCTL_GET_IDLUN 0x5382		/* Gets a struct vki_scsi_idlun */
-+#define VKI_SCSI_IOCTL_PROBE_HOST 0x5385	/* Gets an arrary describing the SCSI host */
-+#define VKI_SCSI_IOCTL_GET_BUS_NUMBER 0x5386	/* Get the bus number for a device */
-+
-+//----------------------------------------------------------------------
-+// From linux-2.6.8.1/include/linux/fd.h
-+//----------------------------------------------------------------------
-+#define VKI_FDRESET 0x254		/* Takes an int by value */
-+#define VKI_FDGETDRVTYP 0x20f	/* Returns char floppy_drive_name[16] */
-+typedef struct vki_floppy_drive_struct {
-+	unsigned long flags;
-+	unsigned long spinup_date;
-+	unsigned long select_date;
-+	unsigned long first_read_date;
-+	short probed_format;
-+	short track;
-+	short maxblock;
-+	short maxtrack;
-+	int generation;
-+	int keep_data;
-+	int fd_ref;
-+	int fd_device;
-+	unsigned long last_checked;
-+	char *dmabuf;
-+	int bufblocks;
-+} vki_floppy_drive_struct_t;
-+#define VKI_FDPOLLDRVSTAT 0x213	    /* returns a struct floppy_drive_struct */
-+typedef struct vki_floppy_struct {
-+	unsigned int	size;
-+	unsigned int	sect;
-+	unsigned int	head;
-+	unsigned int	track;
-+	unsigned int	stretch;
-+	unsigned char	gap;
-+	unsigned char	rate;
-+	unsigned char	spec1;
-+	unsigned char	fmt_gap;
-+	const char	* name;
-+} vki_floppy_struct_t;
-+#define VKI_FDGETPRM 0x204	    /* returns a struct floppy_struct */
-+
- //----------------------------------------------------------------------
- // From linux-2.6.8.1/include/linux/cdrom.h
- //----------------------------------------------------------------------
-@@ -1640,6 +1690,7 @@
-                                            (struct cdrom_tochdr) */
- #define VKI_CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
-                                            (struct cdrom_tocentry) */
-+#define VKI_CDROMEJECT		0x5309 /* Eject cdrom media */
- #define VKI_CDROMSUBCHNL	0x530b /* Read subchannel data 
-                                            (struct cdrom_subchnl) */
- #define VKI_CDROMREADMODE2	0x530c /* Read CDROM mode 2 data (2336 Bytes) 
---- valgrind/coregrind/m_syswrap/syswrap-generic.c.orig	2006-08-02 18:22:13.000000000 -0600
-+++ valgrind/coregrind/m_syswrap/syswrap-generic.c	2006-08-02 18:43:49.000000000 -0600
-@@ -3227,6 +3227,33 @@
+Add various ioctl()s
+
+Patch initially written by Eric Andersen <andersen@codepoet.org>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
+===================================================================
+--- valgrind-3.6.1.orig/coregrind/m_syswrap/syswrap-linux.c	2011-07-06 09:50:32.243069845 +0200
++++ valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c	2011-07-06 09:53:39.783069751 +0200
+@@ -3900,7 +3900,33 @@
     case VKI_SG_GET_SG_TABLESIZE: /* 0x227f */
        PRE_MEM_WRITE( "ioctl(SG_GET_SG_TABLESIZE)", ARG3, sizeof(int) );
        break;
@@ -105,7 +27,7 @@
 +   case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
 +      PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", ARG3, sizeof(int) );
 +      break;
-+
+ 
 +   case VKI_FDRESET:
 +      break;
 +   case VKI_FDGETDRVTYP:
@@ -117,10 +39,10 @@
 +   case VKI_FDGETPRM:
 +      PRE_MEM_WRITE( "ioctl(FDGETPRM)", ARG3, sizeof(vki_floppy_struct_t) );
 +      break;
- 
     case VKI_IIOCGETCPS:
        PRE_MEM_WRITE( "ioctl(IIOCGETCPS)", ARG3,
-@@ -3550,6 +3578,8 @@
+ 		     VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
+@@ -4215,6 +4241,8 @@
     case VKI_BLKROGET:
        PRE_MEM_WRITE( "ioctl(BLKROGET)", ARG3, sizeof(int));
        break;
@@ -129,7 +51,7 @@
     case VKI_BLKGETSIZE:
        PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
        break;
-@@ -3558,6 +3588,8 @@
+@@ -4223,6 +4251,8 @@
     case VKI_BLKRAGET:
        PRE_MEM_WRITE( "ioctl(BLKRAGET)", ARG3, sizeof(long));
        break;
@@ -138,7 +60,7 @@
     case VKI_BLKFRASET:
        break;
     case VKI_BLKFRAGET:
-@@ -3624,6 +3656,8 @@
+@@ -4289,6 +4319,8 @@
        PRE_MEM_WRITE( "ioctl(CDROMREADTOCENTRY)", ARG3, 
  		     sizeof(struct vki_cdrom_tocentry));
        break;
@@ -147,7 +69,7 @@
     case VKI_CDROMMULTISESSION: /* 0x5310 */
        PRE_MEM_WRITE( "ioctl(CDROMMULTISESSION)", ARG3,
  		     sizeof(struct vki_cdrom_multisession));
-@@ -4042,6 +4076,28 @@
+@@ -4989,7 +5021,28 @@
     case VKI_SG_GET_SG_TABLESIZE:
        POST_MEM_WRITE(ARG3, sizeof(int));
        break;      
@@ -161,7 +83,7 @@
 +   case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
 +      POST_MEM_WRITE(ARG3, sizeof(int));
 +      break;
-+
+ 
 +   case VKI_FDRESET:
 +      break;
 +   case VKI_FDGETDRVTYP:
@@ -173,10 +95,10 @@
 +   case VKI_FDGETPRM:
 +      POST_MEM_WRITE( ARG3, sizeof(vki_floppy_struct_t) );
 +      break;
- 
     case VKI_IIOCGETCPS:
        POST_MEM_WRITE( ARG3, VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
-@@ -4260,6 +4317,8 @@
+       break;
+@@ -5210,6 +5263,8 @@
     case VKI_BLKROGET:
        POST_MEM_WRITE(ARG3, sizeof(int));
        break;
@@ -185,7 +107,7 @@
     case VKI_BLKGETSIZE:
        POST_MEM_WRITE(ARG3, sizeof(unsigned long));
        break;
-@@ -4268,6 +4327,8 @@
+@@ -5218,6 +5273,8 @@
     case VKI_BLKRAGET:
        POST_MEM_WRITE(ARG3, sizeof(long));
        break;
@@ -194,7 +116,7 @@
     case VKI_BLKFRASET:
        break;
     case VKI_BLKFRAGET:
-@@ -4309,6 +4370,8 @@
+@@ -5259,6 +5316,8 @@
     case VKI_CDROMREADTOCENTRY:
        POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_tocentry));
        break;
@@ -203,3 +125,79 @@
     case VKI_CDROMMULTISESSION:
        POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_multisession));
        break;
+Index: valgrind-3.6.1/include/vki/vki-linux.h
+===================================================================
+--- valgrind-3.6.1.orig/include/vki/vki-linux.h	2011-07-06 09:48:16.733069914 +0200
++++ valgrind-3.6.1/include/vki/vki-linux.h	2011-07-06 09:49:49.413069868 +0200
+@@ -1646,7 +1646,9 @@
+ 
+ #define VKI_BLKROSET   _VKI_IO(0x12,93)	/* set device read-only (0 = read-write) */
+ #define VKI_BLKROGET   _VKI_IO(0x12,94)	/* get read-only status (0 = read_write) */
++#define VKI_BLKRRPART  _VKI_IO(0x12,95) /* re-read partition table */
+ #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
++#define VKI_BLKFLSBUF  _VKI_IO(0x12,97) /* flush buffer cache */
+ #define VKI_BLKRASET   _VKI_IO(0x12,98)	/* set read ahead for block device */
+ #define VKI_BLKRAGET   _VKI_IO(0x12,99)	/* get current read ahead setting */
+ #define VKI_BLKFRASET  _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
+@@ -1721,6 +1723,53 @@
+ //#define SG_GET_COMMAND_Q 0x2270   /* Yields 0 (queuing off) or 1 (on) */
+ #define VKI_SG_SET_COMMAND_Q 0x2271   /* Change queuing state with 0 or 1 */
+ 
++typedef struct vki_scsi_idlun
++{
++    int mux4;
++    int host_unique_id;
++
++} vki_scsi_idlun_t;
++#define VKI_SCSI_IOCTL_GET_IDLUN 0x5382		/* Gets a struct vki_scsi_idlun */
++#define VKI_SCSI_IOCTL_PROBE_HOST 0x5385	/* Gets an arrary describing the SCSI host */
++#define VKI_SCSI_IOCTL_GET_BUS_NUMBER 0x5386	/* Get the bus number for a device */
++
++//----------------------------------------------------------------------
++// From linux-2.6.8.1/include/linux/fd.h
++//----------------------------------------------------------------------
++#define VKI_FDRESET 0x254		/* Takes an int by value */
++#define VKI_FDGETDRVTYP 0x20f	/* Returns char floppy_drive_name[16] */
++typedef struct vki_floppy_drive_struct {
++	unsigned long flags;
++	unsigned long spinup_date;
++	unsigned long select_date;
++	unsigned long first_read_date;
++	short probed_format;
++	short track;
++	short maxblock;
++	short maxtrack;
++	int generation;
++	int keep_data;
++	int fd_ref;
++	int fd_device;
++	unsigned long last_checked;
++	char *dmabuf;
++	int bufblocks;
++} vki_floppy_drive_struct_t;
++#define VKI_FDPOLLDRVSTAT 0x213	    /* returns a struct floppy_drive_struct */
++typedef struct vki_floppy_struct {
++	unsigned int	size;
++	unsigned int	sect;
++	unsigned int	head;
++	unsigned int	track;
++	unsigned int	stretch;
++	unsigned char	gap;
++	unsigned char	rate;
++	unsigned char	spec1;
++	unsigned char	fmt_gap;
++	const char	* name;
++} vki_floppy_struct_t;
++#define VKI_FDGETPRM 0x204	    /* returns a struct floppy_struct */
++
+ //----------------------------------------------------------------------
+ // From linux-2.6.8.1/include/linux/cdrom.h
+ //----------------------------------------------------------------------
+@@ -1730,6 +1779,7 @@
+                                            (struct cdrom_tochdr) */
+ #define VKI_CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
+                                            (struct cdrom_tocentry) */
++#define VKI_CDROMEJECT		0x5309 /* Eject cdrom media */
+ #define VKI_CDROMSUBCHNL	0x530b /* Read subchannel data 
+                                            (struct cdrom_subchnl) */
+ #define VKI_CDROMREADMODE2	0x530c /* Read CDROM mode 2 data (2336 Bytes) 
diff --git a/package/valgrind/valgrind-largefile.patch b/package/valgrind/valgrind-largefile.patch
deleted file mode 100644
index 9ef5708bc8..0000000000
--- a/package/valgrind/valgrind-largefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-[PATCH] valgrind: don't enable largefile support unconditionally on uClibc
-
-uClibc can be compiled without largefile support (and errors out if
-_FILE_OFFSET_BITS is set to 64), so don't define it if that combination
-is detected.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- coregrind/m_ume.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: valgrind-3.2.3/coregrind/m_ume.c
-===================================================================
---- valgrind-3.2.3.orig/coregrind/m_ume.c
-+++ valgrind-3.2.3/coregrind/m_ume.c
-@@ -31,7 +31,11 @@
- 
- 
- #define _GNU_SOURCE
-+#include <features.h>
-+/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
- #define _FILE_OFFSET_BITS 64
-+#endif
- 
- // It seems that on SuSE 9.1 (x86) something in <fcntl.h> messes up stuff
- // acquired indirectly from vki-x86-linux.h.  Therefore our headers must be
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 5bf0a9d284..551aecf4dc 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,85 +4,26 @@
 #
 #############################################################
 
-VALGRIND_VERSION=3.2.3
-VALGRIND_SITE:=http://valgrind.org/downloads/
-VALGRIND_DIR:=$(BUILD_DIR)/valgrind-$(VALGRIND_VERSION)
-VALGRIND_SOURCE:=valgrind-$(VALGRIND_VERSION).tar.bz2
-VALGRIND_CAT:=$(BZCAT)
-
-$(DL_DIR)/$(VALGRIND_SOURCE):
-	$(call DOWNLOAD,$(VALGRIND_SITE),$(VALGRIND_SOURCE))
-
-$(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE)
-	$(VALGRIND_CAT) $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(VALGRIND_DIR)/.unpacked
-
-$(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(VALGRIND_DIR) package/valgrind/ valgrind\*.patch
-	touch $(VALGRIND_DIR)/.patched
-
-$(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched
-	(cd $(VALGRIND_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		$(DISABLE_NLS) \
-		--without-uiout --disable-valgrindmi \
-		--disable-tui --disable-valgrindtk \
-		--without-x --without-included-gettext \
-		--disable-tls \
-	)
-	touch $(VALGRIND_DIR)/.configured
-
-$(VALGRIND_DIR)/coregrind/valgrind: $(VALGRIND_DIR)/.configured
-	$(MAKE) -C $(VALGRIND_DIR)
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/coregrind/valgrind
-	$(MAKE) \
-	    prefix=$(TARGET_DIR)/usr \
-	    exec_prefix=$(TARGET_DIR)/usr \
-	    bindir=$(TARGET_DIR)/usr/bin \
-	    sbindir=$(TARGET_DIR)/usr/sbin \
-	    libexecdir=$(TARGET_DIR)/usr/lib \
-	    datadir=$(TARGET_DIR)/usr/share \
-	    sysconfdir=$(TARGET_DIR)/etc \
-	    sharedstatedir=$(TARGET_DIR)/usr/com \
-	    localstatedir=$(TARGET_DIR)/var \
-	    libdir=$(TARGET_DIR)/usr/lib \
-	    infodir=$(TARGET_DIR)/usr/info \
-	    mandir=$(TARGET_DIR)/usr/man \
-	    includedir=$(TARGET_DIR)/usr/include \
-	    -C $(VALGRIND_DIR) install
-	mv $(TARGET_DIR)/usr/bin/valgrind $(TARGET_DIR)/usr/bin/valgrind.bin
-	cp package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/
-	cp package/valgrind/valgrind.sh $(TARGET_DIR)/usr/bin/valgrind
-	chmod a+x $(TARGET_DIR)/usr/bin/valgrind
-	rm -rf $(TARGET_DIR)/usr/share/doc/valgrind
-	touch -c $@
-
-valgrind: $(TARGET_DIR)/usr/bin/valgrind
-
-valgrind-source: $(DL_DIR)/$(VALGRIND_SOURCE)
+VALGRIND_VERSION = 3.6.1
+VALGRIND_SITE    = http://valgrind.org/downloads/
+VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
+
+VALGRIND_CONF_OPT = --disable-tls
+
+# On ARM, Valgrind only supports ARMv7, and uses the arch part of the
+# host tuple to determine whether it's being built for ARMv7 or
+# not. Therefore, we adjust the host tuple to specify we're on
+# ARMv7. The valgrind package is guaranteed, through Config.in, to
+# only be selected on Cortex A8 and Cortex A9 platforms.
+ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
+VALGRIND_CONF_OPT += \
+	--host=$(patsubst arm-%,armv7-unknown-%,$(GNU_TARGET_NAME))
+endif
 
-valgrind-clean:
-	-$(MAKE) -C $(VALGRIND_DIR) clean
-	-rm -f $(TARGET_DIR)/usr/bin/valgrind*
-	rm -rf $(TARGET_DIR)/usr/lib/valgrind
+define VALGRIND_INSTALL_UCLIBC_SUPP
+	install -D -m 0644 package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/uclibc.supp
+endef
 
-valgrind-dirclean:
-	rm -rf $(VALGRIND_DIR)
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_INSTALL_UCLIBC_SUPP
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_VALGRIND),y)
-TARGETS+=valgrind
-endif
+$(eval $(call AUTOTARGETS,package,valgrind))
diff --git a/package/valgrind/valgrind.sh b/package/valgrind/valgrind.sh
deleted file mode 100755
index 4b8eb2e57b..0000000000
--- a/package/valgrind/valgrind.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-#
-# Valgrind wrapper
-
-# Use special suppression file for uClibc
-export VALGRIND_OPTS="$VALGRIND_OPTS --suppressions=/usr/lib/valgrind/uclibc.supp"
-
-# Use 'exec' to avoid having another shell process hanging around.
-exec $0.bin "$@"
-

From af52661d19f8619d3455e07e4cc2f5cdebef38bf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:07 +0200
Subject: [PATCH 0388/6849] linux: rename LINUX26 to LINUX

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 110 ++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index f9fe4545f4..6dfd558c2c 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -1,24 +1,24 @@
 ###############################################################################
 #
-# Linux kernel 2.6 target
+# Linux kernel target
 #
 ###############################################################################
-LINUX26_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 
-# Compute LINUX26_SOURCE and LINUX26_SITE from the configuration
-ifeq ($(LINUX26_VERSION),custom)
-LINUX26_TARBALL:=$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
-LINUX26_SITE:=$(dir $(LINUX26_TARBALL))
-LINUX26_SOURCE:=$(notdir $(LINUX26_TARBALL))
+# Compute LINUX_SOURCE and LINUX_SITE from the configuration
+ifeq ($(LINUX_VERSION),custom)
+LINUX_TARBALL:=$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
+LINUX_SITE:=$(dir $(LINUX_TARBALL))
+LINUX_SOURCE:=$(notdir $(LINUX_TARBALL))
 else
-LINUX26_SOURCE:=linux-$(LINUX26_VERSION).tar.bz2
-LINUX26_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
 endif
 
-LINUX26_DIR:=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
-LINUX26_PATCH=$(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_DIR:=$(BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_PATCH=$(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 
-LINUX26_MAKE_FLAGS = \
+LINUX_MAKE_FLAGS = \
 	HOSTCC="$(HOSTCC)" \
 	HOSTCFLAGS="$(HOSTCFLAGS)" \
 	ARCH=$(KERNEL_ARCH) \
@@ -28,27 +28,27 @@ LINUX26_MAKE_FLAGS = \
 
 # Get the real Linux version, which tells us where kernel modules are
 # going to be installed in the target filesystem.
-LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease)
+LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
 
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
-LINUX26_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
 ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
 ifeq ($(KERNEL_ARCH),blackfin)
 # a uImage, but with a different file name
-LINUX26_IMAGE_NAME=vmImage
+LINUX_IMAGE_NAME=vmImage
 else
-LINUX26_IMAGE_NAME=uImage
+LINUX_IMAGE_NAME=uImage
 endif
-LINUX26_DEPENDENCIES+=$(MKIMAGE)
+LINUX_DEPENDENCIES+=host-uboot-mkimage
 else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)
-LINUX26_IMAGE_NAME=bzImage
+LINUX_IMAGE_NAME=bzImage
 else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)
-LINUX26_IMAGE_NAME=zImage
+LINUX_IMAGE_NAME=zImage
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
-LINUX26_IMAGE_NAME=vmlinux.bin
+LINUX_IMAGE_NAME=vmlinux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
-LINUX26_IMAGE_NAME=vmlinux
+LINUX_IMAGE_NAME=vmlinux
 endif
 endif
 
@@ -57,44 +57,44 @@ endif
 # for bzImage, arch/i386 and arch/x86_64 do not exist when copying the
 # defconfig file.
 ifeq ($(KERNEL_ARCH),i386)
-KERNEL_ARCH_PATH=$(LINUX26_DIR)/arch/x86
+KERNEL_ARCH_PATH=$(LINUX_DIR)/arch/x86
 else ifeq ($(KERNEL_ARCH),x86_64)
-KERNEL_ARCH_PATH=$(LINUX26_DIR)/arch/x86
+KERNEL_ARCH_PATH=$(LINUX_DIR)/arch/x86
 else
-KERNEL_ARCH_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)
+KERNEL_ARCH_PATH=$(LINUX_DIR)/arch/$(KERNEL_ARCH)
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
-LINUX26_IMAGE_PATH=$(LINUX26_DIR)/$(LINUX26_IMAGE_NAME)
+LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else
 ifeq ($(KERNEL_ARCH),avr32)
-LINUX26_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX26_IMAGE_NAME)
+LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)
 else
-LINUX26_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/$(LINUX26_IMAGE_NAME)
+LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
 endif
 endif # BR2_LINUX_KERNEL_VMLINUX
 
 # Download
-$(LINUX26_DIR)/.stamp_downloaded:
+$(LINUX_DIR)/.stamp_downloaded:
 	@$(call MESSAGE,"Downloading kernel")
-	$(call DOWNLOAD,$(LINUX26_SITE),$(LINUX26_SOURCE))
-	$(foreach patch,$(filter ftp://% http://%,$(LINUX26_PATCH)),\
+	$(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE))
+	$(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCH)),\
 		$(call DOWNLOAD,$(dir $(patch)),$(notdir $(patch)))$(sep))
 	mkdir -p $(@D)
 	touch $@
 
 # Extraction
-$(LINUX26_DIR)/.stamp_extracted: $(LINUX26_DIR)/.stamp_downloaded
+$(LINUX_DIR)/.stamp_extracted: $(LINUX_DIR)/.stamp_downloaded
 	@$(call MESSAGE,"Extracting kernel")
 	mkdir -p $(@D)
-	$(Q)$(INFLATE$(suffix $(LINUX26_SOURCE))) $(DL_DIR)/$(LINUX26_SOURCE) | \
+	$(Q)$(INFLATE$(suffix $(LINUX_SOURCE))) $(DL_DIR)/$(LINUX_SOURCE) | \
 		tar -C $(@D) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
 	$(Q)touch $@
 
 # Patch
-$(LINUX26_DIR)/.stamp_patched: $(LINUX26_DIR)/.stamp_extracted
+$(LINUX_DIR)/.stamp_patched: $(LINUX_DIR)/.stamp_extracted
 	@$(call MESSAGE,"Patching kernel")
-	for p in $(LINUX26_PATCH) ; do \
+	for p in $(LINUX_PATCH) ; do \
 		if echo $$p | grep -q -E "^ftp://|^http://" ; then \
 			toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
 		elif test -d $$p ; then \
@@ -107,13 +107,13 @@ $(LINUX26_DIR)/.stamp_patched: $(LINUX26_DIR)/.stamp_extracted
 
 
 # Configuration
-$(LINUX26_DIR)/.stamp_configured: $(LINUX26_DIR)/.stamp_patched
+$(LINUX_DIR)/.stamp_configured: $(LINUX_DIR)/.stamp_patched
 	@$(call MESSAGE,"Configuring kernel")
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
-	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
+	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
 	cp $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) buildroot_defconfig
+	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 endif
 ifeq ($(BR2_ARM_EABI),y)
@@ -141,61 +141,61 @@ endif
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 	$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
 endif
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
 	$(Q)touch $@
 
 # Compilation. We make sure the kernel gets rebuilt when the
 # configuration has changed.
-$(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured $(LINUX26_DIR)/.config
+$(LINUX_DIR)/.stamp_compiled: $(LINUX_DIR)/.stamp_configured $(LINUX_DIR)/.config
 	@$(call MESSAGE,"Compiling kernel")
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
-		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) modules ;	\
+		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi
 	$(Q)touch $@
 
 # Installation
-$(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
+$(LINUX_DIR)/.stamp_installed: $(LINUX_DIR)/.stamp_compiled
 	@$(call MESSAGE,"Installing kernel")
 ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
-	install -m 0644 -D $(LINUX26_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX26_IMAGE_NAME)
+	install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
 endif
-	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
+	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
-		$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) 		\
+		$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) 		\
 			DEPMOD="$(HOST_DIR)/usr/sbin/depmod" modules_install ;		\
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/build ;	\
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/source ;	\
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
 	fi
 	$(Q)touch $@
 
-linux linux26: host-module-init-tools $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_installed
+linux linux26: host-module-init-tools $(LINUX_DEPENDENCIES) $(LINUX_DIR)/.stamp_installed
 
-linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX26_DIR)/.stamp_configured
-	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
+linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
+	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
 
 # Support for rebuilding the kernel after the initramfs file list has
 # been generated in $(BINARIES_DIR)/rootfs.initramfs.
-$(LINUX26_DIR)/.stamp_initramfs_rebuilt: $(LINUX26_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
+$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
 	# Remove the previously generated initramfs which was empty,
 	# to make sure the kernel will actually regenerate it.
 	$(RM) -f $(@D)/usr/initramfs_data.cpio*
 	# Build the kernel.
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	# Copy the kernel image to its final destination
-	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
+	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 	$(Q)touch $@
 
 # The initramfs building code must make sure this target gets called
 # after it generated the initramfs list of files.
-linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX26_DIR)/.stamp_initramfs_rebuilt
+linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
 
 ifeq ($(BR2_LINUX_KERNEL),y)
-TARGETS+=linux26
+TARGETS+=linux
 endif
 
 # Checks to give errors that the user can understand

From 9af0ee86b71cd8bb679687204cc380bd9ff2c73d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:08 +0200
Subject: [PATCH 0389/6849] linux: convert to the GENTARGETS infrastructure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 126 ++++++++++++++++++++++++-------------------------
 1 file changed, 61 insertions(+), 65 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 6dfd558c2c..f8eac6fb43 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -7,16 +7,18 @@ LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 
 # Compute LINUX_SOURCE and LINUX_SITE from the configuration
 ifeq ($(LINUX_VERSION),custom)
-LINUX_TARBALL:=$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
-LINUX_SITE:=$(dir $(LINUX_TARBALL))
-LINUX_SOURCE:=$(notdir $(LINUX_TARBALL))
+LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
+LINUX_SITE = $(dir $(LINUX_TARBALL))
+LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
 else
-LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2
+LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
 endif
 
-LINUX_DIR:=$(BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_PATCH=$(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+
+LINUX_INSTALL_IMAGES = YES
+LINUX_DEPENDENCIES  += host-module-init-tools
 
 LINUX_MAKE_FLAGS = \
 	HOSTCC="$(HOSTCC)" \
@@ -74,27 +76,17 @@ LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
 endif
 endif # BR2_LINUX_KERNEL_VMLINUX
 
-# Download
-$(LINUX_DIR)/.stamp_downloaded:
-	@$(call MESSAGE,"Downloading kernel")
-	$(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE))
-	$(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCH)),\
+define LINUX_DOWNLOAD_PATCHES
+	$(if $(LINUX_PATCHES),
+		@$(call MESSAGE,"Download additional patches"))
+	$(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCHES)),\
 		$(call DOWNLOAD,$(dir $(patch)),$(notdir $(patch)))$(sep))
-	mkdir -p $(@D)
-	touch $@
-
-# Extraction
-$(LINUX_DIR)/.stamp_extracted: $(LINUX_DIR)/.stamp_downloaded
-	@$(call MESSAGE,"Extracting kernel")
-	mkdir -p $(@D)
-	$(Q)$(INFLATE$(suffix $(LINUX_SOURCE))) $(DL_DIR)/$(LINUX_SOURCE) | \
-		tar -C $(@D) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
-	$(Q)touch $@
+endef
+
+LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
 
-# Patch
-$(LINUX_DIR)/.stamp_patched: $(LINUX_DIR)/.stamp_extracted
-	@$(call MESSAGE,"Patching kernel")
-	for p in $(LINUX_PATCH) ; do \
+define LINUX_APPLY_PATCHES
+	for p in $(LINUX_PATCHES) ; do \
 		if echo $$p | grep -q -E "^ftp://|^http://" ; then \
 			toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
 		elif test -d $$p ; then \
@@ -103,64 +95,66 @@ $(LINUX_DIR)/.stamp_patched: $(LINUX_DIR)/.stamp_extracted
 			toolchain/patch-kernel.sh $(@D) `dirname $$p` `basename $$p` ; \
 		fi \
 	done
-	$(Q)touch $@
+endef
+
+LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
 
 
-# Configuration
-$(LINUX_DIR)/.stamp_configured: $(LINUX_DIR)/.stamp_patched
-	@$(call MESSAGE,"Configuring kernel")
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
-	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
+KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
-	cp $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+endif
+
+define LINUX_CONFIGURE_CMDS
+	cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-endif
-ifeq ($(BR2_ARM_EABI),y)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)
-else
-	$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config)
-endif
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+	$(if $(BR2_ARM_EABI),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
+		$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
 	# As the kernel gets compiled before root filesystems are
 	# built, we create a fake initramfs file list. It'll be
 	# replaced later by the real list, and the kernel will be
 	# rebuilt using the linux26-rebuild-with-initramfs target.
-	touch $(BINARIES_DIR)/rootfs.initramfs
-	$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
-	$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
-	$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
-	$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
-endif
-ifneq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)
-endif
-ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
-	$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
-endif
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
-	$(Q)touch $@
+	$(if $(BR2_TARGET_ROOTFS_INITRAMFS),
+		touch $(BINARIES_DIR)/rootfs.initramfs
+		$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
+		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
+		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
+		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
+		$(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config))
+	$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
+		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
+	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
+		$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
+	yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
+endef
 
 # Compilation. We make sure the kernel gets rebuilt when the
 # configuration has changed.
-$(LINUX_DIR)/.stamp_compiled: $(LINUX_DIR)/.stamp_configured $(LINUX_DIR)/.config
-	@$(call MESSAGE,"Compiling kernel")
+define LINUX_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi
-	$(Q)touch $@
+endef
+
 
-# Installation
-$(LINUX_DIR)/.stamp_installed: $(LINUX_DIR)/.stamp_compiled
-	@$(call MESSAGE,"Installing kernel")
 ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
+define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
 	install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+endef
 endif
+
+define LINUX_INSTALL_IMAGES_CMDS
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
+endef
+
+define LINUX_INSTALL_TARGET_CMDS
+	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
@@ -169,17 +163,18 @@ endif
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
 	fi
-	$(Q)touch $@
+endef
 
-linux linux26: host-module-init-tools $(LINUX_DEPENDENCIES) $(LINUX_DIR)/.stamp_installed
+$(eval $(call GENTARGETS,,linux))
 
 linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
 	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
+	rm -f $(LINUX_DIR)/.stamp_{built,target_installed,images_installed}
 
 # Support for rebuilding the kernel after the initramfs file list has
 # been generated in $(BINARIES_DIR)/rootfs.initramfs.
-$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
+$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.initramfs
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
 	# Remove the previously generated initramfs which was empty,
 	# to make sure the kernel will actually regenerate it.
@@ -194,6 +189,7 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_installed $(BINARIES_
 # after it generated the initramfs list of files.
 linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
 
+
 ifeq ($(BR2_LINUX_KERNEL),y)
 TARGETS+=linux
 endif

From a4ca959321da218ebb2e5078831e5ec1f4d8da34 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:09 +0200
Subject: [PATCH 0390/6849] u-boot: rename to uboot

This will allow to match the currently Config.in option
BR2_TARGET_UBOOT, in order to make it easy to integrate U-Boot into
the package infrastructure.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/Config.in                                |  2 +-
 boot/{u-boot => uboot}/Config.in              |  0
 .../uboot-2010.03-fix-avr32.patch}            |  0
 boot/{u-boot/u-boot.mk => uboot/uboot.mk}     | 78 +++++++++----------
 4 files changed, 40 insertions(+), 40 deletions(-)
 rename boot/{u-boot => uboot}/Config.in (100%)
 rename boot/{u-boot/u-boot-2010.03-fix-avr32.patch => uboot/uboot-2010.03-fix-avr32.patch} (100%)
 rename boot/{u-boot/u-boot.mk => uboot/uboot.mk} (62%)

diff --git a/boot/Config.in b/boot/Config.in
index 67ab8aca4e..67adae8318 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -3,7 +3,7 @@ menu "Bootloaders"
 source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
 source "boot/syslinux/Config.in"
-source "boot/u-boot/Config.in"
+source "boot/uboot/Config.in"
 source "boot/at91bootstrap/Config.in"
 source "boot/at91dataflashboot/Config.in"
 
diff --git a/boot/u-boot/Config.in b/boot/uboot/Config.in
similarity index 100%
rename from boot/u-boot/Config.in
rename to boot/uboot/Config.in
diff --git a/boot/u-boot/u-boot-2010.03-fix-avr32.patch b/boot/uboot/uboot-2010.03-fix-avr32.patch
similarity index 100%
rename from boot/u-boot/u-boot-2010.03-fix-avr32.patch
rename to boot/uboot/uboot-2010.03-fix-avr32.patch
diff --git a/boot/u-boot/u-boot.mk b/boot/uboot/uboot.mk
similarity index 62%
rename from boot/u-boot/u-boot.mk
rename to boot/uboot/uboot.mk
index 215b1c71bf..3e945c7f25 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/uboot/uboot.mk
@@ -3,42 +3,42 @@
 # U-Boot
 #
 #############################################################
-U_BOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
-U_BOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 
-U_BOOT_INSTALL_IMAGES = YES
+UBOOT_INSTALL_IMAGES = YES
 
-ifeq ($(U_BOOT_VERSION),custom)
+ifeq ($(UBOOT_VERSION),custom)
 # Handle custom U-Boot tarballs as specified by the configuration
-U_BOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
-U_BOOT_SITE    = $(dir $(U_BOOT_TARBALL))
-U_BOOT_SOURCE  = $(notdir $(U_BOOT_TARBALL))
+UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
+UBOOT_SITE    = $(dir $(UBOOT_TARBALL))
+UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
 else
 # Handle stable official U-Boot versions
-U_BOOT_SITE    = ftp://ftp.denx.de/pub/u-boot
-U_BOOT_SOURCE  = u-boot-$(U_BOOT_VERSION).tar.bz2
+UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot
+UBOOT_SOURCE  = u-boot-$(UBOOT_VERSION).tar.bz2
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
-U_BOOT_BIN          = u-boot.kwb
-U_BOOT_MAKE_TARGET  = $(U_BOOT_BIN)
+UBOOT_BIN          = u-boot.kwb
+UBOOT_MAKE_TARGET  = $(U_BOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
-U_BOOT_BIN          = u-boot.ldr
+UBOOT_BIN          = u-boot.ldr
 else
-U_BOOT_BIN          = u-boot.bin
+UBOOT_BIN          = u-boot.bin
 endif
 
-U_BOOT_ARCH=$(KERNEL_ARCH)
+UBOOT_ARCH=$(KERNEL_ARCH)
 
 # u-boot in the past used arch=ppc for powerpc
-ifneq ($(findstring x2010.03,x$(U_BOOT_VERSION)),)
-U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
+ifneq ($(findstring x2010.03,x$(UBOOT_VERSION)),)
+UBOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
 endif
 
-U_BOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
-U_BOOT_MAKE_OPTS += \
+UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
+UBOOT_MAKE_OPTS += \
 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-	ARCH=$(U_BOOT_ARCH)
+	ARCH=$(UBOOT_ARCH)
 
 # Helper function to fill the U-Boot config.h file.
 # Argument 1: option name
@@ -53,18 +53,18 @@ $(if $(call qstrip,$(2)),
 endef
 
 ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
-define U_BOOT_APPLY_CUSTOM_PATCHES
+define UBOOT_APPLY_CUSTOM_PATCHES
 	toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
-		u-boot-$(U_BOOT_VERSION)-\*.patch
+		uboot-$(UBOOT_VERSION)-\*.patch
 endef
 
-U_BOOT_POST_PATCH_HOOKS += U_BOOT_APPLY_CUSTOM_PATCHES
+UBOOT_POST_PATCH_HOOKS += U_BOOT_APPLY_CUSTOM_PATCHES
 endif
 
-define U_BOOT_CONFIGURE_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(U_BOOT_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(U_BOOT_MAKE_OPTS)		\
-		$(U_BOOT_BOARD_NAME)_config
+define UBOOT_CONFIGURE_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS)		\
+		$(UBOOT_BOARD_NAME)_config
 	@echo >> $(@D)/include/config.h
 	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
 	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
@@ -81,35 +81,35 @@ define U_BOOT_CONFIGURE_CMDS
 endef
 
 ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-define U_BOOT_BUILD_TARGET_ENV_UTILS
+define UBOOT_BUILD_TARGET_ENV_UTILS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) HOSTCC="$(TARGET_CC)" -C $(@D) env
 endef
 endif
 
-define U_BOOT_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(U_BOOT_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(U_BOOT_MAKE_OPTS) 		\
-		$(U_BOOT_MAKE_TARGET)
-	$(U_BOOT_BUILD_TARGET_ENV_UTILS)
+define UBOOT_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
+		$(UBOOT_MAKE_TARGET)
+	$(UBOOT_BUILD_TARGET_ENV_UTILS)
 endef
 
-define U_BOOT_INSTALL_IMAGES_CMDS
-	cp -dpf $(@D)/$(U_BOOT_BIN) $(BINARIES_DIR)/
+define UBOOT_INSTALL_IMAGES_CMDS
+	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 endef
 
 ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-define U_BOOT_INSTALL_TARGET_ENV_UTILS
+define UBOOT_INSTALL_TARGET_ENV_UTILS
 	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv \
 		$(TARGET_DIR)/usr/sbin/fw_printenv
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 endef
 endif
 
-define U_BOOT_INSTALL_TARGET_CMDS
-	$(U_BOOT_INSTALL_TARGET_ENV_UTILS)
+define UBOOT_INSTALL_TARGET_CMDS
+	$(UBOOT_INSTALL_TARGET_ENV_UTILS)
 endef
 
-$(eval $(call GENTARGETS,boot,u-boot))
+$(eval $(call GENTARGETS,boot,uboot))
 
 #############################################################
 #
@@ -121,7 +121,7 @@ TARGETS+=u-boot
 
 # we NEED a board name unless we're at make source
 ifeq ($(filter source,$(MAKECMDGOALS)),)
-ifeq ($(U_BOOT_BOARD_NAME),)
+ifeq ($(UBOOT_BOARD_NAME),)
 $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
 endif
 endif

From b0d446dee427cfdb71c55c2a46472786de7b8ffc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:10 +0200
Subject: [PATCH 0391/6849] Improve TARGETS handling for bootloaders and kernel

As the kernel and bootloaders do not use the normal BR2_PACKAGE_*
Kconfig options, their target name was not automatically added to the
global TARGETS variable. Each bootloader .mk and the linux.mk had to
add their own target manually to TARGETS, and the package
infrastructure was making tests on non-existing Kconfig variables.

This commit improves the package infrastructure so that it looks at
BR2_PACKAGE_<pkg> for packages, BR2_TARGET_<pkg> for bootloaders and
at the special BR2_LINUX_KERNEL for the linux package.

This allows to simplify a little bit the bootloaders and linux .mk
files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk         |  8 --------
 boot/at91dataflashboot/at91dataflashboot.mk |  9 ---------
 boot/barebox/barebox.mk                     |  3 ---
 boot/grub/grub.mk                           |  9 ---------
 boot/syslinux/syslinux.mk                   |  9 ---------
 boot/uboot/uboot.mk                         |  8 --------
 linux/linux.mk                              |  5 -----
 package/Makefile.package.in                 | 16 +++++++++++++---
 8 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 37f8ac70c4..871b0ffb49 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -31,19 +31,11 @@ endef
 
 $(eval $(call GENTARGETS,boot,at91bootstrap))
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
-TARGETS+=at91bootstrap
-
 # we NEED a board name unless we're at make source
 ifeq ($(filter source,$(MAKECMDGOALS)),)
 ifeq ($(AT91BOOTSTRAP_BOARD),)
 $(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting)
 endif
 endif
-
 endif
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 9b6cf21166..14fb8c54d3 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -20,12 +20,3 @@ define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
 endef
 
 $(eval $(call GENTARGETS,boot,at91dataflashboot))
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_AT91DATAFLASHBOOT),y)
-TARGETS+=at91dataflashboot
-endif
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 34ec5dadf2..1952c987f7 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -54,13 +54,10 @@ endif
 $(eval $(call GENTARGETS,boot,barebox))
 
 ifeq ($(BR2_TARGET_BAREBOX),y)
-TARGETS+=barebox
-
 # we NEED a board defconfig file unless we're at make source
 ifeq ($(filter source,$(MAKECMDGOALS)),)
 ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
 $(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
 endif
 endif
-
 endif
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 49384169f1..2ce8eabc90 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -83,12 +83,3 @@ define GRUB_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call AUTOTARGETS,boot,grub))
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_GRUB),y)
-TARGETS+=grub
-endif
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index e9c32b6409..686124fe59 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -27,12 +27,3 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
 endef
 
 $(eval $(call GENTARGETS,boot,syslinux))
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_SYSLINUX),y)
-TARGETS+=syslinux
-endif
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 3e945c7f25..dfa012a8fc 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -111,19 +111,11 @@ endef
 
 $(eval $(call GENTARGETS,boot,uboot))
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
 ifeq ($(BR2_TARGET_UBOOT),y)
-TARGETS+=u-boot
-
 # we NEED a board name unless we're at make source
 ifeq ($(filter source,$(MAKECMDGOALS)),)
 ifeq ($(UBOOT_BOARD_NAME),)
 $(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
 endif
 endif
-
 endif
diff --git a/linux/linux.mk b/linux/linux.mk
index f8eac6fb43..25db1f5ea5 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -189,11 +189,6 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI
 # after it generated the initramfs list of files.
 linux-rebuild-with-initramfs linux26-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
 
-
-ifeq ($(BR2_LINUX_KERNEL),y)
-TARGETS+=linux
-endif
-
 # Checks to give errors that the user can understand
 ifeq ($(filter source,$(MAKECMDGOALS)),)
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index aa5c0d7e81..faa7ff1f38 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -522,10 +522,20 @@ $$($(2)_TARGET_UNINSTALL):		PKG=$(2)
 $$($(2)_TARGET_CLEAN):			PKG=$(2)
 $$($(2)_TARGET_DIRCLEAN):		PKG=$(2)
 
+# Compute the name of the Kconfig option that correspond to the
+# package being enabled. We handle three cases: the special Linux
+# kernel case, the bootloaders case, and the normal packages case.
+ifeq ($(1),linux)
+$(2)_KCONFIG_VAR = BR2_LINUX_KERNEL
+else ifeq ($(4),boot)
+$(2)_KCONFIG_VAR = BR2_TARGET_$(2)
+else
+$(2)_KCONFIG_VAR = BR2_PACKAGE_$(2)
+endif
+
 # add package to the general list of targets if requested by the buildroot
 # configuration
-
-ifeq ($$(BR2_PACKAGE_$(2)),y)
+ifeq ($$($$($(2)_KCONFIG_VAR)),y)
 
 TARGETS += $(1)
 
@@ -537,7 +547,7 @@ else ifeq ($$($(2)_SITE_METHOD),bzr)
 DL_TOOLS_DEPENDENCIES += bzr
 endif # SITE_METHOD
 
-endif # BR2_PACKAGE_$(2)
+endif # $(2)_KCONFIG_VAR
 endef # GENTARGETS_INNER
 
 ################################################################################

From 205fb19cdb475b0b56e675f53bdeca17deb98fbe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:11 +0200
Subject: [PATCH 0392/6849] linux: allow specification of a custom Git
 repository as a source

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 15 +++++++++++++++
 linux/linux.mk  |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index bf16ddf2b7..8d3b0ba849 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -47,6 +47,12 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL
 	  This option allows to specify the http or ftp location of a
 	  specific kernel source tarball
 
+config BR2_LINUX_KERNEL_CUSTOM_GIT
+	bool "Custom Git tree"
+	help
+	  This option allows Buildroot to get the Linux kernel source
+	  code from a Git repository.
+
 endchoice
 
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
@@ -58,12 +64,21 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
 	depends on BR2_LINUX_KERNEL_CUSTOM_TARBALL
 
+config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
+	string "URL of custom Git repository"
+	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+
+config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
+	string "Custom Git version"
+	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+
 config BR2_LINUX_KERNEL_VERSION
 	string
 	default "2.6.39.3" if BR2_LINUX_KERNEL_2_6_39
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
+	default $BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
 
 #
 # Patch selection
diff --git a/linux/linux.mk b/linux/linux.mk
index 25db1f5ea5..bba49216c7 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -10,6 +10,9 @@ ifeq ($(LINUX_VERSION),custom)
 LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
 LINUX_SITE = $(dir $(LINUX_TARBALL))
 LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
+else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
+LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
+LINUX_SITE_METHOD = git
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2
 LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/

From 29679495b8f247171a741f11c666cbb2ae254cd7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:12 +0200
Subject: [PATCH 0393/6849] u-boot: allow specification of custom Git repo as
 source

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 14 ++++++++++++++
 boot/uboot/uboot.mk  |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index aada346e72..dbd4f34dfa 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -34,6 +34,9 @@ config BR2_TARGET_UBOOT_2010_03
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"
 
+config BR2_TARGET_UBOOT_CUSTOM_GIT
+	bool "Custom Git repository"
+
 endchoice
 
 if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -51,6 +54,7 @@ config BR2_TARGET_UBOOT_VERSION
 	default "2010.06"	if BR2_TARGET_UBOOT_2010_06
 	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
+	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	string "custom patch dir"
@@ -61,6 +65,16 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 
 	  Most users may leave this empty
 
+if BR2_TARGET_UBOOT_CUSTOM_GIT
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
+	string "URL of custom Git repository"
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
+	string "Custom Git version"
+
+endif
+
 choice
 	prompt "U-Boot binary format"
 
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index dfa012a8fc..e87727b5df 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -13,6 +13,9 @@ ifeq ($(UBOOT_VERSION),custom)
 UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
 UBOOT_SITE    = $(dir $(UBOOT_TARBALL))
 UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
+else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
+UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL))
+UBOOT_SITE_METHOD = git
 else
 # Handle stable official U-Boot versions
 UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot

From 2269dfa356913ab2cff7f6d9cb1cf3b2e69c7175 Mon Sep 17 00:00:00 2001
From: Philippe Reynes <tremyfr@yahoo.fr>
Date: Mon, 11 Jul 2011 22:46:13 +0200
Subject: [PATCH 0394/6849] Add x-loader bootloader

Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

merge xloader
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/Config.in          |  1 +
 boot/xloader/Config.in  | 15 +++++++++++++++
 boot/xloader/xloader.mk | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 boot/xloader/Config.in
 create mode 100644 boot/xloader/xloader.mk

diff --git a/boot/Config.in b/boot/Config.in
index 67adae8318..2a97695d57 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -6,6 +6,7 @@ source "boot/syslinux/Config.in"
 source "boot/uboot/Config.in"
 source "boot/at91bootstrap/Config.in"
 source "boot/at91dataflashboot/Config.in"
+source "boot/xloader/Config.in"
 
 endmenu
 
diff --git a/boot/xloader/Config.in b/boot/xloader/Config.in
new file mode 100644
index 0000000000..d295b45d89
--- /dev/null
+++ b/boot/xloader/Config.in
@@ -0,0 +1,15 @@
+menuconfig BR2_TARGET_XLOADER
+	bool "X-loader"
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	help
+	  The x-loader bootloader. It is mainly used on OMAP-based
+	  platforms.
+
+if BR2_TARGET_XLOADER
+config BR2_TARGET_XLOADER_BOARDNAME
+	string "x-loader board name"
+	help
+	  One of x-loader supported boards to be built.
+	  This will be suffixed with _config to meet x-loader
+	  standard naming.
+endif
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
new file mode 100644
index 0000000000..8d8cce3b9e
--- /dev/null
+++ b/boot/xloader/xloader.mk
@@ -0,0 +1,37 @@
+#############################################################
+#
+# x-loader
+#
+#############################################################
+XLOADER_VERSION    = 6f3a26101303051e0f91b6213735b68ce804e94e
+XLOADER_SITE       = git://gitorious.org/x-loader/x-loader.git
+XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
+
+XLOADER_INSTALL_IMAGES = YES
+
+define XLOADER_BUILD_CMDS
+	$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) $(XLOADER_BOARD_NAME)_config
+	$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
+	$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) ift
+endef
+
+define XLOADER_INSTALL_IMAGES_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/MLO $(BINARIES_DIR)/
+endef
+
+$(eval $(call GENTARGETS,boot,xloader))
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_TARGET_XLOADER),y)
+# we NEED a board name unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(XLOADER_BOARD_NAME),)
+$(error NO x-loader board name set. Check your BR2_BOOT_XLOADER_BOARDNAME setting)
+endif
+endif
+
+endif

From 6fa85c6c035de54fd202805e13e2923327583fae Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:14 +0200
Subject: [PATCH 0395/6849] barebox: bump version

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 1952c987f7..7e69437e39 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BAREBOX_VERSION = 2011.05.0
+BAREBOX_VERSION = 2011.06.0
 BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 

From 4a665aa9459f6f2ebcb2c46efd4a0a73fb1f9795 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:15 +0200
Subject: [PATCH 0396/6849] at91dataflashboot: use "config" instead of
 "menuconfig"

Since at91dataflashboot has no suboption, using "menuconfig" is
useless and confusing, as it creates an empty submenu in the
configuration interface.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91dataflashboot/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index 88cd058f58..a4efe11926 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
-menuconfig BR2_TARGET_AT91DATAFLASHBOOT
+config BR2_TARGET_AT91DATAFLASHBOOT
        depends on BR2_arm
        bool "AT91 DataFlashBoot"

From f45f775b4fcb271e5b94b489ad47ffd37f712ce2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:16 +0200
Subject: [PATCH 0397/6849] linux: add support for 3.x and -rc versions

The assumption that all kernels are in
http://www.kernel.org/pub/linux/kernel/v2.6/ is no longer true:
versions 3.x are in separate directories.

We now compute the directory name from the major and minor versions of
the version provided by the user. This assumes that the 3.1 version
will be in a /v3.1/ directory, which we don't know yet because the 3.1
cycle hasn't started yet.

At the same time, we add support for the official -rcX versions.

Patch tested by compiling 3.0-rc6, which Buildroot has successfully
downloaded and built.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index bba49216c7..06792382a9 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -15,7 +15,16 @@ LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
 LINUX_SITE_METHOD = git
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2
-LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
+# to use the $(word) function. We support versions such as 3.1,
+# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+LINUX_VERSION_MAJOR = $(word 1,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
+LINUX_VERSION_MINOR = $(word 2,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
+LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
+# release candidates are in testing/ subdir
+ifneq ($(findstring -rc,$(LINUX_VERSION)),)
+LINUX_SITE = $(LINUX_SITE)testing/
+endif # -rc
 endif
 
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))

From e488c285b1839976e1d508d8be8c0208cc453f3e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Jul 2011 22:46:17 +0200
Subject: [PATCH 0398/6849] uboot: Add 2011.06, remove 2010.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in                     | 10 +++++-----
 boot/uboot/uboot-2010.03-fix-avr32.patch |  5 -----
 boot/uboot/uboot.mk                      |  5 -----
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 boot/uboot/uboot-2010.03-fix-avr32.patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index dbd4f34dfa..070533efd7 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2011_03
+	default BR2_TARGET_UBOOT_2011_06
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2011_06
+	bool "2011.06"
+
 config BR2_TARGET_UBOOT_2011_03
 	bool "2011.03"
 
@@ -28,9 +31,6 @@ config BR2_TARGET_UBOOT_2010_09
 config BR2_TARGET_UBOOT_2010_06
 	bool "2010.06"
 
-config BR2_TARGET_UBOOT_2010_03
-	bool "2010.03"
-
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -48,11 +48,11 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
 	default "2011.03"	if BR2_TARGET_UBOOT_2011_03
 	default "2010.12"	if BR2_TARGET_UBOOT_2010_12
 	default "2010.09"	if BR2_TARGET_UBOOT_2010_09
 	default "2010.06"	if BR2_TARGET_UBOOT_2010_06
-	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 
diff --git a/boot/uboot/uboot-2010.03-fix-avr32.patch b/boot/uboot/uboot-2010.03-fix-avr32.patch
deleted file mode 100644
index 1f9aab8f0e..0000000000
--- a/boot/uboot/uboot-2010.03-fix-avr32.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-diff -Naur u-boot-2010.03-orig/include/asm-avr32/unaligned.h u-boot-2010.03/include/asm-avr32/unaligned.h
---- u-boot-2010.03-orig/include/asm-avr32/unaligned.h	1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2010.03/include/asm-avr32/unaligned.h	2010-06-22 23:09:49.000000000 -0300
-@@ -0,0 +1 @@
-+#include <asm-generic/unaligned.h>
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index e87727b5df..ec592e13e4 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -33,11 +33,6 @@ endif
 
 UBOOT_ARCH=$(KERNEL_ARCH)
 
-# u-boot in the past used arch=ppc for powerpc
-ifneq ($(findstring x2010.03,x$(UBOOT_VERSION)),)
-UBOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
-endif
-
 UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
 UBOOT_MAKE_OPTS += \
 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \

From 33c4e77c2acc9615181b26255684e7d952393c2f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 11 Jul 2011 23:46:22 +0200
Subject: [PATCH 0399/6849] barebox: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7e69437e39..55e1ffd65f 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BAREBOX_VERSION = 2011.06.0
+BAREBOX_VERSION = 2011.07.0
 BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 

From ffe62f915dcbf62a840b40167f391127f0702aac Mon Sep 17 00:00:00 2001
From: Milton Soares Filho <milton.soares.filho@gmail.com>
Date: Tue, 12 Jul 2011 01:04:39 -0400
Subject: [PATCH 0400/6849] sysvinit: package name typo

This fails when Make decides to process sysvinit targets before busybox.

Signed-off-by: Milton Soares Filho <milton.soares.filho@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sysvinit/sysvinit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 97576b8a92..adcc1ade02 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -10,7 +10,7 @@ SYSVINIT_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
 
 # Override Busybox implementations if Busybox is enabled.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSKLOGD_DEPENDENCIES = busybox
+SYSVINIT_DEPENDENCIES = busybox
 endif
 
 define SYSVINIT_DEBIAN_PATCHES

From 50b62197858f4171372341a97fdc33b28064cce6 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Mon, 11 Jul 2011 15:34:26 +0200
Subject: [PATCH 0401/6849] libgcrypt: bump version to 1.5.0

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgcrypt/libgcrypt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index a7163ea5aa..8b08c3eefd 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBGCRYPT_VERSION = 1.4.6
+LIBGCRYPT_VERSION = 1.5.0
 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
 LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 LIBGCRYPT_INSTALL_STAGING = YES

From 9c6106f10494e539f00b1fc117801171348bd4bd Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Mon, 11 Jul 2011 15:34:27 +0200
Subject: [PATCH 0402/6849] package: add gnutls

[Peter: move to crypto section]
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/gnutls/Config.in |  8 ++++++++
 package/gnutls/gnutls.mk | 14 ++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/gnutls/Config.in
 create mode 100644 package/gnutls/gnutls.mk

diff --git a/package/Config.in b/package/Config.in
index d87dcd8fc1..aef701d8f8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -248,6 +248,7 @@ endmenu
 
 menu "Crypto"
 source "package/beecrypt/Config.in"
+source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libnss/Config.in"
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
new file mode 100644
index 0000000000..cedf120ee7
--- /dev/null
+++ b/package/gnutls/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GNUTLS
+	bool "gnutls"
+	select BR2_PACKAGE_LIBGCRYPT
+	help
+	  GnuTLS is a secure communications library implementing the SSL
+	  and TLS protocols and technologies around them.
+
+	  http://www.gnu.org/software/gnutls/gnutls.html
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
new file mode 100644
index 0000000000..5f31e1e9dc
--- /dev/null
+++ b/package/gnutls/gnutls.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# gnutls
+#
+#############################################################
+
+GNUTLS_VERSION = 2.8.6
+GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
+GNUTLS_SITE = http://ftp.gnu.org/gnu/gnutls/
+GNUTLS_DEPENDENCIES = libgcrypt
+GNUTLS_CONF_OPT += --without-libgcrypt-prefix
+GNUTLS_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,gnutls))

From f1ebbb3df9d6ec1405e19244c81ca4c852bf3c34 Mon Sep 17 00:00:00 2001
From: Robin Holt <holt@sgi.com>
Date: Mon, 13 Jun 2011 07:14:05 -0500
Subject: [PATCH 0403/6849] package: add libargtable2

The argtable2 sourceforge project provides easy parsing of command line
options and file contents.

[Peter: Misc cleanup/fixes]
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/libargtable2/Config.in       |  7 +++++++
 package/libargtable2/libargtable2.mk | 17 +++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/libargtable2/Config.in
 create mode 100644 package/libargtable2/libargtable2.mk

diff --git a/package/Config.in b/package/Config.in
index aef701d8f8..55ea34300d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -333,6 +333,7 @@ source "package/libupnp/Config.in"
 endmenu
 
 menu "Other"
+source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
diff --git a/package/libargtable2/Config.in b/package/libargtable2/Config.in
new file mode 100644
index 0000000000..42d067becd
--- /dev/null
+++ b/package/libargtable2/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBARGTABLE2
+	bool "libargtable2"
+	help
+	  A greatly simplified and yet quite robust argument parsing
+	  set of library calls.
+
+	  http://argtable.sourceforge.net/
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
new file mode 100644
index 0000000000..57eb629ff1
--- /dev/null
+++ b/package/libargtable2/libargtable2.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# libargtable2
+#
+#############################################################
+
+LIBARGTABLE2_VERSION = 13
+LIBARGTABLE2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/argtable/
+
+LIBARGTABLE2_INSTALL_STAGING = YES
+LIBARGTABLE2_CONF_OPT= --program-prefix="" \
+		--disable-example \
+		--disable-kernel-module \
+		--enable-lib \
+		--enable-util
+
+$(eval $(call AUTOTARGETS,package,libargtable2))

From 177b4b4ac036a34fd2a037f22f121722ce163dd2 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Tue, 10 May 2011 08:17:05 +0200
Subject: [PATCH 0404/6849] Makefile.package.in: Add BR2_XZCAT for LZMA
 compression type

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                   | 7 +++++++
 Makefile                    | 1 +
 package/Makefile.package.in | 1 +
 3 files changed, 9 insertions(+)

diff --git a/Config.in b/Config.in
index a67c08d7fb..2fce9d7900 100644
--- a/Config.in
+++ b/Config.in
@@ -52,6 +52,13 @@ config BR2_BZCAT
 	  Default is "bzcat"
 	  Other possible values include "bunzip2 -c" or "bzip2 -d -c".
 
+config BR2_XZCAT
+	string "xzcat command"
+	default "xzcat"
+	help
+	  Command to be used to extract a xz'ed file to stdout.
+	  Default is "xzcat"
+
 config BR2_TAR_OPTIONS
 	string "Tar options"
 	default ""
diff --git a/Makefile b/Makefile
index 20dd707103..2f3802c105 100644
--- a/Makefile
+++ b/Makefile
@@ -261,6 +261,7 @@ KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 
 ZCAT:=$(call qstrip,$(BR2_ZCAT))
 BZCAT:=$(call qstrip,$(BR2_BZCAT))
+XZCAT:=$(call qstrip,$(BR2_XZCAT))
 TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 
 GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index faa7ff1f38..74087cd462 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -61,6 +61,7 @@ INFLATE.gz   = $(ZCAT)
 INFLATE.tbz  = $(BZCAT)
 INFLATE.tbz2 = $(BZCAT)
 INFLATE.tgz  = $(ZCAT)
+INFLATE.xz   = $(XZCAT)
 INFLATE.tar  = cat
 
 # MESSAGE Macro -- display a message in bold type

From 951574555c6b70194c4a5b96542dff42c4b97bdb Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Fri, 6 May 2011 15:23:04 +0100
Subject: [PATCH 0405/6849] sh: Add SH2A CodeSourcery external toolchain

Added the CodeSourcery uCLinux/uClibc toolchain for the SH2A big
endian devices.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 13 +++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 04bd20745b..22cee53596 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -152,6 +152,18 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
+	bool "CodeSoucery SH 2010.09"
+	depends on BR2_sh2a_nofpueb || BR2_sh2eb
+	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the SuperH architecture, from CodeSourcery. It
+	  uses gcc 4.5.1, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
+	  kernel headers 2.6.35.2. It has support for
+	  the following variants:
+            - SH2A, uClibc, big endian
+
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	bool "Blackfin.uclinux.org 2010RC1"
 	depends on BR2_bfin
@@ -206,6 +218,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
+	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index ef71ce04d6..db9365b1ad 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -189,6 +189,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-g
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
+TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2

From 466cb4531d939785c96dfc1fa931b0815dd24e3c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 6 May 2011 11:04:45 -0300
Subject: [PATCH 0406/6849] bridge-utils: bump to version 1.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bridge-utils/Config.in |  2 +-
 package/bridge-utils/bridge.mk | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in
index 9feb230447..c2e8ca028c 100644
--- a/package/bridge-utils/Config.in
+++ b/package/bridge-utils/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_BRIDGE
 	  Manage ethernet bridging; a way to connect networks together to
 	  form a larger network.
 
-	  http://bridge.sourceforge.net/
+	  http://linux-net.osdl.org/index.php/Bridge
diff --git a/package/bridge-utils/bridge.mk b/package/bridge-utils/bridge.mk
index f8736b1bf4..8f3f741380 100644
--- a/package/bridge-utils/bridge.mk
+++ b/package/bridge-utils/bridge.mk
@@ -1,20 +1,18 @@
 #############################################################
 #
-# bridge-utils - User Space Program For Controlling Bridging
+# bridge-utils
 #
 #############################################################
-#
-BRIDGE_VERSION:=1.4
-BRIDGE_SOURCE:=bridge-utils-$(BRIDGE_VERSION).tar.gz
-BRIDGE_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
-BRIDGE_AUTORECONF:=YES
-BRIDGE_INSTALL_STAGING:=NO
-BRIDGE_INSTALL_TARGET:=YES
-BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR)
+
+BRIDGE_VERSION = 1.5
+BRIDGE_SOURCE = bridge-utils-$(BRIDGE_VERSION).tar.gz
+BRIDGE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge
+BRIDGE_AUTORECONF = YES
+BRIDGE_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
 
 define BRIDGE_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
-		include/libbridge.h man/man8/brctl.8 sbin/brctl)
+		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
 endef
 
 $(eval $(call AUTOTARGETS,package,bridge))

From aa0c4d4e48c615b1eab0b10296680b4a047c500e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 13 Jul 2011 08:09:41 +0200
Subject: [PATCH 0407/6849] libargtable2: fix source tarball name

Last minute brown paper bag bug.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libargtable2/libargtable2.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index 57eb629ff1..5f388f9745 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -5,6 +5,7 @@
 #############################################################
 
 LIBARGTABLE2_VERSION = 13
+LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
 LIBARGTABLE2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/argtable/
 
 LIBARGTABLE2_INSTALL_STAGING = YES

From 72eb844be64567dadd7d619aa049fafbfa347736 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 12 Jul 2011 17:45:22 -0700
Subject: [PATCH 0408/6849] Fix colon location in S01logging script

The S01logging script currently displays the start/stop messages like this:

Start logging :OK

The normal form for these messages is:

Start logging: OK

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/S01logging | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/busybox/S01logging b/package/busybox/S01logging
index 6badebe1ab..581f192daa 100644
--- a/package/busybox/S01logging
+++ b/package/busybox/S01logging
@@ -5,13 +5,13 @@
 
 case "$1" in
   start)
-	echo -n "Starting logging :"
+	echo -n "Starting logging: "
 	start-stop-daemon -S -q -p /var/run/syslog.pid --exec /sbin/syslogd -- -m 0
 	start-stop-daemon -S -q -p /var/run/klogd.pid --exec /sbin/klogd
 	echo "OK"
 	;;
   stop)
-	echo -n "Stopping logging :"
+	echo -n "Stopping logging: "
 	start-stop-daemon -K -q -p /var/run/syslog.pid
 	start-stop-daemon -K -q -p /var/run/klogd.pid
 	echo "OK"

From ea23f34e25839a9559c3bb61cc5d9f54c89e137b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 13 Jul 2011 01:07:45 +0200
Subject: [PATCH 0409/6849] toolchain/crosstool-ng: allow pre-downloading the
 sources

On "make source", just download the required sources, and do not
build the entire toolchain. This requires a new patch against
crosstool-NG (got from upstream).

The "uclibc-source" rule requires an installed and configured
crosstool-NG, so it has to be after the variables declaration.
For consistency, move down the main rule "uclibc".

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...k-on-existing-symlinks-and-build.log.patch | 76 +++++++++++++++++++
 .../toolchain-crosstool-ng/crosstool-ng.mk    | 17 +++--
 2 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch

diff --git a/toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch b/toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch
new file mode 100644
index 0000000000..2bb613ffb3
--- /dev/null
+++ b/toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch
@@ -0,0 +1,76 @@
+
+# HG changeset patch
+# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+# Date 1310507544 -7200
+# Node ID 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3
+# Parent  f1c730da41f3b22ca1a1e1b14592da4b7c078797
+scripts, cc/gcc: do not fail on existing symlinks or build.log
+
+If the user builds a toolchain over an existing one, so, without removing
+CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
+build.log.
+
+This can also happen (for build.log) if the user first ran in download-
+or extract-only.
+
+Patch (with no SoB) originally from:
+  Phil Wilshire <phil.wilshire@overturenetworks.com>
+
+Modified by me as it did not apply cleanly.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+
+diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/cc/gcc.sh
+--- a/scripts/build/cc/gcc.sh	Tue Jul 12 23:21:27 2011 +0200
++++ b/scripts/build/cc/gcc.sh	Tue Jul 12 23:52:24 2011 +0200
+@@ -386,7 +386,7 @@
+     # check whether compiler has an extension
+     file="$( ls -1 "${core_prefix_dir}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
+     [ -z "${file}" ] || ext=".${file##*.}"
+-    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
++    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
+ 
+     CT_EndStep
+ }
+@@ -630,7 +630,7 @@
+     # check whether compiler has an extension
+     file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
+     [ -z "${file}" ] || ext=".${file##*.}"
+-    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
++    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
+ 
+     CT_EndStep
+ }
+diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/internals.sh
+--- a/scripts/build/internals.sh	Tue Jul 12 23:21:27 2011 +0200
++++ b/scripts/build/internals.sh	Tue Jul 12 23:52:24 2011 +0200
+@@ -86,14 +86,14 @@
+     for t in "${CT_TARGET}-"*; do
+         if [ -n "${CT_TARGET_ALIAS}" ]; then
+             _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
+-            CT_DoExecLog ALL ln -sv "${t}" "${_t}"
++            CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
+         fi
+         if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
+             _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
+             if [ "${_t}" = "${t}" ]; then
+                 CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
+             else
+-                CT_DoExecLog ALL ln -sv "${t}" "${_t}"
++                CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
+             fi
+         fi
+     done
+diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/crosstool-NG.sh.in
+--- a/scripts/crosstool-NG.sh.in	Tue Jul 12 23:21:27 2011 +0200
++++ b/scripts/crosstool-NG.sh.in	Tue Jul 12 23:52:24 2011 +0200
+@@ -604,7 +604,7 @@
+ # moment... Consign all ouptut to oblivion...
+ CT_DoLog INFO "Finishing installation (may take a few seconds)..."
+ exec >/dev/null 2>&1
+-
++rm -f ${CT_PREFIX_DIR}/build.log.bz2
+ if [ "${CT_LOG_TO_FILE}" = "y" ]; then
+     cp "${tmp_log_file}" "${CT_PREFIX_DIR}/build.log"
+     if [ "${CT_LOG_FILE_COMPRESS}" = y ]; then
+
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 2d1b51c685..d3fcc65ff9 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -5,11 +5,6 @@
 # crosstool-NG as a backend is but a kind of external toolchains,
 # except that it is not pre-built.
 
-#-----------------------------------------------------------------------------
-# 'uclibc' is the target to depend on to get the toolchain and prepare
-# the staging directory and co.
-uclibc: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
-
 #-----------------------------------------------------------------------------
 # Internal variables
 
@@ -32,6 +27,18 @@ define ctng
 PATH=$(HOST_PATH) $(CTNG_DIR)/ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
 endef
 
+#-----------------------------------------------------------------------------
+# 'uclibc' is the target to depend on to get the toolchain and prepare
+# the staging directory and co.
+uclibc: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
+
+# 'uclibc-source' is the target used by the infra structure to mean
+# "we just want to download the toolchain's sources, not build it"
+# For crosstool-NG, we need it to be configured before we can download;
+# then we have to override a config option to just do the download
+uclibc-source: $(CTNG_DIR)/.config
+	$(Q)$(call ctng,build CT_ONLY_DOWNLOAD=y)
+
 #-----------------------------------------------------------------------------
 # Installing the libs to target/ and staging/
 

From b51b664727458235460ed3c5429b8d44215b9446 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 13 Jul 2011 08:49:52 +0200
Subject: [PATCH 0410/6849] toolchain-external: download/show external
 toolchain with make source/external-deps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on patch by Hervé Fache <h-fache@ti.com>.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index db9365b1ad..fd9a53057e 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -50,8 +50,6 @@
 #  $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest
 #  of Buildroot is handled identical for the 2 toolchain types.
 
-uclibc: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
-
 LIB_EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
 LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so
@@ -197,6 +195,7 @@ TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8386/
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2010R1-RC4.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else
 # A value must be set (even if unused), otherwise the
 # $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main
@@ -320,3 +319,11 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
 	done ;
 	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s \
 		toolchain/toolchain-external/ext-toolchain-wrapper.c -o $@
+
+# 'uclibc' is the target to provide toolchain / staging dir
+uclibc: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
+
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
+# download ext toolchain if so configured
+uclibc-source: $(addprefix $(DL_DIR)/,$(TOOLCHAIN_EXTERNAL_SOURCE))
+endif

From b28de60c24ad4bef4ff7a6ad51cbb6e79906c868 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 13 Jul 2011 12:44:42 +0200
Subject: [PATCH 0411/6849] package: add libroxml

Closes #3595

Based on patch by Tristan Lelong <tristan.lelong@blunderer.org>.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                       |  1 +
 package/Config.in                             |  1 +
 package/libroxml/Config.in                    |  8 +++++
 .../libroxml/libroxml-2.0.3-fix-install.patch | 25 ++++++++++++++
 package/libroxml/libroxml.mk                  | 33 +++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 package/libroxml/Config.in
 create mode 100644 package/libroxml/libroxml-2.0.3-fix-install.patch
 create mode 100644 package/libroxml/libroxml.mk

diff --git a/CHANGES b/CHANGES
index 4c29ffe3f6..0b3e28aa43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#3559: libnspr: Add new package
+	#3595: patch to add libroxml
 	#3565: libnss: Add new package
 	#3907: 2011.05 - Qt 4.7.3 not building on ARM
 
diff --git a/package/Config.in b/package/Config.in
index 55ea34300d..d073a1b67d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -363,6 +363,7 @@ endmenu
 menu "JSON/XML"
 source "package/expat/Config.in"
 source "package/ezxml/Config.in"
+source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
diff --git a/package/libroxml/Config.in b/package/libroxml/Config.in
new file mode 100644
index 0000000000..e26d239f89
--- /dev/null
+++ b/package/libroxml/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBROXML
+	bool "roxml"
+	help
+	  libroxml is a light and powerful xml parsing library with
+	  xpath handling. Roxml is a binary using libroxml to explore
+	  xml file from shell scripts.
+
+	  http://libroxml.googlecode.com
diff --git a/package/libroxml/libroxml-2.0.3-fix-install.patch b/package/libroxml/libroxml-2.0.3-fix-install.patch
new file mode 100644
index 0000000000..fe3cfad8f4
--- /dev/null
+++ b/package/libroxml/libroxml-2.0.3-fix-install.patch
@@ -0,0 +1,25 @@
+[PATCH] fix make install if doxygen isn't available
+
+If doxygen isn't available, then man pages / html docs won't get created,
+so don't try to install them.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: libroxml-2.0.3/Makefile
+===================================================================
+--- libroxml-2.0.3.orig/Makefile
++++ libroxml-2.0.3/Makefile
+@@ -153,8 +153,8 @@
+ 	$E install -D $(INC) $(DESTDIR)/usr/include
+ 	$E install -D LGPL.txt $(DESTDIR)/usr/share/doc/libroxml/
+ 	$E install -D docs/roxml.1 $(DESTDIR)/usr/share/man/man1/
+-	$E install -D docs/man/man3/* $(DESTDIR)/usr/share/man/man3/
+-	$E install -D docs/html/* $(DESTDIR)/usr/share/doc/libroxml/html/
++	$E [ ! -d docs/man/man3 ] || install -D docs/man/man3/* $(DESTDIR)/usr/share/man/man3/
++	$E [ ! -d docs/html ] || install -D docs/html/* $(DESTDIR)/usr/share/doc/libroxml/html/
+ 	$E install -m644 libroxml.pc $(DESTDIR)/usr/lib/pkgconfig
+ 	$E cp -d $(TARGET_LN) $(DESTDIR)/usr/lib
+ 
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
new file mode 100644
index 0000000000..bf067dfd7d
--- /dev/null
+++ b/package/libroxml/libroxml.mk
@@ -0,0 +1,33 @@
+#
+# libroxml
+#
+
+LIBROXML_VERSION = 2.0.3
+LIBROXML_SITE = http://libroxml.googlecode.com/files
+LIBROXML_INSTALL_STAGING = YES
+
+define LIBROXML_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) OPTIM= -C $(@D) V=1 all
+endef
+
+define LIBROXML_INSTALL_STAGING_CMDS
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install
+endef
+
+define LIBROXML_INSTALL_TARGET_CMDS
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+define LIBROXML_UNINSTALL_STAGING_CMDS
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) uninstall
+endef
+
+define LIBROXML_UNINSTALL_TARGET_CMDS
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+endef
+
+define LIBROXML_CLEAN_CMDS
+	-$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,libroxml))

From 691a5ead68deb5c77442f7a88ede479e57a9758c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 13 Jul 2011 11:12:29 +0200
Subject: [PATCH 0412/6849] New package: attr

Commands for Manipulating Filesystem Extended Attributes.

[Peter: needs largefile]
Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/attr/Config.in | 11 +++++++++++
 package/attr/attr.mk   | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/attr/Config.in
 create mode 100644 package/attr/attr.mk

diff --git a/package/Config.in b/package/Config.in
index d073a1b67d..069d8bb0b1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -495,6 +495,7 @@ source "package/xmlstarlet/Config.in"
 endmenu
 
 menu "System tools"
+source "package/attr/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
diff --git a/package/attr/Config.in b/package/attr/Config.in
new file mode 100644
index 0000000000..79f2336807
--- /dev/null
+++ b/package/attr/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_ATTR
+	bool "attr"
+	depends on BR2_LARGEFILE
+	help
+	  Commands for Manipulating Filesystem Extended Attributes.
+	  This package also provides libattr.
+
+	  http://savannah.nongnu.org/projects/attr
+
+comment "attr requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
new file mode 100644
index 0000000000..b744ef6d1b
--- /dev/null
+++ b/package/attr/attr.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# attr
+#
+#############################################################
+
+ATTR_VERSION = 2.4.46
+ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
+ATTR_SITE = http://download.savannah.gnu.org/releases/attr
+ATTR_INSTALL_STAGING = YES
+ATTR_CONF_OPT = --enable-gettext=no
+
+# While the configuration system uses autoconf, the Makefiles are
+# hand-written and do not use automake. Therefore, we have to hack
+# around their deficiencies by passing installation paths.
+ATTR_INSTALL_STAGING_OPT = 			\
+	prefix=$(STAGING_DIR)/usr 		\
+	exec_prefix=$(STAGING_DIR)/usr 		\
+	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib 	\
+	install-dev install-lib
+
+ATTR_INSTALL_TARGET_OPT = 			\
+	prefix=$(TARGET_DIR)/usr 		\
+	exec_prefix=$(TARGET_DIR)/usr 		\
+	install install-lib
+
+$(eval $(call AUTOTARGETS,package,attr))

From 41d2a1477233231ae0445d5ac07320290b686b4e Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 13 Jul 2011 11:13:59 +0200
Subject: [PATCH 0413/6849] New package: acl

POSIX Access Control Lists, which are used to define more
fine-grained discretionary access rights for files and
directories.

[Peter: needs largefile]
Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |  1 +
 package/acl/Config.in | 14 ++++++++++++++
 package/acl/acl.mk    | 28 ++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/acl/Config.in
 create mode 100644 package/acl/acl.mk

diff --git a/package/Config.in b/package/Config.in
index 069d8bb0b1..2fa9ff5ae5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -495,6 +495,7 @@ source "package/xmlstarlet/Config.in"
 endmenu
 
 menu "System tools"
+source "package/acl/Config.in"
 source "package/attr/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
diff --git a/package/acl/Config.in b/package/acl/Config.in
new file mode 100644
index 0000000000..f3d10d5a2f
--- /dev/null
+++ b/package/acl/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_ACL
+	bool "acl"
+	select BR2_PACKAGE_ATTR
+	depends on BR2_LARGEFILE
+	help
+	  POSIX Access Control Lists, which are used to define more
+	  fine-grained discretionary access rights for files and
+	  directories.
+	  This package also provides libacl.
+
+	  http://savannah.nongnu.org/projects/acl
+
+comment "acl requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
new file mode 100644
index 0000000000..11768f617d
--- /dev/null
+++ b/package/acl/acl.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# acl
+#
+#############################################################
+
+ACL_VERSION = 2.2.51
+ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz
+ACL_SITE = http://download.savannah.gnu.org/releases/acl
+ACL_INSTALL_STAGING = YES
+ACL_DEPENDENCIES = attr
+ACL_CONF_OPT = --enable-gettext=no
+
+# While the configuration system uses autoconf, the Makefiles are
+# hand-written and do not use automake. Therefore, we have to hack
+# around their deficiencies by passing installation paths.
+ACL_INSTALL_STAGING_OPT = 			\
+	prefix=$(STAGING_DIR)/usr 		\
+	exec_prefix=$(STAGING_DIR)/usr 		\
+	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib	\
+	install-dev install-lib
+
+ACL_INSTALL_TARGET_OPT = 			\
+	prefix=$(TARGET_DIR)/usr 		\
+	exec_prefix=$(TARGET_DIR)/usr 		\
+	install install-lib
+
+$(eval $(call AUTOTARGETS,package,acl))

From 9eb41624ffdff466087749b64a57c5673cd2d2e7 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 13 Jul 2011 17:34:19 +0300
Subject: [PATCH 0414/6849] package: add Mini-XML

[Peter: don't build mxmldoc as it needs spawn.h]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/mxml/Config.in                        |  6 +++
 ...ml-2.6-fix-cross-target-installation.patch | 53 +++++++++++++++++++
 package/mxml/mxml.mk                          | 15 ++++++
 4 files changed, 75 insertions(+)
 create mode 100644 package/mxml/Config.in
 create mode 100644 package/mxml/mxml-2.6-fix-cross-target-installation.patch
 create mode 100644 package/mxml/mxml.mk

diff --git a/package/Config.in b/package/Config.in
index 2fa9ff5ae5..fb5a570c16 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -367,6 +367,7 @@ source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
+source "package/mxml/Config.in"
 source "package/xerces/Config.in"
 source "package/yajl/Config.in"
 endmenu
diff --git a/package/mxml/Config.in b/package/mxml/Config.in
new file mode 100644
index 0000000000..d3202b4bc9
--- /dev/null
+++ b/package/mxml/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MXML
+	bool "Mini-XML"
+	help
+	  Lightweight XML Library
+
+	  http://www.minixml.org
diff --git a/package/mxml/mxml-2.6-fix-cross-target-installation.patch b/package/mxml/mxml-2.6-fix-cross-target-installation.patch
new file mode 100644
index 0000000000..62b6bbc8d9
--- /dev/null
+++ b/package/mxml/mxml-2.6-fix-cross-target-installation.patch
@@ -0,0 +1,53 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Subject: [PATCH] mxml: workaround for cross build
+
+The added patch is a workaround for cross build as follows:
+
+	* disable run of a test binary at build time
+	* disable generation of documentation using the mxmldoc binary
+	* remove now non-existent entries from the install target
+	* disable strip when running install
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
+--- mxml-2.6-dist//Makefile.in	2008-12-06 06:20:38.000000000 +0200
++++ mxml-2.6/Makefile.in	2011-07-13 07:25:36.615999491 +0300
+@@ -59,7 +59,7 @@
+ # Install commands...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
+ INSTALL_DATA	=	$(INSTALL) -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+ INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
+@@ -88,7 +88,7 @@
+ 			mxml-node.o mxml-search.o mxml-set.o
+ LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
+ OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
+-TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
++TARGETS		=	$(LIBMXML) libmxml.a
+ 
+ 
+ #
+@@ -134,8 +134,6 @@
+ #
+ 
+ install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
+-	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
+-	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
+ 	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
+ 	for file in $(DOCFILES); do \
+ 		$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
+@@ -144,10 +142,6 @@
+ 	$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
+ 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
+ 	$(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
+-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
+-	$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
+-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
+-	$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
+ 
+ install-libmxml.a:
+ 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
new file mode 100644
index 0000000000..e45abe920b
--- /dev/null
+++ b/package/mxml/mxml.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# mxml
+#
+#############################################################
+MXML_VERSION = 2.6
+MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6
+MXML_INSTALL_STAGING = YES
+
+MXML_INSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) uninstall
+MXML_UNINSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) uninstall
+
+$(eval $(call AUTOTARGETS,package,mxml))

From 333acf358b8b0b9f3d53c07e952be9a1c6f9bf03 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 13 Jul 2011 22:43:12 +0200
Subject: [PATCH 0415/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0b3e28aa43..06a7e53cd9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,13 +6,23 @@
 	ext-toolchain-wrapper improvements, improved non-MMU
 	support. GCC 4.3.6 / 4.6.1.
 
-	Updated/fixed packages: berkeleydb, bmon, busybox, dbus,
-	dbus-glib, ethtool, ffmpeg, gst-plugins-bad, gst-plugins-base,
-	lame, libarchive, libdnet, libgtk2, libmpeg2, lighttpd,
-	mtd-utils, oprofile, qt, ruby, sudo, sqlite, synergy,
-	usbutils, webkit
-
-	New packages: libiqrf, libnspr, libnss, live555, rsyslog,
+	GENTARGETS infrastructure extended to cover bootloaders and
+	Linux kernel as well. Options to retrive Linux/U-Boot from a
+	custom git repo instead of upstream tarballs.
+	Support for Linux 3.x and release candiate tarballs.
+	X-Loader bootloader for omap added.
+
+	Make source/external-deps now also works for external
+	toolchains / crosstool-ng backend.
+
+	Updated/fixed packages: berkeleydb, bmon, bridge-utils,
+	busybox, dbus, dbus-glib, ethtool, ffmpeg, gst-plugins-bad,
+	gst-plugins-base, lame, libarchive, libdnet, libgcrypt,
+	libgtk2, libmpeg2, lighttpd, mtd-utils, oprofile, qt, ruby,
+	sudo, sqlite, synergy, usbutils, valgrind, webkit
+
+	New packages: acl, attr, ebtables, gnutls, libargtable2,
+	libiqrf, libnspr, libnss, libroxml, live555, mxml, rsyslog,
 	sredird, statserial, stunnel, yajl
 
 	Issues resolved (http://bugs.uclibc.org):

From 33cddbb86706dd8d5efa7dda3a68e9af9318412a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 09:08:30 +0200
Subject: [PATCH 0416/6849] libpng: bump version

Security fix.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpng/libpng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 657ba45f8e..c4c37d8528 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,7 +3,7 @@
 # libpng (Portable Network Graphic library)
 #
 #############################################################
-LIBPNG_VERSION = 1.4.7
+LIBPNG_VERSION = 1.4.8
 LIBPNG_SERIES = 14
 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2

From 749213ffdf921f88d74cd7d587854dfe46b0405e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 09:10:25 +0200
Subject: [PATCH 0417/6849] xz: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xz/xz.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 1d8c7ee6ed..ed4734b964 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -3,7 +3,7 @@
 # xz-utils
 #
 #############################################################
-XZ_VERSION = 5.0.1
+XZ_VERSION = 5.0.3
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES

From d10125af7fa172d0bc5682d98b1aff627c6fd101 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 09:33:44 +0200
Subject: [PATCH 0418/6849] lzo: bump version

This contains an updated build system, so the patches are no longer needed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzo/lzo-2.03-acinclude-m4.patch     | 377 --------------------
 package/lzo/lzo-2.03-fix-configure-ac.patch |  21 --
 package/lzo/lzo-2.03-fix-makefile-am.patch  |  24 --
 package/lzo/lzo.mk                          |  14 +-
 4 files changed, 2 insertions(+), 434 deletions(-)
 delete mode 100644 package/lzo/lzo-2.03-acinclude-m4.patch
 delete mode 100644 package/lzo/lzo-2.03-fix-configure-ac.patch
 delete mode 100644 package/lzo/lzo-2.03-fix-makefile-am.patch

diff --git a/package/lzo/lzo-2.03-acinclude-m4.patch b/package/lzo/lzo-2.03-acinclude-m4.patch
deleted file mode 100644
index 8f860f4cc0..0000000000
--- a/package/lzo/lzo-2.03-acinclude-m4.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-The lzo tarball only contains an aclocal.m4, which is the result from
-running aclocal. Unfortunately, it lacks the acinclude.m4 file which
-would allow us to do an autoreconf of the package. Therefore, this
-patch extracts from aclocal.m4 the parts that are specific to this lzo
-package, and put them into an acinclude.m4 so that autoreconf on this
-package will work.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- acinclude.m4 |  360 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 360 insertions(+)
-
-Index: lzo-2.03/acinclude.m4
-===================================================================
---- /dev/null
-+++ lzo-2.03/acinclude.m4
-@@ -0,0 +1,360 @@
-+# /***********************************************************************
-+# // standard ACC macros
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
-+AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
-+])#
-+
-+AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
-+AC_HEADER_TIME
-+AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h])
-+])#
-+
-+AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
-+AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown clock_getcpuclockid clock_getres clock_gettime ctime difftime fstat getenv getpagesize getrusage gettimeofday gmtime isatty localtime longjmp lstat memcmp memcpy memmove memset mkdir mktime mmap mprotect munmap qsort raise rmdir setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
-+])#
-+
-+
-+AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
-+AC_CHECK_SIZEOF(short)
-+AC_CHECK_SIZEOF(int)
-+AC_CHECK_SIZEOF(long)
-+
-+AC_CHECK_SIZEOF(long long)
-+AC_CHECK_SIZEOF(__int16)
-+AC_CHECK_SIZEOF(__int32)
-+AC_CHECK_SIZEOF(__int64)
-+
-+AC_CHECK_SIZEOF(void *)
-+AC_CHECK_SIZEOF(size_t)
-+AC_CHECK_SIZEOF(ptrdiff_t)
-+])#
-+
-+
-+# /***********************************************************************
-+# // Check for ACC_conformance
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_ACC_ACCCHK], [
-+mfx_tmp=$1
-+mfx_save_CPPFLAGS=$CPPFLAGS
-+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
-+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
-+
-+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
-+
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-+[[#define ACC_CONFIG_NO_HEADER 1
-+#include "acc/acc.h"
-+#include "acc/acc_incd.h"
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-+#include "acc/acc_chk.ch"
-+#undef ACCCHK_ASSERT
-+static void test_acc_compile_time_assert(void) {
-+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
-+#include "acc/acc_chk.ch"
-+#undef ACCCHK_ASSERT
-+}
-+#undef NDEBUG
-+#include <assert.h>
-+static int test_acc_run_time_assert(int r) {
-+#define ACCCHK_ASSERT(expr)     assert(expr);
-+#include "acc/acc_chk.ch"
-+#undef ACCCHK_ASSERT
-+return r;
-+}
-+]], [[
-+test_acc_compile_time_assert();
-+if (test_acc_run_time_assert(1) != 1) return 1;
-+]]
-+)])
-+
-+mfx_tmp=FAILED
-+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+
-+CPPFLAGS=$mfx_save_CPPFLAGS
-+
-+AC_MSG_RESULT([$mfx_tmp])
-+case x$mfx_tmp in
-+  xpassed | xyes) ;;
-+  *)
-+    AC_MSG_NOTICE([])
-+    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
-+    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
-+    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
-+    AC_MSG_NOTICE([Thanks for your support.])
-+    AC_MSG_NOTICE([])
-+    AC_MSG_ERROR([ACC conformance test failed. Stop.])
-+dnl    AS_EXIT
-+    ;;
-+esac
-+])# mfx_ACC_ACCCHK
-+
-+
-+# /***********************************************************************
-+# // Check for ACC_conformance
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_MINIACC_ACCCHK], [
-+mfx_tmp=$1
-+mfx_save_CPPFLAGS=$CPPFLAGS
-+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
-+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
-+
-+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
-+
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-+[[#define ACC_CONFIG_NO_HEADER 1
-+#define ACC_WANT_ACC_INCD_H 1
-+#include $2
-+
-+#define ACC_WANT_ACC_CHK_CH 1
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-+#include $2
-+
-+#define ACC_WANT_ACC_CHK_CH 1
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
-+static void test_acc_compile_time_assert(void) {
-+#include $2
-+}
-+
-+#undef NDEBUG
-+#include <assert.h>
-+#define ACC_WANT_ACC_CHK_CH 1
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr)  assert(expr);
-+static int test_acc_run_time_assert(int r) {
-+#include $2
-+return r;
-+}
-+]], [[
-+test_acc_compile_time_assert();
-+if (test_acc_run_time_assert(1) != 1) return 1;
-+]]
-+)])
-+
-+mfx_tmp=FAILED
-+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+
-+CPPFLAGS=$mfx_save_CPPFLAGS
-+
-+AC_MSG_RESULT([$mfx_tmp])
-+case x$mfx_tmp in
-+  xpassed | xyes) ;;
-+  *)
-+    AC_MSG_NOTICE([])
-+    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
-+    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
-+    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
-+    AC_MSG_NOTICE([Thanks for your support.])
-+    AC_MSG_NOTICE([])
-+    AC_MSG_ERROR([ACC conformance test failed. Stop.])
-+dnl    AS_EXIT
-+    ;;
-+esac
-+])# mfx_MINIACC_ACCCHK
-+
-+
-+
-+# serial 1
-+
-+AC_DEFUN([mfx_PROG_CPPFLAGS], [
-+AC_MSG_CHECKING([whether the C preprocessor needs special flags])
-+
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-+[[#include <limits.h>
-+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
-+#  include "your C preprocessor is broken 1"
-+#elif (0xffffu == 0xfffffffful)
-+#  include "your C preprocessor is broken 2"
-+#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX)
-+#  include "your C preprocessor is broken 3"
-+#endif
-+]], [[ ]]
-+)])
-+
-+mfx_save_CPPFLAGS=$CPPFLAGS
-+mfx_tmp=ERROR
-+for mfx_arg in "" -no-cpp-precomp
-+do
-+  CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS"
-+  _AC_COMPILE_IFELSE([],
-+[mfx_tmp=$mfx_arg
-+break])
-+done
-+CPPFLAGS=$mfx_save_CPPFLAGS
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+case x$mfx_tmp in
-+  x)
-+    AC_MSG_RESULT([none needed]) ;;
-+  xERROR)
-+    AC_MSG_RESULT([ERROR])
-+    AC_MSG_ERROR([your C preprocessor is broken - for details see config.log])
-+    ;;
-+  *)
-+    AC_MSG_RESULT([$mfx_tmp])
-+    CPPFLAGS="$mfx_tmp $CPPFLAGS"
-+    ;;
-+esac
-+])# mfx_PROG_CPPFLAGS
-+
-+# serial 3
-+
-+AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [
-+AC_CACHE_CHECK([whether limits.h is sane],
-+mfx_cv_header_sane_limits_h,
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <limits.h>
-+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
-+#  if defined(__APPLE__) && defined(__GNUC__)
-+#    error "your preprocessor is broken - use compiler option -no-cpp-precomp"
-+#  else
-+#    include "your preprocessor is broken"
-+#  endif
-+#endif
-+#define MFX_0xffff          0xffff
-+#define MFX_0xffffffffL     4294967295ul
-+#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
-+#  include "error CHAR_BIT"
-+#endif
-+#if !defined(UCHAR_MAX)
-+#  include "error UCHAR_MAX 1"
-+#endif
-+#if !defined(USHRT_MAX)
-+#  include "error USHRT_MAX 1"
-+#endif
-+#if !defined(UINT_MAX)
-+#  include "error UINT_MAX 1"
-+#endif
-+#if !defined(ULONG_MAX)
-+#  include "error ULONG_MAX 1"
-+#endif
-+#if !defined(SHRT_MAX)
-+#  include "error SHRT_MAX 1"
-+#endif
-+#if !defined(INT_MAX)
-+#  include "error INT_MAX 1"
-+#endif
-+#if !defined(LONG_MAX)
-+#  include "error LONG_MAX 1"
-+#endif
-+#if (UCHAR_MAX < 1)
-+#  include "error UCHAR_MAX 2"
-+#endif
-+#if (USHRT_MAX < 1)
-+#  include "error USHRT_MAX 2"
-+#endif
-+#if (UINT_MAX < 1)
-+#  include "error UINT_MAX 2"
-+#endif
-+#if (ULONG_MAX < 1)
-+#  include "error ULONG_MAX 2"
-+#endif
-+#if (UCHAR_MAX < 0xff)
-+#  include "error UCHAR_MAX 3"
-+#endif
-+#if (USHRT_MAX < MFX_0xffff)
-+#  include "error USHRT_MAX 3"
-+#endif
-+#if (UINT_MAX < MFX_0xffff)
-+#  include "error UINT_MAX 3"
-+#endif
-+#if (ULONG_MAX < MFX_0xffffffffL)
-+#  include "error ULONG_MAX 3"
-+#endif
-+#if (USHRT_MAX > UINT_MAX)
-+#  include "error USHRT_MAX vs UINT_MAX"
-+#endif
-+#if (UINT_MAX > ULONG_MAX)
-+#  include "error UINT_MAX vs ULONG_MAX"
-+#endif
-+]], [[
-+#if (USHRT_MAX == MFX_0xffff)
-+{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; }
-+#elif (USHRT_MAX >= MFX_0xffff)
-+{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; }
-+#endif
-+#if (UINT_MAX == MFX_0xffff)
-+{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; }
-+#elif (UINT_MAX >= MFX_0xffff)
-+{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; }
-+#endif
-+#if (ULONG_MAX == MFX_0xffff)
-+{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; }
-+#elif (ULONG_MAX >= MFX_0xffff)
-+{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; }
-+#endif
-+#if !defined(_CRAY1) /* CRAY PVP systems */
-+#if (USHRT_MAX == MFX_0xffffffffL)
-+{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; }
-+#elif (USHRT_MAX >= MFX_0xffffffffL)
-+{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; }
-+#endif
-+#endif /* _CRAY1 */
-+#if (UINT_MAX == MFX_0xffffffffL)
-+{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; }
-+#elif (UINT_MAX >= MFX_0xffffffffL)
-+{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; }
-+#endif
-+#if (ULONG_MAX == MFX_0xffffffffL)
-+{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; }
-+#elif (ULONG_MAX >= MFX_0xffffffffL)
-+{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; }
-+#endif
-+]])],
-+[mfx_cv_header_sane_limits_h=yes],
-+[mfx_cv_header_sane_limits_h=no])])
-+])
-+
-+# /***********************************************************************
-+# // standard
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [
-+AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
-+])#
-+
-+
-+# /***********************************************************************
-+# //
-+# ************************************************************************/
-+
-+dnl more types which are not yet covered by ACC
-+
-+AC_DEFUN([mfx_CHECK_SIZEOF], [
-+AC_CHECK_SIZEOF(__int32)
-+AC_CHECK_SIZEOF(intmax_t)
-+AC_CHECK_SIZEOF(uintmax_t)
-+AC_CHECK_SIZEOF(intptr_t)
-+AC_CHECK_SIZEOF(uintptr_t)
-+
-+AC_CHECK_SIZEOF(float)
-+AC_CHECK_SIZEOF(double)
-+AC_CHECK_SIZEOF(long double)
-+
-+AC_CHECK_SIZEOF(dev_t)
-+AC_CHECK_SIZEOF(fpos_t)
-+AC_CHECK_SIZEOF(mode_t)
-+AC_CHECK_SIZEOF(off_t)
-+AC_CHECK_SIZEOF(ssize_t)
-+AC_CHECK_SIZEOF(time_t)
-+])#
-+
-+
-+
-+AC_DEFUN([mfx_CHECK_LIB_WINMM], [
-+if test "X$GCC" = Xyes; then
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+     test "X$LIBS" != "X" && LIBS="$LIBS "
-+     LIBS="${LIBS}-lwinmm" ;;
-+*)
-+     ;;
-+esac
-+fi
-+])#
diff --git a/package/lzo/lzo-2.03-fix-configure-ac.patch b/package/lzo/lzo-2.03-fix-configure-ac.patch
deleted file mode 100644
index 26aece7b43..0000000000
--- a/package/lzo/lzo-2.03-fix-configure-ac.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-_AC_SRCPATHS doesn't exist in autoconf, _AC_SRCDIRS should be used
-instead according to many reports found by Google.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: lzo-2.03/configure.ac
-===================================================================
---- lzo-2.03.orig/configure.ac
-+++ lzo-2.03/configure.ac
-@@ -48,7 +48,7 @@
- AM_MAINTAINER_MODE
- 
- if test -z "$ac_abs_top_srcdir"; then
--    _AC_SRCPATHS(.)
-+    _AC_SRCDIRS(.)
- fi
- if test -r .Conf.settings1; then
-     . ./.Conf.settings1
diff --git a/package/lzo/lzo-2.03-fix-makefile-am.patch b/package/lzo/lzo-2.03-fix-makefile-am.patch
deleted file mode 100644
index 9f23e40db1..0000000000
--- a/package/lzo/lzo-2.03-fix-makefile-am.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile.am is not allowed to override CFLAGS/CPPFLAGS, it must use
-AM_CFLAGS and AM_CPPFLAGS. This is needed in order for autoreconf to
-work on this package.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/Makefile.am |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: lzo-2.03/src/Makefile.am
-===================================================================
---- lzo-2.03.orig/src/Makefile.am
-+++ lzo-2.03/src/Makefile.am
-@@ -7,8 +7,8 @@
- SUFFIXES = .S
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
--CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
--CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
-+AM_CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
-+AM_CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
- 
- lib_LTLIBRARIES = liblzo2.la
- 
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index bfa66792db..d4195f6c4e 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -3,19 +3,9 @@
 # lzo
 #
 #############################################################
-LZO_VERSION:=2.03
-LZO_SOURCE:=lzo-$(LZO_VERSION).tar.gz
-LZO_SITE:=http://www.oberhumer.com/opensource/lzo/download
-LZO_AUTORECONF = NO
-
-# lzo's configure was generated by an old autoconf, and the
-# AC_CANONICAL_TARGET check fails in host-lzo when the cache has been
-# filled with ac_cv_build and ac_cv_host.
-HOST_LZO_AUTORECONF = YES
-
+LZO_VERSION = 2.05
+LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
 LZO_INSTALL_STAGING = YES
-LZO_INSTALL_TARGET = YES
-LZO_INSTALL_STAGING_OPT = CC="$(TARGET_CC)" DESTDIR=$(STAGING_DIR) install
 
 $(eval $(call AUTOTARGETS,package,lzo))
 $(eval $(call AUTOTARGETS,package,lzo,host))

From c1e0bc5275328f22d3e18d8658c882152d7994c6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 09:35:52 +0200
Subject: [PATCH 0419/6849] jpeg: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jpeg/jpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 8919a3a09d..30a6225bde 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -3,7 +3,7 @@
 # jpeg (libraries needed by some apps)
 #
 #############################################################
-JPEG_VERSION = 8b
+JPEG_VERSION = 8c
 JPEG_SITE = http://www.ijg.org/files/
 JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES

From 908c5610cc2e74340b6e589e4331cee780dea05e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 13:41:29 +0200
Subject: [PATCH 0420/6849] uboot: unbreak kirkwood format handling after
 a4ca959321

Commit a4ca959321 (u-boot: rename to uboot) forgot to change the kirkwood
format handling to look for the new variable name, breaking support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/uboot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index ec592e13e4..0610e4c9dc 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -24,7 +24,7 @@ endif
 
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
 UBOOT_BIN          = u-boot.kwb
-UBOOT_MAKE_TARGET  = $(U_BOOT_BIN)
+UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
 else

From e48d8ba57d59d4400251a526ee9c03fa0b07c36f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 13:43:37 +0200
Subject: [PATCH 0421/6849] sheevaplug_defconfig: use 2.6.39.3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/sheevaplug_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 305aadd5af..3ba568ea59 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -19,6 +19,6 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3"
 BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
 BR2_LINUX_KERNEL_UIMAGE=y

From ea7f5ff97617e6d84017df63a8599b17d10ca57c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 14 Jul 2011 16:38:07 +0200
Subject: [PATCH 0422/6849] linux: fix build with release candidates

Fixes *** Recursive variable `LINUX_SITE' references itself

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 06792382a9..bdd8bb3e44 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -23,7 +23,7 @@ LINUX_VERSION_MINOR = $(word 2,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
 LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
 # release candidates are in testing/ subdir
 ifneq ($(findstring -rc,$(LINUX_VERSION)),)
-LINUX_SITE = $(LINUX_SITE)testing/
+LINUX_SITE := $(LINUX_SITE)testing/
 endif # -rc
 endif
 

From 8e3bf78a85bc434b92558f1929728ce8e0bbf4f9 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 22:00:06 +0200
Subject: [PATCH 0423/6849] linux-fusion: change linux26 dependency to linux

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-fusion/linux-fusion.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 440b8b9aa2..392ffd6268 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -7,7 +7,7 @@ LINUX_FUSION_VERSION = 8.1.2
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES
-LINUX_FUSION_DEPENDENCIES = linux26
+LINUX_FUSION_DEPENDENCIES = linux
 
 LINUX_FOR_FUSION=$(LINUX26_VERSION_PROBED)
 LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d

From ca0c065cb7f50f7dfbb3f5c02361f5166d4101ee Mon Sep 17 00:00:00 2001
From: Evgeni Dobrev <evgeni_dobrev@developer.bg>
Date: Thu, 14 Jul 2011 22:27:51 +0200
Subject: [PATCH 0424/6849] package: add libyaml

YAML 1.1 parser and emitter written in C

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libyaml/Config.in  |  6 ++++++
 package/libyaml/libyaml.mk | 12 ++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/libyaml/Config.in
 create mode 100644 package/libyaml/libyaml.mk

diff --git a/package/Config.in b/package/Config.in
index fb5a570c16..db730ece63 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -367,6 +367,7 @@ source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
+source "package/libyaml/Config.in"
 source "package/mxml/Config.in"
 source "package/xerces/Config.in"
 source "package/yajl/Config.in"
diff --git a/package/libyaml/Config.in b/package/libyaml/Config.in
new file mode 100644
index 0000000000..00a48b2016
--- /dev/null
+++ b/package/libyaml/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBYAML
+	bool "libyaml"
+	help
+	  LibYAML is a YAML 1.1 parser and emitter written in C.
+
+	  http://pyyaml.org/wiki/LibYAML
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
new file mode 100644
index 0000000000..563b1ba8a7
--- /dev/null
+++ b/package/libyaml/libyaml.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libyaml
+#
+#############################################################
+LIBYAML_VERSION = 0.1.4
+LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
+LIBYAML_SITE = http://pyyaml.org/download/libyaml/
+LIBYAML_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libyaml))
+

From 7c2974596971e20a7d8d606d88bfd1b682472edb Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 14 Jul 2011 13:02:33 +0200
Subject: [PATCH 0425/6849] Makefile: unbreak source-check

'source-check' breaks because the *_DEFCONFIG options are empty strings.
There is an explicit check to avoid erroring-out when doing 'source', but
not when doing 'source-check'.

This patch set DL_MODE right from the first sub-make call.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 2f3802c105..ffe634391f 100644
--- a/Makefile
+++ b/Makefile
@@ -488,9 +488,6 @@ endif
 
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)
 
-_source-check:
-	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source
-
 external-deps:
 	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u
 
@@ -595,7 +592,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 # check if download URLs are outdated
 source-check: allyesconfig
-	$(MAKE) $(EXTRAMAKEARGS) _source-check
+	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source
 
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 

From 8a08570c19269dfa138ed5138035c105327ee2f5 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 09:10:55 +0200
Subject: [PATCH 0426/6849] gnutls: update to version 2.10.3

There are newer releases available, but this is the last release that
uses libgcrypt. Newer versions prefer nettle over gcrypt. But then there
are users of gnutls (for example libsoup and glib-networking) that
assume that gnutls uses gcrypt as its crypto backend. They won't compile
with a version of gnutls that uses nettle.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 5f31e1e9dc..db5d583a3c 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 2.8.6
+GNUTLS_VERSION = 2.10.3
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = http://ftp.gnu.org/gnu/gnutls/
 GNUTLS_DEPENDENCIES = libgcrypt

From 6d5f6c2cfbc2f0b48704fe99a5b618a594033f80 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 22:01:14 +0200
Subject: [PATCH 0427/6849] dbus-glib: update to version 0.94

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus-glib/dbus-glib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index fac5f2b947..6058b234f2 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -3,7 +3,7 @@
 # dbus-glib
 #
 #############################################################
-DBUS_GLIB_VERSION = 0.92
+DBUS_GLIB_VERSION = 0.94
 DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib/
 DBUS_GLIB_INSTALL_STAGING = YES

From bef98b7c10a9969bc3f8b977dd9e0bdafba684a3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Fri, 15 Jul 2011 00:24:07 +0200
Subject: [PATCH 0428/6849] toolchain/crosstool-NG: use the package
 infrastructure

Move crosstool-NG to package/ and make it an autotarget package.
This requires a new patch (now upstream).

Now, the crosstool-NG toolchain backend only contains enough to build
the toolchain, there's no more reference to building crosstool-NG as
a package.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../crosstool-ng-001-no-cvs.patch             |  0
 ...k-on-existing-symlinks-and-build.log.patch |  0
 .../crosstool-ng-003-autostuf-compat.patch    | 10 ++++
 package/crosstool-ng/crosstool-ng.mk          |  9 +++
 .../toolchain-crosstool-ng/crosstool-ng.mk    | 57 ++++---------------
 5 files changed, 30 insertions(+), 46 deletions(-)
 rename toolchain/toolchain-crosstool-ng/001-no-cvs.patch => package/crosstool-ng/crosstool-ng-001-no-cvs.patch (100%)
 rename toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch => package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch (100%)
 create mode 100644 package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
 create mode 100644 package/crosstool-ng/crosstool-ng.mk

diff --git a/toolchain/toolchain-crosstool-ng/001-no-cvs.patch b/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
similarity index 100%
rename from toolchain/toolchain-crosstool-ng/001-no-cvs.patch
rename to package/crosstool-ng/crosstool-ng-001-no-cvs.patch
diff --git a/toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch b/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
similarity index 100%
rename from toolchain/toolchain-crosstool-ng/002-dont-break-on-existing-symlinks-and-build.log.patch
rename to package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
diff --git a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch b/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
new file mode 100644
index 0000000000..d79e62bace
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
@@ -0,0 +1,10 @@
+--- crosstool-ng-1.11.3/configure	2011-05-21 01:10:10.000000000 +0200
++++ host-crosstool-ng-1.11.3/configure	2011-07-14 17:35:25.830403914 +0200
+@@ -260,6 +260,7 @@
+         # Skip, auto-stuff compatibility
+         --build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
+         --build|--host|--infodir|--datadir|--sysconfdir|--localstatedir)             shift 2;;
++        --enable-shared|--disable-shared|--enable-static|--disable-static)           shift;;
+         *)          printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
+     esac
+ done
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
new file mode 100644
index 0000000000..b40cf353b9
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -0,0 +1,9 @@
+CROSSTOOL_NG_VERSION           = 1.11.3
+CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
+CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
+CROSSTOOL_NG_INSTALL_STAGING   = NO
+CROSSTOOL_NG_INSTALL_TARGET    = NO
+CROSSTOOL_NG_MAKE              = $(MAKE1)
+HOST_CROSSTOOL_NG_DEPENDENCIES = host-gawk host-automake $(if $(BR2_CCACHE),host-ccache)
+
+$(eval $(call AUTOTARGETS,package,crosstool-ng,host))
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index d3fcc65ff9..ec6e1889b0 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -8,15 +8,9 @@
 #-----------------------------------------------------------------------------
 # Internal variables
 
-# Crostool-NG hard-coded configuration options
-CTNG_VERSION:=1.11.3
-CTNG_SITE:=http://crosstool-ng.org/download/crosstool-ng/
-CTNG_SOURCE:=crosstool-ng-$(CTNG_VERSION).tar.bz2
-CTNG_DIR:=$(BUILD_DIR)/crosstool-ng-$(CTNG_VERSION)
-CTNG_CAT:=bzcat
-CTNG_PATCH_DIR:=toolchain/toolchain-crosstool-ng
-CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/toolchain-crosstool-ng/uClibc.config
+CTNG_DIR := $(BUILD_DIR)/build-toolchain
 
+CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/toolchain-crosstool-ng/uClibc.config
 CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 
 # Hack! ct-ng is in fact a Makefile script. As such, it accepts all
@@ -24,7 +18,7 @@ CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 # to calling ct-ng.
 # $1: the set of arguments to pass to ct-ng
 define ctng
-PATH=$(HOST_PATH) $(CTNG_DIR)/ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
+PATH=$(HOST_PATH) ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
 endef
 
 #-----------------------------------------------------------------------------
@@ -366,6 +360,11 @@ define ctng-oldconfig
 	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_DOT_CONFIG_PATHS_SED))
 endef
 
+# We need the host crosstool-NG before we can even begin working
+# on the toolchain. Using order-only dependency, as we do not want
+# to rebuild the toolchain for every run...
+$(CTNG_DIR)/.config: | host-crosstool-ng
+
 # Default configuration
 # Depends on top-level .config because it has options we have to shoe-horn
 # into crosstool-NG's .config
@@ -375,8 +374,10 @@ endef
 # are correctly set ( eg. if an option is new, then the initial sed
 # can't do anything about it ) Ideally, this should go in oldconfig
 # itself, but it's much easier to handle here.
-$(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(CTNG_DIR)/ct-ng $(CONFIG_DIR)/.config
+
+$(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(CONFIG_DIR)/.config
 	$(Q)if [ ! -f $@ ]; then                                                        \
+	        mkdir -p "$(CTNG_DIR)";                                                 \
 	        libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }' "$<")";            \
 	        if [ "$${libc}" != "$(BR2_TOOLCHAIN_CTNG_LIBC)" ]; then                 \
 	            echo "* Inconsistency in crosstool-NG config file '$<'";            \
@@ -403,39 +404,3 @@ ctng-menuconfig: $(CTNG_DIR)/.config
 	$(call ctng-oldconfig,$<)
 	$(call ctng-check-config-changed,$<,$<.timestamp)
 	$(Q)rm -f $<.timestamp
-
-#-----------------------------------------------------------------------------
-# Retrieving, configuring and building crosstool-NG (as a package)
-
-$(DL_DIR)/$(CTNG_SOURCE):
-	$(Q)$(call DOWNLOAD,$(CTNG_SITE),$(CTNG_SOURCE))
-
-$(CTNG_DIR)/.unpacked: $(DL_DIR)/$(CTNG_SOURCE)
-	$(Q)rm -rf $(CTNG_DIR)
-	$(Q)mkdir -p $(BUILD_DIR)
-	$(Q)$(CTNG_CAT) $(DL_DIR)/$(CTNG_SOURCE) |tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(Q)touch $@
-
-$(CTNG_DIR)/.patched: $(CTNG_DIR)/.unpacked
-	$(Q)toolchain/patch-kernel.sh $(CTNG_DIR)       \
-	                              $(CTNG_PATCH_DIR) \
-	                              \*.patch          \
-	                              \*.patch.$(ARCH)
-	$(Q)touch $@
-
-# Use order-only dependencies on host-* as they
-# are virtual targets with no rules, and so are
-# considered always remade. But we do not want
-# to reconfigure and rebuild ct-ng every time
-# we need to run it...
-$(CTNG_DIR)/.configured: | $(if $(BR2_CCACHE),host-ccache) \
-                           host-gawk        \
-                           host-automake
-
-$(CTNG_DIR)/.configured: $(CTNG_DIR)/.patched
-	$(Q)cd $(CTNG_DIR) && PATH=$(HOST_PATH) ./configure --local
-	$(Q)touch $@
-
-$(CTNG_DIR)/ct-ng: $(CTNG_DIR)/.configured
-	$(Q)$(MAKE) -C $(CTNG_DIR) --no-print-directory
-	$(Q)touch $@

From b979619973dad84c2ef6a978b3a3b04b35d6ce3a Mon Sep 17 00:00:00 2001
From: Danomi Mocelopolis <d_mo1234@yahoo.com>
Date: Sun, 17 Jul 2011 22:17:08 +0200
Subject: [PATCH 0429/6849] make help: sort defconfigs for make 3.82

Closes #3985

The wildcard function in make 3.82 no longer sorts the output, so
add an explicit sort so the defconfigs are listed in a sensible order.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 1 +
 Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 06a7e53cd9..a6016cc61a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@
 	#3595: patch to add libroxml
 	#3565: libnss: Add new package
 	#3907: 2011.05 - Qt 4.7.3 not building on ARM
+	#3985: "help" target's defconfig list needs sort
 
 2011.05, Released May 27th, 2011:
 
diff --git a/Makefile b/Makefile
index ffe634391f..02a1659991 100644
--- a/Makefile
+++ b/Makefile
@@ -668,7 +668,7 @@ endif
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'
 	@echo '  make O=dir             - Locate all output files in "dir", including .config'
 	@echo
-	@$(foreach b, $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig)), \
+	@$(foreach b, $(sort $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig))), \
 	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
 	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'

From 530890bb95a5073002fb5d0b63dcbcfb9f47fde1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 12:10:48 +0200
Subject: [PATCH 0430/6849] toolchain-buildroot: NPTL is only supported with
 EABI on ARM

So hide option if OABI is selected.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 0c3a5100cf..5df188f5d4 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -78,7 +78,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32
+	default BR2_PTHREADS_NATIVE if (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32) && !BR2_ARM_OABI
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -102,6 +102,7 @@ choice
 		bool "Native POSIX Threading (NPTL)"
 	        select BR2_TOOLCHAIN_HAS_THREADS
 		depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32
+		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 endchoice
 

From 20d6fca6cd7c96d2a16e6ef80de453f69a5e3bc0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 12:49:25 +0200
Subject: [PATCH 0431/6849] Makefile.package.in: use "" for MESSAGE arguments

Otherwise we get output like:

>>> host-pkg-config 0.25 'Installing to host directory'

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 74087cd462..90530dc432 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -292,21 +292,21 @@ $(BUILD_DIR)/%/.stamp_built::
 
 # Install to host dir
 $(BUILD_DIR)/%/.stamp_host_installed:
-	@$(call MESSAGE,'Installing to host directory')
+	@$(call MESSAGE,"Installing to host directory")
 	$($(PKG)_INSTALL_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 
 # Install to staging dir
 $(BUILD_DIR)/%/.stamp_staging_installed:
-	@$(call MESSAGE,'Installing to staging directory')
+	@$(call MESSAGE,"Installing to staging directory")
 	$($(PKG)_INSTALL_STAGING_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 
 # Install to images dir
 $(BUILD_DIR)/%/.stamp_images_installed:
-	@$(call MESSAGE,'Installing to images directory')
+	@$(call MESSAGE,"Installing to images directory")
 	$($(PKG)_INSTALL_IMAGES_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@

From 1dfc43cced8d30984687950beca6448203fb576d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 13:10:24 +0200
Subject: [PATCH 0432/6849] linux-fusion: fix build after af52661d (linux:
 rename LINUX26 to LINUX)

linux-fusion uses a number of linux-specific variables. Adjust to match
their new names.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-fusion/linux-fusion.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 392ffd6268..be1cc7113d 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -9,12 +9,12 @@ LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES
 LINUX_FUSION_DEPENDENCIES = linux
 
-LINUX_FOR_FUSION=$(LINUX26_VERSION_PROBED)
+LINUX_FOR_FUSION=$(LINUX_VERSION_PROBED)
 LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
 
 LINUX_FUSION_MAKE_OPTS =  KERNEL_VERSION=$(LINUX_FOR_FUSION)
-LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX26_DIR)
-LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(LINUX26_DIR)
+LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX_DIR)
+LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(LINUX_DIR)
 
 LINUX_FUSION_MAKE_OPTS += SYSROOT=$(TARGET_DIR)
 LINUX_FUSION_MAKE_OPTS += ARCH=$(KERNEL_ARCH)

From 7a2fa1f8db5c2e627a4b939862af5f938fcfc359 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 15:22:13 +0200
Subject: [PATCH 0433/6849] uboot-tools: add fw_printenv, rename to uboot-tools

Move fw_printenv / fw_setenv options from the uboot bootloader build to
the uboot-mkimage package, and rename it to uboot-tools.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in                          |  5 --
 boot/uboot/uboot.mk                           | 19 -------
 linux/linux.mk                                |  2 +-
 package/Config.in                             |  2 +-
 package/uboot-mkimage/Config.in               |  7 ---
 package/uboot-mkimage/uboot-mkimage.mk        | 31 -----------
 package/uboot-tools/Config.in                 | 23 ++++++++
 .../uboot-tools-2011.03-drop-configh.patch}   |  0
 ...ols-2011.03-hostcflags-override-fix.patch} |  0
 package/uboot-tools/uboot-tools.mk            | 55 +++++++++++++++++++
 10 files changed, 80 insertions(+), 64 deletions(-)
 delete mode 100644 package/uboot-mkimage/Config.in
 delete mode 100644 package/uboot-mkimage/uboot-mkimage.mk
 create mode 100644 package/uboot-tools/Config.in
 rename package/{uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch => uboot-tools/uboot-tools-2011.03-drop-configh.patch} (100%)
 rename package/{uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch => uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch} (100%)
 create mode 100644 package/uboot-tools/uboot-tools.mk

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 070533efd7..a0b2bfc875 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -91,11 +91,6 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 
 endchoice
 
-config BR2_TARGET_UBOOT_TOOL_ENV
-	bool "fw_printenv tool in target"
-	help
-	  Install fw_printenv / fw_setenv tools in target.
-
 menuconfig BR2_TARGET_UBOOT_NETWORK
 	bool "Network Settings"
 	default y
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 0610e4c9dc..142557995d 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -78,35 +78,16 @@ define UBOOT_CONFIGURE_CMDS
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
 endef
 
-ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-define UBOOT_BUILD_TARGET_ENV_UTILS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) HOSTCC="$(TARGET_CC)" -C $(@D) env
-endef
-endif
-
 define UBOOT_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
 		$(UBOOT_MAKE_TARGET)
-	$(UBOOT_BUILD_TARGET_ENV_UTILS)
 endef
 
 define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 endef
 
-ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-define UBOOT_INSTALL_TARGET_ENV_UTILS
-	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv \
-		$(TARGET_DIR)/usr/sbin/fw_printenv
-	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
-endef
-endif
-
-define UBOOT_INSTALL_TARGET_CMDS
-	$(UBOOT_INSTALL_TARGET_ENV_UTILS)
-endef
-
 $(eval $(call GENTARGETS,boot,uboot))
 
 ifeq ($(BR2_TARGET_UBOOT),y)
diff --git a/linux/linux.mk b/linux/linux.mk
index bdd8bb3e44..e6cf01aea0 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -54,7 +54,7 @@ LINUX_IMAGE_NAME=vmImage
 else
 LINUX_IMAGE_NAME=uImage
 endif
-LINUX_DEPENDENCIES+=host-uboot-mkimage
+LINUX_DEPENDENCIES+=host-uboot-tools
 else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)
 LINUX_IMAGE_NAME=bzImage
 else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)
diff --git a/package/Config.in b/package/Config.in
index db730ece63..a01f8d2779 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -206,7 +206,7 @@ source "package/sredird/Config.in"
 source "package/sshfs/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
-source "package/uboot-mkimage/Config.in"
+source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
 source "package/usb_modeswitch/Config.in"
 source "package/usbmount/Config.in"
diff --git a/package/uboot-mkimage/Config.in b/package/uboot-mkimage/Config.in
deleted file mode 100644
index e1dec53798..0000000000
--- a/package/uboot-mkimage/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_UBOOT_MKIMAGE
-	bool "uboot-mkimage"
-	help
-	  The mkimage tool from Das U-Boot bootloader, which allows
-	  generation of U-Boot images in various formats.
-
-	  http://www.denx.de/wiki/U-Boot/WebHome
diff --git a/package/uboot-mkimage/uboot-mkimage.mk b/package/uboot-mkimage/uboot-mkimage.mk
deleted file mode 100644
index d8a8fbbe9c..0000000000
--- a/package/uboot-mkimage/uboot-mkimage.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-UBOOT_MKIMAGE_VERSION = 2011.03
-UBOOT_MKIMAGE_SOURCE  = u-boot-$(UBOOT_MKIMAGE_VERSION).tar.bz2
-UBOOT_MKIMAGE_SITE    = ftp://ftp.denx.de/pub/u-boot
-
-define UBOOT_MKIMAGE_BUILD_CMDS
-	$(MAKE) -C $(@D) 			\
-		HOSTCC="$(TARGET_CC)"		\
-		HOSTCFLAGS="$(TARGET_CFLAGS)"	\
-		HOSTLDFLAGS="$(TARGET_LDFLAGS)"	\
-		HOSTSTRIP=true			\
-		tools
-endef
-
-define UBOOT_MKIMAGE_INSTALL_CMDS
-	install -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin
-endef
-
-define HOST_UBOOT_MKIMAGE_BUILD_CMDS
-	$(MAKE) -C $(@D) 			\
-		HOSTCC="$(HOSTCC)"		\
-		HOSTCFLAGS="$(HOST_CFLAGS)"	\
-		HOSTLDFLAGS="$(HOST_LDFLAGS)"	\
-		tools
-endef
-
-define HOST_UBOOT_MKIMAGE_INSTALL_CMDS
-	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
-endef
-
-$(eval $(call GENTARGETS,package,uboot-mkimage))
-$(eval $(call GENTARGETS,package,uboot-mkimage,host))
diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in
new file mode 100644
index 0000000000..f19739150c
--- /dev/null
+++ b/package/uboot-tools/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_UBOOT_TOOLS
+	bool "u-boot tools"
+	help
+	  Companion tools for Das U-Boot bootloader.
+
+	  http://www.denx.de/wiki/U-Boot/WebHome
+
+if BR2_PACKAGE_UBOOT_TOOLS
+
+config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
+	bool "mkimage"
+	help
+	  The mkimage tool from Das U-Boot bootloader, which allows
+	  generation of U-Boot images in various formats.
+
+config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
+	bool "fw_printenv"
+	help
+	  The fw_printenv / fw_setenv tools from Das U-Boot
+	  bootloader, which allows access to the U-Boot environment
+	  from Linux.
+
+endif
diff --git a/package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
similarity index 100%
rename from package/uboot-mkimage/uboot-mkimage-2011.03-drop-configh.patch
rename to package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
diff --git a/package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch
similarity index 100%
rename from package/uboot-mkimage/uboot-mkimage-2011.03-hostcflags-override-fix.patch
rename to package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
new file mode 100644
index 0000000000..b9e0f215bf
--- /dev/null
+++ b/package/uboot-tools/uboot-tools.mk
@@ -0,0 +1,55 @@
+UBOOT_TOOLS_VERSION = 2011.03
+UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
+UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
+
+define UBOOT_TOOLS_BUILD_CMDS
+	$(MAKE) -C $(@D) 			\
+		HOSTCC="$(TARGET_CC)"		\
+		HOSTCFLAGS="$(TARGET_CFLAGS)"	\
+		HOSTLDFLAGS="$(TARGET_LDFLAGS)"	\
+		HOSTSTRIP=true			\
+		tools env
+endef
+
+ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y)
+define UBOOT_TOOLS_INSTALL_MKIMAGE
+	install -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
+define UBOOT_TOOLS_INSTALL_FWPRINTENV
+	install -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin
+	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
+endef
+endif
+
+define UBOOT_TOOLS_INSTALL_TARGET_CMDS
+	$(UBOOT_TOOLS_INSTALL_MKIMAGE)
+	$(UBOOT_TOOLS_INSTALL_FWPRINTENV)
+endef
+
+define UBOOT_TOOLS_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/,\
+		usr/bin/mkimage usr/sbin/fw_printenv usr/sbin/fw_setenv)
+endef
+
+
+define BUSYBOX_UNINSTALL_TARGET_CMDS
+	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) uninstall
+endef
+
+define HOST_UBOOT_TOOLS_BUILD_CMDS
+	$(MAKE1) -C $(@D) 			\
+		HOSTCC="$(HOSTCC)"		\
+		HOSTCFLAGS="$(HOST_CFLAGS)"	\
+		HOSTLDFLAGS="$(HOST_LDFLAGS)"	\
+		tools
+endef
+
+define HOST_UBOOT_TOOLS_INSTALL_CMDS
+	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(call GENTARGETS,package,uboot-tools))
+$(eval $(call GENTARGETS,package,uboot-tools,host))

From b7876e797d44ce33007bb93e523f0ce019324b6a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 15:33:35 +0200
Subject: [PATCH 0434/6849] iso9660: fix build after af52661d (linux: rename
 LINUX26 to LINUX)

iso9660 used LINUX26_IMAGE_PATH, which got renamed. Adjust to match
the new name.

Reported-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/iso9660/iso9660.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 2a5288c336..a31b557094 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -21,7 +21,7 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 rootfs-ext2 gr
 	mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
 	cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
 	cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
-	cp $(LINUX26_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+	cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
 	cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)

From 135f1140a1160be3ebcd21e6c6a37ffd8abcf6ba Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 16:01:37 +0200
Subject: [PATCH 0435/6849] proftpd: bump version

Fixes several security-related issues.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...> proftpd-1.3.3e-fix-kernel-header-capability-version.patch} | 0
 package/proftpd/proftpd.mk                                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/proftpd/{proftpd-1.3.3b-fix-kernel-header-capability-version.patch => proftpd-1.3.3e-fix-kernel-header-capability-version.patch} (100%)

diff --git a/package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch
similarity index 100%
rename from package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch
rename to package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 75ab930ff6..3733cd643b 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -3,7 +3,7 @@
 # proftpd
 #
 #############################################################
-PROFTPD_VERSION = 1.3.3b
+PROFTPD_VERSION = 1.3.3e
 PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2
 PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source/
 

From 604b576854cef8b0bdb3a0e101a519c1d12aab07 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 22:25:39 +0200
Subject: [PATCH 0436/6849] cmake: bump version

qt4 patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake-2.8.3-qt4-fix.patch | 257 ------------------------
 package/cmake/cmake.mk                  |   5 +-
 2 files changed, 2 insertions(+), 260 deletions(-)
 delete mode 100644 package/cmake/cmake-2.8.3-qt4-fix.patch

diff --git a/package/cmake/cmake-2.8.3-qt4-fix.patch b/package/cmake/cmake-2.8.3-qt4-fix.patch
deleted file mode 100644
index 4d50c921e7..0000000000
--- a/package/cmake/cmake-2.8.3-qt4-fix.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-The FindQt4 module of CMake insists on having uic, even if the QtGui
-module isn't part of the requirements to build the program. This isn't
-correct, as Qt doesn't build/install the uic program when QtGui is
-disabled (uic is used to generate some UI code).
-
-This has been fixed upstream in
-http://cmake.org/gitweb?p=cmake.git;a=commit;h=43cb9b8276a70d153d56a69d5c61daaf2bc51b78. This
-commit will be part of the upcoming 2.8.4 CMake release, but in the
-mean time, let's include it in Buildroot.
-
-From 43cb9b8276a70d153d56a69d5c61daaf2bc51b78 Mon Sep 17 00:00:00 2001
-From: Clinton Stimpson <clinton@elemtech.com>
-Date: Fri, 14 Jan 2011 21:26:19 -0700
-Subject: [PATCH] Change to use fphsa to check required variables and version.
-
-Also, set the required variables based on components, if specified.
-Also, don't make finding uic required if not using QtGui.
----
- Modules/FindQt4.cmake |  179 +++++++++++++------------------------------------
- 1 files changed, 46 insertions(+), 133 deletions(-)
-
-diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
-index d9d6ea7..70e69b0 100644
---- a/Modules/FindQt4.cmake
-+++ b/Modules/FindQt4.cmake
-@@ -9,7 +9,7 @@
- # QT_LIBRARIES variable.
- #
- # Typical usage could be something like:
--#   find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtXml REQUIRED )
-+#   find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml)
- #   include(${QT_USE_FILE})
- #   add_executable(myexe main.cpp)
- #   target_link_libraries(myexe ${QT_LIBRARIES})
-@@ -354,6 +354,7 @@ ENDIF(QT_QT_LIBRARY)
- 
- INCLUDE(CheckSymbolExists)
- INCLUDE(MacroAddFileDependencies)
-+INCLUDE(FindPackageHandleStandardArgs)
- 
- SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
- 
-@@ -469,6 +470,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-   DOC "The qmake executable for the Qt installation to use"
- )
- 
-+# double check that it was a Qt4 qmake, if not, re-find with different names
- IF (QT_QMAKE_EXECUTABLE)
- 
-   IF(QT_QMAKE_EXECUTABLE_LAST)
-@@ -477,8 +479,6 @@ IF (QT_QMAKE_EXECUTABLE)
- 
-   SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
- 
--  SET(QT4_QMAKE_FOUND FALSE)
--  
-   _qt4_query_qmake(QT_VERSION QTVERSION)
- 
-   # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
-@@ -495,74 +495,9 @@ IF (QT_QMAKE_EXECUTABLE)
-     ENDIF(QT_QMAKE_EXECUTABLE)
-   ENDIF(NOT QTVERSION)
- 
--  # check that we found the Qt4 qmake, Qt3 qmake output won't match here
--  STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
--  IF (qt_version_tmp)
--
--    # we need at least version 4.0.0
--    IF (NOT QT_MIN_VERSION)
--      SET(QT_MIN_VERSION "4.0.0")
--    ENDIF (NOT QT_MIN_VERSION)
--
--    #now parse the parts of the user given version string into variables
--    STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" req_qt_major_vers "${QT_MIN_VERSION}")
--    IF (NOT req_qt_major_vers)
--      MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"4.0.1\"")
--    ENDIF (NOT req_qt_major_vers)
--
--    # now parse the parts of the user given version string into variables
--    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
--    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
--    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
--
--    # Suppport finding at least a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 )
--    # This implementation is a hack to avoid duplicating code and make sure we stay
--    # source-compatible with CMake 2.6.x
--    IF( Qt4_FIND_VERSION )
--      SET( QT_MIN_VERSION ${Qt4_FIND_VERSION} )
--      SET( req_qt_major_vers ${Qt4_FIND_VERSION_MAJOR} )
--      SET( req_qt_minor_vers ${Qt4_FIND_VERSION_MINOR} )
--      SET( req_qt_patch_vers ${Qt4_FIND_VERSION_PATCH} )
--    ENDIF( Qt4_FIND_VERSION )
--
--    IF (NOT req_qt_major_vers EQUAL 4)
--      MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", major version 4 is required, e.g. \"4.0.1\"")
--    ENDIF (NOT req_qt_major_vers EQUAL 4)
--
--    # and now the version string given by qmake
--    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
--    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
--    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
--
--    # compute an overall version number which can be compared at once
--    MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
--    MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}")
--
--    # Support finding *exactly* a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 EXACT )
--    IF( Qt4_FIND_VERSION_EXACT )
--      IF(found_vers EQUAL req_vers)
--        SET( QT4_QMAKE_FOUND TRUE )
--      ELSE(found_vers EQUAL req_vers)
--        SET( QT4_QMAKE_FOUND FALSE )
--        IF (found_vers LESS req_vers)
--          SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
--        ELSE (found_vers LESS req_vers)
--          SET(QT4_INSTALLED_VERSION_TOO_NEW TRUE)
--        ENDIF (found_vers LESS req_vers)
--      ENDIF(found_vers EQUAL req_vers)
--    ELSE( Qt4_FIND_VERSION_EXACT )
--      IF (found_vers LESS req_vers)
--        SET(QT4_QMAKE_FOUND FALSE)
--        SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
--      ELSE (found_vers LESS req_vers)
--        SET(QT4_QMAKE_FOUND TRUE)
--      ENDIF (found_vers LESS req_vers)
--    ENDIF( Qt4_FIND_VERSION_EXACT )
--  ENDIF (qt_version_tmp)
--
- ENDIF (QT_QMAKE_EXECUTABLE)
- 
--IF (QT4_QMAKE_FOUND)
-+IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
- 
-   # ask qmake for the mkspecs directory
-   # we do this first because QT_LIBINFIX might be set
-@@ -1072,32 +1007,7 @@ IF (QT4_QMAKE_FOUND)
-   # get the directory of the current file, used later on in the file
-   GET_FILENAME_COMPONENT( _qt4_current_dir  "${CMAKE_CURRENT_LIST_FILE}" PATH)
- 
--  ######################################
--  #
--  #       decide if Qt got found
--  #
--  ######################################
--
--  # if the includes,libraries,moc,uic and rcc are found then we have it
--  IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND 
--      QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
--    SET( QT4_FOUND "YES" )
--    INCLUDE(FindPackageMessage)
--    FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})"
--      "[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
--  ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
--        QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
--    SET( QT4_FOUND "NO")
--    SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
--    IF( Qt4_FIND_REQUIRED)
--      MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
--    ENDIF( Qt4_FIND_REQUIRED)
--  ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND 
--         QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
-   
--  SET(QT_FOUND ${QT4_FOUND})
--
--
-   ###############################################
-   #
-   #       configuration/system dependent settings  
-@@ -1189,44 +1099,47 @@ IF (QT4_QMAKE_FOUND)
- 
-   INCLUDE("${_qt4_current_dir}/Qt4Macros.cmake")
- 
-+ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)
- 
--  #######################################
--  #
--  #       compatibility settings 
--  #
--  #######################################
--  # Backwards compatibility for CMake1.4 and 1.2
--  SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
--  SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
--
--  SET( QT_QT_LIBRARY "")
--
--ELSE(QT4_QMAKE_FOUND)
--   
--   SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
--   
--   # The code below is overly complex to make sure we do not break compatibility with CMake 2.6.x
--   # For CMake 2.8, it should be simplified by getting rid of QT4_INSTALLED_VERSION_TOO_OLD and 
--   # QT4_INSTALLED_VERSION_TOO_NEW
--   IF(Qt4_FIND_REQUIRED)
--      IF(QT4_INSTALLED_VERSION_TOO_OLD)
--    IF( Qt4_FIND_VERSION_EXACT )
--      MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, version ${QT_MIN_VERSION} is required")
--    ELSE( Qt4_FIND_VERSION_EXACT )
--      MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
--    ENDIF( Qt4_FIND_VERSION_EXACT )
--      ELSE(QT4_INSTALLED_VERSION_TOO_OLD)
--      IF( Qt4_FIND_VERSION_EXACT AND QT4_INSTALLED_VERSION_TOO_NEW )
--      MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too new, version ${QT_MIN_VERSION} is required")
--    ELSE( Qt4_FIND_VERSION_EXACT AND QT4_INSTALLED_VERSION_TOO_NEW )
--      MESSAGE( FATAL_ERROR "Qt qmake not found!")
--    ENDIF( Qt4_FIND_VERSION_EXACT AND QT4_INSTALLED_VERSION_TOO_NEW )
--      ENDIF(QT4_INSTALLED_VERSION_TOO_OLD)
--   ELSE(Qt4_FIND_REQUIRED)
--      IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
--         MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
--      ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
--   ENDIF(Qt4_FIND_REQUIRED)
-- 
--ENDIF (QT4_QMAKE_FOUND)
-+#support old QT_MIN_VERSION if set, but not if version is supplied by find_package()
-+IF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
-+  SET(Qt4_FIND_VERSION ${QT_MIN_VERSION})
-+ENDIF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
-+
-+IF( Qt4_FIND_COMPONENTS )
-+
-+  # if components specified in find_package(), make sure each of those pieces were found
-+  SET(_QT4_FOUND_REQUIRED_VARS QT_QMAKE_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_INCLUDE_DIR QT_LIBRARY_DIR)
-+  FOREACH( component ${Qt4_FIND_COMPONENTS} )
-+    STRING( TOUPPER ${component} _COMPONENT )
-+    SET(_QT4_FOUND_REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} QT_${_COMPONENT}_INCLUDE_DIR QT_${_COMPONENT}_LIBRARY)
-+  ENDFOREACH( component )
-+
-+  if(Qt4_FIND_COMPONENTS MATCHES QtGui)
-+    SET(_QT4_FOUND_REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} QT_UIC_EXECUTABLE)
-+  endif(Qt4_FIND_COMPONENTS MATCHES QtGui)
-+
-+ELSE( Qt4_FIND_COMPONENTS )
-+
-+  # if no components specified, we'll make a default set of required variables to say Qt is found
-+  SET(_QT4_FOUND_REQUIRED_VARS QT_QMAKE_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_UIC_EXECUTABLE QT_INCLUDE_DIR
-+    QT_LIBRARY_DIR QT_QTCORE_LIBRARY)
-+
-+ENDIF( Qt4_FIND_COMPONENTS )
-+
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
-+  REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
-+  VERSION_VAR QTVERSION
-+  )
-+
-+#######################################
-+#
-+#       compatibility settings
-+#
-+#######################################
-+# Backwards compatibility for CMake1.4 and 1.2
-+SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
-+SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
-+SET( QT_QT_LIBRARY "")
-+SET(QT_FOUND ${QT4_FOUND})
- 
--- 
-1.7.0
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index efff5a5e40..1b458c2194 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -1,6 +1,5 @@
-CMAKE_VERSION=2.8.3
-CMAKE_SOURCE=cmake-$(CMAKE_VERSION).tar.gz
-CMAKE_SITE=http://www.cmake.org/files/v2.8/
+CMAKE_VERSION = 2.8.5
+CMAKE_SITE = http://www.cmake.org/files/v2.8/
 
 define HOST_CMAKE_CONFIGURE_CMDS
  (cd $(@D); \

From b9187818daa207d4781a3e07659c08e66e23fd4b Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 09:16:28 +0200
Subject: [PATCH 0437/6849] shared-mime-info: update to version 0.90

Need to use $(MAKE1) as parallel builds appear to be broken.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../shared-mime-info-0.60-fix-xmllint.patch     | 17 -----------------
 package/shared-mime-info/shared-mime-info.mk    |  7 ++++---
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch

diff --git a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch b/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
deleted file mode 100644
index 921333e3d9..0000000000
--- a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: shared-mime-info-0.60/Makefile.am
-===================================================================
---- shared-mime-info-0.60.orig/Makefile.am
-+++ shared-mime-info-0.60/Makefile.am
-@@ -72,7 +72,7 @@
- 
- check: freedesktop.org.xml
- 	if test -n $(XMLLINT) ; then \
--		xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml;	\
-+		$(XMLLINT) --noout --valid $(top_srcdir)/freedesktop.org.xml;	\
- 	fi
- 	if test -d CVS/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \
- 		mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 6abfa7531e..50b0f25156 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -3,7 +3,7 @@
 # shared-mime-info
 #
 #############################################################
-SHARED_MIME_INFO_VERSION = 0.60
+SHARED_MIME_INFO_VERSION = 0.90
 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2
 SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
 
@@ -15,11 +15,12 @@ SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
 SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
 
 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+SHARED_MIME_INFO_MAKE = $(MAKE1)
 
 HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
 
-HOST_SHARED_MIME_INFO_CONF_OPT = \
-	--disable-update-mimedb
+HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+HOST_SHARED_MIME_INFO_MAKE = $(MAKE1)
 
 define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
 	$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime

From d57c7ae55707861f92545cdeb50f1dc39a778979 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 22:57:21 +0200
Subject: [PATCH 0438/6849] shared-mime-info: remove default options

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/shared-mime-info/shared-mime-info.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 50b0f25156..b24540dfa2 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -8,9 +8,7 @@ SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2
 SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
 
 SHARED_MIME_INFO_INSTALL_STAGING = YES
-SHARED_MIME_INFO_INSTALL_TARGET = YES
 
-SHARED_MIME_INFO_AUTORECONF = NO
 SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
 SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
 

From d2b438cd1409dc2a61cd3428ec6da6a2f66633af Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 13 Jul 2011 18:54:47 +0200
Subject: [PATCH 0439/6849] gvfs: update to latest upstream version (1.8.2)

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gvfs/gvfs.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index adfa966a59..bd370b5832 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -3,8 +3,8 @@
 # gvfs
 #
 #############################################################
-GVFS_VERSION_MAJOR = 1.6
-GVFS_VERSION_MINOR = 6
+GVFS_VERSION_MAJOR = 1.8
+GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)

From 5739c7fac6ec95fd6394e33a0f28ac663f2c8178 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 13 Jul 2011 18:54:48 +0200
Subject: [PATCH 0440/6849] gvfs: drop dbus-glib dependency

Drop the dbus-glib dependency as gvfs uses dbus directly.

Also change dependency on the XML parser for dbus to be more
in sync with the dbus package.

[Peter: drop expat|libxml2 deps as shared-mime-type already selects libxml2]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gvfs/Config.in | 2 --
 package/gvfs/gvfs.mk   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 04fce93fac..87f9a03216 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -3,9 +3,7 @@ config BR2_PACKAGE_GVFS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_EXPAT # needed by dbus(-glib)
 	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_SHARED_MIME_INFO
 	help
 	  gvfs is a userspace virtual filesystem where mount runs as a
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index bd370b5832..f208973f2a 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -11,7 +11,7 @@ GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = NO
 GVFS_INSTALL_TARGET = YES
 GVFS_AUTORECONF = NO
-GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus-glib shared-mime-info
+GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
 
 GVFS_CONF_OPT = \
 	--disable-gconf			\

From b8ee6635ed6339e2676f64903d0c079cdd968c3c Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 13 Jul 2011 18:54:49 +0200
Subject: [PATCH 0441/6849] gvfs: fix installation of gsettings schemas

Install gvfs into staging and compile the installed schemas for
use on the target.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gvfs/gvfs.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index f208973f2a..b0fcf3d557 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -8,7 +8,7 @@ GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
-GVFS_INSTALL_STAGING = NO
+GVFS_INSTALL_STAGING = YES
 GVFS_INSTALL_TARGET = YES
 GVFS_AUTORECONF = NO
 GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
@@ -71,6 +71,17 @@ define GVFS_REMOVE_USELESS_BINARY
 	rm $(TARGET_DIR)/usr/bin/gvfs-less
 endef
 
-GVFS_POST_INSTALL_TARGET_HOOKS += GVFS_REMOVE_USELESS_BINARY
+define GVFS_REMOVE_TARGET_SCHEMAS
+	rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml
+endef
+
+define GVFS_COMPILE_SCHEMAS
+	$(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
+endef
+
+GVFS_POST_INSTALL_TARGET_HOOKS += \
+	GVFS_REMOVE_USELESS_BINARY	\
+	GVFS_REMOVE_TARGET_SCHEMAS	\
+	GVFS_COMPILE_SCHEMAS
 
 $(eval $(call AUTOTARGETS,package,gvfs))

From d5247aa842274348de4ed928a062d0027feb87d7 Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Mon, 9 May 2011 14:12:53 +0100
Subject: [PATCH 0442/6849] sh: Fix Buildroot sh targets to match gnuconfig
 targets

sh2eb and sh2a_nofpueb gnuconfig targets are no longer supported
in Buildroot. This patch replaces these Buildroot targets with sh2
and sh2a respectively, and adds sh4a targets as these are widely
used.

To build for devices without an fpu, the relevant toolchain flags
will have to be specified.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/jffs2/Config.in                     |  4 ++--
 target/Config.in.arch                  | 32 +++++++++++++++-----------
 toolchain/elf2flt/elf2flt/config.sub   |  8 +++----
 toolchain/toolchain-external/Config.in |  4 ++--
 toolchain/uClibc/uclibc.mk             |  4 ++--
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index 5748fbb634..9a96d7da18 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -94,8 +94,8 @@ choice
 	prompt "Endianess"
 	default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_armeb || \
 			BR2_avr32 || BR2_m68k || BR2_mips || \
-			BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
-			BR2_sh3eb || BR2_sh4eb || BR2_sparc
+			BR2_powerpc || BR2_sh2 || BR2_sh2a || \
+			BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc
 
 config BR2_TARGET_ROOTFS_JFFS2_LE
 	bool "little-endian"
diff --git a/target/Config.in.arch b/target/Config.in.arch
index 91956ec011..5e9fad4869 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -211,18 +211,22 @@ choice
 	help
 	  Specific CPU variant to use
 
-config BR2_sh2a_nofpueb
-	bool "sh2a_nofpueb"
-config BR2_sh2eb
-	bool "sh2eb"
+config BR2_sh2
+	bool "sh2 (SH2 big endian)"
+config BR2_sh2a
+	bool "sh2a (SH2A big endian)"
 config BR2_sh3
-	bool "sh3"
+	bool "sh3 (SH3 little endian)"
 config BR2_sh3eb
-	bool "sh3eb"
+	bool "sh3eb (SH3 big endian)"
 config BR2_sh4
-	bool "sh4"
+	bool "sh4 (SH4 little endian)"
 config BR2_sh4eb
-	bool "sh4eb"
+	bool "sh4eb (SH4 big endian)"
+config BR2_sh4a
+	bool "sh4a (SH4A little endian)"
+config BR2_sh4aeb
+	bool "sh4aeb (SH4A big endian)"
 endchoice
 
 #
@@ -489,12 +493,14 @@ config BR2_ARCH
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
 	default "powerpc"	if BR2_powerpc
-	default "sh2a_nofpueb"	if BR2_sh2a_nofpueb
-	default "sh2eb"		if BR2_sh2eb
+	default "sh2"		if BR2_sh2
+	default "sh2a"		if BR2_sh2a
 	default "sh3"		if BR2_sh3
 	default "sh3eb"		if BR2_sh3eb
 	default "sh4"		if BR2_sh4
 	default "sh4eb"		if BR2_sh4eb
+	default "sh4a"		if BR2_sh4a
+	default "sh4aeb"	if BR2_sh4aeb
 	default "sh64"		if BR2_sh64
 	default "sparc"		if BR2_sparc
 	default "x86_64"	if BR2_x86_64
@@ -510,10 +516,10 @@ config BR2_ARCH
 config BR2_ENDIAN
 	string
 	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \
-			    BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_sh64
+			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64
 	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \
-			    BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
-			    BR2_sh3eb || BR2_sh4eb || BR2_sparc
+			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \
+			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc
 
 config BR2_GCC_TARGET_TUNE
 	string
diff --git a/toolchain/elf2flt/elf2flt/config.sub b/toolchain/elf2flt/elf2flt/config.sub
index 4279c84913..20724573d0 100755
--- a/toolchain/elf2flt/elf2flt/config.sub
+++ b/toolchain/elf2flt/elf2flt/config.sub
@@ -262,7 +262,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b \
@@ -342,8 +342,8 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* \
+	| sheb-* | shbe-* | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
@@ -1097,7 +1097,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 22cee53596..5222702e15 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -139,7 +139,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "CodeSoucery SH 2010.09"
-	depends on BR2_sh4 || BR2_sh4eb
+	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
@@ -154,7 +154,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	bool "CodeSoucery SH 2010.09"
-	depends on BR2_sh2a_nofpueb || BR2_sh2eb
+	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 19256bb905..3173ef4bb1 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -182,14 +182,14 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh)
 	/bin/echo "# CONFIG_SH2 is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# CONFIG_SH3 is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# CONFIG_SH4 is not set" >> $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_sh2a_nofpueb),y)
+ifeq ($(BR2_sh2a),y)
 	$(SED) 's,# CONFIG_SH2A is not set,CONFIG_SH2A=y,g' $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# UCLIBC_FORMAT_FLAT_SEP_DATA is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# UCLIBC_FORMAT_SHARED_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_sh2eb),y)
+ifeq ($(BR2_sh2),y)
 	$(SED) 's,# CONFIG_SH2 is not set,CONFIG_SH2=y,g' $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig

From 82b23f3be19600da5dccd3d8989d92d02448f88d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jul 2011 23:34:10 +0200
Subject: [PATCH 0443/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index a6016cc61a..7f8cb82dae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,14 +16,16 @@
 	toolchains / crosstool-ng backend.
 
 	Updated/fixed packages: berkeleydb, bmon, bridge-utils,
-	busybox, dbus, dbus-glib, ethtool, ffmpeg, gst-plugins-bad,
-	gst-plugins-base, lame, libarchive, libdnet, libgcrypt,
-	libgtk2, libmpeg2, lighttpd, mtd-utils, oprofile, qt, ruby,
-	sudo, sqlite, synergy, usbutils, valgrind, webkit
+	busybox, cmake, dbus, dbus-glib, ethtool, ffmpeg,
+	gst-plugins-bad, gst-plugins-base, gvfs, jpeg, lame,
+	libarchive, libdnet, libgcrypt, libgtk2, libmpeg2, libpng,
+	lighttpd, linux-fusion, lzo, mtd-utils, oprofile, proftpd, qt,
+	ruby, shared-mime-info, sudo, sqlite, synergy, usbutils,
+	valgrind, webkit, xz
 
 	New packages: acl, attr, ebtables, gnutls, libargtable2,
-	libiqrf, libnspr, libnss, libroxml, live555, mxml, rsyslog,
-	sredird, statserial, stunnel, yajl
+	libiqrf, libnspr, libnss, libroxml, libyaml, live555, mxml,
+	rsyslog, sredird, statserial, stunnel, uboot-tools, yajl
 
 	Issues resolved (http://bugs.uclibc.org):
 

From cfb54ef515dc6043ffdca14424307791c14f2a18 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Jul 2011 12:26:27 +0200
Subject: [PATCH 0444/6849] uboot-tools: enable fw_printenv by default

Normally people want to atleast use fw_printenv if they are using u-boot
tools, so default to 'y'.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uboot-tools/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in
index f19739150c..9cc837c93a 100644
--- a/package/uboot-tools/Config.in
+++ b/package/uboot-tools/Config.in
@@ -15,6 +15,7 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
 
 config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
 	bool "fw_printenv"
+	default y
 	help
 	  The fw_printenv / fw_setenv tools from Das U-Boot
 	  bootloader, which allows access to the U-Boot environment

From e5decb1905708573e4741e786db7bbb8e1f93561 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Jul 2011 13:59:42 +0200
Subject: [PATCH 0445/6849] uboot: fix custom patch dir typo

Noticed by robinmholt on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/uboot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 142557995d..776bdefcbc 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -56,7 +56,7 @@ define UBOOT_APPLY_CUSTOM_PATCHES
 		uboot-$(UBOOT_VERSION)-\*.patch
 endef
 
-UBOOT_POST_PATCH_HOOKS += U_BOOT_APPLY_CUSTOM_PATCHES
+UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES
 endif
 
 define UBOOT_CONFIGURE_CMDS

From 8a6f23a42409a0784ffa38c262b50516516e56ef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Jul 2011 23:11:57 +0200
Subject: [PATCH 0446/6849] sdl: build alsa support if enabled

Ensure alsa-lib gets built before SDL if enabled, so the SDL configure
script correctly detects alsa support.

Noticed by Ayla on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 99488a60b4..af462c40d6 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -40,6 +40,10 @@ ifeq ($(BR2_PACKAGE_TSLIB),y)
 SDL_DEPENDENCIES += tslib
 endif
 
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+SDL_DEPENDENCIES += alsa-lib
+endif
+
 SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-arts \
 		--disable-esd \

From 424888e47431db738f5f9b3c6392435bfce7a842 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 20 Jul 2011 16:30:14 +0200
Subject: [PATCH 0447/6849] initramfs: fix boot with dynamic /dev

Devtmpfs (which is used by devtmpfs/mdev/udev options) doesn't get
automounted by the kernel when an initramfs is used, causing boot
failures when a dynamic /dev is used.

Fix it by adding a pre-init script to mount devtmpfs before running init.

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/initramfs/init         |  4 ++++
 fs/initramfs/initramfs.mk | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100755 fs/initramfs/init

diff --git a/fs/initramfs/init b/fs/initramfs/init
new file mode 100755
index 0000000000..751cb270f1
--- /dev/null
+++ b/fs/initramfs/init
@@ -0,0 +1,4 @@
+#!/bin/sh
+# devtmpfs does not get automounted for initramfs
+/bin/mount -t devtmpfs devtmpfs /dev
+exec /sbin/init $*
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 73122a8411..1cd48b6c8b 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -6,13 +6,26 @@
 #
 #############################################################
 
-define ROOTFS_INITRAMFS_INIT_SYMLINK
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+
+define ROOTFS_INITRAMFS_ADD_INIT
 	if [ ! -e $(TARGET_DIR)/init ]; then \
 		ln -sf sbin/init $(TARGET_DIR)/init; \
 	fi
 endef
 
-ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_INIT_SYMLINK
+else
+# devtmpfs does not get automounted when initramfs is used.
+# Add a pre-init script to mount it before running init
+define ROOTFS_INITRAMFS_ADD_INIT
+	if [ ! -e $(TARGET_DIR)/init ]; then \
+		$(INSTALL) -m 0755 fs/initramfs/init $(TARGET_DIR)/init; \
+	fi
+endef
+
+endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
+
+ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_ADD_INIT
 
 define ROOTFS_INITRAMFS_CMD
 	$(SHELL) fs/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@

From 7dae68a0fa24dd733bf70d6dee9b20c70e1041fc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 20 Jul 2011 23:51:17 +0200
Subject: [PATCH 0448/6849] zlib: always build host version dynamically

Host libraries should always be built using dynamic linking, rather than
static if BR2_PREFER_STATIC_LIB is enabled, as that then breaks dependent
libraries expecting a shared library.

Reported-by: Andy Kennedy <andy.kennedy@adtran.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zlib/zlib.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index dcd2548da8..18e7068ff2 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -31,9 +31,7 @@ define HOST_ZLIB_CONFIGURE_CMDS
 	(cd $(@D); rm -rf config.cache; \
 		$(HOST_CONFIGURE_ARGS) \
 		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(ZLIB_PIC)" \
 		./configure \
-		$(ZLIB_SHARED) \
 		--prefix="$(HOST_DIR)/usr" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 	)

From c74bce7de54ac631259982f8a78e4342a0ff637c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 20 Jul 2011 16:46:28 +0200
Subject: [PATCH 0449/6849] usbmount: bump to 0.0.21

[Peter: fix udev dep, use Debian mirrors, fix usbmount.rules install, uninstall]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbmount/Config.in               |  3 +-
 package/usbmount/usbmount-0.0.14.1.patch | 57 ------------------------
 package/usbmount/usbmount.mk             | 13 +++---
 3 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 package/usbmount/usbmount-0.0.14.1.patch

diff --git a/package/usbmount/Config.in b/package/usbmount/Config.in
index 5cf15be6a1..33e1f05f90 100644
--- a/package/usbmount/Config.in
+++ b/package/usbmount/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_USBMOUNT
 	bool "usbmount"
 	select BR2_PACKAGE_UDEV
-	select BR2_PACKAGE_UDEV_VOLUME_ID
 	select BR2_PACKAGE_LOCKFILE_PROGS
 	help
 	  The usbmount package automatically mounts USB mass storage devices
 	  when they are plugged in, and unmounts them when they are removed.
+
+	  http://usbmount.alioth.debian.org/
diff --git a/package/usbmount/usbmount-0.0.14.1.patch b/package/usbmount/usbmount-0.0.14.1.patch
deleted file mode 100644
index 22a5857d97..0000000000
--- a/package/usbmount/usbmount-0.0.14.1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur usbmount-0.0.14.1/usbmount usbmount-0.0.14.1-patched/usbmount
---- usbmount-0.0.14.1/usbmount	2007-01-27 05:22:14.000000000 -0600
-+++ usbmount-0.0.14.1-patched/usbmount	2007-03-15 07:25:18.000000000 -0500
-@@ -20,7 +20,7 @@
- log()
- {
-     if test $1 != debug || expr "$VERBOSE" : "[yY]" > /dev/null; then
--	logger -p user.$1 -t "usbmount[$$]" -- "$2"
-+	echo "usbmount[$$] -- $2" >> $LOGFILE
-     fi
- }
- 
-@@ -57,11 +57,11 @@
- if test "$1" = add; then
- 
-     # Acquire lock.
--    log debug "trying to acquire lock /var/run/usbmount/.mount.lock"
--    lockfile-create --retry 3 /var/run/usbmount/.mount || \
--	{ log err "cannot acquire lock /var/run/usbmount/.mount.lock"; exit 1; }
--    trap '( lockfile-remove /var/run/usbmount/.mount )' 0
--    log debug "acquired lock /var/run/usbmount/.mount.lock"
-+    log debug "trying to acquire lock /var/run/.usbmount.lock"
-+    lockfile-create --retry 5 /var/run/.usbmount || \
-+	{ log err "cannot acquire lock /var/run/.usbmount.lock"; exit 1; }
-+    trap '( lockfile-remove /var/run/.usbmount )' 0
-+    log debug "acquired lock /var/run/.usbmount.lock"
- 
-     # Try to read from the device.  Some devices need a few seconds
-     # initialization time before they can be accessed.  Give up after
-@@ -184,6 +184,7 @@
- 		log info "executing command: run-parts /etc/usbmount/umount.d"
- 		run-parts /etc/usbmount/umount.d || :
- 	    fi
-+	    lockfile-remove /var/run/.usbmount
- 	    break
- 	fi
-     done < /proc/mounts
-diff -ur usbmount-0.0.14.1/usbmount.conf usbmount-0.0.14.1-patched/usbmount.conf
---- usbmount-0.0.14.1/usbmount.conf	2005-04-08 09:05:10.000000000 -0500
-+++ usbmount-0.0.14.1-patched/usbmount.conf	2007-03-15 07:21:33.000000000 -0500
-@@ -17,7 +17,7 @@
- # sure all data is written to the medium before you remove it (e.g. run the #
- # "sync" command in a terminal window).  Otherwise, you *WILL* lose data!   #
- #############################################################################
--FILESYSTEMS="ext2 ext3"
-+FILESYSTEMS="ext2 ext3 msdos vfat"
- 
- # Mount options: Options passed to the mount command with the -o flag.
- # WARNING!  Removing "sync" from the options is a very bad idea and
-@@ -35,3 +35,7 @@
- # If set to "yes", more information will be logged via the syslog
- # facility.
- VERBOSE="no"
-+
-+# Location of the log file when verbose is Yes
-+LOGFILE="/var/log/usbmount.log"
-+
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 5925e5e69b..abe349dcfc 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -3,20 +3,23 @@
 # usbmount
 #
 #############################################################
-USBMOUNT_VERSION=0.0.14.1
-USBMOUNT_SOURCE:=usbmount_$(USBMOUNT_VERSION).tar.gz
-USBMOUNT_SITE:=http://usbmount.alioth.debian.org/package/
+USBMOUNT_VERSION = 0.0.21
+USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
+USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount
 USBMOUNT_DEPENDENCIES = udev lockfile-progs
 
 define USBMOUNT_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/sbin/usbmount
+	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
+	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
 	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
 	        $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
 	fi
 endef
 
 define USBMOUNT_UNINSTALL_TARGET_CMDS
-	rm -rf $(TARGET_DIR)/etc/usbmount $(TARGET_DIR)/sbin/usbmount
+	rm -rf $(TARGET_DIR)/etc/usbmount \
+	       $(TARGET_DIR)/usr/share/usbmount/usbmount \
+	       $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
 endef
 
 $(eval $(call GENTARGETS,package,usbmount))

From 4ec2e3bb53ec57e3b64b4b49918a5e8f53e1eb97 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Jul 2011 22:45:49 +0200
Subject: [PATCH 0450/6849] busybox: busybox-1.18.x.config: enable blkid applet

Needed by usbmount.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox-1.18.x.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox-1.18.x.config b/package/busybox/busybox-1.18.x.config
index 4c43b7a789..502048d22d 100644
--- a/package/busybox/busybox-1.18.x.config
+++ b/package/busybox/busybox-1.18.x.config
@@ -514,7 +514,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_REV is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
+CONFIG_BLKID=y
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FBSET is not set

From 301c17a35244bfa58df81d60ff6c9dcc90d55da0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Jul 2011 14:54:21 -0300
Subject: [PATCH 0451/6849] squid: bump to version 3.1.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 9427a797cd..2184f1a7c4 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.12
+SQUID_VERSION = 3.1.14
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_AUTORECONF = YES

From 055b8bce465d46810373ca1f9530fd1e896e9890 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Jul 2011 14:54:22 -0300
Subject: [PATCH 0452/6849] binutils: add version 2.21.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host               |  7 +++-
 .../binutils-2.21.1/110-arm-eabi-conf.patch   | 24 +++++++++++
 .../binutils-2.21.1/120-sh-conf.patch         | 42 +++++++++++++++++++
 .../300-001_ld_makefile_patch.patch           | 24 +++++++++++
 .../300-012_check_ldrunpath_length.patch      | 21 ++++++++++
 5 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch
 create mode 100644 package/binutils/binutils-2.21.1/120-sh-conf.patch
 create mode 100644 package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch
 create mode 100644 package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 4a5e8eff9a..a867b18b37 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -2,7 +2,7 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_21
+	default BR2_BINUTILS_VERSION_2_21_1
 	help
 	  Select the version of binutils you wish to use.
 
@@ -37,6 +37,10 @@ choice
 		depends on !BR2_avr32
 		bool "binutils 2.21"
 
+	config BR2_BINUTILS_VERSION_2_21_1
+		depends on !BR2_avr32
+		bool "binutils 2.21.1"
+
 endchoice
 
 config BR2_BINUTILS_VERSION
@@ -48,6 +52,7 @@ config BR2_BINUTILS_VERSION
 	default "2.20"		if BR2_BINUTILS_VERSION_2_20
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
+	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
diff --git a/package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch b/package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch
new file mode 100644
index 0000000000..af26329d90
--- /dev/null
+++ b/package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch
@@ -0,0 +1,24 @@
+diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
+--- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
++++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
+@@ -2245,7 +2245,7 @@ case "${target}" in
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     libgloss_dir=arm
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-*gnueabi)
+     noconfigdirs="$noconfigdirs target-qthreads"
+     noconfigdirs="$noconfigdirs target-libobjc"
+     case ${with_newlib} in
+diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
+--- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
++++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
+@@ -522,7 +522,7 @@ case "${target}" in
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     libgloss_dir=arm
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-*gnueabi)
+     noconfigdirs="$noconfigdirs target-qthreads"
+     noconfigdirs="$noconfigdirs target-libobjc"
+     case ${with_newlib} in
diff --git a/package/binutils/binutils-2.21.1/120-sh-conf.patch b/package/binutils/binutils-2.21.1/120-sh-conf.patch
new file mode 100644
index 0000000000..071d15a41b
--- /dev/null
+++ b/package/binutils/binutils-2.21.1/120-sh-conf.patch
@@ -0,0 +1,42 @@
+diff -rdup binutils-2.18.50.0.9.old/configure binutils-2.18.50.0.9/configure
+--- binutils-2.18.50.0.9.old/configure	2008-08-23 17:36:13.000000000 +0200
++++ binutils-2.18.50.0.9/configure	2008-10-14 14:25:22.000000000 +0200
+@@ -2281,7 +2281,7 @@ case "${target}" in
+   am33_2.0-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+-  sh-*-linux*)
++  sh*-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -2606,7 +2606,7 @@ case "${target}" in
+   romp-*-*)
+     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${host}" in
+       i[3456789]86-*-vsta) ;; # don't add gprof back in
+       i[3456789]86-*-go32*) ;; # don't add gprof back in
+diff -rdup binutils-2.18.50.0.9.old/configure.ac binutils-2.18.50.0.9/configure.ac
+--- binutils-2.18.50.0.9.old/configure.ac	2008-08-23 17:36:13.000000000 +0200
++++ binutils-2.18.50.0.9/configure.ac	2008-10-14 14:25:11.000000000 +0200
+@@ -530,7 +530,7 @@ case "${target}" in
+   am33_2.0-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;
+-  sh-*-linux*)
++  sh*-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     ;;    
+   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -855,7 +855,7 @@ case "${target}" in
+   romp-*-*)
+     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${host}" in
+       i[[3456789]]86-*-vsta) ;; # don't add gprof back in
+       i[[3456789]]86-*-go32*) ;; # don't add gprof back in
diff --git a/package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..5cb0f614d8
--- /dev/null
+++ b/package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch
@@ -0,0 +1,24 @@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
+@@ -18,7 +18,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
+@@ -287,7 +287,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..df783109bb
--- /dev/null
+++ b/package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1497,6 +1499,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)

From 0279d9e327fba69481078fd3dbb275b8556ce8b7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Jul 2011 14:54:23 -0300
Subject: [PATCH 0453/6849] iptables: bump to version 1.4.11.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 8652de434e..13d2ac309a 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.10
+IPTABLES_VERSION = 1.4.11.1
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 4e7283604f584c79b928a4d90a98a8037c36f08e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Jul 2011 14:54:24 -0300
Subject: [PATCH 0454/6849] iproute2: bump to version 2.6.39

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2-xt-v6.patch | 39 +++++++++++++++++++++++++++
 package/iproute2/iproute2.mk          |  3 +--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 package/iproute2/iproute2-xt-v6.patch

diff --git a/package/iproute2/iproute2-xt-v6.patch b/package/iproute2/iproute2-xt-v6.patch
new file mode 100644
index 0000000000..4856e3609d
--- /dev/null
+++ b/package/iproute2/iproute2-xt-v6.patch
@@ -0,0 +1,39 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Forwarded: yes
+Subject: [PATCH] iproute2: Fix building xt module against xtables version 6
+
+
+diff --git a/tc/m_xt.c b/tc/m_xt.c
+index 651a59e..13bf19f 100644
+--- a/tc/m_xt.c
++++ b/tc/m_xt.c
+@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p,
+ 					return -1;
+ 				}
+ 				tcipt_globals.opts =
+-				    xtables_merge_options(tcipt_globals.opts,
+-				                          m->extra_opts,
+-				                          &m->option_offset);
++				    xtables_merge_options(
++#if (XTABLES_VERSION_CODE >= 6)
++				        tcipt_globals.orig_opts,
++#endif
++				        tcipt_globals.opts,
++				        m->extra_opts,
++				        &m->option_offset);
+ 			} else {
+ 				fprintf(stderr," failed to find target %s\n\n", optarg);
+ 				return -1;
+@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
+ 			}
+ 
+ 			tcipt_globals.opts =
+-			    xtables_merge_options(tcipt_globals.opts,
++			    xtables_merge_options(
++#if (XTABLES_VERSION_CODE >= 6)
++				                  tcipt_globals.orig_opts,
++#endif
++				                  tcipt_globals.opts,
+ 			                          m->extra_opts,
+ 			                          &m->option_offset);
+ 		} else {
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 630fab4c5a..fd78b3c45d 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,8 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 2.6.38
-IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
+IPROUTE2_VERSION = 2.6.39
 IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 

From 9bd1fab4ea7721b40d9b72db6a46688a83e292fa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Jul 2011 23:10:33 +0200
Subject: [PATCH 0455/6849] iproute2: ensure TARGET_CFLAGS are used

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index fd78b3c45d..bafb8c06f4 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -29,13 +29,12 @@ define IPROUTE2_CONFIGURE_CMDS
 	rm -r $(IPROUTE2_DIR)/include/netinet
 	# arpd needs berkeleydb
 	$(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(IPROUTE2_DIR)/Makefile
 	echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config
 	$(IPROUTE2_WITH_IPTABLES)
 endef
 
 define IPROUTE2_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" -C $(@D)
+	$(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
 endef
 
 define IPROUTE2_INSTALL_TARGET_CMDS

From d1f711a7d24783fcb3fc6ef04b0c723d65058369 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Jul 2011 07:31:49 +0200
Subject: [PATCH 0456/6849] iptables: unbreak build without ipv6 support

Patch submitted upstream, but so far not committed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._TCPMSS.c-unbreak-build-without-ipv6.patch | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 package/iptables/iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch

diff --git a/package/iptables/iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch b/package/iptables/iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
new file mode 100644
index 0000000000..4d3c88f2d3
--- /dev/null
+++ b/package/iptables/iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
@@ -0,0 +1,72 @@
+From b5bfbb9fcac3d4c87bcf6da55ed40d63d456017d Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Fri, 22 Jul 2011 07:19:09 +0200
+Subject: [PATCH] libxt_TCPMSS.c: unbreak build without ipv6 after ea2a02f7
+
+ea2a02f7 (libxt_TCPMSS: use guided option parser) added an netinet/ip6.h
+include, which is not available on systems without ipv6.
+
+The ip.h / ipv6.h includes are only used to know the size of struct
+iphdr / ip6_hdr, so simply hardcode those instead.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ extensions/libxt_TCPMSS.c |   13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c
+index 2266326..310dd17 100644
+--- a/extensions/libxt_TCPMSS.c
++++ b/extensions/libxt_TCPMSS.c
+@@ -4,8 +4,6 @@
+ */
+ #include <stdio.h>
+ #include <xtables.h>
+-#include <netinet/ip.h>
+-#include <netinet/ip6.h>
+ #include <linux/netfilter/xt_TCPMSS.h>
+ 
+ enum {
+@@ -13,6 +11,9 @@ enum {
+ 	O_CLAMP_MSS,
+ };
+ 
++#define IPHDRSIZE	20	/* sizeof(struct iphdr) */
++#define IP6HDRSIZE	40	/* sizeof(struct ip6_hdr) */
++
+ struct mssinfo {
+ 	struct xt_entry_target t;
+ 	struct xt_tcpmss_info mss;
+@@ -29,17 +30,17 @@ hdrsize);
+ 
+ static void TCPMSS_help(void)
+ {
+-	__TCPMSS_help(sizeof(struct iphdr));
++	__TCPMSS_help(IPHDRSIZE);
+ }
+ 
+ static void TCPMSS_help6(void)
+ {
+-	__TCPMSS_help(sizeof(struct ip6_hdr));
++	__TCPMSS_help(IP6HDRSIZE);
+ }
+ 
+ static const struct xt_option_entry TCPMSS4_opts[] = {
+ 	{.name = "set-mss", .id = O_SET_MSS, .type = XTTYPE_UINT16,
+-	 .min = 0, .max = UINT16_MAX - sizeof(struct iphdr),
++	 .min = 0, .max = UINT16_MAX - IPHDRSIZE,
+ 	 .flags = XTOPT_PUT, XTOPT_POINTER(struct xt_tcpmss_info, mss)},
+ 	{.name = "clamp-mss-to-pmtu", .id = O_CLAMP_MSS, .type = XTTYPE_NONE},
+ 	XTOPT_TABLEEND,
+@@ -47,7 +48,7 @@ static const struct xt_option_entry TCPMSS4_opts[] = {
+ 
+ static const struct xt_option_entry TCPMSS6_opts[] = {
+ 	{.name = "set-mss", .id = O_SET_MSS, .type = XTTYPE_UINT16,
+-	 .min = 0, .max = UINT16_MAX - sizeof(struct ip6_hdr),
++	 .min = 0, .max = UINT16_MAX - IP6HDRSIZE,
+ 	 .flags = XTOPT_PUT, XTOPT_POINTER(struct xt_tcpmss_info, mss)},
+ 	{.name = "clamp-mss-to-pmtu", .id = O_CLAMP_MSS, .type = XTTYPE_NONE},
+ 	XTOPT_TABLEEND,
+-- 
+1.7.5.4
+

From c1ac6ce60e9d4bb0c611aeae604033228af15e68 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Jul 2011 07:32:58 +0200
Subject: [PATCH 0457/6849] iptables: largefile support not required anymore

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/iptables/Config.in b/package/iptables/Config.in
index da5a832a2f..8c4e989fcc 100644
--- a/package/iptables/Config.in
+++ b/package/iptables/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_IPTABLES
 	bool "iptables"
-	depends on BR2_LARGEFILE
 	help
 	  Linux kernel (2.4+) firewall, NAT, and packet mangling tools.
 
 	  http://www.iptables.org/
-
-comment "iptables requires a toolchain with LARGEFILE support"
-        depends on !BR2_LARGEFILE

From bea473a4d4a949388826679abd53e3d43573a639 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Jul 2011 16:49:56 -0300
Subject: [PATCH 0458/6849] libmnl: new package

[Peter: needs largefile support]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libmnl/Config.in | 11 +++++++++++
 package/libmnl/libmnl.mk | 12 ++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libmnl/Config.in
 create mode 100644 package/libmnl/libmnl.mk

diff --git a/package/Config.in b/package/Config.in
index a01f8d2779..981a633dce 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -324,6 +324,7 @@ source "package/libeXosip2/Config.in"
 source "package/libidn/Config.in"
 source "package/libmicrohttpd/Config.in"
 source "package/neon/Config.in"
+source "package/libmnl/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
diff --git a/package/libmnl/Config.in b/package/libmnl/Config.in
new file mode 100644
index 0000000000..87475df5af
--- /dev/null
+++ b/package/libmnl/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBMNL
+	bool "libmnl"
+	depends on BR2_LARGEFILE
+	help
+	  libmnl is a minimalistic user-space library oriented
+	  to Netlink developers.
+
+	  http://netfilter.org/projects/libmnl/
+
+comment "libmnl requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
new file mode 100644
index 0000000000..6749756b7e
--- /dev/null
+++ b/package/libmnl/libmnl.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libmnl
+#
+#############################################################
+
+LIBMNL_VERSION = 1.0.1
+LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
+LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
+LIBMNL_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libmnl))

From 6a7611b540677a072656e481d4735f2b4b6a3381 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Jul 2011 16:49:57 -0300
Subject: [PATCH 0459/6849] ipset: new package

Add ipset support package.
Note that this requires bleeding edge (>=2.6.39) kernel version or
patches.

[Peter: needs largefile, host-pkg-config]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/ipset/Config.in | 12 ++++++++++++
 package/ipset/ipset.mk  | 13 +++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/ipset/Config.in
 create mode 100644 package/ipset/ipset.mk

diff --git a/package/Config.in b/package/Config.in
index 981a633dce..b9bd529924 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -407,6 +407,7 @@ source "package/ifplugd/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
+source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
diff --git a/package/ipset/Config.in b/package/ipset/Config.in
new file mode 100644
index 0000000000..af16fa837c
--- /dev/null
+++ b/package/ipset/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_IPSET
+	bool "ipset"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBMNL
+	help
+	  Utility to manage IP sets in the linux kernel.
+	  Requires a patched kernel or version >=2.6.39.
+
+	  http://ipset.netfilter.org/
+
+comment "ipset requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
new file mode 100644
index 0000000000..9d901fc53e
--- /dev/null
+++ b/package/ipset/ipset.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# ipset
+#
+#############################################################
+
+IPSET_VERSION = 6.8
+IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
+IPSET_SITE = http://ipset.netfilter.org
+IPSET_AUTORECONF = YES
+IPSET_DEPENDENCIES = libmnl host-pkg-config
+
+$(eval $(call AUTOTARGETS,package,ipset))

From d58aab892ec95b9a4bdb48a15440212cd7f23d77 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Jul 2011 09:08:36 +0200
Subject: [PATCH 0460/6849] kernel-headers: add 3.0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in         | 6 +++++-
 toolchain/kernel-headers/kernel-headers.mk | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 774810f5d9..bc8a024ed2 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_2_6_39
+	default BR2_KERNEL_HEADERS_3_0
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -30,6 +30,9 @@ choice
 	config BR2_KERNEL_HEADERS_2_6_39
 		bool "Linux 2.6.39.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_0
+		bool "Linux 3.0.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -51,5 +54,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.3"	if BR2_KERNEL_HEADERS_2_6_39
+	default "3.0"		if BR2_KERNEL_HEADERS_3_0
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 079497ae31..ce70cab3a1 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -26,7 +26,11 @@ SUBLEVEL:=$(if $(SUBLEVEL),.$(SUBLEVEL),)
 EXTRAVERSION:=$(if $(EXTRAVERSION),.$(EXTRAVERSION),)
 
 LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL)$(SUBLEVEL)$(EXTRAVERSION)
+ifeq ($(findstring x2.6.,x$(DEFAULT_KERNEL_HEADERS)),x2.6.)
 LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+else
+LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v3.0/
+endif
 LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
 LINUX_HEADERS_CAT:=$(BZCAT)
 LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION)

From ca99c04d2676ba66b670b0eb17ed5fe5d37db4e2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 22 Jul 2011 13:51:45 +0200
Subject: [PATCH 0461/6849] ipset: ensure target kernel headers are used

ipsets configure script checks the kernel headers to ensure the kernel
is new enough / has patch applied, and errors out if this is not so.

Ensure that the target kernel headers are searched, rather than
what is available on the build host.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 9d901fc53e..700d2bc229 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -9,5 +9,6 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
 IPSET_DEPENDENCIES = libmnl host-pkg-config
+IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)
 
 $(eval $(call AUTOTARGETS,package,ipset))

From aa7a46d612654f7a03b19edacc9a8b1416012295 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Jul 2011 14:02:25 +0200
Subject: [PATCH 0462/6849] bind: fix intermittent build issues with high
 BR2_JLEVEL

Build sometimes breaks with:

libtool: link: `unix/os.lo' is not a valid libtool object
make[3]: *** [rndc-confgen] Error 1
make[3]: *** Waiting for unfinished jobs....
make[4]: Leaving directory `/scratch/peko/build/bind-9.6-ESV-R4/bin/rndc/unix'

So disable parallel builds.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 2df6ae8e33..0530934be3 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -6,6 +6,7 @@
 
 BIND_VERSION = 9.6-ESV-R4
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
+BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
 BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen dnssec-dsfromkey
 BIND_TARGET_SBINS += dnssec-keyfromlabel dnssec-keygen dnssec-signzone

From 332dd196cad4fa1a9b0257b08091b902efa5a7c2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 22 Jul 2011 15:02:48 -0300
Subject: [PATCH 0463/6849] iptables: fixup multitarget binary links

Newer vesions renamed iptables-multi to xtables-multi so fix
the symlinks accordingly.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 13d2ac309a..c464e6b488 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -14,15 +14,15 @@ IPTABLES_DEPENDENCIES = host-pkg-config
 IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR)
 
 define IPTABLES_TARGET_SYMLINK_CREATE
-	ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables
-	ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-save
-	ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-restore
+	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables
+	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-save
+	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-restore
 endef
 
 define IPTABLES_TARGET_IPV6_SYMLINK_CREATE
-	ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables
-	ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save
-	ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore
+	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables
+	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save
+	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore
 endef
 
 define IPTABLES_TARGET_IPV6_REMOVE
@@ -40,6 +40,7 @@ endif
 define IPTABLES_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/iptables-xml
 	rm -f $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/sbin/ip6tables*
+	rm -f $(TARGET_DIR)/usr/sbin/xtables-multi
 	rm -rf $(TARGET_DIR)/usr/lib/xtables
 endef
 

From ba930bbc19fee322572bf804b8d4c3a487adbdc2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 22 Jul 2011 12:27:29 -0300
Subject: [PATCH 0464/6849] iproute2: fixup CCOPTS to unbreak build

CCOPTS is also used for HOSTCC in the netem/ directory which contains
host tools so just ditch it there to avoid extra non-native
optimizations to sweep by.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index bafb8c06f4..0e6a431b98 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -34,6 +34,7 @@ define IPROUTE2_CONFIGURE_CMDS
 endef
 
 define IPROUTE2_BUILD_CMDS
+	$(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile
 	$(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
 endef
 

From cae6d2397bfb49cda38d5ba629e049a959eede8a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 20 Jul 2011 07:11:52 +0200
Subject: [PATCH 0465/6849] scons: new package

Only the host package is supported.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/scons/scons.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 package/scons/scons.mk

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
new file mode 100644
index 0000000000..f8fe84b3ae
--- /dev/null
+++ b/package/scons/scons.mk
@@ -0,0 +1,13 @@
+SCONS_VERSION = 2.0.1
+SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
+SCONS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/scons
+
+define HOST_SCONS_BUILD_CMDS
+	(cd $(@D); python setup.py build)
+endef
+
+define HOST_SCONS_INSTALL_CMDS
+	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr)
+endef
+
+$(eval $(call GENTARGETS,package,scons,host))

From 9683d4f11aa39975d8ed006b86f7fda4f59876c6 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 09:27:32 +0200
Subject: [PATCH 0466/6849] gst-plugins-good: update configuration options

Update the list of plugins that can be selected/deselected.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/Config.in  |  9 +++++++++
 .../gst-plugins-good/gst-plugins-good.mk       | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 368642f6c1..b431603663 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -82,6 +82,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX
 	bool "icydemux"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE
+	bool "imagefreeze"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE
 	bool "interleave"
 
@@ -127,6 +130,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP
 	bool "rtsp"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE
+	bool "shapewipe"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE
 	bool "smpte"
 
@@ -180,6 +186,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
 	bool "ossaudio (OSS audio)"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
+	bool "oss4 (Open Sound System 4)"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
 	select BR2_PACKAGE_LIBSOUP
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 8fbd120a91..ff7b4c0c8b 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -144,6 +144,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-interleave
 else
@@ -234,6 +240,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-smpte
 else
@@ -321,6 +333,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-oss
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-soup
 GST_PLUGINS_GOOD_DEPENDENCIES += libsoup

From ce0b61a7a5864818451e190aa040e87b369b5e72 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 09:27:33 +0200
Subject: [PATCH 0467/6849] gst-plugins-ugly: update configuration options

Remove the option for the libid3tag plug-in as is not any longer
found in gst-plugins-ugly.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-ugly/Config.in           | 4 ----
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/package/multimedia/gst-plugins-ugly/Config.in b/package/multimedia/gst-plugins-ugly/Config.in
index 9f738cf175..e20426f1b8 100644
--- a/package/multimedia/gst-plugins-ugly/Config.in
+++ b/package/multimedia/gst-plugins-ugly/Config.in
@@ -38,10 +38,6 @@ config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA
 
 comment "plugins with external dependencies (there may be more available)"
 
-config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG
-	bool "id3tag"
-	select BR2_PACKAGE_LIBID3TAG
-
 config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD
 	bool "mad (*.mp3 audio)"
 	select BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index a173df1943..da214a194a 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -60,13 +60,6 @@ else
 GST_PLUGINS_UGLY_CONF_OPT += --disable-synaesthesia
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-id3tag
-GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag
-else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-id3tag
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y)
 GST_PLUGINS_UGLY_CONF_OPT += --enable-mad
 GST_PLUGINS_UGLY_DEPENDENCIES += libmad

From 8d3b7283faceedf71797b4e53ac8dba0cda9b7e2 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Sat, 16 Jul 2011 00:33:00 +0200
Subject: [PATCH 0468/6849] gst-plugins-ugly: fix dependencies for mad MP3
 decoder plug-in

The mad plug-in depends on libid3tag. This dependency used to be
implicit by selecting the id3tag plug-in. Now that this plug-in
is not any longer part of gst-plugins-ugly we need an explicit
dependency on libid3tag.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-ugly/Config.in           | 2 +-
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/gst-plugins-ugly/Config.in b/package/multimedia/gst-plugins-ugly/Config.in
index e20426f1b8..94e2b9d554 100644
--- a/package/multimedia/gst-plugins-ugly/Config.in
+++ b/package/multimedia/gst-plugins-ugly/Config.in
@@ -40,7 +40,7 @@ comment "plugins with external dependencies (there may be more available)"
 
 config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD
 	bool "mad (*.mp3 audio)"
-	select BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG
+	select BR2_PACKAGE_LIBID3TAG
 	select BR2_PACKAGE_LIBMAD
 
 config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index da214a194a..ab557a386d 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -62,7 +62,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y)
 GST_PLUGINS_UGLY_CONF_OPT += --enable-mad
-GST_PLUGINS_UGLY_DEPENDENCIES += libmad
+GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
 else
 GST_PLUGINS_UGLY_CONF_OPT += --disable-mad
 endif

From cf0114a41827ea80d4f70b3024a58f6eece4774c Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 14 Jul 2011 09:32:39 +0200
Subject: [PATCH 0469/6849] orc: new package

Orc - the Oil Runtime Compiler - is the successor of liboil.
There's a runtime library that is installed in staging and target
and there's a host version that can be built if orcc, the ORC
compiler is needed at build time.

[Peter: minor tweaks]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |  1 +
 package/orc/Config.in |  7 +++++++
 package/orc/orc.mk    | 10 ++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/orc/Config.in
 create mode 100644 package/orc/orc.mk

diff --git a/package/Config.in b/package/Config.in
index b9bd529924..28e55700cb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -346,6 +346,7 @@ source "package/libglib2/Config.in"
 source "package/libnspr/Config.in"
 source "package/liboil/Config.in"
 source "package/libsigc/Config.in"
+source "package/orc/Config.in"
 source "package/startup-notification/Config.in"
 endmenu
 
diff --git a/package/orc/Config.in b/package/orc/Config.in
new file mode 100644
index 0000000000..1de0f235fd
--- /dev/null
+++ b/package/orc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ORC
+	bool "orc"
+	help
+	  Orc is a library and set of tools for compiling and executing
+	  very simple programs that operate on arrays of data.
+
+	  http://code.entropywave.com/projects/orc/
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
new file mode 100644
index 0000000000..f89d5cf93e
--- /dev/null
+++ b/package/orc/orc.mk
@@ -0,0 +1,10 @@
+#############################################################
+#
+# orc
+#
+#############################################################
+ORC_VERSION = 0.4.14
+ORC_SITE = http://code.entropywave.com/download/orc/
+ORC_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,orc))

From 82e840e72ec51dbb7058404b046e6fc72a187c04 Mon Sep 17 00:00:00 2001
From: Frederik Pasch <fpasch@googlemail.com>
Date: Sun, 24 Jul 2011 23:51:44 +0200
Subject: [PATCH 0470/6849] nfs-utils: replace legacy index() function by
 strchr()

Closes #3961

Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                       |  1 +
 .../nfs-utils-1.2.3-susv3-legacy.patch        | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch

diff --git a/CHANGES b/CHANGES
index 7f8cb82dae..8396dce9a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,7 @@
 	#3595: patch to add libroxml
 	#3565: libnss: Add new package
 	#3907: 2011.05 - Qt 4.7.3 not building on ARM
+	#3961: Nfs-utils: Remove SUSv3-function index
 	#3985: "help" target's defconfig list needs sort
 
 2011.05, Released May 27th, 2011:
diff --git a/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch b/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch
new file mode 100644
index 0000000000..3504e2d72f
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch
@@ -0,0 +1,54 @@
+Use the strchr() function instead of the legacy index() function.
+
+Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
+--- 1/utils/mountd/fsloc.c
++++ 2/utils/mountd/fsloc.c
+@@ -126,7 +126,7 @@
+ 	struct servers *rv=NULL;
+ 
+ 	xlog(L_NOTICE, "method_list(%s)\n", data);
+-	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
++	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
+ 		ptr++;
+ 	list = malloc(listsize * sizeof(char *));
+ 	copy = strdup(data);
+--- 1/support/nfs/nfs_mntent.c
++++ 2/support/nfs/nfs_mntent.c
+@@ -9,7 +9,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <string.h>		/* for index */
++#include <string.h>		/* for strchr */
+ #include <ctype.h>		/* for isdigit */
+ #include <sys/stat.h>		/* for umask */
+ 
+@@ -163,7 +163,7 @@
+ 			return NULL;
+ 
+ 		mfp->mntent_lineno++;
+-		s = index (buf, '\n');
++		s = strchr (buf, '\n');
+ 		if (s == NULL) {
+ 			/* Missing final newline?  Otherwise extremely */
+ 			/* long line - assume file was corrupted */
+@@ -171,7 +171,7 @@
+ 				fprintf(stderr, _("[mntent]: warning: no final "
+ 					"newline at the end of %s\n"),
+ 					mfp->mntent_file);
+-				s = index (buf, 0);
++				s = strchr (buf, 0);
+ 			} else {
+ 				mfp->mntent_errs = 1;
+ 				goto err;
+--- 1/utils/mount/error.c
++++ 2/utils/mount/error.c
+@@ -62,7 +62,7 @@
+ 	char *tmp;
+ 
+ 	if (estr) {
+-		if ((ptr = index(estr, ':')))
++		if ((ptr = strchr(estr, ':')))
+ 			estr = ++ptr;
+ 
+ 		tmp = &errbuf[spos];

From 80eeabc55d3c38d628b43f45545dcb56f5b06bee Mon Sep 17 00:00:00 2001
From: Benoit Mauduit <benoit.mauduit@openwide.fr>
Date: Mon, 16 May 2011 17:25:44 +0200
Subject: [PATCH 0471/6849] busybox: Add busybox-xconfig and busybox-gconfig
 rules

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 8998ca083c..1782a730cb 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -178,8 +178,9 @@ endef
 
 $(eval $(call GENTARGETS,package,busybox))
 
-busybox-menuconfig: busybox-patch
-	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) menuconfig
+busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
+	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \
+		$(subst busybox-,,$@)
 	rm -f $(BUSYBOX_DIR)/.stamp_built
 	rm -f $(BUSYBOX_DIR)/.stamp_target_installed
 

From 9dc7b73f3bf70740e954a80417b47c4458e7608b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Jul 2011 00:09:33 +0200
Subject: [PATCH 0472/6849] System config: split static-dev device table
 setting into seperate option

As discussed here:

http://lists.busybox.net/pipermail/buildroot/2011-May/043251.html

Add BR2_ROOTFS_STATIC_DEVICE_TABLE for the extra device table file(s)
to create device nodes in /dev, rather than complicated logic in
BR2_ROOTFS_DEVICE_TABLE, making it complicated to move between static
and dynamic modes.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/common.mk             |  3 ++-
 target/generic/Config.in | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index 4d5051460d..f793ff962b 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -33,7 +33,8 @@
 
 FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
 FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
-ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
+ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) \
+	$(call qstrip,$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
 
 define ROOTFS_TARGET_INTERNAL
 
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 7961beccc8..a91de32124 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -33,18 +33,25 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 endchoice
 
 config BR2_ROOTFS_DEVICE_TABLE
+	string "Path to the permission tables"
+	default "target/generic/device_table.txt"
+	help
+	  Specify a space-separated list of permission table locations,
+	  that will be passed to the makedevs utility to assign
+	  correct owners and permissions on various files in the
+	  target filesystem.
+
+	  See package/makedevs/README for details on the usage and
+	  syntax of these files.
+
+config BR2_ROOTFS_STATIC_DEVICE_TABLE
 	string "Path to the device tables"
-	default "target/generic/device_table.txt target/generic/device_table_dev.txt" \
-		if BR2_ROOTFS_DEVICE_CREATION_STATIC
-	default "target/generic/device_table.txt" \
-		if (BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV || \
-		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
-		    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS)
+	default "target/generic/device_table_dev.txt"
+	depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
 	help
 	  Specify a space-separated list of device table locations,
 	  that will be passed to the makedevs utility to create all
-	  the special device files and assign correct owners and
-	  permissions on various files in the target filesystem.
+	  the special device files under /dev.
 
 	  See package/makedevs/README for details on the usage and
 	  syntax of these files.

From 0af4136c544aecf7950a76996fd76cc8c208d604 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 18 Jul 2011 14:11:39 +0200
Subject: [PATCH 0473/6849] e2fsprogs: Add missing dependency of tst_uuid.o on
 uuid.h

The missing dependency used to break parallel builds.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-1.41.9-add-missing-dep-of-tst_uuid-o.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch

diff --git a/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
new file mode 100644
index 0000000000..3a60e89461
--- /dev/null
+++ b/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
@@ -0,0 +1,18 @@
+Add missing dependency of tst_uuid.o on uuid.h
+
+The missing dependency used to break parallel builds.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
+--- e2fsprogs.orig//lib/uuid/Makefile.in	2010-06-14 05:07:36.000000000 +0200
++++ e2fsprogs-1.41.14//lib/uuid/Makefile.in	2011-07-18 13:44:58.000000000 +0200
+@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
+ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
+ 	cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
+ 
+-tst_uuid.o: $(srcdir)/tst_uuid.c
++tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
+ 	$(E) "	CC $@"
+ 	$(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+ 

From ec8eda419a54674a0d326ea25bd9c440cd059065 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 23 Jun 2011 12:21:21 +0300
Subject: [PATCH 0474/6849] toolchain: add user defined target LDFLAGS options

Allow the user to specify additional options for the target LDFLAGS.

I use this to pass the -te500v2 option to the linker, when using the
CodeSourcery toolchain for PowerPC. This chooses the correct CRT for e500 hard
float. Otherwise I get errors like

undefined reference to `_save32gpr_31'
undefined reference to `_rest32gpr_31_x'

at final link time.

[Peter: fixup, use qstrip]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in           | 1 +
 toolchain/toolchain-common.in | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index 8e9637ce8d..c3af5d3ea5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -77,6 +77,7 @@ TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
+TARGET_LDFLAGS=$(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 4a2f3795b1..bbb7be627e 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -96,3 +96,8 @@ config BR2_TARGET_OPTIMIZATION
 	help
 	  Optimizations to use when building for the target host.
 	  NOTE: gcc optimization level is defined in build options.
+
+config BR2_TARGET_LDFLAGS
+	string "Target linker options"
+	help
+	  Extra options to pass to the linker when buiding for the target.

From b96193a4b53e0c6661c722aa4e91e7cfb7608cef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Jul 2011 08:44:26 +0200
Subject: [PATCH 0475/6849] xorg-xserver: configure needs pkg-config

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 0311483904..70ba8b20fd 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -54,7 +54,8 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xkeyboard-config		\
 	pixman 				\
 	openssl 			\
-	mcookie
+	mcookie 			\
+	host-pkg-config
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--disable-xnest --disable-xephyr --disable-xvfb \

From afce67a9029dbcc1eec0b011ed2daa4559455310 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 27 Apr 2011 10:32:48 +0200
Subject: [PATCH 0476/6849] New package: ti-utils

Add the calibrator and other useful utilities for TI wireless solution,
based on wl12xx driver.

See http://linuxwireless.org/en/users/Drivers/wl12xx/calibrator for
further details.

[Peter: add libnl Config.in dependency]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/ti-utils/Config.in   |  8 ++++++++
 package/ti-utils/ti-utils.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/ti-utils/Config.in
 create mode 100644 package/ti-utils/ti-utils.mk

diff --git a/package/Config.in b/package/Config.in
index 28e55700cb..dfa6e35c19 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -206,6 +206,7 @@ source "package/sredird/Config.in"
 source "package/sshfs/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
+source "package/ti-utils/Config.in"
 source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
 source "package/usb_modeswitch/Config.in"
diff --git a/package/ti-utils/Config.in b/package/ti-utils/Config.in
new file mode 100644
index 0000000000..02ae336dcc
--- /dev/null
+++ b/package/ti-utils/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_TI_UTILS
+	bool "ti-utils"
+	select BR2_PACKAGE_LIBNL
+	help
+	  The calibrator and other useful utilities for TI wireless solution,
+	  based on wl12xx driver.
+
+	  http://linuxwireless.org/en/users/Drivers/wl12xx/calibrator
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
new file mode 100644
index 0000000000..8f35b5922c
--- /dev/null
+++ b/package/ti-utils/ti-utils.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# ti-utils
+#
+#############################################################
+
+TI_UTILS_VERSION = fbceab8f228cff80fd29b830bb85a188c69def08
+TI_UTILS_SITE = git://github.com/gxk/ti-utils.git
+TI_UTILS_DEPENDENCIES = libnl
+
+define TI_UTILS_BUILD_CMDS
+	$(MAKE1) NFSROOT="$(STAGING_DIR)" CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
+		-C $(@D) all
+endef
+
+define TI_UTILS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(@D)/calibrator \
+		$(TARGET_DIR)/usr/bin/calibrator
+	$(INSTALL) -m 0755 $(@D)/scripts/go.sh \
+		$(TARGET_DIR)/usr/bin/go.sh
+endef
+
+define TI_UTILS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/calibrator
+	rm -f $(TARGET_DIR)/usr/bin/go.sh
+endef
+
+$(eval $(call GENTARGETS,package,ti-utils))
+

From 53f8882d445b8ce3fc2745c10f90d30cbb1384ec Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Jul 2011 14:16:35 +0200
Subject: [PATCH 0477/6849] libdrm: configure needs pkg-config

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdrm/libdrm.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index fe7a46fcea..f1d7c314c1 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -8,7 +8,14 @@ LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
 LIBDRM_INSTALL_STAGING = YES
 
-LIBDRM_DEPENDENCIES = xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xproto_dri2proto pthread-stubs
+LIBDRM_DEPENDENCIES = \
+	xproto_glproto \
+	xproto_xf86vidmodeproto \
+	xlib_libXxf86vm \
+	xlib_libXmu \
+	xproto_dri2proto \
+	pthread-stubs \
+	host-pkg-config
 
 ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)
 LIBDRM_CONF_OPT += --enable-intel

From 43a2e623870e0b5c562794f632b3e27eaac5e900 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Jul 2011 16:26:40 +0200
Subject: [PATCH 0478/6849] hostapd: fix libnl linking with
 BR2_PREFER_STATIC_LIB

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index f097e75e68..d733999dd0 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -10,6 +10,13 @@ HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
 
+HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
+
+# libnl needs -lm (for rint) if linking statically
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+HOSTAPD_LDFLAGS += -lm
+endif
+
 define HOSTAPD_LIBNL_CONFIG
 	echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG)
 endef
@@ -72,7 +79,7 @@ define HOSTAPD_CONFIGURE_CMDS
 	cp $(@D)/$(HOSTAPD_SUBDIR)/defconfig $(HOSTAPD_CONFIG)
 	$(SED) "s/\/local//" $(@D)/$(HOSTAPD_SUBDIR)/Makefile
 	echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG)
-	echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(HOSTAPD_CONFIG)
+	echo "LDFLAGS += $(HOSTAPD_LDFLAGS)" >>$(HOSTAPD_CONFIG)
 	echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG)
 # Drivers
 	$(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG)

From c663498aac2a82e73e8cc3d604a1637502a49e21 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Jul 2011 23:06:29 +0200
Subject: [PATCH 0479/6849] package: remove hal

Hal is deprecated upstream, our package has not seen any significant
work since it was added in 2007, nothing depends on it and it's blocking
a long-overdue udev update.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 -
 package/gvfs/gvfs.mk                          |   8 +-
 package/hal/Config.in                         |  19 --
 package/hal/S98haldaemon                      |  56 ----
 package/hal/hal-include-fix.patch             |  35 ---
 package/hal/hal.mk                            | 107 -------
 package/hal/hal02-include-ieee80211-fix.patch |  15 -
 package/hal/hal03-link-dbus.patch             |  60 ----
 .../hal/hal04-remove-glib-dbus-headers.patch  | 275 ------------------
 package/hal/hal05-libtool-hack.patch          |  13 -
 package/hal/hal06-libintl.patch               |  24 --
 11 files changed, 1 insertion(+), 612 deletions(-)
 delete mode 100644 package/hal/Config.in
 delete mode 100755 package/hal/S98haldaemon
 delete mode 100644 package/hal/hal-include-fix.patch
 delete mode 100644 package/hal/hal.mk
 delete mode 100644 package/hal/hal02-include-ieee80211-fix.patch
 delete mode 100644 package/hal/hal03-link-dbus.patch
 delete mode 100644 package/hal/hal04-remove-glib-dbus-headers.patch
 delete mode 100644 package/hal/hal05-libtool-hack.patch
 delete mode 100644 package/hal/hal06-libintl.patch

diff --git a/package/Config.in b/package/Config.in
index dfa6e35c19..812a730d16 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -170,7 +170,6 @@ source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
 source "package/gpsd/Config.in"
 source "package/gvfs/Config.in"
-source "package/hal/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hdparm/Config.in"
 endif
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index b0fcf3d557..37b4accf99 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -20,6 +20,7 @@ GVFS_CONF_OPT = \
 	--disable-gphoto2		\
 	--disable-keyring		\
 	--disable-bash-completion	\
+	--disable-hal
 
 ifeq ($(BR2_PACKAGE_AVAHI),y)
 GVFS_DEPENDENCIES += avahi
@@ -28,13 +29,6 @@ else
 GVFS_CONF_OPT += --disable-avahi
 endif
 
-ifeq ($(BR2_PACKAGE_HAL),y)
-GVFS_DEPENDENCIES += hal
-GVFS_CONF_OPT += --enable-hal
-else
-GVFS_CONF_OPT += --disable-hal
-endif
-
 ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
 GVFS_DEPENDENCIES += libarchive
 GVFS_CONF_OPT += --enable-archive
diff --git a/package/hal/Config.in b/package/hal/Config.in
deleted file mode 100644
index 1951c9d800..0000000000
--- a/package/hal/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config BR2_PACKAGE_HAL
-	bool "hal"
-	depends on BR2_USE_WCHAR # glib2
-	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_DBUS
-	select BR2_DBUS_EXPAT
-	select BR2_PACKAGE_DBUS_GLIB
-	select BR2_PACKAGE_HWDATA
-	select BR2_PACKAGE_UDEV
-	select BR2_PACKAGE_UDEV_VOLUME_ID
-	help
-	  The Hardware Abstraction Layer (HAL) suite.
-
-comment "hal requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
diff --git a/package/hal/S98haldaemon b/package/hal/S98haldaemon
deleted file mode 100755
index 40ea0f4d34..0000000000
--- a/package/hal/S98haldaemon
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# haldaemon:   HAL daemon
-#
-# chkconfig: 345 98 02
-# description:  This is a daemon for collecting and maintaing information \
-#               about hardware from several sources. \
-#               See http://www.freedesktop.org/Software/hal
-#
-# processname: hald
-# pidfile: /var/run/haldaemon.pid
-#
-
-# Sanity checks.
-[ -x /usr/sbin/hald ] || exit 0
-
-RETVAL=0
-
-start() {
-    echo -n "Starting HAL daemon: "
-    hald
-    RETVAL=$?
-    echo "done"
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/haldaemon
-}
-
-stop() {
-    echo -n "Stopping HAL daemon: "
-
-    killall hald
-    RETVAL=$?
-    echo "done"
-    if [ $RETVAL -eq 0 ]; then
-        rm -f /var/lock/subsys/haldaemon
-        rm -f /var/run/haldaemon.pid
-    fi
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        stop
-	sleep 3
-        start
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|restart}"
-        ;;
-esac
-exit $RETVAL
diff --git a/package/hal/hal-include-fix.patch b/package/hal/hal-include-fix.patch
deleted file mode 100644
index af2a7fe59a..0000000000
--- a/package/hal/hal-include-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-[PATCH] hal: add missing includes
-
-- hald/linux/classdev.c needs sys/socket.h for struct sockaddr
-- hald/linux/addons/addon-storage.c needs limits.h for INT_MAX
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- hald/linux/addons/addon-storage.c |    1 +
- hald/linux/classdev.c             |    1 +
- 2 files changed, 2 insertions(+)
-
-Index: hal-0.5.8/hald/linux/addons/addon-storage.c
-===================================================================
---- hal-0.5.8.orig/hald/linux/addons/addon-storage.c
-+++ hal-0.5.8/hald/linux/addons/addon-storage.c
-@@ -29,6 +29,7 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <linux/cdrom.h>
- #include <linux/fs.h>
- #include <mntent.h>
-Index: hal-0.5.8/hald/linux/classdev.c
-===================================================================
---- hal-0.5.8.orig/hald/linux/classdev.c
-+++ hal-0.5.8/hald/linux/classdev.c
-@@ -31,6 +31,7 @@
- 
- #include <ctype.h>
- #include <limits.h>
-+#include <sys/socket.h>
- #include <linux/types.h>
- #include <net/if_arp.h> /* for ARPHRD_... */
- #include <stdlib.h>
diff --git a/package/hal/hal.mk b/package/hal/hal.mk
deleted file mode 100644
index 801fe92755..0000000000
--- a/package/hal/hal.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#############################################################
-#
-# hal
-#
-#############################################################
-HAL_VERSION:=0.5.8
-HAL_SOURCE:=hal-$(HAL_VERSION).tar.gz
-HAL_SITE:=http://people.freedesktop.org/~david/dist/
-HAL_DIR:=$(BUILD_DIR)/hal-$(HAL_VERSION)
-HAL_CAT:=$(ZCAT)
-HAL_BINARY:=hald/hald
-HAL_TARGET_BINARY:=usr/sbin/hald
-
-GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \
-	     -I$(STAGING_DIR)/usr/lib/glib-2.0/include
-GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libglib-2.0.so \
-	   $(STAGING_DIR)/usr/lib/libgmodule-2.0.so \
-	   $(STAGING_DIR)/usr/lib/libgobject-2.0.so \
-	   $(STAGING_DIR)/usr/lib/libgthread-2.0.so
-DBUS_GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libdbus-glib-1.so
-
-$(DL_DIR)/$(HAL_SOURCE):
-	$(call DOWNLOAD,$(HAL_SITE),$(HAL_SOURCE))
-
-hal-source: $(DL_DIR)/$(HAL_SOURCE)
-
-$(HAL_DIR)/.unpacked: $(DL_DIR)/$(HAL_SOURCE)
-	$(HAL_CAT) $(DL_DIR)/$(HAL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(HAL_DIR) package/hal/ \*.patch
-	touch $(HAL_DIR)/.unpacked
-
-$(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked
-	(cd $(HAL_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/lib/glib-2.0/include" \
-		GLIB_CFLAGS="$(GLIB_CFLAGS)" \
-		GLIB_LIBS="$(GLIB_LIBS)" \
-		DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \
-		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \
-		VOLUME_ID_CFLAGS="$(TARGET_CFLAGS)" \
-		VOLUME_ID_LIBS="$(STAGING_DIR)/lib/libvolume_id.so" \
-		ac_cv_path_LIBUSB_CONFIG= \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-hwdata=$(TARGET_DIR)/usr/share/hwdata \
-		--with-expat=$(STAGING_DIR)/usr/ \
-		--disable-policy-kit \
-		--disable-gtk-doc \
-		--disable-static \
-		--disable-acpi-acpid \
-		--disable-acpi-proc \
-	)
-	touch $(HAL_DIR)/.configured
-
-$(HAL_DIR)/hald/hald: $(HAL_DIR)/.configured
-	$(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" DBUS_GLIB_LIBS="$(DBUS_GLIB_LIBS)" -C $(HAL_DIR)
-
-$(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
-	$(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" -C $(HAL_DIR) install
-	rm -rf $(TARGET_DIR)/usr/share/hal/device-manager
-	rm -rf $(TARGET_DIR)/usr/lib/libhal*.so
-	rm -rf $(TARGET_DIR)/usr/lib/hal
-	rm -rf $(TARGET_DIR)/etc/PolicyKit
-	$(INSTALL) -m 0755 -D package/hal/S98haldaemon $(TARGET_DIR)/etc/init.d
-	for file in hald-addon-acpi* hald-addon-cpufreq \
-		hald-addon-keyboard hald-addon-pmu \
-		hald-probe-pc-floppy hald-probe-printer \
-		hald-probe-serial hald-probe-smbios \
-		hal-storage-eject hal-storage-closetray \
-		hal-system-power-pmu hald-probe-input \
-		hald-probe-hiddev hald-addon-hid-ups; \
-	do \
-		rm -f $(TARGET_DIR)/usr/libexec/$$file; \
-	done
-
-hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY)
-
-hal-clean:
-	rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf
-	rm -rf $(TARGET_DIR)/etc/hal $(TARGET_DIR)/usr/share/hal
-	rm -f $(TARGET_DIR)/etc/init.d/S98haldaemon
-	rm -f $(TARGET_DIR)/etc/udev/rules.d/90-hal.rules
-	rm -f $(TARGET_DIR)/usr/bin/hal-* $(TARGET_DIR)/usr/bin/lshal
-	rm -f $(TARGET_DIR)/usr/sbin/hald
-	rm -f $(TARGET_DIR)/usr/libexec/hald-* $(TARGET_DIR)/usr/libexec/hal-*
-	rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/libexec
-	rm -f $(TARGET_DIR)/usr/lib/libhal.so.1*
-	rm -f $(TARGET_DIR)/usr/lib/libhal-storage.so.1*
-	-$(MAKE) -C $(HAL_DIR) clean
-
-hal-dirclean:
-	rm -rf $(HAL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_HAL),y)
-TARGETS+=hal
-endif
diff --git a/package/hal/hal02-include-ieee80211-fix.patch b/package/hal/hal02-include-ieee80211-fix.patch
deleted file mode 100644
index 9e7b5e2495..0000000000
--- a/package/hal/hal02-include-ieee80211-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur hal-0.5.8/hald/linux/classdev.c hal-0.5.8-patched/hald/linux/classdev.c
---- hal-0.5.8/hald/linux/classdev.c	2006-09-11 18:32:56.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/classdev.c	2007-01-13 22:00:46.896769548 -0600
-@@ -32,7 +32,10 @@
- #include <ctype.h>
- #include <limits.h>
- #include <linux/types.h>
--#include <net/if_arp.h> /* for ARPHRD_... */
-+#include <linux/if_arp.h> /* for ARPHRD_... */
-+#ifndef ARPHRD_IEEE80211_RADIOTAP
-+# define ARPHRD_IEEE80211_RADIOTAP 803
-+#endif
- #include <stdlib.h>
- #include <string.h>
- #include <stdint.h>
diff --git a/package/hal/hal03-link-dbus.patch b/package/hal/hal03-link-dbus.patch
deleted file mode 100644
index d522b85975..0000000000
--- a/package/hal/hal03-link-dbus.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN hal-0.5.8/hald/linux/addons/Makefile.in hal-0.5.8-patched/hald/linux/addons/Makefile.in
---- hal-0.5.8/hald/linux/addons/Makefile.in	2006-09-11 18:25:31.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/addons/Makefile.in	2006-11-16 10:08:30.000000000 -0600
-@@ -119,7 +119,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -o $@
- SOURCES = $(hald_addon_acpi_SOURCES) \
- 	$(hald_addon_acpi_buttons_toshiba_SOURCES) \
- 	$(hald_addon_cpufreq_SOURCES) $(hald_addon_hid_ups_SOURCES) \
-diff -urN hal-0.5.8/hald/linux/probing/Makefile.in hal-0.5.8-patched/hald/linux/probing/Makefile.in
---- hal-0.5.8/hald/linux/probing/Makefile.in	2006-09-11 18:25:31.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/probing/Makefile.in	2006-11-16 10:08:30.000000000 -0600
-@@ -97,7 +97,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_LIBS) -o $@
- SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_input_SOURCES) \
- 	$(hald_probe_pc_floppy_SOURCES) $(hald_probe_printer_SOURCES) \
- 	$(hald_probe_serial_SOURCES) $(hald_probe_smbios_SOURCES) \
-diff -urN hal-0.5.8/hald/Makefile.in hal-0.5.8-patched/hald/Makefile.in
---- hal-0.5.8/hald/Makefile.in	2006-09-11 18:25:30.000000000 -0500
-+++ hal-0.5.8-patched/hald/Makefile.in	2006-11-16 10:08:30.000000000 -0600
-@@ -71,7 +71,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_GLIB_LIBS) $(GLIB_LIBS) -o $@
- SOURCES = $(hald_SOURCES)
- DIST_SOURCES = $(hald_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-diff -urN hal-0.5.8/hald-runner/Makefile.in hal-0.5.8-patched/hald-runner/Makefile.in
---- hal-0.5.8/hald-runner/Makefile.in	2006-09-11 18:25:30.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/Makefile.in	2006-11-16 10:09:06.000000000 -0600
-@@ -64,7 +64,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -o $@
- SOURCES = $(hald_runner_SOURCES)
- DIST_SOURCES = $(hald_runner_SOURCES)
- ETAGS = etags
-diff -urN hal-0.5.8/tools/Makefile.in hal-0.5.8-patched/tools/Makefile.in
---- hal-0.5.8/tools/Makefile.in	2006-09-11 18:25:33.000000000 -0500
-+++ hal-0.5.8-patched/tools/Makefile.in	2006-11-16 10:10:14.000000000 -0600
-@@ -133,7 +133,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -o $@
- SOURCES = $(hal_device_SOURCES) $(hal_find_by_capability_SOURCES) \
- 	$(hal_find_by_property_SOURCES) $(hal_get_property_SOURCES) \
- 	$(hal_set_property_SOURCES) \
diff --git a/package/hal/hal04-remove-glib-dbus-headers.patch b/package/hal/hal04-remove-glib-dbus-headers.patch
deleted file mode 100644
index fd83bd23c9..0000000000
--- a/package/hal/hal04-remove-glib-dbus-headers.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -ur hal-0.5.8/hald/device_info.c hal-0.5.8-patched/hald/device_info.c
---- hal-0.5.8/hald/device_info.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/device_info.c	2006-11-15 11:52:24.000000000 -0600
-@@ -33,8 +33,6 @@
- #include <dirent.h>
- #include <expat.h>
- #include <assert.h>
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
- #include <math.h>
- 
- #include "hald.h"
-diff -ur hal-0.5.8/hald/dummy/osspec.c hal-0.5.8-patched/hald/dummy/osspec.c
---- hal-0.5.8/hald/dummy/osspec.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/dummy/osspec.c	2006-11-15 11:52:24.000000000 -0600
-@@ -28,8 +28,6 @@
- #endif
- 
- #include <glib.h>
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
- 
- #include "../osspec.h"
- #include "../logger.h"
-diff -ur hal-0.5.8/hald/hald.c hal-0.5.8-patched/hald/hald.c
---- hal-0.5.8/hald/hald.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/hald.c	2006-11-15 11:52:24.000000000 -0600
-@@ -42,10 +42,6 @@
- #include <grp.h>
- #include <syslog.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--#include <dbus/dbus-glib-lowlevel.h>
--
- /*#include "master_slave.h"*/
- 
- #include "logger.h"
-diff -ur hal-0.5.8/hald/hald_dbus.c hal-0.5.8-patched/hald/hald_dbus.c
---- hal-0.5.8/hald/hald_dbus.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/hald_dbus.c	2006-11-15 11:52:24.000000000 -0600
-@@ -35,9 +35,6 @@
- #include <stdint.h>
- #include <sys/time.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib-lowlevel.h>
--
- #include "hald.h"
- #include "hald_dbus.h"
- #include "device.h"
-diff -ur hal-0.5.8/hald/hald_runner.c hal-0.5.8-patched/hald/hald_runner.c
---- hal-0.5.8/hald/hald_runner.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/hald_runner.c	2006-11-15 11:52:24.000000000 -0600
-@@ -31,8 +31,6 @@
- #include <stdio.h>
- 
- #include <glib.h>
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib-lowlevel.h>
- 
- #include "hald.h"
- #include "util.h"
-diff -ur hal-0.5.8/hald/linux/addons/addon-cpufreq.h hal-0.5.8-patched/hald/linux/addons/addon-cpufreq.h
---- hal-0.5.8/hald/linux/addons/addon-cpufreq.h	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/addons/addon-cpufreq.h	2006-11-15 11:52:24.000000000 -0600
-@@ -29,8 +29,6 @@
- #include <config.h>
- #endif
- 
--#include <dbus/dbus-glib.h>
--#include <dbus/dbus-glib-lowlevel.h>
- #include <glib.h>
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur hal-0.5.8/hald/linux/addons/addon-macbookpro-backlight.c hal-0.5.8-patched/hald/linux/addons/addon-macbookpro-backlight.c
---- hal-0.5.8/hald/linux/addons/addon-macbookpro-backlight.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/addons/addon-macbookpro-backlight.c	2006-11-15 11:52:24.000000000 -0600
-@@ -37,8 +37,6 @@
- #include <unistd.h> 
- 
- #include <glib/gmain.h>
--#include <dbus/dbus-glib.h>
--#include <dbus/dbus-glib-lowlevel.h>
- 
- #include "libhal/libhal.h"
- #include "../../logger.h"
-diff -ur hal-0.5.8/hald/linux/addons/addon-usb-csr.c hal-0.5.8-patched/hald/linux/addons/addon-usb-csr.c
---- hal-0.5.8/hald/linux/addons/addon-usb-csr.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/addons/addon-usb-csr.c	2006-11-15 11:52:24.000000000 -0600
-@@ -30,8 +30,6 @@
- #include <usb.h>
- 
- #include <glib/gmain.h>
--#include <dbus/dbus-glib.h>
--#include <dbus/dbus-glib-lowlevel.h>
- 
- #include "libhal/libhal.h"
- #include "../../logger.h"
-diff -ur hal-0.5.8/hald/linux/blockdev.c hal-0.5.8-patched/hald/linux/blockdev.c
---- hal-0.5.8/hald/linux/blockdev.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/blockdev.c	2006-11-15 11:52:24.000000000 -0600
-@@ -37,9 +37,6 @@
- #include <syslog.h>
- #include <unistd.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--
- #include "../device_info.h"
- #include "../hald.h"
- #include "../hald_dbus.h"
-diff -ur hal-0.5.8/hald/linux/classdev.c hal-0.5.8-patched/hald/linux/classdev.c
---- hal-0.5.8/hald/linux/classdev.c	2006-09-11 18:32:56.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/classdev.c	2006-11-15 11:52:24.000000000 -0600
-@@ -39,9 +39,6 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--
- #include "../device_info.h"
- #include "../device_store.h"
- #include "../hald.h"
-diff -ur hal-0.5.8/hald/linux/coldplug.c hal-0.5.8-patched/hald/linux/coldplug.c
---- hal-0.5.8/hald/linux/coldplug.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/coldplug.c	2006-11-15 11:52:24.000000000 -0600
-@@ -33,9 +33,6 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--
- #include "../device_info.h"
- #include "../hald.h"
- #include "../logger.h"
-diff -ur hal-0.5.8/hald/linux/hotplug.c hal-0.5.8-patched/hald/linux/hotplug.c
---- hal-0.5.8/hald/linux/hotplug.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/hotplug.c	2006-11-15 11:52:24.000000000 -0600
-@@ -32,9 +32,6 @@
- #include <string.h>
- #include <unistd.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--
- #include "../device_info.h"
- #include "../hald.h"
- #include "../logger.h"
-diff -ur hal-0.5.8/hald/linux/ids.c hal-0.5.8-patched/hald/linux/ids.c
---- hal-0.5.8/hald/linux/ids.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/ids.c	2006-11-15 11:56:11.000000000 -0600
-@@ -33,7 +33,6 @@
- #include <unistd.h>
- 
- #include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
- 
- #include "../logger.h"
- 
-diff -ur hal-0.5.8/hald/linux/osspec.c hal-0.5.8-patched/hald/linux/osspec.c
---- hal-0.5.8/hald/linux/osspec.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/osspec.c	2006-11-15 11:52:24.000000000 -0600
-@@ -44,9 +44,6 @@
- #include <sys/utsname.h>
- #include <unistd.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--
- #include "../device_info.h"
- #include "../hald.h"
- #include "../hald_dbus.h"
-diff -ur hal-0.5.8/hald/linux/physdev.c hal-0.5.8-patched/hald/linux/physdev.c
---- hal-0.5.8/hald/linux/physdev.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/linux/physdev.c	2006-11-15 11:52:24.000000000 -0600
-@@ -31,9 +31,6 @@
- #include <stdint.h>
- #include <unistd.h>
- 
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
--
- #include "../device_info.h"
- #include "../hald.h"
- #include "../logger.h"
-diff -ur hal-0.5.8/hald/util.c hal-0.5.8-patched/hald/util.c
---- hal-0.5.8/hald/util.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald/util.c	2006-11-15 11:52:24.000000000 -0600
-@@ -42,8 +42,6 @@
- #include <sys/file.h>
- 
- #include <glib.h>
--#include <dbus/dbus.h>
--#include <dbus/dbus-glib.h>
- 
- #include "osspec.h"
- #include "logger.h"
-diff -ur hal-0.5.8/hald-runner/main.c hal-0.5.8-patched/hald-runner/main.c
---- hal-0.5.8/hald-runner/main.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/main.c	2006-11-15 11:52:24.000000000 -0600
-@@ -24,8 +24,6 @@
-  **************************************************************************/
- #include <stdio.h>
- #include <stdlib.h>
--#define DBUS_API_SUBJECT_TO_CHANGE 
--#include <dbus/dbus-glib-lowlevel.h>
- 
- #include <glib.h>
- #include "utils.h"
-diff -ur hal-0.5.8/hald-runner/runner.c hal-0.5.8-patched/hald-runner/runner.c
---- hal-0.5.8/hald-runner/runner.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/runner.c	2006-11-15 11:56:42.000000000 -0600
-@@ -31,8 +31,7 @@
- #include <signal.h>
- #include <string.h>
- 
--#define DBUS_API_SUBJECT_TO_CHANGE 
--#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus.h>
- 
- #include <glib.h>
- #include "utils.h"
-diff -ur hal-0.5.8/hald-runner/runner.h hal-0.5.8-patched/hald-runner/runner.h
---- hal-0.5.8/hald-runner/runner.h	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/runner.h	2006-11-15 11:52:24.000000000 -0600
-@@ -25,9 +25,6 @@
- #ifndef RUNNER_H
- #define RUNNER_H
- 
--#define DBUS_API_SUBJECT_TO_CHANGE 
--#include <dbus/dbus-glib-lowlevel.h>
--
- #include <glib.h>
- 
- typedef struct {
-diff -ur hal-0.5.8/hald-runner/utils.c hal-0.5.8-patched/hald-runner/utils.c
---- hal-0.5.8/hald-runner/utils.c	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/utils.c	2006-11-15 11:52:24.000000000 -0600
-@@ -24,8 +24,6 @@
-  **************************************************************************/
- #include <stdio.h>
- #include <stdlib.h>
--#define DBUS_API_SUBJECT_TO_CHANGE 
--#include <dbus/dbus-glib-lowlevel.h>
- #include <glib.h>
- 
- #include "utils.h"
-diff -ur hal-0.5.8/hald-runner/utils.h hal-0.5.8-patched/hald-runner/utils.h
---- hal-0.5.8/hald-runner/utils.h	2006-09-11 16:56:39.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/utils.h	2006-11-15 11:52:35.000000000 -0600
-@@ -25,8 +25,7 @@
- #ifndef UTILS_H
- #define UTILS_H
- 
--#define DBUS_API_SUBJECT_TO_CHANGE 
--#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus.h>
- 
- char **get_string_array(DBusMessageIter *iter, gchar *extra);
- char **get_string_array_from_fd(int fd);
-diff -ur hal-0.5.8/tools/lshal.c hal-0.5.8-patched/tools/lshal.c
---- hal-0.5.8/tools/lshal.c	2006-09-11 16:56:40.000000000 -0500
-+++ hal-0.5.8-patched/tools/lshal.c	2006-11-15 11:52:24.000000000 -0600
-@@ -36,8 +36,6 @@
- #include <getopt.h>
- 
- #include <glib.h>
--#include <dbus/dbus-glib-lowlevel.h>
--#include <dbus/dbus-glib.h>
- #include <libhal.h>
- 
- #ifdef __SUNPRO_C
diff --git a/package/hal/hal05-libtool-hack.patch b/package/hal/hal05-libtool-hack.patch
deleted file mode 100644
index 1b7e112049..0000000000
--- a/package/hal/hal05-libtool-hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur hal-0.5.8/libhal-storage/Makefile.in hal-0.5.8-patched/libhal-storage/Makefile.in
---- hal-0.5.8/libhal-storage/Makefile.in	2006-09-11 18:25:32.000000000 -0500
-+++ hal-0.5.8-patched/libhal-storage/Makefile.in	2007-01-14 17:17:28.628840792 -0600
-@@ -354,8 +354,7 @@
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	    cp -a "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
diff --git a/package/hal/hal06-libintl.patch b/package/hal/hal06-libintl.patch
deleted file mode 100644
index d38124e5c0..0000000000
--- a/package/hal/hal06-libintl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur hal-0.5.8/hald/Makefile.in hal-0.5.8-patched/hald/Makefile.in
---- hal-0.5.8/hald/Makefile.in	2006-09-11 18:25:30.000000000 -0500
-+++ hal-0.5.8-patched/hald/Makefile.in	2007-01-17 08:54:04.000000000 -0600
-@@ -336,7 +336,7 @@
- 	osspec.h							\
- 	property.h			property.c			
- 
--hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lm @EXPAT_LIB@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la
-+hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lm @EXPAT_LIB@ @INTLLIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la
- 
- #### Init scripts fun
- SCRIPT_IN_FILES = haldaemon.in
-diff -ur hal-0.5.8/hald-runner/Makefile.in hal-0.5.8-patched/hald-runner/Makefile.in
---- hal-0.5.8/hald-runner/Makefile.in	2006-09-11 18:25:30.000000000 -0500
-+++ hal-0.5.8-patched/hald-runner/Makefile.in	2007-01-17 08:54:18.000000000 -0600
-@@ -303,7 +303,7 @@
- 	@DBUS_CFLAGS@ @GLIB_CFLAGS@
- 
- hald_runner_SOURCES = main.c runner.c runner.h utils.h utils.c
--hald_runner_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
-+hald_runner_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @INTLLIBS@
- all: all-am
- 
- .SUFFIXES:

From f0952fcdb614cb144f41b2b72f944f4236c5cb2c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Fri, 22 Jul 2011 16:51:28 +0200
Subject: [PATCH 0480/6849] udev: bump version and clean up

[Peter: fix Config.in deps, add host-pkg-config]
Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/Config.in            |  46 ++++-----
 package/udev/S10udev              |   6 +-
 package/udev/libvolume_id.la.tmpl |  35 -------
 package/udev/udev.mk              | 150 ++++++------------------------
 4 files changed, 43 insertions(+), 194 deletions(-)
 delete mode 100644 package/udev/libvolume_id.la.tmpl

diff --git a/package/udev/Config.in b/package/udev/Config.in
index 6438d4f0a0..254a8f43df 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -5,37 +5,23 @@ config BR2_PACKAGE_UDEV
 
 	  ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 
-config BR2_PACKAGE_UDEV_UTILS
-	bool "udev-utils"
-	depends on BR2_PACKAGE_UDEV
-	help
-	  Adds the udevmonitor, udevinfo, and udevtest binaries
-	  to your filesystem.
-
-menu "Extra udev tools"
-	depends on BR2_PACKAGE_UDEV
-
-config BR2_PACKAGE_UDEV_VOLUME_ID
-	bool "udev-libvolume_id"
-	depends on BR2_PACKAGE_UDEV
-	help
-	  Build and install volume identification library.
+if BR2_PACKAGE_UDEV
 
-config BR2_PACKAGE_UDEV_SCSI_ID
-	bool "udev-scsi_id"
-	depends on BR2_PACKAGE_UDEV_VOLUME_ID
+config BR2_PACKAGE_UDEV_ALL_EXTRAS
+	bool "enable all extras"
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_ACL
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	select BR2_PACKAGE_USBUTILS
+	select BR2_PACKAGE_HWDATA
+	select BR2_PACKAGE_LIBGLIB2
 	help
-	  Build and install SCSI disk identification library.
+	  Enable all extras with external dependencies like
+	  libacl, libusb, libusb-compat, usbutils, hwdata
 
-config BR2_PACKAGE_UDEV_PATH_ID
-	bool "udev-path_id"
-	depends on BR2_PACKAGE_UDEV_VOLUME_ID
-	help
-	  Install udev's unique device path generation program path_id.
+comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
-config BR2_PACKAGE_UDEV_FIRMWARE_SH
-	bool "udev-firmware_sh"
-	depends on BR2_PACKAGE_UDEV_VOLUME_ID
-	help
-	  Install udev's firmware loading script firmware.sh.
-endmenu
+endif
diff --git a/package/udev/S10udev b/package/udev/S10udev
index 0d2a23afa5..29eb1075c3 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -19,8 +19,6 @@
 # Check for missing binaries
 UDEV_BIN=/sbin/udevd
 test -x $UDEV_BIN || exit 5
-UDEVSTART_BIN=/sbin/udevstart
-test -x $UDEVSTART_BIN || exit 5
 
 # Check for config file and read it
 UDEV_CONFIG=/etc/udev/udev.conf
@@ -29,16 +27,14 @@ test -r $UDEV_CONFIG || exit 6
 
 case "$1" in
     start)
-        mknod -m 0666 /dev/null c 1 3
         echo -n "Populating $udev_root using udev: "
         echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
         $UDEV_BIN -d || (echo "FAIL" && exit 1)
-	$UDEVSTART_BIN || (echo "FAIL" && exit 1)
         echo "done"
         ;;
     stop)
         # Stop execution of events
-        udevcontrol stop_exec_queue
+        udevadm control --stop_exec_queue
         killall udevd
         ;;
     *)
diff --git a/package/udev/libvolume_id.la.tmpl b/package/udev/libvolume_id.la.tmpl
deleted file mode 100644
index 725628bba4..0000000000
--- a/package/udev/libvolume_id.la.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-# libvolume_id.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libvolume_id.so.REPLACE_CURRENT'
-
-# Names of this library.
-library_names='libvolume_id.so.REPLACE_CURRENT.REPLACE_AGE.REPLACE_REVISION libvolume_id.so.REPLACE_CURRENT libvolume_id.so'
-
-# The name of the static archive.
-old_library='libvolume_id.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lc'
-
-# Version information for libvolume_id.
-current=REPLACE_CURRENT
-age=REPLACE_AGE
-revision=REPLACE_REVISION
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='REPLACE_LIB_DIR'
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 4b61ce48da..6d87ad33dc 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,132 +3,34 @@
 # udev
 #
 #############################################################
-UDEV_VERSION:=114
-UDEV_VOLUME_ID_CURRENT:=0
-UDEV_VOLUME_ID_AGE:=79
-UDEV_VOLUME_ID_REVISION:=0
-UDEV_VOLUME_ID_VERSION:=$(UDEV_VOLUME_ID_CURRENT).$(UDEV_VOLUME_ID_AGE).$(UDEV_VOLUME_ID_REVISION)
-UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
-UDEV_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
-UDEV_INSTALL_STAGING=YES
-
-# 094 had _GNU_SOURCE set
-BR2_UDEV_CFLAGS:= -D_GNU_SOURCE $(TARGET_CFLAGS)
-ifeq ($(BR2_LARGEFILE),)
-BR2_UDEV_CFLAGS+=-U_FILE_OFFSET_BITS
-endif
-
-# UDEV_ROOT is /dev so we can replace devfs, not /udev for experiments
-UDEV_ROOT:=/dev
-
-UDEV_EXTRAS=
-ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y)
-UDEV_EXTRAS+=volume_id
-endif
-ifeq ($(BR2_PACKAGE_UDEV_SCSI_ID),y)
-UDEV_EXTRAS+=scsi_id
-UDEV_EXTRAS+=usb_id
-endif
-ifeq ($(BR2_PACKAGE_UDEV_PATH_ID),y)
-UDEV_EXTRAS+=path_id
-endif
-ifeq ($(BR2_PACKAGE_UDEV_FIRMWARE_SH),y)
-UDEV_EXTRAS+=firmware
-endif
-
-UDEV_BUILD_EXTRAS=$(addprefix extras/,$(UDEV_EXTRAS))
-
-#
-# Build
-#
-define UDEV_BUILD_CMDS
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC="$(TARGET_CC)" LD="$(TARGET_CC)"\
-		CFLAGS="$(BR2_UDEV_CFLAGS)" \
-		USE_LOG=false USE_SELINUX=false \
-		udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D)
-endef
-
-#
-# Staging installation
-#
-ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y)
-define UDEV_VOLUME_ID_STAGING_INSTALL_CMDS
-	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
-	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so.0
-	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so
-	$(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/lib/libvolume_id.la
-endef
+UDEV_VERSION = 172
+UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
+UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
+
+UDEV_CONF_OPT =			\
+	--sbindir=/sbin		\
+	--with-rootlibdir=/lib	\
+	--libexecdir=/lib/udev	\
+	--disable-introspection
+
+UDEV_DEPENDENCIES = host-gperf host-pkg-config
+
+ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
+UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
+UDEV_CONF_OPT +=							\
+	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
+	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids
+else
+UDEV_CONF_OPT +=		\
+	--disable-hwdb		\
+	--disable-udev_acl	\
+	--disable-gudev
 endif
 
-define UDEV_INSTALL_STAGING_CMDS
-$(UDEV_VOLUME_ID_STAGING_INSTALL_CMDS)
+define UDEV_INSTALL_INITSCRIPT
+	$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
 endef
 
-#
-# Target installation
-#
-ifneq ($(BR2_PACKAGE_UDEV_UTILS),y)
-define UDEV_UTILS_REMOVAL
-	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor
-	rm -f $(TARGET_DIR)/usr/bin/udevinfo
-	rm -f $(TARGET_DIR)/usr/bin/udevtest
-endef
-endif
-
-define UDEV_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/sys
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		DESTDIR=$(TARGET_DIR) \
-		CFLAGS="$(BR2_UDEV_CFLAGS)" \
-		LDFLAGS="-warn-common" \
-		USE_LOG=false USE_SELINUX=false \
-		udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) install
-	$(INSTALL) -m 0755 -D package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
-	$(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d
-	( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf )
-	install -m 0755 -D $(@D)/udevstart $(TARGET_DIR)/sbin/udevstart
-	for i in $(TARGET_DIR)/sbin/udev* $(TARGET_DIR)/usr/bin/udev* ; do \
-		$(STRIPCMD) $(STRIP_STRIP_ALL) $$i ; \
-	done
-	for i in scsi_id usb_id vol_id ; do \
-		if test -e $(TARGET_DIR)/lib/udev/$$i ; then \
-			$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/lib/udev/$$i ; \
-		fi \
-	done
-	$(UDEV_UTILS_REMOVAL)
-endef
-
-#
-# Clean
-#
-define UDEV_CLEAN_CMDS
-	-$(MAKE) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) clean
-endef
-
-#
-# Staging uninstall
-#
-define UDEV_UNINSTALL_STAGING_CMDS
-	rm -f $(STAGING_DIR)/usr/include/libvolume_id.h
-	rm -f $(STAGING_DIR)/lib/libvolume_id.so*
-	rm -f $(STAGING_DIR)/lib/libvolume_id.la
-endef
-
-#
-# Target uninstall
-#
-define UDEV_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
-	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
-	rm -fr $(TARGET_DIR)/sys
-	rm -f $(TARGET_DIR)/lib/libvolume_id.so.0*
-	rm -rf $(TARGET_DIR)/lib/udev
-endef
+UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT
 
-$(eval $(call GENTARGETS,package,udev))
+$(eval $(call AUTOTARGETS,package,udev))

From f0e9c42bd157733409da478435f78fe9cff7ae09 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Jul 2011 10:41:31 +0200
Subject: [PATCH 0481/6849] udev: extras needs BR2_PROGRAM_INVOCATION

For usbutils.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/Config.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/udev/Config.in b/package/udev/Config.in
index 254a8f43df..48391e5fbb 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -9,8 +9,9 @@ if BR2_PACKAGE_UDEV
 
 config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "enable all extras"
-	depends on BR2_LARGEFILE
-	depends on BR2_USE_WCHAR
+	depends on BR2_LARGEFILE # acl
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_PROGRAM_INVOCATION # usbutils
 	select BR2_PACKAGE_ACL
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
@@ -21,7 +22,7 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	  Enable all extras with external dependencies like
 	  libacl, libusb, libusb-compat, usbutils, hwdata
 
-comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "udev extras requires a toolchain with LARGEFILE/WCHAR/PROGRAM_INVOCATION support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)
 
 endif

From bc38f2c8b5acd8ec32f024fe7fa806d7dc6dc1b1 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Mon, 25 Jul 2011 17:46:55 -0400
Subject: [PATCH 0482/6849] inotify-tools: Add new package

Adds support for inotify-tools, which are useful for scripting the
Linux inotify API.

[Peter: needs largefile support]
Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/inotify-tools/Config.in        | 14 ++++++++++++++
 package/inotify-tools/inotify-tools.mk |  8 ++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/inotify-tools/Config.in
 create mode 100644 package/inotify-tools/inotify-tools.mk

diff --git a/package/Config.in b/package/Config.in
index 812a730d16..61f82560e1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -491,6 +491,7 @@ source "package/dash/Config.in"
 endif
 source "package/dialog/Config.in"
 source "package/file/Config.in"
+source "package/inotify-tools/Config.in"
 source "package/lockfile-progs/Config.in"
 source "package/logrotate/Config.in"
 source "package/screen/Config.in"
diff --git a/package/inotify-tools/Config.in b/package/inotify-tools/Config.in
new file mode 100644
index 0000000000..ed94b3f0ef
--- /dev/null
+++ b/package/inotify-tools/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_INOTIFY_TOOLS
+	bool "inotify-tools"
+	depends on BR2_LARGEFILE
+	help
+	  inotify-tools is a C library and a set of command-line
+	  programs for Linux providing a simple interface to inotify.
+	  These programs can be used to monitor and act upon
+	  filesystem events. Provides the 'inotifywait' and 'inotifywatch'
+	  binaries.
+
+	  https://github.com/rvoicilas/inotify-tools
+
+comment "inotify-tools requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
new file mode 100644
index 0000000000..d6378bb050
--- /dev/null
+++ b/package/inotify-tools/inotify-tools.mk
@@ -0,0 +1,8 @@
+#############################################################
+#
+# inotify-utils
+#
+#############################################################
+INOTIFY_TOOLS_VERSION = 3.14
+INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
+$(eval $(call AUTOTARGETS,package,inotify-tools))

From 04d0689cc419c0181ddf0f6d4089df97699e9ee3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Jul 2011 15:28:19 +0200
Subject: [PATCH 0483/6849] toolchain-external: sync toolchain options with the
 internal toolchain

The internal toolchain defaults to thread support enabled (and
most external toolchains have thread support as well), so enable
BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS by default.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5222702e15..8cd37d4b53 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -311,6 +311,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PROGRAM_INVOCATION
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 	bool "Toolchain has threads support?"
 	select BR2_TOOLCHAIN_HAS_THREADS
+	default y
 	help
 	  Select this option if your external toolchain has thread
 	  support. If you don't know, leave the default value,

From 6378cac4e633600d1e2d6cdcd729049fda090fb3 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Fri, 22 Jul 2011 16:53:12 +0200
Subject: [PATCH 0484/6849] util-linux: convert to autotarget and bump to
 2.19.1

[Peter: fix deps, restructure, add unshare]
Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in                  | 121 ++++-
 ...-2.13-pre17-hardcode-a-out-constants.patch |  41 --
 .../util-linux/util-linux-no-nls-fix.patch    |  25 -
 .../util-linux/util-linux-susv3-legacy.patch  | 429 ------------------
 .../util-linux-uclibc-build-fix.patch         |  16 +
 .../util-linux/util-linux-umount2-fix.patch   |  20 -
 package/util-linux/util-linux.mk              | 134 ++----
 7 files changed, 178 insertions(+), 608 deletions(-)
 delete mode 100644 package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
 delete mode 100644 package/util-linux/util-linux-no-nls-fix.patch
 delete mode 100644 package/util-linux/util-linux-susv3-legacy.patch
 create mode 100644 package/util-linux/util-linux-uclibc-build-fix.patch
 delete mode 100644 package/util-linux/util-linux-umount2-fix.patch

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 434dae9521..b59a31ab22 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_UTIL-LINUX
+config BR2_PACKAGE_UTIL_LINUX
 	bool "util-linux"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
-	depends on BR2_INET_RPC
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	depends on BR2_PROGRAM_INVOCATION
 	help
 	  Various useful/essential Linux utilities.
 
@@ -10,5 +10,114 @@ config BR2_PACKAGE_UTIL-LINUX
 
 	  http://www.kernel.org/pub/linux/utils/util-linux/
 
-comment "util-linux requires a toolchain with RPC support"
-	depends on !BR2_INET_RPC
+if BR2_PACKAGE_UTIL_LINUX
+
+############################################
+# default enabled and should be disabled by
+#  --disable-foo
+#
+
+config BR2_PACKAGE_UTIL_LINUX_MOUNT
+	bool "build mount utilties"
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_FSCK
+	bool "build \"fsck\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	bool "build libuuid and uuid utilities"
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_UUIDD
+	bool "build \"uuidd\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	bool "build libblkid and blkid utilities"
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_AGETTY
+	bool "build \"agetty\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_CRAMFS
+	bool "build \"fsck.cramfs, mkfs.cramfs\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
+	bool "build \"switch_root\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
+	bool "build \"pivot_root\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_FALLOCATE
+	bool "build \"fallocate\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_UNSHARE
+	bool "build \"unshare\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_RENAME
+	bool "build \"rename\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
+	bool "build \"chrt, ionice, teskset\""
+	default y
+
+config BR2_PACKAGE_UTIL_LINUX_WALL
+	bool "build \"wall\""
+	default y
+
+############################################
+# default disabled and should be enabled by
+#  --enable-foo
+#
+config BR2_PACKAGE_UTIL_LINUX_ARCH
+	bool "build \"arch\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_INIT
+	bool "build \"simpleinit, shutdown, initctl\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_KILL
+	bool "build \"kill\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_LAST
+	bool "build \"last\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_MESG
+	bool "build \"kill\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_PARTX
+	bool "build \"addpart, delpart, partx\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_RAW
+	bool "build \"raw\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_RESET
+	bool "build \"reset\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
+	bool "build \"chfn, chsh, login, newgrp, vipw\""
+	default n
+
+config BR2_PACKAGE_UTIL_LINUX_WRITE
+	bool "build \"addpart, delpart, partx\""
+	default n
+
+endif
+
+comment "util-linux requires a toolchain with LARGEFILE/WCHAR/PROGRAM_INVOCATION support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)
diff --git a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch b/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
deleted file mode 100644
index b115c410ef..0000000000
--- a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Hardcode a.out related constants
-
-The OMAGIC, NMAGIC and ZMAGIC constants, related to the legacy a.out
-binary format, are no longer available in the headers of all
-architectures, due to this binary format being deprecated. For that
-reason, util-linux fails to build.
-
-We therefore take the approach used in newer versions of
-util-linux-ng: hardcoding those values. See
-http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=commitdiff;h=e9eb4dad0ece03914f67f6d1ded74cfbbe694ba4
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- text-utils/more.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-Index: util-linux-2.13-pre7/text-utils/more.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/more.c
-+++ util-linux-2.13-pre7/text-utils/more.c
-@@ -53,7 +53,6 @@
- #include <sys/stat.h>
- #include <sys/file.h>
- #include <sys/wait.h>
--#include <a.out.h>
- #include <locale.h>
- #include "xstrncpy.h"
- #include "nls.h"
-@@ -504,9 +503,9 @@
- 
- 	if (fread(twobytes, 2, 1, f) == 1) {
- 		switch(twobytes[0] + (twobytes[1]<<8)) {
--		case OMAGIC:	/* 0407 */
--		case NMAGIC:	/* 0410 */
--		case ZMAGIC:	/* 0413 */
-+		case 0407:	/* a.out obj */
-+		case 0410:	/* a.out exec */
-+		case 0413:	/* a.out demand exec */
- 		case 0405:
- 		case 0411:
- 		case 0177545:
diff --git a/package/util-linux/util-linux-no-nls-fix.patch b/package/util-linux/util-linux-no-nls-fix.patch
deleted file mode 100644
index c02009f08a..0000000000
--- a/package/util-linux/util-linux-no-nls-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH]: fix util-linux build without NLS support
-
-util-linux partly supports builds without NLS support, but it forgets to
-provide a dummy setlocale() macro.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/nls.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: util-linux-2.13-pre7/include/nls.h
-===================================================================
---- util-linux-2.13-pre7.orig/include/nls.h
-+++ util-linux-2.13-pre7/include/nls.h
-@@ -19,6 +19,10 @@
- # define textdomain(Domain) /* empty */
- # define _(Text) (Text)
- # define N_(Text) (Text)
-+# undef LC_ALL
-+# define LC_ALL 0
-+# undef setlocale
-+# define setlocale(category, locale)
- #endif
- 
- 
diff --git a/package/util-linux/util-linux-susv3-legacy.patch b/package/util-linux/util-linux-susv3-legacy.patch
deleted file mode 100644
index 2239119a50..0000000000
--- a/package/util-linux/util-linux-susv3-legacy.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-[PATCH] replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- fdisk/cfdisk.c         |    2 +-
- fdisk/fdiskbsdlabel.c  |   16 ++++++++--------
- fdisk/sfdisk.c         |   10 +++++-----
- login-utils/login.c    |    6 +++---
- login-utils/shutdown.c |    2 +-
- login-utils/ttymsg.c   |    2 +-
- login-utils/vipw.c     |    4 ++--
- login-utils/wall.c     |    2 +-
- misc-utils/logger.c    |    2 +-
- misc-utils/namei.c     |    2 +-
- misc-utils/whereis.c   |    4 ++--
- mount/mntent.c         |    4 ++--
- mount/mount.c          |    4 ++--
- mount/mount_by_label.c |    2 +-
- mount/sundries.c       |    2 +-
- mount/umount.c         |    2 +-
- partx/partx.c          |    2 +-
- text-utils/colcrt.c    |    4 ++--
- text-utils/display.c   |    2 +-
- text-utils/parse.c     |    8 ++++----
- 20 files changed, 41 insertions(+), 41 deletions(-)
-
-Index: util-linux-2.13-pre7/fdisk/fdiskbsdlabel.c
-===================================================================
---- util-linux-2.13-pre7.orig/fdisk/fdiskbsdlabel.c
-+++ util-linux-2.13-pre7/fdisk/fdiskbsdlabel.c
-@@ -538,10 +538,10 @@
- 
-   /* We need a backup of the disklabel (xbsd_dlabel might have changed). */
-   d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE];
--  bcopy (d, &dl, sizeof (struct xbsd_disklabel));
-+  memmove (&dl, d, sizeof (struct xbsd_disklabel));
- 
-   /* The disklabel will be overwritten by 0's from bootxx anyway */
--  bzero (d, sizeof (struct xbsd_disklabel));
-+  memset (d, 0, sizeof (struct xbsd_disklabel));
- 
-   snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename);
-   if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize],
-@@ -555,7 +555,7 @@
-       exit ( EXIT_FAILURE );
-     }
- 
--  bcopy (&dl, d, sizeof (struct xbsd_disklabel));
-+  memmove (d, &dl, sizeof (struct xbsd_disklabel));
- 
- #if defined (__powerpc__) || defined (__hppa__)
-   sector = 0;
-@@ -657,7 +657,7 @@
- 	struct geom g;
- 
- 	get_geometry (fd, &g);
--	bzero (d, sizeof (struct xbsd_disklabel));
-+	memset (d, 0, sizeof (struct xbsd_disklabel));
- 
- 	d -> d_magic = BSD_DISKMAGIC;
- 
-@@ -740,8 +740,8 @@
- 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
- 		fatal (unable_to_read);
- 
--	bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
--	       d, sizeof (struct xbsd_disklabel));
-+	memmove (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-+	       sizeof (struct xbsd_disklabel));
- 
- 	if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC)
- 		return 0;
-@@ -776,8 +776,8 @@
-   /* This is necessary if we want to write the bootstrap later,
-      otherwise we'd write the old disklabel with the bootstrap.
-   */
--  bcopy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
--	 sizeof (struct xbsd_disklabel));
-+  memmove (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-+	 d, sizeof (struct xbsd_disklabel));
- 
- #if defined (__alpha__) && BSD_LABELSECTOR == 0
-   alpha_bootblock_checksum (disklabelbuffer);
-Index: util-linux-2.13-pre7/login-utils/ttymsg.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/ttymsg.c
-+++ util-linux-2.13-pre7/login-utils/ttymsg.c
-@@ -111,7 +111,7 @@
- 		if (wret >= 0) {
- 			left -= wret;
- 			if (iov != localiov) {
--				bcopy(iov, localiov,
-+				memmove(localiov, iov,
- 				    iovcnt * sizeof(struct iovec));
- 				iov = localiov;
- 			}
-Index: util-linux-2.13-pre7/login-utils/vipw.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/vipw.c
-+++ util-linux-2.13-pre7/login-utils/vipw.c
-@@ -313,8 +313,8 @@
- 	bindtextdomain(PACKAGE, LOCALEDIR);
- 	textdomain(PACKAGE);
- 
--	bzero(tmp_file, FILENAMELEN);
--	progname = (rindex(argv[0], '/')) ? rindex(argv[0], '/') + 1 : argv[0];
-+	memset(tmp_file, 0, FILENAMELEN);
-+	progname = (strrchr(argv[0], '/')) ? strrchr(argv[0], '/') + 1 : argv[0];
- 	if (!strcmp(progname, "vigr")) {
- 		program = VIGR;
- 		xstrncpy(orig_file, GROUP_FILE, sizeof(orig_file));
-Index: util-linux-2.13-pre7/misc-utils/logger.c
-===================================================================
---- util-linux-2.13-pre7.orig/misc-utils/logger.c
-+++ util-linux-2.13-pre7/misc-utils/logger.c
-@@ -198,7 +198,7 @@
- 			} else {
- 				if (p != buf)
- 					*p++ = ' ';
--				bcopy(*argv++, p, len);
-+				memmove(p, *argv++, len);
- 				*(p += len) = '\0';
- 			}
- 		}
-Index: util-linux-2.13-pre7/misc-utils/namei.c
-===================================================================
---- util-linux-2.13-pre7.orig/misc-utils/namei.c
-+++ util-linux-2.13-pre7/misc-utils/namei.c
-@@ -242,7 +242,7 @@
- 		 * call namei()
- 		 */
- 		
--		bzero(sym, BUFSIZ);
-+		memset(sym, 0, BUFSIZ);
- 		if(readlink(buf, sym, BUFSIZ) == -1){
- 		    (void)printf(_(" ? problems reading symlink %s - %s (%d)\n"), buf, ERR);
- 		    return;
-Index: util-linux-2.13-pre7/text-utils/colcrt.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/colcrt.c
-+++ util-linux-2.13-pre7/text-utils/colcrt.c
-@@ -252,8 +252,8 @@
- 		}
- 		putwchar('\n');
- 	}
--	bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t));
--	bzero(page[267- ol], ol * 132 * sizeof(wchar_t));
-+	memmove(page, page[ol], (267 - ol) * 132 * sizeof(wchar_t));
-+	memset(page[267- ol], 0, ol * 132 * sizeof(wchar_t));
- 	outline -= ol;
- 	outcol = 0;
- 	first = 1;
-Index: util-linux-2.13-pre7/fdisk/sfdisk.c
-===================================================================
---- util-linux-2.13-pre7.orig/fdisk/sfdisk.c
-+++ util-linux-2.13-pre7/fdisk/sfdisk.c
-@@ -40,7 +40,7 @@
- #include <unistd.h>		/* read, write */
- #include <fcntl.h>		/* O_RDWR */
- #include <errno.h>		/* ERANGE */
--#include <string.h>		/* index() */
-+#include <string.h>		/* strchr() */
- #include <ctype.h>
- #include <getopt.h>
- #include <sys/ioctl.h>
-@@ -1709,12 +1709,12 @@
- 	eof = 1;
- 	return RD_EOF;
-     }
--    if (!(lp = index(lp, '\n')))
-+    if (!(lp = strchr(lp, '\n')))
-       fatal(_("long or incomplete input line - quitting\n"));
-     *lp = 0;
- 
-     /* remove comments, if any */
--    if ((lp = index(line+2, '#')) != 0)
-+    if ((lp = strchr(line+2, '#')) != 0)
-       *lp = 0;
- 
-     /* recognize a few commands - to be expanded */
-@@ -1724,7 +1724,7 @@
-     }
- 
-     /* dump style? - then bad input is fatal */
--    if ((ip = index(line+2, ':')) != 0) {
-+    if ((ip = strchr(line+2, ':')) != 0) {
- 	struct dumpfld *d;
- 
-       nxtfld:
-@@ -2491,7 +2491,7 @@
- 
-     if (argc < 1)
-       fatal(_("no command?\n"));
--    if ((progn = rindex(argv[0], '/')) == NULL)
-+    if ((progn = strrchr(argv[0], '/')) == NULL)
-       progn = argv[0];
-     else
-       progn++;
-Index: util-linux-2.13-pre7/login-utils/login.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/login.c
-+++ util-linux-2.13-pre7/login-utils/login.c
-@@ -337,7 +337,7 @@
-      */
-     gethostname(tbuf, sizeof(tbuf));
-     xstrncpy(thishost, tbuf, sizeof(thishost));
--    domain = index(tbuf, '.');
-+    domain = strchr(tbuf, '.');
-     
-     username = tty_name = hostname = NULL;
-     fflag = hflag = pflag = 0;
-@@ -356,7 +356,7 @@
- 	      exit(1);
- 	  }
- 	  hflag = 1;
--	  if (domain && (p = index(optarg, '.')) &&
-+	  if (domain && (p = strchr(optarg, '.')) &&
- 	      strcasecmp(p, domain) == 0)
- 	    *p = 0;
- 
-@@ -1101,7 +1101,7 @@
- 	childArgv[childArgc++] = buff;
-     } else {
- 	tbuf[0] = '-';
--	xstrncpy(tbuf + 1, ((p = rindex(pwd->pw_shell, '/')) ?
-+	xstrncpy(tbuf + 1, ((p = strrchr(pwd->pw_shell, '/')) ?
- 			   p + 1 : pwd->pw_shell),
- 		sizeof(tbuf)-1);
- 	
-Index: util-linux-2.13-pre7/login-utils/shutdown.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/shutdown.c
-+++ util-linux-2.13-pre7/login-utils/shutdown.c
-@@ -279,7 +279,7 @@
- 			if (fgets (line, sizeof(line), fp) != NULL &&
- 			    strncasecmp (line, "HALT_ACTION", 11) == 0 &&
- 			    iswhitespace(line[11])) {
--				p = index(line, '\n');
-+				p = strchr(line, '\n');
- 				if (p)
- 					*p = 0;		/* strip final '\n' */
- 				p = line+11;
-Index: util-linux-2.13-pre7/misc-utils/whereis.c
-===================================================================
---- util-linux-2.13-pre7.orig/misc-utils/whereis.c
-+++ util-linux-2.13-pre7/misc-utils/whereis.c
-@@ -323,14 +323,14 @@
- 	char dirbuf[1024];
- 	struct stat statbuf;
- 
--	dd = index(dir, '*');
-+	dd = strchr(dir, '*');
- 	if (!dd)
- 		goto noglob;
- 
- 	l = strlen(dir);
- 	if (l < sizeof(dirbuf)) { 	/* refuse excessively long names */
- 		strcpy (dirbuf, dir);
--		d = index(dirbuf, '*');
-+		d = strchr(dirbuf, '*');
- 		*d = 0;
- 		dirp = opendir(dirbuf);
- 		if (dirp == NULL)
-Index: util-linux-2.13-pre7/mount/mntent.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/mntent.c
-+++ util-linux-2.13-pre7/mount/mntent.c
-@@ -158,7 +158,7 @@
- 			return NULL;
- 
- 		mfp->mntent_lineno++;
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* Missing final newline?  Otherwise extremely */
- 			/* long line - assume file was corrupted */
-@@ -166,7 +166,7 @@
- 				fprintf(stderr, _("[mntent]: warning: no final "
- 					"newline at the end of %s\n"),
- 					mfp->mntent_file);
--				s = index (buf, 0);
-+				s = strchr (buf, 0);
- 			} else {
- 				mfp->mntent_errs = 1;
- 				goto err;
-Index: util-linux-2.13-pre7/mount/mount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/mount.c
-+++ util-linux-2.13-pre7/mount/mount.c
-@@ -488,11 +488,11 @@
- 
-    /* Accept a comma-separated list of types, and try them one by one */
-    /* A list like "nonfs,.." indicates types not to use */
--   if (*types && strncmp(*types, "no", 2) && index(*types,',')) {
-+   if (*types && strncmp(*types, "no", 2) && strchr(*types,',')) {
-       char *t = strdup(*types);
-       char *p;
- 
--      while((p = index(t,',')) != NULL) {
-+      while((p = strchr(t,',')) != NULL) {
- 	 *p = 0;
- 	 args.type = *types = t;
- 	 if(do_mount_syscall (&args) == 0)
-Index: util-linux-2.13-pre7/mount/mount_by_label.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/mount_by_label.c
-+++ util-linux-2.13-pre7/mount/mount_by_label.c
-@@ -213,7 +213,7 @@
- 	    fseek(procpt, 0, SEEK_SET);
- 
- 	    while (fgets(line, sizeof(line), procpt)) {
--		if (!index(line, '\n'))
-+		if (!strchr(line, '\n'))
- 			break;
- 
- 		if (sscanf (line, " %d %d %d %[^\n ]",
-Index: util-linux-2.13-pre7/mount/sundries.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/sundries.c
-+++ util-linux-2.13-pre7/mount/sundries.c
-@@ -138,7 +138,7 @@
- 	     if (strncmp(p, type, len) == 0 &&
- 		 (p[len] == 0 || p[len] == ','))
- 		     return !no;
--	     p = index(p,',');
-+	     p = strchr(p,',');
- 	     if (!p)
- 		     break;
- 	     p++;
-Index: util-linux-2.13-pre7/mount/umount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/umount.c
-+++ util-linux-2.13-pre7/mount/umount.c
-@@ -332,7 +332,7 @@
- 			if (res < 0)
- 				umnt_err2 = errno;
- 			/* Do not complain about remote NFS mount points */
--			if (errno == ENOENT && index(spec, ':'))
-+			if (errno == ENOENT && strchr(spec, ':'))
- 				umnt_err2 = 0;
- 		}
- 	}
-Index: util-linux-2.13-pre7/partx/partx.c
-===================================================================
---- util-linux-2.13-pre7.orig/partx/partx.c
-+++ util-linux-2.13-pre7/partx/partx.c
-@@ -130,7 +130,7 @@
- 	case 'n':
- 		p = optarg;
- 		lower = atoi(p);
--		p = index(p, '-');
-+		p = strchr(p, '-');
- 		if (p)
- 			upper = atoi(p+1);
- 		else
-Index: util-linux-2.13-pre7/text-utils/display.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/display.c
-+++ util-linux-2.13-pre7/text-utils/display.c
-@@ -163,7 +163,7 @@
- 	pr->cchar[0] = 's';
- 	pr->cchar[1] = 0;
- 	for (p1 = pr->fmt; *p1 != '%'; ++p1);
--	for (p2 = ++p1; *p1 && index(spec, *p1); ++p1);
-+	for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1);
- 	while ((*p2++ = *p1++) != 0) ;
- }
- 
-Index: util-linux-2.13-pre7/text-utils/parse.c
-===================================================================
---- util-linux-2.13-pre7.orig/text-utils/parse.c
-+++ util-linux-2.13-pre7/text-utils/parse.c
-@@ -64,7 +64,7 @@
- 		exit(1);
- 	}
- 	while (fgets(buf, sizeof(buf), fp)) {
--		if ((p = index(buf, '\n')) == NULL) {
-+		if ((p = strchr(buf, '\n')) == NULL) {
- 			(void)fprintf(stderr, _("hexdump: line too long.\n"));
- 			while ((ch = getchar()) != '\n' && ch != EOF);
- 			continue;
-@@ -171,7 +171,7 @@
- 			 * skip any special chars -- save precision in
- 			 * case it's a %s format.
- 			 */
--			while (index(spec + 1, *++fmt));
-+			while (strchr(spec + 1, *++fmt));
- 			if (*fmt == '.' && isdigit((unsigned char)*++fmt)) {
- 				prec = atoi(fmt);
- 				while (isdigit((unsigned char)*++fmt));
-@@ -244,10 +244,10 @@
- 			if (fu->bcnt) {
- 				sokay = USEBCNT;
- 				/* skip to conversion character */
--				for (++p1; index(spec, *p1); ++p1);
-+				for (++p1; strchr(spec, *p1); ++p1);
- 			} else {
- 				/* skip any special chars, field width */
--				while (index(spec + 1, *++p1));
-+				while (strchr(spec + 1, *++p1));
- 				if (*p1 == '.' &&
- 				    isdigit((unsigned char)*++p1)) {
- 					sokay = USEPREC;
-Index: util-linux-2.13-pre7/fdisk/cfdisk.c
-===================================================================
---- util-linux-2.13-pre7.orig/fdisk/cfdisk.c
-+++ util-linux-2.13-pre7/fdisk/cfdisk.c
-@@ -348,7 +348,7 @@
- /* Some libc's have their own basename() */
- static char *
- my_basename(char *devname) {
--    char *s = rindex(devname, '/');
-+    char *s = strrchr(devname, '/');
-     return s ? s+1 : devname;
- }
- 
-Index: util-linux-2.13-pre7/login-utils/wall.c
-===================================================================
---- util-linux-2.13-pre7.orig/login-utils/wall.c
-+++ util-linux-2.13-pre7/login-utils/wall.c
-@@ -87,7 +87,7 @@
-         textdomain(PACKAGE);
- 
- 	progname = argv[0];
--	p = rindex(progname, '/');
-+	p = strrchr(progname, '/');
- 	if (p)
- 	     progname = p+1;
- 
diff --git a/package/util-linux/util-linux-uclibc-build-fix.patch b/package/util-linux/util-linux-uclibc-build-fix.patch
new file mode 100644
index 0000000000..f9da863f4d
--- /dev/null
+++ b/package/util-linux/util-linux-uclibc-build-fix.patch
@@ -0,0 +1,16 @@
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: util-linux-2.19.1/configure.ac
+===================================================================
+--- util-linux-2.19.1.orig/configure.ac
++++ util-linux-2.19.1/configure.ac
+@@ -250,7 +250,7 @@ esac
+
+
+ AC_MSG_CHECKING(whether program_invocation_short_name is defined)
+-AC_TRY_COMPILE([#include <argp.h>],
++AC_TRY_COMPILE([#include <errno.h>],
+                [program_invocation_short_name = "test";],
+                AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
+                          [Define if program_invocation_short_name is defined])
+
diff --git a/package/util-linux/util-linux-umount2-fix.patch b/package/util-linux/util-linux-umount2-fix.patch
deleted file mode 100644
index 14b6c34818..0000000000
--- a/package/util-linux/util-linux-umount2-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-[PATCH] fix multiple definitions of umount2 issue
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- mount/umount.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: util-linux-2.13-pre7/mount/umount.c
-===================================================================
---- util-linux-2.13-pre7.orig/mount/umount.c
-+++ util-linux-2.13-pre7/mount/umount.c
-@@ -29,7 +29,7 @@
- #include "nfsmount.h"
- #include <arpa/inet.h>
- 
--#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
-+#if 1
- /* Interesting ... it seems libc knows about MNT_FORCE and presumably
-    about umount2 as well -- need not do anything */
- #else /* MNT_FORCE */
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 445b4d1c79..a63055aa8f 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -3,100 +3,60 @@
 # util-linux
 #
 #############################################################
-UTIL-LINUX_VERSION:=2.13-pre7
-UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2
-UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux/testing
-UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION)
-UTIL-LINUX_CAT:=$(BZCAT)
-UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe
-UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
+UTIL_LINUX_VERSION_MAJOR = 2.19
+UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
+UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
-# schedutils isn't support for all archs
-ifneq ($(BR2_i386)$(BR2_powerpc)$(BR2_x86_64)$(BR2_ia64)$(BR2_alpha),)
-UTIL-LINUX_SCHED_UTILS:=--enable-schedutils
-else
-UTIL-LINUX_SCHED_UTILS:=--disable-schedutils
-endif
+UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-UTIL-LINUX_DEPENDENCIES += gettext libintl
-UTIL-LINUX_MAKE_OPT = LIBS=-lintl
+# If both util-linux and busybox are selected, make certain util-linux
+# wins the fight over who gets to have their utils actually installed
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+UTIL_LINUX_DEPENDENCIES += busybox
 endif
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
-UTIL-LINUX_DEPENDENCIES += ncurses
-endif
-
-$(DL_DIR)/$(UTIL-LINUX_SOURCE):
-	$(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE))
-
-$(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE)
-	$(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux\*.patch
-	touch $(UTIL-LINUX_DIR)/.unpacked
-
-$(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
-	(cd $(UTIL-LINUX_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		ac_cv_lib_blkid_blkid_known_fstype=no \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--disable-use-tty-group \
-		--prefix=/ \
-		--exec-prefix=/ \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(UTIL-LINUX_SCHED_UTILS) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-		ARCH=$(ARCH) \
-	)
-	touch $(UTIL-LINUX_DIR)/.configured
-
-$(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured
-	$(MAKE) \
-		-C $(UTIL-LINUX_DIR) \
-		ARCH=$(ARCH) \
-		CC="$(TARGET_CC)" \
-		OPT="$(TARGET_CFLAGS)" \
-		$(UTIL-LINUX_MAKE_OPT) \
-		HAVE_SLANG="NO"
-
-$(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
-	$(MAKE) ARCH=$(ARCH) DESTDIR=$(TARGET_DIR) USE_TTY_GROUP=no -C $(UTIL-LINUX_DIR) install
-	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/info \
-		$(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/share/doc
-
-#If both util-linux and busybox are selected, make certain util-linux
-#wins the fight over who gets to have their utils actually installed
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-UTIL-LINUX_DEPENDENCIES := busybox $(UTIL-LINUX_DEPENDENCIES)
+UTIL_LINUX_DEPENDENCIES += ncurses
+else
+UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
-util-linux: $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY)
-
-util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE)
-
-util-linux-clean:
-	#There is no working 'uninstall' target. Just skip it...
-	#$(MAKE) DESTDIR=$(TARGET_DIR) -C $(UTIL-LINUX_DIR) uninstall
-	-$(MAKE) -C $(UTIL-LINUX_DIR) clean
-
-util-linux-dirclean:
-	rm -rf $(UTIL-LINUX_DIR)
-
 
-#############################################################
+#############################################
 #
-# Toplevel Makefile options
+# disable default utilities
 #
-#############################################################
-ifeq ($(BR2_PACKAGE_UTIL-LINUX),y)
-TARGETS+=util-linux
-endif
+UTIL_LINUX_CONF_OPT += \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),,--disable-mount) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),,--disable-fsck) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),,--disable-libuuid) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_UUID),,--disable-uuid) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),,--disable-libblkid) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),,--disable-agetty) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),,--disable-cramfs) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),,--disable-switch_root) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),,--disable-pivot_root) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),,--disable-fallocate) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),,--disable-unshare) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall)
+
+#############################################
+#
+# enable extra utilities
+#
+UTIL_LINUX_CONF_OPT += \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_INIT),--enable-init) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
+
+$(eval $(call AUTOTARGETS,package,util-linux))

From 213bbe9a2281f47eb1f602c041fd91133b662c35 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jul 2011 11:49:46 +0200
Subject: [PATCH 0485/6849] util-linux: misc fixes

- We patch configure.ac, so we need to autoreconf
- configure uses pkg-config, so ensure the cross version is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index a63055aa8f..c01a4ff79a 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -7,6 +7,8 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
 UTIL_LINUX_VERSION_MAJOR = 2.19
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
+UTIL_LINUX_AUTORECONF = YES
+UTIL_LINUX_DEPENDENCIES = host-pkg-config
 
 UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
 

From 4ee9d569f9ae5da199b6e64a45d83dc6aa9c78ce Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jul 2011 11:51:47 +0200
Subject: [PATCH 0486/6849] uClibc: drop BR2_PROGRAM_INVOCATION option

Remove the BR option and enable the configuration setting in the
uClibc defconfigs.

The BR2_PROGRAM_INVOCATION option only adds very little overhead to
uClibc, and we have a number of packages needing it, so simply always
enable it - Simplifying the kconfig logic and the number of choices
users have to make.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/coreutils/Config.in                      |  6 +++---
 package/tar/Config.in                            |  6 +++---
 package/udev/Config.in                           |  5 ++---
 package/usbutils/Config.in                       |  4 ----
 package/util-linux/Config.in                     |  5 ++---
 target/xtensa/uClibc-0.9.30.config               |  2 +-
 target/xtensa/uClibc.config                      |  2 +-
 toolchain/helpers.mk                             |  2 --
 toolchain/toolchain-buildroot/Config.in.2        | 10 ----------
 toolchain/toolchain-common.in                    |  3 ---
 toolchain/toolchain-crosstool-ng/Config.in       | 12 ------------
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk |  7 -------
 toolchain/toolchain-crosstool-ng/uClibc.config   |  3 ++-
 toolchain/toolchain-external/Config.in           | 10 ----------
 toolchain/uClibc/uClibc-0.9.30.config            |  2 +-
 toolchain/uClibc/uClibc-0.9.31.config            |  4 ++--
 toolchain/uClibc/uClibc-0.9.32.config            |  4 ++--
 toolchain/uClibc/uClibc-snapshot.config          |  4 ++--
 toolchain/uClibc/uclibc.mk                       |  7 -------
 19 files changed, 21 insertions(+), 77 deletions(-)

diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
index a7159cf9ea..bfd6f26203 100644
--- a/package/coreutils/Config.in
+++ b/package/coreutils/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_COREUTILS
 	bool "coreutils"
-	depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION
+	depends on BR2_USE_WCHAR
 	help
 	  All of the basic file/text/shell utilities.  These are the
 	  core utilities which are expected to exist on every system.
@@ -13,5 +13,5 @@ config BR2_PACKAGE_COREUTILS
 
 	  http://www.gnu.org/software/coreutils/
 
-comment "coreutils requires a toolchain with WCHAR and PROGRAM_INVOCATION support"
-	depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)
+comment "coreutils requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/tar/Config.in b/package/tar/Config.in
index 20529e3783..427cae461d 100644
--- a/package/tar/Config.in
+++ b/package/tar/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_TAR
 	bool "tar"
-	depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION
+	depends on BR2_USE_WCHAR
 	help
 	  A program that saves many files together into a single tape or disk
 	  archive, and can restore individual files from the archive.
 
 	  http://www.gnu.org/software/tar/
 
-comment "tar requires a toolchain with WCHAR and PROGRAM_INVOCATION support"
-	depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)
+comment "tar requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/udev/Config.in b/package/udev/Config.in
index 48391e5fbb..67fd413d99 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -11,7 +11,6 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "enable all extras"
 	depends on BR2_LARGEFILE # acl
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_PROGRAM_INVOCATION # usbutils
 	select BR2_PACKAGE_ACL
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
@@ -22,7 +21,7 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	  Enable all extras with external dependencies like
 	  libacl, libusb, libusb-compat, usbutils, hwdata
 
-comment "udev extras requires a toolchain with LARGEFILE/WCHAR/PROGRAM_INVOCATION support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)
+comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
 endif
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index fbd712b86d..23004d9528 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -1,9 +1,5 @@
-comment "usbutils requires a toolchain with PROGRAM_INVOCATION support"
-	depends on !BR2_PROGRAM_INVOCATION
-
 config BR2_PACKAGE_USBUTILS
 	bool "usbutils"
-	depends on BR2_PROGRAM_INVOCATION
 	select BR2_PACKAGE_LIBUSB
 	help
 	  USB enumeration utilities
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index b59a31ab22..c0e15e7158 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_UTIL_LINUX
 	bool "util-linux"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
-	depends on BR2_PROGRAM_INVOCATION
 	help
 	  Various useful/essential Linux utilities.
 
@@ -119,5 +118,5 @@ config BR2_PACKAGE_UTIL_LINUX_WRITE
 
 endif
 
-comment "util-linux requires a toolchain with LARGEFILE/WCHAR/PROGRAM_INVOCATION support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)
+comment "util-linux requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/target/xtensa/uClibc-0.9.30.config b/target/xtensa/uClibc-0.9.30.config
index cc6815d07e..5701fe474e 100644
--- a/target/xtensa/uClibc-0.9.30.config
+++ b/target/xtensa/uClibc-0.9.30.config
@@ -84,7 +84,7 @@ UCLIBC_SUSV3_LEGACY=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 UNIX98PTY_ONLY=y
diff --git a/target/xtensa/uClibc.config b/target/xtensa/uClibc.config
index 546a045347..cd82fabe62 100644
--- a/target/xtensa/uClibc.config
+++ b/target/xtensa/uClibc.config
@@ -75,7 +75,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
 ASSUME_DEVPTS=y
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 13dbebbee8..123720b87e 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -148,7 +148,6 @@ check_glibc = \
 	$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
 	$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
 	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
-	$(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)
 
 #
 # Check the conformity of Buildroot configuration with regard to the
@@ -194,7 +193,6 @@ check_uclibc = \
 	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
-	$(call check_uclibc_feature,__UCLIBC_HAS_PROGRAM_INVOCATION_NAME__,BR2_PROGRAM_INVOCATION,$${UCLIBC_CONFIG_FILE},Program invocation support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support)
 
 #
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 5df188f5d4..e3fe337841 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -41,16 +41,6 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE
 	  Enable this option if you want your toolchain to support
 	  localization and internationalization.
 
-config BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION
-	bool "Enable 'program invocation name' support"
-	select BR2_PROGRAM_INVOCATION
-	help
-	  Enable this option if you want your toolchain to support the
-	  GNU-specific program_invocation_name and
-	  program_invocation_short_name strings.  Some GNU packages
-	  (like tar and coreutils) utilize these for extra useful
-	  output, but in general are not required.
-
 config BR2_TOOLCHAIN_BUILDROOT_CXX
 	bool "Enable C++ support"
 	select BR2_INSTALL_LIBSTDCPP
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index bbb7be627e..2d11008098 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -20,9 +20,6 @@ config BR2_USE_WCHAR
 config BR2_ENABLE_LOCALE
 	bool
 
-config BR2_PROGRAM_INVOCATION
-	bool
-
 config BR2_INSTALL_LIBSTDCPP
 	bool
 
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 3cac8088af..2d1e801c40 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -17,7 +17,6 @@ config BR2_TOOLCHAIN_CTNG_eglibc
 	select BR2_INET_RPC
 	select BR2_ENABLE_LOCALE
 	select BR2_USE_WCHAR
-	select BR2_PROGRAM_INVOCATION
 
 config BR2_TOOLCHAIN_CTNG_glibc
 	bool "glibc"
@@ -26,7 +25,6 @@ config BR2_TOOLCHAIN_CTNG_glibc
 	select BR2_INET_RPC
 	select BR2_ENABLE_LOCALE
 	select BR2_USE_WCHAR
-	select BR2_PROGRAM_INVOCATION
 
 endchoice # C library
 
@@ -89,16 +87,6 @@ config BR2_TOOLCHAIN_CTNG_uClibc_LOCALE
 	  Enable this option if you want your toolchain to support
 	  localization and internationalization.
 
-config BR2_TOOLCHAIN_CTNG_uClibc_PROGRAM_INVOCATION
-	bool "Enable 'program invocation name' support"
-	select BR2_PROGRAM_INVOCATION
-	help
-	  Enable this option if you want your toolchain to support the
-	  GNU-specific program_invocation_name and
-	  program_invocation_short_name strings.  Some GNU packages
-	  (like tar and coreutils) utilize these for extra useful
-	  output, but in general are not required.
-
 endif # BR2_TOOLCHAIN_CTNG_uClibc
 
 config BR2_TOOLCHAIN_CTNG_CXX
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index ec6e1889b0..912bb06b22 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -305,13 +305,6 @@ else
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_RPC)=.*:\# \1 is not set:;
 endif
 
-# Handle the program_invocation_name option
-ifneq ($(call qstrip,$(BR2_PROGRAM_INVOCATION)),)
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_PROGRAM_INVOCATION_NAME) is not set:\1=y:;
-else
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_PROGRAM_INVOCATION_NAME)=y:\# \1 is not set:;
-endif
-
 # Instruct CT-NG's .config where to find the uClibc's .config
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LIBC_UCLIBC_CONFIG_FILE)=.*:\1="$(CTNG_DIR)/libc.config":;
 
diff --git a/toolchain/toolchain-crosstool-ng/uClibc.config b/toolchain/toolchain-crosstool-ng/uClibc.config
index f1163ae84c..76a3427460 100644
--- a/toolchain/toolchain-crosstool-ng/uClibc.config
+++ b/toolchain/toolchain-crosstool-ng/uClibc.config
@@ -109,7 +109,8 @@ UCLIBC_DYNAMIC_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 8cd37d4b53..bedbb53d8d 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -173,7 +173,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	select BR2_INET_IPV6
 	select BR2_INET_RPC
 	select BR2_USE_WCHAR
-	select BR2_PROGRAM_INVOCATION
 	select BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Toolchain for the Blackfin architecture, from
@@ -231,7 +230,6 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INET_RPC
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
-	select BR2_PROGRAM_INVOCATION
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
@@ -300,14 +298,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LOCALE
 	  support. If you don't know, leave the default value,
 	  Buildroot will tell you if it's correct or not.
 
-config BR2_TOOLCHAIN_EXTERNAL_PROGRAM_INVOCATION
-	bool "Toolchain has program invocation support?"
-	select BR2_PROGRAM_INVOCATION
-	help
-	  Select this option if your external toolchain has program
-	  invocation support. If you don't know, leave the default
-	  value, Buildroot will tell you if it's correct or not.
-
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 	bool "Toolchain has threads support?"
 	select BR2_TOOLCHAIN_HAS_THREADS
diff --git a/toolchain/uClibc/uClibc-0.9.30.config b/toolchain/uClibc/uClibc-0.9.30.config
index 2202b9e14f..49ac3ef4cb 100644
--- a/toolchain/uClibc/uClibc-0.9.30.config
+++ b/toolchain/uClibc/uClibc-0.9.30.config
@@ -82,7 +82,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
index 60b4628061..80210c5df8 100644
--- a/toolchain/uClibc/uClibc-0.9.31.config
+++ b/toolchain/uClibc/uClibc-0.9.31.config
@@ -89,8 +89,8 @@ UCLIBC_SUSV3_LEGACY=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-# UCLIBC_HAS___PROGNAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config
index 5a7b52a9a2..e9f942d63b 100644
--- a/toolchain/uClibc/uClibc-0.9.32.config
+++ b/toolchain/uClibc/uClibc-0.9.32.config
@@ -113,8 +113,8 @@ UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-# UCLIBC_HAS___PROGNAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index 34ec0ff01f..bff7584694 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -113,8 +113,8 @@ UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-# UCLIBC_HAS___PROGNAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 3173ef4bb1..e74012f616 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -318,13 +318,6 @@ ifeq ($(BR2_USE_WCHAR),y)
 else
 	$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_PROGRAM_INVOCATION),y)
-	$(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y,g' $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=y,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=n,g' $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=n,g' $(UCLIBC_DIR)/.oldconfig
-endif
 ifeq ("$(KERNEL_ARCH)","i386")
 	/bin/echo "# CONFIG_GENERIC_386 is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# CONFIG_386 is not set" >> $(UCLIBC_DIR)/.oldconfig

From 1f2879ccb7ebb13fed94607da3c8a27506a18e5b Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Fri, 22 Jul 2011 16:58:19 +0200
Subject: [PATCH 0487/6849] usbmount fixes

- create mounting points
- fix dependencies
- fix udev rules
- fix fs type detection

[Peter: fix Config.in deps, create usb7, only remove /media/usb?]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbmount/Config.in                    |  8 ++++++
 .../usbmount-fstype-detection-fix.patch       | 25 +++++++++++++++++++
 package/usbmount/usbmount-rules-fix.patch     | 19 ++++++++++++++
 package/usbmount/usbmount.mk                  | 17 ++++++++++---
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 package/usbmount/usbmount-fstype-detection-fix.patch
 create mode 100644 package/usbmount/usbmount-rules-fix.patch

diff --git a/package/usbmount/Config.in b/package/usbmount/Config.in
index 33e1f05f90..dbbc72d0a9 100644
--- a/package/usbmount/Config.in
+++ b/package/usbmount/Config.in
@@ -1,9 +1,17 @@
 config BR2_PACKAGE_USBMOUNT
 	bool "usbmount"
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_LOCKFILE_PROGS
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	help
 	  The usbmount package automatically mounts USB mass storage devices
 	  when they are plugged in, and unmounts them when they are removed.
 
 	  http://usbmount.alioth.debian.org/
+
+comment "usbmount requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/usbmount/usbmount-fstype-detection-fix.patch b/package/usbmount/usbmount-fstype-detection-fix.patch
new file mode 100644
index 0000000000..a3686f1c47
--- /dev/null
+++ b/package/usbmount/usbmount-fstype-detection-fix.patch
@@ -0,0 +1,25 @@
+newer blkid version shows two parameter with TYPE within:
+
+/dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos"
+PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1"
+
+change regular expression to take " TYPE" only
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ usbmount |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/usbmount
+===================================================================
+--- a/usbmount
++++ b/usbmount
+@@ -88,7 +88,7 @@
+     #   FIXME: improvement: implement mounting by label (notice that labels
+     #   can contain spaces, which makes things a little bit less comfortable).
+     DEVINFO=$(/sbin/blkid -p $DEVNAME)
+-    FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
++    FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+     UUID=$(echo "$DEVINFO"   | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+     USAGE=$(echo "$DEVINFO"  | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+
diff --git a/package/usbmount/usbmount-rules-fix.patch b/package/usbmount/usbmount-rules-fix.patch
new file mode 100644
index 0000000000..c71b613c8a
--- /dev/null
+++ b/package/usbmount/usbmount-rules-fix.patch
@@ -0,0 +1,19 @@
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ usbmount.rules |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: b/usbmount.rules
+===================================================================
+--- a/usbmount.rules
++++ b/usbmount.rules
+@@ -1,7 +1,7 @@
+ # Rules for USBmount -*- conf -*-
+
+ KERNEL=="sd*", DRIVERS=="sbp2",		ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+-KERNEL=="sd*", SUBSYSTEMS=="usb",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+-KERNEL=="ub*", SUBSYSTEMS=="usb",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
++KERNEL=="sd*", SUBSYSTEM=="block",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
++KERNEL=="ub*", SUBSYSTEM=="block",	ACTION=="add",	RUN+="/usr/share/usbmount/usbmount add"
+ KERNEL=="sd*",				ACTION=="remove",	RUN+="/usr/share/usbmount/usbmount remove"
+ KERNEL=="ub*",				ACTION=="remove",	RUN+="/usr/share/usbmount/usbmount remove"
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index abe349dcfc..0f93e5babf 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -6,20 +6,29 @@
 USBMOUNT_VERSION = 0.0.21
 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
 USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount
-USBMOUNT_DEPENDENCIES = udev lockfile-progs
+USBMOUNT_DEPENDENCIES = udev lockfile-progs util-linux
 
 define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
+
+	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink 	\
+		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_create_model_symlink
+	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink 	\
+		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
+
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
 	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
 	        $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
 	fi
+
+	mkdir -p $(addprefix $(TARGET_DIR)/media/usb,0 1 2 3 4 5 6 7)
 endef
 
 define USBMOUNT_UNINSTALL_TARGET_CMDS
-	rm -rf $(TARGET_DIR)/etc/usbmount \
-	       $(TARGET_DIR)/usr/share/usbmount/usbmount \
-	       $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
+	rm -rf $(TARGET_DIR)/etc/usbmount			\
+		$(TARGET_DIR)/usr/share/usbmount/usbmount	\
+		$(TARGET_DIR)/lib/udev/rules.d/usbmount.rules	\
+		$(TARGET_DIR)/media/usb?
 endef
 
 $(eval $(call GENTARGETS,package,usbmount))

From 4e3ae5ccaba22b6db443a768c8c6a5f2b14d01af Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jul 2011 21:08:21 +0200
Subject: [PATCH 0488/6849] busybox: BR2_PACKAGE_BUSYBOX_SHOW_OTHER: remove
 conditional check

It is already within an 'if BR2_PACKAGE_BUSYBOX' section.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 283e59f569..488b12483f 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -56,7 +56,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
 	  Most people will just use the default BusyBox configuration file.
 
 config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	bool "Show packages that are also provided by busybox" if BR2_PACKAGE_BUSYBOX
+	bool "Show packages that are also provided by busybox"
 	help
 	  Show packages in menuconfig that are potentially also provided
 	  by busybox.

From 3612ecf4a86f10a7d4601504d21b2872c0ed1c29 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jul 2011 23:26:36 +0200
Subject: [PATCH 0489/6849] iso9660: fix build after linux package change

linux26 target is no more.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/iso9660/iso9660.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index a31b557094..afebafcd8a 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
 ISO9660_OPTS+=-U
 endif
 
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 rootfs-ext2 grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-ext2 grub
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
 	mkdir -p $(ISO9660_TARGET_DIR)
 	mkdir -p $(ISO9660_TARGET_DIR)/boot/grub

From a4a20acb2e7a4e050ead17097660ee0892fed172 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 00:01:47 +0200
Subject: [PATCH 0490/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8396dce9a6..cf01121ef5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,17 +15,22 @@
 	Make source/external-deps now also works for external
 	toolchains / crosstool-ng backend.
 
-	Updated/fixed packages: berkeleydb, bmon, bridge-utils,
-	busybox, cmake, dbus, dbus-glib, ethtool, ffmpeg,
-	gst-plugins-bad, gst-plugins-base, gvfs, jpeg, lame,
-	libarchive, libdnet, libgcrypt, libgtk2, libmpeg2, libpng,
-	lighttpd, linux-fusion, lzo, mtd-utils, oprofile, proftpd, qt,
-	ruby, shared-mime-info, sudo, sqlite, synergy, usbutils,
-	valgrind, webkit, xz
-
-	New packages: acl, attr, ebtables, gnutls, libargtable2,
-	libiqrf, libnspr, libnss, libroxml, libyaml, live555, mxml,
-	rsyslog, sredird, statserial, stunnel, uboot-tools, yajl
+	Updated/fixed packages: berkeleydb, bind, binutils, bmon,
+	bridge-utils, busybox, cmake, dbus, dbus-glib, e2fsprogs,
+	ethtool, ffmpeg, gst-plugins-{bad,base,good,ugly}, gvfs,
+	hostapd, iproute2, iptables, jpeg, lame, libarchive, libdnet,
+	libdrm, libgcrypt, libgtk2, libmpeg2, libpng, lighttpd,
+	linux-fusion, lzo, mtd-utils, nfs-utils, oprofile, proftpd,
+	qt, ruby, sdl, shared-mime-info, sudo, sqlite, squid, synergy,
+	udev, usbmount, usbutils, util-linux, valgrind, webkit,
+	xorg-xserver, xz, zlib
+
+	New packages: acl, attr, ebtables, gnutls, inotify-tools,
+	ipset, libargtable2, libiqrf, libmnl, libnspr, libnss,
+	libroxml, libyaml, live555, mxml, orc, rsyslog, sredird,
+	statserial, stunnel, ti-utils, uboot-tools, yajl
+
+	Removed packages: hal
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 49086f19fe49c976a4d925de838007281e7e8588 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 09:19:30 +0200
Subject: [PATCH 0491/6849] util-linux: fix sub option typos

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index c0e15e7158..5d954665ec 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -93,7 +93,7 @@ config BR2_PACKAGE_UTIL_LINUX_LAST
 	default n
 
 config BR2_PACKAGE_UTIL_LINUX_MESG
-	bool "build \"kill\""
+	bool "build \"mesg\""
 	default n
 
 config BR2_PACKAGE_UTIL_LINUX_PARTX
@@ -113,7 +113,7 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	default n
 
 config BR2_PACKAGE_UTIL_LINUX_WRITE
-	bool "build \"addpart, delpart, partx\""
+	bool "build \"write\""
 	default n
 
 endif

From bf102241678a7993cce7b028125400962e1974e8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 14:42:39 +0200
Subject: [PATCH 0492/6849] e2fsprogs: simplify Config.in

No need for 'depends on' for all individual options when they already
are in a conditional section.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/Config.in | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 2bb92d9778..3060719d5a 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -16,79 +16,64 @@ if BR2_PACKAGE_E2FSPROGS_UTILS
 config BR2_PACKAGE_E2FSPROGS_BADBLOCKS
 	bool "badblocks"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_BLKID
 	bool "blkid"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_CHATTR
 	bool "chattr"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_DUMPE2FS
 	bool "dumpe2fs"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBUUID
 
 config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG
 	bool "e2freefrag"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
-
 
 config BR2_PACKAGE_E2FSPROGS_E2FSCK
 	bool "e2fsck"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_E2LABEL
 	bool "e2label"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_E2UNDO
 	bool "e2undo"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_FILEFRAG
 	bool "filefrag"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_FINDFS
 	bool "findfs"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_E2LABEL
 
 config BR2_PACKAGE_E2FSPROGS_FSCK
 	bool "fsck"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_LOGSAVE
 	bool "logsave"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_LSATTR
 	bool "lsattr"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_MKE2FS
 	bool "mke2fs"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
@@ -99,19 +84,16 @@ config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
 config BR2_PACKAGE_E2FSPROGS_TUNE2FS
 	bool "tune2fs"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_E2LABEL
 
 config BR2_PACKAGE_E2FSPROGS_UUIDGEN
 	bool "uuidgen"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBUUID
 
 config BR2_PACKAGE_E2FSPROGS_UUIDD
 	bool "uuidd"
 	default y
-	depends on BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_E2FSPROGS_LIBUUID
 	help
 	  The uuidd daemon from the e2fsprogs suite

From f94057d89d454bd6683e979cee1ef79c79c24401 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 14:55:59 +0200
Subject: [PATCH 0493/6849] e2fsprogs: don't build uuidd if not requested

Rather than not installing it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index cf1a6b857c..8a7edb4274 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -14,6 +14,7 @@ E2FSPROGS_CONF_OPT = \
 	--disable-debugfs \
 	--disable-imager \
 	--disable-resizer \
+	$(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \
 	--enable-fsck \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
@@ -40,7 +41,6 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDD) += usr/sbin/uuidd
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen
 
 # libraries to keep or remove

From 5d7cac5eb28742cc6156aa902349918879add8a8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 15:04:09 +0200
Subject: [PATCH 0494/6849] e2fsprogs: add options for
 debugfs/e2image/resize2fs utilities

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/Config.in    | 9 +++++++++
 package/e2fsprogs/e2fsprogs.mk | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 3060719d5a..2410fef99b 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -26,6 +26,9 @@ config BR2_PACKAGE_E2FSPROGS_CHATTR
 	bool "chattr"
 	default y
 
+config BR2_PACKAGE_E2FSPROGS_DEBUGFS
+	bool "debugfs"
+
 config BR2_PACKAGE_E2FSPROGS_DUMPE2FS
 	bool "dumpe2fs"
 	default y
@@ -40,6 +43,9 @@ config BR2_PACKAGE_E2FSPROGS_E2FSCK
 	default y
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
+config BR2_PACKAGE_E2FSPROGS_E2IMAGE
+	bool "e2image"
+
 config BR2_PACKAGE_E2FSPROGS_E2LABEL
 	bool "e2label"
 	default y
@@ -81,6 +87,9 @@ config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
 	default y
 	depends on BR2_PACKAGE_E2FSPROGS
 
+config BR2_PACKAGE_E2FSPROGS_RESIZE2FS
+	bool "resize2fs"
+
 config BR2_PACKAGE_E2FSPROGS_TUNE2FS
 	bool "tune2fs"
 	default y
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 8a7edb4274..6381d05aa3 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -11,9 +11,9 @@ E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \
 	--enable-elf-shlibs \
-	--disable-debugfs \
-	--disable-imager \
-	--disable-resizer \
+	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \
 	--enable-fsck \
 	--disable-e2initrd-helper \

From c2b730f4471a005981a96e2b1902a2577fcb5a7e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 15:45:02 +0200
Subject: [PATCH 0495/6849] e2fsprogs: configure needs pkg-config

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 6381d05aa3..e4ae86ac7c 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -19,6 +19,8 @@ E2FSPROGS_CONF_OPT = \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
 
+E2FSPROGS_DEPENDENCIES = host-pkg-config
+
 E2FSPROGS_MAKE_OPT = \
 	LDCONFIG=true
 

From 43d198c051556f66ec3bb6226415dce822e7a0c4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 17:54:37 +0200
Subject: [PATCH 0496/6849] util-linux: libblkid needs liibuuid

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 5d954665ec..4bb614a3bd 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -33,6 +33,7 @@ config BR2_PACKAGE_UTIL_LINUX_UUIDD
 	default y
 
 config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	bool "build libblkid and blkid utilities"
 	default y
 

From e1ffc2f791b336339909c90559b7db40b455f172 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 17:58:50 +0200
Subject: [PATCH 0497/6849] e2fsprogs: use libblkid / blkid from util-linux

e2fsprogs and util-linux both provide blkid / libblkid causing conflicts
if both are enabled. The preferred upstream (E.G. what is used by Debian)
is util-linux, so remove the options from e2fsprogs and make it use the
util-linux version instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/Config.in    | 23 ++++++-----------------
 package/e2fsprogs/e2fsprogs.mk | 16 +---------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 2410fef99b..76586d2394 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -2,6 +2,10 @@
 config BR2_PACKAGE_E2FSPROGS
 	bool "e2fsprogs"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	help
 	  The EXT2 file system utilities and libraries
 
@@ -17,11 +21,6 @@ config BR2_PACKAGE_E2FSPROGS_BADBLOCKS
 	bool "badblocks"
 	default y
 
-config BR2_PACKAGE_E2FSPROGS_BLKID
-	bool "blkid"
-	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
-
 config BR2_PACKAGE_E2FSPROGS_CHATTR
 	bool "chattr"
 	default y
@@ -41,7 +40,6 @@ config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG
 config BR2_PACKAGE_E2FSPROGS_E2FSCK
 	bool "e2fsck"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_E2IMAGE
 	bool "e2image"
@@ -49,7 +47,6 @@ config BR2_PACKAGE_E2FSPROGS_E2IMAGE
 config BR2_PACKAGE_E2FSPROGS_E2LABEL
 	bool "e2label"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_E2UNDO
 	bool "e2undo"
@@ -67,7 +64,6 @@ config BR2_PACKAGE_E2FSPROGS_FINDFS
 config BR2_PACKAGE_E2FSPROGS_FSCK
 	bool "fsck"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_LOGSAVE
 	bool "logsave"
@@ -80,7 +76,6 @@ config BR2_PACKAGE_E2FSPROGS_LSATTR
 config BR2_PACKAGE_E2FSPROGS_MKE2FS
 	bool "mke2fs"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
 	bool "mklost+found"
@@ -117,14 +112,8 @@ config BR2_PACKAGE_E2FSPROGS_LIBUUID
 	help
 	  The uuid library from the e2fsprogs suite
 
-config BR2_PACKAGE_E2FSPROGS_LIBBLKID
-	bool "libblkid"
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
-	help
-	  The blkid library from the e2fsprogs suite
-
 endmenu
 
-comment "e2fsprogs requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "e2fsprogs requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index e4ae86ac7c..42bdd2c6a7 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -15,6 +15,7 @@ E2FSPROGS_CONF_OPT = \
 	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \
+	--disable-blkid \
 	--enable-fsck \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
@@ -30,7 +31,6 @@ endef
 
 # binaries to keep or remove
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BLKID) += usr/sbin/blkid
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_CHATTR) += usr/bin/chattr
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += usr/sbin/dumpe2fs
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
@@ -47,7 +47,6 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen
 
 # libraries to keep or remove
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LIBUUID) += usr/lib/libuuid.so*
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LIBBLKID) += usr/lib/libblkid.so*
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libcom_err.so*
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libe2p.so*
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libext2fs.so*
@@ -117,18 +116,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y)
 E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL
 endif
 
-define E2FSPROGS_STAGING_LIBBLKID_INSTALL
-	install -D $(@D)/lib/blkid/blkid.h \
-		$(STAGING_DIR)/usr/include/blkid/blkid.h
-	install -D $(@D)/lib/blkid/blkid_types.h \
-		$(STAGING_DIR)/usr/include/blkid/blkid_types.h
-	install -D $(@D)/lib/blkid/blkid.pc \
-		$(STAGING_DIR)/usr/lib/pkgconfig/blkid.pc
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBBLKID),y)
-E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBBLKID_INSTALL
-endif
-
 $(eval $(call AUTOTARGETS,package,e2fsprogs))
 $(eval $(call AUTOTARGETS,package,e2fsprogs,host))

From 1af183e95b0b61cb122ea8417aa2254930b73ecb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jul 2011 23:26:29 +0200
Subject: [PATCH 0498/6849] e2fsprogs: ensure util-linux is built before
 e2fsprogs

For libblkid.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 42bdd2c6a7..21e65d15a9 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -20,7 +20,7 @@ E2FSPROGS_CONF_OPT = \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
 
-E2FSPROGS_DEPENDENCIES = host-pkg-config
+E2FSPROGS_DEPENDENCIES = host-pkg-config util-linux
 
 E2FSPROGS_MAKE_OPT = \
 	LDCONFIG=true

From 6486661a6b41158535d785db9e1e403f7216b5d9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 08:36:55 +0200
Subject: [PATCH 0499/6849] util-linux: install to staging

For libblkid / libuuid.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index c01a4ff79a..72dabaf096 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -8,6 +8,7 @@ UTIL_LINUX_VERSION_MAJOR = 2.19
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_AUTORECONF = YES
+UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkg-config
 
 UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown

From 7ee8ebbd813ad0a6d2392ef628c1724104f0619b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 08:39:02 +0200
Subject: [PATCH 0500/6849] autoconf: use dummy autopoint

We currently don't build a host-gettext package, so when a package using
gettext is autoreconf'ed, we end up using autopoint from the host.

Autopoint unfortunately requires CVS, so if that isn't available autoreconf
fails.

From reading:

http://www.gnu.org/software/gnulib/manual/html_node/gettextize-and-autopoint.html

It seems that we don't really need to rerun autopoint, so fix it by
passing autopoint=/bin/true instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/autoconf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 0ff0644f94..45bb635309 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -23,4 +23,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
 AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"

From e1fbd63f3c9700ef9d590ea7b4659ca592db5e3c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 08:49:48 +0200
Subject: [PATCH 0501/6849] package: use libuuid from util-linux

And adjust users.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/Config.in    | 25 ++++---------------------
 package/e2fsprogs/e2fsprogs.mk | 19 +------------------
 package/gdisk/Config.in        | 18 +++++++++++-------
 package/gdisk/gdisk.mk         |  2 +-
 package/xfsprogs/Config.in     | 10 ++++++----
 package/xfsprogs/xfsprogs.mk   |  2 +-
 6 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 76586d2394..91e167067e 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -6,16 +6,13 @@ config BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
-	  The EXT2 file system utilities and libraries
+	  The EXT2 file system utilities.
 
-menuconfig BR2_PACKAGE_E2FSPROGS_UTILS
-	bool "e2fsprogs utilities"
-	depends on BR2_PACKAGE_E2FSPROGS
-	help
-	  e2fsprogs utilities selection
+	  http://e2fsprogs.sf.net
 
-if BR2_PACKAGE_E2FSPROGS_UTILS
+if BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_BADBLOCKS
 	bool "badblocks"
@@ -31,7 +28,6 @@ config BR2_PACKAGE_E2FSPROGS_DEBUGFS
 config BR2_PACKAGE_E2FSPROGS_DUMPE2FS
 	bool "dumpe2fs"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
 
 config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG
 	bool "e2freefrag"
@@ -93,27 +89,14 @@ config BR2_PACKAGE_E2FSPROGS_TUNE2FS
 config BR2_PACKAGE_E2FSPROGS_UUIDGEN
 	bool "uuidgen"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
 
 config BR2_PACKAGE_E2FSPROGS_UUIDD
 	bool "uuidd"
 	default y
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
 	help
 	  The uuidd daemon from the e2fsprogs suite
 
 endif
 
-menu "e2fsprogs libraries"
-	depends on BR2_PACKAGE_E2FSPROGS
-
-config BR2_PACKAGE_E2FSPROGS_LIBUUID
-	bool "libuuid"
-	help
-	  The uuid library from the e2fsprogs suite
-
-endmenu
-
 comment "e2fsprogs requires a toolchain with LARGEFILE + WCHAR support"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
-
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 21e65d15a9..1cfeb0135e 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -6,7 +6,6 @@
 
 E2FSPROGS_VERSION = 1.41.14
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
-E2FSPROGS_INSTALL_STAGING = YES
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \
@@ -16,6 +15,7 @@ E2FSPROGS_CONF_OPT = \
 	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \
 	--disable-blkid \
+	--disable-libuuid \
 	--enable-fsck \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
@@ -45,13 +45,6 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen
 
-# libraries to keep or remove
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LIBUUID) += usr/lib/libuuid.so*
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libcom_err.so*
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libe2p.so*
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libext2fs.so*
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libss.so*
-
 # files to remove
 E2FSPROGS_TXTTARGETS_ = \
 	usr/sbin/mkfs.ext[234] \
@@ -106,15 +99,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
 E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
 endif
 
-define E2FSPROGS_STAGING_LIBUUID_INSTALL
-	install -D $(@D)/lib/uuid/uuid.h $(STAGING_DIR)/usr/include/uuid/uuid.h
-	install -D $(@D)/lib/uuid/uuid.pc \
-		$(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y)
-E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL
-endif
-
 $(eval $(call AUTOTARGETS,package,e2fsprogs))
 $(eval $(call AUTOTARGETS,package,e2fsprogs,host))
diff --git a/package/gdisk/Config.in b/package/gdisk/Config.in
index 0daec5d5a6..02bc188ff2 100644
--- a/package/gdisk/Config.in
+++ b/package/gdisk/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_GDISK
 	bool "gdisk"
-	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # util-linux
 	help
 	  GPT fdisk (consisting of the gdisk and sgdisk programs) is a
 	  text-mode partitioning tool that works on Globally Unique Identifier
@@ -12,8 +14,9 @@ config BR2_PACKAGE_GDISK
 config BR2_PACKAGE_GDISK_GDISK
 	bool "interactive gdisk"
 	depends on BR2_PACKAGE_GDISK
-	select BR2_PACKAGE_E2FSPROGS
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
 	  Install the interactive GUID partition table (GPT) manipulator
 	  /usr/sbin/gdisk which is modelled after and quite similar in use
@@ -22,13 +25,14 @@ config BR2_PACKAGE_GDISK_GDISK
 config BR2_PACKAGE_GDISK_SGDISK
 	bool "command line sgdisk"
 	depends on BR2_PACKAGE_GDISK
-	select BR2_PACKAGE_E2FSPROGS
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_POPT
 	help
 	  Install the command-line GUID partition table (GPT) manipulator
 	  /usr/sbin/sgdisk which is named after the traditional MBR based
 	  sfdisk tool albeit with an entirely different option syntax.
 
-comment "gdisk requires a toolchain with LARGEFILE and C++ support enabled"
-	depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPP
+comment "gdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
+	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
index ef4627d8e6..bc7bc32538 100644
--- a/package/gdisk/gdisk.mk
+++ b/package/gdisk/gdisk.mk
@@ -13,7 +13,7 @@ GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk
 
 ifneq ($(GDISK_TARGETS_y),)
 
-GDISK_DEPENDENCIES += e2fsprogs
+GDISK_DEPENDENCIES += util-linux
 ifeq ($(BR2_PACKAGE_GDISK_SGDISK),y)
     GDISK_DEPENDENCIES += popt
 endif
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
index 12bc69e1eb..6c4d547dcd 100644
--- a/package/xfsprogs/Config.in
+++ b/package/xfsprogs/Config.in
@@ -2,14 +2,16 @@
 comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled"
 	depends on BR2_PACKAGE_XFSPROGS
 
-comment "xfsprogs requires a toolchain with LARGEFILE support"
-        depends on !BR2_LARGEFILE
+comment "xfsprogs requires a toolchain with LARGEFILE + WCHAR support"
+        depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_XFSPROGS
 	bool "xfsprogs"
 	depends on BR2_LARGEFILE
-	select BR2_PACKAGE_E2FSPROGS
-	select BR2_PACKAGE_E2FSPROGS_LIBUUID
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
 	  The XFS file system utilities and libraries
 
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 866e9b295c..204b3cbd66 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -77,7 +77,7 @@ $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
 	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
 
-xfsprogs: e2fsprogs $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
+xfsprogs: util-linux $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
 
 xfsprogs-clean:
 	rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs

From 952d96d5aed88bf0e7f7e6df55003c9ad5115f10 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 08:53:55 +0200
Subject: [PATCH 0502/6849] util-linux: drop BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 dependency

Drop the dependency as it isn't really nice that other packages need
to select it, and kconf complains about it:

warning: (BR2_PACKAGE_E2FSPROGS && BR2_PACKAGE_USBMOUNT) selects
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS which has unmet direct dependencies
 (!BR2_PACKAGE_BUSYBOX)

Instead ensure that only the libraries are built by default, so
busybox applets are still used unless explicitly configured.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  2 +-
 package/e2fsprogs/Config.in  |  1 -
 package/gdisk/Config.in      |  2 --
 package/usbmount/Config.in   |  1 -
 package/util-linux/Config.in | 22 ----------------------
 package/xfsprogs/Config.in   |  1 -
 6 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 61f82560e1..7112e059e3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -514,8 +514,8 @@ source "package/psmisc/Config.in"
 source "package/rsyslog/Config.in"
 source "package/sysklogd/Config.in"
 source "package/sysvinit/Config.in"
-source "package/util-linux/Config.in"
 endif
+source "package/util-linux/Config.in"
 source "package/dsp-tools/Config.in"
 endmenu
 
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 91e167067e..ebf500309b 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_E2FSPROGS
 	bool "e2fsprogs"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # util-linux
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
diff --git a/package/gdisk/Config.in b/package/gdisk/Config.in
index 02bc188ff2..24d305d1f9 100644
--- a/package/gdisk/Config.in
+++ b/package/gdisk/Config.in
@@ -14,7 +14,6 @@ config BR2_PACKAGE_GDISK
 config BR2_PACKAGE_GDISK_GDISK
 	bool "interactive gdisk"
 	depends on BR2_PACKAGE_GDISK
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
@@ -25,7 +24,6 @@ config BR2_PACKAGE_GDISK_GDISK
 config BR2_PACKAGE_GDISK_SGDISK
 	bool "command line sgdisk"
 	depends on BR2_PACKAGE_GDISK
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_POPT
diff --git a/package/usbmount/Config.in b/package/usbmount/Config.in
index dbbc72d0a9..6980c8c274 100644
--- a/package/usbmount/Config.in
+++ b/package/usbmount/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_USBMOUNT
 	depends on BR2_USE_WCHAR # util-linux
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_LOCKFILE_PROGS
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	help
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 4bb614a3bd..45b0a825de 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -18,11 +18,9 @@ if BR2_PACKAGE_UTIL_LINUX
 
 config BR2_PACKAGE_UTIL_LINUX_MOUNT
 	bool "build mount utilties"
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_FSCK
 	bool "build \"fsck\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	bool "build libuuid and uuid utilities"
@@ -30,7 +28,6 @@ config BR2_PACKAGE_UTIL_LINUX_LIBUUID
 
 config BR2_PACKAGE_UTIL_LINUX_UUIDD
 	bool "build \"uuidd\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -39,39 +36,30 @@ config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 
 config BR2_PACKAGE_UTIL_LINUX_AGETTY
 	bool "build \"agetty\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_CRAMFS
 	bool "build \"fsck.cramfs, mkfs.cramfs\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
 	bool "build \"switch_root\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
 	bool "build \"pivot_root\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_FALLOCATE
 	bool "build \"fallocate\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_UNSHARE
 	bool "build \"unshare\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_RENAME
 	bool "build \"rename\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
 	bool "build \"chrt, ionice, teskset\""
-	default y
 
 config BR2_PACKAGE_UTIL_LINUX_WALL
 	bool "build \"wall\""
-	default y
 
 ############################################
 # default disabled and should be enabled by
@@ -79,43 +67,33 @@ config BR2_PACKAGE_UTIL_LINUX_WALL
 #
 config BR2_PACKAGE_UTIL_LINUX_ARCH
 	bool "build \"arch\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_INIT
 	bool "build \"simpleinit, shutdown, initctl\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_KILL
 	bool "build \"kill\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_LAST
 	bool "build \"last\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_MESG
 	bool "build \"mesg\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_PARTX
 	bool "build \"addpart, delpart, partx\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_RAW
 	bool "build \"raw\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_RESET
 	bool "build \"reset\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	bool "build \"chfn, chsh, login, newgrp, vipw\""
-	default n
 
 config BR2_PACKAGE_UTIL_LINUX_WRITE
 	bool "build \"write\""
-	default n
 
 endif
 
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
index 6c4d547dcd..fda068f7d6 100644
--- a/package/xfsprogs/Config.in
+++ b/package/xfsprogs/Config.in
@@ -9,7 +9,6 @@ config BR2_PACKAGE_XFSPROGS
 	bool "xfsprogs"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # util-linux
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help

From 70db1984dc003452dae7a9b449843c4e13620e00 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 09:09:44 +0200
Subject: [PATCH 0503/6849] toolchain/helpers.mk: unbreak check_glibc after
 PROGRAM_INVOCATION removal

As noticed by Thomas Petazzoni on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 123720b87e..4d90d15ecb 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -147,7 +147,7 @@ check_glibc = \
 	$(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\
 	$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
 	$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
-	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
+	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support)
 
 #
 # Check the conformity of Buildroot configuration with regard to the

From cef0721c743312c477fb87863939588b553c0a1b Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Fri, 29 Jul 2011 09:46:10 +0200
Subject: [PATCH 0504/6849] libroxml: bump version

Closes #3997

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                       |  1 +
 package/libroxml/Config.in                    |  2 +-
 .../libroxml/libroxml-2.0.3-fix-install.patch | 25 -------------------
 package/libroxml/libroxml.mk                  |  2 +-
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 package/libroxml/libroxml-2.0.3-fix-install.patch

diff --git a/CHANGES b/CHANGES
index cf01121ef5..46dc4881d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,7 @@
 	#3907: 2011.05 - Qt 4.7.3 not building on ARM
 	#3961: Nfs-utils: Remove SUSv3-function index
 	#3985: "help" target's defconfig list needs sort
+	#3997: bump libroxml to v2.1.0
 
 2011.05, Released May 27th, 2011:
 
diff --git a/package/libroxml/Config.in b/package/libroxml/Config.in
index e26d239f89..b6b253fcdd 100644
--- a/package/libroxml/Config.in
+++ b/package/libroxml/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBROXML
 	  xpath handling. Roxml is a binary using libroxml to explore
 	  xml file from shell scripts.
 
-	  http://libroxml.googlecode.com
+	  http://www.libroxml.net
diff --git a/package/libroxml/libroxml-2.0.3-fix-install.patch b/package/libroxml/libroxml-2.0.3-fix-install.patch
deleted file mode 100644
index fe3cfad8f4..0000000000
--- a/package/libroxml/libroxml-2.0.3-fix-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH] fix make install if doxygen isn't available
-
-If doxygen isn't available, then man pages / html docs won't get created,
-so don't try to install them.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: libroxml-2.0.3/Makefile
-===================================================================
---- libroxml-2.0.3.orig/Makefile
-+++ libroxml-2.0.3/Makefile
-@@ -153,8 +153,8 @@
- 	$E install -D $(INC) $(DESTDIR)/usr/include
- 	$E install -D LGPL.txt $(DESTDIR)/usr/share/doc/libroxml/
- 	$E install -D docs/roxml.1 $(DESTDIR)/usr/share/man/man1/
--	$E install -D docs/man/man3/* $(DESTDIR)/usr/share/man/man3/
--	$E install -D docs/html/* $(DESTDIR)/usr/share/doc/libroxml/html/
-+	$E [ ! -d docs/man/man3 ] || install -D docs/man/man3/* $(DESTDIR)/usr/share/man/man3/
-+	$E [ ! -d docs/html ] || install -D docs/html/* $(DESTDIR)/usr/share/doc/libroxml/html/
- 	$E install -m644 libroxml.pc $(DESTDIR)/usr/lib/pkgconfig
- 	$E cp -d $(TARGET_LN) $(DESTDIR)/usr/lib
- 
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index bf067dfd7d..88d3e664d8 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
 # libroxml
 #
 
-LIBROXML_VERSION = 2.0.3
+LIBROXML_VERSION = 2.1.0
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 

From 8d657be342788bf5dd7d9690061787580b571f6f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 09:52:59 +0200
Subject: [PATCH 0505/6849] libroxml: drop -Werror from CFLAGS

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libroxml/libroxml-2.1.0-werror.patch | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/libroxml/libroxml-2.1.0-werror.patch

diff --git a/package/libroxml/libroxml-2.1.0-werror.patch b/package/libroxml/libroxml-2.1.0-werror.patch
new file mode 100644
index 0000000000..a72f2a786e
--- /dev/null
+++ b/package/libroxml/libroxml-2.1.0-werror.patch
@@ -0,0 +1,22 @@
+[PATCH] remove -Werror from CFLAGS
+
+-Werror should only be used during development, not in released SW.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libroxml-2.1.0/Makefile
+===================================================================
+--- libroxml-2.1.0.orig/Makefile
++++ libroxml-2.1.0/Makefile
+@@ -41,7 +41,7 @@
+ 
+ # options
+ override CPPFLAGS += -Iinc/
+-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES)
++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES)
+ override LDFLAGS += 
+ 
+ ifeq ("$(OS)", "Darwin")

From 1050bf67c7f4fd10c31ab7fa687b5609094681a4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 13:34:18 +0200
Subject: [PATCH 0506/6849] util-linux: mount/fsck needs libblkid

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 45b0a825de..f4be2b7604 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -18,8 +18,10 @@ if BR2_PACKAGE_UTIL_LINUX
 
 config BR2_PACKAGE_UTIL_LINUX_MOUNT
 	bool "build mount utilties"
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 
 config BR2_PACKAGE_UTIL_LINUX_FSCK
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	bool "build \"fsck\""
 
 config BR2_PACKAGE_UTIL_LINUX_LIBUUID

From 55cea3b5ef3bd5464420fd610c73e150443d0e67 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jul 2011 13:38:49 +0200
Subject: [PATCH 0507/6849] util-linux: add option for libmount

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in     | 4 ++++
 package/util-linux/util-linux.mk | 1 +
 2 files changed, 5 insertions(+)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index f4be2b7604..816130dafa 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -24,6 +24,10 @@ config BR2_PACKAGE_UTIL_LINUX_FSCK
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	bool "build \"fsck\""
 
+config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	bool "build libmount"
+
 config BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	bool "build libuuid and uuid utilities"
 	default y
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 72dabaf096..570a1d1749 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -33,6 +33,7 @@ endif
 UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),,--disable-mount) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),,--disable-fsck) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),,--disable-libmount) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),,--disable-libuuid) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UUID),,--disable-uuid) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),,--disable-libblkid) \

From db185234b4ce7687868ac662fc2a14098f90dcf8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 2 Aug 2011 10:00:16 +0200
Subject: [PATCH 0508/6849] udev: bump to 173

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/udev.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 6d87ad33dc..567bbfb295 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 172
+UDEV_VERSION = 173
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 
@@ -19,11 +19,11 @@ ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
 UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
 UDEV_CONF_OPT +=							\
 	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
-	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids
+	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\
+	--enable-udev_acl
 else
 UDEV_CONF_OPT +=		\
 	--disable-hwdb		\
-	--disable-udev_acl	\
 	--disable-gudev
 endif
 

From 411543ae80171f9555725421b390c922ae8d6375 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 4 Aug 2011 20:32:54 +0200
Subject: [PATCH 0509/6849] kernel-headers: bump 2.6.35.x / 2.6.39.x stable
 versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...i-use-__uX-types-for-headers-exported-to-user-space.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-2.6.35.13-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index bc8a024ed2..d0ec9d505f 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -49,11 +49,11 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.35.13"	if BR2_KERNEL_HEADERS_2_6_35
+	default "2.6.35.14"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
-	default "2.6.39.3"	if BR2_KERNEL_HEADERS_2_6_39
+	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0"		if BR2_KERNEL_HEADERS_3_0
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-2.6.35.13-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-2.6.35.13-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
rename to toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

From b760d12553149a35f9c8451a750b4e88b81c9652 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 3 Aug 2011 11:18:19 +0200
Subject: [PATCH 0510/6849] openvpn: bump to 2.2.1

tmpdir issue was already fixed in 2.2.1 version, so
remove the patch

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/openvpn-fix-tmpdir.patch | 39 ------------------------
 package/openvpn/openvpn.mk               |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 package/openvpn/openvpn-fix-tmpdir.patch

diff --git a/package/openvpn/openvpn-fix-tmpdir.patch b/package/openvpn/openvpn-fix-tmpdir.patch
deleted file mode 100644
index 919d49bf23..0000000000
--- a/package/openvpn/openvpn-fix-tmpdir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b70d99fb617350b252c8bde2f1f2d81d3f5b7955 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 27 Apr 2011 18:43:50 +0200
-Subject: [PATCH] Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto
-
-The tmp_dir string is required in the options struct regardless of options
-so spin it out of #if conditionals.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Acked-by: David Sommerseth <dazo@users.sourceforge.net>
-Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
----
- options.h |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/options.h b/options.h
-index a9c6a94..8a51502 100644
---- a/options.h
-+++ b/options.h
-@@ -369,6 +369,8 @@ struct options
-   struct plugin_option_list *plugin_list;
- #endif
- 
-+  const char *tmp_dir;
-+
- #if P2MP
- 
- #if P2MP_SERVER
-@@ -409,7 +411,6 @@ struct options
-   const char *client_connect_script;
-   const char *client_disconnect_script;
-   const char *learn_address_script;
--  const char *tmp_dir;
-   const char *client_config_dir;
-   bool ccd_exclusive;
-   bool disable;
--- 
-1.7.0.1
-
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 27a9a553d4..b7587fd047 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.2.0
+OPENVPN_VERSION = 2.2.1
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_CONF_OPT = --enable-small --disable-plugins
 

From d63a817f55a8591893431257657da44bb6c1103b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 30 Jul 2011 00:00:37 +0200
Subject: [PATCH 0511/6849] external toolchains: fix SuperH toolchain
 configuration

The CodeSourcery toolchain for SH2-A platforms provide largefile
support, inet RPC, wide char and threads, so adjust the configuration
accordingly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index bedbb53d8d..0253d8330b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -156,6 +156,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	bool "CodeSoucery SH 2010.09"
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_LARGEFILE
+	select BR2_INET_RPC
+	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Toolchain for the SuperH architecture, from CodeSourcery. It

From fc57b341d9e3ce65d6df4e3ec14d87eb2ff361be Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 4 Aug 2011 21:15:40 +0200
Subject: [PATCH 0512/6849] orc: target install: cleanup unused files

orcc is only needed when developing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/orc.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index f89d5cf93e..37b6e991cf 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -7,4 +7,18 @@ ORC_VERSION = 0.4.14
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_INSTALL_STAGING = YES
 
+define ORC_REMOVE_BUGREPORT
+	rm -f $(TARGET_DIR)/usr/bin/orc-bugreport
+endef
+
+define ORC_REMOVE_DEVFILES
+	rm -f $(TARGET_DIR)/usr/bin/orcc
+endef
+
+ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_BUGREPORT
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
+endif
+
 $(eval $(call AUTOTARGETS,package,orc))

From d49286740aaeacb413dd0aa8822ff06d164ebb27 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 4 Aug 2011 21:20:44 +0200
Subject: [PATCH 0513/6849] package: mark liboil + swfdec as deprecated

They are dead upstream, and will be removed during 2011.11 cycle unless
someone speaks up.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                             | 2 ++
 package/liboil/Config.in            | 1 +
 package/multimedia/swfdec/Config.in | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 46dc4881d1..caeff385cb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,8 @@
 	libroxml, libyaml, live555, mxml, orc, rsyslog, sredird,
 	statserial, stunnel, ti-utils, uboot-tools, yajl
 
+	Deprecated packages: liboil, swfdec
+
 	Removed packages: hal
 
 	Issues resolved (http://bugs.uclibc.org):
diff --git a/package/liboil/Config.in b/package/liboil/Config.in
index 0acbbfc13e..ad7a3d8fd0 100644
--- a/package/liboil/Config.in
+++ b/package/liboil/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBOIL
 	bool "liboil"
+	depends on BR2_DEPRECATED
 	help
 	  Library of simple functions that are optimized for various CPUs.
 
diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in
index bc1c73af93..46119fc4a6 100644
--- a/package/multimedia/swfdec/Config.in
+++ b/package/multimedia/swfdec/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SWFDEC
 	bool "swfdec"
+	depends on BR2_DEPRECATED
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	select BR2_PACKAGE_LIBOIL

From e9394d8ca2a52cac02e7e63bebaf4a71df8bdf2d Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Sun, 31 Jul 2011 22:18:39 +0200
Subject: [PATCH 0514/6849] libsoup: add patch to fix CVE-2011-2054

Fixes a security hole that caused some SoupServer users to
unintentionally allow accessing the entire local filesystem when
they thought they were only providing access to a single directory.

This is the change from libsoup-2.34.3 backported to 2.32.2. It
doesn't include the changes to the test suite though.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoup/libsoup-CVE-2011-2054.patch | 32 +++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/libsoup/libsoup-CVE-2011-2054.patch

diff --git a/package/libsoup/libsoup-CVE-2011-2054.patch b/package/libsoup/libsoup-CVE-2011-2054.patch
new file mode 100644
index 0000000000..0dc5eccf9d
--- /dev/null
+++ b/package/libsoup/libsoup-CVE-2011-2054.patch
@@ -0,0 +1,32 @@
+From 4617b6ef6dd21931a0153070c5b5ff7ef21b46f8 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Wed, 29 Jun 2011 10:04:06 -0400
+Subject: [PATCH] SoupServer: fix to not allow smuggling ".." into path
+
+When SoupServer:raw-paths was set (the default), it was possible to
+sneak ".." segments into the path passed to the SoupServerHandler,
+which could then end up tricking some handlers into retrieving
+arbitrary files from the filesystem. Fix that.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=653258
+
+diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
+index d56efd1..7225337 100644
+--- a/libsoup/soup-server.c
++++ b/libsoup/soup-server.c
+@@ -779,6 +779,15 @@ got_headers (SoupMessage *req, SoupClientContext *client)
+ 
+ 		uri = soup_message_get_uri (req);
+ 		decoded_path = soup_uri_decode (uri->path);
++
++		if (strstr (decoded_path, "/../") ||
++		    g_str_has_suffix (decoded_path, "/..")) {
++			/* Introducing new ".." segments is not allowed */
++			g_free (decoded_path);
++			soup_message_set_status (req, SOUP_STATUS_BAD_REQUEST);
++			return;
++		}
++
+ 		soup_uri_set_path (uri, decoded_path);
+ 		g_free (decoded_path);
+ 	}

From b4d1882f7e74d448abe37c5a57d9bf39f05e46b2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Jul 2011 17:14:01 -0300
Subject: [PATCH 0515/6849] iptables: bump to version 1.4.12

Bump iptables to version 1.4.12 for linux kernel 3.0 support

[Peter: Rename patch]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...bles-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch} | 0
 package/iptables/iptables.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/iptables/{iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch => iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch} (100%)

diff --git a/package/iptables/iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch b/package/iptables/iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
similarity index 100%
rename from package/iptables/iptables-1.4.11.1-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
rename to package/iptables/iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index c464e6b488..1ee88281ba 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.11.1
+IPTABLES_VERSION = 1.4.12
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From ced6c9df4328eea1c10bba11be8c02debe499ec4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Jul 2011 17:14:03 -0300
Subject: [PATCH 0516/6849] samba: bump to version 3.3.15

Bump samba to version 3.3.15 and add security patches for CVE-2011-2522
and CVE-2011-2694.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba-00CVE-2011-2694.patch |  55 ++
 package/samba/samba-01CVE-2011-2522.patch | 749 ++++++++++++++++++++++
 package/samba/samba-CVE-2011-0719.patch   | 613 ------------------
 package/samba/samba.mk                    |   7 +-
 4 files changed, 808 insertions(+), 616 deletions(-)
 create mode 100644 package/samba/samba-00CVE-2011-2694.patch
 create mode 100644 package/samba/samba-01CVE-2011-2522.patch
 delete mode 100644 package/samba/samba-CVE-2011-0719.patch

diff --git a/package/samba/samba-00CVE-2011-2694.patch b/package/samba/samba-00CVE-2011-2694.patch
new file mode 100644
index 0000000000..167accfad4
--- /dev/null
+++ b/package/samba/samba-00CVE-2011-2694.patch
@@ -0,0 +1,55 @@
+From d401ccaedaec09ad6900ec24ecaf205bed3e3ac1 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Thu, 7 Jul 2011 10:03:33 +0200
+Subject: [PATCH] s3 swat: Fix possible XSS attack (bug #8289)
+
+Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack
+against SWAT, the Samba Web Administration Tool. The attack uses reflection to
+insert arbitrary content into the "change password" page.
+
+This patch fixes the reflection issue by not printing user-specified content on
+the website anymore.
+
+Signed-off-by: Kai Blin <kai@samba.org>
+
+CVE-2011-2694.
+---
+ source/web/swat.c |   14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 9c7294a..434b1ac 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -1120,11 +1120,9 @@ static void chg_passwd(void)
+ 	if(cgi_variable(CHG_S_PASSWD_FLAG)) {
+ 		printf("<p>");
+ 		if (rslt == True) {
+-			printf(_(" The passwd for '%s' has been changed."), cgi_variable_nonull(SWAT_USER));
+-			printf("\n");
++			printf("%s\n", _(" The passwd has been changed."));
+ 		} else {
+-			printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable_nonull(SWAT_USER));
+-			printf("\n");
++			printf("%s\n", _(" The passwd has NOT been changed."));
+ 		}
+ 	}
+ 	
+@@ -1138,14 +1136,6 @@ static void passwd_page(void)
+ {
+ 	const char *new_name = cgi_user_name();
+ 
+-	/* 
+-	 * After the first time through here be nice. If the user
+-	 * changed the User box text to another users name, remember it.
+-	 */
+-	if (cgi_variable(SWAT_USER)) {
+-		new_name = cgi_variable_nonull(SWAT_USER);
+-	} 
+-
+ 	if (!new_name) new_name = "";
+ 
+ 	printf("<H2>%s</H2>\n", _("Server Password Management"));
+-- 
+1.7.1
+
diff --git a/package/samba/samba-01CVE-2011-2522.patch b/package/samba/samba-01CVE-2011-2522.patch
new file mode 100644
index 0000000000..7d48b554c0
--- /dev/null
+++ b/package/samba/samba-01CVE-2011-2522.patch
@@ -0,0 +1,749 @@
+From b610e0cee563465c6b970647b215f8ae4d0c6599 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 12:56:21 +0200
+Subject: [PATCH 01/12] s3 swat: Allow getting the user's HTTP auth password
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/cgi.c        |    9 +++++++++
+ source/web/swat_proto.h |    1 +
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/source/web/cgi.c b/source/web/cgi.c
+index 72aa11c..ccdc3a7 100644
+--- a/source/web/cgi.c
++++ b/source/web/cgi.c
+@@ -42,6 +42,7 @@ static char *query_string;
+ static const char *baseurl;
+ static char *pathinfo;
+ static char *C_user;
++static char *C_pass;
+ static bool inetd_server;
+ static bool got_request;
+ 
+@@ -388,6 +389,7 @@ static bool cgi_handle_authorization(char *line)
+ 			
+ 			/* Save the users name */
+ 			C_user = SMB_STRDUP(user);
++			C_pass = SMB_STRDUP(user_pass);
+ 			TALLOC_FREE(pass);
+ 			return True;
+ 		}
+@@ -422,6 +424,13 @@ char *cgi_user_name(void)
+         return(C_user);
+ }
+ 
++/***************************************************************************
++return a ptr to the users password
++  ***************************************************************************/
++char *cgi_user_pass(void)
++{
++        return(C_pass);
++}
+ 
+ /***************************************************************************
+ handle a file download
+diff --git a/source/web/swat_proto.h b/source/web/swat_proto.h
+index 0f84e4f..76f9c3c 100644
+--- a/source/web/swat_proto.h
++++ b/source/web/swat_proto.h
+@@ -31,6 +31,7 @@ const char *cgi_variable(const char *name);
+ const char *cgi_variable_nonull(const char *name);
+ bool am_root(void);
+ char *cgi_user_name(void);
++char *cgi_user_pass(void);
+ void cgi_setup(const char *rootdir, int auth_required);
+ const char *cgi_baseurl(void);
+ const char *cgi_pathinfo(void);
+-- 
+1.7.1
+
+
+From 3806fec53dcf3b6e5c3fd71917f9d67d47c65e32 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 12:57:43 +0200
+Subject: [PATCH 02/12] s3 swat: Add support for anti-XSRF token
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c       |   54 +++++++++++++++++++++++++++++++++++++++++++++++
+ source/web/swat_proto.h |    5 ++++
+ 2 files changed, 59 insertions(+), 0 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 434b1ac..e7d84e5 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -29,6 +29,7 @@
+ 
+ #include "includes.h"
+ #include "web/swat_proto.h"
++#include "../lib/crypto/md5.h"
+ 
+ static int demo_mode = False;
+ static int passwd_only = False;
+@@ -50,6 +51,7 @@ static int iNumNonAutoPrintServices = 0;
+ #define DISABLE_USER_FLAG "disable_user_flag"
+ #define ENABLE_USER_FLAG "enable_user_flag"
+ #define RHOST "remote_host"
++#define XSRF_TOKEN "xsrf"
+ 
+ #define _(x) lang_msg_rotate(talloc_tos(),x)
+ 
+@@ -138,6 +140,58 @@ static char *make_parm_name(const char *label)
+ 	return parmname;
+ }
+ 
++void get_xsrf_token(const char *username, const char *pass,
++		    const char *formname, char token_str[33])
++{
++	struct MD5Context md5_ctx;
++	uint8_t token[16];
++	int i;
++
++	token_str[0] = '\0';
++	ZERO_STRUCT(md5_ctx);
++	MD5Init(&md5_ctx);
++
++	MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname));
++	if (username != NULL) {
++		MD5Update(&md5_ctx, (uint8_t *)username, strlen(username));
++	}
++	if (pass != NULL) {
++		MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass));
++	}
++
++	MD5Final(token, &md5_ctx);
++
++	for(i = 0; i < sizeof(token); i++) {
++		char tmp[3];
++
++		snprintf(tmp, sizeof(tmp), "%02x", token[i]);
++		strncat(token_str, tmp, sizeof(tmp));
++	}
++}
++
++void print_xsrf_token(const char *username, const char *pass,
++		      const char *formname)
++{
++	char token[33];
++
++	get_xsrf_token(username, pass, formname, token);
++	printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n",
++	       XSRF_TOKEN, token);
++
++}
++
++bool verify_xsrf_token(const char *formname)
++{
++	char expected[33];
++	const char *username = cgi_user_name();
++	const char *pass = cgi_user_pass();
++	const char *token = cgi_variable_nonull(XSRF_TOKEN);
++
++	get_xsrf_token(username, pass, formname, expected);
++	return (strncmp(expected, token, sizeof(expected)) == 0);
++}
++
++
+ /****************************************************************************
+   include a lump of html in a page 
+ ****************************************************************************/
+diff --git a/source/web/swat_proto.h b/source/web/swat_proto.h
+index 76f9c3c..e66c942 100644
+--- a/source/web/swat_proto.h
++++ b/source/web/swat_proto.h
+@@ -67,5 +67,10 @@ void status_page(void);
+ /* The following definitions come from web/swat.c  */
+ 
+ const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
++void get_xsrf_token(const char *username, const char *pass,
++		    const char *formname, char token_str[33]);
++void print_xsrf_token(const char *username, const char *pass,
++		      const char *formname);
++bool verify_xsrf_token(const char *formname);
+ 
+ #endif /*  _SWAT_PROTO_H_  */
+-- 
+1.7.1
+
+
+From 3f38cf42facc38c19e0448cbae3078b9606b08e4 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 12:58:53 +0200
+Subject: [PATCH 03/12] s3 swat: Add XSRF protection to status page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/statuspage.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/source/web/statuspage.c b/source/web/statuspage.c
+index 8070ae7..fe545e4 100644
+--- a/source/web/statuspage.c
++++ b/source/web/statuspage.c
+@@ -247,9 +247,14 @@ void status_page(void)
+ 	int nr_running=0;
+ 	bool waitup = False;
+ 	TALLOC_CTX *ctx = talloc_stackframe();
++	const char form_name[] = "status";
+ 
+ 	smbd_pid = pid_to_procid(pidfile_pid("smbd"));
+ 
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
++
+ 	if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
+ 		stop_smbd();
+ 		start_smbd();
+@@ -326,9 +331,11 @@ void status_page(void)
+ 
+ 	initPid2Machine ();
+ 
++output_page:
+ 	printf("<H2>%s</H2>\n", _("Server Status"));
+ 
+ 	printf("<FORM method=post>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
+ 
+ 	if (!autorefresh) {
+ 		printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
+-- 
+1.7.1
+
+
+From ba996f0ae87f6bf4f19a4918e44dbd6d44a96561 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:02:53 +0200
+Subject: [PATCH 04/12] s3 swat: Add XSRF protection to viewconfig page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index e7d84e5..647126f 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -664,13 +664,20 @@ static void welcome_page(void)
+ static void viewconfig_page(void)
+ {
+ 	int full_view=0;
++	const char form_name[] = "viewconfig";
++
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
+ 
+ 	if (cgi_variable("full_view")) {
+ 		full_view = 1;
+ 	}
+ 
++output_page:
+ 	printf("<H2>%s</H2>\n", _("Current Config"));
+ 	printf("<form method=post>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
+ 
+ 	if (full_view) {
+ 		printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
+-- 
+1.7.1
+
+
+From 94f8482607a175c44436fae456fbda3624629982 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:03:15 +0200
+Subject: [PATCH 05/12] s3 swat: Add XSRF protection to wizard_params page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 647126f..b7eec4a 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -697,18 +697,25 @@ output_page:
+ static void wizard_params_page(void)
+ {
+ 	unsigned int parm_filter = FLAG_WIZARD;
++	const char form_name[] = "wizard_params";
+ 
+ 	/* Here we first set and commit all the parameters that were selected
+  	   in the previous screen. */
+ 
+ 	printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
+ 
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
++
+ 	if (cgi_variable("Commit")) {
+ 		commit_parameters(GLOBAL_SECTION_SNUM);
+ 		save_reload(0);
+ 	}
+ 
++output_page:
+ 	printf("<form name=\"swatform\" method=post action=wizard_params>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
+ 
+ 	if (have_write_access) {
+ 		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+-- 
+1.7.1
+
+
+From eb22fd73060534700d514ec295985549131c7569 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:03:44 +0200
+Subject: [PATCH 06/12] s3 swat: Add XSRF protection to wizard page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index b7eec4a..b6e0c0f 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -751,6 +751,11 @@ static void wizard_page(void)
+ 	int have_home = -1;
+ 	int HomeExpo = 0;
+ 	int SerType = 0;
++	const char form_name[] = "wizard";
++
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
+ 
+ 	if (cgi_variable("Rewrite")) {
+ 		(void) rewritecfg_file();
+@@ -841,10 +846,12 @@ static void wizard_page(void)
+ 		winstype = 3;
+ 
+ 	role = lp_server_role();
+-	
++
++output_page:
+ 	/* Here we go ... */
+ 	printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
+ 	printf("<form method=post action=wizard>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
+ 
+ 	if (have_write_access) {
+ 		printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
+-- 
+1.7.1
+
+
+From 8fb3064eeaa3640af6c8b91aa5859d8bfb6d0888 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:04:12 +0200
+Subject: [PATCH 07/12] s3 swat: Add XSRF protection to globals page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index b6e0c0f..5d11685 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -920,9 +920,14 @@ static void globals_page(void)
+ {
+ 	unsigned int parm_filter = FLAG_BASIC;
+ 	int mode = 0;
++	const char form_name[] = "globals";
+ 
+ 	printf("<H2>%s</H2>\n", _("Global Parameters"));
+ 
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
++
+ 	if (cgi_variable("Commit")) {
+ 		commit_parameters(GLOBAL_SECTION_SNUM);
+ 		save_reload(0);
+@@ -935,7 +940,9 @@ static void globals_page(void)
+ 	if ( cgi_variable("AdvMode"))
+ 		mode = 1;
+ 
++output_page:
+ 	printf("<form name=\"swatform\" method=post action=globals>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
+ 
+ 	ViewModeBoxes( mode );
+ 	switch ( mode ) {
+-- 
+1.7.1
+
+
+From ef457a20422cfa8231e25b539d2cd87f299686b9 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:04:48 +0200
+Subject: [PATCH 08/12] s3 swat: Add XSRF protection to shares page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |   18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 5d11685..4544c31 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -982,11 +982,17 @@ static void shares_page(void)
+ 	int mode = 0;
+ 	unsigned int parm_filter = FLAG_BASIC;
+ 	size_t converted_size;
++	const char form_name[] = "shares";
++
++	printf("<H2>%s</H2>\n", _("Share Parameters"));
++
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
+ 
+ 	if (share)
+ 		snum = lp_servicenumber(share);
+ 
+-	printf("<H2>%s</H2>\n", _("Share Parameters"));
+ 
+ 	if (cgi_variable("Commit") && snum >= 0) {
+ 		commit_parameters(snum);
+@@ -1012,10 +1018,6 @@ static void shares_page(void)
+ 		}
+ 	}
+ 
+-	printf("<FORM name=\"swatform\" method=post>\n");
+-
+-	printf("<table>\n");
+-
+ 	if ( cgi_variable("ViewMode") )
+ 		mode = atoi(cgi_variable_nonull("ViewMode"));
+ 	if ( cgi_variable("BasicMode"))
+@@ -1023,6 +1025,12 @@ static void shares_page(void)
+ 	if ( cgi_variable("AdvMode"))
+ 		mode = 1;
+ 
++output_page:
++	printf("<FORM name=\"swatform\" method=post>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
++
++	printf("<table>\n");
++
+ 	ViewModeBoxes( mode );
+ 	switch ( mode ) {
+ 		case 0:
+-- 
+1.7.1
+
+
+From 4850456845d2da5e3451716a5ad4ca0ef034e01f Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:05:38 +0200
+Subject: [PATCH 09/12] s3 swat: Add XSRF protection to password page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 4544c31..5242484 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -1225,12 +1225,15 @@ static void chg_passwd(void)
+ static void passwd_page(void)
+ {
+ 	const char *new_name = cgi_user_name();
++	const char passwd_form[] = "passwd";
++	const char rpasswd_form[] = "rpasswd";
+ 
+ 	if (!new_name) new_name = "";
+ 
+ 	printf("<H2>%s</H2>\n", _("Server Password Management"));
+ 
+ 	printf("<FORM name=\"swatform\" method=post>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), passwd_form);
+ 
+ 	printf("<table>\n");
+ 
+@@ -1270,14 +1273,16 @@ static void passwd_page(void)
+ 	 * Do some work if change, add, disable or enable was
+ 	 * requested. It could be this is the first time through this
+ 	 * code, so there isn't anything to do.  */
+-	if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
+-	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG))) {
++	if (verify_xsrf_token(passwd_form) &&
++	   ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
++	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG)))) {
+ 		chg_passwd();		
+ 	}
+ 
+ 	printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
+ 
+ 	printf("<FORM name=\"swatform\" method=post>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), rpasswd_form);
+ 
+ 	printf("<table>\n");
+ 
+@@ -1310,7 +1315,7 @@ static void passwd_page(void)
+ 	 * password somewhere other than the server. It could be this
+ 	 * is the first time through this code, so there isn't
+ 	 * anything to do.  */
+-	if (cgi_variable(CHG_R_PASSWD_FLAG)) {
++	if (verify_xsrf_token(passwd_form) && cgi_variable(CHG_R_PASSWD_FLAG)) {
+ 		chg_passwd();		
+ 	}
+ 
+-- 
+1.7.1
+
+
+From 407ae61fbfc8ee1643a4db8ea9b104f031b32e0f Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Fri, 8 Jul 2011 15:06:13 +0200
+Subject: [PATCH 10/12] s3 swat: Add XSRF protection to printer page
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c |   28 ++++++++++++++++++----------
+ 1 files changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 5242484..4582a63 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -1332,18 +1332,15 @@ static void printers_page(void)
+ 	int i;
+ 	int mode = 0;
+ 	unsigned int parm_filter = FLAG_BASIC;
++	const char form_name[] = "printers";
++
++	if (!verify_xsrf_token(form_name)) {
++		goto output_page;
++	}
+ 
+ 	if (share)
+ 		snum = lp_servicenumber(share);
+ 
+-        printf("<H2>%s</H2>\n", _("Printer Parameters"));
+- 
+-        printf("<H3>%s</H3>\n", _("Important Note:"));
+-        printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
+-        printf("%s",_("are autoloaded printers from "));
+-        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
+-        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
+-
+ 	if (cgi_variable("Commit") && snum >= 0) {
+ 		commit_parameters(snum);
+ 		if (snum >= iNumNonAutoPrintServices)
+@@ -1372,8 +1369,6 @@ static void printers_page(void)
+ 		}
+ 	}
+ 
+-	printf("<FORM name=\"swatform\" method=post>\n");
+-
+ 	if ( cgi_variable("ViewMode") )
+ 		mode = atoi(cgi_variable_nonull("ViewMode"));
+         if ( cgi_variable("BasicMode"))
+@@ -1381,6 +1376,19 @@ static void printers_page(void)
+         if ( cgi_variable("AdvMode"))
+                 mode = 1;
+ 
++output_page:
++        printf("<H2>%s</H2>\n", _("Printer Parameters"));
++
++        printf("<H3>%s</H3>\n", _("Important Note:"));
++        printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
++        printf("%s",_("are autoloaded printers from "));
++        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
++        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
++
++
++	printf("<FORM name=\"swatform\" method=post>\n");
++	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
++
+ 	ViewModeBoxes( mode );
+ 	switch ( mode ) {
+ 		case 0:
+-- 
+1.7.1
+
+
+From 11e281228f334bf3d384df5655136f0b4b4068aa Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Sat, 9 Jul 2011 09:52:07 +0200
+Subject: [PATCH 11/12] s3 swat: Add time component to XSRF token
+
+Signed-off-by: Kai Blin <kai@samba.org>
+---
+ source/web/swat.c       |   28 ++++++++++++++++++++++++----
+ source/web/swat_proto.h |    2 +-
+ 2 files changed, 25 insertions(+), 5 deletions(-)
+
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 4582a63..50df66e 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -52,6 +52,8 @@ static int iNumNonAutoPrintServices = 0;
+ #define ENABLE_USER_FLAG "enable_user_flag"
+ #define RHOST "remote_host"
+ #define XSRF_TOKEN "xsrf"
++#define XSRF_TIME "xsrf_time"
++#define XSRF_TIMEOUT 300
+ 
+ #define _(x) lang_msg_rotate(talloc_tos(),x)
+ 
+@@ -141,7 +143,7 @@ static char *make_parm_name(const char *label)
+ }
+ 
+ void get_xsrf_token(const char *username, const char *pass,
+-		    const char *formname, char token_str[33])
++		    const char *formname, time_t xsrf_time, char token_str[33])
+ {
+ 	struct MD5Context md5_ctx;
+ 	uint8_t token[16];
+@@ -152,6 +154,7 @@ void get_xsrf_token(const char *username, const char *pass,
+ 	MD5Init(&md5_ctx);
+ 
+ 	MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname));
++	MD5Update(&md5_ctx, (uint8_t *)&xsrf_time, sizeof(time_t));
+ 	if (username != NULL) {
+ 		MD5Update(&md5_ctx, (uint8_t *)username, strlen(username));
+ 	}
+@@ -173,11 +176,13 @@ void print_xsrf_token(const char *username, const char *pass,
+ 		      const char *formname)
+ {
+ 	char token[33];
++	time_t xsrf_time = time(NULL);
+ 
+-	get_xsrf_token(username, pass, formname, token);
++	get_xsrf_token(username, pass, formname, xsrf_time, token);
+ 	printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n",
+ 	       XSRF_TOKEN, token);
+-
++	printf("<input type=\"hidden\" name=\"%s\" value=\"%lld\">\n",
++	       XSRF_TIME, (long long int)xsrf_time);
+ }
+ 
+ bool verify_xsrf_token(const char *formname)
+@@ -186,8 +191,23 @@ bool verify_xsrf_token(const char *formname)
+ 	const char *username = cgi_user_name();
+ 	const char *pass = cgi_user_pass();
+ 	const char *token = cgi_variable_nonull(XSRF_TOKEN);
++	const char *time_str = cgi_variable_nonull(XSRF_TIME);
++	time_t xsrf_time = 0;
++	time_t now = time(NULL);
++
++	if (sizeof(time_t) == sizeof(int)) {
++		xsrf_time = atoi(time_str);
++	} else if (sizeof(time_t) == sizeof(long)) {
++		xsrf_time = atol(time_str);
++	} else if (sizeof(time_t) == sizeof(long long)) {
++		xsrf_time = atoll(time_str);
++	}
++
++	if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
++		return false;
++	}
+ 
+-	get_xsrf_token(username, pass, formname, expected);
++	get_xsrf_token(username, pass, formname, xsrf_time, expected);
+ 	return (strncmp(expected, token, sizeof(expected)) == 0);
+ }
+ 
+diff --git a/source/web/swat_proto.h b/source/web/swat_proto.h
+index e66c942..424a3af 100644
+--- a/source/web/swat_proto.h
++++ b/source/web/swat_proto.h
+@@ -68,7 +68,7 @@ void status_page(void);
+ 
+ const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
+ void get_xsrf_token(const char *username, const char *pass,
+-		    const char *formname, char token_str[33]);
++		    const char *formname, time_t xsrf_time, char token_str[33]);
+ void print_xsrf_token(const char *username, const char *pass,
+ 		      const char *formname);
+ bool verify_xsrf_token(const char *formname);
+-- 
+1.7.1
+
+
+From 3973cfa50024983618a44ffdb9f756b642b85be7 Mon Sep 17 00:00:00 2001
+From: Kai Blin <kai@samba.org>
+Date: Tue, 12 Jul 2011 08:08:24 +0200
+Subject: [PATCH 12/12] s3 swat: Create random nonce in CGI mode
+
+In CGI mode, we don't get access to the user's password, which would
+reduce the hash used so far to parameters an attacker can easily guess.
+To work around this, read the nonce from secrets.tdb or generate one if
+it's not there.
+Also populate the C_user field so we can use that for token creation.
+
+Signed-off-by: Kai Blin <kai@samba.org>
+
+The last 12 patches address bug #8290 (CSRF vulnerability in SWAT).
+This addresses CVE-2011-2522 (Cross-Site Request Forgery in SWAT).
+---
+ source/web/cgi.c  |   18 +++++++++++++++++-
+ source/web/swat.c |    1 -
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/source/web/cgi.c b/source/web/cgi.c
+index ccdc3a7..890ac8e 100644
+--- a/source/web/cgi.c
++++ b/source/web/cgi.c
+@@ -19,6 +19,7 @@
+ 
+ #include "includes.h"
+ #include "web/swat_proto.h"
++#include "secrets.h"
+ 
+ #define MAX_VARIABLES 10000
+ 
+@@ -321,7 +322,22 @@ static void cgi_web_auth(void)
+ 		exit(0);
+ 	}
+ 
+-	setuid(0);
++	C_user = SMB_STRDUP(user);
++
++	if (!setuid(0)) {
++		C_pass = secrets_fetch_generic("root", "SWAT");
++		if (C_pass == NULL) {
++			char *tmp_pass = NULL;
++			tmp_pass = generate_random_str(16);
++			if (tmp_pass == NULL) {
++				printf("%sFailed to create random nonce for "
++				       "SWAT session\n<br>%s\n", head, tail);
++				exit(0);
++			}
++			secrets_store_generic("root", "SWAT", tmp_pass);
++			C_pass = SMB_STRDUP(tmp_pass);
++		}
++	}
+ 	setuid(pwd->pw_uid);
+ 	if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) {
+ 		printf("%sFailed to become user %s - uid=%d/%d<br>%s\n", 
+diff --git a/source/web/swat.c b/source/web/swat.c
+index 50df66e..146f1cf 100644
+--- a/source/web/swat.c
++++ b/source/web/swat.c
+@@ -29,7 +29,6 @@
+ 
+ #include "includes.h"
+ #include "web/swat_proto.h"
+-#include "../lib/crypto/md5.h"
+ 
+ static int demo_mode = False;
+ static int passwd_only = False;
+-- 
+1.7.1
+
diff --git a/package/samba/samba-CVE-2011-0719.patch b/package/samba/samba-CVE-2011-0719.patch
deleted file mode 100644
index 1cb8580aab..0000000000
--- a/package/samba/samba-CVE-2011-0719.patch
+++ /dev/null
@@ -1,613 +0,0 @@
-From 724e44eed299c618066dec411530aa9f156119ec Mon Sep 17 00:00:00 2001
-From: Karolin Seeger <kseeger@samba.org>
-Date: Sun, 27 Feb 2011 18:28:29 +0100
-Subject: [PATCH] Fix denial of service - memory corruption.
-
-CVE-2011-0719
-
-Fix bug #7949 (DoS in Winbind and smbd with many file descriptors open).
-
-All current released versions of Samba are vulnerable to
-a denial of service caused by memory corruption. Range
-checks on file descriptors being used in the FD_SET macro
-were not present allowing stack corruption. This can cause
-the Samba code to crash or to loop attempting to select
-on a bad file descriptor set.
-
-A connection to a file share, or a local account is needed
-to exploit this problem, either authenticated or unauthenticated
-(guest connection).
-
-Currently we do not believe this flaw is exploitable
-beyond a crash or causing the code to loop, but on the
-advice of our security reviewers we are releasing fixes
-in case an exploit is discovered at a later date.
----
- source/client/client.c          |    4 +++-
- source/client/dnsbrowse.c       |   12 ++++++++++++
- source/lib/events.c             |   13 +++++++++++++
- source/lib/packet.c             |    5 +++++
- source/lib/readline.c           |    5 +++++
- source/lib/select.c             |    6 ++++++
- source/lib/util_sock.c          |   11 +++++++++--
- source/libaddns/dnssock.c       |    6 +++++-
- source/libsmb/nmblib.c          |    5 +++++
- source/nmbd/nmbd_packets.c      |   24 ++++++++++++++++++++++--
- source/nsswitch/wb_common.c     |   22 ++++++++++++++++++++--
- source/printing/printing.c      |    5 +++++
- source/smbd/dnsregister.c       |    6 ++++++
- source/smbd/oplock.c            |    5 ++++-
- source/smbd/oplock_irix.c       |    5 +++++
- source/smbd/process.c           |    2 +-
- source/smbd/server.c            |   29 +++++++++++++++++++++--------
- source/utils/smbfilter.c        |    8 ++++++--
- source/winbindd/winbindd.c      |   12 +++++++++++-
- source/winbindd/winbindd_dual.c |    7 +++++++
- 20 files changed, 171 insertions(+), 21 deletions(-)
-
-diff --git a/source/client/client.c b/source/client/client.c
-index 53bd9e6..a989441 100644
---- a/source/client/client.c
-+++ b/source/client/client.c
-@@ -4379,8 +4379,10 @@ static void readline_callback(void)
- 
-  again:
- 
--	if (cli->fd == -1)
-+	if (cli->fd < 0 || cli->fd >= FD_SETSIZE) {
-+		errno = EBADF;
- 		return;
-+	}
- 
- 	FD_ZERO(&fds);
- 	FD_SET(cli->fd,&fds);
-diff --git a/source/client/dnsbrowse.c b/source/client/dnsbrowse.c
-index 5e3a4de..aa2fb22 100644
---- a/source/client/dnsbrowse.c
-+++ b/source/client/dnsbrowse.c
-@@ -81,6 +81,11 @@ static void do_smb_resolve(struct mdns_smbsrv_result *browsesrv)
- 			TALLOC_FREE(fdset);
- 		}
- 
-+		if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
-+			errno = EBADF;
-+			break;
-+		}
-+
- 		fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
- 		fdset = TALLOC_ZERO(ctx, fdsetsz);
- 		FD_SET(mdnsfd, fdset);
-@@ -183,6 +188,13 @@ int do_smb_browse(void)
- 
- 		fdsetsz = howmany(mdnsfd + 1, NFDBITS) * sizeof(fd_mask);
- 		fdset = TALLOC_ZERO(ctx, fdsetsz);
-+
-+		if (mdnsfd < 0 || mdnsfd >= FD_SETSIZE) {
-+			errno = EBADF;
-+			TALLOC_FREE(ctx);
-+			return 1;
-+		}
-+
- 		FD_SET(mdnsfd, fdset);
- 
- 		tv.tv_sec = 1;
-diff --git a/source/lib/events.c b/source/lib/events.c
-index cd20ceb..2ddbab7 100644
---- a/source/lib/events.c
-+++ b/source/lib/events.c
-@@ -140,6 +140,11 @@ struct fd_event *event_add_fd(struct event_context *event_ctx,
- {
- 	struct fd_event *fde;
- 
-+	if (fd < 0 || fd >= FD_SETSIZE) {
-+		errno = EBADF;
-+		return NULL;
-+	}
-+
- 	if (!(fde = TALLOC_P(mem_ctx, struct fd_event))) {
- 		return NULL;
- 	}
-@@ -190,6 +195,14 @@ bool event_add_to_select_args(struct event_context *event_ctx,
- 	bool ret = False;
- 
- 	for (fde = event_ctx->fd_events; fde; fde = fde->next) {
-+		if (fde->fd < 0 || fde->fd >= FD_SETSIZE) {
-+			/* We ignore here, as it shouldn't be
-+			   possible to add an invalid fde->fd
-+			   but we don't want FD_SET to see an
-+			   invalid fd. */
-+			continue;
-+		}
-+
- 		if (fde->flags & EVENT_FD_READ) {
- 			FD_SET(fde->fd, read_fds);
- 			ret = True;
-diff --git a/source/lib/packet.c b/source/lib/packet.c
-index e048616..512c7f2 100644
---- a/source/lib/packet.c
-+++ b/source/lib/packet.c
-@@ -106,6 +106,11 @@ NTSTATUS packet_fd_read_sync(struct packet_context *ctx)
- 	int res;
- 	fd_set r_fds;
- 
-+	if (ctx->fd < 0 || ctx->fd >= FD_SETSIZE) {
-+		errno = EBADF;
-+		return map_nt_error_from_unix(errno);
-+	}
-+
- 	FD_ZERO(&r_fds);
- 	FD_SET(ctx->fd, &r_fds);
- 
-diff --git a/source/lib/readline.c b/source/lib/readline.c
-index 34867aa..70a82f2 100644
---- a/source/lib/readline.c
-+++ b/source/lib/readline.c
-@@ -91,6 +91,11 @@ static char *smb_readline_replacement(const char *prompt, void (*callback)(void)
- 		timeout.tv_sec = 5;
- 		timeout.tv_usec = 0;
- 
-+		if (fd < 0 || fd >= FD_SETSIZE) {
-+			errno = EBADF;
-+			break;
-+		}
-+
- 		FD_ZERO(&fds);
- 		FD_SET(fd,&fds);
- 
-diff --git a/source/lib/select.c b/source/lib/select.c
-index c3da6a9..2d5f02c 100644
---- a/source/lib/select.c
-+++ b/source/lib/select.c
-@@ -61,6 +61,11 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
- 		if (pipe(select_pipe) == -1)
- 			smb_panic("Could not create select pipe");
- 
-+		if (select_pipe[0] < 0 || select_pipe[0] >= FD_SETSIZE) {
-+			errno = EBADF;
-+			return -1;
-+		}
-+
- 		/*
- 		 * These next two lines seem to fix a bug with the Linux
- 		 * 2.0.x kernel (and probably other UNIXes as well) where
-@@ -87,6 +92,7 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s
- 		readfds2 = &readfds_buf;
- 		FD_ZERO(readfds2);
- 	}
-+
- 	FD_SET(select_pipe[0], readfds2);
- 
- 	errno = 0;
-diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
-index 650bd13..8aa2c97 100644
---- a/source/lib/util_sock.c
-+++ b/source/lib/util_sock.c
-@@ -960,6 +960,11 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
- 	timeout.tv_usec = (long)(1000 * (time_out % 1000));
- 
- 	for (nread=0; nread < mincnt; ) {
-+		if (fd < 0 || fd >= FD_SETSIZE) {
-+			errno = EBADF;
-+			return map_nt_error_from_unix(EBADF);
-+		}
-+
- 		FD_ZERO(&fds);
- 		FD_SET(fd,&fds);
- 
-@@ -1492,7 +1497,7 @@ bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
- 
- 	for (i=0; i<num_addrs; i++) {
- 		sockets[i] = socket(addrs[i].ss_family, SOCK_STREAM, 0);
--		if (sockets[i] < 0)
-+		if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE)
- 			goto done;
- 		set_blocking(sockets[i], false);
- 	}
-@@ -1541,8 +1546,10 @@ bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
- 	FD_ZERO(&r_fds);
- 
- 	for (i=0; i<num_addrs; i++) {
--		if (sockets[i] == -1)
-+		if (sockets[i] < 0 || sockets[i] >= FD_SETSIZE) {
-+			/* This cannot happen - ignore if so. */
- 			continue;
-+		}
- 		FD_SET(sockets[i], &wr_fds);
- 		FD_SET(sockets[i], &r_fds);
- 		if (sockets[i]>maxfd)
-diff --git a/source/libaddns/dnssock.c b/source/libaddns/dnssock.c
-index 7c8bd41..f427bd5 100644
---- a/source/libaddns/dnssock.c
-+++ b/source/libaddns/dnssock.c
-@@ -218,7 +218,11 @@ static DNS_ERROR read_all(int fd, uint8 *data, size_t len)
- 	while (total < len) {
- 		ssize_t ret;
- 		int fd_ready;
--		
-+
-+		if (fd < 0 || fd >= FD_SETSIZE) {
-+			return ERROR_DNS_SOCKET_ERROR;
-+		}
-+
- 		FD_ZERO( &rfds );
- 		FD_SET( fd, &rfds );
- 
-diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
-index bfe5e7b..768e54d 100644
---- a/source/libsmb/nmblib.c
-+++ b/source/libsmb/nmblib.c
-@@ -1097,6 +1097,11 @@ struct packet_struct *receive_packet(int fd,enum packet_type type,int t)
- 	struct timeval timeout;
- 	int ret;
- 
-+	if (fd < 0 || fd >= FD_SETSIZE) {
-+		errno = EBADF;
-+		return NULL;
-+	}
-+
- 	FD_ZERO(&fds);
- 	FD_SET(fd,&fds);
- 	timeout.tv_sec = t/1000;
-diff --git a/source/nmbd/nmbd_packets.c b/source/nmbd/nmbd_packets.c
-index 4b97819..03e5362 100644
---- a/source/nmbd/nmbd_packets.c
-+++ b/source/nmbd/nmbd_packets.c
-@@ -1683,7 +1683,7 @@ static bool create_listen_fdset(fd_set **ppset, int **psock_array, int *listen_n
- 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec))
- 		count++;
- 
--	if((count*2) + 2 > FD_SETSIZE) {
-+	if((count*2) + 2 >= FD_SETSIZE) {
- 		DEBUG(0,("create_listen_fdset: Too many file descriptors needed (%d). We can \
- only use %d.\n", (count*2) + 2, FD_SETSIZE));
- 		SAFE_FREE(pset);
-@@ -1699,24 +1699,44 @@ only use %d.\n", (count*2) + 2, FD_SETSIZE));
- 	FD_ZERO(pset);
- 
- 	/* Add in the broadcast socket on 137. */
-+	if (ClientNMB < 0 || ClientNMB >= FD_SETSIZE) {
-+		errno = EBADF;
-+		SAFE_FREE(pset);
-+		return True;
-+	}
-+
- 	FD_SET(ClientNMB,pset);
- 	sock_array[num++] = ClientNMB;
- 	*maxfd = MAX( *maxfd, ClientNMB);
- 
- 	/* Add in the 137 sockets on all the interfaces. */
- 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
-+		if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) {
-+			/* We have to ignore sockets outside FD_SETSIZE. */
-+			continue;
-+		}
- 		FD_SET(subrec->nmb_sock,pset);
- 		sock_array[num++] = subrec->nmb_sock;
- 		*maxfd = MAX( *maxfd, subrec->nmb_sock);
- 	}
- 
- 	/* Add in the broadcast socket on 138. */
-+	if (ClientDGRAM < 0 || ClientDGRAM >= FD_SETSIZE) {
-+		errno = EBADF;
-+		SAFE_FREE(pset);
-+		return True;
-+	}
-+
- 	FD_SET(ClientDGRAM,pset);
- 	sock_array[num++] = ClientDGRAM;
- 	*maxfd = MAX( *maxfd, ClientDGRAM);
- 
- 	/* Add in the 138 sockets on all the interfaces. */
- 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
-+		if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) {
-+			/* We have to ignore sockets outside FD_SETSIZE. */
-+			continue;
-+		}
- 		FD_SET(subrec->dgram_sock,pset);
- 		sock_array[num++] = subrec->dgram_sock;
- 		*maxfd = MAX( *maxfd, subrec->dgram_sock);
-@@ -1767,7 +1787,7 @@ bool listen_for_packets(bool run_election)
- 
- #ifndef SYNC_DNS
- 	dns_fd = asyncdns_fd();
--	if (dns_fd != -1) {
-+	if (dns_fd >= 0 && dns_fd < FD_SETSIZE) {
- 		FD_SET(dns_fd, &r_fds);
- 		maxfd = MAX( maxfd, dns_fd);
- 	}
-diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
-index a164621..4f76bd0 100644
---- a/source/nsswitch/wb_common.c
-+++ b/source/nsswitch/wb_common.c
-@@ -240,6 +240,12 @@ static int winbind_named_pipe_sock(const char *dir)
- 
- 		switch (errno) {
- 			case EINPROGRESS:
-+
-+				if (fd < 0 || fd >= FD_SETSIZE) {
-+					errno = EBADF;
-+					goto error_out;
-+				}
-+
- 				FD_ZERO(&w_fds);
- 				FD_SET(fd, &w_fds);
- 				tv.tv_sec = CONNECT_TIMEOUT - wait_time;
-@@ -383,7 +389,13 @@ int winbind_write_sock(void *buffer, int count, int recursing, int need_priv)
- 	while(nwritten < count) {
- 		struct timeval tv;
- 		fd_set r_fds;
--		
-+
-+		if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
-+			errno = EBADF;
-+			winbind_close_sock();
-+			return -1;
-+		}
-+
- 		/* Catch pipe close on other end by checking if a read()
- 		   call would not block by calling select(). */
- 
-@@ -443,7 +455,13 @@ int winbind_read_sock(void *buffer, int count)
- 	while(nread < count) {
- 		struct timeval tv;
- 		fd_set r_fds;
--		
-+
-+		if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
-+			errno = EBADF;
-+			winbind_close_sock();
-+			return -1;
-+		}
-+
- 		/* Catch pipe close on other end by checking if a read()
- 		   call would not block by calling select(). */
- 
-diff --git a/source/printing/printing.c b/source/printing/printing.c
-index a9272eb..c3b8c61 100644
---- a/source/printing/printing.c
-+++ b/source/printing/printing.c
-@@ -1407,6 +1407,11 @@ void start_background_queue(void)
- 		exit(1);
- 	}
- 
-+	if (pause_pipe[1] < 0 || pause_pipe[1] >= FD_SETSIZE) {
-+		DEBUG(5,("start_background_queue: pipe fd out of range.\n"));
-+		exit(1);
-+	}
-+
- 	background_lpq_updater_pid = sys_fork();
- 
- 	if (background_lpq_updater_pid == -1) {
-diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
-index f02739e..3c689b9 100644
---- a/source/smbd/dnsregister.c
-+++ b/source/smbd/dnsregister.c
-@@ -125,6 +125,9 @@ void dns_register_smbd(struct dns_reg_state ** dns_state_ptr,
- 	 */
- 	if (dns_state->srv_ref != NULL) {
- 		mdnsd_conn_fd = DNSServiceRefSockFD(dns_state->srv_ref);
-+		if (mdnsd_conn_fd < 0 || mdnsd_conn_fd >= FD_SETSIZE) {
-+			return;
-+		}
- 		FD_SET(mdnsd_conn_fd, listen_set);
- 		return;
- 	}
-@@ -156,6 +159,9 @@ void dns_register_smbd(struct dns_reg_state ** dns_state_ptr,
- 	}
- 
- 	mdnsd_conn_fd = DNSServiceRefSockFD(dns_state->srv_ref);
-+	if (mdnsd_conn_fd < 0 || mdnsd_conn_fd >= FD_SETSIZE) {
-+		return;
-+	}
- 	FD_SET(mdnsd_conn_fd, listen_set);
- 	*maxfd = MAX(*maxfd, mdnsd_conn_fd);
- 	*timeout = timeval_zero();
-diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
-index a07d05d..5ae3fdf 100644
---- a/source/smbd/oplock.c
-+++ b/source/smbd/oplock.c
-@@ -241,7 +241,10 @@ bool downgrade_oplock(files_struct *fsp)
- int oplock_notify_fd(void)
- {
- 	if (koplocks) {
--		return koplocks->notification_fd;
-+		int fd = koplocks->notification_fd;
-+		if (fd < 0 || fd >= FD_SETSIZE) {
-+			return -1;
-+		}
- 	}
- 
- 	return -1;
-diff --git a/source/smbd/oplock_irix.c b/source/smbd/oplock_irix.c
-index 8c287c9..6e86fac 100644
---- a/source/smbd/oplock_irix.c
-+++ b/source/smbd/oplock_irix.c
-@@ -284,6 +284,11 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void)
- 		return False;
- 	}
- 
-+	if (pfd[0] < 0 || pfd[0] >= FD_SETSIZE) {
-+		DEBUG(0,("setup_kernel_oplock_pipe: fd out of range.\n"));
-+		return False;
-+	}
-+
- 	oplock_pipe_read = pfd[0];
- 	oplock_pipe_write = pfd[1];
- 
-diff --git a/source/smbd/process.c b/source/smbd/process.c
-index 403c7c6..9b8f29b 100644
---- a/source/smbd/process.c
-+++ b/source/smbd/process.c
-@@ -698,7 +698,7 @@ static void async_processing(fd_set *pfds)
- 
- static int select_on_fd(int fd, int maxfd, fd_set *fds)
- {
--	if (fd != -1) {
-+	if (fd != -1 && fd < FD_SETSIZE) {
- 		FD_SET(fd, fds);
- 		maxfd = MAX(maxfd, fd);
- 	}
-diff --git a/source/smbd/server.c b/source/smbd/server.c
-index 5129484..a670334 100644
---- a/source/smbd/server.c
-+++ b/source/smbd/server.c
-@@ -209,7 +209,13 @@ static bool open_sockets_inetd(void)
- 	/* Started from inetd. fd 0 is the socket. */
- 	/* We will abort gracefully when the client or remote system 
- 	   goes away */
--	smbd_set_server_fd(dup(0));
-+	int fd = dup(0);
-+
-+	if (fd < 0 || fd >= FD_SETSIZE) {
-+		return false;
-+	}
-+
-+	smbd_set_server_fd(fd);
- 	
- 	/* close our standard file descriptors */
- 	close_low_fds(False); /* Don't close stderr */
-@@ -436,7 +442,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
- 							num_sockets == 0 ? 0 : 2,
- 							ifss,
- 							true);
--				if(s == -1) {
-+				if(s < 0 || s >= FD_SETSIZE) {
-+					close(s);
- 					continue;
- 				}
- 
-@@ -516,7 +523,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
- 						num_sockets == 0 ? 0 : 2,
- 						&ss,
- 						true);
--				if (s == -1) {
-+				if (s < 0 || s >= FD_SETSIZE) {
- 					continue;
- 				}
- 
-@@ -709,6 +716,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
- 			struct sockaddr addr;
- 			socklen_t in_addrlen = sizeof(addr);
- 			pid_t child = 0;
-+			int fd;
- 
- 			s = -1;
- 			for(i = 0; i < num_sockets; i++) {
-@@ -721,16 +729,21 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
- 				}
- 			}
- 
--			smbd_set_server_fd(accept(s,&addr,&in_addrlen));
--
--			if (smbd_server_fd() == -1 && errno == EINTR)
-+			fd = accept(s,&addr,&in_addrlen);
-+			if (fd == -1 && errno == EINTR)
- 				continue;
--
--			if (smbd_server_fd() == -1) {
-+			if (fd == -1) {
- 				DEBUG(2,("open_sockets_smbd: accept: %s\n",
- 					 strerror(errno)));
- 				continue;
- 			}
-+			if (fd < 0 || fd >= FD_SETSIZE) {
-+				DEBUG(2,("open_sockets_smbd: bad fd %d\n",
-+					fd ));
-+				continue;
-+			}
-+
-+			smbd_set_server_fd(fd);
- 
- 			/* Ensure child is set to blocking mode */
- 			set_blocking(smbd_server_fd(),True);
-diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c
-index 1e22a40..45f9207 100644
---- a/source/utils/smbfilter.c
-+++ b/source/utils/smbfilter.c
-@@ -162,8 +162,8 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
- 		int num;
- 		
- 		FD_ZERO(&fds);
--		if (s != -1) FD_SET(s, &fds);
--		if (c != -1) FD_SET(c, &fds);
-+		if (s >= 0 && s < FD_SETSIZE) FD_SET(s, &fds);
-+		if (c >= 0 && c < FD_SETSIZE) FD_SET(c, &fds);
- 
- 		num = sys_select_intr(MAX(s+1, c+1),&fds,NULL,NULL,NULL);
- 		if (num <= 0) continue;
-@@ -235,6 +235,10 @@ static void start_filter(char *desthost)
- 		struct sockaddr_storage ss;
- 		socklen_t in_addrlen = sizeof(ss);
- 		
-+		if (s < 0 || s >= FD_SETSIZE) {
-+			break;
-+		}
-+
- 		FD_ZERO(&fds);
- 		FD_SET(s, &fds);
- 
-diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
-index 1d618e2..6b5c251 100644
---- a/source/winbindd/winbindd.c
-+++ b/source/winbindd/winbindd.c
-@@ -836,7 +836,8 @@ static void process_loop(void)
- 	listen_sock = open_winbindd_socket();
- 	listen_priv_sock = open_winbindd_priv_socket();
- 
--	if (listen_sock == -1 || listen_priv_sock == -1) {
-+	if (listen_sock < 0 || listen_sock >= FD_SETSIZE ||
-+			listen_priv_sock < 0 || listen_priv_sock >= FD_SETSIZE) {
- 		perror("open_winbind_socket");
- 		exit(1);
- 	}
-@@ -861,6 +862,9 @@ static void process_loop(void)
- 
- 	FD_ZERO(&r_fds);
- 	FD_ZERO(&w_fds);
-+
-+	/* We check the range for listen_sock and
-+	   listen_priv_sock above. */
- 	FD_SET(listen_sock, &r_fds);
- 	FD_SET(listen_priv_sock, &r_fds);
- 
-@@ -890,6 +894,12 @@ static void process_loop(void)
- 	}
- 
- 	for (ev = fd_events; ev; ev = ev->next) {
-+		if (ev->fd < 0 || ev->fd >= FD_SETSIZE) {
-+			/* Ignore here - event_add_to_select_args
-+			   should make this impossible. */
-+			continue;
-+		}
-+
- 		if (ev->flags & EVENT_FD_READ) {
- 			FD_SET(ev->fd, &r_fds);
- 			maxfd = MAX(ev->fd, maxfd);
-diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
-index ff004f2..b30ec20 100644
---- a/source/winbindd/winbindd_dual.c
-+++ b/source/winbindd/winbindd_dual.c
-@@ -1250,6 +1250,12 @@ static bool fork_domain_child(struct winbindd_child *child)
- 		return False;
- 	}
- 
-+	if (fdpair[0] < 0 || fdpair[0] >= FD_SETSIZE) {
-+		DEBUG(0, ("fork_domain_child: bad fd range (%d)\n", fdpair[0]));
-+		errno = EBADF;
-+		return False;
-+	}
-+
- 	ZERO_STRUCT(state);
- 	state.pid = sys_getpid();
- 
-@@ -1405,6 +1411,7 @@ static bool fork_domain_child(struct winbindd_child *child)
- 		message_dispatch(winbind_messaging_context());
- 
- 		FD_ZERO(&read_fds);
-+		/* We check state.sock against FD_SETSIZE above. */
- 		FD_SET(state.sock, &read_fds);
- 
- 		ret = sys_select(state.sock + 1, &read_fds, NULL, NULL, tp);
--- 
-1.6.4.2
-
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index a3bd63cb77..dfc7636846 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -3,9 +3,10 @@
 # samba
 #
 #############################################################
-SAMBA_VERSION:=3.3.14
-SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
-SAMBA_SITE:=http://samba.org/samba/ftp/stable/
+
+SAMBA_VERSION = 3.3.15
+SAMBA_SOURCE = samba-$(SAMBA_VERSION).tar.gz
+SAMBA_SITE = http://samba.org/samba/ftp/stable/
 
 SAMBA_SUBDIR = source
 SAMBA_AUTORECONF = NO

From 3633557c9574290cac64c96c8e7965183118ced3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Jul 2011 17:14:02 -0300
Subject: [PATCH 0517/6849] iw: bump to version 3.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 0f5dd0e5cd..be3edc2098 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 0.9.22
+IW_VERSION = 3.0
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From 4eb982cf90f16927442f4e7692ce51dd5d21f37b Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 27 Jul 2011 11:34:51 +0200
Subject: [PATCH 0518/6849] 'source' target should depend on 'dirs'

In the following command flow:
make distclean
make <board>_defconfig
make source

the dl directory would normally be created by the first wget download. If there are no such downloads, e.g. because you use a local download mirror (e.g. scp, file) or only use git/svn/hg/bzr repositories, the dl directory is not created automatically. This causes e.g. the 'pushd' command in the respective _DOWNLOAD commands to fail.

This patch adds a dependency to the 'dirs' target to 'source', fixing this scenario.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 02a1659991..df6ce8f534 100644
--- a/Makefile
+++ b/Makefile
@@ -486,7 +486,7 @@ target-purgelocales:
 	done
 endif
 
-source: $(TARGETS_SOURCE) $(HOST_SOURCE)
+source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)
 
 external-deps:
 	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u

From b0d0e060771c80de5afed4d591e63a2b6520eec4 Mon Sep 17 00:00:00 2001
From: Frederic Bassaler <frederic.bassaler@gmail.com>
Date: Thu, 4 Aug 2011 21:02:44 +0200
Subject: [PATCH 0519/6849] midori: bump to 0.3.6

midori 0.4.0 is out, but requires an additionnal dependency : vala
(maybe a more experienced person could add it?)

Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/midori/midori.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 5f6315fd8b..0bf431b76d 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MIDORI_VERSION = 0.3.2
+MIDORI_VERSION = 0.3.6
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
 MIDORI_INSTALL_TARGET = YES

From f940d7602ca0810da0432638d2ce8441d6486991 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Aug 2011 21:34:24 +0200
Subject: [PATCH 0520/6849] package: fix <pkg>_DL_VERSION value

993e51bc22f508fbaf39c5c49fd0595fc5c56013 introduced a <pkg>_DL_VERSION
in addition to <pkg>_VERSION. This variable, purely internal to the
package infrastructure, allows to store the *raw* version name, as
defined in the package .mk file. However, as this version string can
contain slashes, it is not appropriate to be part of the build
directory name of the package. This is why <pkg>_VERSION is defined to
be the same thing as <pkg>_DL_VERSION, except that slashes are
replaced by underscores.

However, the initial implementation didn't take into account the case
of host packages. So 763822e874fd8d39b591feaa9639f76183897fb7 was
committed to fix this. But unfortunately, this commit got it wrong
again: it forgot the case where <pkg>_VERSION is set, but not
HOST_<pkg>_VERSION. In this case, HOST_<pkg>_DL_VERSION remained
empty. This can be seen for example by building host-sstrip.

This problem has been noticed by Julien Boibessot
<julien.boibessot@free.fr>, who also helped in fixing the
issue. Thanks!

The fix is simply to ensure that <pkg>_DL_VERSION is properly set in
all cases: when HOST_<pkg>_VERSION is defined, when only <pkg>_VERSION
is defined, and when no version is defined.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 90530dc432..868bf28420 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -366,15 +366,17 @@ $(2)_NAME			=  $(1)
 # sanitize the package version that is used in paths, directory and file names.
 # Forward slashes may appear in the package's version when pointing to a
 # version control system branch or tag, for example remotes/origin/1_10_stable.
-$(2)_DL_VERSION	= $($(2)_VERSION)
 ifndef $(2)_VERSION
  ifdef $(3)_VERSION
-  $(2)_VERSION = $($(3)_VERSION)
+  $(2)_DL_VERSION = $($(3)_VERSION)
+  $(2)_VERSION = $(subst /,_,$($(3)_VERSION))
  else
   $(2)_VERSION = undefined
+  $(2)_DL_VERSION = undefined
  endif
 else
- $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
+  $(2)_DL_VERSION = $($(2)_VERSION)
+  $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
 endif
 
 $(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)

From 10a130f91e5b947e2d2558443ff09b1686eac273 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Aug 2011 21:38:59 +0200
Subject: [PATCH 0521/6849] initramfs/init: make sure that 0, 1, 2 fds are
 available

As the kernel doesn't automatically mount devtmpfs when an initramfs
is used, commit 424888e47431db738f5f9b3c6392435bfce7a842 has
introduced a small wrapper script that mounts devtmpfs before starting
the real init.

Unfortunately, the problem is that in this case, the init process runs
without any 0, 1 and 2 file descriptors, so none of the
messages/errors printed by the various initialization scripts can be
seen. This is due to the fact the init process relies on 0, 1 and 2
being opened by the kernel before init is started. However, as
/dev/console isn't present on the filesystem at the time the kernel
tries to open the console to create the 0, 1 and 2 file descriptors,
the kernel fails on this and prints the famous "Warning: unable to
open an initial console".

The proposed workaround is to actually open 0, 1 and 2 to /dev/console
in the wrapper script, right after mounting the devtmpfs filesystem,
and before starting the real init. The "Warning" from the kernel is
still shown, but at least the messages from the init scripts are
visible.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/initramfs/init | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/initramfs/init b/fs/initramfs/init
index 751cb270f1..a275482177 100755
--- a/fs/initramfs/init
+++ b/fs/initramfs/init
@@ -1,4 +1,7 @@
 #!/bin/sh
 # devtmpfs does not get automounted for initramfs
 /bin/mount -t devtmpfs devtmpfs /dev
+exec 0</dev/console
+exec 1>/dev/console
+exec 2>/dev/console
 exec /sbin/init $*

From 54624512d8602bccd2c5e19e6b769e180dbdb886 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 2 Aug 2011 20:33:17 +0200
Subject: [PATCH 0522/6849] toolchain-external: fix some typos CodeSoucery ->
 CodeSourcery

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 0253d8330b..ba74f18cd1 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -120,7 +120,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
             - MIPS32 little endian soft float uclibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
-	bool "CodeSoucery PowerPC 2010.09"
+	bool "CodeSourcery PowerPC 2010.09"
 	depends on BR2_powerpc
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
@@ -138,7 +138,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
             - 970 glibc hard-float, 64 bits
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
-	bool "CodeSoucery SH 2010.09"
+	bool "CodeSourcery SH 2010.09"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
@@ -153,7 +153,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
             - SH4A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
-	bool "CodeSoucery SH 2010.09"
+	bool "CodeSourcery SH 2010.09"
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE

From 5255a7197b858c4cb5632e12d2097b75b68518e7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 4 Aug 2011 22:03:37 +0200
Subject: [PATCH 0523/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index caeff385cb..158ab6a04f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,14 +15,15 @@
 	Make source/external-deps now also works for external
 	toolchains / crosstool-ng backend.
 
-	Updated/fixed packages: berkeleydb, bind, binutils, bmon,
-	bridge-utils, busybox, cmake, dbus, dbus-glib, e2fsprogs,
-	ethtool, ffmpeg, gst-plugins-{bad,base,good,ugly}, gvfs,
-	hostapd, iproute2, iptables, jpeg, lame, libarchive, libdnet,
-	libdrm, libgcrypt, libgtk2, libmpeg2, libpng, lighttpd,
-	linux-fusion, lzo, mtd-utils, nfs-utils, oprofile, proftpd,
-	qt, ruby, sdl, shared-mime-info, sudo, sqlite, squid, synergy,
-	udev, usbmount, usbutils, util-linux, valgrind, webkit,
+	Updated/fixed packages: autoconf, berkeleydb, bind, binutils,
+	bmon, bridge-utils, busybox, cmake, dbus, dbus-glib,
+	e2fsprogs, ethtool, ffmpeg, gst-plugins-{bad,base,good,ugly},
+	gvfs, hostapd, iproute2, iptables, iw, jpeg, lame, libarchive,
+	libdnet, libdrm, libgcrypt, libgtk2, libmpeg2, libpng,
+	libsoup, lighttpd, linux-fusion, lzo, midori, mtd-utils,
+	nfs-utils, openvpn, oprofile, orc, proftpd, qt, ruby, samba,
+	sdl, shared-mime-info, sudo, sqlite, squid, synergy, udev,
+	usbmount, usbutils, util-linux, valgrind, webkit,
 	xorg-xserver, xz, zlib
 
 	New packages: acl, attr, ebtables, gnutls, inotify-tools,

From 5496bc399bc9eee202dbd7bd1d143722f30536e9 Mon Sep 17 00:00:00 2001
From: "Michael J. Hammel" <mjhammel@graphics-muse.org>
Date: Sat, 23 Apr 2011 20:51:41 -0600
Subject: [PATCH 0524/6849] pkg-config: Add "mapdir" to sysroot handled
 variables

Closes #3583, #3649

Fixes xfonts_font-adobe build failure.

Signed-off-by: Michael J. Hammel <mjhammel@graphics-muse.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                               | 10 ++++++----
 package/pkg-config/pkg-config-0.25-fix-variable.patch |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 158ab6a04f..09ef71e41a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,10 +21,10 @@
 	gvfs, hostapd, iproute2, iptables, iw, jpeg, lame, libarchive,
 	libdnet, libdrm, libgcrypt, libgtk2, libmpeg2, libpng,
 	libsoup, lighttpd, linux-fusion, lzo, midori, mtd-utils,
-	nfs-utils, openvpn, oprofile, orc, proftpd, qt, ruby, samba,
-	sdl, shared-mime-info, sudo, sqlite, squid, synergy, udev,
-	usbmount, usbutils, util-linux, valgrind, webkit,
-	xorg-xserver, xz, zlib
+	nfs-utils, openvpn, oprofile, orc, pkg-config, proftpd, qt,
+	ruby, samba, sdl, shared-mime-info, sudo, sqlite, squid,
+	synergy, udev, usbmount, usbutils, util-linux, valgrind,
+	webkit, xorg-xserver, xz, zlib
 
 	New packages: acl, attr, ebtables, gnutls, inotify-tools,
 	ipset, libargtable2, libiqrf, libmnl, libnspr, libnss,
@@ -40,6 +40,8 @@
 	#3559: libnspr: Add new package
 	#3595: patch to add libroxml
 	#3565: libnss: Add new package
+	#3583: xfonts_font-adobe-100dpi fails due to missing map file
+	#3649: [PATCH] Add mapdir to existing pkg-config patch
 	#3907: 2011.05 - Qt 4.7.3 not building on ARM
 	#3961: Nfs-utils: Remove SUSv3-function index
 	#3985: "help" target's defconfig list needs sort
diff --git a/package/pkg-config/pkg-config-0.25-fix-variable.patch b/package/pkg-config/pkg-config-0.25-fix-variable.patch
index 0b1d4a9d88..13a2b9191b 100644
--- a/package/pkg-config/pkg-config-0.25-fix-variable.patch
+++ b/package/pkg-config/pkg-config-0.25-fix-variable.patch
@@ -8,20 +8,21 @@ so ensure the sysroot'ed files are used.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 ---
- main.c |    5 +++++
- 1 file changed, 5 insertions(+)
+ main.c |    6 +++++
+ 1 file changed, 6 insertions(+)
 
 Index: pkg-config-0.25/main.c
 ===================================================================
 --- pkg-config-0.25.orig/main.c
 +++ pkg-config-0.25/main.c
-@@ -700,6 +700,11 @@
+@@ -700,6 +700,12 @@
    if (variable_name)
      {
        char *str = packages_get_var (packages, variable_name);
 +      /* include/lib variable? */
 +      if (pcsysrootdir &&
 +          (!strcmp(variable_name, "includedir") ||
++           !strcmp(variable_name, "mapdir") ||
 +           !strcmp(variable_name, "libdir")))
 +          printf ("%s/", pcsysrootdir);
        printf ("%s", str);

From 7ff457cdb5949a7e8d9409495d1342f71b7d3adf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 4 Aug 2011 22:31:30 +0200
Subject: [PATCH 0525/6849] Update for 2011.08-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  4 ++--
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 09ef71e41a..a6f368b487 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2011.08, Not released yet:
+2011.08-rc1, Released August 4th, 2011:
 
 	Fixes all over the tree and new features.
 
@@ -9,7 +9,7 @@
 	GENTARGETS infrastructure extended to cover bootloaders and
 	Linux kernel as well. Options to retrive Linux/U-Boot from a
 	custom git repo instead of upstream tarballs.
-	Support for Linux 3.x and release candiate tarballs.
+	Support for Linux 3.x and release candidate tarballs.
 	X-Loader bootloader for omap added.
 
 	Make source/external-deps now also works for external
diff --git a/Makefile b/Makefile
index df6ce8f534..24f0cb2d06 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.08-git
+export BR2_VERSION:=2011.08-rc1
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index a70bfb35ab..3977d685ad 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,15 +13,15 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.05.tar.bz2">buildroot-2011.05.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2011.05-rc2</b>, which can be
+
+The latest release candidate is <b>2011.08-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.05-rc2.tar.gz">buildroot-2011.05-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2011.08-rc1.tar.gz">buildroot-2011.08-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.05-rc2.tar.bz2">buildroot-2011.05-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.08-rc1.tar.bz2">buildroot-2011.08-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 4d79bf2a74..42ebdd257c 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>4 August 2011 -- 2011.08-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.08-rc1.tar.bz2">2011.08-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>27 May 2011 -- 2011.05 released</b>
 
     <p>The stable 2011.05 release is out - Thanks to everyone

From 59377dd2b5873012eb2470b284735cb6bf6e5ce7 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 5 Aug 2011 10:52:27 +0200
Subject: [PATCH 0526/6849] libsoup: bump to 2.32.2

Buildroot should use a stable release, not use an unstable development
version. Updating to the current stable branch (2.34) is not trivial,
so at least use the latest release from the stable 2.32 branch.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoup/libsoup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 6ec0882fec..11bfadd852 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBSOUP_MAJOR_VERSION:=2.31
+LIBSOUP_MAJOR_VERSION:=2.32
 LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
 LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
 LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)

From 2c85cb9308ed907a8a8e487be8c7ab971a1fb126 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 6 Aug 2011 12:06:41 +0200
Subject: [PATCH 0527/6849] xfont_font-misc-misc: remove mapfiles workaround

Not needed anymore after the recent pkg-config mapfiles fix.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index 64e14d2837..f6a5564938 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -12,11 +12,5 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-define XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
-	$(SED) 's|UTIL_DIR = |UTIL_DIR = $(STAGING_DIR)|' $(@D)/Makefile
-endef
-
-XFONT_FONT_MISC_MISC_POST_CONFIGURE_HOOKS += XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
-
 $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-misc))
 

From c77f8f173caee4cbfeeeaa9e7311763931c40075 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 7 Aug 2011 22:57:41 +0200
Subject: [PATCH 0528/6849] toochain/crosstool-NG: bump version

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../crosstool-ng-000-makefile-recursion.patch | 38 ++++++++++
 .../crosstool-ng-001-no-cvs.patch             | 15 ----
 ...k-on-existing-symlinks-and-build.log.patch | 76 -------------------
 .../crosstool-ng-003-autostuf-compat.patch    | 10 ---
 package/crosstool-ng/crosstool-ng.mk          |  2 +-
 .../toolchain-crosstool-ng/crosstool-ng.mk    |  2 +-
 6 files changed, 40 insertions(+), 103 deletions(-)
 create mode 100644 package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
 delete mode 100644 package/crosstool-ng/crosstool-ng-001-no-cvs.patch
 delete mode 100644 package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
 delete mode 100644 package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch

diff --git a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
new file mode 100644
index 0000000000..4f66744725
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
@@ -0,0 +1,38 @@
+Makefile: allow recursion
+
+When crosstool-NG is used standalone, we completely avoid recursion,
+because the Makefile calls itself only once.
+
+But when used as the buildroot toolchain backend, there is already
+one level of make recursion when we first call the crosstool-NG
+Makefile. And when buildroot is used out-of-tree, we are already
+at the second level of recursion when calling the crosstool-NG
+Makefile.
+
+So, to cope with the situation, just get rid of the recursion test.
+
+This probably won't go upstream.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+
+diff -du crosstool-ng-1.12.0/Makefile.in host-crosstool-ng-1.12.0/Makefile.in
+--- crosstool-ng-1.12.0/Makefile.in     2011-08-01 01:21:34.000000000 +0200
++++ host-crosstool-ng-1.12.0/Makefile.in        2011-08-07 21:39:16.055958219 +0200
+@@ -95,9 +95,14 @@
+ # level.
+ # This has the side effect of only showing the real targets, and hiding our
+ # internal ones. :-)
+-ifneq ($(MAKELEVEL),0)
+-$(error Recursion detected, bailing out...)
+-endif
++#
++# NB: For buildroot, this has no importance:
++# - crosstool-NG should never ever be called manually
++# - thus auto-completion would never ever be attempted
++# - so we shouldn't have to detect it
++#ifneq ($(MAKELEVEL),0)
++#$(error Recursion detected, bailing out...)
++#endif
+ 
+ MAKEFLAGS += $(CT_MAKEFLAGS)
+ build install clean distclean uninstall:
diff --git a/package/crosstool-ng/crosstool-ng-001-no-cvs.patch b/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
deleted file mode 100644
index c82d359415..0000000000
--- a/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Remove dependency on cvs.
-
-cvs is used to retrieve newlib, which is not supported
-under Buildroot, so cvs is not required.
-
---- crosstool-ng-1.8.0/configure.orig	2010-11-27 15:43:52.000000000 +0000
-+++ crosstool-ng-1.8.0/configure	2010-11-27 15:44:10.000000000 +0000
-@@ -359,7 +359,6 @@
-              err="'libtool' 1.5.26 or above was not found"
- has_or_abort prog=stat
- has_or_abort prog="curl wget"
--has_or_abort prog=cvs
- has_or_abort prog=patch
- has_or_abort prog=tar
- has_or_abort prog=gzip
diff --git a/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch b/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
deleted file mode 100644
index 2bb613ffb3..0000000000
--- a/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-
-# HG changeset patch
-# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-# Date 1310507544 -7200
-# Node ID 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3
-# Parent  f1c730da41f3b22ca1a1e1b14592da4b7c078797
-scripts, cc/gcc: do not fail on existing symlinks or build.log
-
-If the user builds a toolchain over an existing one, so, without removing
-CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
-build.log.
-
-This can also happen (for build.log) if the user first ran in download-
-or extract-only.
-
-Patch (with no SoB) originally from:
-  Phil Wilshire <phil.wilshire@overturenetworks.com>
-
-Modified by me as it did not apply cleanly.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/cc/gcc.sh
---- a/scripts/build/cc/gcc.sh	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/build/cc/gcc.sh	Tue Jul 12 23:52:24 2011 +0200
-@@ -386,7 +386,7 @@
-     # check whether compiler has an extension
-     file="$( ls -1 "${core_prefix_dir}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
-     [ -z "${file}" ] || ext=".${file##*.}"
--    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
-+    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
- 
-     CT_EndStep
- }
-@@ -630,7 +630,7 @@
-     # check whether compiler has an extension
-     file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
-     [ -z "${file}" ] || ext=".${file##*.}"
--    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
-+    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
- 
-     CT_EndStep
- }
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/internals.sh
---- a/scripts/build/internals.sh	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/build/internals.sh	Tue Jul 12 23:52:24 2011 +0200
-@@ -86,14 +86,14 @@
-     for t in "${CT_TARGET}-"*; do
-         if [ -n "${CT_TARGET_ALIAS}" ]; then
-             _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
--            CT_DoExecLog ALL ln -sv "${t}" "${_t}"
-+            CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
-         fi
-         if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
-             _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
-             if [ "${_t}" = "${t}" ]; then
-                 CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
-             else
--                CT_DoExecLog ALL ln -sv "${t}" "${_t}"
-+                CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
-             fi
-         fi
-     done
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/crosstool-NG.sh.in
---- a/scripts/crosstool-NG.sh.in	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/crosstool-NG.sh.in	Tue Jul 12 23:52:24 2011 +0200
-@@ -604,7 +604,7 @@
- # moment... Consign all ouptut to oblivion...
- CT_DoLog INFO "Finishing installation (may take a few seconds)..."
- exec >/dev/null 2>&1
--
-+rm -f ${CT_PREFIX_DIR}/build.log.bz2
- if [ "${CT_LOG_TO_FILE}" = "y" ]; then
-     cp "${tmp_log_file}" "${CT_PREFIX_DIR}/build.log"
-     if [ "${CT_LOG_FILE_COMPRESS}" = y ]; then
-
diff --git a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch b/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
deleted file mode 100644
index d79e62bace..0000000000
--- a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- crosstool-ng-1.11.3/configure	2011-05-21 01:10:10.000000000 +0200
-+++ host-crosstool-ng-1.11.3/configure	2011-07-14 17:35:25.830403914 +0200
-@@ -260,6 +260,7 @@
-         # Skip, auto-stuff compatibility
-         --build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
-         --build|--host|--infodir|--datadir|--sysconfdir|--localstatedir)             shift 2;;
-+        --enable-shared|--disable-shared|--enable-static|--disable-static)           shift;;
-         *)          printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
-     esac
- done
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index b40cf353b9..2bbf63120a 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.11.3
+CROSSTOOL_NG_VERSION           = 1.12.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 912bb06b22..3a205dd873 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -203,7 +203,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="unknown":;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(GNU_TARGET_NAME)":;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_CC_PKGVERSION)="(.*)":\1="crosstool-NG $(CTNG_VERSION) - buildroot $(BR2_VERSION_FULL)":;
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
 ifneq ($(call qstrip,$(BR2_USE_MMU)),)
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
 else

From c72a9bd4c80febbc19b26927d0eadc84afef1ba7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 7 Aug 2011 22:37:58 +0200
Subject: [PATCH 0529/6849] toolchain/crosstool-NG: update bundled config files

Update the crosstool-NG libc-specific config files to match the
new set of options coming with the updated crosstool-NG.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../crosstool-ng.config-eglibc                | 227 +++++------------
 .../crosstool-ng.config-glibc                 | 234 +++++-------------
 .../crosstool-ng.config-uClibc                | 192 ++++----------
 3 files changed, 180 insertions(+), 473 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 5902d40043..3b6a2e22a0 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,8 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.11.3
-# Sat May 21 22:35:30 2011
-#
+# The crosstool-NG configuration menu
+# Sun Aug  7 15:40:17 2011
+#
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_static_link_ok=y
+CT_CONFIGURE_has_static_libstdcxx=y
+CT_CONFIGURE_has_expat=y
+CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -51,8 +57,6 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
 # CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
-# CT_PATCH_SINGLE is not set
-# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -84,55 +88,24 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH="x86"
 CT_ARCH_SUPPORTS_32=y
-# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
-# CT_ARCH_SUPPORT_ABI is not set
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-# CT_ARCH_DEFAULT_BE is not set
-CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
-# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
+CT_ARCH_TUNE="generic"
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_BITNESS=64
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86=y
 CT_ARCH_x86_AVAILABLE=y
 
 #
@@ -144,14 +117,6 @@ CT_ARCH_USE_MMU=y
 # Target optimisations
 #
 
-#
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-# CT_ARCH_ARM_MODE_THUMB is not set
-CT_ARCH_ARM_EABI=y
-
 #
 # Toolchain options
 #
@@ -163,6 +128,9 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
+CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
 
 #
 # Tuple completion and aliasing
@@ -174,10 +142,7 @@ CT_TARGET_ALIAS=""
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
-# CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
 #
@@ -190,17 +155,28 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-# CT_BARE_METAL is not set
-# CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.4"
-# CT_KERNEL_bare_metal is not set
+CT_KERNEL_VERSION="2.6.38.8"
 CT_KERNEL_linux=y
-# CT_KERNEL_mingw32 is not set
-# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_mingw32_AVAILABLE is not set
+CT_KERNEL_LINUX_INSTALL=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39_3 is not set
+# CT_KERNEL_V_2_6_39_2 is not set
+# CT_KERNEL_V_2_6_39_1 is not set
+# CT_KERNEL_V_2_6_39 is not set
+CT_KERNEL_V_2_6_38_8=y
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_10 is not set
+# CT_KERNEL_V_2_6_33_16 is not set
+# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
 
 #
 # Common kernel options
@@ -210,22 +186,6 @@ CT_SHARED_LIBS=y
 #
 # linux other options
 #
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_2_6_38_4=y
-# CT_KERNEL_V_2_6_38_3 is not set
-# CT_KERNEL_V_2_6_38_2 is not set
-# CT_KERNEL_V_2_6_38_1 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_9 is not set
-# CT_KERNEL_V_2_6_33_12 is not set
-# CT_KERNEL_V_2_6_32_39 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_58 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
@@ -236,30 +196,26 @@ CT_KERNEL_LINUX_INSTALL_CHECK=y
 # Binary utilities
 #
 CT_ARCH_BINFMT_ELF=y
-# CT_ARCH_BINFMT_FLAT is not set
-# CT_ARCH_BINFMT_FDPIC is not set
 
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_21 is not set
 # CT_BINUTILS_V_2_20_1 is not set
 CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_19_1 is not set
 # CT_BINUTILS_V_2_19 is not set
 # CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_FORCE_LD_BFD=y
 CT_BINUTILS_LINKER_LD=y
-# CT_BINUTILS_LINKER_GOLD is not set
-# CT_BINUTILS_LINKER_LD_GOLD is not set
-# CT_BINUTILS_LINKER_GOLD_LD is not set
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 
 #
 # C compiler
@@ -267,13 +223,6 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
-# CT_CC_V_linaro_4_6_2011_04_0 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_linaro_4_5_2011_04_0 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_linaro_4_4_2011_02_0 is not set
 # CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -281,35 +230,23 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
 # CT_CC_V_4_3_5 is not set
 # CT_CC_V_4_3_4 is not set
 # CT_CC_V_4_3_3 is not set
 # CT_CC_V_4_3_2 is not set
 # CT_CC_V_4_3_1 is not set
 # CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_3 is not set
 # CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
-# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
 CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
-# CT_CC_GCC_4_5 is not set
-# CT_CC_GCC_4_5_or_later is not set
-# CT_CC_GCC_4_6 is not set
-# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
-# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_GCC_USE_MPC is not set
-# CT_CC_GCC_USE_LIBELF is not set
+# CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -321,17 +258,14 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
 # CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
 #
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
@@ -361,43 +295,43 @@ CT_CC_GCC_LDBL_128=m
 CT_LIBC="eglibc"
 CT_LIBC_VERSION="2_10"
 CT_LIBC_eglibc=y
-# CT_LIBC_glibc is not set
-# CT_LIBC_mingw is not set
-# CT_LIBC_newlib is not set
-# CT_LIBC_none is not set
-# CT_LIBC_uClibc is not set
 CT_LIBC_eglibc_AVAILABLE=y
-# CT_LIBC_EGLIBC_V_2_13 is not set
 # CT_LIBC_EGLIBC_V_2_12 is not set
 # CT_LIBC_EGLIBC_V_2_11 is not set
 CT_LIBC_EGLIBC_V_2_10=y
 # CT_LIBC_EGLIBC_V_2_9 is not set
-# CT_LIBC_EGLIBC_V_2_8 is not set
-# CT_LIBC_EGLIBC_V_2_7 is not set
-# CT_LIBC_EGLIBC_V_2_6 is not set
-# CT_LIBC_EGLIBC_V_2_5 is not set
 # CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_LIBC_EGLIBC_2_10_or_later=y
+CT_LIBC_EGLIBC_2_9_or_later=y
+CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL=y
 CT_EGLIBC_REVISION="HEAD"
+# CT_EGLIBC_HTTP is not set
 # CT_EGLIBC_CHECKOUT is not set
 # CT_EGLIBC_OPT_SIZE is not set
 # CT_EGLIBC_CUSTOM_CONFIG is not set
-# CT_LIBC_glibc_AVAILABLE is not set
-# CT_LIBC_mingw_AVAILABLE is not set
-# CT_LIBC_newlib_AVAILABLE is not set
-# CT_LIBC_none_AVAILABLE is not set
-# CT_LIBC_uClibc_AVAILABLE is not set
-CT_LIBC_glibc_familly=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
-# glibc/eglibc common options
+# Common C library options
 #
-CT_LIBC_GLIBC_EXTRA_CONFIG=""
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
+CT_LIBC_XLDD=y
+
+#
+# eglibc other options
+#
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_LIBC_GLIBC_CONFIGPARMS=""
 CT_LIBC_GLIBC_EXTRA_CFLAGS=""
 CT_LIBC_EXTRA_CC_ARGS=""
 # CT_LIBC_DISABLE_VERSIONING is not set
 CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+CT_LIBC_GLIBC_FORCE_UNWIND=y
 CT_LIBC_GLIBC_USE_PORTS=y
 CT_LIBC_ADDONS_LIST=""
 
@@ -423,22 +357,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.4"
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-# CT_LIBC_SUPPORT_WIN32THREADS is not set
-# CT_LIBC_SUPPORT_THREADS_NONE is not set
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-# CT_THREADS_WIN32THREADS is not set
-# CT_THREADS_NONE is not set
-CT_LIBC_XLDD=y
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.8"
 
 #
 # Debug facilities
@@ -453,34 +372,22 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
-# CT_MPC_NEEDED is not set
-# CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
-# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
-# CT_GMP_V_4_2_4 is not set
-# CT_GMP_V_4_2_2 is not set
 CT_GMP_VERSION="4.3.2"
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
-# CT_PPL_0_11 is not set
-# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index f7c0de738c..cadbb0bed5 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,8 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.11.3
-# Sat May 21 22:36:05 2011
-#
+# The crosstool-NG configuration menu
+# Sun Aug  7 15:49:35 2011
+#
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_static_link_ok=y
+CT_CONFIGURE_has_static_libstdcxx=y
+CT_CONFIGURE_has_expat=y
+CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -51,8 +57,6 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
 # CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
-# CT_PATCH_SINGLE is not set
-# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -84,55 +88,24 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH="x86"
 CT_ARCH_SUPPORTS_32=y
-# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
-# CT_ARCH_SUPPORT_ABI is not set
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-# CT_ARCH_DEFAULT_BE is not set
-CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
-# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
+CT_ARCH_TUNE="generic"
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_BITNESS=64
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86=y
 CT_ARCH_x86_AVAILABLE=y
 
 #
@@ -144,14 +117,6 @@ CT_ARCH_USE_MMU=y
 # Target optimisations
 #
 
-#
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-# CT_ARCH_ARM_MODE_THUMB is not set
-CT_ARCH_ARM_EABI=y
-
 #
 # Toolchain options
 #
@@ -163,21 +128,21 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
+CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
 
 #
 # Tuple completion and aliasing
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
+CT_TARGET_ALIAS="x86_64-linux"
 
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
-# CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
 #
@@ -190,17 +155,28 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-# CT_BARE_METAL is not set
-# CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.4"
-# CT_KERNEL_bare_metal is not set
+CT_KERNEL_VERSION="3.0"
 CT_KERNEL_linux=y
-# CT_KERNEL_mingw32 is not set
-# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_mingw32_AVAILABLE is not set
+CT_KERNEL_LINUX_INSTALL=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_V_3_0=y
+# CT_KERNEL_V_2_6_39_3 is not set
+# CT_KERNEL_V_2_6_39_2 is not set
+# CT_KERNEL_V_2_6_39_1 is not set
+# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_2_6_38_8 is not set
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_10 is not set
+# CT_KERNEL_V_2_6_33_16 is not set
+# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
 
 #
 # Common kernel options
@@ -210,22 +186,6 @@ CT_SHARED_LIBS=y
 #
 # linux other options
 #
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_2_6_38_4=y
-# CT_KERNEL_V_2_6_38_3 is not set
-# CT_KERNEL_V_2_6_38_2 is not set
-# CT_KERNEL_V_2_6_38_1 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_9 is not set
-# CT_KERNEL_V_2_6_33_12 is not set
-# CT_KERNEL_V_2_6_32_39 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_58 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
@@ -236,30 +196,26 @@ CT_KERNEL_LINUX_INSTALL_CHECK=y
 # Binary utilities
 #
 CT_ARCH_BINFMT_ELF=y
-# CT_ARCH_BINFMT_FLAT is not set
-# CT_ARCH_BINFMT_FDPIC is not set
 
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_21 is not set
 # CT_BINUTILS_V_2_20_1 is not set
 CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_19_1 is not set
 # CT_BINUTILS_V_2_19 is not set
 # CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_FORCE_LD_BFD=y
 CT_BINUTILS_LINKER_LD=y
-# CT_BINUTILS_LINKER_GOLD is not set
-# CT_BINUTILS_LINKER_LD_GOLD is not set
-# CT_BINUTILS_LINKER_GOLD_LD is not set
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 
 #
 # C compiler
@@ -267,13 +223,6 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
-# CT_CC_V_linaro_4_6_2011_04_0 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_linaro_4_5_2011_04_0 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_linaro_4_4_2011_02_0 is not set
 # CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -281,35 +230,23 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
 # CT_CC_V_4_3_5 is not set
 # CT_CC_V_4_3_4 is not set
 # CT_CC_V_4_3_3 is not set
 # CT_CC_V_4_3_2 is not set
 # CT_CC_V_4_3_1 is not set
 # CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_3 is not set
 # CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
-# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
 CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
-# CT_CC_GCC_4_5 is not set
-# CT_CC_GCC_4_5_or_later is not set
-# CT_CC_GCC_4_6 is not set
-# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
-# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_GCC_USE_MPC is not set
-# CT_CC_GCC_USE_LIBELF is not set
+# CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -321,17 +258,14 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
 # CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
 #
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
@@ -360,45 +294,38 @@ CT_CC_GCC_LDBL_128=m
 #
 CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
-# CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
-# CT_LIBC_mingw is not set
-# CT_LIBC_newlib is not set
-# CT_LIBC_none is not set
-# CT_LIBC_uClibc is not set
-# CT_LIBC_eglibc_AVAILABLE is not set
 CT_LIBC_glibc_AVAILABLE=y
 CT_LIBC_GLIBC_TARBALL=y
-# CT_LIBC_GLIBC_V_2_12_2 is not set
-# CT_LIBC_GLIBC_V_2_12_1 is not set
-# CT_LIBC_GLIBC_V_2_11_1 is not set
-# CT_LIBC_GLIBC_V_2_11 is not set
-# CT_LIBC_GLIBC_V_2_10_1 is not set
 CT_LIBC_GLIBC_V_2_9=y
 # CT_LIBC_GLIBC_V_2_8 is not set
-# CT_LIBC_GLIBC_V_2_7 is not set
-# CT_LIBC_GLIBC_V_2_6_1 is not set
-# CT_LIBC_GLIBC_V_2_6 is not set
-# CT_LIBC_GLIBC_V_2_5_1 is not set
-# CT_LIBC_GLIBC_V_2_5 is not set
-# CT_LIBC_mingw_AVAILABLE is not set
-# CT_LIBC_newlib_AVAILABLE is not set
-# CT_LIBC_none_AVAILABLE is not set
-# CT_LIBC_uClibc_AVAILABLE is not set
-CT_LIBC_glibc_familly=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_THREADS="nptl"
 
 #
-# glibc/eglibc common options
+# Common C library options
 #
-CT_LIBC_GLIBC_EXTRA_CONFIG=""
+CT_THREADS_NPTL=y
+CT_LIBC_XLDD=y
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_LIBC_GLIBC_CONFIGPARMS=""
 CT_LIBC_GLIBC_EXTRA_CFLAGS=""
 CT_LIBC_EXTRA_CC_ARGS=""
 # CT_LIBC_DISABLE_VERSIONING is not set
 CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+CT_LIBC_GLIBC_FORCE_UNWIND=y
 CT_LIBC_GLIBC_USE_PORTS=y
 CT_LIBC_ADDONS_LIST=""
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_LIBC_GLIBC_MIN_KERNEL="3.0"
+
+#
+# glibc other options
+#
 
 #
 # WARNING !!!                                            
@@ -419,25 +346,6 @@ CT_LIBC_ADDONS_LIST=""
 #
 #   or try again later... :-(                            
 #
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
-# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.4"
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-# CT_LIBC_SUPPORT_LINUXTHREADS is not set
-# CT_LIBC_SUPPORT_WIN32THREADS is not set
-# CT_LIBC_SUPPORT_THREADS_NONE is not set
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-# CT_THREADS_WIN32THREADS is not set
-# CT_THREADS_NONE is not set
-CT_LIBC_XLDD=y
 
 #
 # Debug facilities
@@ -452,34 +360,22 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
-# CT_MPC_NEEDED is not set
-# CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
-# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
-# CT_GMP_V_4_2_4 is not set
-# CT_GMP_V_4_2_2 is not set
 CT_GMP_VERSION="4.3.2"
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
-# CT_PPL_0_11 is not set
-# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 5728e0812b..7d90e402c9 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,8 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.11.3
-# Sat May 21 22:36:24 2011
-#
+# The crosstool-NG configuration menu
+# Sun Aug  7 15:06:46 2011
+#
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_static_link_ok=y
+CT_CONFIGURE_has_static_libstdcxx=y
+CT_CONFIGURE_has_expat=y
+CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -51,8 +57,6 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
 # CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
-# CT_PATCH_SINGLE is not set
-# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -84,55 +88,24 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH="x86"
 CT_ARCH_SUPPORTS_32=y
-# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
-# CT_ARCH_SUPPORT_ABI is not set
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-# CT_ARCH_DEFAULT_BE is not set
-CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
-# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
+CT_ARCH_TUNE="generic"
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_BITNESS=64
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86=y
 CT_ARCH_x86_AVAILABLE=y
 
 #
@@ -144,14 +117,6 @@ CT_ARCH_USE_MMU=y
 # Target optimisations
 #
 
-#
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-# CT_ARCH_ARM_MODE_THUMB is not set
-CT_ARCH_ARM_EABI=y
-
 #
 # Toolchain options
 #
@@ -163,6 +128,9 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
+CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
 
 #
 # Tuple completion and aliasing
@@ -174,10 +142,7 @@ CT_TARGET_ALIAS=""
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
-# CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
 #
@@ -190,17 +155,28 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-# CT_BARE_METAL is not set
-# CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.4"
-# CT_KERNEL_bare_metal is not set
+CT_KERNEL_VERSION="2.6.38.8"
 CT_KERNEL_linux=y
-# CT_KERNEL_mingw32 is not set
-# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_mingw32_AVAILABLE is not set
+CT_KERNEL_LINUX_INSTALL=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39_3 is not set
+# CT_KERNEL_V_2_6_39_2 is not set
+# CT_KERNEL_V_2_6_39_1 is not set
+# CT_KERNEL_V_2_6_39 is not set
+CT_KERNEL_V_2_6_38_8=y
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_10 is not set
+# CT_KERNEL_V_2_6_33_16 is not set
+# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
 
 #
 # Common kernel options
@@ -210,22 +186,6 @@ CT_SHARED_LIBS=y
 #
 # linux other options
 #
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_2_6_38_4=y
-# CT_KERNEL_V_2_6_38_3 is not set
-# CT_KERNEL_V_2_6_38_2 is not set
-# CT_KERNEL_V_2_6_38_1 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_9 is not set
-# CT_KERNEL_V_2_6_33_12 is not set
-# CT_KERNEL_V_2_6_32_39 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_58 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
@@ -236,29 +196,25 @@ CT_KERNEL_LINUX_INSTALL_CHECK=y
 # Binary utilities
 #
 CT_ARCH_BINFMT_ELF=y
-# CT_ARCH_BINFMT_FLAT is not set
-# CT_ARCH_BINFMT_FDPIC is not set
 
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_21 is not set
 # CT_BINUTILS_V_2_20_1 is not set
 CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_19_1 is not set
 # CT_BINUTILS_V_2_19 is not set
 # CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_LINKER_LD=y
-# CT_BINUTILS_LINKER_GOLD is not set
-# CT_BINUTILS_LINKER_LD_GOLD is not set
-# CT_BINUTILS_LINKER_GOLD_LD is not set
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 
 #
 # C compiler
@@ -266,13 +222,6 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
-# CT_CC_V_linaro_4_6_2011_04_0 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_linaro_4_5_2011_04_0 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_linaro_4_4_2011_02_0 is not set
 # CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -280,35 +229,23 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
 # CT_CC_V_4_3_5 is not set
 # CT_CC_V_4_3_4 is not set
 # CT_CC_V_4_3_3 is not set
 # CT_CC_V_4_3_2 is not set
 # CT_CC_V_4_3_1 is not set
 # CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_3 is not set
 # CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
-# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
 CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
-# CT_CC_GCC_4_5 is not set
-# CT_CC_GCC_4_5_or_later is not set
-# CT_CC_GCC_4_6 is not set
-# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
-# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_GCC_USE_MPC is not set
-# CT_CC_GCC_USE_LIBELF is not set
+# CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -320,17 +257,14 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
 # CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
 #
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
@@ -359,27 +293,13 @@ CT_CC_GCC_LDBL_128=m
 #
 CT_LIBC="uClibc"
 CT_LIBC_VERSION="0.9.30.3"
-# CT_LIBC_eglibc is not set
-# CT_LIBC_glibc is not set
-# CT_LIBC_mingw is not set
-# CT_LIBC_newlib is not set
-# CT_LIBC_none is not set
 CT_LIBC_uClibc=y
-# CT_LIBC_eglibc_AVAILABLE is not set
-# CT_LIBC_glibc_AVAILABLE is not set
-# CT_LIBC_mingw_AVAILABLE is not set
-# CT_LIBC_newlib_AVAILABLE is not set
-# CT_LIBC_none_AVAILABLE is not set
 CT_LIBC_uClibc_AVAILABLE=y
-# CT_LIBC_UCLIBC_V_0_9_31 is not set
+# CT_LIBC_UCLIBC_V_0_9_32 is not set
 CT_LIBC_UCLIBC_V_0_9_30_3=y
 # CT_LIBC_UCLIBC_V_0_9_30_2 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_1 is not set
 # CT_LIBC_UCLIBC_V_0_9_30 is not set
-# CT_LIBC_UCLIBC_V_0_9_29 is not set
-# CT_LIBC_UCLIBC_V_0_9_28_3 is not set
-# CT_LIBC_UCLIBC_V_snapshot is not set
-# CT_LIBC_UCLIBC_V_specific_date is not set
 CT_LIBC_UCLIBC_0_9_30_or_later=y
 CT_LIBC_UCLIBC_PARALLEL=y
 CT_LIBC_UCLIBC_VERBOSITY_0=y
@@ -392,18 +312,14 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
 CT_LIBC_UCLIBC_CONFIG_FILE=""
 CT_LIBC_SUPPORT_THREADS_ANY=y
-# CT_LIBC_SUPPORT_NPTL is not set
 CT_LIBC_SUPPORT_LINUXTHREADS=y
-# CT_LIBC_SUPPORT_WIN32THREADS is not set
 CT_LIBC_SUPPORT_THREADS_NONE=y
 CT_THREADS="linuxthreads"
 
 #
 # Common C library options
 #
-# CT_THREADS_NPTL is not set
 CT_THREADS_LINUXTHREADS=y
-# CT_THREADS_WIN32THREADS is not set
 # CT_THREADS_NONE is not set
 CT_LIBC_XLDD=y
 
@@ -429,34 +345,22 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
-# CT_MPC_NEEDED is not set
-# CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
-# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
-# CT_GMP_V_4_2_4 is not set
-# CT_GMP_V_4_2_2 is not set
 CT_GMP_VERSION="4.3.2"
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
-# CT_PPL_0_11 is not set
-# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set

From 7cb161ac314c74ae69a0a856b713a1e21d900522 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Aug 2011 08:58:40 +0200
Subject: [PATCH 0530/6849] kernel-headers: bump 3.0.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d0ec9d505f..116b8621c6 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -54,6 +54,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0"		if BR2_KERNEL_HEADERS_3_0
+	default "3.0.1"		if BR2_KERNEL_HEADERS_3_0
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From ce205b5c56bb8b213d174d7e34f87c973489e05a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Aug 2011 09:00:44 +0200
Subject: [PATCH 0531/6849] linux: bump 2.6.39.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 8d3b0ba849..537cb54cc3 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_39
 
 config BR2_LINUX_KERNEL_2_6_39
-	bool "2.6.39.3"
+	bool "2.6.39.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.39.3"
+	default "2.6.39.4"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.39.3" if BR2_LINUX_KERNEL_2_6_39
+	default "2.6.39.4" if BR2_LINUX_KERNEL_2_6_39
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From db685acb529c0c7f49abdb8567b93c172ba92d59 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Aug 2011 09:02:04 +0200
Subject: [PATCH 0532/6849] sheevaplug_defconfig: use 2.6.39.4

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/sheevaplug_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 3ba568ea59..86389dd7b9 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -19,6 +19,6 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.4"
 BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
 BR2_LINUX_KERNEL_UIMAGE=y

From 720335154e6c28db18c9fed8642f23c35ece1799 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Aug 2011 09:03:06 +0200
Subject: [PATCH 0533/6849] qemu_arm_versatile_defconfig: use 2.6.38.8

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index faf55e33aa..e4a70245c1 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From c578d2cc2bb2ef7feb21e461116b5597da2f225c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Aug 2011 09:54:57 +0200
Subject: [PATCH 0534/6849] qemu_mipsel_malta_defconfig: use 2.6.38.8

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mipsel_malta_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 3f54cefc84..f95fe2418d 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-2.6.38.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 92496e0ef01fbf697483f061f933b303bd8fa408 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Aug 2011 18:56:47 +0200
Subject: [PATCH 0535/6849] binutils: default to 2.21 on mips(el)

uClibc currently doesn't build on mips(el) with 2.21.1.

For details, see:

http://lists.uclibc.org/pipermail/uclibc/2011-March/045026.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index a867b18b37..f6e34ce5fd 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -2,6 +2,7 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
+	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel)
 	default BR2_BINUTILS_VERSION_2_21_1
 	help
 	  Select the version of binutils you wish to use.

From 01281da4573a2452bb17e3f968aa4f6a110180ad Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 8 Aug 2011 13:58:09 +0200
Subject: [PATCH 0536/6849] util-linux: fix BR2_PACKAGE_UTIL_LINUX_UUIDD option

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 570a1d1749..d34759bfd6 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -35,7 +35,7 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),,--disable-fsck) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),,--disable-libmount) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),,--disable-libuuid) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_UUID),,--disable-uuid) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),,--disable-uuidd) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),,--disable-libblkid) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),,--disable-agetty) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),,--disable-cramfs) \

From efd5ca7b262f67c5343267eb3c13b517568f8126 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Mon, 8 Aug 2011 09:10:29 +0200
Subject: [PATCH 0537/6849] ti-utils: bump version and clean up

[Peter: fixup whitespace, simplify target install]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ti-utils/ti-utils.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index 8f35b5922c..037e0c9eb9 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -4,26 +4,28 @@
 #
 #############################################################
 
-TI_UTILS_VERSION = fbceab8f228cff80fd29b830bb85a188c69def08
+TI_UTILS_VERSION = 06dbdb2727354b5f3ad7c723897f40051fddee49
 TI_UTILS_SITE = git://github.com/gxk/ti-utils.git
 TI_UTILS_DEPENDENCIES = libnl
 
 define TI_UTILS_BUILD_CMDS
-	$(MAKE1) NFSROOT="$(STAGING_DIR)" CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
+	$(MAKE1) NFSROOT="$(STAGING_DIR)" \
+		CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
 		-C $(@D) all
 endef
 
 define TI_UTILS_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 $(@D)/calibrator \
+	$(INSTALL) -m 0755 -D $(@D)/calibrator \
 		$(TARGET_DIR)/usr/bin/calibrator
-	$(INSTALL) -m 0755 $(@D)/scripts/go.sh \
-		$(TARGET_DIR)/usr/bin/go.sh
+	$(INSTALL) -m 0755 -D $(@D)/scripts/go.sh \
+		$(TARGET_DIR)/usr/share/ti-utils/scripts/go.sh
+
+	cp -r $(@D)/ini_files $(TARGET_DIR)/usr/share/ti-utils
 endef
 
 define TI_UTILS_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/calibrator
-	rm -f $(TARGET_DIR)/usr/bin/go.sh
+	rm -fr $(TARGET_DIR)/usr/share/ti-utils
 endef
 
 $(eval $(call GENTARGETS,package,ti-utils))
-

From a8273c4272b1b8661a03c7cabdf4c8d710607049 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 9 Aug 2011 16:15:22 +0200
Subject: [PATCH 0538/6849] util-linux: fix libintl linking if present

The configure script correctly detects presence of libintl, but it forgets
to link against it, breaking the build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index d34759bfd6..dd6ee5c697 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -25,6 +25,10 @@ else
 UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+UTIL_LINUX_DEPENDENCIES += libintl
+UTIL_LINUX_MAKE_OPT += LIBS=-lintl
+endif
 
 #############################################
 #

From ac7d781f7c6653d08b9044bda786db480a5ed673 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 9 Aug 2011 19:38:01 +0200
Subject: [PATCH 0539/6849] barebox: bump version

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 55e1ffd65f..5c615f8624 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BAREBOX_VERSION = 2011.07.0
+BAREBOX_VERSION = 2011.08.0
 BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 

From 71f279f9a2bd3f086f3d31fa5a669d3f638bee99 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 12 Aug 2011 09:45:50 +0200
Subject: [PATCH 0540/6849] util-linux: fix install when locales are enabled

util-linux uses mkinstalldirs to install .po files when locales are
enabled, but the definition of MKINSTALLDIRS comes from a tweaked
nls.m4 (based on the one from gettext).

When we autoreconf the package, we end up using the system (staging)
version of nls.m4, so MKINSTALLDIRS doesn't get defined.

Fix it by passing a definition of MKINSTALLDIRS to make during the
install steps.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index dd6ee5c697..9d2f9be3b6 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -68,3 +68,8 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
 
 $(eval $(call AUTOTARGETS,package,util-linux))
+
+# MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
+# one, so it disappears
+UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs

From e35921b3a0d148098f08d2f0533b238a65ff3e86 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 11 Aug 2011 12:44:07 +0200
Subject: [PATCH 0541/6849] directfb: bump to version 1.4.13

There's an even newer stable release available (1.4.14), but it
has problems with cross-compilation that we are still resolving
on the directfb-dev mailing-list.

[Peter: rename ppc patch to match]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-compile-fix.patch => directfb-1.4.13-ppc-compile-fix.patch} | 0
 package/directfb/directfb.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/directfb/{directfb-1.4.11-ppc-compile-fix.patch => directfb-1.4.13-ppc-compile-fix.patch} (100%)

diff --git a/package/directfb/directfb-1.4.11-ppc-compile-fix.patch b/package/directfb/directfb-1.4.13-ppc-compile-fix.patch
similarity index 100%
rename from package/directfb/directfb-1.4.11-ppc-compile-fix.patch
rename to package/directfb/directfb-1.4.13-ppc-compile-fix.patch
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 5af65d7e34..c32fcdb205 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 DIRECTFB_VERSION_MAJOR = 1.4
-DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).11
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).13
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_AUTORECONF = YES

From ad891ac44aa826ebed7fa35be4912116255f5da6 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 12 Aug 2011 14:22:56 +0200
Subject: [PATCH 0542/6849] Fix the Python build when running Linux 3.*

When compiling Python on a host running Linux 3.0, the sys.platform
constant is set at "linux3". A lot of code (inside the interpreter
itself, its build system and third party apps and libraries) relies on
it to be linux2 on a Linux system.

This leads to the build of the target python package to break.

This behaviour has been reported on the Python bugtracker but is not
fixed yet.

http://bugs.python.org/issue12326

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...thon-2.7-013-fix-linux-3-compilation.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/python/python-2.7-013-fix-linux-3-compilation.patch

diff --git a/package/python/python-2.7-013-fix-linux-3-compilation.patch b/package/python/python-2.7-013-fix-linux-3-compilation.patch
new file mode 100644
index 0000000000..a43ec7ee40
--- /dev/null
+++ b/package/python/python-2.7-013-fix-linux-3-compilation.patch
@@ -0,0 +1,22 @@
+diff -r 683202530137 configure
+--- a/configure	Fri Aug 12 11:40:39 2011 +0300
++++ b/configure	Fri Aug 12 14:02:18 2011 +0200
+@@ -3055,6 +3055,7 @@ then
+ 	cygwin*) MACHDEP="cygwin";;
+ 	darwin*) MACHDEP="darwin";;
+         irix646) MACHDEP="irix6";;
++        linux*) MACHDEP="linux2";;
+ 	'')	MACHDEP="unknown";;
+ 	esac
+ fi
+diff -r 683202530137 configure.in
+--- a/configure.in	Fri Aug 12 11:40:39 2011 +0300
++++ b/configure.in	Fri Aug 12 14:02:18 2011 +0200
+@@ -307,6 +307,7 @@ then
+ 	cygwin*) MACHDEP="cygwin";;
+ 	darwin*) MACHDEP="darwin";;
+         irix646) MACHDEP="irix6";;
++        linux*) MACHDEP="linux2";;
+ 	'')	MACHDEP="unknown";;
+ 	esac
+ fi

From 323dcc076a03acdd407f6d254fe8c9c2fcd464b2 Mon Sep 17 00:00:00 2001
From: Heiko Helmle <helman@gmx.net>
Date: Fri, 12 Aug 2011 21:14:28 +0200
Subject: [PATCH 0543/6849] libxml-parser-perl: fix install bug

This patch makes libxml-parser-perl behave on my system - though it looks
like it isn't necessary on all host OSses (on gentoo and opensuse it works
without, but on ubuntu lucid and Scientific 6 it fails without the patch).

Signed-off-by: Heiko Helmle <helman@gmx.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml-parser-perl/libxml-parser-perl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 52d89d5816..9f80cf9f06 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -18,6 +18,7 @@ define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
         EXPATINCPATH=$(HOST_DIR)/usr/include \
         INSTALLDIRS=site \
         INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
+        INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
  )
 endef
 

From 1c1009d38d20885e7543da7e9af45a8265051311 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Aug 2011 12:11:58 +0200
Subject: [PATCH 0544/6849] usbmount: depend on udev rather than selecting it

udev is much more than a library, so we shouldn't use select to silently
enable it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbmount/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/usbmount/Config.in b/package/usbmount/Config.in
index 6980c8c274..30c7b5a5ca 100644
--- a/package/usbmount/Config.in
+++ b/package/usbmount/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_USBMOUNT
 	bool "usbmount"
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
-	select BR2_PACKAGE_UDEV
+	depends on BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_LOCKFILE_PROGS
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
@@ -13,4 +13,4 @@ config BR2_PACKAGE_USBMOUNT
 	  http://usbmount.alioth.debian.org/
 
 comment "usbmount requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) && BR2_PACKAGE_UDEV

From 1add7c592bff56c5115997ab9b42e0fd9a5947ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Aug 2011 12:43:22 +0200
Subject: [PATCH 0545/6849] udev: ensure /dev mgmt option is in sync

These options should be in sync, both for consistency and because udev
needs devtmpfs enabled in the kernel.

We unfortunately cannot just select BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
here, as that one selects udev - leading to recursion erors, so instead
we use depends on.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/udev/Config.in b/package/udev/Config.in
index 67fd413d99..391c71810b 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_UDEV
 	bool "udev"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	help
 	  Userspace device daemon.
 
@@ -25,3 +26,6 @@ comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
 endif
+
+comment "udev requires /dev mgmnt set to udev under System configuration"
+	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV

From 3037dba2f11f5576dfbe3152f8e1e2bf7b1e6c21 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Aug 2011 19:16:03 +0200
Subject: [PATCH 0546/6849] uClibc: disallow 0.9.32 on avr32

Build breaks during gcc-intermediate step with 0.9.32.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 16b2be415f..9f3c7b3c73 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,6 +5,7 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
+	default BR2_UCLIBC_VERSION_0_9_31 if BR2_avr32 # 0.9.32 broken
 	default BR2_UCLIBC_VERSION_0_9_32
 	help
 	  Select the version of uClibc you wish to use.
@@ -18,6 +19,7 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
+		depends on !BR2_avr32
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"

From 57fb63e34d7816d82d7f8947dfde2edc9e739e50 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 16 Aug 2011 00:13:20 +0200
Subject: [PATCH 0547/6849] binutils: default to 2.21 on sh

uClibc currently doesn't build on sh with 2.21.1, similar to the mips
issue (92496e0).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index f6e34ce5fd..7de59f006a 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -2,7 +2,7 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel)
+	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
 	default BR2_BINUTILS_VERSION_2_21_1
 	help
 	  Select the version of binutils you wish to use.

From 5c6212aea681843b0129b17d04ccc24d0bc3403d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 16 Aug 2011 00:14:53 +0200
Subject: [PATCH 0548/6849] uClibc: disallow 0.9.32 on sh

Build breaks during final uClibc build with 0.9.32.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 9f3c7b3c73..34aaa13dd7 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,7 +5,7 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_0_9_31 if BR2_avr32 # 0.9.32 broken
+	default BR2_UCLIBC_VERSION_0_9_31 if (BR2_avr32 || BR2_sh) # 0.9.32 broken
 	default BR2_UCLIBC_VERSION_0_9_32
 	help
 	  Select the version of uClibc you wish to use.
@@ -19,7 +19,7 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
-		depends on !BR2_avr32
+		depends on !(BR2_avr32 || BR2_sh)
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"

From 1f2c67fe1b9ddcbc6f20ab8cea19b13d40c35d4e Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 18 Aug 2011 09:44:46 +0200
Subject: [PATCH 0549/6849] kernel-headers: bump 3.0.x stable version

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 116b8621c6..161a647a74 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -54,6 +54,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.1"		if BR2_KERNEL_HEADERS_3_0
+	default "3.0.3"		if BR2_KERNEL_HEADERS_3_0
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 31fc47771778426dddf9a20465fedaf73ce32440 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Mon, 22 Aug 2011 12:38:27 +0200
Subject: [PATCH 0550/6849] mtd: bump to 1.4.6

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 78ab7659c7..58b5ce100b 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,9 +3,9 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION:=1.4.5
-MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2
-MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils
+MTD_VERSION = 1.4.6
+MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
+MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 MTD_DEPENDENCIES = zlib lzo
 endif
@@ -22,8 +22,8 @@ define HOST_MTD_INSTALL_CMDS
 	$(MAKE1) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
 endef
 
-MKFS_JFFS2=$(HOST_DIR)/usr/sbin/mkfs.jffs2
-SUMTOOL=$(HOST_DIR)/usr/sbin/sumtool
+MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
+SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
 
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK)		+= docfdisk
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS)	+= doc_loadbios

From f5777ce8fbd60c216234de58147f25dfaac88fe6 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Mon, 22 Aug 2011 21:28:47 +0200
Subject: [PATCH 0551/6849] linux: add linux/linux26-savedefconfig support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile       | 1 +
 linux/linux.mk | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 24f0cb2d06..7e7e25f751 100644
--- a/Makefile
+++ b/Makefile
@@ -652,6 +652,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 ifeq ($(BR2_LINUX_KERNEL),y)
 	@echo '  linux-menuconfig       - Run Linux kernel menuconfig'
+	@echo '  linux-savedefconfig    - Run Linux kernel savedefconfig'
 endif
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 	@echo '  uclibc-menuconfig      - Run uClibc menuconfig'
diff --git a/linux/linux.mk b/linux/linux.mk
index e6cf01aea0..6662f7b06d 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -184,6 +184,10 @@ linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig li
 		$(subst linux-,,$(subst linux26-,,$@))
 	rm -f $(LINUX_DIR)/.stamp_{built,target_installed,images_installed}
 
+linux-savedefconfig linux26-savedefconfig: dirs $(LINUX_DIR)/.stamp_configured
+	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
+		$(subst linux-,,$(subst linux26-,,$@))
+
 # Support for rebuilding the kernel after the initramfs file list has
 # been generated in $(BINARIES_DIR)/rootfs.initramfs.
 $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.initramfs

From 83f1bf9e4553ab4ac01f17566b3f74df8058987d Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Mon, 22 Aug 2011 21:28:48 +0200
Subject: [PATCH 0552/6849] barebox: add barebox-<n/x/menu>config and
 barebox-savedefconfig support

[Peter: only activate if barebox is enabled, fix deps]
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                |  4 ++++
 boot/barebox/barebox.mk | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Makefile b/Makefile
index 7e7e25f751..f74a6acb8f 100644
--- a/Makefile
+++ b/Makefile
@@ -659,6 +659,10 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 endif
 ifeq ($(BR2_TOOLCHAIN_CTNG),y)
 	@echo '  ctng-menuconfig        - Run crosstool-NG menuconfig'
+endif
+ifeq ($(BR2_TARGET_BAREBOX),y)
+	@echo '  barebox-menuconfig     - Run barebox menuconfig'
+	@echo '  barebox-savedefconfig  - Run barebox savedefconfig'
 endif
 	@echo
 	@echo 'Miscellaneous:'
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 5c615f8624..d3143e69a1 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -60,4 +60,14 @@ ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
 $(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
 endif
 endif
+
+barebox-menuconfig barebox-xconfig barebox-gconfig barebox-nconfig: barebox-configure
+	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
+		$(subst barebox-,,$@)
+	rm -f $(BAREBOX_DIR)/.stamp_{built,target_installed,images_installed}
+
+barebox-savedefconfig: barebox-configure
+	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
+		$(subst barebox-,,$@)
+
 endif

From 60620a1d8195774a65b053268d07ab603caab192 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Aug 2011 14:45:46 +0200
Subject: [PATCH 0553/6849] binutils: only use 2.21.1 for uClibc 0.9.32 /
 snapshot

Earlier versions don't build with it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 7de59f006a..f87298a756 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -3,7 +3,8 @@ comment "Binutils Options"
 choice
 	prompt "Binutils Version"
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
-	default BR2_BINUTILS_VERSION_2_21_1
+	default BR2_BINUTILS_VERSION_2_21_1 if (BR2_UCLIBC_VERSION_0_9_32 || BR2_UCLIBC_VERSION_SNAPSHOT)
+	default BR2_BINUTILS_VERSION_2_21
 	help
 	  Select the version of binutils you wish to use.
 
@@ -39,7 +40,7 @@ choice
 		bool "binutils 2.21"
 
 	config BR2_BINUTILS_VERSION_2_21_1
-		depends on !BR2_avr32
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.21.1"
 
 endchoice

From 480a6c3b01319afb641237da28b40983e1530cbe Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Aug 2011 15:01:18 +0200
Subject: [PATCH 0554/6849] configs: remove arm toolchain defconfigs

nptl is default nowadays, and configurations were pretty much random
anyway.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/arm_nptl_toolchain_defconfig | 17 -----------------
 configs/arm_toolchain_defconfig      | 15 ---------------
 2 files changed, 32 deletions(-)
 delete mode 100644 configs/arm_nptl_toolchain_defconfig
 delete mode 100644 configs/arm_toolchain_defconfig

diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
deleted file mode 100644
index 8100073b39..0000000000
--- a/configs/arm_nptl_toolchain_defconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-
-# Toolchain options
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_ENABLE_LOCALE=y
-BR2_USE_WCHAR=y
-BR2_PTHREADS_NATIVE=y
-BR2_INSTALL_LIBSTDCPP=y
-
-# No package
-# BR2_PACKAGE_BUSYBOX is not set
-
-# No filesystem (toolchain only)
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
deleted file mode 100644
index 8bc97c98cf..0000000000
--- a/configs/arm_toolchain_defconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Architecture
-BR2_arm=y
-
-# Common Toolchain Options
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_ENABLE_LOCALE=y
-BR2_USE_WCHAR=y
-BR2_INSTALL_LIBSTDCPP=y
-
-# No package
-# BR2_PACKAGE_BUSYBOX is not set
-
-# No filesystem (toolchain only)

From e0a6bcd8268602fe3d2780c23cf5f7be47441ae6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Aug 2011 15:07:41 +0200
Subject: [PATCH 0555/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGES b/CHANGES
index a6f368b487..1e5ea4e53e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2011.08, Not yet released:
+
+	Fixes all over the tree.
+
+	Toolchain: crosstool-NG 1.12.0, use binutils 2.21 of
+	mips/sh/older uClibc, disallow uClibc 0.9.32 on avr32/sh
+	(broken).
+
+	Updated/fixed packages: barebox, directfb, libsoup,
+	libxml-parser-perl, mtd, python, ti-utils, udev, usbmount,
+	util-linux, xfont_font-misc-misc
+
 2011.08-rc1, Released August 4th, 2011:
 
 	Fixes all over the tree and new features.

From d881a14f9b7e7367bc664105bd98166015eaefaf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 25 Aug 2011 17:29:40 +0200
Subject: [PATCH 0556/6849] mini2440_defconfig: fix getty config

BR2_TARGET_GENERIC_GETTY_TTYSAC0 is no more.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/mini2440_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/mini2440_defconfig b/configs/mini2440_defconfig
index d1be8e1d0e..ac6d0cf9d2 100644
--- a/configs/mini2440_defconfig
+++ b/configs/mini2440_defconfig
@@ -3,7 +3,8 @@ BR2_arm=y
 BR2_arm920t=y
 
 # Serial port
-BR2_TARGET_GENERIC_GETTY_TTYSAC0=y
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttySAC0"
 
 # Filesystem
 BR2_TARGET_ROOTFS_JFFS2=y

From cb6c2c427838a0ba5dc7bb404734574c9ed6b102 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 26 Aug 2011 07:13:33 +0200
Subject: [PATCH 0557/6849] grub: fix patch handling after AUTOTARGETS
 conversion

Closes #4093

AUTOTARGETS doesn't handle compressed patches, so the '400' patch did
not get applied.

Fix it by extracting the patch. With this, the '500' patch is no longer
needed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                  |     4 +
 boot/grub/grub.400-nic_update2.patch     | 49480 +++++++++++++++++++++
 boot/grub/grub.400-nic_update2.patch.bz2 |   Bin 328903 -> 0 bytes
 boot/grub/grub.500-build-fix.patch       |    14 -
 4 files changed, 49484 insertions(+), 14 deletions(-)
 create mode 100644 boot/grub/grub.400-nic_update2.patch
 delete mode 100644 boot/grub/grub.400-nic_update2.patch.bz2
 delete mode 100644 boot/grub/grub.500-build-fix.patch

diff --git a/CHANGES b/CHANGES
index 1e5ea4e53e..2b64c337b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,10 @@
 	libxml-parser-perl, mtd, python, ti-utils, udev, usbmount,
 	util-linux, xfont_font-misc-misc
 
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4093: Grub fails to install bz2 patch after conversion to...
+
 2011.08-rc1, Released August 4th, 2011:
 
 	Fixes all over the tree and new features.
diff --git a/boot/grub/grub.400-nic_update2.patch b/boot/grub/grub.400-nic_update2.patch
new file mode 100644
index 0000000000..064c953f09
--- /dev/null
+++ b/boot/grub/grub.400-nic_update2.patch
@@ -0,0 +1,49480 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-08-31
+Initial Package Version: 0.97
+Origin: OpenSolaris, Joe Ciccone, Jim Gifford
+Upstream Status: N/A
+Description: Adds support for Forcedeth and other NIC's
+	     Fixes for GCC 4.x
+	     Removal of bad network drivers
+ 
+diff -Naur grub-0.97.orig/configure grub-0.97/configure
+--- grub-0.97.orig/configure	2005-05-08 02:48:12.000000000 +0000
++++ grub-0.97/configure	2005-09-01 00:15:48.000000000 +0000
+@@ -872,47 +872,32 @@
+   --disable-packet-retransmission
+                           turn off packet retransmission
+   --enable-pci-direct     access PCI directly instead of using BIOS
+-  --enable-3c509          enable 3Com509 driver
+-  --enable-3c529          enable 3Com529 driver
+   --enable-3c595          enable 3Com595 driver
+   --enable-3c90x          enable 3Com90x driver
+-  --enable-cs89x0         enable CS89x0 driver
+   --enable-davicom        enable Davicom driver
+-  --enable-depca          enable DEPCA and EtherWORKS driver
+-  --enable-eepro          enable Etherexpress Pro/10 driver
++  --enable-e1000          enable Etherexpress Pro/1000 driver
+   --enable-eepro100       enable Etherexpress Pro/100 driver
+   --enable-epic100        enable SMC 83c170 EPIC/100 driver
+-  --enable-3c507          enable 3Com507 driver
+-  --enable-exos205        enable EXOS205 driver
+-  --enable-ni5210         enable Racal-Interlan NI5210 driver
+-  --enable-lance          enable Lance PCI PCNet/32 driver
+-  --enable-ne2100         enable Novell NE2100 driver
+-  --enable-ni6510         enable Racal-Interlan NI6510 driver
++  --enable-forcedeth      enable Nvidia Geforce driver
+   --enable-natsemi        enable NatSemi DP8381x driver
+-  --enable-ni5010         enable Racal-Interlan NI5010 driver
+-  --enable-3c503          enable 3Com503 driver
+-  --enable-ne             enable NE1000/2000 ISA driver
++  --enable-ns83820        enable NS83820 driver
+   --enable-ns8390         enable NE2000 PCI driver
+-  --enable-wd             enable WD8003/8013, SMC8216/8416 driver
+-  --enable-otulip         enable old Tulip driver
++  --enable-pcnet32        enable AMD Lance/PCI PCNet/32 driver
++  --enable-pnic           enable Bochs Pseudo Nic driver
+   --enable-rtl8139        enable Realtek 8139 driver
++  --enable-r8169          enable Realtek 8169 driver
+   --enable-sis900         enable SIS 900 and SIS 7016 driver
+-  --enable-sk-g16         enable Schneider and Koch G16 driver
+-  --enable-smc9000        enable SMC9000 driver
+-  --enable-tiara          enable Tiara driver
++  --enable-tg3            enable Broadcom Tigon3 driver
+   --enable-tulip          enable Tulip driver
++  --enable-tlan           enable TI ThunderLAN driver
++  --enable-undi           enable PXE UNDI driver
+   --enable-via-rhine      enable Rhine-I/II driver
+-  --enable-w89c840        enable Winbond W89c840, Compex RL100-ATX driver
+-  --enable-3c503-shmem    use 3c503 shared memory mode
+-  --enable-3c503-aui      use AUI by default on 3c503 cards
++  --enable-w89c840        enable Winbond W89c840 driver
+   --enable-compex-rl2000-fix
+                           specify this if you have a Compex RL2000 PCI
+-  --enable-smc9000-scan=LIST
+-                          probe for SMC9000 I/O addresses using LIST
+   --enable-ne-scan=LIST   probe for NE base address using LIST
+   --enable-wd-default-mem=MEM
+                           set the default memory location for WD/SMC
+-  --enable-cs-scan=LIST   probe for CS89x0 base address using LIST
+   --enable-diskless       enable diskless support
+   --disable-hercules      disable hercules terminal support
+   --disable-serial        disable serial terminal support
+@@ -5559,7 +5544,7 @@
+ 
+ fi;
+ if test "x$enable_packet_retransmission" != xno; then
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1"
++  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1 -DCONFIG_PCI"
+ fi
+ 
+ # Check whether --enable-pci-direct or --disable-pci-direct was given.
+@@ -5571,26 +5556,6 @@
+   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONFIG_PCI_DIRECT=1"
+ fi
+ 
+-# Check whether --enable-3c509 or --disable-3c509 was given.
+-if test "${enable_3c509+set}" = set; then
+-  enableval="$enable_3c509"
+-
+-fi;
+-if test "x$enable_3c509" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o"
+-fi
+-
+-# Check whether --enable-3c529 or --disable-3c529 was given.
+-if test "${enable_3c529+set}" = set; then
+-  enableval="$enable_3c529"
+-
+-fi;
+-if test "x$enable_3c529" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o"
+-fi
+-
+ # Check whether --enable-3c595 or --disable-3c595 was given.
+ if test "${enable_3c595+set}" = set; then
+   enableval="$enable_3c595"
+@@ -5611,16 +5576,6 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o"
+ fi
+ 
+-# Check whether --enable-cs89x0 or --disable-cs89x0 was given.
+-if test "${enable_cs89x0+set}" = set; then
+-  enableval="$enable_cs89x0"
+-
+-fi;
+-if test "x$enable_cs89x0" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o"
+-fi
+-
+ # Check whether --enable-davicom or --disable-davicom was given.
+ if test "${enable_davicom+set}" = set; then
+   enableval="$enable_davicom"
+@@ -5631,24 +5586,14 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS davicom.o"
+ fi
+ 
+-# Check whether --enable-depca or --disable-depca was given.
+-if test "${enable_depca+set}" = set; then
+-  enableval="$enable_depca"
++# Check whether --enable-e1000 or --disable-e1000 was given.
++if test "${enable_e1000+set}" = set; then
++  enableval="$enable_e1000"
+ 
+ fi;
+-if test "x$enable_depca" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o"
+-fi
+-
+-# Check whether --enable-eepro or --disable-eepro was given.
+-if test "${enable_eepro+set}" = set; then
+-  enableval="$enable_eepro"
+-
+-fi;
+-if test "x$enable_eepro" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro.o"
++if test "x$enable_e1000" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_E1000=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS e1000.o"
+ fi
+ 
+ # Check whether --enable-eepro100 or --disable-eepro100 was given.
+@@ -5671,64 +5616,14 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o"
+ fi
+ 
+-# Check whether --enable-3c507 or --disable-3c507 was given.
+-if test "${enable_3c507+set}" = set; then
+-  enableval="$enable_3c507"
+-
+-fi;
+-if test "x$enable_3c507" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o"
+-fi
+-
+-# Check whether --enable-exos205 or --disable-exos205 was given.
+-if test "${enable_exos205+set}" = set; then
+-  enableval="$enable_exos205"
+-
+-fi;
+-if test "x$enable_exos205" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o"
+-fi
+-
+-# Check whether --enable-ni5210 or --disable-ni5210 was given.
+-if test "${enable_ni5210+set}" = set; then
+-  enableval="$enable_ni5210"
+-
+-fi;
+-if test "x$enable_ni5210" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o"
+-fi
+-
+-# Check whether --enable-lance or --disable-lance was given.
+-if test "${enable_lance+set}" = set; then
+-  enableval="$enable_lance"
+-
+-fi;
+-if test "x$enable_lance" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o"
+-fi
+-
+-# Check whether --enable-ne2100 or --disable-ne2100 was given.
+-if test "${enable_ne2100+set}" = set; then
+-  enableval="$enable_ne2100"
+-
+-fi;
+-if test "x$enable_ne2100" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o"
+-fi
+-
+-# Check whether --enable-ni6510 or --disable-ni6510 was given.
+-if test "${enable_ni6510+set}" = set; then
+-  enableval="$enable_ni6510"
++# Check whether --enable-forcedeth or --disable-forcedeth was given.
++if test "${enable_forcedeth+set}" = set; then
++  enableval="$enable_forcedeth"
+ 
+ fi;
+-if test "x$enable_ni6510" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o"
++if test "x$enable_forcedeth" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_FORCEDETH=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS forcedeth.o"
+ fi
+ 
+ # Check whether --enable-natsemi or --disable-natsemi was given.
+@@ -5741,34 +5636,14 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS natsemi.o"
+ fi
+ 
+-# Check whether --enable-ni5010 or --disable-ni5010 was given.
+-if test "${enable_ni5010+set}" = set; then
+-  enableval="$enable_ni5010"
++# Check whether --enable-ns83820 or --disable-ns83820 was given.
++if test "${enable_ns83820+set}" = set; then
++  enableval="$enable_ns83820"
+ 
+ fi;
+-if test "x$enable_ni5010" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5010=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5010.o"
+-fi
+-
+-# Check whether --enable-3c503 or --disable-3c503 was given.
+-if test "${enable_3c503+set}" = set; then
+-  enableval="$enable_3c503"
+-
+-fi;
+-if test "x$enable_3c503" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o"
+-fi
+-
+-# Check whether --enable-ne or --disable-ne was given.
+-if test "${enable_ne+set}" = set; then
+-  enableval="$enable_ne"
+-
+-fi;
+-if test "x$enable_ne" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o"
++if test "x$enable_ns83820" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS83820=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns83820.o"
+ fi
+ 
+ # Check whether --enable-ns8390 or --disable-ns8390 was given.
+@@ -5781,24 +5656,24 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o"
+ fi
+ 
+-# Check whether --enable-wd or --disable-wd was given.
+-if test "${enable_wd+set}" = set; then
+-  enableval="$enable_wd"
++# Check whether --enable-pcnet32 or --disable-pcnet32 was given.
++if test "${enable_pcnet32+set}" = set; then
++  enableval="$enable_pcnet32"
+ 
+ fi;
+-if test "x$enable_wd" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o"
++if test "x$enable_pcnet32" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PCNET32=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pcnet32.o"
+ fi
+ 
+-# Check whether --enable-otulip or --disable-otulip was given.
+-if test "${enable_otulip+set}" = set; then
+-  enableval="$enable_otulip"
++# Check whether --enable-pnic or --disable-pnic was given.
++if test "${enable_pnic+set}" = set; then
++  enableval="$enable_pnic"
+ 
+ fi;
+-if test "x$enable_otulip" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o"
++if test "x$enable_pnic" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PNIC=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pnic.o"
+ fi
+ 
+ # Check whether --enable-rtl8139 or --disable-rtl8139 was given.
+@@ -5811,6 +5686,16 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o"
+ fi
+ 
++# Check whether --enable-r8169 or --disable-r8169 was given.
++if test "${enable_r8169+set}" = set; then
++  enableval="$enable_r8169"
++
++fi;
++if test "x$enable_r8169" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_R8169=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS r8169.o"
++fi
++
+ # Check whether --enable-sis900 or --disable-sis900 was given.
+ if test "${enable_sis900+set}" = set; then
+   enableval="$enable_sis900"
+@@ -5821,34 +5706,14 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS sis900.o"
+ fi
+ 
+-# Check whether --enable-sk-g16 or --disable-sk-g16 was given.
+-if test "${enable_sk_g16+set}" = set; then
+-  enableval="$enable_sk_g16"
+-
+-fi;
+-if test "x$enable_sk_g16" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o"
+-fi
+-
+-# Check whether --enable-smc9000 or --disable-smc9000 was given.
+-if test "${enable_smc9000+set}" = set; then
+-  enableval="$enable_smc9000"
+-
+-fi;
+-if test "x$enable_smc9000" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o"
+-fi
+-
+-# Check whether --enable-tiara or --disable-tiara was given.
+-if test "${enable_tiara+set}" = set; then
+-  enableval="$enable_tiara"
++# Check whether --enable-tg3 or --disable-tg3 was given.
++if test "${enable_tg3+set}" = set; then
++  enableval="$enable_tg3"
+ 
+ fi;
+-if test "x$enable_tiara" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o"
++if test "x$enable_tg3" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TG3=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tg3.o"
+ fi
+ 
+ # Check whether --enable-tulip or --disable-tulip was given.
+@@ -5861,6 +5726,16 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o"
+ fi
+ 
++# Check whether --enable-tlan or --disable-tlan was given.
++if test "${enable_tlan+set}" = set; then
++  enableval="$enable_tlan"
++
++fi;
++if test "x$enable_tlan" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TLAN=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tlan.o"
++fi
++
+ # Check whether --enable-via-rhine or --disable-via-rhine was given.
+ if test "${enable_via_rhine+set}" = set; then
+   enableval="$enable_via_rhine"
+@@ -5895,24 +5770,6 @@
+   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_TFTP=1"
+ fi
+ 
+-# Check whether --enable-3c503-shmem or --disable-3c503-shmem was given.
+-if test "${enable_3c503_shmem+set}" = set; then
+-  enableval="$enable_3c503_shmem"
+-
+-fi;
+-if test "x$enable_3c503_shmem" = xyes; then
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1"
+-fi
+-
+-# Check whether --enable-3c503-aui or --disable-3c503-aui was given.
+-if test "${enable_3c503_aui+set}" = set; then
+-  enableval="$enable_3c503_aui"
+-
+-fi;
+-if test "x$enable_3c503_aui" = xyes; then
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1"
+-fi
+-
+ # Check whether --enable-compex-rl2000-fix or --disable-compex-rl2000-fix was given.
+ if test "${enable_compex_rl2000_fix+set}" = set; then
+   enableval="$enable_compex_rl2000_fix"
+@@ -5922,12 +5779,6 @@
+   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1"
+ fi
+ 
+-# Check whether --enable-smc9000-scan or --disable-smc9000-scan was given.
+-if test "${enable_smc9000_scan+set}" = set; then
+-  enableval="$enable_smc9000_scan"
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan"
+-fi;
+-
+ # Check whether --enable-ne-scan or --disable-ne-scan was given.
+ if test "${enable_ne_scan+set}" = set; then
+   enableval="$enable_ne_scan"
+@@ -5944,12 +5795,6 @@
+   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000"
+ fi;
+ 
+-# Check whether --enable-cs-scan or --disable-cs-scan was given.
+-if test "${enable_cs_scan+set}" = set; then
+-  enableval="$enable_cs_scan"
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan"
+-fi;
+-
+ # Check whether --enable-diskless or --disable-diskless was given.
+ if test "${enable_diskless+set}" = set; then
+   enableval="$enable_diskless"
+diff -Naur grub-0.97.orig/configure.ac grub-0.97/configure.ac
+--- grub-0.97.orig/configure.ac	2005-05-08 02:36:03.000000000 +0000
++++ grub-0.97/configure.ac	2005-09-01 00:16:05.000000000 +0000
+@@ -317,7 +317,7 @@
+   [  --disable-packet-retransmission
+                           turn off packet retransmission])
+ if test "x$enable_packet_retransmission" != xno; then
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1"
++  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1 -DCONFIG_PCI"
+ fi
+ 
+ AC_ARG_ENABLE(pci-direct,
+@@ -327,20 +327,6 @@
+ fi
+ 
+ dnl Device drivers.
+-AC_ARG_ENABLE(3c509,
+-  [  --enable-3c509          enable 3Com509 driver])
+-if test "x$enable_3c509" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o"
+-fi
+-
+-AC_ARG_ENABLE(3c529,
+-  [  --enable-3c529          enable 3Com529 driver])
+-if test "x$enable_3c529" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o"
+-fi
+-
+ AC_ARG_ENABLE(3c595,
+   [  --enable-3c595          enable 3Com595 driver])
+ if test "x$enable_3c595" = xyes; then
+@@ -355,13 +341,6 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o"
+ fi
+ 
+-AC_ARG_ENABLE(cs89x0,
+-  [  --enable-cs89x0         enable CS89x0 driver])
+-if test "x$enable_cs89x0" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o"
+-fi
+-
+ AC_ARG_ENABLE(davicom,
+   [  --enable-davicom        enable Davicom driver])
+ if test "x$enable_davicom" = xyes; then
+@@ -369,18 +348,11 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS davicom.o"
+ fi
+ 
+-AC_ARG_ENABLE(depca,
+-  [  --enable-depca          enable DEPCA and EtherWORKS driver])
+-if test "x$enable_depca" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o"
+-fi
+-
+-AC_ARG_ENABLE(eepro,
+-  [  --enable-eepro          enable Etherexpress Pro/10 driver])
+-if test "x$enable_eepro" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro.o"
++AC_ARG_ENABLE(e1000,
++  [  --enable-e1000          enable Etherexpress Pro/1000 driver])
++if test "x$enable_e1000" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_E1000=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS e1000.o"
+ fi
+ 
+ AC_ARG_ENABLE(eepro100,
+@@ -397,46 +369,11 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o"
+ fi
+ 
+-AC_ARG_ENABLE(3c507,
+-  [  --enable-3c507          enable 3Com507 driver])
+-if test "x$enable_3c507" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o"
+-fi
+-
+-AC_ARG_ENABLE(exos205,
+-  [  --enable-exos205        enable EXOS205 driver])
+-if test "x$enable_exos205" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o"
+-fi
+-
+-AC_ARG_ENABLE(ni5210,
+-  [  --enable-ni5210         enable Racal-Interlan NI5210 driver])
+-if test "x$enable_ni5210" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o"
+-fi
+-
+-AC_ARG_ENABLE(lance,
+-  [  --enable-lance          enable Lance PCI PCNet/32 driver])
+-if test "x$enable_lance" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o"
+-fi
+-
+-AC_ARG_ENABLE(ne2100,
+-  [  --enable-ne2100         enable Novell NE2100 driver])
+-if test "x$enable_ne2100" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o"
+-fi
+-
+-AC_ARG_ENABLE(ni6510,
+-  [  --enable-ni6510         enable Racal-Interlan NI6510 driver])
+-if test "x$enable_ni6510" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o"
++AC_ARG_ENABLE(forcedeth,
++  [  --enable-forcedeth      enable Nvidia Geforce driver])
++if test "x$enable_forcedeth" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_FORCEDETH=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS forcedeth.o"
+ fi
+ 
+ AC_ARG_ENABLE(natsemi,
+@@ -446,25 +383,11 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS natsemi.o"
+ fi
+ 
+-AC_ARG_ENABLE(ni5010,
+-  [  --enable-ni5010         enable Racal-Interlan NI5010 driver])
+-if test "x$enable_ni5010" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5010=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5010.o"
+-fi
+-
+-AC_ARG_ENABLE(3c503,
+-  [  --enable-3c503          enable 3Com503 driver])
+-if test "x$enable_3c503" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o"
+-fi
+-
+-AC_ARG_ENABLE(ne,
+-  [  --enable-ne             enable NE1000/2000 ISA driver])
+-if test "x$enable_ne" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o"
++AC_ARG_ENABLE(ns83820,
++  [  --enable-ns83820        enable NS83820 driver])
++if test "x$enable_ns83820" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS83820=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns83820.o"
+ fi
+ 
+ AC_ARG_ENABLE(ns8390,
+@@ -474,18 +397,18 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o"
+ fi
+ 
+-AC_ARG_ENABLE(wd,
+-  [  --enable-wd             enable WD8003/8013, SMC8216/8416 driver])
+-if test "x$enable_wd" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o"
++AC_ARG_ENABLE(pcnet32,
++  [  --enable-pcnet32        enable AMD Lance/PCI PCNet/32 driver])
++if test "x$enable_pcnet32" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PCNET32=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pcnet32.o"
+ fi
+ 
+-AC_ARG_ENABLE(otulip,
+-  [  --enable-otulip         enable old Tulip driver])
+-if test "x$enable_otulip" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o"
++AC_ARG_ENABLE(pnic,
++  [  --enable-pnic           enable Bochs Pseudo Nic driver])
++if test "x$enable_pnic" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PNIC=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pnic.o"
+ fi
+ 
+ AC_ARG_ENABLE(rtl8139,
+@@ -495,6 +418,13 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o"
+ fi
+ 
++AC_ARG_ENABLE(r8169,
++  [  --enable-r8169          enable Realtek 8169 driver])
++if test "x$enable_r8169" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_R8169=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS r8169.o"
++fi
++
+ AC_ARG_ENABLE(sis900,
+   [  --enable-sis900         enable SIS 900 and SIS 7016 driver])
+ if test "x$enable_sis900" = xyes; then
+@@ -502,25 +432,11 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS sis900.o"
+ fi
+ 
+-AC_ARG_ENABLE(sk-g16,
+-  [  --enable-sk-g16         enable Schneider and Koch G16 driver])
+-if test "x$enable_sk_g16" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o"
+-fi
+-
+-AC_ARG_ENABLE(smc9000,
+-  [  --enable-smc9000        enable SMC9000 driver])
+-if test "x$enable_smc9000" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o"
+-fi
+-
+-AC_ARG_ENABLE(tiara,
+-  [  --enable-tiara          enable Tiara driver])
+-if test "x$enable_tiara" = xyes; then
+-  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1"
+-  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o"
++AC_ARG_ENABLE(tg3,
++  [  --enable-tg3            enable Broadcom Tigon3 driver])
++if test "x$enable_tg3" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TG3=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tg3.o"
+ fi
+ 
+ AC_ARG_ENABLE(tulip,
+@@ -530,6 +446,13 @@
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o"
+ fi
+ 
++AC_ARG_ENABLE(tlan,
++  [  --enable-tlan           enable TI ThunderLAN driver])
++if test "x$enable_tlan" = xyes; then
++  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TLAN=1"
++  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tlan.o"
++fi
++
+ AC_ARG_ENABLE(via-rhine,
+   [  --enable-via-rhine      enable Rhine-I/II driver])
+ if test "x$enable_via_rhine" = xyes; then
+@@ -538,7 +461,7 @@
+ fi
+ 
+ AC_ARG_ENABLE(w89c840,
+-  [  --enable-w89c840        enable Winbond W89c840, Compex RL100-ATX driver])
++  [  --enable-w89c840        enable Winbond W89c840 driver])
+ if test "x$enable_w89c840" = xyes; then
+   NET_CFLAGS="$NET_CFLAGS -DINCLUDE_W89C840=1"
+   NETBOOT_DRIVERS="$NETBOOT_DRIVERS w89c840.o"
+@@ -550,19 +473,7 @@
+   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_TFTP=1"
+ fi
+ 
+-dnl Extra options.
+-AC_ARG_ENABLE(3c503-shmem,
+-  [  --enable-3c503-shmem    use 3c503 shared memory mode])
+-if test "x$enable_3c503_shmem" = xyes; then
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1"
+-fi
+-
+-AC_ARG_ENABLE(3c503-aui,
+-  [  --enable-3c503-aui      use AUI by default on 3c503 cards])
+-if test "x$enable_3c503_aui" = xyes; then
+-  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1"
+-fi
+-
++dnl extra flag for ns8390.c
+ AC_ARG_ENABLE(compex-rl2000-fix,
+   [  --enable-compex-rl2000-fix
+                           specify this if you have a Compex RL2000 PCI])
+@@ -570,11 +481,6 @@
+   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1"
+ fi
+ 
+-AC_ARG_ENABLE(smc9000-scan,
+-  [  --enable-smc9000-scan=LIST
+-                          probe for SMC9000 I/O addresses using LIST],
+-  [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan"])
+-
+ AC_ARG_ENABLE(ne-scan,
+   [  --enable-ne-scan=LIST   probe for NE base address using LIST],
+   [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=$enable_ne_scan"],
+@@ -586,10 +492,6 @@
+   [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=$enable_wd_default_mem"],
+   [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000"])
+ 
+-AC_ARG_ENABLE(cs-scan,
+-  [  --enable-cs-scan=LIST   probe for CS89x0 base address using LIST],
+-  [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan"])
+-
+ dnl Diskless
+ AC_ARG_ENABLE(diskless,
+   [  --enable-diskless       enable diskless support])
+diff -Naur grub-0.97.orig/netboot/3c509.h grub-0.97/netboot/3c509.h
+--- grub-0.97.orig/netboot/3c509.h	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/3c509.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,397 +0,0 @@
+-/*
+- * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are
+- * met: 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer. 2. The name
+- * of the author may not be used to endorse or promote products derived from
+- * this software withough specific prior written permission
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- *
+- * if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by:
+- *
+- October 2, 1994
+-
+- Modified by: Andres Vega Garcia
+-
+- INRIA - Sophia Antipolis, France
+- e-mail: avega@sophia.inria.fr
+- finger: avega@pax.inria.fr
+-
+- */
+-
+-/*
+- * Ethernet software status per interface.
+- */
+-/*
+- * Some global constants
+- */
+-
+-#define TX_INIT_RATE		16
+-#define TX_INIT_MAX_RATE	64
+-#define RX_INIT_LATENCY		64
+-#define RX_INIT_EARLY_THRESH	64
+-#define MIN_RX_EARLY_THRESHF	16	/* not less than ether_header */
+-#define MIN_RX_EARLY_THRESHL	4
+-
+-#define EEPROMSIZE	0x40
+-#define MAX_EEPROMBUSY	1000
+-#define EP_LAST_TAG	0xd7
+-#define EP_MAX_BOARDS	16
+-#define EP_ID_PORT	0x100
+-
+-/*
+- * some macros to acces long named fields
+- */
+-#define IS_BASE (eth_nic_base)
+-#define BASE	(eth_nic_base)
+-
+-/*
+- * Commands to read/write EEPROM trough EEPROM command register (Window 0,
+- * Offset 0xa)
+- */
+-#define EEPROM_CMD_RD	0x0080	/* Read:  Address required (5 bits) */
+-#define EEPROM_CMD_WR	0x0040	/* Write: Address required (5 bits) */
+-#define EEPROM_CMD_ERASE 0x00c0	/* Erase: Address required (5 bits) */
+-#define EEPROM_CMD_EWEN	0x0030	/* Erase/Write Enable: No data required */
+-
+-#define EEPROM_BUSY		(1<<15)
+-#define EEPROM_TST_MODE		(1<<14)
+-
+-/*
+- * Some short functions, worth to let them be a macro
+- */
+-#define is_eeprom_busy(b) (inw((b)+EP_W0_EEPROM_COMMAND)&EEPROM_BUSY)
+-#define GO_WINDOW(x)	outw(WINDOW_SELECT|(x), BASE+EP_COMMAND)
+-
+-/**************************************************************************
+- *
+- * These define the EEPROM data structure.  They are used in the probe
+- * function to verify the existance of the adapter after having sent
+- * the ID_Sequence.
+- *
+- * There are others but only the ones we use are defined here.
+- *
+- **************************************************************************/
+-
+-#define EEPROM_NODE_ADDR_0	0x0	/* Word */
+-#define EEPROM_NODE_ADDR_1	0x1	/* Word */
+-#define EEPROM_NODE_ADDR_2	0x2	/* Word */
+-#define EEPROM_PROD_ID		0x3	/* 0x9[0-f]50 */
+-#define EEPROM_MFG_ID		0x7	/* 0x6d50 */
+-#define EEPROM_ADDR_CFG		0x8	/* Base addr */
+-#define EEPROM_RESOURCE_CFG	0x9	/* IRQ. Bits 12-15 */
+-
+-/**************************************************************************
+- *
+- * These are the registers for the 3Com 3c509 and their bit patterns when
+- * applicable.  They have been taken out the the "EtherLink III Parallel
+- * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual
+- * from 3com.
+- *
+- **************************************************************************/
+-
+-#define EP_COMMAND		0x0e	/* Write. BASE+0x0e is always a
+-					 * command reg. */
+-#define EP_STATUS		0x0e	/* Read. BASE+0x0e is always status
+-					 * reg. */
+-#define EP_WINDOW		0x0f	/* Read. BASE+0x0f is always window
+-					 * reg. */
+-/*
+- * Window 0 registers. Setup.
+- */
+-/* Write */
+-#define EP_W0_EEPROM_DATA	0x0c
+-#define EP_W0_EEPROM_COMMAND	0x0a
+-#define EP_W0_RESOURCE_CFG	0x08
+-#define EP_W0_ADDRESS_CFG	0x06
+-#define EP_W0_CONFIG_CTRL	0x04
+-/* Read */
+-#define EP_W0_PRODUCT_ID	0x02
+-#define EP_W0_MFG_ID		0x00
+-
+-/*
+- * Window 1 registers. Operating Set.
+- */
+-/* Write */
+-#define EP_W1_TX_PIO_WR_2	0x02
+-#define EP_W1_TX_PIO_WR_1	0x00
+-/* Read */
+-#define EP_W1_FREE_TX		0x0c
+-#define EP_W1_TX_STATUS		0x0b	/* byte */
+-#define EP_W1_TIMER		0x0a	/* byte */
+-#define EP_W1_RX_STATUS		0x08
+-#define EP_W1_RX_PIO_RD_2	0x02
+-#define EP_W1_RX_PIO_RD_1	0x00
+-
+-/*
+- * Window 2 registers. Station Address Setup/Read
+- */
+-/* Read/Write */
+-#define EP_W2_ADDR_5		0x05
+-#define EP_W2_ADDR_4		0x04
+-#define EP_W2_ADDR_3		0x03
+-#define EP_W2_ADDR_2		0x02
+-#define EP_W2_ADDR_1		0x01
+-#define EP_W2_ADDR_0		0x00
+-
+-/*
+- * Window 3 registers.  FIFO Management.
+- */
+-/* Read */
+-#define EP_W3_FREE_TX		0x0c
+-#define EP_W3_FREE_RX		0x0a
+-
+-/*
+- * Window 4 registers. Diagnostics.
+- */
+-/* Read/Write */
+-#define EP_W4_MEDIA_TYPE	0x0a
+-#define EP_W4_CTRLR_STATUS	0x08
+-#define EP_W4_NET_DIAG		0x06
+-#define EP_W4_FIFO_DIAG		0x04
+-#define EP_W4_HOST_DIAG		0x02
+-#define EP_W4_TX_DIAG		0x00
+-
+-/*
+- * Window 5 Registers.  Results and Internal status.
+- */
+-/* Read */
+-#define EP_W5_READ_0_MASK	0x0c
+-#define EP_W5_INTR_MASK		0x0a
+-#define EP_W5_RX_FILTER		0x08
+-#define EP_W5_RX_EARLY_THRESH	0x06
+-#define EP_W5_TX_AVAIL_THRESH	0x02
+-#define EP_W5_TX_START_THRESH	0x00
+-
+-/*
+- * Window 6 registers. Statistics.
+- */
+-/* Read/Write */
+-#define TX_TOTAL_OK		0x0c
+-#define RX_TOTAL_OK		0x0a
+-#define TX_DEFERRALS		0x08
+-#define RX_FRAMES_OK		0x07
+-#define TX_FRAMES_OK		0x06
+-#define RX_OVERRUNS		0x05
+-#define TX_COLLISIONS		0x04
+-#define TX_AFTER_1_COLLISION	0x03
+-#define TX_AFTER_X_COLLISIONS	0x02
+-#define TX_NO_SQE		0x01
+-#define TX_CD_LOST		0x00
+-
+-/****************************************
+- *
+- * Register definitions.
+- *
+- ****************************************/
+-
+-/*
+- * Command register. All windows.
+- *
+- * 16 bit register.
+- *     15-11:  5-bit code for command to be executed.
+- *     10-0:   11-bit arg if any. For commands with no args;
+- *	      this can be set to anything.
+- */
+-#define GLOBAL_RESET		(unsigned short) 0x0000	/* Wait at least 1ms
+-							 * after issuing */
+-#define WINDOW_SELECT		(unsigned short) (0x1<<11)
+-#define START_TRANSCEIVER	(unsigned short) (0x2<<11)	/* Read ADDR_CFG reg to
+-							 * determine whether
+-							 * this is needed. If
+-							 * so; wait 800 uSec
+-							 * before using trans-
+-							 * ceiver. */
+-#define RX_DISABLE		(unsigned short) (0x3<<11)	/* state disabled on
+-							 * power-up */
+-#define RX_ENABLE		(unsigned short) (0x4<<11)
+-#define RX_RESET		(unsigned short) (0x5<<11)
+-#define RX_DISCARD_TOP_PACK	(unsigned short) (0x8<<11)
+-#define TX_ENABLE		(unsigned short) (0x9<<11)
+-#define TX_DISABLE		(unsigned short) (0xa<<11)
+-#define TX_RESET		(unsigned short) (0xb<<11)
+-#define REQ_INTR		(unsigned short) (0xc<<11)
+-#define SET_INTR_MASK		(unsigned short) (0xe<<11)
+-#define SET_RD_0_MASK		(unsigned short) (0xf<<11)
+-#define SET_RX_FILTER		(unsigned short) (0x10<<11)
+-#define FIL_INDIVIDUAL	(unsigned short) (0x1)
+-#define FIL_GROUP		(unsigned short) (0x2)
+-#define FIL_BRDCST	(unsigned short) (0x4)
+-#define FIL_ALL		(unsigned short) (0x8)
+-#define SET_RX_EARLY_THRESH	(unsigned short) (0x11<<11)
+-#define SET_TX_AVAIL_THRESH	(unsigned short) (0x12<<11)
+-#define SET_TX_START_THRESH	(unsigned short) (0x13<<11)
+-#define STATS_ENABLE		(unsigned short) (0x15<<11)
+-#define STATS_DISABLE		(unsigned short) (0x16<<11)
+-#define STOP_TRANSCEIVER	(unsigned short) (0x17<<11)
+-/*
+- * The following C_* acknowledge the various interrupts. Some of them don't
+- * do anything.  See the manual.
+- */
+-#define ACK_INTR		(unsigned short) (0x6800)
+-#define C_INTR_LATCH	(unsigned short) (ACK_INTR|0x1)
+-#define C_CARD_FAILURE	(unsigned short) (ACK_INTR|0x2)
+-#define C_TX_COMPLETE	(unsigned short) (ACK_INTR|0x4)
+-#define C_TX_AVAIL	(unsigned short) (ACK_INTR|0x8)
+-#define C_RX_COMPLETE	(unsigned short) (ACK_INTR|0x10)
+-#define C_RX_EARLY	(unsigned short) (ACK_INTR|0x20)
+-#define C_INT_RQD		(unsigned short) (ACK_INTR|0x40)
+-#define C_UPD_STATS	(unsigned short) (ACK_INTR|0x80)
+-
+-/*
+- * Status register. All windows.
+- *
+- *     15-13:  Window number(0-7).
+- *     12:     Command_in_progress.
+- *     11:     reserved.
+- *     10:     reserved.
+- *     9:      reserved.
+- *     8:      reserved.
+- *     7:      Update Statistics.
+- *     6:      Interrupt Requested.
+- *     5:      RX Early.
+- *     4:      RX Complete.
+- *     3:      TX Available.
+- *     2:      TX Complete.
+- *     1:      Adapter Failure.
+- *     0:      Interrupt Latch.
+- */
+-#define S_INTR_LATCH		(unsigned short) (0x1)
+-#define S_CARD_FAILURE		(unsigned short) (0x2)
+-#define S_TX_COMPLETE		(unsigned short) (0x4)
+-#define S_TX_AVAIL		(unsigned short) (0x8)
+-#define S_RX_COMPLETE		(unsigned short) (0x10)
+-#define S_RX_EARLY		(unsigned short) (0x20)
+-#define S_INT_RQD		(unsigned short) (0x40)
+-#define S_UPD_STATS		(unsigned short) (0x80)
+-#define S_5_INTS		(S_CARD_FAILURE|S_TX_COMPLETE|\
+-				 S_TX_AVAIL|S_RX_COMPLETE|S_RX_EARLY)
+-#define S_COMMAND_IN_PROGRESS	(unsigned short) (0x1000)
+-
+-/*
+- * FIFO Registers.
+- * RX Status. Window 1/Port 08
+- *
+- *     15:     Incomplete or FIFO empty.
+- *     14:     1: Error in RX Packet   0: Incomplete or no error.
+- *     13-11:  Type of error.
+- *	      1000 = Overrun.
+- *	      1011 = Run Packet Error.
+- *	      1100 = Alignment Error.
+- *	      1101 = CRC Error.
+- *	      1001 = Oversize Packet Error (>1514 bytes)
+- *	      0010 = Dribble Bits.
+- *	      (all other error codes, no errors.)
+- *
+- *     10-0:   RX Bytes (0-1514)
+- */
+-#define ERR_RX_INCOMPLETE	(unsigned short) (0x1<<15)
+-#define ERR_RX			(unsigned short) (0x1<<14)
+-#define ERR_RX_OVERRUN		(unsigned short) (0x8<<11)
+-#define ERR_RX_RUN_PKT		(unsigned short) (0xb<<11)
+-#define ERR_RX_ALIGN		(unsigned short) (0xc<<11)
+-#define ERR_RX_CRC		(unsigned short) (0xd<<11)
+-#define ERR_RX_OVERSIZE		(unsigned short) (0x9<<11)
+-#define ERR_RX_DRIBBLE		(unsigned short) (0x2<<11)
+-
+-/*
+- * FIFO Registers.
+- * TX Status. Window 1/Port 0B
+- *
+- *   Reports the transmit status of a completed transmission. Writing this
+- *   register pops the transmit completion stack.
+- *
+- *   Window 1/Port 0x0b.
+- *
+- *     7:      Complete
+- *     6:      Interrupt on successful transmission requested.
+- *     5:      Jabber Error (TP Only, TX Reset required. )
+- *     4:      Underrun (TX Reset required. )
+- *     3:      Maximum Collisions.
+- *     2:      TX Status Overflow.
+- *     1-0:    Undefined.
+- *
+- */
+-#define TXS_COMPLETE		0x80
+-#define TXS_SUCCES_INTR_REQ		0x40
+-#define TXS_JABBER		0x20
+-#define TXS_UNDERRUN		0x10
+-#define TXS_MAX_COLLISION	0x8
+-#define TXS_STATUS_OVERFLOW	0x4
+-
+-/*
+- * Configuration control register.
+- * Window 0/Port 04
+- */
+-/* Read */
+-#define IS_AUI				(1<<13)
+-#define IS_BNC				(1<<12)
+-#define IS_UTP				(1<<9)
+-/* Write */
+-#define ENABLE_DRQ_IRQ			0x0001
+-#define W0_P4_CMD_RESET_ADAPTER		0x4
+-#define W0_P4_CMD_ENABLE_ADAPTER	0x1
+-/*
+- * Media type and status.
+- * Window 4/Port 0A
+- */
+-#define ENABLE_UTP			0xc0
+-#define DISABLE_UTP			0x0
+-
+-/*
+- * Resource control register
+- */
+-
+-#define SET_IRQ(i)	( ((i)<<12) | 0xF00) /* set IRQ i */
+-
+-/*
+- * Receive status register
+- */
+-
+-#define RX_BYTES_MASK			(unsigned short) (0x07ff)
+-#define RX_ERROR	0x4000
+-#define RX_INCOMPLETE	0x8000
+-
+-
+-/*
+- * Misc defines for various things.
+- */
+-#define ACTIVATE_ADAPTER_TO_CONFIG	0xff /* to the id_port */
+-#define MFG_ID				0x6d50 /* in EEPROM and W0 ADDR_CONFIG */
+-#define PROD_ID				0x9150
+-
+-#define AUI				0x1
+-#define BNC				0x2
+-#define UTP				0x4
+-
+-#define RX_BYTES_MASK			(unsigned short) (0x07ff)
+-
+- /* EISA support */
+-#define EP_EISA_START			0x1000
+-#define EP_EISA_W0			0x0c80
+-
+-#ifdef	INCLUDE_3C529
+- /* MCA support */
+-#define MCA_MOTHERBOARD_SETUP_REG	0x94
+-#define MCA_ADAPTER_SETUP_REG		0x96
+-#define MCA_MAX_SLOT_NR			8
+-#define MCA_POS_REG(n)			(0x100+(n))
+-#endif
+-
+-/*
+- * Local variables:
+- *  c-basic-offset: 8
+- * End:
+- */
+diff -Naur grub-0.97.orig/netboot/3c595.c grub-0.97/netboot/3c595.c
+--- grub-0.97.orig/netboot/3c595.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/3c595.c	2005-08-31 19:03:35.000000000 +0000
+@@ -20,6 +20,7 @@
+ *
+ *  Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
+ *
++* timlegge	08-24-2003	Add Multicast Support
+ */
+ 
+ /* #define EDEBUG */
+@@ -30,7 +31,7 @@
+ #include "3c595.h"
+ #include "timer.h"
+ 
+-static unsigned short	eth_nic_base, eth_asic_base;
++static unsigned short	eth_nic_base;
+ static unsigned short	vx_connector, vx_connectors;
+ 
+ static struct connector_entry {
+@@ -57,14 +58,12 @@
+ static void vxgetlink(void);
+ static void vxsetlink(void);
+ 
+-#define	udelay(n)	waiton_timer2(((n)*TICKS_PER_MS)/1000)
+-
+ /**************************************************************************
+ ETH_RESET - Reset adapter
+ ***************************************************************************/
+ static void t595_reset(struct nic *nic)
+ {
+-	int i, j;
++	int i;
+ 
+ 	/***********************************************************
+ 			Reset 3Com 595 card
+@@ -133,7 +132,7 @@
+ 	outw(ACK_INTR | 0xff, BASE + VX_COMMAND);
+ 
+ 	outw(SET_RX_FILTER | FIL_INDIVIDUAL |
+-	    FIL_BRDCST, BASE + VX_COMMAND);
++	    FIL_BRDCST|FIL_MULTICAST, BASE + VX_COMMAND);
+ 
+ 	vxsetlink();
+ /*{
+@@ -225,10 +224,9 @@
+ /**************************************************************************
+ ETH_POLL - Wait for a frame
+ ***************************************************************************/
+-static int t595_poll(struct nic *nic)
++static int t595_poll(struct nic *nic, int retrieve)
+ {
+ 	/* common variables */
+-	unsigned short type = 0;	/* used by EDEBUG */
+ 	/* variables for 3C595 */
+ 	short status, cst;
+ 	register short rx_fifo;
+@@ -262,6 +260,8 @@
+ 	if (rx_fifo==0)
+ 		return 0;
+ 
++	if ( ! retrieve ) return 1;
++
+ 		/* read packet */
+ #ifdef EDEBUG
+ 	printf("[l=%d",rx_fifo);
+@@ -300,12 +300,15 @@
+ 	outw(RX_DISCARD_TOP_PACK, BASE + VX_COMMAND);
+ 	while (inw(BASE + VX_STATUS) & S_COMMAND_IN_PROGRESS);
+ #ifdef EDEBUG
++{
++	unsigned short type = 0;	/* used by EDEBUG */
+ 	type = (nic->packet[12]<<8) | nic->packet[13];
+ 	if(nic->packet[0]+nic->packet[1]+nic->packet[2]+nic->packet[3]+nic->packet[4]+
+ 	    nic->packet[5] == 0xFF*ETH_ALEN)
+ 		printf(",t=%hX,b]",type);
+ 	else
+ 		printf(",t=%hX]",type);
++}
+ #endif
+ 	return 1;
+ }
+@@ -382,9 +385,8 @@
+ static void            
+ vxsetlink(void)
+ {       
+-    int i, j, k;
++    int i, j;
+     char *reason, *warning;
+-    static short prev_flags;
+     static char prev_conn = -1;
+ 
+     if (prev_conn == -1) {
+@@ -438,28 +440,47 @@
+     GO_WINDOW(1); 
+ }
+ 
+-static void t595_disable(struct nic *nic)
++static void t595_disable(struct dev *dev)
+ {
+-    outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
+-    udelay(8000);
+-    GO_WINDOW(4);
+-    outw(0, BASE + VX_W4_MEDIA_TYPE);
+-    GO_WINDOW(1);
++	struct nic *nic = (struct nic *)dev;
++	t595_reset(nic);
++
++	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
++	udelay(8000);
++	GO_WINDOW(4);
++	outw(0, BASE + VX_W4_MEDIA_TYPE);
++	GO_WINDOW(1);
++}
++
++static void t595_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
+ }
+ 
+ /**************************************************************************
+ ETH_PROBE - Look for an adapter
+ ***************************************************************************/
+-struct nic *t595_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *pci)
++static int t595_probe(struct dev *dev, struct pci_device *pci)
+ {
++	struct nic *nic = (struct nic *)dev;
+ 	int i;
+ 	unsigned short *p;
+ 
+-	if (probeaddrs == 0 || probeaddrs[0] == 0)
++	if (pci->ioaddr == 0)
+ 		return 0;
+ /*	eth_nic_base = probeaddrs[0] & ~3; */
+ 	eth_nic_base = pci->ioaddr;
+ 
++	nic->irqno  = 0;
++	nic->ioaddr = pci->ioaddr & ~3;
++
+ 	GO_WINDOW(0);
+ 	outw(GLOBAL_RESET, BASE + VX_COMMAND);
+ 	VX_BUSY_WAIT;
+@@ -487,14 +508,40 @@
+ 	printf("Ethernet address: %!\n", nic->node_addr);
+ 
+ 	t595_reset(nic);
+-	nic->reset = t595_reset;
+-	nic->poll = t595_poll;
++	dev->disable  = t595_disable;
++	nic->poll     = t595_poll;
+ 	nic->transmit = t595_transmit;
+-	nic->disable = t595_disable;
+-	return nic;
++	nic->irq      = t595_irq;
++	return 1;
+ 
+ }
+ 
++static struct pci_id t595_nics[] = {
++PCI_ROM(0x10b7, 0x5900, "3c590",           "3Com590"),		/* Vortex 10Mbps */
++PCI_ROM(0x10b7, 0x5950, "3c595",           "3Com595"),		/* Vortex 100baseTx */
++PCI_ROM(0x10b7, 0x5951, "3c595-1",         "3Com595"),		/* Vortex 100baseT4 */
++PCI_ROM(0x10b7, 0x5952, "3c595-2",         "3Com595"),		/* Vortex 100base-MII */
++PCI_ROM(0x10b7, 0x9000, "3c900-tpo",       "3Com900-TPO"),	/* 10 Base TPO */
++PCI_ROM(0x10b7, 0x9001, "3c900-t4",        "3Com900-Combo"),	/* 10/100 T4 */
++PCI_ROM(0x10b7, 0x9004, "3c900b-tpo",      "3Com900B-TPO"),	/* 10 Base TPO */
++PCI_ROM(0x10b7, 0x9005, "3c900b-combo",    "3Com900B-Combo"),	/* 10 Base Combo */
++PCI_ROM(0x10b7, 0x9006, "3c900b-tpb2",     "3Com900B-2/T"),	/* 10 Base TP and Base2 */
++PCI_ROM(0x10b7, 0x900a, "3c900b-fl",       "3Com900B-FL"),	/* 10 Base F */
++PCI_ROM(0x10b7, 0x9800, "3c980-cyclone-1", "3Com980-Cyclone"),	/* Cyclone */
++PCI_ROM(0x10b7, 0x9805, "3c9805-1",        "3Com9805"),		/* Dual Port Server Cyclone */
++PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX"),	/* Hurricane */
++PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado"),
++};
++
++struct pci_driver t595_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "3C595",
++	.probe    = t595_probe,
++	.ids      = t595_nics,
++	.id_count = sizeof(t595_nics)/sizeof(t595_nics[0]),
++	.class    = 0,
++};
++
+ /*
+  * Local variables:
+  *  c-basic-offset: 8
+diff -Naur grub-0.97.orig/netboot/3c90x.c grub-0.97/netboot/3c90x.c
+--- grub-0.97.orig/netboot/3c90x.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/3c90x.c	2005-08-31 19:03:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ /*
+  * 3c90x.c -- This file implements the 3c90x driver for etherboot.  Written
+  * by Greg Beeley, Greg.Beeley@LightSys.org.  Modified by Steve Smith,
+- * Steve.Smith@Juno.Com
++ * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
+  *
+  * This program Copyright (C) 1999 LightSys Technology Services, Inc.
+  * Portions Copyright (C) 1999 Steve Smith
+@@ -31,13 +31,15 @@
+  *					Re-wrote poll and transmit for
+  *					better error recovery and heavy
+  *					network traffic operation
++ * v2.01    5-26-2003 NN Fixed driver alignment issue which
++ *                  caused system lockups if driver structures
++ *                  not 8-byte aligned.
+  *
+  */
+ 
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ #include "timer.h"
+ 
+ #define	XCVR_MAGIC	(0x5A00)
+@@ -47,9 +49,6 @@
+  **/
+ #define	XMIT_RETRIES	250
+ 
+-#undef	virt_to_bus
+-#define	virt_to_bus(x)	((unsigned long)x)
+-
+ /*** Register definitions for the 3c905 ***/
+ enum Registers
+     {
+@@ -225,7 +224,7 @@
+     unsigned int	DataAddr;
+     unsigned int	DataLength;
+     }
+-    TXD;
++    TXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+ 
+ /*** RX descriptor ***/
+ typedef struct
+@@ -235,7 +234,7 @@
+     unsigned int	DataAddr;
+     unsigned int	DataLength;
+     }
+-    RXD;
++    RXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+ 
+ /*** Global variables ***/
+ static struct
+@@ -311,6 +310,7 @@
+     }
+ 
+ 
++#if 0
+ /*** a3c90x_internal_WriteEepromWord - write a physical word of
+  *** data to the onboard serial eeprom (not the BIOS prom, but the
+  *** nvram in the card that stores, among other things, the MAC
+@@ -344,8 +344,9 @@
+ 
+     return 0;
+     }
++#endif
+ 
+-
++#if 0
+ /*** a3c90x_internal_WriteEeprom - write data to the serial eeprom,
+  *** and re-compute the eeprom checksum.
+  ***/
+@@ -384,8 +385,7 @@
+ 
+     return 0;
+     }
+-
+-
++#endif
+ 
+ /*** a3c90x_reset: exported function that resets the card to its default
+  *** state.  This is so the Linux driver can re-set the card up the way
+@@ -393,12 +393,10 @@
+  *** not alter the selected transceiver that we used to download the boot
+  *** image.
+  ***/
+-static void
+-a3c90x_reset(struct nic *nic)
++static void a3c90x_reset(void)
+     {
+-    int cfg;
+-
+ #ifdef	CFG_3C90X_PRESERVE_XCVR
++    int cfg;
+     /** Read the current InternalConfig value. **/
+     a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+     cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
+@@ -473,7 +471,7 @@
+  *** p - the pointer to the packet data itself.
+  ***/
+ static void
+-a3c90x_transmit(struct nic *nic, const char *d, unsigned int t,
++a3c90x_transmit(struct nic *nic __unused, const char *d, unsigned int t,
+                 unsigned int s, const char *p)
+     {
+ 
+@@ -553,7 +551,7 @@
+ 	if (status & 0x02)
+ 	    {
+ 	    printf("3C90X: Tx Reclaim Error (%hhX)\n", status);
+-	    a3c90x_reset(NULL);
++	    a3c90x_reset();
+ 	    }
+ 	else if (status & 0x04)
+ 	    {
+@@ -572,18 +570,18 @@
+ 	else if (status & 0x10)
+ 	    {
+ 	    printf("3C90X: Tx Underrun (%hhX)\n", status);
+-	    a3c90x_reset(NULL);
++	    a3c90x_reset();
+ 	    }
+ 	else if (status & 0x20)
+ 	    {
+ 	    printf("3C90X: Tx Jabber (%hhX)\n", status);
+-	    a3c90x_reset(NULL);
++	    a3c90x_reset();
+ 	    }
+ 	else if ((status & 0x80) != 0x80)
+ 	    {
+ 	    printf("3C90X: Internal Error - Incomplete Transmission (%hhX)\n",
+ 	           status);
+-	    a3c90x_reset(NULL);
++	    a3c90x_reset();
+ 	    }
+ 	}
+ 
+@@ -601,7 +599,7 @@
+  *** in nic->packetlen.  Return 1 if a packet was found.
+  ***/
+ static int
+-a3c90x_poll(struct nic *nic)
++a3c90x_poll(struct nic *nic, int retrieve)
+     {
+     int i, errcode;
+ 
+@@ -610,6 +608,8 @@
+ 	return 0;
+ 	}
+ 
++    if ( ! retrieve ) return 1;
++
+     /** we don't need to acknowledge rxComplete -- the upload engine
+      ** does it for us.
+      **/
+@@ -663,34 +663,51 @@
+  *** [Ken]
+  ***/
+ static void
+-a3c90x_disable(struct nic *nic)
+-    {
++a3c90x_disable(struct dev *dev __unused)
++{
++	/* reset and disable merge */
++	a3c90x_reset();
+ 	/* Disable the receiver and transmitter. */
+ 	outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
+ 	outw(cmdTxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
+-    }
+-
++}
+ 
++static void a3c90x_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
+ 
+ /*** a3c90x_probe: exported routine to probe for the 3c905 card and perform
+  *** initialization.  If this routine is called, the pci functions did find the
+  *** card.  We just have to init it here.
+  ***/
+-struct nic*
+-a3c90x_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *pci)
+-    {
++static int a3c90x_probe(struct dev *dev, struct pci_device *pci)
++{
++    struct nic *nic = (struct nic *)dev;
+     int i, c;
+     unsigned short eeprom[0x21];
+     unsigned int cfg;
+     unsigned int mopt;
++    unsigned int mstat;
+     unsigned short linktype;
++#define	HWADDR_OFFSET	10
+ 
+-    if (probeaddrs == 0 || probeaddrs[0] == 0)
++    if (pci->ioaddr == 0)
+           return 0;
+ 
+     adjust_pci_device(pci);
+ 
+-    INF_3C90X.IOAddr = probeaddrs[0] & ~3;
++    nic->ioaddr = pci->ioaddr & ~3;
++    nic->irqno = 0;
++
++    INF_3C90X.IOAddr = pci->ioaddr & ~3;
+     INF_3C90X.CurrentWindow = 255;
+     switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03))
+ 	{
+@@ -756,30 +773,45 @@
+            "Copyright 1999 LightSys Technology Services, Inc.\n"
+            "Portions Copyright 1999 Steve Smith\n");
+     printf("Provided with ABSOLUTELY NO WARRANTY.\n");
++#ifdef	CFG_3C90X_BOOTROM_FIX
++    if (INF_3C90X.isBrev)
++        {
++        printf("NOTE: 3c905b bootrom fix enabled; has side "
++	   "effects.  See 3c90x.txt for info.\n");
++	}
++#endif
+     printf("-------------------------------------------------------"
+            "------------------------\n");
+ 
+     /** Retrieve the Hardware address and print it on the screen. **/
+-    INF_3C90X.HWAddr[0] = eeprom[0]>>8;
+-    INF_3C90X.HWAddr[1] = eeprom[0]&0xFF;
+-    INF_3C90X.HWAddr[2] = eeprom[1]>>8;
+-    INF_3C90X.HWAddr[3] = eeprom[1]&0xFF;
+-    INF_3C90X.HWAddr[4] = eeprom[2]>>8;
+-    INF_3C90X.HWAddr[5] = eeprom[2]&0xFF;
++    INF_3C90X.HWAddr[0] = eeprom[HWADDR_OFFSET + 0]>>8;
++    INF_3C90X.HWAddr[1] = eeprom[HWADDR_OFFSET + 0]&0xFF;
++    INF_3C90X.HWAddr[2] = eeprom[HWADDR_OFFSET + 1]>>8;
++    INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
++    INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
++    INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
+     printf("MAC Address = %!\n", INF_3C90X.HWAddr);
+ 
++    /* Test if the link is good, if not continue */
++    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winDiagnostics4);
++    mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w);
++    if((mstat & (1<<11)) == 0) {
++	printf("Valid link not established\n");
++	return 0;
++    }
++
+     /** Program the MAC address into the station address registers **/
+     a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+-    outw(htons(eeprom[0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
+-    outw(htons(eeprom[1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
+-    outw(htons(eeprom[2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
++    outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
++    outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
++    outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
+     outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
+     outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
+     outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
+ 
+     /** Fill in our entry in the etherboot arp table **/
+     for(i=0;i<ETH_ALEN;i++)
+-	nic->node_addr[i] = (eeprom[i/2] >> (8*((i&1)^1))) & 0xff;
++	nic->node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;
+ 
+     /** Read the media options register, print a message and set default
+      ** xcvr.
+@@ -903,8 +935,8 @@
+     while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+ 	;
+ 
+-    /** Set the RX filter = receive only individual pkts & bcast. **/
+-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x04);
++    /** Set the RX filter = receive only individual pkts & multicast & bcast. **/
++    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
+     a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
+ 
+ 
+@@ -918,12 +950,46 @@
+                                  cmdAcknowledgeInterrupt, 0x661);
+ 
+     /** Set our exported functions **/
+-    nic->reset    = a3c90x_reset;
++    dev->disable  = a3c90x_disable;
+     nic->poll     = a3c90x_poll;
+     nic->transmit = a3c90x_transmit;
+-    nic->disable  = a3c90x_disable;
++    nic->irq      = a3c90x_irq;
+ 
+-    return nic;
+-    }
++    return 1;
++}
+ 
+ 
++static struct pci_id a3c90x_nics[] = {
++/* Original 90x revisions: */
++PCI_ROM(0x10b7, 0x9000, "3c905-tpo",     "3Com900-TPO"),	/* 10 Base TPO */
++PCI_ROM(0x10b7, 0x9001, "3c905-t4",      "3Com900-Combo"),	/* 10/100 T4 */
++PCI_ROM(0x10b7, 0x9050, "3c905-tpo100",  "3Com905-TX"),		/* 100 Base TX / 10/100 TPO */
++PCI_ROM(0x10b7, 0x9051, "3c905-combo",   "3Com905-T4"),		/* 100 Base T4 / 10 Base Combo */
++/* Newer 90xB revisions: */
++PCI_ROM(0x10b7, 0x9004, "3c905b-tpo",    "3Com900B-TPO"),	/* 10 Base TPO */
++PCI_ROM(0x10b7, 0x9005, "3c905b-combo",  "3Com900B-Combo"),	/* 10 Base Combo */
++PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2",   "3Com900B-2/T"),	/* 10 Base TP and Base2 */
++PCI_ROM(0x10b7, 0x900a, "3c905b-fl",     "3Com900B-FL"),	/* 10 Base FL */
++PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"),	/* 10/100 TPO */
++PCI_ROM(0x10b7, 0x9056, "3c905b-t4",     "3Com905B-T4"),	/* 10/100 T4 */
++PCI_ROM(0x10b7, 0x9058, "3c905b-9058",   "3Com905B-9058"),	/* Cyclone 10/100/BNC */
++PCI_ROM(0x10b7, 0x905a, "3c905b-fx",     "3Com905B-FL"),	/* 100 Base FX / 10 Base FX */
++/* Newer 90xC revision: */
++PCI_ROM(0x10b7, 0x9200, "3c905c-tpo",    "3Com905C-TXM"),	/* 10/100 TPO (3C905C-TXM) */
++PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm","3Com20B-EMB WNM"),
++PCI_ROM(0x10b7, 0x9800, "3c980",         "3Com980-Cyclone"),	/* Cyclone */
++PCI_ROM(0x10b7, 0x9805, "3c9805",        "3Com9805"),		/* Dual Port Server Cyclone */
++PCI_ROM(0x10b7, 0x7646, "3csoho100-tx",  "3CSOHO100-TX"),	/* Hurricane */
++PCI_ROM(0x10b7, 0x4500, "3c450",         "3Com450 HomePNA Tornado"),
++PCI_ROM(0x10b7, 0x1201, "3c982a",        "3Com982A"),
++PCI_ROM(0x10b7, 0x1202, "3c982b",        "3Com982B"),
++};
++
++struct pci_driver a3c90x_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "3C90X",
++	.probe    = a3c90x_probe,
++	.ids      = a3c90x_nics,
++	.id_count = sizeof(a3c90x_nics)/sizeof(a3c90x_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/3c90x.txt grub-0.97/netboot/3c90x.txt
+--- grub-0.97.orig/netboot/3c90x.txt	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/3c90x.txt	1970-01-01 00:00:00.000000000 +0000
+@@ -1,307 +0,0 @@
+-
+-	Instructions for use of the 3C90X driver for EtherBoot
+-
+-		Original 3C905B support by:
+-			Greg Beeley (Greg.Beeley@LightSys.org),
+-			LightSys Technology Services, Inc.
+-			February 11, 1999
+-
+-		Updates for 3C90X family by:
+-			Steve Smith (steve.smith@juno.com)
+-			October 1, 1999
+-
+-		Minor documentation updates by
+-			Greg Beeley (Greg.Beeley@LightSys.org)
+-			March 29, 2000
+-
+--------------------------------------------------------------------------------
+-
+-I   OVERVIEW
+-
+-    The 3c90X series ethernet cards are a group of high-performance busmaster
+-    DMA cards from 3Com.  This particular driver supports both the 3c90x and
+-    the 3c90xB revision cards.  3C90xC family support has been tested to some
+-    degree but not extensively.
+-
+-    Here's the licensing information:
+-
+-    This program Copyright (C) 1999 LightSys Technology Services, Inc.
+-    Portions Copyright (C) 1999 Steve Smith.
+-
+-    This program may be re-distributed in source or binary form, modified,
+-    sold, or copied for any purpose, provided that the above copyright message
+-    and this text are included with all source copies or derivative works, and
+-    provided that the above copyright message and this text are included in the
+-    documentation of any binary-only distributions.  This program is
+-    distributed WITHOUT ANY WARRANTY, without even the warranty of FITNESS FOR
+-    A PARTICULAR PURPOSE or MERCHANTABILITY.  Please read the associated
+-    documentation "3c90x.txt" before compiling and using this driver.
+-
+-
+-II  FLASH PROMS
+-
+-    The 3c90xB cards, according to the 3Com documentation, only accept the
+-    following flash memory chips:
+-
+-	Atmel AT29C512 (64 kilobyte)
+-	Atmel AT29C010 (128 kilobyte)
+-
+-    The 3c90x cards, according to the 3Com documentation, accept the
+-    following flash memory chips capacities:
+-
+-	64  kb (8 kB)
+-	128 kb (16 kB)
+-	256 kb (32 kB) and
+-	512 kb (64 kB)
+-
+-    Atmel AT29C512 (64 kilobyte) chips are specifically listed for both
+-    adapters, but flashing on the 3c905b cards would only be supported
+-    through the Atmel parts.  Any device, of the supported size, should
+-    be supported when programmed by a dedicated PROM programmer (e.g.
+-    not the card).
+-
+-    To use this driver in such a PROM, visit Atmel's web site and download
+-    their .PDF file containing a list of their distributors.  Contact the
+-    distributors for pricing information.  The prices are quite reasonable
+-    (about $3 US each for the 64 kB part), and are comparable to what one would
+-    expect for similarly sized standard EPROMs.  And, the flash chips are much
+-    easier to work with, as they don't need to be UV-erased to be reprogrammed.
+-    The 3C905B card actually provides a method to program the flash memory
+-    while it is resident on board the card itself; if someone would like to
+-    write a small DOS program to do the programming, I can provide the
+-    information about the registers and so forth.
+-
+-    A utility program, 3c90xutil, is provided with Etherboot in the 'contrib'
+-    directory that allows for the on-board flashing of the ROM while Linux
+-    is running.  The program has been successfully used under Linux, but I
+-    have heard problem reports of its use under FreeBSD.  Anyone willing to
+-    make it work under FreeBSD is more than welcome to do so!
+-
+-    You also have the option of using EPROM chips - the 3C905B-TX-NM has been
+-    successfully tested with 27C256 (32kB) and 27C512 (64kB) chips with a
+-    specified access time of 100ns and faster.
+-
+-
+-III GENERAL USE
+-
+-    Normally, the basic procedure for using this driver is as follows:
+-
+-	1.  Run the 3c90xcfg program on the driver diskette to enable the
+-	boot PROM and set it to 64k or 128k, as appropriate.
+-	2.  Build the appropriate 3c90x.fd0 or 3c90x.fd0 floppy image with
+-	possibly the value CFG_3C90X_XCVR defined to the transceiver type that
+-	you want to use (i.e., 10/100 rj45, AUI, coax, MII).
+-	3.  Run the floppy image on the PC to be network booted, to get
+-	it configured, and to verify that it will boot properly.
+-	4.  Build the 3c90x.rom or 3c90x.lzrom PROM image and program
+-	it into the flash or EPROM memory chip.
+-	5.  Put the PROM in the ethernet card, boot and enable 'boot from
+-	network first' in the system BIOS, save and reboot.
+-
+-    Here are some issues to be aware of:
+-
+-	1.  If you experience crashes or different behaviour when using the
+-	boot PROM, add the setting CFG_3C90X_BOOTROM_FIX and go through the
+-	steps 2-5 above.  This works around a bug in some 3c905B cards (see
+-	below), but has some side-effects which may not be desirable.
+-        Please note that you have to boot off a floppy (not PROM!) once for
+-        this fix to take effect.
+-	2.  The possible need to manually set the CFG_3C90X_XCVR value to
+-	configure the transceiver type.  Values are listed below.
+-	3.  The possible need to define CFG_3C90X_PRESERVE_XCVR for use in
+-	operating systems that don't intelligently determine the
+-	transceiver type.
+-
+-    Some things that are on the 'To-Do' list, perhaps for me, but perhaps
+-    for any other volunteers out there:
+-
+-	1.  Extend the driver to fully implement the auto-select
+-	algorithm if the card has multiple media ports.
+-	2.  Fix any bugs in the code <grin>....
+-	3.  Extend the driver to support the 3c905c revision cards
+-	"officially".  Right now, the support has been primarily empirical
+-	and not based on 3c905C documentation.
+-
+-    Now for the details....
+-
+-    This driver has been tested on roughly 300 systems.  The main two
+-    configuration issues to contend with are:
+-
+-	1.  Ensure that PCI Busmastering is enabled for the adapter (configured
+-	in the CMOS setup)
+-	2.  Some systems don't work properly with the adapter when plug and
+-	play OS is enabled; I always set it to "No" or "Disabled" -- this makes
+-	it easier and really doesn't adversely affect anything.
+-
+-    Roughly 95% of the systems worked when configured properly.  A few
+-    have issues with booting locally once the boot PROM has been installed
+-    (this number has been less than 2%).  Other configuration issues that
+-    to check:
+-
+-	1.  Newer BIOS's actually work correctly with the network boot order.
+-	Set the network adapter first.  Most older BIOS's automatically go to
+-	the network boot PROM first.
+-	2.  For systems where the adapter was already installed and is just
+-	having the PROM installed, try setting the "reset configuration data"
+-	to yes in the CMOS setup if the BIOS isn't seen at first.  If your BIOS
+-	doesn't have this option, remove the card, start the system, shut down,
+-	install the card and restart (or switch to a different PCI slot).
+-	3.  Make sure the CMOS security settings aren't preventing a boot.
+-
+-    The 3c905B cards have a significant 'bug' that relates to the flash prom:
+-    unless the card is set internally to the MII transceiver, it will only
+-    read the first 8k of the PROM image.  Don't ask why -- it seems really
+-    obscure, but it has to do with the way they mux'd the address lines
+-    from the PCI bus to the ROM.  Unfortunately, most of us are not using
+-    MII transceivers, and even the .lzrom image ends up being just a little
+-    bit larger than 8k.  Note that the workaround for this is disabled by
+-    default, because the Windows NT 4.0 driver does not like it (no packets
+-    are transmitted).
+-
+-    So, the solution that I've used is to internally set the card's nvram
+-    configuration to use MII when it boots.  The 3c905b driver does this
+-    automatically.  This way, the 16k prom image can be loaded into memory,
+-    and then the 3c905b driver can set the temporary configuration of the
+-    card to an appropriate value, either configurable by the user or chosen
+-    by the driver.
+-
+-    To enable the 3c905B bugfix, which is necessary for these cards when 
+-    booting from the Flash ROM, define -DCFG_3C90X_BOOTROM_FIX when building,
+-    create a floppy image and boot it once.
+-    Thereafter, the card should accept the larger prom image.
+-
+-    The driver should choose an appropriate transceiver on the card.  However,
+-    if it doesn't on your card or if you need to, for instance, set your
+-    card to 10mbps when connected to an unmanaged 10/100 hub, you can specify
+-    which transceiver you want to use.  To do this, build the 3c905b.fd0
+-    image with -DCFG_3C90X_XCVR=x, where 'x' is one of the following
+-    values:
+-
+-	0	10Base-T
+-	1	10mbps AUI
+-	3	10Base-2 (thinnet/coax)
+-	4	100Base-TX
+-	5	100Base-FX
+-	6	MII
+-	8	Auto-negotiation 10Base-T / 100Base-TX (usually the default)
+-	9	MII External MAC Mode
+-	255	Allow driver to choose an 'appropriate' media port.
+-
+-    Then proceed from step 2 in the above 'general use' instructions.  The
+-    .rom image can be built with CFG_3C90X_XCVR set to a value, but you
+-    normally don't want to do this, since it is easier to change the
+-    transceiver type by rebuilding a new floppy, changing the BIOS to floppy
+-    boot, booting, and then changing the BIOS back to network boot.  If
+-    CFG_3C90X_XCVR is not set in a particular build, it just uses the
+-    current configuration (either its 'best guess' or whatever the stored
+-    CFG_3C90X_XCVR value was from the last time it was set).
+-
+-    [[ Note for the more technically inclined:  The CFG_3C90X_XCVR value is
+-    programmed into a register in the card's NVRAM that was reserved for
+-    LanWorks PROM images to use.  When the driver boots, the card comes
+-    up in MII mode, and the driver checks the LanWorks register to find
+-    out if the user specified a transceiver type.  If it finds that
+-    information, it uses that, otherwise it picks a transceiver that the
+-    card has based on the 3c905b's MediaOptions register.  This driver isn't
+-    quite smart enough to always determine which media port is actually
+-    _connected_; maybe someone else would like to take on that task (it
+-    actually involves sending a self-directed packet and seeing if it
+-    comes back.  IF it does, that port is connected). ]]
+-
+-    Another issue to keep in mind is that it is possible that some OS'es
+-    might not be happy with the way I've handled the PROM-image hack with
+-    setting MII mode on bootup.  Linux 2.0.35 does not have this problem.
+-    Behavior of other systems may vary.  The 3com documentation specifically
+-    says that, at least with the card that I have, the device driver in the
+-    OS should auto-select the media port, so other drivers should work fine
+-    with this 'hack'.  However, if yours doesn't seem to, you can try defining
+-    CFG_3C90X_PRESERVE_XCVR when building to cause Etherboot to keep the
+-    working setting (that allowed the bootp/tftp process) across the eth_reset
+-    operation.
+-
+-
+-IV  FOR DEVELOPERS....
+-
+-    If you would like to fix/extend/etc. this driver, feel free to do so; just
+-    be sure you can test the modified version on the 3c905B-TX cards that the
+-    driver was originally designed for.  This section of this document gives
+-    some information that might be relevant to a programmer.
+-
+-    A.  Main Entry Point
+-
+-	a3c90x_probe is the main entry point for this driver.  It is referred
+-	to in an array in 'config.c'.
+-
+-    B.  Other Important Functions
+-
+-	The functions a3c90x_transmit, a3c90x_poll, a3c90x_reset, and
+-	a3c90x_disable are static functions that EtherBoot finds out about
+-	as a  result of a3c90x_probe setting entries in the nic structure
+-	for them.  The EtherBoot framework does not use interrupts.  It is
+-	polled.  All transmit and receive operations are initiated by the
+-	etherboot framework, not by an interrupt or by the driver.
+-
+-    C.  Internal Functions
+-
+-	The following functions are internal to the driver:
+-
+-	a3c90x_internal_IssueCommand - sends a command to the 3c905b card.
+-	a3c90x_internal_SetWindow - shifts between one of eight register
+-	windows onboard the 3c90x.  The bottom 16 bytes of the card's
+-	I/O space are multiplexed among 128 bytes, only 16 of which are
+-	visible at any one time.  This SetWindow function selects one of
+-	the eight sets.
+-	a3c90x_internal_ReadEeprom - reads a word (16 bits) from the
+-	card's onboard nvram.  This is NOT the BIOS boot rom.  This is
+-	where the card stores such things as its hardware address.
+-	a3c90x_internal_WriteEeprom - writes a word (16 bits) to the
+-	card's nvram, and recomputes the eeprom checksum.
+-	a3c90x_internal_WriteEepromWord - writes a word (16 bits) to the
+-	card's nvram.  Used by the above routine.
+-	a3c90x_internal_WriteEepromWord - writes a word (16 bits) to the
+-	card's nvram.  Used by the above routine.
+-
+-    D.  Globals
+-
+-	All global variables are inside a global structure named INF_3C90X.
+-	So, wherever you see that structure referenced, you know the variable
+-	is a global.  Just keeps things a little neater.
+-
+-    E.  Enumerations
+-
+-	There are quite a few enumerated type definitions for registers and
+-	so forth, many for registers that I didn't even touch in the driver.
+-	Register types start with 'reg', window numbers (for SetWindow)
+-	start with 'win', and commands (for IssueCommand) start with 'cmd'.
+-	Register offsets also include an indication in the name as to the
+-	size of the register (_b = byte, _w = word, _l = long), and which
+-	window the register is in, if it is windowed (0-7).
+-
+-    F.  Why the 'a3c90x' name?
+-
+-	I had to come up with a letter at the beginning of all of the
+-	identifiers, since 3com so conveniently had their name start with a
+-	number.  Another driver used 't' (for 'three'?); I chose 'a' for
+-	no reason at all.
+-
+-Addendum by Jorge L. deLyra <delyra@latt.if.usp.br>, 22Nov2000 re
+-working around the 3C905 hardware bug mentioned above:
+-
+-Use this floppy to fix any 3COM model 3C905B PCI 10/100 Ethernet cards
+-that fail to load and run the boot program the first time around. If
+-they have a "Lucent" rather than a "Broadcom" chipset these cards have
+-a configuration bug that causes a hang when trying to load the boot
+-program from the PROM, if you try to use them right out of the box.
+-
+-The boot program in this floppy is the file named 3c905b-tpo100.rom
+-from Etherboot version 4.6.10, compiled with the bugfix parameter
+-
+-			CFG_3C90X_BOOTROM_FIX
+-
+-You have to take the chip off the card and boot the system once using
+-this floppy. Once loaded from the floppy, the boot program will access
+-the card and change some setting in it, correcting the problem. After
+-that you may use either this boot program or the normal one, compiled
+-without this bugfix parameter, to boot the machine from the PROM chip.
+-
+-[Any recent Etherboot version should do, not just 4.6.10 - Ed.]
+diff -Naur grub-0.97.orig/netboot/Makefile.am grub-0.97/netboot/Makefile.am
+--- grub-0.97.orig/netboot/Makefile.am	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/Makefile.am	2005-08-31 19:03:35.000000000 +0000
+@@ -10,58 +10,72 @@
+ 
+ noinst_LIBRARIES = $(LIBDRIVERS)
+ 
+-libdrivers_a_SOURCES = cards.h config.c etherboot.h \
+-	fsys_tftp.c linux-asm-io.h linux-asm-string.h \
+-	main.c misc.c nic.h osdep.h pci.c pci.h timer.c timer.h
+-EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c595.c 3c595.h 3c90x.c \
+-	cs89x0.c cs89x0.h davicom.c depca.c eepro.c eepro100.c \
+-	epic100.c epic100.h fa311.c i82586.c lance.c natsemi.c \
+-	ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \
+-	sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
+-	tiara.c tlan.c tulip.c via-rhine.c w89c840.c
++libdrivers_a_SOURCES = big_bswap.h bootp.h byteswap.h config.c cpu.h \
++	dev.h elf.h endian.h etherboot.h fsys_tftp.c grub.h \
++	i386_byteswap.h i386_elf.h i386_endian.h i386_timer.c \
++	if_arp.h if_ether.h igmp.h in.h io.h ip.h isa.h latch.h \
++	little_bswap.h misc.c nic.c nic.h osdep.h pci.c pci.h \
++	pci_ids.h pci_io.c stdint.h tftp.h timer.c timer.h \
++	types.h udp.h mii.h pic8259.c pic8259.h pxe.h basemem.c segoff.h
++EXTRA_libdrivers_a_SOURCES = 3c595.c 3c595.h 3c90x.c davicom.c \
++	e1000.c e1000_hw.h eepro100.c epic100.c epic100.h natsemi.c \
++	ns8390.c ns8390.h pcnet32.c rtl8139.c sis900.c sis900.h \
++	sundance.c tg3.c tg3.h tlan.c tlan.h tulip.c via-rhine.c \
++	w89c840.c r8169.c forcedeth.c ns83820.c pnic.c pnic_api.c \
++	undi.c undi.h
+ libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	-DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
+ # Filled by configure.
+ libdrivers_a_LIBADD = @NETBOOT_DRIVERS@
+ libdrivers_a_DEPENDENCIES = $(libdrivers_a_LIBADD)
+ 
+-EXTRA_DIST = README.netboot 3c90x.txt cs89x0.txt sis900.txt tulip.txt
++EXTRA_DIST = README.netboot
+ 
+ # These below are several special rules for the device drivers.
+ # We cannot use a simple rule for them...
+ 
+ # What objects are derived from a driver?
+-3c509_drivers = 3c509.o 3c529.o
++#3c509_drivers = 3c509.o 3c529.o
+ 3c595_drivers = 3c595.o
+ 3c90x_drivers = 3c90x.o
+-cs89x0_drivers = cs89x0.o
++#cs89x0_drivers = cs89x0.o
+ davicom_drivers = davicom.o
+-depca_drivers = depca.o
+-eepro_drivers = eepro.o
++#depca_drivers = depca.o
++#eepro_drivers = eepro.o
++e1000_drivers = e1000.o
+ eepro100_drivers = eepro100.o
+ epic100_drivers = epic100.o
+ #fa311_drivers = fa311.o
+-i82586_drivers = 3c507.o exos205.o ni5210.o
+-lance_drivers = lance.o ne2100.o ni6510.o
++forcedeth_drivers = forcedeth.o
++#i82586_drivers = 3c507.o exos205.o ni5210.o
++#lance_drivers = lance.o ne2100.o ni6510.o
+ natsemi_drivers = natsemi.o
+-ni5010_drivers = ni5010.o
++#ni5010_drivers = ni5010.o
++ns83820_drivers = ns83820.o
+ ns8390_drivers = 3c503.o ne.o ns8390.o wd.o
+-otulip_drivers = otulip.o
++#otulip_drivers = otulip.o
++pcnet32_drivers = pcnet32.o
++pnic_drivers = pnic.o
++r8169_drivers = r8169.o
+ rtl8139_drivers = rtl8139.o
+ sis900_drivers = sis900.o
+-sk_g16_drivers = sk_g16.o
+-smc9000_drivers = smc9000.o
+-tiara_drivers = tiara.o
+-#tlan_drivers = tlan.o
++#sk_g16_drivers = sk_g16.o
++sundance_driver = sundance.o
++#smc9000_drivers = smc9000.o
++tg3_drivers = tg3.o
++#tiara_drivers = tiara.o
++tlan_drivers = tlan.o
+ tulip_drivers = tulip.o
++undi_drivers = undi.o
+ via_rhine_drivers = via_rhine.o
+ w89c840_drivers = w89c840.o
+ 
++
+ # Is it really necessary to specify dependecies explicitly?
+-$(3c509_drivers): 3c509.c 3c509.h
+-$(3c509_drivers): %.o: 3c509.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(3c509_drivers): 3c509.c 3c509.h
++#$(3c509_drivers): %.o: 3c509.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ $(3c595_drivers): 3c595.c 3c595.h
+ $(3c595_drivers): %.o: 3c595.c
+@@ -73,23 +87,28 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(cs89x0_drivers): cs89x0.c cs89x0.h
+-$(cs89x0_drivers): %.o: cs89x0.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(cs89x0_drivers): cs89x0.c cs89x0.h
++#$(cs89x0_drivers): %.o: cs89x0.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ $(davicom_drivers): davicom.c
+ $(davicom_drivers): %.o: davicom.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(depca_drivers): depca.c
+-$(depca_drivers): %.o: depca.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(depca_drivers): depca.c
++#$(depca_drivers): %.o: depca.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++#$(eepro_drivers): eepro.c
++#$(eepro_drivers): %.o: eepro.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(eepro_drivers): eepro.c
+-$(eepro_drivers): %.o: eepro.c
++$(e1000_drivers): e1000.c e1000_hw.h
++$(e1000_drivers): %.o: e1000.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+@@ -103,28 +122,38 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
++$(forcedeth_drivers): forcedeth.c
++$(forcedeth_drivers): %.o: forcedeth.c
++	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
+ #$(fa311_drivers): fa311.c
+ #$(fa311_drivers): %.o: fa311.c
+ #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(i82586_drivers): i82586.c
+-$(i82586_drivers): %.o: i82586.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(i82586_drivers): i82586.c
++#$(i82586_drivers): %.o: i82586.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(lance_drivers): lance.c
+-$(lance_drivers): %.o: lance.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(lance_drivers): lance.c
++#$(lance_drivers): %.o: lance.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ $(natsemi_drivers): natsemi.c
+ $(natsemi_drivers): %.o: natsemi.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(ni5010_drivers): ni5010.c
+-$(ni5010_drivers): %.o: ni5010.c
++#$(ni5010_drivers): ni5010.c
++#$(ni5010_drivers): %.o: ni5010.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(ns83820_drivers): ns83820.c
++$(ns83820_drivers): %.o: ns83820.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+@@ -133,8 +162,18 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(otulip_drivers): otulip.c otulip.h
+-$(otulip_drivers): %.o: otulip.c
++#$(otulip_drivers): otulip.c otulip.h
++#$(otulip_drivers): %.o: otulip.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(pcnet32_drivers): pcnet32.c
++$(pcnet32_drivers): %.o: pcnet32.c
++	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(pnic_drivers): pnic.c
++$(pnic_drivers): %.o: pnic.c pnic_api.h
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+@@ -143,36 +182,56 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(sis900_drivers): sis900.c
+-$(sis900_drivers): %.o: sis900.c sis900.h
++$(r8169_drivers): r8169.c
++$(r8169_drivers): %.o: r8169.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(sk_g16_drivers): sk_g16.c sk_g16.h
+-$(sk_g16_drivers): %.o: sk_g16.c
++$(sis900_drivers): sis900.c sis900.h
++$(sis900_drivers): %.o: sis900.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(smc9000_drivers): smc9000.c smc9000.h
+-$(smc9000_drivers): %.o: smc9000.c
++#$(sk_g16_drivers): sk_g16.c sk_g16.h
++#$(sk_g16_drivers): %.o: sk_g16.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++#$(smc9000_drivers): smc9000.c smc9000.h
++#$(smc9000_drivers): %.o: smc9000.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(sundance_drivers): sundance.c
++$(sundance_drivers): %.o: sundance.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(tiara_drivers): tiara.c
+-$(tiara_drivers): %.o: tiara.c
++$(tg3_drivers): tg3.c tg3.h
++$(tg3_drivers): %.o: tg3.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-#$(tlan_drivers): tlan.c
+-#$(tlan_drivers): %.o: tlan.c
++#$(tiara_drivers): tiara.c
++#$(tiara_drivers): %.o: tiara.c
+ #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
++$(tlan_drivers): tlan.c tlan.h
++$(tlan_drivers): %.o: tlan.c
++	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
+ $(tulip_drivers): tulip.c
+ $(tulip_drivers): %.o: tulip.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
++$(undi_drivers): undi.c undi.h
++$(undi_drivers): %.o: undi.c
++	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++          $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
+ $(via_rhine_drivers): via-rhine.c
+ $(via_rhine_drivers): %.o: via-rhine.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+@@ -184,36 +243,45 @@
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ # Per-object flags.
+-3c509_o_CFLAGS = -DINCLUDE_3C509=1
+-3c529_o_CFLAGS = -DINCLUDE_3C529=1
++#3c509_o_CFLAGS = -DINCLUDE_3C509=1
++#3c529_o_CFLAGS = -DINCLUDE_3C529=1
+ 3c595_o_CFLAGS = -DINCLUDE_3C595=1
+ 3c90x_o_CFLAGS = -DINCLUDE_3C90X=1
+-cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
++#cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
+ davicom_o_CFLAGS = -DINCLUDE_DAVICOM=1
+-depca_o_CFLAGS = -DINCLUDE_DEPCA=1
+-eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
++#depca_o_CFLAGS = -DINCLUDE_DEPCA=1
++#eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
++e1000_o_CFLAGS = -DINCLUDE_E1000=1
+ eepro100_o_CFLAGS = -DINCLUDE_EEPRO100=1
+ epic100_o_CFLAGS = -DINCLUDE_EPIC100=1
+ #fa311_o_CFLAGS = -DINCLUDE_FA311=1
+-3c507_o_CFLAGS = -DINCLUDE_3C507=1
+-exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
+-ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
+-lance_o_CFLAGS = -DINCLUDE_LANCE=1
+-ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
+-ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
++forcedeth_o_CFLAGS = -DINCLUDE_FORCEDETH=1
++#3c507_o_CFLAGS = -DINCLUDE_3C507=1
++#exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
++#ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
++#lance_o_CFLAGS = -DINCLUDE_LANCE=1
++#ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
++#ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
+ natsemi_o_CFLAGS = -DINCLUDE_NATSEMI=1
+-ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
+-3c503_o_CFLAGS = -DINCLUDE_3C503=1
+-ne_o_CFLAGS = -DINCLUDE_NE=1
++#ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
++#3c503_o_CFLAGS = -DINCLUDE_3C503=1
++#ne_o_CFLAGS = -DINCLUDE_NE=1
++ns83820_o_CFLAGS = -DINCLUDE_NS83820=1
+ ns8390_o_CFLAGS = -DINCLUDE_NS8390=1
+-wd_o_CFLAGS = -DINCLUDE_WD=1
+-otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
++#wd_o_CFLAGS = -DINCLUDE_WD=1
++#otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
++pcnet32_o_CFLAGS = -DINCLUDE_PCNET32=1
++pnic_o_CFLAGS = -DINCLUDE_PNIC=1
++r8169_o_CFLAGS = -DINCLUDE_R8169=1
+ rtl8139_o_CFLAGS = -DINCLUDE_RTL8139=1
+ sis900_o_CFLAGS = -DINCLUDE_SIS900=1
+-sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
+-smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
+-tiara_o_CFLAGS = -DINCLUDE_TIARA=1
+-#tlan_o_CFLAGS = -DINCLUDE_TLAN=1
++#sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
++#smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
++sundance_o_CFLAGS = -DINCLUDE_SUNDANCE=1
++#tiara_o_CFLAGS = -DINCLUDE_TIARA=1
++tg3_o_CFLAGS = -DINCLUDE_TG3=1
++tlan_o_CFLAGS = -DINCLUDE_TLAN=1
+ tulip_o_CFLAGS = -DINCLUDE_TULIP=1
++undi_o_CFLAGS = -DINCLUDE_UNDI=1
+ via_rhine_o_CFLAGS = -DINCLUDE_VIA_RHINE=1
+ w89c840_o_CFLAGS = -DINCLUDE_W89C840=1
+diff -Naur grub-0.97.orig/netboot/Makefile.in grub-0.97/netboot/Makefile.in
+--- grub-0.97.orig/netboot/Makefile.in	2005-05-08 02:42:35.000000000 +0000
++++ grub-0.97/netboot/Makefile.in	2005-09-01 00:14:15.000000000 +0000
+@@ -48,18 +47,51 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-LIBRARIES = $(noinst_LIBRARIES)
+ AR = ar
+ ARFLAGS = cru
++LIBRARIES = $(noinst_LIBRARIES)
+ libdrivers_a_AR = $(AR) $(ARFLAGS)
+ am_libdrivers_a_OBJECTS = libdrivers_a-config.$(OBJEXT) \
+-	libdrivers_a-fsys_tftp.$(OBJEXT) libdrivers_a-main.$(OBJEXT) \
+-	libdrivers_a-misc.$(OBJEXT) libdrivers_a-pci.$(OBJEXT) \
+-	libdrivers_a-timer.$(OBJEXT)
++	libdrivers_a-fsys_tftp.$(OBJEXT) \
++	libdrivers_a-i386_timer.$(OBJEXT) libdrivers_a-misc.$(OBJEXT) \
++	libdrivers_a-nic.$(OBJEXT) libdrivers_a-pci.$(OBJEXT) \
++	libdrivers_a-pci_io.$(OBJEXT) libdrivers_a-timer.$(OBJEXT) \
++	libdrivers_a-pic8259.$(OBJEXT) libdrivers_a-basemem.$(OBJEXT)
+ libdrivers_a_OBJECTS = $(am_libdrivers_a_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libdrivers_a-3c595.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-3c90x.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-basemem.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-config.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-davicom.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-e1000.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-eepro100.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-epic100.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-forcedeth.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-fsys_tftp.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-i386_timer.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-misc.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-natsemi.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-nic.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-ns83820.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-ns8390.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pci.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pci_io.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pcnet32.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pic8259.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pnic.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pnic_api.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-r8169.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-rtl8139.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-sis900.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-tg3.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-timer.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-tlan.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-tulip.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-via-rhine.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-w89c840.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+@@ -148,8 +180,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -186,16 +216,19 @@
+ # Don't build the netboot support by default.
+ @NETBOOT_SUPPORT_TRUE@LIBDRIVERS = libdrivers.a
+ noinst_LIBRARIES = $(LIBDRIVERS)
+-libdrivers_a_SOURCES = cards.h config.c etherboot.h \
+-	fsys_tftp.c linux-asm-io.h linux-asm-string.h \
+-	main.c misc.c nic.h osdep.h pci.c pci.h timer.c timer.h
+-
+-EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c595.c 3c595.h 3c90x.c \
+-	cs89x0.c cs89x0.h davicom.c depca.c eepro.c eepro100.c \
+-	epic100.c epic100.h fa311.c i82586.c lance.c natsemi.c \
+-	ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \
+-	sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
+-	tiara.c tlan.c tulip.c via-rhine.c w89c840.c
++libdrivers_a_SOURCES = big_bswap.h bootp.h byteswap.h config.c cpu.h \
++	dev.h elf.h endian.h etherboot.h fsys_tftp.c grub.h \
++	i386_byteswap.h i386_elf.h i386_endian.h i386_timer.c \
++	if_arp.h if_ether.h igmp.h in.h io.h ip.h isa.h latch.h \
++	little_bswap.h misc.c nic.c nic.h osdep.h pci.c pci.h \
++	pci_ids.h pci_io.c stdint.h tftp.h timer.c timer.h \
++	types.h udp.h mii.h pic8259.c pic8259.h pxe.h basemem.c segoff.h
++
++EXTRA_libdrivers_a_SOURCES = 3c595.c 3c595.h 3c90x.c davicom.c \
++	e1000.c e1000_hw.h eepro100.c epic100.c epic100.h natsemi.c \
++	ns8390.c ns8390.h pcnet32.c rtl8139.c sis900.c sis900.h \
++	tg3.c tg3.h tlan.c tlan.h tulip.c via-rhine.c \
++	w89c840.c r8169.c forcedeth.c ns83820.c pnic.c pnic_api.c 
+ 
+ libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	-DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
+@@ -203,69 +236,83 @@
+ # Filled by configure.
+ libdrivers_a_LIBADD = @NETBOOT_DRIVERS@
+ libdrivers_a_DEPENDENCIES = $(libdrivers_a_LIBADD)
+-EXTRA_DIST = README.netboot 3c90x.txt cs89x0.txt sis900.txt tulip.txt
++EXTRA_DIST = README.netboot
+ 
+ # These below are several special rules for the device drivers.
+ # We cannot use a simple rule for them...
+ 
+ # What objects are derived from a driver?
+-3c509_drivers = 3c509.o 3c529.o
++#3c509_drivers = 3c509.o 3c529.o
+ 3c595_drivers = 3c595.o
+ 3c90x_drivers = 3c90x.o
+-cs89x0_drivers = cs89x0.o
++#cs89x0_drivers = cs89x0.o
+ davicom_drivers = davicom.o
+-depca_drivers = depca.o
+-eepro_drivers = eepro.o
++#depca_drivers = depca.o
++#eepro_drivers = eepro.o
++e1000_drivers = e1000.o
+ eepro100_drivers = eepro100.o
+ epic100_drivers = epic100.o
+ #fa311_drivers = fa311.o
+-i82586_drivers = 3c507.o exos205.o ni5210.o
+-lance_drivers = lance.o ne2100.o ni6510.o
++forcedeth_drivers = forcedeth.o
++#i82586_drivers = 3c507.o exos205.o ni5210.o
++#lance_drivers = lance.o ne2100.o ni6510.o
+ natsemi_drivers = natsemi.o
+-ni5010_drivers = ni5010.o
++#ni5010_drivers = ni5010.o
++ns83820_drivers = ns83820.o
+ ns8390_drivers = 3c503.o ne.o ns8390.o wd.o
+-otulip_drivers = otulip.o
++#otulip_drivers = otulip.o
++pcnet32_drivers = pcnet32.o
++pnic_drivers = pnic.o
++r8169_drivers = r8169.o
+ rtl8139_drivers = rtl8139.o
+ sis900_drivers = sis900.o
+-sk_g16_drivers = sk_g16.o
+-smc9000_drivers = smc9000.o
+-tiara_drivers = tiara.o
+-#tlan_drivers = tlan.o
++#sk_g16_drivers = sk_g16.o
++#smc9000_drivers = smc9000.o
++tg3_drivers = tg3.o
++#tiara_drivers = tiara.o
++tlan_drivers = tlan.o
+ tulip_drivers = tulip.o
+ via_rhine_drivers = via_rhine.o
+ w89c840_drivers = w89c840.o
+ 
+ # Per-object flags.
+-3c509_o_CFLAGS = -DINCLUDE_3C509=1
+-3c529_o_CFLAGS = -DINCLUDE_3C529=1
++#3c509_o_CFLAGS = -DINCLUDE_3C509=1
++#3c529_o_CFLAGS = -DINCLUDE_3C529=1
+ 3c595_o_CFLAGS = -DINCLUDE_3C595=1
+ 3c90x_o_CFLAGS = -DINCLUDE_3C90X=1
+-cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
++#cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
+ davicom_o_CFLAGS = -DINCLUDE_DAVICOM=1
+-depca_o_CFLAGS = -DINCLUDE_DEPCA=1
+-eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
++#depca_o_CFLAGS = -DINCLUDE_DEPCA=1
++#eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
++e1000_o_CFLAGS = -DINCLUDE_E1000=1
+ eepro100_o_CFLAGS = -DINCLUDE_EEPRO100=1
+ epic100_o_CFLAGS = -DINCLUDE_EPIC100=1
+ #fa311_o_CFLAGS = -DINCLUDE_FA311=1
+-3c507_o_CFLAGS = -DINCLUDE_3C507=1
+-exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
+-ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
+-lance_o_CFLAGS = -DINCLUDE_LANCE=1
+-ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
+-ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
++forcedeth_o_CFLAGS = -DINCLUDE_FORCEDETH=1
++#3c507_o_CFLAGS = -DINCLUDE_3C507=1
++#exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
++#ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
++#lance_o_CFLAGS = -DINCLUDE_LANCE=1
++#ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
++#ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
+ natsemi_o_CFLAGS = -DINCLUDE_NATSEMI=1
+-ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
+-3c503_o_CFLAGS = -DINCLUDE_3C503=1
+-ne_o_CFLAGS = -DINCLUDE_NE=1
++#ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
++#3c503_o_CFLAGS = -DINCLUDE_3C503=1
++#ne_o_CFLAGS = -DINCLUDE_NE=1
++ns83820_o_CFLAGS = -DINCLUDE_NS83820=1
+ ns8390_o_CFLAGS = -DINCLUDE_NS8390=1
+-wd_o_CFLAGS = -DINCLUDE_WD=1
+-otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
++#wd_o_CFLAGS = -DINCLUDE_WD=1
++#otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
++pcnet32_o_CFLAGS = -DINCLUDE_PCNET32=1
++pnic_o_CFLAGS = -DINCLUDE_PNIC=1
++r8169_o_CFLAGS = -DINCLUDE_R8169=1
+ rtl8139_o_CFLAGS = -DINCLUDE_RTL8139=1
+ sis900_o_CFLAGS = -DINCLUDE_SIS900=1
+-sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
+-smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
+-tiara_o_CFLAGS = -DINCLUDE_TIARA=1
+-#tlan_o_CFLAGS = -DINCLUDE_TLAN=1
++#sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
++#smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
++#tiara_o_CFLAGS = -DINCLUDE_TIARA=1
++tg3_o_CFLAGS = -DINCLUDE_TG3=1
++tlan_o_CFLAGS = -DINCLUDE_TLAN=1
+ tulip_o_CFLAGS = -DINCLUDE_TULIP=1
+ via_rhine_o_CFLAGS = -DINCLUDE_VIA_RHINE=1
+ w89c840_o_CFLAGS = -DINCLUDE_W89C840=1
+@@ -316,32 +363,32 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-3c509.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-3c595.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-3c90x.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-basemem.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-config.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-cs89x0.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-davicom.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-depca.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-eepro.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-e1000.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-eepro100.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-epic100.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-fa311.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-forcedeth.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-fsys_tftp.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-i82586.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-lance.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-main.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-i386_timer.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-misc.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-natsemi.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-ni5010.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-nic.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-ns83820.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-ns8390.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-otulip.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pci.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pci_io.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pcnet32.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pic8259.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pnic.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pnic_api.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-r8169.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-rtl8139.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-sis900.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-sk_g16.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-smc9000.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tiara.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tg3.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-timer.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tlan.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tulip.Po@am__quote@
+@@ -352,450 +399,513 @@
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
+ libdrivers_a-config.o: config.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-config.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-config.Tpo" -c -o libdrivers_a-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-config.Tpo" "$(DEPDIR)/libdrivers_a-config.Po"; else rm -f "$(DEPDIR)/libdrivers_a-config.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='libdrivers_a-config.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-config.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-config.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c
+ 
+ libdrivers_a-config.obj: config.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-config.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-config.Tpo" -c -o libdrivers_a-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-config.Tpo" "$(DEPDIR)/libdrivers_a-config.Po"; else rm -f "$(DEPDIR)/libdrivers_a-config.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='libdrivers_a-config.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-config.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-config.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`
+ 
+ libdrivers_a-fsys_tftp.o: fsys_tftp.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fsys_tftp.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" -c -o libdrivers_a-fsys_tftp.o `test -f 'fsys_tftp.c' || echo '$(srcdir)/'`fsys_tftp.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" "$(DEPDIR)/libdrivers_a-fsys_tftp.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fsys_tftp.c' object='libdrivers_a-fsys_tftp.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-fsys_tftp.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-fsys_tftp.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fsys_tftp.o `test -f 'fsys_tftp.c' || echo '$(srcdir)/'`fsys_tftp.c
+ 
+ libdrivers_a-fsys_tftp.obj: fsys_tftp.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fsys_tftp.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" -c -o libdrivers_a-fsys_tftp.obj `if test -f 'fsys_tftp.c'; then $(CYGPATH_W) 'fsys_tftp.c'; else $(CYGPATH_W) '$(srcdir)/fsys_tftp.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" "$(DEPDIR)/libdrivers_a-fsys_tftp.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fsys_tftp.c' object='libdrivers_a-fsys_tftp.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-fsys_tftp.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-fsys_tftp.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fsys_tftp.obj `if test -f 'fsys_tftp.c'; then $(CYGPATH_W) 'fsys_tftp.c'; else $(CYGPATH_W) '$(srcdir)/fsys_tftp.c'; fi`
+ 
+-libdrivers_a-main.o: main.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-main.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-main.Tpo" -c -o libdrivers_a-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-main.Tpo" "$(DEPDIR)/libdrivers_a-main.Po"; else rm -f "$(DEPDIR)/libdrivers_a-main.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libdrivers_a-main.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+-
+-libdrivers_a-main.obj: main.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-main.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-main.Tpo" -c -o libdrivers_a-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-main.Tpo" "$(DEPDIR)/libdrivers_a-main.Po"; else rm -f "$(DEPDIR)/libdrivers_a-main.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libdrivers_a-main.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
++libdrivers_a-i386_timer.o: i386_timer.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i386_timer.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" -c -o libdrivers_a-i386_timer.o `test -f 'i386_timer.c' || echo '$(srcdir)/'`i386_timer.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" "$(DEPDIR)/libdrivers_a-i386_timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i386_timer.c' object='libdrivers_a-i386_timer.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-i386_timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-i386_timer.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i386_timer.o `test -f 'i386_timer.c' || echo '$(srcdir)/'`i386_timer.c
++
++libdrivers_a-i386_timer.obj: i386_timer.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i386_timer.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" -c -o libdrivers_a-i386_timer.obj `if test -f 'i386_timer.c'; then $(CYGPATH_W) 'i386_timer.c'; else $(CYGPATH_W) '$(srcdir)/i386_timer.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" "$(DEPDIR)/libdrivers_a-i386_timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i386_timer.c' object='libdrivers_a-i386_timer.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-i386_timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-i386_timer.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i386_timer.obj `if test -f 'i386_timer.c'; then $(CYGPATH_W) 'i386_timer.c'; else $(CYGPATH_W) '$(srcdir)/i386_timer.c'; fi`
+ 
+ libdrivers_a-misc.o: misc.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-misc.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-misc.Tpo" -c -o libdrivers_a-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-misc.Tpo" "$(DEPDIR)/libdrivers_a-misc.Po"; else rm -f "$(DEPDIR)/libdrivers_a-misc.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='libdrivers_a-misc.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-misc.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-misc.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
+ 
+ libdrivers_a-misc.obj: misc.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-misc.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-misc.Tpo" -c -o libdrivers_a-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-misc.Tpo" "$(DEPDIR)/libdrivers_a-misc.Po"; else rm -f "$(DEPDIR)/libdrivers_a-misc.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='libdrivers_a-misc.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-misc.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-misc.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`
+ 
++libdrivers_a-nic.o: nic.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-nic.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-nic.Tpo" -c -o libdrivers_a-nic.o `test -f 'nic.c' || echo '$(srcdir)/'`nic.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-nic.Tpo" "$(DEPDIR)/libdrivers_a-nic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-nic.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nic.c' object='libdrivers_a-nic.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-nic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-nic.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-nic.o `test -f 'nic.c' || echo '$(srcdir)/'`nic.c
++
++libdrivers_a-nic.obj: nic.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-nic.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-nic.Tpo" -c -o libdrivers_a-nic.obj `if test -f 'nic.c'; then $(CYGPATH_W) 'nic.c'; else $(CYGPATH_W) '$(srcdir)/nic.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-nic.Tpo" "$(DEPDIR)/libdrivers_a-nic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-nic.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nic.c' object='libdrivers_a-nic.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-nic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-nic.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-nic.obj `if test -f 'nic.c'; then $(CYGPATH_W) 'nic.c'; else $(CYGPATH_W) '$(srcdir)/nic.c'; fi`
++
+ libdrivers_a-pci.o: pci.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci.Tpo" -c -o libdrivers_a-pci.o `test -f 'pci.c' || echo '$(srcdir)/'`pci.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci.Tpo" "$(DEPDIR)/libdrivers_a-pci.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci.c' object='libdrivers_a-pci.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci.o `test -f 'pci.c' || echo '$(srcdir)/'`pci.c
+ 
+ libdrivers_a-pci.obj: pci.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci.Tpo" -c -o libdrivers_a-pci.obj `if test -f 'pci.c'; then $(CYGPATH_W) 'pci.c'; else $(CYGPATH_W) '$(srcdir)/pci.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci.Tpo" "$(DEPDIR)/libdrivers_a-pci.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci.c' object='libdrivers_a-pci.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci.obj `if test -f 'pci.c'; then $(CYGPATH_W) 'pci.c'; else $(CYGPATH_W) '$(srcdir)/pci.c'; fi`
+ 
++libdrivers_a-pci_io.o: pci_io.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci_io.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci_io.Tpo" -c -o libdrivers_a-pci_io.o `test -f 'pci_io.c' || echo '$(srcdir)/'`pci_io.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo" "$(DEPDIR)/libdrivers_a-pci_io.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci_io.c' object='libdrivers_a-pci_io.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci_io.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci_io.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci_io.o `test -f 'pci_io.c' || echo '$(srcdir)/'`pci_io.c
++
++libdrivers_a-pci_io.obj: pci_io.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci_io.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci_io.Tpo" -c -o libdrivers_a-pci_io.obj `if test -f 'pci_io.c'; then $(CYGPATH_W) 'pci_io.c'; else $(CYGPATH_W) '$(srcdir)/pci_io.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo" "$(DEPDIR)/libdrivers_a-pci_io.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci_io.c' object='libdrivers_a-pci_io.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci_io.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci_io.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci_io.obj `if test -f 'pci_io.c'; then $(CYGPATH_W) 'pci_io.c'; else $(CYGPATH_W) '$(srcdir)/pci_io.c'; fi`
++
+ libdrivers_a-timer.o: timer.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-timer.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-timer.Tpo" -c -o libdrivers_a-timer.o `test -f 'timer.c' || echo '$(srcdir)/'`timer.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-timer.Tpo" "$(DEPDIR)/libdrivers_a-timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-timer.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timer.c' object='libdrivers_a-timer.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-timer.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-timer.o `test -f 'timer.c' || echo '$(srcdir)/'`timer.c
+ 
+ libdrivers_a-timer.obj: timer.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-timer.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-timer.Tpo" -c -o libdrivers_a-timer.obj `if test -f 'timer.c'; then $(CYGPATH_W) 'timer.c'; else $(CYGPATH_W) '$(srcdir)/timer.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-timer.Tpo" "$(DEPDIR)/libdrivers_a-timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-timer.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timer.c' object='libdrivers_a-timer.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-timer.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-timer.obj `if test -f 'timer.c'; then $(CYGPATH_W) 'timer.c'; else $(CYGPATH_W) '$(srcdir)/timer.c'; fi`
+ 
+-libdrivers_a-3c509.o: 3c509.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c509.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c509.Tpo" -c -o libdrivers_a-3c509.o `test -f '3c509.c' || echo '$(srcdir)/'`3c509.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c509.Tpo" "$(DEPDIR)/libdrivers_a-3c509.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c509.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c509.c' object='libdrivers_a-3c509.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c509.o `test -f '3c509.c' || echo '$(srcdir)/'`3c509.c
+-
+-libdrivers_a-3c509.obj: 3c509.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c509.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c509.Tpo" -c -o libdrivers_a-3c509.obj `if test -f '3c509.c'; then $(CYGPATH_W) '3c509.c'; else $(CYGPATH_W) '$(srcdir)/3c509.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c509.Tpo" "$(DEPDIR)/libdrivers_a-3c509.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c509.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c509.c' object='libdrivers_a-3c509.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c509.obj `if test -f '3c509.c'; then $(CYGPATH_W) '3c509.c'; else $(CYGPATH_W) '$(srcdir)/3c509.c'; fi`
++libdrivers_a-pic8259.o: pic8259.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pic8259.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pic8259.Tpo" -c -o libdrivers_a-pic8259.o `test -f 'pic8259.c' || echo '$(srcdir)/'`pic8259.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo" "$(DEPDIR)/libdrivers_a-pic8259.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pic8259.c' object='libdrivers_a-pic8259.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pic8259.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pic8259.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pic8259.o `test -f 'pic8259.c' || echo '$(srcdir)/'`pic8259.c
++
++libdrivers_a-pic8259.obj: pic8259.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pic8259.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pic8259.Tpo" -c -o libdrivers_a-pic8259.obj `if test -f 'pic8259.c'; then $(CYGPATH_W) 'pic8259.c'; else $(CYGPATH_W) '$(srcdir)/pic8259.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo" "$(DEPDIR)/libdrivers_a-pic8259.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pic8259.c' object='libdrivers_a-pic8259.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pic8259.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pic8259.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pic8259.obj `if test -f 'pic8259.c'; then $(CYGPATH_W) 'pic8259.c'; else $(CYGPATH_W) '$(srcdir)/pic8259.c'; fi`
++
++libdrivers_a-basemem.o: basemem.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-basemem.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-basemem.Tpo" -c -o libdrivers_a-basemem.o `test -f 'basemem.c' || echo '$(srcdir)/'`basemem.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-basemem.Tpo" "$(DEPDIR)/libdrivers_a-basemem.Po"; else rm -f "$(DEPDIR)/libdrivers_a-basemem.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='basemem.c' object='libdrivers_a-basemem.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-basemem.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-basemem.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-basemem.o `test -f 'basemem.c' || echo '$(srcdir)/'`basemem.c
++
++libdrivers_a-basemem.obj: basemem.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-basemem.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-basemem.Tpo" -c -o libdrivers_a-basemem.obj `if test -f 'basemem.c'; then $(CYGPATH_W) 'basemem.c'; else $(CYGPATH_W) '$(srcdir)/basemem.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-basemem.Tpo" "$(DEPDIR)/libdrivers_a-basemem.Po"; else rm -f "$(DEPDIR)/libdrivers_a-basemem.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='basemem.c' object='libdrivers_a-basemem.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-basemem.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-basemem.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-basemem.obj `if test -f 'basemem.c'; then $(CYGPATH_W) 'basemem.c'; else $(CYGPATH_W) '$(srcdir)/basemem.c'; fi`
+ 
+ libdrivers_a-3c595.o: 3c595.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c595.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c595.Tpo" -c -o libdrivers_a-3c595.o `test -f '3c595.c' || echo '$(srcdir)/'`3c595.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c595.Tpo" "$(DEPDIR)/libdrivers_a-3c595.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c595.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c595.c' object='libdrivers_a-3c595.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c595.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c595.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c595.o `test -f '3c595.c' || echo '$(srcdir)/'`3c595.c
+ 
+ libdrivers_a-3c595.obj: 3c595.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c595.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c595.Tpo" -c -o libdrivers_a-3c595.obj `if test -f '3c595.c'; then $(CYGPATH_W) '3c595.c'; else $(CYGPATH_W) '$(srcdir)/3c595.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c595.Tpo" "$(DEPDIR)/libdrivers_a-3c595.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c595.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c595.c' object='libdrivers_a-3c595.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c595.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c595.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c595.obj `if test -f '3c595.c'; then $(CYGPATH_W) '3c595.c'; else $(CYGPATH_W) '$(srcdir)/3c595.c'; fi`
+ 
+ libdrivers_a-3c90x.o: 3c90x.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c90x.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c90x.Tpo" -c -o libdrivers_a-3c90x.o `test -f '3c90x.c' || echo '$(srcdir)/'`3c90x.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo" "$(DEPDIR)/libdrivers_a-3c90x.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c90x.c' object='libdrivers_a-3c90x.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c90x.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c90x.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c90x.o `test -f '3c90x.c' || echo '$(srcdir)/'`3c90x.c
+ 
+ libdrivers_a-3c90x.obj: 3c90x.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c90x.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c90x.Tpo" -c -o libdrivers_a-3c90x.obj `if test -f '3c90x.c'; then $(CYGPATH_W) '3c90x.c'; else $(CYGPATH_W) '$(srcdir)/3c90x.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo" "$(DEPDIR)/libdrivers_a-3c90x.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c90x.c' object='libdrivers_a-3c90x.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c90x.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c90x.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c90x.obj `if test -f '3c90x.c'; then $(CYGPATH_W) '3c90x.c'; else $(CYGPATH_W) '$(srcdir)/3c90x.c'; fi`
+ 
+-libdrivers_a-cs89x0.o: cs89x0.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-cs89x0.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" -c -o libdrivers_a-cs89x0.o `test -f 'cs89x0.c' || echo '$(srcdir)/'`cs89x0.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" "$(DEPDIR)/libdrivers_a-cs89x0.Po"; else rm -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cs89x0.c' object='libdrivers_a-cs89x0.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-cs89x0.o `test -f 'cs89x0.c' || echo '$(srcdir)/'`cs89x0.c
+-
+-libdrivers_a-cs89x0.obj: cs89x0.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-cs89x0.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" -c -o libdrivers_a-cs89x0.obj `if test -f 'cs89x0.c'; then $(CYGPATH_W) 'cs89x0.c'; else $(CYGPATH_W) '$(srcdir)/cs89x0.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" "$(DEPDIR)/libdrivers_a-cs89x0.Po"; else rm -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cs89x0.c' object='libdrivers_a-cs89x0.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-cs89x0.obj `if test -f 'cs89x0.c'; then $(CYGPATH_W) 'cs89x0.c'; else $(CYGPATH_W) '$(srcdir)/cs89x0.c'; fi`
+-
+ libdrivers_a-davicom.o: davicom.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-davicom.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-davicom.Tpo" -c -o libdrivers_a-davicom.o `test -f 'davicom.c' || echo '$(srcdir)/'`davicom.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-davicom.Tpo" "$(DEPDIR)/libdrivers_a-davicom.Po"; else rm -f "$(DEPDIR)/libdrivers_a-davicom.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='davicom.c' object='libdrivers_a-davicom.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-davicom.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-davicom.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-davicom.o `test -f 'davicom.c' || echo '$(srcdir)/'`davicom.c
+ 
+ libdrivers_a-davicom.obj: davicom.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-davicom.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-davicom.Tpo" -c -o libdrivers_a-davicom.obj `if test -f 'davicom.c'; then $(CYGPATH_W) 'davicom.c'; else $(CYGPATH_W) '$(srcdir)/davicom.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-davicom.Tpo" "$(DEPDIR)/libdrivers_a-davicom.Po"; else rm -f "$(DEPDIR)/libdrivers_a-davicom.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='davicom.c' object='libdrivers_a-davicom.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-davicom.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-davicom.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-davicom.obj `if test -f 'davicom.c'; then $(CYGPATH_W) 'davicom.c'; else $(CYGPATH_W) '$(srcdir)/davicom.c'; fi`
+ 
+-libdrivers_a-depca.o: depca.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-depca.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-depca.Tpo" -c -o libdrivers_a-depca.o `test -f 'depca.c' || echo '$(srcdir)/'`depca.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-depca.Tpo" "$(DEPDIR)/libdrivers_a-depca.Po"; else rm -f "$(DEPDIR)/libdrivers_a-depca.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='depca.c' object='libdrivers_a-depca.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-depca.o `test -f 'depca.c' || echo '$(srcdir)/'`depca.c
+-
+-libdrivers_a-depca.obj: depca.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-depca.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-depca.Tpo" -c -o libdrivers_a-depca.obj `if test -f 'depca.c'; then $(CYGPATH_W) 'depca.c'; else $(CYGPATH_W) '$(srcdir)/depca.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-depca.Tpo" "$(DEPDIR)/libdrivers_a-depca.Po"; else rm -f "$(DEPDIR)/libdrivers_a-depca.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='depca.c' object='libdrivers_a-depca.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-depca.obj `if test -f 'depca.c'; then $(CYGPATH_W) 'depca.c'; else $(CYGPATH_W) '$(srcdir)/depca.c'; fi`
+-
+-libdrivers_a-eepro.o: eepro.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro.Tpo" -c -o libdrivers_a-eepro.o `test -f 'eepro.c' || echo '$(srcdir)/'`eepro.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro.Tpo" "$(DEPDIR)/libdrivers_a-eepro.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro.c' object='libdrivers_a-eepro.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro.o `test -f 'eepro.c' || echo '$(srcdir)/'`eepro.c
+-
+-libdrivers_a-eepro.obj: eepro.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro.Tpo" -c -o libdrivers_a-eepro.obj `if test -f 'eepro.c'; then $(CYGPATH_W) 'eepro.c'; else $(CYGPATH_W) '$(srcdir)/eepro.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro.Tpo" "$(DEPDIR)/libdrivers_a-eepro.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro.c' object='libdrivers_a-eepro.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro.obj `if test -f 'eepro.c'; then $(CYGPATH_W) 'eepro.c'; else $(CYGPATH_W) '$(srcdir)/eepro.c'; fi`
++libdrivers_a-e1000.o: e1000.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-e1000.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-e1000.Tpo" -c -o libdrivers_a-e1000.o `test -f 'e1000.c' || echo '$(srcdir)/'`e1000.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-e1000.Tpo" "$(DEPDIR)/libdrivers_a-e1000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-e1000.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='e1000.c' object='libdrivers_a-e1000.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-e1000.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-e1000.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-e1000.o `test -f 'e1000.c' || echo '$(srcdir)/'`e1000.c
++
++libdrivers_a-e1000.obj: e1000.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-e1000.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-e1000.Tpo" -c -o libdrivers_a-e1000.obj `if test -f 'e1000.c'; then $(CYGPATH_W) 'e1000.c'; else $(CYGPATH_W) '$(srcdir)/e1000.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-e1000.Tpo" "$(DEPDIR)/libdrivers_a-e1000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-e1000.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='e1000.c' object='libdrivers_a-e1000.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-e1000.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-e1000.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-e1000.obj `if test -f 'e1000.c'; then $(CYGPATH_W) 'e1000.c'; else $(CYGPATH_W) '$(srcdir)/e1000.c'; fi`
+ 
+ libdrivers_a-eepro100.o: eepro100.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro100.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro100.Tpo" -c -o libdrivers_a-eepro100.o `test -f 'eepro100.c' || echo '$(srcdir)/'`eepro100.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo" "$(DEPDIR)/libdrivers_a-eepro100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro100.c' object='libdrivers_a-eepro100.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-eepro100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-eepro100.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro100.o `test -f 'eepro100.c' || echo '$(srcdir)/'`eepro100.c
+ 
+ libdrivers_a-eepro100.obj: eepro100.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro100.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro100.Tpo" -c -o libdrivers_a-eepro100.obj `if test -f 'eepro100.c'; then $(CYGPATH_W) 'eepro100.c'; else $(CYGPATH_W) '$(srcdir)/eepro100.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo" "$(DEPDIR)/libdrivers_a-eepro100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro100.c' object='libdrivers_a-eepro100.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-eepro100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-eepro100.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro100.obj `if test -f 'eepro100.c'; then $(CYGPATH_W) 'eepro100.c'; else $(CYGPATH_W) '$(srcdir)/eepro100.c'; fi`
+ 
+ libdrivers_a-epic100.o: epic100.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-epic100.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-epic100.Tpo" -c -o libdrivers_a-epic100.o `test -f 'epic100.c' || echo '$(srcdir)/'`epic100.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-epic100.Tpo" "$(DEPDIR)/libdrivers_a-epic100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-epic100.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='epic100.c' object='libdrivers_a-epic100.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-epic100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-epic100.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-epic100.o `test -f 'epic100.c' || echo '$(srcdir)/'`epic100.c
+ 
+ libdrivers_a-epic100.obj: epic100.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-epic100.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-epic100.Tpo" -c -o libdrivers_a-epic100.obj `if test -f 'epic100.c'; then $(CYGPATH_W) 'epic100.c'; else $(CYGPATH_W) '$(srcdir)/epic100.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-epic100.Tpo" "$(DEPDIR)/libdrivers_a-epic100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-epic100.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='epic100.c' object='libdrivers_a-epic100.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-epic100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-epic100.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-epic100.obj `if test -f 'epic100.c'; then $(CYGPATH_W) 'epic100.c'; else $(CYGPATH_W) '$(srcdir)/epic100.c'; fi`
+ 
+-libdrivers_a-fa311.o: fa311.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fa311.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-fa311.Tpo" -c -o libdrivers_a-fa311.o `test -f 'fa311.c' || echo '$(srcdir)/'`fa311.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fa311.Tpo" "$(DEPDIR)/libdrivers_a-fa311.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fa311.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fa311.c' object='libdrivers_a-fa311.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fa311.o `test -f 'fa311.c' || echo '$(srcdir)/'`fa311.c
+-
+-libdrivers_a-fa311.obj: fa311.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fa311.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-fa311.Tpo" -c -o libdrivers_a-fa311.obj `if test -f 'fa311.c'; then $(CYGPATH_W) 'fa311.c'; else $(CYGPATH_W) '$(srcdir)/fa311.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fa311.Tpo" "$(DEPDIR)/libdrivers_a-fa311.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fa311.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fa311.c' object='libdrivers_a-fa311.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fa311.obj `if test -f 'fa311.c'; then $(CYGPATH_W) 'fa311.c'; else $(CYGPATH_W) '$(srcdir)/fa311.c'; fi`
+-
+-libdrivers_a-i82586.o: i82586.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i82586.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-i82586.Tpo" -c -o libdrivers_a-i82586.o `test -f 'i82586.c' || echo '$(srcdir)/'`i82586.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i82586.Tpo" "$(DEPDIR)/libdrivers_a-i82586.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i82586.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i82586.c' object='libdrivers_a-i82586.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i82586.o `test -f 'i82586.c' || echo '$(srcdir)/'`i82586.c
+-
+-libdrivers_a-i82586.obj: i82586.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i82586.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-i82586.Tpo" -c -o libdrivers_a-i82586.obj `if test -f 'i82586.c'; then $(CYGPATH_W) 'i82586.c'; else $(CYGPATH_W) '$(srcdir)/i82586.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i82586.Tpo" "$(DEPDIR)/libdrivers_a-i82586.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i82586.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i82586.c' object='libdrivers_a-i82586.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i82586.obj `if test -f 'i82586.c'; then $(CYGPATH_W) 'i82586.c'; else $(CYGPATH_W) '$(srcdir)/i82586.c'; fi`
+-
+-libdrivers_a-lance.o: lance.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-lance.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-lance.Tpo" -c -o libdrivers_a-lance.o `test -f 'lance.c' || echo '$(srcdir)/'`lance.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-lance.Tpo" "$(DEPDIR)/libdrivers_a-lance.Po"; else rm -f "$(DEPDIR)/libdrivers_a-lance.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lance.c' object='libdrivers_a-lance.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-lance.o `test -f 'lance.c' || echo '$(srcdir)/'`lance.c
+-
+-libdrivers_a-lance.obj: lance.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-lance.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-lance.Tpo" -c -o libdrivers_a-lance.obj `if test -f 'lance.c'; then $(CYGPATH_W) 'lance.c'; else $(CYGPATH_W) '$(srcdir)/lance.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-lance.Tpo" "$(DEPDIR)/libdrivers_a-lance.Po"; else rm -f "$(DEPDIR)/libdrivers_a-lance.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lance.c' object='libdrivers_a-lance.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-lance.obj `if test -f 'lance.c'; then $(CYGPATH_W) 'lance.c'; else $(CYGPATH_W) '$(srcdir)/lance.c'; fi`
+-
+ libdrivers_a-natsemi.o: natsemi.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-natsemi.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-natsemi.Tpo" -c -o libdrivers_a-natsemi.o `test -f 'natsemi.c' || echo '$(srcdir)/'`natsemi.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo" "$(DEPDIR)/libdrivers_a-natsemi.Po"; else rm -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='natsemi.c' object='libdrivers_a-natsemi.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-natsemi.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-natsemi.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-natsemi.o `test -f 'natsemi.c' || echo '$(srcdir)/'`natsemi.c
+ 
+ libdrivers_a-natsemi.obj: natsemi.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-natsemi.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-natsemi.Tpo" -c -o libdrivers_a-natsemi.obj `if test -f 'natsemi.c'; then $(CYGPATH_W) 'natsemi.c'; else $(CYGPATH_W) '$(srcdir)/natsemi.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo" "$(DEPDIR)/libdrivers_a-natsemi.Po"; else rm -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='natsemi.c' object='libdrivers_a-natsemi.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-natsemi.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-natsemi.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-natsemi.obj `if test -f 'natsemi.c'; then $(CYGPATH_W) 'natsemi.c'; else $(CYGPATH_W) '$(srcdir)/natsemi.c'; fi`
+ 
+-libdrivers_a-ni5010.o: ni5010.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ni5010.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-ni5010.Tpo" -c -o libdrivers_a-ni5010.o `test -f 'ni5010.c' || echo '$(srcdir)/'`ni5010.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo" "$(DEPDIR)/libdrivers_a-ni5010.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ni5010.c' object='libdrivers_a-ni5010.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ni5010.o `test -f 'ni5010.c' || echo '$(srcdir)/'`ni5010.c
+-
+-libdrivers_a-ni5010.obj: ni5010.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ni5010.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-ni5010.Tpo" -c -o libdrivers_a-ni5010.obj `if test -f 'ni5010.c'; then $(CYGPATH_W) 'ni5010.c'; else $(CYGPATH_W) '$(srcdir)/ni5010.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo" "$(DEPDIR)/libdrivers_a-ni5010.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ni5010.c' object='libdrivers_a-ni5010.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ni5010.obj `if test -f 'ni5010.c'; then $(CYGPATH_W) 'ni5010.c'; else $(CYGPATH_W) '$(srcdir)/ni5010.c'; fi`
+-
+ libdrivers_a-ns8390.o: ns8390.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns8390.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns8390.Tpo" -c -o libdrivers_a-ns8390.o `test -f 'ns8390.c' || echo '$(srcdir)/'`ns8390.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo" "$(DEPDIR)/libdrivers_a-ns8390.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns8390.c' object='libdrivers_a-ns8390.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns8390.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns8390.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns8390.o `test -f 'ns8390.c' || echo '$(srcdir)/'`ns8390.c
+ 
+ libdrivers_a-ns8390.obj: ns8390.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns8390.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns8390.Tpo" -c -o libdrivers_a-ns8390.obj `if test -f 'ns8390.c'; then $(CYGPATH_W) 'ns8390.c'; else $(CYGPATH_W) '$(srcdir)/ns8390.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo" "$(DEPDIR)/libdrivers_a-ns8390.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns8390.c' object='libdrivers_a-ns8390.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns8390.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns8390.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns8390.obj `if test -f 'ns8390.c'; then $(CYGPATH_W) 'ns8390.c'; else $(CYGPATH_W) '$(srcdir)/ns8390.c'; fi`
+ 
+-libdrivers_a-otulip.o: otulip.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-otulip.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-otulip.Tpo" -c -o libdrivers_a-otulip.o `test -f 'otulip.c' || echo '$(srcdir)/'`otulip.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-otulip.Tpo" "$(DEPDIR)/libdrivers_a-otulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-otulip.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='otulip.c' object='libdrivers_a-otulip.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-otulip.o `test -f 'otulip.c' || echo '$(srcdir)/'`otulip.c
+-
+-libdrivers_a-otulip.obj: otulip.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-otulip.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-otulip.Tpo" -c -o libdrivers_a-otulip.obj `if test -f 'otulip.c'; then $(CYGPATH_W) 'otulip.c'; else $(CYGPATH_W) '$(srcdir)/otulip.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-otulip.Tpo" "$(DEPDIR)/libdrivers_a-otulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-otulip.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='otulip.c' object='libdrivers_a-otulip.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-otulip.obj `if test -f 'otulip.c'; then $(CYGPATH_W) 'otulip.c'; else $(CYGPATH_W) '$(srcdir)/otulip.c'; fi`
++libdrivers_a-pcnet32.o: pcnet32.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pcnet32.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" -c -o libdrivers_a-pcnet32.o `test -f 'pcnet32.c' || echo '$(srcdir)/'`pcnet32.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" "$(DEPDIR)/libdrivers_a-pcnet32.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcnet32.c' object='libdrivers_a-pcnet32.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pcnet32.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pcnet32.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pcnet32.o `test -f 'pcnet32.c' || echo '$(srcdir)/'`pcnet32.c
++
++libdrivers_a-pcnet32.obj: pcnet32.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pcnet32.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" -c -o libdrivers_a-pcnet32.obj `if test -f 'pcnet32.c'; then $(CYGPATH_W) 'pcnet32.c'; else $(CYGPATH_W) '$(srcdir)/pcnet32.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" "$(DEPDIR)/libdrivers_a-pcnet32.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcnet32.c' object='libdrivers_a-pcnet32.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pcnet32.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pcnet32.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pcnet32.obj `if test -f 'pcnet32.c'; then $(CYGPATH_W) 'pcnet32.c'; else $(CYGPATH_W) '$(srcdir)/pcnet32.c'; fi`
+ 
+ libdrivers_a-rtl8139.o: rtl8139.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-rtl8139.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" -c -o libdrivers_a-rtl8139.o `test -f 'rtl8139.c' || echo '$(srcdir)/'`rtl8139.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" "$(DEPDIR)/libdrivers_a-rtl8139.Po"; else rm -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rtl8139.c' object='libdrivers_a-rtl8139.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-rtl8139.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-rtl8139.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-rtl8139.o `test -f 'rtl8139.c' || echo '$(srcdir)/'`rtl8139.c
+ 
+ libdrivers_a-rtl8139.obj: rtl8139.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-rtl8139.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" -c -o libdrivers_a-rtl8139.obj `if test -f 'rtl8139.c'; then $(CYGPATH_W) 'rtl8139.c'; else $(CYGPATH_W) '$(srcdir)/rtl8139.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" "$(DEPDIR)/libdrivers_a-rtl8139.Po"; else rm -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rtl8139.c' object='libdrivers_a-rtl8139.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-rtl8139.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-rtl8139.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-rtl8139.obj `if test -f 'rtl8139.c'; then $(CYGPATH_W) 'rtl8139.c'; else $(CYGPATH_W) '$(srcdir)/rtl8139.c'; fi`
+ 
+ libdrivers_a-sis900.o: sis900.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sis900.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-sis900.Tpo" -c -o libdrivers_a-sis900.o `test -f 'sis900.c' || echo '$(srcdir)/'`sis900.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sis900.Tpo" "$(DEPDIR)/libdrivers_a-sis900.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sis900.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sis900.c' object='libdrivers_a-sis900.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-sis900.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-sis900.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sis900.o `test -f 'sis900.c' || echo '$(srcdir)/'`sis900.c
+ 
+ libdrivers_a-sis900.obj: sis900.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sis900.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-sis900.Tpo" -c -o libdrivers_a-sis900.obj `if test -f 'sis900.c'; then $(CYGPATH_W) 'sis900.c'; else $(CYGPATH_W) '$(srcdir)/sis900.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sis900.Tpo" "$(DEPDIR)/libdrivers_a-sis900.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sis900.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sis900.c' object='libdrivers_a-sis900.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-sis900.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-sis900.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sis900.obj `if test -f 'sis900.c'; then $(CYGPATH_W) 'sis900.c'; else $(CYGPATH_W) '$(srcdir)/sis900.c'; fi`
+ 
+-libdrivers_a-sk_g16.o: sk_g16.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sk_g16.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" -c -o libdrivers_a-sk_g16.o `test -f 'sk_g16.c' || echo '$(srcdir)/'`sk_g16.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" "$(DEPDIR)/libdrivers_a-sk_g16.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sk_g16.c' object='libdrivers_a-sk_g16.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sk_g16.o `test -f 'sk_g16.c' || echo '$(srcdir)/'`sk_g16.c
+-
+-libdrivers_a-sk_g16.obj: sk_g16.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sk_g16.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" -c -o libdrivers_a-sk_g16.obj `if test -f 'sk_g16.c'; then $(CYGPATH_W) 'sk_g16.c'; else $(CYGPATH_W) '$(srcdir)/sk_g16.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" "$(DEPDIR)/libdrivers_a-sk_g16.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sk_g16.c' object='libdrivers_a-sk_g16.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sk_g16.obj `if test -f 'sk_g16.c'; then $(CYGPATH_W) 'sk_g16.c'; else $(CYGPATH_W) '$(srcdir)/sk_g16.c'; fi`
+-
+-libdrivers_a-smc9000.o: smc9000.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-smc9000.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-smc9000.Tpo" -c -o libdrivers_a-smc9000.o `test -f 'smc9000.c' || echo '$(srcdir)/'`smc9000.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo" "$(DEPDIR)/libdrivers_a-smc9000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smc9000.c' object='libdrivers_a-smc9000.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-smc9000.o `test -f 'smc9000.c' || echo '$(srcdir)/'`smc9000.c
+-
+-libdrivers_a-smc9000.obj: smc9000.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-smc9000.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-smc9000.Tpo" -c -o libdrivers_a-smc9000.obj `if test -f 'smc9000.c'; then $(CYGPATH_W) 'smc9000.c'; else $(CYGPATH_W) '$(srcdir)/smc9000.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo" "$(DEPDIR)/libdrivers_a-smc9000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smc9000.c' object='libdrivers_a-smc9000.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-smc9000.obj `if test -f 'smc9000.c'; then $(CYGPATH_W) 'smc9000.c'; else $(CYGPATH_W) '$(srcdir)/smc9000.c'; fi`
+-
+-libdrivers_a-tiara.o: tiara.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tiara.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tiara.Tpo" -c -o libdrivers_a-tiara.o `test -f 'tiara.c' || echo '$(srcdir)/'`tiara.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tiara.Tpo" "$(DEPDIR)/libdrivers_a-tiara.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tiara.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tiara.c' object='libdrivers_a-tiara.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tiara.o `test -f 'tiara.c' || echo '$(srcdir)/'`tiara.c
+-
+-libdrivers_a-tiara.obj: tiara.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tiara.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tiara.Tpo" -c -o libdrivers_a-tiara.obj `if test -f 'tiara.c'; then $(CYGPATH_W) 'tiara.c'; else $(CYGPATH_W) '$(srcdir)/tiara.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tiara.Tpo" "$(DEPDIR)/libdrivers_a-tiara.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tiara.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tiara.c' object='libdrivers_a-tiara.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tiara.obj `if test -f 'tiara.c'; then $(CYGPATH_W) 'tiara.c'; else $(CYGPATH_W) '$(srcdir)/tiara.c'; fi`
++libdrivers_a-tg3.o: tg3.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tg3.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tg3.Tpo" -c -o libdrivers_a-tg3.o `test -f 'tg3.c' || echo '$(srcdir)/'`tg3.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tg3.Tpo" "$(DEPDIR)/libdrivers_a-tg3.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tg3.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tg3.c' object='libdrivers_a-tg3.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tg3.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tg3.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tg3.o `test -f 'tg3.c' || echo '$(srcdir)/'`tg3.c
++
++libdrivers_a-tg3.obj: tg3.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tg3.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tg3.Tpo" -c -o libdrivers_a-tg3.obj `if test -f 'tg3.c'; then $(CYGPATH_W) 'tg3.c'; else $(CYGPATH_W) '$(srcdir)/tg3.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tg3.Tpo" "$(DEPDIR)/libdrivers_a-tg3.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tg3.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tg3.c' object='libdrivers_a-tg3.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tg3.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tg3.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tg3.obj `if test -f 'tg3.c'; then $(CYGPATH_W) 'tg3.c'; else $(CYGPATH_W) '$(srcdir)/tg3.c'; fi`
+ 
+ libdrivers_a-tlan.o: tlan.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tlan.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tlan.Tpo" -c -o libdrivers_a-tlan.o `test -f 'tlan.c' || echo '$(srcdir)/'`tlan.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tlan.Tpo" "$(DEPDIR)/libdrivers_a-tlan.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tlan.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tlan.c' object='libdrivers_a-tlan.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tlan.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tlan.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tlan.o `test -f 'tlan.c' || echo '$(srcdir)/'`tlan.c
+ 
+ libdrivers_a-tlan.obj: tlan.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tlan.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tlan.Tpo" -c -o libdrivers_a-tlan.obj `if test -f 'tlan.c'; then $(CYGPATH_W) 'tlan.c'; else $(CYGPATH_W) '$(srcdir)/tlan.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tlan.Tpo" "$(DEPDIR)/libdrivers_a-tlan.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tlan.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tlan.c' object='libdrivers_a-tlan.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tlan.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tlan.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tlan.obj `if test -f 'tlan.c'; then $(CYGPATH_W) 'tlan.c'; else $(CYGPATH_W) '$(srcdir)/tlan.c'; fi`
+ 
+ libdrivers_a-tulip.o: tulip.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tulip.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tulip.Tpo" -c -o libdrivers_a-tulip.o `test -f 'tulip.c' || echo '$(srcdir)/'`tulip.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tulip.Tpo" "$(DEPDIR)/libdrivers_a-tulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tulip.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tulip.c' object='libdrivers_a-tulip.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tulip.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tulip.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tulip.o `test -f 'tulip.c' || echo '$(srcdir)/'`tulip.c
+ 
+ libdrivers_a-tulip.obj: tulip.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tulip.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tulip.Tpo" -c -o libdrivers_a-tulip.obj `if test -f 'tulip.c'; then $(CYGPATH_W) 'tulip.c'; else $(CYGPATH_W) '$(srcdir)/tulip.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tulip.Tpo" "$(DEPDIR)/libdrivers_a-tulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tulip.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tulip.c' object='libdrivers_a-tulip.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tulip.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tulip.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tulip.obj `if test -f 'tulip.c'; then $(CYGPATH_W) 'tulip.c'; else $(CYGPATH_W) '$(srcdir)/tulip.c'; fi`
+ 
+ libdrivers_a-via-rhine.o: via-rhine.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-via-rhine.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" -c -o libdrivers_a-via-rhine.o `test -f 'via-rhine.c' || echo '$(srcdir)/'`via-rhine.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" "$(DEPDIR)/libdrivers_a-via-rhine.Po"; else rm -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='via-rhine.c' object='libdrivers_a-via-rhine.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-via-rhine.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-via-rhine.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-via-rhine.o `test -f 'via-rhine.c' || echo '$(srcdir)/'`via-rhine.c
+ 
+ libdrivers_a-via-rhine.obj: via-rhine.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-via-rhine.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" -c -o libdrivers_a-via-rhine.obj `if test -f 'via-rhine.c'; then $(CYGPATH_W) 'via-rhine.c'; else $(CYGPATH_W) '$(srcdir)/via-rhine.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" "$(DEPDIR)/libdrivers_a-via-rhine.Po"; else rm -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='via-rhine.c' object='libdrivers_a-via-rhine.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-via-rhine.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-via-rhine.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-via-rhine.obj `if test -f 'via-rhine.c'; then $(CYGPATH_W) 'via-rhine.c'; else $(CYGPATH_W) '$(srcdir)/via-rhine.c'; fi`
+ 
+ libdrivers_a-w89c840.o: w89c840.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-w89c840.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-w89c840.Tpo" -c -o libdrivers_a-w89c840.o `test -f 'w89c840.c' || echo '$(srcdir)/'`w89c840.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo" "$(DEPDIR)/libdrivers_a-w89c840.Po"; else rm -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='w89c840.c' object='libdrivers_a-w89c840.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-w89c840.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-w89c840.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-w89c840.o `test -f 'w89c840.c' || echo '$(srcdir)/'`w89c840.c
+ 
+ libdrivers_a-w89c840.obj: w89c840.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-w89c840.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-w89c840.Tpo" -c -o libdrivers_a-w89c840.obj `if test -f 'w89c840.c'; then $(CYGPATH_W) 'w89c840.c'; else $(CYGPATH_W) '$(srcdir)/w89c840.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo" "$(DEPDIR)/libdrivers_a-w89c840.Po"; else rm -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='w89c840.c' object='libdrivers_a-w89c840.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-w89c840.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-w89c840.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-w89c840.obj `if test -f 'w89c840.c'; then $(CYGPATH_W) 'w89c840.c'; else $(CYGPATH_W) '$(srcdir)/w89c840.c'; fi`
+-uninstall-info-am:
++
++libdrivers_a-r8169.o: r8169.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-r8169.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-r8169.Tpo" -c -o libdrivers_a-r8169.o `test -f 'r8169.c' || echo '$(srcdir)/'`r8169.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-r8169.Tpo" "$(DEPDIR)/libdrivers_a-r8169.Po"; else rm -f "$(DEPDIR)/libdrivers_a-r8169.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='r8169.c' object='libdrivers_a-r8169.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-r8169.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-r8169.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-r8169.o `test -f 'r8169.c' || echo '$(srcdir)/'`r8169.c
++
++libdrivers_a-r8169.obj: r8169.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-r8169.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-r8169.Tpo" -c -o libdrivers_a-r8169.obj `if test -f 'r8169.c'; then $(CYGPATH_W) 'r8169.c'; else $(CYGPATH_W) '$(srcdir)/r8169.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-r8169.Tpo" "$(DEPDIR)/libdrivers_a-r8169.Po"; else rm -f "$(DEPDIR)/libdrivers_a-r8169.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='r8169.c' object='libdrivers_a-r8169.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-r8169.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-r8169.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-r8169.obj `if test -f 'r8169.c'; then $(CYGPATH_W) 'r8169.c'; else $(CYGPATH_W) '$(srcdir)/r8169.c'; fi`
++
++libdrivers_a-forcedeth.o: forcedeth.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-forcedeth.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" -c -o libdrivers_a-forcedeth.o `test -f 'forcedeth.c' || echo '$(srcdir)/'`forcedeth.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" "$(DEPDIR)/libdrivers_a-forcedeth.Po"; else rm -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='forcedeth.c' object='libdrivers_a-forcedeth.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-forcedeth.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-forcedeth.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-forcedeth.o `test -f 'forcedeth.c' || echo '$(srcdir)/'`forcedeth.c
++
++libdrivers_a-forcedeth.obj: forcedeth.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-forcedeth.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" -c -o libdrivers_a-forcedeth.obj `if test -f 'forcedeth.c'; then $(CYGPATH_W) 'forcedeth.c'; else $(CYGPATH_W) '$(srcdir)/forcedeth.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" "$(DEPDIR)/libdrivers_a-forcedeth.Po"; else rm -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='forcedeth.c' object='libdrivers_a-forcedeth.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-forcedeth.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-forcedeth.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-forcedeth.obj `if test -f 'forcedeth.c'; then $(CYGPATH_W) 'forcedeth.c'; else $(CYGPATH_W) '$(srcdir)/forcedeth.c'; fi`
++
++libdrivers_a-ns83820.o: ns83820.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns83820.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns83820.Tpo" -c -o libdrivers_a-ns83820.o `test -f 'ns83820.c' || echo '$(srcdir)/'`ns83820.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo" "$(DEPDIR)/libdrivers_a-ns83820.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns83820.c' object='libdrivers_a-ns83820.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns83820.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns83820.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns83820.o `test -f 'ns83820.c' || echo '$(srcdir)/'`ns83820.c
++
++libdrivers_a-ns83820.obj: ns83820.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns83820.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns83820.Tpo" -c -o libdrivers_a-ns83820.obj `if test -f 'ns83820.c'; then $(CYGPATH_W) 'ns83820.c'; else $(CYGPATH_W) '$(srcdir)/ns83820.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo" "$(DEPDIR)/libdrivers_a-ns83820.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns83820.c' object='libdrivers_a-ns83820.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns83820.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns83820.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns83820.obj `if test -f 'ns83820.c'; then $(CYGPATH_W) 'ns83820.c'; else $(CYGPATH_W) '$(srcdir)/ns83820.c'; fi`
++
++libdrivers_a-pnic.o: pnic.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic.Tpo" -c -o libdrivers_a-pnic.o `test -f 'pnic.c' || echo '$(srcdir)/'`pnic.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic.Tpo" "$(DEPDIR)/libdrivers_a-pnic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic.c' object='libdrivers_a-pnic.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic.o `test -f 'pnic.c' || echo '$(srcdir)/'`pnic.c
++
++libdrivers_a-pnic.obj: pnic.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic.Tpo" -c -o libdrivers_a-pnic.obj `if test -f 'pnic.c'; then $(CYGPATH_W) 'pnic.c'; else $(CYGPATH_W) '$(srcdir)/pnic.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic.Tpo" "$(DEPDIR)/libdrivers_a-pnic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic.c' object='libdrivers_a-pnic.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic.obj `if test -f 'pnic.c'; then $(CYGPATH_W) 'pnic.c'; else $(CYGPATH_W) '$(srcdir)/pnic.c'; fi`
++
++libdrivers_a-pnic_api.o: pnic_api.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic_api.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" -c -o libdrivers_a-pnic_api.o `test -f 'pnic_api.c' || echo '$(srcdir)/'`pnic_api.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" "$(DEPDIR)/libdrivers_a-pnic_api.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic_api.c' object='libdrivers_a-pnic_api.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic_api.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic_api.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic_api.o `test -f 'pnic_api.c' || echo '$(srcdir)/'`pnic_api.c
++
++libdrivers_a-pnic_api.obj: pnic_api.c
++@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic_api.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" -c -o libdrivers_a-pnic_api.obj `if test -f 'pnic_api.c'; then $(CYGPATH_W) 'pnic_api.c'; else $(CYGPATH_W) '$(srcdir)/pnic_api.c'; fi`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" "$(DEPDIR)/libdrivers_a-pnic_api.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic_api.c' object='libdrivers_a-pnic_api.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic_api.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic_api.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic_api.obj `if test -f 'pnic_api.c'; then $(CYGPATH_W) 'pnic_api.c'; else $(CYGPATH_W) '$(srcdir)/pnic_api.c'; fi`
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -817,11 +927,9 @@
+ 	  done | \
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+-	  test -n "$$unique" || unique=$$empty_fix; \
+-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	    $$tags $$unique; \
+-	fi
++	test -z "$(ETAGS_ARGS)$$tags$$unique" \
++	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	     $$tags $$unique
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -895,7 +1003,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -962,10 +1070,10 @@
+ 
+ 
+ # Is it really necessary to specify dependecies explicitly?
+-$(3c509_drivers): 3c509.c 3c509.h
+-$(3c509_drivers): %.o: 3c509.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(3c509_drivers): 3c509.c 3c509.h
++#$(3c509_drivers): %.o: 3c509.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ $(3c595_drivers): 3c595.c 3c595.h
+ $(3c595_drivers): %.o: 3c595.c
+@@ -977,23 +1085,28 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(cs89x0_drivers): cs89x0.c cs89x0.h
+-$(cs89x0_drivers): %.o: cs89x0.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(cs89x0_drivers): cs89x0.c cs89x0.h
++#$(cs89x0_drivers): %.o: cs89x0.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ $(davicom_drivers): davicom.c
+ $(davicom_drivers): %.o: davicom.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(depca_drivers): depca.c
+-$(depca_drivers): %.o: depca.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(depca_drivers): depca.c
++#$(depca_drivers): %.o: depca.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(eepro_drivers): eepro.c
+-$(eepro_drivers): %.o: eepro.c
++#$(eepro_drivers): eepro.c
++#$(eepro_drivers): %.o: eepro.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(e1000_drivers): e1000.c e1000_hw.h
++$(e1000_drivers): %.o: e1000.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+@@ -1007,28 +1120,38 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
++$(forcedeth_drivers): forcedeth.c
++$(forcedeth_drivers): %.o: forcedeth.c
++	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
+ #$(fa311_drivers): fa311.c
+ #$(fa311_drivers): %.o: fa311.c
+ #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(i82586_drivers): i82586.c
+-$(i82586_drivers): %.o: i82586.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(i82586_drivers): i82586.c
++#$(i82586_drivers): %.o: i82586.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(lance_drivers): lance.c
+-$(lance_drivers): %.o: lance.c
+-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++#$(lance_drivers): lance.c
++#$(lance_drivers): %.o: lance.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+ $(natsemi_drivers): natsemi.c
+ $(natsemi_drivers): %.o: natsemi.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(ni5010_drivers): ni5010.c
+-$(ni5010_drivers): %.o: ni5010.c
++#$(ni5010_drivers): ni5010.c
++#$(ni5010_drivers): %.o: ni5010.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(ns83820_drivers): ns83820.c
++$(ns83820_drivers): %.o: ns83820.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+@@ -1037,41 +1160,62 @@
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(otulip_drivers): otulip.c otulip.h
+-$(otulip_drivers): %.o: otulip.c
++#$(otulip_drivers): otulip.c otulip.h
++#$(otulip_drivers): %.o: otulip.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++$(pcnet32_drivers): pcnet32.c
++$(pcnet32_drivers): %.o: pcnet32.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(rtl8139_drivers): rtl8139.c
+-$(rtl8139_drivers): %.o: rtl8139.c
++$(pnic_drivers): pnic.c
++$(pnic_drivers): %.o: pnic.c pnic_api.h
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(sis900_drivers): sis900.c
+-$(sis900_drivers): %.o: sis900.c sis900.h
++$(rtl8139_drivers): rtl8139.c
++$(rtl8139_drivers): %.o: rtl8139.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(sk_g16_drivers): sk_g16.c sk_g16.h
+-$(sk_g16_drivers): %.o: sk_g16.c
++$(r8169_drivers): r8169.c
++$(r8169_drivers): %.o: r8169.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(smc9000_drivers): smc9000.c smc9000.h
+-$(smc9000_drivers): %.o: smc9000.c
++$(sis900_drivers): sis900.c sis900.h
++$(sis900_drivers): %.o: sis900.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-$(tiara_drivers): tiara.c
+-$(tiara_drivers): %.o: tiara.c
++#$(sk_g16_drivers): sk_g16.c sk_g16.h
++#$(sk_g16_drivers): %.o: sk_g16.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++#$(smc9000_drivers): smc9000.c smc9000.h
++#$(smc9000_drivers): %.o: smc9000.c
++#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
++
++$(tg3_drivers): tg3.c tg3.h
++$(tg3_drivers): %.o: tg3.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
+-#$(tlan_drivers): tlan.c
+-#$(tlan_drivers): %.o: tlan.c
++#$(tiara_drivers): tiara.c
++#$(tiara_drivers): %.o: tiara.c
+ #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+ #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+ 
++$(tlan_drivers): tlan.c tlan.h
++$(tlan_drivers): %.o: tlan.c
++	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
++
+ $(tulip_drivers): tulip.c
+ $(tulip_drivers): %.o: tulip.c
+ 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+diff -Naur grub-0.97.orig/netboot/basemem.c grub-0.97/netboot/basemem.c
+--- grub-0.97.orig/netboot/basemem.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/basemem.c	2005-08-31 19:24:28.000000000 +0000
+@@ -0,0 +1,178 @@
++#include "etherboot.h"
++#define DEBUG_BASEMEM
++/* Routines to allocate base memory in a BIOS-compatible way, by
++ * updating the Free Base Memory Size counter at 40:13h.
++ *
++ * Michael Brown <mbrown@fensystems.co.uk> (mcb30)
++ * $Id: grub-0.95-diskless-patch-2-undi.patch,v 1.1.1.1 2005/06/14 08:18:50 wesolows Exp $
++ */
++
++#define fbms ( ( uint16_t * ) phys_to_virt ( 0x413 ) )
++#define BASE_MEMORY_MAX ( 640 )
++#define FREE_BLOCK_MAGIC ( ('!'<<0) + ('F'<<8) + ('R'<<16) + ('E'<<24) )
++
++typedef struct free_base_memory_block {
++	uint32_t	magic;
++	uint16_t	size_kb;
++} free_base_memory_block_t;
++
++/* Return amount of free base memory in bytes
++ */
++
++uint32_t get_free_base_memory ( void ) {
++	return *fbms << 10;
++}
++
++/* Adjust the real mode stack pointer.  We keep the real mode stack at
++ * the top of free base memory, rather than allocating space for it.
++ */
++
++inline void adjust_real_mode_stack ( void ) {
++/*  	real_mode_stack = ( *fbms << 10 ); */
++}
++
++/* Allocate N bytes of base memory.  Amount allocated will be rounded
++ * up to the nearest kB, since that's the granularity of the BIOS FBMS
++ * counter.  Returns NULL if memory cannot be allocated.
++ */
++
++void * allot_base_memory ( size_t size ) {
++	uint16_t size_kb = ( size + 1023 ) >> 10;
++	void *ptr = NULL;
++
++#ifdef DEBUG_BASEMEM
++	printf ( "Trying to allocate %d kB of base memory, %d kB free\n",
++		 size_kb, *fbms );
++#endif
++
++	/* Free up any unused memory before we start */
++	free_unused_base_memory();
++
++	/* Check available base memory */
++	if ( size_kb > *fbms ) { return NULL; }
++
++	/* Reduce available base memory */
++	*fbms -= size_kb;
++
++	/* Calculate address of memory allocated */
++	ptr = phys_to_virt ( *fbms << 10 );
++
++#ifdef DEBUG_BASEMEM
++	/* Zero out memory.  We do this so that allocation of
++	 * already-used space will show up in the form of a crash as
++	 * soon as possible.
++	 */
++	memset ( ptr, 0, size_kb << 10 );
++#endif
++
++	/* Adjust real mode stack pointer */
++	adjust_real_mode_stack ();
++
++	return ptr;
++}
++
++/* Free base memory allocated by allot_base_memory.  The BIOS provides
++ * nothing better than a LIFO mechanism for freeing memory (i.e. it
++ * just has the single "total free memory" counter), but we improve
++ * upon this slightly; as long as you free all the allotted blocks, it
++ * doesn't matter what order you free them in.  (This will only work
++ * for blocks that are freed via forget_base_memory()).
++ *
++ * Yes, it's annoying that you have to remember the size of the blocks
++ * you've allotted.  However, since our granularity of allocation is
++ * 1K, the alternative is to risk wasting the occasional kB of base
++ * memory, which is a Bad Thing.  Really, you should be using as
++ * little base memory as possible, so consider the awkwardness of the
++ * API to be a feature! :-)
++ */
++
++void forget_base_memory ( void *ptr, size_t size ) {
++	uint16_t remainder = virt_to_phys(ptr) & 1023;
++	uint16_t size_kb = ( size + remainder + 1023 ) >> 10;
++	free_base_memory_block_t *free_block =
++		( free_base_memory_block_t * ) ( ptr - remainder );
++	
++	if ( ( ptr == NULL ) || ( size == 0 ) ) { return; }
++
++#ifdef DEBUG_BASEMEM
++	printf ( "Trying to free %d bytes base memory at 0x%x\n",
++		 size, virt_to_phys ( ptr ) );
++	if ( remainder > 0 ) {
++		printf ( "WARNING: destructively expanding free block "
++			 "downwards to 0x%x\n",
++			 virt_to_phys ( ptr - remainder ) );
++	}
++#endif
++
++	/* Mark every kilobyte within this block as free.  This is
++	 * overkill for normal purposes, but helps when something has
++	 * allocated base memory with a granularity finer than the
++	 * BIOS granularity of 1kB.  PXE ROMs tend to do this when
++	 * they allocate their own memory.  This method allows us to
++	 * free their blocks (admittedly in a rather dangerous,
++	 * tread-on-anything-either-side sort of way, but there's no
++	 * other way to do it).
++	 *
++	 * Since we're marking every kB as free, there's actually no
++	 * need for recording the size of the blocks.  However, we
++	 * keep this in so that debug messages are friendlier.  It
++	 * probably adds around 8 bytes to the overall code size.
++	 */
++	while ( size_kb > 0 ) {
++		/* Mark this block as unused */
++		free_block->magic = FREE_BLOCK_MAGIC;
++		free_block->size_kb = size_kb;
++		/* Move up by 1 kB */
++		(void *)(free_block += ( 1 << 10 ));
++		size_kb--;
++	}
++
++	/* Free up unused base memory */
++	free_unused_base_memory();
++}
++
++/* Do the actual freeing of memory.  This is split out from
++ * forget_base_memory() so that it may be called separately.  It
++ * should be called whenever base memory is deallocated by an external
++ * entity (if we can detect that it has done so) so that we get the
++ * chance to free up our own blocks.
++ */
++void free_unused_base_memory ( void ) {
++	free_base_memory_block_t *free_block = NULL;
++
++	/* Try to release memory back to the BIOS.  Free all
++	 * consecutive blocks marked as free.
++	 */
++	while ( 1 ) {
++		/* Calculate address of next potential free block */
++		free_block = ( free_base_memory_block_t * )
++			phys_to_virt ( *fbms << 10 );
++		
++		/* Stop processing if we're all the way up to 640K or
++		 * if this is not a free block
++		 */
++		if ( ( *fbms == BASE_MEMORY_MAX ) ||
++		     ( free_block->magic != FREE_BLOCK_MAGIC ) ) {
++			break;
++		}
++
++		/* Return memory to BIOS */
++		*fbms += free_block->size_kb;
++
++#ifdef DEBUG_BASEMEM
++		printf ( "Freed %d kB base memory, %d kB now free\n",
++			 free_block->size_kb, *fbms );
++		
++		/* Zero out freed block.  We do this in case
++		 * the block contained any structures that
++		 * might be located by scanning through
++		 * memory.
++		 */
++		memset ( free_block, 0, free_block->size_kb << 10 );
++#endif			
++	}
++
++	/* Adjust real mode stack pointer */
++	adjust_real_mode_stack ();
++}
++
+diff -Naur grub-0.97.orig/netboot/big_bswap.h grub-0.97/netboot/big_bswap.h
+--- grub-0.97.orig/netboot/big_bswap.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/big_bswap.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef ETHERBOOT_BIG_BSWAP_H
++#define ETHERBOOT_BIG_BSWAP_H
++
++#define ntohl(x) 	(x)
++#define htonl(x) 	(x)
++#define ntohs(x) 	(x)
++#define htons(x) 	(x)
++#define cpu_to_le32(x)	__bswap_32(x)
++#define cpu_to_le16(x)	__bswap_16(x)
++#define cpu_to_be32(x)	(x)
++#define cpu_to_be16(x)	(x)
++#define le32_to_cpu(x)	__bswap_32(x)
++#define le16_to_cpu(x)	__bswap_16(x)
++#define be32_to_cpu(x)	(x)
++#define be16_to_cpu(x)	(x)
++
++#endif /* ETHERBOOT_BIG_BSWAP_H */
+diff -Naur grub-0.97.orig/netboot/bootp.h grub-0.97/netboot/bootp.h
+--- grub-0.97.orig/netboot/bootp.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/bootp.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,182 @@
++#ifndef	_BOOTP_H
++#define	_BOOTP_H
++
++#include "if_ether.h"
++#include "ip.h"
++#include "udp.h"
++
++#ifndef	MAX_BOOTP_RETRIES
++#define MAX_BOOTP_RETRIES	20
++#endif
++
++#ifdef	ALTERNATE_DHCP_PORTS_1067_1068
++#undef	NON_STANDARD_BOOTP_SERVER
++#define	NON_STANDARD_BOOTP_SERVER	1067
++#undef	NON_STANDARD_BOOTP_CLIENT
++#define	NON_STANDARD_BOOTP_CLIENT	1068
++#endif
++
++#ifdef	NON_STANDARD_BOOTP_SERVER
++#define	BOOTP_SERVER	NON_STANDARD_BOOTP_SERVER
++#else
++#define BOOTP_SERVER	67
++#endif
++#ifdef	NON_STANDARD_BOOTP_CLIENT
++#define	BOOTP_CLIENT	NON_STANDARD_BOOTP_CLIENT
++#else
++#define BOOTP_CLIENT	68
++#endif
++
++#define BOOTP_REQUEST	1
++#define BOOTP_REPLY	2
++
++#define TAG_LEN(p)		(*((p)+1))
++#define RFC1533_COOKIE		99, 130, 83, 99
++#define RFC1533_PAD		0
++#define RFC1533_NETMASK		1
++#define RFC1533_TIMEOFFSET	2
++#define RFC1533_GATEWAY		3
++#define RFC1533_TIMESERVER	4
++#define RFC1533_IEN116NS	5
++#define RFC1533_DNS		6
++#define RFC1533_LOGSERVER	7
++#define RFC1533_COOKIESERVER	8
++#define RFC1533_LPRSERVER	9
++#define RFC1533_IMPRESSSERVER	10
++#define RFC1533_RESOURCESERVER	11
++#define RFC1533_HOSTNAME	12
++#define RFC1533_BOOTFILESIZE	13
++#define RFC1533_MERITDUMPFILE	14
++#define RFC1533_DOMAINNAME	15
++#define RFC1533_SWAPSERVER	16
++#define RFC1533_ROOTPATH	17
++#define RFC1533_EXTENSIONPATH	18
++#define RFC1533_IPFORWARDING	19
++#define RFC1533_IPSOURCEROUTING	20
++#define RFC1533_IPPOLICYFILTER	21
++#define RFC1533_IPMAXREASSEMBLY	22
++#define RFC1533_IPTTL		23
++#define RFC1533_IPMTU		24
++#define RFC1533_IPMTUPLATEAU	25
++#define RFC1533_INTMTU		26
++#define RFC1533_INTLOCALSUBNETS	27
++#define RFC1533_INTBROADCAST	28
++#define RFC1533_INTICMPDISCOVER	29
++#define RFC1533_INTICMPRESPOND	30
++#define RFC1533_INTROUTEDISCOVER 31
++#define RFC1533_INTROUTESOLICIT	32
++#define RFC1533_INTSTATICROUTES	33
++#define RFC1533_LLTRAILERENCAP	34
++#define RFC1533_LLARPCACHETMO	35
++#define RFC1533_LLETHERNETENCAP	36
++#define RFC1533_TCPTTL		37
++#define RFC1533_TCPKEEPALIVETMO	38
++#define RFC1533_TCPKEEPALIVEGB	39
++#define RFC1533_NISDOMAIN	40
++#define RFC1533_NISSERVER	41
++#define RFC1533_NTPSERVER	42
++#define RFC1533_VENDOR		43
++#define RFC1533_NBNS		44
++#define RFC1533_NBDD		45
++#define RFC1533_NBNT		46
++#define RFC1533_NBSCOPE		47
++#define RFC1533_XFS		48
++#define RFC1533_XDM		49
++#ifndef	NO_DHCP_SUPPORT
++#define RFC2132_REQ_ADDR	50
++#define RFC2132_MSG_TYPE	53
++#define RFC2132_SRV_ID		54
++#define RFC2132_PARAM_LIST	55
++#define RFC2132_MAX_SIZE	57
++#define	RFC2132_VENDOR_CLASS_ID	60
++
++#define DHCPDISCOVER		1
++#define DHCPOFFER		2
++#define DHCPREQUEST		3
++#define DHCPACK			5
++#endif	/* NO_DHCP_SUPPORT */
++
++#define RFC1533_VENDOR_MAJOR	0
++#define RFC1533_VENDOR_MINOR	0
++
++#define RFC1533_VENDOR_MAGIC	128
++#define RFC1533_VENDOR_ADDPARM	129
++#define	RFC1533_VENDOR_ETHDEV	130
++#ifdef	IMAGE_FREEBSD
++#define RFC1533_VENDOR_HOWTO    132
++#define RFC1533_VENDOR_KERNEL_ENV    133
++#endif
++#define RFC1533_VENDOR_ETHERBOOT_ENCAP 150
++#define RFC1533_VENDOR_MNUOPTS	160
++#define RFC1533_VENDOR_NIC_DEV_ID 175
++#define RFC1533_VENDOR_SELECTION 176
++#define RFC1533_VENDOR_ARCH     177
++#define RFC1533_VENDOR_MOTD	184
++#define RFC1533_VENDOR_NUMOFMOTD 8
++#define RFC1533_VENDOR_IMG	192
++#define RFC1533_VENDOR_NUMOFIMG	16
++
++#define RFC1533_VENDOR_CONFIGFILE 150
++
++#define RFC1533_END		255
++
++#define BOOTP_VENDOR_LEN	64
++
++#define DHCP_OPT_LEN		312
++
++/* Format of a bootp packet */
++struct bootp_t {
++	uint8_t  bp_op;
++	uint8_t  bp_htype;
++	uint8_t  bp_hlen;
++	uint8_t  bp_hops;
++	uint32_t bp_xid;
++	uint16_t bp_secs;
++	uint16_t unused;
++	in_addr bp_ciaddr;
++	in_addr bp_yiaddr;
++	in_addr bp_siaddr;
++	in_addr bp_giaddr;
++	uint8_t  bp_hwaddr[16];
++	uint8_t  bp_sname[64];
++	char     bp_file[128];
++	uint8_t  bp_vend[BOOTP_VENDOR_LEN];
++};
++
++struct dhcp_t {
++	uint8_t  bp_op;
++	uint8_t  bp_htype;
++	uint8_t  bp_hlen;
++	uint8_t  bp_hops;
++	uint32_t bp_xid;
++	uint16_t bp_secs;
++	uint16_t bp_flag;
++	in_addr bp_ciaddr;
++	in_addr bp_yiaddr;
++	in_addr bp_siaddr;
++	in_addr bp_giaddr;
++	uint8_t  bp_hwaddr[16];
++	uint8_t  bp_sname[64];
++	char     bp_file[128];
++	uint8_t  bp_vend[DHCP_OPT_LEN];
++};
++
++/* Format of a bootp IP packet */
++struct bootpip_t
++{
++	struct iphdr ip;
++	struct udphdr udp;
++	struct bootp_t bp;
++};
++struct dhcpip_t
++{
++	struct iphdr ip;
++	struct udphdr udp;
++	struct dhcp_t bp;
++};
++
++#define MAX_RFC1533_VENDLEN (ETH_MAX_MTU - sizeof(struct bootpip_t) + BOOTP_VENDOR_LEN)
++
++#define BOOTP_DATA_ADDR (&bootp_data)
++
++#endif	/* _BOOTP_H */
+diff -Naur grub-0.97.orig/netboot/byteswap.h grub-0.97/netboot/byteswap.h
+--- grub-0.97.orig/netboot/byteswap.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/byteswap.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,20 @@
++#ifndef ETHERBOOT_BYTESWAP_H
++#define ETHERBOOT_BYTESWAP_H
++
++#include "endian.h"
++#include "i386_byteswap.h"
++
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#include "little_bswap.h"
++#endif
++#if __BYTE_ORDER == __BIG_ENDIAN
++#include "big_bswap.h"
++#endif
++
++/* Make routines available to all */
++#define swap32(x)	__bswap_32(x)
++#define swap16(x)	__bswap_16(x)
++#define bswap_32(x)	__bswap_32(x)
++#define bswap_16(x)	__bswap_16(x)
++	
++#endif /* ETHERBOOT_BYTESWAP_H */
+diff -Naur grub-0.97.orig/netboot/cards.h grub-0.97/netboot/cards.h
+--- grub-0.97.orig/netboot/cards.h	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/cards.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,183 +0,0 @@
+-#ifndef	CARDS_H
+-#define CARDS_H
+-
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+-#include "nic.h"
+-
+-/* OK, this is how the PCI support hack works:  if pci.h is included before
+- * this file is included, assume that the driver supports PCI.  This means that
+- * this file is usually included last.  */
+-
+-#ifdef	PCI_H
+-#define PCI_ARG(x) ,x
+-#else
+-#define PCI_ARG(x)
+-#endif
+-
+-#ifdef	INCLUDE_WD
+-extern struct nic	*wd_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_3C503
+-extern struct nic	*t503_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_VIA_RHINE
+-extern struct nic	*rhine_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NE
+-extern struct nic	*ne_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NS8390
+-extern struct nic	*nepci_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_3C509
+-extern struct nic	*t509_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_3C529
+-extern struct nic	*t529_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_3C595
+-extern struct nic	*t595_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_3C90X
+-extern struct nic	*a3c90x_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_EEPRO
+-extern struct nic	*eepro_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_EEPRO100
+-extern struct nic	*eepro100_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_EPIC100
+-extern struct nic	*epic100_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_OTULIP
+-extern struct nic	*otulip_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_TULIP
+-extern struct nic	*tulip_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_DAVICOM
+-extern struct nic	*davicom_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_CS89X0
+-extern struct nic	*cs89x0_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_LANCE
+-extern struct nic	*lancepci_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NE2100
+-extern struct nic	*ne2100_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NI6510
+-extern struct nic	*ni6510_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_SK_G16
+-extern struct nic	*SK_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_3C507
+-extern struct nic	*t507_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NI5010
+-extern struct nic	*ni5010_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NI5210
+-extern struct nic	*ni5210_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_EXOS205
+-extern struct nic	*exos205_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_SMC9000
+-extern struct nic	*smc9000_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_TIARA
+-extern struct nic	*tiara_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_DEPCA
+-extern struct nic	*depca_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_RTL8139
+-extern struct nic	*rtl8139_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_W89C840
+-extern struct nic	*w89c840_probe(struct nic *, unsigned short *
+-	PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_SIS900
+-extern struct nic	*sis900_probe(struct nic *, unsigned short *
+-        PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_NATSEMI
+-extern struct nic	*natsemi_probe(struct nic *, unsigned short *
+-        PCI_ARG(struct pci_device *));
+-#endif
+-
+-#ifdef	INCLUDE_TLAN
+-extern struct nic	*tlan_probe(struct nic *, unsigned short *
+-        PCI_ARG(struct pci_device *));
+-#endif
+-
+-#endif	/* CARDS_H */
+diff -Naur grub-0.97.orig/netboot/config.c grub-0.97/netboot/config.c
+--- grub-0.97.orig/netboot/config.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/config.c	2005-08-31 19:03:35.000000000 +0000
+@@ -1,598 +1,165 @@
+ /*
+- *  GRUB  --  GRand Unified Bootloader
+- *  Copyright (C) 2001,2002  Free Software Foundation, Inc.
+- *
+- *  This program is free software; you can redistribute it and/or modify
+- *  it under the terms of the GNU General Public License as published by
+- *  the Free Software Foundation; either version 2 of the License, or
+- *  (at your option) any later version.
+- *
+- *  This program is distributed in the hope that it will be useful,
+- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- *  GNU General Public License for more details.
+- *
+- *  You should have received a copy of the GNU General Public License
+- *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-/* Based on "src/config.c" in etherboot-5.0.5.  */
+-
+-/*
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License as
+  * published by the Free Software Foundation; either version 2, or (at
+  * your option) any later version.
+  */
+ 
+-#define GRUB	1
+-#include <etherboot.h>
+-#include <nic.h>
++#include	"grub.h"
++#include	"pci.h"
++#include	"isa.h"
++#include	"nic.h"
+ 
+-#undef	INCLUDE_PCI
+-#if	defined(INCLUDE_NS8390) || defined(INCLUDE_EEPRO100) || defined(INCLUDE_LANCE) || defined(INCLUDE_EPIC100) || defined(INCLUDE_TULIP) || defined(INCLUDE_OTULIP) || defined(INCLUDE_3C90X) ||  defined(INCLUDE_3C595) || defined(INCLUDE_RTL8139) || defined(INCLUDE_VIA_RHINE) || defined(INCLUDE_W89C840) || defined(INCLUDE_DAVICOM) || defined(INCLUDE_SIS900) || defined(INCLUDE_NATSEMI) || defined(INCLUDE_TLAN)
+-	/* || others later */
+-# define INCLUDE_PCI
+-# include <pci.h>
+-static unsigned short pci_ioaddrs[16];
+-
+-static struct pci_device pci_nic_list[] =
++#ifdef CONFIG_PCI
++static int pci_probe(struct dev *dev, const char *type_name)
+ {
+-#ifdef	INCLUDE_NS8390
+-  { PCI_VENDOR_ID_REALTEK,	PCI_DEVICE_ID_REALTEK_8029,
+-    "Realtek 8029", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_WINBOND2,	PCI_DEVICE_ID_WINBOND2_89C940,
+-    "Winbond NE2000-PCI", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_COMPEX,	PCI_DEVICE_ID_COMPEX_RL2000,
+-    "Compex ReadyLink 2000", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_KTI,		PCI_DEVICE_ID_KTI_ET32P2,
+-    "KTI ET32P2", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_NETVIN,	PCI_DEVICE_ID_NETVIN_NV5000SC,
+-    "NetVin NV5000SC", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_HOLTEK,	PCI_DEVICE_ID_HOLTEK_HT80232,
+-    "Holtek HT80232", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_3C90X
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900TPO,
+-    "3Com900-TPO", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900COMBO,
+-    "3Com900-Combo", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905TX,
+-    "3Com905-TX", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905T4,
+-    "3Com905-T4", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9004,
+-    "3Com900B-TPO", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9005,
+-    "3Com900B-Combo", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9006,
+-    "3Com900B-2/T", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x900A,
+-    "3Com900B-FL", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905B_TX,
+-    "3Com905B-TX", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9056,
+-    "3Com905B-T4", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x905A,
+-    "3Com905B-FL", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905C_TXM,
+-    "3Com905C-TXM", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9800,
+-    "3Com980-Cyclone", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9805,
+-    "3Com9805", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x7646,
+-    "3CSOHO100-TX", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_3C595
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C590,
+-    "3Com590", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C595,
+-    "3Com595", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C595_1,
+-    "3Com595", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C595_2,
+-    "3Com595", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900TPO,
+-    "3Com900-TPO", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900COMBO,
+-    "3Com900-Combo", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9004,
+-    "3Com900B-TPO", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9005,
+-    "3Com900B-Combo", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9006,
+-    "3Com900B-2/T", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x900A,
+-    "3Com900B-FL", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9800,
+-    "3Com980-Cyclone", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x9805,
+-    "3Com9805", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_3COM,		0x7646,
+-    "3CSOHO100-TX", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_EEPRO100
+-  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82557,
+-    "Intel EtherExpressPro100", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82559ER,
+-    "Intel EtherExpressPro100 82559ER", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ID1029,
+-    "Intel EtherExpressPro100 ID1029", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ID1030,
+-    "Intel Corporation 82559 InBusiness 10/100", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82562,
+-    "Intel EtherExpressPro100 82562EM", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_EPIC100
+-  { PCI_VENDOR_ID_SMC,		PCI_DEVICE_ID_SMC_EPIC100,
+-    "SMC EtherPowerII", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_LANCE
+-  { PCI_VENDOR_ID_AMD,		PCI_DEVICE_ID_AMD_LANCE,
+-    "AMD Lance/PCI", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_AMD_HOMEPNA,	PCI_DEVICE_ID_AMD_HOMEPNA,
+-    "AMD Lance/HomePNA", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_RTL8139
+-  { PCI_VENDOR_ID_REALTEK,	PCI_DEVICE_ID_REALTEK_8139,
+-    "Realtek 8139", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DLINK,	PCI_DEVICE_ID_DFE530TXP,
+-    "DFE530TX+/DFE538TX", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_SMC_1211,	PCI_DEVICE_ID_SMC_1211,
+-    "SMC EZ10/100", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_OTULIP
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP,
+-    "Digital Tulip", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_FAST,
+-    "Digital Tulip Fast", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_PLUS,
+-    "Digital Tulip+", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_21142,
+-    "Digital Tulip 21142", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_TULIP
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP,
+-    "Digital Tulip", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_FAST,
+-    "Digital Tulip Fast", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_PLUS,
+-    "Digital Tulip+", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_21142,
+-    "Digital Tulip 21142", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_MACRONIX,	PCI_DEVICE_ID_MX987x5,
+-    "Macronix MX987x5", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_LINKSYS,	PCI_DEVICE_ID_LC82C115,
+-    "LinkSys LNE100TX", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_LINKSYS,	PCI_DEVICE_ID_DEC_TULIP,
+-    "Netgear FA310TX", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9102,
+-    "Davicom 9102", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9009,
+-    "Davicom 9009", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_ADMTEK,	PCI_DEVICE_ID_ADMTEK_0985,
+-    "ADMtek Centaur-P", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_ADMTEK,	0x0981,
+-    "ADMtek AN981 Comet", 0, 0, 0, 0},
+-  { 0x125B,			0x1400,
+-    "ASIX AX88140", 0, 0, 0, 0 },
+-  { 0x11F6,			0x9881,
+-    "Compex RL100-TX", 0, 0, 0, 0 },
+-#endif
+-#ifdef	INCLUDE_DAVICOM
+-  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9102,
+-    "Davicom 9102", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9009,
+-    "Davicom 9009", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_VIA_RHINE
+-  { PCI_VENDOR_ID_VIATEC,	PCI_DEVICE_ID_VIA_VT6102,
+-    "VIA 6102", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_VIATEC,	PCI_DEVICE_ID_VIA_RHINE_I,
+-    "VIA 3043", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_VIATEC,	PCI_DEVICE_ID_VIA_86C100A,
+-    "VIA 86C100A", 0, 0, 0, 0},
+-#endif
+-#ifdef	INCLUDE_W89C840
+-  { PCI_VENDOR_ID_WINBOND2,	PCI_DEVICE_ID_WINBOND2_89C840,
+-    "Winbond W89C840F", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_COMPEX,	PCI_DEVICE_ID_COMPEX_RL100ATX,
+-    "Compex RL100ATX", 0, 0, 0, 0},
+-#endif
+-#ifdef INCLUDE_SIS900
+-  { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS900,
+-    "SIS900", 0, 0, 0, 0},
+-  { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS7016,
+-    "SIS7016", 0, 0, 0, 0},
+-#endif
+-  
+-#ifdef INCLUDE_NATSEMI
+-  { PCI_VENDOR_ID_NS,	     	PCI_DEVICE_ID_DP83815,
+-    "DP83815", 0, 0, 0, 0},
+-#endif
+-  
+-#ifdef INCLUDE_TLAN
+-  { PCI_VENDOR_ID_OLICOM,	PCI_DEVICE_ID_OLICOM_OC2326,
+-    "OC2326", 0, 0, 0, 0},
++/*
++ *	NIC probing is in pci device order, followed by the 
++ *      link order of the drivers.  A driver that matches 
++ *      on vendor and device id will supersede a driver
++ *      that matches on pci class.
++ *
++ *	If you want to probe for another device behind the same pci
++ *      device just increment index.  And the previous probe call
++ *      will be repeated.
++ */
++	struct pci_probe_state *state = &dev->state.pci;
++	printf("Probing pci %s...\n", type_name);
++	if (dev->how_probe == PROBE_FIRST) {
++		state->advance    = 1;
++		state->dev.driver = 0;
++		state->dev.bus    = 0;
++		state->dev.devfn  = 0;
++		dev->index        = -1;
++	}
++	for(;;) {
++		if ((dev->how_probe != PROBE_AWAKE) && state->advance) {
++			find_pci(dev->type, &state->dev);
++			dev->index = -1;
++		}
++		state->advance = 1;
++		
++		if (state->dev.driver == 0)
++			break;
++		
++#if 0
++		/* FIXME the romaddr code needs a total rethought to be useful */
++		if (state->dev.romaddr != ((unsigned long) rom.rom_segment << 4)) {
++			continue;
++		}
++#endif
++		if (dev->how_probe != PROBE_AWAKE) {
++			dev->type_index++;
++		}
++		dev->devid.bus_type = PCI_BUS_TYPE;
++		dev->devid.vendor_id = htons(state->dev.vendor);
++		dev->devid.device_id = htons(state->dev.dev_id);
++		/* FIXME how do I handle dev->index + PROBE_AGAIN?? */
++		
++		printf("[%s]", state->dev.name);
++		if (state->dev.driver->probe(dev, &state->dev)) {
++			state->advance = (dev->index == -1);
++			return PROBE_WORKED;
++		}
++		putchar('\n');
++	}
++	return PROBE_FAILED;
++}
+ #endif
+ 
+-  /* other PCI NICs go here */
+-  {0, 0, NULL, 0, 0, 0, 0}
+-};
+-#endif	/* INCLUDE_*PCI */
+-
+-#include <cards.h>
+-
+-#ifdef INCLUDE_PCI
+-struct pci_dispatch_table
++#ifdef CONFIG_ISA
++static int isa_probe(struct dev *dev, const char *type_name)
+ {
+-  unsigned short vendor;
+-  unsigned short dev_id;
+-  struct nic *(*eth_probe) (struct nic *, unsigned short *,
+-			    struct pci_device *);
+-};
+-
+-static struct pci_dispatch_table PCI_NIC[] =
+-{
+-# ifdef INCLUDE_NS8390
+-  { PCI_VENDOR_ID_REALTEK,  PCI_DEVICE_ID_REALTEK_8029,    nepci_probe },
+-  { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940, nepci_probe },
+-  { PCI_VENDOR_ID_COMPEX,   PCI_DEVICE_ID_COMPEX_RL2000,   nepci_probe },
+-  { PCI_VENDOR_ID_KTI,      PCI_DEVICE_ID_KTI_ET32P2,      nepci_probe },
+-  { PCI_VENDOR_ID_NETVIN,   PCI_DEVICE_ID_NETVIN_NV5000SC, nepci_probe },
+-  { PCI_VENDOR_ID_HOLTEK,   PCI_DEVICE_ID_HOLTEK_HT80232,  nepci_probe },
+-# endif /* INCLUDE_NS8390 */
+-# ifdef INCLUDE_3C90X
+-  { PCI_VENDOR_ID_3COM,	    PCI_DEVICE_ID_3COM_3C900TPO,   a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C900COMBO, a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905TX,    a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905T4,    a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9004,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9005,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9006,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x900A,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905B_TX,  a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9056,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x905A,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905C_TXM, a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9800,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9805,                        a3c90x_probe },
+-  { PCI_VENDOR_ID_3COM,     0x7646,                        a3c90x_probe },
+-# endif /* INCLUDE_3C90X */
+-# ifdef	INCLUDE_3C595
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C590,      t595_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C595,      t595_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C595_1,    t595_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C595_2,    t595_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C900TPO,   t595_probe },
+-  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C900COMBO, t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9004,                        t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9005,                        t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9006,                        t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x900A,                        t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9800,                        t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x9805,                        t595_probe },
+-  { PCI_VENDOR_ID_3COM,     0x7646,                        t595_probe },
+-# endif /* INCLUDE_3C595 */
+-# ifdef	INCLUDE_EEPRO100
+-  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82557,     eepro100_probe },
+-  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82559ER,   eepro100_probe },
+-  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_ID1029,    eepro100_probe },
+-  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_ID1030,    eepro100_probe },
+-  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82562,     eepro100_probe },
+-# endif /* INCLUDE_EEPRO100 */
+-# ifdef	INCLUDE_EPIC100
+-  { PCI_VENDOR_ID_SMC,      PCI_DEVICE_ID_SMC_EPIC100,     epic100_probe },
+-# endif /* INCLUDE_EPIC100 */
+-# ifdef	INCLUDE_LANCE
+-  { PCI_VENDOR_ID_AMD,      PCI_DEVICE_ID_AMD_LANCE,       lancepci_probe },
+-  { PCI_VENDOR_ID_AMD_HOMEPNA, PCI_DEVICE_ID_AMD_HOMEPNA,  lancepci_probe },
+-# endif /* INCLUDE_LANCE */
+-# ifdef	INCLUDE_RTL8139
+-  { PCI_VENDOR_ID_REALTEK,  PCI_DEVICE_ID_REALTEK_8139,    rtl8139_probe },
+-  { PCI_VENDOR_ID_DLINK,    PCI_DEVICE_ID_DFE530TXP,       rtl8139_probe },
+-  { PCI_VENDOR_ID_SMC_1211, PCI_DEVICE_ID_SMC_1211,        rtl8139_probe },
+-# endif /* INCLUDE_RTL8139 */
+-# ifdef	INCLUDE_OTULIP
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP,       otulip_probe },
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_FAST,  otulip_probe },
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_PLUS,  otulip_probe },
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_21142,       otulip_probe },
+-# endif /* INCLUDE_OTULIP */
+-# ifdef	INCLUDE_TULIP
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP,       tulip_probe },
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_FAST,  tulip_probe },
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_PLUS,  tulip_probe },
+-  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_21142,       tulip_probe },
+-  { PCI_VENDOR_ID_MACRONIX, PCI_DEVICE_ID_MX987x5,         tulip_probe },
+-  { PCI_VENDOR_ID_LINKSYS,  PCI_DEVICE_ID_LC82C115,        tulip_probe },
+-  { PCI_VENDOR_ID_LINKSYS,  PCI_DEVICE_ID_DEC_TULIP,       tulip_probe },
+-  { PCI_VENDOR_ID_DAVICOM,  PCI_DEVICE_ID_DM9102,          tulip_probe },
+-  { PCI_VENDOR_ID_DAVICOM,  PCI_DEVICE_ID_DM9009,          tulip_probe },
+-  { PCI_VENDOR_ID_ADMTEK,   PCI_DEVICE_ID_ADMTEK_0985,     tulip_probe },
+-  { PCI_VENDOR_ID_ADMTEK,   0x0981,                        tulip_probe },
+-  { 0x125B,                 0x1400,                        tulip_probe },
+-  { 0x11F6,                 0x9881,                        tulip_probe },
+-# endif /* INCLUDE_TULIP */
+-# ifdef INCLUDE_DAVICOM
+-  { PCI_VENDOR_ID_DAVICOM,   PCI_DEVICE_ID_DM9102,           davicom_probe },
+-  { PCI_VENDOR_ID_DAVICOM,   PCI_DEVICE_ID_DM9009,           davicom_probe },
+-# endif /* INCLUDE_DAVICOM */
+-# ifdef	INCLUDE_VIA_RHINE
+-  { PCI_VENDOR_ID_VIATEC,   PCI_DEVICE_ID_VIA_VT6102,      rhine_probe },
+-  { PCI_VENDOR_ID_VIATEC,   PCI_DEVICE_ID_VIA_RHINE_I,     rhine_probe },
+-  { PCI_VENDOR_ID_VIATEC,   PCI_DEVICE_ID_VIA_86C100A,     rhine_probe },
+-# endif /* INCLUDE_VIA_RHINE */
+-# ifdef INCLUDE_W89C840
+-  { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C840, w89c840_probe },
+-  { PCI_VENDOR_ID_COMPEX,   PCI_DEVICE_ID_COMPEX_RL100ATX, w89c840_probe },
+-# endif /* INCLUDE_W89C840 */
+-# ifdef INCLUDE_SIS900
+-  { PCI_VENDOR_ID_SIS,      PCI_DEVICE_ID_SIS900,          sis900_probe },
+-  { PCI_VENDOR_ID_SIS,      PCI_DEVICE_ID_SIS7016,         sis900_probe },
+-# endif /* INCLUDE_SIS900 */
+-# ifdef INCLUDE_NATSEMI
+-  { PCI_VENDOR_ID_NS,       PCI_DEVICE_ID_DP83815,         natsemi_probe },
+-# endif /* INCLUDE_NATSEMI */
+-# ifdef INCLUDE_TLAN
+-  { PCI_VENDOR_ID_OLICOM,   PCI_DEVICE_ID_OLICOM_OC2326,   tlan_probe },
+-# endif /* INCLUDE_TLAN */
+-  { 0,                      0,                             0 }
+-};
+-#endif /* GRUB && INCLUDE_PCI */
+-
+-struct dispatch_table
+-{
+-  const char	*nic_name;
+-#ifdef	INCLUDE_PCI
+-  struct nic	*(*eth_probe) (struct nic *, unsigned short *,
+-			       struct pci_device *);
+-#else
+-  struct nic	*(*eth_probe) (struct nic *, unsigned short *);
+-#endif	/* INCLUDE_PCI */
+-  unsigned short	*probe_ioaddrs;		/* for probe overrides */
+-};
+-
+ /*
+- *	NIC probing is in order of appearance in this table.
++ *	NIC probing is in the order the drivers were linked togeter.
+  *	If for some reason you want to change the order,
+- *	just rearrange the entries (bracketed by the #ifdef/#endif)
++ *	just change the order you list the drivers in.
+  */
+-static struct dispatch_table	NIC[] =
+-{
+-#ifdef	INCLUDE_RTL8139
+-  { "RTL8139", rtl8139_probe, pci_ioaddrs },
+-#endif
+-#ifdef INCLUDE_SIS900
+-  { "SIS900", sis900_probe, pci_ioaddrs },	
+-#endif
+-#ifdef INCLUDE_NATSEMI
+-  { "NATSEMI", natsemi_probe, pci_ioaddrs },	
+-#endif
+-#ifdef	INCLUDE_WD
+-  { "WD", wd_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_3C503
+-  { "3C503", t503_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_NE
+-  { "NE*000", ne_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_3C509
+-  { "3C5x9", t509_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_3C529
+-  { "3C5x9", t529_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_3C595
+-  { "3C595", t595_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_3C90X
+-  { "3C90X", a3c90x_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_EEPRO
+-  { "EEPRO", eepro_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_EEPRO100
+-  { "EEPRO100", eepro100_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_EPIC100
+-  { "EPIC100", epic100_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_OTULIP
+-  { "OTulip", otulip_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_TULIP
+-  { "Tulip", tulip_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_DAVICOM
+-  { "DAVICOM", davicom_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_CS89X0
+-  { "CS89x0", cs89x0_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_NE2100
+-  { "NE2100", ne2100_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_NI6510
+-  { "NI6510", ni6510_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_SK_G16
+-  { "SK_G16", SK_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_3C507
+-  { "3C507", t507_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_NI5010
+-  { "NI5010", ni5010_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_NI5210
+-  { "NI5210", ni5210_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_EXOS205
+-  { "EXOS205", exos205_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_SMC9000
+-  { "SMC9000", smc9000_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_TIARA
+-  { "TIARA", tiara_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_DEPCA
+-  { "DEPCA", depca_probe, 0 },
+-#endif
+-#ifdef	INCLUDE_NS8390
+-  { "NE2000/PCI", nepci_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_LANCE
+-  { "LANCE/PCI", lancepci_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_VIA_RHINE
+-  { "VIA 86C100", rhine_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_W89C840
+-  { "W89C840F", w89c840_probe, pci_ioaddrs },
+-#endif
+-#ifdef	INCLUDE_TLAN
+-  { "Olicom 2326", tlan_probe, pci_ioaddrs },
+-#endif
+-  /* this entry must always be last to mark the end of list */
+-  { 0, 0, 0 }
+-};
+-
+-#define	NIC_TABLE_SIZE	(sizeof (NIC) / sizeof (NIC[0]))
+-
+-static int
+-eth_dummy (struct nic *dummy)
+-{
+-  return 0;
++	struct isa_probe_state *state = &dev->state.isa;
++	printf("Probing isa %s...\n", type_name);
++	if (dev->how_probe == PROBE_FIRST) {
++		state->advance = 0;
++		state->driver  = isa_drivers;
++		dev->index     = -1;
++	}
++	for(;;)
++	{
++		if ((dev->how_probe != PROBE_AWAKE) && state->advance) {
++			state->driver++;
++			dev->index = -1;
++		}
++		state->advance = 1;
++		
++		if (state->driver >= isa_drivers_end)
++			break;
++
++		if (state->driver->type != dev->type)
++			continue;
++
++		if (dev->how_probe != PROBE_AWAKE) {
++			dev->type_index++;
++		}
++		printf("[%s]", state->driver->name);
++		dev->devid.bus_type = ISA_BUS_TYPE;
++		/* FIXME how do I handle dev->index + PROBE_AGAIN?? */
++		/* driver will fill in vendor and device IDs */
++		if (state->driver->probe(dev, state->driver->ioaddrs)) {
++			state->advance = (dev->index == -1);
++			return PROBE_WORKED;
++		}
++		putchar('\n');
++	}
++	return PROBE_FAILED;
+ }
+-
+-static char	packet[ETH_FRAME_LEN];
+-
+-struct nic	nic =
+-{
+-  (void (*) (struct nic *)) eth_dummy,	/* reset */
+-  eth_dummy,				/* poll */
+-  (void (*) (struct nic *, const char *,
+-	     unsigned int, unsigned int,
+-	     const char *)) eth_dummy,	/* transmit */
+-  (void (*) (struct nic *)) eth_dummy,	/* disable */
+-#ifdef	T503_AUI
+-  1,					/* aui */
+ #else
+-  0,					/* no aui */
++#define isa_probe(d,tn) (PROBE_FAILED)
+ #endif
+-  &rom,					/* rom_info */
+-  arptable[ARP_CLIENT].node,		/* node_addr */
+-  packet,				/* packet */
+-  0,				/* packetlen */
+-  0,				/* priv_data */
++static const char *driver_name[] = {
++	"nic", 
++	"disk", 
++	"floppy",
+ };
+-
+-void
+-eth_reset (void)
++int probe(struct dev *dev)
+ {
+-  (*nic.reset) (&nic);
+-}
++	const char *type_name;
+ 
+-int
+-eth_probe (void)
+-{
+-  struct pci_device	*p;
+-  const struct dispatch_table	*t;
+-  static int probed = 0;
++	EnterFunction("probe");
+ 
+-  /* If already probed, don't try to probe it any longer.  */
+-  if (probed)
+-    return 1;
+-  
+-  /* Clear the ready flag.  */
+-  network_ready = 0;
+-  /* Clear the ARP table.  */
+-  grub_memset ((char *) arptable, 0,
+-	       MAX_ARP * sizeof (struct arptable_t));
+-  
+-  p = 0;
+-  
+-#ifdef	INCLUDE_PCI
+-  /* In GRUB, the ROM info is initialized here.  */
+-  rom = *((struct rom_info *) ROM_INFO_LOCATION);
+-  
+-  eth_pci_init(pci_nic_list);
+-  pci_ioaddrs[0] = 0;
+-  pci_ioaddrs[1] = 0;
+-  /* at this point we have a list of possible PCI candidates
+-     we just pick the first one with a non-zero ioaddr */
+-  for (p = pci_nic_list; p->vendor != 0; ++p)
+-    {
+-      if (p->ioaddr != 0)
+-	{
+-	  pci_ioaddrs[0] = p->ioaddr;
+-	  break;
++	type_name = "";
++	if ((dev->type >= 0) && 
++		(dev->type < sizeof(driver_name)/sizeof(driver_name[0]))) {
++		type_name = driver_name[dev->type];
+ 	}
+-    }
+-#endif
+-  
+-  etherboot_printf("Probing...");
+-	
+-#ifdef INCLUDE_PCI
+-  if (p->vendor)
+-    {
+-      struct pci_dispatch_table *pt;
+-      
+-      for (pt = PCI_NIC; pt->eth_probe != 0; pt++)
+-	if (p->vendor == pt->vendor && p->dev_id == pt->dev_id)
+-	  {
+-	    etherboot_printf ("[%s]", p->name);
+-	    if ((pt->eth_probe) (&nic, pci_ioaddrs, p))
+-	      {
+-		probed = 1;
+-		return 1;
+-	      }
+-	  }
+-    }
+-#endif /* INCLUDE_PCI */
+-	
+-  for (t = NIC; t->nic_name != 0; ++t)
+-    {
+-      etherboot_printf("[%s]", t->nic_name);
+-#ifdef	INCLUDE_PCI
+-      if ((*t->eth_probe) (&nic, t->probe_ioaddrs, p))
+-	{
+-	  probed = 1;
+-	  return 1;
++	if (dev->how_probe == PROBE_FIRST) {
++		dev->to_probe = PROBE_PCI;
++		memset(&dev->state, 0, sizeof(dev->state));
+ 	}
+-#else
+-      if ((*t->eth_probe) (&nic, t->probe_ioaddrs))
+-	{
+-	  probed = 1;
+-	  return 1;
++	if (dev->to_probe == PROBE_PCI) {
++		dev->how_probe = pci_probe(dev, type_name);
++		if (dev->how_probe == PROBE_FAILED) {
++			dev->to_probe = PROBE_ISA;
++		}
++	}
++	if (dev->to_probe == PROBE_ISA) {
++		dev->how_probe = isa_probe(dev, type_name);
++		if (dev->how_probe == PROBE_FAILED) {
++			dev->to_probe = PROBE_NONE;
++		}
++	}
++	if ((dev->to_probe != PROBE_PCI) &&
++		(dev->to_probe != PROBE_ISA)) {
++		dev->how_probe = PROBE_FAILED;
++		
+ 	}
+-#endif	/* INCLUDE_PCI */
+-    }
+-  
+-  return 0;
+-}
+-
+-int
+-eth_poll (void)
+-{
+-  return ((*nic.poll) (&nic));
+-}
+ 
+-void
+-eth_transmit (const char *d, unsigned int t, unsigned int s, const void *p)
+-{
+-  (*nic.transmit) (&nic, d, t, s, p);
+-  if (t == IP)
+-    twiddle ();
++	LeaveFunction("probe");
++	return dev->how_probe;
+ }
+ 
+-void
+-eth_disable (void)
++void disable(struct dev *dev)
+ {
+-  (*nic.disable) (&nic);
++	if (dev->disable) {
++		dev->disable(dev);
++		dev->disable = 0;
++	}
+ }
+diff -Naur grub-0.97.orig/netboot/cpu.h grub-0.97/netboot/cpu.h
+--- grub-0.97.orig/netboot/cpu.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/cpu.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,243 @@
++#ifndef I386_BITS_CPU_H
++#define I386_BITS_CPU_H
++
++
++/* Sample usage: CPU_FEATURE_P(cpu.x86_capability, FPU) */
++#define CPU_FEATURE_P(CAP, FEATURE) \
++	(!!(CAP[(X86_FEATURE_##FEATURE)/32] & ((X86_FEATURE_##FEATURE) & 0x1f)))
++
++#define NCAPINTS	4	/* Currently we have 4 32-bit words worth of info */
++
++/* Intel-defined CPU features, CPUID level 0x00000001, word 0 */
++#define X86_FEATURE_FPU		(0*32+ 0) /* Onboard FPU */
++#define X86_FEATURE_VME		(0*32+ 1) /* Virtual Mode Extensions */
++#define X86_FEATURE_DE		(0*32+ 2) /* Debugging Extensions */
++#define X86_FEATURE_PSE 	(0*32+ 3) /* Page Size Extensions */
++#define X86_FEATURE_TSC		(0*32+ 4) /* Time Stamp Counter */
++#define X86_FEATURE_MSR		(0*32+ 5) /* Model-Specific Registers, RDMSR, WRMSR */
++#define X86_FEATURE_PAE		(0*32+ 6) /* Physical Address Extensions */
++#define X86_FEATURE_MCE		(0*32+ 7) /* Machine Check Architecture */
++#define X86_FEATURE_CX8		(0*32+ 8) /* CMPXCHG8 instruction */
++#define X86_FEATURE_APIC	(0*32+ 9) /* Onboard APIC */
++#define X86_FEATURE_SEP		(0*32+11) /* SYSENTER/SYSEXIT */
++#define X86_FEATURE_MTRR	(0*32+12) /* Memory Type Range Registers */
++#define X86_FEATURE_PGE		(0*32+13) /* Page Global Enable */
++#define X86_FEATURE_MCA		(0*32+14) /* Machine Check Architecture */
++#define X86_FEATURE_CMOV	(0*32+15) /* CMOV instruction (FCMOVCC and FCOMI too if FPU present) */
++#define X86_FEATURE_PAT		(0*32+16) /* Page Attribute Table */
++#define X86_FEATURE_PSE36	(0*32+17) /* 36-bit PSEs */
++#define X86_FEATURE_PN		(0*32+18) /* Processor serial number */
++#define X86_FEATURE_CLFLSH	(0*32+19) /* Supports the CLFLUSH instruction */
++#define X86_FEATURE_DTES	(0*32+21) /* Debug Trace Store */
++#define X86_FEATURE_ACPI	(0*32+22) /* ACPI via MSR */
++#define X86_FEATURE_MMX		(0*32+23) /* Multimedia Extensions */
++#define X86_FEATURE_FXSR	(0*32+24) /* FXSAVE and FXRSTOR instructions (fast save and restore */
++				          /* of FPU context), and CR4.OSFXSR available */
++#define X86_FEATURE_XMM		(0*32+25) /* Streaming SIMD Extensions */
++#define X86_FEATURE_XMM2	(0*32+26) /* Streaming SIMD Extensions-2 */
++#define X86_FEATURE_SELFSNOOP	(0*32+27) /* CPU self snoop */
++#define X86_FEATURE_HT		(0*32+28) /* Hyper-Threading */
++#define X86_FEATURE_ACC		(0*32+29) /* Automatic clock control */
++#define X86_FEATURE_IA64	(0*32+30) /* IA-64 processor */
++
++/* AMD-defined CPU features, CPUID level 0x80000001, word 1 */
++/* Don't duplicate feature flags which are redundant with Intel! */
++#define X86_FEATURE_SYSCALL	(1*32+11) /* SYSCALL/SYSRET */
++#define X86_FEATURE_MMXEXT	(1*32+22) /* AMD MMX extensions */
++#define X86_FEATURE_LM		(1*32+29) /* Long Mode (x86-64) */
++#define X86_FEATURE_3DNOWEXT	(1*32+30) /* AMD 3DNow! extensions */
++#define X86_FEATURE_3DNOW	(1*32+31) /* 3DNow! */
++
++/* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */
++#define X86_FEATURE_RECOVERY	(2*32+ 0) /* CPU in recovery mode */
++#define X86_FEATURE_LONGRUN	(2*32+ 1) /* Longrun power control */
++#define X86_FEATURE_LRTI	(2*32+ 3) /* LongRun table interface */
++
++/* Other features, Linux-defined mapping, word 3 */
++/* This range is used for feature bits which conflict or are synthesized */
++#define X86_FEATURE_CXMMX	(3*32+ 0) /* Cyrix MMX extensions */
++#define X86_FEATURE_K6_MTRR	(3*32+ 1) /* AMD K6 nonstandard MTRRs */
++#define X86_FEATURE_CYRIX_ARR	(3*32+ 2) /* Cyrix ARRs (= MTRRs) */
++#define X86_FEATURE_CENTAUR_MCR	(3*32+ 3) /* Centaur MCRs (= MTRRs) */
++
++#define MAX_X86_VENDOR_ID 16
++struct cpuinfo_x86 {
++	uint8_t	 x86;		/* CPU family */
++	uint8_t	 x86_model;
++	uint8_t	 x86_mask;
++
++       	int	 cpuid_level;	/* Maximum supported CPUID level, -1=no CPUID */
++	unsigned x86_capability[NCAPINTS];
++	char	 x86_vendor_id[MAX_X86_VENDOR_ID];
++};
++
++
++#define X86_VENDOR_INTEL 0
++#define X86_VENDOR_CYRIX 1
++#define X86_VENDOR_AMD 2
++#define X86_VENDOR_UMC 3
++#define X86_VENDOR_NEXGEN 4
++#define X86_VENDOR_CENTAUR 5
++#define X86_VENDOR_RISE 6
++#define X86_VENDOR_TRANSMETA 7
++#define X86_VENDOR_NSC 8
++#define X86_VENDOR_UNKNOWN 0xff
++
++/*
++ * EFLAGS bits
++ */
++#define X86_EFLAGS_CF	0x00000001 /* Carry Flag */
++#define X86_EFLAGS_PF	0x00000004 /* Parity Flag */
++#define X86_EFLAGS_AF	0x00000010 /* Auxillary carry Flag */
++#define X86_EFLAGS_ZF	0x00000040 /* Zero Flag */
++#define X86_EFLAGS_SF	0x00000080 /* Sign Flag */
++#define X86_EFLAGS_TF	0x00000100 /* Trap Flag */
++#define X86_EFLAGS_IF	0x00000200 /* Interrupt Flag */
++#define X86_EFLAGS_DF	0x00000400 /* Direction Flag */
++#define X86_EFLAGS_OF	0x00000800 /* Overflow Flag */
++#define X86_EFLAGS_IOPL	0x00003000 /* IOPL mask */
++#define X86_EFLAGS_NT	0x00004000 /* Nested Task */
++#define X86_EFLAGS_RF	0x00010000 /* Resume Flag */
++#define X86_EFLAGS_VM	0x00020000 /* Virtual Mode */
++#define X86_EFLAGS_AC	0x00040000 /* Alignment Check */
++#define X86_EFLAGS_VIF	0x00080000 /* Virtual Interrupt Flag */
++#define X86_EFLAGS_VIP	0x00100000 /* Virtual Interrupt Pending */
++#define X86_EFLAGS_ID	0x00200000 /* CPUID detection flag */
++
++/*
++ * Generic CPUID function
++ */
++static inline void cpuid(int op, 
++	unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
++{
++	__asm__("cpuid"
++		: "=a" (*eax),
++		  "=b" (*ebx),
++		  "=c" (*ecx),
++		  "=d" (*edx)
++		: "0" (op));
++}
++
++/*
++ * CPUID functions returning a single datum
++ */
++static inline unsigned int cpuid_eax(unsigned int op)
++{
++	unsigned int eax;
++
++	__asm__("cpuid"
++		: "=a" (eax)
++		: "0" (op)
++		: "bx", "cx", "dx");
++	return eax;
++}
++static inline unsigned int cpuid_ebx(unsigned int op)
++{
++	unsigned int eax, ebx;
++
++	__asm__("cpuid"
++		: "=a" (eax), "=b" (ebx)
++		: "0" (op)
++		: "cx", "dx" );
++	return ebx;
++}
++static inline unsigned int cpuid_ecx(unsigned int op)
++{
++	unsigned int eax, ecx;
++
++	__asm__("cpuid"
++		: "=a" (eax), "=c" (ecx)
++		: "0" (op)
++		: "bx", "dx" );
++	return ecx;
++}
++static inline unsigned int cpuid_edx(unsigned int op)
++{
++	unsigned int eax, edx;
++
++	__asm__("cpuid"
++		: "=a" (eax), "=d" (edx)
++		: "0" (op)
++		: "bx", "cx");
++	return edx;
++}
++
++/*
++ * Intel CPU features in CR4
++ */
++#define X86_CR4_VME		0x0001	/* enable vm86 extensions */
++#define X86_CR4_PVI		0x0002	/* virtual interrupts flag enable */
++#define X86_CR4_TSD		0x0004	/* disable time stamp at ipl 3 */
++#define X86_CR4_DE		0x0008	/* enable debugging extensions */
++#define X86_CR4_PSE		0x0010	/* enable page size extensions */
++#define X86_CR4_PAE		0x0020	/* enable physical address extensions */
++#define X86_CR4_MCE		0x0040	/* Machine check enable */
++#define X86_CR4_PGE		0x0080	/* enable global pages */
++#define X86_CR4_PCE		0x0100	/* enable performance counters at ipl 3 */
++#define X86_CR4_OSFXSR		0x0200	/* enable fast FPU save and restore */
++#define X86_CR4_OSXMMEXCPT	0x0400	/* enable unmasked SSE exceptions */
++
++
++#define MSR_K6_EFER			0xC0000080
++/* EFER bits: */ 
++#define _EFER_SCE 0  /* SYSCALL/SYSRET */
++#define _EFER_LME 8  /* Long mode enable */
++#define _EFER_LMA 10 /* Long mode active (read-only) */
++#define _EFER_NX 11  /* No execute enable */
++
++#define EFER_SCE (1<<_EFER_SCE)
++#define EFER_LME (1<<EFER_LME)
++#define EFER_LMA (1<<EFER_LMA)
++#define EFER_NX (1<<_EFER_NX)
++
++#define rdmsr(msr,val1,val2) \
++     __asm__ __volatile__("rdmsr" \
++			  : "=a" (val1), "=d" (val2) \
++			  : "c" (msr))
++
++#define wrmsr(msr,val1,val2) \
++     __asm__ __volatile__("wrmsr" \
++			  : /* no outputs */ \
++			  : "c" (msr), "a" (val1), "d" (val2))
++
++
++#define read_cr0()	({ \
++	unsigned int __dummy; \
++	__asm__( \
++		"movl %%cr0, %0\n\t" \
++		:"=r" (__dummy)); \
++	__dummy; \
++})
++#define write_cr0(x) \
++	__asm__("movl %0,%%cr0": :"r" (x));
++
++#define read_cr3()	({ \
++	unsigned int __dummy; \
++	__asm__( \
++		"movl %%cr3, %0\n\t" \
++		:"=r" (__dummy)); \
++	__dummy; \
++})
++#define write_cr3x(x) \
++	__asm__("movl %0,%%cr3": :"r" (x));
++
++
++#define read_cr4()	({ \
++	unsigned int __dummy; \
++	__asm__( \
++		"movl %%cr4, %0\n\t" \
++		:"=r" (__dummy)); \
++	__dummy; \
++})
++#define write_cr4x(x) \
++	__asm__("movl %0,%%cr4": :"r" (x));
++
++
++extern struct cpuinfo_x86 cpu_info;
++#ifdef CONFIG_X86_64
++extern void cpu_setup(void);
++#else
++#define cpu_setup() do {} while(0)
++#endif
++
++#endif /* I386_BITS_CPU_H */
+diff -Naur grub-0.97.orig/netboot/cs89x0.c grub-0.97/netboot/cs89x0.c
+--- grub-0.97.orig/netboot/cs89x0.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/cs89x0.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,659 +0,0 @@
+-/* cs89x0.c: A Crystal Semiconductor CS89[02]0 driver for etherboot. */
+-/*
+-  Permission is granted to distribute the enclosed cs89x0.[ch] driver
+-  only in conjunction with the Etherboot package.  The code is
+-  ordinarily distributed under the GPL.
+-  
+-  Russ Nelson, January 2000
+-
+-  ChangeLog:
+-
+-  Thu Dec 6 22:40:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
+-
+-  * disabled all "advanced" features; this should make the code more reliable
+-
+-  * reorganized the reset function
+-
+-  * always reset the address port, so that autoprobing will continue working
+-
+-  * some cosmetic changes
+-
+-  * 2.5
+-
+-  Thu Dec 5 21:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
+-
+-  * tested the code against a CS8900 card
+-
+-  * lots of minor bug fixes and adjustments
+-
+-  * this is the first release, that actually works! it still requires some
+-    changes in order to be more tolerant to different environments
+-
+-  * 4
+-
+-  Fri Nov 22 23:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
+-
+-  * read the manuals for the CS89x0 chipsets and took note of all the
+-    changes that will be neccessary in order to adapt Russel Nelson's code
+-    to the requirements of a BOOT-Prom
+-
+-  * 6
+-
+-  Thu Nov 19 22:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
+-
+-  * Synched with Russel Nelson's current code (v1.00)
+-
+-  * 2
+-
+-  Thu Nov 12 18:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
+-
+-  * Cleaned up some of the code and tried to optimize the code size.
+-
+-  * 1.5
+-
+-  Sun Nov 10 16:30:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
+-
+-  * First experimental release. This code compiles fine, but I
+-  have no way of testing whether it actually works.
+-
+-  * I did not (yet) bother to make the code 16bit aware, so for
+-  the time being, it will only work for Etherboot/32.
+-
+-  * 12
+-
+-  */
+-
+-#include "etherboot.h"
+-#include "nic.h"
+-#include "cards.h"
+-#include "cs89x0.h"
+-
+-static unsigned short	eth_nic_base;
+-static unsigned long    eth_mem_start;
+-static unsigned short   eth_irq;
+-static unsigned short   eth_cs_type;	/* one of: CS8900, CS8920, CS8920M  */
+-static unsigned short   eth_auto_neg_cnf;
+-static unsigned short   eth_adapter_cnf;
+-static unsigned short	eth_linectl;
+-
+-/*************************************************************************
+-	CS89x0 - specific routines
+-**************************************************************************/
+-
+-static inline int readreg(int portno)
+-{
+-	outw(portno, eth_nic_base + ADD_PORT);
+-	return inw(eth_nic_base + DATA_PORT);
+-}
+-
+-static inline void writereg(int portno, int value)
+-{
+-	outw(portno, eth_nic_base + ADD_PORT);
+-	outw(value, eth_nic_base + DATA_PORT);
+-	return;
+-}
+-
+-/*************************************************************************
+-EEPROM access
+-**************************************************************************/
+-
+-static int wait_eeprom_ready(void)
+-{
+-	unsigned long tmo = currticks() + 4*TICKS_PER_SEC;
+-
+-	/* check to see if the EEPROM is ready, a timeout is used -
+-	   just in case EEPROM is ready when SI_BUSY in the
+-	   PP_SelfST is clear */
+-	while(readreg(PP_SelfST) & SI_BUSY) {
+-		if (currticks() >= tmo)
+-			return -1; }
+-	return 0;
+-}
+-
+-static int get_eeprom_data(int off, int len, unsigned short *buffer)
+-{
+-	int i;
+-
+-#ifdef	EDEBUG
+-	printf("\ncs: EEPROM data from %hX for %hX:",off,len);
+-#endif
+-	for (i = 0; i < len; i++) {
+-		if (wait_eeprom_ready() < 0)
+-			return -1;
+-		/* Now send the EEPROM read command and EEPROM location
+-		   to read */
+-		writereg(PP_EECMD, (off + i) | EEPROM_READ_CMD);
+-		if (wait_eeprom_ready() < 0)
+-			return -1;
+-		buffer[i] = readreg(PP_EEData);
+-#ifdef	EDEBUG
+-		if (!(i%10))
+-			printf("\ncs: ");
+-		printf("%hX ", buffer[i]);
+-#endif
+-	}
+-#ifdef	EDEBUG
+-	putchar('\n');
+-#endif
+-
+-	return(0);
+-}
+-
+-static int get_eeprom_chksum(int off, int len, unsigned short *buffer)
+-{
+-	int  i, cksum;
+-
+-	cksum = 0;
+-	for (i = 0; i < len; i++)
+-		cksum += buffer[i];
+-	cksum &= 0xffff;
+-	if (cksum == 0)
+-		return 0;
+-	return -1;
+-}
+-
+-/*************************************************************************
+-Activate all of the available media and probe for network
+-**************************************************************************/
+-
+-static void clrline(void)
+-{
+-	int i;
+-
+-	putchar('\r');
+-	for (i = 79; i--; ) putchar(' ');
+-	printf("\rcs: ");
+-	return;
+-}
+-
+-static void control_dc_dc(int on_not_off)
+-{
+-	unsigned int selfcontrol;
+-	unsigned long tmo = currticks() + TICKS_PER_SEC;
+-
+-	/* control the DC to DC convertor in the SelfControl register.  */
+-	selfcontrol = HCB1_ENBL; /* Enable the HCB1 bit as an output */
+-	if (((eth_adapter_cnf & A_CNF_DC_DC_POLARITY) != 0) ^ on_not_off)
+-		selfcontrol |= HCB1;
+-	else
+-		selfcontrol &= ~HCB1;
+-	writereg(PP_SelfCTL, selfcontrol);
+-
+-	/* Wait for the DC/DC converter to power up - 1000ms */
+-	while (currticks() < tmo);
+-
+-	return;
+-}
+-
+-static int detect_tp(void)
+-{
+-	unsigned long tmo;
+-
+-	/* Turn on the chip auto detection of 10BT/ AUI */
+-
+-	clrline(); printf("attempting %s:","TP");
+-
+-        /* If connected to another full duplex capable 10-Base-T card
+-	   the link pulses seem to be lost when the auto detect bit in
+-	   the LineCTL is set.  To overcome this the auto detect bit
+-	   will be cleared whilst testing the 10-Base-T interface.
+-	   This would not be necessary for the sparrow chip but is
+-	   simpler to do it anyway. */
+-	writereg(PP_LineCTL, eth_linectl &~ AUI_ONLY);
+-	control_dc_dc(0);
+-
+-        /* Delay for the hardware to work out if the TP cable is
+-	   present - 150ms */
+-	for (tmo = currticks() + 4; currticks() < tmo; );
+-
+-	if ((readreg(PP_LineST) & LINK_OK) == 0)
+-		return 0;
+-
+-	if (eth_cs_type != CS8900) {
+-
+-		writereg(PP_AutoNegCTL, eth_auto_neg_cnf & AUTO_NEG_MASK);
+-
+-		if ((eth_auto_neg_cnf & AUTO_NEG_BITS) == AUTO_NEG_ENABLE) {
+-			printf(" negotiating duplex... ");
+-			while (readreg(PP_AutoNegST) & AUTO_NEG_BUSY) {
+-				if (currticks() - tmo > 40*TICKS_PER_SEC) {
+-					printf("time out ");
+-					break;
+-				}
+-			}
+-		}
+-		if (readreg(PP_AutoNegST) & FDX_ACTIVE)
+-			printf("using full duplex");
+-		else
+-			printf("using half duplex");
+-	}
+-
+-	return A_CNF_MEDIA_10B_T;
+-}
+-
+-/* send a test packet - return true if carrier bits are ok */
+-static int send_test_pkt(struct nic *nic)
+-{
+-	static unsigned char testpacket[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
+-				     0, 46, /*A 46 in network order       */
+-				     0, 0,  /*DSAP=0 & SSAP=0 fields      */
+-				     0xf3,0 /*Control (Test Req+P bit set)*/ };
+-	unsigned long tmo;
+-
+-	writereg(PP_LineCTL, readreg(PP_LineCTL) | SERIAL_TX_ON);
+-
+-	memcpy(testpacket, nic->node_addr, ETH_ALEN);
+-	memcpy(testpacket+ETH_ALEN, nic->node_addr, ETH_ALEN);
+-
+-	outw(TX_AFTER_ALL, eth_nic_base + TX_CMD_PORT);
+-	outw(ETH_ZLEN, eth_nic_base + TX_LEN_PORT);
+-
+-	/* Test to see if the chip has allocated memory for the packet */
+-	for (tmo = currticks() + 2;
+-	     (readreg(PP_BusST) & READY_FOR_TX_NOW) == 0; )
+-		if (currticks() >= tmo)
+-			return(0);
+-
+-	/* Write the contents of the packet */
+-	outsw(eth_nic_base + TX_FRAME_PORT, testpacket,
+-	      (ETH_ZLEN+1)>>1);
+-
+-	printf(" sending test packet ");
+-	/* wait a couple of timer ticks for packet to be received */
+-	for (tmo = currticks() + 2; currticks() < tmo; );
+-
+-	if ((readreg(PP_TxEvent) & TX_SEND_OK_BITS) == TX_OK) {
+-			printf("succeeded");
+-			return 1;
+-	}
+-	printf("failed");
+-	return 0;
+-}
+-
+-
+-static int detect_aui(struct nic *nic)
+-{
+-	clrline(); printf("attempting %s:","AUI");
+-	control_dc_dc(0);
+-
+-	writereg(PP_LineCTL, (eth_linectl & ~AUTO_AUI_10BASET) | AUI_ONLY);
+-
+-	if (send_test_pkt(nic)) {
+-		return A_CNF_MEDIA_AUI; }
+-	else
+-		return 0;
+-}
+-
+-static int detect_bnc(struct nic *nic)
+-{
+-	clrline(); printf("attempting %s:","BNC");
+-	control_dc_dc(1);
+-
+-	writereg(PP_LineCTL, (eth_linectl & ~AUTO_AUI_10BASET) | AUI_ONLY);
+-
+-	if (send_test_pkt(nic)) {
+-		return A_CNF_MEDIA_10B_2; }
+-	else
+-		return 0;
+-}
+-
+-/**************************************************************************
+-ETH_RESET - Reset adapter
+-***************************************************************************/
+-
+-static void cs89x0_reset(struct nic *nic)
+-{
+-	int  i;
+-	unsigned long reset_tmo;
+-
+-	writereg(PP_SelfCTL, readreg(PP_SelfCTL) | POWER_ON_RESET);
+-
+-	/* wait for two ticks; that is 2*55ms */
+-	for (reset_tmo = currticks() + 2; currticks() < reset_tmo; );
+-
+-	if (eth_cs_type != CS8900) {
+-		/* Hardware problem requires PNP registers to be reconfigured
+-		   after a reset */
+-		if (eth_irq != 0xFFFF) {
+-			outw(PP_CS8920_ISAINT, eth_nic_base + ADD_PORT);
+-			outb(eth_irq, eth_nic_base + DATA_PORT);
+-			outb(0, eth_nic_base + DATA_PORT + 1); }
+-
+-		if (eth_mem_start) {
+-			outw(PP_CS8920_ISAMemB, eth_nic_base + ADD_PORT);
+-			outb((eth_mem_start >> 8) & 0xff, eth_nic_base + DATA_PORT);
+-			outb((eth_mem_start >> 24) & 0xff, eth_nic_base + DATA_PORT + 1); } }
+-
+-	/* Wait until the chip is reset */
+-	for (reset_tmo = currticks() + 2;
+-	     (readreg(PP_SelfST) & INIT_DONE) == 0 &&
+-		     currticks() < reset_tmo; );
+-
+-	/* disable interrupts and memory accesses */
+-	writereg(PP_BusCTL, 0);
+-
+-	/* set the ethernet address */
+-	for (i=0; i < ETH_ALEN/2; i++)
+-		writereg(PP_IA+i*2,
+-			 nic->node_addr[i*2] |
+-			 (nic->node_addr[i*2+1] << 8));
+-
+-	/* receive only error free packets addressed to this card */
+-	writereg(PP_RxCTL, DEF_RX_ACCEPT);
+-
+-	/* do not generate any interrupts on receive operations */
+-	writereg(PP_RxCFG, 0);
+-
+-	/* do not generate any interrupts on transmit operations */
+-	writereg(PP_TxCFG, 0);
+-
+-	/* do not generate any interrupts on buffer operations */
+-	writereg(PP_BufCFG, 0);
+-
+-	/* reset address port, so that autoprobing will keep working */
+-	outw(PP_ChipID, eth_nic_base + ADD_PORT);
+-
+-	return;
+-}
+-
+-/**************************************************************************
+-ETH_TRANSMIT - Transmit a frame
+-***************************************************************************/
+-
+-static void cs89x0_transmit(
+-	struct nic *nic,
+-	const char *d,			/* Destination */
+-	unsigned int t,			/* Type */
+-	unsigned int s,			/* size */
+-	const char *p)			/* Packet */
+-{
+-	unsigned long tmo;
+-	int           sr;
+-
+-	/* does this size have to be rounded??? please,
+-	   somebody have a look in the specs */
+-	if ((sr = ((s + ETH_HLEN + 1)&~1)) < ETH_ZLEN)
+-		sr = ETH_ZLEN;
+-
+-retry:
+-	/* initiate a transmit sequence */
+-	outw(TX_AFTER_ALL, eth_nic_base + TX_CMD_PORT);
+-	outw(sr, eth_nic_base + TX_LEN_PORT);
+-
+-	/* Test to see if the chip has allocated memory for the packet */
+-	if ((readreg(PP_BusST) & READY_FOR_TX_NOW) == 0) {
+-		/* Oops... this should not happen! */
+-		printf("cs: unable to send packet; retrying...\n");
+-		for (tmo = currticks() + 5*TICKS_PER_SEC; currticks() < tmo; );
+-		cs89x0_reset(nic);
+-		goto retry; }
+-
+-	/* Write the contents of the packet */
+-	outsw(eth_nic_base + TX_FRAME_PORT, d, ETH_ALEN/2);
+-	outsw(eth_nic_base + TX_FRAME_PORT, nic->node_addr,
+-	      ETH_ALEN/2);
+-	outw(((t >> 8)&0xFF)|(t << 8), eth_nic_base + TX_FRAME_PORT);
+-	outsw(eth_nic_base + TX_FRAME_PORT, p, (s+1)/2);
+-	for (sr = sr/2 - (s+1)/2 - ETH_ALEN - 1; sr-- > 0;
+-	     outw(0, eth_nic_base + TX_FRAME_PORT));
+-
+-	/* wait for transfer to succeed */
+-	for (tmo = currticks()+5*TICKS_PER_SEC;
+-	     (s = readreg(PP_TxEvent)&~0x1F) == 0 && currticks() < tmo;)
+-		/* nothing */ ;
+-	if ((s & TX_SEND_OK_BITS) != TX_OK) {
+-		printf("\ntransmission error %#hX\n", s);
+-	}
+-
+-	return;
+-}
+-
+-/**************************************************************************
+-ETH_POLL - Wait for a frame
+-***************************************************************************/
+-
+-static int cs89x0_poll(struct nic *nic)
+-{
+-	int status;
+-
+-	status = readreg(PP_RxEvent);
+-
+-	if ((status & RX_OK) == 0)
+-		return(0);
+-
+-	status = inw(eth_nic_base + RX_FRAME_PORT);
+-	nic->packetlen = inw(eth_nic_base + RX_FRAME_PORT);
+-	insw(eth_nic_base + RX_FRAME_PORT, nic->packet, nic->packetlen >> 1);
+-	if (nic->packetlen & 1)
+-		nic->packet[nic->packetlen-1] = inw(eth_nic_base + RX_FRAME_PORT);
+-	return 1;
+-}
+-
+-static void cs89x0_disable(struct nic *nic)
+-{
+-	cs89x0_reset(nic);
+-}
+-
+-/**************************************************************************
+-ETH_PROBE - Look for an adapter
+-***************************************************************************/
+-
+-struct nic *cs89x0_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	static const unsigned int netcard_portlist[] = {
+-#ifdef	CS_SCAN
+-		CS_SCAN,
+-#else	/* use "conservative" default values for autoprobing */
+-		0x300,0x320,0x340,0x200,0x220,0x240,
+-		0x260,0x280,0x2a0,0x2c0,0x2e0,
+-	/* if that did not work, then be more aggressive */
+-		0x301,0x321,0x341,0x201,0x221,0x241,
+-		0x261,0x281,0x2a1,0x2c1,0x2e1,
+-#endif
+-		0};
+-
+-	int      i, result = -1;
+-	unsigned rev_type = 0, ioaddr, ioidx, isa_cnf, cs_revision;
+-	unsigned short eeprom_buff[CHKSUM_LEN];
+-
+-
+-	for (ioidx = 0; (ioaddr=netcard_portlist[ioidx++]) != 0; ) {
+-		/* if they give us an odd I/O address, then do ONE write to
+-		   the address port, to get it back to address zero, where we
+-		   expect to find the EISA signature word. */
+-		if (ioaddr & 1) {
+-			ioaddr &= ~1;
+-			if ((inw(ioaddr + ADD_PORT) & ADD_MASK) != ADD_SIG)
+-				continue;
+-			outw(PP_ChipID, ioaddr + ADD_PORT);
+-		}
+-
+-		if (inw(ioaddr + DATA_PORT) != CHIP_EISA_ID_SIG)
+-			continue;
+-		eth_nic_base = ioaddr;
+-
+-		/* get the chip type */
+-		rev_type = readreg(PRODUCT_ID_ADD);
+-		eth_cs_type = rev_type &~ REVISON_BITS;
+-		cs_revision = ((rev_type & REVISON_BITS) >> 8) + 'A';
+-
+-		printf("\ncs: cs89%c0%s rev %c, base %#hX",
+-		       eth_cs_type==CS8900?'0':'2',
+-		       eth_cs_type==CS8920M?"M":"",
+-		       cs_revision,
+-		       eth_nic_base);
+-
+-		/* First check to see if an EEPROM is attached*/
+-		if ((readreg(PP_SelfST) & EEPROM_PRESENT) == 0) {
+-			printf("\ncs: no EEPROM...\n");
+-			outw(PP_ChipID, eth_nic_base + ADD_PORT);
+-			continue; }
+-		else if (get_eeprom_data(START_EEPROM_DATA,CHKSUM_LEN,
+-					 eeprom_buff) < 0) {
+-			printf("\ncs: EEPROM read failed...\n");
+-			outw(PP_ChipID, eth_nic_base + ADD_PORT);
+-			continue; }
+-		else if (get_eeprom_chksum(START_EEPROM_DATA,CHKSUM_LEN,
+-					   eeprom_buff) < 0) {
+-			printf("\ncs: EEPROM checksum bad...\n");
+-			outw(PP_ChipID, eth_nic_base + ADD_PORT);
+-			continue; }
+-
+-		/* get transmission control word but keep the
+-		   autonegotiation bits */
+-		eth_auto_neg_cnf = eeprom_buff[AUTO_NEG_CNF_OFFSET/2];
+-		/* Store adapter configuration */
+-		eth_adapter_cnf = eeprom_buff[ADAPTER_CNF_OFFSET/2];
+-		/* Store ISA configuration */
+-		isa_cnf = eeprom_buff[ISA_CNF_OFFSET/2];
+-
+-		/* store the initial memory base address */
+-		eth_mem_start = eeprom_buff[PACKET_PAGE_OFFSET/2] << 8;
+-
+-		printf("%s%s%s, addr ",
+-		       (eth_adapter_cnf & A_CNF_10B_T)?", RJ-45":"",
+-		       (eth_adapter_cnf & A_CNF_AUI)?", AUI":"",
+-		       (eth_adapter_cnf & A_CNF_10B_2)?", BNC":"");
+-
+-		/* If this is a CS8900 then no pnp soft */
+-		if (eth_cs_type != CS8900 &&
+-		    /* Check if the ISA IRQ has been set  */
+-		    (i = readreg(PP_CS8920_ISAINT) & 0xff,
+-		     (i != 0 && i < CS8920_NO_INTS)))
+-			eth_irq = i;
+-		else {
+-			i = isa_cnf & INT_NO_MASK;
+-			if (eth_cs_type == CS8900) {
+-				/* the table that follows is dependent
+-				   upon how you wired up your cs8900
+-				   in your system.  The table is the
+-				   same as the cs8900 engineering demo
+-				   board.  irq_map also depends on the
+-				   contents of the table.  Also see
+-				   write_irq, which is the reverse
+-				   mapping of the table below. */
+-				if (i < 4) i = "\012\013\014\005"[i];
+-				else printf("\ncs: BUG: isa_config is %d\n", i); }
+-			eth_irq = i; }
+-
+-		/* Retrieve and print the ethernet address. */
+-		for (i=0; i<ETH_ALEN; i++) {
+-			nic->node_addr[i] = ((unsigned char *)eeprom_buff)[i];
+-		}
+-		printf("%!\n", nic->node_addr);
+-
+-		/* Set the LineCTL quintuplet based on adapter
+-		   configuration read from EEPROM */
+-		if ((eth_adapter_cnf & A_CNF_EXTND_10B_2) &&
+-		    (eth_adapter_cnf & A_CNF_LOW_RX_SQUELCH))
+-			eth_linectl = LOW_RX_SQUELCH;
+-		else
+-			eth_linectl = 0;
+-
+-		/* check to make sure that they have the "right"
+-		   hardware available */
+-		switch(eth_adapter_cnf & A_CNF_MEDIA_TYPE) {
+-		case A_CNF_MEDIA_10B_T: result = eth_adapter_cnf & A_CNF_10B_T;
+-			break;
+-		case A_CNF_MEDIA_AUI:   result = eth_adapter_cnf & A_CNF_AUI;
+-			break;
+-		case A_CNF_MEDIA_10B_2: result = eth_adapter_cnf & A_CNF_10B_2;
+-			break;
+-		default: result = eth_adapter_cnf & (A_CNF_10B_T | A_CNF_AUI |
+-						     A_CNF_10B_2);
+-		}
+-		if (!result) {
+-			printf("cs: EEPROM is configured for unavailable media\n");
+-		error:
+-			writereg(PP_LineCTL, readreg(PP_LineCTL) &
+-				 ~(SERIAL_TX_ON | SERIAL_RX_ON));
+-			outw(PP_ChipID, eth_nic_base + ADD_PORT);
+-			continue;
+-		}
+-
+-		/* Initialize the card for probing of the attached media */
+-		cs89x0_reset(nic);
+-
+-		/* set the hardware to the configured choice */
+-		switch(eth_adapter_cnf & A_CNF_MEDIA_TYPE) {
+-		case A_CNF_MEDIA_10B_T:
+-			result = detect_tp();
+-			if (!result) {
+-				clrline();
+-				printf("10Base-T (RJ-45%s",
+-				       ") has no cable\n"); }
+-			/* check "ignore missing media" bit */
+-			if (eth_auto_neg_cnf & IMM_BIT)
+-				/* Yes! I don't care if I see a link pulse */
+-				result = A_CNF_MEDIA_10B_T;
+-			break;
+-		case A_CNF_MEDIA_AUI:
+-			result = detect_aui(nic);
+-			if (!result) {
+-				clrline();
+-				printf("10Base-5 (AUI%s",
+-				       ") has no cable\n"); }
+-			/* check "ignore missing media" bit */
+-			if (eth_auto_neg_cnf & IMM_BIT)
+-				/* Yes! I don't care if I see a carrrier */
+-				result = A_CNF_MEDIA_AUI;
+-			break;
+-		case A_CNF_MEDIA_10B_2:
+-			result = detect_bnc(nic);
+-			if (!result) {
+-				clrline();
+-				printf("10Base-2 (BNC%s",
+-				       ") has no cable\n"); }
+-			/* check "ignore missing media" bit */
+-			if (eth_auto_neg_cnf & IMM_BIT)
+-				/* Yes! I don't care if I can xmit a packet */
+-				result = A_CNF_MEDIA_10B_2;
+-			break;
+-		case A_CNF_MEDIA_AUTO:
+-			writereg(PP_LineCTL, eth_linectl | AUTO_AUI_10BASET);
+-			if (eth_adapter_cnf & A_CNF_10B_T)
+-				if ((result = detect_tp()) != 0)
+-					break;
+-			if (eth_adapter_cnf & A_CNF_AUI)
+-				if ((result = detect_aui(nic)) != 0)
+-					break;
+-			if (eth_adapter_cnf & A_CNF_10B_2)
+-				if ((result = detect_bnc(nic)) != 0)
+-					break;
+-			clrline(); printf("no media detected\n");
+-			goto error;
+-		}
+-		clrline();
+-		switch(result) {
+-		case 0:                 printf("no network cable attached to configured media\n");
+-			goto error;
+-		case A_CNF_MEDIA_10B_T: printf("using 10Base-T (RJ-45)\n");
+-			break;
+-		case A_CNF_MEDIA_AUI:   printf("using 10Base-5 (AUI)\n");
+-			break;
+-		case A_CNF_MEDIA_10B_2: printf("using 10Base-2 (BNC)\n");
+-			break;
+-		}
+-
+-		/* Turn on both receive and transmit operations */
+-		writereg(PP_LineCTL, readreg(PP_LineCTL) | SERIAL_RX_ON |
+-			 SERIAL_TX_ON);
+-
+-		break;
+-	}
+-
+-	if (ioaddr == 0)
+-		return (0);
+-	nic->reset = cs89x0_reset;
+-	nic->poll = cs89x0_poll;
+-	nic->transmit = cs89x0_transmit;
+-	nic->disable = cs89x0_disable;
+-	return (nic);
+-}
+-
+-/*
+- * Local variables:
+- *  c-basic-offset: 8
+- * End:
+- */
+-
+diff -Naur grub-0.97.orig/netboot/cs89x0.h grub-0.97/netboot/cs89x0.h
+--- grub-0.97.orig/netboot/cs89x0.h	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/cs89x0.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,461 +0,0 @@
+-/*  Copyright, 1988-1992, Russell Nelson, Crynwr Software
+-
+-   This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, version 1.
+-
+-   This program is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with this program; if not, write to the Free Software
+-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+-
+-#define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
+-				/* offset   2h -> Model/Product Number  */
+-				/* offset   3h -> Chip Revision Number  */
+-
+-#define PP_ISAIOB 0x0020	/*  IO base address */
+-#define PP_CS8900_ISAINT 0x0022	/*  ISA interrupt select */
+-#define PP_CS8920_ISAINT 0x0370	/*  ISA interrupt select */
+-#define PP_CS8900_ISADMA 0x0024	/*  ISA Rec DMA channel */
+-#define PP_CS8920_ISADMA 0x0374	/*  ISA Rec DMA channel */
+-#define PP_ISASOF 0x0026	/*  ISA DMA offset */
+-#define PP_DmaFrameCnt 0x0028	/*  ISA DMA Frame count */
+-#define PP_DmaByteCnt 0x002A	/*  ISA DMA Byte count */
+-#define PP_CS8900_ISAMemB 0x002C	/*  Memory base */
+-#define PP_CS8920_ISAMemB 0x0348 /*  */
+-
+-#define PP_ISABootBase 0x0030	/*  Boot Prom base  */
+-#define PP_ISABootMask 0x0034	/*  Boot Prom Mask */
+-
+-/* EEPROM data and command registers */
+-#define PP_EECMD 0x0040		/*  NVR Interface Command register */
+-#define PP_EEData 0x0042	/*  NVR Interface Data Register */
+-#define PP_DebugReg 0x0044	/*  Debug Register */
+-
+-#define PP_RxCFG 0x0102		/*  Rx Bus config */
+-#define PP_RxCTL 0x0104		/*  Receive Control Register */
+-#define PP_TxCFG 0x0106		/*  Transmit Config Register */
+-#define PP_TxCMD 0x0108		/*  Transmit Command Register */
+-#define PP_BufCFG 0x010A	/*  Bus configuration Register */
+-#define PP_LineCTL 0x0112	/*  Line Config Register */
+-#define PP_SelfCTL 0x0114	/*  Self Command Register */
+-#define PP_BusCTL 0x0116	/*  ISA bus control Register */
+-#define PP_TestCTL 0x0118	/*  Test Register */
+-#define PP_AutoNegCTL 0x011C	/*  Auto Negotiation Ctrl */
+-
+-#define PP_ISQ 0x0120		/*  Interrupt Status */
+-#define PP_RxEvent 0x0124	/*  Rx Event Register */
+-#define PP_TxEvent 0x0128	/*  Tx Event Register */
+-#define PP_BufEvent 0x012C	/*  Bus Event Register */
+-#define PP_RxMiss 0x0130	/*  Receive Miss Count */
+-#define PP_TxCol 0x0132		/*  Transmit Collision Count */
+-#define PP_LineST 0x0134	/*  Line State Register */
+-#define PP_SelfST 0x0136	/*  Self State register */
+-#define PP_BusST 0x0138		/*  Bus Status */
+-#define PP_TDR 0x013C		/*  Time Domain Reflectometry */
+-#define PP_AutoNegST 0x013E	/*  Auto Neg Status */
+-#define PP_TxCommand 0x0144	/*  Tx Command */
+-#define PP_TxLength 0x0146	/*  Tx Length */
+-#define PP_LAF 0x0150		/*  Hash Table */
+-#define PP_IA 0x0158		/*  Physical Address Register */
+-
+-#define PP_RxStatus 0x0400	/*  Receive start of frame */
+-#define PP_RxLength 0x0402	/*  Receive Length of frame */
+-#define PP_RxFrame 0x0404	/*  Receive frame pointer */
+-#define PP_TxFrame 0x0A00	/*  Transmit frame pointer */
+-
+-/*  Primary I/O Base Address. If no I/O base is supplied by the user, then this */
+-/*  can be used as the default I/O base to access the PacketPage Area. */
+-#define DEFAULTIOBASE 0x0300
+-#define FIRST_IO 0x020C		/*  First I/O port to check */
+-#define LAST_IO 0x037C		/*  Last I/O port to check (+10h) */
+-#define ADD_MASK 0x3000		/*  Mask it use of the ADD_PORT register */
+-#define ADD_SIG 0x3000		/*  Expected ID signature */
+-
+-#define CHIP_EISA_ID_SIG 0x630E   /*  Product ID Code for Crystal Chip (CS8900 spec 4.3) */
+-
+-#ifdef	IBMEIPKT
+-#define EISA_ID_SIG 0x4D24	/*  IBM */
+-#define PART_NO_SIG 0x1010	/*  IBM */
+-#define MONGOOSE_BIT 0x0000	/*  IBM */
+-#else
+-#define EISA_ID_SIG 0x630E	/*  PnP Vendor ID (same as chip id for Crystal board) */
+-#define PART_NO_SIG 0x4000	/*  ID code CS8920 board (PnP Vendor Product code) */
+-#define MONGOOSE_BIT 0x2000	/*  PART_NO_SIG + MONGOOSE_BUT => ID of mongoose */
+-#endif
+-
+-#define PRODUCT_ID_ADD 0x0002   /*  Address of product ID */
+-
+-/*  Mask to find out the types of  registers */
+-#define REG_TYPE_MASK 0x001F
+-
+-/*  Eeprom Commands */
+-#define ERSE_WR_ENBL 0x00F0
+-#define ERSE_WR_DISABLE 0x0000
+-
+-/*  Defines Control/Config register quintuplet numbers */
+-#define RX_BUF_CFG 0x0003
+-#define RX_CONTROL 0x0005
+-#define TX_CFG 0x0007
+-#define TX_COMMAND 0x0009
+-#define BUF_CFG 0x000B
+-#define LINE_CONTROL 0x0013
+-#define SELF_CONTROL 0x0015
+-#define BUS_CONTROL 0x0017
+-#define TEST_CONTROL 0x0019
+-
+-/*  Defines Status/Count registers quintuplet numbers */
+-#define RX_EVENT 0x0004
+-#define TX_EVENT 0x0008
+-#define BUF_EVENT 0x000C
+-#define RX_MISS_COUNT 0x0010
+-#define TX_COL_COUNT 0x0012
+-#define LINE_STATUS 0x0014
+-#define SELF_STATUS 0x0016
+-#define BUS_STATUS 0x0018
+-#define TDR 0x001C
+-
+-/* PP_RxCFG - Receive  Configuration and Interrupt Mask bit definition -  Read/write */
+-#define SKIP_1 0x0040
+-#define RX_STREAM_ENBL 0x0080
+-#define RX_OK_ENBL 0x0100
+-#define RX_DMA_ONLY 0x0200
+-#define AUTO_RX_DMA 0x0400
+-#define BUFFER_CRC 0x0800
+-#define RX_CRC_ERROR_ENBL 0x1000
+-#define RX_RUNT_ENBL 0x2000
+-#define RX_EXTRA_DATA_ENBL 0x4000
+-
+-/* PP_RxCTL - Receive Control bit definition - Read/write */
+-#define RX_IA_HASH_ACCEPT 0x0040
+-#define RX_PROM_ACCEPT 0x0080
+-#define RX_OK_ACCEPT 0x0100
+-#define RX_MULTCAST_ACCEPT 0x0200
+-#define RX_IA_ACCEPT 0x0400
+-#define RX_BROADCAST_ACCEPT 0x0800
+-#define RX_BAD_CRC_ACCEPT 0x1000
+-#define RX_RUNT_ACCEPT 0x2000
+-#define RX_EXTRA_DATA_ACCEPT 0x4000
+-#define RX_ALL_ACCEPT (RX_PROM_ACCEPT|RX_BAD_CRC_ACCEPT|RX_RUNT_ACCEPT|RX_EXTRA_DATA_ACCEPT)
+-/*  Default receive mode - individually addressed, broadcast, and error free */
+-#define DEF_RX_ACCEPT (RX_IA_ACCEPT | RX_BROADCAST_ACCEPT | RX_OK_ACCEPT)
+-
+-/* PP_TxCFG - Transmit Configuration Interrupt Mask bit definition - Read/write */
+-#define TX_LOST_CRS_ENBL 0x0040
+-#define TX_SQE_ERROR_ENBL 0x0080
+-#define TX_OK_ENBL 0x0100
+-#define TX_LATE_COL_ENBL 0x0200
+-#define TX_JBR_ENBL 0x0400
+-#define TX_ANY_COL_ENBL 0x0800
+-#define TX_16_COL_ENBL 0x8000
+-
+-/* PP_TxCMD - Transmit Command bit definition - Read-only */
+-#define TX_START_4_BYTES 0x0000
+-#define TX_START_64_BYTES 0x0040
+-#define TX_START_128_BYTES 0x0080
+-#define TX_START_ALL_BYTES 0x00C0
+-#define TX_FORCE 0x0100
+-#define TX_ONE_COL 0x0200
+-#define TX_TWO_PART_DEFF_DISABLE 0x0400
+-#define TX_NO_CRC 0x1000
+-#define TX_RUNT 0x2000
+-
+-/* PP_BufCFG - Buffer Configuration Interrupt Mask bit definition - Read/write */
+-#define GENERATE_SW_INTERRUPT 0x0040
+-#define RX_DMA_ENBL 0x0080
+-#define READY_FOR_TX_ENBL 0x0100
+-#define TX_UNDERRUN_ENBL 0x0200
+-#define RX_MISS_ENBL 0x0400
+-#define RX_128_BYTE_ENBL 0x0800
+-#define TX_COL_COUNT_OVRFLOW_ENBL 0x1000
+-#define RX_MISS_COUNT_OVRFLOW_ENBL 0x2000
+-#define RX_DEST_MATCH_ENBL 0x8000
+-
+-/* PP_LineCTL - Line Control bit definition - Read/write */
+-#define SERIAL_RX_ON 0x0040
+-#define SERIAL_TX_ON 0x0080
+-#define AUI_ONLY 0x0100
+-#define AUTO_AUI_10BASET 0x0200
+-#define MODIFIED_BACKOFF 0x0800
+-#define NO_AUTO_POLARITY 0x1000
+-#define TWO_PART_DEFDIS 0x2000
+-#define LOW_RX_SQUELCH 0x4000
+-
+-/* PP_SelfCTL - Software Self Control bit definition - Read/write */
+-#define POWER_ON_RESET 0x0040
+-#define SW_STOP 0x0100
+-#define SLEEP_ON 0x0200
+-#define AUTO_WAKEUP 0x0400
+-#define HCB0_ENBL 0x1000
+-#define HCB1_ENBL 0x2000
+-#define HCB0 0x4000
+-#define HCB1 0x8000
+-
+-/* PP_BusCTL - ISA Bus Control bit definition - Read/write */
+-#define RESET_RX_DMA 0x0040
+-#define MEMORY_ON 0x0400
+-#define DMA_BURST_MODE 0x0800
+-#define IO_CHANNEL_READY_ON 0x1000
+-#define RX_DMA_SIZE_64K 0x2000
+-#define ENABLE_IRQ 0x8000
+-
+-/* PP_TestCTL - Test Control bit definition - Read/write */
+-#define LINK_OFF 0x0080
+-#define ENDEC_LOOPBACK 0x0200
+-#define AUI_LOOPBACK 0x0400
+-#define BACKOFF_OFF 0x0800
+-#define FAST_TEST 0x8000
+-
+-/* PP_RxEvent - Receive Event Bit definition - Read-only */
+-#define RX_IA_HASHED 0x0040
+-#define RX_DRIBBLE 0x0080
+-#define RX_OK 0x0100
+-#define RX_HASHED 0x0200
+-#define RX_IA 0x0400
+-#define RX_BROADCAST 0x0800
+-#define RX_CRC_ERROR 0x1000
+-#define RX_RUNT 0x2000
+-#define RX_EXTRA_DATA 0x4000
+-
+-#define HASH_INDEX_MASK 0x0FC00
+-
+-/* PP_TxEvent - Transmit Event Bit definition - Read-only */
+-#define TX_LOST_CRS 0x0040
+-#define TX_SQE_ERROR 0x0080
+-#define TX_OK 0x0100
+-#define TX_LATE_COL 0x0200
+-#define TX_JBR 0x0400
+-#define TX_16_COL 0x8000
+-#define TX_SEND_OK_BITS (TX_OK|TX_LOST_CRS)
+-#define TX_COL_COUNT_MASK 0x7800
+-
+-/* PP_BufEvent - Buffer Event Bit definition - Read-only */
+-#define SW_INTERRUPT 0x0040
+-#define RX_DMA 0x0080
+-#define READY_FOR_TX 0x0100
+-#define TX_UNDERRUN 0x0200
+-#define RX_MISS 0x0400
+-#define RX_128_BYTE 0x0800
+-#define TX_COL_OVRFLW 0x1000
+-#define RX_MISS_OVRFLW 0x2000
+-#define RX_DEST_MATCH 0x8000
+-
+-/* PP_LineST - Ethernet Line Status bit definition - Read-only */
+-#define LINK_OK 0x0080
+-#define AUI_ON 0x0100
+-#define TENBASET_ON 0x0200
+-#define POLARITY_OK 0x1000
+-#define CRS_OK 0x4000
+-
+-/* PP_SelfST - Chip Software Status bit definition */
+-#define ACTIVE_33V 0x0040
+-#define INIT_DONE 0x0080
+-#define SI_BUSY 0x0100
+-#define EEPROM_PRESENT 0x0200
+-#define EEPROM_OK 0x0400
+-#define EL_PRESENT 0x0800
+-#define EE_SIZE_64 0x1000
+-
+-/* PP_BusST - ISA Bus Status bit definition */
+-#define TX_BID_ERROR 0x0080
+-#define READY_FOR_TX_NOW 0x0100
+-
+-/* PP_AutoNegCTL - Auto Negotiation Control bit definition */
+-#define RE_NEG_NOW 0x0040
+-#define ALLOW_FDX 0x0080
+-#define AUTO_NEG_ENABLE 0x0100
+-#define NLP_ENABLE 0x0200
+-#define FORCE_FDX 0x8000
+-#define AUTO_NEG_BITS (FORCE_FDX|NLP_ENABLE|AUTO_NEG_ENABLE)
+-#define AUTO_NEG_MASK (FORCE_FDX|NLP_ENABLE|AUTO_NEG_ENABLE|ALLOW_FDX|RE_NEG_NOW)
+-
+-/* PP_AutoNegST - Auto Negotiation Status bit definition */
+-#define AUTO_NEG_BUSY 0x0080
+-#define FLP_LINK 0x0100
+-#define FLP_LINK_GOOD 0x0800
+-#define LINK_FAULT 0x1000
+-#define HDX_ACTIVE 0x4000
+-#define FDX_ACTIVE 0x8000
+-
+-/*  The following block defines the ISQ event types */
+-#define ISQ_RECEIVER_EVENT 0x04
+-#define ISQ_TRANSMITTER_EVENT 0x08
+-#define ISQ_BUFFER_EVENT 0x0c
+-#define ISQ_RX_MISS_EVENT 0x10
+-#define ISQ_TX_COL_EVENT 0x12
+-
+-#define ISQ_EVENT_MASK 0x003F   /*  ISQ mask to find out type of event */
+-#define ISQ_HIST 16		/*  small history buffer */
+-#define AUTOINCREMENT 0x8000	/*  Bit mask to set bit-15 for autoincrement */
+-
+-#define TXRXBUFSIZE 0x0600
+-#define RXDMABUFSIZE 0x8000
+-#define RXDMASIZE 0x4000
+-#define TXRX_LENGTH_MASK 0x07FF
+-
+-/*  rx options bits */
+-#define RCV_WITH_RXON	1       /*  Set SerRx ON */
+-#define RCV_COUNTS	2       /*  Use Framecnt1 */
+-#define RCV_PONG	4       /*  Pong respondent */
+-#define RCV_DONG	8       /*  Dong operation */
+-#define RCV_POLLING	0x10	/*  Poll RxEvent */
+-#define RCV_ISQ		0x20	/*  Use ISQ, int */
+-#define RCV_AUTO_DMA	0x100	/*  Set AutoRxDMAE */
+-#define RCV_DMA		0x200	/*  Set RxDMA only */
+-#define RCV_DMA_ALL	0x400	/*  Copy all DMA'ed */
+-#define RCV_FIXED_DATA	0x800	/*  Every frame same */
+-#define RCV_IO		0x1000	/*  Use ISA IO only */
+-#define RCV_MEMORY	0x2000	/*  Use ISA Memory */
+-
+-#define RAM_SIZE	0x1000       /*  The card has 4k bytes or RAM */
+-#define PKT_START PP_TxFrame  /*  Start of packet RAM */
+-
+-#define RX_FRAME_PORT	0x0000
+-#define TX_FRAME_PORT RX_FRAME_PORT
+-#define TX_CMD_PORT	0x0004
+-#define TX_NOW		0x0000       /*  Tx packet after   5 bytes copied */
+-#define TX_AFTER_381	0x0020       /*  Tx packet after 381 bytes copied */
+-#define TX_AFTER_ALL	0x0060       /*  Tx packet after all bytes copied */
+-#define TX_LEN_PORT	0x0006
+-#define ISQ_PORT	0x0008
+-#define ADD_PORT	0x000A
+-#define DATA_PORT	0x000C
+-
+-#define EEPROM_WRITE_EN		0x00F0
+-#define EEPROM_WRITE_DIS	0x0000
+-#define EEPROM_WRITE_CMD	0x0100
+-#define EEPROM_READ_CMD		0x0200
+-
+-/*  Receive Header */
+-/*  Description of header of each packet in receive area of memory */
+-#define RBUF_EVENT_LOW	0   /*  Low byte of RxEvent - status of received frame */
+-#define RBUF_EVENT_HIGH	1   /*  High byte of RxEvent - status of received frame */
+-#define RBUF_LEN_LOW	2   /*  Length of received data - low byte */
+-#define RBUF_LEN_HI	3   /*  Length of received data - high byte */
+-#define RBUF_HEAD_LEN	4   /*  Length of this header */
+-
+-#define CHIP_READ 0x1   /*  Used to mark state of the repins code (chip or dma) */
+-#define DMA_READ 0x2   /*  Used to mark state of the repins code (chip or dma) */
+-
+-/*  for bios scan */
+-/*  */
+-#ifdef	CSDEBUG
+-/*  use these values for debugging bios scan */
+-#define BIOS_START_SEG 0x00000
+-#define BIOS_OFFSET_INC 0x0010
+-#else
+-#define BIOS_START_SEG 0x0c000
+-#define BIOS_OFFSET_INC 0x0200
+-#endif
+-
+-#define BIOS_LAST_OFFSET 0x0fc00
+-
+-/*  Byte offsets into the EEPROM configuration buffer */
+-#define ISA_CNF_OFFSET 0x6
+-#define TX_CTL_OFFSET (ISA_CNF_OFFSET + 8)			/*  8900 eeprom */
+-#define AUTO_NEG_CNF_OFFSET (ISA_CNF_OFFSET + 8)		/*  8920 eeprom */
+-
+-  /*  the assumption here is that the bits in the eeprom are generally  */
+-  /*  in the same position as those in the autonegctl register. */
+-  /*  Of course the IMM bit is not in that register so it must be  */
+-  /*  masked out */
+-#define EE_FORCE_FDX  0x8000
+-#define EE_NLP_ENABLE 0x0200
+-#define EE_AUTO_NEG_ENABLE 0x0100
+-#define EE_ALLOW_FDX 0x0080
+-#define EE_AUTO_NEG_CNF_MASK (EE_FORCE_FDX|EE_NLP_ENABLE|EE_AUTO_NEG_ENABLE|EE_ALLOW_FDX)
+-
+-#define IMM_BIT 0x0040		/*  ignore missing media */
+-
+-#define ADAPTER_CNF_OFFSET (AUTO_NEG_CNF_OFFSET + 2)
+-#define A_CNF_10B_T 0x0001
+-#define A_CNF_AUI 0x0002
+-#define A_CNF_10B_2 0x0004
+-#define A_CNF_MEDIA_TYPE 0x0060
+-#define A_CNF_MEDIA_AUTO 0x0000
+-#define A_CNF_MEDIA_10B_T 0x0020
+-#define A_CNF_MEDIA_AUI 0x0040
+-#define A_CNF_MEDIA_10B_2 0x0060
+-#define A_CNF_DC_DC_POLARITY 0x0080
+-#define A_CNF_NO_AUTO_POLARITY 0x2000
+-#define A_CNF_LOW_RX_SQUELCH 0x4000
+-#define A_CNF_EXTND_10B_2 0x8000
+-
+-#define PACKET_PAGE_OFFSET 0x8
+-
+-/*  Bit definitions for the ISA configuration word from the EEPROM */
+-#define INT_NO_MASK 0x000F
+-#define DMA_NO_MASK 0x0070
+-#define ISA_DMA_SIZE 0x0200
+-#define ISA_AUTO_RxDMA 0x0400
+-#define ISA_RxDMA 0x0800
+-#define DMA_BURST 0x1000
+-#define STREAM_TRANSFER 0x2000
+-#define ANY_ISA_DMA (ISA_AUTO_RxDMA | ISA_RxDMA)
+-
+-/*  DMA controller registers */
+-#define DMA_BASE 0x00     /*  DMA controller base */
+-#define DMA_BASE_2 0x0C0    /*  DMA controller base */
+-
+-#define DMA_STAT 0x0D0    /*  DMA controller status register */
+-#define DMA_MASK 0x0D4    /*  DMA controller mask register */
+-#define DMA_MODE 0x0D6    /*  DMA controller mode register */
+-#define DMA_RESETFF 0x0D8    /*  DMA controller first/last flip flop */
+-
+-/*  DMA data */
+-#define DMA_DISABLE 0x04     /*  Disable channel n */
+-#define DMA_ENABLE 0x00     /*  Enable channel n */
+-/*  Demand transfers, incr. address, auto init, writes, ch. n */
+-#define DMA_RX_MODE 0x14
+-/*  Demand transfers, incr. address, auto init, reads, ch. n */
+-#define DMA_TX_MODE 0x18
+-
+-#define DMA_SIZE (16*1024) /*  Size of dma buffer - 16k */
+-
+-#define CS8900 0x0000
+-#define CS8920 0x4000
+-#define CS8920M 0x6000
+-#define REVISON_BITS 0x1F00
+-#define EEVER_NUMBER 0x12
+-#define CHKSUM_LEN 0x14
+-#define CHKSUM_VAL 0x0000
+-#define START_EEPROM_DATA 0x001c /*  Offset into eeprom for start of data */
+-#define IRQ_MAP_EEPROM_DATA 0x0046 /*  Offset into eeprom for the IRQ map */
+-#define IRQ_MAP_LEN 0x0004 /*  No of bytes to read for the IRQ map */
+-#define PNP_IRQ_FRMT 0x0022 /*  PNP small item IRQ format */
+-#define CS8900_IRQ_MAP 0x1c20 /*  This IRQ map is fixed */
+-
+-#define CS8920_NO_INTS 0x0F   /*  Max CS8920 interrupt select # */
+-
+-#define PNP_ADD_PORT 0x0279
+-#define PNP_WRITE_PORT 0x0A79
+-
+-#define GET_PNP_ISA_STRUCT 0x40
+-#define PNP_ISA_STRUCT_LEN 0x06
+-#define PNP_CSN_CNT_OFF 0x01
+-#define PNP_RD_PORT_OFF 0x02
+-#define PNP_FUNCTION_OK 0x00
+-#define PNP_WAKE 0x03
+-#define PNP_RSRC_DATA 0x04
+-#define PNP_RSRC_READY 0x01
+-#define PNP_STATUS 0x05
+-#define PNP_ACTIVATE 0x30
+-#define PNP_CNF_IO_H 0x60
+-#define PNP_CNF_IO_L 0x61
+-#define PNP_CNF_INT 0x70
+-#define PNP_CNF_DMA 0x74
+-#define PNP_CNF_MEM 0x48
+-
+-#define BIT0 1
+-#define BIT15 0x8000
+-
+-/*
+- * Local variables:
+- *  c-basic-offset: 8
+- * End:
+- */
+-
+diff -Naur grub-0.97.orig/netboot/cs89x0.txt grub-0.97/netboot/cs89x0.txt
+--- grub-0.97.orig/netboot/cs89x0.txt	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/cs89x0.txt	1970-01-01 00:00:00.000000000 +0000
+@@ -1,26 +0,0 @@
+-Permission is granted to distribute the enclosed cs89x0.[ch] driver
+-only in conjunction with the Etherboot package.  The code is
+-ordinarily distributed under the GPL.
+-
+-Russ Nelson, January 2000
+-
+-CREDITS
+-
+-I want to thank
+-
+-  Mike Cruse <mcruse@cti-ltd.com>
+-     for providing an evaluation NIC and for sponsoring the
+-     development of this driver.
+-
+-  Randall Sears <sears@crystal.cirrus.com>
+-  Deva Bodas <bodas@crystal.cirrus.com>
+-  Andreas Kraemer <akraemer@crystal.cirrus.com>
+-  Wolfgang Krause <100303.2673@compuserve.com>
+-     for excellent technical support and for providing the required
+-     programming information. I appreciate Crystal Semiconductor's
+-     commitment towards free software.
+-
+-  Russell Nelson <nelson@crynwr.com>
+-     for writing the Linux device driver for the CS89x0
+-     chipset. Russel's code is very well designed and simplified my
+-     job a lot.
+diff -Naur grub-0.97.orig/netboot/davicom.c grub-0.97/netboot/davicom.c
+--- grub-0.97.orig/netboot/davicom.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/davicom.c	2005-08-31 19:03:35.000000000 +0000
+@@ -1,12 +1,12 @@
++#ifdef ALLMULTI
++#error multicast support is not yet implemented
++#endif
+ /*  
+     DAVICOM DM9009/DM9102/DM9102A Etherboot Driver	V1.00
+ 
+-    This driver was ported from Marty Conner's Tulip Etherboot driver. 
+-    Thanks Marty Connor (mdc@thinguin.org) 
+-    You can get Tulip driver source file from this URL:
++    This driver was ported from Marty Connor's Tulip Etherboot driver. 
++    Thanks Marty Connor (mdc@etherboot.org) 
+ 
+-    "http://etherboot.sourceforge..net/#Distribution"
+-    
+     This davicom etherboot driver supports DM9009/DM9102/DM9102A/
+     DM9102A+DM9801/DM9102A+DM9802 NICs.
+ 
+@@ -36,7 +36,6 @@
+ 			register(CR6)
+ */
+ 
+-
+ /*********************************************************************/
+ /* Declarations                                                      */
+ /*********************************************************************/
+@@ -44,7 +43,6 @@
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ 
+ #undef DAVICOM_DEBUG
+ #undef DAVICOM_DEBUG_WHERE
+@@ -99,8 +97,10 @@
+ #define eeprom_delay()  inl(ee_addr)
+ 
+ /* helpful macro if on a big_endian machine for changing byte order.
+-   not strictly needed on Intel */
++   not strictly needed on Intel
++   Already defined in Etherboot includes
+ #define le16_to_cpu(val) (val)
++*/
+ 
+ /* transmit and receive descriptor format */
+ struct txdesc {
+@@ -138,20 +138,12 @@
+ /* transmit descriptor and buffer */
+ #define NTXD 2
+ static struct txdesc txd[NTXD] __attribute__ ((aligned(4)));
+-#ifdef	USE_LOWMEM_BUFFER
+-#define txb ((char *)0x10000 - BUFLEN)
+-#else
+ static unsigned char txb[BUFLEN] __attribute__ ((aligned(4)));
+-#endif
+ 
+ /* receive descriptor(s) and buffer(s) */
+ #define NRXD 4
+ static struct rxdesc rxd[NRXD] __attribute__ ((aligned(4)));
+-#ifdef	USE_LOWMEM_BUFFER
+-#define rxb ((char *)0x10000 - NRXD * BUFLEN - BUFLEN)
+-#else
+ static unsigned char rxb[NRXD * BUFLEN] __attribute__ ((aligned(4)));
+-#endif
+ static int rxd_tail;
+ static int TxPtr;
+ 
+@@ -161,15 +153,13 @@
+ /*********************************************************************/
+ static void whereami(const char *str);
+ static int read_eeprom(unsigned long ioaddr, int location, int addr_len);
+-struct nic *davicom_probe(struct nic *nic, unsigned short *io_addrs,
+-			struct pci_device *pci);
++static int davicom_probe(struct dev *dev, struct pci_device *pci);
+ static void davicom_init_chain(struct nic *nic);	/* Sten 10/9 */
+ static void davicom_reset(struct nic *nic);
+ static void davicom_transmit(struct nic *nic, const char *d, unsigned int t,
+ 			   unsigned int s, const char *p);
+-static int davicom_poll(struct nic *nic);
+-static void davicom_disable(struct nic *nic);
+-static void whereami (const char *str);
++static int davicom_poll(struct nic *nic, int retrieve);
++static void davicom_disable(struct dev *dev);
+ #ifdef	DAVICOM_DEBUG
+ static void davicom_more(void);
+ #endif /* DAVICOM_DEBUG */
+@@ -184,13 +174,10 @@
+ /*********************************************************************/
+ /* Utility Routines                                                  */
+ /*********************************************************************/
+-
+-static inline void whereami (const char *str)
++static inline void whereami(const char *str)
+ {
+-#ifdef	DAVICOM_DEBUG_WHERE
+   printf("%s\n", str);
+   /* sleep(2); */
+-#endif
+ }
+ 
+ #ifdef	DAVICOM_DEBUG
+@@ -360,7 +347,7 @@
+ /*
+   Sense media mode and set CR6
+ */
+-static void davicom_media_chk(struct nic * nic)
++static void davicom_media_chk(struct nic * nic __unused)
+ {
+   unsigned long to, csr6;
+ 
+@@ -446,8 +433,8 @@
+   /* Sten: Set 2 TX descriptor but use one TX buffer because
+ 	   it transmit a packet and wait complete every time. */
+   for (i=0; i<NTXD; i++) {
+-    txd[i].buf1addr = &txb[0];		/* Used same TX buffer */
+-    txd[i].buf2addr = (unsigned char *)&txd[i+1]; /*  Point to Next TX desc */
++    txd[i].buf1addr = (void *)virt_to_bus(&txb[0]);	/* Used same TX buffer */
++    txd[i].buf2addr = (void *)virt_to_bus(&txd[i+1]);	/*  Point to Next TX desc */
+     txd[i].buf1sz   = 0;
+     txd[i].buf2sz   = 0;
+     txd[i].control  = 0x184;           /* Begin/End/Chain */
+@@ -466,8 +453,8 @@
+ 
+   /* setup receive descriptor */
+   for (i=0; i<NRXD; i++) {
+-    rxd[i].buf1addr = &rxb[i * BUFLEN];
+-    rxd[i].buf2addr = (unsigned char *)&rxd[i+1]; /* Point to Next RX desc */
++    rxd[i].buf1addr = (void *)virt_to_bus(&rxb[i * BUFLEN]);
++    rxd[i].buf2addr = (void *)virt_to_bus(&rxd[i+1]); /* Point to Next RX desc */
+     rxd[i].buf1sz   = BUFLEN;
+     rxd[i].buf2sz   = 0;        /* not used */
+     rxd[i].control  = 0x4;		/* Chain Structure */
+@@ -475,8 +462,8 @@
+   }
+ 
+   /* Chain the last descriptor to first */
+-  txd[NTXD - 1].buf2addr = (unsigned char *)&txd[0];
+-  rxd[NRXD - 1].buf2addr = (unsigned char *)&rxd[0];
++  txd[NTXD - 1].buf2addr = (void *)virt_to_bus(&txd[0]);
++  rxd[NRXD - 1].buf2addr = (void *)virt_to_bus(&rxd[0]);
+   TxPtr = 0;
+   rxd_tail = 0;
+ }
+@@ -488,7 +475,6 @@
+ static void davicom_reset(struct nic *nic)
+ {
+   unsigned long to;
+-  u32 addr_low, addr_high;
+ 
+   whereami("davicom_reset\n");
+ 
+@@ -507,8 +493,8 @@
+   davicom_init_chain(nic);	/* Sten 10/9 */
+ 
+   /* Point to receive descriptor */
+-  outl((unsigned long)&rxd[0], ioaddr + CSR3);
+-  outl((unsigned long)&txd[0], ioaddr + CSR4);	/* Sten 10/9 */
++  outl(virt_to_bus(&rxd[0]), ioaddr + CSR3);
++  outl(virt_to_bus(&txd[0]), ioaddr + CSR4);	/* Sten 10/9 */
+ 
+   /* According phyxcer media mode to set CR6,
+      DM9102/A phyxcer can auto-detect media mode */
+@@ -591,13 +577,15 @@
+ /*********************************************************************/
+ /* eth_poll - Wait for a frame                                       */
+ /*********************************************************************/
+-static int davicom_poll(struct nic *nic)
++static int davicom_poll(struct nic *nic, int retrieve)
+ {
+   whereami("davicom_poll\n");
+ 
+   if (rxd[rxd_tail].status & 0x80000000)
+     return 0;
+ 
++  if ( ! retrieve ) return 1;
++
+   whereami("davicom_poll got one\n");
+ 
+   nic->packetlen = (rxd[rxd_tail].status & 0x3FFF0000) >> 16;
+@@ -627,10 +615,13 @@
+ /*********************************************************************/
+ /* eth_disable - Disable the interface                               */
+ /*********************************************************************/
+-static void davicom_disable(struct nic *nic)
++static void davicom_disable(struct dev *dev)
+ {
++  struct nic *nic = (struct nic *)dev;
+   whereami("davicom_disable\n");
+ 
++  davicom_reset(nic);
++
+   /* disable interrupts */
+   outl(0x00000000, ioaddr + CSR7);
+ 
+@@ -640,24 +631,43 @@
+   /* Clear the missed-packet counter. */
+   (volatile unsigned long)inl(ioaddr + CSR8);
+ }
++
++
++/*********************************************************************/
++/* eth_irq - enable, disable and force interrupts                    */
++/*********************************************************************/
++static void davicom_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
+ 
+ /*********************************************************************/
+ /* eth_probe - Look for an adapter                                   */
+ /*********************************************************************/
+-struct nic *davicom_probe(struct nic *nic, unsigned short *io_addrs,
+-                          struct pci_device *pci)
++static int davicom_probe(struct dev *dev, struct pci_device *pci)
+ {
++  struct nic *nic = (struct nic *)dev;
+   unsigned int i;
+-  u32 l1, l2;
+ 
+   whereami("davicom_probe\n");
+ 
+-  if (io_addrs == 0 || *io_addrs == 0)
++  if (pci->ioaddr == 0)
+     return 0;
+ 
+   vendor  = pci->vendor;
+   dev_id  = pci->dev_id;
+-  ioaddr  = *io_addrs;
++  ioaddr  = pci->ioaddr & ~3;
++
++  nic->irqno  = 0;
++  nic->ioaddr = pci->ioaddr & ~3;
+ 
+   /* wakeup chip */
+   pcibios_write_config_dword(pci->bus, pci->devfn, 0x40, 0x00000000);
+@@ -683,10 +693,26 @@
+   /* initialize device */
+   davicom_reset(nic);
+ 
+-  nic->reset    = davicom_reset;
++  dev->disable  = davicom_disable;
+   nic->poll     = davicom_poll;
+   nic->transmit = davicom_transmit;
+-  nic->disable  = davicom_disable;
++  nic->irq      = davicom_irq;
+ 
+-  return nic;
++  return 1;
+ }
++
++static struct pci_id davicom_nics[] = {
++PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100"),
++PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102"),
++PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009"),
++PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132"),	/* Needs probably some fixing */
++};
++
++struct pci_driver davicom_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "DAVICOM",
++	.probe    = davicom_probe,
++	.ids      = davicom_nics,
++	.id_count = sizeof(davicom_nics)/sizeof(davicom_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/depca.c grub-0.97/netboot/depca.c
+--- grub-0.97.orig/netboot/depca.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/depca.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,752 +0,0 @@
+-/* Etherboot: depca.h merged, comments from Linux driver retained */
+-/*  depca.c: A DIGITAL DEPCA  & EtherWORKS ethernet driver for linux.
+-
+-    Written 1994, 1995 by David C. Davies.
+-
+-
+-                      Copyright 1994 David C. Davies
+-		                   and 
+-			 United States Government
+-	 (as represented by the Director, National Security Agency).  
+-
+-               Copyright 1995  Digital Equipment Corporation.
+-
+-
+-    This software may be used and distributed according to the terms of
+-    the GNU Public License, incorporated herein by reference.
+-
+-    This driver is written for the Digital Equipment Corporation series
+-    of DEPCA and EtherWORKS ethernet cards:
+-
+-        DEPCA       (the original)
+-    	DE100
+-    	DE101
+-	DE200 Turbo
+-	DE201 Turbo
+-	DE202 Turbo (TP BNC)
+-	DE210
+-	DE422       (EISA)
+-
+-    The  driver has been tested on DE100, DE200 and DE202 cards  in  a
+-    relatively busy network. The DE422 has been tested a little.
+-
+-    This  driver will NOT work   for the DE203,  DE204  and DE205 series  of
+-    cards,  since they have  a  new custom ASIC in   place of the AMD  LANCE
+-    chip.  See the 'ewrk3.c'   driver in the  Linux  source tree for running
+-    those cards.
+-
+-    I have benchmarked the driver with a  DE100 at 595kB/s to (542kB/s from)
+-    a DECstation 5000/200.
+-
+-    The author may be reached at davies@maniac.ultranet.com
+-
+-    =========================================================================
+-
+-    The  driver was originally based  on   the 'lance.c' driver from  Donald
+-    Becker   which  is included with  the  standard  driver distribution for
+-    linux.  V0.4  is  a complete  re-write  with only  the kernel  interface
+-    remaining from the original code.
+-
+-    1) Lance.c code in /linux/drivers/net/
+-    2) "Ethernet/IEEE 802.3 Family. 1992 World Network Data Book/Handbook",
+-       AMD, 1992 [(800) 222-9323].
+-    3) "Am79C90 CMOS Local Area Network Controller for Ethernet (C-LANCE)",
+-       AMD, Pub. #17881, May 1993.
+-    4) "Am79C960 PCnet-ISA(tm), Single-Chip Ethernet Controller for ISA",
+-       AMD, Pub. #16907, May 1992
+-    5) "DEC EtherWORKS LC Ethernet Controller Owners Manual",
+-       Digital Equipment corporation, 1990, Pub. #EK-DE100-OM.003
+-    6) "DEC EtherWORKS Turbo Ethernet Controller Owners Manual",
+-       Digital Equipment corporation, 1990, Pub. #EK-DE200-OM.003
+-    7) "DEPCA Hardware Reference Manual", Pub. #EK-DEPCA-PR
+-       Digital Equipment Corporation, 1989
+-    8) "DEC EtherWORKS Turbo_(TP BNC) Ethernet Controller Owners Manual",
+-       Digital Equipment corporation, 1991, Pub. #EK-DE202-OM.001
+-    
+-
+-    Peter Bauer's depca.c (V0.5) was referred to when debugging V0.1 of this
+-    driver.
+-
+-    The original DEPCA  card requires that the  ethernet ROM address counter
+-    be enabled to count and has an 8 bit NICSR.  The ROM counter enabling is
+-    only  done when a  0x08 is read as the  first address octet (to minimise
+-    the chances  of writing over some  other hardware's  I/O register).  The
+-    NICSR accesses   have been changed  to  byte accesses  for all the cards
+-    supported by this driver, since there is only one  useful bit in the MSB
+-    (remote boot timeout) and it  is not used.  Also, there  is a maximum of
+-    only 48kB network  RAM for this  card.  My thanks  to Torbjorn Lindh for
+-    help debugging all this (and holding my feet to  the fire until I got it
+-    right).
+-
+-    The DE200  series  boards have  on-board 64kB  RAM for  use  as a shared
+-    memory network  buffer. Only the DE100  cards make use  of a  2kB buffer
+-    mode which has not  been implemented in  this driver (only the 32kB  and
+-    64kB modes are supported [16kB/48kB for the original DEPCA]).
+-
+-    At the most only 2 DEPCA cards can  be supported on  the ISA bus because
+-    there is only provision  for two I/O base addresses  on each card (0x300
+-    and 0x200). The I/O address is detected by searching for a byte sequence
+-    in the Ethernet station address PROM at the expected I/O address for the
+-    Ethernet  PROM.   The shared memory  base   address  is 'autoprobed'  by
+-    looking  for the self  test PROM  and detecting the  card name.   When a
+-    second  DEPCA is  detected,  information  is   placed in the   base_addr
+-    variable of the  next device structure (which  is created if necessary),
+-    thus  enabling ethif_probe  initialization  for the device.  More than 2
+-    EISA cards can  be  supported, but  care will  be  needed assigning  the
+-    shared memory to ensure that each slot has the  correct IRQ, I/O address
+-    and shared memory address assigned.
+-
+-    ************************************************************************
+-
+-    NOTE: If you are using two  ISA DEPCAs, it is  important that you assign
+-    the base memory addresses correctly.   The  driver autoprobes I/O  0x300
+-    then 0x200.  The  base memory address for  the first device must be less
+-    than that of the second so that the auto probe will correctly assign the
+-    I/O and memory addresses on the same card.  I can't think of a way to do
+-    this unambiguously at the moment, since there is nothing on the cards to
+-    tie I/O and memory information together.
+-
+-    I am unable  to  test  2 cards   together for now,    so this  code   is
+-    unchecked. All reports, good or bad, are welcome.
+-
+-    ************************************************************************
+-
+-    The board IRQ   setting must be  at an  unused IRQ which  is auto-probed
+-    using Donald Becker's autoprobe routines. DEPCA and DE100 board IRQs are
+-    {2,3,4,5,7}, whereas the  DE200 is at {5,9,10,11,15}.  Note that IRQ2 is
+-    really IRQ9 in machines with 16 IRQ lines.
+-
+-    No 16MB memory  limitation should exist with this  driver as DMA is  not
+-    used and the common memory area is in low memory on the network card (my
+-    current system has 20MB and I've not had problems yet).
+-
+-    The ability to load this driver as a loadable module has been added. To
+-    utilise this ability, you have to do <8 things:
+-
+-    0) have a copy of the loadable modules code installed on your system.
+-    1) copy depca.c from the  /linux/drivers/net directory to your favourite
+-    temporary directory.
+-    2) if you wish, edit the  source code near  line 1530 to reflect the I/O
+-    address and IRQ you're using (see also 5).
+-    3) compile  depca.c, but include -DMODULE in  the command line to ensure
+-    that the correct bits are compiled (see end of source code).
+-    4) if you are wanting to add a new  card, goto 5. Otherwise, recompile a
+-    kernel with the depca configuration turned off and reboot.
+-    5) insmod depca.o [irq=7] [io=0x200] [mem=0xd0000] [adapter_name=DE100]
+-       [Alan Cox: Changed the code to allow command line irq/io assignments]
+-       [Dave Davies: Changed the code to allow command line mem/name
+-                                                                assignments]
+-    6) run the net startup bits for your eth?? interface manually 
+-    (usually /etc/rc.inet[12] at boot time). 
+-    7) enjoy!
+-
+-    Note that autoprobing is not allowed in loadable modules - the system is
+-    already up and running and you're messing with interrupts.
+-
+-    To unload a module, turn off the associated interface 
+-    'ifconfig eth?? down' then 'rmmod depca'.
+-
+-    To assign a base memory address for the shared memory  when running as a
+-    loadable module, see 5 above.  To include the adapter  name (if you have
+-    no PROM  but know the card name)  also see 5  above. Note that this last
+-    option  will not work  with kernel  built-in  depca's. 
+-
+-    The shared memory assignment for a loadable module  makes sense to avoid
+-    the 'memory autoprobe' picking the wrong shared memory  (for the case of
+-    2 depca's in a PC).
+-
+-    ************************************************************************
+-    Support for MCA EtherWORKS cards added 11-3-98.
+-    Verified to work with up to 2 DE212 cards in a system (although not
+-      fully stress-tested).  
+-
+-    Currently known bugs/limitations:
+-
+-    Note:  with the MCA stuff as a module, it trusts the MCA configuration,
+-           not the command line for IRQ and memory address.  You can
+-           specify them if you want, but it will throw your values out.
+-           You still have to pass the IO address it was configured as
+-           though.
+-
+-    ************************************************************************
+-    TO DO:
+-    ------
+-
+-
+-    Revision History
+-    ----------------
+-
+-    Version   Date        Description
+-  
+-      0.1     25-jan-94   Initial writing.
+-      0.2     27-jan-94   Added LANCE TX hardware buffer chaining.
+-      0.3      1-feb-94   Added multiple DEPCA support.
+-      0.31     4-feb-94   Added DE202 recognition.
+-      0.32    19-feb-94   Tidy up. Improve multi-DEPCA support.
+-      0.33    25-feb-94   Fix DEPCA ethernet ROM counter enable.
+-                          Add jabber packet fix from murf@perftech.com
+-			  and becker@super.org
+-      0.34     7-mar-94   Fix DEPCA max network memory RAM & NICSR access.
+-      0.35     8-mar-94   Added DE201 recognition. Tidied up.
+-      0.351   30-apr-94   Added EISA support. Added DE422 recognition.
+-      0.36    16-may-94   DE422 fix released.
+-      0.37    22-jul-94   Added MODULE support
+-      0.38    15-aug-94   Added DBR ROM switch in depca_close(). 
+-                          Multi DEPCA bug fix.
+-      0.38axp 15-sep-94   Special version for Alpha AXP Linux V1.0.
+-      0.381   12-dec-94   Added DE101 recognition, fix multicast bug.
+-      0.382    9-feb-95   Fix recognition bug reported by <bkm@star.rl.ac.uk>.
+-      0.383   22-feb-95   Fix for conflict with VESA SCSI reported by
+-                          <stromain@alf.dec.com>
+-      0.384   17-mar-95   Fix a ring full bug reported by <bkm@star.rl.ac.uk>
+-      0.385    3-apr-95   Fix a recognition bug reported by 
+-                                                <ryan.niemi@lastfrontier.com>
+-      0.386   21-apr-95   Fix the last fix...sorry, must be galloping senility
+-      0.40    25-May-95   Rewrite for portability & updated.
+-                          ALPHA support from <jestabro@amt.tay1.dec.com>
+-      0.41    26-Jun-95   Added verify_area() calls in depca_ioctl() from
+-                          suggestion by <heiko@colossus.escape.de>
+-      0.42    27-Dec-95   Add 'mem' shared memory assignment for loadable 
+-                          modules.
+-                          Add 'adapter_name' for loadable modules when no PROM.
+-			  Both above from a suggestion by 
+-			  <pchen@woodruffs121.residence.gatech.edu>.
+-			  Add new multicasting code.
+-      0.421   22-Apr-96	  Fix alloc_device() bug <jari@markkus2.fimr.fi>
+-      0.422   29-Apr-96	  Fix depca_hw_init() bug <jari@markkus2.fimr.fi>
+-      0.423    7-Jun-96   Fix module load bug <kmg@barco.be>
+-      0.43    16-Aug-96   Update alloc_device() to conform to de4x5.c
+-      0.44     1-Sep-97   Fix *_probe() to test check_region() first - bug
+-                           reported by <mmogilvi@elbert.uccs.edu>
+-      0.45     3-Nov-98   Added support for MCA EtherWORKS (DE210/DE212) cards
+-                           by <tymm@computer.org> 
+-      0.451    5-Nov-98   Fixed mca stuff cuz I'm a dummy. <tymm@computer.org>
+-      0.5     14-Nov-98   Re-spin for 2.1.x kernels.
+-      0.51    27-Jun-99   Correct received packet length for CRC from
+-                           report by <worm@dkik.dk>
+-
+-    =========================================================================
+-*/
+-
+-#include "etherboot.h"
+-#include "nic.h"
+-#include "cards.h"
+-
+-/*
+-** I/O addresses. Note that the 2k buffer option is not supported in
+-** this driver.
+-*/
+-#define DEPCA_NICSR ioaddr+0x00   /* Network interface CSR */
+-#define DEPCA_RBI   ioaddr+0x02   /* RAM buffer index (2k buffer mode) */
+-#define DEPCA_DATA  ioaddr+0x04   /* LANCE registers' data port */
+-#define DEPCA_ADDR  ioaddr+0x06   /* LANCE registers' address port */
+-#define DEPCA_HBASE ioaddr+0x08   /* EISA high memory base address reg. */
+-#define DEPCA_PROM  ioaddr+0x0c   /* Ethernet address ROM data port */
+-#define DEPCA_CNFG  ioaddr+0x0c   /* EISA Configuration port */
+-#define DEPCA_RBSA  ioaddr+0x0e   /* RAM buffer starting address (2k buff.) */
+-
+-/*
+-** These are LANCE registers addressable through DEPCA_ADDR 
+-*/
+-#define CSR0       0
+-#define CSR1       1
+-#define CSR2       2
+-#define CSR3       3
+-
+-/* 
+-** NETWORK INTERFACE CSR (NI_CSR) bit definitions 
+-*/
+- 
+-#define TO       	0x0100	/* Time Out for remote boot */
+-#define SHE      	0x0080  /* SHadow memory Enable */
+-#define BS       	0x0040  /* Bank Select */
+-#define BUF      	0x0020	/* BUFfer size (1->32k, 0->64k) */
+-#define RBE      	0x0010	/* Remote Boot Enable (1->net boot) */
+-#define AAC      	0x0008  /* Address ROM Address Counter (1->enable) */
+-#define _128KB      	0x0008  /* 128kB Network RAM (1->enable) */
+-#define IM       	0x0004	/* Interrupt Mask (1->mask) */
+-#define IEN      	0x0002	/* Interrupt tristate ENable (1->enable) */
+-#define LED      	0x0001	/* LED control */
+-
+-/* 
+-** Control and Status Register 0 (CSR0) bit definitions 
+-*/
+-
+-#define ERR     	0x8000 	/* Error summary */
+-#define BABL    	0x4000 	/* Babble transmitter timeout error  */
+-#define CERR    	0x2000 	/* Collision Error */
+-#define MISS    	0x1000 	/* Missed packet */
+-#define MERR    	0x0800 	/* Memory Error */
+-#define RINT    	0x0400 	/* Receiver Interrupt */
+-#define TINT    	0x0200 	/* Transmit Interrupt */
+-#define IDON    	0x0100 	/* Initialization Done */
+-#define INTR    	0x0080 	/* Interrupt Flag */
+-#define INEA    	0x0040 	/* Interrupt Enable */
+-#define RXON    	0x0020 	/* Receiver on */
+-#define TXON    	0x0010 	/* Transmitter on */
+-#define TDMD    	0x0008 	/* Transmit Demand */
+-#define STOP    	0x0004 	/* Stop */
+-#define STRT    	0x0002 	/* Start */
+-#define INIT    	0x0001 	/* Initialize */
+-#define INTM            0xff00  /* Interrupt Mask */
+-#define INTE            0xfff0  /* Interrupt Enable */
+-
+-/*
+-** CONTROL AND STATUS REGISTER 3 (CSR3)
+-*/
+-
+-#define BSWP    	0x0004	/* Byte SWaP */
+-#define ACON    	0x0002	/* ALE control */
+-#define BCON    	0x0001	/* Byte CONtrol */
+-
+-/*
+-** Initialization Block Mode Register 
+-*/
+-
+-#define PROM       	0x8000 	/* Promiscuous Mode */
+-#define EMBA       	0x0080	/* Enable Modified Back-off Algorithm */
+-#define INTL       	0x0040 	/* Internal Loopback */
+-#define DRTY       	0x0020 	/* Disable Retry */
+-#define COLL       	0x0010 	/* Force Collision */
+-#define DTCR       	0x0008 	/* Disable Transmit CRC */
+-#define LOOP       	0x0004 	/* Loopback */
+-#define DTX        	0x0002 	/* Disable the Transmitter */
+-#define DRX        	0x0001 	/* Disable the Receiver */
+-
+-/*
+-** Receive Message Descriptor 1 (RMD1) bit definitions. 
+-*/
+-
+-#define R_OWN       0x80000000 	/* Owner bit 0 = host, 1 = lance */
+-#define R_ERR     	0x4000 	/* Error Summary */
+-#define R_FRAM    	0x2000 	/* Framing Error */
+-#define R_OFLO    	0x1000 	/* Overflow Error */
+-#define R_CRC     	0x0800 	/* CRC Error */
+-#define R_BUFF    	0x0400 	/* Buffer Error */
+-#define R_STP     	0x0200 	/* Start of Packet */
+-#define R_ENP     	0x0100 	/* End of Packet */
+-
+-/*
+-** Transmit Message Descriptor 1 (TMD1) bit definitions. 
+-*/
+-
+-#define T_OWN       0x80000000 	/* Owner bit 0 = host, 1 = lance */
+-#define T_ERR     	0x4000 	/* Error Summary */
+-#define T_ADD_FCS 	0x2000 	/* More the 1 retry needed to Xmit */
+-#define T_MORE    	0x1000	/* >1 retry to transmit packet */
+-#define T_ONE     	0x0800 	/* 1 try needed to transmit the packet */
+-#define T_DEF     	0x0400 	/* Deferred */
+-#define T_STP       0x02000000 	/* Start of Packet */
+-#define T_ENP       0x01000000	/* End of Packet */
+-#define T_FLAGS     0xff000000  /* TX Flags Field */
+-
+-/*
+-** Transmit Message Descriptor 3 (TMD3) bit definitions.
+-*/
+-
+-#define TMD3_BUFF    0x8000	/* BUFFer error */
+-#define TMD3_UFLO    0x4000	/* UnderFLOw error */
+-#define TMD3_RES     0x2000	/* REServed */
+-#define TMD3_LCOL    0x1000	/* Late COLlision */
+-#define TMD3_LCAR    0x0800	/* Loss of CARrier */
+-#define TMD3_RTRY    0x0400	/* ReTRY error */
+-
+-/*
+-** Ethernet PROM defines
+-*/
+-#define PROBE_LENGTH    32
+-
+-/*
+-** Set the number of Tx and Rx buffers. Ensure that the memory requested
+-** here is <= to the amount of shared memory set up by the board switches.
+-** The number of descriptors MUST BE A POWER OF 2.
+-**
+-** total_memory = NUM_RX_DESC*(8+RX_BUFF_SZ) + NUM_TX_DESC*(8+TX_BUFF_SZ)
+-*/
+-#define NUM_RX_DESC     2               /* Number of RX descriptors */
+-#define NUM_TX_DESC     2               /* Number of TX descriptors */
+-#define RX_BUFF_SZ	1536            /* Buffer size for each Rx buffer */
+-#define TX_BUFF_SZ	1536            /* Buffer size for each Tx buffer */
+-
+-/*
+-** ISA Bus defines
+-*/
+-#define DEPCA_IO_PORTS	{0x300, 0x200, 0}
+-
+-#ifndef	DEPCA_MODEL
+-#define	DEPCA_MODEL	DEPCA
+-#endif
+-
+-static enum {
+-	DEPCA, DE100, DE101, DE200, DE201, DE202, DE210, DE212, DE422, unknown
+-} adapter = DEPCA_MODEL;
+-
+-/*
+-** Name <-> Adapter mapping
+-*/
+-
+-static char *adapter_name[] = {
+-	"DEPCA",
+-	"DE100","DE101",
+-	"DE200","DE201","DE202",
+-	"DE210","DE212",
+-	"DE422",
+-	""
+-};
+-
+-#ifndef	DEPCA_RAM_BASE
+-#define DEPCA_RAM_BASE	0xd0000
+-#endif
+-
+-/*
+-** Memory Alignment. Each descriptor is 4 longwords long. To force a
+-** particular alignment on the TX descriptor, adjust DESC_SKIP_LEN and
+-** DESC_ALIGN. ALIGN aligns the start address of the private memory area
+-** and hence the RX descriptor ring's first entry. 
+-*/
+-#define ALIGN4      ((u32)4 - 1)       /* 1 longword align */
+-#define ALIGN8      ((u32)8 - 1)       /* 2 longword (quadword) align */
+-#define ALIGN         ALIGN8              /* Keep the LANCE happy... */
+-
+-typedef	long		s32;
+-typedef	unsigned long	u32;
+-typedef	short		s16;
+-typedef	unsigned short	u16;
+-typedef	char		s8;
+-typedef	unsigned char	u8;
+-
+-/*
+-** The DEPCA Rx and Tx ring descriptors. 
+-*/
+-struct depca_rx_desc {
+-    volatile s32 base;
+-    s16 buf_length;		/* This length is negative 2's complement! */
+-    s16 msg_length;		/* This length is "normal". */
+-};
+-
+-struct depca_tx_desc {
+-    volatile s32 base;
+-    s16 length;		        /* This length is negative 2's complement! */
+-    s16 misc;                   /* Errors and TDR info */
+-};
+-
+-#define LA_MASK 0x0000ffff      /* LANCE address mask for mapping network RAM
+-				   to LANCE memory address space */
+-
+-/*
+-** The Lance initialization block, described in databook, in common memory.
+-*/
+-struct depca_init {
+-    u16 mode;	                /* Mode register */
+-    u8  phys_addr[ETH_ALEN];	/* Physical ethernet address */
+-    u8  mcast_table[8];	        /* Multicast Hash Table. */
+-    u32 rx_ring;     	        /* Rx ring base pointer & ring length */
+-    u32 tx_ring;	        /* Tx ring base pointer & ring length */
+-};
+-
+-struct depca_private {
+-	struct depca_rx_desc	*rx_ring;
+-	struct depca_tx_desc	*tx_ring;
+-	struct depca_init	init_block;	/* Shadow init block */
+-	char			*rx_memcpy[NUM_RX_DESC];
+-	char			*tx_memcpy[NUM_TX_DESC];
+-	u32			bus_offset;	/* ISA bus address offset */
+-	u32			sh_mem;		/* address of shared mem */
+-	u32			dma_buffs;	/* Rx & Tx buffer start */
+-	int			rx_cur, tx_cur;	/* Next free ring entry */
+-	int			txRingMask, rxRingMask;
+-	s32			rx_rlen, tx_rlen;
+-	/* log2([rt]xRingMask+1) for the descriptors */
+-};
+-
+-static Address		mem_start = DEPCA_RAM_BASE;
+-static Address		mem_len, offset;
+-static unsigned short	ioaddr = 0;
+-static struct depca_private	lp;
+-
+-/*
+-** Miscellaneous defines...
+-*/
+-#define STOP_DEPCA \
+-    outw(CSR0, DEPCA_ADDR);\
+-    outw(STOP, DEPCA_DATA)
+-
+-/* Initialize the lance Rx and Tx descriptor rings. */
+-static void depca_init_ring(struct nic *nic)
+-{
+-	int	i;
+-	u32	p;
+-
+-	lp.rx_cur = lp.tx_cur = 0;
+-	/* Initialize the base addresses and length of each buffer in the ring */
+-	for (i = 0; i <= lp.rxRingMask; i++) {
+-		writel((p = lp.dma_buffs + i * RX_BUFF_SZ) | R_OWN, &lp.rx_ring[i].base);
+-		writew(-RX_BUFF_SZ, &lp.rx_ring[i].buf_length);
+-		lp.rx_memcpy[i] = (char *) (p + lp.bus_offset);
+-	}
+-	for (i = 0; i <= lp.txRingMask; i++) {
+-		writel((p = lp.dma_buffs + (i + lp.txRingMask + 1) * TX_BUFF_SZ) & 0x00ffffff, &lp.tx_ring[i].base);
+-		lp.tx_memcpy[i] = (char *) (p + lp.bus_offset);
+-	}
+-
+-	/* Set up the initialization block */
+-	lp.init_block.rx_ring = ((u32) ((u32) lp.rx_ring) & LA_MASK) | lp.rx_rlen;
+-	lp.init_block.tx_ring = ((u32) ((u32) lp.tx_ring) & LA_MASK) | lp.tx_rlen;
+-	for (i = 0; i < ETH_ALEN; i++)
+-		lp.init_block.phys_addr[i] = nic->node_addr[i];
+-	lp.init_block.mode = 0x0000;	/* Enable the Tx and Rx */
+-	memset(lp.init_block.mcast_table, 0, sizeof(lp.init_block.mcast_table));
+-}
+-
+-static void LoadCSRs(void)
+-{
+-	outw(CSR1, DEPCA_ADDR);	/* initialisation block address LSW */
+-	outw((u16) (lp.sh_mem & LA_MASK), DEPCA_DATA);
+-	outw(CSR2, DEPCA_ADDR);	/* initialisation block address MSW */
+-	outw((u16) ((lp.sh_mem & LA_MASK) >> 16), DEPCA_DATA);
+-	outw(CSR3, DEPCA_ADDR);	/* ALE control */
+-	outw(ACON, DEPCA_DATA);
+-	outw(CSR0, DEPCA_ADDR);	/* Point back to CSR0 */
+-}
+-
+-static int InitRestartDepca(void)
+-{
+-	int		i;
+-
+-	/* Copy the shadow init_block to shared memory */
+-	memcpy_toio((char *)lp.sh_mem, &lp.init_block, sizeof(struct depca_init));
+-	outw(CSR0, DEPCA_ADDR);		/* point back to CSR0 */
+-	outw(INIT, DEPCA_DATA);		/* initialise DEPCA */
+-
+-	for (i = 0; i < 100 && !(inw(DEPCA_DATA) & IDON); i++)
+-		;
+-	if (i < 100) {
+-		/* clear IDON by writing a 1, and start LANCE */
+-		outw(IDON | STRT, DEPCA_DATA);
+-	} else {
+-		printf("DEPCA not initialised\n");
+-		return (1);
+-	}
+-	return (0);
+-}
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void depca_reset(struct nic *nic)
+-{
+-	s16	nicsr;
+-	int	i, j;
+-
+-	STOP_DEPCA;
+-	nicsr = inb(DEPCA_NICSR);
+-	nicsr = ((nicsr & ~SHE & ~RBE & ~IEN) | IM);
+-	outb(nicsr, DEPCA_NICSR);
+-	if (inw(DEPCA_DATA) != STOP)
+-	{
+-		printf("depca: Cannot stop NIC\n");
+-		return;
+-	}
+-
+-	/* Initialisation block */
+-	lp.sh_mem = mem_start;
+-	mem_start += sizeof(struct depca_init);
+-	/* Tx & Rx descriptors (aligned to a quadword boundary) */
+-	mem_start = (mem_start + ALIGN) & ~ALIGN;
+-	lp.rx_ring = (struct depca_rx_desc *) mem_start;
+-	mem_start += (sizeof(struct depca_rx_desc) * NUM_RX_DESC);
+-	lp.tx_ring = (struct depca_tx_desc *) mem_start;
+-	mem_start += (sizeof(struct depca_tx_desc) * NUM_TX_DESC);
+-
+-	lp.bus_offset = mem_start & 0x00ff0000;
+-	/* LANCE re-mapped start address */
+-	lp.dma_buffs = mem_start & LA_MASK;
+-
+-	/* Finish initialising the ring information. */
+-	lp.rxRingMask = NUM_RX_DESC - 1;
+-	lp.txRingMask = NUM_TX_DESC - 1;
+-
+-	/* Calculate Tx/Rx RLEN size for the descriptors. */
+-	for (i = 0, j = lp.rxRingMask; j > 0; i++) {
+-		j >>= 1;
+-	}
+-	lp.rx_rlen = (s32) (i << 29);
+-	for (i = 0, j = lp.txRingMask; j > 0; i++) {
+-		j >>= 1;
+-	}
+-	lp.tx_rlen = (s32) (i << 29);
+-
+-	/* Load the initialisation block */
+-	depca_init_ring(nic);
+-	LoadCSRs();
+-	InitRestartDepca();
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int depca_poll(struct nic *nic)
+-{
+-	int		entry;
+-	u32		status;
+-
+-	entry = lp.rx_cur;
+-	if ((status = readl(&lp.rx_ring[entry].base) & R_OWN))
+-		return (0);
+-	memcpy(nic->packet, lp.rx_memcpy[entry], nic->packetlen = lp.rx_ring[entry].msg_length);
+-	lp.rx_ring[entry].base |= R_OWN;
+-	lp.rx_cur = (++lp.rx_cur) & lp.rxRingMask;
+-	return (1);
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void depca_transmit(
+-	struct nic *nic,
+-	const char *d,			/* Destination */
+-	unsigned int t,			/* Type */
+-	unsigned int s,			/* size */
+-	const char *p)			/* Packet */
+-{
+-	int		entry, len;
+-	char		*mem;
+-
+-	/* send the packet to destination */
+-	/*
+-	** Caution: the right order is important here... dont
+-	** setup the ownership rights until all the other
+-	** information is in place
+-	*/
+-	mem = lp.tx_memcpy[entry = lp.tx_cur];
+-	memcpy_toio(mem, d, ETH_ALEN);
+-	memcpy_toio(mem + ETH_ALEN, nic->node_addr, ETH_ALEN);
+-	mem[ETH_ALEN * 2] = t >> 8;
+-	mem[ETH_ALEN * 2 + 1] = t;
+-	memcpy_toio(mem + ETH_HLEN, p, s);
+-	s += ETH_HLEN;
+-	len = (s < ETH_ZLEN ? ETH_ZLEN : s);
+-	/* clean out flags */
+-	writel(readl(&lp.tx_ring[entry].base) & ~T_FLAGS, &lp.tx_ring[entry].base);
+-	/* clears other error flags */
+-	writew(0x0000, &lp.tx_ring[entry].misc);
+-	/* packet length in buffer */
+-	writew(-len, &lp.tx_ring[entry].length);
+-	/* start and end of packet, ownership */
+-	writel(readl(&lp.tx_ring[entry].base) | (T_STP|T_ENP|T_OWN), &lp.tx_ring[entry].base);
+-	/* update current pointers */
+-	lp.tx_cur = (++lp.tx_cur) & lp.txRingMask;
+-}
+-
+-/**************************************************************************
+-DISABLE - Turn off ethernet interface
+-***************************************************************************/
+-static void depca_disable(struct nic *nic)
+-{
+-	STOP_DEPCA;
+-}
+-
+-/*
+-** Look for a special sequence in the Ethernet station address PROM that
+-** is common across all DEPCA products. Note that the original DEPCA needs
+-** its ROM address counter to be initialized and enabled. Only enable
+-** if the first address octet is a 0x08 - this minimises the chances of
+-** messing around with some other hardware, but it assumes that this DEPCA
+-** card initialized itself correctly.
+-**
+-** Search the Ethernet address ROM for the signature. Since the ROM address
+-** counter can start at an arbitrary point, the search must include the entire
+-** probe sequence length plus the (length_of_the_signature - 1).
+-** Stop the search IMMEDIATELY after the signature is found so that the
+-** PROM address counter is correctly positioned at the start of the
+-** ethernet address for later read out.
+-*/
+-static int depca_probe1(struct nic *nic)
+-{
+-	u8	data, nicsr;
+-	/* This is only correct for little endian machines, but then
+-	   Etherboot doesn't work on anything but a PC */
+-	u8	sig[] = { 0xFF, 0x00, 0x55, 0xAA, 0xFF, 0x00, 0x55, 0xAA };
+-	int	i, j;
+-	long	sum, chksum;
+-
+-	data = inb(DEPCA_PROM);		/* clear counter on DEPCA */
+-	data = inb(DEPCA_PROM);		/* read data */
+-	if (data == 0x8) {
+-		nicsr = inb(DEPCA_NICSR);
+-		nicsr |= AAC;
+-		outb(nicsr, DEPCA_NICSR);
+-	}
+-	for (i = 0, j = 0; j < (int)sizeof(sig) && i < PROBE_LENGTH+((int)sizeof(sig))-1; ++i) {
+-		data = inb(DEPCA_PROM);
+-		if (data == sig[j])		/* track signature */
+-			++j;
+-		else
+-			j = (data == sig[0]) ? 1 : 0;
+-	}
+-	if (j != sizeof(sig))
+-		return (0);
+-	/* put the card in its initial state */
+-	STOP_DEPCA;
+-	nicsr = ((inb(DEPCA_NICSR) & ~SHE & ~RBE & ~IEN) | IM);
+-	outb(nicsr, DEPCA_NICSR);
+-	if (inw(DEPCA_DATA) != STOP)
+-		return (0);
+-	memcpy((char *)mem_start, sig, sizeof(sig));
+-	if (memcmp((char *)mem_start, sig, sizeof(sig)) != 0)
+-		return (0);
+-	for (i = 0, j = 0, sum = 0; j < 3; j++) {
+-		sum <<= 1;
+-		if (sum > 0xFFFF)
+-			sum -= 0xFFFF;
+-		sum += (u8)(nic->node_addr[i++] = inb(DEPCA_PROM));
+-		sum += (u16)((nic->node_addr[i++] = inb(DEPCA_PROM)) << 8);
+-		if (sum > 0xFFFF)
+-			sum -= 0xFFFF;
+-	}
+-	if (sum == 0xFFFF)
+-		sum = 0;
+-	chksum = (u8)inb(DEPCA_PROM);
+-	chksum |= (u16)(inb(DEPCA_PROM) << 8);
+-	mem_len = (adapter == DEPCA) ? (48 << 10) : (64 << 10);
+-	offset = 0;
+-	if (nicsr & BUF) {
+-		offset = 0x8000;
+-		nicsr &= ~BS;
+-		mem_len -= (32 << 10);
+-	}
+-	if (adapter != DEPCA)	/* enable shadow RAM */
+-		outb(nicsr |= SHE, DEPCA_NICSR);
+-	printf("%s base %#hX, memory [%#hX-%#hX], addr %!",
+-		adapter_name[adapter], ioaddr, mem_start, mem_start + mem_len,
+-		nic->node_addr);
+-	if (sum != chksum)
+-		printf(" (bad checksum)");
+-	putchar('\n');
+-	return (1);
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-struct nic *depca_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	static unsigned short	base[] = DEPCA_IO_PORTS;
+-	int			i;
+-
+-	if (probe_addrs == 0 || probe_addrs[0] == 0)
+-		probe_addrs = base;	/* Use defaults */
+-	for (i = 0; (ioaddr = base[i]) != 0; ++i) {
+-		if (depca_probe1(nic))
+-			break;
+-	}
+-	if (ioaddr == 0)
+-		return (0);
+-	depca_reset(nic);
+-	/* point to NIC specific routines */
+-	nic->reset = depca_reset;
+-	nic->poll = depca_poll;
+-	nic->transmit = depca_transmit;
+-	nic->disable = depca_disable;
+-	return (nic);
+-}
+diff -Naur grub-0.97.orig/netboot/dev.h grub-0.97/netboot/dev.h
+--- grub-0.97.orig/netboot/dev.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/dev.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,83 @@
++#ifndef _DEV_H
++#define _DEV_H
++
++#include "isa.h"
++#include "pci.h"
++
++/* Need to check the packing of this struct if Etherboot is ported */
++struct dev_id
++{
++	unsigned short	vendor_id;
++	unsigned short	device_id;
++	unsigned char	bus_type;
++#define	PCI_BUS_TYPE	1
++#define	ISA_BUS_TYPE	2
++};
++
++/* Dont use sizeof, that will include the padding */
++#define	DEV_ID_SIZE	8
++
++
++struct pci_probe_state 
++{
++#ifdef CONFIG_PCI
++	struct pci_device dev;
++	int advance;
++#else
++	int dummy;
++#endif
++};
++struct isa_probe_state
++{
++#ifdef CONFIG_ISA
++	const struct isa_driver *driver;
++	int advance;
++#else
++	int dummy;
++#endif
++};
++
++union probe_state
++{
++	struct pci_probe_state pci;
++	struct isa_probe_state isa;
++};
++
++struct dev
++{
++	void		(*disable)P((struct dev *));
++	struct dev_id	devid;	/* device ID string (sent to DHCP server) */
++	int		index;  /* Index of next device on this controller to probe */
++	int		type;		/* Type of device I am probing for */
++	int		how_probe;	/* First, next or awake */
++	int 		to_probe;	/* Flavor of device I am probing */
++	int		failsafe;	/* Failsafe probe requested */
++	int		type_index;	/* Index of this device (within type) */
++#define	PROBE_NONE 0
++#define PROBE_PCI  1
++#define PROBE_ISA  2
++	union probe_state state;
++};
++
++
++#define NIC_DRIVER    0
++#define DISK_DRIVER   1
++#define FLOPPY_DRIVER 2
++
++#define BRIDGE_DRIVER 1000
++
++#define PROBE_FIRST  (-1)
++#define PROBE_NEXT   0
++#define PROBE_AWAKE  1		/* After calling disable bring up the same device */
++
++/* The probe result codes are selected
++ * to allow them to be fed back into the probe
++ * routine and get a successful probe.
++ */
++#define PROBE_FAILED PROBE_FIRST
++#define PROBE_WORKED  PROBE_NEXT
++
++extern int probe(struct dev *dev);
++extern void disable(struct dev *dev);
++
++#endif /* _DEV_H */
+diff -Naur grub-0.97.orig/netboot/e1000.c grub-0.97/netboot/e1000.c
+--- grub-0.97.orig/netboot/e1000.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/e1000.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,3682 @@
++/**************************************************************************
++Etherboot -  BOOTP/TFTP Bootstrap Program
++Inter Pro 1000 for Etherboot
++Drivers are port from Intel's Linux driver e1000-4.3.15
++
++***************************************************************************/
++/*******************************************************************************
++
++  
++  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
++  
++  This program is free software; you can redistribute it and/or modify it 
++  under the terms of the GNU General Public License as published by the Free 
++  Software Foundation; either version 2 of the License, or (at your option) 
++  any later version.
++  
++  This program is distributed in the hope that it will be useful, but WITHOUT 
++  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
++  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
++  more details.
++  
++  You should have received a copy of the GNU General Public License along with
++  this program; if not, write to the Free Software Foundation, Inc., 59 
++  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++  
++  The full GNU General Public License is included in this distribution in the
++  file called LICENSE.
++  
++  Contact Information:
++  Linux NICS <linux.nics@intel.com>
++  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
++
++*******************************************************************************/
++/*
++ *  Copyright (C) Archway Digital Solutions.
++ *
++ *  written by Chrsitopher Li <cli at arcyway dot com> or <chrisl at gnuchina dot org>
++ *  2/9/2002
++ *
++ *  Copyright (C) Linux Networx.
++ *  Massive upgrade to work with the new intel gigabit NICs.
++ *  <ebiederman at lnxi dot com>
++ *
++ *  Support for 82541ei & 82547ei chips from Intel's Linux driver 5.1.13 added by
++ *  Georg Baum <gbaum@users.sf.net>, sponsored by PetaMem GmbH and linkLINE Communications, Inc.
++ *
++ *  01/2004: Updated to Linux driver 5.2.22 by Georg Baum <gbaum@users.sf.net>
++ */
++
++/* to get some global routines like printf */
++#include "etherboot.h"
++/* to get the interface to the body of the program */
++#include "nic.h"
++/* to get the PCI support functions, if this is a PCI NIC */
++#include "pci.h"
++#include "timer.h"
++
++typedef unsigned char *dma_addr_t;
++
++typedef enum {
++	FALSE = 0,
++	TRUE = 1
++} boolean_t;
++
++#define DEBUG 0
++
++
++/* Some pieces of code are disabled with #if 0 ... #endif.
++ * They are not deleted to show where the etherboot driver differs
++ * from the linux driver below the function level.
++ * Some member variables of the hw struct have been eliminated
++ * and the corresponding inplace checks inserted instead.
++ * Pieces such as LED handling that we definitely don't need are deleted.
++ *
++ * The following defines should not be needed normally,
++ * but may be helpful for debugging purposes. */
++
++/* Define this if you want to program the transmission control register
++ * the way the Linux driver does it. */
++#undef LINUX_DRIVER_TCTL
++
++/* Define this to behave more like the Linux driver. */
++#undef LINUX_DRIVER
++
++#include "e1000_hw.h"
++
++/* NIC specific static variables go here */
++static struct e1000_hw hw;
++static char tx_pool[128 + 16];
++static char rx_pool[128 + 16];
++static char packet[2096];
++
++static struct e1000_tx_desc *tx_base;
++static struct e1000_rx_desc *rx_base;
++
++static int tx_tail;
++static int rx_tail, rx_last;
++
++/* Function forward declarations */
++static int e1000_setup_link(struct e1000_hw *hw);
++static int e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
++static int e1000_setup_copper_link(struct e1000_hw *hw);
++static int e1000_phy_setup_autoneg(struct e1000_hw *hw);
++static void e1000_config_collision_dist(struct e1000_hw *hw);
++static int e1000_config_mac_to_phy(struct e1000_hw *hw);
++static int e1000_config_fc_after_link_up(struct e1000_hw *hw);
++static int e1000_check_for_link(struct e1000_hw *hw);
++static int e1000_wait_autoneg(struct e1000_hw *hw);
++static void e1000_get_speed_and_duplex(struct e1000_hw *hw, uint16_t *speed, uint16_t *duplex);
++static int e1000_read_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy_data);
++static int e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy_data);
++static int e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t phy_data);
++static int e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr, uint16_t phy_data);
++static void e1000_phy_hw_reset(struct e1000_hw *hw);
++static int e1000_phy_reset(struct e1000_hw *hw);
++static int e1000_detect_gig_phy(struct e1000_hw *hw);
++
++/* Printing macros... */
++
++#define E1000_ERR(args...) printf("e1000: " args)
++
++#if DEBUG >= 3
++#define E1000_DBG(args...) printf("e1000: " args)
++#else
++#define E1000_DBG(args...)
++#endif
++
++#define MSGOUT(S, A, B)     printk(S "\n", A, B)
++#if DEBUG >= 2
++#define DEBUGFUNC(F)        DEBUGOUT(F "\n");
++#else
++#define DEBUGFUNC(F)
++#endif
++#if DEBUG >= 1
++#define DEBUGOUT(S) printf(S)
++#define DEBUGOUT1(S,A) printf(S,A)
++#define DEBUGOUT2(S,A,B) printf(S,A,B)
++#define DEBUGOUT3(S,A,B,C) printf(S,A,B,C)
++#define DEBUGOUT7(S,A,B,C,D,E,F,G) printf(S,A,B,C,D,E,F,G)
++#else
++#define DEBUGOUT(S)
++#define DEBUGOUT1(S,A)
++#define DEBUGOUT2(S,A,B)
++#define DEBUGOUT3(S,A,B,C)
++#define DEBUGOUT7(S,A,B,C,D,E,F,G)
++#endif
++
++#define E1000_WRITE_REG(a, reg, value) ( \
++    ((a)->mac_type >= e1000_82543) ? \
++        (writel((value), ((a)->hw_addr + E1000_##reg))) : \
++        (writel((value), ((a)->hw_addr + E1000_82542_##reg))))
++
++#define E1000_READ_REG(a, reg) ( \
++    ((a)->mac_type >= e1000_82543) ? \
++        readl((a)->hw_addr + E1000_##reg) : \
++        readl((a)->hw_addr + E1000_82542_##reg))
++
++#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
++    ((a)->mac_type >= e1000_82543) ? \
++        writel((value), ((a)->hw_addr + E1000_##reg + ((offset) << 2))) : \
++        writel((value), ((a)->hw_addr + E1000_82542_##reg + ((offset) << 2))))
++
++#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
++    ((a)->mac_type >= e1000_82543) ? \
++        readl((a)->hw_addr + E1000_##reg + ((offset) << 2)) : \
++        readl((a)->hw_addr + E1000_82542_##reg + ((offset) << 2)))
++
++#define E1000_WRITE_FLUSH(a) {uint32_t x; x = E1000_READ_REG(a, STATUS);}
++
++uint32_t
++e1000_io_read(struct e1000_hw *hw __unused, uint32_t port)
++{
++        return inl(port);
++}
++
++void
++e1000_io_write(struct e1000_hw *hw __unused, uint32_t port, uint32_t value)
++{
++        outl(value, port);
++}
++
++static inline void e1000_pci_set_mwi(struct e1000_hw *hw)
++{
++	pci_write_config_word(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
++}
++
++static inline void e1000_pci_clear_mwi(struct e1000_hw *hw)
++{
++	pci_write_config_word(hw->pdev, PCI_COMMAND,
++			      hw->pci_cmd_word & ~PCI_COMMAND_INVALIDATE);
++}
++
++/******************************************************************************
++ * Raises the EEPROM's clock input.
++ *
++ * hw - Struct containing variables accessed by shared code
++ * eecd - EECD's current value
++ *****************************************************************************/
++static void
++e1000_raise_ee_clk(struct e1000_hw *hw,
++                   uint32_t *eecd)
++{
++	/* Raise the clock input to the EEPROM (by setting the SK bit), and then
++	 * wait <delay> microseconds.
++	 */
++	*eecd = *eecd | E1000_EECD_SK;
++	E1000_WRITE_REG(hw, EECD, *eecd);
++	E1000_WRITE_FLUSH(hw);
++	udelay(hw->eeprom.delay_usec);
++}
++
++/******************************************************************************
++ * Lowers the EEPROM's clock input.
++ *
++ * hw - Struct containing variables accessed by shared code 
++ * eecd - EECD's current value
++ *****************************************************************************/
++static void
++e1000_lower_ee_clk(struct e1000_hw *hw,
++                   uint32_t *eecd)
++{
++	/* Lower the clock input to the EEPROM (by clearing the SK bit), and then 
++	 * wait 50 microseconds. 
++	 */
++	*eecd = *eecd & ~E1000_EECD_SK;
++	E1000_WRITE_REG(hw, EECD, *eecd);
++	E1000_WRITE_FLUSH(hw);
++	udelay(hw->eeprom.delay_usec);
++}
++
++/******************************************************************************
++ * Shift data bits out to the EEPROM.
++ *
++ * hw - Struct containing variables accessed by shared code
++ * data - data to send to the EEPROM
++ * count - number of bits to shift out
++ *****************************************************************************/
++static void
++e1000_shift_out_ee_bits(struct e1000_hw *hw,
++                        uint16_t data,
++                        uint16_t count)
++{
++	struct e1000_eeprom_info *eeprom = &hw->eeprom;
++	uint32_t eecd;
++	uint32_t mask;
++	
++	/* We need to shift "count" bits out to the EEPROM. So, value in the
++	 * "data" parameter will be shifted out to the EEPROM one bit at a time.
++	 * In order to do this, "data" must be broken down into bits. 
++	 */
++	mask = 0x01 << (count - 1);
++	eecd = E1000_READ_REG(hw, EECD);
++	if (eeprom->type == e1000_eeprom_microwire) {
++		eecd &= ~E1000_EECD_DO;
++	} else if (eeprom->type == e1000_eeprom_spi) {
++		eecd |= E1000_EECD_DO;
++	}
++	do {
++		/* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
++		 * and then raising and then lowering the clock (the SK bit controls
++		 * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
++		 * by setting "DI" to "0" and then raising and then lowering the clock.
++		 */
++		eecd &= ~E1000_EECD_DI;
++		
++		if(data & mask)
++			eecd |= E1000_EECD_DI;
++		
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		
++		udelay(eeprom->delay_usec);
++		
++		e1000_raise_ee_clk(hw, &eecd);
++		e1000_lower_ee_clk(hw, &eecd);
++		
++		mask = mask >> 1;
++		
++	} while(mask);
++
++	/* We leave the "DI" bit set to "0" when we leave this routine. */
++	eecd &= ~E1000_EECD_DI;
++	E1000_WRITE_REG(hw, EECD, eecd);
++}
++
++/******************************************************************************
++ * Shift data bits in from the EEPROM
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static uint16_t
++e1000_shift_in_ee_bits(struct e1000_hw *hw,
++                       uint16_t count)
++{
++	uint32_t eecd;
++	uint32_t i;
++	uint16_t data;
++	
++	/* In order to read a register from the EEPROM, we need to shift 'count' 
++	 * bits in from the EEPROM. Bits are "shifted in" by raising the clock
++	 * input to the EEPROM (setting the SK bit), and then reading the value of
++	 * the "DO" bit.  During this "shifting in" process the "DI" bit should
++	 * always be clear.
++	 */
++	
++	eecd = E1000_READ_REG(hw, EECD);
++	
++	eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
++	data = 0;
++	
++	for(i = 0; i < count; i++) {
++		data = data << 1;
++		e1000_raise_ee_clk(hw, &eecd);
++		
++		eecd = E1000_READ_REG(hw, EECD);
++		
++		eecd &= ~(E1000_EECD_DI);
++		if(eecd & E1000_EECD_DO)
++			data |= 1;
++		
++		e1000_lower_ee_clk(hw, &eecd);
++	}
++	
++	return data;
++}
++
++/******************************************************************************
++ * Prepares EEPROM for access
++ *
++ * hw - Struct containing variables accessed by shared code
++ *
++ * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This 
++ * function should be called before issuing a command to the EEPROM.
++ *****************************************************************************/
++static int32_t
++e1000_acquire_eeprom(struct e1000_hw *hw)
++{
++	struct e1000_eeprom_info *eeprom = &hw->eeprom;
++	uint32_t eecd, i=0;
++
++	eecd = E1000_READ_REG(hw, EECD);
++
++	/* Request EEPROM Access */
++	if(hw->mac_type > e1000_82544) {
++		eecd |= E1000_EECD_REQ;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		eecd = E1000_READ_REG(hw, EECD);
++		while((!(eecd & E1000_EECD_GNT)) &&
++		      (i < E1000_EEPROM_GRANT_ATTEMPTS)) {
++			i++;
++			udelay(5);
++			eecd = E1000_READ_REG(hw, EECD);
++		}
++		if(!(eecd & E1000_EECD_GNT)) {
++			eecd &= ~E1000_EECD_REQ;
++			E1000_WRITE_REG(hw, EECD, eecd);
++			DEBUGOUT("Could not acquire EEPROM grant\n");
++			return -E1000_ERR_EEPROM;
++		}
++	}
++
++	/* Setup EEPROM for Read/Write */
++
++	if (eeprom->type == e1000_eeprom_microwire) {
++		/* Clear SK and DI */
++		eecd &= ~(E1000_EECD_DI | E1000_EECD_SK);
++		E1000_WRITE_REG(hw, EECD, eecd);
++
++		/* Set CS */
++		eecd |= E1000_EECD_CS;
++		E1000_WRITE_REG(hw, EECD, eecd);
++	} else if (eeprom->type == e1000_eeprom_spi) {
++		/* Clear SK and CS */
++		eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
++		E1000_WRITE_REG(hw, EECD, eecd);
++		udelay(1);
++	}
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Returns EEPROM to a "standby" state
++ * 
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static void
++e1000_standby_eeprom(struct e1000_hw *hw)
++{
++	struct e1000_eeprom_info *eeprom = &hw->eeprom;
++	uint32_t eecd;
++	
++	eecd = E1000_READ_REG(hw, EECD);
++
++	if(eeprom->type == e1000_eeprom_microwire) {
++
++		/* Deselect EEPROM */
++		eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(eeprom->delay_usec);
++	
++		/* Clock high */
++		eecd |= E1000_EECD_SK;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(eeprom->delay_usec);
++	
++		/* Select EEPROM */
++		eecd |= E1000_EECD_CS;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(eeprom->delay_usec);
++
++		/* Clock low */
++		eecd &= ~E1000_EECD_SK;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(eeprom->delay_usec);
++	} else if(eeprom->type == e1000_eeprom_spi) {
++		/* Toggle CS to flush commands */
++		eecd |= E1000_EECD_CS;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(eeprom->delay_usec);
++		eecd &= ~E1000_EECD_CS;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(eeprom->delay_usec);
++	}
++}
++
++/******************************************************************************
++ * Terminates a command by inverting the EEPROM's chip select pin
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static void
++e1000_release_eeprom(struct e1000_hw *hw)
++{
++	uint32_t eecd;
++
++	eecd = E1000_READ_REG(hw, EECD);
++
++	if (hw->eeprom.type == e1000_eeprom_spi) {
++		eecd |= E1000_EECD_CS;  /* Pull CS high */
++		eecd &= ~E1000_EECD_SK; /* Lower SCK */
++
++		E1000_WRITE_REG(hw, EECD, eecd);
++
++		udelay(hw->eeprom.delay_usec);
++	} else if(hw->eeprom.type == e1000_eeprom_microwire) {
++		/* cleanup eeprom */
++
++		/* CS on Microwire is active-high */
++		eecd &= ~(E1000_EECD_CS | E1000_EECD_DI);
++
++		E1000_WRITE_REG(hw, EECD, eecd);
++
++		/* Rising edge of clock */
++		eecd |= E1000_EECD_SK;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(hw->eeprom.delay_usec);
++
++		/* Falling edge of clock */
++		eecd &= ~E1000_EECD_SK;
++		E1000_WRITE_REG(hw, EECD, eecd);
++		E1000_WRITE_FLUSH(hw);
++		udelay(hw->eeprom.delay_usec);
++	}
++
++	/* Stop requesting EEPROM access */
++	if(hw->mac_type > e1000_82544) {
++		eecd &= ~E1000_EECD_REQ;
++		E1000_WRITE_REG(hw, EECD, eecd);
++	}
++}
++
++/******************************************************************************
++ * Reads a 16 bit word from the EEPROM.
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static int32_t
++e1000_spi_eeprom_ready(struct e1000_hw *hw)
++{
++	uint16_t retry_count = 0;
++	uint8_t spi_stat_reg;
++
++	/* Read "Status Register" repeatedly until the LSB is cleared.  The
++	 * EEPROM will signal that the command has been completed by clearing
++	 * bit 0 of the internal status register.  If it's not cleared within
++	 * 5 milliseconds, then error out.
++	 */
++	retry_count = 0;
++	do {
++		e1000_shift_out_ee_bits(hw, EEPROM_RDSR_OPCODE_SPI,
++		hw->eeprom.opcode_bits);
++		spi_stat_reg = (uint8_t)e1000_shift_in_ee_bits(hw, 8);
++		if (!(spi_stat_reg & EEPROM_STATUS_RDY_SPI))
++			break;
++
++		udelay(5);
++		retry_count += 5;
++
++	} while(retry_count < EEPROM_MAX_RETRY_SPI);
++
++	/* ATMEL SPI write time could vary from 0-20mSec on 3.3V devices (and
++	 * only 0-5mSec on 5V devices)
++	 */
++	if(retry_count >= EEPROM_MAX_RETRY_SPI) {
++		DEBUGOUT("SPI EEPROM Status error\n");
++		return -E1000_ERR_EEPROM;
++	}
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Reads a 16 bit word from the EEPROM.
++ *
++ * hw - Struct containing variables accessed by shared code
++ * offset - offset of  word in the EEPROM to read
++ * data - word read from the EEPROM
++ * words - number of words to read
++ *****************************************************************************/
++static int
++e1000_read_eeprom(struct e1000_hw *hw,
++                  uint16_t offset,
++		  uint16_t words,
++                  uint16_t *data)
++{
++	struct e1000_eeprom_info *eeprom = &hw->eeprom;
++	uint32_t i = 0;
++	
++	DEBUGFUNC("e1000_read_eeprom");
++
++	/* A check for invalid values:  offset too large, too many words, and not
++	 * enough words.
++	 */
++	if((offset > eeprom->word_size) || (words > eeprom->word_size - offset) ||
++	   (words == 0)) {
++		DEBUGOUT("\"words\" parameter out of bounds\n");
++		return -E1000_ERR_EEPROM;
++	}
++
++	/*  Prepare the EEPROM for reading  */
++	if(e1000_acquire_eeprom(hw) != E1000_SUCCESS)
++		return -E1000_ERR_EEPROM;
++
++	if(eeprom->type == e1000_eeprom_spi) {
++		uint16_t word_in;
++		uint8_t read_opcode = EEPROM_READ_OPCODE_SPI;
++
++		if(e1000_spi_eeprom_ready(hw)) {
++			e1000_release_eeprom(hw);
++			return -E1000_ERR_EEPROM;
++		}
++
++		e1000_standby_eeprom(hw);
++
++		/* Some SPI eeproms use the 8th address bit embedded in the opcode */
++		if((eeprom->address_bits == 8) && (offset >= 128))
++			read_opcode |= EEPROM_A8_OPCODE_SPI;
++
++		/* Send the READ command (opcode + addr)  */
++		e1000_shift_out_ee_bits(hw, read_opcode, eeprom->opcode_bits);
++		e1000_shift_out_ee_bits(hw, (uint16_t)(offset*2), eeprom->address_bits);
++
++		/* Read the data.  The address of the eeprom internally increments with
++		 * each byte (spi) being read, saving on the overhead of eeprom setup
++		 * and tear-down.  The address counter will roll over if reading beyond
++		 * the size of the eeprom, thus allowing the entire memory to be read
++		 * starting from any offset. */
++		for (i = 0; i < words; i++) {
++			word_in = e1000_shift_in_ee_bits(hw, 16);
++			data[i] = (word_in >> 8) | (word_in << 8);
++		}
++	} else if(eeprom->type == e1000_eeprom_microwire) {
++		for (i = 0; i < words; i++) {
++			/*  Send the READ command (opcode + addr)  */
++			e1000_shift_out_ee_bits(hw, EEPROM_READ_OPCODE_MICROWIRE,
++						eeprom->opcode_bits);
++			e1000_shift_out_ee_bits(hw, (uint16_t)(offset + i),
++			                        eeprom->address_bits);
++
++			/* Read the data.  For microwire, each word requires the overhead
++			 * of eeprom setup and tear-down. */
++			data[i] = e1000_shift_in_ee_bits(hw, 16);
++			e1000_standby_eeprom(hw);
++		}
++	}
++
++	/* End this read operation */
++	e1000_release_eeprom(hw);
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Verifies that the EEPROM has a valid checksum
++ * 
++ * hw - Struct containing variables accessed by shared code
++ *
++ * Reads the first 64 16 bit words of the EEPROM and sums the values read.
++ * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
++ * valid.
++ *****************************************************************************/
++static int
++e1000_validate_eeprom_checksum(struct e1000_hw *hw)
++{
++	uint16_t checksum = 0;
++	uint16_t i, eeprom_data;
++
++	DEBUGFUNC("e1000_validate_eeprom_checksum");
++
++	for(i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
++		if(e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
++			DEBUGOUT("EEPROM Read Error\n");
++			return -E1000_ERR_EEPROM;
++		}
++		checksum += eeprom_data;
++	}
++	
++	if(checksum == (uint16_t) EEPROM_SUM)
++		return E1000_SUCCESS;
++	else {
++		DEBUGOUT("EEPROM Checksum Invalid\n");    
++		return -E1000_ERR_EEPROM;
++	}
++}
++
++/******************************************************************************
++ * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
++ * second function of dual function devices
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static int 
++e1000_read_mac_addr(struct e1000_hw *hw)
++{
++	uint16_t offset;
++	uint16_t eeprom_data;
++	int i;
++
++	DEBUGFUNC("e1000_read_mac_addr");
++
++	for(i = 0; i < NODE_ADDRESS_SIZE; i += 2) {
++		offset = i >> 1;
++		if(e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
++			DEBUGOUT("EEPROM Read Error\n");
++			return -E1000_ERR_EEPROM;
++		}
++		hw->mac_addr[i] = eeprom_data & 0xff;
++		hw->mac_addr[i+1] = (eeprom_data >> 8) & 0xff;
++	}
++	if(((hw->mac_type == e1000_82546) || (hw->mac_type == e1000_82546_rev_3)) &&
++		(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1))
++		/* Invert the last bit if this is the second device */
++		hw->mac_addr[5] ^= 1;
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Initializes receive address filters.
++ *
++ * hw - Struct containing variables accessed by shared code 
++ *
++ * Places the MAC address in receive address register 0 and clears the rest
++ * of the receive addresss registers. Clears the multicast table. Assumes
++ * the receiver is in reset when the routine is called.
++ *****************************************************************************/
++static void
++e1000_init_rx_addrs(struct e1000_hw *hw)
++{
++	uint32_t i;
++	uint32_t addr_low;
++	uint32_t addr_high;
++	
++	DEBUGFUNC("e1000_init_rx_addrs");
++	
++	/* Setup the receive address. */
++	DEBUGOUT("Programming MAC Address into RAR[0]\n");
++	addr_low = (hw->mac_addr[0] |
++		(hw->mac_addr[1] << 8) |
++		(hw->mac_addr[2] << 16) | (hw->mac_addr[3] << 24));
++	
++	addr_high = (hw->mac_addr[4] |
++		(hw->mac_addr[5] << 8) | E1000_RAH_AV);
++	
++	E1000_WRITE_REG_ARRAY(hw, RA, 0, addr_low);
++	E1000_WRITE_REG_ARRAY(hw, RA, 1, addr_high);
++	
++	/* Zero out the other 15 receive addresses. */
++	DEBUGOUT("Clearing RAR[1-15]\n");
++	for(i = 1; i < E1000_RAR_ENTRIES; i++) {
++		E1000_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
++		E1000_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
++	}
++}
++
++/******************************************************************************
++ * Clears the VLAN filer table
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static void
++e1000_clear_vfta(struct e1000_hw *hw)
++{
++	uint32_t offset;
++    
++	for(offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++)
++		E1000_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
++}
++
++/******************************************************************************
++* Writes a value to one of the devices registers using port I/O (as opposed to
++* memory mapped I/O). Only 82544 and newer devices support port I/O. *
++* hw - Struct containing variables accessed by shared code
++* offset - offset to write to * value - value to write
++*****************************************************************************/
++void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset, uint32_t value){
++	uint32_t io_addr = hw->io_base;
++	uint32_t io_data = hw->io_base + 4;
++	e1000_io_write(hw, io_addr, offset);
++	e1000_io_write(hw, io_data, value);
++}
++
++/******************************************************************************
++ * Set the phy type member in the hw struct.
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static int32_t
++e1000_set_phy_type(struct e1000_hw *hw)
++{
++	DEBUGFUNC("e1000_set_phy_type");
++
++	switch(hw->phy_id) {
++	case M88E1000_E_PHY_ID:
++	case M88E1000_I_PHY_ID:
++	case M88E1011_I_PHY_ID:
++		hw->phy_type = e1000_phy_m88;
++		break;
++	case IGP01E1000_I_PHY_ID:
++		hw->phy_type = e1000_phy_igp;
++		break;
++	default:
++		/* Should never have loaded on this device */
++		hw->phy_type = e1000_phy_undefined;
++		return -E1000_ERR_PHY_TYPE;
++	}
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * IGP phy init script - initializes the GbE PHY
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static void
++e1000_phy_init_script(struct e1000_hw *hw)
++{
++	DEBUGFUNC("e1000_phy_init_script");
++
++#if 0
++	/* See e1000_sw_init() of the Linux driver */
++	if(hw->phy_init_script) {
++#else
++	if((hw->mac_type == e1000_82541) ||
++	   (hw->mac_type == e1000_82547) ||
++	   (hw->mac_type == e1000_82541_rev_2) ||
++	   (hw->mac_type == e1000_82547_rev_2)) {
++#endif
++		mdelay(20);
++
++		e1000_write_phy_reg(hw,0x0000,0x0140);
++
++		mdelay(5);
++
++		if(hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547) {
++			e1000_write_phy_reg(hw, 0x1F95, 0x0001);
++
++			e1000_write_phy_reg(hw, 0x1F71, 0xBD21);
++
++			e1000_write_phy_reg(hw, 0x1F79, 0x0018);
++
++			e1000_write_phy_reg(hw, 0x1F30, 0x1600);
++
++			e1000_write_phy_reg(hw, 0x1F31, 0x0014);
++
++			e1000_write_phy_reg(hw, 0x1F32, 0x161C);
++
++			e1000_write_phy_reg(hw, 0x1F94, 0x0003);
++
++			e1000_write_phy_reg(hw, 0x1F96, 0x003F);
++
++			e1000_write_phy_reg(hw, 0x2010, 0x0008);
++		} else {
++			e1000_write_phy_reg(hw, 0x1F73, 0x0099);
++		}
++
++		e1000_write_phy_reg(hw, 0x0000, 0x3300);
++
++
++		if(hw->mac_type == e1000_82547) {
++			uint16_t fused, fine, coarse;
++
++			/* Move to analog registers page */
++			e1000_read_phy_reg(hw, IGP01E1000_ANALOG_SPARE_FUSE_STATUS, &fused);
++
++			if(!(fused & IGP01E1000_ANALOG_SPARE_FUSE_ENABLED)) {
++				e1000_read_phy_reg(hw, IGP01E1000_ANALOG_FUSE_STATUS, &fused);
++
++				fine = fused & IGP01E1000_ANALOG_FUSE_FINE_MASK;
++				coarse = fused & IGP01E1000_ANALOG_FUSE_COARSE_MASK;
++
++				if(coarse > IGP01E1000_ANALOG_FUSE_COARSE_THRESH) {
++					coarse -= IGP01E1000_ANALOG_FUSE_COARSE_10;
++					fine -= IGP01E1000_ANALOG_FUSE_FINE_1;
++				} else if(coarse == IGP01E1000_ANALOG_FUSE_COARSE_THRESH)
++					fine -= IGP01E1000_ANALOG_FUSE_FINE_10;
++
++				fused = (fused & IGP01E1000_ANALOG_FUSE_POLY_MASK) |
++					(fine & IGP01E1000_ANALOG_FUSE_FINE_MASK) |
++					(coarse & IGP01E1000_ANALOG_FUSE_COARSE_MASK);
++
++				e1000_write_phy_reg(hw, IGP01E1000_ANALOG_FUSE_CONTROL, fused);
++				e1000_write_phy_reg(hw, IGP01E1000_ANALOG_FUSE_BYPASS,
++						IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL);
++			}
++		}
++	}
++}
++
++/******************************************************************************
++ * Set the mac type member in the hw struct.
++ * 
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static int
++e1000_set_mac_type(struct e1000_hw *hw)
++{
++	DEBUGFUNC("e1000_set_mac_type");
++
++	switch (hw->device_id) {
++	case E1000_DEV_ID_82542:
++		switch (hw->revision_id) {
++		case E1000_82542_2_0_REV_ID:
++			hw->mac_type = e1000_82542_rev2_0;
++			break;
++		case E1000_82542_2_1_REV_ID:
++			hw->mac_type = e1000_82542_rev2_1;
++			break;
++		default:
++			/* Invalid 82542 revision ID */
++			return -E1000_ERR_MAC_TYPE;
++		}
++		break;
++	case E1000_DEV_ID_82543GC_FIBER:
++	case E1000_DEV_ID_82543GC_COPPER:
++		hw->mac_type = e1000_82543;
++		break;
++	case E1000_DEV_ID_82544EI_COPPER:
++	case E1000_DEV_ID_82544EI_FIBER:
++	case E1000_DEV_ID_82544GC_COPPER:
++	case E1000_DEV_ID_82544GC_LOM:
++		hw->mac_type = e1000_82544;
++		break;
++	case E1000_DEV_ID_82540EM:
++	case E1000_DEV_ID_82540EM_LOM:
++	case E1000_DEV_ID_82540EP:
++	case E1000_DEV_ID_82540EP_LOM:
++	case E1000_DEV_ID_82540EP_LP:
++		hw->mac_type = e1000_82540;
++		break;
++	case E1000_DEV_ID_82545EM_COPPER:
++	case E1000_DEV_ID_82545EM_FIBER:
++		hw->mac_type = e1000_82545;
++		break;
++	case E1000_DEV_ID_82545GM_COPPER:
++	case E1000_DEV_ID_82545GM_FIBER:
++	case E1000_DEV_ID_82545GM_SERDES:
++		hw->mac_type = e1000_82545_rev_3;
++		break;
++	case E1000_DEV_ID_82546EB_COPPER:
++	case E1000_DEV_ID_82546EB_FIBER:
++	case E1000_DEV_ID_82546EB_QUAD_COPPER:
++		hw->mac_type = e1000_82546;
++		break;
++	case E1000_DEV_ID_82546GB_COPPER:
++	case E1000_DEV_ID_82546GB_FIBER:
++	case E1000_DEV_ID_82546GB_SERDES:
++		hw->mac_type = e1000_82546_rev_3;
++		break;
++	case E1000_DEV_ID_82541EI:
++	case E1000_DEV_ID_82541EI_MOBILE:
++		hw->mac_type = e1000_82541;
++		break;
++	case E1000_DEV_ID_82541ER:
++	case E1000_DEV_ID_82541GI:
++	case E1000_DEV_ID_82541GI_MOBILE:
++		hw->mac_type = e1000_82541_rev_2;
++		break;
++	case E1000_DEV_ID_82547EI:
++		hw->mac_type = e1000_82547;
++		break;
++	case E1000_DEV_ID_82547GI:
++		hw->mac_type = e1000_82547_rev_2;
++		break;
++	default:
++		/* Should never have loaded on this device */
++		return -E1000_ERR_MAC_TYPE;
++	}
++
++	return E1000_SUCCESS;
++}
++
++/*****************************************************************************
++ * Set media type and TBI compatibility.
++ *
++ * hw - Struct containing variables accessed by shared code
++ * **************************************************************************/
++static void
++e1000_set_media_type(struct e1000_hw *hw)
++{
++	uint32_t status;
++
++	DEBUGFUNC("e1000_set_media_type");
++	
++	if(hw->mac_type != e1000_82543) {
++		/* tbi_compatibility is only valid on 82543 */
++		hw->tbi_compatibility_en = FALSE;
++	}
++
++	switch (hw->device_id) {
++		case E1000_DEV_ID_82545GM_SERDES:
++		case E1000_DEV_ID_82546GB_SERDES:
++			hw->media_type = e1000_media_type_internal_serdes;
++			break;
++		default:
++			if(hw->mac_type >= e1000_82543) {
++				status = E1000_READ_REG(hw, STATUS);
++				if(status & E1000_STATUS_TBIMODE) {
++					hw->media_type = e1000_media_type_fiber;
++					/* tbi_compatibility not valid on fiber */
++					hw->tbi_compatibility_en = FALSE;
++				} else {
++					hw->media_type = e1000_media_type_copper;
++				}
++			} else {
++				/* This is an 82542 (fiber only) */
++				hw->media_type = e1000_media_type_fiber;
++			}
++	}
++}
++
++/******************************************************************************
++ * Reset the transmit and receive units; mask and clear all interrupts.
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static void
++e1000_reset_hw(struct e1000_hw *hw)
++{
++	uint32_t ctrl;
++	uint32_t ctrl_ext;
++	uint32_t icr;
++	uint32_t manc;
++	
++	DEBUGFUNC("e1000_reset_hw");
++	
++	/* For 82542 (rev 2.0), disable MWI before issuing a device reset */
++	if(hw->mac_type == e1000_82542_rev2_0) {
++		DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
++		e1000_pci_clear_mwi(hw);
++	}
++
++	/* Clear interrupt mask to stop board from generating interrupts */
++	DEBUGOUT("Masking off all interrupts\n");
++	E1000_WRITE_REG(hw, IMC, 0xffffffff);
++	
++	/* Disable the Transmit and Receive units.  Then delay to allow
++	 * any pending transactions to complete before we hit the MAC with
++	 * the global reset.
++	 */
++	E1000_WRITE_REG(hw, RCTL, 0);
++	E1000_WRITE_REG(hw, TCTL, E1000_TCTL_PSP);
++	E1000_WRITE_FLUSH(hw);
++
++	/* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */
++	hw->tbi_compatibility_on = FALSE;
++
++	/* Delay to allow any outstanding PCI transactions to complete before
++	 * resetting the device
++	 */ 
++	mdelay(10);
++
++	ctrl = E1000_READ_REG(hw, CTRL);
++
++	/* Must reset the PHY before resetting the MAC */
++	if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
++		E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_PHY_RST));
++		mdelay(5);
++	}
++
++	/* Issue a global reset to the MAC.  This will reset the chip's
++	 * transmit, receive, DMA, and link units.  It will not effect
++	 * the current PCI configuration.  The global reset bit is self-
++	 * clearing, and should clear within a microsecond.
++	 */
++	DEBUGOUT("Issuing a global reset to MAC\n");
++
++	switch(hw->mac_type) {
++		case e1000_82544:
++		case e1000_82540:
++		case e1000_82545:
++		case e1000_82546:
++		case e1000_82541:
++		case e1000_82541_rev_2:
++			/* These controllers can't ack the 64-bit write when issuing the
++			 * reset, so use IO-mapping as a workaround to issue the reset */
++			E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
++			break;
++		case e1000_82545_rev_3:
++		case e1000_82546_rev_3:
++			/* Reset is performed on a shadow of the control register */
++			E1000_WRITE_REG(hw, CTRL_DUP, (ctrl | E1000_CTRL_RST));
++			break;
++		default:
++			E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));
++			break;
++	}
++
++	/* After MAC reset, force reload of EEPROM to restore power-on settings to
++	 * device.  Later controllers reload the EEPROM automatically, so just wait
++	 * for reload to complete.
++	 */
++	switch(hw->mac_type) {
++		case e1000_82542_rev2_0:
++		case e1000_82542_rev2_1:
++		case e1000_82543:
++		case e1000_82544:
++			/* Wait for reset to complete */
++			udelay(10);
++			ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
++			ctrl_ext |= E1000_CTRL_EXT_EE_RST;
++			E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
++			E1000_WRITE_FLUSH(hw);
++			/* Wait for EEPROM reload */
++			mdelay(2);
++			break;
++		case e1000_82541:
++		case e1000_82541_rev_2:
++		case e1000_82547:
++		case e1000_82547_rev_2:
++			/* Wait for EEPROM reload */
++			mdelay(20);
++			break;
++		default:
++			/* Wait for EEPROM reload (it happens automatically) */
++			mdelay(5);
++			break;
++	}
++
++	/* Disable HW ARPs on ASF enabled adapters */
++	if(hw->mac_type >= e1000_82540) {
++		manc = E1000_READ_REG(hw, MANC);
++		manc &= ~(E1000_MANC_ARP_EN);
++		E1000_WRITE_REG(hw, MANC, manc);
++	}
++
++	if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
++		e1000_phy_init_script(hw);
++	}
++
++	/* Clear interrupt mask to stop board from generating interrupts */
++	DEBUGOUT("Masking off all interrupts\n");
++	E1000_WRITE_REG(hw, IMC, 0xffffffff);
++	
++	/* Clear any pending interrupt events. */
++	icr = E1000_READ_REG(hw, ICR);
++
++	/* If MWI was previously enabled, reenable it. */
++	if(hw->mac_type == e1000_82542_rev2_0) {
++#ifdef LINUX_DRIVER
++		if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
++#endif
++			e1000_pci_set_mwi(hw);
++	}
++}
++
++/******************************************************************************
++ * Performs basic configuration of the adapter.
++ *
++ * hw - Struct containing variables accessed by shared code
++ * 
++ * Assumes that the controller has previously been reset and is in a 
++ * post-reset uninitialized state. Initializes the receive address registers,
++ * multicast table, and VLAN filter table. Calls routines to setup link
++ * configuration and flow control settings. Clears all on-chip counters. Leaves
++ * the transmit and receive units disabled and uninitialized.
++ *****************************************************************************/
++static int
++e1000_init_hw(struct e1000_hw *hw)
++{
++	uint32_t ctrl, status;
++	uint32_t i;
++	int32_t ret_val;
++	uint16_t pcix_cmd_word;
++	uint16_t pcix_stat_hi_word;
++	uint16_t cmd_mmrbc;
++	uint16_t stat_mmrbc;
++	e1000_bus_type bus_type = e1000_bus_type_unknown;
++
++	DEBUGFUNC("e1000_init_hw");
++
++	/* Set the media type and TBI compatibility */
++	e1000_set_media_type(hw);
++
++	/* Disabling VLAN filtering. */
++	DEBUGOUT("Initializing the IEEE VLAN\n");
++	E1000_WRITE_REG(hw, VET, 0);
++	
++	e1000_clear_vfta(hw);
++	
++	/* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
++	if(hw->mac_type == e1000_82542_rev2_0) {
++		DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
++		e1000_pci_clear_mwi(hw);
++		E1000_WRITE_REG(hw, RCTL, E1000_RCTL_RST);
++		E1000_WRITE_FLUSH(hw);
++		mdelay(5);
++	}
++	
++	/* Setup the receive address. This involves initializing all of the Receive
++	 * Address Registers (RARs 0 - 15).
++	 */
++	e1000_init_rx_addrs(hw);
++	
++	/* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */
++	if(hw->mac_type == e1000_82542_rev2_0) {
++		E1000_WRITE_REG(hw, RCTL, 0);
++		E1000_WRITE_FLUSH(hw);
++		mdelay(1);
++#ifdef LINUX_DRIVER
++		if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
++#endif
++			e1000_pci_set_mwi(hw);
++	}
++	
++	/* Zero out the Multicast HASH table */
++	DEBUGOUT("Zeroing the MTA\n");
++	for(i = 0; i < E1000_MC_TBL_SIZE; i++)
++		E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
++	
++#if 0
++	/* Set the PCI priority bit correctly in the CTRL register.  This
++	 * determines if the adapter gives priority to receives, or if it
++	 * gives equal priority to transmits and receives.
++	 */
++	if(hw->dma_fairness) {
++		ctrl = E1000_READ_REG(hw, CTRL);
++		E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PRIOR);
++	}
++#endif
++
++	switch(hw->mac_type) {
++		case e1000_82545_rev_3:
++		case e1000_82546_rev_3:
++			break;
++		default:
++			if (hw->mac_type >= e1000_82543) {
++				/* See e1000_get_bus_info() of the Linux driver */
++				status = E1000_READ_REG(hw, STATUS);
++				bus_type = (status & E1000_STATUS_PCIX_MODE) ?
++					e1000_bus_type_pcix : e1000_bus_type_pci;
++			}
++
++			/* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
++			if(bus_type == e1000_bus_type_pcix) {
++				pci_read_config_word(hw->pdev, PCIX_COMMAND_REGISTER, &pcix_cmd_word);
++				pci_read_config_word(hw->pdev, PCIX_STATUS_REGISTER_HI, &pcix_stat_hi_word);
++				cmd_mmrbc = (pcix_cmd_word & PCIX_COMMAND_MMRBC_MASK) >>
++					PCIX_COMMAND_MMRBC_SHIFT;
++				stat_mmrbc = (pcix_stat_hi_word & PCIX_STATUS_HI_MMRBC_MASK) >>
++					PCIX_STATUS_HI_MMRBC_SHIFT;
++				if(stat_mmrbc == PCIX_STATUS_HI_MMRBC_4K)
++					stat_mmrbc = PCIX_STATUS_HI_MMRBC_2K;
++				if(cmd_mmrbc > stat_mmrbc) {
++					pcix_cmd_word &= ~PCIX_COMMAND_MMRBC_MASK;
++					pcix_cmd_word |= stat_mmrbc << PCIX_COMMAND_MMRBC_SHIFT;
++					pci_write_config_word(hw->pdev, PCIX_COMMAND_REGISTER, pcix_cmd_word);
++				}
++			}
++			break;
++	}
++
++	/* Call a subroutine to configure the link and setup flow control. */
++	ret_val = e1000_setup_link(hw);
++	
++	/* Set the transmit descriptor write-back policy */
++	if(hw->mac_type > e1000_82544) {
++		ctrl = E1000_READ_REG(hw, TXDCTL);
++		ctrl = (ctrl & ~E1000_TXDCTL_WTHRESH) | E1000_TXDCTL_FULL_TX_DESC_WB;
++		E1000_WRITE_REG(hw, TXDCTL, ctrl);
++	}
++
++#if 0
++	/* Clear all of the statistics registers (clear on read).  It is
++	 * important that we do this after we have tried to establish link
++	 * because the symbol error count will increment wildly if there
++	 * is no link.
++	 */
++	e1000_clear_hw_cntrs(hw);
++#endif
++
++	return ret_val;
++}
++
++/******************************************************************************
++ * Adjust SERDES output amplitude based on EEPROM setting.
++ *
++ * hw - Struct containing variables accessed by shared code.
++ *****************************************************************************/
++static int32_t
++e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
++{
++	uint16_t eeprom_data;
++	int32_t  ret_val;
++
++	DEBUGFUNC("e1000_adjust_serdes_amplitude");
++
++	if(hw->media_type != e1000_media_type_internal_serdes)
++		return E1000_SUCCESS;
++
++	switch(hw->mac_type) {
++		case e1000_82545_rev_3:
++		case e1000_82546_rev_3:
++			break;
++		default:
++			return E1000_SUCCESS;
++	}
++
++	if ((ret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1,
++					&eeprom_data))) {
++		return ret_val;
++	}
++
++	if(eeprom_data != EEPROM_RESERVED_WORD) {
++		/* Adjust SERDES output amplitude only. */
++		eeprom_data &= EEPROM_SERDES_AMPLITUDE_MASK;
++		if((ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_EXT_CTRL,
++		                                  eeprom_data)))
++			return ret_val;
++	}
++
++	return E1000_SUCCESS;
++}
++								   
++/******************************************************************************
++ * Configures flow control and link settings.
++ * 
++ * hw - Struct containing variables accessed by shared code
++ * 
++ * Determines which flow control settings to use. Calls the apropriate media-
++ * specific link configuration function. Configures the flow control settings.
++ * Assuming the adapter has a valid link partner, a valid link should be
++ * established. Assumes the hardware has previously been reset and the 
++ * transmitter and receiver are not enabled.
++ *****************************************************************************/
++static int
++e1000_setup_link(struct e1000_hw *hw)
++{
++	uint32_t ctrl_ext;
++	int32_t ret_val;
++	uint16_t eeprom_data;
++
++	DEBUGFUNC("e1000_setup_link");
++	
++	/* Read and store word 0x0F of the EEPROM. This word contains bits
++	 * that determine the hardware's default PAUSE (flow control) mode,
++	 * a bit that determines whether the HW defaults to enabling or
++	 * disabling auto-negotiation, and the direction of the
++	 * SW defined pins. If there is no SW over-ride of the flow
++	 * control setting, then the variable hw->fc will
++	 * be initialized based on a value in the EEPROM.
++	 */
++	if(e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data) < 0) {
++		DEBUGOUT("EEPROM Read Error\n");
++		return -E1000_ERR_EEPROM;
++	}
++	
++	if(hw->fc == e1000_fc_default) {
++		if((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 0)
++			hw->fc = e1000_fc_none;
++		else if((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 
++			EEPROM_WORD0F_ASM_DIR)
++			hw->fc = e1000_fc_tx_pause;
++		else
++			hw->fc = e1000_fc_full;
++	}
++	
++	/* We want to save off the original Flow Control configuration just
++	 * in case we get disconnected and then reconnected into a different
++	 * hub or switch with different Flow Control capabilities.
++	 */
++	if(hw->mac_type == e1000_82542_rev2_0)
++		hw->fc &= (~e1000_fc_tx_pause);
++
++#if 0
++	/* See e1000_sw_init() of the Linux driver */
++	if((hw->mac_type < e1000_82543) && (hw->report_tx_early == 1))
++#else
++	if((hw->mac_type < e1000_82543) && (hw->mac_type >= e1000_82543))
++#endif
++		hw->fc &= (~e1000_fc_rx_pause);
++	
++#if 0
++	hw->original_fc = hw->fc;
++#endif
++
++	DEBUGOUT1("After fix-ups FlowControl is now = %x\n", hw->fc);
++	
++	/* Take the 4 bits from EEPROM word 0x0F that determine the initial
++	 * polarity value for the SW controlled pins, and setup the
++	 * Extended Device Control reg with that info.
++	 * This is needed because one of the SW controlled pins is used for
++	 * signal detection.  So this should be done before e1000_setup_pcs_link()
++	 * or e1000_phy_setup() is called.
++	 */
++	if(hw->mac_type == e1000_82543) {
++		ctrl_ext = ((eeprom_data & EEPROM_WORD0F_SWPDIO_EXT) << 
++			SWDPIO__EXT_SHIFT);
++		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
++	}
++	
++	/* Call the necessary subroutine to configure the link. */
++	ret_val = (hw->media_type == e1000_media_type_copper) ?
++		e1000_setup_copper_link(hw) :
++		e1000_setup_fiber_serdes_link(hw);
++	if (ret_val < 0) {
++		return ret_val;
++	}
++	
++	/* Initialize the flow control address, type, and PAUSE timer
++	 * registers to their default values.  This is done even if flow
++	 * control is disabled, because it does not hurt anything to
++	 * initialize these registers.
++	 */
++	DEBUGOUT("Initializing the Flow Control address, type and timer regs\n");
++	
++	E1000_WRITE_REG(hw, FCAL, FLOW_CONTROL_ADDRESS_LOW);
++	E1000_WRITE_REG(hw, FCAH, FLOW_CONTROL_ADDRESS_HIGH);
++	E1000_WRITE_REG(hw, FCT, FLOW_CONTROL_TYPE);
++#if 0
++	E1000_WRITE_REG(hw, FCTTV, hw->fc_pause_time);
++#else
++	E1000_WRITE_REG(hw, FCTTV, FC_DEFAULT_TX_TIMER);
++#endif
++	
++	/* Set the flow control receive threshold registers.  Normally,
++	 * these registers will be set to a default threshold that may be
++	 * adjusted later by the driver's runtime code.  However, if the
++	 * ability to transmit pause frames in not enabled, then these
++	 * registers will be set to 0. 
++	 */
++	if(!(hw->fc & e1000_fc_tx_pause)) {
++		E1000_WRITE_REG(hw, FCRTL, 0);
++		E1000_WRITE_REG(hw, FCRTH, 0);
++	} else {
++		/* We need to set up the Receive Threshold high and low water marks
++		 * as well as (optionally) enabling the transmission of XON frames.
++		 */
++#if 0
++		if(hw->fc_send_xon) {
++			E1000_WRITE_REG(hw, FCRTL, (hw->fc_low_water | E1000_FCRTL_XONE));
++			E1000_WRITE_REG(hw, FCRTH, hw->fc_high_water);
++		} else {
++			E1000_WRITE_REG(hw, FCRTL, hw->fc_low_water);
++			E1000_WRITE_REG(hw, FCRTH, hw->fc_high_water);
++		}
++#else
++		E1000_WRITE_REG(hw, FCRTL, (FC_DEFAULT_LO_THRESH | E1000_FCRTL_XONE));
++		E1000_WRITE_REG(hw, FCRTH, FC_DEFAULT_HI_THRESH);
++#endif
++	}
++	return ret_val;
++}
++
++/******************************************************************************
++ * Sets up link for a fiber based or serdes based adapter
++ *
++ * hw - Struct containing variables accessed by shared code
++ *
++ * Manipulates Physical Coding Sublayer functions in order to configure
++ * link. Assumes the hardware has been previously reset and the transmitter
++ * and receiver are not enabled.
++ *****************************************************************************/
++static int
++e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
++{
++	uint32_t ctrl;
++	uint32_t status;
++	uint32_t txcw = 0;
++	uint32_t i;
++	uint32_t signal = 0;
++	int32_t ret_val;
++
++	DEBUGFUNC("e1000_setup_fiber_serdes_link");
++
++	/* On adapters with a MAC newer than 82544, SW Defineable pin 1 will be 
++	 * set when the optics detect a signal. On older adapters, it will be 
++	 * cleared when there is a signal.  This applies to fiber media only.
++	 * If we're on serdes media, adjust the output amplitude to value set in
++	 * the EEPROM.
++	 */
++	ctrl = E1000_READ_REG(hw, CTRL);
++	if(hw->media_type == e1000_media_type_fiber)
++		signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
++
++	if((ret_val = e1000_adjust_serdes_amplitude(hw)))
++		return ret_val;
++
++	/* Take the link out of reset */
++	ctrl &= ~(E1000_CTRL_LRST);
++
++#if 0
++	/* Adjust VCO speed to improve BER performance */
++	if((ret_val = e1000_set_vco_speed(hw)))
++		return ret_val;
++#endif
++
++	e1000_config_collision_dist(hw);
++	
++	/* Check for a software override of the flow control settings, and setup
++	 * the device accordingly.  If auto-negotiation is enabled, then software
++	 * will have to set the "PAUSE" bits to the correct value in the Tranmsit
++	 * Config Word Register (TXCW) and re-start auto-negotiation.  However, if
++	 * auto-negotiation is disabled, then software will have to manually 
++	 * configure the two flow control enable bits in the CTRL register.
++	 *
++	 * The possible values of the "fc" parameter are:
++	 *      0:  Flow control is completely disabled
++	 *      1:  Rx flow control is enabled (we can receive pause frames, but 
++	 *          not send pause frames).
++	 *      2:  Tx flow control is enabled (we can send pause frames but we do
++	 *          not support receiving pause frames).
++	 *      3:  Both Rx and TX flow control (symmetric) are enabled.
++	 */
++	switch (hw->fc) {
++	case e1000_fc_none:
++		/* Flow control is completely disabled by a software over-ride. */
++		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
++		break;
++	case e1000_fc_rx_pause:
++		/* RX Flow control is enabled and TX Flow control is disabled by a 
++		 * software over-ride. Since there really isn't a way to advertise 
++		 * that we are capable of RX Pause ONLY, we will advertise that we
++		 * support both symmetric and asymmetric RX PAUSE. Later, we will
++		 *  disable the adapter's ability to send PAUSE frames.
++		 */
++		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
++		break;
++	case e1000_fc_tx_pause:
++		/* TX Flow control is enabled, and RX Flow control is disabled, by a 
++		 * software over-ride.
++		 */
++		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
++		break;
++	case e1000_fc_full:
++		/* Flow control (both RX and TX) is enabled by a software over-ride. */
++		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
++		break;
++	default:
++		DEBUGOUT("Flow control param set incorrectly\n");
++		return -E1000_ERR_CONFIG;
++		break;
++	}
++	
++	/* Since auto-negotiation is enabled, take the link out of reset (the link
++	 * will be in reset, because we previously reset the chip). This will
++	 * restart auto-negotiation.  If auto-neogtiation is successful then the
++	 * link-up status bit will be set and the flow control enable bits (RFCE
++	 * and TFCE) will be set according to their negotiated value.
++	 */
++	DEBUGOUT("Auto-negotiation enabled\n");
++	
++	E1000_WRITE_REG(hw, TXCW, txcw);
++	E1000_WRITE_REG(hw, CTRL, ctrl);
++	E1000_WRITE_FLUSH(hw);
++	
++	hw->txcw = txcw;
++	mdelay(1);
++	
++	/* If we have a signal (the cable is plugged in) then poll for a "Link-Up"
++	 * indication in the Device Status Register.  Time-out if a link isn't 
++	 * seen in 500 milliseconds seconds (Auto-negotiation should complete in 
++	 * less than 500 milliseconds even if the other end is doing it in SW).
++	 * For internal serdes, we just assume a signal is present, then poll.
++	 */
++	if(hw->media_type == e1000_media_type_internal_serdes ||
++	   (E1000_READ_REG(hw, CTRL) & E1000_CTRL_SWDPIN1) == signal) {
++		DEBUGOUT("Looking for Link\n");
++		for(i = 0; i < (LINK_UP_TIMEOUT / 10); i++) {
++			mdelay(10);
++			status = E1000_READ_REG(hw, STATUS);
++			if(status & E1000_STATUS_LU) break;
++		}
++		if(i == (LINK_UP_TIMEOUT / 10)) {
++			DEBUGOUT("Never got a valid link from auto-neg!!!\n");
++			hw->autoneg_failed = 1;
++			/* AutoNeg failed to achieve a link, so we'll call 
++			 * e1000_check_for_link. This routine will force the link up if
++			 * we detect a signal. This will allow us to communicate with
++			 * non-autonegotiating link partners.
++			 */
++			if((ret_val = e1000_check_for_link(hw))) {
++				DEBUGOUT("Error while checking for link\n");
++				return ret_val;
++			}
++			hw->autoneg_failed = 0;
++		} else {
++			hw->autoneg_failed = 0;
++			DEBUGOUT("Valid Link Found\n");
++		}
++	} else {
++		DEBUGOUT("No Signal Detected\n");
++	}
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++* Detects which PHY is present and the speed and duplex
++*
++* hw - Struct containing variables accessed by shared code
++******************************************************************************/
++static int
++e1000_setup_copper_link(struct e1000_hw *hw)
++{
++	uint32_t ctrl;
++	int32_t ret_val;
++	uint16_t i;
++	uint16_t phy_data;
++	
++	DEBUGFUNC("e1000_setup_copper_link");
++	
++	ctrl = E1000_READ_REG(hw, CTRL);
++	/* With 82543, we need to force speed and duplex on the MAC equal to what
++	 * the PHY speed and duplex configuration is. In addition, we need to
++	 * perform a hardware reset on the PHY to take it out of reset.
++	 */
++	if(hw->mac_type > e1000_82543) {
++		ctrl |= E1000_CTRL_SLU;
++		ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
++		E1000_WRITE_REG(hw, CTRL, ctrl);
++	} else {
++		ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX | E1000_CTRL_SLU);
++		E1000_WRITE_REG(hw, CTRL, ctrl);
++		e1000_phy_hw_reset(hw);
++	}
++	
++	/* Make sure we have a valid PHY */
++	if((ret_val = e1000_detect_gig_phy(hw))) {
++		DEBUGOUT("Error, did not detect valid phy.\n");
++		return ret_val;
++	}
++	DEBUGOUT1("Phy ID = %x \n", hw->phy_id);
++
++	if(hw->mac_type <= e1000_82543 ||
++	   hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547 ||
++#if 0
++	   hw->mac_type == e1000_82541_rev_2 || hw->mac_type == e1000_82547_rev_2)
++		hw->phy_reset_disable = FALSE;
++
++	if(!hw->phy_reset_disable) {
++#else
++	   hw->mac_type == e1000_82541_rev_2 || hw->mac_type == e1000_82547_rev_2) {
++#endif
++	if (hw->phy_type == e1000_phy_igp) {
++
++		if((ret_val = e1000_phy_reset(hw))) {
++			DEBUGOUT("Error Resetting the PHY\n");
++			return ret_val;
++		}
++
++		/* Wait 10ms for MAC to configure PHY from eeprom settings */
++		mdelay(15);
++
++#if 0
++		/* disable lplu d3 during driver init */
++		if((ret_val = e1000_set_d3_lplu_state(hw, FALSE))) {
++			DEBUGOUT("Error Disabling LPLU D3\n");
++			return ret_val;
++		}
++
++		/* Configure mdi-mdix settings */
++		if((ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL,
++		                                 &phy_data)))
++			return ret_val;
++
++		if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
++			hw->dsp_config_state = e1000_dsp_config_disabled;
++			/* Force MDI for IGP B-0 PHY */
++			phy_data &= ~(IGP01E1000_PSCR_AUTO_MDIX |
++			              IGP01E1000_PSCR_FORCE_MDI_MDIX);
++			hw->mdix = 1;
++
++		} else {
++			hw->dsp_config_state = e1000_dsp_config_enabled;
++			phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
++
++			switch (hw->mdix) {
++			case 1:
++				phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
++				break;
++			case 2:
++				phy_data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
++				break;
++			case 0:
++			default:
++				phy_data |= IGP01E1000_PSCR_AUTO_MDIX;
++				break;
++			}
++		}
++		if((ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL,
++		                                  phy_data)))
++			return ret_val;
++
++		/* set auto-master slave resolution settings */
++		e1000_ms_type phy_ms_setting = hw->master_slave;
++
++		if(hw->ffe_config_state == e1000_ffe_config_active)
++			hw->ffe_config_state = e1000_ffe_config_enabled;
++
++		if(hw->dsp_config_state == e1000_dsp_config_activated)
++			hw->dsp_config_state = e1000_dsp_config_enabled;
++#endif
++
++		/* when autonegotiation advertisment is only 1000Mbps then we
++		 * should disable SmartSpeed and enable Auto MasterSlave
++		 * resolution as hardware default. */
++		if(hw->autoneg_advertised == ADVERTISE_1000_FULL) {
++			/* Disable SmartSpeed */
++			if((ret_val = e1000_read_phy_reg(hw,
++			                                 IGP01E1000_PHY_PORT_CONFIG,
++			                                 &phy_data)))
++				return ret_val;
++			phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
++			if((ret_val = e1000_write_phy_reg(hw,
++			                                  IGP01E1000_PHY_PORT_CONFIG,
++			                                  phy_data)))
++				return ret_val;
++			/* Set auto Master/Slave resolution process */
++			if((ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL,
++			                                 &phy_data)))
++				return ret_val;
++			phy_data &= ~CR_1000T_MS_ENABLE;
++			if((ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,
++			                                  phy_data)))
++				return ret_val;
++		}
++
++		if((ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL,
++		                                 &phy_data)))
++			return ret_val;
++
++#if 0
++		/* load defaults for future use */
++		hw->original_master_slave = (phy_data & CR_1000T_MS_ENABLE) ?
++		                            ((phy_data & CR_1000T_MS_VALUE) ?
++		                             e1000_ms_force_master :
++		                             e1000_ms_force_slave) :
++		                             e1000_ms_auto;
++
++		switch (phy_ms_setting) {
++		case e1000_ms_force_master:
++			phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
++			break;
++		case e1000_ms_force_slave:
++			phy_data |= CR_1000T_MS_ENABLE;
++			phy_data &= ~(CR_1000T_MS_VALUE);
++			break;
++		case e1000_ms_auto:
++			phy_data &= ~CR_1000T_MS_ENABLE;
++		default:
++			break;
++		}
++#endif
++
++		if((ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,
++		                                  phy_data)))
++			return ret_val;
++	} else {
++		/* Enable CRS on TX. This must be set for half-duplex operation. */
++		if((ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL,
++		                                 &phy_data)))
++			return ret_val;
++
++		phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
++
++		/* Options:
++		 *   MDI/MDI-X = 0 (default)
++		 *   0 - Auto for all speeds
++		 *   1 - MDI mode
++		 *   2 - MDI-X mode
++		 *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
++		 */
++#if 0
++		phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
++
++		switch (hw->mdix) {
++		case 1:
++			phy_data |= M88E1000_PSCR_MDI_MANUAL_MODE;
++			break;
++		case 2:
++			phy_data |= M88E1000_PSCR_MDIX_MANUAL_MODE;
++			break;
++		case 3:
++			phy_data |= M88E1000_PSCR_AUTO_X_1000T;
++			break;
++		case 0:
++		default:
++#endif
++			phy_data |= M88E1000_PSCR_AUTO_X_MODE;
++#if 0
++			break;
++		}
++#endif
++
++		/* Options:
++		 *   disable_polarity_correction = 0 (default)
++		 *       Automatic Correction for Reversed Cable Polarity
++		 *   0 - Disabled
++		 *   1 - Enabled
++		 */
++		phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
++		if((ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL,
++		                                  phy_data)))
++			return ret_val;
++
++		/* Force TX_CLK in the Extended PHY Specific Control Register
++		 * to 25MHz clock.
++		 */
++		if((ret_val = e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
++		                                 &phy_data)))
++			return ret_val;
++
++		phy_data |= M88E1000_EPSCR_TX_CLK_25;
++
++#ifdef LINUX_DRIVER
++		if (hw->phy_revision < M88E1011_I_REV_4) {
++#endif
++			/* Configure Master and Slave downshift values */
++			phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
++				M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
++			phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
++				M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
++			if((ret_val = e1000_write_phy_reg(hw,
++			                                  M88E1000_EXT_PHY_SPEC_CTRL,
++			                                  phy_data)))
++				return ret_val;
++		}
++	
++		/* SW Reset the PHY so all changes take effect */
++		if((ret_val = e1000_phy_reset(hw))) {
++			DEBUGOUT("Error Resetting the PHY\n");
++			return ret_val;
++#ifdef LINUX_DRIVER
++		}
++#endif
++	}
++	
++	/* Options:
++	 *   autoneg = 1 (default)
++	 *      PHY will advertise value(s) parsed from
++	 *      autoneg_advertised and fc
++	 *   autoneg = 0
++	 *      PHY will be set to 10H, 10F, 100H, or 100F
++	 *      depending on value parsed from forced_speed_duplex.
++	 */
++	
++	/* Is autoneg enabled?  This is enabled by default or by software
++	 * override.  If so, call e1000_phy_setup_autoneg routine to parse the
++	 * autoneg_advertised and fc options. If autoneg is NOT enabled, then
++	 * the user should have provided a speed/duplex override.  If so, then
++	 * call e1000_phy_force_speed_duplex to parse and set this up.
++	 */
++	/* Perform some bounds checking on the hw->autoneg_advertised
++	 * parameter.  If this variable is zero, then set it to the default.
++	 */
++	hw->autoneg_advertised &= AUTONEG_ADVERTISE_SPEED_DEFAULT;
++	
++	/* If autoneg_advertised is zero, we assume it was not defaulted
++	 * by the calling code so we set to advertise full capability.
++	 */
++	if(hw->autoneg_advertised == 0)
++		hw->autoneg_advertised = AUTONEG_ADVERTISE_SPEED_DEFAULT;
++	
++	DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
++	if((ret_val = e1000_phy_setup_autoneg(hw))) {
++		DEBUGOUT("Error Setting up Auto-Negotiation\n");
++		return ret_val;
++	}
++	DEBUGOUT("Restarting Auto-Neg\n");
++	
++	/* Restart auto-negotiation by setting the Auto Neg Enable bit and
++	 * the Auto Neg Restart bit in the PHY control register.
++	 */
++	if((ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data)))
++		return ret_val;
++
++	phy_data |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
++	if((ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data)))
++		return ret_val;
++
++#if 0	
++	/* Does the user want to wait for Auto-Neg to complete here, or
++	 * check at a later time (for example, callback routine).
++	 */
++	if(hw->wait_autoneg_complete) {
++		if((ret_val = e1000_wait_autoneg(hw))) {
++			DEBUGOUT("Error while waiting for autoneg to complete\n");
++			return ret_val;
++		}
++	}
++#else
++	/* If we do not wait for autonegotiation to complete I 
++	 * do not see a valid link status.
++	 */
++	if((ret_val = e1000_wait_autoneg(hw))) {
++		DEBUGOUT("Error while waiting for autoneg to complete\n");
++		return ret_val;
++	}
++#endif
++	} /* !hw->phy_reset_disable */
++	
++	/* Check link status. Wait up to 100 microseconds for link to become
++	 * valid.
++	 */
++	for(i = 0; i < 10; i++) {
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
++			return ret_val;
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
++			return ret_val;
++
++		if(phy_data & MII_SR_LINK_STATUS) {
++			/* We have link, so we need to finish the config process:
++			 *   1) Set up the MAC to the current PHY speed/duplex
++			 *      if we are on 82543.  If we
++			 *      are on newer silicon, we only need to configure
++			 *      collision distance in the Transmit Control Register.
++			 *   2) Set up flow control on the MAC to that established with
++			 *      the link partner.
++			 */
++			if(hw->mac_type >= e1000_82544) {
++				e1000_config_collision_dist(hw);
++			} else {
++				if((ret_val = e1000_config_mac_to_phy(hw))) {
++					DEBUGOUT("Error configuring MAC to PHY settings\n");
++					return ret_val;
++				}
++			}
++			if((ret_val = e1000_config_fc_after_link_up(hw))) {
++				DEBUGOUT("Error Configuring Flow Control\n");
++				return ret_val;
++			}
++#if 0
++			if(hw->phy_type == e1000_phy_igp) {
++				if((ret_val = e1000_config_dsp_after_link_change(hw, TRUE))) {
++					DEBUGOUT("Error Configuring DSP after link up\n");
++					return ret_val;
++				}
++			}
++#endif
++			DEBUGOUT("Valid link established!!!\n");
++			return E1000_SUCCESS;
++		}
++		udelay(10);
++	}
++	
++	DEBUGOUT("Unable to establish link!!!\n");
++	return -E1000_ERR_NOLINK;
++}
++
++/******************************************************************************
++* Configures PHY autoneg and flow control advertisement settings
++*
++* hw - Struct containing variables accessed by shared code
++******************************************************************************/
++static int
++e1000_phy_setup_autoneg(struct e1000_hw *hw)
++{
++	int32_t ret_val;
++	uint16_t mii_autoneg_adv_reg;
++	uint16_t mii_1000t_ctrl_reg;
++
++	DEBUGFUNC("e1000_phy_setup_autoneg");
++	
++	/* Read the MII Auto-Neg Advertisement Register (Address 4). */
++	if((ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
++	                                 &mii_autoneg_adv_reg)))
++		return ret_val;
++
++	/* Read the MII 1000Base-T Control Register (Address 9). */
++	if((ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg)))
++		return ret_val;
++
++	/* Need to parse both autoneg_advertised and fc and set up
++	 * the appropriate PHY registers.  First we will parse for
++	 * autoneg_advertised software override.  Since we can advertise
++	 * a plethora of combinations, we need to check each bit
++	 * individually.
++	 */
++	
++	/* First we clear all the 10/100 mb speed bits in the Auto-Neg
++	 * Advertisement Register (Address 4) and the 1000 mb speed bits in
++	 * the  1000Base-T Control Register (Address 9).
++	 */
++	mii_autoneg_adv_reg &= ~REG4_SPEED_MASK;
++	mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
++
++	DEBUGOUT1("autoneg_advertised %x\n", hw->autoneg_advertised);
++
++	/* Do we want to advertise 10 Mb Half Duplex? */
++	if(hw->autoneg_advertised & ADVERTISE_10_HALF) {
++		DEBUGOUT("Advertise 10mb Half duplex\n");
++		mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
++	}
++
++	/* Do we want to advertise 10 Mb Full Duplex? */
++	if(hw->autoneg_advertised & ADVERTISE_10_FULL) {
++		DEBUGOUT("Advertise 10mb Full duplex\n");
++		mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
++	}
++
++	/* Do we want to advertise 100 Mb Half Duplex? */
++	if(hw->autoneg_advertised & ADVERTISE_100_HALF) {
++		DEBUGOUT("Advertise 100mb Half duplex\n");
++		mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
++	}
++
++	/* Do we want to advertise 100 Mb Full Duplex? */
++	if(hw->autoneg_advertised & ADVERTISE_100_FULL) {
++		DEBUGOUT("Advertise 100mb Full duplex\n");
++		mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
++	}
++
++	/* We do not allow the Phy to advertise 1000 Mb Half Duplex */
++	if(hw->autoneg_advertised & ADVERTISE_1000_HALF) {
++		DEBUGOUT("Advertise 1000mb Half duplex requested, request denied!\n");
++	}
++
++	/* Do we want to advertise 1000 Mb Full Duplex? */
++	if(hw->autoneg_advertised & ADVERTISE_1000_FULL) {
++		DEBUGOUT("Advertise 1000mb Full duplex\n");
++		mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
++	}
++
++	/* Check for a software override of the flow control settings, and
++	 * setup the PHY advertisement registers accordingly.  If
++	 * auto-negotiation is enabled, then software will have to set the
++	 * "PAUSE" bits to the correct value in the Auto-Negotiation
++	 * Advertisement Register (PHY_AUTONEG_ADV) and re-start auto-negotiation.
++	 *
++	 * The possible values of the "fc" parameter are:
++	 *      0:  Flow control is completely disabled
++	 *      1:  Rx flow control is enabled (we can receive pause frames
++	 *          but not send pause frames).
++	 *      2:  Tx flow control is enabled (we can send pause frames
++	 *          but we do not support receiving pause frames).
++	 *      3:  Both Rx and TX flow control (symmetric) are enabled.
++	 *  other:  No software override.  The flow control configuration
++	 *          in the EEPROM is used.
++	 */
++	switch (hw->fc) {
++	case e1000_fc_none: /* 0 */
++		/* Flow control (RX & TX) is completely disabled by a
++		 * software over-ride.
++		 */
++		mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
++		break;
++	case e1000_fc_rx_pause: /* 1 */
++		/* RX Flow control is enabled, and TX Flow control is
++		 * disabled, by a software over-ride.
++		 */
++		/* Since there really isn't a way to advertise that we are
++		 * capable of RX Pause ONLY, we will advertise that we
++		 * support both symmetric and asymmetric RX PAUSE.  Later
++		 * (in e1000_config_fc_after_link_up) we will disable the
++		 *hw's ability to send PAUSE frames.
++		 */
++		mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
++		break;
++	case e1000_fc_tx_pause: /* 2 */
++		/* TX Flow control is enabled, and RX Flow control is
++		 * disabled, by a software over-ride.
++		 */
++		mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
++		mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
++		break;
++	case e1000_fc_full: /* 3 */
++		/* Flow control (both RX and TX) is enabled by a software
++		 * over-ride.
++		 */
++		mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
++		break;
++	default:
++		DEBUGOUT("Flow control param set incorrectly\n");
++		return -E1000_ERR_CONFIG;
++	}
++
++	if((ret_val = e1000_write_phy_reg(hw, PHY_AUTONEG_ADV,
++	                       mii_autoneg_adv_reg)))
++		return ret_val;
++
++	DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
++
++	if((ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg)))
++		return ret_val;
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++* Sets the collision distance in the Transmit Control register
++*
++* hw - Struct containing variables accessed by shared code
++*
++* Link should have been established previously. Reads the speed and duplex
++* information from the Device Status register.
++******************************************************************************/
++static void
++e1000_config_collision_dist(struct e1000_hw *hw)
++{
++	uint32_t tctl;
++
++	tctl = E1000_READ_REG(hw, TCTL);
++	
++	tctl &= ~E1000_TCTL_COLD;
++	tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
++	
++	E1000_WRITE_REG(hw, TCTL, tctl);
++	E1000_WRITE_FLUSH(hw);
++}
++
++/******************************************************************************
++* Sets MAC speed and duplex settings to reflect the those in the PHY
++*
++* hw - Struct containing variables accessed by shared code
++* mii_reg - data to write to the MII control register
++*
++* The contents of the PHY register containing the needed information need to
++* be passed in.
++******************************************************************************/
++static int
++e1000_config_mac_to_phy(struct e1000_hw *hw)
++{
++	uint32_t ctrl;
++	int32_t ret_val;
++	uint16_t phy_data;
++
++	DEBUGFUNC("e1000_config_mac_to_phy");
++
++	/* Read the Device Control Register and set the bits to Force Speed
++	 * and Duplex.
++	 */
++	ctrl = E1000_READ_REG(hw, CTRL);
++	ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
++	ctrl &= ~(E1000_CTRL_SPD_SEL | E1000_CTRL_ILOS);
++
++	/* Set up duplex in the Device Control and Transmit Control
++	 * registers depending on negotiated values.
++	 */
++	if (hw->phy_type == e1000_phy_igp) {
++		if((ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS,
++		                                 &phy_data)))
++			return ret_val;
++
++		if(phy_data & IGP01E1000_PSSR_FULL_DUPLEX) ctrl |= E1000_CTRL_FD;
++		else ctrl &= ~E1000_CTRL_FD;
++
++		e1000_config_collision_dist(hw);
++
++		/* Set up speed in the Device Control register depending on
++		 * negotiated values.
++		 */
++		if((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
++		   IGP01E1000_PSSR_SPEED_1000MBPS)
++			ctrl |= E1000_CTRL_SPD_1000;
++		else if((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
++			IGP01E1000_PSSR_SPEED_100MBPS)
++			ctrl |= E1000_CTRL_SPD_100;
++	} else {
++		if((ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
++		                                 &phy_data)))
++			return ret_val;
++		
++		if(phy_data & M88E1000_PSSR_DPLX) ctrl |= E1000_CTRL_FD;
++		else ctrl &= ~E1000_CTRL_FD;
++
++		e1000_config_collision_dist(hw);
++
++		/* Set up speed in the Device Control register depending on
++		 * negotiated values.
++		 */
++		if((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS)
++			ctrl |= E1000_CTRL_SPD_1000;
++		else if((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_100MBS)
++			ctrl |= E1000_CTRL_SPD_100;
++	}
++	/* Write the configured values back to the Device Control Reg. */
++	E1000_WRITE_REG(hw, CTRL, ctrl);
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Forces the MAC's flow control settings.
++ * 
++ * hw - Struct containing variables accessed by shared code
++ *
++ * Sets the TFCE and RFCE bits in the device control register to reflect
++ * the adapter settings. TFCE and RFCE need to be explicitly set by
++ * software when a Copper PHY is used because autonegotiation is managed
++ * by the PHY rather than the MAC. Software must also configure these
++ * bits when link is forced on a fiber connection.
++ *****************************************************************************/
++static int
++e1000_force_mac_fc(struct e1000_hw *hw)
++{
++	uint32_t ctrl;
++	
++	DEBUGFUNC("e1000_force_mac_fc");
++	
++	/* Get the current configuration of the Device Control Register */
++	ctrl = E1000_READ_REG(hw, CTRL);
++	
++	/* Because we didn't get link via the internal auto-negotiation
++	 * mechanism (we either forced link or we got link via PHY
++	 * auto-neg), we have to manually enable/disable transmit an
++	 * receive flow control.
++	 *
++	 * The "Case" statement below enables/disable flow control
++	 * according to the "hw->fc" parameter.
++	 *
++	 * The possible values of the "fc" parameter are:
++	 *      0:  Flow control is completely disabled
++	 *      1:  Rx flow control is enabled (we can receive pause
++	 *          frames but not send pause frames).
++	 *      2:  Tx flow control is enabled (we can send pause frames
++	 *          frames but we do not receive pause frames).
++	 *      3:  Both Rx and TX flow control (symmetric) is enabled.
++	 *  other:  No other values should be possible at this point.
++	 */
++	
++	switch (hw->fc) {
++	case e1000_fc_none:
++		ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
++		break;
++	case e1000_fc_rx_pause:
++		ctrl &= (~E1000_CTRL_TFCE);
++		ctrl |= E1000_CTRL_RFCE;
++		break;
++	case e1000_fc_tx_pause:
++		ctrl &= (~E1000_CTRL_RFCE);
++		ctrl |= E1000_CTRL_TFCE;
++		break;
++	case e1000_fc_full:
++		ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
++		break;
++	default:
++		DEBUGOUT("Flow control param set incorrectly\n");
++		return -E1000_ERR_CONFIG;
++	}
++	
++	/* Disable TX Flow Control for 82542 (rev 2.0) */
++	if(hw->mac_type == e1000_82542_rev2_0)
++		ctrl &= (~E1000_CTRL_TFCE);
++	
++	E1000_WRITE_REG(hw, CTRL, ctrl);
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Configures flow control settings after link is established
++ * 
++ * hw - Struct containing variables accessed by shared code
++ *
++ * Should be called immediately after a valid link has been established.
++ * Forces MAC flow control settings if link was forced. When in MII/GMII mode
++ * and autonegotiation is enabled, the MAC flow control settings will be set
++ * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
++ * and RFCE bits will be automaticaly set to the negotiated flow control mode.
++ *****************************************************************************/
++static int
++e1000_config_fc_after_link_up(struct e1000_hw *hw)
++{
++	int32_t ret_val;
++	uint16_t mii_status_reg;
++	uint16_t mii_nway_adv_reg;
++	uint16_t mii_nway_lp_ability_reg;
++	uint16_t speed;
++	uint16_t duplex;
++	
++	DEBUGFUNC("e1000_config_fc_after_link_up");
++	
++	/* Check for the case where we have fiber media and auto-neg failed
++	 * so we had to force link.  In this case, we need to force the
++	 * configuration of the MAC to match the "fc" parameter.
++	 */
++	if(((hw->media_type == e1000_media_type_fiber) && (hw->autoneg_failed)) ||
++	   ((hw->media_type == e1000_media_type_internal_serdes) && (hw->autoneg_failed))) { 
++		if((ret_val = e1000_force_mac_fc(hw))) {
++			DEBUGOUT("Error forcing flow control settings\n");
++			return ret_val;
++		}
++	}
++	
++	/* Check for the case where we have copper media and auto-neg is
++	 * enabled.  In this case, we need to check and see if Auto-Neg
++	 * has completed, and if so, how the PHY and link partner has
++	 * flow control configured.
++	 */
++	if(hw->media_type == e1000_media_type_copper) {
++		/* Read the MII Status Register and check to see if AutoNeg
++		 * has completed.  We read this twice because this reg has
++		 * some "sticky" (latched) bits.
++		 */
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg)))
++			return ret_val;
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg)))
++			return ret_val;
++		
++		if(mii_status_reg & MII_SR_AUTONEG_COMPLETE) {
++			/* The AutoNeg process has completed, so we now need to
++			 * read both the Auto Negotiation Advertisement Register
++			 * (Address 4) and the Auto_Negotiation Base Page Ability
++			 * Register (Address 5) to determine how flow control was
++			 * negotiated.
++			 */
++			if((ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
++			                                 &mii_nway_adv_reg)))
++				return ret_val;
++			if((ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
++			                                 &mii_nway_lp_ability_reg)))
++				return ret_val;
++
++			/* Two bits in the Auto Negotiation Advertisement Register
++			 * (Address 4) and two bits in the Auto Negotiation Base
++			 * Page Ability Register (Address 5) determine flow control
++			 * for both the PHY and the link partner.  The following
++			 * table, taken out of the IEEE 802.3ab/D6.0 dated March 25,
++			 * 1999, describes these PAUSE resolution bits and how flow
++			 * control is determined based upon these settings.
++			 * NOTE:  DC = Don't Care
++			 *
++			 *   LOCAL DEVICE  |   LINK PARTNER
++			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | NIC Resolution
++			 *-------|---------|-------|---------|--------------------
++			 *   0   |    0    |  DC   |   DC    | e1000_fc_none
++			 *   0   |    1    |   0   |   DC    | e1000_fc_none
++			 *   0   |    1    |   1   |    0    | e1000_fc_none
++			 *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
++			 *   1   |    0    |   0   |   DC    | e1000_fc_none
++			 *   1   |   DC    |   1   |   DC    | e1000_fc_full
++			 *   1   |    1    |   0   |    0    | e1000_fc_none
++			 *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
++			 *
++			 */
++			/* Are both PAUSE bits set to 1?  If so, this implies
++			 * Symmetric Flow Control is enabled at both ends.  The
++			 * ASM_DIR bits are irrelevant per the spec.
++			 *
++			 * For Symmetric Flow Control:
++			 *
++			 *   LOCAL DEVICE  |   LINK PARTNER
++			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
++			 *-------|---------|-------|---------|--------------------
++			 *   1   |   DC    |   1   |   DC    | e1000_fc_full
++			 *
++			 */
++			if((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
++				(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
++				/* Now we need to check if the user selected RX ONLY
++				 * of pause frames.  In this case, we had to advertise
++				 * FULL flow control because we could not advertise RX
++				 * ONLY. Hence, we must now check to see if we need to
++				 * turn OFF  the TRANSMISSION of PAUSE frames.
++				 */
++#if 0
++				if(hw->original_fc == e1000_fc_full) {
++					hw->fc = e1000_fc_full;
++#else
++				if(hw->fc == e1000_fc_full) {
++#endif
++					DEBUGOUT("Flow Control = FULL.\r\n");
++				} else {
++					hw->fc = e1000_fc_rx_pause;
++					DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
++				}
++			}
++			/* For receiving PAUSE frames ONLY.
++			 *
++			 *   LOCAL DEVICE  |   LINK PARTNER
++			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
++			 *-------|---------|-------|---------|--------------------
++			 *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
++			 *
++			 */
++			else if(!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
++				(mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
++				(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
++				(mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
++				hw->fc = e1000_fc_tx_pause;
++				DEBUGOUT("Flow Control = TX PAUSE frames only.\r\n");
++			}
++			/* For transmitting PAUSE frames ONLY.
++			 *
++			 *   LOCAL DEVICE  |   LINK PARTNER
++			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
++			 *-------|---------|-------|---------|--------------------
++			 *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
++			 *
++			 */
++			else if((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
++				(mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
++				!(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
++				(mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
++				hw->fc = e1000_fc_rx_pause;
++				DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
++			}
++			/* Per the IEEE spec, at this point flow control should be
++			 * disabled.  However, we want to consider that we could
++			 * be connected to a legacy switch that doesn't advertise
++			 * desired flow control, but can be forced on the link
++			 * partner.  So if we advertised no flow control, that is
++			 * what we will resolve to.  If we advertised some kind of
++			 * receive capability (Rx Pause Only or Full Flow Control)
++			 * and the link partner advertised none, we will configure
++			 * ourselves to enable Rx Flow Control only.  We can do
++			 * this safely for two reasons:  If the link partner really
++			 * didn't want flow control enabled, and we enable Rx, no
++			 * harm done since we won't be receiving any PAUSE frames
++			 * anyway.  If the intent on the link partner was to have
++			 * flow control enabled, then by us enabling RX only, we
++			 * can at least receive pause frames and process them.
++			 * This is a good idea because in most cases, since we are
++			 * predominantly a server NIC, more times than not we will
++			 * be asked to delay transmission of packets than asking
++			 * our link partner to pause transmission of frames.
++			 */
++#if 0
++			else if(hw->original_fc == e1000_fc_none ||
++				hw->original_fc == e1000_fc_tx_pause) {
++#else
++			else if(hw->fc == e1000_fc_none)
++				DEBUGOUT("Flow Control = NONE.\r\n");
++			else if(hw->fc == e1000_fc_tx_pause) {
++#endif
++				hw->fc = e1000_fc_none;
++				DEBUGOUT("Flow Control = NONE.\r\n");
++			} else {
++				hw->fc = e1000_fc_rx_pause;
++				DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
++			}
++			
++			/* Now we need to do one last check...  If we auto-
++			 * negotiated to HALF DUPLEX, flow control should not be
++			 * enabled per IEEE 802.3 spec.
++			 */
++			e1000_get_speed_and_duplex(hw, &speed, &duplex);
++			
++			if(duplex == HALF_DUPLEX)
++				hw->fc = e1000_fc_none;
++			
++			/* Now we call a subroutine to actually force the MAC
++			 * controller to use the correct flow control settings.
++			 */
++			if((ret_val = e1000_force_mac_fc(hw))) {
++				DEBUGOUT("Error forcing flow control settings\n");
++				return ret_val;
++			}
++		} else {
++			DEBUGOUT("Copper PHY and Auto Neg has not completed.\r\n");
++		}
++	}
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Checks to see if the link status of the hardware has changed.
++ *
++ * hw - Struct containing variables accessed by shared code
++ *
++ * Called by any function that needs to check the link status of the adapter.
++ *****************************************************************************/
++static int
++e1000_check_for_link(struct e1000_hw *hw)
++{
++	uint32_t rxcw;
++	uint32_t ctrl;
++	uint32_t status;
++	uint32_t rctl;
++	uint32_t signal = 0;
++	int32_t ret_val;
++	uint16_t phy_data;
++	uint16_t lp_capability;
++	
++	DEBUGFUNC("e1000_check_for_link");
++	
++	/* On adapters with a MAC newer than 82544, SW Defineable pin 1 will be 
++	 * set when the optics detect a signal. On older adapters, it will be 
++	 * cleared when there is a signal.  This applies to fiber media only.
++	 */
++	if(hw->media_type == e1000_media_type_fiber)
++		signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
++
++	ctrl = E1000_READ_REG(hw, CTRL);
++	status = E1000_READ_REG(hw, STATUS);
++	rxcw = E1000_READ_REG(hw, RXCW);
++	
++	/* If we have a copper PHY then we only want to go out to the PHY
++	 * registers to see if Auto-Neg has completed and/or if our link
++	 * status has changed.  The get_link_status flag will be set if we
++	 * receive a Link Status Change interrupt or we have Rx Sequence
++	 * Errors.
++	 */
++#if 0
++	if((hw->media_type == e1000_media_type_copper) && hw->get_link_status) {
++#else
++	if(hw->media_type == e1000_media_type_copper) {
++#endif
++		/* First we want to see if the MII Status Register reports
++		 * link.  If so, then we want to get the current speed/duplex
++		 * of the PHY.
++		 * Read the register twice since the link bit is sticky.
++		 */
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
++			return ret_val;
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
++			return ret_val;
++		
++		if(phy_data & MII_SR_LINK_STATUS) {
++#if 0
++			hw->get_link_status = FALSE;
++#endif
++		} else {
++			/* No link detected */
++			return -E1000_ERR_NOLINK;
++		}
++
++		/* We have a M88E1000 PHY and Auto-Neg is enabled.  If we
++		 * have Si on board that is 82544 or newer, Auto
++		 * Speed Detection takes care of MAC speed/duplex
++		 * configuration.  So we only need to configure Collision
++		 * Distance in the MAC.  Otherwise, we need to force
++		 * speed/duplex on the MAC to the current PHY speed/duplex
++		 * settings.
++		 */
++		if(hw->mac_type >= e1000_82544)
++			e1000_config_collision_dist(hw);
++		else {
++			if((ret_val = e1000_config_mac_to_phy(hw))) {
++				DEBUGOUT("Error configuring MAC to PHY settings\n");
++				return ret_val;
++			}
++		}
++		
++		/* Configure Flow Control now that Auto-Neg has completed. First, we 
++		 * need to restore the desired flow control settings because we may
++		 * have had to re-autoneg with a different link partner.
++		 */
++		if((ret_val = e1000_config_fc_after_link_up(hw))) {
++			DEBUGOUT("Error configuring flow control\n");
++			return ret_val;
++		}
++		
++		/* At this point we know that we are on copper and we have
++		 * auto-negotiated link.  These are conditions for checking the link
++		 * parter capability register.  We use the link partner capability to
++		 * determine if TBI Compatibility needs to be turned on or off.  If
++		 * the link partner advertises any speed in addition to Gigabit, then
++		 * we assume that they are GMII-based, and TBI compatibility is not
++		 * needed. If no other speeds are advertised, we assume the link
++		 * partner is TBI-based, and we turn on TBI Compatibility.
++		 */
++		if(hw->tbi_compatibility_en) {
++			if((ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
++			                                 &lp_capability)))
++				return ret_val;
++			if(lp_capability & (NWAY_LPAR_10T_HD_CAPS |
++                                NWAY_LPAR_10T_FD_CAPS |
++                                NWAY_LPAR_100TX_HD_CAPS |
++                                NWAY_LPAR_100TX_FD_CAPS |
++                                NWAY_LPAR_100T4_CAPS)) {
++				/* If our link partner advertises anything in addition to 
++				 * gigabit, we do not need to enable TBI compatibility.
++				 */
++				if(hw->tbi_compatibility_on) {
++					/* If we previously were in the mode, turn it off. */
++					rctl = E1000_READ_REG(hw, RCTL);
++					rctl &= ~E1000_RCTL_SBP;
++					E1000_WRITE_REG(hw, RCTL, rctl);
++					hw->tbi_compatibility_on = FALSE;
++				}
++			} else {
++				/* If TBI compatibility is was previously off, turn it on. For
++				 * compatibility with a TBI link partner, we will store bad
++				 * packets. Some frames have an additional byte on the end and
++				 * will look like CRC errors to to the hardware.
++				 */
++				if(!hw->tbi_compatibility_on) {
++					hw->tbi_compatibility_on = TRUE;
++					rctl = E1000_READ_REG(hw, RCTL);
++					rctl |= E1000_RCTL_SBP;
++					E1000_WRITE_REG(hw, RCTL, rctl);
++				}
++			}
++		}
++	}
++	/* If we don't have link (auto-negotiation failed or link partner cannot
++	 * auto-negotiate), the cable is plugged in (we have signal), and our
++	 * link partner is not trying to auto-negotiate with us (we are receiving
++	 * idles or data), we need to force link up. We also need to give
++	 * auto-negotiation time to complete, in case the cable was just plugged
++	 * in. The autoneg_failed flag does this.
++	 */
++	else if((((hw->media_type == e1000_media_type_fiber) &&
++	        ((ctrl & E1000_CTRL_SWDPIN1) == signal)) ||
++	        (hw->media_type == e1000_media_type_internal_serdes)) &&
++		(!(status & E1000_STATUS_LU)) &&
++		(!(rxcw & E1000_RXCW_C))) {
++		if(hw->autoneg_failed == 0) {
++			hw->autoneg_failed = 1;
++			return 0;
++		}
++		DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\r\n");
++		
++		/* Disable auto-negotiation in the TXCW register */
++		E1000_WRITE_REG(hw, TXCW, (hw->txcw & ~E1000_TXCW_ANE));
++		
++		/* Force link-up and also force full-duplex. */
++		ctrl = E1000_READ_REG(hw, CTRL);
++		ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
++		E1000_WRITE_REG(hw, CTRL, ctrl);
++		
++		/* Configure Flow Control after forcing link up. */
++		if((ret_val = e1000_config_fc_after_link_up(hw))) {
++			DEBUGOUT("Error configuring flow control\n");
++			return ret_val;
++		}
++	}
++	/* If we are forcing link and we are receiving /C/ ordered sets, re-enable
++	 * auto-negotiation in the TXCW register and disable forced link in the
++	 * Device Control register in an attempt to auto-negotiate with our link
++	 * partner.
++	 */
++	else if(((hw->media_type == e1000_media_type_fiber)  ||
++	         (hw->media_type == e1000_media_type_internal_serdes)) &&
++		(ctrl & E1000_CTRL_SLU) &&
++		(rxcw & E1000_RXCW_C)) {
++		DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\r\n");
++		E1000_WRITE_REG(hw, TXCW, hw->txcw);
++		E1000_WRITE_REG(hw, CTRL, (ctrl & ~E1000_CTRL_SLU));
++	}
++#if 0
++	/* If we force link for non-auto-negotiation switch, check link status
++	 * based on MAC synchronization for internal serdes media type.
++	 */
++	else if((hw->media_type == e1000_media_type_internal_serdes) &&
++			!(E1000_TXCW_ANE & E1000_READ_REG(hw, TXCW))) {
++		/* SYNCH bit and IV bit are sticky. */
++		udelay(10);
++		if(E1000_RXCW_SYNCH & E1000_READ_REG(hw, RXCW)) {
++			if(!(rxcw & E1000_RXCW_IV)) {
++				hw->serdes_link_down = FALSE;
++				DEBUGOUT("SERDES: Link is up.\n");
++			}
++		} else {
++			hw->serdes_link_down = TRUE;
++			DEBUGOUT("SERDES: Link is down.\n");
++		}
++	}
++#endif
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++ * Detects the current speed and duplex settings of the hardware.
++ *
++ * hw - Struct containing variables accessed by shared code
++ * speed - Speed of the connection
++ * duplex - Duplex setting of the connection
++ *****************************************************************************/
++static void 
++e1000_get_speed_and_duplex(struct e1000_hw *hw,
++                           uint16_t *speed,
++                           uint16_t *duplex)
++{
++	uint32_t status;
++	
++	DEBUGFUNC("e1000_get_speed_and_duplex");
++	
++	if(hw->mac_type >= e1000_82543) {
++		status = E1000_READ_REG(hw, STATUS);
++		if(status & E1000_STATUS_SPEED_1000) {
++			*speed = SPEED_1000;
++			DEBUGOUT("1000 Mbs, ");
++		} else if(status & E1000_STATUS_SPEED_100) {
++			*speed = SPEED_100;
++			DEBUGOUT("100 Mbs, ");
++		} else {
++			*speed = SPEED_10;
++			DEBUGOUT("10 Mbs, ");
++		}
++		
++		if(status & E1000_STATUS_FD) {
++			*duplex = FULL_DUPLEX;
++			DEBUGOUT("Full Duplex\r\n");
++		} else {
++			*duplex = HALF_DUPLEX;
++			DEBUGOUT(" Half Duplex\r\n");
++		}
++	} else {
++		DEBUGOUT("1000 Mbs, Full Duplex\r\n");
++		*speed = SPEED_1000;
++		*duplex = FULL_DUPLEX;
++	}
++}
++
++/******************************************************************************
++* Blocks until autoneg completes or times out (~4.5 seconds)
++*
++* hw - Struct containing variables accessed by shared code
++******************************************************************************/
++static int
++e1000_wait_autoneg(struct e1000_hw *hw)
++{
++	int32_t ret_val;
++	uint16_t i;
++	uint16_t phy_data;
++	
++	DEBUGFUNC("e1000_wait_autoneg");
++	DEBUGOUT("Waiting for Auto-Neg to complete.\n");
++	
++	/* We will wait for autoneg to complete or 4.5 seconds to expire. */
++	for(i = PHY_AUTO_NEG_TIME; i > 0; i--) {
++		/* Read the MII Status Register and wait for Auto-Neg
++		 * Complete bit to be set.
++		 */
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
++			return ret_val;
++		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
++			return ret_val;
++		if(phy_data & MII_SR_AUTONEG_COMPLETE) {
++			DEBUGOUT("Auto-Neg complete.\n");
++			return E1000_SUCCESS;
++		}
++		mdelay(100);
++	}
++	DEBUGOUT("Auto-Neg timedout.\n");
++	return -E1000_ERR_TIMEOUT;
++}
++
++/******************************************************************************
++* Raises the Management Data Clock
++*
++* hw - Struct containing variables accessed by shared code
++* ctrl - Device control register's current value
++******************************************************************************/
++static void
++e1000_raise_mdi_clk(struct e1000_hw *hw,
++                    uint32_t *ctrl)
++{
++	/* Raise the clock input to the Management Data Clock (by setting the MDC
++	 * bit), and then delay 10 microseconds.
++	 */
++	E1000_WRITE_REG(hw, CTRL, (*ctrl | E1000_CTRL_MDC));
++	E1000_WRITE_FLUSH(hw);
++	udelay(10);
++}
++
++/******************************************************************************
++* Lowers the Management Data Clock
++*
++* hw - Struct containing variables accessed by shared code
++* ctrl - Device control register's current value
++******************************************************************************/
++static void
++e1000_lower_mdi_clk(struct e1000_hw *hw,
++                    uint32_t *ctrl)
++{
++	/* Lower the clock input to the Management Data Clock (by clearing the MDC
++	 * bit), and then delay 10 microseconds.
++	 */
++	E1000_WRITE_REG(hw, CTRL, (*ctrl & ~E1000_CTRL_MDC));
++	E1000_WRITE_FLUSH(hw);
++	udelay(10);
++}
++
++/******************************************************************************
++* Shifts data bits out to the PHY
++*
++* hw - Struct containing variables accessed by shared code
++* data - Data to send out to the PHY
++* count - Number of bits to shift out
++*
++* Bits are shifted out in MSB to LSB order.
++******************************************************************************/
++static void
++e1000_shift_out_mdi_bits(struct e1000_hw *hw,
++                         uint32_t data,
++                         uint16_t count)
++{
++	uint32_t ctrl;
++	uint32_t mask;
++
++	/* We need to shift "count" number of bits out to the PHY. So, the value
++	 * in the "data" parameter will be shifted out to the PHY one bit at a 
++	 * time. In order to do this, "data" must be broken down into bits.
++	 */
++	mask = 0x01;
++	mask <<= (count - 1);
++	
++	ctrl = E1000_READ_REG(hw, CTRL);
++	
++	/* Set MDIO_DIR and MDC_DIR direction bits to be used as output pins. */
++	ctrl |= (E1000_CTRL_MDIO_DIR | E1000_CTRL_MDC_DIR);
++	
++	while(mask) {
++		/* A "1" is shifted out to the PHY by setting the MDIO bit to "1" and
++		 * then raising and lowering the Management Data Clock. A "0" is
++		 * shifted out to the PHY by setting the MDIO bit to "0" and then
++		 * raising and lowering the clock.
++		 */
++		if(data & mask) ctrl |= E1000_CTRL_MDIO;
++		else ctrl &= ~E1000_CTRL_MDIO;
++		
++		E1000_WRITE_REG(hw, CTRL, ctrl);
++		E1000_WRITE_FLUSH(hw);
++		
++		udelay(10);
++
++		e1000_raise_mdi_clk(hw, &ctrl);
++		e1000_lower_mdi_clk(hw, &ctrl);
++
++		mask = mask >> 1;
++	}
++}
++
++/******************************************************************************
++* Shifts data bits in from the PHY
++*
++* hw - Struct containing variables accessed by shared code
++*
++* Bits are shifted in in MSB to LSB order. 
++******************************************************************************/
++static uint16_t
++e1000_shift_in_mdi_bits(struct e1000_hw *hw)
++{
++	uint32_t ctrl;
++	uint16_t data = 0;
++	uint8_t i;
++
++	/* In order to read a register from the PHY, we need to shift in a total
++	 * of 18 bits from the PHY. The first two bit (turnaround) times are used
++	 * to avoid contention on the MDIO pin when a read operation is performed.
++	 * These two bits are ignored by us and thrown away. Bits are "shifted in"
++	 * by raising the input to the Management Data Clock (setting the MDC bit),
++	 * and then reading the value of the MDIO bit.
++	 */ 
++	ctrl = E1000_READ_REG(hw, CTRL);
++	
++	/* Clear MDIO_DIR (SWDPIO1) to indicate this bit is to be used as input. */
++	ctrl &= ~E1000_CTRL_MDIO_DIR;
++	ctrl &= ~E1000_CTRL_MDIO;
++	
++	E1000_WRITE_REG(hw, CTRL, ctrl);
++	E1000_WRITE_FLUSH(hw);
++	
++	/* Raise and Lower the clock before reading in the data. This accounts for
++	 * the turnaround bits. The first clock occurred when we clocked out the
++	 * last bit of the Register Address.
++	 */
++	e1000_raise_mdi_clk(hw, &ctrl);
++	e1000_lower_mdi_clk(hw, &ctrl);
++	
++	for(data = 0, i = 0; i < 16; i++) {
++		data = data << 1;
++		e1000_raise_mdi_clk(hw, &ctrl);
++		ctrl = E1000_READ_REG(hw, CTRL);
++		/* Check to see if we shifted in a "1". */
++		if(ctrl & E1000_CTRL_MDIO) data |= 1;
++		e1000_lower_mdi_clk(hw, &ctrl);
++	}
++	
++	e1000_raise_mdi_clk(hw, &ctrl);
++	e1000_lower_mdi_clk(hw, &ctrl);
++	
++	return data;
++}
++
++/*****************************************************************************
++* Reads the value from a PHY register, if the value is on a specific non zero
++* page, sets the page first.
++*
++* hw - Struct containing variables accessed by shared code
++* reg_addr - address of the PHY register to read
++******************************************************************************/
++static int
++e1000_read_phy_reg(struct e1000_hw *hw,
++                   uint32_t reg_addr,
++                   uint16_t *phy_data)
++{
++	uint32_t ret_val;
++
++	DEBUGFUNC("e1000_read_phy_reg");
++
++	if(hw->phy_type == e1000_phy_igp &&
++	   (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
++		if((ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
++		                                     (uint16_t)reg_addr)))
++			return ret_val;
++	}
++
++	ret_val = e1000_read_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr,
++	                                phy_data);
++
++	return ret_val;
++}
++
++static int
++e1000_read_phy_reg_ex(struct e1000_hw *hw,
++                      uint32_t reg_addr,
++                      uint16_t *phy_data)
++{
++	uint32_t i;
++	uint32_t mdic = 0;
++	const uint32_t phy_addr = 1;
++
++	DEBUGFUNC("e1000_read_phy_reg_ex");
++	
++	if(reg_addr > MAX_PHY_REG_ADDRESS) {
++		DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
++		return -E1000_ERR_PARAM;
++	}
++	
++	if(hw->mac_type > e1000_82543) {
++		/* Set up Op-code, Phy Address, and register address in the MDI
++		 * Control register.  The MAC will take care of interfacing with the
++		 * PHY to retrieve the desired data.
++		 */
++		mdic = ((reg_addr << E1000_MDIC_REG_SHIFT) |
++			(phy_addr << E1000_MDIC_PHY_SHIFT) | 
++			(E1000_MDIC_OP_READ));
++		
++		E1000_WRITE_REG(hw, MDIC, mdic);
++
++		/* Poll the ready bit to see if the MDI read completed */
++		for(i = 0; i < 64; i++) {
++			udelay(50);
++			mdic = E1000_READ_REG(hw, MDIC);
++			if(mdic & E1000_MDIC_READY) break;
++		}
++		if(!(mdic & E1000_MDIC_READY)) {
++			DEBUGOUT("MDI Read did not complete\n");
++			return -E1000_ERR_PHY;
++		}
++		if(mdic & E1000_MDIC_ERROR) {
++			DEBUGOUT("MDI Error\n");
++			return -E1000_ERR_PHY;
++		}
++		*phy_data = (uint16_t) mdic;
++	} else {
++		/* We must first send a preamble through the MDIO pin to signal the
++		 * beginning of an MII instruction.  This is done by sending 32
++		 * consecutive "1" bits.
++		 */
++		e1000_shift_out_mdi_bits(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
++		
++		/* Now combine the next few fields that are required for a read
++		 * operation.  We use this method instead of calling the
++		 * e1000_shift_out_mdi_bits routine five different times. The format of
++		 * a MII read instruction consists of a shift out of 14 bits and is
++		 * defined as follows:
++		 *    <Preamble><SOF><Op Code><Phy Addr><Reg Addr>
++		 * followed by a shift in of 18 bits.  This first two bits shifted in
++		 * are TurnAround bits used to avoid contention on the MDIO pin when a
++		 * READ operation is performed.  These two bits are thrown away
++		 * followed by a shift in of 16 bits which contains the desired data.
++		 */
++		mdic = ((reg_addr) | (phy_addr << 5) | 
++			(PHY_OP_READ << 10) | (PHY_SOF << 12));
++		
++		e1000_shift_out_mdi_bits(hw, mdic, 14);
++		
++		/* Now that we've shifted out the read command to the MII, we need to
++		 * "shift in" the 16-bit value (18 total bits) of the requested PHY
++		 * register address.
++		 */
++		*phy_data = e1000_shift_in_mdi_bits(hw);
++	}
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++* Writes a value to a PHY register
++*
++* hw - Struct containing variables accessed by shared code
++* reg_addr - address of the PHY register to write
++* data - data to write to the PHY
++******************************************************************************/
++static int 
++e1000_write_phy_reg(struct e1000_hw *hw,
++                    uint32_t reg_addr,
++                    uint16_t phy_data)
++{
++	uint32_t ret_val;
++
++	DEBUGFUNC("e1000_write_phy_reg");
++
++	if(hw->phy_type == e1000_phy_igp &&
++	   (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
++		if((ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
++		                                     (uint16_t)reg_addr)))
++			return ret_val;
++	}
++
++	ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr,
++	                                 phy_data);
++
++	return ret_val;
++}
++
++static int
++e1000_write_phy_reg_ex(struct e1000_hw *hw,
++                       uint32_t reg_addr,
++                       uint16_t phy_data)
++{
++	uint32_t i;
++	uint32_t mdic = 0;
++	const uint32_t phy_addr = 1;
++	
++	DEBUGFUNC("e1000_write_phy_reg_ex");
++	
++	if(reg_addr > MAX_PHY_REG_ADDRESS) {
++		DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
++		return -E1000_ERR_PARAM;
++	}
++	
++	if(hw->mac_type > e1000_82543) {
++		/* Set up Op-code, Phy Address, register address, and data intended
++		 * for the PHY register in the MDI Control register.  The MAC will take
++		 * care of interfacing with the PHY to send the desired data.
++		 */
++		mdic = (((uint32_t) phy_data) |
++			(reg_addr << E1000_MDIC_REG_SHIFT) |
++			(phy_addr << E1000_MDIC_PHY_SHIFT) | 
++			(E1000_MDIC_OP_WRITE));
++		
++		E1000_WRITE_REG(hw, MDIC, mdic);
++		
++		/* Poll the ready bit to see if the MDI read completed */
++		for(i = 0; i < 640; i++) {
++			udelay(5);
++			mdic = E1000_READ_REG(hw, MDIC);
++			if(mdic & E1000_MDIC_READY) break;
++		}
++		if(!(mdic & E1000_MDIC_READY)) {
++			DEBUGOUT("MDI Write did not complete\n");
++			return -E1000_ERR_PHY;
++		}
++	} else {
++		/* We'll need to use the SW defined pins to shift the write command
++		 * out to the PHY. We first send a preamble to the PHY to signal the
++		 * beginning of the MII instruction.  This is done by sending 32 
++		 * consecutive "1" bits.
++		 */
++		e1000_shift_out_mdi_bits(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
++		
++		/* Now combine the remaining required fields that will indicate a 
++		 * write operation. We use this method instead of calling the
++		 * e1000_shift_out_mdi_bits routine for each field in the command. The
++		 * format of a MII write instruction is as follows:
++		 * <Preamble><SOF><Op Code><Phy Addr><Reg Addr><Turnaround><Data>.
++		 */
++		mdic = ((PHY_TURNAROUND) | (reg_addr << 2) | (phy_addr << 7) |
++			(PHY_OP_WRITE << 12) | (PHY_SOF << 14));
++		mdic <<= 16;
++		mdic |= (uint32_t) phy_data;
++		
++		e1000_shift_out_mdi_bits(hw, mdic, 32);
++	}
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++* Returns the PHY to the power-on reset state
++*
++* hw - Struct containing variables accessed by shared code
++******************************************************************************/
++static void
++e1000_phy_hw_reset(struct e1000_hw *hw)
++{
++	uint32_t ctrl, ctrl_ext;
++
++	DEBUGFUNC("e1000_phy_hw_reset");
++	
++	DEBUGOUT("Resetting Phy...\n");
++	
++	if(hw->mac_type > e1000_82543) {
++		/* Read the device control register and assert the E1000_CTRL_PHY_RST
++		 * bit. Then, take it out of reset.
++		 */
++		ctrl = E1000_READ_REG(hw, CTRL);
++		E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PHY_RST);
++		E1000_WRITE_FLUSH(hw);
++		mdelay(10);
++		E1000_WRITE_REG(hw, CTRL, ctrl);
++		E1000_WRITE_FLUSH(hw);
++	} else {
++		/* Read the Extended Device Control Register, assert the PHY_RESET_DIR
++		 * bit to put the PHY into reset. Then, take it out of reset.
++		 */
++		ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
++		ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR;
++		ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA;
++		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
++		E1000_WRITE_FLUSH(hw);
++		mdelay(10);
++		ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA;
++		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
++		E1000_WRITE_FLUSH(hw);
++	}
++	udelay(150);
++}
++
++/******************************************************************************
++* Resets the PHY
++*
++* hw - Struct containing variables accessed by shared code
++*
++* Sets bit 15 of the MII Control regiser
++******************************************************************************/
++static int 
++e1000_phy_reset(struct e1000_hw *hw)
++{
++	int32_t ret_val;
++	uint16_t phy_data;
++
++	DEBUGFUNC("e1000_phy_reset");
++
++	if(hw->mac_type != e1000_82541_rev_2) {
++		if((ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data)))
++			return ret_val;
++		
++		phy_data |= MII_CR_RESET;
++		if((ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data)))
++			return ret_val;
++		
++		udelay(1);
++	} else e1000_phy_hw_reset(hw);
++
++	if(hw->phy_type == e1000_phy_igp)
++		e1000_phy_init_script(hw);
++
++	return E1000_SUCCESS;
++}
++
++/******************************************************************************
++* Probes the expected PHY address for known PHY IDs
++*
++* hw - Struct containing variables accessed by shared code
++******************************************************************************/
++static int
++e1000_detect_gig_phy(struct e1000_hw *hw)
++{
++	int32_t phy_init_status, ret_val;
++	uint16_t phy_id_high, phy_id_low;
++	boolean_t match = FALSE;
++
++	DEBUGFUNC("e1000_detect_gig_phy");
++	
++	/* Read the PHY ID Registers to identify which PHY is onboard. */
++	if((ret_val = e1000_read_phy_reg(hw, PHY_ID1, &phy_id_high)))
++		return ret_val;
++
++	hw->phy_id = (uint32_t) (phy_id_high << 16);
++	udelay(20);
++	if((ret_val = e1000_read_phy_reg(hw, PHY_ID2, &phy_id_low)))
++		return ret_val;
++	
++	hw->phy_id |= (uint32_t) (phy_id_low & PHY_REVISION_MASK);
++#ifdef LINUX_DRIVER
++	hw->phy_revision = (uint32_t) phy_id_low & ~PHY_REVISION_MASK;
++#endif
++	
++	switch(hw->mac_type) {
++	case e1000_82543:
++		if(hw->phy_id == M88E1000_E_PHY_ID) match = TRUE;
++		break;
++	case e1000_82544:
++		if(hw->phy_id == M88E1000_I_PHY_ID) match = TRUE;
++		break;
++	case e1000_82540:
++	case e1000_82545:
++	case e1000_82545_rev_3:
++	case e1000_82546:
++	case e1000_82546_rev_3:
++		if(hw->phy_id == M88E1011_I_PHY_ID) match = TRUE;
++		break;
++	case e1000_82541:
++	case e1000_82541_rev_2:
++	case e1000_82547:
++	case e1000_82547_rev_2:
++		if(hw->phy_id == IGP01E1000_I_PHY_ID) match = TRUE;
++		break;
++	default:
++		DEBUGOUT1("Invalid MAC type %d\n", hw->mac_type);
++		return -E1000_ERR_CONFIG;
++	}
++	phy_init_status = e1000_set_phy_type(hw);
++
++	if ((match) && (phy_init_status == E1000_SUCCESS)) {
++		DEBUGOUT1("PHY ID 0x%X detected\n", hw->phy_id);
++		return E1000_SUCCESS;
++	}
++	DEBUGOUT1("Invalid PHY ID 0x%X\n", hw->phy_id);
++	return -E1000_ERR_PHY;
++}
++
++/******************************************************************************
++ * Sets up eeprom variables in the hw struct.  Must be called after mac_type
++ * is configured.
++ *
++ * hw - Struct containing variables accessed by shared code
++ *****************************************************************************/
++static void
++e1000_init_eeprom_params(struct e1000_hw *hw)
++{
++	struct e1000_eeprom_info *eeprom = &hw->eeprom;
++	uint32_t eecd = E1000_READ_REG(hw, EECD);
++	uint16_t eeprom_size;
++
++	DEBUGFUNC("e1000_init_eeprom_params");
++
++	switch (hw->mac_type) {
++	case e1000_82542_rev2_0:
++	case e1000_82542_rev2_1:
++	case e1000_82543:
++	case e1000_82544:
++		eeprom->type = e1000_eeprom_microwire;
++		eeprom->word_size = 64;
++		eeprom->opcode_bits = 3;
++		eeprom->address_bits = 6;
++		eeprom->delay_usec = 50;
++		break;
++	case e1000_82540:
++	case e1000_82545:
++	case e1000_82545_rev_3:
++	case e1000_82546:
++	case e1000_82546_rev_3:
++		eeprom->type = e1000_eeprom_microwire;
++		eeprom->opcode_bits = 3;
++		eeprom->delay_usec = 50;
++		if(eecd & E1000_EECD_SIZE) {
++			eeprom->word_size = 256;
++			eeprom->address_bits = 8;
++		} else {
++			eeprom->word_size = 64;
++			eeprom->address_bits = 6;
++		}
++		break;
++	case e1000_82541:
++	case e1000_82541_rev_2:
++	case e1000_82547:
++	case e1000_82547_rev_2:
++		if (eecd & E1000_EECD_TYPE) {
++			eeprom->type = e1000_eeprom_spi;
++			if (eecd & E1000_EECD_ADDR_BITS) {
++				eeprom->page_size = 32;
++				eeprom->address_bits = 16;
++			} else {
++				eeprom->page_size = 8;
++				eeprom->address_bits = 8;
++			}
++		} else {
++			eeprom->type = e1000_eeprom_microwire;
++			eeprom->opcode_bits = 3;
++			eeprom->delay_usec = 50;
++			if (eecd & E1000_EECD_ADDR_BITS) {
++				eeprom->word_size = 256;
++				eeprom->address_bits = 8;
++			} else {
++				eeprom->word_size = 64;
++				eeprom->address_bits = 6;
++			}
++		}
++		break;
++	default:
++		eeprom->type = e1000_eeprom_spi;
++		if (eecd & E1000_EECD_ADDR_BITS) {
++			eeprom->page_size = 32;
++			eeprom->address_bits = 16;
++		} else {
++			eeprom->page_size = 8;
++			eeprom->address_bits = 8;
++		}
++		break;
++	}
++
++	if (eeprom->type == e1000_eeprom_spi) {
++		eeprom->opcode_bits = 8;
++		eeprom->delay_usec = 1;
++		eeprom->word_size = 64;
++		if (e1000_read_eeprom(hw, EEPROM_CFG, 1, &eeprom_size) == 0) {
++			eeprom_size &= EEPROM_SIZE_MASK;
++
++			switch (eeprom_size) {
++			case EEPROM_SIZE_16KB:
++				eeprom->word_size = 8192;
++				break;
++			case EEPROM_SIZE_8KB:
++				eeprom->word_size = 4096;
++				break;
++			case EEPROM_SIZE_4KB:
++				eeprom->word_size = 2048;
++				break;
++			case EEPROM_SIZE_2KB:
++				eeprom->word_size = 1024;
++				break;
++			case EEPROM_SIZE_1KB:
++				eeprom->word_size = 512;
++				break;
++			case EEPROM_SIZE_512B:
++				eeprom->word_size = 256;
++				break;
++			case EEPROM_SIZE_128B:
++			default:
++				break;
++			}
++		}
++	}
++}
++
++/**
++ * e1000_reset - Reset the adapter
++ */
++
++static int
++e1000_reset(struct e1000_hw *hw)
++{
++	uint32_t pba;
++	/* Repartition Pba for greater than 9k mtu
++	 * To take effect CTRL.RST is required.
++	 */
++
++	if(hw->mac_type < e1000_82547) {
++		pba = E1000_PBA_48K;
++	} else {
++		pba = E1000_PBA_30K;
++	}
++	E1000_WRITE_REG(hw, PBA, pba);
++
++	/* flow control settings */
++#if 0
++	hw->fc_high_water = FC_DEFAULT_HI_THRESH;
++	hw->fc_low_water = FC_DEFAULT_LO_THRESH;
++	hw->fc_pause_time = FC_DEFAULT_TX_TIMER;
++	hw->fc_send_xon = 1;
++	hw->fc = hw->original_fc;
++#endif
++	
++	e1000_reset_hw(hw);
++	if(hw->mac_type >= e1000_82544)
++		E1000_WRITE_REG(hw, WUC, 0);
++	return e1000_init_hw(hw);
++}
++
++/**
++ * e1000_sw_init - Initialize general software structures (struct e1000_adapter)
++ * @adapter: board private structure to initialize
++ *
++ * e1000_sw_init initializes the Adapter private data structure.
++ * Fields are initialized based on PCI device information and
++ * OS network device settings (MTU size).
++ **/
++
++static int 
++e1000_sw_init(struct pci_device *pdev, struct e1000_hw *hw)
++{
++	int result;
++
++	/* PCI config space info */
++	pci_read_config_word(pdev, PCI_VENDOR_ID, &hw->vendor_id);
++	pci_read_config_word(pdev, PCI_DEVICE_ID, &hw->device_id);
++	pci_read_config_byte(pdev, PCI_REVISION, &hw->revision_id);
++#if 0
++	pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID,
++                             &hw->subsystem_vendor_id);
++	pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &hw->subsystem_id);
++#endif
++
++	pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
++
++	/* identify the MAC */
++
++	result = e1000_set_mac_type(hw);
++	if (result) {
++		E1000_ERR("Unknown MAC Type\n");
++		return result;
++	}
++
++	/* initialize eeprom parameters */
++
++	e1000_init_eeprom_params(hw);
++
++#if 0
++	if((hw->mac_type == e1000_82541) ||
++	   (hw->mac_type == e1000_82547) ||
++	   (hw->mac_type == e1000_82541_rev_2) ||
++	   (hw->mac_type == e1000_82547_rev_2))
++		hw->phy_init_script = 1;
++#endif
++
++	e1000_set_media_type(hw);
++
++#if 0
++	if(hw->mac_type < e1000_82543)
++		hw->report_tx_early = 0;
++	else
++		hw->report_tx_early = 1;
++
++	hw->wait_autoneg_complete = FALSE;
++#endif
++	hw->tbi_compatibility_en = TRUE;
++#if 0
++	hw->adaptive_ifs = TRUE;
++
++	/* Copper options */
++
++	if(hw->media_type == e1000_media_type_copper) {
++		hw->mdix = AUTO_ALL_MODES;
++		hw->disable_polarity_correction = FALSE;
++		hw->master_slave = E1000_MASTER_SLAVE;
++	}
++#endif
++	return E1000_SUCCESS;
++}
++
++static void fill_rx (void)
++{
++	struct e1000_rx_desc *rd;
++	rx_last = rx_tail;
++	rd = rx_base + rx_tail;
++	rx_tail = (rx_tail + 1) % 8;
++	memset (rd, 0, 16);
++	rd->buffer_addr = virt_to_bus(&packet);
++	E1000_WRITE_REG (&hw, RDT, rx_tail);
++}
++
++static void init_descriptor (void)
++{
++	unsigned long ptr;
++	unsigned long tctl;
++
++	ptr = virt_to_phys(tx_pool);
++	if (ptr & 0xf)
++		ptr = (ptr + 0x10) & (~0xf);
++
++	tx_base = phys_to_virt(ptr);
++
++	E1000_WRITE_REG (&hw, TDBAL, virt_to_bus(tx_base));
++	E1000_WRITE_REG (&hw, TDBAH, 0);
++	E1000_WRITE_REG (&hw, TDLEN, 128);
++
++	/* Setup the HW Tx Head and Tail descriptor pointers */
++
++	E1000_WRITE_REG (&hw, TDH, 0);
++	E1000_WRITE_REG (&hw, TDT, 0);
++	tx_tail = 0;
++
++	/* Program the Transmit Control Register */
++
++#ifdef LINUX_DRIVER_TCTL
++	tctl = E1000_READ_REG(&hw, TCTL);
++
++	tctl &= ~E1000_TCTL_CT;
++	tctl |= E1000_TCTL_EN | E1000_TCTL_PSP |
++		(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
++#else
++	tctl = E1000_TCTL_PSP | E1000_TCTL_EN |
++		(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT) | 
++		(E1000_HDX_COLLISION_DISTANCE << E1000_COLD_SHIFT);
++#endif
++
++	E1000_WRITE_REG (&hw, TCTL, tctl);
++
++	e1000_config_collision_dist(&hw);
++
++
++	rx_tail = 0;
++	/* disable receive */
++	E1000_WRITE_REG (&hw, RCTL, 0);
++	ptr = virt_to_phys(rx_pool);
++	if (ptr & 0xf)
++		ptr = (ptr + 0x10) & (~0xf);
++	rx_base = phys_to_virt(ptr);
++
++	/* Setup the Base and Length of the Rx Descriptor Ring */
++
++	E1000_WRITE_REG (&hw, RDBAL, virt_to_bus(rx_base));
++	E1000_WRITE_REG (&hw, RDBAH, 0);
++
++	E1000_WRITE_REG (&hw, RDLEN, 128);
++
++	/* Setup the HW Rx Head and Tail Descriptor Pointers */
++	E1000_WRITE_REG (&hw, RDH, 0);
++	E1000_WRITE_REG (&hw, RDT, 0);
++
++	E1000_WRITE_REG (&hw, RCTL, 
++		E1000_RCTL_EN | 
++		E1000_RCTL_BAM | 
++		E1000_RCTL_SZ_2048 | 
++		E1000_RCTL_MPE);
++	fill_rx();
++}
++
++
++
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int
++e1000_poll (struct nic *nic, int retrieve)
++{
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++	struct e1000_rx_desc *rd;
++
++	rd = rx_base + rx_last;
++	if (!rd->status & E1000_RXD_STAT_DD)
++		return 0;
++
++	if ( ! retrieve ) return 1;
++
++	//      printf("recv: packet %! -> %! len=%d \n", packet+6, packet,rd->Length);
++	memcpy (nic->packet, packet, rd->length);
++	nic->packetlen = rd->length;
++	fill_rx ();
++	return 1;
++}
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void
++e1000_transmit (struct nic *nic, const char *d,	/* Destination */
++		    unsigned int type,	/* Type */
++		    unsigned int size,	/* size */
++		    const char *p)	/* Packet */
++{
++	/* send the packet to destination */
++	struct eth_hdr {
++		unsigned char dst_addr[ETH_ALEN];
++		unsigned char src_addr[ETH_ALEN];
++		unsigned short type;
++	} hdr;
++	struct e1000_tx_desc *txhd;	/* header */
++	struct e1000_tx_desc *txp;	/* payload */
++	DEBUGFUNC("send");
++
++	memcpy (&hdr.dst_addr, d, ETH_ALEN);
++	memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN);
++
++	hdr.type = htons (type);
++	txhd = tx_base + tx_tail;
++	tx_tail = (tx_tail + 1) % 8;
++	txp = tx_base + tx_tail;
++	tx_tail = (tx_tail + 1) % 8;
++
++	txhd->buffer_addr = virt_to_bus (&hdr);
++	txhd->lower.data = sizeof (hdr);
++	txhd->upper.data = 0;
++
++	txp->buffer_addr = virt_to_bus(p);
++	txp->lower.data = E1000_TXD_CMD_RPS | E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS | size;
++	txp->upper.data = 0;
++
++	E1000_WRITE_REG (&hw, TDT, tx_tail);
++	while (!(txp->upper.data & E1000_TXD_STAT_DD)) {
++		udelay(10);	/* give the nic a chance to write to the register */
++		poll_interruptions();
++	}
++	DEBUGFUNC("send end");
++}
++
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void e1000_disable (struct dev *dev __unused)
++{
++	/* Clear the transmit ring */
++	E1000_WRITE_REG (&hw, TDH, 0);
++	E1000_WRITE_REG (&hw, TDT, 0);
++
++	/* Clear the receive ring */
++	E1000_WRITE_REG (&hw, RDH, 0);
++	E1000_WRITE_REG (&hw, RDT, 0);
++
++	/* put the card in its initial state */
++	E1000_WRITE_REG (&hw, CTRL, E1000_CTRL_RST);
++
++	/* Turn off the ethernet interface */
++	E1000_WRITE_REG (&hw, RCTL, 0);
++	E1000_WRITE_REG (&hw, TCTL, 0);
++	mdelay (10);
++
++	/* Unmap my window to the device */
++	iounmap(hw.hw_addr);
++}
++
++/**************************************************************************
++IRQ - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void e1000_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++#define IORESOURCE_IO	0x00000100     /* Resource type */
++#define BAR_0		0
++#define BAR_1		1
++#define BAR_5		5
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++You should omit the last argument struct pci_device * for a non-PCI NIC
++***************************************************************************/
++static int e1000_probe(struct dev *dev, struct pci_device *p)
++{
++	struct nic *nic = (struct nic *)dev;
++	unsigned long mmio_start, mmio_len;
++	int ret_val, i;
++
++	if (p == 0)
++		return 0;
++	/* Initialize hw with default values */
++	memset(&hw, 0, sizeof(hw));
++	hw.pdev = p;
++
++#if 1
++	/* Are these variables needed? */
++	hw.fc                    = e1000_fc_none;
++#if 0
++	hw.original_fc           = e1000_fc_none;
++#endif
++	hw.autoneg_failed        = 0;
++#if 0
++	hw.get_link_status       = TRUE;
++#endif
++#endif
++
++	mmio_start = pci_bar_start(p, PCI_BASE_ADDRESS_0);
++	mmio_len   = pci_bar_size(p,  PCI_BASE_ADDRESS_0);
++	hw.hw_addr = ioremap(mmio_start, mmio_len);
++
++	for(i = BAR_1; i <= BAR_5; i++) {
++		if(pci_bar_size(p, i) == 0)
++			continue;                
++		if(pci_find_capability(p, i) & IORESOURCE_IO) {
++			hw.io_base = pci_bar_start(p, i);
++			break;
++                }        
++	}
++
++	adjust_pci_device(p);
++
++	nic->ioaddr   = p->ioaddr & ~3;
++	nic->irqno    = 0;
++
++	/* From Matt Hortman <mbhortman@acpthinclient.com> */
++	/* MAC and Phy settings */
++
++	/* setup the private structure */
++	if (e1000_sw_init(p, &hw) < 0) {
++		iounmap(hw.hw_addr);
++		return 0;
++	}
++
++	/* make sure the EEPROM is good */
++
++	if (e1000_validate_eeprom_checksum(&hw) < 0) {
++		printf ("The EEPROM Checksum Is Not Valid\n");
++		iounmap(hw.hw_addr);
++		return 0;
++	}
++
++	/* copy the MAC address out of the EEPROM */
++
++	e1000_read_mac_addr(&hw);
++	memcpy (nic->node_addr, hw.mac_addr, ETH_ALEN);
++	
++	printf("Ethernet addr: %!\n", nic->node_addr);
++
++	/* reset the hardware with the new settings */
++
++	ret_val = e1000_reset(&hw);
++	if (ret_val < 0) {
++		if ((ret_val == -E1000_ERR_NOLINK) ||
++			(ret_val == -E1000_ERR_TIMEOUT)) {
++			E1000_ERR("Valid Link not detected\n");
++		} else {
++			E1000_ERR("Hardware Initialization Failed\n");
++		}
++		iounmap(hw.hw_addr);
++		return 0;
++	}
++	init_descriptor();
++
++	/* point to NIC specific routines */
++	dev->disable  = e1000_disable;
++	nic->poll     = e1000_poll;
++	nic->transmit = e1000_transmit;
++	nic->irq      = e1000_irq;
++
++	return 1;
++}
++
++static struct pci_id e1000_nics[] = {
++PCI_ROM(0x8086, 0x1000, "e1000-82542",               "Intel EtherExpressPro1000"),
++PCI_ROM(0x8086, 0x1001, "e1000-82543gc-fiber",       "Intel EtherExpressPro1000 82543GC Fiber"),
++PCI_ROM(0x8086, 0x1004, "e1000-82543gc-copper",	     "Intel EtherExpressPro1000 82543GC Copper"),
++PCI_ROM(0x8086, 0x1008, "e1000-82544ei-copper",      "Intel EtherExpressPro1000 82544EI Copper"),
++PCI_ROM(0x8086, 0x1009, "e1000-82544ei-fiber",       "Intel EtherExpressPro1000 82544EI Fiber"),
++PCI_ROM(0x8086, 0x100C, "e1000-82544gc-copper",      "Intel EtherExpressPro1000 82544GC Copper"),
++PCI_ROM(0x8086, 0x100D, "e1000-82544gc-lom",         "Intel EtherExpressPro1000 82544GC LOM"),
++PCI_ROM(0x8086, 0x100E, "e1000-82540em",     	     "Intel EtherExpressPro1000 82540EM"),
++PCI_ROM(0x8086, 0x100F, "e1000-82545em-copper",      "Intel EtherExpressPro1000 82545EM Copper"),
++PCI_ROM(0x8086, 0x1010, "e1000-82546eb-copper",      "Intel EtherExpressPro1000 82546EB Copper"),
++PCI_ROM(0x8086, 0x1011, "e1000-82545em-fiber",       "Intel EtherExpressPro1000 82545EM Fiber"),
++PCI_ROM(0x8086, 0x1012, "e1000-82546eb-fiber", 	     "Intel EtherExpressPro1000 82546EB Copper"),
++PCI_ROM(0x8086, 0x1013, "e1000-82541ei",	     "Intel EtherExpressPro1000 82541EI"),
++PCI_ROM(0x8086, 0x1015, "e1000-82540em-lom",  	     "Intel EtherExpressPro1000 82540EM LOM"),
++PCI_ROM(0x8086, 0x1016, "e1000-82540ep-lom",	     "Intel EtherExpressPro1000 82540EP LOM"),
++PCI_ROM(0x8086, 0x1017, "e1000-82540ep",	     "Intel EtherExpressPro1000 82540EP"),
++PCI_ROM(0x8086, 0x1018, "e1000-82541ep",	     "Intel EtherExpressPro1000 82541EP"),
++PCI_ROM(0x8086, 0x1019, "e1000-82547ei",	     "Intel EtherExpressPro1000 82547EI"),
++PCI_ROM(0x8086, 0x101d, "e1000-82546eb-quad-copper", "Intel EtherExpressPro1000 82546EB Quad Copper"),
++PCI_ROM(0x8086, 0x101e, "e1000-82540ep-lp",	     "Intel EtherExpressPro1000 82540EP LP"),
++PCI_ROM(0x8086, 0x1026, "e1000-82545gm-copper",	     "Intel EtherExpressPro1000 82545GM Copper"),
++PCI_ROM(0x8086, 0x1027, "e1000-82545gm-fiber",	     "Intel EtherExpressPro1000 82545GM Fiber"),
++PCI_ROM(0x8086, 0x1028, "e1000-82545gm-serdes",	     "Intel EtherExpressPro1000 82545GM SERDES"),
++PCI_ROM(0x8086, 0x1075, "e1000-82547gi",	     "Intel EtherExpressPro1000 82547GI"),
++PCI_ROM(0x8086, 0x1076, "e1000-82541gi",	     "Intel EtherExpressPro1000 82541GI"),
++PCI_ROM(0x8086, 0x1077, "e1000-82541gi-mobile",	     "Intel EtherExpressPro1000 82541GI Mobile"),
++PCI_ROM(0x8086, 0x1078, "e1000-82541er",	     "Intel EtherExpressPro1000 82541ER"),
++PCI_ROM(0x8086, 0x1079, "e1000-82546gb-copper",	     "Intel EtherExpressPro1000 82546GB Copper"),
++PCI_ROM(0x8086, 0x107a, "e1000-82546gb-fiber",	     "Intel EtherExpressPro1000 82546GB Fiber"),
++PCI_ROM(0x8086, 0x107b, "e1000-82546gb-serdes",	     "Intel EtherExpressPro1000 82546GB SERDES"),
++};
++
++struct pci_driver e1000_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "E1000",
++	.probe    = e1000_probe,
++	.ids      = e1000_nics,
++	.id_count = sizeof(e1000_nics)/sizeof(e1000_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/e1000_hw.h grub-0.97/netboot/e1000_hw.h
+--- grub-0.97.orig/netboot/e1000_hw.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/e1000_hw.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,2058 @@
++/*******************************************************************************
++
++  
++  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
++  
++  This program is free software; you can redistribute it and/or modify it 
++  under the terms of the GNU General Public License as published by the Free 
++  Software Foundation; either version 2 of the License, or (at your option) 
++  any later version.
++  
++  This program is distributed in the hope that it will be useful, but WITHOUT 
++  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
++  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
++  more details.
++  
++  You should have received a copy of the GNU General Public License along with
++  this program; if not, write to the Free Software Foundation, Inc., 59 
++  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++  
++  The full GNU General Public License is included in this distribution in the
++  file called LICENSE.
++  
++  Contact Information:
++  Linux NICS <linux.nics@intel.com>
++  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
++
++*******************************************************************************/
++
++/* e1000_hw.h
++ * Structures, enums, and macros for the MAC
++ */
++
++#ifndef _E1000_HW_H_
++#define _E1000_HW_H_
++
++/* Forward declarations of structures used by the shared code */
++struct e1000_hw;
++struct e1000_hw_stats;
++
++/* Enumerated types specific to the e1000 hardware */
++/* Media Access Controlers */
++typedef enum {
++    e1000_undefined = 0,
++    e1000_82542_rev2_0,
++    e1000_82542_rev2_1,
++    e1000_82543,
++    e1000_82544,
++    e1000_82540,
++    e1000_82545,
++    e1000_82545_rev_3,
++    e1000_82546,
++    e1000_82546_rev_3,
++    e1000_82541,
++    e1000_82541_rev_2,
++    e1000_82547,
++    e1000_82547_rev_2,
++    e1000_num_macs
++} e1000_mac_type;
++
++typedef enum {
++    e1000_eeprom_uninitialized = 0,
++    e1000_eeprom_spi,
++    e1000_eeprom_microwire,
++    e1000_num_eeprom_types
++} e1000_eeprom_type;
++
++/* Media Types */
++typedef enum {
++	e1000_media_type_copper = 0,
++	e1000_media_type_fiber = 1,
++	e1000_media_type_internal_serdes = 2,
++	e1000_num_media_types
++} e1000_media_type;
++
++typedef enum {
++    e1000_10_half = 0,
++    e1000_10_full = 1,
++    e1000_100_half = 2,
++    e1000_100_full = 3
++} e1000_speed_duplex_type;
++
++/* Flow Control Settings */
++typedef enum {
++	e1000_fc_none = 0,
++	e1000_fc_rx_pause = 1,
++	e1000_fc_tx_pause = 2,
++	e1000_fc_full = 3,
++	e1000_fc_default = 0xFF
++} e1000_fc_type;
++
++/* PCI bus types */
++typedef enum {
++	e1000_bus_type_unknown = 0,
++	e1000_bus_type_pci,
++	e1000_bus_type_pcix,
++	e1000_bus_type_reserved
++} e1000_bus_type;
++
++/* PCI bus speeds */
++typedef enum {
++	e1000_bus_speed_unknown = 0,
++	e1000_bus_speed_33,
++	e1000_bus_speed_66,
++	e1000_bus_speed_100,
++	e1000_bus_speed_120,
++	e1000_bus_speed_133,
++	e1000_bus_speed_reserved
++} e1000_bus_speed;
++
++/* PCI bus widths */
++typedef enum {
++	e1000_bus_width_unknown = 0,
++	e1000_bus_width_32,
++	e1000_bus_width_64,
++	e1000_bus_width_reserved
++} e1000_bus_width;
++
++/* PHY status info structure and supporting enums */
++typedef enum {
++	e1000_cable_length_50 = 0,
++	e1000_cable_length_50_80,
++	e1000_cable_length_80_110,
++	e1000_cable_length_110_140,
++	e1000_cable_length_140,
++	e1000_cable_length_undefined = 0xFF
++} e1000_cable_length;
++
++typedef enum {
++    e1000_igp_cable_length_10  = 10,
++    e1000_igp_cable_length_20  = 20,
++    e1000_igp_cable_length_30  = 30,
++    e1000_igp_cable_length_40  = 40,
++    e1000_igp_cable_length_50  = 50,
++    e1000_igp_cable_length_60  = 60,
++    e1000_igp_cable_length_70  = 70,
++    e1000_igp_cable_length_80  = 80,
++    e1000_igp_cable_length_90  = 90,
++    e1000_igp_cable_length_100 = 100,
++    e1000_igp_cable_length_110 = 110,
++    e1000_igp_cable_length_120 = 120,
++    e1000_igp_cable_length_130 = 130,
++    e1000_igp_cable_length_140 = 140,
++    e1000_igp_cable_length_150 = 150,
++    e1000_igp_cable_length_160 = 160,
++    e1000_igp_cable_length_170 = 170,
++    e1000_igp_cable_length_180 = 180
++} e1000_igp_cable_length;
++
++typedef enum {
++	e1000_10bt_ext_dist_enable_normal = 0,
++	e1000_10bt_ext_dist_enable_lower,
++	e1000_10bt_ext_dist_enable_undefined = 0xFF
++} e1000_10bt_ext_dist_enable;
++
++typedef enum {
++	e1000_rev_polarity_normal = 0,
++	e1000_rev_polarity_reversed,
++	e1000_rev_polarity_undefined = 0xFF
++} e1000_rev_polarity;
++
++typedef enum {
++    e1000_downshift_normal = 0,
++    e1000_downshift_activated,
++    e1000_downshift_undefined = 0xFF
++} e1000_downshift;
++
++typedef enum {
++	e1000_polarity_reversal_enabled = 0,
++	e1000_polarity_reversal_disabled,
++	e1000_polarity_reversal_undefined = 0xFF
++} e1000_polarity_reversal;
++
++typedef enum {
++	e1000_auto_x_mode_manual_mdi = 0,
++	e1000_auto_x_mode_manual_mdix,
++	e1000_auto_x_mode_auto1,
++	e1000_auto_x_mode_auto2,
++	e1000_auto_x_mode_undefined = 0xFF
++} e1000_auto_x_mode;
++
++typedef enum {
++	e1000_1000t_rx_status_not_ok = 0,
++	e1000_1000t_rx_status_ok,
++	e1000_1000t_rx_status_undefined = 0xFF
++} e1000_1000t_rx_status;
++
++typedef enum {
++    e1000_phy_m88 = 0,
++    e1000_phy_igp,
++    e1000_phy_undefined = 0xFF
++} e1000_phy_type;
++
++typedef enum {
++    e1000_ms_hw_default = 0,
++    e1000_ms_force_master,
++    e1000_ms_force_slave,
++    e1000_ms_auto
++} e1000_ms_type;
++
++typedef enum {
++    e1000_ffe_config_enabled = 0,
++    e1000_ffe_config_active,
++    e1000_ffe_config_blocked
++} e1000_ffe_config;
++
++typedef enum {
++    e1000_dsp_config_disabled = 0,
++    e1000_dsp_config_enabled,
++    e1000_dsp_config_activated,
++    e1000_dsp_config_undefined = 0xFF
++} e1000_dsp_config;
++
++struct e1000_phy_info {
++	e1000_cable_length cable_length;
++	e1000_10bt_ext_dist_enable extended_10bt_distance;
++	e1000_rev_polarity cable_polarity;
++	e1000_downshift downshift;
++	e1000_polarity_reversal polarity_correction;
++	e1000_auto_x_mode mdix_mode;
++	e1000_1000t_rx_status local_rx;
++	e1000_1000t_rx_status remote_rx;
++};
++
++struct e1000_phy_stats {
++	uint32_t idle_errors;
++	uint32_t receive_errors;
++};
++
++struct e1000_eeprom_info {
++    e1000_eeprom_type type;
++    uint16_t word_size;
++    uint16_t opcode_bits;
++    uint16_t address_bits;
++    uint16_t delay_usec;
++    uint16_t page_size;
++};
++
++
++
++/* Error Codes */
++#define E1000_SUCCESS      0
++#define E1000_ERR_EEPROM   1
++#define E1000_ERR_PHY      2
++#define E1000_ERR_CONFIG   3
++#define E1000_ERR_PARAM    4
++#define E1000_ERR_MAC_TYPE 5
++#define E1000_ERR_PHY_TYPE 6
++#define E1000_ERR_NOLINK   7
++#define E1000_ERR_TIMEOUT  8
++
++#define E1000_READ_REG_IO(a, reg) \
++	e1000_read_reg_io((a), E1000_##reg)
++#define E1000_WRITE_REG_IO(a, reg, val) \
++	e1000_write_reg_io((a), E1000_##reg, val)
++
++/* PCI Device IDs */
++#define E1000_DEV_ID_82542               0x1000
++#define E1000_DEV_ID_82543GC_FIBER       0x1001
++#define E1000_DEV_ID_82543GC_COPPER      0x1004
++#define E1000_DEV_ID_82544EI_COPPER      0x1008
++#define E1000_DEV_ID_82544EI_FIBER       0x1009
++#define E1000_DEV_ID_82544GC_COPPER      0x100C
++#define E1000_DEV_ID_82544GC_LOM         0x100D
++#define E1000_DEV_ID_82540EM             0x100E
++#define E1000_DEV_ID_82540EM_LOM         0x1015
++#define E1000_DEV_ID_82540EP_LOM         0x1016
++#define E1000_DEV_ID_82540EP             0x1017
++#define E1000_DEV_ID_82540EP_LP          0x101E
++#define E1000_DEV_ID_82545EM_COPPER      0x100F
++#define E1000_DEV_ID_82545EM_FIBER       0x1011
++#define E1000_DEV_ID_82545GM_COPPER      0x1026
++#define E1000_DEV_ID_82545GM_FIBER       0x1027
++#define E1000_DEV_ID_82545GM_SERDES      0x1028
++#define E1000_DEV_ID_82546EB_COPPER      0x1010
++#define E1000_DEV_ID_82546EB_FIBER       0x1012
++#define E1000_DEV_ID_82546EB_QUAD_COPPER 0x101D
++#define E1000_DEV_ID_82541EI             0x1013
++#define E1000_DEV_ID_82541EI_MOBILE      0x1018
++#define E1000_DEV_ID_82541ER             0x1078
++#define E1000_DEV_ID_82547GI             0x1075
++#define E1000_DEV_ID_82541GI             0x1076
++#define E1000_DEV_ID_82541GI_MOBILE      0x1077
++#define E1000_DEV_ID_82546GB_COPPER      0x1079
++#define E1000_DEV_ID_82546GB_FIBER       0x107A
++#define E1000_DEV_ID_82546GB_SERDES      0x107B
++#define E1000_DEV_ID_82547EI             0x1019
++
++#define NODE_ADDRESS_SIZE 6
++#define ETH_LENGTH_OF_ADDRESS 6
++
++/* MAC decode size is 128K - This is the size of BAR0 */
++#define MAC_DECODE_SIZE (128 * 1024)
++
++#define E1000_82542_2_0_REV_ID 2
++#define E1000_82542_2_1_REV_ID 3
++
++#define SPEED_10    10
++#define SPEED_100   100
++#define SPEED_1000  1000
++#define HALF_DUPLEX 1
++#define FULL_DUPLEX 2
++
++/* The sizes (in bytes) of a ethernet packet */
++#define ENET_HEADER_SIZE             14
++#define MAXIMUM_ETHERNET_FRAME_SIZE  1518 /* With FCS */
++#define MINIMUM_ETHERNET_FRAME_SIZE  64   /* With FCS */
++#define ETHERNET_FCS_SIZE            4
++#define MAXIMUM_ETHERNET_PACKET_SIZE \
++    (MAXIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
++#define MINIMUM_ETHERNET_PACKET_SIZE \
++    (MINIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
++#define CRC_LENGTH                   ETHERNET_FCS_SIZE
++#define MAX_JUMBO_FRAME_SIZE         0x3F00
++
++
++/* 802.1q VLAN Packet Sizes */
++#define VLAN_TAG_SIZE                     4     /* 802.3ac tag (not DMAed) */
++
++/* Ethertype field values */
++#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
++#define ETHERNET_IP_TYPE        0x0800  /* IP packets */
++#define ETHERNET_ARP_TYPE       0x0806  /* Address Resolution Protocol (ARP) */
++
++/* Packet Header defines */
++#define IP_PROTOCOL_TCP    6
++#define IP_PROTOCOL_UDP    0x11
++
++/* This defines the bits that are set in the Interrupt Mask
++ * Set/Read Register.  Each bit is documented below:
++ *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
++ *   o RXSEQ  = Receive Sequence Error 
++ */
++#define POLL_IMS_ENABLE_MASK ( \
++    E1000_IMS_RXDMT0 |         \
++    E1000_IMS_RXSEQ)
++
++/* This defines the bits that are set in the Interrupt Mask
++ * Set/Read Register.  Each bit is documented below:
++ *   o RXT0   = Receiver Timer Interrupt (ring 0)
++ *   o TXDW   = Transmit Descriptor Written Back
++ *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
++ *   o RXSEQ  = Receive Sequence Error
++ *   o LSC    = Link Status Change
++ */
++#define IMS_ENABLE_MASK ( \
++    E1000_IMS_RXT0   |    \
++    E1000_IMS_TXDW   |    \
++    E1000_IMS_RXDMT0 |    \
++    E1000_IMS_RXSEQ  |    \
++    E1000_IMS_LSC)
++
++/* Number of high/low register pairs in the RAR. The RAR (Receive Address
++ * Registers) holds the directed and multicast addresses that we monitor. We
++ * reserve one of these spots for our directed address, allowing us room for
++ * E1000_RAR_ENTRIES - 1 multicast addresses. 
++ */
++#define E1000_RAR_ENTRIES 15
++
++#define MIN_NUMBER_OF_DESCRIPTORS 8
++#define MAX_NUMBER_OF_DESCRIPTORS 0xFFF8
++
++/* Receive Descriptor */
++struct e1000_rx_desc {
++    uint64_t buffer_addr; /* Address of the descriptor's data buffer */
++    uint16_t length;     /* Length of data DMAed into data buffer */
++    uint16_t csum;       /* Packet checksum */
++    uint8_t status;      /* Descriptor status */
++    uint8_t errors;      /* Descriptor Errors */
++    uint16_t special;
++};
++
++/* Receive Decriptor bit definitions */
++#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
++#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
++#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
++#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
++#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
++#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
++#define E1000_RXD_STAT_PIF      0x80    /* passed in-exact filter */
++#define E1000_RXD_ERR_CE        0x01    /* CRC Error */
++#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
++#define E1000_RXD_ERR_SEQ       0x04    /* Sequence Error */
++#define E1000_RXD_ERR_CXE       0x10    /* Carrier Extension Error */
++#define E1000_RXD_ERR_TCPE      0x20    /* TCP/UDP Checksum Error */
++#define E1000_RXD_ERR_IPE       0x40    /* IP Checksum Error */
++#define E1000_RXD_ERR_RXE       0x80    /* Rx Data Error */
++#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
++#define E1000_RXD_SPC_PRI_MASK  0xE000  /* Priority is in upper 3 bits */
++#define E1000_RXD_SPC_PRI_SHIFT 0x000D  /* Priority is in upper 3 of 16 */
++#define E1000_RXD_SPC_CFI_MASK  0x1000  /* CFI is bit 12 */
++#define E1000_RXD_SPC_CFI_SHIFT 0x000C  /* CFI is bit 12 */
++
++/* mask to determine if packets should be dropped due to frame errors */
++#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
++    E1000_RXD_ERR_CE  |                \
++    E1000_RXD_ERR_SE  |                \
++    E1000_RXD_ERR_SEQ |                \
++    E1000_RXD_ERR_CXE |                \
++    E1000_RXD_ERR_RXE)
++
++/* Transmit Descriptor */
++struct e1000_tx_desc {
++    uint64_t buffer_addr;       /* Address of the descriptor's data buffer */
++    union {
++        uint32_t data;
++        struct {
++            uint16_t length;    /* Data buffer length */
++            uint8_t cso;        /* Checksum offset */
++            uint8_t cmd;        /* Descriptor control */
++        } flags;
++    } lower;
++    union {
++        uint32_t data;
++        struct {
++            uint8_t status;     /* Descriptor status */
++            uint8_t css;        /* Checksum start */
++            uint16_t special;
++        } fields;
++    } upper;
++};
++
++/* Transmit Descriptor bit definitions */
++#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
++#define E1000_TXD_DTYP_C     0x00000000 /* Context Descriptor */
++#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
++#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
++#define E1000_TXD_CMD_EOP    0x01000000 /* End of Packet */
++#define E1000_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
++#define E1000_TXD_CMD_IC     0x04000000 /* Insert Checksum */
++#define E1000_TXD_CMD_RS     0x08000000 /* Report Status */
++#define E1000_TXD_CMD_RPS    0x10000000 /* Report Packet Sent */
++#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
++#define E1000_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
++#define E1000_TXD_CMD_IDE    0x80000000 /* Enable Tidv register */
++#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
++#define E1000_TXD_STAT_EC    0x00000002 /* Excess Collisions */
++#define E1000_TXD_STAT_LC    0x00000004 /* Late Collisions */
++#define E1000_TXD_STAT_TU    0x00000008 /* Transmit underrun */
++#define E1000_TXD_CMD_TCP    0x01000000 /* TCP packet */
++#define E1000_TXD_CMD_IP     0x02000000 /* IP packet */
++#define E1000_TXD_CMD_TSE    0x04000000 /* TCP Seg enable */
++#define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
++
++/* Offload Context Descriptor */
++struct e1000_context_desc {
++    union {
++        uint32_t ip_config;
++        struct {
++            uint8_t ipcss;      /* IP checksum start */
++            uint8_t ipcso;      /* IP checksum offset */
++            uint16_t ipcse;     /* IP checksum end */
++        } ip_fields;
++    } lower_setup;
++    union {
++        uint32_t tcp_config;
++        struct {
++            uint8_t tucss;      /* TCP checksum start */
++            uint8_t tucso;      /* TCP checksum offset */
++            uint16_t tucse;     /* TCP checksum end */
++        } tcp_fields;
++    } upper_setup;
++    uint32_t cmd_and_length;    /* */
++    union {
++        uint32_t data;
++        struct {
++            uint8_t status;     /* Descriptor status */
++            uint8_t hdr_len;    /* Header length */
++            uint16_t mss;       /* Maximum segment size */
++        } fields;
++    } tcp_seg_setup;
++};
++
++/* Offload data descriptor */
++struct e1000_data_desc {
++    uint64_t buffer_addr;       /* Address of the descriptor's buffer address */
++    union {
++        uint32_t data;
++        struct {
++            uint16_t length;    /* Data buffer length */
++            uint8_t typ_len_ext;        /* */
++            uint8_t cmd;        /* */
++        } flags;
++    } lower;
++    union {
++        uint32_t data;
++        struct {
++            uint8_t status;     /* Descriptor status */
++            uint8_t popts;      /* Packet Options */
++            uint16_t special;   /* */
++        } fields;
++    } upper;
++};
++
++/* Filters */
++#define E1000_NUM_UNICAST          16   /* Unicast filter entries */
++#define E1000_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) */
++#define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
++
++
++/* Receive Address Register */
++struct e1000_rar {
++    volatile uint32_t low;      /* receive address low */
++    volatile uint32_t high;     /* receive address high */
++};
++
++/* Number of entries in the Multicast Table Array (MTA). */
++#define E1000_NUM_MTA_REGISTERS 128
++
++/* IPv4 Address Table Entry */
++struct e1000_ipv4_at_entry {
++    volatile uint32_t ipv4_addr;        /* IP Address (RW) */
++    volatile uint32_t reserved;
++};
++
++/* Four wakeup IP addresses are supported */
++#define E1000_WAKEUP_IP_ADDRESS_COUNT_MAX 4
++#define E1000_IP4AT_SIZE                  E1000_WAKEUP_IP_ADDRESS_COUNT_MAX
++#define E1000_IP6AT_SIZE                  1
++
++/* IPv6 Address Table Entry */
++struct e1000_ipv6_at_entry {
++    volatile uint8_t ipv6_addr[16];
++};
++
++/* Flexible Filter Length Table Entry */
++struct e1000_fflt_entry {
++    volatile uint32_t length;   /* Flexible Filter Length (RW) */
++    volatile uint32_t reserved;
++};
++
++/* Flexible Filter Mask Table Entry */
++struct e1000_ffmt_entry {
++    volatile uint32_t mask;     /* Flexible Filter Mask (RW) */
++    volatile uint32_t reserved;
++};
++
++/* Flexible Filter Value Table Entry */
++struct e1000_ffvt_entry {
++    volatile uint32_t value;    /* Flexible Filter Value (RW) */
++    volatile uint32_t reserved;
++};
++
++/* Four Flexible Filters are supported */
++#define E1000_FLEXIBLE_FILTER_COUNT_MAX 4
++
++/* Each Flexible Filter is at most 128 (0x80) bytes in length */
++#define E1000_FLEXIBLE_FILTER_SIZE_MAX  128
++
++#define E1000_FFLT_SIZE E1000_FLEXIBLE_FILTER_COUNT_MAX
++#define E1000_FFMT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
++#define E1000_FFVT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
++
++/* Register Set. (82543, 82544)
++ *
++ * Registers are defined to be 32 bits and  should be accessed as 32 bit values.
++ * These registers are physically located on the NIC, but are mapped into the 
++ * host memory address space.
++ *
++ * RW - register is both readable and writable
++ * RO - register is read only
++ * WO - register is write only
++ * R/clr - register is read only and is cleared when read
++ * A - register array
++ */
++#define E1000_CTRL     0x00000  /* Device Control - RW */
++#define E1000_CTRL_DUP 0x00004  /* Device Control Duplicate (Shadow) - RW */
++#define E1000_STATUS   0x00008  /* Device Status - RO */
++#define E1000_EECD     0x00010  /* EEPROM/Flash Control - RW */
++#define E1000_EERD     0x00014  /* EEPROM Read - RW */
++#define E1000_CTRL_EXT 0x00018  /* Extended Device Control - RW */
++#define E1000_FLA      0x0001C  /* Flash Access - RW */
++#define E1000_MDIC     0x00020  /* MDI Control - RW */
++#define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
++#define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
++#define E1000_FCT      0x00030  /* Flow Control Type - RW */
++#define E1000_VET      0x00038  /* VLAN Ether Type - RW */
++#define E1000_ICR      0x000C0  /* Interrupt Cause Read - R/clr */
++#define E1000_ITR      0x000C4  /* Interrupt Throttling Rate - RW */
++#define E1000_ICS      0x000C8  /* Interrupt Cause Set - WO */
++#define E1000_IMS      0x000D0  /* Interrupt Mask Set - RW */
++#define E1000_IMC      0x000D8  /* Interrupt Mask Clear - WO */
++#define E1000_RCTL     0x00100  /* RX Control - RW */
++#define E1000_FCTTV    0x00170  /* Flow Control Transmit Timer Value - RW */
++#define E1000_TXCW     0x00178  /* TX Configuration Word - RW */
++#define E1000_RXCW     0x00180  /* RX Configuration Word - RO */
++#define E1000_TCTL     0x00400  /* TX Control - RW */
++#define E1000_TIPG     0x00410  /* TX Inter-packet gap -RW */
++#define E1000_TBT      0x00448  /* TX Burst Timer - RW */
++#define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
++#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
++#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
++#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
++#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
++#define E1000_RDBAL    0x02800  /* RX Descriptor Base Address Low - RW */
++#define E1000_RDBAH    0x02804  /* RX Descriptor Base Address High - RW */
++#define E1000_RDLEN    0x02808  /* RX Descriptor Length - RW */
++#define E1000_RDH      0x02810  /* RX Descriptor Head - RW */
++#define E1000_RDT      0x02818  /* RX Descriptor Tail - RW */
++#define E1000_RDTR     0x02820  /* RX Delay Timer - RW */
++#define E1000_RXDCTL   0x02828  /* RX Descriptor Control - RW */
++#define E1000_RADV     0x0282C  /* RX Interrupt Absolute Delay Timer - RW */
++#define E1000_RSRPD    0x02C00  /* RX Small Packet Detect - RW */
++#define E1000_TXDMAC   0x03000  /* TX DMA Control - RW */
++#define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */
++#define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */
++#define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */
++#define E1000_TDFTS    0x03428  /* TX Data FIFO Tail Saved - RW */
++#define E1000_TDFPC    0x03430  /* TX Data FIFO Packet Count - RW */
++#define E1000_TDBAL    0x03800  /* TX Descriptor Base Address Low - RW */
++#define E1000_TDBAH    0x03804  /* TX Descriptor Base Address High - RW */
++#define E1000_TDLEN    0x03808  /* TX Descriptor Length - RW */
++#define E1000_TDH      0x03810  /* TX Descriptor Head - RW */
++#define E1000_TDT      0x03818  /* TX Descripotr Tail - RW */
++#define E1000_TIDV     0x03820  /* TX Interrupt Delay Value - RW */
++#define E1000_TXDCTL   0x03828  /* TX Descriptor Control - RW */
++#define E1000_TADV     0x0382C  /* TX Interrupt Absolute Delay Val - RW */
++#define E1000_TSPMT    0x03830  /* TCP Segmentation PAD & Min Threshold - RW */
++#define E1000_CRCERRS  0x04000  /* CRC Error Count - R/clr */
++#define E1000_ALGNERRC 0x04004  /* Alignment Error Count - R/clr */
++#define E1000_SYMERRS  0x04008  /* Symbol Error Count - R/clr */
++#define E1000_RXERRC   0x0400C  /* Receive Error Count - R/clr */
++#define E1000_MPC      0x04010  /* Missed Packet Count - R/clr */
++#define E1000_SCC      0x04014  /* Single Collision Count - R/clr */
++#define E1000_ECOL     0x04018  /* Excessive Collision Count - R/clr */
++#define E1000_MCC      0x0401C  /* Multiple Collision Count - R/clr */
++#define E1000_LATECOL  0x04020  /* Late Collision Count - R/clr */
++#define E1000_COLC     0x04028  /* Collision Count - R/clr */
++#define E1000_DC       0x04030  /* Defer Count - R/clr */
++#define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */
++#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
++#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
++#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
++#define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */
++#define E1000_XONTXC   0x0404C  /* XON TX Count - R/clr */
++#define E1000_XOFFRXC  0x04050  /* XOFF RX Count - R/clr */
++#define E1000_XOFFTXC  0x04054  /* XOFF TX Count - R/clr */
++#define E1000_FCRUC    0x04058  /* Flow Control RX Unsupported Count- R/clr */
++#define E1000_PRC64    0x0405C  /* Packets RX (64 bytes) - R/clr */
++#define E1000_PRC127   0x04060  /* Packets RX (65-127 bytes) - R/clr */
++#define E1000_PRC255   0x04064  /* Packets RX (128-255 bytes) - R/clr */
++#define E1000_PRC511   0x04068  /* Packets RX (255-511 bytes) - R/clr */
++#define E1000_PRC1023  0x0406C  /* Packets RX (512-1023 bytes) - R/clr */
++#define E1000_PRC1522  0x04070  /* Packets RX (1024-1522 bytes) - R/clr */
++#define E1000_GPRC     0x04074  /* Good Packets RX Count - R/clr */
++#define E1000_BPRC     0x04078  /* Broadcast Packets RX Count - R/clr */
++#define E1000_MPRC     0x0407C  /* Multicast Packets RX Count - R/clr */
++#define E1000_GPTC     0x04080  /* Good Packets TX Count - R/clr */
++#define E1000_GORCL    0x04088  /* Good Octets RX Count Low - R/clr */
++#define E1000_GORCH    0x0408C  /* Good Octets RX Count High - R/clr */
++#define E1000_GOTCL    0x04090  /* Good Octets TX Count Low - R/clr */
++#define E1000_GOTCH    0x04094  /* Good Octets TX Count High - R/clr */
++#define E1000_RNBC     0x040A0  /* RX No Buffers Count - R/clr */
++#define E1000_RUC      0x040A4  /* RX Undersize Count - R/clr */
++#define E1000_RFC      0x040A8  /* RX Fragment Count - R/clr */
++#define E1000_ROC      0x040AC  /* RX Oversize Count - R/clr */
++#define E1000_RJC      0x040B0  /* RX Jabber Count - R/clr */
++#define E1000_MGTPRC   0x040B4  /* Management Packets RX Count - R/clr */
++#define E1000_MGTPDC   0x040B8  /* Management Packets Dropped Count - R/clr */
++#define E1000_MGTPTC   0x040BC  /* Management Packets TX Count - R/clr */
++#define E1000_TORL     0x040C0  /* Total Octets RX Low - R/clr */
++#define E1000_TORH     0x040C4  /* Total Octets RX High - R/clr */
++#define E1000_TOTL     0x040C8  /* Total Octets TX Low - R/clr */
++#define E1000_TOTH     0x040CC  /* Total Octets TX High - R/clr */
++#define E1000_TPR      0x040D0  /* Total Packets RX - R/clr */
++#define E1000_TPT      0x040D4  /* Total Packets TX - R/clr */
++#define E1000_PTC64    0x040D8  /* Packets TX (64 bytes) - R/clr */
++#define E1000_PTC127   0x040DC  /* Packets TX (65-127 bytes) - R/clr */
++#define E1000_PTC255   0x040E0  /* Packets TX (128-255 bytes) - R/clr */
++#define E1000_PTC511   0x040E4  /* Packets TX (256-511 bytes) - R/clr */
++#define E1000_PTC1023  0x040E8  /* Packets TX (512-1023 bytes) - R/clr */
++#define E1000_PTC1522  0x040EC  /* Packets TX (1024-1522 Bytes) - R/clr */
++#define E1000_MPTC     0x040F0  /* Multicast Packets TX Count - R/clr */
++#define E1000_BPTC     0x040F4  /* Broadcast Packets TX Count - R/clr */
++#define E1000_TSCTC    0x040F8  /* TCP Segmentation Context TX - R/clr */
++#define E1000_TSCTFC   0x040FC  /* TCP Segmentation Context TX Fail - R/clr */
++#define E1000_RXCSUM   0x05000  /* RX Checksum Control - RW */
++#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
++#define E1000_RA       0x05400  /* Receive Address - RW Array */
++#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
++#define E1000_WUC      0x05800  /* Wakeup Control - RW */
++#define E1000_WUFC     0x05808  /* Wakeup Filter Control - RW */
++#define E1000_WUS      0x05810  /* Wakeup Status - RO */
++#define E1000_MANC     0x05820  /* Management Control - RW */
++#define E1000_IPAV     0x05838  /* IP Address Valid - RW */
++#define E1000_IP4AT    0x05840  /* IPv4 Address Table - RW Array */
++#define E1000_IP6AT    0x05880  /* IPv6 Address Table - RW Array */
++#define E1000_WUPL     0x05900  /* Wakeup Packet Length - RW */
++#define E1000_WUPM     0x05A00  /* Wakeup Packet Memory - RO A */
++#define E1000_FFLT     0x05F00  /* Flexible Filter Length Table - RW Array */
++#define E1000_FFMT     0x09000  /* Flexible Filter Mask Table - RW Array */
++#define E1000_FFVT     0x09800  /* Flexible Filter Value Table - RW Array */
++
++/* Register Set (82542)
++ *
++ * Some of the 82542 registers are located at different offsets than they are
++ * in more current versions of the 8254x. Despite the difference in location,
++ * the registers function in the same manner.
++ */
++#define E1000_82542_CTRL     E1000_CTRL
++#define E1000_82542_CTRL_DUP E1000_CTRL_DUP
++#define E1000_82542_STATUS   E1000_STATUS
++#define E1000_82542_EECD     E1000_EECD
++#define E1000_82542_EERD     E1000_EERD
++#define E1000_82542_CTRL_EXT E1000_CTRL_EXT
++#define E1000_82542_FLA      E1000_FLA
++#define E1000_82542_MDIC     E1000_MDIC
++#define E1000_82542_FCAL     E1000_FCAL
++#define E1000_82542_FCAH     E1000_FCAH
++#define E1000_82542_FCT      E1000_FCT
++#define E1000_82542_VET      E1000_VET
++#define E1000_82542_RA       0x00040
++#define E1000_82542_ICR      E1000_ICR
++#define E1000_82542_ITR      E1000_ITR
++#define E1000_82542_ICS      E1000_ICS
++#define E1000_82542_IMS      E1000_IMS
++#define E1000_82542_IMC      E1000_IMC
++#define E1000_82542_RCTL     E1000_RCTL
++#define E1000_82542_RDTR     0x00108
++#define E1000_82542_RDBAL    0x00110
++#define E1000_82542_RDBAH    0x00114
++#define E1000_82542_RDLEN    0x00118
++#define E1000_82542_RDH      0x00120
++#define E1000_82542_RDT      0x00128
++#define E1000_82542_FCRTH    0x00160
++#define E1000_82542_FCRTL    0x00168
++#define E1000_82542_FCTTV    E1000_FCTTV
++#define E1000_82542_TXCW     E1000_TXCW
++#define E1000_82542_RXCW     E1000_RXCW
++#define E1000_82542_MTA      0x00200
++#define E1000_82542_TCTL     E1000_TCTL
++#define E1000_82542_TIPG     E1000_TIPG
++#define E1000_82542_TDBAL    0x00420
++#define E1000_82542_TDBAH    0x00424
++#define E1000_82542_TDLEN    0x00428
++#define E1000_82542_TDH      0x00430
++#define E1000_82542_TDT      0x00438
++#define E1000_82542_TIDV     0x00440
++#define E1000_82542_TBT      E1000_TBT
++#define E1000_82542_AIT      E1000_AIT
++#define E1000_82542_VFTA     0x00600
++#define E1000_82542_LEDCTL   E1000_LEDCTL
++#define E1000_82542_PBA      E1000_PBA
++#define E1000_82542_RXDCTL   E1000_RXDCTL
++#define E1000_82542_RADV     E1000_RADV
++#define E1000_82542_RSRPD    E1000_RSRPD
++#define E1000_82542_TXDMAC   E1000_TXDMAC
++#define E1000_82542_TDFHS    E1000_TDFHS
++#define E1000_82542_TDFTS    E1000_TDFTS
++#define E1000_82542_TDFPC    E1000_TDFPC
++#define E1000_82542_TXDCTL   E1000_TXDCTL
++#define E1000_82542_TADV     E1000_TADV
++#define E1000_82542_TSPMT    E1000_TSPMT
++#define E1000_82542_CRCERRS  E1000_CRCERRS
++#define E1000_82542_ALGNERRC E1000_ALGNERRC
++#define E1000_82542_SYMERRS  E1000_SYMERRS
++#define E1000_82542_RXERRC   E1000_RXERRC
++#define E1000_82542_MPC      E1000_MPC
++#define E1000_82542_SCC      E1000_SCC
++#define E1000_82542_ECOL     E1000_ECOL
++#define E1000_82542_MCC      E1000_MCC
++#define E1000_82542_LATECOL  E1000_LATECOL
++#define E1000_82542_COLC     E1000_COLC
++#define E1000_82542_DC       E1000_DC
++#define E1000_82542_TNCRS    E1000_TNCRS
++#define E1000_82542_SEC      E1000_SEC
++#define E1000_82542_CEXTERR  E1000_CEXTERR
++#define E1000_82542_RLEC     E1000_RLEC
++#define E1000_82542_XONRXC   E1000_XONRXC
++#define E1000_82542_XONTXC   E1000_XONTXC
++#define E1000_82542_XOFFRXC  E1000_XOFFRXC
++#define E1000_82542_XOFFTXC  E1000_XOFFTXC
++#define E1000_82542_FCRUC    E1000_FCRUC
++#define E1000_82542_PRC64    E1000_PRC64
++#define E1000_82542_PRC127   E1000_PRC127
++#define E1000_82542_PRC255   E1000_PRC255
++#define E1000_82542_PRC511   E1000_PRC511
++#define E1000_82542_PRC1023  E1000_PRC1023
++#define E1000_82542_PRC1522  E1000_PRC1522
++#define E1000_82542_GPRC     E1000_GPRC
++#define E1000_82542_BPRC     E1000_BPRC
++#define E1000_82542_MPRC     E1000_MPRC
++#define E1000_82542_GPTC     E1000_GPTC
++#define E1000_82542_GORCL    E1000_GORCL
++#define E1000_82542_GORCH    E1000_GORCH
++#define E1000_82542_GOTCL    E1000_GOTCL
++#define E1000_82542_GOTCH    E1000_GOTCH
++#define E1000_82542_RNBC     E1000_RNBC
++#define E1000_82542_RUC      E1000_RUC
++#define E1000_82542_RFC      E1000_RFC
++#define E1000_82542_ROC      E1000_ROC
++#define E1000_82542_RJC      E1000_RJC
++#define E1000_82542_MGTPRC   E1000_MGTPRC
++#define E1000_82542_MGTPDC   E1000_MGTPDC
++#define E1000_82542_MGTPTC   E1000_MGTPTC
++#define E1000_82542_TORL     E1000_TORL
++#define E1000_82542_TORH     E1000_TORH
++#define E1000_82542_TOTL     E1000_TOTL
++#define E1000_82542_TOTH     E1000_TOTH
++#define E1000_82542_TPR      E1000_TPR
++#define E1000_82542_TPT      E1000_TPT
++#define E1000_82542_PTC64    E1000_PTC64
++#define E1000_82542_PTC127   E1000_PTC127
++#define E1000_82542_PTC255   E1000_PTC255
++#define E1000_82542_PTC511   E1000_PTC511
++#define E1000_82542_PTC1023  E1000_PTC1023
++#define E1000_82542_PTC1522  E1000_PTC1522
++#define E1000_82542_MPTC     E1000_MPTC
++#define E1000_82542_BPTC     E1000_BPTC
++#define E1000_82542_TSCTC    E1000_TSCTC
++#define E1000_82542_TSCTFC   E1000_TSCTFC
++#define E1000_82542_RXCSUM   E1000_RXCSUM
++#define E1000_82542_WUC      E1000_WUC
++#define E1000_82542_WUFC     E1000_WUFC
++#define E1000_82542_WUS      E1000_WUS
++#define E1000_82542_MANC     E1000_MANC
++#define E1000_82542_IPAV     E1000_IPAV
++#define E1000_82542_IP4AT    E1000_IP4AT
++#define E1000_82542_IP6AT    E1000_IP6AT
++#define E1000_82542_WUPL     E1000_WUPL
++#define E1000_82542_WUPM     E1000_WUPM
++#define E1000_82542_FFLT     E1000_FFLT
++#define E1000_82542_TDFH     0x08010
++#define E1000_82542_TDFT     0x08018
++#define E1000_82542_FFMT     E1000_FFMT
++#define E1000_82542_FFVT     E1000_FFVT
++
++/* Statistics counters collected by the MAC */
++struct e1000_hw_stats {
++    uint64_t crcerrs;
++    uint64_t algnerrc;
++    uint64_t symerrs;
++    uint64_t rxerrc;
++    uint64_t mpc;
++    uint64_t scc;
++    uint64_t ecol;
++    uint64_t mcc;
++    uint64_t latecol;
++    uint64_t colc;
++    uint64_t dc;
++    uint64_t tncrs;
++    uint64_t sec;
++    uint64_t cexterr;
++    uint64_t rlec;
++    uint64_t xonrxc;
++    uint64_t xontxc;
++    uint64_t xoffrxc;
++    uint64_t xofftxc;
++    uint64_t fcruc;
++    uint64_t prc64;
++    uint64_t prc127;
++    uint64_t prc255;
++    uint64_t prc511;
++    uint64_t prc1023;
++    uint64_t prc1522;
++    uint64_t gprc;
++    uint64_t bprc;
++    uint64_t mprc;
++    uint64_t gptc;
++    uint64_t gorcl;
++    uint64_t gorch;
++    uint64_t gotcl;
++    uint64_t gotch;
++    uint64_t rnbc;
++    uint64_t ruc;
++    uint64_t rfc;
++    uint64_t roc;
++    uint64_t rjc;
++    uint64_t mgprc;
++    uint64_t mgpdc;
++    uint64_t mgptc;
++    uint64_t torl;
++    uint64_t torh;
++    uint64_t totl;
++    uint64_t toth;
++    uint64_t tpr;
++    uint64_t tpt;
++    uint64_t ptc64;
++    uint64_t ptc127;
++    uint64_t ptc255;
++    uint64_t ptc511;
++    uint64_t ptc1023;
++    uint64_t ptc1522;
++    uint64_t mptc;
++    uint64_t bptc;
++    uint64_t tsctc;
++    uint64_t tsctfc;
++};
++
++/* Structure containing variables used by the shared code (e1000_hw.c) */
++struct e1000_hw {
++	struct pci_device *pdev;
++	uint8_t *hw_addr;
++	e1000_mac_type   mac_type;
++	e1000_phy_type phy_type;
++#if 0
++	uint32_t phy_init_script;
++#endif
++	e1000_media_type media_type;
++	e1000_fc_type    fc;
++#if 0
++	e1000_bus_speed bus_speed;
++	e1000_bus_width bus_width;
++	e1000_bus_type  bus_type;
++#endif
++	struct e1000_eeprom_info eeprom;
++#if 0
++	e1000_ms_type master_slave;
++	e1000_ms_type original_master_slave;
++	e1000_ffe_config ffe_config_state;
++#endif
++	uint32_t io_base;
++	uint32_t phy_id;
++#ifdef LINUX_DRIVER
++	uint32_t phy_revision;
++#endif
++	uint32_t phy_addr;
++#if 0
++	uint32_t original_fc;
++#endif
++	uint32_t txcw;
++	uint32_t autoneg_failed;
++#if 0
++	uint32_t max_frame_size;
++	uint32_t min_frame_size;
++	uint32_t mc_filter_type;
++	uint32_t num_mc_addrs;
++	uint32_t collision_delta;
++	uint32_t tx_packet_delta;
++	uint32_t ledctl_default;
++	uint32_t ledctl_mode1;
++	uint32_t ledctl_mode2;
++	uint16_t phy_spd_default;
++#endif
++	uint16_t autoneg_advertised;
++	uint16_t pci_cmd_word;
++#if 0
++	uint16_t fc_high_water;
++	uint16_t fc_low_water;
++	uint16_t fc_pause_time;
++	uint16_t current_ifs_val;
++	uint16_t ifs_min_val;
++	uint16_t ifs_max_val;
++	uint16_t ifs_step_size;
++	uint16_t ifs_ratio;
++#endif
++	uint16_t device_id;
++	uint16_t vendor_id;
++#if 0
++	uint16_t subsystem_id;
++	uint16_t subsystem_vendor_id;
++#endif
++	uint8_t revision_id;
++#if 0
++	uint8_t autoneg;
++	uint8_t mdix;
++	uint8_t forced_speed_duplex;
++	uint8_t wait_autoneg_complete;
++	uint8_t dma_fairness;
++#endif
++	uint8_t mac_addr[NODE_ADDRESS_SIZE];
++#if 0
++	uint8_t perm_mac_addr[NODE_ADDRESS_SIZE];
++	boolean_t disable_polarity_correction;
++	boolean_t speed_downgraded;
++	e1000_dsp_config dsp_config_state;
++	boolean_t get_link_status;
++	boolean_t serdes_link_down;
++#endif
++	boolean_t tbi_compatibility_en;
++	boolean_t tbi_compatibility_on;
++#if 0
++	boolean_t phy_reset_disable;
++	boolean_t fc_send_xon;
++	boolean_t fc_strict_ieee;
++	boolean_t report_tx_early;
++	boolean_t adaptive_ifs;
++	boolean_t ifs_params_forced;
++	boolean_t in_ifs_mode;
++#endif
++};
++
++
++#define E1000_EEPROM_SWDPIN0   0x0001   /* SWDPIN 0 EEPROM Value */
++#define E1000_EEPROM_LED_LOGIC 0x0020   /* Led Logic Word */
++
++/* Register Bit Masks */
++/* Device Control */
++#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
++#define E1000_CTRL_BEM      0x00000002  /* Endian Mode.0=little,1=big */
++#define E1000_CTRL_PRIOR    0x00000004  /* Priority on PCI. 0=rx,1=fair */
++#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
++#define E1000_CTRL_TME      0x00000010  /* Test mode. 0=normal,1=test */
++#define E1000_CTRL_SLE      0x00000020  /* Serial Link on 0=dis,1=en */
++#define E1000_CTRL_ASDE     0x00000020  /* Auto-speed detect enable */
++#define E1000_CTRL_SLU      0x00000040  /* Set link up (Force Link) */
++#define E1000_CTRL_ILOS     0x00000080  /* Invert Loss-Of Signal */
++#define E1000_CTRL_SPD_SEL  0x00000300  /* Speed Select Mask */
++#define E1000_CTRL_SPD_10   0x00000000  /* Force 10Mb */
++#define E1000_CTRL_SPD_100  0x00000100  /* Force 100Mb */
++#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
++#define E1000_CTRL_BEM32    0x00000400  /* Big Endian 32 mode */
++#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
++#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
++#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
++#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
++#define E1000_CTRL_SWDPIN2  0x00100000  /* SWDPIN 2 value */
++#define E1000_CTRL_SWDPIN3  0x00200000  /* SWDPIN 3 value */
++#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
++#define E1000_CTRL_SWDPIO1  0x00800000  /* SWDPIN 1 input or output */
++#define E1000_CTRL_SWDPIO2  0x01000000  /* SWDPIN 2 input or output */
++#define E1000_CTRL_SWDPIO3  0x02000000  /* SWDPIN 3 input or output */
++#define E1000_CTRL_RST      0x04000000  /* Global reset */
++#define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
++#define E1000_CTRL_TFCE     0x10000000  /* Transmit flow control enable */
++#define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */
++#define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
++#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
++
++/* Device Status */
++#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
++#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
++#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
++#define E1000_STATUS_FUNC_0     0x00000000      /* Function 0 */
++#define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
++#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
++#define E1000_STATUS_TBIMODE    0x00000020      /* TBI mode */
++#define E1000_STATUS_SPEED_MASK 0x000000C0
++#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
++#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
++#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
++#define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */
++#define E1000_STATUS_MTXCKOK    0x00000400      /* MTX clock running OK */
++#define E1000_STATUS_PCI66      0x00000800      /* In 66Mhz slot */
++#define E1000_STATUS_BUS64      0x00001000      /* In 64 bit slot */
++#define E1000_STATUS_PCIX_MODE  0x00002000      /* PCI-X mode */
++#define E1000_STATUS_PCIX_SPEED 0x0000C000      /* PCI-X bus speed */
++
++/* Constants used to intrepret the masked PCI-X bus speed. */
++#define E1000_STATUS_PCIX_SPEED_66  0x00000000 /* PCI-X bus speed  50-66 MHz */
++#define E1000_STATUS_PCIX_SPEED_100 0x00004000 /* PCI-X bus speed  66-100 MHz */
++#define E1000_STATUS_PCIX_SPEED_133 0x00008000 /* PCI-X bus speed 100-133 MHz */
++
++/* EEPROM/Flash Control */
++#define E1000_EECD_SK        0x00000001 /* EEPROM Clock */
++#define E1000_EECD_CS        0x00000002 /* EEPROM Chip Select */
++#define E1000_EECD_DI        0x00000004 /* EEPROM Data In */
++#define E1000_EECD_DO        0x00000008 /* EEPROM Data Out */
++#define E1000_EECD_FWE_MASK  0x00000030 
++#define E1000_EECD_FWE_DIS   0x00000010 /* Disable FLASH writes */
++#define E1000_EECD_FWE_EN    0x00000020 /* Enable FLASH writes */
++#define E1000_EECD_FWE_SHIFT 4
++#define E1000_EECD_REQ       0x00000040 /* EEPROM Access Request */
++#define E1000_EECD_GNT       0x00000080 /* EEPROM Access Grant */
++#define E1000_EECD_PRES      0x00000100 /* EEPROM Present */
++#define E1000_EECD_SIZE      0x00000200 /* EEPROM Size (0=64 word 1=256 word) */
++#define E1000_EECD_ADDR_BITS 0x00000400 /* EEPROM Addressing bits based on type
++                                         * (0-small, 1-large) */
++#define E1000_EECD_TYPE      0x00002000 /* EEPROM Type (1-SPI, 0-Microwire) */
++#ifndef E1000_EEPROM_GRANT_ATTEMPTS
++#define E1000_EEPROM_GRANT_ATTEMPTS 1000 /* EEPROM # attempts to gain grant */
++#endif
++
++/* EEPROM Read */
++#define E1000_EERD_START      0x00000001 /* Start Read */
++#define E1000_EERD_DONE       0x00000010 /* Read Done */
++#define E1000_EERD_ADDR_SHIFT 8
++#define E1000_EERD_ADDR_MASK  0x0000FF00 /* Read Address */
++#define E1000_EERD_DATA_SHIFT 16
++#define E1000_EERD_DATA_MASK  0xFFFF0000 /* Read Data */
++
++/* SPI EEPROM Status Register */
++#define EEPROM_STATUS_RDY_SPI  0x01
++#define EEPROM_STATUS_WEN_SPI  0x02
++#define EEPROM_STATUS_BP0_SPI  0x04
++#define EEPROM_STATUS_BP1_SPI  0x08
++#define EEPROM_STATUS_WPEN_SPI 0x80
++
++/* Extended Device Control */
++#define E1000_CTRL_EXT_GPI0_EN   0x00000001 /* Maps SDP4 to GPI0 */ 
++#define E1000_CTRL_EXT_GPI1_EN   0x00000002 /* Maps SDP5 to GPI1 */
++#define E1000_CTRL_EXT_PHYINT_EN E1000_CTRL_EXT_GPI1_EN
++#define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
++#define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
++#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Defineable Pin 4 */
++#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Defineable Pin 5 */
++#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
++#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Defineable Pin 6 */
++#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Defineable Pin 7 */
++#define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
++#define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
++#define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
++#define E1000_CTRL_EXT_SDP7_DIR  0x00000800 /* Direction of SDP7 0=in 1=out */
++#define E1000_CTRL_EXT_ASDCHK    0x00001000 /* Initiate an ASD sequence */
++#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
++#define E1000_CTRL_EXT_IPS       0x00004000 /* Invert Power State */
++#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
++#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
++#define E1000_CTRL_EXT_LINK_MODE_GMII 0x00000000
++#define E1000_CTRL_EXT_LINK_MODE_TBI  0x00C00000
++#define E1000_CTRL_EXT_WR_WMARK_MASK  0x03000000
++#define E1000_CTRL_EXT_WR_WMARK_256   0x00000000
++#define E1000_CTRL_EXT_WR_WMARK_320   0x01000000
++#define E1000_CTRL_EXT_WR_WMARK_384   0x02000000
++#define E1000_CTRL_EXT_WR_WMARK_448   0x03000000
++
++/* MDI Control */
++#define E1000_MDIC_DATA_MASK 0x0000FFFF
++#define E1000_MDIC_REG_MASK  0x001F0000
++#define E1000_MDIC_REG_SHIFT 16
++#define E1000_MDIC_PHY_MASK  0x03E00000
++#define E1000_MDIC_PHY_SHIFT 21
++#define E1000_MDIC_OP_WRITE  0x04000000
++#define E1000_MDIC_OP_READ   0x08000000
++#define E1000_MDIC_READY     0x10000000
++#define E1000_MDIC_INT_EN    0x20000000
++#define E1000_MDIC_ERROR     0x40000000
++
++/* LED Control */
++#define E1000_LEDCTL_LED0_MODE_MASK  0x0000000F
++#define E1000_LEDCTL_LED0_MODE_SHIFT 0
++#define E1000_LEDCTL_LED0_IVRT       0x00000040
++#define E1000_LEDCTL_LED0_BLINK      0x00000080
++#define E1000_LEDCTL_LED1_MODE_MASK  0x00000F00
++#define E1000_LEDCTL_LED1_MODE_SHIFT 8
++#define E1000_LEDCTL_LED1_IVRT       0x00004000
++#define E1000_LEDCTL_LED1_BLINK      0x00008000
++#define E1000_LEDCTL_LED2_MODE_MASK  0x000F0000
++#define E1000_LEDCTL_LED2_MODE_SHIFT 16
++#define E1000_LEDCTL_LED2_IVRT       0x00400000
++#define E1000_LEDCTL_LED2_BLINK      0x00800000
++#define E1000_LEDCTL_LED3_MODE_MASK  0x0F000000
++#define E1000_LEDCTL_LED3_MODE_SHIFT 24
++#define E1000_LEDCTL_LED3_IVRT       0x40000000
++#define E1000_LEDCTL_LED3_BLINK      0x80000000
++
++#define E1000_LEDCTL_MODE_LINK_10_1000  0x0
++#define E1000_LEDCTL_MODE_LINK_100_1000 0x1
++#define E1000_LEDCTL_MODE_LINK_UP       0x2
++#define E1000_LEDCTL_MODE_ACTIVITY      0x3
++#define E1000_LEDCTL_MODE_LINK_ACTIVITY 0x4
++#define E1000_LEDCTL_MODE_LINK_10       0x5
++#define E1000_LEDCTL_MODE_LINK_100      0x6
++#define E1000_LEDCTL_MODE_LINK_1000     0x7
++#define E1000_LEDCTL_MODE_PCIX_MODE     0x8
++#define E1000_LEDCTL_MODE_FULL_DUPLEX   0x9
++#define E1000_LEDCTL_MODE_COLLISION     0xA
++#define E1000_LEDCTL_MODE_BUS_SPEED     0xB
++#define E1000_LEDCTL_MODE_BUS_SIZE      0xC
++#define E1000_LEDCTL_MODE_PAUSED        0xD
++#define E1000_LEDCTL_MODE_LED_ON        0xE
++#define E1000_LEDCTL_MODE_LED_OFF       0xF
++
++/* Receive Address */
++#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
++
++/* Interrupt Cause Read */
++#define E1000_ICR_TXDW    0x00000001    /* Transmit desc written back */
++#define E1000_ICR_TXQE    0x00000002    /* Transmit Queue empty */
++#define E1000_ICR_LSC     0x00000004    /* Link Status Change */
++#define E1000_ICR_RXSEQ   0x00000008    /* rx sequence error */
++#define E1000_ICR_RXDMT0  0x00000010    /* rx desc min. threshold (0) */
++#define E1000_ICR_RXO     0x00000040    /* rx overrun */
++#define E1000_ICR_RXT0    0x00000080    /* rx timer intr (ring 0) */
++#define E1000_ICR_MDAC    0x00000200    /* MDIO access complete */
++#define E1000_ICR_RXCFG   0x00000400    /* RX /c/ ordered set */
++#define E1000_ICR_GPI_EN0 0x00000800    /* GP Int 0 */
++#define E1000_ICR_GPI_EN1 0x00001000    /* GP Int 1 */
++#define E1000_ICR_GPI_EN2 0x00002000    /* GP Int 2 */
++#define E1000_ICR_GPI_EN3 0x00004000    /* GP Int 3 */
++#define E1000_ICR_TXD_LOW 0x00008000
++#define E1000_ICR_SRPD    0x00010000
++
++/* Interrupt Cause Set */
++#define E1000_ICS_TXDW    E1000_ICR_TXDW        /* Transmit desc written back */
++#define E1000_ICS_TXQE    E1000_ICR_TXQE        /* Transmit Queue empty */
++#define E1000_ICS_LSC     E1000_ICR_LSC         /* Link Status Change */
++#define E1000_ICS_RXSEQ   E1000_ICR_RXSEQ       /* rx sequence error */
++#define E1000_ICS_RXDMT0  E1000_ICR_RXDMT0      /* rx desc min. threshold */
++#define E1000_ICS_RXO     E1000_ICR_RXO         /* rx overrun */
++#define E1000_ICS_RXT0    E1000_ICR_RXT0        /* rx timer intr */
++#define E1000_ICS_MDAC    E1000_ICR_MDAC        /* MDIO access complete */
++#define E1000_ICS_RXCFG   E1000_ICR_RXCFG       /* RX /c/ ordered set */
++#define E1000_ICS_GPI_EN0 E1000_ICR_GPI_EN0     /* GP Int 0 */
++#define E1000_ICS_GPI_EN1 E1000_ICR_GPI_EN1     /* GP Int 1 */
++#define E1000_ICS_GPI_EN2 E1000_ICR_GPI_EN2     /* GP Int 2 */
++#define E1000_ICS_GPI_EN3 E1000_ICR_GPI_EN3     /* GP Int 3 */
++#define E1000_ICS_TXD_LOW E1000_ICR_TXD_LOW
++#define E1000_ICS_SRPD    E1000_ICR_SRPD
++
++/* Interrupt Mask Set */
++#define E1000_IMS_TXDW    E1000_ICR_TXDW        /* Transmit desc written back */
++#define E1000_IMS_TXQE    E1000_ICR_TXQE        /* Transmit Queue empty */
++#define E1000_IMS_LSC     E1000_ICR_LSC         /* Link Status Change */
++#define E1000_IMS_RXSEQ   E1000_ICR_RXSEQ       /* rx sequence error */
++#define E1000_IMS_RXDMT0  E1000_ICR_RXDMT0      /* rx desc min. threshold */
++#define E1000_IMS_RXO     E1000_ICR_RXO         /* rx overrun */
++#define E1000_IMS_RXT0    E1000_ICR_RXT0        /* rx timer intr */
++#define E1000_IMS_MDAC    E1000_ICR_MDAC        /* MDIO access complete */
++#define E1000_IMS_RXCFG   E1000_ICR_RXCFG       /* RX /c/ ordered set */
++#define E1000_IMS_GPI_EN0 E1000_ICR_GPI_EN0     /* GP Int 0 */
++#define E1000_IMS_GPI_EN1 E1000_ICR_GPI_EN1     /* GP Int 1 */
++#define E1000_IMS_GPI_EN2 E1000_ICR_GPI_EN2     /* GP Int 2 */
++#define E1000_IMS_GPI_EN3 E1000_ICR_GPI_EN3     /* GP Int 3 */
++#define E1000_IMS_TXD_LOW E1000_ICR_TXD_LOW
++#define E1000_IMS_SRPD    E1000_ICR_SRPD
++
++/* Interrupt Mask Clear */
++#define E1000_IMC_TXDW    E1000_ICR_TXDW        /* Transmit desc written back */
++#define E1000_IMC_TXQE    E1000_ICR_TXQE        /* Transmit Queue empty */
++#define E1000_IMC_LSC     E1000_ICR_LSC         /* Link Status Change */
++#define E1000_IMC_RXSEQ   E1000_ICR_RXSEQ       /* rx sequence error */
++#define E1000_IMC_RXDMT0  E1000_ICR_RXDMT0      /* rx desc min. threshold */
++#define E1000_IMC_RXO     E1000_ICR_RXO         /* rx overrun */
++#define E1000_IMC_RXT0    E1000_ICR_RXT0        /* rx timer intr */
++#define E1000_IMC_MDAC    E1000_ICR_MDAC        /* MDIO access complete */
++#define E1000_IMC_RXCFG   E1000_ICR_RXCFG       /* RX /c/ ordered set */
++#define E1000_IMC_GPI_EN0 E1000_ICR_GPI_EN0     /* GP Int 0 */
++#define E1000_IMC_GPI_EN1 E1000_ICR_GPI_EN1     /* GP Int 1 */
++#define E1000_IMC_GPI_EN2 E1000_ICR_GPI_EN2     /* GP Int 2 */
++#define E1000_IMC_GPI_EN3 E1000_ICR_GPI_EN3     /* GP Int 3 */
++#define E1000_IMC_TXD_LOW E1000_ICR_TXD_LOW
++#define E1000_IMC_SRPD    E1000_ICR_SRPD
++
++/* Receive Control */
++#define E1000_RCTL_RST          0x00000001      /* Software reset */
++#define E1000_RCTL_EN           0x00000002      /* enable */
++#define E1000_RCTL_SBP          0x00000004      /* store bad packet */
++#define E1000_RCTL_UPE          0x00000008      /* unicast promiscuous enable */
++#define E1000_RCTL_MPE          0x00000010      /* multicast promiscuous enab */
++#define E1000_RCTL_LPE          0x00000020      /* long packet enable */
++#define E1000_RCTL_LBM_NO       0x00000000      /* no loopback mode */
++#define E1000_RCTL_LBM_MAC      0x00000040      /* MAC loopback mode */
++#define E1000_RCTL_LBM_SLP      0x00000080      /* serial link loopback mode */
++#define E1000_RCTL_LBM_TCVR     0x000000C0      /* tcvr loopback mode */
++#define E1000_RCTL_RDMTS_HALF   0x00000000      /* rx desc min threshold size */
++#define E1000_RCTL_RDMTS_QUAT   0x00000100      /* rx desc min threshold size */
++#define E1000_RCTL_RDMTS_EIGTH  0x00000200      /* rx desc min threshold size */
++#define E1000_RCTL_MO_SHIFT     12              /* multicast offset shift */
++#define E1000_RCTL_MO_0         0x00000000      /* multicast offset 11:0 */
++#define E1000_RCTL_MO_1         0x00001000      /* multicast offset 12:1 */
++#define E1000_RCTL_MO_2         0x00002000      /* multicast offset 13:2 */
++#define E1000_RCTL_MO_3         0x00003000      /* multicast offset 15:4 */
++#define E1000_RCTL_MDR          0x00004000      /* multicast desc ring 0 */
++#define E1000_RCTL_BAM          0x00008000      /* broadcast enable */
++/* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
++#define E1000_RCTL_SZ_2048      0x00000000      /* rx buffer size 2048 */
++#define E1000_RCTL_SZ_1024      0x00010000      /* rx buffer size 1024 */
++#define E1000_RCTL_SZ_512       0x00020000      /* rx buffer size 512 */
++#define E1000_RCTL_SZ_256       0x00030000      /* rx buffer size 256 */
++/* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
++#define E1000_RCTL_SZ_16384     0x00010000      /* rx buffer size 16384 */
++#define E1000_RCTL_SZ_8192      0x00020000      /* rx buffer size 8192 */
++#define E1000_RCTL_SZ_4096      0x00030000      /* rx buffer size 4096 */
++#define E1000_RCTL_VFE          0x00040000      /* vlan filter enable */
++#define E1000_RCTL_CFIEN        0x00080000      /* canonical form enable */
++#define E1000_RCTL_CFI          0x00100000      /* canonical form indicator */
++#define E1000_RCTL_DPF          0x00400000      /* discard pause frames */
++#define E1000_RCTL_PMCF         0x00800000      /* pass MAC control frames */
++#define E1000_RCTL_BSEX         0x02000000      /* Buffer size extension */
++
++/* Receive Descriptor */
++#define E1000_RDT_DELAY 0x0000ffff      /* Delay timer (1=1024us) */
++#define E1000_RDT_FPDB  0x80000000      /* Flush descriptor block */
++#define E1000_RDLEN_LEN 0x0007ff80      /* descriptor length */
++#define E1000_RDH_RDH   0x0000ffff      /* receive descriptor head */
++#define E1000_RDT_RDT   0x0000ffff      /* receive descriptor tail */
++
++/* Flow Control */
++#define E1000_FCRTH_RTH  0x0000FFF8     /* Mask Bits[15:3] for RTH */
++#define E1000_FCRTH_XFCE 0x80000000     /* External Flow Control Enable */
++#define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
++#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
++
++/* Receive Descriptor Control */
++#define E1000_RXDCTL_PTHRESH 0x0000003F /* RXDCTL Prefetch Threshold */
++#define E1000_RXDCTL_HTHRESH 0x00003F00 /* RXDCTL Host Threshold */
++#define E1000_RXDCTL_WTHRESH 0x003F0000 /* RXDCTL Writeback Threshold */
++#define E1000_RXDCTL_GRAN    0x01000000 /* RXDCTL Granularity */
++
++/* Transmit Descriptor Control */
++#define E1000_TXDCTL_PTHRESH 0x000000FF /* TXDCTL Prefetch Threshold */
++#define E1000_TXDCTL_HTHRESH 0x0000FF00 /* TXDCTL Host Threshold */
++#define E1000_TXDCTL_WTHRESH 0x00FF0000 /* TXDCTL Writeback Threshold */
++#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
++#define E1000_TXDCTL_LWTHRESH 0xFE000000 /* TXDCTL Low Threshold */
++#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
++
++/* Transmit Configuration Word */
++#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
++#define E1000_TXCW_HD         0x00000040        /* TXCW half duplex */
++#define E1000_TXCW_PAUSE      0x00000080        /* TXCW sym pause request */
++#define E1000_TXCW_ASM_DIR    0x00000100        /* TXCW astm pause direction */
++#define E1000_TXCW_PAUSE_MASK 0x00000180        /* TXCW pause request mask */
++#define E1000_TXCW_RF         0x00003000        /* TXCW remote fault */
++#define E1000_TXCW_NP         0x00008000        /* TXCW next page */
++#define E1000_TXCW_CW         0x0000ffff        /* TxConfigWord mask */
++#define E1000_TXCW_TXC        0x40000000        /* Transmit Config control */
++#define E1000_TXCW_ANE        0x80000000        /* Auto-neg enable */
++
++/* Receive Configuration Word */
++#define E1000_RXCW_CW    0x0000ffff     /* RxConfigWord mask */
++#define E1000_RXCW_NC    0x04000000     /* Receive config no carrier */
++#define E1000_RXCW_IV    0x08000000     /* Receive config invalid */
++#define E1000_RXCW_CC    0x10000000     /* Receive config change */
++#define E1000_RXCW_C     0x20000000     /* Receive config */
++#define E1000_RXCW_SYNCH 0x40000000     /* Receive config synch */
++#define E1000_RXCW_ANC   0x80000000     /* Auto-neg complete */
++
++/* Transmit Control */
++#define E1000_TCTL_RST    0x00000001    /* software reset */
++#define E1000_TCTL_EN     0x00000002    /* enable tx */
++#define E1000_TCTL_BCE    0x00000004    /* busy check enable */
++#define E1000_TCTL_PSP    0x00000008    /* pad short packets */
++#define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
++#define E1000_TCTL_COLD   0x003ff000    /* collision distance */
++#define E1000_TCTL_SWXOFF 0x00400000    /* SW Xoff transmission */
++#define E1000_TCTL_PBE    0x00800000    /* Packet Burst Enable */
++#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
++#define E1000_TCTL_NRTU   0x02000000    /* No Re-transmit on underrun */
++
++/* Receive Checksum Control */
++#define E1000_RXCSUM_PCSS_MASK 0x000000FF   /* Packet Checksum Start */
++#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
++#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
++#define E1000_RXCSUM_IPV6OFL   0x00000400   /* IPv6 checksum offload */
++
++/* Definitions for power management and wakeup registers */
++/* Wake Up Control */
++#define E1000_WUC_APME       0x00000001 /* APM Enable */
++#define E1000_WUC_PME_EN     0x00000002 /* PME Enable */
++#define E1000_WUC_PME_STATUS 0x00000004 /* PME Status */
++#define E1000_WUC_APMPME     0x00000008 /* Assert PME on APM Wakeup */
++#define E1000_WUC_SPM        0x80000000 /* Enable SPM */
++
++/* Wake Up Filter Control */
++#define E1000_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
++#define E1000_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
++#define E1000_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
++#define E1000_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
++#define E1000_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
++#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
++#define E1000_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
++#define E1000_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
++#define E1000_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
++#define E1000_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
++#define E1000_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
++#define E1000_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
++#define E1000_WUFC_ALL_FILTERS 0x000F00FF /* Mask for all wakeup filters */
++#define E1000_WUFC_FLX_OFFSET 16       /* Offset to the Flexible Filters bits */
++#define E1000_WUFC_FLX_FILTERS 0x000F0000 /* Mask for the 4 flexible filters */
++
++/* Wake Up Status */
++#define E1000_WUS_LNKC 0x00000001 /* Link Status Changed */
++#define E1000_WUS_MAG  0x00000002 /* Magic Packet Received */
++#define E1000_WUS_EX   0x00000004 /* Directed Exact Received */
++#define E1000_WUS_MC   0x00000008 /* Directed Multicast Received */
++#define E1000_WUS_BC   0x00000010 /* Broadcast Received */
++#define E1000_WUS_ARP  0x00000020 /* ARP Request Packet Received */
++#define E1000_WUS_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Received */
++#define E1000_WUS_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Received */
++#define E1000_WUS_FLX0 0x00010000 /* Flexible Filter 0 Match */
++#define E1000_WUS_FLX1 0x00020000 /* Flexible Filter 1 Match */
++#define E1000_WUS_FLX2 0x00040000 /* Flexible Filter 2 Match */
++#define E1000_WUS_FLX3 0x00080000 /* Flexible Filter 3 Match */
++#define E1000_WUS_FLX_FILTERS 0x000F0000 /* Mask for the 4 flexible filters */
++
++/* Management Control */
++#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
++#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
++#define E1000_MANC_R_ON_FORCE    0x00000004 /* Reset on Force TCO - RO */
++#define E1000_MANC_RMCP_EN       0x00000100 /* Enable RCMP 026Fh Filtering */
++#define E1000_MANC_0298_EN       0x00000200 /* Enable RCMP 0298h Filtering */
++#define E1000_MANC_IPV4_EN       0x00000400 /* Enable IPv4 */
++#define E1000_MANC_IPV6_EN       0x00000800 /* Enable IPv6 */
++#define E1000_MANC_SNAP_EN       0x00001000 /* Accept LLC/SNAP */
++#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
++#define E1000_MANC_NEIGHBOR_EN   0x00004000 /* Enable Neighbor Discovery 
++                                             * Filtering */
++#define E1000_MANC_TCO_RESET     0x00010000 /* TCO Reset Occurred */
++#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
++#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
++#define E1000_MANC_SMB_REQ       0x01000000 /* SMBus Request */
++#define E1000_MANC_SMB_GNT       0x02000000 /* SMBus Grant */
++#define E1000_MANC_SMB_CLK_IN    0x04000000 /* SMBus Clock In */
++#define E1000_MANC_SMB_DATA_IN   0x08000000 /* SMBus Data In */
++#define E1000_MANC_SMB_DATA_OUT  0x10000000 /* SMBus Data Out */
++#define E1000_MANC_SMB_CLK_OUT   0x20000000 /* SMBus Clock Out */
++
++#define E1000_MANC_SMB_DATA_OUT_SHIFT  28 /* SMBus Data Out Shift */
++#define E1000_MANC_SMB_CLK_OUT_SHIFT   29 /* SMBus Clock Out Shift */
++
++/* Wake Up Packet Length */
++#define E1000_WUPL_LENGTH_MASK 0x0FFF   /* Only the lower 12 bits are valid */
++
++#define E1000_MDALIGN          4096
++
++/* EEPROM Commands - Microwire */
++#define EEPROM_READ_OPCODE_MICROWIRE  0x6  /* EEPROM read opcode */
++#define EEPROM_WRITE_OPCODE_MICROWIRE 0x5  /* EEPROM write opcode */
++#define EEPROM_ERASE_OPCODE_MICROWIRE 0x7  /* EEPROM erase opcode */
++#define EEPROM_EWEN_OPCODE_MICROWIRE  0x13 /* EEPROM erase/write enable */
++#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10 /* EEPROM erast/write disable */
++
++/* EEPROM Commands - SPI */
++#define EEPROM_MAX_RETRY_SPI    5000 /* Max wait of 5ms, for RDY signal */
++#define EEPROM_READ_OPCODE_SPI  0x3  /* EEPROM read opcode */
++#define EEPROM_WRITE_OPCODE_SPI 0x2  /* EEPROM write opcode */
++#define EEPROM_A8_OPCODE_SPI    0x8  /* opcode bit-3 = address bit-8 */
++#define EEPROM_WREN_OPCODE_SPI  0x6  /* EEPROM set Write Enable latch */
++#define EEPROM_WRDI_OPCODE_SPI  0x4  /* EEPROM reset Write Enable latch */
++#define EEPROM_RDSR_OPCODE_SPI  0x5  /* EEPROM read Status register */
++#define EEPROM_WRSR_OPCODE_SPI  0x1  /* EEPROM write Status register */
++
++/* EEPROM Size definitions */
++#define EEPROM_SIZE_16KB        0x1800
++#define EEPROM_SIZE_8KB         0x1400
++#define EEPROM_SIZE_4KB         0x1000
++#define EEPROM_SIZE_2KB         0x0C00
++#define EEPROM_SIZE_1KB         0x0800
++#define EEPROM_SIZE_512B        0x0400
++#define EEPROM_SIZE_128B        0x0000
++#define EEPROM_SIZE_MASK        0x1C00
++
++/* EEPROM Word Offsets */
++#define EEPROM_COMPAT              0x0003
++#define EEPROM_ID_LED_SETTINGS     0x0004
++#define EEPROM_SERDES_AMPLITUDE       0x0006 /* For SERDES output amplitude adjustment. */
++#define EEPROM_INIT_CONTROL1_REG   0x000A
++#define EEPROM_INIT_CONTROL2_REG   0x000F
++#define EEPROM_INIT_CONTROL3_PORT_B   0x0014
++#define EEPROM_INIT_CONTROL3_PORT_A   0x0024
++#define EEPROM_CFG                 0x0012
++#define EEPROM_FLASH_VERSION       0x0032
++#define EEPROM_CHECKSUM_REG        0x003F
++
++/* Word definitions for ID LED Settings */
++#define ID_LED_RESERVED_0000 0x0000
++#define ID_LED_RESERVED_FFFF 0xFFFF
++#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2 << 12) | \
++                              (ID_LED_OFF1_OFF2 << 8) | \
++                              (ID_LED_DEF1_DEF2 << 4) | \
++                              (ID_LED_DEF1_DEF2))
++#define ID_LED_DEF1_DEF2     0x1
++#define ID_LED_DEF1_ON2      0x2
++#define ID_LED_DEF1_OFF2     0x3
++#define ID_LED_ON1_DEF2      0x4
++#define ID_LED_ON1_ON2       0x5
++#define ID_LED_ON1_OFF2      0x6
++#define ID_LED_OFF1_DEF2     0x7
++#define ID_LED_OFF1_ON2      0x8
++#define ID_LED_OFF1_OFF2     0x9
++
++#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
++#define IGP_ACTIVITY_LED_ENABLE 0x0300
++#define IGP_LED3_MODE           0x07000000
++
++
++/* Mask bits for SERDES amplitude adjustment in Word 6 of the EEPROM */
++#define EEPROM_SERDES_AMPLITUDE_MASK  0x000F
++
++/* Mask bits for fields in Word 0x0a of the EEPROM */
++#define EEPROM_WORD0A_ILOS   0x0010
++#define EEPROM_WORD0A_SWDPIO 0x01E0
++#define EEPROM_WORD0A_LRST   0x0200
++#define EEPROM_WORD0A_FD     0x0400
++#define EEPROM_WORD0A_66MHZ  0x0800
++
++/* Mask bits for fields in Word 0x0f of the EEPROM */
++#define EEPROM_WORD0F_PAUSE_MASK 0x3000
++#define EEPROM_WORD0F_PAUSE      0x1000
++#define EEPROM_WORD0F_ASM_DIR    0x2000
++#define EEPROM_WORD0F_ANE        0x0800
++#define EEPROM_WORD0F_SWPDIO_EXT 0x00F0
++
++/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
++#define EEPROM_SUM 0xBABA
++
++/* EEPROM Map defines (WORD OFFSETS)*/
++#define EEPROM_NODE_ADDRESS_BYTE_0 0
++#define EEPROM_PBA_BYTE_1          8
++
++#define EEPROM_RESERVED_WORD          0xFFFF
++
++/* EEPROM Map Sizes (Byte Counts) */
++#define PBA_SIZE 4
++
++/* Collision related configuration parameters */
++#define E1000_COLLISION_THRESHOLD       16
++#define E1000_CT_SHIFT                  4
++#define E1000_COLLISION_DISTANCE        64
++#define E1000_FDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
++#define E1000_HDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
++#define E1000_COLD_SHIFT                12
++
++/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
++#define REQ_TX_DESCRIPTOR_MULTIPLE  8
++#define REQ_RX_DESCRIPTOR_MULTIPLE  8
++
++/* Default values for the transmit IPG register */
++#define DEFAULT_82542_TIPG_IPGT        10
++#define DEFAULT_82543_TIPG_IPGT_FIBER  9
++#define DEFAULT_82543_TIPG_IPGT_COPPER 8
++
++#define E1000_TIPG_IPGT_MASK  0x000003FF
++#define E1000_TIPG_IPGR1_MASK 0x000FFC00
++#define E1000_TIPG_IPGR2_MASK 0x3FF00000
++
++#define DEFAULT_82542_TIPG_IPGR1 2
++#define DEFAULT_82543_TIPG_IPGR1 8
++#define E1000_TIPG_IPGR1_SHIFT  10
++
++#define DEFAULT_82542_TIPG_IPGR2 10
++#define DEFAULT_82543_TIPG_IPGR2 6
++#define E1000_TIPG_IPGR2_SHIFT  20
++
++#define E1000_TXDMAC_DPP 0x00000001
++
++/* Adaptive IFS defines */
++#define TX_THRESHOLD_START     8
++#define TX_THRESHOLD_INCREMENT 10
++#define TX_THRESHOLD_DECREMENT 1
++#define TX_THRESHOLD_STOP      190
++#define TX_THRESHOLD_DISABLE   0
++#define TX_THRESHOLD_TIMER_MS  10000
++#define MIN_NUM_XMITS          1000
++#define IFS_MAX                80
++#define IFS_STEP               10
++#define IFS_MIN                40
++#define IFS_RATIO              4
++
++/* PBA constants */
++#define E1000_PBA_16K 0x0010    /* 16KB, default TX allocation */
++#define E1000_PBA_22K 0x0016
++#define E1000_PBA_24K 0x0018
++#define E1000_PBA_30K 0x001E
++#define E1000_PBA_40K 0x0028
++#define E1000_PBA_48K 0x0030    /* 48KB, default RX allocation */
++
++/* Flow Control Constants */
++#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
++#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
++#define FLOW_CONTROL_TYPE         0x8808
++
++/* The historical defaults for the flow control values are given below. */
++#define FC_DEFAULT_HI_THRESH        (0x8000)    /* 32KB */
++#define FC_DEFAULT_LO_THRESH        (0x4000)    /* 16KB */
++#define FC_DEFAULT_TX_TIMER         (0x100)     /* ~130 us */
++
++/* PCIX Config space */
++#define PCIX_COMMAND_REGISTER    0xE6
++#define PCIX_STATUS_REGISTER_LO  0xE8
++#define PCIX_STATUS_REGISTER_HI  0xEA
++
++#define PCIX_COMMAND_MMRBC_MASK      0x000C
++#define PCIX_COMMAND_MMRBC_SHIFT     0x2
++#define PCIX_STATUS_HI_MMRBC_MASK    0x0060
++#define PCIX_STATUS_HI_MMRBC_SHIFT   0x5
++#define PCIX_STATUS_HI_MMRBC_4K      0x3
++#define PCIX_STATUS_HI_MMRBC_2K      0x2
++
++
++/* Number of bits required to shift right the "pause" bits from the
++ * EEPROM (bits 13:12) to the "pause" (bits 8:7) field in the TXCW register.
++ */
++#define PAUSE_SHIFT 5
++
++/* Number of bits required to shift left the "SWDPIO" bits from the
++ * EEPROM (bits 8:5) to the "SWDPIO" (bits 25:22) field in the CTRL register.
++ */
++#define SWDPIO_SHIFT 17
++
++/* Number of bits required to shift left the "SWDPIO_EXT" bits from the
++ * EEPROM word F (bits 7:4) to the bits 11:8 of The Extended CTRL register.
++ */
++#define SWDPIO__EXT_SHIFT 4
++
++/* Number of bits required to shift left the "ILOS" bit from the EEPROM
++ * (bit 4) to the "ILOS" (bit 7) field in the CTRL register.
++ */
++#define ILOS_SHIFT  3
++
++
++#define RECEIVE_BUFFER_ALIGN_SIZE  (256)
++
++/* Number of milliseconds we wait for auto-negotiation to complete */
++#define LINK_UP_TIMEOUT             500
++
++#define E1000_TX_BUFFER_SIZE ((uint32_t)1514)
++
++/* The carrier extension symbol, as received by the NIC. */
++#define CARRIER_EXTENSION   0x0F
++
++/* TBI_ACCEPT macro definition:
++ *
++ * This macro requires:
++ *      adapter = a pointer to struct e1000_hw 
++ *      status = the 8 bit status field of the RX descriptor with EOP set
++ *      error = the 8 bit error field of the RX descriptor with EOP set
++ *      length = the sum of all the length fields of the RX descriptors that
++ *               make up the current frame
++ *      last_byte = the last byte of the frame DMAed by the hardware
++ *      max_frame_length = the maximum frame length we want to accept.
++ *      min_frame_length = the minimum frame length we want to accept.
++ *
++ * This macro is a conditional that should be used in the interrupt 
++ * handler's Rx processing routine when RxErrors have been detected.
++ *
++ * Typical use:
++ *  ...
++ *  if (TBI_ACCEPT) {
++ *      accept_frame = TRUE;
++ *      e1000_tbi_adjust_stats(adapter, MacAddress);
++ *      frame_length--;
++ *  } else {
++ *      accept_frame = FALSE;
++ *  }
++ *  ...
++ */
++
++#define TBI_ACCEPT(adapter, status, errors, length, last_byte) \
++    ((adapter)->tbi_compatibility_on && \
++     (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
++     ((last_byte) == CARRIER_EXTENSION) && \
++     (((status) & E1000_RXD_STAT_VP) ? \
++          (((length) > ((adapter)->min_frame_size - VLAN_TAG_SIZE)) && \
++           ((length) <= ((adapter)->max_frame_size + 1))) : \
++          (((length) > (adapter)->min_frame_size) && \
++           ((length) <= ((adapter)->max_frame_size + VLAN_TAG_SIZE + 1)))))
++
++
++/* Structures, enums, and macros for the PHY */
++
++/* Bit definitions for the Management Data IO (MDIO) and Management Data
++ * Clock (MDC) pins in the Device Control Register.
++ */
++#define E1000_CTRL_PHY_RESET_DIR  E1000_CTRL_SWDPIO0
++#define E1000_CTRL_PHY_RESET      E1000_CTRL_SWDPIN0
++#define E1000_CTRL_MDIO_DIR       E1000_CTRL_SWDPIO2
++#define E1000_CTRL_MDIO           E1000_CTRL_SWDPIN2
++#define E1000_CTRL_MDC_DIR        E1000_CTRL_SWDPIO3
++#define E1000_CTRL_MDC            E1000_CTRL_SWDPIN3
++#define E1000_CTRL_PHY_RESET_DIR4 E1000_CTRL_EXT_SDP4_DIR
++#define E1000_CTRL_PHY_RESET4     E1000_CTRL_EXT_SDP4_DATA
++
++/* PHY 1000 MII Register/Bit Definitions */
++/* PHY Registers defined by IEEE */
++#define PHY_CTRL         0x00 /* Control Register */
++#define PHY_STATUS       0x01 /* Status Regiser */
++#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
++#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
++#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
++#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
++#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
++#define PHY_NEXT_PAGE_TX 0x07 /* Next Page TX */
++#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
++#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
++#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
++#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
++
++/* M88E1000 Specific Registers */
++#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
++#define M88E1000_PHY_SPEC_STATUS   0x11  /* PHY Specific Status Register */
++#define M88E1000_INT_ENABLE        0x12  /* Interrupt Enable Register */
++#define M88E1000_INT_STATUS        0x13  /* Interrupt Status Register */
++#define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
++#define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
++
++#define M88E1000_PHY_EXT_CTRL      0x1A  /* PHY extend control register */
++#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
++#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
++#define M88E1000_PHY_VCO_REG_BIT8  0x100 /* Bits 8 & 11 are adjusted for */
++#define M88E1000_PHY_VCO_REG_BIT11 0x800    /* improved BER performance */
++
++#define IGP01E1000_IEEE_REGS_PAGE  0x0000
++#define IGP01E1000_IEEE_RESTART_AUTONEG 0x3300
++#define IGP01E1000_IEEE_FORCE_GIGA      0x0140
++
++/* IGP01E1000 Specific Registers */
++#define IGP01E1000_PHY_PORT_CONFIG 0x10 /* PHY Specific Port Config Register */
++#define IGP01E1000_PHY_PORT_STATUS 0x11 /* PHY Specific Status Register */
++#define IGP01E1000_PHY_PORT_CTRL   0x12 /* PHY Specific Control Register */
++#define IGP01E1000_PHY_LINK_HEALTH 0x13 /* PHY Link Health Register */
++#define IGP01E1000_GMII_FIFO       0x14 /* GMII FIFO Register */
++#define IGP01E1000_PHY_CHANNEL_QUALITY 0x15 /* PHY Channel Quality Register */
++#define IGP01E1000_PHY_PAGE_SELECT     0x1F /* PHY Page Select Core Register */
++
++/* IGP01E1000 AGC Registers - stores the cable length values*/
++#define IGP01E1000_PHY_AGC_A        0x1172
++#define IGP01E1000_PHY_AGC_B        0x1272
++#define IGP01E1000_PHY_AGC_C        0x1472
++#define IGP01E1000_PHY_AGC_D        0x1872
++
++/* IGP01E1000 DSP Reset Register */
++#define IGP01E1000_PHY_DSP_RESET   0x1F33
++#define IGP01E1000_PHY_DSP_SET     0x1F71
++#define IGP01E1000_PHY_DSP_FFE     0x1F35
++
++#define IGP01E1000_PHY_CHANNEL_NUM    4
++#define IGP01E1000_PHY_AGC_PARAM_A    0x1171
++#define IGP01E1000_PHY_AGC_PARAM_B    0x1271
++#define IGP01E1000_PHY_AGC_PARAM_C    0x1471
++#define IGP01E1000_PHY_AGC_PARAM_D    0x1871
++
++#define IGP01E1000_PHY_EDAC_MU_INDEX        0xC000
++#define IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS 0x8000
++
++#define IGP01E1000_PHY_ANALOG_TX_STATE      0x2890
++#define IGP01E1000_PHY_ANALOG_CLASS_A       0x2000
++#define IGP01E1000_PHY_FORCE_ANALOG_ENABLE  0x0004
++#define IGP01E1000_PHY_DSP_FFE_CM_CP        0x0069
++
++#define IGP01E1000_PHY_DSP_FFE_DEFAULT      0x002A
++/* IGP01E1000 PCS Initialization register - stores the polarity status when
++ * speed = 1000 Mbps. */
++#define IGP01E1000_PHY_PCS_INIT_REG  0x00B4
++#define IGP01E1000_PHY_PCS_CTRL_REG  0x00B5
++
++#define IGP01E1000_ANALOG_REGS_PAGE  0x20C0
++  
++#define MAX_PHY_REG_ADDRESS 0x1F        /* 5 bit address bus (0-0x1F) */
++#define MAX_PHY_MULTI_PAGE_REG  0xF     /*Registers that are equal on all pages*/
++/* PHY Control Register */
++#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
++#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
++#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
++#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
++#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
++#define MII_CR_POWER_DOWN       0x0800  /* Power down */
++#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
++#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
++#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
++#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
++
++/* PHY Status Register */
++#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
++#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
++#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
++#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
++#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
++#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
++#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
++#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
++#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
++#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
++#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
++#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
++#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
++#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
++#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
++
++/* Autoneg Advertisement Register */
++#define NWAY_AR_SELECTOR_FIELD 0x0001   /* indicates IEEE 802.3 CSMA/CD */
++#define NWAY_AR_10T_HD_CAPS    0x0020   /* 10T   Half Duplex Capable */
++#define NWAY_AR_10T_FD_CAPS    0x0040   /* 10T   Full Duplex Capable */
++#define NWAY_AR_100TX_HD_CAPS  0x0080   /* 100TX Half Duplex Capable */
++#define NWAY_AR_100TX_FD_CAPS  0x0100   /* 100TX Full Duplex Capable */
++#define NWAY_AR_100T4_CAPS     0x0200   /* 100T4 Capable */
++#define NWAY_AR_PAUSE          0x0400   /* Pause operation desired */
++#define NWAY_AR_ASM_DIR        0x0800   /* Asymmetric Pause Direction bit */
++#define NWAY_AR_REMOTE_FAULT   0x2000   /* Remote Fault detected */
++#define NWAY_AR_NEXT_PAGE      0x8000   /* Next Page ability supported */
++
++/* Link Partner Ability Register (Base Page) */
++#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
++#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
++#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
++#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
++#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
++#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
++#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
++#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
++#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
++#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
++#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
++
++/* Autoneg Expansion Register */
++#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
++#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
++#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
++#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
++#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
++
++/* Next Page TX Register */
++#define NPTX_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
++#define NPTX_TOGGLE         0x0800 /* Toggles between exchanges
++                                    * of different NP
++                                    */
++#define NPTX_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg
++                                    * 0 = cannot comply with msg
++                                    */
++#define NPTX_MSG_PAGE       0x2000 /* formatted(1)/unformatted(0) pg */
++#define NPTX_NEXT_PAGE      0x8000 /* 1 = addition NP will follow 
++                                    * 0 = sending last NP
++                                    */
++
++/* Link Partner Next Page Register */
++#define LP_RNPR_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
++#define LP_RNPR_TOGGLE         0x0800 /* Toggles between exchanges
++                                       * of different NP
++                                       */
++#define LP_RNPR_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg 
++                                       * 0 = cannot comply with msg
++                                       */
++#define LP_RNPR_MSG_PAGE       0x2000  /* formatted(1)/unformatted(0) pg */
++#define LP_RNPR_ACKNOWLDGE     0x4000  /* 1 = ACK / 0 = NO ACK */
++#define LP_RNPR_NEXT_PAGE      0x8000  /* 1 = addition NP will follow
++                                        * 0 = sending last NP 
++                                        */
++
++/* 1000BASE-T Control Register */
++#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
++#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
++#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
++#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
++                                        /* 0=DTE device */
++#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
++                                        /* 0=Configure PHY as Slave */
++#define CR_1000T_MS_ENABLE       0x1000 /* 1=Master/Slave manual config value */
++                                        /* 0=Automatic Master/Slave config */
++#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
++#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
++#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
++#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
++#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
++
++/* 1000BASE-T Status Register */
++#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
++#define SR_1000T_ASYM_PAUSE_DIR   0x0100 /* LP asymmetric pause direction bit */
++#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
++#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
++#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
++#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
++#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local TX is Master, 0=Slave */
++#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
++#define SR_1000T_REMOTE_RX_STATUS_SHIFT 12
++#define SR_1000T_LOCAL_RX_STATUS_SHIFT  13
++#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT    5
++#define FFE_IDLE_ERR_COUNT_TIMEOUT_20            20
++#define FFE_IDLE_ERR_COUNT_TIMEOUT_100           100
++
++/* Extended Status Register */
++#define IEEE_ESR_1000T_HD_CAPS 0x1000 /* 1000T HD capable */
++#define IEEE_ESR_1000T_FD_CAPS 0x2000 /* 1000T FD capable */
++#define IEEE_ESR_1000X_HD_CAPS 0x4000 /* 1000X HD capable */
++#define IEEE_ESR_1000X_FD_CAPS 0x8000 /* 1000X FD capable */
++
++#define PHY_TX_POLARITY_MASK   0x0100 /* register 10h bit 8 (polarity bit) */
++#define PHY_TX_NORMAL_POLARITY 0      /* register 10h bit 8 (normal polarity) */
++
++#define AUTO_POLARITY_DISABLE  0x0010 /* register 11h bit 4 */
++                                      /* (0=enable, 1=disable) */
++
++/* M88E1000 PHY Specific Control Register */
++#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
++#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
++#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
++#define M88E1000_PSCR_CLK125_DISABLE    0x0010 /* 1=CLK125 low, 
++                                                * 0=CLK125 toggling
++                                                */
++#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000  /* MDI Crossover Mode bits 6:5 */
++                                               /* Manual MDI configuration */
++#define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
++#define M88E1000_PSCR_AUTO_X_1000T     0x0040  /* 1000BASE-T: Auto crossover,
++                                                *  100BASE-TX/10BASE-T: 
++                                                *  MDI Mode
++                                                */
++#define M88E1000_PSCR_AUTO_X_MODE      0x0060  /* Auto crossover enabled 
++                                                * all speeds. 
++                                                */
++#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE 0x0080 
++                                        /* 1=Enable Extended 10BASE-T distance
++                                         * (Lower 10BASE-T RX Threshold)
++                                         * 0=Normal 10BASE-T RX Threshold */
++#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
++                                        /* 1=5-Bit interface in 100BASE-TX
++                                         * 0=MII interface in 100BASE-TX */
++#define M88E1000_PSCR_SCRAMBLER_DISABLE    0x0200 /* 1=Scrambler disable */
++#define M88E1000_PSCR_FORCE_LINK_GOOD      0x0400 /* 1=Force link good */
++#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Transmit */
++
++#define M88E1000_PSCR_POLARITY_REVERSAL_SHIFT    1
++#define M88E1000_PSCR_AUTO_X_MODE_SHIFT          5
++#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT 7
++
++/* M88E1000 PHY Specific Status Register */
++#define M88E1000_PSSR_JABBER             0x0001 /* 1=Jabber */
++#define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
++#define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
++#define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
++#define M88E1000_PSSR_CABLE_LENGTH       0x0380 /* 0=<50M;1=50-80M;2=80-110M;
++                                            * 3=110-140M;4=>140M */
++#define M88E1000_PSSR_LINK               0x0400 /* 1=Link up, 0=Link down */
++#define M88E1000_PSSR_SPD_DPLX_RESOLVED  0x0800 /* 1=Speed & Duplex resolved */
++#define M88E1000_PSSR_PAGE_RCVD          0x1000 /* 1=Page received */
++#define M88E1000_PSSR_DPLX               0x2000 /* 1=Duplex 0=Half Duplex */
++#define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
++#define M88E1000_PSSR_10MBS              0x0000 /* 00=10Mbs */
++#define M88E1000_PSSR_100MBS             0x4000 /* 01=100Mbs */
++#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
++
++#define M88E1000_PSSR_REV_POLARITY_SHIFT 1
++#define M88E1000_PSSR_DOWNSHIFT_SHIFT    5
++#define M88E1000_PSSR_MDIX_SHIFT         6
++#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
++
++/* M88E1000 Extended PHY Specific Control Register */
++#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000 /* 1=Fiber loopback */
++#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000 /* 1=Lost lock detect enabled.
++                                              * Will assert lost lock and bring
++                                              * link down if idle not seen
++                                              * within 1ms in 1000BASE-T 
++                                              */
++/* Number of times we will attempt to autonegotiate before downshifting if we
++ * are the master */
++#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
++#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000    
++#define M88E1000_EPSCR_MASTER_DOWNSHIFT_2X   0x0400
++#define M88E1000_EPSCR_MASTER_DOWNSHIFT_3X   0x0800
++#define M88E1000_EPSCR_MASTER_DOWNSHIFT_4X   0x0C00
++/* Number of times we will attempt to autonegotiate before downshifting if we
++ * are the slave */
++#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
++#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_DIS   0x0000
++#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
++#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_2X    0x0200
++#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_3X    0x0300
++#define M88E1000_EPSCR_TX_CLK_2_5     0x0060 /* 2.5 MHz TX_CLK */
++#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
++#define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */
++
++/* IGP01E1000 Specific Port Config Register - R/W */
++#define IGP01E1000_PSCFR_AUTO_MDIX_PAR_DETECT  0x0010
++#define IGP01E1000_PSCFR_PRE_EN                0x0020
++#define IGP01E1000_PSCFR_SMART_SPEED           0x0080
++#define IGP01E1000_PSCFR_DISABLE_TPLOOPBACK    0x0100
++#define IGP01E1000_PSCFR_DISABLE_JABBER        0x0400
++#define IGP01E1000_PSCFR_DISABLE_TRANSMIT      0x2000
++
++/* IGP01E1000 Specific Port Status Register - R/O */
++#define IGP01E1000_PSSR_AUTONEG_FAILED         0x0001 /* RO LH SC */
++#define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
++#define IGP01E1000_PSSR_CABLE_LENGTH           0x007C
++#define IGP01E1000_PSSR_FULL_DUPLEX            0x0200
++#define IGP01E1000_PSSR_LINK_UP                0x0400
++#define IGP01E1000_PSSR_MDIX                   0x0800
++#define IGP01E1000_PSSR_SPEED_MASK             0xC000 /* speed bits mask */
++#define IGP01E1000_PSSR_SPEED_10MBPS           0x4000
++#define IGP01E1000_PSSR_SPEED_100MBPS          0x8000
++#define IGP01E1000_PSSR_SPEED_1000MBPS         0xC000
++#define IGP01E1000_PSSR_CABLE_LENGTH_SHIFT     0x0002 /* shift right 2 */
++#define IGP01E1000_PSSR_MDIX_SHIFT             0x000B /* shift right 11 */
++
++/* IGP01E1000 Specific Port Control Register - R/W */
++#define IGP01E1000_PSCR_TP_LOOPBACK            0x0001
++#define IGP01E1000_PSCR_CORRECT_NC_SCMBLR      0x0200
++#define IGP01E1000_PSCR_TEN_CRS_SELECT         0x0400
++#define IGP01E1000_PSCR_FLIP_CHIP              0x0800
++#define IGP01E1000_PSCR_AUTO_MDIX              0x1000
++#define IGP01E1000_PSCR_FORCE_MDI_MDIX         0x2000 /* 0-MDI, 1-MDIX */
++
++/* IGP01E1000 Specific Port Link Health Register */
++#define IGP01E1000_PLHR_SS_DOWNGRADE           0x8000
++#define IGP01E1000_PLHR_GIG_SCRAMBLER_ERROR    0x4000
++#define IGP01E1000_PLHR_GIG_REM_RCVR_NOK       0x0800 /* LH */
++#define IGP01E1000_PLHR_IDLE_ERROR_CNT_OFLOW   0x0400 /* LH */
++#define IGP01E1000_PLHR_DATA_ERR_1             0x0200 /* LH */
++#define IGP01E1000_PLHR_DATA_ERR_0             0x0100
++#define IGP01E1000_PLHR_AUTONEG_FAULT          0x0010
++#define IGP01E1000_PLHR_AUTONEG_ACTIVE         0x0008
++#define IGP01E1000_PLHR_VALID_CHANNEL_D        0x0004
++#define IGP01E1000_PLHR_VALID_CHANNEL_C        0x0002
++#define IGP01E1000_PLHR_VALID_CHANNEL_B        0x0001
++#define IGP01E1000_PLHR_VALID_CHANNEL_A        0x0000
++
++/* IGP01E1000 Channel Quality Register */
++#define IGP01E1000_MSE_CHANNEL_D        0x000F
++#define IGP01E1000_MSE_CHANNEL_C        0x00F0
++#define IGP01E1000_MSE_CHANNEL_B        0x0F00
++#define IGP01E1000_MSE_CHANNEL_A        0xF000
++
++/* IGP01E1000 DSP reset macros */
++#define DSP_RESET_ENABLE     0x0
++#define DSP_RESET_DISABLE    0x2
++#define E1000_MAX_DSP_RESETS 10
++
++/* IGP01E1000 AGC Registers */
++
++#define IGP01E1000_AGC_LENGTH_SHIFT 7         /* Coarse - 13:11, Fine - 10:7 */
++
++/* 7 bits (3 Coarse + 4 Fine) --> 128 optional values */
++#define IGP01E1000_AGC_LENGTH_TABLE_SIZE 128
++
++/* The precision of the length is +/- 10 meters */
++#define IGP01E1000_AGC_RANGE    10
++
++/* IGP01E1000 PCS Initialization register */
++/* bits 3:6 in the PCS registers stores the channels polarity */
++#define IGP01E1000_PHY_POLARITY_MASK    0x0078
++
++/* IGP01E1000 GMII FIFO Register */
++#define IGP01E1000_GMII_FLEX_SPD               0x10 /* Enable flexible speed
++                                                     * on Link-Up */
++#define IGP01E1000_GMII_SPD                    0x20 /* Enable SPD */
++
++/* IGP01E1000 Analog Register */
++#define IGP01E1000_ANALOG_SPARE_FUSE_STATUS         0x20D1
++#define IGP01E1000_ANALOG_FUSE_STATUS               0x20D0
++#define IGP01E1000_ANALOG_FUSE_CONTROL              0x20DC
++#define IGP01E1000_ANALOG_FUSE_BYPASS               0x20DE
++
++#define IGP01E1000_ANALOG_FUSE_POLY_MASK            0xF000
++#define IGP01E1000_ANALOG_FUSE_FINE_MASK            0x0F80
++#define IGP01E1000_ANALOG_FUSE_COARSE_MASK          0x0070
++#define IGP01E1000_ANALOG_SPARE_FUSE_ENABLED        0x0100
++#define IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL    0x0002
++
++#define IGP01E1000_ANALOG_FUSE_COARSE_THRESH        0x0040
++#define IGP01E1000_ANALOG_FUSE_COARSE_10            0x0010
++#define IGP01E1000_ANALOG_FUSE_FINE_1               0x0080
++#define IGP01E1000_ANALOG_FUSE_FINE_10              0x0500
++
++/* Bit definitions for valid PHY IDs. */
++#define M88E1000_E_PHY_ID  0x01410C50
++#define M88E1000_I_PHY_ID  0x01410C30
++#define M88E1011_I_PHY_ID  0x01410C20
++#define IGP01E1000_I_PHY_ID  0x02A80380
++#define M88E1000_12_PHY_ID M88E1000_E_PHY_ID
++#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
++#define M88E1011_I_REV_4   0x04
++
++/* Miscellaneous PHY bit definitions. */
++#define PHY_PREAMBLE        0xFFFFFFFF
++#define PHY_SOF             0x01
++#define PHY_OP_READ         0x02
++#define PHY_OP_WRITE        0x01
++#define PHY_TURNAROUND      0x02
++#define PHY_PREAMBLE_SIZE   32
++#define MII_CR_SPEED_1000   0x0040
++#define MII_CR_SPEED_100    0x2000
++#define MII_CR_SPEED_10     0x0000
++#define E1000_PHY_ADDRESS   0x01
++#define PHY_AUTO_NEG_TIME   45  /* 4.5 Seconds */
++#define PHY_FORCE_TIME      20  /* 2.0 Seconds */
++#define PHY_REVISION_MASK   0xFFFFFFF0
++#define DEVICE_SPEED_MASK   0x00000300  /* Device Ctrl Reg Speed Mask */
++#define REG4_SPEED_MASK     0x01E0
++#define REG9_SPEED_MASK     0x0300
++#define ADVERTISE_10_HALF   0x0001
++#define ADVERTISE_10_FULL   0x0002
++#define ADVERTISE_100_HALF  0x0004
++#define ADVERTISE_100_FULL  0x0008
++#define ADVERTISE_1000_HALF 0x0010
++#define ADVERTISE_1000_FULL 0x0020
++#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F  /* Everything but 1000-Half */
++#define AUTONEG_ADVERTISE_10_100_ALL    0x000F	/* All 10/100 speeds*/
++#define AUTONEG_ADVERTISE_10_ALL        0x0003	/* 10Mbps Full & Half speeds*/
++
++#endif /* _E1000_HW_H_ */
+diff -Naur grub-0.97.orig/netboot/eepro.c grub-0.97/netboot/eepro.c
+--- grub-0.97.orig/netboot/eepro.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/eepro.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,586 +0,0 @@
+-/**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-Intel EEPRO/10 NIC driver for Etherboot
+-Adapted from Linux eepro.c from kernel 2.2.17
+-
+-This board accepts a 32 pin EEPROM (29C256), however a test with a
+-27C010 shows that this EPROM also works in the socket, but it's not clear
+-how repeatably. The two top address pins appear to be held low, thus
+-the bottom 32kB of the 27C010 is visible in the CPU's address space.
+-To be sure you could put 4 copies of the code in the 27C010, then
+-it doesn't matter whether the extra lines are held low or high, just
+-hopefully not floating as CMOS chips don't like floating inputs.
+-
+-Be careful with seating the EPROM as the socket on my board actually
+-has 34 pins, the top row of 2 are not used.
+-***************************************************************************/
+-
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+-/* to get some global routines like printf */
+-#include "etherboot.h"
+-/* to get the interface to the body of the program */
+-#include "nic.h"
+-/* to get our own prototype */
+-#include "cards.h"
+-/* we use timer2 for microsecond waits */
+-#include "timer.h"
+-
+-#undef	DEBUG		/* only after include files */
+-
+-/* Different 82595 chips */
+-#define LAN595		0
+-#define LAN595TX	1
+-#define LAN595FX	2
+-#define LAN595FX_10ISA	3
+-
+-#define	SLOW_DOWN	inb(0x80);
+-
+-/* The station (ethernet) address prefix, used for IDing the board. */
+-#define SA_ADDR0 0x00	/* Etherexpress Pro/10 */
+-#define SA_ADDR1 0xaa
+-#define SA_ADDR2 0x00
+-
+-#define GetBit(x,y) ((x & (1<<y))>>y)
+-
+-/* EEPROM Word 0: */
+-#define ee_PnP       0  /* Plug 'n Play enable bit */
+-#define ee_Word1     1  /* Word 1? */
+-#define ee_BusWidth  2  /* 8/16 bit */
+-#define ee_FlashAddr 3  /* Flash Address */
+-#define ee_FlashMask 0x7   /* Mask */
+-#define ee_AutoIO    6  /* */
+-#define ee_reserved0 7  /* =0! */
+-#define ee_Flash     8  /* Flash there? */
+-#define ee_AutoNeg   9  /* Auto Negotiation enabled? */
+-#define ee_IO0       10 /* IO Address LSB */
+-#define ee_IO0Mask   0x /*...*/
+-#define ee_IO1       15 /* IO MSB */
+-
+-/* EEPROM Word 1: */
+-#define ee_IntSel    0   /* Interrupt */
+-#define ee_IntMask   0x7
+-#define ee_LI        3   /* Link Integrity 0= enabled */
+-#define ee_PC        4   /* Polarity Correction 0= enabled */
+-#define ee_TPE_AUI   5   /* PortSelection 1=TPE */
+-#define ee_Jabber    6   /* Jabber prevention 0= enabled */
+-#define ee_AutoPort  7   /* Auto Port Selection 1= Disabled */
+-#define ee_SMOUT     8   /* SMout Pin Control 0= Input */
+-#define ee_PROM      9   /* Flash EPROM / PROM 0=Flash */
+-#define ee_reserved1 10  /* .. 12 =0! */
+-#define ee_AltReady  13  /* Alternate Ready, 0=normal */
+-#define ee_reserved2 14  /* =0! */
+-#define ee_Duplex    15
+-
+-/* Word2,3,4: */
+-#define ee_IA5       0 /*bit start for individual Addr Byte 5 */
+-#define ee_IA4       8 /*bit start for individual Addr Byte 5 */
+-#define ee_IA3       0 /*bit start for individual Addr Byte 5 */
+-#define ee_IA2       8 /*bit start for individual Addr Byte 5 */
+-#define ee_IA1       0 /*bit start for individual Addr Byte 5 */
+-#define ee_IA0       8 /*bit start for individual Addr Byte 5 */
+-
+-/* Word 5: */
+-#define ee_BNC_TPE   0 /* 0=TPE */
+-#define ee_BootType  1 /* 00=None, 01=IPX, 10=ODI, 11=NDIS */
+-#define ee_BootTypeMask 0x3 
+-#define ee_NumConn   3  /* Number of Connections 0= One or Two */
+-#define ee_FlashSock 4  /* Presence of Flash Socket 0= Present */
+-#define ee_PortTPE   5
+-#define ee_PortBNC   6
+-#define ee_PortAUI   7
+-#define ee_PowerMgt  10 /* 0= disabled */
+-#define ee_CP        13 /* Concurrent Processing */
+-#define ee_CPMask    0x7
+-
+-/* Word 6: */
+-#define ee_Stepping  0 /* Stepping info */
+-#define ee_StepMask  0x0F
+-#define ee_BoardID   4 /* Manucaturer Board ID, reserved */
+-#define ee_BoardMask 0x0FFF
+-
+-/* Word 7: */
+-#define ee_INT_TO_IRQ 0 /* int to IRQ Mapping  = 0x1EB8 for Pro/10+ */
+-#define ee_FX_INT2IRQ 0x1EB8 /* the _only_ mapping allowed for FX chips */
+-
+-/*..*/
+-#define ee_SIZE 0x40 /* total EEprom Size */
+-#define ee_Checksum 0xBABA /* initial and final value for adding checksum */
+-
+-
+-/* Card identification via EEprom:   */
+-#define ee_addr_vendor 0x10  /* Word offset for EISA Vendor ID */
+-#define ee_addr_id 0x11      /* Word offset for Card ID */
+-#define ee_addr_SN 0x12      /* Serial Number */
+-#define ee_addr_CRC_8 0x14   /* CRC over last thee Bytes */
+-
+-
+-#define ee_vendor_intel0 0x25  /* Vendor ID Intel */
+-#define ee_vendor_intel1 0xD4
+-#define ee_id_eepro10p0 0x10   /* ID for eepro/10+ */
+-#define ee_id_eepro10p1 0x31
+-
+-/* now this section could be used by both boards: the oldies and the ee10:
+- * ee10 uses tx buffer before of rx buffer and the oldies the inverse.
+- * (aris)
+- */
+-#define	RAM_SIZE	0x8000
+-
+-#define	RCV_HEADER	8
+-#define RCV_DEFAULT_RAM	0x6000
+-#define RCV_RAM 	rcv_ram
+-
+-static unsigned rcv_ram = RCV_DEFAULT_RAM;
+-
+-#define XMT_HEADER	8
+-#define XMT_RAM		(RAM_SIZE - RCV_RAM)
+-
+-#define XMT_START	((rcv_start + RCV_RAM) % RAM_SIZE)
+-
+-#define RCV_LOWER_LIMIT	(rcv_start >> 8)
+-#define RCV_UPPER_LIMIT	(((rcv_start + RCV_RAM) - 2) >> 8)
+-#define XMT_LOWER_LIMIT	(XMT_START >> 8)
+-#define XMT_UPPER_LIMIT	(((XMT_START + XMT_RAM) - 2) >> 8)
+-
+-#define RCV_START_PRO	0x00
+-#define RCV_START_10	XMT_RAM
+-					/* by default the old driver */
+-static unsigned rcv_start = RCV_START_PRO;
+-
+-#define	RCV_DONE	0x0008
+-#define	RX_OK		0x2000
+-#define	RX_ERROR	0x0d81
+-
+-#define	TX_DONE_BIT	0x0080
+-#define	CHAIN_BIT	0x8000
+-#define	XMT_STATUS	0x02
+-#define	XMT_CHAIN	0x04
+-#define	XMT_COUNT	0x06
+-
+-#define	BANK0_SELECT	0x00		
+-#define	BANK1_SELECT	0x40		
+-#define	BANK2_SELECT	0x80		
+-
+-/* Bank 0 registers */
+-#define	COMMAND_REG	0x00	/* Register 0 */
+-#define	MC_SETUP	0x03
+-#define	XMT_CMD		0x04
+-#define	DIAGNOSE_CMD	0x07
+-#define	RCV_ENABLE_CMD	0x08
+-#define	RCV_DISABLE_CMD	0x0a
+-#define	STOP_RCV_CMD	0x0b
+-#define	RESET_CMD	0x0e
+-#define	POWER_DOWN_CMD	0x18
+-#define	RESUME_XMT_CMD	0x1c
+-#define	SEL_RESET_CMD	0x1e
+-#define	STATUS_REG	0x01	/* Register 1 */
+-#define	RX_INT		0x02
+-#define	TX_INT		0x04
+-#define	EXEC_STATUS	0x30
+-#define	ID_REG		0x02	/* Register 2	*/
+-#define	R_ROBIN_BITS	0xc0	/* round robin counter */
+-#define	ID_REG_MASK	0x2c
+-#define	ID_REG_SIG	0x24
+-#define	AUTO_ENABLE	0x10
+-#define	INT_MASK_REG	0x03	/* Register 3	*/
+-#define	RX_STOP_MASK	0x01
+-#define	RX_MASK		0x02
+-#define	TX_MASK		0x04
+-#define	EXEC_MASK	0x08
+-#define	ALL_MASK	0x0f
+-#define	IO_32_BIT	0x10
+-#define	RCV_BAR		0x04	/* The following are word (16-bit) registers */
+-#define	RCV_STOP	0x06
+-
+-#define	XMT_BAR_PRO	0x0a
+-#define	XMT_BAR_10	0x0b
+-static unsigned xmt_bar = XMT_BAR_PRO;
+-
+-#define	HOST_ADDRESS_REG	0x0c
+-#define	IO_PORT		0x0e
+-#define	IO_PORT_32_BIT	0x0c
+-
+-/* Bank 1 registers */
+-#define	REG1	0x01
+-#define	WORD_WIDTH	0x02
+-#define	INT_ENABLE	0x80
+-#define INT_NO_REG	0x02
+-#define	RCV_LOWER_LIMIT_REG	0x08
+-#define	RCV_UPPER_LIMIT_REG	0x09
+-
+-#define	XMT_LOWER_LIMIT_REG_PRO	0x0a
+-#define	XMT_UPPER_LIMIT_REG_PRO	0x0b
+-#define	XMT_LOWER_LIMIT_REG_10	0x0b
+-#define	XMT_UPPER_LIMIT_REG_10	0x0a
+-static unsigned xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_PRO;
+-static unsigned xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_PRO;
+-
+-/* Bank 2 registers */
+-#define	XMT_Chain_Int	0x20	/* Interrupt at the end of the transmit chain */
+-#define	XMT_Chain_ErrStop	0x40 /* Interrupt at the end of the chain even if there are errors */
+-#define	RCV_Discard_BadFrame	0x80 /* Throw bad frames away, and continue to receive others */
+-#define	REG2		0x02
+-#define	PRMSC_Mode	0x01
+-#define	Multi_IA	0x20
+-#define	REG3		0x03
+-#define	TPE_BIT		0x04
+-#define	BNC_BIT		0x20
+-#define	REG13		0x0d
+-#define	FDX		0x00
+-#define	A_N_ENABLE	0x02
+-	
+-#define	I_ADD_REG0	0x04
+-#define	I_ADD_REG1	0x05
+-#define	I_ADD_REG2	0x06
+-#define	I_ADD_REG3	0x07
+-#define	I_ADD_REG4	0x08
+-#define	I_ADD_REG5	0x09
+-
+-#define EEPROM_REG_PRO	0x0a
+-#define EEPROM_REG_10	0x0b
+-static unsigned eeprom_reg = EEPROM_REG_PRO;
+-
+-#define EESK 0x01
+-#define EECS 0x02
+-#define EEDI 0x04
+-#define EEDO 0x08
+-
+-/* The horrible routine to read a word from the serial EEPROM. */
+-/* IMPORTANT - the 82595 will be set to Bank 0 after the eeprom is read */
+-
+-/* The delay between EEPROM clock transitions. */
+-#define eeprom_delay() { udelay(40); }
+-#define EE_READ_CMD (6 << 6)
+-
+-/* do a full reset */
+-#define eepro_full_reset(ioaddr)	outb(RESET_CMD, ioaddr); udelay(40);
+-
+-/* do a nice reset */
+-#define eepro_sel_reset(ioaddr) 	{ \
+-					outb(SEL_RESET_CMD, ioaddr); \
+-					SLOW_DOWN; \
+-					SLOW_DOWN; \
+-					}
+-
+-/* clear all interrupts */
+-#define	eepro_clear_int(ioaddr)	outb(ALL_MASK, ioaddr + STATUS_REG)
+-
+-/* enable rx */
+-#define	eepro_en_rx(ioaddr)	outb(RCV_ENABLE_CMD, ioaddr)
+-
+-/* disable rx */
+-#define	eepro_dis_rx(ioaddr)	outb(RCV_DISABLE_CMD, ioaddr)
+-
+-/* switch bank */
+-#define eepro_sw2bank0(ioaddr) outb(BANK0_SELECT, ioaddr)
+-#define eepro_sw2bank1(ioaddr) outb(BANK1_SELECT, ioaddr)
+-#define eepro_sw2bank2(ioaddr) outb(BANK2_SELECT, ioaddr)
+-
+-static unsigned int	rx_start, tx_start;
+-static int		tx_last;
+-static unsigned		tx_end;
+-static int		eepro = 0;
+-static unsigned short	ioaddr = 0;
+-static unsigned int	mem_start, mem_end = RCV_DEFAULT_RAM / 1024;
+-
+-#define	udelay(n)	waiton_timer2(((n)*TICKS_PER_MS)/1000)
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void eepro_reset(struct nic *nic)
+-{
+-	int		temp_reg, i;
+-
+-	/* put the card in its initial state */
+-	eepro_sw2bank2(ioaddr);	/* be careful, bank2 now */
+-	temp_reg = inb(ioaddr + eeprom_reg);
+-#ifdef	DEBUG
+-	printf("Stepping %d\n", temp_reg >> 5);
+-#endif
+-	if (temp_reg & 0x10)	/* check the TurnOff Enable bit */
+-		outb(temp_reg & 0xEF, ioaddr + eeprom_reg);
+-	for (i = 0; i < ETH_ALEN; i++)	/* fill the MAC address */
+-		outb(nic->node_addr[i], ioaddr + I_ADD_REG0 + i);
+-	temp_reg = inb(ioaddr + REG1);
+-	/* setup Transmit Chaining and discard bad RCV frames */
+-	outb(temp_reg | XMT_Chain_Int | XMT_Chain_ErrStop
+-		| RCV_Discard_BadFrame, ioaddr + REG1);
+-	temp_reg = inb(ioaddr + REG2);		/* match broadcast */
+-	outb(temp_reg | 0x14, ioaddr + REG2);
+-	temp_reg = inb(ioaddr + REG3);
+-	outb(temp_reg & 0x3F, ioaddr + REG3);	/* clear test mode */
+-	/* set the receiving mode */
+-	eepro_sw2bank1(ioaddr);	/* be careful, bank1 now */
+-	/* initialise the RCV and XMT upper and lower limits */
+-	outb(RCV_LOWER_LIMIT, ioaddr + RCV_LOWER_LIMIT_REG);
+-	outb(RCV_UPPER_LIMIT, ioaddr + RCV_UPPER_LIMIT_REG);
+-	outb(XMT_LOWER_LIMIT, ioaddr + xmt_lower_limit_reg);
+-	outb(XMT_UPPER_LIMIT, ioaddr + xmt_upper_limit_reg);
+-	eepro_sw2bank0(ioaddr);	/* Switch back to bank 0 */
+-	eepro_clear_int(ioaddr);
+-	/* Initialise RCV */
+-	outw(rx_start = (RCV_LOWER_LIMIT << 8), ioaddr + RCV_BAR);
+-	outw(((RCV_UPPER_LIMIT << 8) | 0xFE), ioaddr + RCV_STOP);
+-	/* Intialise XMT */
+-	outw((XMT_LOWER_LIMIT << 8), ioaddr + xmt_bar);
+-	eepro_sel_reset(ioaddr);
+-	tx_start = tx_end = (XMT_LOWER_LIMIT << 8);
+-	tx_last = 0;
+-	eepro_en_rx(ioaddr);
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int eepro_poll(struct nic *nic)
+-{
+-	int		i;
+-	unsigned int	rcv_car = rx_start;
+-	unsigned int	rcv_event, rcv_status, rcv_next_frame, rcv_size;
+-
+-	/* return true if there's an ethernet packet ready to read */
+-	/* nic->packet should contain data on return */
+-	/* nic->packetlen should contain length of data */
+-#if	0
+-	if ((inb(ioaddr + STATUS_REG) & 0x40) == 0)
+-		return (0);
+-	outb(0x40, ioaddr + STATUS_REG);
+-#endif
+-	outw(rcv_car, ioaddr + HOST_ADDRESS_REG);
+-	rcv_event = inw(ioaddr + IO_PORT);
+-	if (rcv_event != RCV_DONE)
+-		return (0);
+-	rcv_status = inw(ioaddr + IO_PORT);
+-	rcv_next_frame = inw(ioaddr + IO_PORT);
+-	rcv_size = inw(ioaddr + IO_PORT);
+-#if	0
+-	printf("%hX %hX %d %hhX\n", rcv_status, rcv_next_frame, rcv_size,
+-		inb(ioaddr + STATUS_REG));
+-#endif
+-	if ((rcv_status & (RX_OK|RX_ERROR)) != RX_OK) {
+-		printf("Receive error %hX\n", rcv_status);
+-		return (0);
+-	}
+-	rcv_size &= 0x3FFF;
+-	insw(ioaddr + IO_PORT, nic->packet, ((rcv_size + 3) >> 1));
+-#if	0
+-	for (i = 0; i < 48; i++) {
+-		printf("%hhX", nic->packet[i]);
+-		putchar(i % 16 == 15 ? '\n' : ' ');
+-	}
+-#endif
+-	nic->packetlen = rcv_size;
+-	rcv_car = rx_start + RCV_HEADER + rcv_size;
+-	rx_start = rcv_next_frame;
+-	if (rcv_car == 0)
+-		rcv_car = ((RCV_UPPER_LIMIT << 8) | 0xff);
+-	outw(rcv_car - 1, ioaddr + RCV_STOP);
+-	return (1);
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void eepro_transmit(
+-	struct nic *nic,
+-	const char *d,			/* Destination */
+-	unsigned int t,			/* Type */
+-	unsigned int s,			/* size */
+-	const char *p)			/* Packet */
+-{
+-	unsigned int	status, tx_available, last, end, length;
+-	unsigned short	type;
+-	int		boguscount = 20;
+-
+-	length = s + ETH_HLEN;
+-	if (tx_end > tx_start)
+-		tx_available = XMT_RAM - (tx_end - tx_start);
+-	else if (tx_end < tx_start)
+-		tx_available = tx_start - tx_end;
+-	else
+-		tx_available = XMT_RAM;
+-	last = tx_end;
+-	end = last + (((length + 3) >> 1) << 1) + XMT_HEADER;
+-	if (end >= (XMT_UPPER_LIMIT << 8)) {
+-		last = (XMT_LOWER_LIMIT << 8);
+-		end = last + (((length + 3) >> 1) << 1) + XMT_HEADER;
+-	}
+-	outw(last, ioaddr + HOST_ADDRESS_REG);
+-	outw(XMT_CMD, ioaddr + IO_PORT);
+-	outw(0, ioaddr + IO_PORT);
+-	outw(end, ioaddr + IO_PORT);
+-	outw(length, ioaddr + IO_PORT);
+-	outsw(ioaddr + IO_PORT, d, ETH_ALEN / 2);
+-	outsw(ioaddr + IO_PORT, nic->node_addr, ETH_ALEN / 2);
+-	type = htons(t);
+-	outsw(ioaddr + IO_PORT, &type, sizeof(type) / 2);
+-	outsw(ioaddr + IO_PORT, p, (s + 3) >> 1);
+-	/* A dummy read to flush the DRAM write pipeline */
+-	status = inw(ioaddr + IO_PORT);
+-	outw(last, ioaddr + xmt_bar);
+-	outb(XMT_CMD, ioaddr);
+-	tx_start = last;
+-	tx_last = last;
+-	tx_end = end;
+-#if	0
+-	printf("%d %d\n", tx_start, tx_end);
+-#endif
+-	while (boguscount > 0) {
+-		if (((status = inw(ioaddr + IO_PORT)) & TX_DONE_BIT) == 0) {
+-			udelay(40);
+-			boguscount--;
+-			continue;
+-		}
+-#if	DEBUG
+-		if ((status & 0x2000) == 0)
+-			printf("Transmit status %hX\n", status);
+-#endif
+-	}
+-}
+-
+-/**************************************************************************
+-DISABLE - Turn off ethernet interface
+-***************************************************************************/
+-static void eepro_disable(struct nic *nic)
+-{
+-	eepro_sw2bank0(ioaddr);	/* Switch to bank 0 */
+-	/* Flush the Tx and disable Rx */
+-	outb(STOP_RCV_CMD, ioaddr);
+-	tx_start = tx_end = (XMT_LOWER_LIMIT << 8);
+-	tx_last = 0;
+-	/* Reset the 82595 */
+-	eepro_full_reset(ioaddr);
+-}
+-
+-static int read_eeprom(int location)
+-{
+-	int		i;
+-	unsigned short	retval = 0;
+-	int		ee_addr = ioaddr + eeprom_reg;
+-	int		read_cmd = location | EE_READ_CMD;
+-	int		ctrl_val = EECS;
+-
+-	if (eepro == LAN595FX_10ISA) {
+-		eepro_sw2bank1(ioaddr);
+-		outb(0x00, ioaddr + STATUS_REG);
+-	}
+-	eepro_sw2bank2(ioaddr);
+-	outb(ctrl_val, ee_addr);
+-	/* shift the read command bits out */
+-	for (i = 8; i >= 0; i--) {
+-		short outval = (read_cmd & (1 << i)) ? ctrl_val | EEDI : ctrl_val;
+-		outb(outval, ee_addr);
+-		outb(outval | EESK, ee_addr);	/* EEPROM clock tick */
+-		eeprom_delay();
+-		outb(outval, ee_addr);		/* finish EEPROM clock tick */
+-		eeprom_delay();
+-	}
+-	outb(ctrl_val, ee_addr);
+-	for (i = 16; i > 0; i--) {
+-		outb(ctrl_val | EESK, ee_addr);
+-		eeprom_delay();
+-		retval = (retval << 1) | ((inb(ee_addr) & EEDO) ? 1 : 0);
+-		outb(ctrl_val, ee_addr);
+-		eeprom_delay();
+-	}
+-	/* terminate the EEPROM access */
+-	ctrl_val &= ~EECS;
+-	outb(ctrl_val | EESK, ee_addr);
+-	eeprom_delay();
+-	outb(ctrl_val, ee_addr);
+-	eeprom_delay();
+-	eepro_sw2bank0(ioaddr);
+-	return (retval);
+-}
+-
+-static int eepro_probe1(struct nic *nic)
+-{
+-	int		i, id, counter, l_eepro = 0;
+-	union {
+-		unsigned char	caddr[ETH_ALEN];
+-		unsigned short	saddr[ETH_ALEN/2];
+-	} station_addr;
+-	char		*name;
+-
+-	id = inb(ioaddr + ID_REG);
+-	if ((id & ID_REG_MASK) != ID_REG_SIG)
+-		return (0);
+-	counter = id & R_ROBIN_BITS;
+-	if (((id = inb(ioaddr + ID_REG)) & R_ROBIN_BITS) != (counter + 0x40))
+-		return (0);
+-	/* yes the 82595 has been found */
+-	station_addr.saddr[2] = read_eeprom(2);
+-	if (station_addr.saddr[2] == 0x0000 || station_addr.saddr[2] == 0xFFFF) {
+-		l_eepro = 3;
+-		eepro = LAN595FX_10ISA;
+-		eeprom_reg= EEPROM_REG_10;
+-		rcv_start = RCV_START_10;
+-		xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_10;
+-		xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_10;
+-		station_addr.saddr[2] = read_eeprom(2);
+-	}
+-	station_addr.saddr[1] = read_eeprom(3);
+-	station_addr.saddr[0] = read_eeprom(4);
+-	if (l_eepro)
+-		name = "Intel EtherExpress 10 ISA";
+-	else if (read_eeprom(7) == ee_FX_INT2IRQ) {
+-		name = "Intel EtherExpress Pro/10+ ISA";
+-		l_eepro = 2;
+-	} else if (station_addr.saddr[0] == SA_ADDR1) {
+-		name = "Intel EtherExpress Pro/10 ISA";
+-		l_eepro = 1;
+-	} else {
+-		l_eepro = 0;
+-		name = "Intel 82595-based LAN card";
+-	}
+-	station_addr.saddr[0] = swap16(station_addr.saddr[0]);
+-	station_addr.saddr[1] = swap16(station_addr.saddr[1]);
+-	station_addr.saddr[2] = swap16(station_addr.saddr[2]);
+-	for (i = 0; i < ETH_ALEN; i++) {
+-		nic->node_addr[i] = station_addr.caddr[i];
+-	}
+-	printf("\n%s ioaddr %#hX, addr %!", name, ioaddr, nic->node_addr);
+-	mem_start = RCV_LOWER_LIMIT << 8;
+-	if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29)
+-		mem_end = RCV_UPPER_LIMIT << 8;
+-	else {
+-		mem_end = mem_end * 1024 + (RCV_LOWER_LIMIT << 8);
+-		rcv_ram = mem_end - (RCV_LOWER_LIMIT << 8);
+-	}
+-	printf(", Rx mem %dK, if %s\n", (mem_end - mem_start) >> 10,
+-		GetBit(read_eeprom(5), ee_BNC_TPE) ? "BNC" : "TP");
+-	return (1);
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-struct nic *eepro_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	unsigned short		*p;
+-	/* same probe list as the Linux driver */
+-	static unsigned short	ioaddrs[] = {
+-		0x300, 0x210, 0x240, 0x280, 0x2C0, 0x200, 0x320, 0x340, 0x360, 0};
+-
+-	if (probe_addrs == 0 || probe_addrs[0] == 0)
+-		probe_addrs = ioaddrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; p++) {
+-		if (eepro_probe1(nic))
+-			break;
+-	}
+-	if (*p == 0)
+-		return (0);
+-	eepro_reset(nic);
+-	/* point to NIC specific routines */
+-	nic->reset = eepro_reset;
+-	nic->poll = eepro_poll;
+-	nic->transmit = eepro_transmit;
+-	nic->disable = eepro_disable;
+-	return (nic);
+-}
+diff -Naur grub-0.97.orig/netboot/eepro100.c grub-0.97/netboot/eepro100.c
+--- grub-0.97.orig/netboot/eepro100.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/eepro100.c	2005-08-31 19:03:35.000000000 +0000
+@@ -80,8 +80,8 @@
+  *
+  * Caveats:
+  *
+- * The etherboot framework moves the code to the 32k segment from
+- * 0x98000 to 0xa0000. There is just a little room between the end of
++ * The Etherboot framework moves the code to the 48k segment from
++ * 0x94000 to 0xa0000. There is just a little room between the end of
+  * this driver and the 0xa0000 address. If you compile in too many
+  * features, this will overflow.
+  * The number under "hex" in the output of size that scrolls by while
+@@ -92,17 +92,13 @@
+ /* The etherboot authors seem to dislike the argument ordering in
+  * outb macros that Linux uses. I disklike the confusion that this
+  * has caused even more.... This file uses the Linux argument ordering.  */
+-/* Sorry not us. It's inherted code from FreeBSD. [The authors] */
++/* Sorry not us. It's inherited code from FreeBSD. [The authors] */
+ 
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ #include "timer.h"
+ 
+-#undef	virt_to_bus
+-#define	virt_to_bus(x)	((unsigned long)x)
+-
+ static int ioaddr;
+ 
+ typedef unsigned char  u8;
+@@ -121,6 +117,18 @@
+   SCBEarlyRx = 20,                /* Early receive byte count. */
+ };
+ 
++enum SCBCmdBits {
++	SCBMaskCmdDone=0x8000, SCBMaskRxDone=0x4000, SCBMaskCmdIdle=0x2000,
++	SCBMaskRxSuspend=0x1000, SCBMaskEarlyRx=0x0800, SCBMaskFlowCtl=0x0400,
++	SCBTriggerIntr=0x0200, SCBMaskAll=0x0100,
++	/* The rest are Rx and Tx commands. */
++	CUStart=0x0010, CUResume=0x0020, CUStatsAddr=0x0040, CUShowStats=0x0050,
++	CUCmdBase=0x0060,	/* CU Base address (set to zero) . */
++	CUDumpStats=0x0070, /* Dump then reset stats counters. */
++	RxStart=0x0001, RxResume=0x0002, RxAbort=0x0004, RxAddrLoad=0x0006,
++	RxResumeNoResources=0x0007,
++};
++
+ static int do_eeprom_cmd(int cmd, int cmd_len);
+ void hd(void *where, int n);
+ 
+@@ -139,8 +147,6 @@
+ #define EE_WRITE_1      0x4806
+ #define EE_ENB          (0x4800 | EE_CS)
+ 
+-#define udelay(n)       waiton_timer2(((n)*TICKS_PER_MS)/1000)
+-
+ /* The EEPROM commands include the alway-set leading bit. */
+ #define EE_READ_CMD     6
+ 
+@@ -184,9 +190,18 @@
+    Typically this takes 0 ticks. */
+ static inline void wait_for_cmd_done(int cmd_ioaddr)
+ {
+-  short wait = 100;
+-  do   ;
+-  while(inb(cmd_ioaddr) && --wait >= 0);
++  int wait = 0;
++  int delayed_cmd;
++
++  do
++    if (inb(cmd_ioaddr) == 0) return;
++  while(++wait <= 100);
++  delayed_cmd = inb(cmd_ioaddr);
++  do
++    if (inb(cmd_ioaddr) == 0) break;
++  while(++wait <= 10000);
++  printf("Command %2.2x was not immediately accepted, %d ticks!\n",
++      delayed_cmd, wait);
+ }
+ 
+ /* Elements of the dump_statistics block. This block must be lword aligned. */
+@@ -212,35 +227,30 @@
+ 
+ /* A speedo3 TX buffer descriptor with two buffers... */
+ static struct TxFD {
+-  volatile s16 status;
+-  s16 command;
+-  u32 link;          /* void * */
+-  u32 tx_desc_addr;  /* (almost) Always points to the tx_buf_addr element. */
+-  s32 count;         /* # of TBD (=2), Tx start thresh., etc. */
+-                     /* This constitutes two "TBD" entries: hdr and data */
+-  u32 tx_buf_addr0;  /* void *, header of frame to be transmitted.  */
+-  s32 tx_buf_size0;  /* Length of Tx hdr. */
+-  u32 tx_buf_addr1;  /* void *, data to be transmitted.  */
+-  s32 tx_buf_size1;  /* Length of Tx data. */
++	volatile s16 status;
++	s16 command;
++	u32 link;          /* void * */
++	u32 tx_desc_addr;  /* (almost) Always points to the tx_buf_addr element. */
++	s32 count;         /* # of TBD (=2), Tx start thresh., etc. */
++	/* This constitutes two "TBD" entries: hdr and data */
++	u32 tx_buf_addr0;  /* void *, header of frame to be transmitted.  */
++	s32 tx_buf_size0;  /* Length of Tx hdr. */
++	u32 tx_buf_addr1;  /* void *, data to be transmitted.  */
++	s32 tx_buf_size1;  /* Length of Tx data. */
+ } txfd;
+ 
+ struct RxFD {               /* Receive frame descriptor. */
+-  volatile s16 status;
+-  s16 command;
+-  u32 link;                 /* struct RxFD * */
+-  u32 rx_buf_addr;          /* void * */
+-  u16 count;
+-  u16 size;
+-  char packet[1518];
++	volatile s16 status;
++	s16 command;
++	u32 link;                 /* struct RxFD * */
++	u32 rx_buf_addr;          /* void * */
++	u16 count;
++	u16 size;
++	char packet[1518];
+ };
+ 
+-#ifdef	USE_LOWMEM_BUFFER
+-#define rxfd ((struct RxFD *)(0x10000 - sizeof(struct RxFD)))
+-#define ACCESS(x) x->
+-#else
+ static struct RxFD rxfd;
+ #define ACCESS(x) x.
+-#endif
+ 
+ static int congenb = 0;         /* Enable congestion control in the DP83840. */
+ static int txfifo = 8;          /* Tx FIFO threshold in 4 byte units, 0-15 */
+@@ -256,8 +266,7 @@
+   u32 link;
+   unsigned char data[22];
+ } confcmd = {
+-  0, CmdConfigure,
+-  (u32) & txfd,
++  0, 0, 0, /* filled in later */
+   {22, 0x08, 0, 0,  0, 0x80, 0x32, 0x03,  1, /* 1=Use MII  0=Use AUI */
+    0, 0x2E, 0,  0x60, 0,
+    0xf2, 0x48,   0, 0x40, 0xf2, 0x80,        /* 0x40=Force full-duplex */
+@@ -276,19 +285,20 @@
+ 
+ static int mdio_write(int phy_id, int location, int value)
+ {
+-  int val, boguscnt = 64*4;         /* <64 usec. to complete, typ 27 ticks */
++	int val, boguscnt = 64*4;         /* <64 usec. to complete, typ 27 ticks */
+ 
+-  outl(0x04000000 | (location<<16) | (phy_id<<21) | value,
+-       ioaddr + SCBCtrlMDI);
+-  do {
+-    udelay(16);
+-
+-    val = inl(ioaddr + SCBCtrlMDI);
+-    if (--boguscnt < 0) {
+-      printf(" mdio_write() timed out with val = %X.\n", val);
+-    }
+-  } while (! (val & 0x10000000));
+-  return val & 0xffff;
++	outl(0x04000000 | (location<<16) | (phy_id<<21) | value,
++	     ioaddr + SCBCtrlMDI);
++	do {
++		udelay(16);
++		
++		val = inl(ioaddr + SCBCtrlMDI);
++		if (--boguscnt < 0) {
++			printf(" mdio_write() timed out with val = %X.\n", val);
++			break;
++		}
++	} while (! (val & 0x10000000));
++	return val & 0xffff;
+ }
+ 
+ /* Support function: mdio_read
+@@ -298,17 +308,19 @@
+  */
+ static int mdio_read(int phy_id, int location)
+ {
+-  int val, boguscnt = 64*4;               /* <64 usec. to complete, typ 27 ticks */
+-  outl(0x08000000 | (location<<16) | (phy_id<<21), ioaddr + SCBCtrlMDI);
+-  do {
+-    udelay(16);
+-
+-    val = inl(ioaddr + SCBCtrlMDI);
+-    if (--boguscnt < 0) {
+-      printf( " mdio_read() timed out with val = %X.\n", val);
+-    }
+-  } while (! (val & 0x10000000));
+-  return val & 0xffff;
++	int val, boguscnt = 64*4;               /* <64 usec. to complete, typ 27 ticks */
++	outl(0x08000000 | (location<<16) | (phy_id<<21), ioaddr + SCBCtrlMDI);
++	do {
++		udelay(16);
++		
++		val = inl(ioaddr + SCBCtrlMDI);
++
++		if (--boguscnt < 0) {
++			printf( " mdio_read() timed out with val = %X.\n", val);
++			break;
++		}
++	} while (! (val & 0x10000000));
++	return val & 0xffff;
+ }
+ 
+ /* The fixes for the code were kindly provided by Dragan Stancevic
+@@ -340,25 +352,26 @@
+ 	return retval;
+ }
+ 
++#if 0
+ static inline void whereami (const char *str)
+ {
+-#if	0
+   printf ("%s\n", str);
+   sleep (2);
+-#endif
+ }
++#else
++#define whereami(s)
++#endif
+ 
+-/* function: eepro100_reset
+- * resets the card. This is used to allow Etherboot to probe the card again
+- * from a "virginal" state....
+- * Arguments: none
+- *
+- * returns:   void.
+- */
+-
+-static void eepro100_reset(struct nic *nic)
++static void eepro100_irq(struct nic *nic __unused, irq_action_t action __unused)
+ {
+-  outl(0, ioaddr + SCBPort);
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
+ }
+ 
+ /* function: eepro100_transmit
+@@ -373,61 +386,87 @@
+ 
+ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p)
+ {
+-  struct eth_hdr {
+-    unsigned char dst_addr[ETH_ALEN];
+-    unsigned char src_addr[ETH_ALEN];
+-    unsigned short type;
+-  } hdr;
+-  unsigned short status;
+-  int to;
+-  int s1, s2;
+-
+-  status = inw(ioaddr + SCBStatus);
+-  /* Acknowledge all of the current interrupt sources ASAP. */
+-  outw(status & 0xfc00, ioaddr + SCBStatus);
++	struct eth_hdr {
++		unsigned char dst_addr[ETH_ALEN];
++		unsigned char src_addr[ETH_ALEN];
++		unsigned short type;
++	} hdr;
++	unsigned short status;
++	int s1, s2;
++
++	status = inw(ioaddr + SCBStatus);
++	/* Acknowledge all of the current interrupt sources ASAP. */
++	outw(status & 0xfc00, ioaddr + SCBStatus);
+ 
+ #ifdef	DEBUG
+-  printf ("transmitting type %hX packet (%d bytes). status = %hX, cmd=%hX\n",
+-	  t, s, status, inw (ioaddr + SCBCmd));
++	printf ("transmitting type %hX packet (%d bytes). status = %hX, cmd=%hX\n",
++		t, s, status, inw (ioaddr + SCBCmd));
+ #endif
+ 
+-  memcpy (&hdr.dst_addr, d, ETH_ALEN);
+-  memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN);
++	memcpy (&hdr.dst_addr, d, ETH_ALEN);
++	memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN);
+ 
+-  hdr.type = htons (t);
++	hdr.type = htons (t);
+ 
+-  txfd.status = 0;
+-  txfd.command = CmdSuspend | CmdTx | CmdTxFlex;
+-  txfd.link   = virt_to_bus (&txfd);
+-  txfd.count   = 0x02208000;
+-  txfd.tx_desc_addr = (u32)&txfd.tx_buf_addr0;
++	txfd.status = 0;
++	txfd.command = CmdSuspend | CmdTx | CmdTxFlex;
++	txfd.link   = virt_to_bus (&txfd);
++	txfd.count   = 0x02208000;
++	txfd.tx_desc_addr = virt_to_bus(&txfd.tx_buf_addr0);
+ 
+-  txfd.tx_buf_addr0 = virt_to_bus (&hdr);
+-  txfd.tx_buf_size0 = sizeof (hdr);
++	txfd.tx_buf_addr0 = virt_to_bus (&hdr);
++	txfd.tx_buf_size0 = sizeof (hdr);
+ 
+-  txfd.tx_buf_addr1 = virt_to_bus (p);
+-  txfd.tx_buf_size1 = s;
++	txfd.tx_buf_addr1 = virt_to_bus (p);
++	txfd.tx_buf_size1 = s;
+ 
+ #ifdef	DEBUG
+-  printf ("txfd: \n");
+-  hd (&txfd, sizeof (txfd));
++	printf ("txfd: \n");
++	hd (&txfd, sizeof (txfd));
+ #endif
+ 
+-  outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
+-  outw(INT_MASK | CU_START, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
+-
+-  s1 = inw (ioaddr + SCBStatus);
+-  load_timer2(10*TICKS_PER_MS);		/* timeout 10 ms for transmit */
+-  while (!txfd.status && timer2_running())
+-    /* Wait */;
+-  s2 = inw (ioaddr + SCBStatus);
++	outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
++	outw(INT_MASK | CU_START, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
++
++	s1 = inw (ioaddr + SCBStatus);
++	load_timer2(10*TICKS_PER_MS);		/* timeout 10 ms for transmit */
++	while (!txfd.status && timer2_running())
++		/* Wait */;
++	s2 = inw (ioaddr + SCBStatus);
+ 
+ #ifdef	DEBUG
+-  printf ("s1 = %hX, s2 = %hX.\n", s1, s2);
++	printf ("s1 = %hX, s2 = %hX.\n", s1, s2);
+ #endif
+ }
+ 
++/*
++ * Sometimes the receiver stops making progress.  This routine knows how to
++ * get it going again, without losing packets or being otherwise nasty like
++ * a chip reset would be.  Previously the driver had a whole sequence
++ * of if RxSuspended, if it's no buffers do one thing, if it's no resources,
++ * do another, etc.  But those things don't really matter.  Separate logic
++ * in the ISR provides for allocating buffers--the other half of operation
++ * is just making sure the receiver is active.  speedo_rx_soft_reset does that.
++ * This problem with the old, more involved algorithm is shown up under
++ * ping floods on the order of 60K packets/second on a 100Mbps fdx network.
++ */
++static void
++speedo_rx_soft_reset(void)
++{
++  wait_for_cmd_done(ioaddr + SCBCmd);
++	/*
++	* Put the hardware into a known state.
++	*/
++	outb(RX_ABORT, ioaddr + SCBCmd);
++
++	ACCESS(rxfd)rx_buf_addr = 0xffffffff;
++
++  wait_for_cmd_done(ioaddr + SCBCmd);
++
++	outb(RX_START, ioaddr + SCBCmd);
++}
++
+ /* function: eepro100_poll / eth_poll
+  * This recieves a packet from the network.
+  *
+@@ -440,34 +479,87 @@
+  *            returns the length of the packet in nic->packetlen.
+  */
+ 
+-static int eepro100_poll(struct nic *nic)
++static int eepro100_poll(struct nic *nic, int retrieve)
+ {
+-  if (!ACCESS(rxfd)status)
+-    return 0;
++  unsigned int status;
++  status = inw(ioaddr + SCBStatus);
+ 
+-  /* Ok. We got a packet. Now restart the reciever.... */
+-  ACCESS(rxfd)status = 0;
+-  ACCESS(rxfd)command = 0xc000;
+-  outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
+-  outw(INT_MASK | RX_START, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
++	if (!ACCESS(rxfd)status)
++		return 0;
++
++	/* There is a packet ready */
++	if ( ! retrieve ) return 1;
++
++  /*
++   * The chip may have suspended reception for various reasons.
++   * Check for that, and re-prime it should this be the case.
++   */
++  switch ((status >> 2) & 0xf) {
++  case 0: /* Idle */
++    break;
++  case 1:	/* Suspended */
++  case 2:	/* No resources (RxFDs) */
++  case 9:	/* Suspended with no more RBDs */
++  case 10: /* No resources due to no RBDs */
++  case 12: /* Ready with no RBDs */
++    speedo_rx_soft_reset();
++    break;
++  case 3:  case 5:  case 6:  case 7:  case 8:
++  case 11:  case 13:  case 14:  case 15:
++    /* these are all reserved values */
++    break;
++  }
++
++	/* Ok. We got a packet. Now restart the reciever.... */
++	ACCESS(rxfd)status = 0;
++	ACCESS(rxfd)command = 0xc000;
++	outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
++	outw(INT_MASK | RX_START, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
+ 
+ #ifdef	DEBUG
+-  printf ("Got a packet: Len = %d.\n", ACCESS(rxfd)count & 0x3fff);
++	printf ("Got a packet: Len = %d.\n", ACCESS(rxfd)count & 0x3fff);
+ #endif
+-  nic->packetlen =  ACCESS(rxfd)count & 0x3fff;
+-  memcpy (nic->packet, ACCESS(rxfd)packet, nic->packetlen);
++	nic->packetlen =  ACCESS(rxfd)count & 0x3fff;
++	memcpy (nic->packet, ACCESS(rxfd)packet, nic->packetlen);
+ #ifdef	DEBUG
+-  hd (nic->packet, 0x30);
++	hd (nic->packet, 0x30);
+ #endif
+-  return 1;
++	return 1;
+ }
+ 
+-static void eepro100_disable(struct nic *nic)
++/* function: eepro100_disable
++ * resets the card. This is used to allow Etherboot or Linux
++ * to probe the card again from a "virginal" state....
++ * Arguments: none
++ *
++ * returns:   void.
++ */
++static void eepro100_disable(struct dev *dev __unused)
+ {
+-    /* See if this PartialReset solves the problem with interfering with
+-       kernel operation after Etherboot hands over. - Ken 20001102 */
+-    outl(2, ioaddr + SCBPort);
++/* from eepro100_reset */
++	outl(0, ioaddr + SCBPort);
++/* from eepro100_disable */
++	/* See if this PartialReset solves the problem with interfering with
++	   kernel operation after Etherboot hands over. - Ken 20001102 */
++	outl(2, ioaddr + SCBPort);
++
++	/* The following is from the Intel e100 driver.
++	 * This hopefully solves the problem with hanging hard DOS images. */
++
++	/* wait for the reset to take effect */
++	udelay(20);
++
++	/* Mask off our interrupt line -- it is unmasked after reset */
++	{
++		u16 intr_status;
++		/* Disable interrupts on our PCI board by setting the mask bit */
++		outw(INT_MASK, ioaddr + SCBCmd);
++		intr_status = inw(ioaddr + SCBStatus);
++		/* ack and clear intrs */
++		outw(intr_status, ioaddr + SCBStatus);
++		inw(ioaddr + SCBStatus);
++	}
+ }
+ 
+ /* exported function: eepro100_probe / eth_probe
+@@ -478,25 +570,30 @@
+  *            leaves the 82557 initialized, and ready to recieve packets.
+  */
+ 
+-struct nic *eepro100_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *p)
++static int eepro100_probe(struct dev *dev, struct pci_device *p)
+ {
++	struct nic *nic = (struct nic *)dev;
+ 	unsigned short sum = 0;
+ 	int i;
+ 	int read_cmd, ee_size;
+-	unsigned short value;
+ 	int options;
+-	int promisc;
++	int rx_mode;
+ 
+ 	/* we cache only the first few words of the EEPROM data
+ 	   be careful not to access beyond this array */
+ 	unsigned short eeprom[16];
+ 
+-	if (probeaddrs == 0 || probeaddrs[0] == 0)
++	if (p->ioaddr == 0)
+ 		return 0;
+-	ioaddr = probeaddrs[0] & ~3; /* Mask the bit that says "this is an io addr" */
++	ioaddr = p->ioaddr & ~3; /* Mask the bit that says "this is an io addr" */
++	nic->ioaddr = ioaddr;
+ 
+ 	adjust_pci_device(p);
+ 
++	/* Copy IRQ from PCI information */
++	/* nic->irqno = pci->irq; */
++	nic->irqno = 0;
++
+ 	if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
+ 		== 0xffe0000) {
+ 		ee_size = 0x100;
+@@ -513,123 +610,138 @@
+ 		sum += value;
+ 	}
+ 
+-  for (i=0;i<ETH_ALEN;i++) {
+-	nic->node_addr[i] =  (eeprom[i/2] >> (8*(i&1))) & 0xff;
+-  }
+-  printf ("Ethernet addr: %!\n", nic->node_addr);
+-
+-  if (sum != 0xBABA)
+-	printf("eepro100: Invalid EEPROM checksum %#hX, "
+-	       "check settings before activating this device!\n", sum);
+-  outl(0, ioaddr + SCBPort);
+-  udelay (10000);
+-
+-  whereami ("Got eeprom.");
+-
+-  outl(virt_to_bus(&lstats), ioaddr + SCBPointer);
+-  outw(INT_MASK | CU_STATSADDR, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
+-
+-  whereami ("set stats addr.");
+-  /* INIT RX stuff. */
+-
+-  /* Base = 0 */
+-  outl(0, ioaddr + SCBPointer);
+-  outw(INT_MASK | RX_ADDR_LOAD, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
+-
+-  whereami ("set rx base addr.");
+-
+-  ACCESS(rxfd)status  = 0x0001;
+-  ACCESS(rxfd)command = 0x0000;
+-  ACCESS(rxfd)link    = virt_to_bus(&(ACCESS(rxfd)status));
+-  ACCESS(rxfd)rx_buf_addr = (int) &nic->packet;
+-  ACCESS(rxfd)count   = 0;
+-  ACCESS(rxfd)size    = 1528;
+-
+-  outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
+-  outw(INT_MASK | RX_START, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
+-
+-  whereami ("started RX process.");
+-
+-  /* Start the reciever.... */
+-  ACCESS(rxfd)status = 0;
+-  ACCESS(rxfd)command = 0xc000;
+-  outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
+-  outw(INT_MASK | RX_START, ioaddr + SCBCmd);
+-
+-  /* INIT TX stuff. */
+-
+-  /* Base = 0 */
+-  outl(0, ioaddr + SCBPointer);
+-  outw(INT_MASK | CU_CMD_BASE, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
+-
+-  whereami ("set TX base addr.");
+-
+-  txfd.command      = (CmdIASetup);
+-  txfd.status       = 0x0000;
+-  txfd.link         = virt_to_bus (&confcmd);
+-
+-  {
+-	char *t = (char *)&txfd.tx_desc_addr;
++	for (i=0;i<ETH_ALEN;i++) {
++		nic->node_addr[i] =  (eeprom[i/2] >> (8*(i&1))) & 0xff;
++	}
++	printf ("Ethernet addr: %!\n", nic->node_addr);
+ 
+-	for (i=0;i<ETH_ALEN;i++)
+-		t[i] = nic->node_addr[i];
+-  }
++	if (sum != 0xBABA)
++		printf("eepro100: Invalid EEPROM checksum %#hX, "
++		       "check settings before activating this device!\n", sum);
++	outl(0, ioaddr + SCBPort);
++	udelay (10000);
++	whereami ("Got eeprom.");
++
++	/* Base = 0 */
++	outl(0, ioaddr + SCBPointer);
++	outw(INT_MASK | RX_ADDR_LOAD, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
++	whereami ("set rx base addr.");
++
++	outl(virt_to_bus(&lstats), ioaddr + SCBPointer);
++	outw(INT_MASK | CU_STATSADDR, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
++	whereami ("set stats addr.");
++
++	/* INIT RX stuff. */
++	ACCESS(rxfd)status  = 0x0001;
++	ACCESS(rxfd)command = 0x0000;
++	ACCESS(rxfd)link    = virt_to_bus(&(ACCESS(rxfd)status));
++	ACCESS(rxfd)rx_buf_addr = virt_to_bus(&nic->packet);
++	ACCESS(rxfd)count   = 0;
++	ACCESS(rxfd)size    = 1528;
++
++	outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
++	outw(INT_MASK | RX_START, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
++
++	whereami ("started RX process.");
++
++	/* Start the reciever.... */
++	ACCESS(rxfd)status = 0;
++	ACCESS(rxfd)command = 0xc000;
++	outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
++	outw(INT_MASK | RX_START, ioaddr + SCBCmd);
++
++	/* INIT TX stuff. */
++
++	/* Base = 0 */
++	outl(0, ioaddr + SCBPointer);
++	outw(INT_MASK | CU_CMD_BASE, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
++
++	whereami ("set TX base addr.");
++
++	txfd.command      = (CmdIASetup);
++	txfd.status       = 0x0000;
++	txfd.link         = virt_to_bus (&confcmd);
++
++	{
++		char *t = (char *)&txfd.tx_desc_addr;
++		
++		for (i=0;i<ETH_ALEN;i++)
++			t[i] = nic->node_addr[i];
++	}
+ 
+ #ifdef	DEBUG
+-  printf ("Setup_eaddr:\n");
+-  hd (&txfd, 0x20);
++	printf ("Setup_eaddr:\n");
++	hd (&txfd, 0x20);
+ #endif
+-  /*      options = 0x40; */ /* 10mbps half duplex... */
+-  options = 0x00;            /* Autosense */
+-
+-  promisc = 0;
+-
+-  if (   ((eeprom[6]>>8) & 0x3f) == DP83840
+-	  || ((eeprom[6]>>8) & 0x3f) == DP83840A) {
+-	int mdi_reg23 = mdio_read(eeprom[6] & 0x1f, 23) | 0x0422;
+-	if (congenb)
+-	  mdi_reg23 |= 0x0100;
+-	printf("  DP83840 specific setup, setting register 23 to %hX.\n",
+-	       mdi_reg23);
+-	mdio_write(eeprom[6] & 0x1f, 23, mdi_reg23);
+-  }
+-  whereami ("Done DP8340 special setup.");
+-  if (options != 0) {
+-	mdio_write(eeprom[6] & 0x1f, 0,
+-		   ((options & 0x20) ? 0x2000 : 0) |    /* 100mbps? */
+-		   ((options & 0x10) ? 0x0100 : 0)); /* Full duplex? */
+-	whereami ("set mdio_register.");
+-  }
++	/*      options = 0x40; */ /* 10mbps half duplex... */
++	options = 0x00;            /* Autosense */
+ 
+-  confcmd.command  = CmdSuspend | CmdConfigure;
+-  confcmd.status   = 0x0000;
+-  confcmd.link     = virt_to_bus (&txfd);
+-  confcmd.data[1]  = (txfifo << 4) | rxfifo;
+-  confcmd.data[4]  = rxdmacount;
+-  confcmd.data[5]  = txdmacount + 0x80;
+-  confcmd.data[15] = promisc ? 0x49: 0x48;
+-  confcmd.data[19] = (options & 0x10) ? 0xC0 : 0x80;
+-  confcmd.data[21] = promisc ? 0x0D: 0x05;
++#ifdef PROMISC
++	rx_mode = 3;
++#elif ALLMULTI
++	rx_mode = 1;
++#else
++	rx_mode = 0;
++#endif
+ 
+-  outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
+-  outw(INT_MASK | CU_START, ioaddr + SCBCmd);
+-  wait_for_cmd_done(ioaddr + SCBCmd);
++	if (   ((eeprom[6]>>8) & 0x3f) == DP83840
++	       || ((eeprom[6]>>8) & 0x3f) == DP83840A) {
++		int mdi_reg23 = mdio_read(eeprom[6] & 0x1f, 23) | 0x0422;
++		if (congenb)
++			mdi_reg23 |= 0x0100;
++		printf("  DP83840 specific setup, setting register 23 to %hX.\n",
++		       mdi_reg23);
++		mdio_write(eeprom[6] & 0x1f, 23, mdi_reg23);
++	}
++	whereami ("Done DP8340 special setup.");
++	if (options != 0) {
++		mdio_write(eeprom[6] & 0x1f, 0,
++			   ((options & 0x20) ? 0x2000 : 0) |    /* 100mbps? */
++			   ((options & 0x10) ? 0x0100 : 0)); /* Full duplex? */
++		whereami ("set mdio_register.");
++	}
+ 
+-  whereami ("started TX thingy (config, iasetup).");
++	confcmd.command  = CmdSuspend | CmdConfigure;
++	confcmd.status   = 0x0000;
++	confcmd.link     = virt_to_bus (&txfd);
++	confcmd.data[1]  = (txfifo << 4) | rxfifo;
++	confcmd.data[4]  = rxdmacount;
++	confcmd.data[5]  = txdmacount + 0x80;
++	confcmd.data[15] = (rx_mode & 2) ? 0x49: 0x48;
++	confcmd.data[19] = (options & 0x10) ? 0xC0 : 0x80;
++	confcmd.data[21] = (rx_mode & 1) ? 0x0D: 0x05;
++
++	outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
++	outw(INT_MASK | CU_START, ioaddr + SCBCmd);
++	wait_for_cmd_done(ioaddr + SCBCmd);
++
++	whereami ("started TX thingy (config, iasetup).");
++
++	load_timer2(10*TICKS_PER_MS);
++	while (!txfd.status && timer2_running())
++		/* Wait */;
++
++	/* Read the status register once to disgard stale data */
++	mdio_read(eeprom[6] & 0x1f, 1);
++	/* Check to see if the network cable is plugged in.
++	 * This allows for faster failure if there is nothing
++	 * we can do.
++	 */
++	if (!(mdio_read(eeprom[6] & 0x1f, 1) & (1 << 2))) {
++		printf("Valid link not established\n");
++		eepro100_disable(dev);
++		return 0;
++	}
+ 
+-  load_timer2(10*TICKS_PER_MS);
+-  while (!txfd.status && timer2_running())
+-	/* Wait */;
+-
+-  nic->reset = eepro100_reset;
+-  nic->poll = eepro100_poll;
+-  nic->transmit = eepro100_transmit;
+-  nic->disable = eepro100_disable;
+-  return nic;
++	dev->disable  = eepro100_disable;
++	nic->poll     = eepro100_poll;
++	nic->transmit = eepro100_transmit;
++	nic->irq      = eepro100_irq;
++	return 1;
+ }
+ 
+ /*********************************************************************/
+@@ -639,16 +751,59 @@
+ /* Hexdump a number of bytes from memory... */
+ void hd (void *where, int n)
+ {
+-  int i;
++	int i;
+ 
+-  while (n > 0) {
+-    printf ("%X ", where);
+-    for (i=0;i < ( (n>16)?16:n);i++)
+-      printf (" %hhX", ((char *)where)[i]);
+-    printf ("\n");
+-    n -= 16;
+-    where += 16;
+-  }
++	while (n > 0) {
++		printf ("%X ", where);
++		for (i=0;i < ( (n>16)?16:n);i++)
++			printf (" %hhX", ((char *)where)[i]);
++		printf ("\n");
++		n -= 16;
++		where += 16;
++	}
+ }
+ #endif
+ 
++static struct pci_id eepro100_nics[] = {
++PCI_ROM(0x8086, 0x1029, "id1029",        "Intel EtherExpressPro100 ID1029"),
++PCI_ROM(0x8086, 0x1030, "id1030",        "Intel EtherExpressPro100 ID1030"),
++PCI_ROM(0x8086, 0x1031, "82801cam",      "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
++PCI_ROM(0x8086, 0x1032, "eepro100-1032", "Intel PRO/100 VE Network Connection"),
++PCI_ROM(0x8086, 0x1033, "eepro100-1033", "Intel PRO/100 VM Network Connection"),
++PCI_ROM(0x8086, 0x1034, "eepro100-1034", "Intel PRO/100 VM Network Connection"),
++PCI_ROM(0x8086, 0x1035, "eepro100-1035", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
++PCI_ROM(0x8086, 0x1036, "eepro100-1036", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
++PCI_ROM(0x8086, 0x1037, "eepro100-1037", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
++PCI_ROM(0x8086, 0x1038, "id1038",        "Intel PRO/100 VM Network Connection"),
++PCI_ROM(0x8086, 0x1039, "82562et",       "Intel PRO100 VE 82562ET"),
++PCI_ROM(0x8086, 0x103a, "id103a",        "Intel Corporation 82559 InBusiness 10/100"),
++PCI_ROM(0x8086, 0x103b, "82562etb",      "Intel PRO100 VE 82562ETB"),
++PCI_ROM(0x8086, 0x103c, "eepro100-103c", "Intel PRO/100 VM Network Connection"),
++PCI_ROM(0x8086, 0x103d, "eepro100-103d", "Intel PRO/100 VE Network Connection"),
++PCI_ROM(0x8086, 0x103e, "eepro100-103e", "Intel PRO/100 VM Network Connection"),
++PCI_ROM(0x8086, 0x1059, "82551qm",       "Intel PRO/100 M Mobile Connection"),
++PCI_ROM(0x8086, 0x1209, "82559er",       "Intel EtherExpressPro100 82559ER"),
++PCI_ROM(0x8086, 0x1227, "82865",         "Intel 82865 EtherExpress PRO/100A"),
++PCI_ROM(0x8086, 0x1228, "82556",         "Intel 82556 EtherExpress PRO/100 Smart"),
++PCI_ROM(0x8086, 0x1229, "eepro100",      "Intel EtherExpressPro100"),
++PCI_ROM(0x8086, 0x2449, "82562em",       "Intel EtherExpressPro100 82562EM"),
++PCI_ROM(0x8086, 0x2459, "82562-1",       "Intel 82562 based Fast Ethernet Connection"),
++PCI_ROM(0x8086, 0x245d, "82562-2",       "Intel 82562 based Fast Ethernet Connection"),
++PCI_ROM(0x8086, 0x1050, "82562ez",       "Intel 82562EZ Network Connection"),
++PCI_ROM(0x8086, 0x5200, "eepro100-5200", "Intel EtherExpress PRO/100 Intelligent Server"),
++PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent Server"),
++};
++
++/* Cards with device ids 0x1030 to 0x103F, 0x2449, 0x2459 or 0x245D might need
++ * a workaround for hardware bug on 10 mbit half duplex (see linux driver eepro100.c)
++ * 2003/03/17 gbaum */
++
++
++struct pci_driver eepro100_driver = {
++	.type      = NIC_DRIVER,
++	.name      = "EEPRO100",
++	.probe     = eepro100_probe,
++	.ids       = eepro100_nics,
++	.id_count  = sizeof(eepro100_nics)/sizeof(eepro100_nics[0]),
++	.class     = 0
++};
+diff -Naur grub-0.97.orig/netboot/elf.h grub-0.97/netboot/elf.h
+--- grub-0.97.orig/netboot/elf.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/elf.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,234 @@
++#ifndef ELF_H
++#define ELF_H
++
++#define EI_NIDENT	16	/* Size of e_ident array. */
++
++/* Values for e_type. */
++#define ET_NONE		0	/* No file type */
++#define ET_REL		1	/* Relocatable file */
++#define ET_EXEC		2	/* Executable file */
++#define ET_DYN		3	/* Shared object file */
++#define ET_CORE		4	/* Core file */
++
++/* Values for e_machine (architecute). */
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386+ */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_486		 6		/* Perhaps disused */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_AT19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_NUM		95
++
++/* Values for p_type. */
++#define PT_NULL		0	/* Unused entry. */
++#define PT_LOAD		1	/* Loadable segment. */
++#define PT_DYNAMIC	2	/* Dynamic linking information segment. */
++#define PT_INTERP	3	/* Pathname of interpreter. */
++#define PT_NOTE		4	/* Auxiliary information. */
++#define PT_SHLIB	5	/* Reserved (not used). */
++#define PT_PHDR		6	/* Location of program header itself. */
++
++/* Values for p_flags. */
++#define PF_X		0x1	/* Executable. */
++#define PF_W		0x2	/* Writable. */
++#define PF_R		0x4	/* Readable. */
++
++
++#define	ELF_PROGRAM_RETURNS_BIT	0x8000000	/* e_flags bit 31 */
++
++#define EI_MAG0		0
++#define ELFMAG0		0x7f
++
++#define EI_MAG1		1
++#define ELFMAG1		'E'
++
++#define EI_MAG2		2
++#define ELFMAG2		'L'
++
++#define EI_MAG3		3
++#define ELFMAG3		'F'
++
++#define ELFMAG		"\177ELF"
++
++#define EI_CLASS	4	/* File class byte index */
++#define ELFCLASSNONE	0	/* Invalid class */
++#define ELFCLASS32	1	/* 32-bit objects */
++#define ELFCLASS64	2	/* 64-bit objects */
++
++#define EI_DATA		5	/* Data encodeing byte index */
++#define ELFDATANONE	0	/* Invalid data encoding */
++#define ELFDATA2LSB	1	/* 2's complement little endian */
++#define ELFDATA2MSB	2	/* 2's complement big endian */
++
++#define EI_VERSION	6	/* File version byte index */
++				/* Value must be EV_CURRENT */
++
++#define EV_NONE		0	/* Invalid ELF Version */
++#define EV_CURRENT	1	/* Current version */
++
++#define ELF32_PHDR_SIZE (8*4)	/* Size of an elf program header */
++
++#ifndef ASSEMBLY
++/*
++ * ELF definitions common to all 32-bit architectures.
++ */
++
++typedef uint32_t	Elf32_Addr;
++typedef uint16_t	Elf32_Half;
++typedef uint32_t	Elf32_Off;
++typedef int32_t		Elf32_Sword;
++typedef uint32_t	Elf32_Word;
++typedef uint32_t	Elf32_Size;
++
++typedef uint64_t	Elf64_Addr;
++typedef uint16_t	Elf64_Half;
++typedef uint64_t	Elf64_Off;
++typedef int32_t		Elf64_Sword;
++typedef uint32_t	Elf64_Word;
++typedef uint64_t	Elf64_Size;
++
++/*
++ * ELF header.
++ */
++typedef struct {
++	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
++	Elf32_Half	e_type;		/* File type. */
++	Elf32_Half	e_machine;	/* Machine architecture. */
++	Elf32_Word	e_version;	/* ELF format version. */
++	Elf32_Addr	e_entry;	/* Entry point. */
++	Elf32_Off	e_phoff;	/* Program header file offset. */
++	Elf32_Off	e_shoff;	/* Section header file offset. */
++	Elf32_Word	e_flags;	/* Architecture-specific flags. */
++	Elf32_Half	e_ehsize;	/* Size of ELF header in bytes. */
++	Elf32_Half	e_phentsize;	/* Size of program header entry. */
++	Elf32_Half	e_phnum;	/* Number of program header entries. */
++	Elf32_Half	e_shentsize;	/* Size of section header entry. */
++	Elf32_Half	e_shnum;	/* Number of section header entries. */
++	Elf32_Half	e_shstrndx;	/* Section name strings section. */
++} Elf32_Ehdr;
++
++typedef struct {
++	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
++	Elf64_Half	e_type;		/* File type. */
++	Elf64_Half	e_machine;	/* Machine architecture. */
++	Elf64_Word	e_version;	/* ELF format version. */
++	Elf64_Addr	e_entry;	/* Entry point. */
++	Elf64_Off	e_phoff;	/* Program header file offset. */
++	Elf64_Off	e_shoff;	/* Section header file offset. */
++	Elf64_Word	e_flags;	/* Architecture-specific flags. */
++	Elf64_Half	e_ehsize;	/* Size of ELF header in bytes. */
++	Elf64_Half	e_phentsize;	/* Size of program header entry. */
++	Elf64_Half	e_phnum;	/* Number of program header entries. */
++	Elf64_Half	e_shentsize;	/* Size of section header entry. */
++	Elf64_Half	e_shnum;	/* Number of section header entries. */
++	Elf64_Half	e_shstrndx;	/* Section name strings section. */
++} Elf64_Ehdr;
++
++/*
++ * Program header.
++ */
++typedef struct {
++	Elf32_Word	p_type;		/* Entry type. */
++	Elf32_Off	p_offset;	/* File offset of contents. */
++	Elf32_Addr	p_vaddr;	/* Virtual address (not used). */
++	Elf32_Addr	p_paddr;	/* Physical address. */
++	Elf32_Size	p_filesz;	/* Size of contents in file. */
++	Elf32_Size	p_memsz;	/* Size of contents in memory. */
++	Elf32_Word	p_flags;	/* Access permission flags. */
++	Elf32_Size	p_align;	/* Alignment in memory and file. */
++} Elf32_Phdr;
++
++typedef struct {
++	Elf64_Word	p_type;		/* Entry type. */
++	Elf64_Word	p_flags;	/* Access permission flags. */
++	Elf64_Off	p_offset;	/* File offset of contents. */
++	Elf64_Addr	p_vaddr;	/* Virtual address (not used). */
++	Elf64_Addr	p_paddr;	/* Physical address. */
++	Elf64_Size	p_filesz;	/* Size of contents in file. */
++	Elf64_Size	p_memsz;	/* Size of contents in memory. */
++	Elf64_Size	p_align;	/* Alignment in memory and file. */
++} Elf64_Phdr;
++
++/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */
++
++
++/* ELF Defines for the current architecture */
++#include "i386_elf.h"
++
++#endif /* ASSEMBLY */
++
++//#include "elf_boot.h"
++
++#endif /* ELF_H */
+diff -Naur grub-0.97.orig/netboot/endian.h grub-0.97/netboot/endian.h
+--- grub-0.97.orig/netboot/endian.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/endian.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef ETHERBOOT_ENDIAN_H
++#define ETHERBOOT_ENDIAN_H
++
++/* Definitions for byte order, according to significance of bytes,
++   from low addresses to high addresses.  The value is what you get by
++   putting '4' in the most significant byte, '3' in the second most
++   significant byte, '2' in the second least significant byte, and '1'
++   in the least significant byte, and then writing down one digit for
++   each byte, starting with the byte at the lowest address at the left,
++   and proceeding to the byte with the highest address at the right.  */
++
++#define __LITTLE_ENDIAN 1234
++#define __BIG_ENDIAN    4321
++#define __PDP_ENDIAN    3412
++
++#include "i386_endian.h"
++
++
++#endif /* ETHERBOOT_ENDIAN_H */
+diff -Naur grub-0.97.orig/netboot/epic100.c grub-0.97/netboot/epic100.c
+--- grub-0.97.orig/netboot/epic100.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/epic100.c	2005-08-31 19:03:35.000000000 +0000
+@@ -1,15 +1,18 @@
++
+ /* epic100.c: A SMC 83c170 EPIC/100 fast ethernet driver for Etherboot */
+ 
++/* 05/06/2003	timlegge	Fixed relocation and implemented Multicast */
+ #define LINUX_OUT_MACROS
+ 
+ #include "etherboot.h"
++#include "pci.h"
+ #include "nic.h"
+-#include "cards.h"
+ #include "timer.h"
+ #include "epic100.h"
+ 
+-#undef	virt_to_bus
+-#define	virt_to_bus(x)	((unsigned long)x)
++/* Condensed operations for readability */
++#define virt_to_le32desc(addr)	cpu_to_le32(virt_to_bus(addr))
++#define le32desc_to_virt(addr)	bus_to_virt(le32_to_cpu(addr))
+ 
+ #define TX_RING_SIZE	2	/* use at least 2 buffers for TX */
+ #define RX_RING_SIZE	2
+@@ -26,23 +29,18 @@
+ 
+ /* The EPIC100 Rx and Tx buffer descriptors. */
+ struct epic_rx_desc {
+-    unsigned short status;
+-    unsigned short rxlength;
+-    unsigned long  bufaddr;
+-    unsigned short buflength;
+-    unsigned short control;
+-    unsigned long  next;
++    unsigned long status;
++    unsigned long bufaddr;
++    unsigned long buflength;
++    unsigned long next;
+ };
+-
+ /* description of the tx descriptors control bits commonly used */
+ #define TD_STDFLAGS	TD_LASTDESC
+ 
+ struct epic_tx_desc {
+-    unsigned short status;
+-    unsigned short txlength;
+-    unsigned long  bufaddr;
+-    unsigned short buflength;
+-    unsigned short control;
++    unsigned long status;
++    unsigned long bufaddr;
++    unsigned long buflength;
+     unsigned long  next;
+ };
+ 
+@@ -51,12 +49,15 @@
+ 
+ static void	epic100_open(void);
+ static void	epic100_init_ring(void);
+-static void	epic100_disable(struct nic *nic);
+-static int	epic100_poll(struct nic *nic);
++static void	epic100_disable(struct dev *dev);
++static int	epic100_poll(struct nic *nic, int retrieve);
+ static void	epic100_transmit(struct nic *nic, const char *destaddr,
+ 				 unsigned int type, unsigned int len, const char *data);
++#ifdef	DEBUG_EEPROM
+ static int	read_eeprom(int location);
++#endif
+ static int	mii_read(int phy_id, int location);
++static void     epic100_irq(struct nic *nic, irq_action_t action);
+ 
+ static int	ioaddr;
+ 
+@@ -69,6 +70,7 @@
+ static int	mmctl  ;
+ static int	mmdata ;
+ static int	lan0   ;
++static int	mc0    ;
+ static int	rxcon  ;
+ static int	txcon  ;
+ static int	prcdar ;
+@@ -80,37 +82,27 @@
+ static unsigned short	eeprom[64];
+ #endif
+ static signed char	phys[4];		/* MII device addresses. */
+-static struct epic_rx_desc	rx_ring[RX_RING_SIZE];
+-static struct epic_tx_desc	tx_ring[TX_RING_SIZE];
+-#ifdef	USE_LOWMEM_BUFFER
+-#define rx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE)
+-#define tx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE - PKT_BUF_SZ * TX_RING_SIZE)
+-#else
+-static char		rx_packet[PKT_BUF_SZ * RX_RING_SIZE];
+-static char		tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
+-#endif
++static struct epic_rx_desc	rx_ring[RX_RING_SIZE]
++	__attribute__ ((aligned(4)));
++static struct epic_tx_desc	tx_ring[TX_RING_SIZE]
++	__attribute__ ((aligned(4)));
++static unsigned char	 	rx_packet[PKT_BUF_SZ * RX_RING_SIZE];
++static unsigned char		tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
+ 
+ /***********************************************************************/
+ /*                    Externally visible functions                     */
+ /***********************************************************************/
+ 
+-    static void
+-epic100_reset(struct nic *nic)
+-{
+-    /* Soft reset the chip. */
+-    outl(GC_SOFT_RESET, genctl);
+-}
+ 
+-    struct nic*
+-epic100_probe(struct nic *nic, unsigned short *probeaddrs)
++    static int
++epic100_probe(struct dev *dev, struct pci_device *pci)
+ {
+-    unsigned short sum = 0;
+-    unsigned short value;
++    struct nic *nic = (struct nic *)dev;
+     int i;
+     unsigned short* ap;
+     unsigned int phy, phy_idx;
+ 
+-    if (probeaddrs == 0 || probeaddrs[0] == 0)
++    if (pci->ioaddr == 0)
+ 	return 0;
+ 
+     /* Ideally we would detect all network cards in slot order.  That would
+@@ -118,7 +110,9 @@
+        well with the current structure.  So instead we detect just the
+        Epic cards in slot order. */
+ 
+-    ioaddr = probeaddrs[0] & ~3; /* Mask the bit that says "this is an io addr" */
++    ioaddr = pci->ioaddr;
++    nic->irqno  = 0;
++    nic->ioaddr = pci->ioaddr & ~3;
+ 
+     /* compute all used static epic100 registers address */
+     command = ioaddr + COMMAND;		/* Control Register */
+@@ -130,6 +124,7 @@
+     mmctl   = ioaddr + MMCTL;		/* MII Management Interface Control */
+     mmdata  = ioaddr + MMDATA;		/* MII Management Interface Data */
+     lan0    = ioaddr + LAN0;		/* MAC address. (0x40-0x48) */
++    mc0     = ioaddr + MC0; 		/* Multicast Control */
+     rxcon   = ioaddr + RXCON;		/* Receive Control */
+     txcon   = ioaddr + TXCON;		/* Transmit Control */
+     prcdar  = ioaddr + PRCDAR;		/* PCI Receive Current Descr Address */
+@@ -160,11 +155,15 @@
+     }
+ 
+ #ifdef	DEBUG_EEPROM
++{
++    unsigned short sum = 0;
++    unsigned short value;
+     for (i = 0; i < 64; i++) {
+ 	value = read_eeprom(i);
+ 	eeprom[i] = value;
+ 	sum += value;
+     }
++}
+ 
+ #if	(EPIC_DEBUG > 1)
+     printf("EEPROM contents\n");
+@@ -202,15 +201,26 @@
+ 
+     epic100_open();
+ 
+-    nic->reset    = epic100_reset;
++    dev->disable  = epic100_disable;
+     nic->poll     = epic100_poll;
+     nic->transmit = epic100_transmit;
+-    nic->disable  = epic100_disable;
++    nic->irq      = epic100_irq;
+ 
+-    return nic;
++    return 1;
+ }
+ 
+-    static void
++static void set_rx_mode(void)
++{
++	unsigned char mc_filter[8];
++	int i;
++	memset(mc_filter, 0xff, sizeof(mc_filter));
++	outl(0x0C, rxcon);
++	for(i = 0; i < 4; i++)
++		outw(((unsigned short *)mc_filter)[i], mc0 + i*4);
++	return;
++}
++	
++   static void
+ epic100_open(void)
+ {
+     int mii_reg5;
+@@ -237,11 +247,11 @@
+     outl(tmp, txcon);
+ 
+     /* Give adress of RX and TX ring to the chip */
+-    outl(virt_to_bus(&rx_ring), prcdar);
+-    outl(virt_to_bus(&tx_ring), ptcdar);
++    outl(virt_to_le32desc(&rx_ring), prcdar);
++    outl(virt_to_le32desc(&tx_ring), ptcdar);
+ 
+     /* Start the chip's Rx process: receive unicast and broadcast */
+-    outl(0x04, rxcon);
++    set_rx_mode();
+     outl(CR_START_RX | CR_QUEUE_RX, command);
+ 
+     putchar('\n');
+@@ -252,34 +262,30 @@
+ epic100_init_ring(void)
+ {
+     int i;
+-    char* p;
+ 
+     cur_rx = cur_tx = 0;
+ 
+-    p = &rx_packet[0];
+     for (i = 0; i < RX_RING_SIZE; i++) {
+-	rx_ring[i].status    = RRING_OWN;	/* Owned by Epic chip */
+-	rx_ring[i].buflength = PKT_BUF_SZ;
+-	rx_ring[i].bufaddr   = virt_to_bus(p + (PKT_BUF_SZ * i));
+-	rx_ring[i].control   = 0;
+-	rx_ring[i].next      = virt_to_bus(&(rx_ring[i + 1]) );
++	rx_ring[i].status    = cpu_to_le32(RRING_OWN);	/* Owned by Epic chip */
++	rx_ring[i].buflength = cpu_to_le32(PKT_BUF_SZ);
++	rx_ring[i].bufaddr   = virt_to_bus(&rx_packet[i * PKT_BUF_SZ]);
++	rx_ring[i].next      = virt_to_le32desc(&rx_ring[i + 1]) ;
+     }
+     /* Mark the last entry as wrapping the ring. */
+-    rx_ring[i-1].next = virt_to_bus(&rx_ring[0]);
++    rx_ring[i-1].next = virt_to_le32desc(&rx_ring[0]);
+ 
+     /*
+      *The Tx buffer descriptor is filled in as needed,
+      * but we do need to clear the ownership bit.
+      */
+-    p = &tx_packet[0];
+ 
+     for (i = 0; i < TX_RING_SIZE; i++) {
+-	tx_ring[i].status  = 0;			/* Owned by CPU */
+-	tx_ring[i].bufaddr = virt_to_bus(p + (PKT_BUF_SZ * i));
+-	tx_ring[i].control = TD_STDFLAGS;
+-	tx_ring[i].next    = virt_to_bus(&(tx_ring[i + 1]) );
++	tx_ring[i].status  = 0x0000;			/* Owned by CPU */
++    	tx_ring[i].buflength = 0x0000 | cpu_to_le32(TD_STDFLAGS << 16);
++	tx_ring[i].bufaddr = virt_to_bus(&tx_packet[i * PKT_BUF_SZ]);
++	tx_ring[i].next    = virt_to_le32desc(&tx_ring[i + 1]);
+     }
+-    tx_ring[i-1].next = virt_to_bus(&tx_ring[0]);
++	tx_ring[i-1].next    = virt_to_le32desc(&tx_ring[0]);
+ }
+ 
+ /* function: epic100_transmit
+@@ -296,7 +302,7 @@
+ 		 unsigned int len, const char *data)
+ {
+     unsigned short nstype;
+-    char* txp;
++    unsigned char *txp;
+     int entry;
+ 
+     /* Calculate the next Tx descriptor entry. */
+@@ -310,7 +316,7 @@
+ 	return;
+     }
+ 
+-    txp = (char*)tx_ring[entry].bufaddr;
++    txp = tx_packet + (entry * PKT_BUF_SZ);
+ 
+     memcpy(txp, destaddr, ETH_ALEN);
+     memcpy(txp + ETH_ALEN, nic->node_addr, ETH_ALEN);
+@@ -319,26 +325,29 @@
+     memcpy(txp + ETH_HLEN, data, len);
+ 
+     len += ETH_HLEN;
+-
++	len &= 0x0FFF;
++	while(len < ETH_ZLEN)
++		txp[len++] = '\0';
+     /*
+      * Caution: the write order is important here,
+      * set the base address with the "ownership"
+      * bits last.
+      */
+-    tx_ring[entry].txlength  = (len >= 60 ? len : 60);
+-    tx_ring[entry].buflength = len;
+-    tx_ring[entry].status    = TRING_OWN;	/* Pass ownership to the chip. */
++    
++    tx_ring[entry].buflength |= cpu_to_le32(len);
++    tx_ring[entry].status = cpu_to_le32(len << 16) | 
++	    cpu_to_le32(TRING_OWN);	/* Pass ownership to the chip. */
+ 
+     cur_tx++;
+ 
+     /* Trigger an immediate transmit demand. */
+-    outl(CR_QUEUE_TX, command);
+-
++    outl(CR_QUEUE_TX, command); 
++    
+     load_timer2(10*TICKS_PER_MS);         /* timeout 10 ms for transmit */
+-    while ((tx_ring[entry].status & TRING_OWN) && timer2_running())
++    while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && timer2_running())
+ 	/* Wait */;
+ 
+-    if ((tx_ring[entry].status & TRING_OWN) != 0)
++    if ((le32_to_cpu(tx_ring[entry].status) & TRING_OWN) != 0)
+ 	printf("Oops, transmitter timeout, status=%hX\n",
+ 	    tx_ring[entry].status);
+ }
+@@ -356,17 +365,19 @@
+  */
+ 
+     static int
+-epic100_poll(struct nic *nic)
++epic100_poll(struct nic *nic, int retrieve)
+ {
+     int entry;
+-    int status;
+     int retcode;
+-
++    int status;
+     entry = cur_rx % RX_RING_SIZE;
+ 
+-    if ((status = rx_ring[entry].status & RRING_OWN) == RRING_OWN)
++    if ((rx_ring[entry].status & cpu_to_le32(RRING_OWN)) == RRING_OWN)
+ 	return (0);
+ 
++    if ( ! retrieve ) return 1;
++
++    status = le32_to_cpu(rx_ring[entry].status);
+     /* We own the next entry, it's a new packet. Send it up. */
+ 
+ #if	(EPIC_DEBUG > 4)
+@@ -383,8 +394,8 @@
+ 	retcode = 0;
+     } else {
+ 	/* Omit the four octet CRC from the length. */
+-	nic->packetlen = rx_ring[entry].rxlength - 4;
+-	memcpy(nic->packet, (char*)rx_ring[entry].bufaddr, nic->packetlen);
++	nic->packetlen = le32_to_cpu((rx_ring[entry].buflength))- 4;
++	memcpy(nic->packet, &rx_packet[entry * PKT_BUF_SZ], nic->packetlen);
+ 	retcode = 1;
+     }
+ 
+@@ -395,17 +406,30 @@
+     rx_ring[entry].status = RRING_OWN;
+ 
+     /* Restart Receiver */
+-    outl(CR_START_RX | CR_QUEUE_RX, command);
++    outl(CR_START_RX | CR_QUEUE_RX, command); 
+ 
+     return retcode;
+ }
+ 
+ 
+     static void
+-epic100_disable(struct nic *nic)
++epic100_disable(struct dev *dev __unused)
+ {
++	/* Soft reset the chip. */
++	outl(GC_SOFT_RESET, genctl);
+ }
+ 
++static void epic100_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
+ 
+ #ifdef	DEBUG_EEPROM
+ /* Serial EEPROM section. */
+@@ -479,3 +503,18 @@
+ 	    break;
+     return inw(mmdata);
+ }
++
++
++static struct pci_id epic100_nics[] = {
++PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII"),		/* SMC 83c170 EPIC/100 */
++PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175"),
++};
++
++struct pci_driver epic100_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "EPIC100",
++	.probe    = epic100_probe,
++	.ids      = epic100_nics,
++	.id_count = sizeof(epic100_nics)/sizeof(epic100_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/etherboot.h grub-0.97/netboot/etherboot.h
+--- grub-0.97.orig/netboot/etherboot.h	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/etherboot.h	2005-08-31 19:03:35.000000000 +0000
+@@ -1,6 +1,6 @@
+ /*
+  *  GRUB  --  GRand Unified Bootloader
+- *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
++ *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -17,531 +17,45 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-/* RULE: You must define the macro ``GRUB'' when including this header
+-   file in GRUB code.  */
+-
+-/* Based on "src/etherboot.h" in etherboot-5.0.5.  */
+-
+-/**************************************************************************
+-ETHERBOOT -  BOOTP/TFTP Bootstrap Program
+-
+-Author: Martin Renters
+-  Date: Dec/93
+-
+-**************************************************************************/
+-
+-/* Include GRUB-specific macros and prototypes here.  */
+-#include <shared.h>
+-
+-/* FIXME: For now, enable the DHCP support. Perhaps I should segregate
+-   the DHCP support from the BOOTP support, and permit both to
+-   co-exist.  */
+-#undef NO_DHCP_SUPPORT
+-
+-/* In GRUB, the relocated address in Etherboot doesn't have any sense.
+-   Just define it as a bogus value.  */
+-#define RELOC	0
+-
+-/* FIXME: Should be an option.  */
+-#define BACKOFF_LIMIT	7
+-
+-#include <osdep.h>
+-
+-#define CTRL_C		3
+-
+-#ifndef	MAX_TFTP_RETRIES
+-# define MAX_TFTP_RETRIES	20
+-#endif
+-
+-#ifndef	MAX_BOOTP_RETRIES
+-# define MAX_BOOTP_RETRIES	20
+-#endif
+-
+-#define MAX_BOOTP_EXTLEN	(ETH_FRAME_LEN - ETH_HLEN - \
+-				 sizeof (struct bootp_t))
++/* 
++ * Transport layer to use Etherboot NIC drivers in GRUB.
++ */
+ 
+-#ifndef	MAX_ARP_RETRIES
+-# define MAX_ARP_RETRIES	20
+-#endif
++#ifndef ETHERBOOT_H
++#define ETHERBOOT_H
+ 
+-#ifndef	MAX_RPC_RETRIES
+-# define MAX_RPC_RETRIES	20
++#include "shared.h"
++#include "osdep.h"
++#include "if_ether.h"
++#include "in.h"
++
++/* Link configuration time in tenths of a second */
++#ifndef VALID_LINK_TIMEOUT
++#define VALID_LINK_TIMEOUT	100 /* 10.0 seconds */
+ #endif
+ 
+-#define	TICKS_PER_SEC		18
+-
+-/* Inter-packet retry in ticks */
+-#define TIMEOUT			(10 * TICKS_PER_SEC)
+-
+-/* These settings have sense only if compiled with -DCONGESTED */
+-/* total retransmission timeout in ticks */
+-#define TFTP_TIMEOUT		(30 * TICKS_PER_SEC)
+-/* packet retransmission timeout in ticks */
+-#define TFTP_REXMT		(3 * TICKS_PER_SEC)
+-
+ #ifndef	NULL
+-# define NULL			((void *) 0)
++#define NULL	((void *)0)
+ #endif
+ 
+-/*
+-   I'm moving towards the defined names in linux/if_ether.h for clarity.
+-   The confusion between 60/64 and 1514/1518 arose because the NS8390
+-   counts the 4 byte frame checksum in the incoming packet, but not
+-   in the outgoing packet. 60/1514 are the correct numbers for most
+-   if not all of the other NIC controllers. I will be retiring the
+-   64/1518 defines in the lead-up to 5.0.
+-*/
+-
+-#define ETH_ALEN		6	/* Size of Ethernet address */
+-#define ETH_HLEN		14	/* Size of ethernet header */
+-#define	ETH_ZLEN		60	/* Minimum packet */
+-/*#define ETH_MIN_PACKET		64*/
+-#define	ETH_FRAME_LEN		1514	/* Maximum packet */
+-/*#define ETH_MAX_PACKET		1518*/
+-/* Because some DHCP/BOOTP servers don't treat the maximum length the same
+-   as Etherboot, subtract the size of an IP header and that of an UDP
+-   header.  */
+-#define	ETH_MAX_MTU		(ETH_FRAME_LEN - ETH_HLEN \
+-				- sizeof (struct iphdr) \
+-				- sizeof (struct udphdr))
+-
+-#define ARP_CLIENT	0
+-#define ARP_SERVER	1
+-#define ARP_GATEWAY	2
+-#define ARP_ROOTSERVER	3
+-#define ARP_SWAPSERVER	4
+-#define MAX_ARP		ARP_SWAPSERVER+1
+-
+-#define	RARP_REQUEST	3
+-#define	RARP_REPLY	4
+-
+-#define IP		0x0800
+-#define ARP		0x0806
+-#define	RARP		0x8035
+-
+-#define BOOTP_SERVER	67
+-#define BOOTP_CLIENT	68
+-#define TFTP_PORT	69
+-#define SUNRPC_PORT	111
+-
+-#define IP_UDP		17
+-/* Same after going through htonl */
+-#define IP_BROADCAST	0xFFFFFFFF
+-
+-#define ARP_REQUEST	1
+-#define ARP_REPLY	2
+-
+-#define BOOTP_REQUEST	1
+-#define BOOTP_REPLY	2
+-
+-#define TAG_LEN(p)		(*((p) + 1))
+-#define RFC1533_COOKIE		99, 130, 83, 99
+-#define RFC1533_PAD		0
+-#define RFC1533_NETMASK		1
+-#define RFC1533_TIMEOFFSET	2
+-#define RFC1533_GATEWAY		3
+-#define RFC1533_TIMESERVER	4
+-#define RFC1533_IEN116NS	5
+-#define RFC1533_DNS		6
+-#define RFC1533_LOGSERVER	7
+-#define RFC1533_COOKIESERVER	8
+-#define RFC1533_LPRSERVER	9
+-#define RFC1533_IMPRESSSERVER	10
+-#define RFC1533_RESOURCESERVER	11
+-#define RFC1533_HOSTNAME	12
+-#define RFC1533_BOOTFILESIZE	13
+-#define RFC1533_MERITDUMPFILE	14
+-#define RFC1533_DOMAINNAME	15
+-#define RFC1533_SWAPSERVER	16
+-#define RFC1533_ROOTPATH	17
+-#define RFC1533_EXTENSIONPATH	18
+-#define RFC1533_IPFORWARDING	19
+-#define RFC1533_IPSOURCEROUTING	20
+-#define RFC1533_IPPOLICYFILTER	21
+-#define RFC1533_IPMAXREASSEMBLY	22
+-#define RFC1533_IPTTL		23
+-#define RFC1533_IPMTU		24
+-#define RFC1533_IPMTUPLATEAU	25
+-#define RFC1533_INTMTU		26
+-#define RFC1533_INTLOCALSUBNETS	27
+-#define RFC1533_INTBROADCAST	28
+-#define RFC1533_INTICMPDISCOVER	29
+-#define RFC1533_INTICMPRESPOND	30
+-#define RFC1533_INTROUTEDISCOVER 31
+-#define RFC1533_INTROUTESOLICIT	32
+-#define RFC1533_INTSTATICROUTES	33
+-#define RFC1533_LLTRAILERENCAP	34
+-#define RFC1533_LLARPCACHETMO	35
+-#define RFC1533_LLETHERNETENCAP	36
+-#define RFC1533_TCPTTL		37
+-#define RFC1533_TCPKEEPALIVETMO	38
+-#define RFC1533_TCPKEEPALIVEGB	39
+-#define RFC1533_NISDOMAIN	40
+-#define RFC1533_NISSERVER	41
+-#define RFC1533_NTPSERVER	42
+-#define RFC1533_VENDOR		43
+-#define RFC1533_NBNS		44
+-#define RFC1533_NBDD		45
+-#define RFC1533_NBNT		46
+-#define RFC1533_NBSCOPE		47
+-#define RFC1533_XFS		48
+-#define RFC1533_XDM		49
+-#ifndef	NO_DHCP_SUPPORT
+-#define RFC2132_REQ_ADDR	50
+-#define RFC2132_MSG_TYPE	53
+-#define RFC2132_SRV_ID		54
+-#define RFC2132_PARAM_LIST	55
+-#define RFC2132_MAX_SIZE	57
+-#define RFC2132_VENDOR_CLASS_ID	60
+-
+-#define DHCPDISCOVER		1
+-#define DHCPOFFER		2
+-#define DHCPREQUEST		3
+-#define DHCPACK			5
+-#endif	/* NO_DHCP_SUPPORT */
+-
+-#define RFC1533_VENDOR_MAJOR	0
+-#define RFC1533_VENDOR_MINOR	0
+-
+-#define RFC1533_VENDOR_MAGIC	128
+-#define RFC1533_VENDOR_ADDPARM	129
+-#define RFC1533_VENDOR_MNUOPTS	160
+-#define RFC1533_VENDOR_SELECTION 176
+-#define RFC1533_VENDOR_MOTD	184
+-#define RFC1533_VENDOR_NUMOFMOTD 8
+-#define RFC1533_VENDOR_IMG	192
+-#define RFC1533_VENDOR_NUMOFIMG	16
+-
+-#define RFC1533_VENDOR_CONFIGFILE	150
+-
+-#define RFC1533_END		255
+-
+-#define BOOTP_VENDOR_LEN	64
+-#ifndef	NO_DHCP_SUPPORT
+-#define DHCP_OPT_LEN		312
+-#endif	/* NO_DHCP_SUPPORT */
+-
+-#define	TFTP_DEFAULTSIZE_PACKET	512
+-#define	TFTP_MAX_PACKET		1432 /* 512 */
+-
+-#define TFTP_RRQ	1
+-#define TFTP_WRQ	2
+-#define TFTP_DATA	3
+-#define TFTP_ACK	4
+-#define TFTP_ERROR	5
+-#define TFTP_OACK	6
+-
+-#define TFTP_CODE_EOF	1
+-#define TFTP_CODE_MORE	2
+-#define TFTP_CODE_ERROR	3
+-#define TFTP_CODE_BOOT	4
+-#define TFTP_CODE_CFG	5
+-
+-#define AWAIT_ARP	0
+-#define AWAIT_BOOTP	1
+-#define AWAIT_TFTP	2
+-#define AWAIT_RARP	3
+-#define AWAIT_RPC	4
+-#define AWAIT_QDRAIN	5	/* drain queue, process ARP requests */
+-
+-typedef struct
+-{
+-  unsigned long	s_addr;
+-}
+-in_addr;
+-
+-struct arptable_t
+-{
+-  in_addr ipaddr;
+-  unsigned char node[6];
+-};
+-
+-/*
+- * A pity sipaddr and tipaddr are not longword aligned or we could use
+- * in_addr. No, I don't want to use #pragma packed.
+- */
+-struct arprequest
+-{
+-  unsigned short hwtype;
+-  unsigned short protocol;
+-  char hwlen;
+-  char protolen;
+-  unsigned short opcode;
+-  char shwaddr[6];
+-  char sipaddr[4];
+-  char thwaddr[6];
+-  char tipaddr[4];
+-};
+-
+-struct iphdr
+-{
+-  char verhdrlen;
+-  char service;
+-  unsigned short len;
+-  unsigned short ident;
+-  unsigned short frags;
+-  char ttl;
+-  char protocol;
+-  unsigned short chksum;
+-  in_addr src;
+-  in_addr dest;
+-};
+-
+-struct udphdr
+-{
+-  unsigned short src;
+-  unsigned short dest;
+-  unsigned short len;
+-  unsigned short chksum;
+-};
+-
+-/* Format of a bootp packet.  */
+-struct bootp_t
+-{
+-  char bp_op;
+-  char bp_htype;
+-  char bp_hlen;
+-  char bp_hops;
+-  unsigned long bp_xid;
+-  unsigned short bp_secs;
+-  unsigned short unused;
+-  in_addr bp_ciaddr;
+-  in_addr bp_yiaddr;
+-  in_addr bp_siaddr;
+-  in_addr bp_giaddr;
+-  char bp_hwaddr[16];
+-  char bp_sname[64];
+-  char bp_file[128];
+-#ifdef	NO_DHCP_SUPPORT
+-  char bp_vend[BOOTP_VENDOR_LEN];
+-#else
+-  char bp_vend[DHCP_OPT_LEN];
+-#endif	/* NO_DHCP_SUPPORT */
+-};
+-
+-/* Format of a bootp IP packet.  */
+-struct bootpip_t
+-{
+-  struct iphdr ip;
+-  struct udphdr udp;
+-  struct bootp_t bp;
+-};
+-
+-/* Format of bootp packet with extensions.  */
+-struct bootpd_t
+-{
+-  struct bootp_t bootp_reply;
+-  unsigned char  bootp_extension[MAX_BOOTP_EXTLEN];
+-};
+-
+-struct tftp_t
+-{
+-  struct iphdr ip;
+-  struct udphdr udp;
+-  unsigned short opcode;
+-  union
+-  {
+-    char rrq[TFTP_DEFAULTSIZE_PACKET];
+-    
+-    struct
+-    {
+-      unsigned short block;
+-      char download[TFTP_MAX_PACKET];
+-    }
+-    data;
+-    
+-    struct
+-    {
+-      unsigned short block;
+-    }
+-    ack;
+-    
+-    struct
+-    {
+-      unsigned short errcode;
+-      char errmsg[TFTP_DEFAULTSIZE_PACKET];
+-    }
+-    err;
+-    
+-    struct
+-    {
+-      char data[TFTP_DEFAULTSIZE_PACKET+2];
+-    }
+-    oack;
+-  }
+-  u;
+-};
+-
+-/* Define a smaller tftp packet solely for making requests to conserve stack
+-   512 bytes should be enough.  */
+-struct tftpreq_t
+-{
+-  struct iphdr ip;
+-  struct udphdr udp;
+-  unsigned short opcode;
+-  union
+-  {
+-    char rrq[512];
+-    
+-    struct
+-    {
+-      unsigned short block;
+-    }
+-    ack;
+-    
+-    struct
+-    {
+-      unsigned short errcode;
+-      char errmsg[512-2];
+-    }
+-    err;
+-  }
+-  u;
+-};
+-
+-#define TFTP_MIN_PACKET	(sizeof(struct iphdr) + sizeof(struct udphdr) + 4)
+-
+-struct rpc_t
+-{
+-  struct iphdr ip;
+-  struct udphdr udp;
+-  union
+-  {
+-    char data[300];		/* longest RPC call must fit!!!! */
+-    
+-    struct
+-    {
+-      long id;
+-      long type;
+-      long rpcvers;
+-      long prog;
+-      long vers;
+-      long proc;
+-      long data[1];
+-    }
+-    call;
+-    
+-    struct
+-    {
+-      long id;
+-      long type;
+-      long rstatus;
+-      long verifier;
+-      long v2;
+-      long astatus;
+-      long data[1];
+-    }
+-    reply;
+-  }
+-  u;
+-};
+-
+-#define PROG_PORTMAP	100000
+-#define PROG_NFS	100003
+-#define PROG_MOUNT	100005
+-
+-#define MSG_CALL	0
+-#define MSG_REPLY	1
+-
+-#define PORTMAP_GETPORT	3
+-
+-#define MOUNT_ADDENTRY	1
+-#define MOUNT_UMOUNTALL	4
+-
+-#define NFS_LOOKUP	4
+-#define NFS_READ	6
+-
+-#define NFS_FHSIZE	32
+-
+-#define NFSERR_PERM	1
+-#define NFSERR_NOENT	2
+-#define NFSERR_ACCES	13
+-
+-/* Block size used for NFS read accesses.  A RPC reply packet (including  all
+- * headers) must fit within a single Ethernet frame to avoid fragmentation.
+- * Chosen to be a power of two, as most NFS servers are optimized for this.  */
+-#define NFS_READ_SIZE	1024
+-
+-#define	FLOPPY_BOOT_LOCATION	0x7c00
+-/* Must match offsets in loader.S */
+-#define ROM_SEGMENT		0x1fa
+-#define ROM_LENGTH		0x1fc
+-
+-#define	ROM_INFO_LOCATION	(FLOPPY_BOOT_LOCATION + ROM_SEGMENT)
+-/* at end of floppy boot block */
+-
+-struct rom_info
+-{
+-  unsigned short	rom_segment;
+-  unsigned short	rom_length;
+-};
+-
+-static inline int
+-rom_address_ok (struct rom_info *rom, int assigned_rom_segment)
+-{
+-  return (assigned_rom_segment < 0xC000
+-	  || assigned_rom_segment == rom->rom_segment);
+-}
+-
+-/* Define a type for passing info to a loaded program.  */
+-struct ebinfo
+-{
+-  unsigned char	major, minor;	/* Version */
+-  unsigned short	flags;		/* Bit flags */
+-};
+-
+-/***************************************************************************
+-External prototypes
+-***************************************************************************/
+-/* main.c */
+-extern void print_network_configuration (void);
+-extern int ifconfig (char *ip, char *sm, char *gw, char *svr);
+-extern int udp_transmit (unsigned long destip, unsigned int srcsock,
+-			 unsigned int destsock, int len, const void *buf);
+-extern int await_reply (int type, int ival, void *ptr, int timeout);
+-extern int decode_rfc1533 (unsigned char *, int, int, int);
+-extern long rfc2131_sleep_interval (int base, int exp);
+-extern void cleanup (void);
+-extern int rarp (void);
+-extern int bootp (void);
+-extern void cleanup_net (void);
+-
+-/* config.c */
+-extern void print_config (void);
+-extern void eth_reset (void);
+-extern int eth_probe (void);
+-extern int eth_poll (void);
+-extern void eth_transmit (const char *d, unsigned int t,
+-			  unsigned int s, const void *p);
+-extern void eth_disable (void);
+-
+-/* misc.c */
+-extern void twiddle (void);
+-extern void sleep (int secs);
+-extern int getdec (char **s);
+-extern void etherboot_printf (const char *, ...);
+-extern int etherboot_sprintf (char *, const char *, ...);
+-extern int inet_aton (char *p, in_addr *i);
+-
+-/***************************************************************************
+-External variables
+-***************************************************************************/
+-/* main.c */
+-extern int ip_abort;
+-extern int network_ready;
+-extern struct rom_info rom;
+-extern struct arptable_t arptable[MAX_ARP];
+-extern struct bootpd_t bootp_data;
+-#define	BOOTP_DATA_ADDR	(&bootp_data)
+-extern unsigned char *end_of_rfc1533;
+ 
+-/* config.c */
+-extern struct nic nic;
++#define gateA20_set() gateA20(1)
++#define gateA20_unset() gateA20(0)
++#define EBDEBUG 0
++/* The 'rom_info' maybe arch depended. It must be moved to some other
++ * place */
++struct rom_info {
++	unsigned short	rom_segment;
++	unsigned short	rom_length;
++};
++
++extern void poll_interruptions P((void));
++
++/* For UNDI drivers */
++extern void fake_irq ( uint8_t irq );
++extern void _trivial_irq_handler_start;
++extern uint32_t get_free_base_memory ( void );
++extern void forget_base_memory ( void*, size_t );
++extern void free_unused_base_memory ( void );
+ 
+-/* Local hack - define some macros to use etherboot source files "as is".  */
+-#ifndef GRUB
+-# undef printf
+-# define printf	etherboot_printf
+-# undef sprintf
+-# define sprintf etherboot_sprintf
+-#endif /* GRUB */
++#endif /* ETHERBOOT_H */
+diff -Naur grub-0.97.orig/netboot/fa311.c grub-0.97/netboot/fa311.c
+--- grub-0.97.orig/netboot/fa311.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/fa311.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,421 +0,0 @@
+-/*
+-        Driver for the National Semiconductor DP83810 Ethernet controller.
+-        
+-        Portions Copyright (C) 2001 Inprimis Technologies, Inc.
+-        http://www.inprimis.com/
+-        
+-        This driver is based (heavily) on the Linux driver for this chip 
+-        which is copyright 1999-2001 by Donald Becker.
+-
+-        This software has no warranties expressed or implied for any
+-        purpose.
+-
+-        This software may be used and distributed according to the terms of
+-        the GNU General Public License (GPL), incorporated herein by reference.
+-        Drivers based on or derived from this code fall under the GPL and must
+-        retain the authorship, copyright and license notice.  This file is not
+-        a complete program and may only be used when the entire operating
+-        system is licensed under the GPL.  License for under other terms may be
+-        available.  Contact the original author for details.
+-
+-        The original author may be reached as becker@scyld.com, or at
+-        Scyld Computing Corporation
+-        410 Severn Ave., Suite 210
+-        Annapolis MD 21403
+-*/
+-
+-
+-typedef unsigned char  u8;
+-typedef   signed char  s8;
+-typedef unsigned short u16;
+-typedef   signed short s16;
+-typedef unsigned int   u32;
+-typedef   signed int   s32;
+-
+-#include "etherboot.h"
+-#include "nic.h"
+-#include "pci.h"
+-
+-#undef	virt_to_bus
+-#define	virt_to_bus(x)          ((unsigned long)x)
+-#define cpu_to_le32(val)        (val)
+-#define le32_to_cpu(val)        (val)
+-#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
+-#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
+-
+-#define TX_RING_SIZE 1
+-#define RX_RING_SIZE 4
+-#define TIME_OUT     1000000
+-#define PKT_BUF_SZ   1536
+-
+-/* Offsets to the device registers. */
+-enum register_offsets {
+-    ChipCmd=0x00, ChipConfig=0x04, EECtrl=0x08, PCIBusCfg=0x0C,
+-    IntrStatus=0x10, IntrMask=0x14, IntrEnable=0x18,
+-    TxRingPtr=0x20, TxConfig=0x24,
+-    RxRingPtr=0x30, RxConfig=0x34,
+-    WOLCmd=0x40, PauseCmd=0x44, RxFilterAddr=0x48, RxFilterData=0x4C,
+-    BootRomAddr=0x50, BootRomData=0x54, StatsCtrl=0x5C, StatsData=0x60,
+-    RxPktErrs=0x60, RxMissed=0x68, RxCRCErrs=0x64,
+-};
+-
+-/* Bit in ChipCmd. */
+-enum ChipCmdBits {
+-    ChipReset=0x100, RxReset=0x20, TxReset=0x10, RxOff=0x08, RxOn=0x04,
+-    TxOff=0x02, TxOn=0x01,
+-};
+-
+-/* Bits in the interrupt status/mask registers. */
+-enum intr_status_bits {
+-    IntrRxDone=0x0001, IntrRxIntr=0x0002, IntrRxErr=0x0004, IntrRxEarly=0x0008,
+-    IntrRxIdle=0x0010, IntrRxOverrun=0x0020,
+-    IntrTxDone=0x0040, IntrTxIntr=0x0080, IntrTxErr=0x0100,
+-    IntrTxIdle=0x0200, IntrTxUnderrun=0x0400,
+-    StatsMax=0x0800, LinkChange=0x4000,	WOLPkt=0x2000,
+-    RxResetDone=0x1000000, TxResetDone=0x2000000,
+-    IntrPCIErr=0x00f00000, IntrNormalSummary=0x0251, IntrAbnormalSummary=0xED20,
+-};
+-
+-/* Bits in the RxMode register. */
+-enum rx_mode_bits {
+-    AcceptErr=0x20, AcceptRunt=0x10, AcceptBroadcast=0xC0000000,
+-    AcceptMulticast=0x00200000, AcceptAllMulticast=0x20000000,
+-    AcceptAllPhys=0x10000000, AcceptMyPhys=0x08000000,
+-};
+-
+-/* Bits in network_desc.status */
+-enum desc_status_bits {
+-    DescOwn=0x80000000, DescMore=0x40000000, DescIntr=0x20000000,
+-    DescNoCRC=0x10000000,
+-    DescPktOK=0x08000000, RxTooLong=0x00400000,
+-};
+-
+-/* The Rx and Tx buffer descriptors. */
+-struct netdev_desc {
+-    u32 next_desc;
+-    s32 cmd_status;
+-    u32 addr;
+-};
+-
+-static struct FA311_DEV {
+-    unsigned int    ioaddr;
+-    unsigned short  vendor;
+-    unsigned short  device;
+-    unsigned int    cur_rx;
+-    unsigned int    cur_tx;
+-    unsigned int    rx_buf_sz;
+-    volatile struct netdev_desc *rx_head_desc;
+-    volatile struct netdev_desc rx_ring[RX_RING_SIZE] __attribute__ ((aligned (4)));
+-    volatile struct netdev_desc tx_ring[TX_RING_SIZE] __attribute__ ((aligned (4)));
+-} fa311_dev;
+-
+-static int  eeprom_read(long ioaddr, int location);
+-static void init_ring(struct FA311_DEV *dev);
+-static void fa311_reset(struct nic *nic);
+-static int  fa311_poll(struct nic *nic);
+-static void fa311_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p);
+-static void fa311_disable(struct nic *nic);
+-
+-static char rx_packet[PKT_BUF_SZ * RX_RING_SIZE] __attribute__ ((aligned (4)));
+-static char tx_packet[PKT_BUF_SZ * TX_RING_SIZE] __attribute__ ((aligned (4)));
+-
+-struct nic * fa311_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
+-{
+-int            prev_eedata;
+-int            i;
+-int            duplex;
+-int            tx_config;
+-int            rx_config;
+-unsigned char  macaddr[6];
+-unsigned char  mactest;
+-unsigned char  pci_bus = 0;
+-struct FA311_DEV* dev = &fa311_dev;
+-	
+-    if (io_addrs == 0 || *io_addrs == 0)
+-        return (0);
+-    memset(dev, 0, sizeof(*dev));
+-    dev->vendor = pci->vendor;
+-    dev->device = pci->dev_id;
+-    dev->ioaddr = pci->membase;
+-
+-    /* Work around the dropped serial bit. */
+-    prev_eedata = eeprom_read(dev->ioaddr, 6);
+-    for (i = 0; i < 3; i++) {
+-        int eedata = eeprom_read(dev->ioaddr, i + 7);
+-        macaddr[i*2] = (eedata << 1) + (prev_eedata >> 15);
+-        macaddr[i*2+1] = eedata >> 7;
+-        prev_eedata = eedata;
+-    }
+-    mactest = 0;
+-    for (i = 0; i < 6; i++)
+-        mactest |= macaddr[i];
+-    if (mactest == 0)
+-        return (0);
+-    for (i = 0; i < 6; i++)
+-        nic->node_addr[i] = macaddr[i];
+-    printf("%! ", nic->node_addr);
+-
+-    adjust_pci_device(pci);
+-
+-    fa311_reset(nic);
+-
+-    nic->reset = fa311_reset;
+-    nic->disable = fa311_disable;
+-    nic->poll = fa311_poll;
+-    nic->transmit = fa311_transmit;
+-
+-    init_ring(dev);
+-
+-    writel(virt_to_bus(dev->rx_ring), dev->ioaddr + RxRingPtr);
+-    writel(virt_to_bus(dev->tx_ring), dev->ioaddr + TxRingPtr);
+-
+-    for (i = 0; i < 6; i += 2)
+-    {
+-        writel(i, dev->ioaddr + RxFilterAddr);
+-        writew(macaddr[i] + (macaddr[i+1] << 8),
+-               dev->ioaddr + RxFilterData);
+-    }
+-
+-    /* Initialize other registers. */
+-    /* Configure for standard, in-spec Ethernet. */
+-    if (readl(dev->ioaddr + ChipConfig) & 0x20000000)
+-    {    /* Full duplex */
+-        tx_config = 0xD0801002;
+-        rx_config = 0x10000020;
+-    }
+-    else
+-    {
+-        tx_config = 0x10801002;
+-        rx_config = 0x0020;
+-    }
+-    writel(tx_config, dev->ioaddr + TxConfig);
+-    writel(rx_config, dev->ioaddr + RxConfig);
+-
+-    duplex = readl(dev->ioaddr + ChipConfig) & 0x20000000 ? 1 : 0;
+-    if (duplex) {
+-        rx_config |= 0x10000000;
+-        tx_config |= 0xC0000000;
+-    } else {
+-        rx_config &= ~0x10000000;
+-        tx_config &= ~0xC0000000;
+-    }
+-    writew(tx_config, dev->ioaddr + TxConfig);
+-    writew(rx_config, dev->ioaddr + RxConfig);
+-
+-    writel(AcceptBroadcast | AcceptAllMulticast | AcceptMyPhys, 
+-           dev->ioaddr + RxFilterAddr);
+-
+-    writel(RxOn | TxOn, dev->ioaddr + ChipCmd);
+-    writel(4, dev->ioaddr + StatsCtrl);              /* Clear Stats */
+-    return nic;	
+-
+-}
+-
+-static void fa311_reset(struct nic *nic)
+-{
+-u32 chip_config;
+-struct FA311_DEV* dev = &fa311_dev;
+-
+-    /* Reset the chip to erase previous misconfiguration. */
+-    outl(ChipReset, dev->ioaddr + ChipCmd);
+-
+-    if ((readl(dev->ioaddr + ChipConfig) & 0xe000) != 0xe000)
+-    {
+-        chip_config = readl(dev->ioaddr + ChipConfig);
+-    }
+-}
+-
+-static int fa311_poll(struct nic *nic)
+-{
+-s32 desc_status;
+-int to;
+-int entry;
+-int retcode;
+-struct FA311_DEV* dev = &fa311_dev;
+-
+-    retcode = 0;
+-    entry = dev->cur_rx;
+-    to = TIME_OUT;
+-    while (to != 0)
+-    {
+-        desc_status = dev->rx_ring[entry].cmd_status;
+-        if ((desc_status & DescOwn) != 0)
+-            break;
+-        else
+-            --to;
+-    }
+-    if (to != 0)
+-    {
+-        readl(dev->ioaddr + IntrStatus);         /* clear interrrupt bits */
+-        /* driver owns the next entry it's a new packet. Send it up. */
+-        if ((desc_status & (DescMore|DescPktOK|RxTooLong)) == DescPktOK)
+-        {
+-            nic->packetlen = (desc_status & 0x0fff) - 4;    /* Omit CRC size. */
+-            memcpy(nic->packet, (char*)(dev->rx_ring[entry].addr), nic->packetlen);
+-            retcode = 1;
+-        }
+-        /* Give the descriptor back to the chip */
+-        dev->rx_ring[entry].cmd_status = cpu_to_le32(dev->rx_buf_sz);
+-        dev->cur_rx++;
+-        if (dev->cur_rx >= RX_RING_SIZE)
+-            dev->cur_rx = 0;
+-        dev->rx_head_desc = &dev->rx_ring[dev->cur_rx];
+-    }
+-    /* Restart Rx engine if stopped. */
+-    writel(RxOn, dev->ioaddr + ChipCmd);
+-    return retcode;
+-}
+-
+-static void fa311_transmit(struct nic *nic, const char *destaddr, unsigned int type, unsigned int len, const char *data)
+-{
+-unsigned short nstype;
+-s32            desc_status;
+-int            to;
+-int            entry;
+-char*          txp;
+-unsigned char* s;
+-struct FA311_DEV* dev = &fa311_dev;
+-
+-    /* Calculate the next Tx descriptor entry. */
+-    entry = dev->cur_tx;
+-    txp = (char*)(dev->tx_ring[entry].addr);
+-
+-    memcpy(txp, destaddr, ETH_ALEN);
+-    memcpy(txp + ETH_ALEN, nic->node_addr, ETH_ALEN);
+-    nstype = htons(type);
+-    memcpy(txp + 12, (char*)&nstype, 2);
+-    memcpy(txp + ETH_HLEN, data, len);
+-    len += ETH_HLEN;
+-    /* pad frame */
+-    if (len <  ETH_ZLEN)
+-    {
+-        s = (unsigned char*)(txp+len);
+-        while (s < (unsigned char*)(txp+ETH_ZLEN))
+-            *s++ = 0;
+-        len = ETH_ZLEN;
+-    }
+-    dev->tx_ring[entry].cmd_status = cpu_to_le32(DescOwn | len);
+-    dev->cur_tx++;
+-    if (dev->cur_tx >= TX_RING_SIZE)
+-        dev->cur_tx = 0;
+-
+-    /* Wake the potentially-idle transmit channel. */
+-    writel(TxOn, dev->ioaddr + ChipCmd);
+-
+-    /* wait for tranmission to complete */
+-    to = TIME_OUT;
+-    while (to != 0)
+-    {
+-        desc_status = dev->tx_ring[entry].cmd_status;
+-        if ((desc_status & DescOwn) == 0)
+-            break;
+-        else
+-            --to;
+-    }
+-
+-    readl(dev->ioaddr + IntrStatus);         /* clear interrrupt bits */
+-    return;
+-}
+-
+-static void fa311_disable(struct nic *nic)
+-{
+-struct FA311_DEV* dev = &fa311_dev;
+-
+-    /* Stop the chip's Tx and Rx processes. */
+-    writel(RxOff | TxOff, dev->ioaddr + ChipCmd);
+-}
+-
+-
+-/* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.
+-   The EEPROM code is for the common 93c06/46 EEPROMs with 6 bit addresses. */
+-
+-/* Delay between EEPROM clock transitions.
+-   No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need
+-   a delay.  Note that pre-2.0.34 kernels had a cache-alignment bug that
+-   made udelay() unreliable.
+-   The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
+-   depricated.
+-*/
+-#define eeprom_delay(ee_addr)	inl(ee_addr)
+-
+-enum EEPROM_Ctrl_Bits {
+-	EE_ShiftClk=0x04, EE_DataIn=0x01, EE_ChipSelect=0x08, EE_DataOut=0x02,
+-};
+-#define EE_Write0 (EE_ChipSelect)
+-#define EE_Write1 (EE_ChipSelect | EE_DataIn)
+-
+-/* The EEPROM commands include the alway-set leading bit. */
+-enum EEPROM_Cmds {
+-	EE_WriteCmd=(5 << 6), EE_ReadCmd=(6 << 6), EE_EraseCmd=(7 << 6),
+-};
+-
+-
+-static int eeprom_read(long addr, int location)
+-{
+-	int i;
+-	int retval = 0;
+-	int ee_addr = addr + EECtrl;
+-	int read_cmd = location | EE_ReadCmd;
+-	writel(EE_Write0, ee_addr);
+-
+-	/* Shift the read command bits out. */
+-	for (i = 10; i >= 0; i--) {
+-		short dataval = (read_cmd & (1 << i)) ? EE_Write1 : EE_Write0;
+-		writel(dataval, ee_addr);
+-		eeprom_delay(ee_addr);
+-		writel(dataval | EE_ShiftClk, ee_addr);
+-		eeprom_delay(ee_addr);
+-	}
+-	writel(EE_ChipSelect, ee_addr);
+-	eeprom_delay(ee_addr);
+-
+-	for (i = 0; i < 16; i++) {
+-		writel(EE_ChipSelect | EE_ShiftClk, ee_addr);
+-		eeprom_delay(ee_addr);
+-		retval |= (readl(ee_addr) & EE_DataOut) ? 1 << i : 0;
+-		writel(EE_ChipSelect, ee_addr);
+-		eeprom_delay(ee_addr);
+-	}
+-
+-	/* Terminate the EEPROM access. */
+-	writel(EE_Write0, ee_addr);
+-	writel(0, ee_addr);
+-	return retval;
+-}
+-
+-/* Initialize the Rx and Tx rings, along with various 'dev' bits. */
+-static void init_ring(struct FA311_DEV *dev)
+-{
+-	int i;
+-
+-	dev->cur_rx = 0;
+-    dev->cur_tx = 0;
+-
+-	dev->rx_buf_sz = PKT_BUF_SZ;
+-	dev->rx_head_desc = &dev->rx_ring[0];
+-
+-	/* Initialize all Rx descriptors. */
+-	for (i = 0; i < RX_RING_SIZE; i++) {
+-		dev->rx_ring[i].next_desc = virt_to_le32desc(&dev->rx_ring[i+1]);
+-		dev->rx_ring[i].cmd_status = DescOwn;
+-	}
+-	/* Mark the last entry as wrapping the ring. */
+-	dev->rx_ring[i-1].next_desc = virt_to_le32desc(&dev->rx_ring[0]);
+-
+-	/* Fill in the Rx buffers.  Handle allocation failure gracefully. */
+-	for (i = 0; i < RX_RING_SIZE; i++) {
+-		dev->rx_ring[i].addr = (u32)(&rx_packet[PKT_BUF_SZ * i]);
+-	    dev->rx_ring[i].cmd_status = cpu_to_le32(dev->rx_buf_sz);
+-	}
+-
+-	for (i = 0; i < TX_RING_SIZE; i++) {
+-		dev->tx_ring[i].next_desc = virt_to_le32desc(&dev->tx_ring[i+1]);
+-		dev->tx_ring[i].cmd_status = 0;
+-	}
+-	dev->tx_ring[i-1].next_desc = virt_to_le32desc(&dev->tx_ring[0]);
+-
+-	for (i = 0; i < TX_RING_SIZE; i++)
+-		dev->tx_ring[i].addr = (u32)(&tx_packet[PKT_BUF_SZ * i]);
+-	return;
+-}
+-
+diff -Naur grub-0.97.orig/netboot/forcedeth.c grub-0.97/netboot/forcedeth.c
+--- grub-0.97.orig/netboot/forcedeth.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/forcedeth.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,1039 @@
++/**************************************************************************
++*    forcedeth.c -- Etherboot device driver for the NVIDIA nForce 
++*			media access controllers.
++*
++* Note: This driver is based on the Linux driver that was based on
++*      a cleanroom reimplementation which was based on reverse
++*      engineered documentation written by Carl-Daniel Hailfinger
++*      and Andrew de Quincey. It's neither supported nor endorsed
++*      by NVIDIA Corp. Use at your own risk.
++*
++*    Written 2004 by Timothy Legge <tlegge@rogers.com>
++*
++*    This program is free software; you can redistribute it and/or modify
++*    it under the terms of the GNU General Public License as published by
++*    the Free Software Foundation; either version 2 of the License, or
++*    (at your option) any later version.
++*
++*    This program is distributed in the hope that it will be useful,
++*    but WITHOUT ANY WARRANTY; without even the implied warranty of
++*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++*    GNU General Public License for more details.
++*
++*    You should have received a copy of the GNU General Public License
++*    along with this program; if not, write to the Free Software
++*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*
++*    Portions of this code based on:
++*		forcedeth: Ethernet driver for NVIDIA nForce media access controllers:
++*
++*	(C) 2003 Manfred Spraul
++*		See Linux Driver for full information
++*	
++*	Linux Driver Version 0.22, 19 Jan 2004
++* 
++* 
++*    REVISION HISTORY:
++*    ================
++*    v1.0	01-31-2004	timlegge	Initial port of Linux driver
++*    v1.1	02-03-2004	timlegge	Large Clean up, first release 
++*    
++*    Indent Options: indent -kr -i8
++***************************************************************************/
++
++/* to get some global routines like printf */
++#include "etherboot.h"
++/* to get the interface to the body of the program */
++#include "nic.h"
++/* to get the PCI support functions, if this is a PCI NIC */
++#include "pci.h"
++/* Include timer support functions */
++#include "timer.h"
++
++#define drv_version "v1.1"
++#define drv_date "02-03-2004"
++
++//#define TFTM_DEBUG
++#ifdef TFTM_DEBUG
++#define dprintf(x) printf x
++#else
++#define dprintf(x)
++#endif
++
++typedef unsigned char u8;
++typedef signed char s8;
++typedef unsigned short u16;
++typedef signed short s16;
++typedef unsigned int u32;
++typedef signed int s32;
++
++/* Condensed operations for readability. */
++#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
++#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
++
++unsigned long BASE;
++/* NIC specific static variables go here */
++
++
++/*
++ * Hardware access:
++ */
++
++#define DEV_NEED_LASTPACKET1	0x0001
++#define DEV_IRQMASK_1		0x0002
++#define DEV_IRQMASK_2		0x0004
++#define DEV_NEED_TIMERIRQ	0x0008
++
++enum {
++	NvRegIrqStatus = 0x000,
++#define NVREG_IRQSTAT_MIIEVENT	0040
++#define NVREG_IRQSTAT_MASK		0x1ff
++	NvRegIrqMask = 0x004,
++#define NVREG_IRQ_RX			0x0002
++#define NVREG_IRQ_RX_NOBUF		0x0004
++#define NVREG_IRQ_TX_ERR		0x0008
++#define NVREG_IRQ_TX2			0x0010
++#define NVREG_IRQ_TIMER			0x0020
++#define NVREG_IRQ_LINK			0x0040
++#define NVREG_IRQ_TX1			0x0100
++#define NVREG_IRQMASK_WANTED_1		0x005f
++#define NVREG_IRQMASK_WANTED_2		0x0147
++#define NVREG_IRQ_UNKNOWN		(~(NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR|NVREG_IRQ_TX2|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX1))
++
++	NvRegUnknownSetupReg6 = 0x008,
++#define NVREG_UNKSETUP6_VAL		3
++
++/*
++ * NVREG_POLL_DEFAULT is the interval length of the timer source on the nic
++ * NVREG_POLL_DEFAULT=97 would result in an interval length of 1 ms
++ */
++	NvRegPollingInterval = 0x00c,
++#define NVREG_POLL_DEFAULT	970
++	NvRegMisc1 = 0x080,
++#define NVREG_MISC1_HD		0x02
++#define NVREG_MISC1_FORCE	0x3b0f3c
++
++	NvRegTransmitterControl = 0x084,
++#define NVREG_XMITCTL_START	0x01
++	NvRegTransmitterStatus = 0x088,
++#define NVREG_XMITSTAT_BUSY	0x01
++
++	NvRegPacketFilterFlags = 0x8c,
++#define NVREG_PFF_ALWAYS	0x7F0008
++#define NVREG_PFF_PROMISC	0x80
++#define NVREG_PFF_MYADDR	0x20
++
++	NvRegOffloadConfig = 0x90,
++#define NVREG_OFFLOAD_HOMEPHY	0x601
++#define NVREG_OFFLOAD_NORMAL	0x5ee
++	NvRegReceiverControl = 0x094,
++#define NVREG_RCVCTL_START	0x01
++	NvRegReceiverStatus = 0x98,
++#define NVREG_RCVSTAT_BUSY	0x01
++
++	NvRegRandomSeed = 0x9c,
++#define NVREG_RNDSEED_MASK	0x00ff
++#define NVREG_RNDSEED_FORCE	0x7f00
++
++	NvRegUnknownSetupReg1 = 0xA0,
++#define NVREG_UNKSETUP1_VAL	0x16070f
++	NvRegUnknownSetupReg2 = 0xA4,
++#define NVREG_UNKSETUP2_VAL	0x16
++	NvRegMacAddrA = 0xA8,
++	NvRegMacAddrB = 0xAC,
++	NvRegMulticastAddrA = 0xB0,
++#define NVREG_MCASTADDRA_FORCE	0x01
++	NvRegMulticastAddrB = 0xB4,
++	NvRegMulticastMaskA = 0xB8,
++	NvRegMulticastMaskB = 0xBC,
++
++	NvRegTxRingPhysAddr = 0x100,
++	NvRegRxRingPhysAddr = 0x104,
++	NvRegRingSizes = 0x108,
++#define NVREG_RINGSZ_TXSHIFT 0
++#define NVREG_RINGSZ_RXSHIFT 16
++	NvRegUnknownTransmitterReg = 0x10c,
++	NvRegLinkSpeed = 0x110,
++#define NVREG_LINKSPEED_FORCE 0x10000
++#define NVREG_LINKSPEED_10	10
++#define NVREG_LINKSPEED_100	100
++#define NVREG_LINKSPEED_1000	1000
++	NvRegUnknownSetupReg5 = 0x130,
++#define NVREG_UNKSETUP5_BIT31	(1<<31)
++	NvRegUnknownSetupReg3 = 0x134,
++#define NVREG_UNKSETUP3_VAL1	0x200010
++	NvRegTxRxControl = 0x144,
++#define NVREG_TXRXCTL_KICK	0x0001
++#define NVREG_TXRXCTL_BIT1	0x0002
++#define NVREG_TXRXCTL_BIT2	0x0004
++#define NVREG_TXRXCTL_IDLE	0x0008
++#define NVREG_TXRXCTL_RESET	0x0010
++	NvRegMIIStatus = 0x180,
++#define NVREG_MIISTAT_ERROR		0x0001
++#define NVREG_MIISTAT_LINKCHANGE	0x0008
++#define NVREG_MIISTAT_MASK		0x000f
++#define NVREG_MIISTAT_MASK2		0x000f
++	NvRegUnknownSetupReg4 = 0x184,
++#define NVREG_UNKSETUP4_VAL	8
++
++	NvRegAdapterControl = 0x188,
++#define NVREG_ADAPTCTL_START	0x02
++#define NVREG_ADAPTCTL_LINKUP	0x04
++#define NVREG_ADAPTCTL_PHYVALID	0x4000
++#define NVREG_ADAPTCTL_RUNNING	0x100000
++#define NVREG_ADAPTCTL_PHYSHIFT	24
++	NvRegMIISpeed = 0x18c,
++#define NVREG_MIISPEED_BIT8	(1<<8)
++#define NVREG_MIIDELAY	5
++	NvRegMIIControl = 0x190,
++#define NVREG_MIICTL_INUSE	0x10000
++#define NVREG_MIICTL_WRITE	0x08000
++#define NVREG_MIICTL_ADDRSHIFT	5
++	NvRegMIIData = 0x194,
++	NvRegWakeUpFlags = 0x200,
++#define NVREG_WAKEUPFLAGS_VAL		0x7770
++#define NVREG_WAKEUPFLAGS_BUSYSHIFT	24
++#define NVREG_WAKEUPFLAGS_ENABLESHIFT	16
++#define NVREG_WAKEUPFLAGS_D3SHIFT	12
++#define NVREG_WAKEUPFLAGS_D2SHIFT	8
++#define NVREG_WAKEUPFLAGS_D1SHIFT	4
++#define NVREG_WAKEUPFLAGS_D0SHIFT	0
++#define NVREG_WAKEUPFLAGS_ACCEPT_MAGPAT		0x01
++#define NVREG_WAKEUPFLAGS_ACCEPT_WAKEUPPAT	0x02
++#define NVREG_WAKEUPFLAGS_ACCEPT_LINKCHANGE	0x04
++
++	NvRegPatternCRC = 0x204,
++	NvRegPatternMask = 0x208,
++	NvRegPowerCap = 0x268,
++#define NVREG_POWERCAP_D3SUPP	(1<<30)
++#define NVREG_POWERCAP_D2SUPP	(1<<26)
++#define NVREG_POWERCAP_D1SUPP	(1<<25)
++	NvRegPowerState = 0x26c,
++#define NVREG_POWERSTATE_POWEREDUP	0x8000
++#define NVREG_POWERSTATE_VALID		0x0100
++#define NVREG_POWERSTATE_MASK		0x0003
++#define NVREG_POWERSTATE_D0		0x0000
++#define NVREG_POWERSTATE_D1		0x0001
++#define NVREG_POWERSTATE_D2		0x0002
++#define NVREG_POWERSTATE_D3		0x0003
++};
++
++
++
++#define NV_TX_LASTPACKET	(1<<0)
++#define NV_TX_RETRYERROR	(1<<3)
++#define NV_TX_LASTPACKET1	(1<<8)
++#define NV_TX_DEFERRED		(1<<10)
++#define NV_TX_CARRIERLOST	(1<<11)
++#define NV_TX_LATECOLLISION	(1<<12)
++#define NV_TX_UNDERFLOW		(1<<13)
++#define NV_TX_ERROR		(1<<14)
++#define NV_TX_VALID		(1<<15)
++
++#define NV_RX_DESCRIPTORVALID	(1<<0)
++#define NV_RX_MISSEDFRAME	(1<<1)
++#define NV_RX_SUBSTRACT1	(1<<3)
++#define NV_RX_ERROR1		(1<<7)
++#define NV_RX_ERROR2		(1<<8)
++#define NV_RX_ERROR3		(1<<9)
++#define NV_RX_ERROR4		(1<<10)
++#define NV_RX_CRCERR		(1<<11)
++#define NV_RX_OVERFLOW		(1<<12)
++#define NV_RX_FRAMINGERR	(1<<13)
++#define NV_RX_ERROR		(1<<14)
++#define NV_RX_AVAIL		(1<<15)
++
++/* Miscelaneous hardware related defines: */
++#define NV_PCI_REGSZ		0x270
++
++/* various timeout delays: all in usec */
++#define NV_TXRX_RESET_DELAY	4
++#define NV_TXSTOP_DELAY1	10
++#define NV_TXSTOP_DELAY1MAX	500000
++#define NV_TXSTOP_DELAY2	100
++#define NV_RXSTOP_DELAY1	10
++#define NV_RXSTOP_DELAY1MAX	500000
++#define NV_RXSTOP_DELAY2	100
++#define NV_SETUP5_DELAY		5
++#define NV_SETUP5_DELAYMAX	50000
++#define NV_POWERUP_DELAY	5
++#define NV_POWERUP_DELAYMAX	5000
++#define NV_MIIBUSY_DELAY	50
++#define NV_MIIPHY_DELAY	10
++#define NV_MIIPHY_DELAYMAX	10000
++
++#define NV_WAKEUPPATTERNS	5
++#define NV_WAKEUPMASKENTRIES	4
++
++/* General driver defaults */
++#define NV_WATCHDOG_TIMEO	(2*HZ)
++#define DEFAULT_MTU		1500	/* also maximum supported, at least for now */
++
++#define RX_RING		4
++#define TX_RING		2
++/* limited to 1 packet until we understand NV_TX_LASTPACKET */
++#define TX_LIMIT_STOP	10
++#define TX_LIMIT_START	5
++
++/* rx/tx mac addr + type + vlan + align + slack*/
++#define RX_NIC_BUFSIZE		(DEFAULT_MTU + 64)
++/* even more slack */
++#define RX_ALLOC_BUFSIZE	(DEFAULT_MTU + 128)
++
++#define OOM_REFILL	(1+HZ/20)
++#define POLL_WAIT	(1+HZ/100)
++
++struct ring_desc {
++	u32 PacketBuffer;
++	u16 Length;
++	u16 Flags;
++};
++
++
++/* Define the TX Descriptor */
++static struct ring_desc tx_ring[TX_RING];
++
++/* Create a static buffer of size RX_BUF_SZ for each
++TX Descriptor.  All descriptors point to a
++part of this buffer */
++static unsigned char txb[TX_RING * RX_NIC_BUFSIZE];
++
++/* Define the TX Descriptor */
++static struct ring_desc rx_ring[RX_RING];
++
++/* Create a static buffer of size RX_BUF_SZ for each
++RX Descriptor   All descriptors point to a
++part of this buffer */
++static unsigned char rxb[RX_RING * RX_NIC_BUFSIZE];
++
++/* Private Storage for the NIC */
++struct forcedeth_private {
++	/* General data:
++	 * Locking: spin_lock(&np->lock); */
++	int in_shutdown;
++	u32 linkspeed;
++	int duplex;
++	int phyaddr;
++
++	/* General data: RO fields */
++	u8 *ring_addr;
++	u32 orig_mac[2];
++	u32 irqmask;
++	/* rx specific fields.
++	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
++	 */
++	struct ring_desc *rx_ring;
++	unsigned int cur_rx, refill_rx;
++	struct sk_buff *rx_skbuff[RX_RING];
++	u32 rx_dma[RX_RING];
++	unsigned int rx_buf_sz;
++
++	/*
++	 * tx specific fields.
++	 */
++	struct ring_desc *tx_ring;
++	unsigned int next_tx, nic_tx;
++	struct sk_buff *tx_skbuff[TX_RING];
++	u32 tx_dma[TX_RING];
++	u16 tx_flags;
++} npx;
++
++static struct forcedeth_private *np;
++
++static inline void pci_push(u8 * base)
++{
++	/* force out pending posted writes */
++	readl(base);
++}
++static int reg_delay(int offset, u32 mask,
++		     u32 target, int delay, int delaymax, const char *msg)
++{
++	u8 *base = (u8 *) BASE;
++
++	pci_push(base);
++	do {
++		udelay(delay);
++		delaymax -= delay;
++		if (delaymax < 0) {
++			if (msg)
++				printf(msg);
++			return 1;
++		}
++	} while ((readl(base + offset) & mask) != target);
++	return 0;
++}
++
++#define MII_READ	(-1)
++#define MII_PHYSID1         0x02	/* PHYS ID 1                   */
++#define MII_PHYSID2         0x03	/* PHYS ID 2                   */
++#define MII_BMCR            0x00	/* Basic mode control register */
++#define MII_BMSR            0x01	/* Basic mode status register  */
++#define MII_ADVERTISE       0x04	/* Advertisement control reg   */
++#define MII_LPA             0x05	/* Link partner ability reg    */
++
++#define BMSR_ANEGCOMPLETE       0x0020	/* Auto-negotiation complete   */
++
++/* Link partner ability register. */
++#define LPA_SLCT                0x001f	/* Same as advertise selector  */
++#define LPA_10HALF              0x0020	/* Can do 10mbps half-duplex   */
++#define LPA_10FULL              0x0040	/* Can do 10mbps full-duplex   */
++#define LPA_100HALF             0x0080	/* Can do 100mbps half-duplex  */
++#define LPA_100FULL             0x0100	/* Can do 100mbps full-duplex  */
++#define LPA_100BASE4            0x0200	/* Can do 100mbps 4k packets   */
++#define LPA_RESV                0x1c00	/* Unused...                   */
++#define LPA_RFAULT              0x2000	/* Link partner faulted        */
++#define LPA_LPACK               0x4000	/* Link partner acked us       */
++#define LPA_NPAGE               0x8000	/* Next page bit               */
++
++/* mii_rw: read/write a register on the PHY.
++ *
++ * Caller must guarantee serialization
++ */
++static int mii_rw(struct nic *nic __unused, int addr, int miireg,
++		  int value)
++{
++	u8 *base = (u8 *) BASE;
++	int was_running;
++	u32 reg;
++	int retval;
++
++	writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
++	was_running = 0;
++	reg = readl(base + NvRegAdapterControl);
++	if (reg & NVREG_ADAPTCTL_RUNNING) {
++		was_running = 1;
++		writel(reg & ~NVREG_ADAPTCTL_RUNNING,
++		       base + NvRegAdapterControl);
++	}
++	reg = readl(base + NvRegMIIControl);
++	if (reg & NVREG_MIICTL_INUSE) {
++		writel(NVREG_MIICTL_INUSE, base + NvRegMIIControl);
++		udelay(NV_MIIBUSY_DELAY);
++	}
++
++	reg =
++	    NVREG_MIICTL_INUSE | (addr << NVREG_MIICTL_ADDRSHIFT) | miireg;
++	if (value != MII_READ) {
++		writel(value, base + NvRegMIIData);
++		reg |= NVREG_MIICTL_WRITE;
++	}
++	writel(reg, base + NvRegMIIControl);
++
++	if (reg_delay(NvRegMIIControl, NVREG_MIICTL_INUSE, 0,
++		      NV_MIIPHY_DELAY, NV_MIIPHY_DELAYMAX, NULL)) {
++		dprintf(("mii_rw of reg %d at PHY %d timed out.\n",
++			 miireg, addr));
++		retval = -1;
++	} else if (value != MII_READ) {
++		/* it was a write operation - fewer failures are detectable */
++		dprintf(("mii_rw wrote 0x%x to reg %d at PHY %d\n",
++			 value, miireg, addr));
++		retval = 0;
++	} else if (readl(base + NvRegMIIStatus) & NVREG_MIISTAT_ERROR) {
++		dprintf(("mii_rw of reg %d at PHY %d failed.\n",
++			 miireg, addr));
++		retval = -1;
++	} else {
++		/* FIXME: why is that required? */
++		udelay(50);
++		retval = readl(base + NvRegMIIData);
++		dprintf(("mii_rw read from reg %d at PHY %d: 0x%x.\n",
++			 miireg, addr, retval));
++	}
++	if (was_running) {
++		reg = readl(base + NvRegAdapterControl);
++		writel(reg | NVREG_ADAPTCTL_RUNNING,
++		       base + NvRegAdapterControl);
++	}
++	return retval;
++}
++
++static void start_rx(struct nic *nic __unused)
++{
++	u8 *base = (u8 *) BASE;
++
++	dprintf(("start_rx\n"));
++	/* Already running? Stop it. */
++	if (readl(base + NvRegReceiverControl) & NVREG_RCVCTL_START) {
++		writel(0, base + NvRegReceiverControl);
++		pci_push(base);
++	}
++	writel(np->linkspeed, base + NvRegLinkSpeed);
++	pci_push(base);
++	writel(NVREG_RCVCTL_START, base + NvRegReceiverControl);
++	pci_push(base);
++}
++
++static void stop_rx(void)
++{
++	u8 *base = (u8 *) BASE;
++
++	dprintf(("stop_rx\n"));
++	writel(0, base + NvRegReceiverControl);
++	reg_delay(NvRegReceiverStatus, NVREG_RCVSTAT_BUSY, 0,
++		  NV_RXSTOP_DELAY1, NV_RXSTOP_DELAY1MAX,
++		  "stop_rx: ReceiverStatus remained busy");
++
++	udelay(NV_RXSTOP_DELAY2);
++	writel(0, base + NvRegLinkSpeed);
++}
++
++static void start_tx(struct nic *nic __unused)
++{
++	u8 *base = (u8 *) BASE;
++
++	dprintf(("start_tx\n"));
++	writel(NVREG_XMITCTL_START, base + NvRegTransmitterControl);
++	pci_push(base);
++}
++
++static void stop_tx(void)
++{
++	u8 *base = (u8 *) BASE;
++
++	dprintf(("stop_tx\n"));
++	writel(0, base + NvRegTransmitterControl);
++	reg_delay(NvRegTransmitterStatus, NVREG_XMITSTAT_BUSY, 0,
++		  NV_TXSTOP_DELAY1, NV_TXSTOP_DELAY1MAX,
++		  "stop_tx: TransmitterStatus remained busy");
++
++	udelay(NV_TXSTOP_DELAY2);
++	writel(0, base + NvRegUnknownTransmitterReg);
++}
++
++
++static void txrx_reset(struct nic *nic __unused)
++{
++	u8 *base = (u8 *) BASE;
++
++	dprintf(("txrx_reset\n"));
++	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET,
++	       base + NvRegTxRxControl);
++	pci_push(base);
++	udelay(NV_TXRX_RESET_DELAY);
++	writel(NVREG_TXRXCTL_BIT2, base + NvRegTxRxControl);
++	pci_push(base);
++}
++
++/*
++ * alloc_rx: fill rx ring entries.
++ * Return 1 if the allocations for the skbs failed and the
++ * rx engine is without Available descriptors
++ */
++static int alloc_rx(struct nic *nic __unused)
++{
++	unsigned int refill_rx = np->refill_rx;
++	int i;
++	//while (np->cur_rx != refill_rx) {
++	for (i = 0; i < RX_RING; i++) {
++		//int nr = refill_rx % RX_RING;
++		rx_ring[i].PacketBuffer =
++		    virt_to_le32desc(&rxb[i * RX_NIC_BUFSIZE]);
++		rx_ring[i].Length = cpu_to_le16(RX_NIC_BUFSIZE);
++		wmb();
++		rx_ring[i].Flags = cpu_to_le16(NV_RX_AVAIL);
++		/*      printf("alloc_rx: Packet  %d marked as Available\n",
++		   refill_rx); */
++		refill_rx++;
++	}
++	np->refill_rx = refill_rx;
++	if (np->cur_rx - refill_rx == RX_RING)
++		return 1;
++	return 0;
++}
++
++static int update_linkspeed(struct nic *nic)
++{
++	int adv, lpa, newdup;
++	u32 newls;
++	adv = mii_rw(nic, np->phyaddr, MII_ADVERTISE, MII_READ);
++	lpa = mii_rw(nic, np->phyaddr, MII_LPA, MII_READ);
++	dprintf(("update_linkspeed: PHY advertises 0x%hX, lpa 0x%hX.\n",
++		 adv, lpa));
++
++	/* FIXME: handle parallel detection properly, handle gigabit ethernet */
++	lpa = lpa & adv;
++	if (lpa & LPA_100FULL) {
++		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_100;
++		newdup = 1;
++	} else if (lpa & LPA_100HALF) {
++		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_100;
++		newdup = 0;
++	} else if (lpa & LPA_10FULL) {
++		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
++		newdup = 1;
++	} else if (lpa & LPA_10HALF) {
++		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
++		newdup = 0;
++	} else {
++		printf("bad ability %hX - falling back to 10HD.\n", lpa);
++		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
++		newdup = 0;
++	}
++	if (np->duplex != newdup || np->linkspeed != newls) {
++		np->duplex = newdup;
++		np->linkspeed = newls;
++		return 1;
++	}
++	return 0;
++}
++
++
++
++static int init_ring(struct nic *nic)
++{
++	int i;
++
++	np->next_tx = np->nic_tx = 0;
++	for (i = 0; i < TX_RING; i++) {
++		tx_ring[i].Flags = 0;
++	}
++
++	np->cur_rx = 0;
++	np->refill_rx = 0;
++	for (i = 0; i < RX_RING; i++) {
++		rx_ring[i].Flags = 0;
++	}
++	return alloc_rx(nic);
++}
++
++static void set_multicast(struct nic *nic)
++{
++
++	u8 *base = (u8 *) BASE;
++	u32 addr[2];
++	u32 mask[2];
++	u32 pff;
++	u32 alwaysOff[2];
++	u32 alwaysOn[2];
++
++	memset(addr, 0, sizeof(addr));
++	memset(mask, 0, sizeof(mask));
++
++	pff = NVREG_PFF_MYADDR;
++
++	alwaysOn[0] = alwaysOn[1] = alwaysOff[0] = alwaysOff[1] = 0;
++
++	addr[0] = alwaysOn[0];
++	addr[1] = alwaysOn[1];
++	mask[0] = alwaysOn[0] | alwaysOff[0];
++	mask[1] = alwaysOn[1] | alwaysOff[1];
++
++	addr[0] |= NVREG_MCASTADDRA_FORCE;
++	pff |= NVREG_PFF_ALWAYS;
++	stop_rx();
++	writel(addr[0], base + NvRegMulticastAddrA);
++	writel(addr[1], base + NvRegMulticastAddrB);
++	writel(mask[0], base + NvRegMulticastMaskA);
++	writel(mask[1], base + NvRegMulticastMaskB);
++	writel(pff, base + NvRegPacketFilterFlags);
++	start_rx(nic);
++}
++
++/**************************************************************************
++RESET - Reset the NIC to prepare for use
++***************************************************************************/
++static int forcedeth_reset(struct nic *nic)
++{
++	u8 *base = (u8 *) BASE;
++	int ret, oom, i;
++	ret = 0;
++	dprintf(("forcedeth: open\n"));
++
++	/* 1) erase previous misconfiguration */
++	/* 4.1-1: stop adapter: ignored, 4.3 seems to be overkill */
++	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
++	writel(0, base + NvRegMulticastAddrB);
++	writel(0, base + NvRegMulticastMaskA);
++	writel(0, base + NvRegMulticastMaskB);
++	writel(0, base + NvRegPacketFilterFlags);
++	writel(0, base + NvRegAdapterControl);
++	writel(0, base + NvRegLinkSpeed);
++	writel(0, base + NvRegUnknownTransmitterReg);
++	txrx_reset(nic);
++	writel(0, base + NvRegUnknownSetupReg6);
++
++	/* 2) initialize descriptor rings */
++	np->in_shutdown = 0;
++	oom = init_ring(nic);
++
++	/* 3) set mac address */
++	{
++		u32 mac[2];
++
++		mac[0] =
++		    (nic->node_addr[0] << 0) + (nic->node_addr[1] << 8) +
++		    (nic->node_addr[2] << 16) + (nic->node_addr[3] << 24);
++		mac[1] =
++		    (nic->node_addr[4] << 0) + (nic->node_addr[5] << 8);
++
++		writel(mac[0], base + NvRegMacAddrA);
++		writel(mac[1], base + NvRegMacAddrB);
++	}
++
++	/* 4) continue setup */
++	np->linkspeed = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
++	np->duplex = 0;
++	writel(NVREG_UNKSETUP3_VAL1, base + NvRegUnknownSetupReg3);
++	writel(0, base + NvRegTxRxControl);
++	pci_push(base);
++	writel(NVREG_TXRXCTL_BIT1, base + NvRegTxRxControl);
++
++	reg_delay(NvRegUnknownSetupReg5, NVREG_UNKSETUP5_BIT31,
++		  NVREG_UNKSETUP5_BIT31, NV_SETUP5_DELAY,
++		  NV_SETUP5_DELAYMAX,
++		  "open: SetupReg5, Bit 31 remained off\n");
++	writel(0, base + NvRegUnknownSetupReg4);
++
++	/* 5) Find a suitable PHY */
++	writel(NVREG_MIISPEED_BIT8 | NVREG_MIIDELAY, base + NvRegMIISpeed);
++	for (i = 1; i < 32; i++) {
++		int id1, id2;
++
++		id1 = mii_rw(nic, i, MII_PHYSID1, MII_READ);
++		if (id1 < 0)
++			continue;
++		id2 = mii_rw(nic, i, MII_PHYSID2, MII_READ);
++		if (id2 < 0)
++			continue;
++		dprintf(("open: Found PHY %04x:%04x at address %d.\n",
++			 id1, id2, i));
++		np->phyaddr = i;
++
++		update_linkspeed(nic);
++
++		break;
++	}
++	if (i == 32) {
++		printf("open: failing due to lack of suitable PHY.\n");
++		ret = -1;
++		goto out_drain;
++	}
++
++	printf("%d-Mbs Link, %s-Duplex\n",
++	       np->linkspeed & NVREG_LINKSPEED_10 ? 10 : 100,
++	       np->duplex ? "Full" : "Half");
++	/* 6) continue setup */
++	writel(NVREG_MISC1_FORCE | (np->duplex ? 0 : NVREG_MISC1_HD),
++	       base + NvRegMisc1);
++	writel(readl(base + NvRegTransmitterStatus),
++	       base + NvRegTransmitterStatus);
++	writel(NVREG_PFF_ALWAYS, base + NvRegPacketFilterFlags);
++	writel(NVREG_OFFLOAD_NORMAL, base + NvRegOffloadConfig);
++
++	writel(readl(base + NvRegReceiverStatus),
++	       base + NvRegReceiverStatus);
++
++	/* FIXME: I cheated and used the calculator to get a random number */
++	i = 75963081;
++	writel(NVREG_RNDSEED_FORCE | (i & NVREG_RNDSEED_MASK),
++	       base + NvRegRandomSeed);
++	writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
++	writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
++	writel(NVREG_POLL_DEFAULT, base + NvRegPollingInterval);
++	writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
++	writel((np->
++		phyaddr << NVREG_ADAPTCTL_PHYSHIFT) |
++	       NVREG_ADAPTCTL_PHYVALID, base + NvRegAdapterControl);
++	writel(NVREG_UNKSETUP4_VAL, base + NvRegUnknownSetupReg4);
++	writel(NVREG_WAKEUPFLAGS_VAL, base + NvRegWakeUpFlags);
++
++	/* 7) start packet processing */
++	writel((u32) virt_to_le32desc(&rx_ring[0]),
++	       base + NvRegRxRingPhysAddr);
++	writel((u32) virt_to_le32desc(&tx_ring[0]),
++	       base + NvRegTxRingPhysAddr);
++
++
++	writel(((RX_RING - 1) << NVREG_RINGSZ_RXSHIFT) +
++	       ((TX_RING - 1) << NVREG_RINGSZ_TXSHIFT),
++	       base + NvRegRingSizes);
++
++	i = readl(base + NvRegPowerState);
++	if ((i & NVREG_POWERSTATE_POWEREDUP) == 0) {
++		writel(NVREG_POWERSTATE_POWEREDUP | i,
++		       base + NvRegPowerState);
++	}
++	pci_push(base);
++	udelay(10);
++	writel(readl(base + NvRegPowerState) | NVREG_POWERSTATE_VALID,
++	       base + NvRegPowerState);
++	writel(NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
++
++	writel(0, base + NvRegIrqMask);
++	pci_push(base);
++	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
++	pci_push(base);
++	writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
++	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
++	pci_push(base);
++/*
++	writel(np->irqmask, base + NvRegIrqMask);
++*/
++	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
++	writel(0, base + NvRegMulticastAddrB);
++	writel(0, base + NvRegMulticastMaskA);
++	writel(0, base + NvRegMulticastMaskB);
++	writel(NVREG_PFF_ALWAYS | NVREG_PFF_MYADDR,
++	       base + NvRegPacketFilterFlags);
++
++	set_multicast(nic);
++	//start_rx(nic);
++	start_tx(nic);
++
++	if (!
++	    (mii_rw(nic, np->phyaddr, MII_BMSR, MII_READ) &
++	     BMSR_ANEGCOMPLETE)) {
++		printf("no link during initialization.\n");
++	}
++
++	udelay(10000);
++      out_drain:
++	return ret;
++}
++
++//extern void hex_dump(const char *data, const unsigned int len);
++
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int forcedeth_poll(struct nic *nic, int retrieve)
++{
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++
++	struct ring_desc *prd;
++	int len;
++	int i;
++
++	i = np->cur_rx % RX_RING;
++	prd = &rx_ring[i];
++
++	if ( ! (prd->Flags & cpu_to_le16(NV_RX_DESCRIPTORVALID)) ) {
++	  return 0;
++	}
++
++	if ( ! retrieve ) return 1;
++
++	/* got a valid packet - forward it to the network core */
++	len = cpu_to_le16(prd->Length);
++	nic->packetlen = len;
++	//hex_dump(rxb + (i * RX_NIC_BUFSIZE), len);
++	memcpy(nic->packet, rxb +
++	       (i * RX_NIC_BUFSIZE), nic->packetlen);
++
++	wmb();
++	np->cur_rx++;
++	alloc_rx(nic);
++	return 1;
++}
++
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void forcedeth_transmit(struct nic *nic, const char *d,	/* Destination */
++			       unsigned int t,	/* Type */
++			       unsigned int s,	/* size */
++			       const char *p)
++{				/* Packet */
++	/* send the packet to destination */
++	u8 *ptxb;
++	u16 nstype;
++	//u16 status;
++	u8 *base = (u8 *) BASE;
++	int nr = np->next_tx % TX_RING;
++
++	/* point to the current txb incase multiple tx_rings are used */
++	ptxb = txb + (nr * RX_NIC_BUFSIZE);
++	//np->tx_skbuff[nr] = ptxb;
++
++	/* copy the packet to ring buffer */
++	memcpy(ptxb, d, ETH_ALEN);	/* dst */
++	memcpy(ptxb + ETH_ALEN, nic->node_addr, ETH_ALEN);	/* src */
++	nstype = htons((u16) t);	/* type */
++	memcpy(ptxb + 2 * ETH_ALEN, (u8 *) & nstype, 2);	/* type */
++	memcpy(ptxb + ETH_HLEN, p, s);
++
++	s += ETH_HLEN;
++	while (s < ETH_ZLEN)	/* pad to min length */
++		ptxb[s++] = '\0';
++
++	tx_ring[nr].PacketBuffer = (u32) virt_to_le32desc(ptxb);
++	tx_ring[nr].Length = cpu_to_le16(s - 1);
++
++	wmb();
++	tx_ring[nr].Flags = np->tx_flags;
++
++	writel(NVREG_TXRXCTL_KICK, base + NvRegTxRxControl);
++	pci_push(base);
++	tx_ring[nr].Flags = np->tx_flags;
++	np->next_tx++;
++}
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void forcedeth_disable(struct dev *dev __unused)
++{
++	/* put the card in its initial state */
++	/* This function serves 3 purposes.
++	 * This disables DMA and interrupts so we don't receive
++	 *  unexpected packets or interrupts from the card after
++	 *  etherboot has finished. 
++	 * This frees resources so etherboot may use
++	 *  this driver on another interface
++	 * This allows etherboot to reinitialize the interface
++	 *  if something is something goes wrong.
++	 */
++	u8 *base = (u8 *) BASE;
++	np->in_shutdown = 1;
++	stop_tx();
++	stop_rx();
++
++	/* disable interrupts on the nic or we will lock up */
++	writel(0, base + NvRegIrqMask);
++	pci_push(base);
++	dprintf(("Irqmask is zero again\n"));
++
++	/* specia op:o write back the misordered MAC address - otherwise
++	 * the next probe_nic would see a wrong address.
++	 */
++	writel(np->orig_mac[0], base + NvRegMacAddrA);
++	writel(np->orig_mac[1], base + NvRegMacAddrB);
++}
++
++/**************************************************************************
++IRQ - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void forcedeth_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++***************************************************************************/
++#define IORESOURCE_MEM 0x00000200
++#define board_found 1
++#define valid_link 0
++static int forcedeth_probe(struct dev *dev, struct pci_device *pci)
++{
++	struct nic *nic = (struct nic *) dev;
++	unsigned long addr;
++	int sz;
++	u8 *base;
++
++	if (pci->ioaddr == 0)
++		return 0;
++
++	printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n",
++	       pci->name, pci->vendor, pci->dev_id);
++
++	nic->irqno  = 0;
++	nic->ioaddr = pci->ioaddr & ~3;
++
++	/* point to private storage */
++	np = &npx;
++
++	adjust_pci_device(pci);
++
++	addr = pci_bar_start(pci, PCI_BASE_ADDRESS_0);
++	sz = pci_bar_size(pci, PCI_BASE_ADDRESS_0);
++
++	/* BASE is used throughout to address the card */
++	BASE = (unsigned long) ioremap(addr, sz);
++	if (!BASE)
++		return 0;
++	//rx_ring[0] = rx_ring;
++	//tx_ring[0] = tx_ring; 
++
++	/* read the mac address */
++	base = (u8 *) BASE;
++	np->orig_mac[0] = readl(base + NvRegMacAddrA);
++	np->orig_mac[1] = readl(base + NvRegMacAddrB);
++
++	nic->node_addr[0] = (np->orig_mac[1] >> 8) & 0xff;
++	nic->node_addr[1] = (np->orig_mac[1] >> 0) & 0xff;
++	nic->node_addr[2] = (np->orig_mac[0] >> 24) & 0xff;
++	nic->node_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
++	nic->node_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
++	nic->node_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
++#ifdef LINUX
++	if (!is_valid_ether_addr(dev->dev_addr)) {
++		/*
++		 * Bad mac address. At least one bios sets the mac address
++		 * to 01:23:45:67:89:ab
++		 */
++		printk(KERN_ERR
++		       "%s: Invalid Mac address detected: %02x:%02x:%02x:%02x:%02x:%02x\n",
++		       pci_name(pci_dev), dev->dev_addr[0],
++		       dev->dev_addr[1], dev->dev_addr[2],
++		       dev->dev_addr[3], dev->dev_addr[4],
++		       dev->dev_addr[5]);
++		printk(KERN_ERR
++		       "Please complain to your hardware vendor. Switching to a random MAC.\n");
++		dev->dev_addr[0] = 0x00;
++		dev->dev_addr[1] = 0x00;
++		dev->dev_addr[2] = 0x6c;
++		get_random_bytes(&dev->dev_addr[3], 3);
++	}
++#endif
++	printf("%s: MAC Address %!, ", pci->name, nic->node_addr);
++
++	np->tx_flags =
++	    cpu_to_le16(NV_TX_LASTPACKET | NV_TX_LASTPACKET1 |
++			NV_TX_VALID);
++	switch (pci->dev_id) {
++	case 0x01C3:		// nforce
++		np->irqmask = NVREG_IRQMASK_WANTED_2;
++		np->irqmask |= NVREG_IRQ_TIMER;
++		break;
++	case 0x0066:		// nforce2
++		np->tx_flags |= cpu_to_le16(NV_TX_LASTPACKET1);
++		np->irqmask = NVREG_IRQMASK_WANTED_2;
++		np->irqmask |= NVREG_IRQ_TIMER;
++		break;
++	case 0x00D6:		// nforce3
++		np->tx_flags |= cpu_to_le16(NV_TX_LASTPACKET1);
++		np->irqmask = NVREG_IRQMASK_WANTED_2;
++		np->irqmask |= NVREG_IRQ_TIMER;
++
++	}
++	dprintf(("%s: forcedeth.c: subsystem: %hX:%hX bound to %s\n",
++		 pci->name, pci->vendor, pci->dev_id, pci->name));
++
++	forcedeth_reset(nic);
++//      if (board_found && valid_link)
++	/* point to NIC specific routines */
++	dev->disable = forcedeth_disable;
++	nic->poll = forcedeth_poll;
++	nic->transmit = forcedeth_transmit;
++	nic->irq    = forcedeth_irq;
++	return 1;
++//      }
++	/* else */
++}
++
++static struct pci_id forcedeth_nics[] = {
++	PCI_ROM(0x10de, 0x01C3, "nforce", "nForce Ethernet Controller"),
++	PCI_ROM(0x10de, 0x0066, "nforce2", "nForce2 Ethernet Controller"),
++	PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce3 Ethernet Controller"),
++};
++
++struct pci_driver forcedeth_driver = {
++	.type = NIC_DRIVER,
++	.name = "forcedeth",
++	.probe = forcedeth_probe,
++	.ids = forcedeth_nics,
++	.id_count = sizeof(forcedeth_nics) / sizeof(forcedeth_nics[0]),
++	.class = 0,
++};
+diff -Naur grub-0.97.orig/netboot/fsys_tftp.c grub-0.97/netboot/fsys_tftp.c
+--- grub-0.97.orig/netboot/fsys_tftp.c	2004-04-15 11:38:40.000000000 +0000
++++ grub-0.97/netboot/fsys_tftp.c	2005-08-31 19:03:35.000000000 +0000
+@@ -29,14 +29,15 @@
+ /* #define TFTP_DEBUG	1 */
+ 
+ #include <filesys.h>
++#include <shared.h>
+ 
+-#define GRUB	1
+-#include <etherboot.h>
+-#include <nic.h>
++#include "grub.h"
++#include "tftp.h"
++#include "nic.h"
+ 
+ static int retry;
+ static unsigned short iport = 2000;
+-static unsigned short oport;
++static unsigned short oport = 0;
+ static unsigned short block, prevblock;
+ static int bcounter;
+ static struct tftp_t tp, saved_tp;
+@@ -46,6 +47,172 @@
+ static unsigned short len, saved_len;
+ static char *buf;
+ 
++/**
++ * tftp_read
++ *
++ * Read file with _name_, data handled by _fnc_. In fact, grub never
++ * use it, we just use it to read dhcp config file.
++ */
++static int await_tftp(int ival, void *ptr __unused, 
++		      unsigned short ptype __unused, struct iphdr *ip, 
++		      struct udphdr *udp)
++{
++	if (!udp) {
++		return 0;
++	}
++	if (arptable[ARP_CLIENT].ipaddr.s_addr != ip->dest.s_addr)
++		return 0;
++	if (ntohs(udp->dest) != ival)
++		return 0;
++	return 1;
++}
++
++int tftp_file_read(const char *name, int (*fnc)(unsigned char *, unsigned int, unsigned int, int))
++{
++	struct tftpreq_t tp;
++	struct tftp_t  *tr;
++	int		rc;
++
++	retry = 0;
++	block = 0;
++	prevblock = 0;
++	bcounter = 0;
++	
++
++	rx_qdrain();
++
++	tp.opcode = htons(TFTP_RRQ);
++	/* Warning: the following assumes the layout of bootp_t.
++	   But that's fixed by the IP, UDP and BOOTP specs. */
++	len = sizeof(tp.ip) + sizeof(tp.udp) + sizeof(tp.opcode) +
++		sprintf((char *)tp.u.rrq, "%s%coctet%cblksize%c%d",
++		name, 0, 0, 0, TFTP_MAX_PACKET) + 1;
++	if (!udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr, ++iport,
++			  TFTP_PORT, len, &tp))
++		return (0);
++	for (;;)
++	{
++		long timeout;
++#ifdef	CONGESTED
++		timeout = rfc2131_sleep_interval(block?TFTP_REXMT: TIMEOUT, retry);
++#else
++		timeout = rfc2131_sleep_interval(TIMEOUT, retry);
++#endif
++		if (!await_reply(await_tftp, iport, NULL, timeout))
++		{
++			if (!block && retry++ < MAX_TFTP_RETRIES)
++			{	/* maybe initial request was lost */
++				if (!udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr,
++						  ++iport, TFTP_PORT, len, &tp))
++					return (0);
++				continue;
++			}
++#ifdef	CONGESTED
++			if (block && ((retry += TFTP_REXMT) < TFTP_TIMEOUT))
++			{	/* we resend our last ack */
++#ifdef	MDEBUG
++				printf("<REXMT>\n");
++#endif
++				udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr,
++					     iport, oport,
++					     TFTP_MIN_PACKET, &tp);
++				continue;
++			}
++#endif
++			break;	/* timeout */
++		}
++		tr = (struct tftp_t *)&nic.packet[ETH_HLEN];
++		if (tr->opcode == ntohs(TFTP_ERROR))
++		{
++			printf("TFTP error %d (%s)\n",
++			       ntohs(tr->u.err.errcode),
++			       tr->u.err.errmsg);
++			break;
++		}
++
++		if (tr->opcode == ntohs(TFTP_OACK)) {
++			char *p = tr->u.oack.data, *e;
++
++			if (prevblock)		/* shouldn't happen */
++				continue;	/* ignore it */
++			len = ntohs(tr->udp.len) - sizeof(struct udphdr) - 2;
++			if (len > TFTP_MAX_PACKET)
++				goto noak;
++			e = p + len;
++			while (*p != '\0' && p < e) {
++/* 				if (!strcasecmp("blksize", p)) { */
++				if (!grub_strcmp("blksize", p)) {
++					p += 8;
++/* 					if ((packetsize = strtoul(p, &p, 10)) < */
++					if ((packetsize = getdec(&p)) < TFTP_DEFAULTSIZE_PACKET)
++						goto noak;
++					while (p < e && *p) p++;
++					if (p < e)
++						p++;
++				}
++				else {
++				noak:
++					tp.opcode = htons(TFTP_ERROR);
++					tp.u.err.errcode = 8;
++/*
++ *	Warning: the following assumes the layout of bootp_t.
++ *	But that's fixed by the IP, UDP and BOOTP specs.
++ */
++					len = sizeof(tp.ip) + sizeof(tp.udp) + sizeof(tp.opcode) + sizeof(tp.u.err.errcode) +
++/*
++ *	Normally bad form to omit the format string, but in this case
++ *	the string we are copying from is fixed. sprintf is just being
++ *	used as a strcpy and strlen.
++ */
++						sprintf((char *)tp.u.err.errmsg,
++						"RFC1782 error") + 1;
++					udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr,
++						     iport, ntohs(tr->udp.src),
++						     len, &tp);
++					return (0);
++				}
++			}
++			if (p > e)
++				goto noak;
++			block = tp.u.ack.block = 0; /* this ensures, that */
++						/* the packet does not get */
++						/* processed as data! */
++		}
++		else if (tr->opcode == htons(TFTP_DATA)) {
++			len = ntohs(tr->udp.len) - sizeof(struct udphdr) - 4;
++			if (len > packetsize)	/* shouldn't happen */
++				continue;	/* ignore it */
++			block = ntohs(tp.u.ack.block = tr->u.data.block); }
++		else {/* neither TFTP_OACK nor TFTP_DATA */
++			break;
++		}
++
++		if ((block || bcounter) && (block != (unsigned short)(prevblock+1))) {
++			/* Block order should be continuous */
++			tp.u.ack.block = htons(block = prevblock);
++		}
++		tp.opcode = htons(TFTP_ACK);
++		oport = ntohs(tr->udp.src);
++		udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr, iport,
++			     oport, TFTP_MIN_PACKET, &tp);	/* ack */
++		if ((unsigned short)(block-prevblock) != 1) {
++			/* Retransmission or OACK, don't process via callback
++			 * and don't change the value of prevblock.  */
++			continue;
++		}
++		prevblock = block;
++		retry = 0;	/* It's the right place to zero the timer? */
++		if ((rc = fnc(tr->u.data.download,
++			      ++bcounter, len, len < packetsize)) <= 0)
++			return(rc);
++		if (len < packetsize) {	/* End of data --- fnc should not have returned */
++			printf("tftp download complete, but\n");
++			return (1);
++		}
++	}
++	return (0);
++}
++
+ /* Fill the buffer by receiving the data via the TFTP protocol.  */
+ static int
+ buf_fill (int abort)
+@@ -65,9 +232,9 @@
+       timeout = rfc2131_sleep_interval (TIMEOUT, retry);
+ #endif
+   
+-      if (! await_reply (AWAIT_TFTP, iport, NULL, timeout))
++      if (! await_reply (await_tftp, iport, NULL, timeout))
+ 	{
+-	  if (ip_abort)
++	  if (user_abort)
+ 	    return 0;
+ 
+ 	  if (! block && retry++ < MAX_TFTP_RETRIES)
+@@ -270,13 +437,7 @@
+   buf_read = 0;
+   saved_filepos = 0;
+ 
+-  /* Clear out the Rx queue first.  It contains nothing of interest,
+-   * except possibly ARP requests from the DHCP/TFTP server.  We use
+-   * polling throughout Etherboot, so some time may have passed since we
+-   * last polled the receive queue, which may now be filled with
+-   * broadcast packets.  This will cause the reply to the packets we are
+-   * about to send to be lost immediately.  Not very clever.  */
+-  await_reply (AWAIT_QDRAIN, 0, NULL, 0);
++  rx_qdrain();
+   
+ #ifdef TFTP_DEBUG
+   grub_printf ("send_rrq ()\n");
+diff -Naur grub-0.97.orig/netboot/grub.h grub-0.97/netboot/grub.h
+--- grub-0.97.orig/netboot/grub.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/grub.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,171 @@
++#ifndef GRUB_H
++#define GRUB_H
++
++#include "osdep.h"
++#include "byteswap.h"
++#include "in.h"
++#include "ip.h"
++#include "udp.h"
++#include "if_ether.h"
++#include "latch.h"
++#include "io.h"
++#include "nic.h"
++#include <shared.h>
++
++#define K_ESC		'\033'
++#define K_EOF		'\04'  /* Ctrl-D */
++#define K_INTR		'\03'  /* Ctrl-C */
++
++#ifndef	MAX_RPC_RETRIES
++#define MAX_RPC_RETRIES		20
++#endif
++
++
++/* Inter-packet retry in ticks */
++#ifndef TIMEOUT
++#define TIMEOUT			(10*TICKS_PER_SEC)
++#endif
++
++#ifndef	NULL
++#define NULL	((void *)0)
++#endif
++
++
++#define ARP_CLIENT	0
++#define ARP_SERVER	1
++#define ARP_GATEWAY	2
++#define MAX_ARP		ARP_GATEWAY+1
++
++#define IGMP_SERVER	0
++#define MAX_IGMP	IGMP_SERVER+1
++
++#define	RARP_REQUEST	3
++#define	RARP_REPLY	4
++
++
++#define MULTICAST_MASK    0xF0000000
++#define MULTICAST_NETWORK 0xE0000000
++
++struct arptable_t {
++	in_addr ipaddr;
++	uint8_t node[6];
++};
++
++struct igmptable_t {
++	in_addr group;
++	unsigned long time;
++};
++
++#define	KERNEL_BUF	(BOOTP_DATA_ADDR->bootp_reply.bp_file)
++
++#define	FLOPPY_BOOT_LOCATION	0x7c00
++/* Must match offsets in loader.S */
++#define ROM_SEGMENT		0x1fa
++#define ROM_LENGTH		0x1fc
++
++#define	ROM_INFO_LOCATION	(FLOPPY_BOOT_LOCATION+ROM_SEGMENT)
++/* at end of floppy boot block */
++
++
++
++/* Define a type for passing info to a loaded program */
++struct ebinfo {
++	uint8_t  major, minor;	/* Version */
++	uint16_t flags;		/* Bit flags */
++};
++
++/***************************************************************************
++External prototypes
++***************************************************************************/
++extern void rx_qdrain P((void));
++extern int tftp P((const char *name, int (*)(unsigned char *, unsigned int, unsigned int, int)));
++extern int ip_transmit P((int len, const void *buf));
++extern void build_ip_hdr P((unsigned long destip, int ttl, int protocol, 
++	int option_len, int len, const void *buf));
++extern void build_udp_hdr P((unsigned long destip, 
++	unsigned int srcsock, unsigned int destsock, int ttl,
++	int len, const void *buf));
++extern int udp_transmit P((unsigned long destip, unsigned int srcsock,
++	unsigned int destsock, int len, const void *buf));
++typedef int (*reply_t)(int ival, void *ptr, unsigned short ptype, struct iphdr *ip, struct udphdr *udp);
++extern int await_reply P((reply_t reply,	int ival, void *ptr, long timeout));
++extern int decode_rfc1533 P((unsigned char *, unsigned int, unsigned int, int));
++extern void join_group(int slot, unsigned long group);
++extern void leave_group(int slot);
++#define RAND_MAX 2147483647L
++extern uint16_t ipchksum P((const void *ip, unsigned long len));
++extern uint16_t add_ipchksums P((unsigned long offset, uint16_t sum, uint16_t new));
++extern int32_t random P((void));
++extern long rfc2131_sleep_interval P((long base, int exp));
++extern long rfc1112_sleep_interval P((long base, int exp));
++#ifndef DOWNLOAD_PROTO_TFTP
++#define	tftp(fname, load_block) 0
++#endif
++extern void cleanup P((void));
++
++/* misc.c */
++extern void twiddle P((void));
++extern void sleep P((int secs));
++extern void interruptible_sleep P((int secs));
++extern void poll_interruptions P((void));
++extern int strcasecmp P((const char *a, const char *b));
++extern char *substr P((const char *a, const char *b));
++extern unsigned long strtoul P((const char *p, const char **, int base));
++extern void printf P((const char *, ...));
++extern int sprintf P((char *, const char *, ...));
++extern int inet_aton P((char *p, in_addr *i));
++extern void putchar P((int));
++extern int getchar P((void));
++extern int iskey P((void));
++
++extern void grub_printf(const char *, ...);
++extern char config_file[128];
++extern void etherboot_printf(const char *,  ...);
++extern int etherboot_sprintf(char *, const char *, ...);
++extern int getdec(char **s);
++extern void cleanup_net(void);
++extern void print_network_configuration (void);
++extern int ifconfig (char *, char *, char *, char *);
++extern struct arptable_t arptable[MAX_ARP];
++
++#undef printf
++#undef sprintf
++#define printf etherboot_printf
++#define sprintf etherboot_sprintf
++
++#ifdef DEBUG
++#define EnterFunction(func) printf("Enter: " func "\n");
++#define LeaveFunction(func) printf("Leave: " func "\n");
++#else
++#define EnterFunction(func)
++#define LeaveFunction(func)
++#endif
++
++/*
++ * Some codes from etherboot use a level in DEBUG. Define it to be
++ * zero means no debug info output, that will make them silence in
++ * compiling. Up it as you want.
++ */
++#ifndef DEBUG
++#  define DEBUG 0
++#endif
++
++/*#define RPC_DEBUG*/
++
++extern char *hostname;
++
++extern int hostnamelen;
++/* Whether network is ready */
++extern int network_ready;
++
++/* User aborted in await_reply if not zero */
++extern int user_abort;
++
++extern int rarp(void);
++extern int grub_eth_probe(void);
++extern int bootp(void);
++
++extern int dhcp(void);
++
++extern struct nic nic;
++#endif /* GRUB_H */
+diff -Naur grub-0.97.orig/netboot/i386_byteswap.h grub-0.97/netboot/i386_byteswap.h
+--- grub-0.97.orig/netboot/i386_byteswap.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/i386_byteswap.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,46 @@
++#ifndef ETHERBOOT_BITS_BYTESWAP_H
++#define ETHERBOOT_BITS_BYTESWAP_H
++
++#include "types.h"
++static inline uint16_t __i386_bswap_16(uint16_t x)
++{
++	__asm__("xchgb %b0,%h0\n\t"
++		: "=q" (x)
++		: "0" (x));
++	return x;
++}
++
++static inline uint32_t __i386_bswap_32(uint32_t x)
++{
++	__asm__("xchgb %b0,%h0\n\t"
++		"rorl $16,%0\n\t"
++		"xchgb %b0,%h0"
++		: "=q" (x)
++		: "0" (x));
++	return x;
++}
++
++
++#define __bswap_constant_16(x) \
++	((uint16_t)((((uint16_t)(x) & 0x00ff) << 8) | \
++		(((uint16_t)(x) & 0xff00) >> 8)))
++
++#define __bswap_constant_32(x) \
++	((uint32_t)((((uint32_t)(x) & 0x000000ffU) << 24) | \
++		(((uint32_t)(x) & 0x0000ff00U) <<  8) | \
++		(((uint32_t)(x) & 0x00ff0000U) >>  8) | \
++		(((uint32_t)(x) & 0xff000000U) >> 24)))
++
++#define __bswap_16(x) \
++	(__builtin_constant_p(x) ? \
++	__bswap_constant_16(x) : \
++	__i386_bswap_16(x))
++
++
++#define __bswap_32(x) \
++	(__builtin_constant_p(x) ? \
++	__bswap_constant_32(x) : \
++	__i386_bswap_32(x))
++
++
++#endif /* ETHERBOOT_BITS_BYTESWAP_H */
+diff -Naur grub-0.97.orig/netboot/i386_elf.h grub-0.97/netboot/i386_elf.h
+--- grub-0.97.orig/netboot/i386_elf.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/i386_elf.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,91 @@
++#ifndef I386_BITS_ELF_H
++#define I386_BITS_ELF_H
++
++#include "cpu.h"
++
++#ifdef CONFIG_X86_64
++/* ELF Defines for the 64bit version of the current architecture */
++#define EM_CURRENT_64	EM_X86_64
++#define EM_CURRENT_64_PRESENT ( \
++	CPU_FEATURE_P(cpu_info.x86_capability, LM) && \
++	CPU_FEATURE_P(cpu_info.x86_capability, PAE) && \
++	CPU_FEATURE_P(cpu_info.x86_capability, PSE))
++			
++#define ELF_CHECK_X86_64_ARCH(x) \
++	(EM_CURRENT_64_PRESENT && ((x).e_machine == EM_X86_64))
++#define __unused_i386
++#else
++#define ELF_CHECK_X86_64_ARCH(x) 0
++#define __unused_i386 __unused
++#endif
++
++
++/* ELF Defines for the current architecture */
++#define	EM_CURRENT	EM_386
++#define ELFDATA_CURRENT	ELFDATA2LSB
++
++#define ELF_CHECK_I386_ARCH(x) \
++	(((x).e_machine == EM_386) || ((x).e_machine == EM_486))
++
++#define ELF_CHECK_ARCH(x) \
++	((ELF_CHECK_I386_ARCH(x) || ELF_CHECK_X86_64_ARCH(x)) && \
++		((x).e_entry <= 0xffffffffUL))
++
++#ifdef  IMAGE_FREEBSD
++/*
++ * FreeBSD has this rather strange "feature" of its design.
++ * At some point in its evolution, FreeBSD started to rely
++ * externally on private/static/debug internal symbol information.
++ * That is, some of the interfaces that software uses to access
++ * and work with the FreeBSD kernel are made available not
++ * via the shared library symbol information (the .DYNAMIC section)
++ * but rather the debug symbols.  This means that any symbol, not
++ * just publicly defined symbols can be (and are) used by system
++ * tools to make the system work.  (such as top, swapinfo, swapon,
++ * etc)
++ *
++ * Even worse, however, is the fact that standard ELF loaders do
++ * not know how to load the symbols since they are not within
++ * an ELF PT_LOAD section.  The kernel needs these symbols to
++ * operate so the following changes/additions to the boot
++ * loading of EtherBoot have been made to get the kernel to load.
++ * All of the changes are within IMAGE_FREEBSD such that the
++ * extra/changed code only compiles when FREEBSD support is
++ * enabled.
++ */
++
++/*
++ * Section header for FreeBSD (debug symbol kludge!) support
++ */
++typedef struct {
++	Elf32_Word	sh_name;	/* Section name (index into the
++					   section header string table). */
++	Elf32_Word	sh_type;	/* Section type. */
++	Elf32_Word	sh_flags;	/* Section flags. */
++	Elf32_Addr	sh_addr;	/* Address in memory image. */
++	Elf32_Off	sh_offset;	/* Offset in file. */
++	Elf32_Size	sh_size;	/* Size in bytes. */
++	Elf32_Word	sh_link;	/* Index of a related section. */
++	Elf32_Word	sh_info;	/* Depends on section type. */
++	Elf32_Size	sh_addralign;	/* Alignment in bytes. */
++	Elf32_Size	sh_entsize;	/* Size of each entry in section. */
++} Elf32_Shdr;
++
++/* sh_type */
++#define SHT_SYMTAB	2		/* symbol table section */
++#define SHT_STRTAB	3		/* string table section */
++
++/*
++ * Module information subtypes (for the metadata that we need to build)
++ */
++#define MODINFO_END		0x0000		/* End of list */
++#define MODINFO_NAME		0x0001		/* Name of module (string) */
++#define MODINFO_TYPE		0x0002		/* Type of module (string) */
++#define MODINFO_METADATA	0x8000		/* Module-specfic */
++
++#define MODINFOMD_SSYM		0x0003		/* start of symbols */
++#define MODINFOMD_ESYM		0x0004		/* end of symbols */
++
++#endif	/* IMAGE_FREEBSD */
++
++#endif /* I386_BITS_ELF_H */
+diff -Naur grub-0.97.orig/netboot/i386_endian.h grub-0.97/netboot/i386_endian.h
+--- grub-0.97.orig/netboot/i386_endian.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/i386_endian.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,6 @@
++#ifndef ETHERBOOT_BITS_ENDIAN_H
++#define ETHERBOOT_BITS_ENDIAN_H
++
++#define __BYTE_ORDER __LITTLE_ENDIAN
++
++#endif /* ETHERBOOT_BITS_ENDIAN_H */
+diff -Naur grub-0.97.orig/netboot/i386_timer.c grub-0.97/netboot/i386_timer.c
+--- grub-0.97.orig/netboot/i386_timer.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/i386_timer.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,192 @@
++/* A couple of routines to implement a low-overhead timer for drivers */
++
++ /*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2, or (at
++ * your option) any later version.
++ */
++#include "grub.h"
++#include "osdep.h"
++#include "io.h"
++#include "timer.h"
++#include "latch.h"
++
++void __load_timer2(unsigned int ticks)
++{
++	/*
++	 * Now let's take care of PPC channel 2
++	 *
++	 * Set the Gate high, program PPC channel 2 for mode 0,
++	 * (interrupt on terminal count mode), binary count,
++	 * load 5 * LATCH count, (LSB and MSB) to begin countdown.
++	 *
++	 * Note some implementations have a bug where the high bits byte
++	 * of channel 2 is ignored.
++	 */
++	/* Set up the timer gate, turn off the speaker */
++	/* Set the Gate high, disable speaker */
++	outb((inb(PPC_PORTB) & ~PPCB_SPKR) | PPCB_T2GATE, PPC_PORTB);
++	/* binary, mode 0, LSB/MSB, Ch 2 */
++	outb(TIMER2_SEL|WORD_ACCESS|MODE0|BINARY_COUNT, TIMER_MODE_PORT);
++	/* LSB of ticks */
++	outb(ticks & 0xFF, TIMER2_PORT);
++	/* MSB of ticks */
++	outb(ticks >> 8, TIMER2_PORT);
++}
++
++static int __timer2_running(void)
++{
++	return ((inb(PPC_PORTB) & PPCB_T2OUT) == 0);
++}
++
++#if !defined(CONFIG_TSC_CURRTICKS)
++void setup_timers(void)
++{
++	return;
++}
++
++void load_timer2(unsigned int ticks)
++{
++	return __load_timer2(ticks);
++}
++
++int timer2_running(void)
++{
++	return __timer2_running();
++}
++
++void ndelay(unsigned int nsecs)
++{
++	waiton_timer2((nsecs * CLOCK_TICK_RATE)/1000000000);
++}
++void udelay(unsigned int usecs)
++{
++	waiton_timer2((usecs * TICKS_PER_MS)/1000);
++}
++#endif /* !defined(CONFIG_TSC_CURRTICKS) */
++
++#if defined(CONFIG_TSC_CURRTICKS)
++
++#define rdtsc(low,high) \
++     __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
++
++#define rdtscll(val) \
++     __asm__ __volatile__ ("rdtsc" : "=A" (val))
++
++
++/* Number of clock ticks to time with the rtc */
++#define LATCH 0xFF
++
++#define LATCHES_PER_SEC ((CLOCK_TICK_RATE + (LATCH/2))/LATCH)
++#define TICKS_PER_LATCH ((LATCHES_PER_SEC + (TICKS_PER_SEC/2))/TICKS_PER_SEC)
++
++static void sleep_latch(void)
++{
++	__load_timer2(LATCH);
++	while(__timer2_running());
++}
++
++/* ------ Calibrate the TSC ------- 
++ * Time how long it takes to excute a loop that runs in known time.
++ * And find the convertion needed to get to CLOCK_TICK_RATE
++ */
++
++
++static unsigned long long calibrate_tsc(void)
++{
++	unsigned long startlow, starthigh;
++	unsigned long endlow, endhigh;
++	
++	rdtsc(startlow,starthigh);
++	sleep_latch();
++	rdtsc(endlow,endhigh);
++
++	/* 64-bit subtract - gcc just messes up with long longs */
++	__asm__("subl %2,%0\n\t"
++		"sbbl %3,%1"
++		:"=a" (endlow), "=d" (endhigh)
++		:"g" (startlow), "g" (starthigh),
++		"0" (endlow), "1" (endhigh));
++	
++	/* Error: ECPUTOOFAST */
++	if (endhigh)
++		goto bad_ctc;
++	
++	endlow *= TICKS_PER_LATCH;
++	return endlow;
++
++	/*
++	 * The CTC wasn't reliable: we got a hit on the very first read,
++	 * or the CPU was so fast/slow that the quotient wouldn't fit in
++	 * 32 bits..
++	 */
++bad_ctc:
++	printf("bad_ctc\n");
++	return 0;
++}
++
++static unsigned long clocks_per_tick;
++void setup_timers(void)
++{
++	if (!clocks_per_tick) {
++		clocks_per_tick = calibrate_tsc();
++		/* Display the CPU Mhz to easily test if the calibration was bad */
++		printf("CPU %ld Mhz\n", (clocks_per_tick/1000 * TICKS_PER_SEC)/1000);
++	}
++}
++
++unsigned long currticks(void)
++{
++	unsigned long clocks_high, clocks_low;
++	unsigned long currticks;
++	/* Read the Time Stamp Counter */
++	rdtsc(clocks_low, clocks_high);
++
++	/* currticks = clocks / clocks_per_tick; */
++	__asm__("divl %1"
++		:"=a" (currticks)
++		:"r" (clocks_per_tick), "0" (clocks_low), "d" (clocks_high));
++
++
++	return currticks;
++}
++
++static unsigned long long timer_timeout;
++static int __timer_running(void)
++{
++	unsigned long long now;
++	rdtscll(now);
++	return now < timer_timeout;
++}
++
++void udelay(unsigned int usecs)
++{
++	unsigned long long now;
++	rdtscll(now);
++	timer_timeout = now + usecs * ((clocks_per_tick * TICKS_PER_SEC)/(1000*1000));
++	while(__timer_running());
++}
++void ndelay(unsigned int nsecs)
++{
++	unsigned long long now;
++	rdtscll(now);
++	timer_timeout = now + nsecs * ((clocks_per_tick * TICKS_PER_SEC)/(1000*1000*1000));
++	while(__timer_running());
++}
++
++void load_timer2(unsigned int timer2_ticks)
++{
++	unsigned long long now;
++	unsigned long clocks;
++	rdtscll(now);
++	clocks = timer2_ticks * ((clocks_per_tick * TICKS_PER_SEC)/CLOCK_TICK_RATE);
++	timer_timeout = now + clocks;
++}
++
++int timer2_running(void)
++{
++	return __timer_running();
++}
++
++#endif /* RTC_CURRTICKS */
+diff -Naur grub-0.97.orig/netboot/i82586.c grub-0.97/netboot/i82586.c
+--- grub-0.97.orig/netboot/i82586.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/i82586.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,825 +0,0 @@
+-/**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-i82586 NIC driver for Etherboot
+-Ken Yap, January 1998
+-***************************************************************************/
+-
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+-#include "etherboot.h"
+-#include "nic.h"
+-#include "cards.h"
+-#include "timer.h"
+-
+-#define	udelay(n)	waiton_timer2(((n)*TICKS_PER_MS)/1000)
+-
+-/* Sources of information:
+-
+-   Donald Becker's excellent 3c507 driver in Linux
+-   Intel 82596 data sheet (yes, 82596; it has a 586 compatibility mode)
+-*/
+-
+-/* Code below mostly stolen wholesale from 3c507.c driver in Linux */
+-
+-/*
+-		Details of the i82586.
+-
+-   You'll really need the databook to understand the details of this part,
+-   but the outline is that the i82586 has two separate processing units.
+-   Both are started from a list of three configuration tables, of which only
+-   the last, the System Control Block (SCB), is used after reset-time.  The SCB
+-   has the following fields:
+-		Status word
+-		Command word
+-		Tx/Command block addr.
+-		Rx block addr.
+-   The command word accepts the following controls for the Tx and Rx units:
+-  */
+-
+-#define	CUC_START	0x0100
+-#define	CUC_RESUME	0x0200
+-#define	CUC_SUSPEND	0x0300
+-#define	RX_START	0x0010
+-#define	RX_RESUME	0x0020
+-#define	RX_SUSPEND	0x0030
+-
+-/* The Rx unit uses a list of frame descriptors and a list of data buffer
+-   descriptors.  We use full-sized (1518 byte) data buffers, so there is
+-   a one-to-one pairing of frame descriptors to buffer descriptors.
+-
+-   The Tx ("command") unit executes a list of commands that look like:
+-	Status word	Written by the 82586 when the command is done.
+-	Command word	Command in lower 3 bits, post-command action in upper 3
+-	Link word	The address of the next command.
+-	Parameters	(as needed).
+-
+-	Some definitions related to the Command Word are:
+- */
+-#define CMD_EOL		0x8000		/* The last command of the list, stop. */
+-#define CMD_SUSP	0x4000		/* Suspend after doing cmd. */
+-#define CMD_INTR	0x2000		/* Interrupt after doing cmd. */
+-
+-enum commands {
+-	CmdNOp = 0, CmdSASetup = 1, CmdConfigure = 2, CmdMulticastList = 3,
+-	CmdTx = 4, CmdTDR = 5, CmdDump = 6, CmdDiagnose = 7};
+-
+-/*
+-		Details of the EtherLink16 Implementation
+-
+-  The 3c507 and NI5210 are generic shared-memory i82586 implementations.
+-  3c507: The host can map 16K, 32K, 48K, or 64K of the 64K memory into
+-  0x0[CD][08]0000, or all 64K into 0xF[02468]0000.
+-  NI5210: The host can map 8k or 16k at 0x[CDE][048C]000 but we
+-  assume 8k because to have 16k you cannot put a ROM on the NIC.
+-  */
+-
+-/* Offsets from the base I/O address. */
+-
+-#ifdef	INCLUDE_3C507
+-
+-#define	SA_DATA		0	/* Station address data, or 3Com signature. */
+-#define MISC_CTRL	6	/* Switch the SA_DATA banks, and bus config bits. */
+-#define RESET_IRQ	10	/* Reset the latched IRQ line. */
+-#define I82586_ATTN	11	/* Frob the 82586 Channel Attention line. */
+-#define ROM_CONFIG	13
+-#define MEM_CONFIG	14
+-#define IRQ_CONFIG	15
+-#define EL16_IO_EXTENT	16
+-
+-/* The ID port is used at boot-time to locate the ethercard. */
+-#define ID_PORT		0x100
+-
+-#endif
+-
+-#ifdef	INCLUDE_NI5210
+-
+-#define	NI52_RESET	0  /* writing to this address, resets the i82586 */
+-#define	I82586_ATTN	1  /* channel attention, kick the 586 */
+-
+-#endif
+-
+-#ifdef	INCLUDE_EXOS205
+-
+-#define	EXOS205_RESET	0  /* writing to this address, resets the i82586 */
+-#define	I82586_ATTN	1  /* channel attention, kick the 586 */
+-
+-#endif
+-
+-/* Offsets to registers in the mailbox (SCB). */
+-#define iSCB_STATUS	0x8
+-#define iSCB_CMD	0xA
+-#define iSCB_CBL	0xC	/* Command BLock offset. */
+-#define iSCB_RFA	0xE	/* Rx Frame Area offset. */
+-
+-/*  Since the 3c507 maps the shared memory window so that the last byte is
+-at 82586 address FFFF, the first byte is at 82586 address 0, 16K, 32K, or
+-48K corresponding to window sizes of 64K, 48K, 32K and 16K respectively.
+-We can account for this be setting the 'SBC Base' entry in the ISCP table
+-below for all the 16 bit offset addresses, and also adding the 'SCB Base'
+-value to all 24 bit physical addresses (in the SCP table and the TX and RX
+-Buffer Descriptors).
+-				-Mark
+-*/
+-
+-/*
+-  What follows in 'init_words[]' is the "program" that is downloaded to the
+-  82586 memory.  It's mostly tables and command blocks, and starts at the
+-  reset address 0xfffff6.  This is designed to be similar to the EtherExpress,
+-  thus the unusual location of the SCB at 0x0008.
+-
+-  Even with the additional "don't care" values, doing it this way takes less
+-  program space than initializing the individual tables, and I feel it's much
+-  cleaner.
+-
+-  The databook is particularly useless for the first two structures, I had
+-  to use the Crynwr driver as an example.
+-
+-  The memory setup is as follows:
+-*/
+-
+-#define CONFIG_CMD	0x18
+-#define SET_SA_CMD	0x24
+-#define SA_OFFSET	0x2A
+-#define IDLELOOP	0x30
+-#define TDR_CMD		0x38
+-#define TDR_TIME	0x3C
+-#define DUMP_CMD	0x40
+-#define DIAG_CMD	0x48
+-#define SET_MC_CMD	0x4E
+-#define DUMP_DATA	0x56	/* A 170 byte buffer for dump and Set-MC into. */
+-
+-#define TX_BUF_START	0x0100
+-#define TX_BUF_SIZE	(1518+14+20+16) /* packet+header+TBD */
+-
+-#define RX_BUF_START	0x1000
+-#define RX_BUF_SIZE	(1518+14+18)	/* packet+header+RBD */
+-#define RX_BUF_END	(mem_end - mem_start - 20)
+-
+-/*
+-  That's it: only 86 bytes to set up the beast, including every extra
+-  command available.  The 170 byte buffer at DUMP_DATA is shared between the
+-  Dump command (called only by the diagnostic program) and the SetMulticastList
+-  command.
+-
+-  To complete the memory setup you only have to write the station address at
+-  SA_OFFSET and create the Tx & Rx buffer lists.
+-
+-  The Tx command chain and buffer list is setup as follows:
+-  A Tx command table, with the data buffer pointing to...
+-  A Tx data buffer descriptor.  The packet is in a single buffer, rather than
+-	chaining together several smaller buffers.
+-  A NoOp command, which initially points to itself,
+-  And the packet data.
+-
+-  A transmit is done by filling in the Tx command table and data buffer,
+-  re-writing the NoOp command, and finally changing the offset of the last
+-  command to point to the current Tx command.  When the Tx command is finished,
+-  it jumps to the NoOp, when it loops until the next Tx command changes the
+-  "link offset" in the NoOp.  This way the 82586 never has to go through the
+-  slow restart sequence.
+-
+-  The Rx buffer list is set up in the obvious ring structure.  We have enough
+-  memory (and low enough interrupt latency) that we can avoid the complicated
+-  Rx buffer linked lists by alway associating a full-size Rx data buffer with
+-  each Rx data frame.
+-
+-  I currently use one transmit buffer starting at TX_BUF_START (0x0100), and
+-  use the rest of memory, from RX_BUF_START to RX_BUF_END, for Rx buffers.
+-
+-  */
+-
+-static unsigned short init_words[] = {
+-	/*	System Configuration Pointer (SCP). */
+-#if	defined(INCLUDE_3C507)
+-	0x0000,					/* Set bus size to 16 bits. */
+-#else
+-	0x0001,					/* Set bus size to 8 bits */
+-#endif
+-	0,0,					/* pad words. */
+-	0x0000,0x0000,				/* ISCP phys addr, set in init_82586_mem(). */
+-
+-	/*	Intermediate System Configuration Pointer (ISCP). */
+-	0x0001,					/* Status word that's cleared when init is done. */
+-	0x0008,0,0,				/* SCB offset, (skip, skip) */
+-
+-	/* System Control Block (SCB). */
+-	0,0xf000|RX_START|CUC_START,		/* SCB status and cmd. */
+-	CONFIG_CMD,				/* Command list pointer, points to Configure. */
+-	RX_BUF_START,				/* Rx block list. */
+-	0,0,0,0,				/* Error count: CRC, align, buffer, overrun. */
+-
+-	/* 0x0018: Configure command.  Change to put MAC data with packet. */
+-	0, CmdConfigure,			/* Status, command. */
+-	SET_SA_CMD,				/* Next command is Set Station Addr. */
+-	0x0804,					/* "4" bytes of config data, 8 byte FIFO. */
+-	0x2e40,					/* Magic values, including MAC data location. */
+-	0,					/* Unused pad word. */
+-
+-	/* 0x0024: Setup station address command. */
+-	0, CmdSASetup,
+-	SET_MC_CMD,				/* Next command. */
+-	0xaa00,0xb000,0x0bad,	/* Station address (to be filled in) */
+-
+-	/* 0x0030: NOP, looping back to itself.  Point to first Tx buffer to Tx. */
+-	0, CmdNOp, IDLELOOP, 0 /* pad */,
+-
+-	/* 0x0038: A unused Time-Domain Reflectometer command. */
+-	0, CmdTDR, IDLELOOP, 0,
+-
+-	/* 0x0040: An unused Dump State command. */
+-	0, CmdDump, IDLELOOP, DUMP_DATA,
+-
+-	/* 0x0048: An unused Diagnose command. */
+-	0, CmdDiagnose, IDLELOOP,
+-
+-	/* 0x004E: An empty set-multicast-list command. */
+-	0, CmdMulticastList, IDLELOOP, 0,
+-};
+-
+-/* NIC specific static variables go here */
+-
+-static unsigned short		ioaddr, irq, scb_base;
+-static Address			mem_start, mem_end;
+-static unsigned short		rx_head, rx_tail;
+-
+-#define	read_mem(m,s)	fmemcpy((char *)s, m, sizeof(s))
+-
+-static void setup_rx_buffers(struct nic *nic)
+-{
+-	Address			write_ptr;
+-	unsigned short		cur_rx_buf;
+-	static unsigned short	rx_cmd[16] = {
+-		0x0000,			/* Rx status */
+-		0x0000,			/* Rx command, only and last */
+-		RX_BUF_START,		/* Link (will be adjusted) */
+-		RX_BUF_START + 22,	/* Buffer offset (will be adjusted) */
+-		0x0000, 0x0000, 0x0000,	/* Pad for dest addr */
+-		0x0000, 0x0000, 0x0000,	/* Pad for source addr */
+-		0x0000,			/* Pad for protocol */
+-		0x0000,			/* Buffer: Actual count */
+-		-1,			/* Buffer: Next (none) */
+-		RX_BUF_START + 0x20,	/* Buffer: Address low (+ scb_base) (will be adjusted) */
+-		0x0000,			/* Buffer: Address high */
+-		0x8000 | (RX_BUF_SIZE - 0x20)
+-	};
+-
+-	cur_rx_buf = rx_head = RX_BUF_START;
+-	do {		/* While there is room for one more buffer */
+-		write_ptr = mem_start + cur_rx_buf;
+-		/* adjust some contents */
+-		rx_cmd[1] = 0x0000;
+-		rx_cmd[2] = cur_rx_buf + RX_BUF_SIZE;
+-		rx_cmd[3] = cur_rx_buf + 22;
+-		rx_cmd[13] = cur_rx_buf + 0x20 + scb_base;
+-		memcpy((char *)write_ptr, (char *)rx_cmd, sizeof(rx_cmd));
+-		rx_tail = cur_rx_buf;
+-		cur_rx_buf += RX_BUF_SIZE;
+-	} while (cur_rx_buf <= RX_BUF_END - RX_BUF_SIZE);
+-	/* Terminate the list by setting the EOL bit and wrap ther pointer
+-	   to make the list a ring. */
+-	write_ptr = mem_start + rx_tail;
+-	rx_cmd[1] = 0xC000;
+-	rx_cmd[2] = rx_head;
+-	memcpy((char *)write_ptr, (char *)rx_cmd, sizeof(unsigned short) * 3);
+-}
+-
+-static void ack_status(void)
+-{
+-	unsigned short	cmd, status;
+-	unsigned short	*shmem = (short *)mem_start;
+-
+-	cmd = (status = shmem[iSCB_STATUS>>1]) & 0xf000;
+-	if (status & 0x100)		/* CU suspended? */
+-		cmd |= CUC_RESUME;
+-	if ((status & 0x200) == 0)	/* CU not active? */
+-		cmd |= CUC_START;
+-	if (status & 0x010)		/* RU suspended? */
+-		cmd |= RX_RESUME;
+-	else if ((status & 0x040) == 0)	/* RU not active? */
+-		cmd |= RX_START;
+-	if (cmd == 0)			/* Nothing to do */
+-		return;
+-	shmem[iSCB_CMD>>1] = cmd;
+-#if	defined(DEBUG)
+-	printf("Status %hX Command %hX\n", status, cmd);
+-#endif
+-	outb(0, ioaddr + I82586_ATTN);
+-}
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-
+-static void i82586_reset(struct nic *nic)
+-{
+-	unsigned long	time;
+-	unsigned short	*shmem = (short *)mem_start;
+-
+-	/* put the card in its initial state */
+-
+-#ifdef	INCLUDE_3C507
+-	/* Enable loopback to protect the wire while starting up,
+-	   and hold the 586 in reset during the memory initialisation. */
+-	outb(0x20, ioaddr + MISC_CTRL);
+-#endif
+-
+-	/* Fix the ISCP address and base. */
+-	init_words[3] = scb_base;
+-	init_words[7] = scb_base;
+-
+-	/* Write the words at 0xfff6. */
+-	/* Write the words at 0x0000. */
+-	/* Fill in the station address. */
+-	memcpy((char *)(mem_end - 10), (char *)init_words, 10);
+-	memcpy((char *)mem_start, (char *)&init_words[5], sizeof(init_words) - 10);
+-	memcpy((char *)mem_start + SA_OFFSET, nic->node_addr, ETH_ALEN);
+-	setup_rx_buffers(nic);
+-
+-#ifdef	INCLUDE_3C507
+-	/* Start the 586 by releasing the reset line, but leave loopback. */
+-	outb(0xA0, ioaddr + MISC_CTRL);
+-#endif
+-
+-	/* This was time consuming to track down; you need to give two channel
+-	   attention signals to reliably start up the i82586. */
+-	outb(0, ioaddr + I82586_ATTN);
+-	time = currticks() + TICKS_PER_SEC;	/* allow 1 second to init */
+-	while (
+-			shmem[iSCB_STATUS>>1] == 0)
+-	{
+-		if (currticks() > time)
+-		{
+-			printf("i82586 initialisation timed out with status %hX, cmd %hX\n",
+-					shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
+-			break;
+-		}
+-	}
+-	/* Issue channel-attn -- the 82586 won't start. */
+-	outb(0, ioaddr + I82586_ATTN);
+-
+-#ifdef	INCLUDE_3C507
+-	/* Disable loopback. */
+-	outb(0x80, ioaddr + MISC_CTRL);
+-#endif
+-#if	defined(DEBUG)
+-	printf("i82586 status %hX, cmd %hX\n",
+-			shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
+-#endif
+-}
+-
+-/**************************************************************************
+-  POLL - Wait for a frame
+- ***************************************************************************/
+-static int i82586_poll(struct nic *nic)
+-{
+-	int		status;
+-	unsigned short	rfd_cmd, next_rx_frame, data_buffer_addr,
+-	frame_status, pkt_len;
+-	unsigned short	*shmem = (short *)mem_start + rx_head;
+-
+-	/* return true if there's an ethernet packet ready to read */
+-	if (
+-			((frame_status = shmem[0]) & 0x8000) == 0)
+-		return (0);		/* nope */
+-	rfd_cmd = shmem[1];
+-	next_rx_frame = shmem[2];
+-	data_buffer_addr = shmem[3];
+-	pkt_len = shmem[11];
+-	status = 0;
+-	if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22
+-			|| (pkt_len & 0xC000) != 0xC000)
+-		printf("\nRx frame corrupt, discarded");
+-	else if ((frame_status & 0x2000) == 0)
+-		printf("\nRx frame had error");
+-	else
+-	{
+-		/* We have a frame, copy it to our buffer */
+-		pkt_len &= 0x3FFF;
+-		memcpy(nic->packet, (char *)mem_start + rx_head + 0x20, pkt_len);
+-		/* Only packets not from ourself */
+-		if (memcmp(nic->packet + ETH_ALEN, nic->node_addr, ETH_ALEN) != 0)
+-		{
+-			nic->packetlen = pkt_len;
+-			status = 1;
+-		}
+-	}
+-	/* Clear the status word and set EOL on Rx frame */
+-	shmem[0] = 0;
+-	shmem[1] = 0xC000;
+-	*(short *)(mem_start + rx_tail + 2) = 0;
+-	rx_tail = rx_head;
+-	rx_head = next_rx_frame;
+-	ack_status();
+-	return (status);
+-}
+-
+-/**************************************************************************
+-  TRANSMIT - Transmit a frame
+- ***************************************************************************/
+-static void i82586_transmit(
+-		struct nic *nic,
+-		const char *d,			/* Destination */
+-		unsigned int t,			/* Type */
+-		unsigned int s,			/* size */
+-		const char *p)			/* Packet */
+-{
+-	Address			bptr;
+-	unsigned short		type, z;
+-	static unsigned short	tx_cmd[11] = {
+-		0x0,			/* Tx status */
+-		CmdTx,			/* Tx command */
+-		TX_BUF_START+16,	/* Next command is a NoOp */
+-		TX_BUF_START+8,		/* Data Buffer offset */
+-		0x8000,			/* | with size */
+-		0xffff,			/* No next data buffer */
+-		TX_BUF_START+22,	/* + scb_base */
+-		0x0,			/* Buffer address high bits (always zero) */
+-		0x0,			/* Nop status */
+-		CmdNOp,			/* Nop command */
+-		TX_BUF_START+16		/* Next is myself */
+-	};
+-	unsigned short	*shmem = (short *)mem_start + TX_BUF_START;
+-
+-	/* send the packet to destination */
+-	/* adjust some contents */
+-	type = htons(t);
+-	if (s < ETH_ZLEN)
+-		s = ETH_ZLEN;
+-	tx_cmd[4] = (s + ETH_HLEN) | 0x8000;
+-	tx_cmd[6] = TX_BUF_START + 22 + scb_base;
+-	bptr = mem_start + TX_BUF_START;
+-	memcpy((char *)bptr, (char *)tx_cmd, sizeof(tx_cmd));
+-	bptr += sizeof(tx_cmd);
+-	memcpy((char *)bptr, d, ETH_ALEN);
+-	bptr += ETH_ALEN;
+-	memcpy((char *)bptr, nic->node_addr, ETH_ALEN);
+-	bptr += ETH_ALEN;
+-	memcpy((char *)bptr, (char *)&type, sizeof(type));
+-	bptr += sizeof(type);
+-	memcpy((char *)bptr, p, s);
+-	/* Change the offset in the IDLELOOP */
+-	*(unsigned short *)(mem_start + IDLELOOP + 4) = TX_BUF_START;
+-	/* Wait for transmit completion */
+-	while (
+-			(shmem[0] & 0x2000) == 0)
+-		;
+-	/* Change the offset in the IDLELOOP back and
+-	   change the final loop to point here */
+-	*(unsigned short *)(mem_start + IDLELOOP + 4) = IDLELOOP;
+-	*(unsigned short *)(mem_start + TX_BUF_START + 20) = IDLELOOP;
+-	ack_status();
+-}
+-
+-/**************************************************************************
+-  DISABLE - Turn off ethernet interface
+- ***************************************************************************/
+-static void i82586_disable(struct nic *nic)
+-{
+-	unsigned short	*shmem = (short *)mem_start;
+-
+-#if	0
+-	/* Flush the Tx and disable Rx. */
+-	shmem[iSCB_CMD>>1] = RX_SUSPEND | CUC_SUSPEND;
+-	outb(0, ioaddr + I82586_ATTN);
+-#ifdef	INCLUDE_NI5210
+-	outb(0, ioaddr + NI52_RESET);
+-#endif
+-#endif	/* 0 */
+-}
+-
+-#ifdef	INCLUDE_3C507
+-
+-static int t507_probe1(struct nic *nic, unsigned short ioaddr)
+-{
+-	int			i;
+-	Address			size;
+-	char			mem_config;
+-	char			if_port;
+-
+-	if (inb(ioaddr) != '*' || inb(ioaddr+1) != '3'
+-		|| inb(ioaddr+2) != 'C' || inb(ioaddr+3) != 'O')
+-		return (0);
+-	irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
+-	mem_config = inb(ioaddr + MEM_CONFIG);
+-	if (mem_config & 0x20)
+-	{
+-		size = 65536L;
+-		mem_start = 0xf00000L + (mem_config & 0x08 ? 0x080000L
+-			: (((Address)mem_config & 0x3) << 17));
+-	}
+-	else
+-	{
+-		size = ((((Address)mem_config & 0x3) + 1) << 14);
+-		mem_start = 0x0c0000L + (((Address)mem_config & 0x18) << 12);
+-	}
+-	mem_end = mem_start + size;
+-	scb_base = 65536L - size;
+-	if_port = inb(ioaddr + ROM_CONFIG) & 0x80;
+-	/* Get station address */
+-	outb(0x01, ioaddr + MISC_CTRL);
+-	for (i = 0; i < ETH_ALEN; ++i)
+-	{
+-		nic->node_addr[i] = inb(ioaddr+i);
+-	}
+-	printf("\n3c507 ioaddr %#hX, IRQ %d, mem [%#X-%#X], %sternal xcvr, addr %!\n",
+-		ioaddr, irq, mem_start, mem_end, if_port ? "in" : "ex", nic->node_addr);
+-	return (1);
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-
+-struct nic *t507_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	static unsigned char	init_ID_done = 0;
+-	unsigned short		lrs_state = 0xff;
+-	static unsigned short	io_addrs[] = { 0x300, 0x320, 0x340, 0x280, 0 };
+-	unsigned short		*p;
+-	int			i;
+-
+-	if (init_ID_done == 0)
+-	{
+-		/* Send the ID sequence to the ID_PORT to enable the board */
+-		outb(0x00, ID_PORT);
+-		for (i = 0; i < 255; ++i)
+-		{
+-			outb(lrs_state, ID_PORT);
+-			lrs_state <<= 1;
+-			if (lrs_state & 0x100)
+-				lrs_state ^= 0xe7;
+-		}
+-		outb(0x00, ID_PORT);
+-		init_ID_done = 1;
+-	}
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	if (probe_addrs == 0)
+-		probe_addrs = io_addrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
+-		if (t507_probe1(nic, ioaddr))
+-			break;
+-	if (ioaddr != 0)
+-	{
+-		/* point to NIC specific routines */
+-		i82586_reset(nic);
+-		nic->reset = i82586_reset;
+-		nic->poll = i82586_poll;
+-		nic->transmit = i82586_transmit;
+-		nic->disable = i82586_disable;
+-		return nic;
+-	}
+-	/* else */
+-	{
+-		return 0;
+-	}
+-}
+-
+-#endif
+-
+-#ifdef	INCLUDE_NI5210
+-
+-static int ni5210_probe2(void)
+-{
+-	unsigned short		i;
+-	unsigned short		shmem[10];
+-
+-	/* Fix the ISCP address and base. */
+-	init_words[3] = scb_base;
+-	init_words[7] = scb_base;
+-
+-	/* Write the words at 0xfff6. */
+-	/* Write the words at 0x0000. */
+-	memcpy((char *)(mem_end - 10), (char *)init_words, 10);
+-	memcpy((char *)mem_start, (char *)&init_words[5], sizeof(init_words) - 10);
+-	if (*(unsigned short *)mem_start != 1)
+-		return (0);
+-	outb(0, ioaddr + NI52_RESET);
+-	outb(0, ioaddr + I82586_ATTN);
+-	udelay(32);
+-	i = 50;
+-	while (
+-		shmem[iSCB_STATUS>>1] == 0)
+-	{
+-		if (--i == 0)
+-		{
+-			printf("i82586 initialisation timed out with status %hX, cmd %hX\n",
+-				shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
+-			break;
+-		}
+-	}
+-	/* Issue channel-attn -- the 82586 won't start. */
+-	outb(0, ioaddr + I82586_ATTN);
+-	if (*(unsigned short *)mem_start != 0)
+-		return (0);
+-	return (1);
+-}
+-
+-static int ni5210_probe1(struct nic *nic)
+-{
+-	int			i;
+-	static Address		mem_addrs[] = {
+-		0xc0000, 0xc4000, 0xc8000, 0xcc000,
+-		0xd0000, 0xd4000, 0xd8000, 0xdc000,
+-		0xe0000, 0xe4000, 0xe8000, 0xec000,
+-		0 };
+-	Address			*p;
+-
+-	if (inb(ioaddr + 6) != 0x0 || inb(ioaddr + 7) != 0x55)
+-		return (0);
+-	scb_base = -8192;		/* assume 8k memory */
+-	for (p = mem_addrs; (mem_start = *p) != 0; ++p)
+-		if (mem_end = mem_start + 8192, ni5210_probe2())
+-			break;
+-	if (mem_start == 0)
+-		return (0);
+-	/* Get station address */
+-	for (i = 0; i < ETH_ALEN; ++i)
+-	{
+-		nic->node_addr[i] = inb(ioaddr+i);
+-	}
+-	printf("\nNI5210 ioaddr %#hX, mem [%#X-%#X], addr %!\n",
+-		ioaddr, mem_start, mem_end, nic->node_addr);
+-	return (1);
+-}
+-
+-struct nic *ni5210_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	/* missing entries are addresses usually already used */
+-	static unsigned short	io_addrs[] = {
+-		0x200, 0x208, 0x210, 0x218, 0x220, 0x228, 0x230, 0x238,
+-		0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 0x270, /*Par*/
+-		0x280, 0x288, 0x290, 0x298, 0x2A0, 0x2A8, 0x2B0, 0x2B8,
+-		0x2C0, 0x2C8, 0x2D0, 0x2D8, 0x2E0, 0x2E8, 0x2F0, /*Ser*/
+-		0x300, 0x308, 0x310, 0x318, 0x320, 0x328, 0x330, 0x338,
+-		0x340, 0x348, 0x350, 0x358, 0x360, 0x368, 0x370, /*Par*/
+-		0x380, 0x388, 0x390, 0x398, 0x3A0, 0x3A8, /*Vid,Par*/
+-		0x3C0, 0x3C8, 0x3D0, 0x3D8, 0x3E0, 0x3E8, /*Ser*/
+-		0x0
+-	};
+-	unsigned short		*p;
+-	int			i;
+-
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	if (probe_addrs == 0)
+-		probe_addrs = io_addrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
+-		if (ni5210_probe1(nic))
+-			break;
+-	if (ioaddr != 0)
+-	{
+-		/* point to NIC specific routines */
+-		i82586_reset(nic);
+-		nic->reset = i82586_reset;
+-		nic->poll = i82586_poll;
+-		nic->transmit = i82586_transmit;
+-		nic->disable = i82586_disable;
+-		return nic;
+-	}
+-	/* else */
+-	{
+-		return 0;
+-	}
+-}
+-#endif
+-
+-#ifdef	INCLUDE_EXOS205
+-
+-/*
+- * Code to download to I186 in EXOS205
+- */
+-
+-static unsigned char exos_i186_init[] =
+-{
+-0x08,0x00,0x14,0x00,0x00,0x00,0xaa,0xfa,0x33,0xc0,0xba,0xfe,0xff,0xef,0xb8,0xf8,
+-0xff,0xe7,0xa0,0xb8,0x7c,0x00,0xe7,0xa4,0xb8,0xbc,0x80,0xe7,0xa8,0x8c,0xc8,0x8e,
+-0xd8,0xbb,0x2f,0x0e,0xc6,0x07,0xa5,0x33,0xc9,0xeb,0x00,0xeb,0x00,0xeb,0x00,0xe2,
+-0xf8,0xbe,0x2c,0x0e,0xba,0x02,0x05,0x33,0xdb,0xb9,0x03,0x00,0xec,0x24,0x0f,0x8a,
+-0xe0,0x02,0xd8,0x42,0x42,0xec,0x02,0xd8,0xd0,0xe0,0xd0,0xe0,0xd0,0xe0,0xd0,0xe0,
+-0x0a,0xc4,0x88,0x04,0x42,0x42,0x46,0xe2,0xe3,0x8a,0xe3,0xd0,0xec,0xd0,0xec,0xd0,
+-0xec,0xd0,0xec,0x80,0xe3,0x0f,0x02,0xe3,0x80,0xf4,0x05,0xec,0x3a,0xe0,0x74,0x05,
+-0xc6,0x04,0x5a,0xeb,0xfe,0xc6,0x04,0x55,0x33,0xc0,0x8e,0xd8,0xbe,0x38,0x00,0xc7,
+-0x04,0xce,0x0e,0x46,0x46,0xc7,0x04,0x00,0xff,0xfb,0xba,0x3c,0x00,0xb8,0x03,0x00,
+-0xef,0x33,0xdb,0x33,0xc9,0xbd,0x04,0x0f,0x90,0x90,0x90,0x90,0xe2,0xfa,0x43,0x2e,
+-0x89,0x5e,0x00,0xeb,0xf3,0x52,0xba,0x00,0x06,0xef,0x50,0x53,0x55,0xbd,0xf8,0x0e,
+-0x2e,0x8b,0x5e,0x00,0x43,0x2e,0x89,0x5e,0x00,0xba,0x22,0x00,0xb8,0x00,0x80,0xef,
+-0x5d,0x5b,0x58,0x5a,0xcf,0x49,0x4e,0x54,0x52,0x20,0x63,0x6e,0x74,0x2d,0x3e,0x00,
+-0x00,0x4c,0x4f,0x4f,0x50,0x20,0x63,0x6e,0x74,0x2d,0x3e,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xea,0x30,0x0e,0x00,0xff,0x00,0x00,0x00,0x00,
+-0x00,0x00,0x00,0x00,0x00,0x00,00
+-};
+-
+-/* These offsets are from the end of the i186 download code */
+-
+-#define	OFFSET_SEMA		0x1D1
+-#define	OFFSET_ADDR		0x1D7
+-
+-static int exos205_probe2(void)
+-{
+-	unsigned short		i;
+-	unsigned short		shmem[10];
+-
+-	/* Fix the ISCP address and base. */
+-	init_words[3] = scb_base;
+-	init_words[7] = scb_base;
+-
+-	/* Write the words at 0xfff6. */
+-	/* Write the words at 0x0000. */
+-	memcpy((char *)(mem_end - 10), (char *)init_words, 10);
+-	memcpy((char *)mem_start, (char *)&init_words[5], sizeof(init_words) - 10);
+-	if (*(unsigned short *)mem_start != 1)
+-		return (0);
+-	outb(0, ioaddr + EXOS205_RESET);
+-	outb(0, ioaddr + I82586_ATTN);
+-	i = 50;
+-	while (
+-		shmem[iSCB_STATUS>>1] == 0)
+-	{
+-		if (--i == 0)
+-		{
+-			printf("i82586 initialisation timed out with status %hX, cmd %hX\n",
+-				shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
+-			break;
+-		}
+-	}
+-	/* Issue channel-attn -- the 82586 won't start. */
+-	outb(0, ioaddr + I82586_ATTN);
+-	if (*(unsigned short *)mem_start != 0)
+-		return (0);
+-	return (1);
+-}
+-
+-static int exos205_probe1(struct nic *nic)
+-{
+-	int			i;
+-	/* If you know the other addresses please let me know */
+-	static Address		mem_addrs[] = {
+-		0xcc000, 0 };
+-	Address			*p;
+-
+-	scb_base = -16384;		/* assume 8k memory */
+-	for (p = mem_addrs; (mem_start = *p) != 0; ++p)
+-		if (mem_end = mem_start + 16384, exos205_probe2())
+-			break;
+-	if (mem_start == 0)
+-		return (0);
+-	/* Get station address */
+-	for (i = 0; i < ETH_ALEN; ++i)
+-	{
+-		nic->node_addr[i] = inb(ioaddr+i);
+-	}
+-	printf("\nEXOS205 ioaddr %#hX, mem [%#X-%#X], addr %!\n",
+-		ioaddr, mem_start, mem_end, nic->node_addr);
+-	return (1);
+-}
+-
+-struct nic *exos205_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	/* If you know the other addresses, please let me know */
+-	static unsigned short	io_addrs[] = {
+-		0x310, 0x0
+-	};
+-	unsigned short		*p;
+-	int			i;
+-
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	if (probe_addrs == 0)
+-		probe_addrs = io_addrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
+-		if (exos205_probe1(nic))
+-			break;
+-	if (ioaddr != 0)
+-	{
+-		/* point to NIC specific routines */
+-		i82586_reset(nic);
+-		nic->reset = i82586_reset;
+-		nic->poll = i82586_poll;
+-		nic->transmit = i82586_transmit;
+-		nic->disable = i82586_disable;
+-		return nic;
+-	}
+-	/* else */
+-	{
+-		return 0;
+-	}
+-}
+-
+-#endif
+diff -Naur grub-0.97.orig/netboot/if_arp.h grub-0.97/netboot/if_arp.h
+--- grub-0.97.orig/netboot/if_arp.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/if_arp.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,29 @@
++#ifndef	_IF_ARP_H
++#define	_IF_ARP_H
++
++#include "types.h"
++
++#define ARP_REQUEST	1
++#define ARP_REPLY	2
++
++#ifndef	MAX_ARP_RETRIES
++#define MAX_ARP_RETRIES		20
++#endif
++
++/*
++ * A pity sipaddr and tipaddr are not longword aligned or we could use
++ * in_addr. No, I don't want to use #pragma packed.
++ */
++struct arprequest {
++	uint16_t hwtype;
++	uint16_t protocol;
++	uint8_t  hwlen;
++	uint8_t  protolen;
++	uint16_t opcode;
++	uint8_t  shwaddr[6];
++	uint8_t  sipaddr[4];
++	uint8_t  thwaddr[6];
++	uint8_t  tipaddr[4];
++};
++
++#endif	/* _IF_ARP_H */
+diff -Naur grub-0.97.orig/netboot/if_ether.h grub-0.97/netboot/if_ether.h
+--- grub-0.97.orig/netboot/if_ether.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/if_ether.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,21 @@
++#ifndef	_IF_ETHER_H
++#define	_IF_ETHER_H
++
++/*
++   I'm moving towards the defined names in linux/if_ether.h for clarity.
++   The confusion between 60/64 and 1514/1518 arose because the NS8390
++   counts the 4 byte frame checksum in the incoming packet, but not
++   in the outgoing packet. 60/1514 are the correct numbers for most
++   if not all of the other NIC controllers.
++*/
++
++#define ETH_ALEN		6	/* Size of Ethernet address */
++#define ETH_HLEN		14	/* Size of ethernet header */
++#define	ETH_ZLEN		60	/* Minimum packet */
++#define	ETH_FRAME_LEN		1514	/* Maximum packet */
++#define ETH_DATA_ALIGN		2	/* Amount needed to align the data after an ethernet header */
++#ifndef	ETH_MAX_MTU
++#define	ETH_MAX_MTU		(ETH_FRAME_LEN-ETH_HLEN)
++#endif
++
++#endif	/* _IF_ETHER_H */
+diff -Naur grub-0.97.orig/netboot/igmp.h grub-0.97/netboot/igmp.h
+--- grub-0.97.orig/netboot/igmp.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/igmp.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,27 @@
++#ifndef	_IGMP_H
++#define	_IGMP_H
++
++/* Max interval between IGMP packets */
++#define IGMP_INTERVAL			(10*TICKS_PER_SEC)
++#define IGMPv1_ROUTER_PRESENT_TIMEOUT	(400*TICKS_PER_SEC)
++
++#define IGMP_QUERY	0x11
++#define IGMPv1_REPORT	0x12
++#define IGMPv2_REPORT	0x16
++#define IGMP_LEAVE	0x17
++#define GROUP_ALL_HOSTS 0xe0000001 /* 224.0.0.1 Host byte order */
++
++struct igmp {
++	uint8_t  type;
++	uint8_t  response_time;
++	uint16_t chksum;
++	in_addr group;
++};
++
++struct igmp_ip_t { /* Format of an igmp ip packet */
++	struct iphdr ip;
++	uint8_t router_alert[4]; /* Router alert option */
++	struct igmp igmp;
++};
++
++#endif	/* _IGMP_H */
+diff -Naur grub-0.97.orig/netboot/in.h grub-0.97/netboot/in.h
+--- grub-0.97.orig/netboot/in.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/in.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,21 @@
++#ifndef	_IN_H
++#define	_IN_H
++
++#include "types.h"
++
++#define IP		0x0800
++#define ARP		0x0806
++#define	RARP		0x8035
++
++#define IP_ICMP		1
++#define IP_IGMP		2
++#define IP_UDP		17
++
++/* Same after going through htonl */
++#define IP_BROADCAST	0xFFFFFFFF
++
++typedef struct {
++	uint32_t	s_addr;
++} in_addr;
++
++#endif	/* _IN_H */
+diff -Naur grub-0.97.orig/netboot/io.h grub-0.97/netboot/io.h
+--- grub-0.97.orig/netboot/io.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/io.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,239 @@
++#ifndef	IO_H
++#define IO_H
++
++
++/* Amount of relocation etherboot is experiencing */
++extern unsigned long virt_offset;
++
++/* Don't require identity mapped physical memory,
++ * osloader.c is the only valid user at the moment.
++ */
++unsigned long virt_to_phys(volatile const void *virt_addr);
++void *phys_to_virt(unsigned long phys_addr);
++
++/* virt_to_bus converts an addresss inside of etherboot [_start, _end]
++ * into a memory access cards can use.
++ */
++#define virt_to_bus virt_to_phys
++
++
++/* bus_to_virt reverses virt_to_bus, the address must be output
++ * from virt_to_bus to be valid.  This function does not work on
++ * all bus addresses.
++ */
++#define bus_to_virt phys_to_virt
++
++/* ioremap converts a random 32bit bus address into something
++ * etherboot can access.
++ */
++static inline void *ioremap(unsigned long bus_addr, unsigned long length __unused)
++{
++	return bus_to_virt(bus_addr);
++}
++
++/* iounmap cleans up anything ioremap had to setup */
++static inline void iounmap(void *virt_addr __unused)
++{
++	return;
++}
++
++/*
++ * This file contains the definitions for the x86 IO instructions
++ * inb/inw/inl/outb/outw/outl and the "string versions" of the same
++ * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing"
++ * versions of the single-IO instructions (inb_p/inw_p/..).
++ *
++ * This file is not meant to be obfuscating: it's just complicated
++ * to (a) handle it all in a way that makes gcc able to optimize it
++ * as well as possible and (b) trying to avoid writing the same thing
++ * over and over again with slight variations and possibly making a
++ * mistake somewhere.
++ */
++
++/*
++ * Thanks to James van Artsdalen for a better timing-fix than
++ * the two short jumps: using outb's to a nonexistent port seems
++ * to guarantee better timings even on fast machines.
++ *
++ * On the other hand, I'd like to be sure of a non-existent port:
++ * I feel a bit unsafe about using 0x80 (should be safe, though)
++ *
++ *		Linus
++ */
++
++#ifdef	SLOW_IO_BY_JUMPING
++#define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:")
++#else
++#define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80")
++#endif
++
++#ifdef	REALLY_SLOW_IO
++#define SLOW_DOWN_IO { __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; }
++#else
++#define SLOW_DOWN_IO __SLOW_DOWN_IO
++#endif
++
++/*
++ * readX/writeX() are used to access memory mapped devices. On some
++ * architectures the memory mapped IO stuff needs to be accessed
++ * differently. On the x86 architecture, we just read/write the
++ * memory location directly.
++ */
++#define readb(addr) (*(volatile unsigned char *) (addr))
++#define readw(addr) (*(volatile unsigned short *) (addr))
++#define readl(addr) (*(volatile unsigned int *) (addr))
++
++#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b))
++#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b))
++#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b))
++
++#define memcpy_fromio(a,b,c)	memcpy((a),(void *)(b),(c))
++#define memcpy_toio(a,b,c)	memcpy((void *)(a),(b),(c))
++
++/*
++ * Force strict CPU ordering.
++ * And yes, this is required on UP too when we're talking
++ * to devices.
++ *
++ * For now, "wmb()" doesn't actually do anything, as all
++ * Intel CPU's follow what Intel calls a *Processor Order*,
++ * in which all writes are seen in the program order even
++ * outside the CPU.
++ *
++ * I expect future Intel CPU's to have a weaker ordering,
++ * but I'd also expect them to finally get their act together
++ * and add some real memory barriers if so.
++ *
++ * Some non intel clones support out of order store. wmb() ceases to be a
++ * nop for these.
++ */
++ 
++#define mb() 	__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
++#define rmb()	mb()
++#define wmb()	mb();
++
++
++/*
++ * Talk about misusing macros..
++ */
++
++#define __OUT1(s,x) \
++extern void __out##s(unsigned x value, unsigned short port); \
++extern inline void __out##s(unsigned x value, unsigned short port) {
++
++#define __OUT2(s,s1,s2) \
++__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
++
++#define __OUT(s,s1,x) \
++__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); } \
++__OUT1(s##c,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); } \
++__OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); SLOW_DOWN_IO; } \
++__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
++
++#define __IN1(s,x) \
++extern unsigned x __in##s(unsigned short port); \
++extern inline unsigned x __in##s(unsigned short port) { unsigned x _v;
++
++#define __IN2(s,s1,s2) \
++__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
++
++#define __IN(s,s1,x,i...) \
++__IN1(s,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); return _v; } \
++__IN1(s##c,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); return _v; } \
++__IN1(s##_p,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); SLOW_DOWN_IO; return _v; } \
++__IN1(s##c_p,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; }
++
++#define __INS(s) \
++extern void ins##s(unsigned short port, void * addr, unsigned long count); \
++extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
++{ __asm__ __volatile__ ("cld ; rep ; ins" #s \
++: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
++
++#define __OUTS(s) \
++extern void outs##s(unsigned short port, const void * addr, unsigned long  count); \
++extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
++{ __asm__ __volatile__ ("cld ; rep ; outs" #s \
++: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
++
++__IN(b,"", char)
++__IN(w,"",short)
++__IN(l,"", long)
++
++__OUT(b,"b",char)
++__OUT(w,"w",short)
++__OUT(l,,int)
++
++__INS(b)
++__INS(w)
++__INS(l)
++
++__OUTS(b)
++__OUTS(w)
++__OUTS(l)
++
++/*
++ * Note that due to the way __builtin_constant_p() works, you
++ *  - can't use it inside a inline function (it will never be true)
++ *  - you don't have to worry about side effects within the __builtin..
++ */
++#define outb(val,port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__outbc((val),(port)) : \
++	__outb((val),(port)))
++
++#define inb(port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__inbc(port) : \
++	__inb(port))
++
++#define outb_p(val,port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__outbc_p((val),(port)) : \
++	__outb_p((val),(port)))
++
++#define inb_p(port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__inbc_p(port) : \
++	__inb_p(port))
++
++#define outw(val,port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__outwc((val),(port)) : \
++	__outw((val),(port)))
++
++#define inw(port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__inwc(port) : \
++	__inw(port))
++
++#define outw_p(val,port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__outwc_p((val),(port)) : \
++	__outw_p((val),(port)))
++
++#define inw_p(port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__inwc_p(port) : \
++	__inw_p(port))
++
++#define outl(val,port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__outlc((val),(port)) : \
++	__outl((val),(port)))
++
++#define inl(port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__inlc(port) : \
++	__inl(port))
++
++#define outl_p(val,port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__outlc_p((val),(port)) : \
++	__outl_p((val),(port)))
++
++#define inl_p(port) \
++((__builtin_constant_p((port)) && (port) < 256) ? \
++	__inlc_p(port) : \
++	__inl_p(port))
++
++#endif /* ETHERBOOT_IO_H */
+diff -Naur grub-0.97.orig/netboot/ip.h grub-0.97/netboot/ip.h
+--- grub-0.97.orig/netboot/ip.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/ip.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,36 @@
++#ifndef	_IP_H
++#define	_IP_H
++
++/* We need 'uint16_t' */
++#include "types.h"
++/* We need 'in_addr' */
++#include "in.h"
++
++struct iphdr {
++	uint8_t  verhdrlen;
++	uint8_t  service;
++	uint16_t len;
++	uint16_t ident;
++	uint16_t frags;
++	uint8_t  ttl;
++	uint8_t  protocol;
++	uint16_t chksum;
++	in_addr src;
++	in_addr dest;
++};
++
++extern void build_ip_hdr(unsigned long __destip, int __ttl, int __protocol, 
++			 int __option_len, int __len, const void * __buf);
++
++extern int ip_transmit(int __len, const void * __buf);
++
++extern uint16_t ipchksum(const void * __data, unsigned long __length);
++
++extern uint16_t add_ipchksums(unsigned long __offset, uint16_t __sum, 
++			      uint16_t __new);
++
++
++
++
++
++#endif	/* _IP_H */
+diff -Naur grub-0.97.orig/netboot/isa.h grub-0.97/netboot/isa.h
+--- grub-0.97.orig/netboot/isa.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/isa.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,27 @@
++#if !defined(ISA_H) && defined(CONFIG_ISA)
++#define ISA_H
++
++struct dev;
++
++#define ISAPNP_VENDOR(a,b,c)	(((((a)-'A'+1)&0x3f)<<2)|\
++				((((b)-'A'+1)&0x18)>>3)|((((b)-'A'+1)&7)<<13)|\
++				((((c)-'A'+1)&0x1f)<<8))
++
++#define	GENERIC_ISAPNP_VENDOR	ISAPNP_VENDOR('P','N','P')
++
++struct isa_driver
++{
++	int type;
++	const char *name;
++	int (*probe)(struct dev *, unsigned short *);
++	unsigned short *ioaddrs;
++};
++
++#define __isa_driver	__attribute__ ((unused,__section__(".drivers.isa")))
++extern const struct isa_driver isa_drivers[];
++extern const struct isa_driver isa_drivers_end[];
++
++#define ISA_ROM(IMAGE, DESCRIPTION)
++
++#endif /* ISA_H */
++
+diff -Naur grub-0.97.orig/netboot/lance.c grub-0.97/netboot/lance.c
+--- grub-0.97.orig/netboot/lance.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/lance.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,564 +0,0 @@
+-/**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-LANCE NIC driver for Etherboot
+-Large portions borrowed from the Linux LANCE driver by Donald Becker
+-Ken Yap, July 1997
+-***************************************************************************/
+-
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+-/* to get some global routines like printf */
+-#include "etherboot.h"
+-/* to get the interface to the body of the program */
+-#include "nic.h"
+-#ifdef	INCLUDE_LANCE
+-#include "pci.h"
+-#endif
+-#include "cards.h"
+-
+-/* Offsets from base I/O address */
+-#if	defined(INCLUDE_NE2100) || defined(INCLUDE_LANCE)
+-#define	LANCE_ETH_ADDR	0x0
+-#define	LANCE_DATA	0x10
+-#define	LANCE_ADDR	0x12
+-#define	LANCE_RESET	0x14
+-#define	LANCE_BUS_IF	0x16
+-#define	LANCE_TOTAL_SIZE	0x18
+-#endif
+-#ifdef	INCLUDE_NI6510
+-#define	LANCE_ETH_ADDR	0x8
+-#define	LANCE_DATA	0x0
+-#define	LANCE_ADDR	0x2
+-#define	LANCE_RESET	0x4
+-#define	LANCE_BUS_IF	0x6
+-#define	LANCE_TOTAL_SIZE	0x10
+-#endif
+-
+-/* lance_poll() now can use multiple Rx buffers to prevent packet loss. Set
+- * Set LANCE_LOG_RX_BUFFERS to 0..7 for 1, 2, 4, 8, 16, 32, 64 or 128 Rx
+- * buffers. Usually 4 (=16 Rx buffers) is a good value. (Andreas Neuhaus)
+- * Decreased to 2 (=4 Rx buffers) (Ken Yap, 20010305) */
+-
+-#define LANCE_LOG_RX_BUFFERS	2		/* Use 2^2=4 Rx buffers */
+-
+-#define RX_RING_SIZE		(1 << (LANCE_LOG_RX_BUFFERS))
+-#define RX_RING_MOD_MASK	(RX_RING_SIZE - 1)
+-#define RX_RING_LEN_BITS	((LANCE_LOG_RX_BUFFERS) << 29)
+-
+-struct lance_init_block
+-{
+-	unsigned short	mode;
+-	unsigned char	phys_addr[ETH_ALEN];
+-	unsigned long	filter[2];
+-	Address		rx_ring;
+-	Address		tx_ring;
+-};
+-
+-struct lance_rx_head
+-{
+-	union {
+-		Address		base;
+-		unsigned char	addr[4];
+-	} u;
+-	short		buf_length;	/* 2s complement */
+-	short		msg_length;
+-};
+-
+-struct lance_tx_head
+-{
+-	union {
+-		Address		base;
+-		unsigned char	addr[4];
+-	} u;
+-	short		buf_length;	/* 2s complement */
+-	short		misc;
+-};
+-
+-struct lance_interface
+-{
+-	struct lance_init_block	init_block;
+-	struct lance_rx_head	rx_ring[RX_RING_SIZE];
+-	struct lance_tx_head	tx_ring;
+-	unsigned char		rbuf[RX_RING_SIZE][ETH_FRAME_LEN+4];
+-	unsigned char		tbuf[ETH_FRAME_LEN];
+-	/*
+-	 * Do not alter the order of the struct members above;
+-	 * the hardware depends on the correct alignment.
+-	 */
+-	int			rx_idx;
+-};
+-
+-#define	LANCE_MUST_PAD		0x00000001
+-#define	LANCE_ENABLE_AUTOSELECT	0x00000002
+-#define	LANCE_SELECT_PHONELINE	0x00000004
+-#define	LANCE_MUST_UNRESET	0x00000008
+-
+-/* A mapping from the chip ID number to the part number and features.
+-   These are from the datasheets -- in real life the '970 version
+-   reportedly has the same ID as the '965. */
+-static const struct lance_chip_type
+-{
+-	int	id_number;
+-	const char	*name;
+-	int	flags;
+-} chip_table[] = {
+-	{0x0000, "LANCE 7990",			/* Ancient lance chip.  */
+-		LANCE_MUST_PAD + LANCE_MUST_UNRESET},
+-	{0x0003, "PCnet/ISA 79C960",		/* 79C960 PCnet/ISA.  */
+-		LANCE_ENABLE_AUTOSELECT},
+-	{0x2260, "PCnet/ISA+ 79C961",		/* 79C961 PCnet/ISA+, Plug-n-Play.  */
+-		LANCE_ENABLE_AUTOSELECT},
+-	{0x2420, "PCnet/PCI 79C970",		/* 79C970 or 79C974 PCnet-SCSI, PCI. */
+-		LANCE_ENABLE_AUTOSELECT},
+-	/* Bug: the PCnet/PCI actually uses the PCnet/VLB ID number, so just call
+-		it the PCnet32. */
+-	{0x2430, "PCnet32",			/* 79C965 PCnet for VL bus. */
+-		LANCE_ENABLE_AUTOSELECT},
+-        {0x2621, "PCnet/PCI-II 79C970A",        /* 79C970A PCInetPCI II. */
+-                LANCE_ENABLE_AUTOSELECT},
+-	{0x2625, "PCnet-FAST III 79C973",	/* 79C973 PCInet-FAST III. */
+-		LANCE_ENABLE_AUTOSELECT},
+-        {0x2626, "PCnet/HomePNA 79C978",        
+-                LANCE_ENABLE_AUTOSELECT|LANCE_SELECT_PHONELINE},
+-	{0x0, "PCnet (unknown)",
+-		LANCE_ENABLE_AUTOSELECT},
+-};
+-
+-/* Define a macro for converting program addresses to real addresses */
+-#undef	virt_to_bus
+-#define	virt_to_bus(x)		((unsigned long)x)
+-
+-static int			chip_version;
+-static int			lance_version;
+-static unsigned short		ioaddr;
+-#ifndef	INCLUDE_LANCE
+-static int			dma;
+-#endif
+-static struct lance_interface	*lp;
+-
+-/* additional 8 bytes for 8-byte alignment space */
+-#ifdef	USE_LOWMEM_BUFFER
+-#define lance ((char *)0x10000 - (sizeof(struct lance_interface)+8))
+-#else
+-static char			lance[sizeof(struct lance_interface)+8];
+-#endif
+-
+-#ifndef	INCLUDE_LANCE
+-/* DMA defines and helper routines */
+-
+-/* DMA controller registers */
+-#define DMA1_CMD_REG		0x08	/* command register (w) */
+-#define DMA1_STAT_REG		0x08	/* status register (r) */
+-#define DMA1_REQ_REG            0x09    /* request register (w) */
+-#define DMA1_MASK_REG		0x0A	/* single-channel mask (w) */
+-#define DMA1_MODE_REG		0x0B	/* mode register (w) */
+-#define DMA1_CLEAR_FF_REG	0x0C	/* clear pointer flip-flop (w) */
+-#define DMA1_TEMP_REG           0x0D    /* Temporary Register (r) */
+-#define DMA1_RESET_REG		0x0D	/* Master Clear (w) */
+-#define DMA1_CLR_MASK_REG       0x0E    /* Clear Mask */
+-#define DMA1_MASK_ALL_REG       0x0F    /* all-channels mask (w) */
+-
+-#define DMA2_CMD_REG		0xD0	/* command register (w) */
+-#define DMA2_STAT_REG		0xD0	/* status register (r) */
+-#define DMA2_REQ_REG            0xD2    /* request register (w) */
+-#define DMA2_MASK_REG		0xD4	/* single-channel mask (w) */
+-#define DMA2_MODE_REG		0xD6	/* mode register (w) */
+-#define DMA2_CLEAR_FF_REG	0xD8	/* clear pointer flip-flop (w) */
+-#define DMA2_TEMP_REG           0xDA    /* Temporary Register (r) */
+-#define DMA2_RESET_REG		0xDA	/* Master Clear (w) */
+-#define DMA2_CLR_MASK_REG       0xDC    /* Clear Mask */
+-#define DMA2_MASK_ALL_REG       0xDE    /* all-channels mask (w) */
+-
+-
+-#define DMA_MODE_READ	0x44	/* I/O to memory, no autoinit, increment, single mode */
+-#define DMA_MODE_WRITE	0x48	/* memory to I/O, no autoinit, increment, single mode */
+-#define DMA_MODE_CASCADE 0xC0   /* pass thru DREQ->HRQ, DACK<-HLDA only */
+-
+-/* enable/disable a specific DMA channel */
+-static void enable_dma(unsigned int dmanr)
+-{
+-	if (dmanr <= 3)
+-		outb_p(dmanr, DMA1_MASK_REG);
+-	else
+-		outb_p(dmanr & 3, DMA2_MASK_REG);
+-}
+-
+-static void disable_dma(unsigned int dmanr)
+-{
+-	if (dmanr <= 3)
+-		outb_p(dmanr | 4, DMA1_MASK_REG);
+-	else
+-		outb_p((dmanr & 3) | 4, DMA2_MASK_REG);
+-}
+-
+-/* set mode (above) for a specific DMA channel */
+-static void set_dma_mode(unsigned int dmanr, char mode)
+-{
+-	if (dmanr <= 3)
+-		outb_p(mode | dmanr, DMA1_MODE_REG);
+-	else
+-		outb_p(mode | (dmanr&3), DMA2_MODE_REG);
+-}
+-#endif	/* !INCLUDE_LANCE */
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void lance_reset(struct nic *nic)
+-{
+-	int		i;
+-	Address		l;
+-
+-	/* Reset the LANCE */
+-	(void)inw(ioaddr+LANCE_RESET);
+-	/* Un-Reset the LANCE, needed only for the NE2100 */
+-	if (chip_table[lance_version].flags & LANCE_MUST_UNRESET)
+-		outw(0, ioaddr+LANCE_RESET);
+-	if (chip_table[lance_version].flags & LANCE_ENABLE_AUTOSELECT)
+-	{
+-		/* This is 79C960 specific; Turn on auto-select of media
+-		   (AUI, BNC). */
+-		outw(0x2, ioaddr+LANCE_ADDR);
+-		/* Don't touch 10base2 power bit. */
+-		outw(inw(ioaddr+LANCE_BUS_IF) | 0x2, ioaddr+LANCE_BUS_IF);
+-	}
+-	/* HomePNA cards need to explicitly pick the phoneline interface.
+-	 * Some of these cards have ethernet interfaces as well, this
+-	 * code might require some modification for those.
+-  	 */
+-        if (chip_table[lance_version].flags & LANCE_SELECT_PHONELINE) {
+-                short media, check ;
+-                /* this is specific to HomePNA cards... */
+-                outw(49, ioaddr+0x12) ;
+-                media = inw(ioaddr+0x16) ;
+-#ifdef DEBUG
+-                printf("media was %d\n", media) ;
+-#endif
+-                media &= ~3 ;
+-                media |= 1 ;
+-#ifdef DEBUG
+-                printf("media changed to %d\n", media) ;
+-#endif
+-                media &= ~3 ;
+-                media |= 1 ;
+-                outw(49, ioaddr+0x12) ;
+-                outw(media, ioaddr+0x16) ;
+-                outw(49, ioaddr+0x12) ;
+-                check = inw(ioaddr+0x16) ;
+-#ifdef DEBUG
+-                printf("check %s, media was set properly\n", 
+-			check ==  media ? "passed" : "FAILED" ) ; 
+-#endif
+-	}
+- 
+-	/* Re-initialise the LANCE, and start it when done. */
+-	/* Set station address */
+-	for (i = 0; i < ETH_ALEN; ++i)
+-		lp->init_block.phys_addr[i] = nic->node_addr[i];
+-	/* Preset the receive ring headers */
+-	for (i=0; i<RX_RING_SIZE; i++) {
+-		lp->rx_ring[i].buf_length = -ETH_FRAME_LEN-4;
+-		/* OWN */
+-		lp->rx_ring[i].u.base = virt_to_bus(lp->rbuf[i]) & 0xffffff;
+-		/* we set the top byte as the very last thing */
+-		lp->rx_ring[i].u.addr[3] = 0x80;
+-	}
+-	lp->rx_idx = 0;
+-	lp->init_block.mode = 0x0;	/* enable Rx and Tx */
+-	l = (Address)virt_to_bus(&lp->init_block);
+-	outw(0x1, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw((short)l, ioaddr+LANCE_DATA);
+-	outw(0x2, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw((short)(l >> 16), ioaddr+LANCE_DATA);
+-	outw(0x4, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw(0x915, ioaddr+LANCE_DATA);
+-	outw(0x0, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw(0x4, ioaddr+LANCE_DATA);		/* stop */
+-	outw(0x1, ioaddr+LANCE_DATA);		/* init */
+-	for (i = 10000; i > 0; --i)
+-		if (inw(ioaddr+LANCE_DATA) & 0x100)
+-			break;
+-#ifdef	DEBUG
+-	if (i <= 0)
+-		printf("Init timed out\n");
+-#endif
+-	/* Apparently clearing the InitDone bit here triggers a bug
+-	   in the '974. (Mark Stockton) */
+-	outw(0x2, ioaddr+LANCE_DATA);		/* start */
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int lance_poll(struct nic *nic)
+-{
+-	int		status;
+-
+-	status = lp->rx_ring[lp->rx_idx].u.base >> 24;
+-	if (status & 0x80)
+-		return (0);
+-#ifdef	DEBUG
+-	printf("LANCE packet received rx_ring.u.base %X mcnt %hX csr0 %hX\n",
+-		lp->rx_ring[lp->rx_idx].u.base, lp->rx_ring[lp->rx_idx].msg_length,
+-		inw(ioaddr+LANCE_DATA));
+-#endif
+-	if (status == 0x3)
+-		memcpy(nic->packet, lp->rbuf[lp->rx_idx], nic->packetlen = lp->rx_ring[lp->rx_idx].msg_length);
+-	/* Andrew Boyd of QNX reports that some revs of the 79C765
+-	   clear the buffer length */
+-	lp->rx_ring[lp->rx_idx].buf_length = -ETH_FRAME_LEN-4;
+-	lp->rx_ring[lp->rx_idx].u.addr[3] |= 0x80;	/* prime for next receive */
+-
+-	/* I'm not sure if the following is still ok with multiple Rx buffers, but it works */
+-	outw(0x0, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw(0x500, ioaddr+LANCE_DATA);		/* clear receive + InitDone */
+-
+-	/* Switch to the next Rx ring buffer */
+-	lp->rx_idx = (lp->rx_idx + 1) & RX_RING_MOD_MASK;
+-
+-	return (status == 0x3);
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void lance_transmit(
+-	struct nic *nic,
+-	const char *d,			/* Destination */
+-	unsigned int t,			/* Type */
+-	unsigned int s,			/* size */
+-	const char *p)			/* Packet */
+-{
+-	unsigned long		time;
+-
+-	/* copy the packet to ring buffer */
+-	memcpy(lp->tbuf, d, ETH_ALEN);	/* dst */
+-	memcpy(&lp->tbuf[ETH_ALEN], nic->node_addr, ETH_ALEN); /* src */
+-	lp->tbuf[ETH_ALEN+ETH_ALEN] = t >> 8;	/* type */
+-	lp->tbuf[ETH_ALEN+ETH_ALEN+1] = t;	/* type */
+-	memcpy(&lp->tbuf[ETH_HLEN], p, s);
+-	s += ETH_HLEN;
+-	if (chip_table[chip_version].flags & LANCE_MUST_PAD)
+-		while (s < ETH_ZLEN)	/* pad to min length */
+-			lp->tbuf[s++] = 0;
+-	lp->tx_ring.buf_length = -s;
+-	lp->tx_ring.misc = 0x0;
+-	/* OWN, STP, ENP */
+-	lp->tx_ring.u.base = virt_to_bus(lp->tbuf) & 0xffffff;
+-	/* we set the top byte as the very last thing */
+-	lp->tx_ring.u.addr[3] = 0x83;
+-	/* Trigger an immediate send poll */
+-	outw(0x0, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);	/* as in the datasheets... */
+-	/* Klaus Espenlaub: the value below was 0x48, but that enabled the
+-	 * interrupt line, causing a hang if for some reasone the interrupt
+-	 * controller had the LANCE interrupt enabled.  I have no idea why
+-	 * nobody ran into this before...  */
+-	outw(0x08, ioaddr+LANCE_DATA);
+-	/* wait for transmit complete */
+-	time = currticks() + TICKS_PER_SEC;		/* wait one second */
+-	while (currticks() < time && (lp->tx_ring.u.base & 0x80000000) != 0)
+-		;
+-	if ((lp->tx_ring.u.base & 0x80000000) != 0)
+-		printf("LANCE timed out on transmit\n");
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw(0x200, ioaddr+LANCE_DATA);		/* clear transmit + InitDone */
+-#ifdef	DEBUG
+-	printf("tx_ring.u.base %X tx_ring.buf_length %hX tx_ring.misc %hX csr0 %hX\n",
+-		lp->tx_ring.u.base, lp->tx_ring.buf_length, lp->tx_ring.misc,
+-		inw(ioaddr+LANCE_DATA));
+-#endif
+-}
+-
+-static void lance_disable(struct nic *nic)
+-{
+-	(void)inw(ioaddr+LANCE_RESET);
+-	if (chip_table[lance_version].flags & LANCE_MUST_UNRESET)
+-		outw(0, ioaddr+LANCE_RESET);
+-
+-	outw(0, ioaddr+LANCE_ADDR);
+-	outw(0x0004, ioaddr+LANCE_DATA);	/* stop the LANCE */
+-
+-#ifndef	INCLUDE_LANCE
+-	disable_dma(dma);
+-#endif
+-}
+-
+-#ifdef	INCLUDE_LANCE
+-static int lance_probe1(struct nic *nic, struct pci_device *pci)
+-#else
+-static int lance_probe1(struct nic *nic)
+-#endif
+-{
+-	int			reset_val ;
+-	unsigned int		i;
+-	Address			l;
+-	short			dma_channels;
+-#ifndef	INCLUDE_LANCE
+-	static const char	dmas[] = { 5, 6, 7, 3 };
+-#endif
+-
+-	reset_val = inw(ioaddr+LANCE_RESET);
+-	outw(reset_val, ioaddr+LANCE_RESET);
+-#if	1  /* Klaus Espenlaub -- was #ifdef	INCLUDE_NE2100*/
+-	outw(0x0, ioaddr+LANCE_ADDR);	/* Switch to window 0 */
+-	if (inw(ioaddr+LANCE_DATA) != 0x4)
+-		return (-1);
+-#endif
+-	outw(88, ioaddr+LANCE_ADDR);	/* Get the version of the chip */
+-	if (inw(ioaddr+LANCE_ADDR) != 88)
+-		lance_version = 0;
+-	else
+-	{
+-		chip_version = inw(ioaddr+LANCE_DATA);
+-		outw(89, ioaddr+LANCE_ADDR);
+-		chip_version |= inw(ioaddr+LANCE_DATA) << 16;
+-		if ((chip_version & 0xfff) != 0x3)
+-			return (-1);
+-		chip_version = (chip_version >> 12) & 0xffff;
+-		for (lance_version = 1; chip_table[lance_version].id_number != 0; ++lance_version)
+-			if (chip_table[lance_version].id_number == chip_version)
+-				break;
+-	}
+-	/* make sure data structure is 8-byte aligned */
+-	l = ((Address)lance + 7) & ~7;
+-	lp = (struct lance_interface *)l;
+-	lp->init_block.mode = 0x3;	/* disable Rx and Tx */
+-	lp->init_block.filter[0] = lp->init_block.filter[1] = 0x0;
+-	/* using multiple Rx buffer and a single Tx buffer */
+-	lp->init_block.rx_ring = (virt_to_bus(&lp->rx_ring) & 0xffffff) | RX_RING_LEN_BITS;
+-	lp->init_block.tx_ring = virt_to_bus(&lp->tx_ring) & 0xffffff;
+-	l = virt_to_bus(&lp->init_block);
+-	outw(0x1, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw((unsigned short)l, ioaddr+LANCE_DATA);
+-	outw(0x2, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw((unsigned short)(l >> 16), ioaddr+LANCE_DATA);
+-	outw(0x4, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	outw(0x915, ioaddr+LANCE_DATA);
+-	outw(0x0, ioaddr+LANCE_ADDR);
+-	(void)inw(ioaddr+LANCE_ADDR);
+-	/* Get station address */
+-	for (i = 0; i < ETH_ALEN; ++i) {
+-		nic->node_addr[i] = inb(ioaddr+LANCE_ETH_ADDR+i);
+-	}
+-#ifndef	INCLUDE_LANCE
+-	/* now probe for DMA channel */
+-	dma_channels = ((inb(DMA1_STAT_REG) >> 4) & 0xf) |
+-		(inb(DMA2_STAT_REG) & 0xf0);
+-	/* need to fix when PCI provides DMA info */
+-	for (i = 0; i < (sizeof(dmas)/sizeof(dmas[0])); ++i)
+-	{
+-		int		j;
+-
+-		dma = dmas[i];
+-		/* Don't enable a permanently busy DMA channel,
+-		   or the machine will hang */
+-		if (dma_channels & (1 << dma))
+-			continue;
+-		outw(0x7f04, ioaddr+LANCE_DATA);	/* clear memory error bits */
+-		set_dma_mode(dma, DMA_MODE_CASCADE);
+-		enable_dma(dma);
+-		outw(0x1, ioaddr+LANCE_DATA);		/* init */
+-		for (j = 100; j > 0; --j)
+-			if (inw(ioaddr+LANCE_DATA) & 0x900)
+-				break;
+-		if (inw(ioaddr+LANCE_DATA) & 0x100)
+-			break;
+-		else
+-			disable_dma(dma);
+-	}
+-	if (i >= (sizeof(dmas)/sizeof(dmas[0])))
+-		dma = 0;
+-	printf("\n%s base %#X, DMA %d, addr %!\n",
+-		chip_table[lance_version].name, ioaddr, dma, nic->node_addr);
+-#else
+-	printf(" %s base %#hX, addr %!\n", chip_table[lance_version].name, ioaddr, nic->node_addr);
+-#endif
+-	if (chip_table[chip_version].flags & LANCE_ENABLE_AUTOSELECT) {
+-		/* Turn on auto-select of media (10baseT or BNC) so that the
+-		 * user watch the LEDs. */
+-		outw(0x0002, ioaddr+LANCE_ADDR);
+-		/* Don't touch 10base2 power bit. */
+-		outw(inw(ioaddr+LANCE_BUS_IF) | 0x0002, ioaddr+LANCE_BUS_IF);
+-	}
+-	return (lance_version);
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-
+-#ifdef	INCLUDE_LANCE
+-struct nic *lancepci_probe(struct nic *nic, unsigned short *probe_addrs, struct pci_device *pci)
+-#endif
+-#ifdef	INCLUDE_NE2100
+-struct nic *ne2100_probe(struct nic *nic, unsigned short *probe_addrs)
+-#endif
+-#ifdef	INCLUDE_NI6510
+-struct nic *ni6510_probe(struct nic *nic, unsigned short *probe_addrs)
+-#endif
+-{
+-	unsigned short		*p;
+-#ifndef	INCLUDE_LANCE
+-	static unsigned short	io_addrs[] = { 0x300, 0x320, 0x340, 0x360, 0 };
+-#endif
+-
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	if (probe_addrs == 0) {
+-#ifdef	INCLUDE_LANCE
+-		return 0;
+-#else
+-		probe_addrs = io_addrs;
+-#endif
+-	}
+-	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
+-	{
+-		char	offset15, offset14 = inb(ioaddr + 14);
+-		unsigned short	pci_cmd;
+-
+-#ifdef	INCLUDE_NE2100
+-		if ((offset14 == 0x52 || offset14 == 0x57) &&
+-		 ((offset15 = inb(ioaddr + 15)) == 0x57 || offset15 == 0x44))
+-			if (lance_probe1(nic) >= 0)
+-				break;
+-#endif
+-#ifdef	INCLUDE_NI6510
+-		if ((offset14 == 0x00 || offset14 == 0x52) &&
+-		 ((offset15 = inb(ioaddr + 15)) == 0x55 || offset15 == 0x44))
+-			if (lance_probe1(nic) >= 0)
+-				break;
+-#endif
+-#ifdef	INCLUDE_LANCE
+-		adjust_pci_device(pci);
+-		if (lance_probe1(nic, pci) >= 0)
+-			break;
+-#endif
+-	}
+-	/* if board found */
+-	if (ioaddr != 0)
+-	{
+-		/* point to NIC specific routines */
+-		lance_reset(nic);
+-		nic->reset = lance_reset;
+-		nic->poll = lance_poll;
+-		nic->transmit = lance_transmit;
+-		nic->disable = lance_disable;
+-		return nic;
+-	}
+-
+-	/* no board found */
+-	return 0;
+-}
+diff -Naur grub-0.97.orig/netboot/latch.h grub-0.97/netboot/latch.h
+--- grub-0.97.orig/netboot/latch.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/latch.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef LATCH_H
++#define LATCH_H
++
++#define	TICKS_PER_SEC		18
++
++/* For different calibrators of the TSC move the declaration of
++ * sleep_latch and the definitions of it's length here...
++ */
++
++#endif /* LATCH_H */
+diff -Naur grub-0.97.orig/netboot/linux-asm-io.h grub-0.97/netboot/linux-asm-io.h
+--- grub-0.97.orig/netboot/linux-asm-io.h	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/linux-asm-io.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,187 +0,0 @@
+-#ifndef	_ASM_IO_H
+-#define _ASM_IO_H
+-
+-/*
+- * This file contains the definitions for the x86 IO instructions
+- * inb/inw/inl/outb/outw/outl and the "string versions" of the same
+- * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing"
+- * versions of the single-IO instructions (inb_p/inw_p/..).
+- *
+- * This file is not meant to be obfuscating: it's just complicated
+- * to (a) handle it all in a way that makes gcc able to optimize it
+- * as well as possible and (b) trying to avoid writing the same thing
+- * over and over again with slight variations and possibly making a
+- * mistake somewhere.
+- */
+-
+-/*
+- * Thanks to James van Artsdalen for a better timing-fix than
+- * the two short jumps: using outb's to a nonexistent port seems
+- * to guarantee better timings even on fast machines.
+- *
+- * On the other hand, I'd like to be sure of a non-existent port:
+- * I feel a bit unsafe about using 0x80 (should be safe, though)
+- *
+- *		Linus
+- */
+-
+-#ifdef	SLOW_IO_BY_JUMPING
+-#define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:")
+-#else
+-#define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80")
+-#endif
+-
+-#ifdef	REALLY_SLOW_IO
+-#define SLOW_DOWN_IO { __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; }
+-#else
+-#define SLOW_DOWN_IO __SLOW_DOWN_IO
+-#endif
+-
+-/*
+- * readX/writeX() are used to access memory mapped devices. On some
+- * architectures the memory mapped IO stuff needs to be accessed
+- * differently. On the x86 architecture, we just read/write the
+- * memory location directly.
+- */
+-#define readb(addr) (*(volatile unsigned char *) (addr))
+-#define readw(addr) (*(volatile unsigned short *) (addr))
+-#define readl(addr) (*(volatile unsigned int *) (addr))
+-
+-#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b))
+-#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b))
+-#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b))
+-
+-#define memset_io(a,b,c)	memset((void *)(a),(b),(c))
+-#define memcpy_fromio(a,b,c)	memcpy((a),(void *)(b),(c))
+-#define memcpy_toio(a,b,c)	memcpy((void *)(a),(b),(c))
+-
+-/*
+- * Again, i386 does not require mem IO specific function.
+- */
+-
+-#define eth_io_copy_and_sum(a,b,c,d)	eth_copy_and_sum((a),(void *)(b),(c),(d))
+-
+-/*
+- * Talk about misusing macros..
+- */
+-
+-#define __OUT1(s,x) \
+-extern void __out##s(unsigned x value, unsigned short port); \
+-extern inline void __out##s(unsigned x value, unsigned short port) {
+-
+-#define __OUT2(s,s1,s2) \
+-__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
+-
+-#define __OUT(s,s1,x) \
+-__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); } \
+-__OUT1(s##c,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); } \
+-__OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); SLOW_DOWN_IO; } \
+-__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
+-
+-#define __IN1(s,x) \
+-extern unsigned x __in##s(unsigned short port); \
+-extern inline unsigned x __in##s(unsigned short port) { unsigned x _v;
+-
+-#define __IN2(s,s1,s2) \
+-__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
+-
+-#define __IN(s,s1,x,i...) \
+-__IN1(s,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); return _v; } \
+-__IN1(s##c,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); return _v; } \
+-__IN1(s##_p,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); SLOW_DOWN_IO; return _v; } \
+-__IN1(s##c_p,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; }
+-
+-#define __INS(s) \
+-extern void ins##s(unsigned short port, void * addr, unsigned long count); \
+-extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
+-{ __asm__ __volatile__ ("cld ; rep ; ins" #s \
+-: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+-
+-#define __OUTS(s) \
+-extern void outs##s(unsigned short port, const void * addr, unsigned long  count); \
+-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
+-{ __asm__ __volatile__ ("cld ; rep ; outs" #s \
+-: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+-
+-__IN(b,"", char)
+-__IN(w,"",short)
+-__IN(l,"", long)
+-
+-__OUT(b,"b",char)
+-__OUT(w,"w",short)
+-__OUT(l,,int)
+-
+-__INS(b)
+-__INS(w)
+-__INS(l)
+-
+-__OUTS(b)
+-__OUTS(w)
+-__OUTS(l)
+-
+-/*
+- * Note that due to the way __builtin_constant_p() works, you
+- *  - can't use it inside a inline function (it will never be true)
+- *  - you don't have to worry about side effects within the __builtin..
+- */
+-#define outb(val,port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__outbc((val),(port)) : \
+-	__outb((val),(port)))
+-
+-#define inb(port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__inbc(port) : \
+-	__inb(port))
+-
+-#define outb_p(val,port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__outbc_p((val),(port)) : \
+-	__outb_p((val),(port)))
+-
+-#define inb_p(port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__inbc_p(port) : \
+-	__inb_p(port))
+-
+-#define outw(val,port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__outwc((val),(port)) : \
+-	__outw((val),(port)))
+-
+-#define inw(port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__inwc(port) : \
+-	__inw(port))
+-
+-#define outw_p(val,port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__outwc_p((val),(port)) : \
+-	__outw_p((val),(port)))
+-
+-#define inw_p(port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__inwc_p(port) : \
+-	__inw_p(port))
+-
+-#define outl(val,port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__outlc((val),(port)) : \
+-	__outl((val),(port)))
+-
+-#define inl(port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__inlc(port) : \
+-	__inl(port))
+-
+-#define outl_p(val,port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__outlc_p((val),(port)) : \
+-	__outl_p((val),(port)))
+-
+-#define inl_p(port) \
+-((__builtin_constant_p((port)) && (port) < 256) ? \
+-	__inlc_p(port) : \
+-	__inl_p(port))
+-
+-#endif
+diff -Naur grub-0.97.orig/netboot/linux-asm-string.h grub-0.97/netboot/linux-asm-string.h
+--- grub-0.97.orig/netboot/linux-asm-string.h	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/linux-asm-string.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,291 +0,0 @@
+-/*
+- * Taken from Linux /usr/include/asm/string.h
+- * All except memcpy, memmove, memset and memcmp removed.
+- */
+-
+-#ifndef	_I386_STRING_H_
+-#define _I386_STRING_H_
+-
+-/*
+- * This string-include defines all string functions as inline
+- * functions. Use gcc. It also assumes ds=es=data space, this should be
+- * normal. Most of the string-functions are rather heavily hand-optimized,
+- * see especially strtok,strstr,str[c]spn. They should work, but are not
+- * very easy to understand. Everything is done entirely within the register
+- * set, making the functions fast and clean. String instructions have been
+- * used through-out, making for "slightly" unclear code :-)
+- *
+- *		NO Copyright (C) 1991, 1992 Linus Torvalds,
+- *		consider these trivial functions to be PD.
+- */
+-
+-typedef int	size_t;
+-
+-extern void *__memcpy(void * to, const void * from, size_t n);
+-extern void *__constant_memcpy(void * to, const void * from, size_t n);
+-extern void *memmove(void * dest,const void * src, size_t n);
+-extern void *__memset_generic(void * s, char c,size_t count);
+-extern void *__constant_c_memset(void * s, unsigned long c, size_t count);
+-extern void *__constant_c_and_count_memset(void * s, unsigned long pattern, size_t count);
+-
+-
+-extern inline void * __memcpy(void * to, const void * from, size_t n)
+-{
+-int d0, d1, d2;
+-__asm__ __volatile__(
+-	"cld\n\t"
+-	"rep ; movsl\n\t"
+-	"testb $2,%b4\n\t"
+-	"je 1f\n\t"
+-	"movsw\n"
+-	"1:\ttestb $1,%b4\n\t"
+-	"je 2f\n\t"
+-	"movsb\n"
+-	"2:"
+-	: "=&c" (d0), "=&D" (d1), "=&S" (d2)
+-	:"0" (n/4), "q" (n),"1" ((long) to),"2" ((long) from)
+-	: "memory");
+-return (to);
+-}
+-
+-/*
+- * This looks horribly ugly, but the compiler can optimize it totally,
+- * as the count is constant.
+- */
+-extern inline void * __constant_memcpy(void * to, const void * from, size_t n)
+-{
+-	switch (n) {
+-		case 0:
+-			return to;
+-		case 1:
+-			*(unsigned char *)to = *(const unsigned char *)from;
+-			return to;
+-		case 2:
+-			*(unsigned short *)to = *(const unsigned short *)from;
+-			return to;
+-		case 3:
+-			*(unsigned short *)to = *(const unsigned short *)from;
+-			*(2+(unsigned char *)to) = *(2+(const unsigned char *)from);
+-			return to;
+-		case 4:
+-			*(unsigned long *)to = *(const unsigned long *)from;
+-			return to;
+-		case 6:	/* for Ethernet addresses */
+-			*(unsigned long *)to = *(const unsigned long *)from;
+-			*(2+(unsigned short *)to) = *(2+(const unsigned short *)from);
+-			return to;
+-		case 8:
+-			*(unsigned long *)to = *(const unsigned long *)from;
+-			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
+-			return to;
+-		case 12:
+-			*(unsigned long *)to = *(const unsigned long *)from;
+-			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
+-			*(2+(unsigned long *)to) = *(2+(const unsigned long *)from);
+-			return to;
+-		case 16:
+-			*(unsigned long *)to = *(const unsigned long *)from;
+-			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
+-			*(2+(unsigned long *)to) = *(2+(const unsigned long *)from);
+-			*(3+(unsigned long *)to) = *(3+(const unsigned long *)from);
+-			return to;
+-		case 20:
+-			*(unsigned long *)to = *(const unsigned long *)from;
+-			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
+-			*(2+(unsigned long *)to) = *(2+(const unsigned long *)from);
+-			*(3+(unsigned long *)to) = *(3+(const unsigned long *)from);
+-			*(4+(unsigned long *)to) = *(4+(const unsigned long *)from);
+-			return to;
+-	}
+-#define COMMON(x) \
+-__asm__ __volatile__( \
+-	"cld\n\t" \
+-	"rep ; movsl" \
+-	x \
+-	: "=&c" (d0), "=&D" (d1), "=&S" (d2) \
+-	: "0" (n/4),"1" ((long) to),"2" ((long) from) \
+-	: "memory");
+-{
+-	int d0, d1, d2;
+-	switch (n % 4) {
+-		case 0: COMMON(""); return to;
+-		case 1: COMMON("\n\tmovsb"); return to;
+-		case 2: COMMON("\n\tmovsw"); return to;
+-		default: COMMON("\n\tmovsw\n\tmovsb"); return to;
+-	}
+-}
+-
+-#undef COMMON
+-}
+-
+-#define __HAVE_ARCH_MEMCPY
+-#define memcpy(t, f, n) \
+-(__builtin_constant_p(n) ? \
+- __constant_memcpy((t),(f),(n)) : \
+- __memcpy((t),(f),(n)))
+-
+-#define __HAVE_ARCH_MEMMOVE
+-extern inline void * memmove(void * dest,const void * src, size_t n)
+-{
+-int d0, d1, d2;
+-if (dest<src)
+-__asm__ __volatile__(
+-	"cld\n\t"
+-	"rep\n\t"
+-	"movsb"
+-	: "=&c" (d0), "=&S" (d1), "=&D" (d2)
+-	:"0" (n),"1" (src),"2" (dest)
+-	: "memory");
+-else
+-__asm__ __volatile__(
+-	"std\n\t"
+-	"rep\n\t"
+-	"movsb\n\t"
+-	"cld"
+-	: "=&c" (d0), "=&S" (d1), "=&D" (d2)
+-	:"0" (n),
+-	 "1" (n-1+(const char *)src),
+-	 "2" (n-1+(char *)dest)
+-	:"memory");
+-return dest;
+-}
+-
+-#define memcmp __builtin_memcmp
+-
+-extern inline void * __memset_generic(void * s, char c,size_t count)
+-{
+-int d0, d1;
+-__asm__ __volatile__(
+-	"cld\n\t"
+-	"rep\n\t"
+-	"stosb"
+-	: "=&c" (d0), "=&D" (d1)
+-	:"a" (c),"1" (s),"0" (count)
+-	:"memory");
+-return s;
+-}
+-
+-/* we might want to write optimized versions of these later */
+-#define __constant_count_memset(s,c,count) __memset_generic((s),(c),(count))
+-
+-/*
+- * memset(x,0,y) is a reasonably common thing to do, so we want to fill
+- * things 32 bits at a time even when we don't know the size of the
+- * area at compile-time..
+- */
+-extern inline void * __constant_c_memset(void * s, unsigned long c, size_t count)
+-{
+-int d0, d1;
+-__asm__ __volatile__(
+-	"cld\n\t"
+-	"rep ; stosl\n\t"
+-	"testb $2,%b3\n\t"
+-	"je 1f\n\t"
+-	"stosw\n"
+-	"1:\ttestb $1,%b3\n\t"
+-	"je 2f\n\t"
+-	"stosb\n"
+-	"2:"
+-	: "=&c" (d0), "=&D" (d1)
+-	:"a" (c), "q" (count), "0" (count/4), "1" ((long) s)
+-	:"memory");
+-return (s);
+-}
+-
+-/*
+- * This looks horribly ugly, but the compiler can optimize it totally,
+- * as we by now know that both pattern and count is constant..
+- */
+-extern inline void * __constant_c_and_count_memset(void * s, unsigned long pattern, size_t count)
+-{
+-	switch (count) {
+-		case 0:
+-			return s;
+-		case 1:
+-			*(unsigned char *)s = pattern;
+-			return s;
+-		case 2:
+-			*(unsigned short *)s = pattern;
+-			return s;
+-		case 3:
+-			*(unsigned short *)s = pattern;
+-			*(2+(unsigned char *)s) = pattern;
+-			return s;
+-		case 4:
+-			*(unsigned long *)s = pattern;
+-			return s;
+-	}
+-#define COMMON(x) \
+-__asm__  __volatile__("cld\n\t" \
+-	"rep ; stosl" \
+-	x \
+-	: "=&c" (d0), "=&D" (d1) \
+-	: "a" (pattern),"0" (count/4),"1" ((long) s) \
+-	: "memory")
+-{
+-	int d0, d1;
+-	switch (count % 4) {
+-		case 0: COMMON(""); return s;
+-		case 1: COMMON("\n\tstosb"); return s;
+-		case 2: COMMON("\n\tstosw"); return s;
+-		default: COMMON("\n\tstosw\n\tstosb"); return s;
+-	}
+-}
+-
+-#undef COMMON
+-}
+-
+-#define __constant_c_x_memset(s, c, count) \
+-(__builtin_constant_p(count) ? \
+- __constant_c_and_count_memset((s),(c),(count)) : \
+- __constant_c_memset((s),(c),(count)))
+-
+-#define __memset(s, c, count) \
+-(__builtin_constant_p(count) ? \
+- __constant_count_memset((s),(c),(count)) : \
+- __memset_generic((s),(c),(count)))
+-
+-#define __HAVE_ARCH_MEMSET
+-#define memset(s, c, count) \
+-(__builtin_constant_p(c) ? \
+- __constant_c_x_memset((s),(c),(count)) : \
+- __memset((s),(c),(count)))
+-
+-#define __HAVE_ARCH_STRNCMP
+-static inline int strncmp(const char * cs,const char * ct,size_t count)
+-{
+-register int __res;
+-int d0, d1, d2;
+-__asm__ __volatile__(
+-	"1:\tdecl %3\n\t"
+-	"js 2f\n\t"
+-	"lodsb\n\t"
+-	"scasb\n\t"
+-	"jne 3f\n\t"
+-	"testb %%al,%%al\n\t"
+-	"jne 1b\n"
+-	"2:\txorl %%eax,%%eax\n\t"
+-	"jmp 4f\n"
+-	"3:\tsbbl %%eax,%%eax\n\t"
+-	"orb $1,%%al\n"
+-	"4:"
+-		     :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2)
+-		     :"1" (cs),"2" (ct),"3" (count));
+-return __res;
+-}
+-
+-#define __HAVE_ARCH_STRLEN
+-static inline size_t strlen(const char * s)
+-{
+-int d0;
+-register int __res;
+-__asm__ __volatile__(
+-	"repne\n\t"
+-	"scasb\n\t"
+-	"notl %0\n\t"
+-	"decl %0"
+-	:"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffff));
+-return __res;
+-}
+-
+-#endif
+diff -Naur grub-0.97.orig/netboot/little_bswap.h grub-0.97/netboot/little_bswap.h
+--- grub-0.97.orig/netboot/little_bswap.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/little_bswap.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef ETHERBOOT_LITTLE_BSWAP_H
++#define ETHERBOOT_LITTLE_BSWAP_H
++
++#define ntohl(x)	__bswap_32(x)
++#define htonl(x) 	__bswap_32(x)
++#define ntohs(x) 	__bswap_16(x)
++#define htons(x) 	__bswap_16(x)
++#define cpu_to_le32(x)	(x)
++#define cpu_to_le16(x)	(x)
++#define cpu_to_be32(x)	__bswap_32(x)
++#define cpu_to_be16(x)	__bswap_16(x)
++#define le32_to_cpu(x)	(x)
++#define le16_to_cpu(x)	(x)
++#define be32_to_cpu(x)	__bswap_32(x)
++#define be16_to_cpu(x)	__bswap_16(x)
++
++#endif /* ETHERBOOT_LITTLE_BSWAP_H */
+diff -Naur grub-0.97.orig/netboot/main.c grub-0.97/netboot/main.c
+--- grub-0.97.orig/netboot/main.c	2004-05-20 22:19:33.000000000 +0000
++++ grub-0.97/netboot/main.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,1171 +0,0 @@
+-/*
+- *  GRUB  --  GRand Unified Bootloader
+- *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+- *
+- *  This program is free software; you can redistribute it and/or modify
+- *  it under the terms of the GNU General Public License as published by
+- *  the Free Software Foundation; either version 2 of the License, or
+- *  (at your option) any later version.
+- *
+- *  This program is distributed in the hope that it will be useful,
+- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- *  GNU General Public License for more details.
+- *
+- *  You should have received a copy of the GNU General Public License
+- *  along with this program; if not, write to the Free Software
+- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-/* Based on "src/main.c" in etherboot-5.0.5.  */
+-
+-/**************************************************************************
+-ETHERBOOT -  BOOTP/TFTP Bootstrap Program
+-
+-Author: Martin Renters
+-  Date: Dec/93
+-  
+-Literature dealing with the network protocols:
+-       ARP - RFC826
+-       RARP - RFC903
+-       UDP - RFC768
+-       BOOTP - RFC951, RFC2132 (vendor extensions)
+-       DHCP - RFC2131, RFC2132 (options)
+-       TFTP - RFC1350, RFC2347 (options), RFC2348 (blocksize), RFC2349 (tsize)
+-       RPC - RFC1831, RFC1832 (XDR), RFC1833 (rpcbind/portmapper)
+-       NFS - RFC1094, RFC1813 (v3, useful for clarifications, not implemented)
+-
+-**************************************************************************/
+-
+-#define GRUB	1
+-#include <etherboot.h>
+-#include <nic.h>
+-
+-/* #define DEBUG	1 */
+-
+-struct arptable_t arptable[MAX_ARP];
+-
+-/* Set if the user pushes Control-C.  */
+-int ip_abort = 0;
+-/* Set if an ethernet card is probed and IP addresses are set.  */
+-int network_ready = 0;
+-
+-struct rom_info rom;
+-
+-static int vendorext_isvalid;
+-static unsigned long netmask;
+-static struct bootpd_t bootp_data;
+-static unsigned long xid;
+-static unsigned char *end_of_rfc1533 = NULL;
+-
+-#ifndef	NO_DHCP_SUPPORT
+-#endif /* NO_DHCP_SUPPORT */
+-
+-/* äEth */
+-static unsigned char vendorext_magic[] = {0xE4, 0x45, 0x74, 0x68};
+-static const unsigned char broadcast[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+-
+-#ifdef	NO_DHCP_SUPPORT
+-
+-static unsigned char rfc1533_cookie[5] = {RFC1533_COOKIE, RFC1533_END};
+-
+-#else /* ! NO_DHCP_SUPPORT */
+-
+-static int dhcp_reply;
+-static in_addr dhcp_server = {0L};
+-static in_addr dhcp_addr = {0L};
+-static unsigned char rfc1533_cookie[] = {RFC1533_COOKIE};
+-static unsigned char rfc1533_end[] = {RFC1533_END};
+-
+-static const unsigned char dhcpdiscover[] =
+-{
+-  RFC2132_MSG_TYPE, 1, DHCPDISCOVER,	
+-  RFC2132_MAX_SIZE,2,	/* request as much as we can */
+-  ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
+-  RFC2132_PARAM_LIST, 4, RFC1533_NETMASK, RFC1533_GATEWAY,
+-  RFC1533_HOSTNAME, RFC1533_EXTENSIONPATH
+-};
+-
+-static const unsigned char dhcprequest[] =
+-{
+-  RFC2132_MSG_TYPE, 1, DHCPREQUEST,
+-  RFC2132_SRV_ID, 4, 0, 0, 0, 0,
+-  RFC2132_REQ_ADDR, 4, 0, 0, 0, 0,
+-  RFC2132_MAX_SIZE, 2,	/* request as much as we can */
+-  ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
+-  /* request parameters */
+-  RFC2132_PARAM_LIST,
+-  /* 4 standard + 2 vendortags */
+-  4 + 2,
+-  /* Standard parameters */
+-  RFC1533_NETMASK, RFC1533_GATEWAY,
+-  RFC1533_HOSTNAME, RFC1533_EXTENSIONPATH,
+-  /* Etherboot vendortags */
+-  RFC1533_VENDOR_MAGIC,
+-  RFC1533_VENDOR_CONFIGFILE,
+-};
+-
+-#endif /* ! NO_DHCP_SUPPORT */
+-
+-static unsigned short ipchksum (unsigned short *ip, int len);
+-static unsigned short udpchksum (struct iphdr *packet);
+-
+-void
+-print_network_configuration (void)
+-{
+-  if (! eth_probe ())
+-    grub_printf ("No ethernet card found.\n");
+-  else if (! network_ready)
+-    grub_printf ("Not initialized yet.\n");
+-  else
+-    {
+-      etherboot_printf ("Address: %@\n", arptable[ARP_CLIENT].ipaddr.s_addr);
+-      etherboot_printf ("Netmask: %@\n", netmask);
+-      etherboot_printf ("Server: %@\n", arptable[ARP_SERVER].ipaddr.s_addr);
+-      etherboot_printf ("Gateway: %@\n", arptable[ARP_GATEWAY].ipaddr.s_addr);
+-    }
+-}
+-
+-
+-/**************************************************************************
+-DEFAULT_NETMASK - Return default netmask for IP address
+-**************************************************************************/
+-static inline unsigned long 
+-default_netmask (void)
+-{
+-  int net = ntohl (arptable[ARP_CLIENT].ipaddr.s_addr) >> 24;
+-  if (net <= 127)
+-    return (htonl (0xff000000));
+-  else if (net < 192)
+-    return (htonl (0xffff0000));
+-  else
+-    return (htonl (0xffffff00));
+-}
+-
+-/* ifconfig - configure network interface.  */
+-int
+-ifconfig (char *ip, char *sm, char *gw, char *svr)
+-{
+-  in_addr tmp;
+-  
+-  if (sm) 
+-    {
+-      if (! inet_aton (sm, &tmp))
+-	return 0;
+-      
+-      netmask = tmp.s_addr;
+-    }
+-  
+-  if (ip) 
+-    {
+-      if (! inet_aton (ip, &arptable[ARP_CLIENT].ipaddr)) 
+-	return 0;
+-      
+-      if (! netmask && ! sm) 
+-	netmask = default_netmask ();
+-    }
+-  
+-  if (gw && ! inet_aton (gw, &arptable[ARP_GATEWAY].ipaddr)) 
+-    return 0;
+-
+-  /* Clear out the ARP entry.  */
+-  grub_memset (arptable[ARP_GATEWAY].node, 0, ETH_ALEN);
+-  
+-  if (svr && ! inet_aton (svr, &arptable[ARP_SERVER].ipaddr)) 
+-    return 0;
+-
+-  /* Likewise.  */
+-  grub_memset (arptable[ARP_SERVER].node, 0, ETH_ALEN);
+-  
+-  if (ip || sm)
+-    {
+-      if (IP_BROADCAST == (netmask | arptable[ARP_CLIENT].ipaddr.s_addr)
+-	  || netmask == (netmask | arptable[ARP_CLIENT].ipaddr.s_addr)
+-	  || ! netmask)
+-	network_ready = 0;
+-      else
+-	network_ready = 1;
+-    }
+-  
+-  return 1;
+-}
+-
+-
+-/**************************************************************************
+-UDP_TRANSMIT - Send a UDP datagram
+-**************************************************************************/
+-int 
+-udp_transmit (unsigned long destip, unsigned int srcsock,
+-	      unsigned int destsock, int len, const void *buf)
+-{
+-  struct iphdr *ip;
+-  struct udphdr *udp;
+-  struct arprequest arpreq;
+-  int arpentry, i;
+-  int retry;
+-
+-  ip = (struct iphdr *) buf;
+-  udp = (struct udphdr *) ((unsigned long) buf + sizeof (struct iphdr));
+-  ip->verhdrlen = 0x45;
+-  ip->service = 0;
+-  ip->len = htons (len);
+-  ip->ident = 0;
+-  ip->frags = 0;
+-  ip->ttl = 60;
+-  ip->protocol = IP_UDP;
+-  ip->chksum = 0;
+-  ip->src.s_addr = arptable[ARP_CLIENT].ipaddr.s_addr;
+-  ip->dest.s_addr = destip;
+-  ip->chksum = ipchksum ((unsigned short *) buf, sizeof (struct iphdr));
+-  udp->src = htons (srcsock);
+-  udp->dest = htons (destsock);
+-  udp->len = htons (len - sizeof (struct iphdr));
+-  udp->chksum = 0;
+-  udp->chksum = htons (udpchksum (ip));
+-
+-  if (udp->chksum == 0)
+-    udp->chksum = 0xffff;
+-  
+-  if (destip == IP_BROADCAST)
+-    {
+-      eth_transmit (broadcast, IP, len, buf);
+-    }
+-  else
+-    {
+-      if (((destip & netmask)
+-	   != (arptable[ARP_CLIENT].ipaddr.s_addr & netmask))
+-	  && arptable[ARP_GATEWAY].ipaddr.s_addr)
+-	destip = arptable[ARP_GATEWAY].ipaddr.s_addr;
+-      
+-      for (arpentry = 0; arpentry < MAX_ARP; arpentry++)
+-	if (arptable[arpentry].ipaddr.s_addr == destip)
+-	  break;
+-      
+-      if (arpentry == MAX_ARP)
+-	{
+-	  etherboot_printf ("%@ is not in my arp table!\n", destip);
+-	  return 0;
+-	}
+-      
+-      for (i = 0; i < ETH_ALEN; i++)
+-	if (arptable[arpentry].node[i])
+-	  break;
+-      
+-      if (i == ETH_ALEN)
+-	{
+-	  /* Need to do arp request.  */
+-#ifdef DEBUG
+-	  grub_printf ("arp request.\n");
+-#endif
+-	  arpreq.hwtype = htons (1);
+-	  arpreq.protocol = htons (IP);
+-	  arpreq.hwlen = ETH_ALEN;
+-	  arpreq.protolen = 4;
+-	  arpreq.opcode = htons (ARP_REQUEST);
+-	  grub_memmove (arpreq.shwaddr, arptable[ARP_CLIENT].node,
+-			ETH_ALEN);
+-	  grub_memmove (arpreq.sipaddr, (char *) &arptable[ARP_CLIENT].ipaddr,
+-			sizeof (in_addr));
+-	  grub_memset (arpreq.thwaddr, 0, ETH_ALEN);
+-	  grub_memmove (arpreq.tipaddr, (char *) &destip, sizeof (in_addr));
+-	  
+-	  for (retry = 1; retry <= MAX_ARP_RETRIES; retry++)
+-	    {
+-	      long timeout;
+-	      
+-	      eth_transmit (broadcast, ARP, sizeof (arpreq), &arpreq);
+-	      timeout = rfc2131_sleep_interval (TIMEOUT, retry);
+-	      
+-	      if (await_reply (AWAIT_ARP, arpentry, arpreq.tipaddr, timeout))
+-		goto xmit;
+-
+-	      if (ip_abort)
+-		return 0;
+-	    }
+-	  
+-	  return 0;
+-	}
+-      
+-    xmit:
+-      eth_transmit (arptable[arpentry].node, IP, len, buf);
+-    }
+-  
+-  return 1;
+-}
+-
+-/**************************************************************************
+-TFTP - Download extended BOOTP data, or kernel image
+-**************************************************************************/
+-static int
+-tftp (const char *name, int (*fnc) (unsigned char *, int, int, int))
+-{
+-  int retry = 0;
+-  static unsigned short iport = 2000;
+-  unsigned short oport = 0;
+-  unsigned short len, block = 0, prevblock = 0;
+-  int bcounter = 0;
+-  struct tftp_t *tr;
+-  struct tftpreq_t tp;
+-  int rc;
+-  int packetsize = TFTP_DEFAULTSIZE_PACKET;
+-  
+-  /* Clear out the Rx queue first.  It contains nothing of interest,
+-   * except possibly ARP requests from the DHCP/TFTP server.  We use
+-   * polling throughout Etherboot, so some time may have passed since we
+-   * last polled the receive queue, which may now be filled with
+-   * broadcast packets.  This will cause the reply to the packets we are
+-   * about to send to be lost immediately.  Not very clever.  */
+-  await_reply (AWAIT_QDRAIN, 0, NULL, 0);
+-  
+-  tp.opcode = htons (TFTP_RRQ);
+-  len = (grub_sprintf ((char *) tp.u.rrq, "%s%coctet%cblksize%c%d",
+-		       name, 0, 0, 0, TFTP_MAX_PACKET)
+-	 + sizeof (tp.ip) + sizeof (tp.udp) + sizeof (tp.opcode) + 1);
+-  if (! udp_transmit (arptable[ARP_SERVER].ipaddr.s_addr, ++iport,
+-		      TFTP_PORT, len, &tp))
+-    return 0;
+-  
+-  for (;;)
+-    {
+-      long timeout;
+-      
+-#ifdef CONGESTED
+-      timeout = rfc2131_sleep_interval (block ? TFTP_REXMT : TIMEOUT, retry);
+-#else
+-      timeout = rfc2131_sleep_interval (TIMEOUT, retry);
+-#endif
+-
+-      if (! await_reply (AWAIT_TFTP, iport, NULL, timeout))
+-	{
+-	  if (! block && retry++ < MAX_TFTP_RETRIES)
+-	    {
+-	      /* Maybe initial request was lost.  */
+-	      if (! udp_transmit (arptable[ARP_SERVER].ipaddr.s_addr,
+-				  ++iport, TFTP_PORT, len, &tp))
+-		return 0;
+-	      
+-	      continue;
+-	    }
+-	  
+-#ifdef CONGESTED
+-	  if (block && ((retry += TFTP_REXMT) < TFTP_TIMEOUT))
+-	    {
+-	      /* We resend our last ack.  */
+-#ifdef MDEBUG
+-	      grub_printf ("<REXMT>\n");
+-#endif
+-	      udp_transmit (arptable[ARP_SERVER].ipaddr.s_addr,
+-			    iport, oport,
+-			    TFTP_MIN_PACKET, &tp);
+-	      continue;
+-	    }
+-#endif
+-	  /* Timeout.  */
+-	  break;
+-	}
+-      
+-      tr = (struct tftp_t *) &nic.packet[ETH_HLEN];
+-      if (tr->opcode == ntohs (TFTP_ERROR))
+-	{
+-	  grub_printf ("TFTP error %d (%s)\n",
+-		       ntohs (tr->u.err.errcode),
+-		       tr->u.err.errmsg);
+-	  break;
+-	}
+-      
+-      if (tr->opcode == ntohs (TFTP_OACK))
+-	{
+-	  char *p = tr->u.oack.data, *e;
+-	  
+-	  /* Shouldn't happen.  */
+-	  if (prevblock)
+-	    /* Ignore it.  */
+-	    continue;
+-	  
+-	  len = ntohs (tr->udp.len) - sizeof (struct udphdr) - 2;
+-	  if (len > TFTP_MAX_PACKET)
+-	    goto noak;
+-	  
+-	  e = p + len;
+-	  while (*p != '\000' && p < e)
+-	    {
+-	      if (! grub_strcmp ("blksize", p))
+-		{
+-		  p += 8;
+-		  if ((packetsize = getdec (&p)) < TFTP_DEFAULTSIZE_PACKET)
+-		    goto noak;
+-		  
+-		  while (p < e && *p)
+-		    p++;
+-		  
+-		  if (p < e)
+-		    p++;
+-		}
+-	      else
+-		{
+-		noak:
+-		  tp.opcode = htons (TFTP_ERROR);
+-		  tp.u.err.errcode = 8;
+-		  len = (grub_sprintf ((char *) tp.u.err.errmsg,
+-				       "RFC1782 error")
+-			 + sizeof (tp.ip) + sizeof (tp.udp)
+-			 + sizeof (tp.opcode) + sizeof (tp.u.err.errcode)
+-			 + 1);
+-		  udp_transmit (arptable[ARP_SERVER].ipaddr.s_addr,
+-				iport, ntohs (tr->udp.src),
+-				len, &tp);
+-		  return 0;
+-		}
+-	    }
+-	  
+-	  if (p > e)
+-	    goto noak;
+-	  
+-	  /* This ensures that the packet does not get processed as data!  */
+-	  block = tp.u.ack.block = 0; 
+-	}
+-      else if (tr->opcode == ntohs (TFTP_DATA))
+-	{
+-	  len = ntohs (tr->udp.len) - sizeof (struct udphdr) - 4;
+-	  /* Shouldn't happen.  */
+-	  if (len > packetsize)
+-	    /* Ignore it.  */
+-	    continue;
+-	  
+-	  block = ntohs (tp.u.ack.block = tr->u.data.block);
+-	}
+-      else
+-	/* Neither TFTP_OACK nor TFTP_DATA.  */
+-	break;
+-      
+-      if ((block || bcounter) && (block != prevblock + 1))
+-	/* Block order should be continuous */
+-	tp.u.ack.block = htons (block = prevblock);
+-      
+-      /* Should be continuous.  */
+-      tp.opcode = htons (TFTP_ACK);
+-      oport = ntohs (tr->udp.src);
+-      /* Ack.  */
+-      udp_transmit (arptable[ARP_SERVER].ipaddr.s_addr, iport,
+-		    oport, TFTP_MIN_PACKET, &tp);
+-      
+-      if ((unsigned short) (block - prevblock) != 1)
+-	/* Retransmission or OACK, don't process via callback
+-	 * and don't change the value of prevblock.  */
+-	continue;
+-      
+-      prevblock = block;
+-      /* Is it the right place to zero the timer?  */
+-      retry = 0;
+-      
+-      if ((rc = fnc (tr->u.data.download,
+-		     ++bcounter, len, len < packetsize)) >= 0)
+-	return rc;
+-
+-      /* End of data.  */
+-      if (len < packetsize)           
+-	return 1;
+-    }
+-  
+-  return 0;
+-}
+-
+-/**************************************************************************
+-RARP - Get my IP address and load information
+-**************************************************************************/
+-int 
+-rarp (void)
+-{
+-  int retry;
+-
+-  /* arp and rarp requests share the same packet structure.  */
+-  struct arprequest rarpreq;
+-
+-  /* Make sure that an ethernet is probed.  */
+-  if (! eth_probe ())
+-    return 0;
+-
+-  /* Clear the ready flag.  */
+-  network_ready = 0;
+-  
+-  grub_memset (&rarpreq, 0, sizeof (rarpreq));
+-
+-  rarpreq.hwtype = htons (1);
+-  rarpreq.protocol = htons (IP);
+-  rarpreq.hwlen = ETH_ALEN;
+-  rarpreq.protolen = 4;
+-  rarpreq.opcode = htons (RARP_REQUEST);
+-  grub_memmove ((char *) &rarpreq.shwaddr, arptable[ARP_CLIENT].node,
+-		ETH_ALEN);
+-  /* sipaddr is already zeroed out */
+-  grub_memmove ((char *) &rarpreq.thwaddr, arptable[ARP_CLIENT].node,
+-		ETH_ALEN);
+-  /* tipaddr is already zeroed out */
+-
+-  for (retry = 0; retry < MAX_ARP_RETRIES; ++retry)
+-    {
+-      long timeout;
+-      
+-      eth_transmit (broadcast, RARP, sizeof (rarpreq), &rarpreq);
+-
+-      timeout = rfc2131_sleep_interval (TIMEOUT, retry);
+-      if (await_reply (AWAIT_RARP, 0, rarpreq.shwaddr, timeout))
+-	break;
+-
+-      if (ip_abort)
+-	return 0;
+-    }
+-
+-  if (retry < MAX_ARP_RETRIES)
+-    {
+-      network_ready = 1;
+-      return 1;
+-    }
+-
+-  return 0;
+-}
+-
+-/**************************************************************************
+-BOOTP - Get my IP address and load information
+-**************************************************************************/
+-int 
+-bootp (void)
+-{
+-  int retry;
+-#ifndef	NO_DHCP_SUPPORT
+-  int reqretry;
+-#endif /* ! NO_DHCP_SUPPORT */
+-  struct bootpip_t ip;
+-  unsigned long starttime;
+-
+-  /* Make sure that an ethernet is probed.  */
+-  if (! eth_probe ())
+-    return 0;
+-
+-  /* Clear the ready flag.  */
+-  network_ready = 0;
+-
+-#ifdef DEBUG
+-  grub_printf ("network is ready.\n");
+-#endif
+-  
+-  grub_memset (&ip, 0, sizeof (struct bootpip_t));
+-  ip.bp.bp_op = BOOTP_REQUEST;
+-  ip.bp.bp_htype = 1;
+-  ip.bp.bp_hlen = ETH_ALEN;
+-  starttime = currticks ();
+-  /* Use lower 32 bits of node address, more likely to be
+-     distinct than the time since booting */
+-  grub_memmove (&xid, &arptable[ARP_CLIENT].node[2], sizeof(xid));
+-  ip.bp.bp_xid = xid += htonl (starttime);
+-  grub_memmove (ip.bp.bp_hwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
+-#ifdef DEBUG
+-  etherboot_printf ("bp_op = %d\n", ip.bp.bp_op);
+-  etherboot_printf ("bp_htype = %d\n", ip.bp.bp_htype);
+-  etherboot_printf ("bp_hlen = %d\n", ip.bp.bp_hlen);
+-  etherboot_printf ("bp_xid = %d\n", ip.bp.bp_xid);
+-  etherboot_printf ("bp_hwaddr = %!\n", ip.bp.bp_hwaddr);
+-  etherboot_printf ("bp_hops = %d\n", (int) ip.bp.bp_hops);
+-  etherboot_printf ("bp_secs = %d\n", (int) ip.bp.bp_hwaddr);
+-#endif
+-  
+-#ifdef	NO_DHCP_SUPPORT
+-  /* Request RFC-style options.  */
+-  grub_memmove (ip.bp.bp_vend, rfc1533_cookie, 5);
+-#else
+-  /* Request RFC-style options.  */
+-  grub_memmove (ip.bp.bp_vend, rfc1533_cookie, sizeof rfc1533_cookie);
+-  grub_memmove (ip.bp.bp_vend + sizeof rfc1533_cookie, dhcpdiscover,
+-		sizeof dhcpdiscover);
+-  grub_memmove (ip.bp.bp_vend + sizeof rfc1533_cookie + sizeof dhcpdiscover,
+-		rfc1533_end, sizeof rfc1533_end);
+-#endif /* ! NO_DHCP_SUPPORT */
+-
+-  for (retry = 0; retry < MAX_BOOTP_RETRIES;)
+-    {
+-      long timeout;
+-
+-#ifdef DEBUG
+-      grub_printf ("retry = %d\n", retry);
+-#endif
+-      
+-      /* Clear out the Rx queue first.  It contains nothing of
+-       * interest, except possibly ARP requests from the DHCP/TFTP
+-       * server.  We use polling throughout Etherboot, so some time
+-       * may have passed since we last polled the receive queue,
+-       * which may now be filled with broadcast packets.  This will
+-       * cause the reply to the packets we are about to send to be
+-       * lost immediately.  Not very clever.  */
+-      await_reply (AWAIT_QDRAIN, 0, NULL, 0);
+-
+-      udp_transmit (IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
+-		    sizeof (struct bootpip_t), &ip);
+-      timeout = rfc2131_sleep_interval (TIMEOUT, retry++);
+-#ifdef NO_DHCP_SUPPORT
+-      if (await_reply (AWAIT_BOOTP, 0, NULL, timeout))
+-	{
+-	  network_ready = 1;
+-	  return 1;
+-	}
+-#else /* ! NO_DHCP_SUPPORT */
+-      if (await_reply (AWAIT_BOOTP, 0, NULL, timeout))
+-	{
+-	  if (dhcp_reply != DHCPOFFER)
+-	    {
+-	      network_ready = 1;
+-	      return 1;
+-	    }
+-
+-	  dhcp_reply = 0;
+-#ifdef DEBUG
+-  etherboot_printf ("bp_op = %d\n", (int) ip.bp.bp_op);
+-  etherboot_printf ("bp_htype = %d\n", (int) ip.bp.bp_htype);
+-  etherboot_printf ("bp_hlen = %d\n", (int) ip.bp.bp_hlen);
+-  etherboot_printf ("bp_xid = %d\n", (int) ip.bp.bp_xid);
+-  etherboot_printf ("bp_hwaddr = %!\n", ip.bp.bp_hwaddr);
+-  etherboot_printf ("bp_hops = %d\n", (int) ip.bp.bp_hops);
+-  etherboot_printf ("bp_secs = %d\n", (int) ip.bp.bp_hwaddr);
+-#endif
+-	  grub_memmove (ip.bp.bp_vend, rfc1533_cookie, sizeof rfc1533_cookie);
+-	  grub_memmove (ip.bp.bp_vend + sizeof rfc1533_cookie,
+-			dhcprequest, sizeof dhcprequest);
+-	  grub_memmove (ip.bp.bp_vend + sizeof rfc1533_cookie
+-			+ sizeof dhcprequest,
+-			rfc1533_end, sizeof rfc1533_end);
+-	  grub_memmove (ip.bp.bp_vend + 9, (char *) &dhcp_server,
+-			sizeof (in_addr));
+-	  grub_memmove (ip.bp.bp_vend + 15, (char *) &dhcp_addr,
+-			sizeof (in_addr));
+-#ifdef DEBUG
+-	  grub_printf ("errnum = %d\n", errnum);
+-#endif
+-	  for (reqretry = 0; reqretry < MAX_BOOTP_RETRIES;)
+-	    {
+-	      int ret;
+-#ifdef DEBUG
+-	      grub_printf ("reqretry = %d\n", reqretry);
+-#endif
+-	      
+-	      ret = udp_transmit (IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
+-				  sizeof (struct bootpip_t), &ip);
+-	      if (! ret)
+-		grub_printf ("udp_transmit failed.\n");
+-	      
+-	      dhcp_reply = 0;
+-	      timeout = rfc2131_sleep_interval (TIMEOUT, reqretry++);
+-	      if (await_reply (AWAIT_BOOTP, 0, NULL, timeout))
+-		if (dhcp_reply == DHCPACK)
+-		  {
+-		    network_ready = 1;
+-		    return 1;
+-		  }
+-
+-#ifdef DEBUG
+-	      grub_printf ("dhcp_reply = %d\n", dhcp_reply);
+-#endif
+-	      
+-	      if (ip_abort)
+-		return 0;
+-	    }
+-	}
+-#endif /* ! NO_DHCP_SUPPORT */
+-      
+-      if (ip_abort)
+-	return 0;
+-      
+-      ip.bp.bp_secs = htons ((currticks () - starttime) / TICKS_PER_SEC);
+-    }
+-
+-  /* Timeout.  */
+-  return 0;
+-}
+-
+-/**************************************************************************
+-UDPCHKSUM - Checksum UDP Packet (one of the rare cases when assembly is
+-            actually simpler...)
+- RETURNS: checksum, 0 on checksum error. This
+-          allows for using the same routine for RX and TX summing:
+-          RX  if (packet->udp.chksum && udpchksum(packet))
+-                  error("checksum error");
+-          TX  packet->udp.chksum=0;
+-              if (0==(packet->udp.chksum=udpchksum(packet)))
+-                  packet->upd.chksum=0xffff;
+-**************************************************************************/
+-static inline void
+-dosum (unsigned short *start, unsigned int len, unsigned short *sum)
+-{
+-  __asm__ __volatile__
+-    ("clc\n"
+-     "1:\tlodsw\n\t"
+-     "xchg %%al,%%ah\n\t"	/* convert to host byte order */
+-     "adcw %%ax,%0\n\t"		/* add carry of previous iteration */
+-     "loop 1b\n\t"
+-     "adcw $0,%0"		/* add carry of last iteration */
+-     : "=b" (*sum), "=S"(start), "=c"(len)
+-     : "0"(*sum), "1"(start), "2"(len)
+-     : "ax", "cc"
+-     );
+-}
+-
+-/* UDP sum:
+- * proto, src_ip, dst_ip, udp_dport, udp_sport, 2*udp_len, payload
+- */
+-static unsigned short
+-udpchksum (struct iphdr *packet)
+-{
+-  int len = ntohs (packet->len);
+-  unsigned short rval;
+-  
+-  /* add udplength + protocol number */
+-  rval = (len - sizeof (struct iphdr)) + IP_UDP;
+-  
+-  /* pad to an even number of bytes */
+-  if (len % 2) {
+-    ((char *) packet)[len++] = 0;
+-  }
+-  
+-  /* sum over src/dst ipaddr + udp packet */
+-  len -= (char *) &packet->src - (char *) packet;
+-  dosum ((unsigned short *) &packet->src, len >> 1, &rval);
+-  
+-  /* take one's complement */
+-  return ~rval;
+-}
+-
+-/**************************************************************************
+-AWAIT_REPLY - Wait until we get a response for our request
+-**************************************************************************/
+-int 
+-await_reply (int type, int ival, void *ptr, int timeout)
+-{
+-  unsigned long time;
+-  struct iphdr *ip;
+-  struct udphdr *udp;
+-  struct arprequest *arpreply;
+-  struct bootp_t *bootpreply;
+-  unsigned short ptype;
+-  unsigned int protohdrlen = (ETH_HLEN + sizeof (struct iphdr)
+-			      + sizeof (struct udphdr));
+-
+-  /* Clear the abort flag.  */
+-  ip_abort = 0;
+-  
+-  time = timeout + currticks ();
+-  /* The timeout check is done below.  The timeout is only checked if
+-   * there is no packet in the Rx queue.  This assumes that eth_poll()
+-   * needs a negligible amount of time.  */
+-  for (;;)
+-    {
+-      if (eth_poll ())
+-	{
+-	  /* We have something!  */
+-	  
+-	  /* Check for ARP - No IP hdr.  */
+-	  if (nic.packetlen >= ETH_HLEN)
+-	    {
+-	      ptype = (((unsigned short) nic.packet[12]) << 8
+-		       | ((unsigned short) nic.packet[13]));
+-	    }
+-	  else
+-	    /* What else could we do with it?  */
+-	    continue;
+-	  
+-	  if (nic.packetlen >= ETH_HLEN + sizeof (struct arprequest)
+-	      && ptype == ARP)
+-	    {
+-	      unsigned long tmp;
+-
+-	      arpreply = (struct arprequest *) &nic.packet[ETH_HLEN];
+-	      
+-	      if (arpreply->opcode == htons (ARP_REPLY)
+-		  && ! grub_memcmp (arpreply->sipaddr, ptr, sizeof (in_addr))
+-		  && type == AWAIT_ARP)
+-		{
+-		  grub_memmove ((char *) arptable[ival].node,
+-				arpreply->shwaddr,
+-				ETH_ALEN);
+-		  return 1;
+-		}
+-	      
+-	      grub_memmove ((char *) &tmp, arpreply->tipaddr,
+-			    sizeof (in_addr));
+-	      
+-	      if (arpreply->opcode == htons (ARP_REQUEST)
+-		  && tmp == arptable[ARP_CLIENT].ipaddr.s_addr)
+-		{
+-		  arpreply->opcode = htons (ARP_REPLY);
+-		  grub_memmove (arpreply->tipaddr, arpreply->sipaddr,
+-				sizeof (in_addr));
+-		  grub_memmove (arpreply->thwaddr, (char *) arpreply->shwaddr,
+-				ETH_ALEN);
+-		  grub_memmove (arpreply->sipaddr,
+-				(char *) &arptable[ARP_CLIENT].ipaddr,
+-				sizeof (in_addr));
+-		  grub_memmove (arpreply->shwaddr,
+-				arptable[ARP_CLIENT].node,
+-				ETH_ALEN);
+-		  eth_transmit (arpreply->thwaddr, ARP,
+-				sizeof (struct arprequest),
+-				arpreply);
+-#ifdef MDEBUG
+-		  grub_memmove (&tmp, arpreply->tipaddr, sizeof (in_addr));
+-		  etherboot_printf ("Sent ARP reply to: %@\n", tmp);
+-#endif	/* MDEBUG */
+-		}
+-	      
+-	      continue;
+-	    }
+-
+-	  if (type == AWAIT_QDRAIN)
+-	    continue;
+-	  
+-	  /* Check for RARP - No IP hdr.  */
+-	  if (type == AWAIT_RARP
+-	      && nic.packetlen >= ETH_HLEN + sizeof (struct arprequest)
+-	      && ptype == RARP)
+-	    {
+-	      arpreply = (struct arprequest *) &nic.packet[ETH_HLEN];
+-	      
+-	      if (arpreply->opcode == htons (RARP_REPLY)
+-		  && ! grub_memcmp (arpreply->thwaddr, ptr, ETH_ALEN))
+-		{
+-		  grub_memmove ((char *) arptable[ARP_SERVER].node,
+-				arpreply->shwaddr, ETH_ALEN);
+-		  grub_memmove ((char *) &arptable[ARP_SERVER].ipaddr,
+-				arpreply->sipaddr, sizeof (in_addr));
+-		  grub_memmove ((char *) &arptable[ARP_CLIENT].ipaddr,
+-				arpreply->tipaddr, sizeof (in_addr));
+-		  return 1;
+-		}
+-	      
+-	      continue;
+-	    }
+-
+-	  /* Anything else has IP header.  */
+-	  if (nic.packetlen < protohdrlen || ptype != IP)
+-	    continue;
+-	  
+-	  ip = (struct iphdr *) &nic.packet[ETH_HLEN];
+-	  if (ip->verhdrlen != 0x45
+-	      || ipchksum ((unsigned short *) ip, sizeof (struct iphdr))
+-	      || ip->protocol != IP_UDP)
+-	    continue;
+-	  
+-	  /*
+-	    - Till Straumann <Till.Straumann@TU-Berlin.de>
+-	    added udp checksum (safer on a wireless link)
+-	    added fragmentation check: I had a corrupted image
+-	    in memory due to fragmented TFTP packets - took me
+-	    3 days to find the cause for this :-(
+-	  */
+-	  
+-	  /* If More Fragments bit and Fragment Offset field
+-	     are non-zero then packet is fragmented */
+-	  if (ip->frags & htons(0x3FFF))
+-	    {
+-	      grub_printf ("ALERT: got a fragmented packet - reconfigure your server\n");
+-	      continue;
+-	    }
+-	  
+-	  udp = (struct udphdr *) &nic.packet[(ETH_HLEN
+-					       + sizeof (struct iphdr))];
+-	  if (udp->chksum && udpchksum (ip))
+-	    {
+-	      grub_printf ("UDP checksum error\n");
+-	      continue;
+-	    }
+-	  
+-	  /* BOOTP ?  */
+-	  bootpreply = (struct bootp_t *)
+-	    &nic.packet[(ETH_HLEN + sizeof (struct iphdr)
+-			 + sizeof (struct udphdr))];
+-	  if (type == AWAIT_BOOTP
+-#ifdef NO_DHCP_SUPPORT
+-	      && (nic.packetlen
+-		  >= (ETH_HLEN + sizeof (struct bootp_t) - BOOTP_VENDOR_LEN))
+-#else
+-	      && (nic.packetlen
+-		  >= (ETH_HLEN + sizeof (struct bootp_t) - DHCP_OPT_LEN))
+-#endif /* ! NO_DHCP_SUPPORT */
+-	      && udp->dest == htons (BOOTP_CLIENT)
+-	      && bootpreply->bp_op == BOOTP_REPLY
+-	      && bootpreply->bp_xid == xid
+-	      && (! grub_memcmp (broadcast, bootpreply->bp_hwaddr, ETH_ALEN)
+-		  || ! grub_memcmp (arptable[ARP_CLIENT].node,
+-				    bootpreply->bp_hwaddr, ETH_ALEN)))
+-	    {
+-#ifdef DEBUG
+-	      grub_printf ("BOOTP packet was received.\n");
+-#endif
+-	      arptable[ARP_CLIENT].ipaddr.s_addr
+-		= bootpreply->bp_yiaddr.s_addr;
+-#ifndef	NO_DHCP_SUPPORT
+-	      dhcp_addr.s_addr = bootpreply->bp_yiaddr.s_addr;
+-#ifdef DEBUG
+-	      etherboot_printf ("dhcp_addr = %@\n", dhcp_addr.s_addr);
+-#endif
+-#endif /* ! NO_DHCP_SUPPORT */
+-	      netmask = default_netmask ();
+-	      arptable[ARP_SERVER].ipaddr.s_addr
+-		= bootpreply->bp_siaddr.s_addr;
+-	      /* Kill arp.  */
+-	      grub_memset (arptable[ARP_SERVER].node, 0, ETH_ALEN);
+-	      arptable[ARP_GATEWAY].ipaddr.s_addr
+-		= bootpreply->bp_giaddr.s_addr;
+-	      /* Kill arp.  */
+-	      grub_memset (arptable[ARP_GATEWAY].node, 0, ETH_ALEN);
+-
+-	      grub_memmove ((char *) BOOTP_DATA_ADDR, (char *) bootpreply,
+-			    sizeof (struct bootpd_t));
+-#ifdef NO_DHCP_SUPPORT
+-	      decode_rfc1533 (BOOTP_DATA_ADDR->bootp_reply.bp_vend,
+-			      0, BOOTP_VENDOR_LEN + MAX_BOOTP_EXTLEN, 1);
+-#else
+-	      decode_rfc1533 (BOOTP_DATA_ADDR->bootp_reply.bp_vend,
+-			      0, DHCP_OPT_LEN + MAX_BOOTP_EXTLEN, 1);
+-#endif /* ! NO_DHCP_SUPPORT */
+-	      
+-	      return 1;
+-	    }
+-	  
+-	  /* TFTP ? */
+-	  if (type == AWAIT_TFTP && ntohs (udp->dest) == ival)
+-	    return 1;
+-	}
+-      else
+-	{
+-	  /* Check for abort key only if the Rx queue is empty -
+-	   * as long as we have something to process, don't
+-	   * assume that something failed.  It is unlikely that
+-	   * we have no processing time left between packets.  */
+-	  if (checkkey () != -1 && ASCII_CHAR (getkey ()) == CTRL_C)
+-	    {
+-	      ip_abort = 1;
+-	      return 0;
+-	    }
+-	  
+-	  /* Do the timeout after at least a full queue walk.  */
+-	  if ((timeout == 0) || (currticks() > time))
+-	    {
+-	      break;
+-	    }
+-	}
+-    }
+-  
+-  return 0;
+-}
+-
+-/**************************************************************************
+-DECODE_RFC1533 - Decodes RFC1533 header
+-**************************************************************************/
+-int
+-decode_rfc1533 (unsigned char *p, int block, int len, int eof)
+-{
+-  static unsigned char *extdata = NULL, *extend = NULL;
+-  unsigned char *extpath = NULL;
+-  unsigned char *endp;
+-  
+-  if (block == 0)
+-    {
+-      end_of_rfc1533 = NULL;
+-      vendorext_isvalid = 0;
+-      
+-      if (grub_memcmp (p, rfc1533_cookie, 4))
+-	/* no RFC 1533 header found */
+-	return 0;
+-      
+-      p += 4;
+-      endp = p + len;
+-    }
+-  else
+-    {
+-      if (block == 1)
+-	{
+-	  if (grub_memcmp (p, rfc1533_cookie, 4))
+-	    /* no RFC 1533 header found */
+-	    return 0;
+-	  
+-	  p += 4;
+-	  len -= 4;
+-	}
+-      
+-      if (extend + len
+-	  <= ((unsigned char *)
+-	      &(BOOTP_DATA_ADDR->bootp_extension[MAX_BOOTP_EXTLEN])))
+-	{
+-	  grub_memmove (extend, p, len);
+-	  extend += len;
+-	}
+-      else
+-	{
+-	  grub_printf ("Overflow in vendor data buffer! Aborting...\n");
+-	  *extdata = RFC1533_END;
+-	  return 0;
+-	}
+-      
+-      p = extdata;
+-      endp = extend;
+-    }
+-
+-  if (! eof)
+-    return -1;
+-  
+-  while (p < endp)
+-    {
+-      unsigned char c = *p;
+-      
+-      if (c == RFC1533_PAD)
+-	{
+-	  p++;
+-	  continue;
+-	}
+-      else if (c == RFC1533_END)
+-	{
+-	  end_of_rfc1533 = endp = p;
+-	  continue;
+-	}
+-      else if (c == RFC1533_NETMASK)
+-	{
+-	  grub_memmove ((char *) &netmask, p + 2, sizeof (in_addr));
+-	}
+-      else if (c == RFC1533_GATEWAY)
+-	{
+-	  /* This is a little simplistic, but it will
+-	     usually be sufficient.
+-	     Take only the first entry.  */
+-	  if (TAG_LEN (p) >= sizeof (in_addr))
+-	    grub_memmove ((char *) &arptable[ARP_GATEWAY].ipaddr, p + 2,
+-			  sizeof (in_addr));
+-	}
+-      else if (c == RFC1533_EXTENSIONPATH)
+-	extpath = p;
+-#ifndef	NO_DHCP_SUPPORT
+-      else if (c == RFC2132_MSG_TYPE)
+-	{
+-	  dhcp_reply = *(p + 2);
+-	}
+-      else if (c == RFC2132_SRV_ID)
+-	{
+-	  grub_memmove ((char *) &dhcp_server, p + 2, sizeof (in_addr));
+-#ifdef DEBUG
+-	  etherboot_printf ("dhcp_server = %@\n", dhcp_server.s_addr);
+-#endif
+-	}
+-#endif /* ! NO_DHCP_SUPPORT */
+-      else if (c == RFC1533_VENDOR_MAGIC
+-	       && TAG_LEN(p) >= 6
+-	       && ! grub_memcmp (p + 2, vendorext_magic, 4)
+-	       && p[6] == RFC1533_VENDOR_MAJOR)
+-	vendorext_isvalid++;
+-      /* GRUB now handles its own tag. Get the name of a configuration
+-	 file from the network. Cool...  */
+-      else if (c == RFC1533_VENDOR_CONFIGFILE)
+-	{
+-	  int l = TAG_LEN (p);
+-	  
+-	  /* Eliminate the trailing NULs according to RFC 2132.  */
+-	  while (*(p + 2 + l - 1) == '\000' && l > 0)
+-	    l--;
+-	  
+-	  /* XXX: Should check if LEN is less than the maximum length
+-	     of CONFIG_FILE. This kind of robustness will be a goal
+-	     in GRUB 1.0.  */
+-	  grub_memmove (config_file, p + 2, l);
+-	  config_file[l] = 0;
+-	}
+-      
+-      p += TAG_LEN (p) + 2;
+-    }
+-  
+-  extdata = extend = endp;
+-  
+-  /* Perhaps we can eliminate this because we doesn't require so
+-     much information, but I leave this alone.  */
+-  if (block == 0 && extpath != NULL)
+-    {
+-      char fname[64];
+-      int fnamelen = TAG_LEN (extpath);
+-      
+-      while (*(extpath + 2 + fnamelen - 1) == '\000' && fnamelen > 0)
+-	fnamelen--;
+-      
+-      if (fnamelen + 1 > sizeof (fname))
+-	{
+-	  grub_printf ("Too long file name for Extensions Path\n");
+-	  return 0;
+-	}
+-      else if (! fnamelen)
+-	{
+-	  grub_printf ("Empty file name for Extensions Path\n");
+-	  return 0;
+-	}
+-      
+-      grub_memmove (fname, extpath + 2, fnamelen);
+-      fname[fnamelen] = '\000';
+-      grub_printf ("Loading BOOTP-extension file: %s\n", fname);
+-      tftp (fname, decode_rfc1533);
+-    }
+-  
+-  /* Proceed with next block.  */
+-  return -1;
+-}
+-
+-/**************************************************************************
+-IPCHKSUM - Checksum IP Header
+-**************************************************************************/
+-static unsigned short 
+-ipchksum (unsigned short *ip, int len)
+-{
+-  unsigned long sum = 0;
+-  len >>= 1;
+-  while (len--)
+-    {
+-      sum += *(ip++);
+-      if (sum > 0xFFFF)
+-	sum -= 0xFFFF;
+-    }
+-  return (~sum) & 0x0000FFFF;
+-}
+-
+-#define TWO_SECOND_DIVISOR (2147483647l/TICKS_PER_SEC)
+-
+-/**************************************************************************
+-RFC2131_SLEEP_INTERVAL - sleep for expotentially longer times
+-**************************************************************************/
+-long
+-rfc2131_sleep_interval (int base, int exp)
+-{
+-  static long seed = 0;
+-  long q;
+-  unsigned long tmo;
+-  
+-#ifdef BACKOFF_LIMIT
+-  if (exp > BACKOFF_LIMIT)
+-    exp = BACKOFF_LIMIT;
+-#endif
+-  if (!seed)
+-    /* Initialize linear congruential generator */
+-    seed = (currticks () + *((long *) &arptable[ARP_CLIENT].node)
+-	    + ((short *) arptable[ARP_CLIENT].node)[2]);
+-  /* simplified version of the LCG given in Bruce Schneier's
+-     "Applied Cryptography" */
+-  q = seed / 53668;
+-  if ((seed = 40014 * (seed - 53668 * q) - 12211 *q ) < 0)
+-    seed += 2147483563L;
+-  tmo = (base << exp) + (TICKS_PER_SEC - (seed / TWO_SECOND_DIVISOR));
+-  return tmo;
+-}
+-
+-/**************************************************************************
+-CLEANUP - shut down networking
+-**************************************************************************/
+-void
+-cleanup_net (void)
+-{
+-  if (network_ready)
+-    {
+-      /* Stop receiving packets.  */
+-      eth_disable ();
+-      network_ready = 0;
+-    }
+-}
+diff -Naur grub-0.97.orig/netboot/mii.h grub-0.97/netboot/mii.h
+--- grub-0.97.orig/netboot/mii.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/mii.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,105 @@
++/*
++ * linux/mii.h: definitions for MII-compatible transceivers
++ * Originally drivers/net/sunhme.h.
++ *
++ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
++ *
++ * Copied Form Linux 2.4.25 an unneeded items removed by:
++ * Timothy Legge (timlegge at etherboot dot org)
++ *
++ * 03/26/2004
++ */
++
++/* Generic MII registers. */
++
++#define MII_BMCR            0x00	/* Basic mode control register */
++#define MII_BMSR            0x01	/* Basic mode status register  */
++#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
++#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
++#define MII_ADVERTISE       0x04	/* Advertisement control reg   */
++#define MII_LPA             0x05	/* Link partner ability reg    */
++#define MII_EXPANSION       0x06        /* Expansion register          */
++#define MII_DCOUNTER        0x12        /* Disconnect counter          */
++#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
++#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
++#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
++#define MII_SREVISION       0x16        /* Silicon revision            */
++#define MII_RESV1           0x17        /* Reserved...                 */
++#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
++#define MII_PHYADDR         0x19        /* PHY address                 */
++#define MII_RESV2           0x1a        /* Reserved...                 */
++#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
++#define MII_NCONFIG         0x1c        /* Network interface config    */
++
++/* Basic mode control register. */
++#define BMCR_RESV               0x007f  /* Unused...                   */
++#define BMCR_CTST               0x0080  /* Collision test              */
++#define BMCR_FULLDPLX           0x0100	/* Full duplex                 */
++#define BMCR_ANRESTART          0x0200	/* Auto negotiation restart    */
++#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
++#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
++#define BMCR_ANENABLE           0x1000	/* Enable auto negotiation     */
++#define BMCR_SPEED100           0x2000	/* Select 100Mbps              */
++#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
++#define BMCR_RESET              0x8000	/* Reset the DP83840           */
++
++/* Basic mode status register. */
++#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
++#define BMSR_JCD                0x0002  /* Jabber detected             */
++#define BMSR_LSTATUS            0x0004  /* Link status                 */
++#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
++#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
++#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
++#define BMSR_RESV               0x07c0  /* Unused...                   */
++#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
++#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
++#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
++#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
++#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
++
++/* Advertisement control register. */
++#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
++#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
++#define ADVERTISE_10HALF        0x0020	/* Try for 10mbps half-duplex  */
++#define ADVERTISE_10FULL        0x0040	/* Try for 10mbps full-duplex  */
++#define ADVERTISE_100HALF       0x0080	/* Try for 100mbps half-duplex */
++#define ADVERTISE_100FULL       0x0100	/* Try for 100mbps full-duplex */
++#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
++#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
++#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
++#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
++#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
++
++#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
++			ADVERTISE_CSMA)
++#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
++                      ADVERTISE_100HALF | ADVERTISE_100FULL)
++
++/* Link partner ability register. */
++#define LPA_SLCT                0x001f  /* Same as advertise selector  */
++#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
++#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
++#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
++#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
++#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
++#define LPA_RESV                0x1c00  /* Unused...                   */
++#define LPA_RFAULT              0x2000  /* Link partner faulted        */
++#define LPA_LPACK               0x4000  /* Link partner acked us       */
++#define LPA_NPAGE               0x8000  /* Next page bit               */
++
++#define LPA_DUPLEX            (LPA_10FULL | LPA_100FULL)
++#define LPA_100                       (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
++
++/* Expansion register for auto-negotiation. */
++#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
++#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
++#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
++#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
++#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
++#define EXPANSION_RESV          0xffe0  /* Unused...                   */
++
++/* N-way test register. */
++#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
++#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
++#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
++
+diff -Naur grub-0.97.orig/netboot/misc.c grub-0.97/netboot/misc.c
+--- grub-0.97.orig/netboot/misc.c	2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/misc.c	2005-08-31 19:03:35.000000000 +0000
+@@ -19,37 +19,90 @@
+ 
+ /* Based on "src/misc.c" in etherboot-5.0.5.  */
+ 
+-#define GRUB	1
+-#include <etherboot.h>
++#include "grub.h"
++#include "timer.h"
+ 
+-void
+-sleep (int secs)
++#include "nic.h"
++
++/**************************************************************************
++RANDOM - compute a random number between 0 and 2147483647L or 2147483562?
++**************************************************************************/
++int32_t random(void)
+ {
+-  unsigned long tmo = currticks () + secs;
++	static int32_t seed = 0;
++	int32_t q;
++	if (!seed) /* Initialize linear congruential generator */
++		seed = currticks() + *(int32_t *)&arptable[ARP_CLIENT].node
++		       + ((int16_t *)arptable[ARP_CLIENT].node)[2];
++	/* simplified version of the LCG given in Bruce Schneier's
++	   "Applied Cryptography" */
++	q = seed/53668;
++	if ((seed = 40014*(seed-53668*q) - 12211*q) < 0) seed += 2147483563L;
++	return seed;
++}
+ 
+-  while (currticks () < tmo)
+-    ;
++/**************************************************************************
++POLL INTERRUPTIONS
++**************************************************************************/
++void poll_interruptions(void)
++{
++	if (checkkey() != -1 && ASCII_CHAR(getkey()) == K_INTR) {
++		user_abort++;
++	}
+ }
+ 
+-void
+-twiddle (void)
++/**************************************************************************
++SLEEP
++**************************************************************************/
++void sleep(int secs)
+ {
+-  static unsigned long lastticks = 0;
+-  static int count = 0;
+-  static const char tiddles[]="-\\|/";
+-  unsigned long ticks;
++	unsigned long tmo;
+ 
+-  if (debug)
+-    {
+-      if ((ticks = currticks ()) == lastticks)
+-	return;
+-      
+-      lastticks = ticks;
+-      grub_putchar (tiddles[(count++) & 3]);
+-      grub_putchar ('\b');
+-    }
++	for (tmo = currticks()+secs*TICKS_PER_SEC; currticks() < tmo; ) {
++		poll_interruptions();
++	}
++}
++
++/**************************************************************************
++INTERRUPTIBLE SLEEP
++**************************************************************************/
++void interruptible_sleep(int secs)
++{
++	printf("<sleep>\n");
++	return sleep(secs);
++}
++
++/**************************************************************************
++TWIDDLE
++**************************************************************************/
++void twiddle(void)
++{
++#ifdef BAR_PROGRESS
++	static int count=0;
++	static const char tiddles[]="-\\|/";
++	static unsigned long lastticks = 0;
++	unsigned long ticks;
++#endif
++#ifdef FREEBSD_PXEEMU
++	extern char pxeemu_nbp_active;
++	if(pxeemu_nbp_active != 0)
++		return;
++#endif
++#ifdef	BAR_PROGRESS
++	/* Limit the maximum rate at which characters are printed */
++	ticks = currticks();
++	if ((lastticks + (TICKS_PER_SEC/18)) > ticks)
++		return;
++	lastticks = ticks;
++
++	putchar(tiddles[(count++)&3]);
++	putchar('\b');
++#else
++	//putchar('.');
++#endif	/* BAR_PROGRESS */
+ }
+ 
++
+ /* Because Etherboot uses its own formats for the printf family,
+    define separate definitions from GRUB.  */
+ /**************************************************************************
+@@ -264,3 +317,5 @@
+   
+   return ret;
+ }
++
++
+diff -Naur grub-0.97.orig/netboot/natsemi.c grub-0.97/netboot/natsemi.c
+--- grub-0.97.orig/netboot/natsemi.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/natsemi.c	2005-08-31 19:53:07.000000000 +0000
+@@ -47,15 +47,15 @@
+ /* Revision History */
+ 
+ /*
++  13 Dec 2003 timlegge 1.1 Enabled Multicast Support
+   29 May 2001  mdc     1.0
+      Initial Release.  Tested with Netgear FA311 and FA312 boards
+-*/
++*/
+ /* Includes */
+ 
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ 
+ /* defines */
+ 
+@@ -71,21 +71,18 @@
+ 
+ #define NUM_RX_DESC    4              /* Number of Rx descriptor registers. */
+ 
+-typedef unsigned char  u8;
+-typedef   signed char  s8;
+-typedef unsigned short u16;
+-typedef   signed short s16;
+-typedef unsigned int   u32;
+-typedef   signed int   s32;
++typedef uint8_t    u8;
++typedef int8_t     s8;
++typedef uint16_t   u16;
++typedef int16_t    s16;
++typedef uint32_t   u32;
++typedef int32_t    s32;
+ 
+ /* helpful macroes if on a big_endian machine for changing byte order.
+    not strictly needed on Intel */
+-#define le16_to_cpu(val) (val)
+-#define cpu_to_le32(val) (val)
+ #define get_unaligned(ptr) (*(ptr))
+ #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+ #define get_u16(ptr) (*(u16 *)(ptr))
+-#define virt_to_bus(x) ((unsigned long)x)
+ #define virt_to_le32desc(addr)  virt_to_bus(addr)
+ 
+ enum pcistuff {
+@@ -161,7 +158,8 @@
+     AcceptMulticast    = 0x00200000, 
+     AcceptAllMulticast = 0x20000000,
+     AcceptAllPhys      = 0x10000000, 
+-    AcceptMyPhys       = 0x08000000
++    AcceptMyPhys       = 0x08000000,
++    RxFilterEnable     = 0x80000000
+ };
+ 
+ typedef struct _BufferDesc {
+@@ -207,17 +205,12 @@
+ static BufferDesc txd              __attribute__ ((aligned(4)));
+ static BufferDesc rxd[NUM_RX_DESC] __attribute__ ((aligned(4)));
+ 
+-#ifdef USE_LOWMEM_BUFFER
+-#define txb ((char *)0x10000 - TX_BUF_SIZE)
+-#define rxb ((char *)0x10000 - NUM_RX_DESC*RX_BUF_SIZE - TX_BUF_SIZE)
+-#else
+ static unsigned char txb[TX_BUF_SIZE] __attribute__ ((aligned(4)));
+ static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE] __attribute__ ((aligned(4)));
+-#endif
+ 
+ /* Function Prototypes */
+ 
+-struct nic *natsemi_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci);
++static int natsemi_probe(struct dev *dev, struct pci_device *pci);
+ static int eeprom_read(long addr, int location);
+ static int mdio_read(int phy_id, int location);
+ static void natsemi_init(struct nic *nic);
+@@ -228,8 +221,9 @@
+ static void natsemi_set_rx_mode(struct nic *nic);
+ static void natsemi_check_duplex(struct nic *nic);
+ static void natsemi_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p);
+-static int  natsemi_poll(struct nic *nic);
+-static void natsemi_disable(struct nic *nic);
++static int  natsemi_poll(struct nic *nic, int retrieve);
++static void natsemi_disable(struct dev *dev);
++static void natsemi_irq(struct nic *nic, irq_action_t action);
+ 
+ /* 
+  * Function: natsemi_probe
+@@ -245,24 +239,28 @@
+  * Returns:   struct nic *:          pointer to NIC data structure
+  */
+ 
+-struct nic *
+-natsemi_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
++static int
++natsemi_probe(struct dev *dev, struct pci_device *pci)
+ {
++    struct nic *nic = (struct nic *)dev;
+     int i;
+     int prev_eedata;
+     u32 tmp;
+ 
+-    if (io_addrs == 0 || *io_addrs == 0)
+-        return NULL;
++    if (pci->ioaddr == 0)
++        return 0;
++
++    adjust_pci_device(pci);
+ 
+     /* initialize some commonly used globals */
+ 	
+-    ioaddr     = *io_addrs & ~3;
++    nic->irqno  = 0;
++    nic->ioaddr = pci->ioaddr & ~3;
++
++    ioaddr     = pci->ioaddr & ~3;
+     vendor     = pci->vendor;
+     dev_id     = pci->dev_id;
+     nic_name   = pci->name;
+-    
+-    adjust_pci_device(pci);
+ 
+     /* natsemi has a non-standard PM control register
+      * in PCI config space.  Some boards apparently need
+@@ -317,12 +315,12 @@
+     /* initialize device */
+     natsemi_init(nic);
+ 
+-    nic->reset    = natsemi_init;
++    dev->disable  = natsemi_disable;
+     nic->poll     = natsemi_poll;
+     nic->transmit = natsemi_transmit;
+-    nic->disable  = natsemi_disable;
++    nic->irq      = natsemi_irq;
+ 
+-    return nic;
++    return 1;
+ }
+ 
+ /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.
+@@ -452,7 +450,7 @@
+  * Returns:   void.
+  */
+ static void 
+-natsemi_reset(struct nic *nic)
++natsemi_reset(struct nic *nic __unused)
+ {
+     outl(ChipReset, ioaddr + ChipCmd);
+ 	
+@@ -504,14 +502,14 @@
+  */
+ 
+ static void
+-natsemi_init_txd(struct nic *nic)
++natsemi_init_txd(struct nic *nic __unused)
+ {
+     txd.link   = (u32) 0;
+     txd.cmdsts = (u32) 0;
+-    txd.bufptr = (u32) &txb[0];
++    txd.bufptr = virt_to_bus(&txb[0]);
+ 
+     /* load Transmit Descriptor Register */
+-    outl((u32) &txd, ioaddr + TxRingPtr); 
++    outl(virt_to_bus(&txd), ioaddr + TxRingPtr); 
+     if (natsemi_debug > 1)
+         printf("natsemi_init_txd: TX descriptor register loaded with: %X\n", 
+                inl(ioaddr + TxRingPtr));
+@@ -527,7 +525,7 @@
+  */
+  
+ static void 
+-natsemi_init_rxd(struct nic *nic) 
++natsemi_init_rxd(struct nic *nic __unused) 
+ { 
+     int i;
+ 
+@@ -535,16 +533,16 @@
+ 
+     /* init RX descriptor */
+     for (i = 0; i < NUM_RX_DESC; i++) {
+-        rxd[i].link   = (i+1 < NUM_RX_DESC) ? (u32) &rxd[i+1] : (u32) &rxd[0];
++        rxd[i].link   = virt_to_bus((i+1 < NUM_RX_DESC) ? &rxd[i+1] : &rxd[0]);
+         rxd[i].cmdsts = (u32) RX_BUF_SIZE;
+-        rxd[i].bufptr = (u32) &rxb[i*RX_BUF_SIZE];
++        rxd[i].bufptr = virt_to_bus(&rxb[i*RX_BUF_SIZE]);
+         if (natsemi_debug > 1)
+             printf("natsemi_init_rxd: rxd[%d]=%X link=%X cmdsts=%X bufptr=%X\n", 
+                    i, &rxd[i], rxd[i].link, rxd[i].cmdsts, rxd[i].bufptr);
+     }
+ 
+     /* load Receive Descriptor Register */
+-    outl((u32) &rxd[0], ioaddr + RxRingPtr);
++    outl(virt_to_bus(&rxd[0]), ioaddr + RxRingPtr);
+ 
+     if (natsemi_debug > 1)
+         printf("natsemi_init_rxd: RX descriptor register loaded with: %X\n", 
+@@ -562,14 +560,15 @@
+  * Returns:   void.
+  */
+ 
+-static void natsemi_set_rx_mode(struct nic *nic)
++static void natsemi_set_rx_mode(struct nic *nic __unused)
+ {
+-    u32 rx_mode = AcceptBroadcast | AcceptMyPhys;
++    u32 rx_mode = RxFilterEnable | AcceptBroadcast |
++	    AcceptAllMulticast | AcceptMyPhys;
+ 	
+     outl(rx_mode, ioaddr + RxFilterAddr);
+ }
+ 
+-static void natsemi_check_duplex(struct nic *nic)
++static void natsemi_check_duplex(struct nic *nic __unused)
+ {
+     int duplex = inl(ioaddr + ChipConfig) & 0x20000000 ? 1 : 0;
+ 	
+@@ -607,14 +606,14 @@
+ 		 unsigned int s,     /* size */
+ 		 const char  *p)     /* Packet */
+ {
+-    u32 status, to, nstype;
++    u32 to, nstype;
+     u32 tx_status;
+     
+     /* Stop the transmitter */
+     outl(TxOff, ioaddr + ChipCmd);
+ 
+     /* load Transmit Descriptor Register */
+-    outl((u32) &txd, ioaddr + TxRingPtr);
++    outl(virt_to_bus(&txd), ioaddr + TxRingPtr);
+     if (natsemi_debug > 1)
+         printf("natsemi_transmit: TX descriptor register loaded with: %X\n", 
+                inl(ioaddr + TxRingPtr));
+@@ -636,7 +635,7 @@
+         txb[s++] = '\0';
+ 
+     /* set the transmit buffer descriptor and enable Transmit State Machine */
+-    txd.bufptr = (u32) &txb[0];
++    txd.bufptr = virt_to_bus(&txb[0]);
+     txd.cmdsts = (u32) OWN | s;
+ 
+     /* restart the transmitter */
+@@ -647,7 +646,7 @@
+ 
+     to = currticks() + TX_TIMEOUT;
+ 
+-    while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to))
++    while ((volatile u32) ( tx_status=txd.cmdsts & OWN) && (currticks() < to))
+         /* wait */ ;
+ 
+     if (currticks() >= to) {
+@@ -674,7 +673,7 @@
+  */
+ 
+ static int
+-natsemi_poll(struct nic *nic)
++natsemi_poll(struct nic *nic, int retrieve)
+ {
+     u32 rx_status = rxd[cur_rx].cmdsts;
+     int retstat = 0;
+@@ -685,6 +684,8 @@
+     if (!(rx_status & OWN))
+         return retstat;
+ 
++    if ( ! retrieve ) return 1;
++
+     if (natsemi_debug > 1)
+         printf("natsemi_poll: got a packet: cur_rx:%d, status:%X\n",
+                cur_rx, rx_status);
+@@ -704,7 +705,7 @@
+ 
+     /* return the descriptor and buffer to receive ring */
+     rxd[cur_rx].cmdsts = RX_BUF_SIZE;
+-    rxd[cur_rx].bufptr = (u32) &rxb[cur_rx*RX_BUF_SIZE];
++    rxd[cur_rx].bufptr = virt_to_bus(&rxb[cur_rx*RX_BUF_SIZE]);
+         
+     if (++cur_rx == NUM_RX_DESC)
+         cur_rx = 0;
+@@ -725,8 +726,12 @@
+  */
+ 
+ static void
+-natsemi_disable(struct nic *nic)
++natsemi_disable(struct dev *dev)
+ {
++    struct nic *nic = (struct nic *)dev;
++    /* merge reset and disable */
++    natsemi_init(nic);
++
+     /* Disable interrupts using the mask. */
+     outl(0, ioaddr + IntrMask);
+     outl(0, ioaddr + IntrEnable);
+@@ -737,3 +742,39 @@
+     /* Restore PME enable bit */
+     outl(SavedClkRun, ioaddr + ClkRun);
+ }
++
++/* Function: natsemi_irq
++ *
++ * Description: Enable, Disable, or Force interrupts
++ *    
++ * Arguments: struct nic *nic:          NIC data structure
++ *            irq_action_t action:      requested action to perform
++ *
++ * Returns:   void.
++ */
++
++static void 
++natsemi_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++static struct pci_id natsemi_nics[] = {
++PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
++};
++
++struct pci_driver natsemi_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "NATSEMI",
++	.probe    = natsemi_probe,
++	.ids      = natsemi_nics,
++	.id_count = sizeof(natsemi_nics)/sizeof(natsemi_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/nfs.h grub-0.97/netboot/nfs.h
+--- grub-0.97.orig/netboot/nfs.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/nfs.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,63 @@
++#ifndef	_NFS_H
++#define	_NFS_H
++
++#define SUNRPC_PORT	111
++
++#define PROG_PORTMAP	100000
++#define PROG_NFS	100003
++#define PROG_MOUNT	100005
++
++#define MSG_CALL	0
++#define MSG_REPLY	1
++
++#define PORTMAP_GETPORT	3
++
++#define MOUNT_ADDENTRY	1
++#define MOUNT_UMOUNTALL	4
++
++#define NFS_LOOKUP	4
++#define	NFS_READLINK	5
++#define NFS_READ	6
++
++#define NFS_FHSIZE	32
++
++#define NFSERR_PERM	1
++#define NFSERR_NOENT	2
++#define NFSERR_ACCES	13
++#define	NFSERR_ISDIR	21
++#define	NFSERR_INVAL	22
++
++/* Block size used for NFS read accesses.  A RPC reply packet (including  all
++ * headers) must fit within a single Ethernet frame to avoid fragmentation.
++ * Chosen to be a power of two, as most NFS servers are optimized for this.  */
++#define NFS_READ_SIZE	1024
++
++#define NFS_MAXLINKDEPTH 16
++
++struct rpc_t {
++	struct iphdr ip;
++	struct udphdr udp;
++	union {
++		uint8_t  data[300];		/* longest RPC call must fit!!!! */
++		struct {
++			uint32_t id;
++			uint32_t type;
++			uint32_t rpcvers;
++			uint32_t prog;
++			uint32_t vers;
++			uint32_t proc;
++			uint32_t data[1];
++		} call;
++		struct {
++			uint32_t id;
++			uint32_t type;
++			uint32_t rstatus;
++			uint32_t verifier;
++			uint32_t v2;
++			uint32_t astatus;
++			uint32_t data[1];
++		} reply;
++	} u;
++};
++
++#endif	/* _NFS_H */
+diff -Naur grub-0.97.orig/netboot/ni5010.c grub-0.97/netboot/ni5010.c
+--- grub-0.97.orig/netboot/ni5010.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/ni5010.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,371 +0,0 @@
+-/**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-Driver for NI5010.
+-Code freely taken from Jan-Pascal van Best and Andreas Mohr's
+-Linux NI5010 driver.
+-***************************************************************************/
+-
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+-/* to get some global routines like printf */
+-#include "etherboot.h"
+-/* to get the interface to the body of the program */
+-#include "nic.h"
+-/* to get our own prototype */
+-#include "cards.h"
+-
+-/* ni5010.h file included verbatim */
+-/*
+- * Racal-Interlan ni5010 Ethernet definitions
+- *
+- * This is an extension to the Linux operating system, and is covered by the
+- * same Gnu Public License that covers that work.
+- *
+- * copyrights (c) 1996 by Jan-Pascal van Best (jvbest@wi.leidenuniv.nl)
+- *
+- * I have done a look in the following sources:
+- *   crynwr-packet-driver by Russ Nelson
+- */
+-
+-#define NI5010_BUFSIZE	2048	/* number of bytes in a buffer */
+-
+-#define NI5010_MAGICVAL0 0x00  /* magic-values for ni5010 card */
+-#define NI5010_MAGICVAL1 0x55
+-#define NI5010_MAGICVAL2 0xAA
+-
+-#define SA_ADDR0 0x02
+-#define SA_ADDR1 0x07
+-#define SA_ADDR2 0x01
+-
+-/* The number of low I/O ports used by the ni5010 ethercard. */
+-#define NI5010_IO_EXTENT       32
+-
+-#define PRINTK(x) if (NI5010_DEBUG) printk x
+-#define PRINTK2(x) if (NI5010_DEBUG>=2) printk x
+-#define PRINTK3(x) if (NI5010_DEBUG>=3) printk x
+-
+-/* The various IE command registers */
+-#define EDLC_XSTAT	(ioaddr + 0x00)	/* EDLC transmit csr */
+-#define EDLC_XCLR	(ioaddr + 0x00)	/* EDLC transmit "Clear IRQ" */
+-#define EDLC_XMASK	(ioaddr + 0x01)	/* EDLC transmit "IRQ Masks" */
+-#define EDLC_RSTAT	(ioaddr + 0x02)	/* EDLC receive csr */
+-#define EDLC_RCLR	(ioaddr + 0x02)	/* EDLC receive "Clear IRQ" */
+-#define EDLC_RMASK	(ioaddr + 0x03)	/* EDLC receive "IRQ Masks" */
+-#define EDLC_XMODE	(ioaddr + 0x04)	/* EDLC transmit Mode */
+-#define EDLC_RMODE	(ioaddr + 0x05)	/* EDLC receive Mode */
+-#define EDLC_RESET	(ioaddr + 0x06)	/* EDLC RESET register */
+-#define EDLC_TDR1	(ioaddr + 0x07)	/* "Time Domain Reflectometry" reg1 */
+-#define EDLC_ADDR	(ioaddr + 0x08)	/* EDLC station address, 6 bytes */
+-	 			/* 0x0E doesn't exist for r/w */
+-#define EDLC_TDR2	(ioaddr + 0x0f)	/* "Time Domain Reflectometry" reg2 */
+-#define IE_GP		(ioaddr + 0x10)	/* GP pointer (word register) */
+-				/* 0x11 is 2nd byte of GP Pointer */
+-#define IE_RCNT		(ioaddr + 0x10)	/* Count of bytes in rcv'd packet */
+- 				/* 0x11 is 2nd byte of "Byte Count" */
+-#define IE_MMODE	(ioaddr + 0x12)	/* Memory Mode register */
+-#define IE_DMA_RST	(ioaddr + 0x13)	/* IE DMA Reset.  write only */
+-#define IE_ISTAT	(ioaddr + 0x13)	/* IE Interrupt Status.  read only */
+-#define IE_RBUF		(ioaddr + 0x14)	/* IE Receive Buffer port */
+-#define IE_XBUF		(ioaddr + 0x15)	/* IE Transmit Buffer port */
+-#define IE_SAPROM	(ioaddr + 0x16)	/* window on station addr prom */
+-#define IE_RESET	(ioaddr + 0x17)	/* any write causes Board Reset */
+-
+-/* bits in EDLC_XSTAT, interrupt clear on write, status when read */
+-#define XS_TPOK		0x80	/* transmit packet successful */
+-#define XS_CS		0x40	/* carrier sense */
+-#define XS_RCVD		0x20	/* transmitted packet received */
+-#define XS_SHORT	0x10	/* transmission media is shorted */
+-#define XS_UFLW		0x08	/* underflow.  iff failed board */
+-#define XS_COLL		0x04	/* collision occurred */
+-#define XS_16COLL	0x02	/* 16th collision occurred */
+-#define XS_PERR		0x01	/* parity error */
+-
+-#define XS_CLR_UFLW	0x08	/* clear underflow */
+-#define XS_CLR_COLL	0x04	/* clear collision */
+-#define XS_CLR_16COLL	0x02	/* clear 16th collision */
+-#define XS_CLR_PERR	0x01	/* clear parity error */
+-
+-/* bits in EDLC_XMASK, mask/enable transmit interrupts.  register is r/w */
+-#define XM_TPOK		0x80	/* =1 to enable Xmt Pkt OK interrupts */
+-#define XM_RCVD		0x20	/* =1 to enable Xmt Pkt Rcvd ints */
+-#define XM_UFLW		0x08	/* =1 to enable Xmt Underflow ints */
+-#define XM_COLL		0x04	/* =1 to enable Xmt Collision ints */
+-#define XM_COLL16	0x02	/* =1 to enable Xmt 16th Coll ints */
+-#define XM_PERR		0x01	/* =1 to enable Xmt Parity Error ints */
+- 				/* note: always clear this bit */
+-#define XM_ALL		(XM_TPOK | XM_RCVD | XM_UFLW | XM_COLL | XM_COLL16)
+-
+-/* bits in EDLC_RSTAT, interrupt clear on write, status when read */
+-#define RS_PKT_OK	0x80	/* received good packet */
+-#define RS_RST_PKT	0x10	/* RESET packet received */
+-#define RS_RUNT		0x08	/* Runt Pkt rcvd.  Len < 64 Bytes */
+-#define RS_ALIGN	0x04	/* Alignment error. not 8 bit aligned */
+-#define RS_CRC_ERR	0x02	/* Bad CRC on rcvd pkt */
+-#define RS_OFLW		0x01	/* overflow for rcv FIFO */
+-#define RS_VALID_BITS	( RS_PKT_OK | RS_RST_PKT | RS_RUNT | RS_ALIGN | RS_CRC_ERR | RS_OFLW )
+- 				/* all valid RSTAT bits */
+-
+-#define RS_CLR_PKT_OK	0x80	/* clear rcvd packet interrupt */
+-#define RS_CLR_RST_PKT	0x10	/* clear RESET packet received */
+-#define RS_CLR_RUNT	0x08	/* clear Runt Pckt received */
+-#define RS_CLR_ALIGN	0x04	/* clear Alignment error */
+-#define RS_CLR_CRC_ERR	0x02	/* clear CRC error */
+-#define RS_CLR_OFLW	0x01	/* clear rcv FIFO Overflow */
+-
+-/* bits in EDLC_RMASK, mask/enable receive interrupts.  register is r/w */
+-#define RM_PKT_OK	0x80	/* =1 to enable rcvd good packet ints */
+-#define RM_RST_PKT	0x10	/* =1 to enable RESET packet ints */
+-#define RM_RUNT		0x08	/* =1 to enable Runt Pkt rcvd ints */
+-#define RM_ALIGN	0x04	/* =1 to enable Alignment error ints */
+-#define RM_CRC_ERR	0x02	/* =1 to enable Bad CRC error ints */
+-#define RM_OFLW		0x01	/* =1 to enable overflow error ints */
+-
+-/* bits in EDLC_RMODE, set Receive Packet mode.  register is r/w */
+-#define RMD_TEST	0x80	/* =1 for Chip testing.  normally 0 */
+-#define RMD_ADD_SIZ	0x10	/* =1 5-byte addr match.  normally 0 */
+-#define RMD_EN_RUNT	0x08	/* =1 enable runt rcv.  normally 0 */
+-#define RMD_EN_RST	0x04	/* =1 to rcv RESET pkt.  normally 0 */
+-
+-#define RMD_PROMISC	0x03	/* receive *all* packets.  unusual */
+-#define RMD_MULTICAST	0x02	/* receive multicasts too.  unusual */
+-#define RMD_BROADCAST	0x01	/* receive broadcasts & normal. usual */
+-#define RMD_NO_PACKETS	0x00	/* don't receive any packets. unusual */
+-
+-/* bits in EDLC_XMODE, set Transmit Packet mode.  register is r/w */
+-#define XMD_COLL_CNT	0xf0	/* coll's since success.  read-only */
+-#define XMD_IG_PAR	0x08	/* =1 to ignore parity.  ALWAYS set */
+-#define XMD_T_MODE	0x04	/* =1 to power xcvr. ALWAYS set this */
+-#define XMD_LBC		0x02	/* =1 for loopback.  normally set */
+-#define XMD_DIS_C	0x01	/* =1 disables contention. normally 0 */
+-
+-/* bits in EDLC_RESET, write only */
+-#define RS_RESET	0x80	/* =1 to hold EDLC in reset state */
+-
+-/* bits in IE_MMODE, write only */
+-#define MM_EN_DMA	0x80	/* =1 begin DMA xfer, Cplt clrs it */
+-#define MM_EN_RCV	0x40	/* =1 allows Pkt rcv.  clr'd by rcv */
+-#define MM_EN_XMT	0x20	/* =1 begin Xmt pkt.  Cplt clrs it */
+-#define MM_BUS_PAGE	0x18	/* =00 ALWAYS.  Used when MUX=1 */
+-#define MM_NET_PAGE	0x06	/* =00 ALWAYS.  Used when MUX=0 */
+-#define MM_MUX		0x01	/* =1 means Rcv Buff on system bus */
+-				/* =0 means Xmt Buff on system bus */
+-
+-/* bits in IE_ISTAT, read only */
+-#define IS_TDIAG	0x80	/* =1 if Diagnostic problem */
+-#define IS_EN_RCV	0x20	/* =1 until frame is rcv'd cplt */
+-#define IS_EN_XMT	0x10	/* =1 until frame is xmt'd cplt */
+-#define IS_EN_DMA	0x08	/* =1 until DMA is cplt or aborted */
+-#define IS_DMA_INT	0x04	/* =0 iff DMA done interrupt. */
+-#define IS_R_INT	0x02	/* =0 iff unmasked Rcv interrupt */
+-#define IS_X_INT	0x01	/* =0 iff unmasked Xmt interrupt */
+-
+-/* NIC specific static variables go here */
+-
+-static unsigned short		ioaddr = 0;
+-static unsigned int		bufsize_rcv = 0;
+-
+-#if	0
+-static void show_registers(void)
+-{
+-	printf("XSTAT %hhX ", inb(EDLC_XSTAT));
+-	printf("XMASK %hhX ", inb(EDLC_XMASK));
+-	printf("RSTAT %hhX ", inb(EDLC_RSTAT));
+-	printf("RMASK %hhX ", inb(EDLC_RMASK));
+-	printf("RMODE %hhX ", inb(EDLC_RMODE));
+-	printf("XMODE %hhX ", inb(EDLC_XMODE));
+-	printf("ISTAT %hhX\n", inb(IE_ISTAT));
+-}
+-#endif
+-
+-static void reset_receiver(void)
+-{
+-	outw(0, IE_GP);		/* Receive packet at start of buffer */
+-	outb(RS_VALID_BITS, EDLC_RCLR);	/* Clear all pending Rcv interrupts */
+-	outb(MM_EN_RCV, IE_MMODE); /* Enable rcv */
+-}
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void ni5010_reset(struct nic *nic)
+-{
+-	int		i;
+-
+-	/* Reset the hardware here.  Don't forget to set the station address. */
+-	outb(RS_RESET, EDLC_RESET);	/* Hold up EDLC_RESET while configing board */
+-	outb(0, IE_RESET);	/* Hardware reset of ni5010 board */
+-	outb(0, EDLC_XMASK);	/* Disable all Xmt interrupts */
+-	outb(0, EDLC_RMASK);	/* Disable all Rcv interrupt */
+-	outb(0xFF, EDLC_XCLR);	/* Clear all pending Xmt interrupts */
+-	outb(0xFF, EDLC_RCLR);	/* Clear all pending Rcv interrupts */
+-	outb(XMD_LBC, EDLC_XMODE);	/* Only loopback xmits */
+-	/* Set the station address */
+-	for(i = 0; i < ETH_ALEN; i++)
+-		outb(nic->node_addr[i], EDLC_ADDR + i);
+-	outb(XMD_IG_PAR | XMD_T_MODE | XMD_LBC, EDLC_XMODE); 
+-				/* Normal packet xmit mode */
+-	outb(RMD_BROADCAST, EDLC_RMODE);
+-				/* Receive broadcast and normal packets */
+-	reset_receiver();
+-	outb(0x00, EDLC_RESET);	/* Un-reset the ni5010 */
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int ni5010_poll(struct nic *nic)
+-{
+-	int		rcv_stat;
+-
+-	if (((rcv_stat = inb(EDLC_RSTAT)) & RS_VALID_BITS) != RS_PKT_OK) {
+-		outb(rcv_stat, EDLC_RSTAT);	/* Clear the status */
+-		return (0);
+-	}
+-        outb(rcv_stat, EDLC_RCLR);	/* Clear the status */
+-	nic->packetlen = inw(IE_RCNT);
+-	/* Read packet into buffer */
+-        outb(MM_MUX, IE_MMODE);	/* Rcv buffer to system bus */
+-	outw(0, IE_GP);		/* Seek to beginning of packet */
+-	insb(IE_RBUF, nic->packet, nic->packetlen); 
+-	return (1);
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void ni5010_transmit(struct nic *nic,
+-	const char *d,	/* Destination */
+-	unsigned int t,	/* Type */
+-	unsigned int s,	/* size */
+-	const char *p)	/* Packet */
+-{
+-	unsigned int	len;
+-	int		buf_offs, xmt_stat;
+-	unsigned long	time;
+-
+-	len = s + ETH_HLEN;
+-	if (len < ETH_ZLEN)
+-		len = ETH_ZLEN;
+-	buf_offs = NI5010_BUFSIZE - len;
+-	outb(0, EDLC_RMASK);	/* Mask all receive interrupts */
+-	outb(0, IE_MMODE);	/* Put Xmit buffer on system bus */
+-	outb(0xFF, EDLC_RCLR);	/* Clear out pending rcv interrupts */
+-	outw(buf_offs, IE_GP);	/* Point GP at start of packet */
+-	outsb(IE_XBUF, d, ETH_ALEN);	/* Put dst in buffer */
+-	outsb(IE_XBUF, nic->node_addr, ETH_ALEN);/* Put src in buffer */
+-	outb(t >> 8, IE_XBUF);
+-	outb(t, IE_XBUF);
+-	outsb(IE_XBUF, p, s);	/* Put data in buffer */
+-	while (s++ < ETH_ZLEN - ETH_HLEN)	/* Pad to min size */
+-		outb(0, IE_XBUF);
+-	outw(buf_offs, IE_GP);	/* Rewrite where packet starts */
+-	/* should work without that outb() (Crynwr used it) */
+-	/*outb(MM_MUX, IE_MMODE);*/
+-	/* Xmt buffer to EDLC bus */
+-	outb(MM_EN_XMT | MM_MUX, IE_MMODE);	/* Begin transmission */
+-	/* wait for transmit complete */
+-	while (((xmt_stat = inb(IE_ISTAT)) & IS_EN_XMT) != 0)
+-		;
+-	reset_receiver();	/* Immediately switch to receive */
+-}
+-
+-/**************************************************************************
+-DISABLE - Turn off ethernet interface
+-***************************************************************************/
+-static void ni5010_disable(struct nic *nic)
+-{
+-	outb(0, IE_MMODE);
+-	outb(RS_RESET, EDLC_RESET);
+-}
+-
+-static inline int rd_port(void)
+-{
+-	inb(IE_RBUF);
+-	return inb(IE_SAPROM);
+-}
+-
+-static int ni5010_probe1(struct nic *nic)
+-{
+-	int		i, boguscount = 40, data;
+-
+-	/* The tests are from the Linux NI5010 driver
+-	   I don't understand it all, but if it works for them...  */
+-	if (inb(ioaddr) == 0xFF)
+-		return (0);
+-	while ((rd_port() & rd_port() & rd_port()
+-		& rd_port() & rd_port() & rd_port()) != 0xFF)
+-	{
+-		if (boguscount-- <= 0)
+-			return (0);
+-	}
+-	for (i = 0; i < 32; i++)
+-		if ((data = rd_port()) != 0xFF)
+-			break;
+-	if (data == 0xFF)
+-		return (0);
+-	if (data == SA_ADDR0 && rd_port() == SA_ADDR1 && rd_port() == SA_ADDR2) {
+-		for (i = 0; i < 4; i++)
+-			rd_port();
+-		if (rd_port() != NI5010_MAGICVAL1 || rd_port() != NI5010_MAGICVAL2)
+-			return (0);
+-	} else
+-		return (0);
+-	for (i = 0; i < ETH_ALEN; i++) {
+-		outw(i, IE_GP);
+-		nic->node_addr[i] = inb(IE_SAPROM);
+-	}
+-	printf("\nNI5010 ioaddr %#hX, addr %!\n", ioaddr, nic->node_addr);
+-/* get the size of the onboard receive buffer
+- * higher addresses than bufsize are wrapped into real buffer
+- * i.e. data for offs. 0x801 is written to 0x1 with a 2K onboard buffer
+- */
+-	if (bufsize_rcv == 0) {
+-        	outb(1, IE_MMODE);      /* Put Rcv buffer on system bus */
+-        	outw(0, IE_GP);		/* Point GP at start of packet */
+-        	outb(0, IE_RBUF);	/* set buffer byte 0 to 0 */
+-        	for (i = 1; i < 0xFF; i++) {
+-                	outw(i << 8, IE_GP); /* Point GP at packet size to be tested */
+-                	outb(i, IE_RBUF);
+-                	outw(0x0, IE_GP); /* Point GP at start of packet */
+-                	data = inb(IE_RBUF);
+-                	if (data == i) break;
+-        	}
+-		bufsize_rcv = i << 8;
+-        	outw(0, IE_GP);		/* Point GP at start of packet */
+-        	outb(0, IE_RBUF);	/* set buffer byte 0 to 0 again */
+-	}
+-	printf("Bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
+-	return (1);
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-struct nic *ni5010_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	static unsigned short	io_addrs[] = {
+-		0x300, 0x320, 0x340, 0x360, 0x380, 0x3a0, 0 };
+-	unsigned short		*p;
+-
+-	/* if probe_addrs is 0, then use list above */
+-	if (probe_addrs == 0 || *probe_addrs == 0)
+-		probe_addrs = io_addrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; p++) {
+-		if (ni5010_probe1(nic))
+-			break;
+-	}
+-	if (ioaddr == 0)
+-		return (0);
+-	ni5010_reset(nic);
+-	/* point to NIC specific routines */
+-	nic->reset = ni5010_reset;
+-	nic->poll = ni5010_poll;
+-	nic->transmit = ni5010_transmit;
+-	nic->disable = ni5010_disable;
+-	return (nic);
+-}
+diff -Naur grub-0.97.orig/netboot/nic.c grub-0.97/netboot/nic.c
+--- grub-0.97.orig/netboot/nic.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/nic.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,1198 @@
++/**************************************************************************
++Etherboot -  Network Bootstrap Program
++
++Literature dealing with the network protocols:
++	ARP - RFC826
++	RARP - RFC903
++        IP - RFC791
++	UDP - RFC768
++	BOOTP - RFC951, RFC2132 (vendor extensions)
++	DHCP - RFC2131, RFC2132 (options)
++	TFTP - RFC1350, RFC2347 (options), RFC2348 (blocksize), RFC2349 (tsize)
++	RPC - RFC1831, RFC1832 (XDR), RFC1833 (rpcbind/portmapper)
++	NFS - RFC1094, RFC1813 (v3, useful for clarifications, not implemented)
++	IGMP - RFC1112, RFC2113, RFC2365, RFC2236, RFC3171
++
++**************************************************************************/
++#include "etherboot.h"
++#include "grub.h"
++#include "nic.h"
++#include "elf.h" /* FOR EM_CURRENT */
++#include "bootp.h"
++#include "if_arp.h"
++#include "tftp.h"
++#include "timer.h"
++#include "ip.h"
++#include "udp.h"
++
++/* Currently no other module uses rom, but it is available */
++struct rom_info		rom;
++struct arptable_t	arptable[MAX_ARP];
++#if MULTICAST_LEVEL2
++unsigned long last_igmpv1 = 0;
++struct igmptable_t	igmptable[MAX_IGMP];
++#endif
++static unsigned long	netmask;
++/* Used by nfs.c */
++char *hostname = "";
++int hostnamelen = 0;
++static uint32_t xid;
++static unsigned char *end_of_rfc1533 = NULL;
++static const unsigned char broadcast[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
++static const in_addr zeroIP = { 0L };
++static char rfc1533_venddata[MAX_RFC1533_VENDLEN];
++static unsigned char rfc1533_cookie[4] = { RFC1533_COOKIE };
++static unsigned char rfc1533_cookie_bootp[5] = { RFC1533_COOKIE, RFC1533_END };
++static unsigned char rfc1533_cookie_dhcp[] = { RFC1533_COOKIE };
++static int dhcp_reply;
++static in_addr dhcp_server = { 0L };
++static in_addr dhcp_addr = { 0L };
++
++static const unsigned char dhcpdiscover[] = {
++	RFC2132_MSG_TYPE, 1, DHCPDISCOVER,
++	RFC2132_MAX_SIZE, 2,	/* request as much as we can */
++	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
++	/* Vendor class identifier */
++	RFC2132_VENDOR_CLASS_ID, 10, 'G', 'R', 'U', 'B', 'C', 'l', 'i', 'e', 'n', 't',
++	RFC2132_PARAM_LIST, 4, RFC1533_NETMASK, RFC1533_GATEWAY,
++	RFC1533_HOSTNAME, RFC1533_EXTENSIONPATH, RFC1533_END
++};
++static const unsigned char dhcprequest [] = {
++	RFC2132_MSG_TYPE,1,DHCPREQUEST,
++	RFC2132_SRV_ID,4,0,0,0,0,
++	RFC2132_REQ_ADDR,4,0,0,0,0,
++	RFC2132_MAX_SIZE,2,	/* request as much as we can */
++	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
++	/* Vendor class identifier */
++	RFC2132_VENDOR_CLASS_ID, 10, 'G', 'R', 'U', 'B', 'C', 'l', 'i', 'e', 'n', 't',
++	RFC2132_PARAM_LIST,
++	/* 4 standard + 2 vendortags */
++	4 + 2,
++	/* Standard parameters */
++	RFC1533_NETMASK, RFC1533_GATEWAY,
++	RFC1533_HOSTNAME, RFC1533_EXTENSIONPATH,
++	/* Etherboot vendortags */
++	RFC1533_VENDOR_MAGIC,
++	RFC1533_VENDOR_CONFIGFILE,
++	RFC1533_END
++};
++
++/* See nic.h */
++int user_abort = 0;
++int network_ready = 0;
++
++#ifdef	REQUIRE_VCI_ETHERBOOT
++int	vci_etherboot;
++#endif
++
++static int dummy(void *unused __unused)
++{
++	return (0);
++}
++
++/* Careful.  We need an aligned buffer to avoid problems on machines
++ * that care about alignment.  To trivally align the ethernet data
++ * (the ip hdr and arp requests) we offset the packet by 2 bytes.
++ * leaving the ethernet data 16 byte aligned.  Beyond this
++ * we use memmove but this makes the common cast simple and fast.
++ */
++static char	packet[ETH_FRAME_LEN + ETH_DATA_ALIGN] __aligned;
++
++struct nic	nic =
++{
++	{
++		0,				/* dev.disable */
++		{
++			0,
++			0,
++			PCI_BUS_TYPE,
++		},				/* dev.devid */
++		0,				/* index */
++		0,				/* type */
++		PROBE_FIRST,			/* how_pobe */
++		PROBE_NONE,			/* to_probe */
++		0,				/* failsafe */
++		0,				/* type_index */
++		{},				/* state */
++	},
++	(int (*)(struct nic *, int))dummy,      /* poll */
++	(void (*)(struct nic *, const char *,
++		unsigned int, unsigned int,
++		const char *))dummy,		/* transmit */
++	(void (*)(struct nic *, irq_action_t))dummy, /* irq */
++	0,					/* flags */
++	&rom,					/* rom_info */
++	arptable[ARP_CLIENT].node,		/* node_addr */
++	packet + ETH_DATA_ALIGN,		/* packet */
++	0,					/* packetlen */
++	0,			/* ioaddr */
++	0,			/* irqno */
++	NULL,					/* priv_data */
++};
++
++
++
++int grub_eth_probe(void)
++{
++	static int probed = 0;
++	struct dev *dev;
++
++	EnterFunction("grub_eth_probe");
++
++	if (probed)
++		return 1;
++
++	network_ready = 0;
++	grub_memset((char *)arptable, 0, MAX_ARP * sizeof(struct arptable_t));
++	dev = &nic.dev;
++	dev->how_probe = -1;
++	dev->type = NIC_DRIVER;
++	dev->failsafe = 1;
++	rom = *((struct rom_info *)ROM_INFO_LOCATION);
++
++	probed = (eth_probe(dev) == PROBE_WORKED);
++
++	LeaveFunction("grub_eth_probe");
++	return probed;
++}
++
++int eth_probe(struct dev *dev)
++{
++	return probe(dev);
++}
++
++int eth_poll(int retrieve)
++{
++	return ((*nic.poll)(&nic, retrieve));
++}
++
++void eth_transmit(const char *d, unsigned int t, unsigned int s, const void *p)
++{
++	(*nic.transmit)(&nic, d, t, s, p);
++	if (t == IP) twiddle();
++}
++
++void eth_disable(void)
++{
++#ifdef MULTICAST_LEVEL2
++	int i;
++	for(i = 0; i < MAX_IGMP; i++) {
++		leave_group(i);
++	}
++#endif
++	disable(&nic.dev);
++}
++
++void eth_irq (irq_action_t action)
++{
++	(*nic.irq)(&nic,action);
++}
++
++/**************************************************************************
++IPCHKSUM - Checksum IP Header
++**************************************************************************/
++uint16_t ipchksum(const void *data, unsigned long length)
++{
++	unsigned long sum;
++	unsigned long i;
++	const uint8_t *ptr;
++
++	/* In the most straight forward way possible,
++	 * compute an ip style checksum.
++	 */
++	sum = 0;
++	ptr = data;
++	for(i = 0; i < length; i++) {
++		unsigned long value;
++		value = ptr[i];
++		if (i & 1) {
++			value <<= 8;
++		}
++		/* Add the new value */
++		sum += value;
++		/* Wrap around the carry */
++		if (sum > 0xFFFF) {
++			sum = (sum + (sum >> 16)) & 0xFFFF;
++		}
++	}
++	return (~cpu_to_le16(sum)) & 0xFFFF;
++}
++
++uint16_t add_ipchksums(unsigned long offset, uint16_t sum, uint16_t new)
++{
++	unsigned long checksum;
++	sum = ~sum & 0xFFFF;
++	new = ~new & 0xFFFF;
++	if (offset & 1) {
++		/* byte swap the sum if it came from an odd offset 
++		 * since the computation is endian independant this
++		 * works.
++		 */
++		new = bswap_16(new);
++	}
++	checksum = sum + new;
++	if (checksum > 0xFFFF) {
++		checksum -= 0xFFFF;
++	}
++	return (~checksum) & 0xFFFF;
++}
++
++/**************************************************************************
++DEFAULT_NETMASK - Return default netmask for IP address
++**************************************************************************/
++static inline unsigned long default_netmask(void)
++{
++	int net = ntohl(arptable[ARP_CLIENT].ipaddr.s_addr) >> 24;
++	if (net <= 127)
++		return(htonl(0xff000000));
++	else if (net < 192)
++		return(htonl(0xffff0000));
++	else
++		return(htonl(0xffffff00));
++}
++
++/**************************************************************************
++IP_TRANSMIT - Send an IP datagram
++**************************************************************************/
++static int await_arp(int ival, void *ptr,
++	unsigned short ptype, struct iphdr *ip __unused, struct udphdr *udp __unused)
++{
++	struct	arprequest *arpreply;
++	if (ptype != ARP)
++		return 0;
++	if (nic.packetlen < ETH_HLEN + sizeof(struct arprequest))
++		return 0;
++	arpreply = (struct arprequest *)&nic.packet[ETH_HLEN];
++
++	if (arpreply->opcode != htons(ARP_REPLY)) 
++		return 0;
++	if (memcmp(arpreply->sipaddr, ptr, sizeof(in_addr)) != 0)
++		return 0;
++	memcpy(arptable[ival].node, arpreply->shwaddr, ETH_ALEN);
++	return 1;
++}
++
++int ip_transmit(int len, const void *buf)
++{
++	unsigned long destip;
++	struct iphdr *ip;
++	struct arprequest arpreq;
++	int arpentry, i;
++	int retry;
++
++	ip = (struct iphdr *)buf;
++	destip = ip->dest.s_addr;
++	if (destip == IP_BROADCAST) {
++		eth_transmit(broadcast, IP, len, buf);
++#ifdef MULTICAST_LEVEL1 
++	} else if ((destip & htonl(MULTICAST_MASK)) == htonl(MULTICAST_NETWORK)) {
++		unsigned char multicast[6];
++		unsigned long hdestip;
++		hdestip = ntohl(destip);
++		multicast[0] = 0x01;
++		multicast[1] = 0x00;
++		multicast[2] = 0x5e;
++		multicast[3] = (hdestip >> 16) & 0x7;
++		multicast[4] = (hdestip >> 8) & 0xff;
++		multicast[5] = hdestip & 0xff;
++		eth_transmit(multicast, IP, len, buf);
++#endif
++	} else {
++		if (((destip & netmask) !=
++		     (arptable[ARP_CLIENT].ipaddr.s_addr & netmask)) &&
++		    arptable[ARP_GATEWAY].ipaddr.s_addr)
++			destip = arptable[ARP_GATEWAY].ipaddr.s_addr;
++		for(arpentry = 0; arpentry<MAX_ARP; arpentry++)
++			if (arptable[arpentry].ipaddr.s_addr == destip) break;
++		if (arpentry == MAX_ARP) {
++			printf("%@ is not in my arp table!\n", destip);
++			return(0);
++		}
++		for (i = 0; i < ETH_ALEN; i++)
++			if (arptable[arpentry].node[i])
++				break;
++		if (i == ETH_ALEN) {	/* Need to do arp request */
++			arpreq.hwtype = htons(1);
++			arpreq.protocol = htons(IP);
++			arpreq.hwlen = ETH_ALEN;
++			arpreq.protolen = 4;
++			arpreq.opcode = htons(ARP_REQUEST);
++			memcpy(arpreq.shwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
++			memcpy(arpreq.sipaddr, &arptable[ARP_CLIENT].ipaddr, sizeof(in_addr));
++			memset(arpreq.thwaddr, 0, ETH_ALEN);
++			memcpy(arpreq.tipaddr, &destip, sizeof(in_addr));
++			for (retry = 1; retry <= MAX_ARP_RETRIES; retry++) {
++				long timeout;
++				eth_transmit(broadcast, ARP, sizeof(arpreq),
++					&arpreq);
++				timeout = rfc2131_sleep_interval(TIMEOUT, retry);
++				if (await_reply(await_arp, arpentry,
++					arpreq.tipaddr, timeout)) goto xmit;
++			}
++			return(0);
++		}
++xmit:
++		eth_transmit(arptable[arpentry].node, IP, len, buf);
++	}
++	return 1;
++}
++
++void build_ip_hdr(unsigned long destip, int ttl, int protocol, int option_len,
++	int len, const void *buf)
++{
++	struct iphdr *ip;
++	ip = (struct iphdr *)buf;
++	ip->verhdrlen = 0x45;
++	ip->verhdrlen += (option_len/4);
++	ip->service = 0;
++	ip->len = htons(len);
++	ip->ident = 0;
++	ip->frags = 0; /* Should we set don't fragment? */
++	ip->ttl = ttl;
++	ip->protocol = protocol;
++	ip->chksum = 0;
++	ip->src.s_addr = arptable[ARP_CLIENT].ipaddr.s_addr;
++	ip->dest.s_addr = destip;
++	ip->chksum = ipchksum(buf, sizeof(struct iphdr) + option_len);
++}
++
++static uint16_t udpchksum(struct iphdr *ip, struct udphdr *udp)
++{
++	struct udp_pseudo_hdr pseudo;
++	uint16_t checksum;
++
++	/* Compute the pseudo header */
++	pseudo.src.s_addr  = ip->src.s_addr;
++	pseudo.dest.s_addr = ip->dest.s_addr;
++	pseudo.unused      = 0;
++	pseudo.protocol    = IP_UDP;
++	pseudo.len         = udp->len;
++
++	/* Sum the pseudo header */
++	checksum = ipchksum(&pseudo, 12);
++
++	/* Sum the rest of the udp packet */
++	checksum = add_ipchksums(12, checksum, ipchksum(udp, ntohs(udp->len)));
++	return checksum;
++}
++
++
++void build_udp_hdr(unsigned long destip, 
++	unsigned int srcsock, unsigned int destsock, int ttl,
++	int len, const void *buf)
++{
++	struct iphdr *ip;
++	struct udphdr *udp;
++	ip = (struct iphdr *)buf;
++	build_ip_hdr(destip, ttl, IP_UDP, 0, len, buf);
++	udp = (struct udphdr *)((char *)buf + sizeof(struct iphdr));
++	udp->src = htons(srcsock);
++	udp->dest = htons(destsock);
++	udp->len = htons(len - sizeof(struct iphdr));
++	udp->chksum = 0;
++	if ((udp->chksum = udpchksum(ip, udp)) == 0)
++		udp->chksum = 0xffff;
++}
++
++
++/**************************************************************************
++UDP_TRANSMIT - Send an UDP datagram
++**************************************************************************/
++int udp_transmit(unsigned long destip, unsigned int srcsock,
++	unsigned int destsock, int len, const void *buf)
++{
++	build_udp_hdr(destip, srcsock, destsock, 60, len, buf);
++	return ip_transmit(len, buf);
++}
++
++/**************************************************************************
++QDRAIN - clear the nic's receive queue
++**************************************************************************/
++static int await_qdrain(int ival __unused, void *ptr __unused,
++	unsigned short ptype __unused, 
++	struct iphdr *ip __unused, struct udphdr *udp __unused)
++{
++	return 0;
++}
++
++void rx_qdrain(void)
++{
++	/* Clear out the Rx queue first.  It contains nothing of interest,
++	 * except possibly ARP requests from the DHCP/TFTP server.  We use
++	 * polling throughout Etherboot, so some time may have passed since we
++	 * last polled the receive queue, which may now be filled with
++	 * broadcast packets.  This will cause the reply to the packets we are
++	 * about to send to be lost immediately.  Not very clever.  */
++	await_reply(await_qdrain, 0, NULL, 0);
++}
++
++/**
++ * rarp
++ *
++ * Get IP address by rarp. Just copy from etherboot
++ **/
++static int await_rarp(int ival, void *ptr, unsigned short ptype, 
++		      struct iphdr *ip, struct udphdr *udp)
++{
++	struct arprequest *arpreply;
++	if (ptype != RARP)
++		return 0;
++	if (nic.packetlen < ETH_HLEN + sizeof(struct arprequest))
++		return 0;
++	arpreply = (struct arprequest *)&nic.packet[ETH_HLEN];
++	if (arpreply->opcode != htons(RARP_REPLY))
++		return 0;
++	if (memcmp(arpreply->thwaddr, ptr, ETH_ALEN) == 0){
++		memcpy(arptable[ARP_SERVER].node, arpreply->shwaddr, ETH_ALEN);
++		memcpy(&arptable[ARP_SERVER].ipaddr, arpreply->sipaddr, sizeof(in_addr));
++		memcpy(&arptable[ARP_CLIENT].ipaddr, arpreply->tipaddr, sizeof(in_addr));
++		return 1;
++	}
++	return 0;
++}
++
++int rarp(void)
++{
++	int retry;
++
++	/* arp and rarp requests share the same packet structure. */
++	struct arprequest rarpreq;
++
++	if(!grub_eth_probe())
++		return 0;
++	network_ready = 0;
++
++	memset(&rarpreq, 0, sizeof(rarpreq));
++
++	rarpreq.hwtype = htons(1);
++	rarpreq.protocol = htons(IP);
++	rarpreq.hwlen = ETH_ALEN;
++	rarpreq.protolen = 4;
++	rarpreq.opcode = htons(RARP_REQUEST);
++	memcpy(&rarpreq.shwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
++	/* sipaddr is already zeroed out */
++	memcpy(&rarpreq.thwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
++	/* tipaddr is already zeroed out */
++
++	for (retry = 0; retry < MAX_ARP_RETRIES; ++retry) {
++		long timeout;
++		eth_transmit(broadcast, RARP, sizeof(rarpreq), &rarpreq);
++
++		timeout = rfc2131_sleep_interval(TIMEOUT, retry);
++		if (await_reply(await_rarp, 0, rarpreq.shwaddr, timeout))
++			break;
++		if (user_abort)
++			return 0;
++	}
++
++	if (retry < MAX_ARP_RETRIES) {
++		network_ready = 1;
++		return (1);
++	}
++	return (0);
++}
++
++/**
++ * bootp
++ *
++ * Get IP address by bootp, segregate from bootp in etherboot.
++ **/
++static int await_bootp(int ival __unused, void *ptr __unused,
++	unsigned short ptype __unused, struct iphdr *ip __unused, 
++	struct udphdr *udp)
++{
++	struct	bootp_t *bootpreply;
++	int len;		/* Length of vendor */
++
++	if (!udp) {
++		return 0;
++	}
++	bootpreply = (struct bootp_t *)
++		&nic.packet[ETH_HLEN + sizeof(struct iphdr) + sizeof(struct udphdr)];
++	len = nic.packetlen - (ETH_HLEN + sizeof(struct iphdr) + 
++		sizeof(struct udphdr) + sizeof(struct bootp_t) - BOOTP_VENDOR_LEN);
++	if (len < 0) {
++		return 0;
++	}
++	if (udp->dest != htons(BOOTP_CLIENT))
++		return 0;
++	if (bootpreply->bp_op != BOOTP_REPLY)
++		return 0;
++	if (bootpreply->bp_xid != xid)
++		return 0;
++	if (memcmp((char *)&bootpreply->bp_siaddr, (char *)&zeroIP, sizeof(in_addr)) == 0)
++		return 0;
++	if ((memcmp(broadcast, bootpreply->bp_hwaddr, ETH_ALEN) != 0) &&
++	    (memcmp(arptable[ARP_CLIENT].node, bootpreply->bp_hwaddr, ETH_ALEN) != 0)) {
++		return 0;
++	}
++	arptable[ARP_CLIENT].ipaddr.s_addr = bootpreply->bp_yiaddr.s_addr;
++	netmask = default_netmask();
++	arptable[ARP_SERVER].ipaddr.s_addr = bootpreply->bp_siaddr.s_addr;
++	memset(arptable[ARP_SERVER].node, 0, ETH_ALEN);  /* Kill arp */
++	arptable[ARP_GATEWAY].ipaddr.s_addr = bootpreply->bp_giaddr.s_addr;
++	memset(arptable[ARP_GATEWAY].node, 0, ETH_ALEN);  /* Kill arp */
++	/* We don't care bootpreply->bp_file, it must be 'pxegrub':-) */
++	memcpy((char *)rfc1533_venddata, (char *)(bootpreply->bp_vend), len);
++	decode_rfc1533(rfc1533_venddata, 0, len, 1);
++	return(1);
++}
++
++int bootp(void)
++{
++	int retry;
++	struct bootpip_t ip;
++	unsigned long  starttime;
++	
++	EnterFunction("bootp");
++
++	if(!grub_eth_probe())
++		return 0;
++	network_ready = 0;
++
++	memset(&ip, 0, sizeof(struct bootpip_t));
++	ip.bp.bp_op = BOOTP_REQUEST;
++	ip.bp.bp_htype = 1;
++	ip.bp.bp_hlen = ETH_ALEN;
++	starttime = currticks();
++	/* Use lower 32 bits of node address, more likely to be
++	   distinct than the time since booting */
++	memcpy(&xid, &arptable[ARP_CLIENT].node[2], sizeof(xid));
++	ip.bp.bp_xid = xid += htonl(starttime);
++	/* bp_secs defaults to zero */
++	memcpy(ip.bp.bp_hwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
++	memcpy(ip.bp.bp_vend, rfc1533_cookie_bootp, sizeof(rfc1533_cookie_bootp)); /* request RFC-style options */
++
++	for (retry = 0; retry < MAX_BOOTP_RETRIES; ) {
++		long timeout;
++
++		rx_qdrain();
++
++		udp_transmit(IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
++			sizeof(struct bootpip_t), &ip);
++		timeout = rfc2131_sleep_interval(TIMEOUT, retry++);
++		if (await_reply(await_bootp, 0, NULL, timeout)){
++			network_ready = 1;
++			return(1);
++		}
++		if (user_abort)
++			return 0;
++		ip.bp.bp_secs = htons((currticks()-starttime)/TICKS_PER_SEC);
++	}
++	return(0);
++}
++
++/**
++ * dhcp
++ *
++ * Get IP address by dhcp, segregate from bootp in etherboot.
++ **/
++static int await_dhcp(int ival __unused, void *ptr __unused,
++	unsigned short ptype __unused, struct iphdr *ip __unused, 
++	struct udphdr *udp)
++{
++	struct	dhcp_t *dhcpreply;
++	int len;
++
++	if (!udp) {
++		return 0;
++	}
++	dhcpreply = (struct dhcp_t *)
++		&nic.packet[ETH_HLEN + sizeof(struct iphdr) + sizeof(struct udphdr)];
++	len = nic.packetlen - (ETH_HLEN + sizeof(struct iphdr) + 
++		sizeof(struct udphdr) + sizeof(struct dhcp_t) - DHCP_OPT_LEN);
++	if (len < 0){
++		return 0;
++	}
++	if (udp->dest != htons(BOOTP_CLIENT))
++		return 0;
++	if (dhcpreply->bp_op != BOOTP_REPLY)
++		return 0;
++	if (dhcpreply->bp_xid != xid)
++		return 0;
++	if (memcmp((char *)&dhcpreply->bp_siaddr, (char *)&zeroIP, sizeof(in_addr)) == 0)
++		return 0;
++	if ((memcmp(broadcast, dhcpreply->bp_hwaddr, ETH_ALEN) != 0) &&
++	    (memcmp(arptable[ARP_CLIENT].node, dhcpreply->bp_hwaddr, ETH_ALEN) != 0)) {
++		return 0;
++	}
++	arptable[ARP_CLIENT].ipaddr.s_addr = dhcpreply->bp_yiaddr.s_addr;
++	dhcp_addr.s_addr = dhcpreply->bp_yiaddr.s_addr;
++	netmask = default_netmask();
++	arptable[ARP_SERVER].ipaddr.s_addr = dhcpreply->bp_siaddr.s_addr;
++	memset(arptable[ARP_SERVER].node, 0, ETH_ALEN);  /* Kill arp */
++	arptable[ARP_GATEWAY].ipaddr.s_addr = dhcpreply->bp_giaddr.s_addr;
++	memset(arptable[ARP_GATEWAY].node, 0, ETH_ALEN);  /* Kill arp */
++	/* We don't care bootpreply->bp_file. It must be 'pxegrub' */
++	memcpy((char *)rfc1533_venddata, (char *)(dhcpreply->bp_vend), len);
++	decode_rfc1533(rfc1533_venddata, 0, len, 1);
++	return(1);
++}
++
++int dhcp(void)
++{
++	int retry;
++	int reqretry;
++	struct dhcpip_t ip;
++	unsigned long  starttime;
++
++	if(!grub_eth_probe())
++		return 0;
++
++	network_ready = 0;
++
++	memset(&ip, 0, sizeof(struct dhcpip_t));
++	ip.bp.bp_op = BOOTP_REQUEST;
++	ip.bp.bp_htype = 1;
++	ip.bp.bp_hlen = ETH_ALEN;
++	starttime = currticks();
++	/* Use lower 32 bits of node address, more likely to be
++	   distinct than the time since booting */
++	memcpy(&xid, &arptable[ARP_CLIENT].node[2], sizeof(xid));
++	ip.bp.bp_xid = xid += htonl(starttime);
++	memcpy(ip.bp.bp_hwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
++	memcpy(ip.bp.bp_vend, rfc1533_cookie_dhcp, sizeof rfc1533_cookie_dhcp); /* request RFC-style options */
++	memcpy(ip.bp.bp_vend + sizeof rfc1533_cookie_dhcp, dhcpdiscover, sizeof dhcpdiscover);
++
++	for (retry = 0; retry < MAX_BOOTP_RETRIES; ) {
++		long timeout;
++
++		rx_qdrain();
++
++		udp_transmit(IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
++			     sizeof(struct bootpip_t), &ip);
++		timeout = rfc2131_sleep_interval(TIMEOUT, retry++);
++		if (await_reply(await_dhcp, 0, NULL, timeout)) {
++			/* If not a DHCPOFFER then must be just a
++			   BOOTP reply, be backward compatible with
++			   BOOTP then. Jscott report a bug here, but I
++			   don't know how it happened */
++			if (dhcp_reply != DHCPOFFER){
++				network_ready = 1;
++				return(1);
++			}
++			dhcp_reply = 0;
++			memcpy(ip.bp.bp_vend, rfc1533_cookie_dhcp, sizeof rfc1533_cookie_dhcp);
++			memcpy(ip.bp.bp_vend + sizeof rfc1533_cookie_dhcp, dhcprequest, sizeof dhcprequest);
++			/* Beware: the magic numbers 9 and 15 depend on
++			   the layout of dhcprequest */
++			memcpy(&ip.bp.bp_vend[9], &dhcp_server, sizeof(in_addr));
++			memcpy(&ip.bp.bp_vend[15], &dhcp_addr, sizeof(in_addr));
++			for (reqretry = 0; reqretry < MAX_BOOTP_RETRIES; ) {
++				udp_transmit(IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
++					     sizeof(struct bootpip_t), &ip);
++				dhcp_reply=0;
++				timeout = rfc2131_sleep_interval(TIMEOUT, reqretry++);
++				if (await_reply(await_dhcp, 0, NULL, timeout))
++					if (dhcp_reply == DHCPACK){
++						network_ready = 1;
++						return(1);
++					}
++				if (user_abort)
++					return 0;
++			}
++		}
++		if (user_abort)
++			return 0;
++		ip.bp.bp_secs = htons((currticks()-starttime)/TICKS_PER_SEC);
++	}
++	return(0);
++}
++
++#ifdef MULTICAST_LEVEL2
++static void send_igmp_reports(unsigned long now)
++{
++	int i;
++	for(i = 0; i < MAX_IGMP; i++) {
++		if (igmptable[i].time && (now >= igmptable[i].time)) {
++			struct igmp_ip_t igmp;
++			igmp.router_alert[0] = 0x94;
++			igmp.router_alert[1] = 0x04;
++			igmp.router_alert[2] = 0;
++			igmp.router_alert[3] = 0;
++			build_ip_hdr(igmptable[i].group.s_addr, 
++				1, IP_IGMP, sizeof(igmp.router_alert), sizeof(igmp), &igmp);
++			igmp.igmp.type = IGMPv2_REPORT;
++			if (last_igmpv1 && 
++				(now < last_igmpv1 + IGMPv1_ROUTER_PRESENT_TIMEOUT)) {
++				igmp.igmp.type = IGMPv1_REPORT;
++			}
++			igmp.igmp.response_time = 0;
++			igmp.igmp.chksum = 0;
++			igmp.igmp.group.s_addr = igmptable[i].group.s_addr;
++			igmp.igmp.chksum = ipchksum(&igmp.igmp, sizeof(igmp.igmp));
++			ip_transmit(sizeof(igmp), &igmp);
++#ifdef	MDEBUG
++			printf("Sent IGMP report to: %@\n", igmp.igmp.group.s_addr);
++#endif
++			/* Don't send another igmp report until asked */
++			igmptable[i].time = 0;
++		}
++	}
++}
++
++static void process_igmp(struct iphdr *ip, unsigned long now)
++{
++	struct igmp *igmp;
++	int i;
++	unsigned iplen = 0;
++	if (!ip || (ip->protocol == IP_IGMP) ||
++		(nic.packetlen < sizeof(struct iphdr) + sizeof(struct igmp))) {
++		return;
++	}
++	iplen = (ip->verhdrlen & 0xf)*4;
++	igmp = (struct igmp *)&nic.packet[sizeof(struct iphdr)];
++	if (ipchksum(igmp, ntohs(ip->len) - iplen) != 0)
++		return;
++	if ((igmp->type == IGMP_QUERY) && 
++		(ip->dest.s_addr == htonl(GROUP_ALL_HOSTS))) {
++		unsigned long interval = IGMP_INTERVAL;
++		if (igmp->response_time == 0) {
++			last_igmpv1 = now;
++		} else {
++			interval = (igmp->response_time * TICKS_PER_SEC)/10;
++		}
++		
++#ifdef	MDEBUG
++		printf("Received IGMP query for: %@\n", igmp->group.s_addr);
++#endif			       
++		for(i = 0; i < MAX_IGMP; i++) {
++			uint32_t group = igmptable[i].group.s_addr;
++			if ((group == 0) || (group == igmp->group.s_addr)) {
++				unsigned long time;
++				time = currticks() + rfc1112_sleep_interval(interval, 0);
++				if (time < igmptable[i].time) {
++					igmptable[i].time = time;
++				}
++			}
++		}
++	}
++	if (((igmp->type == IGMPv1_REPORT) || (igmp->type == IGMPv2_REPORT)) &&
++		(ip->dest.s_addr == igmp->group.s_addr)) {
++#ifdef	MDEBUG
++		printf("Received IGMP report for: %@\n", igmp->group.s_addr);
++#endif			       
++		for(i = 0; i < MAX_IGMP; i++) {
++			if ((igmptable[i].group.s_addr == igmp->group.s_addr) &&
++				igmptable[i].time != 0) {
++				igmptable[i].time = 0;
++			}
++		}
++	}
++}
++
++void leave_group(int slot)
++{
++	/* Be very stupid and always send a leave group message if 
++	 * I have subscribed.  Imperfect but it is standards
++	 * compliant, easy and reliable to implement.
++	 *
++	 * The optimal group leave method is to only send leave when,
++	 * we were the last host to respond to a query on this group,
++	 * and igmpv1 compatibility is not enabled.
++	 */
++	if (igmptable[slot].group.s_addr) {
++		struct igmp_ip_t igmp;
++		igmp.router_alert[0] = 0x94;
++		igmp.router_alert[1] = 0x04;
++		igmp.router_alert[2] = 0;
++		igmp.router_alert[3] = 0;
++		build_ip_hdr(htonl(GROUP_ALL_HOSTS),
++			1, IP_IGMP, sizeof(igmp.router_alert), sizeof(igmp), &igmp);
++		igmp.igmp.type = IGMP_LEAVE;
++		igmp.igmp.response_time = 0;
++		igmp.igmp.chksum = 0;
++		igmp.igmp.group.s_addr = igmptable[slot].group.s_addr;
++		igmp.igmp.chksum = ipchksum(&igmp.igmp, sizeof(igmp));
++		ip_transmit(sizeof(igmp), &igmp);
++#ifdef	MDEBUG
++		printf("Sent IGMP leave for: %@\n", igmp.igmp.group.s_addr);
++#endif	
++	}
++	memset(&igmptable[slot], 0, sizeof(igmptable[0]));
++}
++
++void join_group(int slot, unsigned long group)
++{
++	/* I have already joined */
++	if (igmptable[slot].group.s_addr == group)
++		return;
++	if (igmptable[slot].group.s_addr) {
++		leave_group(slot);
++	}
++	/* Only join a group if we are given a multicast ip, this way
++	 * code can be given a non-multicast (broadcast or unicast ip)
++	 * and still work... 
++	 */
++	if ((group & htonl(MULTICAST_MASK)) == htonl(MULTICAST_NETWORK)) {
++		igmptable[slot].group.s_addr = group;
++		igmptable[slot].time = currticks();
++	}
++}
++#else
++#define send_igmp_reports(now);
++#define process_igmp(ip, now)
++#endif
++
++/**************************************************************************
++AWAIT_REPLY - Wait until we get a response for our request
++************f**************************************************************/
++int await_reply(reply_t reply, int ival, void *ptr, long timeout)
++{
++	unsigned long time, now;
++	struct	iphdr *ip;
++	unsigned iplen = 0;
++	struct	udphdr *udp;
++	unsigned short ptype;
++	int result;
++
++	user_abort = 0;
++
++	time = timeout + currticks();
++	/* The timeout check is done below.  The timeout is only checked if
++	 * there is no packet in the Rx queue.  This assumes that eth_poll()
++	 * needs a negligible amount of time.  
++	 */
++	for (;;) {
++		now = currticks();
++		send_igmp_reports(now);
++		result = eth_poll(1);
++		if (result == 0) {
++			/* We don't have anything */
++		
++			/* Check for abort key only if the Rx queue is empty -
++			 * as long as we have something to process, don't
++			 * assume that something failed.  It is unlikely that
++			 * we have no processing time left between packets.  */
++			poll_interruptions();
++			/* Do the timeout after at least a full queue walk.  */
++			if ((timeout == 0) || (currticks() > time) || user_abort == 1) {
++				break;
++			}
++			continue;
++		}
++	
++		/* We have something! */
++
++		/* Find the Ethernet packet type */
++		if (nic.packetlen >= ETH_HLEN) {
++			ptype = ((unsigned short) nic.packet[12]) << 8
++				| ((unsigned short) nic.packet[13]);
++		} else continue; /* what else could we do with it? */
++		/* Verify an IP header */
++		ip = 0;
++		if ((ptype == IP) && (nic.packetlen >= ETH_HLEN + sizeof(struct iphdr))) {
++			unsigned ipoptlen;
++			ip = (struct iphdr *)&nic.packet[ETH_HLEN];
++			if ((ip->verhdrlen < 0x45) || (ip->verhdrlen > 0x4F)) 
++				continue;
++			iplen = (ip->verhdrlen & 0xf) * 4;
++			if (ipchksum(ip, iplen) != 0)
++				continue;
++			if (ip->frags & htons(0x3FFF)) {
++				static int warned_fragmentation = 0;
++				if (!warned_fragmentation) {
++					printf("ALERT: got a fragmented packet - reconfigure your server\n");
++					warned_fragmentation = 1;
++				}
++				continue;
++			}
++			if (ntohs(ip->len) > ETH_MAX_MTU)
++				continue;
++
++			ipoptlen = iplen - sizeof(struct iphdr);
++			if (ipoptlen) {
++				/* Delete the ip options, to guarantee
++				 * good alignment, and make etherboot simpler.
++				 */
++				memmove(&nic.packet[ETH_HLEN + sizeof(struct iphdr)], 
++					&nic.packet[ETH_HLEN + iplen],
++					nic.packetlen - ipoptlen);
++				nic.packetlen -= ipoptlen;
++			}
++		}
++		udp = 0;
++		if (ip && (ip->protocol == IP_UDP) && 
++		    (nic.packetlen >= ETH_HLEN + sizeof(struct iphdr) + sizeof(struct udphdr))) {
++			udp = (struct udphdr *)&nic.packet[ETH_HLEN + sizeof(struct iphdr)];
++			
++			/* Make certain we have a reasonable packet length */
++			if (ntohs(udp->len) > (ntohs(ip->len) - iplen))
++				continue;
++
++			if (udp->chksum && udpchksum(ip, udp)) {
++				printf("UDP checksum error\n");
++				continue;
++			}
++		}
++		result = reply(ival, ptr, ptype, ip, udp);
++		if (result > 0) {
++			return result;
++		}
++		
++		/* If it isn't a packet the upper layer wants see if there is a default
++		 * action.  This allows us reply to arp and igmp queryies.
++		 */
++		if ((ptype == ARP) &&
++		    (nic.packetlen >= ETH_HLEN + sizeof(struct arprequest))) {
++			struct	arprequest *arpreply;
++			unsigned long tmp;
++			
++			arpreply = (struct arprequest *)&nic.packet[ETH_HLEN];
++			memcpy(&tmp, arpreply->tipaddr, sizeof(in_addr));
++			if ((arpreply->opcode == htons(ARP_REQUEST)) &&
++			    (tmp == arptable[ARP_CLIENT].ipaddr.s_addr)) {
++				arpreply->opcode = htons(ARP_REPLY);
++				memcpy(arpreply->tipaddr, arpreply->sipaddr, sizeof(in_addr));
++				memcpy(arpreply->thwaddr, arpreply->shwaddr, ETH_ALEN);
++				memcpy(arpreply->sipaddr, &arptable[ARP_CLIENT].ipaddr, sizeof(in_addr));
++				memcpy(arpreply->shwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
++				eth_transmit(arpreply->thwaddr, ARP,
++					     sizeof(struct  arprequest),
++					     arpreply);
++#ifdef	MDEBUG
++				memcpy(&tmp, arpreply->tipaddr, sizeof(in_addr));
++				printf("Sent ARP reply to: %@\n",tmp);
++#endif	/* MDEBUG */
++			}
++		}
++		process_igmp(ip, now);
++	}
++	return(0);
++}
++
++#ifdef	REQUIRE_VCI_ETHERBOOT
++/**************************************************************************
++FIND_VCI_ETHERBOOT - Looks for "Etherboot" in Vendor Encapsulated Identifiers
++On entry p points to byte count of VCI options
++**************************************************************************/
++static int find_vci_etherboot(unsigned char *p)
++{
++	unsigned char	*end = p + 1 + *p;
++
++	for (p++; p < end; ) {
++		if (*p == RFC2132_VENDOR_CLASS_ID) {
++			if (strncmp("Etherboot", p + 2, sizeof("Etherboot") - 1) == 0)
++				return (1);
++		} else if (*p == RFC1533_END)
++			return (0);
++		p += TAG_LEN(p) + 2;
++	}
++	return (0);
++}
++#endif	/* REQUIRE_VCI_ETHERBOOT */
++
++/**
++ * decode_rfc1533
++ *
++ * Decodes RFC1533 header
++ **/
++int decode_rfc1533(unsigned char *p, unsigned int block, unsigned int len, int eof)
++{
++	static unsigned char *extdata = NULL, *extend = NULL;
++	unsigned char        *extpath = NULL;
++	unsigned char        *endp;
++
++	if (block == 0) {
++		end_of_rfc1533 = NULL;
++		if (memcmp(p, rfc1533_cookie, sizeof(rfc1533_cookie)))
++			return(0); /* no RFC 1533 header found */
++		p += 4;
++		endp = p + len;
++	} else {
++		if (block == 1) {
++			if (memcmp(p, rfc1533_cookie, sizeof(rfc1533_cookie)))
++				return(0); /* no RFC 1533 header found */
++			p += 4;
++			len -= 4; }
++		if (extend + len <= (unsigned char *)
++		    rfc1533_venddata + sizeof(rfc1533_venddata)) {
++			memcpy(extend, p, len);
++			extend += len;
++		} else {
++			printf("Overflow in vendor data buffer! Aborting...\n");
++			*extdata = RFC1533_END;
++			return(0);
++		}
++		p = extdata; endp = extend;
++	}
++	if (!eof)
++		return 1;
++	while (p < endp) {
++		unsigned char c = *p;
++		if (c == RFC1533_PAD) {
++			p++;
++			continue;
++		}
++		else if (c == RFC1533_END) {
++			end_of_rfc1533 = endp = p;
++			continue;
++		}
++		else if (c == RFC1533_NETMASK)
++			memcpy(&netmask, p+2, sizeof(in_addr));
++		else if (c == RFC1533_GATEWAY) {
++			/* This is a little simplistic, but it will
++			   usually be sufficient.
++			   Take only the first entry */
++			if (TAG_LEN(p) >= sizeof(in_addr))
++				memcpy(&arptable[ARP_GATEWAY].ipaddr, p+2, sizeof(in_addr));
++		}
++		else if (c == RFC1533_EXTENSIONPATH)
++			extpath = p;
++		else if (c == RFC2132_MSG_TYPE)
++			dhcp_reply=*(p+2);
++		else if (c == RFC2132_SRV_ID)
++			memcpy(&dhcp_server, p+2, sizeof(in_addr));
++		else if (c == RFC1533_HOSTNAME) {
++			hostname = p + 2;
++			hostnamelen = *(p + 1);
++		}
++		else if (c == RFC1533_VENDOR_CONFIGFILE){
++			int l = TAG_LEN (p);
++	  
++			/* Eliminate the trailing NULs according to RFC 2132.  */
++			while (*(p + 2 + l - 1) == '\000' && l > 0)
++				l--;
++	  
++			/* XXX: Should check if LEN is less than the maximum length
++			   of CONFIG_FILE. This kind of robustness will be a goal
++			   in GRUB 1.0.  */
++			memcpy (config_file, p + 2, l);
++			config_file[l] = 0;
++		}
++		else {
++			;
++		}
++		p += TAG_LEN(p) + 2;
++	}
++	extdata = extend = endp;
++	if (block <= 0 && extpath != NULL) {
++		char fname[64];
++		if (TAG_LEN(extpath) >= sizeof(fname)){
++			printf("Overflow in vendor data buffer! Aborting...\n");
++			*extdata = RFC1533_END;
++			return(0);
++		}
++		memcpy(fname, extpath+2, TAG_LEN(extpath));
++		fname[(int)TAG_LEN(extpath)] = '\0';
++		printf("Loading BOOTP-extension file: %s\n",fname);
++		tftp_file_read(fname, decode_rfc1533);
++	}
++	return 1;	/* proceed with next block */
++}
++
++
++/* FIXME double check TWO_SECOND_DIVISOR */
++#define TWO_SECOND_DIVISOR (RAND_MAX/TICKS_PER_SEC)
++/**************************************************************************
++RFC2131_SLEEP_INTERVAL - sleep for expotentially longer times (base << exp) +- 1 sec)
++**************************************************************************/
++long rfc2131_sleep_interval(long base, int exp)
++{
++	unsigned long tmo;
++#ifdef BACKOFF_LIMIT
++	if (exp > BACKOFF_LIMIT)
++		exp = BACKOFF_LIMIT;
++#endif
++	tmo = (base << exp) + (TICKS_PER_SEC - (random()/TWO_SECOND_DIVISOR));
++	return tmo;
++}
++
++#ifdef MULTICAST_LEVEL2
++/**************************************************************************
++RFC1112_SLEEP_INTERVAL - sleep for expotentially longer times, up to (base << exp)
++**************************************************************************/
++long rfc1112_sleep_interval(long base, int exp)
++{
++	unsigned long divisor, tmo;
++#ifdef BACKOFF_LIMIT
++	if (exp > BACKOFF_LIMIT)
++		exp = BACKOFF_LIMIT;
++#endif
++	divisor = RAND_MAX/(base << exp);
++	tmo = random()/divisor;
++	return tmo;
++}
++#endif /* MULTICAST_LEVEL_2 */
++/* ifconfig - configure network interface.  */
++int
++ifconfig (char *ip, char *sm, char *gw, char *svr)
++{
++  in_addr tmp;
++  
++  if (sm) 
++    {
++      if (! inet_aton (sm, &tmp))
++	return 0;
++      
++      netmask = tmp.s_addr;
++    }
++  
++  if (ip) 
++    {
++      if (! inet_aton (ip, &arptable[ARP_CLIENT].ipaddr)) 
++	return 0;
++      
++      if (! netmask && ! sm) 
++	netmask = default_netmask ();
++    }
++  
++  if (gw && ! inet_aton (gw, &arptable[ARP_GATEWAY].ipaddr)) 
++    return 0;
++
++  /* Clear out the ARP entry.  */
++  grub_memset (arptable[ARP_GATEWAY].node, 0, ETH_ALEN);
++  
++  if (svr && ! inet_aton (svr, &arptable[ARP_SERVER].ipaddr)) 
++    return 0;
++
++  /* Likewise.  */
++  grub_memset (arptable[ARP_SERVER].node, 0, ETH_ALEN);
++  
++  if (ip || sm)
++    {
++      if (IP_BROADCAST == (netmask | arptable[ARP_CLIENT].ipaddr.s_addr)
++	  || netmask == (netmask | arptable[ARP_CLIENT].ipaddr.s_addr)
++	  || ! netmask)
++	network_ready = 0;
++      else
++	network_ready = 1;
++    }
++  
++  return 1;
++}
++
++/*
++ * print_network_configuration
++ *
++ * Output the network configuration. It may broke the graphic console now.:-(
++ */
++void print_network_configuration (void)
++{
++	EnterFunction("print_network_configuration");
++	if (! grub_eth_probe ())
++		grub_printf ("No ethernet card found.\n");
++	else if (! network_ready)
++		grub_printf ("Not initialized yet.\n");
++	else {
++		etherboot_printf ("Address: %@\n", arptable[ARP_CLIENT].ipaddr.s_addr);
++		etherboot_printf ("Netmask: %@\n", netmask);
++		etherboot_printf ("Server: %@\n", arptable[ARP_SERVER].ipaddr.s_addr);
++		etherboot_printf ("Gateway: %@\n", arptable[ARP_GATEWAY].ipaddr.s_addr);
++	}
++	LeaveFunction("print_network_configuration");
++}
++
++/**
++ * cleanup_net
++ *
++ * Mark network unusable, and disable NICs
++ */
++void cleanup_net (void)
++{
++	if (network_ready){
++		/* Stop receiving packets.  */
++		eth_disable ();
++		network_ready = 0;
++	}
++}
+diff -Naur grub-0.97.orig/netboot/nic.h grub-0.97/netboot/nic.h
+--- grub-0.97.orig/netboot/nic.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/nic.h	2005-08-31 19:03:35.000000000 +0000
+@@ -8,24 +8,38 @@
+ #ifndef	NIC_H
+ #define NIC_H
+ 
++#include "dev.h"
++
++typedef enum {
++	DISABLE = 0,
++	ENABLE,
++	FORCE
++} irq_action_t;
++
+ /*
+  *	Structure returned from eth_probe and passed to other driver
+  *	functions.
+  */
+-
+ struct nic
+ {
+-	void		(*reset)P((struct nic *));
+-	int		(*poll)P((struct nic *));
++	struct dev	dev;  /* This must come first */
++	int		(*poll)P((struct nic *, int retrieve));
+ 	void		(*transmit)P((struct nic *, const char *d,
+ 				unsigned int t, unsigned int s, const char *p));
+-	void		(*disable)P((struct nic *));
++	void		(*irq)P((struct nic *, irq_action_t));
+ 	int		flags;	/* driver specific flags */
+ 	struct rom_info	*rom_info;	/* -> rom_info from main */
+ 	unsigned char	*node_addr;
+-	char		*packet;
++	unsigned char	*packet;
+ 	unsigned int	packetlen;
++	unsigned int	ioaddr;
++	unsigned char	irqno;
+ 	void		*priv_data;	/* driver can hang private data here */
+ };
+ 
++extern int  eth_probe(struct dev *dev);
++extern int  eth_poll(int retrieve);
++extern void eth_transmit(const char *d, unsigned int t, unsigned int s, const void *p);
++extern void eth_disable(void);
++extern void eth_irq(irq_action_t action);
+ #endif	/* NIC_H */
+diff -Naur grub-0.97.orig/netboot/ns83820.c grub-0.97/netboot/ns83820.c
+--- grub-0.97.orig/netboot/ns83820.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/ns83820.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,1020 @@
++/**************************************************************************
++*    ns83820.c: Etherboot device driver for the National Semiconductor 83820
++*    Written 2004 by Timothy Legge <tlegge@rogers.com>
++*
++*    This program is free software; you can redistribute it and/or modify
++*    it under the terms of the GNU General Public License as published by
++*    the Free Software Foundation; either version 2 of the License, or
++*    (at your option) any later version.
++*
++*    This program is distributed in the hope that it will be useful,
++*    but WITHOUT ANY WARRANTY; without even the implied warranty of
++*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++*    GNU General Public License for more details.
++*
++*    You should have received a copy of the GNU General Public License
++*    along with this program; if not, write to the Free Software
++*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*
++*    Portions of this code based on:
++*	ns83820.c by Benjamin LaHaise with contributions
++* 		for Linux kernel 2.4.x.
++*	
++*    Linux Driver Version 0.20, 20020610
++* 
++*    This development of this Etherboot driver was funded by:
++*
++*    NXTV: http://www.nxtv.com/
++*    	
++*    REVISION HISTORY:
++*    ================
++*
++*    v1.0	02-16-2004	timlegge	Initial port of Linux driver
++*    v1.1	02-19-2004	timlegge	More rohbust transmit and poll
++*    
++*    Indent Options: indent -kr -i8
++***************************************************************************/
++
++/* to get some global routines like printf */
++#include "etherboot.h"
++/* to get the interface to the body of the program */
++#include "nic.h"
++/* to get the PCI support functions, if this is a PCI NIC */
++#include "pci.h"
++
++#if ARCH == ia64		/* Support 64-bit addressing */
++#define USE_64BIT_ADDR
++#endif
++
++//#define DDEBUG
++#ifdef DDEBUG
++#define dprintf(x) printf x
++#else
++#define dprintf(x)
++#endif
++
++typedef unsigned char u8;
++typedef signed char s8;
++typedef unsigned short u16;
++typedef signed short s16;
++typedef unsigned int u32;
++typedef signed int s32;
++
++#define HZ 100
++
++/* Condensed operations for readability. */
++#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
++#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
++
++/* NIC specific static variables go here */
++
++/* Global parameters.  See MODULE_PARM near the bottom. */
++// static int ihr = 2;
++static int reset_phy = 0;
++static int lnksts = 0;		/* CFG_LNKSTS bit polarity */
++
++#if defined(CONFIG_HIGHMEM64G) || defined(__ia64__)
++#define USE_64BIT_ADDR	"+"
++#endif
++
++#if defined(USE_64BIT_ADDR)
++#define TRY_DAC	1
++#else
++#define TRY_DAC	0
++#endif
++
++/* tunables */
++#define RX_BUF_SIZE	1500	/* 8192 */
++
++/* Must not exceed ~65000. */
++#define NR_RX_DESC	64
++#define NR_TX_DESC	1
++
++		   /* not tunable *//* Extra 6 bytes for 64 bit alignment (divisable by 8) */
++#define REAL_RX_BUF_SIZE (RX_BUF_SIZE + 14 + 6)	/* rx/tx mac addr + type */
++
++#define MIN_TX_DESC_FREE	8
++
++/* register defines */
++#define CFGCS		0x04
++
++#define CR_TXE		0x00000001
++#define CR_TXD		0x00000002
++/* Ramit : Here's a tip, don't do a RXD immediately followed by an RXE
++ * The Receive engine skips one descriptor and moves
++ * onto the next one!! */
++#define CR_RXE		0x00000004
++#define CR_RXD		0x00000008
++#define CR_TXR		0x00000010
++#define CR_RXR		0x00000020
++#define CR_SWI		0x00000080
++#define CR_RST		0x00000100
++
++#define PTSCR_EEBIST_FAIL       0x00000001
++#define PTSCR_EEBIST_EN         0x00000002
++#define PTSCR_EELOAD_EN         0x00000004
++#define PTSCR_RBIST_FAIL        0x000001b8
++#define PTSCR_RBIST_DONE        0x00000200
++#define PTSCR_RBIST_EN          0x00000400
++#define PTSCR_RBIST_RST         0x00002000
++
++#define MEAR_EEDI		0x00000001
++#define MEAR_EEDO		0x00000002
++#define MEAR_EECLK		0x00000004
++#define MEAR_EESEL		0x00000008
++#define MEAR_MDIO		0x00000010
++#define MEAR_MDDIR		0x00000020
++#define MEAR_MDC		0x00000040
++
++#define ISR_TXDESC3	0x40000000
++#define ISR_TXDESC2	0x20000000
++#define ISR_TXDESC1	0x10000000
++#define ISR_TXDESC0	0x08000000
++#define ISR_RXDESC3	0x04000000
++#define ISR_RXDESC2	0x02000000
++#define ISR_RXDESC1	0x01000000
++#define ISR_RXDESC0	0x00800000
++#define ISR_TXRCMP	0x00400000
++#define ISR_RXRCMP	0x00200000
++#define ISR_DPERR	0x00100000
++#define ISR_SSERR	0x00080000
++#define ISR_RMABT	0x00040000
++#define ISR_RTABT	0x00020000
++#define ISR_RXSOVR	0x00010000
++#define ISR_HIBINT	0x00008000
++#define ISR_PHY		0x00004000
++#define ISR_PME		0x00002000
++#define ISR_SWI		0x00001000
++#define ISR_MIB		0x00000800
++#define ISR_TXURN	0x00000400
++#define ISR_TXIDLE	0x00000200
++#define ISR_TXERR	0x00000100
++#define ISR_TXDESC	0x00000080
++#define ISR_TXOK	0x00000040
++#define ISR_RXORN	0x00000020
++#define ISR_RXIDLE	0x00000010
++#define ISR_RXEARLY	0x00000008
++#define ISR_RXERR	0x00000004
++#define ISR_RXDESC	0x00000002
++#define ISR_RXOK	0x00000001
++
++#define TXCFG_CSI	0x80000000
++#define TXCFG_HBI	0x40000000
++#define TXCFG_MLB	0x20000000
++#define TXCFG_ATP	0x10000000
++#define TXCFG_ECRETRY	0x00800000
++#define TXCFG_BRST_DIS	0x00080000
++#define TXCFG_MXDMA1024	0x00000000
++#define TXCFG_MXDMA512	0x00700000
++#define TXCFG_MXDMA256	0x00600000
++#define TXCFG_MXDMA128	0x00500000
++#define TXCFG_MXDMA64	0x00400000
++#define TXCFG_MXDMA32	0x00300000
++#define TXCFG_MXDMA16	0x00200000
++#define TXCFG_MXDMA8	0x00100000
++
++#define CFG_LNKSTS	0x80000000
++#define CFG_SPDSTS	0x60000000
++#define CFG_SPDSTS1	0x40000000
++#define CFG_SPDSTS0	0x20000000
++#define CFG_DUPSTS	0x10000000
++#define CFG_TBI_EN	0x01000000
++#define CFG_MODE_1000	0x00400000
++/* Ramit : Dont' ever use AUTO_1000, it never works and is buggy.
++ * Read the Phy response and then configure the MAC accordingly */
++#define CFG_AUTO_1000	0x00200000
++#define CFG_PINT_CTL	0x001c0000
++#define CFG_PINT_DUPSTS	0x00100000
++#define CFG_PINT_LNKSTS	0x00080000
++#define CFG_PINT_SPDSTS	0x00040000
++#define CFG_TMRTEST	0x00020000
++#define CFG_MRM_DIS	0x00010000
++#define CFG_MWI_DIS	0x00008000
++#define CFG_T64ADDR	0x00004000
++#define CFG_PCI64_DET	0x00002000
++#define CFG_DATA64_EN	0x00001000
++#define CFG_M64ADDR	0x00000800
++#define CFG_PHY_RST	0x00000400
++#define CFG_PHY_DIS	0x00000200
++#define CFG_EXTSTS_EN	0x00000100
++#define CFG_REQALG	0x00000080
++#define CFG_SB		0x00000040
++#define CFG_POW		0x00000020
++#define CFG_EXD		0x00000010
++#define CFG_PESEL	0x00000008
++#define CFG_BROM_DIS	0x00000004
++#define CFG_EXT_125	0x00000002
++#define CFG_BEM		0x00000001
++
++#define EXTSTS_UDPPKT	0x00200000
++#define EXTSTS_TCPPKT	0x00080000
++#define EXTSTS_IPPKT	0x00020000
++
++#define SPDSTS_POLARITY	(CFG_SPDSTS1 | CFG_SPDSTS0 | CFG_DUPSTS | (lnksts ? CFG_LNKSTS : 0))
++
++#define MIBC_MIBS	0x00000008
++#define MIBC_ACLR	0x00000004
++#define MIBC_FRZ	0x00000002
++#define MIBC_WRN	0x00000001
++
++#define PCR_PSEN	(1 << 31)
++#define PCR_PS_MCAST	(1 << 30)
++#define PCR_PS_DA	(1 << 29)
++#define PCR_STHI_8	(3 << 23)
++#define PCR_STLO_4	(1 << 23)
++#define PCR_FFHI_8K	(3 << 21)
++#define PCR_FFLO_4K	(1 << 21)
++#define PCR_PAUSE_CNT	0xFFFE
++
++#define RXCFG_AEP	0x80000000
++#define RXCFG_ARP	0x40000000
++#define RXCFG_STRIPCRC	0x20000000
++#define RXCFG_RX_FD	0x10000000
++#define RXCFG_ALP	0x08000000
++#define RXCFG_AIRL	0x04000000
++#define RXCFG_MXDMA512	0x00700000
++#define RXCFG_DRTH	0x0000003e
++#define RXCFG_DRTH0	0x00000002
++
++#define RFCR_RFEN	0x80000000
++#define RFCR_AAB	0x40000000
++#define RFCR_AAM	0x20000000
++#define RFCR_AAU	0x10000000
++#define RFCR_APM	0x08000000
++#define RFCR_APAT	0x07800000
++#define RFCR_APAT3	0x04000000
++#define RFCR_APAT2	0x02000000
++#define RFCR_APAT1	0x01000000
++#define RFCR_APAT0	0x00800000
++#define RFCR_AARP	0x00400000
++#define RFCR_MHEN	0x00200000
++#define RFCR_UHEN	0x00100000
++#define RFCR_ULM	0x00080000
++
++#define VRCR_RUDPE	0x00000080
++#define VRCR_RTCPE	0x00000040
++#define VRCR_RIPE	0x00000020
++#define VRCR_IPEN	0x00000010
++#define VRCR_DUTF	0x00000008
++#define VRCR_DVTF	0x00000004
++#define VRCR_VTREN	0x00000002
++#define VRCR_VTDEN	0x00000001
++
++#define VTCR_PPCHK	0x00000008
++#define VTCR_GCHK	0x00000004
++#define VTCR_VPPTI	0x00000002
++#define VTCR_VGTI	0x00000001
++
++#define CR		0x00
++#define CFG		0x04
++#define MEAR		0x08
++#define PTSCR		0x0c
++#define	ISR		0x10
++#define	IMR		0x14
++#define	IER		0x18
++#define	IHR		0x1c
++#define TXDP		0x20
++#define TXDP_HI		0x24
++#define TXCFG		0x28
++#define GPIOR		0x2c
++#define RXDP		0x30
++#define RXDP_HI		0x34
++#define RXCFG		0x38
++#define PQCR		0x3c
++#define WCSR		0x40
++#define PCR		0x44
++#define RFCR		0x48
++#define RFDR		0x4c
++
++#define SRR		0x58
++
++#define VRCR		0xbc
++#define VTCR		0xc0
++#define VDR		0xc4
++#define CCSR		0xcc
++
++#define TBICR		0xe0
++#define TBISR		0xe4
++#define TANAR		0xe8
++#define TANLPAR		0xec
++#define TANER		0xf0
++#define TESR		0xf4
++
++#define TBICR_MR_AN_ENABLE	0x00001000
++#define TBICR_MR_RESTART_AN	0x00000200
++
++#define TBISR_MR_LINK_STATUS	0x00000020
++#define TBISR_MR_AN_COMPLETE	0x00000004
++
++#define TANAR_PS2 		0x00000100
++#define TANAR_PS1 		0x00000080
++#define TANAR_HALF_DUP 		0x00000040
++#define TANAR_FULL_DUP 		0x00000020
++
++#define GPIOR_GP5_OE		0x00000200
++#define GPIOR_GP4_OE		0x00000100
++#define GPIOR_GP3_OE		0x00000080
++#define GPIOR_GP2_OE		0x00000040
++#define GPIOR_GP1_OE		0x00000020
++#define GPIOR_GP3_OUT		0x00000004
++#define GPIOR_GP1_OUT		0x00000001
++
++#define LINK_AUTONEGOTIATE	0x01
++#define LINK_DOWN		0x02
++#define LINK_UP			0x04
++
++
++#define __kick_rx()	writel(CR_RXE, ns->base + CR)
++
++#define kick_rx() do { \
++	dprintf(("kick_rx: maybe kicking\n")); \
++		writel(virt_to_le32desc(&rx_ring[ns->cur_rx]), ns->base + RXDP); \
++		if (ns->next_rx == ns->next_empty) \
++			printf("uh-oh: next_rx == next_empty???\n"); \
++		__kick_rx(); \
++} while(0)
++
++
++#ifdef USE_64BIT_ADDR
++#define HW_ADDR_LEN	8
++#else
++#define HW_ADDR_LEN	4
++#endif
++
++#define CMDSTS_OWN	0x80000000
++#define CMDSTS_MORE	0x40000000
++#define CMDSTS_INTR	0x20000000
++#define CMDSTS_ERR	0x10000000
++#define CMDSTS_OK	0x08000000
++#define CMDSTS_LEN_MASK	0x0000ffff
++
++#define CMDSTS_DEST_MASK	0x01800000
++#define CMDSTS_DEST_SELF	0x00800000
++#define CMDSTS_DEST_MULTI	0x01000000
++
++#define DESC_SIZE	8	/* Should be cache line sized */
++
++#ifdef USE_64BIT_ADDR
++struct ring_desc {
++	uint64_t link;
++	uint64_t bufptr;
++	u32 cmdsts;
++	u32 extsts;		/* Extended status field */
++};
++#else
++struct ring_desc {
++	u32 link;
++	u32 bufptr;
++	u32 cmdsts;
++	u32 extsts;		/* Extended status field */
++};
++#endif
++
++/* Define the TX Descriptor */
++static struct ring_desc tx_ring[NR_TX_DESC]
++    __attribute__ ((aligned(8)));
++
++/* Create a static buffer of size REAL_RX_BUF_SIZE for each
++TX Descriptor.  All descriptors point to a
++part of this buffer */
++static unsigned char txb[NR_TX_DESC * REAL_RX_BUF_SIZE];
++
++/* Define the TX Descriptor */
++static struct ring_desc rx_ring[NR_RX_DESC]
++    __attribute__ ((aligned(8)));
++
++/* Create a static buffer of size REAL_RX_BUF_SIZE for each
++RX Descriptor   All descriptors point to a
++part of this buffer */
++static unsigned char rxb[NR_RX_DESC * REAL_RX_BUF_SIZE]
++    __attribute__ ((aligned(8)));
++
++/* Private Storage for the NIC */
++struct ns83820_private {
++	u8 *base;
++	int up;
++	long idle;
++	u32 *next_rx_desc;
++	u16 next_rx, next_empty;
++	u32 cur_rx;
++	u32 *descs;
++	unsigned ihr;
++	u32 CFG_cache;
++	u32 MEAR_cache;
++	u32 IMR_cache;
++	int linkstate;
++	u16 tx_done_idx;
++	u16 tx_idx;
++	u16 tx_intr_idx;
++	u32 phy_descs;
++	u32 *tx_descs;
++
++} nsx;
++static struct ns83820_private *ns;
++
++static void phy_intr(struct nic *nic __unused)
++{
++	static char *speeds[] =
++	    { "10", "100", "1000", "1000(?)", "1000F" };
++	u32 cfg, new_cfg;
++	u32 tbisr, tanar, tanlpar;
++	int speed, fullduplex, newlinkstate;
++
++	cfg = readl(ns->base + CFG) ^ SPDSTS_POLARITY;
++	if (ns->CFG_cache & CFG_TBI_EN) {
++		/* we have an optical transceiver */
++		tbisr = readl(ns->base + TBISR);
++		tanar = readl(ns->base + TANAR);
++		tanlpar = readl(ns->base + TANLPAR);
++		dprintf(("phy_intr: tbisr=%hX, tanar=%hX, tanlpar=%hX\n",
++			 tbisr, tanar, tanlpar));
++
++		if ((fullduplex = (tanlpar & TANAR_FULL_DUP)
++		     && (tanar & TANAR_FULL_DUP))) {
++
++			/* both of us are full duplex */
++			writel(readl(ns->base + TXCFG)
++			       | TXCFG_CSI | TXCFG_HBI | TXCFG_ATP,
++			       ns->base + TXCFG);
++			writel(readl(ns->base + RXCFG) | RXCFG_RX_FD,
++			       ns->base + RXCFG);
++			/* Light up full duplex LED */
++			writel(readl(ns->base + GPIOR) | GPIOR_GP1_OUT,
++			       ns->base + GPIOR);
++
++		} else if (((tanlpar & TANAR_HALF_DUP)
++			    && (tanar & TANAR_HALF_DUP))
++			   || ((tanlpar & TANAR_FULL_DUP)
++			       && (tanar & TANAR_HALF_DUP))
++			   || ((tanlpar & TANAR_HALF_DUP)
++			       && (tanar & TANAR_FULL_DUP))) {
++
++			/* one or both of us are half duplex */
++			writel((readl(ns->base + TXCFG)
++				& ~(TXCFG_CSI | TXCFG_HBI)) | TXCFG_ATP,
++			       ns->base + TXCFG);
++			writel(readl(ns->base + RXCFG) & ~RXCFG_RX_FD,
++			       ns->base + RXCFG);
++			/* Turn off full duplex LED */
++			writel(readl(ns->base + GPIOR) & ~GPIOR_GP1_OUT,
++			       ns->base + GPIOR);
++		}
++
++		speed = 4;	/* 1000F */
++
++	} else {
++		/* we have a copper transceiver */
++		new_cfg =
++		    ns->CFG_cache & ~(CFG_SB | CFG_MODE_1000 | CFG_SPDSTS);
++
++		if (cfg & CFG_SPDSTS1)
++			new_cfg |= CFG_MODE_1000;
++		else
++			new_cfg &= ~CFG_MODE_1000;
++
++		speed = ((cfg / CFG_SPDSTS0) & 3);
++		fullduplex = (cfg & CFG_DUPSTS);
++
++		if (fullduplex)
++			new_cfg |= CFG_SB;
++
++		if ((cfg & CFG_LNKSTS) &&
++		    ((new_cfg ^ ns->CFG_cache) & CFG_MODE_1000)) {
++			writel(new_cfg, ns->base + CFG);
++			ns->CFG_cache = new_cfg;
++		}
++
++		ns->CFG_cache &= ~CFG_SPDSTS;
++		ns->CFG_cache |= cfg & CFG_SPDSTS;
++	}
++
++	newlinkstate = (cfg & CFG_LNKSTS) ? LINK_UP : LINK_DOWN;
++
++	if (newlinkstate & LINK_UP && ns->linkstate != newlinkstate) {
++		printf("link now %s mbps, %s duplex and up.\n",
++		       speeds[speed], fullduplex ? "full" : "half");
++	} else if (newlinkstate & LINK_DOWN
++		   && ns->linkstate != newlinkstate) {
++		printf("link now down.\n");
++	}
++	ns->linkstate = newlinkstate;
++}
++static void ns83820_set_multicast(struct nic *nic __unused);
++static void ns83820_setup_rx(struct nic *nic)
++{
++	unsigned i;
++	ns->idle = 1;
++	ns->next_rx = 0;
++	ns->next_rx_desc = ns->descs;
++	ns->next_empty = 0;
++	ns->cur_rx = 0;
++
++
++	for (i = 0; i < NR_RX_DESC; i++) {
++		rx_ring[i].link = virt_to_le32desc(&rx_ring[i + 1]);
++		rx_ring[i].bufptr =
++		    virt_to_le32desc(&rxb[i * REAL_RX_BUF_SIZE]);
++		rx_ring[i].cmdsts = cpu_to_le32(REAL_RX_BUF_SIZE);
++		rx_ring[i].extsts = cpu_to_le32(0);
++	}
++//      No need to wrap the ring 
++//      rx_ring[i].link = virt_to_le32desc(&rx_ring[0]);
++	writel(0, ns->base + RXDP_HI);
++	writel(virt_to_le32desc(&rx_ring[0]), ns->base + RXDP);
++
++	dprintf(("starting receiver\n"));
++
++	writel(0x0001, ns->base + CCSR);
++	writel(0, ns->base + RFCR);
++	writel(0x7fc00000, ns->base + RFCR);
++	writel(0xffc00000, ns->base + RFCR);
++
++	ns->up = 1;
++
++	phy_intr(nic);
++
++	/* Okay, let it rip */
++	ns->IMR_cache |= ISR_PHY;
++	ns->IMR_cache |= ISR_RXRCMP;
++	//dev->IMR_cache |= ISR_RXERR;
++	//dev->IMR_cache |= ISR_RXOK;
++	ns->IMR_cache |= ISR_RXORN;
++	ns->IMR_cache |= ISR_RXSOVR;
++	ns->IMR_cache |= ISR_RXDESC;
++	ns->IMR_cache |= ISR_RXIDLE;
++	ns->IMR_cache |= ISR_TXDESC;
++	ns->IMR_cache |= ISR_TXIDLE;
++
++	// No reason to enable interupts...
++	// writel(ns->IMR_cache, ns->base + IMR);
++	// writel(1, ns->base + IER);
++	ns83820_set_multicast(nic);
++	kick_rx();
++}
++
++
++static void ns83820_do_reset(struct nic *nic __unused, u32 which)
++{
++	dprintf(("resetting chip...\n"));
++	writel(which, ns->base + CR);
++	do {
++
++	} while (readl(ns->base + CR) & which);
++	dprintf(("okay!\n"));
++}
++
++static void ns83820_reset(struct nic *nic)
++{
++	unsigned i;
++	dprintf(("ns83820_reset\n"));
++
++	writel(0, ns->base + PQCR);
++
++	ns83820_setup_rx(nic);
++
++	for (i = 0; i < NR_TX_DESC; i++) {
++		tx_ring[i].link = 0;
++		tx_ring[i].bufptr = 0;
++		tx_ring[i].cmdsts = cpu_to_le32(0);
++		tx_ring[i].extsts = cpu_to_le32(0);
++	}
++
++	ns->tx_idx = 0;
++	ns->tx_done_idx = 0;
++	writel(0, ns->base + TXDP_HI);
++	return;
++}
++static void ns83820_getmac(struct nic *nic __unused, u8 * mac)
++{
++	unsigned i;
++	for (i = 0; i < 3; i++) {
++		u32 data;
++		/* Read from the perfect match memory: this is loaded by
++		 * the chip from the EEPROM via the EELOAD self test.
++		 */
++		writel(i * 2, ns->base + RFCR);
++		data = readl(ns->base + RFDR);
++		*mac++ = data;
++		*mac++ = data >> 8;
++	}
++}
++
++static void ns83820_set_multicast(struct nic *nic __unused)
++{
++	u8 *rfcr = ns->base + RFCR;
++	u32 and_mask = 0xffffffff;
++	u32 or_mask = 0;
++	u32 val;
++
++	/* Support Multicast */
++	and_mask &= ~(RFCR_AAU | RFCR_AAM);
++	or_mask |= RFCR_AAM;
++	val = (readl(rfcr) & and_mask) | or_mask;
++	/* Ramit : RFCR Write Fix doc says RFEN must be 0 modify other bits */
++	writel(val & ~RFCR_RFEN, rfcr);
++	writel(val, rfcr);
++
++}
++static void ns83820_run_bist(struct nic *nic __unused, const char *name,
++			     u32 enable, u32 done, u32 fail)
++{
++	int timed_out = 0;
++	long start;
++	u32 status;
++	int loops = 0;
++
++	dprintf(("start %s\n", name))
++
++	    start = currticks();
++
++	writel(enable, ns->base + PTSCR);
++	for (;;) {
++		loops++;
++		status = readl(ns->base + PTSCR);
++		if (!(status & enable))
++			break;
++		if (status & done)
++			break;
++		if (status & fail)
++			break;
++		if ((currticks() - start) >= HZ) {
++			timed_out = 1;
++			break;
++		}
++	}
++
++	if (status & fail)
++		printf("%s failed! (0x%hX & 0x%hX)\n", name, status, fail);
++	else if (timed_out)
++		printf("run_bist %s timed out! (%hX)\n", name, status);
++	dprintf(("done %s in %d loops\n", name, loops));
++}
++
++/*************************************
++Check Link
++*************************************/
++static void ns83820_check_intr(struct nic *nic) {
++	int i;
++	u32 isr = readl(ns->base + ISR);
++	if(ISR_PHY & isr)
++		phy_intr(nic);
++	if(( ISR_RXIDLE | ISR_RXDESC | ISR_RXERR) & isr)
++		kick_rx();
++	for (i = 0; i < NR_RX_DESC; i++) {
++		if (rx_ring[i].cmdsts == CMDSTS_OWN) {
++//			rx_ring[i].link = virt_to_le32desc(&rx_ring[i + 1]);
++			rx_ring[i].cmdsts = cpu_to_le32(REAL_RX_BUF_SIZE);
++		}
++	}
++}
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int ns83820_poll(struct nic *nic, int retrieve)
++{
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++	u32 cmdsts;
++	int entry = ns->cur_rx;
++
++	ns83820_check_intr(nic);
++
++	cmdsts = le32_to_cpu(rx_ring[entry].cmdsts);
++
++	if ( ! ( (CMDSTS_OWN & (cmdsts)) && (cmdsts != (CMDSTS_OWN)) ) )
++	  return 0;
++
++	if ( ! retrieve ) return 1;
++
++	if (! (CMDSTS_OK & cmdsts) )
++	  return 0;
++
++	nic->packetlen = cmdsts & 0xffff;
++	memcpy(nic->packet,
++	       rxb + (entry * REAL_RX_BUF_SIZE),
++	       nic->packetlen);
++	//			rx_ring[entry].link = 0;
++	rx_ring[entry].cmdsts = cpu_to_le32(CMDSTS_OWN);
++
++	ns->cur_rx = ++ns->cur_rx % NR_RX_DESC;
++
++	if (ns->cur_rx == 0)	/* We have wrapped the ring */
++	  kick_rx();
++
++	return 1;
++}
++
++static inline void kick_tx(struct nic *nic __unused)
++{
++	dprintf(("kick_tx\n"));
++	writel(CR_TXE, ns->base + CR);
++}
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void ns83820_transmit(struct nic *nic, const char *d,	/* Destination */
++			     unsigned int t,	/* Type */
++			     unsigned int s,	/* size */
++			     const char *p)
++{				/* Packet */
++	/* send the packet to destination */
++
++	u16 nstype;
++	u32 cmdsts, extsts;
++	int cur_tx = 0;
++	u32 isr = readl(ns->base + ISR);
++	if (ISR_TXIDLE & isr)
++		kick_tx(nic);
++	/* point to the current txb incase multiple tx_rings are used */
++	memcpy(txb, d, ETH_ALEN);
++	memcpy(txb + ETH_ALEN, nic->node_addr, ETH_ALEN);
++	nstype = htons((u16) t);
++	memcpy(txb + 2 * ETH_ALEN, (u8 *) & nstype, 2);
++	memcpy(txb + ETH_HLEN, p, s);
++	s += ETH_HLEN;
++	s &= 0x0FFF;
++	while (s < ETH_ZLEN)
++		txb[s++] = '\0';
++
++	/* Setup the transmit descriptor */
++	extsts = 0;
++	extsts |= EXTSTS_UDPPKT;
++
++	tx_ring[cur_tx].bufptr = virt_to_le32desc(&txb);
++	tx_ring[cur_tx].extsts = cpu_to_le32(extsts);
++
++	cmdsts = cpu_to_le32(0);
++	cmdsts |= cpu_to_le32(CMDSTS_OWN | s);
++	tx_ring[cur_tx].cmdsts = cpu_to_le32(cmdsts);
++
++	writel(virt_to_le32desc(&tx_ring[0]), ns->base + TXDP);
++	kick_tx(nic);
++}
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void ns83820_disable(struct dev *dev)
++{
++	/* put the card in its initial state */
++	/* This function serves 3 purposes.
++	 * This disables DMA and interrupts so we don't receive
++	 *  unexpected packets or interrupts from the card after
++	 *  etherboot has finished. 
++	 * This frees resources so etherboot may use
++	 *  this driver on another interface
++	 * This allows etherboot to reinitialize the interface
++	 *  if something is something goes wrong.
++	 */
++	/* disable interrupts */
++	writel(0, ns->base + IMR);
++	writel(0, ns->base + IER);
++	readl(ns->base + IER);
++
++	ns->up = 0;
++
++	ns83820_do_reset((struct nic *) dev, CR_RST);
++
++	ns->IMR_cache &=
++	    ~(ISR_RXOK | ISR_RXDESC | ISR_RXERR | ISR_RXEARLY |
++	      ISR_RXIDLE);
++	writel(ns->IMR_cache, ns->base + IMR);
++
++	/* touch the pci bus... */
++	readl(ns->base + IMR);
++
++	/* assumes the transmitter is already disabled and reset */
++	writel(0, ns->base + RXDP_HI);
++	writel(0, ns->base + RXDP);
++}
++
++/**************************************************************************
++IRQ - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void ns83820_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++***************************************************************************/
++
++#define board_found 1
++#define valid_link 0
++static int ns83820_probe(struct dev *dev, struct pci_device *pci)
++{
++	struct nic *nic = (struct nic *) dev;
++	int sz;
++	long addr;
++	int using_dac = 0;
++
++	if (pci->ioaddr == 0)
++		return 0;
++
++	printf("ns83820.c: Found %s, vendor=0x%hX, device=0x%hX\n",
++	       pci->name, pci->vendor, pci->dev_id);
++
++	/* point to private storage */
++	ns = &nsx;
++
++	adjust_pci_device(pci);
++
++	addr = pci_bar_start(pci, PCI_BASE_ADDRESS_1);
++	sz = pci_bar_size(pci, PCI_BASE_ADDRESS_1);
++
++	ns->base = ioremap(addr, (1UL << 12));
++//      ns->base = ioremap(addr, sz);
++
++	if (!ns->base)
++		return 0;
++
++	nic->irqno  = 0;
++	nic->ioaddr = pci->ioaddr & ~3;
++
++	/* disable interrupts */
++	writel(0, ns->base + IMR);
++	writel(0, ns->base + IER);
++	readl(ns->base + IER);
++
++	ns->IMR_cache = 0;
++
++	ns83820_do_reset(nic, CR_RST);
++
++	/* Must reset the ram bist before running it */
++	writel(PTSCR_RBIST_RST, ns->base + PTSCR);
++	ns83820_run_bist(nic, "sram bist", PTSCR_RBIST_EN,
++			 PTSCR_RBIST_DONE, PTSCR_RBIST_FAIL);
++	ns83820_run_bist(nic, "eeprom bist", PTSCR_EEBIST_EN, 0,
++			 PTSCR_EEBIST_FAIL);
++	ns83820_run_bist(nic, "eeprom load", PTSCR_EELOAD_EN, 0, 0);
++
++	/* I love config registers */
++	ns->CFG_cache = readl(ns->base + CFG);
++
++	if ((ns->CFG_cache & CFG_PCI64_DET)) {
++		printf("%s: detected 64 bit PCI data bus.\n", pci->name);
++		/*dev->CFG_cache |= CFG_DATA64_EN; */
++		if (!(ns->CFG_cache & CFG_DATA64_EN))
++			printf
++			    ("%s: EEPROM did not enable 64 bit bus.  Disabled.\n",
++			     pci->name);
++	} else
++		ns->CFG_cache &= ~(CFG_DATA64_EN);
++
++	ns->CFG_cache &= (CFG_TBI_EN | CFG_MRM_DIS | CFG_MWI_DIS |
++			  CFG_T64ADDR | CFG_DATA64_EN | CFG_EXT_125 |
++			  CFG_M64ADDR);
++	ns->CFG_cache |=
++	    CFG_PINT_DUPSTS | CFG_PINT_LNKSTS | CFG_PINT_SPDSTS |
++	    CFG_EXTSTS_EN | CFG_EXD | CFG_PESEL;
++	ns->CFG_cache |= CFG_REQALG;
++	ns->CFG_cache |= CFG_POW;
++	ns->CFG_cache |= CFG_TMRTEST;
++
++	/* When compiled with 64 bit addressing, we must always enable
++	 * the 64 bit descriptor format.
++	 */
++#ifdef USE_64BIT_ADDR
++	ns->CFG_cache |= CFG_M64ADDR;
++#endif
++
++//FIXME: Enable section on dac or remove this
++	if (using_dac)
++		ns->CFG_cache |= CFG_T64ADDR;
++
++	/* Big endian mode does not seem to do what the docs suggest */
++	ns->CFG_cache &= ~CFG_BEM;
++
++	/* setup optical transceiver if we have one */
++	if (ns->CFG_cache & CFG_TBI_EN) {
++		dprintf(("%s: enabling optical transceiver\n", pci->name));
++		writel(readl(ns->base + GPIOR) | 0x3e8, ns->base + GPIOR);
++
++		/* setup auto negotiation feature advertisement */
++		writel(readl(ns->base + TANAR)
++		       | TANAR_HALF_DUP | TANAR_FULL_DUP,
++		       ns->base + TANAR);
++
++		/* start auto negotiation */
++		writel(TBICR_MR_AN_ENABLE | TBICR_MR_RESTART_AN,
++		       ns->base + TBICR);
++		writel(TBICR_MR_AN_ENABLE, ns->base + TBICR);
++		ns->linkstate = LINK_AUTONEGOTIATE;
++
++		ns->CFG_cache |= CFG_MODE_1000;
++	}
++	writel(ns->CFG_cache, ns->base + CFG);
++	dprintf(("CFG: %hX\n", ns->CFG_cache));
++
++	/* FIXME: reset_phy is defaulted to 0, should we reset anyway? */
++	if (reset_phy) {
++		dprintf(("%s: resetting phy\n", pci->name));
++		writel(ns->CFG_cache | CFG_PHY_RST, ns->base + CFG);
++		writel(ns->CFG_cache, ns->base + CFG);
++	}
++#if 0				/* Huh?  This sets the PCI latency register.  Should be done via 
++				 * the PCI layer.  FIXME.
++				 */
++	if (readl(dev->base + SRR))
++		writel(readl(dev->base + 0x20c) | 0xfe00,
++		       dev->base + 0x20c);
++#endif
++
++	/* Note!  The DMA burst size interacts with packet
++	 * transmission, such that the largest packet that
++	 * can be transmitted is 8192 - FLTH - burst size.
++	 * If only the transmit fifo was larger...
++	 */
++	/* Ramit : 1024 DMA is not a good idea, it ends up banging 
++	 * some DELL and COMPAQ SMP systems */
++	writel(TXCFG_CSI | TXCFG_HBI | TXCFG_ATP | TXCFG_MXDMA512
++	       | ((1600 / 32) * 0x100), ns->base + TXCFG);
++
++	/* Set Rx to full duplex, don't accept runt, errored, long or length
++	 * range errored packets.  Use 512 byte DMA.
++	 */
++	/* Ramit : 1024 DMA is not a good idea, it ends up banging 
++	 * some DELL and COMPAQ SMP systems 
++	 * Turn on ALP, only we are accpeting Jumbo Packets */
++	writel(RXCFG_AEP | RXCFG_ARP | RXCFG_AIRL | RXCFG_RX_FD
++	       | RXCFG_STRIPCRC
++	       //| RXCFG_ALP
++	       | (RXCFG_MXDMA512) | 0, ns->base + RXCFG);
++
++	/* Disable priority queueing */
++	writel(0, ns->base + PQCR);
++
++	/* Enable IP checksum validation and detetion of VLAN headers.
++	 * Note: do not set the reject options as at least the 0x102
++	 * revision of the chip does not properly accept IP fragments
++	 * at least for UDP.
++	 */
++	/* Ramit : Be sure to turn on RXCFG_ARP if VLAN's are enabled, since
++	 * the MAC it calculates the packetsize AFTER stripping the VLAN
++	 * header, and if a VLAN Tagged packet of 64 bytes is received (like
++	 * a ping with a VLAN header) then the card, strips the 4 byte VLAN
++	 * tag and then checks the packet size, so if RXCFG_ARP is not enabled,
++	 * it discrards it!.  These guys......
++	 */
++	writel(VRCR_IPEN | VRCR_VTDEN, ns->base + VRCR);
++
++	/* Enable per-packet TCP/UDP/IP checksumming */
++	writel(VTCR_PPCHK, ns->base + VTCR);
++
++	/* Ramit : Enable async and sync pause frames */
++//      writel(0, ns->base + PCR); 
++	writel((PCR_PS_MCAST | PCR_PS_DA | PCR_PSEN | PCR_FFLO_4K |
++		PCR_FFHI_8K | PCR_STLO_4 | PCR_STHI_8 | PCR_PAUSE_CNT),
++	       ns->base + PCR);
++
++	/* Disable Wake On Lan */
++	writel(0, ns->base + WCSR);
++
++	ns83820_getmac(nic, nic->node_addr);
++	printf("%! at ioaddr 0x%hX, ", nic->node_addr, ns->base);
++
++	if (using_dac) {
++		dprintf(("%s: using 64 bit addressing.\n", pci->name));
++	}
++
++	dprintf(("%s: DP83820 %d.%d: %! io=0x%hX\n",
++		 pci->name,
++		 (unsigned) readl(ns->base + SRR) >> 8,
++		 (unsigned) readl(ns->base + SRR) & 0xff,
++		 nic->node_addr, pci->ioaddr));
++
++#ifdef PHY_CODE_IS_FINISHED
++	ns83820_probe_phy(dev);
++#endif
++
++	ns83820_reset(nic);
++	/* point to NIC specific routines */
++	dev->disable  = ns83820_disable;
++	nic->poll     = ns83820_poll;
++	nic->transmit = ns83820_transmit;
++	nic->irq      = ns83820_irq;
++	return 1;
++}
++
++static struct pci_id ns83820_nics[] = {
++	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820"),
++};
++
++struct pci_driver ns83820_driver = {
++	.type = NIC_DRIVER,
++	.name = "NS83820/PCI",
++	.probe = ns83820_probe,
++	.ids = ns83820_nics,
++	.id_count = sizeof(ns83820_nics) / sizeof(ns83820_nics[0]),
++	.class = 0,
++};
+diff -Naur grub-0.97.orig/netboot/ns8390.c grub-0.97/netboot/ns8390.c
+--- grub-0.97.orig/netboot/ns8390.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/ns8390.c	2005-08-31 21:13:41.000000000 +0000
+@@ -13,11 +13,15 @@
+   the proper functioning of this software, nor do the authors assume any
+   responsibility for damages incurred with its use.
+ 
++Multicast support added by Timothy Legge (timlegge@users.sourceforge.net) 09/28/2003
++Relocation support added by Ken Yap (ken_yap@users.sourceforge.net) 28/12/02
+ 3c503 support added by Bill Paul (wpaul@ctr.columbia.edu) on 11/15/94
+ SMC8416 support added by Bill Paul (wpaul@ctr.columbia.edu) on 12/25/94
+ 3c503 PIO support added by Jim Hague (jim.hague@acm.org) on 2/17/98
+ RX overrun by Klaus Espenlaub (espenlaub@informatik.uni-ulm.de) on 3/10/99
+   parts taken from the Linux 8390 driver (by Donald Becker and Paul Gortmaker)
++SMC8416 PIO support added by Andrew Bettison (andrewb@zip.com.au) on 4/3/02
++  based on the Linux 8390 driver (by Donald Becker and Paul Gortmaker)
+ 
+ **************************************************************************/
+ 
+@@ -26,10 +30,16 @@
+ #include "ns8390.h"
+ #ifdef	INCLUDE_NS8390
+ #include "pci.h"
++#else
++#include "isa.h"
+ #endif
+-#include "cards.h"
+ 
+-static unsigned char	eth_vendor, eth_flags, eth_laar;
++typedef int Address;
++
++static unsigned char	eth_vendor, eth_flags;
++#ifdef	INCLUDE_WD
++static unsigned char	eth_laar;
++#endif
+ static unsigned short	eth_nic_base, eth_asic_base;
+ static unsigned char	eth_memsize, eth_rx_start, eth_tx_start;
+ static Address		eth_bmem, eth_rmem;
+@@ -66,6 +76,7 @@
+ #endif
+ 
+ #if	defined(INCLUDE_WD)
++#define	ASIC_PIO	WD_IAR
+ #define	eth_probe	wd_probe
+ #if	defined(INCLUDE_3C503) || defined(INCLUDE_NE) || defined(INCLUDE_NS8390)
+ Error you must only define one of INCLUDE_WD, INCLUDE_3C503, INCLUDE_NE, INCLUDE_NS8390
+@@ -101,13 +112,16 @@
+ #endif
+ #endif
+ 
+-#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM))
++#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM)) || (defined(INCLUDE_WD) && defined(WD_790_PIO))
+ /**************************************************************************
+ ETH_PIO_READ - Read a frame via Programmed I/O
+ **************************************************************************/
+ static void eth_pio_read(unsigned int src, unsigned char *dst, unsigned int cnt)
+ {
+-	if (eth_flags & FLAG_16BIT) { ++cnt; cnt &= ~1; }
++#ifdef	INCLUDE_WD
++	outb(src & 0xff, eth_asic_base + WD_GP2);
++	outb(src >> 8, eth_asic_base + WD_GP2);
++#else
+ 	outb(D8390_COMMAND_RD2 |
+ 		D8390_COMMAND_STA, eth_nic_base + D8390_P0_COMMAND);
+ 	outb(cnt, eth_nic_base + D8390_P0_RBCR0);
+@@ -122,9 +136,10 @@
+ 	outb(src >> 8, eth_asic_base + _3COM_DAMSB);
+ 	outb(t503_output | _3COM_CR_START, eth_asic_base + _3COM_CR);
+ #endif
++#endif
+ 
+ 	if (eth_flags & FLAG_16BIT)
+-		cnt >>= 1;
++		cnt = (cnt + 1) >> 1;
+ 
+ 	while(cnt--) {
+ #ifdef	INCLUDE_3C503
+@@ -153,7 +168,10 @@
+ #ifdef	COMPEX_RL2000_FIX
+ 	unsigned int x;
+ #endif	/* COMPEX_RL2000_FIX */
+-	if (eth_flags & FLAG_16BIT) { ++cnt; cnt &= ~1; }
++#ifdef	INCLUDE_WD
++	outb(dst & 0xff, eth_asic_base + WD_GP2);
++	outb(dst >> 8, eth_asic_base + WD_GP2);
++#else
+ 	outb(D8390_COMMAND_RD2 |
+ 		D8390_COMMAND_STA, eth_nic_base + D8390_P0_COMMAND);
+ 	outb(D8390_ISR_RDC, eth_nic_base + D8390_P0_ISR);
+@@ -170,9 +188,10 @@
+ 
+ 	outb(t503_output | _3COM_CR_DDIR | _3COM_CR_START, eth_asic_base + _3COM_CR);
+ #endif
++#endif
+ 
+ 	if (eth_flags & FLAG_16BIT)
+-		cnt >>= 1;
++		cnt = (cnt + 1) >> 1;
+ 
+ 	while(cnt--)
+ 	{
+@@ -201,17 +220,40 @@
+ 	if (x >= COMPEX_RL2000_TRIES)
+ 		printf("Warning: Compex RL2000 aborted wait!\n");
+ #endif	/* COMPEX_RL2000_FIX */
++#ifndef	INCLUDE_WD
+ 	while((inb(eth_nic_base + D8390_P0_ISR) & D8390_ISR_RDC)
+ 		!= D8390_ISR_RDC);
+ #endif
++#endif
+ }
+ #else
+ /**************************************************************************
+ ETH_PIO_READ - Dummy routine when NE2000 not compiled in
+ **************************************************************************/
+-static void eth_pio_read(unsigned int src, unsigned char *dst, unsigned int cnt) {}
++static void eth_pio_read(unsigned int src __unused, unsigned char *dst  __unused, unsigned int cnt __unused) {}
+ #endif
+ 
++
++/**************************************************************************
++enable_multycast - Enable Multicast
++**************************************************************************/
++static void enable_multicast(unsigned short eth_nic_base) 
++{
++	unsigned char mcfilter[8];
++	int i;
++	memset(mcfilter, 0xFF, 8);
++	outb(4, eth_nic_base+D8390_P0_RCR);	
++	outb(D8390_COMMAND_RD2 + D8390_COMMAND_PS1, eth_nic_base + D8390_P0_COMMAND);
++	for(i=0;i<8;i++)
++	{
++		outb(mcfilter[i], eth_nic_base + 8 + i);
++		if(inb(eth_nic_base + 8 + i)!=mcfilter[i])
++			printf("Error SMC 83C690 Multicast filter read/write mishap %d\n",i);
++	}
++	outb(D8390_COMMAND_RD2 + D8390_COMMAND_PS0, eth_nic_base + D8390_P0_COMMAND);
++	outb(4 | 0x08, eth_nic_base+D8390_P0_RCR);
++}
++
+ /**************************************************************************
+ NS8390_RESET - Reset adapter
+ **************************************************************************/
+@@ -238,7 +280,14 @@
+ 	outb(eth_tx_start, eth_nic_base+D8390_P0_TPSR);
+ 	outb(eth_rx_start, eth_nic_base+D8390_P0_PSTART);
+ #ifdef	INCLUDE_WD
+-	if (eth_flags & FLAG_790) outb(0, eth_nic_base + 0x09);
++	if (eth_flags & FLAG_790) {
++#ifdef	WD_790_PIO
++		outb(0x10, eth_asic_base + 0x06); /* disable interrupts, enable PIO */
++		outb(0x01, eth_nic_base + 0x09); /* enable ring read auto-wrap */
++#else
++		outb(0, eth_nic_base + 0x09);
++#endif
++	}
+ #endif
+ 	outb(eth_memsize, eth_nic_base+D8390_P0_PSTOP);
+ 	outb(eth_memsize - 1, eth_nic_base+D8390_P0_BOUND);
+@@ -266,8 +315,10 @@
+ 		outb(D8390_COMMAND_PS0 |
+ 			D8390_COMMAND_RD2 | D8390_COMMAND_STA, eth_nic_base+D8390_P0_COMMAND);
+ 	outb(0xFF, eth_nic_base+D8390_P0_ISR);
+-	outb(0, eth_nic_base+D8390_P0_TCR);
+-	outb(4, eth_nic_base+D8390_P0_RCR);	/* allow broadcast frames */
++	outb(0, eth_nic_base+D8390_P0_TCR);	/* transmitter on */
++	outb(4, eth_nic_base+D8390_P0_RCR);	/* allow rx broadcast frames */
++
++	enable_multicast(eth_nic_base);
+ 
+ #ifdef	INCLUDE_3C503
+         /*
+@@ -281,7 +332,7 @@
+ #endif
+ }
+ 
+-static int ns8390_poll(struct nic *nic);
++static int ns8390_poll(struct nic *nic, int retrieve);
+ 
+ #ifndef	INCLUDE_3C503
+ /**************************************************************************
+@@ -324,7 +375,7 @@
+ 
+ 	/* clear the RX ring, acknowledge overrun interrupt */
+ 	eth_drain_receiver = 1;
+-	while (ns8390_poll(nic))
++	while (ns8390_poll(nic, 1))
+ 		/* Nothing */;
+ 	eth_drain_receiver = 0;
+ 	outb(D8390_ISR_OVW, eth_nic_base+D8390_P0_ISR);
+@@ -344,50 +395,54 @@
+ 	unsigned int s,			/* size */
+ 	const char *p)			/* Packet */
+ {
++#if defined(INCLUDE_3C503) || (defined(INCLUDE_WD) && ! defined(WD_790_PIO))
++	Address		eth_vmem = bus_to_virt(eth_bmem);
++#endif
+ #ifdef	INCLUDE_3C503
+         if (!(eth_flags & FLAG_PIO)) {
+-                memcpy((char *)eth_bmem, d, ETH_ALEN);	/* dst */
+-                memcpy((char *)eth_bmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
+-                *((char *)eth_bmem+12) = t>>8;		/* type */
+-                *((char *)eth_bmem+13) = t;
+-                memcpy((char *)eth_bmem+ETH_HLEN, p, s);
++                memcpy((char *)eth_vmem, d, ETH_ALEN);	/* dst */
++                memcpy((char *)eth_vmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
++                *((char *)eth_vmem+12) = t>>8;		/* type */
++                *((char *)eth_vmem+13) = t;
++                memcpy((char *)eth_vmem+ETH_HLEN, p, s);
+                 s += ETH_HLEN;
+-                while (s < ETH_ZLEN) *((char *)eth_bmem+(s++)) = 0;
++                while (s < ETH_ZLEN) *((char *)eth_vmem+(s++)) = 0;
+         }
+ #endif
+ 
+ #ifdef	INCLUDE_WD
+-	/* Memory interface */
+ 	if (eth_flags & FLAG_16BIT) {
+ 		outb(eth_laar | WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
+ 		inb(0x84);
+ 	}
++#ifndef	WD_790_PIO
++	/* Memory interface */
+ 	if (eth_flags & FLAG_790) {
+ 		outb(WD_MSR_MENB, eth_asic_base + WD_MSR);
+ 		inb(0x84);
+ 	}
+ 	inb(0x84);
+-	memcpy((char *)eth_bmem, d, ETH_ALEN);	/* dst */
+-	memcpy((char *)eth_bmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
+-	*((char *)eth_bmem+12) = t>>8;		/* type */
+-	*((char *)eth_bmem+13) = t;
+-	memcpy((char *)eth_bmem+ETH_HLEN, p, s);
++	memcpy((char *)eth_vmem, d, ETH_ALEN);	/* dst */
++	memcpy((char *)eth_vmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
++	*((char *)eth_vmem+12) = t>>8;		/* type */
++	*((char *)eth_vmem+13) = t;
++	memcpy((char *)eth_vmem+ETH_HLEN, p, s);
+ 	s += ETH_HLEN;
+-	while (s < ETH_ZLEN) *((char *)eth_bmem+(s++)) = 0;
++	while (s < ETH_ZLEN) *((char *)eth_vmem+(s++)) = 0;
+ 	if (eth_flags & FLAG_790) {
+ 		outb(0, eth_asic_base + WD_MSR);
+ 		inb(0x84);
+ 	}
+-	if (eth_flags & FLAG_16BIT) {
+-		outb(eth_laar & ~WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
+-		inb(0x84);
+-	}
++#else
++	inb(0x84);
++#endif
+ #endif
+ 
+ #if	defined(INCLUDE_3C503)
+-	if (eth_flags & FLAG_PIO) {
++	if (eth_flags & FLAG_PIO)
+ #endif
+-#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM))
++#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM)) || (defined(INCLUDE_WD) && defined(WD_790_PIO))
++	{
+ 		/* Programmed I/O */
+ 		unsigned short type;
+ 		type = (t >> 8) | (t << 8);
+@@ -398,12 +453,16 @@
+ 		eth_pio_write(p, (eth_tx_start<<8)+ETH_HLEN, s);
+ 		s += ETH_HLEN;
+ 		if (s < ETH_ZLEN) s = ETH_ZLEN;
++	}
+ #endif
+ #if	defined(INCLUDE_3C503)
+-	}
+ #endif
+ 
+ #ifdef	INCLUDE_WD
++	if (eth_flags & FLAG_16BIT) {
++		outb(eth_laar & ~WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
++		inb(0x84);
++	}
+ 	if (eth_flags & FLAG_790)
+ 		outb(D8390_COMMAND_PS0 |
+ 			D8390_COMMAND_STA, eth_nic_base+D8390_P0_COMMAND);
+@@ -428,7 +487,7 @@
+ /**************************************************************************
+ NS8390_POLL - Wait for a frame
+ **************************************************************************/
+-static int ns8390_poll(struct nic *nic)
++static int ns8390_poll(struct nic *nic, int retrieve)
+ {
+ 	int ret = 0;
+ 	unsigned char rstat, curr, next;
+@@ -453,22 +512,27 @@
+ 	outb(D8390_COMMAND_PS0, eth_nic_base+D8390_P0_COMMAND);
+ 	if (curr >= eth_memsize) curr=eth_rx_start;
+ 	if (curr == next) return(0);
++
++	if ( ! retrieve ) return 1;
++
+ #ifdef	INCLUDE_WD
+ 	if (eth_flags & FLAG_16BIT) {
+ 		outb(eth_laar | WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
+ 		inb(0x84);
+ 	}
++#ifndef	WD_790_PIO
+ 	if (eth_flags & FLAG_790) {
+ 		outb(WD_MSR_MENB, eth_asic_base + WD_MSR);
+ 		inb(0x84);
+ 	}
++#endif
+ 	inb(0x84);
+ #endif
+ 	pktoff = next << 8;
+ 	if (eth_flags & FLAG_PIO)
+ 		eth_pio_read(pktoff, (char *)&pkthdr, 4);
+ 	else
+-		memcpy(&pkthdr, (char *)eth_rmem + pktoff, 4);
++		memcpy(&pkthdr, bus_to_virt(eth_rmem + pktoff), 4);
+ 	pktoff += sizeof(pkthdr);
+ 	/* incoming length includes FCS so must sub 4 */
+ 	len = pkthdr.len - 4;
+@@ -486,7 +550,7 @@
+ 			if (eth_flags & FLAG_PIO)
+ 				eth_pio_read(pktoff, p, frag);
+ 			else
+-				memcpy(p, (char *)eth_rmem + pktoff, frag);
++				memcpy(p, bus_to_virt(eth_rmem + pktoff), frag);
+ 			pktoff = eth_rx_start << 8;
+ 			p += frag;
+ 			len -= frag;
+@@ -495,14 +559,16 @@
+ 		if (eth_flags & FLAG_PIO)
+ 			eth_pio_read(pktoff, p, len);
+ 		else
+-			memcpy(p, (char *)eth_rmem + pktoff, len);
++			memcpy(p, bus_to_virt(eth_rmem + pktoff), len);
+ 		ret = 1;
+ 	}
+ #ifdef	INCLUDE_WD
++#ifndef	WD_790_PIO
+ 	if (eth_flags & FLAG_790) {
+ 		outb(0, eth_asic_base + WD_MSR);
+ 		inb(0x84);
+ 	}
++#endif
+ 	if (eth_flags & FLAG_16BIT) {
+ 		outb(eth_laar & ~WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
+ 		inb(0x84);
+@@ -519,31 +585,56 @@
+ /**************************************************************************
+ NS8390_DISABLE - Turn off adapter
+ **************************************************************************/
+-static void ns8390_disable(struct nic *nic)
++static void ns8390_disable(struct dev *dev)
+ {
++	struct nic *nic = (struct nic *)dev;
++	/* reset and disable merge */
++	ns8390_reset(nic);
++}
++
++/**************************************************************************
++NS8390_IRQ - Enable, Disable, or Force interrupts
++**************************************************************************/
++static void ns8390_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
+ }
+ 
+ /**************************************************************************
+ ETH_PROBE - Look for an adapter
+ **************************************************************************/
+ #ifdef	INCLUDE_NS8390
+-struct nic *eth_probe(struct nic *nic, unsigned short *probe_addrs,
+-		      struct pci_device *pci)
++static int eth_probe (struct dev *dev, struct pci_device *pci)
+ #else
+-struct nic *eth_probe(struct nic *nic, unsigned short *probe_addrs)
++static int eth_probe (struct dev *dev, unsigned short *probe_addrs __unused)
+ #endif
+ {
++	struct nic *nic = (struct nic *)dev;
+ 	int i;
+-	struct wd_board *brd;
+-	unsigned short chksum;
+-	unsigned char c;
++#ifdef INCLUDE_NS8390
++	unsigned short pci_probe_addrs[] = { pci->ioaddr, 0 };
++	unsigned short *probe_addrs = pci_probe_addrs;
++#endif
+ 	eth_vendor = VENDOR_NONE;
+ 	eth_drain_receiver = 0;
+ 
++	nic->irqno  = 0;
++
+ #ifdef	INCLUDE_WD
++{
+ 	/******************************************************************
+ 	Search for WD/SMC cards
+ 	******************************************************************/
++	struct wd_board *brd;
++	unsigned short chksum;
++	unsigned char c;
+ 	for (eth_asic_base = WD_LOW_BASE; eth_asic_base <= WD_HIGH_BASE;
+ 		eth_asic_base += 0x20) {
+ 		chksum = 0;
+@@ -560,6 +651,9 @@
+ 	/* We've found a board */
+ 	eth_vendor = VENDOR_WD;
+ 	eth_nic_base = eth_asic_base + WD_NIC_ADDR;
++
++	nic->ioaddr = eth_nic_base;
++
+ 	c = inb(eth_asic_base+WD_BID);	/* Get board id */
+ 	for (brd = wd_boards; brd->name; brd++)
+ 		if (brd->id == c) break;
+@@ -582,8 +676,9 @@
+ 	} else
+ 		eth_bmem = WD_DEFAULT_MEM;
+ 	if (brd->id == TYPE_SMC8216T || brd->id == TYPE_SMC8216C) {
+-		*((unsigned int *)(eth_bmem + 8192)) = (unsigned int)0;
+-		if (*((unsigned int *)(eth_bmem + 8192))) {
++		/* from Linux driver, 8416BT detects as 8216 sometimes */
++		unsigned int addr = inb(eth_asic_base + 0xb);
++		if (((addr >> 4) & 3) == 0) {
+ 			brd += 2;
+ 			eth_memsize = brd->memsize;
+ 		}
+@@ -592,19 +687,27 @@
+ 	for (i=0; i<ETH_ALEN; i++) {
+ 		nic->node_addr[i] = inb(i+eth_asic_base+WD_LAR);
+ 	}
+-	printf("\n%s base %#hx, memory %#hx, addr %!\n",
+-		brd->name, eth_asic_base, eth_bmem, nic->node_addr);
++	printf("\n%s base %#hx", brd->name, eth_asic_base);
+ 	if (eth_flags & FLAG_790) {
++#ifdef	WD_790_PIO
++		printf(", PIO mode, addr %!\n", nic->node_addr);
++		eth_bmem = 0;
++		eth_flags |= FLAG_PIO;		/* force PIO mode */
++		outb(0, eth_asic_base+WD_MSR);
++#else
++		printf(", memory %#x, addr %!\n", eth_bmem, nic->node_addr);
+ 		outb(WD_MSR_MENB, eth_asic_base+WD_MSR);
+ 		outb((inb(eth_asic_base+0x04) |
+ 			0x80), eth_asic_base+0x04);
+-		outb((((unsigned)eth_bmem >> 13) & 0x0F) |
+-			(((unsigned)eth_bmem >> 11) & 0x40) |
++		outb(((unsigned)(eth_bmem >> 13) & 0x0F) |
++			((unsigned)(eth_bmem >> 11) & 0x40) |
+ 			(inb(eth_asic_base+0x0B) & 0xB0), eth_asic_base+0x0B);
+ 		outb((inb(eth_asic_base+0x04) &
+ 			~0x80), eth_asic_base+0x04);
++#endif
+ 	} else {
+-		outb((((unsigned)eth_bmem >> 13) & 0x3F) | 0x40, eth_asic_base+WD_MSR);
++		printf(", memory %#x, addr %!\n", eth_bmem, nic->node_addr);
++		outb(((unsigned)(eth_bmem >> 13) & 0x3F) | 0x40, eth_asic_base+WD_MSR);
+ 	}
+ 	if (eth_flags & FLAG_16BIT) {
+ 		if (eth_flags & FLAG_790) {
+@@ -624,8 +727,14 @@
+ 		}
+ 		inb(0x84);
+ 	}
++}
+ #endif
+ #ifdef	INCLUDE_3C503
++#ifdef	T503_AUI
++	nic->flags = 1;		/* aui */
++#else
++	nic->flags = 0;		/* no aui */
++#endif
+         /******************************************************************
+         Search for 3Com 3c503 if no WD/SMC cards
+         ******************************************************************/
+@@ -708,11 +817,12 @@
+         /* Get our ethernet address */
+ 
+                 outb(_3COM_CR_EALO | _3COM_CR_XSEL, eth_asic_base + _3COM_CR);
++		nic->ioaddr = eth_nic_base;
+                 printf("\n3Com 3c503 base %#hx, ", eth_nic_base);
+                 if (eth_flags & FLAG_PIO)
+ 			printf("PIO mode");
+                 else
+-			printf("memory %#hx", eth_bmem);
++			printf("memory %#x", eth_bmem);
+                 for (i=0; i<ETH_ALEN; i++) {
+                         nic->node_addr[i] = inb(eth_nic_base+i);
+                 }
+@@ -734,9 +844,9 @@
+          */
+ 
+ 		if (!(eth_flags & FLAG_PIO)) {
+-			memset((char *)eth_bmem, 0, 0x2000);
++			memset(bus_to_virt(eth_bmem), 0, 0x2000);
+ 			for(i = 0; i < 0x2000; ++i)
+-				if (*(((char *)eth_bmem)+i)) {
++				if (*((char *)(bus_to_virt(eth_bmem+i)))) {
+ 					printf ("Failed to clear 3c503 shared mem.\n");
+ 					return (0);
+ 				}
+@@ -749,9 +859,11 @@
+         }
+ #endif
+ #if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390)
++{
+ 	/******************************************************************
+ 	Search for NE1000/2000 if no WD/SMC or 3com cards
+ 	******************************************************************/
++	unsigned char c;
+ 	if (eth_vendor == VENDOR_NONE) {
+ 		char romdata[16], testbuf[32];
+ 		int idx;
+@@ -810,23 +922,94 @@
+ 		for (i=0; i<ETH_ALEN; i++) {
+ 			nic->node_addr[i] = romdata[i + ((eth_flags & FLAG_16BIT) ? i : 0)];
+ 		}
++		nic->ioaddr = eth_nic_base;
+ 		printf("\nNE%c000 base %#hx, addr %!\n",
+ 			(eth_flags & FLAG_16BIT) ? '2' : '1', eth_nic_base,
+ 			nic->node_addr);
+ 	}
++}
+ #endif
+ 	if (eth_vendor == VENDOR_NONE)
+ 		return(0);
+         if (eth_vendor != VENDOR_3COM)
+ 		eth_rmem = eth_bmem;
+ 	ns8390_reset(nic);
+-	nic->reset = ns8390_reset;
+-	nic->poll = ns8390_poll;
++
++	dev->disable  = ns8390_disable; 
++	nic->poll     = ns8390_poll;
+ 	nic->transmit = ns8390_transmit;
+-	nic->disable = ns8390_disable;
+-	return(nic);
++	nic->irq      = ns8390_irq;
++
++        /* Based on PnP ISA map */
++#ifdef	INCLUDE_WD
++        dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
++        dev->devid.device_id = htons(0x812a);
++#endif
++#ifdef	INCLUDE_3C503
++        dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
++        dev->devid.device_id = htons(0x80f3);
++#endif
++#ifdef	INCLUDE_NE
++        dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
++        dev->devid.device_id = htons(0x80d6);
++#endif
++	return 1;
+ }
+ 
++#ifdef	INCLUDE_WD
++static struct isa_driver wd_driver __isa_driver = {
++	.type    = NIC_DRIVER,
++	.name    = "WD",
++	.probe   = wd_probe,
++	.ioaddrs = 0, 
++};
++#endif
++
++#ifdef	INCLUDE_3C503
++static struct isa_driver t503_driver __isa_driver = {
++	.type    = NIC_DRIVER,
++	.name    = "3C503",
++	.probe   = t503_probe,
++	.ioaddrs = 0, 
++};
++#endif
++
++#ifdef	INCLUDE_NE
++static struct isa_driver ne_driver __isa_driver = {
++	.type    = NIC_DRIVER,
++	.name    = "NE*000",
++	.probe   = ne_probe,
++	.ioaddrs = 0, 
++};
++#endif
++
++#ifdef	INCLUDE_NS8390
++static struct pci_id nepci_nics[] = {
++/* A few NE2000 PCI clones, list not exhaustive */
++PCI_ROM(0x10ec, 0x8029, "rtl8029",      "Realtek 8029"),
++PCI_ROM(0x1186, 0x0300, "dlink-528",    "D-Link DE-528"),
++PCI_ROM(0x1050, 0x0940, "winbond940",   "Winbond NE2000-PCI"),		/* Winbond 86C940 / 89C940 */
++PCI_ROM(0x1050, 0x5a5a, "winbond940f",  "Winbond W89c940F"),		/* Winbond 89C940F */
++PCI_ROM(0x11f6, 0x1401, "compexrl2000", "Compex ReadyLink 2000"),
++PCI_ROM(0x8e2e, 0x3000, "ktiet32p2",    "KTI ET32P2"),
++PCI_ROM(0x4a14, 0x5000, "nv5000sc",     "NetVin NV5000SC"),
++PCI_ROM(0x12c3, 0x0058, "holtek80232",  "Holtek HT80232"),
++PCI_ROM(0x12c3, 0x5598, "holtek80229",  "Holtek HT80229"),
++PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34"),
++PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926"),
++};
++
++struct pci_driver nepci_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "NE2000/PCI",
++	.probe    = nepci_probe,
++	.ids      = nepci_nics,
++	.id_count = sizeof(nepci_nics)/sizeof(nepci_nics[0]),
++	.class    = 0,
++};
++
++#endif /* INCLUDE_NS8390 */
++
+ /*
+  * Local variables:
+  *  c-basic-offset: 8
+diff -Naur grub-0.97.orig/netboot/osdep.h grub-0.97/netboot/osdep.h
+--- grub-0.97.orig/netboot/osdep.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/osdep.h	2005-08-31 19:03:35.000000000 +0000
+@@ -1,94 +1,18 @@
+-#ifndef	__OSDEP_H__
+-#define __OSDEP_H__
++#ifndef	_OSDEP_H
++#define _OSDEP_H
+ 
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
++#define __unused __attribute__((unused))
++#define __aligned __attribute__((aligned(16)))
+ 
+-#define	__LITTLE_ENDIAN		/* x86 */
+-
+-/* Taken from /usr/include/linux/hfs_sysdep.h */
+-#if defined(__BIG_ENDIAN)
+-#	if !defined(__constant_htonl)
+-#		define __constant_htonl(x) (x)
+-#	endif
+-#	if !defined(__constant_htons)
+-#		define __constant_htons(x) (x)
+-#	endif
+-#elif defined(__LITTLE_ENDIAN)
+-#	if !defined(__constant_htonl)
+-#		define __constant_htonl(x) \
+-        ((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \
+-                             (((unsigned long int)(x) & 0x0000ff00U) <<  8) | \
+-                             (((unsigned long int)(x) & 0x00ff0000U) >>  8) | \
+-                             (((unsigned long int)(x) & 0xff000000U) >> 24)))
+-#	endif
+-#	if !defined(__constant_htons)
+-#		define __constant_htons(x) \
+-        ((unsigned short int)((((unsigned short int)(x) & 0x00ff) << 8) | \
+-                              (((unsigned short int)(x) & 0xff00) >> 8)))
+-#	endif
+-#else
+-#	error "Don't know if bytes are big- or little-endian!"
+-#endif
+-
+-#define ntohl(x) \
+-(__builtin_constant_p(x) ? \
+- __constant_htonl((x)) : \
+- __swap32(x))
+-#define htonl(x) \
+-(__builtin_constant_p(x) ? \
+- __constant_htonl((x)) : \
+- __swap32(x))
+-#define ntohs(x) \
+-(__builtin_constant_p(x) ? \
+- __constant_htons((x)) : \
+- __swap16(x))
+-#define htons(x) \
+-(__builtin_constant_p(x) ? \
+- __constant_htons((x)) : \
+- __swap16(x))
+-
+-static inline unsigned long int __swap32(unsigned long int x)
+-{
+-	__asm__("xchgb %b0,%h0\n\t"
+-		"rorl $16,%0\n\t"
+-		"xchgb %b0,%h0"
+-		: "=q" (x)
+-		: "0" (x));
+-	return x;
+-}
+-
+-static inline unsigned short int __swap16(unsigned short int x)
+-{
+-	__asm__("xchgb %b0,%h0"
+-		: "=q" (x)
+-		: "0" (x));
+-	return x;
+-}
+-
+-/* Make routines available to all */
+-#define	swap32(x)	__swap32(x)
+-#define	swap16(x)	__swap16(x)
+-
+-#include "linux-asm-io.h"
+-
+-typedef	unsigned long Address;
++#include "io.h"
++#include "byteswap.h"
++#include "latch.h"
+ 
+ /* ANSI prototyping macro */
+ #ifdef	__STDC__
+-#define	P(x)	x
++#  define	P(x)	x
+ #else
+-#define	P(x)	()
++#  define	P(x)	()
+ #endif
+ 
+ #endif
+-
+-/*
+- * Local variables:
+- *  c-basic-offset: 8
+- * End:
+- */
+diff -Naur grub-0.97.orig/netboot/otulip.c grub-0.97/netboot/otulip.c
+--- grub-0.97.orig/netboot/otulip.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/otulip.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,374 +0,0 @@
+-/*
+-  Etherboot DEC Tulip driver
+-  adapted by Ken Yap from
+-
+-  FreeBSD netboot DEC 21143 driver
+-
+-  Author: David Sharp
+-    date: Nov/98
+-
+- Known to work on DEC DE500 using 21143-PC chipset.
+- Even on cards with the same chipset there can be
+- incompatablity problems with the way media selection
+- and status LED settings are done.  See comments below.
+-
+- Some code fragments were taken from verious places,
+- Ken Yap's etherboot, FreeBSD's if_de.c, and various
+- Linux related files.  DEC's manuals for the 21143 and
+- SROM format were very helpful.  The Linux de driver
+- development page has a number of links to useful
+- related information.  Have a look at:
+- ftp://cesdis.gsfc.nasa.gov/pub/linux/drivers/tulip-devel.html
+-
+-*/
+-
+-#include "etherboot.h"
+-#include "nic.h"
+-#include "pci.h"
+-#include "cards.h"
+-#include "otulip.h"
+-
+-static unsigned short vendor, dev_id;
+-static unsigned short ioaddr;
+-static unsigned int *membase;
+-static unsigned char srom[1024];
+-
+-#define BUFLEN 1536     /* must be longword divisable */
+-                        /* buffers must be longword aligned */
+-
+-/* transmit descriptor and buffer */
+-static struct txdesc txd;
+-
+-/* receive descriptor(s) and buffer(s) */
+-#define NRXD 4
+-static struct rxdesc rxd[NRXD];
+-static int rxd_tail = 0;
+-#ifdef	USE_LOWMEM_BUFFER
+-#define rxb ((char *)0x10000 - NRXD * BUFLEN)
+-#define txb ((char *)0x10000 - NRXD * BUFLEN - BUFLEN)
+-#else
+-static unsigned char rxb[NRXD * BUFLEN];
+-static unsigned char txb[BUFLEN];
+-#endif
+-
+-static unsigned char ehdr[ETH_HLEN];    /* buffer for ethernet header */
+-
+-enum tulip_offsets {
+-        CSR0=0,    CSR1=0x08, CSR2=0x10, CSR3=0x18, CSR4=0x20, CSR5=0x28,
+-        CSR6=0x30, CSR7=0x38, CSR8=0x40, CSR9=0x48, CSR10=0x50, CSR11=0x58,
+-        CSR12=0x60, CSR13=0x68, CSR14=0x70, CSR15=0x78 };
+-
+-
+-/***************************************************************************/
+-/* 21143 specific stuff  */
+-/***************************************************************************/
+-
+-/* XXX assume 33MHz PCI bus,  this is not very accurate and should be
+-   used only with gross over estimations of required delay times unless
+-   you tune UADJUST to your specific processor and I/O subsystem */
+-
+-#define UADJUST 870
+-static void udelay(unsigned long usec) {
+-  unsigned long i;
+-  for (i=((usec*UADJUST)/33)+1; i>0; i--) (void) TULIP_CSR_READ(csr_0);
+-}
+-
+-/* The following srom related code was taken from FreeBSD's if_de.c */
+-/* with minor alterations to make it work here.  the Linux code is */
+-/* better but this was easier to use */
+-
+-static void delay_300ns(void)
+-{
+-    int idx;
+-    for (idx = (300 / 33) + 1; idx > 0; idx--)
+-        (void) TULIP_CSR_READ(csr_busmode);
+-}
+-
+-#define EMIT do { TULIP_CSR_WRITE(csr_srom_mii, csr); delay_300ns(); } while (0)
+-
+-static void srom_idle(void)
+-{
+-    unsigned bit, csr;
+-
+-    csr  = SROMSEL ; EMIT;
+-    csr  = SROMSEL | SROMRD; EMIT;
+-    csr ^= SROMCS; EMIT;
+-    csr ^= SROMCLKON; EMIT;
+-    /*
+-     * Write 25 cycles of 0 which will force the SROM to be idle.
+-     */
+-    for (bit = 3 + SROM_BITWIDTH + 16; bit > 0; bit--) {
+-        csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
+-        csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
+-    }
+-    csr ^= SROMCLKOFF; EMIT;
+-    csr ^= SROMCS; EMIT;
+-    csr  = 0; EMIT;
+-}
+-
+-static void srom_read(void)
+-{
+-    unsigned idx;
+-    const unsigned bitwidth = SROM_BITWIDTH;
+-    const unsigned cmdmask = (SROMCMD_RD << bitwidth);
+-    const unsigned msb = 1 << (bitwidth + 3 - 1);
+-    unsigned lastidx = (1 << bitwidth) - 1;
+-
+-    srom_idle();
+-
+-    for (idx = 0; idx <= lastidx; idx++) {
+-        unsigned lastbit, data, bits, bit, csr;
+-        csr  = SROMSEL ;                EMIT;
+-        csr  = SROMSEL | SROMRD;        EMIT;
+-        csr ^= SROMCSON;                EMIT;
+-        csr ^=            SROMCLKON;    EMIT;
+-
+-        lastbit = 0;
+-        for (bits = idx|cmdmask, bit = bitwidth + 3; bit > 0; bit--, bits <<= 1)
+- {
+-            const unsigned thisbit = bits & msb;
+-            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
+-            if (thisbit != lastbit) {
+-                csr ^= SROMDOUT; EMIT;  /* clock low; invert data */
+-            } else {
+-                EMIT;
+-            }
+-            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
+-            lastbit = thisbit;
+-        }
+-        csr ^= SROMCLKOFF; EMIT;
+-
+-        for (data = 0, bits = 0; bits < 16; bits++) {
+-            data <<= 1;
+-            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
+-            data |= TULIP_CSR_READ(csr_srom_mii) & SROMDIN ? 1 : 0;
+-            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
+-        }
+-        srom[idx*2] = data & 0xFF;
+-        srom[idx*2+1] = data >> 8;
+-        csr  = SROMSEL | SROMRD; EMIT;
+-        csr  = 0; EMIT;
+-    }
+-    srom_idle();
+-}
+-
+-/**************************************************************************
+-ETH_RESET - Reset adapter
+-***************************************************************************/
+-static void tulip_reset(struct nic *nic)
+-{
+-        int x,cnt=2;
+-
+-        outl(0x00000001, ioaddr + CSR0);
+-        udelay(1000);
+-        /* turn off reset and set cache align=16lword, burst=unlimit */
+-        outl(0x01A08000, ioaddr + CSR0);
+-
+-	/* for some reason the media selection does not take
+-           the first time se it is repeated.  */
+-
+-        while(cnt--) {
+-        /* stop TX,RX processes */
+-        if (cnt == 1)
+-		outl(0x32404000, ioaddr + CSR6);
+-        else
+-		outl(0x32000040, ioaddr + CSR6);
+-
+-        /* XXX - media selection is vendor specific and hard coded right
+-           here.  This should be fixed to use the hints in the SROM and
+-           allow media selection by the user at runtime.  MII support
+-           should also be added.  Support for chips other than the
+-           21143 should be added here as well  */
+-
+-        /* start  set to 10Mbps half-duplex */
+-
+-        /* setup SIA */
+-        outl(0x0, ioaddr + CSR13);              /* reset SIA */
+-        outl(0x7f3f, ioaddr + CSR14);
+-        outl(0x8000008, ioaddr + CSR15);
+-        outl(0x0, ioaddr + CSR13);
+-        outl(0x1, ioaddr + CSR13);
+-        outl(0x2404000, ioaddr + CSR6);
+-
+-        /* initalize GP */
+-        outl(0x8af0008, ioaddr + CSR15);
+-        outl(0x50008, ioaddr + CSR15);
+-
+-        /* end  set to 10Mbps half-duplex */
+-
+-	if (vendor == PCI_VENDOR_ID_MACRONIX && dev_id == PCI_DEVICE_ID_MX987x5) {
+-		/* do stuff for MX98715 */
+-		outl(0x01a80000, ioaddr + CSR6);
+-		outl(0xFFFFFFFF, ioaddr + CSR14);
+-		outl(0x00001000, ioaddr + CSR12);
+-	}
+-
+-        outl(0x0, ioaddr + CSR7);       /* disable interrupts */
+-
+-        /* construct setup packet which is used by the 21143 to
+-           program its CAM to recognize interesting MAC addresses */
+-
+-        memset(&txd, 0, sizeof(struct txdesc));
+-        txd.buf1addr = &txb[0];
+-        txd.buf2addr = &txb[0];         /* just in case */
+-        txd.buf1sz   = 192;             /* setup packet must be 192 bytes */
+-        txd.buf2sz   = 0;
+-        txd.control  = 0x020;           /* setup packet */
+-        txd.status   = 0x80000000;      /* give ownership to 21143 */
+-
+-        /* construct perfect filter frame */
+-        /* with mac address as first match */
+-        /* and broadcast address for all others */
+-
+-        for(x=0;x<192;x++) txb[x] = 0xff;
+-        txb[0] = nic->node_addr[0];
+-        txb[1] = nic->node_addr[1];
+-        txb[4] = nic->node_addr[2];
+-        txb[5] = nic->node_addr[3];
+-        txb[8] = nic->node_addr[4];
+-        txb[9] = nic->node_addr[5];
+-        outl((unsigned long)&txd, ioaddr + CSR4);        /* set xmit buf */
+-        outl(0x2406000, ioaddr + CSR6);         /* start transmiter */
+-
+-        udelay(50000);  /* wait for the setup packet to be processed */
+-
+-        }
+-
+-        /* setup receive descriptor */
+-        {
+-          int x;
+-          for(x=0;x<NRXD;x++) {
+-            memset(&rxd[x], 0, sizeof(struct rxdesc));
+-            rxd[x].buf1addr = &rxb[x * BUFLEN];
+-            rxd[x].buf2addr = 0;        /* not used */
+-            rxd[x].buf1sz   = BUFLEN;
+-            rxd[x].buf2sz   = 0;        /* not used */
+-            rxd[x].control  = 0x0;
+-            rxd[x].status   = 0x80000000;       /* give ownership it to 21143 */
+-          }
+-          rxd[NRXD - 1].control  = 0x008;       /* Set Receive end of ring on la
+-st descriptor */
+-          rxd_tail = 0;
+-        }
+-
+-        /* tell DC211XX where to find rx descriptor list */
+-        outl((unsigned long)&rxd[0], ioaddr + CSR3);
+-        /* start the receiver */
+-        outl(0x2406002, ioaddr + CSR6);
+-
+-}
+-
+-/**************************************************************************
+-ETH_TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static const char padmap[] = {
+-        0, 3, 2, 1};
+-
+-static void tulip_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p)
+-{
+-        unsigned long time;
+-
+-        /* setup ethernet header */
+-
+-	memcpy(ehdr, d, ETH_ALEN);
+-	memcpy(&ehdr[ETH_ALEN], nic->node_addr, ETH_ALEN);
+-        ehdr[ETH_ALEN*2] = (t >> 8) & 0xff;
+-        ehdr[ETH_ALEN*2+1] = t & 0xff;
+-
+-        /* setup the transmit descriptor */
+-
+-        memset(&txd, 0, sizeof(struct txdesc));
+-
+-        txd.buf1addr = &ehdr[0];        /* ethernet header */
+-        txd.buf1sz   = ETH_HLEN;
+-
+-        txd.buf2addr = p;               /* packet to transmit */
+-        txd.buf2sz   = s;
+-
+-        txd.control  = 0x188;           /* LS+FS+TER */
+-
+-        txd.status   = 0x80000000;      /* give it to 21143 */
+-
+-        outl(inl(ioaddr + CSR6) & ~0x00004000, ioaddr + CSR6);
+-        outl((unsigned long)&txd, ioaddr + CSR4);
+-        outl(inl(ioaddr + CSR6) | 0x00004000, ioaddr + CSR6);
+-
+-/*   Wait for transmit to complete before returning.  not well tested.
+-
+-        time = currticks();
+-        while(txd.status & 0x80000000) {
+-          if (currticks() - time > 20) {
+-            printf("transmit timeout.\n");
+-            break;
+-          }
+-        }
+-*/
+-
+-}
+-
+-/**************************************************************************
+-ETH_POLL - Wait for a frame
+-***************************************************************************/
+-static int tulip_poll(struct nic *nic)
+-{
+-        if (rxd[rxd_tail].status & 0x80000000) return 0;
+-
+-        nic->packetlen = (rxd[rxd_tail].status & 0x3FFF0000) >> 16;
+-
+-        /* copy packet to working buffer */
+-        /* XXX - this copy could be avoided with a little more work
+-           but for now we are content with it because the optimised
+-           memcpy(, , ) is quite fast */
+-
+-        memcpy(nic->packet, rxb + rxd_tail * BUFLEN, nic->packetlen);
+-
+-        /* return the descriptor and buffer to recieve ring */
+-        rxd[rxd_tail].status = 0x80000000;
+-        rxd_tail++;
+-        if (rxd_tail == NRXD) rxd_tail = 0;
+-
+-        return 1;
+-}
+-
+-static void tulip_disable(struct nic *nic)
+-{
+-	/* nothing for the moment */
+-}
+-
+-/**************************************************************************
+-ETH_PROBE - Look for an adapter
+-***************************************************************************/
+-struct nic *otulip_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
+-{
+-        int i;
+-
+-	if (io_addrs == 0 || *io_addrs == 0)
+-		return (0);
+-	vendor = pci->vendor;
+-	dev_id = pci->dev_id;
+-	ioaddr = *io_addrs;
+-	membase = (unsigned int *)pci->membase;
+-
+-        /* wakeup chip */
+-        pcibios_write_config_dword(pci->bus,pci->devfn,0x40,0x00000000);
+-
+-        /* Stop the chip's Tx and Rx processes. */
+-        /* outl(inl(ioaddr + CSR6) & ~0x2002, ioaddr + CSR6); */
+-        /* Clear the missed-packet counter. */
+-        /* (volatile int)inl(ioaddr + CSR8); */
+-
+-        srom_read();
+-
+-	for (i=0; i < ETH_ALEN; i++)
+-		nic->node_addr[i] = srom[20+i];
+-
+-        printf("Tulip %! at ioaddr %#hX\n", nic->node_addr, ioaddr);
+-
+-        tulip_reset(nic);
+-
+-	nic->reset = tulip_reset;
+-	nic->poll = tulip_poll;
+-	nic->transmit = tulip_transmit;
+-	nic->disable = tulip_disable;
+-        return nic;
+-}
+diff -Naur grub-0.97.orig/netboot/otulip.h grub-0.97/netboot/otulip.h
+--- grub-0.97.orig/netboot/otulip.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/otulip.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,76 +0,0 @@
+-/* mostly stolen from FreeBSD if_de.c, if_devar.h */
+-
+-#define TULIP_CSR_READ(csr)		(membase[csr*2])
+-#define CSR_READ(csr)			(membase[csr*2])
+-#define TULIP_CSR_WRITE(csr, val)	(membase[csr*2] = val)
+-#define CSR_WRITE(csr, val)		(membase[csr*2] = val)
+-
+-#define csr_0			0
+-#define csr_1			1
+-#define csr_2			2
+-#define csr_3			3
+-#define csr_4			4
+-#define csr_5			5
+-#define csr_6			6
+-#define csr_7			7
+-#define csr_8			8
+-#define csr_9			9
+-#define csr_10			10
+-#define csr_11			11
+-#define csr_12			12
+-#define csr_13			13
+-#define csr_14			14
+-#define csr_15			15
+-
+-#define csr_busmode		csr_0
+-#define csr_txpoll		csr_1
+-#define csr_rxpoll		csr_2
+-#define csr_rxlist		csr_3
+-#define csr_txlist		csr_4
+-#define csr_status		csr_5
+-#define csr_command		csr_6
+-#define csr_intr		csr_7
+-#define csr_missed_frames	csr_8
+-#define csr_enetrom		csr_9		/* 21040 */
+-#define csr_reserved		csr_10		/* 21040 */
+-#define csr_full_duplex		csr_11		/* 21040 */
+-#define csr_bootrom		csr_10		/* 21041/21140A/?? */
+-#define csr_gp			csr_12		/* 21140* */
+-#define csr_watchdog		csr_15		/* 21140* */
+-#define csr_gp_timer		csr_11		/* 21041/21140* */
+-#define csr_srom_mii		csr_9		/* 21041/21140* */
+-#define csr_sia_status		csr_12		/* 2104x */
+-#define csr_sia_connectivity	csr_13		/* 2104x */
+-#define csr_sia_tx_rx		csr_14		/* 2104x */
+-#define csr_sia_general		csr_15		/* 2104x */
+-
+-#define SROMSEL		0x0800
+-#define SROMCS		0x0001
+-#define SROMCLKON	0x0002
+-#define SROMCLKOFF	0x0002
+-#define SROMRD		0x4000
+-#define SROMWR		0x2000
+-#define SROM_BITWIDTH	6
+-#define SROMCMD_RD	6
+-#define SROMCSON	0x0001
+-#define SROMDOUT	0x0004
+-#define SROMDIN		0x0008
+-
+-
+-struct txdesc {
+-	unsigned long	status;		/* owner, status */
+-	unsigned long	buf1sz:11,	/* size of buffer 1 */
+-			buf2sz:11,	/* size of buffer 2 */
+-			control:10;	/* control bits */
+-	const unsigned char *buf1addr;	/* buffer 1 address */
+-	const unsigned char *buf2addr;	/* buffer 2 address */
+-};
+-
+-struct rxdesc {
+-	unsigned long	status;		/* owner, status */
+-	unsigned long	buf1sz:11,	/* size of buffer 1 */
+-			buf2sz:11,	/* size of buffer 2 */
+-			control:10;	/* control bits */
+-	unsigned char	*buf1addr;	/* buffer 1 address */
+-	unsigned char	*buf2addr;	/* buffer 2 address */
+-};
+diff -Naur grub-0.97.orig/netboot/pci.c grub-0.97/netboot/pci.c
+--- grub-0.97.orig/netboot/pci.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/pci.c	2005-08-31 19:03:35.000000000 +0000
+@@ -1,15 +1,3 @@
+-/*
+-** Support for NE2000 PCI clones added David Monro June 1997
+-** Generalised to other NICs by Ken Yap July 1997
+-**
+-** Most of this is taken from:
+-**
+-** /usr/src/linux/drivers/pci/pci.c
+-** /usr/src/linux/include/linux/pci.h
+-** /usr/src/linux/arch/i386/bios32.c
+-** /usr/src/linux/include/linux/bios32.h
+-** /usr/src/linux/drivers/net/ne.c
+-*/
+ 
+ /*
+  * This program is free software; you can redistribute it and/or
+@@ -18,402 +6,294 @@
+  * your option) any later version.
+  */
+ 
+-#include "etherboot.h"
++#include "grub.h"
+ #include "pci.h"
+ 
+-/*#define	DEBUG	1*/
+-#define DEBUG	0
+-
+-#ifdef	CONFIG_PCI_DIRECT
+-#define  PCIBIOS_SUCCESSFUL                0x00
+-
+-/*
+- * Functions for accessing PCI configuration space with type 1 accesses
+- */
+-
+-#define CONFIG_CMD(bus, device_fn, where)   (0x80000000 | (bus << 16) | (device_fn << 8) | (where & ~3))
+-
+-int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn,
+-			       unsigned int where, unsigned char *value)
++unsigned long virt_offset = 0;
++unsigned long virt_to_phys(volatile const void *virt_addr)
+ {
+-    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
+-    *value = inb(0xCFC + (where&3));
+-    return PCIBIOS_SUCCESSFUL;
++	return ((unsigned long)virt_addr) + virt_offset;
+ }
+ 
+-int pcibios_read_config_word (unsigned int bus,
+-    unsigned int device_fn, unsigned int where, unsigned short *value)
++void *phys_to_virt(unsigned long phys_addr)
+ {
+-    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
+-    *value = inw(0xCFC + (where&2));
+-    return PCIBIOS_SUCCESSFUL;
++	return (void *)(phys_addr - virt_offset);
+ }
+ 
+-int pcibios_read_config_dword (unsigned int bus, unsigned int device_fn,
+-				 unsigned int where, unsigned int *value)
+-{
+-    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
+-    *value = inl(0xCFC);
+-    return PCIBIOS_SUCCESSFUL;
+-}
++#ifdef INCLUDE_3C595
++extern struct pci_driver t595_driver;
++#endif /* INCLUDE_3C595 */
+ 
+-int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn,
+-				 unsigned int where, unsigned char value)
+-{
+-    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
+-    outb(value, 0xCFC + (where&3));
+-    return PCIBIOS_SUCCESSFUL;
+-}
++#ifdef INCLUDE_3C90X
++extern struct pci_driver a3c90x_driver;
++#endif /* INCLUDE_3C90X */
+ 
+-int pcibios_write_config_word (unsigned int bus, unsigned int device_fn,
+-				 unsigned int where, unsigned short value)
+-{
+-    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
+-    outw(value, 0xCFC + (where&2));
+-    return PCIBIOS_SUCCESSFUL;
+-}
++#ifdef INCLUDE_DAVICOM
++extern struct pci_driver davicom_driver;
++#endif /* INCLUDE_DAVICOM */
+ 
+-int pcibios_write_config_dword (unsigned int bus, unsigned int device_fn, unsigned int where, unsigned int value)
+-{
+-    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
+-    outl(value, 0xCFC);
+-    return PCIBIOS_SUCCESSFUL;
+-}
++#ifdef INCLUDE_E1000
++extern struct pci_driver e1000_driver;
++#endif /* INCLUDE_E1000 */
+ 
+-#undef CONFIG_CMD
++#ifdef INCLUDE_EEPRO100
++extern struct pci_driver eepro100_driver;
++#endif /* INCLUDE_EEPRO100 */
+ 
+-#else	 /* CONFIG_PCI_DIRECT  not defined */
++#ifdef INCLUDE_EPIC100
++extern struct pci_driver epic100_driver;
++#endif /* INCLUDE_EPIC100 */
+ 
+-static struct {
+-	unsigned long address;
+-	unsigned short segment;
+-} bios32_indirect = { 0, KERN_CODE_SEG };
+-
+-static long pcibios_entry;
+-static struct {
+-	unsigned long address;
+-	unsigned short segment;
+-} pci_indirect = { 0, KERN_CODE_SEG };
++#ifdef INCLUDE_FORCEDETH
++extern struct pci_driver forcedeth_driver;
++#endif /* INCLUDE_FORCEDETH */
+ 
+-static unsigned long bios32_service(unsigned long service)
+-{
+-	unsigned char return_code;	/* %al */
+-	unsigned long address;		/* %ebx */
+-	unsigned long length;		/* %ecx */
+-	unsigned long entry;		/* %edx */
+-	unsigned long flags;
+-
+-	save_flags(flags);
+-	__asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%edi)"
+-#else
+-		"lcall *(%%edi)"
+-#endif
+-		: "=a" (return_code),
+-		  "=b" (address),
+-		  "=c" (length),
+-		  "=d" (entry)
+-		: "0" (service),
+-		  "1" (0),
+-		  "D" (&bios32_indirect));
+-	restore_flags(flags);
+-
+-	switch (return_code) {
+-		case 0:
+-			return address + entry;
+-		case 0x80:	/* Not present */
+-			printf("bios32_service(%d) : not present\n", service);
+-			return 0;
+-		default: /* Shouldn't happen */
+-			printf("bios32_service(%d) : returned %#X, mail drew@colorado.edu\n",
+-				service, return_code);
+-			return 0;
+-	}
+-}
++#ifdef INCLUDE_NATSEMI
++extern struct pci_driver natsemi_driver;
++#endif /* INCLUDE_NATSEMI */
+ 
+-int pcibios_read_config_byte(unsigned int bus,
+-        unsigned int device_fn, unsigned int where, unsigned char *value)
+-{
+-        unsigned long ret;
+-        unsigned long bx = (bus << 8) | device_fn;
+-        unsigned long flags;
+-
+-        save_flags(flags);
+-        __asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%esi)\n\t"
+-#else
+-		"lcall *(%%esi)\n\t"
+-#endif
+-                "jc 1f\n\t"
+-                "xor %%ah, %%ah\n"
+-                "1:"
+-                : "=c" (*value),
+-                  "=a" (ret)
+-                : "1" (PCIBIOS_READ_CONFIG_BYTE),
+-                  "b" (bx),
+-                  "D" ((long) where),
+-                  "S" (&pci_indirect));
+-        restore_flags(flags);
+-        return (int) (ret & 0xff00) >> 8;
+-}
++#ifdef INCLUDE_NS83820
++extern struct pci_driver ns83820_driver;
++#endif /* INCLUDE_NS83820 */
+ 
+-int pcibios_read_config_word(unsigned int bus,
+-        unsigned int device_fn, unsigned int where, unsigned short *value)
+-{
+-        unsigned long ret;
+-        unsigned long bx = (bus << 8) | device_fn;
+-        unsigned long flags;
+-
+-        save_flags(flags);
+-        __asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%esi)\n\t"
+-#else
+-		"lcall *(%%esi)\n\t"
+-#endif
+-                "jc 1f\n\t"
+-                "xor %%ah, %%ah\n"
+-                "1:"
+-                : "=c" (*value),
+-                  "=a" (ret)
+-                : "1" (PCIBIOS_READ_CONFIG_WORD),
+-                  "b" (bx),
+-                  "D" ((long) where),
+-                  "S" (&pci_indirect));
+-        restore_flags(flags);
+-        return (int) (ret & 0xff00) >> 8;
+-}
++#ifdef INCLUDE_NS8390
++extern struct pci_driver nepci_driver;
++#endif /* INCLUDE_NS8390 */
+ 
+-int pcibios_read_config_dword(unsigned int bus,
+-        unsigned int device_fn, unsigned int where, unsigned int *value)
+-{
+-        unsigned long ret;
+-        unsigned long bx = (bus << 8) | device_fn;
+-        unsigned long flags;
+-
+-        save_flags(flags);
+-        __asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%esi)\n\t"
+-#else
+-		"lcall *(%%esi)\n\t"
+-#endif
+-                "jc 1f\n\t"
+-                "xor %%ah, %%ah\n"
+-                "1:"
+-                : "=c" (*value),
+-                  "=a" (ret)
+-                : "1" (PCIBIOS_READ_CONFIG_DWORD),
+-                  "b" (bx),
+-                  "D" ((long) where),
+-                  "S" (&pci_indirect));
+-        restore_flags(flags);
+-        return (int) (ret & 0xff00) >> 8;
+-}
++#ifdef INCLUDE_PCNET32
++extern struct pci_driver pcnet32_driver;
++#endif /* INCLUDE_PCNET32 */
+ 
+-int pcibios_write_config_byte (unsigned int bus,
+-	unsigned int device_fn, unsigned int where, unsigned char value)
+-{
+-	unsigned long ret;
+-	unsigned long bx = (bus << 8) | device_fn;
+-	unsigned long flags;
+-
+-	save_flags(flags); cli();
+-	__asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%esi)\n\t"
+-#else
+-		"lcall *(%%esi)\n\t"
+-#endif
+-		"jc 1f\n\t"
+-		"xor %%ah, %%ah\n"
+-		"1:"
+-		: "=a" (ret)
+-		: "0" (PCIBIOS_WRITE_CONFIG_BYTE),
+-		  "c" (value),
+-		  "b" (bx),
+-		  "D" ((long) where),
+-		  "S" (&pci_indirect));
+-	restore_flags(flags);
+-	return (int) (ret & 0xff00) >> 8;
+-}
++#ifdef INCLUDE_PNIC
++extern struct pci_driver pnic_driver;
++#endif /* INCLUDE_PNIC */
+ 
+-int pcibios_write_config_word (unsigned int bus,
+-	unsigned int device_fn, unsigned int where, unsigned short value)
+-{
+-	unsigned long ret;
+-	unsigned long bx = (bus << 8) | device_fn;
+-	unsigned long flags;
+-
+-	save_flags(flags); cli();
+-	__asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%esi)\n\t"
+-#else
+-		"lcall *(%%esi)\n\t"
+-#endif
+-		"jc 1f\n\t"
+-		"xor %%ah, %%ah\n"
+-		"1:"
+-		: "=a" (ret)
+-		: "0" (PCIBIOS_WRITE_CONFIG_WORD),
+-		  "c" (value),
+-		  "b" (bx),
+-		  "D" ((long) where),
+-		  "S" (&pci_indirect));
+-	restore_flags(flags);
+-	return (int) (ret & 0xff00) >> 8;
+-}
++#ifdef INCLUDE_RTL8139
++extern struct pci_driver rtl8139_driver;
++#endif /* INCLUDE_RTL8139 */
+ 
+-int pcibios_write_config_dword (unsigned int bus,
+-	unsigned int device_fn, unsigned int where, unsigned int value)
+-{
+-	unsigned long ret;
+-	unsigned long bx = (bus << 8) | device_fn;
+-	unsigned long flags;
+-
+-	save_flags(flags); cli();
+-	__asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-		"lcall (%%esi)\n\t"
+-#else
+-		"lcall *(%%esi)\n\t"
+-#endif
+-		"jc 1f\n\t"
+-		"xor %%ah, %%ah\n"
+-		"1:"
+-		: "=a" (ret)
+-		: "0" (PCIBIOS_WRITE_CONFIG_DWORD),
+-		  "c" (value),
+-		  "b" (bx),
+-		  "D" ((long) where),
+-		  "S" (&pci_indirect));
+-	restore_flags(flags);
+-	return (int) (ret & 0xff00) >> 8;
+-}
++#ifdef INCLUDE_SIS900
++extern struct pci_driver sis900_driver;
++extern struct pci_driver sis_bridge_driver;
++#endif /* INCLUDE_SIS900 */
+ 
+-static void check_pcibios(void)
+-{
+-	unsigned long signature;
+-	unsigned char present_status;
+-	unsigned char major_revision;
+-	unsigned char minor_revision;
+-	unsigned long flags;
+-	int pack;
+-
+-	if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
+-		pci_indirect.address = pcibios_entry;
+-
+-		save_flags(flags);
+-		__asm__(
+-#ifdef ABSOLUTE_WITHOUT_ASTERISK
+-			"lcall (%%edi)\n\t"
+-#else
+-			"lcall *(%%edi)\n\t"
+-#endif
+-			"jc 1f\n\t"
+-			"xor %%ah, %%ah\n"
+-			"1:\tshl $8, %%eax\n\t"
+-			"movw %%bx, %%ax"
+-			: "=d" (signature),
+-			  "=a" (pack)
+-			: "1" (PCIBIOS_PCI_BIOS_PRESENT),
+-			  "D" (&pci_indirect)
+-			: "bx", "cx");
+-		restore_flags(flags);
+-
+-		present_status = (pack >> 16) & 0xff;
+-		major_revision = (pack >> 8) & 0xff;
+-		minor_revision = pack & 0xff;
+-		if (present_status || (signature != PCI_SIGNATURE)) {
+-			printf("ERROR: BIOS32 says PCI BIOS, but no PCI "
+-				"BIOS????\n");
+-			pcibios_entry = 0;
+-		}
+-#if	DEBUG
+-		if (pcibios_entry) {
+-			printf ("pcibios_init : PCI BIOS revision %hhX.%hhX"
+-				" entry at %#X\n", major_revision,
+-				minor_revision, pcibios_entry);
+-		}
+-#endif
+-	}
+-}
++#ifdef INCLUDE_SUNDANCE
++extern struct pci_driver sundance_driver;
++#endif	/* INCLUDE_SUNDANCE */
+ 
+-static void pcibios_init(void)
+-{
+-	union bios32 *check;
+-	unsigned char sum;
+-	int i, length;
+-	unsigned long bios32_entry = 0;
+-
+-	/*
+-	 * Follow the standard procedure for locating the BIOS32 Service
+-	 * directory by scanning the permissible address range from
+-	 * 0xe0000 through 0xfffff for a valid BIOS32 structure.
+-	 *
+-	 */
++#ifdef INCLUDE_TG3
++extern struct pci_driver  tg3_driver;
++#endif /* INCLUDE_TG3 */
++
++#ifdef INCLUDE_TLAN
++extern struct pci_driver tlan_driver;
++#endif /* INCLUDE_TLAN */
++
++#ifdef INCLUDE_TULIP
++extern struct pci_driver tulip_driver;
++#endif /* INCLUDE_TULIP */
++
++#ifdef INCLUDE_UNDI
++extern struct pci_driver undi_driver;
++#endif /* INCLUDE_UNDI */
++
++#ifdef INCLUDE_VIA_RHINE
++extern struct pci_driver rhine_driver;
++#endif/* INCLUDE_VIA_RHINE */
++
++#ifdef INCLUDE_W89C840
++extern struct pci_driver w89c840_driver;
++#endif /* INCLUDE_W89C840 */
++
++#ifdef INCLUDE_R8169
++extern struct pci_driver r8169_driver;
++#endif /* INCLUDE_R8169 */
++
++static const struct pci_driver *pci_drivers[] = {
++
++#ifdef INCLUDE_3C595
++	&t595_driver,
++#endif /* INCLUDE_3C595 */
++
++#ifdef INCLUDE_3C90X
++	&a3c90x_driver,
++#endif /* INCLUDE_3C90X */
++
++#ifdef INCLUDE_DAVICOM
++	&davicom_driver,
++#endif /* INCLUDE_DAVICOM */
++
++#ifdef INCLUDE_E1000
++	&e1000_driver,
++#endif /* INCLUDE_E1000 */
++
++#ifdef INCLUDE_EEPRO100
++	&eepro100_driver,
++#endif /* INCLUDE_EEPRO100 */
++
++#ifdef INCLUDE_EPIC100
++	&epic100_driver,
++#endif /* INCLUDE_EPIC100 */
++
++#ifdef INCLUDE_FORCEDETH
++	&forcedeth_driver,
++#endif /* INCLUDE_FORCEDETH */
++
++#ifdef INCLUDE_NATSEMI
++	&natsemi_driver,
++#endif /* INCLUDE_NATSEMI */
++
++#ifdef INCLUDE_NS83820
++	&ns83820_driver,
++#endif /* INCLUDE_NS83820 */
++
++#ifdef INCLUDE_NS8390
++	&nepci_driver,
++#endif /* INCLUDE_NS8390 */
++
++#ifdef INCLUDE_PCNET32
++	&pcnet32_driver,
++#endif /* INCLUDE_PCNET32 */
++
++#ifdef INCLUDE_PNIC
++	&pnic_driver,
++#endif /* INCLUDE_PNIC */
+ 
+-	for (check = (union bios32 *) 0xe0000; check <= (union bios32 *) 0xffff0; ++check) {
+-		if (check->fields.signature != BIOS32_SIGNATURE)
++#ifdef INCLUDE_RTL8139
++	&rtl8139_driver,
++#endif /* INCLUDE_RTL8139 */
++
++#ifdef INCLUDE_SIS900
++	&sis900_driver,
++	&sis_bridge_driver,
++#endif /* INCLUDE_SIS900 */
++
++#ifdef INCLUDE_SUNDANCE
++	&sundance_driver,
++#endif /* INCLUDE_SUNDANCE */
++
++#ifdef INCLUDE_TG3
++	& tg3_driver,
++#endif /* INCLUDE_TG3 */
++
++#ifdef INCLUDE_TLAN
++	&tlan_driver,
++#endif /* INCLUDE_TLAN */
++
++#ifdef INCLUDE_TULIP
++	& tulip_driver,
++#endif /* INCLUDE_TULIP */
++
++#ifdef INCLUDE_VIA_RHINE
++	&rhine_driver,
++#endif/* INCLUDE_VIA_RHINE */
++
++#ifdef INCLUDE_W89C840
++	&w89c840_driver,
++#endif /* INCLUDE_W89C840 */
++
++#ifdef INCLUDE_R8169
++	&r8169_driver,
++#endif /* INCLUDE_R8169 */
++
++/* We must be the last one */
++#ifdef INCLUDE_UNDI
++	&undi_driver,
++#endif /* INCLUDE_UNDI */
++
++	0
++};
++
++static void scan_drivers(
++	int type, 
++	uint32_t class, uint16_t vendor, uint16_t device,
++	const struct pci_driver *last_driver, struct pci_device *dev)
++{
++	const struct pci_driver *skip_driver = last_driver;
++	/* Assume there is only one match of the correct type */
++	const struct pci_driver *driver;
++	int i, j;
++	
++	for(j = 0; pci_drivers[j] != 0; j++){
++		driver = pci_drivers[j];
++		if (driver->type != type)
+ 			continue;
+-		length = check->fields.length * 16;
+-		if (!length)
++		if (skip_driver) {
++			if (skip_driver == driver) 
++				skip_driver = 0;
+ 			continue;
+-		sum = 0;
+-		for (i = 0; i < length ; ++i)
+-			sum += check->chars[i];
+-		if (sum != 0)
++		}
++		for(i = 0; i < driver->id_count; i++) {
++			if ((vendor == driver->ids[i].vendor) &&
++			    (device == driver->ids[i].dev_id)) {
++				
++				dev->driver = driver;
++				dev->name   = driver->ids[i].name;
++
++				goto out;
++			}
++		}
++	}
++	if (!class) {
++		goto out;
++	}
++	for(j = 0; pci_drivers[j] != 0; j++){
++		driver = pci_drivers[j];
++		if (driver->type != type)
+ 			continue;
+-		if (check->fields.revision != 0) {
+-			printf("pcibios_init : unsupported revision %d at %#X, mail drew@colorado.edu\n",
+-				check->fields.revision, check);
++		if (skip_driver) {
++			if (skip_driver == driver)
++				skip_driver = 0;
+ 			continue;
+ 		}
+-#if	DEBUG
+-		printf("pcibios_init : BIOS32 Service Directory "
+-			"structure at %#X\n", check);
+-#endif
+-		if (!bios32_entry) {
+-			if (check->fields.entry >= 0x100000) {
+-				printf("pcibios_init: entry in high "
+-					"memory, giving up\n");
+-				return;
+-			} else {
+-				bios32_entry = check->fields.entry;
+-#if	DEBUG
+-				printf("pcibios_init : BIOS32 Service Directory"
+-					" entry at %#X\n", bios32_entry);
+-#endif
+-				bios32_indirect.address = bios32_entry;
+-			}
++		if (last_driver == driver)
++			continue;
++		if ((class >> 8) == driver->class) {
++			dev->driver = driver;
++			dev->name   = driver->name;
++			goto out;
+ 		}
+ 	}
+-	if (bios32_entry)
+-		check_pcibios();
++ out:
++	return;
+ }
+-#endif	/* CONFIG_PCI_DIRECT not defined*/
+ 
+-static void scan_bus(struct pci_device *pcidev)
++void scan_pci_bus(int type, struct pci_device *dev)
+ {
+-	unsigned int devfn, l, bus, buses;
++	unsigned int first_bus, first_devfn;
++	const struct pci_driver *first_driver;
++	unsigned int devfn, bus, buses;
+ 	unsigned char hdr_type = 0;
+-	unsigned short vendor, device;
+-	unsigned int membase, ioaddr, romaddr;
+-	int i, reg;
+-	unsigned int pci_ioaddr = 0;
+-
++	uint32_t class;
++	uint16_t vendor, device;
++	uint32_t l, membase, ioaddr, romaddr;
++	int reg;
++
++	EnterFunction("scan_pci_bus");
++	first_bus    = 0;
++	first_devfn  = 0;
++	first_driver = 0;
++	if (dev->driver) {
++		first_driver = dev->driver;
++		first_bus    = dev->bus;
++		first_devfn  = dev->devfn;
++		/* Re read the header type on a restart */
++		pcibios_read_config_byte(first_bus, first_devfn & ~0x7, 
++			PCI_HEADER_TYPE, &hdr_type);
++		dev->driver  = 0;
++		dev->bus     = 0;
++		dev->devfn   = 0;
++	}
++		
+ 	/* Scan all PCI buses, until we find our card.
+-	 * We could be smart only scan the required busses but that
++	 * We could be smart only scan the required buses but that
+ 	 * is error prone, and tricky.
+-	 * By scanning all possible pci busses in order we should find
++	 * By scanning all possible pci buses in order we should find
+ 	 * our card eventually. 
+ 	 */
+ 	buses=256;
+-	for (bus = 0; bus < buses; ++bus) {
+-		for (devfn = 0; devfn < 0xff; ++devfn) {
++	for (bus = first_bus; bus < buses; ++bus) {
++		for (devfn = first_devfn; devfn < 0xff; ++devfn, first_driver = 0) {
+ 			if (PCI_FUNC (devfn) == 0)
+ 				pcibios_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type);
+ 			else if (!(hdr_type & 0x80))	/* not a multi-function device */
+@@ -421,61 +301,90 @@
+ 			pcibios_read_config_dword(bus, devfn, PCI_VENDOR_ID, &l);
+ 			/* some broken boards return 0 if a slot is empty: */
+ 			if (l == 0xffffffff || l == 0x00000000) {
+-				hdr_type = 0;
+ 				continue;
+ 			}
+ 			vendor = l & 0xffff;
+ 			device = (l >> 16) & 0xffff;
+ 
++			pcibios_read_config_dword(bus, devfn, PCI_REVISION, &l);
++			class = (l >> 8) & 0xffffff;
+ #if	DEBUG
+-			printf("bus %hhX, function %hhX, vendor %hX, device %hX\n",
+-				bus, devfn, vendor, device);
++		{
++			int i;
++			printf("%hhx:%hhx.%hhx [%hX/%hX] ---- ",
++				bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
++				vendor, device);
++#if	DEBUG > 1
++			for(i = 0; i < 256; i++) {
++				unsigned char byte;
++				if ((i & 0xf) == 0) {
++					printf("%hhx: ", i);
++				}
++				pcibios_read_config_byte(bus, devfn, i, &byte);
++				printf("%hhx ", byte);
++				if ((i & 0xf) == 0xf) {
++					printf("\n");
++				}
++			}
++#endif
++
++		}
++#endif
++			scan_drivers(type, class, vendor, device, first_driver, dev);
++			if (!dev->driver){
++#if DEBUG
++				printf("No driver fit.\n");
+ #endif
+-			for (i = 0; pcidev[i].vendor != 0; i++) {
+-				if (vendor != pcidev[i].vendor
+-				    || device != pcidev[i].dev_id)
++				continue;
++			}
++#if DEBUG
++			printf("Get Driver:\n");
++#endif
++			dev->devfn = devfn;
++			dev->bus = bus;
++			dev->class = class;
++			dev->vendor = vendor;
++			dev->dev_id = device;
++			
++			
++			/* Get the ROM base address */
++			pcibios_read_config_dword(bus, devfn, 
++				PCI_ROM_ADDRESS, &romaddr);
++			romaddr >>= 10;
++			dev->romaddr = romaddr;
++			
++			/* Get the ``membase'' */
++			pcibios_read_config_dword(bus, devfn,
++				PCI_BASE_ADDRESS_1, &membase);
++			dev->membase = membase;
++				
++			/* Get the ``ioaddr'' */
++			for (reg = PCI_BASE_ADDRESS_0; reg <= PCI_BASE_ADDRESS_5; reg += 4) {
++				pcibios_read_config_dword(bus, devfn, reg, &ioaddr);
++				if ((ioaddr & PCI_BASE_ADDRESS_IO_MASK) == 0 || (ioaddr & PCI_BASE_ADDRESS_SPACE_IO) == 0)
+ 					continue;
+-				pcidev[i].devfn = devfn;
+-				pcidev[i].bus = bus;
+-				for (reg = PCI_BASE_ADDRESS_0; reg <= PCI_BASE_ADDRESS_5; reg += 4) {
+-					pcibios_read_config_dword(bus, devfn, reg, &ioaddr);
+-
+-					if ((ioaddr & PCI_BASE_ADDRESS_IO_MASK) == 0 || (ioaddr & PCI_BASE_ADDRESS_SPACE_IO) == 0)
+-						continue;
+-					/* Strip the I/O address out of the returned value */
+-					ioaddr &= PCI_BASE_ADDRESS_IO_MASK;
+-					/* Get the memory base address */
+-					pcibios_read_config_dword(bus, devfn,
+-						PCI_BASE_ADDRESS_1, &membase);
+-					/* Get the ROM base address */
+-					pcibios_read_config_dword(bus, devfn, PCI_ROM_ADDRESS, &romaddr);
+-					romaddr >>= 10;
+-					printf("Found %s at %#hx, ROM address %#hx\n",
+-						pcidev[i].name, ioaddr, romaddr);
+-					/* Take the first one or the one that matches in boot ROM address */
+-					if (pci_ioaddr == 0 || romaddr == ((unsigned long) rom.rom_segment << 4)) {
+-						pcidev[i].membase = membase;
+-						pcidev[i].ioaddr = ioaddr;
+-						return;
+-					}
+-				}
++				
++				
++				/* Strip the I/O address out of the returned value */
++				ioaddr &= PCI_BASE_ADDRESS_IO_MASK;
++				
++				/* Take the first one or the one that matches in boot ROM address */
++				dev->ioaddr = ioaddr;
+ 			}
++#if DEBUG > 2
++			printf("Found %s ROM address %#hx\n",
++				dev->name, romaddr);
++#endif
++			LeaveFunction("scan_pci_bus");
++			return;
+ 		}
++		first_devfn = 0;
+ 	}
++	first_bus = 0;
++	LeaveFunction("scan_pci_bus");
+ }
+ 
+-void eth_pci_init(struct pci_device *pcidev)
+-{
+-#ifndef	CONFIG_PCI_DIRECT
+-	pcibios_init();
+-	if (!pcibios_entry) {
+-		printf("pci_init: no BIOS32 detected\n");
+-		return;
+-	}
+-#endif
+-	scan_bus(pcidev);
+-	/* return values are in pcidev structures */
+-}
++
+ 
+ /*
+  *	Set device to be a busmaster in case BIOS neglected to do so.
+@@ -489,13 +398,134 @@
+ 	pcibios_read_config_word(p->bus, p->devfn, PCI_COMMAND, &pci_command);
+ 	new_command = pci_command | PCI_COMMAND_MASTER|PCI_COMMAND_IO;
+ 	if (pci_command != new_command) {
+-		printf("The PCI BIOS has not enabled this device!\nUpdating PCI command %hX->%hX. pci_bus %hhX pci_device_fn %hhX\n",
++#if DEBUG > 0
++		printf(
++			"The PCI BIOS has not enabled this device!\n"
++			"Updating PCI command %hX->%hX. pci_bus %hhX pci_device_fn %hhX\n",
+ 			   pci_command, new_command, p->bus, p->devfn);
++#endif
+ 		pcibios_write_config_word(p->bus, p->devfn, PCI_COMMAND, new_command);
+ 	}
+ 	pcibios_read_config_byte(p->bus, p->devfn, PCI_LATENCY_TIMER, &pci_latency);
+ 	if (pci_latency < 32) {
+-		printf("PCI latency timer (CFLT) is unreasonably low at %d. Setting to 32 clocks.\n", pci_latency);
++#if DEBUG > 0
++		printf("PCI latency timer (CFLT) is unreasonably low at %d. Setting to 32 clocks.\n", 
++			pci_latency);
++#endif
+ 		pcibios_write_config_byte(p->bus, p->devfn, PCI_LATENCY_TIMER, 32);
+ 	}
+ }
++
++/*
++ * Find the start of a pci resource.
++ */
++unsigned long pci_bar_start(struct pci_device *dev, unsigned int index)
++{
++	uint32_t lo, hi;
++	unsigned long bar;
++	pci_read_config_dword(dev, index, &lo);
++	if (lo & PCI_BASE_ADDRESS_SPACE_IO) {
++		bar = lo & PCI_BASE_ADDRESS_IO_MASK;
++	} else {
++		bar = 0;
++		if ((lo & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
++			pci_read_config_dword(dev, index + 4, &hi);
++			if (hi) {
++				if (sizeof(unsigned long) > sizeof(uint32_t)) {
++					bar = hi;
++					/* It's REALLY interesting:-) */
++					bar <<=32;
++				}
++				else {
++					printf("Unhandled 64bit BAR\n");
++					return -1UL;
++				}
++			}
++		}
++		bar |= lo & PCI_BASE_ADDRESS_MEM_MASK;
++	}
++	return bar + pcibios_bus_base(dev->bus);
++}
++
++/*
++ * Find the size of a pci resource.
++ */
++unsigned long pci_bar_size(struct pci_device *dev, unsigned int bar)
++{
++	uint32_t start, size;
++	/* Save the original bar */
++	pci_read_config_dword(dev, bar, &start);
++	/* Compute which bits can be set */
++	pci_write_config_dword(dev, bar, ~0);
++	pci_read_config_dword(dev, bar, &size);
++	/* Restore the original size */
++	pci_write_config_dword(dev, bar, start);
++	/* Find the significant bits */
++	if (start & PCI_BASE_ADDRESS_SPACE_IO) {
++		size &= PCI_BASE_ADDRESS_IO_MASK;
++	} else {
++		size &= PCI_BASE_ADDRESS_MEM_MASK;
++	}
++	/* Find the lowest bit set */
++	size = size & ~(size - 1);
++	return size;
++}
++
++/**
++ * pci_find_capability - query for devices' capabilities 
++ * @dev: PCI device to query
++ * @cap: capability code
++ *
++ * Tell if a device supports a given PCI capability.
++ * Returns the address of the requested capability structure within the
++ * device's PCI configuration space or 0 in case the device does not
++ * support it.  Possible values for @cap:
++ *
++ *  %PCI_CAP_ID_PM           Power Management 
++ *
++ *  %PCI_CAP_ID_AGP          Accelerated Graphics Port 
++ *
++ *  %PCI_CAP_ID_VPD          Vital Product Data 
++ *
++ *  %PCI_CAP_ID_SLOTID       Slot Identification 
++ *
++ *  %PCI_CAP_ID_MSI          Message Signalled Interrupts
++ *
++ *  %PCI_CAP_ID_CHSWP        CompactPCI HotSwap 
++ */
++int pci_find_capability(struct pci_device *dev, int cap)
++{
++	uint16_t status;
++	uint8_t pos, id;
++	uint8_t hdr_type;
++	int ttl = 48;
++
++	pci_read_config_word(dev, PCI_STATUS, &status);
++	if (!(status & PCI_STATUS_CAP_LIST))
++		return 0;
++	pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type);
++	switch (hdr_type & 0x7F) {
++	case PCI_HEADER_TYPE_NORMAL:
++	case PCI_HEADER_TYPE_BRIDGE:
++	default:
++		pci_read_config_byte(dev, PCI_CAPABILITY_LIST, &pos);
++		break;
++	case PCI_HEADER_TYPE_CARDBUS:
++		pci_read_config_byte(dev, PCI_CB_CAPABILITY_LIST, &pos);
++		break;
++	}
++	while (ttl-- && pos >= 0x40) {
++		pos &= ~3;
++		pci_read_config_byte(dev, pos + PCI_CAP_LIST_ID, &id);
++#if	DEBUG > 0
++		printf("Capability: %d\n", id);
++#endif
++		if (id == 0xff)
++			break;
++		if (id == cap)
++			return pos;
++		pci_read_config_byte(dev, pos + PCI_CAP_LIST_NEXT, &pos);
++	}
++	return 0;
++}
++
+diff -Naur grub-0.97.orig/netboot/pci.h grub-0.97/netboot/pci.h
+--- grub-0.97.orig/netboot/pci.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/pci.h	2005-08-31 21:31:46.000000000 +0000
+@@ -1,4 +1,4 @@
+-#ifndef	PCI_H
++#if !defined(PCI_H) && defined(CONFIG_PCI)
+ #define PCI_H
+ 
+ /*
+@@ -21,10 +21,19 @@
+  * your option) any later version.
+  */
+ 
++#include "pci_ids.h"
++
+ #define PCI_COMMAND_IO			0x1	/* Enable response in I/O space */
+ #define PCI_COMMAND_MEM			0x2	/* Enable response in mem space */
+ #define PCI_COMMAND_MASTER		0x4	/* Enable bus mastering */
+ #define PCI_LATENCY_TIMER		0x0d	/* 8 bits */
++#define PCI_COMMAND_SPECIAL		0x8	/* Enable response to special cycles */
++#define PCI_COMMAND_INVALIDATE		0x10	/* Use memory write and invalidate */
++#define  PCI_COMMAND_VGA_PALETTE 0x20	/* Enable palette snooping */
++#define  PCI_COMMAND_PARITY	0x40	/* Enable parity checking */
++#define  PCI_COMMAND_WAIT 	0x80	/* Enable address/data stepping */
++#define  PCI_COMMAND_SERR	0x100	/* Enable SERR */
++#define  PCI_COMMAND_FAST_BACK	0x200	/* Enable back-to-back writes */
+ 
+ #define PCIBIOS_PCI_FUNCTION_ID         0xb1XX
+ #define PCIBIOS_PCI_BIOS_PRESENT        0xb101
+@@ -42,10 +51,37 @@
+ #define PCI_DEVICE_ID           0x02    /* 16 bits */
+ #define PCI_COMMAND             0x04    /* 16 bits */
+ 
++#define PCI_STATUS		0x06	/* 16 bits */
++#define  PCI_STATUS_CAP_LIST	0x10	/* Support Capability List */
++#define  PCI_STATUS_66MHZ	0x20	/* Support 66 Mhz PCI 2.1 bus */
++#define  PCI_STATUS_UDF		0x40	/* Support User Definable Features [obsolete] */
++#define  PCI_STATUS_FAST_BACK	0x80	/* Accept fast-back to back */
++#define  PCI_STATUS_PARITY	0x100	/* Detected parity error */
++#define  PCI_STATUS_DEVSEL_MASK	0x600	/* DEVSEL timing */
++#define  PCI_STATUS_DEVSEL_FAST	0x000	
++#define  PCI_STATUS_DEVSEL_MEDIUM 0x200
++#define  PCI_STATUS_DEVSEL_SLOW 0x400
++#define  PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
++#define  PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
++#define  PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
++#define  PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
++#define  PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
++
+ #define PCI_REVISION            0x08    /* 8 bits  */
++#define PCI_REVISION_ID         0x08    /* 8 bits  */
++#define PCI_CLASS_REVISION      0x08    /* 32 bits  */
+ #define PCI_CLASS_CODE          0x0b    /* 8 bits */
+ #define PCI_SUBCLASS_CODE       0x0a    /* 8 bits */
+ #define PCI_HEADER_TYPE         0x0e    /* 8 bits */
++#define  PCI_HEADER_TYPE_NORMAL	0
++#define  PCI_HEADER_TYPE_BRIDGE 1
++#define  PCI_HEADER_TYPE_CARDBUS 2
++
++
++/* Header type 0 (normal devices) */
++#define PCI_CARDBUS_CIS		0x28
++#define PCI_SUBSYSTEM_VENDOR_ID	0x2c
++#define PCI_SUBSYSTEM_ID	0x2e  
+ 
+ #define PCI_BASE_ADDRESS_0      0x10    /* 32 bits */
+ #define PCI_BASE_ADDRESS_1      0x14    /* 32 bits */
+@@ -54,15 +90,155 @@
+ #define PCI_BASE_ADDRESS_4      0x20    /* 32 bits */
+ #define PCI_BASE_ADDRESS_5      0x24    /* 32 bits */
+ 
++#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
++#define PCI_BASE_ADDRESS_MEM_TYPE_32	0x00	/* 32 bit address */
++#define PCI_BASE_ADDRESS_MEM_TYPE_1M	0x02	/* Below 1M [obsolete] */
++#define PCI_BASE_ADDRESS_MEM_TYPE_64	0x04	/* 64 bit address */
++
+ #ifndef	PCI_BASE_ADDRESS_IO_MASK
+ #define	PCI_BASE_ADDRESS_IO_MASK       (~0x03)
+ #endif
++#ifndef	PCI_BASE_ADDRESS_MEM_MASK
++#define	PCI_BASE_ADDRESS_MEM_MASK       (~0x0f)
++#endif
+ #define	PCI_BASE_ADDRESS_SPACE_IO	0x01
+ #define	PCI_ROM_ADDRESS		0x30	/* 32 bits */
+ #define	PCI_ROM_ADDRESS_ENABLE	0x01	/* Write 1 to enable ROM,
+ 					   bits 31..11 are address,
+ 					   10..2 are reserved */
+ 
++#define PCI_CAPABILITY_LIST	0x34	/* Offset of first capability list entry */
++
++#define PCI_INTERRUPT_LINE	0x3c	/* IRQ number (0-15) */
++#define PCI_INTERRUPT_PIN	0x3d	/* IRQ pin on PCI bus (A-D) */
++
++/* Header type 1 (PCI-to-PCI bridges) */
++#define PCI_PRIMARY_BUS		0x18	/* Primary bus number */
++#define PCI_SECONDARY_BUS	0x19	/* Secondary bus number */
++#define PCI_SUBORDINATE_BUS	0x1a	/* Highest bus number behind the bridge */
++#define PCI_SEC_LATENCY_TIMER	0x1b	/* Latency timer for secondary interface */
++#define PCI_IO_BASE		0x1c	/* I/O range behind the bridge */
++#define PCI_IO_LIMIT		0x1d
++#define  PCI_IO_RANGE_TYPE_MASK	0x0f	/* I/O bridging type */
++#define  PCI_IO_RANGE_TYPE_16	0x00
++#define  PCI_IO_RANGE_TYPE_32	0x01
++#define  PCI_IO_RANGE_MASK	~0x0f
++#define PCI_SEC_STATUS		0x1e	/* Secondary status register, only bit 14 used */
++#define PCI_MEMORY_BASE		0x20	/* Memory range behind */
++#define PCI_MEMORY_LIMIT	0x22
++#define  PCI_MEMORY_RANGE_TYPE_MASK 0x0f
++#define  PCI_MEMORY_RANGE_MASK	~0x0f
++#define PCI_PREF_MEMORY_BASE	0x24	/* Prefetchable memory range behind */
++#define PCI_PREF_MEMORY_LIMIT	0x26
++#define  PCI_PREF_RANGE_TYPE_MASK 0x0f
++#define  PCI_PREF_RANGE_TYPE_32	0x00
++#define  PCI_PREF_RANGE_TYPE_64	0x01
++#define  PCI_PREF_RANGE_MASK	~0x0f
++#define PCI_PREF_BASE_UPPER32	0x28	/* Upper half of prefetchable memory range */
++#define PCI_PREF_LIMIT_UPPER32	0x2c
++#define PCI_IO_BASE_UPPER16	0x30	/* Upper half of I/O addresses */
++#define PCI_IO_LIMIT_UPPER16	0x32
++/* 0x34 same as for htype 0 */
++/* 0x35-0x3b is reserved */
++#define PCI_ROM_ADDRESS1	0x38	/* Same as PCI_ROM_ADDRESS, but for htype 1 */
++/* 0x3c-0x3d are same as for htype 0 */
++#define PCI_BRIDGE_CONTROL	0x3e
++#define  PCI_BRIDGE_CTL_PARITY	0x01	/* Enable parity detection on secondary interface */
++#define  PCI_BRIDGE_CTL_SERR	0x02	/* The same for SERR forwarding */
++#define  PCI_BRIDGE_CTL_NO_ISA	0x04	/* Disable bridging of ISA ports */
++#define  PCI_BRIDGE_CTL_VGA	0x08	/* Forward VGA addresses */
++#define  PCI_BRIDGE_CTL_MASTER_ABORT 0x20  /* Report master aborts */
++#define  PCI_BRIDGE_CTL_BUS_RESET 0x40	/* Secondary bus reset */
++#define  PCI_BRIDGE_CTL_FAST_BACK 0x80	/* Fast Back2Back enabled on secondary interface */
++
++#define PCI_CB_CAPABILITY_LIST	0x14
++
++/* Capability lists */
++
++#define PCI_CAP_LIST_ID		0	/* Capability ID */
++#define  PCI_CAP_ID_PM		0x01	/* Power Management */
++#define  PCI_CAP_ID_AGP		0x02	/* Accelerated Graphics Port */
++#define  PCI_CAP_ID_VPD		0x03	/* Vital Product Data */
++#define  PCI_CAP_ID_SLOTID	0x04	/* Slot Identification */
++#define  PCI_CAP_ID_MSI		0x05	/* Message Signalled Interrupts */
++#define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
++#define PCI_CAP_LIST_NEXT	1	/* Next capability in the list */
++#define PCI_CAP_FLAGS		2	/* Capability defined flags (16 bits) */
++#define PCI_CAP_SIZEOF		4
++
++/* Power Management Registers */
++
++#define PCI_PM_PMC              2       /* PM Capabilities Register */
++#define  PCI_PM_CAP_VER_MASK	0x0007	/* Version */
++#define  PCI_PM_CAP_PME_CLOCK	0x0008	/* PME clock required */
++#define  PCI_PM_CAP_RESERVED    0x0010  /* Reserved field */
++#define  PCI_PM_CAP_DSI		0x0020	/* Device specific initialization */
++#define  PCI_PM_CAP_AUX_POWER	0x01C0	/* Auxilliary power support mask */
++#define  PCI_PM_CAP_D1		0x0200	/* D1 power state support */
++#define  PCI_PM_CAP_D2		0x0400	/* D2 power state support */
++#define  PCI_PM_CAP_PME		0x0800	/* PME pin supported */
++#define  PCI_PM_CAP_PME_MASK    0xF800  /* PME Mask of all supported states */
++#define  PCI_PM_CAP_PME_D0      0x0800  /* PME# from D0 */
++#define  PCI_PM_CAP_PME_D1      0x1000  /* PME# from D1 */
++#define  PCI_PM_CAP_PME_D2      0x2000  /* PME# from D2 */
++#define  PCI_PM_CAP_PME_D3      0x4000  /* PME# from D3 (hot) */
++#define  PCI_PM_CAP_PME_D3cold  0x8000  /* PME# from D3 (cold) */
++#define PCI_PM_CTRL		4	/* PM control and status register */
++#define  PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
++#define  PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
++#define  PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
++#define  PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */
++#define  PCI_PM_CTRL_PME_STATUS	0x8000	/* PME pin status */
++#define PCI_PM_PPB_EXTENSIONS	6	/* PPB support extensions (??) */
++#define  PCI_PM_PPB_B2_B3	0x40	/* Stop clock when in D3hot (??) */
++#define  PCI_PM_BPCC_ENABLE	0x80	/* Bus power/clock control enable (??) */
++#define PCI_PM_DATA_REGISTER	7	/* (??) */
++#define PCI_PM_SIZEOF		8
++
++/* AGP registers */
++
++#define PCI_AGP_VERSION		2	/* BCD version number */
++#define PCI_AGP_RFU		3	/* Rest of capability flags */
++#define PCI_AGP_STATUS		4	/* Status register */
++#define  PCI_AGP_STATUS_RQ_MASK	0xff000000	/* Maximum number of requests - 1 */
++#define  PCI_AGP_STATUS_SBA	0x0200	/* Sideband addressing supported */
++#define  PCI_AGP_STATUS_64BIT	0x0020	/* 64-bit addressing supported */
++#define  PCI_AGP_STATUS_FW	0x0010	/* FW transfers supported */
++#define  PCI_AGP_STATUS_RATE4	0x0004	/* 4x transfer rate supported */
++#define  PCI_AGP_STATUS_RATE2	0x0002	/* 2x transfer rate supported */
++#define  PCI_AGP_STATUS_RATE1	0x0001	/* 1x transfer rate supported */
++#define PCI_AGP_COMMAND		8	/* Control register */
++#define  PCI_AGP_COMMAND_RQ_MASK 0xff000000  /* Master: Maximum number of requests */
++#define  PCI_AGP_COMMAND_SBA	0x0200	/* Sideband addressing enabled */
++#define  PCI_AGP_COMMAND_AGP	0x0100	/* Allow processing of AGP transactions */
++#define  PCI_AGP_COMMAND_64BIT	0x0020 	/* Allow processing of 64-bit addresses */
++#define  PCI_AGP_COMMAND_FW	0x0010 	/* Force FW transfers */
++#define  PCI_AGP_COMMAND_RATE4	0x0004	/* Use 4x rate */
++#define  PCI_AGP_COMMAND_RATE2	0x0002	/* Use 2x rate */
++#define  PCI_AGP_COMMAND_RATE1	0x0001	/* Use 1x rate */
++#define PCI_AGP_SIZEOF		12
++
++/* Slot Identification */
++
++#define PCI_SID_ESR		2	/* Expansion Slot Register */
++#define  PCI_SID_ESR_NSLOTS	0x1f	/* Number of expansion slots available */
++#define  PCI_SID_ESR_FIC	0x20	/* First In Chassis Flag */
++#define PCI_SID_CHASSIS_NR	3	/* Chassis Number */
++
++/* Message Signalled Interrupts registers */
++
++#define PCI_MSI_FLAGS		2	/* Various flags */
++#define  PCI_MSI_FLAGS_64BIT	0x80	/* 64-bit addresses allowed */
++#define  PCI_MSI_FLAGS_QSIZE	0x70	/* Message queue size configured */
++#define  PCI_MSI_FLAGS_QMASK	0x0e	/* Maximum queue size available */
++#define  PCI_MSI_FLAGS_ENABLE	0x01	/* MSI feature enabled */
++#define PCI_MSI_RFU		3	/* Rest of capability flags */
++#define PCI_MSI_ADDRESS_LO	4	/* Lower 32 bits */
++#define PCI_MSI_ADDRESS_HI	8	/* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */
++#define PCI_MSI_DATA_32		8	/* 16 bits of data for 32-bit devices */
++#define PCI_MSI_DATA_64		12	/* 16 bits of data for 64-bit devices */
++
++#define PCI_SLOT(devfn)		  ((devfn) >> 3)
+ #define PCI_FUNC(devfn)           ((devfn) & 0x07)
+ 
+ #define BIOS32_SIGNATURE        (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
+@@ -85,108 +261,97 @@
+ 	char chars[16];
+ };
+ 
+-#define KERN_CODE_SEG	0x8	/* This _MUST_ match start.S */
+-
+-/* Stuff for asm */
+-#define save_flags(x) \
+-__asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */ :"memory")
+-
+-#define cli() __asm__ __volatile__ ("cli": : :"memory")
+-
+-#define restore_flags(x) \
+-__asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
+-
+-#define PCI_VENDOR_ID_ADMTEK            0x1317
+-#define PCI_DEVICE_ID_ADMTEK_0985       0x0985
+-#define PCI_VENDOR_ID_REALTEK           0x10ec
+-#define PCI_DEVICE_ID_REALTEK_8029      0x8029
+-#define PCI_DEVICE_ID_REALTEK_8139      0x8139
+-#define PCI_VENDOR_ID_WINBOND2          0x1050
+-#define PCI_DEVICE_ID_WINBOND2_89C940   0x0940
+-#define PCI_DEVICE_ID_WINBOND2_89C840   0x0840
+-#define PCI_VENDOR_ID_COMPEX            0x11f6
+-#define PCI_DEVICE_ID_COMPEX_RL2000     0x1401
+-#define PCI_DEVICE_ID_COMPEX_RL100ATX   0x2011
+-#define PCI_VENDOR_ID_KTI               0x8e2e
+-#define PCI_DEVICE_ID_KTI_ET32P2        0x3000
+-#define PCI_VENDOR_ID_NETVIN            0x4a14
+-#define PCI_DEVICE_ID_NETVIN_NV5000SC   0x5000
+-#define	PCI_VENDOR_ID_HOLTEK		0x12c3
+-#define	PCI_DEVICE_ID_HOLTEK_HT80232	0x0058
+-#define PCI_VENDOR_ID_3COM		0x10b7
+-#define PCI_DEVICE_ID_3COM_3C590	0x5900
+-#define PCI_DEVICE_ID_3COM_3C595	0x5950
+-#define PCI_DEVICE_ID_3COM_3C595_1	0x5951
+-#define PCI_DEVICE_ID_3COM_3C595_2	0x5952
+-#define PCI_DEVICE_ID_3COM_3C900TPO	0x9000
+-#define PCI_DEVICE_ID_3COM_3C900COMBO	0x9001
+-#define PCI_DEVICE_ID_3COM_3C905TX	0x9050
+-#define PCI_DEVICE_ID_3COM_3C905T4	0x9051
+-#define PCI_DEVICE_ID_3COM_3C905B_TX	0x9055
+-#define PCI_DEVICE_ID_3COM_3C905C_TXM	0x9200
+-#define PCI_VENDOR_ID_INTEL		0x8086
+-#define PCI_DEVICE_ID_INTEL_82557	0x1229
+-#define PCI_DEVICE_ID_INTEL_82559ER	0x1209
+-#define PCI_DEVICE_ID_INTEL_ID1029	0x1029
+-#define PCI_DEVICE_ID_INTEL_ID1030	0x1030
+-#define PCI_DEVICE_ID_INTEL_82562	0x2449
+-#define PCI_VENDOR_ID_AMD		0x1022
+-#define PCI_DEVICE_ID_AMD_LANCE		0x2000
+-#define PCI_VENDOR_ID_AMD_HOMEPNA	0x1022
+-#define PCI_DEVICE_ID_AMD_HOMEPNA	0x2001
+-#define PCI_VENDOR_ID_SMC_1211          0x1113
+-#define PCI_DEVICE_ID_SMC_1211          0x1211
+-#define PCI_VENDOR_ID_DEC		0x1011
+-#define PCI_DEVICE_ID_DEC_TULIP		0x0002
+-#define PCI_DEVICE_ID_DEC_TULIP_FAST	0x0009
+-#define PCI_DEVICE_ID_DEC_TULIP_PLUS	0x0014
+-#define PCI_DEVICE_ID_DEC_21142		0x0019
+-#define PCI_VENDOR_ID_SMC		0x10B8
+-#ifndef	PCI_DEVICE_ID_SMC_EPIC100
+-# define PCI_DEVICE_ID_SMC_EPIC100	0x0005
+-#endif
+-#define PCI_VENDOR_ID_MACRONIX		0x10d9
+-#define PCI_DEVICE_ID_MX987x5		0x0531
+-#define PCI_VENDOR_ID_LINKSYS		0x11AD
+-#define PCI_DEVICE_ID_LC82C115		0xC115
+-#define PCI_VENDOR_ID_VIATEC		0x1106
+-#define PCI_DEVICE_ID_VIA_RHINE_I	0x3043
+-#define PCI_DEVICE_ID_VIA_VT6102	0x3065
+-#define PCI_DEVICE_ID_VIA_86C100A	0x6100
+-#define PCI_VENDOR_ID_DAVICOM		0x1282
+-#define	PCI_DEVICE_ID_DM9009		0x9009
+-#define PCI_DEVICE_ID_DM9102		0x9102
+-#define PCI_VENDOR_ID_SIS         	0x1039
+-#define PCI_DEVICE_ID_SIS900     	0x0900   
+-#define PCI_DEVICE_ID_SIS7016    	0x7016  
+-#define	PCI_VENDOR_ID_DLINK		0x1186
+-#define	PCI_DEVICE_ID_DFE530TXP		0x1300
+-#define	PCI_VENDOR_ID_NS		0x100B
+-#define	PCI_DEVICE_ID_DP83815		0x0020
+-#define PCI_VENDOR_ID_OLICOM		0x108d
+-#define PCI_DEVICE_ID_OLICOM_OC3136	0x0001
+-#define PCI_DEVICE_ID_OLICOM_OC2315	0x0011
+-#define PCI_DEVICE_ID_OLICOM_OC2325	0x0012
+-#define PCI_DEVICE_ID_OLICOM_OC2183	0x0013
+-#define PCI_DEVICE_ID_OLICOM_OC2326	0x0014
+-#define PCI_DEVICE_ID_OLICOM_OC6151	0x0021
++struct pci_device;
++struct dev;
++typedef int (*pci_probe_t)(struct dev *, struct pci_device *);
+ 
+ struct pci_device {
+-	unsigned short	vendor, dev_id;
+-	const char	*name;
+-	unsigned int	membase;
+-	unsigned short	ioaddr;
+-	unsigned char	devfn;
+-	unsigned char	bus;
++	uint32_t		class;
++	uint16_t		vendor, dev_id;
++	const char		*name;
++	/* membase and ioaddr are silly and depricated */
++	unsigned int		membase;
++	unsigned int		ioaddr;
++	unsigned int		romaddr;
++	unsigned char		irq;
++	unsigned char		devfn;
++	unsigned char		bus;
++	unsigned char		use_specified;
++	const struct pci_driver	*driver;
++};
++
++extern void scan_pci_bus(int type, struct pci_device *dev);
++extern void find_pci(int type, struct pci_device *dev);
++
++extern int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn, unsigned int where, uint8_t *value);
++extern int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn, unsigned int where, uint8_t value);
++extern int pcibios_read_config_word(unsigned int bus, unsigned int device_fn, unsigned int where, uint16_t *value);
++extern int pcibios_write_config_word (unsigned int bus, unsigned int device_fn, unsigned int where, uint16_t value);
++extern int pcibios_read_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, uint32_t *value);
++extern int pcibios_write_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, uint32_t value);
++extern unsigned long pcibios_bus_base(unsigned int bus);
++extern void adjust_pci_device(struct pci_device *p);
++
++
++static inline int 
++pci_read_config_byte(struct pci_device *dev, unsigned int where, uint8_t *value)
++{
++	return pcibios_read_config_byte(dev->bus, dev->devfn, where, value);
++}
++static inline int 
++pci_write_config_byte(struct pci_device *dev, unsigned int where, uint8_t value)
++{
++	return pcibios_write_config_byte(dev->bus, dev->devfn, where, value);
++}
++static inline int 
++pci_read_config_word(struct pci_device *dev, unsigned int where, uint16_t *value)
++{
++	return pcibios_read_config_word(dev->bus, dev->devfn, where, value);
++}
++static inline int 
++pci_write_config_word(struct pci_device *dev, unsigned int where, uint16_t value)
++{
++	return pcibios_write_config_word(dev->bus, dev->devfn, where, value);
++}
++static inline int 
++pci_read_config_dword(struct pci_device *dev, unsigned int where, uint32_t *value)
++{
++	return pcibios_read_config_dword(dev->bus, dev->devfn, where, value);
++}
++static inline int 
++pci_write_config_dword(struct pci_device *dev, unsigned int where, uint32_t value)
++{
++	return pcibios_write_config_dword(dev->bus, dev->devfn, where, value);
++}
++
++/* Helper functions to find the size of a pci bar */
++extern unsigned long pci_bar_start(struct pci_device *dev, unsigned int bar);
++extern unsigned long pci_bar_size(struct pci_device *dev, unsigned int bar);
++/* Helper function to find pci capabilities */
++extern int pci_find_capability(struct pci_device *dev, int cap);
++struct pci_id {
++	unsigned short vendor, dev_id;
++	const char *name;
++};
++
++struct dev;
++/* Most pci drivers will use this */
++struct pci_driver {
++	int type;
++	const char *name;
++	pci_probe_t probe;
++	struct pci_id *ids;
++	int id_count;
++
++/* On a few occasions the hardware is standardized enough that
++ * we only need to know the class of the device and not the exact
++ * type to drive the device correctly.  If this is the case
++ * set a class value other than 0.
++ */
++	unsigned short class;
+ };
+ 
+-extern void	eth_pci_init(struct pci_device *);
++#define PCI_ROM(VENDOR_ID, DEVICE_ID, IMAGE, DESCRIPTION) \
++	{ VENDOR_ID, DEVICE_ID, IMAGE, }
+ 
+-extern int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned char *value);
+-extern int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn, unsigned int where, unsigned char value);
+-extern int pcibios_read_config_word(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned short *value);
+-extern int pcibios_write_config_word (unsigned int bus, unsigned int device_fn, unsigned int where, unsigned short value);
+-extern int pcibios_read_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned int *value);
+-extern int pcibios_write_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned int value);
+-void adjust_pci_device(struct pci_device *p);
+ #endif	/* PCI_H */
+diff -Naur grub-0.97.orig/netboot/pci_ids.h grub-0.97/netboot/pci_ids.h
+--- grub-0.97.orig/netboot/pci_ids.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pci_ids.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,1809 @@
++/*
++ *	PCI Class, Vendor and Device IDs
++ *
++ *	Please keep sorted.
++ */
++
++/* Device classes and subclasses */
++
++#define PCI_CLASS_NOT_DEFINED		0x0000
++#define PCI_CLASS_NOT_DEFINED_VGA	0x0001
++
++#define PCI_BASE_CLASS_STORAGE		0x01
++#define PCI_CLASS_STORAGE_SCSI		0x0100
++#define PCI_CLASS_STORAGE_IDE		0x0101
++#define PCI_CLASS_STORAGE_FLOPPY	0x0102
++#define PCI_CLASS_STORAGE_IPI		0x0103
++#define PCI_CLASS_STORAGE_RAID		0x0104
++#define PCI_CLASS_STORAGE_OTHER		0x0180
++
++#define PCI_BASE_CLASS_NETWORK		0x02
++#define PCI_CLASS_NETWORK_ETHERNET	0x0200
++#define PCI_CLASS_NETWORK_TOKEN_RING	0x0201
++#define PCI_CLASS_NETWORK_FDDI		0x0202
++#define PCI_CLASS_NETWORK_ATM		0x0203
++#define PCI_CLASS_NETWORK_OTHER		0x0280
++
++#define PCI_BASE_CLASS_DISPLAY		0x03
++#define PCI_CLASS_DISPLAY_VGA		0x0300
++#define PCI_CLASS_DISPLAY_XGA		0x0301
++#define PCI_CLASS_DISPLAY_3D		0x0302
++#define PCI_CLASS_DISPLAY_OTHER		0x0380
++
++#define PCI_BASE_CLASS_MULTIMEDIA	0x04
++#define PCI_CLASS_MULTIMEDIA_VIDEO	0x0400
++#define PCI_CLASS_MULTIMEDIA_AUDIO	0x0401
++#define PCI_CLASS_MULTIMEDIA_PHONE	0x0402
++#define PCI_CLASS_MULTIMEDIA_OTHER	0x0480
++
++#define PCI_BASE_CLASS_MEMORY		0x05
++#define PCI_CLASS_MEMORY_RAM		0x0500
++#define PCI_CLASS_MEMORY_FLASH		0x0501
++#define PCI_CLASS_MEMORY_OTHER		0x0580
++
++#define PCI_BASE_CLASS_BRIDGE		0x06
++#define PCI_CLASS_BRIDGE_HOST		0x0600
++#define PCI_CLASS_BRIDGE_ISA		0x0601
++#define PCI_CLASS_BRIDGE_EISA		0x0602
++#define PCI_CLASS_BRIDGE_MC		0x0603
++#define PCI_CLASS_BRIDGE_PCI		0x0604
++#define PCI_CLASS_BRIDGE_PCMCIA		0x0605
++#define PCI_CLASS_BRIDGE_NUBUS		0x0606
++#define PCI_CLASS_BRIDGE_CARDBUS	0x0607
++#define PCI_CLASS_BRIDGE_RACEWAY	0x0608
++#define PCI_CLASS_BRIDGE_OTHER		0x0680
++
++#define PCI_BASE_CLASS_COMMUNICATION	0x07
++#define PCI_CLASS_COMMUNICATION_SERIAL	0x0700
++#define PCI_CLASS_COMMUNICATION_PARALLEL 0x0701
++#define PCI_CLASS_COMMUNICATION_MULTISERIAL 0x0702
++#define PCI_CLASS_COMMUNICATION_MODEM	0x0703
++#define PCI_CLASS_COMMUNICATION_OTHER	0x0780
++
++#define PCI_BASE_CLASS_SYSTEM		0x08
++#define PCI_CLASS_SYSTEM_PIC		0x0800
++#define PCI_CLASS_SYSTEM_DMA		0x0801
++#define PCI_CLASS_SYSTEM_TIMER		0x0802
++#define PCI_CLASS_SYSTEM_RTC		0x0803
++#define PCI_CLASS_SYSTEM_PCI_HOTPLUG	0x0804
++#define PCI_CLASS_SYSTEM_OTHER		0x0880
++
++#define PCI_BASE_CLASS_INPUT		0x09
++#define PCI_CLASS_INPUT_KEYBOARD	0x0900
++#define PCI_CLASS_INPUT_PEN		0x0901
++#define PCI_CLASS_INPUT_MOUSE		0x0902
++#define PCI_CLASS_INPUT_SCANNER		0x0903
++#define PCI_CLASS_INPUT_GAMEPORT	0x0904
++#define PCI_CLASS_INPUT_OTHER		0x0980
++
++#define PCI_BASE_CLASS_DOCKING		0x0a
++#define PCI_CLASS_DOCKING_GENERIC	0x0a00
++#define PCI_CLASS_DOCKING_OTHER		0x0a80
++
++#define PCI_BASE_CLASS_PROCESSOR	0x0b
++#define PCI_CLASS_PROCESSOR_386		0x0b00
++#define PCI_CLASS_PROCESSOR_486		0x0b01
++#define PCI_CLASS_PROCESSOR_PENTIUM	0x0b02
++#define PCI_CLASS_PROCESSOR_ALPHA	0x0b10
++#define PCI_CLASS_PROCESSOR_POWERPC	0x0b20
++#define PCI_CLASS_PROCESSOR_MIPS	0x0b30
++#define PCI_CLASS_PROCESSOR_CO		0x0b40
++
++#define PCI_BASE_CLASS_SERIAL		0x0c
++#define PCI_CLASS_SERIAL_FIREWIRE	0x0c00
++#define PCI_CLASS_SERIAL_ACCESS		0x0c01
++#define PCI_CLASS_SERIAL_SSA		0x0c02
++#define PCI_CLASS_SERIAL_USB		0x0c03
++#define PCI_CLASS_SERIAL_FIBER		0x0c04
++#define PCI_CLASS_SERIAL_SMBUS		0x0c05
++
++#define PCI_BASE_CLASS_INTELLIGENT	0x0e
++#define PCI_CLASS_INTELLIGENT_I2O	0x0e00
++
++#define PCI_BASE_CLASS_SATELLITE	0x0f
++#define PCI_CLASS_SATELLITE_TV		0x0f00
++#define PCI_CLASS_SATELLITE_AUDIO	0x0f01
++#define PCI_CLASS_SATELLITE_VOICE	0x0f03
++#define PCI_CLASS_SATELLITE_DATA	0x0f04
++
++#define PCI_BASE_CLASS_CRYPT		0x10
++#define PCI_CLASS_CRYPT_NETWORK		0x1000
++#define PCI_CLASS_CRYPT_ENTERTAINMENT	0x1001
++#define PCI_CLASS_CRYPT_OTHER		0x1080
++
++#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11
++#define PCI_CLASS_SP_DPIO		0x1100
++#define PCI_CLASS_SP_OTHER		0x1180
++
++#define PCI_CLASS_OTHERS		0xff
++
++/* Vendors and devices.  Sort key: vendor first, device next. */
++
++#define PCI_VENDOR_ID_DYNALINK		0x0675
++#define PCI_DEVICE_ID_DYNALINK_IS64PH	0x1702
++
++#define PCI_VENDOR_ID_BERKOM			0x0871
++#define PCI_DEVICE_ID_BERKOM_A1T		0xffa1
++#define PCI_DEVICE_ID_BERKOM_T_CONCEPT		0xffa2
++#define PCI_DEVICE_ID_BERKOM_A4T		0xffa4
++#define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO	0xffa8
++
++#define PCI_VENDOR_ID_COMPAQ		0x0e11
++#define PCI_DEVICE_ID_COMPAQ_TOKENRING	0x0508
++#define PCI_DEVICE_ID_COMPAQ_1280	0x3033
++#define PCI_DEVICE_ID_COMPAQ_TRIFLEX	0x4000
++#define PCI_DEVICE_ID_COMPAQ_6010	0x6010
++#define PCI_DEVICE_ID_COMPAQ_SMART2P	0xae10
++#define PCI_DEVICE_ID_COMPAQ_NETEL100	0xae32
++#define PCI_DEVICE_ID_COMPAQ_NETEL10	0xae34
++#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I	0xae35
++#define PCI_DEVICE_ID_COMPAQ_NETEL100D	0xae40
++#define PCI_DEVICE_ID_COMPAQ_NETEL100PI	0xae43
++#define PCI_DEVICE_ID_COMPAQ_NETEL100I	0xb011
++#define PCI_DEVICE_ID_COMPAQ_CISS	0xb060
++#define PCI_DEVICE_ID_COMPAQ_CISSB	0xb178
++#define PCI_DEVICE_ID_COMPAQ_THUNDER	0xf130
++#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B	0xf150
++
++#define PCI_VENDOR_ID_NCR		0x1000
++#define PCI_VENDOR_ID_LSI_LOGIC		0x1000
++#define PCI_DEVICE_ID_NCR_53C810	0x0001
++#define PCI_DEVICE_ID_NCR_53C820	0x0002
++#define PCI_DEVICE_ID_NCR_53C825	0x0003
++#define PCI_DEVICE_ID_NCR_53C815	0x0004
++#define PCI_DEVICE_ID_LSI_53C810AP	0x0005
++#define PCI_DEVICE_ID_NCR_53C860	0x0006
++#define PCI_DEVICE_ID_LSI_53C1510	0x000a
++#define PCI_DEVICE_ID_NCR_53C896	0x000b
++#define PCI_DEVICE_ID_NCR_53C895	0x000c
++#define PCI_DEVICE_ID_NCR_53C885	0x000d
++#define PCI_DEVICE_ID_NCR_53C875	0x000f
++#define PCI_DEVICE_ID_NCR_53C1510	0x0010
++#define PCI_DEVICE_ID_LSI_53C895A	0x0012
++#define PCI_DEVICE_ID_LSI_53C875A	0x0013
++#define PCI_DEVICE_ID_LSI_53C1010_33	0x0020
++#define PCI_DEVICE_ID_LSI_53C1010_66	0x0021
++#define PCI_DEVICE_ID_LSI_53C1030	0x0030
++#define PCI_DEVICE_ID_LSI_53C1035	0x0040
++#define PCI_DEVICE_ID_NCR_53C875J	0x008f
++#define PCI_DEVICE_ID_LSI_FC909		0x0621
++#define PCI_DEVICE_ID_LSI_FC929		0x0622
++#define PCI_DEVICE_ID_LSI_FC929_LAN	0x0623
++#define PCI_DEVICE_ID_LSI_FC919		0x0624
++#define PCI_DEVICE_ID_LSI_FC919_LAN	0x0625
++#define PCI_DEVICE_ID_NCR_YELLOWFIN	0x0701
++#define PCI_DEVICE_ID_LSI_61C102	0x0901
++#define PCI_DEVICE_ID_LSI_63C815	0x1000
++
++#define PCI_VENDOR_ID_ATI		0x1002
++/* Mach64 */
++#define PCI_DEVICE_ID_ATI_68800		0x4158
++#define PCI_DEVICE_ID_ATI_215CT222	0x4354
++#define PCI_DEVICE_ID_ATI_210888CX	0x4358
++#define PCI_DEVICE_ID_ATI_215ET222	0x4554
++/* Mach64 / Rage */
++#define PCI_DEVICE_ID_ATI_215GB		0x4742
++#define PCI_DEVICE_ID_ATI_215GD		0x4744
++#define PCI_DEVICE_ID_ATI_215GI		0x4749
++#define PCI_DEVICE_ID_ATI_215GP		0x4750
++#define PCI_DEVICE_ID_ATI_215GQ		0x4751
++#define PCI_DEVICE_ID_ATI_215XL		0x4752
++#define PCI_DEVICE_ID_ATI_215GT		0x4754
++#define PCI_DEVICE_ID_ATI_215GTB	0x4755
++#define PCI_DEVICE_ID_ATI_215_IV	0x4756
++#define PCI_DEVICE_ID_ATI_215_IW	0x4757
++#define PCI_DEVICE_ID_ATI_215_IZ	0x475A
++#define PCI_DEVICE_ID_ATI_210888GX	0x4758
++#define PCI_DEVICE_ID_ATI_215_LB	0x4c42
++#define PCI_DEVICE_ID_ATI_215_LD	0x4c44
++#define PCI_DEVICE_ID_ATI_215_LG	0x4c47
++#define PCI_DEVICE_ID_ATI_215_LI	0x4c49
++#define PCI_DEVICE_ID_ATI_215_LM	0x4c4D
++#define PCI_DEVICE_ID_ATI_215_LN	0x4c4E
++#define PCI_DEVICE_ID_ATI_215_LR	0x4c52
++#define PCI_DEVICE_ID_ATI_215_LS	0x4c53
++#define PCI_DEVICE_ID_ATI_264_LT	0x4c54
++/* Mach64 VT */
++#define PCI_DEVICE_ID_ATI_264VT		0x5654
++#define PCI_DEVICE_ID_ATI_264VU		0x5655
++#define PCI_DEVICE_ID_ATI_264VV		0x5656
++/* Rage128 Pro GL */
++#define PCI_DEVICE_ID_ATI_Rage128_PA	0x5041
++#define PCI_DEVICE_ID_ATI_Rage128_PB	0x5042
++#define PCI_DEVICE_ID_ATI_Rage128_PC	0x5043
++#define PCI_DEVICE_ID_ATI_Rage128_PD	0x5044
++#define PCI_DEVICE_ID_ATI_Rage128_PE	0x5045
++#define PCI_DEVICE_ID_ATI_RAGE128_PF	0x5046
++/* Rage128 Pro VR */
++#define PCI_DEVICE_ID_ATI_RAGE128_PG	0x5047
++#define PCI_DEVICE_ID_ATI_RAGE128_PH	0x5048
++#define PCI_DEVICE_ID_ATI_RAGE128_PI	0x5049
++#define PCI_DEVICE_ID_ATI_RAGE128_PJ	0x504A
++#define PCI_DEVICE_ID_ATI_RAGE128_PK	0x504B
++#define PCI_DEVICE_ID_ATI_RAGE128_PL	0x504C
++#define PCI_DEVICE_ID_ATI_RAGE128_PM	0x504D
++#define PCI_DEVICE_ID_ATI_RAGE128_PN	0x504E
++#define PCI_DEVICE_ID_ATI_RAGE128_PO	0x504F
++#define PCI_DEVICE_ID_ATI_RAGE128_PP	0x5050
++#define PCI_DEVICE_ID_ATI_RAGE128_PQ	0x5051
++#define PCI_DEVICE_ID_ATI_RAGE128_PR	0x5052
++#define PCI_DEVICE_ID_ATI_RAGE128_TR	0x5452
++#define PCI_DEVICE_ID_ATI_RAGE128_PS	0x5053
++#define PCI_DEVICE_ID_ATI_RAGE128_PT	0x5054
++#define PCI_DEVICE_ID_ATI_RAGE128_PU	0x5055
++#define PCI_DEVICE_ID_ATI_RAGE128_PV	0x5056
++#define PCI_DEVICE_ID_ATI_RAGE128_PW	0x5057
++#define PCI_DEVICE_ID_ATI_RAGE128_PX	0x5058
++/* Rage128 GL */
++#define PCI_DEVICE_ID_ATI_RAGE128_RE	0x5245
++#define PCI_DEVICE_ID_ATI_RAGE128_RF	0x5246
++#define PCI_DEVICE_ID_ATI_RAGE128_RG	0x534b
++#define PCI_DEVICE_ID_ATI_RAGE128_RH	0x534c
++#define PCI_DEVICE_ID_ATI_RAGE128_RI	0x534d
++/* Rage128 VR */
++#define PCI_DEVICE_ID_ATI_RAGE128_RK	0x524b
++#define PCI_DEVICE_ID_ATI_RAGE128_RL	0x524c
++#define PCI_DEVICE_ID_ATI_RAGE128_RM	0x5345
++#define PCI_DEVICE_ID_ATI_RAGE128_RN	0x5346
++#define PCI_DEVICE_ID_ATI_RAGE128_RO	0x5347
++/* Rage128 M3 */
++#define PCI_DEVICE_ID_ATI_RAGE128_LE	0x4c45
++#define PCI_DEVICE_ID_ATI_RAGE128_LF	0x4c46
++/* Rage128 Pro Ultra */
++#define PCI_DEVICE_ID_ATI_RAGE128_U1	0x5446
++#define PCI_DEVICE_ID_ATI_RAGE128_U2	0x544C
++#define PCI_DEVICE_ID_ATI_RAGE128_U3	0x5452
++/* Radeon M4 */
++#define PCI_DEVICE_ID_ATI_RADEON_LE	0x4d45
++#define PCI_DEVICE_ID_ATI_RADEON_LF	0x4d46
++/* Radeon NV-100 */
++#define PCI_DEVICE_ID_ATI_RADEON_N1	0x5159
++#define PCI_DEVICE_ID_ATI_RADEON_N2	0x515a
++/* Radeon */
++#define PCI_DEVICE_ID_ATI_RADEON_RA	0x5144
++#define PCI_DEVICE_ID_ATI_RADEON_RB	0x5145
++#define PCI_DEVICE_ID_ATI_RADEON_RC	0x5146
++#define PCI_DEVICE_ID_ATI_RADEON_RD	0x5147
++
++#define PCI_VENDOR_ID_VLSI		0x1004
++#define PCI_DEVICE_ID_VLSI_82C592	0x0005
++#define PCI_DEVICE_ID_VLSI_82C593	0x0006
++#define PCI_DEVICE_ID_VLSI_82C594	0x0007
++#define PCI_DEVICE_ID_VLSI_82C597	0x0009
++#define PCI_DEVICE_ID_VLSI_82C541	0x000c
++#define PCI_DEVICE_ID_VLSI_82C543	0x000d
++#define PCI_DEVICE_ID_VLSI_82C532	0x0101
++#define PCI_DEVICE_ID_VLSI_82C534	0x0102
++#define PCI_DEVICE_ID_VLSI_82C535	0x0104
++#define PCI_DEVICE_ID_VLSI_82C147	0x0105
++#define PCI_DEVICE_ID_VLSI_VAS96011	0x0702
++
++#define PCI_VENDOR_ID_ADL		0x1005
++#define PCI_DEVICE_ID_ADL_2301		0x2301
++
++#define PCI_VENDOR_ID_NS		0x100b
++#define PCI_DEVICE_ID_NS_87415		0x0002
++#define PCI_DEVICE_ID_NS_87560_LIO	0x000e
++#define PCI_DEVICE_ID_NS_87560_USB	0x0012
++#define PCI_DEVICE_ID_NS_83815		0x0020
++#define	PCI_DEVICE_ID_DP83815		0x0020
++#define PCI_DEVICE_ID_NS_83820		0x0022
++#define PCI_DEVICE_ID_NS_87410		0xd001
++
++#define PCI_VENDOR_ID_TSENG		0x100c
++#define PCI_DEVICE_ID_TSENG_W32P_2	0x3202
++#define PCI_DEVICE_ID_TSENG_W32P_b	0x3205
++#define PCI_DEVICE_ID_TSENG_W32P_c	0x3206
++#define PCI_DEVICE_ID_TSENG_W32P_d	0x3207
++#define PCI_DEVICE_ID_TSENG_ET6000	0x3208
++
++#define PCI_VENDOR_ID_WEITEK		0x100e
++#define PCI_DEVICE_ID_WEITEK_P9000	0x9001
++#define PCI_DEVICE_ID_WEITEK_P9100	0x9100
++
++#define PCI_VENDOR_ID_DEC		0x1011
++#define PCI_DEVICE_ID_DEC_BRD		0x0001
++#define PCI_DEVICE_ID_DEC_TULIP		0x0002
++#define PCI_DEVICE_ID_DEC_TGA		0x0004
++#define PCI_DEVICE_ID_DEC_TULIP_FAST	0x0009
++#define PCI_DEVICE_ID_DEC_TGA2		0x000D
++#define PCI_DEVICE_ID_DEC_FDDI		0x000F
++#define PCI_DEVICE_ID_DEC_TULIP_PLUS	0x0014
++#define PCI_DEVICE_ID_DEC_21142		0x0019
++#define PCI_DEVICE_ID_DEC_21052		0x0021
++#define PCI_DEVICE_ID_DEC_21150		0x0022
++#define PCI_DEVICE_ID_DEC_21152		0x0024
++#define PCI_DEVICE_ID_DEC_21153		0x0025
++#define PCI_DEVICE_ID_DEC_21154		0x0026
++#define PCI_DEVICE_ID_DEC_21285		0x1065
++#define PCI_DEVICE_ID_COMPAQ_42XX	0x0046
++
++#define PCI_VENDOR_ID_CIRRUS		0x1013
++#define PCI_DEVICE_ID_CIRRUS_7548	0x0038
++#define PCI_DEVICE_ID_CIRRUS_5430	0x00a0
++#define PCI_DEVICE_ID_CIRRUS_5434_4	0x00a4
++#define PCI_DEVICE_ID_CIRRUS_5434_8	0x00a8
++#define PCI_DEVICE_ID_CIRRUS_5436	0x00ac
++#define PCI_DEVICE_ID_CIRRUS_5446	0x00b8
++#define PCI_DEVICE_ID_CIRRUS_5480	0x00bc
++#define PCI_DEVICE_ID_CIRRUS_5462	0x00d0
++#define PCI_DEVICE_ID_CIRRUS_5464	0x00d4
++#define PCI_DEVICE_ID_CIRRUS_5465	0x00d6
++#define PCI_DEVICE_ID_CIRRUS_6729	0x1100
++#define PCI_DEVICE_ID_CIRRUS_6832	0x1110
++#define PCI_DEVICE_ID_CIRRUS_7542	0x1200
++#define PCI_DEVICE_ID_CIRRUS_7543	0x1202
++#define PCI_DEVICE_ID_CIRRUS_7541	0x1204
++
++#define PCI_VENDOR_ID_IBM		0x1014
++#define PCI_DEVICE_ID_IBM_FIRE_CORAL	0x000a
++#define PCI_DEVICE_ID_IBM_TR		0x0018
++#define PCI_DEVICE_ID_IBM_82G2675	0x001d
++#define PCI_DEVICE_ID_IBM_MCA		0x0020
++#define PCI_DEVICE_ID_IBM_82351		0x0022
++#define PCI_DEVICE_ID_IBM_PYTHON	0x002d
++#define PCI_DEVICE_ID_IBM_SERVERAID	0x002e
++#define PCI_DEVICE_ID_IBM_TR_WAKE	0x003e
++#define PCI_DEVICE_ID_IBM_MPIC		0x0046
++#define PCI_DEVICE_ID_IBM_3780IDSP	0x007d
++#define PCI_DEVICE_ID_IBM_CHUKAR	0x0096
++#define	PCI_DEVICE_ID_IBM_405GP		0x0156
++#define PCI_DEVICE_ID_IBM_SERVERAIDI960	0x01bd
++#define PCI_DEVICE_ID_IBM_MPIC_2	0xffff
++
++#define PCI_VENDOR_ID_COMPEX2		0x101a // pci.ids says "AT&T GIS (NCR)"
++#define PCI_DEVICE_ID_COMPEX2_100VG	0x0005
++
++#define PCI_VENDOR_ID_WD		0x101c
++#define PCI_DEVICE_ID_WD_7197		0x3296
++
++#define PCI_VENDOR_ID_AMI		0x101e
++#define PCI_DEVICE_ID_AMI_MEGARAID3	0x1960
++#define PCI_DEVICE_ID_AMI_MEGARAID	0x9010
++#define PCI_DEVICE_ID_AMI_MEGARAID2	0x9060
++
++#define PCI_VENDOR_ID_AMD		0x1022
++
++#define PCI_DEVICE_ID_AMD_LANCE		0x2000
++#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
++#define PCI_DEVICE_ID_AMD_HOMEPNA	0x2001
++#define PCI_DEVICE_ID_AMD_SCSI		0x2020
++#define PCI_DEVICE_ID_AMD_FE_GATE_7006	0x7006
++#define PCI_DEVICE_ID_AMD_FE_GATE_7007	0x7007
++#define PCI_DEVICE_ID_AMD_FE_GATE_700C	0x700C
++#define PCI_DEVIDE_ID_AMD_FE_GATE_700D	0x700D
++#define PCI_DEVICE_ID_AMD_FE_GATE_700E	0x700E
++#define PCI_DEVICE_ID_AMD_FE_GATE_700F	0x700F
++#define PCI_DEVICE_ID_AMD_COBRA_7400	0x7400
++#define PCI_DEVICE_ID_AMD_COBRA_7401	0x7401
++#define PCI_DEVICE_ID_AMD_COBRA_7403	0x7403
++#define PCI_DEVICE_ID_AMD_COBRA_7404	0x7404
++#define PCI_DEVICE_ID_AMD_VIPER_7408	0x7408
++#define PCI_DEVICE_ID_AMD_VIPER_7409	0x7409
++#define PCI_DEVICE_ID_AMD_VIPER_740B	0x740B
++#define PCI_DEVICE_ID_AMD_VIPER_740C	0x740C
++#define PCI_DEVICE_ID_AMD_VIPER_7410	0x7410
++#define PCI_DEVICE_ID_AMD_VIPER_7411	0x7411
++#define PCI_DEVICE_ID_AMD_VIPER_7413	0x7413
++#define PCI_DEVICE_ID_AMD_VIPER_7414	0x7414
++#define PCI_DEVICE_ID_AMD_VIPER_7440	0x7440
++#define PCI_DEVICE_ID_AMD_VIPER_7441	0x7441
++#define PCI_DEVICE_ID_AMD_VIPER_7443	0x7443
++#define PCI_DEVICE_ID_AMD_VIPER_7448	0x7448
++#define PCI_DEVICE_ID_AMD_VIPER_7449	0x7449
++
++#define PCI_VENDOR_ID_TRIDENT		0x1023
++#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
++#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001
++#define PCI_DEVICE_ID_TRIDENT_9320	0x9320
++#define PCI_DEVICE_ID_TRIDENT_9388	0x9388
++#define PCI_DEVICE_ID_TRIDENT_9397	0x9397
++#define PCI_DEVICE_ID_TRIDENT_939A	0x939A
++#define PCI_DEVICE_ID_TRIDENT_9520	0x9520
++#define PCI_DEVICE_ID_TRIDENT_9525	0x9525
++#define PCI_DEVICE_ID_TRIDENT_9420	0x9420
++#define PCI_DEVICE_ID_TRIDENT_9440	0x9440
++#define PCI_DEVICE_ID_TRIDENT_9660	0x9660
++#define PCI_DEVICE_ID_TRIDENT_9750	0x9750
++#define PCI_DEVICE_ID_TRIDENT_9850	0x9850
++#define PCI_DEVICE_ID_TRIDENT_9880	0x9880
++#define PCI_DEVICE_ID_TRIDENT_8400	0x8400
++#define PCI_DEVICE_ID_TRIDENT_8420	0x8420
++#define PCI_DEVICE_ID_TRIDENT_8500	0x8500
++
++#define PCI_VENDOR_ID_AI		0x1025
++#define PCI_DEVICE_ID_AI_M1435		0x1435
++
++#define PCI_VENDOR_ID_DELL              0x1028
++
++#define PCI_VENDOR_ID_MATROX		0x102B
++#define PCI_DEVICE_ID_MATROX_MGA_2	0x0518
++#define PCI_DEVICE_ID_MATROX_MIL	0x0519
++#define PCI_DEVICE_ID_MATROX_MYS	0x051A
++#define PCI_DEVICE_ID_MATROX_MIL_2	0x051b
++#define PCI_DEVICE_ID_MATROX_MIL_2_AGP	0x051f
++#define PCI_DEVICE_ID_MATROX_MGA_IMP	0x0d10
++#define PCI_DEVICE_ID_MATROX_G100_MM	0x1000
++#define PCI_DEVICE_ID_MATROX_G100_AGP	0x1001
++#define PCI_DEVICE_ID_MATROX_G200_PCI	0x0520
++#define PCI_DEVICE_ID_MATROX_G200_AGP	0x0521
++#define	PCI_DEVICE_ID_MATROX_G400	0x0525
++#define PCI_DEVICE_ID_MATROX_G550	0x2527
++#define PCI_DEVICE_ID_MATROX_VIA	0x4536
++
++#define PCI_VENDOR_ID_CT		0x102c
++#define PCI_DEVICE_ID_CT_65545		0x00d8
++#define PCI_DEVICE_ID_CT_65548		0x00dc
++#define PCI_DEVICE_ID_CT_65550		0x00e0
++#define PCI_DEVICE_ID_CT_65554		0x00e4
++#define PCI_DEVICE_ID_CT_65555		0x00e5
++
++#define PCI_VENDOR_ID_MIRO		0x1031
++#define PCI_DEVICE_ID_MIRO_36050	0x5601
++
++#define PCI_VENDOR_ID_NEC		0x1033
++#define PCI_DEVICE_ID_NEC_PCX2		0x0046
++#define PCI_DEVICE_ID_NEC_NILE4		0x005a
++#define PCI_DEVICE_ID_NEC_VRC5476       0x009b
++
++#define PCI_VENDOR_ID_FD		0x1036
++#define PCI_DEVICE_ID_FD_36C70		0x0000
++
++#define PCI_VENDOR_ID_SIS         	0x1039
++#define PCI_VENDOR_ID_SI		0x1039
++#define PCI_DEVICE_ID_SI_5591_AGP	0x0001
++#define PCI_DEVICE_ID_SI_6202		0x0002
++#define PCI_DEVICE_ID_SI_503		0x0008
++#define PCI_DEVICE_ID_SI_ACPI		0x0009
++#define PCI_DEVICE_ID_SI_5597_VGA	0x0200
++#define PCI_DEVICE_ID_SI_6205		0x0205
++#define PCI_DEVICE_ID_SI_501		0x0406
++#define PCI_DEVICE_ID_SI_496		0x0496
++#define PCI_DEVICE_ID_SI_300		0x0300
++#define PCI_DEVICE_ID_SI_315H		0x0310
++#define PCI_DEVICE_ID_SI_315		0x0315
++#define PCI_DEVICE_ID_SI_315PRO		0x0325
++#define PCI_DEVICE_ID_SI_530		0x0530
++#define PCI_DEVICE_ID_SI_540		0x0540
++#define PCI_DEVICE_ID_SI_550		0x0550
++#define PCI_DEVICE_ID_SI_601		0x0601
++#define PCI_DEVICE_ID_SI_620		0x0620
++#define PCI_DEVICE_ID_SI_630		0x0630
++#define PCI_DEVICE_ID_SI_635		0x0635
++#define PCI_DEVICE_ID_SI_640		0x0640
++#define PCI_DEVICE_ID_SI_645		0x0645
++#define PCI_DEVICE_ID_SI_650		0x0650
++#define PCI_DEVICE_ID_SI_730		0x0730
++#define PCI_DEVICE_ID_SI_735		0x0735
++#define PCI_DEVICE_ID_SI_740		0x0740
++#define PCI_DEVICE_ID_SI_745		0x0745
++#define PCI_DEVICE_ID_SI_750		0x0750
++#define PCI_DEVICE_ID_SI_900		0x0900
++#define PCI_DEVICE_ID_SIS900		0x0900
++#define PCI_DEVICE_ID_SI_5107		0x5107
++#define PCI_DEVICE_ID_SI_5300		0x5300
++#define PCI_DEVICE_ID_SI_540_VGA	0x5300
++#define PCI_DEVICE_ID_SI_550_VGA	0x5315
++#define PCI_DEVICE_ID_SI_5511		0x5511
++#define PCI_DEVICE_ID_SI_5513		0x5513
++#define PCI_DEVICE_ID_SI_5571		0x5571
++#define PCI_DEVICE_ID_SI_5591		0x5591
++#define PCI_DEVICE_ID_SI_5597		0x5597
++#define PCI_DEVICE_ID_SI_5598		0x5598
++#define PCI_DEVICE_ID_SI_5600		0x5600
++#define PCI_DEVICE_ID_SI_6300		0x6300
++#define PCI_DEVICE_ID_SI_630_VGA	0x6300
++#define PCI_DEVICE_ID_SI_6306		0x6306
++#define PCI_DEVICE_ID_SI_6326		0x6326
++#define PCI_DEVICE_ID_SI_7001		0x7001
++#define PCI_DEVICE_ID_SI_7016		0x7016
++#define PCI_DEVICE_ID_SIS7016    	0x7016  
++#define PCI_DEVICE_ID_SI_730_VGA	0x7300
++
++#define PCI_VENDOR_ID_HP		0x103c
++#define PCI_DEVICE_ID_HP_DONNER_GFX	0x1008
++#define PCI_DEVICE_ID_HP_TACHYON	0x1028
++#define PCI_DEVICE_ID_HP_TACHLITE	0x1029
++#define PCI_DEVICE_ID_HP_J2585A		0x1030
++#define PCI_DEVICE_ID_HP_J2585B		0x1031
++#define PCI_DEVICE_ID_HP_SAS		0x1048
++#define PCI_DEVICE_ID_HP_DIVA1		0x1049
++#define PCI_DEVICE_ID_HP_DIVA2		0x104A
++#define PCI_DEVICE_ID_HP_SP2_0		0x104B
++
++#define PCI_VENDOR_ID_PCTECH		0x1042
++#define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000
++#define PCI_DEVICE_ID_PCTECH_RZ1001	0x1001
++#define PCI_DEVICE_ID_PCTECH_SAMURAI_0	0x3000
++#define PCI_DEVICE_ID_PCTECH_SAMURAI_1	0x3010
++#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020
++
++#define PCI_VENDOR_ID_ASUSTEK		0x1043
++#define PCI_DEVICE_ID_ASUSTEK_0675	0x0675
++
++#define PCI_VENDOR_ID_DPT		0x1044
++#define PCI_DEVICE_ID_DPT		0xa400
++
++#define PCI_VENDOR_ID_OPTI		0x1045
++#define PCI_DEVICE_ID_OPTI_92C178	0xc178
++#define PCI_DEVICE_ID_OPTI_82C557	0xc557
++#define PCI_DEVICE_ID_OPTI_82C558	0xc558
++#define PCI_DEVICE_ID_OPTI_82C621	0xc621
++#define PCI_DEVICE_ID_OPTI_82C700	0xc700
++#define PCI_DEVICE_ID_OPTI_82C701	0xc701
++#define PCI_DEVICE_ID_OPTI_82C814	0xc814
++#define PCI_DEVICE_ID_OPTI_82C822	0xc822
++#define PCI_DEVICE_ID_OPTI_82C861	0xc861
++#define PCI_DEVICE_ID_OPTI_82C825	0xd568
++
++#define PCI_VENDOR_ID_ELSA		0x1048
++#define PCI_DEVICE_ID_ELSA_MICROLINK	0x1000
++#define PCI_DEVICE_ID_ELSA_QS3000	0x3000
++
++#define PCI_VENDOR_ID_ELSA		0x1048
++#define PCI_DEVICE_ID_ELSA_MICROLINK	0x1000
++#define PCI_DEVICE_ID_ELSA_QS3000	0x3000
++
++#define PCI_VENDOR_ID_SGS		0x104a
++#define PCI_DEVICE_ID_SGS_2000		0x0008
++#define PCI_DEVICE_ID_SGS_1764		0x0009
++
++#define PCI_VENDOR_ID_BUSLOGIC		      0x104B
++#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
++#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
++#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT     0x8130
++
++#define PCI_VENDOR_ID_TI		0x104c
++#define PCI_DEVICE_ID_TI_TVP4010	0x3d04
++#define PCI_DEVICE_ID_TI_TVP4020	0x3d07
++#define PCI_DEVICE_ID_TI_1130		0xac12
++#define PCI_DEVICE_ID_TI_1031		0xac13
++#define PCI_DEVICE_ID_TI_1131		0xac15
++#define PCI_DEVICE_ID_TI_1250		0xac16
++#define PCI_DEVICE_ID_TI_1220		0xac17
++#define PCI_DEVICE_ID_TI_1221		0xac19
++#define PCI_DEVICE_ID_TI_1210		0xac1a
++#define PCI_DEVICE_ID_TI_1410		0xac50
++#define PCI_DEVICE_ID_TI_1450		0xac1b
++#define PCI_DEVICE_ID_TI_1225		0xac1c
++#define PCI_DEVICE_ID_TI_1251A		0xac1d
++#define PCI_DEVICE_ID_TI_1211		0xac1e
++#define PCI_DEVICE_ID_TI_1251B		0xac1f
++#define PCI_DEVICE_ID_TI_4410		0xac41
++#define PCI_DEVICE_ID_TI_4451		0xac42
++#define PCI_DEVICE_ID_TI_1420		0xac51
++
++#define PCI_VENDOR_ID_SONY		0x104d
++#define PCI_DEVICE_ID_SONY_CXD3222	0x8039
++
++#define PCI_VENDOR_ID_OAK		0x104e
++#define PCI_DEVICE_ID_OAK_OTI107	0x0107
++
++/* Winbond have two vendor IDs! See 0x10ad as well */
++#define PCI_VENDOR_ID_WINBOND2		0x1050
++#define PCI_DEVICE_ID_WINBOND2_89C840   0x0840
++#define PCI_DEVICE_ID_WINBOND2_89C940	0x0940
++#define PCI_DEVICE_ID_WINBOND2_89C940F	0x5a5a
++#define PCI_DEVICE_ID_WINBOND2_6692	0x6692
++
++#define PCI_VENDOR_ID_ANIGMA		0x1051
++#define PCI_DEVICE_ID_ANIGMA_MC145575	0x0100
++  
++#define PCI_VENDOR_ID_EFAR		0x1055
++#define PCI_DEVICE_ID_EFAR_SLC90E66_1	0x9130
++#define PCI_DEVICE_ID_EFAR_SLC90E66_0	0x9460
++#define PCI_DEVICE_ID_EFAR_SLC90E66_2	0x9462
++#define PCI_DEVICE_ID_EFAR_SLC90E66_3	0x9463
++
++#define PCI_VENDOR_ID_MOTOROLA		0x1057
++#define PCI_VENDOR_ID_MOTOROLA_OOPS	0x1507
++#define PCI_DEVICE_ID_MOTOROLA_MPC105	0x0001
++#define PCI_DEVICE_ID_MOTOROLA_MPC106	0x0002
++#define PCI_DEVICE_ID_MOTOROLA_RAVEN	0x4801
++#define PCI_DEVICE_ID_MOTOROLA_FALCON	0x4802
++#define PCI_DEVICE_ID_MOTOROLA_CPX8216	0x4806
++
++#define PCI_VENDOR_ID_PROMISE		0x105a
++#define PCI_DEVICE_ID_PROMISE_20265	0x0d30
++#define PCI_DEVICE_ID_PROMISE_20267	0x4d30
++#define PCI_DEVICE_ID_PROMISE_20246	0x4d33
++#define PCI_DEVICE_ID_PROMISE_20262	0x4d38
++#define PCI_DEVICE_ID_PROMISE_20268	0x4d68
++#define PCI_DEVICE_ID_PROMISE_20268R	0x6268
++#define PCI_DEVICE_ID_PROMISE_20269	0x4d69
++#define PCI_DEVICE_ID_PROMISE_20275	0x1275
++#define PCI_DEVICE_ID_PROMISE_5300	0x5300
++
++#define PCI_VENDOR_ID_N9		0x105d
++#define PCI_DEVICE_ID_N9_I128		0x2309
++#define PCI_DEVICE_ID_N9_I128_2		0x2339
++#define PCI_DEVICE_ID_N9_I128_T2R	0x493d
++
++#define PCI_VENDOR_ID_UMC		0x1060
++#define PCI_DEVICE_ID_UMC_UM8673F	0x0101
++#define PCI_DEVICE_ID_UMC_UM8891A	0x0891
++#define PCI_DEVICE_ID_UMC_UM8886BF	0x673a
++#define PCI_DEVICE_ID_UMC_UM8886A	0x886a
++#define PCI_DEVICE_ID_UMC_UM8881F	0x8881
++#define PCI_DEVICE_ID_UMC_UM8886F	0x8886
++#define PCI_DEVICE_ID_UMC_UM9017F	0x9017
++#define PCI_DEVICE_ID_UMC_UM8886N	0xe886
++#define PCI_DEVICE_ID_UMC_UM8891N	0xe891
++
++#define PCI_VENDOR_ID_X			0x1061
++#define PCI_DEVICE_ID_X_AGX016		0x0001
++
++#define PCI_VENDOR_ID_MYLEX		0x1069
++#define PCI_DEVICE_ID_MYLEX_DAC960_P	0x0001
++#define PCI_DEVICE_ID_MYLEX_DAC960_PD	0x0002
++#define PCI_DEVICE_ID_MYLEX_DAC960_PG	0x0010
++#define PCI_DEVICE_ID_MYLEX_DAC960_LA	0x0020
++#define PCI_DEVICE_ID_MYLEX_DAC960_LP	0x0050
++#define PCI_DEVICE_ID_MYLEX_DAC960_BA	0xBA56
++
++#define PCI_VENDOR_ID_PICOP		0x1066
++#define PCI_DEVICE_ID_PICOP_PT86C52X	0x0001
++#define PCI_DEVICE_ID_PICOP_PT80C524	0x8002
++
++#define PCI_VENDOR_ID_APPLE		0x106b
++#define PCI_DEVICE_ID_APPLE_BANDIT	0x0001
++#define PCI_DEVICE_ID_APPLE_GC		0x0002
++#define PCI_DEVICE_ID_APPLE_HYDRA	0x000e
++#define PCI_DEVICE_ID_APPLE_UNI_N_FW	0x0018
++#define PCI_DEVICE_ID_APPLE_KL_USB	0x0019
++#define PCI_DEVICE_ID_APPLE_UNI_N_AGP	0x0020
++#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC	0x0021
++#define PCI_DEVICE_ID_APPLE_UNI_N_FW2	0x0030
++
++#define PCI_VENDOR_ID_YAMAHA		0x1073
++#define PCI_DEVICE_ID_YAMAHA_724	0x0004
++#define PCI_DEVICE_ID_YAMAHA_724F	0x000d
++#define PCI_DEVICE_ID_YAMAHA_740	0x000a
++#define PCI_DEVICE_ID_YAMAHA_740C	0x000c
++#define PCI_DEVICE_ID_YAMAHA_744	0x0010
++#define PCI_DEVICE_ID_YAMAHA_754	0x0012
++
++#define PCI_VENDOR_ID_NEXGEN		0x1074
++#define PCI_DEVICE_ID_NEXGEN_82C501	0x4e78
++
++#define PCI_VENDOR_ID_QLOGIC		0x1077
++#define PCI_DEVICE_ID_QLOGIC_ISP1020	0x1020
++#define PCI_DEVICE_ID_QLOGIC_ISP1022	0x1022
++#define PCI_DEVICE_ID_QLOGIC_ISP2100	0x2100
++#define PCI_DEVICE_ID_QLOGIC_ISP2200	0x2200
++
++#define PCI_VENDOR_ID_CYRIX		0x1078
++#define PCI_DEVICE_ID_CYRIX_5510	0x0000
++#define PCI_DEVICE_ID_CYRIX_PCI_MASTER	0x0001
++#define PCI_DEVICE_ID_CYRIX_5520	0x0002
++#define PCI_DEVICE_ID_CYRIX_5530_LEGACY	0x0100
++#define PCI_DEVICE_ID_CYRIX_5530_SMI	0x0101
++#define PCI_DEVICE_ID_CYRIX_5530_IDE	0x0102
++#define PCI_DEVICE_ID_CYRIX_5530_AUDIO	0x0103
++#define PCI_DEVICE_ID_CYRIX_5530_VIDEO	0x0104
++
++#define PCI_VENDOR_ID_LEADTEK		0x107d
++#define PCI_DEVICE_ID_LEADTEK_805	0x0000
++
++#define PCI_VENDOR_ID_INTERPHASE	0x107e
++#define PCI_DEVICE_ID_INTERPHASE_5526	0x0004
++#define PCI_DEVICE_ID_INTERPHASE_55x6	0x0005
++#define PCI_DEVICE_ID_INTERPHASE_5575	0x0008
++
++#define PCI_VENDOR_ID_CONTAQ		0x1080
++#define PCI_DEVICE_ID_CONTAQ_82C599	0x0600
++#define PCI_DEVICE_ID_CONTAQ_82C693	0xc693
++
++#define PCI_VENDOR_ID_FOREX		0x1083
++
++#define PCI_VENDOR_ID_OLICOM		0x108d
++#define PCI_DEVICE_ID_OLICOM_OC3136	0x0001
++#define PCI_DEVICE_ID_OLICOM_OC2315	0x0011
++#define PCI_DEVICE_ID_OLICOM_OC2325	0x0012
++#define PCI_DEVICE_ID_OLICOM_OC2183	0x0013
++#define PCI_DEVICE_ID_OLICOM_OC2326	0x0014
++#define PCI_DEVICE_ID_OLICOM_OC6151	0x0021
++
++#define PCI_VENDOR_ID_SUN		0x108e
++#define PCI_DEVICE_ID_SUN_EBUS		0x1000
++#define PCI_DEVICE_ID_SUN_HAPPYMEAL	0x1001
++#define PCI_DEVICE_ID_SUN_RIO_EBUS	0x1100
++#define PCI_DEVICE_ID_SUN_RIO_GEM	0x1101
++#define PCI_DEVICE_ID_SUN_RIO_1394	0x1102
++#define PCI_DEVICE_ID_SUN_RIO_USB	0x1103
++#define PCI_DEVICE_ID_SUN_GEM		0x2bad
++#define PCI_DEVICE_ID_SUN_SIMBA		0x5000
++#define PCI_DEVICE_ID_SUN_PBM		0x8000
++#define PCI_DEVICE_ID_SUN_SCHIZO	0x8001
++#define PCI_DEVICE_ID_SUN_SABRE		0xa000
++#define PCI_DEVICE_ID_SUN_HUMMINGBIRD	0xa001
++
++#define PCI_VENDOR_ID_CMD		0x1095
++#define PCI_DEVICE_ID_CMD_640		0x0640
++#define PCI_DEVICE_ID_CMD_643		0x0643
++#define PCI_DEVICE_ID_CMD_646		0x0646
++#define PCI_DEVICE_ID_CMD_647		0x0647
++#define PCI_DEVICE_ID_CMD_648		0x0648
++#define PCI_DEVICE_ID_CMD_649		0x0649
++#define PCI_DEVICE_ID_CMD_670		0x0670
++#define PCI_DEVICE_ID_CMD_680		0x0680
++
++#define PCI_VENDOR_ID_VISION		0x1098
++#define PCI_DEVICE_ID_VISION_QD8500	0x0001
++#define PCI_DEVICE_ID_VISION_QD8580	0x0002
++
++#define PCI_VENDOR_ID_BROOKTREE		0x109e
++#define PCI_DEVICE_ID_BROOKTREE_848	0x0350
++#define PCI_DEVICE_ID_BROOKTREE_849A	0x0351
++#define PCI_DEVICE_ID_BROOKTREE_878_1	0x036e
++#define PCI_DEVICE_ID_BROOKTREE_878	0x0878
++#define PCI_DEVICE_ID_BROOKTREE_8474	0x8474
++
++#define PCI_VENDOR_ID_SIERRA		0x10a8
++#define PCI_DEVICE_ID_SIERRA_STB	0x0000
++
++#define PCI_VENDOR_ID_SGI		0x10a9
++#define PCI_DEVICE_ID_SGI_IOC3		0x0003
++
++#define PCI_VENDOR_ID_ACC		0x10aa
++#define PCI_DEVICE_ID_ACC_2056		0x0000
++
++#define PCI_VENDOR_ID_WINBOND		0x10ad
++#define PCI_DEVICE_ID_WINBOND_83769	0x0001
++#define PCI_DEVICE_ID_WINBOND_82C105	0x0105
++#define PCI_DEVICE_ID_WINBOND_83C553	0x0565
++
++#define PCI_VENDOR_ID_DATABOOK		0x10b3
++#define PCI_DEVICE_ID_DATABOOK_87144	0xb106
++
++#define PCI_VENDOR_ID_PLX		0x10b5
++#define PCI_DEVICE_ID_PLX_R685		0x1030
++#define PCI_DEVICE_ID_PLX_ROMULUS	0x106a
++#define PCI_DEVICE_ID_PLX_SPCOM800	0x1076
++#define PCI_DEVICE_ID_PLX_1077		0x1077
++#define PCI_DEVICE_ID_PLX_SPCOM200	0x1103
++#define PCI_DEVICE_ID_PLX_DJINN_ITOO	0x1151
++#define PCI_DEVICE_ID_PLX_R753		0x1152
++#define PCI_DEVICE_ID_PLX_9050		0x9050
++#define PCI_DEVICE_ID_PLX_9060		0x9060
++#define PCI_DEVICE_ID_PLX_9060ES	0x906E
++#define PCI_DEVICE_ID_PLX_9060SD	0x906D
++#define PCI_DEVICE_ID_PLX_9080		0x9080
++#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2	0xa001
++
++#define PCI_VENDOR_ID_MADGE		0x10b6
++#define PCI_DEVICE_ID_MADGE_MK2		0x0002
++#define PCI_DEVICE_ID_MADGE_C155S	0x1001
++
++#define PCI_VENDOR_ID_3COM		0x10b7
++#define PCI_DEVICE_ID_3COM_3C985	0x0001
++#define PCI_DEVICE_ID_3COM_3C339	0x3390
++#define PCI_DEVICE_ID_3COM_3C590	0x5900
++#define PCI_DEVICE_ID_3COM_3C595	0x5950
++#define PCI_DEVICE_ID_3COM_3C595TX	0x5950
++#define PCI_DEVICE_ID_3COM_3C595_1	0x5951
++#define PCI_DEVICE_ID_3COM_3C595T4	0x5951
++#define PCI_DEVICE_ID_3COM_3C595_2	0x5952
++#define PCI_DEVICE_ID_3COM_3C595MII	0x5952
++#define PCI_DEVICE_ID_3COM_3C900TPO	0x9000
++#define PCI_DEVICE_ID_3COM_3C900COMBO	0x9001
++#define PCI_DEVICE_ID_3COM_3C905TX	0x9050
++#define PCI_DEVICE_ID_3COM_3C905T4	0x9051
++#define PCI_DEVICE_ID_3COM_3C905B_TX	0x9055
++#define PCI_DEVICE_ID_3COM_3C905C_TXM	0x9200
++
++#define PCI_VENDOR_ID_SMC		0x10b8
++#define PCI_DEVICE_ID_SMC_EPIC100	0x0005
++
++#define PCI_VENDOR_ID_SUNDANCE		0x13F0
++#define PCI_DEVICE_ID_SUNDANCE_ALTA	0x0201
++
++#define PCI_VENDOR_ID_AL		0x10b9
++#define PCI_DEVICE_ID_AL_M1445		0x1445
++#define PCI_DEVICE_ID_AL_M1449		0x1449
++#define PCI_DEVICE_ID_AL_M1451		0x1451
++#define PCI_DEVICE_ID_AL_M1461		0x1461
++#define PCI_DEVICE_ID_AL_M1489		0x1489
++#define PCI_DEVICE_ID_AL_M1511		0x1511
++#define PCI_DEVICE_ID_AL_M1513		0x1513
++#define PCI_DEVICE_ID_AL_M1521		0x1521
++#define PCI_DEVICE_ID_AL_M1523		0x1523
++#define PCI_DEVICE_ID_AL_M1531		0x1531
++#define PCI_DEVICE_ID_AL_M1533		0x1533
++#define PCI_DEVICE_ID_AL_M1541		0x1541
++#define PCI_DEVICE_ID_AL_M1621          0x1621
++#define PCI_DEVICE_ID_AL_M1631          0x1631
++#define PCI_DEVICE_ID_AL_M1641          0x1641
++#define PCI_DEVICE_ID_AL_M1647          0x1647
++#define PCI_DEVICE_ID_AL_M1651          0x1651
++#define PCI_DEVICE_ID_AL_M1543		0x1543
++#define PCI_DEVICE_ID_AL_M3307		0x3307
++#define PCI_DEVICE_ID_AL_M4803		0x5215
++#define PCI_DEVICE_ID_AL_M5219		0x5219
++#define PCI_DEVICE_ID_AL_M5229		0x5229
++#define PCI_DEVICE_ID_AL_M5237		0x5237
++#define PCI_DEVICE_ID_AL_M5243		0x5243
++#define PCI_DEVICE_ID_AL_M5451		0x5451
++#define PCI_DEVICE_ID_AL_M7101		0x7101
++
++#define PCI_VENDOR_ID_MITSUBISHI	0x10ba
++
++#define PCI_VENDOR_ID_SURECOM		0x10bd
++#define PCI_DEVICE_ID_SURECOM_NE34	0x0e34
++
++#define PCI_VENDOR_ID_NEOMAGIC		0x10c8
++#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2070 0x0001
++#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128V 0x0002
++#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZV 0x0003
++#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004
++#define PCI_DEVICE_ID_NEOMAGIC_MAGICMEDIA_256AV       0x0005
++#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS   0x0083
++
++#define PCI_VENDOR_ID_ASP		0x10cd
++#define PCI_DEVICE_ID_ASP_ABP940	0x1200
++#define PCI_DEVICE_ID_ASP_ABP940U	0x1300
++#define PCI_DEVICE_ID_ASP_ABP940UW	0x2300
++
++#define PCI_VENDOR_ID_MACRONIX		0x10d9
++#define PCI_DEVICE_ID_MACRONIX_MX98713	0x0512
++#define PCI_DEVICE_ID_MX987x3		0x0512
++#define PCI_DEVICE_ID_MACRONIX_MX987x5	0x0531
++#define PCI_DEVICE_ID_MX987x5		0x0531
++
++#define PCI_VENDOR_ID_TCONRAD		0x10da
++#define PCI_DEVICE_ID_TCONRAD_TOKENRING	0x0508
++
++#define PCI_VENDOR_ID_CERN		0x10dc
++#define PCI_DEVICE_ID_CERN_SPSB_PMC	0x0001
++#define PCI_DEVICE_ID_CERN_SPSB_PCI	0x0002
++#define PCI_DEVICE_ID_CERN_HIPPI_DST	0x0021
++#define PCI_DEVICE_ID_CERN_HIPPI_SRC	0x0022
++
++#define PCI_VENDOR_ID_NVIDIA			0x10de
++#define PCI_DEVICE_ID_NVIDIA_TNT		0x0020
++#define PCI_DEVICE_ID_NVIDIA_TNT2		0x0028
++#define PCI_DEVICE_ID_NVIDIA_UTNT2		0x0029
++#define PCI_DEVICE_ID_NVIDIA_VTNT2		0x002C
++#define PCI_DEVICE_ID_NVIDIA_UVTNT2		0x002D
++#define PCI_DEVICE_ID_NVIDIA_ITNT2		0x00A0
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR	0x0100
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR	0x0101
++#define PCI_DEVICE_ID_NVIDIA_QUADRO		0x0103
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX	0x0110
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2	0x0111
++#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR	0x0113
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS	0x0150
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2	0x0151
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA	0x0152
++#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO	0x0153
++
++#define PCI_VENDOR_ID_IMS		0x10e0
++#define PCI_DEVICE_ID_IMS_8849		0x8849
++#define PCI_DEVICE_ID_IMS_TT128		0x9128
++#define PCI_DEVICE_ID_IMS_TT3D		0x9135
++
++#define PCI_VENDOR_ID_TEKRAM2		0x10e1
++#define PCI_DEVICE_ID_TEKRAM2_690c	0x690c
++
++#define PCI_VENDOR_ID_TUNDRA		0x10e3
++#define PCI_DEVICE_ID_TUNDRA_CA91C042	0x0000
++
++#define PCI_VENDOR_ID_AMCC		0x10e8
++#define PCI_DEVICE_ID_AMCC_MYRINET	0x8043
++#define PCI_DEVICE_ID_AMCC_PARASTATION	0x8062
++#define PCI_DEVICE_ID_AMCC_S5933	0x807d
++#define PCI_DEVICE_ID_AMCC_S5933_HEPC3	0x809c
++
++#define PCI_VENDOR_ID_INTERG		0x10ea
++#define PCI_DEVICE_ID_INTERG_1680	0x1680
++#define PCI_DEVICE_ID_INTERG_1682	0x1682
++#define PCI_DEVICE_ID_INTERG_2000	0x2000
++#define PCI_DEVICE_ID_INTERG_2010	0x2010
++#define PCI_DEVICE_ID_INTERG_5000	0x5000
++#define PCI_DEVICE_ID_INTERG_5050	0x5050
++
++#define PCI_VENDOR_ID_REALTEK		0x10ec
++#define PCI_DEVICE_ID_REALTEK_8029	0x8029
++#define PCI_DEVICE_ID_REALTEK_8129	0x8129
++#define PCI_DEVICE_ID_REALTEK_8139	0x8139
++
++#define PCI_VENDOR_ID_XILINX		0x10ee
++#define PCI_DEVICE_ID_TURBOPAM		0x4020
++
++#define PCI_VENDOR_ID_TRUEVISION	0x10fa
++#define PCI_DEVICE_ID_TRUEVISION_T1000	0x000c
++
++#define PCI_VENDOR_ID_INIT		0x1101
++#define PCI_DEVICE_ID_INIT_320P		0x9100
++#define PCI_DEVICE_ID_INIT_360P		0x9500
++
++#define PCI_VENDOR_ID_CREATIVE		0x1102 // duplicate: ECTIVA
++#define PCI_DEVICE_ID_CREATIVE_EMU10K1	0x0002
++
++#define PCI_VENDOR_ID_ECTIVA		0x1102 // duplicate: CREATIVE
++#define PCI_DEVICE_ID_ECTIVA_EV1938	0x8938
++
++#define PCI_VENDOR_ID_TTI		0x1103
++#define PCI_DEVICE_ID_TTI_HPT343	0x0003
++#define PCI_DEVICE_ID_TTI_HPT366	0x0004
++
++#define PCI_VENDOR_ID_VIA		0x1106
++#define PCI_VENDOR_ID_VIATEC		0x1106
++#define PCI_DEVICE_ID_VIA_8363_0	0x0305
++#define PCI_DEVICE_ID_VIA_8371_0	0x0391
++#define PCI_DEVICE_ID_VIA_8501_0	0x0501
++#define PCI_DEVICE_ID_VIA_82C505	0x0505
++#define PCI_DEVICE_ID_VIA_82C561	0x0561
++#define PCI_DEVICE_ID_VIA_82C586_1	0x0571
++#define PCI_DEVICE_ID_VIA_82C576	0x0576
++#define PCI_DEVICE_ID_VIA_82C585	0x0585
++#define PCI_DEVICE_ID_VIA_82C586_0	0x0586
++#define PCI_DEVICE_ID_VIA_82C595	0x0595
++#define PCI_DEVICE_ID_VIA_82C596	0x0596
++#define PCI_DEVICE_ID_VIA_82C597_0	0x0597
++#define PCI_DEVICE_ID_VIA_82C598_0	0x0598
++#define PCI_DEVICE_ID_VIA_8601_0	0x0601
++#define PCI_DEVICE_ID_VIA_8605_0	0x0605
++#define PCI_DEVICE_ID_VIA_82C680	0x0680
++#define PCI_DEVICE_ID_VIA_82C686	0x0686
++#define PCI_DEVICE_ID_VIA_82C691	0x0691
++#define PCI_DEVICE_ID_VIA_82C693	0x0693
++#define PCI_DEVICE_ID_VIA_82C693_1	0x0698
++#define PCI_DEVICE_ID_VIA_82C926	0x0926
++#define PCI_DEVICE_ID_VIA_82C576_1	0x1571
++#define PCI_DEVICE_ID_VIA_82C595_97	0x1595
++#define PCI_DEVICE_ID_VIA_82C586_2	0x3038
++#define PCI_DEVICE_ID_VIA_82C586_3	0x3040
++#define PCI_DEVICE_ID_VIA_RHINE_I	0x3043
++#define PCI_DEVICE_ID_VIA_6305		0x3044
++#define PCI_DEVICE_ID_VIA_82C596_3	0x3050
++#define PCI_DEVICE_ID_VIA_82C596B_3	0x3051
++#define PCI_DEVICE_ID_VIA_82C686_4	0x3057
++#define PCI_DEVICE_ID_VIA_82C686_5	0x3058
++#define PCI_DEVICE_ID_VIA_8233_5	0x3059
++#define PCI_DEVICE_ID_VIA_8233_7	0x3065
++#define PCI_DEVICE_ID_VIA_VT6102	0x3065
++#define PCI_DEVICE_ID_VIA_82C686_6	0x3068
++#define PCI_DEVICE_ID_VIA_8233_0	0x3074
++#define PCI_DEVICE_ID_VIA_VT6105	0x3106
++#define PCI_DEVICE_ID_VIA_8233C_0	0x3109
++#define PCI_DEVICE_ID_VIA_8633_0	0x3091
++#define PCI_DEVICE_ID_VIA_8367_0	0x3099
++#define PCI_DEVICE_ID_VIA_86C100A	0x6100
++#define PCI_DEVICE_ID_VIA_8231		0x8231
++#define PCI_DEVICE_ID_VIA_8231_4	0x8235
++#define PCI_DEVICE_ID_VIA_8365_1	0x8305
++#define PCI_DEVICE_ID_VIA_8371_1	0x8391
++#define PCI_DEVICE_ID_VIA_8501_1	0x8501
++#define PCI_DEVICE_ID_VIA_82C597_1	0x8597
++#define PCI_DEVICE_ID_VIA_82C598_1	0x8598
++#define PCI_DEVICE_ID_VIA_8601_1	0x8601
++#define PCI_DEVICE_ID_VIA_8505_1	0X8605
++#define PCI_DEVICE_ID_VIA_8633_1	0xB091
++#define PCI_DEVICE_ID_VIA_8367_1	0xB099
++
++#define PCI_VENDOR_ID_SIEMENS           0x110A
++#define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
++
++#define PCI_VENDOR_ID_SMC2		0x1113
++#define PCI_DEVICE_ID_SMC2_1211TX	0x1211
++#define PCI_DEVICE_ID_SMC2_1211         0x1211
++#define PCI_DEVICE_ID_SMC2_1216         0x1216
++
++#define PCI_VENDOR_ID_VORTEX		0x1119
++#define PCI_DEVICE_ID_VORTEX_GDT60x0	0x0000
++#define PCI_DEVICE_ID_VORTEX_GDT6000B	0x0001
++#define PCI_DEVICE_ID_VORTEX_GDT6x10	0x0002
++#define PCI_DEVICE_ID_VORTEX_GDT6x20	0x0003
++#define PCI_DEVICE_ID_VORTEX_GDT6530	0x0004
++#define PCI_DEVICE_ID_VORTEX_GDT6550	0x0005
++#define PCI_DEVICE_ID_VORTEX_GDT6x17	0x0006
++#define PCI_DEVICE_ID_VORTEX_GDT6x27	0x0007
++#define PCI_DEVICE_ID_VORTEX_GDT6537	0x0008
++#define PCI_DEVICE_ID_VORTEX_GDT6557	0x0009
++#define PCI_DEVICE_ID_VORTEX_GDT6x15	0x000a
++#define PCI_DEVICE_ID_VORTEX_GDT6x25	0x000b
++#define PCI_DEVICE_ID_VORTEX_GDT6535	0x000c
++#define PCI_DEVICE_ID_VORTEX_GDT6555	0x000d
++#define PCI_DEVICE_ID_VORTEX_GDT6x17RP	0x0100
++#define PCI_DEVICE_ID_VORTEX_GDT6x27RP	0x0101
++#define PCI_DEVICE_ID_VORTEX_GDT6537RP	0x0102
++#define PCI_DEVICE_ID_VORTEX_GDT6557RP	0x0103
++#define PCI_DEVICE_ID_VORTEX_GDT6x11RP	0x0104
++#define PCI_DEVICE_ID_VORTEX_GDT6x21RP	0x0105
++#define PCI_DEVICE_ID_VORTEX_GDT6x17RP1	0x0110
++#define PCI_DEVICE_ID_VORTEX_GDT6x27RP1	0x0111
++#define PCI_DEVICE_ID_VORTEX_GDT6537RP1	0x0112
++#define PCI_DEVICE_ID_VORTEX_GDT6557RP1	0x0113
++#define PCI_DEVICE_ID_VORTEX_GDT6x11RP1	0x0114
++#define PCI_DEVICE_ID_VORTEX_GDT6x21RP1	0x0115
++#define PCI_DEVICE_ID_VORTEX_GDT6x17RP2	0x0120
++#define PCI_DEVICE_ID_VORTEX_GDT6x27RP2	0x0121
++#define PCI_DEVICE_ID_VORTEX_GDT6537RP2	0x0122
++#define PCI_DEVICE_ID_VORTEX_GDT6557RP2	0x0123
++#define PCI_DEVICE_ID_VORTEX_GDT6x11RP2	0x0124
++#define PCI_DEVICE_ID_VORTEX_GDT6x21RP2	0x0125
++
++#define PCI_VENDOR_ID_EF		0x111a
++#define PCI_DEVICE_ID_EF_ATM_FPGA	0x0000
++#define PCI_DEVICE_ID_EF_ATM_ASIC	0x0002
++
++#define PCI_VENDOR_ID_IDT		0x111d
++#define PCI_DEVICE_ID_IDT_IDT77201	0x0001
++
++#define PCI_VENDOR_ID_FORE		0x1127
++#define PCI_DEVICE_ID_FORE_PCA200PC	0x0210
++#define PCI_DEVICE_ID_FORE_PCA200E	0x0300
++
++#define PCI_VENDOR_ID_IMAGINGTECH	0x112f
++#define PCI_DEVICE_ID_IMAGINGTECH_ICPCI	0x0000
++
++#define PCI_VENDOR_ID_PHILIPS		0x1131
++#define PCI_DEVICE_ID_PHILIPS_SAA7145	0x7145
++#define PCI_DEVICE_ID_PHILIPS_SAA7146	0x7146
++#define PCI_DEVICE_ID_PHILIPS_SAA9730	0x9730
++
++#define PCI_VENDOR_ID_EICON		0x1133
++#define PCI_DEVICE_ID_EICON_DIVA20PRO	0xe001
++#define PCI_DEVICE_ID_EICON_DIVA20	0xe002
++#define PCI_DEVICE_ID_EICON_DIVA20PRO_U	0xe003
++#define PCI_DEVICE_ID_EICON_DIVA20_U	0xe004
++#define PCI_DEVICE_ID_EICON_DIVA201	0xe005
++#define PCI_DEVICE_ID_EICON_MAESTRA	0xe010
++#define PCI_DEVICE_ID_EICON_MAESTRAQ	0xe012
++#define PCI_DEVICE_ID_EICON_MAESTRAQ_U	0xe013
++#define PCI_DEVICE_ID_EICON_MAESTRAP	0xe014
++ 
++#define PCI_VENDOR_ID_CYCLONE		0x113c
++#define PCI_DEVICE_ID_CYCLONE_SDK	0x0001
++
++#define PCI_VENDOR_ID_ALLIANCE		0x1142
++#define PCI_DEVICE_ID_ALLIANCE_PROMOTIO	0x3210
++#define PCI_DEVICE_ID_ALLIANCE_PROVIDEO	0x6422
++#define PCI_DEVICE_ID_ALLIANCE_AT24	0x6424
++#define PCI_DEVICE_ID_ALLIANCE_AT3D	0x643d
++
++#define PCI_VENDOR_ID_SYSKONNECT	0x1148
++#define PCI_DEVICE_ID_SYSKONNECT_FP	0x4000
++#define PCI_DEVICE_ID_SYSKONNECT_TR	0x4200
++#define PCI_DEVICE_ID_SYSKONNECT_GE	0x4300
++
++#define PCI_VENDOR_ID_VMIC		0x114a
++#define PCI_DEVICE_ID_VMIC_VME		0x7587
++
++#define PCI_VENDOR_ID_DIGI		0x114f
++#define PCI_DEVICE_ID_DIGI_EPC		0x0002
++#define PCI_DEVICE_ID_DIGI_RIGHTSWITCH	0x0003
++#define PCI_DEVICE_ID_DIGI_XEM		0x0004
++#define PCI_DEVICE_ID_DIGI_XR		0x0005
++#define PCI_DEVICE_ID_DIGI_CX		0x0006
++#define PCI_DEVICE_ID_DIGI_XRJ		0x0009
++#define PCI_DEVICE_ID_DIGI_EPCJ		0x000a
++#define PCI_DEVICE_ID_DIGI_XR_920	0x0027
++#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E	0x0070
++#define PCI_DEVICE_ID_DIGI_DF_M_E	0x0071
++#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A	0x0072
++#define PCI_DEVICE_ID_DIGI_DF_M_A	0x0073
++
++#define PCI_VENDOR_ID_MUTECH		0x1159
++#define PCI_DEVICE_ID_MUTECH_MV1000	0x0001
++
++#define PCI_VENDOR_ID_XIRCOM		0x115d
++#define PCI_DEVICE_ID_XIRCOM_X3201_ETH	0x0003
++#define PCI_DEVICE_ID_XIRCOM_X3201_MDM	0x0103
++
++#define PCI_VENDOR_ID_RENDITION		0x1163
++#define PCI_DEVICE_ID_RENDITION_VERITE	0x0001
++#define PCI_DEVICE_ID_RENDITION_VERITE2100 0x2000
++
++#define PCI_VENDOR_ID_SERVERWORKS	  0x1166
++#define PCI_DEVICE_ID_SERVERWORKS_HE	  0x0008
++#define PCI_DEVICE_ID_SERVERWORKS_LE	  0x0009
++#define PCI_DEVICE_ID_SERVERWORKS_CIOB30  0x0010
++#define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE 0x0011
++#define PCI_DEVICE_ID_SERVERWORKS_OSB4	  0x0200
++#define PCI_DEVICE_ID_SERVERWORKS_CSB5	  0x0201
++#define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
++#define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
++#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
++#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
++#define PCI_DEVICE_ID_SERVERWORKS_CSB5ISA 0x0230
++
++#define PCI_VENDOR_ID_SBE		0x1176
++#define PCI_DEVICE_ID_SBE_WANXL100	0x0301
++#define PCI_DEVICE_ID_SBE_WANXL200	0x0302
++#define PCI_DEVICE_ID_SBE_WANXL400	0x0104
++
++#define PCI_VENDOR_ID_TOSHIBA		0x1179
++#define PCI_DEVICE_ID_TOSHIBA_601	0x0601
++#define PCI_DEVICE_ID_TOSHIBA_TOPIC95	0x060a
++#define PCI_DEVICE_ID_TOSHIBA_TOPIC97	0x060f
++
++#define PCI_VENDOR_ID_RICOH		0x1180
++#define PCI_DEVICE_ID_RICOH_RL5C465	0x0465
++#define PCI_DEVICE_ID_RICOH_RL5C466	0x0466
++#define PCI_DEVICE_ID_RICOH_RL5C475	0x0475
++#define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
++#define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
++
++#define	PCI_VENDOR_ID_DLINK		0x1186
++#define	PCI_DEVICE_ID_DFE530TXP		0x1300
++#define PCI_DEVICE_ID_DFE530TXS		0x1002
++
++#define PCI_VENDOR_ID_ARTOP		0x1191
++#define PCI_DEVICE_ID_ARTOP_ATP8400	0x0004
++#define PCI_DEVICE_ID_ARTOP_ATP850UF	0x0005
++#define PCI_DEVICE_ID_ARTOP_ATP860	0x0006
++#define PCI_DEVICE_ID_ARTOP_ATP860R	0x0007
++#define PCI_DEVICE_ID_ARTOP_AEC7610	0x8002
++#define PCI_DEVICE_ID_ARTOP_AEC7612UW	0x8010
++#define PCI_DEVICE_ID_ARTOP_AEC7612U	0x8020
++#define PCI_DEVICE_ID_ARTOP_AEC7612S	0x8030
++#define PCI_DEVICE_ID_ARTOP_AEC7612D	0x8040
++#define PCI_DEVICE_ID_ARTOP_AEC7612SUW	0x8050
++#define PCI_DEVICE_ID_ARTOP_8060	0x8060
++
++#define PCI_VENDOR_ID_ZEITNET		0x1193
++#define PCI_DEVICE_ID_ZEITNET_1221	0x0001
++#define PCI_DEVICE_ID_ZEITNET_1225	0x0002
++
++#define PCI_VENDOR_ID_OMEGA		0x119b
++#define PCI_DEVICE_ID_OMEGA_82C092G	0x1221
++
++#define PCI_VENDOR_ID_FUJITSU_ME	0x119e
++#define PCI_DEVICE_ID_FUJITSU_FS155	0x0001
++#define PCI_DEVICE_ID_FUJITSU_FS50	0x0003
++
++#define PCI_SUBVENDOR_ID_KEYSPAN	0x11a9
++#define PCI_SUBDEVICE_ID_KEYSPAN_SX2	0x5334
++
++#define PCI_VENDOR_ID_GALILEO		0x11ab
++#define PCI_DEVICE_ID_GALILEO_GT64011	0x4146
++#define PCI_DEVICE_ID_GALILEO_GT64111	0x4146
++#define PCI_DEVICE_ID_GALILEO_GT96100	0x9652
++#define PCI_DEVICE_ID_GALILEO_GT96100A	0x9653
++
++#define PCI_VENDOR_ID_LINKSYS		0x11ad
++#define PCI_VENDOR_ID_LITEON		0x11ad
++#define PCI_DEVICE_ID_LITEON_LNE100TX	0x0002
++#define PCI_DEVICE_ID_LC82C115		0xC115
++
++#define PCI_VENDOR_ID_V3		0x11b0
++#define PCI_DEVICE_ID_V3_V960		0x0001
++#define PCI_DEVICE_ID_V3_V350		0x0001
++#define PCI_DEVICE_ID_V3_V961		0x0002
++#define PCI_DEVICE_ID_V3_V351		0x0002
++
++#define PCI_VENDOR_ID_NP		0x11bc
++#define PCI_DEVICE_ID_NP_PCI_FDDI	0x0001
++
++#define PCI_VENDOR_ID_ATT		0x11c1
++#define PCI_DEVICE_ID_ATT_L56XMF	0x0440
++#define PCI_DEVICE_ID_ATT_VENUS_MODEM	0x480
++
++#define PCI_VENDOR_ID_SPECIALIX		0x11cb
++#define PCI_DEVICE_ID_SPECIALIX_IO8	0x2000
++#define PCI_DEVICE_ID_SPECIALIX_XIO	0x4000
++#define PCI_DEVICE_ID_SPECIALIX_RIO	0x8000
++#define PCI_SUBDEVICE_ID_SPECIALIX_SPEED4 0xa004
++
++#define PCI_VENDOR_ID_AURAVISION	0x11d1
++#define PCI_DEVICE_ID_AURAVISION_VXP524	0x01f7
++
++#define PCI_VENDOR_ID_ANALOG_DEVICES	0x11d4
++#define PCI_DEVICE_ID_AD1889JS		0x1889
++
++#define PCI_VENDOR_ID_IKON		0x11d5
++#define PCI_DEVICE_ID_IKON_10115	0x0115
++#define PCI_DEVICE_ID_IKON_10117	0x0117
++
++#define PCI_VENDOR_ID_ZORAN		0x11de
++#define PCI_DEVICE_ID_ZORAN_36057	0x6057
++#define PCI_DEVICE_ID_ZORAN_36120	0x6120
++
++#define PCI_VENDOR_ID_KINETIC		0x11f4
++#define PCI_DEVICE_ID_KINETIC_2915	0x2915
++
++#define PCI_VENDOR_ID_COMPEX		0x11f6
++#define PCI_DEVICE_ID_COMPEX_ENET100VG4	0x0112
++#define PCI_DEVICE_ID_COMPEX_RL2000	0x1401
++#define PCI_DEVICE_ID_COMPEX_RL100ATX   0x2011
++
++#define PCI_VENDOR_ID_RP		0x11fe
++#define PCI_DEVICE_ID_RP32INTF		0x0001
++#define PCI_DEVICE_ID_RP8INTF		0x0002
++#define PCI_DEVICE_ID_RP16INTF		0x0003
++#define PCI_DEVICE_ID_RP4QUAD		0x0004
++#define PCI_DEVICE_ID_RP8OCTA		0x0005
++#define PCI_DEVICE_ID_RP8J		0x0006
++#define PCI_DEVICE_ID_RPP4		0x000A
++#define PCI_DEVICE_ID_RPP8		0x000B
++#define PCI_DEVICE_ID_RP8M		0x000C
++
++#define PCI_VENDOR_ID_CYCLADES		0x120e
++#define PCI_DEVICE_ID_CYCLOM_Y_Lo	0x0100
++#define PCI_DEVICE_ID_CYCLOM_Y_Hi	0x0101
++#define PCI_DEVICE_ID_CYCLOM_4Y_Lo	0x0102
++#define PCI_DEVICE_ID_CYCLOM_4Y_Hi	0x0103
++#define PCI_DEVICE_ID_CYCLOM_8Y_Lo	0x0104
++#define PCI_DEVICE_ID_CYCLOM_8Y_Hi	0x0105
++#define PCI_DEVICE_ID_CYCLOM_Z_Lo	0x0200
++#define PCI_DEVICE_ID_CYCLOM_Z_Hi	0x0201
++#define PCI_DEVICE_ID_PC300_RX_2	0x0300
++#define PCI_DEVICE_ID_PC300_RX_1	0x0301
++#define PCI_DEVICE_ID_PC300_TE_2	0x0310
++#define PCI_DEVICE_ID_PC300_TE_1	0x0311
++
++#define PCI_VENDOR_ID_ESSENTIAL		0x120f
++#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER	0x0001
++
++#define PCI_VENDOR_ID_O2		0x1217
++#define PCI_DEVICE_ID_O2_6729		0x6729
++#define PCI_DEVICE_ID_O2_6730		0x673a
++#define PCI_DEVICE_ID_O2_6832		0x6832
++#define PCI_DEVICE_ID_O2_6836		0x6836
++
++#define PCI_VENDOR_ID_3DFX		0x121a
++#define PCI_DEVICE_ID_3DFX_VOODOO	0x0001
++#define PCI_DEVICE_ID_3DFX_VOODOO2	0x0002
++#define PCI_DEVICE_ID_3DFX_BANSHEE	0x0003
++#define PCI_DEVICE_ID_3DFX_VOODOO3	0x0005
++
++#define PCI_VENDOR_ID_SIGMADES		0x1236
++#define PCI_DEVICE_ID_SIGMADES_6425	0x6401
++
++#define PCI_VENDOR_ID_CCUBE		0x123f
++
++#define PCI_VENDOR_ID_AVM		0x1244
++#define PCI_DEVICE_ID_AVM_B1		0x0700
++#define PCI_DEVICE_ID_AVM_C4		0x0800
++#define PCI_DEVICE_ID_AVM_A1		0x0a00
++#define PCI_DEVICE_ID_AVM_A1_V2		0x0e00
++#define PCI_DEVICE_ID_AVM_C2		0x1100
++#define PCI_DEVICE_ID_AVM_T1		0x1200
++
++#define PCI_VENDOR_ID_DIPIX		0x1246
++
++#define PCI_VENDOR_ID_STALLION		0x124d
++#define PCI_DEVICE_ID_STALLION_ECHPCI832 0x0000
++#define PCI_DEVICE_ID_STALLION_ECHPCI864 0x0002
++#define PCI_DEVICE_ID_STALLION_EIOPCI	0x0003
++
++#define PCI_VENDOR_ID_OPTIBASE		0x1255
++#define PCI_DEVICE_ID_OPTIBASE_FORGE	0x1110
++#define PCI_DEVICE_ID_OPTIBASE_FUSION	0x1210
++#define PCI_DEVICE_ID_OPTIBASE_VPLEX	0x2110
++#define PCI_DEVICE_ID_OPTIBASE_VPLEXCC	0x2120
++#define PCI_DEVICE_ID_OPTIBASE_VQUEST	0x2130
++
++#define PCI_VENDOR_ID_ESS		0x125d
++#define PCI_DEVICE_ID_ESS_ESS1968	0x1968
++#define PCI_DEVICE_ID_ESS_AUDIOPCI	0x1969
++#define PCI_DEVICE_ID_ESS_ESS1978	0x1978
++
++#define PCI_VENDOR_ID_HARRIS        	0x1260
++#define PCI_DEVICE_ID_HARRIS_PRISM2	0x3873
++
++#define PCI_VENDOR_ID_SATSAGEM		0x1267
++#define PCI_DEVICE_ID_SATSAGEM_NICCY	0x1016
++#define PCI_DEVICE_ID_SATSAGEM_PCR2101	0x5352
++#define PCI_DEVICE_ID_SATSAGEM_TELSATTURBO 0x5a4b
++
++#define PCI_VENDOR_ID_HUGHES		0x1273
++#define PCI_DEVICE_ID_HUGHES_DIRECPC	0x0002
++
++#define PCI_VENDOR_ID_ENSONIQ		0x1274
++#define PCI_DEVICE_ID_ENSONIQ_CT5880	0x5880
++#define PCI_DEVICE_ID_ENSONIQ_ES1370	0x5000
++#define PCI_DEVICE_ID_ENSONIQ_ES1371	0x1371
++
++#define PCI_VENDOR_ID_ROCKWELL		0x127A
++
++#define PCI_VENDOR_ID_DAVICOM		0x1282
++#define	PCI_DEVICE_ID_DM9009		0x9009
++#define PCI_DEVICE_ID_DM9102		0x9102
++
++#define PCI_VENDOR_ID_ITE		0x1283
++#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
++#define PCI_DEVICE_ID_ITE_IT8172G	0x8172
++#define PCI_DEVICE_ID_ITE_8872		0x8872
++
++
++/* formerly Platform Tech */
++#define PCI_VENDOR_ID_ESS_OLD		0x1285
++#define PCI_DEVICE_ID_ESS_ESS0100	0x0100
++
++#define PCI_VENDOR_ID_ALTEON		0x12ae
++#define PCI_DEVICE_ID_ALTEON_ACENIC	0x0001
++
++#define PCI_VENDOR_ID_USR		0x12B9
++
++#define	PCI_VENDOR_ID_HOLTEK		0x12c3
++#define	PCI_DEVICE_ID_HOLTEK_HT80232	0x0058
++
++#define PCI_SUBVENDOR_ID_CONNECT_TECH			0x12c4
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232		0x0001
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_232		0x0002
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_232		0x0003
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485		0x0004
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_4_4	0x0005
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485		0x0006
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485_2_2	0x0007
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_485		0x0008
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6	0x0009
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1	0x000A
++#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1	0x000B
++
++#define PCI_VENDOR_ID_PICTUREL		0x12c5
++#define PCI_DEVICE_ID_PICTUREL_PCIVST	0x0081
++
++#define PCI_VENDOR_ID_NVIDIA_SGS	0x12d2
++#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
++
++#define PCI_SUBVENDOR_ID_CHASE_PCIFAST		0x12E0
++#define PCI_SUBDEVICE_ID_CHASE_PCIFAST4		0x0031
++#define PCI_SUBDEVICE_ID_CHASE_PCIFAST8		0x0021
++#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16	0x0011
++#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC	0x0041
++#define PCI_SUBVENDOR_ID_CHASE_PCIRAS		0x124D
++#define PCI_SUBDEVICE_ID_CHASE_PCIRAS4		0xF001
++#define PCI_SUBDEVICE_ID_CHASE_PCIRAS8		0xF010
++
++#define PCI_VENDOR_ID_AUREAL		0x12eb
++#define PCI_DEVICE_ID_AUREAL_VORTEX_1	0x0001
++#define PCI_DEVICE_ID_AUREAL_VORTEX_2	0x0002
++
++#define PCI_VENDOR_ID_CBOARDS		0x1307
++#define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001
++
++#define PCI_VENDOR_ID_SIIG		0x131f
++#define PCI_DEVICE_ID_SIIG_1S_10x_550	0x1000
++#define PCI_DEVICE_ID_SIIG_1S_10x_650	0x1001
++#define PCI_DEVICE_ID_SIIG_1S_10x_850	0x1002
++#define PCI_DEVICE_ID_SIIG_1S1P_10x_550	0x1010
++#define PCI_DEVICE_ID_SIIG_1S1P_10x_650	0x1011
++#define PCI_DEVICE_ID_SIIG_1S1P_10x_850	0x1012
++#define PCI_DEVICE_ID_SIIG_1P_10x	0x1020
++#define PCI_DEVICE_ID_SIIG_2P_10x	0x1021
++#define PCI_DEVICE_ID_SIIG_2S_10x_550	0x1030
++#define PCI_DEVICE_ID_SIIG_2S_10x_650	0x1031
++#define PCI_DEVICE_ID_SIIG_2S_10x_850	0x1032
++#define PCI_DEVICE_ID_SIIG_2S1P_10x_550	0x1034
++#define PCI_DEVICE_ID_SIIG_2S1P_10x_650	0x1035
++#define PCI_DEVICE_ID_SIIG_2S1P_10x_850	0x1036
++#define PCI_DEVICE_ID_SIIG_4S_10x_550	0x1050
++#define PCI_DEVICE_ID_SIIG_4S_10x_650	0x1051
++#define PCI_DEVICE_ID_SIIG_4S_10x_850	0x1052
++#define PCI_DEVICE_ID_SIIG_1S_20x_550	0x2000
++#define PCI_DEVICE_ID_SIIG_1S_20x_650	0x2001
++#define PCI_DEVICE_ID_SIIG_1S_20x_850	0x2002
++#define PCI_DEVICE_ID_SIIG_1P_20x	0x2020
++#define PCI_DEVICE_ID_SIIG_2P_20x	0x2021
++#define PCI_DEVICE_ID_SIIG_2S_20x_550	0x2030
++#define PCI_DEVICE_ID_SIIG_2S_20x_650	0x2031
++#define PCI_DEVICE_ID_SIIG_2S_20x_850	0x2032
++#define PCI_DEVICE_ID_SIIG_2P1S_20x_550	0x2040
++#define PCI_DEVICE_ID_SIIG_2P1S_20x_650	0x2041
++#define PCI_DEVICE_ID_SIIG_2P1S_20x_850	0x2042
++#define PCI_DEVICE_ID_SIIG_1S1P_20x_550	0x2010
++#define PCI_DEVICE_ID_SIIG_1S1P_20x_650	0x2011
++#define PCI_DEVICE_ID_SIIG_1S1P_20x_850	0x2012
++#define PCI_DEVICE_ID_SIIG_4S_20x_550	0x2050
++#define PCI_DEVICE_ID_SIIG_4S_20x_650	0x2051
++#define PCI_DEVICE_ID_SIIG_4S_20x_850	0x2052
++#define PCI_DEVICE_ID_SIIG_2S1P_20x_550	0x2060
++#define PCI_DEVICE_ID_SIIG_2S1P_20x_650	0x2061
++#define PCI_DEVICE_ID_SIIG_2S1P_20x_850	0x2062
++
++#define PCI_VENDOR_ID_ADMTEK            0x1317
++#define PCI_DEVICE_ID_ADMTEK_0985       0x0985
++
++#define PCI_VENDOR_ID_DOMEX		0x134a
++#define PCI_DEVICE_ID_DOMEX_DMX3191D	0x0001
++
++#define PCI_VENDOR_ID_QUATECH		0x135C
++#define PCI_DEVICE_ID_QUATECH_QSC100	0x0010
++#define PCI_DEVICE_ID_QUATECH_DSC100	0x0020
++#define PCI_DEVICE_ID_QUATECH_DSC200	0x0030
++#define PCI_DEVICE_ID_QUATECH_QSC200	0x0040
++#define PCI_DEVICE_ID_QUATECH_ESC100D	0x0050
++#define PCI_DEVICE_ID_QUATECH_ESC100M	0x0060
++
++#define PCI_VENDOR_ID_SEALEVEL		0x135e
++#define PCI_DEVICE_ID_SEALEVEL_U530	0x7101
++#define PCI_DEVICE_ID_SEALEVEL_UCOMM2	0x7201
++#define PCI_DEVICE_ID_SEALEVEL_UCOMM422	0x7402
++#define PCI_DEVICE_ID_SEALEVEL_UCOMM232	0x7202
++#define PCI_DEVICE_ID_SEALEVEL_COMM4	0x7401
++#define PCI_DEVICE_ID_SEALEVEL_COMM8	0x7801
++
++#define PCI_VENDOR_ID_HYPERCOPE		0x1365
++#define PCI_DEVICE_ID_HYPERCOPE_PLX	0x9050
++#define PCI_SUBDEVICE_ID_HYPERCOPE_OLD_ERGO	0x0104
++#define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO		0x0106
++#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO	0x0107
++#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2	0x0108
++#define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS	0x0109
++
++#define PCI_VENDOR_ID_KAWASAKI		0x136b
++#define PCI_DEVICE_ID_MCHIP_KL5A72002	0xff01
++
++#define PCI_VENDOR_ID_LMC		0x1376
++#define PCI_DEVICE_ID_LMC_HSSI		0x0003
++#define PCI_DEVICE_ID_LMC_DS3		0x0004
++#define PCI_DEVICE_ID_LMC_SSI		0x0005
++#define PCI_DEVICE_ID_LMC_T1		0x0006
++
++#define PCI_VENDOR_ID_NETGEAR		0x1385
++#define PCI_DEVICE_ID_NETGEAR_MA301	0x4100
++#define PCI_DEVICE_ID_NETGEAR_GA620	0x620a
++#define PCI_DEVICE_ID_NETGEAR_GA622	0x622a
++
++#define PCI_VENDOR_ID_APPLICOM		0x1389
++#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
++#define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002
++#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
++
++#define PCI_VENDOR_ID_MOXA		0x1393
++#define PCI_DEVICE_ID_MOXA_C104		0x1040
++#define PCI_DEVICE_ID_MOXA_C168		0x1680
++#define PCI_DEVICE_ID_MOXA_CP204J	0x2040
++#define PCI_DEVICE_ID_MOXA_C218		0x2180
++#define PCI_DEVICE_ID_MOXA_C320		0x3200
++
++#define PCI_VENDOR_ID_CCD		0x1397
++#define PCI_DEVICE_ID_CCD_2BD0		0x2bd0
++#define PCI_DEVICE_ID_CCD_B000		0xb000
++#define PCI_DEVICE_ID_CCD_B006		0xb006
++#define PCI_DEVICE_ID_CCD_B007		0xb007
++#define PCI_DEVICE_ID_CCD_B008		0xb008
++#define PCI_DEVICE_ID_CCD_B009		0xb009
++#define PCI_DEVICE_ID_CCD_B00A		0xb00a
++#define PCI_DEVICE_ID_CCD_B00B		0xb00b
++#define PCI_DEVICE_ID_CCD_B00C		0xb00c
++#define PCI_DEVICE_ID_CCD_B100		0xb100
++
++#define PCI_VENDOR_ID_MICROGATE		0x13c0
++#define PCI_DEVICE_ID_MICROGATE_USC	0x0010
++#define PCI_DEVICE_ID_MICROGATE_SCC	0x0020
++#define PCI_DEVICE_ID_MICROGATE_SCA	0x0030
++
++#define PCI_VENDOR_ID_3WARE		0x13C1
++#define PCI_DEVICE_ID_3WARE_1000	0x1000
++
++#define PCI_VENDOR_ID_ABOCOM		0x13D1
++#define PCI_DEVICE_ID_ABOCOM_2BD1       0x2BD1
++
++#define PCI_VENDOR_ID_CMEDIA		0x13f6
++#define PCI_DEVICE_ID_CMEDIA_CM8338A	0x0100
++#define PCI_DEVICE_ID_CMEDIA_CM8338B	0x0101
++#define PCI_DEVICE_ID_CMEDIA_CM8738	0x0111
++#define PCI_DEVICE_ID_CMEDIA_CM8738B	0x0112
++
++#define PCI_VENDOR_ID_LAVA		0x1407
++#define PCI_DEVICE_ID_LAVA_DSERIAL	0x0100 /* 2x 16550 */
++#define PCI_DEVICE_ID_LAVA_QUATRO_A	0x0101 /* 2x 16550, half of 4 port */
++#define PCI_DEVICE_ID_LAVA_QUATRO_B	0x0102 /* 2x 16550, half of 4 port */
++#define PCI_DEVICE_ID_LAVA_PORT_PLUS	0x0200 /* 2x 16650 */
++#define PCI_DEVICE_ID_LAVA_QUAD_A	0x0201 /* 2x 16650, half of 4 port */
++#define PCI_DEVICE_ID_LAVA_QUAD_B	0x0202 /* 2x 16650, half of 4 port */
++#define PCI_DEVICE_ID_LAVA_SSERIAL	0x0500 /* 1x 16550 */
++#define PCI_DEVICE_ID_LAVA_PORT_650	0x0600 /* 1x 16650 */
++#define PCI_DEVICE_ID_LAVA_PARALLEL	0x8000
++#define PCI_DEVICE_ID_LAVA_DUAL_PAR_A	0x8002 /* The Lava Dual Parallel is */
++#define PCI_DEVICE_ID_LAVA_DUAL_PAR_B	0x8003 /* two PCI devices on a card */
++#define PCI_DEVICE_ID_LAVA_BOCA_IOPPAR	0x8800
++
++#define PCI_VENDOR_ID_TIMEDIA		0x1409
++#define PCI_DEVICE_ID_TIMEDIA_1889	0x7168
++
++#define PCI_VENDOR_ID_OXSEMI		0x1415
++#define PCI_DEVICE_ID_OXSEMI_12PCI840	0x8403
++#define PCI_DEVICE_ID_OXSEMI_16PCI954	0x9501
++#define PCI_DEVICE_ID_OXSEMI_16PCI952	0x950A
++#define PCI_DEVICE_ID_OXSEMI_16PCI95N	0x9511
++#define PCI_DEVICE_ID_OXSEMI_16PCI954PP	0x9513
++
++#define PCI_VENDOR_ID_AIRONET		0x14b9
++#define PCI_DEVICE_ID_AIRONET_4800_1	0x0001
++#define PCI_DEVICE_ID_AIRONET_4800	0x4500 // values switched?  see
++#define PCI_DEVICE_ID_AIRONET_4500	0x4800 // drivers/net/aironet4500_card.c
++
++#define PCI_VENDOR_ID_TITAN		0x14D2
++#define PCI_DEVICE_ID_TITAN_010L	0x8001
++#define PCI_DEVICE_ID_TITAN_100L	0x8010
++#define PCI_DEVICE_ID_TITAN_110L	0x8011
++#define PCI_DEVICE_ID_TITAN_200L	0x8020
++#define PCI_DEVICE_ID_TITAN_210L	0x8021
++#define PCI_DEVICE_ID_TITAN_400L	0x8040
++#define PCI_DEVICE_ID_TITAN_800L	0x8080
++#define PCI_DEVICE_ID_TITAN_100		0xA001
++#define PCI_DEVICE_ID_TITAN_200		0xA005
++#define PCI_DEVICE_ID_TITAN_400		0xA003
++#define PCI_DEVICE_ID_TITAN_800B	0xA004
++
++#define PCI_VENDOR_ID_PANACOM		0x14d4
++#define PCI_DEVICE_ID_PANACOM_QUADMODEM	0x0400
++#define PCI_DEVICE_ID_PANACOM_DUALMODEM	0x0402
++
++#define PCI_VENDOR_ID_BROADCOM		0x14e4
++#define PCI_DEVICE_ID_TIGON3_5700	0x1644
++#define PCI_DEVICE_ID_TIGON3_5701	0x1645
++#define PCI_DEVICE_ID_TIGON3_5702	0x1646
++#define PCI_DEVICE_ID_TIGON3_5703	0x1647
++#define PCI_DEVICE_ID_TIGON3_5704	0x1648
++#define PCI_DEVICE_ID_TIGON3_5702FE	0x164d
++#define PCI_DEVICE_ID_TIGON3_5705	0x1653
++#define PCI_DEVICE_ID_TIGON3_5705_2	0x1654
++#define PCI_DEVICE_ID_TIGON3_5705M	0x165d
++#define PCI_DEVICE_ID_TIGON3_5705M_2	0x165e
++#define PCI_DEVICE_ID_TIGON3_5782	0x1696
++#define PCI_DEVICE_ID_TIGON3_5788	0x169c
++#define PCI_DEVICE_ID_TIGON3_5702X	0x16a6
++#define PCI_DEVICE_ID_TIGON3_5703X	0x16a7
++#define PCI_DEVICE_ID_TIGON3_5704S	0x16a8
++#define PCI_DEVICE_ID_TIGON3_5702A3	0x16c6
++#define PCI_DEVICE_ID_TIGON3_5703A3	0x16c7
++#define PCI_DEVICE_ID_TIGON3_5901	0x170d
++#define PCI_DEVICE_ID_TIGON3_5901_2	0x170e
++
++#define PCI_VENDOR_ID_SYBA		0x1592
++#define PCI_DEVICE_ID_SYBA_2P_EPP	0x0782
++#define PCI_DEVICE_ID_SYBA_1P_ECP	0x0783
++
++#define PCI_VENDOR_ID_MORETON		0x15aa
++#define PCI_DEVICE_ID_RASTEL_2PORT	0x2000
++
++#define PCI_VENDOR_ID_ZOLTRIX		0x15b0
++#define PCI_DEVICE_ID_ZOLTRIX_2BD0	0x2bd0 
++
++#define PCI_VENDOR_ID_PDC		0x15e9
++#define PCI_DEVICE_ID_PDC_1841		0x1841
++
++#define PCI_VENDOR_ID_SYMPHONY		0x1c1c
++#define PCI_DEVICE_ID_SYMPHONY_101	0x0001
++
++#define PCI_VENDOR_ID_TEKRAM		0x1de1
++#define PCI_DEVICE_ID_TEKRAM_DC290	0xdc29
++
++#define PCI_VENDOR_ID_3DLABS		0x3d3d
++#define PCI_DEVICE_ID_3DLABS_300SX	0x0001
++#define PCI_DEVICE_ID_3DLABS_500TX	0x0002
++#define PCI_DEVICE_ID_3DLABS_DELTA	0x0003
++#define PCI_DEVICE_ID_3DLABS_PERMEDIA	0x0004
++#define PCI_DEVICE_ID_3DLABS_MX		0x0006
++#define PCI_DEVICE_ID_3DLABS_PERMEDIA2	0x0007
++#define PCI_DEVICE_ID_3DLABS_GAMMA	0x0008
++#define PCI_DEVICE_ID_3DLABS_PERMEDIA2V	0x0009
++
++#define PCI_VENDOR_ID_AVANCE		0x4005
++#define PCI_DEVICE_ID_AVANCE_ALG2064	0x2064
++#define PCI_DEVICE_ID_AVANCE_2302	0x2302
++
++#define PCI_VENDOR_ID_AKS		0x416c
++#define PCI_DEVICE_ID_AKS_ALADDINCARD	0x0100
++#define PCI_DEVICE_ID_AKS_CPC		0x0200
++
++#define PCI_VENDOR_ID_NETVIN		0x4a14
++#define PCI_DEVICE_ID_NETVIN_NV5000SC	0x5000
++
++#define PCI_VENDOR_ID_S3		0x5333
++#define PCI_DEVICE_ID_S3_PLATO_PXS	0x0551
++#define PCI_DEVICE_ID_S3_ViRGE		0x5631
++#define PCI_DEVICE_ID_S3_TRIO		0x8811
++#define PCI_DEVICE_ID_S3_AURORA64VP	0x8812
++#define PCI_DEVICE_ID_S3_TRIO64UVP	0x8814
++#define PCI_DEVICE_ID_S3_ViRGE_VX	0x883d
++#define PCI_DEVICE_ID_S3_868		0x8880
++#define PCI_DEVICE_ID_S3_928		0x88b0
++#define PCI_DEVICE_ID_S3_864_1		0x88c0
++#define PCI_DEVICE_ID_S3_864_2		0x88c1
++#define PCI_DEVICE_ID_S3_964_1		0x88d0
++#define PCI_DEVICE_ID_S3_964_2		0x88d1
++#define PCI_DEVICE_ID_S3_968		0x88f0
++#define PCI_DEVICE_ID_S3_TRIO64V2	0x8901
++#define PCI_DEVICE_ID_S3_PLATO_PXG	0x8902
++#define PCI_DEVICE_ID_S3_ViRGE_DXGX	0x8a01
++#define PCI_DEVICE_ID_S3_ViRGE_GX2	0x8a10
++#define PCI_DEVICE_ID_S3_ViRGE_MX	0x8c01
++#define PCI_DEVICE_ID_S3_ViRGE_MXP	0x8c02
++#define PCI_DEVICE_ID_S3_ViRGE_MXPMV	0x8c03
++#define PCI_DEVICE_ID_S3_SONICVIBES	0xca00
++
++#define PCI_VENDOR_ID_DCI		0x6666
++#define PCI_DEVICE_ID_DCI_PCCOM4	0x0001
++#define PCI_DEVICE_ID_DCI_PCCOM8	0x0002
++
++#define PCI_VENDOR_ID_GENROCO		0x5555
++#define PCI_DEVICE_ID_GENROCO_HFP832	0x0003
++
++#define PCI_VENDOR_ID_INTEL		0x8086
++#define PCI_DEVICE_ID_INTEL_21145	0x0039
++#define PCI_DEVICE_ID_INTEL_82375	0x0482
++#define PCI_DEVICE_ID_INTEL_82424	0x0483
++#define PCI_DEVICE_ID_INTEL_82378	0x0484
++#define PCI_DEVICE_ID_INTEL_82430	0x0486
++#define PCI_DEVICE_ID_INTEL_82434	0x04a3
++#define PCI_DEVICE_ID_INTEL_I960	0x0960
++#define PCI_DEVICE_ID_INTEL_82542       	0x1000
++#define PCI_DEVICE_ID_INTEL_82543GC_FIBER  	0x1001
++#define PCI_DEVICE_ID_INTEL_82543GC_COPPER 	0x1004
++#define PCI_DEVICE_ID_INTEL_82544EI_COPPER 	0x1008
++#define PCI_DEVICE_ID_INTEL_82544EI_FIBER 	0x1009
++#define PCI_DEVICE_ID_INTEL_82544GC_COPPER 	0x100C
++#define PCI_DEVICE_ID_INTEL_82544GC_LOM   	0x100D
++#define PCI_DEVICE_ID_INTEL_82540EM		0x100E
++#define PCI_DEVICE_ID_INTEL_82545EM_COPPER	0x100F
++#define PCI_DEVICE_ID_INTEL_82546EB_COPPER	0x1010
++#define PCI_DEVICE_ID_INTEL_82545EM_FIBER	0x1011
++#define PCI_DEVICE_ID_INTEL_82546EB_FIBER	0x1012
++#define PCI_DEVICE_ID_INTEL_82540EM_LOM		0x1015
++#define PCI_DEVICE_ID_INTEL_ID1029	0x1029
++#define PCI_DEVICE_ID_INTEL_ID1030	0x1030
++#define PCI_DEVICE_ID_INTEL_ID1031	0x1031
++#define PCI_DEVICE_ID_INTEL_ID1038	0x1038
++#define PCI_DEVICE_ID_INTEL_ID1039	0x1039
++#define PCI_DEVICE_ID_INTEL_ID103A	0x103A
++#define PCI_DEVICE_ID_INTEL_82562ET	0x1031
++#define PCI_DEVICE_ID_INTEL_82559ER	0x1209
++#define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
++#define PCI_DEVICE_ID_INTEL_82092AA_1	0x1222
++#define PCI_DEVICE_ID_INTEL_7116	0x1223
++#define PCI_DEVICE_ID_INTEL_82596	0x1226
++#define PCI_DEVICE_ID_INTEL_82865	0x1227
++#define PCI_DEVICE_ID_INTEL_82557	0x1229
++#define PCI_DEVICE_ID_INTEL_82437	0x122d
++#define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
++#define PCI_DEVICE_ID_INTEL_82371FB_1	0x1230
++#define PCI_DEVICE_ID_INTEL_82371MX	0x1234
++#define PCI_DEVICE_ID_INTEL_82437MX	0x1235
++#define PCI_DEVICE_ID_INTEL_82441	0x1237
++#define PCI_DEVICE_ID_INTEL_82380FB	0x124b
++#define PCI_DEVICE_ID_INTEL_82439	0x1250
++#define PCI_DEVICE_ID_INTEL_80960_RP	0x1960
++#define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
++#define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
++#define PCI_DEVICE_ID_INTEL_82801AA_2	0x2412
++#define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
++#define PCI_DEVICE_ID_INTEL_82801AA_5	0x2415
++#define PCI_DEVICE_ID_INTEL_82801AA_6	0x2416
++#define PCI_DEVICE_ID_INTEL_82801AA_8	0x2418
++#define PCI_DEVICE_ID_INTEL_82801AB_0	0x2420
++#define PCI_DEVICE_ID_INTEL_82801AB_1	0x2421
++#define PCI_DEVICE_ID_INTEL_82801AB_2	0x2422
++#define PCI_DEVICE_ID_INTEL_82801AB_3	0x2423
++#define PCI_DEVICE_ID_INTEL_82801AB_5	0x2425
++#define PCI_DEVICE_ID_INTEL_82801AB_6	0x2426
++#define PCI_DEVICE_ID_INTEL_82801AB_8	0x2428
++#define PCI_DEVICE_ID_INTEL_82801BA_0	0x2440
++#define PCI_DEVICE_ID_INTEL_82801BA_1	0x2442
++#define PCI_DEVICE_ID_INTEL_82801BA_2	0x2443
++#define PCI_DEVICE_ID_INTEL_82801BA_3	0x2444
++#define PCI_DEVICE_ID_INTEL_82801BA_4	0x2445
++#define PCI_DEVICE_ID_INTEL_82801BA_5	0x2446
++#define PCI_DEVICE_ID_INTEL_82801BA_6	0x2448
++#define PCI_DEVICE_ID_INTEL_82801BA_7	0x2449
++#define PCI_DEVICE_ID_INTEL_82562	0x2449
++#define PCI_DEVICE_ID_INTEL_82801BA_8	0x244a
++#define PCI_DEVICE_ID_INTEL_82801BA_9	0x244b
++#define PCI_DEVICE_ID_INTEL_82801BA_10	0x244c
++#define PCI_DEVICE_ID_INTEL_82801BA_11	0x244e
++#define PCI_DEVICE_ID_INTEL_82801CA_0	0x2480
++#define PCI_DEVICE_ID_INTEL_82801CA_2	0x2482
++#define PCI_DEVICE_ID_INTEL_82801CA_3	0x2483
++#define PCI_DEVICE_ID_INTEL_82801CA_4	0x2484
++#define PCI_DEVICE_ID_INTEL_82801CA_5	0x2485
++#define PCI_DEVICE_ID_INTEL_82801CA_6	0x2486
++#define PCI_DEVICE_ID_INTEL_82801CA_7	0x2487
++#define PCI_DEVICE_ID_INTEL_82801CA_10	0x248a
++#define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
++#define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c
++#define PCI_DEVICE_ID_INTEL_80310	0x530d
++#define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
++#define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
++#define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020
++#define PCI_DEVICE_ID_INTEL_82437VX	0x7030
++#define PCI_DEVICE_ID_INTEL_82439TX	0x7100
++#define PCI_DEVICE_ID_INTEL_82371AB_0	0x7110
++#define PCI_DEVICE_ID_INTEL_82371AB	0x7111
++#define PCI_DEVICE_ID_INTEL_82371AB_2	0x7112
++#define PCI_DEVICE_ID_INTEL_82371AB_3	0x7113
++#define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
++#define PCI_DEVICE_ID_INTEL_82810_IG1	0x7121
++#define PCI_DEVICE_ID_INTEL_82810_MC3	0x7122
++#define PCI_DEVICE_ID_INTEL_82810_IG3	0x7123
++#define PCI_DEVICE_ID_INTEL_82443LX_0	0x7180
++#define PCI_DEVICE_ID_INTEL_82443LX_1	0x7181
++#define PCI_DEVICE_ID_INTEL_82443BX_0	0x7190
++#define PCI_DEVICE_ID_INTEL_82443BX_1	0x7191
++#define PCI_DEVICE_ID_INTEL_82443BX_2	0x7192
++#define PCI_DEVICE_ID_INTEL_82443MX_0	0x7198
++#define PCI_DEVICE_ID_INTEL_82443MX_1	0x7199
++#define PCI_DEVICE_ID_INTEL_82443MX_2	0x719a
++#define PCI_DEVICE_ID_INTEL_82443MX_3	0x719b
++#define PCI_DEVICE_ID_INTEL_82372FB_0	0x7600
++#define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
++#define PCI_DEVICE_ID_INTEL_82372FB_2	0x7602
++#define PCI_DEVICE_ID_INTEL_82372FB_3	0x7603
++#define PCI_DEVICE_ID_INTEL_82454GX	0x84c4
++#define PCI_DEVICE_ID_INTEL_82450GX	0x84c5
++#define PCI_DEVICE_ID_INTEL_82451NX	0x84ca
++
++#define PCI_VENDOR_ID_COMPUTONE		0x8e0e
++#define PCI_DEVICE_ID_COMPUTONE_IP2EX	0x0291
++#define PCI_DEVICE_ID_COMPUTONE_PG	0x0302
++#define PCI_SUBVENDOR_ID_COMPUTONE	0x8e0e
++#define PCI_SUBDEVICE_ID_COMPUTONE_PG4	0x0001
++#define PCI_SUBDEVICE_ID_COMPUTONE_PG8	0x0002
++#define PCI_SUBDEVICE_ID_COMPUTONE_PG6	0x0003
++
++#define PCI_VENDOR_ID_KTI		0x8e2e
++#define PCI_DEVICE_ID_KTI_ET32P2	0x3000
++
++#define PCI_VENDOR_ID_ADAPTEC		0x9004
++#define PCI_DEVICE_ID_ADAPTEC_7810	0x1078
++#define PCI_DEVICE_ID_ADAPTEC_7821	0x2178
++#define PCI_DEVICE_ID_ADAPTEC_38602	0x3860
++#define PCI_DEVICE_ID_ADAPTEC_7850	0x5078
++#define PCI_DEVICE_ID_ADAPTEC_7855	0x5578
++#define PCI_DEVICE_ID_ADAPTEC_5800	0x5800
++#define PCI_DEVICE_ID_ADAPTEC_3860	0x6038
++#define PCI_DEVICE_ID_ADAPTEC_1480A	0x6075
++#define PCI_DEVICE_ID_ADAPTEC_7860	0x6078
++#define PCI_DEVICE_ID_ADAPTEC_7861	0x6178
++#define PCI_DEVICE_ID_ADAPTEC_7870	0x7078
++#define PCI_DEVICE_ID_ADAPTEC_7871	0x7178
++#define PCI_DEVICE_ID_ADAPTEC_7872	0x7278
++#define PCI_DEVICE_ID_ADAPTEC_7873	0x7378
++#define PCI_DEVICE_ID_ADAPTEC_7874	0x7478
++#define PCI_DEVICE_ID_ADAPTEC_7895	0x7895
++#define PCI_DEVICE_ID_ADAPTEC_7880	0x8078
++#define PCI_DEVICE_ID_ADAPTEC_7881	0x8178
++#define PCI_DEVICE_ID_ADAPTEC_7882	0x8278
++#define PCI_DEVICE_ID_ADAPTEC_7883	0x8378
++#define PCI_DEVICE_ID_ADAPTEC_7884	0x8478
++#define PCI_DEVICE_ID_ADAPTEC_7885	0x8578
++#define PCI_DEVICE_ID_ADAPTEC_7886	0x8678
++#define PCI_DEVICE_ID_ADAPTEC_7887	0x8778
++#define PCI_DEVICE_ID_ADAPTEC_7888	0x8878
++#define PCI_DEVICE_ID_ADAPTEC_1030	0x8b78
++
++#define PCI_VENDOR_ID_ADAPTEC2		0x9005
++#define PCI_DEVICE_ID_ADAPTEC2_2940U2	0x0010
++#define PCI_DEVICE_ID_ADAPTEC2_2930U2	0x0011
++#define PCI_DEVICE_ID_ADAPTEC2_7890B	0x0013
++#define PCI_DEVICE_ID_ADAPTEC2_7890	0x001f
++#define PCI_DEVICE_ID_ADAPTEC2_3940U2	0x0050
++#define PCI_DEVICE_ID_ADAPTEC2_3950U2D	0x0051
++#define PCI_DEVICE_ID_ADAPTEC2_7896	0x005f
++#define PCI_DEVICE_ID_ADAPTEC2_7892A	0x0080
++#define PCI_DEVICE_ID_ADAPTEC2_7892B	0x0081
++#define PCI_DEVICE_ID_ADAPTEC2_7892D	0x0083
++#define PCI_DEVICE_ID_ADAPTEC2_7892P	0x008f
++#define PCI_DEVICE_ID_ADAPTEC2_7899A	0x00c0
++#define PCI_DEVICE_ID_ADAPTEC2_7899B	0x00c1
++#define PCI_DEVICE_ID_ADAPTEC2_7899D	0x00c3
++#define PCI_DEVICE_ID_ADAPTEC2_7899P	0x00cf
++
++#define PCI_VENDOR_ID_ATRONICS		0x907f
++#define PCI_DEVICE_ID_ATRONICS_2015	0x2015
++
++#define PCI_VENDOR_ID_HOLTEK2		0x9412
++#define PCI_DEVICE_ID_HOLTEK2_6565	0x6565
++
++#define PCI_VENDOR_ID_NETMOS		0x9710
++#define PCI_DEVICE_ID_NETMOS_9735	0x9735
++#define PCI_DEVICE_ID_NETMOS_9835	0x9835
++
++#define PCI_SUBVENDOR_ID_EXSYS		0xd84d
++#define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014
++
++#define PCI_VENDOR_ID_TIGERJET		0xe159
++#define PCI_DEVICE_ID_TIGERJET_300	0x0001
++#define PCI_DEVICE_ID_TIGERJET_100	0x0002
++
++#define PCI_VENDOR_ID_ARK		0xedd8
++#define PCI_DEVICE_ID_ARK_STING		0xa091
++#define PCI_DEVICE_ID_ARK_STINGARK	0xa099
++#define PCI_DEVICE_ID_ARK_2000MT	0xa0a1
++
+diff -Naur grub-0.97.orig/netboot/pci_io.c grub-0.97/netboot/pci_io.c
+--- grub-0.97.orig/netboot/pci_io.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pci_io.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,431 @@
++/*
++** Support for NE2000 PCI clones added David Monro June 1997
++** Generalised to other NICs by Ken Yap July 1997
++**
++** Most of this is taken from:
++**
++** /usr/src/linux/drivers/pci/pci.c
++** /usr/src/linux/include/linux/pci.h
++** /usr/src/linux/arch/i386/bios32.c
++** /usr/src/linux/include/linux/bios32.h
++** /usr/src/linux/drivers/net/ne.c
++*/
++#define PCBIOS
++#include "grub.h"
++#include "pci.h"
++
++#ifdef	CONFIG_PCI_DIRECT
++#define  PCIBIOS_SUCCESSFUL                0x00
++
++#define DEBUG 0
++
++/*
++ * Functions for accessing PCI configuration space with type 1 accesses
++ */
++
++#define CONFIG_CMD(bus, device_fn, where)   (0x80000000 | (bus << 16) | (device_fn << 8) | (where & ~3))
++
++int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn,
++			       unsigned int where, uint8_t *value)
++{
++    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
++    *value = inb(0xCFC + (where&3));
++    return PCIBIOS_SUCCESSFUL;
++}
++
++int pcibios_read_config_word (unsigned int bus,
++    unsigned int device_fn, unsigned int where, uint16_t *value)
++{
++    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
++    *value = inw(0xCFC + (where&2));
++    return PCIBIOS_SUCCESSFUL;
++}
++
++int pcibios_read_config_dword (unsigned int bus, unsigned int device_fn,
++				 unsigned int where, uint32_t *value)
++{
++    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
++    *value = inl(0xCFC);
++    return PCIBIOS_SUCCESSFUL;
++}
++
++int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn,
++				 unsigned int where, uint8_t value)
++{
++    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
++    outb(value, 0xCFC + (where&3));
++    return PCIBIOS_SUCCESSFUL;
++}
++
++int pcibios_write_config_word (unsigned int bus, unsigned int device_fn,
++				 unsigned int where, uint16_t value)
++{
++    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
++    outw(value, 0xCFC + (where&2));
++    return PCIBIOS_SUCCESSFUL;
++}
++
++int pcibios_write_config_dword (unsigned int bus, unsigned int device_fn, unsigned int where, uint32_t value)
++{
++    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
++    outl(value, 0xCFC);
++    return PCIBIOS_SUCCESSFUL;
++}
++
++#undef CONFIG_CMD
++
++#else	 /* CONFIG_PCI_DIRECT  not defined */
++
++#if !defined(PCBIOS)
++#error "The pcibios can only be used when the PCBIOS support is compiled in"
++#endif
++
++
++#define KERN_CODE_SEG 0X8
++/* Stuff for asm */
++#define save_flags(x) \
++__asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */ :"memory")
++
++#define cli() __asm__ __volatile__ ("cli": : :"memory")
++
++#define restore_flags(x) \
++__asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
++
++
++
++static struct {
++	unsigned long address;
++	unsigned short segment;
++} bios32_indirect = { 0, KERN_CODE_SEG };
++
++static long pcibios_entry = 0;
++static struct {
++	unsigned long address;
++	unsigned short segment;
++} pci_indirect = { 0, KERN_CODE_SEG };
++
++static unsigned long bios32_service(unsigned long service)
++{
++	unsigned char return_code;	/* %al */
++	unsigned long address;		/* %ebx */
++	unsigned long length;		/* %ecx */
++	unsigned long entry;		/* %edx */
++	unsigned long flags;
++
++	save_flags(flags);
++	__asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%edi)"
++#else
++		"lcall *(%%edi)"
++#endif
++		: "=a" (return_code),
++		  "=b" (address),
++		  "=c" (length),
++		  "=d" (entry)
++		: "0" (service),
++		  "1" (0),
++		  "D" (&bios32_indirect));
++	restore_flags(flags);
++
++	switch (return_code) {
++		case 0:
++			return address + entry;
++		case 0x80:	/* Not present */
++			printf("bios32_service(%d) : not present\n", service);
++			return 0;
++		default: /* Shouldn't happen */
++			printf("bios32_service(%d) : returned %#X, mail drew@colorado.edu\n",
++				service, return_code);
++			return 0;
++	}
++}
++
++int pcibios_read_config_byte(unsigned int bus,
++        unsigned int device_fn, unsigned int where, uint8_t *value)
++{
++        unsigned long ret;
++        unsigned long bx = (bus << 8) | device_fn;
++        unsigned long flags;
++
++        save_flags(flags);
++        __asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%esi)\n\t"
++#else
++		"lcall *(%%esi)\n\t"
++#endif
++                "jc 1f\n\t"
++                "xor %%ah, %%ah\n"
++                "1:"
++                : "=c" (*value),
++                  "=a" (ret)
++                : "1" (PCIBIOS_READ_CONFIG_BYTE),
++                  "b" (bx),
++                  "D" ((long) where),
++                  "S" (&pci_indirect));
++        restore_flags(flags);
++        return (int) (ret & 0xff00) >> 8;
++}
++
++int pcibios_read_config_word(unsigned int bus,
++        unsigned int device_fn, unsigned int where, uint16_t *value)
++{
++        unsigned long ret;
++        unsigned long bx = (bus << 8) | device_fn;
++        unsigned long flags;
++
++        save_flags(flags);
++        __asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%esi)\n\t"
++#else
++		"lcall *(%%esi)\n\t"
++#endif
++                "jc 1f\n\t"
++                "xor %%ah, %%ah\n"
++                "1:"
++                : "=c" (*value),
++                  "=a" (ret)
++                : "1" (PCIBIOS_READ_CONFIG_WORD),
++                  "b" (bx),
++                  "D" ((long) where),
++                  "S" (&pci_indirect));
++        restore_flags(flags);
++        return (int) (ret & 0xff00) >> 8;
++}
++
++int pcibios_read_config_dword(unsigned int bus,
++        unsigned int device_fn, unsigned int where, uint32_t *value)
++{
++        unsigned long ret;
++        unsigned long bx = (bus << 8) | device_fn;
++        unsigned long flags;
++
++        save_flags(flags);
++        __asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%esi)\n\t"
++#else
++		"lcall *(%%esi)\n\t"
++#endif
++                "jc 1f\n\t"
++                "xor %%ah, %%ah\n"
++                "1:"
++                : "=c" (*value),
++                  "=a" (ret)
++                : "1" (PCIBIOS_READ_CONFIG_DWORD),
++                  "b" (bx),
++                  "D" ((long) where),
++                  "S" (&pci_indirect));
++        restore_flags(flags);
++        return (int) (ret & 0xff00) >> 8;
++}
++
++int pcibios_write_config_byte (unsigned int bus,
++	unsigned int device_fn, unsigned int where, uint8_t value)
++{
++	unsigned long ret;
++	unsigned long bx = (bus << 8) | device_fn;
++	unsigned long flags;
++
++	save_flags(flags); cli();
++	__asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%esi)\n\t"
++#else
++		"lcall *(%%esi)\n\t"
++#endif
++		"jc 1f\n\t"
++		"xor %%ah, %%ah\n"
++		"1:"
++		: "=a" (ret)
++		: "0" (PCIBIOS_WRITE_CONFIG_BYTE),
++		  "c" (value),
++		  "b" (bx),
++		  "D" ((long) where),
++		  "S" (&pci_indirect));
++	restore_flags(flags);
++	return (int) (ret & 0xff00) >> 8;
++}
++
++int pcibios_write_config_word (unsigned int bus,
++	unsigned int device_fn, unsigned int where, uint16_t value)
++{
++	unsigned long ret;
++	unsigned long bx = (bus << 8) | device_fn;
++	unsigned long flags;
++
++	save_flags(flags); cli();
++	__asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%esi)\n\t"
++#else
++		"lcall *(%%esi)\n\t"
++#endif
++		"jc 1f\n\t"
++		"xor %%ah, %%ah\n"
++		"1:"
++		: "=a" (ret)
++		: "0" (PCIBIOS_WRITE_CONFIG_WORD),
++		  "c" (value),
++		  "b" (bx),
++		  "D" ((long) where),
++		  "S" (&pci_indirect));
++	restore_flags(flags);
++	return (int) (ret & 0xff00) >> 8;
++}
++
++int pcibios_write_config_dword (unsigned int bus,
++	unsigned int device_fn, unsigned int where, uint32_t value)
++{
++	unsigned long ret;
++	unsigned long bx = (bus << 8) | device_fn;
++	unsigned long flags;
++
++	save_flags(flags); cli();
++	__asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++		"lcall (%%esi)\n\t"
++#else
++		"lcall *(%%esi)\n\t"
++#endif
++		"jc 1f\n\t"
++		"xor %%ah, %%ah\n"
++		"1:"
++		: "=a" (ret)
++		: "0" (PCIBIOS_WRITE_CONFIG_DWORD),
++		  "c" (value),
++		  "b" (bx),
++		  "D" ((long) where),
++		  "S" (&pci_indirect));
++	restore_flags(flags);
++	return (int) (ret & 0xff00) >> 8;
++}
++
++static void check_pcibios(void)
++{
++	unsigned long signature;
++	unsigned char present_status;
++	unsigned char major_revision;
++	unsigned char minor_revision;
++	unsigned long flags;
++	int pack;
++
++	if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
++		pci_indirect.address = pcibios_entry;
++
++		save_flags(flags);
++		__asm__(
++#ifdef ABSOLUTE_WITHOUT_ASTERISK
++			"lcall (%%edi)\n\t"
++#else
++			"lcall *(%%edi)\n\t"
++#endif
++			"jc 1f\n\t"
++			"xor %%ah, %%ah\n"
++			"1:\tshl $8, %%eax\n\t"
++			"movw %%bx, %%ax"
++			: "=d" (signature),
++			  "=a" (pack)
++			: "1" (PCIBIOS_PCI_BIOS_PRESENT),
++			  "D" (&pci_indirect)
++			: "bx", "cx");
++		restore_flags(flags);
++
++		present_status = (pack >> 16) & 0xff;
++		major_revision = (pack >> 8) & 0xff;
++		minor_revision = pack & 0xff;
++		if (present_status || (signature != PCI_SIGNATURE)) {
++			printf("ERROR: BIOS32 says PCI BIOS, but no PCI "
++				"BIOS????\n");
++			pcibios_entry = 0;
++		}
++#if	DEBUG
++		if (pcibios_entry) {
++			printf ("pcibios_init : PCI BIOS revision %hhX.%hhX"
++				" entry at %#X\n", major_revision,
++				minor_revision, pcibios_entry);
++		}
++#endif
++	}
++}
++
++static void pcibios_init(void)
++{
++	union bios32 *check;
++	unsigned char sum;
++	int i, length;
++	unsigned long bios32_entry = 0;
++
++	EnterFunction("pcibios_init");
++	/*
++	 * Follow the standard procedure for locating the BIOS32 Service
++	 * directory by scanning the permissible address range from
++	 * 0xe0000 through 0xfffff for a valid BIOS32 structure.
++	 *
++	 */
++
++	for (check = (union bios32 *) 0xe0000; check <= (union bios32 *) 0xffff0; ++check) {
++		if (check->fields.signature != BIOS32_SIGNATURE)
++			continue;
++		length = check->fields.length * 16;
++		if (!length)
++			continue;
++		sum = 0;
++		for (i = 0; i < length ; ++i)
++			sum += check->chars[i];
++		if (sum != 0)
++			continue;
++		if (check->fields.revision != 0) {
++			printf("pcibios_init : unsupported revision %d at %#X, mail drew@colorado.edu\n",
++				check->fields.revision, check);
++			continue;
++		}
++#if	DEBUG
++		printf("pcibios_init : BIOS32 Service Directory "
++			"structure at %#X\n", check);
++#endif
++		if (!bios32_entry) {
++			if (check->fields.entry >= 0x100000) {
++				printf("pcibios_init: entry in high "
++					"memory, giving up\n");
++				return;
++			} else {
++				bios32_entry = check->fields.entry;
++#if	DEBUG
++				printf("pcibios_init : BIOS32 Service Directory"
++					" entry at %#X\n", bios32_entry);
++#endif
++				bios32_indirect.address = bios32_entry;
++			}
++		}
++	}
++	if (bios32_entry)
++		check_pcibios();
++	LeaveFunction("pcibios_init");
++}
++
++#endif	/* CONFIG_PCI_DIRECT not defined*/
++
++unsigned long pcibios_bus_base(unsigned int bus __unused)
++{
++	/* architecturally this must be 0 */
++	return 0;
++}
++
++void find_pci(int type, struct pci_device *dev)
++{
++	EnterFunction("find_pci");
++#ifndef	CONFIG_PCI_DIRECT
++	if (!pcibios_entry) {
++		pcibios_init();
++	}
++	if (!pcibios_entry) {
++		printf("pci_init: no BIOS32 detected\n");
++		return;
++	}
++#endif
++	LeaveFunction("find_pci");
++	return scan_pci_bus(type, dev);
++}
+diff -Naur grub-0.97.orig/netboot/pcnet32.c grub-0.97/netboot/pcnet32.c
+--- grub-0.97.orig/netboot/pcnet32.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pcnet32.c	2005-08-31 22:57:50.000000000 +0000
+@@ -0,0 +1,1004 @@
++/**************************************************************************
++*
++*    pcnet32.c -- Etherboot device driver for the AMD PCnet32
++*    Written 2003-2003 by Timothy Legge <tlegge@rogers.com>
++*
++*    This program is free software; you can redistribute it and/or modify
++*    it under the terms of the GNU General Public License as published by
++*    the Free Software Foundation; either version 2 of the License, or
++*    (at your option) any later version.
++*
++*    This program is distributed in the hope that it will be useful,
++*    but WITHOUT ANY WARRANTY; without even the implied warranty of
++*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++*    GNU General Public License for more details.
++*
++*    You should have received a copy of the GNU General Public License
++*    along with this program; if not, write to the Free Software
++*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*
++*    Portions of this code based on:
++*		pcnet32.c: An AMD PCnet32 ethernet driver for linux:
++*
++*	(C) 1996-1999 Thomas Bogendoerfer
++*		See Linux Driver for full information
++*	
++*	The transmit and poll functions were written with reference to:
++*	lance.c - LANCE NIC driver for Etherboot written by Ken Yap 
++*	
++*	Linux Driver Version 1.27a, 10.02.2002
++* 
++* 
++*    REVISION HISTORY:
++*    ================
++*    v1.0	08-06-2003	timlegge	Initial port of Linux driver
++*    v1.1	08-23-2003	timlegge	Add multicast support
++*    v1.2	01-17-2004	timlegge	Initial driver output cleanup
++*    v1.3	03-29-2004	timlegge	More driver cleanup
++*    
++*    Indent Options: indent -kr -i8
++***************************************************************************/
++
++/* to get some global routines like printf */
++#include "etherboot.h"
++/* to get the interface to the body of the program */
++#include "nic.h"
++/* to get the PCI support functions, if this is a PCI NIC */
++#include "pci.h"
++/* Include the time functions */
++#include "timer.h"
++#include "mii.h"
++/* void hex_dump(const char *data, const unsigned int len); */
++
++/* Etherboot Specific definations */
++#define drv_version "v1.3"
++#define drv_date "03-29-2004"
++
++typedef unsigned char u8;
++typedef signed char s8;
++typedef unsigned short u16;
++typedef signed short s16;
++typedef unsigned int u32;
++typedef signed int s32;
++
++static u32 ioaddr;		/* Globally used for the card's io address */
++
++#ifdef EDEBUG
++#define dprintf(x) printf x
++#else
++#define dprintf(x)
++#endif
++
++/* Condensed operations for readability. */
++#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
++#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
++
++/* End Etherboot Specific */
++
++int cards_found /* __initdata */ ;
++
++#ifdef REMOVE
++/* FIXME: Remove these they are probably pointless */
++
++/* 
++ * VLB I/O addresses 
++ */
++static unsigned int pcnet32_portlist[] /*__initdata */  =
++{ 0x300, 0x320, 0x340, 0x360, 0 };
++
++static int pcnet32_debug = 1;
++static int tx_start = 1;	/* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */
++static int pcnet32vlb;		/* check for VLB cards ? */
++
++static struct net_device *pcnet32_dev;
++
++static int max_interrupt_work = 80;
++static int rx_copybreak = 200;
++#endif
++#define PCNET32_PORT_AUI      0x00
++#define PCNET32_PORT_10BT     0x01
++#define PCNET32_PORT_GPSI     0x02
++#define PCNET32_PORT_MII      0x03
++
++#define PCNET32_PORT_PORTSEL  0x03
++#define PCNET32_PORT_ASEL     0x04
++#define PCNET32_PORT_100      0x40
++#define PCNET32_PORT_FD	      0x80
++
++#define PCNET32_DMA_MASK 0xffffffff
++
++/*
++ * table to translate option values from tulip
++ * to internal options
++ */
++static unsigned char options_mapping[] = {
++	PCNET32_PORT_ASEL,	/*  0 Auto-select      */
++	PCNET32_PORT_AUI,	/*  1 BNC/AUI          */
++	PCNET32_PORT_AUI,	/*  2 AUI/BNC          */
++	PCNET32_PORT_ASEL,	/*  3 not supported    */
++	PCNET32_PORT_10BT | PCNET32_PORT_FD,	/*  4 10baseT-FD       */
++	PCNET32_PORT_ASEL,	/*  5 not supported    */
++	PCNET32_PORT_ASEL,	/*  6 not supported    */
++	PCNET32_PORT_ASEL,	/*  7 not supported    */
++	PCNET32_PORT_ASEL,	/*  8 not supported    */
++	PCNET32_PORT_MII,	/*  9 MII 10baseT      */
++	PCNET32_PORT_MII | PCNET32_PORT_FD,	/* 10 MII 10baseT-FD   */
++	PCNET32_PORT_MII,	/* 11 MII (autosel)    */
++	PCNET32_PORT_10BT,	/* 12 10BaseT          */
++	PCNET32_PORT_MII | PCNET32_PORT_100,	/* 13 MII 100BaseTx    */
++	PCNET32_PORT_MII | PCNET32_PORT_100 | PCNET32_PORT_FD,	/* 14 MII 100BaseTx-FD */
++	PCNET32_PORT_ASEL	/* 15 not supported    */
++};
++
++#define MAX_UNITS 8		/* More are supported, limit only on options */
++static int options[MAX_UNITS];
++static int full_duplex[MAX_UNITS];
++
++/*
++ *				Theory of Operation
++ * 
++ * This driver uses the same software structure as the normal lance
++ * driver. So look for a verbose description in lance.c. The differences
++ * to the normal lance driver is the use of the 32bit mode of PCnet32
++ * and PCnetPCI chips. Because these chips are 32bit chips, there is no
++ * 16MB limitation and we don't need bounce buffers.
++ */
++
++
++
++/*
++ * Set the number of Tx and Rx buffers, using Log_2(# buffers).
++ * Reasonable default values are 4 Tx buffers, and 16 Rx buffers.
++ * That translates to 2 (4 == 2^^2) and 4 (16 == 2^^4).
++ */
++#ifndef PCNET32_LOG_TX_BUFFERS
++#define PCNET32_LOG_TX_BUFFERS 1
++#define PCNET32_LOG_RX_BUFFERS 2
++#endif
++
++#define TX_RING_SIZE		(1 << (PCNET32_LOG_TX_BUFFERS))
++#define TX_RING_MOD_MASK	(TX_RING_SIZE - 1)
++/* FIXME: Fix this to allow multiple tx_ring descriptors */
++#define TX_RING_LEN_BITS	0x0000	/*PCNET32_LOG_TX_BUFFERS) << 12) */
++
++#define RX_RING_SIZE		(1 << (PCNET32_LOG_RX_BUFFERS))
++#define RX_RING_MOD_MASK	(RX_RING_SIZE - 1)
++#define RX_RING_LEN_BITS	((PCNET32_LOG_RX_BUFFERS) << 4)
++
++#define PKT_BUF_SZ		1544
++
++/* Offsets from base I/O address. */
++#define PCNET32_WIO_RDP		0x10
++#define PCNET32_WIO_RAP		0x12
++#define PCNET32_WIO_RESET	0x14
++#define PCNET32_WIO_BDP		0x16
++
++#define PCNET32_DWIO_RDP	0x10
++#define PCNET32_DWIO_RAP	0x14
++#define PCNET32_DWIO_RESET	0x18
++#define PCNET32_DWIO_BDP	0x1C
++
++#define PCNET32_TOTAL_SIZE	0x20
++
++/* Buffers for the tx and Rx */
++
++/* Create a static buffer of size PKT_BUF_SZ for each
++TX Descriptor.  All descriptors point to a
++part of this buffer */
++static unsigned char txb[PKT_BUF_SZ * TX_RING_SIZE];
++//    __attribute__ ((aligned(16)));
++
++/* Create a static buffer of size PKT_BUF_SZ for each
++RX Descriptor   All descriptors point to a
++part of this buffer */
++static unsigned char rxb[RX_RING_SIZE * PKT_BUF_SZ];
++//    __attribute__ ((aligned(16)));
++
++/* The PCNET32 Rx and Tx ring descriptors. */
++struct pcnet32_rx_head {
++	u32 base;
++	s16 buf_length;
++	s16 status;
++	u32 msg_length;
++	u32 reserved;
++};
++
++struct pcnet32_tx_head {
++	u32 base;
++	s16 length;
++	s16 status;
++	u32 misc;
++	u32 reserved;
++};
++
++/* The PCNET32 32-Bit initialization block, described in databook. */
++struct pcnet32_init_block {
++	u16 mode;
++	u16 tlen_rlen;
++	u8 phys_addr[6];
++	u16 reserved;
++	u32 filter[2];
++	/* Receive and transmit ring base, along with extra bits. */
++	u32 rx_ring;
++	u32 tx_ring;
++};
++/* PCnet32 access functions */
++struct pcnet32_access {
++	u16(*read_csr) (unsigned long, int);
++	void (*write_csr) (unsigned long, int, u16);
++	 u16(*read_bcr) (unsigned long, int);
++	void (*write_bcr) (unsigned long, int, u16);
++	 u16(*read_rap) (unsigned long);
++	void (*write_rap) (unsigned long, u16);
++	void (*reset) (unsigned long);
++};
++
++/* Define the TX Descriptor */
++static struct pcnet32_tx_head tx_ring[TX_RING_SIZE]
++    __attribute__ ((aligned(16)));
++
++
++/* Define the RX Descriptor */
++static struct pcnet32_rx_head rx_ring[RX_RING_SIZE]
++    __attribute__ ((aligned(16)));
++
++/* May need to be moved to mii.h */
++struct mii_if_info {
++	int phy_id;
++	int advertising;
++	unsigned int full_duplex:1;	/* is full duplex? */
++};
++
++/*
++ * The first three fields of pcnet32_private are read by the ethernet device 
++ * so we allocate the structure should be allocated by pci_alloc_consistent().
++ */
++#define MII_CNT 4
++struct pcnet32_private {
++	struct pcnet32_init_block init_block;
++	struct pci_dev *pci_dev;	/* Pointer to the associated pci device structure */
++	const char *name;
++	/* The saved address of a sent-in-place packet/buffer, for skfree(). */
++	struct sk_buff *tx_skbuff[TX_RING_SIZE];
++	struct sk_buff *rx_skbuff[RX_RING_SIZE];
++	struct pcnet32_access a;
++	unsigned int cur_rx, cur_tx;	/* The next free ring entry */
++	char tx_full;
++	int options;
++	int shared_irq:1,	/* shared irq possible */
++	 ltint:1,		/* enable TxDone-intr inhibitor */
++	 dxsuflo:1,		/* disable transmit stop on uflo */
++	 mii:1;			/* mii port available */
++	struct mii_if_info mii_if;
++	unsigned char phys[MII_CNT];
++	struct net_device *next;
++	int full_duplex:1;
++} lpx;
++
++static struct pcnet32_private *lp;
++
++static int mdio_read(struct nic *nic __unused, int phy_id, int reg_num);
++#if 0
++static void mdio_write(struct nic *nic __unused, int phy_id, int reg_num,
++		       int val);
++#endif
++enum pci_flags_bit {
++	PCI_USES_IO = 1, PCI_USES_MEM = 2, PCI_USES_MASTER = 4,
++	PCI_ADDR0 = 0x10 << 0, PCI_ADDR1 = 0x10 << 1, PCI_ADDR2 =
++	    0x10 << 2, PCI_ADDR3 = 0x10 << 3,
++};
++
++
++static u16 pcnet32_wio_read_csr(unsigned long addr, int index)
++{
++	outw(index, addr + PCNET32_WIO_RAP);
++	return inw(addr + PCNET32_WIO_RDP);
++}
++
++static void pcnet32_wio_write_csr(unsigned long addr, int index, u16 val)
++{
++	outw(index, addr + PCNET32_WIO_RAP);
++	outw(val, addr + PCNET32_WIO_RDP);
++}
++
++static u16 pcnet32_wio_read_bcr(unsigned long addr, int index)
++{
++	outw(index, addr + PCNET32_WIO_RAP);
++	return inw(addr + PCNET32_WIO_BDP);
++}
++
++static void pcnet32_wio_write_bcr(unsigned long addr, int index, u16 val)
++{
++	outw(index, addr + PCNET32_WIO_RAP);
++	outw(val, addr + PCNET32_WIO_BDP);
++}
++
++static u16 pcnet32_wio_read_rap(unsigned long addr)
++{
++	return inw(addr + PCNET32_WIO_RAP);
++}
++
++static void pcnet32_wio_write_rap(unsigned long addr, u16 val)
++{
++	outw(val, addr + PCNET32_WIO_RAP);
++}
++
++static void pcnet32_wio_reset(unsigned long addr)
++{
++	inw(addr + PCNET32_WIO_RESET);
++}
++
++static int pcnet32_wio_check(unsigned long addr)
++{
++	outw(88, addr + PCNET32_WIO_RAP);
++	return (inw(addr + PCNET32_WIO_RAP) == 88);
++}
++
++static struct pcnet32_access pcnet32_wio = {
++      read_csr:pcnet32_wio_read_csr,
++      write_csr:pcnet32_wio_write_csr,
++      read_bcr:pcnet32_wio_read_bcr,
++      write_bcr:pcnet32_wio_write_bcr,
++      read_rap:pcnet32_wio_read_rap,
++      write_rap:pcnet32_wio_write_rap,
++      reset:pcnet32_wio_reset
++};
++
++static u16 pcnet32_dwio_read_csr(unsigned long addr, int index)
++{
++	outl(index, addr + PCNET32_DWIO_RAP);
++	return (inl(addr + PCNET32_DWIO_RDP) & 0xffff);
++}
++
++static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
++{
++	outl(index, addr + PCNET32_DWIO_RAP);
++	outl(val, addr + PCNET32_DWIO_RDP);
++}
++
++static u16 pcnet32_dwio_read_bcr(unsigned long addr, int index)
++{
++	outl(index, addr + PCNET32_DWIO_RAP);
++	return (inl(addr + PCNET32_DWIO_BDP) & 0xffff);
++}
++
++static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
++{
++	outl(index, addr + PCNET32_DWIO_RAP);
++	outl(val, addr + PCNET32_DWIO_BDP);
++}
++
++static u16 pcnet32_dwio_read_rap(unsigned long addr)
++{
++	return (inl(addr + PCNET32_DWIO_RAP) & 0xffff);
++}
++
++static void pcnet32_dwio_write_rap(unsigned long addr, u16 val)
++{
++	outl(val, addr + PCNET32_DWIO_RAP);
++}
++
++static void pcnet32_dwio_reset(unsigned long addr)
++{
++	inl(addr + PCNET32_DWIO_RESET);
++}
++
++static int pcnet32_dwio_check(unsigned long addr)
++{
++	outl(88, addr + PCNET32_DWIO_RAP);
++	return ((inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88);
++}
++
++static struct pcnet32_access pcnet32_dwio = {
++      read_csr:pcnet32_dwio_read_csr,
++      write_csr:pcnet32_dwio_write_csr,
++      read_bcr:pcnet32_dwio_read_bcr,
++      write_bcr:pcnet32_dwio_write_bcr,
++      read_rap:pcnet32_dwio_read_rap,
++      write_rap:pcnet32_dwio_write_rap,
++      reset:pcnet32_dwio_reset
++};
++
++
++/* Initialize the PCNET32 Rx and Tx rings. */
++static int pcnet32_init_ring(struct nic *nic)
++{
++	int i;
++
++	lp->tx_full = 0;
++	lp->cur_rx = lp->cur_tx = 0;
++
++	for (i = 0; i < RX_RING_SIZE; i++) {
++		rx_ring[i].base = (u32) virt_to_le32desc(&rxb[i]);
++		rx_ring[i].buf_length = le16_to_cpu(-PKT_BUF_SZ);
++		rx_ring[i].status = le16_to_cpu(0x8000);
++	}
++
++	/* The Tx buffer address is filled in as needed, but we do need to clear
++	   the upper ownership bit. */
++	for (i = 0; i < TX_RING_SIZE; i++) {
++		tx_ring[i].base = 0;
++		tx_ring[i].status = 0;
++	}
++
++
++	lp->init_block.tlen_rlen =
++	    le16_to_cpu(TX_RING_LEN_BITS | RX_RING_LEN_BITS);
++	for (i = 0; i < 6; i++)
++		lp->init_block.phys_addr[i] = nic->node_addr[i];
++	lp->init_block.rx_ring = (u32) virt_to_le32desc(&rx_ring[0]);
++	lp->init_block.tx_ring = (u32) virt_to_le32desc(&tx_ring[0]);
++	return 0;
++}
++
++/**************************************************************************
++RESET - Reset adapter
++***************************************************************************/
++static void pcnet32_reset(struct nic *nic)
++{
++	/* put the card in its initial state */
++	u16 val;
++	int i;
++
++	/* Reset the PCNET32 */
++	lp->a.reset(ioaddr);
++
++	/* switch pcnet32 to 32bit mode */
++	lp->a.write_bcr(ioaddr, 20, 2);
++
++	/* set/reset autoselect bit */
++	val = lp->a.read_bcr(ioaddr, 2) & ~2;
++	if (lp->options & PCNET32_PORT_ASEL)
++		val |= 2;
++	lp->a.write_bcr(ioaddr, 2, val);
++	/* handle full duplex setting */
++	if (lp->full_duplex) {
++		val = lp->a.read_bcr(ioaddr, 9) & ~3;
++		if (lp->options & PCNET32_PORT_FD) {
++			val |= 1;
++			if (lp->options ==
++			    (PCNET32_PORT_FD | PCNET32_PORT_AUI))
++				val |= 2;
++		} else if (lp->options & PCNET32_PORT_ASEL) {
++			/* workaround of xSeries250, turn on for 79C975 only */
++			i = ((lp->a.
++			      read_csr(ioaddr,
++				       88) | (lp->a.read_csr(ioaddr,
++							     89) << 16)) >>
++			     12) & 0xffff;
++			if (i == 0x2627)
++				val |= 3;
++		}
++		lp->a.write_bcr(ioaddr, 9, val);
++	}
++
++	/* set/reset GPSI bit in test register */
++	val = lp->a.read_csr(ioaddr, 124) & ~0x10;
++	if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
++		val |= 0x10;
++	lp->a.write_csr(ioaddr, 124, val);
++
++	if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
++		val = lp->a.read_bcr(ioaddr, 32) & ~0x38;	/* disable Auto Negotiation, set 10Mpbs, HD */
++		if (lp->options & PCNET32_PORT_FD)
++			val |= 0x10;
++		if (lp->options & PCNET32_PORT_100)
++			val |= 0x08;
++		lp->a.write_bcr(ioaddr, 32, val);
++	} else {
++		if (lp->options & PCNET32_PORT_ASEL) {	/* enable auto negotiate, setup, disable fd */
++			val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
++			val |= 0x20;
++			lp->a.write_bcr(ioaddr, 32, val);
++		}
++	}
++
++#ifdef DO_DXSUFLO
++	if (lp->dxsuflo) {	/* Disable transmit stop on underflow */
++		val = lp->a.read_csr(ioaddr, 3);
++		val |= 0x40;
++		lp->a.write_csr(ioaddr, 3, val);
++	}
++#endif
++
++	if (lp->ltint) {	/* Enable TxDone-intr inhibitor */
++		val = lp->a.read_csr(ioaddr, 5);
++		val |= (1 << 14);
++		lp->a.write_csr(ioaddr, 5, val);
++	}
++	lp->init_block.mode =
++	    le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
++	lp->init_block.filter[0] = 0xffffffff;
++	lp->init_block.filter[1] = 0xffffffff;
++
++	pcnet32_init_ring(nic);
++
++
++	/* Re-initialize the PCNET32, and start it when done. */
++	lp->a.write_csr(ioaddr, 1,
++			(virt_to_bus(&lp->init_block)) & 0xffff);
++	lp->a.write_csr(ioaddr, 2, (virt_to_bus(&lp->init_block)) >> 16);
++	lp->a.write_csr(ioaddr, 4, 0x0915);
++	lp->a.write_csr(ioaddr, 0, 0x0001);
++
++
++	i = 0;
++	while (i++ < 100)
++		if (lp->a.read_csr(ioaddr, 0) & 0x0100)
++			break;
++	/* 
++	 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
++	 * reports that doing so triggers a bug in the '974.
++	 */
++	lp->a.write_csr(ioaddr, 0, 0x0042);
++
++	dprintf(("pcnet32 open, csr0 %hX.\n", lp->a.read_csr(ioaddr, 0)));
++
++}
++
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int pcnet32_poll(struct nic *nic __unused, int retrieve)
++{
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++
++	int status;
++	int entry;
++
++	entry = lp->cur_rx & RX_RING_MOD_MASK;
++	status = ((short) le16_to_cpu(rx_ring[entry].status) >> 8);
++
++	if (status < 0)
++		return 0;
++
++	if ( ! retrieve ) return 1;
++
++	if (status == 0x03) {
++		nic->packetlen =
++		    (le32_to_cpu(rx_ring[entry].msg_length) & 0xfff) - 4;
++		memcpy(nic->packet, &rxb[entry], nic->packetlen);
++
++		/* Andrew Boyd of QNX reports that some revs of the 79C765
++		 * clear the buffer length */
++		rx_ring[entry].buf_length = le16_to_cpu(-PKT_BUF_SZ);
++		rx_ring[entry].status |= le16_to_cpu(0x8000);	/* prime for next receive */
++		/* Switch to the next Rx ring buffer */
++		lp->cur_rx++;
++
++	} else {
++		return 0;
++	}
++
++	return 1;
++}
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void pcnet32_transmit(struct nic *nic __unused, const char *d,	/* Destination */
++			     unsigned int t,	/* Type */
++			     unsigned int s,	/* size */
++			     const char *p)
++{				/* Packet */
++	/* send the packet to destination */
++	unsigned long time;
++	u8 *ptxb;
++	u16 nstype;
++	u16 status;
++	int entry = 0;		/*lp->cur_tx & TX_RING_MOD_MASK; */
++
++	status = 0x8300;
++	/* point to the current txb incase multiple tx_rings are used */
++	ptxb = txb + (lp->cur_tx * PKT_BUF_SZ);
++
++	/* copy the packet to ring buffer */
++	memcpy(ptxb, d, ETH_ALEN);	/* dst */
++	memcpy(ptxb + ETH_ALEN, nic->node_addr, ETH_ALEN);	/* src */
++	nstype = htons((u16) t);	/* type */
++	memcpy(ptxb + 2 * ETH_ALEN, (u8 *) & nstype, 2);	/* type */
++	memcpy(ptxb + ETH_HLEN, p, s);
++
++	s += ETH_HLEN;
++	while (s < ETH_ZLEN)	/* pad to min length */
++		ptxb[s++] = '\0';
++
++	tx_ring[entry].length = le16_to_cpu(-s);
++	tx_ring[entry].misc = 0x00000000;
++	tx_ring[entry].base = (u32) virt_to_le32desc(ptxb);
++
++	/* we set the top byte as the very last thing */
++	tx_ring[entry].status = le16_to_cpu(status);
++
++
++	/* Trigger an immediate send poll */
++	lp->a.write_csr(ioaddr, 0, 0x0048);
++
++	/* wait for transmit complete */
++	lp->cur_tx = 0;		/* (lp->cur_tx + 1); */
++	time = currticks() + TICKS_PER_SEC;	/* wait one second */
++	while (currticks() < time &&
++	       ((short) le16_to_cpu(tx_ring[entry].status) < 0));
++
++	if ((short) le16_to_cpu(tx_ring[entry].status) < 0)
++		printf("PCNET32 timed out on transmit\n");
++
++	/* Stop pointing at the current txb
++	 * otherwise the card continues to send the packet */
++	tx_ring[entry].base = 0;
++
++}
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void pcnet32_disable(struct dev *dev __unused)
++{
++	/* Stop the PCNET32 here -- it ocassionally polls memory if we don't */
++	lp->a.write_csr(ioaddr, 0, 0x0004);
++
++	/*
++	 * Switch back to 16-bit mode to avoid problesm with dumb 
++	 * DOS packet driver after a warm reboot
++	 */
++	lp->a.write_bcr(ioaddr, 20, 4);
++}
++
++/**************************************************************************
++IRQ - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void pcnet32_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++You should omit the last argument struct pci_device * for a non-PCI NIC
++***************************************************************************/
++static int pcnet32_probe(struct dev *dev, struct pci_device *pci)
++{
++	struct nic *nic = (struct nic *) dev;
++	int i, media;
++	int fdx, mii, fset, dxsuflo, ltint;
++	int chip_version;
++	char *chipname;
++	struct pcnet32_access *a = NULL;
++	u8 promaddr[6];
++
++	int shared = 1;
++	if (pci->ioaddr == 0)
++		return 0;
++
++	/* BASE is used throughout to address the card */
++	ioaddr = pci->ioaddr;
++	printf("pcnet32.c: Found %s, Vendor=0x%hX Device=0x%hX\n",
++	       pci->name, pci->vendor, pci->dev_id);
++
++	nic->irqno  = 0;
++	nic->ioaddr = pci->ioaddr & ~3;
++
++	/* reset the chip */
++	pcnet32_wio_reset(ioaddr);
++
++	/* NOTE: 16-bit check is first, otherwise some older PCnet chips fail */
++	if (pcnet32_wio_read_csr(ioaddr, 0) == 4
++	    && pcnet32_wio_check(ioaddr)) {
++		a = &pcnet32_wio;
++	} else {
++		pcnet32_dwio_reset(ioaddr);
++		if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
++		    && pcnet32_dwio_check(ioaddr)) {
++			a = &pcnet32_dwio;
++		} else
++			return 0;
++	}
++
++	chip_version =
++	    a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
++
++	dprintf(("PCnet chip version is %0xhX\n", chip_version));
++	if ((chip_version & 0xfff) != 0x003)
++		return 0;
++
++	/* initialize variables */
++	fdx = mii = fset = dxsuflo = ltint = 0;
++	chip_version = (chip_version >> 12) & 0xffff;
++
++	switch (chip_version) {
++	case 0x2420:
++		chipname = "PCnet/PCI 79C970";	/* PCI */
++		break;
++	case 0x2430:
++		if (shared)
++			chipname = "PCnet/PCI 79C970";	/* 970 gives the wrong chip id back */
++		else
++			chipname = "PCnet/32 79C965";	/* 486/VL bus */
++		break;
++	case 0x2621:
++		chipname = "PCnet/PCI II 79C970A";	/* PCI */
++		fdx = 1;
++		break;
++	case 0x2623:
++		chipname = "PCnet/FAST 79C971";	/* PCI */
++		fdx = 1;
++		mii = 1;
++		fset = 1;
++		ltint = 1;
++		break;
++	case 0x2624:
++		chipname = "PCnet/FAST+ 79C972";	/* PCI */
++		fdx = 1;
++		mii = 1;
++		fset = 1;
++		break;
++	case 0x2625:
++		chipname = "PCnet/FAST III 79C973";	/* PCI */
++		fdx = 1;
++		mii = 1;
++		break;
++	case 0x2626:
++		chipname = "PCnet/Home 79C978";	/* PCI */
++		fdx = 1;
++		/* 
++		 * This is based on specs published at www.amd.com.  This section
++		 * assumes that a card with a 79C978 wants to go into 1Mb HomePNA
++		 * mode.  The 79C978 can also go into standard ethernet, and there
++		 * probably should be some sort of module option to select the
++		 * mode by which the card should operate
++		 */
++		/* switch to home wiring mode */
++		media = a->read_bcr(ioaddr, 49);
++
++		printf("media reset to %#x.\n", media);
++		a->write_bcr(ioaddr, 49, media);
++		break;
++	case 0x2627:
++		chipname = "PCnet/FAST III 79C975";	/* PCI */
++		fdx = 1;
++		mii = 1;
++		break;
++	default:
++		printf("PCnet version %#x, no PCnet32 chip.\n",
++		       chip_version);
++		return 0;
++	}
++
++	/*
++	 *  On selected chips turn on the BCR18:NOUFLO bit. This stops transmit
++	 *  starting until the packet is loaded. Strike one for reliability, lose
++	 *  one for latency - although on PCI this isnt a big loss. Older chips 
++	 *  have FIFO's smaller than a packet, so you can't do this.
++	 */
++
++	if (fset) {
++		a->write_bcr(ioaddr, 18,
++			     (a->read_bcr(ioaddr, 18) | 0x0800));
++		a->write_csr(ioaddr, 80,
++			     (a->read_csr(ioaddr, 80) & 0x0C00) | 0x0c00);
++		dxsuflo = 1;
++		ltint = 1;
++	}
++
++	dprintf(("%s at %hX,", chipname, ioaddr));
++
++	/* read PROM address */
++	for (i = 0; i < 6; i++)
++		promaddr[i] = inb(ioaddr + i);
++
++	/* Update the nic structure with the MAC Address */
++	for (i = 0; i < ETH_ALEN; i++) {
++		nic->node_addr[i] = promaddr[i];
++	}
++	/* Print out some hardware info */
++	printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr,
++	       ioaddr);
++
++	/* Set to pci bus master */
++	adjust_pci_device(pci);
++
++	/* point to private storage */
++	lp = &lpx;
++
++#if EBDEBUG
++	if (((chip_version + 1) & 0xfffe) == 0x2624) {	/* Version 0x2623 or 0x2624 */
++		i = a->read_csr(ioaddr, 80) & 0x0C00;	/* Check tx_start_pt */
++		dprintf(("    tx_start_pt(0x%hX):", i));
++		switch (i >> 10) {
++		case 0:
++			dprintf(("  20 bytes,"));
++			break;
++		case 1:
++			dprintf(("  64 bytes,"));
++			break;
++		case 2:
++			dprintf((" 128 bytes,"));
++			break;
++		case 3:
++			dprintf(("~220 bytes,"));
++			break;
++		}
++		i = a->read_bcr(ioaddr, 18);	/* Check Burst/Bus control */
++		dprintf((" BCR18(%hX):", i & 0xffff));
++		if (i & (1 << 5))
++			dprintf(("BurstWrEn "));
++		if (i & (1 << 6))
++			dprintf(("BurstRdEn "));
++		if (i & (1 << 7))
++			dprintf(("DWordIO "));
++		if (i & (1 << 11))
++			dprintf(("NoUFlow "));
++		i = a->read_bcr(ioaddr, 25);
++		dprintf(("    SRAMSIZE=0x%hX,", i << 8));
++		i = a->read_bcr(ioaddr, 26);
++		dprintf((" SRAM_BND=0x%hX,", i << 8));
++		i = a->read_bcr(ioaddr, 27);
++		if (i & (1 << 14))
++			dprintf(("LowLatRx"));
++	}
++#endif
++	lp->name = chipname;
++	lp->shared_irq = shared;
++	lp->full_duplex = fdx;
++	lp->dxsuflo = dxsuflo;
++	lp->ltint = ltint;
++	lp->mii = mii;
++	/* FIXME: Fix Options for only one card */
++	if ((cards_found >= MAX_UNITS)
++	    || ((unsigned int) options[cards_found] > sizeof(options_mapping)))
++		lp->options = PCNET32_PORT_ASEL;
++	else
++		lp->options = options_mapping[options[cards_found]];
++
++	if (fdx && !(lp->options & PCNET32_PORT_ASEL) &&
++	    ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
++		lp->options |= PCNET32_PORT_FD;
++
++	if (!a) {
++		printf("No access methods\n");
++		return 0;
++	}
++	lp->a = *a;
++
++	/* detect special T1/E1 WAN card by checking for MAC address */
++	if (nic->node_addr[0] == 0x00 && nic->node_addr[1] == 0xe0
++	    && nic->node_addr[2] == 0x75)
++		lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
++
++	lp->init_block.mode = le16_to_cpu(0x0003);	/* Disable Rx and Tx. */
++	lp->init_block.tlen_rlen =
++	    le16_to_cpu(TX_RING_LEN_BITS | RX_RING_LEN_BITS);
++	for (i = 0; i < 6; i++)
++		lp->init_block.phys_addr[i] = nic->node_addr[i];
++	lp->init_block.filter[0] = 0xffffffff;
++	lp->init_block.filter[1] = 0xffffffff;
++	lp->init_block.rx_ring = virt_to_bus(&rx_ring);
++	lp->init_block.tx_ring = virt_to_bus(&tx_ring);
++
++	/* switch pcnet32 to 32bit mode */
++	a->write_bcr(ioaddr, 20, 2);
++
++
++	a->write_csr(ioaddr, 1, (virt_to_bus(&lp->init_block)) & 0xffff);
++	a->write_csr(ioaddr, 2, (virt_to_bus(&lp->init_block)) >> 16);
++
++	/* 
++	 * To auto-IRQ we enable the initialization-done and DMA error
++	 * interrupts. For ISA boards we get a DMA error, but VLB and PCI
++	 * boards will work.
++	 */
++	/* Trigger an initialization just for the interrupt. */
++
++	a->write_csr(ioaddr, 0, 0x41);
++	mdelay(1);
++
++	cards_found++;
++
++	/* point to NIC specific routines */
++	pcnet32_reset(nic);
++	if (1) {
++	        int tmp;
++		int phy, phy_idx = 0;
++		u16 mii_lpa;
++		lp->phys[0] = 1;	/* Default Setting */
++		for (phy = 1; phy < 32 && phy_idx < MII_CNT; phy++) {
++			int mii_status = mdio_read(nic, phy, MII_BMSR);
++			if (mii_status != 0xffff && mii_status != 0x0000) {
++				lp->phys[phy_idx++] = phy;
++				lp->mii_if.advertising =
++				    mdio_read(nic, phy, MII_ADVERTISE);
++				if ((mii_status & 0x0040) == 0) {
++				  tmp = phy;
++				  dprintf (("MII PHY found at address %d, status " 
++					    "%hX advertising %hX\n", phy, mii_status, 
++					    lp->mii_if.advertising));
++				}
++			}
++		}
++		if (phy_idx == 0)
++			printf("No MII transceiver found!\n");
++		lp->mii_if.phy_id = lp->phys[0];
++
++		lp->mii_if.advertising =
++		    mdio_read(nic, lp->phys[0], MII_ADVERTISE);
++
++		mii_lpa = mdio_read(nic, lp->phys[0], MII_LPA);
++		lp->mii_if.advertising &= mii_lpa;
++		if (lp->mii_if.advertising & ADVERTISE_100FULL)
++			printf("100Mbps Full-Duplex\n");
++		else if (lp->mii_if.advertising & ADVERTISE_100HALF)
++			printf("100Mbps Half-Duplex\n");
++		else if (lp->mii_if.advertising & ADVERTISE_10FULL)
++			printf("10Mbps Full-Duplex\n");
++		else if (lp->mii_if.advertising & ADVERTISE_10HALF)
++			printf("10Mbps Half-Duplex\n");
++		else
++			printf("\n");
++	}
++
++	nic->poll     = pcnet32_poll;
++	nic->transmit = pcnet32_transmit;
++	dev->disable  = pcnet32_disable;
++	nic->irq      = pcnet32_irq;
++
++	return 1;
++}
++static int mdio_read(struct nic *nic __unused, int phy_id, int reg_num)
++{
++	u16 val_out;
++	int phyaddr;
++
++	if (!lp->mii)
++		return 0;
++
++	phyaddr = lp->a.read_bcr(ioaddr, 33);
++
++	lp->a.write_bcr(ioaddr, 33,
++			((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	val_out = lp->a.read_bcr(ioaddr, 34);
++	lp->a.write_bcr(ioaddr, 33, phyaddr);
++
++	return val_out;
++}
++
++#if 0
++static void mdio_write(struct nic *nic __unused, int phy_id, int reg_num,
++		       int val)
++{
++	int phyaddr;
++
++	if (!lp->mii)
++		return;
++
++	phyaddr = lp->a.read_bcr(ioaddr, 33);
++
++	lp->a.write_bcr(ioaddr, 33,
++			((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	lp->a.write_bcr(ioaddr, 34, val);
++	lp->a.write_bcr(ioaddr, 33, phyaddr);
++}
++#endif
++
++static struct pci_id pcnet32_nics[] = {
++	PCI_ROM(0x1022, 0x2000, "lancepci", "AMD Lance/PCI"),
++	PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD Lance/PCI PCNet/32"),
++	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD Lance/HomePNA"),
++};
++
++struct pci_driver pcnet32_driver = {
++	.type = NIC_DRIVER,
++	.name = "PCNET32/PCI",
++	.probe = pcnet32_probe,
++	.ids = pcnet32_nics,
++	.id_count = sizeof(pcnet32_nics) / sizeof(pcnet32_nics[0]),
++	.class = 0,
++};
+diff -Naur grub-0.97.orig/netboot/pic8259.c grub-0.97/netboot/pic8259.c
+--- grub-0.97.orig/netboot/pic8259.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pic8259.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,267 @@
++/*
++ * Basic support for controlling the 8259 Programmable Interrupt Controllers.
++ *
++ * Initially written by Michael Brown (mcb30).
++ */
++
++#include <etherboot.h>
++#include <pic8259.h>
++
++#ifdef DEBUG_IRQ
++#define DBG(...) printf ( __VA_ARGS__ )
++#else
++#define DBG(...)
++#endif
++
++/* Current locations of trivial IRQ handler.  These will change at
++ * runtime when relocation is used; the handler needs to be copied to
++ * base memory before being installed.
++ */
++void (*trivial_irq_handler)P((void)) = _trivial_irq_handler;
++uint16_t volatile *trivial_irq_trigger_count = &_trivial_irq_trigger_count;
++segoff_t *trivial_irq_chain_to = &_trivial_irq_chain_to;
++uint8_t *trivial_irq_chain = &_trivial_irq_chain;
++irq_t trivial_irq_installed_on = IRQ_NONE;
++
++/* Previous trigger count for trivial IRQ handler */
++static uint16_t trivial_irq_previous_trigger_count = 0;
++
++/* Install a handler for the specified IRQ.  Address of previous
++ * handler will be stored in previous_handler.  Enabled/disabled state
++ * of IRQ will be preserved across call, therefore if the handler does
++ * chaining, ensure that either (a) IRQ is disabled before call, or
++ * (b) previous_handler points directly to the place that the handler
++ * picks up its chain-to address.
++ */
++
++int install_irq_handler ( irq_t irq, segoff_t *handler,
++			  uint8_t *previously_enabled,
++			  segoff_t *previous_handler ) {
++	segoff_t *irq_vector = IRQ_VECTOR ( irq );
++	*previously_enabled = irq_enabled ( irq );
++
++	if ( irq > IRQ_MAX ) {
++		DBG ( "Invalid IRQ number %d\n" );
++		return 0;
++	}
++
++	previous_handler->segment = irq_vector->segment;
++	previous_handler->offset = irq_vector->offset;
++	if ( *previously_enabled ) disable_irq ( irq );
++	DBG ( "Installing handler at %hx:%hx for IRQ %d, leaving %s\n",
++		  handler->segment, handler->offset, irq,
++		  ( *previously_enabled ? "enabled" : "disabled" ) );
++	DBG ( "...(previous handler at %hx:%hx)\n",
++		  previous_handler->segment, previous_handler->offset );
++	irq_vector->segment = handler->segment;
++	irq_vector->offset = handler->offset;
++	if ( *previously_enabled ) enable_irq ( irq );
++	return 1;
++}
++
++/* Remove handler for the specified IRQ.  Routine checks that another
++ * handler has not been installed that chains to handler before
++ * uninstalling handler.  Enabled/disabled state of the IRQ will be
++ * restored to that specified by previously_enabled.
++ */
++
++int remove_irq_handler ( irq_t irq, segoff_t *handler,
++			 uint8_t *previously_enabled,
++			 segoff_t *previous_handler ) {
++	segoff_t *irq_vector = IRQ_VECTOR ( irq );
++
++	if ( irq > IRQ_MAX ) {
++		DBG ( "Invalid IRQ number %d\n" );
++		return 0;
++	}
++	if ( ( irq_vector->segment != handler->segment ) ||
++	     ( irq_vector->offset != handler->offset ) ) {
++		DBG ( "Cannot remove handler for IRQ %d\n" );
++		return 0;
++	}
++
++	DBG ( "Removing handler for IRQ %d\n", irq );
++	disable_irq ( irq );
++	irq_vector->segment = previous_handler->segment;
++	irq_vector->offset = previous_handler->offset;
++	if ( *previously_enabled ) enable_irq ( irq );
++	return 1;
++}
++
++/* Install the trivial IRQ handler.  This routine installs the
++ * handler, tests it and enables the IRQ.
++ */
++
++int install_trivial_irq_handler ( irq_t irq ) {
++	segoff_t trivial_irq_handler_segoff = SEGOFF(trivial_irq_handler);
++	
++	if ( trivial_irq_installed_on != IRQ_NONE ) {
++		DBG ( "Can install trivial IRQ handler only once\n" );
++		return 0;
++	}
++	if ( SEGMENT(trivial_irq_handler) > 0xffff ) {
++		DBG ( "Trivial IRQ handler not in base memory\n" );
++		return 0;
++	}
++
++	DBG ( "Installing trivial IRQ handler on IRQ %d\n", irq );
++	if ( ! install_irq_handler ( irq, &trivial_irq_handler_segoff,
++				     trivial_irq_chain,
++				     trivial_irq_chain_to ) )
++		return 0;
++	trivial_irq_installed_on = irq;
++
++	DBG ( "Testing trivial IRQ handler\n" );
++	disable_irq ( irq );
++	*trivial_irq_trigger_count = 0;
++	trivial_irq_previous_trigger_count = 0;
++	fake_irq ( irq );
++	if ( ! trivial_irq_triggered ( irq ) ) {
++		DBG ( "Installation of trivial IRQ handler failed\n" );
++		remove_trivial_irq_handler ( irq );
++		return 0;
++	}
++	DBG ( "Trivial IRQ handler installed successfully\n" );
++	enable_irq ( irq );
++	return 1;
++}
++
++/* Remove the trivial IRQ handler.
++ */
++
++int remove_trivial_irq_handler ( irq_t irq ) {
++	segoff_t trivial_irq_handler_segoff = SEGOFF(trivial_irq_handler);
++
++	if ( trivial_irq_installed_on == IRQ_NONE ) return 1;
++	if ( irq != trivial_irq_installed_on ) {
++		DBG ( "Cannot uninstall trivial IRQ handler from IRQ %d; "
++		      "is installed on IRQ %d\n", irq,
++		      trivial_irq_installed_on );
++		return 0;
++	}
++
++	if ( ! remove_irq_handler ( irq, &trivial_irq_handler_segoff,
++				    trivial_irq_chain,
++				    trivial_irq_chain_to ) )
++		return 0;
++
++	if ( trivial_irq_triggered ( trivial_irq_installed_on ) ) {
++		DBG ( "Sending EOI for unwanted trivial IRQ\n" );
++		send_specific_eoi ( trivial_irq_installed_on );
++	}
++
++	trivial_irq_installed_on = IRQ_NONE;
++	return 1;
++}
++
++/* Safe method to detect whether or not trivial IRQ has been
++ * triggered.  Using this call avoids potential race conditions.  This
++ * call will return success only once per trigger.
++ */
++
++int trivial_irq_triggered ( irq_t irq ) {
++	uint16_t trivial_irq_this_trigger_count = *trivial_irq_trigger_count;
++	int triggered = ( trivial_irq_this_trigger_count -
++			  trivial_irq_previous_trigger_count );
++	
++	/* irq is not used at present, but we have it in the API for
++	 * future-proofing; in case we want the facility to have
++	 * multiple trivial IRQ handlers installed simultaneously.
++	 *
++	 * Avoid compiler warning about unused variable.
++	 */
++	if ( irq == IRQ_NONE ) {};
++	
++	trivial_irq_previous_trigger_count = trivial_irq_this_trigger_count;
++	return triggered ? 1 : 0;
++}
++
++/* Copy trivial IRQ handler to a new location.  Typically used to copy
++ * the handler into base memory; when relocation is being used we need
++ * to do this before installing the handler.
++ *
++ * Call with target=NULL in order to restore the handler to its
++ * original location.
++ */
++
++int copy_trivial_irq_handler ( void *target, size_t target_size ) {
++	irq_t currently_installed_on = trivial_irq_installed_on;
++	uint32_t offset = ( target == NULL ? 0 :
++			    target - &_trivial_irq_handler_start );
++
++	if (( target != NULL ) && ( target_size < TRIVIAL_IRQ_HANDLER_SIZE )) {
++		DBG ( "Insufficient space to copy trivial IRQ handler\n" );
++		return 0;
++	}
++
++	if ( currently_installed_on != IRQ_NONE ) {
++		DBG ("WARNING: relocating trivial IRQ handler while in use\n");
++		if ( ! remove_trivial_irq_handler ( currently_installed_on ) )
++			return 0;
++	}
++
++	/* Do the actual copy */
++	if ( target != NULL ) {
++		DBG ( "Copying trivial IRQ handler to %hx:%hx\n",
++		      SEGMENT(target), OFFSET(target) );
++		memcpy ( target, &_trivial_irq_handler_start,
++			 TRIVIAL_IRQ_HANDLER_SIZE );
++	} else {
++		DBG ( "Restoring trivial IRQ handler to original location\n" );
++	}
++	/* Update all the pointers to structures within the handler */
++	trivial_irq_handler = ( void (*)P((void)) )
++		( (void*)_trivial_irq_handler + offset );
++	trivial_irq_trigger_count = (uint16_t*)
++		( (void*)&_trivial_irq_trigger_count + offset );
++	trivial_irq_chain_to = (segoff_t*)
++		( (void*)&_trivial_irq_chain_to + offset );
++	trivial_irq_chain = (uint8_t*)
++		( (void*)&_trivial_irq_chain + offset );
++
++	if ( currently_installed_on != IRQ_NONE ) {
++		if ( ! install_trivial_irq_handler ( currently_installed_on ) )
++			return 0;
++	}
++	return 1;
++}
++
++/* Send non-specific EOI(s).  This seems to be inherently unsafe.
++ */
++
++void send_nonspecific_eoi ( irq_t irq ) {
++	DBG ( "Sending non-specific EOI for IRQ %d\n", irq );
++	if ( irq >= IRQ_PIC_CUTOFF ) {
++		outb ( ICR_EOI_NON_SPECIFIC, PIC2_ICR );
++	}		
++	outb ( ICR_EOI_NON_SPECIFIC, PIC1_ICR );
++}
++
++/* Send specific EOI(s).
++ */
++
++void send_specific_eoi ( irq_t irq ) {
++	DBG ( "Sending specific EOI for IRQ %d\n", irq );
++	outb ( ICR_EOI_SPECIFIC | ICR_VALUE(irq), ICR_REG(irq) );
++	if ( irq >= IRQ_PIC_CUTOFF ) {
++		outb ( ICR_EOI_SPECIFIC | ICR_VALUE(CHAINED_IRQ),
++		       ICR_REG(CHAINED_IRQ) );
++	}
++}
++
++/* Dump current 8259 status: enabled IRQs and handler addresses.
++ */
++
++#ifdef DEBUG_IRQ
++void dump_irq_status ( void ) {
++	int irq = 0;
++	
++	for ( irq = 0; irq < 16; irq++ ) {
++		if ( irq_enabled ( irq ) ) {
++			printf ( "IRQ%d enabled, ISR at %hx:%hx\n", irq,
++				 IRQ_VECTOR(irq)->segment,
++				 IRQ_VECTOR(irq)->offset );
++		}
++	}
++}
++#endif
+diff -Naur grub-0.97.orig/netboot/pic8259.h grub-0.97/netboot/pic8259.h
+--- grub-0.97.orig/netboot/pic8259.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pic8259.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,99 @@
++/*
++ * Basic support for controlling the 8259 Programmable Interrupt Controllers.
++ *
++ * Initially written by Michael Brown (mcb30).
++ */
++
++#ifndef PIC8259_H
++#define PIC8259_H
++
++/* For segoff_t */
++#include <segoff.h>
++
++#define IRQ_PIC_CUTOFF (8)
++
++/* 8259 register locations */
++#define PIC1_ICW1 (0x20)
++#define PIC1_OCW2 (0x20)
++#define PIC1_OCW3 (0x20)
++#define PIC1_ICR (0x20)
++#define PIC1_IRR (0x20)
++#define PIC1_ISR (0x20)
++#define PIC1_ICW2 (0x21)
++#define PIC1_ICW3 (0x21)
++#define PIC1_ICW4 (0x21)
++#define PIC1_IMR (0x21)
++#define PIC2_ICW1 (0xa0)
++#define PIC2_OCW2 (0xa0)
++#define PIC2_OCW3 (0xa0)
++#define PIC2_ICR (0xa0)
++#define PIC2_IRR (0xa0)
++#define PIC2_ISR (0xa0)
++#define PIC2_ICW2 (0xa1)
++#define PIC2_ICW3 (0xa1)
++#define PIC2_ICW4 (0xa1)
++#define PIC2_IMR (0xa1)
++
++/* Register command values */
++#define OCW3_ID (0x08)
++#define OCW3_READ_IRR (0x03)
++#define OCW3_READ_ISR (0x02)
++#define ICR_EOI_NON_SPECIFIC (0x20)
++#define ICR_EOI_NOP (0x40)
++#define ICR_EOI_SPECIFIC (0x60)
++#define ICR_EOI_SET_PRIORITY (0xc0)
++
++/* Macros to enable/disable IRQs */
++#define IMR_REG(x) ( (x) < IRQ_PIC_CUTOFF ? PIC1_IMR : PIC2_IMR )
++#define IMR_BIT(x) ( 1 << ( (x) % IRQ_PIC_CUTOFF ) )
++#define irq_enabled(x) ( ( inb ( IMR_REG(x) ) & IMR_BIT(x) ) == 0 )
++#define enable_irq(x) outb ( inb( IMR_REG(x) ) & ~IMR_BIT(x), IMR_REG(x) )
++#define disable_irq(x) outb ( inb( IMR_REG(x) ) | IMR_BIT(x), IMR_REG(x) )
++
++/* Macros for acknowledging IRQs */
++#define ICR_REG(x) ( (x) < IRQ_PIC_CUTOFF ? PIC1_ICR : PIC2_ICR )
++#define ICR_VALUE(x) ( (x) % IRQ_PIC_CUTOFF )
++#define CHAINED_IRQ 2
++
++/* Utility macros to convert IRQ numbers to INT numbers and INT vectors  */
++#define IRQ_INT(x) ( (x)<IRQ_PIC_CUTOFF ? (x)+0x08 : (x)-IRQ_PIC_CUTOFF+0x70 )
++#define INT_VECTOR(x) ( (segoff_t*) phys_to_virt( 4 * (x) ) )
++#define IRQ_VECTOR(x) ( INT_VECTOR ( IRQ_INT(x) ) )
++
++/* Other constants */
++typedef uint8_t irq_t;
++#define IRQ_MAX (15)
++#define IRQ_NONE (0xff)
++
++/* Labels in assembly code (in pcbios.S)
++ */
++extern void _trivial_irq_handler_start;
++extern void _trivial_irq_handler ( void );
++extern volatile uint16_t _trivial_irq_trigger_count;
++extern segoff_t _trivial_irq_chain_to;
++extern uint8_t _trivial_irq_chain;
++extern void _trivial_irq_handler_end;
++#define TRIVIAL_IRQ_HANDLER_SIZE \
++	((uint32_t)( &_trivial_irq_handler_end - &_trivial_irq_handler_start ))
++
++/* Function prototypes
++ */
++int install_irq_handler ( irq_t irq, segoff_t *handler,
++			  uint8_t *previously_enabled,
++			  segoff_t *previous_handler );
++int remove_irq_handler ( irq_t irq, segoff_t *handler,
++			 uint8_t *previously_enabled,
++			 segoff_t *previous_handler );
++int install_trivial_irq_handler ( irq_t irq );
++int remove_trivial_irq_handler ( irq_t irq );
++int trivial_irq_triggered ( irq_t irq );
++int copy_trivial_irq_handler ( void *target, size_t target_size );
++void send_non_specific_eoi ( irq_t irq );
++void send_specific_eoi ( irq_t irq );
++#ifdef DEBUG_IRQ
++void dump_irq_status ( void );
++#else
++#define dump_irq_status()
++#endif
++
++#endif /* PIC8259_H */
+diff -Naur grub-0.97.orig/netboot/pnic.c grub-0.97/netboot/pnic.c
+--- grub-0.97.orig/netboot/pnic.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pnic.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,267 @@
++/**************************************************************************
++Etherboot -  BOOTP/TFTP Bootstrap Program
++Bochs Pseudo NIC driver for Etherboot
++***************************************************************************/
++
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2, or (at
++ * your option) any later version.
++ *
++ * See pnic_api.h for an explanation of the Bochs Pseudo NIC.
++ */
++
++/* to get some global routines like printf */
++#include "etherboot.h"
++/* to get the interface to the body of the program */
++#include "nic.h"
++/* to get the PCI support functions, if this is a PCI NIC */
++#include "pci.h"
++
++/* PNIC API */
++#include "pnic_api.h"
++
++/* Private data structure */
++typedef struct {
++	uint16_t api_version;
++} pnic_priv_data_t;
++
++/* Function prototypes */
++static int pnic_api_check ( uint16_t api_version );
++
++/* NIC specific static variables go here */
++static uint8_t tx_buffer[ETH_FRAME_LEN];
++
++/* 
++ * Utility functions: issue a PNIC command, retrieve result.  Use
++ * pnic_command_quiet if you don't want failure codes to be
++ * automatically printed.  Returns the PNIC status code.
++ * 
++ * Set output_length to NULL only if you expect to receive exactly
++ * output_max_length bytes, otherwise it'll complain that you didn't
++ * get enough data (on the assumption that if you not interested in
++ * discovering the output length then you're expecting a fixed amount
++ * of data).
++ */
++
++static uint16_t pnic_command_quiet ( struct nic *nic, uint16_t command,
++				     void *input, uint16_t input_length,
++				     void *output, uint16_t output_max_length,
++				     uint16_t *output_length ) {
++	int i;
++	uint16_t status;
++	uint16_t _output_length;
++
++	if ( input != NULL ) {
++		/* Write input length */
++		outw ( input_length, nic->ioaddr + PNIC_REG_LEN );
++		/* Write input data */
++		for ( i = 0; i < input_length; i++ ) {
++			outb( ((char*)input)[i], nic->ioaddr + PNIC_REG_DATA );
++		}
++	}
++	/* Write command */
++	outw ( command, nic->ioaddr + PNIC_REG_CMD );
++	/* Retrieve status */
++	status = inw ( nic->ioaddr + PNIC_REG_STAT );
++	/* Retrieve output length */
++	_output_length = inw ( nic->ioaddr + PNIC_REG_LEN );
++	if ( output_length == NULL ) {
++		if ( _output_length != output_max_length ) {
++			printf ( "pnic_command %#hx: wrong data length "
++				 "returned (expected %d, got %d)\n", command,
++				 output_max_length, _output_length );
++		}
++	} else {
++		*output_length = _output_length;
++	}
++	if ( output != NULL ) {
++		if ( _output_length > output_max_length ) {
++			printf ( "pnic_command %#hx: output buffer too small "
++				 "(have %d, need %d)\n", command,
++				 output_max_length, _output_length );
++			_output_length = output_max_length;
++		}
++		/* Retrieve output data */
++		for ( i = 0; i < _output_length; i++ ) {
++			((char*)output)[i] =
++				inb ( nic->ioaddr + PNIC_REG_DATA );
++		}
++	}
++	return status;
++}
++
++static uint16_t pnic_command ( struct nic *nic, uint16_t command,
++			       void *input, uint16_t input_length,
++			       void *output, uint16_t output_max_length,
++			       uint16_t *output_length ) {
++	pnic_priv_data_t *priv = (pnic_priv_data_t*)nic->priv_data;
++	uint16_t status = pnic_command_quiet ( nic, command,
++					       input, input_length,
++					       output, output_max_length,
++					       output_length );
++	if ( status == PNIC_STATUS_OK ) return status;
++	printf ( "PNIC command %#hx (len %#hx) failed with status %#hx\n",
++		 command, input_length, status );
++	if ( priv->api_version ) pnic_api_check(priv->api_version);
++	return status;
++}
++
++/* Check API version matches that of NIC */
++static int pnic_api_check ( uint16_t api_version ) {
++	if ( api_version != PNIC_API_VERSION ) {
++		printf ( "Warning: API version mismatch! "
++			 "(NIC's is %d.%d, ours is %d.%d)\n",
++			 api_version >> 8, api_version & 0xff,
++			 PNIC_API_VERSION >> 8, PNIC_API_VERSION & 0xff );
++	}
++	if ( api_version < PNIC_API_VERSION ) {
++		printf ( "*** You may need to update your copy of Bochs ***\n" );
++	}
++	return ( api_version == PNIC_API_VERSION );
++}
++
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int pnic_poll(struct nic *nic, int retrieve)
++{
++	uint16_t length;
++	uint16_t qlen;
++
++	/* Check receive queue length to see if there's anything to
++	 * get.  Necessary since once we've called PNIC_CMD_RECV we
++	 * have to read out the packet, otherwise it's lost forever.
++	 */
++	if ( pnic_command ( nic, PNIC_CMD_RECV_QLEN, NULL, 0,
++			    &qlen, sizeof(qlen), NULL )
++	     != PNIC_STATUS_OK ) return ( 0 );
++	if ( qlen == 0 ) return ( 0 );
++
++	/* There is a packet ready.  Return 1 if we're only checking. */
++	if ( ! retrieve ) return ( 1 );
++
++	/* Retrieve the packet */
++	if ( pnic_command ( nic, PNIC_CMD_RECV, NULL, 0,
++			    nic->packet, ETH_FRAME_LEN, &length )
++	     != PNIC_STATUS_OK ) return ( 0 );
++	nic->packetlen = length;
++	return ( 1 );
++}
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void pnic_transmit(
++	struct nic *nic,
++	const char *dest,		/* Destination */
++	unsigned int type,		/* Type */
++	unsigned int size,		/* size */
++	const char *data)		/* Packet */
++{
++	unsigned int nstype = htons ( type );
++
++	if ( ( ETH_HLEN + size ) >= ETH_FRAME_LEN ) {
++		printf ( "pnic_transmit: packet too large\n" );
++		return;
++	}
++
++	/* Assemble packet */
++	memcpy ( tx_buffer, dest, ETH_ALEN );
++	memcpy ( tx_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN );
++	memcpy ( tx_buffer + 2 * ETH_ALEN, &nstype, 2 );
++	memcpy ( tx_buffer + ETH_HLEN, data, size );
++
++	pnic_command ( nic, PNIC_CMD_XMIT, tx_buffer, ETH_HLEN + size,
++		       NULL, 0, NULL );
++}
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void pnic_disable(struct dev *dev)
++{
++	struct nic *nic = (struct nic *)dev;
++	pnic_command ( nic, PNIC_CMD_RESET, NULL, 0, NULL, 0, NULL );
++}
++
++/**************************************************************************
++IRQ - Handle card interrupt status
++***************************************************************************/
++static void pnic_irq ( struct nic *nic, irq_action_t action )
++{
++	uint8_t enabled;
++
++	switch ( action ) {
++	case DISABLE :
++	case ENABLE :
++		enabled = ( action == ENABLE ? 1 : 0 );
++		pnic_command ( nic, PNIC_CMD_MASK_IRQ,
++			       &enabled, sizeof(enabled), NULL, 0, NULL );
++		break;
++	case FORCE :
++		pnic_command ( nic, PNIC_CMD_FORCE_IRQ,
++			       NULL, 0, NULL, 0, NULL );
++		break;
++	}
++}
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++***************************************************************************/
++
++static int pnic_probe(struct dev *dev, struct pci_device *pci)
++{
++	struct nic *nic = (struct nic *)dev;
++	static pnic_priv_data_t priv;
++	uint16_t status;
++
++	printf(" - ");
++
++	/* Clear private data structure and chain it in */
++	memset ( &priv, 0, sizeof(priv) );
++	nic->priv_data = &priv;
++
++	/* Mask the bit that says "this is an io addr" */
++	nic->ioaddr = pci->ioaddr & ~3;
++	nic->irqno = pci->irq;
++	/* Not sure what this does, but the rtl8139 driver does it */
++	adjust_pci_device(pci);
++
++	status = pnic_command_quiet( nic, PNIC_CMD_API_VER, NULL, 0,
++				     &priv.api_version,
++				     sizeof(priv.api_version), NULL );
++	if ( status != PNIC_STATUS_OK ) {
++		printf ( "PNIC failed installation check, code %#hx\n",
++			 status );
++		return 0;
++	}
++	pnic_api_check(priv.api_version);
++	status = pnic_command ( nic, PNIC_CMD_READ_MAC, NULL, 0,
++				nic->node_addr, ETH_ALEN, NULL );
++	printf ( "Detected Bochs Pseudo NIC MAC %! (API v%d.%d) at %#hx\n",
++		 nic->node_addr, priv.api_version>>8, priv.api_version&0xff,
++		 nic->ioaddr );
++
++	/* point to NIC specific routines */
++	dev->disable  = pnic_disable;
++	nic->poll     = pnic_poll;
++	nic->transmit = pnic_transmit;
++	nic->irq      = pnic_irq;
++	return 1;
++}
++
++static struct pci_id pnic_nics[] = {
++/* genrules.pl doesn't let us use macros for PCI IDs...*/
++PCI_ROM(0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor"),
++};
++
++struct pci_driver pnic_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "PNIC",
++	.probe    = pnic_probe,
++	.ids      = pnic_nics,
++	.id_count = sizeof(pnic_nics)/sizeof(pnic_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/pnic_api.h grub-0.97/netboot/pnic_api.h
+--- grub-0.97.orig/netboot/pnic_api.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pnic_api.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,59 @@
++/*
++ * Constants etc. for the Bochs/Etherboot pseudo-NIC
++ * 
++ * This header file must be valid C and C++.
++ *
++ * Operation of the pseudo-NIC (PNIC) is pretty simple.  To write a
++ * command plus data, first write the length of the data to
++ * PNIC_REG_LEN, then write the data a byte at a type to
++ * PNIC_REG_DATA, then write the command code to PNIC_REG_CMD.  The
++ * status will be available from PNIC_REG_STAT.  The length of any
++ * data returned will be in PNIC_REG_LEN and can be read a byte at a
++ * time from PNIC_REG_DATA.
++ */
++
++/*
++ * PCI parameters
++ */
++#define PNIC_PCI_VENDOR	0xfefe	/* Hopefully these won't clash with */
++#define PNIC_PCI_DEVICE 0xefef	/* any real PCI device IDs.         */
++
++/*
++ * 'Hardware' register addresses, offset from io_base
++ */
++#define PNIC_REG_CMD	0x00	/* Command register, 2 bytes, write only */
++#define PNIC_REG_STAT	0x00	/* Status register, 2 bytes, read only */
++#define PNIC_REG_LEN	0x02	/* Length register, 2 bytes, read-write */
++#define PNIC_REG_DATA	0x04	/* Data port, 1 byte, read-write */
++/*
++ * PNIC_MAX_REG used in Bochs to claim i/o space
++ */
++#define PNIC_MAX_REG	0x04
++
++/*
++ * Command code definitions: write these into PNIC_REG_CMD
++ */
++#define PNIC_CMD_NOOP		0x0000
++#define PNIC_CMD_API_VER	0x0001
++#define PNIC_CMD_READ_MAC	0x0002
++#define PNIC_CMD_RESET		0x0003
++#define PNIC_CMD_XMIT		0x0004
++#define PNIC_CMD_RECV		0x0005
++#define PNIC_CMD_RECV_QLEN	0x0006
++#define PNIC_CMD_MASK_IRQ	0x0007
++#define PNIC_CMD_FORCE_IRQ	0x0008
++
++/*
++ * Status code definitions: read these from PNIC_REG_STAT
++ *
++ * We avoid using status codes that might be confused with
++ * randomly-read data (e.g. 0x0000, 0xffff etc.)
++ */
++#define PNIC_STATUS_OK		0x4f4b		/* 'OK' */
++#define PNIC_STATUS_UNKNOWN_CMD	0x3f3f		/* '??' */
++
++/*
++ * Other miscellaneous information
++ */
++
++#define PNIC_API_VERSION	0x0101		/* 1.1 */
+diff -Naur grub-0.97.orig/netboot/pxe.h grub-0.97/netboot/pxe.h
+--- grub-0.97.orig/netboot/pxe.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/pxe.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,521 @@
++/*
++ * Copyright (c) 2000 Alfred Perlstein <alfred@freebsd.org>
++ * All rights reserved.
++ * Copyright (c) 2000 Paul Saab <ps@freebsd.org>
++ * All rights reserved.
++ * Copyright (c) 2000 John Baldwin <jhb@freebsd.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ * $FreeBSD: src/sys/boot/i386/libi386/pxe.h,v 1.4.2.2 2000/09/10 02:52:18 ps Exp $
++ */
++
++/*
++ * The typedefs and structures declared in this file
++ * clearly violate style(9), the reason for this is to conform to the
++ * typedefs/structure-names used in the Intel literature to avoid confusion.
++ *
++ * It's for your own good. :)
++ */
++
++/* SEGOFF16_t defined in separate header for Etherboot
++ */
++#include <segoff.h>
++
++/* It seems that intel didn't think about ABI,
++ * either that or 16bit ABI != 32bit ABI (which seems reasonable)
++ * I have to thank Intel for the hair loss I incurred trying to figure
++ * out why PXE was mis-reading structures I was passing it (at least
++ * from my point of view)
++ *
++ * Solution: use gcc's '__attribute__ ((packed))' to correctly align
++ * structures passed into PXE
++ * Question: does this really work for PXE's expected ABI?
++ */
++#define	PACKED		__attribute__ ((packed))
++
++#define	S_SIZE(s)	s, sizeof(s) - 1
++
++#define	IP_STR		"%d.%d.%d.%d"
++#define	IP_ARGS(ip)					\
++	(int)(ip >> 24) & 0xff, (int)(ip >> 16) & 0xff, \
++	(int)(ip >> 8) & 0xff, (int)ip & 0xff
++
++#define	MAC_STR		"%02x:%02x:%02x:%02x:%02x:%02x"
++#define	MAC_ARGS(mac)					\
++	mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] 
++
++#define	PXENFSROOTPATH	"/pxeroot"
++
++typedef struct {
++	uint16_t		Seg_Addr;
++	uint32_t		Phy_Addr;
++	uint16_t		Seg_Size;
++} PACKED SEGDESC_t; /* PACKED is required, otherwise gcc pads this out to 12
++		       bytes - mbrown@fensystems.co.uk (mcb30) 17/5/03 */
++
++typedef	uint16_t		SEGSEL_t;
++typedef	uint16_t		PXENV_STATUS_t;
++typedef	uint32_t		IP4_t;
++typedef	uint32_t		ADDR32_t;
++typedef	uint16_t		UDP_PORT_t;
++
++#define	MAC_ADDR_LEN		16
++typedef	uint8_t			MAC_ADDR[MAC_ADDR_LEN];
++
++/* PXENV+ */
++typedef struct {
++	uint8_t		Signature[6];	/* 'PXENV+' */
++	uint16_t	Version;	/* MSB = major, LSB = minor */
++	uint8_t		Length;		/* structure length */
++	uint8_t		Checksum;	/* checksum pad */
++	SEGOFF16_t	RMEntry;	/* SEG:OFF to PXE entry point */
++	/* don't use PMOffset and PMSelector (from the 2.1 PXE manual) */
++	uint32_t	PMOffset;	/* Protected mode entry */
++	SEGSEL_t	PMSelector;	/* Protected mode selector */
++	SEGSEL_t	StackSeg;	/* Stack segment address */
++	uint16_t	StackSize;	/* Stack segment size (bytes) */
++	SEGSEL_t	BC_CodeSeg;	/* BC Code segment address */
++	uint16_t	BC_CodeSize;	/* BC Code segment size (bytes) */
++	SEGSEL_t	BC_DataSeg;	/* BC Data segment address */
++	uint16_t	BC_DataSize;	/* BC Data segment size (bytes) */
++	SEGSEL_t	UNDIDataSeg;	/* UNDI Data segment address */
++	uint16_t	UNDIDataSize;	/* UNDI Data segment size (bytes) */
++	SEGSEL_t	UNDICodeSeg;	/* UNDI Code segment address */
++	uint16_t	UNDICodeSize;	/* UNDI Code segment size (bytes) */
++	SEGOFF16_t	PXEPtr;		/* SEG:OFF to !PXE struct, 
++					   only present when Version > 2.1 */
++} PACKED pxenv_t;
++
++/* !PXE */
++typedef struct {
++	uint8_t		Signature[4];
++	uint8_t		StructLength;
++	uint8_t		StructCksum;
++	uint8_t		StructRev;
++	uint8_t		reserved_1;
++	SEGOFF16_t	UNDIROMID;
++	SEGOFF16_t	BaseROMID;
++	SEGOFF16_t	EntryPointSP;
++	SEGOFF16_t	EntryPointESP;
++	SEGOFF16_t	StatusCallout;
++	uint8_t		reserved_2;
++	uint8_t		SegDescCn;
++	SEGSEL_t	FirstSelector;
++	SEGDESC_t	Stack;
++	SEGDESC_t	UNDIData;
++	SEGDESC_t	UNDICode;
++	SEGDESC_t	UNDICodeWrite;
++	SEGDESC_t	BC_Data;
++	SEGDESC_t	BC_Code;
++	SEGDESC_t	BC_CodeWrite;
++} PACKED pxe_t;
++
++#define	PXENV_START_UNDI		0x0000
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint16_t	ax;
++	uint16_t	bx;
++	uint16_t	dx;
++	uint16_t	di;
++	uint16_t	es;
++} PACKED t_PXENV_START_UNDI;
++
++#define	PXENV_UNDI_STARTUP		0x0001
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_STARTUP;
++
++#define	PXENV_UNDI_CLEANUP		0x0002
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_CLEANUP;
++
++#define	PXENV_UNDI_INITIALIZE		0x0003
++typedef struct {
++	PXENV_STATUS_t	Status;
++	ADDR32_t	ProtocolIni;	/* Phys addr of a copy of the driver module */
++	uint8_t		reserved[8];
++} PACKED t_PXENV_UNDI_INITIALIZE;
++
++
++#define	MAXNUM_MCADDR		8
++typedef struct {
++	uint16_t	MCastAddrCount;
++	MAC_ADDR	McastAddr[MAXNUM_MCADDR];
++} PACKED t_PXENV_UNDI_MCAST_ADDRESS;
++
++#define	PXENV_UNDI_RESET_ADAPTER	0x0004		
++typedef struct {
++	PXENV_STATUS_t	Status;
++	t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
++} PACKED t_PXENV_UNDI_RESET;
++
++#define	PXENV_UNDI_SHUTDOWN		0x0005
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_SHUTDOWN;
++
++#define	PXENV_UNDI_OPEN			0x0006
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint16_t	OpenFlag;
++	uint16_t	PktFilter;
++#	define FLTR_DIRECTED	0x0001
++#	define FLTR_BRDCST	0x0002
++#	define FLTR_PRMSCS	0x0003
++#	define FLTR_SRC_RTG	0x0004
++
++	t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
++} PACKED t_PXENV_UNDI_OPEN;
++
++#define	PXENV_UNDI_CLOSE		0x0007
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_CLOSE;
++
++#define	PXENV_UNDI_TRANSMIT		0x0008
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint8_t		Protocol;
++#	define P_UNKNOWN	0
++#	define P_IP		1
++#	define P_ARP		2
++#	define P_RARP		3
++
++	uint8_t		XmitFlag;
++#	define XMT_DESTADDR	0x0000
++#	define XMT_BROADCAST	0x0001
++
++	SEGOFF16_t	DestAddr;
++	SEGOFF16_t	TBD;
++	uint32_t	Reserved[2];
++} PACKED t_PXENV_UNDI_TRANSMIT;
++
++#define	MAX_DATA_BLKS		8
++typedef struct {
++	uint16_t	ImmedLength;
++	SEGOFF16_t	Xmit;
++	uint16_t	DataBlkCount;
++	struct	DataBlk {
++		uint8_t		TDPtrType;
++		uint8_t		TDRsvdByte;
++		uint16_t	TDDataLen;
++		SEGOFF16_t	TDDataPtr;
++	} DataBlock[MAX_DATA_BLKS];
++} PACKED t_PXENV_UNDI_TBD;
++
++#define	PXENV_UNDI_SET_MCAST_ADDRESS	0x0009
++typedef struct {
++	PXENV_STATUS_t	Status;
++	t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
++} PACKED t_PXENV_UNDI_SET_MCAST_ADDR;
++
++#define	PXENV_UNDI_SET_STATION_ADDRESS	0x000A
++typedef struct {
++	PXENV_STATUS_t	Status;
++	MAC_ADDR	StationAddress;		/* Temp MAC addres to use */
++} PACKED t_PXENV_UNDI_SET_STATION_ADDRESS;
++
++#define	PXENV_UNDI_SET_PACKET_FILTER	0x000B
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint8_t		filter;			/* see UNDI_OPEN (0x0006) */
++} PACKED t_PXENV_UNDI_SET_PACKET_FILTER;
++
++#define	PXENV_UNDI_GET_INFORMATION	0x000C
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint16_t	BaseIo;			/* Adapter base I/O address */
++	uint16_t	IntNumber;		/* Adapter IRQ number */
++	uint16_t	MaxTranUnit;		/* Adapter maximum transmit unit */
++	uint16_t	HwType;			/* Type of protocol at the hardware addr */
++#	define ETHER_TYPE	1
++#	define EXP_ETHER_TYPE	2
++#	define IEEE_TYPE	6
++#	define ARCNET_TYPE	7
++
++	uint16_t	HwAddrLen;		/* Length of hardware address */
++	MAC_ADDR	CurrentNodeAddress;	/* Current hardware address */
++	MAC_ADDR	PermNodeAddress;	/* Permanent hardware address */
++	SEGSEL_t	ROMAddress;		/* Real mode ROM segment address */
++	uint16_t	RxBufCt;		/* Receive queue length */
++	uint16_t	TxBufCt;		/* Transmit queue length */
++} PACKED t_PXENV_UNDI_GET_INFORMATION;
++
++#define	PXENV_UNDI_GET_STATISTICS	0x000D
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint32_t	XmitGoodFrames;		/* Number of successful transmissions */
++	uint32_t	RcvGoodFrames;		/* Number of good frames received */
++	uint32_t	RcvCRCErrors;		/* Number of frames with CRC errors */
++	uint32_t	RcvResourceErrors;	/* Number of frames dropped */
++} PACKED t_PXENV_UNDI_GET_STATISTICS;
++
++#define	PXENV_UNDI_CLEAR_STATISTICS	0x000E
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_CLEAR_STATISTICS;
++
++#define	PXENV_UNDI_INITIATE_DIAGS	0x000F
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_INITIATE_DIAGS;
++
++#define	PXENV_UNDI_FORCE_INTERRUPT	0x0010
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_UNDI_FORCE_INTERRUPT;
++
++#define	PXENV_UNDI_GET_MCAST_ADDRESS	0x0011
++typedef struct {
++	PXENV_STATUS_t	Status;
++	IP4_t		InetAddr;		/* IP mulicast address */
++	MAC_ADDR	MediaAddr;		/* MAC multicast address */
++} PACKED t_PXENV_UNDI_GET_MCAST_ADDR;
++
++#define	PXENV_UNDI_GET_NIC_TYPE		0x0012
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint8_t		NicType;		/* Type of NIC */
++#	define PCI_NIC		2
++#	define PnP_NIC		3
++#	define CardBus_NIC	4
++
++	union {
++		struct {
++			uint16_t	Vendor_ID;
++			uint16_t	Dev_ID;
++			uint8_t		Base_Class;
++			uint8_t		Sub_Class;
++			uint8_t		Prog_Intf;
++			uint8_t		Rev;
++			uint16_t	BusDevFunc;
++			uint16_t	SubVendor_ID;
++			uint16_t	SubDevice_ID;
++		} pci, cardbus;
++		struct {
++			uint32_t	EISA_Dev_ID;
++			uint8_t		Base_Class;
++			uint8_t		Sub_Class;
++			uint8_t		Prog_Intf;
++			uint16_t	CardSelNum;
++		} pnp;
++	} info;
++} PACKED t_PXENV_UNDI_GET_NIC_TYPE;
++
++#define	PXENV_UNDI_GET_IFACE_INFO	0x0013
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint8_t		IfaceType[16];		/* Name of MAC type in ASCII. */
++	uint32_t	LinkSpeed;		/* Defined in NDIS 2.0 spec */
++	uint32_t	ServiceFlags;		/* Defined in NDIS 2.0 spec */
++	uint32_t	Reserved[4];		/* must be 0 */
++} PACKED t_PXENV_UNDI_GET_IFACE_INFO;
++
++#define	PXENV_UNDI_ISR			0x0014
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint16_t	FuncFlag;		/* PXENV_UNDI_ISR_OUT_xxx */
++	uint16_t	BufferLength;		/* Length of Frame */
++	uint16_t	FrameLength;		/* Total length of reciever frame */
++	uint16_t	FrameHeaderLength;	/* Length of the media header in Frame */
++	SEGOFF16_t	Frame;			/* receive buffer */
++	uint8_t		ProtType;		/* Protocol type */
++	uint8_t		PktType;		/* Packet Type */
++#	define PXENV_UNDI_ISR_IN_START		1
++#	define PXENV_UNDI_ISR_IN_PROCESS	2
++#	define PXENV_UNDI_ISR_IN_GET_NEXT	3
++
++	/* one of these will be returned for PXENV_UNDI_ISR_IN_START */
++#	define PXENV_UNDI_ISR_OUT_OURS		0
++#	define PXENV_UNDI_ISR_OUT_NOT_OURS	1
++
++	/*
++	 * one of these will bre returnd for PXEND_UNDI_ISR_IN_PROCESS
++	 * and PXENV_UNDI_ISR_IN_GET_NEXT
++	 */
++#	define PXENV_UNDI_ISR_OUT_DONE		0
++#	define PXENV_UNDI_ISR_OUT_TRANSMIT	2
++#	define PXENV_UNDI_ISR_OUT_RECEIVE	3
++#	define PXENV_UNDI_ISR_OUT_BUSY		4
++} PACKED t_PXENV_UNDI_ISR;
++
++#define	PXENV_STOP_UNDI			0x0015
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_STOP_UNDI;
++
++#define	PXENV_TFTP_OPEN			0x0020
++typedef struct {
++	PXENV_STATUS_t	Status;
++	IP4_t		ServerIPAddress;
++	IP4_t		GatewayIPAddress;
++	uint8_t		FileName[128];
++	UDP_PORT_t	TFTPPort;
++	uint16_t	PacketSize;
++} PACKED t_PXENV_TFTP_OPEN;
++
++#define	PXENV_TFTP_CLOSE		0x0021
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_TFTP_CLOSE;
++
++#define	PXENV_TFTP_READ			0x0022
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint16_t	PacketNumber;
++	uint16_t	BufferSize;
++	SEGOFF16_t	Buffer;
++} PACKED t_PXENV_TFTP_READ;
++
++#define	PXENV_TFTP_READ_FILE		0x0023
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint8_t		FileName[128];
++	uint32_t	BufferSize;
++	ADDR32_t	Buffer;
++	IP4_t		ServerIPAddress;
++	IP4_t		GatewayIPAdress;
++	IP4_t		McastIPAdress;
++	UDP_PORT_t	TFTPClntPort;
++	UDP_PORT_t	TFTPSrvPort;
++	uint16_t	TFTPOpenTimeOut;
++	uint16_t	TFTPReopenDelay;
++} PACKED t_PXENV_TFTP_READ_FILE;
++
++#define	PXENV_TFTP_GET_FSIZE		0x0025
++typedef struct {
++	PXENV_STATUS_t	Status;
++	IP4_t		ServerIPAddress;
++	IP4_t		GatewayIPAdress;
++	uint8_t		FileName[128];
++	uint32_t	FileSize;
++} PACKED t_PXENV_TFTP_GET_FSIZE;
++
++#define	PXENV_UDP_OPEN			0x0030
++typedef struct {
++	PXENV_STATUS_t	Status;
++	IP4_t		src_ip;		/* IP address of this station */
++} PACKED t_PXENV_UDP_OPEN;
++
++#define	PXENV_UDP_CLOSE			0x0031
++typedef struct {
++	PXENV_STATUS_t	status;
++} PACKED t_PXENV_UDP_CLOSE;
++
++#define	PXENV_UDP_READ			0x0032
++typedef struct {
++	PXENV_STATUS_t	status;
++	IP4_t		src_ip;		/* IP of sender */
++	IP4_t		dest_ip;	/* Only accept packets sent to this IP */
++	UDP_PORT_t	s_port;		/* UDP source port of sender */
++	UDP_PORT_t	d_port;		/* Only accept packets sent to this port */
++	uint16_t	buffer_size;	/* Size of the packet buffer */
++	SEGOFF16_t	buffer;		/* SEG:OFF to the packet buffer */
++} PACKED t_PXENV_UDP_READ;
++
++#define	PXENV_UDP_WRITE			0x0033
++typedef struct {
++	PXENV_STATUS_t	status;
++	IP4_t		ip;		/* dest ip addr */
++	IP4_t		gw;		/* ip gateway */
++	UDP_PORT_t	src_port;	/* source udp port */
++	UDP_PORT_t	dst_port;	/* destination udp port */
++	uint16_t	buffer_size;	/* Size of the packet buffer */
++	SEGOFF16_t	buffer;		/* SEG:OFF to the packet buffer */
++} PACKED t_PXENV_UDP_WRITE;
++
++#define	PXENV_UNLOAD_STACK		0x0070
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint8_t		reserved[10];
++} PACKED t_PXENV_UNLOAD_STACK;
++
++
++#define	PXENV_GET_CACHED_INFO		0x0071
++typedef struct {
++	PXENV_STATUS_t	Status;
++	uint16_t	PacketType;	/* type (defined right here) */
++#	define PXENV_PACKET_TYPE_DHCP_DISCOVER  1
++#	define PXENV_PACKET_TYPE_DHCP_ACK       2
++#	define PXENV_PACKET_TYPE_BINL_REPLY     3
++	uint16_t	BufferSize;	/* max to copy, leave at 0 for pointer */
++	SEGOFF16_t	Buffer;		/* copy to, leave at 0 for pointer */
++	uint16_t	BufferLimit;	/* max size of buffer in BC dataseg ? */
++} PACKED t_PXENV_GET_CACHED_INFO;
++
++
++/* structure filled in by PXENV_GET_CACHED_INFO 
++ * (how we determine which IP we downloaded the initial bootstrap from)
++ * words can't describe...
++ */
++typedef struct {
++	uint8_t		opcode;
++#	define BOOTP_REQ	1
++#	define BOOTP_REP	2
++	uint8_t		Hardware;	/* hardware type */
++	uint8_t		Hardlen;	/* hardware addr len */
++	uint8_t		Gatehops;	/* zero it */
++	uint32_t	ident;		/* random number chosen by client */
++	uint16_t	seconds;	/* seconds since did initial bootstrap */
++	uint16_t	Flags;		/* seconds since did initial bootstrap */
++#	define BOOTP_BCAST	0x8000		/* ? */
++	IP4_t		cip;		/* Client IP */
++	IP4_t		yip;		/* Your IP */
++	IP4_t		sip;		/* IP to use for next boot stage */
++	IP4_t		gip;		/* Relay IP ? */
++	MAC_ADDR	CAddr;		/* Client hardware address */
++	uint8_t		Sname[64];	/* Server's hostname (Optional) */
++	uint8_t		bootfile[128];	/* boot filename */
++	union {
++#		if 1
++#		define BOOTP_DHCPVEND  1024    /* DHCP extended vendor field size */
++#		else
++#		define BOOTP_DHCPVEND  312	/* DHCP standard vendor field size */
++#		endif
++		uint8_t		d[BOOTP_DHCPVEND];	/* raw array of vendor/dhcp options */
++		struct {
++			uint8_t		magic[4];	/* DHCP magic cookie */
++#			ifndef		VM_RFC1048
++#			define		VM_RFC1048	0x63825363L	/* ? */
++#			endif
++			uint32_t	flags;		/* bootp flags/opcodes */
++			uint8_t		pad[56];	/* I don't think intel knows what a
++							   union does... */
++		} v;
++	} vendor;
++} PACKED BOOTPLAYER;
++
++#define	PXENV_RESTART_TFTP		0x0073
++#define	t_PXENV_RESTART_TFTP		t_PXENV_TFTP_READ_FILE
++
++#define	PXENV_START_BASE		0x0075
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_START_BASE;
++
++#define	PXENV_STOP_BASE			0x0076
++typedef struct {
++	PXENV_STATUS_t	Status;
++} PACKED t_PXENV_STOP_BASE;
+diff -Naur grub-0.97.orig/netboot/r8169.c grub-0.97/netboot/r8169.c
+--- grub-0.97.orig/netboot/r8169.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/r8169.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,854 @@
++/**************************************************************************
++*    r8169.c: Etherboot device driver for the RealTek RTL-8169 Gigabit
++*    Written 2003 by Timothy Legge <tlegge@rogers.com>
++*
++*    This program is free software; you can redistribute it and/or modify
++*    it under the terms of the GNU General Public License as published by
++*    the Free Software Foundation; either version 2 of the License, or
++*    (at your option) any later version.
++*
++*    This program is distributed in the hope that it will be useful,
++*    but WITHOUT ANY WARRANTY; without even the implied warranty of
++*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++*    GNU General Public License for more details.
++*
++*    You should have received a copy of the GNU General Public License
++*    along with this program; if not, write to the Free Software
++*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*
++*    Portions of this code based on:
++*	r8169.c: A RealTek RTL-8169 Gigabit Ethernet driver 
++* 		for Linux kernel 2.4.x.
++*
++*    Written 2002 ShuChen <shuchen@realtek.com.tw>
++*	  See Linux Driver for full information
++*	
++*    Linux Driver Version 1.27a, 10.02.2002
++* 
++*    Thanks to:
++*    	Jean Chen of RealTek Semiconductor Corp. for
++*    	providing the evaluation NIC used to develop 
++*    	this driver.  RealTek's support for Etherboot 
++*    	is appreciated.
++*    	
++*    REVISION HISTORY:
++*    ================
++*
++*    v1.0	11-26-2003	timlegge	Initial port of Linux driver
++*    v1.5	01-17-2004	timlegge	Initial driver output cleanup
++*    v1.6	03-27-2004	timlegge	Additional Cleanup
++*    
++*    Indent Options: indent -kr -i8
++***************************************************************************/
++
++/* to get some global routines like printf */
++#include "etherboot.h"
++/* to get the interface to the body of the program */
++#include "nic.h"
++/* to get the PCI support functions, if this is a PCI NIC */
++#include "pci.h"
++#include "timer.h"
++
++#define drv_version "v1.6"
++#define drv_date "03-27-2004"
++
++typedef unsigned char u8;
++typedef signed char s8;
++typedef unsigned short u16;
++typedef signed short s16;
++typedef unsigned int u32;
++typedef signed int s32;
++
++#define HZ 1000
++
++static u32 ioaddr;
++
++#ifdef EDEBUG
++#define dprintf(x) printf x
++#else
++#define dprintf(x)
++#endif
++
++/* Condensed operations for readability. */
++#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
++#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
++
++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
++
++/* media options 
++        _10_Half = 0x01,
++        _10_Full = 0x02,
++        _100_Half = 0x04,
++        _100_Full = 0x08,
++        _1000_Full = 0x10,
++*/
++static int media = -1;
++
++#if 0
++/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
++static int max_interrupt_work = 20;
++#endif
++
++#if 0
++/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
++   The RTL chips use a 64 element hash table based on the Ethernet CRC.  */
++static int multicast_filter_limit = 32;
++#endif
++
++/* MAC address length*/
++#define MAC_ADDR_LEN	6
++
++/* max supported gigabit ethernet frame size -- must be at least (dev->mtu+14+4).*/
++#define MAX_ETH_FRAME_SIZE	1536
++
++#define TX_FIFO_THRESH 256	/* In bytes */
++
++#define RX_FIFO_THRESH	7	/* 7 means NO threshold, Rx buffer level before first PCI xfer.  */
++#define RX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */
++#define TX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */
++#define EarlyTxThld 	0x3F	/* 0x3F means NO early transmit */
++#define RxPacketMaxSize	0x0800	/* Maximum size supported is 16K-1 */
++#define InterFrameGap	0x03	/* 3 means InterFrameGap = the shortest one */
++
++#define NUM_TX_DESC	1	/* Number of Tx descriptor registers */
++#define NUM_RX_DESC	4	/* Number of Rx descriptor registers */
++#define RX_BUF_SIZE	1536	/* Rx Buffer size */
++
++#define RTL_MIN_IO_SIZE 0x80
++#define TX_TIMEOUT  (6*HZ)
++
++/* write/read MMIO register */
++#define RTL_W8(reg, val8)	writeb ((val8), ioaddr + (reg))
++#define RTL_W16(reg, val16)	writew ((val16), ioaddr + (reg))
++#define RTL_W32(reg, val32)	writel ((val32), ioaddr + (reg))
++#define RTL_R8(reg)		readb (ioaddr + (reg))
++#define RTL_R16(reg)		readw (ioaddr + (reg))
++#define RTL_R32(reg)		((unsigned long) readl (ioaddr + (reg)))
++
++enum RTL8169_registers {
++	MAC0 = 0,		/* Ethernet hardware address. */
++	MAR0 = 8,		/* Multicast filter. */
++	TxDescStartAddr = 0x20,
++	TxHDescStartAddr = 0x28,
++	FLASH = 0x30,
++	ERSR = 0x36,
++	ChipCmd = 0x37,
++	TxPoll = 0x38,
++	IntrMask = 0x3C,
++	IntrStatus = 0x3E,
++	TxConfig = 0x40,
++	RxConfig = 0x44,
++	RxMissed = 0x4C,
++	Cfg9346 = 0x50,
++	Config0 = 0x51,
++	Config1 = 0x52,
++	Config2 = 0x53,
++	Config3 = 0x54,
++	Config4 = 0x55,
++	Config5 = 0x56,
++	MultiIntr = 0x5C,
++	PHYAR = 0x60,
++	TBICSR = 0x64,
++	TBI_ANAR = 0x68,
++	TBI_LPAR = 0x6A,
++	PHYstatus = 0x6C,
++	RxMaxSize = 0xDA,
++	CPlusCmd = 0xE0,
++	RxDescStartAddr = 0xE4,
++	EarlyTxThres = 0xEC,
++	FuncEvent = 0xF0,
++	FuncEventMask = 0xF4,
++	FuncPresetState = 0xF8,
++	FuncForceEvent = 0xFC,
++};
++
++enum RTL8169_register_content {
++	/*InterruptStatusBits */
++	SYSErr = 0x8000,
++	PCSTimeout = 0x4000,
++	SWInt = 0x0100,
++	TxDescUnavail = 0x80,
++	RxFIFOOver = 0x40,
++	RxUnderrun = 0x20,
++	RxOverflow = 0x10,
++	TxErr = 0x08,
++	TxOK = 0x04,
++	RxErr = 0x02,
++	RxOK = 0x01,
++
++	/*RxStatusDesc */
++	RxRES = 0x00200000,
++	RxCRC = 0x00080000,
++	RxRUNT = 0x00100000,
++	RxRWT = 0x00400000,
++
++	/*ChipCmdBits */
++	CmdReset = 0x10,
++	CmdRxEnb = 0x08,
++	CmdTxEnb = 0x04,
++	RxBufEmpty = 0x01,
++
++	/*Cfg9346Bits */
++	Cfg9346_Lock = 0x00,
++	Cfg9346_Unlock = 0xC0,
++
++	/*rx_mode_bits */
++	AcceptErr = 0x20,
++	AcceptRunt = 0x10,
++	AcceptBroadcast = 0x08,
++	AcceptMulticast = 0x04,
++	AcceptMyPhys = 0x02,
++	AcceptAllPhys = 0x01,
++
++	/*RxConfigBits */
++	RxCfgFIFOShift = 13,
++	RxCfgDMAShift = 8,
++
++	/*TxConfigBits */
++	TxInterFrameGapShift = 24,
++	TxDMAShift = 8,		/* DMA burst value (0-7) is shift this many bits */
++
++	/*rtl8169_PHYstatus */
++	TBI_Enable = 0x80,
++	TxFlowCtrl = 0x40,
++	RxFlowCtrl = 0x20,
++	_1000bpsF = 0x10,
++	_100bps = 0x08,
++	_10bps = 0x04,
++	LinkStatus = 0x02,
++	FullDup = 0x01,
++
++	/*GIGABIT_PHY_registers */
++	PHY_CTRL_REG = 0,
++	PHY_STAT_REG = 1,
++	PHY_AUTO_NEGO_REG = 4,
++	PHY_1000_CTRL_REG = 9,
++
++	/*GIGABIT_PHY_REG_BIT */
++	PHY_Restart_Auto_Nego = 0x0200,
++	PHY_Enable_Auto_Nego = 0x1000,
++
++	/* PHY_STAT_REG = 1; */
++	PHY_Auto_Neco_Comp = 0x0020,
++
++	/* PHY_AUTO_NEGO_REG = 4; */
++	PHY_Cap_10_Half = 0x0020,
++	PHY_Cap_10_Full = 0x0040,
++	PHY_Cap_100_Half = 0x0080,
++	PHY_Cap_100_Full = 0x0100,
++
++	/* PHY_1000_CTRL_REG = 9; */
++	PHY_Cap_1000_Full = 0x0200,
++
++	PHY_Cap_Null = 0x0,
++
++	/*_MediaType*/
++	_10_Half = 0x01,
++	_10_Full = 0x02,
++	_100_Half = 0x04,
++	_100_Full = 0x08,
++	_1000_Full = 0x10,
++
++	/*_TBICSRBit*/
++	TBILinkOK = 0x02000000,
++};
++
++static struct {
++	const char *name;
++	u8 version;		/* depend on RTL8169 docs */
++	u32 RxConfigMask;	/* should clear the bits supported by this chip */
++} rtl_chip_info[] = {
++	{
++"RTL-8169", 0x00, 0xff7e1880,},};
++
++enum _DescStatusBit {
++	OWNbit = 0x80000000,
++	EORbit = 0x40000000,
++	FSbit = 0x20000000,
++	LSbit = 0x10000000,
++};
++
++struct TxDesc {
++	u32 status;
++	u32 vlan_tag;
++	u32 buf_addr;
++	u32 buf_Haddr;
++};
++
++struct RxDesc {
++	u32 status;
++	u32 vlan_tag;
++	u32 buf_addr;
++	u32 buf_Haddr;
++};
++
++/* The descriptors for this card are required to be aligned on
++256 byte boundaries.  As the align attribute does not do more than
++16 bytes of alignment it requires some extra steps.  Add 256 to the 
++size of the array and the init_ring adjusts the alignment */
++
++/* Define the TX Descriptor */
++static u8 tx_ring[NUM_TX_DESC * sizeof(struct TxDesc) + 256];
++
++/* Create a static buffer of size RX_BUF_SZ for each
++TX Descriptor.  All descriptors point to a
++part of this buffer */
++static unsigned char txb[NUM_TX_DESC * RX_BUF_SIZE];
++
++/* Define the RX Descriptor */
++static u8 rx_ring[NUM_RX_DESC * sizeof(struct TxDesc) + 256];
++
++/* Create a static buffer of size RX_BUF_SZ for each
++RX Descriptor   All descriptors point to a
++part of this buffer */
++static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE];
++
++struct rtl8169_private {
++	void *mmio_addr;	/* memory map physical address */
++	int chipset;
++	unsigned long cur_rx;	/* Index into the Rx descriptor buffer of next Rx pkt. */
++	unsigned long cur_tx;	/* Index into the Tx descriptor buffer of next Rx pkt. */
++	unsigned char *TxDescArrays;	/* Index of Tx Descriptor buffer */
++	unsigned char *RxDescArrays;	/* Index of Rx Descriptor buffer */
++	struct TxDesc *TxDescArray;	/* Index of 256-alignment Tx Descriptor buffer */
++	struct RxDesc *RxDescArray;	/* Index of 256-alignment Rx Descriptor buffer */
++	unsigned char *RxBufferRing[NUM_RX_DESC];	/* Index of Rx Buffer array */
++	unsigned char *Tx_skbuff[NUM_TX_DESC];
++} tpx;
++
++static struct rtl8169_private *tpc;
++
++static const u16 rtl8169_intr_mask =
++    SYSErr | PCSTimeout | RxUnderrun | RxOverflow | RxFIFOOver | TxErr |
++    TxOK | RxErr | RxOK;
++static const unsigned int rtl8169_rx_config =
++    (RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift);
++
++void mdio_write(int RegAddr, int value)
++{
++	int i;
++
++	RTL_W32(PHYAR, 0x80000000 | (RegAddr & 0xFF) << 16 | value);
++	udelay(1000);
++
++	for (i = 2000; i > 0; i--) {
++		/* Check if the RTL8169 has completed writing to the specified MII register */
++		if (!(RTL_R32(PHYAR) & 0x80000000)) {
++			break;
++		} else {
++			udelay(100);
++		}
++	}
++}
++
++int mdio_read(int RegAddr)
++{
++	int i, value = -1;
++
++	RTL_W32(PHYAR, 0x0 | (RegAddr & 0xFF) << 16);
++	udelay(1000);
++
++	for (i = 2000; i > 0; i--) {
++		/* Check if the RTL8169 has completed retrieving data from the specified MII register */
++		if (RTL_R32(PHYAR) & 0x80000000) {
++			value = (int) (RTL_R32(PHYAR) & 0xFFFF);
++			break;
++		} else {
++			udelay(100);
++		}
++	}
++	return value;
++}
++
++static int rtl8169_init_board(struct pci_device *pdev)
++{
++	int i;
++	unsigned long rtreg_base, rtreg_len;
++	u32 tmp;
++
++	rtreg_base = pci_bar_start(pdev, PCI_BASE_ADDRESS_1);
++	rtreg_len = pci_bar_size(pdev, PCI_BASE_ADDRESS_1);
++
++	/* check for weird/broken PCI region reporting */
++	if (rtreg_len < RTL_MIN_IO_SIZE) {
++		printf("Invalid PCI region size(s), aborting\n");
++	}
++
++	adjust_pci_device(pdev);
++/*      pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); */
++
++	/* ioremap MMIO region */
++	ioaddr = (unsigned long) ioremap(rtreg_base, rtreg_len);
++	if (ioaddr == 0)
++		return 0;
++
++	tpc->mmio_addr = &ioaddr;
++	/* Soft reset the chip. */
++	RTL_W8(ChipCmd, CmdReset);
++
++	/* Check that the chip has finished the reset. */
++	for (i = 1000; i > 0; i--)
++		if ((RTL_R8(ChipCmd) & CmdReset) == 0)
++			break;
++		else
++			udelay(10);
++
++	/* identify chip attached to board */
++	tmp = RTL_R32(TxConfig);
++	tmp = ((tmp & 0x7c000000) + ((tmp & 0x00800000) << 2)) >> 24;
++
++	for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--)
++		if (tmp == rtl_chip_info[i].version) {
++			tpc->chipset = i;
++			goto match;
++		}
++	/* if unknown chip, assume array element #0, original RTL-8169 in this case */
++	dprintf(("PCI device: unknown chip version, assuming RTL-8169\n"));
++	dprintf(("PCI device: TxConfig = 0x%hX\n",
++		 (unsigned long) RTL_R32(TxConfig)));
++	tpc->chipset = 0;
++	return 1;
++      match:
++	return 0;
++
++}
++
++/**************************************************************************
++IRQ - Wait for a frame
++***************************************************************************/
++void r8169_irq ( struct nic *nic __unused, irq_action_t action ) {
++	int intr_status = 0;
++	int interested = RxUnderrun | RxOverflow | RxFIFOOver | RxErr | RxOK;
++ 
++	switch ( action ) {
++		case DISABLE:
++		case ENABLE:
++			intr_status = RTL_R16(IntrStatus);
++			/* h/w no longer present (hotplug?) or major error, 
++				bail */
++			if (intr_status == 0xFFFF)
++				break;
++
++			intr_status = intr_status & ~interested;
++			if ( action == ENABLE )
++				intr_status = intr_status | interested;
++			RTL_W16(IntrMask, intr_status);
++			break;
++		case FORCE :
++			RTL_W8(TxPoll, (RTL_R8(TxPoll) | 0x01));
++			break;
++	}
++}
++
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int r8169_poll(struct nic *nic, int retreive)
++{
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++	int cur_rx;
++	unsigned int intr_status = 0;
++	cur_rx = tpc->cur_rx;
++	if ((tpc->RxDescArray[cur_rx].status & OWNbit) == 0) {
++	         /* There is a packet ready */
++  	         if(!retreive)
++  	                 return 1;
++		intr_status = RTL_R16(IntrStatus);
++		/* h/w no longer present (hotplug?) or major error,
++			bail */
++		if (intr_status == 0xFFFF)
++			return 0;
++		RTL_W16(IntrStatus, intr_status & 
++			~(RxFIFOOver | RxOverflow | RxOK));
++
++		if (!(tpc->RxDescArray[cur_rx].status & RxRES)) {
++			nic->packetlen = (int) (tpc->RxDescArray[cur_rx].
++						status & 0x00001FFF) - 4;
++			memcpy(nic->packet, tpc->RxBufferRing[cur_rx],
++			       nic->packetlen);
++			if (cur_rx == NUM_RX_DESC - 1)
++				tpc->RxDescArray[cur_rx].status =
++				    (OWNbit | EORbit) + RX_BUF_SIZE;
++			else
++				tpc->RxDescArray[cur_rx].status =
++				    OWNbit + RX_BUF_SIZE;
++			tpc->RxDescArray[cur_rx].buf_addr =
++			    virt_to_bus(tpc->RxBufferRing[cur_rx]);
++		} else
++			printf("Error Rx");
++		/* FIXME: shouldn't I reset the status on an error */
++		cur_rx = (cur_rx + 1) % NUM_RX_DESC;
++		tpc->cur_rx = cur_rx;
++		RTL_W16(IntrStatus, intr_status & 
++			(RxFIFOOver | RxOverflow | RxOK));
++
++		return 1;
++
++	}
++	tpc->cur_rx = cur_rx;
++	/* FIXME: There is no reason to do this as cur_rx did not change */
++
++	return (0);		/* initially as this is called to flush the input */
++
++}
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void r8169_transmit(struct nic *nic, const char *d,	/* Destination */
++			   unsigned int t,	/* Type */
++			   unsigned int s,	/* size */
++			   const char *p)
++{				/* Packet */
++	/* send the packet to destination */
++
++	u16 nstype;
++	u32 to;
++	u8 *ptxb;
++	int entry = tpc->cur_tx % NUM_TX_DESC;
++
++	/* point to the current txb incase multiple tx_rings are used */
++	ptxb = tpc->Tx_skbuff[entry * MAX_ETH_FRAME_SIZE];
++	memcpy(ptxb, d, ETH_ALEN);
++	memcpy(ptxb + ETH_ALEN, nic->node_addr, ETH_ALEN);
++	nstype = htons((u16) t);
++	memcpy(ptxb + 2 * ETH_ALEN, (u8 *) & nstype, 2);
++	memcpy(ptxb + ETH_HLEN, p, s);
++	s += ETH_HLEN;
++	s &= 0x0FFF;
++	while (s < ETH_ZLEN)
++		ptxb[s++] = '\0';
++
++	tpc->TxDescArray[entry].buf_addr = virt_to_bus(ptxb);
++	if (entry != (NUM_TX_DESC - 1))
++		tpc->TxDescArray[entry].status =
++		    (OWNbit | FSbit | LSbit) | ((s > ETH_ZLEN) ? s :
++						ETH_ZLEN);
++	else
++		tpc->TxDescArray[entry].status =
++		    (OWNbit | EORbit | FSbit | LSbit) | ((s > ETH_ZLEN) ? s
++							 : ETH_ZLEN);
++	RTL_W8(TxPoll, 0x40);	/* set polling bit */
++
++	tpc->cur_tx++;
++	to = currticks() + TX_TIMEOUT;
++	while ((tpc->TxDescArray[entry].status & OWNbit) && (currticks() < to));	/* wait */
++
++	if (currticks() >= to) {
++		printf("TX Time Out");
++	}
++}
++
++static void rtl8169_set_rx_mode(struct nic *nic __unused)
++{
++	u32 mc_filter[2];	/* Multicast hash filter */
++	int rx_mode;
++	u32 tmp = 0;
++
++	/* IFF_ALLMULTI */
++	/* Too many to filter perfectly -- accept all multicasts. */
++	rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
++	mc_filter[1] = mc_filter[0] = 0xffffffff;
++
++	tmp =
++	    rtl8169_rx_config | rx_mode | (RTL_R32(RxConfig) &
++					   rtl_chip_info[tpc->chipset].
++					   RxConfigMask);
++
++	RTL_W32(RxConfig, tmp);
++	RTL_W32(MAR0 + 0, mc_filter[0]);
++	RTL_W32(MAR0 + 4, mc_filter[1]);
++}
++static void rtl8169_hw_start(struct nic *nic)
++{
++	u32 i;
++
++	/* Soft reset the chip. */
++	RTL_W8(ChipCmd, CmdReset);
++
++	/* Check that the chip has finished the reset. */
++	for (i = 1000; i > 0; i--) {
++		if ((RTL_R8(ChipCmd) & CmdReset) == 0)
++			break;
++		else
++			udelay(10);
++	}
++
++	RTL_W8(Cfg9346, Cfg9346_Unlock);
++	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
++	RTL_W8(EarlyTxThres, EarlyTxThld);
++
++	/* For gigabit rtl8169 */
++	RTL_W16(RxMaxSize, RxPacketMaxSize);
++
++	/* Set Rx Config register */
++	i = rtl8169_rx_config | (RTL_R32(RxConfig) &
++				 rtl_chip_info[tpc->chipset].RxConfigMask);
++	RTL_W32(RxConfig, i);
++
++	/* Set DMA burst size and Interframe Gap Time */
++	RTL_W32(TxConfig,
++		(TX_DMA_BURST << TxDMAShift) | (InterFrameGap <<
++						TxInterFrameGapShift));
++
++
++	tpc->cur_rx = 0;
++
++	RTL_W32(TxDescStartAddr, virt_to_le32desc(tpc->TxDescArray));
++	RTL_W32(RxDescStartAddr, virt_to_le32desc(tpc->RxDescArray));
++	RTL_W8(Cfg9346, Cfg9346_Lock);
++	udelay(10);
++
++	RTL_W32(RxMissed, 0);
++
++	rtl8169_set_rx_mode(nic);
++
++	/* no early-rx interrupts */
++	RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
++}
++
++static void rtl8169_init_ring(struct nic *nic __unused)
++{
++	int i;
++
++	tpc->cur_rx = 0;
++	tpc->cur_tx = 0;
++	memset(tpc->TxDescArray, 0x0, NUM_TX_DESC * sizeof(struct TxDesc));
++	memset(tpc->RxDescArray, 0x0, NUM_RX_DESC * sizeof(struct RxDesc));
++
++	for (i = 0; i < NUM_TX_DESC; i++) {
++		tpc->Tx_skbuff[i] = &txb[i];
++	}
++
++	for (i = 0; i < NUM_RX_DESC; i++) {
++		if (i == (NUM_RX_DESC - 1))
++			tpc->RxDescArray[i].status =
++			    (OWNbit | EORbit) + RX_BUF_SIZE;
++		else
++			tpc->RxDescArray[i].status = OWNbit + RX_BUF_SIZE;
++
++		tpc->RxBufferRing[i] = &rxb[i * RX_BUF_SIZE];
++		tpc->RxDescArray[i].buf_addr =
++		    virt_to_bus(tpc->RxBufferRing[i]);
++	}
++}
++
++/**************************************************************************
++RESET - Finish setting up the ethernet interface
++***************************************************************************/
++static void r8169_reset(struct nic *nic)
++{
++	int i;
++	u8 diff;
++	u32 TxPhyAddr, RxPhyAddr;
++
++	tpc->TxDescArrays = tx_ring;
++	if (tpc->TxDescArrays == 0)
++		printf("Allot Error");
++	/* Tx Desscriptor needs 256 bytes alignment; */
++	TxPhyAddr = virt_to_bus(tpc->TxDescArrays);
++	diff = 256 - (TxPhyAddr - ((TxPhyAddr >> 8) << 8));
++	TxPhyAddr += diff;
++	tpc->TxDescArray = (struct TxDesc *) (tpc->TxDescArrays + diff);
++
++	tpc->RxDescArrays = rx_ring;
++	/* Rx Desscriptor needs 256 bytes alignment; */
++	RxPhyAddr = virt_to_bus(tpc->RxDescArrays);
++	diff = 256 - (RxPhyAddr - ((RxPhyAddr >> 8) << 8));
++	RxPhyAddr += diff;
++	tpc->RxDescArray = (struct RxDesc *) (tpc->RxDescArrays + diff);
++
++	if (tpc->TxDescArrays == NULL || tpc->RxDescArrays == NULL) {
++		printf("Allocate RxDescArray or TxDescArray failed\n");
++		return;
++	}
++
++	rtl8169_init_ring(nic);
++	rtl8169_hw_start(nic);
++	/* Construct a perfect filter frame with the mac address as first match
++	 * and broadcast for all others */
++	for (i = 0; i < 192; i++)
++		txb[i] = 0xFF;
++
++	txb[0] = nic->node_addr[0];
++	txb[1] = nic->node_addr[1];
++	txb[2] = nic->node_addr[2];
++	txb[3] = nic->node_addr[3];
++	txb[4] = nic->node_addr[4];
++	txb[5] = nic->node_addr[5];
++}
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void r8169_disable(struct dev *dev __unused)
++{
++	int i;
++	/* Stop the chip's Tx and Rx DMA processes. */
++	RTL_W8(ChipCmd, 0x00);
++
++	/* Disable interrupts by clearing the interrupt mask. */
++	RTL_W16(IntrMask, 0x0000);
++
++	RTL_W32(RxMissed, 0);
++
++	tpc->TxDescArrays = NULL;
++	tpc->RxDescArrays = NULL;
++	tpc->TxDescArray = NULL;
++	tpc->RxDescArray = NULL;
++	for (i = 0; i < NUM_RX_DESC; i++) {
++		tpc->RxBufferRing[i] = NULL;
++	}
++}
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++***************************************************************************/
++
++#define board_found 1
++#define valid_link 0
++static int r8169_probe(struct dev *dev, struct pci_device *pci)
++{
++	struct nic *nic = (struct nic *) dev;
++	static int board_idx = -1;
++	static int printed_version = 0;
++	int i, rc;
++	int option = -1, Cap10_100 = 0, Cap1000 = 0;
++
++	printf("r8169.c: Found %s, Vendor=%hX Device=%hX\n",
++	       pci->name, pci->vendor, pci->dev_id);
++
++	board_idx++;
++
++	printed_version = 1;
++
++	/* point to private storage */
++	tpc = &tpx;
++
++	rc = rtl8169_init_board(pci);	/* Return code is meaningless */
++
++	/* Get MAC address.  FIXME: read EEPROM */
++	for (i = 0; i < MAC_ADDR_LEN; i++)
++		nic->node_addr[i] = RTL_R8(MAC0 + i);
++
++	dprintf(("%s: Identified chip type is '%s'.\n", pci->name,
++		 rtl_chip_info[tpc->chipset].name));
++	/* Print out some hardware info */
++	printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr,
++	       ioaddr);
++
++	/* if TBI is not endbled */
++	if (!(RTL_R8(PHYstatus) & TBI_Enable)) {
++		int val = mdio_read(PHY_AUTO_NEGO_REG);
++
++		option = media;
++		/* Force RTL8169 in 10/100/1000 Full/Half mode. */
++		if (option > 0) {
++			printf(" Force-mode Enabled.\n");
++			Cap10_100 = 0, Cap1000 = 0;
++			switch (option) {
++			case _10_Half:
++				Cap10_100 = PHY_Cap_10_Half;
++				Cap1000 = PHY_Cap_Null;
++				break;
++			case _10_Full:
++				Cap10_100 = PHY_Cap_10_Full;
++				Cap1000 = PHY_Cap_Null;
++				break;
++			case _100_Half:
++				Cap10_100 = PHY_Cap_100_Half;
++				Cap1000 = PHY_Cap_Null;
++				break;
++			case _100_Full:
++				Cap10_100 = PHY_Cap_100_Full;
++				Cap1000 = PHY_Cap_Null;
++				break;
++			case _1000_Full:
++				Cap10_100 = PHY_Cap_Null;
++				Cap1000 = PHY_Cap_1000_Full;
++				break;
++			default:
++				break;
++			}
++			/* leave PHY_AUTO_NEGO_REG bit4:0 unchanged */
++			mdio_write(PHY_AUTO_NEGO_REG,
++				   Cap10_100 | (val & 0x1F));
++			mdio_write(PHY_1000_CTRL_REG, Cap1000);
++		} else {
++			dprintf(("Auto-negotiation Enabled.\n",
++				 pci->name));
++
++			/* enable 10/100 Full/Half Mode, leave PHY_AUTO_NEGO_REG bit4:0 unchanged */
++			mdio_write(PHY_AUTO_NEGO_REG,
++				   PHY_Cap_10_Half | PHY_Cap_10_Full |
++				   PHY_Cap_100_Half | PHY_Cap_100_Full |
++				   (val & 0x1F));
++
++			/* enable 1000 Full Mode */
++			mdio_write(PHY_1000_CTRL_REG, PHY_Cap_1000_Full);
++
++		}
++
++		/* Enable auto-negotiation and restart auto-nigotiation */
++		mdio_write(PHY_CTRL_REG,
++			   PHY_Enable_Auto_Nego | PHY_Restart_Auto_Nego);
++		udelay(100);
++
++		/* wait for auto-negotiation process */
++		for (i = 10000; i > 0; i--) {
++			/* Check if auto-negotiation complete */
++			if (mdio_read(PHY_STAT_REG) & PHY_Auto_Neco_Comp) {
++				udelay(100);
++				option = RTL_R8(PHYstatus);
++				if (option & _1000bpsF) {
++					printf
++					    ("1000Mbps Full-duplex operation.\n");
++				} else {
++					printf
++					    ("%sMbps %s-duplex operation.\n",
++					     (option & _100bps) ? "100" :
++					     "10",
++					     (option & FullDup) ? "Full" :
++					     "Half");
++				}
++				break;
++			} else {
++				udelay(100);
++			}
++		}		/* end for-loop to wait for auto-negotiation process */
++
++	} else {
++		udelay(100);
++		printf
++		    ("%s: 1000Mbps Full-duplex operation, TBI Link %s!\n",
++		     pci->name,
++		     (RTL_R32(TBICSR) & TBILinkOK) ? "OK" : "Failed");
++
++	}
++
++	r8169_reset(nic);
++	/* point to NIC specific routines */
++	dev->disable = r8169_disable;
++	nic->poll = r8169_poll;
++	nic->transmit = r8169_transmit;
++	nic->irqno = pci->irq;
++	nic->irq = r8169_irq;
++	nic->ioaddr = ioaddr;
++	return 1;
++
++}
++
++static struct pci_id r8169_nics[] = {
++	PCI_ROM(0x10ec, 0x8169, "r8169", "RealTek RTL8169 Gigabit Ethernet"),
++};
++
++struct pci_driver r8169_driver = {
++	.type = NIC_DRIVER,
++	.name = "r8169/PCI",
++	.probe = r8169_probe,
++	.ids = r8169_nics,
++	.id_count = sizeof(r8169_nics) / sizeof(r8169_nics[0]),
++	.class = 0,
++};
+diff -Naur grub-0.97.orig/netboot/rtl8139.c grub-0.97/netboot/rtl8139.c
+--- grub-0.97.orig/netboot/rtl8139.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/rtl8139.c	2005-08-31 19:03:35.000000000 +0000
+@@ -17,6 +17,8 @@
+ /*********************************************************************/
+ 
+ /*
++  28 Dec 2002	ken_yap@users.sourceforge.net (Ken Yap)
++     Put in virt_to_bus calls to allow Etherboot relocation.
+ 
+   06 Apr 2001	ken_yap@users.sourceforge.net (Ken Yap)
+      Following email from Hyun-Joon Cha, added a disable routine, otherwise
+@@ -63,7 +65,6 @@
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ #include "timer.h"
+ 
+ #define RTL_TIMEOUT (1*TICKS_PER_SEC)
+@@ -112,9 +113,19 @@
+ 	 * definitions we will probably never need to know about.  */
+ };
+ 
++enum RxEarlyStatusBits {
++	ERGood=0x08, ERBad=0x04, EROVW=0x02, EROK=0x01
++};
++
+ enum ChipCmdBits {
+ 	CmdReset=0x10, CmdRxEnb=0x08, CmdTxEnb=0x04, RxBufEmpty=0x01, };
+ 
++enum IntrMaskBits {
++	SERR=0x8000, TimeOut=0x4000, LenChg=0x2000,
++	FOVW=0x40, PUN_LinkChg=0x20, RXOVW=0x10,
++	TER=0x08, TOK=0x04, RER=0x02, ROK=0x01
++};
++
+ /* Interrupt register bits, using my own meaningful names. */
+ enum IntrStatusBits {
+ 	PCIErr=0x8000, PCSTimeout=0x4000, CableLenChange= 0x2000,
+@@ -155,74 +166,68 @@
+ 	AcceptMulticast=0x04, AcceptMyPhys=0x02, AcceptAllPhys=0x01,
+ };
+ 
+-static int ioaddr;
+ static unsigned int cur_rx,cur_tx;
+ 
+ /* The RTL8139 can only transmit from a contiguous, aligned memory block.  */
+ static unsigned char tx_buffer[TX_BUF_SIZE] __attribute__((aligned(4)));
+-
+-/* I know that this is a MEGA HACK, but the tagged boot image specification
+- * states that we can do whatever we want below 0x10000 - so we do!  */
+-/* But we still give the user the choice of using an internal buffer
+-   just in case - Ken */
+-#ifdef	USE_LOWMEM_BUFFER
+-#define rx_ring ((unsigned char *)(0x10000 - (RX_BUF_LEN + 16)))
+-#else
+ static unsigned char rx_ring[RX_BUF_LEN+16] __attribute__((aligned(4)));
+-#endif
+ 
+-struct nic *rtl8139_probe(struct nic *nic, unsigned short *probeaddrs,
+-	struct pci_device *pci);
+-static int read_eeprom(int location);
++static int rtl8139_probe(struct dev *dev, struct pci_device *pci);
++static int read_eeprom(struct nic *nic, int location, int addr_len);
+ static void rtl_reset(struct nic *nic);
+ static void rtl_transmit(struct nic *nic, const char *destaddr,
+ 	unsigned int type, unsigned int len, const char *data);
+-static int rtl_poll(struct nic *nic);
+-static void rtl_disable(struct nic*);
++static int rtl_poll(struct nic *nic, int retrieve);
++static void rtl_disable(struct dev *);
++static void rtl_irq(struct nic *nic, irq_action_t action);
+ 
+ 
+-struct nic *rtl8139_probe(struct nic *nic, unsigned short *probeaddrs,
+-	struct pci_device *pci)
++static int rtl8139_probe(struct dev *dev, struct pci_device *pci)
+ {
++	struct nic *nic = (struct nic *)dev;
+ 	int i;
+ 	int speed10, fullduplex;
++	int addr_len;
++	unsigned short *ap = (unsigned short*)nic->node_addr;
+ 
+ 	/* There are enough "RTL8139" strings on the console already, so
+ 	 * be brief and concentrate on the interesting pieces of info... */
+ 	printf(" - ");
+ 
+ 	/* Mask the bit that says "this is an io addr" */
+-	ioaddr = probeaddrs[0] & ~3;
++	nic->ioaddr = pci->ioaddr & ~3;
++
++	/* Copy IRQ from PCI information */
++	nic->irqno = pci->irq;
+ 
+ 	adjust_pci_device(pci);
+ 
+ 	/* Bring the chip out of low-power mode. */
+-	outb(0x00, ioaddr + Config1);
+-
+-	if (read_eeprom(0) != 0xffff) {
+-		unsigned short *ap = (unsigned short*)nic->node_addr;
+-		for (i = 0; i < 3; i++)
+-			*ap++ = read_eeprom(i + 7);
+-	} else {
+-		unsigned char *ap = (unsigned char*)nic->node_addr;
+-		for (i = 0; i < ETH_ALEN; i++)
+-			*ap++ = inb(ioaddr + MAC0 + i);
+-	}
++	outb(0x00, nic->ioaddr + Config1);
+ 
+-	speed10 = inb(ioaddr + MediaStatus) & MSRSpeed10;
+-	fullduplex = inw(ioaddr + MII_BMCR) & BMCRDuplex;
+-	printf("ioaddr %#hX, addr %! %sMbps %s-duplex\n", ioaddr,
+-		nic->node_addr,  speed10 ? "10" : "100",
+-		fullduplex ? "full" : "half");
++	addr_len = read_eeprom(nic,0,8) == 0x8129 ? 8 : 6;
++	for (i = 0; i < 3; i++)
++	  *ap++ = read_eeprom(nic,i + 7,addr_len);
++
++	speed10 = inb(nic->ioaddr + MediaStatus) & MSRSpeed10;
++	fullduplex = inw(nic->ioaddr + MII_BMCR) & BMCRDuplex;
++	printf("ioaddr %#hX, irq %d, addr %! %sMbps %s-duplex\n", nic->ioaddr,
++	       nic->irqno, nic->node_addr,  speed10 ? "10" : "100",
++	       fullduplex ? "full" : "half");
+ 
+ 	rtl_reset(nic);
+ 
+-	nic->reset = rtl_reset;
+-	nic->poll = rtl_poll;
++	if (inb(nic->ioaddr + MediaStatus) & MSRLinkFail) {
++		printf("Cable not connected or other link failure\n");
++		return(0);
++	}
++
++	dev->disable  = rtl_disable;
++	nic->poll     = rtl_poll;
+ 	nic->transmit = rtl_transmit;
+-	nic->disable = rtl_disable;
++	nic->irq      = rtl_irq;
+ 
+-	return nic;
++	return 1;
+ }
+ 
+ /* Serial EEPROM section. */
+@@ -244,22 +249,23 @@
+ #define eeprom_delay()  inl(ee_addr)
+ 
+ /* The EEPROM commands include the alway-set leading bit. */
+-#define EE_WRITE_CMD    (5 << 6)
+-#define EE_READ_CMD     (6 << 6)
+-#define EE_ERASE_CMD    (7 << 6)
++#define EE_WRITE_CMD    (5)
++#define EE_READ_CMD     (6)
++#define EE_ERASE_CMD    (7)
+ 
+-static int read_eeprom(int location)
++static int read_eeprom(struct nic *nic, int location, int addr_len)
+ {
+ 	int i;
+ 	unsigned int retval = 0;
+-	long ee_addr = ioaddr + Cfg9346;
+-	int read_cmd = location | EE_READ_CMD;
++	long ee_addr = nic->ioaddr + Cfg9346;
++	int read_cmd = location | (EE_READ_CMD << addr_len);
+ 
+ 	outb(EE_ENB & ~EE_CS, ee_addr);
+ 	outb(EE_ENB, ee_addr);
++	eeprom_delay();
+ 
+ 	/* Shift the read command bits out. */
+-	for (i = 10; i >= 0; i--) {
++	for (i = 4 + addr_len; i >= 0; i--) {
+ 		int dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
+ 		outb(EE_ENB | dataval, ee_addr);
+ 		eeprom_delay();
+@@ -279,31 +285,51 @@
+ 
+ 	/* Terminate the EEPROM access. */
+ 	outb(~EE_CS, ee_addr);
++	eeprom_delay();
+ 	return retval;
+ }
+ 
++static const unsigned int rtl8139_rx_config = 
++	(RX_BUF_LEN_IDX << 11) |
++	(RX_FIFO_THRESH << 13) |
++	(RX_DMA_BURST << 8);
++	
++static void set_rx_mode(struct nic *nic) {
++	unsigned int mc_filter[2];
++	int rx_mode;
++	/* !IFF_PROMISC */
++	rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
++	mc_filter[1] = mc_filter[0] = 0xffffffff;
++
++	outl(rtl8139_rx_config | rx_mode, nic->ioaddr + RxConfig);
++
++	outl(mc_filter[0], nic->ioaddr + MAR0 + 0);
++	outl(mc_filter[1], nic->ioaddr + MAR0 + 4);
++}
++	
+ static void rtl_reset(struct nic* nic)
+ {
+ 	int i;
+ 
+-	outb(CmdReset, ioaddr + ChipCmd);
++	outb(CmdReset, nic->ioaddr + ChipCmd);
+ 
+ 	cur_rx = 0;
+ 	cur_tx = 0;
+ 
+ 	/* Give the chip 10ms to finish the reset. */
+ 	load_timer2(10*TICKS_PER_MS);
+-	while ((inb(ioaddr + ChipCmd) & CmdReset) != 0 && timer2_running())
++	while ((inb(nic->ioaddr + ChipCmd) & CmdReset) != 0 &&
++	       timer2_running())
+ 		/* wait */;
+ 
+ 	for (i = 0; i < ETH_ALEN; i++)
+-		outb(nic->node_addr[i], ioaddr + MAC0 + i);
++		outb(nic->node_addr[i], nic->ioaddr + MAC0 + i);
+ 
+ 	/* Must enable Tx/Rx before setting transfer thresholds! */
+-	outb(CmdRxEnb | CmdTxEnb, ioaddr + ChipCmd);
++	outb(CmdRxEnb | CmdTxEnb, nic->ioaddr + ChipCmd);
+ 	outl((RX_FIFO_THRESH<<13) | (RX_BUF_LEN_IDX<<11) | (RX_DMA_BURST<<8),
+-		ioaddr + RxConfig);		/* accept no frames yet!  */
+-	outl((TX_DMA_BURST<<8)|0x03000000, ioaddr + TxConfig);
++		nic->ioaddr + RxConfig);	  /* accept no frames yet!  */
++	outl((TX_DMA_BURST<<8)|0x03000000, nic->ioaddr + TxConfig);
+ 
+ 	/* The Linux driver changes Config1 here to use a different LED pattern
+ 	 * for half duplex or full/autodetect duplex (for full/autodetect, the
+@@ -316,19 +342,26 @@
+ #ifdef	DEBUG_RX
+ 	printf("rx ring address is %X\n",(unsigned long)rx_ring);
+ #endif
+-	outl((unsigned long)rx_ring, ioaddr + RxBuf);
++	outl((unsigned long)virt_to_bus(rx_ring), nic->ioaddr + RxBuf);
++
++
+ 
+-	/* Start the chip's Tx and Rx process. */
+-	outl(0, ioaddr + RxMissed);
+-	/* set_rx_mode */
+-	outb(AcceptBroadcast|AcceptMyPhys, ioaddr + RxConfig);
+ 	/* If we add multicast support, the MAR0 register would have to be
+ 	 * initialized to 0xffffffffffffffff (two 32 bit accesses).  Etherboot
+ 	 * only needs broadcast (for ARP/RARP/BOOTP/DHCP) and unicast.  */
+-	outb(CmdRxEnb | CmdTxEnb, ioaddr + ChipCmd);
+ 
++	outb(CmdRxEnb | CmdTxEnb, nic->ioaddr + ChipCmd);
++	
++	outl(rtl8139_rx_config, nic->ioaddr + RxConfig);
++	
++	/* Start the chip's Tx and Rx process. */
++	outl(0, nic->ioaddr + RxMissed);
++
++	/* set_rx_mode */
++	set_rx_mode(nic);
++	
+ 	/* Disable all known interrupts by setting the interrupt mask. */
+-	outw(0, ioaddr + IntrMask);
++	outw(0, nic->ioaddr + IntrMask);
+ }
+ 
+ static void rtl_transmit(struct nic *nic, const char *destaddr,
+@@ -337,10 +370,11 @@
+ 	unsigned int status, to, nstype;
+ 	unsigned long txstatus;
+ 
++	/* nstype assignment moved up here to avoid gcc 3.0.3 compiler bug */
++	nstype = htons(type);
+ 	memcpy(tx_buffer, destaddr, ETH_ALEN);
+ 	memcpy(tx_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN);
+-	nstype = htons(type);
+-	memcpy(tx_buffer + 2 * ETH_ALEN, (char*)&nstype, 2);
++	memcpy(tx_buffer + 2 * ETH_ALEN, &nstype, 2);
+ 	memcpy(tx_buffer + ETH_HLEN, data, len);
+ 
+ 	len += ETH_HLEN;
+@@ -354,22 +388,22 @@
+ 		tx_buffer[len++] = '\0';
+ 	}
+ 
+-	outl((unsigned long)tx_buffer, ioaddr + TxAddr0 + cur_tx*4);
++	outl((unsigned long)virt_to_bus(tx_buffer), nic->ioaddr + TxAddr0 + cur_tx*4);
+ 	outl(((TX_FIFO_THRESH<<11) & 0x003f0000) | len,
+-		ioaddr + TxStatus0 + cur_tx*4);
++		nic->ioaddr + TxStatus0 + cur_tx*4);
+ 
+ 	to = currticks() + RTL_TIMEOUT;
+ 
+ 	do {
+-		status = inw(ioaddr + IntrStatus);
++		status = inw(nic->ioaddr + IntrStatus);
+ 		/* Only acknlowledge interrupt sources we can properly handle
+ 		 * here - the RxOverflow/RxFIFOOver MUST be handled in the
+ 		 * rtl_poll() function.  */
+-		outw(status & (TxOK | TxErr | PCIErr), ioaddr + IntrStatus);
++		outw(status & (TxOK | TxErr | PCIErr), nic->ioaddr + IntrStatus);
+ 		if ((status & (TxOK | TxErr | PCIErr)) != 0) break;
+ 	} while (currticks() < to);
+ 
+-	txstatus = inl(ioaddr+ TxStatus0 + cur_tx*4);
++	txstatus = inl(nic->ioaddr+ TxStatus0 + cur_tx*4);
+ 
+ 	if (status & TxOK) {
+ 		cur_tx = (cur_tx + 1) % NUM_TX_DESC;
+@@ -386,19 +420,22 @@
+ 	}
+ }
+ 
+-static int rtl_poll(struct nic *nic)
++static int rtl_poll(struct nic *nic, int retrieve)
+ {
+ 	unsigned int status;
+ 	unsigned int ring_offs;
+ 	unsigned int rx_size, rx_status;
+ 
+-	if (inb(ioaddr + ChipCmd) & RxBufEmpty) {
++	if (inb(nic->ioaddr + ChipCmd) & RxBufEmpty) {
+ 		return 0;
+ 	}
+ 
+-	status = inw(ioaddr + IntrStatus);
++	/* There is a packet ready */
++	if ( ! retrieve ) return 1;
++
++	status = inw(nic->ioaddr + IntrStatus);
+ 	/* See below for the rest of the interrupt acknowledges.  */
+-	outw(status & ~(RxFIFOOver | RxOverflow | RxOK), ioaddr + IntrStatus);
++	outw(status & ~(RxFIFOOver | RxOverflow | RxOK), nic->ioaddr + IntrStatus);
+ 
+ #ifdef	DEBUG_RX
+ 	printf("rtl_poll: int %hX ", status);
+@@ -438,21 +475,77 @@
+ 		nic->packet[12], nic->packet[13], rx_status);
+ #endif
+ 	cur_rx = (cur_rx + rx_size + 4 + 3) & ~3;
+-	outw(cur_rx - 16, ioaddr + RxBufPtr);
++	outw(cur_rx - 16, nic->ioaddr + RxBufPtr);
+ 	/* See RTL8139 Programming Guide V0.1 for the official handling of
+ 	 * Rx overflow situations.  The document itself contains basically no
+ 	 * usable information, except for a few exception handling rules.  */
+-	outw(status & (RxFIFOOver | RxOverflow | RxOK), ioaddr + IntrStatus);
++	outw(status & (RxFIFOOver | RxOverflow | RxOK), nic->ioaddr + IntrStatus);
+ 	return 1;
+ }
+ 
+-static void rtl_disable(struct nic *nic)
++static void rtl_irq(struct nic *nic, irq_action_t action)
+ {
++	unsigned int mask;
++	/* Bit of a guess as to which interrupts we should allow */
++	unsigned int interested = ROK | RER | RXOVW | FOVW | SERR;
++
++	switch ( action ) {
++	case DISABLE :
++	case ENABLE :
++		mask = inw(nic->ioaddr + IntrMask);
++		mask = mask & ~interested;
++		if ( action == ENABLE ) mask = mask | interested;
++		outw(mask, nic->ioaddr + IntrMask);
++		break;
++	case FORCE :
++		/* Apparently writing a 1 to this read-only bit of a
++		 * read-only and otherwise unrelated register will
++		 * force an interrupt.  If you ever want to see how
++		 * not to write a datasheet, read the one for the
++		 * RTL8139...
++		 */
++		outb(EROK, nic->ioaddr + RxEarlyStatus);
++		break;
++	}
++}
++
++static void rtl_disable(struct dev *dev)
++{
++	struct nic *nic = (struct nic *)dev;
++	/* merge reset and disable */
++	rtl_reset(nic);
++
+ 	/* reset the chip */
+-	outb(CmdReset, ioaddr + ChipCmd);
++	outb(CmdReset, nic->ioaddr + ChipCmd);
+ 
+ 	/* 10 ms timeout */
+ 	load_timer2(10*TICKS_PER_MS);
+-	while ((inb(ioaddr + ChipCmd) & CmdReset) != 0 && timer2_running())
++	while ((inb(nic->ioaddr + ChipCmd) & CmdReset) != 0 && timer2_running())
+ 		/* wait */;
+ }
++
++static struct pci_id rtl8139_nics[] = {
++PCI_ROM(0x10ec, 0x8129, "rtl8129",       "Realtek 8129"),
++PCI_ROM(0x10ec, 0x8139, "rtl8139",       "Realtek 8139"),
++PCI_ROM(0x10ec, 0x8138, "rtl8139b",      "Realtek 8139B"),
++PCI_ROM(0x1186, 0x1300, "dfe538",        "DFE530TX+/DFE538TX"),
++PCI_ROM(0x1113, 0x1211, "smc1211-1",     "SMC EZ10/100"),
++PCI_ROM(0x1112, 0x1211, "smc1211",       "SMC EZ10/100"),
++PCI_ROM(0x1500, 0x1360, "delta8139",     "Delta Electronics 8139"),
++PCI_ROM(0x4033, 0x1360, "addtron8139",   "Addtron Technology 8139"),
++PCI_ROM(0x1186, 0x1340, "dfe690txd",     "D-Link DFE690TXD"),
++PCI_ROM(0x13d1, 0xab06, "fe2000vx",      "AboCom FE2000VX"),
++PCI_ROM(0x1259, 0xa117, "allied8139",    "Allied Telesyn 8139"),
++PCI_ROM(0x14ea, 0xab06, "fnw3603tx",     "Planex FNW-3603-TX"),
++PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX"),
++PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139"),
++};
++
++struct pci_driver rtl8139_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "RTL8139",
++	.probe    = rtl8139_probe,
++	.ids      = rtl8139_nics,
++	.id_count = sizeof(rtl8139_nics)/sizeof(rtl8139_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/segoff.h grub-0.97/netboot/segoff.h
+--- grub-0.97.orig/netboot/segoff.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/segoff.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,43 @@
++/*
++ * Segment:offset types and macros
++ *
++ * Initially written by Michael Brown (mcb30).
++ */
++
++#ifndef SEGOFF_H
++#define SEGOFF_H
++
++#include <stdint.h>
++#include <io.h>
++
++/* Segment:offset structure.  Note that the order within the structure
++ * is offset:segment.
++ */
++typedef struct {
++	uint16_t offset;
++	uint16_t segment;
++} segoff_t;
++
++/* For PXE stuff */
++typedef segoff_t SEGOFF16_t;
++
++/* Macros for converting from virtual to segment:offset addresses,
++ * when we don't actually care which of the many isomorphic results we
++ * get.
++ */
++#ifdef DEBUG_SEGMENT
++uint16_t SEGMENT ( const void * const ptr ) {
++	uint32_t phys = virt_to_phys ( ptr );
++	if ( phys > 0xfffff ) {
++		printf ( "FATAL ERROR: segment address out of range\n" );
++	}
++	return phys >> 4;
++}
++#else
++#define SEGMENT(x) ( virt_to_phys ( x ) >> 4 )
++#endif
++#define OFFSET(x) ( virt_to_phys ( x ) & 0xf )
++#define SEGOFF(x) { OFFSET(x), SEGMENT(x) }
++#define VIRTUAL(x,y) ( phys_to_virt ( ( ( x ) << 4 ) + ( y ) ) )
++
++#endif /* SEGOFF_H */
+diff -Naur grub-0.97.orig/netboot/sis900.c grub-0.97/netboot/sis900.c
+--- grub-0.97.orig/netboot/sis900.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/sis900.c	2005-08-31 20:02:38.000000000 +0000
+@@ -27,6 +27,11 @@
+ /* Revision History */
+ 
+ /*
++  07 Dec 2003  timlegge - Enabled Multicast Support
++  06 Dec 2003  timlegge - Fixed relocation issue in 5.2
++  04 Jan 2002  Chien-Yu Chen, Doug Ambrisko, Marty Connor  Patch to Etherboot 5.0.5
++     Added support for the SiS 630ET plus various bug fixes from linux kernel
++     source 2.4.17.
+   01 March 2001  mdc     1.0
+      Initial Release.  Tested with PCI based sis900 card and ThinkNIC
+      computer.
+@@ -35,13 +40,12 @@
+      Testet with SIS730S chipset + ICS1893
+ */
+ 
+-
+ /* Includes */
+ 
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
++#include "timer.h"
+ 
+ #include "sis900.h"
+ 
+@@ -51,6 +55,7 @@
+ 
+ static unsigned short vendor, dev_id;
+ static unsigned long ioaddr;
++static u8 pci_revision;
+ 
+ static unsigned int cur_phy;
+ 
+@@ -58,15 +63,10 @@
+ 
+ static BufferDesc txd;
+ static BufferDesc rxd[NUM_RX_DESC];
+-
+-#ifdef USE_LOWMEM_BUFFER
+-#define txb ((char *)0x10000 - TX_BUF_SIZE)
+-#define rxb ((char *)0x10000 - NUM_RX_DESC*RX_BUF_SIZE - TX_BUF_SIZE)
+-#else
+ static unsigned char txb[TX_BUF_SIZE];
+ static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE];
+-#endif
+ 
++#if 0
+ static struct mac_chip_info {
+     const char *name;
+     u16 vendor_id, device_id, flags;
+@@ -78,11 +78,13 @@
+       PCI_COMMAND_IO|PCI_COMMAND_MASTER, SIS900_TOTAL_SIZE},
+     {0,0,0,0,0} /* 0 terminated list. */
+ };
++#endif
+ 
+ static void sis900_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
+ static void amd79c901_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
+ static void ics1893_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
+ static void rtl8201_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
++static void vt6103_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
+ 
+ static struct mii_chip_info {
+     const char * name;
+@@ -96,6 +98,7 @@
+     {"AMD 79C901 HomePNA PHY",   0x0000, 0x35c8, amd79c901_read_mode},
+     {"ICS 1893 Integrated PHYceiver"   , 0x0015, 0xf441,ics1893_read_mode},
+     {"RTL 8201 10/100Mbps Phyceiver"   , 0x0000, 0x8201,rtl8201_read_mode},
++    {"VIA 6103 10/100Mbps Phyceiver", 0x0101, 0x8f20,vt6103_read_mode},
+     {0,0,0,0}
+ };
+ 
+@@ -106,24 +109,32 @@
+     u16 status;
+ } mii;
+ 
+-
+ // PCI to ISA bridge for SIS640E access
+-static struct pci_device   pci_isa_bridge_list[] = {
++static struct pci_id   pci_isa_bridge_list[] = {
+ 	{ 0x1039, 0x0008,
+-		"SIS 85C503/5513 PCI to ISA bridge", 0, 0, 0, 0},
+-	{0, 0, NULL, 0, 0, 0, 0}
++		"SIS 85C503/5513 PCI to ISA bridge"},
++};
++
++struct pci_driver sis_bridge_driver = {
++	.type     = BRIDGE_DRIVER,
++	.name     = "",
++	.probe    = 0,
++	.ids      = pci_isa_bridge_list,
++	.id_count = sizeof(pci_isa_bridge_list)/sizeof(pci_isa_bridge_list[0]),
++	.class    = 0,
+ };
+ 
+ /* Function Prototypes */
+ 
+-struct nic *sis900_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci);
++static int sis900_probe(struct dev *dev, struct pci_device *pci);
+ 
+ static u16  sis900_read_eeprom(int location);
+ static void sis900_mdio_reset(long mdio_addr);
+ static void sis900_mdio_idle(long mdio_addr);
+ static u16  sis900_mdio_read(int phy_id, int location);
++#if 0
+ static void sis900_mdio_write(int phy_id, int location, int val);
+-
++#endif
+ static void sis900_init(struct nic *nic);
+ 
+ static void sis900_reset(struct nic *nic);
+@@ -136,9 +147,11 @@
+ 
+ static void sis900_transmit(struct nic *nic, const char *d, 
+                             unsigned int t, unsigned int s, const char *p);
+-static int  sis900_poll(struct nic *nic);
++static int  sis900_poll(struct nic *nic, int retrieve);
++
++static void sis900_disable(struct dev *dev);
+ 
+-static void sis900_disable(struct nic *nic);
++static void sis900_irq(struct nic *nic, irq_action_t action);
+ 
+ /**
+  *	sis900_get_mac_addr: - Get MAC address for stand alone SiS900 model
+@@ -149,7 +162,7 @@
+  *	MAC address is read from read_eeprom() into @net_dev->dev_addr.
+  */
+ 
+-static int sis900_get_mac_addr(struct pci_device * pci_dev , struct nic *nic)
++static int sis900_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
+ {
+ 	u16 signature;
+ 	int i;
+@@ -168,6 +181,50 @@
+ }
+ 
+ /**
++ *	sis96x_get_mac_addr: - Get MAC address for SiS962 or SiS963 model
++ *	@pci_dev: the sis900 pci device
++ *	@net_dev: the net device to get address for 
++ *
++ *	SiS962 or SiS963 model, use EEPROM to store MAC address. And EEPROM 
++ *	is shared by
++ *	LAN and 1394. When access EEPROM, send EEREQ signal to hardware first 
++ *	and wait for EEGNT. If EEGNT is ON, EEPROM is permitted to be access 
++ *	by LAN, otherwise is not. After MAC address is read from EEPROM, send
++ *	EEDONE signal to refuse EEPROM access by LAN. 
++ *	The EEPROM map of SiS962 or SiS963 is different to SiS900. 
++ *	The signature field in SiS962 or SiS963 spec is meaningless. 
++ *	MAC address is read into @net_dev->dev_addr.
++ */
++
++static int sis96x_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
++{
++/* 	long ioaddr = net_dev->base_addr; */
++	long ee_addr = ioaddr + mear;
++	u32 waittime = 0;
++	int i;
++	
++	printf("Alternate function\n");
++
++	outl(EEREQ, ee_addr);
++	while(waittime < 2000) {
++		if(inl(ee_addr) & EEGNT) {
++
++			/* get MAC address from EEPROM */
++			for (i = 0; i < 3; i++)
++			        ((u16 *)(nic->node_addr))[i] = sis900_read_eeprom(i+EEPROMMACAddr);
++
++			outl(EEDONE, ee_addr);
++			return 1;
++		} else {
++			udelay(1);	
++			waittime ++;
++		}
++	}
++	outl(EEDONE, ee_addr);
++	return 0;
++}
++
++/**
+  *	sis630e_get_mac_addr: - Get MAC address for SiS630E model
+  *	@pci_dev: the sis900 pci device
+  *	@net_dev: the net device to get address for
+@@ -177,17 +234,21 @@
+  *	MAC address is read into @net_dev->dev_addr.
+  */
+ 
+-static int sis630e_get_mac_addr(struct pci_device * pci_dev, struct nic *nic)
++static int sis630e_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
+ {
+ 	u8 reg;
+ 	int i;
+-	struct pci_device	*p;
+-
+-	// find PCI to ISA bridge
+-	eth_pci_init(pci_isa_bridge_list);
++	struct pci_device	p[1];
+ 
+-    /* the firts entry in this list should contain bus/devfn */
+-    p = pci_isa_bridge_list;
++	/* find PCI to ISA bridge */
++	memset(p, 0, sizeof(p));
++	do {
++		find_pci(BRIDGE_DRIVER, p);
++	} while(p->driver && p->driver != &sis_bridge_driver);
++
++	/* error on failure */
++	if (!p->driver)
++	    return 0;
+ 
+ 	pcibios_read_config_byte(p->bus,p->devfn, 0x48, &reg);
+ 	pcibios_write_config_byte(p->bus,p->devfn, 0x48, reg | 0x40);
+@@ -201,7 +262,43 @@
+ 
+ 	return 1;
+ }
+-
++
++/**
++ *      sis630e_get_mac_addr: - Get MAC address for SiS630E model
++ *      @pci_dev: the sis900 pci device
++ *      @net_dev: the net device to get address for
++ *
++ *      SiS630E model, use APC CMOS RAM to store MAC address.
++ *      APC CMOS RAM is accessed through ISA bridge.
++ *      MAC address is read into @net_dev->dev_addr.
++ */
++
++static int sis635_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
++{
++        u32 rfcrSave;
++        u32 i;
++	
++	
++        rfcrSave = inl(rfcr + ioaddr);
++
++        outl(rfcrSave | RELOAD, ioaddr + cr);
++        outl(0, ioaddr + cr);
++
++        /* disable packet filtering before setting filter */
++        outl(rfcrSave & ~RFEN, rfcr + ioaddr);
++
++        /* load MAC addr to filter data register */
++        for (i = 0 ; i < 3 ; i++) {
++                outl((i << RFADDR_shift), ioaddr + rfcr);
++                *( ((u16 *)nic->node_addr) + i) = inw(ioaddr + rfdr);
++        }
++
++        /* enable packet filitering */
++        outl(rfcrSave | RFEN, rfcr + ioaddr);
++
++        return 1;
++}
++
+ /* 
+  * Function: sis900_probe
+  *
+@@ -216,19 +313,21 @@
+  * Returns:   struct nic *:          pointer to NIC data structure
+  */
+ 
+-struct nic *sis900_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
++static int sis900_probe(struct dev *dev, struct pci_device *pci)
+ {
++    struct nic *nic = (struct nic *)dev;
+     int i;
+     int found=0;
+     int phy_addr;
+-    u16 signature;
+     u8 revision;
+     int ret;
+ 
+-    if (io_addrs == 0 || *io_addrs == 0)
+-        return NULL;
++    if (pci->ioaddr == 0)
++        return 0;
+ 
+-    ioaddr  = *io_addrs & ~3;
++    nic->irqno  = 0;
++    nic->ioaddr = pci->ioaddr & ~3;
++    ioaddr  = pci->ioaddr & ~3;
+     vendor  = pci->vendor;
+     dev_id  = pci->dev_id;
+ 
+@@ -240,19 +339,29 @@
+     /* get MAC address */
+     ret = 0;
+     pcibios_read_config_byte(pci->bus,pci->devfn, PCI_REVISION, &revision);
+-    if (revision == SIS630E_900_REV || revision == SIS630EA1_900_REV)
+-       ret = sis630e_get_mac_addr(pci, nic);
+-    else if (revision == SIS630S_900_REV)
++    
++    /* save for use later in sis900_reset() */
++    pci_revision = revision; 
++
++    if (revision == SIS630E_900_REV)
+         ret = sis630e_get_mac_addr(pci, nic);
++    else if ((revision > 0x81) && (revision <= 0x90))
++        ret = sis635_get_mac_addr(pci, nic);
++    else if (revision == SIS96x_900_REV)
++	ret = sis96x_get_mac_addr(pci, nic);
+     else
+         ret = sis900_get_mac_addr(pci, nic);
+ 
+     if (ret == 0)
+     {
+         printf ("sis900_probe: Error MAC address not found\n");
+-        return NULL;
++        return 0;
+     }
+ 
++    /* 630ET : set the mii access mode as software-mode */
++    if (revision == SIS630ET_900_REV)
++	outl(ACCESSMODE | inl(ioaddr + cr), ioaddr + cr);
++
+     printf("\nsis900_probe: MAC addr %! at ioaddr %#hX\n",
+            nic->node_addr, ioaddr);
+     printf("sis900_probe: Vendor:%#hX Device:%#hX\n", vendor, dev_id);
+@@ -264,7 +373,7 @@
+     for (phy_addr = 0; phy_addr < 32; phy_addr++) {
+         u16 mii_status;
+         u16 phy_id0, phy_id1;
+-                
++
+         mii_status = sis900_mdio_read(phy_addr, MII_STATUS);
+         if (mii_status == 0xffff || mii_status == 0x0000)
+             /* the mii is not accessable, try next one */
+@@ -272,7 +381,7 @@
+                 
+         phy_id0 = sis900_mdio_read(phy_addr, MII_PHY_ID0);
+         phy_id1 = sis900_mdio_read(phy_addr, MII_PHY_ID1);
+-                
++
+         /* search our mii table for the current mii */ 
+         for (i = 0; mii_chip_table[i].phy_id1; i++) {
+ 
+@@ -294,7 +403,7 @@
+         
+     if (found == 0) {
+         printf("sis900_probe: No MII transceivers found!\n");
+-        return NULL;
++        return 0;
+     }
+ 
+     /* Arbitrarily select the last PHY found as current PHY */
+@@ -304,15 +413,14 @@
+     /* initialize device */
+     sis900_init(nic);
+ 
+-    nic->reset    = sis900_init;
++    dev->disable  = sis900_disable;
+     nic->poll     = sis900_poll;
+     nic->transmit = sis900_transmit;
+-    nic->disable  = sis900_disable;
++    nic->irq      = sis900_irq;
+ 
+-    return nic;
++    return 1;
+ }
+ 
+-
+ /* 
+  * EEPROM Routines:  These functions read and write to EEPROM for 
+  *    retrieving the MAC address and other configuration information about 
+@@ -322,7 +430,6 @@
+ /* Delay between EEPROM clock transitions. */
+ #define eeprom_delay()  inl(ee_addr)
+ 
+-
+ /* Function: sis900_read_eeprom
+  *
+  * Description: reads and returns a given location from EEPROM
+@@ -378,7 +485,6 @@
+ 
+ #define sis900_mdio_delay()    inl(mdio_addr)
+ 
+-
+ /* 
+    Read and write the MII management registers using software-generated
+    serial MDIO protocol. Note that the command bits and data bits are
+@@ -432,9 +538,11 @@
+         outl(MDC, mdio_addr);
+         sis900_mdio_delay();
+     }
++    outl(0x00, mdio_addr);
+     return retval;
+ }
+ 
++#if 0
+ static void sis900_mdio_write(int phy_id, int location, int value)
+ {
+     long mdio_addr = ioaddr + mear;
+@@ -471,10 +579,11 @@
+         outb(MDC, mdio_addr);
+         sis900_mdio_delay();
+     }
++    outl(0x00, mdio_addr);
+     return;
+ }
++#endif
+ 
+-
+ /* Function: sis900_init
+  *
+  * Description: resets the ethernet controller chip and various
+@@ -500,10 +609,9 @@
+ 
+     sis900_check_mode(nic);
+ 
+-    outl(RxENA, ioaddr + cr);
++    outl(RxENA| inl(ioaddr + cr), ioaddr + cr);
+ }
+ 
+-
+ /* 
+  * Function: sis900_reset
+  *
+@@ -515,7 +623,7 @@
+  */
+ 
+ static void 
+-sis900_reset(struct nic *nic)
++sis900_reset(struct nic *nic __unused)
+ {
+     int i = 0;
+     u32 status = TxRCMP | RxRCMP;
+@@ -524,16 +632,19 @@
+     outl(0, ioaddr + imr);
+     outl(0, ioaddr + rfcr);
+ 
+-    outl(RxRESET | TxRESET | RESET, ioaddr + cr);
+-        
++    outl(RxRESET | TxRESET | RESET | inl(ioaddr + cr), ioaddr + cr);
++
+     /* Check that the chip has finished the reset. */
+     while (status && (i++ < 1000)) {
+         status ^= (inl(isr + ioaddr) & status);
+     }
+-    outl(PESEL, ioaddr + cfg);
++
++    if( (pci_revision == SIS635A_900_REV) || (pci_revision == SIS900B_900_REV) )
++            outl(PESEL | RND_CNT, ioaddr + cfg);
++    else
++            outl(PESEL, ioaddr + cfg);
+ }
+ 
+-
+ /* Function: sis_init_rxfilter
+  *
+  * Description: sets receive filter address to our MAC address
+@@ -552,7 +663,7 @@
+     rfcrSave = inl(rfcr + ioaddr);
+ 
+     /* disable packet filtering before setting filter */
+-    outl(rfcrSave & ~RFEN, rfcr);
++    outl(rfcrSave & ~RFEN, rfcr + ioaddr);
+ 
+     /* load MAC addr to filter data register */
+     for (i = 0 ; i < 3 ; i++) {
+@@ -571,7 +682,6 @@
+     outl(rfcrSave | RFEN, rfcr + ioaddr);
+ }
+ 
+-
+ /* 
+  * Function: sis_init_txd
+  *
+@@ -583,20 +693,19 @@
+  */
+ 
+ static void
+-sis900_init_txd(struct nic *nic)
++sis900_init_txd(struct nic *nic __unused)
+ {
+     txd.link   = (u32) 0;
+     txd.cmdsts = (u32) 0;
+-    txd.bufptr = (u32) &txb[0];
++    txd.bufptr = virt_to_bus(&txb[0]);
+ 
+     /* load Transmit Descriptor Register */
+-    outl((u32) &txd, ioaddr + txdp); 
++    outl(virt_to_bus(&txd), ioaddr + txdp); 
+     if (sis900_debug > 0)
+         printf("sis900_init_txd: TX descriptor register loaded with: %X\n", 
+                inl(ioaddr + txdp));
+ }
+ 
+-
+ /* Function: sis_init_rxd
+  *
+  * Description: initializes the Rx descriptor ring
+@@ -607,7 +716,7 @@
+  */
+ 
+ static void 
+-sis900_init_rxd(struct nic *nic) 
++sis900_init_rxd(struct nic *nic __unused) 
+ { 
+     int i;
+ 
+@@ -615,16 +724,16 @@
+ 
+     /* init RX descriptor */
+     for (i = 0; i < NUM_RX_DESC; i++) {
+-        rxd[i].link   = (i+1 < NUM_RX_DESC) ? (u32) &rxd[i+1] : (u32) &rxd[0];
++        rxd[i].link   = virt_to_bus((i+1 < NUM_RX_DESC) ? &rxd[i+1] : &rxd[0]);
+         rxd[i].cmdsts = (u32) RX_BUF_SIZE;
+-        rxd[i].bufptr = (u32) &rxb[i*RX_BUF_SIZE];
++        rxd[i].bufptr = virt_to_bus(&rxb[i*RX_BUF_SIZE]);
+         if (sis900_debug > 0)
+             printf("sis900_init_rxd: rxd[%d]=%X link=%X cmdsts=%X bufptr=%X\n", 
+                    i, &rxd[i], rxd[i].link, rxd[i].cmdsts, rxd[i].bufptr);
+     }
+ 
+     /* load Receive Descriptor Register */
+-    outl((u32) &rxd[0], ioaddr + rxdp);
++    outl(virt_to_bus(&rxd[0]), ioaddr + rxdp);
+ 
+     if (sis900_debug > 0)
+         printf("sis900_init_rxd: RX descriptor register loaded with: %X\n", 
+@@ -632,7 +741,6 @@
+ 
+ }
+ 
+-
+ /* Function: sis_init_rxd
+  *
+  * Description: 
+@@ -644,25 +752,36 @@
+  * Returns:   void.
+  */
+ 
+-static void sis900_set_rx_mode(struct nic *nic)
++static void sis900_set_rx_mode(struct nic *nic __unused)
+ {
+-    int i;
++    int i, table_entries;
++    u32 rx_mode; 
++    u16 mc_filter[16] = {0};	/* 256/128 bits multicast hash table */
++    	
++    if((pci_revision == SIS635A_900_REV) || (pci_revision == SIS900B_900_REV))
++	table_entries = 16;
++    else
++	table_entries = 8;
+ 
+-    /* Configure Multicast Hash Table in Receive Filter 
+-       to reject all MCAST packets */
+-    for (i = 0; i < 8; i++) {
++    /* accept all multicast packet */
++    rx_mode = RFAAB | RFAAM;
++    for (i = 0; i < table_entries; i++)
++		mc_filter[i] = 0xffff;
++					
++    /* update Multicast Hash Table in Receive Filter */
++    for (i = 0; i < table_entries; i++) {
+         /* why plus 0x04? That makes the correct value for hash table. */
+         outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr);
+-        outl((u32)(0x0), ioaddr + rfdr);
++        outl(mc_filter[i], ioaddr + rfdr);
+     }
+-    /* Accept Broadcast packets, destination addresses that match 
++
++    /* Accept Broadcast and multicast packets, destination addresses that match 
+        our MAC address */
+-    outl(RFEN | RFAAB, ioaddr + rfcr);
++    outl(RFEN | rx_mode, ioaddr + rfcr);
+ 
+     return;
+ }
+ 
+-
+ /* Function: sis900_check_mode
+  *
+  * Description: checks the state of transmit and receive
+@@ -674,15 +793,21 @@
+  */
+ 
+ static void
+-sis900_check_mode (struct nic *nic)
++sis900_check_mode(struct nic *nic)
+ {
+     int speed, duplex;
+     u32 tx_flags = 0, rx_flags = 0;
+ 
+     mii.chip_info->read_mode(nic, cur_phy, &speed, &duplex);
+ 
+-    tx_flags = TxATP | (TX_DMA_BURST << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift);
+-    rx_flags = RX_DMA_BURST << RxMXDMA_shift;
++    if( inl(ioaddr + cfg) & EDB_MASTER_EN ) {
++        tx_flags = TxATP | (DMA_BURST_64 << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift);
++	rx_flags = DMA_BURST_64 << RxMXDMA_shift;
++    }
++    else {
++            tx_flags = TxATP | (DMA_BURST_512 << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift);
++            rx_flags = DMA_BURST_512 << RxMXDMA_shift;
++    }
+ 
+     if (speed == HW_SPEED_HOME || speed == HW_SPEED_10_MBPS) {
+         rx_flags |= (RxDRNT_10 << RxDRNT_shift);
+@@ -702,7 +827,6 @@
+     outl (rx_flags, ioaddr + rxcfg);
+ }
+ 
+-
+ /* Function: sis900_read_mode
+  *
+  * Description: retrieves and displays speed and duplex
+@@ -714,24 +838,33 @@
+  */
+ 
+ static void
+-sis900_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
++sis900_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
+ {
+     int i = 0;
+     u32 status;
++    u16 phy_id0, phy_id1;
+         
+     /* STSOUT register is Latched on Transition, read operation updates it */
+     while (i++ < 2)
+         status = sis900_mdio_read(phy_addr, MII_STSOUT);
+ 
+-    if (status & MII_STSOUT_SPD)
+-        *speed = HW_SPEED_100_MBPS;
+-    else
+-        *speed = HW_SPEED_10_MBPS;
+-
+-    if (status & MII_STSOUT_DPLX)
+-        *duplex = FDX_CAPABLE_FULL_SELECTED;
+-    else
+-        *duplex = FDX_CAPABLE_HALF_SELECTED;
++    *speed = HW_SPEED_10_MBPS;
++    *duplex = FDX_CAPABLE_HALF_SELECTED;
++    
++    if (status & (MII_NWAY_TX | MII_NWAY_TX_FDX))
++	*speed = HW_SPEED_100_MBPS;
++    if (status & ( MII_NWAY_TX_FDX | MII_NWAY_T_FDX))
++	*duplex = FDX_CAPABLE_FULL_SELECTED;
++	
++    /* Workaround for Realtek RTL8201 PHY issue */
++    phy_id0 = sis900_mdio_read(phy_addr, MII_PHY_ID0);
++    phy_id1 = sis900_mdio_read(phy_addr, MII_PHY_ID1);
++    if((phy_id0 == 0x0000) && ((phy_id1 & 0xFFF0) == 0x8200)){
++	if(sis900_mdio_read(phy_addr, MII_CONTROL) & MII_CNTL_FDX)
++	    *duplex = FDX_CAPABLE_FULL_SELECTED;
++	if(sis900_mdio_read(phy_addr, 0x0019) & 0x01)
++	    *speed = HW_SPEED_100_MBPS;
++    }
+ 
+     if (status & MII_STSOUT_LINK_FAIL)
+         printf("sis900_read_mode: Media Link Off\n");
+@@ -743,7 +876,6 @@
+                "full" : "half");
+ }
+ 
+-
+ /* Function: amd79c901_read_mode
+  *
+  * Description: retrieves and displays speed and duplex
+@@ -755,7 +887,7 @@
+  */
+ 
+ static void
+-amd79c901_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
++amd79c901_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
+ {
+     int i;
+     u16 status;
+@@ -796,7 +928,6 @@
+     }
+ }
+ 
+-
+ /**
+  *	ics1893_read_mode: - read media mode for ICS1893 PHY
+  *	@net_dev: the net device to read mode for
+@@ -808,7 +939,7 @@
+  *	to determine the speed and duplex mode for sis900
+  */
+ 
+-static void ics1893_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
++static void ics1893_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
+ {
+ 	int i = 0;
+ 	u32 status;
+@@ -848,7 +979,7 @@
+  *	to determine the speed and duplex mode for sis900
+  */
+ 
+-static void rtl8201_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
++static void rtl8201_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
+ {
+ 	u32 status;
+ 
+@@ -878,7 +1009,51 @@
+ 		       *duplex == FDX_CAPABLE_FULL_SELECTED ?
+ 		       "full" : "half");
+ 	else
+-		printf("rtl9201_read_config_mode: Media Link Off\n");
++		printf("rtl8201_read_config_mode: Media Link Off\n");
++}
++
++/**
++ *	vt6103_read_mode: - read media mode for vt6103 phy
++ *	@nic: the net device to read mode for
++ *	@phy_addr: mii phy address
++ *	@speed: the transmit speed to be determined
++ *	@duplex: the duplex mode to be determined
++ *
++ *	read MII_STATUS register from rtl8201 phy
++ *	to determine the speed and duplex mode for sis900
++ */
++
++static void vt6103_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
++{
++	u32 status;
++
++	status = sis900_mdio_read(phy_addr, MII_STATUS);
++
++	if (status & MII_STAT_CAN_TX_FDX) {
++		*speed = HW_SPEED_100_MBPS;
++		*duplex = FDX_CAPABLE_FULL_SELECTED;
++	}
++	else if (status & MII_STAT_CAN_TX) {
++		*speed = HW_SPEED_100_MBPS;
++		*duplex = FDX_CAPABLE_HALF_SELECTED;
++	}
++	else if (status & MII_STAT_CAN_T_FDX) {
++		*speed = HW_SPEED_10_MBPS;
++		*duplex = FDX_CAPABLE_FULL_SELECTED;
++	}
++	else if (status & MII_STAT_CAN_T) {
++		*speed = HW_SPEED_10_MBPS;
++		*duplex = FDX_CAPABLE_HALF_SELECTED;
++	}
++
++	if (status & MII_STAT_LINK)
++		printf("vt6103_read_mode: Media Link On %s %s-duplex \n",
++		       *speed == HW_SPEED_100_MBPS ?
++		       "100mbps" : "10mbps",
++		       *duplex == FDX_CAPABLE_FULL_SELECTED ?
++		       "full" : "half");
++	else
++		printf("vt6103_read_config_mode: Media Link Off\n");
+ }
+ 
+ /* Function: sis900_transmit
+@@ -900,14 +1075,14 @@
+                 unsigned int s,     /* size */
+                 const char  *p)     /* Packet */
+ {
+-    u32 status, to, nstype;
++    u32 to, nstype;
+     u32 tx_status;
+     
+     /* Stop the transmitter */
+-    outl(TxDIS, ioaddr + cr);
++    outl(TxDIS | inl(ioaddr + cr), ioaddr + cr);
+ 
+     /* load Transmit Descriptor Register */
+-    outl((u32) &txd, ioaddr + txdp); 
++    outl(virt_to_bus(&txd), ioaddr + txdp); 
+     if (sis900_debug > 1)
+         printf("sis900_transmit: TX descriptor register loaded with: %X\n", 
+                inl(ioaddr + txdp));
+@@ -929,18 +1104,18 @@
+         txb[s++] = '\0';
+ 
+     /* set the transmit buffer descriptor and enable Transmit State Machine */
+-    txd.bufptr = (u32) &txb[0];
++    txd.bufptr = virt_to_bus(&txb[0]);
+     txd.cmdsts = (u32) OWN | s;
+ 
+     /* restart the transmitter */
+-    outl(TxENA, ioaddr + cr);
++    outl(TxENA | inl(ioaddr + cr), ioaddr + cr);
+ 
+     if (sis900_debug > 1)
+         printf("sis900_transmit: Queued Tx packet size %d.\n", (int) s);
+ 
+     to = currticks() + TX_TIMEOUT;
+ 
+-    while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to))
++    while ((volatile u32) ( tx_status=txd.cmdsts & OWN) && (currticks() < to))
+         /* wait */ ;
+ 
+     if (currticks() >= to) {
+@@ -955,7 +1130,6 @@
+     outl(0, ioaddr + imr);
+ }
+ 
+-
+ /* Function: sis900_poll
+  *
+  * Description: checks for a received packet and returns it if found.
+@@ -971,7 +1145,7 @@
+  */
+ 
+ static int
+-sis900_poll(struct nic *nic)
++sis900_poll(struct nic *nic, int retrieve)
+ {
+     u32 rx_status = rxd[cur_rx].cmdsts;
+     int retstat = 0;
+@@ -986,6 +1160,8 @@
+         printf("sis900_poll: got a packet: cur_rx:%d, status:%X\n",
+                cur_rx, rx_status);
+ 
++    if ( ! retrieve ) return 1;
++    
+     nic->packetlen = (rx_status & DSIZE) - CRC_SIZE;
+ 
+     if (rx_status & (ABORT|OVERRUN|TOOLONG|RUNT|RXISERR|CRCERR|FAERR)) {
+@@ -1001,18 +1177,18 @@
+ 
+     /* return the descriptor and buffer to receive ring */
+     rxd[cur_rx].cmdsts = RX_BUF_SIZE;
+-    rxd[cur_rx].bufptr = (u32) &rxb[cur_rx*RX_BUF_SIZE];
++    rxd[cur_rx].bufptr = virt_to_bus(&rxb[cur_rx*RX_BUF_SIZE]);
+         
+     if (++cur_rx == NUM_RX_DESC)
+         cur_rx = 0;
+ 
+     /* re-enable the potentially idle receive state machine */
+-    outl(RxENA , ioaddr + cr);
++    outl(RxENA | inl(ioaddr + cr), ioaddr + cr);
+ 
+     return retstat;
++
+ }
+ 
+-
+ /* Function: sis900_disable
+  *
+  * Description: Turns off interrupts and stops Tx and Rx engines
+@@ -1023,12 +1199,53 @@
+  */
+ 
+ static void
+-sis900_disable(struct nic *nic)
++sis900_disable(struct dev *dev)
+ {
++    struct nic *nic = (struct nic *)dev;
++    /* merge reset and disable */
++    sis900_init(nic);
++
+     /* Disable interrupts by clearing the interrupt mask. */
+     outl(0, ioaddr + imr);
+     outl(0, ioaddr + ier);
+     
+     /* Stop the chip's Tx and Rx Status Machine */
+-    outl(RxDIS | TxDIS, ioaddr + cr);
++    outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr);
++}
++
++/* Function: sis900_irq
++ *
++ * Description: Enable, Disable, or Force, interrupts
++ *    
++ * Arguments: struct nic *nic:          NIC data structure
++ *            irq_action_t action:      Requested action       
++ *
++ * Returns:   void.
++ */
++
++static void
++sis900_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
+ }
++
++static struct pci_id sis900_nics[] = {
++PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900"),
++PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
++};
++
++struct pci_driver sis900_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "SIS900",
++	.probe    = sis900_probe,
++	.ids      = sis900_nics,
++	.id_count = sizeof(sis900_nics)/sizeof(sis900_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/sis900.h grub-0.97/netboot/sis900.h
+--- grub-0.97.orig/netboot/sis900.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/sis900.h	2005-08-31 19:03:35.000000000 +0000
+@@ -39,14 +39,16 @@
+ 
+ /* Symbolic names for bits in various registers */
+ enum sis900_command_register_bits {
+-    RESET   = 0x00000100, 
+-    SWI     = 0x00000080, 
+-    RxRESET = 0x00000020,
+-    TxRESET = 0x00000010, 
+-    RxDIS   = 0x00000008, 
+-    RxENA   = 0x00000004,
+-    TxDIS   = 0x00000002, 
+-    TxENA   = 0x00000001
++    RELOAD     = 0x00000400,
++    ACCESSMODE = 0x00000200,
++    RESET      = 0x00000100, 
++    SWI        = 0x00000080, 
++    RxRESET    = 0x00000020,
++    TxRESET    = 0x00000010, 
++    RxDIS      = 0x00000008, 
++    RxENA      = 0x00000004,
++    TxDIS      = 0x00000002, 
++    TxENA      = 0x00000001
+ };
+ 
+ enum sis900_configuration_register_bits {
+@@ -57,7 +59,10 @@
+     EXD      = 0x00000010, 
+     PESEL    = 0x00000008, 
+     LPM      = 0x00000004, 
+-    BEM      = 0x00000001
++    BEM      = 0x00000001,
++    RND_CNT  = 0x00000400,
++    FAIR_BACKOFF = 0x00000200,
++    EDB_MASTER_EN = 0x00002000
+ };
+ 
+ enum sis900_eeprom_access_reigster_bits {
+@@ -108,6 +113,10 @@
+ #define TX_DMA_BURST    0
+ #define RX_DMA_BURST    0
+ 
++enum sis900_tx_rx_dma{
++	        DMA_BURST_512 = 0,      DMA_BURST_64 = 5
++};
++
+ /* transmit FIFO threshholds */
+ #define TX_FILL_THRESH  16      /* 1/4 FIFO size */
+ #define TxFILLT_shift   8
+@@ -172,6 +181,11 @@
+     EEeraseAll      = 0x0120,
+     EEwriteAll      = 0x0110, 
+     EEaddrMask      = 0x013F, 
++    EEcmdShift 	    = 16
++};
++/* For SiS962 or SiS963, request the eeprom software access */
++enum sis96x_eeprom_command {
++	EEREQ = 0x00000400, EEDONE = 0x00000200, EEGNT = 0x00000100
+ };
+ 
+ /* Manamgement Data I/O (mdio) frame */
+@@ -236,7 +250,8 @@
+     MII_CONFIG1 = 0x0010,
+     MII_CONFIG2 = 0x0011,
+     MII_STSOUT  = 0x0012,
+-    MII_MASK    = 0x0013
++    MII_MASK    = 0x0013,
++    MII_RESV    = 0x0014
+ };
+ 
+ /* mii registers specific to AMD 79C901 */
+@@ -320,7 +335,9 @@
+ 
+ enum sis900_revision_id {
+ 	SIS630A_900_REV = 0x80,		SIS630E_900_REV = 0x81,
+-	SIS630S_900_REV = 0x82,		SIS630EA1_900_REV = 0x83
++	SIS630S_900_REV = 0x82,		SIS630EA1_900_REV = 0x83,
++	SIS630ET_900_REV = 0x84,        SIS635A_900_REV = 0x90,
++	SIS96x_900_REV = 0X91,		SIS900B_900_REV = 0x03
+ };
+ 
+ enum sis630_revision_id {
+diff -Naur grub-0.97.orig/netboot/sis900.txt grub-0.97/netboot/sis900.txt
+--- grub-0.97.orig/netboot/sis900.txt	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/sis900.txt	1970-01-01 00:00:00.000000000 +0000
+@@ -1,91 +0,0 @@
+-How I added the SIS900 card to Etherboot
+-
+-Author: Marty Connor (mdc@thinguin.org)
+-
+-Date:   25 Febrary 2001
+-
+-Description:
+-
+-This file is intended to help people who want to write an Etherboot
+-driver or port another driver to Etherboot.  It is a starting point.
+-Perhaps someday I may write a more detailed description of writing an
+-Etherboot driver. This text should help get people started, and
+-studying sis900.[ch] should help show the basic structure and
+-techniques involved in writing and Etherboot driver.
+-
+-***********************************************************************
+-
+-0. Back up all the files I need to modify:
+-
+-cd etherboot-4.7.20/src
+-cp Makefile Makefile.orig
+-cp config.c config.c.orig
+-cp pci.h pci.h.orig
+-cp NIC NIC.orig
+-cp cards.h cards.h.orig
+-
+-1. Edit src/Makefile to add SIS900FLAGS to defines
+-
+-SIS900FLAGS=	       	-DINCLUDE_SIS900
+-
+-2. edit src/pci.h to add PCI signatures for card
+-
+-#define PCI_VENDOR_ID_SIS         	0x1039
+-#define PCI_DEVICE_ID_SIS900     	0x0900   
+-#define PCI_DEVICE_ID_SIS7016    	0x7016  
+-
+-3. Edit src/config.c to add the card to the card probe list
+-
+-#if defined(INCLUDE_NS8390)  || defined(INCLUDE_EEPRO100)  || 
+-    defined(INCLUDE_LANCE)   || defined(INCLUDE_EPIC100)   || 
+-    defined(INCLUDE_TULIP)   || defined(INCLUDE_OTULIP)    ||
+-    defined(INCLUDE_3C90X)   || defined(INCLUDE_3C595)     ||
+-    defined(INCLUDE_RTL8139) || defined(INCLUDE_VIA_RHINE) || 
+-    defined(INCLUDE_SIS900)  || defined(INCLUDE_W89C840)
+-
+-... and ...
+-
+-#ifdef INCLUDE_SIS900
+-       { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS900,
+-         "SIS900", 0, 0, 0, 0},
+-       { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS7016,
+-	 "SIS7016", 0, 0, 0, 0},
+-#endif
+-
+-... and ...
+-
+-#ifdef INCLUDE_SIS900
+-	{ "SIS900", sis900_probe, pci_ioaddrs },	
+-#endif
+-
+-4. Edit NIC to add sis900 and sis7016 to NIC list
+-
+-# SIS 900 and SIS 7016
+-sis900		sis900		0x1039,0x0900
+-sis7016		sis900		0x1039,0x7016
+-
+-5. Edit cards.h to add sis900 probe routine declaration
+-
+-#ifdef	INCLUDE_SIS900
+-extern struct nic	*sis900_probe(struct nic *, unsigned short *
+-                        PCI_ARG(struct pci_device *));
+-#endif
+-
+-***********************************************************************
+-
+-At this point, you can begin creating your driver source file.  See
+-the "Writing and Etherboot Driver" section of the Etherboot
+-documentation for some hints.  See the skel.c file for a starting
+-point.  If there is a Linux driver for the card, you may be able to
+-use that.  Copy and learn from existing Etherboot drivers (this is GPL
+-/ Open Source software!).
+-
+-Join the etherboot-developers and etherboot-users mailing lists
+-(information is on etherboot.sourceforge.net) for information and
+-assistance. We invite more developers to help improve Etherboot.
+-
+-Visit the http://etherboot.sourceforge.net, http://thinguin.org, 
+-http://rom-o-matic.net, and http://ltsp.org sites for information and
+-assistance.
+-
+-Enjoy.
+diff -Naur grub-0.97.orig/netboot/sk_g16.c grub-0.97/netboot/sk_g16.c
+--- grub-0.97.orig/netboot/sk_g16.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/sk_g16.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,1160 +0,0 @@
+-/**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-Schneider & Koch G16 NIC driver for Etherboot
+-heavily based on SK G16 driver from Linux 2.0.36
+-Changes to make it work with Etherboot by Georg Baum <Georg.Baum@gmx.de>
+-***************************************************************************/
+-
+-/*-
+- * Copyright (C) 1994 by PJD Weichmann & SWS Bern, Switzerland
+- *
+- * This software may be used and distributed according to the terms
+- * of the GNU Public License, incorporated herein by reference.
+- *
+- * Module         : sk_g16.c
+- *
+- * Version        : $Revision: 1.4 $
+- *
+- * Author         : Patrick J.D. Weichmann
+- *
+- * Date Created   : 94/05/26
+- * Last Updated   : $Date: 2002/01/02 21:56:40 $
+- *
+- * Description    : Schneider & Koch G16 Ethernet Device Driver for
+- *                  Linux Kernel >= 1.1.22
+- * Update History :
+- *
+--*/
+-
+-/*
+- * The Schneider & Koch (SK) G16 Network device driver is based
+- * on the 'ni6510' driver from Michael Hipp which can be found at
+- * ftp://sunsite.unc.edu/pub/Linux/system/Network/drivers/nidrivers.tar.gz
+- *
+- * Sources: 1) ni6510.c by M. Hipp
+- *          2) depca.c  by D.C. Davies
+- *          3) skeleton.c by D. Becker
+- *          4) Am7990 Local Area Network Controller for Ethernet (LANCE),
+- *             AMD, Pub. #05698, June 1989
+- *
+- * Many Thanks for helping me to get things working to:
+- *
+- *                 A. Cox (A.Cox@swansea.ac.uk)
+- *                 M. Hipp (mhipp@student.uni-tuebingen.de)
+- *                 R. Bolz (Schneider & Koch, Germany)
+- *
+- * See README.sk_g16 for details about limitations and bugs for the
+- * current version.
+- *
+- * To Do:
+- *        - Support of SK_G8 and other SK Network Cards.
+- *        - Autoset memory mapped RAM. Check for free memory and then
+- *          configure RAM correctly.
+- *        - SK_close should really set card in to initial state.
+- *        - Test if IRQ 3 is not switched off. Use autoirq() functionality.
+- *          (as in /drivers/net/skeleton.c)
+- *        - Implement Multicast addressing. At minimum something like
+- *          in depca.c.
+- *        - Redo the statistics part.
+- *        - Try to find out if the board is in 8 Bit or 16 Bit slot.
+- *          If in 8 Bit mode don't use IRQ 11.
+- *        - (Try to make it slightly faster.)
+- */
+-
+-/* to get some global routines like printf */
+-#include "etherboot.h"
+-/* to get the interface to the body of the program */
+-#include "nic.h"
+-
+-/* From linux/if_ether.h: */
+-#define ETH_ZLEN	60		/* Min. octets in frame sans FCS */
+-
+-#include "sk_g16.h"
+-
+-/*
+- * Schneider & Koch Card Definitions
+- * =================================
+- */
+-
+-#define SK_NAME   "SK_G16"
+-
+-/*
+- * SK_G16 Configuration
+- * --------------------
+- */
+-
+-/*
+- * Abbreviations
+- * -------------
+- *
+- * RAM - used for the 16KB shared memory
+- * Boot_ROM, ROM - are used for referencing the BootEPROM
+- *
+- * SK_ADDR is a symbolic constant used to configure
+- * the behaviour of the driver and the SK_G16.
+- *
+- * SK_ADDR defines the address where the RAM will be mapped into the real
+- *         host memory.
+- *         valid addresses are from 0xa0000 to 0xfc000 in 16Kbyte steps.
+- */
+-
+-#define SK_ADDR         0xcc000
+-
+-/*
+- * In POS3 are bits A14-A19 of the address bus. These bits can be set
+- * to choose the RAM address. That's why we only can choose the RAM address
+- * in 16KB steps.
+- */
+-
+-#define POS_ADDR       (rom_addr>>14)  /* Do not change this line */
+-
+-/*
+- * SK_G16 I/O PORT's + IRQ's + Boot_ROM locations
+- * ----------------------------------------------
+- */
+-
+-/*
+- * As nearly every card has also SK_G16 a specified I/O Port region and
+- * only a few possible IRQ's.
+- * In the Installation Guide from Schneider & Koch is listed a possible
+- * Interrupt IRQ2. IRQ2 is always IRQ9 in boards with two cascaded interrupt
+- * controllers. So we use in SK_IRQS IRQ9.
+- */
+-
+-/* Don't touch any of the following #defines. */
+-
+-#define SK_IO_PORTS     { 0x100, 0x180, 0x208, 0x220, 0x288, 0x320, 0x328, 0x390, 0 }
+-
+-/*
+- * SK_G16 POS REGISTERS
+- * --------------------
+- */
+-
+-/*
+- * SK_G16 has a Programmable Option Select (POS) Register.
+- * The POS is composed of 8 separate registers (POS0-7) which
+- * are I/O mapped on an address set by the W1 switch.
+- *
+- */
+-
+-#define SK_POS_SIZE 8           /* 8 I/O Ports are used by SK_G16 */
+-
+-#define SK_POS0     ioaddr      /* Card-ID Low (R) */
+-#define SK_POS1     ioaddr+1    /* Card-ID High (R) */
+-#define SK_POS2     ioaddr+2    /* Card-Enable, Boot-ROM Disable (RW) */
+-#define SK_POS3     ioaddr+3    /* Base address of RAM */
+-#define SK_POS4     ioaddr+4    /* IRQ */
+-
+-/* POS5 - POS7 are unused */
+-
+-/*
+- * SK_G16 MAC PREFIX
+- * -----------------
+- */
+-
+-/*
+- * Scheider & Koch manufacturer code (00:00:a5).
+- * This must be checked, that we are sure it is a SK card.
+- */
+-
+-#define SK_MAC0         0x00
+-#define SK_MAC1         0x00
+-#define SK_MAC2         0x5a
+-
+-/*
+- * SK_G16 ID
+- * ---------
+- */
+-
+-/*
+- * If POS0,POS1 contain the following ID, then we know
+- * at which I/O Port Address we are.
+- */
+-
+-#define SK_IDLOW  0xfd
+-#define SK_IDHIGH 0x6a
+-
+-
+-/*
+- * LANCE POS Bit definitions
+- * -------------------------
+- */
+-
+-#define SK_ROM_RAM_ON  (POS2_CARD)
+-#define SK_ROM_RAM_OFF (POS2_EPROM)
+-#define SK_ROM_ON      (inb(SK_POS2) & POS2_CARD)
+-#define SK_ROM_OFF     (inb(SK_POS2) | POS2_EPROM)
+-#define SK_RAM_ON      (inb(SK_POS2) | POS2_CARD)
+-#define SK_RAM_OFF     (inb(SK_POS2) & POS2_EPROM)
+-
+-#define POS2_CARD  0x0001              /* 1 = SK_G16 on      0 = off */
+-#define POS2_EPROM 0x0002              /* 1 = Boot EPROM off 0 = on */
+-
+-/*
+- * SK_G16 Memory mapped Registers
+- * ------------------------------
+- *
+- */
+-
+-#define SK_IOREG        (board->ioreg) /* LANCE data registers.     */
+-#define SK_PORT         (board->port)  /* Control, Status register  */
+-#define SK_IOCOM        (board->iocom) /* I/O Command               */
+-
+-/*
+- * SK_G16 Status/Control Register bits
+- * -----------------------------------
+- *
+- * (C) Controlreg (S) Statusreg
+- */
+-
+-/*
+- * Register transfer: 0 = no transfer
+- *                    1 = transferring data between LANCE and I/O reg
+- */
+-#define SK_IORUN        0x20
+-
+-/*
+- * LANCE interrupt: 0 = LANCE interrupt occurred
+- *                  1 = no LANCE interrupt occurred
+- */
+-#define SK_IRQ          0x10
+-
+-#define SK_RESET        0x08   /* Reset SK_CARD: 0 = RESET 1 = normal */
+-#define SK_RW           0x02   /* 0 = write to 1 = read from */
+-#define SK_ADR          0x01   /* 0 = REG DataPort 1 = RAP Reg addr port */
+-
+-
+-#define SK_RREG         SK_RW  /* Transferdirection to read from lance */
+-#define SK_WREG         0      /* Transferdirection to write to lance */
+-#define SK_RAP          SK_ADR /* Destination Register RAP */
+-#define SK_RDATA        0      /* Destination Register REG DataPort */
+-
+-/*
+- * SK_G16 I/O Command
+- * ------------------
+- */
+-
+-/*
+- * Any bitcombination sets the internal I/O bit (transfer will start)
+- * when written to I/O Command
+- */
+-
+-#define SK_DOIO         0x80   /* Do Transfer */
+-
+-/*
+- * LANCE RAP (Register Address Port).
+- * ---------------------------------
+- */
+-
+-/*
+- * The LANCE internal registers are selected through the RAP.
+- * The Registers are:
+- *
+- * CSR0 - Status and Control flags
+- * CSR1 - Low order bits of initialize block (bits 15:00)
+- * CSR2 - High order bits of initialize block (bits 07:00, 15:08 are reserved)
+- * CSR3 - Allows redefinition of the Bus Master Interface.
+- *        This register must be set to 0x0002, which means BSWAP = 0,
+- *        ACON = 1, BCON = 0;
+- *
+- */
+-
+-#define CSR0            0x00
+-#define CSR1            0x01
+-#define CSR2            0x02
+-#define CSR3            0x03
+-
+-/*
+- * General Definitions
+- * ===================
+- */
+-
+-/*
+- * Set the number of Tx and Rx buffers, using Log_2(# buffers).
+- * We have 16KB RAM which can be accessed by the LANCE. In the
+- * memory are not only the buffers but also the ring descriptors and
+- * the initialize block.
+- * Don't change anything unless you really know what you do.
+- */
+-
+-#define LC_LOG_TX_BUFFERS 1               /* (2 == 2^^1) 2 Transmit buffers */
+-#define LC_LOG_RX_BUFFERS 2               /* (8 == 2^^3) 8 Receive buffers */
+-
+-/* Descriptor ring sizes */
+-
+-#define TMDNUM (1 << (LC_LOG_TX_BUFFERS)) /* 2 Transmit descriptor rings */
+-#define RMDNUM (1 << (LC_LOG_RX_BUFFERS)) /* 8 Receive Buffers */
+-
+-/* Define Mask for setting RMD, TMD length in the LANCE init_block */
+-
+-#define TMDNUMMASK (LC_LOG_TX_BUFFERS << 29)
+-#define RMDNUMMASK (LC_LOG_RX_BUFFERS << 29)
+-
+-/*
+- * Data Buffer size is set to maximum packet length.
+- */
+-
+-#define PKT_BUF_SZ              1518
+-
+-/*
+- * The number of low I/O ports used by the ethercard.
+- */
+-
+-#define ETHERCARD_TOTAL_SIZE    SK_POS_SIZE
+-
+-/*
+- * Portreserve is there to mark the Card I/O Port region as used.
+- * Check_region is to check if the region at ioaddr with the size "size"
+- * is free or not.
+- * Snarf_region allocates the I/O Port region.
+- */
+-
+-#ifndef	HAVE_PORTRESERVE
+-
+-#define check_region(ioaddr1, size)              0
+-#define request_region(ioaddr1, size,name)       do ; while (0)
+-
+-#endif
+-
+-/*
+- * SK_DEBUG
+- *
+- * Here you can choose what level of debugging wanted.
+- *
+- * If SK_DEBUG and SK_DEBUG2 are undefined, then only the
+- *  necessary messages will be printed.
+- *
+- * If SK_DEBUG is defined, there will be many debugging prints
+- *  which can help to find some mistakes in configuration or even
+- *  in the driver code.
+- *
+- * If SK_DEBUG2 is defined, many many messages will be printed
+- *  which normally you don't need. I used this to check the interrupt
+- *  routine.
+- *
+- * (If you define only SK_DEBUG2 then only the messages for
+- *  checking interrupts will be printed!)
+- *
+- * Normal way of live is:
+- *
+- * For the whole thing get going let both symbolic constants
+- * undefined. If you face any problems and you know what's going
+- * on (you know something about the card and you can interpret some
+- * hex LANCE register output) then define SK_DEBUG
+- *
+- */
+-
+-#undef  SK_DEBUG	/* debugging */
+-#undef  SK_DEBUG2	/* debugging with more verbose report */
+-
+-#ifdef	SK_DEBUG
+-#define PRINTF(x) printf x
+-#else
+-#define PRINTF(x) /**/
+-#endif
+-
+-#ifdef	SK_DEBUG2
+-#define PRINTF2(x) printf x
+-#else
+-#define PRINTF2(x) /**/
+-#endif
+-
+-/*
+- * SK_G16 RAM
+- *
+- * The components are memory mapped and can be set in a region from
+- * 0x00000 through 0xfc000 in 16KB steps.
+- *
+- * The Network components are: dual ported RAM, Prom, I/O Reg, Status-,
+- * Controlregister and I/O Command.
+- *
+- * dual ported RAM: This is the only memory region which the LANCE chip
+- *      has access to. From the Lance it is addressed from 0x0000 to
+- *      0x3fbf. The host accesses it normally.
+- *
+- * PROM: The PROM obtains the ETHERNET-MAC-Address. It is realised as a
+- *       8-Bit PROM, this means only the 16 even addresses are used of the
+- *       32 Byte Address region. Access to a odd address results in invalid
+- *       data.
+- *
+- * LANCE I/O Reg: The I/O Reg is build of 4 single Registers, Low-Byte Write,
+- *       Hi-Byte Write, Low-Byte Read, Hi-Byte Read.
+- *       Transfer from or to the LANCE is always in 16Bit so Low and High
+- *       registers are always relevant.
+- *
+- *       The Data from the Readregister is not the data in the Writeregister!!
+- *
+- * Port: Status- and Controlregister.
+- *       Two different registers which share the same address, Status is
+- *       read-only, Control is write-only.
+- *
+- * I/O Command:
+- *       Any bitcombination written in here starts the transmission between
+- *       Host and LANCE.
+- */
+-
+-typedef struct
+-{
+-	unsigned char  ram[0x3fc0];   /* 16KB dual ported ram */
+-	unsigned char  rom[0x0020];   /* 32Byte PROM containing 6Byte MAC */
+-	unsigned char  res1[0x0010];  /* reserved */
+-	unsigned volatile short ioreg;/* LANCE I/O Register */
+-	unsigned volatile char  port; /* Statusregister and Controlregister */
+-	unsigned char  iocom;         /* I/O Command Register */
+-} SK_RAM;
+-
+-/* struct  */
+-
+-/*
+- * This is the structure for the dual ported ram. We
+- * have exactly 16 320 Bytes. In here there must be:
+- *
+- *     - Initialize Block   (starting at a word boundary)
+- *     - Receive and Transmit Descriptor Rings (quadword boundary)
+- *     - Data Buffers (arbitrary boundary)
+- *
+- * This is because LANCE has on SK_G16 only access to the dual ported
+- * RAM and nowhere else.
+- */
+-
+-struct SK_ram
+-{
+-    struct init_block ib;
+-    struct tmd tmde[TMDNUM];
+-    struct rmd rmde[RMDNUM];
+-    char tmdbuf[TMDNUM][PKT_BUF_SZ];
+-    char rmdbuf[RMDNUM][PKT_BUF_SZ];
+-};
+-
+-/*
+- * Structure where all necessary information is for ring buffer
+- * management and statistics.
+- */
+-
+-struct priv
+-{
+-    struct SK_ram *ram;  /* dual ported ram structure */
+-    struct rmd *rmdhead; /* start of receive ring descriptors */
+-    struct tmd *tmdhead; /* start of transmit ring descriptors */
+-    int        rmdnum;   /* actual used ring descriptor */
+-    int        tmdnum;   /* actual transmit descriptor for transmitting data */
+-    int        tmdlast;  /* last sent descriptor used for error handling, etc */
+-    void       *rmdbufs[RMDNUM]; /* pointer to the receive buffers */
+-    void       *tmdbufs[TMDNUM]; /* pointer to the transmit buffers */
+-};
+-
+-/* global variable declaration */
+-
+-/* static variables */
+-
+-static SK_RAM *board;  /* pointer to our memory mapped board components */
+-static unsigned short	ioaddr; /* base io address */
+-static struct priv	p_data;
+-
+-/* Macros */
+-
+-
+-/* Function Prototypes */
+-
+-/*
+- * Device Driver functions
+- * -----------------------
+- * See for short explanation of each function its definitions header.
+- */
+-
+-static int   SK_probe1(struct nic *nic, short ioaddr1);
+-
+-static void SK_reset(struct nic *nic);
+-static int SK_poll(struct nic *nic);
+-static void SK_transmit(
+-struct nic *nic,
+-const char *d,			/* Destination */
+-unsigned int t,			/* Type */
+-unsigned int s,			/* size */
+-const char *p);			/* Packet */
+-static void SK_disable(struct nic *nic);
+-struct nic *SK_probe(struct nic *nic, unsigned short *probe_addrs);
+-
+-/*
+- * LANCE Functions
+- * ---------------
+- */
+-
+-static int SK_lance_init(struct nic *nic, unsigned short mode);
+-static void SK_reset_board(void);
+-static void SK_set_RAP(int reg_number);
+-static int SK_read_reg(int reg_number);
+-static int SK_rread_reg(void);
+-static void SK_write_reg(int reg_number, int value);
+-
+-/*
+- * Debugging functions
+- * -------------------
+- */
+-
+-static void SK_print_pos(struct nic *nic, char *text);
+-static void SK_print_ram(struct nic *nic);
+-
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void SK_reset(struct nic *nic)
+-{
+-	/* put the card in its initial state */
+-	SK_lance_init(nic, MODE_NORMAL);
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int SK_poll(struct nic *nic)
+-{
+-	/* return true if there's an ethernet packet ready to read */
+-	struct priv *p;         /* SK_G16 private structure */
+-	struct rmd *rmdp;
+-	int csr0, rmdstat, packet_there;
+-    PRINTF2(("## %s: At beginning of SK_poll(). CSR0: %#hX\n",
+-           SK_NAME, SK_read_reg(CSR0)));
+-
+-	p = nic->priv_data;
+-    csr0 = SK_read_reg(CSR0);      /* store register for checking */
+-
+-    /*
+-     * Acknowledge all of the current interrupt sources, disable
+-     * Interrupts (INEA = 0)
+-     */
+-
+-    SK_write_reg(CSR0, csr0 & CSR0_CLRALL);
+-
+-    if (csr0 & CSR0_ERR) /* LANCE Error */
+-    {
+-	printf("%s: error: %#hX", SK_NAME, csr0);
+-
+-        if (csr0 & CSR0_MISS)      /* No place to store packet ? */
+-        {
+-		printf(", Packet dropped.");
+-        }
+-	putchar('\n');
+-    }
+-
+-    rmdp = p->rmdhead + p->rmdnum;
+-    packet_there = 0;
+-    /* As long as we own the next entry, check status and send
+-     * it up to higher layer
+-     */
+-
+-    while (!( (rmdstat = rmdp->u.s.status) & RX_OWN))
+-    {
+-	/*
+-         * Start and end of packet must be set, because we use
+-	 * the ethernet maximum packet length (1518) as buffer size.
+-	 *
+-	 * Because our buffers are at maximum OFLO and BUFF errors are
+-	 * not to be concerned (see Data sheet)
+-	 */
+-
+-	if ((rmdstat & (RX_STP | RX_ENP)) != (RX_STP | RX_ENP))
+-	{
+-	    /* Start of a frame > 1518 Bytes ? */
+-
+-	    if (rmdstat & RX_STP)
+-	    {
+-		printf("%s: packet too long\n", SK_NAME);
+-	    }
+-
+-	    /*
+-             * All other packets will be ignored until a new frame with
+-	     * start (RX_STP) set follows.
+-	     *
+-	     * What we do is just give descriptor free for new incoming
+-	     * packets.
+-	     */
+-
+-	    rmdp->u.s.status = RX_OWN;      /* Relinquish ownership to LANCE */
+-
+-	}
+-	else if (rmdstat & RX_ERR)          /* Receive Error ? */
+-	{
+-	    printf("%s: RX error: %#hX\n", SK_NAME, (int) rmdstat);
+-	    rmdp->u.s.status = RX_OWN;      /* Relinquish ownership to LANCE */
+-	}
+-	else /* We have a packet which can be queued for the upper layers */
+-	{
+-
+-	    int len = (rmdp->mlen & 0x0fff);  /* extract message length from receive buffer */
+-
+-	    /*
+-             * Copy data out of our receive descriptor into nic->packet.
+-	     *
+-	     * (rmdp->u.buffer & 0x00ffffff) -> get address of buffer and
+-	     * ignore status fields)
+-	     */
+-
+-	    memcpy(nic->packet, (unsigned char *) (rmdp->u.buffer & 0x00ffffff), nic->packetlen = len);
+-	    packet_there = 1;
+-
+-
+-	    /*
+-             * Packet is queued and marked for processing so we
+-	     * free our descriptor
+-	     */
+-
+-	    rmdp->u.s.status = RX_OWN;
+-
+-	    p->rmdnum++;
+-	    p->rmdnum %= RMDNUM;
+-
+-	    rmdp = p->rmdhead + p->rmdnum;
+-	}
+-    }
+-    SK_write_reg(CSR0, CSR0_INEA); /* Enable Interrupts */
+-	return (packet_there);
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void SK_transmit(
+-struct nic *nic,
+-const char *d,			/* Destination */
+-unsigned int t,			/* Type */
+-unsigned int s,			/* size */
+-const char *pack)		/* Packet */
+-{
+-	/* send the packet to destination */
+-    struct priv *p;         /* SK_G16 private structure */
+-    struct tmd *tmdp;
+-    short len;
+-    int csr0, i, tmdstat;
+-
+-    PRINTF2(("## %s: At beginning of SK_transmit(). CSR0: %#hX\n",
+-           SK_NAME, SK_read_reg(CSR0)));
+-	p = nic->priv_data;
+-	tmdp = p->tmdhead + p->tmdnum; /* Which descriptor for transmitting */
+-
+-	/* Copy data into dual ported ram */
+-
+-	memcpy(&p->ram->tmdbuf[p->tmdnum][0], d, ETH_ALEN);	/* dst */
+-	memcpy(&p->ram->tmdbuf[p->tmdnum][ETH_ALEN], nic->node_addr, ETH_ALEN); /* src */
+-	p->ram->tmdbuf[p->tmdnum][ETH_ALEN + ETH_ALEN] = t >> 8;	/* type */
+-	p->ram->tmdbuf[p->tmdnum][ETH_ALEN + ETH_ALEN + 1] = t;	/* type */
+-	memcpy(&p->ram->tmdbuf[p->tmdnum][ETH_HLEN], pack, s);
+-	s += ETH_HLEN;
+-	while (s < ETH_ZLEN)	/* pad to min length */
+-		p->ram->tmdbuf[p->tmdnum][s++] = 0;
+-	p->ram->tmde[p->tmdnum].status2 = 0x0;
+-
+-	/* Evaluate Packet length */
+-	len = ETH_ZLEN < s ? s : ETH_ZLEN;
+-
+-	/* Fill in Transmit Message Descriptor */
+-
+-	tmdp->blen = -len;            /* set length to transmit */
+-
+-	/*
+-	 * Packet start and end is always set because we use the maximum
+-	 * packet length as buffer length.
+-	 * Relinquish ownership to LANCE
+-	 */
+-
+-	tmdp->u.s.status = TX_OWN | TX_STP | TX_ENP;
+-
+-	/* Start Demand Transmission */
+-	SK_write_reg(CSR0, CSR0_TDMD | CSR0_INEA);
+-
+-    csr0 = SK_read_reg(CSR0);      /* store register for checking */
+-
+-    /*
+-     * Acknowledge all of the current interrupt sources, disable
+-     * Interrupts (INEA = 0)
+-     */
+-
+-    SK_write_reg(CSR0, csr0 & CSR0_CLRALL);
+-
+-    if (csr0 & CSR0_ERR) /* LANCE Error */
+-    {
+-	printf("%s: error: %#hX", SK_NAME, csr0);
+-
+-        if (csr0 & CSR0_MISS)      /* No place to store packet ? */
+-        {
+-		printf(", Packet dropped.");
+-        }
+-	putchar('\n');
+-    }
+-
+-
+-    /* Set next buffer */
+-    p->tmdlast++;
+-    p->tmdlast &= TMDNUM-1;
+-
+-    tmdstat = tmdp->u.s.status & 0xff00; /* filter out status bits 15:08 */
+-
+-    /*
+-     * We check status of transmitted packet.
+-     * see LANCE data-sheet for error explanation
+-     */
+-    if (tmdstat & TX_ERR) /* Error occurred */
+-    {
+-	printf("%s: TX error: %#hX %#hX\n", SK_NAME, (int) tmdstat,
+-		(int) tmdp->status2);
+-
+-	if (tmdp->status2 & TX_TDR)    /* TDR problems? */
+-	{
+-	    printf("%s: tdr-problems \n", SK_NAME);
+-	}
+-
+-        if (tmdp->status2 & TX_UFLO)   /* Underflow error ? */
+-        {
+-            /*
+-             * If UFLO error occurs it will turn transmitter of.
+-             * So we must reinit LANCE
+-             */
+-
+-            SK_lance_init(nic, MODE_NORMAL);
+-        }
+-
+-	tmdp->status2 = 0;             /* Clear error flags */
+-    }
+-
+-    SK_write_reg(CSR0, CSR0_INEA); /* Enable Interrupts */
+-
+-	/* Set pointer to next transmit buffer */
+-	p->tmdnum++;
+-	p->tmdnum &= TMDNUM-1;
+-
+-}
+-
+-/**************************************************************************
+-DISABLE - Turn off ethernet interface
+-***************************************************************************/
+-static void SK_disable(struct nic *nic)
+-{
+-    PRINTF(("## %s: At beginning of SK_disable(). CSR0: %#hX\n",
+-           SK_NAME, SK_read_reg(CSR0)));
+-    PRINTF(("%s: Shutting %s down CSR0 %#hX\n", SK_NAME, SK_NAME,
+-           (int) SK_read_reg(CSR0)));
+-
+-    SK_write_reg(CSR0, CSR0_STOP); /* STOP the LANCE */
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-struct nic *SK_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	unsigned short		*p;
+-	static unsigned short	io_addrs[] = SK_IO_PORTS;
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	putchar('\n');
+-	nic->priv_data = &p_data;
+-	if (probe_addrs == 0)
+-		probe_addrs = io_addrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
+-	{
+-		long		offset1, offset0 = inb(ioaddr);
+-		if ((offset0 == SK_IDLOW) &&
+-		 ((offset1 = inb(ioaddr + 1)) == SK_IDHIGH))
+-			if (SK_probe1(nic, ioaddr) >= 0)
+-				break;
+-	}
+-	/* if board found */
+-	if (ioaddr != 0)
+-	{
+-		/* point to NIC specific routines */
+-		nic->reset = SK_reset;
+-		nic->poll = SK_poll;
+-		nic->transmit = SK_transmit;
+-		nic->disable = SK_disable;
+-		return nic;
+-	}
+-	/* else */
+-	{
+-		return 0;
+-	}
+-}
+-
+-int SK_probe1(struct nic *nic, short ioaddr1)
+-{
+-    int i,j;                /* Counters */
+-    int sk_addr_flag = 0;   /* SK ADDR correct? 1 - no, 0 - yes */
+-    unsigned int rom_addr;  /* used to store RAM address used for POS_ADDR */
+-
+-    struct priv *p;         /* SK_G16 private structure */
+-
+-    if (SK_ADDR & 0x3fff || SK_ADDR < 0xa0000)
+-    {
+-       /*
+-        * Now here we could use a routine which searches for a free
+-        * place in the ram and set SK_ADDR if found. TODO.
+-        */
+-            printf("%s: SK_ADDR %#hX is not valid. Check configuration.\n",
+-                    SK_NAME, SK_ADDR);
+-            return -1;
+-    }
+-
+-    rom_addr = SK_ADDR;
+-
+-    outb(SK_ROM_RAM_OFF, SK_POS2); /* Boot_ROM + RAM off */
+-    outb(POS_ADDR, SK_POS3);       /* Set RAM address */
+-    outb(SK_ROM_RAM_ON, SK_POS2);  /* RAM on, BOOT_ROM on */
+-#ifdef	SK_DEBUG
+-    SK_print_pos(nic, "POS registers after ROM, RAM config");
+-#endif
+-
+-    board = (SK_RAM *) rom_addr;
+-	PRINTF(("adr[0]: %hX, adr[1]: %hX, adr[2]: %hX\n",
+-	board->rom[0], board->rom[2], board->rom[4]));
+-
+-    /* Read in station address */
+-    for (i = 0, j = 0; i < ETH_ALEN; i++, j+=2)
+-    {
+-	*(nic->node_addr+i) = board->rom[j];
+-    }
+-
+-    /* Check for manufacturer code */
+-#ifdef	SK_DEBUG
+-    if (!(*(nic->node_addr+0) == SK_MAC0 &&
+-	  *(nic->node_addr+1) == SK_MAC1 &&
+-	  *(nic->node_addr+2) == SK_MAC2) )
+-    {
+-        PRINTF(("## %s: We did not find SK_G16 at RAM location.\n",
+-                SK_NAME));
+-	return -1;                     /* NO SK_G16 found */
+-    }
+-#endif
+-
+-    p = nic->priv_data;
+-
+-    /* Initialize private structure */
+-
+-    p->ram = (struct SK_ram *) rom_addr; /* Set dual ported RAM addr */
+-    p->tmdhead = &(p->ram)->tmde[0];     /* Set TMD head */
+-    p->rmdhead = &(p->ram)->rmde[0];     /* Set RMD head */
+-
+-    printf("Schneider & Koch G16 at %#hX, mem at %#hX, HW addr: %!\n",
+-	    (unsigned int) ioaddr, (unsigned int) p->ram, nic->node_addr);
+-
+-    /* Initialize buffer pointers */
+-
+-    for (i = 0; i < TMDNUM; i++)
+-    {
+-	p->tmdbufs[i] = p->ram->tmdbuf[i];
+-    }
+-
+-    for (i = 0; i < RMDNUM; i++)
+-    {
+-	p->rmdbufs[i] = p->ram->rmdbuf[i];
+-    }
+-    i = 0;
+-
+-    if (!(i = SK_lance_init(nic, MODE_NORMAL)))  /* LANCE init OK? */
+-    {
+-
+-#ifdef	SK_DEBUG
+-        /*
+-         * This debug block tries to stop LANCE,
+-         * reinit LANCE with transmitter and receiver disabled,
+-         * then stop again and reinit with NORMAL_MODE
+-         */
+-
+-        printf("## %s: After lance init. CSR0: %#hX\n",
+-               SK_NAME, SK_read_reg(CSR0));
+-        SK_write_reg(CSR0, CSR0_STOP);
+-        printf("## %s: LANCE stopped. CSR0: %#hX\n",
+-               SK_NAME, SK_read_reg(CSR0));
+-        SK_lance_init(nic, MODE_DTX | MODE_DRX);
+-        printf("## %s: Reinit with DTX + DRX off. CSR0: %#hX\n",
+-               SK_NAME, SK_read_reg(CSR0));
+-        SK_write_reg(CSR0, CSR0_STOP);
+-        printf("## %s: LANCE stopped. CSR0: %#hX\n",
+-               SK_NAME, SK_read_reg(CSR0));
+-        SK_lance_init(nic, MODE_NORMAL);
+-        printf("## %s: LANCE back to normal mode. CSR0: %#hX\n",
+-               SK_NAME, SK_read_reg(CSR0));
+-        SK_print_pos(nic, "POS regs before returning OK");
+-
+-#endif	/* SK_DEBUG */
+-
+-    }
+-    else /* LANCE init failed */
+-    {
+-
+-	PRINTF(("## %s: LANCE init failed: CSR0: %#hX\n",
+-               SK_NAME, SK_read_reg(CSR0)));
+-	return -1;
+-    }
+-
+-#ifdef	SK_DEBUG
+-    SK_print_pos(nic, "End of SK_probe1");
+-    SK_print_ram(nic);
+-#endif
+-
+-    return 0;                            /* Initialization done */
+-
+-} /* End of SK_probe1() */
+-
+-static int SK_lance_init(struct nic *nic, unsigned short mode)
+-{
+-    int i;
+-    struct priv *p = (struct priv *) nic->priv_data;
+-    struct tmd  *tmdp;
+-    struct rmd  *rmdp;
+-
+-    PRINTF(("## %s: At beginning of LANCE init. CSR0: %#hX\n",
+-           SK_NAME, SK_read_reg(CSR0)));
+-
+-    /* Reset LANCE */
+-    SK_reset_board();
+-
+-    /* Initialize TMD's with start values */
+-    p->tmdnum = 0;                   /* First descriptor for transmitting */
+-    p->tmdlast = 0;                  /* First descriptor for reading stats */
+-
+-    for (i = 0; i < TMDNUM; i++)     /* Init all TMD's */
+-    {
+-	tmdp = p->tmdhead + i;
+-
+-	tmdp->u.buffer = (unsigned long) p->tmdbufs[i]; /* assign buffer */
+-
+-	/* Mark TMD as start and end of packet */
+-	tmdp->u.s.status = TX_STP | TX_ENP;
+-    }
+-
+-
+-    /* Initialize RMD's with start values */
+-
+-    p->rmdnum = 0;                   /* First RMD which will be used */
+-
+-    for (i = 0; i < RMDNUM; i++)     /* Init all RMD's */
+-    {
+-	rmdp = p->rmdhead + i;
+-
+-
+-	rmdp->u.buffer = (unsigned long) p->rmdbufs[i]; /* assign buffer */
+-
+-	/*
+-         * LANCE must be owner at beginning so that he can fill in
+-	 * receiving packets, set status and release RMD
+-	 */
+-
+-	rmdp->u.s.status = RX_OWN;
+-
+-	rmdp->blen = -PKT_BUF_SZ;    /* Buffer Size in a two's complement */
+-
+-	rmdp->mlen = 0;              /* init message length */
+-
+-    }
+-
+-    /* Fill LANCE Initialize Block */
+-
+-    (p->ram)->ib.mode = mode;        /* Set operation mode */
+-
+-    for (i = 0; i < ETH_ALEN; i++)   /* Set physical address */
+-    {
+-	(p->ram)->ib.paddr[i] = *(nic->node_addr+i);
+-    }
+-
+-    for (i = 0; i < 8; i++)          /* Set multicast, logical address */
+-    {
+-	(p->ram)->ib.laddr[i] = 0;   /* We do not use logical addressing */
+-    }
+-
+-    /* Set ring descriptor pointers and set number of descriptors */
+-
+-    (p->ram)->ib.rdrp = (int)  p->rmdhead | RMDNUMMASK;
+-    (p->ram)->ib.tdrp = (int)  p->tmdhead | TMDNUMMASK;
+-
+-    /* Prepare LANCE Control and Status Registers */
+-
+-    SK_write_reg(CSR3, CSR3_ACON);   /* Ale Control !!!THIS MUST BE SET!!!! */
+-
+-    /*
+-     * LANCE addresses the RAM from 0x0000 to 0x3fbf and has no access to
+-     * PC Memory locations.
+-     *
+-     * In structure SK_ram is defined that the first thing in ram
+-     * is the initialization block. So his address is for LANCE always
+-     * 0x0000
+-     *
+-     * CSR1 contains low order bits 15:0 of initialization block address
+-     * CSR2 is built of:
+-     *    7:0  High order bits 23:16 of initialization block address
+-     *   15:8  reserved, must be 0
+-     */
+-
+-    /* Set initialization block address (must be on word boundary) */
+-    SK_write_reg(CSR1, 0);          /* Set low order bits 15:0 */
+-    SK_write_reg(CSR2, 0);          /* Set high order bits 23:16 */
+-
+-
+-    PRINTF(("## %s: After setting CSR1-3. CSR0: %#hX\n",
+-           SK_NAME, SK_read_reg(CSR0)));
+-
+-    /* Initialize LANCE */
+-
+-    /*
+-     * INIT = Initialize, when set, causes the LANCE to begin the
+-     * initialization procedure and access the Init Block.
+-     */
+-
+-    SK_write_reg(CSR0, CSR0_INIT);
+-
+-    /* Wait until LANCE finished initialization */
+-
+-    SK_set_RAP(CSR0);              /* Register Address Pointer to CSR0 */
+-
+-    for (i = 0; (i < 100) && !(SK_rread_reg() & CSR0_IDON); i++)
+-	; /* Wait until init done or go ahead if problems (i>=100) */
+-
+-    if (i >= 100) /* Something is wrong ! */
+-    {
+-	printf("%s: can't init am7990, status: %#hX "
+-	       "init_block: %#hX\n",
+-		SK_NAME, (int) SK_read_reg(CSR0),
+-		(unsigned int) &(p->ram)->ib);
+-
+-#ifdef	SK_DEBUG
+-	SK_print_pos(nic, "LANCE INIT failed");
+-#endif
+-
+-	return -1;                 /* LANCE init failed */
+-    }
+-
+-    PRINTF(("## %s: init done after %d ticks\n", SK_NAME, i));
+-
+-    /* Clear Initialize done, enable Interrupts, start LANCE */
+-
+-    SK_write_reg(CSR0, CSR0_IDON | CSR0_INEA | CSR0_STRT);
+-
+-    PRINTF(("## %s: LANCE started. CSR0: %#hX\n", SK_NAME,
+-            SK_read_reg(CSR0)));
+-
+-    return 0;                      /* LANCE is up and running */
+-
+-} /* End of SK_lance_init() */
+-
+-/* LANCE access functions
+- *
+- * ! CSR1-3 can only be accessed when in CSR0 the STOP bit is set !
+- */
+-
+-static void SK_reset_board(void)
+-{
+-    int i;
+-
+-	PRINTF(("## %s: At beginning of SK_reset_board.\n", SK_NAME));
+-    SK_PORT = 0x00;           /* Reset active */
+-    for (i = 0; i < 10 ; i++) /* Delay min 5ms */
+-	;
+-    SK_PORT = SK_RESET;       /* Set back to normal operation */
+-
+-} /* End of SK_reset_board() */
+-
+-static void SK_set_RAP(int reg_number)
+-{
+-    SK_IOREG = reg_number;
+-    SK_PORT  = SK_RESET | SK_RAP | SK_WREG;
+-    SK_IOCOM = SK_DOIO;
+-
+-    while (SK_PORT & SK_IORUN)
+-	;
+-} /* End of SK_set_RAP() */
+-
+-static int SK_read_reg(int reg_number)
+-{
+-    SK_set_RAP(reg_number);
+-
+-    SK_PORT  = SK_RESET | SK_RDATA | SK_RREG;
+-    SK_IOCOM = SK_DOIO;
+-
+-    while (SK_PORT & SK_IORUN)
+-	;
+-    return (SK_IOREG);
+-
+-} /* End of SK_read_reg() */
+-
+-static int SK_rread_reg(void)
+-{
+-    SK_PORT  = SK_RESET | SK_RDATA | SK_RREG;
+-
+-    SK_IOCOM = SK_DOIO;
+-
+-    while (SK_PORT & SK_IORUN)
+-	;
+-    return (SK_IOREG);
+-
+-} /* End of SK_rread_reg() */
+-
+-static void SK_write_reg(int reg_number, int value)
+-{
+-    SK_set_RAP(reg_number);
+-
+-    SK_IOREG = value;
+-    SK_PORT  = SK_RESET | SK_RDATA | SK_WREG;
+-    SK_IOCOM = SK_DOIO;
+-
+-    while (SK_PORT & SK_IORUN)
+-	;
+-} /* End of SK_write_reg */
+-
+-/*
+- * Debugging functions
+- * -------------------
+- */
+-
+-#ifdef	SK_DEBUG
+-static void SK_print_pos(struct nic *nic, char *text)
+-{
+-
+-    unsigned char pos0 = inb(SK_POS0),
+-		  pos1 = inb(SK_POS1),
+-		  pos2 = inb(SK_POS2),
+-		  pos3 = inb(SK_POS3),
+-		  pos4 = inb(SK_POS4);
+-
+-
+-    printf("## %s: %s.\n"
+-           "##   pos0=%#hX pos1=%#hX pos2=%#hX pos3=%#hX pos4=%#hX\n",
+-           SK_NAME, text, pos0, pos1, pos2, (pos3<<14), pos4);
+-
+-} /* End of SK_print_pos() */
+-
+-static void SK_print_ram(struct nic *nic)
+-{
+-
+-    int i;
+-    struct priv *p = (struct priv *) nic->priv_data;
+-
+-    printf("## %s: RAM Details.\n"
+-           "##   RAM at %#hX tmdhead: %#hX rmdhead: %#hX initblock: %#hX\n",
+-           SK_NAME,
+-           (unsigned int) p->ram,
+-           (unsigned int) p->tmdhead,
+-           (unsigned int) p->rmdhead,
+-           (unsigned int) &(p->ram)->ib);
+-
+-    printf("##   ");
+-
+-    for(i = 0; i < TMDNUM; i++)
+-    {
+-           if (!(i % 3)) /* Every third line do a newline */
+-           {
+-               printf("\n##   ");
+-           }
+-        printf("tmdbufs%d: %#hX ", (i+1), (int) p->tmdbufs[i]);
+-    }
+-    printf("##   ");
+-
+-    for(i = 0; i < RMDNUM; i++)
+-    {
+-         if (!(i % 3)) /* Every third line do a newline */
+-           {
+-               printf("\n##   ");
+-           }
+-        printf("rmdbufs%d: %#hX ", (i+1), (int) p->rmdbufs[i]);
+-    }
+-    putchar('\n');
+-
+-} /* End of SK_print_ram() */
+-#endif
+diff -Naur grub-0.97.orig/netboot/sk_g16.h grub-0.97/netboot/sk_g16.h
+--- grub-0.97.orig/netboot/sk_g16.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/sk_g16.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,168 +0,0 @@
+-/*-
+- *
+- * This software may be used and distributed according to the terms
+- * of the GNU Public License, incorporated herein by reference.
+- *
+- * Module         : sk_g16.h
+- * Version        : $Revision: 1.3 $
+- *
+- * Author         : M.Hipp (mhipp@student.uni-tuebingen.de)
+- * changes by     : Patrick J.D. Weichmann
+- *
+- * Date Created   : 94/05/25
+- *
+- * Description    : In here are all necessary definitions of
+- *                  the am7990 (LANCE) chip used for writing a
+- *                  network device driver which uses this chip
+- *
+- * $Log: sk_g16.h,v $
+- * Revision 1.3  2000/07/29 19:22:54  okuji
+- * update the network support to etherboot-4.6.4.
+- *
+--*/
+-
+-#ifndef	SK_G16_H
+-
+-#define SK_G16_H
+-
+-
+-/*
+- *	Control and Status Register 0 (CSR0) bit definitions
+- *
+- * (R=Readable) (W=Writeable) (S=Set on write) (C-Clear on write)
+- *
+- */
+-
+-#define CSR0_ERR	0x8000	/* Error summary (R) */
+-#define CSR0_BABL	0x4000	/* Babble transmitter timeout error (RC) */
+-#define CSR0_CERR	0x2000	/* Collision Error (RC) */
+-#define CSR0_MISS	0x1000	/* Missed packet (RC) */
+-#define CSR0_MERR	0x0800	/* Memory Error  (RC) */
+-#define CSR0_RINT	0x0400	/* Receiver Interrupt (RC) */
+-#define CSR0_TINT       0x0200	/* Transmit Interrupt (RC) */
+-#define CSR0_IDON	0x0100	/* Initialization Done (RC) */
+-#define CSR0_INTR	0x0080	/* Interrupt Flag (R) */
+-#define CSR0_INEA	0x0040	/* Interrupt Enable (RW) */
+-#define CSR0_RXON	0x0020	/* Receiver on (R) */
+-#define CSR0_TXON	0x0010  /* Transmitter on (R) */
+-#define CSR0_TDMD	0x0008	/* Transmit Demand (RS) */
+-#define CSR0_STOP	0x0004	/* Stop (RS) */
+-#define CSR0_STRT	0x0002	/* Start (RS) */
+-#define CSR0_INIT	0x0001	/* Initialize (RS) */
+-
+-#define CSR0_CLRALL     0x7f00  /* mask for all clearable bits */
+-
+-/*
+- *    Control and Status Register 3 (CSR3) bit definitions
+- *
+- */
+-
+-#define CSR3_BSWAP	0x0004	/* Byte Swap (RW) */
+-#define CSR3_ACON	0x0002  /* ALE Control (RW) */
+-#define CSR3_BCON	0x0001	/* Byte Control (RW) */
+-
+-/*
+- *	Initialization Block Mode operation Bit Definitions.
+- */
+-
+-#define MODE_PROM	0x8000	/* Promiscuous Mode */
+-#define MODE_INTL	0x0040  /* Internal Loopback */
+-#define MODE_DRTY	0x0020  /* Disable Retry */
+-#define MODE_COLL	0x0010	/* Force Collision */
+-#define MODE_DTCR	0x0008	/* Disable Transmit CRC) */
+-#define MODE_LOOP	0x0004	/* Loopback */
+-#define MODE_DTX	0x0002	/* Disable the Transmitter */
+-#define MODE_DRX	0x0001  /* Disable the Receiver */
+-
+-#define MODE_NORMAL	0x0000  /* Normal operation mode */
+-
+-/*
+- *	Receive message descriptor status bit definitions.
+- */
+-
+-#define RX_OWN		0x80	/* Owner bit 0 = host, 1 = lance */
+-#define RX_ERR		0x40	/* Error Summary */
+-#define RX_FRAM		0x20	/* Framing Error */
+-#define RX_OFLO		0x10	/* Overflow Error */
+-#define RX_CRC		0x08	/* CRC Error */
+-#define RX_BUFF		0x04	/* Buffer Error */
+-#define RX_STP		0x02	/* Start of Packet */
+-#define RX_ENP		0x01	/* End of Packet */
+-
+-
+-/*
+- *	Transmit message descriptor status bit definitions.
+- */
+-
+-#define TX_OWN		0x80	/* Owner bit 0 = host, 1 = lance */
+-#define TX_ERR		0x40    /* Error Summary */
+-#define TX_MORE		0x10	/* More the 1 retry needed to Xmit */
+-#define TX_ONE		0x08	/* One retry needed to Xmit */
+-#define TX_DEF		0x04	/* Deferred */
+-#define TX_STP		0x02	/* Start of Packet */
+-#define TX_ENP		0x01	/* End of Packet */
+-
+-/*
+- *      Transmit status (2) (valid if TX_ERR == 1)
+- */
+-
+-#define TX_BUFF		0x8000  /* Buffering error (no ENP) */
+-#define TX_UFLO		0x4000  /* Underflow (late memory) */
+-#define TX_LCOL		0x1000  /* Late collision */
+-#define TX_LCAR		0x0400  /* Loss of Carrier */
+-#define TX_RTRY		0x0200  /* Failed after 16 retransmissions  */
+-#define TX_TDR          0x003f  /* Time-domain-reflectometer-value */
+-
+-
+-/*
+- * Structures used for Communication with the LANCE
+- */
+-
+-/* LANCE Initialize Block */
+-
+-struct init_block
+-{
+-  unsigned short mode;     /* Mode Register */
+-  unsigned char  paddr[6]; /* Physical Address (MAC) */
+-  unsigned char  laddr[8]; /* Logical Filter Address (not used) */
+-  unsigned int   rdrp;     /* Receive Descriptor Ring pointer */
+-  unsigned int   tdrp;     /* Transmit Descriptor Ring pointer */
+-};
+-
+-
+-/* Receive Message Descriptor Entry */
+-
+-struct rmd
+-{
+-  union rmd_u
+-  {
+-    unsigned long buffer;     /* Address of buffer */
+-    struct rmd_s
+-    {
+-      unsigned char unused[3];
+-      unsigned volatile char status;   /* Status Bits */
+-    } s;
+-  } u;
+-  volatile short blen;        /* Buffer Length (two's complement) */
+-  unsigned short mlen;        /* Message Byte Count */
+-};
+-
+-
+-/* Transmit Message Descriptor Entry */
+-
+-struct tmd
+-{
+-  union tmd_u
+-  {
+-    unsigned long  buffer;    /* Address of buffer */
+-    struct tmd_s
+-    {
+-      unsigned char unused[3];
+-      unsigned volatile char status;   /* Status Bits */
+-    } s;
+-  } u;
+-  unsigned short blen;             /* Buffer Length (two's complement) */
+-  unsigned volatile short status2; /* Error Status Bits */
+-};
+-
+-#endif	/* End of SK_G16_H */
+diff -Naur grub-0.97.orig/netboot/smc9000.c grub-0.97/netboot/smc9000.c
+--- grub-0.97.orig/netboot/smc9000.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/smc9000.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,522 +0,0 @@
+- /*------------------------------------------------------------------------
+- * smc9000.c
+- * This is a Etherboot driver for SMC's 9000 series of Ethernet cards.
+- *
+- * Copyright (C) 1998 Daniel Engström <daniel.engstrom@riksnett.no>
+- * Based on the Linux SMC9000 driver, smc9194.c by Eric Stahlman
+- * Copyright (C) 1996 by Erik Stahlman <eric@vt.edu>
+- *
+- * This software may be used and distributed according to the terms
+- * of the GNU Public License, incorporated herein by reference.
+- *
+- * "Features" of the SMC chip:
+- *   4608 byte packet memory. ( for the 91C92/4.  Others have more )
+- *   EEPROM for configuration
+- *   AUI/TP selection
+- *
+- * Authors
+- *	Erik Stahlman				<erik@vt.edu>
+- *      Daniel Engström                         <daniel.engstrom@riksnett.no>
+- *
+- * History
+- * 98-09-25              Daniel Engström Etherboot driver crated from Eric's
+- *                                       Linux driver.
+- *
+- *---------------------------------------------------------------------------*/
+-#define LINUX_OUT_MACROS 1
+-#define SMC9000_VERBOSE  1
+-#define SMC9000_DEBUG    0
+-
+-#include "etherboot.h"
+-#include "nic.h"
+-#include "cards.h"
+-#include "smc9000.h"
+-
+-# define _outb outb
+-# define _outw outw
+-
+-static const char       smc9000_version[] = "Version 0.99 98-09-30";
+-static unsigned int	smc9000_base=0;
+-static const char       *interfaces[ 2 ] = { "TP", "AUI" };
+-static const char       *chip_ids[ 15 ] =  {
+-   NULL, NULL, NULL,
+-   /* 3 */ "SMC91C90/91C92",
+-   /* 4 */ "SMC91C94",
+-   /* 5 */ "SMC91C95",
+-   NULL,
+-   /* 7 */ "SMC91C100",
+-   /* 8 */ "SMC91C100FD",
+-   NULL, NULL, NULL,
+-   NULL, NULL, NULL
+-};
+-static const char      smc91c96_id[] = "SMC91C96";
+-
+-/*
+- * Function: smc_reset( int ioaddr )
+- * Purpose:
+- *	This sets the SMC91xx chip to its normal state, hopefully from whatever
+- *	mess that any other DOS driver has put it in.
+- *
+- * Maybe I should reset more registers to defaults in here?  SOFTRESET  should
+- * do that for me.
+- *
+- * Method:
+- *	1.  send a SOFT RESET
+- *	2.  wait for it to finish
+- *	3.  reset the memory management unit
+- *      4.  clear all interrupts
+- *
+-*/
+-static void smc_reset(int ioaddr)
+-{
+-   /* This resets the registers mostly to defaults, but doesn't
+-    * affect EEPROM.  That seems unnecessary */
+-   SMC_SELECT_BANK(ioaddr, 0);
+-   _outw( RCR_SOFTRESET, ioaddr + RCR );
+-
+-   /* this should pause enough for the chip to be happy */
+-   SMC_DELAY(ioaddr);
+-
+-   /* Set the transmit and receive configuration registers to
+-    * default values */
+-   _outw(RCR_CLEAR, ioaddr + RCR);
+-   _outw(TCR_CLEAR, ioaddr + TCR);
+-
+-   /* Reset the MMU */
+-   SMC_SELECT_BANK(ioaddr, 2);
+-   _outw( MC_RESET, ioaddr + MMU_CMD );
+-
+-   /* Note:  It doesn't seem that waiting for the MMU busy is needed here,
+-    * but this is a place where future chipsets _COULD_ break.  Be wary
+-    * of issuing another MMU command right after this */
+-   _outb(0, ioaddr + INT_MASK);
+-}
+-
+-
+-/*----------------------------------------------------------------------
+- * Function: smc_probe( int ioaddr )
+- *
+- * Purpose:
+- *	Tests to see if a given ioaddr points to an SMC9xxx chip.
+- *	Returns a 0 on success
+- *
+- * Algorithm:
+- *	(1) see if the high byte of BANK_SELECT is 0x33
+- *	(2) compare the ioaddr with the base register's address
+- *	(3) see if I recognize the chip ID in the appropriate register
+- *
+- * ---------------------------------------------------------------------
+- */
+-static int smc_probe( int ioaddr )
+-{
+-   word bank;
+-   word	revision_register;
+-   word base_address_register;
+-
+-   /* First, see if the high byte is 0x33 */
+-   bank = inw(ioaddr + BANK_SELECT);
+-   if ((bank & 0xFF00) != 0x3300) {
+-      return -1;
+-   }
+-   /* The above MIGHT indicate a device, but I need to write to further
+-    *	test this.  */
+-   _outw(0x0, ioaddr + BANK_SELECT);
+-   bank = inw(ioaddr + BANK_SELECT);
+-   if ((bank & 0xFF00) != 0x3300) {
+-      return -1;
+-   }
+-
+-   /* well, we've already written once, so hopefully another time won't
+-    *  hurt.  This time, I need to switch the bank register to bank 1,
+-    *  so I can access the base address register */
+-   SMC_SELECT_BANK(ioaddr, 1);
+-   base_address_register = inw(ioaddr + BASE);
+-
+-   if (ioaddr != (base_address_register >> 3 & 0x3E0))  {
+-#ifdef	SMC9000_VERBOSE
+-      printf("SMC9000: IOADDR %hX doesn't match configuration (%hX)."
+-	     "Probably not a SMC chip\n",
+-	     ioaddr, base_address_register >> 3 & 0x3E0);
+-#endif
+-      /* well, the base address register didn't match.  Must not have
+-       * been a SMC chip after all. */
+-      return -1;
+-   }
+-
+-
+-   /* check if the revision register is something that I recognize.
+-    * These might need to be added to later, as future revisions
+-    * could be added.  */
+-   SMC_SELECT_BANK(ioaddr, 3);
+-   revision_register  = inw(ioaddr + REVISION);
+-   if (!chip_ids[(revision_register >> 4) & 0xF]) {
+-      /* I don't recognize this chip, so... */
+-#ifdef	SMC9000_VERBOSE
+-      printf("SMC9000: IO %hX: Unrecognized revision register:"
+-	     " %hX, Contact author.\n", ioaddr, revision_register);
+-#endif
+-      return -1;
+-   }
+-
+-   /* at this point I'll assume that the chip is an SMC9xxx.
+-    * It might be prudent to check a listing of MAC addresses
+-    * against the hardware address, or do some other tests. */
+-   return 0;
+-}
+-
+-
+-/**************************************************************************
+- * ETH_RESET - Reset adapter
+- ***************************************************************************/
+-
+-static void smc9000_reset(struct nic *nic)
+-{
+-   smc_reset(smc9000_base);
+-}
+-
+-/**************************************************************************
+- * ETH_TRANSMIT - Transmit a frame
+- ***************************************************************************/
+-static void smc9000_transmit(
+-	struct nic *nic,
+-	const char *d,			/* Destination */
+-	unsigned int t,			/* Type */
+-	unsigned int s,			/* size */
+-	const char *p)			/* Packet */
+-{
+-   word length; /* real, length incl. header */
+-   word numPages;
+-   unsigned long time_out;
+-   byte	packet_no;
+-   word status;
+-   int i;
+-
+-   /* We dont pad here since we can have the hardware doing it for us */
+-   length = (s + ETH_HLEN + 1)&~1;
+-
+-   /* convert to MMU pages */
+-   numPages = length / 256;
+-
+-   if (numPages > 7 ) {
+-#ifdef	SMC9000_VERBOSE
+-      printf("SMC9000: Far too big packet error. \n");
+-#endif
+-      return;
+-   }
+-
+-   /* dont try more than, say 30 times */
+-   for (i=0;i<30;i++) {
+-      /* now, try to allocate the memory */
+-      SMC_SELECT_BANK(smc9000_base, 2);
+-      _outw(MC_ALLOC | numPages, smc9000_base + MMU_CMD);
+-
+-      status = 0;
+-      /* wait for the memory allocation to finnish */
+-      for (time_out = currticks() + 5*TICKS_PER_SEC; currticks() < time_out; ) {
+-	 status = inb(smc9000_base + INTERRUPT);
+-	 if ( status & IM_ALLOC_INT ) {
+-	    /* acknowledge the interrupt */
+-	    _outb(IM_ALLOC_INT, smc9000_base + INTERRUPT);
+-	    break;
+-	 }
+-      }
+-
+-      if ((status & IM_ALLOC_INT) != 0 ) {
+-	 /* We've got the memory */
+-	 break;
+-      } else {
+-	 printf("SMC9000: Memory allocation timed out, resetting MMU.\n");
+-	 _outw(MC_RESET, smc9000_base + MMU_CMD);
+-      }
+-   }
+-
+-   /* If I get here, I _know_ there is a packet slot waiting for me */
+-   packet_no = inb(smc9000_base + PNR_ARR + 1);
+-   if (packet_no & 0x80) {
+-      /* or isn't there?  BAD CHIP! */
+-      printf("SMC9000: Memory allocation failed. \n");
+-      return;
+-   }
+-
+-   /* we have a packet address, so tell the card to use it */
+-   _outb(packet_no, smc9000_base + PNR_ARR);
+-
+-   /* point to the beginning of the packet */
+-   _outw(PTR_AUTOINC, smc9000_base + POINTER);
+-
+-#if	SMC9000_DEBUG > 2
+-   printf("Trying to xmit packet of length %hX\n", length );
+-#endif
+-
+-   /* send the packet length ( +6 for status, length and ctl byte )
+-    * and the status word ( set to zeros ) */
+-   _outw(0, smc9000_base + DATA_1 );
+-
+-   /* send the packet length ( +6 for status words, length, and ctl) */
+-   _outb((length+6) & 0xFF,  smc9000_base + DATA_1);
+-   _outb((length+6) >> 8 ,   smc9000_base + DATA_1);
+-
+-   /* Write the contents of the packet */
+-
+-   /* The ethernet header first... */
+-   outsw(smc9000_base + DATA_1, d, ETH_ALEN >> 1);
+-   outsw(smc9000_base + DATA_1, nic->node_addr, ETH_ALEN >> 1);
+-   _outw(htons(t), smc9000_base + DATA_1);
+-
+-   /* ... the data ... */
+-   outsw(smc9000_base + DATA_1 , p, s >> 1);
+-
+-   /* ... and the last byte, if there is one.   */
+-   if ((s & 1) == 0) {
+-      _outw(0, smc9000_base + DATA_1);
+-   } else {
+-      _outb(p[s-1], smc9000_base + DATA_1);
+-      _outb(0x20, smc9000_base + DATA_1);
+-   }
+-
+-   /* and let the chipset deal with it */
+-   _outw(MC_ENQUEUE , smc9000_base + MMU_CMD);
+-
+-   status = 0; time_out = currticks() + 5*TICKS_PER_SEC;
+-   do {
+-      status = inb(smc9000_base + INTERRUPT);
+-
+-      if ((status & IM_TX_INT ) != 0) {
+-	 word tx_status;
+-
+-	 /* ack interrupt */
+-	 _outb(IM_TX_INT, smc9000_base + INTERRUPT);
+-
+-	 packet_no = inw(smc9000_base + FIFO_PORTS);
+-	 packet_no &= 0x7F;
+-
+-	 /* select this as the packet to read from */
+-	 _outb( packet_no, smc9000_base + PNR_ARR );
+-
+-	 /* read the first word from this packet */
+-	 _outw( PTR_AUTOINC | PTR_READ, smc9000_base + POINTER );
+-
+-	 tx_status = inw( smc9000_base + DATA_1 );
+-
+-	 if (0 == (tx_status & TS_SUCCESS)) {
+-#ifdef	SMC9000_VERBOSE
+-	    printf("SMC9000: TX FAIL STATUS: %hX \n", tx_status);
+-#endif
+-	    /* re-enable transmit */
+-	    SMC_SELECT_BANK(smc9000_base, 0);
+-	    _outw(inw(smc9000_base + TCR ) | TCR_ENABLE, smc9000_base + TCR );
+-	 }
+-
+-	 /* kill the packet */
+-	 SMC_SELECT_BANK(smc9000_base, 2);
+-	 _outw(MC_FREEPKT, smc9000_base + MMU_CMD);
+-
+-	 return;
+-      }
+-   }while(currticks() < time_out);
+-
+-   printf("SMC9000: Waring TX timed out, resetting board\n");
+-   smc_reset(smc9000_base);
+-   return;
+-}
+-
+-/**************************************************************************
+- * ETH_POLL - Wait for a frame
+- ***************************************************************************/
+-static int smc9000_poll(struct nic *nic)
+-{
+-   if(!smc9000_base)
+-     return 0;
+-
+-   SMC_SELECT_BANK(smc9000_base, 2);
+-   if (inw(smc9000_base + FIFO_PORTS) & FP_RXEMPTY)
+-     return 0;
+-
+-   /*  start reading from the start of the packet */
+-   _outw(PTR_READ | PTR_RCV | PTR_AUTOINC, smc9000_base + POINTER);
+-
+-   /* First read the status and check that we're ok */
+-   if (!(inw(smc9000_base + DATA_1) & RS_ERRORS)) {
+-      /* Next: read the packet length and mask off the top bits */
+-      nic->packetlen = (inw(smc9000_base + DATA_1) & 0x07ff);
+-
+-      /* the packet length includes the 3 extra words */
+-      nic->packetlen -= 6;
+-#if	SMC9000_DEBUG > 2
+-      printf(" Reading %d words (and %d byte(s))\n",
+-	       (nic->packetlen >> 1), nic->packetlen & 1);
+-#endif
+-      /* read the packet (and the last "extra" word) */
+-      insw(smc9000_base + DATA_1, nic->packet, (nic->packetlen+2) >> 1);
+-      /* is there an odd last byte ? */
+-      if (nic->packet[nic->packetlen+1] & 0x20)
+-	 nic->packetlen++;
+-
+-      /*  error or good, tell the card to get rid of this packet */
+-      _outw(MC_RELEASE, smc9000_base + MMU_CMD);
+-      return 1;
+-   }
+-
+-   printf("SMC9000: RX error\n");
+-   /*  error or good, tell the card to get rid of this packet */
+-   _outw(MC_RELEASE, smc9000_base + MMU_CMD);
+-   return 0;
+-}
+-
+-static void smc9000_disable(struct nic *nic)
+-{
+-   if(!smc9000_base)
+-     return;
+-
+-   /* no more interrupts for me */
+-   SMC_SELECT_BANK(smc9000_base, 2);
+-   _outb( 0, smc9000_base + INT_MASK);
+-
+-   /* and tell the card to stay away from that nasty outside world */
+-   SMC_SELECT_BANK(smc9000_base, 0);
+-   _outb( RCR_CLEAR, smc9000_base + RCR );
+-   _outb( TCR_CLEAR, smc9000_base + TCR );
+-}
+-
+-/**************************************************************************
+- * ETH_PROBE - Look for an adapter
+- ***************************************************************************/
+-
+-struct nic *smc9000_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-   unsigned short   revision;
+-   int	            memory;
+-   int              media;
+-   const char *	    version_string;
+-   const char *	    if_string;
+-   int              i;
+-
+-   /*
+-    * the SMC9000 can be at any of the following port addresses.  To change,
+-    * for a slightly different card, you can add it to the array.  Keep in
+-    * mind that the array must end in zero.
+-    */
+-   static unsigned short portlist[] = {
+-#ifdef	SMC9000_SCAN
+-      SMC9000_SCAN,
+-#else
+-      0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0,
+-      0x300, 0x320, 0x340, 0x360, 0x380, 0x3A0, 0x3C0, 0x3E0,
+-#endif
+-      0 };
+-
+-   printf("\nSMC9000 %s\n", smc9000_version);
+-#ifdef	SMC9000_VERBOSE
+-   printf("Copyright (C) 1998 Daniel Engstr\x94m\n");
+-   printf("Copyright (C) 1996 Eric Stahlman\n");
+-#endif
+-   /* if no addresses supplied, fall back on defaults */
+-   if (probe_addrs == 0 || probe_addrs[0] == 0)
+-     probe_addrs = portlist;
+-
+-   /* check every ethernet address */
+-   for (i = 0; probe_addrs[i]; i++) {
+-      /* check this specific address */
+-      if (smc_probe(probe_addrs[i]) == 0)
+-	smc9000_base = probe_addrs[i];
+-   }
+-
+-   /* couldn't find anything */
+-   if(0 == smc9000_base)
+-     goto out;
+-
+-   /*
+-    * Get the MAC address ( bank 1, regs 4 - 9 )
+-    */
+-   SMC_SELECT_BANK(smc9000_base, 1);
+-   for ( i = 0; i < 6; i += 2 ) {
+-      word address;
+-
+-      address = inw(smc9000_base + ADDR0 + i);
+-      nic->node_addr[i+1] = address >> 8;
+-      nic->node_addr[i] = address & 0xFF;
+-   }
+-
+-
+-   /* get the memory information */
+-   SMC_SELECT_BANK(smc9000_base, 0);
+-   memory = ( inw(smc9000_base + MCR) >> 9 )  & 0x7;  /* multiplier */
+-   memory *= 256 * (inw(smc9000_base + MIR) & 0xFF);
+-
+-   /*
+-    * Now, I want to find out more about the chip.  This is sort of
+-    * redundant, but it's cleaner to have it in both, rather than having
+-    * one VERY long probe procedure.
+-    */
+-   SMC_SELECT_BANK(smc9000_base, 3);
+-   revision  = inw(smc9000_base + REVISION);
+-   version_string = chip_ids[(revision >> 4) & 0xF];
+-
+-   if (((revision & 0xF0) >> 4 == CHIP_9196) &&
+-       ((revision & 0x0F) >= REV_9196)) {
+-      /* This is a 91c96. 'c96 has the same chip id as 'c94 (4) but
+-       * a revision starting at 6 */
+-      version_string = smc91c96_id;
+-   }
+-
+-   if ( !version_string ) {
+-      /* I shouldn't get here because this call was done before.... */
+-      goto out;
+-   }
+-
+-   /* is it using AUI or 10BaseT ? */
+-   SMC_SELECT_BANK(smc9000_base, 1);
+-   if (inw(smc9000_base + CONFIG) & CFG_AUI_SELECT)
+-     media = 2;
+-   else
+-     media = 1;
+-
+-   if_string = interfaces[media - 1];
+-
+-   /* now, reset the chip, and put it into a known state */
+-   smc_reset(smc9000_base);
+-
+-   printf("%s rev:%d I/O port:%hX Interface:%s RAM:%d bytes \n",
+-	  version_string, revision & 0xF,
+-	  smc9000_base, if_string, memory );
+-   /*
+-    * Print the Ethernet address
+-    */
+-   printf("Ethernet MAC address: %!\n", nic->node_addr);
+-
+-   SMC_SELECT_BANK(smc9000_base, 0);
+-
+-   /* see the header file for options in TCR/RCR NORMAL*/
+-   _outw(TCR_NORMAL, smc9000_base + TCR);
+-   _outw(RCR_NORMAL, smc9000_base + RCR);
+-
+-   /* Select which interface to use */
+-   SMC_SELECT_BANK(smc9000_base, 1);
+-   if ( media == 1 ) {
+-      _outw( inw( smc9000_base + CONFIG ) & ~CFG_AUI_SELECT,
+-	   smc9000_base + CONFIG );
+-   }
+-   else if ( media == 2 ) {
+-      _outw( inw( smc9000_base + CONFIG ) | CFG_AUI_SELECT,
+-	   smc9000_base + CONFIG );
+-   }
+-
+-   nic->reset = smc9000_reset;
+-   nic->poll = smc9000_poll;
+-   nic->transmit = smc9000_transmit;
+-   nic->disable = smc9000_disable;
+-
+-
+-   return nic;
+-
+-out:
+-#ifdef	SMC9000_VERBOSE
+-   printf("No SMC9000 adapters found\n");
+-#endif
+-   smc9000_base = 0;
+-
+-   return (0);
+-}
+-
+-
+-
+diff -Naur grub-0.97.orig/netboot/smc9000.h grub-0.97/netboot/smc9000.h
+--- grub-0.97.orig/netboot/smc9000.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/smc9000.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,205 +0,0 @@
+-/*------------------------------------------------------------------------
+- * smc9000.h
+- *
+- * Copyright (C) 1998 by Daniel Engström
+- * Copyright (C) 1996 by Erik Stahlman
+- *
+- * This software may be used and distributed according to the terms
+- * of the GNU Public License, incorporated herein by reference.
+- *
+- * This file contains register information and access macros for
+- * the SMC91xxx chipset.
+- *
+- * Information contained in this file was obtained from the SMC91C94
+- * manual from SMC.  To get a copy, if you really want one, you can find
+- * information under www.smsc.com in the components division.
+- * ( this thanks to advice from Donald Becker ).
+- *
+- * Authors
+- *      Daniel Engström                         <daniel.engstrom@riksnett.no>
+- *	Erik Stahlman				<erik@vt.edu>
+- *
+- * History
+- * 96-01-06		 Erik Stahlman   moved definitions here from main .c
+- *                                       file
+- * 96-01-19		 Erik Stahlman	 polished this up some, and added
+- *                                       better error handling
+- * 98-09-25              Daniel Engström adjusted for Etherboot
+- * 98-09-27              Daniel Engström moved some static strings back to the
+- *                                       main .c file
+- * --------------------------------------------------------------------------*/
+-#ifndef	_SMC9000_H_
+-# define _SMC9000_H_
+-
+-/* I want some simple types */
+-typedef unsigned char			byte;
+-typedef unsigned short			word;
+-typedef unsigned long int		dword;
+-
+-/*---------------------------------------------------------------
+- *
+- * A description of the SMC registers is probably in order here,
+- * although for details, the SMC datasheet is invaluable.
+- *
+- * Basically, the chip has 4 banks of registers ( 0 to 3 ), which
+- * are accessed by writing a number into the BANK_SELECT register
+- * ( I also use a SMC_SELECT_BANK macro for this ).
+- *
+- * The banks are configured so that for most purposes, bank 2 is all
+- * that is needed for simple run time tasks.
+- * ----------------------------------------------------------------------*/
+-
+-/*
+- * Bank Select Register:
+- *
+- *		yyyy yyyy 0000 00xx
+- *		xx		= bank number
+- *		yyyy yyyy	= 0x33, for identification purposes.
+- */
+-#define	BANK_SELECT		14
+-
+-/* BANK 0  */
+-
+-#define	TCR		0	/* transmit control register */
+-#define TCR_ENABLE	0x0001	/* if this is 1, we can transmit */
+-#define TCR_FDUPLX	0x0800	/* receive packets sent out */
+-#define TCR_STP_SQET	0x1000	/* stop transmitting if Signal quality error */
+-#define	TCR_MON_CNS	0x0400	/* monitors the carrier status */
+-#define	TCR_PAD_ENABLE	0x0080	/* pads short packets to 64 bytes */
+-
+-#define	TCR_CLEAR	0	/* do NOTHING */
+-/* the normal settings for the TCR register : */
+-#define	TCR_NORMAL	(TCR_ENABLE | TCR_PAD_ENABLE)
+-
+-
+-#define EPH_STATUS	2
+-#define ES_LINK_OK	0x4000	/* is the link integrity ok ? */
+-
+-#define	RCR		4
+-#define RCR_SOFTRESET	0x8000	/* resets the chip */
+-#define	RCR_STRIP_CRC	0x200	/* strips CRC */
+-#define RCR_ENABLE	0x100	/* IFF this is set, we can receive packets */
+-#define RCR_ALMUL	0x4	/* receive all multicast packets */
+-#define	RCR_PROMISC	0x2	/* enable promiscuous mode */
+-
+-/* the normal settings for the RCR register : */
+-#define	RCR_NORMAL	(RCR_STRIP_CRC | RCR_ENABLE)
+-#define RCR_CLEAR	0x0		/* set it to a base state */
+-
+-#define	COUNTER		6
+-#define	MIR		8
+-#define	MCR		10
+-/* 12 is reserved */
+-
+-/* BANK 1 */
+-#define CONFIG			0
+-#define CFG_AUI_SELECT		0x100
+-#define	BASE			2
+-#define	ADDR0			4
+-#define	ADDR1			6
+-#define	ADDR2			8
+-#define	GENERAL			10
+-#define	CONTROL			12
+-#define	CTL_POWERDOWN		0x2000
+-#define	CTL_LE_ENABLE		0x80
+-#define	CTL_CR_ENABLE		0x40
+-#define	CTL_TE_ENABLE		0x0020
+-#define CTL_AUTO_RELEASE	0x0800
+-#define	CTL_EPROM_ACCESS	0x0003 /* high if Eprom is being read */
+-
+-/* BANK 2 */
+-#define MMU_CMD		0
+-#define MC_BUSY		1	/* only readable bit in the register */
+-#define MC_NOP		0
+-#define	MC_ALLOC	0x20	/* or with number of 256 byte packets */
+-#define	MC_RESET	0x40
+-#define	MC_REMOVE	0x60	/* remove the current rx packet */
+-#define MC_RELEASE	0x80	/* remove and release the current rx packet */
+-#define MC_FREEPKT	0xA0	/* Release packet in PNR register */
+-#define MC_ENQUEUE	0xC0	/* Enqueue the packet for transmit */
+-
+-#define	PNR_ARR		2
+-#define FIFO_PORTS	4
+-
+-#define FP_RXEMPTY	0x8000
+-#define FP_TXEMPTY	0x80
+-
+-#define	POINTER		6
+-#define PTR_READ	0x2000
+-#define	PTR_RCV		0x8000
+-#define	PTR_AUTOINC	0x4000
+-#define PTR_AUTO_INC	0x0040
+-
+-#define	DATA_1		8
+-#define	DATA_2		10
+-#define	INTERRUPT	12
+-
+-#define INT_MASK	13
+-#define IM_RCV_INT	0x1
+-#define	IM_TX_INT	0x2
+-#define	IM_TX_EMPTY_INT	0x4
+-#define	IM_ALLOC_INT	0x8
+-#define	IM_RX_OVRN_INT	0x10
+-#define	IM_EPH_INT	0x20
+-#define	IM_ERCV_INT	0x40 /* not on SMC9192 */
+-
+-/* BANK 3 */
+-#define	MULTICAST1	0
+-#define	MULTICAST2	2
+-#define	MULTICAST3	4
+-#define	MULTICAST4	6
+-#define	MGMT		8
+-#define	REVISION	10 /* ( hi: chip id   low: rev # ) */
+-
+-
+-/* this is NOT on SMC9192 */
+-#define	ERCV		12
+-
+-/* Note that 9194 and 9196 have the smame chip id,
+- * the 9196 will have revisions starting at 6 */
+-#define CHIP_9190	3
+-#define CHIP_9194	4
+-#define CHIP_9195	5
+-#define CHIP_9196	4
+-#define CHIP_91100	7
+-#define CHIP_91100FD	8
+-
+-#define REV_9196	6
+-
+-/*
+- * Transmit status bits
+- */
+-#define TS_SUCCESS	0x0001
+-#define TS_LOSTCAR	0x0400
+-#define TS_LATCOL	0x0200
+-#define TS_16COL	0x0010
+-
+-/*
+- * Receive status bits
+- */
+-#define RS_ALGNERR	0x8000
+-#define RS_BADCRC	0x2000
+-#define RS_ODDFRAME	0x1000
+-#define RS_TOOLONG	0x0800
+-#define RS_TOOSHORT	0x0400
+-#define RS_MULTICAST	0x0001
+-#define RS_ERRORS	(RS_ALGNERR | RS_BADCRC | RS_TOOLONG | RS_TOOSHORT)
+-
+-
+-/*-------------------------------------------------------------------------
+- *  I define some macros to make it easier to do somewhat common
+- * or slightly complicated, repeated tasks.
+- --------------------------------------------------------------------------*/
+-
+-/* select a register bank, 0 to 3  */
+-
+-#define SMC_SELECT_BANK(x, y) { _outw( y, x + BANK_SELECT ); }
+-
+-/* define a small delay for the reset */
+-#define SMC_DELAY(x) { inw( x + RCR );\
+-			inw( x + RCR );\
+-			inw( x + RCR ); }
+-
+-
+-#endif	/* _SMC_9000_H_ */
+-
+diff -Naur grub-0.97.orig/netboot/stdint.h grub-0.97/netboot/stdint.h
+--- grub-0.97.orig/netboot/stdint.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/stdint.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,18 @@
++#ifndef STDINT_H
++#define STDINT_H
++/* 
++ * I'm architecture depended. Check me before port GRUB
++ */
++typedef unsigned           size_t;
++
++typedef unsigned char      uint8_t;
++typedef unsigned short     uint16_t;
++typedef unsigned long      uint32_t;
++typedef unsigned long long uint64_t;
++
++typedef signed char        int8_t;
++typedef signed short       int16_t;
++typedef signed long        int32_t;
++typedef signed long long   int64_t;
++
++#endif /* STDINT_H */
+diff -Naur grub-0.97.orig/netboot/tftp.h grub-0.97/netboot/tftp.h
+--- grub-0.97.orig/netboot/tftp.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/tftp.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,82 @@
++#ifndef	_TFTP_H
++#define	_TFTP_H
++
++#include "if_ether.h"
++#include "ip.h"
++#include "udp.h"
++
++#ifndef	MAX_TFTP_RETRIES
++#define MAX_TFTP_RETRIES	20
++#endif
++
++/* These settings have sense only if compiled with -DCONGESTED */
++/* total retransmission timeout in ticks */
++#define TFTP_TIMEOUT		(30*TICKS_PER_SEC)
++/* packet retransmission timeout in ticks */
++#define TFTP_REXMT		(3*TICKS_PER_SEC)
++
++#define TFTP_PORT	69
++#define	TFTP_DEFAULTSIZE_PACKET	512
++#define	TFTP_MAX_PACKET		1432 /* 512 */
++
++#define TFTP_RRQ	1
++#define TFTP_WRQ	2
++#define TFTP_DATA	3
++#define TFTP_ACK	4
++#define TFTP_ERROR	5
++#define TFTP_OACK	6
++
++#define TFTP_CODE_EOF	1
++#define TFTP_CODE_MORE	2
++#define TFTP_CODE_ERROR	3
++#define TFTP_CODE_BOOT	4
++#define TFTP_CODE_CFG	5
++
++struct tftp_t {
++	struct iphdr ip;
++	struct udphdr udp;
++	uint16_t opcode;
++	union {
++		uint8_t rrq[TFTP_DEFAULTSIZE_PACKET];
++		struct {
++			uint16_t block;
++			uint8_t  download[TFTP_MAX_PACKET];
++		} data;
++		struct {
++			uint16_t block;
++		} ack;
++		struct {
++			uint16_t errcode;
++			uint8_t  errmsg[TFTP_DEFAULTSIZE_PACKET];
++		} err;
++		struct {
++			uint8_t  data[TFTP_DEFAULTSIZE_PACKET+2];
++		} oack;
++	} u;
++};
++
++/* define a smaller tftp packet solely for making requests to conserve stack
++   512 bytes should be enough */
++struct tftpreq_t {
++	struct iphdr ip;
++	struct udphdr udp;
++	uint16_t opcode;
++	union {
++		uint8_t rrq[512];
++		struct {
++			uint16_t block;
++		} ack;
++		struct {
++			uint16_t errcode;
++			uint8_t  errmsg[512-2];
++		} err;
++	} u;
++};
++
++#define TFTP_MIN_PACKET	(sizeof(struct iphdr) + sizeof(struct udphdr) + 4)
++
++typedef int (*read_actor_t)(unsigned char *, unsigned int, unsigned int, int);
++
++int tftp_file_read(const char *name, read_actor_t);
++
++#endif	/* _TFTP_H */
+diff -Naur grub-0.97.orig/netboot/tg3.c grub-0.97/netboot/tg3.c
+--- grub-0.97.orig/netboot/tg3.c	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/tg3.c	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,3322 @@
++/* $Id: grub-0.95-diskless-patch-2.patch,v 1.1.1.1 2005/06/14 08:18:50 wesolows Exp $
++ * tg3.c: Broadcom Tigon3 ethernet driver.
++ *
++ * Copyright (C) 2001, 2002 David S. Miller (davem@redhat.com)
++ * Copyright (C) 2001, 2002 Jeff Garzik (jgarzik@mandrakesoft.com)
++ * Copyright (C) 2003 Eric Biederman (ebiederman@lnxi.com)  [etherboot port]
++ */
++
++/* 11-13-2003	timlegge	Fix Issue with NetGear GA302T 
++ * 11-18-2003   ebiederm        Generalize NetGear Fix to what the code was supposed to be.
++ */
++
++#include "etherboot.h"
++#include "nic.h"
++#include "pci.h"
++#include "timer.h"
++/*#include "string.h"*/
++#include "tg3.h"
++
++#define SUPPORT_COPPER_PHY  1
++#define SUPPORT_FIBER_PHY   1
++#define SUPPORT_LINK_REPORT 1
++#define SUPPORT_PARTNO_STR  1
++#define SUPPORT_PHY_STR     1
++
++struct tg3 tg3;
++
++/* Dummy defines for error handling */
++#define EBUSY  1
++#define ENODEV 2
++#define EINVAL 3
++#define ENOMEM 4
++
++
++/* These numbers seem to be hard coded in the NIC firmware somehow.
++ * You can't change the ring sizes, but you can change where you place
++ * them in the NIC onboard memory.
++ */
++#define TG3_RX_RING_SIZE		512
++#define TG3_DEF_RX_RING_PENDING		20	/* RX_RING_PENDING seems to be o.k. at 20 and 200 */
++#define TG3_RX_RCB_RING_SIZE	1024
++
++/*	(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ? \
++	 512 : 1024) */
++ #define TG3_TX_RING_SIZE		512
++#define TG3_DEF_TX_RING_PENDING		(TG3_TX_RING_SIZE - 1)
++
++#define TG3_RX_RING_BYTES	(sizeof(struct tg3_rx_buffer_desc) * TG3_RX_RING_SIZE)
++#define TG3_RX_RCB_RING_BYTES	(sizeof(struct tg3_rx_buffer_desc) * TG3_RX_RCB_RING_SIZE)
++
++#define TG3_TX_RING_BYTES	(sizeof(struct tg3_tx_buffer_desc) * TG3_TX_RING_SIZE)
++#define NEXT_TX(N)		(((N) + 1) & (TG3_TX_RING_SIZE - 1))
++#define PREV_TX(N)		(((N) - 1) & (TG3_TX_RING_SIZE - 1))
++
++#define RX_PKT_BUF_SZ		(1536 + 2 + 64)
++
++
++static struct bss {
++	struct tg3_rx_buffer_desc rx_std[TG3_RX_RING_SIZE];
++	struct tg3_rx_buffer_desc rx_rcb[TG3_RX_RCB_RING_SIZE];
++	struct tg3_tx_buffer_desc tx_ring[TG3_TX_RING_SIZE];
++	struct tg3_hw_status      hw_status;
++	struct tg3_hw_stats       hw_stats;
++	unsigned char             rx_bufs[TG3_DEF_RX_RING_PENDING][RX_PKT_BUF_SZ];
++} tg3_bss;
++
++/**
++ * pci_save_state - save the PCI configuration space of a device before suspending
++ * @dev: - PCI device that we're dealing with
++ * @buffer: - buffer to hold config space context
++ *
++ * @buffer must be large enough to hold the entire PCI 2.2 config space 
++ * (>= 64 bytes).
++ */
++static int pci_save_state(struct pci_device *dev, uint32_t *buffer)
++{
++	int i;
++	for (i = 0; i < 16; i++)
++		pci_read_config_dword(dev, i * 4,&buffer[i]);
++	return 0;
++}
++
++/** 
++ * pci_restore_state - Restore the saved state of a PCI device
++ * @dev: - PCI device that we're dealing with
++ * @buffer: - saved PCI config space
++ *
++ */
++static int pci_restore_state(struct pci_device *dev, uint32_t *buffer)
++{
++	int i;
++
++	for (i = 0; i < 16; i++)
++		pci_write_config_dword(dev,i * 4, buffer[i]);
++	return 0;
++}
++
++static void tg3_write_indirect_reg32(uint32_t off, uint32_t val)
++{
++	pci_write_config_dword(tg3.pdev, TG3PCI_REG_BASE_ADDR, off);
++	pci_write_config_dword(tg3.pdev, TG3PCI_REG_DATA, val);
++}
++
++#define tw32(reg,val)		tg3_write_indirect_reg32((reg),(val))
++#define tw32_mailbox(reg, val)	writel(((val) & 0xffffffff), tg3.regs + (reg))
++#define tw16(reg,val)		writew(((val) & 0xffff), tg3.regs + (reg))
++#define tw8(reg,val)		writeb(((val) & 0xff), tg3.regs + (reg))
++#define tr32(reg)		readl(tg3.regs + (reg))
++#define tr16(reg)		readw(tg3.regs + (reg))
++#define tr8(reg)		readb(tg3.regs + (reg))
++
++static void tw32_carefully(uint32_t reg, uint32_t val)
++{
++	tw32(reg, val);
++	tr32(reg);
++	udelay(100);
++}
++
++static void tw32_mailbox2(uint32_t reg, uint32_t val)
++{
++	tw32_mailbox(reg, val);
++	tr32(reg);
++}
++
++static void tg3_write_mem(uint32_t off, uint32_t val)
++{
++	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
++	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_DATA, val);
++
++	/* Always leave this as zero. */
++	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
++}
++
++static void tg3_read_mem(uint32_t off, uint32_t *val)
++{
++	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
++	pci_read_config_dword(tg3.pdev, TG3PCI_MEM_WIN_DATA, val);
++
++	/* Always leave this as zero. */
++	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
++}
++
++static void tg3_disable_ints(struct tg3 *tp)
++{
++	tw32(TG3PCI_MISC_HOST_CTRL,
++	     (tp->misc_host_ctrl | MISC_HOST_CTRL_MASK_PCI_INT));
++	tw32_mailbox2(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
++}
++
++static void tg3_switch_clocks(struct tg3 *tp)
++{
++	uint32_t orig_clock_ctrl, clock_ctrl;
++
++	clock_ctrl = tr32(TG3PCI_CLOCK_CTRL);
++
++	orig_clock_ctrl = clock_ctrl;
++	clock_ctrl &= (CLOCK_CTRL_FORCE_CLKRUN | CLOCK_CTRL_CLKRUN_OENABLE | 0x1f);
++	tp->pci_clock_ctrl = clock_ctrl;
++	
++	if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) &&
++		(orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE)!=0) {
++		tw32_carefully(TG3PCI_CLOCK_CTRL, 
++			clock_ctrl | (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK));
++		tw32_carefully(TG3PCI_CLOCK_CTRL, 
++			clock_ctrl | (CLOCK_CTRL_ALTCLK));
++	}
++	tw32_carefully(TG3PCI_CLOCK_CTRL, clock_ctrl);
++}
++
++#define PHY_BUSY_LOOPS	5000
++
++static int tg3_readphy(struct tg3 *tp, int reg, uint32_t *val)
++{
++	uint32_t frame_val;
++	int loops, ret;
++
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode & ~MAC_MI_MODE_AUTO_POLL);
++
++	*val = 0xffffffff;
++
++	frame_val  = ((PHY_ADDR << MI_COM_PHY_ADDR_SHIFT) &
++		      MI_COM_PHY_ADDR_MASK);
++	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
++		      MI_COM_REG_ADDR_MASK);
++	frame_val |= (MI_COM_CMD_READ | MI_COM_START);
++	
++	tw32_carefully(MAC_MI_COM, frame_val);
++
++	loops = PHY_BUSY_LOOPS;
++	while (loops-- > 0) {
++		udelay(10);
++		frame_val = tr32(MAC_MI_COM);
++
++		if ((frame_val & MI_COM_BUSY) == 0) {
++			udelay(5);
++			frame_val = tr32(MAC_MI_COM);
++			break;
++		}
++	}
++
++	ret = -EBUSY;
++	if (loops > 0) {
++		*val = frame_val & MI_COM_DATA_MASK;
++		ret = 0;
++	}
++
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
++
++	return ret;
++}
++
++static int tg3_writephy(struct tg3 *tp, int reg, uint32_t val)
++{
++	uint32_t frame_val;
++	int loops, ret;
++
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode & ~MAC_MI_MODE_AUTO_POLL);
++
++	frame_val  = ((PHY_ADDR << MI_COM_PHY_ADDR_SHIFT) &
++		      MI_COM_PHY_ADDR_MASK);
++	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
++		      MI_COM_REG_ADDR_MASK);
++	frame_val |= (val & MI_COM_DATA_MASK);
++	frame_val |= (MI_COM_CMD_WRITE | MI_COM_START);
++	
++	tw32_carefully(MAC_MI_COM, frame_val);
++
++	loops = PHY_BUSY_LOOPS;
++	while (loops-- > 0) {
++		udelay(10);
++		frame_val = tr32(MAC_MI_COM);
++		if ((frame_val & MI_COM_BUSY) == 0) {
++			udelay(5);
++			frame_val = tr32(MAC_MI_COM);
++			break;
++		}
++	}
++
++	ret = -EBUSY;
++	if (loops > 0)
++		ret = 0;
++
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
++
++	return ret;
++}
++
++static int tg3_writedsp(struct tg3 *tp, uint16_t addr, uint16_t val)
++{
++	int err;
++	err  = tg3_writephy(tp, MII_TG3_DSP_ADDRESS, addr);
++	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
++	return err;
++}
++
++
++static void tg3_phy_set_wirespeed(struct tg3 *tp)
++{
++	uint32_t val;
++
++	if (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED)
++		return;
++
++	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x7007);
++	tg3_readphy(tp, MII_TG3_AUX_CTRL, &val);
++	tg3_writephy(tp, MII_TG3_AUX_CTRL, (val | (1 << 15) | (1 << 4)));
++}
++
++static int tg3_bmcr_reset(struct tg3 *tp)
++{
++	uint32_t phy_control;
++	int limit, err;
++
++	/* OK, reset it, and poll the BMCR_RESET bit until it
++	 * clears or we time out.
++	 */
++	phy_control = BMCR_RESET;
++	err = tg3_writephy(tp, MII_BMCR, phy_control);
++	if (err != 0)
++		return -EBUSY;
++
++	limit = 5000;
++	while (limit--) {
++		err = tg3_readphy(tp, MII_BMCR, &phy_control);
++		if (err != 0)
++			return -EBUSY;
++
++		if ((phy_control & BMCR_RESET) == 0) {
++			udelay(40);
++			break;
++		}
++		udelay(10);
++	}
++	if (limit <= 0)
++		return -EBUSY;
++
++	return 0;
++}
++
++static int tg3_wait_macro_done(struct tg3 *tp)
++{
++	int limit = 100;
++
++	while (limit--) {
++		uint32_t tmp32;
++
++		tg3_readphy(tp, 0x16, &tmp32);
++		if ((tmp32 & 0x1000) == 0)
++			break;
++	}
++	if (limit <= 0)
++		return -EBUSY;
++
++	return 0;
++}
++
++static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp)
++{
++	static const uint32_t test_pat[4][6] = {
++	{ 0x00005555, 0x00000005, 0x00002aaa, 0x0000000a, 0x00003456, 0x00000003 },
++	{ 0x00002aaa, 0x0000000a, 0x00003333, 0x00000003, 0x0000789a, 0x00000005 },
++	{ 0x00005a5a, 0x00000005, 0x00002a6a, 0x0000000a, 0x00001bcd, 0x00000003 },
++	{ 0x00002a5a, 0x0000000a, 0x000033c3, 0x00000003, 0x00002ef1, 0x00000005 }
++	};
++	int chan;
++
++	for (chan = 0; chan < 4; chan++) {
++		int i;
++
++		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
++			(chan * 0x2000) | 0x0200);
++		tg3_writephy(tp, 0x16, 0x0002);
++
++		for (i = 0; i < 6; i++)
++			tg3_writephy(tp, MII_TG3_DSP_RW_PORT,
++				test_pat[chan][i]);
++
++		tg3_writephy(tp, 0x16, 0x0202);
++		if (tg3_wait_macro_done(tp)) {
++			*resetp = 1;
++			return -EBUSY;
++		}
++
++		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
++			     (chan * 0x2000) | 0x0200);
++		tg3_writephy(tp, 0x16, 0x0082);
++		if (tg3_wait_macro_done(tp)) {
++			*resetp = 1;
++			return -EBUSY;
++		}
++
++		tg3_writephy(tp, 0x16, 0x0802);
++		if (tg3_wait_macro_done(tp)) {
++			*resetp = 1;
++			return -EBUSY;
++		}
++
++		for (i = 0; i < 6; i += 2) {
++			uint32_t low, high;
++
++			tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &low);
++			tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &high);
++			if (tg3_wait_macro_done(tp)) {
++				*resetp = 1;
++				return -EBUSY;
++			}
++			low &= 0x7fff;
++			high &= 0x000f;
++			if (low != test_pat[chan][i] ||
++			    high != test_pat[chan][i+1]) {
++				tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000b);
++				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x4001);
++				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x4005);
++
++				return -EBUSY;
++			}
++		}
++	}
++
++	return 0;
++}
++
++static int tg3_phy_reset_chanpat(struct tg3 *tp)
++{
++	int chan;
++
++	for (chan = 0; chan < 4; chan++) {
++		int i;
++
++		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
++			     (chan * 0x2000) | 0x0200);
++		tg3_writephy(tp, 0x16, 0x0002);
++		for (i = 0; i < 6; i++)
++			tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x000);
++		tg3_writephy(tp, 0x16, 0x0202);
++		if (tg3_wait_macro_done(tp))
++			return -EBUSY;
++	}
++
++	return 0;
++}
++
++static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
++{
++	uint32_t reg32, phy9_orig;
++	int retries, do_phy_reset, err;
++
++	retries = 10;
++	do_phy_reset = 1;
++	do {
++		if (do_phy_reset) {
++			err = tg3_bmcr_reset(tp);
++			if (err)
++				return err;
++			do_phy_reset = 0;
++		}
++		
++		/* Disable transmitter and interrupt.  */
++		tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
++		reg32 |= 0x3000;
++		tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
++
++		/* Set full-duplex, 1000 mbps.  */
++		tg3_writephy(tp, MII_BMCR,
++			BMCR_FULLDPLX | TG3_BMCR_SPEED1000);
++
++		/* Set to master mode.  */
++		tg3_readphy(tp, MII_TG3_CTRL, &phy9_orig);
++		tg3_writephy(tp, MII_TG3_CTRL,
++			(MII_TG3_CTRL_AS_MASTER |
++				MII_TG3_CTRL_ENABLE_AS_MASTER));
++
++		/* Enable SM_DSP_CLOCK and 6dB.  */
++		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
++
++		/* Block the PHY control access.  */
++		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
++		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0800);
++
++		err = tg3_phy_write_and_check_testpat(tp, &do_phy_reset);
++		if (!err)
++			break;
++	} while (--retries);
++
++	err = tg3_phy_reset_chanpat(tp);
++	if (err)
++		return err;
++
++	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
++	tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0000);
++
++	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);
++	tg3_writephy(tp, 0x16, 0x0000);
++
++	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
++
++	tg3_writephy(tp, MII_TG3_CTRL, phy9_orig);
++
++	tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
++	reg32 &= ~0x3000;
++	tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
++
++	return err;
++}
++
++/* This will reset the tigon3 PHY if there is no valid
++ * link.
++ */
++static int tg3_phy_reset(struct tg3 *tp)
++{
++	uint32_t phy_status;
++	int err;
++
++	err  = tg3_readphy(tp, MII_BMSR, &phy_status);
++	err |= tg3_readphy(tp, MII_BMSR, &phy_status);
++	if (err != 0)
++		return -EBUSY;
++
++	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
++		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
++		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) {
++		err = tg3_phy_reset_5703_4_5(tp);
++		if (err)
++			return err;
++		goto out;
++	}
++	err = tg3_bmcr_reset(tp);
++	if (err)
++		return err;
++ out:
++	tg3_phy_set_wirespeed(tp);
++	return 0;
++}
++
++static void tg3_set_power_state_0(struct tg3 *tp)
++{
++	uint16_t power_control;
++	int pm = tp->pm_cap;
++
++	/* Make sure register accesses (indirect or otherwise)
++	 * will function correctly.
++	 */
++	pci_write_config_dword(tp->pdev,  TG3PCI_MISC_HOST_CTRL, tp->misc_host_ctrl);
++
++	pci_read_config_word(tp->pdev, pm + PCI_PM_CTRL, &power_control);
++
++	power_control |= PCI_PM_CTRL_PME_STATUS;
++	power_control &= ~(PCI_PM_CTRL_STATE_MASK);
++	power_control |= 0;
++	pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, power_control);
++
++	tw32_carefully(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
++
++	return;
++}
++
++
++#if SUPPORT_LINK_REPORT
++static void tg3_link_report(struct tg3 *tp)
++{
++	if (!tp->carrier_ok) {
++		printf("Link is down.\n");
++	} else {
++		printf("Link is up at %d Mbps, %s duplex. %s %s %s\n",
++			(tp->link_config.active_speed == SPEED_1000 ?
++			       1000 :
++			(tp->link_config.active_speed == SPEED_100 ?
++				100 : 10)),
++			(tp->link_config.active_duplex == DUPLEX_FULL ?  
++				"full" : "half"),
++			(tp->tg3_flags & TG3_FLAG_TX_PAUSE) ? "TX" : "",
++			(tp->tg3_flags & TG3_FLAG_RX_PAUSE) ? "RX" : "",
++			(tp->tg3_flags & (TG3_FLAG_TX_PAUSE |TG3_FLAG_RX_PAUSE)) ? "flow control" : "");
++	}
++}
++#else
++#define tg3_link_report(tp)
++#endif
++
++static void tg3_setup_flow_control(struct tg3 *tp, uint32_t local_adv, uint32_t remote_adv)
++{
++	uint32_t new_tg3_flags = 0;
++
++	if (local_adv & ADVERTISE_PAUSE_CAP) {
++		if (local_adv & ADVERTISE_PAUSE_ASYM) {
++			if (remote_adv & LPA_PAUSE_CAP)
++				new_tg3_flags |=
++					(TG3_FLAG_RX_PAUSE |
++					 TG3_FLAG_TX_PAUSE);
++			else if (remote_adv & LPA_PAUSE_ASYM)
++				new_tg3_flags |=
++					(TG3_FLAG_RX_PAUSE);
++		} else {
++			if (remote_adv & LPA_PAUSE_CAP)
++				new_tg3_flags |=
++					(TG3_FLAG_RX_PAUSE |
++					 TG3_FLAG_TX_PAUSE);
++		}
++	} else if (local_adv & ADVERTISE_PAUSE_ASYM) {
++		if ((remote_adv & LPA_PAUSE_CAP) &&
++		    (remote_adv & LPA_PAUSE_ASYM))
++			new_tg3_flags |= TG3_FLAG_TX_PAUSE;
++	}
++
++	tp->tg3_flags &= ~(TG3_FLAG_RX_PAUSE | TG3_FLAG_TX_PAUSE);
++	tp->tg3_flags |= new_tg3_flags;
++
++	if (new_tg3_flags & TG3_FLAG_RX_PAUSE)
++		tp->rx_mode |= RX_MODE_FLOW_CTRL_ENABLE;
++	else
++		tp->rx_mode &= ~RX_MODE_FLOW_CTRL_ENABLE;
++
++	if (new_tg3_flags & TG3_FLAG_TX_PAUSE)
++		tp->tx_mode |= TX_MODE_FLOW_CTRL_ENABLE;
++	else
++		tp->tx_mode &= ~TX_MODE_FLOW_CTRL_ENABLE;
++}
++
++#if SUPPORT_COPPER_PHY
++static void tg3_aux_stat_to_speed_duplex(
++	struct tg3 *tp __unused, uint32_t val, uint8_t *speed, uint8_t *duplex)
++{
++	static const uint8_t map[] = {
++		[0] = (SPEED_INVALID << 2) | DUPLEX_INVALID,
++		[MII_TG3_AUX_STAT_10HALF >> 8]   = (SPEED_10 << 2) | DUPLEX_HALF,
++		[MII_TG3_AUX_STAT_10FULL >> 8]   = (SPEED_10 << 2) | DUPLEX_FULL,
++		[MII_TG3_AUX_STAT_100HALF >> 8]  = (SPEED_100 << 2) | DUPLEX_HALF,
++		[MII_TG3_AUX_STAT_100_4 >> 8] = (SPEED_INVALID << 2) | DUPLEX_INVALID,
++		[MII_TG3_AUX_STAT_100FULL >> 8]  = (SPEED_100 << 2) | DUPLEX_FULL,
++		[MII_TG3_AUX_STAT_1000HALF >> 8] = (SPEED_1000 << 2) | DUPLEX_HALF,
++		[MII_TG3_AUX_STAT_1000FULL >> 8] = (SPEED_1000 << 2) | DUPLEX_FULL,
++	};
++	uint8_t result;
++	result = map[(val & MII_TG3_AUX_STAT_SPDMASK) >> 8];
++	*speed = result >> 2;
++	*duplex = result & 3;
++}
++
++static int tg3_phy_copper_begin(struct tg3 *tp)
++{
++	uint32_t new_adv;
++
++	tp->link_config.advertising =
++		(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
++			ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
++			ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
++			ADVERTISED_Autoneg | ADVERTISED_MII);
++	
++	if (tp->tg3_flags & TG3_FLAG_10_100_ONLY) {
++		tp->link_config.advertising &=
++			~(ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full);
++	}
++	
++	new_adv = (ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
++	if (tp->link_config.advertising & ADVERTISED_10baseT_Half) {
++		new_adv |= ADVERTISE_10HALF;
++	}
++	if (tp->link_config.advertising & ADVERTISED_10baseT_Full) {
++		new_adv |= ADVERTISE_10FULL;
++	}
++	if (tp->link_config.advertising & ADVERTISED_100baseT_Half) {
++		new_adv |= ADVERTISE_100HALF;
++	}
++	if (tp->link_config.advertising & ADVERTISED_100baseT_Full) {
++		new_adv |= ADVERTISE_100FULL;
++	}
++	tg3_writephy(tp, MII_ADVERTISE, new_adv);
++	
++	if (tp->link_config.advertising &
++		(ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full)) {
++		new_adv = 0;
++		if (tp->link_config.advertising & ADVERTISED_1000baseT_Half) {
++			new_adv |= MII_TG3_CTRL_ADV_1000_HALF;
++		}
++		if (tp->link_config.advertising & ADVERTISED_1000baseT_Full) {
++			new_adv |= MII_TG3_CTRL_ADV_1000_FULL;
++		}
++		if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY) &&
++			(tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
++				tp->pci_chip_rev_id == CHIPREV_ID_5701_B0)) {
++			new_adv |= (MII_TG3_CTRL_AS_MASTER |
++				MII_TG3_CTRL_ENABLE_AS_MASTER);
++		}
++		tg3_writephy(tp, MII_TG3_CTRL, new_adv);
++	} else {
++		tg3_writephy(tp, MII_TG3_CTRL, 0);
++	}
++
++	tg3_writephy(tp, MII_BMCR, BMCR_ANENABLE | BMCR_ANRESTART);
++
++	return 0;
++}
++
++static int tg3_init_5401phy_dsp(struct tg3 *tp)
++{
++	int err;
++
++	/* Turn off tap power management. */
++	err  = tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c20);
++	
++	err |= tg3_writedsp(tp, 0x0012, 0x1804);
++	err |= tg3_writedsp(tp, 0x0013, 0x1204);
++	err |= tg3_writedsp(tp, 0x8006, 0x0132);
++	err |= tg3_writedsp(tp, 0x8006, 0x0232);
++	err |= tg3_writedsp(tp, 0x201f, 0x0a20);
++
++	udelay(40);
++
++	return err;
++}
++
++static int tg3_setup_copper_phy(struct tg3 *tp)
++{
++	int current_link_up;
++	uint32_t bmsr, dummy;
++	int i, err;
++
++	tw32_carefully(MAC_STATUS,
++		(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
++
++	tp->mi_mode = MAC_MI_MODE_BASE;
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
++
++	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x02);
++
++	/* Some third-party PHYs need to be reset on link going
++	 * down.
++	 */
++	if (	(	(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
++			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
++			(tp->pci_chip_rev_id == CHIPREV_ID_5705_A0)) &&
++		(tp->carrier_ok)) {
++		tg3_readphy(tp, MII_BMSR, &bmsr);
++		tg3_readphy(tp, MII_BMSR, &bmsr);
++		if (!(bmsr & BMSR_LSTATUS))
++			tg3_phy_reset(tp);
++	}
++
++	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
++		tg3_readphy(tp, MII_BMSR, &bmsr);
++		tg3_readphy(tp, MII_BMSR, &bmsr);
++
++		if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE))
++			bmsr = 0;
++
++		if (!(bmsr & BMSR_LSTATUS)) {
++			err = tg3_init_5401phy_dsp(tp);
++			if (err)
++				return err;
++
++			tg3_readphy(tp, MII_BMSR, &bmsr);
++			for (i = 0; i < 1000; i++) {
++				udelay(10);
++				tg3_readphy(tp, MII_BMSR, &bmsr);
++				if (bmsr & BMSR_LSTATUS) {
++					udelay(40);
++					break;
++				}
++			}
++
++			if ((tp->phy_id & PHY_ID_REV_MASK) == PHY_REV_BCM5401_B0 &&
++			    !(bmsr & BMSR_LSTATUS) &&
++			    tp->link_config.active_speed == SPEED_1000) {
++				err = tg3_phy_reset(tp);
++				if (!err)
++					err = tg3_init_5401phy_dsp(tp);
++				if (err)
++					return err;
++			}
++		}
++	} else if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
++		   tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) {
++		/* 5701 {A0,B0} CRC bug workaround */
++		tg3_writephy(tp, 0x15, 0x0a75);
++		tg3_writephy(tp, 0x1c, 0x8c68);
++		tg3_writephy(tp, 0x1c, 0x8d68);
++		tg3_writephy(tp, 0x1c, 0x8c68);
++	}
++
++	/* Clear pending interrupts... */
++	tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
++	tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
++
++	tg3_writephy(tp, MII_TG3_IMASK, ~0);
++
++	if (tp->led_mode == led_mode_three_link)
++		tg3_writephy(tp, MII_TG3_EXT_CTRL,
++			     MII_TG3_EXT_CTRL_LNK3_LED_MODE);
++	else
++		tg3_writephy(tp, MII_TG3_EXT_CTRL, 0);
++
++	current_link_up = 0;
++
++	tg3_readphy(tp, MII_BMSR, &bmsr);
++	tg3_readphy(tp, MII_BMSR, &bmsr);
++
++	if (bmsr & BMSR_LSTATUS) {
++		uint32_t aux_stat, bmcr;
++
++		tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
++		for (i = 0; i < 2000; i++) {
++			udelay(10);
++			tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
++			if (aux_stat)
++				break;
++		}
++
++		tg3_aux_stat_to_speed_duplex(tp, aux_stat,
++			&tp->link_config.active_speed,
++			&tp->link_config.active_duplex);
++		tg3_readphy(tp, MII_BMCR, &bmcr);
++		tg3_readphy(tp, MII_BMCR, &bmcr);
++		if (bmcr & BMCR_ANENABLE) {
++			uint32_t gig_ctrl;
++			
++			current_link_up = 1;
++			
++			/* Force autoneg restart if we are exiting
++			 * low power mode.
++			 */
++			tg3_readphy(tp, MII_TG3_CTRL, &gig_ctrl);
++			if (!(gig_ctrl & (MII_TG3_CTRL_ADV_1000_HALF |
++				      MII_TG3_CTRL_ADV_1000_FULL))) {
++				current_link_up = 0;
++			}
++		} else {
++			current_link_up = 0;
++		}
++	}
++
++	if (current_link_up == 1 &&
++		(tp->link_config.active_duplex == DUPLEX_FULL)) {
++		uint32_t local_adv, remote_adv;
++
++		tg3_readphy(tp, MII_ADVERTISE, &local_adv);
++		local_adv &= (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
++
++		tg3_readphy(tp, MII_LPA, &remote_adv);
++		remote_adv &= (LPA_PAUSE_CAP | LPA_PAUSE_ASYM);
++
++		/* If we are not advertising full pause capability,
++		 * something is wrong.  Bring the link down and reconfigure.
++		 */
++		if (local_adv != ADVERTISE_PAUSE_CAP) {
++			current_link_up = 0;
++		} else {
++			tg3_setup_flow_control(tp, local_adv, remote_adv);
++		}
++	}
++
++	if (current_link_up == 0) {
++		uint32_t tmp;
++
++		tg3_phy_copper_begin(tp);
++
++		tg3_readphy(tp, MII_BMSR, &tmp);
++		tg3_readphy(tp, MII_BMSR, &tmp);
++		if (tmp & BMSR_LSTATUS)
++			current_link_up = 1;
++	}
++
++	tp->mac_mode &= ~MAC_MODE_PORT_MODE_MASK;
++	if (current_link_up == 1) {
++		if (tp->link_config.active_speed == SPEED_100 ||
++		    tp->link_config.active_speed == SPEED_10)
++			tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
++		else
++			tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
++	} else
++		tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
++
++	tp->mac_mode &= ~MAC_MODE_HALF_DUPLEX;
++	if (tp->link_config.active_duplex == DUPLEX_HALF)
++		tp->mac_mode |= MAC_MODE_HALF_DUPLEX;
++
++	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) {
++		if ((tp->led_mode == led_mode_link10) ||
++		    (current_link_up == 1 &&
++		     tp->link_config.active_speed == SPEED_10))
++			tp->mac_mode |= MAC_MODE_LINK_POLARITY;
++	} else {
++		if (current_link_up == 1)
++			tp->mac_mode |= MAC_MODE_LINK_POLARITY;
++		tw32(MAC_LED_CTRL, LED_CTRL_PHY_MODE_1);
++	}
++
++	/* ??? Without this setting Netgear GA302T PHY does not
++	 * ??? send/receive packets...
++	 * With this other PHYs cannot bring up the link
++	 */
++	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5411 &&
++		tp->pci_chip_rev_id == CHIPREV_ID_5700_ALTIMA) {
++		tp->mi_mode |= MAC_MI_MODE_AUTO_POLL;
++		tw32_carefully(MAC_MI_MODE, tp->mi_mode);
++	}
++
++	tw32_carefully(MAC_MODE, tp->mac_mode);
++
++	/* Link change polled. */
++	tw32_carefully(MAC_EVENT, 0);
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 &&
++	    current_link_up == 1 &&
++	    tp->link_config.active_speed == SPEED_1000 &&
++	    ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ||
++	     (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED))) {
++		udelay(120);
++		tw32_carefully(MAC_STATUS,
++			(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
++		tg3_write_mem(
++			      NIC_SRAM_FIRMWARE_MBOX,
++			      NIC_SRAM_FIRMWARE_MBOX_MAGIC2);
++	}
++
++	if (current_link_up != tp->carrier_ok) {
++		tp->carrier_ok = current_link_up;
++		tg3_link_report(tp);
++	}
++
++	return 0;
++}
++#else
++#define tg3_setup_copper_phy(TP) (-EINVAL)
++#endif /* SUPPORT_COPPER_PHY */
++
++#if SUPPORT_FIBER_PHY
++struct tg3_fiber_aneginfo {
++	int state;
++#define ANEG_STATE_UNKNOWN		0
++#define ANEG_STATE_AN_ENABLE		1
++#define ANEG_STATE_RESTART_INIT		2
++#define ANEG_STATE_RESTART		3
++#define ANEG_STATE_DISABLE_LINK_OK	4
++#define ANEG_STATE_ABILITY_DETECT_INIT	5
++#define ANEG_STATE_ABILITY_DETECT	6
++#define ANEG_STATE_ACK_DETECT_INIT	7
++#define ANEG_STATE_ACK_DETECT		8
++#define ANEG_STATE_COMPLETE_ACK_INIT	9
++#define ANEG_STATE_COMPLETE_ACK		10
++#define ANEG_STATE_IDLE_DETECT_INIT	11
++#define ANEG_STATE_IDLE_DETECT		12
++#define ANEG_STATE_LINK_OK		13
++#define ANEG_STATE_NEXT_PAGE_WAIT_INIT	14
++#define ANEG_STATE_NEXT_PAGE_WAIT	15
++
++	uint32_t flags;
++#define MR_AN_ENABLE		0x00000001
++#define MR_RESTART_AN		0x00000002
++#define MR_AN_COMPLETE		0x00000004
++#define MR_PAGE_RX		0x00000008
++#define MR_NP_LOADED		0x00000010
++#define MR_TOGGLE_TX		0x00000020
++#define MR_LP_ADV_FULL_DUPLEX	0x00000040
++#define MR_LP_ADV_HALF_DUPLEX	0x00000080
++#define MR_LP_ADV_SYM_PAUSE	0x00000100
++#define MR_LP_ADV_ASYM_PAUSE	0x00000200
++#define MR_LP_ADV_REMOTE_FAULT1	0x00000400
++#define MR_LP_ADV_REMOTE_FAULT2	0x00000800
++#define MR_LP_ADV_NEXT_PAGE	0x00001000
++#define MR_TOGGLE_RX		0x00002000
++#define MR_NP_RX		0x00004000
++
++#define MR_LINK_OK		0x80000000
++
++	unsigned long link_time, cur_time;
++
++	uint32_t ability_match_cfg;
++	int ability_match_count;
++
++	char ability_match, idle_match, ack_match;
++
++	uint32_t txconfig, rxconfig;
++#define ANEG_CFG_NP		0x00000080
++#define ANEG_CFG_ACK		0x00000040
++#define ANEG_CFG_RF2		0x00000020
++#define ANEG_CFG_RF1		0x00000010
++#define ANEG_CFG_PS2		0x00000001
++#define ANEG_CFG_PS1		0x00008000
++#define ANEG_CFG_HD		0x00004000
++#define ANEG_CFG_FD		0x00002000
++#define ANEG_CFG_INVAL		0x00001f06
++
++};
++#define ANEG_OK		0
++#define ANEG_DONE	1
++#define ANEG_TIMER_ENAB	2
++#define ANEG_FAILED	-1
++
++#define ANEG_STATE_SETTLE_TIME	10000
++
++static int tg3_fiber_aneg_smachine(struct tg3 *tp,
++				   struct tg3_fiber_aneginfo *ap)
++{
++	unsigned long delta;
++	uint32_t rx_cfg_reg;
++	int ret;
++
++	if (ap->state == ANEG_STATE_UNKNOWN) {
++		ap->rxconfig = 0;
++		ap->link_time = 0;
++		ap->cur_time = 0;
++		ap->ability_match_cfg = 0;
++		ap->ability_match_count = 0;
++		ap->ability_match = 0;
++		ap->idle_match = 0;
++		ap->ack_match = 0;
++	}
++	ap->cur_time++;
++
++	if (tr32(MAC_STATUS) & MAC_STATUS_RCVD_CFG) {
++		rx_cfg_reg = tr32(MAC_RX_AUTO_NEG);
++
++		if (rx_cfg_reg != ap->ability_match_cfg) {
++			ap->ability_match_cfg = rx_cfg_reg;
++			ap->ability_match = 0;
++			ap->ability_match_count = 0;
++		} else {
++			if (++ap->ability_match_count > 1) {
++				ap->ability_match = 1;
++				ap->ability_match_cfg = rx_cfg_reg;
++			}
++		}
++		if (rx_cfg_reg & ANEG_CFG_ACK)
++			ap->ack_match = 1;
++		else
++			ap->ack_match = 0;
++
++		ap->idle_match = 0;
++	} else {
++		ap->idle_match = 1;
++		ap->ability_match_cfg = 0;
++		ap->ability_match_count = 0;
++		ap->ability_match = 0;
++		ap->ack_match = 0;
++
++		rx_cfg_reg = 0;
++	}
++
++	ap->rxconfig = rx_cfg_reg;
++	ret = ANEG_OK;
++
++	switch(ap->state) {
++	case ANEG_STATE_UNKNOWN:
++		if (ap->flags & (MR_AN_ENABLE | MR_RESTART_AN))
++			ap->state = ANEG_STATE_AN_ENABLE;
++
++		/* fallthru */
++	case ANEG_STATE_AN_ENABLE:
++		ap->flags &= ~(MR_AN_COMPLETE | MR_PAGE_RX);
++		if (ap->flags & MR_AN_ENABLE) {
++			ap->link_time = 0;
++			ap->cur_time = 0;
++			ap->ability_match_cfg = 0;
++			ap->ability_match_count = 0;
++			ap->ability_match = 0;
++			ap->idle_match = 0;
++			ap->ack_match = 0;
++
++			ap->state = ANEG_STATE_RESTART_INIT;
++		} else {
++			ap->state = ANEG_STATE_DISABLE_LINK_OK;
++		}
++		break;
++
++	case ANEG_STATE_RESTART_INIT:
++		ap->link_time = ap->cur_time;
++		ap->flags &= ~(MR_NP_LOADED);
++		ap->txconfig = 0;
++		tw32(MAC_TX_AUTO_NEG, 0);
++		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
++		tw32_carefully(MAC_MODE, tp->mac_mode);
++
++		ret = ANEG_TIMER_ENAB;
++		ap->state = ANEG_STATE_RESTART;
++
++		/* fallthru */
++	case ANEG_STATE_RESTART:
++		delta = ap->cur_time - ap->link_time;
++		if (delta > ANEG_STATE_SETTLE_TIME) {
++			ap->state = ANEG_STATE_ABILITY_DETECT_INIT;
++		} else {
++			ret = ANEG_TIMER_ENAB;
++		}
++		break;
++
++	case ANEG_STATE_DISABLE_LINK_OK:
++		ret = ANEG_DONE;
++		break;
++
++	case ANEG_STATE_ABILITY_DETECT_INIT:
++		ap->flags &= ~(MR_TOGGLE_TX);
++		ap->txconfig = (ANEG_CFG_FD | ANEG_CFG_PS1);
++		tw32(MAC_TX_AUTO_NEG, ap->txconfig);
++		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
++		tw32_carefully(MAC_MODE, tp->mac_mode);
++
++		ap->state = ANEG_STATE_ABILITY_DETECT;
++		break;
++
++	case ANEG_STATE_ABILITY_DETECT:
++		if (ap->ability_match != 0 && ap->rxconfig != 0) {
++			ap->state = ANEG_STATE_ACK_DETECT_INIT;
++		}
++		break;
++
++	case ANEG_STATE_ACK_DETECT_INIT:
++		ap->txconfig |= ANEG_CFG_ACK;
++		tw32(MAC_TX_AUTO_NEG, ap->txconfig);
++		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
++		tw32_carefully(MAC_MODE, tp->mac_mode);
++
++		ap->state = ANEG_STATE_ACK_DETECT;
++
++		/* fallthru */
++	case ANEG_STATE_ACK_DETECT:
++		if (ap->ack_match != 0) {
++			if ((ap->rxconfig & ~ANEG_CFG_ACK) ==
++			    (ap->ability_match_cfg & ~ANEG_CFG_ACK)) {
++				ap->state = ANEG_STATE_COMPLETE_ACK_INIT;
++			} else {
++				ap->state = ANEG_STATE_AN_ENABLE;
++			}
++		} else if (ap->ability_match != 0 &&
++			   ap->rxconfig == 0) {
++			ap->state = ANEG_STATE_AN_ENABLE;
++		}
++		break;
++
++	case ANEG_STATE_COMPLETE_ACK_INIT:
++		if (ap->rxconfig & ANEG_CFG_INVAL) {
++			ret = ANEG_FAILED;
++			break;
++		}
++		ap->flags &= ~(MR_LP_ADV_FULL_DUPLEX |
++			       MR_LP_ADV_HALF_DUPLEX |
++			       MR_LP_ADV_SYM_PAUSE |
++			       MR_LP_ADV_ASYM_PAUSE |
++			       MR_LP_ADV_REMOTE_FAULT1 |
++			       MR_LP_ADV_REMOTE_FAULT2 |
++			       MR_LP_ADV_NEXT_PAGE |
++			       MR_TOGGLE_RX |
++			       MR_NP_RX);
++		if (ap->rxconfig & ANEG_CFG_FD)
++			ap->flags |= MR_LP_ADV_FULL_DUPLEX;
++		if (ap->rxconfig & ANEG_CFG_HD)
++			ap->flags |= MR_LP_ADV_HALF_DUPLEX;
++		if (ap->rxconfig & ANEG_CFG_PS1)
++			ap->flags |= MR_LP_ADV_SYM_PAUSE;
++		if (ap->rxconfig & ANEG_CFG_PS2)
++			ap->flags |= MR_LP_ADV_ASYM_PAUSE;
++		if (ap->rxconfig & ANEG_CFG_RF1)
++			ap->flags |= MR_LP_ADV_REMOTE_FAULT1;
++		if (ap->rxconfig & ANEG_CFG_RF2)
++			ap->flags |= MR_LP_ADV_REMOTE_FAULT2;
++		if (ap->rxconfig & ANEG_CFG_NP)
++			ap->flags |= MR_LP_ADV_NEXT_PAGE;
++
++		ap->link_time = ap->cur_time;
++
++		ap->flags ^= (MR_TOGGLE_TX);
++		if (ap->rxconfig & 0x0008)
++			ap->flags |= MR_TOGGLE_RX;
++		if (ap->rxconfig & ANEG_CFG_NP)
++			ap->flags |= MR_NP_RX;
++		ap->flags |= MR_PAGE_RX;
++
++		ap->state = ANEG_STATE_COMPLETE_ACK;
++		ret = ANEG_TIMER_ENAB;
++		break;
++
++	case ANEG_STATE_COMPLETE_ACK:
++		if (ap->ability_match != 0 &&
++		    ap->rxconfig == 0) {
++			ap->state = ANEG_STATE_AN_ENABLE;
++			break;
++		}
++		delta = ap->cur_time - ap->link_time;
++		if (delta > ANEG_STATE_SETTLE_TIME) {
++			if (!(ap->flags & (MR_LP_ADV_NEXT_PAGE))) {
++				ap->state = ANEG_STATE_IDLE_DETECT_INIT;
++			} else {
++				if ((ap->txconfig & ANEG_CFG_NP) == 0 &&
++				    !(ap->flags & MR_NP_RX)) {
++					ap->state = ANEG_STATE_IDLE_DETECT_INIT;
++				} else {
++					ret = ANEG_FAILED;
++				}
++			}
++		}
++		break;
++
++	case ANEG_STATE_IDLE_DETECT_INIT:
++		ap->link_time = ap->cur_time;
++		tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
++		tw32_carefully(MAC_MODE, tp->mac_mode);
++
++		ap->state = ANEG_STATE_IDLE_DETECT;
++		ret = ANEG_TIMER_ENAB;
++		break;
++
++	case ANEG_STATE_IDLE_DETECT:
++		if (ap->ability_match != 0 &&
++		    ap->rxconfig == 0) {
++			ap->state = ANEG_STATE_AN_ENABLE;
++			break;
++		}
++		delta = ap->cur_time - ap->link_time;
++		if (delta > ANEG_STATE_SETTLE_TIME) {
++			/* XXX another gem from the Broadcom driver :( */
++			ap->state = ANEG_STATE_LINK_OK;
++		}
++		break;
++
++	case ANEG_STATE_LINK_OK:
++		ap->flags |= (MR_AN_COMPLETE | MR_LINK_OK);
++		ret = ANEG_DONE;
++		break;
++
++	case ANEG_STATE_NEXT_PAGE_WAIT_INIT:
++		/* ??? unimplemented */
++		break;
++
++	case ANEG_STATE_NEXT_PAGE_WAIT:
++		/* ??? unimplemented */
++		break;
++
++	default:
++		ret = ANEG_FAILED;
++		break;
++	};
++
++	return ret;
++}
++
++static int tg3_setup_fiber_phy(struct tg3 *tp)
++{
++	uint32_t orig_pause_cfg;
++	uint16_t orig_active_speed;
++	uint8_t orig_active_duplex;
++	int current_link_up;
++	int i;
++
++	orig_pause_cfg =
++		(tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
++				  TG3_FLAG_TX_PAUSE));
++	orig_active_speed = tp->link_config.active_speed;
++	orig_active_duplex = tp->link_config.active_duplex;
++
++	tp->mac_mode &= ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
++	tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;
++	tw32_carefully(MAC_MODE, tp->mac_mode);
++
++	/* Reset when initting first time or we have a link. */
++	if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) ||
++	    (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED)) {
++		/* Set PLL lock range. */
++		tg3_writephy(tp, 0x16, 0x8007);
++
++		/* SW reset */
++		tg3_writephy(tp, MII_BMCR, BMCR_RESET);
++
++		/* Wait for reset to complete. */
++		mdelay(5);
++
++		/* Config mode; select PMA/Ch 1 regs. */
++		tg3_writephy(tp, 0x10, 0x8411);
++
++		/* Enable auto-lock and comdet, select txclk for tx. */
++		tg3_writephy(tp, 0x11, 0x0a10);
++
++		tg3_writephy(tp, 0x18, 0x00a0);
++		tg3_writephy(tp, 0x16, 0x41ff);
++
++		/* Assert and deassert POR. */
++		tg3_writephy(tp, 0x13, 0x0400);
++		udelay(40);
++		tg3_writephy(tp, 0x13, 0x0000);
++
++		tg3_writephy(tp, 0x11, 0x0a50);
++		udelay(40);
++		tg3_writephy(tp, 0x11, 0x0a10);
++
++		/* Wait for signal to stabilize */
++		mdelay(150);
++
++		/* Deselect the channel register so we can read the PHYID
++		 * later.
++		 */
++		tg3_writephy(tp, 0x10, 0x8011);
++	}
++
++	/* Disable link change interrupt.  */
++	tw32_carefully(MAC_EVENT, 0);
++
++	current_link_up = 0;
++	if (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) {
++		if (!(tp->tg3_flags & TG3_FLAG_GOT_SERDES_FLOWCTL)) {
++			struct tg3_fiber_aneginfo aninfo;
++			int status = ANEG_FAILED;
++			unsigned int tick;
++			uint32_t tmp;
++
++			memset(&aninfo, 0, sizeof(aninfo));
++			aninfo.flags |= (MR_AN_ENABLE);
++
++			tw32(MAC_TX_AUTO_NEG, 0);
++
++			tmp = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
++			tw32_carefully(MAC_MODE, tmp | MAC_MODE_PORT_MODE_GMII);
++
++			tw32_carefully(MAC_MODE, tp->mac_mode | MAC_MODE_SEND_CONFIGS);
++
++			aninfo.state = ANEG_STATE_UNKNOWN;
++			aninfo.cur_time = 0;
++			tick = 0;
++			while (++tick < 195000) {
++				status = tg3_fiber_aneg_smachine(tp, &aninfo);
++				if (status == ANEG_DONE ||
++				    status == ANEG_FAILED)
++					break;
++
++				udelay(1);
++			}
++
++			tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
++			tw32_carefully(MAC_MODE, tp->mac_mode);
++
++			if (status == ANEG_DONE &&
++			    (aninfo.flags &
++			     (MR_AN_COMPLETE | MR_LINK_OK |
++			      MR_LP_ADV_FULL_DUPLEX))) {
++				uint32_t local_adv, remote_adv;
++
++				local_adv = ADVERTISE_PAUSE_CAP;
++				remote_adv = 0;
++				if (aninfo.flags & MR_LP_ADV_SYM_PAUSE)
++					remote_adv |= LPA_PAUSE_CAP;
++				if (aninfo.flags & MR_LP_ADV_ASYM_PAUSE)
++					remote_adv |= LPA_PAUSE_ASYM;
++
++				tg3_setup_flow_control(tp, local_adv, remote_adv);
++
++				tp->tg3_flags |=
++					TG3_FLAG_GOT_SERDES_FLOWCTL;
++				current_link_up = 1;
++			}
++			for (i = 0; i < 60; i++) {
++				udelay(20);
++				tw32_carefully(MAC_STATUS,
++					(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
++				if ((tr32(MAC_STATUS) &
++				     (MAC_STATUS_SYNC_CHANGED |
++				      MAC_STATUS_CFG_CHANGED)) == 0)
++					break;
++			}
++			if (current_link_up == 0 &&
++			    (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED)) {
++				current_link_up = 1;
++			}
++		} else {
++			/* Forcing 1000FD link up. */
++			current_link_up = 1;
++		}
++	}
++
++	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
++	tw32_carefully(MAC_MODE, tp->mac_mode);
++
++	tp->hw_status->status =
++		(SD_STATUS_UPDATED |
++		 (tp->hw_status->status & ~SD_STATUS_LINK_CHG));
++
++	for (i = 0; i < 100; i++) {
++		udelay(20);
++		tw32_carefully(MAC_STATUS,
++			(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
++		if ((tr32(MAC_STATUS) &
++		     (MAC_STATUS_SYNC_CHANGED |
++		      MAC_STATUS_CFG_CHANGED)) == 0)
++			break;
++	}
++
++	if ((tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) == 0)
++		current_link_up = 0;
++
++	if (current_link_up == 1) {
++		tp->link_config.active_speed = SPEED_1000;
++		tp->link_config.active_duplex = DUPLEX_FULL;
++	} else {
++		tp->link_config.active_speed = SPEED_INVALID;
++		tp->link_config.active_duplex = DUPLEX_INVALID;
++	}
++
++	if (current_link_up != tp->carrier_ok) {
++		tp->carrier_ok = current_link_up;
++		tg3_link_report(tp);
++	} else {
++		uint32_t now_pause_cfg =
++			tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
++					 TG3_FLAG_TX_PAUSE);
++		if (orig_pause_cfg != now_pause_cfg ||
++		    orig_active_speed != tp->link_config.active_speed ||
++		    orig_active_duplex != tp->link_config.active_duplex)
++			tg3_link_report(tp);
++	}
++
++	if ((tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) == 0) {
++		tw32_carefully(MAC_MODE, tp->mac_mode | MAC_MODE_LINK_POLARITY);
++		if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) {
++			tw32_carefully(MAC_MODE, tp->mac_mode);
++		}
++	}
++
++	return 0;
++}
++#else
++#define tg3_setup_fiber_phy(TP) (-EINVAL)
++#endif /* SUPPORT_FIBER_PHY */
++
++static int tg3_setup_phy(struct tg3 *tp)
++{
++	int err;
++
++	if (tp->phy_id == PHY_ID_SERDES) {
++		err = tg3_setup_fiber_phy(tp);
++	} else {
++		err = tg3_setup_copper_phy(tp);
++	}
++
++	if (tp->link_config.active_speed == SPEED_1000 &&
++	    tp->link_config.active_duplex == DUPLEX_HALF)
++		tw32(MAC_TX_LENGTHS,
++		     ((2 << TX_LENGTHS_IPG_CRS_SHIFT) |
++		      (6 << TX_LENGTHS_IPG_SHIFT) |
++		      (0xff << TX_LENGTHS_SLOT_TIME_SHIFT)));
++	else
++		tw32(MAC_TX_LENGTHS,
++		     ((2 << TX_LENGTHS_IPG_CRS_SHIFT) |
++		      (6 << TX_LENGTHS_IPG_SHIFT) |
++		      (32 << TX_LENGTHS_SLOT_TIME_SHIFT)));
++
++	return err;
++}
++
++
++#define MAX_WAIT_CNT 1000
++
++/* To stop a block, clear the enable bit and poll till it
++ * clears.  
++ */
++static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, uint32_t enable_bit)
++{
++	unsigned int i;
++	uint32_t val;
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
++		switch(ofs) {
++		case RCVLSC_MODE:
++		case DMAC_MODE:
++		case MBFREE_MODE:
++		case BUFMGR_MODE:
++		case MEMARB_MODE:
++			/* We can't enable/disable these bits of the
++			 * 5705, just say success.
++			 */
++			return 0;
++		default:
++			break;
++		}
++	}
++	val = tr32(ofs);
++	val &= ~enable_bit;
++	tw32(ofs, val);
++	tr32(ofs);
++
++	for (i = 0; i < MAX_WAIT_CNT; i++) {
++		udelay(100);
++		val = tr32(ofs);
++		if ((val & enable_bit) == 0)
++			break;
++	}
++
++	if (i == MAX_WAIT_CNT) {
++		printf("tg3_stop_block timed out, ofs=%lx enable_bit=%x\n",
++		       ofs, enable_bit);
++		return -ENODEV;
++	}
++
++	return 0;
++}
++
++static int tg3_abort_hw(struct tg3 *tp)
++{
++	int i, err;
++
++	tg3_disable_ints(tp);
++
++	tp->rx_mode &= ~RX_MODE_ENABLE;
++	tw32_carefully(MAC_RX_MODE, tp->rx_mode);
++
++	err  = tg3_stop_block(tp, RCVBDI_MODE,   RCVBDI_MODE_ENABLE);
++	err |= tg3_stop_block(tp, RCVLPC_MODE,   RCVLPC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, RCVLSC_MODE,   RCVLSC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, RCVDBDI_MODE,  RCVDBDI_MODE_ENABLE);
++	err |= tg3_stop_block(tp, RCVDCC_MODE,   RCVDCC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, RCVCC_MODE,    RCVCC_MODE_ENABLE);
++
++	err |= tg3_stop_block(tp, SNDBDS_MODE,   SNDBDS_MODE_ENABLE);
++	err |= tg3_stop_block(tp, SNDBDI_MODE,   SNDBDI_MODE_ENABLE);
++	err |= tg3_stop_block(tp, SNDDATAI_MODE, SNDDATAI_MODE_ENABLE);
++	err |= tg3_stop_block(tp, RDMAC_MODE,    RDMAC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, SNDDATAC_MODE, SNDDATAC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, SNDBDC_MODE,   SNDBDC_MODE_ENABLE);
++	if (err)
++		goto out;
++
++	tp->mac_mode &= ~MAC_MODE_TDE_ENABLE;
++	tw32_carefully(MAC_MODE, tp->mac_mode);
++
++	tp->tx_mode &= ~TX_MODE_ENABLE;
++	tw32_carefully(MAC_TX_MODE, tp->tx_mode);
++
++	for (i = 0; i < MAX_WAIT_CNT; i++) {
++		udelay(100);
++		if (!(tr32(MAC_TX_MODE) & TX_MODE_ENABLE))
++			break;
++	}
++	if (i >= MAX_WAIT_CNT) {
++		printf("tg3_abort_hw timed out TX_MODE_ENABLE will not clear MAC_TX_MODE=%x\n",
++			tr32(MAC_TX_MODE));
++		return -ENODEV;
++	}
++
++	err  = tg3_stop_block(tp, HOSTCC_MODE, HOSTCC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, WDMAC_MODE,  WDMAC_MODE_ENABLE);
++	err |= tg3_stop_block(tp, MBFREE_MODE, MBFREE_MODE_ENABLE);
++
++	tw32(FTQ_RESET, 0xffffffff);
++	tw32(FTQ_RESET, 0x00000000);
++
++	err |= tg3_stop_block(tp, BUFMGR_MODE, BUFMGR_MODE_ENABLE);
++	err |= tg3_stop_block(tp, MEMARB_MODE, MEMARB_MODE_ENABLE);
++	if (err)
++		goto out;
++
++	memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
++
++out:
++	return err;
++}
++
++static void tg3_chip_reset(struct tg3 *tp)
++{
++	uint32_t val;
++
++	if (!(tp->tg3_flags2 & TG3_FLG2_SUN_5704)) {
++		/* Force NVRAM to settle.
++		 * This deals with a chip bug which can result in EEPROM
++		 * corruption.
++		 */
++		if (tp->tg3_flags & TG3_FLAG_NVRAM) {
++			int i;
++	
++			tw32(NVRAM_SWARB, SWARB_REQ_SET1);
++			for (i = 0; i < 100000; i++) {
++				if (tr32(NVRAM_SWARB) & SWARB_GNT1)
++					break;
++				udelay(10);
++			}
++		}
++	}
++	/* In Etherboot we don't need to worry about the 5701
++	 * REG_WRITE_BUG because we do all register writes indirectly.
++	 */
++
++	/* do the reset */
++	val = GRC_MISC_CFG_CORECLK_RESET;
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
++		val |= GRC_MISC_CFG_KEEP_GPHY_POWER;
++	tw32(GRC_MISC_CFG, val);
++
++	/* Flush PCI posted writes.  The normal MMIO registers
++	 * are inaccessible at this time so this is the only
++	 * way to make this reliably.  I tried to use indirect
++	 * register read/write but this upset some 5701 variants.
++	 */
++	pci_read_config_dword(tp->pdev, PCI_COMMAND, &val);
++
++	udelay(120);
++
++	/* Re-enable indirect register accesses. */
++	pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
++			       tp->misc_host_ctrl);
++
++	/* Set MAX PCI retry to zero. */
++	val = (PCISTATE_ROM_ENABLE | PCISTATE_ROM_RETRY_ENABLE);
++	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0 &&
++	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE))
++		val |= PCISTATE_RETRY_SAME_DMA;
++	pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, val);
++
++	pci_restore_state(tp->pdev, tp->pci_cfg_state);
++
++	/* Make sure PCI-X relaxed ordering bit is clear. */
++	pci_read_config_dword(tp->pdev, TG3PCI_X_CAPS, &val);
++	val &= ~PCIX_CAPS_RELAXED_ORDERING;
++	pci_write_config_dword(tp->pdev, TG3PCI_X_CAPS, val);
++
++	tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
++
++	if (((tp->nic_sram_data_cfg & NIC_SRAM_DATA_CFG_MINI_PCI) != 0) &&
++		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) {
++		tp->pci_clock_ctrl |=
++			(CLOCK_CTRL_FORCE_CLKRUN | CLOCK_CTRL_CLKRUN_OENABLE);
++		tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
++	}
++
++	tw32(TG3PCI_MISC_HOST_CTRL, tp->misc_host_ctrl);
++}
++
++static void tg3_stop_fw(struct tg3 *tp)
++{
++	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
++		uint32_t val;
++		int i;
++
++		tg3_write_mem(NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
++		val = tr32(GRC_RX_CPU_EVENT);
++		val |= (1 << 14);
++		tw32(GRC_RX_CPU_EVENT, val);
++
++		/* Wait for RX cpu to ACK the event.  */
++		for (i = 0; i < 100; i++) {
++			if (!(tr32(GRC_RX_CPU_EVENT) & (1 << 14)))
++				break;
++			udelay(1);
++		}
++	}
++}
++
++static int tg3_restart_fw(struct tg3 *tp, uint32_t state)
++{
++	uint32_t val;
++	int i;
++	
++	tg3_write_mem(NIC_SRAM_FIRMWARE_MBOX, 
++		NIC_SRAM_FIRMWARE_MBOX_MAGIC1);
++	/* Wait for firmware initialization to complete. */
++	for (i = 0; i < 100000; i++) {
++		tg3_read_mem(NIC_SRAM_FIRMWARE_MBOX, &val);
++		if (val == (uint32_t) ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)
++			break;
++		udelay(10);
++	}
++	if (i >= 100000 &&
++		    !(tp->tg3_flags2 & TG3_FLG2_SUN_5704)) {
++		printf("Firmware will not restart magic=%x\n",
++			val);
++		return -ENODEV;
++	}
++	if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
++		state = DRV_STATE_SUSPEND;
++	}
++	tg3_write_mem(NIC_SRAM_FW_DRV_STATE_MBOX, state);
++	return 0;
++}
++
++static int tg3_halt(struct tg3 *tp)
++{
++	tg3_stop_fw(tp);
++	tg3_abort_hw(tp);
++	tg3_chip_reset(tp);
++	return tg3_restart_fw(tp, DRV_STATE_UNLOAD);
++}
++
++static void __tg3_set_mac_addr(struct tg3 *tp)
++{
++	uint32_t addr_high, addr_low;
++	int i;
++
++	addr_high = ((tp->nic->node_addr[0] << 8) |
++		     tp->nic->node_addr[1]);
++	addr_low = ((tp->nic->node_addr[2] << 24) |
++		    (tp->nic->node_addr[3] << 16) |
++		    (tp->nic->node_addr[4] <<  8) |
++		    (tp->nic->node_addr[5] <<  0));
++	for (i = 0; i < 4; i++) {
++		tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);
++		tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);
++	}
++
++	if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700) &&
++		(GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) &&
++		(GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705)) {
++		for(i = 0; i < 12; i++) {
++			tw32(MAC_EXTADDR_0_HIGH + (i * 8), addr_high);
++			tw32(MAC_EXTADDR_0_LOW + (i * 8), addr_low);
++		}
++	}
++	addr_high = (tp->nic->node_addr[0] +
++		     tp->nic->node_addr[1] +
++		     tp->nic->node_addr[2] +
++		     tp->nic->node_addr[3] +
++		     tp->nic->node_addr[4] +
++		     tp->nic->node_addr[5]) &
++		TX_BACKOFF_SEED_MASK;
++	tw32(MAC_TX_BACKOFF_SEED, addr_high);
++}
++
++static void tg3_set_bdinfo(struct tg3 *tp, uint32_t bdinfo_addr,
++			   dma_addr_t mapping, uint32_t maxlen_flags,
++			   uint32_t nic_addr)
++{
++	tg3_write_mem((bdinfo_addr +
++		       TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH),
++		      ((uint64_t) mapping >> 32));
++	tg3_write_mem((bdinfo_addr +
++		       TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW),
++		      ((uint64_t) mapping & 0xffffffff));
++	tg3_write_mem((bdinfo_addr +
++		       TG3_BDINFO_MAXLEN_FLAGS),
++		       maxlen_flags);
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		tg3_write_mem((bdinfo_addr + TG3_BDINFO_NIC_ADDR), nic_addr);
++	}
++}
++
++
++static void tg3_init_rings(struct tg3 *tp)
++{
++	unsigned i;
++
++	/* Zero out the tg3 variables */
++	memset(&tg3_bss, 0, sizeof(tg3_bss));
++	tp->rx_std    = &tg3_bss.rx_std[0];
++	tp->rx_rcb    = &tg3_bss.rx_rcb[0];
++	tp->tx_ring   = &tg3_bss.tx_ring[0];
++	tp->hw_status = &tg3_bss.hw_status;
++	tp->hw_stats  = &tg3_bss.hw_stats;
++	tp->mac_mode  = 0;
++
++
++	/* Initialize tx/rx rings for packet processing.
++	 *
++	 * The chip has been shut down and the driver detached from
++	 * the networking, so no interrupts or new tx packets will
++	 * end up in the driver.
++	 */
++
++	/* Initialize invariants of the rings, we only set this
++	 * stuff once.  This works because the card does not
++	 * write into the rx buffer posting rings.
++	 */
++	for (i = 0; i < TG3_RX_RING_SIZE; i++) {
++		struct tg3_rx_buffer_desc *rxd;
++
++		rxd = &tp->rx_std[i];
++		rxd->idx_len = (RX_PKT_BUF_SZ - 2 - 64)	<< RXD_LEN_SHIFT;
++		rxd->type_flags = (RXD_FLAG_END << RXD_FLAGS_SHIFT);
++		rxd->opaque = (RXD_OPAQUE_RING_STD | (i << RXD_OPAQUE_INDEX_SHIFT));
++
++		/* Note where the receive buffer for the ring is placed */
++		rxd->addr_hi = 0;
++		rxd->addr_lo = virt_to_bus(
++			&tg3_bss.rx_bufs[i%TG3_DEF_RX_RING_PENDING][2]);
++	}
++}
++
++#define TG3_WRITE_SETTINGS(TABLE) \
++do { \
++	const uint32_t *_table, *_end; \
++	_table = TABLE; \
++	_end = _table + sizeof(TABLE)/sizeof(TABLE[0]);  \
++	for(; _table < _end; _table += 2) { \
++		tw32(_table[0], _table[1]); \
++	} \
++} while(0)
++
++
++/* initialize/reset the tg3 */
++static int tg3_setup_hw(struct tg3 *tp)
++{
++	uint32_t val, rdmac_mode;
++	int i, err, limit;
++
++	/* Simply don't support setups with extremly buggy firmware in etherboot */
++	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0) {
++		printf("Error 5701_A0 firmware bug detected\n");
++		return -EINVAL;
++	}
++
++	tg3_disable_ints(tp);
++
++	/* Originally this was all in tg3_init_hw */
++
++	/* Force the chip into D0. */
++	tg3_set_power_state_0(tp);
++
++	tg3_switch_clocks(tp);
++
++	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
++
++
++	/* Originally this was all in tg3_reset_hw */
++
++	tg3_stop_fw(tp);
++
++	/* No need to call tg3_abort_hw here, it is called before tg3_setup_hw. */
++
++	tg3_chip_reset(tp);
++
++	tw32(GRC_MODE, tp->grc_mode);  /* Redundant? */
++
++	err = tg3_restart_fw(tp, DRV_STATE_START);
++	if (err)
++		return err;
++
++	if (tp->phy_id == PHY_ID_SERDES) {
++		tp->mac_mode = MAC_MODE_PORT_MODE_TBI;
++	}
++	tw32_carefully(MAC_MODE, tp->mac_mode);
++
++
++	/* This works around an issue with Athlon chipsets on
++	 * B3 tigon3 silicon.  This bit has no effect on any
++	 * other revision.
++	 */
++	tp->pci_clock_ctrl |= CLOCK_CTRL_DELAY_PCI_GRANT;
++	tw32_carefully(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
++
++	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0 &&
++	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE)) {
++		val = tr32(TG3PCI_PCISTATE);
++		val |= PCISTATE_RETRY_SAME_DMA;
++		tw32(TG3PCI_PCISTATE, val);
++	}
++
++	/* Descriptor ring init may make accesses to the
++	 * NIC SRAM area to setup the TX descriptors, so we
++	 * can only do this after the hardware has been
++	 * successfully reset.
++	 */
++	tg3_init_rings(tp);
++
++	/* Clear statistics/status block in chip */
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		for (i = NIC_SRAM_STATS_BLK;
++		     i < NIC_SRAM_STATUS_BLK + TG3_HW_STATUS_SIZE;
++		     i += sizeof(uint32_t)) {
++			tg3_write_mem(i, 0);
++			udelay(40);
++		}
++	}
++
++	/* This value is determined during the probe time DMA
++	 * engine test, tg3_setup_dma.
++	 */
++	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
++
++	tp->grc_mode &= ~(GRC_MODE_HOST_SENDBDS |
++			  GRC_MODE_4X_NIC_SEND_RINGS |
++			  GRC_MODE_NO_TX_PHDR_CSUM |
++			  GRC_MODE_NO_RX_PHDR_CSUM);
++	tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
++	tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
++	tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;
++
++	tw32(GRC_MODE,
++		tp->grc_mode | 
++		(GRC_MODE_IRQ_ON_MAC_ATTN | GRC_MODE_HOST_STACKUP));
++
++	/* Setup the timer prescalar register.  Clock is always 66Mhz. */
++	tw32(GRC_MISC_CFG,
++	     (65 << GRC_MISC_CFG_PRESCALAR_SHIFT));
++
++	/* Initialize MBUF/DESC pool. */
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		tw32(BUFMGR_MB_POOL_ADDR, NIC_SRAM_MBUF_POOL_BASE);
++		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
++			tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE64);
++		else
++			tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE96);
++		tw32(BUFMGR_DMA_DESC_POOL_ADDR, NIC_SRAM_DMA_DESC_POOL_BASE);
++		tw32(BUFMGR_DMA_DESC_POOL_SIZE, NIC_SRAM_DMA_DESC_POOL_SIZE);
++	}
++	if (!(tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE)) {
++		tw32(BUFMGR_MB_RDMA_LOW_WATER,
++		     tp->bufmgr_config.mbuf_read_dma_low_water);
++		tw32(BUFMGR_MB_MACRX_LOW_WATER,
++		     tp->bufmgr_config.mbuf_mac_rx_low_water);
++		tw32(BUFMGR_MB_HIGH_WATER,
++		     tp->bufmgr_config.mbuf_high_water);
++	} else {
++		tw32(BUFMGR_MB_RDMA_LOW_WATER,
++		     tp->bufmgr_config.mbuf_read_dma_low_water_jumbo);
++		tw32(BUFMGR_MB_MACRX_LOW_WATER,
++		     tp->bufmgr_config.mbuf_mac_rx_low_water_jumbo);
++		tw32(BUFMGR_MB_HIGH_WATER,
++		     tp->bufmgr_config.mbuf_high_water_jumbo);
++	}
++	tw32(BUFMGR_DMA_LOW_WATER,
++	     tp->bufmgr_config.dma_low_water);
++	tw32(BUFMGR_DMA_HIGH_WATER,
++	     tp->bufmgr_config.dma_high_water);
++
++	tw32(BUFMGR_MODE, BUFMGR_MODE_ENABLE | BUFMGR_MODE_ATTN_ENABLE);
++	for (i = 0; i < 2000; i++) {
++		if (tr32(BUFMGR_MODE) & BUFMGR_MODE_ENABLE)
++			break;
++		udelay(10);
++	}
++	if (i >= 2000) {
++		printf("tg3_setup_hw cannot enable BUFMGR\n");
++		return -ENODEV;
++	}
++
++	tw32(FTQ_RESET, 0xffffffff);
++	tw32(FTQ_RESET, 0x00000000);
++	for (i = 0; i < 2000; i++) {
++		if (tr32(FTQ_RESET) == 0x00000000)
++			break;
++		udelay(10);
++	}
++	if (i >= 2000) {
++		printf("tg3_setup_hw cannot reset FTQ\n");
++		return -ENODEV;
++	}
++
++	/* Initialize TG3_BDINFO's at:
++	 *  RCVDBDI_STD_BD:	standard eth size rx ring
++	 *  RCVDBDI_JUMBO_BD:	jumbo frame rx ring
++	 *  RCVDBDI_MINI_BD:	small frame rx ring (??? does not work)
++	 *
++	 * like so:
++	 *  TG3_BDINFO_HOST_ADDR:	high/low parts of DMA address of ring
++	 *  TG3_BDINFO_MAXLEN_FLAGS:	(rx max buffer size << 16) |
++	 *                              ring attribute flags
++	 *  TG3_BDINFO_NIC_ADDR:	location of descriptors in nic SRAM
++	 *
++	 * Standard receive ring @ NIC_SRAM_RX_BUFFER_DESC, 512 entries.
++	 * Jumbo receive ring @ NIC_SRAM_RX_JUMBO_BUFFER_DESC, 256 entries.
++	 *
++	 * ??? No space allocated for mini receive ring? :(
++	 *
++	 * The size of each ring is fixed in the firmware, but the location is
++	 * configurable.
++	 */
++	{
++		static const uint32_t table_all[] = {
++			/* Setup replenish thresholds. */
++			RCVBDI_STD_THRESH, TG3_DEF_RX_RING_PENDING / 8,
++
++			/* Etherboot lives below 4GB */
++			RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH, 0,
++			RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR, NIC_SRAM_RX_BUFFER_DESC,
++		};
++		static const uint32_t table_not_5705[] = {
++			/* Buffer maximum length */
++			RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS, RX_STD_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT,
++			
++			/* Disable the mini frame rx ring */
++			RCVDBDI_MINI_BD + TG3_BDINFO_MAXLEN_FLAGS,	BDINFO_FLAGS_DISABLED,
++			
++			/* Disable the jumbo frame rx ring */
++			RCVBDI_JUMBO_THRESH, 0,
++			RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS, BDINFO_FLAGS_DISABLED,
++			
++			
++		};
++		TG3_WRITE_SETTINGS(table_all);
++		tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW, 
++			virt_to_bus(tp->rx_std));
++		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
++			tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS,
++				RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT);
++		} else {
++			TG3_WRITE_SETTINGS(table_not_5705);
++		}
++	}
++
++	
++	/* There is only one send ring on 5705, no need to explicitly
++	 * disable the others.
++	 */
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		/* Clear out send RCB ring in SRAM. */
++		for (i = NIC_SRAM_SEND_RCB; i < NIC_SRAM_RCV_RET_RCB; i += TG3_BDINFO_SIZE)
++			tg3_write_mem(i + TG3_BDINFO_MAXLEN_FLAGS, BDINFO_FLAGS_DISABLED);
++	}
++
++	tp->tx_prod = 0;
++	tw32_mailbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0);
++	tw32_mailbox2(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0);
++
++	tg3_set_bdinfo(tp,
++		NIC_SRAM_SEND_RCB,
++		virt_to_bus(tp->tx_ring),
++		(TG3_TX_RING_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT),
++		NIC_SRAM_TX_BUFFER_DESC);
++
++	/* There is only one receive return ring on 5705, no need to explicitly
++	 * disable the others.
++	 */
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		for (i = NIC_SRAM_RCV_RET_RCB; i < NIC_SRAM_STATS_BLK; i += TG3_BDINFO_SIZE) {
++			tg3_write_mem(i + TG3_BDINFO_MAXLEN_FLAGS,
++				BDINFO_FLAGS_DISABLED);
++		}
++	}
++
++	tp->rx_rcb_ptr = 0;
++	tw32_mailbox2(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, 0);
++
++	tg3_set_bdinfo(tp,
++		NIC_SRAM_RCV_RET_RCB,
++		virt_to_bus(tp->rx_rcb),
++		(TG3_RX_RCB_RING_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT),
++		0);
++
++	tp->rx_std_ptr = TG3_DEF_RX_RING_PENDING;
++	tw32_mailbox2(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW,
++		     tp->rx_std_ptr);
++
++	tw32_mailbox2(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, 0);
++
++	/* Initialize MAC address and backoff seed. */
++	__tg3_set_mac_addr(tp);
++
++	/* Calculate RDMAC_MODE setting early, we need it to determine
++	 * the RCVLPC_STATE_ENABLE mask.
++	 */
++	rdmac_mode = (RDMAC_MODE_ENABLE | RDMAC_MODE_TGTABORT_ENAB |
++		RDMAC_MODE_MSTABORT_ENAB | RDMAC_MODE_PARITYERR_ENAB |
++		RDMAC_MODE_ADDROFLOW_ENAB | RDMAC_MODE_FIFOOFLOW_ENAB |
++		RDMAC_MODE_FIFOURUN_ENAB | RDMAC_MODE_FIFOOREAD_ENAB |
++		RDMAC_MODE_LNGREAD_ENAB);
++	if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
++		rdmac_mode |= RDMAC_MODE_SPLIT_ENABLE;
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
++		if (tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
++			if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
++				!(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
++				rdmac_mode |= RDMAC_MODE_FIFO_LONG_BURST;
++			}
++		}
++	}
++
++	/* Setup host coalescing engine. */
++	tw32(HOSTCC_MODE, 0);
++	for (i = 0; i < 2000; i++) {
++		if (!(tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE))
++			break;
++		udelay(10);
++	}
++
++	tp->mac_mode = MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
++		MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;
++	tw32_carefully(MAC_MODE, tp->mac_mode | MAC_MODE_RXSTAT_CLEAR | MAC_MODE_TXSTAT_CLEAR);
++
++	tp->grc_local_ctrl = GRC_LCLCTRL_INT_ON_ATTN | GRC_LCLCTRL_AUTO_SEEPROM;
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
++		tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
++				       GRC_LCLCTRL_GPIO_OUTPUT1);
++	tw32_carefully(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
++
++	tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0);
++	tr32(MAILBOX_INTERRUPT_0);
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		tw32_carefully(DMAC_MODE, DMAC_MODE_ENABLE);
++	}
++
++	val = (	WDMAC_MODE_ENABLE | WDMAC_MODE_TGTABORT_ENAB |
++		WDMAC_MODE_MSTABORT_ENAB | WDMAC_MODE_PARITYERR_ENAB |
++		WDMAC_MODE_ADDROFLOW_ENAB | WDMAC_MODE_FIFOOFLOW_ENAB |
++		WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
++		WDMAC_MODE_LNGREAD_ENAB);
++	if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) &&
++		((tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) != 0) &&
++		!(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
++		val |= WDMAC_MODE_RX_ACCEL;
++	}
++	tw32_carefully(WDMAC_MODE, val);
++
++	if ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) {
++		val = tr32(TG3PCI_X_CAPS);
++		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) {
++			val &= PCIX_CAPS_BURST_MASK;
++			val |= (PCIX_CAPS_MAX_BURST_CPIOB << PCIX_CAPS_BURST_SHIFT);
++		} else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
++			val &= ~(PCIX_CAPS_SPLIT_MASK | PCIX_CAPS_BURST_MASK);
++			val |= (PCIX_CAPS_MAX_BURST_CPIOB << PCIX_CAPS_BURST_SHIFT);
++			if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
++				val |= (tp->split_mode_max_reqs <<
++					PCIX_CAPS_SPLIT_SHIFT);
++		}
++		tw32(TG3PCI_X_CAPS, val);
++	}
++
++	tw32_carefully(RDMAC_MODE, rdmac_mode);
++	{
++		static const uint32_t table_all[] = {
++			/* MTU + ethernet header + FCS + optional VLAN tag */
++			MAC_RX_MTU_SIZE, ETH_MAX_MTU + ETH_HLEN + 8,
++			
++			/* The slot time is changed by tg3_setup_phy if we
++			 * run at gigabit with half duplex.
++			 */
++			MAC_TX_LENGTHS,	
++			(2 << TX_LENGTHS_IPG_CRS_SHIFT) |
++			(6 << TX_LENGTHS_IPG_SHIFT) |
++			(32 << TX_LENGTHS_SLOT_TIME_SHIFT),
++			
++			/* Receive rules. */
++			MAC_RCV_RULE_CFG, RCV_RULE_CFG_DEFAULT_CLASS,
++			RCVLPC_CONFIG, 0x0181,
++			
++			/* Receive/send statistics. */
++			RCVLPC_STATS_ENABLE, 0xffffff,
++			RCVLPC_STATSCTRL, RCVLPC_STATSCTRL_ENABLE,
++			SNDDATAI_STATSENAB, 0xffffff,
++			SNDDATAI_STATSCTRL, (SNDDATAI_SCTRL_ENABLE |SNDDATAI_SCTRL_FASTUPD),
++			
++			/* Host coalescing engine */
++			HOSTCC_RXCOL_TICKS, 0,
++			HOSTCC_TXCOL_TICKS, LOW_TXCOL_TICKS,
++			HOSTCC_RXMAX_FRAMES, 1,
++			HOSTCC_TXMAX_FRAMES, LOW_RXMAX_FRAMES,
++			HOSTCC_RXCOAL_MAXF_INT, 1,
++			HOSTCC_TXCOAL_MAXF_INT, 0,
++			
++			/* Status/statistics block address. */
++			/* Etherboot lives below 4GB, so HIGH == 0 */
++			HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH, 0,
++
++			/* No need to enable 32byte coalesce mode. */
++			HOSTCC_MODE, HOSTCC_MODE_ENABLE | 0,
++			
++			RCVCC_MODE, RCVCC_MODE_ENABLE | RCVCC_MODE_ATTN_ENABLE,
++			RCVLPC_MODE, RCVLPC_MODE_ENABLE,
++			
++			RCVDCC_MODE, RCVDCC_MODE_ENABLE | RCVDCC_MODE_ATTN_ENABLE,
++
++			SNDDATAC_MODE, SNDDATAC_MODE_ENABLE,
++			SNDBDC_MODE, SNDBDC_MODE_ENABLE | SNDBDC_MODE_ATTN_ENABLE,
++			RCVBDI_MODE, RCVBDI_MODE_ENABLE | RCVBDI_MODE_RCB_ATTN_ENAB,
++			RCVDBDI_MODE, RCVDBDI_MODE_ENABLE | RCVDBDI_MODE_INV_RING_SZ,
++			SNDDATAI_MODE, SNDDATAI_MODE_ENABLE,
++			SNDBDI_MODE, SNDBDI_MODE_ENABLE | SNDBDI_MODE_ATTN_ENABLE,
++			SNDBDS_MODE, SNDBDS_MODE_ENABLE | SNDBDS_MODE_ATTN_ENABLE,
++			
++			/* Accept all multicast frames. */
++			MAC_HASH_REG_0, 0xffffffff,
++			MAC_HASH_REG_1, 0xffffffff,
++			MAC_HASH_REG_2, 0xffffffff,
++			MAC_HASH_REG_3, 0xffffffff,
++		};
++		static const uint32_t table_not_5705[] = {
++			/* Host coalescing engine */
++			HOSTCC_RXCOAL_TICK_INT, 0,
++			HOSTCC_TXCOAL_TICK_INT, 0,
++
++			/* Status/statistics block address. */
++			/* Etherboot lives below 4GB, so HIGH == 0 */
++			HOSTCC_STAT_COAL_TICKS, DEFAULT_STAT_COAL_TICKS,
++			HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH, 0,
++			HOSTCC_STATS_BLK_NIC_ADDR, NIC_SRAM_STATS_BLK,
++			HOSTCC_STATUS_BLK_NIC_ADDR, NIC_SRAM_STATUS_BLK,
++
++			RCVLSC_MODE, RCVLSC_MODE_ENABLE | RCVLSC_MODE_ATTN_ENABLE,
++
++			MBFREE_MODE, MBFREE_MODE_ENABLE,
++		};
++		TG3_WRITE_SETTINGS(table_all);
++		tw32(HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
++			virt_to_bus(tp->hw_stats));
++		tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
++			virt_to_bus(tp->hw_status));
++		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++			TG3_WRITE_SETTINGS(table_not_5705);
++		}
++	}
++
++	tp->tx_mode = TX_MODE_ENABLE;
++	tw32_carefully(MAC_TX_MODE, tp->tx_mode);
++
++	tp->rx_mode = RX_MODE_ENABLE;
++	tw32_carefully(MAC_RX_MODE, tp->rx_mode);
++
++	tp->mi_mode = MAC_MI_MODE_BASE;
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
++
++	tw32(MAC_LED_CTRL, 0);
++	tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
++	if (tp->phy_id == PHY_ID_SERDES) {
++		tw32_carefully(MAC_RX_MODE, RX_MODE_RESET);
++	}
++	tp->rx_mode |= RX_MODE_KEEP_VLAN_TAG; /* drop tagged vlan packets */
++	tw32_carefully(MAC_RX_MODE, tp->rx_mode);
++
++	if (tp->pci_chip_rev_id == CHIPREV_ID_5703_A1)
++		tw32(MAC_SERDES_CFG, 0x616000);
++
++	/* Prevent chip from dropping frames when flow control
++	 * is enabled.
++	 */
++	tw32(MAC_LOW_WMARK_MAX_RX_FRAME, 2);
++	tr32(MAC_LOW_WMARK_MAX_RX_FRAME);
++
++	err = tg3_setup_phy(tp);
++
++	/* Ignore CRC stats */
++
++	/* Initialize receive rules. */
++	tw32(MAC_RCV_RULE_0,  0xc2000000 & RCV_RULE_DISABLE_MASK);
++	tw32(MAC_RCV_VALUE_0, 0xffffffff & RCV_RULE_DISABLE_MASK);
++	tw32(MAC_RCV_RULE_1,  0x86000004 & RCV_RULE_DISABLE_MASK);
++	tw32(MAC_RCV_VALUE_1, 0xffffffff & RCV_RULE_DISABLE_MASK);
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
++		limit = 8;
++	else
++		limit = 16;
++	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF)
++		limit -= 4;
++	switch (limit) {
++	case 16:	tw32(MAC_RCV_RULE_15,  0); tw32(MAC_RCV_VALUE_15,  0);
++	case 15:	tw32(MAC_RCV_RULE_14,  0); tw32(MAC_RCV_VALUE_14,  0);
++	case 14:	tw32(MAC_RCV_RULE_13,  0); tw32(MAC_RCV_VALUE_13,  0);
++	case 13:	tw32(MAC_RCV_RULE_12,  0); tw32(MAC_RCV_VALUE_12,  0);
++	case 12:	tw32(MAC_RCV_RULE_11,  0); tw32(MAC_RCV_VALUE_11,  0);
++	case 11:	tw32(MAC_RCV_RULE_10,  0); tw32(MAC_RCV_VALUE_10,  0);
++	case 10:	tw32(MAC_RCV_RULE_9,  0);  tw32(MAC_RCV_VALUE_9,  0);
++	case 9:		tw32(MAC_RCV_RULE_8,  0);  tw32(MAC_RCV_VALUE_8,  0);
++	case 8:		tw32(MAC_RCV_RULE_7,  0);  tw32(MAC_RCV_VALUE_7,  0);
++	case 7:		tw32(MAC_RCV_RULE_6,  0);  tw32(MAC_RCV_VALUE_6,  0);
++	case 6:		tw32(MAC_RCV_RULE_5,  0);  tw32(MAC_RCV_VALUE_5,  0);
++	case 5:		tw32(MAC_RCV_RULE_4,  0);  tw32(MAC_RCV_VALUE_4,  0);
++	case 4:		/* tw32(MAC_RCV_RULE_3,  0); tw32(MAC_RCV_VALUE_3,  0); */
++	case 3:		/* tw32(MAC_RCV_RULE_2,  0); tw32(MAC_RCV_VALUE_2,  0); */
++	case 2:
++	case 1:
++	default:
++		break;
++	};
++
++	return err;
++}
++
++
++
++/* Chips other than 5700/5701 use the NVRAM for fetching info. */
++static void tg3_nvram_init(struct tg3 *tp)
++{
++	tw32(GRC_EEPROM_ADDR,
++	     (EEPROM_ADDR_FSM_RESET |
++	      (EEPROM_DEFAULT_CLOCK_PERIOD <<
++	       EEPROM_ADDR_CLKPERD_SHIFT)));
++
++	mdelay(1);
++
++	/* Enable seeprom accesses. */
++	tw32_carefully(GRC_LOCAL_CTRL,
++		tr32(GRC_LOCAL_CTRL) | GRC_LCLCTRL_AUTO_SEEPROM);
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
++	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
++		uint32_t nvcfg1 = tr32(NVRAM_CFG1);
++
++		tp->tg3_flags |= TG3_FLAG_NVRAM;
++		if (nvcfg1 & NVRAM_CFG1_FLASHIF_ENAB) {
++			if (nvcfg1 & NVRAM_CFG1_BUFFERED_MODE)
++				tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
++		} else {
++			nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;
++			tw32(NVRAM_CFG1, nvcfg1);
++		}
++
++	} else {
++		tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED);
++	}
++}
++
++
++static int tg3_nvram_read_using_eeprom(
++	struct tg3 *tp __unused, uint32_t offset, uint32_t *val)
++{
++	uint32_t tmp;
++	int i;
++
++	if (offset > EEPROM_ADDR_ADDR_MASK ||
++		(offset % 4) != 0) {
++		return -EINVAL;
++	}
++
++	tmp = tr32(GRC_EEPROM_ADDR) & ~(EEPROM_ADDR_ADDR_MASK |
++					EEPROM_ADDR_DEVID_MASK |
++					EEPROM_ADDR_READ);
++	tw32(GRC_EEPROM_ADDR,
++	     tmp |
++	     (0 << EEPROM_ADDR_DEVID_SHIFT) |
++	     ((offset << EEPROM_ADDR_ADDR_SHIFT) &
++	      EEPROM_ADDR_ADDR_MASK) |
++	     EEPROM_ADDR_READ | EEPROM_ADDR_START);
++
++	for (i = 0; i < 10000; i++) {
++		tmp = tr32(GRC_EEPROM_ADDR);
++
++		if (tmp & EEPROM_ADDR_COMPLETE)
++			break;
++		udelay(100);
++	}
++	if (!(tmp & EEPROM_ADDR_COMPLETE)) {
++		return -EBUSY;
++	}
++
++	*val = tr32(GRC_EEPROM_DATA);
++	return 0;
++}
++
++static int tg3_nvram_read(struct tg3 *tp, uint32_t offset, uint32_t *val)
++{
++	int i, saw_done_clear;
++
++	if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
++		return tg3_nvram_read_using_eeprom(tp, offset, val);
++
++	if (tp->tg3_flags & TG3_FLAG_NVRAM_BUFFERED)
++		offset = ((offset / NVRAM_BUFFERED_PAGE_SIZE) <<
++			  NVRAM_BUFFERED_PAGE_POS) +
++			(offset % NVRAM_BUFFERED_PAGE_SIZE);
++
++	if (offset > NVRAM_ADDR_MSK)
++		return -EINVAL;
++
++	tw32(NVRAM_SWARB, SWARB_REQ_SET1);
++	for (i = 0; i < 1000; i++) {
++		if (tr32(NVRAM_SWARB) & SWARB_GNT1)
++			break;
++		udelay(20);
++	}
++
++	tw32(NVRAM_ADDR, offset);
++	tw32(NVRAM_CMD,
++	     NVRAM_CMD_RD | NVRAM_CMD_GO |
++	     NVRAM_CMD_FIRST | NVRAM_CMD_LAST | NVRAM_CMD_DONE);
++
++	/* Wait for done bit to clear then set again. */
++	saw_done_clear = 0;
++	for (i = 0; i < 1000; i++) {
++		udelay(10);
++		if (!saw_done_clear &&
++		    !(tr32(NVRAM_CMD) & NVRAM_CMD_DONE))
++			saw_done_clear = 1;
++		else if (saw_done_clear &&
++			 (tr32(NVRAM_CMD) & NVRAM_CMD_DONE))
++			break;
++	}
++	if (i >= 1000) {
++		tw32(NVRAM_SWARB, SWARB_REQ_CLR1);
++		return -EBUSY;
++	}
++
++	*val = bswap_32(tr32(NVRAM_RDDATA));
++	tw32(NVRAM_SWARB, 0x20);
++
++	return 0;
++}
++
++struct subsys_tbl_ent {
++	uint16_t subsys_vendor, subsys_devid;
++	uint32_t phy_id;
++};
++
++static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
++	/* Broadcom boards. */
++	{ 0x14e4, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
++	{ 0x14e4, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
++	{ 0x14e4, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
++	{ 0x14e4, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
++	{ 0x14e4, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
++	{ 0x14e4, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
++	{ 0x14e4, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
++	{ 0x14e4, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
++	{ 0x14e4, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
++	{ 0x14e4, 0x0009, PHY_ID_BCM5701 }, /* BCM95703Ax1 */
++	{ 0x14e4, 0x8009, PHY_ID_BCM5701 }, /* BCM95703Ax2 */
++
++	/* 3com boards. */
++	{ PCI_VENDOR_ID_3COM, 0x1000, PHY_ID_BCM5401 }, /* 3C996T */
++	{ PCI_VENDOR_ID_3COM, 0x1006, PHY_ID_BCM5701 }, /* 3C996BT */
++	/* { PCI_VENDOR_ID_3COM, 0x1002, PHY_ID_XXX },     3C996CT */
++	/* { PCI_VENDOR_ID_3COM, 0x1003, PHY_ID_XXX },     3C997T */
++	{ PCI_VENDOR_ID_3COM, 0x1004, PHY_ID_SERDES  }, /* 3C996SX */
++	/* { PCI_VENDOR_ID_3COM, 0x1005, PHY_ID_XXX },     3C997SZ */
++	{ PCI_VENDOR_ID_3COM, 0x1007, PHY_ID_BCM5701 }, /* 3C1000T */
++	{ PCI_VENDOR_ID_3COM, 0x1008, PHY_ID_BCM5701 }, /* 3C940BR01 */
++
++	/* DELL boards. */
++	{ PCI_VENDOR_ID_DELL, 0x00d1, PHY_ID_BCM5401 }, /* VIPER */
++	{ PCI_VENDOR_ID_DELL, 0x0106, PHY_ID_BCM5401 }, /* JAGUAR */
++	{ PCI_VENDOR_ID_DELL, 0x0109, PHY_ID_BCM5411 }, /* MERLOT */
++	{ PCI_VENDOR_ID_DELL, 0x010a, PHY_ID_BCM5411 }, /* SLIM_MERLOT */
++
++	/* Compaq boards. */
++	{ PCI_VENDOR_ID_COMPAQ, 0x007c, PHY_ID_BCM5701 }, /* BANSHEE */
++	{ PCI_VENDOR_ID_COMPAQ, 0x009a, PHY_ID_BCM5701 }, /* BANSHEE_2 */
++	{ PCI_VENDOR_ID_COMPAQ, 0x007d, PHY_ID_SERDES  }, /* CHANGELING */
++	{ PCI_VENDOR_ID_COMPAQ, 0x0085, PHY_ID_BCM5701 }, /* NC7780 */
++	{ PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }  /* NC7780_2 */
++};
++
++static int tg3_phy_probe(struct tg3 *tp)
++{
++	uint32_t eeprom_phy_id, hw_phy_id_1, hw_phy_id_2;
++	uint32_t hw_phy_id, hw_phy_id_masked;
++	enum phy_led_mode eeprom_led_mode;
++	uint32_t val;
++	unsigned i;
++	int eeprom_signature_found, err;
++
++	tp->phy_id = PHY_ID_INVALID;
++
++	for (i = 0; i < sizeof(subsys_id_to_phy_id)/sizeof(subsys_id_to_phy_id[0]); i++) {
++		if ((subsys_id_to_phy_id[i].subsys_vendor == tp->subsystem_vendor) &&
++			(subsys_id_to_phy_id[i].subsys_devid == tp->subsystem_device)) {
++			tp->phy_id = subsys_id_to_phy_id[i].phy_id;
++			break;
++		}
++	}
++
++	eeprom_phy_id = PHY_ID_INVALID;
++	eeprom_led_mode = led_mode_auto;
++	eeprom_signature_found = 0;
++	tg3_read_mem(NIC_SRAM_DATA_SIG, &val);
++	if (val == NIC_SRAM_DATA_SIG_MAGIC) {
++		uint32_t nic_cfg;
++
++		tg3_read_mem(NIC_SRAM_DATA_CFG, &nic_cfg);
++		tp->nic_sram_data_cfg = nic_cfg;
++
++		eeprom_signature_found = 1;
++
++		if ((nic_cfg & NIC_SRAM_DATA_CFG_PHY_TYPE_MASK) ==
++		    NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER) {
++			eeprom_phy_id = PHY_ID_SERDES;
++		} else {
++			uint32_t nic_phy_id;
++
++			tg3_read_mem(NIC_SRAM_DATA_PHY_ID, &nic_phy_id);
++			if (nic_phy_id != 0) {
++				uint32_t id1 = nic_phy_id & NIC_SRAM_DATA_PHY_ID1_MASK;
++				uint32_t id2 = nic_phy_id & NIC_SRAM_DATA_PHY_ID2_MASK;
++
++				eeprom_phy_id  = (id1 >> 16) << 10;
++				eeprom_phy_id |= (id2 & 0xfc00) << 16;
++				eeprom_phy_id |= (id2 & 0x03ff) <<  0;
++			}
++		}
++
++		switch (nic_cfg & NIC_SRAM_DATA_CFG_LED_MODE_MASK) {
++		case NIC_SRAM_DATA_CFG_LED_TRIPLE_SPD:
++			eeprom_led_mode = led_mode_three_link;
++			break;
++
++		case NIC_SRAM_DATA_CFG_LED_LINK_SPD:
++			eeprom_led_mode = led_mode_link10;
++			break;
++
++		default:
++			eeprom_led_mode = led_mode_auto;
++			break;
++		};
++		if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
++			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
++			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) &&
++			(nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP)) {
++			tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
++		}
++
++		if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE)
++			tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
++		if (nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)
++			tp->tg3_flags |= TG3_FLAG_SERDES_WOL_CAP;
++	}
++
++	/* Now read the physical PHY_ID from the chip and verify
++	 * that it is sane.  If it doesn't look good, we fall back
++	 * to either the hard-coded table based PHY_ID and failing
++	 * that the value found in the eeprom area.
++	 */
++	err  = tg3_readphy(tp, MII_PHYSID1, &hw_phy_id_1);
++	err |= tg3_readphy(tp, MII_PHYSID2, &hw_phy_id_2);
++
++	hw_phy_id  = (hw_phy_id_1 & 0xffff) << 10;
++	hw_phy_id |= (hw_phy_id_2 & 0xfc00) << 16;
++	hw_phy_id |= (hw_phy_id_2 & 0x03ff) <<  0;
++
++	hw_phy_id_masked = hw_phy_id & PHY_ID_MASK;
++
++	if (!err && KNOWN_PHY_ID(hw_phy_id_masked)) {
++		tp->phy_id = hw_phy_id;
++	} else {
++		/* phy_id currently holds the value found in the
++		 * subsys_id_to_phy_id[] table or PHY_ID_INVALID
++		 * if a match was not found there.
++		 */
++		if (tp->phy_id == PHY_ID_INVALID) {
++			if (!eeprom_signature_found ||
++			    !KNOWN_PHY_ID(eeprom_phy_id & PHY_ID_MASK))
++				return -ENODEV;
++			tp->phy_id = eeprom_phy_id;
++		}
++	}
++
++	err = tg3_phy_reset(tp);
++	if (err)
++		return err;
++
++	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
++	    tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) {
++		uint32_t mii_tg3_ctrl;
++		
++		/* These chips, when reset, only advertise 10Mb
++		 * capabilities.  Fix that.
++		 */
++		err  = tg3_writephy(tp, MII_ADVERTISE,
++				    (ADVERTISE_CSMA |
++				     ADVERTISE_PAUSE_CAP |
++				     ADVERTISE_10HALF |
++				     ADVERTISE_10FULL |
++				     ADVERTISE_100HALF |
++				     ADVERTISE_100FULL));
++		mii_tg3_ctrl = (MII_TG3_CTRL_ADV_1000_HALF |
++				MII_TG3_CTRL_ADV_1000_FULL |
++				MII_TG3_CTRL_AS_MASTER |
++				MII_TG3_CTRL_ENABLE_AS_MASTER);
++		if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
++			mii_tg3_ctrl = 0;
++
++		err |= tg3_writephy(tp, MII_TG3_CTRL, mii_tg3_ctrl);
++		err |= tg3_writephy(tp, MII_BMCR,
++				    (BMCR_ANRESTART | BMCR_ANENABLE));
++	}
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) {
++		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
++		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
++		tg3_writedsp(tp, MII_TG3_DSP_RW_PORT, 0x2aaa);
++	}
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
++		tg3_writephy(tp, 0x1c, 0x8d68);
++		tg3_writephy(tp, 0x1c, 0x8d68);
++	}
++
++	/* Enable Ethernet@WireSpeed */
++	tg3_phy_set_wirespeed(tp);
++
++	if (!err && ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)) {
++		err = tg3_init_5401phy_dsp(tp);
++	}
++
++	/* Determine the PHY led mode. 
++	 * Be careful if this gets set wrong it can result in an inability to 
++	 * establish a link.
++	 */
++	if (tp->phy_id == PHY_ID_SERDES) {
++		tp->led_mode = led_mode_three_link;
++	}
++	else if (tp->subsystem_vendor == PCI_VENDOR_ID_DELL) {
++		tp->led_mode = led_mode_link10;
++	} else {
++		tp->led_mode = led_mode_three_link;
++		if (eeprom_signature_found &&
++		    eeprom_led_mode != led_mode_auto)
++			tp->led_mode = eeprom_led_mode;
++	}
++
++	if (tp->phy_id == PHY_ID_SERDES)
++		tp->link_config.advertising =
++			(ADVERTISED_1000baseT_Half |
++			 ADVERTISED_1000baseT_Full |
++			 ADVERTISED_Autoneg |
++			 ADVERTISED_FIBRE);
++	if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
++		tp->link_config.advertising &=
++			~(ADVERTISED_1000baseT_Half |
++			  ADVERTISED_1000baseT_Full);
++
++	return err;
++}
++
++#if SUPPORT_PARTNO_STR
++static void tg3_read_partno(struct tg3 *tp)
++{
++	unsigned char vpd_data[256];
++	int i;
++
++	for (i = 0; i < 256; i += 4) {
++		uint32_t tmp;
++
++		if (tg3_nvram_read(tp, 0x100 + i, &tmp))
++			goto out_not_found;
++
++		vpd_data[i + 0] = ((tmp >>  0) & 0xff);
++		vpd_data[i + 1] = ((tmp >>  8) & 0xff);
++		vpd_data[i + 2] = ((tmp >> 16) & 0xff);
++		vpd_data[i + 3] = ((tmp >> 24) & 0xff);
++	}
++
++	/* Now parse and find the part number. */
++	for (i = 0; i < 256; ) {
++		unsigned char val = vpd_data[i];
++		int block_end;
++
++		if (val == 0x82 || val == 0x91) {
++			i = (i + 3 +
++			     (vpd_data[i + 1] +
++			      (vpd_data[i + 2] << 8)));
++			continue;
++		}
++
++		if (val != 0x90)
++			goto out_not_found;
++
++		block_end = (i + 3 +
++			     (vpd_data[i + 1] +
++			      (vpd_data[i + 2] << 8)));
++		i += 3;
++		while (i < block_end) {
++			if (vpd_data[i + 0] == 'P' &&
++			    vpd_data[i + 1] == 'N') {
++				int partno_len = vpd_data[i + 2];
++
++				if (partno_len > 24)
++					goto out_not_found;
++
++				memcpy(tp->board_part_number,
++				       &vpd_data[i + 3],
++				       partno_len);
++
++				/* Success. */
++				return;
++			}
++		}
++
++		/* Part number not found. */
++		goto out_not_found;
++	}
++
++out_not_found:
++	memcpy(tp->board_part_number, "none", sizeof("none"));
++}
++#else
++#define tg3_read_partno(TP) ((TP)->board_part_number[0] = '\0')
++#endif
++
++static int tg3_get_invariants(struct tg3 *tp)
++{
++	uint32_t misc_ctrl_reg;
++	uint32_t pci_state_reg, grc_misc_cfg;
++	uint16_t pci_cmd;
++	uint8_t  pci_latency;
++	int err;
++
++	/* Read the subsystem vendor and device ids */
++	pci_read_config_word(tp->pdev, PCI_SUBSYSTEM_VENDOR_ID, &tp->subsystem_vendor);
++	pci_read_config_word(tp->pdev, PCI_SUBSYSTEM_ID, &tp->subsystem_device);
++
++	/* The sun_5704 code needs infrastructure etherboot does have
++	 * ignore it for now.
++	 */
++
++	/* If we have an AMD 762 or Intel ICH/ICH0 chipset, write
++	 * reordering to the mailbox registers done by the host
++	 * controller can cause major troubles.  We read back from
++	 * every mailbox register write to force the writes to be
++	 * posted to the chip in order.
++	 *
++	 * TG3_FLAG_MBOX_WRITE_REORDER has been forced on.
++	 */
++
++	/* Force memory write invalidate off.  If we leave it on,
++	 * then on 5700_BX chips we have to enable a workaround.
++	 * The workaround is to set the TG3PCI_DMA_RW_CTRL boundry
++	 * to match the cacheline size.  The Broadcom driver have this
++	 * workaround but turns MWI off all the times so never uses
++	 * it.  This seems to suggest that the workaround is insufficient.
++	 */
++	pci_read_config_word(tp->pdev, PCI_COMMAND, &pci_cmd);
++	pci_cmd &= ~PCI_COMMAND_INVALIDATE;
++	/* Also, force SERR#/PERR# in PCI command. */
++	pci_cmd |= PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
++	pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
++
++	/* It is absolutely critical that TG3PCI_MISC_HOST_CTRL
++	 * has the register indirect write enable bit set before
++	 * we try to access any of the MMIO registers.  It is also
++	 * critical that the PCI-X hw workaround situation is decided
++	 * before that as well.
++	 */
++	pci_read_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL, &misc_ctrl_reg);
++
++	tp->pci_chip_rev_id = (misc_ctrl_reg >> MISC_HOST_CTRL_CHIPREV_SHIFT);
++
++	/* Initialize misc host control in PCI block. */
++	tp->misc_host_ctrl |= (misc_ctrl_reg &
++			       MISC_HOST_CTRL_CHIPREV);
++	pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
++			       tp->misc_host_ctrl);
++
++	pci_read_config_byte(tp->pdev, PCI_LATENCY_TIMER, &pci_latency);
++	if (pci_latency < 64) {
++		pci_write_config_byte(tp->pdev, PCI_LATENCY_TIMER, 64);
++	}
++
++	pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE, &pci_state_reg);
++
++	/* If this is a 5700 BX chipset, and we are in PCI-X
++	 * mode, enable register write workaround.
++	 *
++	 * The workaround is to use indirect register accesses
++	 * for all chip writes not to mailbox registers.
++	 *
++	 * In etherboot to simplify things we just always use this work around.
++	 */
++	if ((pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0) {
++		tp->tg3_flags |= TG3_FLAG_PCIX_MODE;
++	}
++	/* Back to back register writes can cause problems on the 5701,
++	 * the workaround is to read back all reg writes except those to
++	 * mailbox regs.
++	 * In etherboot we always use indirect register accesses so
++	 * we don't see this.
++	 */
++
++	if ((pci_state_reg & PCISTATE_BUS_SPEED_HIGH) != 0)
++		tp->tg3_flags |= TG3_FLAG_PCI_HIGH_SPEED;
++	if ((pci_state_reg & PCISTATE_BUS_32BIT) != 0)
++		tp->tg3_flags |= TG3_FLAG_PCI_32BIT;
++
++	/* Chip-specific fixup from Broadcom driver */
++	if ((tp->pci_chip_rev_id == CHIPREV_ID_5704_A0) &&
++	    (!(pci_state_reg & PCISTATE_RETRY_SAME_DMA))) {
++		pci_state_reg |= PCISTATE_RETRY_SAME_DMA;
++		pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, pci_state_reg);
++	}
++
++	/* Force the chip into D0. */
++	tg3_set_power_state_0(tp);
++
++	/* Etherboot does not ask the tg3 to do checksums */
++	/* Etherboot does not ask the tg3 to do jumbo frames */
++	/* Ehterboot does not ask the tg3 to use WakeOnLan. */
++
++	/* A few boards don't want Ethernet@WireSpeed phy feature */
++	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) ||
++		((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
++			(tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) &&
++			(tp->pci_chip_rev_id != CHIPREV_ID_5705_A1))) {
++		tp->tg3_flags2 |= TG3_FLG2_NO_ETH_WIRE_SPEED;
++	}
++
++	/* Avoid tagged irq status etherboot does not use irqs */
++
++	/* Only 5701 and later support tagged irq status mode.
++	 * Also, 5788 chips cannot use tagged irq status.
++	 *
++	 * However, since etherboot does not use irqs avoid tagged irqs
++	 * status  because the interrupt condition is more difficult to
++	 * fully clear in that mode.
++	 */
++	
++	/* Since some 5700_AX && 5700_BX have problems with 32BYTE
++	 * coalesce_mode, and the rest work fine anything set.
++	 * Don't enable HOST_CC_MODE_32BYTE in etherboot.
++	 */
++
++	/* Initialize MAC MI mode, polling disabled. */
++	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
++
++	/* Initialize data/descriptor byte/word swapping. */
++	tw32(GRC_MODE, tp->grc_mode);
++
++	tg3_switch_clocks(tp);
++
++	/* Clear this out for sanity. */
++	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
++
++	/* Etherboot does not need to check if the PCIX_TARGET_HWBUG
++	 * is needed.  It always uses it.
++	 */
++	
++	udelay(50);
++	tg3_nvram_init(tp);
++
++	/* The TX descriptors will reside in main memory.
++	 */
++
++	/* See which board we are using.
++	 */
++	grc_misc_cfg = tr32(GRC_MISC_CFG);
++	grc_misc_cfg &= GRC_MISC_CFG_BOARD_ID_MASK;
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
++	    grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5704CIOBE) {
++		tp->tg3_flags |= TG3_FLAG_SPLIT_MODE;
++		tp->split_mode_max_reqs = SPLIT_MODE_5704_MAX_REQ;
++	}
++
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
++	    (grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788 ||
++	     grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788M))
++		tp->tg3_flags2 |= TG3_FLG2_IS_5788;
++
++	/* these are limited to 10/100 only */
++	if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) &&
++		    ((grc_misc_cfg == 0x8000) || (grc_misc_cfg == 0x4000))) ||
++		((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
++			(tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM) &&
++			((tp->pdev->dev_id == PCI_DEVICE_ID_TIGON3_5901) ||
++				(tp->pdev->dev_id == PCI_DEVICE_ID_TIGON3_5901_2)))) {
++		tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
++	}
++
++	err = tg3_phy_probe(tp);
++	if (err) {
++		printf("phy probe failed, err %d\n", err);
++	}
++
++	tg3_read_partno(tp);
++
++
++	/* 5700 BX chips need to have their TX producer index mailboxes
++	 * written twice to workaround a bug.
++	 * In etherboot we do this unconditionally to simplify things.
++	 */
++
++	/* 5700 chips can get confused if TX buffers straddle the
++	 * 4GB address boundary in some cases.
++	 * 
++	 * In etherboot we can ignore the problem as etherboot lives below 4GB.
++	 */
++
++	/* In etherboot wake-on-lan is unconditionally disabled */
++	return err;
++}
++
++static int  tg3_get_device_address(struct tg3 *tp)
++{
++	struct nic *nic = tp->nic;
++	uint32_t hi, lo, mac_offset;
++
++	if (PCI_FUNC(tp->pdev->devfn) == 0)
++		mac_offset = 0x7c;
++	else
++		mac_offset = 0xcc;
++
++	/* First try to get it from MAC address mailbox. */
++	tg3_read_mem(NIC_SRAM_MAC_ADDR_HIGH_MBOX, &hi);
++	if ((hi >> 16) == 0x484b) {
++		nic->node_addr[0] = (hi >>  8) & 0xff;
++		nic->node_addr[1] = (hi >>  0) & 0xff;
++
++		tg3_read_mem(NIC_SRAM_MAC_ADDR_LOW_MBOX, &lo);
++		nic->node_addr[2] = (lo >> 24) & 0xff;
++		nic->node_addr[3] = (lo >> 16) & 0xff;
++		nic->node_addr[4] = (lo >>  8) & 0xff;
++		nic->node_addr[5] = (lo >>  0) & 0xff;
++	}
++	/* Next, try NVRAM. */
++	else if (!tg3_nvram_read(tp, mac_offset + 0, &hi) &&
++		 !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
++		nic->node_addr[0] = ((hi >> 16) & 0xff);
++		nic->node_addr[1] = ((hi >> 24) & 0xff);
++		nic->node_addr[2] = ((lo >>  0) & 0xff);
++		nic->node_addr[3] = ((lo >>  8) & 0xff);
++		nic->node_addr[4] = ((lo >> 16) & 0xff);
++		nic->node_addr[5] = ((lo >> 24) & 0xff);
++	}
++	/* Finally just fetch it out of the MAC control regs. */
++	else {
++		hi = tr32(MAC_ADDR_0_HIGH);
++		lo = tr32(MAC_ADDR_0_LOW);
++
++		nic->node_addr[5] = lo & 0xff;
++		nic->node_addr[4] = (lo >> 8) & 0xff;
++		nic->node_addr[3] = (lo >> 16) & 0xff;
++		nic->node_addr[2] = (lo >> 24) & 0xff;
++		nic->node_addr[1] = hi & 0xff;
++		nic->node_addr[0] = (hi >> 8) & 0xff;
++	}
++
++	return 0;
++}
++
++
++static int tg3_setup_dma(struct tg3 *tp)
++{
++	tw32(TG3PCI_CLOCK_CTRL, 0);
++
++	if ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) == 0) {
++		tp->dma_rwctrl =
++			(0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
++			(0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT) |
++			(0x7 << DMA_RWCTRL_WRITE_WATER_SHIFT) |
++			(0x7 << DMA_RWCTRL_READ_WATER_SHIFT) |
++			(0x0f << DMA_RWCTRL_MIN_DMA_SHIFT);
++		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
++			tp->dma_rwctrl &= ~(DMA_RWCTRL_MIN_DMA << DMA_RWCTRL_MIN_DMA_SHIFT);
++		}
++	} else {
++		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
++			tp->dma_rwctrl =
++				(0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
++				(0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT) |
++				(0x3 << DMA_RWCTRL_WRITE_WATER_SHIFT) |
++				(0x7 << DMA_RWCTRL_READ_WATER_SHIFT) |
++				(0x00 << DMA_RWCTRL_MIN_DMA_SHIFT);
++		else
++			tp->dma_rwctrl =
++				(0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
++				(0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT) |
++				(0x3 << DMA_RWCTRL_WRITE_WATER_SHIFT) |
++				(0x3 << DMA_RWCTRL_READ_WATER_SHIFT) |
++				(0x0f << DMA_RWCTRL_MIN_DMA_SHIFT);
++
++		/* Wheee, some more chip bugs... */
++		if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
++			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)) {
++			uint32_t ccval = tr32(TG3PCI_CLOCK_CTRL) & 0x1f;
++
++			if ((ccval == 0x6) || (ccval == 0x7)) {
++				tp->dma_rwctrl |= DMA_RWCTRL_ONE_DMA;
++			}
++		}
++	}
++
++	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
++		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)) {
++		tp->dma_rwctrl &= ~(DMA_RWCTRL_MIN_DMA << DMA_RWCTRL_MIN_DMA_SHIFT);
++	}
++
++	tp->dma_rwctrl |= DMA_RWCTRL_ASSERT_ALL_BE;
++
++	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
++
++	return 0;
++}
++
++static void tg3_init_link_config(struct tg3 *tp)
++{
++	tp->link_config.advertising =
++		(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
++		 ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
++		 ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
++		 ADVERTISED_Autoneg | ADVERTISED_MII);
++	tp->carrier_ok = 0;
++	tp->link_config.active_speed = SPEED_INVALID;
++	tp->link_config.active_duplex = DUPLEX_INVALID;
++}
++
++
++#if SUPPORT_PHY_STR
++static const char * tg3_phy_string(struct tg3 *tp)
++{
++	switch (tp->phy_id & PHY_ID_MASK) {
++	case PHY_ID_BCM5400:	return "5400";
++	case PHY_ID_BCM5401:	return "5401";
++	case PHY_ID_BCM5411:	return "5411";
++	case PHY_ID_BCM5701:	return "5701";
++	case PHY_ID_BCM5703:	return "5703";
++	case PHY_ID_BCM5704:	return "5704";
++	case PHY_ID_BCM8002:	return "8002";
++	case PHY_ID_SERDES:	return "serdes";
++	default:		return "unknown";
++	};
++}
++#else
++#define tg3_phy_string(TP) "?"
++#endif
++
++
++static void tg3_poll_link(struct tg3 *tp)
++{
++	uint32_t mac_stat;
++
++	mac_stat = tr32(MAC_STATUS);
++	if (tp->phy_id == PHY_ID_SERDES) {
++		if (tp->carrier_ok?
++			(mac_stat & MAC_STATUS_LNKSTATE_CHANGED):
++			(mac_stat & MAC_STATUS_PCS_SYNCED)) {
++			tw32_carefully(MAC_MODE, tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK);
++			tw32_carefully(MAC_MODE, tp->mac_mode);
++
++			tg3_setup_phy(tp);
++		}
++	}
++	else {
++		if (mac_stat & MAC_STATUS_LNKSTATE_CHANGED) {
++			tg3_setup_phy(tp);
++		}
++	}
++}
++
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static void tg3_ack_irqs(struct tg3 *tp)
++{
++	if (tp->hw_status->status & SD_STATUS_UPDATED) {
++		/*
++		 * writing any value to intr-mbox-0 clears PCI INTA# and
++		 * chip-internal interrupt pending events.
++		 * writing non-zero to intr-mbox-0 additional tells the
++		 * NIC to stop sending us irqs, engaging "in-intr-handler"
++		 * event coalescing.
++		 */
++		tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 
++			0x00000001);
++		/*
++		 * Flush PCI write.  This also guarantees that our
++		 * status block has been flushed to host memory.
++		 */
++		tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
++		tp->hw_status->status &= ~SD_STATUS_UPDATED;
++	}
++}
++
++static int tg3_poll(struct nic *nic, int retrieve)
++{
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++
++	struct tg3 *tp = &tg3;
++	int result;
++
++	result = 0;
++
++	if ( (tp->hw_status->idx[0].rx_producer != tp->rx_rcb_ptr) && !retrieve ) 
++	  return 1;
++
++	tg3_ack_irqs(tp);
++
++	if (tp->hw_status->idx[0].rx_producer != tp->rx_rcb_ptr) {
++		struct tg3_rx_buffer_desc *desc;
++		unsigned int len;
++		desc = &tp->rx_rcb[tp->rx_rcb_ptr];
++		if ((desc->opaque & RXD_OPAQUE_RING_MASK) == RXD_OPAQUE_RING_STD) {
++			len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - 4; /* omit crc */
++			
++			nic->packetlen = len;
++			memcpy(nic->packet, bus_to_virt(desc->addr_lo), len);
++			result = 1;
++		}
++		tp->rx_rcb_ptr = (tp->rx_rcb_ptr + 1) % TG3_RX_RCB_RING_SIZE;
++		
++		/* ACK the status ring */
++		tw32_mailbox2(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, tp->rx_rcb_ptr);
++
++		/* Refill RX ring. */
++		if (result) {
++			tp->rx_std_ptr = (tp->rx_std_ptr + 1) % TG3_RX_RING_SIZE;
++			tw32_mailbox2(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW, tp->rx_std_ptr);
++		}
++	}
++	tg3_poll_link(tp);
++	return result;
++}
++
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++#if 0
++static void tg3_set_txd(struct tg3 *tp, int entry,
++	dma_addr_t mapping, int len, uint32_t flags,
++	uint32_t mss_and_is_end)
++{
++	struct tg3_tx_buffer_desc *txd =  &tp->tx_ring[entry];
++	int is_end = (mss_and_is_end & 0x1);
++	if (is_end) {
++		flags |= TXD_FLAG_END;
++	}
++
++	txd->addr_hi   = 0;
++	txd->addr_lo   = mapping & 0xffffffff;
++	txd->len_flags = (len << TXD_LEN_SHIFT) | flags;
++	txd->vlan_tag  = 0 << TXD_VLAN_TAG_SHIFT;
++}
++#endif
++
++static void tg3_transmit(struct nic *nic, const char *dst_addr,
++	unsigned int type, unsigned int size, const char *packet)
++{
++	static struct eth_frame {
++		uint8_t  dst_addr[ETH_ALEN];
++		uint8_t  src_addr[ETH_ALEN];
++		uint16_t type;
++		uint8_t  data [ETH_FRAME_LEN - ETH_HLEN];
++	} frame[2];
++	static int frame_idx;
++	
++	/* send the packet to destination */
++	struct tg3_tx_buffer_desc *txd;
++	struct tg3 *tp;
++	uint32_t entry;
++	int i;
++
++	/* Wait until there is a free packet frame */
++	tp = &tg3;
++	i = 0;
++	entry = tp->tx_prod;
++	while((tp->hw_status->idx[0].tx_consumer != entry) &&
++		(tp->hw_status->idx[0].tx_consumer != PREV_TX(entry))) {
++		mdelay(10);	/* give the nick a chance */
++		poll_interruptions();
++		if (++i > 500) { /* timeout 5s for transmit */
++			printf("transmit timed out\n");
++			tg3_halt(tp);
++			tg3_setup_hw(tp);
++			return;
++		}
++	}
++	if (i != 0) {
++		printf("#");
++	}
++	
++	/* Copy the packet to the our local buffer */
++	memcpy(&frame[frame_idx].dst_addr, dst_addr, ETH_ALEN);
++	memcpy(&frame[frame_idx].src_addr, nic->node_addr, ETH_ALEN);
++	frame[frame_idx].type = htons(type);
++	memset(&frame[frame_idx].data, 0, sizeof(frame[frame_idx].data));
++	memcpy(&frame[frame_idx].data, packet, size);
++
++	/* Setup the ring buffer entry to transmit */
++	txd            = &tp->tx_ring[entry];
++	txd->addr_hi   = 0; /* Etherboot runs under 4GB */
++	txd->addr_lo   = virt_to_bus(&frame[frame_idx]);
++	txd->len_flags = ((size + ETH_HLEN) << TXD_LEN_SHIFT) | TXD_FLAG_END;
++	txd->vlan_tag  = 0 << TXD_VLAN_TAG_SHIFT;
++
++	/* Advance to the next entry */
++	entry = NEXT_TX(entry);
++	frame_idx ^= 1;
++
++	/* Packets are ready, update Tx producer idx local and on card */
++	tw32_mailbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
++	tw32_mailbox2((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
++	tp->tx_prod = entry;
++}
++
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++static void tg3_disable(struct dev *dev __unused)
++{
++	struct tg3 *tp = &tg3;
++	/* put the card in its initial state */
++	/* This function serves 3 purposes.
++	 * This disables DMA and interrupts so we don't receive
++	 *  unexpected packets or interrupts from the card after
++	 *  etherboot has finished. 
++	 * This frees resources so etherboot may use
++	 *  this driver on another interface
++	 * This allows etherboot to reinitialize the interface
++	 *  if something is something goes wrong.
++	 */
++	tg3_halt(tp);
++	tp->tg3_flags &= ~(TG3_FLAG_INIT_COMPLETE|TG3_FLAG_GOT_SERDES_FLOWCTL);
++	tp->carrier_ok = 0;
++	iounmap((void *)tp->regs);
++}
++
++/**************************************************************************
++IRQ - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void tg3_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++You should omit the last argument struct pci_device * for a non-PCI NIC
++***************************************************************************/
++static int tg3_probe(struct dev *dev, struct pci_device *pdev)
++{
++	struct nic *nic = (struct nic *)dev;
++	struct tg3 *tp = &tg3;
++	unsigned long tg3reg_base, tg3reg_len;
++	int i, err, pm_cap;
++
++	if (pdev == 0)
++		return 0;
++
++	memset(tp, 0, sizeof(*tp));
++
++	adjust_pci_device(pdev);
++
++	nic->irqno  = 0;
++	nic->ioaddr = pdev->ioaddr & ~3;
++
++	/* Find power-management capability. */
++	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
++	if (pm_cap == 0) {
++		printf("Cannot find PowerManagement capability, aborting.\n");
++		return 0;
++	}
++	tg3reg_base = pci_bar_start(pdev, PCI_BASE_ADDRESS_0);
++	if (tg3reg_base == -1UL) {
++		printf("Unuseable bar\n");
++		return 0;
++	}
++	tg3reg_len  = pci_bar_size(pdev,  PCI_BASE_ADDRESS_0);
++
++	tp->pdev       = pdev;
++	tp->nic        = nic;
++	tp->pm_cap     = pm_cap;
++	tp->rx_mode    = 0;
++	tp->tx_mode    = 0;
++	tp->mi_mode    = MAC_MI_MODE_BASE;
++	tp->tg3_flags  = 0 & ~TG3_FLAG_INIT_COMPLETE; 
++	
++	/* The word/byte swap controls here control register access byte
++	 * swapping.  DMA data byte swapping is controlled in the GRC_MODE
++	 * setting below.
++	 */
++	tp->misc_host_ctrl =
++		MISC_HOST_CTRL_MASK_PCI_INT |
++		MISC_HOST_CTRL_WORD_SWAP |
++		MISC_HOST_CTRL_INDIR_ACCESS |
++		MISC_HOST_CTRL_PCISTATE_RW;
++
++	/* The NONFRM (non-frame) byte/word swap controls take effect
++	 * on descriptor entries, anything which isn't packet data.
++	 *
++	 * The StrongARM chips on the board (one for tx, one for rx)
++	 * are running in big-endian mode.
++	 */
++	tp->grc_mode = (GRC_MODE_WSWAP_DATA | GRC_MODE_BSWAP_DATA |
++			GRC_MODE_WSWAP_NONFRM_DATA);
++#if __BYTE_ORDER == __BIG_ENDIAN
++	tp->grc_mode |= GRC_MODE_BSWAP_NONFRM_DATA;
++#endif
++	tp->regs = (unsigned long) ioremap(tg3reg_base, tg3reg_len);
++	if (tp->regs == 0UL) {
++		printf("Cannot map device registers, aborting\n");
++		return 0;
++	}
++
++	tg3_init_link_config(tp);
++
++	err = tg3_get_invariants(tp);
++	if (err) {
++		printf("Problem fetching invariants of chip, aborting.\n");
++		goto err_out_iounmap;
++	}
++
++	err = tg3_get_device_address(tp);
++	if (err) {
++		printf("Could not obtain valid ethernet address, aborting.\n");
++		goto err_out_iounmap;
++	}
++	printf("Ethernet addr: %!\n", nic->node_addr);
++
++	tg3_setup_dma(tp);
++
++	/* Now that we have fully setup the chip, save away a snapshot
++	 * of the PCI config space.  We need to restore this after
++	 * GRC_MISC_CFG core clock resets and some resume events.
++	 */
++	pci_save_state(tp->pdev, tp->pci_cfg_state);
++
++	printf("Tigon3 [partno(%s) rev %hx PHY(%s)] (PCI%s:%s:%s)\n",
++		tp->board_part_number,
++		tp->pci_chip_rev_id,
++		tg3_phy_string(tp),
++		((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "X" : ""),
++		((tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) ?
++			((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "133MHz" : "66MHz") :
++			((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "100MHz" : "33MHz")),
++		((tp->tg3_flags & TG3_FLAG_PCI_32BIT) ? "32-bit" : "64-bit"));
++
++
++	err = tg3_setup_hw(tp); 
++	if (err) {
++		goto err_out_disable;
++	} 
++	tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
++
++	/* Wait for a reasonable time for the link to come up */
++	tg3_poll_link(tp);
++	for(i = 0; !tp->carrier_ok && (i < VALID_LINK_TIMEOUT*100); i++) {
++		mdelay(1);
++		tg3_poll_link(tp);
++	}
++	if (!tp->carrier_ok){
++		printf("Valid link not established\n");
++		goto err_out_disable;
++	}
++
++	dev->disable  = tg3_disable;
++	nic->poll     = tg3_poll;
++	nic->transmit = tg3_transmit;
++	nic->irq      = tg3_irq;
++
++	return 1;
++
++ err_out_iounmap:
++	iounmap((void *)tp->regs);
++	return 0;
++ err_out_disable:
++	tg3_disable(dev);
++	return 0;
++}
++
++static struct pci_id tg3_nics[] = {
++PCI_ROM(0x14e4, 0x1644, "tg3-5700",        "Broadcom Tigon 3 5700"),
++PCI_ROM(0x14e4, 0x1645, "tg3-5701",        "Broadcom Tigon 3 5701"),
++PCI_ROM(0x14e4, 0x1646, "tg3-5702",        "Broadcom Tigon 3 5702"),
++PCI_ROM(0x14e4, 0x1647, "tg3-5703",        "Broadcom Tigon 3 5703"),
++PCI_ROM(0x14e4, 0x1648, "tg3-5704",        "Broadcom Tigon 3 5704"),
++PCI_ROM(0x14e4, 0x164d, "tg3-5702FE",      "Broadcom Tigon 3 5702FE"),
++PCI_ROM(0x14e4, 0x1653, "tg3-5705",        "Broadcom Tigon 3 5705"),
++PCI_ROM(0x14e4, 0x1654, "tg3-5705_2",      "Broadcom Tigon 3 5705_2"),
++PCI_ROM(0x14e4, 0x165d, "tg3-5705M",       "Broadcom Tigon 3 5705M"),
++PCI_ROM(0x14e4, 0x165e, "tg3-5705M_2",     "Broadcom Tigon 3 5705M_2"),
++PCI_ROM(0x14e4, 0x1696, "tg3-5782",        "Broadcom Tigon 3 5782"),
++PCI_ROM(0x14e4, 0x169c, "tg3-5788",        "Broadcom Tigon 3 5788"),
++PCI_ROM(0x14e4, 0x16a6, "tg3-5702X",       "Broadcom Tigon 3 5702X"),
++PCI_ROM(0x14e4, 0x16a7, "tg3-5703X",       "Broadcom Tigon 3 5703X"),
++PCI_ROM(0x14e4, 0x16a8, "tg3-5704S",       "Broadcom Tigon 3 5704S"),
++PCI_ROM(0x14e4, 0x16c6, "tg3-5702A3",      "Broadcom Tigon 3 5702A3"),
++PCI_ROM(0x14e4, 0x16c7, "tg3-5703A3",      "Broadcom Tigon 3 5703A3"),
++PCI_ROM(0x14e4, 0x170d, "tg3-5901",        "Broadcom Tigon 3 5901"),
++PCI_ROM(0x14e4, 0x170e, "tg3-5901_2",      "Broadcom Tigon 3 5901_2"),
++PCI_ROM(0x1148, 0x4400, "tg3-9DXX",        "Syskonnect 9DXX"),
++PCI_ROM(0x1148, 0x4500, "tg3-9MXX",        "Syskonnect 9MXX"),
++PCI_ROM(0x173b, 0x03e8, "tg3-ac1000",      "Altima AC1000"),
++PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001"),
++PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100"),
++PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003"),
++};
++
++struct pci_driver tg3_driver = {
++	.type	  = NIC_DRIVER,
++	.name	  = "TG3",
++	.probe	  = tg3_probe,
++	.ids	  = tg3_nics,
++	.id_count = sizeof(tg3_nics)/sizeof(tg3_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/tg3.h grub-0.97/netboot/tg3.h
+--- grub-0.97.orig/netboot/tg3.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/tg3.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,2203 @@
++/* $Id: grub-0.95-diskless-patch-2.patch,v 1.1.1.1 2005/06/14 08:18:50 wesolows Exp $
++ * tg3.h: Definitions for Broadcom Tigon3 ethernet driver.
++ *
++ * Copyright (C) 2001, 2002 David S. Miller (davem@redhat.com)
++ * Copyright (C) 2001 Jeff Garzik (jgarzik@mandrakesoft.com)
++ */
++
++#ifndef _T3_H
++#define _T3_H
++
++#include "stdint.h"
++
++typedef unsigned long dma_addr_t;
++
++/* From mii.h */
++
++/* Indicates what features are advertised by the interface. */
++#define ADVERTISED_10baseT_Half		(1 << 0)
++#define ADVERTISED_10baseT_Full		(1 << 1)
++#define ADVERTISED_100baseT_Half	(1 << 2)
++#define ADVERTISED_100baseT_Full	(1 << 3)
++#define ADVERTISED_1000baseT_Half	(1 << 4)
++#define ADVERTISED_1000baseT_Full	(1 << 5)
++#define ADVERTISED_Autoneg		(1 << 6)
++#define ADVERTISED_TP			(1 << 7)
++#define ADVERTISED_AUI			(1 << 8)
++#define ADVERTISED_MII			(1 << 9)
++#define ADVERTISED_FIBRE		(1 << 10)
++#define ADVERTISED_BNC			(1 << 11)
++
++/* The following are all involved in forcing a particular link
++ * mode for the device for setting things.  When getting the
++ * devices settings, these indicate the current mode and whether
++ * it was foced up into this mode or autonegotiated.
++ */
++
++/* The forced speed, 10Mb, 100Mb, gigabit. */
++#define SPEED_10		0
++#define SPEED_100		1
++#define SPEED_1000		2
++#define SPEED_INVALID           3
++
++
++/* Duplex, half or full. */
++#define DUPLEX_HALF		0x00
++#define DUPLEX_FULL		0x01
++#define DUPLEX_INVALID          0x02
++
++/* Which connector port. */
++#define PORT_TP			0x00
++#define PORT_AUI		0x01
++#define PORT_MII		0x02
++#define PORT_FIBRE		0x03
++#define PORT_BNC		0x04
++
++/* Which tranceiver to use. */
++#define XCVR_INTERNAL		0x00
++#define XCVR_EXTERNAL		0x01
++#define XCVR_DUMMY1		0x02
++#define XCVR_DUMMY2		0x03
++#define XCVR_DUMMY3		0x04
++
++/* Enable or disable autonegotiation.  If this is set to enable,
++ * the forced link modes above are completely ignored.
++ */
++#define AUTONEG_DISABLE		0x00
++#define AUTONEG_ENABLE		0x01
++
++/* Wake-On-Lan options. */
++#define WAKE_PHY		(1 << 0)
++#define WAKE_UCAST		(1 << 1)
++#define WAKE_MCAST		(1 << 2)
++#define WAKE_BCAST		(1 << 3)
++#define WAKE_ARP		(1 << 4)
++#define WAKE_MAGIC		(1 << 5)
++#define WAKE_MAGICSECURE	(1 << 6) /* only meaningful if WAKE_MAGIC */
++
++/* Generic MII registers. */
++
++#define MII_BMCR            0x00        /* Basic mode control register */
++#define MII_BMSR            0x01        /* Basic mode status register  */
++#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
++#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
++#define MII_ADVERTISE       0x04        /* Advertisement control reg   */
++#define MII_LPA             0x05        /* Link partner ability reg    */
++#define MII_EXPANSION       0x06        /* Expansion register          */
++#define MII_DCOUNTER        0x12        /* Disconnect counter          */
++#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
++#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
++#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
++#define MII_SREVISION       0x16        /* Silicon revision            */
++#define MII_RESV1           0x17        /* Reserved...                 */
++#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
++#define MII_PHYADDR         0x19        /* PHY address                 */
++#define MII_RESV2           0x1a        /* Reserved...                 */
++#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
++#define MII_NCONFIG         0x1c        /* Network interface config    */
++
++/* Basic mode control register. */
++#define BMCR_RESV               0x007f  /* Unused...                   */
++#define BMCR_CTST               0x0080  /* Collision test              */
++#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
++#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
++#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
++#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
++#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
++#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
++#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
++#define BMCR_RESET              0x8000  /* Reset the DP83840           */
++
++/* Basic mode status register. */
++#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
++#define BMSR_JCD                0x0002  /* Jabber detected             */
++#define BMSR_LSTATUS            0x0004  /* Link status                 */
++#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
++#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
++#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
++#define BMSR_RESV               0x07c0  /* Unused...                   */
++#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
++#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
++#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
++#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
++#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
++
++/* Advertisement control register. */
++#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
++#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
++#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
++#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
++#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
++#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
++#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
++#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
++#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
++#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
++#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
++
++#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
++			ADVERTISE_CSMA)
++#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
++                       ADVERTISE_100HALF | ADVERTISE_100FULL)
++
++/* Link partner ability register. */
++#define LPA_SLCT                0x001f  /* Same as advertise selector  */
++#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
++#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
++#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
++#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
++#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
++#define LPA_RESV                0x1c00  /* Unused...                   */
++#define LPA_RFAULT              0x2000  /* Link partner faulted        */
++#define LPA_LPACK               0x4000  /* Link partner acked us       */
++#define LPA_NPAGE               0x8000  /* Next page bit               */
++
++#define LPA_DUPLEX		(LPA_10FULL | LPA_100FULL)
++#define LPA_100			(LPA_100FULL | LPA_100HALF | LPA_100BASE4)
++
++/* Expansion register for auto-negotiation. */
++#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
++#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
++#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
++#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
++#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
++#define EXPANSION_RESV          0xffe0  /* Unused...                   */
++
++/* N-way test register. */
++#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
++#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
++#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
++
++
++/* From tg3.h */
++
++#define TG3_64BIT_REG_HIGH		0x00UL
++#define TG3_64BIT_REG_LOW		0x04UL
++
++/* Descriptor block info. */
++#define TG3_BDINFO_HOST_ADDR		0x0UL /* 64-bit */
++#define TG3_BDINFO_MAXLEN_FLAGS		0x8UL /* 32-bit */
++#define  BDINFO_FLAGS_USE_EXT_RECV	 0x00000001 /* ext rx_buffer_desc */
++#define  BDINFO_FLAGS_DISABLED		 0x00000002
++#define  BDINFO_FLAGS_MAXLEN_MASK	 0xffff0000
++#define  BDINFO_FLAGS_MAXLEN_SHIFT	 16
++#define TG3_BDINFO_NIC_ADDR		0xcUL /* 32-bit */
++#define TG3_BDINFO_SIZE			0x10UL
++
++#define RX_COPY_THRESHOLD  		256
++
++#define RX_STD_MAX_SIZE			1536
++#define RX_STD_MAX_SIZE_5705		512
++#define RX_JUMBO_MAX_SIZE		0xdeadbeef /* XXX */
++
++/* First 256 bytes are a mirror of PCI config space. */
++#define TG3PCI_VENDOR			0x00000000
++#define  TG3PCI_VENDOR_BROADCOM		 0x14e4
++#define TG3PCI_DEVICE			0x00000002
++#define  TG3PCI_DEVICE_TIGON3_1		 0x1644 /* BCM5700 */
++#define  TG3PCI_DEVICE_TIGON3_2		 0x1645 /* BCM5701 */
++#define  TG3PCI_DEVICE_TIGON3_3		 0x1646 /* BCM5702 */
++#define  TG3PCI_DEVICE_TIGON3_4		 0x1647 /* BCM5703 */
++#define TG3PCI_COMMAND			0x00000004
++#define TG3PCI_STATUS			0x00000006
++#define TG3PCI_CCREVID			0x00000008
++#define TG3PCI_CACHELINESZ		0x0000000c
++#define TG3PCI_LATTIMER			0x0000000d
++#define TG3PCI_HEADERTYPE		0x0000000e
++#define TG3PCI_BIST			0x0000000f
++#define TG3PCI_BASE0_LOW		0x00000010
++#define TG3PCI_BASE0_HIGH		0x00000014
++/* 0x18 --> 0x2c unused */
++#define TG3PCI_SUBSYSVENID		0x0000002c
++#define TG3PCI_SUBSYSID			0x0000002e
++#define TG3PCI_ROMADDR			0x00000030
++#define TG3PCI_CAPLIST			0x00000034
++/* 0x35 --> 0x3c unused */
++#define TG3PCI_IRQ_LINE			0x0000003c
++#define TG3PCI_IRQ_PIN			0x0000003d
++#define TG3PCI_MIN_GNT			0x0000003e
++#define TG3PCI_MAX_LAT			0x0000003f
++#define TG3PCI_X_CAPS			0x00000040
++#define  PCIX_CAPS_RELAXED_ORDERING	 0x00020000
++#define  PCIX_CAPS_SPLIT_MASK		 0x00700000
++#define  PCIX_CAPS_SPLIT_SHIFT		 20
++#define  PCIX_CAPS_BURST_MASK		 0x000c0000
++#define  PCIX_CAPS_BURST_SHIFT		 18
++#define  PCIX_CAPS_MAX_BURST_CPIOB	 2
++#define TG3PCI_PM_CAP_PTR		0x00000041
++#define TG3PCI_X_COMMAND		0x00000042
++#define TG3PCI_X_STATUS			0x00000044
++#define TG3PCI_PM_CAP_ID		0x00000048
++#define TG3PCI_VPD_CAP_PTR		0x00000049
++#define TG3PCI_PM_CAPS			0x0000004a
++#define TG3PCI_PM_CTRL_STAT		0x0000004c
++#define TG3PCI_BR_SUPP_EXT		0x0000004e
++#define TG3PCI_PM_DATA			0x0000004f
++#define TG3PCI_VPD_CAP_ID		0x00000050
++#define TG3PCI_MSI_CAP_PTR		0x00000051
++#define TG3PCI_VPD_ADDR_FLAG		0x00000052
++#define  VPD_ADDR_FLAG_WRITE		0x00008000
++#define TG3PCI_VPD_DATA			0x00000054
++#define TG3PCI_MSI_CAP_ID		0x00000058
++#define TG3PCI_NXT_CAP_PTR		0x00000059
++#define TG3PCI_MSI_CTRL			0x0000005a
++#define TG3PCI_MSI_ADDR_LOW		0x0000005c
++#define TG3PCI_MSI_ADDR_HIGH		0x00000060
++#define TG3PCI_MSI_DATA			0x00000064
++/* 0x66 --> 0x68 unused */
++#define TG3PCI_MISC_HOST_CTRL		0x00000068
++#define  MISC_HOST_CTRL_CLEAR_INT	 0x00000001
++#define  MISC_HOST_CTRL_MASK_PCI_INT	 0x00000002
++#define  MISC_HOST_CTRL_BYTE_SWAP	 0x00000004
++#define  MISC_HOST_CTRL_WORD_SWAP	 0x00000008
++#define  MISC_HOST_CTRL_PCISTATE_RW	 0x00000010
++#define  MISC_HOST_CTRL_CLKREG_RW	 0x00000020
++#define  MISC_HOST_CTRL_REGWORD_SWAP	 0x00000040
++#define  MISC_HOST_CTRL_INDIR_ACCESS	 0x00000080
++#define  MISC_HOST_CTRL_IRQ_MASK_MODE	 0x00000100
++#define  MISC_HOST_CTRL_TAGGED_STATUS	 0x00000200
++#define  MISC_HOST_CTRL_CHIPREV		 0xffff0000
++#define  MISC_HOST_CTRL_CHIPREV_SHIFT	 16
++#define  GET_CHIP_REV_ID(MISC_HOST_CTRL) \
++	 (((MISC_HOST_CTRL) & MISC_HOST_CTRL_CHIPREV) >> \
++	  MISC_HOST_CTRL_CHIPREV_SHIFT)
++#define  CHIPREV_ID_5700_A0		 0x7000
++#define  CHIPREV_ID_5700_A1		 0x7001
++#define  CHIPREV_ID_5700_B0		 0x7100
++#define  CHIPREV_ID_5700_B1		 0x7101
++#define  CHIPREV_ID_5700_B3		 0x7102
++#define  CHIPREV_ID_5700_ALTIMA		 0x7104
++#define  CHIPREV_ID_5700_C0		 0x7200
++#define  CHIPREV_ID_5701_A0		 0x0000
++#define  CHIPREV_ID_5701_B0		 0x0100
++#define  CHIPREV_ID_5701_B2		 0x0102
++#define  CHIPREV_ID_5701_B5		 0x0105
++#define  CHIPREV_ID_5703_A0		 0x1000
++#define  CHIPREV_ID_5703_A1		 0x1001
++#define  CHIPREV_ID_5703_A2		 0x1002
++#define  CHIPREV_ID_5703_A3		 0x1003
++#define  CHIPREV_ID_5704_A0		 0x2000
++#define  CHIPREV_ID_5704_A1		 0x2001
++#define  CHIPREV_ID_5704_A2		 0x2002
++#define  CHIPREV_ID_5705_A0		 0x3000
++#define  CHIPREV_ID_5705_A1		 0x3001
++#define	 CHIPREV_ID_5705_A2              0x3002
++#define  CHIPREV_ID_5705_A3              0x3003
++#define  GET_ASIC_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 12)
++#define   ASIC_REV_5700			 0x07
++#define   ASIC_REV_5701			 0x00
++#define   ASIC_REV_5703			 0x01
++#define   ASIC_REV_5704			 0x02
++#define   ASIC_REV_5705			 0x03
++#define  GET_CHIP_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 8)
++#define   CHIPREV_5700_AX		 0x70
++#define   CHIPREV_5700_BX		 0x71
++#define   CHIPREV_5700_CX		 0x72
++#define   CHIPREV_5701_AX		 0x00
++#define  GET_METAL_REV(CHIP_REV_ID)	((CHIP_REV_ID) & 0xff)
++#define   METAL_REV_A0			 0x00
++#define   METAL_REV_A1			 0x01
++#define   METAL_REV_B0			 0x00
++#define   METAL_REV_B1			 0x01
++#define   METAL_REV_B2			 0x02
++#define TG3PCI_DMA_RW_CTRL		0x0000006c
++#define  DMA_RWCTRL_MIN_DMA		 0x000000ff
++#define  DMA_RWCTRL_MIN_DMA_SHIFT	 0
++#define  DMA_RWCTRL_READ_BNDRY_MASK	 0x00000700
++#define  DMA_RWCTRL_READ_BNDRY_DISAB	 0x00000000
++#define  DMA_RWCTRL_READ_BNDRY_16	 0x00000100
++#define  DMA_RWCTRL_READ_BNDRY_32	 0x00000200
++#define  DMA_RWCTRL_READ_BNDRY_64	 0x00000300
++#define  DMA_RWCTRL_READ_BNDRY_128	 0x00000400
++#define  DMA_RWCTRL_READ_BNDRY_256	 0x00000500
++#define  DMA_RWCTRL_READ_BNDRY_512	 0x00000600
++#define  DMA_RWCTRL_READ_BNDRY_1024	 0x00000700
++#define  DMA_RWCTRL_WRITE_BNDRY_MASK	 0x00003800
++#define  DMA_RWCTRL_WRITE_BNDRY_DISAB	 0x00000000
++#define  DMA_RWCTRL_WRITE_BNDRY_16	 0x00000800
++#define  DMA_RWCTRL_WRITE_BNDRY_32	 0x00001000
++#define  DMA_RWCTRL_WRITE_BNDRY_64	 0x00001800
++#define  DMA_RWCTRL_WRITE_BNDRY_128	 0x00002000
++#define  DMA_RWCTRL_WRITE_BNDRY_256	 0x00002800
++#define  DMA_RWCTRL_WRITE_BNDRY_512	 0x00003000
++#define  DMA_RWCTRL_WRITE_BNDRY_1024	 0x00003800
++#define  DMA_RWCTRL_ONE_DMA		 0x00004000
++#define  DMA_RWCTRL_READ_WATER		 0x00070000
++#define  DMA_RWCTRL_READ_WATER_SHIFT	 16
++#define  DMA_RWCTRL_WRITE_WATER		 0x00380000
++#define  DMA_RWCTRL_WRITE_WATER_SHIFT	 19
++#define  DMA_RWCTRL_USE_MEM_READ_MULT	 0x00400000
++#define  DMA_RWCTRL_ASSERT_ALL_BE	 0x00800000
++#define  DMA_RWCTRL_PCI_READ_CMD	 0x0f000000
++#define  DMA_RWCTRL_PCI_READ_CMD_SHIFT	 24
++#define  DMA_RWCTRL_PCI_WRITE_CMD	 0xf0000000
++#define  DMA_RWCTRL_PCI_WRITE_CMD_SHIFT	 28
++#define TG3PCI_PCISTATE			0x00000070
++#define  PCISTATE_FORCE_RESET		 0x00000001
++#define  PCISTATE_INT_NOT_ACTIVE	 0x00000002
++#define  PCISTATE_CONV_PCI_MODE		 0x00000004
++#define  PCISTATE_BUS_SPEED_HIGH	 0x00000008
++#define  PCISTATE_BUS_32BIT		 0x00000010
++#define  PCISTATE_ROM_ENABLE		 0x00000020
++#define  PCISTATE_ROM_RETRY_ENABLE	 0x00000040
++#define  PCISTATE_FLAT_VIEW		 0x00000100
++#define  PCISTATE_RETRY_SAME_DMA	 0x00002000
++#define TG3PCI_CLOCK_CTRL		0x00000074
++#define  CLOCK_CTRL_CORECLK_DISABLE	 0x00000200
++#define  CLOCK_CTRL_RXCLK_DISABLE	 0x00000400
++#define  CLOCK_CTRL_TXCLK_DISABLE	 0x00000800
++#define  CLOCK_CTRL_ALTCLK		 0x00001000
++#define  CLOCK_CTRL_PWRDOWN_PLL133	 0x00008000
++#define  CLOCK_CTRL_44MHZ_CORE		 0x00040000
++#define  CLOCK_CTRL_625_CORE		 0x00100000
++#define  CLOCK_CTRL_FORCE_CLKRUN	 0x00200000
++#define  CLOCK_CTRL_CLKRUN_OENABLE	 0x00400000
++#define  CLOCK_CTRL_DELAY_PCI_GRANT	 0x80000000
++#define TG3PCI_REG_BASE_ADDR		0x00000078
++#define TG3PCI_MEM_WIN_BASE_ADDR	0x0000007c
++#define TG3PCI_REG_DATA			0x00000080
++#define TG3PCI_MEM_WIN_DATA		0x00000084
++#define TG3PCI_MODE_CTRL		0x00000088
++#define TG3PCI_MISC_CFG			0x0000008c
++#define TG3PCI_MISC_LOCAL_CTRL		0x00000090
++/* 0x94 --> 0x98 unused */
++#define TG3PCI_STD_RING_PROD_IDX	0x00000098 /* 64-bit */
++#define TG3PCI_RCV_RET_RING_CON_IDX	0x000000a0 /* 64-bit */
++#define TG3PCI_SND_PROD_IDX		0x000000a8 /* 64-bit */
++/* 0xb0 --> 0x100 unused */
++
++/* 0x100 --> 0x200 unused */
++
++/* Mailbox registers */
++#define MAILBOX_INTERRUPT_0		0x00000200 /* 64-bit */
++#define MAILBOX_INTERRUPT_1		0x00000208 /* 64-bit */
++#define MAILBOX_INTERRUPT_2		0x00000210 /* 64-bit */
++#define MAILBOX_INTERRUPT_3		0x00000218 /* 64-bit */
++#define MAILBOX_GENERAL_0		0x00000220 /* 64-bit */
++#define MAILBOX_GENERAL_1		0x00000228 /* 64-bit */
++#define MAILBOX_GENERAL_2		0x00000230 /* 64-bit */
++#define MAILBOX_GENERAL_3		0x00000238 /* 64-bit */
++#define MAILBOX_GENERAL_4		0x00000240 /* 64-bit */
++#define MAILBOX_GENERAL_5		0x00000248 /* 64-bit */
++#define MAILBOX_GENERAL_6		0x00000250 /* 64-bit */
++#define MAILBOX_GENERAL_7		0x00000258 /* 64-bit */
++#define MAILBOX_RELOAD_STAT		0x00000260 /* 64-bit */
++#define MAILBOX_RCV_STD_PROD_IDX	0x00000268 /* 64-bit */
++#define MAILBOX_RCV_JUMBO_PROD_IDX	0x00000270 /* 64-bit */
++#define MAILBOX_RCV_MINI_PROD_IDX	0x00000278 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_0	0x00000280 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_1	0x00000288 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_2	0x00000290 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_3	0x00000298 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_4	0x000002a0 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_5	0x000002a8 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_6	0x000002b0 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_7	0x000002b8 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_8	0x000002c0 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_9	0x000002c8 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_10	0x000002d0 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_11	0x000002d8 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_12	0x000002e0 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_13	0x000002e8 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_14	0x000002f0 /* 64-bit */
++#define MAILBOX_RCVRET_CON_IDX_15	0x000002f8 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_0	0x00000300 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_1	0x00000308 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_2	0x00000310 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_3	0x00000318 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_4	0x00000320 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_5	0x00000328 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_6	0x00000330 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_7	0x00000338 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_8	0x00000340 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_9	0x00000348 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_10	0x00000350 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_11	0x00000358 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_12	0x00000360 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_13	0x00000368 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_14	0x00000370 /* 64-bit */
++#define MAILBOX_SNDHOST_PROD_IDX_15	0x00000378 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_0	0x00000380 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_1	0x00000388 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_2	0x00000390 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_3	0x00000398 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_4	0x000003a0 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_5	0x000003a8 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_6	0x000003b0 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_7	0x000003b8 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_8	0x000003c0 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_9	0x000003c8 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_10	0x000003d0 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_11	0x000003d8 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_12	0x000003e0 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_13	0x000003e8 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_14	0x000003f0 /* 64-bit */
++#define MAILBOX_SNDNIC_PROD_IDX_15	0x000003f8 /* 64-bit */
++
++/* MAC control registers */
++#define MAC_MODE			0x00000400
++#define  MAC_MODE_RESET			 0x00000001
++#define  MAC_MODE_HALF_DUPLEX		 0x00000002
++#define  MAC_MODE_PORT_MODE_MASK	 0x0000000c
++#define  MAC_MODE_PORT_MODE_TBI		 0x0000000c
++#define  MAC_MODE_PORT_MODE_GMII	 0x00000008
++#define  MAC_MODE_PORT_MODE_MII		 0x00000004
++#define  MAC_MODE_PORT_MODE_NONE	 0x00000000
++#define  MAC_MODE_PORT_INT_LPBACK	 0x00000010
++#define  MAC_MODE_TAGGED_MAC_CTRL	 0x00000080
++#define  MAC_MODE_TX_BURSTING		 0x00000100
++#define  MAC_MODE_MAX_DEFER		 0x00000200
++#define  MAC_MODE_LINK_POLARITY		 0x00000400
++#define  MAC_MODE_RXSTAT_ENABLE		 0x00000800
++#define  MAC_MODE_RXSTAT_CLEAR		 0x00001000
++#define  MAC_MODE_RXSTAT_FLUSH		 0x00002000
++#define  MAC_MODE_TXSTAT_ENABLE		 0x00004000
++#define  MAC_MODE_TXSTAT_CLEAR		 0x00008000
++#define  MAC_MODE_TXSTAT_FLUSH		 0x00010000
++#define  MAC_MODE_SEND_CONFIGS		 0x00020000
++#define  MAC_MODE_MAGIC_PKT_ENABLE	 0x00040000
++#define  MAC_MODE_ACPI_ENABLE		 0x00080000
++#define  MAC_MODE_MIP_ENABLE		 0x00100000
++#define  MAC_MODE_TDE_ENABLE		 0x00200000
++#define  MAC_MODE_RDE_ENABLE		 0x00400000
++#define  MAC_MODE_FHDE_ENABLE		 0x00800000
++#define MAC_STATUS			0x00000404
++#define  MAC_STATUS_PCS_SYNCED		 0x00000001
++#define  MAC_STATUS_SIGNAL_DET		 0x00000002
++#define  MAC_STATUS_RCVD_CFG		 0x00000004
++#define  MAC_STATUS_CFG_CHANGED		 0x00000008
++#define  MAC_STATUS_SYNC_CHANGED	 0x00000010
++#define  MAC_STATUS_PORT_DEC_ERR	 0x00000400
++#define  MAC_STATUS_LNKSTATE_CHANGED	 0x00001000
++#define  MAC_STATUS_MI_COMPLETION	 0x00400000
++#define  MAC_STATUS_MI_INTERRUPT	 0x00800000
++#define  MAC_STATUS_AP_ERROR		 0x01000000
++#define  MAC_STATUS_ODI_ERROR		 0x02000000
++#define  MAC_STATUS_RXSTAT_OVERRUN	 0x04000000
++#define  MAC_STATUS_TXSTAT_OVERRUN	 0x08000000
++#define MAC_EVENT			0x00000408
++#define  MAC_EVENT_PORT_DECODE_ERR	 0x00000400
++#define  MAC_EVENT_LNKSTATE_CHANGED	 0x00001000
++#define  MAC_EVENT_MI_COMPLETION	 0x00400000
++#define  MAC_EVENT_MI_INTERRUPT		 0x00800000
++#define  MAC_EVENT_AP_ERROR		 0x01000000
++#define  MAC_EVENT_ODI_ERROR		 0x02000000
++#define  MAC_EVENT_RXSTAT_OVERRUN	 0x04000000
++#define  MAC_EVENT_TXSTAT_OVERRUN	 0x08000000
++#define MAC_LED_CTRL			0x0000040c
++#define  LED_CTRL_LNKLED_OVERRIDE	 0x00000001
++#define  LED_CTRL_1000MBPS_ON		 0x00000002
++#define  LED_CTRL_100MBPS_ON		 0x00000004
++#define  LED_CTRL_10MBPS_ON		 0x00000008
++#define  LED_CTRL_TRAFFIC_OVERRIDE	 0x00000010
++#define  LED_CTRL_TRAFFIC_BLINK		 0x00000020
++#define  LED_CTRL_TRAFFIC_LED		 0x00000040
++#define  LED_CTRL_1000MBPS_STATUS	 0x00000080
++#define  LED_CTRL_100MBPS_STATUS	 0x00000100
++#define  LED_CTRL_10MBPS_STATUS		 0x00000200
++#define  LED_CTRL_TRAFFIC_STATUS	 0x00000400
++#define  LED_CTRL_MAC_MODE		 0x00000000
++#define  LED_CTRL_PHY_MODE_1		 0x00000800
++#define  LED_CTRL_PHY_MODE_2		 0x00001000
++#define  LED_CTRL_BLINK_RATE_MASK	 0x7ff80000
++#define  LED_CTRL_BLINK_RATE_SHIFT	 19
++#define  LED_CTRL_BLINK_PER_OVERRIDE	 0x00080000
++#define  LED_CTRL_BLINK_RATE_OVERRIDE	 0x80000000
++#define MAC_ADDR_0_HIGH			0x00000410 /* upper 2 bytes */
++#define MAC_ADDR_0_LOW			0x00000414 /* lower 4 bytes */
++#define MAC_ADDR_1_HIGH			0x00000418 /* upper 2 bytes */
++#define MAC_ADDR_1_LOW			0x0000041c /* lower 4 bytes */
++#define MAC_ADDR_2_HIGH			0x00000420 /* upper 2 bytes */
++#define MAC_ADDR_2_LOW			0x00000424 /* lower 4 bytes */
++#define MAC_ADDR_3_HIGH			0x00000428 /* upper 2 bytes */
++#define MAC_ADDR_3_LOW			0x0000042c /* lower 4 bytes */
++#define MAC_ACPI_MBUF_PTR		0x00000430
++#define MAC_ACPI_LEN_OFFSET		0x00000434
++#define  ACPI_LENOFF_LEN_MASK		 0x0000ffff
++#define  ACPI_LENOFF_LEN_SHIFT		 0
++#define  ACPI_LENOFF_OFF_MASK		 0x0fff0000
++#define  ACPI_LENOFF_OFF_SHIFT		 16
++#define MAC_TX_BACKOFF_SEED		0x00000438
++#define  TX_BACKOFF_SEED_MASK		 0x000003ff
++#define MAC_RX_MTU_SIZE			0x0000043c
++#define  RX_MTU_SIZE_MASK		 0x0000ffff
++#define MAC_PCS_TEST			0x00000440
++#define  PCS_TEST_PATTERN_MASK		 0x000fffff
++#define  PCS_TEST_PATTERN_SHIFT		 0
++#define  PCS_TEST_ENABLE		 0x00100000
++#define MAC_TX_AUTO_NEG			0x00000444
++#define  TX_AUTO_NEG_MASK		 0x0000ffff
++#define  TX_AUTO_NEG_SHIFT		 0
++#define MAC_RX_AUTO_NEG			0x00000448
++#define  RX_AUTO_NEG_MASK		 0x0000ffff
++#define  RX_AUTO_NEG_SHIFT		 0
++#define MAC_MI_COM			0x0000044c
++#define  MI_COM_CMD_MASK		 0x0c000000
++#define  MI_COM_CMD_WRITE		 0x04000000
++#define  MI_COM_CMD_READ		 0x08000000
++#define  MI_COM_READ_FAILED		 0x10000000
++#define  MI_COM_START			 0x20000000
++#define  MI_COM_BUSY			 0x20000000
++#define  MI_COM_PHY_ADDR_MASK		 0x03e00000
++#define  MI_COM_PHY_ADDR_SHIFT		 21
++#define  MI_COM_REG_ADDR_MASK		 0x001f0000
++#define  MI_COM_REG_ADDR_SHIFT		 16
++#define  MI_COM_DATA_MASK		 0x0000ffff
++#define MAC_MI_STAT			0x00000450
++#define  MAC_MI_STAT_LNKSTAT_ATTN_ENAB	 0x00000001
++#define MAC_MI_MODE			0x00000454
++#define  MAC_MI_MODE_CLK_10MHZ		 0x00000001
++#define  MAC_MI_MODE_SHORT_PREAMBLE	 0x00000002
++#define  MAC_MI_MODE_AUTO_POLL		 0x00000010
++#define  MAC_MI_MODE_CORE_CLK_62MHZ	 0x00008000
++#define  MAC_MI_MODE_BASE		 0x000c0000 /* XXX magic values XXX */
++#define MAC_AUTO_POLL_STATUS		0x00000458
++#define  MAC_AUTO_POLL_ERROR		 0x00000001
++#define MAC_TX_MODE			0x0000045c
++#define  TX_MODE_RESET			 0x00000001
++#define  TX_MODE_ENABLE			 0x00000002
++#define  TX_MODE_FLOW_CTRL_ENABLE	 0x00000010
++#define  TX_MODE_BIG_BCKOFF_ENABLE	 0x00000020
++#define  TX_MODE_LONG_PAUSE_ENABLE	 0x00000040
++#define MAC_TX_STATUS			0x00000460
++#define  TX_STATUS_XOFFED		 0x00000001
++#define  TX_STATUS_SENT_XOFF		 0x00000002
++#define  TX_STATUS_SENT_XON		 0x00000004
++#define  TX_STATUS_LINK_UP		 0x00000008
++#define  TX_STATUS_ODI_UNDERRUN		 0x00000010
++#define  TX_STATUS_ODI_OVERRUN		 0x00000020
++#define MAC_TX_LENGTHS			0x00000464
++#define  TX_LENGTHS_SLOT_TIME_MASK	 0x000000ff
++#define  TX_LENGTHS_SLOT_TIME_SHIFT	 0
++#define  TX_LENGTHS_IPG_MASK		 0x00000f00
++#define  TX_LENGTHS_IPG_SHIFT		 8
++#define  TX_LENGTHS_IPG_CRS_MASK	 0x00003000
++#define  TX_LENGTHS_IPG_CRS_SHIFT	 12
++#define MAC_RX_MODE			0x00000468
++#define  RX_MODE_RESET			 0x00000001
++#define  RX_MODE_ENABLE			 0x00000002
++#define  RX_MODE_FLOW_CTRL_ENABLE	 0x00000004
++#define  RX_MODE_KEEP_MAC_CTRL		 0x00000008
++#define  RX_MODE_KEEP_PAUSE		 0x00000010
++#define  RX_MODE_ACCEPT_OVERSIZED	 0x00000020
++#define  RX_MODE_ACCEPT_RUNTS		 0x00000040
++#define  RX_MODE_LEN_CHECK		 0x00000080
++#define  RX_MODE_PROMISC		 0x00000100
++#define  RX_MODE_NO_CRC_CHECK		 0x00000200
++#define  RX_MODE_KEEP_VLAN_TAG		 0x00000400
++#define MAC_RX_STATUS			0x0000046c
++#define  RX_STATUS_REMOTE_TX_XOFFED	 0x00000001
++#define  RX_STATUS_XOFF_RCVD		 0x00000002
++#define  RX_STATUS_XON_RCVD		 0x00000004
++#define MAC_HASH_REG_0			0x00000470
++#define MAC_HASH_REG_1			0x00000474
++#define MAC_HASH_REG_2			0x00000478
++#define MAC_HASH_REG_3			0x0000047c
++#define MAC_RCV_RULE_0			0x00000480
++#define MAC_RCV_VALUE_0			0x00000484
++#define MAC_RCV_RULE_1			0x00000488
++#define MAC_RCV_VALUE_1			0x0000048c
++#define MAC_RCV_RULE_2			0x00000490
++#define MAC_RCV_VALUE_2			0x00000494
++#define MAC_RCV_RULE_3			0x00000498
++#define MAC_RCV_VALUE_3			0x0000049c
++#define MAC_RCV_RULE_4			0x000004a0
++#define MAC_RCV_VALUE_4			0x000004a4
++#define MAC_RCV_RULE_5			0x000004a8
++#define MAC_RCV_VALUE_5			0x000004ac
++#define MAC_RCV_RULE_6			0x000004b0
++#define MAC_RCV_VALUE_6			0x000004b4
++#define MAC_RCV_RULE_7			0x000004b8
++#define MAC_RCV_VALUE_7			0x000004bc
++#define MAC_RCV_RULE_8			0x000004c0
++#define MAC_RCV_VALUE_8			0x000004c4
++#define MAC_RCV_RULE_9			0x000004c8
++#define MAC_RCV_VALUE_9			0x000004cc
++#define MAC_RCV_RULE_10			0x000004d0
++#define MAC_RCV_VALUE_10		0x000004d4
++#define MAC_RCV_RULE_11			0x000004d8
++#define MAC_RCV_VALUE_11		0x000004dc
++#define MAC_RCV_RULE_12			0x000004e0
++#define MAC_RCV_VALUE_12		0x000004e4
++#define MAC_RCV_RULE_13			0x000004e8
++#define MAC_RCV_VALUE_13		0x000004ec
++#define MAC_RCV_RULE_14			0x000004f0
++#define MAC_RCV_VALUE_14		0x000004f4
++#define MAC_RCV_RULE_15			0x000004f8
++#define MAC_RCV_VALUE_15		0x000004fc
++#define  RCV_RULE_DISABLE_MASK		 0x7fffffff
++#define MAC_RCV_RULE_CFG		0x00000500
++#define  RCV_RULE_CFG_DEFAULT_CLASS	0x00000008
++#define MAC_LOW_WMARK_MAX_RX_FRAME	0x00000504
++/* 0x508 --> 0x520 unused */
++#define MAC_HASHREGU_0			0x00000520
++#define MAC_HASHREGU_1			0x00000524
++#define MAC_HASHREGU_2			0x00000528
++#define MAC_HASHREGU_3			0x0000052c
++#define MAC_EXTADDR_0_HIGH		0x00000530
++#define MAC_EXTADDR_0_LOW		0x00000534
++#define MAC_EXTADDR_1_HIGH		0x00000538
++#define MAC_EXTADDR_1_LOW		0x0000053c
++#define MAC_EXTADDR_2_HIGH		0x00000540
++#define MAC_EXTADDR_2_LOW		0x00000544
++#define MAC_EXTADDR_3_HIGH		0x00000548
++#define MAC_EXTADDR_3_LOW		0x0000054c
++#define MAC_EXTADDR_4_HIGH		0x00000550
++#define MAC_EXTADDR_4_LOW		0x00000554
++#define MAC_EXTADDR_5_HIGH		0x00000558
++#define MAC_EXTADDR_5_LOW		0x0000055c
++#define MAC_EXTADDR_6_HIGH		0x00000560
++#define MAC_EXTADDR_6_LOW		0x00000564
++#define MAC_EXTADDR_7_HIGH		0x00000568
++#define MAC_EXTADDR_7_LOW		0x0000056c
++#define MAC_EXTADDR_8_HIGH		0x00000570
++#define MAC_EXTADDR_8_LOW		0x00000574
++#define MAC_EXTADDR_9_HIGH		0x00000578
++#define MAC_EXTADDR_9_LOW		0x0000057c
++#define MAC_EXTADDR_10_HIGH		0x00000580
++#define MAC_EXTADDR_10_LOW		0x00000584
++#define MAC_EXTADDR_11_HIGH		0x00000588
++#define MAC_EXTADDR_11_LOW		0x0000058c
++#define MAC_SERDES_CFG			0x00000590
++#define MAC_SERDES_STAT			0x00000594
++/* 0x598 --> 0x600 unused */
++#define MAC_TX_MAC_STATE_BASE		0x00000600 /* 16 bytes */
++#define MAC_RX_MAC_STATE_BASE		0x00000610 /* 20 bytes */
++/* 0x624 --> 0x800 unused */
++#define MAC_TX_STATS_OCTETS		0x00000800
++#define MAC_TX_STATS_RESV1		0x00000804
++#define MAC_TX_STATS_COLLISIONS		0x00000808
++#define MAC_TX_STATS_XON_SENT		0x0000080c
++#define MAC_TX_STATS_XOFF_SENT		0x00000810
++#define MAC_TX_STATS_RESV2		0x00000814
++#define MAC_TX_STATS_MAC_ERRORS		0x00000818
++#define MAC_TX_STATS_SINGLE_COLLISIONS	0x0000081c
++#define MAC_TX_STATS_MULT_COLLISIONS	0x00000820
++#define MAC_TX_STATS_DEFERRED		0x00000824
++#define MAC_TX_STATS_RESV3		0x00000828
++#define MAC_TX_STATS_EXCESSIVE_COL	0x0000082c
++#define MAC_TX_STATS_LATE_COL		0x00000830
++#define MAC_TX_STATS_RESV4_1		0x00000834
++#define MAC_TX_STATS_RESV4_2		0x00000838
++#define MAC_TX_STATS_RESV4_3		0x0000083c
++#define MAC_TX_STATS_RESV4_4		0x00000840
++#define MAC_TX_STATS_RESV4_5		0x00000844
++#define MAC_TX_STATS_RESV4_6		0x00000848
++#define MAC_TX_STATS_RESV4_7		0x0000084c
++#define MAC_TX_STATS_RESV4_8		0x00000850
++#define MAC_TX_STATS_RESV4_9		0x00000854
++#define MAC_TX_STATS_RESV4_10		0x00000858
++#define MAC_TX_STATS_RESV4_11		0x0000085c
++#define MAC_TX_STATS_RESV4_12		0x00000860
++#define MAC_TX_STATS_RESV4_13		0x00000864
++#define MAC_TX_STATS_RESV4_14		0x00000868
++#define MAC_TX_STATS_UCAST		0x0000086c
++#define MAC_TX_STATS_MCAST		0x00000870
++#define MAC_TX_STATS_BCAST		0x00000874
++#define MAC_TX_STATS_RESV5_1		0x00000878
++#define MAC_TX_STATS_RESV5_2		0x0000087c
++#define MAC_RX_STATS_OCTETS		0x00000880
++#define MAC_RX_STATS_RESV1		0x00000884
++#define MAC_RX_STATS_FRAGMENTS		0x00000888
++#define MAC_RX_STATS_UCAST		0x0000088c
++#define MAC_RX_STATS_MCAST		0x00000890
++#define MAC_RX_STATS_BCAST		0x00000894
++#define MAC_RX_STATS_FCS_ERRORS		0x00000898
++#define MAC_RX_STATS_ALIGN_ERRORS	0x0000089c
++#define MAC_RX_STATS_XON_PAUSE_RECVD	0x000008a0
++#define MAC_RX_STATS_XOFF_PAUSE_RECVD	0x000008a4
++#define MAC_RX_STATS_MAC_CTRL_RECVD	0x000008a8
++#define MAC_RX_STATS_XOFF_ENTERED	0x000008ac
++#define MAC_RX_STATS_FRAME_TOO_LONG	0x000008b0
++#define MAC_RX_STATS_JABBERS		0x000008b4
++#define MAC_RX_STATS_UNDERSIZE		0x000008b8
++/* 0x8bc --> 0xc00 unused */
++
++/* Send data initiator control registers */
++#define SNDDATAI_MODE			0x00000c00
++#define  SNDDATAI_MODE_RESET		 0x00000001
++#define  SNDDATAI_MODE_ENABLE		 0x00000002
++#define  SNDDATAI_MODE_STAT_OFLOW_ENAB	 0x00000004
++#define SNDDATAI_STATUS			0x00000c04
++#define  SNDDATAI_STATUS_STAT_OFLOW	 0x00000004
++#define SNDDATAI_STATSCTRL		0x00000c08
++#define  SNDDATAI_SCTRL_ENABLE		 0x00000001
++#define  SNDDATAI_SCTRL_FASTUPD		 0x00000002
++#define  SNDDATAI_SCTRL_CLEAR		 0x00000004
++#define  SNDDATAI_SCTRL_FLUSH		 0x00000008
++#define  SNDDATAI_SCTRL_FORCE_ZERO	 0x00000010
++#define SNDDATAI_STATSENAB		0x00000c0c
++#define SNDDATAI_STATSINCMASK		0x00000c10
++/* 0xc14 --> 0xc80 unused */
++#define SNDDATAI_COS_CNT_0		0x00000c80
++#define SNDDATAI_COS_CNT_1		0x00000c84
++#define SNDDATAI_COS_CNT_2		0x00000c88
++#define SNDDATAI_COS_CNT_3		0x00000c8c
++#define SNDDATAI_COS_CNT_4		0x00000c90
++#define SNDDATAI_COS_CNT_5		0x00000c94
++#define SNDDATAI_COS_CNT_6		0x00000c98
++#define SNDDATAI_COS_CNT_7		0x00000c9c
++#define SNDDATAI_COS_CNT_8		0x00000ca0
++#define SNDDATAI_COS_CNT_9		0x00000ca4
++#define SNDDATAI_COS_CNT_10		0x00000ca8
++#define SNDDATAI_COS_CNT_11		0x00000cac
++#define SNDDATAI_COS_CNT_12		0x00000cb0
++#define SNDDATAI_COS_CNT_13		0x00000cb4
++#define SNDDATAI_COS_CNT_14		0x00000cb8
++#define SNDDATAI_COS_CNT_15		0x00000cbc
++#define SNDDATAI_DMA_RDQ_FULL_CNT	0x00000cc0
++#define SNDDATAI_DMA_PRIO_RDQ_FULL_CNT	0x00000cc4
++#define SNDDATAI_SDCQ_FULL_CNT		0x00000cc8
++#define SNDDATAI_NICRNG_SSND_PIDX_CNT	0x00000ccc
++#define SNDDATAI_STATS_UPDATED_CNT	0x00000cd0
++#define SNDDATAI_INTERRUPTS_CNT		0x00000cd4
++#define SNDDATAI_AVOID_INTERRUPTS_CNT	0x00000cd8
++#define SNDDATAI_SND_THRESH_HIT_CNT	0x00000cdc
++/* 0xce0 --> 0x1000 unused */
++
++/* Send data completion control registers */
++#define SNDDATAC_MODE			0x00001000
++#define  SNDDATAC_MODE_RESET		 0x00000001
++#define  SNDDATAC_MODE_ENABLE		 0x00000002
++/* 0x1004 --> 0x1400 unused */
++
++/* Send BD ring selector */
++#define SNDBDS_MODE			0x00001400
++#define  SNDBDS_MODE_RESET		 0x00000001
++#define  SNDBDS_MODE_ENABLE		 0x00000002
++#define  SNDBDS_MODE_ATTN_ENABLE	 0x00000004
++#define SNDBDS_STATUS			0x00001404
++#define  SNDBDS_STATUS_ERROR_ATTN	 0x00000004
++#define SNDBDS_HWDIAG			0x00001408
++/* 0x140c --> 0x1440 */
++#define SNDBDS_SEL_CON_IDX_0		0x00001440
++#define SNDBDS_SEL_CON_IDX_1		0x00001444
++#define SNDBDS_SEL_CON_IDX_2		0x00001448
++#define SNDBDS_SEL_CON_IDX_3		0x0000144c
++#define SNDBDS_SEL_CON_IDX_4		0x00001450
++#define SNDBDS_SEL_CON_IDX_5		0x00001454
++#define SNDBDS_SEL_CON_IDX_6		0x00001458
++#define SNDBDS_SEL_CON_IDX_7		0x0000145c
++#define SNDBDS_SEL_CON_IDX_8		0x00001460
++#define SNDBDS_SEL_CON_IDX_9		0x00001464
++#define SNDBDS_SEL_CON_IDX_10		0x00001468
++#define SNDBDS_SEL_CON_IDX_11		0x0000146c
++#define SNDBDS_SEL_CON_IDX_12		0x00001470
++#define SNDBDS_SEL_CON_IDX_13		0x00001474
++#define SNDBDS_SEL_CON_IDX_14		0x00001478
++#define SNDBDS_SEL_CON_IDX_15		0x0000147c
++/* 0x1480 --> 0x1800 unused */
++
++/* Send BD initiator control registers */
++#define SNDBDI_MODE			0x00001800
++#define  SNDBDI_MODE_RESET		 0x00000001
++#define  SNDBDI_MODE_ENABLE		 0x00000002
++#define  SNDBDI_MODE_ATTN_ENABLE	 0x00000004
++#define SNDBDI_STATUS			0x00001804
++#define  SNDBDI_STATUS_ERROR_ATTN	 0x00000004
++#define SNDBDI_IN_PROD_IDX_0		0x00001808
++#define SNDBDI_IN_PROD_IDX_1		0x0000180c
++#define SNDBDI_IN_PROD_IDX_2		0x00001810
++#define SNDBDI_IN_PROD_IDX_3		0x00001814
++#define SNDBDI_IN_PROD_IDX_4		0x00001818
++#define SNDBDI_IN_PROD_IDX_5		0x0000181c
++#define SNDBDI_IN_PROD_IDX_6		0x00001820
++#define SNDBDI_IN_PROD_IDX_7		0x00001824
++#define SNDBDI_IN_PROD_IDX_8		0x00001828
++#define SNDBDI_IN_PROD_IDX_9		0x0000182c
++#define SNDBDI_IN_PROD_IDX_10		0x00001830
++#define SNDBDI_IN_PROD_IDX_11		0x00001834
++#define SNDBDI_IN_PROD_IDX_12		0x00001838
++#define SNDBDI_IN_PROD_IDX_13		0x0000183c
++#define SNDBDI_IN_PROD_IDX_14		0x00001840
++#define SNDBDI_IN_PROD_IDX_15		0x00001844
++/* 0x1848 --> 0x1c00 unused */
++
++/* Send BD completion control registers */
++#define SNDBDC_MODE			0x00001c00
++#define SNDBDC_MODE_RESET		 0x00000001
++#define SNDBDC_MODE_ENABLE		 0x00000002
++#define SNDBDC_MODE_ATTN_ENABLE		 0x00000004
++/* 0x1c04 --> 0x2000 unused */
++
++/* Receive list placement control registers */
++#define RCVLPC_MODE			0x00002000
++#define  RCVLPC_MODE_RESET		 0x00000001
++#define  RCVLPC_MODE_ENABLE		 0x00000002
++#define  RCVLPC_MODE_CLASS0_ATTN_ENAB	 0x00000004
++#define  RCVLPC_MODE_MAPOOR_AATTN_ENAB	 0x00000008
++#define  RCVLPC_MODE_STAT_OFLOW_ENAB	 0x00000010
++#define RCVLPC_STATUS			0x00002004
++#define  RCVLPC_STATUS_CLASS0		 0x00000004
++#define  RCVLPC_STATUS_MAPOOR		 0x00000008
++#define  RCVLPC_STATUS_STAT_OFLOW	 0x00000010
++#define RCVLPC_LOCK			0x00002008
++#define  RCVLPC_LOCK_REQ_MASK		 0x0000ffff
++#define  RCVLPC_LOCK_REQ_SHIFT		 0
++#define  RCVLPC_LOCK_GRANT_MASK		 0xffff0000
++#define  RCVLPC_LOCK_GRANT_SHIFT	 16
++#define RCVLPC_NON_EMPTY_BITS		0x0000200c
++#define  RCVLPC_NON_EMPTY_BITS_MASK	 0x0000ffff
++#define RCVLPC_CONFIG			0x00002010
++#define RCVLPC_STATSCTRL		0x00002014
++#define  RCVLPC_STATSCTRL_ENABLE	 0x00000001
++#define  RCVLPC_STATSCTRL_FASTUPD	 0x00000002
++#define RCVLPC_STATS_ENABLE		0x00002018
++#define  RCVLPC_STATSENAB_LNGBRST_RFIX	 0x00400000
++#define RCVLPC_STATS_INCMASK		0x0000201c
++/* 0x2020 --> 0x2100 unused */
++#define RCVLPC_SELLST_BASE		0x00002100 /* 16 16-byte entries */
++#define  SELLST_TAIL			0x00000004
++#define  SELLST_CONT			0x00000008
++#define  SELLST_UNUSED			0x0000000c
++#define RCVLPC_COS_CNTL_BASE		0x00002200 /* 16 4-byte entries */
++#define RCVLPC_DROP_FILTER_CNT		0x00002240
++#define RCVLPC_DMA_WQ_FULL_CNT		0x00002244
++#define RCVLPC_DMA_HIPRIO_WQ_FULL_CNT	0x00002248
++#define RCVLPC_NO_RCV_BD_CNT		0x0000224c
++#define RCVLPC_IN_DISCARDS_CNT		0x00002250
++#define RCVLPC_IN_ERRORS_CNT		0x00002254
++#define RCVLPC_RCV_THRESH_HIT_CNT	0x00002258
++/* 0x225c --> 0x2400 unused */
++
++/* Receive Data and Receive BD Initiator Control */
++#define RCVDBDI_MODE			0x00002400
++#define  RCVDBDI_MODE_RESET		 0x00000001
++#define  RCVDBDI_MODE_ENABLE		 0x00000002
++#define  RCVDBDI_MODE_JUMBOBD_NEEDED	 0x00000004
++#define  RCVDBDI_MODE_FRM_TOO_BIG	 0x00000008
++#define  RCVDBDI_MODE_INV_RING_SZ	 0x00000010
++#define RCVDBDI_STATUS			0x00002404
++#define  RCVDBDI_STATUS_JUMBOBD_NEEDED	 0x00000004
++#define  RCVDBDI_STATUS_FRM_TOO_BIG	 0x00000008
++#define  RCVDBDI_STATUS_INV_RING_SZ	 0x00000010
++#define RCVDBDI_SPLIT_FRAME_MINSZ	0x00002408
++/* 0x240c --> 0x2440 unused */
++#define RCVDBDI_JUMBO_BD		0x00002440 /* TG3_BDINFO_... */
++#define RCVDBDI_STD_BD			0x00002450 /* TG3_BDINFO_... */
++#define RCVDBDI_MINI_BD			0x00002460 /* TG3_BDINFO_... */
++#define RCVDBDI_JUMBO_CON_IDX		0x00002470
++#define RCVDBDI_STD_CON_IDX		0x00002474
++#define RCVDBDI_MINI_CON_IDX		0x00002478
++/* 0x247c --> 0x2480 unused */
++#define RCVDBDI_BD_PROD_IDX_0		0x00002480
++#define RCVDBDI_BD_PROD_IDX_1		0x00002484
++#define RCVDBDI_BD_PROD_IDX_2		0x00002488
++#define RCVDBDI_BD_PROD_IDX_3		0x0000248c
++#define RCVDBDI_BD_PROD_IDX_4		0x00002490
++#define RCVDBDI_BD_PROD_IDX_5		0x00002494
++#define RCVDBDI_BD_PROD_IDX_6		0x00002498
++#define RCVDBDI_BD_PROD_IDX_7		0x0000249c
++#define RCVDBDI_BD_PROD_IDX_8		0x000024a0
++#define RCVDBDI_BD_PROD_IDX_9		0x000024a4
++#define RCVDBDI_BD_PROD_IDX_10		0x000024a8
++#define RCVDBDI_BD_PROD_IDX_11		0x000024ac
++#define RCVDBDI_BD_PROD_IDX_12		0x000024b0
++#define RCVDBDI_BD_PROD_IDX_13		0x000024b4
++#define RCVDBDI_BD_PROD_IDX_14		0x000024b8
++#define RCVDBDI_BD_PROD_IDX_15		0x000024bc
++#define RCVDBDI_HWDIAG			0x000024c0
++/* 0x24c4 --> 0x2800 unused */
++
++/* Receive Data Completion Control */
++#define RCVDCC_MODE			0x00002800
++#define  RCVDCC_MODE_RESET		 0x00000001
++#define  RCVDCC_MODE_ENABLE		 0x00000002
++#define  RCVDCC_MODE_ATTN_ENABLE	 0x00000004
++/* 0x2804 --> 0x2c00 unused */
++
++/* Receive BD Initiator Control Registers */
++#define RCVBDI_MODE			0x00002c00
++#define  RCVBDI_MODE_RESET		 0x00000001
++#define  RCVBDI_MODE_ENABLE		 0x00000002
++#define  RCVBDI_MODE_RCB_ATTN_ENAB	 0x00000004
++#define RCVBDI_STATUS			0x00002c04
++#define  RCVBDI_STATUS_RCB_ATTN		 0x00000004
++#define RCVBDI_JUMBO_PROD_IDX		0x00002c08
++#define RCVBDI_STD_PROD_IDX		0x00002c0c
++#define RCVBDI_MINI_PROD_IDX		0x00002c10
++#define RCVBDI_MINI_THRESH		0x00002c14
++#define RCVBDI_STD_THRESH		0x00002c18
++#define RCVBDI_JUMBO_THRESH		0x00002c1c
++/* 0x2c20 --> 0x3000 unused */
++
++/* Receive BD Completion Control Registers */
++#define RCVCC_MODE			0x00003000
++#define  RCVCC_MODE_RESET		 0x00000001
++#define  RCVCC_MODE_ENABLE		 0x00000002
++#define  RCVCC_MODE_ATTN_ENABLE		 0x00000004
++#define RCVCC_STATUS			0x00003004
++#define  RCVCC_STATUS_ERROR_ATTN	 0x00000004
++#define RCVCC_JUMP_PROD_IDX		0x00003008
++#define RCVCC_STD_PROD_IDX		0x0000300c
++#define RCVCC_MINI_PROD_IDX		0x00003010
++/* 0x3014 --> 0x3400 unused */
++
++/* Receive list selector control registers */
++#define RCVLSC_MODE			0x00003400
++#define  RCVLSC_MODE_RESET		 0x00000001
++#define  RCVLSC_MODE_ENABLE		 0x00000002
++#define  RCVLSC_MODE_ATTN_ENABLE	 0x00000004
++#define RCVLSC_STATUS			0x00003404
++#define  RCVLSC_STATUS_ERROR_ATTN	 0x00000004
++/* 0x3408 --> 0x3800 unused */
++
++/* Mbuf cluster free registers */
++#define MBFREE_MODE			0x00003800
++#define  MBFREE_MODE_RESET		 0x00000001
++#define  MBFREE_MODE_ENABLE		 0x00000002
++#define MBFREE_STATUS			0x00003804
++/* 0x3808 --> 0x3c00 unused */
++
++/* Host coalescing control registers */
++#define HOSTCC_MODE			0x00003c00
++#define  HOSTCC_MODE_RESET		 0x00000001
++#define  HOSTCC_MODE_ENABLE		 0x00000002
++#define  HOSTCC_MODE_ATTN		 0x00000004
++#define  HOSTCC_MODE_NOW		 0x00000008
++#define  HOSTCC_MODE_FULL_STATUS	 0x00000000
++#define  HOSTCC_MODE_64BYTE		 0x00000080
++#define  HOSTCC_MODE_32BYTE		 0x00000100
++#define  HOSTCC_MODE_CLRTICK_RXBD	 0x00000200
++#define  HOSTCC_MODE_CLRTICK_TXBD	 0x00000400
++#define  HOSTCC_MODE_NOINT_ON_NOW	 0x00000800
++#define  HOSTCC_MODE_NOINT_ON_FORCE	 0x00001000
++#define HOSTCC_STATUS			0x00003c04
++#define  HOSTCC_STATUS_ERROR_ATTN	 0x00000004
++#define HOSTCC_RXCOL_TICKS		0x00003c08
++#define  LOW_RXCOL_TICKS		 0x00000032
++#define  DEFAULT_RXCOL_TICKS		 0x00000048
++#define  HIGH_RXCOL_TICKS		 0x00000096
++#define HOSTCC_TXCOL_TICKS		0x00003c0c
++#define  LOW_TXCOL_TICKS		 0x00000096
++#define  DEFAULT_TXCOL_TICKS		 0x0000012c
++#define  HIGH_TXCOL_TICKS		 0x00000145
++#define HOSTCC_RXMAX_FRAMES		0x00003c10
++#define  LOW_RXMAX_FRAMES		 0x00000005
++#define  DEFAULT_RXMAX_FRAMES		 0x00000008
++#define  HIGH_RXMAX_FRAMES		 0x00000012
++#define HOSTCC_TXMAX_FRAMES		0x00003c14
++#define  LOW_TXMAX_FRAMES		 0x00000035
++#define  DEFAULT_TXMAX_FRAMES		 0x0000004b
++#define  HIGH_TXMAX_FRAMES		 0x00000052
++#define HOSTCC_RXCOAL_TICK_INT		0x00003c18
++#define  DEFAULT_RXCOAL_TICK_INT	 0x00000019
++#define HOSTCC_TXCOAL_TICK_INT		0x00003c1c
++#define  DEFAULT_TXCOAL_TICK_INT	 0x00000019
++#define HOSTCC_RXCOAL_MAXF_INT		0x00003c20
++#define  DEFAULT_RXCOAL_MAXF_INT	 0x00000005
++#define HOSTCC_TXCOAL_MAXF_INT		0x00003c24
++#define  DEFAULT_TXCOAL_MAXF_INT	 0x00000005
++#define HOSTCC_STAT_COAL_TICKS		0x00003c28
++#define  DEFAULT_STAT_COAL_TICKS	 0x000f4240
++/* 0x3c2c --> 0x3c30 unused */
++#define HOSTCC_STATS_BLK_HOST_ADDR	0x00003c30 /* 64-bit */
++#define HOSTCC_STATUS_BLK_HOST_ADDR	0x00003c38 /* 64-bit */
++#define HOSTCC_STATS_BLK_NIC_ADDR	0x00003c40
++#define HOSTCC_STATUS_BLK_NIC_ADDR	0x00003c44
++#define HOSTCC_FLOW_ATTN		0x00003c48
++/* 0x3c4c --> 0x3c50 unused */
++#define HOSTCC_JUMBO_CON_IDX		0x00003c50
++#define HOSTCC_STD_CON_IDX		0x00003c54
++#define HOSTCC_MINI_CON_IDX		0x00003c58
++/* 0x3c5c --> 0x3c80 unused */
++#define HOSTCC_RET_PROD_IDX_0		0x00003c80
++#define HOSTCC_RET_PROD_IDX_1		0x00003c84
++#define HOSTCC_RET_PROD_IDX_2		0x00003c88
++#define HOSTCC_RET_PROD_IDX_3		0x00003c8c
++#define HOSTCC_RET_PROD_IDX_4		0x00003c90
++#define HOSTCC_RET_PROD_IDX_5		0x00003c94
++#define HOSTCC_RET_PROD_IDX_6		0x00003c98
++#define HOSTCC_RET_PROD_IDX_7		0x00003c9c
++#define HOSTCC_RET_PROD_IDX_8		0x00003ca0
++#define HOSTCC_RET_PROD_IDX_9		0x00003ca4
++#define HOSTCC_RET_PROD_IDX_10		0x00003ca8
++#define HOSTCC_RET_PROD_IDX_11		0x00003cac
++#define HOSTCC_RET_PROD_IDX_12		0x00003cb0
++#define HOSTCC_RET_PROD_IDX_13		0x00003cb4
++#define HOSTCC_RET_PROD_IDX_14		0x00003cb8
++#define HOSTCC_RET_PROD_IDX_15		0x00003cbc
++#define HOSTCC_SND_CON_IDX_0		0x00003cc0
++#define HOSTCC_SND_CON_IDX_1		0x00003cc4
++#define HOSTCC_SND_CON_IDX_2		0x00003cc8
++#define HOSTCC_SND_CON_IDX_3		0x00003ccc
++#define HOSTCC_SND_CON_IDX_4		0x00003cd0
++#define HOSTCC_SND_CON_IDX_5		0x00003cd4
++#define HOSTCC_SND_CON_IDX_6		0x00003cd8
++#define HOSTCC_SND_CON_IDX_7		0x00003cdc
++#define HOSTCC_SND_CON_IDX_8		0x00003ce0
++#define HOSTCC_SND_CON_IDX_9		0x00003ce4
++#define HOSTCC_SND_CON_IDX_10		0x00003ce8
++#define HOSTCC_SND_CON_IDX_11		0x00003cec
++#define HOSTCC_SND_CON_IDX_12		0x00003cf0
++#define HOSTCC_SND_CON_IDX_13		0x00003cf4
++#define HOSTCC_SND_CON_IDX_14		0x00003cf8
++#define HOSTCC_SND_CON_IDX_15		0x00003cfc
++/* 0x3d00 --> 0x4000 unused */
++
++/* Memory arbiter control registers */
++#define MEMARB_MODE			0x00004000
++#define  MEMARB_MODE_RESET		 0x00000001
++#define  MEMARB_MODE_ENABLE		 0x00000002
++#define MEMARB_STATUS			0x00004004
++#define MEMARB_TRAP_ADDR_LOW		0x00004008
++#define MEMARB_TRAP_ADDR_HIGH		0x0000400c
++/* 0x4010 --> 0x4400 unused */
++
++/* Buffer manager control registers */
++#define BUFMGR_MODE			0x00004400
++#define  BUFMGR_MODE_RESET		 0x00000001
++#define  BUFMGR_MODE_ENABLE		 0x00000002
++#define  BUFMGR_MODE_ATTN_ENABLE	 0x00000004
++#define  BUFMGR_MODE_BM_TEST		 0x00000008
++#define  BUFMGR_MODE_MBLOW_ATTN_ENAB	 0x00000010
++#define BUFMGR_STATUS			0x00004404
++#define  BUFMGR_STATUS_ERROR		 0x00000004
++#define  BUFMGR_STATUS_MBLOW		 0x00000010
++#define BUFMGR_MB_POOL_ADDR		0x00004408
++#define BUFMGR_MB_POOL_SIZE		0x0000440c
++#define BUFMGR_MB_RDMA_LOW_WATER	0x00004410
++#define  DEFAULT_MB_RDMA_LOW_WATER	 0x00000050
++#define  DEFAULT_MB_RDMA_LOW_WATER_5705	 0x00000000
++#define  DEFAULT_MB_RDMA_LOW_WATER_JUMBO 0x00000130
++#define BUFMGR_MB_MACRX_LOW_WATER	0x00004414
++#define  DEFAULT_MB_MACRX_LOW_WATER	  0x00000020
++#define  DEFAULT_MB_MACRX_LOW_WATER_5705  0x00000010
++#define  DEFAULT_MB_MACRX_LOW_WATER_JUMBO 0x00000098
++#define BUFMGR_MB_HIGH_WATER		0x00004418
++#define  DEFAULT_MB_HIGH_WATER		 0x00000060
++#define  DEFAULT_MB_HIGH_WATER_5705	 0x00000060
++#define  DEFAULT_MB_HIGH_WATER_JUMBO	 0x0000017c
++#define BUFMGR_RX_MB_ALLOC_REQ		0x0000441c
++#define  BUFMGR_MB_ALLOC_BIT		 0x10000000
++#define BUFMGR_RX_MB_ALLOC_RESP		0x00004420
++#define BUFMGR_TX_MB_ALLOC_REQ		0x00004424
++#define BUFMGR_TX_MB_ALLOC_RESP		0x00004428
++#define BUFMGR_DMA_DESC_POOL_ADDR	0x0000442c
++#define BUFMGR_DMA_DESC_POOL_SIZE	0x00004430
++#define BUFMGR_DMA_LOW_WATER		0x00004434
++#define  DEFAULT_DMA_LOW_WATER		 0x00000005
++#define BUFMGR_DMA_HIGH_WATER		0x00004438
++#define  DEFAULT_DMA_HIGH_WATER		 0x0000000a
++#define BUFMGR_RX_DMA_ALLOC_REQ		0x0000443c
++#define BUFMGR_RX_DMA_ALLOC_RESP	0x00004440
++#define BUFMGR_TX_DMA_ALLOC_REQ		0x00004444
++#define BUFMGR_TX_DMA_ALLOC_RESP	0x00004448
++#define BUFMGR_HWDIAG_0			0x0000444c
++#define BUFMGR_HWDIAG_1			0x00004450
++#define BUFMGR_HWDIAG_2			0x00004454
++/* 0x4458 --> 0x4800 unused */
++
++/* Read DMA control registers */
++#define RDMAC_MODE			0x00004800
++#define  RDMAC_MODE_RESET		 0x00000001
++#define  RDMAC_MODE_ENABLE		 0x00000002
++#define  RDMAC_MODE_TGTABORT_ENAB	 0x00000004
++#define  RDMAC_MODE_MSTABORT_ENAB	 0x00000008
++#define  RDMAC_MODE_PARITYERR_ENAB	 0x00000010
++#define  RDMAC_MODE_ADDROFLOW_ENAB	 0x00000020
++#define  RDMAC_MODE_FIFOOFLOW_ENAB	 0x00000040
++#define  RDMAC_MODE_FIFOURUN_ENAB	 0x00000080
++#define  RDMAC_MODE_FIFOOREAD_ENAB	 0x00000100
++#define  RDMAC_MODE_LNGREAD_ENAB	 0x00000200
++#define  RDMAC_MODE_SPLIT_ENABLE	 0x00000800
++#define  RDMAC_MODE_SPLIT_RESET		 0x00001000
++#define  RDMAC_MODE_FIFO_SIZE_128	 0x00020000
++#define  RDMAC_MODE_FIFO_LONG_BURST	 0x00030000
++#define RDMAC_STATUS			0x00004804
++#define  RDMAC_STATUS_TGTABORT		 0x00000004
++#define  RDMAC_STATUS_MSTABORT		 0x00000008
++#define  RDMAC_STATUS_PARITYERR		 0x00000010
++#define  RDMAC_STATUS_ADDROFLOW		 0x00000020
++#define  RDMAC_STATUS_FIFOOFLOW		 0x00000040
++#define  RDMAC_STATUS_FIFOURUN		 0x00000080
++#define  RDMAC_STATUS_FIFOOREAD		 0x00000100
++#define  RDMAC_STATUS_LNGREAD		 0x00000200
++/* 0x4808 --> 0x4c00 unused */
++
++/* Write DMA control registers */
++#define WDMAC_MODE			0x00004c00
++#define  WDMAC_MODE_RESET		 0x00000001
++#define  WDMAC_MODE_ENABLE		 0x00000002
++#define  WDMAC_MODE_TGTABORT_ENAB	 0x00000004
++#define  WDMAC_MODE_MSTABORT_ENAB	 0x00000008
++#define  WDMAC_MODE_PARITYERR_ENAB	 0x00000010
++#define  WDMAC_MODE_ADDROFLOW_ENAB	 0x00000020
++#define  WDMAC_MODE_FIFOOFLOW_ENAB	 0x00000040
++#define  WDMAC_MODE_FIFOURUN_ENAB	 0x00000080
++#define  WDMAC_MODE_FIFOOREAD_ENAB	 0x00000100
++#define  WDMAC_MODE_LNGREAD_ENAB	 0x00000200
++#define  WDMAC_MODE_RX_ACCEL	 	 0x00000400
++#define WDMAC_STATUS			0x00004c04
++#define  WDMAC_STATUS_TGTABORT		 0x00000004
++#define  WDMAC_STATUS_MSTABORT		 0x00000008
++#define  WDMAC_STATUS_PARITYERR		 0x00000010
++#define  WDMAC_STATUS_ADDROFLOW		 0x00000020
++#define  WDMAC_STATUS_FIFOOFLOW		 0x00000040
++#define  WDMAC_STATUS_FIFOURUN		 0x00000080
++#define  WDMAC_STATUS_FIFOOREAD		 0x00000100
++#define  WDMAC_STATUS_LNGREAD		 0x00000200
++/* 0x4c08 --> 0x5000 unused */
++
++/* Per-cpu register offsets (arm9) */
++#define CPU_MODE			0x00000000
++#define  CPU_MODE_RESET			 0x00000001
++#define  CPU_MODE_HALT			 0x00000400
++#define CPU_STATE			0x00000004
++#define CPU_EVTMASK			0x00000008
++/* 0xc --> 0x1c reserved */
++#define CPU_PC				0x0000001c
++#define CPU_INSN			0x00000020
++#define CPU_SPAD_UFLOW			0x00000024
++#define CPU_WDOG_CLEAR			0x00000028
++#define CPU_WDOG_VECTOR			0x0000002c
++#define CPU_WDOG_PC			0x00000030
++#define CPU_HW_BP			0x00000034
++/* 0x38 --> 0x44 unused */
++#define CPU_WDOG_SAVED_STATE		0x00000044
++#define CPU_LAST_BRANCH_ADDR		0x00000048
++#define CPU_SPAD_UFLOW_SET		0x0000004c
++/* 0x50 --> 0x200 unused */
++#define CPU_R0				0x00000200
++#define CPU_R1				0x00000204
++#define CPU_R2				0x00000208
++#define CPU_R3				0x0000020c
++#define CPU_R4				0x00000210
++#define CPU_R5				0x00000214
++#define CPU_R6				0x00000218
++#define CPU_R7				0x0000021c
++#define CPU_R8				0x00000220
++#define CPU_R9				0x00000224
++#define CPU_R10				0x00000228
++#define CPU_R11				0x0000022c
++#define CPU_R12				0x00000230
++#define CPU_R13				0x00000234
++#define CPU_R14				0x00000238
++#define CPU_R15				0x0000023c
++#define CPU_R16				0x00000240
++#define CPU_R17				0x00000244
++#define CPU_R18				0x00000248
++#define CPU_R19				0x0000024c
++#define CPU_R20				0x00000250
++#define CPU_R21				0x00000254
++#define CPU_R22				0x00000258
++#define CPU_R23				0x0000025c
++#define CPU_R24				0x00000260
++#define CPU_R25				0x00000264
++#define CPU_R26				0x00000268
++#define CPU_R27				0x0000026c
++#define CPU_R28				0x00000270
++#define CPU_R29				0x00000274
++#define CPU_R30				0x00000278
++#define CPU_R31				0x0000027c
++/* 0x280 --> 0x400 unused */
++
++#define RX_CPU_BASE			0x00005000
++#define TX_CPU_BASE			0x00005400
++
++/* Mailboxes */
++#define GRCMBOX_INTERRUPT_0		0x00005800 /* 64-bit */
++#define GRCMBOX_INTERRUPT_1		0x00005808 /* 64-bit */
++#define GRCMBOX_INTERRUPT_2		0x00005810 /* 64-bit */
++#define GRCMBOX_INTERRUPT_3		0x00005818 /* 64-bit */
++#define GRCMBOX_GENERAL_0		0x00005820 /* 64-bit */
++#define GRCMBOX_GENERAL_1		0x00005828 /* 64-bit */
++#define GRCMBOX_GENERAL_2		0x00005830 /* 64-bit */
++#define GRCMBOX_GENERAL_3		0x00005838 /* 64-bit */
++#define GRCMBOX_GENERAL_4		0x00005840 /* 64-bit */
++#define GRCMBOX_GENERAL_5		0x00005848 /* 64-bit */
++#define GRCMBOX_GENERAL_6		0x00005850 /* 64-bit */
++#define GRCMBOX_GENERAL_7		0x00005858 /* 64-bit */
++#define GRCMBOX_RELOAD_STAT		0x00005860 /* 64-bit */
++#define GRCMBOX_RCVSTD_PROD_IDX		0x00005868 /* 64-bit */
++#define GRCMBOX_RCVJUMBO_PROD_IDX	0x00005870 /* 64-bit */
++#define GRCMBOX_RCVMINI_PROD_IDX	0x00005878 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_0	0x00005880 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_1	0x00005888 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_2	0x00005890 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_3	0x00005898 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_4	0x000058a0 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_5	0x000058a8 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_6	0x000058b0 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_7	0x000058b8 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_8	0x000058c0 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_9	0x000058c8 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_10	0x000058d0 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_11	0x000058d8 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_12	0x000058e0 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_13	0x000058e8 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_14	0x000058f0 /* 64-bit */
++#define GRCMBOX_RCVRET_CON_IDX_15	0x000058f8 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_0	0x00005900 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_1	0x00005908 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_2	0x00005910 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_3	0x00005918 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_4	0x00005920 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_5	0x00005928 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_6	0x00005930 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_7	0x00005938 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_8	0x00005940 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_9	0x00005948 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_10	0x00005950 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_11	0x00005958 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_12	0x00005960 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_13	0x00005968 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_14	0x00005970 /* 64-bit */
++#define GRCMBOX_SNDHOST_PROD_IDX_15	0x00005978 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_0	0x00005980 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_1	0x00005988 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_2	0x00005990 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_3	0x00005998 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_4	0x000059a0 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_5	0x000059a8 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_6	0x000059b0 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_7	0x000059b8 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_8	0x000059c0 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_9	0x000059c8 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_10	0x000059d0 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_11	0x000059d8 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_12	0x000059e0 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_13	0x000059e8 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_14	0x000059f0 /* 64-bit */
++#define GRCMBOX_SNDNIC_PROD_IDX_15	0x000059f8 /* 64-bit */
++#define GRCMBOX_HIGH_PRIO_EV_VECTOR	0x00005a00
++#define GRCMBOX_HIGH_PRIO_EV_MASK	0x00005a04
++#define GRCMBOX_LOW_PRIO_EV_VEC		0x00005a08
++#define GRCMBOX_LOW_PRIO_EV_MASK	0x00005a0c
++/* 0x5a10 --> 0x5c00 */
++
++/* Flow Through queues */
++#define FTQ_RESET			0x00005c00
++/* 0x5c04 --> 0x5c10 unused */
++#define FTQ_DMA_NORM_READ_CTL		0x00005c10
++#define FTQ_DMA_NORM_READ_FULL_CNT	0x00005c14
++#define FTQ_DMA_NORM_READ_FIFO_ENQDEQ	0x00005c18
++#define FTQ_DMA_NORM_READ_WRITE_PEEK	0x00005c1c
++#define FTQ_DMA_HIGH_READ_CTL		0x00005c20
++#define FTQ_DMA_HIGH_READ_FULL_CNT	0x00005c24
++#define FTQ_DMA_HIGH_READ_FIFO_ENQDEQ	0x00005c28
++#define FTQ_DMA_HIGH_READ_WRITE_PEEK	0x00005c2c
++#define FTQ_DMA_COMP_DISC_CTL		0x00005c30
++#define FTQ_DMA_COMP_DISC_FULL_CNT	0x00005c34
++#define FTQ_DMA_COMP_DISC_FIFO_ENQDEQ	0x00005c38
++#define FTQ_DMA_COMP_DISC_WRITE_PEEK	0x00005c3c
++#define FTQ_SEND_BD_COMP_CTL		0x00005c40
++#define FTQ_SEND_BD_COMP_FULL_CNT	0x00005c44
++#define FTQ_SEND_BD_COMP_FIFO_ENQDEQ	0x00005c48
++#define FTQ_SEND_BD_COMP_WRITE_PEEK	0x00005c4c
++#define FTQ_SEND_DATA_INIT_CTL		0x00005c50
++#define FTQ_SEND_DATA_INIT_FULL_CNT	0x00005c54
++#define FTQ_SEND_DATA_INIT_FIFO_ENQDEQ	0x00005c58
++#define FTQ_SEND_DATA_INIT_WRITE_PEEK	0x00005c5c
++#define FTQ_DMA_NORM_WRITE_CTL		0x00005c60
++#define FTQ_DMA_NORM_WRITE_FULL_CNT	0x00005c64
++#define FTQ_DMA_NORM_WRITE_FIFO_ENQDEQ	0x00005c68
++#define FTQ_DMA_NORM_WRITE_WRITE_PEEK	0x00005c6c
++#define FTQ_DMA_HIGH_WRITE_CTL		0x00005c70
++#define FTQ_DMA_HIGH_WRITE_FULL_CNT	0x00005c74
++#define FTQ_DMA_HIGH_WRITE_FIFO_ENQDEQ	0x00005c78
++#define FTQ_DMA_HIGH_WRITE_WRITE_PEEK	0x00005c7c
++#define FTQ_SWTYPE1_CTL			0x00005c80
++#define FTQ_SWTYPE1_FULL_CNT		0x00005c84
++#define FTQ_SWTYPE1_FIFO_ENQDEQ		0x00005c88
++#define FTQ_SWTYPE1_WRITE_PEEK		0x00005c8c
++#define FTQ_SEND_DATA_COMP_CTL		0x00005c90
++#define FTQ_SEND_DATA_COMP_FULL_CNT	0x00005c94
++#define FTQ_SEND_DATA_COMP_FIFO_ENQDEQ	0x00005c98
++#define FTQ_SEND_DATA_COMP_WRITE_PEEK	0x00005c9c
++#define FTQ_HOST_COAL_CTL		0x00005ca0
++#define FTQ_HOST_COAL_FULL_CNT		0x00005ca4
++#define FTQ_HOST_COAL_FIFO_ENQDEQ	0x00005ca8
++#define FTQ_HOST_COAL_WRITE_PEEK	0x00005cac
++#define FTQ_MAC_TX_CTL			0x00005cb0
++#define FTQ_MAC_TX_FULL_CNT		0x00005cb4
++#define FTQ_MAC_TX_FIFO_ENQDEQ		0x00005cb8
++#define FTQ_MAC_TX_WRITE_PEEK		0x00005cbc
++#define FTQ_MB_FREE_CTL			0x00005cc0
++#define FTQ_MB_FREE_FULL_CNT		0x00005cc4
++#define FTQ_MB_FREE_FIFO_ENQDEQ		0x00005cc8
++#define FTQ_MB_FREE_WRITE_PEEK		0x00005ccc
++#define FTQ_RCVBD_COMP_CTL		0x00005cd0
++#define FTQ_RCVBD_COMP_FULL_CNT		0x00005cd4
++#define FTQ_RCVBD_COMP_FIFO_ENQDEQ	0x00005cd8
++#define FTQ_RCVBD_COMP_WRITE_PEEK	0x00005cdc
++#define FTQ_RCVLST_PLMT_CTL		0x00005ce0
++#define FTQ_RCVLST_PLMT_FULL_CNT	0x00005ce4
++#define FTQ_RCVLST_PLMT_FIFO_ENQDEQ	0x00005ce8
++#define FTQ_RCVLST_PLMT_WRITE_PEEK	0x00005cec
++#define FTQ_RCVDATA_INI_CTL		0x00005cf0
++#define FTQ_RCVDATA_INI_FULL_CNT	0x00005cf4
++#define FTQ_RCVDATA_INI_FIFO_ENQDEQ	0x00005cf8
++#define FTQ_RCVDATA_INI_WRITE_PEEK	0x00005cfc
++#define FTQ_RCVDATA_COMP_CTL		0x00005d00
++#define FTQ_RCVDATA_COMP_FULL_CNT	0x00005d04
++#define FTQ_RCVDATA_COMP_FIFO_ENQDEQ	0x00005d08
++#define FTQ_RCVDATA_COMP_WRITE_PEEK	0x00005d0c
++#define FTQ_SWTYPE2_CTL			0x00005d10
++#define FTQ_SWTYPE2_FULL_CNT		0x00005d14
++#define FTQ_SWTYPE2_FIFO_ENQDEQ		0x00005d18
++#define FTQ_SWTYPE2_WRITE_PEEK		0x00005d1c
++/* 0x5d20 --> 0x6000 unused */
++
++/* Message signaled interrupt registers */
++#define MSGINT_MODE			0x00006000
++#define  MSGINT_MODE_RESET		 0x00000001
++#define  MSGINT_MODE_ENABLE		 0x00000002
++#define MSGINT_STATUS			0x00006004
++#define MSGINT_FIFO			0x00006008
++/* 0x600c --> 0x6400 unused */
++
++/* DMA completion registers */
++#define DMAC_MODE			0x00006400
++#define  DMAC_MODE_RESET		 0x00000001
++#define  DMAC_MODE_ENABLE		 0x00000002
++/* 0x6404 --> 0x6800 unused */
++
++/* GRC registers */
++#define GRC_MODE			0x00006800
++#define  GRC_MODE_UPD_ON_COAL		0x00000001
++#define  GRC_MODE_BSWAP_NONFRM_DATA	0x00000002
++#define  GRC_MODE_WSWAP_NONFRM_DATA	0x00000004
++#define  GRC_MODE_BSWAP_DATA		0x00000010
++#define  GRC_MODE_WSWAP_DATA		0x00000020
++#define  GRC_MODE_SPLITHDR		0x00000100
++#define  GRC_MODE_NOFRM_CRACKING	0x00000200
++#define  GRC_MODE_INCL_CRC		0x00000400
++#define  GRC_MODE_ALLOW_BAD_FRMS	0x00000800
++#define  GRC_MODE_NOIRQ_ON_SENDS	0x00002000
++#define  GRC_MODE_NOIRQ_ON_RCV		0x00004000
++#define  GRC_MODE_FORCE_PCI32BIT	0x00008000
++#define  GRC_MODE_HOST_STACKUP		0x00010000
++#define  GRC_MODE_HOST_SENDBDS		0x00020000
++#define  GRC_MODE_NO_TX_PHDR_CSUM	0x00100000
++#define  GRC_MODE_NO_RX_PHDR_CSUM	0x00800000
++#define  GRC_MODE_IRQ_ON_TX_CPU_ATTN	0x01000000
++#define  GRC_MODE_IRQ_ON_RX_CPU_ATTN	0x02000000
++#define  GRC_MODE_IRQ_ON_MAC_ATTN	0x04000000
++#define  GRC_MODE_IRQ_ON_DMA_ATTN	0x08000000
++#define  GRC_MODE_IRQ_ON_FLOW_ATTN	0x10000000
++#define  GRC_MODE_4X_NIC_SEND_RINGS	0x20000000
++#define  GRC_MODE_MCAST_FRM_ENABLE	0x40000000
++#define GRC_MISC_CFG			0x00006804
++#define  GRC_MISC_CFG_CORECLK_RESET	0x00000001
++#define  GRC_MISC_CFG_PRESCALAR_MASK	0x000000fe
++#define  GRC_MISC_CFG_PRESCALAR_SHIFT	1
++#define  GRC_MISC_CFG_BOARD_ID_MASK	0x0001e000
++#define  GRC_MISC_CFG_BOARD_ID_5700	0x0001e000
++#define  GRC_MISC_CFG_BOARD_ID_5701	0x00000000
++#define  GRC_MISC_CFG_BOARD_ID_5702FE	0x00004000
++#define  GRC_MISC_CFG_BOARD_ID_5703	0x00000000
++#define  GRC_MISC_CFG_BOARD_ID_5703S	0x00002000
++#define  GRC_MISC_CFG_BOARD_ID_5704	0x00000000
++#define  GRC_MISC_CFG_BOARD_ID_5704CIOBE 0x00004000
++#define  GRC_MISC_CFG_BOARD_ID_5704_A2	0x00008000
++#define  GRC_MISC_CFG_BOARD_ID_5788	0x00010000
++#define  GRC_MISC_CFG_BOARD_ID_5788M	0x00018000
++#define  GRC_MISC_CFG_BOARD_ID_AC91002A1 0x00018000
++#define  GRC_MISC_CFG_KEEP_GPHY_POWER	0x04000000
++#define GRC_LOCAL_CTRL			0x00006808
++#define  GRC_LCLCTRL_INT_ACTIVE		0x00000001
++#define  GRC_LCLCTRL_CLEARINT		0x00000002
++#define  GRC_LCLCTRL_SETINT		0x00000004
++#define  GRC_LCLCTRL_INT_ON_ATTN	0x00000008
++#define  GRC_LCLCTRL_GPIO_INPUT0	0x00000100
++#define  GRC_LCLCTRL_GPIO_INPUT1	0x00000200
++#define  GRC_LCLCTRL_GPIO_INPUT2	0x00000400
++#define  GRC_LCLCTRL_GPIO_OE0		0x00000800
++#define  GRC_LCLCTRL_GPIO_OE1		0x00001000
++#define  GRC_LCLCTRL_GPIO_OE2		0x00002000
++#define  GRC_LCLCTRL_GPIO_OUTPUT0	0x00004000
++#define  GRC_LCLCTRL_GPIO_OUTPUT1	0x00008000
++#define  GRC_LCLCTRL_GPIO_OUTPUT2	0x00010000
++#define  GRC_LCLCTRL_EXTMEM_ENABLE	0x00020000
++#define  GRC_LCLCTRL_MEMSZ_MASK		0x001c0000
++#define  GRC_LCLCTRL_MEMSZ_256K		0x00000000
++#define  GRC_LCLCTRL_MEMSZ_512K		0x00040000
++#define  GRC_LCLCTRL_MEMSZ_1M		0x00080000
++#define  GRC_LCLCTRL_MEMSZ_2M		0x000c0000
++#define  GRC_LCLCTRL_MEMSZ_4M		0x00100000
++#define  GRC_LCLCTRL_MEMSZ_8M		0x00140000
++#define  GRC_LCLCTRL_MEMSZ_16M		0x00180000
++#define  GRC_LCLCTRL_BANK_SELECT	0x00200000
++#define  GRC_LCLCTRL_SSRAM_TYPE		0x00400000
++#define  GRC_LCLCTRL_AUTO_SEEPROM	0x01000000
++#define GRC_TIMER			0x0000680c
++#define GRC_RX_CPU_EVENT		0x00006810
++#define GRC_RX_TIMER_REF		0x00006814
++#define GRC_RX_CPU_SEM			0x00006818
++#define GRC_REMOTE_RX_CPU_ATTN		0x0000681c
++#define GRC_TX_CPU_EVENT		0x00006820
++#define GRC_TX_TIMER_REF		0x00006824
++#define GRC_TX_CPU_SEM			0x00006828
++#define GRC_REMOTE_TX_CPU_ATTN		0x0000682c
++#define GRC_MEM_POWER_UP		0x00006830 /* 64-bit */
++#define GRC_EEPROM_ADDR			0x00006838
++#define  EEPROM_ADDR_WRITE		0x00000000
++#define  EEPROM_ADDR_READ		0x80000000
++#define  EEPROM_ADDR_COMPLETE		0x40000000
++#define  EEPROM_ADDR_FSM_RESET		0x20000000
++#define  EEPROM_ADDR_DEVID_MASK		0x1c000000
++#define  EEPROM_ADDR_DEVID_SHIFT	26
++#define  EEPROM_ADDR_START		0x02000000
++#define  EEPROM_ADDR_CLKPERD_SHIFT	16
++#define  EEPROM_ADDR_ADDR_MASK		0x0000ffff
++#define  EEPROM_ADDR_ADDR_SHIFT		0
++#define  EEPROM_DEFAULT_CLOCK_PERIOD	0x60
++#define  EEPROM_CHIP_SIZE		(64 * 1024)
++#define GRC_EEPROM_DATA			0x0000683c
++#define GRC_EEPROM_CTRL			0x00006840
++#define GRC_MDI_CTRL			0x00006844
++#define GRC_SEEPROM_DELAY		0x00006848
++/* 0x684c --> 0x6c00 unused */
++
++/* 0x6c00 --> 0x7000 unused */
++
++/* NVRAM Control registers */
++#define NVRAM_CMD			0x00007000
++#define  NVRAM_CMD_RESET		 0x00000001
++#define  NVRAM_CMD_DONE			 0x00000008
++#define  NVRAM_CMD_GO			 0x00000010
++#define  NVRAM_CMD_WR			 0x00000020
++#define  NVRAM_CMD_RD			 0x00000000
++#define  NVRAM_CMD_ERASE		 0x00000040
++#define  NVRAM_CMD_FIRST		 0x00000080
++#define  NVRAM_CMD_LAST			 0x00000100
++#define NVRAM_STAT			0x00007004
++#define NVRAM_WRDATA			0x00007008
++#define NVRAM_ADDR			0x0000700c
++#define  NVRAM_ADDR_MSK			0x00ffffff
++#define NVRAM_RDDATA			0x00007010
++#define NVRAM_CFG1			0x00007014
++#define  NVRAM_CFG1_FLASHIF_ENAB	 0x00000001
++#define  NVRAM_CFG1_BUFFERED_MODE	 0x00000002
++#define  NVRAM_CFG1_PASS_THRU		 0x00000004
++#define  NVRAM_CFG1_BIT_BANG		 0x00000008
++#define  NVRAM_CFG1_COMPAT_BYPASS	 0x80000000
++#define NVRAM_CFG2			0x00007018
++#define NVRAM_CFG3			0x0000701c
++#define NVRAM_SWARB			0x00007020
++#define  SWARB_REQ_SET0			 0x00000001
++#define  SWARB_REQ_SET1			 0x00000002
++#define  SWARB_REQ_SET2			 0x00000004
++#define  SWARB_REQ_SET3			 0x00000008
++#define  SWARB_REQ_CLR0			 0x00000010
++#define  SWARB_REQ_CLR1			 0x00000020
++#define  SWARB_REQ_CLR2			 0x00000040
++#define  SWARB_REQ_CLR3			 0x00000080
++#define  SWARB_GNT0			 0x00000100
++#define  SWARB_GNT1			 0x00000200
++#define  SWARB_GNT2			 0x00000400
++#define  SWARB_GNT3			 0x00000800
++#define  SWARB_REQ0			 0x00001000
++#define  SWARB_REQ1			 0x00002000
++#define  SWARB_REQ2			 0x00004000
++#define  SWARB_REQ3			 0x00008000
++#define    NVRAM_BUFFERED_PAGE_SIZE	   264
++#define    NVRAM_BUFFERED_PAGE_POS	   9
++/* 0x7024 --> 0x7400 unused */
++
++/* 0x7400 --> 0x8000 unused */
++
++/* 32K Window into NIC internal memory */
++#define NIC_SRAM_WIN_BASE		0x00008000
++
++/* Offsets into first 32k of NIC internal memory. */
++#define NIC_SRAM_PAGE_ZERO		0x00000000
++#define NIC_SRAM_SEND_RCB		0x00000100 /* 16 * TG3_BDINFO_... */
++#define NIC_SRAM_RCV_RET_RCB		0x00000200 /* 16 * TG3_BDINFO_... */
++#define NIC_SRAM_STATS_BLK		0x00000300
++#define NIC_SRAM_STATUS_BLK		0x00000b00
++
++#define NIC_SRAM_FIRMWARE_MBOX		0x00000b50
++#define  NIC_SRAM_FIRMWARE_MBOX_MAGIC1	 0x4B657654
++#define  NIC_SRAM_FIRMWARE_MBOX_MAGIC2	 0x4861764b /* !dma on linkchg */
++
++#define NIC_SRAM_DATA_SIG		0x00000b54
++#define  NIC_SRAM_DATA_SIG_MAGIC	 0x4b657654 /* ascii for 'KevT' */
++
++#define NIC_SRAM_DATA_CFG			0x00000b58
++#define  NIC_SRAM_DATA_CFG_LED_MODE_MASK	 0x0000000c
++#define  NIC_SRAM_DATA_CFG_LED_MODE_UNKNOWN	 0x00000000
++#define  NIC_SRAM_DATA_CFG_LED_TRIPLE_SPD	 0x00000004
++#define  NIC_SRAM_DATA_CFG_LED_OPEN_DRAIN	 0x00000004
++#define  NIC_SRAM_DATA_CFG_LED_LINK_SPD		 0x00000008
++#define  NIC_SRAM_DATA_CFG_LED_OUTPUT		 0x00000008
++#define  NIC_SRAM_DATA_CFG_PHY_TYPE_MASK	 0x00000030
++#define  NIC_SRAM_DATA_CFG_PHY_TYPE_UNKNOWN	 0x00000000
++#define  NIC_SRAM_DATA_CFG_PHY_TYPE_COPPER	 0x00000010
++#define  NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER	 0x00000020
++#define  NIC_SRAM_DATA_CFG_WOL_ENABLE		 0x00000040
++#define  NIC_SRAM_DATA_CFG_ASF_ENABLE		 0x00000080
++#define  NIC_SRAM_DATA_CFG_EEPROM_WP		 0x00000100
++#define  NIC_SRAM_DATA_CFG_MINI_PCI		 0x00001000
++#define  NIC_SRAM_DATA_CFG_FIBER_WOL		 0x00004000
++
++#define NIC_SRAM_DATA_PHY_ID		0x00000b74
++#define  NIC_SRAM_DATA_PHY_ID1_MASK	 0xffff0000
++#define  NIC_SRAM_DATA_PHY_ID2_MASK	 0x0000ffff
++
++#define NIC_SRAM_FW_CMD_MBOX		0x00000b78
++#define  FWCMD_NICDRV_ALIVE		 0x00000001
++#define  FWCMD_NICDRV_PAUSE_FW		 0x00000002
++#define  FWCMD_NICDRV_IPV4ADDR_CHG	 0x00000003
++#define  FWCMD_NICDRV_IPV6ADDR_CHG	 0x00000004
++#define  FWCMD_NICDRV_FIX_DMAR		 0x00000005
++#define  FWCMD_NICDRV_FIX_DMAW		 0x00000006
++#define NIC_SRAM_FW_CMD_LEN_MBOX	0x00000b7c
++#define NIC_SRAM_FW_CMD_DATA_MBOX	0x00000b80
++#define NIC_SRAM_FW_ASF_STATUS_MBOX	0x00000c00
++#define NIC_SRAM_FW_DRV_STATE_MBOX	0x00000c04
++#define  DRV_STATE_START		 0x00000001
++#define  DRV_STATE_UNLOAD		 0x00000002
++#define  DRV_STATE_WOL			 0x00000003
++#define  DRV_STATE_SUSPEND		 0x00000004
++
++#define NIC_SRAM_FW_RESET_TYPE_MBOX	0x00000c08
++
++#define NIC_SRAM_MAC_ADDR_HIGH_MBOX	0x00000c14
++#define NIC_SRAM_MAC_ADDR_LOW_MBOX	0x00000c18
++
++#define NIC_SRAM_RX_MINI_BUFFER_DESC	0x00001000
++
++#define NIC_SRAM_DMA_DESC_POOL_BASE	0x00002000
++#define  NIC_SRAM_DMA_DESC_POOL_SIZE	 0x00002000
++#define NIC_SRAM_TX_BUFFER_DESC		0x00004000 /* 512 entries */
++#define NIC_SRAM_RX_BUFFER_DESC		0x00006000 /* 256 entries */
++#define NIC_SRAM_RX_JUMBO_BUFFER_DESC	0x00007000 /* 256 entries */
++#define NIC_SRAM_MBUF_POOL_BASE		0x00008000
++#define  NIC_SRAM_MBUF_POOL_SIZE96	 0x00018000
++#define  NIC_SRAM_MBUF_POOL_SIZE64	 0x00010000
++#define  NIC_SRAM_MBUF_POOL_BASE5705	0x00010000
++#define  NIC_SRAM_MBUF_POOL_SIZE5705	0x0000e000
++
++/* Currently this is fixed. */
++#define PHY_ADDR		0x01
++
++/* Tigon3 specific PHY MII registers. */
++#define  TG3_BMCR_SPEED1000		0x0040
++
++#define MII_TG3_CTRL			0x09 /* 1000-baseT control register */
++#define  MII_TG3_CTRL_ADV_1000_HALF	0x0100
++#define  MII_TG3_CTRL_ADV_1000_FULL	0x0200
++#define  MII_TG3_CTRL_AS_MASTER		0x0800
++#define  MII_TG3_CTRL_ENABLE_AS_MASTER	0x1000
++
++#define MII_TG3_EXT_CTRL		0x10 /* Extended control register */
++#define  MII_TG3_EXT_CTRL_LNK3_LED_MODE	0x0002
++#define  MII_TG3_EXT_CTRL_TBI		0x8000
++
++#define MII_TG3_EXT_STAT		0x11 /* Extended status register */
++#define  MII_TG3_EXT_STAT_LPASS		0x0100
++
++#define MII_TG3_DSP_RW_PORT		0x15 /* DSP coefficient read/write port */
++
++#define MII_TG3_DSP_ADDRESS		0x17 /* DSP address register */
++
++#define MII_TG3_AUX_CTRL		0x18 /* auxilliary control register */
++
++#define MII_TG3_AUX_STAT		0x19 /* auxilliary status register */
++#define MII_TG3_AUX_STAT_LPASS		0x0004
++#define MII_TG3_AUX_STAT_SPDMASK	0x0700
++#define MII_TG3_AUX_STAT_10HALF		0x0100
++#define MII_TG3_AUX_STAT_10FULL		0x0200
++#define MII_TG3_AUX_STAT_100HALF	0x0300
++#define MII_TG3_AUX_STAT_100_4		0x0400
++#define MII_TG3_AUX_STAT_100FULL	0x0500
++#define MII_TG3_AUX_STAT_1000HALF	0x0600
++#define MII_TG3_AUX_STAT_1000FULL	0x0700
++
++#define MII_TG3_ISTAT			0x1a /* IRQ status register */
++#define MII_TG3_IMASK			0x1b /* IRQ mask register */
++
++/* ISTAT/IMASK event bits */
++#define MII_TG3_INT_LINKCHG		0x0002
++#define MII_TG3_INT_SPEEDCHG		0x0004
++#define MII_TG3_INT_DUPLEXCHG		0x0008
++#define MII_TG3_INT_ANEG_PAGE_RX	0x0400
++
++/* XXX Add this to mii.h */
++#ifndef ADVERTISE_PAUSE
++#define ADVERTISE_PAUSE_CAP		0x0400
++#endif
++#ifndef ADVERTISE_PAUSE_ASYM
++#define ADVERTISE_PAUSE_ASYM		0x0800
++#endif
++#ifndef LPA_PAUSE
++#define LPA_PAUSE_CAP			0x0400
++#endif
++#ifndef LPA_PAUSE_ASYM
++#define LPA_PAUSE_ASYM			0x0800
++#endif
++
++/* There are two ways to manage the TX descriptors on the tigon3.
++ * Either the descriptors are in host DMA'able memory, or they
++ * exist only in the cards on-chip SRAM.  All 16 send bds are under
++ * the same mode, they may not be configured individually.
++ *
++ * The mode we use is controlled by TG3_FLAG_HOST_TXDS in tp->tg3_flags.
++ *
++ * To use host memory TX descriptors:
++ *	1) Set GRC_MODE_HOST_SENDBDS in GRC_MODE register.
++ *	   Make sure GRC_MODE_4X_NIC_SEND_RINGS is clear.
++ *	2) Allocate DMA'able memory.
++ *	3) In NIC_SRAM_SEND_RCB (of desired index) of on-chip SRAM:
++ *	   a) Set TG3_BDINFO_HOST_ADDR to DMA address of memory
++ *	      obtained in step 2
++ *	   b) Set TG3_BDINFO_NIC_ADDR to NIC_SRAM_TX_BUFFER_DESC.
++ *	   c) Set len field of TG3_BDINFO_MAXLEN_FLAGS to number
++ *            of TX descriptors.  Leave flags field clear.
++ *	4) Access TX descriptors via host memory.  The chip
++ *	   will refetch into local SRAM as needed when producer
++ *	   index mailboxes are updated.
++ *
++ * To use on-chip TX descriptors:
++ *	1) Set GRC_MODE_4X_NIC_SEND_RINGS in GRC_MODE register.
++ *	   Make sure GRC_MODE_HOST_SENDBDS is clear.
++ *	2) In NIC_SRAM_SEND_RCB (of desired index) of on-chip SRAM:
++ *	   a) Set TG3_BDINFO_HOST_ADDR to zero.
++ *	   b) Set TG3_BDINFO_NIC_ADDR to NIC_SRAM_TX_BUFFER_DESC
++ *	   c) TG3_BDINFO_MAXLEN_FLAGS is don't care.
++ *	3) Access TX descriptors directly in on-chip SRAM
++ *	   using normal {read,write}l().  (and not using
++ *         pointer dereferencing of ioremap()'d memory like
++ *	   the broken Broadcom driver does)
++ *
++ * Note that BDINFO_FLAGS_DISABLED should be set in the flags field of
++ * TG3_BDINFO_MAXLEN_FLAGS of all unused SEND_RCB indices.
++ */
++struct tg3_tx_buffer_desc {
++	uint32_t			addr_hi;
++	uint32_t			addr_lo;
++
++	uint32_t			len_flags;
++#define TXD_FLAG_TCPUDP_CSUM		0x0001
++#define TXD_FLAG_IP_CSUM		0x0002
++#define TXD_FLAG_END			0x0004
++#define TXD_FLAG_IP_FRAG		0x0008
++#define TXD_FLAG_IP_FRAG_END		0x0010
++#define TXD_FLAG_VLAN			0x0040
++#define TXD_FLAG_COAL_NOW		0x0080
++#define TXD_FLAG_CPU_PRE_DMA		0x0100
++#define TXD_FLAG_CPU_POST_DMA		0x0200
++#define TXD_FLAG_ADD_SRC_ADDR		0x1000
++#define TXD_FLAG_CHOOSE_SRC_ADDR	0x6000
++#define TXD_FLAG_NO_CRC			0x8000
++#define TXD_LEN_SHIFT			16
++
++	uint32_t			vlan_tag;
++#define TXD_VLAN_TAG_SHIFT		0
++#define TXD_MSS_SHIFT			16
++};
++
++#define TXD_ADDR			0x00UL /* 64-bit */
++#define TXD_LEN_FLAGS			0x08UL /* 32-bit (upper 16-bits are len) */
++#define TXD_VLAN_TAG			0x0cUL /* 32-bit (upper 16-bits are tag) */
++#define TXD_SIZE			0x10UL
++
++struct tg3_rx_buffer_desc {
++	uint32_t			addr_hi;
++	uint32_t			addr_lo;
++
++	uint32_t			idx_len;
++#define RXD_IDX_MASK	0xffff0000
++#define RXD_IDX_SHIFT	16
++#define RXD_LEN_MASK	0x0000ffff
++#define RXD_LEN_SHIFT	0
++
++	uint32_t			type_flags;
++#define RXD_TYPE_SHIFT	16
++#define RXD_FLAGS_SHIFT	0
++
++#define RXD_FLAG_END			0x0004
++#define RXD_FLAG_MINI			0x0800
++#define RXD_FLAG_JUMBO			0x0020
++#define RXD_FLAG_VLAN			0x0040
++#define RXD_FLAG_ERROR			0x0400
++#define RXD_FLAG_IP_CSUM		0x1000
++#define RXD_FLAG_TCPUDP_CSUM		0x2000
++#define RXD_FLAG_IS_TCP			0x4000
++
++	uint32_t			ip_tcp_csum;
++#define RXD_IPCSUM_MASK		0xffff0000
++#define RXD_IPCSUM_SHIFT	16
++#define RXD_TCPCSUM_MASK	0x0000ffff
++#define RXD_TCPCSUM_SHIFT	0
++
++	uint32_t			err_vlan;
++
++#define RXD_VLAN_MASK			0x0000ffff
++
++#define RXD_ERR_BAD_CRC			0x00010000
++#define RXD_ERR_COLLISION		0x00020000
++#define RXD_ERR_LINK_LOST		0x00040000
++#define RXD_ERR_PHY_DECODE		0x00080000
++#define RXD_ERR_ODD_NIBBLE_RCVD_MII	0x00100000
++#define RXD_ERR_MAC_ABRT		0x00200000
++#define RXD_ERR_TOO_SMALL		0x00400000
++#define RXD_ERR_NO_RESOURCES		0x00800000
++#define RXD_ERR_HUGE_FRAME		0x01000000
++#define RXD_ERR_MASK			0xffff0000
++
++	uint32_t			reserved;
++	uint32_t			opaque;
++#define RXD_OPAQUE_INDEX_MASK		0x0000ffff
++#define RXD_OPAQUE_INDEX_SHIFT		0
++#define RXD_OPAQUE_RING_STD		0x00010000
++#define RXD_OPAQUE_RING_JUMBO		0x00020000
++#define RXD_OPAQUE_RING_MINI		0x00040000
++#define RXD_OPAQUE_RING_MASK		0x00070000
++};
++
++struct tg3_ext_rx_buffer_desc {
++	struct {
++		uint32_t		addr_hi;
++		uint32_t		addr_lo;
++	}				addrlist[3];
++	uint32_t			len2_len1;
++	uint32_t			resv_len3;
++	struct tg3_rx_buffer_desc	std;
++};
++
++/* We only use this when testing out the DMA engine
++ * at probe time.  This is the internal format of buffer
++ * descriptors used by the chip at NIC_SRAM_DMA_DESCS.
++ */
++struct tg3_internal_buffer_desc {
++	uint32_t			addr_hi;
++	uint32_t			addr_lo;
++	uint32_t			nic_mbuf;
++	/* XXX FIX THIS */
++#if __BYTE_ORDER == __BIG_ENDIAN
++	uint16_t			cqid_sqid;
++	uint16_t			len;
++#else
++	uint16_t			len;
++	uint16_t			cqid_sqid;
++#endif
++	uint32_t			flags;
++	uint32_t			__cookie1;
++	uint32_t			__cookie2;
++	uint32_t			__cookie3;
++};
++
++#define TG3_HW_STATUS_SIZE		0x50
++struct tg3_hw_status {
++	uint32_t			status;
++#define SD_STATUS_UPDATED		0x00000001
++#define SD_STATUS_LINK_CHG		0x00000002
++#define SD_STATUS_ERROR			0x00000004
++
++	uint32_t			status_tag;
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++	uint16_t			rx_consumer;
++	uint16_t			rx_jumbo_consumer;
++#else
++	uint16_t			rx_jumbo_consumer;
++	uint16_t			rx_consumer;
++#endif
++
++#if __BYTE_ORDER ==  __BIG_ENDIAN
++	uint16_t			reserved;
++	uint16_t			rx_mini_consumer;
++#else
++	uint16_t			rx_mini_consumer;
++	uint16_t			reserved;
++#endif
++	struct {
++#if __BYTE_ORDER ==  __BIG_ENDIAN
++		uint16_t		tx_consumer;
++		uint16_t		rx_producer;
++#else
++		uint16_t		rx_producer;
++		uint16_t		tx_consumer;
++#endif
++	}				idx[16];
++};
++
++typedef struct {
++	uint32_t high, low;
++} tg3_stat64_t;
++
++struct tg3_hw_stats {
++	uint8_t				__reserved0[0x400-0x300];
++
++	/* Statistics maintained by Receive MAC. */
++	tg3_stat64_t			rx_octets;
++	uint64_t			__reserved1;
++	tg3_stat64_t			rx_fragments;
++	tg3_stat64_t			rx_ucast_packets;
++	tg3_stat64_t			rx_mcast_packets;
++	tg3_stat64_t			rx_bcast_packets;
++	tg3_stat64_t			rx_fcs_errors;
++	tg3_stat64_t			rx_align_errors;
++	tg3_stat64_t			rx_xon_pause_rcvd;
++	tg3_stat64_t			rx_xoff_pause_rcvd;
++	tg3_stat64_t			rx_mac_ctrl_rcvd;
++	tg3_stat64_t			rx_xoff_entered;
++	tg3_stat64_t			rx_frame_too_long_errors;
++	tg3_stat64_t			rx_jabbers;
++	tg3_stat64_t			rx_undersize_packets;
++	tg3_stat64_t			rx_in_length_errors;
++	tg3_stat64_t			rx_out_length_errors;
++	tg3_stat64_t			rx_64_or_less_octet_packets;
++	tg3_stat64_t			rx_65_to_127_octet_packets;
++	tg3_stat64_t			rx_128_to_255_octet_packets;
++	tg3_stat64_t			rx_256_to_511_octet_packets;
++	tg3_stat64_t			rx_512_to_1023_octet_packets;
++	tg3_stat64_t			rx_1024_to_1522_octet_packets;
++	tg3_stat64_t			rx_1523_to_2047_octet_packets;
++	tg3_stat64_t			rx_2048_to_4095_octet_packets;
++	tg3_stat64_t			rx_4096_to_8191_octet_packets;
++	tg3_stat64_t			rx_8192_to_9022_octet_packets;
++
++	uint64_t			__unused0[37];
++
++	/* Statistics maintained by Transmit MAC. */
++	tg3_stat64_t			tx_octets;
++	uint64_t			__reserved2;
++	tg3_stat64_t			tx_collisions;
++	tg3_stat64_t			tx_xon_sent;
++	tg3_stat64_t			tx_xoff_sent;
++	tg3_stat64_t			tx_flow_control;
++	tg3_stat64_t			tx_mac_errors;
++	tg3_stat64_t			tx_single_collisions;
++	tg3_stat64_t			tx_mult_collisions;
++	tg3_stat64_t			tx_deferred;
++	uint64_t			__reserved3;
++	tg3_stat64_t			tx_excessive_collisions;
++	tg3_stat64_t			tx_late_collisions;
++	tg3_stat64_t			tx_collide_2times;
++	tg3_stat64_t			tx_collide_3times;
++	tg3_stat64_t			tx_collide_4times;
++	tg3_stat64_t			tx_collide_5times;
++	tg3_stat64_t			tx_collide_6times;
++	tg3_stat64_t			tx_collide_7times;
++	tg3_stat64_t			tx_collide_8times;
++	tg3_stat64_t			tx_collide_9times;
++	tg3_stat64_t			tx_collide_10times;
++	tg3_stat64_t			tx_collide_11times;
++	tg3_stat64_t			tx_collide_12times;
++	tg3_stat64_t			tx_collide_13times;
++	tg3_stat64_t			tx_collide_14times;
++	tg3_stat64_t			tx_collide_15times;
++	tg3_stat64_t			tx_ucast_packets;
++	tg3_stat64_t			tx_mcast_packets;
++	tg3_stat64_t			tx_bcast_packets;
++	tg3_stat64_t			tx_carrier_sense_errors;
++	tg3_stat64_t			tx_discards;
++	tg3_stat64_t			tx_errors;
++
++	uint64_t			__unused1[31];
++
++	/* Statistics maintained by Receive List Placement. */
++	tg3_stat64_t			COS_rx_packets[16];
++	tg3_stat64_t			COS_rx_filter_dropped;
++	tg3_stat64_t			dma_writeq_full;
++	tg3_stat64_t			dma_write_prioq_full;
++	tg3_stat64_t			rxbds_empty;
++	tg3_stat64_t			rx_discards;
++	tg3_stat64_t			rx_errors;
++	tg3_stat64_t			rx_threshold_hit;
++
++	uint64_t			__unused2[9];
++
++	/* Statistics maintained by Send Data Initiator. */
++	tg3_stat64_t			COS_out_packets[16];
++	tg3_stat64_t			dma_readq_full;
++	tg3_stat64_t			dma_read_prioq_full;
++	tg3_stat64_t			tx_comp_queue_full;
++
++	/* Statistics maintained by Host Coalescing. */
++	tg3_stat64_t			ring_set_send_prod_index;
++	tg3_stat64_t			ring_status_update;
++	tg3_stat64_t			nic_irqs;
++	tg3_stat64_t			nic_avoided_irqs;
++	tg3_stat64_t			nic_tx_threshold_hit;
++
++	uint8_t				__reserved4[0xb00-0x9c0];
++};
++
++enum phy_led_mode {
++	led_mode_auto,
++	led_mode_three_link,
++	led_mode_link10
++};
++
++#if 0
++/* 'mapping' is superfluous as the chip does not write into
++ * the tx/rx post rings so we could just fetch it from there.
++ * But the cache behavior is better how we are doing it now.
++ */
++struct ring_info {
++	struct sk_buff			*skb;
++	DECLARE_PCI_UNMAP_ADDR(mapping)
++};
++
++struct tx_ring_info {
++	struct sk_buff			*skb;
++	DECLARE_PCI_UNMAP_ADDR(mapping)
++	uint32_t			prev_vlan_tag;
++};
++#endif
++
++struct tg3_config_info {
++	uint32_t			flags;
++};
++
++struct tg3_link_config {
++	/* Describes what we're trying to get. */
++	uint32_t			advertising;
++#if 0
++	uint16_t			speed;
++	uint8_t				duplex;
++	uint8_t				autoneg;
++#define SPEED_INVALID		0xffff
++#define DUPLEX_INVALID		0xff
++#define AUTONEG_INVALID		0xff
++#endif
++
++	/* Describes what we actually have. */
++	uint8_t				active_speed;
++	uint8_t				active_duplex;
++
++	/* When we go in and out of low power mode we need
++	 * to swap with this state.
++	 */
++#if 0
++	int				phy_is_low_power;
++	uint16_t			orig_speed;
++	uint8_t				orig_duplex;
++	uint8_t				orig_autoneg;
++#endif
++};
++
++struct tg3_bufmgr_config {
++	uint32_t		mbuf_read_dma_low_water;
++	uint32_t		mbuf_mac_rx_low_water;
++	uint32_t		mbuf_high_water;
++
++	uint32_t		mbuf_read_dma_low_water_jumbo;
++	uint32_t		mbuf_mac_rx_low_water_jumbo;
++	uint32_t		mbuf_high_water_jumbo;
++
++	uint32_t		dma_low_water;
++	uint32_t		dma_high_water;
++};
++
++struct tg3 {
++#if 0
++	/* SMP locking strategy:
++	 *
++	 * lock: Held during all operations except TX packet
++	 *       processing.
++	 *
++	 * tx_lock: Held during tg3_start_xmit{,_4gbug} and tg3_tx
++	 *
++	 * If you want to shut up all asynchronous processing you must
++	 * acquire both locks, 'lock' taken before 'tx_lock'.  IRQs must
++	 * be disabled to take 'lock' but only softirq disabling is
++	 * necessary for acquisition of 'tx_lock'.
++	 */
++	spinlock_t			lock;
++	spinlock_t			tx_lock;
++#endif
++
++	uint32_t			tx_prod;
++#if 0
++	uint32_t			tx_cons;
++#endif
++	uint32_t			rx_rcb_ptr;
++	uint32_t			rx_std_ptr;
++#if 0
++	uint32_t			rx_jumbo_ptr;
++	spinlock_t			indirect_lock;
++
++	struct net_device_stats		net_stats;
++	struct net_device_stats		net_stats_prev;
++#endif
++	unsigned long			phy_crc_errors;
++
++#if 0
++	uint32_t			rx_offset;
++#endif
++	uint32_t			tg3_flags;
++#if 0
++#define TG3_FLAG_HOST_TXDS		0x00000001
++#endif
++#define TG3_FLAG_TXD_MBOX_HWBUG		0x00000002
++#define TG3_FLAG_RX_CHECKSUMS		0x00000004
++#define TG3_FLAG_USE_LINKCHG_REG	0x00000008
++#define TG3_FLAG_USE_MI_INTERRUPT	0x00000010
++#define TG3_FLAG_ENABLE_ASF		0x00000020
++#define TG3_FLAG_5701_REG_WRITE_BUG	0x00000040
++#define TG3_FLAG_POLL_SERDES		0x00000080
++#define TG3_FLAG_MBOX_WRITE_REORDER	0x00000100
++#define TG3_FLAG_PCIX_TARGET_HWBUG	0x00000200
++#define TG3_FLAG_WOL_SPEED_100MB	0x00000400
++#define TG3_FLAG_WOL_ENABLE		0x00000800
++#define TG3_FLAG_EEPROM_WRITE_PROT	0x00001000
++#define TG3_FLAG_NVRAM			0x00002000
++#define TG3_FLAG_NVRAM_BUFFERED		0x00004000
++#define TG3_FLAG_RX_PAUSE		0x00008000
++#define TG3_FLAG_TX_PAUSE		0x00010000
++#define TG3_FLAG_PCIX_MODE		0x00020000
++#define TG3_FLAG_PCI_HIGH_SPEED		0x00040000
++#define TG3_FLAG_PCI_32BIT		0x00080000
++#define TG3_FLAG_NO_TX_PSEUDO_CSUM	0x00100000
++#define TG3_FLAG_NO_RX_PSEUDO_CSUM	0x00200000
++#define TG3_FLAG_SERDES_WOL_CAP		0x00400000
++#define TG3_FLAG_JUMBO_ENABLE		0x00800000
++#define TG3_FLAG_10_100_ONLY		0x01000000
++#define TG3_FLAG_PAUSE_AUTONEG		0x02000000
++#define TG3_FLAG_PAUSE_RX		0x04000000
++#define TG3_FLAG_PAUSE_TX		0x08000000
++#define TG3_FLAG_BROKEN_CHECKSUMS	0x10000000
++#define TG3_FLAG_GOT_SERDES_FLOWCTL	0x20000000
++#define TG3_FLAG_SPLIT_MODE		0x40000000
++#define TG3_FLAG_INIT_COMPLETE		0x80000000
++
++	uint32_t			tg3_flags2;
++#define TG3_FLG2_RESTART_TIMER		0x00000001
++#define TG3_FLG2_SUN_5704		0x00000002
++#define TG3_FLG2_NO_ETH_WIRE_SPEED	0x00000004
++#define TG3_FLG2_IS_5788		0x00000008
++#define TG3_FLG2_MAX_RXPEND_64		0x00000010
++#define TG3_FLG2_TSO_CAPABLE		0x00000020
++
++
++
++	uint32_t			split_mode_max_reqs;
++#define SPLIT_MODE_5704_MAX_REQ		3
++
++#if 0
++	struct timer_list		timer;
++	uint16_t			timer_counter;
++	uint16_t			timer_multiplier;
++	uint32_t			timer_offset;
++	uint16_t			asf_counter;
++	uint16_t			asf_multiplier;
++#endif
++
++	struct tg3_link_config		link_config;
++	struct tg3_bufmgr_config	bufmgr_config;
++
++#if 0
++	uint32_t			rx_pending;
++	uint32_t			rx_jumbo_pending;
++	uint32_t			tx_pending;
++#endif
++
++	/* cache h/w values, often passed straight to h/w */
++	uint32_t			rx_mode;
++	uint32_t			tx_mode;
++	uint32_t			mac_mode;
++	uint32_t			mi_mode;
++	uint32_t			misc_host_ctrl;
++	uint32_t			grc_mode;
++	uint32_t			grc_local_ctrl;
++	uint32_t			dma_rwctrl;
++#if 0
++	uint32_t			coalesce_mode;
++#endif
++
++	/* PCI block */
++	uint16_t			pci_chip_rev_id;
++#if 0
++	uint8_t				pci_cacheline_sz;
++	uint8_t				pci_lat_timer;
++	uint8_t				pci_hdr_type;
++	uint8_t				pci_bist;
++#endif
++	uint32_t			pci_cfg_state[64 / sizeof(uint32_t)];
++
++	int				pm_cap;
++
++	/* PHY info */
++	uint32_t			phy_id;
++#define PHY_ID_MASK			0xfffffff0
++#define PHY_ID_BCM5400			0x60008040
++#define PHY_ID_BCM5401			0x60008050
++#define PHY_ID_BCM5411			0x60008070
++#define PHY_ID_BCM5701			0x60008110
++#define PHY_ID_BCM5703			0x60008160
++#define PHY_ID_BCM5704			0x60008190
++#define PHY_ID_BCM5705			0x600081a0
++#define PHY_ID_BCM8002			0x60010140
++#define PHY_ID_SERDES			0xfeedbee0
++#define PHY_ID_INVALID			0xffffffff
++#define PHY_ID_REV_MASK			0x0000000f
++#define PHY_REV_BCM5401_B0		0x1
++#define PHY_REV_BCM5401_B2		0x3
++#define PHY_REV_BCM5401_C0		0x6
++#define PHY_REV_BCM5411_X0		0x1 /* Found on Netgear GA302T */
++
++	enum phy_led_mode		led_mode;
++
++	char				board_part_number[24];
++	uint32_t			nic_sram_data_cfg;
++	uint32_t			pci_clock_ctrl;
++#if 0
++	struct pci_device		*pdev_peer;
++#endif
++
++	/* This macro assumes the passed PHY ID is already masked
++	 * with PHY_ID_MASK.
++	 */
++#define KNOWN_PHY_ID(X)		\
++	((X) == PHY_ID_BCM5400 || (X) == PHY_ID_BCM5401 || \
++	 (X) == PHY_ID_BCM5411 || (X) == PHY_ID_BCM5701 || \
++	 (X) == PHY_ID_BCM5703 || (X) == PHY_ID_BCM5704 || \
++	 (X) == PHY_ID_BCM5705 || \
++	 (X) == PHY_ID_BCM8002 || (X) == PHY_ID_SERDES)
++
++	unsigned long			regs;
++	struct pci_device		*pdev;
++	struct nic			*nic;
++#if 0
++	struct net_device		*dev;
++#endif
++#if TG3_VLAN_TAG_USED
++	struct vlan_group		*vlgrp;
++#endif
++
++	struct tg3_rx_buffer_desc	*rx_std;
++#if 0
++	struct ring_info		*rx_std_buffers;
++	dma_addr_t			rx_std_mapping;
++	struct tg3_rx_buffer_desc	*rx_jumbo;
++	struct ring_info		*rx_jumbo_buffers;
++	dma_addr_t			rx_jumbo_mapping;
++#endif
++
++	struct tg3_rx_buffer_desc	*rx_rcb;
++#if 0
++	dma_addr_t			rx_rcb_mapping;
++#endif
++
++	/* TX descs are only used if TG3_FLAG_HOST_TXDS is set. */
++	struct tg3_tx_buffer_desc	*tx_ring;
++#if 0
++	struct tx_ring_info		*tx_buffers;
++	dma_addr_t			tx_desc_mapping;
++#endif
++
++	struct tg3_hw_status		*hw_status;
++#if 0
++	dma_addr_t			status_mapping;
++#endif
++#if 0
++	uint32_t			msg_enable;
++#endif
++
++	struct tg3_hw_stats		*hw_stats;
++#if 0
++	dma_addr_t			stats_mapping;
++#endif
++
++	int				carrier_ok;
++	uint16_t			subsystem_vendor;
++	uint16_t			subsystem_device;
++};
++
++#endif /* !(_T3_H) */
+diff -Naur grub-0.97.orig/netboot/tiara.c grub-0.97/netboot/tiara.c
+--- grub-0.97.orig/netboot/tiara.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/tiara.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,255 +0,0 @@
+-/**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-
+-TIARA (Fujitsu Etherstar) NIC driver for Etherboot
+-Copyright (c) Ken Yap 1998
+-
+-Information gleaned from:
+-
+-TIARA.ASM Packet driver by Brian Fisher, Queens U, Kingston, Ontario
+-Fujitsu MB86960 spec sheet (different chip but same family)
+-***************************************************************************/
+-
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+-/* to get some global routines like printf */
+-#include "etherboot.h"
+-/* to get the interface to the body of the program */
+-#include "nic.h"
+-#include "cards.h"
+-
+-/*
+-	EtherStar I/O Register offsets
+-*/
+-
+-/* Offsets of registers */
+-#define	DLCR_XMIT_STAT	0x00
+-#define	DLCR_XMIT_MASK	0x01
+-#define	DLCR_RECV_STAT	0x02
+-#define	DLCR_RECV_MASK	0x03
+-#define	DLCR_XMIT_MODE	0x04
+-#define	DLCR_RECV_MODE	0x05
+-#define	DLCR_ENABLE	0x06
+-#define	DLCR_TDR_LOW	0x07
+-#define	DLCR_NODE_ID	0x08
+-#define	DLCR_TDR_HIGH	0x0F
+-#define	BMPR_MEM_PORT	0x10
+-#define	BMPR_PKT_LEN	0x12
+-#define	BMPR_DMA_ENABLE	0x14
+-#define	PROM_ID		0x18
+-
+-#define	TMST		0x80
+-#define	TMT_OK		0x80
+-#define	TMT_16COLL	0x02
+-#define	BUF_EMPTY	0x40
+-
+-#define	CARD_DISABLE	0x80	/* written to DLCR_ENABLE to disable card */
+-#define	CARD_ENABLE	0	/* written to DLCR_ENABLE to enable card */
+-
+-#define	CLEAR_STATUS	0x0F	/* used to clear status info */
+-/*
+-	00001111B
+-	!!!!!!!!--------
+-	!!!!!!!+--------CLEAR BUS WRITE ERROR
+-	!!!!!!+---------CLEAR 16 COLLISION
+-	!!!!!+----------CLEAR COLLISION
+-	!!!!+-----------CLEAR UNDERFLOW
+-	!!!+------------NC
+-	!!+-------------NC
+-	!+--------------NC
+-	+---------------NC
+-*/
+-
+-#define	NO_TX_IRQS	0	/* written to clear transmit IRQs */
+-
+-#define	CLR_RCV_STATUS	0xCF	/* clears receive status */
+-
+-#define	EN_RCV_IRQS	0x80	/* enable receive interrupts */
+-/*
+-	10000000B
+-	!!!!!!!!--------
+-	!!!!!!!+--------ENABLE OVERFLOW
+-	!!!!!!+---------ENABLE CRC
+-	!!!!!+----------ENABLE ALIGN
+-	!!!!+-----------ENABLE SHORT PKT
+-	!!!+------------DISABLE REMOTE RESET
+-	!!+-------------RESERVED
+-	!+--------------RESERVED
+-	+---------------ENABLE PKT READY
+-*/
+-
+-#define	XMIT_MODE	0x02
+-/*
+-	00000010B
+-	!!!!!!!!---------ENABLE CARRIER DETECT
+-	!!!!!!!+---------DISABLE LOOPBACK
+-*/
+-
+-#define	RECV_MODE	0x02
+-/*
+-	00000010B
+-	!!!!!!!!---------ACCEPT ALL PACKETS
+-	!!!!!!!+---------ACCEPT PHYSICAL, MULTICAST, AND
+-	!!!!!!+----------BROADCAST PACKETS
+-	!!!!!+-----------DISABLE REMOTE RESET
+-	!!!!+------------DISABLE SHORT PACKETS
+-	!!!+-------------USE 6 BYTE ADDRESS
+-	!!+--------------NC
+-	!+---------------NC
+-	+----------------DISABLE CRC TEST MODE
+-*/
+-
+-/* NIC specific static variables go here */
+-
+-static unsigned short	ioaddr;
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void tiara_reset(struct nic *nic)
+-{
+-	int		i;
+-
+-	outb(CARD_DISABLE, ioaddr + DLCR_ENABLE);
+-	outb(CLEAR_STATUS, ioaddr + DLCR_XMIT_STAT);
+-	outb(NO_TX_IRQS, ioaddr + DLCR_XMIT_MASK);
+-	outb(CLR_RCV_STATUS, ioaddr + DLCR_RECV_STAT);
+-	outb(XMIT_MODE, ioaddr + DLCR_XMIT_MODE);
+-	outb(RECV_MODE, ioaddr + DLCR_RECV_MODE);
+-	/* Vacuum recv buffer */
+-	while ((inb(ioaddr + DLCR_RECV_MODE) & BUF_EMPTY) == 0)
+-		inb(ioaddr + BMPR_MEM_PORT);
+-	/* Set node address */
+-	for (i = 0; i < ETH_ALEN; ++i)
+-		outb(nic->node_addr[i], ioaddr + DLCR_NODE_ID + i);
+-	outb(CLR_RCV_STATUS, ioaddr + DLCR_RECV_STAT);
+-	outb(CARD_ENABLE, ioaddr + DLCR_ENABLE);
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int tiara_poll(struct nic *nic)
+-{
+-	unsigned int		len;
+-
+-	if (inb(ioaddr + DLCR_RECV_MODE) & BUF_EMPTY)
+-		return (0);
+-	/* Ack packet */
+-	outw(CLR_RCV_STATUS, ioaddr + DLCR_RECV_STAT);
+-	len = inw(ioaddr + BMPR_MEM_PORT);		/* throw away status */
+-	len = inw(ioaddr + BMPR_MEM_PORT);
+-	/* Drop overlength packets */
+-	if (len > ETH_FRAME_LEN)
+-		return (0);		/* should we drain the buffer? */
+-	insw(ioaddr + BMPR_MEM_PORT, nic->packet, len / 2);
+-	/* If it's our own, drop it */
+-	if (memcmp(nic->packet + ETH_ALEN, nic->node_addr, ETH_ALEN) == 0)
+-		return (0);
+-	nic->packetlen = len;
+-	return (1);
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void tiara_transmit(
+-struct nic *nic,
+-const char *d,			/* Destination */
+-unsigned int t,			/* Type */
+-unsigned int s,			/* size */
+-const char *p)			/* Packet */
+-{
+-	unsigned int	len;
+-	unsigned long	time;
+-
+-	len = s + ETH_HLEN;
+-	if (len < ETH_ZLEN)
+-		len = ETH_ZLEN;
+-	t = htons(t);
+-	outsw(ioaddr + BMPR_MEM_PORT, d, ETH_ALEN / 2);
+-	outsw(ioaddr + BMPR_MEM_PORT, nic->node_addr, ETH_ALEN / 2);
+-	outw(t, ioaddr + BMPR_MEM_PORT);
+-	outsw(ioaddr + BMPR_MEM_PORT, p, s / 2);
+-	if (s & 1)					/* last byte */
+-		outb(p[s-1], ioaddr + BMPR_MEM_PORT);
+-	while (s++ < ETH_ZLEN - ETH_HLEN)	/* pad */
+-		outb(0, ioaddr + BMPR_MEM_PORT);
+-	outw(len | (TMST << 8), ioaddr + BMPR_PKT_LEN);
+-	/* wait for transmit complete */
+-	time = currticks() + TICKS_PER_SEC;		/* wait one second */
+-	while (currticks() < time && (inb(ioaddr) & (TMT_OK|TMT_16COLL)) == 0)
+-		;
+-	if ((inb(ioaddr) & (TMT_OK|TMT_16COLL)) == 0)
+-		printf("Tiara timed out on transmit\n");
+-	/* Do we need to ack the transmit? */
+-}
+-
+-/**************************************************************************
+-DISABLE - Turn off ethernet interface
+-***************************************************************************/
+-static void tiara_disable(struct nic *nic)
+-{
+-	/* Apparently only a power down can do this properly */
+-	outb(CARD_DISABLE, ioaddr + DLCR_ENABLE);
+-}
+-
+-static int tiara_probe1(struct nic *nic)
+-{
+-	/* Hope all the Tiara cards have this vendor prefix */
+-	static char	vendor_prefix[] = { 0x08, 0x00, 0x1A };
+-	static char	all_ones[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+-	int		i;
+-
+-	for (i = 0; i < ETH_ALEN; ++i)
+-		nic->node_addr[i] = inb(ioaddr + PROM_ID + i);
+-	if (memcmp(nic->node_addr, vendor_prefix, sizeof(vendor_prefix)) != 0)
+-		return (0);
+-	if (memcmp(nic->node_addr, all_ones, sizeof(all_ones)) == 0)
+-		return (0);
+-	printf("\nTiara ioaddr %#hX, addr %!\n", ioaddr, nic->node_addr);
+-	return (1);
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-***************************************************************************/
+-struct nic *tiara_probe(struct nic *nic, unsigned short *probe_addrs)
+-{
+-	/* missing entries are addresses usually already used */
+-	static unsigned short	io_addrs[] = {
+-		0x100, 0x120, 0x140, 0x160,
+-		0x180, 0x1A0, 0x1C0, 0x1E0,
+-		0x200, 0x220, 0x240, /*Par*/
+-		0x280, 0x2A0, 0x2C0, /*Ser*/
+-		0x300, 0x320, 0x340, /*Par*/
+-		0x380, /*Vid,Par*/ 0x3C0, /*Ser*/
+-		0x0
+-	};
+-	unsigned short		*p;
+-
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	if (probe_addrs == 0)
+-		probe_addrs = io_addrs;
+-	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
+-		if (tiara_probe1(nic))
+-			break;
+-	/* if board found */
+-	if (ioaddr != 0)
+-	{
+-		tiara_reset(nic);
+-		/* point to NIC specific routines */
+-		nic->reset = tiara_reset;
+-		nic->poll = tiara_poll;
+-		nic->transmit = tiara_transmit;
+-		nic->disable = tiara_disable;
+-		return nic;
+-	}
+-	else
+-		return (0);
+-}
+diff -Naur grub-0.97.orig/netboot/timer.c grub-0.97/netboot/timer.c
+--- grub-0.97.orig/netboot/timer.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/timer.c	2005-08-31 19:03:35.000000000 +0000
+@@ -6,122 +6,24 @@
+  * published by the Free Software Foundation; either version 2, or (at
+  * your option) any later version.
+  */
+-
+-#include	"etherboot.h"
++#include        "grub.h"
+ #include	"timer.h"
+ 
+-void load_timer2(unsigned int ticks)
+-{
+-	/* Set up the timer gate, turn off the speaker */
+-	outb((inb(PPC_PORTB) & ~PPCB_SPKR) | PPCB_T2GATE, PPC_PORTB);
+-	outb(TIMER2_SEL|WORD_ACCESS|MODE0|BINARY_COUNT, TIMER_MODE_PORT);
+-	outb(ticks & 0xFF, TIMER2_PORT);
+-	outb(ticks >> 8, TIMER2_PORT);
+-}
+-
+-#if defined(CONFIG_TSC_CURRTICKS)
+-#define rdtsc(low,high) \
+-     __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
+-
+-#define rdtscll(val) \
+-     __asm__ __volatile__ ("rdtsc" : "=A" (val))
+-
+-
+-#define HZ TICKS_PER_SEC
+-#define CLOCK_TICK_RATE	1193180U /* Underlying HZ */
+-/* LATCH is used in the interval timer and ftape setup. */
+-#define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
++/* Machine Independant timer helper functions */
+ 
+-
+-/* ------ Calibrate the TSC ------- 
+- * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset().
+- * Too much 64-bit arithmetic here to do this cleanly in C, and for
+- * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2)
+- * output busy loop as low as possible. We avoid reading the CTC registers
+- * directly because of the awkward 8-bit access mechanism of the 82C54
+- * device.
+- */
+-
+-#define CALIBRATE_LATCH	(5 * LATCH)
+-
+-static unsigned long long calibrate_tsc(void)
++void mdelay(unsigned int msecs)
+ {
+-	/* Set the Gate high, disable speaker */
+-	outb((inb(0x61) & ~0x02) | 0x01, 0x61);
+-
+-	/*
+-	 * Now let's take care of CTC channel 2
+-	 *
+-	 * Set the Gate high, program CTC channel 2 for mode 0,
+-	 * (interrupt on terminal count mode), binary count,
+-	 * load 5 * LATCH count, (LSB and MSB) to begin countdown.
+-	 */
+-	outb(0xb0, 0x43);			/* binary, mode 0, LSB/MSB, Ch 2 */
+-	outb(CALIBRATE_LATCH & 0xff, 0x42);	/* LSB of count */
+-	outb(CALIBRATE_LATCH >> 8, 0x42);	/* MSB of count */
+-
+-	{
+-		unsigned long startlow, starthigh;
+-		unsigned long endlow, endhigh;
+-		unsigned long count;
+-
+-		rdtsc(startlow,starthigh);
+-		count = 0;
+-		do {
+-			count++;
+-		} while ((inb(0x61) & 0x20) == 0);
+-		rdtsc(endlow,endhigh);
+-
+-		/* Error: ECTCNEVERSET */
+-		if (count <= 1)
+-			goto bad_ctc;
+-
+-		/* 64-bit subtract - gcc just messes up with long longs */
+-		__asm__("subl %2,%0\n\t"
+-			"sbbl %3,%1"
+-			:"=a" (endlow), "=d" (endhigh)
+-			:"g" (startlow), "g" (starthigh),
+-			 "0" (endlow), "1" (endhigh));
+-
+-		/* Error: ECPUTOOFAST */
+-		if (endhigh)
+-			goto bad_ctc;
+-
+-		endlow /= 5;
+-		return endlow;
++	unsigned int i;
++	for(i = 0; i < msecs; i++) {
++		udelay(1000);
++		poll_interruptions();
+ 	}
+-
+-	/*
+-	 * The CTC wasn't reliable: we got a hit on the very first read,
+-	 * or the CPU was so fast/slow that the quotient wouldn't fit in
+-	 * 32 bits..
+-	 */
+-bad_ctc:
+-	printf("bad_ctc\n");
+-	return 0;
+ }
+ 
+-
+-unsigned long currticks(void)
++void waiton_timer2(unsigned int ticks)
+ {
+-	static unsigned long clocks_per_tick;
+-	unsigned long clocks_high, clocks_low;
+-	unsigned long currticks;
+-	if (!clocks_per_tick) {
+-		clocks_per_tick = calibrate_tsc();
+-		printf("clocks_per_tick = %d\n", clocks_per_tick);
++	load_timer2(ticks);
++	while(timer2_running()) {
++		poll_interruptions();
+ 	}
+-
+-	/* Read the Time Stamp Counter */
+-	rdtsc(clocks_low, clocks_high);
+-
+-	/* currticks = clocks / clocks_per_tick; */
+-	__asm__("divl %1"
+-		:"=a" (currticks)
+-		:"r" (clocks_per_tick), "0" (clocks_low), "d" (clocks_high));
+-
+-
+-	return currticks;
+ }
+-
+-#endif /* RTC_CURRTICKS */
+diff -Naur grub-0.97.orig/netboot/timer.h grub-0.97/netboot/timer.h
+--- grub-0.97.orig/netboot/timer.h	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/timer.h	2005-08-31 19:03:35.000000000 +0000
+@@ -36,7 +36,8 @@
+ #define	BCD_COUNT	0x01
+ 
+ /* Timers tick over at this rate */
+-#define	TICKS_PER_MS	1193
++#define CLOCK_TICK_RATE	1193180U
++#define	TICKS_PER_MS	(CLOCK_TICK_RATE/1000)
+ 
+ /* Parallel Peripheral Controller Port B */
+ #define	PPC_PORTB	0x61
+@@ -49,16 +50,19 @@
+ /* Ticks must be between 0 and 65535 (0 == 65536)
+    because it is a 16 bit counter */
+ extern void load_timer2(unsigned int ticks);
+-extern inline int timer2_running(void)
+-{
+-	return ((inb(PPC_PORTB) & PPCB_T2OUT) == 0);
+-}
+-
+-extern inline void waiton_timer2(unsigned int ticks)
+-{
+-	load_timer2(ticks);
+-	while ((inb(PPC_PORTB) & PPCB_T2OUT) == 0)
+-		;
+-}
++extern inline int timer2_running(void);
++extern void waiton_timer2(unsigned int ticks);
++extern void __load_timer2(unsigned int ticks);
++
++extern void setup_timers(void);
++extern void ndelay(unsigned int nsecs);
++extern void udelay(unsigned int usecs);
++extern void mdelay(unsigned int msecs);
++//extern unsigned long currticks(void);
++
++struct timeval {
++	long tv_sec;
++	long tv_usec;
++};
+ 
+ #endif	/* TIMER_H */
+diff -Naur grub-0.97.orig/netboot/tlan.c grub-0.97/netboot/tlan.c
+--- grub-0.97.orig/netboot/tlan.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/tlan.c	2005-09-01 00:05:20.000000000 +0000
+@@ -1,3746 +1,1814 @@
++#define EB51
++
++#ifdef EB50
++#define __unused __attribute__((unused))
++#endif
++
+ /**************************************************************************
+-Etherboot -  BOOTP/TFTP Bootstrap Program
+-TLAN driver for Etherboot
++*
++*    tlan.c -- Etherboot device driver for the Texas Instruments ThunderLAN
++*    Written 2003-2003 by Timothy Legge <tlegge@rogers.com>
++*
++*    This program is free software; you can redistribute it and/or modify
++*    it under the terms of the GNU General Public License as published by
++*    the Free Software Foundation; either version 2 of the License, or
++*    (at your option) any later version.
++*
++*    This program is distributed in the hope that it will be useful,
++*    but WITHOUT ANY WARRANTY; without even the implied warranty of
++*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++*    GNU General Public License for more details.
++*
++*    You should have received a copy of the GNU General Public License
++*    along with this program; if not, write to the Free Software
++*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*
++*    Portions of this code based on:
++*	lan.c: Linux ThunderLan Driver:
++*
++*	by James Banks
++*
++*  	(C) 1997-1998 Caldera, Inc.
++*	(C) 1998 James Banks
++*	(C) 1999-2001 Torben Mathiasen
++*	(C) 2002 Samuel Chessman
++*
++*    REVISION HISTORY:
++*    ================
++*    v1.0	07-08-2003	timlegge	Initial not quite working version
++*    v1.1	07-27-2003	timlegge	Sync 5.0 and 5.1 versions
++*    v1.2	08-19-2003	timlegge	Implement Multicast Support
++*    v1.3	08-23-2003	timlegge	Fix the transmit Function
++*    v1.4	01-17-2004	timlegge	Initial driver output cleanup    
++*    
++*    Indent Options: indent -kr -i8
+ ***************************************************************************/
+ 
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- */
+-
+ /* to get some global routines like printf */
+ #include "etherboot.h"
+ /* to get the interface to the body of the program */
+ #include "nic.h"
+ /* to get the PCI support functions, if this is a PCI NIC */
+ #include "pci.h"
+-/* to get our own prototype */
+-#include "cards.h"
+-
+-	/*****************************************************************
+-	 * TLan Definitions
+-	 *
+-	 ****************************************************************/
++#include "timer.h"
++#include "tlan.h"
+ 
+-#define TLAN_MIN_FRAME_SIZE	64
+-#define TLAN_MAX_FRAME_SIZE	1600
++#define drv_version "v1.4"
++#define drv_date "01-17-2004"
+ 
+-#define TLAN_NUM_RX_LISTS	32
+-#define TLAN_NUM_TX_LISTS	64
++/* NIC specific static variables go here */
++#define HZ 100
++#define TX_TIME_OUT	  (6*HZ)
+ 
+-#define TLAN_IGNORE		0
+-#define TLAN_RECORD		1
++#ifdef EB50
++#define	cpu_to_le32(val) (val)
++#define	le32_to_cpu(val) (val)
++#define	virt_to_bus(x) ((unsigned long) x)
++#define	bus_to_virt(x) ((unsigned long) x)
++#endif
+ 
+-#define TLAN_DBG(lvl, format, args...)	if (debug&lvl) printf("TLAN: " format, ##args );
+-#define TLAN_DEBUG_GNRL		0x0001
+-#define TLAN_DEBUG_TX		0x0002
+-#define TLAN_DEBUG_RX		0x0004 
+-#define TLAN_DEBUG_LIST		0x0008
+-#define TLAN_DEBUG_PROBE	0x0010
++/* Condensed operations for readability. */
++#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
++#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
+ 
+-#define MAX_TLAN_BOARDS		8	 /* Max number of boards installed at a time */
+ 
+-	/*****************************************************************
+-	 * Device Identification Definitions
+-	 *
+-	 ****************************************************************/
+-		
+-#define PCI_DEVICE_ID_NETELLIGENT_10_T2			0xB012
+-#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100	0xB030
+-#ifndef PCI_DEVICE_ID_OLICOM_OC2183
+-#define PCI_DEVICE_ID_OLICOM_OC2183			0x0013
+-#endif
+-#ifndef PCI_DEVICE_ID_OLICOM_OC2325
+-#define PCI_DEVICE_ID_OLICOM_OC2325			0x0012
+-#endif
+-#ifndef PCI_DEVICE_ID_OLICOM_OC2326
+-#define PCI_DEVICE_ID_OLICOM_OC2326			0x0014
+-#endif
+-#define TLAN_ADAPTER_NONE		0x00000000
+-#define TLAN_ADAPTER_UNMANAGED_PHY	0x00000001
+-#define TLAN_ADAPTER_BIT_RATE_PHY	0x00000002
+-#define TLAN_ADAPTER_USE_INTERN_10	0x00000004
+-#define TLAN_ADAPTER_ACTIVITY_LED	0x00000008
+-#define TLAN_SPEED_DEFAULT	0
+-#define TLAN_SPEED_10		10
+-#define TLAN_SPEED_100		100
+-#define TLAN_DUPLEX_DEFAULT	0
+-#define TLAN_DUPLEX_HALF	1
+-#define TLAN_DUPLEX_FULL	2
+-#define TLAN_BUFFERS_PER_LIST	10
+-#define TLAN_LAST_BUFFER	0x80000000
+-#define TLAN_CSTAT_UNUSED	0x8000
+-#define TLAN_CSTAT_FRM_CMP	0x4000
+-#define TLAN_CSTAT_READY	0x3000
+-#define TLAN_CSTAT_EOC		0x0800
+-#define TLAN_CSTAT_RX_ERROR	0x0400
+-#define TLAN_CSTAT_PASS_CRC	0x0200
+-#define TLAN_CSTAT_DP_PR	0x0100
+-
+-	/*****************************************************************
+-	 * PHY definitions
+-	 *
+-	 ****************************************************************/
+-
+-#define TLAN_PHY_MAX_ADDR	0x1F
+-#define TLAN_PHY_NONE		0x20
+-
+-	/*****************************************************************
+-	 * TLan Driver Timer Definitions
+-	 *
+-	 ****************************************************************/
+-
+-#define TLAN_TIMER_LINK_BEAT		1
+-#define TLAN_TIMER_ACTIVITY		2
+-#define TLAN_TIMER_PHY_PDOWN		3
+-#define TLAN_TIMER_PHY_PUP		4
+-#define TLAN_TIMER_PHY_RESET		5
+-#define TLAN_TIMER_PHY_START_LINK	6
+-#define TLAN_TIMER_PHY_FINISH_AN	7
+-#define TLAN_TIMER_FINISH_RESET		8
+-#define TLAN_TIMER_ACT_DELAY		(HZ/10)
+-
+-	/*****************************************************************
+-	 * TLan Driver Eeprom Definitions
+-	 *
+-	 ****************************************************************/
+-
+-#define TLAN_EEPROM_ACK		0
+-#define TLAN_EEPROM_STOP	1
+-
+-	/*****************************************************************
+-	 * Host Register Offsets and Contents
+-	 *
+-	 ****************************************************************/
+-
+-#define TLAN_HOST_CMD			0x00
+-#define 	TLAN_HC_GO		0x80000000
+-#define		TLAN_HC_STOP		0x40000000
+-#define		TLAN_HC_ACK		0x20000000
+-#define		TLAN_HC_CS_MASK		0x1FE00000
+-#define		TLAN_HC_EOC		0x00100000
+-#define		TLAN_HC_RT		0x00080000
+-#define		TLAN_HC_NES		0x00040000
+-#define		TLAN_HC_AD_RST		0x00008000
+-#define		TLAN_HC_LD_TMR		0x00004000
+-#define		TLAN_HC_LD_THR		0x00002000
+-#define		TLAN_HC_REQ_INT		0x00001000
+-#define		TLAN_HC_INT_OFF		0x00000800
+-#define		TLAN_HC_INT_ON		0x00000400
+-#define		TLAN_HC_AC_MASK		0x000000FF
+-#define TLAN_CH_PARM			0x04
+-#define TLAN_DIO_ADR			0x08
+-#define		TLAN_DA_ADR_INC		0x8000
+-#define		TLAN_DA_RAM_ADR		0x4000
+-#define TLAN_HOST_INT			0x0A
+-#define		TLAN_HI_IV_MASK		0x1FE0
+-#define		TLAN_HI_IT_MASK		0x001C
+-#define TLAN_DIO_DATA			0x0C
+-
+-/* ThunderLAN Internal Register DIO Offsets */
+-
+-#define TLAN_NET_CMD			0x00
+-#define		TLAN_NET_CMD_NRESET	0x80
+-#define		TLAN_NET_CMD_NWRAP	0x40
+-#define		TLAN_NET_CMD_CSF	0x20
+-#define		TLAN_NET_CMD_CAF	0x10
+-#define		TLAN_NET_CMD_NOBRX	0x08
+-#define		TLAN_NET_CMD_DUPLEX	0x04
+-#define		TLAN_NET_CMD_TRFRAM	0x02
+-#define		TLAN_NET_CMD_TXPACE	0x01
+-#define TLAN_NET_SIO			0x01
+-#define 	TLAN_NET_SIO_MINTEN	0x80
+-#define		TLAN_NET_SIO_ECLOK	0x40
+-#define		TLAN_NET_SIO_ETXEN	0x20
+-#define		TLAN_NET_SIO_EDATA	0x10
+-#define		TLAN_NET_SIO_NMRST	0x08
+-#define		TLAN_NET_SIO_MCLK	0x04
+-#define		TLAN_NET_SIO_MTXEN	0x02
+-#define		TLAN_NET_SIO_MDATA	0x01
+-#define TLAN_NET_STS			0x02
+-#define		TLAN_NET_STS_MIRQ	0x80
+-#define		TLAN_NET_STS_HBEAT	0x40
+-#define		TLAN_NET_STS_TXSTOP	0x20
+-#define		TLAN_NET_STS_RXSTOP	0x10
+-#define		TLAN_NET_STS_RSRVD	0x0F
+-#define TLAN_NET_MASK			0x03
+-#define		TLAN_NET_MASK_MASK7	0x80
+-#define		TLAN_NET_MASK_MASK6	0x40
+-#define		TLAN_NET_MASK_MASK5	0x20
+-#define		TLAN_NET_MASK_MASK4	0x10
+-#define		TLAN_NET_MASK_RSRVD	0x0F
+-#define TLAN_NET_CONFIG			0x04
+-#define 	TLAN_NET_CFG_RCLK	0x8000
+-#define		TLAN_NET_CFG_TCLK	0x4000
+-#define		TLAN_NET_CFG_BIT	0x2000
+-#define		TLAN_NET_CFG_RXCRC	0x1000
+-#define		TLAN_NET_CFG_PEF	0x0800
+-#define		TLAN_NET_CFG_1FRAG	0x0400
+-#define		TLAN_NET_CFG_1CHAN	0x0200
+-#define		TLAN_NET_CFG_MTEST	0x0100
+-#define		TLAN_NET_CFG_PHY_EN	0x0080
+-#define		TLAN_NET_CFG_MSMASK	0x007F
+-#define TLAN_MAN_TEST			0x06
+-#define TLAN_DEF_VENDOR_ID		0x08
+-#define TLAN_DEF_DEVICE_ID		0x0A
+-#define TLAN_DEF_REVISION		0x0C
+-#define TLAN_DEF_SUBCLASS		0x0D
+-#define TLAN_DEF_MIN_LAT		0x0E
+-#define TLAN_DEF_MAX_LAT		0x0F
+-#define TLAN_AREG_0			0x10
+-#define TLAN_AREG_1			0x16
+-#define TLAN_AREG_2			0x1C
+-#define TLAN_AREG_3			0x22
+-#define TLAN_HASH_1			0x28
+-#define TLAN_HASH_2			0x2C
+-#define TLAN_GOOD_TX_FRMS		0x30
+-#define TLAN_TX_UNDERUNS		0x33
+-#define TLAN_GOOD_RX_FRMS		0x34
+-#define TLAN_RX_OVERRUNS		0x37
+-#define TLAN_DEFERRED_TX		0x38
+-#define TLAN_CRC_ERRORS			0x3A
+-#define TLAN_CODE_ERRORS		0x3B
+-#define TLAN_MULTICOL_FRMS		0x3C
+-#define TLAN_SINGLECOL_FRMS		0x3E
+-#define TLAN_EXCESSCOL_FRMS		0x40
+-#define TLAN_LATE_COLS			0x41
+-#define TLAN_CARRIER_LOSS		0x42
+-#define TLAN_ACOMMIT			0x43
+-#define TLAN_LED_REG			0x44
+-#define		TLAN_LED_ACT		0x10
+-#define		TLAN_LED_LINK		0x01
+-#define TLAN_BSIZE_REG			0x45
+-#define TLAN_MAX_RX			0x46
+-#define TLAN_INT_DIS			0x48
+-#define		TLAN_ID_TX_EOC		0x04
+-#define		TLAN_ID_RX_EOF		0x02
+-#define		TLAN_ID_RX_EOC		0x01
+-
+-/* ThunderLAN Interrupt Codes */
+-
+-#define TLAN_INT_NUMBER_OF_INTS	8
+-
+-#define TLAN_INT_NONE			0x0000
+-#define TLAN_INT_TX_EOF			0x0001
+-#define TLAN_INT_STAT_OVERFLOW		0x0002
+-#define TLAN_INT_RX_EOF			0x0003
+-#define TLAN_INT_DUMMY			0x0004
+-#define TLAN_INT_TX_EOC			0x0005
+-#define TLAN_INT_STATUS_CHECK		0x0006
+-#define TLAN_INT_RX_EOC			0x0007
+-#define TLAN_TLPHY_ID			0x10
+-#define TLAN_TLPHY_CTL			0x11
+-#define 	TLAN_TC_IGLINK		0x8000
+-#define		TLAN_TC_SWAPOL		0x4000
+-#define		TLAN_TC_AUISEL		0x2000
+-#define		TLAN_TC_SQEEN		0x1000
+-#define		TLAN_TC_MTEST		0x0800
+-#define		TLAN_TC_RESERVED	0x07F8
+-#define		TLAN_TC_NFEW		0x0004
+-#define		TLAN_TC_INTEN		0x0002
+-#define		TLAN_TC_TINT		0x0001
+-#define TLAN_TLPHY_STS			0x12
+-#define		TLAN_TS_MINT		0x8000
+-#define		TLAN_TS_PHOK		0x4000
+-#define		TLAN_TS_POLOK		0x2000
+-#define		TLAN_TS_TPENERGY	0x1000
+-#define		TLAN_TS_RESERVED	0x0FFF
+-#define TLAN_TLPHY_PAR			0x19
+-#define		TLAN_PHY_CIM_STAT	0x0020
+-#define		TLAN_PHY_SPEED_100	0x0040
+-#define		TLAN_PHY_DUPLEX_FULL	0x0080
+-#define		TLAN_PHY_AN_EN_STAT     0x0400
+-
+-
+-/* ThunderLAN MII Registers */
+-
+-/* Generic MII/PHY Registers */
+-
+-#define MII_GEN_CTL			0x00
+-#define 	MII_GC_RESET		0x8000
+-#define		MII_GC_LOOPBK		0x4000
+-#define		MII_GC_SPEEDSEL		0x2000
+-#define		MII_GC_AUTOENB		0x1000
+-#define		MII_GC_PDOWN		0x0800
+-#define		MII_GC_ISOLATE		0x0400
+-#define		MII_GC_AUTORSRT		0x0200
+-#define		MII_GC_DUPLEX		0x0100
+-#define		MII_GC_COLTEST		0x0080
+-#define		MII_GC_RESERVED		0x007F
+-#define MII_GEN_STS			0x01
+-#define		MII_GS_100BT4		0x8000
+-#define		MII_GS_100BTXFD		0x4000
+-#define		MII_GS_100BTXHD		0x2000
+-#define		MII_GS_10BTFD		0x1000
+-#define		MII_GS_10BTHD		0x0800
+-#define		MII_GS_RESERVED		0x07C0
+-#define		MII_GS_AUTOCMPLT	0x0020
+-#define		MII_GS_RFLT		0x0010
+-#define		MII_GS_AUTONEG		0x0008
+-#define		MII_GS_LINK		0x0004
+-#define		MII_GS_JABBER		0x0002
+-#define		MII_GS_EXTCAP		0x0001
+-#define MII_GEN_ID_HI			0x02
+-#define MII_GEN_ID_LO			0x03
+-#define 	MII_GIL_OUI		0xFC00
+-#define 	MII_GIL_MODEL		0x03F0
+-#define 	MII_GIL_REVISION	0x000F
+-#define MII_AN_ADV			0x04
+-#define MII_AN_LPA			0x05
+-#define MII_AN_EXP			0x06
+-
+-/* ThunderLAN Specific MII/PHY Registers */
+-
+-#define 	TLAN_TC_IGLINK		0x8000
+-#define		TLAN_TC_SWAPOL		0x4000
+-#define		TLAN_TC_AUISEL		0x2000
+-#define		TLAN_TC_SQEEN		0x1000
+-#define		TLAN_TC_MTEST		0x0800
+-#define		TLAN_TC_RESERVED	0x07F8
+-#define		TLAN_TC_NFEW		0x0004
+-#define		TLAN_TC_INTEN		0x0002
+-#define		TLAN_TC_TINT		0x0001
+-#define		TLAN_TS_MINT		0x8000
+-#define		TLAN_TS_PHOK		0x4000
+-#define		TLAN_TS_POLOK		0x2000
+-#define		TLAN_TS_TPENERGY	0x1000
+-#define		TLAN_TS_RESERVED	0x0FFF
+-#define		TLAN_PHY_CIM_STAT	0x0020
+-#define		TLAN_PHY_SPEED_100	0x0040
+-#define		TLAN_PHY_DUPLEX_FULL	0x0080
+-#define		TLAN_PHY_AN_EN_STAT     0x0400
+-
+-/* National Sem. & Level1 PHY id's */
+-#define NAT_SEM_ID1			0x2000
+-#define NAT_SEM_ID2			0x5C01
+-#define LEVEL1_ID1			0x7810
+-#define LEVEL1_ID2			0x0000
+-
+-#define TLan_ClearBit( bit, port )	outb_p(inb_p(port) & ~bit, port)
+-#define TLan_GetBit( bit, port )	((int) (inb_p(port) & bit))
+-#define TLan_SetBit( bit, port )	outb_p(inb_p(port) | bit, port)
+-
+-typedef	unsigned int	u32;
+-typedef	unsigned short	u16;
+-typedef	unsigned char	u8;
++static void TLan_ResetLists(struct nic *nic __unused);
++static void TLan_ResetAdapter(struct nic *nic __unused);
++static void TLan_FinishReset(struct nic *nic __unused);
+ 
+-/* Routines to access internal registers. */
++static void TLan_EeSendStart(u16);
++static int TLan_EeSendByte(u16, u8, int);
++static void TLan_EeReceiveByte(u16, u8 *, int);
++static int TLan_EeReadByte(u16 io_base, u8, u8 *);
+ 
+-inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
+-{
+-	outw(internal_addr, base_addr + TLAN_DIO_ADR);
+-	return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)));
+-	
+-} /* TLan_DioRead8 */
++static void TLan_PhyDetect(struct nic *nic);
++static void TLan_PhyPowerDown(struct nic *nic);
++static void TLan_PhyPowerUp(struct nic *nic);
+ 
+-inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
+-{
+-	outw(internal_addr, base_addr + TLAN_DIO_ADR);
+-	return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2)));
+ 
+-} /* TLan_DioRead16 */
++static void TLan_SetMac(struct nic *nic __unused, int areg, char *mac);
+ 
+-inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
+-{
+-	outw(internal_addr, base_addr + TLAN_DIO_ADR);
+-	return (inl(base_addr + TLAN_DIO_DATA));
++static void TLan_PhyReset(struct nic *nic);
++static void TLan_PhyStartLink(struct nic *nic);
++static void TLan_PhyFinishAutoNeg(struct nic *nic);
+ 
+-} /* TLan_DioRead32 */
++#ifdef MONITOR
++static void TLan_PhyMonitor(struct nic *nic);
++#endif
+ 
+-inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
+-{
+-	outw(internal_addr, base_addr + TLAN_DIO_ADR);
+-	outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
+ 
+-}
++static void refill_rx(struct nic *nic __unused);
+ 
+-inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
+-{
+-	outw(internal_addr, base_addr + TLAN_DIO_ADR);
+-	outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
++static int TLan_MiiReadReg(struct nic *nic __unused, u16, u16, u16 *);
++static void TLan_MiiSendData(u16, u32, unsigned);
++static void TLan_MiiSync(u16);
++static void TLan_MiiWriteReg(struct nic *nic __unused, u16, u16, u16);
+ 
+-}
+ 
+-inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
+-{
+-	outw(internal_addr, base_addr + TLAN_DIO_ADR);
+-	outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
++const char *media[] = {
++	"10BaseT-HD ", "10BaseT-FD ", "100baseTx-HD ",
++	"100baseTx-FD", "100baseT4", 0
++};
+ 
+-}
++/* This much match tlan_pci_tbl[]!  */
++enum tlan_nics {
++	NETEL10 = 0, NETEL100 = 1, NETFLEX3I = 2, THUNDER = 3, NETFLEX3B =
++	    4, NETEL100PI = 5,
++	NETEL100D = 6, NETEL100I = 7, OC2183 = 8, OC2325 = 9, OC2326 =
++	    10, NETELLIGENT_10_100_WS_5100 = 11,
++	NETELLIGENT_10_T2 = 12
++};
+ 
+-/* NIC specific static variables go here */
++struct pci_id_info {
++	const char *name;
++	int nic_id;
++	struct match_info {
++		u32 pci, pci_mask, subsystem, subsystem_mask;
++		u32 revision, revision_mask;	/* Only 8 bits. */
++	} id;
++	u32 flags;
++	u16 addrOfs;		/* Address Offset */
++};
+ 
+-/*****************************************************************************
+-******************************************************************************
++static struct pci_id_info tlan_pci_tbl[] = {
++	{"Compaq Netelligent 10 T PCI UTP", NETEL10,
++	 {0xae340e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
++	{"Compaq Netelligent 10/100 TX PCI UTP", NETEL100,
++	 {0xae320e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
++	{"Compaq Integrated NetFlex-3/P", NETFLEX3I,
++	 {0xae350e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_NONE, 0x83},
++	{"Compaq NetFlex-3/P", THUNDER,
++	 {0xf1300e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83},
++	{"Compaq NetFlex-3/P", NETFLEX3B,
++	 {0xf1500e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_NONE, 0x83},
++	{"Compaq Netelligent Integrated 10/100 TX UTP", NETEL100PI,
++	 {0xae430e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
++	{"Compaq Netelligent Dual 10/100 TX PCI UTP", NETEL100D,
++	 {0xae400e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_NONE, 0x83},
++	{"Compaq Netelligent 10/100 TX Embedded UTP", NETEL100I,
++	 {0xb0110e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_NONE, 0x83},
++	{"Olicom OC-2183/2185", OC2183,
++	 {0x0013108d, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_USE_INTERN_10, 0x83},
++	{"Olicom OC-2325", OC2325,
++	 {0x0012108d, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_UNMANAGED_PHY, 0xF8},
++	{"Olicom OC-2326", OC2326,
++	 {0x0014108d, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_USE_INTERN_10, 0xF8},
++	{"Compaq Netelligent 10/100 TX UTP", NETELLIGENT_10_100_WS_5100,
++	 {0xb0300e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
++	{"Compaq Netelligent 10 T/2 PCI UTP/Coax", NETELLIGENT_10_T2,
++	 {0xb0120e11, 0xffffffff, 0, 0, 0, 0},
++	 TLAN_ADAPTER_NONE, 0x83},
++	{"Compaq NetFlex-3/E", 0,	/* EISA card */
++	 {0, 0, 0, 0, 0, 0},
++	 TLAN_ADAPTER_ACTIVITY_LED | TLAN_ADAPTER_UNMANAGED_PHY |
++	 TLAN_ADAPTER_BIT_RATE_PHY, 0x83},
++	{"Compaq NetFlex-3/E", 0,	/* EISA card */
++	 {0, 0, 0, 0, 0, 0},
++	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
++	{0, 0,
++	 {0, 0, 0, 0, 0, 0},
++	 0, 0},
++};
+ 
+-	ThunderLAN Driver Eeprom routines
+ 
+-	The Compaq Netelligent 10 and 10/100 cards use a Microchip 24C02A
+-	EEPROM.  These functions are based on information in Microchip's
+-	data sheet.  I don't know how well this functions will work with
+-	other EEPROMs.
++struct TLanList {
++	u32 forward;
++	u16 cStat;
++	u16 frameSize;
++	struct {
++		u32 count;
++		u32 address;
++	} buffer[TLAN_BUFFERS_PER_LIST];
++};
+ 
+-******************************************************************************
+-*****************************************************************************/
+ 
+-	/***************************************************************
+-	 *	TLan_EeSendStart
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:	
+-	 *		io_base		The IO port base address for the
+-	 *				TLAN device with the EEPROM to
+-	 *				use.
+-	 *
+-	 *	This function sends a start cycle to an EEPROM attached
+-	 *	to a TLAN chip.
+-	 *
+-	 **************************************************************/
+ 
+-static void TLan_EeSendStart( u16 io_base )
+-{
+-	u16	sio;
++struct TLanList tx_ring[TLAN_NUM_TX_LISTS];
++static unsigned char txb[TLAN_MAX_FRAME_SIZE * TLAN_NUM_TX_LISTS];
+ 
+-	outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+-	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
++struct TLanList rx_ring[TLAN_NUM_RX_LISTS];
++static unsigned char rxb[TLAN_MAX_FRAME_SIZE * TLAN_NUM_RX_LISTS];
+ 
+-	TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-	TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+-	TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
+-	TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
+-	TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
++typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
+ 
+-} /* TLan_EeSendStart */
+ 
+-	/***************************************************************
+-	 *	TLan_EeSendByte
+-	 *
+-	 *	Returns:
+-	 *		If the correct ack was received, 0, otherwise 1
+-	 *	Parms:	io_base		The IO port base address for the
+-	 *				TLAN device with the EEPROM to
+-	 *				use.
+-	 *		data		The 8 bits of information to
+-	 *				send to the EEPROM.
+-	 *		stop		If TLAN_EEPROM_STOP is passed, a
+-	 *				stop cycle is sent after the
+-	 *				byte is sent after the ack is
+-	 *				read.
+-	 *
+-	 *	This function sends a byte on the serial EEPROM line,
+-	 *	driving the clock to send each bit. The function then
+-	 *	reverses transmission direction and reads an acknowledge
+-	 *	bit.
+-	 *
+-	 **************************************************************/
++int chip_idx;
+ 
+-static int TLan_EeSendByte( u16 io_base, u8 data, int stop )
+-{
+-	int	err;
+-	u8	place;
+-	u16	sio;
+ 
+-	outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+-	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
++/*****************************************************************
++* TLAN Private Information Structure
++*
++****************************************************************/
++struct tlan_private {
++	unsigned short vendor_id;	/* PCI Vendor code */
++	unsigned short dev_id;	/* PCI Device code */
++	const char *nic_name;
++	u8 *padBuffer;
++	u8 *rxBuffer;
++	struct TLanList *rx_head_desc;
++	u32 rxHead;
++	u32 rxTail;
++	u32 rxEocCount;
++	unsigned int cur_rx, dirty_rx;	/* Producer/consumer ring indicies */
++	unsigned int cur_tx, dirty_tx;
++	unsigned rx_buf_sz;	/* Based on mtu + Slack */
++	struct TLanList *txList;
++	struct TLanList *rxList;
++	u8 *txBuffer;
++	u32 txHead;
++	u32 txInProgress;
++	u32 txTail;
++	int eoc;
++	u32 txBusyCount;
++	u32 phyOnline;
++	u32 timerSetAt;
++	u32 timerType;
++	u32 adapterRev;
++	u32 aui;
++	u32 debug;
++	u32 duplex;
++	u32 phy[2];
++	u32 phyNum;
++	u32 speed;
++	u8 tlanRev;
++	u8 tlanFullDuplex;
++	char devName[8];
++	u8 link;
++	u8 is_eisa;
++	u8 neg_be_verbose;
++} TLanPrivateInfo;
+ 
+-	/* Assume clock is low, tx is enabled; */
+-	for ( place = 0x80; place != 0; place >>= 1 ) {
+-		if ( place & data )
+-			TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+-		else
+-			TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
+-		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+-	}
+-	TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
+-	TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-	err = TLan_GetBit( TLAN_NET_SIO_EDATA, sio );
+-	TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+-	TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
++static struct tlan_private *priv;
+ 
+-	if ( ( ! err ) && stop ) {
+-		TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );	/* STOP, raise data while clock is high */
+-		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-		TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+-	}
++u32 BASE;
+ 
+-	return ( err );
+ 
+-} /* TLan_EeSendByte */
+ 
+-	/***************************************************************
+-	 *	TLan_EeReceiveByte
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		io_base		The IO port base address for the
+-	 *				TLAN device with the EEPROM to
+-	 *				use.
+-	 *		data		An address to a char to hold the
+-	 *				data sent from the EEPROM.
+-	 *		stop		If TLAN_EEPROM_STOP is passed, a
+-	 *				stop cycle is sent after the
+-	 *				byte is received, and no ack is
+-	 *				sent.
+-	 *
+-	 *	This function receives 8 bits of data from the EEPROM
+-	 *	over the serial link.  It then sends and ack bit, or no
+-	 *	ack and a stop bit.  This function is used to retrieve
+-	 *	data after the address of a byte in the EEPROM has been
+-	 *	sent.
+-	 *
+-	 **************************************************************/
++/***************************************************************
++*	TLan_ResetLists
++*
++*	Returns:
++*		Nothing
++*	Parms:
++*		dev	The device structure with the list
++*			stuctures to be reset.
++*
++*	This routine sets the variables associated with managing
++*	the TLAN lists to their initial values.
++*
++**************************************************************/
+ 
+-static void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
++void TLan_ResetLists(struct nic *nic __unused)
+ {
+-	u8  place;
+-	u16 sio;
+ 
+-	outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+-	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
+-	*data = 0;
++	int i;
++	struct TLanList *list;
++	priv->txHead = 0;
++	priv->txTail = 0;
+ 
+-	/* Assume clock is low, tx is enabled; */
+-	TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
+-	for ( place = 0x80; place; place >>= 1 ) {
+-		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-		if ( TLan_GetBit( TLAN_NET_SIO_EDATA, sio ) )
+-			*data |= place;
+-		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
++	for (i = 0; i < TLAN_NUM_TX_LISTS; i++) {
++		list = &tx_ring[i];
++		list->cStat = TLAN_CSTAT_UNUSED;
++/*		list->buffer[0].address = 0; */
++		list->buffer[0].address = virt_to_bus(txb + 
++				(i * TLAN_MAX_FRAME_SIZE)); 
++		list->buffer[2].count = 0;
++		list->buffer[2].address = 0;
++		list->buffer[9].address = 0;
++/*		list->forward = 0; */
+ 	}
+ 
+-	TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
+-	if ( ! stop ) {
+-		TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );	/* Ack = 0 */
+-		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+-	} else {
+-		TLan_SetBit( TLAN_NET_SIO_EDATA, sio );		/* No ack = 1 (?) */
+-		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+-		TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );	/* STOP, raise data while clock is high */
+-		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
+-		TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+-	}
++	priv->cur_rx = 0;
++	priv->rx_buf_sz = (TLAN_MAX_FRAME_SIZE);
++	priv->rx_head_desc = &rx_ring[0];
++
++	/* Initialize all the Rx descriptors */
++	for (i = 0; i < TLAN_NUM_RX_LISTS; i++) {
++		rx_ring[i].forward = virt_to_le32desc(&rx_ring[i + 1]);
++		rx_ring[i].cStat = TLAN_CSTAT_READY;
++		rx_ring[i].frameSize = TLAN_MAX_FRAME_SIZE;
++		rx_ring[i].buffer[0].count =
++		    TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
++		rx_ring[i].buffer[0].address =
++		    virt_to_le32desc(&rxb[i * TLAN_MAX_FRAME_SIZE]);
++		rx_ring[i].buffer[1].count = 0;
++		rx_ring[i].buffer[1].address = 0;
++	}
++
++	/* Mark the last entry as wrapping the ring */
++	rx_ring[i - 1].forward = virt_to_le32desc(&rx_ring[0]);
++	priv->dirty_rx = (unsigned int) (i - TLAN_NUM_RX_LISTS);
+ 
+-} /* TLan_EeReceiveByte */
++} /* TLan_ResetLists */
+ 
+-	/***************************************************************
+-	 *	TLan_EeReadByte
+-	 *
+-	 *	Returns:
+-	 *		No error = 0, else, the stage at which the error
+-	 *		occurred.
+-	 *	Parms:
+-	 *		io_base		The IO port base address for the
+-	 *				TLAN device with the EEPROM to
+-	 *				use.
+-	 *		ee_addr		The address of the byte in the
+-	 *				EEPROM whose contents are to be
+-	 *				retrieved.
+-	 *		data		An address to a char to hold the
+-	 *				data obtained from the EEPROM.
+-	 *
+-	 *	This function reads a byte of information from an byte
+-	 *	cell in the EEPROM.
+-	 *
+-	 **************************************************************/
++/***************************************************************
++*	TLan_Reset
++*
++*	Returns:
++*		0
++*	Parms:
++*		dev	Pointer to device structure of adapter
++*			to be reset.
++*
++*	This function resets the adapter and it's physical
++*	device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
++*	Programmer's Guide" for details.  The routine tries to
++*	implement what is detailed there, though adjustments
++*	have been made.
++*
++**************************************************************/
+ 
+-static int TLan_EeReadByte( u16 io_base, u8 ee_addr, u8 *data )
++void TLan_ResetAdapter(struct nic *nic __unused)
+ {
+-	int err;
+-	unsigned long flags = 0;
+-	int ret=0;
++	int i;
++	u32 addr;
++	u32 data;
++	u8 data8;
+ 
+-	TLan_EeSendStart( io_base );
+-	err = TLan_EeSendByte( io_base, 0xA0, TLAN_EEPROM_ACK );
+-	if (err)
+-	{
+-		ret=1;
+-		goto fail;
+-	}
+-	err = TLan_EeSendByte( io_base, ee_addr, TLAN_EEPROM_ACK );
+-	if (err)
+-	{
+-		ret=2;
+-		goto fail;
+-	}
+-	TLan_EeSendStart( io_base );
+-	err = TLan_EeSendByte( io_base, 0xA1, TLAN_EEPROM_ACK );
+-	if (err)
+-	{
+-		ret=3;
+-		goto fail;
+-	}
+-	TLan_EeReceiveByte( io_base, data, TLAN_EEPROM_STOP );
+-fail:
++	priv->tlanFullDuplex = FALSE;
++	priv->phyOnline = 0;
++/*  1.	Assert reset bit. */
+ 
+-	return ret;
++	data = inl(BASE + TLAN_HOST_CMD);
++	data |= TLAN_HC_AD_RST;
++	outl(data, BASE + TLAN_HOST_CMD);
+ 
+-} /* TLan_EeReadByte */
++	udelay(1000);
+ 
+-#if	0
+-/* Not yet converted from Linux driver */
+-/*****************************************************************************
+-******************************************************************************
++/*  2.	Turn off interrupts. ( Probably isn't necessary ) */
+ 
+-	ThunderLAN Driver PHY Layer Routines
++	data = inl(BASE + TLAN_HOST_CMD);
++	data |= TLAN_HC_INT_OFF;
++	outl(data, BASE + TLAN_HOST_CMD);
++/*  3.	Clear AREGs and HASHs. */
+ 
+-******************************************************************************
+-*****************************************************************************/
++	for (i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4) {
++		TLan_DioWrite32(BASE, (u16) i, 0);
++	}
+ 
+-	/*********************************************************************
+-	 *	TLan_PhyPrint
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		dev	A pointer to the device structure of the
+-	 *			TLAN device having the PHYs to be detailed.
+-	 *				
+-	 *	This function prints the registers a PHY (aka tranceiver).
+-	 *
+-	 ********************************************************************/
++/*  4.	Setup NetConfig register. */
+ 
+-void TLan_PhyPrint( struct net_device *dev )
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-	u16 i, data0, data1, data2, data3, phy;
++	data =
++	    TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
++	TLan_DioWrite16(BASE, TLAN_NET_CONFIG, (u16) data);
+ 
+-	phy = priv->phy[priv->phyNum];
++/*  5.	Load Ld_Tmr and Ld_Thr in HOST_CMD. */
+ 
+-	if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
+-		printk( "TLAN:   Device %s, Unmanaged PHY.\n", dev->name );
+-	} else if ( phy <= TLAN_PHY_MAX_ADDR ) {
+-		printk( "TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy );
+-		printk( "TLAN:      Off.  +0     +1     +2     +3 \n" );
+-                for ( i = 0; i < 0x20; i+= 4 ) {
+-			printk( "TLAN:      0x%02x", i );
+-			TLan_MiiReadReg( dev, phy, i, &data0 );
+-			printk( " 0x%04hx", data0 );
+-			TLan_MiiReadReg( dev, phy, i + 1, &data1 );
+-			printk( " 0x%04hx", data1 );
+-			TLan_MiiReadReg( dev, phy, i + 2, &data2 );
+-			printk( " 0x%04hx", data2 );
+-			TLan_MiiReadReg( dev, phy, i + 3, &data3 );
+-			printk( " 0x%04hx\n", data3 );
+-		}
+-	} else {
+-		printk( "TLAN:   Device %s, Invalid PHY.\n", dev->name );
+-	}
++	outl(TLAN_HC_LD_TMR | 0x3f, BASE + TLAN_HOST_CMD);
++	outl(TLAN_HC_LD_THR | 0x0, BASE + TLAN_HOST_CMD);
+ 
+-} /* TLan_PhyPrint */
++/*  6.	Unreset the MII by setting NMRST (in NetSio) to 1. */
+ 
+-	/*********************************************************************
+-	 *	TLan_PhyDetect
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		dev	A pointer to the device structure of the adapter
+-	 *			for which the PHY needs determined.
+-	 *
+-	 *	So far I've found that adapters which have external PHYs
+-	 *	may also use the internal PHY for part of the functionality.
+-	 *	(eg, AUI/Thinnet).  This function finds out if this TLAN
+-	 *	chip has an internal PHY, and then finds the first external
+-	 *	PHY (starting from address 0) if it exists).
+-	 *
+-	 ********************************************************************/
++	outw(TLAN_NET_SIO, BASE + TLAN_DIO_ADR);
++	addr = BASE + TLAN_DIO_DATA + TLAN_NET_SIO;
++	TLan_SetBit(TLAN_NET_SIO_NMRST, addr);
+ 
+-void TLan_PhyDetect( struct net_device *dev )
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-	u16		control;
+-	u16		hi;
+-	u16		lo;
+-	u32		phy;
++/*  7.	Setup the remaining registers. */
+ 
+-	if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
+-		priv->phyNum = 0xFFFF;
+-		return;
++	if (priv->tlanRev >= 0x30) {
++		data8 = TLAN_ID_TX_EOC | TLAN_ID_RX_EOC;
++		TLan_DioWrite8(BASE, TLAN_INT_DIS, data8);
+ 	}
++	TLan_PhyDetect(nic);
++	data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN;
+ 
+-	TLan_MiiReadReg( dev, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi );
+-	
+-	if ( hi != 0xFFFF ) {
+-		priv->phy[0] = TLAN_PHY_MAX_ADDR;
+-	} else {
+-		priv->phy[0] = TLAN_PHY_NONE;
++	if (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_BIT_RATE_PHY) {
++		data |= TLAN_NET_CFG_BIT;
++		if (priv->aui == 1) {
++			TLan_DioWrite8(BASE, TLAN_ACOMMIT, 0x0a);
++		} else if (priv->duplex == TLAN_DUPLEX_FULL) {
++			TLan_DioWrite8(BASE, TLAN_ACOMMIT, 0x00);
++			priv->tlanFullDuplex = TRUE;
++		} else {
++			TLan_DioWrite8(BASE, TLAN_ACOMMIT, 0x08);
++		}
+ 	}
+ 
+-	priv->phy[1] = TLAN_PHY_NONE;
+-	for ( phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++ ) {
+-		TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &control );
+-		TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &hi );
+-		TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &lo );
+-		if ( ( control != 0xFFFF ) || ( hi != 0xFFFF ) || ( lo != 0xFFFF ) ) {
+-			TLAN_DBG( TLAN_DEBUG_GNRL, "PHY found at %02x %04x %04x %04x\n", phy, control, hi, lo );
+-			if ( ( priv->phy[1] == TLAN_PHY_NONE ) && ( phy != TLAN_PHY_MAX_ADDR ) ) {
+-				priv->phy[1] = phy;
+-			}
+-		}
++	if (priv->phyNum == 0) {
++		data |= TLAN_NET_CFG_PHY_EN;
+ 	}
++	TLan_DioWrite16(BASE, TLAN_NET_CONFIG, (u16) data);
+ 
+-	if ( priv->phy[1] != TLAN_PHY_NONE ) {
+-		priv->phyNum = 1;
+-	} else if ( priv->phy[0] != TLAN_PHY_NONE ) {
+-		priv->phyNum = 0;
++	if (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_UNMANAGED_PHY) {
++		TLan_FinishReset(nic);
+ 	} else {
+-		printk( "TLAN:  Cannot initialize device, no PHY was found!\n" );
++		TLan_PhyPowerDown(nic);
+ 	}
+ 
+-} /* TLan_PhyDetect */
++}	/* TLan_ResetAdapter */
+ 
+-void TLan_PhyPowerDown( struct net_device *dev )
++void TLan_FinishReset(struct nic *nic)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u16		value;
+ 
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name );
+-	value = MII_GC_PDOWN | MII_GC_LOOPBK | MII_GC_ISOLATE;
+-	TLan_MiiSync( dev->base_addr );
+-	TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
+-	if ( ( priv->phyNum == 0 ) && ( priv->phy[1] != TLAN_PHY_NONE ) && ( ! ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) ) ) {
+-		TLan_MiiSync( dev->base_addr );
+-		TLan_MiiWriteReg( dev, priv->phy[1], MII_GEN_CTL, value );
++	u8 data;
++	u32 phy;
++	u8 sio;
++	u16 status;
++	u16 partner;
++	u16 tlphy_ctl;
++	u16 tlphy_par;
++	u16 tlphy_id1, tlphy_id2;
++	int i;
++
++	phy = priv->phy[priv->phyNum];
++
++	data = TLAN_NET_CMD_NRESET | TLAN_NET_CMD_NWRAP;
++	if (priv->tlanFullDuplex) {
++		data |= TLAN_NET_CMD_DUPLEX;
+ 	}
++	TLan_DioWrite8(BASE, TLAN_NET_CMD, data);
++	data = TLAN_NET_MASK_MASK4 | TLAN_NET_MASK_MASK5;
++	if (priv->phyNum == 0) {
++		data |= TLAN_NET_MASK_MASK7;
++	}
++	TLan_DioWrite8(BASE, TLAN_NET_MASK, data);
++	TLan_DioWrite16(BASE, TLAN_MAX_RX, ((1536) + 7) & ~7);
++	TLan_MiiReadReg(nic, phy, MII_GEN_ID_HI, &tlphy_id1);
++	TLan_MiiReadReg(nic, phy, MII_GEN_ID_LO, &tlphy_id2);
+ 
+-	/* Wait for 50 ms and powerup
+-	 * This is abitrary.  It is intended to make sure the
+-	 * tranceiver settles.
+-	 */
+-	TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP );
++	if ((tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_UNMANAGED_PHY)
++	    || (priv->aui)) {
++		status = MII_GS_LINK;
++		printf("TLAN:  %s: Link forced.\n", priv->nic_name);
++	} else {
++		TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
++		udelay(1000);
++		TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
++		if ((status & MII_GS_LINK) &&	/* We only support link info on Nat.Sem. PHY's */
++		    (tlphy_id1 == NAT_SEM_ID1)
++		    && (tlphy_id2 == NAT_SEM_ID2)) {
++			TLan_MiiReadReg(nic, phy, MII_AN_LPA, &partner);
++			TLan_MiiReadReg(nic, phy, TLAN_TLPHY_PAR,
++					&tlphy_par);
+ 
+-} /* TLan_PhyPowerDown */
++			printf("TLAN: %s: Link active with ",
++			       priv->nic_name);
++			if (!(tlphy_par & TLAN_PHY_AN_EN_STAT)) {
++				printf("forced 10%sMbps %s-Duplex\n",
++				       tlphy_par & TLAN_PHY_SPEED_100 ? ""
++				       : "0",
++				       tlphy_par & TLAN_PHY_DUPLEX_FULL ?
++				       "Full" : "Half");
++			} else {
++				printf
++				    ("AutoNegotiation enabled, at 10%sMbps %s-Duplex\n",
++				     tlphy_par & TLAN_PHY_SPEED_100 ? "" :
++				     "0",
++				     tlphy_par & TLAN_PHY_DUPLEX_FULL ?
++				     "Full" : "Half");
++				printf("TLAN: Partner capability: ");
++				for (i = 5; i <= 10; i++)
++					if (partner & (1 << i))
++						printf("%s", media[i - 5]);
++				printf("\n");
++			}
+ 
+-void TLan_PhyPowerUp( struct net_device *dev )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u16		value;
++			TLan_DioWrite8(BASE, TLAN_LED_REG, TLAN_LED_LINK);
++#ifdef MONITOR
++			/* We have link beat..for now anyway */
++			priv->link = 1;
++			/*Enabling link beat monitoring */
++			/* TLan_SetTimer( nic, (10*HZ), TLAN_TIMER_LINK_BEAT ); */
++			mdelay(10000);
++			TLan_PhyMonitor(nic);
++#endif
++		} else if (status & MII_GS_LINK) {
++			printf("TLAN: %s: Link active\n", priv->nic_name);
++			TLan_DioWrite8(BASE, TLAN_LED_REG, TLAN_LED_LINK);
++		}
++	}
+ 
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name );
+-	TLan_MiiSync( dev->base_addr );
+-	value = MII_GC_LOOPBK;
+-	TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
+-	TLan_MiiSync(dev->base_addr);
+-	/* Wait for 500 ms and reset the
+-	 * tranceiver.  The TLAN docs say both 50 ms and
+-	 * 500 ms, so do the longer, just in case.
+-	 */
+-	TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET );
++	if (priv->phyNum == 0) {
++		TLan_MiiReadReg(nic, phy, TLAN_TLPHY_CTL, &tlphy_ctl);
++		tlphy_ctl |= TLAN_TC_INTEN;
++		TLan_MiiWriteReg(nic, phy, TLAN_TLPHY_CTL, tlphy_ctl);
++		sio = TLan_DioRead8(BASE, TLAN_NET_SIO);
++		sio |= TLAN_NET_SIO_MINTEN;
++		TLan_DioWrite8(BASE, TLAN_NET_SIO, sio);
++	}
+ 
+-} /* TLan_PhyPowerUp */
++	if (status & MII_GS_LINK) {
++		TLan_SetMac(nic, 0, nic->node_addr);
++		priv->phyOnline = 1;
++		outb((TLAN_HC_INT_ON >> 8), BASE + TLAN_HOST_CMD + 1);
++/*		if ( debug >= 1 && debug != TLAN_DEBUG_PROBE ) {
++			outb( ( TLAN_HC_REQ_INT >> 8 ), BASE + TLAN_HOST_CMD + 1 );
++		}
+ 
+-void TLan_PhyReset( struct net_device *dev )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u16		phy;
+-	u16		value;
++		*/
++		outl(virt_to_bus(&rx_ring), BASE + TLAN_CH_PARM);
++		outl(TLAN_HC_GO | TLAN_HC_RT, BASE + TLAN_HOST_CMD);
++	} else {
++		printf
++		    ("TLAN: %s: Link inactive, will retry in 10 secs...\n",
++		     priv->nic_name);
++		/* TLan_SetTimer( nic, (10*HZ), TLAN_TIMER_FINISH_RESET ); */
++		mdelay(10000);
++		TLan_FinishReset(nic);
++		return;
+ 
+-	phy = priv->phy[priv->phyNum];
++	}
+ 
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name );
+-	TLan_MiiSync( dev->base_addr );
+-	value = MII_GC_LOOPBK | MII_GC_RESET;
+-	TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, value );
+-	TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
+-	while ( value & MII_GC_RESET ) {
+-		TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
+-	}
+-
+-	/* Wait for 500 ms and initialize.
+-	 * I don't remember why I wait this long.
+-	 * I've changed this to 50ms, as it seems long enough.
+-	 */
+-	TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_START_LINK );
+-
+-} /* TLan_PhyReset */
+-
+-void TLan_PhyStartLink( struct net_device *dev )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u16		ability;
+-	u16		control;
+-	u16		data;
+-	u16		phy;
+-	u16		status;
+-	u16		tctl;
+-
+-	phy = priv->phy[priv->phyNum];
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Trying to activate link.\n", dev->name );
+-	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+-	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &ability );
+-
+-	if ( ( status & MII_GS_AUTONEG ) && 
+-	     ( ! priv->aui ) ) {
+-		ability = status >> 11;
+-		if ( priv->speed  == TLAN_SPEED_10 && 
+-		     priv->duplex == TLAN_DUPLEX_HALF) {
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0000);
+-		} else if ( priv->speed == TLAN_SPEED_10 &&
+-			    priv->duplex == TLAN_DUPLEX_FULL) {
+-			priv->tlanFullDuplex = TRUE;
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0100);
+-		} else if ( priv->speed == TLAN_SPEED_100 &&
+-			    priv->duplex == TLAN_DUPLEX_HALF) {
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2000);
+-		} else if ( priv->speed == TLAN_SPEED_100 &&
+-			    priv->duplex == TLAN_DUPLEX_FULL) {
+-			priv->tlanFullDuplex = TRUE;
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2100);
+-		} else {
+-	
+-			/* Set Auto-Neg advertisement */
+-			TLan_MiiWriteReg( dev, phy, MII_AN_ADV, (ability << 5) | 1);
+-			/* Enablee Auto-Neg */
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1000 );
+-			/* Restart Auto-Neg */
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1200 );
+-			/* Wait for 4 sec for autonegotiation
+-		 	* to complete.  The max spec time is less than this
+-		 	* but the card need additional time to start AN.
+-		 	* .5 sec should be plenty extra.
+-		 	*/
+-			printk( "TLAN: %s: Starting autonegotiation.\n", dev->name );
+-			TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN );
+-			return;
+-		}
+-		
+-	}	
+-	
+-	if ( ( priv->aui ) && ( priv->phyNum != 0 ) ) {
+-		priv->phyNum = 0;
+-		data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
+-		TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
+-		TLan_SetTimer( dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN );
+-		return;
+-	}  else if ( priv->phyNum == 0 ) {
+-        	TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tctl );
+-		if ( priv->aui ) {
+-                	tctl |= TLAN_TC_AUISEL;
+-		} else { 
+-                	tctl &= ~TLAN_TC_AUISEL;
+-			control = 0;
+-			if ( priv->duplex == TLAN_DUPLEX_FULL ) {
+-				control |= MII_GC_DUPLEX;
+-				priv->tlanFullDuplex = TRUE;
+-			}
+-			if ( priv->speed == TLAN_SPEED_100 ) {
+-				control |= MII_GC_SPEEDSEL;
+-			}
+-       			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, control );
+-		}
+-        	TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tctl );
+-	}
+-
+-	/* Wait for 2 sec to give the tranceiver time
+-	 * to establish link.
+-	 */
+-	TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET );
+-
+-} /* TLan_PhyStartLink */
+-
+-void TLan_PhyFinishAutoNeg( struct net_device *dev )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u16		an_adv;
+-	u16		an_lpa;
+-	u16		data;
+-	u16		mode;
+-	u16		phy;
+-	u16		status;
+-	
+-	phy = priv->phy[priv->phyNum];
+-
+-	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+-	udelay( 1000 );
+-	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+-
+-	if ( ! ( status & MII_GS_AUTOCMPLT ) ) {
+-		/* Wait for 8 sec to give the process
+-		 * more time.  Perhaps we should fail after a while.
+-		 */
+-		 if (!priv->neg_be_verbose++) {
+-			 printk(KERN_INFO "TLAN:  Giving autonegotiation more time.\n");
+-		 	 printk(KERN_INFO "TLAN:  Please check that your adapter has\n");
+-		 	 printk(KERN_INFO "TLAN:  been properly connected to a HUB or Switch.\n");
+-			 printk(KERN_INFO "TLAN:  Trying to establish link in the background...\n");
+-		 }
+-		TLan_SetTimer( dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN );
+-		return;
+-	}
+-
+-	printk( "TLAN: %s: Autonegotiation complete.\n", dev->name );
+-	TLan_MiiReadReg( dev, phy, MII_AN_ADV, &an_adv );
+-	TLan_MiiReadReg( dev, phy, MII_AN_LPA, &an_lpa );
+-	mode = an_adv & an_lpa & 0x03E0;
+-	if ( mode & 0x0100 ) {
+-		priv->tlanFullDuplex = TRUE;
+-	} else if ( ! ( mode & 0x0080 ) && ( mode & 0x0040 ) ) {
+-		priv->tlanFullDuplex = TRUE;
+-	}
+-
+-	if ( ( ! ( mode & 0x0180 ) ) && ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) && ( priv->phyNum != 0 ) ) {
+-		priv->phyNum = 0;
+-		data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
+-		TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
+-		TLan_SetTimer( dev, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN );
+-		return;
+-	}
+-
+-	if ( priv->phyNum == 0 ) {
+-		if ( ( priv->duplex == TLAN_DUPLEX_FULL ) || ( an_adv & an_lpa & 0x0040 ) ) {
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, MII_GC_AUTOENB | MII_GC_DUPLEX );
+-			printk( "TLAN:  Starting internal PHY with FULL-DUPLEX\n" );
+-		} else {
+-			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, MII_GC_AUTOENB );
+-			printk( "TLAN:  Starting internal PHY with HALF-DUPLEX\n" );
+-		}
+-	}
+-
+-	/* Wait for 100 ms.  No reason in partiticular.
+-	 */
+-	TLan_SetTimer( dev, (HZ/10), TLAN_TIMER_FINISH_RESET );
+-		
+-} /* TLan_PhyFinishAutoNeg */
+-
+-#ifdef MONITOR
+-
+-        /*********************************************************************
+-        *
+-        *      TLan_phyMonitor
+-        *
+-        *      Returns: 
+-        *              None
+-        *
+-        *      Params:
+-        *              dev             The device structure of this device.
+-        *
+-        *      
+-        *      This function monitors PHY condition by reading the status
+-        *      register via the MII bus. This can be used to give info
+-        *      about link changes (up/down), and possible switch to alternate
+-        *      media.
+-        *
+-        * ******************************************************************/
+-
+-void TLan_PhyMonitor( struct net_device *dev )
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-	u16     phy;
+-	u16     phy_status;
+-
+-	phy = priv->phy[priv->phyNum];
+-
+-        /* Get PHY status register */
+-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &phy_status );
+-
+-        /* Check if link has been lost */
+-        if (!(phy_status & MII_GS_LINK)) { 
+- 	       if (priv->link) {
+-		      priv->link = 0;
+-	              printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
+-	              dev->flags &= ~IFF_RUNNING;
+-		      TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
+-		      return;
+-		}
+-	}
+-
+-        /* Link restablished? */
+-        if ((phy_status & MII_GS_LINK) && !priv->link) {
+- 		priv->link = 1;
+-        	printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
+-        	dev->flags |= IFF_RUNNING;
+-        }
+-
+-	/* Setup a new monitor */
+-	TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
+-}	
+-
+-#endif /* MONITOR */
+-
+-/*****************************************************************************
+-******************************************************************************
+-
+-	ThunderLAN Driver MII Routines
+-
+-	These routines are based on the information in Chap. 2 of the
+-	"ThunderLAN Programmer's Guide", pp. 15-24.
+-
+-******************************************************************************
+-*****************************************************************************/
+-
+-	/***************************************************************
+-	 *	TLan_MiiReadReg
+-	 *
+-	 *	Returns:
+-	 *		0	if ack received ok
+-	 *		1	otherwise.
+-	 *
+-	 *	Parms:
+-	 *		dev		The device structure containing
+-	 *				The io address and interrupt count
+-	 *				for this device.
+-	 *		phy		The address of the PHY to be queried.
+-	 *		reg		The register whose contents are to be
+-	 *				retreived.
+-	 *		val		A pointer to a variable to store the
+-	 *				retrieved value.
+-	 *
+-	 *	This function uses the TLAN's MII bus to retreive the contents
+-	 *	of a given register on a PHY.  It sends the appropriate info
+-	 *	and then reads the 16-bit register value from the MII bus via
+-	 *	the TLAN SIO register.
+-	 *
+-	 **************************************************************/
+-
+-int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
+-{
+-	u8	nack;
+-	u16	sio, tmp;
+- 	u32	i;
+-	int	err;
+-	int	minten;
+-	TLanPrivateInfo *priv = dev->priv;
+-	unsigned long flags = 0;
+-
+-	err = FALSE;
+-	outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
+-	sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
+-	
+-	if (!in_irq())
+-		spin_lock_irqsave(&priv->lock, flags);
+-
+-	TLan_MiiSync(dev->base_addr);
+-
+-	minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
+-	if ( minten )
+-		TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
+-
+-	TLan_MiiSendData( dev->base_addr, 0x1, 2 );	/* Start ( 01b ) */
+-	TLan_MiiSendData( dev->base_addr, 0x2, 2 );	/* Read  ( 10b ) */
+-	TLan_MiiSendData( dev->base_addr, phy, 5 );	/* Device #      */
+-	TLan_MiiSendData( dev->base_addr, reg, 5 );	/* Register #    */
+-
+-	TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);		/* Change direction */
+-
+-	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);		/* Clock Idle bit */
+-	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+-	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);		/* Wait 300ns */
+-
+-	nack = TLan_GetBit(TLAN_NET_SIO_MDATA, sio);	/* Check for ACK */
+-	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);		/* Finish ACK */
+-	if (nack) {					/* No ACK, so fake it */
+-		for (i = 0; i < 16; i++) {
+-			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
+-			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+-		}
+-		tmp = 0xffff;
+-		err = TRUE;
+-	} else {					/* ACK, so read data */
+-		for (tmp = 0, i = 0x8000; i; i >>= 1) {
+-			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
+-			if (TLan_GetBit(TLAN_NET_SIO_MDATA, sio))
+-				tmp |= i;
+-			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+-		}
+-	}
+-
+-	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);		/* Idle cycle */
+-	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+-
+-	if ( minten )
+-		TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
+-
+-	*val = tmp;
+-	
+-	if (!in_irq())
+-		spin_unlock_irqrestore(&priv->lock, flags);
+-
+-	return err;
+-
+-} /* TLan_MiiReadReg */
+-
+-	/***************************************************************
+-	 *	TLan_MiiSendData
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		base_port	The base IO port of the adapter	in
+-	 *				question.
+-	 *		dev		The address of the PHY to be queried.
+-	 *		data		The value to be placed on the MII bus.
+-	 *		num_bits	The number of bits in data that are to
+-	 *				be placed on the MII bus.
+-	 *
+-	 *	This function sends on sequence of bits on the MII
+-	 *	configuration bus.
+-	 *
+-	 **************************************************************/
+-
+-void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
+-{
+-	u16 sio;
+-	u32 i;
+-
+-	if ( num_bits == 0 )
+-		return;
+-
+-	outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
+-	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
+-	TLan_SetBit( TLAN_NET_SIO_MTXEN, sio );
+-
+-	for ( i = ( 0x1 << ( num_bits - 1 ) ); i; i >>= 1 ) {
+-		TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
+-		(void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
+-		if ( data & i )
+-			TLan_SetBit( TLAN_NET_SIO_MDATA, sio );
+-		else
+-			TLan_ClearBit( TLAN_NET_SIO_MDATA, sio );
+-		TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+-		(void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
+-	}
+-
+-} /* TLan_MiiSendData */
+-
+-	/***************************************************************
+-	 *	TLan_MiiSync
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		base_port	The base IO port of the adapter in
+-	 *				question.
+-	 *
+-	 *	This functions syncs all PHYs in terms of the MII configuration
+-	 *	bus.
+-	 *
+-	 **************************************************************/
+-
+-void TLan_MiiSync( u16 base_port )
+-{
+-	int i;
+-	u16 sio;
+-
+-	outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
+-	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
+-
+-	TLan_ClearBit( TLAN_NET_SIO_MTXEN, sio );
+-	for ( i = 0; i < 32; i++ ) {
+-		TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
+-		TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+-	}
+-
+-} /* TLan_MiiSync */
+-
+-	/***************************************************************
+-	 *	TLan_MiiWriteReg
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		dev		The device structure for the device
+-	 *				to write to.
+-	 *		phy		The address of the PHY to be written to.
+-	 *		reg		The register whose contents are to be
+-	 *				written.
+-	 *		val		The value to be written to the register.
+-	 *
+-	 *	This function uses the TLAN's MII bus to write the contents of a
+-	 *	given register on a PHY.  It sends the appropriate info and then
+-	 *	writes the 16-bit register value from the MII configuration bus
+-	 *	via the TLAN SIO register.
+-	 *
+-	 **************************************************************/
+-
+-void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
+-{
+-	u16	sio;
+-	int	minten;
+-	unsigned long flags = 0;
+-	TLanPrivateInfo *priv = dev->priv;
+-
+-	outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
+-	sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
+-	
+-	if (!in_irq())
+-		spin_lock_irqsave(&priv->lock, flags);
+-
+-	TLan_MiiSync( dev->base_addr );
+-
+-	minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
+-	if ( minten )
+-		TLan_ClearBit( TLAN_NET_SIO_MINTEN, sio );
+-
+-	TLan_MiiSendData( dev->base_addr, 0x1, 2 );	/* Start ( 01b ) */
+-	TLan_MiiSendData( dev->base_addr, 0x1, 2 );	/* Write ( 01b ) */
+-	TLan_MiiSendData( dev->base_addr, phy, 5 );	/* Device #      */
+-	TLan_MiiSendData( dev->base_addr, reg, 5 );	/* Register #    */
+-
+-	TLan_MiiSendData( dev->base_addr, 0x2, 2 );	/* Send ACK */
+-	TLan_MiiSendData( dev->base_addr, val, 16 );	/* Send Data */
+-
+-	TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );	/* Idle cycle */
+-	TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+-
+-	if ( minten )
+-		TLan_SetBit( TLAN_NET_SIO_MINTEN, sio );
+-	
+-	if (!in_irq())
+-		spin_unlock_irqrestore(&priv->lock, flags);
+-
+-} /* TLan_MiiWriteReg */
+-#endif
+-
+-/**************************************************************************
+-RESET - Reset adapter
+-***************************************************************************/
+-static void skel_reset(struct nic *nic)
+-{
+-	/* put the card in its initial state */
+-}
+-
+-/**************************************************************************
+-POLL - Wait for a frame
+-***************************************************************************/
+-static int skel_poll(struct nic *nic)
+-{
+-	/* return true if there's an ethernet packet ready to read */
+-	/* nic->packet should contain data on return */
+-	/* nic->packetlen should contain length of data */
+-	return (0);	/* initially as this is called to flush the input */
+-}
+-
+-/**************************************************************************
+-TRANSMIT - Transmit a frame
+-***************************************************************************/
+-static void skel_transmit(
+-	struct nic *nic,
+-	const char *d,			/* Destination */
+-	unsigned int t,			/* Type */
+-	unsigned int s,			/* size */
+-	const char *p)			/* Packet */
+-{
+-	/* send the packet to destination */
+-}
+-
+-/**************************************************************************
+-DISABLE - Turn off ethernet interface
+-***************************************************************************/
+-static void skel_disable(struct nic *nic)
+-{
+-}
+-
+-/**************************************************************************
+-PROBE - Look for an adapter, this routine's visible to the outside
+-You should omit the last argument struct pci_device * for a non-PCI NIC
+-***************************************************************************/
+-struct nic *tlan_probe(struct nic *nic, unsigned short *probe_addrs,
+-	struct pci_device *p)
+-{
+-	/* if probe_addrs is 0, then routine can use a hardwired default */
+-	/* if board found */
+-	{
+-		/* point to NIC specific routines */
+-		nic->reset = skel_reset;
+-		nic->poll = skel_poll;
+-		nic->transmit = skel_transmit;
+-		nic->disable = skel_disable;
+-		return nic;
+-	}
+-	/* else */
+-	return 0;
+-}
+-
+-#if	0
+-#ifndef TLAN_H
+-#define TLAN_H
+-/********************************************************************
+- *
+- *  Linux ThunderLAN Driver
+- *
+- *  tlan.h
+- *  by James Banks
+- *
+- *  (C) 1997-1998 Caldera, Inc.
+- *  (C) 1999-2001 Torben Mathiasen
+- * 
+- *  This software may be used and distributed according to the terms
+- *  of the GNU General Public License, incorporated herein by reference.
+- *
+- ** This file is best viewed/edited with tabstop=4, colums>=132
+- *
+- *  
+- *  Dec 10, 1999	Torben Mathiasen <torben.mathiasen@compaq.com>
+- *			New Maintainer
+- *
+- ********************************************************************/
+-
+-#include <asm/io.h>
+-#include <asm/types.h>
+-#include <linux/netdevice.h>
+-
+-#define FALSE			0
+-#define TRUE			1
+-
+-#define TX_TIMEOUT		(10*HZ)	 /* We need time for auto-neg */
+-
+-typedef struct tlan_adapter_entry {
+-	u16	vendorId;
+-	u16	deviceId;
+-	char	*deviceLabel;
+-	u32	flags;
+-	u16	addrOfs;
+-} TLanAdapterEntry;
+-
+-	/*****************************************************************
+-	 * EISA Definitions
+-	 *
+-	 ****************************************************************/
+-
+-#define EISA_ID      0xc80   /* EISA ID Registers */ 
+-#define EISA_ID0     0xc80   /* EISA ID Register 0 */ 
+-#define EISA_ID1     0xc81   /* EISA ID Register 1 */ 
+-#define EISA_ID2     0xc82   /* EISA ID Register 2 */ 
+-#define EISA_ID3     0xc83   /* EISA ID Register 3 */ 
+-#define EISA_CR      0xc84   /* EISA Control Register */
+-#define EISA_REG0    0xc88   /* EISA Configuration Register 0 */
+-#define EISA_REG1    0xc89   /* EISA Configuration Register 1 */
+-#define EISA_REG2    0xc8a   /* EISA Configuration Register 2 */
+-#define EISA_REG3    0xc8f   /* EISA Configuration Register 3 */
+-#define EISA_APROM   0xc90   /* Ethernet Address PROM */
+-
+-	/*****************************************************************
+-	 * Rx/Tx List Definitions
+-	 *
+-	 ****************************************************************/
+-
+-typedef struct tlan_buffer_ref_tag {
+-	u32	count;
+-	u32	address;
+-} TLanBufferRef;
+-
+-typedef struct tlan_list_tag {
+-	u32		forward;
+-	u16		cStat;
+-	u16		frameSize;
+-	TLanBufferRef	buffer[TLAN_BUFFERS_PER_LIST];
+-} TLanList;
+-
+-typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
+-
+-	/*****************************************************************
+-	 * TLAN Private Information Structure
+-	 *
+-	 ****************************************************************/
+-
+-typedef struct tlan_private_tag {
+-	struct net_device       *nextDevice;
+-	void			*dmaStorage;
+-	u8			*padBuffer;
+-	TLanList                *rxList;
+-	u8			*rxBuffer;
+-	u32                     rxHead;
+-	u32                     rxTail;
+-	u32			rxEocCount;
+-	TLanList                *txList;
+-	u8			*txBuffer;
+-	u32                     txHead;
+-	u32                     txInProgress;
+-	u32                     txTail;
+-	u32			txBusyCount;
+-	u32                     phyOnline;
+-	u32			timerSetAt;
+-	u32			timerType;
+-	struct timer_list	timer;
+-	struct net_device_stats	stats;
+-	struct board		*adapter;
+-	u32			adapterRev;
+-	u32			aui;
+-	u32			debug;
+-	u32			duplex;
+-	u32			phy[2];
+-	u32			phyNum;
+-	u32			speed;
+-	u8			tlanRev;
+-	u8			tlanFullDuplex;
+-	char                    devName[8];
+-	spinlock_t		lock;
+-	u8			link;
+-	u8			is_eisa;
+-	struct tq_struct	tlan_tqueue;
+-	u8			neg_be_verbose;
+-} TLanPrivateInfo;
+-
+-#define 	TLAN_HC_GO		0x80000000
+-#define		TLAN_HC_STOP		0x40000000
+-#define		TLAN_HC_ACK		0x20000000
+-#define		TLAN_HC_CS_MASK		0x1FE00000
+-#define		TLAN_HC_EOC		0x00100000
+-#define		TLAN_HC_RT		0x00080000
+-#define		TLAN_HC_NES		0x00040000
+-#define		TLAN_HC_AD_RST		0x00008000
+-#define		TLAN_HC_LD_TMR		0x00004000
+-#define		TLAN_HC_LD_THR		0x00002000
+-#define		TLAN_HC_REQ_INT		0x00001000
+-#define		TLAN_HC_INT_OFF		0x00000800
+-#define		TLAN_HC_INT_ON		0x00000400
+-#define		TLAN_HC_AC_MASK		0x000000FF
+-#define		TLAN_DA_ADR_INC		0x8000
+-#define		TLAN_DA_RAM_ADR		0x4000
+-#define		TLAN_HI_IV_MASK		0x1FE0
+-#define		TLAN_HI_IT_MASK		0x001C
+-
+-#define		TLAN_NET_CMD_NRESET	0x80
+-#define		TLAN_NET_CMD_NWRAP	0x40
+-#define		TLAN_NET_CMD_CSF	0x20
+-#define		TLAN_NET_CMD_CAF	0x10
+-#define		TLAN_NET_CMD_NOBRX	0x08
+-#define		TLAN_NET_CMD_DUPLEX	0x04
+-#define		TLAN_NET_CMD_TRFRAM	0x02
+-#define		TLAN_NET_CMD_TXPACE	0x01
+-#define 	TLAN_NET_SIO_MINTEN	0x80
+-#define		TLAN_NET_SIO_ECLOK	0x40
+-#define		TLAN_NET_SIO_ETXEN	0x20
+-#define		TLAN_NET_SIO_EDATA	0x10
+-#define		TLAN_NET_SIO_NMRST	0x08
+-#define		TLAN_NET_SIO_MCLK	0x04
+-#define		TLAN_NET_SIO_MTXEN	0x02
+-#define		TLAN_NET_SIO_MDATA	0x01
+-#define		TLAN_NET_STS_MIRQ	0x80
+-#define		TLAN_NET_STS_HBEAT	0x40
+-#define		TLAN_NET_STS_TXSTOP	0x20
+-#define		TLAN_NET_STS_RXSTOP	0x10
+-#define		TLAN_NET_STS_RSRVD	0x0F
+-#define		TLAN_NET_MASK_MASK7	0x80
+-#define		TLAN_NET_MASK_MASK6	0x40
+-#define		TLAN_NET_MASK_MASK5	0x20
+-#define		TLAN_NET_MASK_MASK4	0x10
+-#define		TLAN_NET_MASK_RSRVD	0x0F
+-#define 	TLAN_NET_CFG_RCLK	0x8000
+-#define		TLAN_NET_CFG_TCLK	0x4000
+-#define		TLAN_NET_CFG_BIT	0x2000
+-#define		TLAN_NET_CFG_RXCRC	0x1000
+-#define		TLAN_NET_CFG_PEF	0x0800
+-#define		TLAN_NET_CFG_1FRAG	0x0400
+-#define		TLAN_NET_CFG_1CHAN	0x0200
+-#define		TLAN_NET_CFG_MTEST	0x0100
+-#define		TLAN_NET_CFG_PHY_EN	0x0080
+-#define		TLAN_NET_CFG_MSMASK	0x007F
+-#define		TLAN_LED_ACT		0x10
+-#define		TLAN_LED_LINK		0x01
+-#define		TLAN_ID_TX_EOC		0x04
+-#define		TLAN_ID_RX_EOF		0x02
+-#define		TLAN_ID_RX_EOC		0x01
+-
+-#define CIRC_INC( a, b ) if ( ++a >= b ) a = 0
+-
+-#ifdef I_LIKE_A_FAST_HASH_FUNCTION
+-/* given 6 bytes, view them as 8 6-bit numbers and return the XOR of those */
+-/* the code below is about seven times as fast as the original code */
+-inline u32 TLan_HashFunc( u8 *a )
+-{
+-        u8     hash;
+-
+-        hash = (a[0]^a[3]);             /* & 077 */
+-        hash ^= ((a[0]^a[3])>>6);       /* & 003 */
+-        hash ^= ((a[1]^a[4])<<2);       /* & 074 */
+-        hash ^= ((a[1]^a[4])>>4);       /* & 017 */
+-        hash ^= ((a[2]^a[5])<<4);       /* & 060 */
+-        hash ^= ((a[2]^a[5])>>2);       /* & 077 */
+-
+-        return (hash & 077);
+-}
+-
+-#else /* original code */
+-
+-inline	u32	xor( u32 a, u32 b )
+-{
+-	return ( ( a && ! b ) || ( ! a && b ) );
+-}
+-#define XOR8( a, b, c, d, e, f, g, h )	xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
+-#define DA( a, bit )					( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
+-
+-inline u32 TLan_HashFunc( u8 *a )
+-{
+-	u32	hash;
+-
+-	hash  = XOR8( DA(a,0), DA(a, 6), DA(a,12), DA(a,18), DA(a,24), DA(a,30), DA(a,36), DA(a,42) );
+-	hash |= XOR8( DA(a,1), DA(a, 7), DA(a,13), DA(a,19), DA(a,25), DA(a,31), DA(a,37), DA(a,43) ) << 1;
+-	hash |= XOR8( DA(a,2), DA(a, 8), DA(a,14), DA(a,20), DA(a,26), DA(a,32), DA(a,38), DA(a,44) ) << 2;
+-	hash |= XOR8( DA(a,3), DA(a, 9), DA(a,15), DA(a,21), DA(a,27), DA(a,33), DA(a,39), DA(a,45) ) << 3;
+-	hash |= XOR8( DA(a,4), DA(a,10), DA(a,16), DA(a,22), DA(a,28), DA(a,34), DA(a,40), DA(a,46) ) << 4;
+-	hash |= XOR8( DA(a,5), DA(a,11), DA(a,17), DA(a,23), DA(a,29), DA(a,35), DA(a,41), DA(a,47) ) << 5;
+-
+-	return hash;
+-
+-} 
+-
+-#endif /* I_LIKE_A_FAST_HASH_FUNCTION */
+-#endif
+-/*******************************************************************************
+- *
+- *  Linux ThunderLAN Driver
+- *
+- *  tlan.c
+- *  by James Banks
+- *
+- *  (C) 1997-1998 Caldera, Inc.
+- *  (C) 1998 James Banks
+- *  (C) 1999-2001 Torben Mathiasen
+- *
+- *  This software may be used and distributed according to the terms
+- *  of the GNU General Public License, incorporated herein by reference.
+- *
+- ** This file is best viewed/edited with columns>=132.
+- *
+- ** Useful (if not required) reading:
+- *
+- *		Texas Instruments, ThunderLAN Programmer's Guide,
+- *			TI Literature Number SPWU013A
+- *			available in PDF format from www.ti.com
+- *		Level One, LXT901 and LXT970 Data Sheets
+- *			available in PDF format from www.level1.com
+- *		National Semiconductor, DP83840A Data Sheet
+- *			available in PDF format from www.national.com
+- *		Microchip Technology, 24C01A/02A/04A Data Sheet
+- *			available in PDF format from www.microchip.com
+- *
+- * Change History
+- *
+- *	Tigran Aivazian <tigran@sco.com>:	TLan_PciProbe() now uses
+- *						new PCI BIOS interface.
+- *	Alan Cox	<alan@redhat.com>:	Fixed the out of memory
+- *						handling.
+- *      
+- *	Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!
+- *
+- *	v1.1 Dec 20, 1999    - Removed linux version checking
+- *			       Patch from Tigran Aivazian. 
+- *			     - v1.1 includes Alan's SMP updates.
+- *			     - We still have problems on SMP though,
+- *			       but I'm looking into that. 
+- *			
+- *	v1.2 Jan 02, 2000    - Hopefully fixed the SMP deadlock.
+- *			     - Removed dependency of HZ being 100.
+- *			     - We now allow higher priority timers to 
+- *			       overwrite timers like TLAN_TIMER_ACTIVITY
+- *			       Patch from John Cagle <john.cagle@compaq.com>.
+- *			     - Fixed a few compiler warnings.
+- *
+- *	v1.3 Feb 04, 2000    - Fixed the remaining HZ issues.
+- *			     - Removed call to pci_present(). 
+- *			     - Removed SA_INTERRUPT flag from irq handler.
+- *			     - Added __init and __initdata to reduce resisdent 
+- *			       code size.
+- *			     - Driver now uses module_init/module_exit.
+- *			     - Rewrote init_module and tlan_probe to
+- *			       share a lot more code. We now use tlan_probe
+- *			       with builtin and module driver.
+- *			     - Driver ported to new net API. 
+- *			     - tlan.txt has been reworked to reflect current 
+- *			       driver (almost)
+- *			     - Other minor stuff
+- *
+- *	v1.4 Feb 10, 2000    - Updated with more changes required after Dave's
+- *	                       network cleanup in 2.3.43pre7 (Tigran & myself)
+- *	                     - Minor stuff.
+- *
+- *	v1.5 March 22, 2000  - Fixed another timer bug that would hang the driver
+- *			       if no cable/link were present.
+- *			     - Cosmetic changes.
+- *			     - TODO: Port completely to new PCI/DMA API
+- *			     	     Auto-Neg fallback.
+- *
+- * 	v1.6 April 04, 2000  - Fixed driver support for kernel-parameters. Haven't
+- * 			       tested it though, as the kernel support is currently 
+- * 			       broken (2.3.99p4p3).
+- * 			     - Updated tlan.txt accordingly.
+- * 			     - Adjusted minimum/maximum frame length.
+- * 			     - There is now a TLAN website up at 
+- * 			       http://tlan.kernel.dk
+- *
+- * 	v1.7 April 07, 2000  - Started to implement custom ioctls. Driver now
+- * 			       reports PHY information when used with Donald
+- * 			       Beckers userspace MII diagnostics utility.
+- *
+- * 	v1.8 April 23, 2000  - Fixed support for forced speed/duplex settings.
+- * 			     - Added link information to Auto-Neg and forced
+- * 			       modes. When NIC operates with auto-neg the driver
+- * 			       will report Link speed & duplex modes as well as
+- * 			       link partner abilities. When forced link is used,
+- * 			       the driver will report status of the established
+- * 			       link.
+- * 			       Please read tlan.txt for additional information. 
+- * 			     - Removed call to check_region(), and used 
+- * 			       return value of request_region() instead.
+- *	
+- *	v1.8a May 28, 2000   - Minor updates.
+- *
+- *	v1.9 July 25, 2000   - Fixed a few remaining Full-Duplex issues.
+- *	                     - Updated with timer fixes from Andrew Morton.
+- *	                     - Fixed module race in TLan_Open.
+- *	                     - Added routine to monitor PHY status.
+- *	                     - Added activity led support for Proliant devices.
+- *
+- *	v1.10 Aug 30, 2000   - Added support for EISA based tlan controllers 
+- *			       like the Compaq NetFlex3/E. 
+- *			     - Rewrote tlan_probe to better handle multiple
+- *			       bus probes. Probing and device setup is now
+- *			       done through TLan_Probe and TLan_init_one. Actual
+- *			       hardware probe is done with kernel API and 
+- *			       TLan_EisaProbe.
+- *			     - Adjusted debug information for probing.
+- *			     - Fixed bug that would cause general debug information 
+- *			       to be printed after driver removal. 
+- *			     - Added transmit timeout handling.
+- *			     - Fixed OOM return values in tlan_probe. 
+- *			     - Fixed possible mem leak in tlan_exit 
+- *			       (now tlan_remove_one).
+- *			     - Fixed timer bug in TLan_phyMonitor.
+- *			     - This driver version is alpha quality, please
+- *			       send me any bug issues you may encounter.
+- *
+- *	v1.11 Aug 31, 2000   - Do not try to register irq 0 if no irq line was 
+- *			       set for EISA cards.
+- *			     - Added support for NetFlex3/E with nibble-rate
+- *			       10Base-T PHY. This is untestet as I haven't got
+- *			       one of these cards.
+- *			     - Fixed timer being added twice.
+- *			     - Disabled PhyMonitoring by default as this is
+- *			       work in progress. Define MONITOR to enable it.
+- *			     - Now we don't display link info with PHYs that
+- *			       doesn't support it (level1).
+- *			     - Incresed tx_timeout beacuse of auto-neg.
+- *			     - Adjusted timers for forced speeds.
+- *
+- *	v1.12 Oct 12, 2000   - Minor fixes (memleak, init, etc.)
+- *
+- * 	v1.13 Nov 28, 2000   - Stop flooding console with auto-neg issues
+- * 			       when link can't be established.
+- *			     - Added the bbuf option as a kernel parameter.
+- *			     - Fixed ioaddr probe bug.
+- *			     - Fixed stupid deadlock with MII interrupts.
+- *			     - Added support for speed/duplex selection with 
+- *			       multiple nics.
+- *			     - Added partly fix for TX Channel lockup with
+- *			       TLAN v1.0 silicon. This needs to be investigated
+- *			       further.
+- *
+- * 	v1.14 Dec 16, 2000   - Added support for servicing multiple frames per.
+- * 			       interrupt. Thanks goes to
+- * 			       Adam Keys <adam@ti.com>
+- * 			       Denis Beaudoin <dbeaudoin@ti.com>
+- * 			       for providing the patch.
+- * 			     - Fixed auto-neg output when using multiple
+- * 			       adapters.
+- * 			     - Converted to use new taskq interface.
+- *
+- * 	v1.14a Jan 6, 2001   - Minor adjustments (spinlocks, etc.)
+- *
+- *******************************************************************************/
+-
+-                                                                                
+-#include <linux/module.h>
+-
+-#include "tlan.h"
+-
+-#include <linux/init.h>
+-#include <linux/ioport.h>
+-#include <linux/pci.h>
+-#include <linux/etherdevice.h>
+-#include <linux/delay.h>
+-#include <linux/spinlock.h>
+-#include <linux/mii.h>
+-
+-typedef u32 (TLanIntVectorFunc)( struct net_device *, u16 );
+-
+-/* For removing EISA devices */
+-static	struct net_device	*TLan_Eisa_Devices;
+-
+-static	int		TLanDevicesInstalled;
+-
+-/* Set speed, duplex and aui settings */
+-static  int aui[MAX_TLAN_BOARDS];
+-static  int duplex[MAX_TLAN_BOARDS];
+-static  int speed[MAX_TLAN_BOARDS];
+-static  int boards_found;
+-
+-MODULE_AUTHOR("Maintainer: Torben Mathiasen <torben.mathiasen@compaq.com>");
+-MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters");
+-MODULE_LICENSE("GPL");
+-
+-MODULE_PARM(aui, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i");
+-MODULE_PARM(duplex, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i");
+-MODULE_PARM(speed, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i");
+-MODULE_PARM(debug, "i");
+-MODULE_PARM(bbuf, "i");
+-MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
+-MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
+-MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
+-MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
+-MODULE_PARM_DESC(bbuf, "ThunderLAN use big buffer (0-1)");
+-EXPORT_NO_SYMBOLS;
+-
+-/* Define this to enable Link beat monitoring */
+-#undef MONITOR
+-
+-/* Turn on debugging. See linux/Documentation/networking/tlan.txt for details */
+-static  int		debug;
+-
+-static	int		bbuf;
+-static	u8		*TLanPadBuffer;
+-static	char		TLanSignature[] = "TLAN";
+-static const char tlan_banner[] = "ThunderLAN driver v1.14a\n";
+-static int tlan_have_pci;
+-static int tlan_have_eisa;
+-
+-const char *media[] = {
+-	"10BaseT-HD ", "10BaseT-FD ","100baseTx-HD ", 
+-	"100baseTx-FD", "100baseT4", 0
+-};
+-
+-int media_map[] = { 0x0020, 0x0040, 0x0080, 0x0100, 0x0200,};
+-
+-static struct board {
+-	const char	*deviceLabel;
+-	u32	   	flags;
+-	u16	   	addrOfs;
+-} board_info[] __devinitdata = {
+-	{ "Compaq Netelligent 10 T PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
+-	{ "Compaq Netelligent 10/100 TX PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
+-	{ "Compaq Integrated NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
+-	{ "Compaq NetFlex-3/P", TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },
+-	{ "Compaq NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
+-	{ "Compaq Netelligent Integrated 10/100 TX UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
+-	{ "Compaq Netelligent Dual 10/100 TX PCI UTP", TLAN_ADAPTER_NONE, 0x83 },
+-	{ "Compaq Netelligent 10/100 TX Embedded UTP", TLAN_ADAPTER_NONE, 0x83 },
+-	{ "Olicom OC-2183/2185", TLAN_ADAPTER_USE_INTERN_10, 0x83 },
+-	{ "Olicom OC-2325", TLAN_ADAPTER_UNMANAGED_PHY, 0xF8 },
+-	{ "Olicom OC-2326", TLAN_ADAPTER_USE_INTERN_10, 0xF8 },
+-	{ "Compaq Netelligent 10/100 TX UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
+-	{ "Compaq Netelligent 10 T/2 PCI UTP/Coax", TLAN_ADAPTER_NONE, 0x83 },
+-	{ "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED | 	/* EISA card */
+-	                        TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },	
+-	{ "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */
+-};
+-
+-static struct pci_device_id tlan_pci_tbl[] __devinitdata = {
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
+-	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2183,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
+-	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2325,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
+-	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2326,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
+-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
+-	{ 0,}
+-};
+-MODULE_DEVICE_TABLE(pci, tlan_pci_tbl);		
+-
+-static void	TLan_EisaProbe( void );
+-static void	TLan_Eisa_Cleanup( void );
+-static int      TLan_Init( struct net_device * );
+-static int	TLan_Open( struct net_device *dev );
+-static int	TLan_StartTx( struct sk_buff *, struct net_device *);
+-static void	TLan_HandleInterrupt( int, void *, struct pt_regs *);
+-static int	TLan_Close( struct net_device *);
+-static struct	net_device_stats *TLan_GetStats( struct net_device *);
+-static void	TLan_SetMulticastList( struct net_device *);
+-static int	TLan_ioctl( struct net_device *dev, struct ifreq *rq, int cmd);
+-static int      TLan_probe1( struct pci_dev *pdev, long ioaddr, int irq, int rev, const struct pci_device_id *ent);
+-static void	TLan_tx_timeout( struct net_device *dev);
+-static int 	tlan_init_one( struct pci_dev *pdev, const struct pci_device_id *ent);
+-
+-static u32	TLan_HandleInvalid( struct net_device *, u16 );
+-static u32	TLan_HandleTxEOF( struct net_device *, u16 );
+-static u32	TLan_HandleStatOverflow( struct net_device *, u16 );
+-static u32	TLan_HandleRxEOF( struct net_device *, u16 );
+-static u32	TLan_HandleDummy( struct net_device *, u16 );
+-static u32	TLan_HandleTxEOC( struct net_device *, u16 );
+-static u32	TLan_HandleStatusCheck( struct net_device *, u16 );
+-static u32	TLan_HandleRxEOC( struct net_device *, u16 );
+-
+-static void	TLan_Timer( unsigned long );
+-
+-static void	TLan_ResetLists( struct net_device * );
+-static void	TLan_FreeLists( struct net_device * );
+-static void	TLan_PrintDio( u16 );
+-static void	TLan_PrintList( TLanList *, char *, int );
+-static void	TLan_ReadAndClearStats( struct net_device *, int );
+-static void	TLan_ResetAdapter( struct net_device * );
+-static void	TLan_FinishReset( struct net_device * );
+-static void	TLan_SetMac( struct net_device *, int areg, char *mac );
+-
+-static void	TLan_PhyPrint( struct net_device * );
+-static void	TLan_PhyDetect( struct net_device * );
+-static void	TLan_PhyPowerDown( struct net_device * );
+-static void	TLan_PhyPowerUp( struct net_device * );
+-static void	TLan_PhyReset( struct net_device * );
+-static void	TLan_PhyStartLink( struct net_device * );
+-static void	TLan_PhyFinishAutoNeg( struct net_device * );
+-#ifdef MONITOR
+-static void     TLan_PhyMonitor( struct net_device * );
+-#endif
+-
+-/*
+-static int	TLan_PhyNop( struct net_device * );
+-static int	TLan_PhyInternalCheck( struct net_device * );
+-static int	TLan_PhyInternalService( struct net_device * );
+-static int	TLan_PhyDp83840aCheck( struct net_device * );
+-*/
+-
+-static int	TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );
+-static void	TLan_MiiSendData( u16, u32, unsigned );
+-static void	TLan_MiiSync( u16 );
+-static void	TLan_MiiWriteReg( struct net_device *, u16, u16, u16 );
+-
+-static void	TLan_EeSendStart( u16 );
+-static int	TLan_EeSendByte( u16, u8, int );
+-static void	TLan_EeReceiveByte( u16, u8 *, int );
+-static int	TLan_EeReadByte( struct net_device *, u8, u8 * );
+-
+-static TLanIntVectorFunc *TLanIntVector[TLAN_INT_NUMBER_OF_INTS] = {
+-	TLan_HandleInvalid,
+-	TLan_HandleTxEOF,
+-	TLan_HandleStatOverflow,
+-	TLan_HandleRxEOF,
+-	TLan_HandleDummy,
+-	TLan_HandleTxEOC,
+-	TLan_HandleStatusCheck,
+-	TLan_HandleRxEOC
+-};
+-
+-static inline void
+-TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-	unsigned long flags = 0;
+-	
+-	if (!in_irq())
+-		spin_lock_irqsave(&priv->lock, flags);
+-	if ( priv->timer.function != NULL &&
+-		priv->timerType != TLAN_TIMER_ACTIVITY ) { 
+-		if (!in_irq())
+-			spin_unlock_irqrestore(&priv->lock, flags);
+-		return;
+-	}
+-	priv->timer.function = &TLan_Timer;
+-	if (!in_irq())
+-		spin_unlock_irqrestore(&priv->lock, flags);
+-
+-	priv->timer.data = (unsigned long) dev;
+-	priv->timerSetAt = jiffies;
+-	priv->timerType = type;
+-	mod_timer(&priv->timer, jiffies + ticks);
+-	
+-} /* TLan_SetTimer */
+-
+-/*****************************************************************************
+-******************************************************************************
+-
+-	ThunderLAN Driver Primary Functions
+-
+-	These functions are more or less common to all Linux network drivers.
+-
+-******************************************************************************
+-*****************************************************************************/
+-
+-	/***************************************************************
+-	 *	tlan_remove_one
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		None
+-	 *
+-	 *	Goes through the TLanDevices list and frees the device
+-	 *	structs and memory associated with each device (lists
+-	 *	and buffers).  It also ureserves the IO port regions
+-	 *	associated with this device.
+-	 *
+-	 **************************************************************/
+-
+-static void __devexit tlan_remove_one( struct pci_dev *pdev)
+-{
+-	struct net_device *dev = pci_get_drvdata( pdev );
+-	TLanPrivateInfo	*priv = dev->priv;
+-	
+-	unregister_netdev( dev );
+-
+-	if ( priv->dmaStorage ) {
+-		kfree( priv->dmaStorage );
+-	}
+-
+-	release_region( dev->base_addr, 0x10 );
+-	
+-	kfree( dev );
+-		
+-	pci_set_drvdata( pdev, NULL );
+-} 
+-
+-static struct pci_driver tlan_driver = {
+-	name:		"tlan",
+-	id_table:	tlan_pci_tbl,
+-	probe:		tlan_init_one,
+-	remove:		tlan_remove_one,	
+-};
+-
+-static int __init tlan_probe(void)
+-{
+-	static int	pad_allocated;
+-	
+-	printk(KERN_INFO "%s", tlan_banner);
+-	
+-	TLanPadBuffer = (u8 *) kmalloc(TLAN_MIN_FRAME_SIZE, 
+-					GFP_KERNEL);
+-
+-	if (TLanPadBuffer == NULL) {
+-		printk(KERN_ERR "TLAN: Could not allocate memory for pad buffer.\n");
+-		return -ENOMEM;
+-	}
+-
+-	memset(TLanPadBuffer, 0, TLAN_MIN_FRAME_SIZE);
+-	pad_allocated = 1;
+-
+-	TLAN_DBG(TLAN_DEBUG_PROBE, "Starting PCI Probe....\n");
+-	
+-	/* Use new style PCI probing. Now the kernel will
+-	   do most of this for us */
+-	pci_register_driver(&tlan_driver);
+-
+-	TLAN_DBG(TLAN_DEBUG_PROBE, "Starting EISA Probe....\n");
+-	TLan_EisaProbe();
+-		
+-	printk(KERN_INFO "TLAN: %d device%s installed, PCI: %d  EISA: %d\n", 
+-		 TLanDevicesInstalled, TLanDevicesInstalled == 1 ? "" : "s",
+-		 tlan_have_pci, tlan_have_eisa);
+-
+-	if (TLanDevicesInstalled == 0) {
+-		pci_unregister_driver(&tlan_driver);
+-		kfree(TLanPadBuffer);
+-		return -ENODEV;
+-	}
+-	return 0;
+-}
+-	
+-
+-static int __devinit tlan_init_one( struct pci_dev *pdev,
+-				    const struct pci_device_id *ent)
+-{
+-	return TLan_probe1( pdev, -1, -1, 0, ent);
+-}
+-
+-/*
+-	***************************************************************
+-	 *	tlan_probe1
+-	 *
+-	 *	Returns:
+-	 *		0 on success, error code on error
+-	 *	Parms: 
+-	 *		none
+-	 *
+-	 *	The name is lower case to fit in with all the rest of
+-	 *	the netcard_probe names.  This function looks for 
+-	 *	another TLan based adapter, setting it up with the
+-	 *	allocated device struct if one is found.
+-	 *	tlan_probe has been ported to the new net API and
+-	 *	now allocates its own device structure. This function
+-	 *	is also used by modules.
+-	 *
+-	 **************************************************************/
+-
+-static int __devinit TLan_probe1(struct pci_dev *pdev, 
+-				long ioaddr, int irq, int rev, const struct pci_device_id *ent )
+-{
+-
+-	struct net_device  *dev;
+-	TLanPrivateInfo    *priv;
+-	u8		   pci_rev;
+-	u16		   device_id;
+-	int		   reg;
+-
+-	if (pdev && pci_enable_device(pdev))
+-		return -EIO;
+-
+-	dev = init_etherdev(NULL, sizeof(TLanPrivateInfo));
+-	if (dev == NULL) {
+-		printk(KERN_ERR "TLAN: Could not allocate memory for device.\n");
+-		return -ENOMEM;
+-	}
+-	SET_MODULE_OWNER(dev);
+-	
+-	priv = dev->priv;
+-
+-	/* Is this a PCI device? */
+-	if (pdev) {
+-		u32 		   pci_io_base = 0;
+-
+-		priv->adapter = &board_info[ent->driver_data];
+-
+-		pci_read_config_byte ( pdev, PCI_REVISION_ID, &pci_rev);
+-
+-		for ( reg= 0; reg <= 5; reg ++ ) {
+-			if (pci_resource_flags(pdev, reg) & IORESOURCE_IO) {
+-				pci_io_base = pci_resource_start(pdev, reg);
+-				TLAN_DBG( TLAN_DEBUG_GNRL, "IO mapping is available at %x.\n",
+-						pci_io_base);
+-				break;
+-			}
+-		}
+-		if (!pci_io_base) {
+-			printk(KERN_ERR "TLAN: No IO mappings available\n");
+-			unregister_netdev(dev);
+-			kfree(dev);
+-			return -ENODEV;
+-		}
+-		
+-		dev->base_addr = pci_io_base;
+-		dev->irq = pdev->irq;
+-		priv->adapterRev = pci_rev; 
+-		pci_set_master(pdev);
+-		pci_set_drvdata(pdev, dev);
+-
+-	} else	{     /* EISA card */
+-		/* This is a hack. We need to know which board structure
+-		 * is suited for this adapter */
+-		device_id = inw(ioaddr + EISA_ID2);
+-		priv->is_eisa = 1;
+-		if (device_id == 0x20F1) {
+-			priv->adapter = &board_info[13]; 	/* NetFlex-3/E */
+-			priv->adapterRev = 23;			/* TLAN 2.3 */
+-		} else {
+-			priv->adapter = &board_info[14];
+-			priv->adapterRev = 10;			/* TLAN 1.0 */
+-		}
+-		dev->base_addr = ioaddr;
+-		dev->irq = irq;
+-	}
+-
+-	/* Kernel parameters */
+-	if (dev->mem_start) {
+-		priv->aui    = dev->mem_start & 0x01;
+-		priv->duplex = ((dev->mem_start & 0x06) == 0x06) ? 0 : (dev->mem_start & 0x06) >> 1;
+-		priv->speed  = ((dev->mem_start & 0x18) == 0x18) ? 0 : (dev->mem_start & 0x18) >> 3;
+-	
+-		if (priv->speed == 0x1) {
+-			priv->speed = TLAN_SPEED_10;
+-		} else if (priv->speed == 0x2) {
+-			priv->speed = TLAN_SPEED_100;
+-		}
+-		debug = priv->debug = dev->mem_end;
+-	} else {
+-		priv->aui    = aui[boards_found];
+-		priv->speed  = speed[boards_found];
+-		priv->duplex = duplex[boards_found];
+-		priv->debug = debug;
+-	}
+-	
+-	/* This will be used when we get an adapter error from
+-	 * within our irq handler */
+-	INIT_LIST_HEAD(&priv->tlan_tqueue.list);
+-	priv->tlan_tqueue.sync = 0;
+-	priv->tlan_tqueue.routine = (void *)(void*)TLan_tx_timeout;
+-	priv->tlan_tqueue.data = dev;
+-
+-	spin_lock_init(&priv->lock);
+-	
+-	if (TLan_Init(dev)) {
+-		printk(KERN_ERR "TLAN: Could not register device.\n");
+-		unregister_netdev(dev);
+-		kfree(dev);
+-		return -EAGAIN;
+-	} else {
+-	
+-	TLanDevicesInstalled++;
+-	boards_found++;
+-	
+-	/* pdev is NULL if this is an EISA device */
+-	if (pdev)
+-		tlan_have_pci++;
+-	else {
+-		priv->nextDevice = TLan_Eisa_Devices;
+-		TLan_Eisa_Devices = dev;
+-		tlan_have_eisa++;
+-	}
+-	
+-	printk(KERN_INFO "TLAN: %s irq=%2d, io=%04x, %s, Rev. %d\n",
+-			dev->name,
+-			(int) dev->irq,
+-			(int) dev->base_addr,
+-			priv->adapter->deviceLabel,
+-			priv->adapterRev);
+-	return 0;
+-	}
+-
+-}
++}	/* TLan_FinishReset */
+ 
+-static void TLan_Eisa_Cleanup(void)
+-{
+-	struct net_device *dev;
+-	TLanPrivateInfo *priv;
+-	
+-	while( tlan_have_eisa ) {
+-		dev = TLan_Eisa_Devices;
+-		priv = dev->priv;
+-		if (priv->dmaStorage) {
+-			kfree(priv->dmaStorage);
+-		}
+-		release_region( dev->base_addr, 0x10);
+-		unregister_netdev( dev );
+-		TLan_Eisa_Devices = priv->nextDevice;
+-		kfree( dev );
+-		tlan_have_eisa--;
+-	}
+-}
+-	
+-		
+-static void __exit tlan_exit(void)
+-{
+-	pci_unregister_driver(&tlan_driver);
+-
+-	if (tlan_have_eisa)
+-		TLan_Eisa_Cleanup();
+-
+-	kfree( TLanPadBuffer );
+-
+-}
+-
+-/* Module loading/unloading */
+-module_init(tlan_probe);
+-module_exit(tlan_exit);
+-
+-	/**************************************************************
+-	 * 	TLan_EisaProbe
+-	 *
+-	 *  	Returns: 0 on success, 1 otherwise
+-	 *
+-	 *  	Parms:	 None
+-	 *
+-	 *
+-	 *  	This functions probes for EISA devices and calls 
+-	 *  	TLan_probe1 when one is found. 
+-	 *
+-	 *************************************************************/
+-
+-static void  __init TLan_EisaProbe (void) 
++/**************************************************************************
++POLL - Wait for a frame
++***************************************************************************/
++static int tlan_poll(struct nic *nic, int retrieve)
+ {
+-	long 	ioaddr;
+-	int 	rc = -ENODEV;
+-	int 	irq;
+-	u16	device_id;
+-
+-	if (!EISA_bus) {	
+-		TLAN_DBG(TLAN_DEBUG_PROBE, "No EISA bus present\n");
+-		return;
+-	}
+-	
+-	/* Loop through all slots of the EISA bus */
+-	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
+-		
+-	TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n", (int) ioaddr + 0xC80, inw(ioaddr + EISA_ID));	
+-	TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n", (int) ioaddr + 0xC82, inw(ioaddr + EISA_ID2));
++	/* return true if there's an ethernet packet ready to read */
++	/* nic->packet should contain data on return */
++	/* nic->packetlen should contain length of data */
++	u32 framesize;
++	u32 host_cmd = 0;
++	u32 ack = 1;
++	int eoc = 0;
++	int entry = priv->cur_rx % TLAN_NUM_RX_LISTS;
++	u16 tmpCStat = le32_to_cpu(rx_ring[entry].cStat);
++	u16 host_int = inw(BASE + TLAN_HOST_INT);
+ 
+-		TLAN_DBG(TLAN_DEBUG_PROBE, "Probing for EISA adapter at IO: 0x%4x : ",
+-				   	(int) ioaddr);
+-		if (request_region(ioaddr, 0x10, TLanSignature) == NULL) 
+-			goto out;
+-
+-		if (inw(ioaddr + EISA_ID) != 0x110E) {		
+-			release_region(ioaddr, 0x10);
+-			goto out;
+-		}
+-		
+-		device_id = inw(ioaddr + EISA_ID2);
+-		if (device_id !=  0x20F1 && device_id != 0x40F1) { 		
+-			release_region (ioaddr, 0x10);
+-			goto out;
+-		}
+-		
+-	 	if (inb(ioaddr + EISA_CR) != 0x1) { 	/* Check if adapter is enabled */
+-			release_region (ioaddr, 0x10);
+-			goto out2;
+-		}
+-		
+-		if (debug == 0x10)		
+-			printk("Found one\n");
++	if ((tmpCStat & TLAN_CSTAT_FRM_CMP) && !retrieve)
++	  return 1;
+ 
+-		/* Get irq from board */
+-		switch (inb(ioaddr + 0xCC0)) {
+-			case(0x10):
+-				irq=5;
+-				break;
+-			case(0x20):
+-				irq=9;
+-				break;
+-			case(0x40):
+-				irq=10;
+-				break;
+-			case(0x80):
+-				irq=11;
+-				break;
+-			default:
+-				goto out;
+-		}               
+-		
+-		
+-		/* Setup the newly found eisa adapter */
+-		rc = TLan_probe1( NULL, ioaddr, irq,
+-					12, NULL);
+-		continue;
+-		
+-		out:
+-			if (debug == 0x10)
+-				printk("None found\n");
+-			continue;
+-
+-		out2:	if (debug == 0x10)
+-				printk("Card found but it is not enabled, skipping\n");
+-			continue;
+-		
+-	}
++	outw(host_int, BASE + TLAN_HOST_INT);
+ 
+-} /* TLan_EisaProbe */
++	if (!(tmpCStat & TLAN_CSTAT_FRM_CMP))
++		return 0;
+ 
+-	
++	/* printf("PI-1: 0x%hX\n", host_int); */
++	if (tmpCStat & TLAN_CSTAT_EOC)
++		eoc = 1;
+ 
+-	/***************************************************************
+-	 *	TLan_Init
+-	 *
+-	 *	Returns:
+-	 *		0 on success, error code otherwise.
+-	 *	Parms:
+-	 *		dev	The structure of the device to be
+-	 *			init'ed.
+-	 *
+-	 *	This function completes the initialization of the
+-	 *	device structure and driver.  It reserves the IO
+-	 *	addresses, allocates memory for the lists and bounce
+-	 *	buffers, retrieves the MAC address from the eeprom
+-	 *	and assignes the device's methods.
+-	 *	
+-	 **************************************************************/
++	framesize = rx_ring[entry].frameSize;
+ 
+-static int TLan_Init( struct net_device *dev )
+-{
+-	int		dma_size;
+-	int 		err;
+-	int		i;
+-	TLanPrivateInfo	*priv;
++	nic->packetlen = framesize;
+ 
+-	priv = dev->priv;
+-	
+-	if (!priv->is_eisa)	/* EISA devices have already requested IO */
+-		if (!request_region( dev->base_addr, 0x10, TLanSignature )) {
+-			printk(KERN_ERR "TLAN: %s: IO port region 0x%lx size 0x%x in use.\n",
+-				dev->name,
+-				dev->base_addr,
+-				0x10 );
+-			return -EIO;
++#ifdef EBDEBUG
++     printf(".%d.", framesize); 
++#endif
++     
++	memcpy(nic->packet, rxb +
++	       (priv->cur_rx * TLAN_MAX_FRAME_SIZE), nic->packetlen);
++
++	rx_ring[entry].cStat = 0;
++#ifdef EBDEBUG
++	//hex_dump(nic->packet, nic->packetlen);
++	printf("%d", entry);  
++#endif
++	entry = (entry + 1) % TLAN_NUM_RX_LISTS;
++	priv->cur_rx = entry;
++	if (eoc) {
++		if ((rx_ring[entry].cStat & TLAN_CSTAT_READY) ==
++		    TLAN_CSTAT_READY) {
++			ack |= TLAN_HC_GO | TLAN_HC_RT;
++			host_cmd = TLAN_HC_ACK | ack | 0x001C0000;
++			outl(host_cmd, BASE + TLAN_HOST_CMD);
+ 		}
+-	
+-	if ( bbuf ) {
+-		dma_size = ( TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS )
+-	           * ( sizeof(TLanList) + TLAN_MAX_FRAME_SIZE );
+ 	} else {
+-		dma_size = ( TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS )
+-	           * ( sizeof(TLanList) );
+-	}
+-	priv->dmaStorage = kmalloc(dma_size, GFP_KERNEL | GFP_DMA);
+-	if ( priv->dmaStorage == NULL ) {
+-		printk(KERN_ERR "TLAN:  Could not allocate lists and buffers for %s.\n",
+-			dev->name );
+-		release_region( dev->base_addr, 0x10 );
+-		return -ENOMEM;
+-	}
+-	memset( priv->dmaStorage, 0, dma_size );
+-	priv->rxList = (TLanList *) 
+-		       ( ( ( (u32) priv->dmaStorage ) + 7 ) & 0xFFFFFFF8 );
+-	priv->txList = priv->rxList + TLAN_NUM_RX_LISTS;
+-	if ( bbuf ) {
+-		priv->rxBuffer = (u8 *) ( priv->txList + TLAN_NUM_TX_LISTS );
+-		priv->txBuffer = priv->rxBuffer
+-				 + ( TLAN_NUM_RX_LISTS * TLAN_MAX_FRAME_SIZE );
+-	}
+-
+-	err = 0;
+-	for ( i = 0;  i < 6 ; i++ )
+-		err |= TLan_EeReadByte( dev,
+-					(u8) priv->adapter->addrOfs + i,
+-					(u8 *) &dev->dev_addr[i] );
+-	if ( err ) {
+-		printk(KERN_ERR "TLAN: %s: Error reading MAC from eeprom: %d\n",
+-			dev->name,
+-			err );
+-	}
+-	dev->addr_len = 6;
+-	
+-	/* Device methods */
+-	dev->open = &TLan_Open;
+-	dev->hard_start_xmit = &TLan_StartTx;
+-	dev->stop = &TLan_Close;
+-	dev->get_stats = &TLan_GetStats;
+-	dev->set_multicast_list = &TLan_SetMulticastList;
+-	dev->do_ioctl = &TLan_ioctl;
+-	dev->tx_timeout = &TLan_tx_timeout;
+-	dev->watchdog_timeo = TX_TIMEOUT;
+-
+-	return 0;
+-
+-} /* TLan_Init */
+-
+-	/***************************************************************
+-	 *	TLan_Open
+-	 *
+-	 *	Returns:
+-	 *		0 on success, error code otherwise.
+-	 *	Parms:
+-	 *		dev	Structure of device to be opened.
+-	 *
+-	 *	This routine puts the driver and TLAN adapter in a
+-	 *	state where it is ready to send and receive packets.
+-	 *	It allocates the IRQ, resets and brings the adapter
+-	 *	out of reset, and allows interrupts.  It also delays
+-	 *	the startup for autonegotiation or sends a Rx GO
+-	 *	command to the adapter, as appropriate.
+-	 *
+-	 **************************************************************/
+-
+-static int TLan_Open( struct net_device *dev )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	int		err;
+-	
+-	priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
+-	err = request_irq( dev->irq, TLan_HandleInterrupt, SA_SHIRQ, TLanSignature, dev );
+-	
+-	if ( err ) {
+-		printk(KERN_ERR "TLAN:  Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq );
+-		return err;
++		host_cmd = TLAN_HC_ACK | ack | (0x000C0000);
++		outl(host_cmd, BASE + TLAN_HOST_CMD);
++#ifdef EBDEBUG
++		printf("AC: 0x%hX\n", inw(BASE + TLAN_CH_PARM)); 
++		host_int = inw(BASE + TLAN_HOST_INT);
++		printf("PI-2: 0x%hX\n", host_int); 
++#endif
+ 	}
+-	
+-	init_timer(&priv->timer);
+-	netif_start_queue(dev);
+-	
+-	/* NOTE: It might not be necessary to read the stats before a
+-			 reset if you don't care what the values are.
+-	*/
+-	TLan_ResetLists( dev );
+-	TLan_ReadAndClearStats( dev, TLAN_IGNORE );
+-	TLan_ResetAdapter( dev );
+-
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Opened.  TLAN Chip Rev: %x\n", dev->name, priv->tlanRev );
+-
+-	return 0;
+-
+-} /* TLan_Open */
+-
+-	/**************************************************************
+-	 *	TLan_ioctl
+-	 *	
+-	 *	Returns:
+-	 *		0 on success, error code otherwise
+-	 *	Params:
+-	 *		dev	structure of device to receive ioctl.
+-	 *		
+-	 *		rq	ifreq structure to hold userspace data.
+-	 *
+-	 *		cmd	ioctl command.
+-	 *
+-	 *
+-	 *************************************************************/
++	refill_rx(nic);
++	return (1);		/* initially as this is called to flush the input */
++}
+ 
+-static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
++static void refill_rx(struct nic *nic __unused)
+ {
+-	TLanPrivateInfo *priv = dev->priv;
+-	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&rq->ifr_data;
+-	u32 phy   = priv->phy[priv->phyNum];
+-	
+-	if (!priv->phyOnline)
+-		return -EAGAIN;
+-
+-	switch(cmd) {
+-	case SIOCGMIIPHY:		/* Get address of MII PHY in use. */
+-	case SIOCDEVPRIVATE:		/* for binary compat, remove in 2.5 */
+-			data->phy_id = phy;
+-
+-	case SIOCGMIIREG:		/* Read MII PHY register. */
+-	case SIOCDEVPRIVATE+1:		/* for binary compat, remove in 2.5 */
+-			TLan_MiiReadReg(dev, data->phy_id & 0x1f, data->reg_num & 0x1f, &data->val_out);
+-			return 0;
+-		
++	int entry = 0;
+ 
+-	case SIOCSMIIREG:		/* Write MII PHY register. */
+-	case SIOCDEVPRIVATE+2:		/* for binary compat, remove in 2.5 */
+-			if (!capable(CAP_NET_ADMIN))
+-				return -EPERM;
+-			TLan_MiiWriteReg(dev, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in);
+-			return 0;
+-		default:
+-			return -EOPNOTSUPP;
++	for (;
++	     (priv->cur_rx - priv->dirty_rx +
++	      TLAN_NUM_RX_LISTS) % TLAN_NUM_RX_LISTS > 0;
++	     priv->dirty_rx = (priv->dirty_rx + 1) % TLAN_NUM_RX_LISTS) {
++		entry = priv->dirty_rx % TLAN_NUM_TX_LISTS;
++		rx_ring[entry].frameSize = TLAN_MAX_FRAME_SIZE;
++		rx_ring[entry].cStat = TLAN_CSTAT_READY;
+ 	}
+-} /* tlan_ioctl */
+-
+-	/***************************************************************
+-	 * 	TLan_tx_timeout
+-	 *
+-	 * 	Returns: nothing
+-	 *
+-	 * 	Params:
+-	 * 		dev	structure of device which timed out 
+-	 * 			during transmit.
+-	 *
+-	 **************************************************************/
+-
+-static void TLan_tx_timeout(struct net_device *dev)
+-{
+-	
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
+-	
+-	/* Ok so we timed out, lets see what we can do about it...*/
+-	TLan_FreeLists( dev );
+-	TLan_ResetLists( dev );		
+-	TLan_ReadAndClearStats( dev, TLAN_IGNORE );
+-	TLan_ResetAdapter( dev );
+-	dev->trans_start = jiffies;
+-	netif_wake_queue( dev );	
+ 
+ }
+-	
+ 
+-	/***************************************************************
+-	 *	TLan_StartTx
+-	 *  
+-	 *	Returns:
+-	 *		0 on success, non-zero on failure.
+-	 *	Parms:
+-	 *		skb	A pointer to the sk_buff containing the
+-	 *			frame to be sent.
+-	 *		dev	The device to send the data on.
+-	 *
+-	 *	This function adds a frame to the Tx list to be sent
+-	 *	ASAP.  First it	verifies that the adapter is ready and
+-	 *	there is room in the queue.  Then it sets up the next
+-	 *	available list, copies the frame to the	corresponding
+-	 *	buffer.  If the adapter Tx channel is idle, it gives
+-	 *	the adapter a Tx Go command on the list, otherwise it
+-	 *	sets the forward address of the previous list to point
+-	 *	to this one.  Then it frees the sk_buff.
+-	 *
+-	 **************************************************************/
++/* #define EBDEBUG */
++/**************************************************************************
++TRANSMIT - Transmit a frame
++***************************************************************************/
++static void tlan_transmit(struct nic *nic, const char *d,	/* Destination */
++			  unsigned int t,	/* Type */
++			  unsigned int s,	/* size */
++			  const char *p)
++{				/* Packet */
++	u16 nstype;
++	u32 to;
++	struct TLanList *tail_list;
++	struct TLanList *head_list;
++	u8 *tail_buffer;
++	u32 ack = 0;
++	u32 host_cmd;
++	int eoc = 0;
++	u16 tmpCStat;
++#ifdef EBDEBUG
++	u16 host_int = inw(BASE + TLAN_HOST_INT);
++#endif
++	int entry = 0;
+ 
+-static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-	TLanList	*tail_list;
+-	u8		*tail_buffer;
+-	int		pad;
+-	unsigned long	flags;
+-
+-	if ( ! priv->phyOnline ) {
+-		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n", dev->name );
+-		dev_kfree_skb_any(skb);
+-		return 0;
++#ifdef EBDEBUG
++	printf("INT0-0x%hX\n", host_int);
++#endif
++
++	if (!priv->phyOnline) {
++		printf("TRANSMIT:  %s PHY is not ready\n", priv->nic_name);
++		return;
+ 	}
+ 
+ 	tail_list = priv->txList + priv->txTail;
+-	
+-	if ( tail_list->cStat != TLAN_CSTAT_UNUSED ) {
+-		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s is busy (Head=%d Tail=%d)\n", dev->name, priv->txHead, priv->txTail );
+-		netif_stop_queue(dev);
++
++	if (tail_list->cStat != TLAN_CSTAT_UNUSED) {
++		printf("TRANSMIT: %s is busy (Head=%d Tail=%d)\n",
++		       priv->nic_name, priv->txList, priv->txTail);
++		tx_ring[entry].cStat = TLAN_CSTAT_UNUSED;
+ 		priv->txBusyCount++;
+-		return 1;
++		return;
+ 	}
+ 
+ 	tail_list->forward = 0;
+ 
+-	if ( bbuf ) {
+-		tail_buffer = priv->txBuffer + ( priv->txTail * TLAN_MAX_FRAME_SIZE );
+-		memcpy( tail_buffer, skb->data, skb->len );
+-	} else {
+-		tail_list->buffer[0].address = virt_to_bus( skb->data );
+-		tail_list->buffer[9].address = (u32) skb;
+-	}
++	tail_buffer = txb + (priv->txTail * TLAN_MAX_FRAME_SIZE);
+ 
+-	pad = TLAN_MIN_FRAME_SIZE - skb->len;
+-
+-	if ( pad > 0 ) {
+-		tail_list->frameSize = (u16) skb->len + pad;
+-		tail_list->buffer[0].count = (u32) skb->len;
+-		tail_list->buffer[1].count = TLAN_LAST_BUFFER | (u32) pad;
+-		tail_list->buffer[1].address = virt_to_bus( TLanPadBuffer );
+-	} else {
+-		tail_list->frameSize = (u16) skb->len;
+-		tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) skb->len;
+-		tail_list->buffer[1].count = 0;
+-		tail_list->buffer[1].address = 0;
+-	}
++	/* send the packet to destination */
++	memcpy(tail_buffer, d, ETH_ALEN);
++	memcpy(tail_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN);
++	nstype = htons((u16) t);
++	memcpy(tail_buffer + 2 * ETH_ALEN, (u8 *) & nstype, 2);
++	memcpy(tail_buffer + ETH_HLEN, p, s);
++
++	s += ETH_HLEN;
++	s &= 0x0FFF;
++	while (s < ETH_ZLEN)
++		tail_buffer[s++] = '\0';
++
++	/*=====================================================*/
++	/* Receive
++	 * 0000 0000 0001 1100
++	 * 0000 0000 0000 1100
++	 * 0000 0000 0000 0011 = 0x0003
++	 *
++	 * 0000 0000 0000 0000 0000 0000 0000 0011
++	 * 0000 0000 0000 1100 0000 0000 0000 0000 = 0x000C0000
++	 *
++	 * Transmit
++	 * 0000 0000 0001 1100
++	 * 0000 0000 0000 0100
++	 * 0000 0000 0000 0001 = 0x0001
++	 *
++	 * 0000 0000 0000 0000 0000 0000 0000 0001
++	 * 0000 0000 0000 0100 0000 0000 0000 0000 = 0x00040000
++	 * */
++
++	/* Setup the transmit descriptor */
++	tail_list->frameSize = (u16) s;
++	tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) s;
++	tail_list->buffer[1].count = 0;
++	tail_list->buffer[1].address = 0;
+ 
+-	spin_lock_irqsave(&priv->lock, flags);
+ 	tail_list->cStat = TLAN_CSTAT_READY;
+-	if ( ! priv->txInProgress ) {
++
++#ifdef EBDEBUG
++	host_int = inw(BASE + TLAN_HOST_INT);
++	printf("INT1-0x%hX\n", host_int);
++#endif
++
++	if (!priv->txInProgress) {
+ 		priv->txInProgress = 1;
+-		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Starting TX on buffer %d\n", priv->txTail );
+-		outl( virt_to_bus( tail_list ), dev->base_addr + TLAN_CH_PARM );
+-		outl( TLAN_HC_GO, dev->base_addr + TLAN_HOST_CMD );
++		outl(virt_to_le32desc(tail_list), BASE + TLAN_CH_PARM);
++		outl(TLAN_HC_GO, BASE + TLAN_HOST_CMD);
+ 	} else {
+-		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Adding buffer %d to TX channel\n", priv->txTail );
+-		if ( priv->txTail == 0 ) {
+-			( priv->txList + ( TLAN_NUM_TX_LISTS - 1 ) )->forward = virt_to_bus( tail_list );
++		if (priv->txTail == 0) {
++#ifdef EBDEBUG
++			printf("Out buffer\n");
++#endif
++			(priv->txList + (TLAN_NUM_TX_LISTS - 1))->forward =
++			    virt_to_le32desc(tail_list);
+ 		} else {
+-			( priv->txList + ( priv->txTail - 1 ) )->forward = virt_to_bus( tail_list );
++#ifdef EBDEBUG
++			printf("Fix this \n");
++#endif
++			(priv->txList + (priv->txTail - 1))->forward =
++			    virt_to_le32desc(tail_list);
+ 		}
+ 	}
+-	spin_unlock_irqrestore(&priv->lock, flags);
+-
+-	CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS );
+-
+-	if ( bbuf )
+-		dev_kfree_skb_any(skb);
+-		
+-	dev->trans_start = jiffies;
+-	return 0;
+-
+-} /* TLan_StartTx */
+-
+-	/***************************************************************
+-	 *	TLan_HandleInterrupt
+-	 *  
+-	 *	Returns:	
+-	 *		Nothing
+-	 *	Parms:
+-	 *		irq	The line on which the interrupt
+-	 *			occurred.
+-	 *		dev_id	A pointer to the device assigned to
+-	 *			this irq line.
+-	 *		regs	???
+-	 *
+-	 *	This function handles an interrupt generated by its
+-	 *	assigned TLAN adapter.  The function deactivates
+-	 *	interrupts on its adapter, records the type of
+-	 *	interrupt, executes the appropriate subhandler, and
+-	 *	acknowdges the interrupt to the adapter (thus
+-	 *	re-enabling adapter interrupts.
+-	 *
+-	 **************************************************************/
+-
+-static void TLan_HandleInterrupt(int irq, void *dev_id, struct pt_regs *regs)
+-{
+-	u32		ack;
+-	struct net_device	*dev;
+-	u32		host_cmd;
+-	u16		host_int;
+-	int		type;
+-	TLanPrivateInfo *priv;
+-
+-	dev = dev_id;
+-	priv = dev->priv;
+-
+-	spin_lock(&priv->lock);
+-
+-	host_int = inw( dev->base_addr + TLAN_HOST_INT );
+-	outw( host_int, dev->base_addr + TLAN_HOST_INT );
++	
++	CIRC_INC(priv->txTail, TLAN_NUM_TX_LISTS);
+ 
+-	type = ( host_int & TLAN_HI_IT_MASK ) >> 2;
++#ifdef EBDEBUG
++	host_int = inw(BASE + TLAN_HOST_INT);
++	printf("INT2-0x%hX\n", host_int);
++#endif
+ 
+-	ack = TLanIntVector[type]( dev, host_int );
++	to = currticks() + TX_TIME_OUT;
++	while ((tail_list->cStat == TLAN_CSTAT_READY) && currticks() < to);
+ 
+-	if ( ack ) {
+-		host_cmd = TLAN_HC_ACK | ack | ( type << 18 );
+-		outl( host_cmd, dev->base_addr + TLAN_HOST_CMD );
++	head_list = priv->txList + priv->txHead;
++	while (((tmpCStat = head_list->cStat) & TLAN_CSTAT_FRM_CMP) 
++			&& (ack < 255)) {
++		ack++;
++		if(tmpCStat & TLAN_CSTAT_EOC)
++			eoc =1;
++		head_list->cStat = TLAN_CSTAT_UNUSED;
++		CIRC_INC(priv->txHead, TLAN_NUM_TX_LISTS);
++		head_list = priv->txList + priv->txHead;
++		
+ 	}
++	if(!ack)
++		printf("Incomplete TX Frame\n");
+ 
+-	spin_unlock(&priv->lock);
+-
+-} /* TLan_HandleInterrupts */
+-
+-	/***************************************************************
+-	 *	TLan_Close
+-	 *  
+-	 * 	Returns:
+-	 *		An error code.
+-	 *	Parms:
+-	 *		dev	The device structure of the device to
+-	 *			close.
+-	 *
+-	 *	This function shuts down the adapter.  It records any
+-	 *	stats, puts the adapter into reset state, deactivates
+-	 *	its time as needed, and	frees the irq it is using.
+-	 *
+-	 **************************************************************/
+-
+-static int TLan_Close(struct net_device *dev)
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-
+-	netif_stop_queue(dev);
+-	priv->neg_be_verbose = 0;
+-
+-	TLan_ReadAndClearStats( dev, TLAN_RECORD );
+-	outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
+-	if ( priv->timer.function != NULL ) {
+-		del_timer_sync( &priv->timer );
+-		priv->timer.function = NULL;
++	if(eoc) {
++		head_list = priv->txList + priv->txHead;
++		if ((head_list->cStat & TLAN_CSTAT_READY) == TLAN_CSTAT_READY) {
++			outl(virt_to_le32desc(head_list), BASE + TLAN_CH_PARM);
++			ack |= TLAN_HC_GO;
++		} else {
++			priv->txInProgress = 0;
++		}
+ 	}
+-	
+-	free_irq( dev->irq, dev );
+-	TLan_FreeLists( dev );
+-	TLAN_DBG( TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name );
+-
+-	return 0;
+-
+-} /* TLan_Close */
+-
+-	/***************************************************************
+-	 *	TLan_GetStats
+-	 *  
+-	 *	Returns:
+-	 *		A pointer to the device's statistics structure.
+-	 *	Parms:
+-	 *		dev	The device structure to return the
+-	 *			stats for.
+-	 *
+-	 *	This function updates the devices statistics by reading
+-	 *	the TLAN chip's onboard registers.  Then it returns the
+-	 *	address of the statistics structure.
+-	 *
+-	 **************************************************************/
+-
+-static struct net_device_stats *TLan_GetStats( struct net_device *dev )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	int i;
+-
+-	/* Should only read stats if open ? */
+-	TLan_ReadAndClearStats( dev, TLAN_RECORD );
+-
+-	TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  %s EOC count = %d\n", dev->name, priv->rxEocCount );
+-	TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s Busy count = %d\n", dev->name, priv->txBusyCount );
+-	if ( debug & TLAN_DEBUG_GNRL ) {
+-		TLan_PrintDio( dev->base_addr );
+-		TLan_PhyPrint( dev );		
+-	}
+-	if ( debug & TLAN_DEBUG_LIST ) {
+-		for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ )
+-			TLan_PrintList( priv->rxList + i, "RX", i );
+-		for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ )
+-			TLan_PrintList( priv->txList + i, "TX", i );
++	if(ack) {
++		host_cmd = TLAN_HC_ACK | ack;
++		outl(host_cmd, BASE + TLAN_HOST_CMD);
+ 	}
+ 	
+-	return ( &( (TLanPrivateInfo *) dev->priv )->stats );
+-
+-} /* TLan_GetStats */
+-
+-	/***************************************************************
+-	 *	TLan_SetMulticastList
+-	 *  
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		dev	The device structure to set the
+-	 *			multicast list for.
+-	 *
+-	 *	This function sets the TLAN adaptor to various receive
+-	 *	modes.  If the IFF_PROMISC flag is set, promiscuous
+-	 *	mode is acitviated.  Otherwise,	promiscuous mode is
+-	 *	turned off.  If the IFF_ALLMULTI flag is set, then
+-	 *	the hash table is set to receive all group addresses.
+-	 *	Otherwise, the first three multicast addresses are
+-	 *	stored in AREG_1-3, and the rest are selected via the
+-	 *	hash table, as necessary.
+-	 *
+-	 **************************************************************/
+-
+-static void TLan_SetMulticastList( struct net_device *dev )
+-{	
+-	struct dev_mc_list	*dmi = dev->mc_list;
+-	u32			hash1 = 0;
+-	u32			hash2 = 0;
+-	int			i;
+-	u32			offset;
+-	u8			tmp;
+-
+-	if ( dev->flags & IFF_PROMISC ) {
+-		tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
+-		TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, tmp | TLAN_NET_CMD_CAF );
+-	} else {
+-		tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
+-		TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF );
+-		if ( dev->flags & IFF_ALLMULTI ) {
+-			for ( i = 0; i < 3; i++ ) 
+-				TLan_SetMac( dev, i + 1, NULL );
+-			TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, 0xFFFFFFFF );
+-			TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, 0xFFFFFFFF );
++	if(priv->tlanRev < 0x30 ) {
++		ack = 1;
++		head_list = priv->txList + priv->txHead;
++		if ((head_list->cStat & TLAN_CSTAT_READY) == TLAN_CSTAT_READY) {
++			outl(virt_to_le32desc(head_list), BASE + TLAN_CH_PARM);
++			ack |= TLAN_HC_GO;
+ 		} else {
+-			for ( i = 0; i < dev->mc_count; i++ ) {
+-				if ( i < 3 ) {
+-					TLan_SetMac( dev, i + 1, (char *) &dmi->dmi_addr );
+-				} else {
+-					offset = TLan_HashFunc( (u8 *) &dmi->dmi_addr );
+-					if ( offset < 32 ) 
+-						hash1 |= ( 1 << offset );
+-					else
+-						hash2 |= ( 1 << ( offset - 32 ) );
+-				}
+-				dmi = dmi->next;
+-			}
+-			for ( ; i < 3; i++ ) 
+-				TLan_SetMac( dev, i + 1, NULL );
+-			TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, hash1 );
+-			TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, hash2 );
++			priv->txInProgress = 0;
+ 		}
++		host_cmd = TLAN_HC_ACK | ack | 0x00140000;
++		outl(host_cmd, BASE + TLAN_HOST_CMD);
++		
+ 	}
++			
++	if (currticks() >= to) {
++		printf("TX Time Out");
++	}
++}
+ 
+-} /* TLan_SetMulticastList */
+-
+-/*****************************************************************************
+-******************************************************************************
+-
+-        ThunderLAN Driver Interrupt Vectors and Table
+-
+-	Please see Chap. 4, "Interrupt Handling" of the "ThunderLAN
+-	Programmer's Guide" for more informations on handling interrupts
+-	generated by TLAN based adapters.  
+-
+-******************************************************************************
+-*****************************************************************************/
+-
+-	/***************************************************************
+-	 *	TLan_HandleInvalid
+-	 *
+-	 *	Returns:
+-	 *		0
+-	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This function handles invalid interrupts.  This should
+-	 *	never happen unless some other adapter is trying to use
+-	 *	the IRQ line assigned to the device.
+-	 *
+-	 **************************************************************/
+-
+-u32 TLan_HandleInvalid( struct net_device *dev, u16 host_int )
++/**************************************************************************
++DISABLE - Turn off ethernet interface
++***************************************************************************/
++#ifdef EB51
++static void tlan_disable(struct dev *dev __unused)
++#else
++static void tlan_disable(struct nic *nic __unused)
++#endif
+ {
+-	/* printk( "TLAN:  Invalid interrupt on %s.\n", dev->name ); */
+-	return 0;
+-
+-} /* TLan_HandleInvalid */
+-
+-	/***************************************************************
+-	 *	TLan_HandleTxEOF
+-	 *
+-	 *	Returns:
+-	 *		1
+-	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This function handles Tx EOF interrupts which are raised
+-	 *	by the adapter when it has completed sending the
+-	 *	contents of a buffer.  If detemines which list/buffer
+-	 *	was completed and resets it.  If the buffer was the last
+-	 *	in the channel (EOC), then the function checks to see if
+-	 *	another buffer is ready to send, and if so, sends a Tx
+-	 *	Go command.  Finally, the driver activates/continues the
+-	 *	activity LED.
++	/* put the card in its initial state */
++	/* This function serves 3 purposes.
++	 * This disables DMA and interrupts so we don't receive
++	 *  unexpected packets or interrupts from the card after
++	 *  etherboot has finished.
++	 * This frees resources so etherboot may use
++	 *  this driver on another interface
++	 * This allows etherboot to reinitialize the interface
++	 *  if something is something goes wrong.
+ 	 *
+-	 **************************************************************/
++	 */
++	outl(TLAN_HC_AD_RST, BASE + TLAN_HOST_CMD);
++}
+ 
+-u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
++/**************************************************************************
++IRQ - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void tlan_irq(struct nic *nic __unused, irq_action_t action __unused)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	int		eoc = 0;
+-	TLanList	*head_list;
+-	u32		ack = 0;
+-	u16		tmpCStat;
+-	
+-	TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOF (Head=%d Tail=%d)\n", priv->txHead, priv->txTail );
+-	head_list = priv->txList + priv->txHead;
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
+ 
+-	while (((tmpCStat = head_list->cStat ) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
+-		ack++;
+-		if ( ! bbuf ) {
+-			dev_kfree_skb_any( (struct sk_buff *) head_list->buffer[9].address );
+-			head_list->buffer[9].address = 0;
+-		}
+-	
+-		if ( tmpCStat & TLAN_CSTAT_EOC )
+-			eoc = 1;
+-			
+-		priv->stats.tx_bytes += head_list->frameSize;
++static void TLan_SetMulticastList(struct nic *nic) {
++	int i;
++	u8 tmp;
+ 
+-		head_list->cStat = TLAN_CSTAT_UNUSED;
+-		netif_start_queue(dev);		
+-		CIRC_INC( priv->txHead, TLAN_NUM_TX_LISTS ); 
+-		head_list = priv->txList + priv->txHead;
+-	}
++	/* !IFF_PROMISC */
++	tmp = TLan_DioRead8(BASE, TLAN_NET_CMD);
++	TLan_DioWrite8(BASE, TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF);
++
++	/* IFF_ALLMULTI */
++	for(i = 0; i< 3; i++)
++		TLan_SetMac(nic, i + 1, NULL);
++	TLan_DioWrite32(BASE, TLAN_HASH_1, 0xFFFFFFFF);
++	TLan_DioWrite32(BASE, TLAN_HASH_2, 0xFFFFFFFF);
+ 
+-	if (!ack)
+-		printk(KERN_INFO "TLAN: Received interrupt for uncompleted TX frame.\n");
+-	
+-	if ( eoc ) {
+-		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d)\n", priv->txHead, priv->txTail );
+-		head_list = priv->txList + priv->txHead;
+-		if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
+-			outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
+-			ack |= TLAN_HC_GO;
+-		} else {
+-			priv->txInProgress = 0;
+-		}
+-	}
+ 	
+-	if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
+-		TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
+-		if ( priv->timer.function == NULL ) {
+-			 priv->timer.function = &TLan_Timer;
+-			 priv->timer.data = (unsigned long) dev;
+-			 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
+-			 priv->timerSetAt = jiffies;
+-			 priv->timerType = TLAN_TIMER_ACTIVITY;
+-			 add_timer(&priv->timer);
+-		} else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
+-			priv->timerSetAt = jiffies;
++}
++/**************************************************************************
++PROBE - Look for an adapter, this routine's visible to the outside
++***************************************************************************/
++
++#define board_found 1
++#define valid_link 0
++#ifdef EB51
++static int tlan_probe(struct dev *dev, struct pci_device *pci)
++{
++	struct nic *nic = (struct nic *) dev;
++#else
++struct nic *tlan_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
++{
++#endif
++		u16 data = 0;
++	int err;
++	int i;
++
++	if (pci->ioaddr == 0)
++		return 0;
++
++	nic->irqno  = 0;
++	nic->ioaddr = pci->ioaddr & ~3;
++
++	BASE = pci->ioaddr;
++	printf("\n");
++	printf("tlan.c: %s, %s\n", drv_version, drv_date);
++	printf("%s: Probing for Vendor 0x%hX, Device 0x%hX",
++	       pci->name, pci->vendor, pci->dev_id);
++
++
++	/* I really must find out what this does */
++	adjust_pci_device(pci);
++
++	/* Point to private storage */
++	priv = &TLanPrivateInfo;
++	/* Figure out which chip we're dealing with */
++	i = 0;
++	chip_idx = -1;
++
++	while (tlan_pci_tbl[i].name) {
++		if ((((u32) pci->dev_id << 16) | pci->vendor) ==
++		    (tlan_pci_tbl[i].id.pci & 0xffffffff)) {
++			chip_idx = i;
++			break;
+ 		}
++		i++;
+ 	}
+ 
+-	return ack;
++	priv->vendor_id = pci->vendor;
++	priv->dev_id = pci->dev_id;
++	priv->nic_name = pci->name;
++	priv->eoc = 0;
+ 
+-} /* TLan_HandleTxEOF */
++	err = 0;
++	for (i = 0; i < 6; i++)
++		err |= TLan_EeReadByte(BASE,
++				       (u8) tlan_pci_tbl[chip_idx].
++				       addrOfs + i,
++				       (u8 *) & nic->node_addr[i]);
++	if (err) {
++		printf("TLAN: %s: Error reading MAC from eeprom: %d\n",
++		       pci->name, err);
++	} else
++		printf("\nAddress: %!\n", nic->node_addr);
+ 
+-	/***************************************************************
+-	 *	TLan_HandleStatOverflow
+-	 *
+-	 *	Returns:
+-	 *		1
+-	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This function handles the Statistics Overflow interrupt
+-	 *	which means that one or more of the TLAN statistics
+-	 *	registers has reached 1/2 capacity and needs to be read.
+-	 *
+-	 **************************************************************/
++	priv->tlanRev = TLan_DioRead8(BASE, TLAN_DEF_REVISION);
++	printf("\nRevision = 0x%hX\n", priv->tlanRev);
+ 
+-u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
+-{
+-	TLan_ReadAndClearStats( dev, TLAN_RECORD );
++	TLan_ResetLists(nic);
++	TLan_ResetAdapter(nic);
++/*
++	data = inl(BASE + TLAN_HOST_CMD);
++	data |= TLAN_HC_EOC;
++	outw(data, BASE + TLAN_HOST_CMD);
++*/
++
++	data = inl(BASE + TLAN_HOST_CMD);
++	data |= TLAN_HC_INT_OFF;
++	outw(data, BASE + TLAN_HOST_CMD);
+ 
++	TLan_SetMulticastList(nic);
++	udelay(100); 
++	priv->txList = tx_ring;
++	priv->rxList = rx_ring;
++/*	if (board_found && valid_link)
++	{*/
++	/* point to NIC specific routines */
++#ifdef EB51
++	dev->disable = tlan_disable;
++	nic->poll = tlan_poll;
++	nic->transmit = tlan_transmit;
++	nic->irq    = tlan_irq;
+ 	return 1;
++#else
++	nic->disable = tlan_disable;
++	nic->poll = tlan_poll;
++	nic->transmit = tlan_transmit;
++	nic->irq    = tlan_irq;
++	return nic;
++#endif
++}
++
++
++/*****************************************************************************
++******************************************************************************
++
++	ThunderLAN Driver Eeprom routines
++
++	The Compaq Netelligent 10 and 10/100 cards use a Microchip 24C02A
++	EEPROM.  These functions are based on information in Microchip's
++	data sheet.  I don't know how well this functions will work with
++	other EEPROMs.
++
++******************************************************************************
++*****************************************************************************/
+ 
+-} /* TLan_HandleStatOverflow */
+ 
+ 	/***************************************************************
+-	 *	TLan_HandleRxEOF
++	 *	TLan_EeSendStart
+ 	 *
+ 	 *	Returns:
+-	 *		1
++	 *		Nothing
+ 	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This function handles the Rx EOF interrupt which
+-	 *	indicates a frame has been received by the adapter from
+-	 *	the net and the frame has been transferred to memory.
+-	 *	The function determines the bounce buffer the frame has
+-	 *	been loaded into, creates a new sk_buff big enough to
+-	 *	hold the frame, and sends it to protocol stack.  It
+-	 *	then resets the used buffer and appends it to the end
+-	 *	of the list.  If the frame was the last in the Rx
+-	 *	channel (EOC), the function restarts the receive channel
+-	 *	by sending an Rx Go command to the adapter.  Then it
+-	 *	activates/continues the activity LED.
++	 *		io_base		The IO port base address for the
++	 *				TLAN device with the EEPROM to
++	 *				use.
++	 *
++	 *	This function sends a start cycle to an EEPROM attached
++	 *	to a TLAN chip.
+ 	 *
+ 	 **************************************************************/
+ 
+-u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
++void TLan_EeSendStart(u16 io_base)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u32		ack = 0;
+-	int		eoc = 0;
+-	u8		*head_buffer;
+-	TLanList	*head_list;
+-	struct sk_buff	*skb;
+-	TLanList	*tail_list;
+-	void		*t;
+-	u32		frameSize;
+-	u16		tmpCStat;
+-
+-	TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOF (Head=%d Tail=%d)\n", priv->rxHead, priv->rxTail );
+-	head_list = priv->rxList + priv->rxHead;
+-	
+-	while (((tmpCStat = head_list->cStat) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
+-		frameSize = head_list->frameSize;
+-		ack++;
+-		if (tmpCStat & TLAN_CSTAT_EOC)
+-			eoc = 1;
+-		
+-		if (bbuf) {
+-			skb = dev_alloc_skb(frameSize + 7);
+-			if (skb == NULL)
+-				printk(KERN_INFO "TLAN: Couldn't allocate memory for received data.\n");
+-			else {
+-				head_buffer = priv->rxBuffer + (priv->rxHead * TLAN_MAX_FRAME_SIZE);
+-				skb->dev = dev;
+-				skb_reserve(skb, 2);
+-				t = (void *) skb_put(skb, frameSize);
+-		
+-				priv->stats.rx_bytes += head_list->frameSize;
+-
+-				memcpy( t, head_buffer, frameSize );
+-				skb->protocol = eth_type_trans( skb, dev );
+-				netif_rx( skb );
+-			}
+-		} else {
+-			struct sk_buff *new_skb;
+-		
+-			/*
+-		 	*	I changed the algorithm here. What we now do
+-		 	*	is allocate the new frame. If this fails we
+-		 	*	simply recycle the frame.
+-		 	*/
+-		
+-			new_skb = dev_alloc_skb( TLAN_MAX_FRAME_SIZE + 7 );
+-			
+-			if ( new_skb != NULL ) {
+-				/* If this ever happened it would be a problem */
+-				/* not any more - ac */
+-				skb = (struct sk_buff *) head_list->buffer[9].address;
+-				skb_trim( skb, frameSize );
+-
+-				priv->stats.rx_bytes += frameSize;
++	u16 sio;
+ 
+-				skb->protocol = eth_type_trans( skb, dev );
+-				netif_rx( skb );
+-	
+-				new_skb->dev = dev;
+-				skb_reserve( new_skb, 2 );
+-				t = (void *) skb_put( new_skb, TLAN_MAX_FRAME_SIZE );
+-				head_list->buffer[0].address = virt_to_bus( t );
+-				head_list->buffer[8].address = (u32) t;
+-				head_list->buffer[9].address = (u32) new_skb;
+-			} else 
+-				printk(KERN_WARNING "TLAN:  Couldn't allocate memory for received data.\n" );
+-		}
++	outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
++	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
+ 
+-		head_list->forward = 0;
+-		head_list->cStat = 0;
+-		tail_list = priv->rxList + priv->rxTail;
+-		tail_list->forward = virt_to_bus( head_list );
+-
+-		CIRC_INC( priv->rxHead, TLAN_NUM_RX_LISTS );
+-		CIRC_INC( priv->rxTail, TLAN_NUM_RX_LISTS );
+-		head_list = priv->rxList + priv->rxHead;
+-	}
++	TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++	TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
++	TLan_SetBit(TLAN_NET_SIO_ETXEN, sio);
++	TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);
++	TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
+ 
+-	if (!ack)
+-		printk(KERN_INFO "TLAN: Received interrupt for uncompleted RX frame.\n");
+-	
++}				/* TLan_EeSendStart */
+ 
+-	if ( eoc ) { 
+-		TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOC (Head=%d Tail=%d)\n", priv->rxHead, priv->rxTail );
+-		head_list = priv->rxList + priv->rxHead;
+-		outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
+-		ack |= TLAN_HC_GO | TLAN_HC_RT;
+-		priv->rxEocCount++;
+-	}
+-
+-	if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
+-		TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
+-		if ( priv->timer.function == NULL )  {
+-			priv->timer.function = &TLan_Timer;
+-			priv->timer.data = (unsigned long) dev;
+-			priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
+-			priv->timerSetAt = jiffies;
+-			priv->timerType = TLAN_TIMER_ACTIVITY;
+-			add_timer(&priv->timer);
+-		} else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
+-			priv->timerSetAt = jiffies;
+-		}
+-	}
+ 
+-	dev->last_rx = jiffies;
+-	
+-	return ack;
+ 
+-} /* TLan_HandleRxEOF */
+ 
+ 	/***************************************************************
+-	 *	TLan_HandleDummy
++	 *	TLan_EeSendByte
+ 	 *
+ 	 *	Returns:
+-	 *		1
+-	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This function handles the Dummy interrupt, which is
+-	 *	raised whenever a test interrupt is generated by setting
+-	 *	the Req_Int bit of HOST_CMD to 1.
++	 *		If the correct ack was received, 0, otherwise 1
++	 *	Parms:	io_base		The IO port base address for the
++	 *				TLAN device with the EEPROM to
++	 *				use.
++	 *		data		The 8 bits of information to
++	 *				send to the EEPROM.
++	 *		stop		If TLAN_EEPROM_STOP is passed, a
++	 *				stop cycle is sent after the
++	 *				byte is sent after the ack is
++	 *				read.
++	 *
++	 *	This function sends a byte on the serial EEPROM line,
++	 *	driving the clock to send each bit. The function then
++	 *	reverses transmission direction and reads an acknowledge
++	 *	bit.
+ 	 *
+ 	 **************************************************************/
+ 
+-u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
++int TLan_EeSendByte(u16 io_base, u8 data, int stop)
+ {
+-	printk( "TLAN:  Test interrupt on %s.\n", dev->name );
+-	return 1;
++	int err;
++	u8 place;
++	u16 sio;
+ 
+-} /* TLan_HandleDummy */
++	outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
++	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
+ 
+-	/***************************************************************
+-	 *	TLan_HandleTxEOC
+-	 *
+-	 *	Returns:
+-	 *		1
+-	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This driver is structured to determine EOC occurances by
+-	 *	reading the CSTAT member of the list structure.  Tx EOC
+-	 *	interrupts are disabled via the DIO INTDIS register.
+-	 *	However, TLAN chips before revision 3.0 didn't have this
+-	 *	functionality, so process EOC events if this is the
+-	 *	case.
+-	 *
+-	 **************************************************************/
++	/* Assume clock is low, tx is enabled; */
++	for (place = 0x80; place != 0; place >>= 1) {
++		if (place & data)
++			TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
++		else
++			TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);
++		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
++	}
++	TLan_ClearBit(TLAN_NET_SIO_ETXEN, sio);
++	TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++	err = TLan_GetBit(TLAN_NET_SIO_EDATA, sio);
++	TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
++	TLan_SetBit(TLAN_NET_SIO_ETXEN, sio);
+ 
+-u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
+-{
+-	TLanPrivateInfo	*priv = dev->priv;
+-	TLanList		*head_list;
+-	u32			ack = 1;
+-	
+-	host_int = 0;
+-	if ( priv->tlanRev < 0x30 ) {
+-		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d) -- IRQ\n", priv->txHead, priv->txTail );
+-		head_list = priv->txList + priv->txHead;
+-		if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
+-			netif_stop_queue(dev);
+-			outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
+-			ack |= TLAN_HC_GO;
+-		} else {
+-			priv->txInProgress = 0;
+-		}
++	if ((!err) && stop) {
++		TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);	/* STOP, raise data while clock is high */
++		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++		TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
+ 	}
+ 
+-	return ack;
++	return (err);
++
++}				/* TLan_EeSendByte */
++
++
+ 
+-} /* TLan_HandleTxEOC */
+ 
+ 	/***************************************************************
+-	 *	TLan_HandleStatusCheck
++	 *	TLan_EeReceiveByte
+ 	 *
+ 	 *	Returns:
+-	 *		0 if Adapter check, 1 if Network Status check.
++	 *		Nothing
+ 	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This function handles Adapter Check/Network Status
+-	 *	interrupts generated by the adapter.  It checks the
+-	 *	vector in the HOST_INT register to determine if it is
+-	 *	an Adapter Check interrupt.  If so, it resets the
+-	 *	adapter.  Otherwise it clears the status registers
+-	 *	and services the PHY.
++	 *		io_base		The IO port base address for the
++	 *				TLAN device with the EEPROM to
++	 *				use.
++	 *		data		An address to a char to hold the
++	 *				data sent from the EEPROM.
++	 *		stop		If TLAN_EEPROM_STOP is passed, a
++	 *				stop cycle is sent after the
++	 *				byte is received, and no ack is
++	 *				sent.
++	 *
++	 *	This function receives 8 bits of data from the EEPROM
++	 *	over the serial link.  It then sends and ack bit, or no
++	 *	ack and a stop bit.  This function is used to retrieve
++	 *	data after the address of a byte in the EEPROM has been
++	 *	sent.
+ 	 *
+ 	 **************************************************************/
+ 
+-u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
+-{	
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u32		ack;
+-	u32		error;
+-	u8		net_sts;
+-	u32		phy;
+-	u16		tlphy_ctl;
+-	u16		tlphy_sts;
+-	
+-	ack = 1;
+-	if ( host_int & TLAN_HI_IV_MASK ) {
+-		netif_stop_queue( dev );
+-		error = inl( dev->base_addr + TLAN_CH_PARM );
+-		printk( "TLAN:  %s: Adaptor Error = 0x%x\n", dev->name, error );
+-		TLan_ReadAndClearStats( dev, TLAN_RECORD );
+-		outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
+-		
+-		queue_task(&priv->tlan_tqueue, &tq_immediate);
+-		mark_bh(IMMEDIATE_BH);
+-		
+-		netif_wake_queue(dev);
+-		ack = 0;
+-	} else {
+-		TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Status Check\n", dev->name );
+-		phy = priv->phy[priv->phyNum];
++void TLan_EeReceiveByte(u16 io_base, u8 * data, int stop)
++{
++	u8 place;
++	u16 sio;
+ 
+-		net_sts = TLan_DioRead8( dev->base_addr, TLAN_NET_STS );
+-		if ( net_sts ) {
+-			TLan_DioWrite8( dev->base_addr, TLAN_NET_STS, net_sts );
+-			TLAN_DBG( TLAN_DEBUG_GNRL, "%s:    Net_Sts = %x\n", dev->name, (unsigned) net_sts );
+-		}
+-		if ( ( net_sts & TLAN_NET_STS_MIRQ ) &&  ( priv->phyNum == 0 ) ) {
+-			TLan_MiiReadReg( dev, phy, TLAN_TLPHY_STS, &tlphy_sts );
+-			TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
+-        		if ( ! ( tlphy_sts & TLAN_TS_POLOK ) && ! ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
+-                		tlphy_ctl |= TLAN_TC_SWAPOL;
+-                		TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
+-        		} else if ( ( tlphy_sts & TLAN_TS_POLOK ) && ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
+-                		tlphy_ctl &= ~TLAN_TC_SWAPOL;
+-                		TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
+-        		}
++	outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
++	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
++	*data = 0;
+ 
+-			if (debug) {
+-				TLan_PhyPrint( dev );		
+-			}
+-		}
++	/* Assume clock is low, tx is enabled; */
++	TLan_ClearBit(TLAN_NET_SIO_ETXEN, sio);
++	for (place = 0x80; place; place >>= 1) {
++		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++		if (TLan_GetBit(TLAN_NET_SIO_EDATA, sio))
++			*data |= place;
++		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
++	}
++
++	TLan_SetBit(TLAN_NET_SIO_ETXEN, sio);
++	if (!stop) {
++		TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);	/* Ack = 0 */
++		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
++	} else {
++		TLan_SetBit(TLAN_NET_SIO_EDATA, sio);	/* No ack = 1 (?) */
++		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
++		TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);	/* STOP, raise data while clock is high */
++		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
++		TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
+ 	}
+ 
+-	return ack;
++}				/* TLan_EeReceiveByte */
++
+ 
+-} /* TLan_HandleStatusCheck */
+ 
+ 	/***************************************************************
+-	 *	TLan_HandleRxEOC
++	 *	TLan_EeReadByte
+ 	 *
+ 	 *	Returns:
+-	 *		1
++	 *		No error = 0, else, the stage at which the error
++	 *		occurred.
+ 	 *	Parms:
+-	 *		dev		Device assigned the IRQ that was
+-	 *				raised.
+-	 *		host_int	The contents of the HOST_INT
+-	 *				port.
+-	 *
+-	 *	This driver is structured to determine EOC occurances by
+-	 *	reading the CSTAT member of the list structure.  Rx EOC
+-	 *	interrupts are disabled via the DIO INTDIS register.
+-	 *	However, TLAN chips before revision 3.0 didn't have this
+-	 *	CSTAT member or a INTDIS register, so if this chip is
+-	 *	pre-3.0, process EOC interrupts normally.
++	 *		io_base		The IO port base address for the
++	 *				TLAN device with the EEPROM to
++	 *				use.
++	 *		ee_addr		The address of the byte in the
++	 *				EEPROM whose contents are to be
++	 *				retrieved.
++	 *		data		An address to a char to hold the
++	 *				data obtained from the EEPROM.
++	 *
++	 *	This function reads a byte of information from an byte
++	 *	cell in the EEPROM.
+ 	 *
+ 	 **************************************************************/
+ 
+-u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
++int TLan_EeReadByte(u16 io_base, u8 ee_addr, u8 * data)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	TLanList	*head_list;
+-	u32		ack = 1;
++	int err;
++	int ret = 0;
+ 
+-	if (  priv->tlanRev < 0x30 ) {
+-		TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOC (Head=%d Tail=%d) -- IRQ\n", priv->rxHead, priv->rxTail );
+-		head_list = priv->rxList + priv->rxHead;
+-		outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
+-		ack |= TLAN_HC_GO | TLAN_HC_RT;
+-		priv->rxEocCount++;
++
++	TLan_EeSendStart(io_base);
++	err = TLan_EeSendByte(io_base, 0xA0, TLAN_EEPROM_ACK);
++	if (err) {
++		ret = 1;
++		goto fail;
++	}
++	err = TLan_EeSendByte(io_base, ee_addr, TLAN_EEPROM_ACK);
++	if (err) {
++		ret = 2;
++		goto fail;
++	}
++	TLan_EeSendStart(io_base);
++	err = TLan_EeSendByte(io_base, 0xA1, TLAN_EEPROM_ACK);
++	if (err) {
++		ret = 3;
++		goto fail;
+ 	}
++	TLan_EeReceiveByte(io_base, data, TLAN_EEPROM_STOP);
++      fail:
+ 
+-	return ack;
++	return ret;
++
++}				/* TLan_EeReadByte */
+ 
+-} /* TLan_HandleRxEOC */
+ 
+ /*****************************************************************************
+ ******************************************************************************
+ 
+-	ThunderLAN Driver Timer Function
++	ThunderLAN Driver MII Routines
++
++	These routines are based on the information in Chap. 2 of the
++	"ThunderLAN Programmer's Guide", pp. 15-24.
+ 
+ ******************************************************************************
+ *****************************************************************************/
+ 
++
+ 	/***************************************************************
+-	 *	TLan_Timer
++	 *	TLan_MiiReadReg
+ 	 *
+ 	 *	Returns:
+-	 *		Nothing
++	 *		0	if ack received ok
++	 *		1	otherwise.
++	 *
+ 	 *	Parms:
+-	 *		data	A value given to add timer when
+-	 *			add_timer was called.
++	 *		dev		The device structure containing
++	 *				The io address and interrupt count
++	 *				for this device.
++	 *		phy		The address of the PHY to be queried.
++	 *		reg		The register whose contents are to be
++	 *				retreived.
++	 *		val		A pointer to a variable to store the
++	 *				retrieved value.
+ 	 *
+-	 *	This function handles timed functionality for the
+-	 *	TLAN driver.  The two current timer uses are for
+-	 *	delaying for autonegotionation and driving the ACT LED.
+-	 *	-	Autonegotiation requires being allowed about
+-	 *		2 1/2 seconds before attempting to transmit a
+-	 *		packet.  It would be a very bad thing to hang
+-	 *		the kernel this long, so the driver doesn't
+-	 *		allow transmission 'til after this time, for
+-	 *		certain PHYs.  It would be much nicer if all
+-	 *		PHYs were interrupt-capable like the internal
+-	 *		PHY.
+-	 *	-	The ACT LED, which shows adapter activity, is
+-	 *		driven by the driver, and so must be left on
+-	 *		for a short period to power up the LED so it
+-	 *		can be seen.  This delay can be changed by
+-	 *		changing the TLAN_TIMER_ACT_DELAY in tlan.h,
+-	 *		if desired.  100 ms  produces a slightly
+-	 *		sluggish response.
++	 *	This function uses the TLAN's MII bus to retreive the contents
++	 *	of a given register on a PHY.  It sends the appropriate info
++	 *	and then reads the 16-bit register value from the MII bus via
++	 *	the TLAN SIO register.
+ 	 *
+ 	 **************************************************************/
+ 
+-void TLan_Timer( unsigned long data )
++int TLan_MiiReadReg(struct nic *nic __unused, u16 phy, u16 reg, u16 * val)
+ {
+-	struct net_device	*dev = (struct net_device *) data;
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u32		elapsed;
+-	unsigned long	flags = 0;
+-
+-	priv->timer.function = NULL;
+-
+-	switch ( priv->timerType ) {
+-#ifdef MONITOR		
+-		case TLAN_TIMER_LINK_BEAT:
+-			TLan_PhyMonitor( dev );
+-			break;
+-#endif
+-		case TLAN_TIMER_PHY_PDOWN:
+-			TLan_PhyPowerDown( dev );
+-			break;
+-		case TLAN_TIMER_PHY_PUP:
+-			TLan_PhyPowerUp( dev );
+-			break;
+-		case TLAN_TIMER_PHY_RESET:
+-			TLan_PhyReset( dev );
+-			break;
+-		case TLAN_TIMER_PHY_START_LINK:
+-			TLan_PhyStartLink( dev );
+-			break;
+-		case TLAN_TIMER_PHY_FINISH_AN:
+-			TLan_PhyFinishAutoNeg( dev );
+-			break;
+-		case TLAN_TIMER_FINISH_RESET:
+-			TLan_FinishReset( dev );
+-			break;
+-		case TLAN_TIMER_ACTIVITY:
+-			spin_lock_irqsave(&priv->lock, flags);
+-			if ( priv->timer.function == NULL ) {
+-				elapsed = jiffies - priv->timerSetAt;
+-				if ( elapsed >= TLAN_TIMER_ACT_DELAY ) {
+-					TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+-				} else  {
+-					priv->timer.function = &TLan_Timer;
+-					priv->timer.expires = priv->timerSetAt + TLAN_TIMER_ACT_DELAY;
+-					spin_unlock_irqrestore(&priv->lock, flags);
+-					add_timer( &priv->timer );
+-					break;
+-				}
+-			}
+-			spin_unlock_irqrestore(&priv->lock, flags);
+-			break;
+-		default:
+-			break;
++	u8 nack;
++	u16 sio, tmp;
++	u32 i;
++	int err;
++	int minten;
++
++	err = FALSE;
++	outw(TLAN_NET_SIO, BASE + TLAN_DIO_ADR);
++	sio = BASE + TLAN_DIO_DATA + TLAN_NET_SIO;
++
++	TLan_MiiSync(BASE);
++
++	minten = TLan_GetBit(TLAN_NET_SIO_MINTEN, sio);
++	if (minten)
++		TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
++
++	TLan_MiiSendData(BASE, 0x1, 2);	/* Start ( 01b ) */
++	TLan_MiiSendData(BASE, 0x2, 2);	/* Read  ( 10b ) */
++	TLan_MiiSendData(BASE, phy, 5);	/* Device #      */
++	TLan_MiiSendData(BASE, reg, 5);	/* Register #    */
++
++
++	TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);	/* Change direction */
++
++	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Clock Idle bit */
++	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
++	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Wait 300ns */
++
++	nack = TLan_GetBit(TLAN_NET_SIO_MDATA, sio);	/* Check for ACK */
++	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);	/* Finish ACK */
++	if (nack) {		/* No ACK, so fake it */
++		for (i = 0; i < 16; i++) {
++			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
++			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
++		}
++		tmp = 0xffff;
++		err = TRUE;
++	} else {		/* ACK, so read data */
++		for (tmp = 0, i = 0x8000; i; i >>= 1) {
++			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
++			if (TLan_GetBit(TLAN_NET_SIO_MDATA, sio))
++				tmp |= i;
++			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
++		}
+ 	}
+ 
+-} /* TLan_Timer */
+ 
+-/*****************************************************************************
+-******************************************************************************
++	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Idle cycle */
++	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+ 
+-	ThunderLAN Driver Adapter Related Routines
++	if (minten)
++		TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
+ 
+-******************************************************************************
+-*****************************************************************************/
++	*val = tmp;
++
++	return err;
++
++}				/* TLan_MiiReadReg */
+ 
+ 	/***************************************************************
+-	 *	TLan_ResetLists
+-	 *  
++	 *	TLan_MiiSendData
++	 *
+ 	 *	Returns:
+ 	 *		Nothing
+ 	 *	Parms:
+-	 *		dev	The device structure with the list
+-	 *			stuctures to be reset.
++	 *		base_port	The base IO port of the adapter	in
++	 *				question.
++	 *		dev		The address of the PHY to be queried.
++	 *		data		The value to be placed on the MII bus.
++	 *		num_bits	The number of bits in data that are to
++	 *				be placed on the MII bus.
+ 	 *
+-	 *	This routine sets the variables associated with managing
+-	 *	the TLAN lists to their initial values.
++	 *	This function sends on sequence of bits on the MII
++	 *	configuration bus.
+ 	 *
+ 	 **************************************************************/
+ 
+-void TLan_ResetLists( struct net_device *dev )
++void TLan_MiiSendData(u16 base_port, u32 data, unsigned num_bits)
+ {
+-	TLanPrivateInfo *priv = dev->priv;
+-	int		i;
+-	TLanList	*list;
+-	struct sk_buff	*skb;
+-	void		*t = NULL;
++	u16 sio;
++	u32 i;
+ 
+-	priv->txHead = 0;
+-	priv->txTail = 0;
+-	for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
+-		list = priv->txList + i;
+-		list->cStat = TLAN_CSTAT_UNUSED;
+-		if ( bbuf ) {
+-			list->buffer[0].address = virt_to_bus( priv->txBuffer + ( i * TLAN_MAX_FRAME_SIZE ) );
+-		} else {
+-			list->buffer[0].address = 0;
+-		}
+-		list->buffer[2].count = 0;
+-		list->buffer[2].address = 0;
+-		list->buffer[9].address = 0;
+-	}
++	if (num_bits == 0)
++		return;
++
++	outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
++	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
++	TLan_SetBit(TLAN_NET_SIO_MTXEN, sio);
+ 
+-	priv->rxHead = 0;
+-	priv->rxTail = TLAN_NUM_RX_LISTS - 1;
+-	for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
+-		list = priv->rxList + i;
+-		list->cStat = TLAN_CSTAT_READY;
+-		list->frameSize = TLAN_MAX_FRAME_SIZE;
+-		list->buffer[0].count = TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
+-		if ( bbuf ) {
+-			list->buffer[0].address = virt_to_bus( priv->rxBuffer + ( i * TLAN_MAX_FRAME_SIZE ) );
+-		} else {
+-			skb = dev_alloc_skb( TLAN_MAX_FRAME_SIZE + 7 );
+-			if ( skb == NULL ) {
+-				printk( "TLAN:  Couldn't allocate memory for received data.\n" );
+-				/* If this ever happened it would be a problem */
+-			} else {
+-				skb->dev = dev;
+-				skb_reserve( skb, 2 );
+-				t = (void *) skb_put( skb, TLAN_MAX_FRAME_SIZE );
+-			}
+-			list->buffer[0].address = virt_to_bus( t );
+-			list->buffer[8].address = (u32) t;
+-			list->buffer[9].address = (u32) skb;
+-		}
+-		list->buffer[1].count = 0;
+-		list->buffer[1].address = 0;
+-		if ( i < TLAN_NUM_RX_LISTS - 1 )
+-			list->forward = virt_to_bus( list + 1 );
++	for (i = (0x1 << (num_bits - 1)); i; i >>= 1) {
++		TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
++		(void) TLan_GetBit(TLAN_NET_SIO_MCLK, sio);
++		if (data & i)
++			TLan_SetBit(TLAN_NET_SIO_MDATA, sio);
+ 		else
+-			list->forward = 0;
++			TLan_ClearBit(TLAN_NET_SIO_MDATA, sio);
++		TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
++		(void) TLan_GetBit(TLAN_NET_SIO_MCLK, sio);
+ 	}
+ 
+-} /* TLan_ResetLists */
++}				/* TLan_MiiSendData */
+ 
+-void TLan_FreeLists( struct net_device *dev )
+-{
+-	TLanPrivateInfo *priv = dev->priv;
+-	int		i;
+-	TLanList	*list;
+-	struct sk_buff	*skb;
+-
+-	if ( ! bbuf ) {
+-		for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
+-			list = priv->txList + i;
+-			skb = (struct sk_buff *) list->buffer[9].address;
+-			if ( skb ) {
+-				dev_kfree_skb_any( skb );
+-				list->buffer[9].address = 0;
+-			}
+-		}
+ 
+-		for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
+-			list = priv->rxList + i;
+-			skb = (struct sk_buff *) list->buffer[9].address;
+-			if ( skb ) {
+-				dev_kfree_skb_any( skb );
+-				list->buffer[9].address = 0;
+-			}
+-		}
+-	}
+ 
+-} /* TLan_FreeLists */
+ 
+ 	/***************************************************************
+-	 *	TLan_PrintDio
+-	 *  
++	 *	TLan_MiiSync
++	 *
+ 	 *	Returns:
+ 	 *		Nothing
+ 	 *	Parms:
+-	 *		io_base		Base IO port of the device of
+-	 *				which to print DIO registers.
++	 *		base_port	The base IO port of the adapter in
++	 *				question.
+ 	 *
+-	 *	This function prints out all the internal (DIO)
+-	 *	registers of a TLAN chip.
++	 *	This functions syncs all PHYs in terms of the MII configuration
++	 *	bus.
+ 	 *
+ 	 **************************************************************/
+ 
+-void TLan_PrintDio( u16 io_base )
++void TLan_MiiSync(u16 base_port)
+ {
+-	u32 data0, data1;
+-	int	i;
++	int i;
++	u16 sio;
+ 
+-	printk( "TLAN:   Contents of internal registers for io base 0x%04hx.\n", io_base );
+-	printk( "TLAN:      Off.  +0         +4\n" );
+-	for ( i = 0; i < 0x4C; i+= 8 ) {
+-		data0 = TLan_DioRead32( io_base, i );
+-		data1 = TLan_DioRead32( io_base, i + 0x4 );
+-		printk( "TLAN:      0x%02x  0x%08x 0x%08x\n", i, data0, data1 );
++	outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
++	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
++
++	TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);
++	for (i = 0; i < 32; i++) {
++		TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
++		TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+ 	}
+ 
+-} /* TLan_PrintDio */
++}				/* TLan_MiiSync */
++
++
++
+ 
+ 	/***************************************************************
+-	 *	TLan_PrintList
+-	 *  
++	 *	TLan_MiiWriteReg
++	 *
+ 	 *	Returns:
+ 	 *		Nothing
+ 	 *	Parms:
+-	 *		list	A pointer to the TLanList structure to
+-	 *			be printed.
+-	 *		type	A string to designate type of list,
+-	 *			"Rx" or "Tx".
+-	 *		num	The index of the list.
++	 *		dev		The device structure for the device
++	 *				to write to.
++	 *		phy		The address of the PHY to be written to.
++	 *		reg		The register whose contents are to be
++	 *				written.
++	 *		val		The value to be written to the register.
+ 	 *
+-	 *	This function prints out the contents of the list
+-	 *	pointed to by the list parameter.
++	 *	This function uses the TLAN's MII bus to write the contents of a
++	 *	given register on a PHY.  It sends the appropriate info and then
++	 *	writes the 16-bit register value from the MII configuration bus
++	 *	via the TLAN SIO register.
+ 	 *
+ 	 **************************************************************/
+ 
+-void TLan_PrintList( TLanList *list, char *type, int num)
++void TLan_MiiWriteReg(struct nic *nic __unused, u16 phy, u16 reg, u16 val)
+ {
+-	int i;
++	u16 sio;
++	int minten;
++
++	outw(TLAN_NET_SIO, BASE + TLAN_DIO_ADR);
++	sio = BASE + TLAN_DIO_DATA + TLAN_NET_SIO;
++
++	TLan_MiiSync(BASE);
++
++	minten = TLan_GetBit(TLAN_NET_SIO_MINTEN, sio);
++	if (minten)
++		TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
++
++	TLan_MiiSendData(BASE, 0x1, 2);	/* Start ( 01b ) */
++	TLan_MiiSendData(BASE, 0x1, 2);	/* Write ( 01b ) */
++	TLan_MiiSendData(BASE, phy, 5);	/* Device #      */
++	TLan_MiiSendData(BASE, reg, 5);	/* Register #    */
++
++	TLan_MiiSendData(BASE, 0x2, 2);	/* Send ACK */
++	TLan_MiiSendData(BASE, val, 16);	/* Send Data */
++
++	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Idle cycle */
++	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
++
++	if (minten)
++		TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
+ 
+-	printk( "TLAN:   %s List %d at 0x%08x\n", type, num, (u32) list );
+-	printk( "TLAN:      Forward    = 0x%08x\n",  list->forward );
+-	printk( "TLAN:      CSTAT      = 0x%04hx\n", list->cStat );
+-	printk( "TLAN:      Frame Size = 0x%04hx\n", list->frameSize );
+-	/* for ( i = 0; i < 10; i++ ) { */
+-	for ( i = 0; i < 2; i++ ) {
+-		printk( "TLAN:      Buffer[%d].count, addr = 0x%08x, 0x%08x\n", i, list->buffer[i].count, list->buffer[i].address );
+-	}
+ 
+-} /* TLan_PrintList */
++}				/* TLan_MiiWriteReg */
+ 
+ 	/***************************************************************
+-	 *	TLan_ReadAndClearStats
++	 *	TLan_SetMac
+ 	 *
+ 	 *	Returns:
+ 	 *		Nothing
+ 	 *	Parms:
+ 	 *		dev	Pointer to device structure of adapter
+-	 *			to which to read stats.
+-	 *		record	Flag indicating whether to add 
++	 *			on which to change the AREG.
++	 *		areg	The AREG to set the address in (0 - 3).
++	 *		mac	A pointer to an array of chars.  Each
++	 *			element stores one byte of the address.
++	 *			IE, it isn't in ascii.
+ 	 *
+-	 *	This functions reads all the internal status registers
+-	 *	of the TLAN chip, which clears them as a side effect.
+-	 *	It then either adds the values to the device's status
+-	 *	struct, or discards them, depending on whether record
+-	 *	is TLAN_RECORD (!=0)  or TLAN_IGNORE (==0).
++	 *	This function transfers a MAC address to one of the
++	 *	TLAN AREGs (address registers).  The TLAN chip locks
++	 *	the register on writing to offset 0 and unlocks the
++	 *	register after writing to offset 5.  If NULL is passed
++	 *	in mac, then the AREG is filled with 0's.
+ 	 *
+ 	 **************************************************************/
+ 
+-void TLan_ReadAndClearStats( struct net_device *dev, int record )
++void TLan_SetMac(struct nic *nic __unused, int areg, char *mac)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u32		tx_good, tx_under;
+-	u32		rx_good, rx_over;
+-	u32		def_tx, crc, code;
+-	u32		multi_col, single_col;
+-	u32		excess_col, late_col, loss;
+-
+-	outw( TLAN_GOOD_TX_FRMS, dev->base_addr + TLAN_DIO_ADR );
+-	tx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
+-	tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+-	tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
+-	tx_under = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
+-
+-	outw( TLAN_GOOD_RX_FRMS, dev->base_addr + TLAN_DIO_ADR );
+-	rx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
+-	rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+-	rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
+-	rx_over  = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
+-		
+-	outw( TLAN_DEFERRED_TX, dev->base_addr + TLAN_DIO_ADR );
+-	def_tx  = inb( dev->base_addr + TLAN_DIO_DATA );
+-	def_tx += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+-	crc     = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
+-	code    = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
+-	
+-	outw( TLAN_MULTICOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
+-	multi_col   = inb( dev->base_addr + TLAN_DIO_DATA );
+-	multi_col  += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
+-	single_col  = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
+-	single_col += inb( dev->base_addr + TLAN_DIO_DATA + 3 ) << 8;
+-
+-	outw( TLAN_EXCESSCOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
+-	excess_col = inb( dev->base_addr + TLAN_DIO_DATA );
+-	late_col   = inb( dev->base_addr + TLAN_DIO_DATA + 1 );
+-	loss       = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
+-
+-	if ( record ) {
+-		priv->stats.rx_packets += rx_good;
+-		priv->stats.rx_errors  += rx_over + crc + code;
+-		priv->stats.tx_packets += tx_good;
+-		priv->stats.tx_errors  += tx_under + loss;
+-		priv->stats.collisions += multi_col + single_col + excess_col + late_col;
+-
+-		priv->stats.rx_over_errors    += rx_over;
+-		priv->stats.rx_crc_errors     += crc;
+-		priv->stats.rx_frame_errors   += code;
++	int i;
+ 
+-		priv->stats.tx_aborted_errors += tx_under;
+-		priv->stats.tx_carrier_errors += loss;
++	areg *= 6;
++
++	if (mac != NULL) {
++		for (i = 0; i < 6; i++)
++			TLan_DioWrite8(BASE, TLAN_AREG_0 + areg + i,
++				       mac[i]);
++	} else {
++		for (i = 0; i < 6; i++)
++			TLan_DioWrite8(BASE, TLAN_AREG_0 + areg + i, 0);
+ 	}
+-			
+-} /* TLan_ReadAndClearStats */
+ 
+-	/***************************************************************
+-	 *	TLan_Reset
++}				/* TLan_SetMac */
++
++	/*********************************************************************
++	 *	TLan_PhyDetect
+ 	 *
+ 	 *	Returns:
+-	 *		0
++	 *		Nothing
+ 	 *	Parms:
+-	 *		dev	Pointer to device structure of adapter
+-	 *			to be reset.
++	 *		dev	A pointer to the device structure of the adapter
++	 *			for which the PHY needs determined.
+ 	 *
+-	 *	This function resets the adapter and it's physical
+-	 *	device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
+-	 *	Programmer's Guide" for details.  The routine tries to
+-	 *	implement what is detailed there, though adjustments
+-	 *	have been made.
++	 *	So far I've found that adapters which have external PHYs
++	 *	may also use the internal PHY for part of the functionality.
++	 *	(eg, AUI/Thinnet).  This function finds out if this TLAN
++	 *	chip has an internal PHY, and then finds the first external
++	 *	PHY (starting from address 0) if it exists).
+ 	 *
+-	 **************************************************************/
++	 ********************************************************************/
+ 
+-void
+-TLan_ResetAdapter( struct net_device *dev )
++void TLan_PhyDetect(struct nic *nic)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	int		i;
+-	u32		addr;
+-	u32		data;
+-	u8		data8;
++	u16 control;
++	u16 hi;
++	u16 lo;
++	u32 phy;
+ 
+-	priv->tlanFullDuplex = FALSE;
+-	priv->phyOnline=0;
+-/*  1.	Assert reset bit. */
++	if (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_UNMANAGED_PHY) {
++		priv->phyNum = 0xFFFF;
++		return;
++	}
+ 
+-	data = inl(dev->base_addr + TLAN_HOST_CMD);
+-	data |= TLAN_HC_AD_RST;
+-	outl(data, dev->base_addr + TLAN_HOST_CMD);
+-	
+-	udelay(1000);
++	TLan_MiiReadReg(nic, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi);
+ 
+-/*  2.	Turn off interrupts. ( Probably isn't necessary ) */
++	if (hi != 0xFFFF) {
++		priv->phy[0] = TLAN_PHY_MAX_ADDR;
++	} else {
++		priv->phy[0] = TLAN_PHY_NONE;
++	}
+ 
+-	data = inl(dev->base_addr + TLAN_HOST_CMD);
+-	data |= TLAN_HC_INT_OFF;
+-	outl(data, dev->base_addr + TLAN_HOST_CMD);
++	priv->phy[1] = TLAN_PHY_NONE;
++	for (phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++) {
++		TLan_MiiReadReg(nic, phy, MII_GEN_CTL, &control);
++		TLan_MiiReadReg(nic, phy, MII_GEN_ID_HI, &hi);
++		TLan_MiiReadReg(nic, phy, MII_GEN_ID_LO, &lo);
++		if ((control != 0xFFFF) || (hi != 0xFFFF)
++		    || (lo != 0xFFFF)) {
++			printf("PHY found at %hX %hX %hX %hX\n", phy,
++			       control, hi, lo);
++			if ((priv->phy[1] == TLAN_PHY_NONE)
++			    && (phy != TLAN_PHY_MAX_ADDR)) {
++				priv->phy[1] = phy;
++			}
++		}
++	}
+ 
+-/*  3.	Clear AREGs and HASHs. */
++	if (priv->phy[1] != TLAN_PHY_NONE) {
++		priv->phyNum = 1;
++	} else if (priv->phy[0] != TLAN_PHY_NONE) {
++		priv->phyNum = 0;
++	} else {
++		printf
++		    ("TLAN:  Cannot initialize device, no PHY was found!\n");
++	}
++
++}				/* TLan_PhyDetect */
+ 
+- 	for ( i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4 ) {
+-		TLan_DioWrite32( dev->base_addr, (u16) i, 0 );
++void TLan_PhyPowerDown(struct nic *nic)
++{
++
++	u16 value;
++	printf("%s: Powering down PHY(s).\n", priv->nic_name);
++	value = MII_GC_PDOWN | MII_GC_LOOPBK | MII_GC_ISOLATE;
++	TLan_MiiSync(BASE);
++	TLan_MiiWriteReg(nic, priv->phy[priv->phyNum], MII_GEN_CTL, value);
++	if ((priv->phyNum == 0) && (priv->phy[1] != TLAN_PHY_NONE)
++	    &&
++	    (!(tlan_pci_tbl[chip_idx].
++	       flags & TLAN_ADAPTER_USE_INTERN_10))) {
++		TLan_MiiSync(BASE);
++		TLan_MiiWriteReg(nic, priv->phy[1], MII_GEN_CTL, value);
+ 	}
+ 
+-/*  4.	Setup NetConfig register. */
++	/* Wait for 50 ms and powerup
++	 * This is abitrary.  It is intended to make sure the
++	 * tranceiver settles.
++	 */
++	/* TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP ); */
++	mdelay(50);
++	TLan_PhyPowerUp(nic);
+ 
+-	data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
+-	TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
++}				/* TLan_PhyPowerDown */
+ 
+-/*  5.	Load Ld_Tmr and Ld_Thr in HOST_CMD. */
+ 
+- 	outl( TLAN_HC_LD_TMR | 0x3f, dev->base_addr + TLAN_HOST_CMD );
+- 	outl( TLAN_HC_LD_THR | 0x9, dev->base_addr + TLAN_HOST_CMD );
++void TLan_PhyPowerUp(struct nic *nic)
++{
++	u16 value;
+ 
+-/*  6.	Unreset the MII by setting NMRST (in NetSio) to 1. */
++	printf("%s: Powering up PHY.\n", priv->nic_name);
++	TLan_MiiSync(BASE);
++	value = MII_GC_LOOPBK;
++	TLan_MiiWriteReg(nic, priv->phy[priv->phyNum], MII_GEN_CTL, value);
++	TLan_MiiSync(BASE);
++	/* Wait for 500 ms and reset the
++	 * tranceiver.  The TLAN docs say both 50 ms and
++	 * 500 ms, so do the longer, just in case.
++	 */
++	mdelay(500);
++	TLan_PhyReset(nic);
++	/* TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET ); */
+ 
+-	outw( TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR );
+-	addr = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
+-	TLan_SetBit( TLAN_NET_SIO_NMRST, addr );
++}				/* TLan_PhyPowerUp */
+ 
+-/*  7.	Setup the remaining registers. */
++void TLan_PhyReset(struct nic *nic)
++{
++	u16 phy;
++	u16 value;
+ 
+-	if ( priv->tlanRev >= 0x30 ) {
+-		data8 = TLAN_ID_TX_EOC | TLAN_ID_RX_EOC;
+-		TLan_DioWrite8( dev->base_addr, TLAN_INT_DIS, data8 );
++	phy = priv->phy[priv->phyNum];
++
++	printf("%s: Reseting PHY.\n", priv->nic_name);
++	TLan_MiiSync(BASE);
++	value = MII_GC_LOOPBK | MII_GC_RESET;
++	TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, value);
++	TLan_MiiReadReg(nic, phy, MII_GEN_CTL, &value);
++	while (value & MII_GC_RESET) {
++		TLan_MiiReadReg(nic, phy, MII_GEN_CTL, &value);
+ 	}
+-	TLan_PhyDetect( dev );
+-	data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN;
+-	
+-	if ( priv->adapter->flags & TLAN_ADAPTER_BIT_RATE_PHY ) {
+-		data |= TLAN_NET_CFG_BIT;
+-		if ( priv->aui == 1 ) {
+-			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x0a );
+-		} else if ( priv->duplex == TLAN_DUPLEX_FULL ) {
+-			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x00 );
++
++	/* Wait for 500 ms and initialize.
++	 * I don't remember why I wait this long.
++	 * I've changed this to 50ms, as it seems long enough.
++	 */
++	/* TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_START_LINK ); */
++	mdelay(50);
++	TLan_PhyStartLink(nic);
++
++}				/* TLan_PhyReset */
++
++
++void TLan_PhyStartLink(struct nic *nic)
++{
++
++	u16 ability;
++	u16 control;
++	u16 data;
++	u16 phy;
++	u16 status;
++	u16 tctl;
++
++	phy = priv->phy[priv->phyNum];
++	printf("%s: Trying to activate link.\n", priv->nic_name);
++	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
++	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &ability);
++
++	if ((status & MII_GS_AUTONEG) && (!priv->aui)) {
++		ability = status >> 11;
++		if (priv->speed == TLAN_SPEED_10 &&
++		    priv->duplex == TLAN_DUPLEX_HALF) {
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x0000);
++		} else if (priv->speed == TLAN_SPEED_10 &&
++			   priv->duplex == TLAN_DUPLEX_FULL) {
++			priv->tlanFullDuplex = TRUE;
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x0100);
++		} else if (priv->speed == TLAN_SPEED_100 &&
++			   priv->duplex == TLAN_DUPLEX_HALF) {
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x2000);
++		} else if (priv->speed == TLAN_SPEED_100 &&
++			   priv->duplex == TLAN_DUPLEX_FULL) {
+ 			priv->tlanFullDuplex = TRUE;
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x2100);
+ 		} else {
+-			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x08 );
++
++			/* Set Auto-Neg advertisement */
++			TLan_MiiWriteReg(nic, phy, MII_AN_ADV,
++					 (ability << 5) | 1);
++			/* Enablee Auto-Neg */
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x1000);
++			/* Restart Auto-Neg */
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x1200);
++			/* Wait for 4 sec for autonegotiation
++			 * to complete.  The max spec time is less than this
++			 * but the card need additional time to start AN.
++			 * .5 sec should be plenty extra.
++			 */
++			printf("TLAN: %s: Starting autonegotiation.\n",
++			       priv->nic_name);
++			mdelay(4000);
++			TLan_PhyFinishAutoNeg(nic);
++			/* TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN ); */
++			return;
+ 		}
+-	}
+ 
+-	if ( priv->phyNum == 0 ) {
+-		data |= TLAN_NET_CFG_PHY_EN;
+ 	}
+-	TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
+ 
+-	if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
+-		TLan_FinishReset( dev );
+-	} else {
+-		TLan_PhyPowerDown( dev );
++	if ((priv->aui) && (priv->phyNum != 0)) {
++		priv->phyNum = 0;
++		data =
++		    TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN |
++		    TLAN_NET_CFG_PHY_EN;
++		TLan_DioWrite16(BASE, TLAN_NET_CONFIG, data);
++		mdelay(50);
++		/* TLan_SetTimer( dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN ); */
++		TLan_PhyPowerDown(nic);
++		return;
++	} else if (priv->phyNum == 0) {
++		control = 0;
++		TLan_MiiReadReg(nic, phy, TLAN_TLPHY_CTL, &tctl);
++		if (priv->aui) {
++			tctl |= TLAN_TC_AUISEL;
++		} else {
++			tctl &= ~TLAN_TC_AUISEL;
++			if (priv->duplex == TLAN_DUPLEX_FULL) {
++				control |= MII_GC_DUPLEX;
++				priv->tlanFullDuplex = TRUE;
++			}
++			if (priv->speed == TLAN_SPEED_100) {
++				control |= MII_GC_SPEEDSEL;
++			}
++		}
++		TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, control);
++		TLan_MiiWriteReg(nic, phy, TLAN_TLPHY_CTL, tctl);
+ 	}
+ 
+-} /* TLan_ResetAdapter */
++	/* Wait for 2 sec to give the tranceiver time
++	 * to establish link.
++	 */
++	/* TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET ); */
++	mdelay(2000);
++	TLan_FinishReset(nic);
++
++}				/* TLan_PhyStartLink */
+ 
+-void
+-TLan_FinishReset( struct net_device *dev )
++void TLan_PhyFinishAutoNeg(struct nic *nic)
+ {
+-	TLanPrivateInfo	*priv = dev->priv;
+-	u8		data;
+-	u32		phy;
+-	u8		sio;
+-	u16		status;
+-	u16		partner;
+-	u16		tlphy_ctl;
+-	u16 		tlphy_par;
+-	u16		tlphy_id1, tlphy_id2;
+-	int 		i;
++
++	u16 an_adv;
++	u16 an_lpa;
++	u16 data;
++	u16 mode;
++	u16 phy;
++	u16 status;
+ 
+ 	phy = priv->phy[priv->phyNum];
+ 
+-	data = TLAN_NET_CMD_NRESET | TLAN_NET_CMD_NWRAP;
+-	if ( priv->tlanFullDuplex ) {
+-		data |= TLAN_NET_CMD_DUPLEX;
++	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
++	udelay(1000);
++	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
++
++	if (!(status & MII_GS_AUTOCMPLT)) {
++		/* Wait for 8 sec to give the process
++		 * more time.  Perhaps we should fail after a while.
++		 */
++		if (!priv->neg_be_verbose++) {
++			printf
++			    ("TLAN:  Giving autonegotiation more time.\n");
++			printf
++			    ("TLAN:  Please check that your adapter has\n");
++			printf
++			    ("TLAN:  been properly connected to a HUB or Switch.\n");
++			printf
++			    ("TLAN:  Trying to establish link in the background...\n");
++		}
++		mdelay(8000);
++		TLan_PhyFinishAutoNeg(nic);
++		/* TLan_SetTimer( dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN ); */
++		return;
+ 	}
+-	TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, data );
+-	data = TLAN_NET_MASK_MASK4 | TLAN_NET_MASK_MASK5; 
+-	if ( priv->phyNum == 0 ) {
+-		data |= TLAN_NET_MASK_MASK7; 
+-	}
+-	TLan_DioWrite8( dev->base_addr, TLAN_NET_MASK, data );
+-	TLan_DioWrite16( dev->base_addr, TLAN_MAX_RX, ((1536)+7)&~7 );
+-	TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &tlphy_id1 );
+-	TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &tlphy_id2 );
+-	
+-	if ( ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) || ( priv->aui ) ) {
+-		status = MII_GS_LINK;
+-		printk( "TLAN:  %s: Link forced.\n", dev->name );
+-	} else {
+-		TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+-		udelay( 1000 );
+-		TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+-		if ( (status & MII_GS_LINK) &&	 /* We only support link info on Nat.Sem. PHY's */ 
+-			(tlphy_id1 == NAT_SEM_ID1) &&
+-			(tlphy_id2 == NAT_SEM_ID2) ) {
+-			TLan_MiiReadReg( dev, phy, MII_AN_LPA, &partner );
+-			TLan_MiiReadReg( dev, phy, TLAN_TLPHY_PAR, &tlphy_par );
+-			
+-			printk( "TLAN: %s: Link active with ", dev->name );
+-			if (!(tlphy_par & TLAN_PHY_AN_EN_STAT)) {
+-			      	 printk( "forced 10%sMbps %s-Duplex\n", 
+-						tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
+-						tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
+-			} else {
+-				printk( "AutoNegotiation enabled, at 10%sMbps %s-Duplex\n",
+-						tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
+-						tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
+-				printk("TLAN: Partner capability: ");
+-					for (i = 5; i <= 10; i++)
+-						if (partner & (1<<i))
+-							printk("%s", media[i-5]);
+-							printk("\n");
+-			}
+ 
+-			TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+-#ifdef MONITOR			
+-			/* We have link beat..for now anyway */
+-	        	priv->link = 1;
+-	        	/*Enabling link beat monitoring */
+-			TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_LINK_BEAT );
+-#endif 
+-		} else if (status & MII_GS_LINK)  {
+-			printk( "TLAN: %s: Link active\n", dev->name );
+-			TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+-		}
++	printf("TLAN: %s: Autonegotiation complete.\n", priv->nic_name);
++	TLan_MiiReadReg(nic, phy, MII_AN_ADV, &an_adv);
++	TLan_MiiReadReg(nic, phy, MII_AN_LPA, &an_lpa);
++	mode = an_adv & an_lpa & 0x03E0;
++	if (mode & 0x0100) {
++		printf("Full Duplex\n");
++		priv->tlanFullDuplex = TRUE;
++	} else if (!(mode & 0x0080) && (mode & 0x0040)) {
++		priv->tlanFullDuplex = TRUE;
++		printf("Full Duplex\n");
+ 	}
+ 
+-	if ( priv->phyNum == 0 ) {
+-        	TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
+-        	tlphy_ctl |= TLAN_TC_INTEN;
+-        	TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl );
+-        	sio = TLan_DioRead8( dev->base_addr, TLAN_NET_SIO );
+-        	sio |= TLAN_NET_SIO_MINTEN;
+-        	TLan_DioWrite8( dev->base_addr, TLAN_NET_SIO, sio );
++	if ((!(mode & 0x0180))
++	    && (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_USE_INTERN_10)
++	    && (priv->phyNum != 0)) {
++		priv->phyNum = 0;
++		data =
++		    TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN |
++		    TLAN_NET_CFG_PHY_EN;
++		TLan_DioWrite16(BASE, TLAN_NET_CONFIG, data);
++		/* TLan_SetTimer( nic, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN ); */
++		mdelay(400);
++		TLan_PhyPowerDown(nic);
++		return;
+ 	}
+ 
+-	if ( status & MII_GS_LINK ) {
+-		TLan_SetMac( dev, 0, dev->dev_addr );
+-		priv->phyOnline = 1;
+-		outb( ( TLAN_HC_INT_ON >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
+-		if ( debug >= 1 && debug != TLAN_DEBUG_PROBE ) {
+-			outb( ( TLAN_HC_REQ_INT >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
++	if (priv->phyNum == 0) {
++		if ((priv->duplex == TLAN_DUPLEX_FULL)
++		    || (an_adv & an_lpa & 0x0040)) {
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL,
++					 MII_GC_AUTOENB | MII_GC_DUPLEX);
++			printf
++			    ("TLAN:  Starting internal PHY with FULL-DUPLEX\n");
++		} else {
++			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL,
++					 MII_GC_AUTOENB);
++			printf
++			    ("TLAN:  Starting internal PHY with HALF-DUPLEX\n");
+ 		}
+-		outl( virt_to_bus( priv->rxList ), dev->base_addr + TLAN_CH_PARM );
+-		outl( TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD );
+-	} else {
+-		printk( "TLAN: %s: Link inactive, will retry in 10 secs...\n", dev->name );
+-		TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
+-		return;
+ 	}
+ 
+-} /* TLan_FinishReset */
++	/* Wait for 100 ms.  No reason in partiticular.
++	 */
++	/* TLan_SetTimer( dev, (HZ/10), TLAN_TIMER_FINISH_RESET ); */
++	mdelay(100);
++	TLan_FinishReset(nic);
+ 
+-	/***************************************************************
+-	 *	TLan_SetMac
+-	 *
+-	 *	Returns:
+-	 *		Nothing
+-	 *	Parms:
+-	 *		dev	Pointer to device structure of adapter
+-	 *			on which to change the AREG.
+-	 *		areg	The AREG to set the address in (0 - 3).
+-	 *		mac	A pointer to an array of chars.  Each
+-	 *			element stores one byte of the address.
+-	 *			IE, it isn't in ascii.
+-	 *
+-	 *	This function transfers a MAC address to one of the
+-	 *	TLAN AREGs (address registers).  The TLAN chip locks
+-	 *	the register on writing to offset 0 and unlocks the
+-	 *	register after writing to offset 5.  If NULL is passed
+-	 *	in mac, then the AREG is filled with 0's.
+-	 *
+-	 **************************************************************/
++}				/* TLan_PhyFinishAutoNeg */
++
++#ifdef MONITOR
++
++	/*********************************************************************
++        *
++        *      TLan_phyMonitor
++        *
++        *      Returns:
++        *              None
++        *
++        *      Params:
++        *              dev             The device structure of this device.
++        *
++        *
++        *      This function monitors PHY condition by reading the status
++        *      register via the MII bus. This can be used to give info
++        *      about link changes (up/down), and possible switch to alternate
++        *      media.
++        *
++        * ******************************************************************/
+ 
+-void TLan_SetMac( struct net_device *dev, int areg, char *mac )
++void TLan_PhyMonitor(struct net_device *dev)
+ {
+-	int i;
+-			
+-	areg *= 6;
++	TLanPrivateInfo *priv = dev->priv;
++	u16 phy;
++	u16 phy_status;
+ 
+-	if ( mac != NULL ) {
+-		for ( i = 0; i < 6; i++ )
+-			TLan_DioWrite8( dev->base_addr, TLAN_AREG_0 + areg + i, mac[i] );
+-	} else {
+-		for ( i = 0; i < 6; i++ )
+-			TLan_DioWrite8( dev->base_addr, TLAN_AREG_0 + areg + i, 0 );
++	phy = priv->phy[priv->phyNum];
++
++	/* Get PHY status register */
++	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &phy_status);
++
++	/* Check if link has been lost */
++	if (!(phy_status & MII_GS_LINK)) {
++		if (priv->link) {
++			priv->link = 0;
++			printf("TLAN: %s has lost link\n", priv->nic_name);
++			priv->flags &= ~IFF_RUNNING;
++			mdelay(2000);
++			TLan_PhyMonitor(nic);
++			/* TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT ); */
++			return;
++		}
+ 	}
+ 
+-} /* TLan_SetMac */
++	/* Link restablished? */
++	if ((phy_status & MII_GS_LINK) && !priv->link) {
++		priv->link = 1;
++		printf("TLAN: %s has reestablished link\n",
++		       priv->nic_name);
++		priv->flags |= IFF_RUNNING;
++	}
++
++	/* Setup a new monitor */
++	/* TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT ); */
++	mdelay(2000);
++	TLan_PhyMonitor(nic);
++}
+ 
++#endif				/* MONITOR */
++
++#ifdef EB51
++static struct pci_id tlan_nics[] = {
++	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP"),
++	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP"),
++	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P"),
++	PCI_ROM(0x0e11, 0xf130, "thunder", "Compaq NetFlex-3/P"),
++	PCI_ROM(0x0e11, 0xf150, "netflex3b", "Compaq NetFlex-3/P"),
++	PCI_ROM(0x0e11, 0xae43, "netel100pi", "Compaq Netelligent Integrated 10/100 TX UTP"),
++	PCI_ROM(0x0e11, 0xae40, "netel100d", "Compaq Netelligent Dual 10/100 TX PCI UTP"),
++	PCI_ROM(0x0e11, 0xb011, "netel100i", "Compaq Netelligent 10/100 TX Embedded UTP"),
++	PCI_ROM(0x108d, 0x0013, "oc2183", "Olicom OC-2183/2185"),
++	PCI_ROM(0x108d, 0x0012, "oc2325", "Olicom OC-2325"),
++	PCI_ROM(0x108d, 0x0014, "oc2326", "Olicom OC-2326"),
++	PCI_ROM(0x0e11, 0xb030, "netelligent_10_100_ws_5100", "Compaq Netelligent 10/100 TX UTP"),
++	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax"),
++};
++
++struct pci_driver tlan_driver = {
++	.type = NIC_DRIVER,
++	.name = "TLAN/PCI",
++	.probe = tlan_probe,
++	.ids = tlan_nics,
++	.id_count = sizeof(tlan_nics) / sizeof(tlan_nics[0]),
++	.class = 0,
++};
+ #endif
+diff -Naur grub-0.97.orig/netboot/tlan.h grub-0.97/netboot/tlan.h
+--- grub-0.97.orig/netboot/tlan.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/tlan.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,536 @@
++/**************************************************************************
++*
++*    tlan.c -- Etherboot device driver for the Texas Instruments ThunderLAN
++*    Written 2003-2003 by Timothy Legge <tlegge@rogers.com>
++*
++*    This program is free software; you can redistribute it and/or modify
++*    it under the terms of the GNU General Public License as published by
++*    the Free Software Foundation; either version 2 of the License, or
++*    (at your option) any later version.
++*
++*    This program is distributed in the hope that it will be useful,
++*    but WITHOUT ANY WARRANTY; without even the implied warranty of
++*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++*    GNU General Public License for more details.
++*
++*    You should have received a copy of the GNU General Public License
++*    along with this program; if not, write to the Free Software
++*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*
++*    Portions of this code (almost all) based on:
++*               tlan.c: Linux ThunderLan Driver:
++*
++*				by James Banks
++*
++*  				(C) 1997-1998 Caldera, Inc.
++*			  	(C) 1998 James Banks
++*				(C) 1999-2001 Torben Mathiasen
++*				(C) 2002 Samuel Chessman
++*
++*    REVISION HISTORY:
++*    ================
++*    v1.0	07-08-2003	timlegge	Initial not quite working version
++*
++* Indent Style: indent -kr -i8
++***************************************************************************/
++
++/*
++#include <asm/io.h>
++#include <asm/types.h>
++#include <linux/netdevice.h>
++*/
++
++typedef unsigned char u8;
++typedef signed char s8;
++typedef unsigned short u16;
++typedef signed short s16;
++typedef unsigned int u32;
++typedef signed int s32;
++	/*****************************************************************
++	 * TLan Definitions
++	 *
++	 ****************************************************************/
++
++#define FALSE			0
++#define TRUE			1
++
++#define TLAN_MIN_FRAME_SIZE	64
++#define TLAN_MAX_FRAME_SIZE	1600
++
++#define TLAN_NUM_RX_LISTS	4
++#define TLAN_NUM_TX_LISTS	2
++
++#define TLAN_IGNORE		0
++#define TLAN_RECORD		1
++/*
++#define TLAN_DBG(lvl, format, args...)	if (debug&lvl) printf("TLAN: " format, ##args );
++*/
++#define TLAN_DEBUG_GNRL		0x0001
++#define TLAN_DEBUG_TX		0x0002
++#define TLAN_DEBUG_RX		0x0004
++#define TLAN_DEBUG_LIST		0x0008
++#define TLAN_DEBUG_PROBE	0x0010
++
++#define TX_TIMEOUT		(10*HZ)	/* We need time for auto-neg */
++#define MAX_TLAN_BOARDS		8	/* Max number of boards installed at a time */
++
++
++	/*****************************************************************
++	 * Device Identification Definitions
++	 *
++	 ****************************************************************/
++
++#define PCI_DEVICE_ID_NETELLIGENT_10_T2			0xB012
++#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100	0xB030
++#ifndef PCI_DEVICE_ID_OLICOM_OC2183
++#define PCI_DEVICE_ID_OLICOM_OC2183			0x0013
++#endif
++#ifndef PCI_DEVICE_ID_OLICOM_OC2325
++#define PCI_DEVICE_ID_OLICOM_OC2325			0x0012
++#endif
++#ifndef PCI_DEVICE_ID_OLICOM_OC2326
++#define PCI_DEVICE_ID_OLICOM_OC2326			0x0014
++#endif
++
++typedef struct tlan_adapter_entry {
++	u16 vendorId;
++	u16 deviceId;
++	char *deviceLabel;
++	u32 flags;
++	u16 addrOfs;
++} TLanAdapterEntry;
++
++#define TLAN_ADAPTER_NONE		0x00000000
++#define TLAN_ADAPTER_UNMANAGED_PHY	0x00000001
++#define TLAN_ADAPTER_BIT_RATE_PHY	0x00000002
++#define TLAN_ADAPTER_USE_INTERN_10	0x00000004
++#define TLAN_ADAPTER_ACTIVITY_LED	0x00000008
++
++#define TLAN_SPEED_DEFAULT	0
++#define TLAN_SPEED_10		10
++#define TLAN_SPEED_100		100
++
++#define TLAN_DUPLEX_DEFAULT	0
++#define TLAN_DUPLEX_HALF	1
++#define TLAN_DUPLEX_FULL	2
++
++
++
++	/*****************************************************************
++	 * EISA Definitions
++	 *
++	 ****************************************************************/
++
++#define EISA_ID      0xc80	/* EISA ID Registers */
++#define EISA_ID0     0xc80	/* EISA ID Register 0 */
++#define EISA_ID1     0xc81	/* EISA ID Register 1 */
++#define EISA_ID2     0xc82	/* EISA ID Register 2 */
++#define EISA_ID3     0xc83	/* EISA ID Register 3 */
++#define EISA_CR      0xc84	/* EISA Control Register */
++#define EISA_REG0    0xc88	/* EISA Configuration Register 0 */
++#define EISA_REG1    0xc89	/* EISA Configuration Register 1 */
++#define EISA_REG2    0xc8a	/* EISA Configuration Register 2 */
++#define EISA_REG3    0xc8f	/* EISA Configuration Register 3 */
++#define EISA_APROM   0xc90	/* Ethernet Address PROM */
++
++
++
++	/*****************************************************************
++	 * Rx/Tx List Definitions
++	 *
++	 ****************************************************************/
++
++#define TLAN_BUFFERS_PER_LIST	10
++#define TLAN_LAST_BUFFER	0x80000000
++#define TLAN_CSTAT_UNUSED	0x8000
++#define TLAN_CSTAT_FRM_CMP	0x4000
++#define TLAN_CSTAT_READY	0x3000
++#define TLAN_CSTAT_EOC		0x0800
++#define TLAN_CSTAT_RX_ERROR	0x0400
++#define TLAN_CSTAT_PASS_CRC	0x0200
++#define TLAN_CSTAT_DP_PR	0x0100
++
++
++
++
++
++
++	/*****************************************************************
++	 * PHY definitions
++	 *
++	 ****************************************************************/
++
++#define TLAN_PHY_MAX_ADDR	0x1F
++#define TLAN_PHY_NONE		0x20
++
++
++
++	/*****************************************************************
++	 * TLan Driver Timer Definitions
++	 *
++	 ****************************************************************/
++
++#define TLAN_TIMER_LINK_BEAT		1
++#define TLAN_TIMER_ACTIVITY		2
++#define TLAN_TIMER_PHY_PDOWN		3
++#define TLAN_TIMER_PHY_PUP		4
++#define TLAN_TIMER_PHY_RESET		5
++#define TLAN_TIMER_PHY_START_LINK	6
++#define TLAN_TIMER_PHY_FINISH_AN	7
++#define TLAN_TIMER_FINISH_RESET		8
++
++#define TLAN_TIMER_ACT_DELAY		(HZ/10)
++
++
++
++
++	/*****************************************************************
++	 * TLan Driver Eeprom Definitions
++	 *
++	 ****************************************************************/
++
++#define TLAN_EEPROM_ACK		0
++#define TLAN_EEPROM_STOP	1
++
++
++
++
++	/*****************************************************************
++	 * Host Register Offsets and Contents
++	 *
++	 ****************************************************************/
++
++#define TLAN_HOST_CMD			0x00
++#define 	TLAN_HC_GO		0x80000000
++#define		TLAN_HC_STOP		0x40000000
++#define		TLAN_HC_ACK		0x20000000
++#define		TLAN_HC_CS_MASK		0x1FE00000
++#define		TLAN_HC_EOC		0x00100000
++#define		TLAN_HC_RT		0x00080000
++#define		TLAN_HC_NES		0x00040000
++#define		TLAN_HC_AD_RST		0x00008000
++#define		TLAN_HC_LD_TMR		0x00004000
++#define		TLAN_HC_LD_THR		0x00002000
++#define		TLAN_HC_REQ_INT		0x00001000
++#define		TLAN_HC_INT_OFF		0x00000800
++#define		TLAN_HC_INT_ON		0x00000400
++#define		TLAN_HC_AC_MASK		0x000000FF
++#define TLAN_CH_PARM			0x04
++#define TLAN_DIO_ADR			0x08
++#define		TLAN_DA_ADR_INC		0x8000
++#define		TLAN_DA_RAM_ADR		0x4000
++#define TLAN_HOST_INT			0x0A
++#define		TLAN_HI_IV_MASK		0x1FE0
++#define		TLAN_HI_IT_MASK		0x001C
++#define TLAN_DIO_DATA			0x0C
++
++
++/* ThunderLAN Internal Register DIO Offsets */
++
++#define TLAN_NET_CMD			0x00
++#define		TLAN_NET_CMD_NRESET	0x80
++#define		TLAN_NET_CMD_NWRAP	0x40
++#define		TLAN_NET_CMD_CSF	0x20
++#define		TLAN_NET_CMD_CAF	0x10
++#define		TLAN_NET_CMD_NOBRX	0x08
++#define		TLAN_NET_CMD_DUPLEX	0x04
++#define		TLAN_NET_CMD_TRFRAM	0x02
++#define		TLAN_NET_CMD_TXPACE	0x01
++#define TLAN_NET_SIO			0x01
++#define 	TLAN_NET_SIO_MINTEN	0x80
++#define		TLAN_NET_SIO_ECLOK	0x40
++#define		TLAN_NET_SIO_ETXEN	0x20
++#define		TLAN_NET_SIO_EDATA	0x10
++#define		TLAN_NET_SIO_NMRST	0x08
++#define		TLAN_NET_SIO_MCLK	0x04
++#define		TLAN_NET_SIO_MTXEN	0x02
++#define		TLAN_NET_SIO_MDATA	0x01
++#define TLAN_NET_STS			0x02
++#define		TLAN_NET_STS_MIRQ	0x80
++#define		TLAN_NET_STS_HBEAT	0x40
++#define		TLAN_NET_STS_TXSTOP	0x20
++#define		TLAN_NET_STS_RXSTOP	0x10
++#define		TLAN_NET_STS_RSRVD	0x0F
++#define TLAN_NET_MASK			0x03
++#define		TLAN_NET_MASK_MASK7	0x80
++#define		TLAN_NET_MASK_MASK6	0x40
++#define		TLAN_NET_MASK_MASK5	0x20
++#define		TLAN_NET_MASK_MASK4	0x10
++#define		TLAN_NET_MASK_RSRVD	0x0F
++#define TLAN_NET_CONFIG			0x04
++#define 	TLAN_NET_CFG_RCLK	0x8000
++#define		TLAN_NET_CFG_TCLK	0x4000
++#define		TLAN_NET_CFG_BIT	0x2000
++#define		TLAN_NET_CFG_RXCRC	0x1000
++#define		TLAN_NET_CFG_PEF	0x0800
++#define		TLAN_NET_CFG_1FRAG	0x0400
++#define		TLAN_NET_CFG_1CHAN	0x0200
++#define		TLAN_NET_CFG_MTEST	0x0100
++#define		TLAN_NET_CFG_PHY_EN	0x0080
++#define		TLAN_NET_CFG_MSMASK	0x007F
++#define TLAN_MAN_TEST			0x06
++#define TLAN_DEF_VENDOR_ID		0x08
++#define TLAN_DEF_DEVICE_ID		0x0A
++#define TLAN_DEF_REVISION		0x0C
++#define TLAN_DEF_SUBCLASS		0x0D
++#define TLAN_DEF_MIN_LAT		0x0E
++#define TLAN_DEF_MAX_LAT		0x0F
++#define TLAN_AREG_0			0x10
++#define TLAN_AREG_1			0x16
++#define TLAN_AREG_2			0x1C
++#define TLAN_AREG_3			0x22
++#define TLAN_HASH_1			0x28
++#define TLAN_HASH_2			0x2C
++#define TLAN_GOOD_TX_FRMS		0x30
++#define TLAN_TX_UNDERUNS		0x33
++#define TLAN_GOOD_RX_FRMS		0x34
++#define TLAN_RX_OVERRUNS		0x37
++#define TLAN_DEFERRED_TX		0x38
++#define TLAN_CRC_ERRORS			0x3A
++#define TLAN_CODE_ERRORS		0x3B
++#define TLAN_MULTICOL_FRMS		0x3C
++#define TLAN_SINGLECOL_FRMS		0x3E
++#define TLAN_EXCESSCOL_FRMS		0x40
++#define TLAN_LATE_COLS			0x41
++#define TLAN_CARRIER_LOSS		0x42
++#define TLAN_ACOMMIT			0x43
++#define TLAN_LED_REG			0x44
++#define		TLAN_LED_ACT		0x10
++#define		TLAN_LED_LINK		0x01
++#define TLAN_BSIZE_REG			0x45
++#define TLAN_MAX_RX			0x46
++#define TLAN_INT_DIS			0x48
++#define		TLAN_ID_TX_EOC		0x04
++#define		TLAN_ID_RX_EOF		0x02
++#define		TLAN_ID_RX_EOC		0x01
++
++
++
++/* ThunderLAN Interrupt Codes */
++
++#define TLAN_INT_NUMBER_OF_INTS	8
++
++#define TLAN_INT_NONE			0x0000
++#define TLAN_INT_TX_EOF			0x0001
++#define TLAN_INT_STAT_OVERFLOW		0x0002
++#define TLAN_INT_RX_EOF			0x0003
++#define TLAN_INT_DUMMY			0x0004
++#define TLAN_INT_TX_EOC			0x0005
++#define TLAN_INT_STATUS_CHECK		0x0006
++#define TLAN_INT_RX_EOC			0x0007
++
++
++
++/* ThunderLAN MII Registers */
++
++/* Generic MII/PHY Registers */
++
++#define MII_GEN_CTL			0x00
++#define 	MII_GC_RESET		0x8000
++#define		MII_GC_LOOPBK		0x4000
++#define		MII_GC_SPEEDSEL		0x2000
++#define		MII_GC_AUTOENB		0x1000
++#define		MII_GC_PDOWN		0x0800
++#define		MII_GC_ISOLATE		0x0400
++#define		MII_GC_AUTORSRT		0x0200
++#define		MII_GC_DUPLEX		0x0100
++#define		MII_GC_COLTEST		0x0080
++#define		MII_GC_RESERVED		0x007F
++#define MII_GEN_STS			0x01
++#define		MII_GS_100BT4		0x8000
++#define		MII_GS_100BTXFD		0x4000
++#define		MII_GS_100BTXHD		0x2000
++#define		MII_GS_10BTFD		0x1000
++#define		MII_GS_10BTHD		0x0800
++#define		MII_GS_RESERVED		0x07C0
++#define		MII_GS_AUTOCMPLT	0x0020
++#define		MII_GS_RFLT		0x0010
++#define		MII_GS_AUTONEG		0x0008
++#define		MII_GS_LINK		0x0004
++#define		MII_GS_JABBER		0x0002
++#define		MII_GS_EXTCAP		0x0001
++#define MII_GEN_ID_HI			0x02
++#define MII_GEN_ID_LO			0x03
++#define 	MII_GIL_OUI		0xFC00
++#define 	MII_GIL_MODEL		0x03F0
++#define 	MII_GIL_REVISION	0x000F
++#define MII_AN_ADV			0x04
++#define MII_AN_LPA			0x05
++#define MII_AN_EXP			0x06
++
++/* ThunderLAN Specific MII/PHY Registers */
++
++#define TLAN_TLPHY_ID			0x10
++#define TLAN_TLPHY_CTL			0x11
++#define 	TLAN_TC_IGLINK		0x8000
++#define		TLAN_TC_SWAPOL		0x4000
++#define		TLAN_TC_AUISEL		0x2000
++#define		TLAN_TC_SQEEN		0x1000
++#define		TLAN_TC_MTEST		0x0800
++#define		TLAN_TC_RESERVED	0x07F8
++#define		TLAN_TC_NFEW		0x0004
++#define		TLAN_TC_INTEN		0x0002
++#define		TLAN_TC_TINT		0x0001
++#define TLAN_TLPHY_STS			0x12
++#define		TLAN_TS_MINT		0x8000
++#define		TLAN_TS_PHOK		0x4000
++#define		TLAN_TS_POLOK		0x2000
++#define		TLAN_TS_TPENERGY	0x1000
++#define		TLAN_TS_RESERVED	0x0FFF
++#define TLAN_TLPHY_PAR			0x19
++#define		TLAN_PHY_CIM_STAT	0x0020
++#define		TLAN_PHY_SPEED_100	0x0040
++#define		TLAN_PHY_DUPLEX_FULL	0x0080
++#define		TLAN_PHY_AN_EN_STAT     0x0400
++
++/* National Sem. & Level1 PHY id's */
++#define NAT_SEM_ID1			0x2000
++#define NAT_SEM_ID2			0x5C01
++#define LEVEL1_ID1			0x7810
++#define LEVEL1_ID2			0x0000
++
++#define CIRC_INC( a, b ) if ( ++a >= b ) a = 0
++
++/* Routines to access internal registers. */
++
++inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
++{
++	outw(internal_addr, base_addr + TLAN_DIO_ADR);
++	return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)));
++
++}				/* TLan_DioRead8 */
++
++
++
++
++inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
++{
++	outw(internal_addr, base_addr + TLAN_DIO_ADR);
++	return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2)));
++
++}				/* TLan_DioRead16 */
++
++
++
++
++inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
++{
++	outw(internal_addr, base_addr + TLAN_DIO_ADR);
++	return (inl(base_addr + TLAN_DIO_DATA));
++
++}				/* TLan_DioRead32 */
++
++
++
++
++inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
++{
++	outw(internal_addr, base_addr + TLAN_DIO_ADR);
++	outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
++
++}
++
++
++
++
++inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
++{
++	outw(internal_addr, base_addr + TLAN_DIO_ADR);
++	outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
++
++}
++
++
++
++
++inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
++{
++	outw(internal_addr, base_addr + TLAN_DIO_ADR);
++	outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
++
++}
++
++
++
++#if 0
++inline void TLan_ClearBit(u8 bit, u16 port)
++{
++	outb_p(inb_p(port) & ~bit, port);
++}
++
++
++
++
++inline int TLan_GetBit(u8 bit, u16 port)
++{
++	return ((int) (inb_p(port) & bit));
++}
++
++
++
++
++inline void TLan_SetBit(u8 bit, u16 port)
++{
++	outb_p(inb_p(port) | bit, port);
++}
++#endif
++
++#define TLan_ClearBit( bit, port )	outb_p(inb_p(port) & ~bit, port)
++#define TLan_GetBit( bit, port )	((int) (inb_p(port) & bit))
++#define TLan_SetBit( bit, port )	outb_p(inb_p(port) | bit, port)
++
++#ifdef I_LIKE_A_FAST_HASH_FUNCTION
++/* given 6 bytes, view them as 8 6-bit numbers and return the XOR of those */
++/* the code below is about seven times as fast as the original code */
++inline u32 TLan_HashFunc(u8 * a)
++{
++	u8 hash;
++
++	hash = (a[0] ^ a[3]);	/* & 077 */
++	hash ^= ((a[0] ^ a[3]) >> 6);	/* & 003 */
++	hash ^= ((a[1] ^ a[4]) << 2);	/* & 074 */
++	hash ^= ((a[1] ^ a[4]) >> 4);	/* & 017 */
++	hash ^= ((a[2] ^ a[5]) << 4);	/* & 060 */
++	hash ^= ((a[2] ^ a[5]) >> 2);	/* & 077 */
++
++	return (hash & 077);
++}
++
++#else				/* original code */
++
++inline u32 xor(u32 a, u32 b)
++{
++	return ((a && !b) || (!a && b));
++}
++
++#define XOR8( a, b, c, d, e, f, g, h )	xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
++#define DA( a, bit )					( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
++
++inline u32 TLan_HashFunc(u8 * a)
++{
++	u32 hash;
++
++	hash =
++	    XOR8(DA(a, 0), DA(a, 6), DA(a, 12), DA(a, 18), DA(a, 24),
++		 DA(a, 30), DA(a, 36), DA(a, 42));
++	hash |=
++	    XOR8(DA(a, 1), DA(a, 7), DA(a, 13), DA(a, 19), DA(a, 25),
++		 DA(a, 31), DA(a, 37), DA(a, 43)) << 1;
++	hash |=
++	    XOR8(DA(a, 2), DA(a, 8), DA(a, 14), DA(a, 20), DA(a, 26),
++		 DA(a, 32), DA(a, 38), DA(a, 44)) << 2;
++	hash |=
++	    XOR8(DA(a, 3), DA(a, 9), DA(a, 15), DA(a, 21), DA(a, 27),
++		 DA(a, 33), DA(a, 39), DA(a, 45)) << 3;
++	hash |=
++	    XOR8(DA(a, 4), DA(a, 10), DA(a, 16), DA(a, 22), DA(a, 28),
++		 DA(a, 34), DA(a, 40), DA(a, 46)) << 4;
++	hash |=
++	    XOR8(DA(a, 5), DA(a, 11), DA(a, 17), DA(a, 23), DA(a, 29),
++		 DA(a, 35), DA(a, 41), DA(a, 47)) << 5;
++
++	return hash;
++
++}
++
++#endif				/* I_LIKE_A_FAST_HASH_FUNCTION */
+diff -Naur grub-0.97.orig/netboot/tulip.c grub-0.97/netboot/tulip.c
+--- grub-0.97.orig/netboot/tulip.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/tulip.c	2005-08-31 19:03:35.000000000 +0000
+@@ -48,6 +48,7 @@
+ /*********************************************************************/
+ 
+ /*
++  07 Sep 2003  timlegge	Multicast Support Added
+   11 Apr 2001  mdc     [patch to etherboot 4.7.24]
+      Major rewrite to include Linux tulip driver media detection
+      code.  This driver should support a lot more cards now.
+@@ -98,7 +99,6 @@
+      and thinguin mailing lists.
+ */
+ 
+-
+ /*********************************************************************/
+ /* Declarations                                                      */
+ /*********************************************************************/
+@@ -106,31 +106,29 @@
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ 
+ /* User settable parameters */
+ 
+-#undef   TULIP_DEBUG
+-#undef   TULIP_DEBUG_WHERE
++#undef	TULIP_DEBUG
++#undef	TULIP_DEBUG_WHERE
++#ifdef	TULIP_DEBUG
+ static int tulip_debug = 2;             /* 1 normal messages, 0 quiet .. 7 verbose. */
++#endif
+ 
+ #define TX_TIME_OUT       2*TICKS_PER_SEC
+ 
+-typedef unsigned char  u8;
+-typedef   signed char  s8;
+-typedef unsigned short u16;
+-typedef   signed short s16;
+-typedef unsigned int   u32;
+-typedef   signed int   s32;
++typedef uint8_t    u8;
++typedef  int8_t    s8;
++typedef uint16_t   u16;
++typedef  int16_t   s16;
++typedef uint32_t   u32;
++typedef  int32_t   s32;
+ 
+ /* helpful macros if on a big_endian machine for changing byte order.
+    not strictly needed on Intel */
+-#define le16_to_cpu(val) (val)
+-#define cpu_to_le32(val) (val)
+ #define get_unaligned(ptr) (*(ptr))
+ #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+ #define get_u16(ptr) (*(u16 *)(ptr))
+-#define virt_to_bus(x) ((unsigned long)x)
+ #define virt_to_le32desc(addr)  virt_to_bus(addr)
+ 
+ #define TULIP_IOTYPE  PCI_USES_MASTER | PCI_USES_IO | PCI_ADDR0
+@@ -212,6 +210,8 @@
+       TULIP_IOTYPE, 256, PNIC2 },
+     { "ADMtek AN981 Comet", { 0x09811317, 0xffffffff, 0, 0, 0, 0 },
+       TULIP_IOTYPE, 256, COMET },
++    { "ADMTek AN983 Comet", { 0x12161113, 0xffffffff, 0, 0, 0, 0 },
++      TULIP_IOTYPE, 256, COMET },
+     { "ADMtek Centaur-P", { 0x09851317, 0xffffffff, 0, 0, 0, 0 },
+       TULIP_IOTYPE, 256, COMET },
+     { "ADMtek Centaur-C", { 0x19851317, 0xffffffff, 0, 0, 0, 0 },
+@@ -280,9 +280,13 @@
+ static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };
+ static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
+ 
++/* not used
+ static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, };
++*/
+ static u16 t21142_csr14[] = { 0xFFFF, 0x0705, 0x0705, 0x0000, 0x7F3D, };
++/* not used
+ static u16 t21142_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
++*/
+ 
+ /* Offsets to the Command and Status Registers, "CSRs".  All accesses
+    must be longword instructions and quadword aligned. */
+@@ -300,6 +304,14 @@
+     TxFIFOUnderflow=0x20, TxJabber=0x08, TxNoBuf=0x04, TxDied=0x02, TxIntr=0x01,
+ };
+ 
++/* The configuration bits in CSR6. */
++enum csr6_mode_bits {
++	TxOn=0x2000, RxOn=0x0002, FullDuplex=0x0200,
++	AcceptBroadcast=0x0100, AcceptAllMulticast=0x0080,
++	AcceptAllPhys=0x0040, AcceptRunt=0x0008,
++};
++
++
+ enum desc_status_bits {
+     DescOwnded=0x80000000, RxDescFatalErr=0x8000, RxWholePkt=0x0300,
+ };
+@@ -384,21 +396,11 @@
+ 
+ #define TX_RING_SIZE	2
+ static struct tulip_tx_desc tx_ring[TX_RING_SIZE] __attribute__ ((aligned(4)));
+-
+-#ifdef USE_LOWMEM_BUFFER
+-#define txb ((char *)0x10000 - BUFLEN)
+-#else
+ static unsigned char txb[BUFLEN] __attribute__ ((aligned(4)));
+-#endif
+ 
+ #define RX_RING_SIZE	4
+ static struct tulip_rx_desc rx_ring[RX_RING_SIZE] __attribute__ ((aligned(4)));
+-
+-#ifdef USE_LOWMEM_BUFFER
+-#define rxb ((char *)0x10000 - RX_RING_SIZE * BUFLEN - BUFLEN)
+-#else
+ static unsigned char rxb[RX_RING_SIZE * BUFLEN] __attribute__ ((aligned(4)));
+-#endif
+ 
+ static struct tulip_private {
+     int cur_rx;
+@@ -471,7 +473,6 @@
+ static const char * block_name[] = {"21140 non-MII", "21140 MII PHY",
+                                     "21142 Serial PHY", "21142 MII PHY", "21143 SYM PHY", "21143 reset method"};
+ 
+-
+ /*********************************************************************/
+ /* Function Prototypes                                               */
+ /*********************************************************************/
+@@ -479,14 +480,13 @@
+ static void mdio_write(struct nic *nic, int phy_id, int location, int value);
+ static int read_eeprom(unsigned long ioaddr, int location, int addr_len);
+ static void parse_eeprom(struct nic *nic);
+-struct nic *tulip_probe(struct nic *nic, unsigned short *io_addrs,
+-                        struct pci_device *pci);
++static int tulip_probe(struct dev *dev, struct pci_device *pci);
+ static void tulip_init_ring(struct nic *nic);
+ static void tulip_reset(struct nic *nic);
+ static void tulip_transmit(struct nic *nic, const char *d, unsigned int t,
+                            unsigned int s, const char *p);
+-static int tulip_poll(struct nic *nic);
+-static void tulip_disable(struct nic *nic);
++static int tulip_poll(struct nic *nic, int retrieve);
++static void tulip_disable(struct dev *dev);
+ static void nway_start(struct nic *nic);
+ static void pnic_do_nway(struct nic *nic);
+ static void select_media(struct nic *nic, int startup);
+@@ -504,7 +504,6 @@
+ static void tulip_more(void);
+ #endif
+ 
+-
+ /*********************************************************************/
+ /* Utility Routines                                                  */
+ /*********************************************************************/
+@@ -535,7 +534,6 @@
+         /* wait */ ;
+ }
+ 
+-
+ /*********************************************************************/
+ /* Media Descriptor Code                                             */
+ /*********************************************************************/
+@@ -565,7 +563,7 @@
+    MDIO protocol.  See the MII specifications or DP83840A data sheet
+    for details. */
+ 
+-int mdio_read(struct nic *nic, int phy_id, int location)
++int mdio_read(struct nic *nic __unused, int phy_id, int location)
+ {
+     int i;
+     int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
+@@ -626,7 +624,7 @@
+     return (retval>>1) & 0xffff;
+ }
+ 
+-void mdio_write(struct nic *nic, int phy_id, int location, int value)
++void mdio_write(struct nic *nic __unused, int phy_id, int location, int value)
+ {
+     int i;
+     int cmd = (0x5002 << 16) | (phy_id << 23) | (location<<18) | value;
+@@ -682,7 +680,6 @@
+     }
+ }
+ 
+-
+ /*********************************************************************/
+ /* EEPROM Reading Code                                               */
+ /*********************************************************************/
+@@ -727,7 +724,6 @@
+     return retval;
+ }
+ 
+-
+ /*********************************************************************/
+ /* EEPROM Parsing Code                                               */
+ /*********************************************************************/
+@@ -895,11 +891,10 @@
+     }
+ }
+ 
+-
+ /*********************************************************************/
+ /* tulip_init_ring - setup the tx and rx descriptors                */
+ /*********************************************************************/
+-static void tulip_init_ring(struct nic *nic)
++static void tulip_init_ring(struct nic *nic __unused)
+ {
+     int i;
+ 
+@@ -935,7 +930,22 @@
+     /* Mark the last entry as wrapping the ring, though this should never happen */
+     tx_ring[1].length  = cpu_to_le32(DESC_RING_WRAP | BUFLEN);
+ }
+-
++
++static void set_rx_mode(struct nic *nic __unused) {
++	int csr6 = inl(ioaddr + CSR6) & ~0x00D5;
++
++	tp->csr6 &= ~0x00D5;
++ 
++	/* !IFF_PROMISC */
++	tp->csr6 |= AcceptAllMulticast;
++	csr6 |= AcceptAllMulticast;
++
++	outl(csr6, ioaddr + CSR6);
++
++	
++	
++}
++
+ /*********************************************************************/
+ /* eth_reset - Reset adapter                                         */
+ /*********************************************************************/
+@@ -943,7 +953,6 @@
+ {
+     int i;
+     unsigned long to;
+-    u32 addr_low, addr_high;
+ 
+ #ifdef TULIP_DEBUG_WHERE
+     whereami("tulip_reset\n");
+@@ -956,7 +965,7 @@
+     if (tp->mii_cnt  ||  (tp->mtable  &&  tp->mtable->has_mii)) {
+ 	outl(0x814C0000, ioaddr + CSR6);
+     }
+-  
++ 
+     /* Reset the chip, holding bit 0 set at least 50 PCI cycles. */
+     outl(0x00000001, ioaddr + CSR0);
+     tulip_wait(1);
+@@ -1022,8 +1031,8 @@
+     }
+ 
+     /* Point to rx and tx descriptors */
+-    outl((unsigned long)&rx_ring[0], ioaddr + CSR3);
+-    outl((unsigned long)&tx_ring[0], ioaddr + CSR4);
++    outl(virt_to_le32desc(&rx_ring[0]), ioaddr + CSR3);
++    outl(virt_to_le32desc(&tx_ring[0]), ioaddr + CSR4);
+ 
+     init_media(nic);
+ 
+@@ -1049,11 +1058,12 @@
+     if (tp->chip_id == LC82C168)
+ 	tulip_check_duplex(nic);
+ 
++    set_rx_mode(nic); 	
++        
+     /* enable transmit and receive */
+     outl(tp->csr6 | 0x00002002, ioaddr + CSR6);
+ }
+ 
+-
+ /*********************************************************************/
+ /* eth_transmit - Transmit a frame                                   */
+ /*********************************************************************/
+@@ -1095,7 +1105,7 @@
+     tx_ring[0].status = cpu_to_le32(0x80000000);
+ 
+     /* Point to transmit descriptor */
+-    outl((u32)&tx_ring[0], ioaddr + CSR4);
++    outl(virt_to_le32desc(&tx_ring[0]), ioaddr + CSR4);
+ 
+     /* Enable Tx */
+     outl(csr6 | 0x00002000, ioaddr + CSR6);
+@@ -1113,11 +1123,11 @@
+     /* Disable Tx */
+     outl(csr6 & ~0x00002000, ioaddr + CSR6);
+ }
+-
++
+ /*********************************************************************/
+ /* eth_poll - Wait for a frame                                       */
+ /*********************************************************************/
+-static int tulip_poll(struct nic *nic)
++static int tulip_poll(struct nic *nic, int retrieve)
+ {
+ 
+ #ifdef TULIP_DEBUG_WHERE
+@@ -1128,6 +1138,8 @@
+     if (rx_ring[tp->cur_rx].status & 0x80000000)
+         return 0;
+ 
++    if ( ! retrieve ) return 1;
++
+ #ifdef TULIP_DEBUG_WHERE
+     whereami("tulip_poll got one\n");
+ #endif
+@@ -1151,17 +1163,20 @@
+ 
+     return 1;
+ }
+-
++
+ /*********************************************************************/
+ /* eth_disable - Disable the interface                               */
+ /*********************************************************************/
+-static void tulip_disable(struct nic *nic)
++static void tulip_disable(struct dev *dev)
+ {
+-
++    struct nic *nic = (struct nic *)dev;
+ #ifdef TULIP_DEBUG_WHERE
+     whereami("tulip_disable\n");
+ #endif
+ 
++    /* merge reset and disable */
++    tulip_reset(nic);
++
+     /* disable interrupts */
+     outl(0x00000000, ioaddr + CSR7);
+ 
+@@ -1171,24 +1186,41 @@
+     /* Clear the missed-packet counter. */
+     (volatile unsigned long)inl(ioaddr + CSR8);
+ }
+-
++
++/*********************************************************************/
++/*IRQ - Enable, Disable, or Force interrupts                         */
++/*********************************************************************/
++static void tulip_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
+ /*********************************************************************/
+ /* eth_probe - Look for an adapter                                   */
+ /*********************************************************************/
+-struct nic *tulip_probe(struct nic *nic, unsigned short *io_addrs,
+-                        struct pci_device *pci)
++static int tulip_probe(struct dev *dev, struct pci_device *pci)
+ {
+-    u32 i, l1, l2;
++    struct nic *nic = (struct nic *)dev;
++    u32 i;
+     u8  chip_rev;
+     u8 ee_data[EEPROM_SIZE];
+     unsigned short sum;
+     int chip_idx;
+     static unsigned char last_phys_addr[ETH_ALEN] = {0x00, 'L', 'i', 'n', 'u', 'x'};
+ 
+-    if (io_addrs == 0 || *io_addrs == 0)
++    if (pci->ioaddr == 0)
+         return 0;
+ 
+-    ioaddr         = *io_addrs;
++    ioaddr         = pci->ioaddr;
++    nic->ioaddr    = pci->ioaddr & ~3;
++    nic->irqno     = 0;
+ 
+     /* point to private storage */
+     tp = &tpx;
+@@ -1378,15 +1410,15 @@
+     /* reset the device and make ready for tx and rx of packets */
+     tulip_reset(nic);
+ 
+-    nic->reset    = tulip_reset;
++    dev->disable  = tulip_disable;
+     nic->poll     = tulip_poll;
+     nic->transmit = tulip_transmit;
+-    nic->disable  = tulip_disable;
++    nic->irq      = tulip_irq;
+ 
+     /* give the board a chance to reset before returning */
+     tulip_wait(4*TICKS_PER_SEC);
+ 
+-    return nic;
++    return 1;
+ }
+ 
+ static void start_link(struct nic *nic)
+@@ -1508,7 +1540,7 @@
+     }
+ }
+ 
+-static void nway_start(struct nic *nic)
++static void nway_start(struct nic *nic __unused)
+ {
+     int csr14 = ((tp->sym_advertise & 0x0780) << 9)  |
+         ((tp->sym_advertise&0x0020)<<1) | 0xffbf;
+@@ -1662,7 +1694,7 @@
+     }
+ }
+ 
+-static void pnic_do_nway(struct nic *nic)
++static void pnic_do_nway(struct nic *nic __unused)
+ {
+     u32 phy_reg = inl(ioaddr + 0xB8);
+     u32 new_csr6 = tp->csr6 & ~0x40C40200;
+@@ -1886,8 +1918,8 @@
+         }
+     } else if (tp->chip_id == DC21040) {                                        /* 21040 */
+         /* Turn on the xcvr interface. */
+-        int csr12 = inl(ioaddr + CSR12);
+ #ifdef TULIP_DEBUG
++        int csr12 = inl(ioaddr + CSR12);
+         if (tulip_debug > 1)
+             printf("%s: 21040 media type is %s, CSR12 is %hhX.\n",
+                    tp->nic_name, medianame[tp->if_port], csr12);
+@@ -1987,3 +2019,51 @@
+ 
+         return 0;
+ }
++
++static struct pci_id tulip_nics[] = {
++PCI_ROM(0x1011, 0x0002, "dc21040",     "Digital Tulip"),
++PCI_ROM(0x1011, 0x0009, "ds21140",     "Digital Tulip Fast"),
++PCI_ROM(0x1011, 0x0014, "dc21041",     "Digital Tulip+"),
++PCI_ROM(0x1011, 0x0019, "ds21142",     "Digital Tulip 21142"),
++PCI_ROM(0x10b7, 0x9300, "3csoho100b-tx","3ComSOHO100B-TX"),
++PCI_ROM(0x10b9, 0x5261, "ali1563",     "ALi 1563 integrated ethernet"),
++PCI_ROM(0x10d9, 0x0512, "mx98713",     "Macronix MX987x3"),
++PCI_ROM(0x10d9, 0x0531, "mx98715",     "Macronix MX987x5"),
++PCI_ROM(0x1113, 0x1217, "mxic-98715",  "Macronix MX987x5"),
++PCI_ROM(0x11ad, 0xc115, "lc82c115",    "LinkSys LNE100TX"),
++PCI_ROM(0x11ad, 0x0002, "82c168",      "Netgear FA310TX"),
++PCI_ROM(0x1282, 0x9100, "dm9100",      "Davicom 9100"),
++PCI_ROM(0x1282, 0x9102, "dm9102",      "Davicom 9102"),
++PCI_ROM(0x1282, 0x9009, "dm9009",      "Davicom 9009"),
++PCI_ROM(0x1282, 0x9132, "dm9132",      "Davicom 9132"),
++PCI_ROM(0x1317, 0x0985, "centaur-p",   "ADMtek Centaur-P"),
++PCI_ROM(0x1317, 0x0981, "an981",       "ADMtek AN981 Comet"),		/* ADMTek Centaur-P (stmicro) */
++PCI_ROM(0x1113, 0x1216, "an983",       "ADMTek AN983 Comet"),
++PCI_ROM(0x1317, 0x9511, "an983b",      "ADMTek Comet 983b"),
++PCI_ROM(0x1317, 0x1985, "centaur-c",   "ADMTek Centaur-C"),
++PCI_ROM(0x8086, 0x0039, "intel21145",  "Intel Tulip"),
++PCI_ROM(0x125b, 0x1400, "ax88140",     "ASIX AX88140"),
++PCI_ROM(0x11f6, 0x9881, "rl100tx",     "Compex RL100-TX"),
++PCI_ROM(0x115d, 0x0003, "xircomtulip", "Xircom Tulip"),
++PCI_ROM(0x104a, 0x0981, "tulip-0981",  "Tulip 0x104a 0x0981"),
++PCI_ROM(0x104a, 0x2774, "tulip-2774",  "Tulip 0x104a 0x2774"),
++PCI_ROM(0x1113, 0x9511, "tulip-9511",  "Tulip 0x1113 0x9511"),
++PCI_ROM(0x1186, 0x1561, "tulip-1561",  "Tulip 0x1186 0x1561"),
++PCI_ROM(0x1259, 0xa120, "tulip-a120",  "Tulip 0x1259 0xa120"),
++PCI_ROM(0x13d1, 0xab02, "tulip-ab02",  "Tulip 0x13d1 0xab02"),
++PCI_ROM(0x13d1, 0xab03, "tulip-ab03",  "Tulip 0x13d1 0xab03"),
++PCI_ROM(0x13d1, 0xab08, "tulip-ab08",  "Tulip 0x13d1 0xab08"),
++PCI_ROM(0x14f1, 0x1803, "lanfinity",   "Conexant LANfinity"),
++PCI_ROM(0x1626, 0x8410, "tulip-8410",  "Tulip 0x1626 0x8410"),
++PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08"),
++PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09"),
++};
++
++struct pci_driver tulip_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "Tulip",
++	.probe    = tulip_probe,
++	.ids      = tulip_nics,
++	.id_count = sizeof(tulip_nics)/sizeof(tulip_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/netboot/tulip.txt grub-0.97/netboot/tulip.txt
+--- grub-0.97.orig/netboot/tulip.txt	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/tulip.txt	1970-01-01 00:00:00.000000000 +0000
+@@ -1,53 +0,0 @@
+-This software may be used and distributed according to the terms of
+-the GNU Public License, incorporated herein by reference.
+-
+-This is a tulip and clone driver for Etherboot.  See the revision
+-history in the tulip.c file for information on changes.  This version
+-of the driver incorporates changes from Bob Edwards and Paul Mackerras
+-who cantributed changes to support the TRENDnet TE100-PCIA NIC which
+-uses a genuine Intel 21143-PD chipset.  There are also various code
+-cleanups to make time-based activities more reliable.
+-
+-Of course you have to have all the usual Etherboot environment
+-(bootp/dhcp/NFS) set up, and you need a Linux kernel with v0.91g
+-(7.16.99) or later of the tulip.c driver compiled in to support some
+-MX98715 based cards.  That file is available at:
+-
+-  http://cesdis.gsfc.nasa.gov/linux/drivers/test/tulip.c
+-
+-NOTES
+-
+-I've tested this driver with a SOHOware Fast 10/100 Model SDA110A,
+-a Linksys LNE100TX v2.0, and a Netgear FA310TX card, and it worked at
+-both 10 and 100 mbits. Other cards based on the tulip family may work as
+-well.
+-
+-These cards are about 20$US, are supported by Linux and now Etherboot,
+-and being PCI, they auto-configure IRQ and IOADDR and auto-negotiate
+-10/100 half/full duplex. It seems like a pretty good value compared to
+-some of the pricier cards, and can lower the cost of building/adapting
+-thin client workstations substantially while giving a considerable
+-performance increase.
+-
+-On some PCI tulip clone chipsets (MX987x5, LC82C115, LC82C168) this driver 
+-lets the card choose the fastest speed it can negotiate with the peer
+-device.  On other cards, it chooses 10mbit half-duplex.
+-
+-I burned an AM27C256 (32KByte) EPROM with mx987x5.lzrom and it worked.
+-According to the data sheet the MX98715A supports up to 64K (27C512)
+-EPROMs, 
+-
+-I've liberally commented the code and header files in the hope that it
+-will help the next person who hacks the code or needs to support some
+-tulip clone card, or wishes to add functionality.
+-
+-Anyway, please test this if you can on your tulip based card, and let
+-me (mdc@thinguin.org) and the netboot list (netboot@baghira.han.de)
+-know how things go.  I also would appreciate code review by people who
+-program.  I'm a strong believer in "another set of eyes".
+-
+-Regards,
+-
+-Marty Connor
+-mdc@thinguin.org
+-http://www.thinguin.org/
+diff -Naur grub-0.97.orig/netboot/types.h grub-0.97/netboot/types.h
+--- grub-0.97.orig/netboot/types.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/types.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,44 @@
++#ifndef _TYPES_H
++#define _TYPES_H
++
++/* I'm architecture independed :-) */
++
++/* 
++ * It's architecture depended headers for common integer types
++ */
++#include "stdint.h"
++
++/* 
++ * Here are some RPC types define from linux /usr/include/rpc/types.h
++ */
++typedef int bool_t;
++typedef int enum_t;
++typedef uint32_t rpcprog_t;
++typedef uint32_t rpcvers_t;
++typedef uint32_t rpcproc_t;
++typedef uint32_t rpcprot_t;
++typedef uint32_t rpcport_t;
++
++/* For bool_t */
++/* typedef enum { */
++/*  	FALSE = 0, */
++/*  	TRUE = 1 */
++/* } boolean_t; */
++
++
++
++/* Some BSD or RPC style types */
++typedef unsigned char u_char;
++typedef unsigned short u_short;
++typedef unsigned int u_int;
++typedef unsigned long u_long;
++typedef long long quad_t;
++typedef unsigned long long u_quad_t;
++typedef struct {
++	int __val[2];
++}fsid_t;			/* Type of file system IDs, from bits/types.h */
++
++typedef int daddr_t;		/* The type of a disk address, from bits/types.h */
++typedef char * caddr_t;
++
++#endif /* _TYPES_H */
+diff -Naur grub-0.97.orig/netboot/udp.h grub-0.97/netboot/udp.h
+--- grub-0.97.orig/netboot/udp.h	1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/netboot/udp.h	2005-08-31 19:03:35.000000000 +0000
+@@ -0,0 +1,30 @@
++#ifndef	_UDP_H
++#define	_UDP_H
++
++/* We need 'uint16_t' and 'uint8_t'  */
++#include "types.h"
++/* We need 'in_addr' */
++#include "in.h"
++
++struct udp_pseudo_hdr {
++	in_addr  src;
++	in_addr  dest;
++	uint8_t  unused;
++	uint8_t  protocol;
++	uint16_t len;
++};
++struct udphdr {
++	uint16_t src;
++	uint16_t dest;
++	uint16_t len;
++	uint16_t chksum;
++};
++
++extern void build_udp_hdr(unsigned long __destip, unsigned int __srcsock, 
++	      unsigned int __destsock, int __ttl, int __len, 
++	      const void * __buf);
++
++extern int udp_transmit(unsigned long __destip, unsigned int __srcsock,
++			unsigned int __destsock, int __len, const void * __buf);
++
++#endif	/* _UDP_H */
+diff -Naur grub-0.97.orig/netboot/via-rhine.c grub-0.97/netboot/via-rhine.c
+--- grub-0.97.orig/netboot/via-rhine.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/via-rhine.c	2005-08-31 19:03:35.000000000 +0000
+@@ -18,7 +18,7 @@
+ 
+ */
+ 
+-static const char *version = "rhine.c v1.0.0 2000-01-07\n";
++static const char *version = "rhine.c v1.0.1 2003-02-06\n";
+ 
+ /* A few user-configurable values. */
+ 
+@@ -46,7 +46,6 @@
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ 
+ /* define all ioaddr */
+ 
+@@ -103,6 +102,11 @@
+ #define byCFGD				ioaddr + 0x7b
+ #define wTallyCntMPA			ioaddr + 0x7c
+ #define wTallyCntCRC			ioaddr + 0x7d
++#define bySTICKHW			ioaddr + 0x83
++#define byWOLcrClr			ioaddr + 0xA4
++#define byWOLcgClr			ioaddr + 0xA7
++#define byPwrcsrClr			ioaddr + 0xAC
++
+ /*---------------------  Exioaddr Definitions -------------------------*/
+ 
+ /*
+@@ -617,9 +621,6 @@
+ 
+ */
+ 
+-#define PCI_VENDOR_ID_FET		0x1106
+-#define PCI_DEVICE_ID_FET_3043		0x3043
+-
+ /* The rest of these values should never change. */
+ #define NUM_TX_DESC	2	/* Number of Tx descriptor registers. */
+ 
+@@ -652,23 +653,19 @@
+ }
+ rhine;
+ 
+-static struct nic *rhine_probe1 (struct nic *dev, int ioaddr,
++static void rhine_probe1 (struct nic *nic, int ioaddr,
+ 				 int chip_id, int options);
+ static int QueryAuto (int);
+ static int ReadMII (int byMIIIndex, int);
+ static void WriteMII (char, char, char, int);
+ static void MIIDelay (void);
+ static void rhine_init_ring (struct nic *dev);
+-static void rhine_disable (struct nic *nic);
++static void rhine_disable (struct dev *dev);
+ static void rhine_reset (struct nic *nic);
+-static int rhine_poll (struct nic *nic);
++static int rhine_poll (struct nic *nic, int retreive);
+ static void rhine_transmit (struct nic *nic, const char *d, unsigned int t,
+ 			    unsigned int s, const char *p);
+ 
+-/* Linux support functions */
+-#define virt_to_bus(x) ((unsigned long)x)
+-#define bus_to_virt(x) ((void *)x)
+-
+ /* Initialize the Rx and Tx rings, along with various 'dev' bits. */
+ static void
+ rhine_init_ring (struct nic *nic)
+@@ -854,26 +851,99 @@
+     }
+ }
+ 
+-struct nic *
+-rhine_probe (struct nic *nic, unsigned short *probeaddrs,
+-	       struct pci_device *pci)
++/* Offsets to the device registers. */
++enum register_offsets {
++        StationAddr=0x00, RxConfig=0x06, TxConfig=0x07, ChipCmd=0x08,
++        IntrStatus=0x0C, IntrEnable=0x0E,
++        MulticastFilter0=0x10, MulticastFilter1=0x14,
++        RxRingPtr=0x18, TxRingPtr=0x1C, GFIFOTest=0x54,
++        MIIPhyAddr=0x6C, MIIStatus=0x6D, PCIBusConfig=0x6E,
++        MIICmd=0x70, MIIRegAddr=0x71, MIIData=0x72, MACRegEEcsr=0x74,
++        ConfigA=0x78, ConfigB=0x79, ConfigC=0x7A, ConfigD=0x7B,
++        RxMissed=0x7C, RxCRCErrs=0x7E, MiscCmd=0x81,
++        StickyHW=0x83, IntrStatus2=0x84, WOLcrClr=0xA4, WOLcgClr=0xA7,
++        PwrcsrClr=0xAC,
++};
++
++/* Bits in the interrupt status/mask registers. */
++enum intr_status_bits {
++        IntrRxDone=0x0001, IntrRxErr=0x0004, IntrRxEmpty=0x0020,
++        IntrTxDone=0x0002, IntrTxError=0x0008, IntrTxUnderrun=0x0210,
++        IntrPCIErr=0x0040,
++        IntrStatsMax=0x0080, IntrRxEarly=0x0100,
++        IntrRxOverflow=0x0400, IntrRxDropped=0x0800, IntrRxNoBuf=0x1000,
++        IntrTxAborted=0x2000, IntrLinkChange=0x4000,
++        IntrRxWakeUp=0x8000,
++        IntrNormalSummary=0x0003, IntrAbnormalSummary=0xC260,
++        IntrTxDescRace=0x080000,        /* mapped from IntrStatus2 */
++        IntrTxErrSummary=0x082218,
++};
++#define DEFAULT_INTR (IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | \
++                   IntrRxDropped | IntrRxNoBuf) 
++
++/***************************************************************************
++ IRQ - PXE IRQ Handler
++***************************************************************************/
++void rhine_irq ( struct nic *nic, irq_action_t action ) {
++     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
++     /* Enable interrupts by setting the interrupt mask. */
++     unsigned int intr_status;
++
++     switch ( action ) {
++          case DISABLE :
++          case ENABLE :
++               intr_status = inw(nic->ioaddr + IntrStatus);
++               /* On Rhine-II, Bit 3 indicates Tx descriptor write-back race. */
++               if (tp->chip_id == 0x3065)
++                   intr_status |= inb(nic->ioaddr + IntrStatus2) << 16;
++               intr_status = (intr_status & ~DEFAULT_INTR);
++               if ( action == ENABLE ) 
++                   intr_status = intr_status | DEFAULT_INTR;
++               outw(intr_status, nic->ioaddr + IntrEnable);
++               break;
++         case FORCE :
++               outw(0x0010, nic->ioaddr + 0x84);
++               break;
++         }
++}
++
++static int
++rhine_probe (struct dev *dev, struct pci_device *pci)
+ {
++    struct nic *nic = (struct nic *)dev;
++    struct rhine_private *tp = &rhine;
+     if (!pci->ioaddr)
+-	return NULL;
+-    nic = rhine_probe1 (nic, pci->ioaddr, 0, -1);
++	return 0;
++    rhine_probe1 (nic, pci->ioaddr, pci->dev_id, -1);
+ 
+-    if (nic)
+-	adjust_pci_device(pci);
+-    nic->poll = rhine_poll;
+-    nic->transmit = rhine_transmit;
+-    nic->reset = rhine_reset;
+-    nic->disable = rhine_disable;
++    adjust_pci_device(pci);
+     rhine_reset (nic);
+ 
+-    return nic;
++    dev->disable  = rhine_disable;
++    nic->poll     = rhine_poll;
++    nic->transmit = rhine_transmit;
++    nic->irqno	  = pci->irq;
++    nic->irq      = rhine_irq;
++    nic->ioaddr   = tp->ioaddr;
++
++
++    return 1;
++}
++
++static void set_rx_mode(struct nic *nic __unused) {
++    	struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
++	unsigned char rx_mode;
++    	int ioaddr = tp->ioaddr;
++
++	/* ! IFF_PROMISC */
++	outl(0xffffffff, byMAR0);
++	outl(0xffffffff, byMAR4);
++	rx_mode = 0x0C;
++
++	outb(0x60 /* thresh */ | rx_mode, byRCR );
+ }
+ 
+-static struct nic *
++static void
+ rhine_probe1 (struct nic *nic, int ioaddr, int chip_id, int options)
+ {
+     struct rhine_private *tp;
+@@ -885,6 +955,29 @@
+ 
+     if (rhine_debug > 0 && did_version++ == 0)
+ 	printf (version);
++
++    /* D-Link provided reset code (with comment additions) */
++    if((chip_id != 0x3043) && (chip_id != 0x6100)) {
++	unsigned char byOrgValue;
++	
++	if(rhine_debug > 0)
++		printf("Enabling Sticky Bit Workaround for Chip_id: 0x%hX\n"
++				, chip_id);
++	/* clear sticky bit before reset & read ethernet address */
++	byOrgValue = inb(bySTICKHW);
++	byOrgValue = byOrgValue & 0xFC;
++	outb(byOrgValue, bySTICKHW);
++
++	/* (bits written are cleared?) */
++	/* disable force PME-enable */
++	outb(0x80, byWOLcgClr);
++	/* disable power-event config bit */
++	outb(0xFF, byWOLcrClr);
++	/* clear power status (undocumented in vt6102 docs?) */
++	outb(0xFF, byPwrcsrClr);
++	
++    }
++
+     /* Perhaps this should be read from the EEPROM? */
+     for (i = 0; i < ETH_ALEN; i++)
+ 	nic->node_addr[i] = inb (byPAR0 + i);
+@@ -920,6 +1013,7 @@
+ 	}
+ #endif
+ 
++    
+     /* query MII to know LineSpeed,duplex mode */
+     byMIIvalue = inb (ioaddr + 0x6d);
+     LineSpeed = byMIIvalue & MIISR_SPEED;
+@@ -971,15 +1065,19 @@
+ 	if (tp->default_port)
+ 	    tp->medialock = 1;
+     }
+-    return nic;
++    return;
+ }
+ 
+-static void
+-rhine_disable (struct nic *nic)
++static void 
++rhine_disable (struct dev *dev)
+ {
++    struct nic *nic = (struct nic *)dev;
+     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
+     int ioaddr = tp->ioaddr;
+ 
++    /* merge reset and disable */
++    rhine_reset(nic);
++
+     printf ("rhine disable\n");
+     /* Switch to loopback mode to avoid hardware races. */
+     writeb(0x60 | 0x01, byTCR);
+@@ -1002,17 +1100,10 @@
+     int rx_bufs_tmp, rx_bufs_tmp1;
+     int tx_bufs_tmp, tx_bufs_tmp1;
+ 
+-#ifdef	USE_LOWMEM_BUFFER
+-#define buf1 (0x10000 - (RX_RING_SIZE * PKT_BUF_SZ + 32))
+-#define buf2 (buf1 - (RX_RING_SIZE * PKT_BUF_SZ + 32))
+-#define desc1 (buf2 - (TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32))
+-#define desc2 (desc1 - (TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32))
+-#else
+     static char buf1[RX_RING_SIZE * PKT_BUF_SZ + 32];
+     static char buf2[RX_RING_SIZE * PKT_BUF_SZ + 32];
+     static char desc1[TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32];
+     static char desc2[TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32];
+-#endif
+ 
+     /* printf ("rhine_reset\n"); */
+     /* Soft reset the chip. */
+@@ -1069,6 +1160,9 @@
+     outl (virt_to_bus (tp->rx_ring), dwCurrentRxDescAddr);
+     outl (virt_to_bus (tp->tx_ring), dwCurrentTxDescAddr);
+ 
++    /* Setup Multicast */	
++    set_rx_mode(nic);
++
+     /* close IMR */
+     outw (0x0000, byIMR0);
+ 
+@@ -1093,15 +1187,34 @@
+     /*set IMR to work */
+     outw (IMRShadow, byIMR0);
+ }
++/* Beware of PCI posted writes */
++#define IOSYNC  do { readb(nic->ioaddr + StationAddr); } while (0)
+ 
+ static int
+-rhine_poll (struct nic *nic)
++rhine_poll (struct nic *nic, int retreive)
+ {
+     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
+     int rxstatus, good = 0;;
+ 
+     if (tp->rx_ring[tp->cur_rx].rx_status.bits.own_bit == 0)
+     {
++        unsigned int intr_status;
++        /* There is a packet ready */
++        if(!retreive)
++            return 1;
++
++        intr_status = inw(nic->ioaddr + IntrStatus);
++        /* On Rhine-II, Bit 3 indicates Tx descriptor write-back race. */
++#if 0
++	if (tp->chip_id == 0x3065)
++	  intr_status |= inb(nic->ioaddr + IntrStatus2) << 16;
++#endif
++        /* Acknowledge all of the current interrupt sources ASAP. */
++        if (intr_status & IntrTxDescRace)
++           outb(0x08, nic->ioaddr + IntrStatus2);
++        outw(intr_status & 0xffff, nic->ioaddr + IntrStatus);
++	IOSYNC;
++
+ 	rxstatus = tp->rx_ring[tp->cur_rx].rx_status.lw;
+ 	if ((rxstatus & 0x0300) != 0x0300)
+ 	{
+@@ -1124,6 +1237,11 @@
+ 	tp->cur_rx++;
+ 	tp->cur_rx = tp->cur_rx % RX_RING_SIZE;
+     }
++        /* Acknowledge all of the current interrupt sources ASAP. */
++        outw(DEFAULT_INTR & ~IntrRxDone, nic->ioaddr + IntrStatus);
++
++        IOSYNC;
++
+     return good;
+ }
+ 
+@@ -1152,7 +1270,7 @@
+     while (s < ETH_ZLEN)
+ 	*((char *) tp->tx_buffs[entry] + ETH_HLEN + (s++)) = 0;
+ 
+-    tp->tx_ring[entry].tx_ctrl.bits.tx_buf_size = ETH_HLEN + s;
++    tp->tx_ring[entry].tx_ctrl.bits.tx_buf_size = s;
+ 
+     tp->tx_ring[entry].tx_status.bits.own_bit = 1;
+ 
+@@ -1170,6 +1288,9 @@
+     /*printf("td4=[%X]",inl(dwCurrentTDSE3)); */
+ 
+     outb (CR1bak, byCR1);
++    /* Wait until transmit is finished */
++    while (tp->tx_ring[entry].tx_status.bits.own_bit != 0)
++	;
+     tp->cur_tx++;
+ 
+     /*outw(IMRShadow,byIMR0); */
+@@ -1177,4 +1298,21 @@
+     /*tp->tx_skbuff[entry] = 0; */
+ }
+ 
++static struct pci_id rhine_nics[] = {
++PCI_ROM(0x1106, 0x3065, "dlink-530tx",     "VIA 6102"),
++PCI_ROM(0x1106, 0x3106, "via-rhine-6105",  "VIA 6105"),
++PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043"),		/* Rhine-I 86c100a */
++PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M"),	
++PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A"),	/* Rhine-II */
++};
++
++struct pci_driver rhine_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "VIA 86C100",
++	.probe    = rhine_probe,
++	.ids      = rhine_nics,
++	.id_count = sizeof(rhine_nics)/sizeof(rhine_nics[0]),
++	.class    = 0,
++};
++
+ /* EOF via-rhine.c */
+diff -Naur grub-0.97.orig/netboot/w89c840.c grub-0.97/netboot/w89c840.c
+--- grub-0.97.orig/netboot/w89c840.c	2003-07-09 11:45:38.000000000 +0000
++++ grub-0.97/netboot/w89c840.c	2005-08-31 19:03:35.000000000 +0000
+@@ -43,6 +43,9 @@
+  *                                       using timer2 routines. Proposed
+  *                                       by Ken Yap to eliminate CPU speed
+  *                                       dependency.
++ *             Dec 12 2003  V0.94   timlegge	Fixed issues in 5.2, removed 
++ *             					interrupt usage, enabled
++ *             					multicast support
+  *
+  * This is the etherboot driver for cards based on Winbond W89c840F chip.
+  *
+@@ -77,10 +80,9 @@
+ #include "etherboot.h"
+ #include "nic.h"
+ #include "pci.h"
+-#include "cards.h"
+ #include "timer.h"
+ 
+-static const char *w89c840_version = "diver Version 0.92 - August 27, 2000";
++static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
+ 
+ typedef unsigned char  u8;
+ typedef   signed char  s8;
+@@ -90,9 +92,6 @@
+ typedef   signed int   s32;
+ 
+ /* Linux support functions */
+-#define virt_to_bus(x) ((unsigned long)x)
+-#define bus_to_virt(x) ((void *)x)
+-
+ #define virt_to_le32desc(addr)  virt_to_bus(addr)
+ #define le32desc_to_virt(addr)  bus_to_virt(addr)
+ 
+@@ -109,7 +108,6 @@
+    bonding and packet priority.
+    There are no ill effects from too-large receive rings. */
+ #define TX_RING_SIZE    2
+-
+ #define RX_RING_SIZE    2
+ 
+ /* The presumed FIFO size for working around the Tx-FIFO-overflow bug.
+@@ -260,32 +258,20 @@
+ 
+ static int ioaddr;
+ static unsigned short eeprom [0x40];
+-
+-#ifdef    USE_LOWMEM_BUFFER
+-#define rx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE)
+-#define tx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE - PKT_BUF_SZ * TX_RING_SIZE)
+-#else
+ static char        rx_packet[PKT_BUF_SZ * RX_RING_SIZE];
+ static char        tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
+-#endif
+ 
+ static int  eeprom_read(long ioaddr, int location);
+ static int  mdio_read(int base_address, int phy_id, int location);
++#if 0
+ static void mdio_write(int base_address, int phy_id, int location, int value);
++#endif
+ 
+ static void check_duplex(void);
+ static void set_rx_mode(void);
+ static void init_ring(void);
+ 
+-/*
+-static void wait_long_time(void)
+-{
+-    printf("Paused - please read output above this line\n");
+-    sleep(3);
+-}
+-*/
+-
+-#if defined W89C840_DEBUG
++#if defined(W89C840_DEBUG)
+ static void decode_interrupt(u32 intr_status)
+ {
+     printf("Interrupt status: ");
+@@ -349,15 +335,17 @@
+     check_duplex();
+     set_rx_mode();
+ 
+-    /* Clear and Enable interrupts by setting the interrupt mask. */
++    /* Do not enable the interrupts Etherboot doesn't need them */
++/*
+     writel(0x1A0F5, ioaddr + IntrStatus);
+     writel(0x1A0F5, ioaddr + IntrEnable);
+-
++*/
+ #if defined(W89C840_DEBUG)
+     printf("winbond-840 : Done reset.\n");
+ #endif
+ }
+ 
++#if 0
+ static void handle_intr(u32 intr_stat)
+ {
+     if ((intr_stat & (NormalIntr|AbnormalIntr)) == 0) {
+@@ -372,7 +360,7 @@
+         /* There was an abnormal interrupt */
+         printf("\n-=- Abnormal interrupt.\n");
+ 
+-#if defined (W89C840_DEBUG)
++#if defined(W89C840_DEBUG)
+         decode_interrupt(intr_stat);
+ #endif
+ 
+@@ -383,19 +371,21 @@
+         }
+     }
+ }
++#endif
+ 
+ /**************************************************************************
+ w89c840_poll - Wait for a frame
+ ***************************************************************************/
+-static int w89c840_poll(struct nic *nic)
++static int w89c840_poll(struct nic *nic, int retrieve)
+ {
+     /* return true if there's an ethernet packet ready to read */
+     /* nic->packet should contain data on return */
+     /* nic->packetlen should contain length of data */
+     int packet_received = 0;
+ 
++#if defined(W89C840_DEBUG)
+     u32 intr_status = readl(ioaddr + IntrStatus);
+-    /* handle_intr(intr_status); */ /* -- handled later */
++#endif
+ 
+     do {
+         /* Code from netdev_rx(dev) */
+@@ -411,6 +401,11 @@
+             break;
+         }
+ 
++        if ( !retrieve ) {
++            packet_received = 1;
++            break;
++        }
++
+         if ((status & 0x38008300) != 0x0300) {
+             if ((status & 0x38000300) != 0x0300) {
+                 /* Ingore earlier buffers. */
+@@ -478,11 +473,7 @@
+         entry = (++w840private.cur_rx) % RX_RING_SIZE;
+         w840private.rx_head_desc = &w840private.rx_ring[entry];
+     } while (0);
+-
+-    if (intr_status & (AbnormalIntr | TxFIFOUnderflow | IntrPCIErr |TimerInt | IntrTxStopped)) {
+-        handle_intr(intr_status);
+-    }
+-
++    
+     return packet_received;
+ }
+ 
+@@ -521,13 +512,13 @@
+ 
+     w840private.tx_ring[entry].buffer1 = virt_to_le32desc(tx_packet);
+ 
+-    w840private.tx_ring[entry].length = (DescWholePkt | s);
++    w840private.tx_ring[entry].length = (DescWholePkt | (u32) s);
+     if (entry >= TX_RING_SIZE-1)         /* Wrap ring */
+         w840private.tx_ring[entry].length |= (DescIntr | DescEndRing);
+     w840private.tx_ring[entry].status = (DescOwn);
+     w840private.cur_tx++;
+ 
+-    w840private.tx_q_bytes += s;
++    w840private.tx_q_bytes = (u16) s;
+     writel(0, ioaddr + TxStartDemand);
+ 
+     /* Work around horrible bug in the chip by marking the queue as full
+@@ -550,33 +541,29 @@
+     load_timer2(TX_TIMEOUT);
+ 
+     {
++#if defined W89C840_DEBUG
+         u32 intr_stat = 0;
+-
++#endif
+         while (1) {
+ 
+-            intr_stat = readl(ioaddr + IntrStatus);
+ #if defined(W89C840_DEBUG)
+-            decode_interrupt(intr_stat);
++	      decode_interrupt(intr_stat);
+ #endif
+ 
+-            if (intr_stat & (NormalIntr | IntrTxDone)) {
+-
+                 while ( (transmit_status & DescOwn) && timer2_running()) {
+ 
+                     transmit_status = w840private.tx_ring[entry].status;
+                 }
+ 
+-                writel(intr_stat & 0x0001ffff, ioaddr + IntrStatus);
+                 break;
+-            }
+         }
+     }
+ 
+     if ((transmit_status & DescOwn) == 0) {
+ 
+ #if defined(W89C840_DEBUG)
+-        printf("winbond-840 : transmission complete after %d wait loop iterations, status %X\n",
+-               TX_LOOP_COUNT - transmit_loop_counter, w840private.tx_ring[entry].status);
++        printf("winbond-840 : transmission complete after wait loop iterations, status %X\n",
++                w840private.tx_ring[entry].status);
+ #endif
+ 
+         return;
+@@ -592,8 +579,12 @@
+ /**************************************************************************
+ w89c840_disable - Turn off ethernet interface
+ ***************************************************************************/
+-static void w89c840_disable(struct nic *nic)
++static void w89c840_disable(struct dev *dev)
+ {
++    struct nic *nic = (struct nic *)dev;
++    /* merge reset and disable */
++    w89c840_reset(nic);
++
+     /* Don't know what to do to disable the board. Is this needed at all? */
+     /* Yes, a live NIC can corrupt the loaded memory later [Ken] */
+     /* Stop the chip's Tx and Rx processes. */
+@@ -601,20 +592,37 @@
+ }
+ 
+ /**************************************************************************
++w89c840_irq - Enable, Disable, or Force interrupts
++***************************************************************************/
++static void w89c840_irq(struct nic *nic __unused, irq_action_t action __unused)
++{
++  switch ( action ) {
++  case DISABLE :
++    break;
++  case ENABLE :
++    break;
++  case FORCE :
++    break;
++  }
++}
++
++/**************************************************************************
+ w89c840_probe - Look for an adapter, this routine's visible to the outside
+ ***************************************************************************/
+-struct nic *w89c840_probe(struct nic *nic, unsigned short *probe_addrs, struct pci_device *p)
++static int w89c840_probe(struct dev *dev, struct pci_device *p)
+ {
++    struct nic *nic = (struct nic *)dev;
+     u16 sum = 0;
+-    int i, j, to;
++    int i, j;
+     unsigned short value;
+-    int options;
+-    int promisc;
+ 
+-    if (probe_addrs == 0 || probe_addrs[0] == 0)
++    if (p->ioaddr == 0)
+         return 0;
+ 
+-    ioaddr = probe_addrs[0]; /* Mask the bit that says "this is an io addr" */
++    ioaddr      = p->ioaddr;
++    nic->ioaddr = p->ioaddr & ~3;
++    nic->irqno  = 0;
++
+ 
+ #if defined(W89C840_DEBUG)
+     printf("winbond-840: PCI bus %hhX device function %hhX: I/O address: %hX\n", p->bus, p->devfn, ioaddr);
+@@ -622,8 +630,6 @@
+ 
+     ioaddr = ioaddr & ~3; /* Mask the bit that says "this is an io addr" */
+ 
+-    /* if probe_addrs is 0, then routine can use a hardwired default */
+-
+     /* From Matt Hortman <mbhortman@acpthinclient.com> */
+     if (p->vendor == PCI_VENDOR_ID_WINBOND2
+         && p->dev_id == PCI_DEVICE_ID_WINBOND2_89C840) {
+@@ -689,14 +695,14 @@
+     }
+ 
+     /* point to NIC specific routines */
+-    nic->reset = w89c840_reset;
+-    nic->poll = w89c840_poll;
++    dev->disable  = w89c840_disable;
++    nic->poll     = w89c840_poll;
+     nic->transmit = w89c840_transmit;
+-    nic->disable = w89c840_disable;
++    nic->irq      = w89c840_irq;
+ 
+     w89c840_reset(nic);
+ 
+-    return nic;
++    return 1;
+ }
+ 
+ /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.  These are
+@@ -814,6 +820,7 @@
+     return (retval>>1) & 0xffff;
+ }
+ 
++#if 0
+ static void mdio_write(int base_address, int phy_id, int location, int value)
+ {
+     long mdio_addr = base_address + MIICtrl;
+@@ -844,6 +851,7 @@
+     }
+     return;
+ }
++#endif
+ 
+ static void check_duplex(void)
+ {
+@@ -877,12 +885,10 @@
+     memset(mc_filter, 0xff, sizeof(mc_filter));
+ 
+ /*
+- * Actually, should work OK with multicast enabled. -- iko
+- */
+-/*
+- *  rx_mode = AcceptBroadcast | AcceptMyPhys | AcceptMulticast;
++ * works OK with multicast enabled. 
+  */
+-    rx_mode = AcceptBroadcast | AcceptMyPhys;
++
++    rx_mode = AcceptBroadcast | AcceptMyPhys | AcceptMulticast;
+ 
+     writel(mc_filter[0], ioaddr + MulticastFilter0);
+     writel(mc_filter[1], ioaddr + MulticastFilter1);
+@@ -932,3 +938,18 @@
+     }
+     return;
+ }
++
++
++static struct pci_id w89c840_nics[] = {
++PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F"),
++PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"),
++};
++
++struct pci_driver w89c840_driver = {
++	.type     = NIC_DRIVER,
++	.name     = "W89C840F",
++	.probe    = w89c840_probe,
++	.ids      = w89c840_nics,
++	.id_count = sizeof(w89c840_nics)/sizeof(w89c840_nics[0]),
++	.class    = 0,
++};
+diff -Naur grub-0.97.orig/stage2/disk_io.c grub-0.97/stage2/disk_io.c
+--- grub-0.97.orig/stage2/disk_io.c	2004-05-23 16:35:24.000000000 +0000
++++ grub-0.97/stage2/disk_io.c	2005-08-31 19:03:35.000000000 +0000
+@@ -25,6 +25,7 @@
+ #ifdef SUPPORT_NETBOOT
+ # define GRUB	1
+ # include <etherboot.h>
++# include <grub.h>
+ #endif
+ 
+ #ifdef GRUB_UTIL
diff --git a/boot/grub/grub.400-nic_update2.patch.bz2 b/boot/grub/grub.400-nic_update2.patch.bz2
deleted file mode 100644
index 8592f15ff1803e3a2703f5fa29400ecaf56c1458..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 328903
zcmV(|K+(TKT4*^jL0KkKS<6ssivxu_e}RAh|NsC0|NsC0|NsC0|NjI4W4ycvdjJ3$
zQ2V`bC_9(H`;AHA-prKSDvhva+5j7#^S-$4q@!$F+u8sF)tKJ+`)Ymfdhk<fw@oPN
zb=^&ycWxMyVTc=E#%(9u?Yp~uz3*wI&82nkJ#&-Z!`F8E=flsR64T@Y?7KQgSvJi#
zhqTG=y;Ik*dmUEoN2^h`4M!^z@4ZW2zJc-XSKjvf+urmB<6EY4r{8^D2CL~ldd+b<
zDtqsJ^KDD*+pF(*p0vwY)9Cx&1G{v6*WKTI=IuM~yPmf_IqSLY_292*LEi9t-tVK|
zeQrL50Q&dea31vg-8A=sm`9~wYa5>H-t+DE&3%VztoO6aykq0n-+8M0H_`W&Ui$#<
z`*!S4Z*4;P^Tevq+g;uR=l}@-6aWCFW9B=1?;Yb0wl|6|um?TrsGnT%lk0#0auR(2
zefQsZ0)Ss;uCdY(QYx!Pq^E2vtLA<8pD(gZ`Lk{HgSOUG_glT+1BEu;`YToUbB4RE
zoQ*{e>f0Ig@$+as_YZqdZGF?an&Y(FUYm<HVEOmndI_eT?QE}rd20eeAm(+#MC(us
zuy*bmYkS`DRaDziZ*Uz%s?ZnTe02HW2dBKlrhp{SD*NrX9!H-$?)PkZaxQbx;le!v
zskYa8?YZgcK<l6qEi}8ct!g1s2HkN@u@C@=p<jB{*RaH=W}Wq%iqOfgu6Dox00M^C
zDGG|{#Hm$hz307Rb>qDpR8<9BFTK9_YfqTpZ+2$WpwKJdcdI)?Mu4CI00n50fah3f
zd$iW+-*>$&^MzNtHTKT?ee1hny&qnVo`=_~=HG9w``g~oFK67rr%L+oX6@VnDD(hy
zeXyZa3IH7+KmZ5R=l}o!0004Qz-ZAx07{tv`tD{rmZsJQR@RW7P#OX0^bbqj#-Bsb
z4?t5QjTKYtJKKOgGv9qCSJy`!eX{L+eQ&qkZ++Lj_TP0;5dqK#UwrR*@C5hUfB_{{
zP$@+yuf2M+?X|hVT`iGhw!{qs)l)vDuf6c*zWVB1-M3wv8TNOmZDsE5j{CccFKcLo
zpIsk71KGE%HvrVM8*H1-*EVa~?mCZZ+T_;elexHfYf7qK&vUM?t=2^svF8wb(8pfx
z+rHb*?{^;_9?yLjrq+6Lp?&waX!GSxU2Ey?Ti;%t+rzzKS@rDkuSKz3rp`X(ue7t?
zsoQ!Nb@ucJJ<eMU`R(_v`=3|7bML)#-+k`&_qT5O?|U+)vSp^%-+AwY-o5U(zHWUX
zU474c7q}jWo}ITE&?>Y`KpGnLKsDK#TV-|+cJu%Qs2IMP_uhNYR|T1^i#;7Pw~vl`
zB=PlipC0GV<KEwNOYYmZwBmEUrp0%!9q*q!z4zJoZ<nojA3Dr>_Mb3v>XuKpdz|&x
zj`v1t=ig77uRiV9bL`tx?{nSjsaIa!o4xJx)EC&@;Z*t;(B0j;xm%hh=Y4bC+g;CY
zDcZK%y;Qwp-mkvBo$DL!?rzL(ZrxpG<#e0argz@*J*|3n-%S>|O_R56cUI!|+SK=Y
z)1BP2uR5K$Mp;_h2Hoem?e5&@?8dvJw{B^>x8Bj#WvREfFT1<2&mQdR`<m}}T~_-I
z+ugSA*6)2jk$BVB&1u_vz3)bctEabkX7kdZmCo;G?(CBo&rPzoO?$fYrf%B|`tj;-
zw>~|3_U`K|-aU7=T~AD|a1V9Qci#hEk0!g|_o6!NLfd)m>FZJ8r#i0ft{(R4^X`2e
zd$(I>Z%ur+g?#PM=<jaxZ*|}u=X>Mg?0wC9-n+(Md%b(_y|(A0?BuTcdN*F(c51q|
z`n|N{+Gj3vSOpJ#uQSsmowX0G?DV@GIsx<yjau{Wb+<QWcU>5r?tOvx)VJ5m(Y?1Y
z&F_1*`fkGaee89v19<Jrx+~tD7vAR{?YVvK1J&zxxVKw&yS=xUxpUjg)0?*5Z+nkb
z#_7?vd)ue4I}LAddwXebZ4FRfy4``^x~nDkcK4m=?#ES=Rl8|+?9?4*cYW-<>!N-3
z-uvESsIXes*}4}yv<}XF+ny91(bj7@yIq;500XU<6}ABG-K)OywcV?;)n41nssT4#
z=tgByxb|ter@HQem3xu9yTXH@Y3ZQNZI0CT&aZ2000#Ex0005dC=?241MikQ?T@RX
zIMH+Od%bOf?z!iO-roiG8d8P!_Vr2Ys&zoVy?3s;th)zhCfx0~@4fEc+pcsxRRUJ-
zneDRO?C-n);QIS(eB)5JTdwPMUCdM0yI#WBqpFAt+g<BzYn{WbTLrW#<OEKgojSU<
zHJlAy3CjQlZqDtXR@#nk<Lr2QdbDd?)+-wc$KHFZ+Jfg@Zn@hxvrds4Uh2E&zzy{H
zQ28~{W;&qg?rq&SS%4jDotqlD0V7(uZlDg@?S1a@8-2iKCta*}-qxpZ<N>d~ceVF@
zuHm6`sy75I)z=!X>$e__cFdWR&9lATPgk7pdwV=>gzSq>#>Em804j-Hn20txZq$iZ
znrKPcJ8l7+x!Z=EH5#bfHtk9RjSY@7U3&K(z3+Fs8ALl<Ds8j_MNr(%=wxpDcX<Iz
zGi64}ool&jwiLGKZoTpKA6Or6wcWkLJbPj8E*&RMwzqXQ)!N+cZQa|ab6JoJrUD~b
zv9w^9ZP&X!we8b8a6s<FT_){Yu|n#OmDek~P6MI4Z8ZuUfNq)2UD<cOk42@L^Z+yf
z^k@J!#()LA%{$st?=cAVoz>Reu)5SW%V%}FP93H?zyomZq*XgE$3}NH*16#3WK}>4
z3RBQJ=m4Y9sXJ(uJ!`Eh4)!{MxwOC=2Amtc;ppq$?48GJqS&`px36Bi-R$;b+r1_e
zO>Mm}HSH!k^J?7otDQ;IZ*6cpnYtMo&JtTOme|`?yPd9R>s*eQR@<{~I*mG)cE@(?
z!>+6D54U~Y#eDW)Xe`&wKB|%_L7wwgfun4;=n*@x(?kRSKmdRM6CeqrAQ7Mw5RD0u
z7@?rh2c!h1f&>U50U7}&38O^Q(1y^1LrJEXsrsh&l4S$b$O9urjR25Hh#(+9O*F*N
z0u#xjK-7AejHWeBg+Ei&4Na73qeIdIKm;if2oqBTXaJ0wHAk6DAjzqS)PAR^3V6^Y
z)csTSPsLA7O&ir20LkhIQcwg96HJ-}0D~k{|06V*s(+!Xk9woiDdJDnGLKWu8k&zp
zV^R8}AkYMwh=d3MG5{a|08AonCLl633>5N-lgP<68h)trQK$##`X)vHx8^ke;T!wx
z9YI5q!~hyH%tJ5)JsiwrOMzwyj4#)-48uT&JJzu2h8+YFk|miaA%=rE34&Zk4w43=
zTOz^0FouSjDQTHviYAz-N+=+Zil~xeSfW!~F%dN>K}kVK6l_RI2x19}Xo03SB-;V8
z(<tEFmciKMZYd=Je%K6z+9Zg~V8Db%5CUNUP$7#NATSvKl5$59SxG>o8bK;17KtWJ
zA()KFL#W0HnTeR7YN`ehq@s$Z0ty0=DwRnfm>`gvfM95pV5mx_Btl>kATp%{$qbx_
zBqBtmQOQ|IX$68*=VFGEW=Weu1j!PZGGv2Pj8xP?KtVAS4-lXlRtAbCWSFT*Ie^MS
z0Co@w6OdS9l@jwV5d_ebI>P{#h@h$jq$p{iYHFsKB4DV5rjjIS0*Vrv3?=D-gdrpM
z$hk?jr42!(H2`y?6`YI(bplc$qEKBFtR$rj(*hPU4ib!O1#pE7feazYKxs+<qLmzp
zR*k~xWHf+6KoSy<Nf9wh0GLV!B@$pDXbMz=0BIJDxU!&tjVM6L5(E@zGy)C)0SQ7Q
zzz~8zo&`Bo6%7IUAths02l&6o{+;b-i2XXdP-UO~iAti?2MC7FIp_Sx2^&mpp@M>#
z8c?p1v|vn1)lkrr1j@-Fk~x?L6cTiy$#D+-8JHLj;MJ%#WEmz)5;DW#1|+o+geF2d
zml>LYQV2wfu^;2p{uJ0`#Rh-4|4Jb&KleZPsM)3O>M$UQBxhKD^9Nc8sU?uw;-mqJ
zi@(i3PxZ6w30*~oFNHB#{r`vJ%+)ylU!6av>y2RC6$CISt1N)LwV?w-H(aKF<6;m}
zfAqjiHM>BE5bQ9-u)s>v*v$<x>oQ_!0QW%T7fo@qh~Ssw<DCP#hm5R&vH+yWGB8Sr
zt2xkWDTSp1RtjuCj;^N8XJJgk#gYwbTq1-D9%Jc9P^vwS%^Jc?%M8mPu*(+%C^9H4
z%*!a4#{)A0YXb<&2*|TN)~y7P%`n+UVOY@?SwVw=i4b5$3zB5!U{PTqK}itBR1if}
z5Y$vfRaHckkyQ~f6jBsSL=i<u($SVNBM211{=VLyQFZ@~$aL<(#RQ>^e}Ws)wvP`E
z9p2A#NjILPsz3Fef`7MJDX7=If6pKM`G4lqwk}lV>Z|^sh&NaLv}e&+j&!ITfkm5X
zdN`(~mR&*PP<oIFPxz|>B<VHfFfWBdyzfVaer^M7^3$V~gtjx<JkYVLJlH9QXs)j}
zr;;gNUmle6_SskHKB@iz-}GZ&NQ;<U5m&^Bv3RJ`{6xYhl<@4yKEFgu8Oy^i$s1hi
zYxd|Jge#^ck*<ZR+llSBVe_n6c6#WmM-kJ8tu}jcy{CPb5puc4wfSw%p0t{kj+2ht
z!3QV{xdri#@-@+6%)sYkwt3^OaA|28cN%%?J5Z;rNrPA2<cgI`V!J#@fPKYWf@xt>
zxPHkZ5<lQt$!0ZUsz=tTOm#w#HayS6Oz@fq?Bc&<f<3QSt!{99CdeEjbiseh9pkT$
zAm5<Mi6Bs<rxT%%4!1k5D4tex$#b9honQ5R4Fky*eG0v_GpL}mx?3ZKJ9@G@hc?=%
z+_by4bnJAUGD)Fdo;d-!5D}(~nkjRoQof4l@e5upo8|t=uabHzvVrwUev@QVPmC6b
zBYrBnX^gFQX}F!FIChGs>ZDr;%WRudC;nI{bmqYzUgZ?s*3#g<^V96c=f}ltaA0ES
zD0VbGIE0f3)&5eks8<`*UKi|wIJxsWr_av1jaP#lo1F;RtJTFeS|BDOEVV3#{Z|Wx
zcMAl=k|R#rsYZ~;9KCjA6$z+~7Duuh`po3u)Mx+56?gtv<Q)i`K|~;c@`zP_yzew*
z7Kt{qF--)OH5C$Q%%G$SSeg)us9D4BGbUT~mS!1!3Y<E1Tg-=1gZzYZI)QeGO(5hN
za<!(#%*4#Vpa?N0k|c)`6eX3`5M<q@5H<h1{$Jw%%l|*&@3raw-Q;I&cK@#s4dBI7
zUM&>d5GsG(6=<=hGaMM4LL!zWh@z5+OMZ+4P|#3od21%3nTm<TBpg`kLmh36GB!By
zraL;?Xd`(ULl~*1=7zN(%pIj+<i!Vr8^esireuaBDuAiOPGwNRr;XrfGYc@vh_Eom
ztjw6QiJY*mgKQ)u86caj#Y)nOIT0RCHdtYShB|=OjH4$DBAOy1X)2-;CX$*4sA;H>
zR76xoRaChfrwMn8Qp&|B>a8})Hd<ZaMmFfk$cTu+<xW8rG?6yTZbgQOHJOu@7)BEb
zvRwpfDj_f<Gc!1YCV(iEVHn0jm6WwYq83{VXd-~Ib0aaTWr>I;$i|9mAloBhM=K;!
zD4k=aO}il?V;dx35M*a}7~8F~PZ66ez#NLRF~EXKqHP%90Yj%y8q#J&VNro(0VL26
z6#!~YMwx{~5}*DMth!{@=!&j&bmrGg3#LjaWf>z;!AAy@jD`Fzmn0#?rEQVM%*UQH
zrx={sT)tfNJ94K@xV<Erk))|u=*t#GVZ0qdI>R!HFoGv0rl7|NBODU4)+3|?A#qs(
zl%Qe=w3#EVCWb(amn0&k7*B!)57z<xJ20v*Bk`>5w{>7>Y<TQsxge-iNkYP+nYs%l
zWujP=!COIvQiZmH7D(F&B{Khx0*x0zq}2a8RUL7$F$=6%5rdl1h_neh$0CAAh}Jb}
zbz>Gpg*6dCMM$WO-L=)`?bMY@Qk-FwkeK6`WmH?kG)&p6S~8f4pf#7MVkL$U*kTo-
zHc<jWOZ5`shZB_q#4v_t3roe8StSNJixm+}MP^Z1GeF=JEmX?@#6ZDO5JgsFlG7nM
zhAT}C4VYsRO)NxIQ$<9XIYmZbVFXD86h%zX83B<LP-TQv!7)=+RY6ph6+tmfP!l<s
zMKuyrQBfc;fK2AF&}x3^A3b1(J~(UU%tn`!;xP>{Ygo`4WF!AT6gw#P4T*v@BA7h}
zn7@<jm7O!~DlpWv#Z$-?1p@*HaY+;wnUT(KJ~evU2Y)h;d7%2+)rXEN1MV!z*fDal
zDTQi@Q1vpaeWg#FFZep>`lv@!@#Ut+vwXjR<^(3)Wl{PZE|`s~&hJC^pMA=q&)V*G
zK86;CYL4XcK3JR6Mp9_N;*icxmiF4Yht&zdo|ua-7!tqgFqXh#49SMR{+*wEYlXoI
z%B=hKW2r&JtE@iU{SLZ@U`e)eXOX_;^@`{OFxi2Hk8jiWeO7Gxt~#9j(9f&zXnE_v
z@^bD@pN{s;ULA)roghq!hLi60KZjA%HGhxa=bQjhisbvPK-4@YB@!0js<%B*L%gV{
ziFlbM+;|hU%VUjZf?!VR*<g2gZ^~+{Q1Y7sy6R--5N#&p8N;U5)yWq0;ll{%>Csy4
zNxl_j%0W@z7@}EDJ#9lXuRW(#zvAi5>hzi$E=e8~>2a|@hD_Y(V$BUZmwCVXf3EdI
zmn_mgc%~(lpM(f{_9J?EQ-KPh(Wed_4xQ=80VamT?}3EtqhaP6KaZGcF>qL!Y1nw|
zVGW1Z7KmkH8tC38kn6DpS2~-QTaLrzn1c^7`FrHxto4j!n}SR<2-6F^ce>4BP5aTd
z1_RuuMy4WIQWE-nFLpM%w>UF4;1G~u$c#g8v5IQ}SE!{@?t~#S`mb(i$!YP%?-F^w
z(uFYy;d`Is0Ng`0nl6FGcXZC2NOuBt7^Z4e-lt~=T?i_fE}IeGZ0H(Mltf;m8=aRE
zBS7xDOG;u=JjKeiGaD;x=$acR8q+e-$T$o(%3mZ7)DFhZ;ss9ZuiwOqZU>uGDQ@iB
zLlW&;v{32Cbm9N$|LZnQWpQhy_2OeZe5vhK)7EPc^<uxbk<@rjLdwiEEPJd<8|Qm8
zZFV|bb6+0$%dK-9l_^gcLELZ~9G@Rt|0l&Z4T+-5XwQDwII}!u;|9?T$_p7%%J9!_
ze7%U96D;XsXFUlR?~|so{Jz<GCWeX4;TPvoNGaU1N>$vLLJ+NQj`T+G`9XO{Q*Q>B
z600(!1(EU$zbC`+;IDe_{JDizKAh-YVd((DB|r)kAZ#-eg1ly-QXfvn5+k^eMo{QJ
z$(erF^Dp0Li?8B~s#^T>dCcOT^ysB9;Of)6B+Ej!8B3k(VK|jXU(F|d@RM0ZY%C_4
zp0_{LV(3eW{GAJ!h#L>?hV25YtBfg7DWUX2wDgD#`;|E!8Pzsp55(mJv}0hpnjv!7
z*P29%lSL2bl<(xvO(NQ9$*#%K)!?T!HX3O%8fm^4RY1aZLdu_hH4RbKEi9X{<zW2e
zNGnyzMu!Jpszk3pEFZsA#Hi0UyE#`Yn3HcCVn)lfh7WRxUw!ct%^imdt5&6%jjH01
zAZU7{;Z<j_I>C}6nNw}AywPgJ5r;Cir2{tT&>fhd#AAi?%fB8I6!P{kVwQ8ErG*8Y
z$k;;`6_m(QMUIC<o=6`|*_oA&1ynl&9FwE*uNfk7(;AfQUPY`rVO10q8%#`3%i69Z
z0*gwF1$kdat}hIe&2ogejT;nb&ZvVaByWnG$|m*v^hx+XF7cZBII*LenjlmiM!lLc
zYj_LF7H0-_S`L_LVi#1`pu`*8Bb%Y&si;R6ipW4nOmWW09BZLAH6$g51p~-ZGi`GS
z;g(rp0#VtP4ENq&_C776v1<b_PkM{P?m={`<F9bO^EcumvBMy6km>5IQvMWId&Q7Q
zh0ZU|EP2IY$VR4dVI@{nP&x$~p0z5_&{5l-!qt`UGkAUf<do1-lOJVal?89yGsfd~
zu&8Yc%$l29!}hso>C%DM7ZRl{v|ac!1FTG#nyL@{e!Xa^DN0Bx+m1mp`*`;@--nUT
z;y+2xXc8Qf=eMm|ohJNU)v5`H{Hz}W4se!?pQxu0IJOZcIOZ>j-v4#we4i5@xoMxO
zr!c}ni1;YHpx{RWfl6U1-(Y==xC3g|!a3mK$;5()Thv6ra3N6EQ#3R&wQyy?g&(EO
zJrQbMLkuqqVDc<Wb$Rx%6QyaV1r$*jDjerOVuZ=dajjiC{krEH<Ry@xf|#Z$y^;^+
zNS}N1+Ew{>Dr63f_U&<~+WoZQ(e0X34ei^#SNL-ihwwC*4+^^mVM&4}rYMRkV;^q%
zX#L;;oLAf(0B~XvfPxs1CIU&Sh^ho;W1-KY`LxWi(#nDwpeQLER0>mIHk(dBjTJi&
zI#o_aZH9fCxY&pjN3sLZbi&L7ftp^9Za18-5Wau2W*ji#J-l%6km$j0TZtgiMja59
zi2kC8C?x$b<TzO;PD5N3bB?5TK@o{aQ5MbGLku)(Z5GMdPXd5O3O?K2g+T4;c8Rdh
z{dtBzKH1w&%zLMG6;)M58~G#7DCPI2!dlQ96;)MLRacD^s;a80s<tpAEJlWDs@5^M
z#*b+db`-L@2_+X*3m_2__J~pzi>|u43`v-X5+w~X!9+wwRS^_SQ87geHUZZ)5vw4X
zGK$PGs5<GukhM`JbFC(lFd7&-Mihtt<cIiW;3R;EfHxJ9h5o4dBU>>EU^|7hd_V!2
zvc<%zC8&{QB7gIIdU2BKmlZ)zHCYzaNP<L#3Y8KR5fLp*BokBwgLO7?MhIcG+)@%i
z`STDFj0MM(RAOw5(8VZ-tSu33QthEo5vIYrsr$m}(KQVRIFq3@it5d>SpAq4b!fvx
z>DmjkZo)`<-dpQ6nXy1yZ6sMxMG6>xtDw9zjkF+12&4w&kc?v(<RFIQB4j6Nbvnl)
zVpd2}qA6e~!pNQG7zRRSu-0`4Xo_akHp3LeLj;kAScV-j%GH?}l{lEzW@Kbp7?NaV
zj$uKBMzc|)6C$Y;UXftIp^SAnFpenVP<Sg;aAl^=XwhhjBGH+UV}p@0QyCaRhGUjQ
zVMYYTVVQ}AO=D6Zh-8Cc#uC`r#K_25BqEkYVKbO!wWCukK}|&^1p!qul}i;hK@vhm
zQ6((_RZ9#JOQ~=sHJJ!>om?lqa%H-s3C!vL<4lv10ZAQNk<q9p>BPt(iK}J<nL9P`
zW&vv**k&|21qx|8rL4<Z&}gaEG$9cf(|ej@4q?LFqGg3Pic?WEyTwwoYXhdS+L#m*
z6i`!1Lq~p%2ADRp5fg!$EEIsbRfw@w20JAP(@~6S4VYAjni*vvTL`MMGb=EI2q4TU
zEoMP$0~%axgNRbI)=I)cNg4*x1N99+VW$ZKA+pTDFv2r3l57lEA;PdTJB-v-^X3~0
zA*d;csFf8-6b>mSQw9z9cS1!f9fL%=LV(*#S%rPHYK$<!jfES<5t25k1w+;&28=R{
zb(Df&#+qP6IWBTwXyX$gssfvgTQh($a?y5Z%N*n=hFX*8<__UH4h4y-bZR#tP_mQ-
zR*2!tEXFqNG{nqIXp@kVM%ft{NfgUlBUGv(jYktMtqVjH7LcN<QWn}4grs1SMHtw#
zo2z=lEx9eexuD}RigP$Bbu}i8%4Z`2Mbyd|;gSYPR*VHP2@NGgVrxT)Mv9jdA^^g$
zFf$B+NHuFofW$C_L`;l>QPzqKsW8(-mcWua+Z!lkQTcN1L(t-lINY11ww09KwUNf5
zo^KT!Svqt&Ek3qu2AD~_JA4>yiaQea*R(}6nV`im%BHFpB6AAMede8Q$V_DnAu)iE
z97~1@)K;S_c>0)S6Ht*cHaDm!l?gIRdU7Em6_1TJD8ApUA)^IV3KhQPv7DZBAx=HZ
zDH~WZm7*94UOBQiZjyk_CJ1UmfIGBc2c5K{2#sLnGLhuwRWr^2<fu?k1VcbXsSre@
zl7$LV?QWKeoq6G?))-ri4OXWDu@+HML|I2b$~FaUim@?`L4qTUgqE1g97;)wN#!G9
zo6~zo2%Bx_i&7x=Cb-+(Qb1tP$Th1YRb^(h#A((MmNN@WlDt|p;$#IY5=AjVRAD$I
z)fN#m4H_c~H8RLz1pw|@m*>)JbrD;#4GM$^lA!=Ktr?~YiK`6EFhkj;HYvFp2NqK#
zN~a(#+RbY!mmtAOT(*m<Ml7a+yx-a3x&5E9qyOwbrx-H$I%14t|8L_(|K|7OI+b#I
z=MDMIT?_x?RgAd`)Z3#6j{2!dTeJ-EVUXc}+q(8-Bf&h85JmjxVIq78|8BS68Hwfy
zD%}6>FKE0sV=2f>;)j}bvwQw-FXr8l)8#p+F8l98euNGkI>_AJGdKKsU5_DjJ;E3I
zC4CvE-W;kOnn%gguS~5{L~1f1jxdcZktT6mhB<=%;cNY0_4Oa`Kfi8Vc=4jRtVV|C
zvDbMuY|FM?wn}Z9>76DiwB;xNp8D5z;%CUJDyo90s;PFW&f7*M<WK!co4*%_LAj_u
zx27LfvE9y$X6qE=Df-wu1*pgxwx?x;3O-Y5bTg^3^NEso>}g?{i%qPfzOtE;o&bw)
zp$?EC)`H1?+Ule|?(IFkpImy^X#1sVj2A{#m-DJcXf<MwjGWDWS4@P28;(r>(^ndv
z5w{@*w|Kl)g#o=o=ge2b)|^3+>q@sq;)tq+A;5qXg?d`7NI~0;oyU`gM1!@?26TBf
zS9z-%6$dI;H8sDa%u<@@{Qfig&E1`J_6O-=<qF(od)naZWDaer9lBRA3Y;%8QSWXr
zU+R6|=>Dr&vLne4)Io|n-{aIgqxciFkW-gMQzvinbT!SFURmVW=R5cp7OVf<fWoqh
z1ImJ)Aaw!k0`Rl7bo4cF)J+R3xAu4Y*R$~^h~D$DJ^cFbbimyAaZ!fzS6WiK*ET2g
z&&q$8(&yUev!@lXF#2bI6~n#cPGc(S0oZ@Fz=QApQO{urLNp1FPN(qn!-<hj{QBdC
zH4sA#8FOS-DE3t>%DpQCUOTF+V#a5<hx6iZXs!77%5e^N_`Clv^Ze(|M1E02hzHLK
z9)N}Tevw17W%KtLJ=Jv5Yuz7Pzo0`EPrD!Vxgd8G(@@GD>IKga8eGBdA5LHr#0i-^
zQf@qGSvRm1dsr+B?5&MVUF>W}`5=J^LNrq2>%4uG=h%xB;^Fz1l&=Z;JMGupdTi^(
zQSI<V?fdfFkgiE9eJ6?HRtqe=|E>%jGEM0;Pctb1+1n_4!X{|Cgk*VKL}4C(k&%9l
ztL6OPPG9Z$uax-_`+UB#3xAkh<PCVE_LczO+mURW^~FcA{LCT3Y)YV#k40w2UCTOa
z#1VeqT}fN4rSg_4T?@L&bd&}RnsGkw>!M!tc4wE7y)%fvIlTYt+f+MAEw@s(-DWn&
z;Sr$0nWvfQ2FNqjTo8@uhyf40148@0|6lli=>8|k?+qFJ-ntl-NfGBy{n!#5R2W0h
z4g!a>y?{5r$={{z*WqU@|M>h?ldOnzPK=a(v9QN_xthsqRL25^20$$#H|u05IL8pf
z>4g2h63zWZ&z^7a<TZ7gam!;VcFEX(dcfjL2?8?X-%b!dKlpE$-u6tEez#^clZ0J$
zKNhEp*w)zE8-q8Qg2BAeX@RR=xE``U5Ugx-Oi?U87p6@}Hu;fVHCZW8IF-sjx!|NV
z7?qepf*rv~KGuBVTWGr?;!6g)Qb{BV(E8HmNIqE9;F-c^De$^urt)GK8A7u}#gL*P
zn01lAEK#n;P7Hw4O#^O88zAX76cG-i2nu3M%%YVj$#cKHC2ufjs8F~q4=_$K&wGGL
zby`aRpT4?T5gh@^!)*cMlYcvI;_Bm<UmW-HdvKMrO&^E3hj+JZYa!#WM~0VWF3}j_
zrP$*}e@Q>b6_>}k5g0@*=h}zkPk(bZ>4q)-4h^*EMCwjNaN)`vgP2svRSK!+=_GWj
z^%5BN^s9)qjC8F0lMjan;4cS``Kt!?ywb+aM+h@Ure(=CXx1&q4tEKq6Ubm~FC>^V
zvBO}zTbvmOU~mNI4Fk%frrg+ObB-mfyLKG*r#MPLt~rM2tDBLNS%eggm5}ts(ynyb
zF~&OxFe^sdpvEVR;C)$I&L%y6K5qD1HlR$HHEdNSNm-Oz4TMBkt|+$`Ld}Oao6#Kp
zQ4ZEfNo%}J<1EAGXp!HS+Rh^i@;j3&t=cH#GC<>-_To0z9x%QWBi$pM5v#0$=OI|*
z)ohTHRL4h~cH=F+tzL&vobdVQ`MJ7~f-#I{oZMa|OLUvHZ+;ZVLG6RpqikT>UQa0z
z2F#IpM4bONkfq`WA)F7~@dipDTo(6CSssT*T}qP>S}Al-=vwR2a>4I;O9z-%v4Q<F
zRX|?$1lmqe2#U2r)Q09;VaU28rC@Y2Q<DS(rDs#>yvZsu=k39WWvha4joxY?#MER<
z9=A)Oux9#7GbaU)Oo~U5ZPsVOt(N-0Qsm?mg%stGL?l#+=O*|(wqQ}L$CZ^;Zj6k8
z%(91UVHHTymS&~V5e=Htt@s|}{+Y(-5&^=M6~?H%dex8tuleJyP!I!~iGU6Vk3d+j
zb%-&|p;3&jAvGs5C`VEGeJ&NAtsY-xU7{kOLS~R(Qm?3h`Un#CDRBTQf{p}#@Uw6p
z<7X~G`a>!CL)&cT2*LFFW5_Mt#eQn(fcbkX!q?k?eyP2vlB><%C08vLbr<njO|70g
zTi2@EEnC%UZ##H>Pp<Mu)0WzkoA2HA?W@D_{V8)BRr@~q&a35{U(&g+kXbOoOpuVx
z*;F3_2m2(>4{Op-Z`*~8;b$^z&KQuBLQjC>@z7z>!VkMrzg<m!YKkF;Etpj1OGSya
z`HBNr<bgVQJ}SeQN&a3A*IGZs(ww=cHdS`<jF4_}WU|`bVFvZqqOv``CZR_t@v+`N
zP8eXrPHJ$&5_#haa3fVxoEBK9qt1sW7=sKYPlH<heRGwX@evVtB{8aMqP%dRQBM28
zf%M*h)-p&q4YEZcy5tD^c*C7d4ZOoJ*i4fQDZ|pIGdGC5{O^DHAL-lsrPs1B%PXz%
z))qa!+jjH5%yKS`vWy|bmKF2lvw+=BpXVw;7%PF}=HjFzhnW-@#CM+?cUZ4TRT*J5
zMHEh9ff-SdGmJeT=y94QGyRzEBjD~Z<laEd$r|iFI*ub!26ThOr5Suk<BW{%#VHh#
zL5;3@aA?C!h15q)XyYRtdgG35-u7nqy7z>Lsh0Hq{b>!FIe`O9b666>S^F&B5f`no
zr+521?&Z4Ma}LC`@L_n#Ng30${=Gq&FnVhk#+$A)7^_)?bNH^mq}IFfHrfs9EO}yn
z;iwd3kwYUs%WhD%{7=eFSss`+LLL;Ufg{LNs%Uv@)U2t@Cy_*TZSS20Y2yu&XWfQP
zzgwi$??z0^5xL2ktR3kJNNmrh=y|vj^kxwd+N#n}A}zLt4KcnbP%D`T+uvzt^+R|g
zbaqsm6=Jp#xdVw?FSV*zlo^a7ooxfW$zq~8=d8MAXcbg#Re-r+;IbHWcCJa4Nzbr{
z8a&pdb?~Nk!V;26BTbR%gk!UYLD)7unAkiI4?L}zA<>J0*g0KoR-I-h^Eo04?@NfZ
z1kT7j{Qp-wJSQe69K`1OvnbS}V|dbt?CoQd!d4a#O`O@dVy1``etIv1nIf*KKid1@
z{k(CkU7Sq=X|Pn#Y>mdHJEhbHLS)S0n#I<#z}J>))j)GROOcW3jx9>iGdi3hfT9Yf
zVmFJaHI}unUK?VBOf)$_p@P6iEW%Y(+r?Q#LrhFOxO3k&8CxXEq9CRyq9?Ax7kzDI
zd<`l-&rD{B-S)sd^t#=#*dU5RF~}&SjRa{#GBfY-mNkx8YU$Tl?AUn2%;csLyg`LP
zc9$lClX9Ab)KY)0Oq405q=*$)3B3Z@9TKp~QuKAeVNmEb{zZ*5S6}F6&-u-Pd<Z4=
z^D`x9c4HG7j<C@bwY=VgzD+|)c}7hp@Xlu`f|{78S%6uAW+6dILQ*V<!-8QJK*K4f
zneTP)_g{y%95n-j0f6rAEHlFls2$0Zk%nLqB@|Xg3AofWv^gy~Eo&<oBC+E=Yz=BH
zFjvPY8e%gdRl6~{t2@X3YdF1G>+m@w`oEl7m$ePys)$N|+n#h0N`;9BDyRB~fR3>t
zNOo-1#uuoK{ukZY>T*{6a#F9Rw`2P#s4$3yMW1O7|M(ZMSbw`9x_3RDf8UEmf4mNh
z9YBZi{N*qnUsBFWHeT68E%s*)x$BvIcGPSp24&P@v$I}!SjJJOMAoVMdGuI?^p6)6
zo~)z`hzX?RsP#mv6Cc)`t?tfjkQ+xB@X}h<*0qaIP@BGcn`ckN^v1u@n;d)p=v!N?
zalUE&W}?=6G$&|UhfwT!;`Qk<NIQCB4LyFoT-A?!dweq+tsG(FwGkmABZuq%=|yDD
zA|zE7k#Z2XwFVx8iH0W3s!kkuH5=^9jTl5NL2!19DH4#1m@^}0DoRxb7rAm2_Oj6i
zC)!q8!G1la87qmoP1_ld>i4;Qu<+iVkoF}o>j{BNmR^XIFVj%K#j5Wg+5X4rx3(L?
z*$tv@5}5ftp<;rs+?wDQMR{wBM5HOF2}x}1(SCgPu-iLv18h!w`GQsc``gZ^Q!{kA
zt(k0@8Z3VzgbTutZhJ9bT$g<hrvWH?Uxm*<x$1LqwM>^DU&{+c1VliK71nbepWacS
z@IRLh1*{8Z%n>>h2<xWvciE2w6-6ePphp6%gsi}UGHN)G=aD%#lc8^RgYaDV>)q7Q
zHmx8sS$qs3aBw6QiiL*q7(z4p!}I0#e`wNkobTM{rj`2!iz{}y{w+IH3BU4>+J9A8
z*ZMDi$kqGT?t%li%QoTA2jqK4xB=Jzm<gaA)O~(#jh^*vgM$>CeF5(*P-PdpIE&M?
zCXprx{iH}-^+1+pAdxBQR|@V{da2?6!#D3j@tsBXuE)pGLzt#Q80XNT6pzu%`%<7X
zO=uybm{IuVw83pzD6@l~rkDQI;0gW(dv)osDB@Kn;T-n=a{Si7W^@1NLU)YH9+K-w
zfK%q}A!I6cZtn^`lcqm%*>I-L>%LyRiW-&E`yuZv24h~I36DQd=(J$pr<<GbmD#n7
z@OgdAn!%4a&j&hqX#JlE11ZVLY$?vM=DDlQ8fWV?8c?An0Vn|}Ej28?i)8~lN)BPK
zEY`R_1zGdHLb@VEfhj#Wdfh}L6H2S7$SQaF$z$uPQ<rTkpsYH>byQJ;!rgCV!!&$;
zT0i`_{xp8?YPTj|LR@b)Ias8isF)jBRDo#>fAQh&0S538Q=j~3L18}G{bDAfCgxCx
zg@}ljP=4_B2q20-54YJ8KdDjQpYr(8R2SU}X`LT@CH#MKkI573WwT2DYAt>jqeYlG
zM<lsGF^lP#<1ZVB9N+3@w?C)(#}E76Cu=fKQb9<Jt=*Wu9nI@YebnF&o5Z0j%pS3O
zQG&V3@g;2D?zH|b1^pZztk+F*H<6fw)oL&D(f`wml~s@XrHp^)J-m4N|J{nJs^Go%
z>|y3kdp}|;w&pulQ%-u_2O8^Ti^(+#*j5fo21Zz_452+LR6)`G6mUPpgvdbRVjRdc
z>lp?PaR`HxiJKc=uVbO1&yL!0hYYoUIL^4v=AKXM3c_b7EGe|{7n+JSHAVPYhoiEb
z-LLahho%R*SLv0dXgRopW$If9(PH!S&HC`mn>{yao=YspHf=fbpaJ9yh*B{aMvPn5
zat{6Pdfw4q%&Pf72eXZI<AhoSpiTI@Fv4Cra9!Wlbp}&nUJ_$$O!d3iNs5!b>Lw3{
zZ=SvzJ}>hAF3KJd@d{EUEHfZ<X$<IYJVrknZav(Q9Y<*427S4WzLh3?Yp&bv<F0zT
z4uNBXTkjNm?m}T%Jc4{XdP#QG+OAYgM(;!tm~jY2T6vlplQ~bMK!Rr_V5Zem6|PRK
z<7Ci^^MKYF7(l4dl2l{-TB7p2yKlx5a0Y$7el3~d8JOcibBpVq(!v|Mgc6BOSAOQ-
zVP8KM`*UTCKGBl{&0(DkQ4Y*>no|rr@}VGDMUmxRTsgCdZ0GR5r0e|4`qQOOb6+l`
zu#@S|Z=A_0^!69a7QN{qEGeBvP|<2tQ|lILZgbiWcsnKtn_?|ZWW}DtGbAsQ^*iH^
zA1#y^X5|2`>3%8|Dtukc_q(E+;V7*Q8x07WObb0>PBzX=`W?vWt<t74g4sI7qV<eC
zshizl-X{5rUo|@P_{~Y9DmU8H^*#1n;{&t>Q%Mwkaf{;-9wuSkRFWh^`>=2>ONbSa
z#2Q|UD%3I%b6ZNvRaqrXOa_uFq)JLEZ0$={%TmCi+bO-ybD)6$6KKNRnKRK(5A9NL
zYN-e-=FNkGb3E8P3y=nA{Q5rTkp;IB?IRgtK7B!4T<Tt<456k!-ZU|s2mIgJ%`Jx%
zw8m)aSPZL@Gkd*(!sZEC&gMjA2I2WLNo-;G5et-qqi62PnPMXeBN&F;ZLzdzshjut
zd@wniwMh%^o$W<=q0gz_oxY`H8~0=QR*@-*P5$3w;A~I)?Ec>~T3*)P<e%|!Q8r?o
z$b{e{-Lu3yVGkEaQ7IB%Rvl*#d$Hn2;)p(_|4N^uvCSjXQOKrsqdAN5zsKTYUsi9I
zg6h!+pVjfN*QjT!k9ZaAlOWk2EgpFnFWSwliZ*(&$<dZPFC)xi7>J07k57K{e{R$D
zm+wxIC`4kGjAc<(MT`1^KiTbm-`V|soJ#`$Q~k64WsmOur2im8oA(b5k#6hu>BXil
z5(C&U)G{K(sBcXV!2WOS6z<Oxz4|u6{n1qU*-TT};gG~c(B=e&*ROx@|9zutNn&mN
z|9Si&&<!zPyr5D@BytgyiZR&tA&|F6Yq$Ua3jL*d6(}RbpcIfh$n%X$c|$iq7)To;
zkoEhuBoExl@}Nw!Dav$0TEm0}h<|VG#DC|LWSgbPcgc*|w}vQc#;nyP49OV|PhL5T
zf`2tY`!wTcLxW`l1@X=>T3uO>;s7oH2mD4Egz_XO(n4T_=Z59@|IrU>eOxU2**)L)
z<7{&3^Yp}IgOip~StSZkfv|gz-JZxSeS7e9g;1phQAX9a<Mnh;Y-h+k_e#&uCD}ts
zN~sZPqMlX9d5Z8Y<PKSc7B31YDGC?*S}!FQ{japcDU8%=g4e(-<~fge3~^Oe)ux_W
z`gatemCXgj|0XXx7L}2F#th|Mo+lIff{GClI`!ZRZ)YmMRAmZo$z&`@-4xwEE0Y$c
zF;)$#5c=MIx~=A~>gE*S+AR0U`TpnP&t`_#XE_wbsRD;JRZ<Bx(3vD{xbIz5^FyV{
zBYAP*_P;iaW@<zFVI72GjKWCCtbzGIc8z%W#6)6fVJ*n!5m?ewFj*VkJ=?>H&ejA$
z-(hchHM38YA-D(g$_KztgaUdbPe<AREg!l*=w18s<vV*Hr!pv^?1v<BT!w}uC~2CK
zsR|U##ffNWNkULuQCS8Y$!ZkoE2V~KCaH~Pn!xA}bz2nxapS2lo;0KkQzmP!InFaV
zm}OAq*@W%zteyw>NPYf?hkuDv>EQ(ko-mn(>7|PiKgmA7hy4w0Vl*Ps_59`0yC>V5
zl4vO@jzQqUr+{9;f4I2<edw8!9_Rbp_IJ-8*@)nMFggUxWa1!9L0eAF^m`!5<*~KB
z>onj@mdSNyU08RJ(u*3%3|K*)H_e913}Yn^R9@$>3Gve=+s|%uH|o{I6PuX$5{4a(
zGp#Q|x=tJncx}<F@3g5@v_d%`$EFazI#|K6#T<=}K!hjDV*(D%W9+fx_nBy6Erj1L
z?iQN-$@%zf!-EO74<vpW$U{>bG}CV+o3|j^4U8b$EF#etw_4V<zpR{VXxx({H(pC2
zGF}-hIdUUkx~v`4V}^@^$i1ws(grvcxP==V(Z#Li6fD_;d2Ot*vEx@+oV*(()2Q2;
zjAAQEOp%5s+eTo+H52AWuATYKhVyvLx-2%~m_o{`=Hsd$*Z2Rc4$L;vAJHSSM;u~p
zHTCj#Cgt$ZFZZUx-z$}+VUk?j!gqG`_5HcKtppMVu{irFr|0xh15Cw%b1g0kNAp8X
zC967&sSP4XGG~CVS0jj55|g3SkKq0u-@Wk$pApZ?hKT3SXZq3BAw(#rav-md4w_12
zC|OZ*m8H%o*}{V%216I=VW(W{3b~Lmz|iph_Xm-~ZMn=QWOJj80?3zE&~yhlHAGv-
zpYzJ?J@mqilx5n8pkS;93W$|7s9GsLavS72wMs{$zoVnz?%Q3iN<2DxF@x3r+AE-5
z>I#?3x<oZRN5gqO2%~F`X*8xvrYf0;#AsyNDk;Mpvz`@$U2*W{7Dbt%bY-_xX?B6k
zmhoZi%rW5?HTeGQOMkK8v4i#M1d<3)N-05DxPnp)Yq|JU@%0I4f=_iT?_H=7D6EQ<
zLQV^yqYHoui#-9D+0JvLAi9}D>9k#%<_z_|D9{i*4c(6$=}CTB?z8&jZE)eJCNOMU
z<nPiv*5fu`b;g)82l>S!1WNkd$Z11~23Hz8QF~a3T1KWwjx=;T8LT4)&g*fT%=$Rr
z*}e`Q5Rpn(K-OTx#K5Btk8)oL?(NE{`9h`+sEiVsjoE=iH1>A;KSuLwyyW4itE$L|
z-IZAy)>drot<K=dl1c-N#;T*sUTzuOAa2ID%~S&uatE*MuNG-GYB8>tuF*+N6jVM@
zkp)E!5gDr8MGB&eCY44RMjBHofy;(<bbPnv)2Vuo+SinacY?DkweBoywX|NWBSmJI
zOx|n$SEDk@X{eY%O^{nlRY5wA9NOnS`vooCRNge3sW!b8J<xV-S*K5riFo7cz4#?2
z%%nuBsu@Em8iK(}sEUZ7sDQ>4o3U8y%&~XTLUs35^VK2FDm7D)-^Aj<U}9A)f`sto
zyS3A`FnCB%yhxd>K=sL*F)0q?I)3?yN~H<=BaBXM+HU8`LZY9?ovC7TPCbLjG#*i{
z;8q!qqX}HHQ|Mn+{C}q&%*^q|<ce(cAt?)Bq~6^$L4KXaOoiz8Ayf7_z%z;p8;{zf
z{mybTluqt-<Nee#@Klr+{9nIwa&JwY&g4I_;Pa5^K<#Ae5L;@iY|6sN4I^|E8~16G
z(uX&B+1O$C-)-0It$!_fPG|+Cj~=$K_pi8*eaZsiSH;zes{|sIC<S=<@UmSXB@|Zr
z1?Ap~-v58H5T9(kOYZ+lYvF!Y5s^WzE50j%75t^5T2>Bk--^dRI<FYHrIa;eFle?E
z1`vOGF;|A+HW3c+;$B`;&+$P=9x4Wv!W$1fQ>s)KQa5R)g)A|M9FEi3CBx3pZ-#rj
zmnPr4SHh(4ygzqy7TDryU7!9|9n*ito92sQ=;VnypxCOQwRB2v>e2hyJd(L%{kG8r
zAXAG57O1R=()9bC2vV&3!r!WLAvTl>MN(*(Gu=8izxtUz8!^{**4j5{-M%^H)?vMb
zee$B@4;HA<imId|I2UjMIJv=>!}obf9xv$nwRQnmkLhjbi4BSJAyx{wFIt_A-s+}{
ztKCI3@?p}}a?NYWw_Ti3*rZ~ybje1h5p9K7m1(`b66~kXMxQ-u+tKlBFpF;cs%0w}
zAxe5<ZCYR`AwEa~0Z`}b^8X%h#0`IpD0Mcd!jP;(%*e+XDh{)g;cCmSng{eFC58+H
zsB?QPd_#w%7`2!!;DG(%jpo-ujj=-|zlSWyU(QBkqzscfW}+2HW0LyfKF*Kt<u88o
zRjMz`L#(%jj)~4jRLnlgKD@3=P3Dr5vAUI<1CQ^)*buVK80S%<P>_5WfMg&)Pvw>Q
z#6am;vW2SsHH@>*{tXn<>F;%mn$0gta;{k@Oeqj+zte<mzK^TP#^V=1)OmL1NP`x>
zd7k}oKLQcD5;u0GXe&`g2AU%6Q_);1u8PM10pS^waKX&lmp>z{YHswo;z{Y>(LYe=
zgqaUret9J!AY{p-JMG}-;e!F~#}G$GV>FQcLy!KB&B|;o4&p=!nK33s$~@g+qzoYb
z|DCcwkHyz_v!2K9eEj`;di?twsA=bz5mVE@4Dj&oPZ&K@+TFNiK9@%L?Y=x|lFy=y
zV8?y(aTcc*zpXfP=w<Bo?5)1N`OIuMdbn1`puwhy<ALy|WDDfIkBim;9`B}E58H4T
z{Oj>@FWN_+pm#;dakyz-ku@0VD4?MrkdTV0X6NKuL-}bae+|x37c^->Qq;;kn@Op<
z>_;mxQ#BVFIE{@6t5r<;chiF&v5mdR_}AX}{@QDNM5}|4kdjmG)+}8+gWQgzQ*xOH
zJ&o6Mel_0J^fq}{a)nV<g)Cbf)L2F~H|N^c@)CQkzQQW&jQbUwnalU$m<~}_s?(!b
z5WzMGg%y#0g{svW`<((FKp<+iB7v)GwvTTv;hfdFmjfeaw69W|f&skHY>^*f`jiRQ
zS8j`r-$Y+2B9`04QGFe^n{QG=!W_;``1|_!)jvyYGb%RyFn?!)Gh^juKZIrvU>HIT
zvsx}m^;{W}cpaKnb5MZU5P>I}i%7i#j%O%9+&rrs`2#F6p6H!&Lw=SAxFJQf*Fo1<
zSeO%6zDJuHu}|@Mrs)I4EJf)lbj2iu$h0G49ce9kIJVn7Du+j#o|^cbXGyyalyD)_
zop8nNROz<ylNNhqg|aY{Ln%z{SD_QeW3EWio;I*M_2&EMJuwwES{Qb4PO?>0S}cZ?
zqUP3@e5X3zWD8!MUuW0kKJIVn`Fz+z=a8}vpXWn)nZ6C~#Ag8oBqf9e0Hl*afy}6E
zBt#96Qcg!A`7SA98lzOZ`p9;k!yezt!#Kt!KF8!hwEs^E_s7<rq&^mKNQ~JQV(KO{
z>pvZ8Y8oEUgi&CS9w1QfTob3{_CZe`ATm&HAQC!_XWunJ=I-`IJg-skApl~;0!DlU
z1buJsYbcb0=MilsPn4)=b^Eh%uS&PPPPJ(F@0))uGhwdXYRJ3^H|#@okzmrHSG2SZ
z9<@RGTBwA`QPj(cnVk}EcmP{%$BlMv0+ZHkeKBJN5m(>xhwjPIB*cf-&zG(LF)_`f
zzQ1s8_flSLdyt1`A%o2ydsNudJ^s&avkwZtj&-s1q=k`qCa=W7@c2S>tLj*@i^>0n
zdpegeVqMv7`X4^q#2ToH>n8QH-!#?P;t#oqln}W=hK<F%Zw}OiE20+mwcgJ`{AjYk
zsqz0wj;9B7sN!C{_2tR?qXBJ<2e>+d*E2HJ8-vILt_TObj9;$5r*WW6uqa_q*2)-v
zHtGqs+}dGarowcyS7Y1=4mO@BS)U{0BBZLWL!GlbV_a=2^$K0yJ$!F#EM}uPv_-8`
zzd-4@cuqhdcv13bX<~iJhJ-?44(n$jBU2e$TF_+-k<QbJOYWJ5SEqc=r>H3~LM@dT
zh-#-vbz#~O-{Jmy(>iRMao?^p!%Dv+wvdWNRf`3Xexj+r)eQi2hIG~+yh9<->uC1p
zi^Xv~PM@4@d|CL-V$piW9#qZlu<sLm#jl#uMl*WU+d7H&YPe^d2b7s1yrG*NxEk!l
z%(3OS9TyV$rfwD5-9UR_X+r7u<8Bn=SmD_sWiMadw;a;cPN@0mv?zZm;hhanyrs`3
z*4D}+&NB+ilqNnew$CZu7eQz>4l2fd6y+QB;!Uc%TT&Y}r;}XjBV0(+O1G`|!Dk*a
zREWU%zKoqybS6=^u47vryW@^+Cmq|i?c@u;*y`9eJGO1xww=@e9($ZU_SHG_;vKVU
z)f#nE7pvxa*E7@q{gKsIOn{b<<X2jonf0Atm8Ue2ZPlmeCY=~$!U(26Eo}DH#;qbz
zIm4=Ww$>WNZX9$UN&u20g2au=Zwp|rd<3$ljV|6LEtg~UTtd!Rt8967UHMC#JNH6L
z4TH%KdPZZLb~#Q(^MHHY>J{^uZl|T0P*miQhzZ&2`SSj9I6afI)#;rP^zFVf$63_l
z#oRPqq6-rxy1HmIr4cj{<y3=C85h);_(gQem?GYsLy)Q}iefTG#YNJ}TNTPlS&UV7
zq%i59R}$|RHic5Ul=eBBSkm~of(NpDq{d;!0%Skmf{vBG8sN8aBmAhp@)&)DN&kgH
zQocf166Fa5;g&B6=uH^YV<j9J;aohGl*jEGzr@~Z?sZfx3Q_Es7ttSi{!0N_?@!&I
zhZ2ej@hYmZ`is{u?M-42uCA7o7jsVQY(lQ%v4L)`PkNy07)trHDB@y}Vi>9igjLh&
zW0LirbF<R&IC}&=8U7<98vt!aBLUTf8Ny<yHChSeJ4TGXy`e6KgrzuFAbB7sz+{SX
z)s8dh7M-V`g;a4xn2X3EbSLTMDRjm&)rUVQ4#ZC*)((!4ln25i!?ZjKLrlM+xf^YJ
zQ?*EBv<T&5U7iqpNJC;+pZaV4ncE>~vS?g{mxN4rnmEoTfcWypTw)pi-u9KN0B}*K
zpZSbaO6(a3_nHZVsh11~6jX)q9~&hH9iVI%K%TAxAXmq-D?ul`GG3n=;(R&9?z*ls
zstg2^z&I!`fq;&L55Alp*aqrIh9T1Yb3Kyg)8yypxA|mpywTv~pdsL*eaRl@cB&fn
zs;c3g>&x=;sh1jvxIXtnUfaHG4t*xw2SMRGKhDMuxSNh-#Vrrtnd0fY3(*FVn;_$$
znd2t&rq{(Niae~|8{;^ls|+8DquA1zmDVXGziljgS)(})A={BG4damqS3}yLn7VEt
zOQbT|M(1@h&vj)i19VN|b4-NeV{`^|GpNQ`w3&hVsG17&R(_HG?l<+Q<l*7FH=)d3
znqg-=c?j8vX=3<7Z-oLpp02j0^>9J6DyqgTXoUU#UMP1JBE!*tK;w=Yrbb8mz<{|6
z#Z~=fRBt#n^UQspP9#er2PKz-P>5;u@4(mtG#DdsjZnU<+{kvlsguN7zhp4R^ns8G
zZQ;tUp?hXOS@gd%j}^`QDB1GH0Q>puZ)>&l%Sqfa9R0|gO_2Aa88@R>cGclmR%z+!
z$+xX}8m?U)l|3Rr=Fm9yFL=hgyuoD0gp{R$Q%z-BtAcVuh56GmV4nNf_BK!V0LZ{y
z6xT$IBu8A>+e&kp1ofX7*FP^{NI1_^-1Zhh5M{#UG~e@h`w{XkWlO#_bDpP!h9U<*
zZ=cj$6WXgMDBPSX08fiCnl^v2_6L;dr{~fnNdpwhS0PnKFG&DM@O!1mJn@wvAJhF%
zo;<&!M^_nQGX3!)2o7;HB?q^k!1=emUi_EzXQlY|>)>fdi7tuE4gySDRd3PY5Z~8Y
zsC$2x91*B<NnBCCgpg`yNV0?2p@WhP9Bt26<AdY&n{Tp*%B}?wYS?=}=;(?Ym0nS-
zpI^r(jafF-b2rZH)qVS?Qm;?p?*yD=#!^VIBNcc$Wqu3RSrqr*KhabdlF`%KROPz3
z1BAh>Kc?URF1uYeqDH{M(L|v1i?ZfzzdQG>3c<Z*Z<{-&+_nfF&v`YPgqBV~1sTOb
z=i^hM6rl-%@)Cotn6bS~Wgi4C#LF%b)6z%^`s3hyo#jJ->mS|M6n-`VKG|{>wpagc
z5c}F+UGdV+@%Wk8U_ACpOV0eH7E*4aO=S}^sK=n=MJ5W`@1_U|xCC^&Kk5ridH>0N
zrF#JAk|1lnNkUeMxxhl&M+s!G^woESw>aLOxH@2DcvKV?k%~Jd$2<y&;2MLtAAs*%
z#lAWFrJlHYJZR#W`9v+s%YU%Eo}8%@%?|qQ?$C12f`61c(wqpU$lhV}q13#~A!#&?
zN+w&v+k}ALHMl>!F7`$Jd2YxS2%V13$&lkgg{p%)8~@7W187m?blD$x9{GQ@KX@V9
zBZeuG6u7%d<kqg*0*LYfAim$_$NlrlWD(^OU!RN4ODY@oq2b8Uad{Ui;2sse)%lvV
za=>fJBC7OZ18?H9c*sYOc#9SU@FG=JRA2-51pYlfE8b9wD~({2vS7f~*BCr1kp~Nv
zy0QWt>4JkunO_RKzs(v{F&OyD?=>Vmht&K{SOK%!m!I5guv`cefk2@sthho|)U|W)
z-;Dm%&4z_6Am`@Tt)Ok`ftpdofmr>_G7f{)T$76`I0`1VTinrRtPoh@;hZFhOE-+=
z5pdLd2%vBpMU4hVBgztQ;XA~u6btD^2nY@X2Ew!-nlJs^Iltq?0vg%v;30}dsT`eC
z<a0l=ef-F}J&%`2W<&#isLUeoe|D{B66(|XwY`?WM$Q5rXW~352Yd?oi6{3BQHk?J
zA2F$;lF@mgs?ZPRC@v3{ci4}j%uent0^`oSNGO8&z~sJk^=j<vlaBL|szV5q$JWM3
z!fB{U>7zQI<?Q4*-*=4{!Vb%29z!Y2Hi)uPNiBwTF|AXs6)hp6$r0pZz|=SeLx@$x
zAY}X`8BgWn_rfn<ys<$qL9!ru4SuZfyv;?GGnXL931vAI%(zni0*~N(@AlKuG3%Vt
zk<%-K|D@-SGhf-_k>-sIjOfqH{*1GX+lan6?Mx3PW|tDpacf9Jx+By<e3MN$l$1$s
zL%DtPQ<tyl*`f%bKt=Np5JuFqN(SM_mx?0mCw+Vid~*fRIuAjQ#?F&_It{Edn-NAX
z7;l_o5%)pz9SxEkK*9+YMs99OmZ73N7COE50=zH`??da>xnJ#yYs?W*8~bVm^Os$5
zlBvz(<DUdo0qlxG46OcybylTaFc|ga*=<)oI|VDxt?Q31<_;+QlafpeNu9!$_m^_6
zuhgoT*dLSw-k*v6gPS{xSczEw4$R6L>bGwKPZ)>7s6rn{QFe$DP;US1q}*f!wQ!;=
znfnsbI&O~DR1N9H$q8n5=H{bEh5{K$md;@wODDpmvy_LjQ>PH<p~jO*%NhN)6g>y@
zrhlmCbe>(lJsxlHmsHV%VoFg2bp-JAIjk1(&JlcO@y=C7bPW4@GdMox$$$J*TBXl{
zb~{=rSd%a=<9XlgkHoiJha^qsIRWs!tQhYKx_F<Ji_J65z-2q6VskSGswP5(<?3fc
z!yIR<n}g&q0^%MXy`%NTk*FNEj0?<&MdzQzneH&;Q6A(EMEanqR<J<ZLM2ZTCw^wW
ziS_Or984V(W`>*jrR<8HoqY(nT-3aui@LO;Ux;6afukve<(I-vKe@Oou5IR|xVTDJ
zJL!Jb99|^>W!@Iz)E3PeniyQ{ymyKCTQ;Q+)i8{{OO!#E00)Kz?Nz;CC_n%lQou`0
zK!^9+A{q?FE`|^!=JW4lgj$oJNc`M?m;wKMS`eB;Lk$8`C(;rcl>XRhHG+<JZVyW2
zw6XR5apj0R724xCvNR;$)G-2(;FR6x$Oc~t2-qC~2a_#f6y-pdo$dA&j+ZzV^Jd~<
zrw<=(>n$J2?HUi;8_Ds**6fKFHPdI;k`d>ax;1Ez`={6uXJjFe-AP&E1TiVD_#~&=
zBMd<1@5J?rW(mjH`e^T*+sNye*Kz}RWb-%!p0Kxf6(9Umq0v;YP>+7RR6~{+rt_yq
zh36OX#H%lNQbY+33ldLQszRDlVa^$1#R7KiA?oN7_b_L}{XHemd$WpKE%yEC@z`m*
z;_9<H?5L@eZIF9)0SesLTN%3_vE|EWn`XsL3S)}5eBAs4LnrS@U&g-jHV>lC`Iqkj
zMC^igqy7?q^tWUr#QG$8#*7Vz@~tpP&2ah_-Q6q#-0aS(JlJ;kPm^;bG^&X!#W>AK
zL`4WRRVvO53z2?)rsGpObq@v_a9xeFI=VX5f_^IolXI}KvC^3|sfyU}*MMyKY399n
zoPrdgfS1S%IJ+FUsf%dO$h;r)%WFOj5qkmET1zW&iLPr{&g*~4qz#KKa$awa2@<2U
zw?nV4PH?Md2dpk`FP@N*F#7#~oQ$cLxh_<^e_Y012R(Ma@U3ZL_8s&UaGsBh^d@8B
zSig#Xqh33z<=zvvnU!&ZbGq762!x@YFQ_2;cn}oveq%U1Iof}jrK?#g*gb!kbKx20
z*i1C|zM%cUlzf1Lqe4CLB^%nS)eJ@J!~-Fa+P%EPLCzs1FZcZ{JILamZ<{=;n0tOq
zrnaX_4z!#Sm$n6o`x!~6VgOA8Sx5>#xE7{=e+js;+MX`nL`tV<9ZU{4Lv0>LslPUq
z`dXhAzq)!5nq+ve&bhZ`sN|UBkD)MM+H19hU0)rPA~?4GdmLh&u&tMmEN?KdjaARZ
z?%P%Kf>@>G<2*G8i<Kob^^k@V-YAYO1E^CKkRK!;v3PR^-wnC9Um!45E$*wvbtKEo
zC2E)90(ksMS3tOWsl0p6sr_((VuQ=<g~%;5Av1C!i3i37kp~$EkjEDjYiN^_4MOs>
zyPM>F#IjR$PJ$8aQJpGQr{`SG>z@QKf;hceXPs`UMNnB}dX_@lrl@@o0q;IMvV3?1
z+IL5hgx)d*?%V6j%j?9Gi_-zNO{&_mi^@{v>+Y&96(Uwujq@&x>{V&JtGmU5dcd-e
zLGQ1)h@ijv>z8)dFk-WYRNm!L08GWGfFv&sK_G$5taR-F#o+YbkDJp&Bd*J3rH`jd
z2h-#5ud18BzUx~_js2W{JL%uJl}g&ipX-0}mG<N{($(c!#&e3R{+U}bpsVv`apdpw
z_B<o0L(%pm*oFu_OF!*twPs;OQ8`OYl)h53Epn4x(yxBPe)5Xjy<(jqyPH&>%J2NS
za_0o#6t-jtUQjf&X?iI|cE+fPE^cx76whH^NHojC{`I}FYHHGo#CL1dbyCU?A<^LN
z(oXQ<mOGz(eUAcAw+{=KJ$(`7oD9rA>~@$%YE4dW>2B{4YlPNi^J5m?v;OAqMG|**
zVwRev3Enz^WFSr|NX8#!#!ZGuxSkZXqBVo#083KJ!&GG|czWaRLqD=z#Pi@`1&@Fq
z(eT|Hj9Gf0kdHC5qWp!hD}+Ra9u-NGlh~w9ND2Rs@l>^+`1VUwP6`-MqzYYq_!D~l
zt+cQVJu>v=Tlli)$@Uid@E!iwv?cwU-$>2yeS!HKxnU3n#a)Qcr96#)R?vH>2Cu*O
z6|g>ja_*M!m|c-;>Z?)I@Ew?Zz>*Yd9uqZ~PC5)psuuFg8bL`))@7&IKWNj^Po19^
zuxUT;yCX0$nL_rgmiTIRA4}Q5I(0Ighn)2~m;SqeKY)X<^B9x?F@;BB>!pz;A{4-e
zjM0GhEkPYqvNy*bk!=Q1Rm(gCxPbSI`Lu<C`AS)Z&6`rwkoHXnyJC`OGid<xxD^nh
z$FD*_L@;J&MhGGv5Jm|M07Hm!&>;@P4l@Xg>T~E}UY*0tH1;&m9gEH0qoInbTt+ra
zon$iovHRv0E7ja{j_YF4&i;h7F=3T^!Mx%A_Y2WxYm(JC+VN9UF-Ed+tdf4@2Pq!9
z#gPAlrIv+bTrn$7uGe3nG;m3p0E!7{Nf*!C*kTicimH_-CHzNKO3O+qmgw>2?Y)sZ
zd$RNjD*nCRdh|_D2m9v&_aF^etTrpJy)h0{cW)*t9JCJW*g?^Ar25_3fyBGO(pI|z
zxE2O6hNzVNSOC~Lv%h61dWI+Q)wtyJSM-Pd)v!0-{Jv3M;bzXZqOYIGdfO8HpTGh<
zpWeT?(PbERvZku#WTeDqQV+N46lIxWB(z(uW8Ruz=s(#oe&|%<36T?IZcS*#{K24g
zp;=JGF1XxWEt)CnwK<(R^*|CVhKc8?=naa71jC#g$KU)$w57@g8`*6;=L=6z#3l(Z
zfG#D+e_tfb9ShDGzRamNFvU=y$}c7Fj9tQav^`i3bUzt&+RV<rSlYMELMjlcCnPUH
z)u-pWMtmd@bukQ_3Ovc!GMe$FxR;PA-36CmO!(&vycxOpofXn`O=x$v1}&fSFxmL=
z?I*7nXjZLb;7$;zn>z7@y!DN18=H9f8OxF*K!ap89P|4oIcM7AIbS_gtruHxCPFwq
z(-bNko#O6bteVMzPErp4@I2bs#N<6If*F{4$RaqhB9j!s{;~S%b#I3im0RXdG)vU-
z2bmsSbc^BFobFko@<#;8SK^kzAK~KSnQ!ohcI-3xo9o;Q!CR!6n<VTF1w%3yx?9Rq
zoUfQZoC8%^AJez*zJ}W(!i2(2hxHJWfDZi{XbIKR@7HSiiJONS4-)N8AHto-(75Mm
z<mX#X!j+_-u)+%e5urE}9H{>hVa6yjn7;oJ;*tM+%KukLu*Fe<hW{fd|7)^P-2a};
z7=Z@Nqmn`cHdMxO^gcb$FW;C_Zi*4sgtg`&E8Za*oPWq7yUXCFKH?G`8dj_u4eqpo
z1M~JtF5<kF5|Y==M1%sa$lmxqyqi`Ym(g=oeB1d_pBPLMC>Vx^Ll5eTvY5jHy5n6c
zpx)_D=0S9{vb{&6AM*wV+^QkH_0;b-JHgi<)ENiF(ZOeaY7qw_dT1bC?*)R@(cg;4
z*%owHD@@x`DfkP%S16MH?PtYMgt;agiDrVt?m*`;xIx;upg@-#!KoOTvH<bxfkge-
zh(e;ii-8K0QgBi}_vh@n2O1xMBR885!QjH6%BybXP{C;ls)K<jm%@4a7sJ2-HvW}f
z1(ovze&Z=1Vn?Ec$7cnBU@-QWVn`=m-F$O~uO0%yKRfjo82w!!zz6SL{c`Q9J@2UW
zBOBg6p#$X(&><<KxMEX#WfWg$HE-PApZj|_dPoGni@f%Hr~{p0@ZsPRLHzdndNojs
zZ)Js6FDyK~yU<$%NE8A?sqm7;Tu<6rS#MP(k3BE~6v!yNdRl0Owug5|%G-t9(JdO>
z2xgHFF6UAocUkZgnU3W5oOq?PL#-LV<ME`(r8wa*F(qX*05_u>h-#>datA+&9T14O
z!Aaj90lFzp#l4siVPKS<ikz~-&=|qtXd}2)D0$x;6&PhM90kQ@=@)ZXq|u`r(Iaxu
zbbiC9yHzfw9){!iZ&hI(4Jq7N)7rHK4ljl-+Z9fC<_{mwo%3ZDA@2^(I-3!iu{aWq
zPap?3<<4WRb(buy*<j}F8wIAli2)jvO`3Y{d32!}Qh5qK;KL~~$WmnqnQb!uwu2{R
zPsFd-biR=F7%nP^t*4Tr?nG@RMM!w%9*XbP=>mVWxYRtXn{(rXPPROGp?jJ|*S20T
z*PuEG*U56?f7*sj*dpdKwwTSYXU<~5QNdpZD+wF)l7ol*#sSiKv8a}JbqJ`Eku#Bn
zi5y!r-+)YT_A{O7TTPkz{v3c21lkvWjnM^=;vh}vA-s7V%!F2dmrGkHX3iSH1X5&-
z(Fvi5qB18j8bdLgVe|&!Ok>+4B4AHyC~_X;51>N)XY{`X9ZVtP?_lbGZpgY&)p5@O
z|Bax-3d5wIN)iY9jURsm8*QhLHan_73#*~<vq4W*csy6}p~i0YJA#47C4IG^|AZk&
zZt)LCzX<*!`Mf}|Of(oh@a89S^p4#<mnZoG%K}J09_NrOz$XT(W=#${h(Y2LNJ@)@
zgkC*T&GtYN5y1FMLKQ<RX?&s7Ee!AT(1>hvMK8JJh3bu^al3YE4!(yy=2gVWA8|s0
z_O2M__Lr7pEP@W_=k|z$#ckPOXFoU#(yI@&WwrQ!?M01ozADfW#b&K(8}=fu@Kbvc
z_8hJquEBmu-q`KyZ>=2mOHpdp$hO~~yz?k>2)!G=@A&A|=({}eB~vwQc-AWB@kms-
z7a*WGwHoWMoM4rh`?;{=)$TaK`-R?gzz^pafv?`(8VZbJF!<xNao*>4_`ZoD?SuFU
zjiLyI%})=Z*yl)6v8{9Weg)iF_mO*bEI8iFh6of@2HrsrA2TE-z99DjJ|p3|?vQHP
zM8-MEIIleBE>`(gs@AoKwiZkq093q$?3(9T@ZJT&zu(qDn>T$^?$sAe9c!>BJPloF
z24H|4@L;;5yJ8*E?XXTC<)M-t$f5{>n26YhNN-Od2_Q-wv0mX>8Vwg^sG(d(sz%sV
zX@n1gJCge^ii|;wn;?N*ObXKXR9(-CGu^GKZR`;t&dfm!E%Z)N1Qa;_Q<biF+QcUF
z@r!fjTX5l5c_QQwe(ajNLA2pB6y{p<DxOq+-ujIklzv;=W_;^)Ffig*L7JpOS)&h#
zw&d;s%>seG&eu1|90Ph$V%UThrkj1m^&|zPUeFmeIGR^Ex|0(ir$phKRtY53x6Q@!
z(~xh1Y-4AVm%SojG;o+4h64|C%wd@4(-Ip|mT^l@Rccq)8^WKW&*Z?~`};QqSX5LN
zAi+1rP9HyHzTD)Q$<z)&ZJ!HOR6b7rK~#mk9H}>ns+)8P*AN_pAAoB@Aj)jCga0^Z
zIg$6zq<tm?z3dZb&bJ6<X{JagoDT=dZ4DXEXLtf3NJ0-T`+HN+1jqmZrmUy9I!~ZE
zh~5=6@7U^}xVpZmpJOl1&el21zyGZm8#{2&5}iuW4K=4|B#gEGVVDur6KCV9c<De6
zCAhsmoUdNZg*q+t@<2eJ5hYDaSd%$<h&JB5xd&bt`v~R#6V6-<R-715bgfj-@?x_7
zo8NMY2uU8!@HVz1!`Y4-DW<EM`eN>PYh>BcN{0}HiInZ#TXdN54Y9%N$E*7#!RRR$
zWgGY8bbGsje<l46j`LXBNsWyq8Au+CRt`I81n5qwz=nXxR39l~i~I2TXDVeLd@BdG
zMIta;pZaQU$Ccz1UG#OAWDF9P;Di(g<OtCVB{Q+|NKY1F?R98m6^3Q30kPJ1?TAX)
zNKtAnoenm=oUT5kR=MjPYuAie36A^}Z3|PWR;Z8I$;~g;-}})QwMTR3wohdP1((l-
z5wbBfQW(;=<oaDr%c!>X87xLZ7ojoNuMwK^24JOWa;S+-wEB>10mAz@0I~r)5qmhL
zaQYWp#~{$Z6kc=(DXdb*Dlhfe3yuvH2OQ58qc#XG-4_mPnDVltWcPJt`{%vS#wXgt
z;^#HBJ$Ikvt!-~T3Lfk%;CS?f!sF73B~45Q5hJOxbP(C6McY;4u4AWE8In<#hULBk
z#-LZSd>L)bE}DLko=5<7aL;ONxIqFc#qz+<^9yAv(S)ivKche_eu$)HAwd{zo2cPX
zfcUGdV7gSU(ikA_T9`yr*T}g6wTg+4flq4_?f)ELN}7t+<2MYcWpt_-L8q)Z^4pLu
zIqYSNaUBd9QI#6IUM%$WNjH+Dh(LsHgS)8Ot+u@!6SY))2r2G8Av8vGH6I^5=rl&Q
zQHD^8AF4oHytJ}X#)#6)K-N5@%`7V@ZXwWx7Ac6Hsh{A;lnmE~8LQH$fHBL)YaDV4
z^I)t!8YlihNz(m{t_IzT?Gu=V8|_%8yfT;+ZhUr*GBk7%HKZ{)t|uuz@`Mz9Ib&4j
z$38S#q+nKR+e_%+OO^(t&WUA^_Dp>4u_zCu$`8L=;X1@izt|@hPek4cCz1e*gvCHU
zU)6tR*#XgwhGwt7tP*xWpxp|tl$x0EXiQcTg4F5>g<*Db++cM1QL^wQ!}OCdAALE8
z+iIxuigWHPFv`pk2T6pGI0=SI5JXFvlhEahW#5X28i9wlP3iX37x^Vb?Tg=GvXGD7
zQj;U<5Ui!<tvYsnNHOmU<8*8srq{eT-KXljpi4)w%>>1n7EM4EGgd9${7s^Yo`?^F
z_ZOH6QS%=K`L)w7ncU0qM<;sKaLag~wC+Nk&7v|liJ;N87X*RgNI>?M+4F?l*|HGI
zm^uQs*@x}1`{@m^0LvAfErhk`;TbRYEB&bvEjreWYOF8{KM$<C3%MFawW(DgT6GUt
zZ?0SxV?UVIW0QP+4urz^hkvWo#&&}Wp;8KXN=|m}5fe&CDg;0)6eb6(Kz$OW4~0KQ
zjds5Bv!`nSLX%XApP6}sgVGxKbnvOaXdTVBDPaK>vmnK^hA|0XF^LBIiSYJfQX?T|
z$?Ev^Z)|4e)P%GOtY4oPlSkuJp4B5f!lP+T+9D74rKjj>{=p%=TD_;H)|vQ*8Wkpi
z%Gcq{>f&kizAHTfd<k%Kd#lib;y*Qx#^0R$Xm-pBDkly{W##s`9KLi_yHsxGgI06j
z_L0uSN+@}DUfEa$0%Bdg!~P7e3op8<+WshQe*&mYTlNgjd_7*5mkM9Des&~B25Xoe
zmiI09PLXOh^F$0fj&YV2SEfJEm=XIaf0h=?=U{E^vnmc$Ob?=vuE#ir2E;p>!AZ?y
zy<`1(r;5wZD%f#X<R;l6h7#a>Y3T3E{#oO4qGf@W_)~|BPrrfK)MEEjhf=!5Q9f3n
zxkeTInsvU)*)Yf?Ov(EeeQt*kn5G9<n8L{|EZn9We1ej=r~S4{1!RDYNAKd+{L=nu
ztEAeNrSTu2i>gXGR+_TxFIm=kS*YZqvJza&;&fA?BFkjfMKWTC8jiDye-sD)q|zT&
z!8oUh5PC?;93aW9YiA=XFe|y%t$8VQ5D{8_lzm{r8XD<HMs%}j3QVZh@CC*&(yaKT
zdh}G(RY5pi30``MLDB5#=KGM3h|Gv;zf?sy<`!$hvr+wRYDsDA!_*HtIfjvcTwk6;
zqnB1wEA62TEzMu538Y^^z$B@+MFs`ZMFr<k;NMu@^)VSDIwJcIBm9_KA@_RT_&V-?
zo94*%y?z{0&rTJ&bo!%8I>l~(Ih!cc83MW}+i(*JPctJ3_;>F8c|JhFMq1VvuK$D(
zSCodv2?KfM2rKUZ|CRav2EXC?sObi6cGO(2Emf@7Kok+e^LonU$Z)`b?cv`!!r)kX
zUR{kIp~dpqz}6eF7YyW`w<-pF+2WRTh!~mI?xu8HOwjV4ze<HSRQP+C*0qf@EB!@Q
zd2<V|!YHXuq`S)z!+dUve=BL!^5$={N)}{P&=BC00u&(v6_+Z`ty0xNKBcGsiegm#
zk*PwGxI>cH?z~o}`nnKcrsZLS&t`c7_%77;OC4^i*3J7362;C>vXW<@bd3NO+aLF|
zn}&DJI5|1|217&LQ=Lj1mGHL>bqq_!0yK4fd6OTvu8Cr{73GA9t>!>fj`5>trFSEt
zDbb-}^JUR|y45d*OzZn*t@Uxut(UL(P1#qzR+_qnm$F_eH!tk-;2|B%mmQ{cr&n9M
zlKI?f-DQZskHum#KO2z^e|QzN1w+yT=s(_mFhjcs3oByej#=*&`kXbVMo4k&N)4V@
z!}xP&(FB6VPEK#iSwc%tgNj$dX*feFTP3J4R7Y>AJGfM&V&oC933S-uCoK9_vZ$$x
zC3yY9T>KG7`%_Q}C|Ib)=+r3{-+X~I=VVf~%1|v}*~nVlw8Y-CR%6WIco}OAox2mD
z9IbcS6(FfKqO`a7;NoRtGPrYhXOXv{dsLHW8`0gob)w4y@wg7w5&3KW?^s98w`TDX
zKJ|9&6ri%T{q=U_<8SE`0<#G8Q!<&+(l$CSlv1O5)(5lr$W%dO?69grU)Lx8ef8<z
zw@WFud5vk>GhivIsl8eh`Dwh-hYq==#Dy7|P#AyiN#MHPoRex$>)>+WZ*X4V@hFYX
zSy^2N5zc*fh~2BZlPc`QFNrdxdTzZgH19CgomFtN5(R~_gPVKZ${y&rBJz*ji*1Q8
zET`fWU()C5w$-l&0AXfRYzceUGc{&AKGhi%{xo<2Bwk3@h?>E?g1n!ulbcL+w&M@l
z1qJOv4b7EYFkw2jc>{w-LrB%moW|r!8p;HtxsGtSBjTopUXX<9IH!h*f_1>pdQp*Z
zJ6AG2o6HBP^Xp$iU5mkPE8i+;X_$_m^=5t1EPpG#GA^p?AssnWT1Aq}{H*i-Fd>Oi
z9V)6fwJ0g^cHqx?HBC@s?fzJfK0vLPl#HFV4yzJkEB{Ou^qgk-eUGkY2)A)B&TxM&
z>)w=h1|8ajrbfW(?TVR#B3vo#I}Xb{tMTN@K&2#+{XBl)YT<0G(?yBz{jQ)w^(0hL
zmRhN)jc9D^;b@ME!(Kd$(&0Oi)<(FX_CO_3#jSWnfhc^9tvxZbEc*H-52;bOWM!nq
z%X6G;`So^}G$K5+!JyD7-pOx8n;tQ(ZGT`ku9dp}0`YZ-o(e>~{^4kc!#9<~Ks&&j
z{ahmH<}&#gPQd0T4y;pjLO5iK^Kru{?3)r5)E}AIuU+ITv`F5Y5fyoHxUV&VHqWf6
z{?cm$P&c0sza8wK$Z~>tNrSt#n0(l<WGme9cxJ!9hJ9YaS)ib~UUfNtW8)sVS|AKi
zUw!g$mNeCjMjHFXNhxrujT;6agTSGa5L$k~QJyos*nv+oej0IhG3Rnz6~pYGi2Gr5
zVg$sim=WiJGI#%gR>Qg?{5^TBBQct;`Nt>n(4d;}ll-8m28l$<q{Ip>l=Godfgrvq
z;SuIcqK$PDQFi<2TA)KN>iMoD$>f#L^Djc8xNbT&YXTokAfpA#%>GFCk2G1_;umz(
zUhM2uCOtLG2K4(oMr6*-7Dbjd<BXHI-qwLpzBnViWRZ85o$=X3k`ZAj6HsLZK}FOM
zICOg*CF<yfbI&)=2-~<R7T_%Jldd<!s_ri8b(oS|PV|z{6R<y!GbwAAPeFnN77P<)
z5>!jC9Qu(k09xS!eoGj(sr#_y_AZ%>;qYa-<}l|S1mqQUcoAGXOtGq=fQ?e)T2_Lk
zs{BzQ`__BTTck`qJvh>k@2miO5~ap7Tv;CDoWax-J!*|Hxw?i^nLSjM0b6r?%h}pg
zwKfffxpF}Bf^PGy4o$j?jP>4&;isO}GHGr@p|`UQ{_iZ#p@jp`11lUbNrGzm9tF%f
z!B<Hkwo?#G5L}3Y2{^d;PCbpB<@4pItaP4We&I{@sCPVmScthpXrDZPKZ$?v)IB(8
zK!tjCg|$bC&`=dD71HP-_WW7@*lwv!E1CT(c=m}BGkfZ%NEz512=KUp6C(mcJk7wT
zV*gfO`KP3xstl!*SE6cfhQekd@II2MxA~du=I})t*cIc2uOhBnHLqg0Y*EQ2Ysf9h
zSrHK+I(ClXpK(9UDd?A)LDp?`0fVB%as)gtFBgUZAzzV%Xn%{ILVj_DcKQfq;wM@U
zNe92w4Os5Ng<wPdS<u;EV1B=w6!*sAXw_lB@fn59#hoOh|9f+-)jMCW<8zDV3Vjke
zX<6RBSpDXs`AZ*~LlZobI0_?BQ4B*-jOiZ^PYhEQLlyNuiQ+$-nxfdhRF#$O<M_$1
z^~W<goYII#1d(l@;4iSLT9It8ld~@Y)|0s|=Tlt49aIPuR8W)wQ6_|cg%zg%Dy*O)
zh>D5|ilY9zLYooa<*q1$i=98M;b3|fnEbER$$yF3KkL<hM^`+?M<4Z!m_RNFuh*mQ
zNX?Mx|2+5q%+zoAfd5|j{~JONAk>x${ABX!xjyd@u%PmMZ7-j7FJF|DnGb%L&wwlf
z;v9M1&_;M@&Bs2Z_3^8^QwwnPHyVF=FMkGZ{v7&cnJon;P(@*h4;B2N7gS`qMbIfY
z&^PZ@)HE>ZZ;h<<KD>B$iS-PzB$wa5{h?@Z&%dUN^1dwpPI+fVy2yUC-TLpbhNU4t
z<jbkcK)-(9HljJZGjSgF8-uol1ht1+ug#m#6C4PnP~kIxIN+WNtOZ3F3QQ;aWZ_-#
zfSB-L`?cDsN4hLP>_LLp!fe0KKcwb3|6RN^!ghlz5dl{lof=)ab@4a_B5~^#lN3Ld
z9v&eUu7uba5wYw$%Ql!LK!h)a6@6aquB`@v(Qd_bR_W5Lj+_qJG_?LmJwX2<BW!(l
z0qwPnloC@pP=?Z315H!YfoY%EolTq<qa;*slZl}&wymC5;NfbNfTX7}<loP&C@i)q
z=4fCF4=oR^ov0>rp9EDf5cYCaj{mANS};eS9*Q#S_}#pY)fna$cbWM|<|hbIEW%!1
zRr&E|4vcT7Z}hhOERz0U0)QIKcdG)CsO-a8FlRyj$zKRd=!*I)aF7Uu`OV}>ML=i&
zoJsj7ORXu{%jGwJ{EtBB)!*!^-rmNd41f3Bw!p+dgu}e{zeypU_%FakE9%in7_&~k
z+~s7%#4jS5`Y34;`1>ql!nhRUR%@*5u2-rlqhrr|EI5G*;SgLESm@%vrNsUEN-qRy
zCDm$bhV>|w2b`T=bI~b6*_*V@`{YNSk9@4}o}WbKCO3h{BDoQnLnulZz~3S&sNfid
z4dAlWO3Fec;+1rnM#QNUaM(5jca24?+{5G%rNnuYN97a*l4+o@a5f?2qQaoU3Y4qq
z>3MPG$T@m^Q*bt+-N^1k0_ke(B@ns3BF`?y?^g3&Y0D+!%P$^Ku6>|BFNRlz@-MUJ
zpVz2XkW|0qN_G57)Mv}D^^XpVK&ni{b;GaJ2%pP2lok}3R7G!yQwa^G4&h1Q#J)%5
zTY!bYZ=;}p1X=M~9+VdmH2~Q!R9p*vOGBL<G8l2>rAy(WBt>y$a{U5mqa*P$LutNb
z)%L8<Es~Ox*V#chB!indSGH}%a$Tg*fhs(U3Y=!bn#a~XXtm_&)Ey^PKmDO%Y@3<Z
zds7Yo*JPyZJN0043RF+LYA{%+THX@fL7OSRV9bwM+m6TZ$7vHt7PhL)Rn6(KX5x1t
zsiA6)tRe-#hUM<OlMQQ0|LfVd#bSG#4%uqAmwia*y8T+PE6pi*g-*}V9ciEI9%e+j
zjjtvrQVKVH@&SP@kX{cl2eL$4m31Im)QSY;0!QqZ=iLulIPO+F=%em(%^U*uwcS77
z$8{Q}6GViXrBqf@sr3OVZ1^v|e<Dr^7}3x46yxaLVQN|4Xb%9_ePM(?3!Z#iCCVhk
zLZD$k7WeHUJQ(b0Qy*<B1jnnJwZK9_B!47<C9ubF!w9A31_;7gWO0Fa3@+^BFF^R)
zJ;TE2-;I4qk)`zp#HjmI6T*8$Z~`v^LED?kbp({C;v8(I9G;JGYBpo#vl|I(Qdqr1
zS@$%RQ|^sI2_PY!C>tlr1)o_P3~vvHGoM_s`9*{4p(-;(s7+rq2-+J~drxhE!31d@
z6&y2`IyC^}*iTg!jR-#J=>s<C?WZHG(Vb{GOc*M}YpnFTTv728tKz6S85eFJK(7ul
zeTW}&w0t-ALvuE&6}IYmT`n9KIPvCf8~tuQ-6T6YLl`J4GnEotKqRE2tiBjtxrSnk
zy~_yB`I1NsxS+p~2=q!|zlgj2?irhr{hShWw6A^X8`bg60xMZFd}Awh;qe<T#xH+E
z4Bgvc>UF`L5n%}Mo0@B<=npCN0iGK5QZW>F=%?Ea$SsvY=1Gp+JSr_l;t05~5jZIQ
zirf3e?dMCUK4rW>>mG8YfyV3{10Ed}W`^@7E!@X6hk-7%Lf{=wPX?#~5V{F;3VatO
zzq*FW?+$Ax+40HIX%F?Q?DE4BBrc=khhd9@RLJiR(gLW-ygs8GW(cHVfu^3d^G4*C
zQCn)%fn^(Z@1mM@CfF(mhw5BB%*MrZTd(rC0yeM!aV_Sd^yfK9!2}_q1VJ4NA>t&5
zqka51HwXK_+d6KD3e0H3rmer8DLf2*g|Kp>#-T{eD3QYVdMFgJJmarKt6DYxQhNTn
z2}?1w=ex!4I*$AcO4b%x-EMH9a3v3F>rGd#2Dj_0$emyyCG;f6=Tdz^uFExcG|OW|
zQ{`7p#MNi?g!$RSu2v)YjB(H9_i_-Eo%e`xWS>GGPzQsjDD;(d$UWT}Crkss8a7++
z4o^z8_*XnQ#L87<YLa`%VMAwmEJ#J5>O=mz-Mr}in{PT!i(@fWVIKcU`%MY8(Mv*|
zXU$BSa0F4_(&QpK)fk<-A1y3`LWwGZG{*&d#W)CZ1sKGf>eviRB2RQyduJY#k!u&^
zt3l~bupxlh*1`Vv!88d9pdpLi{b<S^HE^C|n!80~R0FJXRAE89cyDVs4>?Bu)hjFX
z)TDa2gst_OvnGNRk3h`|VwRf$3qT%E{^;>S6?daYFV&Z0i)POPPm<x~x`L2o&}EX>
zCoG2@U(MBf_0I@J;|NNb3}sIb75GtoDPq}Z*08+()~_2xrNG<a;^+ti28U50VP{?k
zLMcc9!o^{`0a=f}n8SYv)h;D8D_X&T11DTwQUNKkA^KZkcQ<c?qC;wD3!d<XH7dSZ
z5xixIXC43UH>D@oUnF%%yLf2j<+Bbwl5(hxp@;g)_sSO2NhSvMYSLM9zhC}yWlf=L
zJGlQA*l|EQ^5A~vCSk0<qNvLS&)tknVXi@IxIxgMLD3&TMxR0v$|l%AH*99nExhny
zsnDW$u{p3|95`?dI0evYNGv>$+WFl%WP&NbnAlr4t6*;!ghM>fa_r$eI6i_dT|*_}
zP9;dz&t7rO>ce^2j^cGouzmP9tB#0*xNxX5#lSM+BoZUM22z=e(TeI>eF`zy9GY!#
z$5P#KI}3ngPC1#v-1A06;5dAGUQXHRiVl~BO?}CFMS*$%O53T`S<~6$$$}VM9L70x
zWpk|>9wATtQStf*TaU8vGQhy;^<_1lSLXW7a8MGC48BUk7?nfcLkxKuqKLye{Fnwn
z-OX&&U`@S)bnjwYXCkrkn~MN}Y?jxizwm(IM{~%^Ey#dL4dY^}g^i!>d4t|2IxZL@
zK?_T=C=VpAV#rued3mUxyg=e)dk8}<`VrS2@;0Z9z>Kk8Dcy1Kb2;z!KthinJ(tpN
zFmB9cga}kgLsI{U;SL+Y#as9`kGe{?uDY=KQc=(Y>{0~mz`WDY7_*~N#nK>p#jSK!
zNFj0Eea@<_ksK28uQ$+R^A<=f$S}W>cTA0kEZ7^r0xXql%n?v&==g`g>p)V_&GBo?
zfSS+x<xwOZ5Zf$!A`i|~<{Z3F^V;kaO2V6OjuQRZuJH9Obz!@5y3X|6HO8hO=zr^l
zRrt{T1IE@w{ya`3QoJEq&`>nDAfmRTnbC+!My@-PSCOMJS<aBu7QLEAfd99Ec{@*=
z`pu$J1~Xx-cJRJc(XdxwKIt+$sF)|z=qF(K#xg=eftGoKJpV}@O>q$=Z!%7U0*&n0
zI%WWptC4R@Q%xlMlw;kT9Yiat|4{JMp*hjVF`<rQnWLB+Jvz4gV~`=Q)te`H=`{AN
zV9Pi@-e~tvLTOS2Dm{NEt_gRkibR!x0VGVHiA3>*A#~>+xW*dYS&xkR3vm@_d605n
z(g20x5~Wb5;V)_7#Qyi_2Iz@pgRU0s_y@cjrmD!S$krx5m5r9);2B@m%}Z^yw_R%^
z1jD@!@dhqim1^Hm_M{h3A+|_ArZ`r1S{TF~a;-l(k24^zPakRWT4ss2DsisshLFLG
zd$%)HP&Y!~LU1x>e!InP-7w-(cEKLQ(}$9lN%J%kFP6&X(ypeH@j_*(tGS2^GXd(_
zv6gYwinRzloZ3SEYX0lkSw1U6sg`G<p@(&DDi|H3rKCiv(l7iMqjzT2mT`!*Lx)yd
zZah6IzVA2nBCcgH>0mW|LfaQLyTnAV+IX<Krf#%qf~6#0^IEb#?B7@%_|0uwhVt5r
zy5f{{qi1Q%pd3+LSQn$S({jp?h{4iX41`I2M5~FVcc%4*CwKc;qHO9~k5Z*6AG4_Y
zF3f!yEE$@!i=xj5roapH`TKU=fPIJP-emILDuus>v-h6^iJ;gJ@uIBlk_`;J&0?#J
z-PxT_b{V`Bg5?ZYH8rbd%A@zbt({;yZ?bu6`rKgwT3sXf)4!lAkMDe2HiBQ;?Yq;Z
z9!!%tw|j_%5f<C%+mL7Vv|H`bhlIsfiwC$Z4Dn^Y0&Uvtm>#>;ti9Eek_sim5t62|
z9+Z1@4M9n%1S!2ZO^d(^qaIAf&!*}xwxh$9ei?`8_fVU3CT^G7%{lqvJ-<2sV!i~z
zDX@>RZ0kmsd?oY3Q|%=%`2Q$MC2?yP2R4=Xk2qeBtJgt<6w~Tmxbf(IfrokWER(<A
zO+NNM;&<ILl`>*pR)oI-foFqG)C$0S&H!<#p;a=wY3vg-bCmeiQB92(qO9c%!n-eQ
z|6w$~P`rdN#Me6Dtl*meeVmQtATYx$rkckb1QmmwLCxHq4)MX<JF5$f*`xvI*<rTE
zGY^}gGv@bC=`jSyt6wCB(B4lhzXpf7O<-#|jj@@G(q6U?i3+f6S)%Q4us$<+@YsOw
zQ!~E4wYOsaGClCis{XDwlsI@t8d0F&6et;Snpsd}XrT|vt5LqFb~51SL5A1`8{hJI
z8L7Tc!xBetMc39hf5<FStA8x?0qJY#$MTuOGg~L|WI$}<e*kfy97fF|&oCgz{{|Pg
z{;BdG)ic6Tp%ZKqh8WApkT2-i?Rv~SN=tBkDn;o=_ezux3FRa{$SaQ@UEqsuNZb^%
z2FQl<0Zf_(Z!WDzm6jJs(o1z%*(gdT#O#rVIW2%2tg&IDU`o|vnVEIi8p$YWbdb+1
zkD`c9-Uc~A<U{Zk?$&}cqp==a_l(lBYgvCPns<BcT-_vmRbxeB0q7|vY0v06jN2Kx
zSG=!Ryp8Xe`t)Hv+)-cNDB+y<&z_(?xgZ`V(o(j1`KHyzoM9n0VS&#uIsv~C%S7Q@
z`1104MZJ+FBQ~dG4NGh`TDTX_u-|Qs&HsF?1>K`ab_Fe+<4WIrX4x)_C!$X93fLgA
zj_X|QMrWDa7~j<H&GML^m(H^-S(u%IkNRFq_69xt^V89>;FyUpS)d%lHhi`9)i$9B
zu_pn+8)=+iG+0Lxk7Kn1;Ank;MDuBoi%mYLC2_svjNUJaH%~oYfSj<;1GZEy7rFNF
z22m{7$qNUO5m8p0B_%=v&5jo!@5i(`duwK5tUF%)OE)$RwNuugl+rSC?{N(Q$b$-@
zr~I<%15KmpTm7NVFV$Zc1|mfEP47v~U0eEXK|3yOi>@At;UV|h>C8Nc*j$5q9ZSVL
z{7<{FUL5Yu(Y`U%{oGFL_Vm?S{cQMql5g5N>%)~@PB&&%^f?S*Xrrb!y1TMfNKXwz
zW{}|>q8&dK%3o8NEdC~Sv1H7TTqI(ova&!wf<OrTh7dwU5rRNK1w#Q57TCw|tLz#P
za{LYpr@Vak5LhKzvc3;^`A45sL-gaiwtHvB#*SjNo5U?alQ=xBIh7w0TC_|08Yr@m
zQbC@a*-)2T@Fh8`yG05kF2Rc3fA}EEYwZwL!3r~BH`V^jJ}l}L5y&&FJ^;0pA*g`<
z{@i1WH3O*V0QHKs!X@`3rGXUqHerTGa@6*u(U#d-D=+xi);*$gDU+%|^b|~hh*!*B
z`tYmrj!7wrJSR1O7l7Jr>_&cC=yxO!nEBT<@B2>=p!esS3vwt~%~WkyF?2_1OL-*U
z*PYeK+Ycx)c>n4w&UG9JL=9E)ypb~gpSW4F^oU(MlMMBJ*Ncb7vm~3o7K#nqS<J^H
zWAYOse_XEw{VWh37$S}N=IEYod3^3K)<Qf6AB+w<g`@OSp3{qOvx#it!~#>31%ISB
z$`Dxek^UY^k53K$X)q)BgOuI?ZFu0>gC1LC>7cNvXusJQWEITml(q7*B+yz1N{TgT
zD)SaQ1;RH6tbfOSu;qlY?#@-S?*6zUgJbG3FNs@Z<8i2y6Z6~h+y1alW(W{7gT~5|
z6EplY+==Efy|yUBP&Si#d?$czX-woAYiP1wyu36CQMVL$^qzBevI-_<izRx6`zP+p
zel_4h^-M8}`JcP`P~Lr&DQk{5OK*8K))kE(_?iG9{5o$h7yI@@_%UB(8A-p`6mL{j
z-q>wx;GAAp9WC9+bCs)Q0{FUGAj>{JfFP7&*~viizkjdNPnCZ*%{eHH*IAFH5qrWD
zJaC1@Xm`%9F)vL#rBfm|QPqV*$=hSLo6qoN2Z+i2;M0x}h-D-D2c#>=J)>0$5VNUt
zf(g!N+&>Q3v{Aj9>SVAEm1QK%45*I#7Uf4*Qh-JTWH~8ej69kgyfFI{yUB{!i7F0Y
z#b50`4}%hie=DGZnw?$~6zmYz;_Dr^6O?9lEea*BL4xz;nXm+dfL5Z@8w}FUMByfF
z!GZRGVIZl;T0TeIO%Ls64&*5%Hwov2RC7vn!HpS*X+C;J1@?|k<AI(Mt82pPMywE4
z<KNs<3lRjf&u~Db<*8HLu#V*-b_gpI7uV=5oBK-ZxaB}kaiw$qW5!x>YzFR)A)ol-
z1G2&IpNiyunvvY{=cuGhKA06*M}-}^6MHlq_-^J%Y`8C)_r7oS$A^^;N=cP4=*jZ3
zhXul-Z6Z9Jt-zD!K|0Xp{z6d|4U`Ki|J&uR9No16{a1K2X6D5^{2%)JF=u{>yAu!<
zu73Iai(d4gaNP@Z9<=CuL?3pid~a_caANtnIZ8kK2}Imlh>D1y?VS;NErT+#B*P8a
zmec+I!zU}6C*s9E9+lMK-)8SPV0rQR0kVG}7Y#xbH9jze_$|b(r2a^h5V}Ehf6QPP
ziQj<hM5Hb@R(bF#lXrP?AgmHX4OP<3{ev&vVdmuCXAK;94cGI%6Q#%3S=5Vr-Kn+Z
za|Pq^m}|0H8c#)WJ{!_r{xCX0f)lH!2-24bLqjep-$I6<bPS`X8OMk6loR(7?bz8L
z+ggs)l*@%6Lw(=Dj{}D@`Z`P<7}j0blr>O21q>B1!oSk$>eOf!fFq5<L)Fsh7M16{
zE_@ee!vAIcQX2(j*{WI*x98okn4q#7&n_umj)xb0kRVB(0881f>tLwLw!F`SD&ioB
z9Gzyq$9q}(zTN7kUyaUhGr1CbIGZ|%smm6bUpg^dfu&Oxq(5bd*l4U90)rqIwE8n1
zC8~Ztf70_9C1zB<EgX4dTiX}$iDhdZ9eSyUUZwO!-h~j&&_En-EY}?~SyfS0_4oG0
z6y-oX-w#PN>K~PV!(9DmSxva3r4-hNf=I*Car2{zn2R5vZTHir0^BL~U`UynWr8T8
zN1Q?H(Qs5%9_)AzZ(e<p!Cp!QOy#We|5KP&T2xedjRdAl9=4x&5wRe?CzKTW9{tiO
zM&BfY^7cSfIN@P=G<mYLFlJpipQ1?1U7T&>8@cB;S06|{77nzSI;XlcH<E>tGJP>1
zY}vf1-zzVmOD=JKH)JeD-n2w<(P7UsRfU~-YxUl!g<afKdr}FO8!ua8ix~iq%v|_}
z0beMEUW-deg%<YYMUMBy?>tV)Nk;oIA;3UQp75JI0ZkIn8+7B7SEz12#&v58OXwz6
zAbK|x0`og6wD5!O6JmWR;16y;<1#?%y1+}mHQmjcX{U?5wYMMnjaae7@!|6P6x`k3
z8nn&%f;C@9Q4;^y^+V`_xR4ge&@}$a^<Il8&A)2)I*va2um8`RU0$jc@J(j(zS^<q
z0hT-4U5Kg3(;Q`8f~zb<<<>$uf8g>{g)^TRD({BMO70EC!iC*9`PmjFZW6wc4|asj
zL`ZalFhGal_O=?I7@8161A%&9MiXCR&^TTfmoFt%<mv?p1MshPrHLbn!-Yj`+jH!;
zaPwMMXO(dr)YXM3^4A2uAo3QiNkBwG#pM-g$(@j>9|Dw^_Rt^!!MezWPgZNly@8T>
z68XtsD08`oThGfqWj?|p!u(5&yKo*8n-NUIFNSG0PrR*v-5FCP{NENi<p&lJfjLCR
zLMIHu({AnEaF;@WHgItrcOsnm^|Z~1*H&$bU}{9GFvz#e9v74digEhCN6xNd#4gUz
z(?lwbHr<#B&ztlE5&URZe)<+S5EFB@7UxfVK05G$W~PWm?}TPW((xj$r2@t?-J9&|
zN;>k|HkVho*wfVa)=KC;D>a^sp!?f!w^00Zlp{U;h#b<qq^aJtoD;8(=ud*s5Ic|H
z9Vi)5X0!%_#771x;6?oTV=kPOGjQfx{|Ajga=$Vv1t-vKEz&cNyLl1llEV%BGK$C`
zu>OTS+mfnEHRq4-CzyTWFpcAHpNCuEFCBYQ-NS&0PLOxcjC>@B@En)@NWPw!-364R
z`J<#Bmu_j;9w257BKln+{h}k$R1LZP1kGm9lJa5rF5kCn*;OlZPVWDZ4|Ybrzjk#W
zaQFdh+#O96b$b23d<8_}pKA-jy$5JpI#eP#9vSX`ZWmyA_uF>tCE$_83)N!gV-!zL
z{U?Urg0GUQBeO>R@=Fcw9$~JU!z^$sX_iZ=M*>KxLnen(bDSsheov~<^AMui1N~-%
z{5_Gm2b4doIVg!c$siOepsFki&{Cp|R|Y$%C14!=mHwWuhUQiF^((LNKA*FZogJCi
zBukk*$Efs8y~@&S<G*yH*_{OS2B&m3qQp=*IO~NJXikR`t#8L2ZGPH0g9U7{ZV_*v
zueiscS&?ruGLOh}_VF7kJri9YVrNDW#e_13L@A{zzs9LmRz(ztdK`4<H(R*#Ed>=t
zEfpw@H3ek&uIx~Id9md7odUrPC-)vw1<u{{9p^F6TVOB5QL00G^W&L-&Hxu^A5!F~
zij;c8SniGC)Q?3R@di04eyC|C_7G6|9fX>57~39{o*oL38C*q9b}!lpO5`*Y0HGk3
z9@|wphTarZ1x<)$qn*BUbz@d!+h*}f6$qp*gy*I$nNmQ}YKPAw3mHfwlo%>ZuyGw~
ztb>tKLBiu;bVDb<y>?hR+#)Uj-fYmQtNj(kgV;{K{*B@J{(kn~gU!}J#m|i%dMc<<
zVhYGd(xG(<%Db3654T7cUldWk0JiWQm~zKzg_4M%SPf;npY=pUaRLD!%!Ms~A)*7i
z6#JgRH542~Tp`xT5_zl9f2_UMo~0~-MxD$D7$8xxLYR_F*DftxmmY$MJ&Y72LM93%
zor0(l>4Y3YczrZ76L1HzJHBHz1sa&CGO9|Usvn|YLLDF7AUNMY$H&f2d%JIC59TIN
z{GRFf=LFn1%k1>d!V9?W(FPg!5u}JG?<j*69EONGK>a&!(L^CHcZm3*M<GEYXU+DI
z4dhoEMF}^LPHk`eo`Wzcc%VUmT??UY=b_=TTOg*OrSrcGrlg{+5Mn;!2!!T!=a66M
zbK&{^l*Y@EGhsE;AGchUELm%Zo=f}KQd<MJlDqYtTOfE$B+~<a0z@}I2W}dl_)qX~
z!eb+S=f?v2H%rDQNy8v<-H_NopC`;{%{5D{xdz{N3?3|@LS-GxBtTN1h0K;25y;LT
zmPhkumzOqy0F)FOwhulQ!rR-*ial1ZWbXFh@lHIjc0!~ClkH%|RV4U)D%(TXmHUrp
z-qvV?KWy~sPigb@U6MdDfdCQ}h$1I6$#Zk>R8nbpmq<~t2o9#0yAI!Vt_UtcIFdz|
z4k+t;!Xb%`oY8kT+ZlTw;=^COa2q8a0bj5fk>m;9W*)elAM)f<hvzuZW|Pv4k%r74
zc*$m_`rmlGdNn=V_xg@DZcitwrwEaZEi8?ZTsY>eIZQC_W*k)<h6Y?Yb9AWGo0EO9
z9GVQW7P2cO`fb4Vs;iSQ$4(1`Om!|}6XsVwZB?KG7wxNyumXSI((l4TnkivMIRgP`
z1OP|FNN1Q3Pvb>=XE$HQnGEtn{~M%r7NO<)&%=)6GeIXLaAX3~5O4?r2#iNZ+4uD~
z*t?%ox#TRXTlMR(Xb@f``Woyj(FkFNr+qn*Z{r$41Zj)W<w1EsC?ik=5JBi6LlCFv
zeL(JYG&u;=qL5y`?odrH`-szKqQNLn9tP$%`)*+84L)oiP=nmlm4S8ipdW}C9x3mq
zm|_L`ginS*3OqThT;%(^>wt1(fMqI2=CKWoLCWu2G}DJ{U^-gY8B>q3e$^uRB&86!
zN3=0W9+1qyrZZR{>i}IszTZ#0I`{p=dDTiQz^~4~r}L~y+2LOjOYjWUowBRCtPxx>
zO2@h1n+|nmjP#kKf(zU76md1tu!u9nL}F>_s|G5g1W`O`KrnwV3-~7648EExhd-9c
z3LTzG@aOc`M@J16Ra79VwMkXl%Bioyel~m$vX+e+^9nv1@@7I%@ldQv67fq4N+udT
zj%wbida)T*!L=Dxll#7oTWi%Df9`3fl@H>F)dPKZd_K>kusQ!zNH8*aN_rpUhw{Ww
zyv^37@^{g6wND9EZbk^o#4rX5i|thbhkCb=+&y40P-Z4A8Hc_3wdSZh_X0h{Yxe&E
zB2PT85q|Cx8#E!v-k%W~kR6m9e;wwKyN8RctQ;7BQKcWR;Hwb#lZQYkQMV~tXVL}2
zCIH$bF9~7*2iy8UB`1^R0YDi&VG$A?f{-`pKa{%lIUE0L+?k_!<MKIDcP0oYmH5+9
z7wc`8AbP@9;Ut?u)*c!Nzev>wu`}4p!q5Ky^~oB1f5rM6$WtFOL-(=+qoI?D#LhV3
z3GN^XLY9F>k{KdWLNo<7G%<uQW)OoI*$E{<h&@(*k5oh1!k|W@`m}1Jr~u%JNK478
zZi<yqb9$HNMSp^Tzc~-mW2EsXP4%)W{~S?j=cC9os38;#ZPO+Jn4*F1_b6mXf{H;Z
zX-@Ii(i}d}dU18R!v~#LCXDvKtKH`@#C&j161@Aa!51Eb&&(M;W0<DZaWxn&Q?nF!
zYlF|Ge=JZFmVr`Ck@DuZp&R@M^Oqi(x4FHjv20q6^3vln6)hos$=lE6@6*ZMp^R+x
zrTqKu4Nx<(zSa<^Cz+H@mmB;@zvNT5;44#pC@M1n<mhr$B$pINV=m1u<s`2y`%+Y<
z>+RwBR@b0t^o0dM8XnGm%8}ykK}yH3-~9Giv|84^NbWjcy8BF*Ud>x2_T8a51!a>e
z)&t5b6$C0sE?x`Y&?K_={mT4D;MEbu4so13eH35a64}RH`SQTY+A_XogV6Ynt~N}^
zku6jiRYbuGP->d*a=<H?JdN%Sd!FoeZEmme9MgL$mBnO)eg!fYxnOzz)jx9FX_Cvn
zTd$=zU#5^~0kzV3MK|jeRr9d}S*(|`!U$@7{(D$RNK=l#ot#UA4{ZZGp+p0xPR>0F
zt7Z;km*DN7{a4z^2kYXvk%tO+#$fc(rr^jj_$m+70ZIV!*|a{)m_Lc9>3>6m|MseN
z2fugw64MY+L|2`s;A}|wb1{_PtMB<;hvDg7iQw<C8>_p2w6tyN4Gb8M-QiF!2s4?7
z`z6EO=&J_)zly-Wc2O7)(jLFg_in28R=8cE-#&9WT_4e@gA7B=2ys4;eiM=cGpYce
zVFZghX2MWrN(wIPnvxOrk1}ha*p%Ej>};6${2i-9x;{U{`!VShF=Pk3exsl9_R}^4
zgZA8$(G1ieJ{#WNiq!IfCWO$M(fsV%88i|e<XLei(gVs2p#GkGU$1tjtTmQAxx=B~
zLgu~h+JI-T!p$wwNg3eI_@y#A>{<*9(lm&8uut#vB^>YaK;09}o&Hh~=egVB!DoTx
zu8}EH8#4~^>+?(a1AP>G)#i-{!A%7P`X@($Sbwv6_*KMZIw>*+?rzLMlshfc9jAD_
zI2Qu%n2Uc=Fr*j)xRuWUq9FHhhj3F{(kg&{`_aPAku+$60FPI-k+moU8?_{4LI^zv
zU}gLYaa*iT>{pJrOY3LQmnH#*TJe-&j|_6gmW=+&KeM#QcKPx9b?}VsPmhnYca{&b
zB8+5Gu?mUM2@<V-S|DNfN2fhvS>^r(7BD%OQ5g{fA|JQfqW9cong~r0$iVUs&c1&k
z$j&jGm*vmxd#UK;O>Vyq>_a9A*IqjcV?G8HAjOswUhQG0EGkTlB&ou}Da;H#=45Ec
zDT1ns2+J%miwpY3Mh&v|kYlPM5L&P~ko|HEtwJ`EL~lW*)0vSB1T$pe8Bj!Fem|Qt
zdR>)01A3oL0D8nlMWicOIE$G?y<<YNB*VcWiB1{@hD5TJH)vi-i%b;SL(rm)isN(C
zT!njek{(Q4H#D9!=Rnk<IA{0oya&hpJ^#q&0ZM(vDHke}K(sgKa}dwI@Stuo9QZ}b
zMwNQVFlrHjNHFUQu3Z7nmtbi!hoXDnfM277Nb2{kLw_AZ$)O5(i?jI10quvXtl*GE
z36tbHuy&OD%D99P1F9R`s2NECK?DM)si&SbX*IV%9Vj^R4G$H8lm0b3CGA`ss{Q=-
zApS0KMB^by1R&zwjof9#UV}jb96s)6Qx8k2#)x&$lkmUC>Ojv%r@UF_z$`k-sD6(&
zdrnM0cY)2MNK_*`T0NUwJKc$GL`Mdntlkr*G6;f#rOZsxX0XDZ0+wA7x}M$szXK6B
zBSj^8xvZZ$PABR5?nB}en~#4yfe#YAJXT+bY+7hUwM89*y`%(G8f<O_1E<r5PcDT-
zfEQjgC{GaN3V<L~=FwC04Ni0Yj+ga+k8henT2HKyKgRyL&Ho8O_Tp(XtS*4lCS}jq
zRO|{75fKp)K9lxtG%TV7AjIltA)mlS(NN=-F}=x$V8BMueg|-`P>*Y}X95^L&)cmX
zmRtn+J31SF(VXW%h=_=YiKuPVIh0r?r_+O^H}IBS0(3Zt_d1y{A?23SpQoPhmioGT
zA{6`U$Q=3pY4%wpLlgV%j7LBiejI|JF!_W$XIVZw=Jn(>3y}HFvq0o0wtil$D}_Wv
zXzl8Uh%?<AG4F5NXHKfUb#w-5CPgG{{@#9nm_O7##X0f&-Z@$}f%SMDG*l>|57s^3
zB+37jfoz@~uN?C2Ie^ap`@G)&{oqI-NOfO-cJv;+!}h$|p5x+=vagKM>xlh@8(GXD
z^7>dN6O?>yYgyYly+irC-(eZ`Ev@htjaK=0@v9l<P^?{<EXP&Kz98p4HXP%ajfr70
zNeP4tc!tJEHbRkWGgGJwBJYR9=@+E<#xG7H+I*M~`Ps>seU;vzjX7*=UUf&lIM{Jr
zF@27Yxy}tX73TY=uXW4LuY$@s@2xpFAhSDBrFbsJS=7`8{Fw1pSCid(MPMGR_L;Pt
zIR^EKus=>uMx>|~pB<qsOWMxyl{gHvl(GhJkso5W;x867(4)#_BlZ^8T;poG@TwNW
z?#M@TLzoX({mx0@x_5zSK!KKs2MaMFh2K}kg;`TLk}=%XRcG?I?HG}a2rRVQ4m-?d
zBl;dm_1oto-)ga7lzi#qWUv#}rJTmQ`5EY}dDEEvv`z-KtB})&{v8a{g>SHkwj1^r
zZ@jbdupNiUDr+9`5WuR_^xw69?GT?Bs`pn&$j{yR#0L^pL#(tz!RG-W!sHUCgWfsx
zEK%7KODo!O$ZcyMezsgz0psFi2+`yeG-JE|Z+Yb+^I(?dKwWLV(DZ=20R4}m)p)Lv
zET60%DHCZrYT3iZLLPnf2)Xnww<&t1jXo^^;^rt6{*n2V%x0*HY8Qnuu%=y(E)ue#
zKw-${?kM?CB@1iI6!ERh#v;pT4O8`=cvq4^@xX-)3d}Pw`L%vZ&|Y<B?=_SBkba^U
zYqSz&aGUb4jBRYeN&TZr)mPMu`7N|h2P3V?wy*ufZBL9jm`sqR_~Ht2>{Mfcn8hH$
zs;Pjf(UCmLKR7}ZTso#OeI!ax&4RUFFdd&Vd({DQe>4!ub!q#m2(*Kixm?-Gmcar-
zEVs^)5f%|aI4GPTB+_~@=uolu8h*CdJ^XIAjV-@Y`f<UoAIJL-^U+=1Bd8D1Q6I8b
zw%qSdk1uU>e(n;<I4-x0qwLZrm;Ne<vdfQq#e-rDqq=?fMBz(hno<IYumRWq)>KVv
zY`q`2{zCU}k0w6;_Q~%@vAyEgJnV0CKkmW2@ltAh5eMPH(U%%hr+bsUwSIHf+1oz-
zO80tJcjKqn^>teYhzUk_=X2e~gnz@wrd)yP**JfHc#WLh5uGLjOj-0Jw&-R)T1J^>
z2AKF#1RXdG^@#&V6x`)qGhLI3V;U7cZmUEqrSw9&qh6rbB%d6X3uaxeZXKQROX*Oe
zPGzNEL6~N(&Nai2g3~(Wa<dUrsDgkZKpuYkC*=x)&DGJRbUiNC3LvwH&*KHWt+vBV
zD}~W~E+j=kaEhqgBa+Y6X9wMX&Qp?+di?z;)tRiL{SG(fAUM=#u-zRaJ)e%y!KL#_
zXJ2T1ny*HoK3Jm>%)o{25h`9`vE1!SLp-0+47Puj`{}oQ=~ego&xHKv{)LVHe@DNl
zXK@^Bf{*KN<d5|9mSNaZ5T^eF&W=R9*$+}+OlcGj?yp7kc)F{hCp+CvIKSRbZ*RKz
zwvH`_#i<UF?7xyd-FvE2p1Cv-h2t|+0E7Q@X7_X`gjXeTP%jQ-vY_fkaF|-D+p2VG
zqAm}hFNSLbX9g6glY{IKdpGi=JKS*5I|^rVqq$XN1r)*S!!7Ms`Ti6R@-PpUkNJ(&
zieYe;dBIh3zA6JV4UH_%YUe}|*r-};AJ-KT(n^S>g$Wl@6@w_8dvJC7HhqUSd*(&<
zx!+XJJ*~O9St#*t$KAzi4Y%3MsLER$ZN%qYIfnk3qty;y`wfQK6^1rF?Bx+l)uvd1
zqK3%?y?&QYgAioy++Pg$XcZ{ZJ=9MbR|21R64WI00TLDQa+3dPpV$l>NyOL2saX}i
z-e)dxJ^EM@3{$tr8t$#Yh*LQRazwbiR}JGxd;7%t!HW4DL$kT|egQ`!Ar?p^_{0T;
zEfLf_{HVOTGP8q<%u_-PhtMA~l;vGsaIBg^JH0X{^~B*b8`NXMD$%^+lWU`ant|v!
z5g0KuhG})v7sPw`dLKK-->eo_)7d1M93Z4r2vPxhj}}JsvYv<8V$nyKt<O?m$Ci&L
zBa0p~=amA_&(MPQI6X4jHSB6<KWEf#d$`v;e`fWr8|T9#@m$9Q(2IwyX%;vNQtvV8
z>-x~4jS~5Me%;Ry`e=~aave&@4&jg#;W*oxtwMvCdM#3rY?agG)q0Dg!o=(cW<cTD
zWgt84&LR$d+lDn!&t?31MwPBPv%{O|R<~yJpDU{$Oat}NmgHQlDyL-m{kALyTkgo3
zD9)GZ!2sM%L9z2MYY@Um)WitNNsEL;CjJs5sSU+5=hZ;wuwR;Aow(`T-`rq5;O*K*
zggAK#d!9H6T;_CugH*tn&`ZP{%WAC;W}i>1etscevUQEvGG{Bwp)bmV^<X)RTrsup
zz>2zG3!X(X43$%xnlT<=<t#0bn+wVWfFJ<8P8x+t?NC#He>nGg#ttjAy;;ZcF}@r6
zDf(2_1e>8DAt6V7%9bj$d8$$F{*I2T<Qpg_9vyU7AJOW~$<`r>6%l1H01@x#vhYT)
zhN?GWBc17>1AKBoXwn27C+*7z(-{oFf+~2Xm0X~eXwt#)&+CA5#U~HE3V)rhlo2Eh
z;udKr0HEoPWz{5=yq7Q&%DISi93qj%`e^)i3#Ie20`WaY1<LIj&bV!|I8y4+Kv9~@
zsH>2BidPHGCa~d(4x|hAeKP2s`f=BSWJjJ0q9#HDWCsxxut(!-#iM$gXFl>)7|iuQ
zCie8W<+%#^Xy$k6zRWiI(6j2}`C=ZPRqj4VncVE3Xq^lZl#Uai_zP1#NWaBXGo2gB
zCBG`q`AahlVGSt}AX632@ZcXcMW^#&L{wV+Gy~a4$?eIf8^!vEI>2LQ%tiv+n~;m(
zH{(rML~kOCFv;33-@f=$0n}{Qx*fGar58}X?~QJAoa=2APHqC>oMX8(1{;D9#{Zsx
zq-{y?)Zw#~Ggn%%I~Q%8W7j}uqH!U=FrNy42#A2hFsfE%%2qpW8fl=O>xqB{RVhL2
z+bi*oot<Q)DG#q7#pS`u6Uq;(=hMZjWFY@j1c6L|fF`P$Y$_9|faX!`Az-6!<Il$J
zljIhAo6KNh^9+1#hnxjh=%LeZsN=F5n;v(V56kazzZd&|ImVWl86aYuL^2dL4Z$db
zL!U$3>vO6=8lSQ@u;YDp$w;;~4HLR_R3*!&k7PWDXGz4vIv#FHC|HqTP{NoDM2=XQ
z5SU_NsKYTwC`~-{Js?=b%vz|`SyqrhqgcdNR!wQcSTrOiXk@~X5I_$@x7qk<xGPT!
znBN5KUhE5;yz1)KVtC%A^YR`thgizbVG<rE;N9f~9{c&EYO0x8Rhi~UQZOJmrnOK8
z7%B?3cYAN&&DA};b#(e<bFK5`?XOT4k+*^5spJNsMSOn8^K06{;H6s{vJup%3aCJ1
z`0aTuatI#qc?l`PkIXN!nb@%5eR_mQhwv(L@cnZsKifxP$%TR_3dBu=kPtZ@?~?&{
z-dVGQ49p%;4m_i;n*LOJSoKBb=d;Q`i`p+OL~t1#qy{6^O0(bO=RIPwo1M<)DqaPh
zL3YkN@CUs4P4+=-3Hf~rck++x&JNpbPJNi->uc1aILqDMAWsVh67Qx{G?CxP*cW9y
z2fW<{7j}Dbu4{dca#(0Qvr+BW%0cud65&#GH7OAVTFw-hvzSsl2rJOx8sh&AC<3Jb
zyy_rg4L(AVtPNB_VO_kGKhDZ_%3OP8PKV2rMb}YHf;PKNMKld6AZ!>?S?z3}a30sj
z*4;QG_;F0vRl?)f(f?=40*xVs!X;Y)v!jm=XrDklKRk>u^5Exgo=iE|6LjWp_nzS^
zVk8ATfC~3oyqu=!0f1FR@y?+fNeBhQ3Hfq&Lw}NO7{CHVrX)qb*n8U7b~lU9Q^2Rb
zh`teCIRNi#_*$y{HEeJKkRTxC4W0?5$-IFLZ<KbdKO;#Kt$E4{2&_|!XL{iDOrqo=
zP~J^nq+`-Mhv7T1fM$)`#2`nu*T_ZVRikEY4~|g0!wMWg^71GYA%|buhJ$uRWIsAL
zmz};wG28X}X9NsSLtH<c>~6>HvAKD3^9@uWvGe>mp@-C%jR;_m`}pp~d9Hn_jWyf{
zQb7kF4u-D=6YPh5Od&Z34$Z$CLIF?!q7H~@9FL;ujRd2Q6ARISS3nXL5q2cIYKHTH
zr6|prNAi6)%5Xi}697L+Tg?G5>IbhQlu(NcuoYoo(@H<*dOs~A5PODw&{Bf2N{WSi
z#B{!a8xcglYj+q<f$SCzk&p!zbPJpuP?i+{#2a277?*vgn>PL{#q9>k+iMe0*}f@o
z>{?a;MV=Oc;si4H)d!J^4V6;|)w|L8#kjBU2}NtlX?8Pc5kOV_c{|9bkpcy8)Tn9n
z>#HE*tGAQ#)9s}-V=Slu&`>Y;e?wUCp(b|^w2!vYh^6%XR-cLtE|bsct;Ra=c9M1r
z`WCBm)B`zOM-g)<3aSTJl_Q?apy8JqFN7Qy&<l|`W7GHdK6Wv0dUTMCqpHyqrmtU`
z?CQ?0ptM5~4onaBsIW{|ex5A-U&Gh1gL@%wFVW?XBb)%~d*b6|i=fcG*%!}gSDg-o
zg*SX%^x<^X*)XT<uL1e_HYX(ksRd?H5CuUD1}Sa0hCq%;27ro3nPW#>REkt6`RNqB
z-n|MnQWYPr4j+p@PPf*2?{6K;djEZPe|KXl=B#Hzk_T|`&Or_Cfi%fRT5H0Fe^lP;
zjrdX)k!s2j4^mUK&jAbFWMyJ7R6o(+1R_3uVp`Fhw!Gdvi7m$<Ngvw!Tk)ZNa~89c
zZHdY*4;2d$EflC#R;we2*==duajaQ=qP}`@Bz~fey5~!nY*a_uqW2~_>k%S5&c9ia
z)m6S!^HU`rZWX>mq_2m%in$CSEp6$QdCSP1YaqJP;_<mK4Hpl9T@5Ofz%vR}rt%r!
zqI#)Tkn8SquwP^|_Em3AO!-YA`Tk2^6f|nrxKkWvLTdgv`~Y$Dcf)ND8*A4b?fS1E
zjR(-h+&zD}@unBMG8=`T#}eV1KxiPZ5z4NP{SEuw>ejJ+Fj1eWA{pxxZ@Fb&ZK~&S
zvL%v!E$XG%Z;u;;pG^SG;w~1lkW|1IJ9yQ*Ub*HmJ2G$G!02HP2DxTnG+4JUk0y*Z
z;Kc_y13ukBH9<P}OOi5(z}!UXh~wTO@zU(v=dHqBJSd|<3R>{#ub}k*l?r~1yuBZQ
z`{%}g12|wHh6!Sb>ciQo(>POslSva2L8&p4Zg$sx7(49rp?@SIZq0UZF(v^Y=^4>7
zA(1pfD4@^LR4`_fFBC`)pIAk{u-6zcM+!>3vQ)Iw?W;}3<7`50^p=DMH(Ho5mR<oC
zL1V5vHj}CAykmvus<!ey=f{6G2Q0JL0!6puCl2@X6=FQt0mVQ>4VYRWV#C}c+I|Wi
zN1lxzthzJs`-*4kEfbZZNA-x_ae0SvE^PLBi3fjw*Z36P;WoYHT6BFz#xyvFIRDMa
zOoXj=f(qmO?H`J;-Z^}u_6xA~c#-jXlV}Qh1+GQz+kjFV1X5~&5Pzfq{rnyV@lW(n
z>|asQGTN_nuH%HB%*-^=kyTY9^>GOQO6w6vf`t8qD4A5|=<d1Gs5QYWt7?5*5>L3Y
zLT+L6a)*~GDFVwv^y8d2uV_R8O}zO&b&l~~u+bvWZ6W0sMqcXL_*z$ten^P8-)AL4
zphcpJEXo_NBIb@QSiC3<Y`d6+1ML!GmV4gQ#3=m9a2KV|kl;vsy&QYZ58UU>CsH0G
z=M#?^%EqM|-I;`bOZ|U-jS47`s4QD9Q9=$+*uJdPIPyjfYvAb74sjk$SFDsRrmKol
zuY;6Amv%0e6|9q6W&@SM5l9?_1zIfg;gjN8Ixih<?@NXxw$Kq=U+C7^r>Xkd8oWJc
z8OoSv=KgMHFDnJS5O^s_-H)vM4YI&+lbag*p1*c$<<s<V{Qa(J_pj#GWDAsk0%PEy
z>KZpI1*HId|EqIQHbPX<7HhNCo)H)c%`IJ_0w8c0iNKnAl?o6~AEb0pKO5rk<{dZE
zr5anoBb<xn0&t6F`0@S1BZ}$U>KTSyby*IP0hA>p5$(tp%*!_gAkl0s6;+cj2(uAH
zjkQA%>b(7&27b#REa;?BqNRn!h1E_alWlXKZ<sHmZ<|j^*!g|qe<Qb_=7bMygn|J8
zA`74?z)I`~a&K0K8GVir@PBZ-jVhp##yxe9-sN>FgFN3@7rwXRiU|5fvd;f9=;hw}
zR!A$OkW#5oc=D6v-Gqf^{A=yo>BcFtKh4MWb|nd452O;bzr`vBP^cFz9&Vpa50qfe
zNf#)__i!<>HsHdOGA8m$?G6-zDR=S=vISq7%Q``S9m9#0UdgQuZ~m=?Yf87cBwtx{
zo!Q1-B=vp4+8t}^YGN2e0rpS3!Tua)m|K9`3qk=vdIGmIZ}vMb=-@=Sj!j&Hpo9%a
z;Q8E=B9#>pZXC~HOf3!eEoFe!#6X$M@d!Gg-Z2n;Fo-;GfT{Bm2lzuz<|U%{RN!b1
zrv(;J@QHP7on%!=r!O9uIG{(!QHSESgBez_QWikI(QtP)nqvu8j6Of`Ow;(iIua2h
zjmy_-$|jvTsfuNsM<)s}oV&#c6cAe(iYc<#$Q1n*6lkp{t;w;=Y#<_6fPi%t|5<?M
z8ye$A+|#0)jTmU+9=04lliCfDpEVsw{MkQsDXb^>OxG)h?B*E;a`ks#_gHmwRa(Bj
z=%{hy<pq1oZ<RSH^9kw)tbM}8ny4^RgsQNa#qSpEtVPyK=;)tl%>0iL#5a9#N=bDY
z0|m;Lh`Ap-hu<g$1fW6D8hs@iOg3$OXL-9$iZwpo6W-Ef+K=OcxUzwf*%D}hRexBD
zcvK%7!U393o0E%*Kj3@_(ecxeLknwKfqT<`H@%%Kn{`n}SuC9Z!9$oU-{<$J<iaqU
z(2YG*FnF9QdZc<fwZD$&hD?!j0bo~#%aMcWdbO(eHyWfEL9<^&;Q*#@szpF<k=8ln
zCP(z-y657$(!|nG%rQ{^sPe_*bb{pNVUt^zPGt;IcFoMU59Y6~b;JqP#4mD6`Wdu_
z9{CLoAVgDOs5K73SYgnuY!ng^iZK9tDzF$)=vSM5GolW+KkqrhLv1>9JH|(ITp|*N
zG(2Vyn2#MWOehNYjl#4um%Y|NQJF)schV~PxadBuv%@vr)NZYgT^<&ys;a80s;gC1
zRaI40RaI40RaI40RaI40RaI40RaIZJi{yDUuP4a#xN@qkG}BI7R@!N$YOJ!#t17C>
zvZ|`8%POkNEUPT5EUPTC$Mx(a`jJm8^mZJ)Eb_qE=Pssk9B*D+nWiRDiV_tk{`3dy
z8T8Y$laA4RG@UL)myQ|RvnHRj<DJk5YEZ<ILV<k&+o|-8oh!>7q9L5T);bTDeLm-h
zSqrUYD{IodX&lg-NAHl!!F8Dae3R|EMr7?YMI)q2AzSW<(EF$EuWKbsRQr_X6~h2q
z62+*^6R`hCP=y6aZE3WAe;*&X^goEd^0jn-JPdFc>WV<4+mw<?B#{t3;k{iU{^}nI
zS%btgTa`gB8SQhqutyYhEO4SK@q=>kd(*|x6ggw#`K_lgqG@B3eFEmGhXzEfkmV7c
z;74GS`%JZ#%Qp$+2k#KtAteX_Q`4u%%7{Y**>po%Jd^u_79``2?Z?yb>F^)R`szq=
zU`3K}XNz{X3{dVhFOg$S=>Q%yIPhq}Z+=_#4^fqU)=?j%_;{|(Mw?I%rjc}NNP`-V
zGs47bOnwQWWH>5He13aZ^x4E@n|#qCgXC(X^L?+3S~w2dJbZjMbDltBGZ9|b696EJ
zA!J36L=Zs+L_c0lxv@QEb6>lrn&P?n{P@j}2p#K}3J8biUtb<U3bZ0iC3eR24NM~O
z58M$WMu%r9x!Yc^;*6+Aqv2~aOx8rR(dc*Iy~+3TPG5<O0ATs=hn%h@pW7tv>`VdC
z-OXo~Za0Z%OE7xSqBRO}yM^(H>CNexI54T4$G0Gy^Qaa?+2-g)L$ef1QoGu1s$x+v
zC6CTsj)i4lq%BC&#Zf7-VMLiM8R($R*1P8rri#=us9MF(jGn`xd$v&rTC}j)VSu7r
z@eeX`|65zWP71c0JF<T4D&xNJ_UdGV?#2Z?i@#{-bmXa9SAxv)=O0JF8+6K4Atb<4
zb9-DVWq|(j5}`w(OD=2P=TxCYDHOpj_^%Wr2q@BQ;>n^Ym@SeV^jm+cn8lvQh^(o(
zZFi3NH{Y2P>n0D_-ka$0r!Kyyb9?zH!yiCFia(*x%*|mSNgSXag#ai(xI_{Ch7#@O
z&TtOOvLY&^y88u{KykQnMHCtoQAb#!x+x-at-={%5`ik=Kd1n^v*D}syNQ&D)po(H
zesx$MCKqRm-r|<jDVWH2WoZztJ!D)XVJV@LpMz=2>%EEVkK=|VwYE?6FMRgj80&<?
zl#70|*CfECQHY3>pX~a*{e9DmH>K<L9YJ~NE3cPse7+kP@mKVJU;Hm`LHtirbo^cO
zRZwE8#YKHmBraMY56o-rTEwG7q*wW0q3-Lm9^pRZi0C<F%p7W_4Y5+=rU|TMO#uYD
zHH5|txR&>$Q4?Etrp?nKwCn+cgC)2+A&WBHh8CIEL&;u}QZ-^|L~1=T4^R<8!$bJ@
zLrW2&LSc>MXFTo3Hr|n6F-A1e*=z$PRpgfKGZ0FZD-cS^6uUTO))yz-;GfXW0u8WK
zIKx03hpTL(0P&Ojyqx3TMKZ`lr}lOV0}P;|Oc2D>i`nZ{pl4!Cf`?Y3T3i~BWsN#x
zL#<c}6oM-D#)m8OtbC*ghK&r9B4d28eh|B>7qyL~cLbn>0K5iwA2&9dLW=btHvcd0
zbn*6WxgbPA5kOFcSSVqFli%Mx47d>N7-^!lwlCC|*QwNf-Fx<T={H7wjHYJ^O+==u
ztFZ9~q7GU1vvY%O)=(zQB$dR!sQlZ;Op%=XtmjE7tIiLM_78q8(^Bt}hcJ7nr)yYI
zheXa<IqmvV5dG+Z()NuIb`Mb+9{56TaZR#aL{!XDQYaL5K?W|^_22EHZXN*F8jpK_
z4SNbe($pptOFeo<2|+1_v`PfK0>FEe#G}E0I~Ke)LSy>l80TKw?`3FUGvcyw^=wl=
zSJHtfE#Y!lF*@lAHRt@sH`is=I>MrfkmBtE?eG6#IF72Z#+X2BKCg3;?iA%3Ur2f=
zl;Fdcbzny~#f3XTvS9IVX_}AZbaW>RDAWjmT$DPDteLVi?SH>(g)<LSz|823Vcw%F
zSb8j3oa3o$Hc<(?3c~hX_QesZCF;l;m8^91kIg!x3n(RsUZt=6v>iynQv3xB98dvC
z;USHF>bj%*n&4}nyWFXCgjq=k&O@#BzUB<X#0o;mz1pQy-QUqamp9sgaFgLaHFFIj
z0SU#_&Q`GQ!XRkA`ZJMfsAm*OsE;+Y)l^7A7Ky){&8SVlf$lqk1jNUO6Sn)>)7#dE
zTO+7muOEZFxpZMJ6;_!K_U!mC9S(C_OU+f#?9S2g^=Nel$H-tD`<D3LTM%p_X~9?a
z1lK)!q3;nK;^CZ#XO7Tgz#!Nh2S9gi)SgC?>WZp7TsQB>Z7#Z=bF9I=f$3^D*io|1
za!>m;5+@aptX??%$@Mtj-N4Ow#hJ9o2@pk8dnCNBiGp18U{JzZau2%@%pyY-!GH>W
zMN%w`kr-!Eid*;aUJldW_WIm+Tvg#Y@!VNhjwk_(n8>6oUUiriI*KwqgdR2V=I26Z
zkCXu;XZA=*2_Zj*(X%8nLP$0?NeLlE6j4PPm}X&_hGrB|MH!e$2FAw5#>|jxk`_Wp
zNeLj>(M1$es*0)<vZ%VEs)ZC$N+_a=D58waGce4<GYTl8V`F1wkg^g&NJ$AHBqW58
zk_A99^av3FuB@B;uMY_LAabV6bVZ<#EI(`9CySXl<`;<MI*mNpEiD(RB2~3mJs1aq
zvQ{m|w;U^*SeG5{_M0h#@a^KVw&^~Tt$t%jKg(^)c;eS2kywS|nK6J0HrZ)GS6-Ol
zbiQ$>)?l7$tQ-bOEJG(5vsiGP#q(>F2L?wEDq)_P3w;V|*e?K5MPxgtj_z=ha)=y|
zCnS^Bgzs{OK|1!J>v@w(q9eo<APNWq;)yH3n1-(_a0kO8WOV_XJ$$mu=dKR9RAEp!
zD6QBK#jJM*pzqb!MuI-mMN<Lw5|8~+vA)iAQ{pK48Gi+Qna#r(;d%z6#QKXf>fw2J
zKR*zpYrIHmREV#G`&)j%VaIU&WG0p^Dz}}adIlZ%!i*kCQY^GuAh-<cH?uOeUjimb
zf~(KR#9j>uAZY)1EmnPKMXGR7XmzE&dWXhNmN!i}lWcMaBQ?ZKIB@|rOQ}#YVzL8i
zfoYMdLCD1?=?)MeWr*{CoVRB46&Op{b5^xwR`s;p76Cy6HCzU;@DvdqwG>zCw>t-n
zKQ94?J{8mr9Mm(A={gSYMe#AaMQB2^tRuBoN>6}PerPDpgb$FqT)sV2tsd??_J5Jp
z$Bzq0erwu1ZxA1CY{pBR5?B$`ENA;zLrcQMDf|usgy+1Yv^p<O0yp_N!@U-Nx}!+^
zx$%52L_FWh=YqZj@Vyr4K|bC)nEKl^DF0H8RK4{Jh3+LDcK}q6%sBgK8ST)X#7Svv
z)>$ftSg<%yGRQ~=kO-uD<}~~Jk6b%^xxj=W2%1L2u9v#x%lSHsgt-8UO6uM#>vYAF
zdSsVJU%oaRD*!M9Yqf*k``D0<HSJNGv_%CjC|q_jhIc`f1EB=3t^XHKXzU)LN_FCp
z_40xA8saFXv<5PxJ=w@ihAV={iEXA#m_c?MWJeikdI#sw_uGt_J#XY3LmV9Qw(5ce
zL46@o-x})s!GIT#C+!t*rBGa=xgb8*ix@6W(3p;);y&>d3M%gm(NzV7ft`BU02H3a
zL<pSI@%j*ZFGKh?avA%?eTem=`Jg$l<mK>!zE25{gwLB%hUI5xpwjp`eYq`*pJ`UV
zgiv?dfn@x0+Aa*WihRnT`j0T7dI?Ak)c53RrNohm8tzdpjI23}8XayVrNKjd>K%0l
z=`vazp+kqmK0*vB@E5#1r=ge};N{(80Uze(oS~q`g6?b?um1_2oA}~1G4^CWN2Bbw
zc!azK6-hur5W@x#GXQZQ)Q6fTBqR0mCc=eZL(tU*2Z;l2esf4aSY-QdG>B|`k>~H%
zrM^CT3sEp&QXd8FKHcWm-!UfE99s=E-n&8i3wG^P>`!BuJ`_G8_r%K}hD_bW2w-la
zhvkFZu#OCk{6S%n#-|L^Q2W^aSsx2%{J!^}f})K!r*=hLcGyk&AA%@Fl1V-Xj^cmX
zxL4SBY&!R}#re&#TrPm>wo>en6>Q#oni8p42K*=19Zgo6@^A%GaINU_yhJh-tbKJq
z*CZxVMDvfRp0bZ@?<wX=9n{8%=wm^AhX&1`StL0KABG)H-(czEwd$H!_Q=yEk^Az6
zTpi!`?Bde(E<Oj;rh%A>BythRi6GDP2oV7Rg+qjO77<7+8Fz*gzB|j%i9vdnPW~%l
zjnA!T0^WF&bYo7~6d&VzG>CIJ9M}+lypQWgKuQ9+G6O5Q)Oy@8h3|;DS;}auS3seW
z9)bWWFD>;wu-5)w34sq(-wsWgcqeDKt?Jf_X3p;sZ+e!LCls14(`;!5kyF-AX$_dP
z3U(|as3&cWqkQ0k)N)brA<)@t7ZEc6o>!~Jb6$^%PE3oJ#mq>QW6P5WkIcmofCM5t
zLTW{$>6$5<7Q{Opy|t=N_s!_NVs2E;{i?+^y_|8AT|e<=_1f0J=ITbB({=GRV-LUM
z|8Cabj&N>j&-_xvA3H`A<bRlqa26wMD36ae`!H5CWx)19^j20qa`*b$AK8_V-Q?i_
zK4v0;)KQAtXLar}jz$ZBD|G;IQ14I>3w$#I<D{Tmp+`0Xu}X{z3K5;PI}HK~-*9Rv
z`!u?WR)U%jsO2;KOM?!OMFwXT6vTg8tZ5!*T!c}QF)IfL3w~8F)C0o9qIX1<bIml!
zXFRwUhWn#B37jbV?TT0JHYrIIRLm;C@!tE)pSk~DY$L6;z2d|E*2>+}Xt=qTSd*sa
zLvB`KbGMJbq3;EM1*Wb_J}T)c;aIx6$M(G*_X{1Jukx5Pp2wf`c_P;iai%RnlBJHG
zetZ5``m1pf{J6yHr*&p?fphQud)zz{Cu>beM2q{LJ$-Qz%=<FdU@?Cc*AyGasX`BT
zPbca9N3!hQkiSD|G3Uuqo5E$u?agR^tj7yhbZwST-{3r&oW3)2zh3OG*n$W;^LgMk
z#n2?+=LQ^aaDi-tpVbM71><jSda0-d*$>XHeHFw?BT~=jn}@a%6d4;Fq<5<#IZ%6*
zRY&B2==>J)Du@A1;=nLu7<97@j2Fr(lou0qZ_?>bLUS23>Yu0}v}p<S1L7$W!$sIG
zL2gJ2lwrOCLtB_jG{I^0?XQ<s^m{Z~uIBjEXAB(E+f1$l<{+qaiJvAvpfWdR3UR<e
zkk@vDZ6D+}2?KYB9uP1YGHv1R^Ys4xjaX_to7$x#^Hf9buYa5%QDR&mpM;E<=(qNs
zW6hbM_Lyc0yFFckIzu4u8rN;2v7U`%Gk&65ocB|ZZUjj~%+-UZAjq)HjVJ`wb2ZvT
z6SH%}Syha)C?XrK$d}4R6iKRbBru2F93(dE*D<povB9G(kQ5HUQj9N3hF&l)q+ERY
z<41y6_LQ&{v48Q+|AhYVdku8`eb*1JUS6Z2oK-e^f)XJ;*DT^+IphyHSa#VFoknno
z#Q-3txwOcV3aJ{ijzkv2ivqGmRdGlL8llZrP4*fkGVtIyf{=g8f}#CORS@>hfap2X
zY{}Qe2@97n0VJxjgoC{Iw3r(O&(3-`*<owl8>JaCe<0{2D>`zxP956<@)<u$pnU;C
zlo25nf``FSn8zz&A|TPJzOu?PjN(~5mn77S{;0v#V|A(N1)afLw=N|8!8HvQXOK1t
ze=DO0rflG61XeZ$3<k>MrLs6;K@f)}BkrT;_l`l+^D^td>c&b}*P)+uB|b=NgiCD^
zxtr1T+SY&U*mLR=9Uv=A>^d_Ih%Hgi-C`Lghb$bK=ZU}2>y6JP7`WLL66#^8eP(hR
zX!KEdX}%7nBn4_NFKXw-1Y(d979uD{A>n}w=86ut765DdLcJ7>*1qs-x)N}D);x%4
zkogf7Nnk0x1|dCx&kO?q!jWE*A<{jGW;b2pQb4rLIL4eFx*y=^jx3_F4;tcQOdc9b
zAr83+7Ww>b(C*mTCm|__z04vK4+s&;?CV(RT5{7gOuvUMHE8KIb=$aFkCMiftlg?T
zy^jWpSU!Nhj&&o9Rm#?7(EQlN{xk)UUYm)uB_sR*NkN{+j(>oP2ox58Gk`LSG5dv9
z<kLZzM!@yw)+Df$_G>)U^8~ama*QwgYsm6Ks2!m=#-Y4Xc@zno1>{9xM<9zkFd|tH
zY79Fml@IGbY-}tI5x{HHM4}-feX6|5#T@z~u8#f%0+&TPYoVp~H3Vc27?(sO%38yv
zlR$PE-z4Y_7a4cg3D;`K8!}T-2Q^n)Ozqi31ptZ@Dg{d(oNo)UYY|XU6Oa}z$s-@K
zD2^S6W6~RwG*GsyK`r+y!bg!>EP1i}3q5z$J`uIs`xlJOZL{a`H>qQtW)9}9cPLz3
zB^dO%-xsjpnV--$k|e^onD*2`;T8!CgWw(n@#gvYgA1jcPa6S10=}TN43<fBn9`CE
zz+@cHs-N)*gllsSagQ)WVFAi4KqiBoa#HHlROJQis;~Ju_J3u1N&g3Tvk^DG#M~Wg
zPOUGs?-SY;%MHFD?eb~k@~(W&bhPImx@+~)?1;pV^*J#RJChl7_9&-|v!jo8K{17K
z?0s=M2;#0?k?)AO%7Dw^p4oRE5RbDQF!oD6K{epLd|XxM5<4NbLl?ur9V*rxaHw@p
z)iIKBqmlgVyqmnh=$rdgcm_~82Yt$afl*5F^e0Wb{oAXq@rqI;Dt;jzs*(;HTsLra
z=m@yd1S?J(pyvd7E%k32+&b-xCctXS?~ebLB;z|wzuWBajl3o4H-|i-+pSa>NVRcT
z;&nz8h#q_>^2ax{I)Ru%*1YwwuT4S#{S8|6d7eiQ@#)v{wj7S`=Z6is!07*NghH|#
z@DnP4pT0r*^GNs+)&k|D=Si=uqCdp2i(ngVTzRlcen|*Oe{Rq*gSgBO!=z+*eS;}@
zoir&A?Hw4pS>n+5{VC#x*H340<3Vx~2DGdUGYIZogtr~9b{syq%iR4K8jkM6(xJE!
zuv)qLZ!H5rK<O2pe+Cc;5eLAn^#yCT*_Hch9gm2=u{L_Um^!=`cnOpx@8&+JmJi^O
z{mjP9E(v?vMQJ#qtGPma1p?vgAIJ^Ukg#8xyW1FFjM%f{Y)^Z)xRZ0D9GDw(QM$TM
zVZnV?35*!^Y0_`HGk;caeCcXnjIuJqE8U|lifm7%#-V5T{X|JeOCwTklUQPe%s4oH
z(9{w+pm30qP)O|}I1!B=%nL7b!U$c<xDcCK{r^i#OL)oe@*E9oX$h<6`X}$Bl+&-f
z{KdxJ#eBlmY<hKNdykhMVUx^REDO;Di2d8NN11DsgV1~kqW)pXvf3wbl5_}h9iS1-
z!iM70d}*gJa*NFl6eA@Z?t%h=t$akX4qp8DP7!laLW`;E0~a~eI^xfWHo-(U@$z<N
z{!q?Ow2YaUH9H53zjdE^_h5=e>_~RIpHq7kx7nG|sI$9jZ<2Str0C0^y&AHe8E!K%
zS0m&y0VJh_no-k)*oySXImHu3Gj;LCJ0vwS@Df<as3Cb&j(?fb+r7_R6XnYE;?mdb
z<&agr(?vG;E{~4FSzuxWzc0Vv2ReW4qS3~#-6s<Zanjzw7PCHIYI+6MfTqbE<N$J%
z?v;JAh>1F;*yEX@8}waBdJ1`(P;dkY9fpWS5>%06bJ1(*&_u7X{CQ=CkECRH$}?+t
zv8=E_Nysu}+V8H_&v@1lfg5T0Yxu&7DgC{>mpqA=qDmpiy)-E>!Geegf+0TOg200j
zuvR<(r}C492n~te*~$-)f+5NR-beDuLy{mA5O8*p+O;3Z#CUzad|sx>5qO?(;FrAe
ze*Ar!N>KA5!0b=;yjjg{HB}fD6j+FeIg0)GowNo*la?mqBaJ<3vlmQspu(lbhGH<f
zMGgmf^7I~(9#Oy~fZ!!EC^TE3R+g^iT87X0+|UcwQhLYCa<`{jU6>%GW(k-K!#5;*
z8>b>JQ=o|y4kIt1fYz^~0Y;S&kI?)K^9Szp_ivVqB!rFeA0K4*E@)ttmnLrguIRnH
zyOD<)4NIHzuUp?{d+%WP$7rICWS}{Stj+J4xzjIu4>3aiEHJYe2UMOvMfAGSC<>89
zzQAmYvOAZwAebmAv^F+Ha|YrD2~jFH8>#URmd%3*(L~v0gAZ1$(!X9Vk0duo83-u;
zzfN01JP<@sl#+oX>x%jrW8&}I{RSrd?SHkVD3{8((yE*#{`ceU3$4_{gp%q*y_D1`
zb3!q?WI5OPuh?`YB^7;R?iD6SSFz0f)6Ne*b8rh!r3yh{C@3lM!HPm4bn5|19#hCh
z9v_22Fw%Pyx!Qo;QIO0y#p5T|DktjG9;a^?3V?vIcAh&zkdh#MWn5M7DD#3crw}SY
zU_f1impwlvg;k4K^>+ugDmw6_VF33zaj4VQC<_zIWZ61usxNt@kG6+aXv@cN$|?t#
zw)Ex&3n^2T>$|aZD?R^{wV0u>)?~W`8UQlk?t-G%VTb^fN=US^188kGscjp_rqd2C
z&*?rjiTBOC2iydCDS&Dri_-jPgQbz^bj4r`#ku5|Mj&TU;p%=&G~6i7U_Kt4?Vx7#
z<Xrc|5WO{9MmSamU0P_EBUGmxYrA5PY1<Vq(Z>OUES?NMA@7OgHjwK5Tz9TozZt(Z
zbBnhLL_*%+=J9-ZmSZ^+X%Qn}%oSL#vk}4VUvz+}?tp#@x!f_Gie!Vr8M|&kPp6ms
zJ*u$TnPM88($_e?oRm|~^rojq5~WU5yb&UysXM64sl`y;|6Jr$zpj6RKaj!HW61f6
zemECZ+J*}D`k9y+{@Nf0Vp8*7YoD5li}9&#mAB^p{B53%FV0s62U$De;y(lG+26dm
z8BIjmH`mZ!8pRAx9lgvnWs4WlHV#BABYh5Ye_FESoKewW&ZmW*=|)&)<`Lfggs-c|
z_Tl~ZYWP#6MjqVnwcS#&4}~)JsUyp_Abff|dAHwQylX!yymv`kSmp@5G)m36=yMg*
zcJ(BgX!@E7*6v$;S}j@Kv+1;PZSrc|aT1!}Qs;_MZKnHCrM$!2oAc*Uv*l&@+HU%x
zBNuJuDZX#9yvAr!qiT!ZugouQ{r2Zt;&c3#y&Jf(39XK~f^7|Q|Kc%x_q9W>s761_
z$;)bAdlF)~@w@aK;=k7Uj^4i0w;DR-;l~U|tkU+K1@gMj9ZMF@vG2tRCcr+7j}Ifs
zWciwM-rc$_J}nR=v5S!$wAf13ZUpSzGy!}wF}cukaUIEd<AZK<#xbqPD~I~qR#@rI
zIXT`oI?sgzaaq$;?PiYMT-q01@nUzz)0_9&J1%hiC+miS<BA~cLKTuCtV2Ior)P71
ziE6bR<BW&GzS^7K9+93p&sni|etOC$i`x5dc+E=W%vs_%!rwhWyJt}CqnGMjSfGL1
zmwp*kUE^9e^uL?B3tSTE5PT7>$v4`d@n<<a9p2T!oKCd#M;)`(dQHvmtxR7Cw>DZ7
z@!E5@i0;~b3ym1>-s5zX^SpD8&)mhh&M~z1D4kv-k*$w5w%l6yhbhT2`QfSWWS0i_
zj**;SLEKqMb~i1Tcow(Vfz1|JvhedYLbp3PkqWC1EkxW~LuU&6!Fbh;KKdbY`rkS4
zs0?cb_H30FPa9*2$7>X`wsnp2>Y^Fp7@T6tUf9K1K`rAPsp6jw<c>}Dn`Ia5`(KH}
zZ*B8u;NkPO)4Z9>`WdRatCBySyIXFeEUw$DZBN~7%?K6CKa0}_*Ep!OwZ?x%7cxJa
zIw?28-iNilF?^45J+)R<z8aCwhl-tVG-VEX-)uSN-n&{Y!FcUr3QnrS+ZWx-)1fCU
zpU-T(>b*IbsX7s8#|AZ+uKMkCon=rQPt@)gU)<dmmk=C+v$(qx2<{Nvb#ZqR++}fx
zKyY^_gg|h2ce(l3``-KQ)=Zu0nVLECsjE(RKmB_&<B<bs)w;j3b^Tel{H?8Q%ldM4
z;S;?HJCA5Y0j)P(xr-X8?=_Bp>F~Hab?`lpwTpYqty#0S&ilgCX1=DBWxYJM${d*j
zi2+scn0*>j@Rh_uZ?JCWZXX;K&!RJ*pLEgIre=L6^5e{PMC9Y!=Qvus@53KlirO9+
z*51w-i#uowU}keUaIN)dC^=2AA1iWuCItww+4GRjryAKOcepp#m{ntM%`a*i$qo$)
zyOYp1KsS8`E(>Jh=gX3u4@Z7{S?U>C|GF0?xMI*hFfBag=X!<-CT%wZD>eZ12_RGl
z_CG)gR)&6*$w1CJI2z%g+SQulcvjxIHW(<Gs+cO+xBBzniZwNS>t@-CY96Zu9kR0K
zdPJJH_sewKV_(PfX+iPp8vEUq-7Y;x^GnRY23DeG_|eG6{;bHr%Aw~!DhD?)>*mCL
z74;%~xA_yVJ~?|-th4h6?(CSmF}XQ=zhSO#hedU=AG3B6NJ&vMKeGs+-G96pSgSEb
z?|0nmZ+hzcMCpZa9<grLI}9BLA7RdkruUFW$qD4OTn_q6Zc+tqv>s<&3jJzN-0@|^
zts!ynIWt<nXqD^!(7Hk9z1qS~Kl8aumahxbl6Zbu0`bK$VFF{{2=0Kgis3%4ep9Tw
zJ7rcyFv$f`<=ZDj5+g4$uMWB%2dptCB^9D@?<pWcqJ`^l>Ia580AT2594gkPCt*#h
zHCgoWAzH>;9)#9};lqbCEJ>q?gOh-b&ZC2XqgvA`3IFPl)RmVvoxAdBp-IvFF+!ja
z`vdWC1zRX!`Y^^Opg`9ZMT>|43p7>st34b?#q!)<3njs0Zl+%TAfqv}@ToTp!WrNe
zCjAd8qDSnM4$08f9?N%4-f^xhu6!h5X!&hpqnfe(%~R9pL40QHIGWOKQ-(2|ArRYF
z_t*yFz=0t2E$&P8Ti_YWchX{=t_t2KN!f!HhsTdRwy{$FMX~!IZjC77e>Rdxd`2gz
zph%iuRFHrzNJDpkE9&dA%eYF*((6kt6OEzGOB{%xb@t*pyGy_Ba*-caIoz0VwOV*-
zuKwi4AFJUbq=a&QvORn8)qS78yEN0WS5o$eNPuTut73=Knq;<|cegdC?gmHajqm<=
z%af~x71hnrSw`|);wR6wf`&{DTG4}rI1-*C#jJG9P(P9T=K$iiv)kXOj~A$OcJ+HZ
z(IjMk8)=4XpBYMpAJS~<<pfwer)tvq1e}d0s+7d6!;cK8vYM=jAcp=~_o`1U1n^R3
z{57nBifzV6{+{>q+U)?pA)Tj13HTE29tUEv5h6s`bX%x(E`mFfj!XF>VM8CR*qYAA
zG{&iR-DjlP`8MzV@(y&xa_-3Xx3XV0I&zmh<>g@7@7;u1YD_2Z0f;U}mlJ`ecT9b1
zr)OKFkML9cl1QpvZC&}!{7}5!C=cH6!P0!F@y7>5gr{EBHF_^%+&ld*VITY-LC-;<
z>w~oZwdg82Y^x^AbFdDl`z3v%rP42hZgeOg#DE+w3*4{;M84Uueyi-0AW|9nBqY41
zKZ2=<PL)ZFU8Q9AgLf>lST0&b7&qieWC=qOCyuEraSd}QTksIo3u;=;UKFo%zd)@_
zKKvo;oq;_e1lfeD?i+}UWSe+Ccq!#nxbM-L|I3Di_8mz%haT1xP&+?8flb7&v-`Kh
z*Tc2HV`=aT{Vf{@xk<)7mg(tH*-)Q=?A!@TPph!=+pm9LZ%Vm(|I&X&<>?c<TKF=>
zj02Pg%^U;mc`JdGJK^`%3f9u-A;#U)y?|}L)D4*J4+NZJn)5o}T3UxNcJrwvg5XR@
zjScNlee#=wOAx3@5a#yjBZ~jQVTPrr|Jm#jhzIBwVPAR`lyX~4Z8B=Y7#GW|RUL35
zP}9|YkvnP^cgbOME#0QWaLrU0CP;5!*|`@jq4;p<?t`^#bG}{gi>khT^Xm88UG66$
zi5)({VDM6j`WGXEutU=5=~7p%ocDB5B#GSlW-@^^v@?~$qD{EvKQEWR98Ea!*Oh=r
z90ki&b>V&8e==rrowr<JNmCfBsQgyR6IYpoa$Em+%)I<9Oyq_{y95UVJarshA+)Sv
zPK;c_^1sNkp3)9J85SjXx8TX@sQ-D!T<qmoou*)ZfWZ?SAYbZ1U%`;Gfe%w9GQi!W
zf1ta3HOiedvF?SeUKfN@E}{9=c2@DmIhqbxtsLGv4GT<)Lc?lf=_=CqH*{?Bvi7#Q
zj=PZBon)ti?^p@bUA()_11=oyy{=nZC_on?L3`yW*BxjS<q5Q|Fpnw7-0YX4TD-28
zjR@Vru034h0iiR#N=-66lEfsKwx*d4=mi5-LS%e<tOUmNa-kSpwA{FRx&j=PWDqm5
z-imN4Qv`9jFlfeZrVKWf)4dRoPAh>kf5N`;^IFt^2?O#@NU*p4-e$}9W9Qr>iT%Fp
z5sS_TX|B9RM@5SqZ;a|=MG<~JX+LLf3Z=a13Wg`OTd!31Ne7b+AHQ!Lvq_7Y76QiU
zJ8;@MZkf|(SzG5HKbBvJX`O;uQ4+t*9blNq?nmt=@#m6!6_1@DE=3|)T7tKu8#APj
zhVbqEDxYiF{#A-jgCZBRl3aHFF>vEoecZml&}_LlrK?V54?}y0oSOh2uk-iHE)Ku1
z)P+_#C-(2&;oQyI>c0q9<w#v~schHW@iu)tBk=6f7OSO92QUyXh2@(T^1HrJnj0$R
zg_N}t#eBhYCw3lh5aA8zj)~j1S}OIa!0zW+W{-sU8&7;Do$TIaNo<r~Ro4Pcl&4LH
z$JfdW_h=%+;~`C*`!iEeAQPTJceeYn!Dp5qRS+n37`^Vo6}SZbYj-?airVZj0nBbF
zTM}<Y1wl1(h?cPZoCb>VAy&E}=!X<i1p(%7F6*s3c@~D!XDXvRhh)vdGf6mt1@dVk
zcleSNhq4iA`}V0a`bxF9<I2=v{fnk5PTdn1-_|JIzl16NW!@b|g4O5JW(|M7+y6~a
z{332<9KUEyOTV#qBUz>N4);5?oyss0Uh>E&3gyArxk-iQHIv5jm?@uC9LJu=9XhGl
zwJ~=XA_QHKLxYOPxoy(8oTj>W>PNc7tY{2*+oblAN%b$!Jet4&s(9`6H~wO;=q8T(
z<GPGr=@#PETqeuOQTBv5y>9KyDk9=Jl$u_$1c`Sfaho%LQs-u%GeKnJLA6A>cs5oi
z2o~$&eO-lAUK>tFEycZieeYbS>%YaAnE1W57{P%$69@(lEZi*+=!_-~K();noEuk^
zj>s$uqyoMz9BK%L42A+NW(j!WsU5mNZds!22~n?+mh1QNL2|K~;)U`yvfrXn<cqBf
zm?HBF=_+8uPUHqMne~#RVUvSw41z{VgTriWkVxB)#C;LA%a#`7A_76yzOtv{7RJX1
zme%(ob~j?RLSjVltyU6WO&Wd@<t}b@Xs)?$@MGFYVC4I|9H0+TbCeGJA(iJzcRv~L
z&ELFZ!&fS@)yfiU>wcw8)#dum9kKzL*DZ!CI#De!TCFW$Z+8U{@<V@P87G5@Cj!Mv
z4lzh{5t-v<lg=nM&)<|$PoDLV8XvCSf5v|M@j?u~49ylTfC+TuRaAxX78bFGki~z@
z(5`(7s=^kbKne1HseEPS0I**_SXLFE3<Pp{0-*uzEyX-R!r%ajh`pQ9ut7!y#@+f)
zi+P)Q2_Mq{5~WY+rHZc`&C@C#wuZN)oG~7v_Tnx^Iz#uCgFo`h_(U}PG=0d{<j99K
z$Hp>Fhx-y`j&8$~i1&t{7Qf`8Tf-Mh%Q*7gz%8?|Wzub{C)kU8p23bXGHN_{YZS&P
z*!<DLxK?`hBN2+6S5@^*OmdLnqXnF-cx2W5ah#g}h9^;~Lcp#Qd;tK{+xZA=XuRzj
z40;6vLpt1%*dwz9=W>*h{oeJ^k9FFi(t+LxvG|terakZ5i28&5KW0pMqd9I#Z}Y=V
z6}4378IYHZVjqoy?(6*W8sfSvJMtoK8kF0a{1lmC_QmsARPnGijf>#HzN>+_&vv%~
zwVtcz@01K}lU+0OM*G{Bu4e-K7^3jkQ<Cg1VN|`$%#n1Pbv*?zz+%a$=&GZTxwiOk
zFKbb9aQpzqCmrT%VFW($g!$g-kE?5I!gPD`GDyM6>SdP019+lr-?!R?pHCmyVfOM|
z5$Gxrk_=asvKq0jlzCDf@J}|@XWx!{WP5M@TR$!6k3T2E=>m`*^iv2HB73pPU*i-|
z%$uN!qTgGmVMzUX5GjAm<S@u>@1bu2jL)u*srYuI8&D(|<_+2&t^-Ay4{r$U#U;oQ
zGB5#iJ{V$K=O-7Hdk^$qk!J6!5%XR;t8AC`Fe{zjs}iR8ev%d}4@^bSOJx4;Visj6
zbgTEYtPH_gr+HDA4f>(Gn>73bqBhc9n35X@0}ERAa%Ah*e-Q@}6pIl{Mqtg+0`CY&
z$jfNvycK~de}xO<Fj7{8!>2rMAIRtCo7Q1Q$km;1<Mr}VMPMOC4QEXESFuYd9&x+g
zE~rSrI5>8W+QhFVqL)}jv`!>10KAr7Z5umG58|c%;Rk?_Edn0BnwrW?a51Aj0mJJB
zS%=VT-X}-lHU7+{+H<%C7yv}waWMzhIiO=(O@2xG@-E(a1`hcd8oqgLQpRZGqtF#X
zs<Y5r8VrEAB=me>!uHt;LqB~^M{gi}Q^)-5q1+nDQ5bvTmlvz5shSuWHKK~6QW?nb
zNBAZ2f)DG7a8MMPopPoS2Xc-efroivLc(li_JLVHlz&`LznPj<49*$A{HIqIB5C;f
zI3fHt^eG2SdS?S~G7xEXd2Ca<KY4PQN4j-MX*b?}<dsykE=!OYB_@^#Ssc}!<4aXp
zIrXa)M|6<X&}e>*4zfJxl);twol%%wr&gIE2%Vg{Z;w|#QrKh;+B)+)=zfv5z*K7f
zno!Ybm^4;bRfAiewsk0o%nyw)qc?-&V}aASbYl<CWpTZh|89Ui7vBp7B`+63;zaU`
zMx<8PDiOGF5&F2!CMWltu%2bCJ7k7>55`I9i5t1Dde8WlSQ$o5azuYqy8pzK_-k&8
zYh`)|XR+9T_)8lUxsgvD3PPjDXU5&M<RxLIYOD~l8=T+En~k(i`T8f-7>W^~6O$J%
z1ue9{fV%(N)1F^zooLwZkGw#c7<jgheRNYBcaL<6QoDTM##A!F#e(ZDIrY9vik@B+
z$xi&HA-WN`ZbJQ@@N)4^sVib?-$L|@ccrA%PScuN6Xa+vvTn7w^Vo%Hw|yOGcc!BB
zDhAApm^_ub1FNdeHEvkvSyI*CZdf*iN#Y{#9N12+LaPy(>yp&4!A)xLDU6aFOqx8z
zh)CauYKImd?$w}w9W^SXweNP-PK(|HR5w!$BIw0hsq;Ev8zRm4OYqG@5vj^Vh%)BM
zmwSVxGaAg9O@+9KqC=#0zabJ3z-$vQr7sliU*~D{7yMAcIZ*w~KEkMnb3t{&QJfrw
zsMz4rmx_#n2Z=;cEglE%>ym)ZLts^-lvGXNjU|`o;o{N=5SK&9h{qrtMIp2_i69Q_
z{7BnS6u2rUuWhEt9!p}~&9Hb=RnBo31~G<b_ehv&lCtNJ+XQ$?G%R{5{t#?!OFav*
zjBgzA+Qg{L*p%lY`CgD<_wb-M_BEIekl|)bupb}g^YliYAO@ptcqz4fg<LXK0diz;
zbVWW83L9aL!9vWBoJdqar=^A0h|a78mQRz?(xg>|fe&qz$6+9uX%9;MR#9OMA4!X+
z!45|aN`*2)qk|ZUGdLNGU_p%HCaS?<L?j=cffDplp!8sIl!9bqYbrYIXmQ30S*9pt
zZFQ4$YBOEaphZ<Iuo!i{tOUNAW}23!Ca<NsrAd-WG*Gcv9v+#qToG?j3#XZ}mjmJd
zCso(d#MAnZdipN_!1(%Mz0~wU#p2;P@`$)v@Wp6hlCf397H#e@6^W5lK)fha4m2X&
zVqm!@ovuyte=7LGa%v`VYDuazgKVeRDCUZa$cDb;!t&^UE$FCAMKUsd7Q0IY4h=g8
zR?uiMV^4HHN7aN0XGRKI-AI0UX6!@*7f5pmjv1)Qsr~QQBv}2l?7^AtRmMBGiQLwk
za?n057<nWHU_Ub5I2?N=T9_i$2r0*?G)JLR52(D{3^Zy=W!%@73=7H_oyh(t$1UPQ
z93A@x$#+4ME{l=FJ3vN^1v-t|yST9T)DPwN>2abl;-W{v0E`8QzDpA$VYI!s{@p)%
zi4YOhiiB)<VG{u%M=<huRN~mFVo9*nynBG4z=2Rr-yk@vCvmtb684eak$xH^YV1U{
z#MmHd`Vna`4X!y2h!~y7+<3<%Daf4LBq<~*TpB}~m<SQ9iub>_Fp0DO^Nj!Bd&KBi
zvB9yS=6L@;ETSStAO?;wj!271i*urI{%>N0|MLCcr2mr-o}UQo#8i#&JvQn^E2j_3
zWjY8XNFL4^3K{|fgdy^hVi2N#-euNmitLg7VnveDG@4>WCjSUFcQ*hHvqp1iBJ3_g
z<a5MZh4=ndQ$`PDcxre|>O`!+&;LmunW?W?3aS4oAfs98{s|%fT?=DS|H&X@=Sc8)
zA=i6&OoqUy`*jBRkx_I>EzRMg`$HUp{wZll$ZIMo5Y~yWMF}VCO0}21;5_Z&-826x
zGbKF57sDj+b#Qi^n{cNb6PK_*+9Uq;y9b%cei5Qsig~&P5kEX68$m_GO^f?E;UA7{
z&h111XM>Yw0=WnDu3y3(qF6i=h0BbL6Fmb|g@;$er5#XJ94L`gpyUaikX6_8R}c12
z&a-C$cYkTMwn0zk<`4fMwuUIPK<V`YcYm--O~GiM*PYwDNop~g{Rfc*hngBx4gSi*
z5(YaG_$n8_s;FK_`+gj5#)mGGAQIx20ArG2qUzF*H)YEnUA>)Jg0CoL-4{DCVyP}I
z%ifPhtx6@u9Lh)&arX4`CUH1BE#mo_N5M@X&Nb1I6Nm+X>t23m$SZQ(G$d_zO|U9U
zc>AxDR8(}|FsJGNPxF7GmInWO)BrMu?u+Q=VjaNU7CvJ6%JbO?AOxVr#(fbTehdu6
zoxFRzHyOl#4jJ+ed?Leq%sUq`d&X!SVpfjReP1fm5q-9Mb%nX2v8Dq4JCH03L)0#c
z0YOL)UR{pge_mt2KM4>-ziR$PfpLkJyLf95y;p<b%}vIkrKUW3dh1>+y0I7?83>g)
z?MI}F48#xRKoghbz+9)t>R~#kygeb|g_r&3#wUR_@c#lf#^hiOEN*7)`9L{EK+wuM
zqBtA&yUfSV3dqZu*IU7WmZon{!sB;jqr1&_?f93CS5EHIF^rP{y*>FaN?_bPjR8}l
zh&F5nWK*JWswjWoj<DWfYNUT2*Q(n_L-MG!?_zMjr~TnR@6O<r8ZE-|cezR7lT3`F
zStkRdp0TbY4Zzc-(TK~uGmNOxY9h{Q-VRbM;^k15kll9e9UMPiz0oO~tuazG(9lZi
z5sJw#cE!mo+gUL?IQAZ|SbF8(ll$SQwIU0Gys@JG7?o>zoH&-8SK!iECS7m^bzOPi
zcUYYiGRyGbQgllMyq5B?{%2U2t39MGi5ClZx+jdC(MZZ~0yusC<!FR*DY^-Tbf#X^
zagPago7vW1JAXOk;Nf8tnelVQR;h(cD+cY<pycwV=BVZvs3sS1{C&@gr#j(U$iviH
z-^z^`GkG1}MxQqr`}0;3__A*%DSk!vE|`l+Iy(4vk-MSt+be<oG)<?D=v3?w{3)ME
z#rkx$0yC3lb6&h4HrVv6Kb#USnQ{tj`fe|@jlM<Fo*x%`O7Y87k#S)|;D;tl(zQQQ
zWos`_!mBu!saVq-g^)_cqh4=*&-r^bWClrMJ_*uA;rc@#8}wYZcV#`gM!OtSgX7Gx
z#U;lr7?0B{3NdIR(ER(uDuB-T7Y5|8Jcoq9k;`>7A*HdXT1(3>{#YK5QJLh-%heE&
zfDpAO_1L}g`a(JH7vPz*`>?U`-OmJH5v>>vS@id<(PAw|-uLjZrDiMgbz{al#DJap
zgLW8GbsSV2gKrRu(6eY%xccyl55__{TY<Tycr6$-7B-a*+|F@phHcH*d~pmiwxgkT
zwf+bjf|3kDk&!)jdSXXW3c=CFk?+h62RszWA9J0DGl~+YABAHt@*B9QnFxd?(7XyS
zh3&DXn{kooSlEMxWFnU6n?~#EXwYq_k5p&0-fO;}2Z$+#5}>eiBgy|VkZH0|p<KS-
zC)v93NaW-D3I6^8tI5*7l-dA3F_|?5DCEgM)=)I@5NSh=aX@@E+=1wESX|3U^JPGt
zvT3Bh5hz3=IMcu4VEr;HOThXTBJu@pPz5e=(_?kRoHSkKFJ=?GL|!aAyK>yrc0h{T
zdeuqpt8ykbY!k*5)cPQ>)`CyOI!o;0U6&Z_ym^49fvJc6;d>$6uW3xaE4S+z1ktPq
zPatF9W43cKf?(afHbi1B88$cW=E^`w{RftYbRI2h_zd0|Edsw6E*3s;yA{zL8ckNj
zR@pB$HtZJvBr^3`8NgMm+qkz^yY~{!P26#kX&BW`73e!%&%>aS<pZ13#{lO^I&T&~
zB9Q@k$RzUpv@{}=yZ0lN>uvqi)yM+-5JdoH0f@|xFiC_v6}Ume#@R2&fO?9P^6h#L
zt_nW1zpq)jo}1`I5dFeJcPzY`em~l-?Icm*##CleiP=9|<ux=Y=i3*^AU1$R=r1g#
zLuD~9$~U3*11U)p>miy(k)82)o(`Ws{Z*j`)h4xtL}p{f=k|wu+^}!PGkxJnDy5v1
z*E3IMw677*?*}~3fka-dUKH(Fg%2G|0o}DcjDi@~0|C`3dQ#kwUby4c%<mm|aGUwp
z#YachkHp;mi=Kij?H|JM_-yj>NVthpGxOtqnD2LE-{Kaec0*a<zTZ8YiWZ*>$<Pcq
zs7Cs~S0z6O!vta6DKnrgGePF4Zz+@!Hl`g$6u1w<B9Ys0YoMkY_&j3B>JfK++i)BT
zI0d_fE&0VLvKpx68s2lnjejhj_QO?%IbB|U?1yAhxX+!hRJ^6Rzo;YQop1&5P_*Ir
zZi`%aCjdn23gWJxT9*ZZVa)%ArKz&kA|10rAwPqxbyYNCVPpX$>NGe@BG7S@K<0b;
zHmP6my>Pw>QMI+X54~Dk7o~Iu0eWLimzp|W`W_hQc2%rlh)70aMXJqtb<R!_L2QEZ
zM7+a0KPiGH!}QU$(8<qpA_};<i!QW^7LNru!<pUtyVL~h)g^ulN2NLm<}a>^GfMgr
zb>z+7VZQ`&T%hp-hsC1~HRVm=5&B`@z!-D_26*roO3UIdJ|}<OC+m;%`2?fL1H-V@
zhALn=FE86u^ndq=t6CaY&=GuHT`Bca3Jw%eNVMvMxr&5e(>-fY4DW?<a|A?SkrLrC
zhA1)KD`6iGB1Ou$=<P!wgcDK;8JyOG6QjnGczP!&>NOR3Oi%9?5usSKv+y{bz1J_F
zPXiRLR1Vfe(S*`e7d5~dG{C|hHR0ELj0CTR_wWC<;QEnK*a`PwWhXV75xTjBkt3%u
z4*_Os*8}eS(xq%RLF5fnDt}H-1BXj_9KNncj9<>!9r5#ST6@Bm`nN^Y@;+>Me>Rg$
z@L{Ot`C(5-_1go`lb${tMuvTOAFgrtPPr4BK$q#4_0Ows7L(}CJ88@MDMOgB?i;<i
z=qUpGzoEmU3Uqk<5Vl~(vE&ei+1V;8r%Kd0#^a8aff_#i!!;!_a4;Ys=}Gaq)1sP^
zu)Eyvi$8gTL(F(Hp-`h^i}B)F&J7+=mHjRjpRrn>Da&CyQ{NZe>$jgURrPD29Mk}l
z6ysvUK!NJfs$t>)LH!wx{o=`c+B<iC;cuGI+L<B|KF_b7aZFJXGd|&A@(OJ~`SRKA
zt6bIxb8O|Kl#vsvmI4_kNJL&XISY%J)RiFt4nvIUnpTF~c*`lOcmXzcxIM;r`5j`S
zy>V9|C-45Ol5Df^8bw&W;OvIj9q?TwW1LHm?h1s_Az#i=r`zCga7w<CB&~_W<q(1;
z_{dyQ4I@zLySC!c^55Bkybo)Q%l~02!bPr-yt$h(9FAGnoSsdSa1FMeuHQXYft~?N
z7bi7qXywDd>eyLjZ1^m7U?1y9?`oPPeo^W%1D>v*8Y8<`mvX{=pyQ=~z0>1Q#`I<D
zb8}f?NA@oR5g_=__n{FFpI~2M%lw=ifvjQ`d)yx3jffs!D=bcOCSGAp<;tI7$bA$P
z0Gp7=)NO$Fh@P>I<>JbIS~`40m>;Z9M~SOtVMMI9qbch(1DfWbzNRUAw_AG~5tKzL
zGP?QXoIR8P*4V%DSj8Zm^$*K|>}l%9{@;iEp;>*bnM29Y4Q3qGVv4q8+^zO6@u`{T
z`E^7CSQ=(Ey^+c-(O<v_;j2EE{&J8(<-FK1_tGvpw@R^A9h+0y@~7EdUyD)B7y-q)
zT!Yjj9M7ruLIx`_))G}$kU?rn(ofou%ODcB%-cdxaAD+#*Gq}qYZTYMyddfo-3e71
z5wb`+GU+4Xu?9&0_^MV@HbxiozUTLib1`nL)Xp5W3gYiU%Vm^~Om7a3j)#O8Bw24`
zQ$OGnH`&<s?G<{I*gwiOr3b)Q&VDQ*SYMF*mp;3XWHI?V%JPUu%Q+R~kZ_GJXh(iF
zlvxrAS`HLnK##%Zfg=iA(rZaR%7Uxbzq8&T+>*t+ANkk;1e4{OW73H9XN{C>&LA%a
z<hJ`wwyYG;Lt;M(y@`+7(_fgEPk82rR0)Oz`OVAo(DUnvblrDW)&PeSz&c9Q@y*Y{
zjXCaYNIvJ0EwPZ0vwWCJc%-ju8H0;I1um7>;k}O&2GByT5K-?b6YmZSgzOo_n!jQW
z+$c|f)}$fH()#>-Wowq>s->kaE-OQp7_ndy+nrLY{d@fn@^GLP=>tl*h1Tr_P7=I1
z<+DUhZ?=ZQD4h$83qvrZ>JwHbf4C%VAzF}Q#5+rdxCPCJwaflDVg9{fNf^_BPl^`f
zd2i!puYrS-uzf`6iLnGJ$JeFQHRaVKQR(iNtTfCBFi&b@B2mxwx2@;hq>oyH{CKtk
zHbK_kUPd}8%3`hzu^-NsD!ff$2hCTlMCsF~I!P_W!Rua97e7>GktRJkmlK|t7&Ivc
z$EZ5KYxUXR!*-5av<4Q{yg3F|YXL53Fo{Oj<kaI*n6FKo%(BrxU0r$pmF(6RKw9pn
zP*!1~sWvOX$3{>YS^G;c@YTsjGwKJX@3lH}KrgcI8e!|S@qU5lqtOAww_G$l%7vUw
zH<T}Z+3lZwhw0qB<*ATL^=y2835%I#aXMk4vcU+gUfWq5?~XhpAy10lk!rzBD3jUd
z7Bb&4!exh^^=d2@C=u4J>%3OD2P8%uPd1KTzLy%_R2S>_pME@9-&%bmQ20sVRl0R%
zWYyIbzmC@aBLwq-B;sAsAu_Z{>PPKKY&+i)|1HM-`+oT~67T11OQL&+%h$k!cPUY<
zZ|PV>(<gZh4=hGyrz>|zn(xo<+;01?c9b{yj#a*9YY)$EUAbTLaIGdYGLdD1U|HZr
zqLpIo5I{(`LguHsOMqcm-;Q)<gP0`Dq$^J95q$L&O?k^5^;9f+^F(?7uU0Xk96TC$
z<a@Hgp|sZGgtCJs*%SmbFPs7sqXD04`4I10^Ju@m$Cu4q(24!ERN-@+0;uVi<UKMv
z@7&)BT#2T?g!67<{t(FPE^FK$_&|^XGUsJ$uKESOE-%<mq4D}A1+}Zk^2DpM(_FrM
z67DlTq1iKaiDWjJ^E86F(zT!o{78`3*?%y&NNDNTA*7E$)ju`u&Jp)1hRC+r%lpZ5
z2T#HT|3x^JB1VSNRM97!+p1zZe3B-6Pw3sGSeeI{|C68?90%EOA_i)0U%~t|+{QUI
z;txi@1uH`t=N;63<^5ZgL!A(RS@L3Pjal9T#|RA}o%_5cyKD33b`{RUkjKuJz6tsC
zC!^zdU7zO*`z{L7pI=fMQ(pwEp9HFwt8Y#@MLH>c58!?>><<WCtK?W8c@+rWKwT0-
z16-b*w(!CJtBI$PUi;AO!Xb-smDDn?3!cG%&lA`?gwUHC8-d0-@x(!#5PUPn>d%FV
zgnCu~e6Bl;tHi^Nnra0L?|-t1*}Dc1xOq~%qkH*@3|ZQJIsk`Ad_ge>+PnF++6b={
ze*T*<%|9xgC-r4h*}rySXG}d+K*jjnsno8j@V+nT$Vfa4FH?i;AzoQ%_NuoL@>_!;
z?om?S+yLQm`H~vlSmS(yVM2sJBYCEnZoog>-{3OnpyH|`x5lMvOAt822@vl1^8OV9
z=1cfqvo_da!VG)qar-J7n76)v;Q^yF37~?9yUb^zF2C=CIRgUlV5sgXY#v-5FB2kq
z?)~#ca{JHE`MZFdsYr8N&fM*H+SaqN7DXYI9mvq$UtCcxH5ImHQ9g`$UG<A!b7;&r
zl+DIB!yt2~0=lAF(Q_57yESu!r(_#e0R?5{HGf(u0JvHnpT~Md%C3LYIJK~z?(e};
zdm&W!8RRhr;UJYhej7eijeh{jsDpl~qN(B_dH%tI7t`1``j-21WQz8BXZ^zL6#NUE
zTk~F|n*RIc(?-t}?n$+XgK<mE?wDNE1>#r-GkGSUjB$I?H{1L5_vPgYEXMxrU<Kw)
ziT^4*Df8yHNmZNvEMB9q-aU>jigVR_55G6gvr>>YP#ow#T5{0BW$JG!*6v>2tGj<p
z*jaL?dLIcZg}`?BP=|*E4TI;TLQw}{v^%Qoah~A9m4d<W)6ndYZ{1915Kz7>ODNoQ
z$e&f8uH0#>_{v+Km&foCZf#Xh<RSLd(gy`!ILQGLTvr(*OmuuWPfi@5#OI@nYsgaw
z;9ot0h<pt9SDsof?|anLb8rIC5q0dQ&N&*4yhMA53xjDq!%G=|7<4%r1l5@3m?MIj
zoq}Z~{?SC?3wENg5qH~5bc{KW0jVwN79|V`$VA<K0Pe?F0_Ob9a;$zRwDsEz*b-T=
zCcC3eZgSDUH#rjbM6i1<=z_Q~<7eZ0FIN+VSK7Y8CezCtP6skhTREM=aKTLE(|Qm>
zT6B&907T&=q6d(CkL9h4rTr{b#}HL#jMgU7_x1}x0)wFq+!cCw&j<{Bk)_u~`k^@$
z6!gQoNyXf0Z2%jl(V?&x$NS3u9oad%irR0U{L|L581^m#7r$YHgG#?JlYO!E+*JX#
z7o<KK9Vr{xy{kO^k0sYWXFZGwx)1cSCIjIG4t-h8L3IA<rGc!*X_#OJ@NqFa9+Si~
z%5`<#G=r)00{y1E;o8YI_HRLdgQT-v0j5LzHx{gqZI8E)?Ct``_cuBfNwq)Cd%~r5
z4h^FwPL6|CMM7rZ6ST;t<e7GFdt8Ah%Zh|63wtnXGD|XE8>&`QodAe)p-0_!<{6pw
z71z2zGuH*?z%9qTVm1p*$=gK6mS?gLIH)t$CK4MH?=%kaF%=fxuINu`eZf2dIOwL;
z%tdoquWoG0e_g2Yq~`pa4xW+eZ=&r)qh>Ip{J!fL*I~3bS?=xhsMD$BtS$?-c~jFV
z=PS$owAwlS6-Q3)z#N>cjHAz*uYOtkHQD^-_U|A#U-u&-$-<We6ee5}N8>FQDGAG)
z?^0yi{{T%*8)xA$bfyIMPeP#T&E=((0DW!;{W<OnTaC*3T>ZAqQrT{okysUfr&GSD
zxLXEkc{bmf&o1lFYwHmzj(Pgn$+8$;9)?d|xT^1_qAqlwDMZH3y4}fgw--6C_VjE9
z%un(axb<Etc=KEb_hoR~h{1=&TpGVIO~|IhQ&9SzoR!795zpS<;z^+ks(-Y2Pzh)I
z`2yYzhGs6ofA3_Jdot<qi@%*tPMgax$>Y&TT;BEHgjeuhKl%$5y$6~NF<m^np1j(=
z?kM`vJ~(XN+g-m;cFZ_FC?uab*bJ7dx!{qP1Stcw(po*c$A6}+qbtC}>hrju<_s$1
zNQzDRA7++EB)HB|A%#p{PPAyusx4Uvy1R11TsI@_=Cg%OaQuG$y1tH=gcossj9b@7
zov-ohT|ny6Eu3`)nm+usR%XWNsPAy;-#oHEJH<9-nm84rXTI5Y@r##TV?6UPkkK-S
zmYCKDoUKEBE>|fW(@9B-or?~1vyr%n%jqHARe)k=dIA~+PK_x(E(Z==!k6C3L9o0K
zSoOgNT_A3?z;k|2DEUos8QjWy`8cgDl$2;DC%Hpn7NK&qcKoh9btd|&6JEzB|EU?X
zG=c62r)zN$thsQjtRVc!6Ct41sCIFI0x7;Gp%-k30H#HS0g}2xM24B{-qu*WVFLtT
zbIL|H;mvA$P?`06R{t%`)RAMkxU!Od>|WzprWkipbXHi#Vmv}F48Q{(k=nsqD!z=A
zCx(+)7KEvU)$~9vpe#lWuhg*T{fG78)QQp}MrtSj_QBr8h`TMHg|v~CtzVmDrp5)&
zNmu8w$Q%Nh$i0hK8@!gd0uJV=MELgm{MpF8KxJ)T)C#5>&b~T={vpBHuc7WT3)6oK
zYfXEs4-T?j+}x0m%gP$r0dQ*@mmDvDrbw;?XiOtw8{r}{836;jqcRcYZQeaaC;N#9
z>(}m30G`u0s~|sa>vYlgFU`W}pWz7run4uK6O*+JjgFzOf;Y_<$RqgTMUBn?V^fOV
zCPXdRF`lom)`GvmD9NTZ_=nvQiE70Rsw2#J-Y91j7KlGAr#CjS@02vYD0C72Bf~jw
zaGXe?KnrmwOE7Q=RhfAqk@lYjgBlYK9P|BGo|O!z2)8BWHi*0_L8x{soy*3oP!D9}
z&<ER}=l7~J3FD%}qMf<OrJAC4dKA;a?}x!X>y>}@4ZBaub@u!Ft-l5J|G?<M*?<K>
zeR>!&ToJClWWExi@uI_eNMg~!^?brW{T=eCk}Q6L2?U5GqU#OFi+*Ht>fpVGz`<=X
z-Zq9~Mx-~O+oi1tz!XbIH#P8mJ}Rciq;#@sF{r!qEI$usATDoknu7chUTNe!*PK_<
z_K_cF;1@=a{E)r<5y#!5%_<NmbCuFt^@V~*8d}YF;&xMMom$bqY0!RDiQc4l9&)@a
zZG*K%`uAH^5+tnYi=gd-0LwLh=Yq?PdBy$e+~Csy>h~|oqmR!fg`)@SQ4W~__rrvF
zwMrW9AU_4=J5g*i^s>BBY5zcuC5@()6&V^Y)L)lL{vBj*qTg9><CQcKUcTKPkluE+
zRr~fIx^X|={zh!bkexxHBfCy_5e<&A(r=3I%Dvbq8;(@8BWu#+r~29Ot6zu77`DAU
zdi(w&x5@q4%C)wTxL6KfTT?p2eKwGi!JbnK>z|srhU{T3=d6Z;{Ps1E4LdeG$&-?+
zNujm=)?zY%>~C9-N$Q0kma4ahR#5V#-LRv=M0HtH><)4~0`u4gK66XzwvJ_;Mo=1|
zK47t?{ORbJv&~i0a*yn*ZJdy;2>x!aUJsJ==Cs1n8A02?%U%^YxJqT!f#xDRbAqF&
z_kb_w3+G}*1SC(3<g~TUL1iwG<T@6ql=$ziVVii&aCH_tL_L$|O#_3qq~00BvTQNI
zf2)LObFAI-WEiw0Rq~zmX!sv@jv6nMs_po_b3vmdOz6+R8JxINO7)~7x7l(e?n>#A
zgFN>|I2*pTk-$L>EF`N84F=D@^+sFxm(h19%xo3mR}04St8vMJ5D&YZd&?1K(qkIE
zCA13yk;W19=LKPe5H@ZRujzS_>wuFF7_|<^vq5_i?SG}u^w*WkPZ3cFH|rOpYb=Q`
zHc;Po%W*L$rB4lK@Yfk#+%N%Rk#|>)HA17KZIX@Aqs4<EUCWpH{CRy(vfE#9M*Yg-
zR$6`0309wTG?|Jv;|LBmkpp269zu}KO-OHlIm}w7|N2^+XOyP7%e&v46INRT%TXUO
zMB+zP1Ifdzg33Y5*-4FLd)pAR)^Ca!`!e~Nhucq<w416)*y}?pu~OFlu6+~RuSpvp
zjdXZv)iAQq<9KG*K)H;`CJ!VUPkO6%Ad{)7<&PR(Nl{AGn&?vgJSLf-;lBPgyAv&6
zT*vhKt55F?=fnj1`Kh^&bwjkIiyAp*Eo?o_$^K~J@A#3RV&$V+!L;)+{_4!pjStQb
z(USi9^Q`)qX1@$(25q5g*O!yI5@`3dd<~di^~5uO`oDF$$A4~JPx)?CRO8-;#Fmq7
z_@@PRRh0Cgeu_>!lwyt(yNe?X3k!pl@$u+l0{1vcHQY~ZMH8ODO*+Cw(33Z1;Y)Iq
zc5=_0k)a*NI^iMDu3?M8BFe~b_Ea9n?p72N)j~a{Xhx`5_n)QGFUCn~3*j5UI<a7-
z9!aVbV>yx2vE^DC>YAsax>UoxF74`fRu(golI^^oVIZ-p8Jn+XMqv+s2l_PT2*O*3
zfyb#mr7YJg4Q0rfwVjO)NBf)Z)Lj9-nPcH~p%CrWEV#yXD||bW-5+p@hyI_ba&=LM
z@x0O0v#&MpXa+BCed*ffZZ>U7B!-OL;u$t`38udJUBCE$*iAlPvhU*~Q7-UF?m74v
zzLuFKFl_v==CYU$g(ea@8G#FALDrh?E}EB2K=`FDHlo%0?V*dC-b-kEP|fP9sXnKW
z)q2{q<dKZPSJowqAN{m$6cuJ#A!=dG(qow2^fJdkK9blP`rglKzf$y9raj9j8SX}Q
z1lPtx(T4L~wak~)-`wkSd9L?9lQrE(eyVJT<eeuBJSgy0P-Q5v4XT<qX#U8``S7pm
zIrPYVCMW#*4EM{xv90zru<2sxOXs(rhDe$5Yit-460+G(9k&i%9@)9whK5;8tug_V
zFWu2qFl)T>M;9B!Z#085#4K3rBLsjgCZb3b1c??bPBKf?O#kajN_P-Oo`Z&hEhMBR
z!~k1l#kMf+Pe89B)2~bJb_D~XsdoRPS7H&khIRlzi(szqINP?w^pl&6_6VSvjmN`X
zt1cmzxfDZjv}7QX7zGBYSV-(-&2|e-kosV?D^(-qW!y-Jw(yu6k{L!OquObBp{GN#
zimDkAZ^Tl&c{J`OqWrU^;B>OIQ;(xOYpD=*TMKTu;V&QL^x5}~e}6OQBh7%P=x&Ew
z-vDJ-J`vgiBRR;;Ruv8U=Yk%-2dmE{Wt#v8Bv)JHF<as5E7_!RJik=z{Er{_(w@;{
zT@Af?*ni=NNZj2$<lp2rzU4y>G)@s^9KYFwQrf>wp5n6kh||L$NlVUf;sCf&>WM_o
zmoB#g0{WL8x^=qwU)c^a(@_GK(la!YqBPZ*G-o7mRVBG_dBnKnq;NH)3VIbeC+08|
zY-n{esKe<(OA0}yrIE1I#lK*rK0Ybg#{E{^hM40)W$Cz8)roqZO-2#Zq5@Y;z~jua
zVE*ub^T%=^@W4E-q!a>slVoC`eP}35Q##KoHNOPg+lb0Jgve<MF+4v~UXvQOJf8^4
zT&@qyOYS2n3}aL+45wnWflW?~VlpKP%49|;6t@BID9C0Y0Xem)6yN?@laSB@s8RHi
zY1fEI`-u`cae?ZoA9d%Dap;(^sw5<&s5q(Ms}ZZp<;Ce38PRedctG3(#UpbFz++Bh
z7dQ}*F*a#bYLpC$f&&>L3yQ=qDIs*)n58f7*DXkng8?H{DMoV|#D=+Yxae}hpgC9~
z00;15Wfx)KKZwB>*kPfC=2H_S2Q3g+Nxc5)lPfNeUm#*x=~YavR!WB_=|PvbWh|L+
zLR<{CV{b;JUWAb+$qr*eWgqDq=faA^CkoZo`v7L2g#o9+D?nYyAbo(;G)6soWJXX7
z$2b?Mu7zf1J=F&;=Hg&#q6$+WlRT&pq)6+c9>yqHYzptffsA`EZ=bY~mDuY<+yA-@
zf#F(@=TgP{TFiN`5L=I{7%P3io{YFlG{LQ`2S4#yL9`o9ULG$U7@Pt9hFqu+<6J4N
zrys}uZfh1rLp$)R3KA`kEN;peJi$?#AI($|83_$arVnPaiS4H)uY^f$uM3v_iVxA?
zTtE+VIKw7@Pv)rS#|iqaD_I0dW=L!T4MBpo@~Np%sGCg}`7<b-wjB><D~gNr3;AwM
zDZgHNPyEP6iPEQnHlm3W)7x4z#S!h&hM}?Ja)125MxfYfeu@}P%j)Eu$t2EbV*@qS
z=i-o!3@1n}4Nd1lvj**Pm?P&y7l_fdw5H%vrLe`Yzyl@Hb$uum`(*C%+_UhErUAJ{
zNGk8{h2{QX8;Tn8K=yFzu70dv6HeV%jrXpJ>|$^wI3^ku@R4Lr^;&3Y*2)GwZ?L=z
z?vY8!vh!kT*e&a+s`KG|8Rk5h16sNqSVEQVZ`waZX91$wBv?X11q$S0&}v=?cV>8s
zngZ50toS<ku*d;{U|2ac+Dixw$1bzEXt>%ZN`SM(iwWN_vBp1Yg1FUVXWrxc>r?mh
z`6iyGm^@?W6~H-3<%RWuT)7x?3vwFa_?lk)e$kW3^)&BGPpk-{ICF1gYP$_wp}d`)
zMsgwbbX=-!#YYH4%cn>#yYHbmt|`VC0R@_L6h%%W$Wo#(vQU}gew*gWOs~p*zn)hd
zWde)?FxQg7g5Ii>cjDqR^kDSYA6|Xr7ueX0lq}4Y=V3A{AkommJViJuT5(mp8TEgC
zmyUU+3D1Q!DKR^r5v<aHRDe1GBY_3Qi&l?R1-z=ygv&Fm0EuDdB;ZTs2vDh*AUoja
zc--qJQOC=`5|ZPO!soNi8ENU=qf83;D?e*HK6!d9h}y$=7+Z+kB*Tx>Qr#QRA02G`
zI8&yYhP!k1`Otr{6iHgFNNiAEyCB<!N0nGwgzVOvrbQ&D$^G`3M%fG(%AO*b-(rr1
ztEr_KS^6<l`^JQwsicrvGm5>D!yrjGV8Y{bWOS|E?Sb1UO@nMdefmUSxx^B`+R_0&
zJl?xd@DUaYBAuFgn3O443MAqsGJ*>(<bdr)2HcWNv4Xfj9Mls{sq;n`A)>SKMk5VD
z*&~tZ0IZlLrt!r{4|#^$cbf$iK-t^5+M?v`qE2#KS5OgXBBRC|kOhVabvKA;0AQ~D
zSB(Ss$XJ4(oOq}oli%lX{j2uHMy$^P=&Zi&hfx)lf_Y2cZ+ik6=Z}KZ)N<R_sR;od
z`N-nIbE1oHogk{&cXmmQ-6+wr*Do$_(`%F;Jt$QGRI~fcm{p7wC@7C8rGf6g?iOVY
z6-@o<O_om#pN!H(!<1G^#~h*Nc#;E>mailz_-lPa-llA$%$6^3RM#SIikePZaFe>i
zsLMYSC;=lpD?c#LpC-O+YO9=u5i*4O?0>FvcaQrMN`u!^8w<^`3_UvjJ9u~R?My(5
zTNp)$mdB_CM-9k&tF@wJYwpgt>QV{Zd2sjjd}qnBc?;a09vSiQ$FJ$8bj(Qvl20UK
z6Jb#Yrav+6I=-SfibzEsa_phVQeI67o8(g3A`FgYd}_94QR`rkf1j5jsu#eM#gmuO
zHhKg^<(&Wm>yH;GSM&h_UO`%J-vxVfM5v$RzZV(%#)`lMZuuFhP5T2LH>|9D2O3Hw
zP<+pR((Q;-5{c5%%y!3olG3=q%)b5n_WYS1HzeWNcDFF|!|31;ut~h&^j)L>@fiy`
zX<4$B4`?Fo9Ou|;o8z67)*qGZ;gK85g!UZtS4s{)fK=aFC<8|NMVgVFYviR!?vfwx
zrA&V0y!iRo1BpP<@XfH=5SAym<r(1c-=f+<IW}IPJys1R$gTu@ARx%cGoyJQGLPUt
z205vx(@_%$*i<#IIB(a;;ckSj{L|9E^(6L*@s}z<$qsR|(a}#HCp6f9Clm8S8|d*R
zPRNLb$NhTdFZ1N2bonkvrLLu|gI*ro@lz69>A8Ze!b!*4I%R%GB%><+rc6YTEg9P|
zn19Wiskq%$ani_v<p6XrQy9ycJ)9&S0~18@*|Y(9^}|37ZUhQJkE(6Jh-R?67}771
zzkUU64R-H6m>Ae(a$7Y<ZUgWWf~yA~+4t~aR>_3=C6Y{L8p!8b0Aoc*X;s37=3Xvb
zK_dzjHIx1Z27V@J;hUYW2K~juj+LzO)2icXL&73o);?|npSt|MN5HJ;4}GZogE2`G
z1dh~^jc6SYN;Qwn^+$mPB?CA~Z?l!ANco&jclW~FYk&Dwcbu)%W=ipXLT{s~v=3P(
z%N<L471RPahR#@CxE~5FTWtX4{nTKc{GOj5im_ateZg2zmVw=okN%=X4no+iy8|$9
z47opNcDhH~x?M}I>4vIyxe!6F2gF0FoeII;kCQe9xPNvoNv~(n#k&ai0>5ok!rVnL
z^mbogAbY{b1kK7BitxL42-$_g!xL{{qt4!%P^i7n#=Mbnq4)H@%D1j;BjOXPMv#s+
zyI|dH7gqQj{opF`PpFLebo4mI)k;U~QayP0=g8(!&0m{O=3_p@fMjvxoAyVy&>X3X
z$6J>51=i_1FP$+VNu0#|Ak=<#V!$@mf<R;@%+~sSNaxF!b%tocmyAJ}S_>He-0}C*
z(V!m~8)DLwPNWcEDr7{6xyg>XC@;gMO$04F{{XLOnTxR^^$suUeJ}z1sYAwVM)U(b
z0$h{ze~e@&rKboT+xRP2CzDPX5FIn@tnp%h!U36TS^2cfNSOELvxVZ5U!KmM(I@5L
z3<=32lLHY~e>uSKULZmn9w5kb*9Qksq=&gx4^$i89-z1u_4VKpT2tT~5a`vZpg@B!
zk|FI3SwL{uEK~g&h*3X(Xu}KZN2b`o2<sn$I?Rps4ewG)Lzv9EgSlSI0^eUo*p`Vk
zogZ&jQ;QO{Om8V$P9Wc3CyLEz5)La!F+643NFQ$Om|9$k+(aB6uBFcB!>4$T*%gYq
zQOl!GPAV`j&iD7@=S@yTmuMXrs~JH{uC45w16xTmd<DkSI`1_z%-aV6ysuHKOBl*e
z{%tOg@fAm8Zii$hl}D!~o9vhClSK}^(dpj4BU>2oAG>v56$KFkjY=uPw^yc5{?Jbk
zxo^)t1Q=49YpHz^4}C#8>ZG;jCLchz;BtB&{_;H<IXTbvoYm#o)zcPLw>X2=&$%72
zD5C!ZnD5jq@aP@EbC-<L=pAQ`{gIK~Fby?eT{U?+$I~RN2$dX9Ps;)~a}ox)0+<XF
z!yUgVFpOw9Q+m`IeSAV}a@I@8GelVym-XfTgiU`^)w_GGuS!p0;PdHc%WM<vtTp@}
z;ctgMIH4fcbvFD1*Puyk#VoUab1@h|G#U8$VII7wWT>}GX&_i%j;Jn1i`IIV7n>aY
z&>#L;=!bqLXHdTKQv(tVH~0igsQKC3plcfLsna5xdzE~f_ROlYBTv@{&TN5Am1ltr
ziOnJnnJG7e8A_kfsVZ(NCe&$&hcX?}G72v*t;*wVq{x$)hOD^0BO(mSkK8+&TKKy?
z@K^bz!S3WN0(2|oFVKOI<m3uz02_LEJ3B(rFxpY7gYeBBEOf+7xUSBeyfY&@M;$tq
zzGXz>>G_UW)y6+lqp&0X6%&U=pk(7{ya}Tr{fdQJG`v%ohs{fD-=9oQ1_l!ai-BH5
zhVJi}Xh+8F#aQIYc`ZmCC(id-m7c)&;-Qmm`9X{YEskh22ORmX`t|o~)vck!%rW@}
zViy6%*Pp_gKl+%B1Nta^lsJ@&y~fk6_W#V)s2szZD}9(6A@^;*o+qc6IQl0dq?zNK
zd__3%?f*??8scB6l&8`?7m0ih!`Jg?_txeq6F5T@##U!3xdZojfcGqMwIws-{pnL_
zVsD!-;#lPP46np$ud8#k`q80Q;CZAcH)SWk#UFkGHLs*RJjjS5KCzCt+71?~Wck2f
zM<qH*V}qsVLA?m;KOuHe+hpf0JE7P~w?R$O*%W;Drtn7x=m%63FFG&}E4uCv>tSqA
z_qVk9k&Hs}(~}Ss(|(CKUvK`$vTfkuqU5zr_n3rxdrJflNxIDcVe1>CGYQsp<9zWK
z+qR8~ZA@(2PA0bPiEZ1S*tX3{GU3VI=iGm{{#18Wb5*~q`|WyAr~XqGdY$IA1(N*`
z%LH5I>HY;l!{+qLmWGEd%BvKBi6FJz%rnd8#sNB(xPf4U#p3&Sk8U)##+)FP1$?fb
zx@Z0)n3y(;(=aAp%9+Ib9E=>W%YXy5l_^R2Z*Mx|A1JrP3EHmWxNXkm8XD+<(VTP?
zEbI+k2M<rm-F^rm`wJRKBO4_7ch)dkjdsUN!JQW4a%qo!R9G&M@#Nuf%q-?cj~`^D
zsm}U_BsFQJ?&_{|<*bIfcHWm;RM-}#ImF*A&}-M#H$4&i4CCs;267=Z`d-A2;9_3E
zgw1N`b>Bd14>rq2RAv||rj0!?2kk&|bpIkaHMoXo*n5MBAIOTKOa*h*%&>(F*NtsJ
zMmjD=tsR=-&&$f66eYLxvsuuKz)ZlbgS{Hcu5rw_7?zJA_7QV$v0p8S8n}b9Ec?N7
z+?X{UmPYhTv@=UUB1Xr&0T+CX9G<=P5Yb37F=XaXhdqu1MU{P6ZAxcHo`<V)GEpNC
zEY2O81xa3W0p_w>HuT8BpD5I@%sC>~mY8s|5$%(k&2gNL**0OeUw@)@`WIo^T78TD
z73FfpdE6h-%z+WvG%jj{tY8p_kS!izSp||=;?ui*r|)?z8Bfvpz)VN~NsMvfy|oja
z7BwY7ns^9z#6E!xV*OAz9A0sCXgCnv?3PF-lz-fsVt0Qx$}&O8Ch7vr4U(c<R*4mx
z__&5ANq*f4VL3uj<im9;72Bju?^Lx88?x(Q7u7ncO;}M-WIR{)is!#Ss+?NEM+W>f
z!Yj!KsV7hLCXUbWrf`%h>Fw;1I&eBX6?%_?czbE@3u=;Jq@U||-pj3Dw)4r^Lw45r
zf{B=6m{KvvvRti2a!_qvUZB|8shaZF$8z?o+}PBGAsa_Lv!8~inkrpF_kO4Qy!4X?
zhhEePe8YtH#Tz9<6pbc+w%_~#dwlwWF99?#l8}z;%Kyg~PRGf7m}hWn!)XF?VbE{;
zH6(P$2i^Ve1lspw<ZA)QBqs>__ip{6|E~Q)0#23v;;~)NFmmg8ATNKSlsye;w^i@6
zy=dXOy`r|A+0UNB0Gx8iwH2rAn{kF`EC^un-yOsHQH21<SFEDarvGEz(^_ntPXdOR
zm(kdwo0xEe_&pf^9=b4EQD7BZv49APdK?p@Hf6f|cm4v))c~CEpG<+B8D3Mgb+h4-
zZtJX+V6WR7cbCM$?x+O(TI5fSwE2n=`~Js`SlDUqoRgN>wex!9<+&k~c0-*W$?Tto
zm#QU~Fj3-e-NNlP(-y}^?fWrTXe&-F15Q;zfJDwv4kgA0IL&8m=V+}t+q4y1i;M7>
z8+Ls6Gj^>%(<<dtnkgj<>d_m_uq!`R!YYkwEm@=2uaz5vO_QgtqGabV8>bQzpDU}D
z>FH&#yG_lOz2irW8Y2qrb8GE$+b+#xnrG<tX5?YF_@!JZhh_PX9rE>of_EBG{P+b%
z$HZn7B`g);As+PdG=JjGKBKkP>q)m%;~%*3?^_zW7vLMV7eltukDS@F4t#Vs#|pdY
zUAj)Uw^__q#m-s7v(krYCTL)zb;?I*mLi(BG<U^nxtUDDXtBMf>h2;G6txPuWzf}|
z%&2cL1!(ZG%6`>az#RK~29s{bH!~_ETHo-x1+Rx6!PMO&R8Nv{ZOe?l;NkH0NpTkX
z!+5|$BC)x7@iUNKGTC_W4htB2B$LC4<q*W}5cy$~fy8fI+%6nJV@X)jP(kg5sH$K<
zV=J+M<b$FJLqNnGfcU|vUnN-*rL<TW6~Sr&`Al^JFaqQ8^=-f`z^JgYG*dw!%_xAm
zJ|)GQXaOx&ss8h2f$xU1KdvoMqa%y^K!^zlx|4N4urTlc{&EXq1v6I!*^}5Me1Ng=
zm^|YrsAYIN8jbB8qKc0fz5a64AtMX8StQ%{2fc^Qb-s_xb^Q3cY2BvvN7|<4=jI)N
zt>erxM+#e-wM4D@a_!5Nw!<G%bayI%zczs*E<d=9pE@V|ai^8|R&{d+H}1oIb8jBb
zXm_p4_dA;#F;qTS+-9&DQCAO-$r=VK;fpPQ9SIB&bgtOf7tRFb@41`%6rDu<0To6-
z?0+;TzW4e|OW-HOAjPkd*tr2w13Ob@vRrlr%!*ijMBn!wKfBLotbaE${l>}N?pB}9
zGg&u$_p0CuPPLy+1hKUylu#nQFN(S{g@1q5{W4${2?`KT_+jBS=S2`VCVYqP^ixyu
zNrjEkl%vE)C!*$9Ww*Qnh6*s45|o^9?*)w`%FPC}D9{f^{F9^U&xXUv6J+EOteV;k
z8f@NQ&t5!C#;YsE6MUj3I7Xax$>9V6Zc>IHLtBmtyK1COvcQzE4^4810l1_G0}F;g
zqmdjmMYWq{8jM4mk5BHii1jBRUJ&Dh_9H!@Sjp>RG?Bx<|5-%FK=6T|5Rn&Hz*7P>
zURaqK7O2yQJ(kuDjGs%y7bej6UT_BgQn2bKaTh3*jAlL{`*@)I?K`rFwn07m{FT)i
zXHUbugXP;se8$1|{;A2Hj`L9+TRtLRBlf%XvGh#NJwAT#q5uUC@U27G$Z_hu4FX~+
zDs~=bw;F@zaN*E~xE~PkLo6xb@BZuS4B|`%DZ1vuu{Qgm207%RV;ajOtDfCKhaWOw
z>n;UhUIOB;N#2ew@7@UfZh|Zo-Dzt)qzZ_a@m%7IpPrt!Dwo3)R+Rx42puN=D2dh}
zBqSOPz*N&~f+Sw%IYCrzAjJ3<!-(0DKV(Lb|4W}B!gZ$Z7tKE%{B$b*u6x4cXMgs=
z=EZB?cAUtv$a<YH5E6L*A;`Mi60hw7K_mhqFHpfR70ll8OjtjQS=2d2m6d*xo!gtw
zAEy1PkEh-~%~Lm|md9>1&<<|?_rdPh|B|{l+Tt+1kia$a2{YospI<IQw-MsA?<u~L
zT3Zv!oZ{ILZ+->J>wYW#nq~J1`uWipnzLCQrVB<#<gXl;6M@KpQ31r}w!<wr^7Hz_
zNr9fK2v8uC;DM3vrKKL9)%e+lPxk|dc*#txe)qSVLX8hIVo(6+3}`SA?}u8~`%^AZ
zeGV@%kUY2wq<X@A){s0jem>SSCn;2_eS%-pHm-5~h*pS13Q9uC&{U3f41#qx2=9D+
z6S-}nAh-eXlbp9<{I&<(4R|2agh5oQfzWMD!UlZ`h*5_ZJY$x)pw0<ko{m?VynINM
zaf5s<h$zB`dF8}Ye?taQ(@#v6Gr<Fi0ML(uu@jDeFuFN+H?mrcb$^-uMJZCfT(;Ny
zVO#xK7@3nlB{M%Y$}K1VnjZe_*N)^VOaZathpM>0n*xrF4J{<fDxxCyp>cd$`n#<j
zrLYsX>;P+24eiXhl;RKXal=!bb;<w*x=ZoLsPniZP?jdK#W^?s7i{f_yPWEQJR`H3
zPmo@|P%Q&6*>*L;R-yREsQCf9|2|<>ZWd+@w%&|13k<UMR80l{DwCS)xj|R6Shxe{
zKj;0GO&LU;e-HPq`ddlQR_fF1=XU%RJ%|-7_k}SB6uwX0o9_kp$IaZm<v&B@_Pupy
z2jjZuiT^ZAw14$<-Px@5hI~TP{?+7dq6W^}))$uGGG;eWRb+Gz#lNj(^-CZ{wrL1I
zIdZAuL9&^I$!w*<m5UV0m4FWa#wt|qKeAyYeh*OU?j+5M^|oG~y7j_H>-dsiz4D6|
zH|NT0nOn<<5HVVz#PSl>bUDT_s2lo3t+n5O@9OW_V&LXE@Y1W_4<_ZwddR15v>UqN
zxd>Kkex@6@z_<|3Rct8<(UHnU3Svuh2H<Pqa!U^jx2MiN=P*7Ut<U6Gq0xm29E?L_
z9}B#0{Vr6O;VOykvSUdx5t?>Qyj<}`ESoEF>4U#>5$+Au)?XUhWZYZ|-%=C&HS#HQ
ztM~rbNmD+0Gj;clZj2>?8yc0#?ND7R=DpS?C`~nN3)Z7ulTc+C!8f+0CIGqeT}iTN
zdNw~=uMz(a$@R;a4o&Lc?_G}eLwkJt_)}~{-ai{+f67_t%|Dk0FA@>|T(7T_m?ZN2
z<mc~)V|^<pq;M^{0{PP%v^9{zyEP+jbF{>pQI2$z){>u`@xbEr&-O$FmbvZj*osR%
zrfZJ&&o~}`<Scx(?XTfc6UrpqGMD6^=SJCd4Zn{|u9{`>&Tj{VTX~cnoL_h#u<s@_
zV^9dxCsL?<k~HC{(^ncmW7Bm^9t-NOk<io5kQzb?f3L3OIf^G<V%WL3G;@yN+_UMY
z=FI9g)fH%4N#jFm{iK`jmLANwyh9uYk9aWz^{LR*#S&!jbIxf~k#s0w$WQit)Y^T)
zrn!r|s;|6;Q%vFJ!#<b?6(W^cd0pp_GP)Bfmg#IYg{QP|Fl1Yk)ooz9S9LWDaPyf4
zeWd5UxDPt^<k&DcK`y&fbH#u!+<t2~5cjl(6aLvYONs@VXALDhqbGKT?6c2elMJFr
z-4nhcfgF@9momgxuIU>SLjM@F%VYbjrgTAtIuum|!WBw37d5%$dV+$gO8EryqdNYA
z``N;J#`gn)ecIebnh#q^`Xq|FluHRshWPH(TNJE=g1Xhw;7-31oonars<)tms-UbQ
zuY#uRKlI6x$cnh;w;xC=8$!JuoZVRn86SkJS-VU{=@F@^1xvZTG)1c@z!G9)jZETD
z;|l9(=O@kjcI4fx`pxdM)^dXT<)33j&2qwkL_S5?2StAn=uWgvUKTH;c5o1XWKOCS
z_d7+M>{XkSeMUGtd<Cblqd3t=CqPulz??%7)h#Ro1Oh3jVx1KRVjOf3X*h#W;rM1f
zX-IVVy_21djh)85C*N-*5-NKr1pL?mD!f|{J~YWa38xcdN~0*(Ax^AyW@ojU_6MvP
z_T>^E_p`g1T+BqY&zj-5sZ$S5P8Mt~P9h1?Ec^-FM6V3IzYG>Z<A<wBjx#DEIk6)r
z#)dOOQ$qx$63+GK9^dDIk^t%iNhGx!Nx)$vA0BS5u5Q*JjvwB8@TKCdI=6lAyLou&
z<l@1HjVI)UKp=k<fk$T|k(A_YZ0t0e^u3`c6@!b5U~CvCC!L*C00A5}(X9uYl%$de
z3D_NS_|Q*!AVwG@GK5OQJ~^R!7(Zj!4+Do5M$n@@p~w*K=Xnt%1bzlo2$<_TRsI4a
zPSA(k*SLAqyeD5T-2j4~!E1gZr06_R#?Yrs65+BAL)98o<ku%2?pL23&Q84r{8gO`
zcPE?fCt*5D>ZOr8<;?Y!^(Cwo6Z!(=$W|<eq?@-1@;{J1);6ov&2Wsp9P54)hqt&m
z4Ejk)i6eod6aeJ06H4-!2)o0a`id$mz8%ZK7qOVwmwQ=mpc6H5QGsxzi<5Ss+|(3D
zVvcztJYG7{T%l<8w|lT74ksstxd6SL?PB-4;xR0P#viH!ubJ3SrWfCYnb<DZUVD7g
zIge|h_V)Hd@hEJv?*UYJ*x|mUy66?Lusd;fn==lCi{nLP$NV7+O&Ks!A4q9qwBqGW
zI!eHOH}mV`{<Mpff=S333Tix|%qGkT7Q&O8%%6<~H%Kp_&&7%31k^ZoDPr^1gNMP1
zyX}Mo2|6gLeslNq(w&7X@DPU&e*%R|V=NAu;&^1_D4GBX+PPmO6YuhScsRItxVU+9
zCS!@(q2i#OhGH>TNc+dz>+9Q%TNI#!`pFS3oa=)6cUN~$cMq@sKZn}~bK4#Gr>Xl5
zgG!NsJ&#%xJ{P-oE{|pi5p(Ec8knSaDCpE!Y}JIrCv~A%F%&7+foF=vQn#UZ8W92Y
z?=sME`c@j`<ijOEn3k76asF=%^#5-R-2OKPG<)n#|COM+czqY8nvXqqZ`+XAgbGv}
z$Na?_C`<_o>8p?$jcW`(ip24CppB>#5sH0G+>eN*#=rW)JXNpc^clE@#KdT$vu_{<
zsN#$;5~=EW9rYIJ5cHfB#N)T+Y^8ZfSVw)thT-=+?(01vc)6N}P2N}@mqfw{yteDx
z+t;@6%_)DHHrrGQd)-!PH*|;#NSu`n%QlR)#hyi>H+*bsJOl<CH*%qapl6*#2@S`i
zJ(i;~*|_~&Row32E-O0k<)*cz4|OuMq4n*4qAIsW=NZtUMMOh{3=|+a)@=g6qfddX
zB?iA??R;&y`FA7B8|Ce%_o(H~N;(2I-fS3?9s-aOF&Yeyh1<BDjG$Bu#TyrkQ<pwQ
zmej)+stSYur;=T*?+3CUYuV!rcMIf9k>^q~eM<5nZ{+j8?)%54C%Lk-^~-<cNBCD>
zMKFn#b=i_`zh*A3?BG&-$}+58dwy$t`4d`<PKsczf;+6O)&70uUl$@mM#0CJo@9}P
z(F3JYqCKqjA0tphrx(mj)-~99;U7JQ19$Lggok&$Luz_OWZE;HsU=JH`u%W0#9;8|
z_>@kEA#kwRl}U|1Q|Ej~b^0&XfaKzY-(Cx2fO?>t-7w~PN-|0*<kl%%_P|tiL6r;w
zdH2?x4+F36#PIvktM8xdAK$z-afBRW^WaS-bEr=sK$M$`iJ2gb*YUqcL8LfyRDdP*
zAs6s*UDq-*lfST+bzd>5_1=E&CPQzpjF}2Rj@Dw15{*K5F<92suGK0ZBv*wy;b7IO
zZ?!Bws8zriu4nZ72>3nicF_bm2Ve*n8jN*_<NXUdfY@;Z?Sd1ACls-cB)|wsf+FWa
z4gpCW0k(c_kb<n^8G_AXoCv49D=wR|;hSb0y%;sp&AYDCqF%~-)$-K;pW8s=&YvFm
z4n*Ui!l0z~&9QyBc#B(iI>|j_5<a}FEL_}F9-R%3li!qS2cvPgrzhMYX*-p!Y@MzL
z!}T^YJ2o4(sl!Ii33}+-x-A<ni{Z^!`p{It(->-U>>}|jK+R6=tG7EQsT&aRgH<!c
zjnQ?fr@HOz0D>)C{GJ`eIPqY<0+GZ#FHU)QQC?AIn#kf}yzl~p<h;lRU9%=-=&HVZ
z@XD1E*)aJ=m&b$zA%rt!pDYJBQ1~nnhj<};HJH}ke2d9InZ=Uy<L69#epuKT&|yTp
z@l#6NC%1>NiS3uBT*D18LKdW}-0!JmoMj;@>%Z2*AkaHRiZoW}NC();B<0fn*@6UH
zyL|maBubxAnP$1SghwO?EG4wsksODlec_&9;^`xkj>mHI=Zu?+d62j^R3V^7REmpn
zFVhg<<t%8^uGLb8A;{p@{(3KHii<EYL?ivNlFim|M8nv+wul2#8SywngNiW}d4&TY
ze5nF|0iRuqIN847B{{r5+Ro=Ldy;|gyRX93@44K)pI{1Cc7)f(f{_?%x#)>YAV}}`
z+Qyncmm{SmYg|m}i+Ud`>Lvh%SX&89wk3BPq>>G(8-jU@H1UbzB&@{!>3+07dNZJV
zVi6))kK_Xi6$>sv#i7OuA@fI)Db8_$R%J{&0|=SHHqKGn*n?tjJ+0+mj+i(^L>oTy
zF}wgKW2~9m#0KWSv5@X4iJ@o<Qc}n$Tw6W2)G1#iS5b(nL3k>v3%Kn_Z#f>Uw2BQO
zI=4nRFuyMcbgp760?W8h9ZOw?CSzRius=tj@X5q8BRrh#nX=ne)&2+x21k<&$dYLs
zqt_9<Ox0f>=3s)kZ0NEX)Mce{Pt%K}Kw?uP03xFjYifj-q8swm->(<d(6Vx<p#%~c
zqNBNt%~(Hfc%(}5m*<+cc)YKTHf)u$j3`8bxX7H8Ebz8$eRhWGRAm(@6&uRSP|oSG
zP>)d<bW@W}ChkSkt7BLQRz*ccSdr*IrMx+bBG5$`Tvi*llw5G9wC!wDilZYgSI`CM
zZJ-NjTs_g)OeT~PFjSA|B)B7>qjBg>V=oi<vG$(^0WnJ(-GkaBe-P8%mZi|#W`!=O
z4M$SpGz!dFeGF}&hT)x1Dhg$d$->OLh@**#JjN1z>dhGuj!_Fa*)gipx1$SNP6sB3
z3jTmvoE{!SfwC8b`G#1W|G|o8VT;5!kx%Im9~pX;N_JWQerZLRc%Q8Z-U8*AWaWgA
zQSGs!Wjwwn#F_EET-+$eCB0Oyxnyjx(_@*lO38+HR4?6~@PsDPg~TvMaW*()Y@+0u
zN8xSH&L@Ez3+QE}>QUAa#`43OMi=tYySq!krm=L+2~r^Eh`h#=T5%jP&fbWIRycc{
zk5wkex4KF>XR=n&>~kB)2r>ngW3c>S7<01@HEk^NSXB_=yTd@xBFDAlx(zgKOw)Z;
zf|&NPp#ELOKm#tz0z0fIzJ(P|zThTM^k-mjSsn+PHILxJ2o8?7`p*k#iUg6s^*hN>
zX2f9?c#pYmJ!bWERkXb@!hhF}Q6jrWI;@ihO)bsFwz~MR2xX6s4HeUu(F==2xCSm3
zBdN_?CYysc4c4Sbkw|D8bUse|{o%{`BT~ep93hEZPm(SNY;{Lja|rB{bSx!2>Xct0
zyioA`B=fsXO9-X|0qkgdNO~$d=gjjxcB+sGhgG5p86DNUEP-`zMD1yY!;X=%t)_!A
zYq_*iQD^I@E^AO9dR0Ek`AvTzN?8y>^90(3d&0kFTk@A_=9rzy2rTAF$yrQT%!992
zL^0@2GQqtq4Nl@6@b);7xuQ~YLYnfIYr=_I_{p7RqA}p%<scxCiB#3VP!Le*;Nwac
zE&pcZX#_?O-mNYP7M4Eyalg&veTicZKJKEh7)>O7D(nPpCdsO|Uw<itog3iAqHF4J
zNqnsN&FTsgHoIi@m6T4by!s1gS>$;UkG-S#iz0{pEuZ>a_w~jbkw$cXBw&5}kxNkU
zOJjWJu2!8zf_$g;@uRn@{A`nM+tugC*n5Zj7s((?K$L?4Sb^VI9-t0tw)eEk=7^Lr
zXvFUx%Bpv49m;@76w7U~Y+N>u%GJ}elDI6aH4=Ol;PJKBMV5x-Z28{ZkK9Mq&q^fL
z58mpYlh6xl!(_l51bhIX>C?hrFV)Qo0Yz!PQv3~s$>)gA|9pZz;vUR?;`VW&NCraN
zfwt-(8sRD95k;l>Z$V7_YJ*0Hj)MV&e*?n)Q@*S3Ea<;$|J(9^?f<X;yZ*m!QMGSD
zAW=~@HBlRQ014ihVxUVO6)f-$pM;W0^S(r0n`;DVp^RJPs2A*ha!sNV<8Hfjxlb1l
z3-2+3El{5sp>^>di+e|t7));G;)~FHD%XDDus3Z@lO2lDxf6r!j~&{V%6v`I-jVF)
zkg~pXV=`%!x^}oR)-iGmCSAwBz1*QZ`*udAqmeDs<!gKf6@VY@Z|n(@MgGgLL#C%O
zcW;)ezOM|AwqRwa*~{%o&ftD~({MA`b3m?Ua!r<|!*%aLnDm65zIzBtUYT;VsO-2o
z^8KqtgL1HDO4Hk?g8Od$ur<l=87idX!7w{QZVx#XYM&Cr_ew?u3A(`Xvk`M2L20S1
zm67FcJsr<9MO{2?i>Vy)6HKz>OpD-DXC{|?=~$_2CJgoV9PTc;acx*F3LuhHLyK-s
zHQEJTYZ|-sluafRJ=tz%Y5mmglR?S8gA6c#Gs|RAUYxpAbo-nnWhA1k-1tCOgdn_V
zK%~TFis7VSIXj<+($^Y1_@Nc&*zsflBa{O!g~TL0dzfq5fu1+rz|2&2D_5olrR>aH
z?hnUGs$*)RRWQkjj-}|xhIa`%<dD|EYgvU~(d5ggmwg$Xtq2|lIhnGx3`-esz987Q
z)<xFoRRv)OD}3C7A~_L9gphPu4n8pcsd2O&ySX4?A3wI}4yEhG%YUs4F)L~rqp(qV
z;P<I*p&xwyN&93iYh$|@8Ct0dHN?Wtt5`5`asG8IjiZnY%<4m-$w};=7uue<u+T9J
zCi8$v7aNTwozf)wR~l)E*U`_b(|BKQKdQNjrbbr}+o91L(eaH|3&K*axoP(@&XRC<
zPp_<~Xl2JYfgL~lmwfsWfg(L!wAa#rop9?FHBdcf%fguj*tV=HZ>I1X4fF$%gk}w@
z`=b%?x|lBOFdT;Fm_<Q4xbpSvwD-KsI3}lm-t-3>CSbh9ibQyZE4#;`KKfZ4meSUW
zia%}zx48ha^HS*c^&%i@@<kx-%K?MHjnb*}Yg=2=d<LAMLXz?=Y})p>yk9#0^d;G0
zn}i`@N|QUugI<8O#hn+Oef#KYp0Ur`NZX3$f|eY|-%K~EVay`h7Ob6VQg$^hh`Qxn
zT#2Po?bW|CaP9q8J)-9|*(;L1_5j{vE;COvnD<`<M$y~vM+}m#N={)^CX1YlZb1Xq
zqq!{Xp4~0g#Eq!%HbKlmhqbOqZ+?dZUH`WAk1;pA%k%U1Hq1HJ>fYJP2*DZ%rWT=f
zm#n`Emao?BHVlobAOZFUIP}9!)8s^4TPwv|yG*Gj_l?t6Be7H+nXg>>5NQ2I<~trA
zU7NCUHnfJsvosw|b?rheBZCTTB9&CUY?#ccC4inj83l^bTTxnNSJ#sdg<kVw%zuVw
z#OTzKLBzcb>|~_7+Y`7QciT}3{Fg<xi1$ke+KpExW8p+aXmsb&n7J}5(7&5{V5C|)
zhS=bRWrY*hbRc||9PfU&*JU>FHX}H$+crXDZQLaV#1rhF&3i~P0`g3wNnNNaeTV_V
zz>)xN?4uHp*Yn_bIM`*;jjHi}7mc+SvDll`pJ@iHH$F0F8|UlhY0WvkFQukD2_D5x
z$1A_2U2M6#m|SlZI!dy8-QlS}BFOwd4^6|-RP7pv?;r$Ds*I&0?`HBVUL1XFDqtZ~
zfi(4;<n1T1oHea%*BnXy{YAE)Uwk<VvtJyGR)u=+a;+hlZ(M>2WbD4xO?E3#j)TYP
zbZ*0%MCN~axGpepPDo~%N>8WC-(Z{|b`nwO3=S7X`*Z~uX-H+f#R|Eib+_vPbCbe6
z<GpR44_|~=g!55PdDf@=^Jx5W<U-!v8s2o%+V-PK!#5-}6w~vO5OA0j@#y!;iY)XY
zp??&bcqbLuW2tM$W$;oXhf1fe9~j+#HfbeGm}8R=B4+;;8eA#aQc!h~`e`sIcskpu
z|4#{z?UzU_u@`TKGIJ61jNj8#40=m~mPmjAodF2$`om)`)9~UTEDlz=q>#KEKXH5{
zGC3kUPzh8FksVD5G(Q*{N<}<UXhT}gR4EvnAYCXv@iY?`T0El=!x$SUql!8pSy9Al
zGYDYOPY<ufG$$e+PLD(7Ul4{9N#&o<T2>J$MyaNTNSxhB9xA~AF&KK6l_wdV7ojFD
zByUlKWmpgo%N%T_tD;5JWHBc~g2quUxjU9hV*1Cl>-a1sdrkF9O;PQ?mm(Z299iZv
zqXtQXjRW$RNRsK^wTDogj7Y{tPay-Q`~AgTv4&riw|UOfN$k37yV`KcQe;K#^^1S6
z*1~UGs`Kb6tI)E^ReoKw!@aEnhd~sv(VZA}S;-`4tT9AQZR^-ZBY=#AdMuW4y^NQI
zg~ZxZUz{{%@|1ll7&|U{fveqMI;N3)urhPGAkJ%PL90bOEh^#3n;@TPs?M9#b|fc~
zm9}mGeeXN(Ro7Jr<IJECbb~x>mSJ$<T{<q%p2Hd$GH_f+r|IS?ra~b`Mnv~YvMOs5
zn(D=-W(PDrSXB+q=cZAr%|zwU4>c;_x~nk-c34}C;J<{QXNV(iFrAf~HM3GXnQ@6f
zK&NYG1de#dAOfp<5*bfXg%z<OK8mAfWrfhi?1`B|@#2%j3LS?w>`)MvMcM%-G1;2y
zhS6I`DtJ__Fv4oeBvdr#DK2Q^bkYWQ72Q>w2k_=T$6<9|hqf`px5O2N54X)6T_+gq
z{8sG%hZPlyM;XfSK<q-Tdlo#49odnx2`xf$w5>TK??&-FeoB0gZGW+<i-7yFz1Fg1
z;rdmwO)6C(;5Xn#3NZr!3;;tx5e)uM4GaK;a|i>Yu|bT3u=*n!zC~dHKw>ZmlHmAw
zB4HpI6udE!P#JT)6$%wF7>a8nCOSSim`srvjf|Kq7|<t)GFQ``ew<a+(sBf6o=sum
z_~&uT+u3_r#-x9+$Lj2CgfqH2x*N}K20`bK#vWhvWPdXWUa-46wizd0Px1+SRd<Oz
ztWJ`MgX2c*CSzxdW1A&+hdQmBri^eJU3J%D%;trci8Ba*4Id!H#um0wdV8E@)*xXn
z?@Y#BXT0zw6WsnuX2s_1dBR9@N{lBJ)m`FqJ*!FLcAVFPBE=gqnD)*x4I;C~b2eZ>
zLP8=*QXpwWLPAqOZ3O%MkyRF16`3O}Z(Cd9@|WYMmDvO8fxZTaYEKym5}Jd~Fl?C-
z@i<;0B?;zv)0$lA%O@7^YFjpVtp&8X+4V18X-||eF!^#>a-ULE_C^ZRz}C*qM;<>{
zWaW0$1m+io*7WA<H)CYH1|4j}y?tA<rg`lfpyjbkj*XM^-il^w>iQLa^Mq#--k+<g
z+fW>Wj9RHBFa-F}m;D_Ar=wIvmvM)NPHVB25?-6)n1s3j#A~`~Au@|}c11!i5S(G~
z(03Ffr9Ik>8RX6GQalE2n>AMt{(R(FW*Ch`y?i1NUP(2@HIN$VvUFq!AuvRg$aIt-
zRWP7nVS_vM${yZX#2)ps?m?W21`cA4;Ox6|xS$nNd{;y87)c)4V%5Y^x)yK@1_nNO
zTGlBBSyu*y{!e!-xNZBG!Mb?Sn3uQ^?<Jq@TK(9&0|O|H)l5{vR3I<B3kNuEIFWeb
zUd06<9$rL<f+)JFbd2Z&fM~JC!L<a5mWmxM1V0A`-&a?JHIfg)6rlK>)#Ii%O~T<8
z1}C(Hfk9W13teMjt0~DUC#Hc$?!z1#hNw+g<}dmaOTx0vHz|hW3JW1S#g|}(e_N1Y
z5i5;TqZtWPCu3JwNy0NR$78|jM2^voQcN;KMg$503Nk<k0hCFiA<5M?{Vw%v5DR+Y
zeOpOFXrl%Fp-FFJ5cf6uIn@~v4em(<O3^tiioRU1Ia}GSH?ouR|4JAf&zH$URdbYD
zbD?onJw(~58G-3>!thzf@ez>~9GsBQq_}^ZPlp;Y=@l6&3&Z+R5L)a+Y~tiOmzQ@X
zP1tZ)a!&<C;A1XF+SW~_{OlemmC%97!Ag))g-o<@&@Q-U+0~hWh+fO?ZojZL`aO7u
zxTTVYCx>*>Ac&E<{8LaV08FL@@y``O=;F%PIXHD}#pr5}r`YgN7P`N{lpML`k3%<<
z6>F<W@c}UPUaR1BIah@_tegWqg%-c3({Xv<n7nFaCM`zjD!i)J;4w2$B9B-hc;(BG
zXSKIee}gGORA0gqCBjfeTm&VmDnYoAj<8eOfP0?}wv!0JVYW6(Bv<aZn5PF=$YBKp
z7K5CP0xr`cT3F85Ojf<Hyk7uK`+u{N?Pc|-ymz!^DWunpLvGYv`Y=j~ylk`{Z!@nu
zQYRhowsWpLa$+arxx$F%S;Fw_>)Fl$2Ur+Byv~;bddOOv->_d|(!Urfj-Hb632>g2
zHd<ToQwxnk$(C3{WAi!E)ET(jPoa~Wn&Bp%uWWXkDW3h&%s^?8wx+R$n3^l(&U!GJ
zCTl-irb!);eGkQm$K4E2+OhUeS$VfkG(DWFy;{6gk5R0*2r7~gWrUoJ$RhG#uGJl(
zAs3&eJKRIb<7-K~>_@-Mg=>Zo_94~VaRO$tD3bJFBO<*aDEeUtY5gztdZ}|wi%DD+
z^(??sL6az{0)luyih8#>tk6DNDU^`_^ssYJslNlD9yvLPMFp9>$ZdpPXyJOiMm8se
zHdrEJlm|iN)X!2Y5}x}ud@=hGTcE-{ymepKLDtYH=@fT<@N1u7@VvqG3?zXH+#O0u
z<k%$ezkE}1i0!e=*9DE?XEb$QNqyjDs~Z?|FjWJg9^orW3ZfyXL8u|%hLLp=4i!hX
z65(lW#_8+l+TjRCGYIU0DTy-2Cmp7Vmg}ondibHpLzz{Ln_#Iin3X~^@tZq*L%(z3
z=L2)&aH=m1Ls2C*{3lSb6=x!2bO_NXQ}@tFa&drs&%xP;5{m6Vu}>*z$|4x)HbE!i
zMGIGY;?stQc)=e&Q2F|do#3(zjPYF-LI`!0<&X=cpNuEN$otYi10+GHu;rU0tuQcb
z;zJDr_=9QJ@e^|Zhbm@NZ4e0HiD33bQe;BQtvF&xcO1KwKvH28q543CvC_t3c()^u
zJVY!s4J;w=Nq~VNNZuc`K!`##GGHxoc~v}KXnL3-Or49(>@6FyP#in0S&^-jGn1DA
zM`7DuB856~V#lfphAP?b=0q$rE$%cdpr9fuk!YU1*R0m^Q)hr&5X!W?4X_a_4Q(!y
zjo@bnZn}CLxr}h*lcp2n&qix%<Z$L7bj>r9Atd?+i4FlWSsX#6!P~h2g<dD@PpC;t
zi?|s-m=6-<2@eY)fmJnALu%c}+^rqs@(S8d%um+oQ6z#@i{E0XANVJP<0Ce6oGUKN
zVS~BXZi8Qxgsj?qV*8N4u*8w*IHzkR5pA!swzm|IZ9CzE7wEIXv*xT8{Oxt_MyA-C
z2NA3}iA#$$>=qoB^EHGx)C+wKGp1K4HH(}A*Wzw_U^}%gS7h&-9yK>hfiTBm)Y7nN
zE%gx9%PY{Dw^uO1w(~I$mADnWSz7mcbRw~HpiFNvO+=bsl@AeG>`HDeWQ()SoyqP!
z$iy@^9{6ON?LGDFotu?BhGK%rn5l>g)}6iPyyIM>B-N|N5^lI*mbjL?!Wh5jT!Yv!
z(?iU@VA?YBq;(U`YGN5>?{8QgVw^eK2dC%$?xA<g)2iCuPRC@S!ieN&U@k0vt>=>0
zJLJ%)R;?4@xn=Q`5?CcmRd!d4y<5$%D>2f635R)i@1yEZ2qU&5w=YMMj#(ndoQrPY
zU8$JOFkiUJSoaLj#mB=i1y{5r)F)aE6Jyd6!SNfhjZEX*CF^1t!?dLs8Rr=J>L+hx
z0#4Y|x1|h_yN1QA<`QQe9?OL}SnU`PeqO(bIT!274SI(cEAohqr{|wV0uhN&fDz$q
zEWj8}Y~$tVlN<&<4YQJy;$NNTe>V!?oAnW0RHUd!yJZstV}L|F=z<|-Md7O)GvpVX
zqsT2*T&SAVGjdbeuqjLK69G;bWpFhua{cOIYx=#hy$=<#Ff5ibR=Q#$m06hiWNYoX
zu;J9Tq`&dVS;7n{bYNGq3%nc~GGwNY7?v0&@ves_GC~=6<SdqP%*A#FmOj5AD#Xk!
zTfErp9rT2_)R0>(4;JDW_2uQU)}gAhD4o}M1!nxJp=9Fk3@1IJ^<Fn`ekT5AnCcA8
zt_-7D2u%v2pTI$`KWo)-JPZgFTy<GO?^#tkv<M);233+>_Qav%26U`>tZ$#O$2wEg
z%z2mUDQH{b?E4+<N>4X1T<&=s9UAUzohgZOysxhG4m8!oBTjYy^OaS)T0ksL&r<k`
zwALKZ1FI1t7Zzcu=Pv7rv|^3`0H8%1*qAgel;n6h=?hKJy>KG@B#*JCTRn{bsuUhx
zr4Gg6FU=`4MN(}Sc?e9dB_I?B<LE<)Ka5YN(pZ^mZ;%55BcYg@MTH+!mv8{uG|cfv
zyd6xV!Ab<j=nqF)NHX={!Z)46Dlv6o^94NPXDofeSuu<<>(vAO(U<(OK<x#rt}t*7
zCsZ~z#LliL_0aWpj?2DNqdB>sW6UeS(Gp$@LrZ-GIR`Ero1`j=P-AmsmqBd?sI}rk
zF$&>tC5IYzbpmZx2#${HwEOt&Ew6>XCS-u-#WJt=<!oO(sUK|DKK=2ugpXs=@*gYG
z#rz4vXbE@(JR)h3kqzPd>yP9hkHr-mCLC%>VPG&xFbP?3Jkv4Og3SPxFzUB^%eY4E
zbRP9S!1l=x!_n~=dqN67XTjr|U+Vhu7(GFw40!LqL+PxA=kc;n;m~q+1qnA`u9-oi
zYE+HDJnQts8ZgPyVHtn~pJvk;JRVK0BQ2TjDW=7I5FL2W6#4vnBE~+viM5GsR+n`o
z+d)udpUyfAQjm&RNLW$j#oizQB&@bE?#)|OWZj#W*Ye_`b)=5A_TQWIHWdiL+ggMv
z%oQp!#@xNBv!DIOmy(=TAjFiGp}ZgAA)|9r7_r}7bhLUeBF3Uvn9`YLxhwnitdi;T
z4vQo*=JUmYH!x-ZIEWPMyVi7M=@4NWYm^+(BX5j*XS3>v;b(%EMS;cA&EQoSAm748
zf>fa@&`Fct{51D`{g#{Vhf*P~MAwLhfPH6(CisF&_QZF|T>o_qmGHS`O!%jdin}sx
zsqdF51kwlL7ga~Uo}Rp&*nWIdTNRqDG6MKU9wa2dQ&AWs;|*$a=W2>^;v;v)iAb>P
z!dZtFk^`9_e}5$f1ceJhzh$Klcg&wio(*Z0n+P@A3fJ95%}a*LbhCnG9x!{xrS-^`
zY8KUV@nh82g3|k=ybf%{`%7WsiXaB&BkXw&ypjnbfRCYfh&lJ1yL|I4{+>-#RJlMA
z#|@wC^kOgW-Y1m#VwoUd?z)Uh1uVXBH3UAhlY@*q)R$pL$h~z+^!~p3BoPPl_gBCB
z4+8s7g+*iP8Km$+|J_Tz@kz?)DR4B;9>U0zq+c$5ylTD|dK*T2dC>>cYJ;WZz-{jA
z09U^~6?W0baEGjn!RDce&HQ5nTjG!IYA_;>3R>OX>Cy%LfkvKmK=@x(_NN=r52T>5
z$^s-st_?yW;^Siw#JyLF73-6kPtWa7MQ)hsnz`cr&_!Y}Xs~!lEHt9(?UMX_297|m
z>#GJzirUJS8r2K-$^oj{eC;z2Y#}iJ@Sr_|k8Rh+M~FpZ?MFVxJb`+o6#VDL9w}UI
zLBba%T_^k(1?yXel~a*K9+^hy&a7kR_qX~V<r(<-jWv9~1T3spKy8;QEHm&6Ho_H^
zMA4#EB&PnkhGnURKE5OUn;Em`=oZQUyV<T?+TeBs1$L8T^?DNbJL&}XA{Fh7R9zp{
zO^rmUdaHR%U=Bg?*Au=&B#07~r1;NploPH>go=JM>=b!&yD2}EF~_AYLhxo-0?LR`
z<lsG1nIgY4#=>7Zl&#m-E3e-i6HnFQtNPrn=g-SIaRB;H%|WHt%Kh=jL!pbDgeX{=
zn30OAlw^{8HVv?lk>ui26<&m<c2q}JC(_(%UVY}X<M8C28d9w$Tv}Rm>*~&V#Mb7U
z^&Pcpm}5qa%thPhtc((P(x;@h)6g@3sOtCcdNE{CRp9pmNd-w6yb@<1xpD<b<y4&q
zqr3h$x1n9UK0=PgTL%5Hl#A|YQWu!EHj9BIv=)tA6jjo#Q6H@F1v;ZH4tr03)2#P`
zeC^Yf^T-sOR9|VB>0XsL<~zSn8K%<kgjnEl%5*!4B^thZTP56(2PFCf%k^i7CUQS7
zzf{`(sx6nWRH6v~_}N8=LvL{Gp5RKrZY9vewz<z@HB?$?o++L9%-;|jN##U!N!AdX
zSxE(Nz^OnKQmeSQBt0^+BNKw{o;4RW=iCt@z)k_nYYxTxht#q>H0a^4&%#pRgQxU2
ze=*SOvqfFdsd7M_dqwlxgks92n7pFRN0e2_HwPc?Xq-Z{W^n5Cd^fjk3yFTdjN)eh
z9ojh&7=(=gX&np340oe|O%`^j0FqzY!Q_+o12OoXKNPpd7y<_98m3{Gik*^?g5nm4
zry#q@VsZC-m9VKK&bGF`v|MD&aCv*L@WBY`$~u+(r4fOWbS@h#nLjg@#>*BNJ^*N;
zxsCDX!6_WtHde@@&xy=tRY;M@C@i;5>$Yg^;36pB|B3eEUY=~{P!VMS%ChEaSw3ya
z@9o}vJb$7*agMg=%B0~VokGG)tmug5rP(7?=m&OlP8=S8r?2#Fgt*pEQeb^K%PSuo
z4(OTF_-8-iHN5aXijmNuVy;NBM_lCe46!&vUKTXUW)Rib3#GYT4-FS?G4>I-j|ftZ
zGF!6p6BDj;@T0@x7;RkA$f5yzUN=r>_#Bss>#8qxSwzWhIO%?#TQN-lh-F^_j4d4c
z-o;u*18XM;oE54M>k0iW%;v-4tq~&xprquYsQO;t^-GiqYPj9I;Bj~DSgY}N*`tLv
z7im_gGA!fcGtB}!$0Ld~jDfv%{G`ebr#855x`G<zpvXk%%FnnlKotl!WFlz}j!6lR
z7H$f4VuS7+J9$9IVv_}PJZGJbLd5Q;Q!4?$qT1vP_CG=9e^ND;iYF?Nlr$j0!?|^z
zN%Zv5hgUrd?s{D0;b*w0ap1jCWpFU!(VUDv@s-g3ylw+iLiZ!Tx?g^jGr*N35)}S3
z{xj&nsVzCh6U&v48dZ@6kIUEOvE8qNQ&mlI78Yh@Yi#zpa>UG_5md~TNu09E)A~=+
zkBn<q@6y7p*&Xeo;MuKXTEIl`4Lm};zuP(`Vv%6P*P)=~1L0?0-k&UFK{cXec|Bog
zi2J+3FG(IT%(BsTIP9Q_P0%|C5ZnPF2yS$?q|BvTI&DGl6qgYkj%<SUvEafmBW_|C
zSgEXCz~xsY@hs<tD@_T!2s2qZgl^dw5(yAlku-9S&a76r<JKOwsuadFMyw8_txRU{
zKL2as-{Nu9ytu2=F1|tqtc(=NUr<wca+$av17XT+pmJ1YgkiFYB83o~b@ALgg3|}h
zIBeIR1v=fmuj$VOT_8V7O&;Y<dF2>gcsk^fGlJsZSL8y;r0<CRL{AewH=ZuoVd8IN
zLd4sDv^7bQwhlmxP|l~>`vBK%LH+a?E;#%yK+D~UZ|5X*;7M!o6n3gKBNhE~6lwD6
z`o>Mh$38*d5IJyOrUQ`mhlYNo<`5s=Rk&_1(;UJisKJq;!G#7d0OvBXt9OF8z9QaG
z4fq#EyhlG_I+<>^G2%XPV=lFF)o(NLBDoaS?O)`YGhn&;a_+H-RB!LT4#2vn_e-$K
zI)bP|)5%33H(z`Bi=LT3_Ch2DFqdcWT(4{I9%}yZK~1>eMl|`@7ff82sltLuQYWLS
zoQOh-cvqVF2?mZ7Upe!7Eou>l7;$8eFiTQ-^T&05w0?BriaRqmO7Zfxn+H@(tIAnV
zywi-rzBi26TKXW?vujNPGxt5h%@lLCUzTka>2&MVK4(x#0*ZS<ELS3(Bg6M|%vSku
zs~Z?rCa3Gvocxq&Z+TzScb5L8-*D;rFaUR!(N;gqp-u&_1-0k#W5L&_Nf41o9Sr_`
zkVIbQ6=&Z`q8a59tKt*GD+x)a;5cb6!XfwjHsohU*kX@B2<ZAmk_pjBU_keD%b&e{
zfoAhPNl~le*jx%!H}Uf5a)(|g{xFuQTmI5VPWuXu3WYHGETdusuf-GyT@(eBi4V03
zuHHm~F{<VL!_k_V`C=fp8iCNsUr=Y?xd2{LlnCbyhe`fc<t6ce0);?#8ipkU6$PIx
zCOJqWk3|@?Kx%RU5dK=>$v9UPbxX)BR0>k`yV951%G{B=^^?zY9T(_~sW5VJ>RF*u
z=7A6$eN2B6e*0y$G1wjCQyvYO(i4)0^HZM7@t|(+gV$wg7#uD50!Cly%`I)&{MmLi
zA_`-jBkalG^j4$$3MlGUrh|~u$ovm+7N^NEnxiVAxkY94&p$^#bLeO=9ST9IV(ZV`
zJ~oG8*b+DH`VeO0vX8`jvu?k^;X7+{k8Ev~>c}cSzNA#gopOqh<o8zD4@n2Li>Ki?
z?xZy_kzoI~11U%C;W52j1|QIp5&M6YoR?p4A2>m0+z$MfAu&SZ_)<^(LmhI|0(z;>
z??^Wz5XC!N8<i>CKqY}Wh6X00WJ-TBhj*iMQJmPH{mq9$6>e$q1b;bq6c~u4azy?D
z3JL)vwZG$*LjpBRTAnZPZ3g+ddPBrKQ)r{f#2|C!jnuqcUUgv#=63SaDNgZa1F8b@
zc%n@8d`1N7Z8ry~Zl=kK;nOEV*|om02-&|oDpxA1SoSdfKG^hT^NZjEi#C&D0+jLI
zo^wVC3Bfy6h6rDO&fa7anZ)x=#u%vh2TZ$0%?%;}IUbC8nJpP?0YfCzm^#>jX!s&6
zTuGqtT@m$&rHX$EqvFELUIG=aOE|+^p_>Fnz=?2CA}-IaWMLMP{-}rQB`CiDk#9@C
zsmB(d%|AalTY3lvo(<kDmczVL_MsnXiup7mZJl`Ea);v}xwhd+{{a}dVrF+^jw1Gz
zyeAPxm5@VJ{J8DY7T*}uIXyUB&NgJnlH;nM0?O&lbE|cZCF?Yy8m>$*!+xoOWTPo*
zSo{zJF}EmgYHnF~dNRlJzUhQd|Mubm>}A_fKNw-AP5&s}b@cqunZ;n@(Tkwz6a<A#
zH7F^?`8IHBGsR(}nxkAxN6uo18iwdrET12+uKPg5XNuhoiQf3llX82t`r_oatIa(`
z5srI!<d&SLmz)!O<uX08f1Sl|>RMWOR4WVRe6truS;_)aEry52>ay={iw`rDen6Cf
zkbnv%TEH$cyVlK9Px@;n5YIXnl;S#Om1du3P6toGXa#G2GJox0={JMo-kM;Bd>9g9
zTR4nEJ@8NNRdXR8h9!dH7kT*;*N0Wm`;WC}J6&JPyqBgBYAFDnST4@h#maE9{iSA=
z%oUqkZ}8)XQWFP5T?m5CnDQ*|O|?uw^v>Ml<qCXv{~@Ikgn_VY*bP3uOx3R?!P9-D
z`*ZU1A+A8smLB?0*g~rPydNtl)W@@RseP~V%7gY++`(^ha!nL0?4ZG8A`wNy!GU0y
zf6JTasnUhtTu*&ZFFyM@F6D}hsvo6p;l_S|+FG213I{9T@BP4W{YY<Re>AII^3}sR
zuPH9X3QzQL>(@ENE*Pqt;J_PvcojP?7c-eS<CFmGFZj$!d6~ZN)`AY9(ODG87odqv
zqN_tm=VSkjU+9%%<BM~se7^`uFRvu`*J2{hFweyo*pgD($$@-Bwn~Cp&3<Q`HGY$)
zl<B)73D6NUL4;p6FF-HuB&@m9^wcAN{jjK?!-T}`jS;CmS~YL$)@={%EX9y24>ZZu
z`k3XOpYf46$(@RFfu^*+MgC#P5es(c@5lJt475+yBt->HOec>90Qyyi-{eE^2qt7H
zepdR)`^lV|POE@~DU-<9g}KM+#|ngGn-rdqS=$vS(CW#Gwm8FNM<X9xCjEElzwcl#
zFniEO=J?9#?oG~3*es6lt5^XU)q6lxT+bNDmX);i;oXfzT)GgdxBchxHj!{Km`>E>
zy%OM_g@ALm{aj}J*JOmZb*>-~!kHy*XUSf%PAD2u;`z?pgM^x*R2SR6NVcdSXYL}{
zU{*ARCUY>BI0KT+w_l{-6;VcHr~NB30&bzseSy{OZ-^ZzkRwQ^a=IgAK+8GC3FjU5
zi%U`og6ttB2)4FRW|jC8dgM#|-tu!IM1yANV<TnJ;tQ-R&_G++;^;uJA3}^OGExXx
zpGc-f#l$Iy7$G0A{NT|vhxHE3CwIf&#L!<+{Lur?L0Ts5Mu_{Sgt}Dz-{z-B8~HRU
zAaEc629P`(!Ah{H?MlSb^o%?g87-g~h!j_M_1bfIMa%<7CV(9%DFw3~UYg!@q<ug7
zd!{mMFy?mE2WCJlX^hpKA8&2OlG!|Ndt|`9L$g_mjAFxaL3#P(6mQ{uC(+p~E@p3!
zBg=S1(7_^5gg@QHwP?-K(1pjt1OQa=NKq>;d%cZZG$}XIpbJS+tr^L~*I^e3Y{oc_
z#f?Jk&qcZ*Wquj$jQ%#td_GWjbX<xu%*}1TR?57Z#h{~jzS`%+ruqh{!LyR^q(68$
z*)ZK1#r+c|cpzM73N>KowU2`~lY0F3IFBa4GYq|QDxPo?pgu8OvurnQ^1CKuX+^L?
z>7I~nw&`d|r2qnV^kCwFcL9&9Nv{k>LM{ZVv&TK)6+(0-O@smemK#tE`(Q|nzcGs|
z`C81h+lK-G2Z%BK_?3nQh!D-^;;^`=X>gfU{M~WU&Lg$!nk)IwBb)gzp?x0|ikEoY
zV98FHhi8~QSi)<O!mcD@ZYk&p+SgFf3kLYEB4!;!Bn%cjir)xToc`Ue!K{(!HLt1q
z<m|g%xM!TpbzsmCKN~DUNZ1=Z5lgO22!bM;fw+N*kjNJY^fl%&wxLk{Ary0Q-&6pA
z0c^K!(CL2wctD5087a*cNujQ#AUhEf?3qlEO#w791f&Gkr}tPdL!B8V&|)>D+Y;Mm
z=MF|BNRddzf;^AM7Jx2$Fd4&bu>kt2^+mDlk5u|I%7!{$$Rf~cUce6oncfbN?0qe-
z(}!Y%bBjeHo<GUv#M%Gze>>EFZUWFBNBx~ggcbJ~z&=llztp-P-IzsEsh2@pCQTX@
zz3+w&sx`4bx2Eh`6C6fjl%`4Thxg4!HNQOMtK$N-O5E)_WavbP8%cNz|KC)rv*-Iv
zPT!5ch0K~9*8eG6Y0MEJ51iX6et(R0(`JkxeG8P&MwT7a(ITI(yGC6=E|^Cd_G!_T
zDKU1oH2=2lY1cHWchoQG|3iG~(>L_dIVY6dBcCPtYA^Wd``rHX2imp}*-wuG2!vi4
z#Y8EKD<$fK)xv$(34Q27j_3KR+4?Pl?kBMpa$dy7$@TL&8{0Qm14iH7q3KR|jhyI;
zo}yhB)C07FIFUZI6^vgQUA8e<{*)`;q(y;RSgmL&cwr8LH$v8B=+j7e(}KEAWDGP`
zDA8W_q2Ne7sBl`-g}_-INd)`@Ek3H5ftem&wRKdpV${B6@K(UA7S#@LbI_o!VF%yW
zMi4y&dr15U)?IBPmkhOvl|VOsz8-nQ{<|9A6yPw%+sKq^vKiT!+AtQMXAU{Ur!!h8
zt{sMxux7Z)tKv+!@Q8GMbXiBPa4bfW2Q@-_Bl1_Lw=2mL`5<N=E$~~RN`Ns_lL`iN
zxLk)36ag7%7({hp?frc<yLCXgk8zI)XnGL*_6QsQU$wXwO<m$NdU$6>_Xa7MyOKa^
z_9P1+hJ?|bzzcKjHr9%Lbt79^1;&I31#%*`L=psp0kyHc`1@TkL!!Q#=`b?}?PuMy
zr(!aJjmVxJYigSIMQ?BoqS=JDreXyy=Y6pbcFgEUnBcn%ZfS4n(`2P*|J{oJ1LeZ8
ztjb&9(|KlQS0UM$Nsc@td!zLAW8O36zO#vY@J{$)gKg31T#<^k+WEZ1r*z{xvarPn
z8Dm^Ki9W)}m&N4TU6!`$P5uLVmLX=!$7i)b=<c~~j!s)U8>2@=mJFQzV)5U%@W~kW
z;xy?W3_jBCF?sl?$;zfGidJCRDr9$iIDd{w^8!v9N0BP%o+FKg3pW0f_mW@}u{63^
z$)oWH1NSiT!YBHgFlaIcLW5nQ2m3~etrCma2tWXxs#4HK3JVYj7G8tLi><AoiS1n!
z%Tz}Rf-1#Z$}A77j8)WXsv;rQKNz0Xhzx9^`Ob<W{GA7B&G*$VT?lbXw)fSoRu_%l
zGv>F>w(-79n{GISHaix?t9_!x{%F<7hj(G_gJ)+->*9+1y%_~$bCn>Rr6jlJ2(xRJ
zqe@t~1(|&oz0W1ZUY_$T=ua)`xy7t(Yrhirm#(y8_0_&INpg&%+Fy!9uRQ8AtQ{$K
zXJN_vp0-<4z<XTG5i(4T!Y@4aF?`(9`a17suiJ-PNbvc6J^0!m4(Tn_S~F2TwDCCq
zt=X7tZ6bK|-}h=HEpEg;6AkDe9bET^ATevXCRu~gFa->mk*gE6o8;vr7wd<s|7^LL
z@?l=J)*V58jFw!t1q5b!n2u?UmEli&qCHa;Mmk$WUwIIJNF4vD{eln)C<z3G7(x~L
zeov7Pz<-d0!6M!ZgZ<$!KWq{~&etAlTq95zFl{-}r-Eo?k|2O!=ZEs~cl7%^yxybF
z-RPsI+w}P%1E`ofhe}y<(*POSb`KZCE!1R00M|vEMZ{x)$&$fD3D$$!K_vk!r&yi)
zTs=>T=t$tf=x};AufV)J>*(H)18{%_X+hKduYxc4?A|rG=t2<}*&;k)Row+`%pGXk
z2ajIfeTHYWzkR$LnO0EV*8}O{cMe8qP?L%x9C&#1hhE${LNkVfT5~JK)p68jjVU9M
zN8zgTtfqu#QH)b$NfF?=gbpDgirLr(bj&el+Kw-Cd#~VwEW;lUdiWRXfd0t~3hRf!
zwo#7r959H~qV#lfkbEhzh9w&I^10u-W2W$bF@o|lG=ijds*)$#KAo}qSJ1*6hp{2d
z8k4fz1_{QEM|aMhV5Fe72iPX>%gb57gKCBZp%G9)#Y*?miV%<y$`FMp?G{&<S5}cW
z%R{z0TIgk{KKCrBj=&y%iWr7D-<gEov{bMn$SaNnEv1{Y|25=|H&1=Fw7I!>R(vVl
z-3T~SZB_MZF;C}F;|HDR&Yh_55j|L{+{BG*>-5Y{Smk#5n}ug`JG)FLBHts&@f^LQ
z&$h|SeLLJs85MBO8Lo4c=SvyqCWjFFG`z+qWgN&6j~N8RhxRp25tj+e_(vJ1Q1?lJ
zy2q^7UTC31rup)3R}XYFG+cq871aY=_);@Xn}|IR*?16A4MSajolXktOyqB85qXMr
zPYMXHXXhUK&HV2u7;oN~jdE@qeiD97rq<fK&PuD=Ahhg*G>jb9N-(LWV;IIN#qfJh
zF?d!mDBLVXx4bFAQ4tXkL`2d=!x0e>s)(`*h$^ZguOnuQJsixuG9PlmzoUD(=|S5!
z&xDae-0>c+2F+;NpvhO0A$r7A{C8F{u5}nyO;vb{9Ajl{1!dI=SS<ujF?;fL(Wou3
zv9KpUAJ~7p^LjTff0`i(AScd8PWZfY9|2l`7!rkjKzXx5Yy#n#fJc$ICPvQ2!1$5r
z{ncECv>$Ne@&)-%VrX3wo}a`(4NvcV{_dYYuhR9MdKmqky)gR(V4x&q;(7e~|JE65
zW#HQfH5;8>;6_jshBd;8KqGiYIdZE8R&H@KehN>vmhW?q#Uz)}I_>=0=as?em^nFc
z2GZdP%irteG4K{{vXjaBdi;r;?NlrvsF;2<pTrV9_Y{rjN#%lI9Luqf%Y8^xQ62c?
zKy^{VQ@H#w1DQnLu-OCrgafdG2q1(Yl<oro0K`y)C=Dt!AaF+@8n3aPvk6_*N4o(5
zF->7j4vURDBHUiDx#$?qeexCjmaVqd_@rCD+w#`4<|aj23tjI$H>Xyfa&O*HDHUXu
zwdvd0?doz?P5V>@D2T}+Dp)FdolWjXfl}8?*&u5MQt)M`rB+a8wd--E2|*4qxySlb
z14-~&r>$=Lf&eL!OYRC`jAuz6?eTgyhsElzWr<Z~bfwe0y;<qTW?j+vUgI%9U;qd}
z07uC^t4rgyBjtyIu*<Y&u@*RrIi)a&f(bF`nV}_sg_cZHf3dAAO%(8rLW)f3f6_5V
zbqg6buH0;KBE0wM^8v;$JMSZFTE+%LzJnVjeB&VXx|vg0PL!NxV`Zy3EF%<9=(UWn
zdO^JETjfc}fC}ijI>88!Ou<CW?zW+$!WZqB133{vx^!>F!{DD+FKEmRz)cjPq!~w$
zJbc~1CpT`~(~RF$^5&-Z6G{sXqta5aM!2j0u-kQx5MlP*wc!2Kt{#{A$<)e^FA<EL
z>SCT>5{C@`PGj=6GkZk%KEI~K-<JMTH}jqP%hnaa6p27&-XDmzY^+u>gF3#MiHzo<
zMkD6c)kC9m=|&k&Tlyv>(8FE4x6^hXN++f*8un7zal#QL_C=Z*w(S=|;X<&qghzBe
zfC1r0i?+{9oXE74sXwch{_0{nI(JmW^6B4wTBgMt!H6R&>iaozy%U;5RI26sH~g6^
z<gb@re(s)X;uhwxQ#eqUzd0a{-tZL?!jLhLiy%iF?{4TlJTRpP=|>8c#017J4!%w~
zn|*%mcE`R5^GY?1pDY=jmJLJY#auc8oT!zSQ$8GZQ%y9}O*GL(@r4vvuLaLmQi?eZ
z2cV0jU5A~n`FfnsP_V9b-)&VZIq&Dpx*e^X`*w4`6=Mkwu<Ncn0iB%({u9seB-j<7
z&>!plGDfM*`uA80Ovx~cJ<61^+2TJN8H!}B%^fTaIx(g?Be8X8J-K^6eenD>+H^ZI
zpA!I>;kg%H-wGHs+0(<}@qO;1+1W3(G02cYMlDXl_4~dW-lxJl=e`Yutcyk8@ij}6
z?gi)?<W8^fNk#ve)+U_oEi_O9W>nnw>Y4zFB1$IORB^*GsG12BV_JvQX`zlm{lL81
zps2Np2n^z3x62>Au$h=|(g+Q{-Yu(*OU(IPeSQpwcKz-`-U=>u{DJyBS40yhibCYo
z5es5wA)hvoP}HHAU_=ItFr|qi2!jGlAedZ8afW4ZWpXG>3;5Nd2+T0U5)ag65=8`n
z|6-5^<$jeDYuNDc&~>kb%+XI<<>GRB;=z9r@{86V?qSFJ3H;<mViJgvO$mx*Xu}pk
zW9Swk7{O1Y5%2NrcMTy=lEL`MdIR=@^0cYJrywE)MFc1S@`FyN#+Ar2)lE+wKYb0F
zg-DBt1QjETgz?Akk<&3Vbvv*#Q2W(brU9SjaycuJw7*~*&B{ZHfe<pAQ$QFmEomlV
z7-kSXets?TH{++hcvI~Gj@|Eg@7L3+-(9803@VS}5dch$Y;{#Yv9+b@s1Zs8vk!;v
z30No~pz??OLu5n<+0=$gK^>o?+3fWfw_I-gL779}LcDc4T*Uk*2}H%>S*Ds~M}Bs6
z{Cf|Ffv$BV3BEz<&I)B!KcMIQ_S(7=VxL2-X0IXoA^-)cNs&PN?WsVvg(^8&*CU#I
za)mozS2qhIHO}6f)+*a)gkZ&S7rQ5{MXK?&X0cokiE>MyyF6t60Jb&x26l9kGHrA-
zH272)r)X?BGcSbUV_mtuII+|I$u4s<GTO*817OPt{m%ayWQ^@+Ho-#w7M>l)Ebiz|
zY?o+*&aB#tXq9o4Hvi>!KT+R)Gi8~W&h@jAQG3ml&A4ftzvATS(}I+wAqypAAxJ`$
zr6@uauxiR!Izp<zWGM<ll%*+3Qk6+<wL%q1QX#UKLo+gpl%UKo%apd;Z7E7gDQ))R
z_t5d_5Kq0^pVycTaE_orCOm7_rF8csDgb8V@DIFmYv?tMYMfOl&0oX^xX=K2ko18N
zros|R0VF6PyF~ax(|NkXAR2)~pavX<ABq!U0|kRwTOJ}ZDGXg`L#J7>bqcs5bOHg>
zy6Thyq~kLOrM!9ac)oXcM{tD9@d3`f;S8C2pmq0Fz5a}4Gaa672eaTd*xSkJym5}P
zg1E5Fw{l9G<jN~tqug9(ZguVkvJ#*Kl?g-w!h)Nsz^-e|{pd+L-f@tVfziy-$dw#%
zuNRLy6J2Zj@ozDP-u-`<mm~lK#@jDZnS^;0Mqk`*4bA*NeZ^ki0A4Q5@g$T$&;E)e
zfzR5;))r1XaxL5pcOALvqv4=tG5kK_0hsvLC+g_>&IdXO9BW;OpvgId*<fyWpAqK$
zhXCMlC@7+WiYPmUDlL*uof1iQ^ME9?gMGa(^ZXB~e|P2m!sbuu_eIq`PK97)hro5X
zf6M7~sInOaU|A60NEBIwg@%>NsaCoYm{$raA7|n>bDN3!jH1y+1#C=y(?F=sl2HW%
z5pktPAx1%1$TferOn(gF5ga$1KGBy?{%%)=Z~F`eoN&UYV#LU1UWpI-Z{xE(@M1ql
zvOtUp{;-~$uz3^|4O9K1L^+>iFuPV~9c!FBG*x067w72D{OPofBH)~tV`_56A*4Ye
zdMru2;f^yIsT8XZ0E4`uaQ1kT%m5%p%nWD@#|jn?qo)2Z^`IuSd<}{CzG5HyCa)WX
zX;~B}47u{?&7L$TbB3xw6qHPvhXBKnrol#39vXmEAx7nBL?Hlv@>7vHcBKN^9e(a?
zw76%>Vye=5W8vhzRjtw$D<DyA)!)YD4tsJN{bWxhFdZS)g9o*Oowz?1XK@=W8RZ)|
ztE!nLIjNx$0H9kdcx>3%vq4aQs59P36#LwP2vI+U_NJ>Cfy5y~UaVRoF?lR1uMkM4
z?*6AecCr1px-cOL`_b2ejRZ$U<I3$YHD^tj5gabkiyK~y+#*B!A`(Oi(sA7~`gejw
zKeIiSv5S{jJNiRRjv+Aa4#T*0_3P`kd3L-PZ)^Dd>+8c@NLW=tfe~ix);X4|e@{+_
z%pIo}-S$6+!o)HLc*&PPhvS)FH}!`9U_yJm-u^I24~yY}2O0Md{sIhN2=oybui>_@
zr?r?EMTTawZ_$aRLo+=zULyC+(UrUd0TL*k0?(~IIfB054T0c}D0@FI@$cmyaTSG|
z{dM7tfV1AI5Ns|4CXhah+YZ{@*ImJ=8uFrsM1e*cI|S(-0Ym^(?CHVb+_mQdP8tbt
zp@*~-7Zh&bJX!674FFw%?qNWj$Ia~fc;uOLu|V=WYk;Vx%pMsx9gk7rl~FR3sDh@(
znFv0S<>B^OYpv^OpXN9JyXroxSplS4BG<3AHCxsI(wV=;TEQF4GB3+wft$g2h>puU
zT~SGq4V=uBlxZt(|Mb3x&5GtBY=CLm=G(WsnZkel6W*+v$Z<_T)J9!ve}cXbXPmlM
zmTEoFgmOOp=}ZHloJpyWen+E<KAE0JRThhIyNjQO8EWq1<+j5>f{+PDAXvGa9g{fD
z+sX_`2?K4*ZHe4!sp(~kXy{}Cjq?h!DnW6ihU`_9f#Lvi`$rdtYW0UwKfyrIgdI9n
zBhsi6wW;oRYNf^NW-xm*{_!WvI*cYVy;Jzt(ppjST%*&5chpAz>~{2Dk2P}i8zIc9
z5ugBD>`)bzGt-|x7BB(@Gv(b}D24KDx}S?GV`TmAN7p+`w+JZ)a(m!o(J<SN=chk+
zvv6SS+?(&A27_esZfzLG5?MMLTD=l^oFFn31JCbKn2vHOvm53S3+2mP2U>UjoO9v?
z`$zMAl&R~s=%2OsjxI}$y{n^(<*FE^BoGPaf}?$3oB>e(>jV~*azvtt0vPCJ%tVL;
z5G}6Nz5)h2M%jzY-WDZzdzl9F@jVq$syI~?#--|INoeO`cPwJz_Dxiy2Ody3pV155
zof_<VFQ1W$u%UtAhq(EeZ_i(+w<aKmY~NkUF#TwDJJ=rr9+W4oCZ=D9w-B)j@Oa^V
zM<Phaddu?VT{3U7x@1gCh`lDbpOK8Yg`v>41X<Z%wH$G1<s70-sn^|ll7D0y$o_~A
zK6n2=wXDN^=y(u<WORD$+3l;YV<j|pkfdNxaEi*608mkienk)|7S~%MIFEDhU_HHA
z8Ye~F`5qs%sYC-{>{Lc6QM-}Bff}DpW;yk<ICbIzBvJGw8&!VJi{KnFhEfFxl&;N>
z)1SVGq8b!a!*(XD*~|xgl9m{jsDaQ{g-Xi<5*Tk#;6S(d3>gvB{NedO0|BV6zXltv
ze8?^eB^4SR20}D-F4!iJLUI&MGSuq=Yx)I&uP+pj+p_!yZJBVHu8!%s%?dBRS6pOr
zPQ1GKRLXA(WZBD=ecXD-Sa?ixh5FMri^A?8Op6Q(U$sEra0__qRuK^?ARVLKNJaxX
z44^D?=`6?3+x+?c_w)Sdbr~ws!n6d0$W%a@^IenCwRe2krssppu8v+gMv1wHGwzhs
z#VBHl)>APR5Ce}yRVg(Zhu)~c?(BDQov`B_Ph!nmGp}y2<Q=S?e%`h~m;*DiYR2*u
zr$OXC9v5`|y>aZR7O1G@>xWfed?GZ=M*Tbod$s?p+V3U7R*HOcgiOs?^S@gv-qkd$
z4NHaONS@1Bg6XNCC?8~fQMNXoNtQ!Dy@;+k+n4-1TQ=BDk|7w6j8WY8nLUDuq@l0)
zHj8nc4CT7l^$aPlfnD?^n2ss6Ho}_h(Y2o+gXLnNO#NTGSfc?(3mPLpYE3`k{h5D%
z<cG^5`MaoXj_p3Sauf06v|{Q?L#20I<hAN2+dyEFD2J}*q+Fq5pRtpFBd+RR{<_Ta
zc)Fcw8Xbr$|0jRVPFlsxSye<;dI+KUPeARDQ#vjLg~NbwX+fzV1q8K>9IBrp0}woc
z8a}F$IpH0Tdxr%X*jg-Z=g?EEj5_<+Ao221+dxzTo}~hXRIrO4z2)ADiT54Fz=(M&
zVd=rHJP67{o^m;eb}Lt7Yqu9;mNW5Jf;lNno=fHd4ZViTULIt(1}Im8`iMu_YYI$3
zalnT~e7+K@Zv))bxx+CDsD?^wR=HFf6ajk$PUH3(P7{D;&bbe9yoZpTWjqLJDB;Mq
zIY#0Dg-Qk&EC?Op2qi}q{Ff_+5BAEuH|TPji0C12B%t3{GjrgyZ=+k$LB#r?y*o@e
zj{oDUs<O&HlL&={NueUwM|C0T&QhX)PBmc6D~gAiRu)yb)@O?Qb&^kryw1w<J|n}F
z=A!_5N4YZ5o_r&hp6+%rUau99n17e_Z~cEORaIAu9BIvxM#(`iGB+(^3bgh+R~KfM
zknDbg;F)JNZ$FY5h?OfZ=?6%awSIX3obNulh7&nRtbpNifwY9I)KdbKnma7$z7<5d
z-c1Qp$0Q{f+iIntbW>dq6lANARTxFQ9gJaWV#`3s7mGS)54QT9pEIg^4sQ;eA8L0e
zI|y^IDIxKXhDT^Vi_S)weg=XZP$Y=x%cZ*?Q)gKSP3Q*4StWMQj<IHxA%lZDv~sK1
zI73EgH(!>f0=!l_lwS2s<Y}#H<vJNQ{3-@hf4$#CyJ&w-D8Fr|+p1N53A|^8A9rUX
zL(~rSh-yK~vJS|;oxACtzD{`KTZYwM)n)!~Yr!GcbUx1P@}k+Xu}W(?fV`>_2j0E(
z`U(vni37gr@?F60cY`;Il=-#N!1N3&l@;?<p1<zTnCwMS6`QAe8&6Kz(>XpwC*I$8
z-tO`SL(E4{I>?KN9pH<PeEo9e0ptP)I1NGfrL#mZo9rrjdA@tmw<F`lDtK4fjBY&d
zQswbKhC#daNn+v(O}JdQ8Q^(gzdq5w0i=+6soqKWy+xf0fJ%}g!^F)wY-B-K)=Zy)
zM{QL(mF%Y8B^^XkLR>(B9OukZlzbd5wLo02dsAShFl7Nx{;gx&5Mk<8JGmFJ>IEb~
zj-&-Sj)?nct>9orn|5$_!j%k$B|#QtRU%8dpzs%;YF^IAeDynS9k0*Pzf-E=@x!yK
z6T>T2$C6^MA~+uN(1u1D)k}y>DpYDlV$#oIec4@bdO~+V4*u*~J&=4L_%N_cAxv4m
z`FnW0v}oIWHTw@AVfyu)y$1@@zmfoEuPXv^AWP#mg)hI=(;6OE4ogTJl)Nitr)$r*
zOY5<bYs=akx9({6o2DHIf6k<n^REaYH|a)EGcuA+CQw>1b#4TUdSJofoUN_vQg&iB
zWf>}n6lPhTgU|N%Hp^^pWYKoHQ{R<Esp<tlw7^tqVEx=(j!YUER#`N~D2k^keNKu^
z;KmICf%vFnFh#=|vGhsM;dwz(56Y-F?ogh>lIb}`JM35ux3dsTe%9$OA%2`0C@7zX
zP<V4#&QDfl8SB|V;P<_K^{Cp`%BO@CmM~PJ*EKm=idn&CM$!>qYXGB0+UoW^L_4vR
zhA>_l>YZH2fUf#RUtuRrKQD|Vg4MG^u_Qo`gIU4BH33cxi1XU69R0Mzx|Zj3q~P8n
zn}AUf8G5RhULjC18qP@UZev>or(h#wR8MM(o&F`4f`I2Pn#-y#ULPkhnHpgewgJKR
zbwCdzq>IK}?n#W|_S+$#j;>3XXpwOZe{zThpkfutaS8CY@yDy2ill-@Y5~7Pa$2wX
z!Gw4}0^#gIK}WNS5|L2;4ryPzhKF-JyelS%>6-D?RH}Rf$N+SdNpUFOYH;lFp{b(F
zXW05BNgqNNE`>%U?7=gza3}#d9T`<K+&rHVGidEI!PmGaGgYg4qfwhZ0r;2{qM=<v
zwz>YzR#lg7x*paoEkJWuWNT0coy(*2=gxEX-)+A~?9B$s5a<$MFK1#zFcK!*`rWKy
z*xK*tg-*uVA7#IXH)(L=y@kKZ*8Inl7H~m9PCA^xBz1&AvmUxP7fEZFOb1O(m`7H7
z-UKty^H?=BdqsBB{4;m@qGx~OKtFFgPtV)(PUDUaS88>|2C7$GP%NJ#!&;{D`Q>2>
zHXToU6@sEM3P4b1RmzG`E0uAf&JH6<5Iibb`^E=`K2$~%%J#{c0Cb#$BdA`SXuZJY
z($^Ofd2!+h#T==i%z)5b5&7%J#OR|!T`8C%xMD>ry@TnbHaa5?Efb4M?1?Y3LlEZ&
zkxXwU4FuwVaMg}{(;GMDtZSqV;=%6rYjALWaEb^%k<dn$6d!H!yz~$tj^t%ZoTLFT
zQ&Yv~ypMfSrcEkA@BP0I)yI#KzgEjrGsWA(Q3K2TzwxD2RaI40RaI4Pe9@O`s;a80
zs<jJ_$D5-%Dypigs;apU(enh?Z?GDB^Rg{GHgt}UnCV{B=u7*;CIAFM{r#Z=Aocqc
zMLa}PfE4*X?mZ#IGz|(Ae!XvBqiA*F%NqBgG6X>6(JCI!{P<^^^U8gdK5!>ii!Dp3
z3c~$@#|}|CIc9_QD4EIRUqnuxk;Plm!B>XA=^+c$eAsz>p<Q_jlce(+d#0j_1~fI`
zX(9lCk_QnAk_dXhkoH#D{)s!i&<{3!pEp0%jJMEGaD9K*pUay3oOG&gs#u{Jzxt0a
zd~7iN%l*kujDK&}85$n%uMMB@L=VdR0-{1BNCGNGXpkfrD254=SU{kNAr?qjsTc?s
z0{xmCkRNdYKf?f|qFzK9000bwaZ0&VFX8O%^Tzl3xTCwenogX4E?j=E+o*T3K<V~^
z`hxI5`|<E#?U92#NfZ!bkpC(?AbXFMz<s)WMlcrYP)L808SDS*qhEF-|0zH5YyQT9
zulwLecz=L@t<ZJI#E@+U8I?!az}_+oY(I0p_-`0sItO)yBE2yjG#uC@whb<g2Mhy>
zKm_ao%W<MPfaXK6%ACR9BeSD}ul8W7=!aPJ<7S|fAZeh~84)xcjBM4TEJm1ujaU;z
z!8v0|NkbWi(L4sAMwCwoM<q_O3U8G$Ksg}BTUbzkj%emnxWJ=JxYtaA4(wd=O_mgq
zMHvS;+%#mCEmS37QF#T0^HjsDIk{1==UC;WxLPcUnl0oeH&+U1lVsGYG)dhl(xf;b
z%O$xmNP>)wGuA*hMb^xK&N7rY9i--XA$wcmj_nXl2H}N7(hE4uGZ^7QmL@@je%v;x
zG^lHKwA^R$xaxA6PQ-G!xePT)9Vjx}l)_+FeIt_;MdOnMJ`5FRQK6%`Hhyz(dtOO-
z(Q;^rQKN*!(`e}xZMGN?j3gY6%V8K1G{hLrE;ZA<F8AJJX;6?n(3rG6v5aT>QMm)D
z)thU&i@GXrK%tyYTZ<&X!heND9ucWKv$lgow4BM3gVgJ@L+2sTf$0aL4-0EX;~|d?
zj`xP<a;ORjp(&DKiHM*3fAGgdQ_mA5i<mQ5I6eLNi0Tu5jx|6&QQ*jMZ=t2{g)$C&
zY!1+7F^*M53U^syB^fAEv`lj%zEB-H;5@V(vu^POr;VY}wuM@49T<hvsn$}=>qSRW
z1S#Fb8JId`h!-KHC{uE}BoibIlO;gFp6TwAspYoDAvnnJIA<6g(x&n`W+4C94;C<;
z^*hcMAmm{w&Ul2PzM&*fwm^aWNdwk=zvKWPY(DSi{(V1>#k<<E(!L`7!Y6<L84&^y
z3P6wK+v)tj$J73N#ox_?=P%Tt1GrW`>cwU*Qmt&+_mzV6!Al2>79RLCp)9g)*|h5v
z{O1pYlv!uw>f7OW*ks~L;ZMut=J)(;nje%tM`GvBxiJ_|3#!qN7}c;^FA@q6C>(=_
z;rWM;@*o0_#D8<*L1V~`h(FM7eMDCVh#-U9eT438Q;>X)Pt1B0b}VdU@OLEcBd~_x
z@x33D4Ao!oq2REO2ZOo6=xjOIlIL^K?05+SgSh359uFrjy$->M^ZuU?u8jEaw-`14
zSn$2)!XyAcBmk2A+#g6Mq)ht0PCG72t2C=HB?``hRYmny69(oos>Di1=+=uqy*e8F
zy88rE7z8wtr$b)fpY)%__<RmOj&`3W>kB%*RF)PNm-LVPHN@Lcz2*3*9nOg?NJJ(X
z0+|sMB&vw_Fs4cJ=8I(I%bSk>7ewgWmoG+z$n_Av#r>y&+C{`&sUjcTLZSX|u=~OY
zGw%;jL$x*3qJPu$m;kCAwujZ%>^ly7bK%p=f*ybUwRO|)cT_W`H?G;*_vbJtp@9sl
z^v{de<NmB48U8&++&XL2{Um@u|K30$(gF991r^)ecG`S|0&)NcD8e`)00sjH=5g=m
z`Syq`C>SDN{76tRME0T!|Kx}-fFLFapnqtpe4qgU1`uHeL5zbSG7w}G20(-v0fPew
z!6?fsEG)|$EHf+^!ziWoAF9RnbpYur<blY@F_2^iLJYycj0`Z01`G@%1m*w{2%$m+
z83r;8fXG3RP#FRcW&;KW5rV`RMiCfB1Yv|=;6?@*Mgs;05sGL;zXTGXA_K8eeSN}L
z3+eF>^zHs~AJStZ{Fz43lm~tk)GKoZsYAOrS!dI?q!ZuO+N$ReehQ>{b1yQEPx?Fi
zs{Q^{*DsyE_lLpA?)tC)H46=%)n*fzfEaxOyV&7-O?p6bGR5OEH&+cwtPyh3Q%Rfq
z+-~};^q$rx%Z;sP1G_a;!};1?4Ply<^&u-@@a<&@G%;%o@W3&wjpHR{fxDU1X1%Z9
zqc<dfBPBcRzr*@^>p6audrN-iH1pm+<SB&y7%Ha;Na!2TJp_}3LAmL~-2T{hbo{qv
z<m26obmMkAFgd;Xfkbi18*_w9V>R0T^=t;HMF0nw1+54~ZX^h+9lY1{WGU7fQ>P9l
z#*?7whj1X8%=ZlRL13Nx9fbeh7_bwZtatGdK?lJUrGTu6M1z_F1u8s(rh;5auMBjV
zJo#)O@XTY=BA$phz%S_S5lKNcM1IrxK!$ugPc?tb>Z=*DDpp|#c*Fri2?7Rofpt|}
zL$td=Li@>LEB4hi)j^q-F^*O_qlr9TUs&M*gqT#gbw{WDaQ19NJVF!vB!9jFoP?nq
zk0MuE%-k3va3ueFk&Oc^UESwUpW@tzHjnv@+-kH31@%YyKxT{|IB~crayw4vQ3U`!
z=Y_ra^@5Kb4&Q=yV45~cbXP{z0>TJbUM`z}RS1w3X%rxm2xyoP)(ePFPGJ#oKlna{
zDTL#@?c!}8$YJ6eF0<D#4J?_M&RfDI8*T`2jC0Kg7>S!*j0g?74lslc<Cv0v$hn|F
zhJ1}EpYQ*roc*CkGabb9jT{W4{XRwyv(p`YC<Ys^_IY`r0O+_GUIO?Kh0t<)y~Wr)
z?W5mf1CPNCbXXxPAkhcDb#Q~j!adPOAMbPgNUDa1)xJVNBEaE;;vl8R3{yK^&EEqT
zlns=Pqzufdc8G%3AP+GIqKt+BOff2V%7dgHfdXs}ahL_PEAbiXDpZG<jr?gu25AS*
ziY3T+`?&?t_JM&95j1S^N2G_CGlX*7BpFaZ3~U{k2Mb*i47xjSP;Y*E-;P)>IPdD!
zPa@wdt=KHXY>klanU4_tkEcz56FM&?f%&^IF|gA-upQX$F={Deu?7lm$;1x7i{A>2
z7!FA!edH{WxOW&+>Od$%iXf_*HpZa{n{-83Aw5|7q%b=jc7f0l>_$>1W$qyA?dm)p
zTgoCLA}n($B94KvjiB^QcI~K&gOuRS7W_JY&&1I@JyqfrZ5r<OK&S{e(c#VkA)sJm
zBLl^!AvqZ`T%17m%uEuQzz7Uz7}mpwnQ=SV`TxGAyqJd;1)Db?AP}4<B%SF@>*SlP
zuQsI*vrLH)UaN$fS*UlRvT%fw30+`v<_(7;Mm)-QC^`gRto*Jb`h8fR7bVlWqxE5g
zUU~7+8Gys=Q5S*MB6h-THk5>tg#87c*>Ed|$){gMW)MVB?_@hY_pkB%Qy1KWyMxXq
zCNIP1r$)rRzbZ6_;GjYIj>JJ%$OK_fN)RG=`1D8O48JHD@SU}`iWxmZPb>nE8MbS&
z{q1<MAi(A8!bA~r!kwv2wFNfC+$OCh$&-pqQ>H+e6(0MvSYtv`JqIE+Mr1r5jEw0v
z1?nA<`oA<w$@<!==t{O!1N(bv|2jXY1o+;@m`wM{@REN|^ps?tK8y*8G5d{7=l0}3
zcfO278QHuiFl7Z0M2BDq0h&6}!`~D3kx~>yA4YOM$U}q&?dlvg4|MJ&c)|YLoN=BH
zVT$-j{Xf})bi2&N=7<-eG`o!MT1g-f0Uo(12sm)!=J0Po6;Ggpema*4$k+bg?7wLY
zgWRxB9f3>2&?n2p+)A$;Vpe&KMpu3AcOaYML;%UEky+XkL1aA<X>a26zxq$~pDi-;
zavE`_r>@0>lWb3+?r%2W*lqR<reuW35KDd5G>YS~+N846tgLejJUh2}etF$gifm4c
z1IbbpLO?vhXOt(Dqu1(Hqgb&nrAA9i#y-4$Xi?+=I}DkeK2FUB!yGZW_F1f7xAJze
zT9!BxQeHx*#nf-)dG2<-bI=|qApF~gFCByx9W;^-{^Qxx#Udtys2dMcqXmcSxV!~6
z9Zx8TqpCl&p*Y5oPuf2}Md~5h)!qXgAr6qaD)veaiDD4Mgvw<(E++uzwKf<geyutK
z^hxUuYUc6$`-5&E9nc)Y@GSweFacB~R1Wy}xKL>zK^g|lMcGtVK%hYkLo87v^bk4&
z-~fcC270~P?D;T>#Gdg_)$#KkkFT#DV<gi!+8>uL)6jm^A~1JOj`E4Rj&PVcPfxWm
z!~Fd__n0vli)5C-WIK>r3*S&Jj#Ci>H+3ooNT6xS?vUtO)*+D01Ky8**?IfxPGx7I
z(VN=|!bCqw!FUk-VGn5|v|ot^AFdZr{m>urV;fIW2dN=$;eoF9p(sP>_UcsbH{M1-
z`{3Xa&UPedj!?N8wn^U5Q6`+F2edaaL=eGK;6UIxhJBg+zn@2D<nO*i0s4B!m0J03
z3pJSyFs6k@bzzyhYwf~)4~9ptZ7Mo;o4GR^;dH7;N)?NaIVGX62R+&v$eJ?SZd;o!
zeBskb!h}qajl!Cqk;+C}B{2udRgv>^r#aQ$aI)bWqn|@Y5rg3e#c&f$6Ga#!>=le<
ze1V1cVj0dZgah(r&8O1MF74~hM5?B?&*f+vCUYdmHZ7pM4A4;L#UL0TSd0u3up&m7
z*EL`}FW+|d{blQAfdU=AR9)QWWhM>OYTK9-RTMjj^>BSR+T)RqGe-!tD>Z{fVrerp
z6ttQq8Gv}{<+;4+RX;@A8sY$N(%0@8=*<UlftcGrkTwNnoW?$SDC((*$q;>79vz$v
z3Rw(auWO(HiALgK5uXUxQl&G!Fp_El8#`|e&J=#5ayc;u-Ij}fgdNHV;~d(rdKWz|
zBXA+$g#UhI_6L`d&<Cl5Jif(VV^KMZF@;<eO0+^qSdi45Ypn?ndNOOOuO3?Lbk@4v
z&Zq>vm3213B=zSiy#b9kO^$42Fm{?kSh7ulvII?e&WT@X>GVGBCI*ifJ9!}z3PfNY
zz)YK@>ISeShfsMgPe^Zl8@;_8Kuw!o{vU0%;#kLDpKKK5WH=sJXdgfv`Ev?WKv2Cv
z_W>%Mr3X?G;hT157oSh*=pd)GfB@j5^vZ;TT~GPIL=QLd{Mf7I@&Ez+xE7EOkS9ae
zLGvFe7zf~xrxE-?@75wiRtRUK3Je<+AjOw?28OU?BuRz`Q-f!84-cH-DY(P{`=f`b
zuHlJLhk;R?2_X#3EqL_kX(ogGzQasrY248<Y~KF;{H5|{eRVdvi=+9hN%(9go+APR
zlW<~^8i2sJEpE{Up#N$O+8`A*C@BCb0t4w^r20;URq3lLi}PLC94A;cuRqLGhL95|
z3Ep#GDe3Zcp?@Lft--z-2v1WW9#^Cuv#6;BP681C^g4vxE<lf?0|Zby7@|%I^g0MM
z@#R&&yWqp{`*C|=0O1Gq7tRd3_;07r$Idc22h@nFd0;2e;bLU35IIps20&Cn%!eS7
zyL<T^(}BJ{K_a_?oDWOu(z+YG!6V{>Lj9%Ibs+mqcMs)?kz|x*`vc37O|pl=Toywx
z_YvNL8y=H;%xL6*Zv)%!JI;7$8zc?;<HpLCigA~6%n67l09ZwV-Xsnk)JF4UC=K1+
z!`z!p`wb@M3mC}6#tI1SAlsztzy%-$EoeJ%?fQFP<dHh#qs8<&A{#pYtGCO;pG>BA
zCj~U<oW09ICNqm-rf)X&gDk@Ev7;Ie6P}4bzQfGGzfWgc?vp*i(gtR@L|MfX6UO^0
zGG3<F)I)>GEo(E<W)GM&vikM_*>h50RG2W~#BgO=;K6db6a`r_!J9HN4uM_4&=&&N
zVc;C5z*>bsDR6iU88X<(@_buEkp@I_B@#HS%4%?7>TV>eB?t-PVc%i6cpGVa%u`p&
z8XUp;{hA!%t>Waw=0<-#Qz?-68%AkEP#eOJ)_44`$hpKRdyR)c(08VAqKDgvd>Np^
zc^K(jPS~=KCS)_?I32B0uwU2wztQ)9Kl4j-HMAO9XC>s6YCbuaTx`Lv44z(-CHF$1
zK&rbE@dUtF1}c;RT=0`1(T>ew4E{_aFiuV%Goqf62tp8=2%2G#0LJwudcqwt8-2C?
zd6acS^KuT&$agOZFOP&KD6zT<K=XtQ4=u;IK}{I>-pBRFJ>lpbgY$<Uif823eLW5s
zW*=tDy}YJr<LWseHOPV;buXW8;Wp*U1>#*vH<|@2pIAajY&hBPaJz7obd&~gN;$kf
z3#N&EwOI@TW3j=@H1}fG;Q;V8%LB0qgJwA(ec0b}Mm95K+_E-;v?HKln6S+!^ow(5
zTyAlpdv<~!wg5h<50d^U^9fJg3I8+->PPXw{gUZ@=CE`x5&$SZruyW2PtZb$kr@*G
z#jcw2XBtV&oJynEFceddXa^HP+b7uwe^28AkpmroT_bkvPgg8s0q{@f!3{<y>aCa^
zi8nvp)ELN6h2ldC`U%2_fAExlt`I&$rS<3q|C|TkJ2w{rfM#ZCL&`<}KmGNk?I2_V
zdLa*r2^1YQFytYE?f`9Y*~X}w03u>X-Z}#IdYF!<d^-*PlP~C;==`NCzp_nk*qc9n
zitaDqG*fy%S>z<DM`{=OwLe}ti{wgFC{erxQVp}Zk)(lLjcnxiu&3Dx`lcXDvX#d+
zYF&x8!YPyP%AiK__1H4L!D0#SDcj@5DI(g-3(;)MGZfs}H=9(Y>2l$PNJ%;GCNg+d
z(VZwoh=)iJqSEs2*(0~3V{Uad0s0%TVLwf)PjI(xHg(a{m+Gr}$LBxsVAqr2dYhcF
z;@xU5Q7-cG)KGK87n^uRE_1zl>tJ@#qAMJe9XMwmn3z5dm*SX+u;Z=Vco-8BD9DC$
z_qXF7oxaXo>u~w~XF>aZtL!As;B@qKPGK_1pITTuVr>qxgwKEP)WBdXbGaL}7|q84
zPkG~YIk~ydc;2Xeb1cI9+zP3s=)4Zy{e~B`kDCvHt(`9yW58$`p?f_JkyN}kNM4^Z
z1LuHLs}L-6jA5cu5kRmWXv6CB6(NqXUpG&*q9l@{bk!bv(=-)CQjdd}hC`f;ACdK;
zjMSsAxKU&T0YDgF+9xkDM&MQ6Cf#@FK}`CnJ3F&)W*?&8AwnQhWbwUX_A}4y%Z!YV
zEUq#-)wAYv+cB!n0{Gu#USg-$Tg-aZVv4sCg7MZGB+=_gyBK72Rl-#F{;Ufy%ACTS
z6s7&!F$o#kVb;a~cEjz3*Q-W>H7v7oKvNem`0m&ykQCT-bnljsG<lpHJw|#6NDcSm
zctG%Vh>Y(DYT^nDx`5djMKak2ASxID8h$_kKd1YALz;l6us!T|1Q>cl2ns{t?>U~h
z3?LyS^h#7qz)9{8uK?OYqe21QfzMZWK4?mTAV8%7K*SRu%2P`y1p*YM0YMA|kQ4z4
zQixmmy?A_nN%TbJ+!YGB-_eC)bN^RFkoS^)(}^V4e|6@pV0jQvK<*(SyP$TS8N-e<
zOwE>It_;|hJ5UtR^E=&$J?Fd6tXC}n1QG&)3;-PYX$<->AA_^0(}H$lWLv|qiA1j?
zM_?C+$h49dqVQr2^lzCYsNW~ZA-qHH@SddUFd214_J-v3vO?8UbV2$ofy)8a#)c)L
zh?C2pdi=RlLy<4tH500r#@6aRJ$?n9fRMQf36r>>EIgpuBAPo7MF=N=rq`Lcz;-@l
zX!k+~rh?B<aNi3x^L$+vK<8(0Gf@LXl4=vXG0P?VgWG{ZJ!ps5BC!I75u+8`2y)Lq
zm-2ECVbh56NVl2?wOGfo-l{RwHP_#J!$THSvxzk_9vTrrNaTmK-Bal*n(;%M;=S=y
z8&0S<AH{^TQ*+_R8LC621tNklMozJo%|H<SK!QnDa1i!UEkjVN0K<<1z}$_ZDk7+=
ziJ)&M0!?fS4e&MGU<UZ1f*3Xn!C)#kVn!v4xxS4W!!=7K4X=KLa+hRq9PkzUMvnRf
zPU*nVh+e+hcA?fCcJN-Cd$?ZmOzwLS@}_dR*tFQRpg_Rny5=#oHZj4j{cib3vZ#&_
zLSQ6QgsP<theKiFMbpJ};WmL_d@#rjn9hRu(W^5zEmy)SE=ELVz|V>ULh5z)OkD(t
z_1pISKll5`fQh&HC&B9if?^J-0sW=TkE`pk%Kn@`j^_%!M1X#(kL{nno5%~-0v~ZM
zqAxOE{#arj^+;iobgd48JMbRrO&)KNt_Q&%b@AeEWAXD`;DiZD3Ar}&b8&tj`#AG+
z4q_Cs6BFw}&=hpfs=Dj%TER9*W)_M~6r#jL`1^L=FiMgQYnH1X=BfeFeL}w|G_w5W
zF!PMe7ZBr#$h(3ZaqQ>DF}KT)Ny6>#Th^N7@I6H?)S<wF8{p0_85RJg(KTE%yizxt
zu>Q*LV(qH0XQR^fuiNhPobPn$6~S2xzUvfVzqWEja@ni%iNDg&tHYdaaP6Hc;_65)
zChu66o~8Y(1&kg^U(a%mcR_=x^gRo=H**906BzmSI=OL#8U{_U3izov!_p-bi*WLY
z>l#->&z0DB)waC0f04-+*6r9dU>K2&(DqB$v)~_PyK745rci|ws8YY?I%7pJ(&xhD
zutJh82BRuPx+~M)L5Q^6qb!Jhb2B=3lwfKY5()cuD6jXFF}o&UBhs_J+dd9)jMG`%
z6AT960D0MueZA#_H-BwoIKB5WUv4wBn962TWsRPQRifV%R`M7m!E}dYvR_X3B`9#6
z7XvrANStBvloDatbx}*H6*f_D7C?dyK^oG!$Hf{l8z(QGfcuAW$j~_X&c458dn?6U
z&@?CXF^nINz57G*4#`jsAKQ)!{@kX6)KBXpP^Etf5+u_!WEEMMjUkpoXE;Cezx^Qn
zSK%C;3<Gkj)}h;O3?~aCBr297CDgs(pRvR63POr#P*p4pTEOD*X)P2|(sG!kR^3N$
zC!GjwxMVSt1|~_?0CMF3DJ_VIsHUY*rd&A6jRXu&NfU@Q4ysVqs<;W%CMa-JQnJ9{
zoY=YuC5j11lA=h8s-b|vH5*~0jI<2_%5ntjD$t#3;;gx{T|#aHaY0o`9eB!7c(Tdq
zQoK}BY8<kvt<|ZmM=8c2&@T{w@{X#d3cQdR4I9DK0Yzjf=jl%5_a7mp*aU$9L5hK%
z<n~@$SIjWk?DY2^Is5(8b*{a>n7-4%+4WWQ>CDXhQ<{w2>!NP+&TzoVwPzkg;bey+
zkrY821W?*5009W3B9H)&Zoai2ut)}lAA|-%9MhJ=>mk6=2E(`1p!S<j?0!Sp_KDyK
zj=|`4+xp`VI5!V*V1x%Y0&xz?iR5{Cfv1z6=6WYj9ysOiPLo5(#SiY6MWHke<arcS
zlT$hz8Svw7D$(Nnl-_V}rijgR5wWg4uqzL95grd=<V1k(K1O`Qp3V;?9tUpmAD#+g
zT4*aW=SFM*LFP_=t>n1rL@9!i2#zYq*GxmmFlVx?0^d~nfYuaXq2)F&bcr?-4(JU-
zzf;sH__YxRkr2iSkTW6mN|^u#gp>DAd>ST5CK>@~4;fwop)h}3UCwSudIKbw%ITw3
z978FgtY@>}#33#$9R7(jFr!>Gqzx!3r5D4#uvKY5@h~t8K^TP#2?;7f4Nxp02#k<C
z-^<oj4mR=cp8_1|fbx>J3L&umvGWl9Ac4$tJp*aU3Lx}qg=CU@LFNqt8$s`f#sg8(
za_LpGTzno!$ay`!z;x#nnvg-@o2T2-N7+a2DEEsDHq#9HcA&N#K_O?61OH>^XbmBx
zJ+5e9PJ0*y$fr40oyb^_(dQW<xqw@!>dx-M9PJ-Zmmeea?fg5_A|Rh^g$aPC+ZpY^
z+i7|8(g~v8W++m$icmy9i6nZZ=>f5LA#fIjB|bS1At49R3Lwzfyw{`wdJvvnm7(A@
z`|<$!!YY#ULP%a}9E*MeRFZFxtYSN!M_&oyujMI&3*=d(q*<sgTd6hJzgNS?WYPf>
zblo*8frdKX2oGDkLlM)5Zk$4K2wu>@8vWlR!-`w(I1XI_0st)AfN+EH6%R3_fuH~!
zhA%`@q<~UVQmrD1atZBF<{f_c(p)!iS!qC0cOV@+n1qIvc>B9d_5B+6`J0K<gi7<N
z*bv0CDLq-0nU){TJmS%MDHBZozR_!!b&vRwyf{|!Lk5&4Ck>sdmMXSoHynEhktD88
z)H~kc2zHwvGq0B`dh!l0cUiyC=B{DuGUktu+HC}lZC(#)FAO8qaD;nAxA-BU3>eC*
zyP;f@Y1TqDNfN}pQ7nfofy#hnytsJj6gel<C#b{|v7@SDpkGtw5)%gIN4VQ;NVS^J
zX|%I|YB7;TRYgQ{OWTpmXhOGXGHPJd#L@sy8wJ45dXvb4g9FWQdu{{qV#%;A6VWv5
zND5K{n#~wmSv4nK{eZr{qmrA>X9G$j#u7INBSKt59rAjFu~4X}22{EmNM;hWJ!om_
zWTMizJM<g0b2=Nl-&jQ(<TJY(q0N{GXW2MRaVwM@Vwj#G>^u#d?mfY<gO2nBIt$6e
z4jK*JQ}vfHXidfbQ=o_l{6zlP1pG8#RIEtsK3KuTLHk=mA1EUXT!qY)(mYC|1vHcs
z78FjT;fkPirNajpU>p$&6i^0mR5}QA9fx_`Ks&N_Ned_omSO_I(lQLJ6kKRB$444>
zE{XOgAb6qTmABjC22aD7d$*`A1GK=vWB{r(@<L5!+Hj)AP@Z5y{H*LZ^ky3OuP+pT
zhwISw-V*&@ecQZnKT$})pF=7yu=EJSh)Ns4fp_#1yXD>dsyl9mdZ^><bWj2`jRa+|
zpCd^DvD9FirRm2bGgxT@@E_iMD;i^+GZt(y8{|^jvtJ`YW%7{gguuP$0e-q8I__Hf
z;1JrP&~kyO3A=$dUcW8bx8FMkL5ySNS~q49dtr<We?%Kxnhq9(MtP;e#8YVHEek>x
z2G({9OfiSxVmcJ_(Co~^Z@64B7j|K|V5t%ufvl;)Xa&cJ-rbO7p78BSlf8omQA`(f
z7)D}I2qD~pOU#OGfV|HN!oqV+VZKL`fHpylE4B>=#-_<^2(Y2u2U*xM7fB?BLnw`R
z8x`c#7z^ra+=A`QjfTm9?XF>gZjk79)B!z*0ox8R<+S8ox7J#GptB${fsu011&#S4
zjFxBu&f@{t6l6@@GkI$q`i=a#|BQd1{w8KV(@FCs3lOCvLPyX4jsX8`D~Bu`mHwy=
zyMqP%@z8+d!=?N5Yy{vyNf1#pP@A{z_38iG1bL7?uf!Gz>5=<y!z-o=27{OPLtx_o
zcdCUE5;7nB*lt0)VdKY~A}6<u4`d(6|8G`(5$QG6MTAk|=7G(l-2QLq#STIOL+(n3
z#tHzJPpfXr;l`%5-E$>HEUH0=imB`f5eEG*1cwTwv6`lG0;Q53%4LL{k9)C8B5NlP
z_8Z78wo1%+xq?l9naOBiOEQ>9Qwwjl=k-r#c?fF`&3|?B{aE05=5m<8RzF>G!x2SQ
zS4q&ANr^=`f#Q37&%j7#57!C!wgZ5Qn|_l6T=F_(0AoO$zrmD0B#4guIQo6}3_P$;
z9Ka9`&iS)#eu&0mqTu^>>30|qK`sbhmJI<+P4Nt&K`fne!ITOHu;a1OfYC+}(~<Pi
z=MT?EKnb+nv=2>GMnoeZ9h<xQ=!brK4GR34(7GpLYYd1(&S_@u5XXp^oJ)G~+1X|T
z4?(eB9)Z)TN>aVBHpEsca+rpJ3_hUnq9S&VKyCT}KFCEq7*KsjVLQz*zQ{7=Bz1sI
z=h#aj(sNPzhC@@JXYA=dJb}!~kvD>3e<VIe-1*0coARN`3kj?RUyH|j)*=U=#BBjg
z08<Pw0ZBzd-@iyM)eZYvps5IhiUGUH0$$VHzTx*x_$|RhN9U*0RCAz(v!L7Hl_L?e
zfcGGKj-c}Q&Iuq_c`u14Jb~uu<tnU|Oh`Jnn*Aps(hoERJ(vdd1GHY>@j0DAxp>he
z4iF>rzNPl6rpLhM?iUN>1E6xnz>L8vBi?{Q2H=D0^xEouGT7nrcAz}?2QF-EPV>ER
z*||`4(&06R3PjBai3z6K4g)X2ou-74#!MCff-Ev}_SjDzbNfEbgoil~t`tZb{1plQ
zU)X<#vZg9qUEApPgf2V=5a*IaCjC$+^htd<oFuJL3VnpB`uI3!`|wolB2bh*AJY|8
zV0%5ki!X}QVpK`xA1f_cXPY>|SD?>~&_-zDL(I}2;%OxZ2TWX}h7e?nlBmRv4ThOz
zn3$NNCL)Ey9|@g)(@_0FK$GMk88!P(tEsr#(|MY|uR#)Q7;T``G-AgVcqLx5X%c&m
zgu2x=PvZzbOmXAKmUvjfNy+?OP?sm#BlP(<vpjbfd|TUc41-7AJ;x%?mYR|yBm?Q@
z;(Pl}TWY|gHf)eJCqw}F$|u|U1zeK|8%~fk$@CY$kIyVM!SFRWC>vG)@_B3xqCZ&<
z*G6|Z4->UiKKTRF*8KK$>2`%H5X1x|d%s|Uo7ELkALEAsZ#lu`_rUV??BZ~2<c0ri
z2HE6fA}Aj)N};@iroh1*Av<V$pg&*OhTRV%$Ui8u7=wa9G<y)p4CO=GKD8TkFl#|t
zM%6aX$Wjg-41zJ*4ucM+I}X6gJ9`Vkqz(X(32@}aV@afY9FGMX0f^cN8z}%&G+{6d
z3YDnZ*uZQ^&}ksTLrRFd0w7%sAZSAFzX|DrFN}$xmkXgU+4LOKEF;~4{Fbj+0p7=%
zkYP$m5;`A>mzkOR0=ps6Mdv#CmL!ZR)r8u|U1Zn#sZvRa<a(vsn7KN#PLee`?y#NL
zM%N}9QH(-Bd&+PIgK<R0D7AnoQ(`**%p#-ZXK(<a!DCp_RKRJegyVK()&dyz_*ek{
zK++8nntMS6kTiJ+p`!F5>?%eA-|<l-qCFY%13^%Du1iFF`jY^W{FD%Wk1%@EcIFNR
zfy4KS_oJg@%~b=xUv2u0smH7Z4{6gM2}y-rk_IxK$P6b^C_I_e{W<{lYx!Ugn`hgt
zNIzvjn6iLMB3y~EY!-8PjJE;mz0^i<!!ng^uw-RXS`bt0W9Reyk9m{b+jW)>x0`L^
zEe=&6<{+9XQX$StSJ~!|GU;nk`atm3AhJN&Z<_abM@8JKF`dxOzH&zf(zdzZ0yXos
z(T4WBjz$&g5VTRkqKLCjrNR1mBfcWac+QPBNDDt>v3=wzI*rA!!i|+a*V7%@5`yP=
z_YYA;bEm_~VF-Mu5xe>`4G>oh2ZRTNoZ3#q1~cnbIS{tfY90Oc*zz}A4JqnFubK42
z;2Tr3OW>+r?%X9(TEriyXClNqFpL5)Oc>|EH<%dti_goC+?{FPym9Px-@{K{kp0t@
zEIJtFHITtXj^b)yA;+$f=p4uaet^UL#>EGm8&TO5BznFc827n6M_@ZiQ0_)opENl`
z!8;tI+1OwP6K@C(*$r?>IGgGUC_SFM4#Ub%=8Z8y6RIdB#ogN&w$WwmF~SXyV`7-T
zYwO(a?q`-Sfw7~YD3R^E2M4U-RSxxl1IiWWp(RpcY#<Dvfbznt5h+ux#PTGAY2jy?
zA)r`O?-pc$8)h8xL!?ejl+q_7pJw2C$r!4bf_LrZwmkP3K7E4q&cybLhSBlZwILzt
zy9aCTjvLOLQxumVIv{qi0R8fd|NH;8Dtj+Ylm4qAdrQ~m_N>5ll6O>_zC+}a^2DH_
z^dx^#2D##;wlEjiN&)qO#p*9QK?yL@m?kTApGk1iyI2Xwzq1{zO8Flka{#>!p8%=I
z_Y<S8C*~H=P^ZuI2>Eyh?DRL$13OFsk2uVd$RLnPIQoFu&F>&7ASs?mXbkK+U0~r1
z!eMPGTePDSD|VD(7_FdCwv-qqlK-nP!9|YJgcX4u1jZ(aWQ4UePM1c5TF~g#QeZe4
zX%%*qVq-{S6Qg#Dg|$$&l&#vRlnX@(qw=*Gz>iNKr3`Cc+zi5{8>XPmKBwLZ!h~Q^
zKznArnw}%BoQEea$ien=g04P2>D}U(N#3d+vy;1y1oh8%c62C%i4vc?3`1^VOF*7b
zSxWl5YR*s#%)x<^l!6=g@RvCrAtemvqhcZc*S7qbC`o{!iRLjX<0!z0FtE%WSwy;U
z1M(_!-|C7bnW!ZxS`GB+??FZ~9wMHO4fhWgjc*dgP?(fuJbZx9gg>*-X$Rh57<&PV
zC5HfL3GwjlHA&ImfZ#tUeHds@T`?P%5d8m}4yTC{crTd--KQE1H{-^EJ!q(>r@(Q~
zwe&Z2+slJ~t6xbAn!v>(2!I`=({VT<<qX}GatG6_@5Jp$D#ZnjF!*J9dQNbJ5ew$x
z1NPYm{23MGB6NI5Az~XyW*S^H^&SSj)#gb981D=N0Znzh7zQttr(};GqFD%<gq{qE
zh(9|lfkD{y5b;yTtS}|v=RYS}{vbD--m&0A-sGKN=sP=)jxj$ej;|cc?ZkLsb`yz8
zW(ErgZeIxX0}zNF#6C1U9*>VWA-pgf$RBQ=zT0zIh-8t328Wm(KxAMR@`S>o4qo1w
z$ax-SfMg(Hfg#9`pDfT84RX>Or!#*MDI5}Fy$*OoWX!KBB403i{eka451gBK0FrNU
z!?yx31Fthmqv|*ZkS{}EQDF|ZO##8%rw)LhWUYc3@Wryw&E0|nbl6A>%a+7V9Gt)e
zIP^bs|2g?^Ut9=ZZYchu0sPj9>`%))-+$4gLYp8nrT|YT0N9k15PR?x$Vd;W153^)
z{`mu}4K06OjPxIe{(2ul6cJGO)I6?Wo*`r@@&1qH0X@twAY**O9^9$tj^845)e!kv
z4#@wY&v5rVhu&H5q4f$YBlpX-DL)b*Au?yW@>J0&s7v<Y=BRNYs|XQ@D@EyKAx@cU
zU*qSW-^au@&XD9#GPAS8`xF>~udCp|t&>=k1+bh2`X)ATpBfY(f*dhJ#HdPQd*&Fh
z-Mrn#*Jezc@j=wz{M+a|o1NJi?3{ld@^(W~Z28^-P<2z^oOhR(PZ2YQJ|lS#s5bn0
z{iiGeaf3&a9GecurzC-gw|1Z>Xu>EE53z8tF+|v(IoL5reU84<yJ>5>Ct;&nIzpzb
zJ*B7`(W8w)w2m|^C~XCW0z#otGbb+@^xTt8^KO5Rh2o9kyUR%jr#Y&C<gn}QPvJ~j
z#%6mFEK1G)ukq~~-!ZmQM#Q6U*i98LyOA<Nm%MW65QeqhnoLk{#f-f1`0SVo-@<Io
zp^iXkM%9yg9n8ERqH-<+mbEP*<FDYRW_sSp<9xEk7tp-L`>HtHN-p!YJ9_O_4?z_f
zSYD`!9kQmAAf1rKHb%g~GTu8m&9WL1qlNI+EI4Y4mxdT(MGg>0boKs9FITHk((HTG
zkQGD6z~qwk{iXq}EIWrJCO!Uo9D>oP(X1bV{6Mh;N|q1z)L31fg34HyM!%+w;CH~=
zx&hF5x@V|G0`C)Y9ORF`u-3A8oDGY>4_YqK`?+KdRP4{n6Pq&4g11L95Y}K5lk0vN
zx}bOgtY+SMb{vy~fe*M$r$JN@!Vp*GJ%(--H%K8FnG*)F(d50y%=xGtH*mn9gEpXJ
zC>_wI&avVTLtu3u+IuQ9zR^*$B4P>fDaK(#Fw4;5Ah>Oo+N7HZhz+_qgh&|B3OL3y
zlaofVBXkX_62dX$a3LaX*+5t&-eJRrn@kzT%T$cWSw?ErrjDa=yuc{#0QDP30pdGB
z;>jlj#Ck#<+>wErNKS-~Aps|7aR-(?cprC>hr`{5<ID~qoK9i^v&&$H;aw2E2k^9B
zt^3|#o%bP|BS-W=yBKB~C(vdo=@Iq9_5k7F;rs^!7!NS^`XONGqsI%VjM+M8MVXM5
zfYx@JO-Tj_qex{SE)HZW0}_J>iiH9+I6E>6u_6xR+c;w?{9dKld<}^8U17^lAXp@w
z%scW^vrC-Qu{P}XPQ5mjuxtQgf=QhM2Jn5&6+Wh}k_#8eku*M-3RgB}Cek@4L+^P$
zi8c)*!Slb)J#~pdF#rPTZ6~fK2<wAm9jTC;Gh(M{C?l!t;nNH!sS#A@9bN~bk75&G
zblasb79S!#8I)n~89}h1a(EbxAe220+R;=RDr)N>=~<-AC`^oKZ77Ub@c^-bfvTaP
zcw8z%;g~!k6zmoxjXk_Lh}aJ0D5Fnh%pMgLwwoGMNv6650HR_BgL|UjaM)tenE>)X
z8$tB^kPo9yAbxZ97%%NVQG%w}`4|rpBxC*uEPpJo%K%qN@ZNtoYc@)GW<4ce;{Gjq
z_uHH{9qbPhen~#@0Lu)dJxCs-8hJdwLGgKf`20_&@Edvkc>A(kKP_F5Agn}KK$<Fw
zt`sJ>-&d8(g$V)z$TKe@Jx5B-4vXkksb(YiBI#?Vv&9fybpkVNNc8MP1!z%&YwUnL
zVGT_Q7u&q=iq>bcR9_xXPdIGkq708o0vmt|LHZNI=JTAzJ@_l*1t;#2e{`iP`KWQ<
z6dhDfUb;0^86I|P;lVtd69P4i0Lv6<AnS53H5464NLVG*efo&1^>PrYCm^1oJqT00
zL4({xU!6P-{Ry)5^~FKRiZLK#0Jai1Dh(3EFNgOLB1lhj`b<+Wu<G-(afkL#`Y+TG
z^bqcy5u!~H>cnYbg2>UO%!6HszJAZqUU}aG=dkY#XhOS)9tv_ZWIg6!<qCv0;zI<T
zH;c#1XUq=msqNq!NaCk`qI(27UD4Pgk({jBV&FwG-ClrccmdAdSFaq7V}ZdHP`;=>
z6iNO7b^d-k4lEKUym(=uH<1Pq^O!xQIWAT5i1X6Wh8`e>1fr!F7_cyu*q-lpl=zOi
z40Y!g`pPy@Ye-jUapt)<n_LICBqx_wcbaTJl^}^YUozo|_8USu0v@E4+Wll1xX+o=
zbUpifeOnRQ!Wq-dMK^Jc!3pux`eXY0leSIU0_H>VY30)$VSxIx2fhrBRQ(AP3k`^T
zvIfWoku}>lXozN*=D~v=5_bWD!1c&N&>tBFtOXhE)vj-W0%m3iz+7sivK5f2vZ6Ms
zcY_T1_g<_o6i(m(99-07aj7Tq=mfb-=43t~&?>6#A3`DcN{F^-JodQKC#xHO0SOR@
z(9~h-w5Z4>$iyILNCD(~1JZ49LM^M$Akb11f$vwabUh@ySLL@FQ~7-cLF4rMIuC~-
zq(KlZ++J)8>trz8N}xA^5bd2kQ68gQYyn9)sXLEfABC->7~_u<p@8#f<2ow$N_lAd
z2;q7ZVt9_RNTD;!*c75st`-2AN32JmTt)`NN~FnP*scT!+3j!Nqyk1RH4xCt2nUe|
zlBKlU#WjbJ;k@HkB+Rgz&4#rT9)&~QiZ+&T5P5+{a^dYH+wSzt8+3674K8ksLWT!a
z!e}4|H7EsUbT^yic3LUWq?sOG;3fQ0p8ynqdAvJrK=1bckL$q=_xnD7{-5;z{S82$
zW+lL_gSiNIJq_X?R1f<<elLC8LkUh`9RF9Np?d!}+-dq)>o37}C-==K<AKN>$M7V7
z9DMIs|GXWbk1~Ni#SCfyF5sXCq6P`Wm!H+2x1pY(KdvR|k__YVMly^Z*D-UG;!wq5
z9vmpgCAEVH-GpiaH%2)e)vJju>p(qP4WL-YnGws6+c%?kMF=+`D*j9*$X*=IUGc#|
zlx{fVOCdQw%d7*FNsLS(15HU0UNMX)(YR^UITI$RCd_eG%u|~rW>#hal?aRno4aF~
zyb73G5C<W)KzfOcIh>+kf4mrUb&ffiIHb^Xz{Rtnx;$aXZZRE@!J`m32b0hykrzk@
zr!%mVxb8NGQO5<%>GTuDG~s|SZ2~@{c1{`~??52cZBCz`Lb`=lz3HYzRXaywJRa^Y
zkv-9pb19>7q4|*0sAz6MCe(BX0>B`ka84_qTw%FI922L9aCaS(pgkBvrW!<iD4UBE
ziSSAvYz)wx$KpI|YxFT;ffRsDHc>i7Uc%HW4TDSunrEPMf}N)@=02wo<NQJXbwK8*
zAI|bRg!GbbHNvC%4XQiRhJ^z_dkTSEfyE61Zw`2q)|_quD25ML;k=Y2woHw}ZB!u!
z191v;YzNz7a}|h7lYsa8r4wFBiXp7YMcNSzuu&uaOffVD*kk#F<csy-6H|5wU=g;6
z@_mWnqfrQUJMaUzW6+*z$QZH=car-3!{wO#_N$j>GQ?dRCuDnvVZN4dkr@LQsetoY
z*vo6G{1`vLnX`2YibhF5zQqIMD~G^kSJVmL-Yp|wE$h%c_{wK4_o7ehFv@DJZTKCg
zy1yBmz~pf|@N%RD`O$tSkaG|00Eie&%vaZ=l8!{#ke1PqXjGo^=0N4G7B(nIyE3&}
z*|H-sZ3Uw$sAxr20&FPIa4~6}v<ygr1|_yCyw0AJq7DRwz(v3k!IB6VHOUByLNlm<
z&~w$E(WB)Fin<axKtvWFNxO&#EymM9f_#ztZc@a1;>--HsY3`ov64_#P*h7oQc}}V
z6xCG)2~^kN36&HrB_$CDjP@jS%5;rG|Fu<Hl+pcHUle>N$IetWUb-ytdNi{#C2W`3
z-fqD#?o=IjNK904%Ww&V7ZE|KnGM2$w9%5Ix;{tuKmnru$fFkwqb!+Y9|$s2+#ER&
z1t9t@&Zv{wE=TB-`M)+4exG)Bx)S6C0mZ*$8i4uE{OpxDOHCBh?93{fX{u?anxL8>
zstPkQsG~C}DyoYtD5t}9-{p{e10U2-7V2QVL%qJh75_RMj}nYJ+~5rNkO^l5p0_@j
zuG!M`n&j4^<%4FZje}`6n!14+RS!&zvK)1h^#hOJs4!_8{3gS(E6LN8Ei5PP2*BOL
z0yLNb52-uOq|k&sj{r6Tqr`!F16(g^OU&Lck3~rx%%1a*6*>Xkflx&YEQKVbd{Xb3
zQ4?rrcT>!J1rjE|Cw`f#3!<P@JE2aP-a<Qlm|Gpnayjt&KHdYg>I`}vI4p|9(0ks4
zG>(U22X8sznolOb#RZvt5-<$9cpZ}wB-l&A1E|>hy_pd+IyZ+0fN(gB(gc;yA<3hl
zaD+sJ5!%WbcSz(SlmKbN1s16YKp;<<jWQZG5MU3)bxmoIM3I1HNC>2cKq5!75D!PM
ztPe-+I4Rcy&HEflk(gs97h)={j-t@ai{S@H$O&V^7`h#6Xn{bT2dfNp=-s^m<E%ri
z>Du$&l6HaA&hQ+2T>-WNF0dyJzf;+WayakAO|NJn%#cEXMCrnh62Po+Fe`i~APz;x
znWPL)GoiJ3B0(^7cl0xt{@TFTk9O^kMs#8iY#_pQ;OCwOHOSy%h~)_$qWB;?vFGd}
z>i4@qpCI-e=<@^7Dr5*A$WX(m<>R9s)jLUd;fBMl3>6ayUFghU>=RU6b<<Q@o|?&;
zDV)#_kmUn}hrN1d^>em*AvE)%%!dhZC&+t6;1~@UV$Q9mp4Vug@&-{8jquoa`neE9
z5g?Ww!4BEDdl}MRmqRR^+`tgP9=wGJl}LgZ#4v<7=pq3|xelO2b2Zf3c^-bA?9vf9
zxaNf+2=UiJgKKfj#c|eT5j2H5qz87@2M$L<JN5-fB~l45eMRtgqtS~?CIwXxVnp&W
z*r~0~or%M4(AmM?ofm0?J!pI{b=tp|^tea#rqAXfebRoI4hMz7cYWS}q{9nEL-N*%
z{oK_FfeoT%I{rvh4yo<Fj@#`#$COVB7t82L_Wg|au=p#T-xXWce-QLIQH*;vrv>AU
zgi<8|9rV;}nSAF|6Kmi2Qy}gtr)||Nt{lr#2vcQP(0k;;hVteQ1?VK&!wkic{+NBm
zi-_xZVA^ROXalj@_r-cQOu7u39g{R%!HhA-*EMsPq-~bR)TQM#SdjevPBd+qI^*Kz
z_$&^_*O1t=nwM7*c<RLMlQ-)4PHhL<{3pGczxJ~x8}DQ542F%Deq4n7v&=nwqC7bv
z-10VOr%240I9`0tX8rsFW>uxV()>1MA~V^GxrEWj2YBjCU62Sok`I-r6S?=w3~*yO
zI)=!WVGods3>{{HlxZWw;n4BUgmgf3WNv{OH&S$S4C956gv=%r9>3+p$Y>96N*;jq
zFM-=-BkMx+7gS<)E)xFZJ${czXgrS-#vViz=c0ECeFh<frSCopx^#Mg>>`1rHFWiO
z{fuw$-iXbgJTSbVMLb{vtA=+yYT<$X%}?NO=<mSQMJVjnnlRQvU|tjaxB1}O%aDKW
z`URkAz#<MT-Bm<K-<eXYYW>YBP{x`O5yDuA{w+4GRc_H$RaRA&SyffnFw5-Js7#0$
z2!?_WAPm6hTVy{(A2!T(zai%O+%PY8+9oQiLTPi`@P9YsJ;(|}iRTlH-2!`uv#99P
z(SlQHx2s-3f+%4L&yomlAjg+idIwl_+ap5ArxAG^oo;~Hz<{TEo#&ee1Owt=_-ss)
zle~&R4_N`Ff)Wx^^+SX^!xYMqf*2r;Rv=)>M0#QwNCXiX1J~67=k;1IsRJq9Am5mT
z9*B{%NcP?3IB7@=s0LtB9ohxgAmyDI?6ZUPwDu91Cd9p74=jVXM-u=X8o<sr{(m?A
zG#!J>Fk{MY<DACj&FX>+fB|@04_$v4wh%Z3+Bg$DQVpYsw2_7#VtJ+4v<<MaI0#MR
zYC6Iw0|Qk8G2w~HBdFiVhV;^h%ZH)!{HN>DyJ>rH!`NrB18BYi0-hHm4Jz{5n~m`i
zK}1OvLj_d<2^3L949v+x5c&F}-RaNGt5#-@5e{YX2~D1#&4##S^vUZD10+d_3?A3P
zFb5=thzO9&Z7e<(iQljnbd^vHkP1pEC<20#845;}pvHqnolwMqqYQA77IWh`A73f(
zNMyd3=fpHYy_v47i7Iv_mO@#AJ5HZTYlC6A1oosFJzIJl5(j@t)5DJNU|`b$XFV~b
zA-zmC><4%x;PXxmuXYp=eOxq95hWp{Bsp7ecs{6_-HtoiHT<_`=eZ;IY_mf!fxNy8
zvoZt6dTBe2=xcD|@8<8`QAiwm13_kLxsmwT;f~rExJSvc&DdikCcHlwnTU|3NUEsD
zSh=xIg3il>R0u@L)^C!Hk-|&HRE$j%#Vj@$iw=ezSy|Y_egkC7R0Q@0WfehG!7m}q
zcpTB^X4fRa9((!kMcL3EdokSkcwLkQI$od%8;PhH2o&lSeIOIqKV%pI@UTAg_|NjM
zB16hB)IgN`>Ek}qk9jBT{?a=Iz&xLC+blS3^W5N`&bSgzzyL@>SO>HK&cU3A^nFmE
zGEK!VUk)@`x72B6!8-;){VIjMlg>H78tI9j96ek_qYxjU4~Rame*dH7z=Wn8lj$sw
zqf<$ljGs$~r|pA}%CK#GAlPU+VJJy1XsO(19CYpiK%K%sb2_U03X}6>;;h%;!Fc9B
zFV_FboAo$?`f=gbigXt%_5T}~vZQ12D+ZfT(|OE0FzdcA3(U!gJen&>(g=@iEK{*a
z!Y`|OUiL<1Lo{B*TC(pF*|8It+f)S1JPjChD?8|;atTN@>FBjBrEwB)_Z=VIln=)I
zY0cb)NNgSsR2zqEoSI55>lIN$yNEZdPVNFtr49ZzmdL7>uX{|;0B@_~cMO#1&*aFo
zGm;<@0r33L)Ea!QgKao(H*vOTlUePijn2yqrp_Ej8YZ48X?C}$ki#tzLd_<@w1JFt
zWN4Z2#w3-@gc{Qg(lz;pL<B9Yqo1I6l=Vf2B)oN@8%S(mnj6>=hGx<z;W^&>v?NFX
zO^gdbhU{@H;LI`+fw8GBjxh{CgExSY8y02)l`uN-`F|9v=7ryYk=-L}N4Q*@KJH)D
z3}hJ)hasP^<0X(Z2S9_;P|d~z_L9NCRs%`XxQ}bjvj-y9vU4yTjRTP8;Lh;h>rN7n
zp}Zt=A&Dy|fE*B$9#iEy78~yN>8MWN$B`gXZXpxZ!G!gMV{S;oCgcR!T^q3NrgySE
zI-I8}Kp0$2QD=0-$pYpFW6egYbrU$rNyi4jnbnc6I-hm2#M!qqg*jnhhDa6gATT^h
z^slh?8pq1^9-a%;3qlYs&w>&XLBDL0Mw0faAV8$REHW}eWDA+S?a=YuZv&@}Nhfm-
zaR`j$aG+5hw7>{VzcdfIFM{PQkdH|9%ec4m0vb<!;(K1JFtZB`MBTLxFq}OMMfE|c
zHTD=9WPY>OuPfRTJAZBfdYCu9Qtd~=GDH8IQ29t?36%)6i=sm+0+BwlQ`^oC>KdY`
zDIy{e_U^_B9Dw&hs_QvE;Kc;;cI{Kga{AA4f$8paA;c(^-l-61#-ghb4ZC52{3O}e
ze!qjJHq`S3AY229Bq8;gHR(2-@C{+hy)98lQwU81BM>{;cgD3K$PgM3#-R9^Zq!m$
zvwtr}Pf&*)*|6{G_(6ys7&)>#m#C5<>kyP41_bCS0vm;5ua*(QXiG72LY1Q+$xVnX
zra;mLl_m-rl4Nj~Z0!j=&*s~qh!#C81ZeVjzG%6ptoZ|xxY}XXZqV*SPy<_i`Uw}r
zpy*?>1C#*4?m1piGdcG-Q48q`b%!48xZ)0|j8K=x<_4a(*ha)&OglmZO}rdBj*jdM
z({aTqK*B|(+=?EPpcr_QwDd{kABt?x55G+e67C-^oG>x?{B4>G4043XJO~{R&tirc
zp`Z@@J|P+aq6mnlf{_VrVT80YokU>khJxRFj{ZirI6^ym23Rz}#Fx8+vE2iPg24{n
z?MrGXVBk(CsGN|Qt|y|W9x)w-0tg%MIJT4}N!fak2z%qoA4I6IlWw5U(`l2J?9$;s
z21Cvyqyl}c)Sf?At&Qzr>nTs-oi8Fz5<H3dHJKW85HT!7xL~eIGz>}=9N~o#eRF|x
zx<jp}<iyfe7)E^s5^16#NH>{HOIpsFOmfARoyJQ#xms<o#t^VpqBP^fA^S2SCMe19
zHX@>G>kTSshA|9XRZlJUcRke>yq0St8Sv4tM)EzDd$U^fJ=H`6B*P&>z)BfHf}Uqx
zHA>$`4P@B%i^;a2`3s*wLq&!h{Aq;Yx&vVCLAzo^#Xg9YwM8J2q3A{4(<Nkz(2h1|
z*)t_h&l1vSA}1#wT<wdQ&J9tVhKGX|xh4tNS}efe7it+5AxL0g?5<o$p&~mMIe{UZ
z0G^OLG?pEZMwr8W*aIdc>}@Bp4W{CRMk}yyOSq-Tbr_kZ?_+`#7K1m)bMUj7I0gZ&
zW4I>?X1S${QdHV{J$9BP7=j)(c@1DS-g|o(y5uvSCV-O*1cFK+h%onzoldaG0kOcc
z`H@31ayAMC21lx)y$%?y4p}*?(=)L4CLy7rj5~!6l!s7=o}}FCe`>v*Y9Bj&#INeV
zju40x@d<xSo`pm1flP&oH;pz*<bH37m|xVd{E=4?6WdY;&mr`~**|=twpaOy`sLzZ
zpC>yZ{W5elgR|+d6Y#)bFL|4cP<Xt4vb?1j)jzyu$;`m~nLJ(|O9|M(pJ2ioCzdQj
zq?A&2e(n64a%B-G4n-5K#zGW4kY?wxHCh!JqeHt-SObq9mKn!L)6zpkIDdbHqw3ht
zmW!J|BVyi-FWppZY<!kuny^Gid*Q3}SL=Hps}_Eq3;zn!Ygm`&gF5iWZ>XzPRxP>+
zwdWB;>v<%Zp3?eG3X`%#Cze;;*3lPDW;P!#eE*``ZnLR8qx@$W#=M<@m?LgZtj@}O
z8QNjJ!rr(?#7~AJS|c-_O{iE9LS{n>ql>V50{pOXS)<o&&K~8jw+}0T<q#v55MiC#
zfHop9<uIw6G8UdB3M^?!5!bI^ahR^>;yC}c4s|)J;nA_T=7bF@tr=5p9QNg|J;PeO
z{i8<4v~4O73_wy)6!Sn*3<OhnL;$Cut<;2&WeruuHu*JPhrXNJ4|-FCN^<0T_v^`u
z4&gFDaDeA-Yk3CY$UYrjgdrp%m<|4Ats3FDU=JfR4h_I^iI9En-FI4Agf9u*!Z)N^
zlSef`ghQAZbLTuEcS^ffq!W2A=6sJXdLGvK&&|+H2Eq@Hu?d%6zbYz9BPTQUPj6&s
zDyxwaGPR=@($$~ZIx<j(0g&fCZxz^a<vwfx^}#{~|7eEc>kl>LZsW(a_%x30?=a-@
zUdS35QUX_>yF;<)nCE;M$qsN4&(Jr#PHPhp5w~|d_EViI;M^XgLa*D?4}%efh*6_Y
zm$tAOyAks<mATmR>cN>RW&~8~f_PxtcYtJ^{S8pFzU<=2jFAC44&KW*2V!&+xY+Se
zD9&vycj3%n`$#Z3$3Jik<TRk+)a@g}7<|Sa(xVzlRm%~}C#GzJKoXs}m<AI_89@c3
z-l7PXY=UV?)1_QaPBTV4Q>%|`kz_Y_5hZrZIfAGqh((dj5i(n43J6>~dp4e~fxy=k
z4ZdAsc1yRM<_ODzC>lQD<!4c!H}I~L`E`E2Vs#-rh$$kPGdEIVNq1&U3xjrFS9?1U
zd}z?u29w8d-7LCB9ncaHFi!!<d~(E`cEjD*41?J|MC<D?0Lr<{L5ZrNS_qYXMecTs
zsTAfDLnxYHbiiOy0aifm4$M?b^=s}3NDKu(R8jpOsD&6YjFm*_m$$X{I#Yx{OdbJ_
zjS<^0gA`9#lePfh=7Ad3?dsopC){dLfaG-^$3}qp&7gda)#!Hr4{rSoaBdvQ9$7dJ
z5|jb$%rLTY$cV7RFfrhqSx$h+VIH)g_Ry~h$lwO(XWwL?JiPVDb-WlxQ-LlV$#Tj<
zktnDDd5<}_5+D6!^-7v}sjx7913U;w?C9EIm|#H?>dQ!1DI#%$Rd2+Y!Rju^o5AfD
z0hQWx_v2PhK>cv3rc~}Xpyiwt+unGjf*WG2#yZGUGn)Y4XlmU&!bmV<G>S2VW4@OG
zm-oNz{=eyRS*%~)f=5N_B9*BuV0+Rmg6`r#g@=+zLG@z8zmVAG!UhMbNDdOHMll{t
zKtyq(ppV_p4ohP!gqDc%AZTefAC3UgFu;$~iGUn_^1<Yo|1&lz<30#`jNvx3Ve?04
z+PGv#o*sT+@5N)v&pxJ%>ICZO#Kyiqx!9AtB_gG*Cz%us_Io@&h&%SWlQz00IMxn>
z*DNf^;J|R~>?@HZZgQ4u3oH~|VLktU;J`rCgP%6)B(Ul-D2Ut(g!K&ULE!a*lMs>T
zpl`1<9mHF(JGbL>Wc)ye{dO6F2fJaH$1yB>&H=**ykD8!qb+&InxB|$vO-LY3)t0z
zO=7+|516Tv-tNW`k*OJ}YXW;WV(n1DoFtM|eA#0KfWxqyYtH?ZMGKE-jF~gBA);u+
z@?Q0d(W8@Mhi)yrjQ0~Z{-ZVo!!+Tn+O@}FV@}Q{EZ5<~juK>&WR8E8F47fzX>U%p
zLT6^wQ5Cv#jc2%4G9`C=@Z3`nSe)eHunyNbsIxbO$K(Cq`+h{9_y5Gebs%9U>zDb)
z$UVtJn6Jnmj|YEwf$~AY3LT{n*mIL9^*~I2P?Q^tI!4(h7sgP;AQ+Fh{h8{%qKFT`
zVfs^>{Ahr3VQCB`hf*7L(0;Ea1+{X5AI;HR$RNX>0w445&CWfQ184lVaBc+4NQaR!
zpOg)bmNqcKKko8X9`mF+F>HW6lBucvlK*KhlpQaKJs42;5_<d>C@I~5=iBq>cb9J;
zi4zYJhLV&576Ji+uyeZuIik@fUExLlVu5Qh1x#u_TDziAN%M=yJHDbnQ^G3TBJi6E
zT-eLeco2d%hPk_>N={KJD-rxkYKswS{j$^&e~+}CxFfFH>#bJYbZ^lO_@JQ|M|5nf
z1x5>;=<g}W-n8}oOO<aGY29r1z2^6?<x9^lZ{iDH(-*<gNn$^Z@ynADX?v>Yvy)dW
zdUJiPYv8_eU$_`!7qW{n9nCe28|<UfdJgV5_40ac?e3J*Fie%f$XF*R+haSE@$F`j
z5Vq>vHkKCQd5$1-DUPO=Eoj1DJEg98(9#yd(q9ciQ8~CIu3+WROE>IT*<%Jrs*+Fb
z<FxuJyX<%924lRRZi9t~F?pXc6VJOx{JlR}ba(Oq#gG+8aq{iF?E|#0Oiev;)2Rd7
z6l&Pn5W^t2k&NnFLugfukGXne!fyjcp7obYU2$$wqLCQDyQ-!%n?cqSBxCN>WoJXN
zm;(%d0HdaCF}+DP3iP9JK^8bLNHQ+YG@}A5LpGsTk5>z99hoqLWE)Ww`eB4d!X@gw
zMPws$pO|u9OwC|+`2$Jf5A!HI$5HZveMb$^!NYxQK|3Bjh%fMKaYui7RC=$U26SX-
zGY-gkxRBRQ-RH4R^9&QTu1cMQH=%Qvtqx{y-Wmx|IOw1|!^EP$woKgiaeV`5hZSe5
zo`66$om&xWp4V~xA4$(j^$~<QfNnrTiI2QHaxe-I>CEh9XN$NbZm170JjzKn3<n5;
z89G)Qw}u;H>AbX)38H5Da>EFn=cakTHR09-*&*THQz7SV{wF>hMNKIKl_C|K!D@zv
z(Cs>+F%ndT>qI{3&}wsUH1tHZu7|W_=)M!<$YDE9Q$<-3q;O%0bmA`Nw5ulk^m+q4
zeSC3}%Fx7iLQm1i(q#2eLaeF8&>>PULtg%$1=ASD*0?E8rSo_Hc5^3?qNaqe7|4v#
zKea}}=q*2Q!$FY`<E$t@_HZF#@EzVR&|a3zSjt>@&mM+TBFy$faUGD5Sx1oZ9sqG6
z?VL~JE-a-wq6^|m&^{eB8azZ4-U!<1<ojnKJv+|?od&v+ZVivT79Iy-UNmqmFrv{K
zDB>K$wBUw~6743C+?g~O1{sNvPpJAcT|4CYPZJw9uFm8W+qFI8Z-d+$1J9v`MZ6sn
z0Yy+WgoV@``csfNI~;<K60GVESe}E(dwFaOHy<&@<fOYEXCU>V<<Gy}hIbqcRN@PS
zF!&o|M?(#&Z4z230Np9wosGQ1B5s7Y7g{K$O}<29yJ3hyfMMqG`+q@)rz|D;fcycc
z%$^UKfsa$oSV>`EHHerE5J>?8Fc;te9JGgX=qRAS0Fa(TaXFCpWl_!!LTG!JU7&H6
zHG*UsH@>pN*oYJeg|t)5ApD7>_421+6awwZ@_pLbI~U#QEp{0Bl_JNq)1HnLi{8)B
znE8P8(3vKiMUzSa8AgsbFfcnY10A<!hTCHYk)|~xY}xNsEK;+x1srAucwj&(M^tPM
zoWw8p@*X@9RZtL7<T!_Lha`4TbYVdWH1xxp0n&K0EH`Y=V@Jo}SC9E*m{c%(*+M<U
zzc9=3+mPqp#rKI#FDLo1-re|jZ!yjB7L(82k%qzVsb1@b6Hs6e57DbM>0t;ZtdR}u
z8suUb2}(mpx_S|$tI7|}2h0<=V3vu7NYYR`g8>Azun<2s?`Yc+Z9$V)O<|0+MG2sm
zcZNiJPl^=ct0lk;9i}8a(=r6_n))9Y_64Oe%ASccdYD~N*q1lvT*jRyvmx6&&^3p>
z2zQ0ez!GFt6J2Kwq3vf(Oqy`vXtdH~G#kl|%P1F5k~bFs3>%f=w$os?1ciG%GQe%^
zmqplS8~DqI-2vDR_x}F$9I?Ayo5N2&jkO|L1_oop_&GD%YG?4S*+Frk?AL9GHXtoK
zjBeCt*BUT)^wLQHK=ROq0uDJg3a@079(Ujx%`oG&_tST7(GgGV#kB(Vf|=`)9k@#3
zhc<zy1D+jx=%Yc|omII)LGsRcGC9!Zn!{`}IT3CB3p!lvarpI<a~qSwJSwW`7V+@?
zUaQYS!xs!1VHLsCNpRtsj@^maBlk$3*C%wIW%3X)HB%)&jzs&dN6DWdtog7Ul-VU9
zXYRmqMx9PVln(BZ-y4gZ$|Xjk79pj~uuf2JfDh}pkcUft+%ic1%y#~h6#U|#5G$xZ
zss6Uflk!8hN9N1{@RRuC^hylf_lm)<*l0DQ4HmomtRA9UqH@#g$O6p!p03*R$JCO(
znIA;-+3Of!88d%#07^hcTq+_e{~{XF|AGF~gZ7jbv-Exc?LS#|hv3f8PXUwkO-2Id
z=FoSPJx4GQ0T@V0<2b%wzwN|*MFwMaJ<b$Y)x&;O5dj0WSK6OQhiHT%aY+$E_KN#J
z<-tFX+unz)@4a9rzCVJLQqWN<P%sC7U{9Drk`za8!An2w<4K^ysj?17f#PInYp`cg
zL+x{@d*p$_L8BeSlPpCk9sLeBufMt{Zl|`+jSFZBu_M~4fS_Kfni7d6i0a0f6kM}&
zK*y;q*#I-`{7@dO6b<ZQ<PL@8%AH_z5S+kh4@J;v9F?H5#KikM%@CBQymn}GP;gP<
z-kv@&E`U5dDZ?<52L~KtG6aZek~-etO+ye08jcY9xtKsb&@0u<n1rq!ED{_IK)NOm
zFRG`h_|P%$z$ho7gYcSJ;{O^y6cm~vJ>#R1=IiV`kEgb*Ff+&ytL7yk`zx2=)V@%Y
zAY`Hk+gRaPToh_cfFNsm?c2eAorg;pc%qEL{q`BR7oi8Bv(CVyqUT-k=rxh@_6;8L
zZhDE#pbW}5g~6j@AkYyem_pJuP^2P&(g<icHSZviz>ge9JhnX&mf_pG$KnhG=p0I;
z(Fd=C*yEodyZVX39qJoq`(qLs?(Xt4yudYQ3F(If1lV;9hq7#F8l@Z@Yt`4G4o2c5
zBw}-w5MTk33E()<h7dq75~Q<i^GOHe6gl|+A)z^Q4-mT}2;xsX?Fc2<Jn#}1u;iGq
z{Im=fDJb}4WKD}&1F(Xeh8uXY{#fI_7?4ZKPCF^Hv<RS*8vt%Qjkb`_Fm+u?$O{S}
zB9C%B91y&cV9VGL=hU9Z``r3jH!Jomh+(A-ocW|9;1JHI-xr=Vz%!l&=|IMZRzl#A
zCKyOFzndE}PrmnshtmS1;q8t1N{Dwr9@{)I$W-IlbQ6d)VBr7~L21#T(h%l13ckpG
z!T`&ves~4`$=Jbrv!tdJ5cMMg{Y;MGEkyeUdDzA%OCpgcY<T#Nzb~@;jlCMUr1scA
zgX1SO6$~4lAbnrQraVwp5#FIf(6Z-vod4^6J8?Mi{@FkF8GN+OkG)i?rMUFnm(uRN
z9loPWz;Gyd?ZUUt8P0~L`m1SHF^pD4L@KJPi=GBi5ji;&MI{W%utYC~nM01yt}W@4
zTq-dITvpF$@<Uc1aa@9m6Q<&x>BO4W&fXr);^B+4usi<|zTH2i+WOl@hO3p`pdeD!
z|Jm%(Yr6*}){T%Tb&VU=5Gox3TVec9^f`o>p%RZ1>+}QO3-k~vguH!;&&-~~z3AO{
zhSI~ieOwV$RdZkw1XLu1N>M~UyxFYYAZSmQHbf0mNJ%Wi7VHA5nzIb3s;Y{lsw$W&
zs;!;sYe554)gDG6l>kb}NkmOm6n5MU!%@BCw>P!v)!6TJ-cGDd{yFn|>U)9Gct_de
zognJYBZNlE%gGAbA|z~VAtWShL}z5W{;F(O0lF0gI1qQy0ANwJb=f1FNLoCGj7)G#
z!m5buMMgwjKn)=qfe`qmM}D{Aj*0B|K*=HLM-!>$aVGY-V9nYo+pQGErF_Fns$eN%
zLYAr`2&j*uFkRhxI6N;zIn`8<O;JHq6ct1fR0K!44w$v3pelgtg&6!M7{pXj8p4cC
zj2KsL;|;<wfypPNO6|;*Lr7T|hLq-&w%V$yp4b~+VZ(1{4O)(4G?r0K5m8A^QB+Y;
z5fME^&}&INnqA;%+A!5ec9g~8Hl|Cm&1AvO0mf6`zu?w*X}=|CCYMX5ETmYh^?Ddb
z%Gt#t>BcP23l%P)DImaxi_PR;*T|S0!1FyM=(3$;c<KZf8OJ=FXwgST4?{)|RGZOR
z2_hv0g;kRKvNg;RO>y9FNO-fz;-FEy+q@@eK_*hb?M(zOg9IfBMgy2;J$qtB$p>C>
zc}ROCDbuORt`Q)eoSg_3aZ&<<K-$5iW;Wsqh6e639@8IHP{ZW^)~0srsj~?7QA|)u
zqQpe?g5tZA-yomS_TYUR13uH&wEDiUh5vc?Z4aCMTe{spoA_VO&;0bQzM5>6VCCFr
z*{3krkjGTBDGoR*xx46FP+E<*f=pf^-#-MCO8>mzG!mHL|A7LwT34iloh~ZzhFFez
zmgQw4Y(?aIEf&?_moE(r?6QF-k$=8lhKuTS`iv!_&}AVSM(m*$Run2m`@E~BXYK!n
z31V;m97LF9sbK-DT8d1lEZ2!1`%4VWFZF%$QT@NF(pzI=MF>fPJ@Dfs!4feZyN7{x
z*ZpaX9FoHFle4NbuoC#Q4*p{FO-N+?yys={7X*`M8KEy)Aj7;bXs#tDyd*Y1+Bn>n
z4F%`Spn~YZo>(qIjNoIVOkSu89Z2Mm=@c95k>~E>*j>9J0|`+y6%)u|fkI-&%jWXu
zYuNJbbvpIIJoe#|X|3Eo-Z1Bw&fqy<%$rC+{UZRAuwU`azv~D@4U&j|%2iGs-`1z>
z&)fTUI{Az}Kh#{9^KIn=F^>>!zx=ho|K@tqKRC;$FpCA?v;zq!CSlHuOS1lgDG~wd
z94a@U(EenNMx0)<a}_5RgDQ`YQxAgw`S6BFOHcnjZgbRjV32O4?296mg5D0%vTT;x
zw3nM|r~baJ*ZJvP<-#rSgr!a<VbOFKb{w(~g8$!;Gu4a#fYj{nla-<jboL0e2u0Cr
zn-?rK%x&XDoEr}YS<M+MO2bRW;rNa04hPrjhUGmxWaG&8mnkKmQU$^95e3}zBt=Y6
zkb=8_6p=642@fbBpwIgi_#T1Z>+a<6{)4psC&m82YYU(CxfikUB*GL_f03H!_8($9
z!(A56wDl9O=^oQpyQT8Bvk>s^gqlhqgWUW_N&z(%A1IlfwyLVCv*>nf-P6^7+lvLQ
zUw%lDQ4yy9?r9>l|1^b$c%f&E5O{Wpvw>-Gk9h+kZ}@u6(Vz_^DEx%^MWR+YYI5iU
zi=qM0Cjb9#ETdUWz@P<$gHz6-0Q@`lO1jjf!zMy6D2U+Tplv><C<i!Je0(Mr5B{qp
zX;T+8q7e3%lig1>{=Yt!tI=O~zn&Q3Rgg-BfRaO<%;Zy<ZxZjtoiHm*6ON~)0Fp_>
zVlGl#GODsFlSIvtROKx+l+#VsLF^|vXvU7exAUr^qR@>{NhF+>A+=m2VkB<uHV=mO
zURq$TK=(GN?5h%_*sNSGWp+#jf|7wUid;yqlbm;I%8f|L9XRif%*&FQQ#u2!RFM%8
zl>ZzS&V*wB`D78I!orB!uKAC{{Wmylt%QknTB33M8_Wx1VjVXEc=GPPU3gntSiT@#
zG|ct9+s%k?U8JGsA3aTRQ)keWYEC=4eiwB&Fy;-2+o<#E8fluU+jEX@tMqv)cN<U#
z^dHcofC@r+x101-Rlq?1i{YO&@$!0Or~3bfHsDW4Yh8P6T(J`oaUv?_6t9fr&!L9<
z8yfl}eTP3{XrIvmE8_HY*GtznvfddH9goOI*07B()9Frwv|Q|@gl&#OGL%8nS_Xa(
zU(uW)`JQj`hV%OP>q<~6u?5!^C|aVPd7Mac$vF$k3{w><g|h)*fZa<ONJ^QoXA-Es
z^g+Z3T%AEXIy!mIMyG*pXy*#Ek5@(%y*vN6_!j@lB1A{b+kWS`I~>9;&4x!T?PEqx
zgZU5hh)B<F>wiwCxAC7z(DD<^jlBDK`g7~s{jXR%6&xXmfg$-72>6BP+5n#*f07Ol
z1N(l(AAt{VZ#9qfV}{Jw;1okyG8PR~)D3kFM!5)a@km0x>WWCYQO8fO(|1AOaPvcO
z8s~J)zdxwR?$GZNMiNpbQSf9}0|N!XB$SbnArKG>0mc(`RfCWUMdHM*^xU{paeBC7
ziO`&}rSbZ2>8{IU{U>>c#+vrN=bjnviQ;`}qj@Em#O|^|krSRQFZ_xMYI=brAppvi
z2xhO(pHgcli;2`6CIXJ?RcA1C|AEw5uHBMcoFP#&dRT27hXMscH}Jy@4n4c`pDH{k
zp6?hpgAOj(?B7?Z(SJbCkU9+>Ex^pr>4eRJxl9&ZpX>1-x9aTfuEl$X1E9+c#Axfi
zRFKl*LZ^y?E5JOG758z+pFT)zBl^GH4o>}oFEow+S<%D2h%KHVqh7;@Ob}CP4j#*f
zhA2#%8yF{$?315Zc|1y}`%}v!p7Xz(%e=wRVrX{T5o5ICf%<|*s$M~zRHuqz6M*&5
z))I!1Nlx^sh=^Soo8VsOmU=l-#Mls}DeL05ZK;t3`bJkgP=c@>4?*du76^I+j`297
z-8AzWuquwz6O{_rXE#)u27Pn~fy6;&5GP3@GI<VttmD{Ps|P}WkRkCTs#(*(8>pZV
zXa;ZEoI{j*^#Pd%mP+Hlryi^wjUD0Ic6LLtUmhrylL!>UhUc=6<J4#;-h8hrTd&6I
zqoZQy!I_5qkMRsMHJkxW9MuD0AZ;`P_Vra)dFSpq9fRYq9^^sxbE^yi;4FjHx(nUL
z=d0vDG=2NI^x{2u&_zwMETY#L|K>-<9z@4>e*Nl(og0iCp)x#LNRQ5uNi*We{Tu^f
zv)?K8{D+4_wNKsFH(j!e2uTN4hMo3<e7n2g5FrcLHXvviOoDU-5{|lOJ@!8CPgjA+
z7}igpZM6Ry#iiJBzV;87WxvHP_m`)lisdbPdi<VcCr)4M5(1iM$xfS39Q7X0!_eW!
zg}m2ddi&iHGq-ql_&`9Ycm)@tPLp>1J9)>SJ&ABsMk$3J?WwjYL^|Y0x_o`zG7drP
zI&UiK13l=B5-7KcI->P^DyuUQXlk&77-Dbfi!*5Sk;hY4axrL0NJJ|G+YQDGli-!q
zc{y*P^fCb+!S3z#7d?YF<Ab5BX(7#kAu|RTdLiAq$`RU431Q(XYvUg86>C&B*hQl_
znh1Vl*}YSt1CbraN3;&{QTg7_0a?4@8~qq&a5nD<-_V3+^W)|6#tdQIfOx!5IbM=j
znT|I*@UPB#pNF4f8zhI;&66M&j+I%ln&R{3y(Z`;mAs_EUjL=!(Z2VhDk3Rt!z>Hr
zhxN+>#rwd`umc4X^e7=>aAfHih{K&JRX1)IQjJ5)&L^hB$u#8+QF@<Vx-1e(VTOGO
zLNWnnag0-9$aZLuk72Te|FJ5746*>FI~Qi>Yoiv0(;ZY&*=L;5Mc4D=<$IlR-a9!Q
zs~ku(Mg0$%=Itv#2OQC=yo|^cs-@vo%!o9G5n%{|Rnpyv*ej~&y=9YYvaOYR_Rc!H
zPZB6B;B`G!OU<f|PF6F1I+W}xh367oINw;00K{KDmTdYHnZQ_tXPaA6<*4Q$+rLrE
zzNy2b1ewAY7IpF`j{(QPa&F+9Zw*a><+|+$;e4v+e<yv$AB~Shgf{`}14pSn2Vhb2
z4#Df~;BaC-rWfrk$)xo5_kN-{2P|I~$J7X^+#5E=?DFPvh?-ev*1;s9cRl@lz3G#@
zjvK(0-Jb?6#114)@*@3-3%AGN4&$uTSa=@yqto@*j&FIhm!f@r4}Uv2lJ3WxF(PK2
zoNin~5%foH#KRnOafa=bl1N9d*XNF$gfz9o;F~Ns+(!i90E9q$zfVMkLV2_b>I0U+
z=j8e^)MbYV6zX>M2XIV`f{##iSFoOF9F2rfNE`a-(#MS5<4ub@(M24P&@v1<;D<Lu
zK+{0eKov0&AlxlN_|&;JX5mhlh9h1I<7%kXLl!ZLke2U#R@-f8$?|>WrxwQBZF!g7
zKA&~2Cw_u^jWCYZcpy4}*}TMFGfKt^2?QKe$x{t57}%&o?Ge$nfDTNd5fR7+#7#-M
zdn*nZ@l2w?Z5b#elB%k%<8kcxe%*XesG9WiWGg(!6p}@fb75Zdx3xV)?8KoEyW_^J
z$&;`Wgg0NCcDthiU><_5jRuK|Ac6sbA`&7J5+Lo1j6@ORfr0Uc1_w1LQ6fYT`DZlS
zyylaU*mk4Gt&A+Z9UQG5Q!{dGITGVB?Qg6Zxds`H&3(Tto{SV7@B_Cx_WI=PR^Z1U
zGtr6zvGrSsBp>X@=86Ei!~`<IS8hZWP$|+hsM)g)1jG;q;2laZ09gUcX0bg3P?c~S
ziV}twra@>3LQz_WkTNj^%cNvGHSl=&yKlJV19E7PGP27e&EZ}|=bF|)K>-(L9BkNC
zgWiOKNah+xXb+;a%eX1HMV@vI0qTZ4Q!qG&Mgb<&+&MefWL>l$l)>Qmtri)QGGzc3
z8?MWkVIh&Dh)wQdUR>7kh_eNWO4KGoZ*uF8wh1kGx_H6$9yHQ7r|1vBFc$<2nF3@D
zW9I!}(*fK&aLryU*9#Q*=xT4hk72E0ym+?^kuD(~@iG?JFc{Yk?;0<XZSRcsYkNas
z0*|OdLS%#*W}hTB#+tsv%M5yU9j-1(rD~n}PRS;%Gc+;S@XMCOwei3}ec~6zi$gi`
zLor^7dz&SztXP+)DYdJW*ESD`YEjGyoe+3|NVU>+qXiPlCkIn@ZPUCz&M)RWX5P0L
zBV<X(b5YsLmUouUAUq;)u7z$f9PXAkAc5Ju$&{C8<iv=dMQ+SAB*l9+hTi>b=Wx+!
z{JGIX-wE0mh7*`fFz^Sjh!e6LNHi12s4==^OYR+ygpc6Md=0(3I-|BIw;eeTGrdl{
z3`1{xc6yVWv^<u>q7Q042F5ZJ<iPB3dV6EO>PJRZFHt6Tfgbe1@AKz1dmCdHOIdu*
zZKJ<C>{T1Fv9uu=>7fSjCwBA)K1mw|cjd3EgKZ3C;?~?Zo)c*|2X7--$al-{&<?OY
zUAwtCgq`N03KMOO1e^k=k8W**=zG_rp!OckNhe2m3ylG&ZbHWNAf{#Cs*xpxtt)hq
z<$V3+aIS*Ab4Bag<pA4zx-He~Y`AVXcJ!9x^?lOE+|-R6+xK6FP5B0PK@c=0*S|4P
zgrNp2pF9GxQXvbP7ue&OGWKQe=1hH6YN60{$P)<n`%TGWo48C{vThqqzB>!^)7k2t
ztDYIS`XrK9Z?Eb1pAtfKch_fDfMh}#5IXak>t|uxeQR`gk-DbRuA||}RUQ!YfjZ6S
zh{Yos2h`iZ=@^H^Zi8{hV}FA$VWNm{VCZjlxHz<ZmGh8kL`<?g7(h>-r+y6sAqei`
z8UEM{oz6Y*<E=1|)KE0rtCKVXuDKLM=7iak2yA3scB0t1&tFui12+cb986{*yh_BF
zwj5;1tbJlQ_P9PdYy*3PY1rY6U&X7~QvP_zUv63Y4afS7s9nDI_^wX&l3YWp!RkX2
zk_^Pi(-|e?nOU0$2HC>uQy<8Ai<WJqHi-@=KVY2)GAN>oI}-PI8g@83;(|LKv%4pD
z^bPIt^t&&IfH|%YQW&~f7-O#`odJjtpiZPwMHFn#jqry=J@Zcf2AJb;&g_wv^+FOy
zP3Y|`yL`iWw!kejdCLw^+aZQLx2sz=at@4o0i30?JNl<bhRG4x+&3fMZSm%aBwd#5
zS)B!PHvexLWRPw%F=L=URZw&0UwL_#i}g}_P2P7)GHCkzX4|td)4|CY0w9o(3MwWf
zkcwoRW}+aC4-!a8H=&Od-Rsi^M0}eR&DeU6Tb&gySzVDfQ>ID~Iysbe(_aQ`Ya&Dl
zn%%Mjk)&f)lg{QCUxniA`V&o4Af+`cikDO>JxJewZad)YS)}#ee4YI4bc*39?I$N*
zsat_2ggO#tYzBD?CPv()qU?A2{oPk44)ej`iyZJH5WWD?5r-!<L?!bPOQ7%;mKo%L
zX2+7<j~fS|<g@s5Mz+_VMdQJ;gveG&;(M{<dn8}kSOwpMi%S^B^VozB@Yf8Q0=Qcp
zn43t=La?B-O;jaBGa@cHF9w3GpD|~Yjp3;IO2Og|h#Aq&UV%VkM>Ijt$}M$2F9ulc
zxK$~_+tnO2N$(fP9(@w4am=5X_zmB5otwc;$=SDU1osba?ZUnWX9_9VnYUt12gLDz
z7~6Ei%;+vtUoUs}v{={7LP2sMK|68*2C^5^rdQWloE~nX)>!Nt8!NKZ_K6jfbJ(Jr
zju}79ZLOk`VeI2zWFbe$j{Xv&Xz*TgmN5KoV!lX~+4iI<7V%$P)}}S4E;)%SZ?l|@
zcm;vJl_tu;q1c>DfLrMUX3H_f0RSp9=z4GVGdGiK4U<e88w?@4e!0UV@dGW;U5)+T
zWhM?8pNBLDiJPW%2|{!x9Ob_6*)dK`xi>w&zgZe3oxZOh4a}hI;lW<vrI;te^3EH8
z{{I^CYvAf|I}XYa(&kHkl#?Wt3Y_|g1XFTDX=uRb*Z6OZyn9!zy-C_H>9wVH>xrbc
zF&8!ia5wNKYyg8vnh0Uo9N=Tykvkt!YxWO3PuT|5L;iE-eWd$}_??Cue#f6?8L<6h
z)hm6a&x|3B(>G(_KAVHvk3wuR?gNsYpD=LT-x{f}n6uG+Y(4(I(|2#d<?AvS@Rkf?
z;azu|`v#Gc1Z6ND&glsW2_zv?znu{uC%)Y6x?@f={S!cZ7@+#CLUP|KbU5&NYmGpC
zVZS_2qj@}Yf$V}GDbK&ejwRq&JvTTZ$9Ema;2Xyz6`k}+C{kR45UYPf;pu)oR!pW@
z@1#^-8{BuSNX*-V48mc6V;7SsT{pwDlbhUZjD!Sx9pv`u{sKA-`MaIkNa2xz1jy&F
zcN3rxC3FfZSUBQ5#C(U?WEM?%{g<8WJLeBG(X{mEhs1hKSs*^1lGYEA70*4Y8e8hm
zC69N!+Pd$>%hOq6K^83*Ffd&WW9Q-fI&M#dqu*X_vkh?in8!QMhDb<3O<FWR+3@xE
zQ^ZYnJ7Fkpfd*l_{0-sYF~+&34o$z`lBgOo+5|3A1ccG`d`tOH#=vd@4hcObW&2~v
z)_uZnvw;OQ&=<gf<cA*(dU>hm*LR+2o(Clk*nN3Dh&y&mo)L$rmm$rkj&io0xVwl<
z$blYtr;)VlP44s6Eg(}xBYLW;PeWQs>4$ee1EhMVVXU14O9k*eNr2SVG%g-cu5+0l
ziA5vXq}!~%Y6po4hpS5eb&^CzS-$HACJKT*eSXvQ&JuqA^VS)Z+i;Qyk+@0uD$|*b
z(ni~E5<wC-2_OYzXtK%v_67u4fQbLC!K3`DG9V}lsW*VcB>%D~3?PV)yQ!>H1Rx}C
zz<^LlU=a=&<QtNg0Bs5;%n$oU=8c=eCkYULNCJp{wfv;RBwlCwgg;;CwndN10j%v!
zl8)o}0kr;LP2aorI5pZ6@=DsbnmW4}CgA13fvCXMb$1$o#v0_5er=W`wb5wqaMVfK
z)`4+|r(-?Z?WY5yKyaB#r)RzcT@_6Wu#XHmYqWwm+~msK(Kw!6=Edl9TVG3UiA@b9
z463R|t6p;jRZ9hefnpQ#dAmAn1Q?*jf3<|lDd}V|?2K@X^*`YElhP#xD0=#@nxEKc
z{*%z~?K&7DUT3L%)eeBCtJSnk3Vp6OF5)+@a`l^vBJLJ^1Je}){N8BxuoBoZrWTMa
zAPA#_s4czyRe^<rxIELW(<MAi!!cl}sY2wSdiA2zjFREo&Ok0^c2<gZ=}OZz>h&QK
z6dl770spA-1I^I~iM3Gg0O=wJSFA^@<F2^QrNB1vrkVmKugIT@3Q`hCEp)d9dq>;{
z1E+HGU6Ss-aEDc%X4DuP6F1#14^;-4kVm2d5wK%(&|*z)NJ-$pn3CkHlyG=3oy~N?
zTFkMsuDyVxstv$RM%%TNN!GoG&BuYfJP>@r4qo71YqUJPJj1dH3hpC7mg=N7fsVxH
zCDG_`CPIYsBet;^?!d9ZX-Xe0@uy`%DB^c-h<_k_Th)(rli1K4f*Ez^LEE?#o5DuU
zN5E4U+V<g@1@CuoQ1zVp2cPU0tN;%|py$M6N4Jk~*^*ARSvTwawmQcp$!5Xy9ad0U
zibYhq4|63@gF+HYolPq<O-dz`F_@(@0npILBbaa8-mC<eJ(?+v?s#tPq}{dF4n$w!
zji_viAthtTe_(8ENNiXf^aLJ<2H~+IbRWih90Z(#4#wf?7&D^A1F+%IfODYe=-@IM
zEH=T>(ZEPt5MQHk=rU@s9T*Ob1Dyv)M*)!0VYUvAjsim9g8dtZL6cP>>2Zzy?12s7
z_j)nx$*yEL8U_Qn<rum1DET426&FYe<Qf5|50f3|nH|6qca|yaww^1nIHvOxmvV4J
zoDo6c+fBr&Res)0@^o?E3Zu8pN305v@9#VwLT(P>eO%MT+9#Rj0w8WrK#hy$D)9q&
z`q<b_M0Lk!1nl5>?dXfgmSJ47x-e7O(E#v<;O-{(aB~w$u!{Ag8?whH1P8Cc*_dGU
zxLKR9&K5Uq#Yf{~J(<_ZUcH|zy%`yYkaB^*FrC7Ig9E#9(-K%<oF2@03}2>pN+1#B
zVc)$vhfhSU{F<Rlqf1)S7+fMvX>9UU<eFf3)0x?JP&fm@Agj1M6M%)lc0g^eKjNRe
z_WMMep&>Z`ESESMgvADi6Kn@yyB*5FdJlpo&F7U{w}I$*T#!zkLExHKtsw_K*rB;(
z7cGn?Ao~{m+?x+*Q59B;CSCarn<F!yAF9mK8fM|XBLG}jHy1JRk5{V>J>K`ZdijQ%
zFX+l0+1o^B0A&aHLj!QlBlLeL$s>@GSC1EDM7dt&-FTdud_l=H8g<R14-}nA&mp>V
z>K6?)jguBp=F@_&j}y4y!{FrtR9r%3G-`nW&)K6ohHU+8)!i}s#ZU)iyEKTAnDy&r
zqabpRVcZv&mhQQt;)kTs)=ud#F5Vr&co27TNavMZrj2@GkZZRyL+tmP6!c#7;xC85
zHlxW#4ViD-r)fTKGUZV8JyejX3FTDMIsm_Iy~m`5o7uE8d_(;q_5s1kaOC&{hoB;Z
z?mQd@<pY8M^$)o8I0-%=g58b-$Yj+PJO}!LfK1$apJ;nG!$Z}4=3#sQ`O6KK*|Xd!
z0rG_aJjMsypf6~r-1?-Liid)kl0r!%a!G>2{*jEPkDUS3?tJUd1dd+4$79V7{B*o{
zA%nE}z8Z`w*5pnbX<4GEs;XiJs;X+S9W%A-CCmpeO)PYRWTrf*!z|?Y=8s2{h52_^
zN1}{Ab*dtq*$)(=q2gu=Mq4ko&$iE<gRhX7XzqPPL{TKoO4Kl1y7*RR-rU~wha!Mo
zY`DmmyyQI!s;pELLCjro0DW;Fp_9jAFMHUQz2obQMo-q8rH64Vg)2h`(&t<8YQ&#a
z60(%8d~6uNiJ5Jt=T4wum2RUb-)G{j1-XzGq@tdeZhC&t*x!5IaEV%5F44zss>p}m
zbY8d9?L|RVHB^>-U2USW=_S9Lml$G6+Hi+*=tx5$xDNS>PaXqzH+pknFfux{;@AfS
zQ|eUGL&fZ8i*n|lA}0E3vV!c?Qewjl$y|sMt0il&O_l9?kTLJz+k?+7!KN8AA%qRs
zZ?`%4rdL8QjiX*zq!Llcb9#Sl$@Mng?c}oU^LgWlclF}9%+2^)tF8EcIN4{U)i!L#
zGUoc!WoM9f*!#w79~6-lR87`$nTV~)y?m;>6WB1_s(6or5Tc%7dc&}FJeSzPVd_(+
zk7PnF<`g4Ec&A|DHSj$;=+e=ltXw8A>v{%xvwMPxpof<O@LG11HZ)Nm1?CiE2KY+p
z+)pgoVE8Y4Hcd9*S+o`d0NtY)?>(;9L)CE1lbB==Kv6p8fxHV3H$_r-mI%m|kgOQT
zcpaMPX{Bf?9x1U=iRFRdfQ<pP%;xFtWb6$%9XL5aqjra!N<3bn!^)lhMk|cCS>HJ7
z<TPPV@W%;}C^1r)u6H8T?wh9+PSQ0ys?J>=jqj6>pUaiHIrJ$s8MW<sya*}kpsAXB
zwZ{~>&^+CSbUeLeJ4rxk;STfqBj{(zNnJu(2=^=6cl;B3<dV=tU~%eeL8loB847BH
zW;|!y0BR4f3hyUVfU28H28%3<X<RM>X||Pz87>M1YYdf`W(s4**v1j4*^JpLiO|9`
zQBZNq15CzPu@)(@Gcq>V+iFD+HqAL<p)$chtp)gvPz#zvq-{KA%?j#ZK*}1?q9cx^
z4RC2TL4#z9Hc;T&?NmDsJ0+JKNhr;nOHk}iY(Xa8nEJ=o?o*eF(J@6*$=-NlweSFV
z2ZS7u?Jx{ZU5KY(@e`WtHwPs4govC(;MEbOLrOjAFHqn@_l}-jha<XzN~mw}?&X}#
z7$jnyR$rFy9v*vd7}GO++O?-X-0M@VpYv$+>)Xm_TYKRN;nI15=3%;_WF#;-C@bi(
zY|dHj25;v$sLIHM@IA{ZfCI#q3ZWFNzBen8$s%2OOy`YjJ+o6u@`Q+HVF53<t0Rio
z+J2e)k*wb9J;o5gj*H3Qf%gI6CwbMhC;%mt4<|oW$U_&#b7N2^vQB=)ohOf|?$n_K
z6h(Iv=mWhUQjbo<<8JLv8~$c(iM4y5N%IphDDOb)Q)#i}2x#;r?MHj-z&AhJAf3i8
zD$+mqnluXlqyj)G5^mxAF(^-44OcY|rliN7x^Q^!TZf~h+*!Sh2YxBq5YX=>rStXR
zYNXu(w#28V^qDWieli0kH_3wMN$u6`!Gu0I{&!Z}X!xNKO*Fzmm(JADTJV~tNm}y5
zaa`_~K`fV!34un)uld3MN&a5A0o@%sV0*WXY?C9?t~8^SAX3zi3#%qrLXvSAF&P5l
zV?B-o84T`u8$jUTFjFDGgC!agPB0A6U|<qs7B~%><2Jn9NKT1fIM4qN^hiXtA+u)>
z0qXmHuaBeObKuNoFXD|IjB)MC!y!C&Qct}JMZIaohJw2DQC0Bup9jg(u|$<tG4cwx
zg%-h50Sa1=<5N`>*1T|<C0#%O5a%c&7y!sB;vDXWMq(l(3^0NTq9!DWh=`b?Cc}XC
zuIDh=O)yPW5mb13y`B@FZ@h#L7v1=JJktE0!n+%{7NTKX=|&&))s(80RQYtNfXWwP
zrBTT5>nq)^?$!r`JWP>c<z}qQ-|duS{OTK%_*Fs}R#D~%1iOruZPX@Gq%i0V7%*W2
zMz9Dlz+th>DaLjw1q=xCeue%YS09i30RN``|EN87jQOmj6cQ~7(<fkL-X}xOSw^*p
zL}&S@_LXR9-i2~BB@~1b8qYW}<E~t0lZ}I;f)>ErYF82*sA5V3hCaam!x7xkRD?}5
z6b$aWOYL)$R8;pkv4#$f_pt@oT&lAT47ks+Y6C@_Ns_>?4xu<ENg%lP=zVR#<!>|s
zV-^+`FyWSOu{D(B(@iwfK~$8}O*GL#OidKkB{b7b6wFgiG(^))Qd3P76t$dZPBuq9
zba+QEJw(Vt(g+#L(`u%f0)s%Xsbh*85){f|D5?r-DT*nIk_l)^2!P<MArn?WYBXjH
zC~2ZiDelX94>9jyDTCI878mqRJ_P=T@4UH6mTt@oBmn+-HebMm`yfR7K=jD_aw8Mj
zt!pB)FmS37iZymnox%M`A_`98NGC`eaXcDmV7l@@Z_4-%AiGF@oQlcd#j2rl0?4_o
zG|h)mKGWVGe9!jrC}ju=g9b7((iIa7vNRMj&<sKgAtF6ei;_SxA*YA>dqUT=(j6ie
zJ90g_)kWs(A!H}?Cd3aw$`uhzsofv(gXlbt*bfgZ$R}9g1VH!8l6uMg6&kQI8!Tja
z!mx3`Z846xdy~!_3?A*GQSVV>tOztVha4QPSxv&zAcd(MhYbZ`S`iZ%&IUpN(+apG
z)VCB*mOc4`cH-ckSLcWa(O*B4Gp#?>@$oqX54^;IqNh?r{x2ZXd}Wu%CL0$Q2wM!y
zj710x!9oe81&b%=)%wf&VfrZc6c&nVLBS~?vA#Iki)4p+8V;(QQWKTTAbOy1I+&9t
z%Yd^m2&B=a%{S0G9B9)~up}ZhDFne9PGmxX-GnGg6pb{r)XS{E>nbS0MDKz)!Hz+(
zgIi_%CL5-tD{TziB5J~z9Mbg!h0Lzu8l*sH6v*VGf*nEB-d2OJ0AxfqkfwwwOr!!3
z?94-X9#7tPJDY_tU~CRB<>!g6QlUt#6l5H@S40YDPqI~2bG+iAy}Quh+`;C{)a1+|
z=pScICPNcc12eaKmQFIM<0y}iHl+gQ%J+n>D>(^-#$-X0O(}td7-3TD*nTT&XAUxh
zH6%enu<CMt7^R0H0MH3|d45ysU+89%4X`<jlp~l5Jgk9W2&$lD_JklB^PiVl4J<-T
z>IawMP>P|Lg;hBL?A7V9J=kI~e&%SVC^qy-WO*Rq;?VM=)d+H#e;*7!(xBoY?p~zo
z1T;ny5@7>`EeVj<k5Bk)+CSgTz-Qu^9Hf4A41j7w3pXOb$dt)w{dZd&VnPf9y$}-1
zy<HkchC>n&2PjohgH2dS(h`8)j-H6V_rItZL-ZfaG8DiQ5X8YK1tHM-4{;C_D6}j}
zF2-pP@nN=@&q9!}ZM$gX%K{zr268Mlno1EzNex&ba(|xv`gVA)+2+POqz0&T|6G(X
z1~d^uBp{;M%WngM{)Q?VG7u#WI4v;hfH}?<n=3)JvICo0sq9Ra%6u4ix$>5LSa#IK
z%^I}KML0cGn?sM9BLw3#U560P)FVKKauG`Ss8!6iBa(@gy~IreYam(?RX_|NAA~T#
zd0sklaW`j>MDFd2K|?T5<ryTFW}!1uFkfKQfp77#0RUr6{fC>=A>jb>i6RRTMib|v
zvF*7y@eU9@azv#O3rKK2zD)YUa!f$<80!6!^gI#Y9t4kssC!RCTl*rY4<bBmbjOyB
zx?2oWwpV;^pM0Oiza6&p#%ps(DY2Y7;Pxh`YJ04mC{JP&{wXK^X{o^9wb;BLf*wDK
z----*Z63)U6!)kXGcKH{Qx2)xW@zq1+O0lIn>XnY2@UoZC(M9x7$bjD9@uImiAsW1
zX^JEbg6dCHJpR+TN&w;Z7@CAlq$L|~D1FlG`2a);Q7VxWRc9}6Z#3!c7(R%1g@Vde
zDg?P7(V#G@bW!{QHE5))dhs=*ZaOB@h7Kacg&`4164Ej-vV=+di9q0^uEF(w&AU&;
zxF=})p1;&-K9_2EYw9{)L@3Yb`T_=M^~te^-JdXSC8#O&GiM}8Hz5K}EJ&?<Kn}YE
zw@A2n&g?3|>sYXDUt2*e5aD82%zCj5U^bgQM}f+01mGe9BlO^hBj4m{LzQ%Y3jmhh
zfIu!gU8I+2V*|=k)j5jfL2(+C_@JOUoPnSW4Q$YE0)mvGTqNM%Ue)o+|KCB8G9QZv
z5Wj3>0&aoAP(2vQq^<Jgl1Rl$0YQ-D5iwD@z=DlRA5O3kl9&^u0fes*j-rD}5hzR$
zor$1#X#!tz*E%rkz&~^s?El9y4d4q4eVL?8VDx^>_SdEUC?zqZ=|w3JA8(E!_7L;`
zM?PB)R_FF44kgqFGqJQ=$bMM$#5xDPc@*^oB7wy9!2I}pG3T0IgmWvq<heH>1iAS1
z<)AydMFt0=Rg-WWvcW(F1Kvr|{#s^sCsoD=OpKN*-P$3l2^{@7P?xG)uuN<TFF^Rj
zP5IqkiNxLuk9?Xff&1<b$1vOxw&mamIHGOt#MO`<Cs7gm-5VuTA`u>#^PaQc>DO-}
zbR_uTF-(^VU@{XDDTIPxnMR=m3Db-uF0?~4TTPKeG5ec3IBhq>gIgAOI3DmL+$tOI
z@5O0N{&2wb2cNugl79OnJwNc{eN(ObRbn!P=Ayi8q3leMOxJ|EL`FJP3uU?uaA|za
zDu`tQnU*+35feGAat%pAsL4F%MO)-ums9Ep8liXIb4?X9Fr`%y#gsu<W1S?)p*=7-
z6}J~8h`)9rpw>TR7^D<61dUK}2U0YBm^lR(Gn8f-43LB$Hv+SsMG(kv&eJvTo+5b*
zJE9)}+7Jw$W6`*qUYsw;Pk9MK{9)0VVcFx={?1D$&(i-hc86!`ajdUB(WE~7Fg<t{
z8H=3)U+5Rcer59fyEh<7B9M(pK{hzo><)$u|Gl~CaaLJnmQ|MOV2I9^iFQi=vyd}(
zqL^_pBB^=Hj5$o!qN$2vf~b=O6pbYjP&)cxP<i`=J)TM}ngQyQVMojWpCq{h1fi0d
z6oO$RlkPA*=9ecyh`2<KgXP-&L3)pk?!Q4ts=e$|p4*c;oqe8}L?~LMb=`IkRS2Ff
zU_?dC;g$wDkcB2;hDHt(5<w43LlGtS)e_4~L@c79CANyXRtUrv=xC+^xZ8CGLx*wN
ze6)CQKr#>(15%-gm=L%o0Sd7R7+_*J6eX=Fy23($!!DF%wWsmuhyccr@ljSKEl)-i
zj8`)R(+F&rVFd%N<B|f~JI_)cChQZ)%s22EepN$=@$(+hjyRc9Uw#RV6%Yi3LlqQ6
z)E<}zD5{2(il9j+Fk@OzxgX8g6!mv0;s?h)2QrUQhCp`#@5%e^9O9>=l1lz-3$cz(
z{KoP7wqQIMU~a~Nw#f)m5sr}+qJtc)sC5n_L?NwCTd>b&lS;DBLjzzU2dA__AtMOb
z6>G<EqWJn4j~|s1K#jO3?(LSr_3SsO2?{16sR^2-pdxCDf&i43osAG=w4|0plF-Z%
z&S5bu=)?;#PDcz*2(8AnAJ6MBAB_D_0ZBp>jUW&d0Rs{gD@dUd#GnQVp)U__YLVt1
zM{zcfI8C0}P*G$e7um3W#kw`SvP={s`M!=bZqDUx9<z)SQ*M!%Yj@y{!(3}-?)#s-
zT<3LHWTDi(dA&wuZ)n`x(vys%kn64Iq1qTcjN`|T8LM#W(S`%y%S=*gXrY}{-P?v3
z9Bu}1Zkw>3-wBzVA_p~Ewq$eHle-PvZ;{9rfqQ`2C{ic^4?qC<c|9Lrj%JBr<>BaI
zhK9f2*Dq&HYGyeD&1zRx^2SC`8m{ULAZ`$aKHQ5KaZnbO^n7RA%TEi#AZUYaynJNA
zjT*^=VKQWiu+gnqqUz;yX_CEaM&Smd6ia|tS*AOgE{IBTg=WmL@rpB0I1<osgNBly
zAaInz1kKW}xR<=0&p(hy96HVegq^S)0awx8?RO0QOc?l~>o0@WDc{O*ISmM$)CV*O
zNPaxQ?eCnxoFsSh4o9dyX=y0{J-kTVb$I{<)cgCnCA$u0iTeXI&;;ni0i=X73`pbC
z=7%Sq0{rmwh0ugQid>yy84LX$aG#4{Ww+a;)IrR@u21HkS@4|yMta{t>w;oGCK(C#
z$bAeZh^O95Wr?XB5*msrTEenqJ%7^h{=Vbq<c{GaMS!r*;*%sddNF<KqO2a~nb^t?
zng7Ph89j%zFOzZbAmWMpJrrn|g)l`Q=lLo2lcrEa;n9gE#KO!mH=5GaIS~;Rf$#q|
z(NkqMX8FT)&L0$Lq832m;wnwzPT<H##YLe%kL1Jm@Zl%OPuNai`aYh6eqsj)fz59-
zJcy<UP^CjZ?1BQyMtF!)KcWyJ`s*IK|Gc`lBgiOZL!~1sN}OVFFqJ*WiJ;ODz)Vzw
zDFlIh#VGrMMDZ7=@cy}mz~O8_r9GA1#=TDv3H%W$ng9R-PZw$QTP3bpSlR8G7u>m0
zFSz!W9^>a<V7;F2X!`IRhzGGWCjOdK;YIsi*G?e=CdfUU2{w?EoDP6Qpp%&U9ngJ;
zxO>52-c<@84)g}5DTDERSRTm#MZU<GpIB2(_Nn}EAJ7`c570=;NWvVAAMqhFqM9op
z3d0*495W20bg8hAAtn&ql3!?kiGD2)1f5=pg{;$}qbH!7lVPL-V~3V8XgW;?QeLLX
z9+ptU1PnbIK+qrKKi5bz_6iKRLx4asQ9gfqcl)G0N6k&-o`cX;rC6JehIq@<(CUDq
z9^+$4L_sMOOAt~MC-IcTOEC<TKSU-80irOnG6bYzXr(AJ4NV##Sy3IOk_V{60}L=c
zp%BDK4e-~sG%EUM!b9`zxy+tTW`fGha3Na^Oj42}f?tlqUSGF=?~yi}`~V~7{X9P#
z7t@CwA94Q)E5>lZFdA5>Bv~&o&$?H#&IVyIH=7>p<Q>_FF!QkP5(lJA)-KZn%+f4I
z3bXt@%Cv-Ihnb1-#@Q)95ZMD?-6j>=0J<12ch!QP6$H<UIbaJCup}gsv6vkdR5pI|
z-_p2%DUgqNB&k3l1Ti3LLkXskeBm&GC`zGne5B0*lx>V+Ax4EM1xgTfN}?D*fOSV$
ziadf4!~p}ocbvGqich|zJh;G@euvUxiZP6pRHC9ZLqQudH!(KFl&XnI7+5$49wFR#
zVT9ZW9v`VpeEly*fx8aRXSi4`Fr^V<@JWu(HIuQ_5b1R*e3NiKN9(pPKLH*oR5;GG
zS&<OGOa?_!3~vJkuZ}|_$14T&LYx4sWPxFnIUslGLNB6F-Cy+-d@B&*$TWuznYJ*4
z;%~tHe-k<?c}(HFg)|HG=g0uhw4Cxjvqm%KZ85_PaKy(93MQ(BDvYX;K&WDXL5P70
zX~@%w2cPF4h*_45?@#JWcUQ!9n@Ehi%=H5RYca-ADGU_JPN32m2lT^`Y>EF{nk{#X
zd(!rT8e#e!p6=J_zeF2;Un4yQ<5H9^58OTiDUQvJ?8nxhJR5XLn$JhIc1h_aFp~`E
z^m*t%J81)52I%!H+B+N!N>4+ABiMt8+3+?25|DB@5HM`%gXvi!po#i3DTV{{Rl_yV
z-UrgC8dNcptcFB1G$j=v1=}nR*0$?bfXpi`m*0}}gEvqX3VM4>g`_ngKi4XMt`Mi#
z037_!kn9KlX-@(G_{um)v{Hz2f%>7D4yZacBJ$Klin$7XSyhH$b2^1Sm`Xd;4^seW
zu(%Qx?@>Q0`2IXXWMD(p@^=0H=KTpFgogcS16tK3kT{_Uxt)2}1EF65*n|g{)ri{H
zey(5}8bVCjAwL58_rZyaYJl=F2DEk%Q@@UO4EgEkL4+@~M^aF4Ep7%j1br^V{6-08
zdL**}feI0L3LMatU?UNB_2;PS10GwjH^7tu3EDECA_7Pwj1}vo5Obtq5yIhv0WcS0
z>vXm`hg}1SAG3ax(SzxRgKdJ6L<(-jaE+w93laekKnNqNfP!xN3Gx8=%$YTs!!6^(
z^qNRX35*9b0Hden{WVpOBw?axhwOI7Fz)nTtYn|^jO6@xvAqD)gVh5DHZ<`=0-g>|
zZMe*D^67gF7>4-pmM9*p1EI1y=uGK2L<d=Lfa@vDuDcn-`ilEM&l@oAX3RP(x~>zZ
zAxr~{C6rV~NNM`@^{27y=c%u8y#Kg8teF6SV4sjtJ#TT5lgB+xhh|)W(1;=mA_#&Y
zkY$t*6*NRaFhmgr6hstgkq=Gojl@7iQ4rp{6hnYj8dIPMhq#~<)$vP)bEiXxL+vUQ
zMik$~VJJj_^7<XTgaY#N;Yi#NmeJA(Gd6Oz2_W9^Ky>R^_PVH_7^{aTnu<UwZ4OY6
z5hEfY(45iF2kox*C5sV}Uc7lObJ+i;WgfB5w*S{w%V^zjVUq5gFVOo#JPW`x7c_j>
zC>R58POtQMZZ`)f0~Z)Py4Uf%fl%feI|?m^(SlrJfx>|R8SCNp$t03byc%6oml5zn
z^_~f!+H4(CB3E(2xbTql!mS`arQGpCG>pPD^Y=l_ZFxljRGf?)(&qFJt^@3p+M6W#
zGzRhonLwHX2pwc*A&CblA)*srtqzbiCkR}V2zi7jfg3%gg1kxfF@98kZh?3ws!~M-
zOGr^uP>_&;O9D!-BM|II%iuoa_u%CcRWwl&$s2<RrHTUdBOw^|xtDoWM3pHK%!I~D
zQizk`nFf3g5kNr!f0XdvFR=QLlkh&P4ZFIzpUv)}fh8(x1|Z1sgd86&>0Mv>^71Mk
zv*9E~IO_;|*y|uRHWkF(1Q9ej9E2exV}cZgP$<W1AOj@_P{^C)g$#-|=4KEp#T^Gp
z7&f3m*izAn$wcEIotBl`B$6h<j#pb_X|xbckb)&3Sdj`cHz#<aAkkO=8yg}pMI#g>
zCB=jwkUC~;z`{@-KDpnSr*9+_I|&*JASUaIV*_&?4#KAUyOWcIkt~pBPI%poK9hOH
z(<ISjkql%$J%?r&Y)2%jk_n*bWD%4|r4W&l*(TeY^9A{7{a#ASWkh#%hb~}w#&m*R
z+Enu*HR4^A!RppQLZ-s3m6oY45ERBtCJz|~j87UwZMGc_ghP`2L_Bc!o;Z$P^!X9;
z)V;)~;7iGdX7?b93Phxc9weRO!3aSq5)=g@#H>>-5|B!d_1MF>6A1N4=!1d;?fP&i
zBHm!+Eu#btseX#?-mb0@aqkM49~A%T+Y!+z;w1ZLsRO}I81W0k|E?+9uyD-y;CHTv
z%2e{%y-wH;qDQt*`XfVKwas=dz2y>iJK!1~P@jqKbb-2y3POfmvnVW@ftf+o{bA!E
z6EOF&=Q!&EKtE{EfF~VO5%fK+9ASVUp8gDK9oDyW5FVO}A`OI?<}TUPK~AjECKp8|
zB_u5^0Z59*$^~kQqNxi4kiddm!|II=f+>>2Fxi^REYqRXLzvD2nBz;L2P6s-f{oZy
zJHRm==*KM(S%#Fw)1<)1G*}oUC>bKOC=@6zQLPpmHrv<~4J|vub0J0urkMjDDQGA?
zP$}gf!-KC!XMe$-s5l2$6hZC=+w9Dc$X@7r;SPX69|9ejFag3CfE_8SBFg>rS+NFb
zsq6_Q`DW0mhyf>0R=5PpA0GP;&jE$aC}WC<Arb$_aXKP21AzL;>_cV(pZH|Ka>2Ic
zjzNdu_%yx@^0uI@e5e5GkRrfHWCDOdRSb#*x<^ExO<3-q73w3H_JW8IbRdQzeZkDq
zriPU}WiwfsF`nYYT~`R8z|uy0VHAmd#378Sein~FKc5Fsbx3RSpJ`ySux({$Hc4m@
zL=y-`f)Sk4HO=+X_47_wxEOx&QQN-|1KLClN_s>9y3bgqN0T7-=;^;0;y^cZEJjFB
zuci&*$J`!d*bf0KiTU;YN6D2{RaHl2`a;JH9Bj;rSbR?Pek1&R84P|Uh}LXQRSr&i
z+5#~|Jya99fTfJLQHm@woWfXFO(~KXNy*E-2Bs=~Gtw#N=e?WFwG~8SO$I?TNjSaM
zkK@KC0~?Z=<3<`CMu0MZj*NilLSZjt0Dw}HfH_#GA^C?!if7J!%jv{y#RSTOWs{8j
z!y@$shJ(Be696J#9*{Zf_85-PhXPMjC$#Qs&W10v%qbJu5H~tBd(Sww!HK2pg5tz)
zEG`u%1czUo>7X!(nhsKLSi4W&sq>Ju3AT2yCoVvqj>7Ef4I$+x=9S0}$u^`1*r(4T
zuP4{+={_Ue=Mhz0{Mv7woYY>#U_iql2Jkf@Wss7_(-GU8x#!LsxCy*z_hR84_ykNw
z{$m-KpT22ec?RMNdxjrOg7*{U6B%-l8y~&~(;8GDe;H0dgem@E^oVu$vvVHag%Rf@
zJ<YwX-61jdE%1TwpJ$O(^;#H0zrINbPvOJbZ}>v0RR+9ljg6F5QB_q{R7Og~9bH(%
z+R9Xiwl~S4Ef!?8gDA`kK&2pw5)+W)LZLv!3ZV|MMKO^NQ=1|nw4!20<#FiNZwlHF
zEik@ktEmXuK2(0NHS_2@53DsIa?7QHSqg==D-;Iq?EyjxHDMBxmL-vzF*T_Sa6>f;
z#I%$lV+wxTB)lGhJH4`ogs<}Z>h@iHv}nx3XYsSqgzX{b6HC~4zWDK9QxOZTXq_f9
z=*RPvL`4)PmS19FoDI<quzIIGdPfsW0R)i*An^~L2SL>#-8hi@=LDbqzKZ(aD4Fvm
z9)|$j>+5Jz=E<g$-{aD5HZUGa1%{{#0}4nJ$1sutB0`<V=9fAr!eN(8kSU&%&!qE+
z2e&mRe=iuEJ<p4)mZaNO<)Fb0m^9<bSsPM<*-EKvRVf9I5QvQ$x~#@H=0@9wJyjZ#
z5TE0B5>E|oSn$&z$V5l{=Z2}HPS`)O;l^Ljps|*ag4q55aS=&oWl3A<jhr96AET6b
zYnIT`e5u*q356wM+6-VNj-y6GwJ2kv`gIkPG(!gXQAMp{#N!B&w-|=*rrr?DnHc1x
zBP3aqVrvydnt@zmtgHu!qe2Okkp>qPD+k!rHM_TRHue=kk%mPIln917kd0hsfx_h)
z@0=AJG*_X5V9;>kqzsJIL|OxEiVQAH;MYl2HlU3g(}9h#vynj2NDl`Lq(x(Gy;_rZ
zG)pv1EKsm+C#FT-Ol_htjFFL;$Pa23%NAKIrdYJ_GpKH?9@GlVF>uw?P%J;<ZWPN=
zrd(vzfoe>aAhOIl7^fFmc!=?iiB)k@WF*xf>l`sT#{{D@QwBy^M&%0))ZU*x7)29P
zT}zTHZBk4s-HK|;I|e2lH-@;3XKFE!#1K_PZ+O$FHOgk4$PQg2QYdKX^dh23E=k8Z
zml_!ybP_S6f+{yPRzNO|4e~;0ibHY^SyV#N0~~jt!-{PT*#fnRt=&~21%e3z4QkUf
zD3)Bz6X`HoG7`bLxdy_pj9BB#Y>q|@!CVZbgM=djk~pCx#+z^T>f>$jf|Y3!s-mko
zPAX(-X*ic-8l4fWF+-soJA;#3fCN)y7X-CN(m6OK;li>h*Ji<nv<X8_?cz{YCK0+(
zq*96?NM`b@-8sGWH>9Abl9PC4R*2<Zcsld7r5l(=pfP}NGBa#HWFXj$k4;{*=YxB|
zIcOsYz&H$w175uGQNT0}rqf_)oCPV{H>kVoD%%bSn+@1PBXp^ikr^D_CMeT=C1n_C
zgK0*Skz=%&)?ph|foSb9h5=NHClU}XG=!E@9StW!sC9JI#^~VK)E#AVM^OTrlM{qu
zwUc1eY*^qvnHCz+6WcLZqX@{x#<j%*0~sr$8%Q!l@lNH6q}jtO3c@w4$5B%ugr-Z8
zLzS#_!LC}<K`mnif})1RS{Uqw?OLU>$};Z{7-m|PDI_9Yw|UtHJp$S!BLK-MCuZ^^
zdx%_#JoV@?2<gCWHrM)m8G?mWMOaglBf2w@^Kq^C;ZkB+j-eBl0MHiGecK)Fam(1{
zj(YR<bAcHXYN0ub3g;4q0TC5cL}(-+nG!h7VVLbSnL+W6ep?L80mR|CVvDViT$OOC
zMp_dwF7Av}3j)*>#KxS~qZpaC23>0F8$qF)gMd<qkf5<*6hNHR^8AQ8Jx1CMH7@eW
z`~N<x-5vao(ZI)~1Bs_*0@!k4g=E~iM0S65<|@ItNRf{)`io0CEkli=_aL)g?XIpI
zM9KlxAk4P&e&edR<FVg6k}MuP-aBv(cx9XnOw31APEA&~;gUL)mJN&LkTOh>HsHJ*
zlFFQ0G7YDMn=%;1DQZ9K))QmepzQX$P9k7R37~8crZdDDN}wY_*L}N$6a+*qR(YV;
zwnT%^oyI`GQ5kex95{!`r|vzJM}atNbd?*Qd+qBksBwIg9GWC}6Otk3W;;Pn$kYfe
z7qOa;rfHjG8^;FWDVP{7Y8s6%Weh6_A%i%2UF`v3$doj|ldh27j72(b)H%@{f$I9F
zjqYB?5IQjF>|A%IGB*eZQ5c}TyNiSd>(Eal!Udg}F^#$ll<Yr1XB*@Wjy5W}3`-W2
zf&)28XfA_Tl7_&iK=4N%MB}-&$TPHkUby^5^#MlDz5%3(1_A|$?;RuXHk>$Q{>UF;
zDWx%s)q$??{d(E?^Of*LHNvE!x2P={v?TiE@`2OSFizP0VWaA)C_G^u_~E!L!Nf{1
zn<j0d83e8kL{JbuJLbhTlX4mYF%8vwid`5S#dl5q5~fm^^+a{g<}x}u!GECH`(Vf~
z%rP3#wk7n24LgEbrzF3u!@-S7LE?Lkr0Lcg^mDUe$RX@w;XToeW@J5<#HK@eHc?Nw
zgzytfh^i2<l%hl+QWPLV0E1MeGzwBu2o$Kyh!YeFF)9%t6G)ImArO%Z5X1~XAqZ46
z6ofz&#L7@pG(t)R6jD;tGP4N`(ooPe!bqhQ00qzM2n5+BGD%{97${IfKtR%s-JLez
zY^mokO5<iafiNQ=a#+E~bC_Zo5deA0KSLsI7+{F2o3t?BAZ`LQqH7cY+8F&ClRU3g
zN$n2p=Rw(w!}*6t$TL9lqC^<Zq~@cet09GGb>n8MmIWM8!_k*(OHS>%ifc<gl*Tl&
zt2be{u%v>*BNP+@AcE2%NHh!tHB(UxtV9i^#D@%mAR?s*hzbc>TA(Q?Ck0{{kqpxJ
zlD!)~UoAdBn{m{q^r9tDDpH~pfHVl8lpu{11VRW<fPicyK{5rPXj6>JA`$E-4uXXK
z!;tD4!a^8nY;>9!E(sOi+@77L#pjai3ML9Dq>7T6kiemVpxjRlq5Grrf#nrAc-?!j
zIGgbC^=CEF6$$K<>PO53K=3z57Z-iN@t7yADI@G6B^JX9BPW)pd1jzoIuiy84_M{O
z6LVkyJm@UyW=~NO5fKp)5fKp)5fKp)5fKp)5fKp)5fKp(h=_=Yh>2XB`GE7(s8a<B
zo~4gbp*JZJ6B{QrptXP*h-!#Y5JY9lBM{6z7ED2hk4MW|w`C@?F)1h>z;y`%0)CQX
z0~ZM|&ZCAfo`C)5*U89F5-CDIHhS#?s5<_3Se}*?7}AA@#dEe*338dTenpfUg9%67
zA;3t7u~i^br@z@gNe;cIE>boRyNu_Aidg|cpCLbM>*+mt{hxm1$+-A)*2k<in@(gP
z#kRqNMS~d#h9-VD|IMRVX^(T1=B_P0RLGi+<-nAoW(w)3O}j|G*l%VI_8+^ycYgzB
z?8n{|e%p55(&5j)oZN76qEH|q9K<q1>715Q9fsWL0j&wIom1)fSLpf&H+4Hh6Km2Q
z^S@i~H7-mVzU@<B%xF!mSq6Hc-P}KEETIGkdY%M;JJ^mXuuL)yEj#iwsDuAd0NTG&
z4fP(?U_TEh=e8vXmuOj9rnROJQ@CL@S|qcULBX1rlIG)y13SKH0Ez($@D4)B*qhIr
z;O{&k7<kh_ZAmB(J8eEhC#4JT(?}bNRO#D#_Z}b)BJ?^uL#YZHL*|h@&XF7*TClZ}
zAfe~*0Hdigz_u-=c7fOnA$xJIjvc^v_<Yb}fjd868v;rDei_*0)saq{NoX+T4{x^1
zwC(jI^aT)mxoD(&tz-0sGeD8kg`>$nPTZsk==S~iqw)}u0323M2C<X6=d9~?I(*4j
zq(7PuQk-HQxEAQ*vIH?~P%bx6T;c)2Vk`x-)MTi0CF)UFrH8DHh$FW^@knJTXcWxE
zm;pE73&49+@gPPLLPeDjVwpw)0)koyVv1p66eVP(2!WwuK!_M3APNelAcR^{NKt8N
zQKX;{nvjB22w)bHi6t5oX%Hf$DO92VhNaq?-u0+hiiSuaU~6g(2>ReMIpDUiG>42C
z0Z}7D#RQ~4dB#Dxjj@5UL&{J)%)s1&kU|1M_wV;Qjhg^b2=WJKf-3$jJ#Vs4gE7y5
z3_S+Q%xdCisc}lCxu`UlsKN~?17>B*hc%@YQ#K)rV2d9HrH)xMi)GVTst`63Od|$v
zU}YCB?gTo6O6cjLZ_b{IhlnN5fR|K`;RU9MV0S|>O(i>1qz|>GRR!|MK0inoz%hHl
zdBp*YZTc6gv)?^#olA}!T#RDZJbnqR*A*%GVp(`kv(pG4L<|K=u#nU1P%cYqes6=o
zG(IF4NbNv9aScFZ1ME+H=lais`Sa!HIKT`bL|_WA)dEA={=}s;kEfz1(z(utzP67?
zy~XrSRc1_lpR;DMc&Uh={2i|n{n2_vCNLqyQ6fzUMdmMVuO{`FOQ^)BzN49lZcxYR
zj&w_n+dZJ)ZG{*Mc8TECr0n>f9wUo?(`;Ct@a)~vP2(VcQUeNGw&saxX+eZ^N;nc#
zAxSEN&b+^}8at<9bKweghfZ-W&%TJPL#0O&9I>=={HGVbAk_I#68)fAQRYdbk_v?L
zo6cx*?&8g`NhSxyrYdS7^pw}CU%lA5&N|~lLun)=?KkS~#CqO$7gm7oXLO6#XU6U9
zM$M*WEY$4L58S<n6v5umjO%Q~s;OQE*@o=`wc^O6#CC^@wl<Qj#M;GWk3q(EH!LM#
z^5|rN&^bmxFn8c&fX<9Z8>r=@NcBrS3^Ni80vPX|HxDJtgUppTKB3P7X+vFU93zo&
zEX^VlG2z&tOc)W4&Sm%J{OOwVJA=8-5hM&@_)HL)jHb!hb0~zDJk7>AHjrSn4sMH)
z%39hZZ<D@pl{=5k60#*cZNF2uhn$vd5t^rHP?Wxr&7#k>%kPG`A#U@el1a)))2B}r
zY9zf>Gc<{53@a+@sJeBCBNFE|boS0-a3J{>T+8rEt(z5REqz&sd(jtuwP;~!uP=PP
zYcC|`F7cb$c$~3-Hp`Q2v<ObLflZaFbZxe(I~<7X4y)OX$d3>R8j(3Hk8F0b)2P>L
zZ5<HoZewLxzFn)qsTC4H4ug`Lv>QQ)2SKtnPMM`iFPQ0VYG%9txUq`g0<fTHoU=!L
z1xvC-A}bQd=)<>e)LotnTxBsJmQx*|bcsODX`T4&5|j;|&os>F4#j|y#vFb};TRdZ
zOmz*cwbJK_vXpJJti(x^9%l+~)&`U`B$?YQg`MSK9R~qdtXzcvDtipqWWr3+Srq!Y
zMg~mCWY%m=n)Ak96~9lfSS*{los4a*p`5uqO@MZHc342^DM+3obH;@(MC}4~gF6`5
z;yY!bNv4{Qc-NuWR~>l8sUl2f&~5<|NwgyR*t;`Xq`Wpk0YJ^n*cf{*kR?7bvqz&t
zq?GOR+s(Ct&&y`BR)<1NBnlilE^l|6T10^eUPnvOU<5IQNWl!8K_JFZU~qDDIU~K3
zkvf-Gr(M)2rsW)}s;a80s;a80s-mi@sH%`va96%H4_E_eCaS8cpi?1H!6eq4RSuUT
zLt_}5!-=)SOvGh_St9Z9-wATjHbFrRGO7r<?|Jc+H)scYtWnMo7!q-@y0~I$I>i&|
z*Rgvy@7m`LSTQC+s3pTl4YUX=1mqVqfI<;i-*-}Iun5E<vC3TDg$5Fcih%}bG-RMP
z#T_6GsvIVSO2iowAd_qc09b*zkb@Yb6K0ocmignAvqt!;z(W%w1jt025Fn6kFwuJX
zS(vLe*taf}$qWxhIJ%R#gSKMij-zM|if$Tc5-?3Ao?Ww|W+mmaoIzo%q7er|19AeI
zNE3Lt3$hh<H;Oe4V7?bqRS?6iA?s&^g|c9AY%)nO2sjK-7<fui0MibPMK*NjeGP|s
zu<UdLYXUQ<ZA3y6&ZUDXnzG<gPzJ~z4MAZNcWXhtXJd?&m<NWEOP^Ds<!s3nkbPoN
zhHV~RVGPF-UGvFV2DAvC5ITW}IMOMy6U-s;ZSAn!rtN7XnUkHu1$#Ej7lo*CN?j|F
zYda22(&XUS^&Dr}vCKCV!=?%p?_|wWp(P>-fiZTdAa}BRwGr<m<d?=netan8wJ0{L
zn{X@qq$sP|_K3w4csky0j`zhT%jWsxGgEulSZQtBTOF9$2_!7<5V%ALTTg9kc>yv3
zZY%FbSz9MBh)*zpN}p)DD-#>g_<A9(F3(O`r;u4Q!!_EGQ^kw;xvc2gd1}IFZJT{e
zJGfsA=2I6ob_^g}v)#1qOE@?(JpflgsK4`Pcfolg_wB8<it5frDKU#U?<27g9nr43
zP)Y+J=529+={F)rlW+SXBx^4AaOCjL`>z++iUuVFM>{l(Itf8S8>fS5NsMn1;Wbd_
zceD?F!$LR2F#EXqS3+_d6xfW83FSs^ngF@DD;qqy=Nz*NaZrPWL2aX_cv{E>q>U2?
z2ivz_W{zGit2jzHG-{O-JT8Zm4P<wfla@9eQX0GGPr#_wi=I;mMRM@TjPPC2pyK#v
zWkOLmHpuS*eGqiRTUBK8vGj*yTVlKiR!X+nus0jKba;}|+bhpNt=@5*VUD_XY|c5}
znP;&FRVY_`W5*Uc%FWo4O_MR<2X6tz=Gt(_XKO>SaE1=tBPR<+97x(83G6-Y#aYgd
z-TJp<eXY@w=Uyi>*{OC|Aj3B)g4S5n8(#P?*%&lxI}b$CH-dM$z*>vV)}n_R-UU)_
z`s(&7mTtpd`LJEGgoa5Wk+YAP$!;S~Cb}5kbTfvP(9j$_7|id$%*SS?!}Q~g36wD5
zAQ857&AzS2Xf4avD?8m?Sf_FJdEg<|=FF&^!J!iNO5rc8NMg1VIvNvM9H_|D-66Mk
ztEFIZJaGGLjiAb7;#Lcns~C0@B2ewi%Cz&pF`U~n`cZtFo?N+b4Y9j)s_gpJqePTO
zi|4nEoFBVwTEZ<Q0FcjjvcR&M%)&E#5E#4>j1Q1o2scIqGbcl-e+t)fa`u~){G!b+
z7P~2j8%5k6&xIlnDUI<Z+n4W(+XJI_)$rzAYk_3N(qhlT3NTG?w(*qI7A+c3GHY?0
zW~R>1iiM_w9r^7V!J!KHnVk=IyELJbvyn98Itz#f=V0PzE)s`LuM1Pi*J@f3%-^lC
z-Hy|3${@gANVwP7aPFHg+6TFZStQjvKGd~ry^4p+KGQIuf-#rtf<@DY_`DRu={JSd
zxGdVv$<`*pnxt%4u=MsVr*T}6k{@8!i4&*32Wv2?4hLK~!sl(TD?wob?1mgEnfFA%
zF1$`sOeD=^Y>v(01t6@ec%4~;5OcmEVa`a4IcMx5#6|7RwRUM%7jZ`(22oo$W7Y10
z+1^x)kaCK4B!*b<sjd{-@hn{gv9cg@OA-kU&UQ-ei-RH@A?zDj2>UUfb6a+miQwTY
zw-0F+s!0;i;c?)N(-4wgQ}B(38IErfV8lhv<xG}Mwit1!rov&8B?PsSe2c2mv|@<b
z8+3Wm1Oh|Z_FV2<s~K=H2KX{P5n@|A({b6^kp}QSpO;lKaxg1*wd}FK0odC|D(TV2
z`Y~|ltICY$hn59bAt;gbi;C?MRpWBZDP-u~36E6eueoE4I~|%J+ekQbtM>B~;gh~4
zeD6ckCgCLEK6eimCvLmTS3ECC+gk0s?DL~~FixyvHimM!c+NtHQLDq4#A4lvzM}LZ
zt(ZjIyC@9v5cs~;hj})O#PqhohlsWKm}uW)4(9l__=SuIl?`suXe7%x+a*=Gq+gnN
zIX9Q()`uk!B{95Y#ZBFvrp^aAa`)$V+>2u*WZJeLCLo1_c+ByguUqSLSKixR#?Uz?
zVREJ?4rw{FHptW$SOws^$u?u!dEzb^$7pwTuFgF$jOyqdBRQ;C^LK)vE}JeU!?%fZ
ziiATkeBjv<!A!}7+h4UVmoXy0qgwiefje|Jfj!YMF@P{nWhsTZLmcw1(9VlPj*m-n
znW+pmobWiuD;S$@uik)pvJHX3+;<gX?Hls0NvplCB*!WU9kREb_uI(xyqV?QDbDbb
zjEw7!Z*{9pi5N^kNHZA_$u@Sa*aKoQ-xLTp#qG)BsmyGPz3s$z4fO5h+1!twtaxlA
zM`h06&U*OrgRmPWKtyxh9OzmNyVgMn5X6W~MS*t*@QSmb2W%dDv189$J?ReWh>0C`
zJFNg2u%!|Q8HD?g@M(1~t21Xs{vy?Ld}1UV+ZlVoxp=eC?-uleB+lbY?bCD4)FhaC
z+nu;%p4ggQ5L`0m8VA}}O0SMA?E<fXz2uR0Pdj3FI6DJuKDvmt>DwAKlpQ9ODHQDR
zh(MGfDrtQtCx<0n<qB4E$fEZKZMRcKceK__Up%nemzFn1wSu?X;r$=*>*?@+2WA7g
z;OsE+wuaPQySIjDVwt<*2r=q2l9nilM}^|(Tg_TpLu<|6^l6{T1Z6uRv|Nj(j5CyP
zn7Z@}dQHZLYHrNUa$r+#xa2o0Q_Ezcv(G;L&4Rbaga-NrpjTCbl}J4!97o=n<%nPF
z_l)7NI#!zOPTeBm&__Lb+Gxdm_iorZ0#cr=z<js<{Rg*h3LK<zU8!V&8)FgHj6l(p
zXkaFTM6_s~dSJ9WJrgtn{N@l5uu4l!ag3>zE_>DT?m~Gr3SvtT_KQxeaIZ$A8zQo|
z%-VIE<h7=BUybeCONfmV7&9e}wsmJ6-*+MqkpyL<nU#6jTQM76*8QX@yfwwO^T>f*
zal|4B<m5YpPSO&daKwp-h?<n4tvLL5^PDyf{0+u}h=K^BsKjqD9BpwmMtx(W-!LX5
zLJ;yH9#{(V>-vQsls!89qPrLKnm?*CKPjJJ#BXN|OUcQp`~u0cQiP=`q)G;of|in%
zpeQ>2tm4ix8bYt-v8qXnCNh!jgr+qa85)i?UMEe4QwoX(kfN-{fuL{lU>P|kQz~J$
zZOpYK2Kx~<JwVukZ*wHDM#73gX;h0M$%p@vs;Zlns<vK6Rx@%|mNPKS%w=jg%y{E!
z#R$R7(HU+@n#cmjjyj|rvDTU^vXWTkw%corKZZw$aDgV}9Sc8|)N8JBSSh5^LnT10
zRvAsb9t1ko6?{8SAB<7Rcuy%Ir?;7a*o4tp1yBP|a~?-#9|NbOUIL!T{M2Fe)`prG
zA6*zjmbdLgkFzG@@UI|k`4H+Mu}SjO_JmF`4RJoMU_&`GAEgazXMb(=Tdsxb`TX<F
z%x7n!tX3lMJEqPYgZa2^uWHO(9x=3qJ7OV1G<5mAMhUvkNm&OVc49kgIF2rD;7sdh
z1=`GHZJXUYalu6^#}kMu=!J%ou>xwi1Gl1}05A;9acEC?bT2ClMYIQmT#gI$0ZEu-
zFv1vPeYR*0;M<JPCSJ@YGR4eqW^6XHeue6FHh3eV{G~)HKrPZ_fKY}Kq>nb9>(8s<
zY4fimp4|6xqsjv*&=LTS?oFWy3nUakp$A}73<5|<B{{p7o`(-wa3r2fI#+V;F>Y`}
z1%pApA<shTJg35$>O*)QY!(;|@Hi@siY^vrKy=<Sx3J9N;7KzL46Yk+-Up=H=v3wK
zLR9dRVdNBG?I7qpcL)jw*1%|}q1+h`JeHSKjE4)L9~Uo^*VY)>py<L~gTM}5z7qgJ
zKzM+H#^O5Mobqfnf`q|L9vaD#N4fhAkpw)`OWz3^YD7db5dQ^fP+J-yF-oAX6Ltxp
zXeMo1lyWqY+TMl4w!wlJ%C1M;dO$bQDH@<k0Nc=*ltYq&X%wVsA`uhNevAjjgtom6
zC>((LsVI=~koA%#5{(Pmd`S%Te-^JDq0BEJ>$)w_f=&ARFRk22V7+O3F?Ml2)2GMe
zgxm-I1VMHeo80s>jIZe^PX4pP90~KwKciFM<p0a&$Nhvd6A{;47&!Rc_0O^#KB6e1
zS)2GK@?%>v7Fmlsyl32kfV0W!B!SX$85l;EMuJIbf{02+CW2UE0Ej4|q=c3HX2-+Y
zdk^_x5B7S1Q)-+#65^|S)km>=3_%U2UEduJyaz`G>*t3U-Y=+>$BY}z2UH;te7?g@
z535a)`ZFFV@sed<$W~#&nCY`p4#e~_s+%>T2@?dHOAQQ8+HP5Jio8j@h2pmclaD&)
z1WzK&Mi6&N5!fsp+XA6&1Bs{{2IDyf07_X=h*XZ9Iz_{Ubznf#S0zp^%wG2>fl(ys
zu_ki8)u!xHX4);3*?Xv|6ct}jyT~?~;BHD8$7$7Mk+;j!?<Y=3ZS)sse$6R#<lB85
zoNC9L#1=nw$w$$w&sua9lL`qPw@t!dJVD<W%H=fDK`aUgXKGB!7PGi#45Gd<M2&<L
zEl~w*Mb=1y1I?XdW546tZNe<Psbpc@p(-sBAf-#FIA)6Glr?3=c)WSnc%m7*yG9n2
zL!v8s(&-fr+$>ft@u<-;a`f4)Gj}a!j)rOj3b1?;Lh<8xUcTZj$2pN^5{Y!)YV0SV
z&pT)I&wje`-?P9~cS<E5snx_>hG$%!qwM&()nBCK<~oL*$-z8tp2jU&F0jZ`7}c$2
zr;B2T4+FZ;o2Y$D`A@Uw*2FV!DGpmQl*yK6W(0NOdz95?o>Y_Dar%~EW;}VY#%wzk
zk1kPDU8t_sb`rBCzTQ=E_S1Q?aK|De(fpy|$1)`ZYA<iBTTXkeCD!a(@<G|&HIeb0
zF>#m%C@D93Pll&<x#lmq->U|7tQKKk1EWfy#i|MwNb)01c*)mfTW{7S%T=<nV;6u!
z$8)ak{I7^JfVJFMz2e1YovvBA%)>SdVM>JCDBc?=hjctS6M`W$R>L-nTKatW(H@!&
zFbrgE@PgxjCzkthXI+|U@N=@J_6#1D>cs_}TUOe^MQ?Ic)WqVgDq<V78>+Lj7q!xc
z9f8x7fZ;tky{vhs5~u7%8&4clQeCwA)9PK&f~GJg<VGg(4Jo<XeXR}0jPJd&+Ff|)
z=n5Sc+&5;H+G2>rXAUZQar(ek4fNqhov&9Rx5>5<g%9+ojykMU$!0F*%?Zis4f;gw
z6i)r>skrtKcJo91bpXi>$U^{inE?As_Gt;Tj32Bj)vu@1=vd$K^qU8&it$-MO9WYw
z3t43_lrpI`2x~}Sn~uB}1RuMSVi7D<8UwsZNO3o4BVc#!T^M3y<b-GR5)@&Wr-|my
z_`-X7oQWnntRbY_wDCE{1|$C{B2z4o-rc+t%(+sOfzPPpReA9jgqGyWZdjO}e0iMy
zVEV^f0QZ+O<{KfxFq~y4VeSLwf9*Jn{U^M8X7%XOW+D4eVE*{YFSKGcpxYAD{QSyb
zyqs`k7b6jxjfueyS`Hg%KcDo+C(JP&ji_>eq~r`S;e|OaE+(dmA<|u;r09bkxS}IZ
z{PAIOA^LANq{IubwlS&u;S&fb+rV;)Dh$K?5_JQ4JG6Zd`>q#(q{M+xV1*Z(#3R}1
zJ+AZH^e4a&ke+}+KTH&W-)YEX_b0&~-vBnJMF0?a2mne{2q=VMlm;SU0+^M+-XGw6
zsvl$be53Rx@<@y9HvRz8P>*4fDm{5(IA*I%m|C!nW=Gi>slp=5Da2+JCKO<lE#&}G
z5kv$9Fyt5poD4uHLBPZ?K+FNsi7N>`KkM9g8+dSkQA8dO<sjhhrUID>szNA=kSU31
zWrC<0Drk}lh$0lErHLq_fQV@tiGmW6iUOz#sG3ugusqzt0Ot&{P^H_a&(?3_%JlaC
zVR`KLAHV&v{YE!|e1_$*DEsm9VhUz>iUB!HUdo7^HKHIuk@cz0cXoN<sfhGs?a;rN
zHT_x?e=Y7IHXTNx)z^Ahmn_A*5QG<9BDO%55@_n`LrL<bR8lJbzsz-^>L5+ej66<+
zO%g){Nk{Dq)_JMpu6%q<J>lEgx}betWm_tP-Nr&yLs)#~r@7tMcXt~XCqQC$A5`4G
z7zed`0pa2KaR{u#B|kigiU0P|_FYiaq;1s-AEONoBj{+rNep4OIm~9vB4Vnr!f2vQ
zvH}UWLIX*VlqD23L42#n*m!qz%eor){kiS?Q+~G+aJ~sw3{k}U^C!m=p@hP&iMvse
ze@FE}0a^$AW^s2U)lCT+sCjX41<?wz%uku>#q#xT0!cbTs7R*&6NiDQ{m2>|&g|2?
z#>k6unHSh^>V#gB0Ah6%JLDf4swjYI0wq`C92lrMsnz`9h+zFRr~Q0J1D>c_RNVjz
zI{>tlfjb<F&%FW#E|>)+zZswDfj7R1{Um7K;QcVMARYxmrnunBURDm`)msZujj5%h
z<1--S-fvLw=#DZero$0Z4AHDO#|cP=xCk(7j2tXjC^z0~LR>~?f1Qyl-3Xh3NMLCu
z(1QuiOUoi#X#tgWs}8<j6G<QWNIuwy_#fVXsgod|<c6N%oW%ExY}qlPlL3PfD<(>G
zG8Pk4g-)G{hsuDn^vAvWUU5Jtuf+e}X{MTJs%fH{ymzNlO*Gry|I@?7(M>emW0Ofu
zG*eA9(@mIU6|i(lQVkgbc>)3L&$0)b+o15eGv%xPEiboUM%%-A=^En`)L=-KK^UDS
z2kd(}&v_4J8?R=pss)f0PX>XvLT366G4Wxu1qd<RE_OP3dv-p2>8-C$iydhiWTUhH
zmqXyInHlZXR*b;>|Cs<otRNKHv{1-@yR7EaLtXp2jrG{C^Q1%qVFlA|km+69g2TGI
zKQMrb0w8pF^bOCF9|Iz^l1UKE3=mWi5HScuP>IK{pY!hO57UYEy7bsPm>1h+OL24V
zwuvv_`=aU}tLf*zUl>mD7ams;Mz5CPhE0(~1~a_Ekv$M1Y+7E@-dtL67%?`6z+*m1
zD<qyQ;h91N8#>9vhM225(Y?-zLdxBn76ZD4+J=b_`3W>(`%N7PF2SMMtEMOSYkl3C
zfxfTsPI~-N{omw1m$eccjt*{9MVINfz$8HgkCW&o3Z`Sb9F89V`ko(;9GJ-m!v3)o
zf7y+8n~!1Ha>)StCoBO$KM&hM<@Dg?34{nhI&^dcobwxgPE`6yRD09sl8B200MKdz
z(*yzQ=lI~4<Ug|s^AMlfCNg6U6G)7nEorhZq4cXMyg6?d@aF=VWafw=<Vw>)_4?nF
zN1wF>T!a5MN<^dqnM4h@s07$22~px6UO@x}p*BebL?}`r@chSV8BD}7`KNg;fe*6u
zy3}!zpMcd88ij1Mh(D6U_t}gwl*t}4K8*_p>upHT&MxVeI{U?#bCXRol@x3$lSDQm
zNNUNwDbv_J#2m9R$U7@i%L_G;n9_0pYRt>58@4Wq^#q2BG|m3%nUe-HBKuhM+MJM_
zZyut<awPd+65I5dzI9I~V>p}+S0MWnW_0b_ovXMOruz`^SB0+ZP&-m}ghL4>aN!v@
zDX!AbVI*`|=!>S~dz{I5vWjuRGK6fDax5Z*`y8BYSId}mFEJt`2vreuviVt>BXk#L
zy<XW&Sd3IC+<XCl^kJ7eUG+Dh&RXFTxL-chY_ee~uqQ-w|9$1C#hA?TMJ9@IA@Vyp
zM_BAMb-e?m(`;uXm8Ao5nRhr{wm?ml2-I7bBH4VitkB5=B!mS6j$}|}sXK^wQ3iUy
zWowsw;n5G@4%}{EnQZTV+N-V0+nyL|B+{$BHqVJqXm;J)tU?{~aWIvUX2L-K$oFV_
zI&JyAFcfWO(;(d{PW;{YM8-IZR9tacKG^Sfoz>V@;tin;(laiz6vp#WAdr^MV{yrr
zTbkHOl4RiTM1E3AV-NeHo+lgdo~-=Ss^>cwFzKr_VS~D}yHOycL4G2`$0|6=i<x@p
zo?EP~HK;;B&51iE2^2dTe?vr5QwFC~%D{^|f=poDZhK_n9xr@xvlL^IdvAsw)_U$P
zcL>74Edr5Kg&he~cKn5e&_YEaHs*YeqvUZ+lEhG^^mK<pwrtEhgHYDvD%PVVinWZl
zCBs37q=Y1p8DvW;cjBBK`Zj5ezV)QK6%lO-FzJ<IA)fG>O~IgE9Y>2npfN6JiQpWA
zIm9`x24R0Q(FhwTi>Hh|4b8R^gqny;K&v#P?Ka{_K>X^Ca3?AN%4C5PK}9(&C_Og(
zF*pcpIs#&1$Pa@Y@hujgep`9u7K-5>|5Xf}<T6w~%!td_oOjnSaxPw+t`v8MB>J~5
z+ezZc<Jv|jZ-G(sM~VV#Uy=X1V3oZ!{o-H9f6?QxeXo1TbQ(U{{1U%>r|F6R6fnqq
z$?=ad@A`ZLkSrWR5>oSfmLB6B%3qJ2d>t_|9!li}H}iVme~wp@rn+{<&S_YaQtI{g
zNsU?=Y&m2~lr$TT>1;^AB8}9}u%`8+lSDK!G>2j#dynq~JV1b<@<&iFrYZ>mq)yQX
zA(dA#h8~FzKR!4`4Dc1wA5<w4BoUB8;esCPBE>p4^iXq~{v7GgrE%!yB91C$>U5_!
ztmeYTTck~j>2bOSahv6A?R@T<qOB$34M}Ici$p%UzD=k!nr||u9tuyX?HwC!Zc6KH
zmD1b7$0ZR(;Ebg^!x<Q2$Jp;|aN@RmcfKEcZ;@-GHtR)YXBr`+v<}-&dgLw0uH9>B
zLvJXe9;<Sg+rRhUS1G$c=HoYd=Gi-6d=1-@Y|JR-{AN<@&&7D(uvFDV+T6Z#@F=da
zey(`rcZcuRxV9X$bq=cQvVJ^vmAmLenRR2Xy(e>oJ4&-^PA;1|T$kHoYiCZ5Q5s!v
z?E<rt3L9G<fA%smj?Us?uI7ymCv5K+JKP<)PHUYmajOf7;}-3M9dP?$9Bw;Yd`}y^
z?VHVSdXGr6R-Y?56C<c&D8YF0HD$KeaUmC$;=#)^Gj#s0I;SE;B7VuFN(3Nf5675I
z1dtR#D9c3@tPrsYLrQbzAZx0>d?ZSgv=od)gaJ)KGEq=fG@zA3N)kXcl*FsRJM{zd
z@Nh9D{{Np}Hyi*uu5}pMSYWwC1t3y)5*W=PK$I;d4MQWS$sCxN6`-z+0woC{0g{xS
znV2jZbVy_wQ%gw%)}<F1^?l45Lr|$PHA-Z-OhmPriI^AxJD(%Cl?Uz8`t+ExBAW{P
zbZQ-iCVG1~=R)PaKIEB}(j75IGYCf6&>C7;lwA};nWju)bddiY15>aS24tEG{3@7i
z(wlY7qKq$W&J!d8&B=hg(gq>7U<8|2)cpRxk?npccQw2*iH&PZra9J3eLH#91n$Xb
zIf}-Fm}-WK7$q#M!U;0bM`s#G21Z;V#<L<5SjG?e6v||k*2!rhW>t?&955j^1vJ`W
zpsRV>In*%R+r*@hV<aspQ;o7VNZ_!)Lkt)(tU%z#a>-4c)M9*Pp@vGiFtwq(nl_Wx
zn1(bo#at+*rf4Zv1Jex*ZN&&QqYX$_qE2*p?NDzpZa2Q12XwlVf|oEboXoCD79vqm
z5kvTRa5lswCkKYLEJ5Q|H>}ZejHr^9B8ZsF3Qe+Nz-Di1(Iuq`OewUWQP8>83=D{D
zNkBes{SQV<u4I`5g_cMs2a#18ILQu1D2mXLiU{h7SfH2<Bua3T0!X?51vCm5zuWJ<
zXQ)ljPC}~qhw3o=CsyDf(0Cv`P9OyUq){k2m`)r}HD=m`*1*#G1Rxzx#G;B%$A&@~
zWf52D#maS<VSfsu(O{J8L20c12EPy4v#eWX)`OH*K}JF4aw5n$HbweevPBq^X*59u
zU}2TgS1l1&1DVB*Z=7BObNc^+BTYnZ8~#%bsIG0pYqIAG|10hfj@xX}bvkM^MD+*N
z_9B!~c!S8CLS%=8LHkG#`3Lf>=SAjKs;*W^Oi&5M?hy6)<NSL1ZJnpMQTbec0tdK_
zuhvP)7)&J%X0!lAf^S{$eR1?_6y_3;Sn5m}$%tbE8iCvo1>gCXg<fGQlz$wUNEI_M
z6BJV`Aricx3*1P9NfI=Iq|itkMdtM>P_Y6w(FgD%XCzN?(nKMYDMc7qMo=Xp2xSQm
ztH4n7#`dq|6U`tQ*zTSIk9t;jarga6woQq8pfDK@8@Fo!k$|n+^~fRQ0R)mnw2JV7
z$xuAslfWS%ArgK7L@#7Af#eTNJ;$jMP&yyW&<>&&sE7!XBalWA5di!ML4gVMUcx?$
z1|kDwaFLME&<4{+eEkLfY1Jx5uCojgNH_<-MElGh>3BoddhS?CVX(<Ni1D~@?y8LG
zEDXa8aEvM#nVmMUFqojr5(AWx?oRHnahalYeONvObtOM5(ss2~6;w=6ML|>)6h$Bv
zB{I|%O%YOYWE533SUicVv8iEXuc|k5!0H~zL{heA#C0CeGx7L*1P_o0`afnX^@~cV
z!t(=Z1VQZHm`$J`tbsR}1^+BVEX?Dnil_S_IgQBhf2*DEf(GEh=>lY^7EVOa#A)LL
zAV*f@I*&caY}Y;4Bk+PLm?D^7^h^L#732`BA_S~L1F{B?9F?RI$O(ZZWkezbWEetN
z2$eO)*!<Y_F{VHc5E@ZArFFr+jBAdyta00HV*_!-f~FTG!6^n}U}UTwu#993u!P1U
z4DT>Ho63~j&>!&P7kX3%hF1tg*c?bUh?+9MtyyM+6x1axEg26S@uWBz8Q_Kn#D;L0
zq??e{;#3u=_RWCB;l_i8-ZDiP4W#%Yv~f6*#^IwhrL<IajfVt8+e$QyVipObHKv$o
z*3Cj_FaRB9RG~{kGz>)}5k(gmIhG_q8JHA2L78Djqa;k1P-r4@910>6Ffy_z4Mzy!
z3xH_YL{yPQfzZuF#8Vd!Cr%B6DxAm*kSq}bhDIg^WDz)oL@^{XAVM@0L6{j5)J&u>
ztAN%1VrN*_1Y?opNBtoWED4L{8EYFurmBzjBW@l*P1W2BqvnW9XE^oG$Nq!JskczR
zd6P_$3Hi-$%;3Gay)}vb*kQjA3NS{Y&;(4Urq+;^Q^aWDrkWNI<5>lJ#?EwmxOOoP
zmnKQ5uPp2yWnKPzkUN)z0fNDGtc|$lZbRrjLH|Brr^ZSW?7<K6g$KfT!6-fyop1=8
zh(q{BDf_U*qxAj^e@??6#RJYX0w71hh)NV<qJs3_aF?v(r*b(JRk7g~!h_T2+<H9S
zAQ05otJ!h|&J1V*ilH#W1^E#@%kNGBx0)h$uxZ*N0khQ#OdL@uA%N&W@si=JVPwzU
zU=y`eH81diJ#d}UrxXyqOmH2L7;H))9_*dk_jwfc9RLB3hUM!}$jNm`A|Wnk#y*CQ
zN~z8=k9<I?H5&%84F1jH`uR~GDT}WGfmph=)L~pdjA-lz@I4pWcXSUKH>e@d0#N24
zaP96eBe`*1N_Ft)Pl$M(#<o-uE4dmdh-d|(Ac^1PME^I(=ur=+@C*_7#b8`943eTF
z<s=mAC)2UgoxD+fQlT=uif(LQH(J6zaYYRx;3RuMqr3nMfmD(FY_*u?stQR!8auBO
zjMHs4K<4q_5lhG7HSfwOpzI+5=a?zeGDuYZTm?E3U#QF~=4Tt&ZUbb73iu8Vd_|B;
zUO1HD8GvtJF)`*(sb`4^^TYCl3Ur4cW{uVRW>4<TLo|ABp?}7wymR>=0m?`RG=YpI
z4Ixt;0((hUw`?Q3f9ur)k?>=HZcRZ=Bf$sztRsocF*05(iee~X7p0PpKrY}1IlvI1
zM<r<kav`e#a_Rls4*^TMJ%o-Xl*FUNG4<Wr7w<SfL>c2@_l^;@<ur)N%NIRn;GtH8
zm_YFyc@h^6_H5RT1cn08Mg-*cOAz}N_Lw><1L6q)z`2Dnp!P%Hcjm?QRH@1oG)}_X
z=c`6k5d!y0A?lQWq!}bPpOc_^NzEe{^;m$t<H!Td^5$V3XPD@Xn?&G0U*PjJj)}$!
z5ytrsEEj41xF~3)OnM5va5(Q#4&Eo{pUBw4W$Qlzdn@x{fWUgb9Z|{g_A^Gnm3!qk
zN9iMB?a$;dYdyR=BJ|p?HlwMB;gj2Bx{dQ>5C_G9iL8P<BmoH(-Uq&^gaB4bFm`*J
z#VFbakn#lxJ<uT1V_R0xZM;#AG&uuPnXRVWf=<RbOfhj`2p!tuceW!@tC&-8?!qpZ
z2yr57F%IH1+K{CU#!0PJqeDT2VHXZ7xdU{@r0W5YP=yB*yE6(EG(*Ijk#zza)*T@*
z>%*itklhlRGZ$Jh0CEALB$W*iBdeKrP%>=f#nDHsz~<00fk-KX0fEu<wp@n+LFx=)
zSSd*aLe#G-WHjSZ4-&FQpfueG$Z}GYiIajx5u@(1J^}K@wwPFLil{CGBNUl9B(MM&
z_=m75P%!YgfcMHu6=D7mZ)4p(ybappc54!Z-W1hKbBS3@x0K;8^URWl03i@qARuKr
z#zPW`!G#0mEe1k^K<g3#$pFM9fShE6!XYpc26UJSl7zt=9{BW}x9`1ll@5wJ$^Nq+
zA@u$0VW-AUeo>;hqj0Hl3qfsypCE=AEg~h0ifXKdH7Z(BIK<PqvMP^pl8wM?OsNB0
z9(~p9U{H6?!$sU~C>EE*RNf-SHkhKegbPw_=Cz%k^)II(Qg4Qb&x6N0<cM<S3`3x6
z9V-yc0TC-v081eS0)3xjsW;%)RZ&Qo3`*J=A<QtG;CY5&l{*Cx(1$86w<8-Z0Be~a
zt>kWELS|EXhyZ?Bc`T{=;vhD+Zee2g$kE}7cSmMNl@|2BXVjQ#_4MSUeA{Zio_*b<
z6sVgJi>NU0^j<sELwOM64+KFa21Wn@@Wg${WPh#2>QAOmQ7KB%UaWG>R-IHus|}gQ
zn0bJeGb}WWB`3OEr1p|yKtN79%_wTX@bUj9kWlq@4oh3d)}XsZ@EyHD`5owO4<2HH
z>`a3r_F|+MS(ycELZ*I5Ho!_!1Y#tmCN9>SadblvRejID^x1^ee)^@<jKGDUgCVeq
zYegaW|F%NnVt|Ao;+qgO5un?WM9hMW!To(mY|)~|-5o492SSz(R~w>o5t2#xon;#%
z033QKiAYJO40sHraAYDGgCRw6lNK?eLL(TFQ!(I~Sp+)>F^pw|#)w$QNeJ<kw^=C=
z*oeg>O9bXP!jX&!)ax`9pafB^iy>QWW^<v_5Narxl!jQ<gVmoF8R0Z)IL(m)B0~hV
z{$bE_=)v5?6!3d+T~lx`Y)-EaxL|*71`~!sAu>=VW*L~<A7>*3PDuf2R)UaWgrNka
z5U_9)2ve|rBjA4N9zTR#Ja1_fNgr9rAB**3mx3<=q<DbkH4_k2RS>x*&+`T$wm|OT
z4^nAWM-_Cc^OG_U$tb)Z>Xo1a{n?3-@{}-*5+O>oI<g#-(_UZ4y%hW;A6fxE3Ort2
zz!1h&O;j58%IWZd4$|cTOo*T|NzIym(P|es=opsGtxxd&j@GYKypy(Q;vT4JDG;KC
z3MNWH@)A=ZXbMUS3Tm1u0LB*~prt7ah-g-Tm{zEvq(F&Kp=lN*MWmo<szQoXC?W!d
zD2T{hh?0dU8fgZUX%c~A29$}RLWQLQg$kt#0;mdFh^B~&rYea-mS6^ur3{e_lqdqI
z1ej@Z43>hBN&%88l7yrHpa!WLMv-Wx3PK1#q)J*v!CT1Oa|ROPv?Ke-PA^4??t*5R
zX^IL$q*6hpprM47h(p~l1yw}6C-CAMPh2>I=OEA^P|}J*dnCx5v5y-qVB#uKMza}!
zppxpELXj0%irHId9j4<X2}}<3LJ)kLhTsgGmJP-+fh-y$Q6?BfRX_2a8`v(3L-}Mx
zq3-UA$C^ndA}Asb+=`v?^7j24y($VU;J-q=j0*KVuOR~04X>d@tpva#bZ`xXo^$s1
zV%?Ug$gwKyEE9kLbRwHazW9B{g^CaInTVuHNwsMn!ZK677mmG<ZJega3Q99FDoR5D
z2ta~OoJmyD6j4kRQ2`RQF$9qf5JW=}G|>c;LnIPSK@`<fB{UH;6G2ccv{4d~6q6JU
z5lcY{!0>DpJ|XZE+H&vT<WSa;^_npSIvX9EHw)HMqsa0$?KUr}=DYyLP6&dZvv!i~
zHm~IQD-EO3Pk^ba0wfrKq>MbmQrS2mk<0Z$YU0H2^Zfm9Zx9%=2_A7MlAhaYmcqmj
zGl|-Y{e0f1z{e;ID1l-T!Gyw%r?dMvu{=WvyTh_<5HuosjKrLR5ICPnB9u}k8A?eb
zE0O_1t5r+{ghYgagL=5Z!ZQOCd6NwomOtV8jEu0*ap8^{i!&=K#|If?a|R_0Vq-v@
zY>P&%0x?ERwEbLVMlfzEKU8u96B(PZ;u#~FcY2leV-WByk!#2fiPfMEx3MsAGAXf)
zF|m6x8i*&zPci2A<kTp;J#EPrKmcPI2^pfK{b}+3@C5IK6Z^;V{hqUn<&CI$0iW8Q
zcxO=7EvP^4Ly#0DAd*!7zV6Uuw4(eB6CYVRY5hmD!xQqKmDdsGVLrRql91>n=sjWR
zk=6u5C|9@y^SFdqba%Dmq?nWl`dO}K63?3#3osR%$AOfzPXQDK5dtVdWbs*%Ao0fA
z@0<U8nhBt7M=VinPkM>Gnn?-a*+AEix8{>4S>rt62tp8UC_)f~AqYYe3>yY+sa%6<
zB9Mh42tpA!IS4{Y*TC^9vsI0;fH&^EE2u&cZZ{;5gi<#z9t$VdpYT9o=zcgDND!YA
zN}tn)Md&da*e5{*BWXt9j6-pQwlWmZlqKMX1JqH{1%~K^^|9yV*h*Pl7Q(2f2r#M~
zME@oq6cSHKfMBoR*X%6oA|QHM0HJ^r(9ZaIKB^<=1Kfq&&IvBn(qM=~G^A=Mx*AtS
zAtJCrR8_QC*)EotiK>M)0cZ<Erkr-@G5k*7AQb03u|L}f8pdIWq1=W9fdD;^LC2TH
z$0PZSQZYg2>zRdH<k|kupu-BP5jdAF@BP8Db?$>0?@ClN1eH{=sa;Bri-8{OKahk&
z9}}K#cnr$0t60+L48c=D&vF8YVbDLK2_y{T#sTPlP)&6p!VWVK;$mW2asVa(9zsFC
z2u{d}0Ci{(D`3HiFr0zC3fNPGfOiOD7}nabS4Or6t^kXVehdBNZ5Tuw*O|0<8O6h)
zHK`gEghLRFiU12u2oX-r90UjxC}a%+vAo#`B62#xQ8nC(2QGtr;+-{uCrP0~M3$Ik
zVS<V%1C}Se>9=rYgM6)CE=!mfLqtL}#@k7>ByX1NQ;Ud$WM}gDil55>zhnc=lD(pZ
z|3~K#IlxAaaGeAX;_G&84g>w?X^DzufVn6Jvw@PT&w6h9eDpkufS69#tCC<O5Fx*T
z27^0?-3Z=T36Wv-cEKPYhR{(6(wlIRfxiifqx7dZHja^yMlR>kCdgVtQna)M3VVC7
z)Go+E0z)CEV<t#wf~XM493VG3`_uctT291^xl&6A3JgMGTp%8C=V|ota82ANkB>vB
zTTJF12m@pp4j`HOM0N^Rq);iw@ppe1yu;;5dZ*ox7Xec8&r`h729C~r(-U2okv&Pa
zhr_y1b53w6Ec*H3Hjv$oIr{86D<1IJ;1P3DR-RJ{3E%az&K<>6q-wgyrI?e+UiTZY
z_Yw;U@XOkJypwh`GY<q7_?3EUQR@Rw<;)r-&Wu(I{(Ijj9o$aiA9CbCl5h{WkYz~`
z^}rDzsYoGV@fA#pe)BLgU(D%q7YMWcllo^;aRHW1R}kwAC_karEh)GR$#!Ka1|s1U
zQm(G*+7erYu|MOS8sH+bW=S=a>WftlA(@L*nlVHB^HWwCPj0JB(F;tZwnD^!e<qH4
z#AS`e84}YgK?VxAG!YGyF$~r^ja4?Gc@8#eDjAWrVD$(+M+cI$6mg`+Mj|kL5Fo~w
zsc1N{pV!8y*|RAsEn;LoC=ZA!?6%A$1VTxeyhw+D#8vvRrza`Qa<dVlj39^@j4*5r
zA~3`D0H<9bJ-)n314&8J%8EiPvM9(X5wgWHq-sI}2_PuJ4Ux{L;r<}Q^KBGNipTKI
zuB?9k&_^X{q$oh4plPK9h^h*RN4J;&Xe0B;|D^URKRDl&PbpV0RNDzgOA*}w4@?hm
z;4FFIA-&@}@WnHQr!#oJT&M7a%)w8oAY(=XI{*SlOgdRYAatakh$RT^yB&eeKk5Qn
z06w_V5Aq+s3_o@TZLiU>izUfrK^Y;#r@8^yc-VHw&FF{b4iym)51=V<*r?atdo(~I
z!~ASHTGCmiH|}8C^DdJ>d^zXIMMVafDIq{j009yzBtjsRtRVqY2_X=Xr|MwW;Buq!
z`a~Cl*q|SW$AkRPr<v^bifydSX(^V34dwTM{(nExkdu&eRoP!ty5VABwispvESAQs
z(2iz|;Kd9MC1?Z=6l1Qc0-2QcYebPQzn^}>(ZzGs{E|5VKo2$JUHSDMyif2S(|``x
zI7f5C6x5XDGKV7aGj&6=dn<Vl$jEj8^XOk7Aq>fs5fU&EO+|vEu=_fP*8aTq<{o_i
z>i>7hzn*^_JogZfuwl&1g>ZmOfLtYHgyAZo%=m@|)7zH5Fq#nHhfwI_^FU)EB)*f~
z*^-J6u-JQJ=FEJp&zw3B1whV8{vp%)HBt3A8GI7+9a--ouYD8s8KDP&*QSGW56fy1
zA(Wki@4)l*@EUiRG#)vP>BFoijchO<iWJCAN<VC;^iL3{X%2<ZfoWWjm}?N-is4zX
zD+N%W1ZQA-m;%I9nO%bVgaGq=VWGNUhqcC@73z4#8l57FD6AN$eO&+rPcJY)+#KQJ
zGtywozJ8-R_4*Lco-9U-KJ(m|2XMLOFQc(Z{@gJQP9;-Bl!cjuhlvDX2izy9?o<vB
z#C~`Pf+3>!{P+6R0HG=Ep16GjN+v1PO8H6AygwhS?R1)suM-{5SDZV`oRW#k%X_{H
zCgG6d-QrLLh$}de6!u>Z(<3hI(^_OjW08m|h(rhyJ!ud?kU~m&>R{Y3F^Fdn4I~!@
zttO;(E5rz4yiO#Gz>Zd$h=7^~A#RsMwIPrULCmIL@zbLfPN))_9U<!U=^E>X4Jrmc
zqba=S2F99TFpz<_1i`3c$8dL^u7Vv$G8Gg+VlkvVz1S?C2kWwWlmL(hY`i<}TlrW(
zc3x$R-*htyIGhN4<l>Pg3Q|QeVCr*v>4*jpQSI)X5jCu`&EpUM0R#>SNGgKiCs8B#
zQ!l4}yi`cuYB58|XK1BVL1JIFYBW*EmfKLL=l^W_-uH0R^ValjSfV<?E_c?}b2yte
zt#j6kV!1YXZ0@EeA=cVaBAjijm~HzRE$2^n9rGX9vBo&r@J8<)V5peqXVs1Q$C-QG
z-OS}q{R9sD_BqLOZT3RvfzV&O#w&-|)HWb}?|JF4VO)(zMz%G<$rlbQ5}!SzeN$H#
z=Tq9t5d(`n_wwefS*(r(-cpwm4$kemb;p0_)itft^{YKSyGHAZHxv=dF&IS?j!T4|
zUWd1Eh#W()gwl3*&n9I^m6uj#7>17{oZHZ@4aqHrVE}<MQ@b{|a%}6;X8NftQisFZ
zRkj<if^$2v5O&w2BSu9c$794vEJO{K_7kl58v7-n)5SK))<zah%*kcYQc^~!q#5Hd
zd}5ouL<sv3^ymsKLU)u<`)9dj`=_>yVk?sdDv9j6WU0&fULWOWkGk)aKO~RKMe#{Z
zF40ej54Hw^B$OnoLYgQ&mO%`WG^G_lQ9(d41WHmBB|;|7-VcGK|Im*j`-s7Xe{8dV
zxE=?BW4V$iv&MrXWJ8;nxN#i#273J`06IA^#h@sqq-lmpL&`+1Z){BN3<xmAz%Y)}
zlDkNCA@W%}YD1fX*(R@sv|>CR8gLFFXbm5QiWm4Xb4MC@ng_4+*aoc3;OKE!RMcWQ
zWxZ~lTu2=n<(uk=wFdz*Ngxmz8f+qKmIQj-O7?(kAgvRDk<UAK22K)D2YtSq6Pcjc
zPVmYBr$aDi3EWu`AoT5prHQ@-c0kljp_-{p3V`IJgY@?w!0Lw7ps0}MN&1iPrlWF-
z;Ve^e)+i=PYnFx56$Yh2p;xF6QE2<l^8>g*hahOBVo;SKPSTh%38ut4<`W6NK@>QL
zVmpFfIMTllDcSsL56qx^(@IFthUIsqNfI0<J}N_+Ef8`%j4;6uy5-r!%q1}ZFStc=
zC)XSh<&WB*tB^7j3(6k%slAhw?}6%=Wfu}y-Fb~PH-=#51KUQFU`dpS(qtKukWENV
z5s<Y+SW^}`GQ>#|OMJPF|CA||Q%w=NFvBMy)DupGX>G{>sd1q~CKAA`DBB@nibhIU
zmI9V2iP4nk7^E3BW_DWu+g<eoZ+;p0*OO=m^(O)<V1;Ukn5jwviYg!onq_7Ps)$Hp
zVqu|)6o?XJssdo3h>DPC2$7_S3Mzso2q=oMoQaU7qNpNBnkZaSGKdrDmk36v0HUI1
zNUBL%C_;dV7>Fepr633yR*?v#We9*sAYuxjX((w(pTp$jd+~ol>%cBH6IBu)FO)V8
zR%Me0hOp2JFo<pj6h>u(L?Z^p5AEc&CK<dw-%zyI<)cmTV_h(&Dz%=jjM9A{M~ciQ
zsA1a%Jq<CzmN;e>Q)5<VXQ~pW&7@1W41XpTNxa30k_7s^^e8IWo_N3x92IaBW*D5n
z2<Oc+Rk#y6hXfC6gwhz1f!xtVUuo2AeqwDoAsbL38<~b?I0|Uis}F<+BIFawP~|Ec
zgs_J`akaZ({Z#~ez6IoV0qe3-K?BLJC8B$uAE^O^Bt4H`N7eFml-QSWI~ity`hbFB
z2r0nmQ?SDbau4y2b<p~axZy9G+aS(?o%K+jKQ$IBA)ju@c@h1!HrrN!r-puayz2EQ
z=7N%unj|{}5dA}YcqC0UQ&bcbQ4~!OLbd$)ll0?-Uv^?15*SPbjLbku5Yj;`5=ucO
z5d<<svkL-9H8CL(6Cy=0K}|tJN<bu#%|k;(fKZe~uuCEk#FUjo1M|)W43yGK5mOBb
zOid$ANkT-xeAsiCYsVbvuZRUbyVu*A`vVWL)*cb;iIwPs=#)NUX{n+sGXScll4ylV
zU__*$DQF<Pfbo1&^vH}(&I?VWMgZJjGWsM*a5wOV4HTo2g93%dkVeqIaXUB9;yEsx
z&?cy#x$sl3Q2top*(A#hH@gD@LS}rq*LP+qtDao8jmzQ4^x*KB^alkZ8dJFY_{S$B
z;eoK&j7IR7Nr-4B$%l$$u<3*d6mf<pR==#PkPAaTH>UU<v#U<No|ZnUnu&2~VpF**
z9XOP(Agz%Ub!<~At$Bz@zp^zq3kFt1p;4W*fund0I7CUz@dMLnPGc>C6Hywl-L$fb
zDKMS(QcWTeh*Sm4_}t(qO>$k3_HqDa+;6*4zq<Ia<`;b_qUzS0V^NXm#gRjo9i9>y
z4@#k?;~3=O%A-m*BVp&qO(RC;%7-LuVqZYQ)1YbM(;+~36X0nuE$G)0oTk}A4)I2i
z+<V4Mg1Wd|RajdRiH$T@B-8<@(V@sTB#97Az>@|Hse&^Cay@@pdegZBZu8s-?NHrB
zH26!9u_xCEj}#60zC=SgnvaCoA=zEYOZ%jWL~^DN%qfehHp28oPigS%^JF%G@1Gx@
zjTHnLi-Z)Vn3o~n&~?91`ABh4@p|AW6J+m31Vf{X5Ttbl77i&81WAQT2BEVshMNr!
z^#{uGCxWsc)<_;mzDII=`sM?66hx3zG(qF6bP-7&!oa2?kf@lTl9iXPdXv%v@R}X+
zl3p*e(-m^S!W@(^g+FxU3GR^1xCB5O%%I~o8j^??kb@1|Kz5?+nSv?+f&yVuh9-cb
zB&DikgsGZPpn-)7PylQI5)QRep7e+zqfe9Y{3*IVbyJ$CD{+Ab8Zfg5EF7G4%^pj(
z57>pwG6c-PQp_5|0}?AUSAcBIg+U_@RXURZ14Mx5S=k!4>k2fYj@l;!Anx!5Iv*rz
zOe_fx)P#qx2R*_<kEPM=d1`-Yx4;{NwIq<nynTV(YY(d-={Dn@IhKAE4&Y?yNhqYG
zm<OxaZfcv>XH6Mdk!wQ|YbQ&DlvGtlqc789YXHb&Ck)Jq5AczUZQPV7pfH}nI>F?|
zI}<~aWSD{=#==Oq7;~&K4c3`sV8V|Ef?6}+SQU+!Sh##Y_C1E=TMzcH@PVZCF_H|D
zMCQg<vKY=8VicA^kz@j45}?%!NsZG2v`reI&--N3(<^%2x{Tviyd*Ffg+rz)Y<O>^
zDr-a(4J#PIurF*>Lu_lNp!D2mG6F++h|BL!qu30@Zq-O>K<){E!|{_DsT`3($KJuP
zY-1S44WYNh40p8ePSoge61YL}8Dh%>%tRrPNo*d5j5gt^6M7u~sJ6rpy@Xw~F$tby
zywf9=%BqkBkhp>xATae}ft$cwGXR2O3JfQKNE5X7e2ZRU#CiGkzHqW+inKe5|9`Vz
z;o-<$CK!@LmzWda29!cHivgx$LRrA+;mkiMyTiZKT?WENBq1<NY4H+>V{4{`(1%+r
zw5@bYKy4e$L(6G|Q4_Qe=f5m$LtuiBEJWZwdR+j_qQk6}+@X}#0w$|N04IwFmZ&Ng
zuJe(>l&E`#B^W3s-jmlsGEJdC$PZ7b-_v_w9V|&wMs|`84XQD?@MuDo7}QV?f<~1m
z+R#u!NfJ<1MIl0zLenf%R51tU{wZQ28b_lAS*gIi#Qpk3)4LlE?XnVm=2!Qb9iH24
zG2KKNJ}Tg*5@)}m`IGo|tD~jZ8eD9Ouu)ECc&cEZtcLYRr;5Y5?!c6{!oy4m(Ki)&
zCk)jlv|{1F)H{ue)&hv-HXRhZY8BKqWi&{`m_7qB4vdjBcw?PYqqBf!x3aQhA}Y$5
zW@HcvorUm3M8%dQqON?+1tp=W1{_k+S~s{k;887W6lpf#BxNzPz|G=Om=Jc08G;@$
zjUXYq%KNk;Q*H{l;{mwVh@ztip^_E$E}9KLiIm#PfHzpVkutV6YQ#ra=^TSbqB6$7
zBO!p=bE8%5HHOTF+8z*MgH?dXSVNWwxslk2J(CKSQjN$M<~I@?k*S0V+H*BHyPOT=
zqsD3?s%U}&)-tgeVMIVhL6#K+=Qxy1G|9aqFoPMU3KL2g^_r=h=#)c6m?UqG4#z3^
zi2er;7qN&S>cp^k8#QSY1d)b-Db_}_L`5`6%9KD6n-h&_XR9EVLeMliw6<?RnTVoj
zG?F{bA%Iu9X#h$`280nsH82aT;mEFKd5faQF(!9WDx(-B;&o8+=q;ug&Xg1+HDK07
znwnC(+YNd-I8A}@)~R(wf*vm*RHOX_VqKp%rU2w1i6@-hriqC+hN8k@rtQi#FvHCf
zOD2{7ZjOj3=?!onkYF*E;W>8|;7E)P9EP_;L32n<(>Iqk&?d;+3-2ECW|_kj2d^rO
z_ifHN(W1#vBk|ni(1ed78yFfC3>=Dh91!Iji7f|Q>D$JA?erF21|CQw&=IuXpn>9K
zG$#%scds=MBj8D0yRSdU4AKceAfUm51YW~G=5wB3_U0uwAP33YQU|c{ebI-!9{wTw
z&5!zHB9EPLjcwS=+aL3mY6Zz<l`bX_8u}XZ0q^Jc518}%XPdw{=$L#Rq>w>`F5PeU
zA?_F>a=X*7)D=lP7*2th5&idSXZwGm&#^L@(x$U%L-ESfyS3C)-nc1-XaFqb^oRF9
zdGyf?z8ll&hw6-h2P7ZI)Z;gkdHlyw+vlT3)9gdgk}aW7dk!=&;=(`g`(enE8%SZu
zM9U;FoR~TkW=5bo>tuD!4337QytqzK-)sYf@l(QjO5HR1Eec<r!GZ<Zm}?3LGX-&l
zP9+UW2N8SRXvkd>E~E{@Y=tIN+%C|=3?VXsl*q@5QXBDRqG(kbq}X)Sthh@BDWHfT
zwp9hB%QX^f!(-2XIx66B>=VSNCBZxl9LC7dO46qj!JrJ0&bg+dX^J+&VGMv-m5?s%
z-Yyx197w%VP%w~FP#cvkan8`&F)|VGsqX{}d;t+SqXylB#G!xyVU*xVD-x+F^jrWn
zDyE46+rjAm={yz825LznVhWNZmRhKY2~vV6y#0O#VVDO%Pm(W}J%2v{6+n9>z=ZKn
zE!h$zm|;V4l20azopLo9Bu>DkfZ-V$YUDJ~RR$DP6cy3@2jN682dDvvKct2-2rf?&
ziC8ECmPrZAE!mYr@nsY{zxK&Ed^Xt8qMn;jI6&jOpU6$3OO9TQ$eiRn84#`ct%(0<
zJ2RSOI!v}*TW%Pz7e0rD2cvs8;&wcNoY{)E-NCbN70XFk$H#o;n*SYk)8r`lupJ$g
z2Id(O3Mh{|FP7p}QUGv3kH2?Gop#{#wX2nkJtgHlCdMWV)3y7@##{TMq&XSJCzv?V
z@#{$;hfuC;PUOaDL^9<v*8@hKB&oLcoaAHE6w9hZ;hAS|ZLnV;E%Eh8*yIvN)=69#
zxo6bnnH(gES_`l2^8A(_1mbHGhsSJ0E5s>H1Dpj77(JZBXoCI<lps!y;q3sZh=qtx
zroy74QfOR63~@u33;PpxVY@gue6Shyda6}fCCfo*k(7gE5^8;MNhp(5gK+~>B9e(!
zST_(gEK*S_u0<t5Rmh~GRaOnbCZh)82BnHhB~{3z`HT|9j2pB{E0IZ1Rdp1V1y;o*
zs2a8@na0J(a8?UB1!5DM$1{5uZurJZB~`IWM5?SCh#H!TNKq!M2K7Xux{69ARk2B!
zC5tjCD3w;lB@(LGq@q<@6qHJ;!MG&UVBA2|)KXLxTNIQ^tC2}iRdOjcb}a4+!Dk?>
z7IF&2XCSObataSH1t5!{?>Cy@kcxMx9J!8|HTUd$&YRF(%6EG4=yJ!{{ekFkRXjmR
zk$Sa|&wUfXXL-QB(qqJ)jArE$tJc~=hQu&;FHCzqZ;5cS=;f67VUlz<VW=Nr>49JF
zc$W$!KA8I%AYvR)jB6>y15rXi5Pac<W*<Wlkv^b~IN@Jc=`;q2uccp%fe<L46Tu%3
z0K?QHWBcV_tmMBu4@thO#L@GSb1+Xi?hWUwkU3Yxkn)fmRDK{2&|x;y-gxwrjjG_=
zh(3#RE<lvZHhpnbM4qaM2x*oK#~NsiRWu;XKG{_oHX4`#hE=wth^eN-AXh<~a2nGT
zZ8IcoXw=qBg-j}Kt;HK?*vXMc43+584uH@DaB7X|ltX2js-;?GNMv%hp^b~daGFix
z=%z5Bupr3UttqK#pba=0jRr&zfq-!fLSZgRi7+GtM3p)u1Be2EikeV}^89zx_x5jd
zxvXO(^03h&azWuIqi^y1)JM$3X|IB3*BlS&`bd<bx(B^>op|JCV?_lyg_#yY_XfO=
zUzvzs<|j^!g$q%Ex;Iv9LTfNG*+k@TA2J`N3Ri3#<_ddd$cWztAV&S2-bRmL{2k(K
zpDmzMxKAihi&OaY7>R@-8o)IG79sGXMPYz<&{$a_Dv7WNXhaY%woYThQ0Z;-`kY6>
z+2aB4sY=-x^%&1-RX)tm$Rx6lMCdrmVq#1NCJi*iDVbwMwf#Kfc*m2DPZ{jo+clPI
z-kTd64XxrjlsQVJJ_I5|6%;tKPHnqCiFz>QO&=_npunyKv0GNfKz5N8Gv5d|k&<CQ
z6^%EhLFp+U=;J22%>ra+pbilBi`M(0B*%a(l_9prg!I=A6Y(R|xIC=-6P2?yp=p@e
zOG89d2kD1&sE%Mf;Iszb(`r9K2*f1;s2UaH-GFj?a5|5AbXCGpq~Dmcu>mktVNM3S
zK~ejpz(78{C~Y+gIC#{=fyX+);3N*u*U{W-MJy5C4LyGxXkCo?m*K2)l|Mv8elX)c
zjNe^u7L3>4p-5c4bqw5I+|8qAu&lOmF*jDV_q26n(}t>qof&LIq*c-=-z=ubmF`}<
zA#~3-r^$pmb*@-&PGGls(>sj@v0}2ENQcB+DzP?5g-j6XW&uJn&l8EpjXID6jq$BG
zM>bSzT62nX*Fn%aG>tMrjXPIAp!OaH<eqhEVy%M)4Gq#Ni6k0Lk&CQ?m>F_2&ST-m
zf`$Wz4v49SN)u9PFv24M)QokaR{=3QAt44*s%el^VQg%nGRRV8C|XJyF)kk#Xu_`%
z#A>4xPBA&WOGAU!3^>B#5}e!&!QJK;0IdNgti<t^@HWibL7FgwsD1w>!Q*C>DxqHP
zD$4{a$fQII8cY~%DaE)8Err01qFZTp|LJ_zW(~loG72F{LWrCanIwS;xMLqiM}VP~
z2(5#!M3~+fvjs`bRj~IwKI9Th*{1kO+eNHnGp-qwSu#-(6u}V$)KbAEK@kxYOx~<d
zIMonUR6?oR!i{PW-{L=4th@v!_kwItET}OS14&BLax|@geWyM==1knG|8LHrfnb`7
z3Z!C27JNZY$O<NCBnf3xoJ7D_BS&4DC_y$N!yf0nh5oV^tPc|U&#$6+Sveag-}sj`
zh9Q<9gv*(JlWB&jk|g31g?sqUIfi(^I+JmGJS*L^P)Z^3pPOLlKCy`30(0vVqtZN}
zKlHss557K7zX$J=6x&;VYl#~J;4e5)iAIq#`TfS<FlW?4+;|$yV2fs#r!x$adoez%
zk#=^yj_Bwvhjttw^2~$#7Li6820H!i6e`qJ0{1VB$muA0#FEHWF7Q4qlbwNZt=Tq~
zvN!5i6zM)=?E_%Ga_#!c{!YfbphLefK4Fdjlebuz<bN!Wu}GC@peX)m`1!qXc+<I0
zLcQRe%gFT8>hAe9r4;h@|0TEPEUWL%(M>=ga`&H!6Z8=(RRKs;r6^FtNRbf<M1tec
z(^HrOjj{q$`KyRrC}IUw0E6Cl#_b$VP%nGRD0X4#rzBf5AV9_>hjp^<0t%oY!MN1A
zF500j84&3K#x_SJXpo9X(sDNkE0{wHIHGYxq)=ec$rA{sA`nb9mSvDs)k!kZR8npb
z$zaxHFVluJ)WtO%6Krt@fHE-bD!n%;Wsc9_O<~!A_sSKpm%4in&|xs?fw7T{{ex`G
za$e&7ri_hDLHi?{$l8XGzkM+cL_|bHMqs+JHbccE))ltv@pAk8xe3%l@G#}>qYN}j
zVTFMW(1BEPF_ING1|49^@nucHr!M-9`UZy-&;+oW6sRfZLMbO=s;aVmiJ+hDkf{Un
zL*=?yY?6=2S5VwBxST*USA;(eM%F@=J+eNT1DGBF;4m6kdJvXF-P~_dKywEgS_)4%
z^M5H1$9@j5{f@9r5t2AHR7F0Io~?cPHcb+(=3TXhaZ{1J!dSf*rID1<D^Xf1gyC7!
z({5!tOq&}(fz0s(k_Z_g!_+?}kD)iyPLQmfKxn`!!X=@&19ye6)TT}YgRDBECd2h`
z_R@q95(?5_|FQ$nG|#3n`@;*=e%%-*fA!Jxrn3_>aqbD-92F-(hY%7UH+ft=xzf!+
z!wJ>0j%Q&;f|^N!$!EuECzu1I`!y*PA3+f>0&efz<H5k|lg;dw2v12g5)Rq_Rot?t
z_+$tA<T~bYAmpca7fk>=Dpr>ezm#j!z3=Xh(tj)?v^`!wPLTQ!07ddouhm}f1m2(S
zgL$KZJTZ;@i-vCO{J1C1D0!ie03CKB9?u^0kZ>gn+`)iQKQ~#LST@c>6djp@RG@$M
z;fx1yh7b<#1yChFc{m56Jwf}<wCkvWb6_;E_N3_&il=X?2fly07hSnGnp%|NTTLUF
zW0}AJ92kWbpvHk1n3{~ovXh$??Z5zgv><awi`mnWMT`^@0f|r`U}gr{9}5>EMxv|_
z-ji7j!$Xt|Yy2qm1H1G5Oi6xh<5{jSkPyqk4r@d=X9hc9ESnbsM4lf;l*7w0<M(wZ
zvqjW2eD#yv3GMPj>Ojs!p5L&PDJMjGwd6Yoe*y=<=>QE6IjCZhEuP1+5Q(x54nFjt
zm5q#rfJI!kDtvPtNCAV(DOl(8FpRGW>}7b@l+frhOz?t;5<6-t+cimk9>hi=Cmd*)
zC5W00<AP?)9XY|Fs-uDn^H608gk6S%Z7vzciC=Nw1rSM_-fk_hVoe`9(4pz>flw|$
zLAuI>gw$}PC`A;hAwr{=CeUFS2-PCX3rB&QHW3wVOqW-l{5aUrLRRxltc-}u5zNY~
zG2$Iao4koi<c8lVge56QfX32{jBgS|L55?bOt9|Cx()*|=qe}S;?u0v4V1BpEf{%P
z>u*nZ8o!OBZ;mKd#yCr3=*Z~f1{jwJq8JdZ=1XT>BWB368YqpFQk};3bl(UOHPahy
z9EnhMlTpBgm#IRDwD3x>z-BdY)gjkqt+*zd955tu+BF9##YrGIO9r7!vn5KPD}-5<
zh8gu?oi}v1D4>SQGo}j@9f*x!+d4Qa85<^1!50}*Mqr~jm^_swSdeE-Hamm|x(M2(
z0=6(L92HGN46?G(vnHy?p|pgCVob@D&@B?%g&M)6EJ<=PYO$%iurM|pgqH@@RyL<F
zoH5AX2J?DSYcWBUO09quDp=ztAppUqY2qk}k{V1fkRUaf)m)M@G~VXYK+S3;!`4h;
zx)Dngj<UY2%z=(LN4k-=kWsjdA}V46hlp#4%{i8HheF=)aYHqf6U3rWdn7tNURhSj
zIt@k_Frnz{R>{p-v!kaNsbiTtHxUvste7QcI8kpdHq1l9BdNQZP&Uan7*^AQ1n@Cq
z2?*?jBW!O2BE}`o=Jxmhj}j%P5elHyLa7WALt+%7rkw^SGI$#A<UY!#>5dEWWrUf9
zEKS=7DT8uG@zjR-4&@0#DlyjlgWIHECPKzTDdFwTFj&oRK=Hf_d}c8xSjTj8WL^;D
zwJ^GDtNuiFq*`-^Xwv5&EgDgf@XS}e&83Y#twh^>$pqGMPUGlsw-1N>sIM@I+XHc>
z-qv?(8n6hCScrtHA{#W*nS$;ETj_qQVJ@OdA|eRn)*4zMA()7XshEnSprR%!N{J$<
zn6BfT(d-Tg)&snVCeZpQcu>Ysx<T_2nF{R4>_EV7TT^1BN<k)DLiO?WbA0s|PRGLD
zyUw&(+p+5}h5QYfwTgdOb55dBu6rIya%(2gj*Ou+6aWyldJ+UN4ne@&I%y=0E(VFx
zx)x}2ROR+@nJo=M#S~6pxdBMYF%1ktQjskIOBGQPQv~YBq@at_ybVDVkSG;OC{o0c
z6pCajZ02u7v!lZc0&N*85Rw#<iH=n*gj5KCh!_+Nl@%A{-uL;u{-lq(b_4|{$@B(`
zaUaOl27JH14#AtSq@RBOM@<xFE%5BXYlB@GmAK75k!UHoMuP>T=j`)!0Y_|M$4j|7
zkP7tSJqagaXVQfr`$R;$F%glOhxFBAq4+-9YhO_$wVQ3Mb>lzlv*D);U}^lz@b35Y
z1W1JGA2GCWA7Qxh^R_AnnXky)6kL5`7JWSr3wTRZ<d~CzIGxiGN!is=G63yy&>d+t
zSp*@pkdy|yyIa1T*32bDJD@2Aq46|eRK&i2tthq#4HK+gRB08YOBN7tQVg`HkfH|J
zMkh+B4JObqNrYi)M07E&7Dc?qnW#fV0spv>)CUrdK=(%kQMgBPa~N98QOR>xh{ZTT
zsNNWAu*w;s2-7PNOo$4_UQwu98!Jq(Tc~+K8aD;Iy24skkX9*Rw&*rCwT2ZD6D0|(
zHM~bC<BcG4a9~pbjT(vp9;#6^G^2x2sX&hbfn>olMue{{grOo-l7ax3A%2^{;O)1a
zX0X~xJS0u?QxOK0;fI9KFm@nK4>%%&L3F_@Mg*pT)ed5qC>S6>^-AMyja|}|H47wl
zNHIy37sS#KriQ23VT2bZ22@F0{sx^=iX=cNh*F^HMN=gul4M385Q>CK0HjJ83vJ)5
z28Af5k*11TP@w}+l0^`c>&USn2?CkR;n9Hv?9^z{6hNOe3FZ>)ISzI|={9^uv#ZdQ
zkT1)<292DW9(XgW4n!x^gNr{Bbm_B9Ey}|zWAFuv0Bp=k6hx@X!wCcuio5Vv5CR5>
zw9ixrtOK*4_*GF96om*K%OkRlVK`FeVOA1k85Uq<pJ-_3VF4JTg9aH&V*Q)--BVtL
zL+<uhLVOYKBsfPqMXA>uItaZtI^AFx1KS8t&`=+C!?^E{-Hvw$S%3%Pl=7X@lL@E5
zQ;#}dM!CiiI&giGS|}1^*P23ud7u(V{?wcU<nb{qIl~fw{0!G~0H%BFKO;ucc!t{M
zPm<LovK<B-w7>Du5;Kg^sIbI<!!RVDGv+%}Qvktv5vWxw<<`rOWQ5v61UnP5NepzV
z_u~LO5#S$R9X+AY1CUAxk_rh(K$LeXWQ|Y;O5{9{xX8g$B*iQe6C}woQw*dM5lcYO
zEKNzQ6vdg9pn@urSqh1YSwbWzh$&(Ua||kgmYJp+A*2+Dfni#pB1x1;h_VbIC6Qto
z2$mUT2!JR-rCLQp0Ss)wuuOUm0i+FkrxK7Ih$vXFZ3EzNNbU~&Ly@q4=%jj2l$0hh
z48&wa_8NecS=cysLj#~?7R)wWYKDT*Xv0PFVnOwc5&_iMzEi0NcNb~(YhV<B_Y^0^
zWK84%jEOE{W{wOUB&N(TS|r0FRJ}IG6D*ap94j!w0wj=(2EYw8<dR7wl1U_Ng8%%{
z`q^dyLrN)tjHIuaHLT&U&sw-544+a@+@7Ze3@O=w(oszyTWngog)r(lkr5RU5fKx(
z?Ww4iQ9;}yA|<OrVdpw?G*Id!J^76d${?*#6<f{0E6~HMuSuyljtjU%^(g@(H1rw4
zS@=9cc>L@!iMS!^5QhV>h-SS0T`S-w`CfoM+%mo9jcTFBib6pETmxPpoI|m~10edd
z5HTeL?HEKrRV^gMOi3jKP&8Cc2z3}2uK;m|`Rr)r4NB1rfl44iP)LU%%t#tdQYZA6
z1Nnknf>4*LFn9zU5*0q2kl+T<AG#KViHeG88WUSPq&&P4IF05}bo;amyJ9X}w6JC<
zX~a9<`N8~ZDTlTZ_{CCkpIrUHyZF@uo5%T%TsSX`!h}S7l~05UVbpnh$4YzBCuU#?
z(m!%}#O)QTJW!o_%$q%_fj-t9DXjU`0u1E?|7Q~bH3JZ-OaA!C-)We?-*Cu=A_U_Q
z=klPnA<fkf>@I&mhSBGkhL|Oj5~VR;;R18p_3k%XDEVrDZtTB+#fxxQ)J2K$d1&zX
z6;e%apxKl%e6aQCdw5_F;DPRSv{GW4{jAX@DuiT)tr<dzDRj8|{%nRE=F1RZb&yII
zB&T<Pd|l&^9wrzhWd%_^`A!p2nB=pD4hC76#ty$n_-pIIrS!IpTVc2ZgB0}#o_U=t
zlf2ma5UtH0NhnT@+GN%vCbbbc8-ngqwj{CV9HO2cA$uJ*;T#=@L~mi!mjYN#<U7db
z9s?((=juGpjsR&kLrReVG;z_9Q27IN<Aw2vxD8-|AX^rQiBni+%v3<LPPK>vNWdW?
ziUb9=c0GC@BNqQRKgioT4er#EIxqtvNa>jX9pME5nf%a4hR1T*QEw6rU`d9_(FhSi
z$bUhO1pv$kjuJN12@pvLLrntQMih-<12Q<S^90d}g&<6ku(1iDkrIi7GBDN#GE<^K
zFrua*(U?%Q3seb`P^Mx;V}T(wT89!>P#Ksi7)ccXOe02&%z(mB#b}78VT^_)rRgDo
z1Ve9lX*t7fakHC2TbnEw0JW_lsu_~3%#4Bq8*XfwiC{L-N}X3AH)#c2G;akIanTVP
zCeBiLM~GaW6H9=HDB&VI*(z3~HbffX5jRjl7ZV^_2&9^bH3kt;1OYZVk;;bwbP@~<
z6hx~{5FsH*L?H4`!c$NMa5932@8CBE`eGcbbE|3&ko<7ycZy)9;O|rAfb^C@gc?(_
z44=N_=nMd%o;nW{k)$A%L%EHp&g~J3x>Q<LC06hc^fV*yU;={pZUis5J||>N2zh1>
z-l7f<04J$WT|glL1NG<uJ=b~_-I!K61;Tj@s2-g{;CUzK{yxCtKFAXwG6QyDN_|E^
z{LqKl@V|2wP|&TC3ExBt{&f08=yZRr`x&;xhXVKcvTbs1%z}Bn(m*UI2?vTBjkT&w
zO4`kkH-v_ynam0V6o25-!0!>8JW7M9$g$H9He;>`NT)7HDc4jE4!WkswAaCg`oSd=
zHggCjZA*TwXwh@-72|*@rQtM`iO0dfT4=2$gM3JOZ(1~J5g}HPw8XoKnFW|&PC}ZM
z+!aCJado#U@gd^CBNmw1hRFJbrI3v!&Y_Iu@n9ha5HLPY<3n9~RzKSzg*kDh6jSEO
z*~Ykjzyyx{N-UOvMjGc-PWTI%#)YYnE=>P>0?cC74O3lA-UF3z&n8(G0T2z(mXtb1
zjo=)YQdH(dh&vqNu$PWF&~=A^p^!=h@3#W#LCAD=F>RP`FDQG?yUxaH9@BI&DRM)f
z9of`wPFFOI=R2-3hf;p{14G5BH`EmFlz&Jfn0h^7$!#I^2&M?IfC9kGZ<qiNEa`*P
z((LB|+$JSjPW}WvPBxB5Cg|TDhPY}$=HIJHZlr*o+DQxBYwLMBmApY>A|RUWMWjT8
zL_|c?&Az$-w3!hURTCB)Ev~^gK=dShi2=wIHMS1)RJL^Un%7)0loMkHMiO^WPh*-h
z&_Z_oUY^=~y#|rmRqOc$RL<lAK~9EXBx1fq7K8&#x(FD6lEDpXB4e(c2Vgj-d5h>i
z?~xb%kP{+X!42RFx)9NKf#`Lq{33-S1FP*M+(+-^=@Jk;phZr?J}3JRJqytl9iKT0
zrjhh|aMy5p^y2zNgbGC1XhHhU^V;nMJ`$_G0nr3Z6-h)y0P77J744)Q<Hw8Mdi1BF
z9{%$j38Syefw$G)hH^t8T(U`nECNi-nlZ4LDr%ysQw-CrgWtCr8&N`Jl*XvQ#f@eK
z5kOnV0ILFoaKi&IB%Q&9Oa{%ap;V0p1WHL3%X)IC&`b)wj$@HB8Zc1Y2m4|NB2QC1
zV+qI!^$4<u?!4g;G}9^!3<4~n0X*P*-P6f}L;G@ImNEY%;CF?5O#XdBp}tyQzav;^
z0tmw}at8>A*LdtTKt|t(#D+zhQj~gmzaJ3pPqDUaW7+Rrz^Sy4A3=8qZq1-`J-7?%
z{s;=cEBM{t2fPv5Hhls1kJm!M1r!WHLjXkqq1Tt4^D1SQ%iYDq0(@nv6{QcVT$WjV
zgs9UHr8yuJfs&gc4Hm4-a?}`;7z&ty<Kx6cSO;fN0BhF(=7=dj@M|pMmTKm%b|KZX
z{5h%}Q^#(Odj&$#i6Rha-sqNSm`VFY4m~5j?Rm6#TRfivj(uP~6jWxx!OF5C6P~*&
z@G9U61HX8I#5>FkBz8_k!5EZigf?pfP;Xd>!F!$zL9}5=(N7ji0T&$DX#|oM2*g?y
zm`p^#5BVILRA>ayunZ9pGR%P>LjpuUSX_apm6$YVWjo3svoL|Eh>BW_z@HJ%k&PVm
z(mdmbZXT$63?77&Aq3G$NK!<EL=X%SGe{Av5d$WWBqRcariOqbR4KF3+(Z<yDa@P}
zu*V_@_$PgEf*^%AD3wZ-R6r2bBzIev=eeRdWC^J=I%&otpy^>yQ&I4Y76Rdz2}3t^
z$3_bUNLK8Ys2Uil2jGDA!kQwsW+Xy{#ZXkk@Ub~Y6dIQ*V2WCidO&pN12!h7a%`xp
zU)7<}Zw|T@(dPQA`}QF+(vgf}?Gwre&|ZF6ktdAyhLMg;SAE`5;KQ*OCHYCh1noW2
zCujxP2zDJfrw|=;A=mVAo<a#I=BZ{S%K~zfPIr9p1w6$}fYgc}=%62CUap=|L&6)p
z-hk=?xB0tfX044-I}0i1dH^Hm;M3sbLOkY3p(=uiNI)T!LJCQxDMF;8p&}?EQW;GM
zzESi`=^};_omR;Yk^^j_8(=VK(or0x*cjMn9VpP^LU0d#Ct3^;$sCrK)h6--QXYIe
zc%vy$LG=1{0(BrvvY^8-2}uM<`AU?YXm3hLkOb|K1A!-xsL*HuAdYf_*9N31Af+fI
zktrz#l!=IDsGy|^XsQ^R8IoWaph}7&N*V%YBqfmN0q{DHstETVoMb*8N0_njjpjdZ
zAYGeC?>hI0rW@7I!Q7qRKCUUqkUKr+A?%WYq=^C`DFqT4Bp84Z0pNF<9=oQjln0}I
z0a&O$VDJaBVB&~alK!&=qgV7Hv@scII20o+sz4r{XzR*gQ3nx33=*wbGp2HvU<8LX
zDm&_~Gmh=!6@ZX2x)U;F2b|%46j=XJQoXH}`Z}=_!t$yDd#;4&A?7{Da0LXQVAK46
z(f%8(Yt`i-nFQ1+_Im<KGc6{ynIu{g5KnOm@HZa$$ZVD{P2w70l;jlR(YGO*%yB55
ztuFK%VYFs~HW;8VB9rHZ4ArR=O`(m#s01Bg*#?3emF7WJvPN-YYI0oE#;ZtGjirqX
zj1C4+(7<u27Y-`+%SaqJ!)E3{ntG~fSTT=HY@}i)$OF*{xIc3!$|<v}GU5(!z_>cc
z98tzCrfKX3mfo1!Fn^cr%8fvR<)Snjd5R5~;&Ze|S=e!T^V3`@sSu`xY%vW<rX5Tc
zl~LYuFumH2h)icBPP6lkb<9Ird1ET@jNs9{Aevf0Zi0yE?0o1wQV)~s=y@SQH6&FO
z(9uGa3X${TUrYHBjX>5k1w=(t1(;&fLli)<G*X8o1F}Qgc?*aUv%NkjekOePMXY|?
z0Ba;DKw%zb#%aPgges77Ti1Tp-@Pt$k8(KrzairVMt&Y3bT$A7)+Z=tCR5|;d>7tC
z^+G91P*V3Fi<Zu3jE3(2vTB5(qOAe2WK-Sde1{P|Z<!>?Ei_QR=XiIYko5FC*ej%D
zIhaKd6*zmju~ql2N%p{jf<Oi)9GWDoVu`2?1Wd~77a%E-k}%8yI^g6KqY}h~5Hzwn
z95Vw7L~sfPV1ft)HjzP&u>u<zLJL5_T!|>bu>W{)c@)Lhkkm)oe-|AhZ|=L}mmi9S
zB9tIdPz@k<@1HgwF&rq`A4q#c=6|oV@cW~YtxNJw<;1YHbs$zlr^&z0$Gw6oo=LUs
zT@<L@`wVSNgg7r`kP(I~7w0}x!Fa8qw#fuXQbP^lkkj+o^pigcI3}0~sNs~sHefkP
zEK$vfMahPZg(VElT4d0oWnzGcC<rJ)N>V{`5*Qn%SjE9I01(C~f~bTay~*;4rOE00
zJV5Q!DMVJA#6;HndJ~_NJqZil>{E3GBogX!LODxu4r(rre3v+5uwG&Zc#`NA98u?@
z9kgKOJ@EMh;;0@&q(3^LN&5*xT^0zQWHS+g{pO%iMgD92<#YAP<Dc_l5P?ZUAp=jl
zLDR|$;9y~fS)Y8G+3myekeMq+NYXPucC%1f7-C6~eTUd4{LET?layN2qlO)4);tmH
zLm&`@A3h~!C6pl03=plkP{XHj#|$EhrR9R-L^|R4hC+NyKCJDjq3jpw5uzL{s2Dl=
zDxDMf0vMk`C~%*PdO3q&Y56bNZ8w}3iBh<01j)k#1&9xv?3}1|w#D&gN?)?!9!!5?
z8Z!Z)LS;YE^WvY+3I9n~aJ(N`oe4BxeIC^`NCrw2+#Z*w5a@0;ELFs&n#*d~A_;R0
zYN)(4VViNS&{#$s7(pWt8hJ4YunaTnbSBG)Is}XV79Buy5mhu~DOd>*Edt}Ip<*8x
z9~<lU4sPp!7H8woYBc&2l$ytJ@^T7KiIa*%QhYJ`A#@zQ1&RRfPm1t@pqcx?qOAo|
zLL>yRHGvBY*u;<@IglXBcEYGUxh^vyrdsjnZwxEATBZ`4ExCA=W^ByNOvy?`5k(}T
zps5Z7Ap2e7a~&bSSLkhHrZQmCkTe=?|CA}gO~~<H24jI3b>*gs%Pcw8OGfbnXnflb
z-43P6=txJ9u~49(#CChVBkR-Um$5SE!S7zcIs=EbzVkAa1&`A60kI{awJM(^-h!M>
z{+hWT)l!6-NsIn-;J8fVB;bM1$bZ-R9pSMYYYSQqw?Bj;qz(ftiMi|gO%tKMUoi0x
z&~3wo@Y^-c{qkOU2SO$9IV9IRDbUTWnlE$PHZd5BJK63d8j|(kj3VG82|BdR)NW8b
zmU{GL5Tc+rqCy*nwVjWKaqA~`j!@a%a%(a`i=)}NSFLw^Vvj7Xq4u2G;~DDp&Jb|$
zRjvrnZi2gs+t_MI5NM3*?20}vRg`j+q9vwonZcF2j)nl+QhV@$sG6J7(6NmfrGV#)
z>~LUkZ-o;OJjF8xSG~~oiW|V*1jhmIw*F`%z&ch5B0t#0tmMg5I|6e7Fd-2Q$N&*n
z$#7qvlIzn76o0U}1h&T;V;k5ba%DoE(WrK<YY^1d%;uH^v}UUrz-tA??|*;5e2K7I
z;kR@{aEqZab7P-MYxniryPCWMmu~BmVa;!5u_-aREap5|Bw~zUxaG%`$0&puLviW{
zvGC`Xu>?kvTwc8<2NaAv(Cyk*mv-7}B3xt;Vm3v=0TkHONtlQs;@Q3qK<+28=)x~E
zGj<bsTW8R3Ga?9@h=?Kxg9rin03SZbM$##XX{aG02!bT4A__eoK^e9K%_A{Tw@y-;
zn5PG%O-xg#C`^%6QK<|trv@4dY`8NkwmY|=&46&02SDI*A_9sih$x~HVC_S=fkg&E
zBr;sd1EkR_`%Uma!6xhnH&<6?(RY>Zel0v2btESikVc1;(DqmL#T$8u9<CCPg6?FP
z*>Alv86-wF)uYEq1{e$ge8kNBvoo-7d*9!y;iZAOX3GY}!1nB6j>m>z!(Fj)VLJ_w
zz;F_GLj({Ydt7NYGs_GfoX}Pxo+zG%ck*`!LQaE)(Hu3P9y@hYxJ+ts+vqtaI-$Z4
z9n-^Uzj?x)@=-=5mJ^l%5}mwF=xP!g-WOLe<O8H6PSraE9?*Z2H=*Q81^oPUpLDS;
z3dVyJeSYI!{cJs2$k0KN|I#|!9`-o@=jBjbn}_ZvViGMC2YI1(2Yl?-F`O6%081ck
z&>_W;Iw+>%9DUFgxFq(ccpl9nZ)?zhA!+fK=m~Wy`|3mS#}4lf1Kr+^&|TVq{byKY
zLYz!c%s;yg=cvQn5Ajbgr0xY+{+~1C2}va2J${H8+~E-x$zXo;g-Dam!{JZXFgvDD
z54io9Dk1xY23b+?67txL@A7Qu(yQP1QE`9<AZyyhRwG7olI?-qT}E6HfR7Gg&=VM%
zIte%VhK{Ss8T^kI8a~V{okKy8N}ZB%Cm}A(L}c`u0(im`n1BZF6!1O&Pn<sEK}CLV
zm;gQA;PRyTPq}{(Bj+N6EF%6`0DMoZ^ri#(poS$SQ|&_7yb31t6;w?S5JN~%K{TRt
zJzO}%{&L@0CJH0q2qq3R7l?!#B-@z&9K;@3kE&D24aX@c6W7Z7p!;LZ;Bk9*D0+IJ
zexvC<y*(lTd4?UZ^?jvPK#(vJ$x$Q`RMSZv4!71|Z>qx-$B0a)CHf=Gg9&zMkNduI
zCm_aL|HuC=rjX)3@i93j{EjmaV+T5FLH;chA_N*$jtRJdqa$vET4*(e@iQRdFTf7L
z5?}6oL<iij)3`pN`pDLef^8ppr1ZR(+<}44NaN}zaYm_Zwb*3olic(o#U=W9aJi&T
z?!z4Ob4==DJ_LUhoHp><XqtK$VLMn65PcD1U;&JXKp8x#7jUW|V@9YL=08CCjl}<#
zR0wJekS79l&G+0LVbw%m4xoHO_{LgdV?rbfEE#EnKM}BIzd$0M#Dr3K=mh^vF70C_
z0eicAjqm3}0~o<@!4u~`b2T8x#>qkOy}JN17~coDJ^3e;3xbYb^FruwW4<sb3dl&V
zv4Iq5+BxPR{sRm+6a)oBU4=G6gxdi?hn*#YV{6<P;R_`);L+78C|KT48C(ZB1X@D6
z%|WD2=r}i5UMc<k&t#O*OVPlp1j0;dAhW)vj*xI~2}C%|Nl+9Jv%C7wk8wUux9<7+
zGCgN~&c<}TkmP$Pz{#p8sw%3CK`hLH8HW&1i7YYO2u&K!Hu^qFzw=Hj_~5@{Qb716
z)&_nOB^mifbMqf^k~)sIchwc1+FKGcGbY{&X0tN0mchu1jdLX&NY*XTBxQ0$o1QRS
zSS>MRfMZAXFf?S=r60MJBq&eySl(#MH+0dMp0JaNq`4gS2FGc?7teExH$)L*2#=vj
z10~9k!T$nsPgRp3hj|)@Ur~ldD2G`T$Va(#?Haa_JHRdtYSfMb!hr44g_`7`r9n|3
z7KAbc+<<?=6SSwJ#}6yM&{7|SI7$Tog_xj*EibhCAj7A2SQCc$C4vX25Z=Jo(>=+)
zr$l|nFw9!2pbN#UnXYbU=iUVqZfJ^*pyd7UYA1*Bb?%YD?}+%2yM!_cA)g00PPj)m
z2EQMNKL-MzImSR58Az6(r-0|wcWCN4@5E9*{W}11yF+$Spcv8%{7^JCAVd^LP+|2N
z1d?-`(|}R@I>sFpj<T@?&O>pd8F#ViIt-DF(Id>u+!5f?AB;iWoflSh;_OQ+`m)ia
zd7&Wuu>lagV*C(w^edjh`*Fm?v1=C@&FsUka(vUm8~5(gaSa+d-<0_EsdO_8V1=9&
z8klf^k$sBvhj&-_Yvw<!F&(>%^@&pq7$9h}17jorBK85r5-5+eUNk#~5Yq^R3G@$U
zf+bBqHz7pNcpLU&xJmX9kU?0FrlicqnfS9ANQy!rHqKASWxO+afHNdAF{DSPVNn}|
zrA%Q}BN#h>0#akj6{ypqvACL!Bn=!B;y17<v4gEY<~nbA#l{#gl)}vr0#cAlbd5`_
znspsCuOt)=ArO><GAqQXZjhr;<k6Fa(w~hy<TcW+b2Nz(@M7XIm=a-0R6vx01QA8a
zDa2|>no3yJV4Z6)H2^?V2Ehsd(##~Q5F{hXE{GLe4Qp`b&UiP#DFUC|b;RdkfJ-wm
zT`&wFvLIntL8LV*4vOa!6Jpmz+`0oa5M?WE$fNmaZoZwU+jP?Q0|-h?iaKKJ&I06S
zHM5cOaZJqJTN@g6jS4Y|wWg)TD81IuvRHEV=yZfbS{7(@R1{G`K@kx^M6oj%OPj^Q
zrPYvOV^K2`tz)bs3Ia+ZDe0~YTyc#_sY=MgaF6WGX)vbe45k_EE<H9IMAQ<^M|@-f
z&Sp4GLKx8TU|3<4P#8`+u+f;bvd}<L5gWrQvNCk;WSN-jz3MWWqQ$^<X*Po7j=2;>
zAsE5AlCY{nQ7AN?hZGD7T{z7^g2&92#URodHbhp9u!F&((YVWCRxz?j!KC9vrb@*U
zOcYXUHedj0)LDS#ZZN7TXl1D*4MrMF#MqXc2y#%OHfB`Og=J+#z=u6jBABU>xK&D~
zfKV#6MYRn}mpBQK6s$sO2(ol6n8ivW<5@=V9FUNZ86<4fg&A#hgdjNu2AI>q##Ewl
zsL(<bwgTNy1p+OlI4~D#AdyxHgE9(qNEoI=gCmhyhB(1PGGP>DlLeDhSjZWY<xXY}
zWJ!`{%uJBgLgcwYl39)_36(2dYB90#15}0)304Y&ZM4)#i)}HAISY8=&E-!C;|(SZ
zYB3_h0C9i6*A03?G}y+Tx}dd;Y@uQiIXson%%-BuG*qiRUdM^x#<pjc2;)%E*p$=}
z9@*#QOa|DoF+<`Ali$2e!7)Zhe1Vb)sP2R`L%rfd!h)D59AhQBzC#3;wYt_i(ZQt2
zT!w%$49p#&0o@udw&dYV>17)X+NeZ@#eqQ45i`jqrev)&MG?2W((HwI(mBl1ru5OK
zVDcM<7&KwT6-6S^>jhfI$1zGUvJ8Y$L`Il1X38Rlr+o{_$;Sb=dwKaPo(+t`9WdDe
z>VYy>d@XQDImx0O5Cs$_Kv3jGWgT6|D4IzF<l=&>u#cdq=+K+;#Z4LjGDSRbCB5{+
zM|)E2WS}p|9s$)vnxA@4Nj+j+n25>ungVa?gTahu2t7J|ak4{JMYjl%)_OFtDm~Oh
z9h@Nv0q5F?Y$S?MV0Q3`jZGSZ=R`*GBTpWfmCg+pT99q1Mt%0U4t;hy1Dp&31;P*v
z!ziJK79!-65YW(tDo~*i1ZE)Q#aS68ztGDWVr)H-fd@WfhRjJQw19{R(~U|U9th@;
z)*2OxsDQx76I*c%gOn2t7&I7>K$Bs*C7@VKqUsOr)T20X1fD_$uMfZA(B@3;!Tvt1
z|6j5XAnQMofQu$)Nhh2Sh<pT1M~Qf^A4UU&oci%i%Dl3fOul^ifYQVilnF^d(jl}$
z4A`1Zn#@m%J9rp-qdjm9Gzw6R14%H1M643kDM3P@s}?d0f4JSu&B3e;79PDd1O66c
zDM7!Rf#_wT@(-LoD-}_p5j%sAkEVPIJO}f&$FWVWNL&I7zQ{c>L4ycH5MvZU#JYo+
zF?WPmSZsix+<Uu^cZ$3=zfv4E#Wn&V+xbsu9pt4i*9+D*+<Dh_$^(JeZ4D?X%>$am
zO2h<92&AUjP;u!w1wCS9{<<b1tR4n(Lw>%FD1Jcdc9H5~r@OV8#-l6@GcYo+4qU`0
zC}|=h2qqt1B4l~+Z(+GAsiBexs)C4sf>M$uVXB}hXbBpm&T~{8e@)LXLJ#=zy$K_q
zzYa4KHn<%2iXOJjt4g1y1n>cXHTn3>!fs|^fr^Ndnu3^!pcq?cClXpvJ#7$ka~i0k
zmp>)vIU93L6_V*hW-&^|5W-v`g=1j|+6I~=pPK0x2U+j2V<tj4$&M~8%$6BSM7+)x
z<=vW-d5UakEr&6_4R9NFz{F&lw+qJcqMHnOwI!2?TgnrBZQyHhvkgJIR>7^z%&pgV
zl`ZNcP2(v|G^RNO%t^B4XrYctWu<POJf#L13>=Ozv5mHAhU;zy1!gKh49SJoYUDlW
zC`u4M_%Q~3x1s_(aM%+;qZ18gPGw?&FWV-=@`esYLBwQTH?0tDz``k(N+6KsQa<uv
zhA1%%%MTAy2$};=ICYno_jDtIj*Xv<*S|sK4&8r9N7u0xI+#h7<t;C)kn#AfGBq+%
zK}15s<HG!37J{_bkL2FBj?hTh7{b=lQ!YZoM)M0-Hq%&ch7a%D0loOm;zBB&ew{P}
zvbBx_Akuek!cS3s6+Tv6smcrvxOl{Zhvp6IL>T;2;l#ZV%O|JB?ILQKXo#A02-$(h
zeOLrZ?ng5WV(PoY5N<#i2EhM00Zz(d7qPKGJV^s^6sw{{C_}uI`5@CAeKGvdI)K}I
zR`sUKI-&672O5f&CYX|h%A7R&h?Be4XnMdj1O_23Wn~h8V<u)-Ry<FJ{omz2Y?%iv
ze0OC=IqG8QYJw(Mf<`I*GNJK%Zk_&`4Qn#Ob2FJHL#+mPZzGCkz=!PQT67WG8H5xc
ze7U4>Ud><!oyH7}0Eg=E%?T*SPhpr&8HvJvP+j=1nFl=<9sq&eB0&%ksM5a3J|Ym(
zp&~>eWNh}wxEU566PGfnV3bsS@MtYg?e`2AKuC&4g9StEwbK3i4rAC)tc7}nf3hrl
zb~s}OWT5;63uIAtWgw=RYM{jUXoL?Ed}Mcy4@jd)I<isA_w$ob4&^DLj(9Pl)^}+%
zkXlS!DU%|yBBlb1ESE6RqgC5Sj6!lFfsh6$z^`w5kdP)t)w5_~l$0e3W`ACTbro}l
z5ls{oEJPHPJGy2gsT{FA5!RwH#)b_3?<4~A0i!V12t9O+P0>C$%`jAa1_!h`ADn({
zKz8yW9mFju$h!6P5uiJzK03nOZ~!?zl9*;$80H2<A3^>7Av)NHVDMoAAtCPVc=7l*
zp5TxJa8Ai6^!`5V_N9OZh@dcII(jf|KMf(%fr1QvQdzO_;Qt0om=!=z69Dc}1GB$B
z-T_HWpI#post@FPFdfsM(wr0D$41<AC=h3uJcRTHt|69@9lGtb_cc!ovrVm=>B7SD
zg+?oPimI{F%BXs2Of+HC014LtGrTv>&n?3O0cD>Kx%_`5<k1ijK><h%QITO`MmXSz
zm`L`r<jD;@Q>N?<vP8v}5{Fa5c#@n`+w+JdK!r3EstiJciNWkVj?ZZVfGHXR7(>EA
zF}jjvFt8KIhNgvGe|Y}il|4rQbe@DLOP#yNf(|mwZa-Qb&P>!7L!gRvtT!RKR)T~b
z&U6A%{W`@9<sTE$ih;RPaHddED*`f13bLUf!a)c!EXqj(78t5y9Cr#G79o6NKq8bR
z2F1xf9>K%gK+mIjHEIl;NRIOy6nIJsSgJ)~SXB6Q;sb};5R(Z^{aQgm<I5K+DI6*c
zkZCAsit0IxbPXmSsM(Op5l{gT1W7@+ZwIwd1CW-<P~ivA93=COAVWh>daNOyHUBpZ
z1;a>*Hln80l(kU1FXqPt8X*~9-e-06>@Yyo3qVtn^Taf1cR@n2>4*+GTuOrQ*HYkS
zF<_)Td(-2|hz2&~oD2st9zfb1K7V%p0qo$vFT};+?iC-bg~2`~2hV-++HVf%K%=xf
zrR<Z5_Q9wK<fwdn1kgV-Af1HnfbHeH&lG-*9Xr7J<VcsH^^t-aSLYm2Ub#Vh(dPif
zA^yd~6*3Uv;UDk@M=E+~NZOrLZYZOfK+;B+ePzHp63i0JL=jMgK~oV_l1WnqFhN8?
zL7aS^lf2&n$<+nGSE(X(sR82dbP;LPWck@XFqsssEfi7596A<&VSp(>fg^L0ZqXq_
zLDCG0IF0b1S*|O1U`<sfHbG0U2)brLDXdI06a>ZtFv0>Hno6OnB4|ng%*IYnWmSs@
z7#MCOjKPQ!5O9VD2(P5JLJXr3SOPs*bw)PQ1~5f|;P>(%97EC?mm35E3MHa|2nHD;
ziH4#YZV95y%B*oRTyAg-5Y#yd3;<A>IS>T789Rk(41}~)h8bin43Iik0&pB9L5UWW
zLUdx80ZRmhB%~1pMJ&cfHA7St5k-h!`R&+Bi#kJcbd=CbsL3)6lFS1Wy#<#dwNZ{h
zNP(W8JL-ks`=maB{iJI~A~GgHK2PrZee7~L#Ebw#tC=d&%BaRmo`erY)+Wy{A9u(o
zDXw1wm;fuV^w=IsYYY!BcxoVkDjf<hIX-S&c$-A#5c_QZm!F=%1HDZKCIP_+K!giV
z?%s_HeFYe%A8*6&?GM=SerEXgbHUMmP^atavF!_=+V@cwhPs`attU&tvlbggi_zg0
z2+UZY@2##|;KQA{^<p$rO_15kb(p6aFYZldoa3lEtwMy#euOO(M2>CY%5Qef3wF?<
zRbY_y-4j?JH_gjjnkhL4!UliL*NMc$QnC9?{f^Rf3BPc$a`x@d!jKw7C%Wc&9>_!9
z*U63~QSQSq!!R&cASXt%RuiH(15U^t%?MX(XYryGtZl%Ui5evcfw-Q5+G8l$X(J1)
zAz6@uY+#*jfZ$Xa#+;o5WEfFRQic+cqA>nh(&C=E>k=~u*8}7j8}H=y%O8i9bjy)7
z{m$Dd{wzjt)oo_Pp-rRuE?W;}TS)Kq=7f{-c&%!5<!`&Xnv5b)#NKB@)RtV#FQFQM
z>Qz(N<W^Xyj0yXyMQ}Ui)eW|{!W!?FNdxO6)n3(;7qd0NKZMPBH$;kPwJC?a(~`tu
z@<?iFF%I>2hVgtK=n11{*B#9TM&ousXb{FDyF0NQqy&ihC8%Uxls>MxXRnD+YfR77
z9OL?k4+@dOIJN43kV!tRXyH<cgD))sgTCgkHDo-D=~pf4Zj0*PIn`Yc#_t<ieVo-f
zatALgh{mR+<(4kntX}1?LW*C>yY8>Ny*Y~we7oLZ9qDOl$K~ak%ZbfNcQiLAV$cNA
z7ME5TBneDP2>Vqha+2t3R+F*9O$D`zck-a^I%HTjjqp!nylrg9TV<W;8IaC8bgYwn
z$ssr12R327w>m*%UHI2IUn_B-dZbe;kU*055Lw0v2=!@B0cg|{_PQ3>DGCi%+sTf1
z^sGZ2;x^mkX;SR$#)O5nNBtzhK3`F4z(yI#X+kAA%#qZgj)CIV(!LKvgKu`5@wv*q
zK5k0=n0BEoCQhUCc}X4;Wn76cJS1;-v-`SX?HAip#U?^h5+R&IK;FIDqz#FfbkOu8
zm_I;E!|cNX27|LI@diCp!l?7u@!Wx;V$8()y%FRV%CAj(v|4XsXdci0Po8kG+hS(y
z$)X`+D37I#{e!Ys-wHSmO;z;}bIoC^`gSqi<+pmJENr$Youm(}gQ&_AGg~ag37I69
z2VnLMiR#9uEX_d?psi>o)}OdL<43<9rt<?UW~7wR-mXH2lX1wKs6v|Y1&B=M^jkDA
z$NYzYlJ&lebXw$0=-!{JW(!cxg6W+;7>EgbRnwP-r`=J*(Gom-=J8jZNyTh!|Lqql
z$v#m0W#H4K_Pi*2`Lx3mNua5M76*2F^SyJG4EDU@hrrKyt|n|dZ=Z9;*uVaaJSfT|
zKK}$Amo@-H+XCVl<ya<N_|lg4L#rU+7R}RsR+jd6vv(!l{$jA<%Ue+n{X4R4#|uVd
z3by~}EX4*`vmG>vbiFQ%il;-%rY=zia%&99u6d)$bV?raeVv<Xa1Jm#B>khjvt<C>
z9v(Pzozt^0kXwk4iE8h;%-WkDE&F!et}$!BCR4MER(7IFVy*3aF`mlZ?@c0Z)Y5k1
z<*6FPpueO=L;KQr=>@T}d&)DrJ(Sw~q_|82vK}jkEGBJP!vB?qo>4atGYOA$G0lcC
zZpODaT79F_Vyw^DT|vFAg=X*|<Ia3qS+$2ZF`GOt)W<Z=Nrz~KE<C-3O)93R6mQwd
zN>(~e7#)f1Zd_@cU1L>;E~BJfjX2HHqz$A82-@WP+Sraaych`-AuaPT)R_%|%iX6E
zK|_#^>iqULzK-s@P7TT&EG^9mjtY?B7#&kVZgbqbp+br%-H^MKj73pO1WY{z&4~vq
zUpJ7$(n*yN=u+SJM#nh-#mVD2C8<Z5#L%)jXpigWwpUvMPW<{?%(xUC-%%-$r0UT*
zxqC=byx4)tvvisoaYF&GjPclBfY~7feL2Jkz&VIoVZ}!iVF_Y@OVhK79~r_YRNBMl
z%^ZS<XXRwZeRC?VAa0jBe}UQ0Liyf!f!`Glj3^RADs+;vr_QHgShJTC5e{<7C}$r|
zWi%b0+(_}XXHtLKT(L0e4*A3OBbR?2t#if=N_mGNBzht-+6qT4#6NucBFvT*)NuDi
zQ@UK)=Wjb*tXZ5$O9QJIWi+fpdt1a1OSR@^Ow>k|A*yY6+1+O|jBcx|o8GEo(+E_T
zr1xE8;<h^-9(Ouc7hU7NcX^4Mk$%b5Bg9Fx;byVSR&1A7wXMyHF|Qm%wFte}N_Ltv
zsvTw>G}f)H+Kb%sc9IxUI}R@}nQ<>Wxa~v4b^%HngJw5H_C?{0+U9r04B6<7qIpBA
z!)`@rk-MqCrmRNAW%h#`GEnlD1GU94KFG!z=_YO2V@%AOv2JNC<bvDW^liStY=y&t
zkl5kChU9=~C~$-Yf+xFl*c?=s$lL9RgBZG9NDE618H8R<;@)YeOATv8HLSkS3)044
zGnWU-PCGyJ{CCZr)sC{eU&P)L5<e%-48NEz!D)1NRw6XI{WgLVPVI1Q&&Ew7(HGb*
z@a_}y+SajXmTaE)YB?-lL<|#Dv%E=U0vsm5x~j66^;I;aK<@WbF8luMdBYUK;6&E&
z9|H_`H!o}K;h*CNF|z{O0~*oDR7bw?f5E-R{8K)16=(hddLWgPe4X>=%gc%_^Dh?F
zpyzDmCE=EP90{0FgAPW}`}QFmHMT6=e)uIXe{I?@CZmHSY~r&!*J^jL;6cr;jCEow
zl}19g6}nyf9QX9uzzcRvFb20Q!u+q=*EsI!??bYO-5u=Xx-G=UT*Otr2BBEBXxU3{
zi|>-=39TrqR(LHn8gW#8v?{AC+}~vdszp(@ll`<+9HTNqy~};Kc)PbTBneva=A2zm
zGR5C28AeudHNgy_$cJSWissV2e!O37&agmX(W|H<5gxXfq$O!fwu!7E=|GFT&Falk
zL;b?ERL-}{b@KKxo_uu#w{;b;l1!1vhCrFJuIz%+Z1)aNcz&bdsCvMhFZ3n~h$%=5
zfK86E3Lfo#+Hqx(zns~s8SB6RCXglkSYtha1VL@%M%jXNIoRfC9XX`=PBB1UiLI>^
zqPRiRcg6&Sdi)|9OObOF`^<1A&Wjwu0q;ir%BHn(5+QbepD}S4-q1c(5a#A!O7nP8
zZhEVDXyswS<cnWDH6aRiNu#gAaA4DGZjEg=`^59rlEaFjscph&1BQ*T01sz#m{umz
zZhi%DTH%j42M7k)nSvOmxHb$7T!VbslLRc3nQ4rjRZv@B*!6=uB)CJ+pe4ArNYDbs
zix&+}ai>KB1b2!Tx8hd3xCW;bcXy}%(w4X1#W(Nm`^=eheP+*|dG>zJTI)B{DIRv>
z&se`VE(#Iec}WM*CRqgh?5jWzk!f5Zq3S+@T8bI6=QO>D5UE=yf<Jh@CeJq{ix3N0
z#Id&W<>d5ZErD-`u|^58;t}13`DUGW%7*y%k^s5SZj>jM?7Jg^+$JMt){pSjg`4bg
zuzx-r-WAe434(+;t(Ql}*8a;^NJ6Lz;5GfFj!w}abpVxF=^y!h2L2sl6AI$AUU<Ja
z?jPdfkD=O3_~vS`SKOrOH141cfGyWoT6a=j^`9}(Fa8>SQxYjX3w?97h)?XYeoT~x
zy+lhGf*5S_9nc*^^h^>4@trpDJb1ZS>|j`&n}u{ZjO%ZOBq(K1xR45pVl!C{qnEct
z7b2)cxi@jvN(obAd(F)dYpT|IMzqQjcJ&aExl?^Y)zIZY!Mu_G$<YD!uZQPU^+zwJ
z9Ip;&`#ruwLYp)@9KKl2f$|vBA&B_2Vljg&5273d)|{pxe7ipYVK{6KixQrk2lN+~
zLNLcp=K)cs$Ay~wSxpK45?k3umMKIkpJ^NmMNvsn#8sW24;#4TmoNJMfYy{vD~*Xn
z8H?a%HH>ecOb0{SvyTt_YcJ!+<c#<q)9Ab-$2TOTT(rTL7SRaWGvQW|@OheM7PrRE
zJ`6=FTBM8pBvrtyJ5uR05g!d2ubX$tTN}doT!{f77K49=Wz?q!no?hkMe0EXqEbew
zJTI+6!OQcD2AH^-7!9MniYGxEMSvtGao~@+e%O?_on>Ae_KgMx;XymcZFw%Zl{Gnn
z`Gc(qUdX{|EOccNaOcMy_NkD*aP^ZwZtT_ofxiD)iKJ_Lb`i2L%Bbs}c|2I)6Susz
z91Z!u(R(wgmX^{hS>xh4IIL`MM}&f1zg*A*X{C6ea;L7}D42oCKxZLDul&o#WtCc_
zD`}L~z%HVOSIM$Jz4q@PyaHzC2xi1TZ?bBi1YwrNfw0$raBDT7G=vYI8V49~KkCrh
znK!lkIh?_s@R@Ah*T^$84o|#&Lrd$2mn9s&2guoA9@1R;h0iqZLH1@YIIk|`5#8UL
z=tXn_heT$LCzS-58@L;8s47YJbruSKp<A+Pm`VJ)M;F6w4w`@@6cYU>wv$dAPwstT
zmuOgt<hXt%+D-zc-?B2S)Rss=q+ohb`~}kBle0b`@GlCVrO^;EUMwGM@6%|7Ny=A#
z9cAJ%>9F2a-i6L*ywGepaM_b4dtY>R8;MltA<hZ$KxYRc71-6;F_DUtxQc@0Tf%}y
zUTMU=I|pp|_+{BN*$|pzhu&j-UYKgW+=%%as#wwzUSog>rofcU!M1PiD-Y+3j#s2}
z*O_ogq!<;k0eEl-X5bdIqExj-=tLRcXK^s}24M8v^!a?Gek1pjWKrpXlTa-(g!Amr
z#_Pk|yLS%Z6=&%W3>=|Y%8uNc*(@$W(B$2H*_&TGa)V)i_T1>fxub%arYzbx*V#&z
zVLNgSziFLa8#U$Ya&5u2Mu&d=K?oCddqI2%4m*j>B1*8T(k;}ZRC=e!k06#9&w=C{
zFA+kj<c(j!e=0h40-H7HN{n(Pz?TL%D1IelRx;Xm^>(sgf<<TSZGzeQPfSeT*Zd~B
zIr@{=()xnCU{lM#Tuq??<wff+EyW~#=C1=0W-^{_o0fwjg*Ji=DhxJT?8}5On^Q7b
zNO7bnv5e`Fyy~e9M&_W@mKVF^WMZsA8KmeQ{tvDedNBYjEWT~HYrm-Ark?*Es{ZP|
z=IX_7Tn~1J@hIPj9grOHHxi&<)|vm6Okp=VSGlm9>DSLEfE5|#X(rP-`T>O2i?qM*
zx?(kgi_M9qLnOn?Rif4ZW~G-x$L@qd$>KqG8m~UezFC#<e^ilP^?Y9=>GT}SR@~_g
z31d1q{@~8P$UqUoltiP)Oqo=U6Qj@g;1JFJ;NI{-5jXf7^k*aOjLO${TM8_L11g}K
z5PP}4SA&6ZtJU`aCRt!9IqN=a1fdPFxpVA&Z+1kX6-g0bA=JLtn;`WI_@9eOfjNMY
z5|`sY@)e`#^w4gR-+N~uu`mnqTtf>B(rOE}<HTywF|IDGvK(uTlblFYu@Bt3`d9Y9
z7Eu&{_(QGT+>+*~o=IJe$>x~T&l`YHU&{_Cq|E{AVsi-LlK0PZj;XYPqmSS`WX?vg
z$dg1yl*2h2tB@!Ej^OW00|{(VA>e>|<`^+Xt^_=`@x7>yIXEFv1L32xk+e}(n~FoE
zt)`);MqV|bE&mCjPV$YDUZ<8W$TG8y6c@^NY@p!^6IGzMw^pEo)H@geORac}>@PVi
zt6e3Hyu(T=_@o*eS{vFLd#ML0#a}9f>TC6TgsYb7sodOQBk5j+@{AJ4ybRS20$=Wb
zU|<XRjbnBsI-wYYQ>!biN{>5;9}~6hOe;MKJ~#chZTy9YPpZP4ZWiPEEsc`bObf0K
zHgr7K*Ps*oizt{~7niKwA%7bAiCZ!69mQy-%uOq-xwI&fMyR0GQ<7Yp=7Qbq%B`lw
zuv44PxkHD|K+rOaF9HqXXEb~>qXEa0c9>CF4*|ui!1^lbq6bF_t#y`_;hGc~^cL>}
z;)j&_E4aa)T)pwC&@oHH5&8rZUN?<SOW9U2GX>gujk0Pr78RgeO1GiK_y%wgP7_K@
zWP~jd8!DWhl@)0zP9y@;W`|2ynt%CKKpf>yzHB!0W>k|&4Q};Ei6a3$Wf?n*ggULE
zj1UTLg6-;+c8``iOnKUg+R?PNzB9G$-6OBTypwcY42d-8dHNn^9|RRtIQ(h6f;~VM
zhbqfV(Ot_SSPE=LXAZ^>9lPP=nVvM1wvN8Vry~yZJtm$DRU?m?1!=I#Hpj`%k$~#$
zNtTfzSKTqbN3u2B3XQMHcwE@%^Bx)@9L{b?$;1>Dfo*6!4&<AgSMpZyHyj6sO^*29
zcV7xW2cs}sUI-q&>3Zx7FF$?BC?=`8k6xC%h^JDj2X*YpVU0B|wT12zmV6Zgz)c6(
z8%F3yaoJo|=`(ExFbBBl<W&dBll!fUidl_bgDJHw<NiDImIpFBhU60!^9!z4*I?n&
zq2jafTd~!wMC)U$NXZp2d7=|JvO;hU#>4+~4JMdxON@<1g12u(<PnSWs07keMX&y)
z;?jDqE*58p2>DQ~|8$%@G=Cvv{@d@!KMaP+srBrU-%2`^v?fiG7rF^(sAiDg5cP==
zMgJ!-IZc6+E>o4N6Hs3Arx)nAV|j6bDfI~b>-W+KpTYB7=1=ClVuc_IRZ%MFlaBF+
zO)4uA@n03ybSwSQ)^0E#nVkB6G^64LP`uS#qVG`Qpq!EU8w;>#z>)+O2<>Fx)7R1X
z>Km!d`wt0pi$zj{%imHaN#2i~a6mGPkVVk%$GxZ#`wr#vCA7R7D-h~2$SRNLw^AHy
zOTGAq5WL|j2xF^S820nkpWg6tR(5Iu*O#dd%^M#ehHfZUR3kQXHXN6$3O{(p5*Cax
zI(#%Z`#~+8QGu4nnN~fyU(|@i|7kX0)$_p#?er79$l`}QyF3$o+S=2#ifXHy>Yst2
zzP|b~A-1ukQB!OC-v%o`s8*IrMQE~G0qff)_Y;E&RzDXx-}b{tFoolBy__Olj$P9h
zeKryxPGGC;CKZR~f=K)ULuP*5dL+}Y8h!2f3nAA!H!s^Yb$J>#5)UmD1@gT=F92R+
zE4E+XQ@wNL;cErQN<KpP!Kk6%GdKjS?z`zERw!sB+HUOuY)eiaRfPtnkT3G_{JvBF
zUD>#gzoPbBba2R{VN@hK5zFnYmS!Tf_2iy;OPl+8EX+4<^db&F$efPFc|oV-QjYKv
ziuB}Xw=imGjO?wW$|}(izYxFJ=gu-(Me|1d7z3rx9R54=_l)~CxRhz;w6S<9E=l7<
zErem9UMuX(<7z@JcqSb$1`|t+%mp*i%UZF7yYa~PvUos?0mqd1r3{8`VQiC#oO@rv
z{p~+oNNPBD823#7)c*cywP%YlBi(m3R>XAD?z~bI|KGVikuJRL#c_dJ-7Zz^%HvDQ
z*oTZEv!zV}vxMK@$4_<>9mI!EE9#GAV;jnU2pQLBpz>JIZ-n$Sx%&+`gl7~l%)Rt<
z`Vje(7GG0TmHK;@7QSk~u8&f+RIZh;b5fke;|QhGE#)R}qAu_(N}FwoWa9co@7fec
zgA5Y3<gG=ICfp(_t^Wb{m<n!lM!sFy-D{7GJK@1?D$8gwRKKf0&6}b5X*ko#{-pTx
zo{QY2S>8>_J*S{qEx-%WMwhvXWbWt-nUcSdXpO14_1F=QhvMt<jZIS0My0U~<BsRz
z8T$2=)9-|h-^tk0e&CE>&TTWIhE3|PF38I!%{P9bhhqwqXlO37ovS;1QGaABI(Sd%
zt6v6J+%222myAt_<W2N;C{|jtjn(`b+R_)}oNKk+-1fla9D^Cy8cIc=1(A&x;X}Qu
z`XaCm(G)OkEvn3~PKYNa)vT6?v{+99!Rp(QF-jAz>Rr)TqB(?A@)}O!Khc;~SrNp1
z3PbrR50qD}D88`~i6G0@Ests@k-b7zuSr-Xaq4rLg<}rZE<^8P6Q*5?LnbFg_BGg7
z3#w1Y4~11yK<*-EG=x{&7mg@IxD+bG$%E|^$VWYzet6u#C{ijy!PWRjhIe5^j1U^;
zQB)IYxW)TVL6biZh(c>(OWo~UNA$29$ZV|UUBZ%*NHEyO;7TQHBxP*_6j%=;Ax$Ea
zrH;m29eO$j6EWaNaeo^Sdw9){{1vMRQf?#%-fk;)f(LcLzc0k+HRKB(pID(yUZ4_j
zVGSh~#ZL8W6dR6hIf3;nHiU?-3K#VnGv4PBwLDhYtNqLzHs$|Xv#3$jWZWn$hp-iN
z>m2y!UI4C|*QC{PmB^ZCvxr`lm8}T6(m6R*1`#)e4o}vJ67f>n&>he;t2VTp#o-ap
zKt%P)UHDTz3Dy6YBGt8fL8Fy~u0C3!Xe;dc!)BpsrO|<iIgZCgLD>GNqvG((IGaz~
z9VgIGam6JEWsbU8<E!-2X84KTG<z0N*;KW+`@S$HzS6!6058I|yQJ%}nUo*h<_VCD
zHNi5@9cb;hqcFQ|64iwmwZ4|&RI3WR)52?lTfI=crtBz=<uY^%$-;WPjE|4}mFhUT
z+)Sm8N(JV2%D(Sd_#(|6%L=g$8&rC-`pIAsn25g&E_B<cBYl{b`j@1EaOU*TczN0L
z=iy4p#Fbu*)IhYQ3OCS@vCY5>)~Mbv;YqF0>niS8uRuOP*!z^V=JQ5F9=_MOmg3<&
zpBadyOUKcqe$+t1e;ayIiS$Ssla1r<&R)daAv?#~BVFKlQw(}DS`hv^0{_@$)BXiq
zbUgzHS6uD)%Xe{+pYyJkLEpej`yS_Uij(Hk*%^HLq}!(G3o=LvxFy{Pg*0K~B3`)a
zLF;4dpTKPKHDdqsB4!$9w>{D1DyOEjnDB7us6iAr-ay+_pFR;E4hf?fz8oe`Jhq2a
zw%M-X6kX%m$^+W3@O(xU&p@%FA~D0+SZrwm(#Rz5$VDKM=#8|P^e;p+{aqyN`uP3W
zCq<UtYeE#WQuX{Ne>(oJ?e_5^^{{6BIySn+*1TM%_Hc`755mcHX&R`Uk$ScGM$+<L
ztC66Ma{_R2W-P%(aYneM!Q+co47S%{>q$pjlz+l@XMdU7l12%)Vx62`d|!i0p_Fuz
zPD$-TGsic*ga(uBBj1QoZ>O>y)<hjbVY!DSFZJyjkx#gKQ$}K}TiLb_K3S;Ym!?x0
zcXsiDiDV9ZfjY0lszivlE}hI7Xq#5@kWnlR(HwdB(UKq7$5rVn;xpneY`-=W=iwMe
zP(yij&@1DsC_UAeZ9O+`sXM}@ji&-GDcsyT`HAx|2!L`Wis@~LWV;u%5M_2LGV$)#
zPv24Kt^>ogmdS;hpQ@#-I7m7AvK@_aMLSA5Zt;`oVlMi8t>T8p7EE&w&G-NljOs$g
z_zV`V5bI#F+iR2HN!m>|w$&S6Wt)_o&iDb6IDWBN&<j1eegbeG>G6tiuD5-sd?l_r
z-ppZ<%WBMmHCb6Gc0D~_YR6V;7nAgQGGQ^1d$YCLz0xOD?C`8=SZ3e+>pr*V%yn=`
zidpQ-R`;Lb9l~TGWxs>q#}`-TuV>tqmONb)MQ0dh3<ZIj5FounVI12H7x!=>*%czw
zyObWg{)MIGm<>2S2cH-BkReI14a0t(LjF2%5nphMIv`)i(4Eq(pxs7~;N}+7$V}L1
zpH+}h%w4)hJtSQFh?zOG%{@XSq@oY%q=}YE?DV~NggfnMQRn`>PMi+QTvgS%7%}E8
zb4A%2CXo(42hW#+1u?xP0oi;PC+-Hg;9Wo6d;jRo3Zc)zm#vdN*}>&n&SHaG%QFE}
zKY`XXIjPnC!1Qml#tHo_>9;b!=11X`K@RD#wpnQp@&`ttArW*kdSf9mDFa?(+CHC-
znD4FNiKdh9RQz*ZcBxwgAnd86jvSh;pv&;rHW!4gaI;hVNt-M##;w;>-16101wFjs
zY$^pNUk6*|h$wvo+P(gQQPo4n#?o@6Z6^;4SE-A!cB)`wO&zGQ>R}I|no8MSj>>Yi
zMnTbcdZ}pY6f|MI<AUrBA^z{0lJ=$(Ylgl%Zs<UwYXh{v7WcxC`dx8c3pGp(Bw!R1
z)e<HfqK3v2{Xy*8;JqcKkrs{4$8^r^my^bmMKU|i^}UQCjQ+kKehaB;>KseAng3D3
z{m7Zi>$IKYxNS7C$ilQ;c&uo9(ZcuHnoiv=zB&EnGA?dLAMe~G?3!QF+hx0kRy%rI
zw&P39kt)j-l#Em^b^X7wYoy9X`gvCW&%3wS+wC%6AjC?3?SSkzM2ahF6AkcTdLrtf
zQWA5b?16+}BdXD~<<fZmHd!5@O#-O|YYCddC+Z)~?!^<vIoq6}q4ih&__??@S|o~7
z7!^t!X8f|n@7k#Yv5=vl`++t>0YiG$iTQ6^-JpJqg*{1vUePWzvsUTuaFmg_d7qxI
zhVBrAQ95)<4?q2NdDhVm1tvq1vxXJm>fgk7%iclPvlzH{<wUQ+DL0q1j-z!Y(rV{0
zs~wbI2I5%HmsvN1fSZZ06~{Essbg~W(CI>hRCMCmzP){ee7t4-KujL{4aEDQBy6!T
za}Yy;^dD(brpWd6)}=aGmt?&d$B*9$TT_3UXK(=RXgO|}4Ft*2{`ZY|F+f-%4Vf=9
z`QMvhwCiInXo+B9E8Xg{xE}Gvl2McVT_sw9N=6t9yBdr|TUx`SutJTLTMa)GRsg~X
zW5q)u3Z|uc$n0HAMY7A}4N23f*|Tv~E3`ri)bK-DAek(sg>2FPp0H9!M+!&@r}B&L
z=Kbpk%=4wE{;=47e_}=b<<z#TrC-XZFoA(ls$K?4at+cskjj4pTNk=G@TUa8!L5<B
zXu!-0lV%8v5D!y=f&XK^WTaTD2s34GBNQ6vR!l}+#V568OGYuuJ-$o55pPh-RZS_m
z*k}#ib4C_ZOO9CR?GB3+6Ate<ipprn&~U_9(;H3{VAl{y3Kq;E98rn9Wk$xlAT>ha
zvK*UwYoT+*Ko0JBz6%j{h5wwVB#WM(F`;}4p?if0RwZq8Izk@Uzxx_P9)>~YP@q&e
zE|tkdSiA*qw6Mw~W;^eER4SvuZ5MG8iZx(#7~LL0ACgcbj}^gkz1V5VvISXFS$9*u
zePbUp?y=)com}`?JIcENq}3Fspt3td#b?8#)4Gx}>9J~FML!c3p^+4rG*id2O2zfq
zv^-|ye#N%1AhP2jI`FYtUA#XZ7iq$LlPkq>MZ6^ln-0FmQ5SmY>eMDSmTyVmCat$Q
zO&VJ8TuU*zwOd7JIG9SutJ%hJSl`W`d2D(vxCPhlbigmtXe|bbbW|)29SmaHg|iYS
z36IWcPFOTU<EZDw({`=1IXu3LZ++LUIf`ykX<AjIv%|ZNq@T#2y!DxFD#th!tD$tH
zQQC1{)DVCQSIt`Gc5vx$>~$)R>!TxS_brJzlCz)If^rt`gpVcCsVD&B0;5`<k=T!=
z!mED54Kau0+GAKYSTpwXoeUDhP-qczpMF_Ph6}hr0xdEk=fnmN$sdnp!C*N?qmXC;
zNXifu9p-EUE6HRzk&<o{%;&Dc$0)Ju`$)_mjb*nYT@;4e?7?>LIT4m}<J(Tox`m-%
za<!V-2ut>2UTr?bvHaib!#8uEl=MLJ+nY|nI!<G8O6Pnd##rD}r)(ng6)_t!$-QSY
z+??dGTL#FIDM#8shtKGymR~LS8@8lwBm_#`7QsA`N~lW?8@f~tKOTCBhiZMUX(Hzp
zV1e<v-~*ffMyreD>r@%NW~;le`Js|yr!zo=9A-w!J{8V7Wr|ev{tJJW9aCRZ>xzzY
z7$B~xXEQV-a%tyQG32hFqgP~L_i`2&enG0`f`y(=pG=6tJO}<)h|#Klkt|(8W`pjC
zaZ>{MCje6bW3d4KXmQBLoWSTK{6ZGWR3ZzoWPZZ_+!S0hlXDu%ilKLW$^@9nGY9hB
za0@3OboBREwICliW)A{)KFyViq#5=vi?N~*8jJfjyi3INA=m=-azc7AJ#|<wECmmU
z*V}F3g<XJ~9gPf&;V#k(i;s{Y3VXTxx=HNJ4A@iasXRAcRN}}1Q?@tk$GFTth8?3b
zf~J&r`splnJ1A4*j<+=bqolQw&emQp?SGe-By1xs#XZ0EQx!R|KtG+oM^DYfLdLG-
z)Fo56nIuNG5S4bsS*>pIZ;c<LE6BC)twX1=K`#xN1m1-b>_cMjQqU2`HV^1>#j{@2
zT{6*XtmkiK(lQ&^B3rWDOT`BK`UkKHq#k{4E6*zEQJfheXutEq#DarT%-jmue^{4u
z9@QE6Yzr~L#M-Glqs8qPgeMhWU>FZ)s%<WrX61jL8%VAe5e}nI(vpdTAY&|$VI;9i
zym<Q{5R<?-)R5R8e-@;#P4ON8&a~LtMg(Ypx7Zu_m8}Z=hE*7nh>u8py)UA7DZWpA
z>TeLael&=U@zf?GZ1@$e2lD5wX32S_B3P+yX9+GVEZHG>9q5_i#Lt&4PgH{MF^~Zb
z56)N3fT`l4B`4_$<nAVGU^r!tW^>W<C@M?#ArNkhc}AqgCzA6i!b|gH(4oO_be#w~
z3xi^u)^a77Cr62WayR)p(j{%yRjXUbM_@@!4+bKr#HYb#Eoc?cp$!p}A&Au-+=kZ+
za>KL2Vnkd$L>d*sgbCD+fpY2fwju(H3P#lX=opIH3(5)>6YBIl{%Q7ueT{<h8q&h>
z<djfu8@ELRYnrUrhSsJfjC^e2XFsE}h`mtG!%y|S?qy8ubV6>BVh^*GBh*KU(FfrG
z_KV09i+&x5LU<Q55m)3lTlFY=pD0^WzYbNYu`Tu`YO8mHK?hd?19sCM#0_s&ykOU%
zkV4QfL^7drS+}VMQ|YB-kj})Dp|&Bvb-8;bsqAmOc(Qk|<i7gNae3p}L%QTfZa<eB
z(hkX9__#B87f{P3s^Tkj5S>+~;HbRvV3K(9D(*^4k6aJ?E-Z|Hi|!Rl1X8($(9`xp
zBitgynHfk~k8;_}`leEevE@Sr<<<&;j^rL91Swh(_|46srpsJv2~+L?;hZW&8TZO_
zrkmEn{K&tQNs`>ryd+bOn#O2LJ<11r;XgyS{?XM7F#>x7oQVrX&iH1C(ayjFoS}kf
zBzVjkA-`3)d~zyBV+9EWgk)gJ*iU{`?x^rQ*_mxDEasW{Wq^&NdXx}EVv2ZBQRSfy
zEP>IosK9nSs!q$c_9x}iP=f5UC8h?&463>-q{MlMTm=uLX`vGMQz|GyejL(md9`oh
zb$ssQ>*6y80%^QJei;0~Dhs5m$8pLVWt>JY)BXAt<M&P1&n;KAB12*hc>yHsno2He
z4-9yucfY?$clfT7D-ylZMIyh-6f5v1<t+3Ujkp{_j;f+x_R}6L4y;B(s<7&y^^_>R
zz=iI7iE;2>oW_#nKSyRCt`2Zi8k7nTovXFqfsNEvD_n#?U`5Q#HfD)(WPjZXa5`Ih
zFzT=)bnBzJ3q&+9Xcgo=$Rp55NwdTiGeH?>VH66?x<urP=qVQOUUtd+A`}Z0h2!v?
zj4%fqE7iGLn$-4qG!=K^PCEXO+%$+^!Qg%As{S@D0#U`^K_Fl->w%NYl2$h67in)`
z^u%?r03TSlr5R}U`dQ{3TOiR#D&UwD=7MQ=p4a4Aw#ahkc+R{g$Yr5xO)PsiT8aMP
zmR(=dQnY|KR;{Y|y^i@B!FDlSAFW>RCOkoq9Ntea07k$xJVpGvONksOJxfDt%ySh~
z`tI}{_Y)LKg*(_C${n@J_>oVqFqW|j++{eU7Xs1iaD5YJwR|}eG5Hv__i(17Y|lK{
z+axxctueE##{aZ!ou?q7y%qrs%3X|-W2kUo^p)hsvZ!Y$zxrdhG5Md|k=_D7X~4B^
z!>zvR@gLe*EGP(*{&PN|0p@=QnEKo}R8AmlpEQPxLWxyQ7HQ9n)O%%g^=x@%$0u_4
z42RZrDkYqe;9hq1jR9A=^JJzg81@4w^%iInFracG6!iEI?{wUVXK-`~i<v+_jumcs
z_2Vg`c@PL;QbWpx-F$fOiUW%fMSkXZ&4dTvBY%mpZA)6lI?;*>``2WRZVr60UIjY6
zPm2WZ|2Yh8q#rF~u>>oaa6L`qYJ}}LxNXE@|2VLekl>6Q&>QY|qkCWuy<-ELyYQdn
zG7u*H0Q0rzs^{QWFSW}Cwiao3#A-UBMS>6K#g?~^r$pU+fzI|sXrmtuurP{a&9}0s
zcoDKR0$AXVbp5x#<SU)4^l2q0{?QsQY5x*H8@#r5-ts*TE!eT*^kR%M%hwfvJunVa
z7t?xAWD6X)5v6Y?n*S(UUP=jLdSyQBwz6@(Eb6Vhrj>RIfVzDVBh?^!ahL85?i1KM
zToC!bjKua%$)zapqQ_P)638lv%PIO;r7|__-V^iXl7<+iET^OaZL_`f7cQWAC1VPw
z-HpwW6i$yK#}16cDR_zan5L85YQaI1095X7{PPw|h9pSjX9UUj{I;%X4w>bKcVWO_
z=Fk2QPY5YAOfph!Mc>=0C{#pX8bcNbdl4BQ*ICrdI6*7!7%^hQ6IAu2zEO2ok`_6(
z4hKPVN-ybID-LLlNg($O@#@o``MPQzD_?4||L{~@J+0bO71(J6Ct9;K{s}PTHg!L`
z*GkP=0GRx;l_QZUpn^XiIp#3z3Brt}yenQx3;p>}&gvPOLG%9H7kO!Gkc>uS$=J(A
zKtYaVR$X3Vdx<H9;I(wAS0t3X4U2fEN~WCjfnEPU$}b06-hEY&I#}^Mgoqy+RiyuB
zh$5Ijr<Lgq`i<{h?^CHSchKMWxvxadLu7vWV85JA#bd}B*%TBqgiiz>9UVXvqU||Y
zL{*8%vCy^KJ3Mmj71m@(KE2V_lqV}oQ#i!MI8h{dWD8-USB;1xWsTKBBZW0_%c{)b
z$Oo!PMpd(;`}_@da<lN*`CZUG%=mG4eH7zB*I_giaB;EZsi|B=a{c?i=iO&so|lo|
znAZ1k&Yr(L6AsYZD@{H#z~$7X=CRwJGhzq=+_>lsg5R|iwP;7F_U))su26j(j>9OY
zkw1k-7nU(2C5{ibd+E7QZ6m(V8di@};!??lq#lZOz!qCt0YSWlgXwgwtCxouzZEWm
zH>+4)nrd5o+{*aixyge4EJE9hclE|kwz;U{@$fJ61R<cDwf4<q%$Bw)FL^=mT0&E0
zND(k4#@;wZt}^*qc^%4w#RmnmsHl_Y37@6D+j7c{ZX{30L^pBkH>^(>oh44(PN>0T
zqfv|tByvOx!6(JVNR7v)w$M@q>Mg+Pzvb>WV|=@+Pi>j$LicA1iUxtGQfnHOYlt>4
zhPhD^k_y}F?{ZPy*4HQ!fhxoaR9zmDCQ}e)$dDQP<@XWYX;7H_2Xvg|yF&BF3LnV;
zVUoeV$%9m~NeS&fe{V*DSN9x!(&v{hImLI%hGToIGdGLH!9ABOI%;9pc5PuQNy&NJ
z-)6;=tDzYwLYTYZM4gR)-Qu!mEOzRtr5zMpd9_%KD&36i$$sBFcO!FF3YBKN$N7XE
zRDiWCj*xGR1=@v4aJ7F)D4f-`C<6R!BX)EMG})R5MS;CxW6huw7j6?+qSk3S+>|4$
zHHFB|R%5rRsQi=y5W!55mv_P)But=#kILoh5?Rrd1MN>qSD~Uy#C)TxqI>@?seLL6
zm?>*&*os(DNo-841p6$)wW@pX)C;_n!!g9p2dCE~A@sKB1K1?}75Pm^?~6BE_j5!(
zZTdM~zBm}wq;xsKjRNun*;vy$7mql{1>Bd`$}924xFB2zsfR%^F9T<5m4pa5dHg{j
zHcedHZlkjFg~IRb=XLr|c8C0uWZyrGp@+q&Q3BJDq-iPC+$#)*7p{p*3Z!Z3TG3|j
zrcdR}?fjIt(?ZZ;&{3?b0_6*hkk}|^{Sg5}2uGvm#CpzTcCiwWdOl0fGF&_qCmu4)
z|0|k8+J-lbm87vaQdv`4qrWIODXbz4jg%$i<?I~O0m8B9Tgf0*(%;ly?>fI+{h-rW
z4K7J2P!7cLw<l7S9Ke-NW0bvzo-vB)6_(e%Fz=G9))b8W6iA<0k04V=ACY}{PdGfS
z+`QxpW+Bud^a%f}75xp4C#U$0!HJK0`!vYQFDZO0qK^VI1rM`F=9R=wV#q&eL}>2r
zv8W~NH5gL`q==`j2-6$W(bLgZWh3vfe5vJ3HIFX-L!m&CrjD8>EVg_Wy_rg!<Ly{>
z@(ftIjU9Ivpq8aksQ){BKxfpazgL_=349#4H&$hoQe@xG@CKPrZ+-M1Rh;tPy9$!w
z-&d*f9}Ly)pW;mMClu{_1yEeOfQKn2&ho+Tch#@Ra;Uy70j-`*@PWx?v;R^;*xi2J
zz|}mH<Vz`^@QWznF)>3RB*%)qm9ZtWyxaiWV+ytnF1JyQkvQx<j=J_gY`krKpLm)e
zlFM`v;568PsbZek?>@W=;G(Srcv^$?Pk0Zum~t(D2d&e}rrL$}aX1x5nq3Uye8nt;
z66sYB5~(-yv4t|L*URHI5n=4&s5rbVe6H9k>v@X?ywR8W4{-AS@S#KvdzSn;bK}U~
zhso7Sl^+iLY)HzXa+D-Gj%(lT@oiZ2{g4z1=0lg;wPOyc>5OXSJgiu<vjseak)p)>
zDv!cVZ)qg<#){TLg)Lv37KHv=Hw^9E%J~C$fzbuSJd-qMx+P}UUR8G?6D3vF?J5)<
zCL!t0hLBU*q8C+a!jL$GiXVhT+>@IueL+RazE$tSB93$mDEvmAr7pW1pC>#yBA%y8
zLW%i1DH|J~8{zS`Q8VPi|9F`>3ZOaX6V#c0ICaUGaCI69%Vai<c8Hft7O;s_Ni$X_
z#HSDGdsWAvi7a4Vvr$h_BxN2R7E5ZbEnCr8MsF&Ws{#=fB5eZrvqca@_6;ljD(sI8
zitsbn8g^<E(yuFA8FHObB!-K*2nCCgP&$lAP=~Etf)FhppqPE-3VUqH37Yx&A~_CA
zD*eTmk;l_yzfD^XmV^&n5!&JSq{qAOQWk#wmpfA!9iB~upO=JynPr7I&cd(-IP}1&
z5=e3)@)8SCa6%jdYh1I%F?(}G1#JX|MTVhSF`l)&3e^kP{h-wqhEk@rTW2juH-&2f
zP|jG58o~nZ5zn8uU9;gaGlzgJcN?1N<k6xeUFcs<5!On+(+s4`uQ@<cTDiTj$Y(yW
z<oQp~mu#E#N@2QrMug128&h&ri#volzZt;AF4^}J)S?m2j%fg@f0;$BtZDIT)bmEg
zydnIly2yTlP>46qEu7kRP9dHBCPN1&x{IuHSZgvea->n381KLRK+Y1By0nhmawHoR
zT}@&bqbOD<T~V5}OhrpXL4J`YghExDi<C$=$tGF2Of^m3vQ(}QC2D`6Av<~se({m3
z@>trL#%6?t@scP)v`_FiMT56a&JC4i$RnFa0clb+#EruAz|Tn=LSe#8-cPrO0*er<
zXa!+txtG$&MT0`wOYORF{r~M(9}6#LHP9&B?h`pl+H!RLQKl3vgn|$dOTSOZ!b3#k
zxVtbH53W~IGoMkLaY0Km(q4~gPD8*3I@vvZpQi(;MEC&?chmrWYw;%HtA<bjJ3Gl~
zj6|NYAkL`RxmLbw@458eIT^JOB`p7K=BZ|FN0?AS$c;Lcg%UYqIEqDFcBKzLPhlqC
zEh=l{Ggl2~XcS@yGn*puU=CiOP)+_yOtxcV>c=t>3rtN{nq2^itgLJzJZ5(P^=*2$
zg#1*>O_F11k+El~r{iM>!b*l{s95ouGcyDC?Pw84UzfPSG2b8C-1d4`G=PW-9yMu_
zLtr81r9x)gdFq1+m3q3Iz+5e1Gg}D5hiXBL>%0+;M}6*!0<><#GPsIz3kl`VsCc|s
z(9Y%ltVrR)U-5CsOkFXJd4NKGndCZgbEP~;p&q9)yb4H?{h^3aTiK6@>w-|`c*Cxj
z>N2c~*;&y%>4je6r_Q9`I5C}?JzwoZAGGoGz=Z0B{Wx8(Ov(AL?iEgGUXDqzq>&T_
z8W|f-5@1KOaAZ+c*5Q0MOx3b*3-?q{$!qg03UTTfXCI)CuJGt*Nyg)u4Ji0H&#@KA
zB=1@BB8=MPN?<#Si?n@A-OI{C9w+)XgI0hfwW9%NH*M1zgqKaoyo!+&868aq%v_8k
z*6QjM@IED{MfWDa^znPdU&DDcRzM%vD_-1t&XP?OlKaeYEqLzV{*0SEK=S9(DU4}$
z(L-OlC$s7FdKWn0-x7bGS8SWGtWsE;XZM-Fc}Hp9S^Op|Ht4R1IMedG;fhVarCb-3
z0~Oa3^;;@7V!PQbY0B+zq`lz`ajCBlkrh9TqZFd2@n6yNXCg7SWBOGDvuYnO<splD
zN%CQxs@?U6)v53WjXghMrFLaWb&>}7mYoXWM)*YEZ-Dmt+Xb9R-hxSyab^F4g!5f;
z!X5y}4`<cSE8p!xbqqO#s;)Kd_|<yxhta$jV|BB2_3K6mcKV7_xM^C0n;`IZFoqQ!
ze&_mvurKI%g*v5~^*ONCCV5EWLE|{hmRfP13nElr2;*)1yk?rw|1|LSbv15!K^E!a
z1qnjB^)Tv<dERx~JFoC{H+D^I{^Nl7@W0x4s={nxq)3+jdhRcO<t8xYBvY@bg4ck~
zz~>|R!ujM)CKivWXI&8+4*ad*g8`+eKf!EY6ymI@yJ+zceZ&Ovt+SyM%iRHZ2#C3t
zHm2tQb>W=gz9HM*yeJ`!I6g4*yEfYpjEvm(;(6N=^xoz>`CR`YHb>I+ee>kd8(-xt
z?0Ef-#w<&VXnidKC>k1t&WQa1Oi$yPw4b{QS(zPE^(h4|ekoukFs)S|QH9~Srzrvo
zj59XR+&lBF2>S<Z46BIY?nPDW^(95Ka#vNcL9D8*s*3DOG9Y2uG2Ai8Z0<5{?l872
zWI;@3Hj6yIgb<{Pxu~QnMtwX262`&}feKL1g?+F^?W@_AyS)YhtYNYm7NOJ@$0RFm
z_OthO^y#$sZAT7}DvB)y!6w3Nu97UrY-B}bvU{9Ek=PX-NRl?N(#M%KUQ%%imW+#8
zFDYACt{kPoxfzrDGZiFd%k((da?gM!{`_(f{rygH_3ytiBw3%iJtas?=zdoGwDKO#
z%=@RT!b~gk9GcV91tgajxAh96!$g2d8pLDz(cDT_IxN(sXl#|n_L_N5`tQuobN-(F
z*z|m9EIjPO^7{kr&u^)UCX1f)0f7kCWATPdK|3cpXZy<18FP+Bgk#G3yG7Rn3Wf%k
z$j>iMcZK&6AWiD)-t1@=d`DpuX`jx^Wv{K#GrlXh2vSRj2*c&Nm7kZ;Ivx{u2nZV{
z7d*mEY>J(DtsVf}lPOkOPBBW-UGYQBCgU=NM73qDIU~1ARkE>%6LROFKU?&rE=A)R
zhO6T^-A82evIK3W4p!ZGY{r~6(fpWHV%?LNx5ZniirbgUrM{b3_yn61#?2D*6`k-e
zoGEOZ%gxDE#uX@j&(yYLbyQDoh!0ngW;_#rQ_9gnFCvjGMG@NhPdASFRV}-=u}IUw
z=!dcJ+`#MLl0sE2(p{j!5n;UZ>m`^8o1<DdK8-BPQXkQq6zz^umEyGN81bB)A>4uD
z_-$HKV{P2aY6kearLdaUClSq>Z?{e6)b^6yhI{f^(zJ%F29VV%P`O9{C2@VONT|in
zg$v{!O^LW)f6h+Qs(D6~1DFWuqtcjX?BBT@%W9j}-xWb{<^87{WpY4%#oVz=O2rtg
zp)-UPr=o$Kvc6qtwNu5Nk&7L%9x*8bYmTH>{R2ULK+#;?lW=?M!~bTMIA<TH*nYxp
z0xF3vGhZ^&v8;`B6mBdU;n~`~h3<A{3dkD1m(I73&tIxxiT~RA8f<FGEZ3x^znzg<
zbAKLX;OZk~Wg39J#`NEbkd#t?CAf15g-v9grb#5E6>!oT7*Q;RkK?KXlHk_hm06+e
zE0$N0W*~M`OXR_hKp3Wh(~i#EFbrnEhubrk8_(QS-&$@++;83u={E+VeM|Vx3BQdK
zXB7QV6wO;y@+zE5BuaSI7f7`iLHvg8_TB<#6(Gl@o&>94$5m7-CJkX)=2ufhJ-`3t
z_oDf6pgU1h&ZheF`!B8!n1qr5+wP@u_8AvEW2$=M*)j+%Wr$-%shXCIshq-jeiX~c
z(7U#u@NL~rQqAGNc(?#V$05#sumw|7{ZI8b?!qJoxU)>F<P{%|NYi(K4jyXwW57}R
zG<+>C>|DgZfNqZhjT8YLog|$xG+>i9IhqFUES9>guD)PvJ)tqX8a0I0n34YPgo?1d
z3YkteSe!j8%&H6zojpvA)C%#<YYQf+jOp2*f>&BVi;uK-D2-OJCvFeZC!S?N$B!FD
zS)ry<W$jDLQs6NKkTMRULde9^T`?D;L`Rmh(TuLebS)Am!qD-}B{}l~&R?x`RRs(z
zKn|%+-(P6OBs^XdtVcffT3rBtF1r0=iZ8d84qkofYsXCdEJBc~yeiuRlk(5VE#UL$
zZ`nCjyoWbU@7O=zHmwxDy?MU-b~Bu*@%`GB=g&dc<X=X${5!6*5I|j0gwWFDXQm;z
z$)sK}e!tK@$_P1<d0_CD=?)H8(ffgYQ(VHVF@)ZMB5usH*imo;%Xc}tQNg~%rh=du
zDsv$^Sdfo4`~xN~1`J@gaF{KQgHWIVG8*4dd;kw>)3MXRZfqv1Z7r_aQ`od87Fw{K
zakrD(TULd&8?WLVQLI!*toB^^%t#EODH8qZ-7nYD=}6~4LGYKxD`EOiV8tMBhB0mh
zk-*syHd{mGk6`WL`0<CVh;}{oaOY{<cXMnc6yuuDR4uXiOL43qZ8CuYeM}0FzCK76
zM5Ohdyn$Wc==aBwmMvx-HZ2(4Xh)M+R^iiSaQ|DakAWDF#6QyI`~d4+Va}e=g}K-M
zIs7FN@)V@em_MHXi@_fg%pU(6VJ%DYH|ICb^YiVG=l`vrxEM72kD;;va<O`<)z#j^
zP6y+=+wD#5)Bc{2e=_lnJC}?|qRM!ucM4{<rS*Wzpi9Q(hu}vivXzmqJ^4=?-QU@;
zTypC7XJ(*H(!sjtX`LFzMC6d;F@}y}xlu_p&6p$eoP(S0D5-L#-G)r!_7;Nf-ss)p
zja$L71``+3*NU;ux=t4o_W<clm)haw^<KgC-uVy!fc~^YgZ7-^oo7vFk58xTn@<it
z>$$h@WH$oQZi$~(dj5Oa6=?9-y@6rg-od|d`ObIa=`6U;e>0$G^)S#kZ(<_d|1@iF
z-v|4N@z=w}lf;^x@|*Vcx1as|ANuY;Tl;)ndkT59YSje*7=w7G)s|04s<f~h3kn!E
z!s@>EfO}G&7H^)8t6S=bnOvxhpJXq30eGk0-|_z8HL!29k7DcUG*No7t)DIW4C+@!
zH*(;o#!~TRIEiMaJ=srUO`NUwQRP3RM$8YS_<XZ(X-mpi;LA=hiu+2MOpK)Wh9t5y
zkG}KYu^h8S7pPn|HL-erUEdJ<^*`m_se+G-7sD2HUD()~Wjf=j1kNpJz1ppfZL=~)
zHZ6jJ0QP8FeE&3XINclTf#s>YjVwHyc-@<UTXZIN`JIVgr$s)O0T`>;Apiypm(iWT
za+%4Ok3rH;IhS3JtzTy!-y1ZUcV^w8^*D99SGjp%e07_PKLY?H3jqJGh?iw$E~_E{
z0DQFI_3`sc6*lJ=06;K?^1PXs3{Dc7EbOB15*l*&qvxWQ<9Np9VY2Q`N{PPq#cjtO
zZ2fVRN7d6MjmEJib)ea<_v(x6X~LnA*?hwCfSIqQTI_N{3-^-8rgiswnv3fV@!BPA
z(Aq_H#{o~Er_V|24>dGd`x<>BGzIyCpu5xEdi2kM8}|grUq08<wim`;J-4Sn1YEz=
zy$fRU8wm_J?M}N4yzD7Db|Lu^*yBTr(=)Xg*wcZMk-Bs`m74B^LLwdj7(dFE0Qc-%
z!!8|bd>5CN$6oV}QZ2dXq<g^2!2EzfyMR_jO3#q<^|@1@<ux|RQ_)$2-cmqO3}D6{
zLvwAnKx7o{&b#cX>K(i@z6y))Yog@(nTwswG`yy!q2nTt_Rx`C{MTiPv@Opu2gm&3
z$mG<<WA~4xG_$G3PB+xWIO@FmvWNFq@Mp7nwZbN^!Gtu5q4mT0J;~1Y!%gpt<-qjz
zJlDzf)6#={u&GD3=!oZ`b)rUgi%GY%@(VHd*v|Bs+Q&`bNtgQxZ-xa^TZ2xewN+dy
ziJsLVW9tiFyS1+jBR+?k2j>GXK7C?5r+y1Jf7p8cUDRjaZLzmdX+pbGCt<ax^K0u@
zz5#Fjx30MpVk7H^<H3OSDG800Wz%l{wbhZd{Bz@t{gsOxF`sc06N%!tUM+*3=Pzk4
zjhrr)jVj|^sE^>oYZVu#oso~TtFEq{KO#T7tgm#UEjE_EWv`LED8=bq|6+8s9z0Uj
z)hxBff4%Y8v9a;%;UT#7$;3>=H*f{xaN~Q^g_T*;`bbUiqVFR4?dnFr#m46Qu93;|
zV!nuf9Xw|xnC^|pnCtiVZ|z!t768P0oRoifd;6SqzVPh%+KMF^@PxXr3hI9F&7A!5
z<8}OF!zx|9<j6+r`h1z$a`*M*nX2-S(bMDoo~G{Z^V9NAL0kS4D_LEa9*=AH%BZJ=
z^GpSwwe!{Xy!O>Kv2HOzSLo^&PQKDF_9h#nf$IxB-Aw}(E5_aHsDn?^zaBTa9(#h#
z9)5ilnYY<rZ$5J$=rr>2SUit1{_Jz6t%rpr(wcF8?N(RQ-TS^Zy1TPnNQ`TtO^o$Z
z&{NaiY|aa>0w$9#U7(Y!L$Ta?`bsa(q~*rUqfFm)&U6q!s(y94)^yl+y>oFjcyeW)
z?#GXJmU<X(>{idq8GmA51=N`de2?-PuZ>(B8<z`yxZVmbJ1?c37tvNVKDhX5qN(pw
zIS*KMf;Nk;c6RVjdel~y8mz5`w|}*vT+zsoyzD`{?8544#Sylytfz8bF4aqQpSd`b
zby+!ascMMlNL~HpFWR1c-hJ5d@Wa$_pvCpV@nXBoY{FG?Wq*yQ_LTo3@4FL#JfkLg
zVbz)(yUHmSt#q~3%b8CWAA`;;V=&;on%>ODGPj9Y9{Y%6jmxY=xpUj(YE8#_n@6qW
z+PVaMow(EWWPi22@!X64z)sOKbk)OQ72@^YC{Shqqf?}?jiFd%>WGkfJxao%G8TYs
z9hui9W=rL>BX9N~i5V5x;Zs8=c`?awv)GvLWl~dHQy4MX;VUtMd0c5Q@4YVY)uFb_
zH=7dWq-M{f)V*@*X?3u2w5@ru<8_Q360lQ}JlmNZLfZJlS35P!P%5KV%;&4|G-s}K
zy-DpZ<ri%(skYiZJ44-KZh+|dYJ#^3KWcrtlPcE9IpdOv|FXxtuN3gm{n)1rz728!
zfR^-^x66>Y09iBu9%2R!08oI<%M0Ucw7gM1QL(YCAQHr64nxPZ!JKDC<1C98)X+W`
zEZ>K|f!s5e#S_sA&z=CNRoGO>WJ46RqYFz`SiuDpuhh$ibbnWDgvsdrE-%84EC|TY
zwzo$oN5XK)?;I_%D}MzzRAy_GywPsXk0<|JdGfg|`N+m9zgTxtmvt0)|1UYbq%0MP
zJI^5}P=+qZ^&h%}%s(D+W_Cd3zH}nDU)i`nZMJj4j6I$R2on<xO_&x<5UoI%gKaEc
zDT_=*(9uP^yu2#l4MzcX;@H_M^5_4Ojx}(8JF3k~5HT+V&qr-~OJ;DSh9nbPlFHh@
zlKHk@e*Gc-2G?(#+LMD#@|9=sBnqa-ibps;la}jaZJU*8nI$eK8llna<HA%vBAHN~
zP(xplZ4-vhC9lIi2nCE|&+#At5$MHg!%;kbhIFDuA7cd&$aJ<8uo{S&o2Cr#%4o*I
zJ}ZUA7{3sV#}!5$L!FHWVdjbJ4fz7<bt_^?fgm$7OR9|Vkq*XOEMZ36-1av3lt=`+
znrd2DjHN|n7=i;&9-N7e&zx3;i*0Y4LW9hHduPa2Pbwg5BY{R*jey}{vX^MiwV@fY
z!SjG6`u~0glxPa#?exXrJL<5+C{?Oy3+SNG)FU{wb<&D31q%uwF-T-DI||4=7B|8Y
z7DF9@Ut;edZ^d1a0jVepEi9x&7@NY@GL_3%4&uz|g^xi0%svVNTDzLKHh8ZQ?bO5C
zSnO;dm9#WDZcDWj<@mO9B|MCf!9np5C{`AE0T<9;lMk0vfo)E`z)d#coY{8Fvd>vT
zNm7VFmV+CPHY!V;r<zEnhHgww2ynB|%LHc0W+|kBu>S1*Ip3Pm!Bg5F=1!ZWraxnP
zh73Hrg;0Gwmij<#H}Yy^|2FqfV#@RXzoxIMzWohXxuYh;C;GU<=!ZPI{`S`mM&?c9
zeL2AGLldugJ=P2-frgMX9rTSu!ZgYFz3gX4Y0b3A7cr6*B(Op=*|w}>Es;Q=rUe-}
z@reTWf1?6Fi-m}cA#uDWK6-Ea3x<&?++VT^#>1@PkdN?i??OUrH%Ak26)kB>1yqFJ
zAeW2~nVTC^*~p5Uxn-b}3@SCT(kSu0ezSS`?FyCk{LdF%=9Tra?A`5L^SMXB?dj&n
z-|YiMA<1WzYE^u4q@PL7|2C=kq=p%W#yltf{t*9ln_uKv@1vDwf%l2~cTJ=i2TetF
zidVj|^z+6qnHSb?GAKVztCc*fJ*!*Y@lWXM>tEiV$B`;k0Sq>ZG&i+gZAa+Z(K>AZ
z&G>F}{QT}$is}pRqVJYKjr$)a*o4#`3EFE?k=tvW|JE^Z<B3P)$Fo#ZJpC!3M=Tyk
zVL{h?L)m?qpqUc>^m~vI@Ps|W#^wcWNr3M#Je`}6rx7zV1*P$PzgE>SnMto|DHbE>
zhs>j`;rzRZR8e<Z;-$m#GrrCQUV}qHRG}6Y*Iqg%UNQq}$VKR&1yRU%3Fkw$G>8nY
zEJia$$S9>S^$-Rxo63hTz$#`A$O^T)q)^<-IUxQYbfz=O{*@^Vo2PC<F<C?{y8YEU
zX>_8oqRQlqz3?HdR5%?%#Zrpjz&q1PM3XW}jw6w#O==^7MIv>m5H)-JaAz94Dqd(G
ztu!b)Wt5p?7?o$F;fjRjer6>3EiTGQIwwM*Mh14b1hubLnc9XyoQ2{j1ZG~7ui~YZ
z)W{)u`fKs8W#uwc2tne>C*G7!3Tjy)JL<3U(4*fa&MU?~IQ;y(mN){Nl@RY>r_fg6
zL?cDQ%SsEmkwuxAWrf%tZ)vQ*lF=y{y0v^UhH~NKMS@xI?TgsoG>V*z%*VO9p{lB(
z!*DqKX67Jls8|RR87A9c6{DS{mGnOVyFf(0Kp_KaK*`5e>~86ddJg@2*hXO+o1b?k
zi7Dkt&72ppg!!pw*0#;<*wxi1!OCFqQ^T54Yk`Z!svRZ>qyJOsz+^y#9r9EiEcr{b
zT_z}f?#!PSJbM4teww`D@~Cv7#X6c1tXuZ;k2s!pn%(615?GW~s%~U@ekcwN(&fdh
zdFSr@ZtwNpM9Z&4l2z=8+weOE&&&xVH{|-C;#v_1081#d%uYIN#%yxK2L`ag!NmU?
zO{BsDKGG0OBuB9QpJ)I7Y}7uV$@+0&_ee8us-h~ViJj4?k9=d*IZ{PSPEi-<{wxpN
z@H6y(;(q?MgxJIX0hk<)S2O>cEB#{kf89RJ@A%^VpUcmN%n2M(I|(XK8L_Kzl=`(6
zF{2uscyXMbw*&S+o;Id8(iE~2ilrv-jDl-fX0YDVA|rd8ZX-5QY7h8vX=Hj#b81%l
z&M2my&Skhi(e?id{64Rr<@BwL>Kzfz)ItpKm0Za0TKSME>!O!=kzS=xQZ3=(<LRg0
zzs7T%=Q;!-2tpK5MH8IoIni#IHQlP<MxzY0k%9*a5hSw8Y_iNS!wJrFoaq9T^&*8r
z696p$>vB^~G}BGC+id4K&To6(_s(;i=Q+-FW$C*B!^ypQD0XB2on*oogUidy%G-Rr
zy`Im1ub*FvPdq+2TzQt;m8_YJ@`&w=shOJv1IVBmK;S}#n9JfbM>b|=Y}vDBs-Dj7
zlrkMN=(#<KB<l5gy<V?h$3f}!DypiINhFe^A)=a@g-u|sY_n7z*4vvl?bgn7ooMG)
zrI3qsZOx7hqYY59nyj-NamN|XbDZ%W$X}isGeV4V(5W&IW2L0#Vzr@W(9FwSOP~_%
zt*Y0tsVuFnTBw|?I_(#;h>?L5odkM|${QEr!)6xd)G)?&`=q7LW?50EHf-DEYS(JW
z=GSzoq$}T{*;%uey0OLwMKt5G`m<$C7m-aNT9-cAIAYau&l8%F|C=j$I2FKZ!WX!b
zF_Nb0E?v;h=d?2&Y(=yXjB_l-z)@ynM1<L+Td%~$pMu`NIZ8Z-Y}tHcZpX%0i#45Z
zqkM3}>pth!GvA`8j8{fY0QM&Bd!wnR%w4BRw!)LBRUK{)3uc?GTMpUbqRXlhzf%fy
z7;2tWS}+?h6rlwwuTy6&JsJ3I&m6}-Hs{C@R=C(xR+~;%EN94uk}6yIcftd8%UO{p
zXtMk9a+cz_(H&7!D8?cBa+^s@%_3C1I%Jm<kcbc8YUDTXjhxVGSARb<uNTs799|R=
zTJ%?rI<sGXgBZk74dGTNMHB{b%5oyL(z*57l`@uLmcAEN3WeJ)p`XT2j&rMZ+Va0N
zBddg;RXdwdj)O$26yDILahQI^TOK1#IN@BjS2&Ft<g&Kv8Or%`x;0j!GvwKXAy#MH
zF{$-kHKq`?;>C63?3Qd`*Ivy-mB&0-J3cl`0bGTGob}}TvteDiu7eQC4I@@yaK=Ep
zIV6)O+g=!sOoiBRsn8XXoFN#l*Ix)M5?RsBO+=9+rBmdO9wczRoIv1?J`*iIK6CJp
zNFG8H42h&}Tgy7^vR4*X3>S8Z0uAyOP>KNIPHAtiL`Iuy*_M5wR^zN3R6AScSI3gT
z@&G)e8ryTKCWwqM4TW@`UM_8OSG+thw`|>(qAM0I7vvnIuF2nH;xZ6A+$B=8-k1&p
z8B!|c%2t9264=|Er8R7)2*()jH`!i{9hf-_IF3%R75U{hkbn?rJ+v((XxAN)lLhKK
z$-0AW@v8YnZP(kxQOiv=jy7Q$tg)mw=nr_7eG3{5XW-VbeLnS7!BV2oD9``D*m?e(
zhyLMp`mk#@*lPj*@&-DB79#!d=)+cGaR)*q49E{GNgN?qRG<a}W0C&Q)+MX};Lvh6
z6ec1gzw+sK6~f~a7{!5-WI+x^j#y?4h5=?^pXoJ%Xd;}kvM7L{tV1G5!WtP`@iqgG
z_AK0>{o#|L%U|2TEd%wuk3NzW7xjEeW)xvzN}muLURxqIHZhH|iC`$28j`A~Mgfin
z^{XWuQVL>-k&yLVakHwCfZ7zckqw)TmE!_5W6@&2Y$IFR3TRbT!c+EYJKlA=&~Q^<
zz^e@GNjJpCk+$H{#}1MkB7}r`8e>aPhDvV&@`?!M!K}pFZ!+*aO}hvv)z)Us3rtuT
zDI6Rb9F8J4A{(0H3~zH?Eif~RRH}*tO@(DuH5_Brw2xZ@IJQIAPNx2j+!AUq%O0mK
zO;r<SM8QR7Ih0g5NMvMl21H9$5CyEl$}qz)#|SG5hKkI_hN2>CAfn96D9j9EvNCdM
z42JK<jczlHF{-KB!?U9`;aH0GX_<7kS9Z5}R@rwIXsQ;itK!|{Dg#7@JQ)PlV{N7k
zj=Bs@s>{hgsK-WIr67e$7C>H2mjQ<0+jpf7mS}^DO~^KiFmP-b)Ngt^X=_o$NJi8c
z!)EIY>9M!4(peITL{U|Y7z9N`P*r4P(J)~dNtjiJ83sfdKtV*)OjA->m}fe|qN=E*
z(J3<)Ql(3vXt;`YLs(mxfw7wfU6`~MKdu8E5iOXRfpx59riw<uuo&Yba2k+fQIL=c
z5^GzC?3c6wvNSA&ykU=y|0j;l+=V?b$3qaIv8=?%CCDUjtv@Bw63pHN(?d&D6dqXP
zC=mxa#nia;9y{(2O|6~zXq;*wp(&bxs%nUWmZE5&B3QXd$SSB}f>L;dIwA9r+Xdfx
z(b@|fTBaqUV3LMnii&BLVu~j+Gb;nxz-Zke1yqsUxr<c<UM6suFoxx9+XfQVT1YVs
zWc#cXG(gb~DY(J1DKc`XxkW*=-9r#Hg=`8Y(Nk;sEvL&Xo4~*~E=^D$<^ScKUf&0f
z`|Gw?QVM?dQYe1+xOOoDxlyIkAaO!cqRMRz@iw|Os>4Xv)nqO0@1W$Os*DPtDPp$}
z&xNf)kq#CanOWMZ#+aB$4mRFNj9FmhgiZ_^O^i|zKciU{8nPw<r{>H;ql^syhCD{I
zG6I!qo}j`SNs!cI1qT(Uv6Et-qwl8-Y#PZDgyMu45c%+9yXe^b|AU9de=m}`2M3x{
z1WrsAHApiuf(ojtszM<us;Z(Y2`HqhN?JmMsy#8BS1P24suHS-auXnCN@|LtA&4rP
z2Aau=ni>kGf(of3C@4&+s;UO6sHLGwqN<uIif9^IXegqJ3MnZ{N(x$Pkfo)drmUG*
zR}>6lkfMQ!P{<e(wJC&IgOwCnnG{tnW<{B;VKr3}>P*aXT-G^E6_%mYYcV3otgBX4
zF`16FhGuBYaH^>?ax!YQCPs@LAu3=J6lR6cBdmnj_<W!8+?#gA9K<Gbn39*@Lk9S1
zkGduZKCgPQ2w=I4$oP~b52dK$1yTf!jd4}%l3UAdZ>>l3u;ddujKJKr6hY)l<~xHH
zgq$2Y87=t8h)hZ%i1!}95``9^?GI9T+m}<}A*lUu?l{8%ID_@p(j325Y)z?jWjIQz
zx>u$#c&V_%_q!qdcpF;5XCtkhF~^BVhlOwF()Cts!(_Z&zs9iPl3-#ztbynH{`(==
z?ZbVumAHtfS}^uv``|wf?%V-}BvxivVUO^?yI$&tP*uT(U<P6hG4R%_K;~y@6r?Ot
z0-}F?0rJG_im`!7C+UAvO(%0cgb|!lS0R<UaA9aqj~pj{3?WWL)yT!%XP>7vKwAZ(
zMI7>LjD>Ib$@ooBZqX5H4bJ}23=im{quj>go{YnIW!lVq&xiDIARG`}4TtWD2i$03
z^us@y&Gx-uqzv60{JgZUkGxdwwG}IZ+4{k%ih@#RFBdQq(o;MXNI<y~1v|T`rKI(|
zd5&&zoN}8_OlrGeGQFNSSIPE!<-uL&$6PW~N%<xxv%r%q>68TIJ>{k&`F(cItEsiE
z7Ian}WvZaiMFNieY{RzIF*P5L7+fYW^311KJ7THy%2Yw=k9&;P-rTr(0z9do6{k(&
zWt%-5FhbFf_1IlxPhm1Jq&%UnyAQXo4f#%qCs@v*_J@*>(h@Di^WN#Iv(e;8LuPgX
zSpw=?rGO;ZM^^Ss;hT<>oa|#*JO?T7DH~Zm{W9Y^+83Sg@agAF;T#Zc_D)9J8q2bp
zJR*Ye(p@mdbt<kh_^0d~Dj>z&slN4vaDi@uBSa_4a5-ccU<VT?u6K-w_j`NmZLE|k
zm1<N)p0Cqala<;i_R4Co($afd+wpUz^w~SYn=yEAcWpgD+bkJH(imipYQncQl7(R3
zW^YwI)`6xQb*5W<Zk6<qHn*aMC93*diKPt_L)?{^j|YzW*0pf!PQd0OpeCk_0zx90
z{nbA97MN@FKWEcZ>WTRul?z3hzAt)V7swP!Q#TykHRco;D;wtSs+lC^K*Sr>srGre
zOx5u!hoA4qzoQgRgIIy7qxm35h(d=Auw4Rxs;9V;h=bf8h1lhWJly?LoaZ^c?|a`l
z&U2jSIlb?D-#N~6oaZ^&>a3A}<jl;>%*@Qp%*@Qp%*=~zB!VQC+ikYm340ihoi|0v
zn{TS`rH_0U4BgtNT=Tbn{rl%R&U3X@RaUjFXF1MuGda$8-+lMrefQsn6F!O{2Sk8*
zIbcwpY=qAs?a&>i6)^yJ6j22#X0b=k+C_`t<%jkvdYDj@!*1fM-CR?OVSu|FSO$$N
zdedIl#_C&Dto+|RV^Ngtl!n@NQFI>l2TrZ^I~Hwlo6mn|wmKI6|1OnzP7fXQbE`wS
zyss@F=bX-94J%0qG*F;f1*UY}9UlnXbx`I(9J6UduDAhA&~veRL4eus?Ta}*D-Hr6
zl5z7c<-42b6#qP<;hxvLTttWo^c_SnyB9lK6{y-=6;)S`6`87;9Z+0OYj`)&PPu2Q
zolB+g#!WuF7;xNFS7uq3yg3>mm47GkO7Mb7xgyAHckKNTUjwf$99a~^AE2(@w-L#M
z1%R>!-wk+3mLDFTwG#ylq3Z1aBs1S&gIRS<O+bOf6D`km)y0Db8z$k7dnx^Df?=~Y
z;jN;IFqUcpXd@DB*vKOl0raW^nV1%%GhX{^TDPdSkB!r+3S=|rvqQq1zxwc<xvI9y
zam@N`uDt5?%+t*G!;zf^eVlgh+U2s<$cjx62{Vl~30*^9okPnqq9{<hH7;Oi1U>5f
z&)(qxuxks8`7|qJM2>&aQ8$}5E@CuhQ(1F3ja9QejOE1dlO=U1c}5H>WZrY-29edJ
zbrf)m2GFYrP}uC?PEu?e7=|e$cC{t(v^OS*V!Qa9*vV@4Wc7)n=sl1)J&)NaVIT?D
z%U>vOLP!Y3Aylg{=D%T+pQVs#z$n~@aT~WPC{X70MP5d7K@-o_UcQtT`(8}qpU8cw
z)62}bPg|_|8eos0j^uf77Xz_o^7nf=`AGRiye&AQ#E(mi!7Ly+I5<2#I9VnYJ=fOp
zVUe(Wu4sZ10Eh~8Hmb#LvuzusrQ~f;q#Mc?DypigR8fCWy7E-A-cZRBN3Tk;MfT?Z
z+Y@vHD2xu~QYpJ6J@UNraNnMf95{T~oqVx9uy#kXM|IIH&wyc^x$w*$A)!Ysp~yIN
zBb^ZyAYO7K(o#eOwEpD)i3l;^ajC%)Bmo0i2<FEe@~PSkWTR#Rssr@Z7O<d!NLxKc
zTr`3b1xhC?FC@y31zb7t+e_RW92_M?qf3+$1|qy!910GCB1OFFE#pMhP+I;_$>=Nx
zwBFo$;SoP__7TKXdpP-cRaI40RaX~(2^je2CNrGpHFmgLfn*4OAmas|8|xTPx59}-
zeF@y_2;#AK%jo(c)c`NOK(wU60Cr`@VcT;m&og9r;l>Vw%$YJ}M_ah3ueVae0v@}d
z=!c=5(GP_V#)bm^4rBwX%Y=E}I%lM2t@LTLqqCNpC)2N*ylJPOj*G^;Lg~rbQAS-^
zx_5BXr-j@-J2q_W<HwBkYSpV&z0g6kW{niSl`9<@G;G<j!5L}hP&&vJkO&Ky$C%1y
zBLj|E3fuswa^$)cEk>BSDameER?m?Zk=1og&33vWE2Hd6b5dNR7kSttr$1C#CX!TJ
z#YA_QUN^4T#oN2x&h=Tlkx|veX~(JKm4ozd=IU^8aBzw{bhxvCq>e+wdZ2J9Dw~-C
zkY5b>_3Pz$=Obm>>vhqi6Rr0JplR6as%RM_hV)k0Q+~YkbO|nVyz&AP%UsZPYc7ZI
zI}!yz(@dC*0TeU!D3JpLyfv6!_ayT*O{WNFGBGSk8rW?p!odujE+{XlchIN+s)5fE
z-~p1`UKks2p<!amX7dA`cZg%fua01LUaC_yij^vcDVvp2Bwa$)p+>DftTiTDe|ha|
zRw>ms{LVZ$*_noPsv9a$B_IC3JXBbqqJL3|+UKvog}dbLOm|V=rD~nAzI?}>QlgZ~
zh^oO@h$)UfNFv)GNL`MbUVWfpF8Va!pLf&maj#r)9`l$?LZek~YGFwY2t>wxjL*2p
z4l-06il`t$1oxfDN_@P%4*YW<3N?+sU%ETb-S-r*IR~8#5lC=nApU~q2bxlT{VW?1
zfk&$5j+j4iHyhredg4>K@IcdjOVS9%5K7uY$|13;WDRq>jVVP8GkCVNZGUf#4JORe
zIUL{wG&o?hoY;dP(%g+L+#%@TX=J^IqFJ$|+=nXzZUA){#K2L53);7K`b9#q9OJg`
zx57QRpnqA0wt=#eK;+g7J`7xw0;C2&0|Q)}V1u5q-aNvT)*I+B64j%&*b=egARf{&
zy=@ST6MM>6WPH#{q6n2ZiEoae>SbLT0IQ@SxxykLOA$(jY>lPN8)_m-V3p*;0Wd2t
zAuu6@3iBg{P{9S6OE|%TW*NG$#K2<_82_3esp!)+-&Dq7m~kuG8^-B$ev2!%IUJHn
zB$7y)(AiNF+bDZoGgUD&!N8qtO&i#5V5x->Hbo6YjWo?~${XIby2v$TD+hIJc1dlH
z6G}4D6Ddn@RAXet5e^VRmQxXg7;MePX0&ZshBD=?%i$}e*G6mp2K9^pZV?W93^D)H
z|E%~M38w>>H$ev`lqkY~D?LuS1aSb<nUe+w{cP)Wur&irD|QaBK&B$GSdgP)f*{Mf
z`S{RcAm_ow%@aTC%~1@*p{PcbH<)OW@WC;S?!!cc3}oFaxi-%objWUIEI>v@QAH?-
zh=Nk?G6tBn^K8eM;NZx{35;1)fWTuEs16y{Lt2|8jLL(wrbhCrf;uxQZ6ZaJ1V88^
z6}KWAU^Y32$A%P@B}wCO`eAnIO$ir!C5T{ygLu=TD5_RM4fJN9%LdHAnqh*9$_cD8
z#v-DLh*BuoHohwGkwrvaj#Ex}y&%Cwn9}9dAkl?UOjI>c!G>!<;Y4Z-Y;1{QV3G(S
z&a`H;wzCLFL~9pPVrc7T8iRR?e0#xkTPP-Et<cd7=NFqOYN)DZDAZaNT7xMt%qI-O
zWwC4+u&j(53@IWeY|L{i$*3kGs+lt*9Lz9`7{-h;!w71IiK<&OA`HwbGVQF)!m4Sa
z2&5>8A{8uRfKoM8ngWFs6Ia|JoHZOMm~oWKSYr-!Y0-ulV}!&JK}I$vL5&d+qQJFA
z87z|)Fl1yn8jNUbSlHxRgCZcLrJ#y}A__iI#)3UO4x)B%Bdt>&(nP@283sxj9ihmh
z3ekh9F@eoRkIfF@-eP1FnCnB@8Yf~MnruZkH>KZ321IbVJbb@*k3&MyJ(rT_F|^lK
zENKCR%gv}$7)@Zrl(kfZKush;O%FskL{t$3z;j?zw+x|khcj4XMyQHYMYZK_472$i
z(?n^HT7Ye=Wn)MfBD6<hBano0H5HMuiy&o6g93whp_pSEMh(O;Ok*=^VQWD}_LxT)
zObm%uh_r>VA=811L5^l4g(OV{DK1%tWjh!elb4pWSX^*7lT8y6nu`Lkp(rOVh$@{h
zW@>Fr21Ig<Cx!+&jxdx`?OBCJLA5#)At+`*p(vum2FzNcOc@ELm<W^K0gP(K6ACj7
zhgPjZQIKY18AbqPRWw;*7E+3;gF>}E-Edim>u$GWgusY}px6>>Xbm-vS(OqL6yAVl
zjTJ$eCSf!b!4){GKn664ITGgvjaqd9rO}y#lm=ARGS)$;H3WqzKyZ5S;U{ksh~&8%
zU~z*X$)p`(YtsYEjJJ&09iccQFo#@)2AY@L5YrgVF?8P#Fo}a>YAF@TtRQHO4NLUQ
z7~VJ>nMv-0ouR=6ZwDGuCZ-F|42k0qq#|4(#3zH;Xbn4zD6%ZQnWU)njHsszC;b(5
zqa>M{B8jS?Dw<dbAyA2`fuU-qDWr&?gAmDkW7hr}@ssWRQ!rL1E3cEA<F+14$ij-C
z=EHfS3n+-uiG>t34HUpdP}4NjRLm7c6;)G1L{$Vt5=2!L6%aYC8YCcU8iS$4u*9M$
ziYgh3LXv0+DTpEp8Y)HMgu<9IFlh|4B2h35mn?zebp%2kU<t22G&~MVW(!VcE=jqe
zc-Wq)4G3;ehdYtfvl)(1(F%IVurLUz0%WBoA`qcR3kXUQnx&+Qf(c5PrA)&Vh^2xm
zs3D3NwFY8PQFTCtxouHYZi109b{57Xk(IVH3^lDznuv;E)){4qB$Wikm}=9zHwG0(
zcn1s<7&{rEpbEEDj-$7`wrtvXT)id+<g(ZyZB-JHV#@GS14-$qVrCPDxPhS5iGo2e
zg*(d8gAu1AL;^ZG>x>GD&<U169EBThL>Vcm4Q4uxR*MYGT1OBW6(}f*48;v;2S#Os
z6GK5@7E%Tj!J5{v!m=>3s!WO^8!S|WWOGwRE>osrt5zhIFTs32znmK(2EW7n|L&jp
z@c({z7lUy;o};CJq92(CtU44Tgc>tc33Jc^SMOKx2#!b4fM~3Y#^NL(d)N=JqQ1-C
z?Y7gptZL|i$=6w)xxAa-{KjJ+HyHQ6MQkkhT(CJc&4^~n)=JloI7sd|PYA>{Y>J@E
zBDjYkIu2O^5rlytmN9+vTYuS6XyaK>RxdU#8ozQwViufIk9XOi?OU8XU}5Fq5S^LC
zn9B*?2DPe2rB1bL56?*2Z7$CNruRlI82r><`u4e*iUksi77bJiK|PIIDH?dB%Sc+L
z93@zaNMCL*In8q}CYZ)(k+o#44^)k?G2*XMj>4EKtu@`HpRt)-)TWgqt7H+i<|`6P
zBPfw#lau22h9cTAn`*V%q9rQi2wp7ApXIOMZ;ZMp-NYLV8vO3F(UD0$hdD}Fx1(6`
zWX$O7)ily$Fwof<8hFDUd1&VtiAZV^1Zs2Jo<?ZixSPr5TK4jODvoAll07(Oi<_eb
zrvI65Y{T(ta8Cuc841!r1euAScl_ji9@T(zfWCkKy&s<ZJRq?cV)TFI7ZxSZ9m`-n
zGpR59P5jHf4sfu7e1#Q<_B_(BuDyK!r~CIk0GZAj{T~gVWmAqEDBE%t6jL&Q9tOZ-
zVe{&ThIYh2_NZ7C)<WnC7`mgJ!OBUY&@IQ=`#l*?{@%KVtTxF`>qi?OrvZ7mDH@~h
z@SlVDXY+Z~54hr$!-`?NNTJ<}FwC&ULbirp#<O}hL0~fhTrs?O>}mM@2aY;c*D5c^
z<7eITX7sJNJKJfSjj~iv4eU*5560y^X_CUSl+}N9)&Xe)L<zH<CPd3Jld5Gpswko=
z8Z@fQK>2ue@!Za$0c6V{-S6r@-pG&eoyt9a^@ETo0ESRDHs%3IAm>scg_bCBOxgt+
zjr>m8(+${RgXHE*IpNrOUqmb#X*%ljx)({xA%aNqadR-PSjEU*;u0YeDw^KkdU&To
zR}kabFDQUWg}RZ)arZGEm(s4Q(1()ehyC}ri}2e-LmZN*HB<XN(qInKsD_5h+bE6U
zEe|9;)-#ZX0|CyoqX_*@xapI?42UW%B~&U1a2PWVQWR!{^kwp2TY#k|0F{Rx=`w44
z2C^&9jUzc4NKin6OuiA%U{eJ(ln0*8u>^ZF<Q@;aqG1V6>BPF%@~UX}I_a+GmjCO`
zKMp}+Ndu}(TWqI1q(~^Ti{}+<vFv7=>_R>wkdP}IgAKJB)<%KRN3Cx(hJmAo8+1*v
zLyLKkA%{MBfzweOl*B-ku!g(8$3sIdqhlL8M+i5z7{<!%45SCexteLFX7rop)yQ;n
zWwi|tVLJXV%JJs7k8F;};M*F~vKbDvm@;^7SU7YhoXH`LmfkR|k1+Q-SC_`yn|>BL
z;%(s6V?#@u3IW}zvqjOc-W2D)Aasc$sW_Osjr&etZ&i3b9DS;YWl|BtXHy>`fjjMk
zWJ4fu3N!)((-i<bfPw11SPhr$^mYDU*57C3DE)dr{Wopi=DzhP1_<zj8q;>v>O_(w
zlVB1ONe!TeL#G&KFc<8T;UcfZd|w46#I|DEi`BIFa2d=CB9kvp!Qi~O;1_|}o%tvl
zL7}se2*pM!a-wk-SwVuHng#17XhtwPZ6||-$xB#OX_?H>Ej5jemPw+9Mn-C!>Qh%m
zL(|^eM#rJ)m85GonN2m8;If;A8!l18*4Xl*F+CYd+sV?_vSnj-Z!!+{W}R|zLrpTM
z+hDT}&_O`41t95I)yB9g>b0WZjj2pXiHt><EDE78sREi@q{I?L^)E50I*o8=RvlQ`
zovn5`4RwYOQM8Danxl}o#M@-q4N=LDDJ#{9ewWek)p3~P3pmVUOP>>mj5BtLwBgCb
zI=HWht^|@HriB~=v_R7oS2Gl1Y_<eyp^db~TDK)1X)&mv$h1pk8<Gql<chjSCrno!
z`9oXbhNe`;R^*zhzWSzXd&85#x2bMsTfR_LG~;t|tv!A%YJ!U7vggwc6wfv@Gu8bQ
zs#4<0Xz0u*sw+F58&2}oG#o|{kufba6eSwWXfi_@IFK7aalcy!jNH}o$dQa#&9}*U
zecma0Vd|>^jYkVXuE!@6aw(mAY1{gJ{3Vwrsxl&KgCrf_a)I#b99bN^126{9-l}N-
z^8Z0PRR9nu2TPWJRDb8~l_}SEP!u4zQ-S99uDsp!4@2Z0=a!-0Eer;4a;NTTDeXSq
z9)_#{M-H6zhyx8nR!JfSG8_`}W`BwEsO5R;PvVn1q~L=DVl-uo7J~sa|HQ_Vm-+ME
zldIcHeh^*`<r(@pZO=JoKg9v1=M02?*t)>`J`Zu%d_uG@TY3juKQfA%#?Ja{F#vh%
z2$U3g3_u9tKH@6$5S+yTf_g%zArr#R&+^mR(x0~~kE7H4Z!WFApE*Af)8J9z>_tA~
z$>k&`l!al6{;lpyW$AWZX5wLfsMMTIZR0G#az|2Ssa(u;m^9y45;q|jw{#8Ak0d1`
zZM(TstZcGrkY-678I0913&Sg|O!&?)X*JG<Kw}KBGRgBiaB&S8jcBw`FksYnv+BlF
za!?q7pei*#U6q^`i+YME3P{F*z?rzrjVKuG*;HkgIPJ*{!yE%GMleB1z5KCisesz_
z{<jF>ij>q0GRhVd6f&_k5`;U|`S>)!zI(PP5KX|IZM~Fyp;arb*}8=PZWLHX*bU;t
z2H?qPxM>!(acfH5>t;k#;`iHd*lpT}@?1PrcrzoKDk%!$3tg9sR*|N#-C!8dl>1@b
zxYg&wml$PcHelk4G7-iyxm)mL-sz#E7~s(b>?|FU5=P|Hig4<=2v$*p-Vk>yZl=P0
zwwb$Z*BECRM?yy721wZ$-Z^1}kvvJ3>{Hn;9C4C$w+m7Jt|?m|l(c$<Zpc<vHBl5h
z-X1=CR_&%WRWRo1RdUQYQyMjKO)08O^P*}>prnb3f-0IQijb-UH7tkmQx80>ACbGK
zj+djXqzDWeOS&$oHfyn=a7HTsN~IA8dZjQyjrIJu8b&DsG$_W%e$8H)rB|Cf77TOc
zz3W!Rppo$_(~~QDt^>glHdbSdWNpU=idNv!VB>NREyza3E(K}Md+e-GE^df%y4@(q
zl?qYbt4--`6r>GO*s6k~rf9V#RWzu|@!c_tP^qZNGFEBD2;zeV6F}-t$mqelTw{$4
zq@Hsbh&<tlTU1tSH<2k-M7%9zPwH{o$60~GQOB<<oE)ztwY#GiSSV_!p=o4NK~e#*
z;-?P!k0TQtH7q0}Bx(LCix)YI5wkMPGseT5%8SPgV~NO`GC`$eIWsI7#M801<6#Cm
z=;N~64HS&2wWnQUvD<XiYRM!-kc|<Ii1B7T$Q6Ptj<V4~h;hJ(9I=%tC`_Fk;ok9%
zHI=HpAk{J{>!PEzVOxSC3LvzCAfk$hF_oIfEZJhS48xw8vp7uNG)ufC#wcQ_%oJL?
z=lt&RMJUe{q*at^GO5Qb=1!v~KNe*X!I<%xt0asag=k@5Ha6U8y{4^^Li5$bM5<|H
zcP(uZC`+*HurTox36>8Sn&YCe2jaxkhgTh=simfZl7yllX=YB)WkMB7Q$avPxrQ}B
zQB<WVO%}1p>Iy|r7EB<jY?Ab#<mJU>xokhOpXB3q@!5xe$G)XIl^$5*%!MIEAkx!7
z#HAFR*-i7$ey!SYmYi=?tu(A;#-n2^BX$L8jIQL`VQ66tiA)Tova1DwY{CoL$(Bte
zpX<CJt<4QqDa#GuMrYD}d94~417WKftg<RB)+R%!9cDByA~Ls*L`_7HSy`Hd$tj`8
z)H|0aaFit_5n+Zz5mGcJL2WTV=e4|vGBN_GVx_8yGj(dgVuC6UD!QZo9yGsxyMLz*
zKgU`1u<qB<w@kt5#_0i~H7&dJ(N7b)wr^aBqPgiT)rRKaf**Wo<9{S0Gl*tLId?-i
z^@3!yusJ$nzrXF*82eZO!-n<YeW{=B+U}?@uvIhHaRLLD@hsXf$EpoNd)Jp-2sMD6
zP<<Qmk^Yh{M}|0kqL~++w1VG#o~y}M<Uw+f>9TwmJAVVz^_si7s_8iYNj+v}UX{Vp
z)4&D6o|6_Nk&Ad($NT+u*~pz^9u6JLS=(FG&hE6Q!|H$DL{?8#v(GbccU}i*#}}hb
zX8H2>dwj;P+5DhM&(vlhBru-H^60rRToLD4Q;8YTarcpixI(%hBi~MC(TK;wtA+8T
zivZd$Xb;*6zt`(hpmcG^YH|L<qU4qvN@q8m=b%+YJv_i(B~)Hykt2gJs#*#%L&SBV
zs!~>+FePNXZl+VaG+<M#CJ1=z4Rfe8o5#MhPkd^4^qfwHw^GY-_>B}<n0$AdX+<_b
zVWP1R#^jkunOhm~@rzGPIx@Yrmg@ysfh1&eQ&qt!&PKHvqA9bcKr7eTW{mGn{dR9S
zqUt;EixN>l6xh?T!st<AyF?eZ3-}Zcs6|`8OvK~o-C=p$S(G}-`=|R3f3QHn^?mp}
zi+rbfFO*S;I6R3#?qRrwL^VLFYg}HFxtW%jLz-U|g9x1mR6PFbDx!%390);2FJIr^
z@Nom|f2%-t8S56MWjZo-NlZL5F-hH~3#6!bu}kivrqt~e7_k8FPI-jrfrB9Yn}#f@
zlU5iv?BZAQ@cVz3DKM0PgpdeJ8|{d+86OQ;eSeHZ5P80PrLpeHv?vHt=5y7I$eras
z$h?fid<vS%eQLjE5p==20@3)o+b)Cv4C8U+d;Y<V6i40kdy}?ef|-aQsP(GBQPM5k
zr^)`$@u2K9+SmJ&W_-zpSj21H>Fqb7y+6Cl)(5=(kwNCrUhl466sqHsQ9k8nj?aJd
z8|z%-o_>oessPcap|KH)qsm$7Rv;(1kKm3qOu@+1GUb!Pu~f`Q*i**u0zDsBc=y_&
z-!*hTEWx<AxVcqTj$-9;ntz^s_=8MZ{*Kgd^}bX3C|4}~+;PLeQK@3&hA$RUAHkO4
zm=NLjcMCfIx3^t*-r9i<I)BIckA_Z42##_JkLIHg?(XhP_&Mg1{@0rAZZM`%g@Yf~
zrS^ApOrI+uH2-F#z(fZxc~iG|#pZuIzx=W519HvBiVj0>71Mr`I?yLE(?IK{cG!!)
zH<OqE9J>ut%Ao|3L>r{N`@BMuI0F>yp*D0n|8#FCYLM8MP+avn8CWfXOVjEB-N?*I
z(apQLInCz}ivr3Z7(r#;-#AJM9t0UBVv|Zj_|`{9+3}cI0~yL&!6=8afk6p+m9yPR
z1NSPZ6hOqKw+z5_EE*{izb}qq0@c@+CH;0GwsYSXw6@3FGS_ns+IgDRylz-MU1QU&
zZJD^X(QA24Yg)j2HLY^hikEkEiE$4IzyS~*Aj@<wix$ti#ujB(b8ARr6k&zi<qgs>
zUs8Vm(Nj?PxKMDvRU0vet2R*TB;|FKs?{6RA_?DP*_B8t?=>3UGB#yTi@C(+tm&59
zZFb9Tw#x0c(mQiF`2WL~mifNEU-VvU(j1r??-ITp`ggY5ZPm9ew%cvC+ikYnZMNH)
znU>paw%cvE1Zb8a3pxE;zFOeCY3|DO*(S2u-L~88?XO*G?%P|o+jtv#Z;x*+cI*+2
zv(8sz@#mEo&xgV-KPH3AzBlFM-L~6pw%cy4t~sXo_vq`Ys;a8(rmCu{s_E0u7|_<L
z64xtl<ay3rXAh1mHHB|7(%Wses_q~I`QMQGx2`Yqdv5U$ryInKIi)vIIa$1u#p#-j
zVFh+y#@H?RcOvP6_oxIupR$h#&L9mA>4r|n@NfV~qQ&_+=eHia{3j7`Lx_j?744gf
z_$bncloiJQ!}59}k3)T--@{R6Nl!5j{bq0t2S^f@?z+cU$HheId+kFLop7;E>C3u%
z4n-7bh9!VG?S12=@sh5n*e67iSY;T1o;0z~vsEjmKR?2}X>{L@!}}_?w|BQ4qs;c5
zOi`E;@yP;TJ^J^dy#3l9nvLz>ZMNSvPmd1?+OxxiY{Ti$In{CBzZ`h=>({SdoqBb5
z@bZMBF)Nj**1Y3$v5i1Qp51tPNpw5(2y&~((|+6ND$eP{yXokToTVGq^9MpL+~B?t
z$*PaL4~~k*pBXQ!rKrK$@pvY0*i3PyOFPG;)7PG{N_zO>ch24tUtXIdj%$0=n>PId
z5=QS{yYXE2-^xb)Ep49z81a$Uom6ww@^>}b9|N{{*AJa?^(Yw5p%K)~*FB%6(ys@c
zqm_;^(>T8y#!Y8FzBA>04S4TDHhwzqRaI40*TV0nF^#);a<<=Xw%ci$;uP&uyXr7o
zd(>kuKD=Qt7ve9BY41j6-UpRS&jekxW7j=9_SZ$0&c+Jj0H=p%Ps@!>Rc~|OUFW7>
zIi6>%dp5<RBWi=O@XQmj9*9Vo-_y5q&EA%IJ!7|CmB<|Ma^{YxET0OZ<kCcPuXItF
z9-XxHYksOy;kLSs79EZEv7JtMCq3$?%dPgv@HR_e9Xdr7eK6(_I}~@YwpG>zQ}p3f
zwc1O`CrKni-=cT~f@vp7(IOFtTp$$kcP4dE3k(}2JNrx$W-wP@DGS-V_rh!g2~ct2
zm>uc5bsSK>jnr*NekNl)ak(Jwvhi<Mi0Pg7=UaB-x#91d0nbi1e&vP6x2~FQae=VO
zpm8eFjfU@|0V59YJVaznySzRv;sFJm967a#mDOtao6gIA*T-tvv#vL2w#M8MIBn~(
zDYlon7IQSQn?g~17FFe=NRa?3LPkWC;89Bq^a>7>P79+ZvDoF78J9Fw^}dC>7hhFs
z07Sf?LX$>9a&|!Egog$Iab(d0hLy{Y!&vFxPqHEon~RwM%ZkcVt9-~nI;a~jge7Kc
zX?g)#v>jI-e%@NlW?5!ime%dI*NYt+eX}zxCtb_NeuVIG&X_uSC*)8%i~)i?D48gL
z?w)W)`aXj<nc=^W9-H3!b?@VCwYzP%aAlV*t=nz48<R5H-L~2{mm9cDy6MB^+XKj9
z>I=VPl4m{~@5FRBt-T(`F><DC`_+1y3G+F}(U*EIM;vQp`sezrbTB;e=tm^FK8Qmk
zL6Z|pSz3iyXR-EZtw|7+8&kPucL>D4eQ^nIrn=u$_cu2sJoL)xo>9lmJMC0+NGbWV
zuS^VgiqFzuU@0$ex)CR--+i&RD_M8)9&Y7^XB{GsfdnM1;Rheu>>!uMcX+>$bUJ*v
zxYy1<F#8*ARMQ0x!N77j5Y9FSiZ$c@(!^P>%HtV0G*tCJ*BhLeWC(tO_K^S?KPL=}
zH3j1^3m!s(U$zyru1L1+-sb%)^{T3>s;Y{L#Y9%7!?wH`p5CgDyk0|EYsJB)hjWg3
zG%f08>h<5h9^dc+jkd1FyDG84Ee3K`SK)Hu!m6rqs#U@YOf=Ka>@ibxtQcPUxnEt~
z#wfjsZHSBVeq1vJcK27^`!)N&PwxIg&UzfRjGgVn?)~C32daJ&`)f%NYpM*PK&TKa
z0HEv;{a)eo_WX;`#~gRRhxry54S>Y%_J-j}u)ycz$*_<d;C<jV>H>?<-)$J)u5(`x
z)qDQX?}%kVXrsv#54tGn=))n3v->~K@ArO4_Vs6nu|UUt^4auJLq(8ZgP(-`ZD`rx
z<8IBLn*Kj$hwvvBrE@969nqsHAmh2MUH?;@ZcZ^T)Wupz{eOgAm_-k@fy<G`;jqI;
z3^q$i`?dWX{nbA0B!)BeF?h6&?FYB?MXuf#$*u(lB!Y%W{fkgCGEMgwO`_iX=kfZ~
z==HSFQ@=Ct#;FNxl2d@6IKe(c{0^LJr!jXv+N(~j=>+?~kGpbm^(fuj&B|Rve7ApD
z!UEC(Hk2Tt0Z3v7NbAQOcEl>%7|*mlQrF?ASN1hO*@p#_+?G&x%~+8%72($fZ!oem
z6x<Y*P5XP@5x3}`)5Lz<^hZ%ZSYah1*Wq@?5MC)M!Hxr1L5MWL<DZ7IW=SIY+`Ipu
zBTxJsT^Z4f!|Tz@o0?YJPu&S~rX(*6{0*#Fad)~EOp89YTXfM?KtszYY(Hh&_*YjM
z`295pczu=GGdOekL(vFP6~`KeK}s?KkQ_u{eIG<H&y}(;87*JnNZlS$*Ct6M!UX*}
z48DgkY@^@97^<pAHIY#Jca&4843V=2ELbxP5|M~<6C@%4rKC8RgqS9y;ROtWhuHj2
zZagq|cs0$=r<<+f;If*|F4kd^j()1`dgixE0Z+JR<vx6H#b3@mZX7aTLOcwALI?s7
z2w(1}9(0HCO_1i^>SW&3;>$GY0l2V$GeOvA0mv>1X~lhs;!-Uz>@)t^rh$rLpJyJw
z-^Rm3Q;z&+P9n9cx30oaGLwts=-788gp71r2xAJ;uNa<AjOqjP1BepXBV$E|C0=bm
zv=kc9+T$h(BbnzYHe|^Iwq&Ik+hK60Rt>BtK2_kW(*tck{nrd_J;0Ay7vcV{--q=7
zG(7m~=ZXwGaf_Ym{8@OnlQvnQph)y=b<YhcP)*<l8)BaQcIaNmc{jaaYMx9oh{(ob
zs_!)j6p?y7u{PS<=+^QBLwkx7RL3eqwoI37B?euJ%YY=1=nN#l5*rzpo2<HB*;{zo
zgy6gi)h(emR4EPGbY_}G%{9+b;NZD9al6XP5xY6|wY0_t6Hbg6n@kBe&jZT|vpL=$
zN42zbuxPAY;vE|2GJu%ZI&{$(WdXY-rF+JwQ)><A!iqAZBer5R6tN3Tk>aTc2O%ZH
zv4a{G!A-*<XP?>ep4i<%6x#rye%B0vNYsLzN(V1!17O&IIUc+NFd9~h7B3iJ<<?1*
z-^~a67_`7Xk232CzwP*FG=a2+$8oHHEOJmoY9e>2N4|y_l&pbWUyY7H`{UG5j;P<D
z-qlxE>g?I;jG7XTCz2=TBs+NQqIM7f(Zd<1`5eBoAzs!IFu?22OAQ%U^Ki~%vYn1w
zg*I-x-XI@xq?jl*eN%F85MF5q*9bt2oI^uBY$aB$fmzfW8gY4|JKqbvU*|C6Z{0(J
zx{^YF1po?O_8Z;nUJQW+;0LNVBh;=c7{gr07Fq4nmU-9h3REhURUjY5r6Oe}0bmoL
zq9Q;h@1w!Id_eF6FePHD;z?1~JI^1_?EjsAxO9HN3)(EJ1G=1wVSSd$K~O=*k$rH6
zNLI%k8q6}4$NWTZ*Lh_(5m7NT1|qOUMFAcGr+hE*;}&T6aP(*HbHZ}iv8oc3g7OJf
zLLe$lw8&j*o@_VUn0VUrM+GK1Q_oq}_|tQM<QfS^Hr)%WdtO&djyT0$jT0Me`M}xE
zEYw_?iRff!o2=6Y&DyEA#zd^;xUh2zYqq{wnDMyEHmOvwjDX{^7N*9>LS^BtYL&5(
zsT(zE&4Ai$2F937%UifoQf{aZBxu|HTT2}WjDSDWWfv_b%nOB!fjTn6QOuKB?a{n=
z8~a)`T+**PGK|XMawx{xplRR=yEOm;Xt6{qb<Ev?Y(t<Wfdgc~RKOz;F<~fJFijA@
zz#TP&!dR(J8o=n04YE>&EeTXKAyw8`Z&8j>T)1c^(SwpxVqs1a@y0qMJL(GR$D?u7
zhxn|K*MN3hl<x;!^Kx+%w7xUB4M2D2zt`e_Ci&}}2vzLiz>XLdNm8j=7?iM&+r8iE
z-x_(lu{YNX8helGG2H=6RPK<o43vz0;_TK(1<9$Y69}Y(=v)2s^|M`^)O6btUKY|_
zUD8q(Q%v5f)s+-ecPTXEx-Haz#;XVR^{U|$7!ibIS5}H@8nhyUthdYR?D#qF7ASuw
zRPRDe{=ai*a2R*0nUu^?DKRMG2grd>Y?BKFn{L;K;dpQOOnWGLN7^nOizDQH4A$r_
zHC)&vG#wMKnbXU^QnQ3T<Z2T^#t`u%`By&30?0VSzyFjLmip8|>$6L%JLedJTtfvR
z0kO=E0bC{OrrA-N8nf8p9_*U2&Fp06^5$YehFMms%u!FYssYHaA&rI%yiPQ{OS#qf
zGdYKiITcHUpB}b@v>a4CmUv%&SNGaMYwLRZSD)d#Z4#npq^$*tqR>z&7ixJk2Qga9
zB$0lh`dl9k6no*hvA^`j$ZhXUww2`tpwyZQa#-PUM401v<3qu2tqozQ+i|CrY05#1
zL1}qrM7yO_TFG{pF}5sBm{6mLASnt2Ky#5$NtGEo>eC@&5<LLqS6_5_O@mgSxHOn{
zcf++j?&!~t<M7U))~Jl3K5wp3zJ_Vi;)gDVL-uc}_3N`4fblg%##s8BKp)1aYp-Mj
zqiU18Ab9sjvc+Xdr(+Kzh^tYpRQ(kcTTm{Tk2(AUfXamhagIe$$Q)|fvLq2@4L73}
z@MoR#i1&{dbvTmwUFAE%Y}MqNg>;ID$cia6Xu777l7_N3Vc}#|#N3^$r@@yaT<qdy
ztZmr2G$)u~98|CWphqrNeV8Cp5E6q0R3rkKe%$`&J0;!Lyx(q?4>3E6+t)(Cap_Ip
zRV#oPnR0s-ei=SCK|??<IiP{)C`*RF`@{}XEGhUNc&Vs<Khwg%=zYKam7UJN>LT$*
zrOx5|!X6q#LVrRACo<`8)xY;(#iP^VWBud|qPZ?#{ate{<PM@b>#@4t#iH@r?!L#{
z&JzMICW_@6p}x<y>gt6e>Nha3i4h~*MNzq_t~F39jeQG4v`)%rK&nR{Q;}zVQ>J4X
zBG#!2RX-Px@`8!|Dv=^9M?Y$xD&iuDH5Zn|F8+S*Jn}<7&@20pmh@r#k{lk?^ZF<Q
z|7T_hP--DcAwC+_wcz2)R*Qcu_fq$VJLgPZq2OzP&qIdb|4&S38{_|OoN@(=2zC~k
zGhn0t-G9$9|H#Mv-}f*2{3HImqFq!d|5y6h3uv``KBxRT{~zIh@W==BAvyU!qYpx;
z|F9$a1t0qg1sMuO-;v1Y%bnN?jOx`kL2LV<8!*vBiva$<Aha`M7LB+A&)@$n&LruK
za#_m9^Z%xEsn$2vjNFBcJCQgAO<ce0&+D;5(OXA!plnk{o_cXG|7~X+_S*Vs{&}Gh
zgx5T{i1@h#a|8qel8Q2PW<t4mNDei%-e!Oh4emu6SalE=T&L_H8YAxf>VLZ(A3GgK
z&tJ1WffI{d4=&X0wh|xKhHHzcP&=OA$lf@wBi9Mc@j{7(Q?;d5#*`eCRYapBOxs*n
z{?5-jbVcR*@rX^CedW@Yw(QwORou1A;AN@*;<}?7DU*V)Zrl8FG2s=jpJ^EpsEp&3
zIKl6H=Zx{2+fScRLT!9CEj9kH?B&@zvzunE<`y2jAK(M`|D@}@`lQSmVkxtxZr_rO
zCXqV!cK2*&aOYe`?Mnt9?osFWYc>A>8rI}$KY#B{`#!<nBx5>S7fOFzQ~u1)&y6ko
ze}Cl3>f7oMy%bsT|DiwLPE%=*<NmKNtEb2LpWJ=TL{;X@rlPAb$DHrIA0cAU3F@1?
zIrre)4Xh~C86o|!Zmnbx?*>HN2nf$Ao1CahX&`(Gci-qn8|_w4$K^wXq}mRUHZF}r
z{8;~Ts;(aY;C>ry^Y6XsOkTfOA61TP#W3|sJH65eC<F;4h8_nuipB4r4tDl)@xjf@
zT5{lWq-6|nRWU<$6s9Vbc$*qz8)XYf+>EEy47gU5g|KN2iLtx;_YchtSVqYvln>Vt
zSlY#d6=y1C&)!rs7C5?|Uq_tYm^8P=2Uw`*SHE+nh$wcRv$N0-0s%5IME{?!1ipv<
z7H__2K2(j<#_S4Xf|Y*8lMFDc7RPkCL@?PnMnPt7+hv;c{XE*+rXT=)p#o7cd(t7w
z71cYhL=q4mta%tw<H!}0b_RMg_EL43aqlVOjdcIVP$K_nS&1S9V!O?3RgSW@6IGe{
z=45Q_RiE2wQXOdy;_&!CF=u#o=nPL#i$D2j`g7-sSi5bEY$jb34WR59VHN?9Vo&ym
z8bLK7KopB=!D31lh9RRc#XuB4^rVZe23iBcKIu1ZJo3Tje#svQ-M&mv523~hBQpul
zRh+E<ZtM;a8>ApUkiI{&FlV?4-nQihD`>5x`$Be!A0F{-pxFt`Tg1pRO-gKF2j433
zY7dG4`5Ahu4%r`{!ws6exCbpDCzNx%{KoIdp?~P8AXZu$#3C7}P8EI=QaiU>V5pVh
zTd{xso36G9A`plIZCBWuUD2Jqf7Nqu|Hm2VKpp=p-Dp#tR`n_o_Di*f9&KQ}FI*w%
zY_ICI{WCAkotYeebKmuNhhILI-N$JpI3$4j^KLH4PDw1D=}?CbG-T3=P2^R#dh3V!
z!ZzppmpTf9f<DrL69Nzm<P;!8*a8!bJ9gu^1Q1S9`~60~eZZeY=^~frkMPs>d%q`t
zn}pu-=oJu8%_x2-JgOh8lo9XOO_5SxwLQ8I^ZSek4Pu_aqLyl!0v#hDggkxh`(OK?
zZ^P<we!9u9Z^z<Q3`sJ`e&vuoH~D&%;K_%7mj_RI{FaYffPDs*Vu%{7?8wR#1uA?;
z&tv)i`UN7PV28LJ-hqz2Ifwv?>_1OK|Idb>^4YI}p9}wSr=WTI8e$uuegrXt89xuZ
zKx{uT!DvoSw%Ql9pgI3E!lk{iE;h&esx&4U`|Z^zLwk52xEOS0Xu!qMaZw<dqQ=C7
z6=^CkuZH1dnw+Y*4L_3V>xASTMh$C|W}V9c0TEGERZAvRHfl5)DuJ;nED<9Cl}uKZ
zdghB=5`aRG<B`l8TP*R635x47IF3=l!E97eYJwDRVXcNO2tNVP;Aay~ITJGjQ>-6x
z887WNG3JAaP%|}py`NT{!}$7s9}iyee9|;fzc)bsThDhE?8hP`Bp^(P8o7TyWlMT`
z+~*6$<ETgOzw@y@zV3uiEj*Yx5|69bFU35%y)=Z`@6K<Kz}j5T$r=?rFAon7E&Dx*
z2QSiIQfb~X2}9?+TCm=T3If7ZzP;?&Y=uADC({7$@SiFM0sdf#@b-<QS7(k)m5y+%
zP$((Zd<Oi+*o`-HtR<`WT+-J+aOD(;XAS*6Lu#t>kHb$-tP(*4f=vmaa8Yj;0^eRX
zip(%<p2AP9!hM^oNioHvDV*XhAY_P?Y$(c#%hnh5+EyA9MELyYfJ(|J3SL0Y!`vJ*
z>*};tlLxWPW6FZUJ=(l|T~_&Ve@{47mrbHk*fWg3C^(~(C<(Zxl7Uf?Tu~RXP#n?s
z$GRQz=&}QQctPa`;?$&<UM^3`dr|fGZSwyoF!K#nRaI3}?USGhhi@G`AIE=dZ$1#8
zjXsJeKj-tEUpavQf<S%0qR$;2U0of7^{wZ$d1lxDp1+g&@m|U8#KPZT6H7r+ZT5V-
zzOAufAexziZ?k&U1nA91reK+wAqXIJqtQsUP<&4_wgF0x;s;Cm27gA@;j%sv{9`C$
zJAo3)ury$xUP3Vl5R^wR>AOF|ftxr#E`AZeNyW1N&WIrEKDIa|2LEGIka%{1c|o9V
z_4#N2y+8TOk2YCS?>Tzy0AuS=JqFqBuC=bORlXQrJiMKCqVk&b^sAA;p-@mf;sg08
zqem+=$GAiej{W)c);MxiRz~S*U;cfb!PSTwuLt!}hOBGX*J0bguX-c^1Xw@{g*GZG
z6ewz}YtA><UpES=gN+zwe(qnAwacNyx_CSpnVFrW3Ju%3flW2@U}c46oU*v0M!#5_
z8T|S#U7Pv2qCpb;zOX&OX)F+VbPucOcB*&j75qKAq>lT?qz$DVhyk|hVn8qUeLqj*
z>U`(k!hj}dItqe{st6z;;5F>_Nj+o3+&({C`ZMzNH(#N-6OZmXN9XcB9~{K>kGy^z
zo(n_JUf~1q^$hl6Jr9^{pR4f)$KSCkzcKNkju6(|7=!O*g(2xrQhHcuhD>v=Sb<ZM
zM5js)sKd5}<==WgGl~CuHaD_CeZbHjh@u!maUrr&z+pV&yvTR;e|G-E`@fF37q^mq
z{-4LE`xD<FO@ssTWDI}Cuk#(1MoOZM(QJSJc&ZXR_|d4iN^_M}I}rqkJrW8Mq$o-t
z9-m7wLj8~8<F$x`vJX;Bi(fhaYyPHve7V%Wglf3`tTQ0U?Q8kAx}8Ojx)YLZ*u)ez
z|A0T^oCHUA5{x&u-AB!oQmQ_+MI)%}q$s=d_Xb~;=-ca2*ySVX>0y(S1sI_y@``f-
znV6^b!;!g0DnD6NzWn}Tzc<}7KSM|1LE?w`nqc@|BhP`G#q8sOlrrSZn6VroizlDt
zWeop3hvozeFcAQ0Ps1at0TH1GvjPI=i2uFOG{mQbfm9t31V2{$NSczB?ZBpN#1}~k
z%qfQP2LjZNlXHLv;ebQ%PcNqjV%F(;E~UuSv<)bjg;e><0HHx)I-nSw5H^K|&e8g_
zv0)7?mXZ{ZG9;l7hci|IbM5+mbGv{Dn`jHRAb(oJlbj$6<5QCOr<ly(KDNlQBgsVo
zT-v>lehDZ+cpWM+eFZx5weo)v#-`|eV@Kj^ixJrk9_y|ULVv^0OyG3zxv0Y%(uE$(
z8ReLNmg7^aqc^jCEWmk@#wfu1WgdU48~cS9A=6~{iPqTzoG+;i@!3-O=+X0wIW&(#
zPzF!l6`vsJ`*@XX1Le~2pATp6=U+snpV%$RE0tKyIcfBN9F*)Pzku*P*e3)|&%wf&
zRL}SSnhe+&ZNTUU`<L1zEb~LK?mC9InGdM$^1t~1f$59K_=wU5T6=>kY&@K;uH9$q
z%?CNZT@_3ZA>4q0(f&I?7WQj)@zo-FKs3hhi-;Eu&UInWi-J0}L9HkX1_zRZh>`=7
zz)*4+Fc`$h#}9w|FpG)c-wGI*h>EHzt9FoRbox1{8Hm(_j~?4^*dl0=FBz&~u}=xE
zEA+zjniVJm?;rd;sbeT=#2HF$pd1|iev0#9hfx<<Yi4VD1JUeWBNl+5uMlYGV*V{^
zJ7JqS9QQWA6_n62Fi6GAoxTx)*Nz;q1cQ6SF$qY}VswUs>HVhTudnULa{6UYwovTd
zfD|Z4()oJ+6+f(DNCbHcG$$!lP=sPV<_JnZz>*PAZz@4@5~zvKWHiA>twoEw<`Ff3
z2T&s%K$XchPd9{NY8-;bplomPT5NOtmG{u_LbOSi@;D<akS#$ZGY98*`j{)~8agY7
zVWRth!3j;&jb|4>G7AG$Jyi*(_*U8(b}S5b?tg~tn1ci;N)bOHryd>sJsW$by3`b*
zAB3iJ=;C`*c*8(vs3)0N-#_Q!DL2)jE=yfd{=nj7w~*pwa2$MCgIW#yQUa0EIO?w5
zs|gE1X@w5h575Xnj0GRFfJzAa&OjvSvvi!$wADDdNvDMp{HejF_Cw)}hEBV5s90aH
zDH3lJBfDb7&<&yRoD71U%4kS%v?wZZC!pwAg)mT@4#<xAkj}Cp|3B{f>iYBA{+gq6
z_yrmzfF6i4OogbEpqJ2xVN&zHrZzi+Gl|!KfYTwtHZ}eh4q;By=K$T0xbOU@&w!0*
z$KqnYL@~elq<{I~b-6#=R9W8pE&?TgL_Kaf&}9CVi=_D<H`no9#7c-uucd(ReGv|%
z65i7N+y0n`p~v2%yloQXJ=cz(WFclG^ZFj};UE+g=)qCQnLhRoWKeAgm*PBFq6ENu
znG+!?Xb6Pcn3P(~&(5Ez#t;Sr2#M{fQL##aTqxoAj{D83OrK+pn%0edU%sy+dnZrj
zNBa`c58VbNL<BeV(BiF~SQk`ry@bd2vop0lrqi>5!3}N_QVfO^-}xYig}Do2pH(2R
z3~mStI~5jQp*VidRPq=t^}_P<>3a<1gm1{bcRl9(zojQ`A&=5gbkRs}%QAO<s&PiL
zdGqFaGNI_+xV~)&9W$-Hpr#MuMO|V(4II5m@MljiX;IspJ&Oo1&G*?eF*pe3Ss4Lk
zclQijBJpw>P4J)~1Mf5t1Fi?x|G>hZfCsbrfH^yplz&uXd(T!cXrBJ}h6r*4B=;V%
zJT7HT=qXc)vneQ`u;>w}y!aGO)R+=?6-oxrWx}E&NJXHq+wolW8<ww+hgXKt9`4|d
z!HY{yjSUF(I7B%SNPePOO<zTv!(Cl}Z`AZ|;NI7Nv}3qI=_x5`e@T40|HyAg3qqj7
zPIU0+1K;0gT<cf_m-zK#Cxp%={>(Sz?IV<9VRu7(ulbEB>1lyzAd(6R^H?>Bb$obT
z*#Q6wkMrPwBZhDXF!KjdJ$%2@P{zKT!vo3fCfjHE>kdFkEmDRVzWzPo5$T*#Gg(gT
z`Z+pAuB}`sz^w~wm&fkEmvGm{P*s@rK@~yQONWMcyhAFmvmsCtYg7UMtq2#^|3fdV
zfpiD*P%R(qT!%f+_mW6DjU({7X_#^kW>cH?>%aslpugvzKJkA+V0-@VronSNg8hBb
z*f*u-ctfc>czbxy!<b-H4knSQmr*6N@O7j5ho*<o)WG7Ok1Eni8p?uzBW+lE)`K_;
z)ux7b%x8K$CnyRx{~5DWVj=_*Kr3_1v<Pg7axYhyjsl3K1XhxI3F|1JA*lfT4Z#KT
zN09^}OB5Fkz1OZI7)%}k;5&LM-$Ca`kCf?pNQEVimtCEe0OQJY+wtTxdIE%~X;pHI
zN*+L?ITxCKT(WnOPtXy`$f9Ooio@PdRtxm}2nVMMl!N2S23U;@P5c@LFzbrcz)cH>
z!V%&VkerSfCjOml=FfpLzLIjj%xT2OGKwbbom=_7a;|E~aYOL%ml6l-`FP=E`V1*_
zE(4TMM{jIwJ$B+K&~2Yu6Ry=Kk_B&6AuE2_WYszEoB!*%zo3aeuk}$a^4*mJ<<NsU
zp>LVRSRx3OeAN=fLK*_WWfsAb5dpKUDiPxm1cGZY^Rx)%P}TtKj0Vy&&1el?01V^h
ziVu@24`KKYb;POreu@C+KbXXi?C#!6=+XoKA7@Mex)*%{c7L+)Vz=H(AabqC>vum+
z3iX@zSUvUa_kAPh?ZUswPxbpN&|kHMPrq3Ch@j?G5%hm{B@?7O^|;Tg`8;Qp%!c92
zJ9XqZy7d5%Kes1m84A;B69epDh=$lwJ5Y-=yki#-8<~w7#!hK6{($Ly5LgLsAGhC9
zkH2`DSZ}$xL(uAkj0j4_xP`Rgn>#_vqLxnoWYI+PorFS*KV|gz3hA5#+nS4Gsi98u
z(qrFx(7$`>zOh;AuU#iAgO`%M@2s-<+`N9P`U8ZAXNFsD%Kr&w^m6FVCkM)(p4S8;
zngi9dom0f0+#L!OFYZ#lS!3M(-%eqDy<4B?BLY1H4nMG+XP!XOODvSjCpjNw_1SH6
z&-YnhH}QS846C`)ZI-zt2JIQT$kR@`DyV3pnt@sNIoesE2+$>}ZrKa)8Ciw)@{MAw
z<2P+$C#c{vS~Xisp$Aj0ACR#US}J{XQAaPU@qT>SwZ`58(efZXJLQ!*k_a%`Gl(;U
znnHpdoQ%D%eSqF=sB$%auY2zlKMqQ>rdeahg0738+(xal*RI+*FNX63sa#JD*EIz*
z!)P-Cn;MqtX$WS1EHTI|FZi(Ep(@78nfiI?6pjWl!9p&4!QoAa*WT>K;Ec<S-4o=E
z)?{dv0?s@c_*J&2N_5lN^`B3g(=EFw&_6T3D*VL!Euxhk8f{=P;>eCyA!S4?7Buhg
z*x}4cAf+{GjGjl}fjwmczvfkDA_)YT29*Y4@il`3It(%>qwcDmYO*jW%@$ChS|I~k
zzz11{0GJZF14uf7$<(e&Xv{&wFwm2b4wQv)0Qs;GeS9JgxC}ws!*J#UWjeveA}I|>
z<OCG~k)kQk$Z2Gf3ML{9sQEJ(*PHD5`jFHH`4E)8rw+Ql1Z(n;LCWE!$eGNI5d6d_
z=;R<qF^Qm&F4drvZZoi`U{x_Py5Q7A86ybTGA7EXep2h;VS&0}nuqFcV+c}Fzv-Xz
znabsz2P$Y$gHge`Av}vc>P|=7^v>7uUjt(7xf7}zZVpD1kdi0am8D@LAjb+y)bTNg
z6j0JMl|2a64be)jTSoL)R^Uk_aSz<0mJn??#>OyiI%qMnBMf<+8Vstc$+FFkCK}cT
z;G#Q+U|_~6C}Oi)u~D+Bg<7g&iVBpq*p|0al?`QC%mIhv_iL>M1RY~Q7WXoH#0YR4
z<JtUXN<7X?OjseAcHc#Z7))v%^TZ)OftCLDD+g}wJh+wF&yE6Sxy$jZ`mrBZuj~GM
z@AZf%>2~k~UR2*wtz9vD37BUNZ#MW*1%IRM(BE^%FQfA2yX>;TFYkJ{aZB~|Uw(yD
z&-8w}^u{hf>p6;jB0kF9!NFFXBrq!IL+^Tw3xRnKW7p`^&%RAYW@pWLI@nr4Ah=do
zS`;@)Q+KheaPe**->c574&eMQwzV^90{EFTu)g8b84T3fs+fe@G(vdhdi$xHEiLsp
zDD5Y?j~AZYI-}d3g7VN`1VHKc?@$)st0P0*GzAP+r%yXf3xHAZ9d#!>>OUaPN^@hG
z#8CF_p^=}3FT1ORJ@)Ppw{SnCUt_Dgp1H4FV(nmm+Ss5V90$z4m#HLjIawv8-+$e~
zd2YHBt!^umT=L@Q>x!qGbMeuSBiztzteg31<792~GMTQI7$9@z^(!$;dYg5wzFcbT
ztFM%E0Ul1X0nB(i{Xo`4dZ*fXFRRwyVVWJDhPZkGi&Y~4^3h~sNVtk)RcElx`Xbi2
zchzgep5itU*yNsFi=ya_A}^kLswOjF!Ww9WFqXL7jq-b|6w#yO>^+}%$Dfv-N3WoL
z1z+~V-0xt5;eMIk_*B|ppb&n8)xF*N`RS*+V_|%*&r_#lsg#9&8g=8kx)!Q42Xpn-
z@J}fgnN9p%&0jkszc}u9H?KD$e0V6Rj)TqVA87UnxM;Nok}|s#W8!;G$8O5!`A&x4
zu7*Y-1qA`gS7zQu2=X^{s%oW0JZPe&uhLXNrI6bdlIdY8<eo6a?(6KgD`c6jG6jnu
zUgmkW3df_{+U}@`n5i@iXX%rRLv30m5n|9nm08NFo${|#L`8Miq;VX8E^c*ja8r!%
z#TEDO4PABM%+%#S&&Ph)3IvTQMs8`hs)@D$`1YYT0+}F76jzLbh5|r?!9uxY`j}|C
zo%o5sM|J{Pvupc~)z?-zB$3AABoO5wi@M=;j}`L$UL!tY2){7C%Auf!32@|O?ZOYr
zlVo>sK!^xVmqFu-B>Yt<BVXM(QtS6)51M0AbSER}%Lau%>HI%8EZZpbv;EukX-V`t
z>9G?s;p?<VwBd#l0N?BVYtt57R1i<3ugpXVDGS@+sSG>%EE(&b{Ablo8~1MSqC|To
z(ux-B)=!mfzVS{JZv1;g(syv2-A4LHTb9xowe-rC^SBS5r>xdEppN8lqovB?Dh5-H
z41BPIpHQ7mwfAn#{tScEM|Bjvb+!=n;uJ<bI$Si4`6MJresNCve)zqYkiwHHD22C9
zHT)k&o1qr0t=(!ZhW}dHBm4JO&*q*i7J{wn<KOeO@QH0(m~3r`3&{XJVmyecZzmZ(
zMt@4y__%9zv5Dix0Mm|X2NOs1s#AE%s+~8?kjkWkVdn<cio%cMO!U(NH&&z4R013o
zCyLTvli=qnmE<WNhlUNRYQ&6h+rBTniZ*PkZ*Q@4*G!6FEffFSHW{H4ee|qU2DFWC
zT*jkdnJqF&8!LwcPv*U{W}bgKPytlsne@>LA$c#&gR)yImebmCkft;+>dyf}b;s!K
zS|&tDYh_EJrkBpD#;>LH)sn6PLL=Ebs{3W#cY6UjB#6MdD@FmAgSy`^U^2hPDo@kD
zGo2IlhmarOx=8N*rOtWh&EMJSk9WTu!6V|L&W*!U5|;v_=L*CBXSj3o_Atae1eJ=5
zN~Y96KV(8Eh?&&Wh{~Ps!Nc8L48+IF`i&(f6EsY+eK)+2guEFyE@WfA#g--_bg2cg
z5gc$I;td`kw8(>l^m*Rgj^E}}jGZn#>g1SpFk(@!A5=jkf@nQ-HpcdE`0y0SEEG-{
zqjUM5_7^{2`%lxpBcvac|Cwj_f+o5;cw87iN9P0R%k<2`Y#-N@u7(HS%kgo}zka+S
zmMOe6od?St1TqQrKb*jcN3y#(_En!N_{U97mA5%3g~Fr(Bw;_bCSE;-7wOmb^3k^P
zQ@1FKi~y1mu{1;NAOS@F_PIufp{m$V_Be~>4(OegNk~3(xl>2@^eSE`XzFxQu`-oZ
z0MxCJqp`F)i5f{E-QWSc?jy9^?_W<yV0-0ECPT;d>w_;rntm67cPKsPk{dJX#e2GG
zD)2~vG!)w+F|xOWUc{~a!_opcar48ueSP2g2!IEtQ9-b<AF;+PVx*WcKj7$)Vrx?-
zBA_{fMQbk@NlJUjOE7^Jki6bTCl>C~6*@SzN**$o13_F3RlW;WR1sP;5hyI0thm7x
zK|Q`g;x8cL29_No7>A~vZYinA#wAWlIN{0Xxd+}UTE~!%T2*)P7u-B7N2pNezeYi$
zm$Sowz3BURXd9cGD8k6Red+8j{9cNF&>cg&v#1~qQA*?pcSPER7tUB5AvmBBivTqK
z$S5Eyy=6S?mdm(pX+TKy*K4h-jxo%d#XrmM;C<KevK@&(gT(i7r|6>Fm2I`{aWGPY
zimiSv=CG{4-huo<{5Xn1`GBlZAD=znvloE~DL-_8SD0uO@2_$7cLvAA`27bj<<p05
zmKFX%%n%c^_jv!N1OA_OA!)iFXKgi)tRGAg^XwX`s;a80s-h~Ys;a80s;VlgsH&=}
zs;VNTRaI40RaI5VST*NF)amW^{n(KHUC-_!7H^Ty`t*u198N_%&`rAs-^wQThB4y6
zF!A@OkWQ5``pXE?nur>nkf^XmX$H0y#GIKil^J%Z{{x*fT3!f9%k6MtD!~2BlyKJ0
zT&3SHvG}hjd1zOkrtCPh)G}5r>ro@qGF9gwNX2E9%ot3lQWXpTeA7WwttJTIfC>TY
z$p>pkK+?b0r_Zehu%F!uARS$~(Hr(4EbEU&e=7rKeVM5XXRr7gt<2~$sK4%(8gqWa
z=hu&J!G5k@jvV{=XHPof{iY{b6b=3sCQ3vhzc9yIGwvlgf|Q9(amEG%e^jBmN;CnO
zQ~i(_L?@m$v<jW_xO_uw((r={cjJ)sbB8yaI*+J*Wt5CWB>%+vU`p&uHzvQ#Hq-6>
z)M_PA9KN%<eBG(zJrPY5lLyZj5<IMti9^#M<Ru|e6i~$hRO>Q{iVBK?;snNslnIcE
zNa8Rdh(vaXB@cz(e|PP9?Z+tje0{w?)<+M1YR9H4SKUXrE~3i%J`e0OGbcp*^^o-5
zZX1uqiZGZzWN6j{%YF+N{^(p}W(Sn1jO30I0THOi0XWPAA}}Nq889RqYzQ1MkL3Pu
ze>U7>nE7s>*Z%*1_VADL;dlQ|G-ro}-VqM<z5_-Y)d<y5*%S0;3}a`j{x(fv#31vK
ztfG*NrIak>)-sr$@JzK~gDBY48}q`vCL?=LxJ;)rx8HTW!;=|sAw>$mG(TpIYJaH7
zLSUTvUX#wa4vAlijaM5AmnO-xz^uP!h2#n%2^f05o%P51v97pZx{U-&U6^hDMo*9M
zW?nlRlSYy;;_XiPkjKJ=(-bPG1sUXTgJi?988J|CVc5e&nGZg;UIW{K?%v-`V$6h5
z<R*h3rWHd8AuhopUH-H7(#A*cw{wXSgzg;{m!ECfzbnXNOXNkBZYs2CtK7wy{&iR@
z8C6w#&x=2Ae%onN{CECM%$*?-W0k2darsQcJ+{(r1#jn(x<X}SmJT@&_RHa%iuP(G
z?sqh%%O>OeUb-=Pa_#&R4ojyBs0X}(rc^Lv>ky#Or24GiofE$^w&@Ih>NjDyWt2dm
z;wwO-nFJo3br6;qW`aKtAE$ThzYRft>?nFz@~Z1;#?<`hmYn8%E?N5hyV;`v$`jJk
zK=M7YYr|5FfzUe;D{bqkvpK_6M3EFjjlvpv{*T+!tNjz$|5>eI{T!sm;p+>7KEW^N
z9{bpRNfa7>2LWy~wvh4L70%(>+B7Bf9fXw_gi;^;yU-b+ZE>GX$yNoNO1J%Vw2Pe2
z)2}1Vd4D1PVpyfYw)~-4&;ZV|6}lwD14I8GuI3tMgX<)k6p&L2x_iHy=;AFIzkU(o
zExHlRsz@NDvSuIVA%+!_NlP{gXsVh>BoZ}E)YD+E&}xl@l0Ej@MTl%+{QnIA-Qs`^
z!mkO>d8PuT%H<!0Pl<H)J@SBo4*&4>ci<`hBb*23xFu@TC-83hUEbi7zn<$*0zpLW
zq%#wnymD!v3J1UQ05??ZIRX@-b?AeOBF^7#nJ^x<3c^o8rBojnb|Clw`}Q|=9WyMc
zKv7(C8fGvRNHFqG98oaa{Cs@`!RRFKIJ`T({lDAcjgSlNuCZvq0H_9m;(evC<<*Bo
z0GeCs=^B7|ezbzx830p?q9@h?0=rZ`0$?zBuOZ1szTxYeSgEVFidL=VI><!OhWp3a
zFD4EHKSXylz^2!u1?;1i0q=)Op%oK@u%dXzm{!)a`h_&<M1X^tXc#EM3H3!jR1Fu2
zXdpZ``KIvkQ4+P9zjQ-v2ElukRY9N)3<Y5#e*T#avYV9{bdeSmA^`zAhh#3yEv`b3
z{{h`#qn&?9bj5>{GrhMD#hTevE6sSwfJjjw`+&iK<bV<K#!1TYFdd?hMf9Q~g5;OV
zwM3c;g7Nr#xg!^kjAYqm8ruLlKp@*p$lD=63?9n%aN5DDQ<|}h(G<EWEYK)*Dy*sJ
zY?UsVo21|{YFc0d62S#<tZg#f7f`SzBI-2;<)vyq!|bZ_wRo4kYfyop6bTf5HIkX(
zdOPZ2WZV#o-7nBULzD{q&QXRoX`ONaAOm?CGFo(svDYv&JG`YpCp@gqMMDl0$>l*&
zGVzzPvN}A|qAQVxk|oBC)n1pJ!|UE0JtQNABa(|o?DXe&P)R7I6;L2n69I!(G4EC-
zHANfPD!SM^zTsZ=&N)V^>jm~OAum8t2p|kORbb#z;O`V&_JLjX4ZMQzp9nssA2g%e
zxbOiJTfp~}L>YeY2eXiS=3mnIj0J!{{}!<N1;BN{ICG?l>bGvUr=UoByw}7L@g7#*
zexHIHG5ZVqRV4oh@ZZT{ag*cpG;YITmXaFshB+9Y8$H4pVv=!1G!lL6)&>3b`MvZz
zkpE9A1p3Hd?<@GG3a^ca+4Iu@1X$QM;li9}@`)BH1s+XAPZMjg{?5<yu*1WTiP#d4
z14HH*YW+mbzW;DFrGRr14iJ|S@gK}vUWL0{*I(lt?+#0n^%0VA*12~lzu<X}i>T~l
z)c#*B{?OJK6s3O%%7CMUddB9ffOEryD)xs(>IsG!^+&pj$mgCumA2@F1_~m=BD#*2
zKOUZ>5IUvzuHaWd5Aopv&WvtiP+}6D7Koh@YN!@=tpO(*#cl&1uXS>)W15KzuLX}=
z=m!9Q>Fbf$2D04KUpYgt+Z&XHvrs|@O>*L_)$BRtoB%8du_d5aawr$D7?3kOmxo)V
zQH6;Kkm1WDo@mt&`e=!Rg|7@FP|g%}3OT=}$^N{1UXU1yBX*o19OvAjw%@jSIr-h0
z^bK)p^y&(9;LC-P4v2_Sy9T3`QM}n1;`h~hual(ZRjQP#IAxl(qYN#j4poBocj9(>
z<~%juDf-GA?7H{lW%J^nC$duZ`hl=>(cBUU5_)x9;=L+k-JBWvUwaX)M#e{i96#o+
zeAJBA%`I8pWRFBZpZk<R29luIEm%+Wx%E)FVTWD6@4PSQ;Gk&IKY#Kn{c!Nx>$VOj
zOZ0y3-xmy&b{J}eI~^eAlwfSv$$ze6zf^^;q-`!`^!f3B3%Imo8XlXj!v8N-76Dya
zY|RIAh5_gxMeTH77rlDA!miL#l8_x9Jz2lC$w!5Z{O=B>dd*$-g(y4NxKJAv4Fkde
zWamicV6B<l4*JEu6i||jIobMum+5$T(RWZYw|fY!JC7P+0qx1o+Ielv)N;MH7*7cS
z4pk3dtnB$UGwhFHt*H$UObi%1Z-_x5uh7X_G>gTWxV_rJ0)T?FxkW7D!ct)J1NMuz
z0Yt6>`QL?t@lsa`q8@-f2iOz`qhNqepo|<fQ)Y}ti&>h`l5*q>!izZR2=ai&fiebM
zmin^+k;F_g6rzAA8pN|OqBp=)HM$W5S!j^FRS;4{R}*uw0RW=!LN-G9%uHEbRmH~8
zwa~_iAdWO>3<HW#C}=vW2uU!Oj(!}kcghq3E*IfUhCwq{J7gq6Z&TdBOg%<@2biJf
z<?Xlv4_QG5zylwzIusHE1-8E+cxSOGn=I$XvOQS~Kzp{HC;AUgqeD5XuEAEyTG22D
z^v#ZgsF7A_NJ#}^{EN_c9LUxensD+gds2tkS${h9z1ud}v`4RU<N*b;BmoIC3<aZ=
zs`PvB?&w~=t$Ovm^xNa0Fuj#kL%VLJWpswHeFsr(+69(ibb?509s{M0f-;yQ7?KMD
zETTL$sR&bq?1#g?1{Sm5?%R)*svC4ZKBx!j-NPRz=nm(8z5LeI+!h35c?5)7AZ)hX
zYTuFL<0lCQ2O*HJX+}Yi@!{?dq`|L$4m|bnclVxKi2My24v_jhN>O}StMsyXxrl>S
zbH3(#(^VbfZ^KYG!}7YbT$F?Jg}OMlx3eqR(n#d?#mXJSm!Ewi!YWM)hybYqMB)a3
z2)!8_g4?uMFoz-FYt?J5U0SXVu^AKuP)Y+hDuf3EFamCxl6nkJfhQx=D~#6^o}L-U
z^`8v$!X0|Qp!I1$>fb1)7BWCa8<GxTtTv3P5>8>DO0lWvAwax4tZ*C;r_9kwblQI~
zmk$p#KGY8XG}s1c5dF@OZYZ=ZC$Ltcb<s-KK%Aw}txazT#3$?KNj%IhBE4XO4MWO9
zfQIKez-A%n7!Wj`P(^%x7cID0?Dygws>+9Tzmr-$Dk`-FqYQqI$~&2LyffF!(HN|i
z&kh!1L&PG5&Nxa1<?t1#ql5@>NP;Gcfk;(GYD1g{1ebglBGf~e5l~!KR%&q;fiRx)
zGz(nTYAxVN#to^#tRfp`@F09Z{A@n<OSC3lpaAFrXWFW?NP;`S+CBcAuXpYI59CCg
z=PQXUl##NGZjD*~HpxqDksdA6E?TUdWdlB5ab#B!&IjH5YX04_zU5L$B?-M$l1l(&
zsG^D}k|?5zA}DCD=|ZHE1a9!S0{_GAyUo|}b4-NBV{r5vAIKrK!3hNcNGy>28Tv8k
zJ!U8Nb3a=R%?2Kr6m&nkAOzQ9+ISpu-DXyz2G2N30fL9#=%bRl1!A{#8H6BOM2HKT
zQ+Lo)yS(~5U5QGHB+yT`$}E5w6M-qycg)@N25t3W_xw6VO?*=N69BpOK=?2W|Ix@l
z1mnXcAM6M2`G1tz1nv(3I2YJ`C2_Bk)=Iot-5`*`6VI4^R}FQqE*<`7D##n8*{mh;
zR5<|z1|5OJP^*N--5Q$ILJ)Eq*<dbRC+w_G=Ke?;=tjXJwsUc=5HYhwj-yfcf%x9o
z+B&y7`Yk;O;65ZDW{}GD@Kwlx)L81>q*VU?3&)XX$(<8vKtLr31&m`C^Hxb|TBfQd
z5W)5v{9fsgbUq@EV26pZ$dm#AL2hWT`S-tw>f+h^Cbx8;fe8fA2?rIgGRj$FDmK$L
zKj-x0b2%1@w4xjmk1u@&bEm)`_N)UT<tQKQzVz_kqw(@#%-(X+ep)p`$%zD_b*i9U
zYVY^#7jS(+60E3qjFkdQP)LnL5Drq(Bg;T97&v9)^C$EH?+PeZL*34(JM`ukCs()u
z4-_HZfuf<=X6c1igk{QhX3jm)dF)#X04iqdLJhymPQN7v1|7%6^$n_4nLC0XX%L6|
zM1qi^C=2;}YwwH6_g|2u^_lhHyusFe(Vq!`%ryMiAlrbk0y5XYMq^woE6d3TBkec>
zNcbQsN{Gfmh(>mB<*ByW)}5MqeOsSy`kpbQsGx-&TTNG!E;4X;IQ2L{cX|O<^?qT7
zQ}zyr4Buy!|3`)~N@k!8I>ud)VCH9c+}?*s5wB=uMD_&H%u)c5?}$dlgs0mNgYe(3
znf6Bqh;Y)K&~O~YQ|3eC@A2-}^Gg{K>^P(6#O%;`v%0iTBjuLDCn@7+F|R%v9eh`W
zxrq09QNxi-18<&y>goHRp*jgn^)sp0{o4jv*hqca7ukqkZff_?KBPp9NPSU&vu{c5
z4(Wo6HvMN5=QQv9-gE5!yoH@u2Ld!t5FXDwT))eI1__9zUZJ+xNg=t6J;nh&C&XzA
z?odBnfL1xRrglJ_2tk4iO*`ukL{3lvq;q^dUEMzBBvHI)`Z=i<-(UnBNWJOOL@7|&
z2zKV6hEA+B#?25*jdit_FnDaoMh+}~Oqkq?5<^r+03XVzgC9I<h=BP}1r&i%fE}ai
zK+F(!p7NrVK!6RPzCk(EZgTwBn-9h4;kjl}IFt%geGGAU0n^j0K4udzWBh2;c!9&)
z=ZpkHZ`ofT5VOz5yCM+>PfCp=#QqUXz)xZOz8zSE1C4lHYtaw^O(2AyDni2*C8DUR
zr{clsFI%arqGK0$LCB!eo4j%(hxi~t=<W6fl>P0*y9?(%U3*FT{U%O6Cjk8+*ch@t
z#-VT^vUhPR2S2n!FbQkYEB(8#8GjXo(ww#qa6q#!L}vJotC(WGucgs7?o=N@K34j^
z7VaqkH5}m3vZc>aYexwNjH3qyBdl#6x|}o?;=;bOS6HEd+5GU?Q|QdgvG2|b5mNPo
z!n^c($4Eiz_w-I%*MaNDtcG97djvcNB0q#VO!F)TbZ}$$N1h(Tkr5FQ5fKp)5fKp)
z2#A6rA|fIpA|g=yKPSQ0-}_I14YsJcM>M9$5soVC9jX01E(4|z+D9=3_CGdDK45@)
znl^()iX4DWg-8y#Ta`V6Igii}6hr;Ok60u6hkVyZSG&KfyVjmwk9UR<$>%+vyxbm}
zq>?FPEF~(BEo;;=YnomFCXVO`iY%_B5a^;}Q_?vUM`Bi=%|4zlqXiLfmYO?-FHsQW
zV)6?DZ~DeC`+oYE+jK!%v+l~-@#XLR)hgAW8d{(Nmx4V*r~~<ZT9@1OUF!K!cSc~K
z9IoZNn2gh^asWyKjg+V=2$Bx-Q3GcUP;r4&ZiXE6J&3vp)Z@LG(su6Ihw^q0Y$jM>
zHU6JIhCSu~<EgT_J~dVzjr+^rDv@uq(EM(GbvrWu9)quta`+qvWBY`J!1(()kZA$Y
zPzol3?e9v&1$hU)6`ivV!dnAZ$>Jl$5E+r9gR_SUZ|UTCAAO1PhQZC5`jjYC1!~Z`
z1G2u2FTkt3eRHMAeqUV(2ta-%jHeYx#JJ4E6EMPvvMP%la>&vP8VlSYkrXZ**a0>j
z-Y9G-!2Wl|-iD7{)d#t*Xc#Ceom8?74o=*?J^qeedQ6+Y$Y~uwJrO-dC)M@e%k!8I
zSDvrA)q)^`4hjO8N85|IpYJ{AxPl#wFxc1th++tZ+%An4C%YvUutRz@g3F*3U{g|h
z^;Elnq!g4=(*$@~l>IC=VPXiJMk8mxhsC_`?DyX(KNU^WqY!;Sd__*KM!RWkw%c+-
zNo0;ZJR#ycwE2G@e~$lB+O~PIJVgOUFOcyrPJhF-lFsRQxCjAaj|5J|2@;-yGZ4r%
zqNqLI3M{Ou2IopB6pvtsqzl(g%k1IkWW<exYrs1I;h0pTX0_%r96<yq#6RaGM1(hi
zaYHd>5MlRvz6@hlxzHMiV}H9I-efiH`4w7e3TcW{8<O+BSmYWB6K)@yQvcN(I+-$R
zyE+fq^dE<>u+Q%NUs;Ts@Z_+J2Ob74OisoTpJjpB7nW@7K0m&uOxb#J$@9EE*ZFOW
zJqWcLKMh4#$dZ^Lt>7EzLC!%Wjb>UV84(9+?ED){d1=I=cY+e(`hIKx@N$odK-*V^
zDgg38H-u#O4`(;hdzujcl&JM-tGcJ}`swYi#+h=rk3j7s<!BX0?i~R_X?muxeZ(c5
z+&NvZ<E0o<cbZZGZ6o;tQ4kIPvGyQz2Hx<<pXlWH-YE~xy`XZ{_ySO!i5$FF!=zNZ
zPtK6I->}^A3#F(~*{ZIaDzeMV0LnJ@heHeE;h%bqp}-?~qjHjjkPkD4t26YFb-rBC
z6D^3=aBD<i$x~yNB!RWJU||{h>U97ln#Y?twX7ioP1RLZMFOf(NGGt&95Vw9z)(Mg
z0*3m56roLC>ke|MV6Y<zE@uf_v4PE^g#^f}>!MkLu(ohQT#{O(;Z~M?fI^2bn5==A
z7^)K}5dfHgY$ysVx@)sVLp5z#a;>T?OoV_51pM78ry2NHt#sf9jhZQaA7vQ})N=6?
z!|N5SB#x3eKv2Oh69N4Szss<8;vOZ47jXDw6<>gPQbxn<Jl|XEX{3)1T45alC`u@*
zB%+Z;DGwKAh94q{kRh2A$rjGDk&-{BSJdnFrUb+1x`i<Jaoe-;<oaepg!Uqkqpf*g
z75RJ5yBJkP)~Qu>XTk4ki~6q4{9Z8D;O7M8`0)k4^~CDdrDs+$hPOf@@2VD%8`;t_
zaK4N^zeR8)(LxOUuhHA=PF1*cOeDe#JV7VT#H=&o#e0v9H~e@o-dF7*?eN*t7Mnhv
z{bIOH!<*1B+Yjm=_oi{%-Q6f$I{^E~RVcM*jLLH+06K(3{m>BcsoEOOhqGm(1Uo#K
zaepKm&GJh+aOZpGfk-1+=PFQFVIjqq7gp12ASk6$%S#xkb!{bq1(?&6mPRvWnzb5?
zzOd1)JE)NXNKzHb06n!+3oVs{1*L@I;b5hM4$wz{b|X6Y7{wMLsTUasfp94Ufkh_e
z_=>7v=WAs2240;Gcl$1pJ6Ld?I{K%l^Y&{Y$%O8Ib<m}!Bs=>0i#mpTJOdJ2sO-&V
z6^a`+V*y4+;HloD>=dk#^CCM@>F+22aL4(0GmmE)biFhl;uMX;ye=i>6JVuNs69vZ
z@Jqu1%DdfSO{|B)&_M(cQbguPL<IRi3CHqB^XCIlA~u89jfMzk=)p-6h{DDch4;{*
z>-<z?PSbg#*O}v?=;NO}cQY$Z{#3{4aW=5<Y6xl26%Cr4ImZz~gUA&E+gqj`b-%yz
z2Gt-Kz|jfM?w7iM9j*8W(cAFX9SOIt4RTW9fv?%&;76Db2_O5`i9d_jKGm;Wc1M!f
zU}rcxw>I||%DxQh6{HW*r_FimQ&VBWv(ODWX;tMQf+~LB>Z#RZm@uIe-@hX?_7s&?
zD3{pHZ-hRCj;2jY%?V>b+ec3Ql<@d_@AD^c#OYem57^5$&(mjP+}4yps<x8U%+-;k
z3e1ZUGa@ocZr9vq_v<KFA}>!LtM+^Antm_p^5NRB<o|PwRaI3Ywb*+E4G=`H-^(-W
z5Y_m-RW|;Np!*t;ov-Uo23Ws>5A<CWGw>vW8Wi|)F%MG)-Ccg6_`GkbO-szE-5+XY
z;43l_4%}BSq-gF2;tW{=bV|TLjWB`<5mb5l0HP4s2!i=A%zjW&5)%R{z$g}*0)-_Y
z^+yU<>Itu%+4u~SWL4zdM!bDKy&(Jo1H>qu<E;sdwM&v<*D!4W_J<7`zRh;nwXKx5
zz@0BVhk!_%ib($#IaWyeH47&eg#toJ2^1V~kcThwTGo-GLP$ZJ`a_rV!cXC)>o@zq
zKj$m?>v=sN^W<5V?I`X}A@L7_A3W5kQc5Cs75ds5DNku#F%=NN%*v#~g{{&Dw844-
zfY>5PBTU1AEE(jc85$!&5D`FdL&5<PsRqP|BSRP73l1WSSm}w{?3!t0<c<v-01RML
zMLf75#t5qjGNlHS4+C_EBXAmeFlCU<fruDW0F)U@0~ty(l)*D#5eXPIh8s~u&m8$5
z0&Rfdv2$Z&(?HX5YHu_Up$9>Sw_$^@hzNsajL{X{jf}%EOcN6m6Db5mvkphg?tjW-
zPS2l*Phyiq+Qimi@#CU=qHKLd6bB<hS$5e9nN?|!s!2#ezL)U~<~T6k&9&iWs;a8x
z3d%7v5s1dVDlQ^1F*OqtRrh8@MDZ*piCv0?d`h=U&z?dfIxeqx>e(-Sk(Px@5FtUU
zcM^oQ!aEbOJ6S+S_qcLAkndMTu+>JImGeZ=a)2-d0xm`I7-V{PP-N005sAkeTA7rV
z&F@MtA{jkkQ<yS^End(-5+0q{xyfxpV;ybxm@=Y_#08iTK|!p*v79N1DI|woW3A>h
zcCn2ZWLDwUlLV`b)X-^&QB<-1U)AV88IpVn_u10>VFm2_Ok-bUuHa5%6#ik^Ujlge
zR|bW4#bdyS%2~E33|YYU&cwtF%>A04?}t12XqXVw`gc|g71*&~boU&S$B5*#B`%P9
z0`y=|@?}H=rh@P&APekUdK3!e2jBSgp5xlS6&fj4ne5(e<3u`oB~GmP*@oHDv;Hkp
z*J8(1tMAzX2wQc^9s_|RdevA3F(7g69;6MwV0#q>J*{GZ$52n($^qyIkkhl!Tqz|m
zcFkP7qRv%IF+te>t@>U}hXc7G)QD~b4I*I`2UkZ%n<e&r8aRF)Yz93WKS3H|(F&f@
z1r=%+sOkP)-{=#}Ab5tq0tpSIuA|bbsxaIMWFKmK@D+*h?0$3OEihLG^HeCje_TE^
zKjOVwTZ0J{0tc`|{=g4E8PuN=gx|^zY05B(<tU_-NOFnDUg8(RVRXP2ZqOCMosL>A
z``L(=_0}e|j@7WFLZ};&xDc6J&T(h`7|Y{6w^`BrAV3v=!m<YO&&ELC9B50YpAXl2
zV^kQZu?J2?GL}E1aLw<$apO;d7B8sE8f}%s1I{Nbr;cs1F-PMVoC2I*^+=NdWOjJa
zT240x%R1P5N1$)85$z3n|M(M7WVF&ADXpEE0lCl5bdwC8bt{OaeR&chJYXrK&d26(
zwx$1OlTlvEWl(W-UhrOAtE`Gq8rf>LuwWlIF5a@YKOlBLkf8Ky-DeGPPZIgWWD*<<
zSD+_@3dEo|NikV0O6l=I5&jae2>-$ESujQIYy$|Ke#(bzVQ><Xf!6vmlq@yX5mZOw
zM?`kA02Z1cD*-}05Q1OzH}Z$06X+@Suz8-x>lIl4r9=AN0`8(nDgK8a-awPwigxxZ
zvHB|LeIsjtYy7o_fDi;vFIQ#&&S$2*#er}1$7yAzI`czghi;R8>PBrS3r|j;fIP_C
znVoWwo;M@$M#quwURVfRu+88a-9uINIDBaq^i(4dp=hvL=>+HySH>bPl;2U{?0&t0
zHIB{@*23T<&<P>BIUcy}su{*!Wf;lahQ-r<6TNcW;*L2Y1_Er^2xBP^szb}<b^IgF
znG=9d^51j8oeNOz2SI|sa|6&RW`K$iF(65MIR{6;17Ghd8yuZkA=JPAUr6pw_%E3s
zZ{N?;T3fco8Uu#*+~4aB-nb6mK;?OtU)F$Q{(Y&<O>$+36lv`n-w@#_{*HMTJyUHm
zgS)Bi?t|>+r(2wWicu-KP(k27@`U90LYP1>4)6{R?r_&zu#{`Ht*%lL%U*xZah?=V
zNO&c|lB-xcq8!SP%~)w(x|vKYWWV2CE)ch;rhz{JF5Q9YT#cisD!Vrkzyfw%&*y>0
z7qdFxFvI#G9ci0D*UUT-Iupa@@#Ja>J_|^ukcSHwXei<sgTY1EL4S9))YBU_<BlAs
zg!Rnp{6CMC&i_6-GcaOVFZ3X0E+mdzJ^)Awf&=<-HBB%Y)N_#gsuVe+54VTEi=@=l
z-xJmI!eRDZKH<{zXTICK$V1MAH*l;Z5JZT?PY7}}9AYgZL4g+C?57CJ0IsxlQjXw#
zo&vMA*fN5X-}td!CVX$fVo?*y?l)S^d$#&b4?i`)^~5i!JycU$^e)>1kWu1f8S2E~
z1dn4*b+?}3NXgvc?i}KbD<M}O8?Lb<bW(IwEshdjJ3gHjB>-oQbZ=la+++Y@q(+AE
zqd=%28$e7bOkIoA2Y{)XihMVION1Z^LQ|97<j&c^p&_rkFinI8Ldi<oC2r=QzRfX(
z)z9{5*vwFxv9`!kGQiQ0Szy({tdE4SaTiEu<ws*r-PiVe_>edu5g^bYKf`w!<A=qB
z-qHFZwp}!E!O3B_`C8Nwsz5tB7I7Q=7uc#+TdVED4X}amAE*%Gk?wd_w5<Vb<IY~(
zo5m@<^7+#u;G2G-*p0k!3HB$NbcvH!aL>#v8SoV@YC#!_6%@r;mDbj=6C;`Xx2?Ol
zh|^dgD1(HR?)lC&c8f%Y%97A1%|oGtT1lw#a8Vvw*9=i|5QyY;q&t_sLe9GuvHkyv
z&=WG#5i6X%iI_>ygA<|blt=UG_*^Ck8kd;YMMZ;WTglo74EE_5kub{<A}Ims`Z^(`
zJqEU%9W|U-eZV<`m)|+JBXiR2oFc%AmOnqVEnqqCD_YdsqVBJ<5ax_wCB=F6?gVHA
za(yoR#$Nku4E2ykL`>j>K|=s)P`pOC6qvf0ymkzp`Um+{(JBkbiBCp%4zT1fgC_tH
zLOnKeU+7+eWL|jeUY9>JWc~n|FOBt2bDY5Rm*_DloSBsEe%6<|8TB3bz@n+!w(rrg
z)6{rwQSgaEcX?&4u6#AzEYa9WB+>RY3<H|g3=7>_;wv7Z9QbV~Mp_?eSHVd@$4~gO
z`*o;{K_VF{y!6mB5YJf_mX+NLKde#U2}O{4of6-ZaR(gI9K7}DpJ0H#rP6ba=cqhq
z<zT>(tl{%ij>SPiK>~tDy0v+a<;nQD!b&C>R??qR?k+WzO=j!II6w_09YTv`_yFl@
zcX$L|2<`a}LyealYuJT|+GBseH3RD(nR{=70T@hDEKoT+mmi)m_d|jh5TxUQ!Gubj
z0w1slFcK(hxb4x1IIQ4_m;(9w19iX`fj)5uIpF%16-o4cuVx@+N{TO9NF@a)kbxt_
z5uWcwb31lL1hgy2q1d15MNb2p5vH-EjVz_J#$%JVJHG7xZ0T}->gnJ4MdLcE@ugjB
zmHXENfp(D=PH8S~I^0cbO9_V^w8Td8DBQ0cp&@$!IZA5iw-8S4;kigZ-UA)h<;#k0
zwd{ikRjpajc7!Efgc@>hI4MHn9>H<yrVxMJbv^quVjvt{f3a)6XnuamagAFn%{p)F
zx#;I<_2cJb(@>-lXaq16xw<+$ET%msY`?Ihmf+yoxuT;#FOK&O8mOiAS{`27pM>o_
z4tn-)&%i%8&zOiXi1CU5NIRgy>d+^;_l$D~Fhmu@WfbYtMr^}3-$hO&-IoP%*@}{`
zy3y|!4D*`IY#N#F(`69e{Rku+ra~j_AbyUkLzYTN1|wj@MOCl+anVc!(tW*xzA4xd
z1Y)_MXI;#K01`g^!JAo6ZPW%2q$0VOWNiRwDOAJ*>E!{Q@CT3MP`tu`Dgj2Gt3VY8
z8v3VCXowo5BA^orxpgZ)oWKTiYHPwdwT~?Ge*i>5K<mAnEmd1E7zEb=CJ_Y%c+-Lx
zBgjD?uAr``D{dVXemOp?JutN}c0*7NvEKXmXxFK2oj}b59_R5LpI~B-Nqt<D;0UE(
zgR`M1Q5+m9hi`~_KIhcoaDG$e-Grhj)OE2ZuBW@25bUjuNAwM&>>@>5P!Ry2BgCR2
zOfH~ufRf#1qn!N;LlGQnxG9JQxr&@l-vRRS;|$w2TW^aF0aB@Y0dc`ZhJchlM*+_W
zRJA5TSbwV)0$C6PS|WpQ#jM5>bm`b0h~i2-eNQ8Thwp}`Y_=?zksv(6>gU}{yNe4H
z9iWiq$B}0*Hd<A@K=U|y^EsODR%i>K6M)JAdnN(^!!QZVyWBIRXsVtNwhtUlJpU0n
z_lw7LvgOsC$*5q!jKE-lYm1o#)tM#4(KShPu>4tsXwOmsU}D#<IP3blvkmeQ>IvU2
zA7exwiLPzl#Cc+$w{Yr%?xlM$dytg=+}?4Os||;siGoGZULb}cP~?}C&aL!Os5Jhg
z?5l}Bc1sQbKA#|lEAN94L1i8cx}LGs<O4wn66*WDsk~GUqN2pTPQta9gT)u6d<YF{
z8)q42ghBLZ`lZbo#9vZ8p?Er({9pF!SNO`1#AchB9q93fD{DuoXO;q#fMfKkk1?$S
z#kEY^`14}?|Fe>$1Ia3!NYn~i#%k0YEq6|sdcYX={jT^RsEC3Tf<ht$yjO<1Yml9S
zN-bwGm{6$pb2up4{!dW1-EZ;vWN*MySg?Ng%)=$EVSdLFc)+uWL|9ST$W_|e&U8=@
z>;=N#l=f1Q5+3I;EB{~zD~8}wQvVD}4-ocg2Cn5T3M47t)+uMS?({l#=d*WeNsn`Y
zbgc=`vawTzb^9~|JwKG~0-+lz|7A__dZ-%C-S^!)3b8Q?*DaMtdq=nZM;|<T;Gpd$
zrDov}KTDt2n`2J#@4udKN9Q}RXVqYi6wR-G8HE1Fa*+|<bYLRt?Hr=nTad6NLqAvH
z93PF-q3=2=60=ST?Q_J$*JvBU2j-9IcAsa}{cI0yw0l^0-2VbZY1w+Jg9_pZj;sTi
zLj_(!Diig=$ryzq1c(8hg+0Xr{4-m!kn?#FA_Xowr1NH%0z=wwmU$^*JlgBkPnJ`l
zQ9uwD0G4cb*QhEZhym}>f*NLt8x_5hYMo&X_o{q$cFres%2DQk^rIfZ;$L!KIfS-z
z{IqtOYqq7~$Z&8jSmLhOH1NqQ|HvvEil{}He0~E02Hx?asih(DA##vY=%>~!9S{Cs
z7~?h#eImNtkJPj|Ton<vC#7xgusMXrk;n5NNcLu1dS|>!Qg?8rH!^f_4^RZmdnn&?
z+G?T)G|+NEXkX2IVw0aKTTGGYV>{Szg19)z#md-erWCxIM8Rp(<^{S1LZ{KE@U1jz
zc}9Z)RrZwNSxbv@gg~#_&nMBF1JRmriPJ)b^^D1fZ@OyWqO0eQ_HcY7qRR$aS)$|u
zm8)Ytjtrcxi0AxJG#vq=OUSEFJAYZEOktQ%D8znNcZbF{Q8S6L)i0ms@*1K=fa@du
zW%j9n_<%X$y?ZX1-10U;h&sgA>b!BgBYv=eyx1tjGn7l~y;$YyXwy;^6qIQwa2D)?
zs;G7e-(T{Oai(H;km^AH3zM#w-D83n2_zdD#qql6Y+w*OA<GR<xmeN-S=cXuM?>JQ
z8~i>SnsGGKhwbZER(Ncxs;a8BRaI40RaI40RaI40`uz(26;_&QT2`8A-L~3kRi>I&
znrWunR@Hku_yu<yv30)M1rKPW!@sv`B66a_IPrFR=Li>CtummXBq-f!9%Y=JRZtya
zv#uBJi-o&GaEIWqa0%|gEx5b8y9Rf+KyY^r?(PJ4cXs}LvG=Ju=jwD#%~vxu)nCok
zboIRbyq6_1LEMl%PAPru-vgur^inA>AfZXjQ7Vg1cs8`oF39@Qn2!b%Bpf)KZ;2N?
zwT<DakcwP=o`Y|a8<Wi#`TAN48(x?pw4#h{gs*dlez`el8S=#T#wi19C216NsBEm)
zzhyDQ5ioRgz|5X7re%gs=ISTsD>r-RL?{gyYbJdy71M-;bX3;&k!?wqw9p`B)K;|b
zHKd2-LT3UvNMNlr%kM9vn)03(4cEvYlD%m<fP}IDMe;?WWO5)ghWvtQexL41`ya|@
zYLtBfF4<W)O`J_%B(C`FzlOHq4#nYtGNZA!Nli#?NL-gX{m^EuKL`YTb4z!cLpQkH
zHl0`$Hh!2Ie-C97Ylz!>b}HO>_#WsO&QVuer!VPJpa}YD&zfM5g%qrGBaU}t02M|x
z=T0*DvyB>u#Te0_j+Ey(tfWjp54KY}7m6Tf5e{F{^PqMpo@n2~65Ex(nE47?ypO!w
zDp0Iscp~GsqL&u7jSJcKmV$BI4^FFF>iv84{9tZ(;sJh2IpdU}A49Mk;^1Uk#RN8A
zxTBi(t983ZuNM=u6hK<vaFYUJzYm-H>}8f2f><(ln{j;+NC|}cjNBB{aMM0B9`UP&
z!~pTo(rVg(IM0Xa6?SXB7Nf};LxpA%npXhzFR<J6Pr@uF99(B#Y(=4P(SWlk@{FVU
zTZWQ~{1UPNC8POQP5v$SJV^{gAdC)DFHZ8&aY{IB4|xBnfCekrooaz9FY<;-pWD|C
zI_ftR&aX(g*xNBxYUl8;EX(PViZf>q+0(EL(l!Ms%E%~#re*O)9}i;clz29C)|>sL
zL5q8J9IDkJ>=HbGt5|T^oGGBlO$>w8C?Oy)h8l!vi@tl|0-3Rg${YRw8KK|-AH2W5
zl9w3DFDm(~Lby??Qgi8#7UpV`PQ#RSgI9*-AwH(j>F1qqnV?xvN8=T-rs)Vp%3f~i
z@uZz(ya-_~l#a-Ep<@kWIU}n}h<HR2W)Q_urzOKDAEq?K)oTk<dSsld;95-aPmv2F
zTl>ev>x->bXXi_4y6gB&E=GfYox>3cPP+5^2K{baJ{4u&JZ72HQXnHWL?EZkO+L+E
zSvWR3oEJwqiIs<pB+e#15M4_B`60v<(p99_nGWhhX_`UvF2?9+p4vFS1^Phc&oCWa
zVe2V=lTX6=XVbG;;57G38J#u>`3x?K`GQ_2?mk2|fd)%8kN!$^o8ZKAL03?|_Z_tm
z5>{2GUsoRJy-iE=QQK4QHTXFL*^T-aY|5+t$+Zk|XvjGZbYwO)c7?02Ev0y3Sw8ab
z?+bI2K7QnD?lBwdUt%<kOh%1=2k(^Ds|~_f%7&4oVmrVa6bQS^1+U*@JGa147SdO{
z&U;DmrJ7yUAY1KdmR>sA64IA9y_RF@_%X%dR}<c}&T{_tyc945aCP@SP~t59RtORi
zFG-c$-~Iho$@RU~Oxc@?1opxDB#k}~DTk0>SlNS!y*_?QrTY*X6(j>8hQcB5n-1*9
zGsX4Hiiv5yY{Nh$3A5t7uu;SFW=z28yuMU#rY9BAO;=>BixC{`kU@815$0);{Q?~&
z2F&`)c`<i@Gu0)Euxd{P@4HVv@Z_bUfYhb_eRlYYSTjM$seRdwWB)!|%o}#A^~ik_
zvR<eHWU+?_VCT7}K34bp6~Dd-=&UHB=@`fP>M+2sEi2>l%iOZpDb)S+ZZgrP-oRP?
zuR=l`%+rskc^(8Jr1W5khD}Y4WQVRY)T4j16SYY0REBXVWQ=&H<EhMF&14lLDG)^i
zA?%3Ws_K00bT_+pDqL40za)abh>;?Kcj#>OV|i0=aQ03CMqu8;J+I9ArG5!y9z$5{
z9|8igd8(PANSgWDd@Lw^3J|k($&$&?BxUbs9r}Rn<Yb1~kMAj~)tV^T7<urb0`rbg
z694}Fi9bv`RC9^IUNyhb!SzTUD|GEyO?D~t=Y8$Ic{Q(sNU00jp?)FhI|@!o<7CLw
zc+U=l`z^JXa~w#F+0v^qIuar$1N0m5to?^V?9=I&nkI%o^O~nY1!$rs<99eCe=;|}
zwr&Ji9%Gu<T26)c6orS>n(_NYtbX|@&ykq7D@FnaiMs!?*bcd^7D&rtv4Pzy4>geO
z3n3pQ!Hu*!E^>X8j|-ZI-Fo4w2*d6oZ@2cvZ1)U+I=$*n*2pp+0=#_4)0hznm~y^A
z-PyWYsC_Ya;^ojB6%2LW(gj9yae4&*?ykwZ!RmTB29$&}_50>(hLnfru-G5|m{CL#
z8LwYI8j+Qo4P&OlG(v-ay3jJu@~)n{aMeIbq+nCU#vl6k;dE}nzECPf8B?9p<c(S6
z;_AG=`Gu(xQ$>W)#!Lap8lQw7dSoyFQ#|#T%AojY1njPF5XAe<ZmuoaHGwpfP7EBB
zr+e%^GhWc^BPzsyl`bNDN9`=A!-c_(OTx{QyoR%4yd#U3UTQ0#OBR%-ps)~I6%YbS
zyj(4#EoX5wLe{dgr$JX-88NJIhUdHBIh=prJu@sFaKo-2L}v2!pM{n%OZ35;OKh#G
zRQS_Vkh<NF+&36PGal>NrjszvH$V(NjXY%6Gj&ll$ASwxvYooz_&Ys|UaUZ*gM)}<
z4PE^wq(4ybhrxZ)sVzD5oAxU2Z-=QZ);}n#0$|7GY<|nFcp|ctqxKPt>V?9NY;fuF
zh9HDQ!mGqbWE-GLN|h}JHx?itXeOLtT0FA`+BQaCZ`=zCNSI5dkTvsErs=Mp6y?n%
zbJmQ>19k(A0-)8{OV)Ww7HQZ6rq*K9jnvWP+yJpe6{#~cYF|NQDrt<nkGm$<+OY9X
z9+iNB_MX^EUAPb0nwVfuKzdjHGBltXqCGO1fV&ME?Slq^h~J;iz<C}GIm<2YgWYf<
zbgqX2eIJAigUF2X49AnF#pF!B&O22B4?RNQkx0wyYuODDc<;=^9RZ2coA>qwh`%hU
zB$|3l<q0wTt`ZcPHl9Ffe42}b+I{N_&{Ikm^kK!_%;}w4)bHgsOGnzBpip8P0l`y<
z1((3T3|kWPqPJJMU}cYxSl@El{oD<D-pcP#Fbw$VhyoMu>NmEruKRLX%ZB#B+YDo~
zj(yxPQXoM)ZJ${>`?$7$SGYf_RB){*+=tgN{|rMryLK%+2`-(=5GAn(Atd`23$JpV
z)j^V<trA`<E<}Zs6%nu6T2c~|E!UYjy9I`lD)LU_U`q>8%~<XsIa~}xI&U@0LT`+$
z$^0-M#%i`PLWUG3KJ(g@N@x$d7qd>e@|Q0>fQD9v+evd}ar@<5j36^q^LGrp<D+*D
z%yBN~)1F%>P{%}noYnK1$R9_BmUTK!m8xOth1z>Kz<9WF+VrnYvVsLE=$Q`Kbxz?B
z;gQ1w4TVfmLK*yMH66Pdcb)6gEUvB`O3MgPZMsK_Ma8X7h(h75waXl;x%}qzz?Km6
z_Dz$^%HKCW2R3~`b|6phkLe39Dba3dSe%=yFTg1e8dJVl{E3d{=<f#~A&)S$H?*}I
z7Qz4-Jk&J`W!x!;??Zmr2Kl%7zjoZpTvr`d8ZYelg1M<xz2$mIOJ#`Sq<MK?fL*W%
zS>DEnmqMb72r-ZeBn}AEw1~xWq|D9bR<^$jPpju+K|u*)hkr-qtyP0w)<^ciAek#n
ziG6j5G)#9-a{f&vbcn!c982*_ds=y~J4-hv3WnPzeY06f_m>+iGDr>w0uCKi+^7PW
zR-cg2_Z)dpzCl0VFXWQHD`siayWKclmne_7Cl@e~k~2LDk8sE{SoZZgX&#GEf4v2H
z{0)+-hTr^)t@Z2%AohvNa&zkvCWC<(p>H$*zFh5wA>;BHi=fSl3Yn_ocY%yEX!GNZ
z@amPa1#o+NllIf(ABRjBs4g(K)DRsZuKE#|SmP1T@mzPY$n#|udXTyPuy}+Us_X5q
z0nTR=p~0-fnG~i<ennLRLm0)vgqke`ZJBZ{K4cq{zs6d-XeSZ`P?5L^5n`L7xeBC?
zNU?m{@J1^)51bU-IH;NwWs9_1Rq|>TJ`dJp2@*UGL~!B1#wkB+8veC7B7kqEPfEDO
z56+P~Ij?)POUlVxIv{I^&HQg=o(N*E1BY#V_XEf@2Zj`<<n?F!?v~E`Si+8pd5dp7
z+Ymz#Qd8!e88#RTzwzfQ#HpnW1sOK|y1x8iB?-8M@3jN(frr($Sn2gSJp^bMqOTXM
zc6MMnqncj{=^s@tzq)5TyQ?Hl&d^B3a>uRQ{}6Do3%Z|H$K01|xXTRbT&nvqRe#%W
z0HWfEFW;8ijad2ay%sQGb2kfUD<LF~ka!7}c%1);4{d;|f&=8;rtEn^;~%Nc<g!#R
z<GiwSOOSbxH(LgVQlisR{7R)^H4@5F6-kZDYw{u~7NWkgM<YR5)E74ZqjdV%z*p;#
zHy@x@v8dx5VxY~Lt+MQA!F6YpyiKqLMjJFN=b;DMHs%>!L{tqzSpFOwM&ep@n#dh<
z5gcBrt3KW>c(sah*(JR=A}`L9`DvoB0x8Nfb{-NKwnTGx`tzpnt2beymPYj!_2TzG
z*_%5!pXnY(K{7GKZvrv!G-ZM`jdoMR>eiNcf2jT`vmrZMIK-XyQN`s80uzSg?Bc>g
zJLScnadk0j##kn0+<%s&Ra`&2(6Bqg*OB%xCScmn;CGT*DyGu0K&Mqz<{9|=di^k1
zrfI>P6dNp<_laio_dz4<OO5kz;kUZYX)RAwfrUGXw4Qpr=Hj4RBQ8dOuC(|@MXYit
zD4_l;1-FhNr!AW+1Sk{@M=$ajwaz=<V^MCaT!qe@Y`c_p$i|yREPe-}93T=S>(5BE
zmj&nt%ej(s8BWC_%2d?&eCu3!y^Ongs>4Nl{))(;bbCn*gU9i47y!X?@WL_T9W0~$
z3;}r|ZrtiFguh_qOLsFDU)z^D!|fUn_c%c6*T0V8XbyV>CX2&OTa)f|&&dh9c4vFi
zAVJ+Q`e`yF+VbEN7S2_M>9{ClSSG7Z$!LLUUw?lw$Boi2J*rlhYg8_a_-Rxxd+)*S
zpw2)Wh|B=Fsc1cB^3g%N*kGL!w6$7T@cc)-y0j_+k`6!|0pXtSbyKk&OI}NhFTzBo
zSl{IcB4HyMl5qLXn|>O-K`e-e&074c$IFtXZfm9Z)+PF9I)o-B`vA;OwR}}!v)g|P
zxQ9Kl_b!OLc04%sPa#5Am#j@9Ka#mPh2_vpFv|4tKs&N&o)$nmFeF?s)2bMQGy&=e
zqI*_2F~zTGWvzVOv4&^(W<^dk%NFz20tTK2!f!a;#Ce(B6p!aaFZG|CP%C0qWu?a(
zg3o@yA}*|{*TE>59)l^dabqP314tyL%^O0!U=YT(y(tz@@j;;WlkoELqX2HHE2wsA
z@f@tULrvqc<#LapuC9c5Lksu_704Iy9lE;7n^noPcyS0~iqUl^EXpB_!~27was@Zv
z|F5{Q&~ZJzES1#a>m)wQIj4@8zK=ss2`09a*`KXN)nsL?+6<2p?uCvUv^~QKY>0ig
zY9%S@f~uPu+pwPeDxDdRaHB)x4~H?Ce2z)xQ}<Ek_;shm5Wi3(`b78#Y!1U5Dw*Vx
z;t>&bnuJmx&L0Ev8udm<7vEK1Hjose)TnFd6ERR{yA+;w$U9a^G}*GkmINtw&-*){
zPoekUi;w52*fG5(&Ya8uJQ;`pUiOlP!^f-ugf=Nhho`^@vTo*!Y7M8{%3mz}ch#KE
zTM>xR7LRS}&h%HYtqk|!jgH8D?U(QRU5t4AKF>%UD>|GR6C@=+O7V|O{B|`ap_xJ;
zg2<2=on-BOKka|(6&PPNi726>IELLIK2Ad`ih+IueSf}t_>RtRybPy0gpK6K$B-MY
zc-^-cJU1KY0{<!u22_@lAqRq1>~-B?RcJ6NVX+Wx=~Oyq;8?IRDWNMZ!xFmn3=Coo
z-*1;BV%*r;$8thB%qnyd<Lq_7IHu8Og~3%a--2L4+d2~9o>KQ?sOzJGcCn0}(((iX
zaKrb&kZKEZ!Wt84G#h$tJNW!bq-PPnS5?t?s|QLESl)Q8$2cQsNY~t=_pfDnc26NF
zf6X&fe3nSZAYO<yzVypMcpR7X=C*6YeQ&C9?jtXmL>k$#o&HtoDpM;N?@tCexnNds
ziEF`^eCTV|SJ=9rDJhEaU-C&=RzN~DrZ=`(KTq3~W?hYuCKvzC`cSu@I<&>KnD;d^
zf_32QPkV=D{)kg<K@1>&jc`s$b(*by5jrF^&XuTB3+!F}eUk{Z=XprYBH%RbcTP~U
z;H1fLH<7!4kTZ^I)w<?_8pJ<mk4N{?DlR9bjUiTC-kW*n2s0c_$XB|F>VQjI!#a*U
zcU{5kjnc-wgof-p>Z;g0C|uHHx4NfzUI=7BI6R>A00<g^_;Mi8ZK0KIW*wl>EUVy&
z4Nn9U0pf*z%K#bjL8}j!uS?mqT@_*QUgif-cxdmq=zjV^3B<l?<@#Q^UyuL-mTEYs
zfzL#4kx2dR1~R`JFCe9ngtdE%S!fg;f?2@zSVn{~rFFLx57$uMm%sDY47_Y>l6m%s
z$rgLrZ3MKPYS#d349MrKi<wqPU0z|(ftpNL+!vgp1dxydT5SGIGqs;M-h)PKSQtjS
zJ>+UAcTsq^1q_T%3O*OrQz;_O5+Ph0W)Ee$(FeG^FNfOc{?|TaB7?gyMkFK~UK?Rr
zT0LVx8`uDm#+l;PAg$eLx{f_bSG>-hv7~+Xb*T6oz8|->YqlUUiT;+&`LiF&*2D?K
z3~W~pJrpK;?g<H5Xk^Eb3;bW8P~mEjDMkCuLx-W{U-rW$+4E_W*!C!wJhj^7;in)?
z6!@kI+VYdS98@qmhSpPBdY)_+T1B~g)*$)w+u|U?2aR~4X1#L@&u&9)R#KzTT-M#~
zSU4{oDldz1vdz!+__`}_`$iap6kO1o2_G>e@}9^Ze;~%q??6CV*l#-JbbK~tIip_y
zO72!Uoh?DG54Kl~_^0wdhW!y|$7q3GN1jd?<kPCKISwA>4X`1FE9UO*k&enh(!S!3
z-+-SoORt!}y6GjzE6OEeFstXksv#ieA+k4V!h0Mp7@t?Sqf-1{AG<*k-6keDk{iCp
zT>21l(A7?bVjoIWlXfzLf!lN!@hMd+>~RiL0X1d__*b6hDfagA@LDRLwf<_-KKW2b
z*f8d|#W5f;E{|Yt?|{V)Bz$t6#rs?<f{(u^jvE0xYSj>kQtHmYyoUc#Mwzb$rcA8i
zLZ)_<S*BX83w%WcD+((C5}NpE(=*IRmEGfuNpI%o8EPIOwbr@TS_?s#d^m-~VPBU#
zX~&HyNL&r3_H!ZZ$MJZ(^|EXd<91iCgO09+WwhQA0n<Yr#-^koXIKPcDM>@zfluxG
z<8mz#@sI$h`FNU{1;?T;AwAq{KYN*p-F|_sr4*O1zlpLDM^3HXO`WF4rnXN%s^$>L
zB`5>zbOp&Se+`e+(Cxh(+SyVEB<$g#@x>On@9K0t8TB=6`$PR5F2jlA6!aK+E^M#e
zm4z85+N_E5#g{kM#zjDg!3%_znaaC4f(cLlJv}rU+Av`^i*E|GcRXYnqPh>dnq>7D
z+C85AB)hlES4;dl+z+u0Pk^?BZ2PW95_vT3f!Y__MkhM;&wOUQ%j>u-;5N2(o6sK^
z66eaS!AD=?@ty>2?)i3o)i&+ly4retr!b84;%gRrI+TOQuFL%owi3$&TV$dR{c;j1
zV?>wbOV9YRn(N!XEX;*5wPBV!^sl45vEd@r7u5IFL;D6_lBa}syIStTjCmkZ%HFff
zk#GM_H?@&s304lMl@xv3V(iVF^4L~c{pE(%!Sws0WRV%2h8L^dgs6(qmq)x54697R
zl^=Dq2oRcKEeG~M$_^MB)ryLFy3txpDX$*fU`qt9%6lGW^5I3;MId3GsbnVc_X!_X
zM542+6uJVy`J)QW!gNE}AH%@NX*7kNFIJWn$kaK=Us%zu#u6=HV*(Q_0L=S@MxBPk
ze&1KFf0AzZ!%$A|W*Hd}@4`gw<V}<4LoN;m(V0GEVTW4Jz%=yp4Id(|HF&$;oAlC$
z?xco~4p9!JQ0|Tep1~WIDsmx&8vO#i2N_-w+|#YpQ5#M@M+~qDafLAxONuXDY`Hq)
z;e;o{7c)Y}P`Wr0aEMt`3aKh5V@avxZ0a-26mUhk<zRqs!inr13(Cy`mP$?C+4ao7
zeK>|w58yWqRVB>BIaCidkb{sQr9p-%VZYpgC&bVw>a*;PxvZKLcIRv)vJ%@i3cC*Q
zYT-Vc#7Lg1ocE&n_YgeA7<dPHaA<e|*mt7IucRdUPDUrjBfUG%X}UOtq@8w+Q49dv
z@aR3KC7n`{M8=%#ATFV`8(-gXU%{5EQ87c4z_Mr=;q!YRIGcmG`YkUw|Hh<vzsg}Z
zh|}pL3EH~J228PLrvin>8P5{&J4n<UKCTdM1g<7ac*4n*PzQ~>!A>P2R-f&_taO`6
z!Z+qmI!}*5<wd}Kr^oQ(IKYEAHosyFhE{vrkJ@l!((BdNuY2iOP%#4$qampJtwn-r
z+I)HM^jx&L@+Rk+IQ=MjmyiDduLxy~M)_P=Sz`_sU711}3?W)|Ld_8FM=T=GN%Ff7
zgbs7YE&UZXP5Rm5D;Y|@38H3!B>QsOyR&h<_8_T*Kg0-*bNeZYhAP8-+|it%^AA6a
zkB5-PKb_|uKYU#=f5!IclHXa_cyC@SG%mcq9J-SvHMy@VmTqM~cpazxVa)$h2p>jn
z;!9B&@t$g2J1si$38tVRNVY{2J<XcVNq2v9c;g%ya2uwYDM_U9CB+Ydh3BYzrp>k5
zL{)j~C_SB>gzU}w>m9_Y5rcsO`Q_tN#z>MI!wVKY0oV|z99?PL>==EMlobP1PXl7y
z-PZn5!b4oOg+!_6Zk#B1Ky5;x#%pK;Fg)rOPpFnhwmXy;nlJ>4-s1hPL_9$!urh$o
zOor5kpy$qy{CSKKa0W3P5iG!Ua{lgjXl%76$kMqg00~#D2Nr^<Byxd_533E54%mS*
zGSG^7ndZFr#i+oBK<veTZF<=C%$1LShg)e92BMZ66^=uu1HMg6oA9BV`tvK_WbKst
zf*|;IOYdx2{A=5-HUYDFUhzyd#LVpQ?grxSfNiub{dv8mbf8|4LHW|-g5g!L@kIO@
zAT6P+sHlj>yh5H~7&$OQIfF*VTn1cG0bAg$?u3jSl1D3JrThbo)xw64UDXe-9_~+z
z9vT?b(29bRe-|O~^B%IcibAr_I?q02r_JT$SCS1WS%gz9KczUs;hmWI)kKybTv+j$
z<Fux=^Lga%k2%Ij+-3V|1a#bdVGe9tKUZS^nEbqg$VcgT#hEEQDzfsC5!UieWAFlI
zjB*GXayd4xg_x>1vj=R8rZ)GTOlHRZ9*KEu$TvA6Tpau8HS4vbktI|=8ZlS{L?$V7
z(q>F5NaC}pnx&^)=F}h=(Fy~&Z<mtPmL#RwroA3QsKQ!Ji)hLV3Ys)bK<O=^+#7)8
zw4Wq%QEY{~OAG#dWSELRjKa(7793z(Y(&mSOgxnF3@Z#S8P&b4&K$t9)v;93Hmpg*
zt_CH&n2`FMmj%GvN}+vDFrmqN6ZJBmJNmu@?hJXm+596P4cI1Sf_99#38KN*T#W&8
zT~{trb8gPt5oM_CzZ=ct=KpyaQn2rqyM4n^Ji=9L02KO@ku-<&*aNx07&jNYmc)#(
z0&$SR_~0FbH;GIp&?H+va%e-PdJ;4y#UJROhO}JFVz8)VZ!b%~y1dUwn9swO?w7Sc
zXcI`liuf!&4(qjV0lfv3iXmtf_7?$x+aDqONm6e^GbbF2&!VeFKjzCY2K1&%b6>4f
zmSFl9XZ=V9rGl+D-?Cz%H8I_Kocufj(EYA&<8Qc~HLl?!uE@|M)qquWLW$gd-=sPj
zBn<ieG8X^A&6^K-ab25=cY`vgM)yhuIBL$<-k;v)*b9J-v~ZST-}#1s-Qi7#C$CO%
ze@i|+-jCpi9cZy3<I!Nnh}i?M*yKpo$!^v@wldy?G@de1&ZZ{tEP}b=9fAeAuH;r(
zDuv3(pTm)<kT*@Rp8bR<`u~J~mIVNP76l4(+Tl_Yt<t&ru}BA?N6}oU`=GC8ZuDy&
z`iPf5?-WcK^tW5{vJoPy^!Piu-?r><2L$yGHH1Y=1!L1`_bvxoXSF{(Z3*WztvIsp
zCrInbI4}8v@B9F-ePlw5@<oD1eumTq&F@@Ux)X^0-_4E%s}ciWcTh?t^TDrN@4m$h
z^&6iGIO#7Bh$GU9aA)bm+>1Y>8MeYog^odiMW1Jg0N&AZB|=2_@{$70r?|XVQQ^OH
z$LC#kJ7@2{xdTG{zIvB4l_#Yyw_IXvWVSP0e^9m$NTR<?KS^iHrq5Jwq;$4hTM{n%
zsPplV(8GBLpF16ItEK$?jB32wd{@0Nzg%~x^G8*oM~5+4m$JqYOtV70`>bHh)j61&
zU%clL;3!lDp@qe*CHX(Vg~;$@3HY76gbU$N=7p{1`MzSt??%oN?V(JkDKNZn+#etN
z`W2pLq0E|yMoE)h-!)6B^oh-$k}<X!Oyck0hBBS1nU$ZiqC3V$2=at!==7JE5u94;
znUf56iwm?^7k!sAVRY4;mt@%EwI~<Jk}Sk0P_S|1anMcE-w+NBM;fBdvLWW2jIu`%
z#tM6mRQei}L&H1I$vHZa8<QcSCE_ad4Rv8yQu%(I>^g!*v_XWZQ6n<fPV(;*QRnK%
zo2}dFBc+gxlu8AK_|iu-hb_zS2gA78)7BImN9n1+uwhly`&;bav+<)kX8IfdFx34C
z(`^yIvk*j(KMl_v&F4VC_2VF3+~?N?SS_LFMM7x`JJ-^Bx!(yyO3-qc8vQH<kq540
z+vA%p^UUNpWn;q8G3Vkj^;XHWnC6!RoY|(x4w&jFpd_khHWc4+`B?jBv%&O!sE?=1
zDSHl%95J#K7)&)aF|h$9EM#d>_DKUnAexkiJpQD&Q`#=QQ}}$Ts~H^h7g&Fu;6AId
zF7F4uIB&qhsK)~^janW+aO9107Vq{?&P_=$UQkdTxX2BP$2AOO0h?eOq9>6d8(8-W
zk!0HTkmZqdNePXuC7ubU`Ssnut4y=OjI+OsabsFE{*Nj`4O2<{|K~_2_47t3PHt3J
zQ#JenD^CuZm5s+z`<F{5GMOA9o;CzUNtu>(UJ>ty>cW3EQ-X#DL2^KYl{m#n87boz
zlo!<CLGe_|u~KN1pnPzEic$*9zsD5mWl)p@Il(ahEZn9cM1s_$iWNgBWMb$RQ0V@X
zM;TrTOo1tdf*7F&j!_O}nGQh^36)YrBcD!Ih9Om)kru&(p_jtIECeh2D<V%P(j&l%
zgvy!XDZ!#8_66r90e(sR%kuw-fA%2%N2rRcivRDWtaMs_iYZ=Nf(W!SHv~Se6k4r8
z-tvCLV4}JK_rN5w(FhBxTDm6QkMwjyZc|(dQyBOVh|q5$O{SXU;$SmKV9eJ-_yGJY
z)+iQ#HUm;J*%14b^e8yOC<X+}GMai8WCBRT-XOw(PzIKbiX;_PQCU1(Ow(QPO|ty*
zM^8MBY>0e3q(c5O%Q<>U7S0R-ecAgi)$?x$5%y0%MH!HG6EvQmb*@_+T)g>2qHro}
z*!@n{(jPWBr~t5kI2uapKWJ%>B@MYB*-E{7aJbNA`2cvex!_2cW45QE4{nS{;nmx{
z385(hUjjcbg0@h<<`T9^;MaNTi)NV-blI1m3B}~<Kgcvi#FaxJQ^eB?r07V0Qf$B&
z0p9A$%VfV$+7%*`dHU4iLVkLqUX;^k=(R+UsKOS<<#2roFz628C69I873nQQlvO8t
z^VsXa=bpsi3?2lX<Qox2XE_0OWvMs_u!Ke6jr_$bLqB~TM)mLByZr9&NleNP-`lue
zVPh2f>4{#xt(~D>y_|kz$>;PZZz52ky#+dZB^^}I;4Rvl-Jos@G20y=K3~7y1y4ht
zO(?^)04^Vd_H(gNe}zV;2wAjPI_AOd6zLiP03(#J1_(%dWz2@}pD~;D#>MjhLkRw!
z_e6nwOa%B|;TyeNTM`pH=JOwRe_vmPYK#~74Q_+8iM`>HnQnM5x7jZ6K5;(Kv86vE
z$itptS<_To0IGObFLZ+J0r$kFl+Y&g$*SRfjV@30=lA;E1Qt(87ST+s%A#Xmj{HK#
z5a5nQ+uOhwZ(HZt!hEBKs2h~%7W{{=ll8DPr?T?ye<5Fun>+1wu?eGsQ6p9ojroSQ
ziS+bJ!sQ6_@L#km0c}r6{fq%;0)MTt6;e*w<bC5z+r5Y#n0$T+V}{l5&Aqqo2<eZG
zED<>MxUCkZsfrUDuT-2?TUya$=>*PCgjXpe3RUF=z{4!r@nYpfi!&39Gqdz>G*N3S
zc66sgCJ5NK#oHGkBa_pT6~G6^Ior;2v~s|j7+5-8404h<hfW>#OdMc<39Df6lTVQS
z*Lj(n_gUr8f^ENI->`n|O|*o%tG)hY9bQvY>_--W?EKKroPsOpWDEEy?IRcH5#lSS
zAVt?^sy4vMz^lw&m2<pYrdZoRE7bjk>{1|^x&64|tt44uD1YvHw}rqvi_IA9t-0*P
zmCIta<ne7{A<OVn=Q1^SBC8-Z02UN>7*q#TJToO*@k=TMjf#>GI&M+lNeHlt>BD6m
z$@&EZrW+LU6YY}FOr88Q2FEyl$d&7OKV98sc^MW;I?okMgZv(zy?RVF6rj%w{A#K4
zXWxZ$cqtGSlRMtuPC-$rCk%g592N#6{9pv|jZRO$+YkFeU_uDdrrNJVa_Xn+AqS)+
z8&wu~)lE6eysFrG;lTXW{qOV&thuPEFAvLbIH+G7OH5^*b<U`bg*!u2d8?&xgrF|c
zq!<5I9%bU6A%_g6(}2GhGxUsU+)dAx9SQ&2**BrLI|AB?!nvP)3R>5<ehGpzeLham
z$2?xH8d<ztnrL|O%Hqoh^MW<opNUV^77qHc#NaO2sRpPEgTh-VFjGX0_KgA>5XMu0
zt7F`472EkJg^De_&ViMVC5Y&Y9<m_8W-2n^V{FW+>>G7j{!>08lu}kRkX)Fw7RU*p
zL5FwA_!eM%i=2&EzQ>DEU&B!EW;ZB_lSoIc@&Oz2={5lschdU@O~C)D4i2;U5<fsd
zYgsD6A}+oOAF4$-E%u36i5DJ0$Vsm=O3~Qb7f;Q?35Y=IHXieG)V_j}XYXIwCi?6n
zvB7D6M3>Klf2U<7OsoereK)iPbP!ZhoOVuityg~a<1!p`lZ$?*)VD!CpcT%gy?Y@G
zc6&HBaC^QQ5;B0`k8FrfYA)tWx^`1^E6tu8&w}0w@~kyKE}<Y<A^VJy2wHi&H`g7}
z=_%MB@|}CKJ2682c9tPPencWC<zV}%7EoLuQb2j_mD}HCOY~a+QvNP$87D+(U&+Aj
zabAER+555M@wdWa7`L}5jeB<Sazr<b;altK-<tvZB_F3ky_Ivp@K}7oo1Sm|CjjyX
zGm$A{U78midp1qhtp3RWGfCl4v9AinLCU`2GRppl_%tQ{+#z!;lqsma=i0w9jZqD`
z!$92ue~9!YJ=0HliPqu<PfEM5Q{j>*UYN;gXu^r}jQPE>hKT!wz3}kD{Kb0)hX+;(
z;6X}gu@c<S@%aji_NBL{dEK3baeKDY1f;c8B+hTSakp<nYiFuirENhKuJDKz1p&tw
za}X>Fk!4A}nE3|+BpCU_EB#d*3E(eaOmr~uo8hv1avRdcn0rz*78e><8IbhX;-V1H
z1(iWmM_-6NZ66b`{4fPiKKZGC7Ut3Q!&kHTW8j`TKcw#a4}^yggZe|&2Mgs6uQ*)e
zCwy-iB_FY@(D)@~Ps8g)gyAURI`;Ks&vj&uOx`$$izR$GT!KGn@^C3(XxIKzSKWd4
z3PSk2yWx2ZC?w4z<r<BlS)cl4$D8t(p|J!7P8bU>k^zRSW<xDi)g~{)s~NQr=t5_L
zAm(6GyuYTXcBO*W=WBOk$>kUdevLavLJ3bOc{aFsi0>Ui7~^XpVdJ8k<f(!^X+lDS
z%3dm>iDZ}7%9zXjoxFuSUh&mm=FAy{m_xl;AlY)Z>gP`XUhmtSXW4mmiPaVe<A2ny
zKpZg!El8Vde^auLYkAiX{s6HdypiE>Ru=%BLr0w_nb}*zS2i=qc_C-PWJ9Em-)5wI
zbj?)Q@Z<`;Bc2@QN0fSKc(k|Ksc+SmJEttE!#>VWJKT7CK10WH_r8b!o^Y4=dWSG<
zOa2>`g$_ztkOWN%>SybGf>=Z0u)7Y6CXil9VftPGDZd&yM$8tyu?y`cTl-vKGpwn`
zVr-7QS5stEFsGGxbhwE*CTE<)CSd?&C=}ilq2>2ak#8cZ)a}#eUUeSs{mkq!xL5h+
zs)|C0-;ZJ$(bfFmp?8S_(O65nzh#sW;?_mc-2KL;H<^~l>)9`w4SwR$Yt2|}jKV7j
z-sjz#L$1vgI-|YCzXRIUteaxk4Sfje$5s?5HMiIIaD!I$oRW4}^9$gE@#^mv&aI?_
z>-Sx5+)^`4q~HG`>2{@nXcC+<3yd_UoD`3q4#!*A*?bt=0)zh94&$e_1PMaL5MYMf
zgd$iM0r59pHHBEWQx=FYO?NZJJR?#6e0Xv26;GpGOHSss8Sm0$9*txRZ+MtkD<_Vm
zG1@hfeLh$mT4C$-k_aNaWH(q~o0saxO!_X^JuIx_r5HV!YSXXK86`c<<8)bNc<hS6
z%d@LQ_)qSeU{RHLNRq<cb2vov*bl+fsA29R$Axzi;ZHv*%JB7r(ri+W;nhQwSIPFE
zP`&2nyBCWY%cri!{lADVUw&Qf{+npnlnr@1`gF@j?9vDbBpd#gC2OOKDqKA4O%k>&
z*dmSkGq8P4L5!ED2w!Gw$qEJM;j&2A80)A=i(lVt|K6;Y*43!y^<$az#PdZ#Kb^_A
z*}OFB_O?1B^dDe%0SO<t0Jm~q+@5rL0y$X7ZX^U}q4Vhsi)heygXx$fad+qlC#JU<
zSY-9p|K8H<Thm2TGeY_Nsn`7uf>g~fHx;$r3IXgZEpa_z9}|((59);N>}Ep<J7C$!
zy;;Z?|IhD66h7C$W4a^!BxdH)bGa*}*Vj9%`#45?!S8MQrOfK|AM@URHe?1C1yXk&
z8+|T4>LCzR@C1;w(O+3YFz09|$o)ywH7mQqP)LRm3^={7>-!7H6LV@ZVCn8fq>Eaj
zQWPEGgHDYWJ|g-|uMMNF%$Daey%x_WE(H_%^Y%a=KV9vGe(9KSuG_Cc8iS)qO>BDC
z7jv3Ozei@)Zeb-KHm;18dn1zn38Q}%a2lJ}Sd$(;uUzdVb~<v(vJCWUKL+8AIN<Wl
zkQr;jyA`X@9f+7eFYmnR(g7+3OOaBrs}0?n!zzy%^!VL$K0mF}Jc;aI2n&qGt%}3y
zH?GeDs!)NSi(QKIWh*07h1J@0p5}g4HcP&<vW+PHjgrBEfgU1%Z5Dx9{e@X&KyWOX
zlx@S29FQxMX<lR!i6*?z>D$akK+z1NL)e>H`QQir6K;z9WvS4{p<sS$rRFfL=)_1D
z;f8iaw|<R6PLZrQ2w5;)vH-pos>A*F3w9-SkzGFfJ)J##+NpegEjnh<G3=F4kR}^{
z@6Fowk$0-F<R#BFT=O4ep(E#{I&g5J^ys(qLfm7-c>8m-5K(1McT0p)6qdnp46@bq
z0RMvCPgbWBWCmN#^yE{>Wn+nqB>mw-#k!(H!ux}}bK48zg_^M53+|NEOk2PA2BWx+
z?<(;qTd>%#uojzE{hXZ6Bertka7NTpf|`Tb(U~%Wv`>#>P`Y$+y;>nY5Z&yH6G``9
z<WJ!Xk}scLef&^fhci@o4Cj0=CqA<I*9@OCA3hzjp-8o$^|w$7?*1f25Y6BT_3mu)
z3t`W`ft(&6^&-a9-QTok_IoD48KFkKstm11Yjbp-*6nw%{&x-tONv<<0AZT_DI${8
z?v3+##-r1GzOb1_$x%tB=%O$DU^h&#0B?d4Z`WE+iy|i}?g6&vlf~JW9sf-ZlBI)j
zsU&t~EMLN2MTL#gF;M^Z@Yc!~ViMK1LAtKe&JAZq(<k|-0ZUAkF|h*9y@QGqsg*cr
zFto$WJ&Z`WxN?nYKzO}^wCe|gSbf=;@~|4c@c_lhHu^>3mDfW|E-u^mdD`DCaQ9vg
zY-^HB@UADiW~Etn=p^n*Q#6Fl5C3Q$+CZfdj;NaB19&1`!q&-7^|=OAn0ZVj^!aY5
zw`(*EG^{W;+yL;-ons{NPZ}i&`R%J@9g4jxWITG(boiO!^KksomKCu;V1`zF?Kp7k
z(XoRcz6cLjB2Oa!L7#@S40>8}qh*7a+sRHqU)I;V0AFConJ0~wiQGExmE_5bKCC7D
z<)@(dc#-GYh8e{i3XYGe!4PD;&+0xs#3psFLc4K!iqk{N%EY5rm{AwUzgM6jYhy^!
zfEejm4QjROZ6X|2vo&jkpO{&5A*mVUKiC_gD`tb20UEZgHZXF?;4NVYKYCG|dwb|A
z-6br5dp$gUw6jEQT<#d)J8kJ^&3Z|DI%{~Y-bJ92#`-#H%wKSYp==;=k@6g=P1f))
zy%Dn?U1OBLB}4Iw^Th>;Bm2HdQUt9D+c0MGoq`I^RT_QE;C1S;=vt$ZKwyU-cF|9o
zmqZB%OspEfi|Q(>*%#gV((DA7Z>`yZ{!%hi5yCI2wzmdsMFR1=Wy~-Gn)Wo23v6w~
zF#YByv5%y}(R}_}u^2oM@?Pg;4fG5BT(>VtW>_@~Oniv;iiK<i@!#X*c6KgQ+Sb%o
z1HagX^{@d^=F~;gej6>3qwfaAb*GteCv^A=pp*P|Xg7h?OWWk^cgBjw<&qP_B)W|e
zl6rnH`-gGK(-oe&7M|ze+sizvOll&x6$!>wLHj!_(;d`Ju(T16|76(C?AI}DirQSd
zHO2BQxy{3Y(njvQpfC82B^|HdFdYpCrCxrz^QgZrVo`Y773HBk7dw|icy$M49^<b5
zXPQo3AcS^AjCGL`1k`Pp@31;LnPoaYyBz<hp8HlYc6heFmm1n8z@K&n$F$D4FzkU}
z9ww<3v#_7`QnCBeB2UetdnbwI%8q{8t-)wDn!&{R5Wew!zj<N{#q0Z9A@`IL7T}^q
zvm(4qhNLb*{sOH(|Gp0_LvW;_MYWW@zHdGjZCq(<Ba$EURU0*|`RJm(3f@&$5{PNY
z$1*pH3$@bET!_3F!?{1g%<lw4_bov*b@Pdss)w+X&W*XOfHy<B8am<lqI-?j>2Fh<
zWMw^w$Ju(@&Ts4djh~!h$tHX|#mMWe=E3#NWiO8Ur^6tKn_MfE?3*nU1SD)IBCC!`
zECMZ@^<Hajq%@)o_@!G66V5-Y;I=Qu^ZwMey}Tb`(kbhZXCgi0Kg)RFmoL;j|9$8G
zI=%fSl&n}V_brnlC4<cXxIg{~hawwimxOBNdF>Tz8`k3^fspz8d~v;^Q98BuaKUqW
z?+QzjL5;5Fes!>5Mdzgviv(48x4)nnB7i9y2nCtvZDCk_0(+B_m)#uTpGGm%E-2>x
z?5|Sio{Q5od~d@05`!-AgA*3Jj=nF&o?>-7f9QuWa^*b|m^b^!tBYN}@nQ8pwnNxt
z+wlhBDbE#WTPE}ey+ft=bdgf@@q|)HZ1aGy>N``96^ETB+Rwd;SnR1J#G}lk$%AQm
zozwLTH*Uv6eb-Vo%A(kH4=xpXyhes0mm^SRre<uFvmuV)mddZ{mv!{Fn~l--=v<m;
ztl5ss$POW4?6o4AvNo5>=P!ktIc2*OIGsD!);hEg{IoSnL!F9)E6*D#ch}{*KUa+z
zVLI2<>WW2in84G=^E-R$|LRl>7DLz*UYfo??a=y7y`_2%sX1GI0ysxRpOIna3);x~
zMpc5q%JtoQyrmk_@$>n|?_FTqr4p+~BZEM;shq_P8c3^+2|2FQOVxHiRnepx0FG6j
z`QIi-y}?3(7=~lzmDcxSD!79w1N4J8!`tJTJBvaa^%sgO+~mC~$8UzKoGZgJ$3u)$
zlWjnLb$DqanE-JCh&1M@>CmN_Cqp&2XS9)Xo&?^vBqvUN(V#dxIevsax=tJpb5!%q
z9i<v(=Sw+vrCfb&1+O=b>hyCx&L=)vQT{8==Jp^LXQ_V>Iz7xV!?3MGu<NfJC01=!
z_hWZAT-}U}$?zFgA^B{gX}E<`TT<&+pEuVMpVEb#2M;+!*zf8v38UOjr&9}32=bZ`
z;3`$lNXE&-P3E6y;OrdeIoTa+XC;kV@uszz#h|lfC72t1r%t(qZn2ge9heO<l#>11
z8BgPr28$QVxtvgKBRKhkxvhz{xy)`lWgWgawu)Hbk-z(o3;AwBPM21f=$lhN8utPY
za9o#Y{6%+~{#?li-YtZmybMrEL&X?ezqU1hrt;JO^mw$&X3eG*ovBGw_l?&P*q)h0
zg38n##)xfO-Td81HPs!6`d4;tNv2!<J)yEt;^^L{w_=3n4uOMJ%lcwZJ+-B)hEWz;
zU-~#@<()N?b72mO9%s@h_Iv_`KDnCDPV1I%UVRMjG~M1bWkEzaRdt)Q9PG)nrDohW
zlKJbfP_&$VX|lojI8+NW6V!&5TKenq>)!nwBm2#oDbAgngSHM$eUZJPIAZP1Yn$Hd
z)dCj2K~77UBPS!2z)!i^moM#1Pjlaof~|h7?X8_(mb#f2xOS-3bvQ1iCM>8DH=x{(
z!zvb+rN;i@fxpRL`PQyc(7HvoD%qk9Uf^%#8fD`+(mK{fzK+VADI$vc7EBSbzE{(f
zx@d;SmUSv&)+Hkvbrp5Xm#Ds@4@ni%1fMXYBjHq>_eS4ZkkmkfKfAh)l@o4rLO?(q
z2|>Q41Zm9HipUw|!mEFHXTDOQYI1I5R{HHp%+~pcL|1TixUyu>X3>%N?S%n67&K8d
zPFZu7%U3%&Zj8tO2Z4Mjwc@SyOZcg)ibSCIO*j6rL*@b}!VM6h?x`5?Czsykj@Mn^
z6IFhBT_>NFNG2PGh#?K!Fwbd;#uo_z6)~%15hv(+tgNBnMuCS`)AfnyeIc%3B;`0u
z5>|lR-yML_!A?;ytNnY`hGzq&4n9Dd<5F2tdI^GM<hK^(lw<NK*{jQfz;pd+4dTw0
z&iY~68WPV30|o_K08Hx)xCaDs<<X5S?sVfEhD;T`X(GCP+W0K@72)XQ4iA3Yyn{>c
zjprFT8yt?AleT~+)rBl+2*$z`9-T?j(1-n1jCri9Gt<Y6iOZrp086nq#(lH~`*k`m
zO1nN=%&6ch-`xr;ChPKUOrVx{9QF}S+rgY)$aTV5m)-_6B`RzJt~&Vp7`n!(Ao5Ru
zq03);j|Oo<x<<Q1afAb8n!vE*9#xSGrxV}W7PONr2JpwY%5r9YAD=?$DYXpo@Q7JF
zLZO~UsOEdnMyms{R^n1LVJf1l<ryE8g%x|fb53*C7#CxLrNsCKF(UH8=HF+I7P$J&
z<Yi5#=EoX8Djr2H&Uu|II#*p57sR;nrDAbx+}q3aSnUt^i3FEAsGL`oaMjD09vsXL
zDyMn*y*X&PhJzuAA7q6>YU<^mu08_q{-lnew=L&(jo3$!3za>$IKEM<4^$&IgeNO2
z21rfkf0H6vK|sfYABU2~3xs><EyMLkgrovjz$Vk6$0LICXcmn!vPcneNQF3f<8_Cr
zG5Zh^5g~)S6-Q$uQ)vq54AUbcBl_9C`kRlt<W3q?#z+MNRqf;PO^Ypm21k+>6_A%8
zT9!bDN8pzfL?niMw6JEttjdPsOUJyp;12~46dxc5<HJWP=9rM?6~qkDfvf;rNdG$c
z)a6Jl(w328CEc@zA;NMU(EAM{Xl`d2&eYfpBSmslm{qEn5mJL<(qI~4aY{812m>nA
z;O8MCqUBG73Z?LZKq(8EaQKDqQkeN7m?0dNtho4Ew1MgpV(GA?G*a<obgGETq^4Rh
z1%WbL{w@$@<lzxzWpw0;0rHf{KvqY(Qgxy{Hq~@`F$a9|wD3k){iSp?5e@`!G8L<U
zlnG|Jw50WLIx;1qIZyCtgkeHjk(VhHC^HPboHl_*%N&tLqUh(340PD|hywBuMCoK3
z<0NrZMIL(4eHt3elr?AoI<0`tygWUFE-)ip-i(-<3BIoaH!u(oNoPT;n9s&W8?N43
z+m~DwMuw!xt>2AoUg!}JDnU7j!COau-f3=FU>RyXP8*$79*SF$mQhSzl!h>d+uAc!
zAYx>mfj-ht{UtqOoPo7Gku=>L<sVOqBo2)wk@JhZDHa+F_Vxhz)o;i^X>)VNjXOgW
zG8PA@c+BWxc?lH;cCwbfk`lRH6G=rQXiPL=X%$5!@Sv(V6{c+6XDGnxxGymd0SuWm
z>81$xMRvPPmWS5-E7X8Be24FdVK5j3I2sA8B@KuP_V<z!pCH9&iOes_1b;7QsZCyN
zjtti{Dhs7E08zg;4QM3O?SIC7Z1}yr*?bO<p*~zYs_M0XUdR+4Wk?`D>ksDMJ;&IM
zx)Geg9~KZ8Zo&D9pT~ZSd4PvMwvW4Crt`b|u{1XNGbS){KXE>%nB4iuvN^jt7vNpo
z>7c_#i>-S;mK6ng=G{)NmLzWDNInT~`xCPi>cq4#1wmn>{8xN=pug}g6C|J%l)N(v
z#|n?SFiP4477nlT(N`sL0465&gOpounN-|q{D?+|II38OY49gQtT-L<DC!RRWq_}v
z-W9VuK)^n?{(@LkF?{NLI|3U1_lM{`&Ph!vo$qSTCPYUt^^?Qv>CdAAt}LNc{`Jp+
zgKLW54UC{Na*|*sXbKq!agds~(pB{MN-bf2R!D!e3TdHo0S{Fb^bo$-`?4%4Ehp{_
znm8+E%6M#Fy?iXy?!u#{<w!kiB6V!-_@wJEEU{MdY#FC7+JSBT=(xOiy3wJfB*nte
zaOi0MA?T#y5JeDp!jFLl6=5$$)8S9r{_z^hq||-1VtpKWQYGlLZ|(p{h{+iYXqYwB
zPSlG=p;6{5S3k2KP)2aU9Usw-#PAr(E}!|kc~*zd$3kYjZ{3+8=?ufK*;eoF2OT@j
zP=hd-5o;&8M!CX&^&e+n%C^?YBi=jWWFtu`PnVeXC`{nq=lc9g6izQT3D+5|JEkum
z&$}IAy`Pvj=wHI2D#Xu(lL}-of*}r*HfH%mkUEWMY2zW~bq@TA&?`b{NNeGx&%=HZ
zw>ZAqU8%k4`}@vueSH6HEj{>*|BS?vR9ziVqMOY`uduUQCE=2lnTHs;IfQC{_G1FF
zAh%y|oMzOVlid(!@*klVvr#Eo>*CFe%$zK;7QAa_Sm0Hz8i=GL@_w#+-Wd=x4`a=Q
zuJ!k$c$(WYA#S1Bm;Iq}oZcUPatykXL%GN0Dk^=U+tBFvEDJv}G?3IHh!636gQ9@}
z0999eafE{?M?S)`Nc3VI^Ia8?$+Eb{<lm<Am7PRVt@aiH1irsWv{A*y+#21NOr3=%
zCPDh-{?Z_Eklg6Xe)p2hx}K9Hg7Hm|xE6*PfBmXMrVbhvwi9V_XCpT&NGo#<CO~qr
z{X5w1Os%M){bg@v<s$>I&_YT`E!Esnp%L~<Cp?n&v)8hi4yp(Q?=>w|%;2~^FYLrg
z+pdW)ELsI0@VSjd9u9)j>8pG|1+odFLz4pv-<+u!7#Mt}uAJiW3WZ0Et)@v`h!~}a
z;J)heYLp$GlqvaCW%v|MFK(QS!Cr1K)jTr;|Dia5e|{nKg2>84C$)17$~x{66|!lf
z|H*ztAy)I^<t>ZMNM^F{7f^|~3;B$0@n^kqo!_%t5V-oZFE@09El=lUw11(I3${>7
z*3tp~3w%I>za^O!01+V&dZ<v5MEaB>KZQL}>L;g7-j}`ad*d0+nsa7z@T{7#*foGP
z4ne!a@R9*dkPL%KL=)n0TO5vH)d5Sx1^_n7t8aWom}nzOY~w>fVU7`N^ux$QBUtIY
z-ZP!^v(!>^UQrbp&ItA6P%hwHYDkJ*x-iV=P$N(Keom}DhGT6{l}~Xz!>A%?5gQb{
zkbNVhdwfTzAm7L~E;!vO4Kn0UNXY0sv8JCsKz#%Lb28Ia6bk-SP%{M?fs`9T258#I
zjGi@U=kqQ^5kZ(>Ds)tDv~v4KY-yYn3kI+GaVa6)(n&-Fgb?-1n`VyTw2t7adIb4#
z17rPjNIOM!Ol0nLz5Yl7G7Co0^V8<^O2G6$V~?)#<#!i!xEt6PCJ8~u3&h08|C;ep
zacQsz!v5f9sX(wcln}s7!hj5do)_oOmkWoZPKAv7a_blg_Tbld?dx;AeEoN*lA+yH
z+u5E0NED4;PKcCTrRLy8e4$uD#iBS%NiSQrv?))p6;!7bcSd$db1T_BU}kmWMp=?F
zeqPN60`b~tr7=w?LTCgQKd=bADdqW^!^oOFGZ>5H2$Q!SG%+1c$MjSpDA^f25u~Is
zR7_+8*%L8EDdO<2%=RPTG+_-jyWv-7HUj}Y0?x4_AiwWD3RI9p6e|Lxf*EA7hhHG{
zp1nSx{9zJr%ZDZHhYl;;Gt_gX1K-AuJL#(p?G3?JylMonK~g;e4piyvYpl5qT2@ek
zc5_nbCV^%2qFj(&x{h0X3TZV$nwWQ?Zq`eEI8@y@jkIWYFfh-YMkx9K>@@uD0hp2~
zty<C)5P4x3n;JXnI{;_Hq5Q_RN@(l&Z)ZRD1*2jJ6sS8S9c_!u2f+x|7Gce%YT&zb
zZWfNtts}5}M!kt>1778D1VX3|ZTJWs<D=#9<kk@o3-cb(cxDm6CVL0E&KxJR1q6^l
zAfQuF@7G+p?D@Xw2-5-d{BvXo<j!Nt27ox-r8DqXWv3$GKlyeIHjPirOo$V|PLN2m
zo3q#bTigNyf#>No1G<_ol#w%MWsrzG&_lYKJ!FoPps^YarpS^CPh>&mQ4#MsKt~w;
z5}6sIiaM*>dW?OYXOAy67+}Z~5CjQ6;Dg+hxx|t|Jc^N%rvF0g*$etkSwDN&L!t2t
zT=&tFp6#MkQ~=-OZn2+FD)PjVNhflyb;kI5<xIM@W}Yzn4_w#7hfP@_D4jm{IS^t=
zB#=nW)8v?YeSHI@06ur`+kM<?%$E{e$r@4GzG|xZ%EB)puZBv6AE0YgrB)&$s;9x+
zE3e3hsD%6^nArNiht1vT&(H7kyq&;64jzb)ceHuh1VnCI;j7ydyGNj0LZJ#mj<<R!
z8U3m%pjWi_8tidx53Qx%&_HMy#(KP4P>RK4Pbjmm7z%_0?VM~2pa^jSKqCY_Kv8E%
zcx|J7TOCNYmAS+@zWbivAC}*wcT9J0Zd|*E)nD=A2Y76UUV$-r7UAjBml!^+Y!^vE
zNlhtF1l;<?x99l3Q1Torsy*Ab!0L$T9D9^1&^==z-kNy@>OrvgbP4?T+%}8@{VrQN
z!ghGl0;eaIw8|rtam{c_@&OXm42Ud)AYoSEqtVeratb6QD-<Z|$CUcl)p)ECS?pft
zR4k~+h_DwHkP>=}mBJaG9__#**VB()L3j^vwvlNU>)0dOA7&^b2G<O^`PKIe^zY5f
ziV0asWO;hpso0^ypm!Vfy@SpCXiy%Y3I@w7@br+O68)hQG)1X6#3+YIl7KOBQG^1J
z%2g7ylnVvxO$`Q`lo$bFu=|6IHxV^bF0SSlSS`mbS2svbM14ol+RBhejNj`%d}a%8
zNgl8XZ+SFQknJG*vsaYetM6}6l>r*RujZ%J_&^PZ$=R=4N|CT~%I;0qkmU3zN?{oi
z5T{*I8pn0tpMp@Eu5M21Dx%AJ^1}I=L?dFf0Z!1})lbnJ!p$fspf-RYE6?sD;vMUn
zjMB5C!u`gv%e~x=sRg}yL0xCjwL38H)|8#F?aDstU)!iL<o2vb4|i`$h?KRQw2bPb
zbjMiHN;Lb?$DycnmcB^=;sFTg5zDJ5khnesF|Q8@Bl3t$yJu(}f(crDZG3+Jtj0Ak
zYJF-d3XD`#R25ZKRbatURYfp^^LYK<9w(KFsl$&@mO6TUym=fADh9mKH@V{~lvavY
zKK@+2`1R@kpbpQO@6Q#iQB9%&goWaaU<C=D?0LPO_zQ#$!=~%Epw9L}J2{;`Zb(&4
zQ+&`V%DDSLKJnAMK8vg1IU9eiG_n65z9m@O86e0<5eN`*ND?vx(*^_vOhFlxWr?hC
zhAw}b+t^Art`@Gd?;{5;%c+aHHYn@_%d?%1q1oykx4l;jb^Ap_K-~UlI6aP@ShRXQ
zS{ys8&hF9g^)PKp9Z;x;&_E;tP?tUZo?W@a!}RY=st-|DR*?7t9}B?i58c<*Ole=T
zl<l<uQM*<n5IX|cGBD;957t0HAVM{Q6+ZArfnO7)K<VYbIp6Fc19>@xpaKFxL8&(Y
z@!B9kxe$QBvG~Ob8S%0DXR>haK>-Y=9Q;J&0|B<?KF)QJ+fTBx^xC#DF{nQ31M)C5
zHJg$R@O2q{B8n_gKrzo=!nzV`5u7-8aw#it_-1p5vsc66?VP%Y&NSk(ewL{?fzCj{
zCyxzS%z`TRs`YNu4JMg@JGW0qTm)Q56W%;V@mPrD9PKAAAZh2u#Z}AGa2gUxAaLWo
zv-JQIF+rCoP}cpFE1HNmJKYxtiJsx^zSTE&vpITs#nu*ao3UwAXN(HOT~Z?G!`V@I
zI;fb8Tge*9(K*z-nhu5?@Zl&Bgh+X<K4R0N>RrJZr>HuogA%Zk%9}#Vq=+t1i$Y-#
zSR27iNXD=+I-P2cUNf3jD>R@@#x5T(fr!jn&0`o5Q3*_8MhPk=EM(4XT!bEE+qww4
z2N-vF!kI<yBJ-Mjkx)h>2q?FKFzOaA-v<l`@&ArK?`Mb&wvVT`kDue^!QIXG2g>z)
z0qE(``>)`s{ema~NC=Pl;K?Wj43Nn|5&ZHBr`k#inqml67F7^*5Cmi=?6d-iYZM6o
zm-heGE!jgG=NPDf%xFYhG{4S@C1B1B0A(mZZ4BB_u{RkZ1V(~fps4iySfG$L(CR4n
zJ<(JhpWsMh2@rFD59jAZI#3|+AFi!$AO=t^&q4c)%xFx8f*(}1Qx?Sf?Eo?#*V3vU
z^Ku4#qM&tv{Jr2mJ$?_PZ=2}cfv=eQ6l4b>`1IdLKRtWC%>E1=q@BHk{uW4R%%>(;
zG|FCe&^vzn54=cx2Op&79ueSfaI8uUBd~ud;h{vk69dgD(^9%64^JIuKf&oF;i=9-
zAb%`SZ}=E4L;VCj3egdKXOyRT3Hnp;hi;Xn_HaGskHvrvedfxB@BsfHhw1L*?-5sN
z`h9>V0i+;3S)mOn>mb@Ql|*e&a3ciRHb1zfiVKDo4mi1D@d?CLNkj&a*@h8MPzD!3
z;e>L87(_yEu?#?ArV;I^Oi7vsdxL&B{Ye7OGjuM<63{iMFpP+<4GFfLg^Etc$apj+
zfk{{diULqK7>RL=Nm4`GF{47l)ND~UcYw}#;awt<fZ!s1h5<_GLwgV~9>&o)6ZS?1
z(Edz&%61OIhAN%Ya%)foBv^&mC`Nz=APuD!NRU&220#iV6q*{)O^g-9m4U>a-%q3C
zWuCux-N7{oM8tgccR4>z<f!!g$vOa>kOATfAP^Z84j))QC|e3&n_43Jew;qT`c5SP
z(E20<0vvlLW<Fn+p|-?6MsC3VTI$?BsPJdRA6uY(hkiqW$EESdxcHV30Z)ky+o>v=
zG;6zjbc5xNHUwH=-Qd+F*RYaFB%O*0RUViD^QI_*S93$g5C_OR>Y!fubGixVEZ}U0
zhIq^neffRw*qeSbbdCY^o~SH`*9cq9*ohR3c`jGHAdtaP0sxE0!@S-2r30qxfPZLD
znBropKj(Z;iSi!v@E+6RD6iRy>$roe<&H1x<%OE1ZBGm+S^i0{M<Tk=Zd8tnE4G<v
z*Z5NFY6ha<-?cuB(timZA!w7~6}vLZskCH7al!_q*>@%gJ`p{!U(oq{^NZAr^_Tj#
zTq^%Pp8mb|;x!ZbFP+5?>BpO`d06xPXiit)TLYi!>V-qvFG>g3wAKD993p*^71IyZ
z)d3ZfsizehEBxqw*@^rEg`ijmJb;Ob=+NOO2c6u^@Mi^L0K4*&wX4;+LkT}Ey!r#T
zIRggQM^ZA7Z50=V_>wmv{<6Pbax;&n+@0lv2i_Ux9W-r>p!)T(59x&u)l!W5R@bP}
zCs^#>d07<iUKv7P|9M8b3R@*VLdo$5UW$m^sLzI+Y-%(fdTi}Kh2kd&eoei7F{0x<
zS8Xr8{#oCtK{)4X&dRm^Fi6oY60oD3ulmg1?$RMm(4pNo1(}yVrlWK&uhnRv4k!d6
zl*1SImA|%Z;aS`jdwKch9ae^#xG=G2t#rg__VxJrigQN_9LbFjYoTqjd!iV2fe`n+
z@MRQ^Sxtl5<IX_$0q?wumFwW+pxA9o{SqCVByzAJM{sZ`JE_pm2tb#eiX`gU;{P6w
zpJ&nEVC|U7wdbQdIaFdn*r4?U1X&O~y!<skL9U<T^R(=AA3BY(DYnP9qPKa=lr`5b
zopes_p+l|MF8}1$RbjXpb-hLIL34JpnnzHJo?FKYe!*87hB)3;u^z_~MDB(~Nq9Rx
zL(iics(3d!5#%%D7{?XWt3clspiR0MY(9GF9GzS0c7riKUTYcr>b#zzuS170B8wH$
z8+SQ|b?{N4lHSeFlq-Os?FM>HQs9xhg}7Vx2=Ad2&_jlYq=^+O{N%xaAuMEu5>Lf_
zxHv%e;(y*4^T*y<*F*0eH=CAwK5k*W(Cg#zHR*E;HTw2KrGg3~Jz1a$KRZ!lL^w9%
zP?EH{w0}=1X6B{MQ&EaNxJVqVeCAa=hPZ5N5(FFH=lg#g|Kxsu>hts>g&y$9$(uj2
zw9fX6+<27#E@{X^q8#<S7zKm+djvXEYF}oXocUMi(>ymgaO>Ix?}RymLZteE5m5R2
z5I72xxGE3u0Ysn>K^>gk-h;`@cJ~%7t7hFVrdrdul{JO7cwg0v<Lta^8*oHf<DPT2
z^|d(Ko9wSlbBfU`Eh1K%Y_`fRg*GsJRho*ZP^>TrZ~M^(DBwuU9fwue>jCoJAU_8O
zsvKzum?_MKlGNg<Zb59COb4YvP?dn>iUZ0O1Ca$;;>R`5-&Q&>lWNs6rkPeRFRf~J
z&Z5t;?|7S8)zRN=_uFWVIRp@PTWzh5+0NT-8VUgr?l1S@f$?Ery3Jl?45ol_j8L0T
z4NUVH!qw9PE*%dlt}3&>{BnFZCkHK<RcxNV>{w;6A_%PRt)K`TPQoj9qA8F^#M&mc
zA_4|y(28zJ=pa^|L)!@Vgg^z!UcoIO4Hk>UZ$viogw&1$^7Eo8u<Tuz?*TtQjUFa_
z4YCYO8$rbFvzgNoux8980-o=f+xMv_lAH1O_2z6nXrGJu)IT{X{1VWo@<RVa5g`Tt
zX~6xKZ3w%;fdtVevlS4?$OSf)GJgbukNrs+Mq(}m0z{z1B?6!n&?Za8#DqssIU&I@
zQA)_ss|4a#2sZ$lgaqoOphx+o4N4Ia1Jr}eiCoJC+Dr{$Nx`7b@B#+f?_p5WgcXXJ
zP?1#1d|^MthwX@EkLA`9No(@{@!jA#j01_t=s(h*+q3-|Ki_f(Fex2L%Ya3!$t03V
zB$7yf{NWo}8i+YI+iYwl|E$xT$+1mHztUmUZr#M_I~d?m|FmQ^8Y#r$O;Ize06?0*
z?zEcRs?Yjeq``!K0}W)l)dO0IQJjJhO(e?qw&QK%Rpv~SOsRuNWy76Stxq%58`+7e
zKihQ&4a917{^&BT;8d&?6yCw2#J18Gy%Py(vMEd*(_1mEX);o(s;a7~hLsU1DG4n=
z+K3x^kya?%824(hYFJ}k-{JqI&aLFfY{4~l-p#p&1uW*y)5Iy9g+(`XYOfq~3M7jI
z@rgmksB+y1;J~&eKkVjT{_kxz+iAUSLP4@>m7n+YBIW;;*BXNGwOb5yZs9LC0*0C)
zY~HC@%NUhZ=+dS$MW$TciG%*RExR=IKJSJQv1oCjY_?x-7K<4gjUrgauewGJ8M_}Y
ziUFsY3gF9TI@4&Qh#DKV1q}bUdCNpb+CBCiOrtb&p5||(NQ~b&DM{+2V+}%MjkKgt
ziHsx{Y>r#on;fg7mz=FT1VNa?l=jTrClcWWCf!@-TX%7(#>%Rws>vLxsH&<egCNMn
zW1N>MMr@F9Y>;V3&v8dbjOxo_8`)KEk+QK`xp0gc(ufv8AeuB&K)G2gsgXF`aFLtM
zX=4o%6Hp^^(@0Rrf{wHpx)y7t*)g+Fu@qI6l_r};7FjNcxMqfi)MmRmwx(UH4c5%C
zrt+-R8%4_nB|*Bt>Ab5g>v~6mH4|jCTg`D|QMzT$ac4H7UkA36V5-T$=O_+xu*oz=
zN2Li9Y7SP$(KSN5ISp-wIW5MM=G_u#hy<iH2YrjO762`wK;~GuMHFpy8X_tyu@R#{
z#BmJD6XE#r`cGg{<~qOh0Z;_^C<;F0|1_9#C(x1~SExR=c$>lO7=3<!=?oP<U-i(?
z{VGJZGXwMo<Nu~_yZ!#3v+et>2mrAFr70S>|I_{=24C-+@?ac{IX;@3ICALy9uL+0
zvzMel6>S*_41i%CO)4G*Dt>47vB^o+4b|L8{s>u4=}2%ccl_caA|fIpA|fIpA|ymb
zRaI40R76BXMN}dpA|fKHA|fIqgZuIQ9>^7`l;v5lllmdo{~8Xv(Onu1geeLBL=px5
z4)}HK9&<o<>9yb{5QCbK%Yp3>$B>E!AP_4S3Dyw+0RnI8*Uj6}|6aJ65BCCP7195s
zlmp=XnkS}(B$7!WA2Ox>n46VN-llUfY5%*N=ng-{4Zr25ZihJEXlRPz5TGJK4HE_I
zujoJsaEV+=f6<DhU`!zW6o?22C%rotl=^*K3P|pn9FO=lczO16Nl6k*Ss-3R^--~N
zu$|o=hV3voLdeL1i)4w-NRZcPkOSn_0vIyVS(ylDCHp{$ASuEfO@j$m!ZsE$jgT0v
zonB^etb`uZ)aYC`4zHB`2l0ms<_v*veyUsIciKU!@P;rtAaX9$JT*HpV{EN>F}tX@
zW~{j{C~?n<5sMQ`O&-n7w7vE%G-q77nK9dIwz-HOSbpZc8P%b7H_YN<4Ky0<09g0Z
zBcy?HMxQ7s)-n*rUSK<+981v^Q1u#jff#@^=mc73<`~S(%*kFbZ7j@pPb=u=_obPc
zk*v(%v8@*qPbKFXyA~}(Pv!leU&lX_$B!O*?{c|~uYLC4eW|LeMNV~=+HZw4)or(3
zCp4dPsid{nS#`zW2r8unM54%mOEt^844VYGt|KN*m6%a^QxqgRV36wjr6xB+F&SG=
zQU%S_3Mu1jovBGiUyNdD8q}**Bt$!x2Z|Ik6H;B_Ke`=@vLME9EmcbwHPcI;*&5Oa
zX~x<c38Ea)gGHhtB;&xdYVN9Jz!8ZDd3u+-m=9htLJY6%QQkG%!@~1iZ+8PXr)7XR
z@?BzOUGcvA@8RLMCysNs8|dldrOv2eNx0S7M)iXZT)1tUrp()FTVpibIFRi4Qw%d1
z>4`cR_nSEz)nBa(lpvtnN5dwVm$Y<Z(8OWP!r_Jx!IY&a%2JGmBp75d+<fuiXlJ?C
zx4RDQ_vI{WYz?%wIh2OxAK7j^JAHh$?9vsd{R4-@@EqS?*xav?j%I4gCP}HubAnh=
z<s8ZxRSQF_0k(lmV-|c5tvo+|oPOM-;(Y0Rnkv2HF6ir4S{-^<xjQtfs^p8)YM~aG
z3XhPKL2Ts<ruiDowOxlEM%erSgzfeB@ZJM~=t<%B#qSIo>;JR^v^y35siz;C)#1at
za_@5JrbM7z_`%Q79y9CHs=c_=Qqxto+ikYnZMNGnL88lRuDa{4y6dvqYF4V-ZMNHO
zw%cu5Z9!$V1$B=BZF6e9NHIka|K=tZG4QM&SS>t%6&0Ewo|CN}oqr2|*7^sPFEa@N
zpA{trTJ|DA)F_5^0#C_=%LE_+_$o&{^fIU~?B0v@?B~}%J`ilibr{BVVSc)3+X-O3
zAUo;3%6lR7WLpMoZSua-AB3cSN8I%!9l>;G!}!Ez4Cwl@vk4R#fYF#h{70z{`qDq~
z7enq=EuSbNF!-}9Z6w-_=h;H-+0KdXCQOM7Wow%akNqAAGmjAt_YGCuFI2Z~A8v=!
zSqbXFC|HwrPo?P2E>09_a-#H2SXy#ubSq>QVxFIeeCf8uU(dZ`kQU4t0^B><_uDyh
zJ@0!7fZ&^Nf<pMhpr%hW8b?<dc;&?g?-G6}5N((+_q}Z0T47o%c!}!Tzxc*%9l?2B
zZCJ~MTO3(sj?TH>=5z91URj~qQ&PA?nL+1t@Xs>>fYkxM#JL3yv(^x)PD4QqoTqn!
zx>NfNV&4z6sXog0Y>iM@5a-H0U4$1SClMAHKAuEOJEaYjl7}7-WSkIq<=IxAaEL=;
zt|5lM_$C0cW?;mO5p|7-m_j|;P9#oL3KdNNP^zlO-?(h|F#?yNSv%6SXJ0QsE*wDY
z>L26E+FJ$%;WO|J2am5h9@e%O*bF%Iz5OMKVId1H8}K8vcUMD^Az@u43i}WN%!#aW
zAh1f@`SA~RPNuyZ9rKA9Fe2{qw#J=${Tl5YZUAHZ2<Qc%6(R8+9XxRW>_d|<WB%;^
z8{4rY0nj_d9cZQj08Nk6oDu*+@y%82*m=)az4GFN;r$j0Cgb!_mqQ^UjX<*R2szJP
zv1CaUNoOfIw^C)(MJsy|6vEEHxd4!o$wCW!c0%QB=jMeQvzOW#Zx1{w1QH*F?{^Hu
z!9|izV2%ia8GMQ@N@$=cya&c!wytn6NF`@_<68w8a$zjb&ziZZNtYf2aony^unh;A
zl}TY-QAnwZiHVRuMAay4J+F^RjPbMMjc{%!4ZW()9yQZ!>$gq!9Ajkod~G{+;}&eL
zWqh$g;}kW|SZ3kV8!r&VY2!CYc@}JUArT}+1QCMf3mB|ZlS1ysL7YN?4`%qpn=oV=
zP=qMV7;T0O6_UPeo@|FEZ-}`wmdvI+)Xdma$D42#n~*oTam87K2E#IT=y$k30mGXd
z;g!8471PNbqi2G7>~bO(8h((_P18999mqhGkW?3uWKk=2D8pLFt!D!`7p3bfIbM?i
zyE40FrghfCZ-#SxnyierG3Ir3YxP5VUzFA^ryd}-Wi;aoctz(bNjvhGIVBO%(C24!
zES@2pl0eM6$yaXHV2}_xBIZIa3X)242;m`8Q^aO0gjI`W%wp**rlQh90}q_yvEf57
zuRsPaRaF&LRRq3NNC63*vGqK-W4BDE3Sk3rJZ%$Z&_c<nN5ZB|I;36Px^(H@+FNgH
zc+0DlcQ_?=H!zOdZ#kH8#l|$|UI`%Ob1*f9FK*Z|MR?UrsYIlm=)*c)-!3xlJ7~&6
zkx~?;DMFO1SsUv4Z!YrTi6;j!NlPVghOsW3^6PckgOFOAA=J%YbDS|O>5wgI$Owe#
z&kq|NoSEx}ZzPnB+hEk_kq$jK{B<q6$FgELkxn^tm<7Zn_kx8>oCfAz@j?_syVubm
z4+O!XSda%u8~MURyusY5&qJk?af&eq-q3*xb>wWpFTQuwe4MsATW<T@$tJ9~WL#<(
z^@s!>tOSupkdCIi?~Ae7A(=7_yt<lxX9xqpX(X2;jZPfAqGYN|VF-~Wx)KnhNe9#<
z10P(f%mTZFK=D~$a2`Eg{O&{%(Z+K10Ag_zT$zw?!oZ0V7z7Y81@ZVJEC|n5+CEKn
z-nWtRYK>0!0|kxNZ<W6uY&B0p1*No+K^Ug<w_2uk(y53_b={ECiKYf1eHd($Z6V(Z
zEMefl%|Q^6B4?BoRV=bj5=wx<EXWrSFfS2s!@+^1b0;c}2g?G~BBG5UiXr)N7d-7w
z-ZRpC{BbE*>BBR`Q$j!!#`Cqzo)8VhDZplI06n^pPqeUX3sp*pCWvKJ^azkS!Rxkl
zcId?Ok2xJ)5#Wg-0WiU+*MZj#OuLCdVY{&DfPDZjAQ$6v)q|RC)pzs6Fp)#0N{%}U
zn8!9)PLVO3T~xt#w@WlO!FZIdBDoqtKu}l<j+<G8Rfx=00&sQI@XXvy>9v}hW+}i@
z<q=gtN*e45$+9ySX$l8zE0aZ{j72g^8W5@q3XJT;&M9kI7N-iLnpmXBi<d22YnM+x
zSejv|C`qk!l+tajBvGAXuGlk-;^2(2Ad_1~L~nSk&MzQ`D2E~l+m&Z+CTs#p0Ko~m
zDblU?+kSWUamPC_!3_waKs+epcX9-n-+mwq^4>PhiyIK-f+&oKGeo{rL`6YO2dfUJ
zQ4zethv?_eJU$2!(qZnp3)0!U1r|kH!Bus;P1WE`B%#`&Lx+yM-UKJEeYN`aGq&Em
z9G-p|_2;ho&WU%e(}o8G>plIoArys#7y^JFy*Zb+8O{85LEf~ky5?YTqd^$ncv<pf
z+$&pV$m0fUaRhh&bLU>XdFKpXEaJt4g-7#j#**{$9{9*`m^O>kGvNcoMABiR7H)cb
zSAbv*#1-IDT8gfmNz+$45uy(t0PYh8+fHl39PrGFaRsIgAV4Jq0yQ<8#r5{<je}E!
z2E;)Pn$_w<YpNNJ6pUChA`PVip~p;Viae?)#&+Ct@ICc%iJRAk7z}1UJ^xulI`(yM
zr0VNN+svS&M=$}2F>RzlYc*B}K+!?AE8bUhI2Eo;;gvx*36Rq)jJM~@(DBY|lpuCZ
zdFCI$BM)BPwD9q$D<-u_j@hogecl^z+~H*$8CKS6lv8z82H3mxi#kM0>~wNX#|FhZ
zWDRqON7eN=+r-#t<vF_B>+-gB?3Ogy8d#RFoM2_k>2HKsF}}GqmhmDRMd|GUQX+#$
zl49VAt_yKk7Aje_6Sd)`E|Fs9`*=3ymd4FKKZiPOhaU^uhMF83U~g0?=}}Df)sYZH
zPHx$DzdV%^O!K`-ktk<j!=Zu2IHS6BMkd&{keDHe-tK<Zd^I($T(eY8PFCqkHn)Xq
zF&UU%j^BHY;MStkL5Pif5-FUb*EzQMlfOkb=IB<JH+9Ey-xNW~7h|d1QYPXeComV<
zM&rJ+RBq|b=VcU7*Z`^Q-OT_ZOuIa$2+EY=VGqrhwQ?~Mq8bPuc>}|mEF1zenvmZj
z^x=FAQ1ibhcQSF;rp6*UM4_j^sJ-S;Vr7f3nd9L1IK24ga{$4ak8}tyFM%3ga#|KM
zLyeet3OVN95qb7$=f^6uhu}zeww*qMvH|&Llj*=j(rD=i-=R%RxkaEc;(O*S3L@AR
z-6>K}RRod<>*cfXM7AcODedg4Zg8yRvu&kjjRMFqEC@bT8aKr4+smImzM<O?G7<*i
z0j733boD%jG>6NRm@MN;^eZ7iN<;VH%ZSF>ijUA_L5ILxMdr-aq1pK|>I*g10n<7v
zDWWUaF!9tUe;-wxPgeFPJ~z(sXBHlTH{-{7zR6YEa?N~UGY&{XWy7Tu!cWG5sR-T(
z<nbI5lp2O_u3lqMJCUUvkaAvg1H1#W5Y!nB&MJ9G9T0I+zhOBFr=fw+Uf2!zKv1GX
zfQXt2&ws`Ewbh)xRmrtFmGEMs&j|Q&g&QJ+F~SLDoUU^tC?cGt0k+UK?$)jw3|c&5
zTDn9{rqowipGn7OWR5dL#Z*++K4V19QB<45DuyD6nkl;Pp~E}q%OXr8Tp7brr(-6Y
zy>nA&U$OTd&;BH~5kdi@H~4q5y5i<&A<>~p^mV9qdT0<~z*r1$H_;6gQg|8Tj-638
zS2oTJ4lB`{ith$7jk94At&9;Pfx0FjmMh0MCf)kW0z%ak5fn33GciJ{lq#yKiU^2?
zsZ>ErO;TDTJJ8OwSh=E)Qz;v#OHpbI3^6h!$zp<vX`vz(2#12>vdY`Pu-hcjx~=sn
z$T1?j(<fQ(VA)2nP0H`)>j`q|jihSv#qWmQ&KbbKYtnh+6ph$PghWKuRiRT-OQTbz
zS*iJt83We+Z3z3NN$Tj<P-*_@&_UE{59$3y!OZ@c@X&Lq3TY^SGYlwbl_)|YsiKIV
z&4vh-1O!wO6ACp&RRR<U6eu)A#I;b&#0^9QKzwk*Ck%=xqKYV@iYTIrDgem<sEMSC
zCRJzvq9}<ZREhwil3=4VC>Ww7qKXM9Y8na(X(9p!2!dsVnO2CPsN5Jrl$2D(0YMN2
zB^0C+W+R0{6q3qIGD8FzVo($%AwakKGx&2yQMM$Aq)I}XR<+}x*&8Mb3R)AK)M-M6
z<%X?QBl_erM{ICNkfc9{{Tk*<c0?2uFhE>mgry8iG8DYtHn*7(1@&Q*Ku@KMIby|T
zVGK<^K3dSHZ#?q<mj{$?i^C9d605dgon2^osMHZu(v%Hf)rj5nZYy&XMNDeXSvd(y
z+QLR)^-0MA>zj@ZkQUI%Ucai=q1{;$F(^_{L{c=93=9mRNvlZ>S+8^3!$NKvP7IcT
z!+P&<^EgFKF*%8WYYeE|_;&Bc(hk4-nn2MK%K1R}=y**#gou0FH<-c{AwbdvCm8EU
zrbU<;6$utjby7||b?Kki%89xmTR@w3WXXz%s%AJ8Ke94PD1*qH19;$MCQL@K!bt3p
zz><fec!?S=$3>c$g4Bi!#4m@%vr&+74|rlW6Ht^X=C|p0TOYh}+9;`Ln2KVR&_EL&
za4xi9c9iPbvlG5xEWxf;EheIdBspMXsF(v2TG6YGXfz~4Sq+XM5T3j-J$uF?htHiE
z8lW485Q0;_jBBG|nwWu{3{Cat!@q1~P*O;9LJ>OFwTNLM>cu=Q;k`6bnT1wnRa6qH
zs;?T9vjnNN(i>F*p~WQzN_V3OmzeDw?0bA!x)@1;f$t&XuLX)v12$>5WHbro>fc^m
zuV{{(CM1cdh>BKD!I=5r7}PyrU=%e-)geSI5kW_u7!piy;9x^r$0N0erQm)2=!PbS
zWTFXZs3d`kVv;wQP)tEu%tFk-is$0ZG*IeSwy8X0jiB~)@!PI-4W$x=6MEwC!AulJ
zEEq9FA}N|~_~Il%9AJ(T#DqfJ;$#IVM0jD4TXPI^D4-~C%p#_SDhf%8jj(8Lx1Rnp
zQ8YgJ%8OPN5+#-<SV|O`1&~5^&X$v+41wc^8KXc4mi+hXo=doN7{O?o)M#az4$?cc
zyRtjk#vEE9m;;L$T*Dbk1*S>s6AD@YqKYY?p(YZW%hjzAPZd}>6lOUC%~eE5VGnfS
z1ENv&C#YnGNPULk+hL8U5k`c>59pFfB$7vcn1bVN!`jb0+f}i7c{gEL*-6+8A-F^|
zG$ys%GcKg~Y}T=|q<&cgQAm(moFR8)5g=6};UV_@AD7{~?!ZqEcjdnKEdLL(2g;8h
zz@-H~&_vj<lcGvR_PQjJNhEoYzhbFUzh{4<#sA}FBC5n88R3V3oFC=P;R`_$gkA4|
z_8&42fI;c}4NcW-s#UD{iGz>+erIn({lwCDyLVMhgq#j4;Zmdl)aD2LkKpl1&$@<4
zN|w-23ZF7Ff={oJfnhU?l$UraCg?26B_vkmo9o5Nk*W$iz80Q4H6ad<tL)9NXwwm<
z8^QuNqT|7mh#Wwg6vo$D|BM$0({rz8R)Rg5o^K2tFO%-R7=e~KAUmofMj>xW<j78l
zB@jzlf?;l4w3#DqrRGp)1cEobQ8X)UVVoBJkXc?_PU*67qP0vD4COTx_U)d_;zx1e
z01>r7lyJqFF=l4_@~wC#+J{EgPARiD5|(R5qJ^Z$p($6pNI4CMQHF)DaTr@&&*`1u
zjN~SY|3L9ku#TsF-|!rpb)ZlH+(+!8YBdg>*1JNe<RhqtRpiG}JN7XmtZ>sm8iZ}+
zWC1%dMN0q)auk^242=LOK!~7&o;31Tt_i2?{g_+-MG7JR-|u91JwSpw4zh%lAmpL^
z<30h$`+~#|7zGb=b>!DLDG=pR&_f4wEgc%_az#}U2`AV;WI=Pf9+YL&(1L|ndK|_f
z1qdqa%e9@4M4OU@)&nA--Ex2**>iu~Gftd8|0CDn7pxTTAV`*6-K5w*_(I_a6b+Jv
zIw}v%&$1r}z3+cTqn^5-vHkrkX_o%Ivdv|6J?8P>OB-z4D~{`yLxQXdq7Y_|U$b++
zklt;uagr}{nUGrbEa6qJdxo;47c4D^QI-$m(BQ(T(DVifP>}Q!mS+1`&1BmC5#Qxb
z&w)n2A1XEqLeM!Y)y<{%!V9U;N2{LVsyLAb3Is}mGrCYQkq(w=2hUs`H})Y26Oy2y
z5_V=c0NfN*dVkO#ez7mK!ZE=!3?gWxJh}ArbMy(_;-RzV9+VGdq|6_8zi0i`a!2-Q
zpTxjDjO~71nlX>^SCl<JIuPhV86({SPe>m@WL)SjH)uQ%XQ1H9f5zx!FuGL>bcb;&
zd;Y>>mYy4YJ$mrN`fFieAn42mp*KMga0Fy{ib>wUZK|PLm@179DCL7cR40&>2p)a5
zPWHWCsl@A=6y#C;Y2!tarYUhm10(+6r6cPpI#7l30HWPSy|o8n(G^erlrl@3izg|N
zLQn!kln_!5#jAa76Ma=NDRe5k!Qd(b7?YHR6+l$FCI%R&L9hfD0BDPod$J{LB}BK^
z8X<D|7e8KV_aZoeRe$LV>w+reEt~KJW$~4nXyvi{zN`0dpGs~eAi^>WX+t5A!GgaY
z5BVhZ)$8N=a_dph_f~Mu?5kftL=^@YQ4W#}Q5nk-Tod}b(FgAgLFKSB!|_x<e9VFL
zv>&UlHf;F6g5ToUjh9-DGv#z7U^wSp1o1K+b3T;(i2-Ck`gScpA3Sg}0tt9tB*Q54
z_v!J`Vc6AF`BQVWK-6c0gwSV^r-@uRY8s{*GF;pFZx&BN@t(f0tWRjej5xQ6+tZV-
zlFUyT-0Gn#k+sq1Cw-oa21GbA6l<gtOcO?LiXA%rn(WG9TkP#ADLw!BW}7nfNq*gP
ziOgW|`Y&5^p@lnV*wgiu4cgT`K(u)Gi9r*t185O&2tMl?_ap=XxJ-X3c7f11NcoV&
zIl^>8PJqf&!coIyv<3n{Qt==UF~SX!4NBna;8rG|@swRC<4(?kf-Hw6tJQ=;W*mN!
zWf6-h|A8b`!G1+Ju#g#Tz+rP^gTK#(E0gq7Xanze6Qmjhhvs^1!%E_rKMDuO?x}+=
zxZve;oUEB$*F0Nu(iDWchsI$?=N#jORZ&xihQ+SO=G3_&2zH*WmL6WI2iE9z@-^<~
zp$&-7lR*Ps*JjQ0IJNPrtt5>C-aDb=TBd=G2nE@CPk^9+{h{05?b=y>q|*Yk*jgK#
z7>;Fo2drPH{UI+PQR;QFMAxJojiWQi76TZwI@Ej}?m3V&6oLR}s14KJslPV>o>cs4
zjR=?;nK}Tk$WnoXl!iTo(}}l}=cR`WG3ZIpPg4UTPakdhds@03X>PqOnQ7nCEe@XD
zju-E8?Z|f><mCJ}%Gz^b@!VfP3RFo#T*Y~y9#_sCSHwVz1&RmE5WV?Q2wou3JpCm=
zPV{f?`5dYaK20URZ#ZbSwHoSgL_)#?ptw^p26s`R>k<@X0>*se=YdB22h>s9)N)mb
ztZ}2Ih9QB6X$}M_Bt}kWqBw-d{v%&3xrCBcKTRhXo3;0mSL74bCaT@Q%T8^4F151_
z(#{+L0H%A00_i6R2Lxz1IkMxJtGF4lh}!2F>i`pWg5@39xIU{yWi{#3Al)yeVofp+
zfYv=|pZ052WL0jGc!(#(si)mCO#NNC<5cH={R_{(AAB3v(dk3dUcys`^MQAIzuVSG
z6fU2$e#Z@f@U6MqI`BQ0h~|pLx};0JY_yRWeFxk6Z_ahndhDYz3z1-m1rr~>y_kWU
z{;IVg97uQ3h?6H3AZ&&6mDcq96KtQ%cZj9eo&WOeG(Tqmn?fLU2eTE3iYFfDydZKo
zB0FBkAQyDx0(9(^3N;RXSL=r{5d}#gAu=d(1TP;R1LW)B?z2Aa#p(p!ii8B-2XK2s
z95V-ad;eCKR3AqfJRj*0KWi;TLQqjfQc+O?&<RJhUV)cFfzERc+H-GbsL+aLV;CZ5
zyJCU9QJMp#<S+_AY@+5Gsdl-1?v2!^eiSqxirUX^YD1D8a)Z^3vjumejP9HOmt}88
zqr||8yk;6|TX4!M!Xv;H0I4)w7B8SMc?l#4P-&8uNq{xe2mKuuo@5yegs`e&L)IGc
zn@!Pi!2u|qmYXQ1oZ6<j^f{g;&;#sn4k0QY39r%wyR_q_?LjOM77}ZN2Od<p?REQs
z*3dmOjh_4{|1DocEBe1DeIxTr<Im6j?XKvtKsaktdZVIG)XhKNRUQ>7iBIJCe?Pm;
z^l@2Fg+){6ya!}eR}a}P3GP!j^TDu_-<VE#bl)DrDIPwhS|+g%!mIIfH19C_eBIxp
z@P07(d5przG8`n##N#w3LGa8v@f4WnD4ppK#T5Ot(Dxm`Y@f6cvi||D3t7c}P<1TB
z-Rm9>Bi{j^-6}&E{D<KYs{EQ-6oE~8wbdrf%5L(NS6ZQE-B7%|F=hcpj~hh3@hi_c
zu(%ZOd_T|c$Nk>p-|lOZMLO)`$s~NUsWK-zsU(mOf~g1B%`fLtiQ+U10RN%>FR{^Y
zhVl7djeLwBXt|z<gA!g|J!Go!+~y?#)ZXzSo{5r8>ZFsIH3q&rqVK$YMdQ4V{X{0{
zfsZ6EXAHopNrQX@+2EaX5&kN!A@?W|qg&i--969Y*Bf1?lnBS7Te>qngIh$hI1my*
zxQMh{YR#YckQ5{_D@($sIEGJo1KD=!@4Xv2B2z?j@blA~ru|Megw}RAF@qq!{J4!m
zIH`h|mLV(qwKIuT1UX~~hmc|$8S57yEG7t!5gi%&REY@18X~C;sFkza!>a6p4>A}=
z3Mb<HItMfs0P<B-T?0c!gC6+<VBTo^r5+FGJBMTWvK9nvNE$aeSIH5FI1yhi^$dW2
zGMq%!96}J7QMH)UeQ^$o?*$kgk}O0T$HNDRlshBHT;QsGXu)7_vvK=5=8s-%@>ioh
z_sb6hyZX5P<)wx}MkTSfgMHva!&Yl^DGeNmWsoYrA8y#lWRJ{527(8)fE+1QK@y0A
z43`mI{41f*y>%8LM0Bgj-xnA1eVPB43(5W?=+W*aQOX%q$O0i%2&fnux?0AW_?AbA
z1|bIP^j{qi84j_;F#dFZlL$L{N#wxsDpS9%$>XYj&@r5OeR}8pxtL+dX&0H|rXyig
zdJ~ygG;DKZZ3P05C-?rghhh`P!O7F{AzU&&7ZataTlDEi%agux4d;+=oU|VeY&#RT
z<Hlk@pTt=g|7V)Xj_{Y)__)2IW=AhKnwvP6<jjdu9vzMK5&cLPnSwPG5<nmwQ+@zw
zy60VthJY?r7|CgH!ii92>74$#%&{O4-jWjX0}v--zFKsDov^(sAR;hF26#15ob*q?
zBmhAyOA|v5aMkm=_*Yzl+>Wxq)gT5Pfg3n|YOTK3WhieYl+u*}Pu@}~Wv{!{9eiq;
zL)1PWD=9X{vN?Y=MKly6dK&VuV_Ra+Jmr&v&v>I)VCQ?`Kc0hv5}}BRPVVI}WBBZX
zekvj0xvYWa;sulXZtd~oFjPK3s-4XqMM=fTl1%)F6N#zPE{$CO4vX{~a@NjAnd5V8
zEU+mr)9O7bgh={x>9!rD4FDIbwR)5UkKvogED{W<d0nP})C&gOoJvC>QGl*<ffWFQ
zr=IaCE~9e}(Z*f@WLb4)u0X^2$DL<AI&AK%!+$SoZpWb8!28BzteS{HAJBKaD4RtX
zGrwX4Wtwg*1^JwT2AHIEs!G`nOvslJ6zfVxt3*<YF}9%{OKXIjq01;b1)#i0T6PDN
z*;>IBmT#@UH8V|zWf20u0ZR$M1PfXYI0${bzZ}&L@)v&faC&%{&_-q?EkWhzRP8*5
z=7*ugn|czUG?Z(oZNI?S>DW-<0U+<gZBt#KYvo<M)b!N&ebLRCzIct|2=QX6_JSJJ
zyFrX_jP)K}x@@--=7=mClG_A`Y1<c_T@irDYj-+pj0Seut3hJNy$)RiZkqo(q6JV;
zDQcRh=F}c7dkf^~&>ZVv728_@lHfonp=vxe)bhSD1E)!(!J}-mf$nAX`;%z1G`IQ?
z5E;}hG?@SFDwqTm32;}zbKseX>bng3Cjku$nzd2}3RE!BZKpkMw;M~51rdfoKu)35
z(5R?Y#)n4w>6KKGTe8@xSfNUqO-?R+71TqIY>~GJ+}X$vtA?C-wYeBdD<@*1XroMJ
z5&$`*_6`v<eS~JqfNH=%HXI<--eN$!`S<sA8`qvz%z0w@Um$0Siz`OD<*vghE)bmW
z>7msLoX!@C5!|FH=kQb8XnJ*YF4{it8_D4H!Ec|HG+yi2Fp2Af9?*ZA)(6l4vcLxZ
z<%u)&{oe2-3Rv-4$s6bLP{D?gNFpa%(9rR4{9c_u4?o-Q`p)vCIK$BAv)j2gouH^P
z{5ev)zv{ph{XPGn9q>d95nuZJ!1h`Y2e1qS$4Y*H<#cv6!QUQF%ycSmdee<@h!m*&
z8A1Q1Q2eAP@_`D2@cbAnzs>g-*M}}0q%-EfN6q&A2iuUQZZ)zXQ6wz^7}xbY9od6D
z{xumuMrA~oLd<Xg5CZ0XKSxuHG)*FI1UspBmy$^&kPqmpPTld-`{kvlEAV)co80et
zwL<%akR*~xC8fu5$W9f#@xXFWiI0lqnS5nc4z4yedL)1;6hCGo{!bM?I5-yaYgs~>
zM5#QkQT75H`S5ZeX-Ru~_%%Wt0*Hto*inu%h%jy+`xLzH_%LN4{Sqz?#abUuvf^cJ
z2z=yq8d!C{d|yv@2#%){A|VH>-QzK^a4wH7`ddF00I2<dG6ggeL+J%aa{kg=-UE;T
zglYNOkIdIdJh~_lXGhNOetC+jp@XT2HR*T<z6VB#f$NjS>9`O<stP9eo4QH}S;Q1U
zBSi9m*bbVoX9*}f)PA(6B!fWP`fwXQztSmK&Zs`INT&clKs}o$J@VvpoZ<ZFshlke
zEugq&<fTj%eFV`#XfZHtqp46#$k|+}nvO|ykm0!d7J)!L6e`-!c6IXk@w#qf)a9xm
znsG0&2+0Gf`97~Ajs2#GPLoqU#1;pCUcFAb7}ubb<#W})&!yHpv9B)aNEnblfKnAx
zDr$lg)Sx>tvYi|AI~(TbvTb!(LaUn{n7LOOT+r}wG6XnCGn_CffHc0ezj#nRs8B(R
z1ToS7KoL0XI{n5Q@5Pu9%2<irXtoP=z1%g7olaHR%8u{u)RV!U0pNvQQ<^0n$8LOE
zGe9SI5JW$y?93Y-UR4s@@-%z|Plu54<W8J%rUIMC%klbXhx9~6O*AqD1O;HUwqWOk
zPjB7H?Tz8t;MH`^6T3%CDDw4zG1f|r+wFhj(jP~I!u13w0K}pS(ICt)4Hlu?p^%1&
z2(<=@UYquw5b9!s{9!+PRX~Ww2&gK8p&%6@EFYx9D5ei5Mi^pRGy@f)%DCN1x7n$o
zs}JnzasU=2?Yi^R*<zuU?J*J6%5<<#(s_omfYH-2(Jml#o{&&yy?dYU${zHGdlU{j
zolot2)2EP9ROo+V6u;_y{wKIJ7^oi>5cH?GL6mvKA;n+}0#FZxl&G|L3<JzKqi2WH
z>+1Du(&Nhv>{FCbNDRs}sQOFcKS}T$CD=K5K83fLc>x$z3c3Ck=wUBhEqk*x`~kNm
z&Zb6F$}vkxF~@XXa0m>u-Y9Zq=H|e*0nozBp((3Q>+qF%LgkO70H1AmO{#S7q{ddI
z<WjgvL|KIBEABTCFImF8^w>kgJCk@6R}<<+W;xpWA-MA#j)mNLO3vL-Fc@$;pdTt_
zT8pD)RiX7)J9G!qYS%YGI2D>1LO06`<#VM~4$u$^u#nh?7bwo<w>1F<nFR?>cK)cc
zCed8t>_&Vp!O#p+l932_cvY-HI&jmLVb<Br=e1^ZHrm~6FJ=MTl%8sUr2d%3ezwSe
zH^$IxGw1rDq92^%cJsz3<HCAeP22m&&F6qI@r1+-FM=gV2amqK6a9w^B;rnk>v5b@
z(CQs1;vxMA1Ggf1z7JfrkX$$)$JLng8Hk)!Gwofc+Gf#mL?~2GW5<!F^GJU=qoZcv
za3DUAv1Illq3(fs<>|_ZtdbHIgbCz&4?j@YSzbn;MxM9Jg?(EX-{-W0;Z%aC-BKUG
zWGCnLd$ZTO-_M?Svz(1RF?6v1A56M6ChSg=!S(hfzmEE$Yw6crY_NoFvPmG4PWC>m
z`}|fuQFz@itkOw(C6_PIHkdMy?>ep|l1U}ru1mz>vo<YgvQc8goh3`+m18R4?pHx@
zh~t~uGQ+%l;s1m>anyo#q&O(+3CMB>OT&|k(_<MFTjfQwODhfpTB=b*S8b|X-zPz4
zu#~4L#Irk>>*wX8m%_X(#;BLrUsX|+)Kgt>x|(ge%2qO_nyj+Mi=B1VS!LH-5H2zx
z3yjMd#F9yw*j~EcGKHO^i|I8BsTencH0wIg60HGPTM*=)LL-ix_0G1uo;ACUxW*%=
z9C61qI}Wp*NF7^?>R<Tw7i~gtcgus}jRO-+k{VCBQ=n5VIL@K&7^(E|;k#U7!wXz4
z-_G5GC=f9?U9hh8XD6!H1#=@hR1Ib1JUON`+Rq`~Gf>?t<L`cbktHWm)m?Wx>CX4t
zoTQKmprAG_s`|x2Y<Mh{^@XlbSM4GWiYg^1f8C2dQ&m+AsU?#D=NJTfwYRI8e!egt
z-8}-RF{DYJUgjKPIW_+ub;(yn8*}?wkVb2AX=<GgaJjdGLCDi7ymf#H2!er8PdKO@
zl}FxcwO}c!!J`SjwN&n+xB1j1P|VB#(@u}a=>0#xQz6B}k;X=T;kjiao`lcjpcet8
zvmQR{J1G-H_20@Ng~tyE9B%pDO>I#!?mz?)Zh-+ie^F-^V!R^dvTZ?R@KQ;;eNa8&
zi4d6Mt?A<~;p^#+)&cg@Kl%QwThkaPk->A60=lfV$r5QamL#AcqBKnBInIH9ay$+8
z&G-k<MKTjX5CuHJr<q9r1OS2!^<CeNEnt`ccm0~ZDPS-$<8%68cho;#z5Dc@ojHiS
zC&nB-jkH7$LeIBR63~DsFmlYzw%OZh4Ae-FmS1u0KHY@(k7A5;$l(Nd=Z2d%LX!#j
zZM+V(VE0>{_X>A(Wln>rkr`LkEQQv^*d02+zMZSLUHUup>!}(29o@38^{5bI$99LF
z-7lkxFAhZdJMcm7G#oDQ_0!A0eDTKpCur9g+AkRrFch>+ICg+TLFeaOX0sky^Yb*Y
z`0Ym<Cw${o%01JIGq--4eXe&1do&9w9)55H5FjMQfH~9R03j+k>?0S1_y`oz!wiK|
zlRR9@AJ)6`k4kyQ4&c9j?&FLtbAkL`I#NzV+)TsqDt;^gu@R}m@{z<$338u3ddu~k
zb?WXtp1pc`bJr+#fMwUap)ngYf&;$f9<+p!&Xr!vfynd|GugS`-GF!HE5~eSLaHMh
z99Mzc)y1yYb9gMW_<UmWM|$t9)`8<4c)9082E6?!B0bK9V#&fnEtU`v{xYc8-f9Gq
z$9_wAceyhoz~o1LwZ7|xJMnK>Ip-JPU`Chd`0PKCuD(E&@x3{zhnu<Fh@mTB&OHBg
zYZA(Sd1(#ys}vdobGY>1_l9aH!`Xo%e@Zs<vg~ENWV19d2y=iichjuv)dWYKc!zf;
z68QaBm>JvIh$m#Ul+a$Dc+5`;Y%a4t{mFQT03yzgBLIUye7|VYnq#^F4Y9L{00yKR
zvO3Q#CGcNA?c-WMyJUd;*X-Yxa9UrZF;!I*PT0=5u7_?HC0256TQlW%%B@l)oNWTc
ze2VL}-B6&muLoJEfc$4dCW^1<Xxsur?_+#!`i;SPImD<{wa?pDE*I|TzciRTkqyDy
zg}rI$I0S_|Y3$<H74p_St2<lZK_%()RB!TavDR&6J_!);hPMkAnGh(qCknBeuSisQ
zeC>0qUF0dShWcUm@%0}Dj&C8dN9)%wwRHbR9&-D30tV$cuOU5dJwfY`xk_k*#@)oC
z<6SVdAZimZFd087h}tKw;GzCf283^zBFL8$l&64s9IdB~bp}LrPlNhFZJc(|>2JR^
zu@7-CPUZ8)BQ+p16JrBFedI_1i*foa2)vE;J8$PyPbnmlNhFd<B$7!alB8{6{%@x~
z<F~wPJ;qyO&8^56#bo9{y>G`}C~IP4GoCf;-G@Jzdix7uQMSuTuep|YSVi3eXzNic
zTD0u9fliVspI~TCYvWXpEf6{H&Y7AnoG`qo1!qQk`f>=Cq3h^yG$+iivndK0HO(f|
z)|N{QE)=*#UWpcQp-2u)^n#cMLYTU*L&==xs+9^rtckr2vT{^uU<k`JA%sR|5qhj&
z0(|hUT={b!n7UBOFT=|>RKqzse%J5H+lyTG*>oExJNU2l?Jz07SQ{{1hV)B6E)ZDt
zaN9(r=;TtzsKP)|*-dsL0O-pL>g1-ZM0IJLGBKW`Ddy38c?IXhckj=CU!4C@W+j?{
z?hNzby(xu}7c}a?fVBMt0pAYJA&A7{=flnAw0d;MbT%f7Z;@RmHB6!pRaCePUc^#Q
zKywR<2novO41@_{w+UyQ4iz-!sz@Xo9GQ+CzZvZHs9@OH0o=B=BO`rjt%&bf+K*Uo
zzGv4g->>9=pBAIaMYSCmdi?-Hf_f;3!Hr`ie)dF@*ULrCiq?f@tdNpPD;aLE40)O<
zYy%n{y2OlYG6=1F#)+9yL`}&gQb0N#J(<@JZoPzawn}nTQdLlA89^dw(Z4Nks@>V$
zIq#g@9X#)w?q{`kY}^tgIE<j8K~yjnsDH{#0Ac{WBXs!)OvQlMV<S9y@`6eHK?eBM
zNQ3tRw1NV;Ky1)N;2*?44Pj2L-%K#YnZ}JKXxf0g^Q{ucG5{OKA2IGw#W5CX(k07E
zKA^XwkT^Z!u%IbJ>Nc?5jyr0_Gl~=BfzQsSKDSfhyRkV+pbW2}03<kGD_O*M?v5-p
z0H|7%itwh#P4A3>B_Vh)13LEV-T}SgnmrF2;jh_xXk_Dfg86gMRqakd0AQ1DAM!N*
ziqK~j_wlZkwjfL6hxHN7Ti^swwT?G8LKqDwQ_zQy{U%X2Vupw?@A@b<GD|PLe!-a9
z8nzjzb<O>=2dtAepCR~>cj@e!t%1Efm<`})4Rt~GJ(ofvG=#d@+>Ld!CTei+Oi1OB
zKfQE<O@aEp_#Ywi>Gy~$V2X&4$?viXlDE$UDEQbSDMC>NPgF&>WiUp`L+JpRdW@Tb
z6Bzu2?2t{sA-P%h2#CY%Nd!;#hX4V!a$8WqeAm;M#iu69NIbK5hK@Sw*)5fv)@q`#
zf6vs{9y5P2_8vaJUo7O=DDtXBspVm7!t1V+fm%y^G6BE64Nrk33HIyLuw2gi#RzQG
z3LFB=L7yD@Lk6r30q(>4KyX9wTj&$6Jhg$GRXA~zwCTg$UrXAhG`zATp{QSeTeQSP
zkAKpMozpZJ2iP%rBF~)H64P2sdM?s~rx<X#^YeSPp}AmC<?#{`dl~Lvsd}34o4_;<
z>cK=+wCuj=P=X!7mgUC_hhE|H)r5KRkB$)66CSJ2IG&hMB^NGSjM%D%=6R>!0&@6{
zFI2P$KZ7@bAP4>I+R436JB6&aL*0ltl=8VmuVan1J^OZ%$^A!kX-3S5rn7gItPv0c
z_H6Ebd>=RN_?DYDFg_WTNfdE}kdcB@kM1{Am*2RSmlOyPYoei~LRz3jn;@yCr2}*t
zv<U6sR6h{>iwS25T@F&Lpj;^oP=Mvn<><ZA0>*CLOygz9JdiUuC)<ATJb;aeqvVH#
z%UBc0*>E9yxLocpjC<cqX9zxyn;?^<lFe^A)Cf6ofkbd@83aSgR0pn7DEL>b(a&_N
zav~`JXPsW!p{OXmuW742neM3|_&+CEMtkH0?WD0tHi8aDt^Y(nVK;Uqhpd5Gl5A9r
z76X=a1&F_tF?iVsNv*$ZjqxJV^f`u)-oYe;oq}CB>-WHD;d}Ml$8A*TJAk`qpNL>N
z4eq_=m}|Xs8B5v?2F5D6&D21ZZQ&L9+pR{^`6q3lNgpEcw<8V;$$kW!!Z&=5BRTT%
zj7msh!62Qu`y^&WbBlPq^Y(a$_4aAXrDNkMiv^GktBLb^Nv~Z)M38|85#ea<s0F6x
z74wcpYhKmVs?D`<eIoS+7*A-TCvRV4x2ec2Tph@b&Sl%$4Y>B&m>7m&JwTBF7MsJe
z&LR;25ORb-2QHi^O7N=-E`+KK44q7<eTHwAa0K3R*X<e05S#qU;&{<@N>&TCRjDPR
ztCLD0F_%xa&h~pHs#bJ_7jA7Yr!-M4Xi<VlgAyl(!ua_;P2zjcIld*_(fn-(b{x*H
z<y(REM6|=GEK|2`mTTF0`w-57+5Fo8WN*1U9r{t$AWnNoff`{t7S00L^YwD_@6MRu
zSf2-R$>q<XqnNQ(RZ;HYc9Kb1?+C#pl1Z-b9A1;l@NB4e17VMRPNh0Sf0|r?csv3!
zkvwsy@P~PzJ)ym}6^tA+cOzN0`g^nFZ>Q^V<o^|qK5GLH!y;==?)5%iZ;QizZaMJb
zQ@=gFS=Hgi*6+s7nM<YxKwvSF*n0KpjGTG%<<I`p&Pnva)0a*kDa$OuMRT}NG5v$Q
zO1F1+cYZ>$yh-jAb|XVRTAvR;H^Ja!79@0#q@_|oHq|fH9tc5_qC@App@ipyDLibb
z4!0p<X|-61=5sn01dlhm$4z)5!p8H0G$}KTjI`Q4Eh~h({by(BmZPukDDr_L;S;dR
z#8swS6f|70!4OetGGL4KO}4Mj-s4%FwwtpNTzmc>9eh5m`RB`fJny{Tb-we{jydVU
z?ReX5`RA9o*8KCwPMuq+a?wSY4v%x!EcG|HNr|%KW4!5d?(wJT7~XO)H`3o|Ju4W%
z7;SD4&a+yaUNyCCw%cvL9WyxFQaI#6@nc3&W?H20$@q)NHn5QcFnXPYO2-Q+f2%{&
zO>Kjb!`bx*fuZrDAOXifd|VJ}?T{}a`8mS;6*FyqP>Z2Pt(I-gRy!@GrKYQGw%cvC
z+ikW~P_|W7RaI40Rb7_UtyQ+$ZMNHOw%V&epj;|09yUV+Boc?l0cH|ml@tXT1p7MG
zg2s(y^Y65l+Br27M_yBV`i;(K6V{ymAU&z>h9Ii)lO~$}V`LD}L-{NHc`|>0E*?D!
zNOlb6<5XC>Hg*YwBSi_1;Gx(mxtIz|v~pugR|OkaI7-0@ShzVUkg^s~<bWvy!8(L0
zw-^uoLzM)LwbJmY?L=#Op#(-Fd$WoDtvGR!&&6z0lKNX#{q*mZDMlcxd`y5@%LZ=z
zP+&D5V{`-}#Ev$R#_bOK#OHqc<>xy{ApZm}1H*lD?AdwioOv=koVYd2X@JHQfW22a
z<#UNW263UHA_5x>JdB5V{ZXzL>f~4-g?5M^w1c+mE{2OKj71iV5Q_o`1KLCJS<26T
zI(WhT*`^JXMllRPpENvi#vfz|z(z3c(?6ZWtNER8w}R+90t;PVpyC4&v_a-$wQDhA
z4hpw$<YN_!>-#JT%5OpiZ;mV-wtrtPL#OsI+6YiwXV+RfmDYO!oyM14$6u*YzNIBp
z1};E)x4ZT(h$;jK09AeX)qu{TjFLmQ<~XLOI6qsp0a>UrAR=H&f@92jbgw-*3sw+?
z&7vAKhdH0wQ-um11~C~aTB>BTjD~!&W*x?-Psh)<vrU*O1Fv4U2x@SkhcMm+Vsy@P
zo|eoQTM`QlkQs$lXW)V($6RzH#CTMjJ3}Bsp-H~xN{ZJ+0{aO4_z6mY@p>ec@1rPC
z53~=6WFM0tq4bJrrzjvx)Qa(9jnrP4;ij5$smlPMZ}YSLFehL<J8&_9HUkjM%kze9
zg;5rG;$~zRnc}+&?RSRh4F0|t(N8=~Hta`h;|m-!4`uRo{+Z|tczXp4`0=bpwBZkc
z-KVne)4zBQF*78Vqs?3;+1AQdn#KXQtfMUyJW-`aebqDT^x86bJggoDWLUjM{vI*f
z>3LAtflyDEK(Rx>f<2zS;&Zn3GrIw=A~C~^bcj*!F@9BmJN^hEA8?hl-%cY?ynMUj
zsoUCK0yyseQRU>nJ~tp-RvbQfap*`L20{k12%9K0XLww1bTdC0y1D~hWz~lPVnCpl
z4j3p_p+NH;;}jz|y!;`Ql6G@A&ineG!{epnkA{%>Lm?`tifuA{Gp!ZnjvgMZMA$#9
zXYVeWMs@IS`$LE}k`L`kBtJi;zvTFQdytP$*35Ej*0LAu%+idWU|8yvz<Q(0kFJIL
zPv7}?XpJpf*ZfYN1It8EZ%+0-34;}Qp*KtIiWXw6X9Rx&EB1=SW>e-zLnc#Y?7p7f
z1IOgNV&;d}2uH?M8}_^GV2Y{R->9xIhQ#n>Vph<e@*h9RA^BRE7TIo?0i75IK_sV0
zIzl38z1ne^GE0BZaU!H><gqML2+)WIkMrPa>S@w<{5nsdjfJhSyksNXFC)--ZCsHc
zd%2eu_Bz5&A9SMwopN5PoM=cFfdF^Cw310Akz~XC1i!<H7|tYd2sz=;-sP!8R!yO<
zVhZ<ncWCqMKu#Bsz$sK9FSiOXV_}?1CHM9@haO1~3enM^s0ds>!87fx=7J`n3fu@z
zT#oGz#fh=TgOnF~K+ppK1c3#qCz1!DU|Pi}zfU7EGBO#c@q}@3#=7xyTogUaa3PsR
z!pbh3h%%v3K@GpjH{mD?oG8HhC{KW-L__+Ovi0acWb~@Ivz{y)D81|)znV@Z{(9E^
z@Hg5he}G{Vv|{ZfPNjzUS1ZGwRrcP-c1v^`nqP>1oI=z?N-IUC^-v;ioS8bw(jy)1
zoy-n6XIi1ruiIBz-=+^o#UTod$^lM4lf#8V_;C@s8765ANTwKDqd1)ZE5#O?>G^UR
zZ{i>@^b_ak9Gwjw5o5sHBjg20);otJWcZNv1b|;o?Tx^R;B}+jT%YyeyU^bgyOCk5
z5vydMpp5T?ofX-dh6pR6&%V3>uAe|(nE^uKOdARVxvEd2^+7I}1*$?zw@VOLr>IHe
zm;>QtVjO`YHo!asZnpw|b#3S1Q^R0_F$sC?;AZa{c>ZWjXLpS9>3U63RDz;E{bdCx
zF*Y%VcJ<~uYM0`9Z;58T&q)F1h;hyVZCMXT_51{R@V@_Sg;(2kys6EA`-if}kD;G>
zU36y=Y#j(&Z0SMh+<wwdEQ9{%F=*FaZnQ=nf=s`$NHPf9qWkEsbec%uUh1+{f#84A
z_m94t{_lQ&=RnqG5Dj3bm{BJv9pc0I^p@uV-stcHPNIE_rRlD9phQo3J+G#%oY8ii
z<K62$Uj6&ecWoV?unFJB^kJpz@@l5QiYbhZ7{%B;%RT?n2m0v`{epl%Aej)xga1*n
zi6mkaf<M620xtCV*{FQ3=>LSO2r<yifj`>x5+bU=a5=%&IY;aw-Vde2`)nFJdp(il
z5>v+3WUvvJJCRBw0qG42vw@lyhp4G$CAzSqc={ajf0PvhK!4g)f`THog+bcXJbtp%
z6dKM3aSK^X2oQV~vhazu$&KC4q7U4M`?ggs2>kp71*R6LcnA18<tzQ=sDGB;=X8if
z&M{HOfmWo}K&F9t66I-2iUEO6QQA2HpfMDz?W{KC>%S%$$+Yc$$pG~M_kM%)4SWO%
z`oIvd^RNGI--tgk&w!lhI-~$klOO_W;DAh4;KaT@pgmw~mT}o2h$#fN>+PqHNW#Og
z^dEru49+IDg#S8tBrJUK`J&q%{lmU(o$_Se8UFj!$oqE2BTwP!LC8t3{{HgLxnKS4
zHF#~`WTtyh0`g;@ZEKo;rwb7?2XN@GEc7B;KowvyECgAJWOuS#T$n*{ds7(Yccnxu
zuS)WAKQg@_Bk|?<jhsE9`U^?-I`QvWoCk?P(nsM%@FFi20)IHLiE%;d^-|9+dZ*A*
z@*Y6S#rFQHkF`-AQG;1$ll_E$!HG!AOLZQT(B0>qRmBL%hw!138k87;+`R7V;{EUn
z@aQi7eccYGYRk&YVi+ME_p<$nRKD8wdd7=yE1jd(KVh~k*h}7idqWjeu&E${t)k^}
z1tBRnaf2hwk7gI-T%>9>9?2e`<-7XkH^}<iO@hO-ciZ;Fo#PJzo@Fcl>G`lYBPCB`
zIqJ|E$Bo+|<Ng$L^4{T^@xzEi+VL0S@D?+ZIRV`&I2S!*KzCf!KIo|-nzQ$4+hF^N
znxOnJ_g7e%1Mp=6f(MJJWE!hp<5!xzj*R?RSw+{lBOMp44)9V$4#Vk!BbW;y6iBC0
zwj>2ZuT`!uWs{ImUaTs3L4&Vhi5A!GVQ<E461XT6LJ>#@`C8v*qOFqi-JEzmMu6fQ
zICN;|t)XG7*zEfFw>s?mW4m2+*0f(Z7O?J@1A~OLfV7_aR3>jlj_eN;Bb0l}fdZri
zqk>HQ)PIglf(tnJ_GEng17PTzLv;Rn)`E`aT^rO$hk~9RZ3ie-L9C}~&yx2SiWDMd
zpo>K=ktrc-A{|q+`u(sS8dj1hC?r$X+<nlpA@LndsbmKmpMt`z6%`Rhs-2#iJYMfl
z%X7u|??6&=R74C!$PedH_qEJAO5(FAv=$iNE#ICR0SJPE4>Onw=;&aA$gU)1*@z4S
z$6dh~5-k<g-l2P*fNCS8&`-vVIQC#1m-Ev?ZZDxgtC>;69t&dyi3l`XgV;Dh&KNt$
z^%NMHnH`@8V*2SC>PdUuMxaN56ZbD+7#I$96cPPoseUVA7156daH`zR@iQssMC9fm
zc9iBV>RY(2&+B3Jf}trOEN0ArcEmwf4D0Sv{oMTibRhN=3F;$Z9Q}%jH-mo6SOCWa
zLIM=|qF2|)K;~@(K8O2g3_zU>z*2`aRW$PY`#c^qf|0jlCV~POQ`tp)lpe;@gSust
z3De>Dzcx417I)2PlO5CsvOS&mS;A1(Q4?`Ui<Ca4Pq5{=X@?^O#PzvGgO0c5ue(EQ
z-%nEGEboJch;>oTnfyEZDS@ceRzF`?vV*?aK1mLmbUHUK$n%{-h{klN*qbV`fO!XA
zsvY?SDlej%gOCjpZvDNNH8ocluRStHyot$&+{5Pl)en&?6eMa~<p;Or?|X%Q)wJSh
zIFU)ts})z@b8D$-Ulu^l^*330Koo=<X_F-NDiaa~1P@R(ibA4J7+=)B5TJA!Z^n7&
zO3twOm`5nNcc|tPpOjNEWKxjgO%I9Ig!z-hG%OL(0QoAXKKisN;|@>gL-G6>>(ds3
z<h$~VZz2V~oIxz&h(STfK;A{hN%8e64!JxYh3qwia<&*T7;4$;@z(3sT@Ui2jz?2(
zLxhRa_UKu+NUwfS+V+JOICO%`h@ugzePM6EE{;7^tzI?6`4IczUBol&D<NjAG~QiY
zbm-4)>ZB!7oD>3SDPS*DCe;g)P_n)F<`Nm5gzlhq^|>g(=2XtO*CT*}tpr4vjn24V
zT=1f+oovH~B$rwCyd@c1slzPP0z-MyF7K`A+n;`|O&3zK%g-#>#0tP~L)t@VL5D!%
zIR}TNLIpUHvW~Wy3VXFdo__63%$pl9aE5dA6oEnw-9`+06fKKP92j?&mw0=yih#sY
ztL^Ymz@Z11wiZ#8L`6kEsj14*6X&eNbI~|QgXl$(BxtW<!DinjO(#43JKHL#t!jEx
znMJ2#lzBZ`<r!wS{<88u3+<YsE#07Rb$RQj2l|a<3bm_Tu)BjGLC>JAbUBB-%7NO@
zB&Ir+vm4bC4e5NY@y0_A<w6bADhC`0sEx!iPT~RdsJaS)N(*XKnQRprwE${W>yQim
z$Pgmq4)UYKrDS_eTvqZ2u#dsLQr9YCj``BTLzOpxoO5Py%=JzAtJc92ah$%oKUeCn
zc;r@@PTaM>n*|>JbtWAx3oA<ekB0l0@ll|qgb-;uDHgCE6S1sSMIpDVj#<L*A*zey
z@m2M+xYKK`1a261upc#43{sE|MRfIeeQ((s?r;MV#AmTns~vuf&jLjUNnKSi?<wQK
zM1$hOUdgcZqx!lviUk>jxShl}fG1{_e_E*&0+S(8Xz<#zUvlU@Y@vO=_ZLD%&wXsM
zFNCB#?BYjxxElrD4Sxp9?d^e*&5?YZ29oe!Y#dUeiU=v{=k0P>3SdMEB21+Pijtrc
zVL`gExAgAd+cp>haDDX-|0pL{RS<VSMxA+goR-v^(M6OZC8$Ce=+lKv3Yi$uY4dEw
z<pN+PB^2VG5F$#0KRUPs@F62}vruv68{A{o_0RO&j2|jbw_G8gB%5-~G5u$a8@={N
z0J(GYcD>fui=#yvT1XIdI1i@L4A;mkm_8vWtl!&f$K(_$a>Awxb=?NNMBW^UMVyR{
zr9eWz0nXqeK&Ym|v%;i*7tsaVwZ0vL<Lu?-o|R&&N%5AWB7&>2t~kIR(!-$?JNVnf
z4Smn?k6J@447%`3e?$Z7-+rnpyV<_9&ykqglWNI0yRb2(WfW1Lqsr`0vucK^uM-eT
z=Wy@qPwJFZbm_a^=l48M_r_Lnw7wk<ae}RH+ACR)N9UUNNQ=P&RWG=w6oP@grz{jD
z7O%#Kxye_A8Pv5dL{1~cVo~G)S`o;q60;yeTtFDrRN(YV0UM=TQ0i5x?7f^?<-DLJ
zKl3qL1Ne{Vhl@xvw_#JD<UKW&pU})N&+qM|9q?V?k56i&$m)uxajdsi*4<PX9dstq
zx^M=y+!MtsU@rv|j;~$NFBpbr=$Bfq5=0pED<RfGE>PrEQ0ufP9>E14PFqZ#{$)@_
z>Ksv?p%jlGM@8y5@Kk85^e7zn(@6C{4N8;Abh5q0K&+)kk5T{vpy#PT3++^<r5dSp
z*O(m+#y;3XOqOs#n1me#IP$6icqlT>?q&8UOR2L=U#=5m7ZIs#ZIcdX@7?Th>mz9p
zA|*a6J&yc{8i?9qqhgea_bywjZ+5)89nb7qaMNYLkwFGJQprDW$3g4$&~5Ca;6usL
z&pteF0>j*p!#LWiKpgtAg&i4dtut)eY8BZ)7<nu?s4u0~RI!%g^I*@8EKLo5PSuOD
z`|-3t?Tz2d*Ix}=<pX*Pd6%xedtz?Me#F(@C}b?$E>%8ypC47a*2H(*N8h_w^lv&<
z16>r0Yewy*fYwEjB~j*f?(r9UA)FU0G<mkNahu>=DkEbz@K!JBS27E|Y6cDpG9u!H
z<lI^KKWwhi9+HAYzh555^cpK>c@-Rc;J{NV9?q8{jrORhhv-qCa)#cZXCk=twGroo
zw7qRTWO?a$5gwPirO;H_&J_n&lBQ#`+MzBf<I1u%Z3CsSDZ_e(N|ySSI|vLzsMj|j
zim##SF?#G}NDxoNwhAxe?u%GG@9Dph?m$9&a9graFCdDQNGDdcMk8j#g14mR7yENK
zYNA;1ya*A@pl<Y7856q|;1>J(?Z<?>Oi4O|sz9e%3=VF^PLN_y1h*uDFxEhhaIqm0
z9545Jo&cf#jgFAmsElgOn!fk0HBeij>InFXM~;_Fl1QwgCB3Qx$m)bUK7J14Z>xHT
zyD;M}O1yjhmL0!?cE_kNeiXQnNX$?LATY#REbLj}da%B3LB}1<noG%Qn-o|#9&8)~
z`mC&T5Rbrs#8N~`czFG-fBp<Cpd5q%9(0Iy!5%Go?^a{@^ePf54qU*@Feh!?BXi<H
z7dsyg*O;KQhu`}1vyz?JKNc$=GgFDc_|M*XmSr+qz9y3T+oLCkc*^$=RPG+3#aRA0
z%_csP0G*E9fNUMb`~0>M^pirmC0~g=r`g9ou;O`+K1Xrn;b8__3?u<5i<KVdxlSJN
zosCtre)ANAT}n+kl`Lv?F`h9R9WIet-E!NqZmsM<77|AAJ&KYcF(c*8uJrm9oPqVm
zU%I&g`856Er2n!Roi(99<N?t&Av8)w1u98IQZh_1K`_Mpk%&ws3@m^|gDXP>gi!?0
z!pPFh$q-UMutOJ6X;e?1KsW!h_TLY|xbAoQAP)BK@_)#mq@EyO!w>vI{?bgpz@0D#
zl22d}QW_jT<%WH5lO$9qY91v2(oKjCViW!XN?{48Fu2xZIN~!n%os@!qe39TnE)da
zL&$?qi7BWL?10<^as&}21`G+6F~Ny}KlRI#8!*DN9I1#3prWXV&O}v73UkUODr6zr
z93fHQl~U!y31a*4)%}sm7N%&z8zp9!{IP=3R}E++=7u9RV6>VIRRtKjGiA!6V*eM^
zX3c1!^*pL*cUXHNh|^fjWUT{nggHjkXc)%A_mzmD1`$OYiZq(p2@{OVRK=j0f~!RM
z%5?%BxI>>84uqY|&`g4E>5LRw4F0q~@J=rJZeEV8Hc8k!=4ir|D0PJq0L)BGEtUn3
zV}O<`hRPZgL^iD;lEg{#&J$Ra78fm}k__ADqZXTP^k`xra4_sMlg>>O5>tppx2!x&
z4eo9Xcr};|3`<&~jL{um?uUulE(r`%0|6(2Xjsxg$s}OCjV95Rh6pX{!wlS0pur<)
zhO~7lvJmV@<ywa+IB_OYaLLxdGr2?*Pz<23kfFFN2Qun%pvr~nDR3z9&+pcCE5RrY
zJjYQ&YB+^_BQ7_9`=Qj)-oQ3b6oG6oH1R`=4U3?`TG&7=vawkXthoizF*cU6B=XTL
zXwyjKNOLbU)k#r6(o|J1M2DNnP*ntV7!r`w*FyG0OpJhJ&19k?B}fnsO`TjlKezGc
z^m+XIz#oVKc_Hoop8ib(RSuBwqJNW^_n$V2Q(JzYNOPVZzvJCpsDNqzA9wkA2e{6)
zvdb3AxK+Yps?9deiV`%&E&WgT`~JMpm+KLWg?#QzwfAy@I<W4oeJ048(}2RLpSuA1
z!$;r#jvjB*=KMP%9Y^o&gVf3G{h@(<pT@AWKzq4>+prVsMJbm;P_sk{RH8^$u-2Vn
zdkwA|QviY^x)<u{F%W+d>-}%bxK42qRsYn%JtTjITSqdW2}kOowyJoTR<;r1VnB&P
zQ&FUii%S{nd^O(5dX)qIHcCGIi)Xn1_J9!eun3AkXb_L@K!kTb4x{mfUbS?;x5vxp
zpCf?zNFgqGB_;y5Sk>-GJ;H83f+zO`a9!xh{Lh;P8bld?Vi)}XUh)31_fPj{7Y~=w
zL~I1Xr&y}br~ZTG{isju>DnuMpt#ukv3MWb@FE%NkjV(E`&R2AO&xjg|0b4?Ek_KV
zmKIG-+x*z4k<XufopB)wz<GGdN1$wnUFh;iZ|+Ac9|oBKV*!Tpg;4uaEuP0ZzOXkt
z{{9x@L->#g&?7q%wwUzkq&*t!Ap`K60RQ^Q+5kkiO}j#MSg3*T8lFGkfZ*_(prOIo
zm+9LK=u=zQVO~H$W~Q}OCfKL^g@P6Fz5^&c{v(7fZ9M_w`Ly*tU7Zv@q#caFc*szH
z(eMsQ+;JahdCu+%2Rv?<7)IZtL7*Z68c2zhdV+?945^?D!OW1-mIkH>f(Nptzc&B`
z4rDg%JW!BWOvH5cll0=}_=!KCDmq8i<Xk-g+GZ$s$NrR7ql>t!B1hi>E$BjA_KIQ;
zHUl5~n&2bU448F-2gk8g##QP<B^nATRiIUVk@COc)*lx9w3uC@K^#jw?AZgeg#dq|
zYRMjS0DVm~sKk<_0OsVFh$^b8k%#jBOi+F0*y;yK4t(K~-o!mKno0r|8&t@I%nvih
zL5eh>!Z8t_?qmP$6lit>G6=T-;Q-`Au>kv_J_I=~!0-=F4X(xG+&x9G{710#pr;~p
z7YZZ<_@uuOW(Eoh28EE9#15hm+&Cc?5cqD(BLHy%hfIM>(($q1nXyopjr@nq?||R<
zh}nq)c*HL}LEjbEkLR<)PtErZBCO-5vMr-MbxQGa((v@43)iAr@(?UhaD;C8qq#bz
z*S+656&?V=9a-J;ebV9vl3~g~HUQ(-p*Oo$XhKmryiD>Yj7$)C8RN)1Arr12jqp9I
z!>M<i0zFz4=6YHIU>+4A;{*s`FT(K>K!=%{?aaZ~CvA{R_p}&fsC;mN$jQCunGkCP
z0}dCpC5JCfp6EozgeXc@cG~7Pnm#=iAon(Z#E+I$)QZ8+Djf-<LcVz8=DPvmAU)@)
z><2<Vwcvx%5Hv8U1Ofp7OhN*~A}a9ZfTx)X4iQpw*gqZ)qgG{<u@x}B*9@pb^?2zd
z^-qW#biM|W^o^o>P)BEDPa$wfI1;{ooM0{zCVH@*HT2c}w_jF$9~`H#48-XO9Kx{o
zpA}bhECN=2zCS#Kg-HNg)I;nNf(#RheW1=c#_(X193Bxa2hzzmEbca-vQfr(9HBQ&
zq|_xy9C6{>>D1~PPY|H=b^q_Z9?suqndl9mc=qN<2@t)a>A_cV7zCOF%`_{D4<e7z
z>;(t^p2OI5P*`(mLqv)d+=rNmpp48SD(5&0&;&Ym1n>r6Z3kiZo*;re$YvO4#z%u*
z#Zfwd6OcG#J}(1S-)U}iy5oc3e2b*`lVk4?JCAfuzC06#14J(-XbA}eVhn`Kx2v<a
zc19!}j^$9|eNGPXdd{HcUXXwTZbu9h_rM&-DaZi7O8|60A)qBX;1BQk9r|!3JJm>d
zD)vAI<3N)lzc&nEdOZGv)8INcf#>&Qfy;@As|N-G2sS{6sq}aBrGifQq)2>be0O!J
zUDTFIBg~h@bOyJZ7Y!j3-S{sx+&vGXao}1Y{lVda7J--yS>?jS94{+wdWR&i7LXnJ
zfV)hv8I)Maz(5F7d4>%38O2zJa5rpBfZqoRU<pzXSwlGOv&3m}z979<+y4*n`F#KX
zHV5G<OQ^tz>I{STp+CR*j9Gt-$B9AUQF{mZfdn8g);3Abc(6Tx!Q3Ge7k*}x31l)q
zfcb;p%ZvxE4UnCOjEN+ZX@4-2?(o4qqJ*3hbTIE69FIv4cYHt8h91EK2@nU+JNRcE
zTbw$2J{@of6V=VJ(<kWrzWfPyrd`}HYUz=dKBxTN#YKw<FVn?F^6eTy)udxaffX4a
zR273yONHT_nehNt3L(>+Xa;Y2M!{w*`;46>Nj0Mr%?&^S*c1O%2sCGS41MT@Hqk8`
zYXb!B^7%r6RL-Ib5S?(r2z+cBXCOF1_U=%E8iRIbh;k4x>I+hUY()G+o}kH&rr9<N
zhI?64RRC2fDNdIk%1fd420uCaQ1_|W7h}owM|pIM$|3q#A|fa#rjlf!peF|q2+AV#
zm;v3xG%oU7e={!=^BrrX&j&-r{Tf5b5#%3H?IMbB4C(;U`gijB3`ieo&~1c%pJu)E
zeFil_g+h3c8dT>GSQ~&|sYD*#;5s>Nr8*baJ`kEP!7BxXI0qs>R<T2+{jZ<fuqXp#
z$ghx+i|M}Lf8CrrwSZKcz&@o_RaJr-s)U-Vs;a80s;Z%?3aYBAs;a80qN=J@RaI40
zQU>^qKt3wzJ)uPzbg-ND(GSv)^Vey0r{}W3Io1%OS-~eCViV7ksX>F)K6O<jQB+Yx
zDesMk2tudueiF=6AQL1&g?zWIeHn&ttX)K`nv+LKymhL+moWBwEm}wH?f2MOnU-E_
zC(QLHt@g)eS`Q(Id_AUs<Y`P-nQ4#6cJ=kn=??3s2nfMHRKJp6&lDct=>2E!v=tEr
zLljgL5d=jv6*WXv1XVQ5Q6w-F5n`%v$K(83I)&N&zj=Zw^}q6D4iPStFi-vedF^n-
zITBU52=f{<EG-s(;{>VwR$?0u;C=dSdjcOtg2ifgdVGsa%%X}4v42~G<oqwA>jdZV
zugc%x(@CQ%TAx)*kIb^tkJeIfgZ-Fj`lYu9wqI<{Uwq*VV5Ya-#x80y9j`|RQa^P=
z{xE#L<wU>VO&M*tVR8PU#jl?}d~<$Y6TXcDvjAmK7_+zO0|PgZ*OB`}nXPM5I{*)K
zzSC=+Hg$(RK;t33kgh@(jc#Bn`Ll^Ju9`V7mOfKLz~-RXNl|zvi2yu81b8tJ5OshX
z4rg7PZBm?uS)mGt#=S!ELIDe@mH0e(I$a{(HVC3^Y_>qILnP4k&KVjUbjHEJ><bS&
zQ6xi5m<W!Wk8X(^gR!AOHqe!iMe<jP=ck+`@8gZ;@=c*MzEGoXPk(=WI-}0}te#s@
z1VJQ7ZX__A$@@Hx-Atu1za{)A*dsBe?(`6#V8HimB0a^>+6oro3lwnT!#kE?4AvuI
z$DUUK`n<UydVXBLf#8}U>f9c$QOI?)N$exSK;!PjSDIHmE@T2+@C446k4>D4s;ay$
zRc1g?0uma63-nb?hjiprM3flcr|b4svKa%aGDd1y&hNPWZTUDk6q9VVxTKOs<3pWF
z0%JloEi?ze_WAo>b=)Si(4D<5w2h%K6v2c;Nr%ZBHLXza7R)Ge8R(dlkbqruoQ23L
zf@sks8Y4+Q)E>aU&m#A~w*g1ebDR^TI|_XhqlWXF(xf4-gvEM-`g{D^b-x%ynS1c!
zH>ZYm6P|q_Xjy$HJOT#`ODgRtgL7{WVW*MgJ5bQC5F&{8BtZk+*zsZ<fhYkzj$~g5
zG=Z`g4Wh#ngM<-5e<ux%=M`uXJz}sQzxV$y{(FS$?(y_9@M8fE6!Q2HihKHkmL~|q
zO1`l+0pD-N3O=wGVJU}*Aba+x2kTe?`_g!k#FxA|L>%>P71g*s21sP;l7!$lb@cGe
zZbZ8q&i6PeyVIlRH0N`dr%NpmtwT^TDCzMJ%yXXOD<B*IV3PZok~;K2qDFXi5>!=)
z@GrMLWHr9AdtxAv!`uo3_k{^V(Sr9G0j)slk_buUxF#2Mkaodu-`e$e>-fX5o$&C)
z(&|%Kkw9Yr7}DB|>(hQ8FAKqX%f%H!%1Xv2ZwlBC$=G&zZ9hUDnDXj;tS;#N|NQfr
zj%8Eq^E;&Sh9Hp+`40W0@1a`7d@+(mI05J#GB&KJF;P*hh8UQ%*7i@VcP@g0>ZOQ!
zY~>FLBElpHpixC2XXf*MjmM7!Q^A3Qo1adU{^WXB(~T{#@)?8r;Q>F{x-TxsodnRS
z=!m#c<rDUqM7qyHrmKV{_Y$oGK!*e#K`E@kGN^#e3~W;gfPm7NLQ4xFgeF8S=1IVZ
zWsrV7rg-qDzflz`6CwuTRP`jfpdnHS1ktrsQyh1nx34*Jz)rF0ef=Iq;nBlDWCOd8
zya=AXn?s8tC>T*y^d<HI4?N|*$V<U4nh<h4Mn0>37g@9)SadijhdB!uFg!5m4R*t*
zkWM&o+fw!<)Fy68F~)8OFsN%G$lx0X1CGMHiN6<KFm_L9_d|z~p4f7CAYFhSJh0~R
zX^lA?d78{@GcyB2Kv$xJh>*;Y$3syL=+iM-U2f$rNnnFoz`<oTWR{4bz#MhPo*{Uh
z!lF8^4mzs2@OVA#oVC<1P&SBwG$11YD1oftJj0AOIK;vtU^swk1SbtZ+W>A<5F<me
z1BRiQjDT(&CP)L<CripfceMEPfEr17!;LAaHjudqn-2$Fm$zrbP7fpTk;?E&rFJ?(
z-^mYOr4Qzn!YU*BQu47c1W7kV1`~D_?kN2?OYsNnsD9t!`z#J(5dI(UxpRN{P<7iK
z!Q?_gc~9lNVNV7=Q0Y<qf?@MByAb|gwTi!2V+eYG*GDbD>J%YGB*zj5<2ByEbaARI
zPwDz`T_2x25uu4%A-tSBj2EQS1|6ICXo-Y*<8NLfaHyD%YeZq?<0O8+3rB(dj9#De
zKggAKs(ydT^@r&V{zLVl_6K4EfPa_5R6HrA`my*sNjWUF_+{jY*9HtE2%ve?6v}>G
z@sNnR6um4Hsw7$pSO}~Waws2BbEok8huu@6g=P_w#|dFXeOFa6RQ%%moFPr+|5ze^
z_Gc3K2=fb}bU=X)fcMm(UPT&RYYicYEd4fvmIRVWnVEn+8Jse26fpeL4kFDVOs6SC
zRDW!~8?<ri^zZD&wvr8axF1Iswgd9QU$_INErz;~Nuzn@;o;3_+3TW>^_(;sgRX$i
zmL>0oCP;GV<kzsr*i9nVgg747g|ivP$CYQi@%pG@pIH4)57U2DAj0Q5TQF$km>n3k
z)<2XhyC9-X7Uzvty@&pX3Ep@5G@Jp7tWMhHt|d0pUL8#0ZVo?3ne8DcN)mveNA2<T
zj*dsc1Z^IFs}%HO#kV4p2H@*s#Yt5YO$LD6i2U0NX;<G>P(cWF9>l<W5ZVL*0aQ&@
zNmWWT0iZ=m8yFn}na4v~>T^N5s`@8|Iq~g74unVK^Si+~N~-Ghn2XsFMMzAdJM{J8
znc<dHy7VJKBdcbr#aWfY41_R|J8*THM}yseED5C^<c>pu$fqEDNFJVqGZCnS!X$YR
z{m4_a4~NzUbIKSTNFG7rCJu-JL(pXw77!Xil2k&J1ZfZh-s=OM**};`5rP>B6St4U
zPHO=TW+vp6V39i|azG%IAs~R1Ac16&Bq4%WAdrR#go5r5e;2o(%iNoTk8D!3oILF`
zdLkV#85gjA!-96217JjjV(v$?f0vvA+3TWvTn>Qsmws!Is&Csdk6>ZU;An||dUAK6
z|4-`uzwtSZrD#q;=Eds((Ditj4xoS~Wr9#AAu=Ti&EEeHN*?Y>Q8dj}%=jh1&Ge!)
z&x`<q_<U?9!b>A<$p;*6s;UTzs<SbIs;a80s^7|df3;c==daV5|31Ncg%X=~N~S6J
z$JTWNsXGu3v`*u5))MxxcaTKxcchRG2K}crg;%u2d9Ac6I~arb24(<|Z`k<*tiAGM
zA>|{su_YuZ42GN*fPhYq>f@RK3<uI|8XXz&Tsl^+L^woz1{1t=!;r1-^?AK}HM+L<
z$>-V_c>ALjIZi=$^#B(9i<?v6AtL?|jlxn8#6cnW`9TBn8$|iIB4is4huUDGno@U&
zZaY0aXo=m;%qTm0hL2V}cL$o_kSX2jF?YZzz>yb;SUT`SN~gVf3{E&h0pxlyL-G(V
z(gF!SE_yl*fV%@r!0BGbfIIJJEr&vwgWfp<j6vBdc(4>0G%!nGRyY^GVHFEpK+w1`
z5a9+k8kpl3L?;0ajshO^Ksh@AX$~0>3Yx2w*{7pu^pXZB#eyitB(Px^Je&*%VJWpl
zyhBG?+#LDFGQb<{hzFSn{C$+dNk&No^W;vnfdn#7e6Rx*lOYcWC$I*UG>1crCkSJV
z27`=KJAr_Bu#TYOM8Xim%P?$&Uh*rsJbExAx$>@%I%PT_^iLDMkR?&d2KjVUK?Wq$
zQ5{!3lt(5l$RhHL@R9?r6BIV#iG-o?A3=X(_mrZ95GR&Td5+X^g|pZHt$M+eR3K$P
zhA8|0!{a}4ed0+Er%L)Lf5zv|&c_Brv62T=C+#89j$3BK2y|g!Frh!=ld+6A>Ka38
zA;_=am-9=zmA#62V25c<p5(y)ITL>14$CifS)iczoj(#hfG~sq7&ZAnJGzfY>m1`8
zW0UV-jj{Hcks8@wIANg#NoR8Qm)vYtEh(ok?&I?Pb*zZY+{(YjdsaC7V;SD1;81a>
z-T2#ztIa`gio@l=BmzO<1c_r>$*HT+H5I<OEwm5kxH&CD1o)dvQ*AMIO#4~Z^m)|L
z9rfEBP7XXUwR?iXHK%e5v~zsxW8wHX=ktyi@ISAC8*MmI(c6ea)mCRV-1N-Mb?}F$
z?rymlvW?2GHY~DWNjdr)9seDZCq5wq%HhHSaRIL`!&e)1-t5>?M2P8g8gk)!=<Xr6
zNK8v`=x;q=1;N2X0+5aS&}<Q+FhFd+DWaJ0+$NxCBhm01q%h>Rzz`ZY3q|#}px6Y%
zdFn4A9Ecg6ZBJAx8e||irWOl=1%hUI*~qJPk=8Q$dU9h^GY`{X^*S2B6rjju5I0a9
zwTaSm<xIjt?z?ji2tYLbS?=R(Hf@-22a9WJWjG0j;fB*-P@Yz~LBGx0XJyF=rNEI6
zgXpmNn%gT3)c`TP>ELtSvlsxbkEb`(MnjY9b2$i@vN9B^?*jy}5CND6ygP+rb%Vn_
z*(^Hi4%<&4x--*J6y@y<cZwB~J%a%<NNx-WLo)UdqG%GxGMAAVyMHIADDr1BhNy`U
z&=gCyO*3%bpf|XHS%IMdhp@W2E-AQrq+*~tfz$2~=n-E*oK^LnZH}(TpnI?b?i~j@
zX*tLTxgOE(aPX^#sL|BBy*Jvg9N9slC5#=)k#&!<3=nM4hK0ufigE#fnzsT@0C%51
zHQdeo=NWwg^22&+#<PSoklV3h;o5ZKN_@$tF`)-jECzGu;5^mkNU|fJ2B=IS=RvK-
z#@Ina5w5Zmv-<9Y;v0}LROkW%0vHbI4{Q|CqEBlJ(O@qMX?DiZ^^Az+w3R{UH%%^2
znV!Tb7&-laVS+$1cw{aC`=;l7G|Yf^l~Nm(U%N1s!TXu{Q2dO;LK%(g{x}JP)J_$r
zZ#aKg^AjM3M?Mgpe1D1*`g?k&hzS?ol_e;Mf)~8NnC+a*5P}m3VnQHrAo)*(8#V^a
z!Se_Q7DGseAj(L|N|I3oio?*Je}!<x6U`rKB7fohkHPn++H{A!WMxj%r{CC{I?rs^
zvI2nECjo)P@^lOsf_$FO4JF9|{TmJg)W#Z#2we>zA_lc31SgNlkEe;WU!>3j<v4Ca
z$W$i$QBbfHpVN&rngPcF#{$$NO%W0vxl!<#@HcM;pI1(ft{_S`elk#G=b0vIh8=Ji
zSn}h6q7(Me^4KXzuiFFh`jP%Wu>ODg|4%UR;fj>miiZhDk1fWguHKQu()JOTNhUAE
z?G*!du@~9CkT%Ac&uoCh+qW;0212T8QWnS`NxA2@JcaK#A5R!oV+RHqqW=T$z65On
z#A#@K!2o$FxqPrd?WJ&7e-`i`6xarLbg#G6L>Y!A7!&(uV4qWAvL+cY4|_XiqLaVC
z`8sVo<T-|TXzJ*J?K7w)+z;4>LK{HX;spS^<G~^B<_>_QWIfD5(E0d*KEt{#o@~nu
z4}L|@bKuX&a83n}<};zHL8wtK2208;AL`4)TOIeyuxZ0EeF9g|shqog+r1|TL<g#g
zdnbofbxYr#U@r_bCoU-t`Nnm|=Q%{<#3h+H835Gv&e(J^9^Icw;z1Asj6@+mgX#4>
zb{^BvJo`SE&4EVegrWN)_n!ZFdjnv*<onAKUhM(mgsIdJICSyx<*E~4H+<|dZ~|jt
z5Ccmix7Lh%P=F<n=t#kRwlW(JVa~K0N5#S-(yj@hK6km|CYAfpoffzO^j+b`mHfPR
zGhy-e<w|rb^f2bo1R7dpPe8yFK8?IuF_^r@3?OwxV}v7u<uD~CcmwpuZHwdZ4UUC)
zZ1us;_Z}0bQK!+o$M<^hD_?i#((85t_ss*`%4$P&74=vTaUi9DY&!85p%VphV0O@T
z^=c{ngs4GLVTu_JFh9K<o%<O3UkQE3o5v_}r*wAvG+x|&XT0lJh`=mJkAQ*EpfrPQ
ziV4~#g;c{vB5l+09D5-U@Web+^wUWEz4!zKPGp0q0>C)XBE&J}()jM=muIKVxbTxu
z#DT;wx38$<v!VLq9fX2FOmdzC2ZwwS&;bZ^uukc*kCH+?s=3v>QRUwxD#S-dghWSi
ztu^=FH3PP+b((~$8U}|UX2sxhF;+Vfq1qQ#K2ph%2<%A&H<DDlZ5l{nhLT#jLqTQ@
zSvk0Y!GuBX+7rWiYG^KiI8(QHX=rHtca;*|H`_eTfytzp-WQ7w8^GMmDjl3QDVv)M
ztcV<dE;#GEi6nJQOz8tyC{cpSMEOLCt7c)sS&P~$Lu?>E)+KtFS4R3=L<3NQh+d}-
z!bZ0kJoAQyFo@yB)e`ZMw&*ICbq_4?;|>d)ma5YktppDnkw%U3*FD3Ny6y!;OgRG<
z+8YB+26*O?OyORgLjnloh1BD<0+*210n9nj985!!0ic`YXe>?%%sfvcqhfUngSjt7
zz|u!uxU#LT-16%Xu?KhBDkE_qY#R~Fk=<x72W^;bFvZR!m{5U@8FtDlZ<1Z`G#Z^E
zCj^LbZlQ<cSR`^xz|NkAzcPo}_hC`)5|Cwr$^0Gl`v0eP&<&%@Lz*#ukM22z)RvR`
zkTrQk^4zmnViX}q)8SB4;srl_WDYD+72W(D@ge&;$^ck>>?XqluFV+`gHIk%5PCp6
z;1w`}Iq2t&s>$@<(a-Oj&a*;!C1}H&qK<R*eP3PD9H^oWHk84XNuY>`#smg?l%kbb
zYT$vK3G8U_AwTBD7uSh$zR;(wMA}m&hmi{r!Q7QIy_n}kb2)469M6Y|%L@Ysoy*9K
z@aCnEE1*2)awSCc1Vg6{ffFyN+II>5SMq`U8a_llkk=Et;|mKR@#Hv756Pqh&GLBt
zwE6+`JWeT{Mm^>FOP7*Z*kJdPo7A}nIP2Ix2SWAW3=)qq_AuZlpgm{Zs;vXA{0}tl
z$04U90Wi#?Y7T)tZ=V=IpFnaQ1f(<&{oxTg2xxc)b%&b);3xB+ZihsnvoBbHPJ&;%
zw8UMLqs_ZZxemDsRRh-taXR_{xJ~dZrh{=3!chyewA?d3T!K0~dLuMMDTBl(l48)%
z?An|0(rE%jh(cyv|Bm&%x$jbZnE2rr=R)HOb>L%1ctM>UPJlyvp!R?|5Pw2In@<z7
z^$UIIA|Zlgsc3+wV!}{xiC{W<;O{zv%%1r?CsU48J_2-^3pG-16)Xgeg&>5Ga0t*R
zHsb_m`+9y7eRe_I5`C!<{%|{jX5eK}sv%4k4xiVr;l%)P)4W6D0PwQnP4tEdt{>z`
z*W5_{{-nh9{MrY=*@$9Giw{}rK)e5~FYDnpzTJ~zBkB9w`1}T`Xnm6)^8McSZP;x4
zHw_S*8)f|84)>Q$86oK8g)w(LD=2_^iXaaanizF}fzBxG80=^wOoSo13e)Ta4WLe_
zD9({B0mL}*a6T<V5eGRGjRgq~f)q-+8a)Br!4OpmP&YDWrVh@mCYkOv7z7F1-LXT1
zk_-@gbkn;!+?3;-*xb&=$y0xuo(WU%<>B}Ka%^j$ko?%9QWSwZH=rm1*YqCv>{Wn<
z{DYu__o_+hD`3~JpVNp4#tOgyi#5#k`q$jhk;0=eVvJpZSI5HIK1r22(;Goju^V5{
z#XZB~2zMo4w)XFcfFy=5l<08fJNu5ysWf>$(c@v%;Ps&UkH5elF(%dIA?}gt4J^KG
zI{|0~h!vtLUOgK@P_yOCjRJ1K=S{+a+!0Ds{3UQ8nMP!3X<G1{W$YR21bFmz;9EEm
z=s}y7Nc2O<PE8mDu!IB^Q%-mfK`Ua}0W+*W&)4|9dDDd0y@)IlS@ek>0#^eHfPlpd
zh`~sHCKS|Bh%;sbSb<_$^15xYCv~D9jTn_T1+b=y(kdS4u@mVMz@{Pygn?5x8&hea
z+kzYs*3Mg!2yuc#W~|8ToE8EO9jt+q(3-$M3>|C?dLC4@hR)eB(jx_+R(nm;vuUk}
zyd=<@HWXW?gC@_pdsxHXAE=23`r!YC?3MEX$ZtH~PYur?fav#!$?F^d^=6L;9?BZ8
zBbJ>sWQrNK%YmfCiHI`BeGcN;r7-*5ytsP#Xo*OYLq&wAHo=$%cnkvpcr)41?fghc
z3F3Um*c)TiXMsN!EkOy!2Poa7pPY$13cLWBRz*k$%fQDZaDpUzhp~J0vH(q>IH9n^
z8WMh-E#gM%)L4wzeW#oNDgbXlkiV*sEX<2DB8sZCE=bZONQ4AX_$U&bf@{9J9kEUm
z0#wZyua=9G9or5M*~EVL2xuAd6k6*S5kx-|vHiM0^awKtPY-nEm#%;cB@$66CWK2m
zmW)c#!Uh0p@=Y5^IO7zUC3#cz5I;gsi3K8%9iQ&7(p|#6Kw<EQa9>Qn=!cY2BNQ5@
z7Vx2P1E;4?Q030<N6_=3mPMfEj&-Aou+mSyVe5L>YBWN^;P{WjpPK(G{W$sOI@%J8
zfZcvv%1_s`fuyV9i74T2creH_&!#$L4FM+m?O-E8n2&ut#&gdoH-kpm;Q^qNQW*uV
zIQ(k^d*^9qgI+#5ZB)$!jB}I`6^^EeRgfd7I~>c^?`e$j<>T7h<}Dmx!LHCY$07lM
zx!1yEP&=x#$a%Rf$KjwrkoKmRx1L2DZ4iq}MTpWVg@Yi0ge8`4tql15LEE2*uR^?C
zp5AkBN#+^n&yjB(cd!u*Ftm^?Wzj`VVFs)a<B{0DUitEr0TZP6eBBC~@f>+M6c_>X
z5aT-}<ItQy_OQLrlFB)F%=6%87oZl<4>lmE7>+uy#ws#GG=X`5gv5bX27A51X1w|y
zY|~#hil=I&|6i6FOe<(59>R!NjD@I#3P^5)3)EzkWIMc!T=j+dzRdIA-;gjRO&m0#
zfcZ)Y_ezMo@&K~}qvawVG9k@K3Xv#?`@PY6lj%7#vC$BDjy*%SBNG?<8~bX|^LPRW
zwFMyM)8uG%A<8c!tBem*#1Qc3#9q{RK3wI)7fGBDdDo>7>A)E`n1o5rkBl9AA^}sp
zNZ62QfC5ID%sMZ9>i`kJ<kXr&>gpW`8IaiRC7Ya%Cu{C-bwisXLhwuTYmn1#^eRQ|
zV!-%AA-g?^lRjS_zLw^9WbO2Pq@2UnASLS#C@4h*1qg@&%6TQA3Ic;1oy?@_c|x)w
z*OYbB$L2OQgyMrFhl`4=+dVq#orKIxl~Hl$rJ$(z8z^&PO@aewP!6DX8WQze8J6=<
zPj9RKjj6<ke=yUb)UUUAJ{2H-7Xt)WkP5g6N5<Gxf%kro;qU<1hqv0{)29?Wl4J&t
zUVb*2Q$7+E&H}+0dPagCL+a(N@}1u7^6C1kgRaPUSOpx6gHCA{T!FD!Y!0Xn;e(v^
z&Ur~Lj4(X?Ga06+q#{X@f+|r=L`Et*@X0sUq38)O%kta+#51CShq!S8*L6UX&EQQS
zCIN%M69`d5$Ww$wp4u;o1MZ&@`5Yc(i4S|<snH-^J*`tlCDxR|8e|$Y#)DjaVY9}1
zVh4Y3Aex^Eae=Nr5Uyho?}1P9pKDFJ0X}&4MuWEiz?q1YgV|Om<&D@OuOJTt-Q4fx
z4Kv;JD1JWhp*pgqDFOiJkPF*=c!RRQ*21I!cL9uxFacif`8wcJ?OVoF*$4;6$OE(2
zzzC6;aRaFibc3cB&&$sj4pN&<FiAci1DJRQvPfzk9P5`OkdInv=}@t=+hUfWq)EiK
zOlYDS#+-dYdh-q+Qch32`u1^fBSC~Cgts7_!^QZMv(dFYS|T^$^}9Fa<M)ZFyoMt%
zA{-?EA(K6)SXdYpp{_H7RH7p^fDJ&-ej9}7#MIkf4TS~gVrUna2)vFxb?ZAzfOM`L
zV4R!LqU)406&etIJr4yu<_Sk((}oC?EI}<;kb6e~Jy4Ddb1FVBr~?CNG8&VZLV*)u
zAsY_Mpcxk)4_81Fe0sIMNdSQq7#kRQ6xr0@Q<5hgI$*daBS4U-hA1!)!5kN(3c9Nb
z0n!MGF2FRPxa^N$b*saiHgACFsFV{(YHE~Fph1YSR)*U^>!=Mm@(PRK8wf#xP%ub=
z;E;$S;M7M?2qcB1asn@SGl1s8Aj+>^aO!Arxi-jZnuAu8X3*4WFhtB%PJ0d|xq0LS
z4gg4R=L}!uKJSfo0(-(gwp<{7xymFD%7iDv{S1d~w-G|8#{XZisK@Wn3LqQ*I3-8q
z)2^SmG$Erpy+of;(tyhvpH-5Rf&ZWI>?wE5IU&S;)vwK8{~JRdFb)VvlT}ntZxhYY
zfd?`mluX0b*|Wpp#~=WZ$pI}C<?2t_;Q;U`Bb<a5kb8z5K3E@ON>7@q2h~M=fSDU-
z=g|AGVhz5^==|4vWOBNBe{(1}Zn)!EnJLOM?v-fjn&5X~i`mOYv0Al;%7lAtLtNV*
zx|<sf#$suUl&Z2UQFvrB7*W2!;e%L<6+l;7BuK5&1%}KP4#aJfCuXqOsEBHUDH;fB
z2u&&%yXpMjud&R~gP$j8bCV1@Q4+FdM~#QW;_^>E$G5>m;Ccx657LRXbn){9x{Z_$
zss^8}!8{?aKu(8`XjGa&<677p1|wV9LTp|`#5~6oboP4Y!Q;VA_d_F)To8ws6ML}-
zX2+93q$EuY1*FiHf{48KX>8I_2p~lPkljORDL}?-p(L1)3&*g#pW_efVmmL`E{O7Q
z?}vP&#4LiW!an4=@usyNnl#_G96=~A;)I%5OyoIPNJM%1c<WxqY=@@F=JUs5fXP%&
z0z+mK^9&4=JDjlsos(aOHcc3!&K<jLgNveIP4MC^ieWemFrDr=$5Fd+u)*1|*$_zK
z43rR}L>n52fIM)NRytvnPYe|S!dZaqLjZ)dGmH<T_S`ifW!qC>5{62_Ldzw}H!K~y
z;A!do00bVxCj;?DsbmP4B7PP~P&Gwv!xy-e1A`U&Ap<@`9N2)N%pj{QiUz#Xx#m9q
zH_bLEJ-|ANxk(O7i5|q%vk|y;$?g>ld7oHd0n4=qM-oYl^c3FS<E2>-ObBsKY_<|2
zT0|X~2@!}JDbNMnJ_A6Dnjm(r7K9N(gaRZDAonm`hyG1}i(OCUB#dj>nS^A@DTT}!
zSV3bL($<J3s}0qsQc9i}a$AdHe1Odj1Q&{TJ&K#okcR{L;o}Sht_&)2^MDc-LECUx
zd2G8u8o=QODQ|Zgd;?B{WZp=naYi$f*qU|RZ-r+_k*-2nkYLRO@=pVmLp;r=0}vsG
zLnxYJ<>NXBa40l_3$_SKdBO$Ifr;P;qlqCzK!iv{kdez=PMu>zsC5|#=?M%qfy^n8
zY=SM427(iN#SN~(gF}gm6$e3%$V@ULVYxA&JB6G?fz((b@o-uw!-GrWD-jT4KD~SL
z2=AnP-dKTfgs__Mh49$nsQHeBz~j{hD-<?*LnIJT>je#10YilvhyjPeg#$~TA}2?n
zQ}*r==@+QWv3PNgAn{vxkdV^zm=WyQ+o1F(al;(ZVDi~H$|Q*QxNRL07;+e(cn6w@
z@StoMb2I>=a6S^DJe}$r2Z<ApF9xhJ5Ti&Vat$DP;ITLw4O%30DX@g^t))TeH(Nr>
zHq|tuGz5tlfubjkK?%{TMQQ?<fyz=+n7}QTf*_I4G%;QP)Zt*zJ{)v3Gf*%L8*Q;u
z5um?K$}}YsBSs+n1HMV_AE)!sNdTCK`LN<f9zce_@!sUR#eW~;c{(H}eUxP9Qcsj&
zNLe%M?eI7oYFFP!|7Jt~lNb8^pmrI5Y$YO8NmT-X%A+Jb8YGfQM^*&^RDG(5f}%9y
zMtjF%vE>W<d;MP3^>lHnRM5S(B6c!_fO{+Ga(S3_+Z2*N*uL}EZZvs<CQZRqYlCsK
zp}-oVV;j04YYD&C7iM74+6X&FT;>rJ(?uy2727;rDh~<U0^DA$yJN1o-D(G!c0gp$
z#s8`Nk_+3*f25dGdzoEF;F23cPb;G4#;16tNNQn@IXBO?U8K&Z%+Jd3dUFbZP>yKq
z=|JnGkoO<SpbyEPuF4YJSaD=6OOe2$OD>PmWu=HX7z(ly)mFla8Up=fhDRpb6G#!L
z7?q8|76iaUtvH66A~Gu&<5~*?3aYBAs;a80;iXkos;a80s;Gj=11=4jq;SKz1_2~d
zBca1Mv=zge(S#6zuTK*f%=MYMSZx|!5al3<0*Hx#DPJ%>m!V#<1At-CznZ!;`VQqk
zW6#se-#I9HVucONbN+ll>LuR`x)jMk(Eu4ES`M=X$>@N3eHbogX!fay4sMReXBd-u
zi`^=Rce~@aN2$Y<KOd2|u?Nkd4{($+K#XVtQ^0z}Jn{j%4}Y`s+CyRrR3YCX&X*Zb
z?e?uO18Vx^I!jcR5W-9lVbun?3z-M94}6KHli{e=Zq;cN-mwoQJP*6eG;z}vRS{8g
z0nkFj3^IvA$jNnlxNr0KYh=`#bc>xHk@RiG<wuTcf_ZZ4$10pUpfn-s9=t$3XSdX3
zoz(98F&_TlyBYxvsl%<MhqQK-oMNgWKmbr}z6q9~5GKB@y-42XG+(%ZcFKZjTmzjv
zAD+s82j-%EX&_>K3948$e*2$2+tU&R`M)`V@F0c=h=w8vA`l2dA|Zi-4`Ckp9F*N4
zZB<oO1FxqIh_z-iF48=Xcjf#T4|JknM?U->;3Zx}I)8*aMHJfDN#1;&e+CmntW!qq
z0f&ld4hhPj>?DYE`7n<p$w2wTg|KJ|A%Mi#P|jG=Dt~+@XVZ#~(F~$AgGe$+w1OW1
zp(Vv2^Aqv?1Y({$0|<Vz&y&a@^uI@86QV=%7<baAW03r!?G4JEuyi}dC+b-0?rN|w
zJu|OH8jDy)Ha4Rp3=>h5<)5HOgRwx;{uvQVw*@+d(+Fol4^SLmIqCO(9wE%Upm@9d
zTOxW#(2lokA0J3SUhRv;XvIMAo=7qull$=Ky_;n*-}y&R^dDGsCXn$Tt?coTXo%hM
z%2Uk+Dnv8n9vijY;5df&ak&FX>$WSA5gzsC&J?UNHY1EWlNCl(eVNhbr$U^#LD7M%
zZ3hFP*nt4uIEM7n7MmMU{a{r_C)I*xsyDH4w9%q*6OoM05ClmFT+}u&Z-B;QCIK&9
zb$2k>b`zk4GlA+d6Ab0Thu|-A{VWCV#P>=1WISUH_&EQ4MPdi<-Q`~<<vt$i-mn@s
z9+w9vB|n5ejvdjlL?Am-NPa+LaCPi|3UBb7dBLg2`iisdj9Gy8`n;bb)Eyq^ugi`*
zwsUisL8<jH(;L?e-G$*0;|3DbOiei8ZBdtWg?QS>KR4IU7Ja_|mBW}Q)BD^QydPf(
zZH!M<xggXkN+%m*45MJ6SSr#{q=QCy8#SPj&+TEaX`x1N4B3VT^~Y@5JBh1#jRh12
zNQbmAK1Lu;16qxU14EG`Br6Tr<WOik0!k@SUBVrQ%4bo;7dRLiPC#@f#rlaqv+w_5
z{<DuCXOCsVDBpp>uOMF;5Yqbb4XTf0*#q4=9+#YJtPEf<OndM;_yQYA0W^nq6buJR
zEV{_>I@`4u9uN&8plIkr9rV~9vR*(SG>#L3NtuPWv?UQK64Jj1zm9;~=jQ;NNHmgk
zaf^sLl7_<=kzOPiyUy++o^xBC^yFN4>g(=A9#6gHghpl&5ivQKL`0mBy^hWxqH;p;
zXyAuTAQ*rWem>gsjDvGPP`;Z`)Fzz_rqm;3831I8_`{&J9Xh|O;r4i$W*9V)e6VC8
zL3mhQ<IIO96F@tJgW!Nd8Vz$Oe~L_!fc%(e>-Xm1-9=EEl%Xi-dNb47YuJ22<{s4&
zQ`DF)1cn4F%0z(!?j*DXI4DpUP{B?LfRS?<fEv_ctp=Ad5d@G(hCuiv22BAcp6Jkj
z+JAD8J|)@PiO8CQE1XGjLgCV4bvSqlGeNB#!XFo`K<5D%s}ea-bWrWa)0Bc8gkpH>
z5bJ6kwYa3AD&SgiDTRRs+iweK(`k$|A#jsire{1l#N($x2z5;AP-#MTS-~d*#`N$U
z2e)Ei5d_dXDN3!*5)`aKkmNDGIu!5fQU81?`Kkk|N7AOuC+0Q!O16N*VN5W!HDnHF
z0vx%fnJgqi6&S9mLF%QJA@W0vKdMS{A-W%F9hgObi0*L6VfsIRIeQcWBqq`ifdsJw
zq)c5x0TA&EhhR230El11vkrz(b|7%#A))|7Hj_iW0(G+hC*#oqA!7toi7keJd24Xi
z6D7lQYAN6iK&jCJIl!EdfI{d)YD%0RMlKP-0K`1t<IgjKwy`Og1ri_=gE)7Zjcs2B
z04<1Zc(Erm5|E0UVlEh%gAE!&DUAp~pv-go=lPT#&vbxsfqct9@kIto1ix%4@PL1Q
z53UQo52j(dqAW3gORv%XAGyytx8~98KSl|>5<{$ZQT)(`gyeYozE8K-eP!-=Qhe!G
z!Qxsjz7K*iQWO6(M1DD!{}>q(HWQs?NM1y5D#7>QVwo=bvolB$5WvY!G{XxkEQm7x
zGNhyoeLKVaJi4J~avXJy4@BW9&v5B9VUTF{3VEpT5wbW#py+!Q=9DN-<TwmSM5aC%
zRf6S<l0z!$tP&34HKaK|yOCITdPjpt>;>|ai2;0skxYV-LP$iyQ8GYCWJ5v7>kSBT
zL;?&QuE)$D2_=x<+rn`{`RDErH8Kbq(D^OgU5zrB4)uG7GN?i_8h&D8SZ+?FJC!2H
z_0VC`AH2{!;lS1jkT`MSJf($1L_PnV>R($AlOL;0Nv4_9B)DOReKJ0YX#MPdXOe2d
z$TlxTL2J7}7;ln7CKwK!K2Apuoa_O@9m8N?If_Gf-B3J&Ak4y=2qj&h6~u{1h+D{<
z4?5U#I!@rnPoUTn5`Y>+8WG|gjVPLFCT4;Kh)5-jv4F@h&|}PaLC7@vaVMNuHM6Hm
ze&)2r%wXD3g!N&jER<e7FeT@{L1vvrH0wtvjbyS6L5TzypdKNzBYcDbq(vBL^heN<
z1A%$X0z1*j7)^MNPTZQCy1}``Xl1~F=~9JMusqpSveL~bTIt}=lJZLZLi6$?bIuU&
z<K7dJ7}$?~rqXVKL6RGI_TVW&T1#C7Vn>O(0~U`ws5@*nfV)DxEU>P|lL%6HVvCCw
z4=8hbg(2K#(DI^N3YSlM<N!py;CXjLXPpc^4{r`Cc9EUr#%-6NLr6;yILXKaQQSIp
zMc#uQ6$1Oz2t?2lgQ*Peo<5ueLF#vX5$hO)fNNo{e77j~ia7`jiAGik><;H#>jpfz
z!ZFp+K%zzf94=*EXbOb}2#d(=$mDq@UW=KDpzMY0vt|LpU6`)5)etk<8b@5&*bg#{
z6NhZE!^AmXxWzLl!ypM_3TkR?X3U53dk4>3s^&wR0961xiOQtE0N9LW&Q7w`Vqj<2
zyXN`>4rB+w>4oebL!r{441lzBr+$e*qf9;K9(d|H8GuEQlFeWkmjI|oz&tDuJWQte
zKo~9{BpMJ=L?|g3=u!z9X?xPJDk9Zmd&Rm9kX>|m{vWuA@@=5{hCV1mvF|?~kEscL
z1qY|qpz(ubkln>ZMga$Cp}?RDgl+zyIA5G+@!&P{dNo)$2H7Phl2(@u!9#Gmb1|Y7
zh`lHE3Suf1O(`1W(*=1S&-XfjgkQTJG~Prilbnp4uoCGREpUkE$XF|QdF9N;2pkWP
z33y58yMUAo-)O3;O9I%j4v=!+l!6Y;D3~_epQrzMus%llawc{eimey5hGFC5tjKiO
zC`P11%K)I0uzRNpB^+>aao^%r2p%}{=O+-*JtwkubvYZ+W88Lnhia1q4s)_-{jZ=z
z<R%kk*@Qm!vFUTT2E>4Nc=yBVg%0TkkF>|v9TKatUvlSdZy|Okx5)Q+W4PyM6I_$G
zC(Xbxc&8VV=o8=-_uo-!{0tcgWIB*OvSLKoc=j|IWBXr4`vZOMN*GvgvTq*98bI7*
zE*I&t{X3M&wt)#B{lBQtA7|Ntu?#>^CodQTMIZRpRMi2Js6s$^Uw83lNN=1GLFkc*
ziA0DR5C)YLDWFD$RnS@k0`k#go3*?(F2ID*C6)w<g@iDY6$Jr8R`Uh4kYa34?Fo`)
zq(IGU$4*Zq2FU`2XefC%fvs4eIwVMt8UP#(B)={Os6F*4a!2*%CrmKRSt*GMeP)+u
z$?F^eag*dBJ_sNl{y9h_`Z#@cTNmoQV@4VZKw3tAW%c9|Gyo_Fsj!AG)5*=<1JegG
z{!?SmKMm;O8`w{8bHVwLk>xZc6B~Un{vINKX1o5N!FZB-AiPXmPf$X92v<P~2|JYU
zt$HTIL9Ee6l-8X&fv37U-Li@(qLXSFn7b?>Wl(`|CH(}ZlXe4@n==_M1{$m%f_J0q
z-%iYnJefx#x@TZG!cOwxgeTj^b&%uB%Mv_5*MsThV{{+Xq8T4KR%nC7^TV$wJT|HG
zA@jo5FoUq@AY|vPla8>!Z&P=7tYJDQi?E9s1cTzf+Xxw-bfC|Qubn~@$=R9aeR#y}
zlV$j&;J^lr+0lL*Bq-FP&|ZfWlz|BliQ>WqXd3QL?6QCDXezBa5Kn9xOQ1UMUj~Pd
zcG*6Po!lj4ngcyYY$c&tJ99?ZmzMwvl>Dop|G|?8GX<yePy8=`nK3;n>2U*uhy}YL
z>mx)olmdhnK}#Si5*%)TET>;-CtXfQZja+I7YYj)dy760%nU@*AyZ!um*P5H-NH|h
z(VP%Rp?PY-Hz#Ld>9R83b|E9lPBiQC29*XKKO(BTNt+@`CV3So?rX30%?F+SOwK1V
zszfTPs-mi@s;a1ps;dEmBBH9IsZWf1Kd;`ARF%d~Gp8={$S2JLXiYg#VJ^JTC5Nj4
z79fM%3j&CM!82+A^dE86@s3>I;_b=6Iq7AFhmiDD%mXm&=5#Lv@;2IE_@PGY*_|~s
z15F5V<X|~xD#Fu19_NIHK-_UvZ*BmG4>}sF+-x@k9a`8h{sYaIR&VVG+I>5Zzj;E2
z2i!^ceR=pK+UFC$VO>HdDE>dLl2F&-m@9FW!S`5bHV*(#^AJC0yZv9d8-MMN>QEB@
zBp6H{wK4d`2|Zpe@9mAdsq`h7IYJDWm;Te}=lv((;RpCUkIT#l!1DO$U(R>V+Qk|b
zr3_ZcCKP**q5<@U0m~s!{U`>Xqf=rUeCbkV9k3A3?EFvA;b=C9phzej2|)@73YCB~
zQ5}QyalQ@Yb@#EDMrQ-1Bx#2upXpz`xotfSrx)RET$)j?C8tR`7#h`(BZUC92w;KP
zA_wiYn((4_oa9rpxlGauzsdRX_5P|BGIQWUpvYMzoG~oO?jb?}`b6LjDYdM7o>tqd
zHbgXx;)^FfT0Msr#0oCqvjmI*Wv!XYNFr@BupreDRD^@837-l>cW`p}BvK-Q1@1?3
zhNt$1ri_15n8~<AmmT02X62!$MMjc_z=Vb~0vKUZgQE#))BX41>%qxz5y=Pv;@rm}
zKUAu7&pInQ$85piL!zzm!A6WAW;wx>EWp6IVM(%3$ck_Q7@8wS6>F=qY16cT%<k!&
zK1VClJm?Jv<_Vlg0!k}}vD@^@)11j*9vb&<9Zy~xdTCLp(AsIjO%#RA0G3dyL<s^M
zLI#FS5|pyTclK;gF;ATH6EtD;txl@Mks+jDXZ3s6b>oR0Qw8R7EIX??Ns~z^0DAaA
zWXmTec*vc)8HZ#qXeQjSXmHs#JOKmjIr`m~r{?%{Cz?-G?<_3wI<{^K62QR7KG-xQ
zA*rCDZV14k&{-ow(o)hGB5f#`unF3Abpag!V1nvhL7u)xiFlP3C<FG;fv92*fGAFj
zv+U=dCZMW7;Cb(WcT=>9vmEj;@QN(-?Z&tkMX|xNcSarr5z&pHMJUElLrheZd>keH
zA*{)AaR`CU4yYXa*#+?NB$3>7ArCIy`duAH9f1R)2M7*EO$*cD3N#{$Du|2%dYEFv
zt&_tPSw#?8%?Z*nLdV0<btaf0-Tl-AJ*zn`4!RyhAJ9MHPkSK791yh&awK^OF6cd@
z(+Ii2fKAdK(E>!;L<(;#4!hSKVRMq3*`QMi0|f|^(Y^T9;^0`9F$}?nsQuQh`2u#t
zr(d^v3>}!lZ3rF+!OxT-4}zvR>&y6gzNVF;5;;A9WM&qO8*ZM1Id5PZzhGMw05BYw
zO|+gNHk?rd=iY2>vvATmGeyY0L>yTQDFPn76ug>MQ}1+d=)n#<E7Cu))A91Jr^JQ>
z*)G6{X}WpvpzqY}ERa13D~}uNd>pV(7+sNXVTyokd;`a|b=mV?4u$X5e6nLx5Sp6E
z98?%E%s{<<U*p&&;bDm)A_4(nxv+32e?Kw@xsqpK>#-*6zMWbA;Qo@*g)9g`apW-S
zigQO_lmHzN3BY%NG0Z4R2nck+i69eX5)1%f9;IYsWPn5J2q@GOB+E1OL=lDEiD-a#
zGmgosb|&G0f!Ow*Cn4bYY~JJ9i;@(DGE0!0R2njl`b_PL26`W1%5s1|i=eJTFw9q^
zW-6z=X-Y!gFCCyeG<rDh0yJWTLbFLI6GVr<=6ZxSfewdx^H6I-95NgXp8Nhg2Gb;v
z?<SxJ01ja7NfFSzaZ`2N$IN+@-5TyEQVx;f0McR8E)oRDYvCIIEHN=VsHCL`(NloL
zSl9&$c#MWWj%f@cVUf4afYL=ZIihUT)uSvx!T8&X*LQK*;ep6HMZ-=U8gPRXlUw+)
zPjW!>1sy5bz>$OQXBxxeFarg=;E8=8eW8f#j(q+b4uEG)2INd$mjf6fL7qYJA@7+r
z6hlylJd&W~6zo!?d@h0#0<Ci7E>DusG#t998fGG(T1$<XrlMTZT@pG(EPUW-?UiB?
z4Y(79VpNU{M{6cnNx6Kop5Wn?T0@e143T#{Lt=8rmL?8N942+igG5ZvQfy9G4aox&
zYBsqO?m7_fhfsT;)46;h{?Se1e8Ow$L4VJK?unH+!LX2@yuZ_`BEt-l5*7$ximGB@
zBx0JZJ*0a3e!U<Yq*ITt58%!xL;i>4IpmV<QDVfnOaw4~^e9cxHAWjC15%IN9fB-u
zy1yE%FZ=`!A6b%F50BTeWDm}e?n%!SPD2l?|D-O}U6BlV|6D$!6h|Bpn_^CJuE^kl
z@)2}1#VyJ?+U!oW<Agt_Mq&oQjk05KQy{^E=C2Su<CoF^9%OAK^a0XD2WaII^AS}r
zsu4BU7%(}%vot1sKU3?lbr_#+#eJN1>G}=F&1hMFxwWP#1QA$JJV?3X&fg1U;Z0&t
zECh<K6iU?o?)~V6qB0f~BDJX|VP;G+g&(_xv_tH0rP?2R{<$reUG)<#*yx&jPCR9%
zA^gG00|+533@``7?DK%+3~0U(vHDFGahKu$et2Q%4}W&G0aGSJeE%tK{$(VRNX;@}
z;tld755@y}g)G?GkB+=_Hfpd-Hvmxw>i)kOt(YWi0_!`-lSC&g)O=yFppM+i$&RMM
zfdbjSn1;I-Lsz5B*x(+6GsVHjiJyqya7;8(@;doyXnp?0RaMu9`77P|FgnRxMCFe@
zj;~t)ZkKOj7!K%7iop=|^7K5ffOmndUhhYq-vwAdo8?e%^z|I)4hAZm;dQX7a1N{j
zVK%oacUVvq=o+VvX(~I1K-iu$slQO(y_OABh%=#8B=PQ{s*`phhYw?YXDZO@<lGXf
zoOcT95IV%t5ts)*!0qN^^<H~89tW#D*qa<A>jDfc7^|Ry<c)#f4$)dFB8-}$$WtZQ
zBeosKCOK`<o&p}Y;ChAyFkb-r*30){&;tes45_zc+xqUy7!+eIwC+M1L<5?iN*MgS
zLQDe~7ie%}i{4?|Aoy!MBsvQ6*3O0D1CK<~kITGJKLn}9+yL0XLQ&dG`3~R*tpU5B
z;D!bnmMCOG;22?D*`)ZFa|cMX-{eSnd>z10dHUZU5b04lE_KOkX%I}vhC~X0o1L6^
z`E7kLsiwUUAsA>$CwE-&!8!vV2`D>}OrhA83WTB{iZ)S0Z;4^%a;S^yojZ#qEDAAm
z^fd4}<PIJ*2f%;_gCG`@yEH&M1K47ofFWrLQW7>35*oO<2q$0^1TR2CsZV4I_Xguq
z|L>1lL_tbE*vWq|QNfGVODJFOgZb`b{#L)b2{F!G>>YwLDw1fkGEk~?-|vw7_5J=D
zUb5btkKQA+k21TRK}d`c$mqh(@;=a@_N3$C?h8C)JI$8^{J7`~#Mymt>Dx>jVr24{
zh&98UQ{*=%u+|)48d8L4Mu6<Urb|>d2t!n*Q~X}A_JCt>O#t_v=@Y&^?*QNWw_^K<
zPIwlFtj7eyFe-4IM2sWA*D^wAlH&1GM5G(G;o+y@-IkG&7dV06a6lfrX*c>KfDjyb
zjscjsT=@pW>ntSMA*nEfQWZ@dwTYTAU%OmubEpbe5D6qCAcT>jPOM1+u1M`^#vXQT
z$z5tLOz-+Ow7C)KlrO9<9I8C2w;6R9@gO1Kd_$NBs3syNNt20R3ScmZiDXEA;K9NO
zmXIYSdX+~$yr3k3_Clg?LHPm>j0j>}Qv(z+h>*QPi99mBQ1a<H{Q$wy2+;pCf!EA<
z!O}C&1q2eC1g{|0BcLb(0D-a$1_8-Kry+I{#E%vP5Q$U(Ibt@dLtAuVz->Uoc#|5N
z(d?`2ydYc0VEV{5DaQ!nc%P$hh_A1nUr_;nim0)4iSRo4{xf_5_kXiJ=#%IiOMy`r
zxxsr+H!hBymL#3rU3O2lU*8CM0ouI&r`RXt5&M20$0U+*hs#=eamO6;@i}~*`6Cd0
zL5HR4GItZR)jZ*YyV`eO4Zy*Pfmo`l;zRP2rJRNa$oOrs!U4HSGLa14+QV)H)DI2Y
zG<!Oc7_&u;Tm&J?s=9Bbh&Q4E?IE$8rnX6Di8Rcv6NUQC7_(Aznwc}P6iS^_VrMKy
zc7S=)GzM~Af>q)TE=ysdE&$CgTmjU<V42Kx+KdsZtxc?0i_ig(4tr_Z&Atz!9w^cv
za|n2Jt+Q*`>@TTyyI(B^jd=$zwB992dH9{jcH)ZNr$C3Se~~CJli<cD-}L9pFLbZp
z{Xf#H69?}@wSKBUV3KM{`vOEK8Gn>d>Uczdj$j1?`=xy7eL|ywxRNKxp1%+Heghq{
zf&45uXkWyj;`KZErDO=CZ`<yZ#xi|ZP<8!N;Y2H-^_~8$oG_jJh9pY?{m|$6faeVP
zjF~;;NC+@R=MK0(Pbw!YDn(VUl|UV`h;l+)IfX+|0r|OadgqKa+Hpu%2oxEJr$$gS
z)4M=$R!>-EAav|LW8(RP$@P7Cp{i;nc%Jz)S))WC$@fF$t&2-X+Un*Dn*&O7r4udv
zwG)<tbconWfLMW?0q)$j6!_2Fe(bGPKi&Ij_9SU}ubmVM#3^#4V7A~X303tokO&lT
z6o_>}0#rguPbBVI9~dMp<Y2U6@eEK&IWq`2ifACcG^@g>Y9sRT<HU-=4goR4;)fhS
znvMva*bF}D6OYxQ1M}sv^r(KyyGHl2fmI6Z&=4U35VBsGyEd`Zt87t??(zKJcjfIm
z^Yi1)Ch$4tSp`FsgjEOD=av`dzzKiB7Yf3-M69_I&s`4BrgH1gOn%On=*TX)%ypcR
z98mOjX3zJ|gj-=Ci3^$AIm9XBqT|wi7o^e<=gUUs7^A~_TZ*A-99GI&c$C;QPLg#~
zmrgt9O`O7;K8~pBVa$YMP`a;!jZI;uJS&PGmyFLrXDjVwpMZkuH3P5AXi$ZVkB$Y@
zNK7sa!;u`;rRh<F;!zL;z)>h8@E>|DqOG)YjmgRt5fV7-7Ul=i!EoLivfHsihmbR}
z6i=%55p6zr7mQfn4)8B+YiV<UP1DVbBqk6D!^`v@mj_|6i4nmDmi36}Pc5pQxDOHa
zzJTrMI1mUL072hqeEFP&u2oix$2}p;+>nP3%w75>Zq&K^I*au?;ReV@4JFx$E~^Nl
z@lf+JZK?O{Na}a~L6goz+#-dr`m-NTVQ#}?3K1i#F|7>Mk)GrSZ%%pb#E25Z5ws&>
z6}_3rq!VemeSLxXMs*CPjmg2|?L0v!OTjzmctLr<a8qOPZ;<F3G(erT76Sp81irWh
z0DLhXgFqGSLx2|$snAdcflo!})HZmFcbj%ZcAd%wjziZEV+_laDJd+3F*0iK9T-Fe
zO7xZ>KtRwHkqrfusX=;xNN>79^B^3L?+*BLu_b?mtA*W`EQoWU`m7H~2ndWw(Lzj6
z4N#7eW&7#^gfIqwx2)0uAb%J2U?0!h7L{a;<^Z84U?nDu6rgE1h7MqpwxQJR<bA;G
zA}s#c_xs*KJAnM^7X{fsd_G(DeFw62+PZp<L-iDJCoKu^PDDLp4kzxMkVLT<ZEPYq
z>~=N@dGHYpuwcAc9S?L8<b^684%5Dazow64^ariSB-!X7`AVjPus$B02I!D>E-1y=
zPif?60olSQH)2I4OV4Ey>>x|{z{B0FetYPGPzgc)=~tj2`AJmmAat%u7^&|V0Ze3v
zFfeJ%3QT5f#>{gtVq}Jy6qtrU+=+}#ql9h^$)W=%Yy|DZ#vo$|F$hWaWrKt<F$^rk
z#4#{!h@xf?#uo+00YFhiL`49Alu&|-1ObsU1alz4q#-|w6POLaX51l>W<V!wtQeJy
zv5^u&A&$V{Dbv>l9b~|f6pOMO;NxXk<C+s#3{GRLP{><fbQ%PS0IISS!6E`7_d=LN
z&_q;3LrD=dMG@?bh~_c&!HmdtF(z9&)~aTzYO0E&sH!TYuDfj*K>n#*g(4ynl!%CF
z2#Ay^0w}IA!YU|=B6#L8MAHORS8f=^K@}AhR8=hzJ?tVTqEv}Mq8wnWL{(h0Y|yHx
zs;Y*SONynSXln&pQ$v60<Mv_`!hHVO;SKt}@uPFdL+AtEbbUT%_(bzI5i7vKnE2^l
zEgmrT`V?@*FgW;BGcaQPE6{h)bh<)v5TonB!{^Mf$vwzQ>;<X3G7h^<-5+7NH>Ic<
zgdz?SC`Z9J{E?u*`6{fR<p<e15Uiqm$<M!x%-qt59wSkLa`>L$Kn^*5f*hQm2_DCX
zOX^PsOMMT29SWo6?#$iEq`k2u)njcjDu6X*Hi5`E_|%+ql_e3_G$r)glRn;h7AGCT
zbPz2vw#;WWffPt!h$n?rQ4sG4;wVChL+d%<oL<e86ruTkB(TuoJ(t2Aga9v3L%XCS
zxW&QzKBMjYpWz!Ejs35%h4qs6gf4jB&;6GKcHb+xQ>@1nC~rs1Xo6__LqKdzE3p@a
zibu+0lR(GN8H|L%WjKZqO2Qw}A%Xd(hZVL)RAIragHD{rKp}NGBp!#xeT<C4dqN#<
zUu?noz`+A~z|beD>*sc4v#!DJ5@66eC))62S~@cs>8G!mG&>+-@y-P<17t1;KTrpO
zq~Yz@Lp0tJ{Xji*c3}HB(2MmO2+dMNtqUYb2ZH0Ux25#pO~MC*j{GyU&`Apt(X-6*
zUOd4%8;!&^00>UFaJfOHfaDM^b;zN-CT&2x{%{Uj?>C!6V?YbD*?`WQqSFP;fzU5M
zv&8Yh?)z>XE*#l4)XifC$l*%Rj))}bcJL*D)2?&3TPWe<j1#bWIEM9mGE3C$17il}
zyf8Z8EH`#83MitKQAHF{MHEp-0AO^1*KBqK%+CAq4iMDc16XJd*{XIVk{W1d2KpNe
zT#SVTYq&0}q8#bL$!$JJ<c<vJgQ1h9-#i-ws2n@z@Cgzh`Ha>dz7$T!=l6STWAn?2
z5%y+K5^R7l3J4%58ELj=O%ZCql8UAYbrcW6bum9#BZRt~A_94gR|yz33&2btqYbl5
zxeqe=%rm@1aPuY(h#{Zl%mk<D-VX1B*!}%7jt}S3VGGF~7peu-=?{qyj2H}*CdfFq
z_^70vf=Fp*C8AS5sWn}wNAvd=V~UG^?jttDJ`HW^vG8HYNBYv<!(;u-D(?wfZ7#}M
zs+D2}pR^tvN-#l#KcBCm{cdMiZ{U6Y(dFCq>_+D63owWoASho5tPx2czye+=@nizS
z_z$U9?vV6{ecV8wv;=AW#Qf*4XRwp$0uILo(<9^&fCdTc{V1<KKbyx+#25XNc9a9w
z%8#MZDtvDJ{y+3a&)@nhPwO`W-kiL^2c`&;SH(wRJuuV-G|~_d%SjMKM8v|AEL4yo
z(bSBI=EO2VyMX)mmKbb?7$^0rXiN`pf^UOk5(yA5h-42WFn5Q40U(bMArl}Dlb~==
z;D>RvG6>`l8u>*4bl>jnu#VQSUD6P70f}&gxvwK<L(U?tkhh{CquwN#?5U3n7t(%v
zTFh}X3{?MA86APr9!L3e&GCcX&LUIoc(NQ!5u#Inmf_K`@_GB<^BZ~0EeQ6Z)<X(p
zh;%}^DFlM~`kF&TxUzSfxsGrShn$4&LJkB3JWN&UMC1dwimIp0&E@dy;D=m^?+zo>
z1UnNzCtEK^vN}ud56Ss@!-jz6MC$-`sv|*A0lakR7Ims-=D!?s6dfP$N+6g(1JH8|
zu7;<~Ck<=I*HWbCM4Jg#W(Q7^9D?|8pl!C;83E!VegTmKLHFX;2LfU|c2c{W1McsN
zkI+hyC=???0B_5b4IUZbrmq7RY(Vc9J!k{8d+(nbK7&ARehb5bucv|7sQ@7ji15hQ
zSpf_44iyOU!EDt4p{__gzWt793DBc}!L~Vx>n%{B=l)J|t{Of4RHuRfCqV(-qe$?b
zINH<chY0@+^nO5aB$u2B2TD-vn#3ewgHy6(k|lwqp_HP8LrnrPK!J!DKtV8UB{OCy
z1^^g&dw=Up{NXRV{_Gwg8l+EO&-_0G9hE8$-AWJ!LYNX<helgeFnAzKZl}m&FhcW7
z3FLVk`()C<pau+*`_tS7$CJx;^)^Cz&>!}DOWua=TgT6#1JrkJ>_f@*udqE}k8P(X
zs`ykjQ~|I)?tsD9Y1g41mS%{Vre-dg=i7K_0~x6y5I;$TYgJYI{>wZK;TTrul?QZD
z{1_b=fHcr?0MB0l^?{(Gg9Q>JAkwlYFbVi>`4s#{wWt3gJ7?bm`A~s80{=ungZiw!
zNHDl>)_e3btN{tYX;x51*g!L>{*(HU_c}hrjRU3@%>fU0=+(FF;=q76+N59At|lzu
z!hHpV8EADyD;9P71~9H8{eT(3Xk=y~coSx(D>s!&u(r}~ngYyM`xDMqrHcb2Ok;=>
zRY1UHJ)$6<1FerZY988_f;*o-H3VK}6wR>v`gHWDE;X*)CzZJ8#KMIFs98)cpY{gW
zPhX?ex2MyKyp#t&Q|faexs#f)PMnE-FiNEr5g3Xhv)c=^ro^D&87hjRVkju0D1@Mc
zst%`aGeZ(Ik^p9fHKV4AjsGXXau8_47^Cbb`?U|io+-zvxnOO*Oc3}<W`<6`E;?QB
z9<n#<_K!NEDu|i(biV>s_CP+b&FVvcMRku$;lLy0nn02dSU^PzU1T|YJKO_axz2MT
zX#g{v=h2x8NeWmL-kTnUIs0@$RG$36n24$(h9RPWw(_S5(!6U}a79p6`;a)3Qs}BM
zpop+UQFqv@Q5Gc}R%AgWkr2g41_n`3K@frwIw3z`pa8%(0Yy_ng55ZIa8n71f*`1Z
zsv@I<2P{rI>vgouxiVV<GQy@NDw3kQRI?wLFFVjs!$GDBs)Cv{svFGiL(+-K5u2uJ
zC8&y7CMbx(5kyl>!%N5)yHM0188qPV;Y<}2RRTd#a>ph#fhIAG!W<1M!T`aej;bQl
zQ|$CUh4uLw{W)%TN7ycbpb+@`t^S6O5a3jhpHUbxT0{`zK}j9VbHfAT*x&~<+72U-
zgegp8!cuTfL`E#gEy5(bCqnCEkv2Hy$vVomU~~7D9v^>_n%`WGyceW>Av=-={LWBu
zWCO@L@I#k4FsLB$A$kYEA@JZl`-#LFRF48MX<fpa9T*`J7njBUO`*t)sGOj3LE!b*
zTpWV-%nTuMk&_Gr@8&vmGkZp#z#q_kdf2&nG~XTpl0gIs1h261HL(Ca8HiAor1LbV
zE{yH|2ig8#!OkDw))nAwAr*l4sBgG`KU0Dal2Z_3$%{OCzsLMRBM*Y2C%`y`S5VV)
z2TVG#<4E>n$teMF_lnw-vk)ADGo=)r3N*6284kzA&{i6>cXsQ5H+Sj&D+9yAm~8-M
z`(!2)BVsB{?R@{+RX}9m1A)m@1_e+jt)U19k~0-v4gQh&W*NrBN=3p7zxTn7V(d*t
zd3I1Iw}b7PPt}|dhSP|hYQ*oH<NLKgz<UR`q~Mh7g8(F8zeL3HhT&xtRA~`x@?-wh
zq){>!jpAS-$G>+?46;Tb9=?)b=u9MCY~1klX1$*d+@N5&X2>&#m}$9@09I8E%Li}x
zq#@|Q=%tD=#9b1EiRgKm%W*t{0Quo|>@mfLfAg+D16*Ubz~u7X*6-wpw&#+7|Lj5k
z5&m!2{xF_I=b*0jsJHWHa(<7PpmDGLTZ|w<2Ud@z-G|mj-Ord9yit`eepJycw$Tvl
zTBn+yUQ@&Wjo3zt*9z-vN>>FCA(x&tTONKYI<A@>n|~00>_rc)`jNyflGovOb0H=f
zvS1q#pBvOOH3G)%(>U>%14V^czSth_5DY{jX&S=A2nkE>pa(F6pj0!sE^~~?Z(RyX
zI%v36T~Z&P^6J((04OkybV~vv__8AeN9jO_Hw~P8h8~Y#AO9oMSp<Vqhls0qfPwV-
zYvHT?pe%eNA}QG*5Rcx#=C2u<ndPDgnvp?c2XZW6k`U4kLuk$Dw{7>%fxd+wzPE(-
zp+7^>ft+WMa;e3Fh8e^Gghzp-;f=Q!mA<dW+g?!-<W>x1(%kig2`|+&QWsEhAi%hv
z#t8|r?ND1Fq=JjY%&zt3t|wU_{#eRyQCcp=L%B$XO*$tD3WF+fqRQFNEg1T^;h1-v
z)Mf?(JE5VF!WU63sX4S+L5mC1Zyt*N=4$@!RT*OxHIYXB;=n%0!!TgNvSl`ijZGFo
z0dN&RHPk`Wz3L4VilIY|2RBQ-{FSyeFu6#WCF}e_8(rR~TPW$w)ju3|C1R)cTH%{@
zHQD!#b&WvPNWn0aC_!n%iOyZUpS#b2v9Fod+z&a}e53zYEJp*>KhS?bv;gJH{CI~1
z3Hl(oY9FeO)DrzkHLy*0ja?fXoAdoiBlFnT<jKN3K07(aFHrktF!vbxKiw$7^pK+`
zjUKVBr3D$u=gE|0&k4kdXu^o%%BMWTNebv1CbFBc<m!hzIw=n_dS%oueEXt#`eB0i
zoD?9;a<`CfwC<W;I>}~LZ7v6K{_y_r{%_s>IrlscKpM%<>F_;8+cPbUY>wMV&in8`
z9?sO(wGhm#ViM30fFA2;ADWL}FAS$zVgbJ#S(JdKnV1YmCV-AX?8_X>k)*lG;_A>v
z1XKYYZ{{r}MNwC$WFJ=cPSXdUdCcLBAnmo2Y#N@Q5QHd_-oB#0v*6y^;&)(p(}r>O
zN_GZi!#JkmpAd6Iqn7#PW1pn%-hM7Ye7k+xk{WMD5S`$bI+S7?mjo5?CoY!hVN?+?
zGigi5soi9C?|^WaF3p%z(?qESe&AsNh{*BO-At_T2M!is9!e5Q5=s@^B%?7v$Pg^F
z>C;Z}t9_IKOhy9%&9hAMOUS5znnQ2{i?SS4ais?t6P;KkJV@dcF<J!kM`=`+kp%g3
zrix(rzCVLU&(Fu!ddr6JWCjjo1DXM#G(2a?263LdToHyNHzrV^U>fcF`LqjC)Z=b)
zqbNLY*b>ky8}o?||9vnTP+Bahf@$7Hs&m9lTGxeC`v`3wv!(9z>~WLMQd3vX7Zfd&
zyJFuaWR>-MdoXY*sIv@89=#bF%)l(Tn3w69e`5m&hBUbq_A%PTjtm&|1MMMHBZ~mS
zBTR*8G>q6VP1<!4szWB;pi$JJ#Rco^7B^!P)gl5Uc4lE7vq_j19IuMJBvD3>dEdF+
z4yS)BCsU?}1dhD2STNxh3koZccmz3-VUwQc7<1=Dt^6FGXL;56>Zh~9%}Ma!Am^XY
z$5^lvB?pFL<%4gBZsP1ZX9)_(9x*xU8Vlf0Zv({f$>R?mR8BZL`E~NnY#gF)a9BO?
zfH~+vpeE97%F2KW3FN7X4;ST+Hi_G|-dp>SfE^TOVdpUDC=QF?kZg_|9<ApCxuNUV
zXD6=DhiR_nCBqV?3SeXoM~&!h4o3h2stFf_B)ONb<>m9^kj85}l`ntPsWt)Z7E%vU
zwZf7x1PqC6!%r+THi5wzsNjQ6h+{R_U3S1JUgRCo+P-9V=VOu{ULGLGZ4OpKRX94Z
z_ZYjxhQyDdcOG%<1EmL~2zdB!&rgAz0X+C8pSS_;$J1Dc=MHDHyc4uU)4=j8zHW6H
z05i;sU3D;pjIaTQtV!n!0|z27oDF*S5^3SC_zro{C@x}Hk9q$eJP<7hkpLmIk5I_d
zMM6RF_8mg3_H_K`f;{2n<*c*6x0HOux*5v(`s;*qO9G?iy@rM05Ui#5rS3_FgA725
z0eJxg!VLPY5(DGiQ0U?ez}{}zO(g?>4BJ_pG(USN(2~psaJsO1AQ|DXXnWtVuxs*h
zBS0^i*VVL+kc8XWuR~ot0(b&Ngr28;=%$gWQUZ%8U<YIBK~dA@k-<NG4}kgg4`?TM
zX&*cRo?+W3xJYjy+9aHM_<HWtMO8$3fzShddNkLUK3WeD7#YVCf=ux_Y##%$;xa+%
zB+@*Db?wH4c^0V-jvZhu!bWo^X`W%nuJmSP?L*Ttag)9o_DuHl+2D)3?B-6E8gN2B
z%?G!(Lf#C3g*()faSMTUz0>RuM;VU;QiefwVb{ZlTE@jjT+7u9fg{x$A}|AKGiDl0
zVMvjoP-0M3R8+x=<z^({p9n8b4++c2dr8FQ$AMasc+MCAep6DpostU$iVRTIG!z8^
zK|@6i0pDkbkp>XL6G^7Nj6tGCpCoy$9$~QW^>`ZX;?xRmw6xJ(64?Zd6o{<E9)v;i
z&_p#x6~YxpB7{k^IAc!*iwch_mp?BpXo)w&LiNnZ{Fxam7zX&o*{31F><$VaC#~l(
z<ab{Z@$Z8bDI}VcfDrQ-9C-1mRTSb!Qy_LM6;Ud&M_y3SVYT9_s-$%}sQ9(4$=|)$
zNeLk&B!rNX5<*Bx2_Ym2Ad(3nk`>d_I5OR9>-q@R!Y=>;`FHU3>*LFEk<?}fmoGm0
z<a9IC+07abJV+RzX$c$#G6e<64KNw1p1Z_EslEYhEsD|vkPr|MgaHO>?O8t!YuDYJ
z$2zyWLXvDcaOlz&H4iWv6fJ1r;D(KfhQMir3WA2lY+4Ah8X6kXyt{n^X7frL3lB<;
z5;x(?0SyR0amqdk+5#d-4zY$rl*A^h#Z~LpBs4%eZcy|B6ePiU616oqEQGKavU!Ma
zVj95(t9kA9>Nfyxa7ZzL(Gn3wv)9`YEDj>L4o4FmHkyeKC?b?)J4SUl6JH?SDGgxC
zP-N@tsDZZF>(-iTx2v|YEbTh}QvpyDX*t7~I$Z~AuxTE^NIA$Fat;R$Gg+xO1AY*=
zB}1l3n|JG0Iw7Gg3G58=7^y+66dku`uK;x>#M5q5oH@=NB}C~%bSB$$U@Pkqz2^@N
z{782x9z2!N)bw7<)b`&MZE{&{W#5VIO$-_rp##hv2Zs}b?dbI<sYE#TaSnb_D*5@$
zQQV9Js0<Flp#;b;6;FnEuR(#ZhP~)#4D=mv!s^>>$t2cR^c)&IJ$QJKZ1L%E-gQsc
zrq35z=3Yqxc)k|G;CRnyfNX$qF2F&_+fh(BEEy5GMWK=)gJ})!U4)HLb)xA^4LGN2
z@<8c0hesYMyf$Ie6Cwb{fE`CNAQIhsfzI$TY4R35yMQ5(>(@(jnW4S$;WWVTRvbur
zk4ZsslYz_N_44L;0C{xy!4w9=q~x4=8|p%2`20Klq&w5r5>5xGcHh7^Z1M|73INzP
zLq*rI5J+yCu6#B$4j2sxKAo|s!)!2)mf}DlfI$Pxb?mX8xRALox{0whh-AlXoS<#g
zhNsG7#Mg~TCy^A1p`GiL62l7&5eP9O5x<vV*VnQW^9$08$Hm$eb~==>CcJy|ep+H*
z1Z~5B$SjD$oj9HWVZ@wLjey@@L1$^K&^}Dzffx;@@PwV`I~(rX#*rY1h}b)}qBgaO
z*tJKC(pt6E-s+nWvqsF?dskIao5rS9yJo4q_o~(Q*T3L-uKPId_xG#&TIc7y3HJSV
zeb?k8w{4XYted|wP7fJ(I{4YPe4=0g5pP3)s$}!A927y{7<VUx3X^g81zhc+o`B7f
z6+HR3MTFhNsxqU@J=>*$0TSiWo}O~kdx3cv0y4Y?=?_o>#o(sU1{s>_kd>vLm5Db6
zf~6nxf<YWAyT|-5c;9s#gNaK;AkoSs%MQ)H51tr7+4<+Q=~_nvJoKJ_U=hzMzD*A=
zd7#cPup$ibuI7u5xr@WcJmM`P9$etBjM5~I39Mep5q><@!zH!iyR)@>Dj(?adRbV5
z=3J?6ZKX%G`wXN+yt}0!^f#I&<UUN@rFxC;KBsd0R{Qzt7H0<^tzvk8vR$tF!=(sH
z8&L@=V%QhK9RlkH0<pfkv7Oh?0&f*w4rPb59W^na${jdT{#DlH9C82OrJ&*+flz+p
zkFTwhN{&zTDGQ^?ts0^u!WZ*EJ)Hf4N@gXgbJ>GxLek>O;^+yJ5t5YbA`Vhg2?qgX
z17#?<7iN@Z%8hSAsH4gb9v3H+G=)x55{hz}{=*5I4$-e`nv#>5m`bP?HcA|d(^qpu
zR#i%fwe&NtJ+q+A&g4&x5aDw!{CA2us@co<ocOiWi=U)KrBoGHF@yW~9@uJ2IdExu
z64`P~jPF?DTw<!LpefY;b_s+A#xO}WV?#=QQ;sQ38Z9*@ojwkdbjAnTg#h)JP!%2b
zdPe@l#KDn^yrO0QfItWU^UIBx%}zeiU}jmBamyGZ=TcaT6~XTf{)YqLSE2IN0A}t2
ztsaA~P8W;jjqs+U4bLOfEN_z@Z3QqYrz0QtPOCy(f?5MrA}{w?=o)_R@YqYu+9yCI
za94T3Lq?!}<MM%jesp+Q1L};=gL~)v4JmX)Wbidv5+z5OC>8YaHf^)@F2Cmsl#FLE
z`l;Q1pu?u5m3C7B4Fob#bU&f8AfOlG{$AZ~p`)GLzhky8Eac%;{1^)}vG`B4Ald2d
z7rPfqs_p+MRC4|{5_-^1F6p_H;O~^5+oc>w2#R?)`+g-*0_1M>A1oJ`Bnh@I!B2tm
zM9-#ZQ{GVgC+A0J9nuz2kdwdekATO*OQG1%swE-@a4lF()bVZX;hy)yicDyC6Tq&7
z_`}z}4VEd_*eXr8K+S*<J~bdTkU0e{$Bfr1WYg0TXj%^O$(zmj@WEksWTK|hK#<o<
za4*z09`Ss)qUIdxH`(DZ&TBl0M;aU2Q1OH#ga8;Hg~gEiWBz4OOg44;>@CES_^Vqw
zb?4wUBG~nr^oT2R4EF0ueCQ=**I|rXwf5wjw^ElDSo2yAM44S-V|N`fS^jX3YoWNT
zzUKA5Q-v83<J~Ex+OsCII)BO?dhkWoC!`m$lk*ugFo>^H{0ltm;8!|#Pq#PW#}F9f
zVW4uFBlE4Aof(SGK4ZqHI=q)o+IX(W)LIKs_zHUlXr9=kfL~bJQHJ*|K7TcNlSSTh
zeF+tQku-n0>XD@g(?sH-mpI>QKLj1Fu6}ULnv;*tj;9}fGrm=_uca7U`*i|;Euvl$
z(mS=-jPzV@V5etErQ@}%%>ep5Eh8<bXa|`)?@^!wlB}W~iGpckXtH7JgxSSqrRXcq
z71xh*Ulz8uRw0&^9OzQrQ^>Q4@w43vA;OObPSUR*2}arh#EL(rHPtJNJn?%q^C}t6
zq-R|Whgp}XB^2&sCxKG6;S`$W&_x|s!p-z{FeZGJ-HFh?M191tc40q~IJopXS2<Zs
z&#Ru#;1dYr$uv1EFkc<*2qI)o-}8pNqf`C`U%t;6iutR@rgj^w7_663_EjEP^yg=x
zAtWMG9uY+J=iAU#?;N`@a{CHYY&|LePGf2gh_OLm5L<6Fd|+#C;?8RWasFV|y$2)B
z=e(mLS?lkd5Y&R<l)PB6M{e9Iz0lXn3`b;l_X<gS6E(fM<w%DLy%34s(#M*D)T>S^
z{D>Zs?=+0qd#?M9K3U#)%vz|z8_S#NV~F=w;g`$&Cyb-tK8*0etlln;piEkOIGfQY
zsYLlNIieG=r^nPz=mC;Gfr2c{Yu|v?#jZPFNq(;*$keAOefj0QEOJ705N}Q1y?%jS
z_7{JJ)K~<rcB9JX=aLUjAlfk?ELn!Q7C;1+W}uqPw~7|mdqT@02KpWo(`gYS>RNYv
zQc-q$cm|;e{_n--pcN<GO5*HpVbcRt&`)QZ=G^0>N6}P~Dn;dIc15hO-5Qd&A|X;J
zpM1e=Uun$;<kGG>!BjC0fm?lZ{8=h82$rg81)RIEN@mA`dpOwmV<b*5o?o5XNn?Ba
zGbngP$kR7(@$E%kkP9nkF9}cl*=A{;$sv|pk{FjiX2EhCFMX9%ojn5TyX{nvryl&e
zGq4IKtM}+uND?@~2&4nQsB6XL;x%9ZbNOKny%V$DEQ19x4BS=5a#HZ0q#l_R>=I;f
zyg{`m)z~l9A00#`lU&{9oS!wNxBp*PMzg=gb?$v^3N6cGZ(pr?%+q+PcQ+tp(dH3`
zeJ+$(GvJ1m+cnf+Bz6aFjiaZUe<GYIo)J*_*6~euD|OH>e}*RxOo@{Q#Q*6KTbP!N
z5J!vC+rG=!u#tDj*Qk@5BPM1xu#V{c>Zg2u4T7Nmv8%{GL#J1QhjDpH6)lTt<{G|$
zFT~IBqMc=eN@`MfW$98_O<HfbIc1sl;zV}D=tEuybgv<V&FEWWYx1xHG0d^k=O?6y
zfCwNey1i;(TYOqu<UB9>KYdR2Ci(D8OHtLJd92wdYYIIB_ZSBSH$RrBB~@WUu|9N%
z6<$-PqAGqB!(@%;Zm2k(b0zJOBJH0P`P;<l6dgdzkyJDkBJxW!=y^PWC53r}`vH<G
zT!sk55sQ_RM4Qf92-Rt~#&9qaNbV8ksrd1!e0fDal&)+b;rvT+%>RzKAhz(DNAHhf
zZ-EwE+fQrcB3WVsx3=cr#A)pdXq{oYQjW&@3?>nD;H9QT^-m>JmKA#D>RVZdzkbs_
z@C<+JC2QLh$sUjxCdO1kcV#Pze<Z^iW2duIjH7MT%orZh=u=GVG?-{4jy=>E!MkC>
zB(S<RaYpXP%=vpkehQs;UHi}E;T4x2vHLX2RXAX_3-|=}Ib0wq#0HSA&!_{;!Bw;j
zRL-WwE(y?_N|NdsoHhHN%1U>Ds%m#b=Nug?E=RfA=Gu3(JI<@vpU|MVI5pZ^YT36}
z0PFcG4TSlHgA7CxA1IGTmRf;}u$Q<AJk&}&1rZv5fP|RT2c|`>L13ppJ1;Mrf2<c2
zEoeMi$>Y?Y7Z*7c!=W>CYdx!zAK&IIsUan@aW!kvG;tIScqAqDr7gdXzh}WLjwt(Q
za&NSlrVn|$oDTD9`5&6_kiTlwWBMW}dOSjck4*r^aZ4`ApLwRLDo$mfxf3-lZifV$
zLe`jW;L&ADCa>}b|MLtAO)Ex{jzc6KW7|`T=J(DA-XPW=+n%dGk;}4m94~UoUAr!8
z7H-t|dQ(HMJ&cGEs8VUhG|h1Ef{*0^{7uIi9VsOtincf1f|vJGQG{)5XPSQ^i=O1?
zC^tMUIGuBDUo+T{=&enk-`d-nc>O4+!|<OIl<EnhOh(|Q7VQw~cw{J%5Dpz{?TG02
zKz^h!jc%CmBo-u*sq8F!{#S%?-2X93{^DSB|9Jz?cGjGegqG<fh&V`<eF)I<L--ls
zi-d{q2isfR&W}qCCvQ3e`7_^0LMVa3D^Lv8xPfP$sSuwOFDu}_Zj$3or}C8Ua>-O}
z)%jLn{sRq=^2os>1zvb|wErEAv2kK_W~if|*1r$mK7}Qkpf^|KR!`7Q>tOlvGQE`j
zkTfR(1kcr{6LP5#>g<U9fxk+`m5}WmHT%JkdrpF=FD@zTkoxp^gJm=%CWh%7Pb-hH
zyBXfrT00O6Z%(Hs*(eg|#-oYKC-#L_S!x(I#I8?`1Uk78bt!cCsfC0IJj=cn91wR*
zJjcjMIM^@itqhOBhJq5y$MwFkh%%39AykPCc{W5?m8f_?MC<*F|K2=S<Peqhp4dq;
zb6AL_K}LT=v5sMN^X!)HKmFW+i~Ol(;st-!(G3xONAjen|0z3o8E!@TfQK`jGUZEi
zn4nkBvEw}#han&LmKhIJE`sjD04Hoh3dJOi2YAxIO}h^+!nZ<_`~<o1dIE-z<ZF`J
zD;8HP&39F(M!~{^2`GOOoMSN6bdHAr3JbA`&BwQrN;L<dxI}dGR`S8KYu8JnPYPrB
z<E)AW&cm6KxsI{daK>+Vl8M`O3wr8<`X0>dD|y!gw+*Ezc{@$G5iD+)_Z74)Io&*;
zw*LD=4m&Xryvuw}zGyH%nnGQ=?ub`$gk5LSo`FHU${0Of%ab&a^k^T^SFw!$`|tOA
zS4ES*0$hW?qE5!P`UW&khTC-$mGQ+`*>8V4PnBG7-Vh%sPBkVSP+es!nXu);4SutY
z-F};&%Ar0w{)6#rzw|#1%*%;DM|=KCHEfj>NKvLojSHyOW{X&74u}^TeA^b2e`K#6
z?UR3dNHqLk#SOGuo`)k&h0i{An?x2MuJp<x6;v<&#95L|Hh+YI_1#c~-5urc$}`IQ
zVfc86!ax|yC@$#T4T^!OL|i`4`5%^@y^)?MI5C=r2=vdfi(^1wT_W0eFq&b|EGQfN
zHKZ2*{(_yrU+jQozf^wEz!xq)Y<8(lT^{H1fTOqImEg1%ZqL5FSd*lTj9oKKN6)ws
zZzed2yj^*d!f_mK$@<eXgzdUb&0Nji`-wI4tfA2M%~Yf6`3Ccd$C^HaC(0+<k5AbA
z=BhahRz~>(&SG*}T~vC=<((cH6C(dA-A(rD;>IQ`ks4%8Gtu|5yt0};1``{T5*`zm
z-7fm2url4Os64wN?A9frvpV-B^~2!Jd~q4xK>fH3wah?AHuZai?BUSOdkGT*HJ;F<
zIVG}$3v?aDe?<qEiZnFC;@oaM8grv=qfQ6W4a9AF!Y)SMTRnE8){t)!=W$P;|3<LH
zypmQ+CJl`k;k5@!FAdwlibzOpRBSoet!*hwAHX$X-G-#(>?@{t615#4W}hzXfZ4OM
z`M0djpQ;3Gt{X<=Iazz;rg=P*-)sji;hr_ec(_s!y%L0a^<OO5`0ev}dXM0p*^53*
zI@<oWILLQA2tejFcj&`erPrRl(MXhLSWgs&S<69!JUp4-0EYfGyGTtdZzmIRkyxH5
zM6i5|^-1`f{O9ZOwDj9wy3{l7!(RLc>0R3<zcW<*@lp+g)nbH-`gPY$k<#3h@JN71
zexDfl9tIaq1IGzBPc#xI5o0;?W|>lv2H_boO|B`U_IUf>`HD0GO)__)3&m?=@(pq!
zB)f|*p4mM$>~xA&;KhR|$ARM`aR-}&=CZi&ah=QG^`=@N4(pWqHskq6&nMg8Y3@~;
zh)p!kYsjhW^zle4kJFFw?AR)2RX#k1*4ZR*X~mZ??NVEQIQc|UH(Kxi<5A|WN!yaS
zExcQVs{Q-V5AQg-H9t}zzsrla?!N2mwv7q80BmHPZG$;vHIaKspf8Rc@)T$~oV4s#
znZ(B2G-a-1K%m%zT@)MV2k43XOFg&Y*-xehauhs<vAe8o!%h76;=$;|?avir7gDp9
zFIRizJi6)#lVSLcS~9rVNQ7L_@a%9o8`o6`Zqc{P>$!)vYT%)z_gn;c46*oc${Si~
ze+jOjQQ=Ei>K)`Yx{K%;SJ)cnVpY7vc`ru5`C4P@Rh(j+iVJf`0^=nvhgd@^V%tAO
z?CeLpFs6~X>NlNXCFQ|_S<tFSDb62WWVD`DeSIrTUcm;vQ23IrQ(a!g)j}tI<DcI`
zq|@tE8UH*;62MfJ`_b1VG75$<!I+V%r&|}=fvqRlp|W<cbiT5p(#b6f>GVj;?}HBk
zCk7t$_`g*4H#6|uR{YO?RW04#1w1uY=Re%4+B3B*vvB0z|G*%VLGzE+D=I=9ANEJM
zC$vjQ?%QoHrJO4b$*9)IQ0!sBSiSW})$#1#pP_8$x9{LLLtu`|Qpx&|^tVNNVlU6g
zriq9hC!RLU)_Zye#GbbZH!9r!`8ph?k2EB8RRnw(+)v=(`Ss+JeK9>BB1To_J{T|9
z{qRoFIZ#`%f@FP5n^^ZIC=IRVAXM{Yz8}1UR|zZ5s&ny~8G4)6FS9;PSQ(z}jIUh0
zNfPo)WV<SP<v3hqOoKisEA!y!pZ<trFS=2>!+SKRL-?6a_fis}HqKAJH=9{5={b$z
z3)xb!&>x?^^H+{bM@G`qidu0c75#7=P!5NLooR94r9@FE_4OKZg6W3jGbTe4r8g2a
z=b7zXrw~i<A2|HP)TzUri-?_9clJb-l(0N7;k?79Mx?26{slaXh5l}afP#QeoF{D`
zQ6gRAj&l#nI6h3wzYZKLXC!>lOd|k2-fv9P*09bpnO_7*7L`&>ZHR)4p%8on1k$+i
zG)4l*pZwz#QYWjrC9_s(3kX$AU7E3sGKf}|aCDYE|8*wUYxLOul4Yu(0sFF<6ptSG
zi3h~}urKd@IJGM4u}X*uLDjG~cs4=6#6Pdwthfs~DsqYB+6&6p1JT}omCT>YmCm{6
zWqNe-ut9Zv$Md9bozgp|Y)H9H=1sSA2yQ<%{yf6DKGS_rBrm-8Q0OQsBdeL)H;5qT
zt?Gi;F(*NkIJd;GX)e#r@~||FIik_(rNQY>0>0K9`<>r~zaQ><zP#tAw?|%cs$ret
zzUw|A!+e}cU=-*7Zr1kA6r)x|I-QfCijWr)%`hFP^G=ZF^7Ypuq1EOQ6qWc}aC5*#
zF5;$}s7hJE!I@0C7>2`tv$g0UrlRWnhRL2Q*piMZT=tLlds;C3wO}UYMv4}fK>Z8V
z2aI+)ZjL1eQxU38k+7!n2R~v+-$m$xlad(F31Ck<B&n#kbgwy4By)-u3CHJD;n-qv
zgU6cyMP08Z-$(Kd5<94bOtS-#H?>Xg7n|JDxCL+Jj3?IFx)(Xbt;!-d<ggqfQ7bra
zJQ-EoObX)5BMuT(mYcLu=MX?PYxX<&;NXat$9J#)qo5jE#J-8KMZDnOH7>H*xa|Ra
z8y7w8df(3Sbs_!g+jZab8eV$BQ0Lqo@xqSprC0<!g{u9}4@&=O)6b=UNx$@4vJt;{
zvl5=d=Wf4S7|0S9wsEY-7m!cX8D$e&$9i6)tT3d=rVpq@7a%AKR4tM2b_@L>#NNA<
zMn@mxL@(dXH%l{(N#9c7ZiZuuF9-sZ&_pudPvGb5GYAPmt`%>(dGsOPWTDFqIiK7o
zit8U3dHk`BT7<>V&*|%bK7HwD(di_AO6->#yx_G_ELXxOt6Eh9@BOE=ERy|&TKUua
zJB!%!M<tJXrT*)2=4GDWzzjB&&0i}K%T-4vv=-z6=1;=`IQZxMd(r1|`m>E!V?WU{
zHc1b@2s>~lV;R_|A+UIujM=`rvQu);=9_oglcDF4u43>9T*Q@yqUn4VUUzfOXw*zD
z-e1-5-;E^cKdQQ;%1q81Mpp}OD*kJB4fY6I`4#*-$9TidEvyKo+uI^@(lFS_7lTpN
zB|w%L6@A`FQ!MR-6+AUxJ)E((Nq_zRGM9^}?rb)I$fx&sd*fQEhMP2Hvb&q7+n`w<
z&y(;t&~rnQw0?5;vr;X_<#3(xuW!*9E~u1KnqitGa4p2H**V9<@TlZ%OO+{NWAr$?
ztVOx>OT!a$ddmykYikQ8wj)YP!S0v9q9Z?m8Ek#SiTtBTmK71b*F{Ky_|2W<`d%D;
z@!#pcN~gcEr;uMiZrB(MM3ht*^r`PS#Vdvh(n~uOFM9{iG&1IR5!_*U)(-C(B{s95
zg|A-{jK`IF8W^8%)V^vh+BJP^_R6+f<f7x}<bQyx{Rl*9X<T@vz!dt8sB{Mmc5_}h
zk=&Qq_POcowPd*w5j1dhVz&VS&Sw5MqJ(qAgj*1xS9_Sj34lMmphw#+e}L#a5|)sp
z-5o`b-t(<yH_C6BTm}2rpP^(bvGpu84`7DMEZzmS!J${|X7qL_o4hMncS1TZ#eTJY
z3O$i#YR#X&SSg|XzT<~{T~6PmPtRuFbO~N>-W$?D%F#I@PdoWZ`~3Oe*r~C{iiP<}
zO7%@WXzuM=bz8jJ53%XUC+^6mm!toWuiwCwlk*=y%~+-J9T&kkdc&hJYxDQ5JkHaF
zLqI-M_Lcg|^R(A<fpj`ol+9HsN`A()D%B$uurJYti}$UsJO7f~LyD2#qA1b8(RBj}
zfqo3gQ(K5i`JP=-bix|$XlBEo#16v0PQcmz-JT@b_)?#|$QBkMxnTVt_n&=~7qy7)
z-`Om{)`}ZYFPs?$96^c>0`YDnq2E;{=>eq%7>jT+^QJeVIk!5)&R6OVg6jQ-P*<*?
z%miS6RU_slEqI-_f#~6uY%WBcWlv;6O~+LAg}j}Kc_IMZ53S<StkwR3Po$;=6oQVg
z*u<vm?Rn1B4E5gijd*>cB|E#=Z!N;Ie~9i{HAT1)T{S)|)@0lHLIV|{_<mES_1aDo
z)Jv&255^C|USZ|wt?fA6^LF_0btn>Xa?mqFtbxdX70ASt*Tx25bgjJ2N*f#At&XzH
zE78zXUp!epSrh(Mw-6BV#XXKW;^MbFuB&$-ij-%bE=Ilm7U^sgM>hX!NpL~EXNUGP
zd!0_|&pM|tkKx_b8(Aox(iY5bjp#r5XwJjJKW-%xN)3o|4ieNZaD`P#mBf<yG+A9e
zPDKJN`@tVP#*=2-D%$`KcKT;IRZnK22kGiu`)l!EB|&6NF@gxcsF=8J50esdy(*K&
zNZ?Phv)V0DqE*%5x290Ey^+*i%ay6msq+=Y$S{4LHDH47JS(mlaLwu=c<=H6&CjAI
zGS#*wkn&_^SLI~qD>*(VdC(iRzQ>ThfW*rAF@@G)we?)JM?}hRUlF82`?2KVf&xy;
z(ECTbL(yyPH-#Z#-SXOI^gLX}1Q6D-oVQfDfFtbO&H4<lR`eEcqug&MqoD7Sqz3`M
zc=TOyp)uCu{J24oX5bh>UX`ve*-d3@L;XS|k*GCuBCmTSGa!(xT_+dYL|;<Aogw!s
z&zCyxt%q4GcS}o!cbLuell3D!)Tj~*=dN!iYjl@tc{))>x`^IKiduY;RCq|l-qO9i
z=jr)5!DAQ~4Ve;KX@RQqlH=`(x0Mk&AHt|UF-PR1^V6G*p~6_Ek7p7U!dAopjNFtE
z6M4V3ywmW(`0B-<6*0z!r;B8UOnsiIF~6#0RUn)!ddN06uaY3xGe&qnZ3FO0<W7-n
zQaRcdSPa8DH0_$G&M$5ztqCi1ag{1Fr*+q@v`l)6bckTEL0|cq3Zw;iWpQ3M(U10y
zL~MiO0F|UZ0BIX7UQ2tf1U%{@mAf}l4Yi@}Fc$!b`q8MCCUqH48M%th>zN@^Nqkfa
z-71Of3*=rbbp}eEp<-z9JfuxG*ne3;L8njCP@Am}GWf1zZ$P#s`jNiN_5}K2BvV^1
zl?LiM!4ks7D%!F7MeoyXDMcYW7wNq|#Y<uz3dYMO*93;5C~G++8sanW8xtjwbIqap
zd1v#_azp0Pe_|6X>oz$L{|y=Y4B9>7Gz&uk3v8iiS=@aqrLnGZ3^gbjEJ*F#a8qiQ
z-MgF=L;R{j*|T6nj$BS)7Sb<jV3c;{!&2<6Bwt{d{FY{iT%BcN4A<R*w3pHkxwx)O
zdQbfWf1T7i(~SKLCLqfJ*p(Ccp=|0O!51gk=NZQxeK-PLB(7ygUZ-(5GU*;2Wn-0T
zh`+(#>rhhks!tWXYneTlrWoEiDG$#qGD=}ht}r^SyJWUNA*xH=jMV3{8BJfBct0W1
z3iK){Kg=?u6+fSrbfYKWT7r8chWr`Grp#QTVi>iZs;y&f)<t9JBSQKlNg9Z7g|N}s
zw6$zasugm);q97JuD?Z@p{0<q7fU0v>^H{G+1El0vs16MmUb>-M8c`RAz&jzYvthA
zcua$xvU&>Pk(tQ|Uu><mnDQi0hbYDpQX%7h`El!A$65X?hn483YL$H+$BrwOcJyS#
z<9E7jUj~YsUNUgf+ePVdCsQ6L&=&Ufd=%*s<ckqW&wuW&xFL2vj1?f{7#adA<={#3
zIqT}h<<W1d%K&5cSr`F>4yxTCN}x7}lePB)3MHqU-_h(>SYliX4LNy)z17v(VNAFv
z#5=)_6xB~8t0Wz|rqBW1r9%aKnM2$cME22xtQ8v~3|h4x$8TH?8q32>(iOeZI0>!G
z-}+lriiO1hn2c5r&f@~IqQjQyl%AG<73`6VH8MfXkgAIssG3ku`hy2Z$X6pYN|^GX
zgc87>RB9&B6*1olWn#YmY38A-EZ6JM=<=i@ishG1PQ}~=Dx?JIg;AuYm>5QG)fgBN
z;#_OA>ImLi$CV~`y}r2E{lVd!^~8b9<snWvYa?JcRr2EUTj#2UtFL79kS0|0qfP02
zbEy;Fo~ji28?Fu=Geh-vY_pu*!hndNaOK`i5njo!R*9n2*<~D+%+hwUmQU5ooCh_%
zRamU!qn~RiRIpsnW8S}`bqZvW(e=I18t`O?6IgR*jm!SpaMuiMP=DFaViWy`VT`Qa
z9n;QwbL&K&D`XIRl+{D;h3<$JXodZdF=Fa{xtS#M%0p)<YQ^fIPRpUKERl}wqn2l^
z5UtSzVydy=&5l7om6JnWT|Dpna~jqprFccYn~8<sd$%C~=`KR!rtV(Z2eBu<$U<EA
zbUA1m@_0*jm?8T~L*)?3HEBWAPBi!ZCM|D!TkH%4=K@=ql#*d=L8xl7dNPYsiMDV9
z<trc!mOgdvHC>@ul)J;E_iH(oh{b*Su!d9piOnKEDefz=a)|-S8&}zmedM6UJoci{
zVX%5DFCY#{fAJ+)+*Xs{rZ6Jj#e`GhGtu+9VVwl9pi1wS<R7Kp&nJKNUc9-NWO-2^
zpK}osy=h|2Ho7(D(mEp#;bO$S&(Zq9kqXZyk0g)r9oV+~7Ujg-&@^_kU8*z}iZ2o%
z6AcUyMautE7l31Fok{p+_$|9>XbdcJe}yF^iZvR@6Plv$RxYSPk@%$qEkPu38j_x(
z9tx_0((}#0&HTRy`$?-`3I*A;_|(`<iQII5xqRbvtKk7#yAs_U*Jc;c87F_G`_OoE
zr+aj5fmgSjwIVl;ljwN;_{Z-^ny~N(4YH0+ORS&IUl%-m3s-P#T&Y;$o%*KEUIzS}
zD{`IUjAXAPbw+ac81;y?2NzPERl0%ehM3i%U?Q%e189dz0s8*!x8EViiVx_Ez&oGk
ze@X%xpgKQyB~Bq4&7b+S%nRmG8)@W(gw$yTprVUU0xI1c+GVV*RB%AO1F*o-N0^PO
zLD`Rh1<KpPF8qa;<1aOb;XH|WuiEgvQCQXIu!TEal0G;%^HCJI_bb;O=0I+&=Hvaq
z`U)e2pz8ZniLf)6gYXulcz%2N@%ncGWb1B#f2~OE+EP@M4@qsLJ?q?#8y_DPGqvw)
zjQ*X5oDrF)xW^3Tj~3f^w~`WI5)b%9^232MZ>g$pQsle-8^Qk}|B@8=0LGJEXz{$P
z2gV*|*2lgmN;xcMNa2h6O&TVSn^a_q6x9NSHjPhESCN#q^~<jv7P0(^kg9%!a%hhx
zA&-k5AHD+r$oY04d?x@NB*;g98nQW!mDa;^%-}8g39=zI^jpc|U_FGRzXs@>Q`mRn
zpB`Efysi#Pd321=W`nZM%9IYeXZ_5w{lfXcqFbAAr2oI;zb)fY8w=kHetWF6$^iDU
zT3UaEbN)-M3`qhX0+s@dkibCvm28p%ZDF!&P4iP#oS_L3HhPo$0*O?vQ)P^0`&8OB
zS)%(wqcg4ljUtW->HLx7M}d1!auL0<ZZRp^HzG`!2FyA>UBqPq(<%Kc2ub8p(uvT(
zrUiX*5Dm#Tz*8E^v3)^{a8q-L6NK^cwHr#sF1%HqU?dtpWC1?7;AeFJYy<-CAdAp_
z5v2eT)gtE?7l^|~pO=IW#_N9<Jc#XMSDIbT`CcS+BaPdUb7R$duz1UO|9ANF&MA~w
zBu+K*HkAE5Zd{=?(?X$4qi60lWjve7@)*VrL@-+3^&!DBNZ@APz4nuPwdAa>pI)|0
z{j9oJd3N<fx`)QK+4~J*)dcJA7dK2+vy3Yv^)f(Ln#7h)JGn8re}bc3M*jH2+KXo-
zUD;$WA}0}OW#X!hUS4Xb-ie7LA%1^Da?t)$^LxwYCVMy+W)2*T+yBk#)6m>N|3T2-
zuV70vy5M=mdI+AJT(1yApoJDFr0}YqI)d;=A9xFav^sSiK-x4@)3@NJ3ZJfScNbCm
zE7egfGAq$SSRl&X&|xAyUv2*IKGh6z`?Pn<%9CuGuX)u+Kj`VuHFB`2GErFAhH@*^
z<pWW9&?w5o&M(oJL=r5AJzo|9h0J%l6l<qP4xIZ<c_82iMnBWm(NA?#<YmFOju~qd
zl=N*zI4uE#E0sWbnBMK=$nqZFcdx408ppmTwX+T<ERHo{o?d~~*tnpq++@mzVdt!b
z(^J-&YVJdYc|8Q-ZGM!NPnrLC$^)MF11C+s4?S81<T1I_WY$ki17<w%Y7;3P4sc-`
zQ?RQMJPvXGho7E#6mlhSLM~q&|K6@18Rq@^p&xL0)~TrR!Om;F{dv+8q2F_7oWm`k
zT-b&oxA*}>lb>VgF3in!|HAS-ieVU2k_S+xPj#z#+}yQdOZ%>m2tUmwnHDECPCW&D
zp!<YFO9;`#Ra9o8{*IJQKkMjMNc%JUe5r-c0^8dYes(sLaHsh*6qKk($+Bx#btNql
z3BipG7#KW&YMq7MqV$PbC5VP8(#Xg*W&Wm5`hY}(NUqEa=kUwfu2-zLh$!w)m9Mfr
z`4#>o1$e0#Kh~jCetO*fSoGqL$M>x4^;Gt9>#Fdqm&KSu?R#RzxMy1@3d_d<%B~hE
zwlvKLr;4+85g|V}nudj=9R4#>;+vC5xrpf@<{IvgQ_dPD-|@SnC|LhFHa3>^FY+-m
z25PL*ME2HdlqApy1{pM{qHSE2Ap(&}ZIeR3Gi>4;?mic1RMdVwpQ%BdcIu6z6&F>0
zFX#!{sQCn-=USk#sT_*!k+7a)h_InjXb(OY@Sy&ts``|xbyT#*6b$(Io>zW96N;<`
zv2SUyziU(qxRDf%T?--W9988Va&hrRAncR(7?4cO5Ow~(B@s?ag%O;{Z^h^cDkz#2
z!a~AXSrl!x)cMKu82_YcBxxZNeV3n<uUFU&snLjz-BzuWc<PU!Oo8yM4-$*fyo;9}
zx9`KM_R|o<au$=;(NYj$c_Yd_TljqBc}nLJLu%u(WF)tM3S%{cw{odUc$~)Rmq~m4
zA5!)jRM+3GbEG`ASN_zaJ_6^o@5Wwbu;U7gQrwu{T=N|r_WcfdOTH8IbvX-l#>EV0
zl-0uxR^Q8w$i01kXD!J=46v2Fb!TUWL%75hYyuTu9{YB&xL%NcxWpC9G0$u?7CsEG
zL~$NIU&eqpkUiN_qeylV1}2^NM&jqND6ku-m(=iIO75aXWxWcO<RqbI;QtC9DjWiO
zZE+c9t{P#jRiPML+Cw6nEc*o?{xZ*QS8&_|%Mmj3cm!<;NN}cdrWC|2l41$Y01dd9
zsx#L~L7f)W4~E_gL0d3t^gSlp<benF0xjh8Q_VyH*6yLdMoPQr0+p%DlQO$yU;lm~
zwHnl_+MPBbx=rc-Gvi7wQF?Tb(;*(y)C*TiGGn~`iBG*);vw3x{*dFgBCz3pL4n(Y
z${^&ZEK2#DRumZas!1!~lwye1EZ9Z~%sxC1rt&q@DWI%c?Ma66v(EKJRdPjbgY{K~
z#wqcFu6;~S@!x~t#>rtI180P)7Dy6Av*Q$5uc>zjz@pv%=+^49gNw6OmEI^id@F+$
z@K;^fF^pu)Jhnw&@DNl}&GY(90toqZai?htJ`uycizU~Mp02=G-S)>K!f%<SxxHe!
zO?KGafVC&|4EAENpNqeigW_z9V@zsFitEWKj3~zXl)67BO|zvw!m+=fKf;iTJzdrh
z#TzDNV$h*c$9?`dNq?LvD}T~~(|~M$1B*0I5fjr#=Xjy9shrSxRBmTQZwmYH5rtO#
zC$gJ2?G0si_{R%R=Ve9*(n<f@8@6L$C#tbEt;7tgQGrZJ(n;|(;iU8_<uo>$86tI3
zFy1PLt4H)OY3mgvIpzTj{P=M~Rya&df?1m$-k{Op=EB0lA6Z7afq5hC9#m(U&1VH=
z{ydKT_|Tv+tNqL~!^x1IPx&K2>o%`wjahHykhm?Zn&89Ff{0V*Y^9S_PGvhFQ>yW|
z@9I%YNoRj3&t9Tjf}1$F3B`KAW`%KfZSA{%ZesTe*k)5tm`mq*R%|F9re1_9e(hzK
zygq7@?h9m(ftMnT=<o9`o}E1Pd+p-pH||mYpJwO`G>hWp*K4madAYnX;ih+~EJ0wG
zc251zJLA^lW5)VpwLT_dujRg1<_mcl6C3-4THiz^9aJ(|s<3ZO%J!Psr(8AIWxAy2
z*&E8JK46%C@6=~z2DP_Ed@FkT%(`53a*+HhHp0B-gK`V~V51L2YP_$1e!XT*<C9(+
zD|7tvvT;DhIq|EU=?cMYJ<p|v_yK9rrRoj8#PG-r>^OLdPr~rL=?%S=N~1~la^nY8
z!*WKVRU7X$fjs_Cm6sqX@|KlxBPs@EMnOE##yE_TIXq}YNKCMAB%l+&IM$ZYCnq63
zig$nkBSxZ8|Hb9T!(x$_143DTcrg07C{To>aW!LINTlbfcYD6NwPY(0tAKeF#rNx-
zccVa!xHf-Ha-5VxUq+3H)4a7aW~TEd*M6e=9Z6(_ZWDVZ%geb%9lOB&-IimjCq-H0
zI7tkLT~i6YGkCyG7i|$Qk;~!)O=GaCUh7wXD^pG_jbZ3-91s(t7cB%DgtHOG|9w&v
zA=;TU5y<EgkM_0gvAKWGQNIdz&V`rm0oWVVO2<_P93bi<gBd2N$vl)Lei`XdX3;3I
zECGWd$_O)H#7R27$&#9lwJHM7ec5m&eI-`M&RvFpiEA-M{bI6Y{EUP=J|UA4^~e(I
zup!Qo@&qQGqlF8P@WvY?CXAP8Q=UF;Tsv$$oZ$%Uaf;l@LsZIw``p#%ajDr~GYjWO
zAyaMx%cY3$T;(FKqd19oDl<057NJxg;-t*AV9Bfh#H{6{gW9}Tyj7<$8)633J#bO9
z45jGwGbidekYNHRQM(Ff14fLx7Ii#umqZ#F&1HG4I@WgN8ejP-;%53GGJuwV#@Gog
zIR2j}4d~7HAsOti`;J$cK38WyyVXCHeumZ;2wj>4IO?s%HuFDXZZ5V$nQ+1*P6B9n
z%r+K|ex>a9#Dm;ls-?En5)Jq?b$4XZckA#EgPe<<63`Y12Folv!8Cuq(rUem*q=Vq
zx#nO_$s`2U=rsu)F(w8f8aNnb*829i*H2UYeRbgs1%t8zDJP_EdchdS`b1{5jK!lj
zgj$%DaJSX`v}(D+Ut!K#IJB#$&36qze&>OuOFpBPvr4)}Am*7o<5Ngepb7>m*gx*u
z`cg1BR<QVb8m6u@BKLt&Z&wov(tyr?#bKXOUmQhSk~4A<XbtkKOT}^SmLhuR7MWbC
z!-e?_?yVB#yg4p}#g1?<&qF=rO84#_x`xUvwCq23V|mwEW}ChGgKih{MZvQL#LS8J
zNA%@Ja=Q{LNl}NqlQD=;&hAZ1avB^YW!u3~ojAD^8wu0Lxkl&{pFn&`Ge*-+9vw}-
zW^2#qy`AqShateq)AfSd-{V*`-7ocf^!wQ?D>6rxSDWV+-w(O4l4olEu_fZ9Sn2=4
zNSC_ljz3)`OGy8Y%jShTlj}|PZ+BRq7PWh&+PJMQ{d6k_Qqcoi0T1rp<^<R2nA+q5
z8CwU{v9+w|ZX?YYqIxN;sWMLrINpbgznBXK$JgX?FpU9WwF&vkNKJ}p%AjQ`@L25_
zQnQpuo><CKV6{=YIXjF4!$*K}Dnwz8KHX~ldd}v6ntY`NgsW4hI}H(FtEqbc><nBl
zBKR2CN2tq}MGe*fZ60*^8jahi3F5+we3m2B59y3*<kjn+KmTJrE=ui5-~M6K_BDf{
zO*~a9W=52+zw=qra(OALkb~FBfj(IpAI%R$8c>@6tqIOM=q_y)f?q$q;J|xDNbRhy
zN$reZRv4~^gg@m{#vd{PaGPooP$S_`0BAS`kB?M6?d3tli5eAK9cI(GSx{YeHYy2#
zrQ9i3E#r8QX$vo0EfC5UPrF>k-p4SG9(NOl@}zRgwl`xbhmFsF+xk&Xm+B%?NB~9I
zeNJJ{Q9t#ivKQn`_Az%f+&e+W=R4oJ$+pleW75{S#O*YP5>;E??=JtYSz)DtL!>IY
zr8T!4Pl62Wg_|#4JK8$w@EB6o)+H#?yPCe|sqk;|;4!I`q@GftZ(*RdA4s)8aH>l?
z9dcqy9TiAO!5BqTu7uTCvz^z!&`GeUMK|l^Kk-(l9zp6g=thl{*pClDgr-m;9i=a?
zh<|IPdp9FO4JeKOKDYKy+4}os_&mP%y)pF|yFikAsJ?>vPJO%RK+)TS_|@>ZJaeGr
zU{nnfFAK$hGL{~PX!Dezt5_FAjzUf(By$4=A?lcjTZD+=`20&jRbc-moE34Zpy7#7
zWxv0oRJ5D>AZ7u`h&Pcj(}^M>AloQ>B|)ruUUZ9^zs!%1cbr#}I;*pDZTW@{(ERX8
zXeC;c82&>~qlk0ss8_|>R-Gi@nQ=S<F`u@RzY_p;k_U&N(kg$WMycAsbZ%3YZP<H$
z_I+fXq#_z2FU^A|rcYuRm^%O=9{hNYzkmM0{CkdrZ5C=(L2w<sfAlN+!1n@&Y(d9T
zeEE%sk<VoNx1^UKrU;*9Z9q1cWA^vXgj9V0SU%4DijpCkWsl|b78tkw^}POSEKi2b
ziJs&QuoI8zG8|FB2NEt4RMn=AG39?<7q4CYE0W54a=h9dBA;-m##UGbocMUS8}X}N
zAy^_U`(eswg^zqZPtr24M*p=qjEqG^G-w$J`Cl5`4Zx0P(2Vti)7L7i&vL72udiy^
z|83tKe|6`*(69Z?ZLCo_>K507Jb3xTjtj%aS0bI{YezH6<HjLkGn`)C9Zi}+Mha+I
zq=z|oVpbbqUUF>c{avhVj#ecDAi;}dNK5n|B3?|qkF1)4EDvt#|JL9!R|CV1nMtVO
zbar@hz)MB-Y{QEKN9M6timw@-jmWA51oGz_^_A2<9c)DwV0nOYL)5DW8^Hjg(()Nn
zg?n08UNk*%_wjx5g$f>sqT>5Sh_@pTdg?6f`1bDNZ!VSugG!G9@&QgYJl?UfnMbV=
z>XWl}^6*J10lQNTzc%1yf~j7*E46MI%Sn5MTUwD{eJsgfaVYp5;_0@s+?veHKQaBd
z(6UD4mbNqN{L$1!rP&?v;K9?4y{@skDN9?ov+6iYye^h*MB~M;!s?hZI^K+Qf=2XO
zTO${O{3vqgbstqs#nm`hbU*)NSGPNJ<r%+ag0lM0UL;9>tTJ}|aJs`>`6c#I0ioN>
zwaPX{vik?82VhGU*lo)82LhX?fo_i_Ctt<%v2!s*TW_{Q9@klugf0M-?-t^Sg(&)B
zsFIbRy@JaTjrmx<>W?5davWqpO=j}^Xh?3QHiOszpW(-a*|{kxGVuV9&Mo=f=VP1X
z$owsK)hc92aP)|ZBxdI_NbO!;lxXbJzW5#K>?PMQxUCQ36jQpn!>$6$Ol3NZ>t4mb
zRGv{wfB3#g>t)Hn^ynQsx+u?j`C)IoPOLfmEEn9Og<1g4JesvsUOSI@2h)LcFr&#)
zvCS{+<Z?zk1Rzq)6CW@6d}rSi)}3un_f@k6{iybd^A9O=lz&KKYG7C^6X;DasfXI&
z(V3rKjjdbYpF@c3Hr2SomFTInP~}8WM)C|K0mA@$<FvU>gYqkUrXhf*`y*tjx>=pM
zVUvj0kL3sjND8Hm)IYnTfAJ))fxX`E=d@?A{OT9#qQzVdZ&nY`;vtIpKt<yXzN*x%
zP@}AyM7k_!zw_C0JOw~5P*yJS+Ah-qNgFAm<xTZ9!Em*~$djv*`TDdQ<t>2YlU7Y^
zj3t;x&?$DF><oUj-H{jLfcG_!@90f5j)Hd<(;IWoTRZM-Jtr~p2fbrsUG38W53isa
z+{a!Jy(=HGRVEV$nop~>avoZ>;GJ}_S9Pol`-sJnZ%5?a?a#!hP4qJHkwidrJLNyi
zt2k0}?L3y|PSiNdIZ$l08jNs$#MI&L7fqa$lsNlZKMK|Juk)_Al|So}?dR^dK8rfV
z8GT43qN0=LXW)A7@fIsJMuxE<l!a>mxhds>{*~j!aeT#?9+m-JE-&e7#E)V>yV~c_
zfrx~R(g71umCOE(d(W8D37bXrCNaAH>19)a_t9}sx9)n9K?wrE@E%ebK6*|IsEB`7
zh1WPFuR-3mA%5FVTd35%W?GBcCz8Nle8e@c*AB_d!SWER8aoUdf|TKZdOkw5B=)Fi
z5CC{9QcA77__!<xyk}s}5-IalfLQm|!8<#^&1*X~UXna+kw>Nn7|uw+^@R39+Hnvh
zE$|QUd-E)V7Q`VspBsge^(=um5FmliCy)PJtXD9RiHI$HtYt;5mJQjGQ;4x_$`JMJ
z9Jk~oeI+%X=`9~#9FsUNW0oTcUmw#CO&}`p89A+D!7stRMkX%3WoC&p4)v46&PG7S
z(|xUzfo{@<b}B!R@siMA{UAJ#ccFOd^oEW&Q21ldRV)t~d*T46S!G1Cyjnc_@Vlj6
zNVzHj%eG^vr*PNH^Jq^qG7R1{WnN=6OP;|7gj^?)SMb#4oBG5;^Q)XVI{XUs`>VBp
z{)hOC0}<ZpjYN-qnaEutlxK(uv2eJVvd}NJs~tg&^fOzB(#?7Eci3>BRSg+d*$Dq6
z@C&#(MeU?)k33oubO={H(7|vax3&=p(0l?u?yavp$%6s_<3zXpsWFLG#YPX@XjXy4
zzSX0lESIMGUc4cYXMvYOcOkwZ{;bLg{Hel{*s3`3Dn?y~x2~?uy&AhZ<tbM_3<ISA
z(*iiGK=HC^0lFD>FY8^w&@9T47O(0Lkt2_cTSZ-^f4DbAhv#?x!g(oUHDmB=Xx)bf
zs0b3wqiEioEHbq%@W{Z3;Bp^hf&Pa)n{#miAP4ilm4oxV$IlnWqEOY_u5Xze9j(Oc
zeX51OL;Sn(A(h5nuSBgP8fAS-Qpth*vWEt1*zIRg=$Kf{cPS>aUMfS6SN+ijODoDV
z1G)Ilejq}C{gxX)<pTTZ?=p9>Ui#6oI;!p_!HH7NG+wN+UP|F;%s~u8mrHS;eCg&u
zOwiDy9KVFFvSf)UDN?}VDM|v+jsF9#wst`nWBH`Unt<3AZu4<4>RY@aL7Q?SsoUEV
zl2%Nw*EfIpD+k$u>)`FDJq~+FH9?j7ZUP%mGOwv_{I40$h)o{it3{@XbZxVwWUg!r
z=!Ncx3+1*0dn~$H=A>IDIB8Pn2$rI*IGR`7)<F&r2kflsZ^&RGD`*mGDVoap6Y%&%
zh=MrbSNq42OL7r4@Peo=W(dWjyjtV04PVIe3i8qtepc?*A17e2C(<$o?d+51$ZBVh
zXM};zoIfXpU#_c4j;LWuYk3NDPTe}kbDW%2tdCnq;>am=vS<{;_Gn(@qS>9eb5=BO
z6x>cmmxXJ$Z)GPZ8bvFt4QRC>$zgbG&ligy#Wbwu_cLZ1rr~5DH<=jGt6jE@jQPqc
zAqQDI#}a;WTm312*iA4$Yb_nIIL!p3W2z2^=u}9x^MKYh@+|fV41IB|NLx6bMJ9;l
z_LA#(94fZW7~gC%&`K^HS2?oovhCL*Cr3jLyMEyEmR!UfSEw5&`C~ofc@80}RnZjP
zxH3;G!q@V+1R*88`IXcYX~?7Fx7oF{^{tn(m}EH9zCUx1nP?$fWD3sl?fn%^VaJ<q
zc}ngTZr|fo%jZP#m&Bt4M=H?d1HFt7a|PIcMt5@=m|9m#P~stqoO7e-7dE0ik@oUS
z$I0*QL{cH%1qteKi$o6QE&%x@IY7=eU~zSS)NhCpuKcR1j=nCx5W3_)ChrDZ(~wNe
zN_;dbCe<3lI54hQRR1kpnf^^O;I*nVyUGC>xzSQW27@%wz$wcGu&#xPyw*GqMSym2
z^JRvx(t=n6hgO2;h{AuotLXFJ>?4<A7k?k$V^*E`wK<4tRBYlOdhXflnN#aN-rmZ{
zkKXe&d-V444n7!LH$myPQFV!uNAYDHaT<X4Qn+k`hTIXwjaVqCBQ*+YR;2Iv9uUd>
z9rYDY8}2P;!r1>2Q~1b{;Us|f5k$V8^4La`f)9uh9EU;*9*!wT$ig%5c&uZm#!rMS
zzO@{ZXO@uC<NNCT%9mCK!<rOYhSq`_?2I_r8@+|@KRtgG)nup4*KNS`rm!zjD-E^q
zP3;f<Bt(ByM99_sQ}#GwiJ*_Z?obwMlFp|hgU2Y%Brrg$ZrL@umL-z1;hvW}u39+N
zzV9dJ)SV*EfZdRnYi)liQ;Ml(QhI+}J=`}?H84~05apaB{7#d(-yjABclZ-VAeBfB
z36JWF0KUR}D=`g|SAF&yp39d_)mp@g-$RaA-?X4ABBC;{+hBSXYo|rY4hPD15uo2&
z_~3>n+zD59P6lnY6dn3t{Q012GJX{fm=QA<Ge=|(u8e5q?My^Z2gVb|!^5Pv+xdy*
zoEp&d4Y{fDPwh-s8L0ozX1!sU$5yLYH~U#Vo{8*D%IZHzWTBKaa}R2-=NIOns?fE~
zLd_EGEe(bMvgOyh15sW;7R_{N6rZ4miEfO{uLx%Kj!I(gycu}?DOVwg5WgEQn{1DM
zm&_?+1zio>RGR;Ey94&CCVguD25Xp(ug>*`p-3XyqKA6E4utA97%$Hx<WWXz0>y$h
zq=<n}t~q~l4#OGK$YF7}b2H~u%uE2l-Suk(5*|u%$O-f_Km}9n9@evyXYoh)O56HI
zrly1>-3Wir1N_!OHhr$U?(nA?%bMN0%=7!D-(9Kv7aPsFrtlem!<o0Vh%yor4CvyM
z)z^W3q(UG>45)EmRDmYvuUQ}e_5ClYVJcb+clgoZl8+)spkd$yzM(*|&l5q{Bpf}_
zaWmIR4*2p9w8omiNP>)h%teJ4L}>m5(qNJiAJ-)mZuYE=P-BDs8cX!w5UC|)0aP}x
zlD0M>QrKa?#%LTGJ1^6sQ1b-Dql^PlKa+Tj<dM82Wyl4@W!8@{nS#Ynw0BWHLMXZg
zR*=L>mxRbv!uNHOCnNa4M>KkrKvXw>a#&>u2@Id`k-J@0>@czjIDK++^UDd=Qb)Va
z@<xI&g-?BPM!bumuGgh<H@V>|lVP_yZvmHg#gS-5rvM(O9O2;xqRYWJqh)h@pxEu_
z{>;h%zS<|6yJX&NOn~}2^IT0!US^7@a{}N`Y5cwFhe)?lyzU$r>s9=EC1cpoj>A3C
zdPq4Q5u?Om5V}PgXY9l4J^oCYmODpgL*$>#Q*IJ$^~n8*8j8cOT$hvJd}<y|2xmXp
zz_Ux|9(>q|mJsD0iGyr+1*}N{tur46MLQDU2e@bTRKIm}Sz2pvv-`L9G0&dPKNB>A
zjD0u0mFY&zEB-EO!~2KM?R|sI5W0L+^(^@$zHaX)ZyTc>hqOPBr*@^!b_rRwu%@^i
z5lukFN4P^cx%JetU@eP%I1Tl4TO6sa@NW&6uz5nA)3ZZljS!)gb{11YR<5ra87s%j
z`4q0iRQwB|Pv5RFHr0BKi2{mS+q~MWm)p_gM4Dn$L8JrR5h7l(yDLK?^LUVnjoZYv
z{{c%tw7+flf!%+!U<o8N2jG6M*iNY((*IB!GpKYue%*c}xXer_DInrbB9N0JEJK%W
z59&Ifoq^E4e<BKq1eq$Np$SKhV5iA|nd8T0AoYStgui$Ey{BjA=l7<mQba`TpQQ>b
zw#qJRNAA~2<~*eB2i@Hw9#E%z3cn-(yS~l3+Wy>$!T3#yz2o{1F#aEn@59$hf{RKN
zAfP0WEJ%culuQs%VEF+;`-4Z1r)WIkiVw0LAtN7KrblgnjZ9U{MQx7MBsMlc0gNFK
zA&?M!3j~a4C*nj(j4CT;E|LL_e0{_}Ktbl5GV%a&615UR5i*1@5|v044JZ^PAW~5=
zNJNAc1q%|o<f*`b&OwN{E)vplLtsmoZ<qBu50$@ZcdT-qpNGhIz(D!bU6xgb5O#;*
ziijxqaYd>W6#Y})d;nHHuNbos(NI{TDkfLJJ6W1U2!w)Xd;&y{Yq_&tHm%W02}haw
zNkfh*A5r8~w6swho1O=UGhIYF>*jEtX4{>?WU3)HhkW1hpm83`jQ+=>{qlBGs)rVG
zC@}O*m<~9aOv!^FOK2$FiY5btAk!NIAY7UkEP!bq;q*sOgmS|%&t3TL&z#Lj7hZsS
zMqx;Y4&dVuz)toaVgf1Gwnrew5Y;Oi2O&;}J~(JUTVztS(?UL-2v9_fmFe4~+sW)<
zBZpv}m{XBOC&^{sZiZRw*eb<7x(#s!2W!J7vI9s3nU*Yj8Lts9kkqFX2pM>8ZEd~9
zw{-<02v(eoW1#{t9)#eiu{MhNVo`>)VK5p<##Vh;UHcBRN%A6rppnvwK;t*bnadz@
zI{y{`vP2z|{uW1+VoqU!`}606PuUqE&Bx|ERL?c@X*cO#Bz+)6F_k$FI#z{oL86K{
zJGWa>PL7B7?ak5eP<thy5jb+=g)J2^xw85Cq4yvvfffjek=6#JFn*y8qDk@QU%l>M
zA{8lUszrjNq&_y}IlZ41dF3wmzklQ1?>6znNAJTv$fMA8KyLd6ini8MN<uUn6WcI~
z1y}dD$_#1bwkC+t^iz!yV`S0WZuHR3(zE^XabR_Y=tSDVrJVw<#6Y02f6g6B4t&kP
z<+O&C42Uz+&ceUP*K;tW8jIsN#WrPGE>;-HO=`-^kQ2b-CtB`C$d^QyLOv&M|K6}u
zkd+1}=P@JnA>k|w^dcf7>_LipI3{ibh9W=#k0$Uo2~sueUBJ`;K5oo#PKgZZz_k7&
z5hR8Kgc31s!0I%sLipfwYk#Nf@;;9Z=OSf@djFzphG(|F25_+Jick?wM<U^uVzv{I
z8u9=<;BPxn$RQCqI0jfFl7U27a4BWk0GdgrYcN!ti&G80D57WC#7b%n7$uSMh&exS
z!GlBo6l$Amd<6qCDhv~9CerNvI+VcG(Mm{T<fS;v%3yhCUQ<g<7}|Z*0m*V4T&wXK
zg`H?yvhk37REW@Ho^FN}iIcpGtY$ldCdTe_4hh{`lbc;HDs9tUdWLp!ixV{1)--Pj
zu}C}gawiBx0Yw8g{ecmPc9@qHfRWgVErSy^&lI87*L6%QxnaZNMGzP<gIJ4@Ajx-_
z)8f*zdy}7myfJRp%`$mqOF<_<?+JU}I!H!f9JhHq+1)5*GPt<0##RSDd)7BNf;h9a
zF?O9Yc4ot<5&~m<%;(I@si+<Umv4BJh&tU>kAY;6ViOusKx=0N+gX#hEHuoLYlBXl
z8fNdjv>izgjRWb1o*1JvK0FOAV~=qnF%1wCJO9VT(060e4a1!0h|1yCc-gDP(4vg2
zR>V0nSmSa@vmPCpGMNNyl|L6>ELCfAx3;&&!g1vl;vA`8vr>s2dCoCT*jD=MTG4tq
zqg_%cjV?9_H0~pThiFfhA+R;q3xdExWEjB>s)Y^55awVsCqhlQ>JZ3mCGx2=5LyYg
z>bmL}qJw#^l5&SGP=@|ly@V-VaNdhRuRs@UbR8Ih_sful17-q`se1F)OUMO)r*rjq
zb5lhNXmzMD0rd=tA@(Qt@d3|(aDWtCEPF7jo)1>6qz0n)@%x|+f&fp?A_teS`{IYt
zDs-Rxq5OAWTK#X;{6rcA{Zsm(LxYNhpg1TH&_G=Hcm%(EhUiAVq@slH4s`%N5zXU|
zY&w8`h%kzZFNN~@V-3)*{>#1S--T!4qvPJTGfmeAwGIfGbe9AZfxxpEB&PWX6EbFS
zpg4m+FpyM<0Z0On=g(7)C?8r7J`<h-2gV38APt*BHTH}f2iF(V1M+mvr$d&^Ieuwm
z-JJUjb4SB`4*+$pGlvQ{-NOfG#N1+*!P?_LH0G<!@y^%xZriXtbphfUkhGLI-<>l{
zwOX;XA)}n|;x2X@z|Ct}5+|Zu4fhwY6gM1hCycyn%e>z=&JH*OzVD&w$f(Ln;4KEi
ze$oJP1-r=IxEy`LCv7;ZPY{QGaje-BvhE7Q=|71;UrRl9PqFD7;cmK(uof~pE}cd<
z=PBM39v5795w-%0+&Ihl@2a*78GW}gpZxC!9vKlE<+Z4GXqO~)HwnV3Ql@5x^+%bz
z!I=sHIXBVst^9)wSm`&%iNz#vdlLf(rVAS;k0^d<qCrJT79fa8MTftN7-%L2h>|2C
zNJ1fqM}FZRHz@tGL<~a`)m1bkgds#t2?Yc(F%2Y54J!o^5d?`MNW=sDfHxs|hi_OP
z1LZh7NchwhRILba%*!NbM42WE?u<2v7(_@^z%;}rJ+x|qn4M+~5J5&6ftistNCf5v
zAE|Z`1_|Uw<f@h=wV4bB6qwU~2d(LT{C)M<W+T_a9^*DqoOYYQVfBy9T^9}>1Q8Dn
z$=d@n=I-=S6wx@&T_J+C5=i90xvZIhcJT7=LWbGUX8^~>a(rxcwK5=xim7R6V!4hX
z`_Oa|5>W#oBo^@C=stpP^kGJ7gL#e+FtHleF{ObPoXjf}y{Wd2x(I1K&z>1}#YUMm
z0}jyD)~aN^wF{vgIMK$|>QT+w%NZ1L81X3!f>f~wT)}2kp~PHhB^w$Jj*8kcAhd>r
zZEBH5ob6YRH^k+lrnnBx2oA#J*Ji3ZwaJnisIVm&8jVC%&2w@%SQL~vD(s7&+`z+P
zgB4E=XggGs5K~N(6IAoTq%SlNNTrA(A`*g@iUJ9UF2I{pLi9^<vp2$U3!&0Ggy0o9
zB(af*BWvg;ILhcY27_8BonJRC;vjbo@L78m*f)eQM37Y-QbQqorW#@(Tv`qd59%6U
z0Q*c+?t%SE{ic4)Y`_DdPjsCEcAZJ*L5xo@53Hg@r1a}%BB*4p_%OHQ@o6;ysftwD
zJe{5K^gV0gBamSu$%B+b0^o=~5`joGpoK804#D0WA}WoS*bCqwZzWTj1SW!7A^|B9
z%oPfxMNA<wO2`R^AZ*IdP9J0j5}IlxV2~Lo3KI4EeLi7d;KC!9Wa2u%u_u2+bh4<c
z_~w%4X2c}4A;=UUP%5T~fQW&lr4*p4mXJ~+mI5<I1_+*#QnU<09bU5T{T)UDGliUM
zVXy=AY&LrK@OC{y9uT9m==^4lltT=u1WctsQbM#Nqp92C;(O0-Bz_1n{8sV(F^3+^
z6TJjXT{7umt`9HLqN=K~KtBn|bu7Pv4zTy<v(6nJDud}G(fj^5Y1#c3^568s%t0Xt
zM1voi74JYYF@X(!&KqJw42G3sF1G&eAL0Gk{@iJ3&3~b%8{mP&7)3+@NL5r6De1c=
z=A3lGa&$tTf<QDXq?14@I1(ad{y)kGBe0m24TwC#23(2eYuF|l5N4SML_m!SG=H{I
z;S9-wNRWeLLjzG^kzk{a!A1@!0V<;+jRuD`Nv%4GG$j<!OcQTT{t(Q86A_Jbu+Aa>
z77GC|e4@deZ3G5rfu@5H@iO9a491NxpkUZ>hg;g|B{#+rFmtywpxcy9keh}eGF;3e
z0HYXEn$=p+m=OgIHW?+Em?pv0qmF8*v%oCWRTm)hDaO_SLx~l~3QB5(prnXGkiw0=
z9Cpxp9hNMn3AGxH5iv8Rqj}y{J>>>s1)zkm)Bqt0J21lm{WDYa-<p&OYt_dB6&--W
zs04Q0<AFDed4T1!LT8NeT#m#oyaEBZE!d6=vtBdOkV9>-U@*Zbm+QMIF{N#x_0e`z
z1gQg1vwIAXJW@|4R--@T@lX@$Nj>S;ktu*8r-{eQ%<S|AdO{p8e$W6hKAv)5<=4Oa
z`r@mHzv4ESIHKoKKhE&Z#u6+Lpb3(Kk=!`|EN})yHdazZl#X&lhAI!eI6RBlYkwZJ
zKOqOTK+R!?a@iphLC*|yVj5%D(e!h{!p}$2V44SVahMM*2P4RGDWu}>?Vdyh=wu!M
zN5hlE@XzF-p_THKH#0kwPah8Ff;!1hC{n0eQbO<qKdeY#l=OkT1nNi*)IYQ(g`j<5
z2nG-n`0}C(KHaP>VjWPLFIU=VVjW2v5C$i#+e5ekQ38Pg>%=iv?B~)B&$kRJV*fN7
z>45yl+<56PFKLY7U;#M<#rbeF#v%!aI4ejKQUYMHi3W5dNQt*WB|zpy0jvu!3Cx%b
z;&vVYZ|PgviX4TY+Ml7>1WL^XN)Rm&z`+bdcZ%;jK?it`C;s~;lz;I1J<fy(jEsjY
zAc!OTb7^(FO-Ylls||?zBpi@RRCfq!Ks@B9bfO!G6JlV(Oaq{R{@CtRpzhAT>_Y$u
z^eN6^#_k}KrZ5@_k{BWM3Ei3z;|ab^eONqh81XITWhm!{m}d_^)Rm@;h#C`Xx9TEG
z_)u<>>vZbsWdP=o50vwEp5@JaXIq_0N<E919-}2+`F9@uoK`1{{Hy(t#4dOy>BU|D
z(R?%P&~NU)OdhfIV4H`?!1Es4I8nzjLCp1$ArA=w+Ew4b$<xGqz|#>VBoP{IAu+}f
z{Zu}969_hXjK2dt_$cv$kVO;>Ey1;|Kx0H^5OE(~v2Df_OccmLvc!%i<w7W3MWUL7
znykw*6=K9O7Y3&gQPcwvl!L?@oRl>n>HyRQYP2P`g&4^QFhy#NC4h{Oa#Yr0gw8^o
zL!^Mz?36N4Oq8<?96HIHpJD%D9P!bdsxZj31W1GuMH;IjSnZ>&_P98eGjPO)_XQ$u
z7(i}27~v@EVlK389hZ=CrK)WPR1RWp4MtQxx#oC5D047SBI&5FG;fSSq!Q$Tq=6+2
z5u-ixtpXV}WSDf5N*ZvQ!O4P*Bh_ui3_Fja%@%18KT3R!5suDMNAE*Q0pN2N3j-jg
zjF3*HNTLG8uq7>5P0#{#TK}Z+)BB+D0Q;U{ql9K!9S)~Kh7%-oYX<1u6CmtT42}bE
zp+F&lW+Zk68O;bW(&z4E!OI?>O$R6u*wxhNl_WL_F%eEFMI}>M<Qjs&1`K=x6XmB?
z^N5cy@)7P53JNA9iK&(rs3I3L01OWo@P01I(sHL^$A#O&Asmrn0Pi3O17X4g1}->l
z6O1uzKsESzR1`cyU(+V|dIBJkXF@$gjTFZZl+f(ELY$TP;jgFZ%1?vNL!=;V8v)`P
zPXmL$9Kg=RHTn*^bV#6kpX%S{0S`BctvaIs#)Yg5!#rd#Kq3uGKu`gcWMmjx*|czy
zPX6sA05=k776divj-GD~^gs`U_69f^5%lY**#J)WVq2msMq#Ba#W3<Hl+iB^^9@;q
z@IjC7Wx<UZkb{&;2%{rIOl5&aqy-a-Dm294;xx!IvIb@tW1tciD3gm}m=Hq}m0G7X
z>v}h%dT7RohE^iBLB=*z;6?><$6Uf9!K$F5HaRA26hFz1&I$^pkjdgDm^&JdHf0+v
zaD!BLkZ>v*b|Ko-hHf)iqgc-2OcDFv;Y}yYVT3W5OEZ{QvlLm5Sx6tJ6w8pjL^us0
z#D2b=$3gu@3SgcC^57m%9hia$y?DD1-H(cS1ek;<dcgf5-MG<FRZTQPKpz<4(-9#O
zG(7*#RxY5Ea{9wUs$uSh`yufYa#Y;{8TR~wcB&#K0+fR0s;XDXTuxwq*$OVKOeM1w
zq%vBH%tI>wO-@Y~vHG1G-gpiqtJ;M7&&AAkdV_sOW9;qrw;n*gaw{@YM5PTeB_$Mq
z6p#`nB_#^gM1)8YArjJs6tNL2Lr7Ar1Op^Jpk2VagrowgAR!u336?1;g=ktDN&+a2
zNI4|}kswtnM2tuj(98nT&@2*#0}xR|OHCrtKm{W~5D+pbjI((?-g<?BzI`~A4xu?2
zExML8#XBUYm!G7dilT}NBBCZqAZY@M281d26ooMb0?!BF5F6_gSQH0}8tZM-8X4Ls
z;~5l81yNFO9JS84+Na=#kvqZNBBsX?!z|tts?nf|qAavwIcm)z0T}@11YiRh7CDRT
zz!2Cq($z&l7$Ccw>>D4CA*r^f#R+UX%}(L-FTVt}3_}YXZbPBhoCC0AB9wCN=D|iN
zvUqSfA;d$(|1PzTooZFo(d#o?(CG73bUz?_L*X~_gn%0b(E#{7+6T5%vO$>#AYd3u
zL|?>6WQp+TdW55>#!48JnPOrlC?JSInpl#iNQRiAq$#SQB_JwE2r6ZmiV~@cA^ZCC
zIZolp@`2N~{kH__6=c1M+U*~qqhCznj{Tuhckl{LfFbXrakuQhq7H=c3^T9@3{okF
zR$PBx=Yr`_`D7yp?{m1~JoV~1SeMEimlvcb`5~xmg+_S4JyhevegOj&a~%nUohcKi
z(IF+X1M@fe`+iI@u^*dR@%<lkf3;ZcaC9)ISsy4bk>(2;q*Q;30T2{IjDkRg2n!Pv
zG_nOh(0@>Ue~99Dpul_mpO4=Q&=V;ARj7URRce+-6dE%O+-Upqetr%ApKeO7;Y_JW
zlZ>Yx+JAFfB0`ahlA=YLWQv4{JA@`%Pqf*b?C~yB{L_Q7f`d+kAH>C@TBGv9tLgrJ
zU!d;)hh(rdlb2ovz>B|xHE-(+{Ev(wz~0#)+=FZyd`S5F#)gK6$kGS3fJ6Qh_qy0{
z8!~(%kMDz55cx~w#)b%#>k#!4tq;t6K4!)n{b}Qcjw4G2l*p#<hw48z=i&~VUdfOe
zf`cUX+MjHD?KKE)SS+`r3Zwidq8~?b*zW&Q^Ps<w0!2<ocmVgC#XEy+1PW5%7#)O)
z2G?e0LI(iK1WL`MWET*Hf;m<c{pQNhOC+&K`ae)ag_!9=JMlEwVmd?#72dzD!!C56
zrQickyhP=sZP?{Re4+%}KVn|a`#-P_kbIH>@IHau0k;(nPU%S~bqK4i8V!jQgLf$+
z5-boHe(F}lBpVEzU^t?0nAU+_WD$4N2!Zp+A{zCnfE;oDY|@F+LZ@d@S4LfD8ea($
zd<oWQ<6>;PM_QskT!MYDqritCMf{>X;Jre6kRRL+;Cutio_voG+1~;8`mj*l$Z~{F
z!SPFduObHpC*J)(xwsRS&sUlJ@-IaaymT2NKsvD`AWx=2y*8W7BM?(3f?hpX8<4MI
zjw6KfBsP?wq$#07fM^mSDM|@>I5ntQ0hT0^*Xn^<9%M-$UK#tbEimfD#~K0u+1gcF
z6J<5+(ag@rm!C`3vAGY0L^v<R_jEm6dJj+--$0$jC7I;(2b?^+0Jd^;hv{asYLiA5
zACieE>HI^_(GK*kw*(viFR%QZ_Q+-s_%)uv{Zbop9`8ITm!|hoIRsI+JR%A*fgULe
z?ahhIJ^=otWmV+@7<r9KdLobI)(c4x|Gp61G$x1-)j0rDR7^1mKx!QRPyDx|eL^`7
zq<M!>(iEn!#W1y&86mkhH1qss3&is^#DPj`Sj-g32;{{#B2em3$Q*(Hc5hDxixHtF
zXojo{b!He^I@^mdEujoQ#il5W7-WgC%BdWxj<{`^QM)OkF}Ev#*as3N(^{fU#)Tw6
zW8s8-k_X8E&M;v5u`#AdG)sWy0po50O$=+p1|xtz2pf;?{S<sYfHgLwm;f6<ALa+Z
zSJ`Ykv2yU~=0)Ym*RTg}0m6Js)NLgnp{WNXq{&plK#-+nfC>AX1RX(vApc{q>!cn8
ze}lMCkpLDbeT5&pV9>uPVfYK{z?mwF36KSHC_x}%h$!q&$f3_QdNI$#b_gHsgQX7%
zKSUTveZq)H2LI4@3`a;(9XR%YOgj-t3<5t>&i4R2vT!U6B*q}I2<ZzzTnFVQkj!J<
z?l$Y-FECR<>yX5Nebao<Lz|H=7hyiu7?ZgDGmj9RbGk7|K~N58KF;qotmqD$F+3p&
zoPjbHAxcUJf=CU?h_D$dI28!eCv_wF;K2?5gJ9`(?mb2Zj{5@b7j<iDfahU)W7YS1
zHa8-DM7b;JWTkSl{I}9<asLmW1k^qz50UZg)x<rc#zR#O;N9LAQ(Z~t8sikC3S`OO
zXVdr5m)VX`vwjElf6h)E<kCbA9@cXwV*6tEE}ue%R{j56soW7U1QpeTffU6AhxNXc
z(drLfo}a7%GNohjGEOrBL#x)ywM2#>96&?84rowa1_Ej@^Wi{8>AU-J1q9X?gC5!1
zBD@fayZB-VBAb-pDrnuJ7blJF4GkG77F@}=CfvlkQV_&3+9O2?1tzKrzOldr+FCY`
zi8C>ng>bRxbF5P#w}qH^z94ZHVNzuMZSHN(Er@9_L#`8&^KZ|JZLc)nO>$&F>6f=Z
zMCgd5M^x&3*JvmbAu1>yNIRRMzZ^}#!p?WC9eqD$aKc%ng_}!<;q8CsT{pn7U`b~i
zrpHEQu^SP`IjmbaRjncOzpL}v0iFU0j@ISUAau9pX3I6uLKf7<1<P%t)yHBa-s7up
z!JWFwC#(THXw&R0I2(5uFF;jSL!2rjjo^Vs#m5AHi0zJ;9V>lv)e7s-at=}xdAZ2u
z2S{feVF#xa#65+sq6F+VLxE%ma3&IFFfB%5INH;Kb{OX(>hjO1eYXv>KrG0YX?7h;
zMN76y=D?oDCaLPRroJ#nq8kPVEMaR8d+aeL&}1S&G|;14CW;3GV#u3ool{h!n^J~S
zR+m<P<3#eFMD)Pv_B4qvk{!nLJsFbbXpdwmx%S|g$J!zC>qS3)V$#wZ;K<-ui}Z0Z
zPD-?Tlit8X*#;C85hO{NU`a_bR3J`Ch>31rcyf$CnlcamFdyqJeHipZ`{K%Avka=U
z)IA5idc8k{q8;FLevj5@e9x$UO#pYRn4RCMT&W4F2XGkS5Pcr(G!h-mF2qPdw$uQ8
zSVWEE2at!7Pb67YM4OC63@H#IGSU<2qoq1$@|v0lBpYcUVyYI%%EAqj)dnm&mVh+_
zjD$g;akh+`sEm_TAj;bt5d<<Os@!7Ds)tJ4vutaSby_NximJmhu*|G8D+J;fiR?u#
zf=*+4FbWNiA)|4&l*j_GvR4RBCtAWHmE5D$uYTy9a9dtuI|dmI>@Y>_8!)L-3aC6_
z#PVV?F+0Cf{!~!Z3igB(BvJB^$Wf(3F3(4F?F}jH0x}+x>G*&#+KeCWAp^b_&jHpX
zFfj6vauc@DcHkY6q><49R4*3j5mzM@sR^-|(OXLU+K7Yqrqlm#FAV2FGRlnO#%@oy
zxD(6ZAwwcpGVDThml8sZlOPBpujJ+RfH?quGh{H+>idlVClEi)^_m_NNyCDOdbpu^
zbPyXIDncG5Y_lq=Lpz5;FohDZKbPhBIUPSgYH&7&Z;W+pnBRAEt&u}8L_<SsBMO|R
zlL=w6nn=nd8jK`~$Vfp*HwR>3+ikJSS!HP&VjRQ0&j<Yc;PZ8wI@oo7t*8GBFk>1&
zx*v>nH)P4wEG$tGq=jl#ij0iNPH>EB2RmY{jX!tm`5^X;L_-WqMI_hOSu}+PLS#@8
z1Q{Y=O)yNdl#mrl(l|;+eS@TOViGd|)Cr<Ymk4MU2+1`mn!t!7Sc$2?jc74pmB4}t
zh8QIxpqQ9~CoCL<!bOy+3TT#+Ri!MzG8TlQfS^K}KqQyp$<K#m(fh)Hc%CmN(jrm%
zK6v`1#VR`-z&P0jBvE9cyn)gnVyK*kq!5gcodte=2VT#+ra2nGn-Ke&2*d&rn2`dw
z#}JLaen9LW<_PAuLa-qBeedDj|36+kxc#4`_$Z$#5uo^opvL>$G#_|=d#l;s;qnRK
zV3Lkz204k<kfZP<4}dNiL}ap%RW!PmU7s*O{oD(TAnyhJ>q7oRHbh-1wZ<ubFQ=-i
zh^CT)sRPjjYu>*Of(fbyq7&8Mnw+rbj1rV0i!i{m1h6qFB!VD<l3<b`rdWs~VI`>v
z3KA$mqDuJ5iX;+5$q^J2LKMRRF#uGQ6hzdGFtMz~AgPidVX7pgiDf62J#wIi;PNw{
zEWMltbo`2cP`X~|{F0=V1j!V^5{xndK=X&@fia^+fy2f0#o`z_G`aBAh+uhxN$P&B
z0P2vUYNzAt;zOVq9gw930@R<++sS_qe?NE|eg47S3$Z^(fh>^|B_z@`DG>-sC&Dr)
zAY^C(D*9|#nq9o+USJRozz%GD(Dd_?8{tt<WHMJCoJu(|#`B3~)Fg4amit-|1~FMA
z#|E%4gAea1pfO-Ew1I?}(MA+&oX1%rMkPabwE%<&YLKcnX^<IoILNjjGD+NSuc9)u
zIfq-vCxe~aIF1OSb-Oo~8VI2v#!~W3F&;5&++8`2?Sb|Nwqr0x%Ms29qa7B7f<mDg
zqKP1gD`_-v%B-(qtXC%URRITFnq?bC4NkU=njkjPjOth-xWZ64WI52nI%M=6p`%_1
zCozfWMDt{aW9BkKm=KeYUfsq3A-7Y%rW7|&@&r%CEAziRh6dR;>QGG|1GDRoe%H8%
zt?1!m;?glCHevLeICc_*J%pj)kP%S13{F^;179Vgh!bDbcRb)Q92wzqIdp;4Msr~>
z>T+o0ms6>A03Ob^0DyYQ03iP3+_?+R@lS*i8j&;ku-=D*NfMFe02ryKa?0e0P#)+5
zAsRrT2!x0z7^q4BViYI?Sacbn6xp2|ZPC6``F@`^$tGwiXe92h>G4dE!lcPefRci6
z2%=&NOEW1j!wKRjz%@`wO1DK>LJFX(1rXC1umE2Fh==^Y*q<-XFJ|-e`}hMH;-^Qm
zV~Q}HLLZ0JZ*E)S@JyKl`_8b}zAdo3ghzD+jTPY17ObUWytFJbV9c<+0*uid*s?@W
zZ;+^Ah-++BR7BATGB`;UbGb}2+ng1=!c&YpNve%v<b+F4{;mkW-mnNOBxD)?C_`*b
z;5bDEWGJmM-c8Fv<M+T0bX8!+@e>V16vCG_K5>!dkzqlXHAGUvkhE^OGDRqDswe@`
zw78}kDC9KZ{P=UA98ieS!5XYkXd{Zi3?R(KA=Y)RX$*lPM2T6+jgiTFhN;zthMR3(
z8Ui3i0YoYZ0K|q6I@&u_4RUTEC8$k}h^8$Ol6e@SM<pBdHybpAttd#S>tW0u)Y;H+
zf!a0JX)B>PH9xU|t&rkaymZ4f3dk%;ttR(kvMR{~B0$n+kNiHW)BXqN8GF9;J9>h5
zB{{ivz7=e`WHBs7D}Zi%zd6%WyKA^`8d0{V%mbum9`Ba+4B4+htwum*06NKzlOGf`
zXl5yhzgf&U+-7mcOPC`Yw_3}sN?{uV0B9>jcyxjFK5%eoYee7?RH2+%M~-gNF=U~Y
z*uq_S!y2rb)S*>T)Y^<ekw$Zh1dtjX@35;8vsUDYZE)MuO5;&z%%--KTw-W4aJ2>%
z7+565#V)fI&{!D^g_Z%V$|X3Gjaq4DTwKanE#~c}P{4Qs3JPU`O@S9=&FT}x*!!e9
zfH(hTnv{!V5JH5q5Wr?9p#z$u0z+U;a+hqAX$hi2o9r3IEPFq0k3Ge`1kl#ZAX_qp
zGLd38R+n``u1<l&eMuLFLAzyaBxt#taOf<BC4(Z1z(Dw5RKdVcQ@OTgusT&c^3zV3
z4or;IIWoo}t#PZfblt0T))8pT840o}aMl5`wg`G*7TSmz&=sOc(1*auCZ^zcH;&vu
z$RYq>;Z|@g%12mHNVuAoShq9@+W<U%PCn0h;wdlywMxBjH_y-O^Jb(yvO4o(sgR2d
zhWDLzy`X%1yxpd}?|(#fhaS5WJ+MH99+8AkXXmr?_1`}iue(!Dg;0zb275FJcFhUi
z!Vu6(JaOv+ct8&hi}3K@%Q+xkDh?1d1=WB>p{Sl`cj4qSTp^srK=Dnxy}Z-XVTS@!
z6*k8aAcF5Fa2RU<`yqZ=O<%!o0P^cRB_cxQ1`xd_CP$VDw3u@UjWK3w;}UNgE5zd^
zi%kaEl!*p|lfa{fp<ZTN^AKVH$q!zzqTh!NWA}FqN#MRNUOH6JY;(vxT?*$HrO=rI
zYbAh?+C$<SaY-QGN88t4qvw)gn2KnIsAK?>XnOm+n=r5q%0PUQ8nT!lkCcZaogQK_
zTcVPZ+Maj5GNqRWjAt;gh{$3xGAzuDg0c)e$F^z+JGaq6PW66qIggWfaEFL*Jg5$x
zz$`;1ZM|`a<41^klK%lP;!Xx4L=Zs;|JeCw3{u>2WQ1&RpQVzwl5P4@9WvcJdZ#0u
zdi}F|KY-(^_I_RTN9T!3F(x^&%Vouc=F(sH7usPc3PuVdA|c%Nh<XVM4ty}AVhkix
zxYkc$?6jGpiB(F@zU92s^+3OFd3{L!(;YeH9U(npE{%LVb)(tt<xzhiut(BhfzX{u
z1qghxeLitDxH>!DkJq!@DYNM3PoWP>yhn<-gU99){b|iJ0(^m}6Qqamboe}ruR>L*
zhp4_&9Aqu{iIFpBU$r}?=?uq48V<?^&ywtYf~h0BUi?b|>t=&(7$*E;FgJo4#KhF%
z4s<YZKP1_P4H@97o+qLQ!Vf_^o;O1+MU0Ulh|B3`=8cAknx=><D*UEppq8>C46>^+
z$-uWU58=KUg>3kx_&2;mswhHesQ|&i422IL%67fGI~IZSDgpxle%4$_i44|=!ZS7g
zR4@?8@H81-+mUUMh7nei8Z_%D#+6btOwcu2Az)V8Ye0%2a?Lu7Ck*1W4q=%th616I
zT)<983>`SZJhQ|bNe%3=aFZbnFffA{UNyoFj3OZ+(IQet7{E?uTEX8K6hs9?j3CHA
zXcT-O>D1@di2WZRc;_+~i_J#VY%@gnL;D$VtYF{fOZR;utDtf8b;NT<!4UM2i*{H-
z(A9^x(8YOn_Lqo#9*Tx24O2L%za;q`*GeQmu|b04bPQm*ZZ8)JzGw_twUaP8c40Y~
zu0J90^w@da9uq*U!Z)8gB|FS8K-@#jGMWYf=%OD6PV1?ml7#P^!ucG8S4$z``9tQh
zh4SI_>sEVv3&RZO!&Ehr5}$J+og#p_9Xb7fC~2DIrW1Db+}`A;QG`h5VoVQrnGxTZ
zpIxj$f|Pu8W~{D|#c;l}13W4)Nj7O%Z>mQi_jw5-bmi?qp?C*})=n;1vamQ?2&SM=
zBz_0r_=~jeWKEEaO)8PZbnFGtZ^O|120R1*34Z@~<xv=bL*+evho_KYeot9|+d%O>
zC(p(m!w>X4&ub9)L(rvQUwIgL!n60@H~AiH`Ae^6u+4s%j~>lC#AXcVO7Z1!D=lp0
zA*UP2l+#agago;RRf!9E7ISmmvT6PHbDN_R*ouqm=iUdCQNg4C)LMoDrww;ogRyv;
zHn%&)cO$o1fbKc9R^@SmW2glm-qzaHCeX#9q}-45`OGnf!8>BxIOP^Dk^t+2Oa}MG
zBLP{Ky3H`Z`(pQ?*2;jQvXKy>CPcUu1*^4zOF>jth7%qx-!N)&O+qP^3WTmiS9ldx
zzm}wqVigzeC>|hPrjALD7`Y*X4i4x#1Dyfyeka4#^BI_7sDB^hK*;*k?JE^2ak4Fk
zPPF>S*u&<mc+U`dLBP@yf2QYQh;T~#g*zwSW1hArFIkzl$$ltzdC)mcAW$ddEAm<q
zH5UX;L&c<g{R>6|JXzf6y#~DS=aU2W<F@c(CVN?VAvmE9u+RFeRfokpcxnJ(41`V4
z^gKiZ&(+)$^-3X32*D&jHxvIIa%KVW&W1=C_Xo#adwMFWuY3TW?-NLl2862983KzA
zU_<4T>hkwC7-5gvORZs`C<&mOsAmLeZwexjRYZ9mo0!6!<P4qnh^nhset0N+g2>Oi
zD-eS0nBgZO)m0S%F;N7>5ivDYbD_ZX%3c@*N?~}y7)f+y2HOFUq9lxjj{9I+g)tHs
zC<IO@LAJ=o$cE#Dq`8DEk`cCqHYX%$un4t|L^4285kN+qRWT+7!eZn-nf-bE$2ybt
zJp}g&{+~fp(D69b)<D1>I{wedW6@LOdR-@`0+pf7$cI?b3H@=ndt~{zemb&nB*U{y
zpf%rSk~GPI5}GvVw|O`lcnEpz5`{Yq3YZZDE6F`ro;0xqxWO=3Irc+XEs=px_&$v>
zpUWZKe8t8cPe4vIc6vF6U4qDC$2+IL=)~AbH_t(TuE^0HB=>g2X)gYGuWz@5#9_?%
zkWe~=A+jECqu>pnEp@L9-VxMZ3R0igU2pSAfR6cdSO%CAK?M%;6v7;CNFF_#5bk!@
zZ(|UXw4e0Uvl46Wu+l@HWDXsQt3(P1<Y_&)uLY9Py{<xT6BQVcX`)6#B{IekfX~CA
z(3JRXSb7)`-OI2*KHbG&2Viz!j-q44^#jc-w*7ib>uxj%V}P$_`^Gp#3jrn0{{;rH
z|3gdSF5Bbyr2&QrVHx-|$W~a6X$Yi8OZDbZOdei%{1Q)1dd2Hgi1~G`#+ILac*f9r
zq{Dg#mW20oVx431`i)z{gpWC%lX32drEPYjlA@R{qY5c$`HWn(q)?wNC0Yll+D%gC
z88UwhxS>~UJ8_($Nznt&j5v^R{r3Y6got>vE-NJlX_cfq6lmK-Xvks*AQ)w5J8V=;
zDca(JfM9EBy`dOnQwtB@*-X=;nlZZARxoTVG9oiD-e%2f<hIEMnaCz8h*6Aiek}@*
z)snLCOk$6ROB-oKl$tg;cIqm3OMzz35XWU(%QHa1(L8J*#CRM+vJN)*WL!d6#Kjm!
zYgt^GG=`F}oWn6z*`|gwl#z=tnA+<+d1jEd^+pQ7nixtA!X+^2%UTvF5z*4|QjJ#O
zS_-!&GfaX^!y%wU&UwNfU=3~%fWef3yN>aYLosh{gg2qFwHk9uNF`{utW-6m5rc~v
zNQTfzF|yIZ6x1TdhcuCE(-BanS~g|ECOmAY==GURJQH!sD;b-`mKa9}15g@c8yg{{
zpqh3_5)W`F%`k%)4m^2CEyEMk0dc6sjAMA~b^#tbJRzzQHyE+F;JCLGma%sX8gaLe
zMvP-&2riXqssskuMmR=C3}(<+Mo18$fs`IrtAhY_6bT^4WZ`6)aDVEC<xx460O}4P
z{q6m~PZxaEJI1Q4bq39C$5E71OjcmH7&Amc(S=7d%UCdEGQv89+p<|@l+dEYLAGM(
zU5X300ZPRyY>}cM+)<To6k-_D9^MrIx^?G}%O>g~z^$r6lB%tS$Xj<oP8879KE4cI
zCmc)-=$5gC42!{IY+WoQA^S5fBGxr38KK20rp(pKM8>6qii(VGD*==&0zQ2l;}=ZG
z?HfF74Y1NDFpukzPg)Y3kX&YR<|3NMynv#1VLP+p1dq0PNKV9uD>W<zNkXKMX~0Zb
z(%`TfKSpPKm1bcvRTTtR78Fx3PDPGOGb&Pq5=2yCuW{-;b4LYv2KXID24t34Pbf0e
zrZEtV=rD1&QC|=~2hRv}>!}7`$Kn0hW+5<IwupbGc*xeAnRL!SuRO2Z%=!5AUfg?4
zSF-9*_F<1V-PbCgvtjWpAQH%MAU*-#G_ff@Kue>aB#bg^+)cV!OHz<ch#PVkZkiGW
zwwq4^0bRoYKwLu9W05vCMgc;y2yb{&GcbvyLJma{0BQY_9GC|r7O@<K<c)KRR&O;y
zI+Vf}2u3pyy)9`twGpgBz`$}E4pGBJqbHWC)R`dUhOJtP9TrGhlyL-u27<DT2EZaB
zfeAA)I1CITsgTySsnrxvy$J&I1Ee`l14bo@Iw-}tC?E|9@_hnmm?9#Pk4>CC2a;TD
zgdaKr*2t1Tq}phVO->>U#88+ZVi$E$G(1>9uCVbpusGf)28;|bgam3y1q7xlOJ*Pl
zsgQsTDAf}UBta2E(vZr;ki-yG9@ue|i3&hqkb;tCES#i@i-^iT*i0fRAQzMPA%MfT
zu*l3d%rzz=gk<%j5&;*$fdt*DKqyQkp)pbkbY^o3JNv?kqsiB+ie|)Y*qD)Jlki?#
z<1rLA{lOmYI(*XhrW&(}3Ec@z1|T^!j_pCG@H+A#{^>IKk%<W8Zs#nthnbV@K~5VU
zc-!@Wk`VAw1a<-e@>jwQpG=%n>NNx7pZtIEwA;>&6ZNE(0gDATer{!4#RsVG_)QDf
z;BA7SarfVNgb^exDL~awx`zlUpbSDp)Txa!jS8efKol?qAx%LEBM?lp5R}YQ5fVU<
zEg=jgF$EBiB_xC~1Pw${0ZU350$~c$%`h<yNhr!Nl_@YmRZUeipi)wzQ9xc=05oVY
zOf)!R8@D3;Tr$dwgRk1e@IK!j+cEK!Rp$WdvPCbV#RINToXkQj#K9ah2?(<=3k)0#
zVSup63?W)bM1dn`s*T1t>41uY2qptiWMQZ)TENv&M8y4{$8Cm2v53|FTQs?wS1nRD
zMF>S96p=aWT;|xJtE(o}mh@kvH9NuY2kX|(u4<@LETp4$OD#%i1aR6Eat~A|KW@(k
zD#f83bVudG1cuBu0lFK}w?NU(H@MmF`Vle&`94KHud}1$HY9!@s~j;5DiX~FwSLc|
zj$p_ao95)O3K)PQ3Q_jiAcZo*M3j&-6AeXB5=AQdB2O6jhv3-kf?<l1kqQEkXi}9^
zrxC#u3--bllk7F#w~GW{#oak3DpRI_jSG83=9ZP9KwK6MB?ttnq<;@ML+1&@(+d4z
zYjgEGo!%me++cG-ztik9=<s@h>>gu><uM7JNE=8{(8WPZRqut#r)W+Hb}5@4D0#GZ
z)pcNC@W%p5Dp%Qu1EfR7d(R1DmpmX}#>ChhFQu6Zmkbn<DDj11EoC#TO^`3(@a06%
zP@m(6hnVadl!|E$&BbZ~;2{7&zr&e=5(okga=(DUDq*UnXsimc>)4l#MGm*ZogMU2
zqlIP^v@r;NY%wANHIW7s(Uf2T7^w@87a5~Q24K~Q<|ll>$#5b<m8CuwK`kt%xV5BG
zW+Wt#D4|0oN;r)Z1gMZeks#2t*<c!nB<ev-f`uYMB2|(dW+My&WQCZm1%@O}7EYlw
z!q%V+nS@9<z{V7aK$+k&GTyaX%t%dUQ!Gk~6ADKN;KnHwjX-MttOW4a^2}ujR}_b(
zaVeMnZ3)|WQFe+7<zfn`6O<kU3PF=e?s?iFsHU0%B_b3kiI9{i3StTdl7NVUK%}HM
zHy9$Wjhw)5ggC%WU@Ivo@e?yJ2tp=t3$X!*k`-uaD2N2&9yr33%OIsJ3W&ojlLrAK
zI=?@NPJnv!XpF?YF^jQ=s@g%>N@U(Ae?S7u4-^M~EQXnQ9C#fGyL|EjRDR=*o$p^j
zeZ(kR-&`U6!R)_io?4u>9*qRB?8w*Ee##lI$JmHwDT!mqnvtX)GI9XWorH($fXLw9
z!_9^RFCq#=$TW(N`i5ZA{&#F&4@pKCTQQ6m!YV;UFmYuDb4T5&P!5Twe8gg&07hO{
z5T0*dJK7yW55*m?SDqb7)Cc*P9nYi*lHn(v*oDD`j0F8dL=I2SG%JDtWO$@HgR%xU
zxr~EwgzcR0tX>RyIHD^9#fE6#URt(r?g~9`7@ZyPX#<ivCF&9-!&n}2q2IIlx!U?b
z9j-9IPZ<XzL@8!DDF$Pdc-}rcPAUpIg2O83i}92W{Up~mbZa@p5vpQoG<f-wnv1H_
zX8TNDm=JDCN|Gy0mDYsV{LXYru&oPRZ>O^-4nt8`Y~FPmN2B~25!r?@yS0fifCtj{
z0Rh|EqQ`~dygB*wGC-7yQ9S8uqpXy#A&i&Gwe4HPj1ntC7LZgOhA0$6V1U&Sln6jX
zU4`7sLcO17J8iBc8N!K(5|69L?~uL44Zxx}hd3V|3atNL_1Fki54hqVruo$1kIdg%
zXgc%2PGwdfslD6+e{c}_FTpwkw4fB>3lf0)XisVG55OlpX-z&ic=Ofewq!M;OY7i4
z=_c@S$p&ivsK|<f$iV|XO=yy0Q*n)NF*F&GO%wvbQVkBJ#%L*Ev{@k&RYB@BI|?R;
zVFM6x8M6!{(2?)p_yf_lfb|bINQdC|xTjFQK>!EnkUWV2`bbrBLHEjJi0q=t%t-tp
z!dQQuX$1Iw&SO;+b)mjhe(fzE|GQ^R-7wL_%vMIQ&ql%go3i?!kjnv-J<p}{`|vgI
zJOfImANe20hiZF2y%YzZecnZWaS!RKrXi$)X<vV7=%Bp_;!)NZI?lj>f@TtdVo-xt
zBt+rz^a5+74`G<~C$6WgdwnmG2b=;-qoRQ9E*N~4i9gtVBvU^zfZWuSSF5S&$QcBP
zGCZL%2xLl;h6|@W@SV^Lxuz<D7I=^_kqvtI+u)z;@xdEhYiws^=Sj>Q_D^Vc>DUBC
zGzmp1Z5aTP5g-vEM{sS!0Lqu<fXRE=93dhr8j*-Y#vMaQp9KiU5ZN>o6e;SE)5chs
z(2_yXh77R8q`(w0H>&~00w{_+q;ecAJK{MJP!uf`gAa~j3`$glK>YAHhVCWNRRLGX
zYetf#{C$D-W@J*78VF1(9f=|47YeUx6a}ys2po`6!uGGLfYPDulz$YLY!K=5OjF2&
z>P`Xh0F%ag?&P0Q%Z(fCc0MfywJss!nuprWFxx~Y2PH*f^S4ar3#=(oo<NTP&R)Gd
z(I!YCU?NDRQbJ&0MW_e@klLD*XhM*rLWD-DsSD~n840HzLV6~U2+y$Sdphgfig`e+
z%#tq>`6ef-R8EOcLof!Z3P30#Vq~T&f{>&dQi_R!O5XlLd;~tXv!eObyf_9O8g}`&
zJK`s%1KgXzJ`w}e<e(%HL3sxfA5140VUbBg>Ohpq^dAkw&{yR5@*=p=K1NBvIGv|)
z#*HVVNzNgp5Ht%A<M7TOv#s1B&SVh<Wc-&$1Jn$Pq)`Cma{3;0Y28#F%w9(t(EaW(
z&l5y@+b<t*mEcKXfdJb;r#rxHQfmxCUGZ>~#HOH~meOSvZDd4DL=f?#@3Coyti}<P
zcZ0pAnAK52yvp;<V(wh7WyH;*6*U+dG~ltX-Y%}j_`3`njL`bWG{d>knd7WtVqXxG
zEt!--JOU+QvSOXA$_T>9>hE;MUX(#)k=*B6S8^mv#$ejOIft3mvSz`LeE^J1bs{2i
z3@;L-s2WT!T!gB$S!mHhRYTs*4a7xUo?yaxf$m&-UV0=ck*?pOfFb}-^!5woxeP^I
z&zR-ByZ6+oq6Pc#TIiY<lu#CwHf1oFgCmLpS>#GD@8E)k0}k;d0rvZPRaJWK?(WtG
z(B^PDf!M+bk{s_yp6RM03<W)Xo?#Ct=EKP7sHq|kEWrpJK9H6V#f~ioN5F?Pp@3vW
z0gg^6OdoDwLH6TAjkdrfiIIgSaxjI-Co$k80~B4<Fcm%c_2W5|!`aygq15FRR23MO
zg!!Su6!YdM-+*Qi#1teTLkg$Rc~_2L;h$5h4Hdy<j&?Py3+&O$^1#p?-zs@VKF}dk
z4{mvnZxBgS$-C!@X+zSHx`D7Fn8L7>fQ1VUQbj?mOpG(^jmG}@hDkvZ<m-$!!saFx
z?rj9S%qUe46Qza574dfQy}?S7QOMW0n|nQ_R8<f{n2<6q0Gi+(NVtBCRpbH0>pIL{
zk^ZHB@s**LH|y-=X*d>TW=3HVnEQjj41)_H3JNkjQbQ*k)}J%%51i@-A*qQlu%sqP
zfHXP=`IE0~cOsNXsVJB#fTX%T{a^I#Dk_H6AyM~3;b0B#pCm*+7LMwaz$+2w<9L!t
zzU3)Q2^wVxFOw7+sGZhhw}TT=#r?6Lb{u?|89fn|nTx*zE#V)2v=B^Gf4?wBKf6Av
zBs4}6{7L@V5-ETpx^#j5-UH+9hSOXmq#__Dv-wJqP{Rm-)os^E)f_X<FZKS9;B>@h
zVY;SJ*@8KZ1_LP1`cb}^32+4fyj_Ic`Tl>4x6YV=q=zxlz{kT!uIu2O!Q<oWXY7^F
zuQG#Cj`_&(aX;3|)}%vt+~P`G8iiyEgjc4uP-O5%xQr87ffAHtADzC@DKHX3NX{<U
z1T^t}qloC~D6q`Z7F#j-CBn@PC~Ex&gpgVJe^1T$L-|+GFizVsich+E8ZgduC_kQ8
zT*{I^QBt+jpX4R@A0c6+!MG@?bi^n<-xK2v3&-d#rj*G+$we=f*Sjhd8Ij;=g9}tr
zl|@Pw2Tl`4@Fp$Ymmh;lj3;|r8y=H}smjhT8qTEQ+`O+M#?wY*6>Z>aR^Y|uW^aTL
z_*fmfrkY26ej;Xqpk~jsrUDvm=&R=s8VvzmX(#v?5Z_IYXz}xr@fj4riwJuX1><Tq
zvkAj8;tbgWNoHKk#5;CP8KlCO*obta*xH=-3NRCbDd7xEHh)PbA#wfO9D+vzI2H(T
z#+-yrfwL4CDG7QbBneqTWRFJlH;3@>A~p+2v`lDMf(KY&Ct$<?=YZxXD?eKAs1u>+
zCj6l~BKetudTs`~h^bx(dU3I^2XX&{U-te?IX(bk0MWqQE$C*j`!u3wkA&miq-^61
zUoVfD%;bgG1sAoRr*kNg!a*vYp8hyPh7x?|m(vGohl3_04z?T6sBIftNcE}77q|lN
zIzzHCi_}OT%>nd61`Mwo(&~u4QHG111-$#Ol-_WI3CSxcddxbO>`r}g@R~p74n$80
zu_htU;+Z`LAbddS1UepyBJ+LOm7lJ-{nSIRt$EFZe$!)6#GR1({{6`b@V(}{p*Ag^
zDEi8#Yd55`3}3}A2jam$Med20_6>gEb1Q}+>x>-ro|!-?C&y!+$shB*Sb!V^gdVe4
z4;fxT&xZkd9395NojQMQoRmc|M&|ejf=^;aBEvY9nl!*;u)wo-h`Kp~k)v7(%Hi%-
zlc<a#4n(WU0V5l-fm%ZtlYI^~Zx;@u$=%lWJx`QV{N3{?=M1Whom7TEZg;%OH-=SQ
z`~%`o<`?$<!l;5s_xN_NBPk-*j7&_AfWr~J*kLBiS$!(6gs0VsijU%c5Ff(?MGF2Q
z`9L;M14FtNg=t2XDo2l(0RKJHm{}PVcV2ljmz<7y;nMw#7|G0;GJ=7Fx8GI>Bg7%|
zOE*4~>IC!cJwe1h5XLEoSB#uHaUe1Pre*+^D20h)2-s>=PnL2+nh(Kdm%$-R1d0FB
zBoe?0(X<Rp?Q=O(g7|=c=od6LC_x%3l=d(+uo)-c@#$l=;v)_qp6fZt0M0*qm0SsE
zi~~W`Dc>eRHZT<!@d|aK_!N7Xf49N}?>*pu%h#v1^&YXn_bcu<L*{`rKL=xDuLHKK
zPjm-#hc0J>?oDyP%q^Hs%rQr$RSTGdma>hf)@v+hmmi;|G3u^-0(@RFVXB+Zl@XBn
zXT46WgK&?xcppFbVyDgK1Q{46WJ0FQ7#+QVCMU!V!RHMQL4=)}0;^#X7=<Ai4LKBu
zq)V5A2(^c37v$I@`0FH$K?WnWVJgIHlQAc3sSVh1H|Mp60v(JEx0~5<JHZ716Nj~6
zCGj7jjV6w`$P<0I1R*z^zva|&I<J%zXwl|C@@8bm^@A&IU{n*qF7v8pk{Vm~eS}CW
zB>4Vpq8NQoYyCjnoK0#D>+gpnXdQ@XGFl9^4q0p(HCn=4mp6s1KalT-7ZUL-L{Dfq
zryB23jbtA{6%DWl!~y>Wte^U5j0SEj4>Av;UHB0Q(E+SFQ^k9JTz5!8YYa-Cjik9s
zS1Y)-G%}QTjw=C|u?;P{S6E$Fk#@{lIW{IP599#NJeF?*3^49%QYNU&1R`jHj0}mh
zL?>b17268Hf~KM-4ar9uqYExIMin-saXG_8j))AbGa|CXdEj{FvD7I+O8E$F2tOdV
zywH65C4z9sppXNM8HYz8&~X_uHZ<ZM=zbE1X35J~L|dT^q};#808^s|@rTrw`;-s0
zt+VX@lrNY|K(tT>zQgUxsc{AvGqSGV(}vat+D8YDU>O~V3MOJgB#0UegfUjx8&n@F
z$D_f1>$aWg9<&Z|2vMeSfYQ6+LYh(FaS!tZL1%N3tQz2e=z54dj5)yRMf&)o^@r*D
zCL&u!MM2{d#S%sgSQodzo0enk6L?tm^QGY{fCK~dqCSEbxKM-r5E_w91PhWqWP$SQ
zd87lLK%fmsKZxRVcYHHoP2@D3v~3*j#xJK3^MvSowF8x~uM3nZ%SakZ#N6+R*d);e
zN6xdh38JQgNGgH|C`ziBOii)kr5LG7QIdo$iQg2Q#1A0mCS@BK!T|)LE2SVnT)fdh
z&~hXsa%)E>5+y=GB@qx5M5r{_>km9K&1j0_FyhJMGT4M=x|xiefYfBrQtAUBDAooE
zLQ_pToFSlsO#swFF$t#vP~fm6K$bxUlb(lKE-_Qu8cvubDrgAz7`Xy0gD_<(F2qVi
za3&4wJKmE@DNO3!xM-O~LrYIifhDOBV@$@u49)NwbPNTiVsJ4yEd>zG2D1ntic>@s
zIfI8OHEPC-Rhg_@DkzFbrW$FgLYBL5F_NK5Wz@JtM$06oHDnAHXS|It^I;?;lQa~@
z$TB#HwZ$mlosej4p^df-RuQ6>8XH-aP(enc0;1L!F*6ZV2}nr<MI?~Hr2@uaCfY<9
zKd5E4#9fVxpLPlqb}MAI15b!U869z~gxoN6Z8Y$bjxb?M1XT=06-7zJ3AtTw9MG1v
zgic~<wM=TG3btXItj7wpD44OR!x%<FMlrP^AclyU6(j^z6Oo2Q#8?z0kpxSU;9-sx
z24+MV4iPNmWSNUiAZ&~Xbtz^TWSJYo9WDeLG;2m=6$U{vC71;jL_pP}Fqn#L%a;m+
zQ7&P$Bc%9n8Oaz(ViF89MN%9FA<5*gs3KT_qFB&za+#4}7a6`Ps{rhCG`0~T)uwb*
zr!mo+p1K}_>vxE_16bM|aICvY(&JbRZ&<hmq_C3b5>POKLByV|EcsI_B&!cnhB3%X
zm1+S7`H~|@ZH!|X2%yacQG(>b)s1v;5ur^c<2W%Kg`g%BH6xjTXIX?GK_ji22qNl`
z5@t9x#3qzg)+UU2#8E<+Rj><1RTWee;znzAMdsj>#1jq?!8(H^A{5NTD5Ok)Go*G#
zpo}QQInpG6;+K!WJstWxpG^8{O{a^<=Lj*zGRv=`s<6QA7N|ByCy3f=yDemW;g4D|
z)Z^1enU78|W0-M}Hwcq@gkyqBPUOHhF}5}|%OZ`!7~>4e?2<DX16n4dxXd`i$z5xN
zkhyR%>quYcwG!qri4ffC%t9E!WqCsp=uIm3kkZne6v0RlOi>asLj^FTP%}}?7!-s>
zM8-!JY>X56l!ZQNSCw|);u(%3#wc_!`;Hv$;5q?xox%tslqLW!fZ&{71Pnv24oZ#!
zFg@@(xjhplJ3u&A`G;QcEZmUXcjjuIu?iBt8ogqffuK!m*@2#C#15fP?TTqq0tKN$
zAn_dJOb9=x)(4T?OanwQ4Fw58FwB%BG_*v-ECMW8XS^y;9)zFmKiXsDW}V$1mymJM
zsjSbV5J7$ag7t5oUR|cc1(;xrz%}A3Y$orz*g$)@k$AQV!pMl{RJQF`$H8hLiK1wc
zf$oMLC&+Yr9-et(C;~tzrb!xFE(~%Sh-qa?3J@ZIG8-_6r3qfnVi;lN@?K{DCUWvq
zOGr?G_zq32$qstyQEU}dLdz&BAf-`aR6$1EA<f1*n@M9G28!afg_9kjmJ$rV^r&K3
z49i={OmPnfS}P-Uun8@(q(+DZV#3<U@(R$2`mnSjlNjs<*jC$h)=48oDPWvzdZ4nC
z2OJ2a0k9|yQHil4$dE6|$mgR=PDl~96MMyhktTCA8wg20eU1Wf_+t0S2VgD#-afeV
z6Y@U^;KmE7g#1UpNninaC__M_M8Ly4?5Jcmfp(3L9H9t}gQleD!xqv3fMF-#WF`*)
zRgnH(_t~NPkLw*8RPKS~O3--_Z@J|1PNE2rDFbP?F+v>!<&?h%_2R5Pf<tg_LwMd{
zYbNp8wsGQ^i}wQk5N!y8aSaNc5H?Pq-_pwm$2?>Sc?v!|4W#mLOP-;Y4RWMO1r+m$
zU!mf7mcqa)4rMf8Vox{f`skU9qvtj_Ny!ux!az_bjJOc@Jhz~KEGhGlo~x-|B{4i{
zFbt4=^TsJPAZ8xn*Fk%*$87H<!=wjxWQiwWCOX3(7vnSD$YGoTq&X?;DkLeT1JPz;
zYttt5yJyAm-01tRsb7)x{Ejqv%OlEnZO7jrdO6+6sWC4z5M0`P4PgZ0=e|k@(nw_P
zPbpCHjZ&Vo0Q5laO~Cam8Y8jq#O(n3WCn^FDWDOgN<g3~K*V-$6eIm>+Mk`0bZo|%
z@Rz$<1~u%(rTreh8Lj-#Ji?k~^%3$K`03px4GzKzUQQIim7vibrJ0$03uF8l@dR!;
zAPQ3BGsiBd%#~gUc&-Y_wSVUupu0v#QuB7xng&wq428&XAmdmpR$)aDQr>nF8r<d(
zJmzG&-iyDOV*Y6yBh@#YC=a9I;C)(VWg#kh#5PoRg-}p3r@qVyVxWkac4wIr-{_DG
z+*ujf-%`T>2T2dl4NHZE5+7y5x6>kP*K_&aP{Rx>t8|T+cl)sFwQ!f69zcI)CvyDZ
z?)lXZ)6ANBC~`hR6u_H6R26~BK_F+U5{Kt33H?M3p@<$w5^8DqrzyhyrS2ZVOi`~2
z3ZoMdFlyJ=|K9b8Yu1erz^p!o8u#uwz7<>1-Hqf#f^0P+RS<xPp5dbDab-iH(I6op
zLypuHCZ)as0&V&KK$8tbg$NNOsL&|@0ZIu-`5ka*HvuG}p!}R2)Ibjcr5I4Y3;tq3
zBxr#tY9uL0l%xWYS%4mQ#FP^q;BX{n8Wx&ELMQ(3mlgGI*ylZBWhodbYM?|>fez3=
z7T)R$NYz8-@%InNrId5Yu*0`;LhuwmQ{^4}f~XsuK!F+v1^|*s0;EPn2q<9|F@YaP
z<Bua?r0_6(Ub2J@Y*Z8^NkYsbR7fnzNV|qpCJWja7^xspuy_C_LK^&yAViPlfXajZ
zd4f}_lM2idNeYrV{Jqv-)_O3@^10(=ht|V5^nCwSid&d+P6OxiT14-c`E#$AyX0^j
zD%iItu!M&CBs9koiUo*>ym%1yKt18z&O#cKKDp}Xdw5~v!8al89?w5?0KXwGd?V-}
z6gC9>VIU9^jR4GwNiVc3?FgWffpGeR#Sa%m6awMG27u-%B9bbkfv%vyfQp2OPa`=I
z&?C%)K#c@UzL*9QEi|<fMk&@BN{A??hJv@S%!6Bk#LO{rDWh;qGRc@24x%kcQUntv
zCX>Pq+l(U<IIw9&J0NOGA_%DiITvtMFzOswrbQ%(iq>XLj#4oSP|{Gu#T5)B(qSND
zm?jWw0vMPw86yJ#$w~-<sY`i~lu8jACjuN`%tTB#ph`m{GYWQN$c$<eX(|Ok3O)P3
zUtnKH;8u1CMwNZF6rSp%4F6qeas?&?oTm^(kZ(9@izinoiI_6@K7j;0l?5Led7qab
zK8cS2Be>G4{|^8)Fraj(ZxaO}UG3l5r@l`%Y&w#G_y>79?!n3a5<7`CYh`o_<p#jN
zIy0F{7${7&$V>Zg$M`tBG;f2JbkN3(1{k3iEwdvq6Hyq=K#OnmP2?G~cXt?@l=^Q!
z_SdBl(Y#}FN4%*UGe;1MW5X@CQ4J~vz>=UHi$)2X$UG08u5l}qLp9^Q_;`4GY955B
z(_qFq86<>B4qJW<P;4w%43JFx5iMwgz>+u?CdDX6AT>&3ddFlyL5*ezMnh3J0Y#4V
zS_Ci*a1{gLO?|aBH}`&|$NV4Tzrzbn`fI>Hyo5iAY;E~9*zJqB>f>T7fgpsawd()`
z!SHG!>jRYcA^#z*e%Xxyg2ZxFvER%b8=PJzZ4C!A#w!aL{$lVN(r)jm146PuhYz#;
zxlli=H;*@<20|{(Mq)xU5cnBVSdfrgR>TgBFt1h?Mg{&Ch-BStVkSe?&L1H=Ar>7X
z>>-sTilBC3@-Z)SFK=H<$6p?}LzHu{lSlcF2Y%<kP|MC5L-R|S7UCQt5ediMtPnTL
zy_RjE#B|HtZ-$1n5u+|z5GBjt&U^HiE+*Nplhx662Bf3Rm`1xv%3@<b?-KxtXgj+g
zYYKTv7BgYU1IQ5WP6{|!a{yu6o?}_G3N4PV&yFcTFiA{p+&iL?C~!8A`di!=!o!DH
zd~6kZ#v%c;X$Y2R^Y^Uoay_L#guei5uZL>uP`y2Q9znk-jwnWXl&;T5sOv^gKJI58
z_$Qi4vks3TIV*KX3`|3FRPC(9CL=O9FCuw&X9RFwvyvQY2P+DnA&<&)U>D4#8|R0W
zTG4M-f+|^xtk@8c8IS}6uvy%A^Fnsu@rvC60C1VR<-7ZNd250(`o(7`1K=4AUPSW^
zXg;t6Y{WxybK`;GjUmp$#{l3TXc2?YAU^FwB4A{wcV^$q+s~G#ekwbRPWsnab9QmN
zyn>TOU77J_JvHmgJv->z>hwQD4!0Pq0n=$iAP$1^Irj(2BbjcQx2Ff)kzyq{yF$ht
zQ1@cR-Z<Zdde?)D5d%RFItW2RI;bqwJ|WPBdqCf#r$CP(#lX+Bt%>5_Zj2ih7tn0r
zfLnk|bOdv721FqQbhaPPHW@6a5(Y5=#p~O*%<^sTh#rhQtOmNwT|#3Z<69cxruqyH
z_9WW7%g<3Gb^&?G%a4JFr!Kv-XPL@~p^GJ}=!br4b~w9dxe(&gQGoBoXtr{|J4yds
zbJue?6o%&6q^7fuV1$N5mgUHA#&QC?MI=NlZk?LSfkC>kwu^Pt=gMWs$SP5YEKcj7
zPQZ*;L<Zx+u?M28qj-`8Gcb@^339;(Y8SHPY$oE1@-T$@NM{7L<bJ3LxY@UG*%|X-
z`30k0viYQF(l}guSDEKN9&paZh$6=|8m*9hZ3dXey)}C+`FZl*;STO9)Iuy44-Tz=
zal<hH5ex>LAWVQ=4Wnw+YOdT;8~SlQv@$m>p_aGJ!{A#xkXyivkT{XjBLIy6MQ4!X
zbPxb|ZA>3vRUpK$>3nN@6g<$)u_1`exNJc3j24EJ<2A>fP-f_P60?K=Om&pbLuiU9
zk`TkT=e-JMh`#W{S_-*B^c8Lpk|t+Y6eqQff$^^h&x8Sz<YJ0=#*ZUGjU1YdZMKgn
zt@ho8+jqY?-=@Oj;CG%&A+;MCmNCP8Yg|bNZ+gui^34Rt?rQCyk|Sh{33y=*u4<rX
zrco{=e8#<-I-Z!NQ#^R%mOewKt`2tL#DjztcF3H_+9?snlL|Q&t3!O9?)Ergxtc0G
zm0<!W$$)X5^^Ldk;@ow1@Lre$ZDWB4hvdODBw%sgdLDEo^fS<of#l>_&jtgZWf(T1
zc9d@*bzv$guOE}q*Pf3${Tw`hb@Z0H>hlsq$gl|$8{zN-(}t1U0A{F4%2IwmJUHJ5
zWyz;Dk+sTRL4ME%0Qyz<XB-~`qm(ezMq1cr5SYtTcj&qfvOZ6p<i|P9TN<mHTMoZ$
z8y995$cI)d<U%yVf41w(jpuDn42JBfwEAR&qOBP!PEG`kr4y;l{^)84W_KX#CmsP)
zxe5>aF#a3yi`Y!Z`W4a@;*k`lUw7U90La1{vJT7_JAAkYO*B0?>RNbth9(a_&bGMb
zEfa+sot8i1J%!Bd5Fa)+(CLoO8HU&ziGg_8*kOPUJpu#R2M5)DZ0n8oyvHY24jLy1
z!wbYWABY+G@i|@wpJeV9d;4yTwGg*UtKs}LswC?Zwj0vkM^{oI4j<xtL&qDg;**&z
z(G1W0E}V+BcF1F;L@c|}27owd!WLQTT|VbiGXc>0;ybh%Hmakund;%>ccZ-R-;j0(
zd(B0NvM48V9BpL`sWKZsXb%$2{!gcom~1@UJid#}!1G7aA2e`_)0#Gm2ot%PnA#1A
zq?d?48TvMwR0Ceng0C|SB??jiH0QCdoay98Ga^8-l{PoyC5DeL4xEfA`v_e<YdAcD
z!*qv{!7LAA6B0uarcJH+;6|}if$lLT$h##dqH`wfjpDH0D_m_TIx)1Ig)D6-^;T97
zH`3y|eKUzPK9iq3tlMoP!p?Zco7Iz<;k;R*lXZ^C0Tzrx(9If<GAJTEGh4KZq&sYJ
z)&nsT!#$Gntmo03ghdUVFIAdNr1;T+S;C498Na(vndHx(hQ;JX<j-Jx7A+JyFvORQ
z1+ZNf($EINr{m?gcy!uc?eYW|jh<Y(9$?6n9wgQs0O$`HP&W!ap;NJl>JH#xC(xY-
z*u=x5@iX{8hT}l}9+3`$N6bi4L{$w7<tC~@DMAE?)pGS0PA?AMQJlIQJAWQJQGG-T
zAbw=$<KY8HN3W>`{&+-=pujlO+@Yx5#hM;C*_mk-(+jeoIf`gaz&jE#3S^kd&;=wU
zFNMJ1yz!!r+!%B{g5#jJo5z(Cd0U&DcpGex9}LDzSZU*Hj3(um8!2ThMl?&UYfCjl
zmmwsL>rD-)!9qY635X!gm<LYxnw)Ml@oQ5U6jcfoXh{P`_dqDb<M0suTm#F@y27=~
z4*g#`gemhKqfIPfStV5{(Df=)X^Xn0tW=q2G|E~4QYu6MXbJ-eYT-6K5)-Y4|8dco
z2+#7Wj4VH3e{rPkApQ}DIh|i-Id;POeVwPAG<GjE??e32(IN8)b|*#<r;s5S-YKiV
zz`%GO2eQpsaOfI&qyqwM1s%d_CWff8bgGIfh=Qa~NW$CeWs3`j@X;TI&nUnrMC3=6
zlc;l9kVNEQ#D6=++EzG-*wY?QT*{xmbfhv($z)=g3TCJ>$_~&?ti+{gRtA-7jkT1u
zHlY)=jX{KLp#}!5prssRtqEeEDcJp9j@{I5D3f~j?KEK(o76$hVH+w8l9YH<kLeBW
z9jDLeK=Zvx<+F0f4&wpJLQHU}Ai!XR@7^9ybAkqmDDc*WEWx*2K=+4{v9fF;cS5}E
zb6v25?495}igAFPr1lX!dBE3N@6M(}KUvJQL!2E=7#S=|1j?}j0Wd01B2t1-tPmy%
zEtCg@J)J7<lRINY8nKv<n=?^`h8%NOXaT_qR4AdC=;C0KSmp~1S^_E<s%c25?X5v3
z8Yt1EGGdBm>jxqtD4>aC)tS2wDLV3YZ43VDJRfcgxEA~XQWbvBb)B$j!XJALojo*Z
zrsY*#v+omeAgX1<ls+hx+LRd0T3yjBVZq`s>(tw`-&wjS!!;6ksL38>6tia+3CTF%
zq<Fd|stHuJ;Ya!)d!;F_bQw`W;t`QeIT@IH(D7(N1Ro6%gJ)@=@79akO3TisIV1_}
zh0z4cQo*>0s6liJBb&op3$*o`&huQ5+lQh<LvGq6oQ+Kx;3m5CH!y=4=b)ltlB$Vl
zVh*pyX<XDDa(ko7Hk0sniXrFiI!TJ{!#Dj+m(L_i5;Q|0Q75%N)9E@k39kb_b7g{`
zL<!%-K4~=kvUHw-h7<Ow<%!f#gPR*066^8^183Z%_aKUrLSJS9h%QRu93JdVB#G!5
z^=VC`MG5V&I}&?P-@bA$kvBegW%7Us2s{Z;A&I{bV25?Z+;2F8=mX0ET#{f)5}=%v
zD<MNA43!FeAj2`EAYw$-p@h)Ms|htanmkER+2vzph6V(FtS3v5Q_%qO@MbR6z}8|I
zhC~?2f%>7&LZHBTIo66#kBC;&LV5A2xWon4+^MF7JRu4>DM7S6d3Mo&5Q|>%32hM8
z4{)U;Zsn}pQY~R*3^FrAAoZglJbRdFZCyvVt!zbDsb*2E8^no75<7q}Hqja$Lkul0
zNZp7KR@p}_l$c?P!GtcI4m}2kgh>riMhF}juyiJIpw4|X3{3jNUByVgtS_TD>((9m
zQEZ}yD60i1g89`Yq|6xK{_G55t>d%K3BF4R3aU{IvNVKzLLUD-*yh7EVI&NEf<qW!
z&wx;$bZxd^m=F|{pvMS7GO8UJn!rs)h}K|46+tqIgCrswPS{&XM9>YWnuH*lAQ1*S
z*v2&LAu`A^0K_Lp7-V5c8C6Ktk(k+rW(F0QW<pLtB#dDsAjlF%o02g(8croKhAT2;
z%ERcr#Jvw}F}kqK(l!<)f{4L6qEB^yZJdh?*;Puigku7Y@oI6&3=cF<-BGQhdgo#v
zJ@KfR$dcDPn3+&ajb*6)A2ygcF)vA$2POo}HbLOZEvv3kRd&UhX7xybkX}ygUF^u-
zc#*0gD61?mF~oxlCnY$C%zb{I_sTtFRqV)v<@yoZpkaRm3eZH9FIGZQ0YJ4u`Iv~n
z5coAvxixbL2%|BedtQ=p;u?o@4<JeOzZZE4P!1plwMg<JZ)dtki6QJ8N2?;zd^*ne
z>Yr2a!D6yS?7Ju>g`vIESsT@fR0LpxMH674+Nk458HO4T0thS+HwhAv2t+Dlw*XBN
zL;)B)L8E&zFd)ULA!9JW{k>=YvKDR8%!yT1RZK+{T7=5O49hC3ot+#;6er^`lp($7
ztlm^;EE{!1RD?PfT~a8DfZ0J+MO+s-hAub}+X2u6O~$|uf;|!%AP*T`o~7##ugNIA
z8=+}^%!pXV`dgvHq501)sNt@u4DLD2$5rdQ35dz`ocWGoKTw>HYU@`}yba;6i5Jsm
z^xqc+G1a?0_k4ovN>FM0dki4==6hMndgzrPk&m2D2pz>7d-LOiv#*^UMnH7$0+uBL
zkO2Af&4z(ZK|xHDEkIQzCZi(2J>h9Xx&%$iY!Dc!5m=ZSv```953$zY9%d9$fiYpr
z*dp`$MOW|dwzH%aY_YIc41YyuSd+Yk_(i^-eBBn?LN|THYT(R~oy56lfm$ejg4-SK
z2Hud%&PPDCK^Dmv2x-PNr4iDCkwjJ3S7qF+Zqaf};YJZ0(V$<Ns?e}`w}@ee`gsDy
zJIAth&~mSll8{;!0N*^9Nm|<reQUz$z|?Kf)#FOTxtI_`xmUMWcuYx=Ny`^^%p-AW
zm>>c`g71=RT{ycobglQJ<5^q6oba+eLDD4nakNb^q0eJ52E@a45Q9jFEf|%IY%4)Y
z6qGjF(Lkr*#ik_t2G;t#3PGL(e6R>{5GsvMs5l1{3W*rPtPB7Y6c84z-T_1Eje`Y>
zJeu07QYL8|)YYcSuGfQ%PEKlLaBxTKbD9kW<T6$Av`zO8jq7>Sk;UqeUF0N|1bC3+
zV`~dDCxA%xq$|1-F_7SpSc3PJ*cq6BGY_V4g$f`~Q!P(sL>Yvdp2x#l@XO*K7|xqg
z&L-1`a08qn0N|#IMK;$lGez(wSva?o<jx0(fec(juBO+t({wd~i86rSE?CJiuPo?>
zy2v&IA@Qk)5Ew=X(2y?g7`-j>Hp>Rb1UAELt^~a07c$XSQj@j4beFe%c6DAHx^rEZ
zxRWOG<!+cH&JzdRpay3saMp!@nyn6#Z575}DMKIuXTWObhi4(n4lxIF-G=(y;zBze
zlzJla*Gz%aA5oj;(1P*1i$phJjl$q(XBdENFlMfjFjyB@R<}DgW}6@!P}Gcds>U9O
zfJBZW3@~RSCjjVDITA&%*o_IMdpHtK4h{DNnpi;8cgo4b70;cR+GZ9kTR5uLqAy#e
zDV!p+%i979lq9fZHmKWZ0F8!1Y;#L_2N{?_#_vmEIc9Al0?}aG;Rp_-zUgidcSKT>
zHGrUOAjnz~s%en41G{84cFkuPoQK)Qnr3ze#JvpX4b-_JnV0}Uym7N}V=y+M(m~ur
zWr#Ae#A$%63C5=rK;V~>8<rX&n88Dcjy9VR#;AZM+n^+i7#V(&FeVXl*dtSl-JYHt
z2zQw~F1p&(VNF%BgJs_KX>8!?*l-$17m$WybB$ry_hD;PG%$pNoNGc@3`t`G-S2Ty
zz~ib5Y=<n7vRjRYrL7}7fzpuKnS%vlotc@Lkh6ivowLfTZRo&_EDM(-a>%V*HJm09
zRg&5&fgSqrlgEL_p8&pGORa})5OKa;_!y1B&4#RPKq;9aKtnwyS)w-{IBUqvyLc)t
ziCM@H#E6)nj(FpY0NVg#9&uF}PP@!>>dUTZHK%f9Se-zT0I(RgVFO{KJ*{LCS%w%s
zn|$mHyC*#}l)%ZpbD7;`<AibA0BNJBl`C~G6iUpD!($B-la^?bZVc&t1DVf=-v=gd
zjRe}vIT_epC=sHy*h%q@4jc`d#;2AB-x#@UJ8i_NDP~kd>gJI`n27`(Ph~qscpUTF
zgUq`D(wv7Aogy&>F%2*>ki$L)VC#L|mlB>Zc8p`h8l?;&j42;G#Nz_;(78p|mn{p5
z`A$h7Y8#g0VJID>LA{1wv4UrMLxux{?BHZFK%`ipgL32!yNvXf4R4&pQ!&|GM`d!>
z;7g69C}q667)=E?O4n(wSSHh;)IlB^y21ml0Utc@3J+0*OR8M5RME)d3CoeFYQ-~L
z76^fRZ-`<8!4#;{&VpLJF`=Rvxvw{YKyYn~%8I2!B^b+>3>as6iH8cApy(VCf;$Tj
ziKB9`fHaZ5L_!XyD2!-6H7z3<#&bXGM@9lPUaYMKgxpRd@u0;~Iv^8KCle<m=d-0a
zCmeC3O}TShG*&#0E*JtX3Q8I=nKd~a-CL4M*mb7NHO3m64P~Y^P&Y>Tc-&SQOnAuZ
z$&4w>0+uEi-tktLJg_TVL!Xp}2L%@x2*Z8lFv>!NVWr?i9h%P1duOU5;M!sV8-XR9
zvt_P6PlyZ5g}~D!4pj;mx|;}TNGvRGTE?QR@=*>lh#3Z)3)z7z6zU0nc!9u?C}G9(
zFFhR!BEcoWkcxt4H5<Q29FY-+XFKFWnA8B>E@(?oPDcfn9mV0f7;qXo<ZrX?7lIuG
zC0a^7OU`Qb<A+=<y%#KY*Z_qImvB@-d|J@VSbRji$dr>~mveUR2}iib_@~)uhb@z^
zq9ZYTfg_Q<ez`%!h>%@)dCM?xGIFR3i>d+$g4)4Sg)lY>2e;UsX3+y^0Kyjs*{+~=
zTN6nD(_jMh0&-lb9gy<RCW{WwfFZY-{>Lh1N#9*0Dsw6*v}TYHz|P1ZL+-thF*z8B
zN}LB5Q32v`pitZ}vd-taAvM8RteFhRvN+8&Hv1j-X=`m>&ZcfHGm}1!2yL|Yc1mz*
zw$+ko$quJzZ*yn0-U$OW?WeJz<cGEBD1jk?#_6u>5Zh|kVBwvJ4ez)b+MvTS6p|^a
z6qpd5k+NM~8pAY$IhjE&5jo~i*$2cRMLP7;q&X2ngg6X1UOz(tv;$>09vg#z$CMa}
z!HFMa1|bU&k<CCN$+T@tlqi6Plo*k4=7DF0Hh^M#K`ROcM!=y^Xip+u*GspMz{jIu
z=5`l7I2TJSa!_FP;m(7PJ`oZz)gCk4;NTEESqYj|Qh}uhuif+Ygr6OjtPg>Qu$&{1
zdd`m<f6P<s$GObXV&Lo!&vMt^HH>ML%*stY)${I-UxG*_E|b5oeW#|0A<2<W#u|Cz
z{wyB~b`MbwdYZ_=h=ENE$rB7DKuQoaGcgcIcs|Y@n?h28Bw(T>pah}{Ng70@RRhnL
zPH4%J5+<k!ND`?iRAK>SDiR^2qJo4b87iWxD5400D3&0IT81c?p<t?#C5Dz#3Ry^r
zNh3?iuXrMK0ne-f4~#BA(j+Z7*i^+aFwqi|E*l1Fr$!rj&tE<kS={>Mc}|xX$DdvM
zf#Y>y1ob*KlEBLb;$cWi(p8BRY-C|1BN*L~q--eQ=tl_7(w@tKL50LrU>G9U#>SZ>
zQZIdpCTJ!$4UG|yIa$VOlVIXPNeLzx5dz^O8X(9rCbmWpN)%{9nrfC7SSUcHvUo>@
zcB!C{QVNxZ@Sn4l4hVD{9zOy0Me*BhnYDwtgd+;Lj`T_H>qvR6%p2tNG_He;xc0j>
zW(4I1=J&UGQ;kiVWw%=f$Z@ThQH^H9S<7tYWj1l${v?h#0$$0UfrvMb9Rqmh0f_{^
z2uuir!B3dR9=nhQIsgMh`cBW9X<*TGS4fr<9mYu&kRxpimKjmZ)K#j;&~2n?Fw-E*
zBw*pU6#`^co58r)-x@WuOzCqiw?fL*C`DH^6qkw=nO9FDMr>Fx28<BQ+z|#uHg6GQ
zR>(GkO(UgQB2OXJ=?=ZH7&PIqk1%Ec#ej;Fh6+@356QUDk*vBr&g#G(K41abl!!s$
zg;%a&rCQ0Lq~$JHMJzz;Tuwf0%n+eQRWXefLUMB2U;!$q;&wA<#raw6`)iZx6I03)
zfyhHl`v(>hNjiBZndA(D`5@qA)@QIvk61>o%BkJCa5P;(n8b(9E2*G@29VZTNP((Z
z+bGLE(;Z1k5lJx&)EAo<35iGoI5P<;Ep|1iA|Vj6P{N2#Q!-Lol`5J_X*UKzhG6K-
zj}Y_&^DzohK~d>OD}a+UH8GHw4OX$#38)E%P{=WnG{h#vMEWHJ>=Fh_ol1jBkrfgN
zNI(1_6+QAGYE@|gp`{Us5GWLBUj2Mt8bZIOC}Vj^?%Rg24lw^PG!%s~G!ZaNvn0Zu
zddLp)nFSji#L+=Wl^u7CfXHGEz#K&2^l}eY^iBR;vMDmMA^RT>j*wosN;{-I0RSg!
z^mM%A?H!ZkCu1C>#15XjdIr3F%wEcT&;UgG2XOXr&bT=u?@r+kxfX#%aJc|GkIC0(
zW+}ZMG?EmhF-jks;#dXoH%Z8cP&2Ijw`urNbqIc`<&$2}N%M9^g3i*wINB;%DAsnu
z>uU&t2>6hhNrCSP0uO*2+Mk01sO`I<)sp5B8pebE@AUt({$J|<49x#G{lE18uDKln
zNK|)v0XxwjUw^me#Tt5nK7;04v-Pw^^s^GAQG=W+?*kSgwO%uJB}+;t05u40qNpgM
z!&1b@F&PR1kb@#6u<k>q64Ho*f;<w^90v$4N(ux>fxHS$+9Ifk$Sl^1$eD@_;e`oM
zYYa-Vag#G3mZKEI1vefR^PORFG`lh=)HngXi<FL{$PQ6c@vt$aMq~*YV-Z_}jaU}Z
zsUd2l)O|x1lWQ8%BY{;-nhjxqba(^d`@N73z!BI%+KUf%Uny~DL}&tBEvk^i5)Yrx
z?K1pDukpilXv~WCt9kJZ$xp}=?yE&iLzNi@0WMF@T8$BGmOURRcp$#>F!S*hIO`lz
zH3`sm$~r^(KJV-thK+5Kdi;m{U0_Al(Vr;>4HV=DnqJRX6^)qw`Jg%8!rG%_UK@^Z
z(qXZNVAF}^O&%(KaMh_BWdV@mu#rJ{Fc-&?i8U#QJ`u3kL<vCgnM!DrB@em~`~|2N
z-!B9L%z>y)gak4<2!$h%9J8q%AV7x}paO*{C<>ucnnvRlDGxFZU@hQc9TFx16Wp;(
zLKp-O!MO{Zp8wZ<Jx83-A?E{(IO-fy7F7a@qySKF_tDN+=1^qee1>DF41ly?<P;4i
zfW#~{pf+|0eU1v61Ex|~(*lq#Scs<yw?aN=dU&DKBaf%!(i@dAC_$lBf=F&|K>Ms6
zj8h7_X+NaSES`*%BO*4SCT+mcGrfG4-E+Z_Z;MO7;R!I1JCJFL#{NYsu-a|5JO6dc
zMFtaO5)}$KgqSp(bN$2>PV#W8oh6vzd0TSH3foC0xM*xyQ3%k+Hwryy<IFmIK}@oa
z<9)bMNX0l6DK4l*MJF-mV8VI0oI6BLeerrnxld%05EuEdqXT|K_}NjCU=@yHL_w5X
zWK%RUKpvN5A@hF1eeO*_;Cy8P#Q^*4Y?jyt0R2&*3Q&WC{dlKK^M^)!7m^(L={Er*
zF3=wHhFVT($1;*o5b7Xd_01%p>H_>dpD&{aCS*c>O4YpZFfsY9^)*hm)M23asr=+9
zQgsLqlm9__Z=E8bI%KL5p=m;~XJ9(u9YciX7C~f)nA%>)xQcv>GJ~~D&AiiQv*o-u
zk&L<wGjCDgX~E5F5JnQrui9%7yw)v~O|Bx%;h_OhU^5QE+OcBPAtbFmIR>2|)P8JJ
z2?J6-7N)R<OU4>-6Ee|4uqX!r7+Q8<^MoZSZ``6Gc2src2-V_7wC<aO9vt{6_LoOm
z*ikW!w$});*j?#nP44bvE@iVhMySPR;sPL<&E^u>NUfqYCquCX($D5`A*sV-oSK;?
zxCS>VMaFV))L{WkLLHpD^!2YYxPHU5?US>S)SpQnayng44{D!;G)d{sxOYNjSpn%U
zU#|_&XzWhN8WHHb7qu!HUg$EQOpJhn$P5M;sVypqbif4whm@HJI#5x=2ieL1>x5Du
zA!S-bJY_NpLO$QASC}+)!x%4mIz#h)@zLnnO}9=5;CqPIDv+c-=oM5Dz`!lOc}#K?
zRDOyvu{PTVrbq~g<_SrE@BBTu*E9~LezNLfMpqqo#$!b$X!)q()IB+F8Wy6fu~Sl6
zrbC78oE&zeVGT^x2DG9xDenOiUf{yu*ZS~dQab6ww&uZrIEViH#m?I#(0W1fPKfoe
zQXcXTrc4Xl8id$|A|e6dcK#l_%j`Ul6+Wx#DtXz<*(lnV+S_oVhmA^%$eZ2#I$a;q
zFQ_&$1Yns#B9%f`W(5s26_1cq{IYzh-Q05A?w$YLgMlDw$iCKs8R`@2?2v~<4>?nb
zfaO>iNdYjpL{@oT$ae__wVGPBDdjPw#ej!1F1_gBM1@rbs1SgWy!nT45M{dqsL?DC
zIbTLS`0sLU)U@$D+N{9KaB3Y^vA9B)av3Z-r4BgFY={YPV8#q%SeYhf1!!?Ij02P7
z1}9SeKj#k5;`dqY;08Idww>4S<}mb%f%y>O@P^aTl0y(K1oIdfX9*9pRP5duAXEk*
zK;%a_2>G8iRHQ-_cp!J@LrL{X^qD=u@X^|nT|>nKwJCsB^oJ$ZX^E2z0|7#ilf1yF
zV~ZD7IC4+*`%X~Kx5$}pI&Dl}9?|Aer|uK|bV^ML0vyDgq@kLZP!RyZ2@y<_KtzR7
z5dcj!Ou!N;60FNY_Ae}45kKf54~`M>H;a~pV|TSf{eW|(lcah$_acWsqx4{WH(*H>
z5iC(5M3tX|-M?f6*cqg%Um`0al7nr8xL7d^GE^{Pe~&|ku@Rvm=937LPHo$CfO7p`
z>^}+j`N<E=9pWMH7up`*U;7b;3Xubo!2iP$!G(rtVTg#Fh%6WqL=Qg@f@8-FsTu8+
ze@g_jMNknE14C#aQUBO{vzeikP}L&_QXm?{krbCfU#@_mSPhs|8-`GzP-S|d$)utr
zf(iy8Kj83@-iI$^2V<I7=}*EuiumRx<6G1Ft$hcbd?E0CgNJyt2*jf;AWKxFLg)e-
z910+R-UgFpK>QRT0;}}byH5hnL+OKH_n5&4;g7}03^=9QBxv3ls4-}Xj+{(y#bgzd
zV8kcw8I8CMY)-^cAardoGxz0j#z!1+#~Ey`gJ<Tnp`^&oLND02PyKqI`ED@U-4Fj+
z*k?hIC)*7mViBafS`gA0Yaa$?)b`A(2TYTkT44KPEos{`VJ5rgaBTx2V^l>EF$hF3
zZon%Y7eQ-RjCLR&?14%L5bTvs+7aI>7$1k?d!ysShsqVe;Sa_~>U2hx3jTFkQA&u4
z#fkPM&2eh;HVZ5U43n>46nDTxgrqA<w50(>Bvg=)a&SB!j-m)CQjiYaZ^>1Bf&7XD
z2`{J>Jw?o7j=*%}(E8=>Xw1w!q1*-#ZdZAP$x38yHz|^7fII9lR73LvQ9vX1%4Dj3
zWAg_%pSB7qV3cWB%DNBI{!g^;yNI`%wT^j6U_!2^844=3SEZl`8VV4Kkxsb8RuQD+
zja-Foy-A^xCbbGtCnF5s8aAW|QjCPcgh>k)<xEIoL?Ixcrb+-NMW85Bl%aLTMw~Vb
zU>F&|onE?;h@mO2Hc@-5imGSc1|~1F(XSYB5TGL67>U9_$;$v~XaJ=shp*}|GV&vs
zaD4~Z8WZzJfy=E<Zx5h*O&?L?`0xYnu%XOxUa9n5Co$g;c{v`kibxD;GcwQXhhGh*
zOY&^dtYE@YA&BPEXu_hZD~va-#;#2nR7_C>E=Ux(iAY00i3WtE9}MvSA@83aksgkt
z0RY*-Oau*5Q6NE6Bux#1Cx>GIGu+|;_xK<^0oD4Ee}*ai7yWhvM1iPNBrt(wmrrbU
zyD*Az0F*mMko3h2lW>@nK#oESfhy9NAwt3{EVK-ekP^rdR18uKDnOJ7l7S)=i$Vbq
zfK3u{zn~?bIK<%?|AI*)afR5H*bR$`2JJ1Sa)u$QG8~$uBZWu9FcUx)6#yr(p1!UE
z`Vw#tY3~G9gO~85J6&T-BAX7-Gm1F*^P4s?o-ztH!_9H1i@dZIU_YmgnH17J5t3|t
ztUH=j=PGC+MSks^PO*r7>ek^v&-iu!mNLVnkDHc5w^-;BB4L@BDV^-h=J_ec5^W4^
z5h{1^#CZh0>M4ond;8t{J;r8GV&ja5c3@;-Oh@Z-w-FIjD8i=7H&H`R7BVNI1Q^0d
zz<Db(AZf<(5tYc$+E8J^CAU*EPu~nTahN0$1OtmGAZiD+@L+blw!xdQEtF}O=2Eox
z9nLluW;vL&4hgc;OAUwW{p;D^$KZB(Fj|=Drr*%kEQD@DEH>}J>W0zOD0*ONJ@Bm|
zsWoJvQv^^HpkWD;L>dAQNl?)gB?_A~=6H4@jzd)ocHSH&Nc+1QdI}f_JIHWusCp+<
z3?JE_ec5;?r2y%^B0Z;0(JVrWt!RXq1F-iWRJODNL*2@qq@h$Gk$hkP#gu}Xq=*)P
zMuEOD$-JIo*1M)V+q}ayfq}b53iI|W=l%QNIVedq#Lb;)+Gy3O-8-xyio*~%Dx9Sb
zI6fhc51>u&{P|qLB=|-{h?n{qKy!ee&((^o;1X<YJ|mJzB$7!al1U^al0_tt%*P}t
zevfW!-I}R2YNCvUb!sw9ktl)@-mny*)OJK8L>VEPtw0NdQsggCta%rF02sr`9yO6A
z=+ZwTHk2Ro8aSM2ziU1R=@=PEkpsO7TN(vRAju|;mOREuRS*$wGNW=DgxI}I;W@?_
zF+(89D9QDNCJ-4D4iD|}S>IZ!G@SGxZ~oP+Ndg*=pRelk^cI(2`gt9IlSfqaDhI&p
zy&5_`?}iUgXn(&)b8t1AfFQfm4&Vz*iZB=^!XDCwPhVadJvgU)euqo*pUEI~b%)}R
zz&|X}SiM+lS(%xJOT`nWSLo&e^M5_w`yCpt$&Vc+$^#7OL%zraOq_#2cG{ziF$K5>
z?3Me)xiAP{s2BnDGB0HAf%Q-9-J*2?mIuE<qfyK>)}uog{&o}P3+6~U2b2%L@uxs5
z#Z^^RRaI40RaH=C?$k@k6V(hs5@4ai?UVy|hY>rN0Qm@@Dk1a_*C$Ek=Ti|E-I^)-
zXX-5h#Dz&IQvop$SZBKjM=_BSM_w3|4@8(qAECR6ILS-rgM0@CW&D_YpK(A|A1rnd
zsi56aO@`xSfsup(=zO@iWA;Xn1Gz9Fd#Vz9MoveR4L+GM4#)R>fv1iSPw;fJfW-jw
zg7&V2clw2Gw8k?<d?qOKpT@ZX?0erC36mNCwXg91Px$$!)${Ams4hn~VIy)x;IRUu
zZZZ-^<P;bOaO}q4Ad$LA`{rRo%9*AX@ymcV8N4}Wocpa$%{bd^$*Hk^5v{-VR>J@s
zHg|C(G;R|IEHs5%vzC6HI{2`l)kus1(@n5EfKJ<OB4Fqf;y45M9|0q~Tyy3DAJOIJ
zVd+}2!I6JEMED=1sTdH(kR5QMBRn2~5H3W=B54`rPE8LQ^tzyFstSnxtm+;G3~LM#
zED4$|(smYn8m*a@zh=2q6d)Xk@IXLQ`Ct$5fKX-y29Xk#nFTY=3_#SPgvzZ8M8dz{
z1qY!D0YEe&rYr)#-wLSu<rM#93DUvKuf(|Bso#mCI_UJ4#~UMEXUdtW{jI0$WX>t+
z;F8#w9>o~*+M=q#gJ=d0$)+l%sm#h@ny4x&Dk_EuA|@)PCa9>#GKwgwDk`XoN~Dt7
zSW_{i7X-n>FxKjcmXZjhFf#(Eib)ElEOZSJ$Wpac6q8jFUd{oDtAm84rkJY(dvZKe
zx$?q!p8}^3o7ih^jp?_p=Z|WsBqEZR%}P=wJPw@`60<=OMH4X<5D)|~RLu=qI~&&M
ziV2Ei9LlPys5u}rmq=h~DvDwfnnsFB3Z<&5B!VSz%qn7<BC3d}DyF2Vrb;NKqG$@H
z81u6#eaoW>nSxdVl4|S-_FxDw(NYG0WN?XzY6}5P0h*SQs35&jjTK8oL`rSUq7=gn
zAnk>~9Q6shLlXyWqFEubNg!<gzaB3Ye&5f~4v(XhJB9kq16#*<2R~UCYQbVLV2co#
zKt>V=O?rF2W^(_XzqCCehhWR>y^HsieXr9HB7ul}0yANrZy<>v_=R?L52V<XNb|&T
zGa$fpi%AXl+%uU3e?#Vl1kT$S5Ux?B5-Ab=UKKG>n$eS<Af^P5O*t#(%OGcXigA!O
z$elXQT&8L>$|#ho7B-V4ogYP*Ibtl2eJ7KO!xK-*&WA1U$8%xKir87<<Em(YMiJ}0
zGQ1i$kYi&Tu+v8!bad>x(`E?eIzn+F-VBx%o^7UTo!$v00tpJh<D|nl6iDVPz5tnf
zb38fT2=V6eQx%ad<K>I}W{5U1Gc`HF$~=QW+E1YSn=*%G!G-Ax`Da9^$U~eM@OakQ
zdh@lu30m8tHaFW*IUE46kTn3D2H~iIp_yi3fMfzPX92Ki%YPzjg3jkdg%1idS8BQj
zOu9Vab6_Ce;}~_V$~nDuu)wpUHLcjl+v#g(q%bV`)lKq-hSlb}`Cxi%*!G4u*Sy(?
zfZm*T3JsziAyOZiPf)-|d|WC-G=LbtybcP1RKRQpMnMJwaEt-H`WOOf1<;a+$p>&4
zRvF=hJ%+FkfxYPSN4FEZv76r>AaCpB9f9|(5g;>i6YXRtW?+0Fsgfosg^6ZLs#1g`
ziV7HkP`C(luVXz}U{e<!SZY#Y))*m*Om|@JG>;z^W&#+5kzipUgoYYgP@zl3Kcam=
zbsdLamv=6XAz|(jSAP%GL#MFx2Orq%JIE3J5GeG@0DZ)WG^2zH9iR?IN)&0R-epjc
zBvlm3lq3@qNi|Xw$uTfhP!LiSutfw>B(VfAHxq(M#$~&9p%mEyH2(kj%tg>cK}TyS
zlVPJKmMRLGsVXL7A;N<(%NWSWim4_^HLW(Xl8T{(FsP#g4ga{?x<W{fA#0AE0B8v%
z%*jirGAcp-GQr*hO~!g#ZJ43|w4q5!5TuY&Of(R{%uz!TAyG(>R8bVfMG-7Wsog3r
zN&y6<vNZl_GAM!>j*<~mvxn9GL)G$U?Eg-<eV6?Y^=JJdA3vJ}$SEkLXiq?ga(Cf?
z?3)`de+{&o2uL9R_@v>O(sYAC95!u#>CD9%a(Z(OjFFH7)Sw3)xcPW^5f~mLP@0WO
z4oa9*pk=<D=x1Yr2O#Rz4Qn-&6cIh;=bTKFa<>??iO~tOc<NH#&A4J8&B3)dM(n9U
zR7T8Aj@Er7Hf~|IR*%`z);&J8B{wc>NG7SQeywQZV08faKw&D4f?V<oauaSn3?YLD
zxm`!zdbo4|XZ-;EXf0vK>7o*&2|8BxLC5mDh^yeA@QnmW9Zu?K2Bs@mUWP+&95#o1
h;FO?#>}((UzwhzThN0Yoeii?`UC9*TLPI6N?flL*jd=h7

diff --git a/boot/grub/grub.500-build-fix.patch b/boot/grub/grub.500-build-fix.patch
deleted file mode 100644
index b096b7b80f..0000000000
--- a/boot/grub/grub.500-build-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- grub-0.97.orig/netboot/main.c       2004-05-21 00:19:33.000000000 +0200
-+++ grub-0.97/netboot/main.c    2007-07-20 02:31:28.000000000 +0200
-@@ -54,9 +54,9 @@
- 
- static int vendorext_isvalid;
- static unsigned long netmask;
--static struct bootpd_t bootp_data;
-+struct bootpd_t bootp_data;
- static unsigned long xid;
--static unsigned char *end_of_rfc1533 = NULL;
-+unsigned char *end_of_rfc1533 = NULL;
-
- #ifndef        NO_DHCP_SUPPORT
- #endif /* NO_DHCP_SUPPORT */

From bf446513e7e73a2bf68213ebfe9ec4bb1fee2467 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Date: Fri, 26 Aug 2011 15:01:41 +0200
Subject: [PATCH 0558/6849] ncurses: fix hanging installation due to old
 version of tic

Closes #3685

During installation of ncurses, the 'tic' program from the host is used. In
some cases, this version of tic is too old for the data to be processed, and
the installation hangs indefinitely (already reported in July 2010, see [1])

With this patch, a static version of tic is built and used during the
installation step of target ncurses. This method is based on a similar fix
in Gentoo Linux (see [2] for the report and [3] for the solution).

[1] http://lists.busybox.net/pipermail/buildroot/2010-July/036100.html
[2] http://bugs.gentoo.org/show_bug.cgi?id=249363#c25
[3] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r2.ebuild

[Peter: Install into host, don't tweak path]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                    |  5 +++--
 package/ncurses/ncurses.mk | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2b64c337b5..1682a552e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,11 +7,12 @@
 	(broken).
 
 	Updated/fixed packages: barebox, directfb, libsoup,
-	libxml-parser-perl, mtd, python, ti-utils, udev, usbmount,
-	util-linux, xfont_font-misc-misc
+	libxml-parser-perl, mtd, ncurses, python, ti-utils, udev,
+	usbmount, util-linux, xfont_font-misc-misc
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3685: ncurses installation hangs due to old version of tic
 	#4093: Grub fails to install bz2 patch after conversion to...
 
 2011.08-rc1, Released August 4th, 2011:
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index ae3f3fb70a..0d425280b0 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -26,6 +26,7 @@
 NCURSES_VERSION = 5.7
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_INSTALL_STAGING = YES
+NCURSES_DEPENDENCIES = host-ncurses
 
 NCURSES_CONF_OPT = \
 	--with-shared \
@@ -120,4 +121,18 @@ define NCURSES_INSTALL_TARGET_CMDS
 	$(NCURSES_INSTALL_TARGET_DEVFILES)
 endef # NCURSES_INSTALL_TARGET_CMDS
 
+#
+# On systems with an older version of tic, the installation of ncurses hangs
+# forever. To resolve the problem, build a static version of tic on host
+# ourselves, and use that during installation.
+#
+define HOST_NCURSES_BUILD_CMDS
+	$(MAKE1) -C $(@D) sources
+	$(MAKE) -C $(@D)/progs tic
+endef
+
+HOST_NCURSES_CONF_OPT = \
+	--without-shared
+
 $(eval $(call AUTOTARGETS,package,ncurses))
+$(eval $(call AUTOTARGETS,package,ncurses,host))

From d43a90032c4016a7583c3c8a88948e6bf3d24271 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 26 Aug 2011 15:03:52 +0200
Subject: [PATCH 0559/6849] ncurses: remove explicit STRIPCMD

Stripping is done globally in target-finalize these days.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 0d425280b0..ac4c12b56d 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -117,7 +117,6 @@ define NCURSES_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a
 	mkdir -p $(TARGET_DIR)/usr/share/terminfo/l
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so*
 	$(NCURSES_INSTALL_TARGET_DEVFILES)
 endef # NCURSES_INSTALL_TARGET_CMDS
 

From f30928c1b19801127b6e8b1b27878e39a04ba5d8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 27 Aug 2011 23:07:42 +0200
Subject: [PATCH 0560/6849] toolchain/crosstool-NG: fix bundled config files

Bundled config files have architecture-specific values in them,
which may break if buildroot is configured with another architecture
that does not forcibly set these option.

For example, the bundled config files are for x86_64, and define:
    CT_ARCH_TUNE="generic"

This comes from the BR2_GCC_TARGET_TUNE config option (in buildroot) that
is set accordingly to the selected (arch,sub-arch).

But if someone configures buildroot for, say, generic ARM, then the
BR2_GCC_TARGET_TUNE config option is not set, and the crosstool-NG backend
Makefile believes it should not be pushed down to the crosstool-NG config
file.

BUT...

The crosstool-NG backend Makefile can not forcibly push BR2_GCC_TARGET_TUNE
down to the CT-NG config file. If BR2_GCC_TARGET_TUNE is empty, the user can
still set CT_ARCH_TUNE by running ctng-menuconfig.

The backend Makefile already passes such values only if they are set.

In the end, we can't push options as-is to the crosstool-NG config, but we
MUST provide sane bundled config files, which this patch does.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc | 2 +-
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc  | 4 ++--
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 3b6a2e22a0..66744bc078 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -97,7 +97,7 @@ CT_ARCH_SUPPORT_TUNE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE="generic"
+CT_ARCH_TUNE=""
 # CT_ARCH_32 is not set
 CT_ARCH_64=y
 CT_ARCH_BITNESS=64
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index cadbb0bed5..9513432fdc 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -97,7 +97,7 @@ CT_ARCH_SUPPORT_TUNE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE="generic"
+CT_ARCH_TUNE=""
 # CT_ARCH_32 is not set
 CT_ARCH_64=y
 CT_ARCH_BITNESS=64
@@ -137,7 +137,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS="x86_64-linux"
+CT_TARGET_ALIAS=""
 
 #
 # Toolchain type
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 7d90e402c9..52969231a5 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -97,7 +97,7 @@ CT_ARCH_SUPPORT_TUNE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE="generic"
+CT_ARCH_TUNE=""
 # CT_ARCH_32 is not set
 CT_ARCH_64=y
 CT_ARCH_BITNESS=64

From 4a2cc4ab22282c98a776f9c913509a37bc2bc6c8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 27 Aug 2011 23:07:43 +0200
Subject: [PATCH 0561/6849] package/crosstool-NG: update version to 1.12.1

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 2bbf63120a..076be282fe 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.12.0
+CROSSTOOL_NG_VERSION           = 1.12.1
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO

From ade71396dc2889dd757d8f38abcbfa51fe2f22c2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Aug 2011 09:32:15 +0200
Subject: [PATCH 0562/6849] news.html: add 2011.08-rc1 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 42ebdd257c..1abca4db95 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08_rc1">CHANGES</a>
-    file for details.
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2011-August/044855.html">announcement</a>.
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2011.08-rc1.tar.bz2">2011.08-rc1

From 73f131ce7d9811fcc8c4b7a161e9700266e09695 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Aug 2011 11:21:17 +0200
Subject: [PATCH 0563/6849] Update for 2011.08-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 10 ++++++++--
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1682a552e3..2225e7630a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,17 @@
-2011.08, Not yet released:
+2011.08-rc2, Released August 29th, 2011:
 
 	Fixes all over the tree.
 
-	Toolchain: crosstool-NG 1.12.0, use binutils 2.21 of
+	Toolchain: crosstool-NG 1.12.1, use binutils 2.21 on
 	mips/sh/older uClibc, disallow uClibc 0.9.32 on avr32/sh
 	(broken).
 
+	Defconfigs: kernel updates, fix mini2440 serial port config,
+	remove old arm toolchain configs.
+
+	Bootloaders: Fix grub patching, add barebox-{n,x,menuconfig}
+	targets similar to linux/busybox.
+
 	Updated/fixed packages: barebox, directfb, libsoup,
 	libxml-parser-perl, mtd, ncurses, python, ti-utils, udev,
 	usbmount, util-linux, xfont_font-misc-misc
diff --git a/Makefile b/Makefile
index f74a6acb8f..e975320d49 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.08-rc1
+export BR2_VERSION:=2011.08-rc2
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index 3977d685ad..e8b8c48ea4 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2011.05.tar.bz2">buildroot-2011.05.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2011.08-rc1</b>, which can be
+The latest release candidate is <b>2011.08-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.08-rc1.tar.gz">buildroot-2011.08-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2011.08-rc2.tar.gz">buildroot-2011.08-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.08-rc1.tar.bz2">buildroot-2011.08-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.08-rc2.tar.bz2">buildroot-2011.08-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 1abca4db95..d957497b89 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>29 August 2011 -- 2011.08-rc2 released</b>
+
+    <p>RC2 is out with more bugfixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.08-rc2.tar.bz2">2011.08-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>4 August 2011 -- 2011.08-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 68c344a372177bf6c1d59c593c384b799f51fdeb Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 29 Aug 2011 17:56:31 +0200
Subject: [PATCH 0564/6849] Fix the CodeSourcery ARM 2009q3 toolchain use

The prefix is not set when selecting this toolchain, resulting in a
build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ba74f18cd1..ff7e8db97e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -214,6 +214,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
+	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103

From 3c90f754961c6d99059c0b6d0a66bc797a3c017b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 29 Aug 2011 17:56:44 +0200
Subject: [PATCH 0565/6849] Fix regression in Python build on 64 bits system

Commit 009d8fceab4db7815502e4b0565fe0ef531d512c introduced
--enable-shared --disable-static options for the host autotools packages,
ultimately causing a regression on the host-python build, leading to
a number of critical modules not being built on the target python on
64 bits system. Introduce a quick fix for the release and before a deeper
fix.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package/python/python.mk b/package/python/python.mk
index c2839b7355..724fd1a928 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -37,6 +37,19 @@ HOST_PYTHON_MAKE_ENV = \
 
 HOST_PYTHON_AUTORECONF = YES
 
+define HOST_PYTHON_CONFIGURE_CMDS
+	(cd $(@D) && rm -rf config.cache; \
+	        $(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
+                $(HOST_PYTHON_CONF_ENV) \
+		./configure \
+		--prefix="$(HOST_DIR)/usr" \
+		--sysconfdir="$(HOST_DIR)/etc" \
+		$(HOST_PYTHON_CONF_OPT) \
+	)
+endef
+
 PYTHON_DEPENDENCIES  = host-python libffi
 
 HOST_PYTHON_DEPENDENCIES = host-expat

From e1472e14491cea068e27b686174af2827d93cd8b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 17 Aug 2011 16:27:37 -0300
Subject: [PATCH 0566/6849] ipset: fixup kernel checks for external toolchains

Add patch to kill kernel checks since we don't build the kernel
modules anyway.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset-drop-modules.patch | 100 +++++++++++++++++++++++++
 package/ipset/ipset.mk                 |   1 -
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 package/ipset/ipset-drop-modules.patch

diff --git a/package/ipset/ipset-drop-modules.patch b/package/ipset/ipset-drop-modules.patch
new file mode 100644
index 0000000000..ee29d434a3
--- /dev/null
+++ b/package/ipset/ipset-drop-modules.patch
@@ -0,0 +1,100 @@
+Drop all the kernel checks and let the user deal with having a new enough
+version of the kernel to enjoy this.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura ipset-6.8.orig//Makefile.am ipset-6.8/Makefile.am
+--- ipset-6.8.orig//Makefile.am	2011-08-17 16:10:41.999386034 -0300
++++ ipset-6.8/Makefile.am	2011-08-17 16:17:34.108702969 -0300
+@@ -4,11 +4,6 @@
+ 
+ include $(top_srcdir)/Make_global.am
+ 
+-if ! WITH_KBUILDDIR
+-KBUILD_OUTPUT=/lib/modules/`uname -r`/build
+-else
+-KBUILD_OUTPUT=$(KBUILDDIR)
+-endif
+ if ! WITH_MAXSETS
+ IP_SET_MAX=256
+ else
+@@ -22,23 +17,6 @@
+ 
+ SUBDIRS		= lib src
+ 
+-modules_sparse:
+-	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
+-			V=$V C=2 CF=-D__CHECK_ENDIAN__ \
+-			IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
+-
+-modules:
+-	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \
+-			IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
+-
+-modules_install:
+-	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
+-			KDIR=$$PWD/kernel modules_install
+-
+-modules_clean:
+-	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
+-			KDIR=$$PWD/kernel clean
+-
+ update_includes:
+ 	./update ip_set.h
+ 	./update ip_set_bitmap.h
+diff -Nura ipset-6.8.orig//configure.ac ipset-6.8/configure.ac
+--- ipset-6.8.orig//configure.ac	2011-08-17 16:10:42.015387986 -0300
++++ ipset-6.8/configure.ac	2011-08-17 16:18:01.578056869 -0300
+@@ -11,51 +11,6 @@
+ *) AC_MSG_ERROR([Linux systems supported exclusively!]);;
+ esac
+ 
+-dnl Additional arguments
+-dnl Kernel build directory or source tree
+-AC_ARG_WITH([kbuild],
+-            AS_HELP_STRING([--with-kbuild=PATH],
+-                           [Path to kernel build directory]),
+-            [KBUILDDIR="$withval";])
+-AC_ARG_WITH([ksource],
+-            AS_HELP_STRING([--with-ksource=PATH],
+-                           [Path to kernel source directory, if not the same as the kernel build directory]),
+-            [KSOURCEDIR="$withval";])
+-AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "")
+-AC_SUBST(KBUILDDIR)
+-
+-dnl Sigh: check kernel version dependencies
+-if test "$KBUILDDIR" != ""
+-then
+-	kbuilddir="$KBUILDDIR"
+-else
+-	kbuilddir="/lib/modules/`uname -r`/build"
+-fi
+-
+-if test -n "$KSOURCEDIR"; then
+-	ksourcedir="$KSOURCEDIR"
+-elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then
+-	ksourcedir="$kbuilddir"
+-else
+-	ksourcedir="/lib/modules/$(uname -r)/source"
+-fi
+-if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h"
+-then
+-	AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
+-fi
+-
+-if test ! -e "$kbuilddir/.config"
+-then
+-	AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
+-fi
+-
+-AC_PROG_GREP
+-
+-if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
+-then
+-	AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
+-fi
+-
+ dnl Maximal number of sets supported by the kernel, default 256
+ AC_ARG_WITH([maxsets],
+ 	    AS_HELP_STRING([--with-maxsets=256],
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 700d2bc229..9d901fc53e 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -9,6 +9,5 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
 IPSET_DEPENDENCIES = libmnl host-pkg-config
-IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)
 
 $(eval $(call AUTOTARGETS,package,ipset))

From b131d4c366050a57be000552648d9f3ca2238483 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 30 Aug 2011 14:46:00 +0200
Subject: [PATCH 0567/6849] news.html: add 2011.08-rc2 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index d957497b89..582a72a6d3 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -9,7 +9,8 @@ <h3>News</h3>
 
     <p>RC2 is out with more bugfixes. See the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08_rc2">CHANGES</a>
-    file for details.
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2011-August/045211.html">announcement</a>.
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2011.08-rc2.tar.bz2">2011.08-rc2

From 7bbc4fa0639c26159348f1fb5b789ee58c5b8f60 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 30 Aug 2011 17:34:23 +0200
Subject: [PATCH 0568/6849] kernel-headers: bump 3.0.x stable version

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 161a647a74..b827ec5be0 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -54,6 +54,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.3"		if BR2_KERNEL_HEADERS_3_0
+	default "3.0.4"		if BR2_KERNEL_HEADERS_3_0
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From facd602dcad54df769ac759886f48f248b61e692 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 31 Aug 2011 13:44:55 +0200
Subject: [PATCH 0569/6849] Update for 2011.08

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  9 +++++++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  8 ++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2225e7630a..99cd79b14b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+2011.08, Released August 31th, 2011:
+
+	Fixes all over the tree.
+
+	Toolchain: Fix codesourcery 2009q3 ARM download, Linux 3.0.4
+	kernel headers.
+
+	Updated/fixed packages: ipset, python
+
 2011.08-rc2, Released August 29th, 2011:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index e975320d49..9ed46fce57 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.08-rc2
+export BR2_VERSION:=2011.08
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index e8b8c48ea4..a397fe0c87 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2011.05</b>, which can be downloaded
+The latest stable release is <b>2011.08</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2011.05.tar.gz">buildroot-2011.05.tar.gz</a>
+<a href="/downloads/buildroot-2011.08.tar.gz">buildroot-2011.08.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.05.tar.bz2">buildroot-2011.05.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.08.tar.bz2">buildroot-2011.08.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2011.08-rc2</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.08-rc2.tar.bz2">buildroot-2011.08-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 582a72a6d3..dbcc7c901b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,14 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>32 August 2011 -- 2011.08 released</b>
+
+    <p>The stable 2011.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08">CHANGES</a>
+    file for more details, and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.08.tar.bz2">2011.08 release</a>.</p>
+
   <li><b>29 August 2011 -- 2011.08-rc2 released</b>
 
     <p>RC2 is out with more bugfixes. See the <a

From d1dd9588ae76d8c9b79a39af182a45e54ac356dd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 31 Aug 2011 14:23:26 +0200
Subject: [PATCH 0570/6849] news.html: fix 2011.08 release date

Thanks to Michael S. Zick for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index dbcc7c901b..658d82a7a3 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,7 +5,7 @@ <h3>News</h3>
 <p>
 
 <ul>
-  <li><b>32 August 2011 -- 2011.08 released</b>
+  <li><b>31 August 2011 -- 2011.08 released</b>
 
     <p>The stable 2011.08 release is out - Thanks to everyone
     contributing and testing the release candidates. See the

From 5427c506bd652e0d0a6c59d14791018195c59525 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Sep 2011 22:14:33 +0200
Subject: [PATCH 0571/6849] kickoff 2011.11 development cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 99cd79b14b..288d57559f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2011.11, Not released yet:
+
 2011.08, Released August 31th, 2011:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 9ed46fce57..8779d3f1fb 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.08
+export BR2_VERSION:=2011.11-git
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:

From 8a124c78edea6e4c5d80f739575c71af4fe9abce Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Sep 2011 22:16:03 +0200
Subject: [PATCH 0572/6849] util-linux: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux-script-libintl.patch           | 30 +++++++++++++++++++
 package/util-linux/util-linux.mk              |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 package/util-linux/util-linux-script-libintl.patch

diff --git a/package/util-linux/util-linux-script-libintl.patch b/package/util-linux/util-linux-script-libintl.patch
new file mode 100644
index 0000000000..0700aa40f8
--- /dev/null
+++ b/package/util-linux/util-linux-script-libintl.patch
@@ -0,0 +1,30 @@
+From 075f251b19509f588d828a81d91b40f47e63e3de Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Sep 2011 21:46:25 +0200
+Subject: [PATCH] script.c: drop libintl.h include
+
+Commit 8fb810ff26 (script: include-what-you-use header check) added a
+<libintl.h> #include, which isn't needed as nls.h includes it (if
+enabled) - But worse, breaks the build for systems without libintl.h
+(like some uClibc configurations).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ term-utils/script.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/script.c b/term-utils/script.c
+index d96ca2f..f708e91 100644
+--- a/term-utils/script.c
++++ b/term-utils/script.c
+@@ -55,7 +55,6 @@
+ #include <getopt.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <libintl.h>
+ #include <limits.h>
+ #include <locale.h>
+ #include <stddef.h>
+-- 
+1.7.5.4
+
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 9d2f9be3b6..49c528aeae 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -3,8 +3,8 @@
 # util-linux
 #
 #############################################################
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
-UTIL_LINUX_VERSION_MAJOR = 2.19
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
+UTIL_LINUX_VERSION_MAJOR = 2.20
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_AUTORECONF = YES

From 044edd0637f3d8dfde318ecd1fc10a6fb6422fa0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 6 Sep 2011 09:12:51 +0200
Subject: [PATCH 0573/6849] e2fsprogs: drop uuidd option

e2fsprogs uuidd no longer builds with libuuid from util-linux 2.20,
and according to tytso the util-linux version should be used instead
when using libuuid from there, so drop the e2fsprogs option.

Reported-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/Config.in    | 6 ------
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index ebf500309b..a98c49efa3 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -89,12 +89,6 @@ config BR2_PACKAGE_E2FSPROGS_UUIDGEN
 	bool "uuidgen"
 	default y
 
-config BR2_PACKAGE_E2FSPROGS_UUIDD
-	bool "uuidd"
-	default y
-	help
-	  The uuidd daemon from the e2fsprogs suite
-
 endif
 
 comment "e2fsprogs requires a toolchain with LARGEFILE + WCHAR support"
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 1cfeb0135e..b2c30bf37f 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -13,7 +13,7 @@ E2FSPROGS_CONF_OPT = \
 	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
-	$(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \
+	--disable-uuidd \
 	--disable-blkid \
 	--disable-libuuid \
 	--enable-fsck \

From bd387486ad871164e4fbe86eb6570775086acfbe Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 11 Aug 2011 11:57:41 +0200
Subject: [PATCH 0574/6849] libsoup: add option to enable HTTPS (SSL) support

By selecting BR2_PACKAGE_LIBSOUP_SSL the gnutls package is selected
and libsoup will be compiled with SSL support.

[Peter: pass --with-libgcrypt-prefix so configure finds it]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoup/Config.in  | 7 +++++++
 package/libsoup/libsoup.mk | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 2264b63cce..347687cfef 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -12,5 +12,12 @@ config BR2_PACKAGE_LIBSOUP
 
 	  http://live.gnome.org/LibSoup
 
+config BR2_PACKAGE_LIBSOUP_SSL
+	bool "https support"
+	select BR2_PACKAGE_GNUTLS
+	depends on BR2_PACKAGE_LIBSOUP
+	help
+	  Enable HTTPS (SSL) support.
+
 comment "libsoup requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 11bfadd852..79a8d5509d 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,9 +19,15 @@ endif
 LIBSOUP_CONF_OPT = \
 	--disable-explicit-deps \
 	--disable-glibtest	\
-	--disable-ssl		\
 	--without-gnome
 
 LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
+ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
+LIBSOUP_DEPENDENCIES += gnutls
+LIBSOUP_CONF_OPT += --enable-ssl --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+LIBSOUP_CONF_OPT += --disable-ssl
+endif
+
 $(eval $(call AUTOTARGETS,package,libsoup))

From 5f150dc6d86b949876f350f96e8a92f7fdcb0765 Mon Sep 17 00:00:00 2001
From: Frederic Bassaler <frederic.bassaler@gmail.com>
Date: Thu, 11 Aug 2011 12:38:33 +0200
Subject: [PATCH 0575/6849] leafpad: bump to 0.8.18

Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/leafpad/leafpad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index 99644095c7..bc042494f7 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -3,7 +3,7 @@
 # leafpad
 #
 #############################################################
-LEAFPAD_VERSION = 0.8.14
+LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
 LEAFPAD_AUTORECONF = NO

From 3f346b7b858447ebee57842a409eb6376acd93ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 6 Sep 2011 10:36:53 -0300
Subject: [PATCH 0576/6849] busybox: add 1.19.x branch and cleanup

Add busybox version 1.19.2 for the 1.19.x branch.
Remove deprecated 1.15.x branch.
Mark 1.16.x and 1.17.x branches deprecated as suggested by Thomas.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in             |   17 +-
 package/busybox/busybox-1.19.x.config | 1013 +++++++++++++++++++++++++
 2 files changed, 1022 insertions(+), 8 deletions(-)
 create mode 100644 package/busybox/busybox-1.19.x.config

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 488b12483f..52aef86307 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -13,23 +13,24 @@ if BR2_PACKAGE_BUSYBOX
 
 choice
 	prompt "BusyBox Version"
-	default BR2_BUSYBOX_VERSION_1_18_X
+	default BR2_BUSYBOX_VERSION_1_19_X
 	help
 	  Select the version of BusyBox you wish to use.
 
-	config BR2_BUSYBOX_VERSION_1_15_X
-		bool "BusyBox 1.15.x"
-		depends on BR2_DEPRECATED
-
 	config BR2_BUSYBOX_VERSION_1_16_X
 		bool "BusyBox 1.16.x"
+		depends on BR2_DEPRECATED
 
 	config BR2_BUSYBOX_VERSION_1_17_X
 		bool "BusyBox 1.17.x"
+		depends on BR2_DEPRECATED
 
 	config BR2_BUSYBOX_VERSION_1_18_X
 		bool "BusyBox 1.18.x"
 
+	config BR2_BUSYBOX_VERSION_1_19_X
+		bool "BusyBox 1.19.x"
+
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
 
@@ -37,18 +38,18 @@ endchoice
 
 config BR2_BUSYBOX_VERSION
 	string
-	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
+	default "1.19.2"	if BR2_BUSYBOX_VERSION_1_19_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
-	default "package/busybox/busybox-1.18.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X
+	default "package/busybox/busybox-1.19.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X
 	default "package/busybox/busybox-1.17.x.config" if BR2_BUSYBOX_VERSION_1_17_X
 	default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
+	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.
diff --git a/package/busybox/busybox-1.19.x.config b/package/busybox/busybox-1.19.x.config
new file mode 100644
index 0000000000..9f4603dd2e
--- /dev/null
+++ b/package/busybox/busybox-1.19.x.config
@@ -0,0 +1,1013 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.19.0
+# Tue Aug 23 11:28:35 2011
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_UNICODE_SUPPORT is not set
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=0
+CONFIG_LAST_SUPPORTED_WCHAR=0
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+# CONFIG_FEATURE_SYSTEMD is not set
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_FEATURE_AR_CREATE=y
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+# CONFIG_GROUPS is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+# CONFIG_BASE64 is not set
+CONFIG_WHO=y
+# CONFIG_USERS is not set
+# CONFIG_CAL is not set
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+# CONFIG_FGCONSOLE is not set
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+# CONFIG_SHOWKEY is not set
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_PATCH=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_SED=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODINFO is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLOCKDEV is not set
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+CONFIG_BLKID=y
+# CONFIG_FEATURE_BLKID_TYPE is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+# CONFIG_FDISK is not set
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_DEVMEM=y
+CONFIG_EJECT=y
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+CONFIG_MICROCOM=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE=""
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_IOSTAT is not set
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
+# CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y

From 6d267a8a351c9b62780f8035d1bcaa699e2b9af2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 25 Aug 2011 22:47:04 +0200
Subject: [PATCH 0577/6849] mini2440_defconfig: use mainline kernel

mini2440 has been supported in the mainline kernel since early 2009,
so use that instead of a custom tarball.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mini2440/linux-2.6.32.2.config            | 1409 -----------------
 configs/mini2440_defconfig                    |    7 +-
 2 files changed, 3 insertions(+), 1413 deletions(-)
 delete mode 100644 board/friendlyarm/mini2440/linux-2.6.32.2.config

diff --git a/board/friendlyarm/mini2440/linux-2.6.32.2.config b/board/friendlyarm/mini2440/linux-2.6.32.2.config
deleted file mode 100644
index b0c383ee78..0000000000
--- a/board/friendlyarm/mini2440/linux-2.6.32.2.config
+++ /dev/null
@@ -1,1409 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.2
-# Fri Jul  2 21:15:21 2010
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_NO_IOPORT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-FriendlyARM"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_CLK=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_SLOW_WORK=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-# CONFIG_MODULES is not set
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-# CONFIG_FREEZER is not set
-
-#
-# System Type
-#
-CONFIG_MMU=y
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-CONFIG_ARCH_S3C2410=y
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_BCMRING is not set
-CONFIG_PLAT_S3C24XX=y
-CONFIG_S3C2410_CLOCK=y
-CONFIG_CPU_S3C244X=y
-CONFIG_S3C2440_XTAL_12000000=y
-# CONFIG_S3C24XX_PWM is not set
-CONFIG_S3C24XX_GPIO_EXTRA=0
-CONFIG_S3C2410_DMA=y
-# CONFIG_S3C2410_DMA_DEBUG is not set
-CONFIG_S3C24XX_ADC=y
-CONFIG_PLAT_S3C=y
-CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
-CONFIG_CPU_LLSERIAL_S3C2440=y
-
-#
-# Boot options
-#
-# CONFIG_S3C_BOOT_WATCHDOG is not set
-# CONFIG_S3C_BOOT_ERROR_RESET is not set
-CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-
-#
-# Power management
-#
-CONFIG_S3C_LOWLEVEL_UART_PORT=0
-CONFIG_S3C_GPIO_SPACE=0
-CONFIG_S3C_DMA=y
-CONFIG_S3C_DEV_USB_HOST=y
-CONFIG_S3C_DEV_NAND=y
-
-#
-# S3C2400 Machines
-#
-CONFIG_S3C2410_GPIO=y
-
-#
-# S3C2410 Machines
-#
-# CONFIG_ARCH_SMDK2410 is not set
-# CONFIG_ARCH_H1940 is not set
-# CONFIG_MACH_N30 is not set
-# CONFIG_ARCH_BAST is not set
-# CONFIG_MACH_OTOM is not set
-# CONFIG_MACH_AML_M5900 is not set
-# CONFIG_MACH_TCT_HAMMER is not set
-# CONFIG_MACH_VR1000 is not set
-# CONFIG_MACH_QT2410 is not set
-
-#
-# S3C2412 Machines
-#
-# CONFIG_MACH_JIVE is not set
-# CONFIG_MACH_SMDK2413 is not set
-# CONFIG_MACH_SMDK2412 is not set
-# CONFIG_MACH_VSTMS is not set
-CONFIG_CPU_S3C2440=y
-CONFIG_S3C2440_DMA=y
-
-#
-# S3C2440 Machines
-#
-# CONFIG_MACH_ANUBIS is not set
-# CONFIG_MACH_OSIRIS is not set
-# CONFIG_MACH_RX3715 is not set
-# CONFIG_ARCH_S3C2440 is not set
-# CONFIG_MACH_NEXCODER_2440 is not set
-# CONFIG_MACH_AT2440EVB is not set
-CONFIG_MACH_MINI2440=y
-
-#
-# S3C2442 Machines
-#
-# CONFIG_MACH_NEO1973_GTA02 is not set
-
-#
-# S3C2443 Machines
-#
-# CONFIG_MACH_SMDK2443 is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-# CONFIG_ARM_THUMB is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Kernel Features
-#
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_HZ=200
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE=""
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-
-#
-# CPU Power Management
-#
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-# CONFIG_PM is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_PHONET is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MISC_DEVICES is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_PROC_FS is not set
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_AX88796 is not set
-# CONFIG_SMC91X is not set
-CONFIG_DM9000=y
-CONFIG_DM9000_DEBUGLEVEL=4
-# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
-# CONFIG_ETHOC is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_DNET is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_B44 is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_S3C2410=y
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_MINI2440_HELLO_MODULE=y
-CONFIG_LEDS_MINI2440=y
-CONFIG_MINI2440_BUTTONS=y
-CONFIG_MINI2440_BUZZER=y
-CONFIG_MINI2440_ADC=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_UARTS=3
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_S3C2440=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-
-#
-# I2C Algorithms
-#
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_S3C2410=y
-# CONFIG_I2C_SIMTEC is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_PCA_PLATFORM is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_DS1682 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-
-#
-# PCI GPIO expanders:
-#
-
-#
-# SPI GPIO expanders:
-#
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_S3C2410_WATCHDOG=y
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_S3C2410=y
-CONFIG_FB_S3C2410_DEBUG=y
-# CONFIG_FB_S3C2410_T240320 is not set
-# CONFIG_FB_S3C2410_N240320 is not set
-CONFIG_FB_S3C2410_TFT640480=y
-# CONFIG_FB_S3C2410_TFT800480 is not set
-# CONFIG_FB_S3C2410_VGA1024768 is not set
-# CONFIG_BACKLIGHT_MINI2440 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
-CONFIG_SOUND=y
-# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_JACK=y
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_S3C24XX_SOC=y
-CONFIG_SND_S3C24XX_SOC_I2S=y
-# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X=y
-# CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 is not set
-# CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES is not set
-CONFIG_SND_SOC_I2C_AND_SPI=y
-# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_L3=y
-CONFIG_SND_SOC_UDA134X=y
-# CONFIG_SOUND_PRIME is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HIDRAW is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_ZEROPLUS is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_MUSB_HDRC is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_S3C=y
-CONFIG_MMC_S3C_HW_SDIO_IRQ=y
-CONFIG_MMC_S3C_PIO=y
-# CONFIG_MMC_S3C_DMA is not set
-# CONFIG_MMC_S3C_PIODMA is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_DEBUG=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_S3C=y
-# CONFIG_DMADEVICES is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-
-#
-# TI VLYNQ
-#
-# CONFIG_STAGING is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_XATTR=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-CONFIG_EXT4_DEBUG=y
-CONFIG_JBD2=y
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-# CONFIG_MSDOS_FS is not set
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-CONFIG_CIFS=y
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-CONFIG_NLS_CODEPAGE_936=y
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=y
-# CONFIG_DLM is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_S3C_UART=0
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=y
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_LZO is not set
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
diff --git a/configs/mini2440_defconfig b/configs/mini2440_defconfig
index ac6d0cf9d2..a7db8551bf 100644
--- a/configs/mini2440_defconfig
+++ b/configs/mini2440_defconfig
@@ -25,8 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://repo.or.cz/w/u-boot-openmoko/mi
 # Kernel
 #
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://www.pauljones.id.au/temp/linux-2.6.32.2-mini2440_20100113.tgz"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/friendlyarm/mini2440/linux-2.6.32.2.config"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.0.4"
+BR2_LINUX_KERNEL_DEFCONFIG="mini2440"
 BR2_LINUX_KERNEL_UIMAGE=y

From 60b9bbfca9af488db9dc561ae2b1d186809893d7 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 16 Aug 2011 12:08:18 +0200
Subject: [PATCH 0578/6849] dbus: bump version to 1.4.14

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 7c2bdddb86..d276b725d3 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,7 +3,7 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.4.10
+DBUS_VERSION = 1.4.14
 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES

From d2f84e1623183aabc63f84c7105bf958c0a90914 Mon Sep 17 00:00:00 2001
From: Frederic Bassaler <frederic.bassaler@gmail.com>
Date: Thu, 11 Aug 2011 15:11:03 +0200
Subject: [PATCH 0579/6849] freetype: bump to 2.4.6

Security update.

Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index ad4292f935..90ba373d69 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -3,7 +3,7 @@
 # freetype
 #
 #############################################################
-FREETYPE_VERSION = 2.4.4
+FREETYPE_VERSION = 2.4.6
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES

From 7b1cf6c6a49571d27e90af68f65c02d5e01e3796 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 9 Sep 2011 11:42:03 +0200
Subject: [PATCH 0580/6849] lzo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzo/lzo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index d4195f6c4e..9bd1a6f824 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -3,7 +3,7 @@
 # lzo
 #
 #############################################################
-LZO_VERSION = 2.05
+LZO_VERSION = 2.06
 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
 LZO_INSTALL_STAGING = YES
 

From 4b9bd9736e97d84a86bb52844a99e74f157980c0 Mon Sep 17 00:00:00 2001
From: Frederic Bassaler <frederic.bassaler@gmail.com>
Date: Wed, 3 Aug 2011 19:23:01 +0200
Subject: [PATCH 0581/6849] package: add Fluxbox 1.3.1 window manager

[Peter: fix build without iconv, whitespace fixes]
Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                         |  1 +
 package/fluxbox/Config.in                 | 12 ++++++++
 package/fluxbox/fluxbox-1.3.1-iconv.patch | 37 +++++++++++++++++++++++
 package/fluxbox/fluxbox.mk                | 16 ++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 package/fluxbox/Config.in
 create mode 100644 package/fluxbox/fluxbox-1.3.1-iconv.patch
 create mode 100644 package/fluxbox/fluxbox.mk

diff --git a/package/Config.in b/package/Config.in
index 7112e059e3..c4cecfa5b8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -127,6 +127,7 @@ comment "X Window managers"
 source "package/matchbox/Config.in"
 source "package/metacity/Config.in"
 source "package/blackbox/Config.in"
+source "package/fluxbox/Config.in"
 
 comment "X applications"
 source "package/alsamixergui/Config.in"
diff --git a/package/fluxbox/Config.in b/package/fluxbox/Config.in
new file mode 100644
index 0000000000..e4d6c3700e
--- /dev/null
+++ b/package/fluxbox/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_FLUXBOX
+	bool "fluxbox"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  The Fluxbox lightweight window manager for X
+
+	  http://fluxbox.org
+
+comment "fluxbox requires a toolchain with C++ support enabled"
+	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP
diff --git a/package/fluxbox/fluxbox-1.3.1-iconv.patch b/package/fluxbox/fluxbox-1.3.1-iconv.patch
new file mode 100644
index 0000000000..82b4507f15
--- /dev/null
+++ b/package/fluxbox/fluxbox-1.3.1-iconv.patch
@@ -0,0 +1,37 @@
+From 3ed2d03446cdf53fd10c8ad056d9f86db9923666 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Fri, 9 Sep 2011 20:35:49 +0200
+Subject: [PATCH] FbString: fix build without iconv
+
+Commit 690d926 (introduced FbTk::BidiString) broke building without
+HAVE_ICONV, because of wrong variable name and use of iconv_t type.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/FbTk/FbString.cc |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
+index fd34693..5295a66 100644
+--- a/src/FbTk/FbString.cc
++++ b/src/FbTk/FbString.cc
+@@ -150,6 +150,7 @@ enum ConvType { FB2X = 0, X2FB, LOCALE2FB, FB2LOCALE, CONVSIZE };
+ #ifdef HAVE_ICONV
+ static iconv_t *iconv_convs = 0;
+ #else
++typedef int iconv_t;
+ static int iconv_convs[CONVSIZE];
+ #endif // HAVE_ICONV
+ 
+@@ -292,7 +293,7 @@ string recode(iconv_t cd, const string &in) {
+ 
+     return ret;
+ #else
+-    return str;
++    return in;
+ #endif // HAVE_ICONV
+ }
+ 
+-- 
+1.7.5.4
+
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
new file mode 100644
index 0000000000..0cd1328864
--- /dev/null
+++ b/package/fluxbox/fluxbox.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# FLUXBOX
+#
+#############################################################
+
+FLUXBOX_VERSION = 1.3.1
+FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
+FLUXBOX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fluxbox/
+
+FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+		   --x-libraries=$(STAGING_DIR)/usr/lib
+
+FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+$(eval $(call AUTOTARGETS,package,fluxbox))

From e73cf2d5f3152ca46b730c69677ae54e3b7217bd Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Mon, 8 Aug 2011 16:55:25 +0200
Subject: [PATCH 0582/6849] package: add libev

Signed-off-by: Bernhard Roth <broth@roth-itk.de>
Signed-off-by: Yegor Yefremov <yegor_sub1@visionsystems.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/libev/Config.in |  6 ++++++
 package/libev/libev.mk  | 11 +++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/libev/Config.in
 create mode 100644 package/libev/libev.mk

diff --git a/package/Config.in b/package/Config.in
index c4cecfa5b8..bcdf421012 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -342,6 +342,7 @@ source "package/libcap/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
+source "package/libev/Config.in"
 source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
 source "package/libnspr/Config.in"
diff --git a/package/libev/Config.in b/package/libev/Config.in
new file mode 100644
index 0000000000..71abe7737d
--- /dev/null
+++ b/package/libev/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBEV
+	bool "libev"
+	help
+	  Userspace library for handling asynchronous notifications
+
+	  http://software.schmorp.de/pkg/libev.html
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
new file mode 100644
index 0000000000..b0db1237fc
--- /dev/null
+++ b/package/libev/libev.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# libev
+#
+#############################################################
+LIBEV_VERSION = 4.04
+LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
+LIBEV_SITE = http://dist.schmorp.de/libev/
+LIBEV_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libev))

From 0789fd3825c00138b832dd97cf9d95242efca75e Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 10 Aug 2011 10:25:12 +0200
Subject: [PATCH 0583/6849] ethtool: bump to 3.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index d3f578c7e8..af066dd990 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 2.6.39
+ETHTOOL_VERSION = 3.0
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool/
 
 $(eval $(call AUTOTARGETS,package,ethtool))

From d5368064c2556a5df9e04538c485453f53936342 Mon Sep 17 00:00:00 2001
From: Murat Demirten <mdemirten@yh.com.tr>
Date: Sun, 7 Aug 2011 00:55:07 +0300
Subject: [PATCH 0584/6849] New package: libgeotiff

Libgeotiff is an open source library normally hosted on top of
libtiff for reading, and writing GeoTIFF information tags.

Signed-off-by: Murat Demirten <mdemirten@yh.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/libgeotiff/Config.in     |  8 ++++++++
 package/libgeotiff/libgeotiff.mk | 12 ++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 package/libgeotiff/Config.in
 create mode 100644 package/libgeotiff/libgeotiff.mk

diff --git a/package/Config.in b/package/Config.in
index bcdf421012..f56384de2d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -284,6 +284,7 @@ source "package/libart/Config.in"
 source "package/libdrm/Config.in"
 source "package/libexif/Config.in"
 source "package/libgail/Config.in"
+source "package/libgeotiff/Config.in"
 source "package/libglade/Config.in"
 source "package/gdk-pixbuf/Config.in"
 source "package/libgtk2/Config.in"
diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in
new file mode 100644
index 0000000000..7489a4704a
--- /dev/null
+++ b/package/libgeotiff/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBGEOTIFF
+       bool "libgeotiff"
+       select BR2_PACKAGE_TIFF
+       help
+         Libgeotiff is an open source library normally hosted on top of
+         libtiff for reading, and writing GeoTIFF information tags.
+
+         http://geotiff.osgeo.org
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
new file mode 100644
index 0000000000..f159eba655
--- /dev/null
+++ b/package/libgeotiff/libgeotiff.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libgeotiff
+#
+#############################################################
+LIBGEOTIFF_VERSION = 1.3.0
+LIBGEOTIFF_SOURCE = libgeotiff-$(LIBGEOTIFF_VERSION).tar.gz
+LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
+LIBGEOTIFF_DEPENDENCIES = tiff
+LIBGEOTIFF_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libgeotiff))

From fe7a4b524b72bcb448f7e723873d8244620cb2f1 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 9 Aug 2011 19:39:20 +0200
Subject: [PATCH 0585/6849] package: add libftdi support

needed by openocd

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libftdi/Config.in                     | 18 +++++++
 .../libftdi-0.19-01_pkgconfig_libusb.patch    | 47 +++++++++++++++++++
 package/libftdi/libftdi.mk                    | 23 +++++++++
 4 files changed, 89 insertions(+)
 create mode 100644 package/libftdi/Config.in
 create mode 100644 package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch
 create mode 100644 package/libftdi/libftdi.mk

diff --git a/package/Config.in b/package/Config.in
index f56384de2d..d95e7b5e8e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -303,6 +303,7 @@ menu "Hardware handling"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
+source "package/libftdi/Config.in"
 source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libusb/Config.in"
diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in
new file mode 100644
index 0000000000..e334d14279
--- /dev/null
+++ b/package/libftdi/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LIBFTDI
+	bool "libftdi"
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	help
+	  Userspace access to FTDI USB interface chips
+
+	  http://www.intra2net.com/en/developer/libftdi/index.php
+
+if BR2_PACKAGE_LIBFTDI
+
+config BR2_PACKAGE_LIBTFDI_CPP
+	depends on BR2_INSTALL_LIBSTDCPP
+	bool "C++ bindings"
+	help
+	  C++ bindings for libftdi
+
+endif # BR2_PACKAGE_LIBFTDI
diff --git a/package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch b/package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch
new file mode 100644
index 0000000000..389291de00
--- /dev/null
+++ b/package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch
@@ -0,0 +1,47 @@
+---
+ configure.in |   35 +++++++++++------------------------
+ 1 file changed, 11 insertions(+), 24 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,30 +8,17 @@
+ AM_PROG_LIBTOOL
+ AC_PROG_CXX
+ 
+-dnl check for libusb-config
+-AC_CHECK_TOOL(HAVELIBUSB, libusb-config)
+-
+-if test ! -z "$HAVELIBUSB"; then
+-   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
+-   LIBUSB_LIBS=`$HAVELIBUSB --libs`
+-
+-   CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+-   LIBS="$LIBS $LIBUSB_LIBS"
+-else
+-   AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
+-fi
+-
+-dnl check for version of libusb
+-AC_MSG_CHECKING([if libusb version is >= 0.1.7])
+-libusb_version_needed="1007"
+-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
++dnl check for libusb
++PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
++CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
++LIBS="$LIBS $LIBUSB_LIBS"
+ 
+-if test $libusb_version -lt $libusb_version_needed; then
+-   AC_MSG_RESULT(no)
+-   AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
+-else
+-   AC_MSG_RESULT(yes)
+-fi
++dnl Check for recent pkg-config which supports Requires.private
++case `$PKG_CONFIG --version` in
++0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
++*) PKGCONFIG_REQUIRES="Requires.private"; ;;
++esac
++AC_SUBST(PKGCONFIG_REQUIRES)
+ 
+ ENABLE_ASYNC_MODE=0
+ AC_ARG_WITH(async-mode,
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
new file mode 100644
index 0000000000..315fe167c5
--- /dev/null
+++ b/package/libftdi/libftdi.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# libftdi
+#
+#############################################################
+LIBFTDI_VERSION = 0.19
+LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz
+LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download/
+LIBFTDI_DEPENDENCIES = libusb-compat libusb
+LIBFTDI_INSTALL_STAGING = YES
+
+LIBFTDI_AUTORECONF = YES
+
+LIBFDTI_CONF_OPT = --without-examples
+
+# configure detect it automaticaly so we need to force it
+ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y)
+LIBFDTI_CONF_OPT += --enable-libftdipp
+else
+LIBFDTI_CONF_OPT += --disable-libftdipp
+endif
+
+$(eval $(call AUTOTARGETS,package,libftdi))

From 6f103474ad6387cb5a00dc3419efc52e78afe5a5 Mon Sep 17 00:00:00 2001
From: Dan Pattison <dan.pattison@ethertek.ca>
Date: Thu, 1 Sep 2011 07:47:49 -0700
Subject: [PATCH 0586/6849] libconfuse: bump to version 2.7

Old libconfuse version 2.6 is from year 2007 so bump to version 2.7
Updated download URL in libconfuse.mk / Config.in
Removed libconfuse-2.6-dont-use-werror.patch
Changed := to just =

Signed-off-by: Dan Pattison <dan.pattison@ethertek.ca>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfuse/Config.in                  |  2 +-
 .../libconfuse-2.6-dont-use-werror.patch      | 34 -------------------
 package/libconfuse/libconfuse.mk              | 15 ++++----
 3 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 package/libconfuse/libconfuse-2.6-dont-use-werror.patch

diff --git a/package/libconfuse/Config.in b/package/libconfuse/Config.in
index e123dab48c..be18cbb073 100644
--- a/package/libconfuse/Config.in
+++ b/package/libconfuse/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCONFUSE
 	  environment variable expansion, functions and nested include
 	  statements.
 
-	  http://www.nongnu.org/confuse/
+	  http://savannah.nongnu.org/download/confuse/
diff --git a/package/libconfuse/libconfuse-2.6-dont-use-werror.patch b/package/libconfuse/libconfuse-2.6-dont-use-werror.patch
deleted file mode 100644
index 50d0733264..0000000000
--- a/package/libconfuse/libconfuse-2.6-dont-use-werror.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-confuse: don't compile with -Werror
-
-Werror isn't really a robust setting for !development.
----
- src/Makefile.am |    2 +-
- src/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: confuse-2.6/src/Makefile.am
-===================================================================
---- confuse-2.6.orig/src/Makefile.am
-+++ confuse-2.6/src/Makefile.am
-@@ -10,7 +10,7 @@
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
- if cc_is_gcc
--AM_CFLAGS=-Wall -Werror
-+AM_CFLAGS=-Wall
- endif
- 
- LIBS = @LIBS@
-Index: confuse-2.6/src/Makefile.in
-===================================================================
---- confuse-2.6.orig/src/Makefile.in
-+++ confuse-2.6/src/Makefile.in
-@@ -196,7 +196,7 @@
- libconfuse_la_SOURCES = confuse.c lexer.l
- libconfuse_la_LIBADD = $(LTLIBINTL)
- include_HEADERS = confuse.h
--@cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror
-+@cc_is_gcc_TRUE@AM_CFLAGS = -Wall
- CLEANFILES = *~ \#*\#
- AM_LFLAGS = -Pcfg_yy -olex.yy.c
- all: all-am
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index 03aa0bcd57..28115d74f0 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -3,13 +3,14 @@
 # libconfuse
 #
 #############################################################
-LIBCONFUSE_VERSION:=2.6
-LIBCONFUSE_SOURCE:=confuse-$(LIBCONFUSE_VERSION).tar.gz
-LIBCONFUSE_SITE:=http://bzero.se/confuse/
-LIBCONFUSE_AUTORECONF:=NO
-LIBCONFUSE_INSTALL_STAGING:=YES
-LIBCONFUSE_INSTALL_TARGET:=YES
+LIBCONFUSE_VERSION = 2.7
+LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
+LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
+LIBCONFUSE_AUTORECONF = NO
+LIBCONFUSE_INSTALL_STAGING = YES
 
-LIBCONFUSE_CONF_OPT:=--disable-rpath
+LIBCONFUSE_CONF_OPT = --disable-rpath
+
+LIBCONFUSE_DEPENDENCIES = uclibc
 
 $(eval $(call AUTOTARGETS,package,libconfuse))

From b1ddfecdb9952cb3bdda0d35ed4efc0f75e26f75 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:49 -0300
Subject: [PATCH 0587/6849] netsnmp: bump to version 5.6.1.1

Bump netsnmp to version 5.6.1.1 which contains minor fixes.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 5704327444..a44f3feef1 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.6.1
+NETSNMP_VERSION = 5.6.1.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES

From 90866f2705ccf2c74956525af0ec1549d902a76e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:50 -0300
Subject: [PATCH 0588/6849] libreplaygain: bump to r475

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libreplaygain/libreplaygain.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libreplaygain/libreplaygain.mk b/package/multimedia/libreplaygain/libreplaygain.mk
index c9410923ec..cc023a0906 100644
--- a/package/multimedia/libreplaygain/libreplaygain.mk
+++ b/package/multimedia/libreplaygain/libreplaygain.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBREPLAYGAIN_VERSION =  r453
+LIBREPLAYGAIN_VERSION =  r475
 LIBREPLAYGAIN_SITE = http://files.musepack.net/source
 LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
 # upstream doesn't ship configure

From 4ee8dea5674fea2f4ec424ece88ffc6d02416ca3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:51 -0300
Subject: [PATCH 0589/6849] libcuefile: bump to r475

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libcuefile/libcuefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libcuefile/libcuefile.mk b/package/multimedia/libcuefile/libcuefile.mk
index 86ec07098c..765c5a2e31 100644
--- a/package/multimedia/libcuefile/libcuefile.mk
+++ b/package/multimedia/libcuefile/libcuefile.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCUEFILE_VERSION = r453
+LIBCUEFILE_VERSION = r475
 LIBCUEFILE_SITE = http://files.musepack.net/source
 LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz
 LIBCUEFILE_INSTALL_STAGING = YES

From 2a49da16465ad2a1993b5a1736c70f6e1b1ac270 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:52 -0300
Subject: [PATCH 0590/6849] libsndfile: bump to version 1.0.25

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libsndfile/libsndfile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk
index d554699b98..52ecce5ed9 100644
--- a/package/multimedia/libsndfile/libsndfile.mk
+++ b/package/multimedia/libsndfile/libsndfile.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBSNDFILE_VERSION = 1.0.23
+LIBSNDFILE_VERSION = 1.0.25
 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
 LIBSNDFILE_INSTALL_STAGING = YES
 

From d1a7e85170873abb2b837aac7920cc491f942920 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:53 -0300
Subject: [PATCH 0591/6849] libcurl: bump to version 7.21.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index ca293fbd69..5773570e81 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -3,7 +3,8 @@
 # libcurl
 #
 #############################################################
-LIBCURL_VERSION = 7.21.2
+
+LIBCURL_VERSION = 7.21.7
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download/
 LIBCURL_INSTALL_STAGING = YES

From 46ef8128014ef160e299be53ff64b8b0345b6d99 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:54 -0300
Subject: [PATCH 0592/6849] libsamplerate: bump to version 0.1.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libsamplerate/libsamplerate.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libsamplerate/libsamplerate.mk b/package/multimedia/libsamplerate/libsamplerate.mk
index 94b07a40f3..f20026a3b8 100644
--- a/package/multimedia/libsamplerate/libsamplerate.mk
+++ b/package/multimedia/libsamplerate/libsamplerate.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSAMPLERATE_VERSION = 0.1.7
+LIBSAMPLERATE_VERSION = 0.1.8
 LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
 LIBSAMPLERATE_INSTALL_STAGING = YES
 LIBSAMPLERATE_DEPENDENCIES = host-pkg-config

From 0cc80d1e60327909c87aa2d97ef99ef071a7a5a5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:55 -0300
Subject: [PATCH 0593/6849] libao: bump to version 1.1.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libao/libao.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libao/libao.mk b/package/multimedia/libao/libao.mk
index ee02d18c5b..83d31545a1 100644
--- a/package/multimedia/libao/libao.mk
+++ b/package/multimedia/libao/libao.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBAO_VERSION = 1.0.0
+LIBAO_VERSION = 1.1.0
 LIBAO_SITE = http://downloads.xiph.org/releases/ao
 LIBAO_DEPENDENCIES = host-pkg-config
 LIBAO_INSTALL_STAGING = YES

From 34d2239ac4d4d4b373de9c21231616883636c7f4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:56 -0300
Subject: [PATCH 0594/6849] sqlite: bump to version 3.7.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index de2e499fcb..db9c53eb54 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3070603
+SQLITE_VERSION = 3070701
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From d9d7cab7bb16a130a12fa4b182c91b2657979d54 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:57 -0300
Subject: [PATCH 0595/6849] musepack: bump to r475

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../multimedia/musepack/musepack-shared.patch | 24 +++++++++++++++++++
 package/multimedia/musepack/musepack.mk       |  5 ++--
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 package/multimedia/musepack/musepack-shared.patch

diff --git a/package/multimedia/musepack/musepack-shared.patch b/package/multimedia/musepack/musepack-shared.patch
new file mode 100644
index 0000000000..d8c788db7c
--- /dev/null
+++ b/package/multimedia/musepack/musepack-shared.patch
@@ -0,0 +1,24 @@
+Fixup installation of shared mpcdec library.
+Based on gentoo patch.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura musepack_src_r475.orig/libmpcdec/CMakeLists.txt musepack_src_r475/libmpcdec/CMakeLists.txt
+--- musepack_src_r475.orig/libmpcdec/CMakeLists.txt	2010-08-21 12:55:01.000000000 -0300
++++ musepack_src_r475/libmpcdec/CMakeLists.txt	2011-08-17 15:53:06.126873408 -0300
+@@ -1,7 +1,12 @@
+ include_directories(${libmpc_SOURCE_DIR}/include)
+ if(SHARED)
+-  add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++  target_link_libraries(mpcdec_shared m)
++  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+ else(SHARED)
+   add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++  target_link_libraries(mpcdec_static m)
++  install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+ endif(SHARED)
+-
diff --git a/package/multimedia/musepack/musepack.mk b/package/multimedia/musepack/musepack.mk
index 34581b6964..21601ebcba 100644
--- a/package/multimedia/musepack/musepack.mk
+++ b/package/multimedia/musepack/musepack.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-MUSEPACK_VERSION =  r435
+MUSEPACK_VERSION =  r475
 MUSEPACK_SITE = http://files.musepack.net/source
 MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
 MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
-MUSEPACK_AUTORECONF = YES
 MUSEPACK_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,musepack))
+$(eval $(call CMAKETARGETS,package/multimedia,musepack))

From 170fb5361d82bf1b0a71a7f8f87da1600a4c2a10 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Sep 2011 22:18:52 +0200
Subject: [PATCH 0596/6849] libconfuse: drop implied uClibc dependency

uClibc doesn't need to be listed as an explicit pkg dependency.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfuse/libconfuse.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index 28115d74f0..79ff6871f6 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -11,6 +11,4 @@ LIBCONFUSE_INSTALL_STAGING = YES
 
 LIBCONFUSE_CONF_OPT = --disable-rpath
 
-LIBCONFUSE_DEPENDENCIES = uclibc
-
 $(eval $(call AUTOTARGETS,package,libconfuse))

From 9f5a613eef9214da8e5c90492f8428b7c6696b29 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:58 -0300
Subject: [PATCH 0597/6849] mpd: bump to version 0.16.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mpd-0.16.2-tremor-needs-ogg_common.patch  | 20 -------------------
 package/multimedia/mpd/mpd.mk                 |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch

diff --git a/package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch b/package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch
deleted file mode 100644
index d315f146d3..0000000000
--- a/package/multimedia/mpd/mpd-0.16.2-tremor-needs-ogg_common.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-[PATCH] configure: tremor needs common ogg support just like libvorbis does
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mpd-0.16.2/configure.ac
-===================================================================
---- mpd-0.16.2.orig/configure.ac
-+++ mpd-0.16.2/configure.ac
-@@ -1081,7 +1081,7 @@
- fi
- 
- AM_CONDITIONAL(HAVE_OGG_COMMON,
--	  test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
-+	  test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
- 
- AM_CONDITIONAL(HAVE_FLAC_COMMON,
- 	  test x$enable_flac = xyes || test x$enable_oggflac = xyes)
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index d418f61d68..e647b4a2b3 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.2
+MPD_VERSION = 0.16.3
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2

From f9fe656ca4c07940df260c7d340832675be7c5c0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:59 -0300
Subject: [PATCH 0598/6849] squid: bump to version 3.1.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid-cross-compile.patch | 65 -------------------------
 package/squid/squid.mk                  |  5 +-
 2 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 package/squid/squid-cross-compile.patch

diff --git a/package/squid/squid-cross-compile.patch b/package/squid/squid-cross-compile.patch
deleted file mode 100644
index 98424aec08..0000000000
--- a/package/squid/squid-cross-compile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Nura squid-3.1.10.orig/configure.ac squid-3.1.10/configure.ac
---- squid-3.1.10.orig/configure.ac	2010-12-22 02:48:27.000000000 -0300
-+++ squid-3.1.10/configure.ac	2010-12-22 11:31:08.420533635 -0300
-@@ -384,7 +384,7 @@
- 
- dnl Nasty hack to get autoconf 2.64 on Linux to run.
- dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64
--AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
-+dnl AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
- 
- dnl This is a developer only option.. developers know how to set defines
- dnl
-@@ -1889,7 +1889,7 @@
-     AC_MSG_NOTICE([Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS])
- fi
- AC_SUBST(NEGOTIATE_AUTH_HELPERS)
--AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
-+dnl AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
- 
- dnl Select digest auth scheme helpers to build
- if test -n "$AUTH_MODULE_digest"; then
-@@ -2202,6 +2202,18 @@
- 	;;
- esac
- 
-+dnl Define CXX_FOR_BUILD
-+CXX_FOR_BUILD="$CXX_FOR_BUILD"
-+AC_SUBST(CXX_FOR_BUILD)
-+
-+dnl Define CXXFLAGS_FOR_BUILD
-+CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD"
-+AC_SUBST(CXXFLAGS_FOR_BUILD)
-+
-+dnl Define LDFLAGS_FOR_BUILD
-+LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD"
-+AC_SUBST(LDFLAGS_FOR_BUILD)
-+
- dnl Check for programs
- AC_PROG_CPP
- AC_PROG_INSTALL
-diff -Nura squid-3.1.10.orig/src/Makefile.am squid-3.1.10/src/Makefile.am
---- squid-3.1.10.orig/src/Makefile.am	2010-12-22 02:46:56.000000000 -0300
-+++ squid-3.1.10/src/Makefile.am	2010-12-22 11:31:08.422533643 -0300
-@@ -195,8 +195,6 @@
- cf_gen_SOURCES = cf_gen.cc
- nodist_cf_gen_HEADER = cf_gen_defines.cci
- cf_gen_LDADD= \
--	../compat/libcompat.la \
--	-L../lib -lmiscutil \
- 	$(EPOLL_LIBS) \
- 	$(MINGW_LIBS) \
- 	$(XTRA_LIBS)
-@@ -753,6 +751,12 @@
- squid.conf.default squid.conf.documented: cf_parser.cci
- 	true
- 
-+cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES)
-+	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \
-+		$(top_srcdir)/lib/util.c \
-+		$(top_srcdir)/compat/assert.cc \
-+		$(cf_gen_LDADD) $(LIBS) ${INCLUDES}
-+
- cf_parser.cci: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
- 
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 2184f1a7c4..fbcdc4875f 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,13 +4,12 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.14
+SQUID_VERSION = 3.1.15
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
-SQUID_AUTORECONF = YES
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
-			ac_cv_func_strnstr=no
+			ac_cv_func_strnstr=no ac_cv_have_squid=yes
 SQUID_CONF_OPT =	--enable-wccp --enable-wccpv2 --enable-async-io=8 \
 			--enable-htcp --enable-snmp --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \

From 95951797b5a2d15c3c92f7f02aad0711aea57ffc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:05:01 -0300
Subject: [PATCH 0599/6849] dnsmasq: bump to version 2.58

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index d8f4d77e30..f62ec216e1 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.57
+DNSMASQ_VERSION = 2.58
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

From d97542c6d88d2e621db8d01db523baac5bf9ccf0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Sep 2011 22:36:36 +0200
Subject: [PATCH 0600/6849] busybox: add 1.19.2 fixes for chpasswd, crond and
 inetd.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.19.2-chpasswd.patch             | 55 +++++++++++++++++++
 .../busybox-1.19.2/busybox-1.19.2-crond.patch | 12 ++++
 .../busybox-1.19.2/busybox-1.19.2-inetd.patch | 47 ++++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch

diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch
new file mode 100644
index 0000000000..0cba0e219a
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch
@@ -0,0 +1,55 @@
+--- busybox-1.19.2/loginutils/chpasswd.c
++++ busybox-1.19.2-chpasswd/loginutils/chpasswd.c
+@@ -33,9 +33,8 @@ static const char chpasswd_longopts[] AL
+ int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
+ {
+-	char *name, *pass;
+-	char salt[sizeof("$N$XXXXXXXX")];
+-	int opt, rc;
++	char *name;
++	int opt;
+ 
+ 	if (getuid() != 0)
+ 		bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+@@ -45,6 +44,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ 	opt = getopt32(argv, "em");
+ 
+ 	while ((name = xmalloc_fgetline(stdin)) != NULL) {
++		char *free_me;
++		char *pass;
++		int rc;
++
+ 		pass = strchr(name, ':');
+ 		if (!pass)
+ 			bb_error_msg_and_die("missing new password");
+@@ -52,7 +55,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ 
+ 		xuname2uid(name); /* dies if there is no such user */
+ 
++		free_me = NULL;
+ 		if (!(opt & OPT_ENC)) {
++			char salt[sizeof("$N$XXXXXXXX")];
++
+ 			crypt_make_salt(salt, 1);
+ 			if (opt & OPT_MD5) {
+ 				salt[0] = '$';
+@@ -60,7 +66,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ 				salt[2] = '$';
+ 				crypt_make_salt(salt + 3, 4);
+ 			}
+-			pass = pw_encrypt(pass, salt, 0);
++			free_me = pass = pw_encrypt(pass, salt, 0);
+ 		}
+ 
+ 		/* This is rather complex: if user is not found in /etc/shadow,
+@@ -81,8 +87,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ 			bb_info_msg("Password for '%s' changed", name);
+ 		logmode = LOGMODE_STDIO;
+ 		free(name);
+-		if (!(opt & OPT_ENC))
+-			free(pass);
++		free(free_me);
+ 	}
+ 	return EXIT_SUCCESS;
+ }
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch
new file mode 100644
index 0000000000..043a846ca4
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch
@@ -0,0 +1,12 @@
+--- busybox-1.19.2/miscutils/crond.c
++++ busybox-1.19.2-crond/miscutils/crond.c
+@@ -861,7 +861,8 @@ int crond_main(int argc UNUSED_PARAM, ch
+ 
+ 	/* "-b after -f is ignored", and so on for every pair a-b */
+ 	opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
+-			":l+:d+"; /* -l and -d have numeric param */
++			/* -l and -d have numeric param */
++			":l+" IF_FEATURE_CROND_D(":d+");
+ 	opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
+ 			&G.log_level, &G.log_filename, &G.crontab_dir_name
+ 			IF_FEATURE_CROND_D(,&G.log_level));
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch
new file mode 100644
index 0000000000..e1395a6b3b
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch
@@ -0,0 +1,47 @@
+--- busybox-1.19.2/networking/inetd.c
++++ busybox-1.19.2-inetd/networking/inetd.c
+@@ -1278,6 +1278,7 @@ int inetd_main(int argc UNUSED_PARAM, ch
+ 							sep->se_count = 0;
+ 							rearm_alarm(); /* will revive it in RETRYTIME sec */
+ 							restore_sigmask(&omask);
++							maybe_close(new_udp_fd);
+ 							maybe_close(accepted_fd);
+ 							continue; /* -> check next fd in fd set */
+ 						}
+@@ -1298,17 +1299,18 @@ int inetd_main(int argc UNUSED_PARAM, ch
+ 					bb_perror_msg("vfork"+1);
+ 					sleep(1);
+ 					restore_sigmask(&omask);
++					maybe_close(new_udp_fd);
+ 					maybe_close(accepted_fd);
+ 					continue; /* -> check next fd in fd set */
+ 				}
+ 				if (pid == 0)
+ 					pid--; /* -1: "we did fork and we are child" */
+ 			}
+-			/* if pid == 0 here, we never forked */
++			/* if pid == 0 here, we didn't fork */
+ 
+ 			if (pid > 0) { /* parent */
+ 				if (sep->se_wait) {
+-					/* tcp wait: we passed listening socket to child,
++					/* wait: we passed socket to child,
+ 					 * will wait for child to terminate */
+ 					sep->se_wait = pid;
+ 					remove_fd_from_set(sep->se_fd);
+@@ -1345,9 +1347,13 @@ int inetd_main(int argc UNUSED_PARAM, ch
+ 			setsid();
+ 			/* "nowait" udp */
+ 			if (new_udp_fd >= 0) {
+-				len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
++				len_and_sockaddr *lsa;
++				int r;
++
++				close(new_udp_fd);
++				lsa = xzalloc_lsa(sep->se_family);
+ 				/* peek at the packet and remember peer addr */
+-				int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
++				r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
+ 					&lsa->u.sa, &lsa->len);
+ 				if (r < 0)
+ 					goto do_exit1;

From ede8ca0019974fc999c6e9f20dfbedfeb9649c60 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 1 Aug 2011 23:46:16 +0200
Subject: [PATCH 0601/6849] samba: make installation of smbd configurable

It may be desirable to compile samba but not actually install
the smbd binary. This is the case if you need libsmbclient but
don't want to run a samba server.

Make this possible by allowing to disable installation of smbd.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/Config.in | 7 +++++++
 package/samba/samba.mk  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index 58a84f3d62..3a777766a8 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -122,6 +122,13 @@ config BR2_PACKAGE_SAMBA_SMBCQUOTAS
 	help
 	  Set or get QUOTAs of NTFS 5 shares
 
+config BR2_PACKAGE_SAMBA_SMBD
+	bool "smbd"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  The server daemon that provides filesharing and printing services
+
 config BR2_PACKAGE_SAMBA_SMBGET
 	bool "smbget"
 	default y
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index dfc7636846..621d13c6aa 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -111,6 +111,7 @@ SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBCACLS) += usr/bin/smbcacls
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBCLIENT) += usr/bin/smbclient
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBCONTROL) += usr/bin/smbcontrol
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBCQUOTAS) += usr/bin/smbcquotas
+SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBD) += usr/sbin/smbd
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBGET) += usr/bin/smbget
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBLDBTOOLS) += usr/bin/ldbadd
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBLDBTOOLS) += usr/bin/ldbdel

From 77cc11d533f79d13e9a440823d6f5e100cbdd202 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 31 Aug 2011 21:46:38 +0200
Subject: [PATCH 0602/6849] netsnmp: fix stop and restart actions in init
 script

/etc/init.d/S59snmpd stop (and restart) currently fail if either snmpd or
snmptrapd are not running.
This is because start-stop-daemon -K returns nonzero if the process to be
killed is not running, and this causes the whole script to fail because it runs
under 'set -e'.

This may not be noticed if only the last start-stop-daemon fails, but this is
in general wrong. It would also cause a failure in other scripts that execute
S59snmpd and check the return value.

Adding the --oknodo (-o) option to start-stop-daemon fixes this.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/S59snmpd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/netsnmp/S59snmpd b/package/netsnmp/S59snmpd
index f65317a1d8..5df4b854d6 100755
--- a/package/netsnmp/S59snmpd
+++ b/package/netsnmp/S59snmpd
@@ -29,7 +29,6 @@ TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid'
 [ -r /etc/default/snmpd ] && . /etc/default/snmpd
 
 ssd_oknodo="-o"
-ssd_oknodo=""
 
 # Cd to / before starting any daemons.
 cd /

From 9c83b37cccb51f89a40f69a64b7ffba2e8c6f0f5 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 31 Aug 2011 21:46:39 +0200
Subject: [PATCH 0603/6849] netsnmp: allow to disable MIB files installation
 and MIB loading code

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/Config.in  | 8 ++++++++
 package/netsnmp/netsnmp.mk | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index 5a3e9aabce..431be2d383 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -6,3 +6,11 @@ config BR2_PACKAGE_NETSNMP
 
 	  http://net-snmp.sourceforge.net/
 
+config BR2_PACKAGE_NETSNMP_ENABLE_MIBS
+	bool "Install MIB files on target and enable MIB loading code"
+	default y
+	depends on BR2_PACKAGE_NETSNMP
+	help
+	  The net-snmp package contains a selection of MIB files.
+	  Say yes if you want those MIB files installed on the target
+	  and enable the code that parses the MIB files.
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index a44f3feef1..05d8db74f4 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -43,6 +43,11 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 	NETSNMP_CONF_OPT += --disable-manuals
 endif
 
+ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y)
+	NETSNMP_CONF_OPT += --disable-mib-loading
+	NETSNMP_CONF_OPT += --disable-mibs
+endif
+
 # Remove IPv6 MIBs if there's no IPv6
 ifneq ($(BR2_INET_IPV6),y)
 define NETSNMP_REMOVE_MIBS_IPV6

From 0e85b480ca131bbe5e152c281ffb312fc4ee4d65 Mon Sep 17 00:00:00 2001
From: Frederic Bassaler <frederic.bassaler@gmail.com>
Date: Thu, 11 Aug 2011 12:56:59 +0200
Subject: [PATCH 0604/6849] xterm: bump to v271

Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xterm/xterm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index d5d193d742..92ddd1e735 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-XTERM_VERSION = 267
+XTERM_VERSION = 271
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
 XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw

From dba4b184318450435e3c5efd0b1955edbece8feb Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Thu, 11 Aug 2011 16:13:13 +0200
Subject: [PATCH 0605/6849] tar: bump to 1.26

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tar/tar.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index e1e16a2302..bab2ca21e8 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-TAR_VERSION = 1.25
+TAR_VERSION = 1.26
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
 
 $(eval $(call AUTOTARGETS,package,tar))

From a8d6e2cc70e1532efea7aba791625a8cb68a10e4 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:34 +0200
Subject: [PATCH 0606/6849] Makefile: auto-target automatically pass
 --program-prefix=""

When cross-compiled, some packages incorrectly prefix their executables
with the target tuple.

Fix that by forcing the program prefix to the empty string when calling
./configure, but only when compiling for target, not for host.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 46ab861c13..7f04c3692b 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -100,6 +100,7 @@ define $(2)_CONFIGURE_CMDS
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
+		--program-prefix="" \
 		$$(DISABLE_DOCUMENTATION) \
 		$$(DISABLE_NLS) \
 		$$(DISABLE_LARGEFILE) \

From 9268aff0e6cfa74b3946b947d258c33d2751242a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:35 +0200
Subject: [PATCH 0607/6849] mpg123: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 8eeb56daa5..43f631c62b 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -32,7 +32,7 @@ ifeq ($(BR2_x86_64),y)
 MPG123_CPU = x86-64
 endif
 
-MPG123_CONF_OPT += --program-prefix='' --with-cpu=$(MPG123_CPU)
+MPG123_CONF_OPT += --with-cpu=$(MPG123_CPU)
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.

From 4c5d599d9f509452b02b5e77db216a08fb222a90 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:36 +0200
Subject: [PATCH 0608/6849] taglib: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/taglib/taglib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk
index e5433a42bb..5b480bb9fc 100644
--- a/package/multimedia/taglib/taglib.mk
+++ b/package/multimedia/taglib/taglib.mk
@@ -14,7 +14,7 @@ TAGLIB_CONF_ENV = \
 	ac_cv_header_cppunit_extensions_HelperMacros_h=no \
 	ac_cv_header_zlib_h=$(if $(BR2_PACKAGE_ZLIB),yes,no)
 
-TAGLIB_CONF_OPT = --disable-libsuffix --program-prefix=''
+TAGLIB_CONF_OPT = --disable-libsuffix
 
 define TAGLIB_REMOVE_DEVFILE
 	rm -f $(TARGET_DIR)/usr/bin/taglib-config

From 63dfeb295fa4b0a515f1fcd188e9902db3d27070 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:37 +0200
Subject: [PATCH 0609/6849] dbus-glib: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus-glib/dbus-glib.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 6058b234f2..7c4e65b3c6 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -13,7 +13,6 @@ DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \
 		have_abstract_sockets=yes
 
 DBUS_GLIB_CONF_OPT = --localstatedir=/var \
-		--program-prefix="" \
 		--disable-tests \
 		--disable-xml-docs \
 		--with-introspect-xml=$(DBUS_HOST_INTROSPECT) \

From cc2597d0fcd96bdaaf0b98e75a9570b84c55df65 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:38 +0200
Subject: [PATCH 0610/6849] fakeroot: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fakeroot/fakeroot.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 29e9e5beb6..1271e7cda2 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -6,7 +6,6 @@
 FAKEROOT_VERSION:=1.9.5
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
-FAKEROOT_CONF_OPT = --program-prefix=''
 
 define FAKEROOT_PATCH_FAKEROOT_IN
 	# If using busybox getopt, make it be quiet.

From 8ea4d5b47bec2d83516f4c61436fc39800aac18b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:39 +0200
Subject: [PATCH 0611/6849] jpeg: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jpeg/jpeg.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 30a6225bde..adbe330596 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -8,7 +8,6 @@ JPEG_SITE = http://www.ijg.org/files/
 JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES
 JPEG_INSTALL_TARGET = YES
-JPEG_CONF_OPT = --program-prefix=
 
 define JPEG_REMOVE_USELESS_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)

From 6c0ea9684d74440ccd2ef964ef385c81309d21fa Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:40 +0200
Subject: [PATCH 0612/6849] sylpheed: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/sylpheed.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index dbd2408f18..371341f8dd 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
-SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix="" \
+SYLPHEED_CONF_OPT = --disable-gtkspell \
                     --includedir=$(STAGING_DIR)/usr/include
 
 SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2

From 617169d1d05a1732bd9d7090b684028e43d199bc Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:41 +0200
Subject: [PATCH 0613/6849] sdl_sound: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_sound/sdl_sound.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 8f51e05758..0a0fe5bf3c 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -31,8 +31,7 @@ SDL_SOUND_CONF_OPT = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
-	--enable-static \
-	--program-prefix=''
+	--enable-static
 
 # enable mmx for newer x86's
 ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)

From 2caafe6be7bc61569317a35b4b36880c7c6761b0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:42 +0200
Subject: [PATCH 0614/6849] lzop: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzop/lzop.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 796686a502..e55c1050a8 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -6,7 +6,6 @@
 LZOP_VERSION:=1.02rc1
 LZOP_SOURCE:=lzop-$(LZOP_VERSION).tar.gz
 LZOP_SITE:=http://www.lzop.org/download/
-LZOP_CONF_OPT:=--program-prefix=""
 LZOP_DEPENDENCIES:=lzo
 
 $(eval $(call AUTOTARGETS,package,lzop))

From 98304cb6a8cb4358f3d53e69fc4edc650ec26d7b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:43 +0200
Subject: [PATCH 0615/6849] netcat: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netcat/netcat.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index f8263ef351..31f6b716c9 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -10,6 +10,5 @@ NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netc
 NETCAT_AUTORECONF:=NO
 NETCAT_INSTALL_STAGING:=NO
 NETCAT_INSTALL_TARGET:=YES
-NETCAT_CONF_OPT = --program-prefix=''
 
 $(eval $(call AUTOTARGETS,package,netcat))

From 9bbc3f76330b4b97dc3f01d69a71695da66febb4 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:44 +0200
Subject: [PATCH 0616/6849] fbdump: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbdump/fbdump.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index eb74d8beec..521b0fdebb 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -7,7 +7,6 @@ FBDUMP_VERSION:=0.4.2
 FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
 FBDUMP_AUTORECONF = NO
-FBDUMP_CONF_OPT = --program-prefix=''
 
 $(eval $(call AUTOTARGETS,package,fbdump))
 

From e2f6269e136f9fdb7765159ea585df0a82b0e25c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:45 +0200
Subject: [PATCH 0617/6849] mysql_client: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mysql_client/mysql_client.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 9cd088cc88..49a7033e16 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -21,7 +21,6 @@ MYSQL_CLIENT_CONF_ENV = \
 	mysql_cv_new_rl_interface=yes
 
 MYSQL_CLIENT_CONF_OPT = \
-	--program-prefix="" \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \

From 48573c70e67cd3f3aa5e7a1512a6286fb1ffb5df Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:46 +0200
Subject: [PATCH 0618/6849] ntfsprogs: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfsprogs/ntfsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk
index 4557747ec7..ea8a2a4555 100644
--- a/package/ntfsprogs/ntfsprogs.mk
+++ b/package/ntfsprogs/ntfsprogs.mk
@@ -6,7 +6,7 @@
 NTFSPROGS_VERSION:=2.0.0
 NTFSPROGS_SOURCE:=ntfsprogs-$(NTFSPROGS_VERSION).tar.gz
 NTFSPROGS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-ntfs/
-NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --program-prefix="" --disable-crypto
+NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --disable-crypto
 NTFSPROGS_INSTALL_STAGING:=yes
 
 NTFSPROGS_BIN:=ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls

From 390b552f09451cf2bad9aa67fbcbf7b380cfa57d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:47 +0200
Subject: [PATCH 0619/6849] lighttpd: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/lighttpd.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 45941eb0c4..ba5f5cf96e 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -11,7 +11,6 @@ LIGHTTPD_CONF_OPT = \
 	--libdir=/usr/lib/lighttpd \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--program-prefix="" \
 	$(if $(BR2_LARGEFILE),,--disable-lfs)
 
 ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)

From ed8619dafa809dff6d5ef1e5c3365016fd96d305 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:48 +0200
Subject: [PATCH 0620/6849] gamin: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gamin/gamin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index d691f6043a..326fd62afb 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -9,7 +9,7 @@ GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
 GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
 
-GAMIN_CONF_OPT = --program-prefix="" --disable-debug
+GAMIN_CONF_OPT = --disable-debug
 
 # python support broken
 GAMIN_CONF_OPT += --without-python

From 8e837d5dfe6c40ed3e3cdf0d7c9db163b0c8c305 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:49 +0200
Subject: [PATCH 0621/6849] ntfs-3g: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/ntfs-3g.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 796e269579..baabff220a 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -7,7 +7,7 @@
 NTFS_3G_VERSION = 2010.10.2
 NTFS_3G_SOURCE = ntfs-3g-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
-NTFS_3G_CONF_OPT = --disable-ldconfig --program-prefix=""
+NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,package,ntfs-3g))

From e127003af528678ea4b6c9eaca9af5647c25bfc2 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:50 +0200
Subject: [PATCH 0622/6849] libargtable2: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libargtable2/libargtable2.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index 5f388f9745..4241e73963 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -9,8 +9,7 @@ LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
 LIBARGTABLE2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/argtable/
 
 LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPT= --program-prefix="" \
-		--disable-example \
+LIBARGTABLE2_CONF_OPT= --disable-example \
 		--disable-kernel-module \
 		--enable-lib \
 		--enable-util

From dc32ba990a9f72579f34d24a742ba744ae4d5a58 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:51 +0200
Subject: [PATCH 0623/6849] fuse: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fuse/libfuse.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk
index 13a5194032..45fb2f3808 100644
--- a/package/fuse/libfuse.mk
+++ b/package/fuse/libfuse.mk
@@ -9,8 +9,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
 
 LIBFUSE_INSTALL_STAGING = YES
-LIBFUSE_CONF_OPT= --program-prefix="" \
-		--disable-nls \
+LIBFUSE_CONF_OPT= --disable-nls \
 		--disable-example \
 		--disable-kernel-module \
 		--enable-lib \

From cfbfd488fecc933d7501d671af19d17cd531b852 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:52 +0200
Subject: [PATCH 0624/6849] dbus: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index d276b725d3..9db8ea666c 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -12,8 +12,7 @@ DBUS_INSTALL_TARGET = YES
 DBUS_DEPENDENCIES = host-pkg-config
 
 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPT = --program-prefix="" \
-		--with-dbus-user=dbus \
+DBUS_CONF_OPT = --with-dbus-user=dbus \
 		--disable-tests \
 		--disable-asserts \
 		--enable-abstract-sockets \

From aa6e5aed3a702f47221e4614be38e4376e240343 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:53 +0200
Subject: [PATCH 0625/6849] tcpreplay: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpreplay/tcpreplay.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index f82867c270..296f4eba35 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -7,7 +7,7 @@
 TCPREPLAY_VERSION = 3.4.3
 TCPREPLAY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/tcpreplay
 TCPREPLAY_CONF_ENV = tr_cv_libpcap_version=">= 0.7.0"
-TCPREPLAY_CONF_OPT = --program-prefix="" --with-libpcap=$(STAGING_DIR)/usr
+TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
 
 TCPREPLAY_DEPENDENCIES = uclibc libpcap
 

From 3bb80363351a101373d598c0e44ba97b9b386ea1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:54 +0200
Subject: [PATCH 0626/6849] directfb: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index c32fcdb205..aa5784526d 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -12,7 +12,6 @@ DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \
 	--disable-explicit-deps \
-	--program-prefix='' \
 	--enable-zlib \
 	--enable-freetype \
 	--enable-fbdev \

From dc1b29e9bca1218dc1bda67880dfc442e803bca1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 10 Aug 2011 00:12:55 +0200
Subject: [PATCH 0627/6849] radvd: remove --program-prefix

--program-prefix is now set in the auto-target infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index fe8be5d39c..6b7468a440 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -7,7 +7,6 @@ RADVD_VERSION:=1.6
 RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz
 RADVD_SITE:=http://www.litech.org/radvd/dist/
 RADVD_DEPENDENCIES:=flex host-flex
-RADVD_CONF_OPT:= --program-prefix=''
 
 define RADVD_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d

From b4df72a91453e768c998e4d671b597c45a9812b9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Sep 2011 13:56:33 +0200
Subject: [PATCH 0628/6849] libsvgtiny: bump version for stroke-width fix

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsvgtiny/libsvgtiny.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index d9ac41b44e..1a7ce378fd 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -5,7 +5,7 @@
 ############################################################
 
 LIBSVGTINY_SITE = svn://svn.netsurf-browser.org/trunk/libsvgtiny
-LIBSVGTINY_VERSION = 9800
+LIBSVGTINY_VERSION = 12121
 
 LIBSVGTINY_INSTALL_STAGING = YES
 LIBSVGTINY_INSTALL_TARGET = YES

From d5b35e2c700c7316c90a0aee9710382e8b10e2cb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Sep 2011 13:57:14 +0200
Subject: [PATCH 0629/6849] musepack: disable parallel build

The musepack build system contains a race condition, which gets triggered by
high BR2_JLEVEL settings - It tries to link against libmpcdec before it is
created:

Linking C executable mpcgain
/scratch/peko/host/usr/lib/gcc/arm-unknown-linux-uclibcgnueabi/4.4.6/../../../../arm-unknown-linux-uclibcgnueabi/bin/ld: cannot find -lmpcdec
collect2: ld returned 1 exit status
make[3]: *** [mpcgain/mpcgain] Error 1

Fix it by disabling parallel build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/musepack/musepack.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/musepack/musepack.mk b/package/multimedia/musepack/musepack.mk
index 21601ebcba..1e5ebcfe84 100644
--- a/package/multimedia/musepack/musepack.mk
+++ b/package/multimedia/musepack/musepack.mk
@@ -9,5 +9,6 @@ MUSEPACK_SITE = http://files.musepack.net/source
 MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
 MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
 MUSEPACK_INSTALL_STAGING = YES
+MUSEPACK_MAKE = $(MAKE1)
 
 $(eval $(call CMAKETARGETS,package/multimedia,musepack))

From a991e3e143408d573aa3d0a3090cabfac65a570e Mon Sep 17 00:00:00 2001
From: Murat Demirten <mdemirten@yh.com.tr>
Date: Sun, 7 Aug 2011 01:42:07 +0300
Subject: [PATCH 0630/6849] package: add portaudio

PortAudio is a free, cross-platform, open-source, audio I/O library.

[Peter: fix whitespace, dependencies, alsa-lib name]
Signed-off-by: Murat Demirten <mdemirten@yh.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in              |  1 +
 package/multimedia/portaudio/Config.in    | 29 +++++++++++++++++++++++
 package/multimedia/portaudio/portaudio.mk | 20 ++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 package/multimedia/portaudio/Config.in
 create mode 100644 package/multimedia/portaudio/portaudio.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 79c601c572..40760b742f 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -37,6 +37,7 @@ source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
+source "package/multimedia/portaudio/Config.in"
 source "package/multimedia/python-mad/Config.in"
 source "package/multimedia/speex/Config.in"
 source "package/multimedia/swfdec/Config.in"
diff --git a/package/multimedia/portaudio/Config.in b/package/multimedia/portaudio/Config.in
new file mode 100644
index 0000000000..f91acc0a28
--- /dev/null
+++ b/package/multimedia/portaudio/Config.in
@@ -0,0 +1,29 @@
+config BR2_PACKAGE_PORTAUDIO
+	bool "portaudio"
+	help
+	  PortAudio is a free, cross-platform, open-source,
+	  audio I/O library.
+
+	  http://www.portaudio.com/
+
+if BR2_PACKAGE_PORTAUDIO
+
+config BR2_PACKAGE_PORTAUDIO_ALSA
+	bool "alsa support"
+	select BR2_PACKAGE_ALSA_LIB
+	default y
+	help
+	  Compile with ALSA support.
+
+config BR2_PACKAGE_PORTAUDIO_OSS
+	bool "oss support"
+	help
+	  Compile with OSS support.
+
+config BR2_PACKAGE_PORTAUDIO_CXX
+	bool "C++ bindings"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Enables C++ bindings.
+
+endif # BR2_PACKAGE_PORTAUDIO
diff --git a/package/multimedia/portaudio/portaudio.mk b/package/multimedia/portaudio/portaudio.mk
new file mode 100644
index 0000000000..67dfe361be
--- /dev/null
+++ b/package/multimedia/portaudio/portaudio.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# portaudio
+#
+################################################################################
+
+PORTAUDIO_VERSION = V19
+PORTAUDIO_SITE = http://www.portaudio.com/archives
+PORTAUDIO_SOURCE = pa_stable_v19_20110326.tgz
+PORTAUDIO_INSTALL_STAGING = YES
+
+PORTAUDIO_DEPENDENCIES = \
+       $(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)
+
+PORTAUDIO_CONF_OPT = \
+       $(if $(BR2_PACKAGE_PORTAUDIO_ALSA),--with-alsa,--without-alsa) \
+       $(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \
+       $(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx)
+
+$(eval $(call AUTOTARGETS,package/multimedia,portaudio))

From d1a9698bec65de83d45b77977e14de45c4946516 Mon Sep 17 00:00:00 2001
From: "Subramaniam C.A" <subramaniam.ca@ti.com>
Date: Mon, 12 Sep 2011 15:59:20 -0500
Subject: [PATCH 0631/6849] ext-toolchain: fix download url

The website for downloading the toolchain has changed from
http://www.codesourcery.com to http://sourcery.mentor.com

Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index fd9a53057e..b9d932f685 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -161,34 +161,34 @@ TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(STAMP_DIR)/ext-toolchain-checked
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package4571/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package4571/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q1-203-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package5383/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package5383/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q3-67-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package7851/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package7851/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/arm/portal/package8739/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package8739/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/mips/portal/package8715/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package8715/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-53-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://www.codesourcery.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/

From a50f6ef29e72b4725b0e53dbf28922c798eacf06 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 7 Sep 2011 14:25:02 +0200
Subject: [PATCH 0632/6849] openssl: bump to 1.0.0e

Changes between 1.0.0d and 1.0.0e [6 Sep 2011]

  *) Fix bug where CRLs with nextUpdate in the past are sometimes accepted
     by initialising X509_STORE_CTX properly. (CVE-2011-3207)
     [Kaspar Brand <ossl@velox.ch>]

  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular
     for multi-threaded use of ECDH. (CVE-2011-3210)
     [Adam Langley (Google)]

  *) Fix x509_name_ex_d2i memory leak on bad inputs.
     [Bodo Moeller]

  *) Remove hard coded ecdsaWithSHA1 signature tests in ssl code and check
     signature public key algorithm by using OID xref utilities instead.
     Before this you could only use some ECC ciphersuites with SHA1 only.
     [Steve Henson]

  *) Add protection against ECDSA timing attacks as mentioned in the paper
     by Billy Bob Brumley and Nicola Tuveri, see:

	http://eprint.iacr.org/2011/232.pdf

     [Billy Bob Brumley and Nicola Tuveri]

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 0163ef8470..82a4fc4a0f 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0d
+OPENSSL_VERSION = 1.0.0e
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From 227eebae0053363aa30353472cea5f7160cd3938 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Sep 2011 00:46:06 +0200
Subject: [PATCH 0633/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGES b/CHANGES
index 288d57559f..5a44e72c41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,25 @@
 2011.11, Not released yet:
 
+	Fixes all over the tree and new features.
+
+	Update external codesourcery toolchain download URLs after
+	Codesourcery got bought by Mentor.
+
+	Updated/fixed packages: busybox, dbus, dbus-glib, directfb,
+	dnsmasq, e2fsprogs, ethtool, fakeroot, fbdump, freetype, fuse,
+	gamin, jpeg, leafpad, libargtable2, libao, libconfuse,
+	libcuefile, libcurl, libreplaygain, libsamplerate, libsndfile,
+	libsoup, libsvgtiny, lighttpd, lzo, lzop, mpd, mpg123,
+	musepack, mysql_client, netcat, netsnmp, ntfs-3g, ntfsprogs,
+	openssl, radvd, samba, sdl_sound, sqlite, squid, sylpheed,
+	taglib, tar, tcpreplay, util-linux, xterm
+
+	New packages: fluxbox, libev, libftdi, libgeotiff, portaudio
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4183: Codesourcery toolchain download site has changed
+
 2011.08, Released August 31th, 2011:
 
 	Fixes all over the tree.

From 3e4d029219f0a4b48c428cf59ba6b220aeedf132 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Sep 2011 08:54:39 +0200
Subject: [PATCH 0634/6849] barebox: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index d3143e69a1..0dfcff34c8 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BAREBOX_VERSION = 2011.08.0
+BAREBOX_VERSION = 2011.09.0
 BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 

From ab6b9e77fed118acb8a757d947708fc1773d21dc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Sep 2011 16:02:38 +0200
Subject: [PATCH 0635/6849] uClibc: add patches to unbreak 0.9.32 on powerpc
 e500

Patches from Jason Woodward, posted on the uClibc list back in July.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0-__fe_nomask_env-use-of-__set_errno.patch | 34 +++++++++++++++++++
 ...Clibc-0.9.32-Fix-e500-fpu-libm-build.patch | 31 +++++++++++++++++
 ....9.32-honor-UCLIBC_HAS_FENV-for-e500.patch | 28 +++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch

diff --git a/toolchain/uClibc/uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch b/toolchain/uClibc/uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
new file mode 100644
index 0000000000..1908925a33
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
@@ -0,0 +1,34 @@
+>From 49f58308779cb0b798f5e7bc902bbc515c1ec394 Mon Sep 17 00:00:00 2001
+From: Jason Woodward <jason.woodward@timesys.com>
+Date: Sat, 11 Jun 2011 22:00:59 -0400
+Subject: [PATCH] Fix e500 __fe_nomask_env use of __set_errno w/o CFLAGS-libm
+
+Since the new _LIBC guard in 96c9a8f7d00cdf6bb7968a2390b9d87da8a45e2d we need
+to use CFLAGS-libm (-DNOT_IN_libc -DIS_IN_libm) or we end up with linker
+errors like:
+
+  lib/libm.a(fe_nomask.os): In function `__fe_nomask_env':
+  fe_nomask.c:(.text+0x26): undefined reference to `__libc_errno'
+  collect2: ld returned 1 exit status
+
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+---
+ libm/powerpc/e500/fpu/Makefile.arch |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libm/powerpc/e500/fpu/Makefile.arch b/libm/powerpc/e500/fpu/Makefile.arch
+index 904561e..a64843f 100644
+--- a/libm/powerpc/e500/fpu/Makefile.arch
++++ b/libm/powerpc/e500/fpu/Makefile.arch
+@@ -11,6 +11,8 @@ libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c)
+ libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
+ endif
+ 
++CFLAGS-fe_nomask.c := $(CFLAGS-libm)
++
+ libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
+ 
+ ifeq ($(DOPIC),y)
+-- 
+1.7.0.4
+
diff --git a/toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch b/toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch
new file mode 100644
index 0000000000..a228bc1f0b
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch
@@ -0,0 +1,31 @@
+>From 826984dee547b41238dc9572a1c756506a3c9148 Mon Sep 17 00:00:00 2001
+From: Jason Woodward <jason.woodward@timesys.com>
+Date: Sat, 11 Jun 2011 19:09:53 -0400
+Subject: [PATCH] Fix e500 fpu libm build
+
+Define libm_ARCH_fpu_OUT in libm/powerpc/e500/Makefile.arch as it is used
+in libm/powerpc/e500/fpu/Makefile.arch
+
+ libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
+
+This appears to have been broken since cd3a494e99fa4bcad1c2a621b71361005528bead
+
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+---
+ libm/powerpc/e500/Makefile.arch |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libm/powerpc/e500/Makefile.arch b/libm/powerpc/e500/Makefile.arch
+index 912ce7f..febde67 100644
+--- a/libm/powerpc/e500/Makefile.arch
++++ b/libm/powerpc/e500/Makefile.arch
+@@ -6,5 +6,6 @@
+ #
+ 
+ libm_ARCH_fpu_DIR := $(libm_SUBARCH_DIR)/fpu
++libm_ARCH_fpu_OUT := $(libm_SUBARCH_OUT)/fpu
+ -include $(libm_ARCH_fpu_DIR)/Makefile.arch
+ 
+-- 
+1.7.0.4
+
diff --git a/toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch b/toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch
new file mode 100644
index 0000000000..c90c34c19e
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch
@@ -0,0 +1,28 @@
+>From 69d9cf20955d0222a5a2631021bc10854ea98128 Mon Sep 17 00:00:00 2001
+From: Jason Woodward <jason.woodward@timesys.com>
+Date: Sat, 11 Jun 2011 20:39:33 -0400
+Subject: [PATCH] honor UCLIBC_HAS_FENV for e500
+
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+---
+ libm/powerpc/e500/fpu/Makefile.arch |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libm/powerpc/e500/fpu/Makefile.arch b/libm/powerpc/e500/fpu/Makefile.arch
+index 8f00e09..904561e 100644
+--- a/libm/powerpc/e500/fpu/Makefile.arch
++++ b/libm/powerpc/e500/fpu/Makefile.arch
+@@ -6,8 +6,10 @@
+ #
+ 
+ 
++ifeq ($(UCLIBC_HAS_FENV),y)
+ libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c)
+ libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
++endif
+ 
+ libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
+ 
+-- 
+1.7.0.4
+

From b25b711e4a62095817e415c4961ea5530c28876e Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 13 Sep 2011 10:42:07 +0200
Subject: [PATCH 0636/6849] samba: bump to 3.5.11

Bump to version 3.5.11 and also update the download location.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba-00CVE-2011-2694.patch     |  55 --
 package/samba/samba-01CVE-2011-2522.patch     | 749 ------------------
 .../samba/samba-add-check-for-__use_bsd.patch |  18 -
 .../samba-do-not-check-glibc-version.patch    | 104 ---
 package/samba/samba-fix-client-mtab.patch     |  11 -
 package/samba/samba-fix-mount.cifs.patch      |  35 +-
 package/samba/samba-getgrouplist.patch        |  41 -
 package/samba/samba-remove-legacy-index.patch |   4 +-
 package/samba/samba.mk                        |   7 +-
 9 files changed, 24 insertions(+), 1000 deletions(-)
 delete mode 100644 package/samba/samba-00CVE-2011-2694.patch
 delete mode 100644 package/samba/samba-01CVE-2011-2522.patch
 delete mode 100644 package/samba/samba-add-check-for-__use_bsd.patch
 delete mode 100644 package/samba/samba-do-not-check-glibc-version.patch
 delete mode 100644 package/samba/samba-fix-client-mtab.patch
 delete mode 100644 package/samba/samba-getgrouplist.patch

diff --git a/package/samba/samba-00CVE-2011-2694.patch b/package/samba/samba-00CVE-2011-2694.patch
deleted file mode 100644
index 167accfad4..0000000000
--- a/package/samba/samba-00CVE-2011-2694.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d401ccaedaec09ad6900ec24ecaf205bed3e3ac1 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Thu, 7 Jul 2011 10:03:33 +0200
-Subject: [PATCH] s3 swat: Fix possible XSS attack (bug #8289)
-
-Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack
-against SWAT, the Samba Web Administration Tool. The attack uses reflection to
-insert arbitrary content into the "change password" page.
-
-This patch fixes the reflection issue by not printing user-specified content on
-the website anymore.
-
-Signed-off-by: Kai Blin <kai@samba.org>
-
-CVE-2011-2694.
----
- source/web/swat.c |   14 ++------------
- 1 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 9c7294a..434b1ac 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -1120,11 +1120,9 @@ static void chg_passwd(void)
- 	if(cgi_variable(CHG_S_PASSWD_FLAG)) {
- 		printf("<p>");
- 		if (rslt == True) {
--			printf(_(" The passwd for '%s' has been changed."), cgi_variable_nonull(SWAT_USER));
--			printf("\n");
-+			printf("%s\n", _(" The passwd has been changed."));
- 		} else {
--			printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable_nonull(SWAT_USER));
--			printf("\n");
-+			printf("%s\n", _(" The passwd has NOT been changed."));
- 		}
- 	}
- 	
-@@ -1138,14 +1136,6 @@ static void passwd_page(void)
- {
- 	const char *new_name = cgi_user_name();
- 
--	/* 
--	 * After the first time through here be nice. If the user
--	 * changed the User box text to another users name, remember it.
--	 */
--	if (cgi_variable(SWAT_USER)) {
--		new_name = cgi_variable_nonull(SWAT_USER);
--	} 
--
- 	if (!new_name) new_name = "";
- 
- 	printf("<H2>%s</H2>\n", _("Server Password Management"));
--- 
-1.7.1
-
diff --git a/package/samba/samba-01CVE-2011-2522.patch b/package/samba/samba-01CVE-2011-2522.patch
deleted file mode 100644
index 7d48b554c0..0000000000
--- a/package/samba/samba-01CVE-2011-2522.patch
+++ /dev/null
@@ -1,749 +0,0 @@
-From b610e0cee563465c6b970647b215f8ae4d0c6599 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 12:56:21 +0200
-Subject: [PATCH 01/12] s3 swat: Allow getting the user's HTTP auth password
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/cgi.c        |    9 +++++++++
- source/web/swat_proto.h |    1 +
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/source/web/cgi.c b/source/web/cgi.c
-index 72aa11c..ccdc3a7 100644
---- a/source/web/cgi.c
-+++ b/source/web/cgi.c
-@@ -42,6 +42,7 @@ static char *query_string;
- static const char *baseurl;
- static char *pathinfo;
- static char *C_user;
-+static char *C_pass;
- static bool inetd_server;
- static bool got_request;
- 
-@@ -388,6 +389,7 @@ static bool cgi_handle_authorization(char *line)
- 			
- 			/* Save the users name */
- 			C_user = SMB_STRDUP(user);
-+			C_pass = SMB_STRDUP(user_pass);
- 			TALLOC_FREE(pass);
- 			return True;
- 		}
-@@ -422,6 +424,13 @@ char *cgi_user_name(void)
-         return(C_user);
- }
- 
-+/***************************************************************************
-+return a ptr to the users password
-+  ***************************************************************************/
-+char *cgi_user_pass(void)
-+{
-+        return(C_pass);
-+}
- 
- /***************************************************************************
- handle a file download
-diff --git a/source/web/swat_proto.h b/source/web/swat_proto.h
-index 0f84e4f..76f9c3c 100644
---- a/source/web/swat_proto.h
-+++ b/source/web/swat_proto.h
-@@ -31,6 +31,7 @@ const char *cgi_variable(const char *name);
- const char *cgi_variable_nonull(const char *name);
- bool am_root(void);
- char *cgi_user_name(void);
-+char *cgi_user_pass(void);
- void cgi_setup(const char *rootdir, int auth_required);
- const char *cgi_baseurl(void);
- const char *cgi_pathinfo(void);
--- 
-1.7.1
-
-
-From 3806fec53dcf3b6e5c3fd71917f9d67d47c65e32 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 12:57:43 +0200
-Subject: [PATCH 02/12] s3 swat: Add support for anti-XSRF token
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c       |   54 +++++++++++++++++++++++++++++++++++++++++++++++
- source/web/swat_proto.h |    5 ++++
- 2 files changed, 59 insertions(+), 0 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 434b1ac..e7d84e5 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -29,6 +29,7 @@
- 
- #include "includes.h"
- #include "web/swat_proto.h"
-+#include "../lib/crypto/md5.h"
- 
- static int demo_mode = False;
- static int passwd_only = False;
-@@ -50,6 +51,7 @@ static int iNumNonAutoPrintServices = 0;
- #define DISABLE_USER_FLAG "disable_user_flag"
- #define ENABLE_USER_FLAG "enable_user_flag"
- #define RHOST "remote_host"
-+#define XSRF_TOKEN "xsrf"
- 
- #define _(x) lang_msg_rotate(talloc_tos(),x)
- 
-@@ -138,6 +140,58 @@ static char *make_parm_name(const char *label)
- 	return parmname;
- }
- 
-+void get_xsrf_token(const char *username, const char *pass,
-+		    const char *formname, char token_str[33])
-+{
-+	struct MD5Context md5_ctx;
-+	uint8_t token[16];
-+	int i;
-+
-+	token_str[0] = '\0';
-+	ZERO_STRUCT(md5_ctx);
-+	MD5Init(&md5_ctx);
-+
-+	MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname));
-+	if (username != NULL) {
-+		MD5Update(&md5_ctx, (uint8_t *)username, strlen(username));
-+	}
-+	if (pass != NULL) {
-+		MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass));
-+	}
-+
-+	MD5Final(token, &md5_ctx);
-+
-+	for(i = 0; i < sizeof(token); i++) {
-+		char tmp[3];
-+
-+		snprintf(tmp, sizeof(tmp), "%02x", token[i]);
-+		strncat(token_str, tmp, sizeof(tmp));
-+	}
-+}
-+
-+void print_xsrf_token(const char *username, const char *pass,
-+		      const char *formname)
-+{
-+	char token[33];
-+
-+	get_xsrf_token(username, pass, formname, token);
-+	printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n",
-+	       XSRF_TOKEN, token);
-+
-+}
-+
-+bool verify_xsrf_token(const char *formname)
-+{
-+	char expected[33];
-+	const char *username = cgi_user_name();
-+	const char *pass = cgi_user_pass();
-+	const char *token = cgi_variable_nonull(XSRF_TOKEN);
-+
-+	get_xsrf_token(username, pass, formname, expected);
-+	return (strncmp(expected, token, sizeof(expected)) == 0);
-+}
-+
-+
- /****************************************************************************
-   include a lump of html in a page 
- ****************************************************************************/
-diff --git a/source/web/swat_proto.h b/source/web/swat_proto.h
-index 76f9c3c..e66c942 100644
---- a/source/web/swat_proto.h
-+++ b/source/web/swat_proto.h
-@@ -67,5 +67,10 @@ void status_page(void);
- /* The following definitions come from web/swat.c  */
- 
- const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
-+void get_xsrf_token(const char *username, const char *pass,
-+		    const char *formname, char token_str[33]);
-+void print_xsrf_token(const char *username, const char *pass,
-+		      const char *formname);
-+bool verify_xsrf_token(const char *formname);
- 
- #endif /*  _SWAT_PROTO_H_  */
--- 
-1.7.1
-
-
-From 3f38cf42facc38c19e0448cbae3078b9606b08e4 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 12:58:53 +0200
-Subject: [PATCH 03/12] s3 swat: Add XSRF protection to status page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/statuspage.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/source/web/statuspage.c b/source/web/statuspage.c
-index 8070ae7..fe545e4 100644
---- a/source/web/statuspage.c
-+++ b/source/web/statuspage.c
-@@ -247,9 +247,14 @@ void status_page(void)
- 	int nr_running=0;
- 	bool waitup = False;
- 	TALLOC_CTX *ctx = talloc_stackframe();
-+	const char form_name[] = "status";
- 
- 	smbd_pid = pid_to_procid(pidfile_pid("smbd"));
- 
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
- 	if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
- 		stop_smbd();
- 		start_smbd();
-@@ -326,9 +331,11 @@ void status_page(void)
- 
- 	initPid2Machine ();
- 
-+output_page:
- 	printf("<H2>%s</H2>\n", _("Server Status"));
- 
- 	printf("<FORM method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
- 
- 	if (!autorefresh) {
- 		printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
--- 
-1.7.1
-
-
-From ba996f0ae87f6bf4f19a4918e44dbd6d44a96561 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:02:53 +0200
-Subject: [PATCH 04/12] s3 swat: Add XSRF protection to viewconfig page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index e7d84e5..647126f 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -664,13 +664,20 @@ static void welcome_page(void)
- static void viewconfig_page(void)
- {
- 	int full_view=0;
-+	const char form_name[] = "viewconfig";
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
- 
- 	if (cgi_variable("full_view")) {
- 		full_view = 1;
- 	}
- 
-+output_page:
- 	printf("<H2>%s</H2>\n", _("Current Config"));
- 	printf("<form method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
- 
- 	if (full_view) {
- 		printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
--- 
-1.7.1
-
-
-From 94f8482607a175c44436fae456fbda3624629982 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:03:15 +0200
-Subject: [PATCH 05/12] s3 swat: Add XSRF protection to wizard_params page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 647126f..b7eec4a 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -697,18 +697,25 @@ output_page:
- static void wizard_params_page(void)
- {
- 	unsigned int parm_filter = FLAG_WIZARD;
-+	const char form_name[] = "wizard_params";
- 
- 	/* Here we first set and commit all the parameters that were selected
-  	   in the previous screen. */
- 
- 	printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
- 
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
- 	if (cgi_variable("Commit")) {
- 		commit_parameters(GLOBAL_SECTION_SNUM);
- 		save_reload(0);
- 	}
- 
-+output_page:
- 	printf("<form name=\"swatform\" method=post action=wizard_params>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
- 
- 	if (have_write_access) {
- 		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
--- 
-1.7.1
-
-
-From eb22fd73060534700d514ec295985549131c7569 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:03:44 +0200
-Subject: [PATCH 06/12] s3 swat: Add XSRF protection to wizard page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index b7eec4a..b6e0c0f 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -751,6 +751,11 @@ static void wizard_page(void)
- 	int have_home = -1;
- 	int HomeExpo = 0;
- 	int SerType = 0;
-+	const char form_name[] = "wizard";
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
- 
- 	if (cgi_variable("Rewrite")) {
- 		(void) rewritecfg_file();
-@@ -841,10 +846,12 @@ static void wizard_page(void)
- 		winstype = 3;
- 
- 	role = lp_server_role();
--	
-+
-+output_page:
- 	/* Here we go ... */
- 	printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
- 	printf("<form method=post action=wizard>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
- 
- 	if (have_write_access) {
- 		printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
--- 
-1.7.1
-
-
-From 8fb3064eeaa3640af6c8b91aa5859d8bfb6d0888 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:04:12 +0200
-Subject: [PATCH 07/12] s3 swat: Add XSRF protection to globals page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index b6e0c0f..5d11685 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -920,9 +920,14 @@ static void globals_page(void)
- {
- 	unsigned int parm_filter = FLAG_BASIC;
- 	int mode = 0;
-+	const char form_name[] = "globals";
- 
- 	printf("<H2>%s</H2>\n", _("Global Parameters"));
- 
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
- 	if (cgi_variable("Commit")) {
- 		commit_parameters(GLOBAL_SECTION_SNUM);
- 		save_reload(0);
-@@ -935,7 +940,9 @@ static void globals_page(void)
- 	if ( cgi_variable("AdvMode"))
- 		mode = 1;
- 
-+output_page:
- 	printf("<form name=\"swatform\" method=post action=globals>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
- 
- 	ViewModeBoxes( mode );
- 	switch ( mode ) {
--- 
-1.7.1
-
-
-From ef457a20422cfa8231e25b539d2cd87f299686b9 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:04:48 +0200
-Subject: [PATCH 08/12] s3 swat: Add XSRF protection to shares page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |   18 +++++++++++++-----
- 1 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 5d11685..4544c31 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -982,11 +982,17 @@ static void shares_page(void)
- 	int mode = 0;
- 	unsigned int parm_filter = FLAG_BASIC;
- 	size_t converted_size;
-+	const char form_name[] = "shares";
-+
-+	printf("<H2>%s</H2>\n", _("Share Parameters"));
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
- 
- 	if (share)
- 		snum = lp_servicenumber(share);
- 
--	printf("<H2>%s</H2>\n", _("Share Parameters"));
- 
- 	if (cgi_variable("Commit") && snum >= 0) {
- 		commit_parameters(snum);
-@@ -1012,10 +1018,6 @@ static void shares_page(void)
- 		}
- 	}
- 
--	printf("<FORM name=\"swatform\" method=post>\n");
--
--	printf("<table>\n");
--
- 	if ( cgi_variable("ViewMode") )
- 		mode = atoi(cgi_variable_nonull("ViewMode"));
- 	if ( cgi_variable("BasicMode"))
-@@ -1023,6 +1025,12 @@ static void shares_page(void)
- 	if ( cgi_variable("AdvMode"))
- 		mode = 1;
- 
-+output_page:
-+	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	printf("<table>\n");
-+
- 	ViewModeBoxes( mode );
- 	switch ( mode ) {
- 		case 0:
--- 
-1.7.1
-
-
-From 4850456845d2da5e3451716a5ad4ca0ef034e01f Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:05:38 +0200
-Subject: [PATCH 09/12] s3 swat: Add XSRF protection to password page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |   11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 4544c31..5242484 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -1225,12 +1225,15 @@ static void chg_passwd(void)
- static void passwd_page(void)
- {
- 	const char *new_name = cgi_user_name();
-+	const char passwd_form[] = "passwd";
-+	const char rpasswd_form[] = "rpasswd";
- 
- 	if (!new_name) new_name = "";
- 
- 	printf("<H2>%s</H2>\n", _("Server Password Management"));
- 
- 	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), passwd_form);
- 
- 	printf("<table>\n");
- 
-@@ -1270,14 +1273,16 @@ static void passwd_page(void)
- 	 * Do some work if change, add, disable or enable was
- 	 * requested. It could be this is the first time through this
- 	 * code, so there isn't anything to do.  */
--	if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
--	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG))) {
-+	if (verify_xsrf_token(passwd_form) &&
-+	   ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
-+	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG)))) {
- 		chg_passwd();		
- 	}
- 
- 	printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
- 
- 	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), rpasswd_form);
- 
- 	printf("<table>\n");
- 
-@@ -1310,7 +1315,7 @@ static void passwd_page(void)
- 	 * password somewhere other than the server. It could be this
- 	 * is the first time through this code, so there isn't
- 	 * anything to do.  */
--	if (cgi_variable(CHG_R_PASSWD_FLAG)) {
-+	if (verify_xsrf_token(passwd_form) && cgi_variable(CHG_R_PASSWD_FLAG)) {
- 		chg_passwd();		
- 	}
- 
--- 
-1.7.1
-
-
-From 407ae61fbfc8ee1643a4db8ea9b104f031b32e0f Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Fri, 8 Jul 2011 15:06:13 +0200
-Subject: [PATCH 10/12] s3 swat: Add XSRF protection to printer page
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c |   28 ++++++++++++++++++----------
- 1 files changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 5242484..4582a63 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -1332,18 +1332,15 @@ static void printers_page(void)
- 	int i;
- 	int mode = 0;
- 	unsigned int parm_filter = FLAG_BASIC;
-+	const char form_name[] = "printers";
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
- 
- 	if (share)
- 		snum = lp_servicenumber(share);
- 
--        printf("<H2>%s</H2>\n", _("Printer Parameters"));
-- 
--        printf("<H3>%s</H3>\n", _("Important Note:"));
--        printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
--        printf("%s",_("are autoloaded printers from "));
--        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
--        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
--
- 	if (cgi_variable("Commit") && snum >= 0) {
- 		commit_parameters(snum);
- 		if (snum >= iNumNonAutoPrintServices)
-@@ -1372,8 +1369,6 @@ static void printers_page(void)
- 		}
- 	}
- 
--	printf("<FORM name=\"swatform\" method=post>\n");
--
- 	if ( cgi_variable("ViewMode") )
- 		mode = atoi(cgi_variable_nonull("ViewMode"));
-         if ( cgi_variable("BasicMode"))
-@@ -1381,6 +1376,19 @@ static void printers_page(void)
-         if ( cgi_variable("AdvMode"))
-                 mode = 1;
- 
-+output_page:
-+        printf("<H2>%s</H2>\n", _("Printer Parameters"));
-+
-+        printf("<H3>%s</H3>\n", _("Important Note:"));
-+        printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
-+        printf("%s",_("are autoloaded printers from "));
-+        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-+        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
-+
-+
-+	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
- 	ViewModeBoxes( mode );
- 	switch ( mode ) {
- 		case 0:
--- 
-1.7.1
-
-
-From 11e281228f334bf3d384df5655136f0b4b4068aa Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Sat, 9 Jul 2011 09:52:07 +0200
-Subject: [PATCH 11/12] s3 swat: Add time component to XSRF token
-
-Signed-off-by: Kai Blin <kai@samba.org>
----
- source/web/swat.c       |   28 ++++++++++++++++++++++++----
- source/web/swat_proto.h |    2 +-
- 2 files changed, 25 insertions(+), 5 deletions(-)
-
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 4582a63..50df66e 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -52,6 +52,8 @@ static int iNumNonAutoPrintServices = 0;
- #define ENABLE_USER_FLAG "enable_user_flag"
- #define RHOST "remote_host"
- #define XSRF_TOKEN "xsrf"
-+#define XSRF_TIME "xsrf_time"
-+#define XSRF_TIMEOUT 300
- 
- #define _(x) lang_msg_rotate(talloc_tos(),x)
- 
-@@ -141,7 +143,7 @@ static char *make_parm_name(const char *label)
- }
- 
- void get_xsrf_token(const char *username, const char *pass,
--		    const char *formname, char token_str[33])
-+		    const char *formname, time_t xsrf_time, char token_str[33])
- {
- 	struct MD5Context md5_ctx;
- 	uint8_t token[16];
-@@ -152,6 +154,7 @@ void get_xsrf_token(const char *username, const char *pass,
- 	MD5Init(&md5_ctx);
- 
- 	MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname));
-+	MD5Update(&md5_ctx, (uint8_t *)&xsrf_time, sizeof(time_t));
- 	if (username != NULL) {
- 		MD5Update(&md5_ctx, (uint8_t *)username, strlen(username));
- 	}
-@@ -173,11 +176,13 @@ void print_xsrf_token(const char *username, const char *pass,
- 		      const char *formname)
- {
- 	char token[33];
-+	time_t xsrf_time = time(NULL);
- 
--	get_xsrf_token(username, pass, formname, token);
-+	get_xsrf_token(username, pass, formname, xsrf_time, token);
- 	printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n",
- 	       XSRF_TOKEN, token);
--
-+	printf("<input type=\"hidden\" name=\"%s\" value=\"%lld\">\n",
-+	       XSRF_TIME, (long long int)xsrf_time);
- }
- 
- bool verify_xsrf_token(const char *formname)
-@@ -186,8 +191,23 @@ bool verify_xsrf_token(const char *formname)
- 	const char *username = cgi_user_name();
- 	const char *pass = cgi_user_pass();
- 	const char *token = cgi_variable_nonull(XSRF_TOKEN);
-+	const char *time_str = cgi_variable_nonull(XSRF_TIME);
-+	time_t xsrf_time = 0;
-+	time_t now = time(NULL);
-+
-+	if (sizeof(time_t) == sizeof(int)) {
-+		xsrf_time = atoi(time_str);
-+	} else if (sizeof(time_t) == sizeof(long)) {
-+		xsrf_time = atol(time_str);
-+	} else if (sizeof(time_t) == sizeof(long long)) {
-+		xsrf_time = atoll(time_str);
-+	}
-+
-+	if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
-+		return false;
-+	}
- 
--	get_xsrf_token(username, pass, formname, expected);
-+	get_xsrf_token(username, pass, formname, xsrf_time, expected);
- 	return (strncmp(expected, token, sizeof(expected)) == 0);
- }
- 
-diff --git a/source/web/swat_proto.h b/source/web/swat_proto.h
-index e66c942..424a3af 100644
---- a/source/web/swat_proto.h
-+++ b/source/web/swat_proto.h
-@@ -68,7 +68,7 @@ void status_page(void);
- 
- const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
- void get_xsrf_token(const char *username, const char *pass,
--		    const char *formname, char token_str[33]);
-+		    const char *formname, time_t xsrf_time, char token_str[33]);
- void print_xsrf_token(const char *username, const char *pass,
- 		      const char *formname);
- bool verify_xsrf_token(const char *formname);
--- 
-1.7.1
-
-
-From 3973cfa50024983618a44ffdb9f756b642b85be7 Mon Sep 17 00:00:00 2001
-From: Kai Blin <kai@samba.org>
-Date: Tue, 12 Jul 2011 08:08:24 +0200
-Subject: [PATCH 12/12] s3 swat: Create random nonce in CGI mode
-
-In CGI mode, we don't get access to the user's password, which would
-reduce the hash used so far to parameters an attacker can easily guess.
-To work around this, read the nonce from secrets.tdb or generate one if
-it's not there.
-Also populate the C_user field so we can use that for token creation.
-
-Signed-off-by: Kai Blin <kai@samba.org>
-
-The last 12 patches address bug #8290 (CSRF vulnerability in SWAT).
-This addresses CVE-2011-2522 (Cross-Site Request Forgery in SWAT).
----
- source/web/cgi.c  |   18 +++++++++++++++++-
- source/web/swat.c |    1 -
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/source/web/cgi.c b/source/web/cgi.c
-index ccdc3a7..890ac8e 100644
---- a/source/web/cgi.c
-+++ b/source/web/cgi.c
-@@ -19,6 +19,7 @@
- 
- #include "includes.h"
- #include "web/swat_proto.h"
-+#include "secrets.h"
- 
- #define MAX_VARIABLES 10000
- 
-@@ -321,7 +322,22 @@ static void cgi_web_auth(void)
- 		exit(0);
- 	}
- 
--	setuid(0);
-+	C_user = SMB_STRDUP(user);
-+
-+	if (!setuid(0)) {
-+		C_pass = secrets_fetch_generic("root", "SWAT");
-+		if (C_pass == NULL) {
-+			char *tmp_pass = NULL;
-+			tmp_pass = generate_random_str(16);
-+			if (tmp_pass == NULL) {
-+				printf("%sFailed to create random nonce for "
-+				       "SWAT session\n<br>%s\n", head, tail);
-+				exit(0);
-+			}
-+			secrets_store_generic("root", "SWAT", tmp_pass);
-+			C_pass = SMB_STRDUP(tmp_pass);
-+		}
-+	}
- 	setuid(pwd->pw_uid);
- 	if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) {
- 		printf("%sFailed to become user %s - uid=%d/%d<br>%s\n", 
-diff --git a/source/web/swat.c b/source/web/swat.c
-index 50df66e..146f1cf 100644
---- a/source/web/swat.c
-+++ b/source/web/swat.c
-@@ -29,7 +29,6 @@
- 
- #include "includes.h"
- #include "web/swat_proto.h"
--#include "../lib/crypto/md5.h"
- 
- static int demo_mode = False;
- static int passwd_only = False;
--- 
-1.7.1
-
diff --git a/package/samba/samba-add-check-for-__use_bsd.patch b/package/samba/samba-add-check-for-__use_bsd.patch
deleted file mode 100644
index a4c7109cf0..0000000000
--- a/package/samba/samba-add-check-for-__use_bsd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/source/client/mount.cifs.c	2009-04-01 13:48:54.000000000 +0200
-+++ b/source/client/mount.cifs.c	2009-04-20 12:59:57.000000000 +0200
-@@ -100,6 +100,7 @@
- 
- /* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
-  * don't link to libreplace so need them here. */
-+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
- 
- /* like strncpy but does not 0 fill the buffer and always null
-  *    terminates. bufsize is the size of the destination buffer */
-@@ -181,6 +182,7 @@
- 	SAFE_FREE(mountpassword);
- 	exit(EX_USAGE);
- }
-+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
- 
- /* caller frees username if necessary */
- static char * getusername(void) {
diff --git a/package/samba/samba-do-not-check-glibc-version.patch b/package/samba/samba-do-not-check-glibc-version.patch
deleted file mode 100644
index c5e3cd4781..0000000000
--- a/package/samba/samba-do-not-check-glibc-version.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- a/source/configure	2009-04-01 14:19:36.000000000 +0200
-+++ b/source/configure	2009-04-20 13:05:12.000000000 +0200
-@@ -44061,90 +44061,8 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--#
--#
--#
--case "$host_os" in
--    *linux*)
--       # glibc <= 2.3.2 has a broken getgrouplist
--       if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <unistd.h>
--#include <sys/utsname.h>
--main() {
--       /* glibc up to 2.3 has a broken getgrouplist */
--#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
--       int libc_major = __GLIBC__;
--       int libc_minor = __GLIBC_MINOR__;
--
--       if (libc_major < 2)
--              exit(1);
--       if ((libc_major == 2) && (libc_minor <= 3))
--              exit(1);
--#endif
--       exit(0);
--}
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  linux_getgrouplist_ok=yes
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--linux_getgrouplist_ok=no
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--       if test x"$linux_getgrouplist_ok" = x"yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETGROUPLIST 1
--_ACEOF
--
--       fi
--       ;;
--    *)
-+# Stripped glibc test which is not needed for uClibc
-+linux_getgrouplist_ok=yes
- 
- for ac_func in getgrouplist
- do
-@@ -44246,8 +44164,6 @@
- fi
- done
- 
--       ;;
--esac
- 
- #
- # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
diff --git a/package/samba/samba-fix-client-mtab.patch b/package/samba/samba-fix-client-mtab.patch
deleted file mode 100644
index 21e71586bd..0000000000
--- a/package/samba/samba-fix-client-mtab.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/client/mtab.c
-+++ b/source/client/mtab.c
-@@ -31,6 +31,8 @@
- #include <unistd.h>
- #include <errno.h>
- #include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #include <time.h>
- #include <fcntl.h>
diff --git a/package/samba/samba-fix-mount.cifs.patch b/package/samba/samba-fix-mount.cifs.patch
index 90bff234c9..9c235ea7be 100644
--- a/package/samba/samba-fix-mount.cifs.patch
+++ b/package/samba/samba-fix-mount.cifs.patch
@@ -1,18 +1,21 @@
---- a/source/client/mount.cifs.c
-+++ b/source/client/mount.cifs.c
-@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
- 	return ret;
- }
- #endif
-+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
- 
- /* BB finish BB
+--- a/client/mount.cifs.c	2011-09-13 10:26:21.000000000 +0200
++++ b/client/mount.cifs.c	2011-09-13 10:27:16.000000000 +0200
+@@ -39,7 +39,6 @@
+ #include <mntent.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#include <fstab.h>
+ #include "mount.h"
  
-@@ -178,7 +179,6 @@ static void mount_cifs_usage(void)
- 	SAFE_FREE(mountpassword);
- 	exit(EX_USAGE);
+ #define MOUNT_CIFS_VERSION_MAJOR "1"
+@@ -255,6 +254,10 @@
+ 	return 0;
  }
--#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
- 
- /* caller frees username if necessary */
- static char * getusername(void) {
+ #else /* CIFS_LEGACY_SETUID_CHECK */
++
++#ifndef _PATH_FSTAB
++#define _PATH_FSTAB "/etc/fstab"
++#endif
+ static int
+ check_fstab(const char *progname, char *mountpoint, char *devname,
+ 	    char **options)
diff --git a/package/samba/samba-getgrouplist.patch b/package/samba/samba-getgrouplist.patch
deleted file mode 100644
index e98d9cdc27..0000000000
--- a/package/samba/samba-getgrouplist.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/source/configure.in	2009-04-01 13:48:54.000000000 +0200
-+++ b/source/configure.in	2009-04-20 13:08:42.000000000 +0200
-@@ -1219,38 +1219,6 @@
- AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
- 
- #
--#
--#
--case "$host_os" in
--    *linux*)
--       # glibc <= 2.3.2 has a broken getgrouplist
--       AC_TRY_RUN([
--#include <unistd.h>
--#include <sys/utsname.h>
--main() {
--       /* glibc up to 2.3 has a broken getgrouplist */
--#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
--       int libc_major = __GLIBC__;
--       int libc_minor = __GLIBC_MINOR__;
--
--       if (libc_major < 2)
--              exit(1);
--       if ((libc_major == 2) && (libc_minor <= 3))
--              exit(1);
--#endif
--       exit(0);
--}
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
--       if test x"$linux_getgrouplist_ok" = x"yes"; then
--          AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
--       fi
--       ;;
--    *)
--       AC_CHECK_FUNCS(getgrouplist)
--       ;;
--esac
--
--#
- # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
- #
- 
diff --git a/package/samba/samba-remove-legacy-index.patch b/package/samba/samba-remove-legacy-index.patch
index 49a3b7d561..855bca77c6 100644
--- a/package/samba/samba-remove-legacy-index.patch
+++ b/package/samba/samba-remove-legacy-index.patch
@@ -1,5 +1,5 @@
---- a/source/registry/reg_perfcount.c
-+++ b/source/registry/reg_perfcount.c
+--- a/source3/registry/reg_perfcount.c
++++ b/source3/registry/reg_perfcount.c
 @@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P
  	obj = NULL;
  	memset(buf, 0, PERFCOUNT_MAX_LEN);
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 621d13c6aa..f36da8572e 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -3,12 +3,11 @@
 # samba
 #
 #############################################################
-
-SAMBA_VERSION = 3.3.15
+SAMBA_VERSION = 3.5.11
 SAMBA_SOURCE = samba-$(SAMBA_VERSION).tar.gz
-SAMBA_SITE = http://samba.org/samba/ftp/stable/
+SAMBA_SITE = http://ftp.samba.org/pub/samba/stable/
 
-SAMBA_SUBDIR = source
+SAMBA_SUBDIR = source3
 SAMBA_AUTORECONF = NO
 
 SAMBA_INSTALL_STAGING = YES

From c71b56b8c1dd6c389be8457d534a04e99cf6bf9c Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 13 Sep 2011 10:42:08 +0200
Subject: [PATCH 0637/6849] samba: fix linking of smbd with avahi support

Expliticly link with -lpthread if smbd is compiled with
avahi support. Otherwise the binary will fail to run.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba-fix-smbd-libs-avahi.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/samba/samba-fix-smbd-libs-avahi.patch

diff --git a/package/samba/samba-fix-smbd-libs-avahi.patch b/package/samba/samba-fix-smbd-libs-avahi.patch
new file mode 100644
index 0000000000..d6423def9a
--- /dev/null
+++ b/package/samba/samba-fix-smbd-libs-avahi.patch
@@ -0,0 +1,15 @@
+Expliticly link with -lpthread if smbd is compiled with
+avahi support. Otherwise the binary will fail to run.
+
+Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
+--- samba-3.5.6-orig/source3/Makefile.in	2010-10-07 18:41:16.000000000 +0200
++++ samba-3.5.6/source3/Makefile.in	2010-10-27 14:52:40.000000000 +0200
+@@ -1552,7 +1552,7 @@
+ 		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+ 		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
+ 		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+-		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
++		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS)
+ 
+ bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+ 	@echo Linking $@

From 94349b4e594f3da847b21b518c1c78c6ebc138c4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Sep 2011 21:45:03 +0200
Subject: [PATCH 0638/6849] portaudio: disable parallel build

The portaudio build system contains a race condition, which gets triggered
by high BR2_JLEVEL settings - It tries to use libportaudio.la before it is
created:

make[3]: *** No rule to make target `../../../lib/libportaudio.la',
needed by `libportaudiocpp.la'.  Stop.

Fix it by disabling parallel build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/portaudio/portaudio.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/portaudio/portaudio.mk b/package/multimedia/portaudio/portaudio.mk
index 67dfe361be..f403d002a6 100644
--- a/package/multimedia/portaudio/portaudio.mk
+++ b/package/multimedia/portaudio/portaudio.mk
@@ -8,6 +8,7 @@ PORTAUDIO_VERSION = V19
 PORTAUDIO_SITE = http://www.portaudio.com/archives
 PORTAUDIO_SOURCE = pa_stable_v19_20110326.tgz
 PORTAUDIO_INSTALL_STAGING = YES
+PORTAUDIO_MAKE = $(MAKE1)
 
 PORTAUDIO_DEPENDENCIES = \
        $(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)

From fcc55064e1e0dd5d955a33a15b23a729b7bb64f3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:17 -0300
Subject: [PATCH 0639/6849] mpd: bump to version 0.16.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index e647b4a2b3..b85e077bed 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.3
+MPD_VERSION = 0.16.4
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2

From 4a54dafcd2bac34cb386e506eda6f0f7991dbff4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:11 -0300
Subject: [PATCH 0640/6849] ipsec-tools: bump to version 0.8.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipsec-tools/ipsec-tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 0861a05bf1..dbc27a7a8c 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-IPSEC_TOOLS_VERSION = 0.7.3
+IPSEC_TOOLS_VERSION = 0.8.0
 IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
-IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
+IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.8/
 IPSEC_TOOLS_INSTALL_STAGING = YES
 IPSEC_TOOLS_MAKE = $(MAKE1)
 IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex

From 065762c091db7b4efb9adfe7c820788c94f0d1ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:15 -0300
Subject: [PATCH 0641/6849] ipset: bump to version 6.9.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 9d901fc53e..260b2b632a 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.8
+IPSET_VERSION = 6.9.1
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES

From b7fe77e43f1507917b7c80b040c6a978a81744a2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:12 -0300
Subject: [PATCH 0642/6849] usbutils: bump to version 004

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 1ddadbeecb..7b5e47b31f 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USBUTILS_VERSION = 003
+USBUTILS_VERSION = 004
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkg-config libusb
 USBUTILS_INSTALL_STAGING = YES

From 60eb1eef16d0d937a8097850f9e4186a64e4fd5c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:13 -0300
Subject: [PATCH 0643/6849] mpfr: bump to version 3.0.1_p4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr-3.0.1_p4.patch | 367 +++++++++++++++++++++++++++++++
 1 file changed, 367 insertions(+)
 create mode 100644 package/mpfr/mpfr-3.0.1_p4.patch

diff --git a/package/mpfr/mpfr-3.0.1_p4.patch b/package/mpfr/mpfr-3.0.1_p4.patch
new file mode 100644
index 0000000000..9604635a28
--- /dev/null
+++ b/package/mpfr/mpfr-3.0.1_p4.patch
@@ -0,0 +1,367 @@
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
+@@ -0,0 +1 @@
++asin_exprange
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
+@@ -1 +1 @@
+-3.0.1
++3.0.1-p1
+diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
+--- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -63,11 +63,14 @@
+ 
+   compared = mpfr_cmp_ui (xp, 1);
+ 
++  MPFR_SAVE_EXPO_MARK (expo);
++
+   if (MPFR_UNLIKELY (compared >= 0))
+     {
+       mpfr_clear (xp);
+       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
+         {
++          MPFR_SAVE_EXPO_FREE (expo);
+           MPFR_SET_NAN (asin);
+           MPFR_RET_NAN;
+         }
+@@ -80,13 +83,11 @@
+               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
+               MPFR_CHANGE_SIGN (asin);
+             }
+-          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
+-          return inexact;
++          mpfr_div_2ui (asin, asin, 1, rnd_mode);
+         }
+     }
+-
+-  MPFR_SAVE_EXPO_MARK (expo);
+-
++  else
++    {
+   /* Compute exponent of 1 - ABS(x) */
+   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
+   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
+@@ -115,6 +116,7 @@
+   inexact = mpfr_set (asin, xp, rnd_mode);
+ 
+   mpfr_clear (xp);
++    }
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+   return mpfr_check_range (asin, inexact, rnd_mode);
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1"
++#define MPFR_VERSION_STRING "3.0.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
+--- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -219,6 +219,49 @@
+   mpfr_clear (y);
+ }
+ 
++static void
++reduced_expo_range (void)
++{
++  mpfr_exp_t emin, emax;
++  mpfr_t x, y, ex_y;
++  int inex, ex_inex;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
++  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
++
++  mpfr_set_emin (1);
++  mpfr_set_emax (1);
++  mpfr_clear_flags ();
++  inex = mpfr_asin (y, x, MPFR_RNDA);
++  flags = __gmpfr_flags;
++  mpfr_set_emin (emin);
++  mpfr_set_emax (emax);
++
++  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
++  ex_inex = -1;
++  ex_flags = MPFR_FLAGS_INEXACT;
++
++  if (SIGN (inex) != ex_inex || flags != ex_flags ||
++      ! mpfr_equal_p (y, ex_y))
++    {
++      printf ("Error in reduced_expo_range\non x = ");
++      mpfr_dump (x);
++      printf ("Expected y = ");
++      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
++      printf ("Got      y = ");
++      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
++      exit (1);
++    }
++
++  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
++}
++
+ int
+ main (void)
+ {
+@@ -226,6 +269,7 @@
+ 
+   special ();
+   special_overflow ();
++  reduced_expo_range ();
+ 
+   test_generic (2, 100, 15);
+ 
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1";
++  return "3.0.1-p1";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
+@@ -0,0 +1 @@
++rec_sqrt-carry
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p1
++3.0.1-p2
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p1"
++#define MPFR_VERSION_STRING "3.0.1-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
+--- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
+@@ -375,20 +375,37 @@
+       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
+       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
+          we need to add or subtract the overlapping part {u + ln, un - ln} */
++      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
++         below (with size = th) mustn't be used. In such a case, the limb
++         (carry) will be 0, so that this is semantically a no-op, but if
++         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
++         non-atomic read/write in a place that is not always allocated,
++         with the possible consequences: a crash if the corresponding
++         address is not mapped, or (rather unlikely) memory corruption
++         if another process/thread writes at the same place; things may
++         be worse with future GMP versions. Hence the tests carry != 0. */
+       if (neg == 0)
+         {
+           if (ln > 0)
+             MPN_COPY (x, u, ln);
+           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
+           /* add cu at x+un */
+-          cy += mpn_add_1 (x + un, x + un, th, cu);
++          if (cu != 0)
++            {
++              MPFR_ASSERTD (th != 0);
++              cy += mpn_add_1 (x + un, x + un, th, cu);
++            }
+         }
+       else /* negative case */
+         {
+           /* subtract {u+ln, un-ln} from {x+ln,un} */
+           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
+           /* carry cy is at x+un, like cu */
+-          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
++          if (cy + cu != 0)
++            {
++              MPFR_ASSERTD (th != 0);
++              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
++            }
+           /* cy cannot be zero, since the most significant bit of Xh is 1,
+              and the correction is bounded by 2^{-h+3} */
+           MPFR_ASSERTD(cy == 0);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p1";
++  return "3.0.1-p2";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
+@@ -0,0 +1 @@
++atan-expo-range
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p2
++3.0.1-p3
+diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
+--- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
+@@ -431,5 +431,5 @@
+   MPFR_GROUP_CLEAR (group);
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+-  return mpfr_check_range (arctgt, inexact, rnd_mode);
++  return mpfr_check_range (atan, inexact, rnd_mode);
+ }
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p2"
++#define MPFR_VERSION_STRING "3.0.1-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
+--- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
+@@ -535,6 +535,52 @@
+   mpfr_clears (a, x, y, (mpfr_ptr) 0);
+ }
+ 
++/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
++ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
++ */
++static void
++reduced_expo_range (void)
++{
++  mpfr_exp_t emin, emax;
++  mpfr_t x, y, ex_y;
++  int inex, ex_inex;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
++  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
++
++  mpfr_set_emin (-5);
++  mpfr_set_emax (-5);
++  mpfr_clear_flags ();
++  inex = mpfr_atan (y, x, MPFR_RNDN);
++  flags = __gmpfr_flags;
++  mpfr_set_emin (emin);
++  mpfr_set_emax (emax);
++
++  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
++  ex_inex = 1;
++  ex_flags = MPFR_FLAGS_INEXACT;
++
++  if (SIGN (inex) != ex_inex || flags != ex_flags ||
++      ! mpfr_equal_p (y, ex_y))
++    {
++      printf ("Error in reduced_expo_range\non x = ");
++      mpfr_dump (x);
++      printf ("Expected y = ");
++      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
++      printf ("Got      y = ");
++      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
++      exit (1);
++    }
++
++  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -546,6 +592,7 @@
+   smallvals_atan2 ();
+   atan2_bug_20071003 ();
+   atan2_different_prec ();
++  reduced_expo_range ();
+ 
+   test_generic_atan  (2, 200, 17);
+   test_generic_atan2 (2, 200, 17);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p2";
++  return "3.0.1-p3";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
+@@ -0,0 +1 @@
++texp-zero
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p3
++3.0.1-p4
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p3"
++#define MPFR_VERSION_STRING "3.0.1-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
+--- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
+@@ -170,7 +170,9 @@
+       mpfr_set_prec (x, prec);
+       mpfr_set_prec (y, prec);
+       mpfr_set_prec (z, prec);
+-      mpfr_urandomb (x, RANDS);
++      do
++        mpfr_urandomb (x, RANDS);
++      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
+       rnd = RND_RAND ();
+       mpfr_exp_2 (y, x, rnd);
+       mpfr_exp_3 (z, x, rnd);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p3";
++  return "3.0.1-p4";
+ }

From 1a17d9f60a9eeb03e54f4be9be3a56bd291a138e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:14 -0300
Subject: [PATCH 0644/6849] gmp: bump to version 5.0.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index cdddca1ba1..c9e37938ed 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMP_VERSION = 5.0.1
+GMP_VERSION = 5.0.2
 GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES

From c961e963ff14c8ca36a0d4baaae477d496bfa246 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Sep 2011 13:40:16 -0300
Subject: [PATCH 0645/6849] iptables: bump to version 1.4.12.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._TCPMSS.c-unbreak-build-without-ipv6.patch | 72 -------------------
 package/iptables/iptables.mk                  |  2 +-
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 package/iptables/iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch

diff --git a/package/iptables/iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch b/package/iptables/iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
deleted file mode 100644
index 4d3c88f2d3..0000000000
--- a/package/iptables/iptables-1.4.12-libxt_TCPMSS.c-unbreak-build-without-ipv6.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From b5bfbb9fcac3d4c87bcf6da55ed40d63d456017d Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 22 Jul 2011 07:19:09 +0200
-Subject: [PATCH] libxt_TCPMSS.c: unbreak build without ipv6 after ea2a02f7
-
-ea2a02f7 (libxt_TCPMSS: use guided option parser) added an netinet/ip6.h
-include, which is not available on systems without ipv6.
-
-The ip.h / ipv6.h includes are only used to know the size of struct
-iphdr / ip6_hdr, so simply hardcode those instead.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- extensions/libxt_TCPMSS.c |   13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c
-index 2266326..310dd17 100644
---- a/extensions/libxt_TCPMSS.c
-+++ b/extensions/libxt_TCPMSS.c
-@@ -4,8 +4,6 @@
- */
- #include <stdio.h>
- #include <xtables.h>
--#include <netinet/ip.h>
--#include <netinet/ip6.h>
- #include <linux/netfilter/xt_TCPMSS.h>
- 
- enum {
-@@ -13,6 +11,9 @@ enum {
- 	O_CLAMP_MSS,
- };
- 
-+#define IPHDRSIZE	20	/* sizeof(struct iphdr) */
-+#define IP6HDRSIZE	40	/* sizeof(struct ip6_hdr) */
-+
- struct mssinfo {
- 	struct xt_entry_target t;
- 	struct xt_tcpmss_info mss;
-@@ -29,17 +30,17 @@ hdrsize);
- 
- static void TCPMSS_help(void)
- {
--	__TCPMSS_help(sizeof(struct iphdr));
-+	__TCPMSS_help(IPHDRSIZE);
- }
- 
- static void TCPMSS_help6(void)
- {
--	__TCPMSS_help(sizeof(struct ip6_hdr));
-+	__TCPMSS_help(IP6HDRSIZE);
- }
- 
- static const struct xt_option_entry TCPMSS4_opts[] = {
- 	{.name = "set-mss", .id = O_SET_MSS, .type = XTTYPE_UINT16,
--	 .min = 0, .max = UINT16_MAX - sizeof(struct iphdr),
-+	 .min = 0, .max = UINT16_MAX - IPHDRSIZE,
- 	 .flags = XTOPT_PUT, XTOPT_POINTER(struct xt_tcpmss_info, mss)},
- 	{.name = "clamp-mss-to-pmtu", .id = O_CLAMP_MSS, .type = XTTYPE_NONE},
- 	XTOPT_TABLEEND,
-@@ -47,7 +48,7 @@ static const struct xt_option_entry TCPMSS4_opts[] = {
- 
- static const struct xt_option_entry TCPMSS6_opts[] = {
- 	{.name = "set-mss", .id = O_SET_MSS, .type = XTTYPE_UINT16,
--	 .min = 0, .max = UINT16_MAX - sizeof(struct ip6_hdr),
-+	 .min = 0, .max = UINT16_MAX - IP6HDRSIZE,
- 	 .flags = XTOPT_PUT, XTOPT_POINTER(struct xt_tcpmss_info, mss)},
- 	{.name = "clamp-mss-to-pmtu", .id = O_CLAMP_MSS, .type = XTTYPE_NONE},
- 	XTOPT_TABLEEND,
--- 
-1.7.5.4
-
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 1ee88281ba..c6d1a0725b 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.12
+IPTABLES_VERSION = 1.4.12.1
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 9136457992c1967e8dce70de8abf0fc9878f4d8c Mon Sep 17 00:00:00 2001
From: Darius Augulis <augulis.darius@gmail.com>
Date: Sun, 4 Sep 2011 15:08:26 +0300
Subject: [PATCH 0646/6849] libevent: bump to version 2.0.13

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libevent/libevent.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index ba9769f45a..fa66f578f0 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -3,7 +3,7 @@
 # libevent
 #
 #############################################################
-LIBEVENT_VERSION = 1.4.12
+LIBEVENT_VERSION = 2.0.13
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
 LIBEVENT_SITE = http://monkey.org/~provos/
 

From 307c006695f24621a8e515f85d0cbbe4374afd89 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 6 Sep 2011 11:46:21 +0200
Subject: [PATCH 0647/6849] lzop : bump to 1.03

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzop/lzop.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index e55c1050a8..b278e5976e 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -3,9 +3,9 @@
 # lzop
 #
 #############################################################
-LZOP_VERSION:=1.02rc1
-LZOP_SOURCE:=lzop-$(LZOP_VERSION).tar.gz
-LZOP_SITE:=http://www.lzop.org/download/
-LZOP_DEPENDENCIES:=lzo
+LZOP_VERSION = 1.03
+LZOP_SOURCE = lzop-$(LZOP_VERSION).tar.gz
+LZOP_SITE = http://www.lzop.org/download/
+LZOP_DEPENDENCIES = lzo
 
 $(eval $(call AUTOTARGETS,package,lzop))

From ab9a76efff3e1cffb572dd748ffaa532f5da0107 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 6 Sep 2011 15:52:33 +0200
Subject: [PATCH 0648/6849] openssh: bump to 5.9p1

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 7a6cc90c99..02a23e1ff6 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSH_VERSION = 5.8p2
+OPENSSH_VERSION = 5.9p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \

From e849ff5d33c37b149152729541ecc403c1dfb90d Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 7 Sep 2011 10:52:44 +0200
Subject: [PATCH 0649/6849] iw: bump to 3.1

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index be3edc2098..5fcdc7215f 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.0
+IW_VERSION = 3.1
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From 25c117fa2a6c0f8e58d5786e4ea9e1e00893d2dd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Sep 2011 15:34:19 +0200
Subject: [PATCH 0650/6849] fuse: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fuse/libfuse.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk
index 45fb2f3808..86e57ff9ac 100644
--- a/package/fuse/libfuse.mk
+++ b/package/fuse/libfuse.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFUSE_VERSION = 2.8.5
+LIBFUSE_VERSION = 2.8.6
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
 

From 27b58e3972e287374259532e09a0ef4761b4270f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Sep 2011 07:51:10 +0200
Subject: [PATCH 0651/6849] qt: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qt/{qt-4.7.3-configure.patch => qt-4.7.4-configure.patch}   | 0
 ...hread_getattr_np.patch => qt-4.7.4-pthread_getattr_np.patch} | 0
 ...np_webkit.patch => qt-4.7.4-pthread_getattr_np_webkit.patch} | 0
 ...-qtdbus-no-gui.patch => qt-4.7.4-script-qtdbus-no-gui.patch} | 0
 package/qt/qt.mk                                                | 2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename package/qt/{qt-4.7.3-configure.patch => qt-4.7.4-configure.patch} (100%)
 rename package/qt/{qt-4.7.3-pthread_getattr_np.patch => qt-4.7.4-pthread_getattr_np.patch} (100%)
 rename package/qt/{qt-4.7.3-pthread_getattr_np_webkit.patch => qt-4.7.4-pthread_getattr_np_webkit.patch} (100%)
 rename package/qt/{qt-4.7.3-script-qtdbus-no-gui.patch => qt-4.7.4-script-qtdbus-no-gui.patch} (100%)

diff --git a/package/qt/qt-4.7.3-configure.patch b/package/qt/qt-4.7.4-configure.patch
similarity index 100%
rename from package/qt/qt-4.7.3-configure.patch
rename to package/qt/qt-4.7.4-configure.patch
diff --git a/package/qt/qt-4.7.3-pthread_getattr_np.patch b/package/qt/qt-4.7.4-pthread_getattr_np.patch
similarity index 100%
rename from package/qt/qt-4.7.3-pthread_getattr_np.patch
rename to package/qt/qt-4.7.4-pthread_getattr_np.patch
diff --git a/package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch
similarity index 100%
rename from package/qt/qt-4.7.3-pthread_getattr_np_webkit.patch
rename to package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch
diff --git a/package/qt/qt-4.7.3-script-qtdbus-no-gui.patch b/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch
similarity index 100%
rename from package/qt/qt-4.7.3-script-qtdbus-no-gui.patch
rename to package/qt/qt-4.7.4-script-qtdbus-no-gui.patch
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ff67058c43..ed95b2cc70 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION = 4.7.3
+QT_VERSION = 4.7.4
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://get.qt.nokia.com/qt/source
 

From fa7e6507101f95950c66ef776ed12c30d135b8ca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 16 Sep 2011 11:29:17 -0300
Subject: [PATCH 0652/6849] busybox: add new 1.19.2 fixes and drop stale config

Drop stale config file for busybox 1.13.x
Add build system and syslogd fixes for 1.19.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox-1.13.x.config         | 870 ------------------
 .../busybox-1.19.2-buildsys.patch             |  19 +
 .../busybox-1.19.2-syslogd.patch              |  20 +
 3 files changed, 39 insertions(+), 870 deletions(-)
 delete mode 100644 package/busybox/busybox-1.13.x.config
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch

diff --git a/package/busybox/busybox-1.13.x.config b/package/busybox/busybox-1.13.x.config
deleted file mode 100644
index 059a0b3a30..0000000000
--- a/package/busybox/busybox-1.13.x.config
+++ /dev/null
@@ -1,870 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.13.0
-# Sat Nov 15 17:33:29 2008
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_DESKTOP=y
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_GETOPT_LONG=y
-CONFIG_FEATURE_DEVPTS=y
-CONFIG_FEATURE_CLEAN_UP=y
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-# CONFIG_LFS is not set
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-CONFIG_INCLUDE_SUSv2=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_VI=y
-CONFIG_FEATURE_EDITING_HISTORY=999
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_BZIP2 is not set
-CONFIG_CPIO=y
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-CONFIG_FEATURE_TAR_FROM=y
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNLZMA=y
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-CONFIG_FOLD=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LENGTH=y
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-# CONFIG_FEATURE_FLOAT_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-# CONFIG_STAT is not set
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-# CONFIG_TAC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-# CONFIG_KBD_MODE is not set
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
-CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-CONFIG_SETKEYCODES=y
-CONFIG_SETLOGCONS=y
-# CONFIG_SHOWKEY is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_PIPE_PROGRESS=y
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
-# CONFIG_ED is not set
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-# CONFIG_FEATURE_FIND_DELETE is not set
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_KILL_REMOVED=y
-CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
-CONFIG_MESG=y
-
-#
-# Login/Password Management Utilities
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-CONFIG_USE_BB_CRYPT=y
-CONFIG_ADDGROUP=y
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-CONFIG_DELGROUP=y
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_ADDUSER=y
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-
-#
-# Linux Module Utilities
-#
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLKID is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-CONFIG_FDFLUSH=y
-CONFIG_FDFORMAT=y
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-CONFIG_GETOPT=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-CONFIG_FEATURE_MDEV_EXEC=y
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_V0 is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-CONFIG_READPROFILE=y
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-CONFIG_SETARCH=y
-CONFIG_SWAPONOFF=y
-# CONFIG_FEATURE_SWAPON_PRI is not set
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-CONFIG_CHRT=y
-CONFIG_CROND=y
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-CONFIG_DEVMEM=y
-CONFIG_EJECT=y
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_INOTIFYD is not set
-CONFIG_LAST=y
-CONFIG_FEATURE_LAST_SMALL=y
-# CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-CONFIG_FEATURE_LESS_REGEXP=y
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-CONFIG_RUNLEVEL=y
-# CONFIG_RX is not set
-CONFIG_SETSID=y
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-# CONFIG_TTYSIZE is not set
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-CONFIG_ARPING=y
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-CONFIG_DNSD=y
-CONFIG_ETHER_WAKE=y
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFENSLAVE is not set
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-CONFIG_FEATURE_IFUPDOWN_IP=y
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-CONFIG_INETD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NAMEIF=y
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
-CONFIG_NETSTAT=y
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
-# CONFIG_FEATURE_NETSTAT_PRG is not set
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-# CONFIG_PING6 is not set
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-CONFIG_APP_UDHCPD=y
-CONFIG_APP_DHCPRELAY=y
-CONFIG_APP_DUMPLEASES=y
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_APP_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-# CONFIG_FEATURE_UDHCP_PORT is not set
-# CONFIG_UDHCP_DEBUG is not set
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-# CONFIG_ZCIP is not set
-# CONFIG_TCPSVD is not set
-# CONFIG_UDPSVD is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-# CONFIG_FEATURE_SENDMAIL_MAILX is not set
-# CONFIG_FEATURE_SENDMAIL_MAILXX is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=y
-# CONFIG_NMETER is not set
-# CONFIG_PGREP is not set
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-CONFIG_UPTIME=y
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_BASH_COMPAT=y
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_READ_NCHARS=y
-CONFIG_ASH_READ_TIMEOUT=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-CONFIG_ASH_MATH_SUPPORT_64=y
-# CONFIG_ASH_GETOPTS is not set
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_CTTYHACK is not set
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch
new file mode 100644
index 0000000000..8e0c4c33ee
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch
@@ -0,0 +1,19 @@
+--- busybox-1.19.2/applets/applet_tables.c
++++ busybox-1.19.2-buildsys/applets/applet_tables.c
+@@ -80,8 +80,15 @@ int main(int argc, char **argv)
+ 
+ 	printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
+ 	if (NUM_APPLETS == 1) {
++		char *dash_to_underscore, *p;
+ 		printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
+-		printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
++		/* Example: "ether-wake" -> "ether_wake" */
++		p = dash_to_underscore = strdup(applets[0].name);
++		p--;
++		while (*++p)
++			if (*p == '-')
++				*p = '_';
++		printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore);
+ 	}
+ 	printf("\n");
+ 
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch
new file mode 100644
index 0000000000..d54f5d4307
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch
@@ -0,0 +1,20 @@
+--- busybox-1.19.2/sysklogd/syslogd.c
++++ busybox-1.19.2-syslogd/sysklogd/syslogd.c
+@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char 
+ 	parser_t *parser;
+ 
+ 	parser = config_open2(file ? file : "/etc/syslog.conf",
+-				file ? xfopen_for_read : fopen_or_warn_stdin);
++				file ? xfopen_for_read : fopen_for_read);
+ 	if (!parser)
+ 		/* didn't find default /etc/syslog.conf */
+ 		/* proceed as if we built busybox without config support */
+@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c
+ 	if (LOG_PRI(pri) < G.logLevel) {
+ #if ENABLE_FEATURE_IPC_SYSLOG
+ 		if ((option_mask32 & OPT_circularlog) && G.shbuf) {
+-			log_to_shmem(msg);
++			log_to_shmem(G.printbuf);
+ 			return;
+ 		}
+ #endif

From 8adad451a3d4e536dffe900d06ccd88740afe68b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:00 +0200
Subject: [PATCH 0653/6849] scripts: remove old, unmaintained, unused scripts

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 scripts/add_new_package.wizard | 120 ---------------------------------
 scripts/create_ipkgs           |  82 ----------------------
 scripts/get_linux_config.sh    |  77 ---------------------
 3 files changed, 279 deletions(-)
 delete mode 100755 scripts/add_new_package.wizard
 delete mode 100755 scripts/create_ipkgs
 delete mode 100755 scripts/get_linux_config.sh

diff --git a/scripts/add_new_package.wizard b/scripts/add_new_package.wizard
deleted file mode 100755
index 4ee02dfb2a..0000000000
--- a/scripts/add_new_package.wizard
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-echo "**** Autotools Add New Package Wizard ****"
-echo " This script will generate files to add a"
-echo " new package to buildroot."
-echo
-
-echo "What is the name of the package?"
-read PACKAGE_NAME
-
-echo "What is the version number?"
-read VERSION_NUM
-
-echo "What is the web address of the tarball?"
-read DOWNLOAD_LOC
-
-echo "Enter any known dependencies, separated"
-echo "by spaces, or just press enter."
-read EXTRA_DEPS
-
-echo "Enter a description of the package."
-read DESCRIPTION
-
-echo "Does autoreconf need to be run first? (y/n)"
-read ANSWER
-
-if [ "$ANSWER" = "y" ]; then
-	RECONF="YES"
-else
-	RECONF="NO"
-fi
-
-echo "Does it need to be installed to the staging dir?"
-echo "Say yes, if other packages depend on it."
-echo "(If not sure, just say yes. It will only use more"
-echo "space on your hard drive.)"
-read ANSWER
-
-if [ "$ANSWER" = "y" ]; then
-	STAGING="YES"
-else
-	STAGING="NO"
-fi
-
-echo "Enter an additional subdirectory below package/"
-echo "as category, or just press enter."
-read SUB_DIR
-
-if [ -z "$SUB_DIR" ]; then
-	CATEGORY_DIR=package
-else
-	CATEGORY_DIR=package/${SUB_DIR}
-fi
-
-echo "Enter any configure script options."
-read CONFIG_OPTIONS
-
-URL=${DOWNLOAD_LOC%/*}
-TARBALL=${DOWNLOAD_LOC##*/}
-EXTENSION=${TARBALL##*.tar.}
-NAME_UPPER=`echo ${PACKAGE_NAME} | tr a-z- A-Z_`
-PACKAGE_DIR=`dirname $0`/../${CATEGORY_DIR}/${PACKAGE_NAME}
-
-mkdir -p ${PACKAGE_DIR}
-
-sed -e 's/ *$//g' > ${PACKAGE_DIR}/${PACKAGE_NAME}.mk <<EOF
-#############################################################
-#
-# ${PACKAGE_NAME}
-#
-#############################################################
-${NAME_UPPER}_VERSION = ${VERSION_NUM}
-${NAME_UPPER}_SOURCE = ${PACKAGE_NAME}-\$(${NAME_UPPER}_VERSION).tar.${EXTENSION}
-${NAME_UPPER}_SITE = ${URL}
-${NAME_UPPER}_AUTORECONF = ${RECONF}
-${NAME_UPPER}_INSTALL_STAGING = ${STAGING}
-${NAME_UPPER}_INSTALL_TARGET = YES
-
-${NAME_UPPER}_CONF_OPT = ${CONFIG_OPTIONS}
-
-${NAME_UPPER}_DEPENDENCIES = uclibc ${EXTRA_DEPS}
-
-\$(eval \$(call AUTOTARGETS,${CATEGORY_DIR},${PACKAGE_NAME}))
-EOF
-
-cat > ${PACKAGE_DIR}/Config.in <<EOF
-config BR2_PACKAGE_${NAME_UPPER}
-	bool "${PACKAGE_NAME}"
-	help
-	  ${DESCRIPTION}
-
-	  ${URL}
-EOF
-
-echo
-echo "**** Manual steps to integrate your new package ****"
-echo
-
-echo "Add the following line to ${CATEGORY_DIR}/Config.in"
-echo "in an appropriate location:"
-echo "source \"${CATEGORY_DIR}/${PACKAGE_NAME}/Config.in\""
-
-if [ -n "$SUB_DIR" ]; then
-	echo
-	echo "Additionally add the following line to package/Config.in"
-	echo "in an appropriate location:"
-	echo "source \"${CATEGORY_DIR}/Config.in\""
-fi
-
-if [ -n "$EXTRA_DEPS" ]; then
-	echo
-	echo "You need to add \"depends on\" and/or \"select\" lines"
-	echo "to ${CATEGORY_DIR}/${PACKAGE_NAME}/Config.in"
-	echo "corresponding to the \"${NAME_UPPER}_DEPENDENCIES\" line"
-	echo "in ${CATEGORY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}.mk"
-fi
-
-echo
-echo "After that run \"make menuconfig\", select your new package"
-echo "and run \"make\" to build \"${PACKAGE_NAME}\"."
diff --git a/scripts/create_ipkgs b/scripts/create_ipkgs
deleted file mode 100755
index 3b9b8af393..0000000000
--- a/scripts/create_ipkgs
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# this script is very *alpha* so be gentle...
-
-# change these lines to your arch and maintainer name
-ARCH="avr32"
-PACK_MAINTAINER="John Voltz <john.voltz@gmail.com>"
-
-BUILDROOT_DIR=`pwd`
-
-echo "Creating ipkgs from your build directory..."
-echo "Please be patient, as this can take a long time.
-			"
-
-# create the ipkg directories
-mkdir -p ${BUILDROOT_DIR}/ipkg-temp
-mkdir -p ${BUILDROOT_DIR}/ipkg-out
-
-for PACKAGE in `ls -d ./build_*/*`; do
-	
-	# extract some info
-	NAME_WITHOUT_VER=${PACKAGE%-*}
-	VERSION=${PACKAGE#${NAME_WITHOUT_VER}-}
-	NAME_WITHOUT_DIR=${NAME_WITHOUT_VER#*/*/}
-	CLEAN_NAME=${NAME_WITHOUT_DIR//_/-}
-
-	# clean out the temp directory
-	rm -rf ${BUILDROOT_DIR}/ipkg-temp/*
-
-	# install the package to temp directory
-	cd ${PACKAGE}
-	echo "Installing ${NAME_WITHOUT_DIR} to ./ipkg-temp"
-	make DESTDIR=${BUILDROOT_DIR}/ipkg-temp DSTROOT=${BUILDROOT_DIR}/ipkg-temp install &> /dev/null 
-
-	# create the control file
-	cd ${BUILDROOT_DIR}
-	mkdir ${BUILDROOT_DIR}/ipkg-temp/CONTROL
-
-	# find it's corresponding buildroot package directory 
-	PACK_NAME=`find ./package -path './package/config' -prune -o -name ${NAME_WITHOUT_DIR}`
-	PACK_NAME=${PACK_NAME%./package/config}
-	PACK_NAME=${PACK_NAME#./package/config}
-	PACK_NAME=`echo -n ${PACK_NAME}`
-
-	# there must be an better way to extract the description and 
-	# dependencies from the Config.in and *.mk file. 
-	# Haven't figured it out just yet.
-	CONF_FILE=`cat ${PACK_NAME}/Config.in`
-	#MAKE_FILE=`cat ${PACK_NAME}/*.mk`
-	HELP_STR=${CONF_FILE#*help}
-	HELP_STR=${HELP_STR%%comment*}
-	HELP_STR=${HELP_STR%%choice*}
-	HELP_STR=${HELP_STR%%depends*}
-	HELP_STR=${HELP_STR%%http*}
-	HELP_STR=`echo -n ${HELP_STR}`
-
-	echo ${HELP_STR}
-
-	if [ "${PACK_NAME}" != "" ]; then
-		echo "Creating ipkg of: ${PACKAGE}"
-
-cat > ${BUILDROOT_DIR}/ipkg-temp/CONTROL/control <<EOF
-Package: ${CLEAN_NAME}
-Priority: optional
-Version: ${VERSION}
-Architecture: ${ARCH}
-Maintainer: ${PACK_MAINTAINER}
-Depends: uclibc
-Description: ${HELP_STR}
-EOF
-
-		# build the package
-		package/ipkg/ipkg-build ${BUILDROOT_DIR}/ipkg-temp ${BUILDROOT_DIR}/ipkg-out
-
-	fi
-
-	echo "Complete.
-					"
-
-done
-
-echo "ipkg builds are finished."
diff --git a/scripts/get_linux_config.sh b/scripts/get_linux_config.sh
deleted file mode 100755
index 6c00036855..0000000000
--- a/scripts/get_linux_config.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#######################################################################
-#
-# Copy successively all configs from the BSP directory (par #1)
-# to the Linux directory (par #2)
-# Do not copy config files for later linux versions than the current
-# A well-behaved filename is 
-# "<name>-linux-2.6.<major>.<minor>.config" or
-# "<name>-linux-2.6.<major>.config"
-#
-#######################################################################
-
-TOPDIR=`pwd`
-DEBUG=0
-# parameter #1	BOARD_PATH
-# parameter #2  LINUX26_DIR
-
-CONFIGS=`ls -X $1/*linux-2.6.*.config | sed s/[.]config// - | sort`
-LINUX26_DIR=`basename $2`
-LINUX26_CONFIG=${2}/.config
-LINUX_MAJOR_VERSION=${LINUX26_DIR:10:2}
-LINUX_MINOR_VERSION=${LINUX26_DIR:13}
-
-function DBG_PRINT
-{
-	if [ ${DEBUG} = 1 ] ; then
-		echo $1
-	fi
-}
-
-function linux_version()
-{
-	local KCONFIG
-	KCONFIG=`basename $1`
-	KERNEL=`echo ${KCONFIG} | sed s/.*linux-2.6./linux-2.6./g -`
-	THIS_MAJOR=${KERNEL:10:2}
-	THIS_MINOR=${KERNEL:13}
-	THIS_MINOR=${THIS_MINOR:=0}
-}
-
-# Try to be careful...
-DBG_PRINT MAJOR=\"${LINUX_MAJOR_VERSION}\"
-DBG_PRINT MINOR=\"${LINUX_MINOR_VERSION}\"
-
-for i in ${CONFIGS} ; do
-    DBG_PRINT FILE=$i
-    linux_version $i
-    DBG_PRINT KERNEL=${KERNEL}
-    if [ ${THIS_MAJOR} -lt ${LINUX_MAJOR_VERSION} ] ; then
-	    echo Copying `basename $i`.config ...
-	    cp $i.config ${LINUX26_CONFIG}
-    elif [ ${THIS_MAJOR} -eq ${LINUX_MAJOR_VERSION} ] ; then
-	if [ "${LINUX_MINOR_VERSION}X" = "X" ] ; then
-		if [ "${THIS_MINOR}X" = "X" ] ; then
-		    echo Copying `basename $i`.config ...
-		    cp $i.config ${LINUX26_CONFIG}
-		else		
-			return
-		fi
-	elif [ ${THIS_MINOR} -le ${LINUX_MINOR_VERSION} ] ; then
-	    echo Copying `basename $i`.config ...
-	    cp $i.config ${LINUX26_CONFIG}
-	fi
-    else		
-	return
-    fi
-done
-
-# Did not work... - be promisceous
-
-if [ ! -f "${LINUX26_CONFIG}" ] ; then \
-	for i in `ls $1/*linux*.config` ; do
-		echo Copying `basename $i` ...
-		cp $i ${LINUX26_CONFIG}
-	done
-fi
-

From 3e304db0f0ef583efb250a19663259bb6dc60c93 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:01 +0200
Subject: [PATCH 0654/6849] scripts/mkmakefile: fix typo

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 scripts/mkmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 38d8268533..cef2ec7070 100755
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Generates a small Makefile used in the root of the output
 # directory, to allow make to be started from there.
-# The Makefile also allow for more convinient build of external modules
+# The Makefile also allow for more convenient build of external modules
 
 # Usage
 # $1 - Kernel src directory

From f082c7c5cf72296566dcf92bba4fcb4c95f2186f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:02 +0200
Subject: [PATCH 0655/6849] support: move scripts/ to a new support/ directory

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                     | 6 +++---
 {scripts => support/scripts}/build-ext3-img  | 0
 {scripts => support/scripts}/copy.sh         | 0
 {scripts => support/scripts}/graph-depends   | 0
 {scripts => support/scripts}/mkmakefile      | 0
 {scripts => support/scripts}/pkg-stats       | 0
 {scripts => support/scripts}/setlocalversion | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename {scripts => support/scripts}/build-ext3-img (100%)
 rename {scripts => support/scripts}/copy.sh (100%)
 rename {scripts => support/scripts}/graph-depends (100%)
 rename {scripts => support/scripts}/mkmakefile (100%)
 rename {scripts => support/scripts}/pkg-stats (100%)
 rename {scripts => support/scripts}/setlocalversion (100%)

diff --git a/Makefile b/Makefile
index 8779d3f1fb..8fdc9eb0fe 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
 # Need to export it, so it can be got from environment in children (eg. mconf)
-export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion)
+export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
 
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
 	defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \
@@ -425,7 +425,7 @@ erase-fakeroots:
 
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
-	( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
+	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
 else
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal
 	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
@@ -607,7 +607,7 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 # output directory.
 outputmakefile:
 ifeq ($(NEED_WRAPPER),y)
-	$(Q)$(TOPDIR)/scripts/mkmakefile $(TOPDIR) $(O)
+	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif
 
 clean:
diff --git a/scripts/build-ext3-img b/support/scripts/build-ext3-img
similarity index 100%
rename from scripts/build-ext3-img
rename to support/scripts/build-ext3-img
diff --git a/scripts/copy.sh b/support/scripts/copy.sh
similarity index 100%
rename from scripts/copy.sh
rename to support/scripts/copy.sh
diff --git a/scripts/graph-depends b/support/scripts/graph-depends
similarity index 100%
rename from scripts/graph-depends
rename to support/scripts/graph-depends
diff --git a/scripts/mkmakefile b/support/scripts/mkmakefile
similarity index 100%
rename from scripts/mkmakefile
rename to support/scripts/mkmakefile
diff --git a/scripts/pkg-stats b/support/scripts/pkg-stats
similarity index 100%
rename from scripts/pkg-stats
rename to support/scripts/pkg-stats
diff --git a/scripts/setlocalversion b/support/scripts/setlocalversion
similarity index 100%
rename from scripts/setlocalversion
rename to support/scripts/setlocalversion

From 20f8a7dec6fc25f6c475163c0273147580128867 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:03 +0200
Subject: [PATCH 0656/6849] support: move libtool patches in support/libtool

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in                             | 6 +++---
 {package => support/libtool}/buildroot-libtool-v1.5.patch | 0
 {package => support/libtool}/buildroot-libtool-v2.2.patch | 0
 {package => support/libtool}/buildroot-libtool-v2.4.patch | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {package => support/libtool}/buildroot-libtool-v1.5.patch (100%)
 rename {package => support/libtool}/buildroot-libtool-v2.2.patch (100%)
 rename {package => support/libtool}/buildroot-libtool-v2.4.patch (100%)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 7f04c3692b..90c8924418 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -152,11 +152,11 @@ define LIBTOOL_PATCH_HOOK
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
 			sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = '1.5'; then \
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi
diff --git a/package/buildroot-libtool-v1.5.patch b/support/libtool/buildroot-libtool-v1.5.patch
similarity index 100%
rename from package/buildroot-libtool-v1.5.patch
rename to support/libtool/buildroot-libtool-v1.5.patch
diff --git a/package/buildroot-libtool-v2.2.patch b/support/libtool/buildroot-libtool-v2.2.patch
similarity index 100%
rename from package/buildroot-libtool-v2.2.patch
rename to support/libtool/buildroot-libtool-v2.2.patch
diff --git a/package/buildroot-libtool-v2.4.patch b/support/libtool/buildroot-libtool-v2.4.patch
similarity index 100%
rename from package/buildroot-libtool-v2.4.patch
rename to support/libtool/buildroot-libtool-v2.4.patch

From 59a326b934737483531c49c99acda7874c72e335 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:04 +0200
Subject: [PATCH 0657/6849] support: move patch-kernel.sh and rename it

The name "patch-kernel.sh" is a bit stupid, since this script is used
to patch everything in Buildroot, not only kernel trees.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/uboot.mk                                  |  2 +-
 linux/linux.mk                                       |  6 +++---
 package/Makefile.autotools.in                        | 12 ++++++------
 package/Makefile.package.in                          |  8 ++++----
 package/argus/argus.mk                               |  2 +-
 package/cups/cups.mk                                 |  2 +-
 package/cvs/cvs.mk                                   |  2 +-
 package/fis/fis.mk                                   |  2 +-
 package/gettext/gettext.mk                           |  2 +-
 package/input-tools/input-tools.mk                   |  2 +-
 package/libeXosip2/libeXosip2.mk                     |  2 +-
 package/libgtk2/libgtk2.mk                           |  2 +-
 package/libosip2/libosip2.mk                         |  2 +-
 package/mii-diag/mii-diag.mk                         |  2 +-
 package/mutt/mutt.mk                                 |  2 +-
 package/netkitbase/netkitbase.mk                     |  2 +-
 package/netkittelnet/netkittelnet.mk                 |  2 +-
 package/setserial/setserial.mk                       |  2 +-
 package/sfdisk/sfdisk.mk                             |  2 +-
 package/sysklogd/sysklogd.mk                         |  2 +-
 package/sysvinit/sysvinit.mk                         |  2 +-
 package/thttpd/thttpd.mk                             |  2 +-
 package/tinyhttpd/tinyhttpd.mk                       |  2 +-
 package/ttcp/ttcp.mk                                 |  2 +-
 package/uemacs/uemacs.mk                             |  2 +-
 package/vpnc/vpnc.mk                                 |  2 +-
 package/xfsprogs/xfsprogs.mk                         |  2 +-
 .../scripts/apply-patches.sh                         |  0
 toolchain/gcc/gcc-uclibc-4.x.mk                      |  4 ++--
 toolchain/gdb/gdb.mk                                 |  2 +-
 toolchain/kernel-headers/kernel-headers.mk           |  4 ++--
 toolchain/uClibc/uclibc.mk                           |  4 ++--
 32 files changed, 44 insertions(+), 44 deletions(-)
 rename toolchain/patch-kernel.sh => support/scripts/apply-patches.sh (100%)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 776bdefcbc..202995a73b 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -52,7 +52,7 @@ endef
 
 ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
 define UBOOT_APPLY_CUSTOM_PATCHES
-	toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
 		uboot-$(UBOOT_VERSION)-\*.patch
 endef
 
diff --git a/linux/linux.mk b/linux/linux.mk
index 6662f7b06d..d289b28427 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -100,11 +100,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
 define LINUX_APPLY_PATCHES
 	for p in $(LINUX_PATCHES) ; do \
 		if echo $$p | grep -q -E "^ftp://|^http://" ; then \
-			toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
+			support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` ; \
 		elif test -d $$p ; then \
-			toolchain/patch-kernel.sh $(@D) $$p linux-\*.patch ; \
+			support/scripts/apply-patches.sh $(@D) $$p linux-\*.patch ; \
 		else \
-			toolchain/patch-kernel.sh $(@D) `dirname $$p` `basename $$p` ; \
+			support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` ; \
 		fi \
 	done
 endef
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 90c8924418..12c503827b 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -152,11 +152,11 @@ define LIBTOOL_PATCH_HOOK
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
 			sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = '1.5'; then \
-				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi
@@ -177,11 +177,11 @@ define AUTORECONF_HOOK
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
 			if test $$$${ltmain_version} = "1.5"; then \
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 868bf28420..07511442cb 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -259,15 +259,15 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
-	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
+	$(if $($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
 	$(Q)( \
 	if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
 	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
+	    support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
 	  else \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
+	    support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
 	    if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \
-	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
+	      support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
 	    fi; \
 	  fi; \
 	fi; \
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index 2705bac745..1a90b10123 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -11,7 +11,7 @@ ARGUS_DEPENDENCIES=libpcap
 
 define ARGUS_DEBIAN_PATCH_APPLY
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 169cdb3341..3b9f2e0d3c 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -69,7 +69,7 @@ $(DL_DIR)/$(CUPS_SOURCE):
 
 $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
 	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(CUPS_DIR) package/cups/ \*.patch
+	support/scripts/apply-patches.sh $(CUPS_DIR) package/cups/ \*.patch
 	$(CONFIG_UPDATE) $(CUPS_DIR)
 	touch $@
 
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 023e93bafa..8d56a21071 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -37,7 +37,7 @@ define CVS_DEBIAN_PATCHES
 		 do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \
 		 done; \
 		); \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
 	fi
 endef
 endif
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index e532aff2b5..29424491c2 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -18,7 +18,7 @@ fis-source: $(DL_DIR)/$(FIS_SOURCE)
 $(FIS_DIR)/.unpacked: $(DL_DIR)/$(FIS_SOURCE)
 	mkdir -p $(FIS_DIR)
 	cp -f $(DL_DIR)/$(FIS_SOURCE) $(FIS_DIR)
-	toolchain/patch-kernel.sh $(FIS_DIR) package/fis \*.patch
+	support/scripts/apply-patches.sh $(FIS_DIR) package/fis \*.patch
 	touch $@
 
 $(FIS_DIR)/$(FIS_BINARY): $(FIS_DIR)/.unpacked
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 2b308c84ab..332a2ca630 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -24,7 +24,7 @@ gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
 
 $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
 	$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
+	support/scripts/apply-patches.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
 	$(CONFIG_UPDATE) $(@D)
 	$(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux
 	touch $@
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index daf07556d6..0c5b523c6f 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -15,7 +15,7 @@ INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST)      += jstest
 
 define INPUT_TOOLS_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 415745b26a..565a259c75 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -18,7 +18,7 @@ define LIBEXOSIP2_DEBIAN_PATCHES
 		 do $(SED) 's,^\+\+\+ .*cvs-$(LIBEXOSIP2_VERSION)/,+++ cvs-$(LIBEXOSIP2_VERSION)/,' $$i; \
 		 done; \
 		); \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
 	fi
 endef
 endif
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index be4531ecbe..f9872b67ca 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -139,7 +139,7 @@ HOST_LIBGTK2_CONF_OPT = \
 		--disable-debug
 
 define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
- toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
+ support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
 endef
 
 HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index aa15332c9f..da3f9a277b 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -16,7 +16,7 @@ define LIBOSIP2_DEBIAN_PATCHES
 		 do $(SED) 's,^\+\+\+ .*cvs-$(LIBOSIP2_VERSION)/,+++ cvs-$(LIBOSIP2_VERSION)/,' $$i; \
 		 done; \
 		); \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
 	fi
 endef
 endif
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 01a8b5f7d0..6d3743a158 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -10,7 +10,7 @@ MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
 
 define MII_DIAG_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index d021aef821..886768cf37 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -16,7 +16,7 @@ MUTT_AUTORECONF=YES
 
 define MUTT_APPLY_DEBIAN_PATCHES
         if [ -d $(@D)/debian/patches ]; then \
-                toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+                support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
         fi
 endef
 
diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 311c8b28a2..dde8f9f6c0 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -22,7 +22,7 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
 	$(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure
 	# don't try to run cross compiled binaries while configuring things
 	$(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
-	toolchain/patch-kernel.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch
+	support/scripts/apply-patches.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch
 	touch $(NETKITBASE_DIR)/.unpacked
 
 $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked
diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index afa3bc451f..e9f40cad03 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -23,7 +23,7 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
 	# Disable termcap support
 	$(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
 	# don't try to run cross compiled binaries while configuring things
-	toolchain/patch-kernel.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch
+	support/scripts/apply-patches.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch
 	touch $(NETKITTELNET_DIR)/.unpacked
 
 $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index f24af73dff..33c8478d9f 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -13,7 +13,7 @@ define SETSERIAL_APPLY_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
 		touch $(@D)/gorhack.h; \
 		rm $(@D)/debian/patches/01_makefile.dpatch; \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches *.dpatch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches *.dpatch; \
 	fi
 endef
 
diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk
index 81c4943dc1..22ebeaaae9 100644
--- a/package/sfdisk/sfdisk.mk
+++ b/package/sfdisk/sfdisk.mk
@@ -14,7 +14,7 @@ $(DL_DIR)/$(SFDISK_SOURCE):
 
 $(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
 	$(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
+	support/scripts/apply-patches.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
 	touch $@
 
 
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 11aee2af57..e08f048e1f 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -15,7 +15,7 @@ endif
 
 define SYSKLOGD_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index adcc1ade02..af5ec42035 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -15,7 +15,7 @@ endif
 
 define SYSVINIT_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index c67aa49cf0..46c87a13c2 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -11,7 +11,7 @@ THTTPD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/t/thttpd/
 ifneq ($(THTTPD_PATCH),)
 define THTTPD_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 endif
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index eac416b971..739849f33b 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -23,7 +23,7 @@ tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
 #############################################################
 $(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE)
 	$(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
+	support/scripts/apply-patches.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
 	touch $(TINYHTTPD_DIR)/.unpacked
 
 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked
diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index 1c4fe6ff10..006b74ca9c 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -15,7 +15,7 @@ $(DL_DIR)/$(TTCP_SOURCE):
 $(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE)
 	-mkdir $(TTCP_DIR)
 	cp -af $(DL_DIR)/$(TTCP_SOURCE) $(TTCP_DIR)
-	toolchain/patch-kernel.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch
+	support/scripts/apply-patches.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch
 	touch $(TTCP_DIR)/.unpacked
 
 $(TTCP_DIR)/.configured: $(TTCP_DIR)/.unpacked
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 539ad51f0e..8355a7f960 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -18,7 +18,7 @@ uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
 
 $(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
 	$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
+	support/scripts/apply-patches.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
 	touch $(UEMACS_DIR)/.unpacked
 
 $(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index c4f23fa2ab..5a8c700368 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -19,7 +19,7 @@ $(DL_DIR)/$(VPNC_SOURCE):
 
 $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
 	$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
+	support/scripts/apply-patches.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
 	touch $@
 
 $(VPNC_BINARY): $(VPNC_DIR)/.unpacked
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 204b3cbd66..68db2f7890 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -24,7 +24,7 @@ xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE)
 
 $(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE)
 	$(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
+	support/scripts/apply-patches.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
 	touch $(XFSPROGS_DIR)/.unpacked
 
 #XFSPROGS_CONFIG_SHARED:=--disable-shared
diff --git a/toolchain/patch-kernel.sh b/support/scripts/apply-patches.sh
similarity index 100%
rename from toolchain/patch-kernel.sh
rename to support/scripts/apply-patches.sh
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 94613fadde..9232290995 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -207,12 +207,12 @@ gcc-patched: $(GCC_DIR)/.patched
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
 ifneq ($(wildcard $(GCC_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
+	support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
 endif
 
 ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
 ifneq ($(BR2_SOFT_FLOAT),)
-	toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
+	support/scripts/apply-patches.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
 endif
 endif
 	touch $@
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index caf3e364d9..db46b12869 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -36,7 +36,7 @@ ifeq ($(GDB_VERSION),snapshot)
 	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
 endif
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
+	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
 endif
 	$(CONFIG_UPDATE) $(@D)
 	touch $@
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index ce70cab3a1..044fcf9477 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -55,10 +55,10 @@ $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
 	touch $@
 
 $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
-	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
+	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
 		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
 ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
-	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
 		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
 endif
 	touch $@
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index e74012f616..0fc5a817eb 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -79,11 +79,11 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 uclibc-patched: $(UCLIBC_DIR)/.patched
 $(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
 ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-	toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
 		uClibc-$(UCLIBC_VERSION)-\*.patch \
 		uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH)
 else
-	toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
 		uClibc.\*.patch uClibc.\*.patch.$(ARCH)
 endif
 	touch $@

From 56da3859c770b83631ebae810dfb3024c1a9cbd2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:05 +0200
Subject: [PATCH 0658/6849] support: move kconfig stuff from package/config to
 support/kconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                               |  2 +-
 {package/config => support/kconfig}/.gitignore         |  0
 {package/config => support/kconfig}/Makefile           |  0
 {package/config => support/kconfig}/Makefile.br        |  0
 {package/config => support/kconfig}/POTFILES.in        |  0
 {package/config => support/kconfig}/README.buildroot2  | 10 +++++-----
 {package/config => support/kconfig}/check.sh           |  0
 {package/config => support/kconfig}/conf.c             |  0
 {package/config => support/kconfig}/confdata.c         |  0
 {package/config => support/kconfig}/expr.c             |  0
 {package/config => support/kconfig}/expr.h             |  0
 {package/config => support/kconfig}/foo.h              |  0
 {package/config => support/kconfig}/gconf.c            |  2 +-
 {package/config => support/kconfig}/gconf.glade        |  0
 {package/config => support/kconfig}/images.c           |  0
 {package/config => support/kconfig}/kconfig_load.c     |  0
 {package/config => support/kconfig}/kxgettext.c        |  0
 .../config => support/kconfig}/lex.zconf.c_shipped     |  0
 {package/config => support/kconfig}/lkc.h              |  0
 {package/config => support/kconfig}/lkc_proto.h        |  0
 .../config => support/kconfig}/lxdialog/.gitignore     |  0
 .../kconfig}/lxdialog/BIG.FAT.WARNING                  |  0
 .../kconfig}/lxdialog/check-lxdialog.sh                |  0
 .../config => support/kconfig}/lxdialog/checklist.c    |  0
 {package/config => support/kconfig}/lxdialog/dialog.h  |  0
 .../config => support/kconfig}/lxdialog/inputbox.c     |  0
 {package/config => support/kconfig}/lxdialog/menubox.c |  0
 {package/config => support/kconfig}/lxdialog/textbox.c |  0
 {package/config => support/kconfig}/lxdialog/util.c    |  0
 {package/config => support/kconfig}/lxdialog/yesno.c   |  0
 {package/config => support/kconfig}/mconf.c            |  0
 {package/config => support/kconfig}/menu.c             |  0
 {package/config => support/kconfig}/nconf.c            |  0
 {package/config => support/kconfig}/nconf.gui.c        |  0
 {package/config => support/kconfig}/nconf.h            |  0
 .../patches/01-kconfig-kernel-to-buildroot.patch       |  0
 .../patches/02-cpp-comments-to-c-comments.patch        |  0
 .../patches/03-change-config-option-prefix.patch       |  0
 .../kconfig}/patches/05-really-clean-everything.patch  |  0
 .../patches/06-br-build-system-integration.patch       |  0
 .../kconfig}/patches/08-make-write-deps.patch          |  8 ++++----
 .../patches/09-implement-kconfig-probability.patch     |  0
 .../kconfig}/patches/10-br-build-system.patch          |  0
 .../kconfig}/patches/11-use-mktemp-for-lxdialog.patch  |  0
 .../kconfig}/patches/12-fix-glade-file-path.patch      |  8 ++++----
 .../patches/14-support-out-of-tree-config.patch        |  0
 {package/config => support/kconfig}/patches/series     |  0
 {package/config => support/kconfig}/qconf.cc           |  0
 {package/config => support/kconfig}/qconf.h            |  0
 .../config => support/kconfig}/streamline_config.pl    |  0
 {package/config => support/kconfig}/symbol.c           |  0
 {package/config => support/kconfig}/util.c             |  2 +-
 {package/config => support/kconfig}/zconf.gperf        |  0
 .../config => support/kconfig}/zconf.hash.c_shipped    |  0
 {package/config => support/kconfig}/zconf.l            |  0
 .../config => support/kconfig}/zconf.tab.c_shipped     |  0
 {package/config => support/kconfig}/zconf.y            |  0
 57 files changed, 16 insertions(+), 16 deletions(-)
 rename {package/config => support/kconfig}/.gitignore (100%)
 rename {package/config => support/kconfig}/Makefile (100%)
 rename {package/config => support/kconfig}/Makefile.br (100%)
 rename {package/config => support/kconfig}/POTFILES.in (100%)
 rename {package/config => support/kconfig}/README.buildroot2 (58%)
 rename {package/config => support/kconfig}/check.sh (100%)
 rename {package/config => support/kconfig}/conf.c (100%)
 rename {package/config => support/kconfig}/confdata.c (100%)
 rename {package/config => support/kconfig}/expr.c (100%)
 rename {package/config => support/kconfig}/expr.h (100%)
 rename {package/config => support/kconfig}/foo.h (100%)
 rename {package/config => support/kconfig}/gconf.c (99%)
 rename {package/config => support/kconfig}/gconf.glade (100%)
 rename {package/config => support/kconfig}/images.c (100%)
 rename {package/config => support/kconfig}/kconfig_load.c (100%)
 rename {package/config => support/kconfig}/kxgettext.c (100%)
 rename {package/config => support/kconfig}/lex.zconf.c_shipped (100%)
 rename {package/config => support/kconfig}/lkc.h (100%)
 rename {package/config => support/kconfig}/lkc_proto.h (100%)
 rename {package/config => support/kconfig}/lxdialog/.gitignore (100%)
 rename {package/config => support/kconfig}/lxdialog/BIG.FAT.WARNING (100%)
 rename {package/config => support/kconfig}/lxdialog/check-lxdialog.sh (100%)
 rename {package/config => support/kconfig}/lxdialog/checklist.c (100%)
 rename {package/config => support/kconfig}/lxdialog/dialog.h (100%)
 rename {package/config => support/kconfig}/lxdialog/inputbox.c (100%)
 rename {package/config => support/kconfig}/lxdialog/menubox.c (100%)
 rename {package/config => support/kconfig}/lxdialog/textbox.c (100%)
 rename {package/config => support/kconfig}/lxdialog/util.c (100%)
 rename {package/config => support/kconfig}/lxdialog/yesno.c (100%)
 rename {package/config => support/kconfig}/mconf.c (100%)
 rename {package/config => support/kconfig}/menu.c (100%)
 rename {package/config => support/kconfig}/nconf.c (100%)
 rename {package/config => support/kconfig}/nconf.gui.c (100%)
 rename {package/config => support/kconfig}/nconf.h (100%)
 rename {package/config => support/kconfig}/patches/01-kconfig-kernel-to-buildroot.patch (100%)
 rename {package/config => support/kconfig}/patches/02-cpp-comments-to-c-comments.patch (100%)
 rename {package/config => support/kconfig}/patches/03-change-config-option-prefix.patch (100%)
 rename {package/config => support/kconfig}/patches/05-really-clean-everything.patch (100%)
 rename {package/config => support/kconfig}/patches/06-br-build-system-integration.patch (100%)
 rename {package/config => support/kconfig}/patches/08-make-write-deps.patch (96%)
 rename {package/config => support/kconfig}/patches/09-implement-kconfig-probability.patch (100%)
 rename {package/config => support/kconfig}/patches/10-br-build-system.patch (100%)
 rename {package/config => support/kconfig}/patches/11-use-mktemp-for-lxdialog.patch (100%)
 rename {package/config => support/kconfig}/patches/12-fix-glade-file-path.patch (73%)
 rename {package/config => support/kconfig}/patches/14-support-out-of-tree-config.patch (100%)
 rename {package/config => support/kconfig}/patches/series (100%)
 rename {package/config => support/kconfig}/qconf.cc (100%)
 rename {package/config => support/kconfig}/qconf.h (100%)
 rename {package/config => support/kconfig}/streamline_config.pl (100%)
 rename {package/config => support/kconfig}/symbol.c (100%)
 rename {package/config => support/kconfig}/util.c (99%)
 rename {package/config => support/kconfig}/zconf.gperf (100%)
 rename {package/config => support/kconfig}/zconf.hash.c_shipped (100%)
 rename {package/config => support/kconfig}/zconf.l (100%)
 rename {package/config => support/kconfig}/zconf.tab.c_shipped (100%)
 rename {package/config => support/kconfig}/zconf.y (100%)

diff --git a/Makefile b/Makefile
index 8fdc9eb0fe..9d8d169243 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ export BR2_VERSION:=2011.11-git
 # absolute path
 TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
-CONFIG=package/config
+CONFIG=support/kconfig
 DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
diff --git a/package/config/.gitignore b/support/kconfig/.gitignore
similarity index 100%
rename from package/config/.gitignore
rename to support/kconfig/.gitignore
diff --git a/package/config/Makefile b/support/kconfig/Makefile
similarity index 100%
rename from package/config/Makefile
rename to support/kconfig/Makefile
diff --git a/package/config/Makefile.br b/support/kconfig/Makefile.br
similarity index 100%
rename from package/config/Makefile.br
rename to support/kconfig/Makefile.br
diff --git a/package/config/POTFILES.in b/support/kconfig/POTFILES.in
similarity index 100%
rename from package/config/POTFILES.in
rename to support/kconfig/POTFILES.in
diff --git a/package/config/README.buildroot2 b/support/kconfig/README.buildroot2
similarity index 58%
rename from package/config/README.buildroot2
rename to support/kconfig/README.buildroot2
index 8ff0d095bd..b92ec1427b 100644
--- a/package/config/README.buildroot2
+++ b/support/kconfig/README.buildroot2
@@ -1,15 +1,15 @@
-This is a copy of the kconfig code in the kernel (currently 2.6.36-rc1) tweaked
+This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked
 to suit Buildroot.
 
 To update:
-	cp -r /usr/src/linux/scripts/kconfig package/config.new
-	cd package/config.new
-	cp -a ../config/patches ../config/README.buildroot2 .
+	cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
+	cd support/config.new
+	cp -a ../kconfig/patches ../kconfig/README.buildroot2 .
 	quilt push -a
 	# Fix any conflict
 	cd ..
 	rm -rf config
-	mv config.new config
+	mv kconfig.new kconfig
 
 Then verify the toplevel targets work:
 	config
diff --git a/package/config/check.sh b/support/kconfig/check.sh
similarity index 100%
rename from package/config/check.sh
rename to support/kconfig/check.sh
diff --git a/package/config/conf.c b/support/kconfig/conf.c
similarity index 100%
rename from package/config/conf.c
rename to support/kconfig/conf.c
diff --git a/package/config/confdata.c b/support/kconfig/confdata.c
similarity index 100%
rename from package/config/confdata.c
rename to support/kconfig/confdata.c
diff --git a/package/config/expr.c b/support/kconfig/expr.c
similarity index 100%
rename from package/config/expr.c
rename to support/kconfig/expr.c
diff --git a/package/config/expr.h b/support/kconfig/expr.h
similarity index 100%
rename from package/config/expr.h
rename to support/kconfig/expr.h
diff --git a/package/config/foo.h b/support/kconfig/foo.h
similarity index 100%
rename from package/config/foo.h
rename to support/kconfig/foo.h
diff --git a/package/config/gconf.c b/support/kconfig/gconf.c
similarity index 99%
rename from package/config/gconf.c
rename to support/kconfig/gconf.c
index 21185a0cbd..f9daf987d9 100644
--- a/package/config/gconf.c
+++ b/support/kconfig/gconf.c
@@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
 	/* Determine GUI path */
 	env = getenv(SRCTREE);
 	if (env)
-		glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL);
+		glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
 	else if (av[0][0] == '/')
 		glade_file = g_strconcat(av[0], ".glade", NULL);
 	else
diff --git a/package/config/gconf.glade b/support/kconfig/gconf.glade
similarity index 100%
rename from package/config/gconf.glade
rename to support/kconfig/gconf.glade
diff --git a/package/config/images.c b/support/kconfig/images.c
similarity index 100%
rename from package/config/images.c
rename to support/kconfig/images.c
diff --git a/package/config/kconfig_load.c b/support/kconfig/kconfig_load.c
similarity index 100%
rename from package/config/kconfig_load.c
rename to support/kconfig/kconfig_load.c
diff --git a/package/config/kxgettext.c b/support/kconfig/kxgettext.c
similarity index 100%
rename from package/config/kxgettext.c
rename to support/kconfig/kxgettext.c
diff --git a/package/config/lex.zconf.c_shipped b/support/kconfig/lex.zconf.c_shipped
similarity index 100%
rename from package/config/lex.zconf.c_shipped
rename to support/kconfig/lex.zconf.c_shipped
diff --git a/package/config/lkc.h b/support/kconfig/lkc.h
similarity index 100%
rename from package/config/lkc.h
rename to support/kconfig/lkc.h
diff --git a/package/config/lkc_proto.h b/support/kconfig/lkc_proto.h
similarity index 100%
rename from package/config/lkc_proto.h
rename to support/kconfig/lkc_proto.h
diff --git a/package/config/lxdialog/.gitignore b/support/kconfig/lxdialog/.gitignore
similarity index 100%
rename from package/config/lxdialog/.gitignore
rename to support/kconfig/lxdialog/.gitignore
diff --git a/package/config/lxdialog/BIG.FAT.WARNING b/support/kconfig/lxdialog/BIG.FAT.WARNING
similarity index 100%
rename from package/config/lxdialog/BIG.FAT.WARNING
rename to support/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/package/config/lxdialog/check-lxdialog.sh b/support/kconfig/lxdialog/check-lxdialog.sh
similarity index 100%
rename from package/config/lxdialog/check-lxdialog.sh
rename to support/kconfig/lxdialog/check-lxdialog.sh
diff --git a/package/config/lxdialog/checklist.c b/support/kconfig/lxdialog/checklist.c
similarity index 100%
rename from package/config/lxdialog/checklist.c
rename to support/kconfig/lxdialog/checklist.c
diff --git a/package/config/lxdialog/dialog.h b/support/kconfig/lxdialog/dialog.h
similarity index 100%
rename from package/config/lxdialog/dialog.h
rename to support/kconfig/lxdialog/dialog.h
diff --git a/package/config/lxdialog/inputbox.c b/support/kconfig/lxdialog/inputbox.c
similarity index 100%
rename from package/config/lxdialog/inputbox.c
rename to support/kconfig/lxdialog/inputbox.c
diff --git a/package/config/lxdialog/menubox.c b/support/kconfig/lxdialog/menubox.c
similarity index 100%
rename from package/config/lxdialog/menubox.c
rename to support/kconfig/lxdialog/menubox.c
diff --git a/package/config/lxdialog/textbox.c b/support/kconfig/lxdialog/textbox.c
similarity index 100%
rename from package/config/lxdialog/textbox.c
rename to support/kconfig/lxdialog/textbox.c
diff --git a/package/config/lxdialog/util.c b/support/kconfig/lxdialog/util.c
similarity index 100%
rename from package/config/lxdialog/util.c
rename to support/kconfig/lxdialog/util.c
diff --git a/package/config/lxdialog/yesno.c b/support/kconfig/lxdialog/yesno.c
similarity index 100%
rename from package/config/lxdialog/yesno.c
rename to support/kconfig/lxdialog/yesno.c
diff --git a/package/config/mconf.c b/support/kconfig/mconf.c
similarity index 100%
rename from package/config/mconf.c
rename to support/kconfig/mconf.c
diff --git a/package/config/menu.c b/support/kconfig/menu.c
similarity index 100%
rename from package/config/menu.c
rename to support/kconfig/menu.c
diff --git a/package/config/nconf.c b/support/kconfig/nconf.c
similarity index 100%
rename from package/config/nconf.c
rename to support/kconfig/nconf.c
diff --git a/package/config/nconf.gui.c b/support/kconfig/nconf.gui.c
similarity index 100%
rename from package/config/nconf.gui.c
rename to support/kconfig/nconf.gui.c
diff --git a/package/config/nconf.h b/support/kconfig/nconf.h
similarity index 100%
rename from package/config/nconf.h
rename to support/kconfig/nconf.h
diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
similarity index 100%
rename from package/config/patches/01-kconfig-kernel-to-buildroot.patch
rename to support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
diff --git a/package/config/patches/02-cpp-comments-to-c-comments.patch b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
similarity index 100%
rename from package/config/patches/02-cpp-comments-to-c-comments.patch
rename to support/kconfig/patches/02-cpp-comments-to-c-comments.patch
diff --git a/package/config/patches/03-change-config-option-prefix.patch b/support/kconfig/patches/03-change-config-option-prefix.patch
similarity index 100%
rename from package/config/patches/03-change-config-option-prefix.patch
rename to support/kconfig/patches/03-change-config-option-prefix.patch
diff --git a/package/config/patches/05-really-clean-everything.patch b/support/kconfig/patches/05-really-clean-everything.patch
similarity index 100%
rename from package/config/patches/05-really-clean-everything.patch
rename to support/kconfig/patches/05-really-clean-everything.patch
diff --git a/package/config/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.patch
similarity index 100%
rename from package/config/patches/06-br-build-system-integration.patch
rename to support/kconfig/patches/06-br-build-system-integration.patch
diff --git a/package/config/patches/08-make-write-deps.patch b/support/kconfig/patches/08-make-write-deps.patch
similarity index 96%
rename from package/config/patches/08-make-write-deps.patch
rename to support/kconfig/patches/08-make-write-deps.patch
index b69daad6ed..e5a21c3861 100644
--- a/package/config/patches/08-make-write-deps.patch
+++ b/support/kconfig/patches/08-make-write-deps.patch
@@ -2,10 +2,10 @@
  util.c |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 116 insertions(+), 1 deletion(-)
 
-Index: config/util.c
+Index: kconfig/util.c
 ===================================================================
---- config.orig/util.c
-+++ config/util.c
+--- kconfig.orig/util.c
++++ kconfig/util.c
 @@ -29,6 +29,121 @@
  	return file;
  }
@@ -60,7 +60,7 @@ Index: config/util.c
 +	if (!out)
 +		return 1;
 +	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-+		"# See package/config/util.c write_make_deps()\n#\n");
++		"# See support/kconfig/util.c write_make_deps()\n#\n");
 +	menu = &rootmenu;//rootmenu.list;
 +	while (menu) {
 +		sym = menu->sym;
diff --git a/package/config/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
similarity index 100%
rename from package/config/patches/09-implement-kconfig-probability.patch
rename to support/kconfig/patches/09-implement-kconfig-probability.patch
diff --git a/package/config/patches/10-br-build-system.patch b/support/kconfig/patches/10-br-build-system.patch
similarity index 100%
rename from package/config/patches/10-br-build-system.patch
rename to support/kconfig/patches/10-br-build-system.patch
diff --git a/package/config/patches/11-use-mktemp-for-lxdialog.patch b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
similarity index 100%
rename from package/config/patches/11-use-mktemp-for-lxdialog.patch
rename to support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
diff --git a/package/config/patches/12-fix-glade-file-path.patch b/support/kconfig/patches/12-fix-glade-file-path.patch
similarity index 73%
rename from package/config/patches/12-fix-glade-file-path.patch
rename to support/kconfig/patches/12-fix-glade-file-path.patch
index 5b080c94bb..681dce160d 100644
--- a/package/config/patches/12-fix-glade-file-path.patch
+++ b/support/kconfig/patches/12-fix-glade-file-path.patch
@@ -2,16 +2,16 @@
  gconf.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: config/gconf.c
+Index: kconfig/gconf.c
 ===================================================================
---- config.orig/gconf.c
-+++ config/gconf.c
+--- kconfig.orig/gconf.c
++++ kconfig/gconf.c
 @@ -1521,7 +1521,7 @@
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
  	if (env)
 -		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
-+		glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL);
++		glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
  	else if (av[0][0] == '/')
  		glade_file = g_strconcat(av[0], ".glade", NULL);
  	else
diff --git a/package/config/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
similarity index 100%
rename from package/config/patches/14-support-out-of-tree-config.patch
rename to support/kconfig/patches/14-support-out-of-tree-config.patch
diff --git a/package/config/patches/series b/support/kconfig/patches/series
similarity index 100%
rename from package/config/patches/series
rename to support/kconfig/patches/series
diff --git a/package/config/qconf.cc b/support/kconfig/qconf.cc
similarity index 100%
rename from package/config/qconf.cc
rename to support/kconfig/qconf.cc
diff --git a/package/config/qconf.h b/support/kconfig/qconf.h
similarity index 100%
rename from package/config/qconf.h
rename to support/kconfig/qconf.h
diff --git a/package/config/streamline_config.pl b/support/kconfig/streamline_config.pl
similarity index 100%
rename from package/config/streamline_config.pl
rename to support/kconfig/streamline_config.pl
diff --git a/package/config/symbol.c b/support/kconfig/symbol.c
similarity index 100%
rename from package/config/symbol.c
rename to support/kconfig/symbol.c
diff --git a/package/config/util.c b/support/kconfig/util.c
similarity index 99%
rename from package/config/util.c
rename to support/kconfig/util.c
index f962cef311..8a5efaa172 100644
--- a/package/config/util.c
+++ b/support/kconfig/util.c
@@ -79,7 +79,7 @@ static int write_make_deps(const char *name)
 	if (!out)
 		return 1;
 	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-		"# See package/config/util.c write_make_deps()\n#\n");
+		"# See support/kconfig/util.c write_make_deps()\n#\n");
 	menu = &rootmenu;//rootmenu.list;
 	while (menu) {
 		sym = menu->sym;
diff --git a/package/config/zconf.gperf b/support/kconfig/zconf.gperf
similarity index 100%
rename from package/config/zconf.gperf
rename to support/kconfig/zconf.gperf
diff --git a/package/config/zconf.hash.c_shipped b/support/kconfig/zconf.hash.c_shipped
similarity index 100%
rename from package/config/zconf.hash.c_shipped
rename to support/kconfig/zconf.hash.c_shipped
diff --git a/package/config/zconf.l b/support/kconfig/zconf.l
similarity index 100%
rename from package/config/zconf.l
rename to support/kconfig/zconf.l
diff --git a/package/config/zconf.tab.c_shipped b/support/kconfig/zconf.tab.c_shipped
similarity index 100%
rename from package/config/zconf.tab.c_shipped
rename to support/kconfig/zconf.tab.c_shipped
diff --git a/package/config/zconf.y b/support/kconfig/zconf.y
similarity index 100%
rename from package/config/zconf.y
rename to support/kconfig/zconf.y

From 102a93bdca09742c99e110f144bf0c9267bbdd14 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Aug 2011 23:35:06 +0200
Subject: [PATCH 0659/6849] support: move package/gnuconfig to
 support/gnuconfig

The CONFIG_UPDATE macro is no longer defined in
package/gnuconfig/gnuconfig.mk, but instead in
package/Makefile.autotools.in. It it also changed a little bit to take
the directory of the package sources as argument, and the AUTOTARGETS
infrastructure is updated to use this macro.

[Peter: drop echo in CONFIG_UPDATE]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                      |  2 +-
 package/Makefile.autotools.in                 | 23 +++++++++++++----
 package/cups/cups.mk                          |  2 +-
 package/gettext/gettext.mk                    |  3 +--
 package/gnuconfig/README.buildroot            | 20 ---------------
 package/gnuconfig/gnuconfig.mk                |  3 ---
 package/lmbench/lmbench.mk                    |  2 +-
 {package => support}/gnuconfig/.cvsignore     |  0
 support/gnuconfig/README.buildroot            | 25 +++++++++++++++++++
 {package => support}/gnuconfig/config.guess   |  0
 {package => support}/gnuconfig/config.sub     |  0
 .../patches/config.guess.uclibc.patch         |  0
 .../gnuconfig/patches/config.sub.ps2.patch    |  0
 support/scripts/pkg-stats                     |  1 -
 toolchain/elf2flt/elf2flt.mk                  |  2 +-
 toolchain/gcc/gcc-uclibc-4.x.mk               |  2 +-
 toolchain/gdb/gdb.mk                          |  2 +-
 17 files changed, 50 insertions(+), 37 deletions(-)
 delete mode 100644 package/gnuconfig/README.buildroot
 delete mode 100644 package/gnuconfig/gnuconfig.mk
 rename {package => support}/gnuconfig/.cvsignore (100%)
 create mode 100644 support/gnuconfig/README.buildroot
 rename {package => support}/gnuconfig/config.guess (100%)
 rename {package => support}/gnuconfig/config.sub (100%)
 rename {package => support}/gnuconfig/patches/config.guess.uclibc.patch (100%)
 rename {package => support}/gnuconfig/patches/config.sub.ps2.patch (100%)

diff --git a/Makefile b/Makefile
index 9d8d169243..a20d3e2a89 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ unexport CFLAGS
 unexport CXXFLAGS
 unexport GREP_OPTIONS
 
-GNU_HOST_NAME:=$(shell package/gnuconfig/config.guess)
+GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 
 #############################################################
 #
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 12c503827b..13947873a0 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -22,6 +22,22 @@
 #
 ################################################################################
 
+
+#
+# Utility function to upgrade config.sub and config.guess files
+#
+# argument 1 : directory into which config.guess and config.sub need
+# to be updated. Note that config.sub and config.guess are searched
+# recursively in this directory.
+#
+define CONFIG_UPDATE
+	for file in config.guess config.sub; do \
+		for i in $$(find $(1) -name $$file); do \
+			cp support/gnuconfig/$$file $$i; \
+		done; \
+	done
+endef
+
 ################################################################################
 # AUTOTARGETS_INNER -- defines how the configuration, compilation and
 # installation of an autotools package should be done, implements a
@@ -132,11 +148,8 @@ endif
 # Hook to update config.sub and config.guess if needed
 #
 define UPDATE_CONFIG_HOOK
-	for file in config.guess config.sub; do \
-		for i in $$$$(find $$(@D) -name $$$$file); do \
-			cp package/gnuconfig/$$$$file $$$$i; \
-		done; \
-	done
+       @$$(call MESSAGE, "Updating config.sub and config.guess")
+       $$(call CONFIG_UPDATE,$$(@D))
 endef
 
 $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 3b9f2e0d3c..4e8db71aa9 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -70,7 +70,7 @@ $(DL_DIR)/$(CUPS_SOURCE):
 $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
 	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	support/scripts/apply-patches.sh $(CUPS_DIR) package/cups/ \*.patch
-	$(CONFIG_UPDATE) $(CUPS_DIR)
+	$(call CONFIG_UPDATE,$(CUPS_DIR))
 	touch $@
 
 $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 332a2ca630..f4c8c7671c 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -25,8 +25,7 @@ gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
 $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
 	$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	support/scripts/apply-patches.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
-	$(CONFIG_UPDATE) $(@D)
-	$(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y)
diff --git a/package/gnuconfig/README.buildroot b/package/gnuconfig/README.buildroot
deleted file mode 100644
index fd43a68c87..0000000000
--- a/package/gnuconfig/README.buildroot
+++ /dev/null
@@ -1,20 +0,0 @@
---- ABOUT ---
-This isnt a real package, it just exists to easily update the
-config.sub / config.guess files in packages to the latest version
-(since many bundled ones don't support the latest possible targets)
-
---- HOWTO ---
-To use, just add this to your unpack rule in the package.mk:
-$(CONFIG_UPDATE) $(PACKAGE_DIR)/
-
---- UPDATE ---
-GNU config is now managed in git, so to update:
-
-# git clone git://git.savannah.gnu.org/config.git
-# cp config/config.* .
-# for p in $(ls patches/*.patch); do patch -p0 < $p; done
-# rm -rf config
-
-A few local customizations are used to support uClibc so you may
-have to make sure they're still needed.  The patches are broken 
-out in the patches/ dir to keep things simple.
diff --git a/package/gnuconfig/gnuconfig.mk b/package/gnuconfig/gnuconfig.mk
deleted file mode 100644
index b6aa5fc7de..0000000000
--- a/package/gnuconfig/gnuconfig.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# See README.buildroot
-gnuconfig-source:
-CONFIG_UPDATE = cp -f package/gnuconfig/config.sub package/gnuconfig/config.guess
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index fefb34f06a..535fc8c357 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -8,7 +8,7 @@ LMBENCH_SOURCE:=lmbench-$(LMBENCH_VERSION).tgz
 LMBENCH_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lmbench/development/lmbench-3.0-a9/
 
 define LMBENCH_CONFIGURE_CMDS
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile
 	sed -i '/cd .*doc/d' $(@D)/src/Makefile
 	sed -i '/include/d' $(@D)/src/Makefile
diff --git a/package/gnuconfig/.cvsignore b/support/gnuconfig/.cvsignore
similarity index 100%
rename from package/gnuconfig/.cvsignore
rename to support/gnuconfig/.cvsignore
diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot
new file mode 100644
index 0000000000..d655d6211f
--- /dev/null
+++ b/support/gnuconfig/README.buildroot
@@ -0,0 +1,25 @@
+--- HOWTO ---
+If your package uses config.guess and/or config.sub, then it probably
+relies on the autotools as its build system. In this case, you should
+use the AUTOTARGETS infrastructure, which will take care of updating
+the config.guess and/or config.sub files appropriately. See the
+Buildroot documentation for details about the AUTOTARGETS
+infrastructure.
+
+If for some reason your package does not use the AUTOTARGETS
+infrastructure, you can request the config.guess and/or config.sub
+files of your package to be updated by using:
+
+      $(call CONFIG_UPDATE,directory-of-your-package-sources)
+
+--- UPDATE ---
+GNU config is now managed in git, so to update:
+
+# git clone git://git.savannah.gnu.org/config.git
+# cp config/config.* .
+# for p in $(ls patches/*.patch); do patch -p0 < $p; done
+# rm -rf config
+
+A few local customizations are used to support uClibc so you may
+have to make sure they're still needed.  The patches are broken
+out in the patches/ dir to keep things simple.
diff --git a/package/gnuconfig/config.guess b/support/gnuconfig/config.guess
similarity index 100%
rename from package/gnuconfig/config.guess
rename to support/gnuconfig/config.guess
diff --git a/package/gnuconfig/config.sub b/support/gnuconfig/config.sub
similarity index 100%
rename from package/gnuconfig/config.sub
rename to support/gnuconfig/config.sub
diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/support/gnuconfig/patches/config.guess.uclibc.patch
similarity index 100%
rename from package/gnuconfig/patches/config.guess.uclibc.patch
rename to support/gnuconfig/patches/config.guess.uclibc.patch
diff --git a/package/gnuconfig/patches/config.sub.ps2.patch b/support/gnuconfig/patches/config.sub.ps2.patch
similarity index 100%
rename from package/gnuconfig/patches/config.sub.ps2.patch
rename to support/gnuconfig/patches/config.sub.ps2.patch
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 7bb292830b..bb1c27d87a 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -81,7 +81,6 @@ for i in $(find package/ -name '*.mk') ; do
 	$i = "package/games/games.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \
 	$i = "package/customize/customize.mk" -o \
-	$i = "package/gnuconfig/gnuconfig.mk" -o \
 	$i = "package/matchbox/matchbox.mk" -o \
 	$i = "package/x11r7/x11r7.mk" ; then
 	echo "skipping $i" 1>&2
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 7fecf3ea8b..e74a6553bf 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -14,7 +14,7 @@ $(ELF2FLT_DIR)/.unpacked:
 	touch $@
 
 $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 9232290995..a2253c9fa2 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -200,7 +200,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	mkdir -p $(TOOLCHAIN_DIR)
 	rm -rf $(GCC_DIR)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 gcc-patched: $(GCC_DIR)/.patched
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index db46b12869..4622616787 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -38,7 +38,7 @@ endif
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
 endif
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 gdb-patched: $(GDB_DIR)/.unpacked

From cbdb0a09224400c97632fa58e1a33d5901ff8f69 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Sep 2011 14:03:33 +0200
Subject: [PATCH 0660/6849] tslib: drop redundant configure options

And cleanup while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 23c1f5bac4..a65e72e9e9 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -3,15 +3,10 @@
 # tslib
 #
 #############################################################
-TSLIB_VERSION:=412d99d8b92c
-TSLIB_SITE:=git://github.com/kergoth/tslib.git
+TSLIB_VERSION = 412d99d8b92c
+TSLIB_SITE = git://github.com/kergoth/tslib.git
 TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
-TSLIB_INSTALL_TARGET = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
-TSLIB_CONF_OPT = \
-	--prefix=/usr	\
-	--sysconfdir=/etc
-
 $(eval $(call AUTOTARGETS,package,tslib))

From 16d6e9b3420e78a89960b8b68202ea46a618810d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Sep 2011 14:16:42 +0200
Subject: [PATCH 0661/6849] Makefile.autotools.in: fix autoreconf libtool
 patching after libtool move

Commit 20f8a7dec6fc (support: move libtool patches in support/libtool)
missed the autoreconf variant of the libtool patching, breaking the build
for packages needing both autoreconf and libtool patching.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 13947873a0..4cd63a36e8 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -190,11 +190,11 @@ define AUTORECONF_HOOK
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
 			if test $$$${ltmain_version} = "1.5"; then \
-				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi

From a21642c7eb06eeffe621e7eaef1a85cb9b4589f8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 18 Sep 2011 18:05:22 +0200
Subject: [PATCH 0662/6849] python: fix build by adding some more patches

The removal of -L flags from TARGET_LDFLAGS in
7e3e8ec040b06d6e2fb69e55c004f1ebc02c76d0 has trigerred some more
issues with Python, requiring some more hacky fixes.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-2.7-004-no-host-headers-libs.patch | 22 +++--
 .../python-2.7-014-verbose-module-build.patch | 19 +++++
 ...-distutils-cross-compilation-support.patch | 84 +++++++++++++++++++
 3 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 package/python/python-2.7-014-verbose-module-build.patch
 create mode 100644 package/python/python-2.7-015-distutils-cross-compilation-support.patch

diff --git a/package/python/python-2.7-004-no-host-headers-libs.patch b/package/python/python-2.7-004-no-host-headers-libs.patch
index 033776d465..aed8de6c87 100644
--- a/package/python/python-2.7-004-no-host-headers-libs.patch
+++ b/package/python/python-2.7-004-no-host-headers-libs.patch
@@ -26,7 +26,19 @@ Index: Python-2.7.1/setup.py
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -388,17 +389,6 @@
+@@ -360,10 +361,7 @@
+         # directly since an inconsistently reproducible issue comes up where
+         # the environment variable is not set even though the value were passed
+         # into configure and stored in the Makefile (issue found on OS X 10.3).
+-        for env_var, arg_name, dir_list in (
+-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
+-                ('LDFLAGS', '-L', self.compiler.library_dirs),
+-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
++        for env_var, arg_name, dir_list in ():
+             env_val = sysconfig.get_config_var(env_var)
+             if env_val:
+                 # To prevent optparse from raising an exception about any
+@@ -388,17 +386,6 @@
                      for directory in reversed(options.dirs):
                          add_dir_to_list(dir_list, directory)
  
@@ -44,7 +56,7 @@ Index: Python-2.7.1/setup.py
          try:
              have_unicode = unicode
          except NameError:
-@@ -407,11 +397,16 @@
+@@ -407,11 +394,16 @@
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
@@ -66,7 +78,7 @@ Index: Python-2.7.1/setup.py
          exts = []
          missing = []
  
-@@ -844,6 +839,9 @@
+@@ -844,6 +836,9 @@
              db_inc_paths.append('/pkg/db-3.%d/include' % x)
              db_inc_paths.append('/opt/db-3.%d/include' % x)
  
@@ -76,7 +88,7 @@ Index: Python-2.7.1/setup.py
          # Add some common subdirectories for Sleepycat DB to the list,
          # based on the standard include directories. This way DB3/4 gets
          # picked up when it is installed in a non-standard prefix and
-@@ -996,6 +994,9 @@
+@@ -996,6 +991,9 @@
          MIN_SQLITE_VERSION = ".".join([str(x)
                                      for x in MIN_SQLITE_VERSION_NUMBER])
  
@@ -86,7 +98,7 @@ Index: Python-2.7.1/setup.py
          # Scan the default include directories before the SQLite specific
          # ones. This allows one to override the copy of sqlite on OSX,
          # where /usr/include contains an old version of sqlite.
-@@ -1095,6 +1096,8 @@
+@@ -1095,6 +1093,8 @@
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
          f = "/usr/include/db.h"
diff --git a/package/python/python-2.7-014-verbose-module-build.patch b/package/python/python-2.7-014-verbose-module-build.patch
new file mode 100644
index 0000000000..a5be60f2a3
--- /dev/null
+++ b/package/python/python-2.7-014-verbose-module-build.patch
@@ -0,0 +1,19 @@
+Enables verbose output when building modules
+
+Patch borrowed from OpenBricks.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: Python-2.7.1/Makefile.pre.in
+===================================================================
+--- Python-2.7.1.orig/Makefile.pre.in
++++ Python-2.7.1/Makefile.pre.in
+@@ -408,7 +408,7 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ 	@case $$MAKEFLAGS in \
+-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py -q build;; \
++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
+ 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
+ 	esac
+ 
diff --git a/package/python/python-2.7-015-distutils-cross-compilation-support.patch b/package/python/python-2.7-015-distutils-cross-compilation-support.patch
new file mode 100644
index 0000000000..16cfd7f5a2
--- /dev/null
+++ b/package/python/python-2.7-015-distutils-cross-compilation-support.patch
@@ -0,0 +1,84 @@
+Add some cross-compilation fixes to distutils
+
+Inspired by work done by Marc Kleine-Budde <mkl@pengutronix.de> in
+PTXdist.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Lib/distutils/sysconfig.py |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+Index: Python-2.7.1/Lib/distutils/sysconfig.py
+===================================================================
+--- Python-2.7.1.orig/Lib/distutils/sysconfig.py
++++ Python-2.7.1/Lib/distutils/sysconfig.py
+@@ -19,13 +19,22 @@
+ from distutils.errors import DistutilsPlatformError
+ 
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++EXECUTABLE_DIRNAME = os.path.dirname(os.path.realpath(sys.executable))
++if os.environ.get('CROSS_COMPILING') == 'yes':
++    _sysroot=os.environ.get('_python_sysroot')
++    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
++    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
++    if '_python_srcdir' in os.environ:
++        EXECUTABLE_DIRNAME = os.path.normpath(os.environ['_python_srcdir'])
++else:
++    PREFIX = os.path.normpath(sys.prefix)
++    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++
+ 
+ # Path to the base directory of the project. On Windows the binary may
+ # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+ # it'll live in project/PCbuild/amd64.
+-project_base = os.path.dirname(os.path.abspath(sys.executable))
++project_base = EXECUTABLE_DIRNAME
+ if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
+     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+ # PC/VS7.1
+@@ -74,7 +83,7 @@
+ 
+     if os.name == "posix":
+         if python_build:
+-            buildir = os.path.dirname(sys.executable)
++            buildir = EXECUTABLE_DIRNAME
+             if plat_specific:
+                 # python.h is located in the buildir
+                 inc_dir = buildir
+@@ -206,7 +215,7 @@
+ def get_makefile_filename():
+     """Return full pathname of installed Makefile from the Python build."""
+     if python_build:
+-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
++        return os.path.join(EXECUTABLE_DIRNAME, "Makefile")
+     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+     return os.path.join(lib_dir, "config", "Makefile")
+ 
+Index: Python-2.7.1/configure.in
+===================================================================
+--- Python-2.7.1.orig/configure.in
++++ Python-2.7.1/configure.in
+@@ -4424,6 +4424,21 @@
+ CROSS_COMPILING=$cross_compiling
+ AC_SUBST(CROSS_COMPILING)
+ 
++#
++# Cross compiling
++#
++# special RUNSHARED
++if test "$cross_compiling" = "yes"; then
++    RUNSHARED="\
++               CROSS_COMPILING=yes \
++               _python_cross_host=${ac_cv_host} \
++               _python_sysroot=\"\$(sysroot)\" \
++               _python_srcdir=\"\$(srcdir)\" \
++               _python_prefix=\"\$(prefix)\" \
++               _python_exec_prefix=\"\$(exec_prefix)\""
++fi
++
++
+ # generate output files
+ AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])

From 2455c89bab315c0b6842198f16777585029e364f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 18 Sep 2011 18:05:23 +0200
Subject: [PATCH 0663/6849] python: bump to 2.7.2

This is mostly a mechanical bump, with a refresh of all the patches to
accomodate the offsets, and some minor conflict resolution.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-2.7-001-support-for-build.patch    | 43 ++++++++-------
 ...ython-2.7-002-cross-compile-variable.patch | 18 +++---
 ...7-003-no-import-when-cross-compiling.patch |  6 +-
 .../python-2.7-004-no-host-headers-libs.patch | 22 ++++----
 .../python-2.7-005-staging-headers-libs.patch | 10 ++--
 .../python-2.7-006-disable-extensions.patch   | 26 ++++-----
 ...on-2.7-007-do-not-generate-pyo-files.patch |  8 +--
 .../python-2.7-008-reread-environment.patch   | 16 +++---
 .../python-2.7-009-python-symlink.patch       |  8 +--
 ...n-2.7-010-change-pyconfig-h-location.patch | 24 ++++----
 package/python/python-2.7-011-no-rpath.patch  | 14 ++---
 ...on-2.7-012-correct-32bit-64bit-check.patch | 10 ++--
 ...thon-2.7-013-fix-linux-3-compilation.patch | 22 ++++----
 .../python-2.7-014-verbose-module-build.patch |  8 +--
 ...-distutils-cross-compilation-support.patch | 14 ++---
 ...python-2.7-100-optional-test-modules.patch | 47 +++++++---------
 .../python-2.7-101-optional-pydoc.patch       | 32 +++++------
 .../python/python-2.7-102-optional-2to3.patch | 55 +++++++++----------
 .../python-2.7-103-optional-sqlite.patch      |  8 +--
 .../python/python-2.7-104-optional-tk.patch   | 35 ++++++------
 .../python-2.7-105-optional-curses.patch      | 20 +++----
 .../python-2.7-106-optional-expat.patch       | 32 +++++------
 .../python-2.7-107-optional-codecs-cjk.patch  |  8 +--
 .../python/python-2.7-108-optional-nis.patch  |  8 +--
 .../python-2.7-109-optional-unicodedata.patch |  8 +--
 .../python/python-2.7-110-optional-db.patch   | 37 +++++++------
 .../python/python-2.7-111-optional-ssl.patch  |  8 +--
 .../python-2.7-112-optional-bzip2.patch       |  8 +--
 .../python/python-2.7-113-optional-zlib.patch |  8 +--
 package/python/python.mk                      |  2 +-
 30 files changed, 279 insertions(+), 286 deletions(-)

diff --git a/package/python/python-2.7-001-support-for-build.patch b/package/python/python-2.7-001-support-for-build.patch
index 2795e65f32..b0430a4efa 100644
--- a/package/python/python-2.7-001-support-for-build.patch
+++ b/package/python/python-2.7-001-support-for-build.patch
@@ -22,11 +22,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in    |   17 +++++++++++++++++
  2 files changed, 34 insertions(+), 15 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -178,7 +178,8 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -181,7 +181,8 @@
  UNICODE_OBJS=   @UNICODE_OBJS@
  
  PYTHON=		python$(EXE)
@@ -36,7 +36,7 @@ Index: Python-2.7.1/Makefile.pre.in
  
  # The task to run while instrument when building the profile-opt target
  PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -210,7 +211,8 @@
+@@ -213,7 +214,8 @@
  
  ##########################################################################
  # Parser
@@ -46,7 +46,7 @@ Index: Python-2.7.1/Makefile.pre.in
  
  POBJS=		\
  		Parser/acceler.o \
-@@ -404,8 +406,8 @@
+@@ -407,8 +409,8 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
  	@case $$MAKEFLAGS in \
@@ -57,15 +57,16 @@ Index: Python-2.7.1/Makefile.pre.in
  	esac
  
  # Build static library
-@@ -536,12 +538,12 @@
- 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+@@ -540,13 +542,13 @@
  
- 
--$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-+$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)
+ # Use a stamp file to prevent make -j invoking pgen twice
+ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
+-Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
++Parser/pgen.stamp: $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)
  		-@$(INSTALL) -d Include
--		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		-$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 		-touch Parser/pgen.stamp
  
 -$(PGEN):	$(PGENOBJS)
 -		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
@@ -74,7 +75,7 @@ Index: Python-2.7.1/Makefile.pre.in
  
  Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
  				$(srcdir)/Include/token.h \
-@@ -921,25 +923,25 @@
+@@ -926,25 +928,25 @@
  	done
  	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
@@ -105,7 +106,7 @@ Index: Python-2.7.1/Makefile.pre.in
  
  # Create the PLATDIR source directory, if one wasn't distributed..
  $(srcdir)/Lib/$(PLATDIR):
-@@ -1044,7 +1046,7 @@
+@@ -1049,7 +1051,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -114,20 +115,20 @@ Index: Python-2.7.1/Makefile.pre.in
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-@@ -1183,7 +1185,7 @@
+@@ -1188,7 +1190,7 @@
  	find . -name '*.gc??' -exec rm -f {} ';'
  
  clobber: clean profile-removal
 -	-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
 +	-rm -f $(BUILDPYTHON) $(BUILDPGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
- 		tags TAGS \
+ 		tags TAGS Parser/pgen.stamp \
  		config.cache config.log pyconfig.h Modules/config.c
  	-rm -rf build platform
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -4291,6 +4291,23 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -4305,6 +4305,23 @@
  done
  AC_MSG_RESULT(done)
  
diff --git a/package/python/python-2.7-002-cross-compile-variable.patch b/package/python/python-2.7-002-cross-compile-variable.patch
index 04b71b0759..f91ee7122c 100644
--- a/package/python/python-2.7-002-cross-compile-variable.patch
+++ b/package/python/python-2.7-002-cross-compile-variable.patch
@@ -15,11 +15,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in    |    3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -406,8 +406,8 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -409,8 +409,8 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
  	@case $$MAKEFLAGS in \
@@ -30,7 +30,7 @@ Index: Python-2.7.1/Makefile.pre.in
  	esac
  
  # Build static library
-@@ -1046,7 +1046,7 @@
+@@ -1051,7 +1051,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -39,11 +39,11 @@ Index: Python-2.7.1/Makefile.pre.in
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -4308,6 +4308,9 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -4322,6 +4322,9 @@
  AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python])
  AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen])
  
diff --git a/package/python/python-2.7-003-no-import-when-cross-compiling.patch b/package/python/python-2.7-003-no-import-when-cross-compiling.patch
index 162ba50319..17d67024d4 100644
--- a/package/python/python-2.7-003-no-import-when-cross-compiling.patch
+++ b/package/python/python-2.7-003-no-import-when-cross-compiling.patch
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
 @@ -304,6 +304,10 @@
              self.announce('WARNING: skipping import check for Cygwin-based "%s"'
                  % ext.name)
diff --git a/package/python/python-2.7-004-no-host-headers-libs.patch b/package/python/python-2.7-004-no-host-headers-libs.patch
index aed8de6c87..c0c528aceb 100644
--- a/package/python/python-2.7-004-no-host-headers-libs.patch
+++ b/package/python/python-2.7-004-no-host-headers-libs.patch
@@ -10,23 +10,25 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py |   39 +++++++++++++++++++++------------------
  1 file changed, 21 insertions(+), 18 deletions(-)
 
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
-@@ -351,8 +351,9 @@
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
+@@ -373,9 +373,10 @@
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+-        self.add_multiarch_paths()
 +        if os.environ.get('CROSS_COMPILING') != 'yes':
 +            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++            self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -360,10 +361,7 @@
+@@ -383,10 +384,7 @@
          # directly since an inconsistently reproducible issue comes up where
          # the environment variable is not set even though the value were passed
          # into configure and stored in the Makefile (issue found on OS X 10.3).
@@ -38,7 +40,7 @@ Index: Python-2.7.1/setup.py
              env_val = sysconfig.get_config_var(env_var)
              if env_val:
                  # To prevent optparse from raising an exception about any
-@@ -388,17 +386,6 @@
+@@ -411,17 +409,6 @@
                      for directory in reversed(options.dirs):
                          add_dir_to_list(dir_list, directory)
  
@@ -56,7 +58,7 @@ Index: Python-2.7.1/setup.py
          try:
              have_unicode = unicode
          except NameError:
-@@ -407,11 +394,16 @@
+@@ -430,11 +417,16 @@
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
@@ -78,7 +80,7 @@ Index: Python-2.7.1/setup.py
          exts = []
          missing = []
  
-@@ -844,6 +836,9 @@
+@@ -867,6 +859,9 @@
              db_inc_paths.append('/pkg/db-3.%d/include' % x)
              db_inc_paths.append('/opt/db-3.%d/include' % x)
  
@@ -88,7 +90,7 @@ Index: Python-2.7.1/setup.py
          # Add some common subdirectories for Sleepycat DB to the list,
          # based on the standard include directories. This way DB3/4 gets
          # picked up when it is installed in a non-standard prefix and
-@@ -996,6 +991,9 @@
+@@ -1019,6 +1014,9 @@
          MIN_SQLITE_VERSION = ".".join([str(x)
                                      for x in MIN_SQLITE_VERSION_NUMBER])
  
@@ -98,7 +100,7 @@ Index: Python-2.7.1/setup.py
          # Scan the default include directories before the SQLite specific
          # ones. This allows one to override the copy of sqlite on OSX,
          # where /usr/include contains an old version of sqlite.
-@@ -1095,6 +1093,8 @@
+@@ -1118,6 +1116,8 @@
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
          f = "/usr/include/db.h"
diff --git a/package/python/python-2.7-005-staging-headers-libs.patch b/package/python/python-2.7-005-staging-headers-libs.patch
index 170e819709..cd378f28c1 100644
--- a/package/python/python-2.7-005-staging-headers-libs.patch
+++ b/package/python/python-2.7-005-staging-headers-libs.patch
@@ -12,12 +12,12 @@ Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>
  setup.py |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
-@@ -350,6 +350,19 @@
-         return sys.platform
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
+@@ -372,6 +372,19 @@
+             os.unlink(tmpfile)
  
      def detect_modules(self):
 +        try:
diff --git a/package/python/python-2.7-006-disable-extensions.patch b/package/python/python-2.7-006-disable-extensions.patch
index 642ebc5859..f62a50fb51 100644
--- a/package/python/python-2.7-006-disable-extensions.patch
+++ b/package/python/python-2.7-006-disable-extensions.patch
@@ -38,11 +38,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py        |    5 ++++-
  3 files changed, 11 insertions(+), 4 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -141,6 +141,8 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -144,6 +144,8 @@
  # configure script arguments
  CONFIG_ARGS=	@CONFIG_ARGS@
  
@@ -51,7 +51,7 @@ Index: Python-2.7.1/Makefile.pre.in
  
  # Subdirectories with code
  SRCDIRS= 	@SRCDIRS@
-@@ -406,8 +408,8 @@
+@@ -409,8 +411,8 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
  	@case $$MAKEFLAGS in \
@@ -62,7 +62,7 @@ Index: Python-2.7.1/Makefile.pre.in
  	esac
  
  # Build static library
-@@ -1046,7 +1048,7 @@
+@@ -1051,7 +1053,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -71,11 +71,11 @@ Index: Python-2.7.1/Makefile.pre.in
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2084,6 +2084,8 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2098,6 +2098,8 @@
  
  AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
  
@@ -84,10 +84,10 @@ Index: Python-2.7.1/configure.in
  # Check for use of the system expat library
  AC_MSG_CHECKING(for --with-system-expat)
  AC_ARG_WITH(system_expat,
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
 @@ -21,7 +21,10 @@
  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
  
diff --git a/package/python/python-2.7-007-do-not-generate-pyo-files.patch b/package/python/python-2.7-007-do-not-generate-pyo-files.patch
index 2cb90cc056..4ae5ef5d6a 100644
--- a/package/python/python-2.7-007-do-not-generate-pyo-files.patch
+++ b/package/python/python-2.7-007-do-not-generate-pyo-files.patch
@@ -13,11 +13,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  Makefile.pre.in |    9 ---------
  1 file changed, 9 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -929,20 +929,11 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -934,20 +934,11 @@
  		-d $(LIBDEST) -f \
  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
  		$(DESTDIR)$(LIBDEST)
diff --git a/package/python/python-2.7-008-reread-environment.patch b/package/python/python-2.7-008-reread-environment.patch
index e36d0cf11d..4ca22a4c9a 100644
--- a/package/python/python-2.7-008-reread-environment.patch
+++ b/package/python/python-2.7-008-reread-environment.patch
@@ -25,11 +25,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py        |    3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -408,8 +408,8 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -411,8 +411,8 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
  	@case $$MAKEFLAGS in \
@@ -40,7 +40,7 @@ Index: Python-2.7.1/Makefile.pre.in
  	esac
  
  # Build static library
-@@ -1039,7 +1039,7 @@
+@@ -1044,7 +1044,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -49,10 +49,10 @@ Index: Python-2.7.1/Makefile.pre.in
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
 @@ -20,6 +20,9 @@
  # Were we compiled --with-pydebug or with #define Py_DEBUG?
  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
diff --git a/package/python/python-2.7-009-python-symlink.patch b/package/python/python-2.7-009-python-symlink.patch
index f284dba555..1b1d0c866f 100644
--- a/package/python/python-2.7-009-python-symlink.patch
+++ b/package/python/python-2.7-009-python-symlink.patch
@@ -10,11 +10,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  Makefile.pre.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -791,7 +791,7 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -796,7 +796,7 @@
  	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
  	else true; \
  	fi
diff --git a/package/python/python-2.7-010-change-pyconfig-h-location.patch b/package/python/python-2.7-010-change-pyconfig-h-location.patch
index fddc6c8836..9b95ddb151 100644
--- a/package/python/python-2.7-010-change-pyconfig-h-location.patch
+++ b/package/python/python-2.7-010-change-pyconfig-h-location.patch
@@ -26,10 +26,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  Makefile.pre.in            |    3 ++-
  3 files changed, 5 insertions(+), 3 deletions(-)
 
-Index: Python-2.7.1/Lib/distutils/sysconfig.py
+Index: Python-2.7.2/Lib/distutils/sysconfig.py
 ===================================================================
---- Python-2.7.1.orig/Lib/distutils/sysconfig.py
-+++ Python-2.7.1/Lib/distutils/sysconfig.py
+--- Python-2.7.2.orig/Lib/distutils/sysconfig.py
++++ Python-2.7.2/Lib/distutils/sysconfig.py
 @@ -193,7 +193,8 @@
          else:
              inc_dir = project_base
@@ -40,11 +40,11 @@ Index: Python-2.7.1/Lib/distutils/sysconfig.py
      if get_python_version() < '2.2':
          config_h = 'config.h'
      else:
-Index: Python-2.7.1/Lib/sysconfig.py
+Index: Python-2.7.2/Lib/sysconfig.py
 ===================================================================
---- Python-2.7.1.orig/Lib/sysconfig.py
-+++ Python-2.7.1/Lib/sysconfig.py
-@@ -371,7 +371,7 @@
+--- Python-2.7.2.orig/Lib/sysconfig.py
++++ Python-2.7.2/Lib/sysconfig.py
+@@ -356,7 +356,7 @@
          else:
              inc_dir = _PROJECT_BASE
      else:
@@ -53,11 +53,11 @@ Index: Python-2.7.1/Lib/sysconfig.py
      return os.path.join(inc_dir, 'pyconfig.h')
  
  def get_scheme_names():
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -967,7 +967,6 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -972,7 +972,6 @@
  		echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
  		$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
  	done
@@ -65,7 +65,7 @@ Index: Python-2.7.1/Makefile.pre.in
  
  # Install the library and miscellaneous stuff needed for extending/embedding
  # This goes into $(exec_prefix)
-@@ -1001,6 +1000,8 @@
+@@ -1006,6 +1005,8 @@
  	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
  	$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
diff --git a/package/python/python-2.7-011-no-rpath.patch b/package/python/python-2.7-011-no-rpath.patch
index 700c4be8d1..3422dceaab 100644
--- a/package/python/python-2.7-011-no-rpath.patch
+++ b/package/python/python-2.7-011-no-rpath.patch
@@ -13,11 +13,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py |   21 ++++++++++++++++++---
  1 file changed, 18 insertions(+), 3 deletions(-)
 
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
-@@ -977,6 +977,12 @@
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
+@@ -997,6 +997,12 @@
                  print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
              db_incs = [db_incdir]
              dblibs = [dblib]
@@ -30,7 +30,7 @@ Index: Python-2.7.1/setup.py
              # We add the runtime_library_dirs argument because the
              # BerkeleyDB lib we're linking against often isn't in the
              # system dynamic library search path.  This is usually
-@@ -986,7 +992,7 @@
+@@ -1006,7 +1012,7 @@
              exts.append(Extension('_bsddb', ['_bsddb.c'],
                                    depends = ['bsddb.h'],
                                    library_dirs=dblib_dir,
@@ -39,7 +39,7 @@ Index: Python-2.7.1/setup.py
                                    include_dirs=db_incs,
                                    libraries=dblibs))
          else:
-@@ -1092,12 +1098,17 @@
+@@ -1112,12 +1118,17 @@
              else:
                  sqlite_extra_link_args = ()
  
@@ -58,7 +58,7 @@ Index: Python-2.7.1/setup.py
                                    extra_link_args=sqlite_extra_link_args,
                                    libraries=["sqlite3",]))
          else:
-@@ -1198,9 +1209,13 @@
+@@ -1218,9 +1229,13 @@
                  elif cand == "bdb":
                      if db_incs is not None:
                          print "building dbm using bdb"
diff --git a/package/python/python-2.7-012-correct-32bit-64bit-check.patch b/package/python/python-2.7-012-correct-32bit-64bit-check.patch
index 88006f02d8..bfccbfd292 100644
--- a/package/python/python-2.7-012-correct-32bit-64bit-check.patch
+++ b/package/python/python-2.7-012-correct-32bit-64bit-check.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py |   12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
 @@ -29,6 +29,14 @@
  except KeyError:
      disabled_module_list = list()
@@ -35,7 +35,7 @@ Index: Python-2.7.1/setup.py
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
      1) 'dir' is not already in 'dirlist'
-@@ -608,7 +616,7 @@
+@@ -628,7 +636,7 @@
          exts.append( Extension('audioop', ['audioop.c']) )
  
          # Disabled on 64-bit platforms
@@ -44,7 +44,7 @@ Index: Python-2.7.1/setup.py
              # Operations on images
              exts.append( Extension('imageop', ['imageop.c']) )
          else:
-@@ -1424,7 +1432,7 @@
+@@ -1444,7 +1452,7 @@
                  missing.append('_codecs_%s' % loc)
  
          # Dynamic loading module
diff --git a/package/python/python-2.7-013-fix-linux-3-compilation.patch b/package/python/python-2.7-013-fix-linux-3-compilation.patch
index a43ec7ee40..e834b9f172 100644
--- a/package/python/python-2.7-013-fix-linux-3-compilation.patch
+++ b/package/python/python-2.7-013-fix-linux-3-compilation.patch
@@ -1,20 +1,22 @@
-diff -r 683202530137 configure
---- a/configure	Fri Aug 12 11:40:39 2011 +0300
-+++ b/configure	Fri Aug 12 14:02:18 2011 +0200
-@@ -3055,6 +3055,7 @@ then
- 	cygwin*) MACHDEP="cygwin";;
+Index: Python-2.7.2/configure
+===================================================================
+--- Python-2.7.2.orig/configure
++++ Python-2.7.2/configure
+@@ -3007,6 +3007,7 @@
  	darwin*) MACHDEP="darwin";;
+ 	atheos*) MACHDEP="atheos";;
          irix646) MACHDEP="irix6";;
 +        linux*) MACHDEP="linux2";;
  	'')	MACHDEP="unknown";;
  	esac
  fi
-diff -r 683202530137 configure.in
---- a/configure.in	Fri Aug 12 11:40:39 2011 +0300
-+++ b/configure.in	Fri Aug 12 14:02:18 2011 +0200
-@@ -307,6 +307,7 @@ then
- 	cygwin*) MACHDEP="cygwin";;
+Index: Python-2.7.2/configure.in
+===================================================================
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -297,6 +297,7 @@
  	darwin*) MACHDEP="darwin";;
+ 	atheos*) MACHDEP="atheos";;
          irix646) MACHDEP="irix6";;
 +        linux*) MACHDEP="linux2";;
  	'')	MACHDEP="unknown";;
diff --git a/package/python/python-2.7-014-verbose-module-build.patch b/package/python/python-2.7-014-verbose-module-build.patch
index a5be60f2a3..ea81e55b8d 100644
--- a/package/python/python-2.7-014-verbose-module-build.patch
+++ b/package/python/python-2.7-014-verbose-module-build.patch
@@ -4,11 +4,11 @@ Patch borrowed from OpenBricks.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -408,7 +408,7 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -411,7 +411,7 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
  	@case $$MAKEFLAGS in \
diff --git a/package/python/python-2.7-015-distutils-cross-compilation-support.patch b/package/python/python-2.7-015-distutils-cross-compilation-support.patch
index 16cfd7f5a2..8304091429 100644
--- a/package/python/python-2.7-015-distutils-cross-compilation-support.patch
+++ b/package/python/python-2.7-015-distutils-cross-compilation-support.patch
@@ -8,10 +8,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  Lib/distutils/sysconfig.py |    7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)
 
-Index: Python-2.7.1/Lib/distutils/sysconfig.py
+Index: Python-2.7.2/Lib/distutils/sysconfig.py
 ===================================================================
---- Python-2.7.1.orig/Lib/distutils/sysconfig.py
-+++ Python-2.7.1/Lib/distutils/sysconfig.py
+--- Python-2.7.2.orig/Lib/distutils/sysconfig.py
++++ Python-2.7.2/Lib/distutils/sysconfig.py
 @@ -19,13 +19,22 @@
  from distutils.errors import DistutilsPlatformError
  
@@ -56,11 +56,11 @@ Index: Python-2.7.1/Lib/distutils/sysconfig.py
      lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
      return os.path.join(lib_dir, "config", "Makefile")
  
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -4424,6 +4424,21 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -4328,6 +4328,21 @@
  CROSS_COMPILING=$cross_compiling
  AC_SUBST(CROSS_COMPILING)
  
diff --git a/package/python/python-2.7-100-optional-test-modules.patch b/package/python/python-2.7-100-optional-test-modules.patch
index b51ea57cc6..fc49d52191 100644
--- a/package/python/python-2.7-100-optional-test-modules.patch
+++ b/package/python/python-2.7-100-optional-test-modules.patch
@@ -10,20 +10,19 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in    |    6 ++++++
  2 files changed, 33 insertions(+), 13 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -851,23 +851,37 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -856,23 +856,30 @@
  	plat-mac/lib-scriptpackages/SystemEvents \
  	plat-mac/lib-scriptpackages/Terminal 
  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
 -LIBSUBDIRS=	lib-tk lib-tk/test lib-tk/test/test_tkinter \
--                lib-tk/test/test_ttk site-packages test test/data \
--		test/decimaltestdata test/xmltestdata \
+-		lib-tk/test/test_ttk site-packages test test/data \
+-		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
 -		test/tracedmodules \
-+LIBSUBDIRS=	lib-tk \
-+                site-packages \
++LIBSUBDIRS=	lib-tk  site-packages \
  		encodings compiler hotshot \
 -		email email/mime email/test email/test/data \
 -		json json/tests \
@@ -38,8 +37,8 @@ Index: Python-2.7.1/Makefile.pre.in
 +		sqlite3 \
 +		logging bsddb csv importlib wsgiref \
 +		lib2to3 lib2to3/fixes lib2to3/pgen2 \
-+		ctypes ctypes/macholib idlelib idlelib/Icons \
-+		distutils distutils/command $(XMLLIBSUBDIRS) \
++		ctypes  ctypes/macholib idlelib idlelib/Icons \
++		distutils distutils/command  $(XMLLIBSUBDIRS) \
  		multiprocessing multiprocessing/dummy \
 -		unittest unittest/test \
 +		unittest \
@@ -47,29 +46,23 @@ Index: Python-2.7.1/Makefile.pre.in
  		curses pydoc_data $(MACHDEPS)
 +
 +ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS +=	lib-tk/test lib-tk/test/test_tkinter	\
-+	      	lib-tk/test/test_ttk test test/data	\
-+		test/decimaltestdata test/xmltestdata 	\
-+		test/tracedmodules   			\
-+		email/test email/test/data		\
-+		sqlite3/test				\
-+		bsddb/test				\
-+		lib2to3/tests				\
-+		lib2to3/tests/data			\
-+		lib2to3/tests/data/fixers		\
-+		lib2to3/tests/data/fixers/myfixes	\
-+		ctypes/test distutils/tests		\
-+		unittest/test
++LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
++		lib-tk/test/test_ttk test test/data \
++		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
++		test/tracedmodules email/test email/test/data \
++		json/tests sqlite3/test bsddb/test lib2to3/tests \
++		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
++		ctypes/test distutils/tests unittest/test
 +endif
 +
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2393,6 +2393,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2408,6 +2408,12 @@
  fi
  
  
diff --git a/package/python/python-2.7-101-optional-pydoc.patch b/package/python/python-2.7-101-optional-pydoc.patch
index 8d51dc95ba..195abcc6e6 100644
--- a/package/python/python-2.7-101-optional-pydoc.patch
+++ b/package/python/python-2.7-101-optional-pydoc.patch
@@ -11,11 +11,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py        |   10 +++++++---
  3 files changed, 17 insertions(+), 4 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -864,7 +864,7 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -868,7 +868,7 @@
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
@@ -23,9 +23,9 @@ Index: Python-2.7.1/Makefile.pre.in
 +		curses $(MACHDEPS)
  
  ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS +=	lib-tk/test lib-tk/test/test_tkinter	\
-@@ -882,6 +882,10 @@
- 		unittest/test
+ LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
+@@ -880,6 +880,10 @@
+ 		ctypes/test distutils/tests unittest/test
  endif
  
 +ifeq (@PYDOC@,yes)
@@ -35,11 +35,11 @@ Index: Python-2.7.1/Makefile.pre.in
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2392,6 +2392,11 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2407,6 +2407,11 @@
          esac])
  fi
  
@@ -51,11 +51,11 @@ Index: Python-2.7.1/configure.in
  
  AC_SUBST(TEST_MODULES)
  
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
-@@ -2072,6 +2072,12 @@
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
+@@ -2092,6 +2092,12 @@
      # turn off warnings when deprecated modules are imported
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -68,7 +68,7 @@ Index: Python-2.7.1/setup.py
      setup(# PyPI Metadata (PEP 301)
            name = "Python",
            version = sys.version.split()[0],
-@@ -2092,9 +2098,7 @@
+@@ -2112,9 +2118,7 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
diff --git a/package/python/python-2.7-102-optional-2to3.patch b/package/python/python-2.7-102-optional-2to3.patch
index 3550db1323..1e04540654 100644
--- a/package/python/python-2.7-102-optional-2to3.patch
+++ b/package/python/python-2.7-102-optional-2to3.patch
@@ -11,34 +11,29 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py        |    5 +++--
  3 files changed, 26 insertions(+), 9 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -856,9 +856,7 @@
- 		encodings compiler hotshot \
- 		email email/mime \
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -862,7 +862,6 @@
  		json \
--		sqlite3 \
+ 		sqlite3 \
  		logging bsddb csv importlib wsgiref \
 -		lib2to3 lib2to3/fixes lib2to3/pgen2 \
- 		ctypes ctypes/macholib idlelib idlelib/Icons \
- 		distutils distutils/command $(XMLLIBSUBDIRS) \
+ 		ctypes  ctypes/macholib idlelib idlelib/Icons \
+ 		distutils distutils/command  $(XMLLIBSUBDIRS) \
  		multiprocessing multiprocessing/dummy \
-@@ -872,12 +870,7 @@
- 		test/decimaltestdata test/xmltestdata 	\
- 		test/tracedmodules   			\
- 		email/test email/test/data		\
--		sqlite3/test				\
- 		bsddb/test				\
--		lib2to3/tests				\
--		lib2to3/tests/data			\
--		lib2to3/tests/data/fixers		\
--		lib2to3/tests/data/fixers/myfixes	\
- 		ctypes/test distutils/tests		\
- 		unittest/test
+@@ -875,8 +874,7 @@
+ 		lib-tk/test/test_ttk test test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ 		test/tracedmodules email/test email/test/data \
+-		json/tests sqlite3/test bsddb/test lib2to3/tests \
+-		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
++		json/tests sqlite3/test bsddb/test \
+ 		ctypes/test distutils/tests unittest/test
  endif
-@@ -886,6 +879,23 @@
+ 
+@@ -884,6 +882,23 @@
  LIBSUBDIRS += pydoc_data
  endif
  
@@ -62,11 +57,11 @@ Index: Python-2.7.1/Makefile.pre.in
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2404,6 +2404,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2419,6 +2419,12 @@
  	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
  	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
  
@@ -79,11 +74,11 @@ Index: Python-2.7.1/configure.in
  # Check for enable-ipv6
  AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
  AC_MSG_CHECKING([if --enable-ipv6 is specified])
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
-@@ -2073,10 +2073,11 @@
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
+@@ -2093,10 +2093,11 @@
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
  
diff --git a/package/python/python-2.7-103-optional-sqlite.patch b/package/python/python-2.7-103-optional-sqlite.patch
index 08e8b5d22e..4172bae48b 100644
--- a/package/python/python-2.7-103-optional-sqlite.patch
+++ b/package/python/python-2.7-103-optional-sqlite.patch
@@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2392,6 +2392,15 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2407,6 +2407,15 @@
          esac])
  fi
  
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch
index 6bcdcb8686..12f1236168 100644
--- a/package/python/python-2.7-104-optional-tk.patch
+++ b/package/python/python-2.7-104-optional-tk.patch
@@ -7,31 +7,30 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in    |    9 +++++++++
  2 files changed, 19 insertions(+), 4 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -851,8 +851,7 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -856,7 +856,7 @@
  	plat-mac/lib-scriptpackages/SystemEvents \
  	plat-mac/lib-scriptpackages/Terminal 
  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS=	lib-tk \
--                site-packages \
+-LIBSUBDIRS=	lib-tk  site-packages \
 +LIBSUBDIRS=	site-packages \
  		encodings compiler hotshot \
  		email email/mime \
  		json \
-@@ -865,8 +864,7 @@
+@@ -870,8 +870,7 @@
  		curses $(MACHDEPS)
  
  ifeq (@TEST_MODULES@,yes)
--LIBSUBDIRS +=	lib-tk/test lib-tk/test/test_tkinter	\
--	      	lib-tk/test/test_ttk test test/data	\
-+LIBSUBDIRS +=	test test/data	\
- 		test/decimaltestdata test/xmltestdata 	\
- 		test/tracedmodules   			\
- 		email/test email/test/data		\
-@@ -896,6 +894,14 @@
+-LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
+-		lib-tk/test/test_ttk test test/data \
++LIBSUBDIRS +=   test test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ 		test/tracedmodules email/test email/test/data \
+ 		json/tests sqlite3/test bsddb/test \
+@@ -899,6 +898,14 @@
  endif
  endif
  
@@ -46,11 +45,11 @@ Index: Python-2.7.1/Makefile.pre.in
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2401,6 +2401,15 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2416,6 +2416,15 @@
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
diff --git a/package/python/python-2.7-105-optional-curses.patch b/package/python/python-2.7-105-optional-curses.patch
index 3a1ceabf65..e3705cbdc5 100644
--- a/package/python/python-2.7-105-optional-curses.patch
+++ b/package/python/python-2.7-105-optional-curses.patch
@@ -7,11 +7,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in    |    9 +++++++++
  2 files changed, 14 insertions(+), 1 deletion(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -861,7 +861,7 @@
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -867,7 +867,7 @@
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
@@ -19,8 +19,8 @@ Index: Python-2.7.1/Makefile.pre.in
 +		$(MACHDEPS)
  
  ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS +=	test test/data	\
-@@ -902,6 +902,10 @@
+ LIBSUBDIRS +=   test test/data \
+@@ -906,6 +906,10 @@
  endif
  endif
  
@@ -31,11 +31,11 @@ Index: Python-2.7.1/Makefile.pre.in
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2410,6 +2410,15 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2425,6 +2425,15 @@
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
  fi
  
diff --git a/package/python/python-2.7-106-optional-expat.patch b/package/python/python-2.7-106-optional-expat.patch
index 24272d9ab4..be1b4a3c62 100644
--- a/package/python/python-2.7-106-optional-expat.patch
+++ b/package/python/python-2.7-106-optional-expat.patch
@@ -14,20 +14,20 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  setup.py        |    2 +-
  3 files changed, 19 insertions(+), 7 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -857,7 +857,7 @@
- 		json \
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -863,7 +863,7 @@
+ 		sqlite3 \
  		logging bsddb csv importlib wsgiref \
- 		ctypes ctypes/macholib idlelib idlelib/Icons \
--		distutils distutils/command $(XMLLIBSUBDIRS) \
+ 		ctypes  ctypes/macholib idlelib idlelib/Icons \
+-		distutils distutils/command  $(XMLLIBSUBDIRS) \
 +		distutils distutils/command \
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
-@@ -906,6 +906,10 @@
+@@ -910,6 +910,10 @@
  LIBSUBDIRS += curses
  endif
  
@@ -38,11 +38,11 @@ Index: Python-2.7.1/Makefile.pre.in
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2087,13 +2087,21 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2102,13 +2102,21 @@
  AC_SUBST(DISABLED_EXTENSIONS)
  
  # Check for use of the system expat library
@@ -69,11 +69,11 @@ Index: Python-2.7.1/configure.in
  
  # Check for use of the system libffi library
  AC_MSG_CHECKING(for --with-system-ffi)
-Index: Python-2.7.1/setup.py
+Index: Python-2.7.2/setup.py
 ===================================================================
---- Python-2.7.1.orig/setup.py
-+++ Python-2.7.1/setup.py
-@@ -1383,7 +1383,7 @@
+--- Python-2.7.2.orig/setup.py
++++ Python-2.7.2/setup.py
+@@ -1403,7 +1403,7 @@
          #
          # More information on Expat can be found at www.libexpat.org.
          #
diff --git a/package/python/python-2.7-107-optional-codecs-cjk.patch b/package/python/python-2.7-107-optional-codecs-cjk.patch
index 1b0541b10a..8ba61fe082 100644
--- a/package/python/python-2.7-107-optional-codecs-cjk.patch
+++ b/package/python/python-2.7-107-optional-codecs-cjk.patch
@@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2409,6 +2409,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2424,6 +2424,12 @@
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
diff --git a/package/python/python-2.7-108-optional-nis.patch b/package/python/python-2.7-108-optional-nis.patch
index 35be7ff63c..212f8d6ca5 100644
--- a/package/python/python-2.7-108-optional-nis.patch
+++ b/package/python/python-2.7-108-optional-nis.patch
@@ -9,11 +9,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2415,6 +2415,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2430,6 +2430,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
    	  fi])
  
diff --git a/package/python/python-2.7-109-optional-unicodedata.patch b/package/python/python-2.7-109-optional-unicodedata.patch
index 9973c3c9b0..229ba8c064 100644
--- a/package/python/python-2.7-109-optional-unicodedata.patch
+++ b/package/python/python-2.7-109-optional-unicodedata.patch
@@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2421,6 +2421,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2436,6 +2436,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch
index 5589ed3c64..0d5ee0c260 100644
--- a/package/python/python-2.7-110-optional-db.patch
+++ b/package/python/python-2.7-110-optional-db.patch
@@ -11,28 +11,29 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in    |   22 ++++++++++++++++++++++
  2 files changed, 30 insertions(+), 2 deletions(-)
 
-Index: Python-2.7.1/Makefile.pre.in
+Index: Python-2.7.2/Makefile.pre.in
 ===================================================================
---- Python-2.7.1.orig/Makefile.pre.in
-+++ Python-2.7.1/Makefile.pre.in
-@@ -855,7 +855,7 @@
- 		encodings compiler hotshot \
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -861,7 +861,7 @@
  		email email/mime \
  		json \
+ 		sqlite3 \
 -		logging bsddb csv importlib wsgiref \
 +		logging csv importlib wsgiref \
- 		ctypes ctypes/macholib idlelib idlelib/Icons \
+ 		ctypes  ctypes/macholib idlelib idlelib/Icons \
  		distutils distutils/command \
  		multiprocessing multiprocessing/dummy \
-@@ -868,7 +868,6 @@
- 		test/decimaltestdata test/xmltestdata 	\
- 		test/tracedmodules   			\
- 		email/test email/test/data		\
--		bsddb/test				\
- 		ctypes/test distutils/tests		\
- 		unittest/test
+@@ -873,7 +873,7 @@
+ LIBSUBDIRS +=   test test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ 		test/tracedmodules email/test email/test/data \
+-		json/tests sqlite3/test bsddb/test \
++		json/tests sqlite3/test \
+ 		ctypes/test distutils/tests unittest/test
  endif
-@@ -910,6 +909,13 @@
+ 
+@@ -914,6 +914,13 @@
  LIBSUBDIRS += $(XMLLIBSUBDIRS)
  endif
  
@@ -46,11 +47,11 @@ Index: Python-2.7.1/Makefile.pre.in
  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2421,6 +2421,28 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2436,6 +2436,28 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
diff --git a/package/python/python-2.7-111-optional-ssl.patch b/package/python/python-2.7-111-optional-ssl.patch
index ff38507faa..5885b4eec7 100644
--- a/package/python/python-2.7-111-optional-ssl.patch
+++ b/package/python/python-2.7-111-optional-ssl.patch
@@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2421,6 +2421,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2436,6 +2436,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
diff --git a/package/python/python-2.7-112-optional-bzip2.patch b/package/python/python-2.7-112-optional-bzip2.patch
index f2e4e7cae1..83a2479116 100644
--- a/package/python/python-2.7-112-optional-bzip2.patch
+++ b/package/python/python-2.7-112-optional-bzip2.patch
@@ -5,11 +5,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2427,6 +2427,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2442,6 +2442,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
    	  fi])
  
diff --git a/package/python/python-2.7-113-optional-zlib.patch b/package/python/python-2.7-113-optional-zlib.patch
index b5d9665363..f24eb17265 100644
--- a/package/python/python-2.7-113-optional-zlib.patch
+++ b/package/python/python-2.7-113-optional-zlib.patch
@@ -5,11 +5,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: Python-2.7.1/configure.in
+Index: Python-2.7.2/configure.in
 ===================================================================
---- Python-2.7.1.orig/configure.in
-+++ Python-2.7.1/configure.in
-@@ -2433,6 +2433,12 @@
+--- Python-2.7.2.orig/configure.in
++++ Python-2.7.2/configure.in
+@@ -2448,6 +2448,12 @@
              DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
           fi])
  
diff --git a/package/python/python.mk b/package/python/python.mk
index 724fd1a928..596770acc1 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).1
+PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).2
 PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
 PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
 

From 661c18bffdb0899bea9f30eade49199d16c72538 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat, 17 Sep 2011 22:23:08 +0200
Subject: [PATCH 0664/6849] barebox: add support for custom version, tarball,
 git and patch dir

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in  | 53 +++++++++++++++++++++++++++++++++++++++++
 boot/barebox/barebox.mk | 23 +++++++++++++++++-
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index a821c45c00..87bf39b4de 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -6,6 +6,59 @@ menuconfig BR2_TARGET_BAREBOX
 	  http://www.barebox.org
 
 if BR2_TARGET_BAREBOX
+choice
+	prompt "version"
+	default BR2_TARGET_BAREBOX_2011_09
+	help
+	  Select the specific Barebox version you want to use
+
+config BR2_TARGET_BAREBOX_2011_08
+	bool "2011.08"
+
+config BR2_TARGET_BAREBOX_2011_09
+	bool "2011.09"
+
+config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
+	bool "Custom tarball"
+
+config BR2_TARGET_BAREBOX_CUSTOM_GIT
+	bool "Custom Git repository"
+
+endchoice
+
+if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
+
+config BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION
+	string "URL of custom Barebox tarball"
+
+endif
+
+config BR2_TARGET_BAREBOX_VERSION
+	string
+	default "2011.08.0"	if BR2_TARGET_BAREBOX_2011_08
+	default "2011.09.0"	if BR2_TARGET_BAREBOX_2011_09
+	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
+	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
+
+config BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR
+	string "custom patch dir"
+	help
+	  If your board requires custom patches, add the path to the
+	  directory containing the patches here. The patches must be
+	  named barebox-<version>-<something>.patch.
+
+	  Most users may leave this empty
+
+if BR2_TARGET_BAREBOX_CUSTOM_GIT
+
+config BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL
+	string "URL of custom Git repository"
+
+config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION
+	string "Custom Git version"
+
+endif
+
 config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG
 	string "board defconfig"
 	help
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 0dfcff34c8..8826ef901e 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,9 +4,30 @@
 #
 #############################################################
 
-BAREBOX_VERSION = 2011.09.0
+BAREBOX_VERSION    = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION))
+
+ifeq ($(BAREBOX_VERSION),custom)
+# Handle custom Barebox tarballs as specified by the configuration
+BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
+BAREBOX_SITE    = $(dir $(BAREBOX_TARBALL))
+BAREBOX_SOURCE  = $(notdir $(BAREBOX_TARBALL))
+else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y)
+BAREBOX_SITE        = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
+BAREBOX_SITE_METHOD = git
+else
+# Handle stable official Barebox versions
 BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
+endif
+
+ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
+define BAREBOX_APPLY_CUSTOM_PATCHES
+	toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \
+		barebox-$(BAREBOX_VERSION)-\*.patch
+endef
+
+BAREBOX_POST_PATCH_HOOKS += BAREBOX_APPLY_CUSTOM_PATCHES
+endif
 
 BAREBOX_INSTALL_IMAGES = YES
 ifneq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)

From ec9ec06b56bcc38f7a5ed98ff8b076e864e74c5d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Sep 2011 22:09:42 +0200
Subject: [PATCH 0665/6849] boot: get rid of toplevel submenus

Sub options are indented anyway, so no need for empty menus / force people
to enter sub menus to see configuration options.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/Config.in | 2 +-
 boot/barebox/Config.in       | 2 +-
 boot/grub/Config.in          | 2 +-
 boot/uboot/Config.in         | 2 +-
 boot/xloader/Config.in       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index f022dd5c99..ff968cdbe9 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -1,4 +1,4 @@
-menuconfig BR2_TARGET_AT91BOOTSTRAP
+config BR2_TARGET_AT91BOOTSTRAP
 	depends on BR2_arm
 	bool "AT91 Bootstrap"
 	help
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 87bf39b4de..71d530fdd6 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -1,4 +1,4 @@
-menuconfig BR2_TARGET_BAREBOX
+config BR2_TARGET_BAREBOX
 	bool "Barebox"
 	help
 	  The Barebox bootloader, formerly known as U-Boot v2.
diff --git a/boot/grub/Config.in b/boot/grub/Config.in
index bc7a73e73d..ec48d178c1 100644
--- a/boot/grub/Config.in
+++ b/boot/grub/Config.in
@@ -9,7 +9,7 @@ config BR2_TARGET_GRUB_SPLASH
 	depends on BR2_TARGET_GRUB
 	help
 	  Add support for splashimage.
-	
+
 	  A splashimage is a 14-color indexed .xpm picture which
 	  is displayed as background for the grub menu.
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index a0b2bfc875..3608cd463b 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -1,4 +1,4 @@
-menuconfig BR2_TARGET_UBOOT
+config BR2_TARGET_UBOOT
 	bool "U-Boot"
 	help
 	  Build "Das U-Boot" Boot Monitor
diff --git a/boot/xloader/Config.in b/boot/xloader/Config.in
index d295b45d89..c411be478b 100644
--- a/boot/xloader/Config.in
+++ b/boot/xloader/Config.in
@@ -1,4 +1,4 @@
-menuconfig BR2_TARGET_XLOADER
+config BR2_TARGET_XLOADER
 	bool "X-loader"
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	help

From ad1fd9778566e9020ace3b8c7d2b3815b67201b4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Sep 2011 22:12:34 +0200
Subject: [PATCH 0666/6849] u-boot: clarify network settings submenu, disable
 override by default

Make it clear that these options override the board defconfig, and
don't enable it by default.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 3608cd463b..daccd8bbcd 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -92,10 +92,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 endchoice
 
 menuconfig BR2_TARGET_UBOOT_NETWORK
-	bool "Network Settings"
-	default y
+	bool "Custom Network Settings"
 	help
-	  Network settings for U-boot
+	  Custom network settings for U-boot
 
 if BR2_TARGET_UBOOT_NETWORK
 

From 3011d235185b490e619dd8b01004538c5985b0ed Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Sat, 17 Sep 2011 22:22:51 +0200
Subject: [PATCH 0667/6849] linux: Add Linux Kernel extensions menu

Add a kernel sub-menu (called "Linux Kernel Extensions"), which makes
possible to patch it or tweak the kernel build step.

 * All linux/linux-ext-*.mk files will be read by the make process.
 * The menu can be customized in "linux/Config.ext.in".

[Peter: small fixes]
Signed-off-by: Benoit Mauduit <benoit.mauduit@openwide.fr>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in | 3 +++
 linux/Config.in     | 4 ++++
 linux/linux.mk      | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 linux/Config.ext.in

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
new file mode 100644
index 0000000000..50e801d67b
--- /dev/null
+++ b/linux/Config.ext.in
@@ -0,0 +1,3 @@
+menu "Linux Kernel Extensions"
+
+endmenu
diff --git a/linux/Config.in b/linux/Config.in
index 537cb54cc3..56552867fb 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -176,6 +176,10 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
 	  /boot in the target root filesystem, as is typically done on
 	  x86/x86_64 systems.
 
+
+# Linux extensions
+source "linux/Config.ext.in"
+
 endif # BR2_LINUX_KERNEL
 
 endmenu
diff --git a/linux/linux.mk b/linux/linux.mk
index d289b28427..f249d96701 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -177,6 +177,8 @@ define LINUX_INSTALL_TARGET_CMDS
 	fi
 endef
 
+include linux/linux-ext-*.mk
+
 $(eval $(call GENTARGETS,,linux))
 
 linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured

From 956d4ab0f501c44f977297d8faac95afa43f3082 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Sat, 17 Sep 2011 22:22:52 +0200
Subject: [PATCH 0668/6849] Add xenomai real-time Framework to buildroot

[Fixes by Thomas, including comments from Arnout:
  * Use AUTOTARGETS instead of GENTARGETS

  * Use $(KERNEL_ARCH) instead of $(BR2_ARCH) as argument to the
    prepare-kernel.sh script. This allows the arch name to be fixed
    with the usual sed expressions and the quotes to be stripped.

  * Add the --verbose option to prepare-kernel.sh. This allows to get
    some clear error message when no Xenomai patch has been found for
    the current kernel version.

  * Improve the help texts as suggested by Arnout, and remove the
    now useless README file.

  * Add a BR2_PACKAGE_XENOMAI_SMP option, instead of poking inside the
    kernel configuration to find out whether SMP is enabled or
    not. This cannot work because: 1) the kernel might be built
    outside of Buildroot and 2) if the kernel is built inside
    Buildroot, it is built *after* Xenomai, so the kernel
    configuration file is typically not yet present.

  * Simplify the ARM subarchitecture selection as suggested by Arnout.

  * Remove the documentation and development files according to
    Buildroot standards (using BR2_HAVE_DOCUMENTATION and
    BR2_HAVE_DEVFILES).

  * Simplify the /etc/ld.so.conf modification logic.
]

[Peter: whitespace fixes]
Signed-off-by: Benoit Mauduit <benoit.mauduit@openwide.fr>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in                           |  15 +++
 linux/linux-ext-xenomai.mk                    |  30 +++++
 package/Config.in                             |   4 +
 package/xenomai/Config.in                     | 106 ++++++++++++++++++
 .../xenomai-do-not-install-devices.patch      |  11 ++
 package/xenomai/xenomai.mk                    |  99 ++++++++++++++++
 target/generic/device_table_dev.txt           |   5 +
 7 files changed, 270 insertions(+)
 create mode 100644 linux/linux-ext-xenomai.mk
 create mode 100644 package/xenomai/Config.in
 create mode 100644 package/xenomai/xenomai-do-not-install-devices.patch
 create mode 100644 package/xenomai/xenomai.mk

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 50e801d67b..893edb58b1 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -1,3 +1,18 @@
 menu "Linux Kernel Extensions"
 
+# Xenomai
+config BR2_LINUX_KERNEL_EXT_XENOMAI
+	bool "Adeos/Xenomai Real-time patch"
+	select BR2_PACKAGE_XENOMAI
+	help
+	  Xenomai Kernel part.
+
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
+	depends on BR2_LINUX_KERNEL_EXT_XENOMAI
+	string "Path for Adeos patch file"
+	help
+	  Optionally, explicitly specify the Adeos patch to use.
+	  Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
+	  and verify that your kernel version in buildroot matches.
+
 endmenu
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
new file mode 100644
index 0000000000..e855deddf8
--- /dev/null
+++ b/linux/linux-ext-xenomai.mk
@@ -0,0 +1,30 @@
+##################################################
+# Linux Adeos/Xenomai extensions
+#
+# Patch the linux kernel with xenomai extension
+##################################################
+
+ifeq ($(BR2_LINUX_KERNEL_EXT_XENOMAI),y)
+# Add dependency to xenomai (user-space) which provide ksrc part
+LINUX_DEPENDENCIES += xenomai
+
+# Adeos patch version
+XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
+ifeq ($(XENOMAI_ADEOS_PATCH),)
+XENOMAI_ADEOS_OPT = --default
+else
+XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
+endif
+
+# Prepare kernel patch
+define XENOMAI_PREPARE_KERNEL
+	$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
+		--linux=$(LINUX_DIR) \
+		--arch=$(KERNEL_ARCH) \
+		$(XENOMAI_ADEOS_OPT) \
+		--verbose
+endef
+
+LINUX_POST_EXTRACT_HOOKS += XENOMAI_PREPARE_KERNEL
+
+endif #BR2_LINUX_EXT_XENOMAI
diff --git a/package/Config.in b/package/Config.in
index d95e7b5e8e..efb266a5eb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -487,6 +487,10 @@ source "package/rpm/Config.in"
 endif
 endmenu
 
+menu "Real-Time"
+source "package/xenomai/Config.in"
+endmenu
+
 menu "Shell and utilities"
 source "package/at/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
new file mode 100644
index 0000000000..b5737b8f77
--- /dev/null
+++ b/package/xenomai/Config.in
@@ -0,0 +1,106 @@
+config BR2_PACKAGE_XENOMAI
+	bool "Xenomai Userspace"
+	help
+	  Real-Time Framework for Linux
+	  http://www.xenomai.org
+
+	  Xenomai is split in two parts: a kernel part and an
+	  userspace part.
+
+	  This package contains the userspace part, which consists
+	  mainly in libraries to write userspace real-time programs
+	  that interact with the in-kernel Xenomai real-time core.
+
+	  For those libraries to work, you need a Xenomai-enabled
+	  kernel. This is possible in two ways:
+	   - if you compile your kernel with Buildroot, you need to go
+	     to Linux Kernel -> Linux Kernel Extensions to enable the
+	     Xenomai extension.
+	   - if you compile your kernel outside of Buildroot, you need
+	     to make sure that it is Xenomai-enabled.
+
+	  Finally, if you are using a static /dev, make sure to
+	  uncomment the Xenomai entries listed in
+	  target/generic/device_table_dev.txt.
+
+if BR2_PACKAGE_XENOMAI
+
+config BR2_PACKAGE_XENOMAI_VERSION
+	string "Custom Xenomai version"
+	help
+	  Manually select Xenomai version.  If left empty, the default
+	  version will be used.
+
+	  Make sure that the selected version has a patch for your
+	  selected Linux kernel. If it does not, download and select
+	  a patch manually with
+	  BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
+	  Kernel -> Linux Kernel Extensions menu.
+
+config BR2_PACKAGE_XENOMAI_SMP
+	bool "Enable SMP support"
+	help
+	  This option allows to enable or disable SMP support. It has
+	  to match your kernel configuration.
+
+choice
+	prompt "Xenomai ARM CPU type"
+	depends on BR2_arm
+	default BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM
+	help
+	  On the ARM architecture, Xenomai needs to be configured for
+	  a specific sub-architecture.  Select the appropriate
+	  sub-architecture from the list.
+
+	config BR2_PACKAGE_XENOMAI_CPU_AT91RM9200
+		bool "Atmel AT91RM9200"
+
+	config BR2_PACKAGE_XENOMAI_CPU_AT91SAM926X
+		bool "Atmel AT91SAM926X"
+
+	config BR2_PACKAGE_XENOMAI_CPU_INTEGRATOR
+		bool "ARM Ltd. Integrator"
+
+	config BR2_PACKAGE_XENOMAI_CPU_IXP4XX
+		bool "Intel IXP4XX (XScale)"
+
+	config BR2_PACKAGE_XENOMAI_CPU_IMX
+		bool "Freescale i.MX (MX1/MXL)"
+
+	config BR2_PACKAGE_XENOMAI_CPU_IMX21
+		bool "Freescale i.MX21"
+
+	config BR2_PACKAGE_XENOMAI_CPU_MX2
+		bool "Freescale MXC/MX2"
+
+	config BR2_PACKAGE_XENOMAI_CPU_MX3
+		bool "Freescale MXC/MX3"
+
+	config BR2_PACKAGE_XENOMAI_CPU_SA1100
+		bool "StrongARM SA1100"
+
+	config BR2_PACKAGE_XENOMAI_CPU_S3C2410
+		bool "S3C2410"
+
+	config BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM
+		bool "Generic ARM"
+
+endchoice
+
+# Now set CPU type. We force manually selected type even if detected in case
+# user takes the risk.
+config BR2_PACKAGE_XENOMAI_CPU_TYPE
+	string
+	depends on BR2_PACKAGE_XENOMAI && BR2_arm
+	default "at91rm9200"  if BR2_PACKAGE_XENOMAI_CPU_AT91RM9200
+	default "at91sam926x" if BR2_PACKAGE_XENOMAI_CPU_AT91SAM926X
+	default "integrator"  if BR2_PACKAGE_XENOMAI_CPU_INTEGRATOR
+	default "ixp4xx"      if BR2_PACKAGE_XENOMAI_CPU_IXP4XX
+	default "generic"     if BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM
+	default "imx"         if BR2_PACKAGE_XENOMAI_CPU_IMX
+	default "imx21"       if BR2_PACKAGE_XENOMAI_CPU_IMX21
+	default "mx2"         if BR2_PACKAGE_XENOMAI_CPU_MX2
+	default "mx3"         if BR2_PACKAGE_XENOMAI_CPU_MX3
+	default "s3c2410"     if BR2_PACKAGE_XENOMAI_CPU_S3C2410
+
+endif
diff --git a/package/xenomai/xenomai-do-not-install-devices.patch b/package/xenomai/xenomai-do-not-install-devices.patch
new file mode 100644
index 0000000000..348abee4b1
--- /dev/null
+++ b/package/xenomai/xenomai-do-not-install-devices.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2011-06-24 16:11:23.591449817 +0200
++++ b/Makefile.in	2011-06-24 16:20:29.638129633 +0200
+@@ -719,7 +719,7 @@
+ 	  $$sudo mknod -m 666 $(DESTDIR)/dev/rtheap c 10 254 ; \
+ 	fi
+ 
+-install-exec-local: devices
++install-exec-local:
+ 
+ install-user:
+ 	$(MAKE) SUDO=false install
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
new file mode 100644
index 0000000000..8f78333e0a
--- /dev/null
+++ b/package/xenomai/xenomai.mk
@@ -0,0 +1,99 @@
+#############################################################
+# Xenomai
+# URL  : http://xenomai.org
+# NOTE : Real-Time Framework for Linux
+#
+#############################################################
+
+XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
+ifeq ($(XENOMAI_VERSION),)
+XENOMAI_VERSION = 2.5.6
+endif
+
+XENOMAI_SITE = http://download.gna.org/xenomai/stable/
+XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
+
+XENOMAI_INSTALL_STAGING = YES
+
+ifeq ($(BR2_arm),y)
+XENOMAI_CPU_TYPE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CPU_TYPE))
+# Set "generic" if not defined
+ifeq ($(XENOMAI_CPU_TYPE),)
+XENOMAI_CPU_TYPE = generic
+endif
+XENOMAI_CONF_OPT += --enable-arm-mach=$(XENOMAI_CPU_TYPE)
+endif #BR2_arm
+
+ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y)
+XENOMAI_CONF_OPT += --enable-smp
+endif
+
+# The configure step needs to be overloaded, because Xenomai doesn't
+# support --prefix=/usr and the autotargets infrastructure enforces
+# this.
+define XENOMAI_CONFIGURE_CMDS
+	(cd $(@D); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+		./configure \
+		$(XENOMAI_CONF_OPT) \
+		--host=$(GNU_TARGET_NAME) \
+	)
+endef
+
+ifeq ($(BR2_HAVE_DOCUMENTATION),)
+define XENOMAI_REMOVE_DOCUMENTATION
+	rm -rf $(TARGET_DIR)/usr/xenomai/share/doc
+	rm -rf $(TARGET_DIR)/usr/xenomai/share/man
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DOCUMENTATION
+endif
+
+ifeq ($(BR2_HAVE_DEVFILES),)
+define XENOMAI_REMOVE_DEVFILES
+	rm -rf $(TARGET_DIR)/usr/xenomai/include
+	for i in xeno-config xeno-info wrap-link.sh ; do \
+		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+	done
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
+endif
+
+define XENOMAI_ADD_LD_SO_CONF
+	# Add /usr/xenomai/lib in the library search path
+	grep -q "^/usr/xenomai/lib" $(TARGET_DIR)/etc/ld.so.conf || \
+		echo "/usr/xenomai/lib" >> $(TARGET_DIR)/etc/ld.so.conf
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_ADD_LD_SO_CONF
+
+# If you use static /dev creation don't forget to update your
+#  device_table_dev.txt
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
+XENOMAI_DEPENDENCIES += udev
+
+define XENOMAI_INSTALL_UDEV_RULES
+	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
+		for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \
+			cp $$f $(TARGET_DIR)/etc/udev/rules.d/ ; \
+		done ; \
+	fi;
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_INSTALL_UDEV_RULES
+endif # udev
+
+define XENOMAI_REMOVE_UDEV_RULES
+	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
+		for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \
+			rm -f $(TARGET_DIR)/etc/udev/rules.d/$$f ; \
+		done ; \
+	fi;
+endef
+
+XENOMAI_POST_UNINSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UDEV_RULES
+
+$(eval $(call AUTOTARGETS,package,xenomai))
diff --git a/target/generic/device_table_dev.txt b/target/generic/device_table_dev.txt
index a3d53d460a..71cd083495 100644
--- a/target/generic/device_table_dev.txt
+++ b/target/generic/device_table_dev.txt
@@ -141,3 +141,8 @@
 
 # I2C device nodes
 /dev/i2c-	c	666	0	0	89	0	0	1	4
+
+# Xenomai
+#/dev/rtheap     c       666     0       0       10      254     0       0       -
+#/dev/rtscope    c       666     0       0       10      253     0       0       -
+#/dev/rtp        c       666     0       0       150     0       0       1       32

From 638ee5cd482ccd5767d66d0c6d37c43026d3c37e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Sep 2011 22:22:53 +0200
Subject: [PATCH 0669/6849] xenomai: add support to keep or remove testsuite
 programs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in  |  5 +++++
 package/xenomai/xenomai.mk | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index b5737b8f77..26c6b510f0 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -103,4 +103,9 @@ config BR2_PACKAGE_XENOMAI_CPU_TYPE
 	default "mx3"         if BR2_PACKAGE_XENOMAI_CPU_MX3
 	default "s3c2410"     if BR2_PACKAGE_XENOMAI_CPU_S3C2410
 
+config BR2_PACKAGE_XENOMAI_TESTSUITE
+       bool "Install testsuite"
+       help
+         This option allows to install the Xenomai test programs.
+
 endif
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 8f78333e0a..cb73740ea4 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -62,6 +62,23 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
 endif
 
+ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
+define XENOMAI_REMOVE_TESTSUITE
+	rm -rf $(TARGET_DIR)/usr/xenomai/share/xenomai/testsuite/
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/xenomai/share/xenomai/
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/xenomai/share/
+	for i in klatency rtdm xeno xeno-load check-vdso \
+		irqloop cond-torture-posix switchtest arith \
+		sigtest clocktest cyclictest latency wakeup-time \
+		xeno-test cond-torture-native mutex-torture-posix \
+		mutex-torture-native ; do \
+		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+	done
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE
+endif
+
 define XENOMAI_ADD_LD_SO_CONF
 	# Add /usr/xenomai/lib in the library search path
 	grep -q "^/usr/xenomai/lib" $(TARGET_DIR)/etc/ld.so.conf || \

From 832ff5c9c06e993d7ffdb24b1635e58332d56cf3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Sep 2011 22:22:54 +0200
Subject: [PATCH 0670/6849] xenomai: add support to keep or remove RT-CAN
 utilities

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in  |  5 +++++
 package/xenomai/xenomai.mk | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 26c6b510f0..6ba9f8b69e 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -108,4 +108,9 @@ config BR2_PACKAGE_XENOMAI_TESTSUITE
        help
          This option allows to install the Xenomai test programs.
 
+config BR2_PACKAGE_XENOMAI_RTCAN
+       bool "RTCan utilities"
+       help
+         This option allows to install the Xenomai RT-CAN utilities.
+
 endif
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index cb73740ea4..36e2e44e39 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -79,6 +79,17 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE
 endif
 
+ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),)
+define XENOMAI_REMOVE_RTCAN_PROGS
+	for i in rtcanrecv rtcansend ; do \
+		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+	done
+	rm -f $(TARGET_DIR)/usr/xenomai/sbin/rtcanconfig
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_RTCAN_PROGS
+endif
+
 define XENOMAI_ADD_LD_SO_CONF
 	# Add /usr/xenomai/lib in the library search path
 	grep -q "^/usr/xenomai/lib" $(TARGET_DIR)/etc/ld.so.conf || \

From 60d48220525f154ee43b2fbe3137a393ebacd4a4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Sep 2011 22:22:55 +0200
Subject: [PATCH 0671/6849] xenomai: add support to keep or remove Analogy
 utilities and libs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in  |  6 ++++++
 package/xenomai/xenomai.mk | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 6ba9f8b69e..3749a60487 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -113,4 +113,10 @@ config BR2_PACKAGE_XENOMAI_RTCAN
        help
          This option allows to install the Xenomai RT-CAN utilities.
 
+config BR2_PACKAGE_XENOMAI_ANALOGY
+       bool "Analogy libs and utils"
+       help
+         This option allows to install the Xenomai Analogy utilities
+         and libraries
+
 endif
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 36e2e44e39..fff2c5dec9 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -90,6 +90,19 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_RTCAN_PROGS
 endif
 
+ifeq ($(BR2_PACKAGE_XENOMAI_ANALOGY),)
+define XENOMAI_REMOVE_ANALOGY
+	for i in cmd_bits cmd_read cmd_write insn_write \
+		insn_bits insn_read ; do \
+		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+	done
+	rm -f $(TARGET_DIR)/usr/xenomai/sbin/analogy_config
+	rm -f $(TARGET_DIR)/usr/xenomai/lib/libanalogy.*
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
+endif
+
 define XENOMAI_ADD_LD_SO_CONF
 	# Add /usr/xenomai/lib in the library search path
 	grep -q "^/usr/xenomai/lib" $(TARGET_DIR)/etc/ld.so.conf || \

From 4b78a5008995d459399a38692d436eceb7c2278d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Sep 2011 22:22:56 +0200
Subject: [PATCH 0672/6849] xenomai: add support to keep or remove skins

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in  | 37 +++++++++++++++++++++++++++++++++++++
 package/xenomai/xenomai.mk | 19 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 3749a60487..cfeaa04289 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -119,4 +119,41 @@ config BR2_PACKAGE_XENOMAI_ANALOGY
          This option allows to install the Xenomai Analogy utilities
          and libraries
 
+config BR2_PACKAGE_XENOMAI_NATIVE_SKIN
+       bool "Native skin library"
+       default y
+       help
+	 This option allows to install the Native Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_POSIX_SKIN
+       bool "POSIX skin library"
+       default y
+       help
+	 This option allows to install the POSIX Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
+       bool "VX-Works skin library"
+       help
+	 This option allows to install the VX-Works Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_PSOS_SKIN
+       bool "PSOS skin library"
+       help
+	 This option allows to install the PSOS Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_RTAI_SKIN
+       bool "RTAI skin library"
+       help
+	 This option allows to install the RTAI Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_UITRON_SKIN
+       bool "uiTron skin library"
+       help
+	 This option allows to install the uiTron Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_VRTX_SKIN
+       bool "VRTX skin library"
+       help
+	 This option allows to install the VRTX Xenomai skin
+
 endif
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index fff2c5dec9..52e0b4e54a 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -103,6 +103,25 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
 endif
 
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,native)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
+
+define XENOMAI_REMOVE_SKINS
+	for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \
+		rm -f $(TARGET_DIR)/usr/xenomai/lib/lib$$i.* ; \
+		if [ $$i == "posix" ] ; then \
+			rm -f $(TARGET_DIR)/usr/xenomai/lib/posix.wrappers ; \
+		fi ; \
+	done
+endef
+
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
+
 define XENOMAI_ADD_LD_SO_CONF
 	# Add /usr/xenomai/lib in the library search path
 	grep -q "^/usr/xenomai/lib" $(TARGET_DIR)/etc/ld.so.conf || \

From a473a616d27e46951a23d90249a31b08006098bf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Sep 2011 22:22:57 +0200
Subject: [PATCH 0673/6849] package: change ordering of steps

Currently, the dependency chain is :

 configure -> patch
 patch -> extract
 extract -> depends
 depends -> source + dependencies ready

This is a problem for RTAI, as :

 * In linux/linux-ext-rtai.mk, we need the RTAI source code to be
   extracted/patched by the RTAI package, so we need to have a
   dependency on RTAI.

 * The RTAI package cannot have its configure step executed before the
   Linux kernel is built, because it needs the kernel source code to
   be extracted and configured.

Therefore, we have a sort of circular dependency. We solve this
circular dependency by having the RTAI kernel part depending on
rtai-patch, and having the RTAI userspace part depending on the linux
package. However, for this to work, we have to modify the dependency
chain to:

 configure -> patch + depends
 patch -> extract
 extract -> source
 depends -> dependencies ready

Which means that dependencies are guaranteed to be built not when the
package is extracted, but when the package is configured. Which is
technically more correct that what we were doing in the past.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 07511442cb..66be0a2377 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -487,15 +487,15 @@ $(1)-install-host:      $(1)-build $$($(2)_TARGET_INSTALL_HOST)
 $(1)-build:		$(1)-configure \
 			$$($(2)_TARGET_BUILD)
 
-$(1)-configure:		$(1)-patch \
+$(1)-configure:		$(1)-patch $(1)-depends \
 			$$($(2)_TARGET_CONFIGURE)
 
 $(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)
 
-$(1)-extract:		$(1)-depends \
+$(1)-extract:		$(1)-source \
 			$$($(2)_TARGET_EXTRACT)
 
-$(1)-depends:		$(1)-source $$($(2)_DEPENDENCIES)
+$(1)-depends:		$$($(2)_DEPENDENCIES)
 
 $(1)-show-depends:
 			@echo $$($(2)_DEPENDENCIES)

From 8797a9cd1fe6723db34b0c125d0d9d04e3483e8d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Sep 2011 22:22:58 +0200
Subject: [PATCH 0674/6849] Add support for the RTAI real-time extension

[Peter: fix rtai Config.in]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in     | 13 ++++++++++++
 linux/linux-ext-rtai.mk | 47 +++++++++++++++++++++++++++++++++++++++++
 package/Config.in       |  1 +
 package/rtai/Config.in  |  7 ++++++
 package/rtai/rtai.mk    | 15 +++++++++++++
 5 files changed, 83 insertions(+)
 create mode 100644 linux/linux-ext-rtai.mk
 create mode 100644 package/rtai/Config.in
 create mode 100644 package/rtai/rtai.mk

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 893edb58b1..8a9f87ec46 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -15,4 +15,17 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 	  Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
 	  and verify that your kernel version in buildroot matches.
 
+# RTAI
+config BR2_LINUX_KERNEL_EXT_RTAI
+       bool "RTAI Real-time patch"
+       select BR2_PACKAGE_RTAI
+       help
+         RTAI Kernel part.
+
+config BR2_LINUX_KERNEL_EXT_RTAI_PATCH
+       depends on BR2_LINUX_KERNEL_EXT_RTAI
+       string "Path for RTAI patch file"
+       help
+         Optionally, explicitly specify the RTAI patch to use.
+
 endmenu
diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
new file mode 100644
index 0000000000..a54230d321
--- /dev/null
+++ b/linux/linux-ext-rtai.mk
@@ -0,0 +1,47 @@
+##################################################
+# Linux RTAI extensions
+#
+# Patch the linux kernel with RTAI extension
+##################################################
+
+ifeq ($(BR2_LINUX_KERNEL_EXT_RTAI),y)
+# Add dependency to RTAI (user-space) which provide kernel patches
+LINUX_DEPENDENCIES += rtai-patch
+
+RTAI_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_RTAI_PATCH))
+
+ifeq ($(KERNEL_ARCH),i386)
+RTAI_ARCH = x86
+else ifeq ($(KERNEL_ARCH),x86_64)
+RTAI_ARCH = x86
+else ifeq ($(KERNEL_ARCH),powerpc)
+RTAI_ARCH = ppc
+else
+RTAI_ARCH = $(KERNEL_ARCH)
+endif
+
+# Prepare kernel patch
+ifeq ($(RTAI_PATCH),)
+define RTAI_PREPARE_KERNEL
+	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
+	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
+		support/script/apply-patches.sh $(LINUX_DIR) 		\
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\
+			hal-linux-$${kver}-*patch ; \
+	else \
+		echo "No RTAI patch for your kernel version" ; \
+		exit 1 ; \
+	fi
+endef
+else
+define RTAI_PREPARE_KERNEL
+	support/script/apply-patches.sh 	\
+		$(LINUX_DIR)			\
+		$(dir $(RTAI_PATCH))		\
+		$(notdir $(RTAI_PATCH))
+endef
+endif
+
+LINUX_POST_PATCH_HOOKS += RTAI_PREPARE_KERNEL
+
+endif #BR2_LINUX_EXT_RTAI
diff --git a/package/Config.in b/package/Config.in
index efb266a5eb..451b271f8d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -489,6 +489,7 @@ endmenu
 
 menu "Real-Time"
 source "package/xenomai/Config.in"
+source "package/rtai/Config.in"
 endmenu
 
 menu "Shell and utilities"
diff --git a/package/rtai/Config.in b/package/rtai/Config.in
new file mode 100644
index 0000000000..ecbff38d47
--- /dev/null
+++ b/package/rtai/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_RTAI
+	bool "rtai"
+	depends on BR2_LINUX_KERNEL_EXT_RTAI
+	help
+	  RTAI - the RealTime Application Interface for Linux.
+
+	  http://www.rtai.org
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
new file mode 100644
index 0000000000..abba614c46
--- /dev/null
+++ b/package/rtai/rtai.mk
@@ -0,0 +1,15 @@
+RTAI_VERSION = 3.8.1
+RTAI_SOURCE  = rtai-$(RTAI_VERSION).tar.bz2
+RTAI_SITE    = http://www.rtai.org/RTAI/
+
+RTAI_DEPENDENCIES = linux
+
+RTAI_CONF_OPT = \
+	--with-linux-dir=$(LINUX_DIR) 	\
+	--disable-leds		      	\
+	--disable-rtailab		\
+	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/kernel/rtai
+
+RTAI_MAKE = $(MAKE1)
+
+$(eval $(call AUTOTARGETS,package,rtai))

From 358601f851c001fc9505efb4866436afc030a170 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Sep 2011 22:20:54 +0200
Subject: [PATCH 0675/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5a44e72c41..04537497d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,22 +2,46 @@
 
 	Fixes all over the tree and new features.
 
-	Update external codesourcery toolchain download URLs after
-	Codesourcery got bought by Mentor.
+	Move misc scripts and support stuff to support/. Rename
+	patch-kernel.sh to support/scripts/apply-patches.sh.
+
+	Bootloaders: Add support for custom git tree / tarballs for
+	barebox, similar to how it's handled for u-boot. Clean up
+	menuconfig options.
+
+	Toolchain: Update external codesourcery toolchain download
+	URLs after Codesourcery got bought by Mentor. Fix uClibc
+	0.9.32 builds for e500 PPC.
+
+	Linux: Kernel extensions infrastructure support, Xenomai +
+	RTAI support.
 
 	Updated/fixed packages: busybox, dbus, dbus-glib, directfb,
 	dnsmasq, e2fsprogs, ethtool, fakeroot, fbdump, freetype, fuse,
-	gamin, jpeg, leafpad, libargtable2, libao, libconfuse,
-	libcuefile, libcurl, libreplaygain, libsamplerate, libsndfile,
-	libsoup, libsvgtiny, lighttpd, lzo, lzop, mpd, mpg123,
-	musepack, mysql_client, netcat, netsnmp, ntfs-3g, ntfsprogs,
-	openssl, radvd, samba, sdl_sound, sqlite, squid, sylpheed,
-	taglib, tar, tcpreplay, util-linux, xterm
-
-	New packages: fluxbox, libev, libftdi, libgeotiff, portaudio
+	gamin, gmp, jpeg, ipsec-tools, ipset, iptables, iw, leafpad,
+	libargtable2, libao, libconfuse, libcuefile, libcurl,
+	libevent, libreplaygain, libsamplerate, libsndfile, libsoup,
+	libsvgtiny, lighttpd, lzo, lzop, mpd, mpfr, mpg123, musepack,
+	mysql_client, netcat, netsnmp, ntfs-3g, ntfsprogs, openssh,
+	openssl, python, qt, radvd, samba, sdl_sound, sqlite, squid,
+	sylpheed, taglib, tar, tcpreplay, tslib, usbutils, util-linux,
+	xterm
+
+	New packages: fluxbox, libev, libftdi, libgeotiff, portaudio,
+	rtai, xenomai.
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#505:  live555: new package
+	#531:  let e2fsprogs package to export headers to staging dir if needed
+	#1171: Linuxthreads new cannot find sysdep.h
+	#2107: New package: input-event-daemon
+	#2599: New package: orc (Oil Runtime Compiler)
+	#2605: gstreamer: Update to 0.10.30
+	#2677: introducing util-linux-ng as replacement for util-linux
+	#2917: Qt: Add declarative module
+	#3145: jffs2 image generation fails
+	#3271: netperf-2.4.5 fails to compile
 	#4183: Codesourcery toolchain download site has changed
 
 2011.08, Released August 31th, 2011:

From dcb43a0eb0c09ffb84c6c7b4c169a2874cb24cc9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 19 Sep 2011 10:13:37 +0200
Subject: [PATCH 0676/6849] barebox: patch-kernel.sh is no more

Thanks to Sven Neumann for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 8826ef901e..c3510fd4c3 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -22,7 +22,7 @@ endif
 
 ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
 define BAREBOX_APPLY_CUSTOM_PATCHES
-	toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \
 		barebox-$(BAREBOX_VERSION)-\*.patch
 endef
 

From 8ca82530b837542a56a4aa728331d97639f6e533 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 20 Sep 2011 21:38:53 +0200
Subject: [PATCH 0677/6849] kernel-headers: fix 3.0 header exports for headers
 with __packed

Fixes E.G. mtd/ubi-user.h, which otherwise breaks busybox 1.9 builds
with ubi applets.

Upstream post 3.0 and discussed here: https://lkml.org/lkml/2011/6/22/25

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...fix-__packed-in-exported-kernel-head.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 toolchain/kernel-headers/linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch

diff --git a/toolchain/kernel-headers/linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch
new file mode 100644
index 0000000000..8777b71639
--- /dev/null
+++ b/toolchain/kernel-headers/linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch
@@ -0,0 +1,46 @@
+From f210735fe2f17a6225432ee3d1239bcf23a8659c Mon Sep 17 00:00:00 2001
+From: Markus Trippelsdorf <markus@trippelsdorf.de>
+Date: Fri, 24 Jun 2011 15:51:00 +0200
+Subject: [PATCH] headers_install: fix __packed in exported kernel headers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+checkpatch.pl warns about using __attribute__((packed)) in kernel
+headers: "__packed is preferred over __attribute__((packed))". If one
+follows that advice it could cause problems in the exported header
+files, because the outside world doesn't know about this shortcut.
+
+For example busybox will fail to compile:
+ CC      miscutils/ubi_attach_detach.o
+ In file included from miscutils/ubi_attach_detach.c:27:0:
+ /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
+ /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
+...
+
+Fix the problem by substituting __packed with __attribute__((packed)) in
+the header_install.pl script.
+
+Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
+CC: Joe Perches <joe@perches.com>
+Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
+Signed-off-by: Michal Marek <mmarek@suse.cz>
+---
+ scripts/headers_install.pl |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
+index efb3be1..48462be 100644
+--- a/scripts/headers_install.pl
++++ b/scripts/headers_install.pl
+@@ -35,6 +35,7 @@ foreach my $file (@files) {
+ 		$line =~ s/([\s(])__iomem\s/$1/g;
+ 		$line =~ s/\s__attribute_const__\s/ /g;
+ 		$line =~ s/\s__attribute_const__$//g;
++		$line =~ s/\b__packed\b/__attribute__((packed))/g;
+ 		$line =~ s/^#include <linux\/compiler.h>//;
+ 		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
+ 		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
+-- 
+1.7.5.4
+

From 33518020ba93b739252f6d7f82bc48e6cbf3100a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:10:52 +0200
Subject: [PATCH 0678/6849] package: add a PRE_PATCH_HOOKS hook point

This will be useful to integrate Xenomai and RTAI into Buildroot, so
that they can patch the kernel before the normal patching process
starts.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 66be0a2377..e2d0e28cef 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -259,6 +259,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
+	$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
 	$(if $($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
 	$(Q)( \
 	if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
@@ -443,6 +444,7 @@ $(2)_EXTRACT_CMDS ?= \
 # post-steps hooks
 $(2)_POST_DOWNLOAD_HOOKS        ?=
 $(2)_POST_EXTRACT_HOOKS         ?=
+$(2)_PRE_PATCH_HOOKS            ?=
 $(2)_POST_PATCH_HOOKS           ?=
 $(2)_PRE_CONFIGURE_HOOKS        ?=
 $(2)_POST_CONFIGURE_HOOKS       ?=

From be27a7933f12af29346eb7e73e0a0ca9ae7f947d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:10:53 +0200
Subject: [PATCH 0679/6849] rtai, xenomai: use the pre patch hook point

The post extract hook point is not really correct as what RTAI and
Xenomai extensions are doing is patching the kernel.

The post patch hook point doesn't work, because RTAI and Xenomai
patches would be applied *after* all other patches, while it sounds
more logical to apply them first, and *then* allow the user to apply
some platform/board specific patches if needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux-ext-rtai.mk    | 2 +-
 linux/linux-ext-xenomai.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index a54230d321..150f9e8979 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -42,6 +42,6 @@ define RTAI_PREPARE_KERNEL
 endef
 endif
 
-LINUX_POST_PATCH_HOOKS += RTAI_PREPARE_KERNEL
+LINUX_PRE_PATCH_HOOKS += RTAI_PREPARE_KERNEL
 
 endif #BR2_LINUX_EXT_RTAI
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index e855deddf8..9b6772e238 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -25,6 +25,6 @@ define XENOMAI_PREPARE_KERNEL
 		--verbose
 endef
 
-LINUX_POST_EXTRACT_HOOKS += XENOMAI_PREPARE_KERNEL
+LINUX_PRE_PATCH_HOOKS += XENOMAI_PREPARE_KERNEL
 
 endif #BR2_LINUX_EXT_XENOMAI

From 5a615f5c7ca3b4019470a470424ced0dfc394ad2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:10:54 +0200
Subject: [PATCH 0680/6849] rtai: fix path to apply-patches

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux-ext-rtai.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index 150f9e8979..78488afd94 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -25,7 +25,7 @@ ifeq ($(RTAI_PATCH),)
 define RTAI_PREPARE_KERNEL
 	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
 	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
-		support/script/apply-patches.sh $(LINUX_DIR) 		\
+		support/scripts/apply-patches.sh $(LINUX_DIR) 		\
 			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\
 			hal-linux-$${kver}-*patch ; \
 	else \
@@ -35,7 +35,7 @@ define RTAI_PREPARE_KERNEL
 endef
 else
 define RTAI_PREPARE_KERNEL
-	support/script/apply-patches.sh 	\
+	support/scripts/apply-patches.sh 	\
 		$(LINUX_DIR)			\
 		$(dir $(RTAI_PATCH))		\
 		$(notdir $(RTAI_PATCH))

From 3d9979692334c917bc8c807e93d78a47849c1e06 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:10:55 +0200
Subject: [PATCH 0681/6849] rtai: Install modules in
 /lib/modules/<version>/rtai

The /lib/modules/<version>/kernel/ is completely rewritten by the
kernel module installation, so third party modules should be outside
of this directory.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rtai/rtai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
index abba614c46..a4a69f9988 100644
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -8,7 +8,7 @@ RTAI_CONF_OPT = \
 	--with-linux-dir=$(LINUX_DIR) 	\
 	--disable-leds		      	\
 	--disable-rtailab		\
-	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/kernel/rtai
+	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
 
 RTAI_MAKE = $(MAKE1)
 

From c2a43fb12a089453f0054a53905ec11406ec93ba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:10:56 +0200
Subject: [PATCH 0682/6849] xenomai: install in /usr

By default, Xenomai installs everything with --prefix=/usr/xenomai,
and passing --prefix=/usr doesn't work because installing Xenomai
headers in /usr/include creates conflicts with other headers. However,
passing --prefix=/usr and --includedir=/usr/include/xenomai just works
fine. This allows to use the default configure command of the
AUTOTARGETS infrastructure, and allows to install the Xenomai headers
and libraries into more usual locations. Furthermore, it allows to
remove the documentation/headers removal hooks, as well as the
ld.so.conf hook since now everything is installed in standard
locations.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/xenomai.mk | 54 ++++++++------------------------------
 1 file changed, 11 insertions(+), 43 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 52e0b4e54a..d2306c4449 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -28,34 +28,12 @@ ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y)
 XENOMAI_CONF_OPT += --enable-smp
 endif
 
-# The configure step needs to be overloaded, because Xenomai doesn't
-# support --prefix=/usr and the autotargets infrastructure enforces
-# this.
-define XENOMAI_CONFIGURE_CMDS
-	(cd $(@D); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
-		./configure \
-		$(XENOMAI_CONF_OPT) \
-		--host=$(GNU_TARGET_NAME) \
-	)
-endef
-
-ifeq ($(BR2_HAVE_DOCUMENTATION),)
-define XENOMAI_REMOVE_DOCUMENTATION
-	rm -rf $(TARGET_DIR)/usr/xenomai/share/doc
-	rm -rf $(TARGET_DIR)/usr/xenomai/share/man
-endef
-
-XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DOCUMENTATION
-endif
+XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
 
 ifeq ($(BR2_HAVE_DEVFILES),)
 define XENOMAI_REMOVE_DEVFILES
-	rm -rf $(TARGET_DIR)/usr/xenomai/include
 	for i in xeno-config xeno-info wrap-link.sh ; do \
-		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
 endef
 
@@ -64,15 +42,13 @@ endif
 
 ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
 define XENOMAI_REMOVE_TESTSUITE
-	rm -rf $(TARGET_DIR)/usr/xenomai/share/xenomai/testsuite/
-	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/xenomai/share/xenomai/
-	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/xenomai/share/
+	rm -rf $(TARGET_DIR)/usr/share/xenomai/
 	for i in klatency rtdm xeno xeno-load check-vdso \
 		irqloop cond-torture-posix switchtest arith \
 		sigtest clocktest cyclictest latency wakeup-time \
 		xeno-test cond-torture-native mutex-torture-posix \
 		mutex-torture-native ; do \
-		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
 endef
 
@@ -82,9 +58,9 @@ endif
 ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),)
 define XENOMAI_REMOVE_RTCAN_PROGS
 	for i in rtcanrecv rtcansend ; do \
-		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
-	rm -f $(TARGET_DIR)/usr/xenomai/sbin/rtcanconfig
+	rm -f $(TARGET_DIR)/usr/sbin/rtcanconfig
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_RTCAN_PROGS
@@ -94,10 +70,10 @@ ifeq ($(BR2_PACKAGE_XENOMAI_ANALOGY),)
 define XENOMAI_REMOVE_ANALOGY
 	for i in cmd_bits cmd_read cmd_write insn_write \
 		insn_bits insn_read ; do \
-		rm -f $(TARGET_DIR)/usr/xenomai/bin/$$i ; \
+		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
-	rm -f $(TARGET_DIR)/usr/xenomai/sbin/analogy_config
-	rm -f $(TARGET_DIR)/usr/xenomai/lib/libanalogy.*
+	rm -f $(TARGET_DIR)/usr/sbin/analogy_config
+	rm -f $(TARGET_DIR)/usr/lib/libanalogy.*
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
@@ -113,23 +89,15 @@ XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
 
 define XENOMAI_REMOVE_SKINS
 	for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \
-		rm -f $(TARGET_DIR)/usr/xenomai/lib/lib$$i.* ; \
+		rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \
 		if [ $$i == "posix" ] ; then \
-			rm -f $(TARGET_DIR)/usr/xenomai/lib/posix.wrappers ; \
+			rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \
 		fi ; \
 	done
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
 
-define XENOMAI_ADD_LD_SO_CONF
-	# Add /usr/xenomai/lib in the library search path
-	grep -q "^/usr/xenomai/lib" $(TARGET_DIR)/etc/ld.so.conf || \
-		echo "/usr/xenomai/lib" >> $(TARGET_DIR)/etc/ld.so.conf
-endef
-
-XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_ADD_LD_SO_CONF
-
 # If you use static /dev creation don't forget to update your
 #  device_table_dev.txt
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)

From 29a2f3d21be89ddbdffb53cfb20a504d44a09c27 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:04 +0200
Subject: [PATCH 0683/6849] libfuse: rename fuse to libfuse

We rename the package/fuse directory to package/libfuse to be
consistent with the package name. This is needed for a future commit
that will simplify the AUTOTARGETS macro by making assumptions on the
directory name.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    | 2 +-
 package/{fuse => libfuse}/Config.in  | 0
 package/{fuse => libfuse}/libfuse.mk | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename package/{fuse => libfuse}/Config.in (100%)
 rename package/{fuse => libfuse}/libfuse.mk (100%)

diff --git a/package/Config.in b/package/Config.in
index 451b271f8d..5d7c15dfac 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -266,7 +266,7 @@ menu "Filesystem"
 source "package/gamin/Config.in"
 source "package/libconfig/Config.in"
 source "package/libconfuse/Config.in"
-source "package/fuse/Config.in"
+source "package/libfuse/Config.in"
 source "package/liblockfile/Config.in"
 source "package/libsysfs/Config.in"
 endmenu
diff --git a/package/fuse/Config.in b/package/libfuse/Config.in
similarity index 100%
rename from package/fuse/Config.in
rename to package/libfuse/Config.in
diff --git a/package/fuse/libfuse.mk b/package/libfuse/libfuse.mk
similarity index 100%
rename from package/fuse/libfuse.mk
rename to package/libfuse/libfuse.mk

From eaee60a1f5c949d9abed25d2eb18294a693cabf1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:05 +0200
Subject: [PATCH 0684/6849] sdl_net: normalize package to sdl_net

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/games/prboom/prboom.mk | 2 +-
 package/sdl_net/sdl_net.mk     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk
index 3a50fd502f..dd749dca1e 100644
--- a/package/games/prboom/prboom.mk
+++ b/package/games/prboom/prboom.mk
@@ -5,7 +5,7 @@
 #############################################################
 PRBOOM_VERSION = 2.5.0
 PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
-PRBOOM_DEPENDENCIES = sdl SDL_net sdl_mixer
+PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 PRBOOM_DEPENDENCIES += libpng
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index f01a04c221..7b7e12a55f 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -14,6 +14,4 @@ SDL_NET_INSTALL_STAGING = YES
 
 SDL_NET_DEPENDENCIES = sdl
 
-$(eval $(call AUTOTARGETS,package,SDL_net))
-
-sdl_net: SDL_net
+$(eval $(call AUTOTARGETS,package,sdl_net))

From 11bdfeaf3bb4271fca0e4063d699bff6df4fb9df Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:06 +0200
Subject: [PATCH 0685/6849] gtk2-themes: normalize package name and directory

[Peter: fix directory argument of AUTOTARGETS macro]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gtk2-themes/Config.in                                  | 3 +--
 package/gtk2-themes/gtk2-theme-hicolor/Config.in               | 2 ++
 .../gtk2-theme-hicolor.mk}                                     | 2 +-
 package/gtk2-themes/gtk2-themes.mk                             | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 package/gtk2-themes/gtk2-theme-hicolor/Config.in
 rename package/gtk2-themes/{gtk2_themes.mk => gtk2-theme-hicolor/gtk2-theme-hicolor.mk} (90%)
 create mode 100644 package/gtk2-themes/gtk2-themes.mk

diff --git a/package/gtk2-themes/Config.in b/package/gtk2-themes/Config.in
index 351b602c05..ac212b898b 100644
--- a/package/gtk2-themes/Config.in
+++ b/package/gtk2-themes/Config.in
@@ -1,7 +1,6 @@
 menu "GTK Themes"
 depends on BR2_PACKAGE_LIBGTK2
 
-config BR2_PACKAGE_GTK2_THEME_HICOLOR
-	bool "hicolor (default theme)"
+source "package/gtk2-themes/gtk2-theme-hicolor/Config.in"
 
 endmenu
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/Config.in b/package/gtk2-themes/gtk2-theme-hicolor/Config.in
new file mode 100644
index 0000000000..144f1d8656
--- /dev/null
+++ b/package/gtk2-themes/gtk2-theme-hicolor/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_GTK2_THEME_HICOLOR
+	bool "hicolor (default theme)"
diff --git a/package/gtk2-themes/gtk2_themes.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
similarity index 90%
rename from package/gtk2-themes/gtk2_themes.mk
rename to package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index 8dc8af4873..ac2eaef824 100644
--- a/package/gtk2-themes/gtk2_themes.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -15,4 +15,4 @@ GTK2_THEME_HICOLOR_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NA
 
 GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS,package,gtk2_theme_hicolor))
+$(eval $(call AUTOTARGETS,package/gtk2-themes,gtk2-theme-hicolor))
diff --git a/package/gtk2-themes/gtk2-themes.mk b/package/gtk2-themes/gtk2-themes.mk
new file mode 100644
index 0000000000..6f31c6da98
--- /dev/null
+++ b/package/gtk2-themes/gtk2-themes.mk
@@ -0,0 +1 @@
+include package/gtk2-themes/*/*.mk

From 53b26022965cdbeafe5e584d77354c68d229805b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:07 +0200
Subject: [PATCH 0686/6849] bridge-utils: normalize package name

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bridge-utils/Config.in                 |  2 +-
 package/bridge-utils/bridge-utils.mk           | 18 ++++++++++++++++++
 .../{bridge.patch => bridge-utils.patch}       |  0
 package/bridge-utils/bridge.mk                 | 18 ------------------
 4 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 package/bridge-utils/bridge-utils.mk
 rename package/bridge-utils/{bridge.patch => bridge-utils.patch} (100%)
 delete mode 100644 package/bridge-utils/bridge.mk

diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in
index c2e8ca028c..537eb1f59f 100644
--- a/package/bridge-utils/Config.in
+++ b/package/bridge-utils/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_BRIDGE
+config BR2_PACKAGE_BRIDGE_UTILS
 	bool "bridge-utils"
 	help
 	  Manage ethernet bridging; a way to connect networks together to
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
new file mode 100644
index 0000000000..680749393d
--- /dev/null
+++ b/package/bridge-utils/bridge-utils.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# bridge-utils
+#
+#############################################################
+
+BRIDGE_UTILS_VERSION = 1.5
+BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz
+BRIDGE_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge
+BRIDGE_UTILS_AUTORECONF = YES
+BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
+
+define BRIDGE_UTILS_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
+		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
+endef
+
+$(eval $(call AUTOTARGETS,package,bridge-utils))
diff --git a/package/bridge-utils/bridge.patch b/package/bridge-utils/bridge-utils.patch
similarity index 100%
rename from package/bridge-utils/bridge.patch
rename to package/bridge-utils/bridge-utils.patch
diff --git a/package/bridge-utils/bridge.mk b/package/bridge-utils/bridge.mk
deleted file mode 100644
index 8f3f741380..0000000000
--- a/package/bridge-utils/bridge.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################################################
-#
-# bridge-utils
-#
-#############################################################
-
-BRIDGE_VERSION = 1.5
-BRIDGE_SOURCE = bridge-utils-$(BRIDGE_VERSION).tar.gz
-BRIDGE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge
-BRIDGE_AUTORECONF = YES
-BRIDGE_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
-
-define BRIDGE_UNINSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
-		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
-endef
-
-$(eval $(call AUTOTARGETS,package,bridge))

From a323d0eeabab7f86954d0b5e58d3d75acc6b6fda Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:24 +0200
Subject: [PATCH 0687/6849] gtk2-theme-hicolor: remove useless definitions

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index ac2eaef824..8aac899a72 100644
--- a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -6,12 +6,6 @@
 GTK2_THEME_HICOLOR_VERSION = 0.10
 GTK2_THEME_HICOLOR_SOURCE = hicolor-icon-theme-$(GTK2_THEME_HICOLOR_VERSION).tar.gz
 GTK2_THEME_HICOLOR_SITE = http://icon-theme.freedesktop.org/releases/
-GTK2_THEME_HICOLOR_INSTALL_STAGING = NO
-GTK2_THEME_HICOLOR_INSTALL_TARGET = YES
-
-GTK2_THEME_HICOLOR_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
-        --build=$(GNU_HOST_NAME) --prefix=/usr \
-        --includedir=/usr/include
 
 GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2
 

From 4d33cb702145f0cb9e1bad3e30cb740c21fe56b7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:23 +0200
Subject: [PATCH 0688/6849] dependencies: add rsync as a required dependency

rsync can now be used for overriden package, and will also be used for
other purposes in the future (optimization of toolchain copy time,
etc.).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/dependencies/dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 74ab2137ab..410f663fab 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -123,7 +123,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
 fi;
 
 # Check that a few mandatory programs are installed
-for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip ${DL_TOOLS} ; do
+for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
 	/bin/echo -e "\nYou must install '$prog' on your build machine";
 	if test $prog = "makeinfo" ; then

From 6c213d64b3e7babc3685af89921c645992b14aa0 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 20 Sep 2011 13:19:52 +0200
Subject: [PATCH 0689/6849] package: add openocd support

with only the following Adapters
 - FTDI FT2xxx/FT4xxx
 - J-Link (Segger and Atmel SAM-ICE)
 - Versaloon-Link JTAG Adapter

[Peter: Config.in tweaks]
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/openocd/Config.in                     | 29 ++++++++++++++++
 ...pilation-host-libsub-was-used-before.patch | 33 +++++++++++++++++++
 ...ix-xscale-uninitialise-breakpoint_pc.patch | 20 +++++++++++
 .../openocd/openocd-0003-force-gnu99.patch    | 19 +++++++++++
 .../openocd-0004-force_jimtcl_static.patch    | 25 ++++++++++++++
 package/openocd/openocd.mk                    | 32 ++++++++++++++++++
 7 files changed, 159 insertions(+)
 create mode 100644 package/openocd/Config.in
 create mode 100644 package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
 create mode 100644 package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch
 create mode 100644 package/openocd/openocd-0003-force-gnu99.patch
 create mode 100644 package/openocd/openocd-0004-force_jimtcl_static.patch
 create mode 100644 package/openocd/openocd.mk

diff --git a/package/Config.in b/package/Config.in
index 5d7c15dfac..12fd0dcf9c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -191,6 +191,7 @@ source "package/memtester/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/ntfsprogs/Config.in"
+source "package/openocd/Config.in"
 source "package/pciutils/Config.in"
 source "package/rng-tools/Config.in"
 source "package/sdparm/Config.in"
diff --git a/package/openocd/Config.in b/package/openocd/Config.in
new file mode 100644
index 0000000000..f67c0a8412
--- /dev/null
+++ b/package/openocd/Config.in
@@ -0,0 +1,29 @@
+config BR2_PACKAGE_OPENOCD
+	bool "openocd"
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	help
+	  OpenOCD - Open On-Chip Debugger
+
+	  http://openocd.berlios.de/web/
+
+if BR2_PACKAGE_OPENOCD
+
+comment "Adapters"
+
+config BR2_PACKAGE_OPENOCD_FT2XXX
+	bool "FT2xxx/FT4xxx Based JTAG Programmer"
+	select BR2_PACKAGE_LIBFTDI
+	help
+	  Enable building support for FT2232 based devices
+	  using the libftdi driver, opensource alternate of FTD2XX
+
+config BR2_PACKAGE_OPENOCD_JLINK
+	bool "Segger J-Link JTAG Programmer"
+	help
+	  Segger J-Link JTAG Programmer and clone such as Atmel SAM-ICE
+
+config BR2_PACKAGE_OPENOCD_VSLLINK
+	bool "Versaloon-Link JTAG Programmr"
+
+endif # BR2_PACKAGE_OPENOCD
diff --git a/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch b/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
new file mode 100644
index 0000000000..99ff04eb7c
--- /dev/null
+++ b/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
@@ -0,0 +1,33 @@
+From 3728c4af7f6303ccedab56ec220797f8f290580e Mon Sep 17 00:00:00 2001
+From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date: Wed, 10 Aug 2011 00:17:29 +0800
+Subject: [PATCH] fix cross compilation: host libsub was used before
+
+tested in buildroot
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ configure.in |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index dfa1e8f..cfe2218 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1046,8 +1046,11 @@ build_usb=no
+ if test $build_jlink = yes -o $build_vsllink = yes -o $build_usbprog = yes -o \
+   $build_rlink = yes -o $build_ulink = yes -o $build_armjtagew = yes
+ then
+-  AC_CHECK_HEADERS([usb.h],[],
+-  [AC_MSG_ERROR([usb.h is required to build some OpenOCD driver(s)])])
++  dnl check for libusb
++  PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
++  CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
++  LDFLAGS="$LFFLAGS $LIBUSB_LDFLAGS"
++  LIBS="$LIBS $LIBUSB_LIBS"
+   build_usb=yes
+ fi
+ 
+-- 
+1.7.5.4
+
diff --git a/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch b/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch
new file mode 100644
index 0000000000..328241ee44
--- /dev/null
+++ b/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch
@@ -0,0 +1,20 @@
+xscale: fix uninitialise breakpoint_pc
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ src/target/xscale.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/src/target/xscale.c
+===================================================================
+--- a/src/target/xscale.c
++++ b/src/target/xscale.c
+@@ -2811,7 +2811,7 @@ static int xscale_analyze_trace(struct t
+    struct xscale_common *xscale = target_to_xscale(target);
+    struct xscale_trace_data *trace_data = xscale->trace.data;
+    int i, retval;
+-   uint32_t breakpoint_pc;
++   uint32_t breakpoint_pc = 0;
+    struct arm_instruction instruction;
+    uint32_t current_pc = 0;  /* initialized when address determined */
+ 	
diff --git a/package/openocd/openocd-0003-force-gnu99.patch b/package/openocd/openocd-0003-force-gnu99.patch
new file mode 100644
index 0000000000..106d112958
--- /dev/null
+++ b/package/openocd/openocd-0003-force-gnu99.patch
@@ -0,0 +1,19 @@
+force gnu99
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ configure.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -28,6 +28,7 @@ AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
++CFLAGS="$CFLAGS -std=gnu99"
+ 
+ dnl configure checks required for Jim files (these are obsolete w/ C99)
+ AC_C_CONST
diff --git a/package/openocd/openocd-0004-force_jimtcl_static.patch b/package/openocd/openocd-0004-force_jimtcl_static.patch
new file mode 100644
index 0000000000..7118b57d73
--- /dev/null
+++ b/package/openocd/openocd-0004-force_jimtcl_static.patch
@@ -0,0 +1,25 @@
+force jimtcl to build static
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ jimtcl/auto.def |    5 -----
+ 1 file changed, 5 deletions(-)
+
+Index: b/jimtcl/auto.def
+===================================================================
+--- a/jimtcl/auto.def
++++ b/jimtcl/auto.def
+@@ -148,13 +148,8 @@ if {[opt-bool references]} {
+     msg-result "Enabling references"
+     define JIM_REFERENCES
+ }
+-if {[opt-bool shared with-jim-shared]} {
+-    msg-result "Building shared library"
+-    define JIM_LIBTYPE shared
+-} else {
+     msg-result "Building static library"
+     define JIM_LIBTYPE static
+-}
+ if {[opt-bool install-jim]} {
+     define install_jim 1
+ } else {
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
new file mode 100644
index 0000000000..74585d3632
--- /dev/null
+++ b/package/openocd/openocd.mk
@@ -0,0 +1,32 @@
+#############################################################
+#
+# openocd
+#
+#############################################################
+OPENOCD_VERSION:=0.5.0
+OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
+OPENOCD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
+
+OPENOCD_AUTORECONF = YES
+OPENOCD_CONF_OPT = \
+	--oldincludedir=$(STAGING_DIR)/usr/include \
+	--includedir=$(STAGING_DIR)/usr/include \
+	--disable-doxygen-html \
+	--enable-dummy
+
+OPENOCD_DEPENDENCIES = libusb-compat
+
+# Adapters
+ifeq ($(BR2_PACKAGE_OPENOCD_FT2XXX),y)
+OPENOCD_CONF_OPT += --enable-ft2232_libftdi
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOCD_JLINK),y)
+OPENOCD_CONF_OPT += --enable-jlink
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOCD_VSLLINK),y)
+OPENOCD_CONF_OPT += --enable-vsllink
+endif
+
+$(eval $(call AUTOTARGETS,package,openocd))

From 945b5356faae24b6d474d370e16e543090ce2a44 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 23 Sep 2011 10:50:09 +0200
Subject: [PATCH 0690/6849] taglib: bump to 1.7

Bump the version of taglib to 1.7. This version does not any longer
ship with a configure script so convert the package from autotargets
to cmaketargets.

The 1.7 version offers optional support for MP4 and WMA files.
Expose these options in buildroot.

[Peter: drop unneded dependencies, keep target install, fix Config.in indent]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/taglib/Config.in           |    9 +
 .../taglib/taglib-1.5-libtool.patch           | 4084 -----------------
 package/multimedia/taglib/taglib.mk           |   16 +-
 3 files changed, 17 insertions(+), 4092 deletions(-)
 delete mode 100644 package/multimedia/taglib/taglib-1.5-libtool.patch

diff --git a/package/multimedia/taglib/Config.in b/package/multimedia/taglib/Config.in
index 3d688a76ce..d172c34ade 100644
--- a/package/multimedia/taglib/Config.in
+++ b/package/multimedia/taglib/Config.in
@@ -1,3 +1,4 @@
+
 config BR2_PACKAGE_TAGLIB
 	bool "taglib"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -9,5 +10,13 @@ config BR2_PACKAGE_TAGLIB
 
 	  http://developer.kde.org/~wheeler/taglib.html
 
+config BR2_PACKAGE_TAGLIB_MP4
+	depends on BR2_PACKAGE_TAGLIB
+	bool "taglib mp4 support"
+
+config BR2_PACKAGE_TAGLIB_ASF
+	depends on BR2_PACKAGE_TAGLIB
+	bool "taglib wma support"
+
 comment "taglib requires a toolchain with C++ support enabled"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/taglib/taglib-1.5-libtool.patch b/package/multimedia/taglib/taglib-1.5-libtool.patch
deleted file mode 100644
index d4160f0ab4..0000000000
--- a/package/multimedia/taglib/taglib-1.5-libtool.patch
+++ /dev/null
@@ -1,4084 +0,0 @@
-[PATCH] fix libtool
-
-Update to 1.5.22 so it doesn't get confused about rpath, and apply
-buildroot-libtool-v1.5.patch so cross compilation works.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- admin/ltmain.sh | 2080 ++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 1284 insertions(+), 796 deletions(-)
-
-Index: taglib-1.5/admin/ltmain.sh
-===================================================================
---- taglib-1.5.orig/admin/ltmain.sh
-+++ taglib-1.5/admin/ltmain.sh
-@@ -1,7 +1,7 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -24,6 +24,34 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+basename="s,^.*/,,g"
-+
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
-+
-+# The name of this program:
-+progname=`echo "$progpath" | $SED $basename`
-+modename="$progname"
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
-+
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.5.22
-+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+  setopt NO_GLOB_SUBST
-+fi
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-@@ -36,7 +64,7 @@
-   :
- else
-   # Restart under the correct shell, and then maybe $echo will work.
--  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
- fi
- 
- if test "X$1" = X--fallback-echo; then
-@@ -45,19 +73,9 @@
-   cat <<EOF
- $*
- EOF
--  exit 0
-+  exit $EXIT_SUCCESS
- fi
- 
--# The name of this program.
--progname=`$echo "$0" | ${SED} 's%^.*/%%'`
--modename="$progname"
--
--# Constants.
--PROGRAM=ltmain.sh
--PACKAGE=libtool
--VERSION=1.5a
--TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
--
- default_mode=
- help="Try \`$progname --help' for more information."
- magic="%%%MAGIC variable%%%"
-@@ -70,14 +88,15 @@
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- # test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  SP2NL='tr \040 \012'
-+  NL2SP='tr \015\012 \040\040'
-   ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
-+ *) # EBCDIC based system
-+  SP2NL='tr \100 \n'
-+  NL2SP='tr \r\n \100\100'
-   ;;
- esac
- 
-@@ -94,12 +113,14 @@
- fi
- 
- # Make sure IFS has a sensible default
--: ${IFS=" 	"}
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   $echo "$modename: not configured to build any kind of library" 1>&2
-   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--  exit 1
-+  exit $EXIT_FAILURE
- fi
- 
- # Global variables.
-@@ -111,6 +132,8 @@
- show="$echo"
- show_help=
- execute_dlfiles=
-+duplicate_deps=no
-+preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- 
-@@ -118,10 +141,51 @@
- # Shell function definitions:
- # This seems to be the best place for them
- 
-+# func_mktempdir [string]
-+# Make a temporary directory that won't clash with other running
-+# libtool processes, and avoids race conditions if possible.  If
-+# given, STRING is the basename for that directory.
-+func_mktempdir ()
-+{
-+    my_template="${TMPDIR-/tmp}/${1-$progname}"
-+
-+    if test "$run" = ":"; then
-+      # Return a directory name, but don't create it in dry-run mode
-+      my_tmpdir="${my_template}-$$"
-+    else
-+
-+      # If mktemp works, use that first and foremost
-+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-+
-+      if test ! -d "$my_tmpdir"; then
-+	# Failing that, at least try and use $RANDOM to avoid a race
-+	my_tmpdir="${my_template}-${RANDOM-0}$$"
-+
-+	save_mktempdir_umask=`umask`
-+	umask 0077
-+	$mkdir "$my_tmpdir"
-+	umask $save_mktempdir_umask
-+      fi
-+
-+      # If we're not in dry-run mode, bomb out on failure
-+      test -d "$my_tmpdir" || {
-+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-+	exit $EXIT_FAILURE
-+      }
-+    fi
-+
-+    $echo "X$my_tmpdir" | $Xsed
-+}
-+
-+
-+# func_win32_libid arg
-+# return the library type of file 'arg'
-+#
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
--win32_libid () {
-+func_win32_libid ()
-+{
-   win32_libid_type="unknown"
-   win32_fileres=`file -L $1 2>/dev/null`
-   case $win32_fileres in
-@@ -130,17 +194,16 @@
-     ;;
-   *ar\ archive*) # could be an import, or static
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
--      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-       win32_nmres=`eval $NM -f posix -A $1 | \
--	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
--      if test "X$win32_nmres" = "Ximport" ; then
--        win32_libid_type="x86 archive import"
--      else
--        win32_libid_type="x86 archive static"
--      fi
-+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-+      case $win32_nmres in
-+      import*)  win32_libid_type="x86 archive import";;
-+      *)        win32_libid_type="x86 archive static";;
-+      esac
-     fi
-     ;;
--  *DLL*) 
-+  *DLL*)
-     win32_libid_type="x86 DLL"
-     ;;
-   *executable*) # but shell scripts are "executable" too...
-@@ -154,9 +217,182 @@
-   $echo $win32_libid_type
- }
- 
-+
-+# func_infer_tag arg
-+# Infer tagged configuration to use if any are available and
-+# if one wasn't chosen via the "--tag" command line option.
-+# Only attempt this if the compiler in the base compile
-+# command doesn't match the default compiler.
-+# arg is usually of the form 'gcc ...'
-+func_infer_tag ()
-+{
-+    if test -n "$available_tags" && test -z "$tagname"; then
-+      CC_quoted=
-+      for arg in $CC; do
-+	case $arg in
-+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	CC_quoted="$CC_quoted $arg"
-+      done
-+      case $@ in
-+      # Blanks in the command may have been stripped by the calling shell,
-+      # but not from the CC environment variable when configure was run.
-+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-+      # Blanks at the start of $base_compile will cause this to fail
-+      # if we don't check for them as well.
-+      *)
-+	for z in $available_tags; do
-+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-+	    # Evaluate the configuration.
-+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-+	    CC_quoted=
-+	    for arg in $CC; do
-+	    # Double-quote args containing other shell metacharacters.
-+	    case $arg in
-+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	      arg="\"$arg\""
-+	      ;;
-+	    esac
-+	    CC_quoted="$CC_quoted $arg"
-+	  done
-+	    case "$@ " in
-+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-+	      # The compiler in the base compile command matches
-+	      # the one in the tagged configuration.
-+	      # Assume this is the tagged configuration we want.
-+	      tagname=$z
-+	      break
-+	      ;;
-+	    esac
-+	  fi
-+	done
-+	# If $tagname still isn't set, then no tagged configuration
-+	# was found and let the user know that the "--tag" command
-+	# line option must be used.
-+	if test -z "$tagname"; then
-+	  $echo "$modename: unable to infer tagged configuration"
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
-+#        else
-+#          $echo "$modename: using $tagname tagged configuration"
-+	fi
-+	;;
-+      esac
-+    fi
-+}
-+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+
-+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
-+}
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+    my_status=""
-+
-+    $show "${rm}r $my_gentop"
-+    $run ${rm}r "$my_gentop"
-+    $show "$mkdir $my_gentop"
-+    $run $mkdir "$my_gentop"
-+    my_status=$?
-+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+      exit $my_status
-+    fi
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
-+
-+      $show "${rm}r $my_xdir"
-+      $run ${rm}r "$my_xdir"
-+      $show "$mkdir $my_xdir"
-+      $run $mkdir "$my_xdir"
-+      exit_status=$?
-+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $exit_status
-+      fi
-+      case $host in
-+      *-darwin*)
-+	$show "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	if test -z "$run"; then
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+	  if test -n "$darwin_arches"; then 
-+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      lipo -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    ${rm}r unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd "$darwin_orig_dir"
-+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	fi # $run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+        ;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+    func_extract_archives_result="$my_oldobjs"
-+}
- # End of Shell function definitions
- #####################################
- 
-+# Darwin sucks
-+eval std_shrext=\"$shrext_cmds\"
-+
-+disable_libs=no
-+
- # Parse our command line options once, thoroughly.
- while test "$#" -gt 0
- do
-@@ -176,12 +412,13 @@
-       ;;
-     tag)
-       tagname="$arg"
-+      preserve_args="${preserve_args}=$arg"
- 
-       # Check whether tagname contains only valid characters
-       case $tagname in
-       *[!-_A-Za-z0-9,/]*)
- 	$echo "$progname: invalid tag name: $tagname" 1>&2
--	exit 1
-+	exit $EXIT_FAILURE
- 	;;
-       esac
- 
-@@ -191,10 +428,10 @@
- 	# not specially marked.
- 	;;
-       *)
--	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
-+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
- 	  taglist="$taglist $tagname"
- 	  # Evaluate the configuration.
--	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
- 	else
- 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
- 	fi
-@@ -220,24 +457,25 @@
-   --version)
-     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-     $echo
--    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-     $echo "This is free software; see the source for copying conditions.  There is NO"
-     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit 0
-+    exit $?
-     ;;
- 
-   --config)
--    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-     # Now print the configurations for the tags.
-     for tagname in $taglist; do
--      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
-+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-     done
--    exit 0
-+    exit $?
-     ;;
- 
-   --debug)
-     $echo "$progname: enabling shell trace mode"
-     set -x
-+    preserve_args="$preserve_args $arg"
-     ;;
- 
-   --dry-run | -n)
-@@ -256,7 +494,7 @@
-     else
-       $echo "disable static libraries"
-     fi
--    exit 0
-+    exit $?
-     ;;
- 
-   --finish) mode="finish" ;;
-@@ -268,13 +506,19 @@
- 
-   --quiet | --silent)
-     show=:
-+    preserve_args="$preserve_args $arg"
-     ;;
- 
--  --tag) prevopt="--tag" prev=tag ;;
-+  --tag)
-+    prevopt="--tag"
-+    prev=tag
-+    preserve_args="$preserve_args --tag"
-+    ;;
-   --tag=*)
-     set tag "$optarg" ${1+"$@"}
-     shift
-     prev=tag
-+    preserve_args="$preserve_args --tag"
-     ;;
- 
-   -dlopen)
-@@ -285,7 +529,7 @@
-   -*)
-     $echo "$modename: unrecognized option \`$arg'" 1>&2
-     $echo "$help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-     ;;
- 
-   *)
-@@ -298,9 +542,21 @@
- if test -n "$prevopt"; then
-   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-   $echo "$help" 1>&2
--  exit 1
-+  exit $EXIT_FAILURE
- fi
- 
-+case $disable_libs in
-+no) 
-+  ;;
-+shared)
-+  build_libtool_libs=no
-+  build_old_libs=yes
-+  ;;
-+static)
-+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-+  ;;
-+esac
-+
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
-@@ -311,7 +567,7 @@
-   # Infer the operation mode.
-   if test -z "$mode"; then
-     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-     case $nonopt in
-     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-@@ -354,7 +610,7 @@
-   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-     $echo "$help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-   fi
- 
-   # Change the help message to a mode-specific one.
-@@ -369,13 +625,15 @@
-     # Get the compilation command and the source file.
-     base_compile=
-     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-+    suppress_opt=yes
-     suppress_output=
-     arg_mode=normal
-     libobj=
-+    later=
- 
-     for arg
-     do
--      case "$arg_mode" in
-+      case $arg_mode in
-       arg  )
- 	# do not "continue".  Instead, add this to base_compile
- 	lastarg="$arg"
-@@ -394,24 +652,19 @@
- 	-o)
- 	  if test -n "$libobj" ; then
- 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  arg_mode=target
- 	  continue
- 	  ;;
- 
--	-static)
--	  build_old_libs=yes
-+	-static | -prefer-pic | -prefer-non-pic)
-+	  later="$later $arg"
- 	  continue
- 	  ;;
- 
--	-prefer-pic)
--	  pic_mode=yes
--	  continue
--	  ;;
--
--	-prefer-non-pic)
--	  pic_mode=no
-+	-no-suppress)
-+	  suppress_opt=no
- 	  continue
- 	  ;;
- 
-@@ -424,7 +677,7 @@
- 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
- 	  lastarg=
- 	  save_ifs="$IFS"; IFS=','
--	  for arg in $args; do
-+ 	  for arg in $args; do
- 	    IFS="$save_ifs"
- 
- 	    # Double-quote args containing other shell metacharacters.
-@@ -462,7 +715,10 @@
-       case $lastarg in
-       # Double-quote args containing other shell metacharacters.
-       # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, so we specify it separately.
-+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-+      # in scan sets (worked around with variable expansion),
-+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-+      # at all, so we specify them separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-@@ -474,11 +730,11 @@
-     case $arg_mode in
-     arg)
-       $echo "$modename: you must specify an argument for -Xcompile"
--      exit 1
-+      exit $EXIT_FAILURE
-       ;;
-     target)
-       $echo "$modename: you must specify a target with \`-o'" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-       ;;
-     *)
-       # Get the name of the library object.
-@@ -511,51 +767,39 @@
-     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-     *)
-       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-       ;;
-     esac
- 
--    # Infer tagged configuration to use if any are available and
--    # if one wasn't chosen via the "--tag" command line option.
--    # Only attempt this if the compiler in the base compile
--    # command doesn't match the default compiler.
--    if test -n "$available_tags" && test -z "$tagname"; then
--      case $base_compile in
--      # Blanks in the command may have been stripped by the calling shell,
--      # but not from the CC environment variable when configure was run.
--      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
--      # Blanks at the start of $base_compile will cause this to fail
--      # if we don't check for them as well.
--      *)
--	for z in $available_tags; do
--	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
--	    # Evaluate the configuration.
--	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
--	    case "$base_compile " in
--	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
--	      # The compiler in the base compile command matches
--	      # the one in the tagged configuration.
--	      # Assume this is the tagged configuration we want.
--	      tagname=$z
--	      break
--	      ;;
--	    esac
--	  fi
--	done
--	# If $tagname still isn't set, then no tagged configuration
--	# was found and let the user know that the "--tag" command
--	# line option must be used.
--	if test -z "$tagname"; then
--	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
--#        else
--#          $echo "$modename: using $tagname tagged configuration"
--	fi
-+    func_infer_tag $base_compile
-+
-+    for arg in $later; do
-+      case $arg in
-+      -static)
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
- 	;;
-       esac
--    fi
-+    done
- 
-+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-+    case $qlibobj in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qlibobj="\"$qlibobj\"" ;;
-+    esac
-+    test "X$libobj" != "X$qlibobj" \
-+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-     if test "X$xdir" = "X$obj"; then
-@@ -568,7 +812,7 @@
-     if test -z "$base_compile"; then
-       $echo "$modename: you must specify a compilation command" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     # Delete any leftover library objects.
-@@ -579,7 +823,7 @@
-     fi
- 
-     $run $rm $removelist
--    trap "$run $rm $removelist; exit 1" 1 2 15
-+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
- 
-     # On Cygwin there's no "real" PIC flag so we must build both object types
-     case $host_os in
-@@ -598,7 +842,7 @@
-       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-       removelist="$removelist $output_obj $lockfile"
--      trap "$run $rm $removelist; exit 1" 1 2 15
-+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-     else
-       output_obj=
-       need_locks=no
-@@ -608,7 +852,7 @@
-     # Lock this critical section if it is needed
-     # We use this script file to make the link, it avoids creating a new file
-     if test "$need_locks" = yes; then
--      until $run ln "$0" "$lockfile" 2>/dev/null; do
-+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
- 	$show "Waiting for $lockfile to be removed"
- 	sleep 2
-       done
-@@ -626,14 +870,19 @@
- compiler."
- 
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
--      $echo $srcfile > "$lockfile"
-+      $echo "$srcfile" > "$lockfile"
-     fi
- 
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
-+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-+    case $qsrcfile in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+      qsrcfile="\"$qsrcfile\"" ;;
-+    esac
- 
-     $run $rm "$libobj" "${libobj}T"
- 
-@@ -655,18 +904,18 @@
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
- 
-       if test ! -d "${xdir}$objdir"; then
- 	$show "$mkdir ${xdir}$objdir"
- 	$run $mkdir ${xdir}$objdir
--	status=$?
--	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
--	  exit $status
-+	exit_status=$?
-+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-+	  exit $exit_status
- 	fi
-       fi
- 
-@@ -681,7 +930,7 @@
-       if $run eval "$command"; then :
-       else
- 	test -n "$output_obj" && $run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       if test "$need_locks" = warn &&
-@@ -701,7 +950,7 @@
- compiler."
- 
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       # Just move the object if needed, then go on to compile the next one
-@@ -722,7 +971,9 @@
- EOF
- 
-       # Allow error messages only from the first compilation.
--      suppress_output=' >/dev/null 2>&1'
-+      if test "$suppress_opt" = yes; then
-+        suppress_output=' >/dev/null 2>&1'
-+      fi
-     else
-       # No PIC object so indicate it doesn't exist in the libtool
-       # object file.
-@@ -736,9 +987,9 @@
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -751,7 +1002,7 @@
-       if $run eval "$command"; then :
-       else
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       if test "$need_locks" = warn &&
-@@ -771,7 +1022,7 @@
- compiler."
- 
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       # Just move the object if needed
-@@ -809,7 +1060,7 @@
-       $run $rm "$lockfile"
-     fi
- 
--    exit 0
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   # libtool link mode
-@@ -835,7 +1086,7 @@
-       ;;
-     esac
-     libtool_args="$nonopt"
--    base_compile="$nonopt"
-+    base_compile="$nonopt $@"
-     compile_command="$nonopt"
-     finalize_command="$nonopt"
- 
-@@ -847,7 +1098,6 @@
-     old_convenience=
-     deplibs=
-     old_deplibs=
--    add_flags=
-     compiler_flags=
-     linker_flags=
-     dllsearchpath=
-@@ -868,6 +1118,8 @@
-     no_install=no
-     objs=
-     non_pic_objects=
-+    notinst_path= # paths that contain not-installed libtool libraries
-+    precious_files_regex=
-     prefer_static_libs=no
-     preload=no
-     prev=
-@@ -881,6 +1133,8 @@
-     vinfo=
-     vinfo_number=no
- 
-+    func_infer_tag $base_compile
-+
-     # We need to know -static, to get the right output filenames.
-     for arg
-     do
-@@ -893,14 +1147,15 @@
- 	  if test -n "$link_static_flag"; then
- 	    dlopen_self=$dlopen_self_static
- 	  fi
-+	  prefer_static_libs=yes
- 	else
- 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
- 	    dlopen_self=$dlopen_self_static
- 	  fi
-+	  prefer_static_libs=built
- 	fi
- 	build_libtool_libs=no
- 	build_old_libs=yes
--	prefer_static_libs=yes
- 	break
- 	;;
-       esac
-@@ -912,7 +1167,6 @@
-     # Go through the arguments, transforming them on the way.
-     while test "$#" -gt 0; do
-       arg="$1"
--      base_compile="$base_compile $arg"
-       shift
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-@@ -976,7 +1230,7 @@
- 	  export_symbols="$arg"
- 	  if test ! -f "$arg"; then
- 	    $echo "$modename: symbol file \`$arg' does not exist"
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  prev=
- 	  continue
-@@ -991,6 +1245,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+	precious_regex)
-+	  precious_files_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
-@@ -1023,7 +1282,7 @@
- 		   test "$pic_object" = none && \
- 		   test "$non_pic_object" = none; then
- 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--		  exit 1
-+		  exit $EXIT_FAILURE
- 		fi
- 
- 		# Extract subdirectory from the argument.
-@@ -1071,12 +1330,17 @@
- 		  if test -z "$pic_object" || test "$pic_object" = none ; then
- 		    arg="$non_pic_object"
- 		  fi
-+		else
-+		  # If the PIC object exists, use it instead.
-+		  # $xdir was prepended to $pic_object above.
-+		  non_pic_object="$pic_object"
-+		  non_pic_objects="$non_pic_objects $non_pic_object"
- 		fi
- 	      else
- 		# Only an error if not doing a dry-run.
- 		if test -z "$run"; then
- 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
--		  exit 1
-+		  exit $EXIT_FAILURE
- 		else
- 		  # Dry-run case.
- 
-@@ -1097,7 +1361,7 @@
- 	    done
- 	  else
- 	    $echo "$modename: link input file \`$save_arg' does not exist"
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  arg=$save_arg
- 	  prev=
-@@ -1109,7 +1373,7 @@
- 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
- 	  *)
- 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	    ;;
- 	  esac
- 	  if test "$prev" = rpath; then
-@@ -1149,16 +1413,15 @@
- 	  finalize_command="$finalize_command $qarg"
- 	  continue
- 	  ;;
--	framework)
--	  case $host in
--	    *-*-darwin*)
--	      case "$deplibs " in
--	        *" $qarg.ltframework "*) ;;
--		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
--		   ;;
--              esac
--              ;;
--   	  esac
-+	shrext)
-+  	  shrext_cmds="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	darwin_framework|darwin_framework_skip)
-+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
- 	  prev=
- 	  continue
- 	  ;;
-@@ -1210,7 +1473,7 @@
-       -export-symbols | -export-symbols-regex)
- 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	if test "X$arg" = "X-export-symbols"; then
- 	  prev=expsyms
-@@ -1220,6 +1483,18 @@
- 	continue
- 	;;
- 
-+      -framework|-arch|-isysroot)
-+	case " $CC " in
-+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-+		prev=darwin_framework_skip ;;
-+	  *) compiler_flags="$compiler_flags $arg"
-+	     prev=darwin_framework ;;
-+	esac
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+	continue
-+	;;
-+
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -1246,7 +1521,8 @@
- 	  absdir=`cd "$dir" && pwd`
- 	  if test -z "$absdir"; then
- 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
--	    exit 1
-+	    absdir="$dir"
-+	    notinst_path="$notinst_path $dir"
- 	  fi
- 	  dir="$absdir"
- 	  ;;
-@@ -1260,10 +1536,15 @@
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
- 	  *) dllsearchpath="$dllsearchpath:$dir";;
- 	  esac
-+	  case :$dllsearchpath: in
-+	  *":$testbindir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  esac
- 	  ;;
- 	esac
- 	continue
-@@ -1272,26 +1553,35 @@
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
--	  *-*-mingw* | *-*-os2*)
-+	  *-*-os2*)
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C and math libraries are in the System framework
--	    deplibs="$deplibs System.ltframework"
-+	    deplibs="$deplibs -framework System"
- 	    continue
-+	    ;;
-+	  *-*-sco3.2v5* | *-*-sco5v6*)
-+	    # Causes problems with __ctype
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+	    # Compiler inserts libc in the correct place for threads to work
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd*)
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1301,18 +1591,41 @@
- 	continue
- 	;;
- 
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      -model)
-+	compile_command="$compile_command $arg"
-+	compiler_flags="$compiler_flags $arg"
-+	finalize_command="$finalize_command $arg"
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+	compiler_flags="$compiler_flags $arg"
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
- 	;;
- 
--      # gcc -m* arguments should be passed to the linker via $compiler_flags
--      # in order to pass architecture information to the linker
--      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
--      # but this is not reliable with gcc because gcc may use -mfoo to
--      # select a different linker, different libraries, etc, while
--      # -Wl,-mfoo simply passes -mfoo to the linker.
--      -m*)
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m* pass through architecture-specific compiler args for GCC
-+      # -m*, -t[45]*, -txscale* pass through architecture-specific
-+      # compiler args for GCC
-+      # -pg pass through profiling flag for GCC
-+      # @file GCC response files
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-+      -t[45]*|-txscale*|@*)
-+
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1323,9 +1636,7 @@
- 	esac
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
--        if test "$with_gcc" = "yes" ; then
--          compiler_flags="$compiler_flags $arg"
--        fi
-+        compiler_flags="$compiler_flags $arg"
-         continue
-         ;;
- 
-@@ -1365,6 +1676,11 @@
- 
-       -o) prev=output ;;
- 
-+      -precious-files-regex)
-+	prev=precious_regex
-+	continue
-+	;;
-+
-       -release)
- 	prev=release
- 	continue
-@@ -1387,7 +1703,7 @@
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 	case "$xrpath " in
-@@ -1473,11 +1789,6 @@
- 	continue
- 	;;
- 
--      -framework)
--        prev=framework
--	continue
--	;;
--
-       # Some other compiler flag.
-       -* | +*)
- 	# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1799,6 @@
- 	  arg="\"$arg\""
- 	  ;;
- 	esac
--	add_flags="$add_flags $arg"
- 	;;
- 
-       *.$objext)
-@@ -1516,7 +1826,7 @@
- 	     test "$pic_object" = none && \
- 	     test "$non_pic_object" = none; then
- 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 
- 	  # Extract subdirectory from the argument.
-@@ -1564,12 +1874,17 @@
- 	    if test -z "$pic_object" || test "$pic_object" = none ; then
- 	      arg="$non_pic_object"
- 	    fi
-+	  else
-+	    # If the PIC object exists, use it instead.
-+	    # $xdir was prepended to $pic_object above.
-+	    non_pic_object="$pic_object"
-+	    non_pic_objects="$non_pic_objects $non_pic_object"
- 	  fi
- 	else
- 	  # Only an error if not doing a dry-run.
- 	  if test -z "$run"; then
- 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  else
- 	    # Dry-run case.
- 
-@@ -1623,7 +1938,6 @@
- 	  arg="\"$arg\""
- 	  ;;
- 	esac
--	add_flags="$add_flags $arg"
- 	;;
-       esac # arg
- 
-@@ -1637,48 +1951,7 @@
-     if test -n "$prev"; then
-       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-       $echo "$help" 1>&2
--      exit 1
--    fi
--
--    # Infer tagged configuration to use if any are available and
--    # if one wasn't chosen via the "--tag" command line option.
--    # Only attempt this if the compiler in the base link
--    # command doesn't match the default compiler.
--    if test -n "$available_tags" && test -z "$tagname"; then
--      case $base_compile in
--      # Blanks in the command may have been stripped by the calling shell,
--      # but not from the CC environment variable when configure was run.
--      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
--      # Blanks at the start of $base_compile will cause this to fail
--      # if we don't check for them as well.
--      *)
--	for z in $available_tags; do
--	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
--	    # Evaluate the configuration.
--	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
--	    case $base_compile in
--	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
--	      # The compiler in $compile_command matches
--	      # the one in the tagged configuration.
--	      # Assume this is the tagged configuration we want.
--	      tagname=$z
--	      break
--	      ;;
--	    esac
--	  fi
--	done
--	# If $tagname still isn't set, then no tagged configuration
--	# was found and let the user know that the "--tag" command
--	# line option must be used.
--	if test -z "$tagname"; then
--	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
--#       else
--#         $echo "$modename: using $tagname tagged configuration"
--	fi
--	;;
--      esac
-+      exit $EXIT_FAILURE
-     fi
- 
-     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1711,9 +1984,9 @@
-     if test ! -d "$output_objdir"; then
-       $show "$mkdir $output_objdir"
-       $run $mkdir $output_objdir
--      status=$?
--      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
--	exit $status
-+      exit_status=$?
-+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-+	exit $exit_status
-       fi
-     fi
- 
-@@ -1722,7 +1995,7 @@
-     "")
-       $echo "$modename: you must specify an output file" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-       ;;
-     *.$libext) linkmode=oldlib ;;
-     *.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +2005,7 @@
- 
-     case $host in
-     *cygwin* | *mingw* | *pw32*)
--      # don't eliminate duplcations in $postdeps and $predeps
-+      # don't eliminate duplications in $postdeps and $predeps
-       duplicate_compiler_generated_deps=yes
-       ;;
-     *)
-@@ -1776,7 +2049,6 @@
-     newlib_search_path=
-     need_relink=no # whether we're linking any uninstalled libtool libraries
-     notinst_deplibs= # not-installed libtool libraries
--    notinst_path= # paths that contain not-installed libtool libraries
-     case $linkmode in
-     lib)
- 	passes="conv link"
-@@ -1785,7 +2057,7 @@
- 	  *.la) ;;
- 	  *)
- 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	    ;;
- 	  esac
- 	done
-@@ -1823,18 +2095,23 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    compiler_flags="$compiler_flags $deplib"
-+	  fi
-+	  continue
-+	  ;;
- 	-l*)
- 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
- 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
- 	    continue
- 	  fi
--	  if test "$pass" = conv && test "$allow_undefined" = yes; then
--	    deplibs="$deplib $deplibs"
--	    continue
--	  fi
- 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
--	    for search_ext in .la $shrext .so .a; do
-+	    for search_ext in .la $std_shrext .so .a; do
- 	      # Search the libtool library
- 	      lib="$searchdir/lib${name}${search_ext}"
- 	      if test -f "$lib"; then
-@@ -1895,18 +2172,6 @@
- 	    fi
- 	  fi
- 	  ;; # -l
--	*.ltframework)
--	  if test "$linkmode,$pass" = "prog,link"; then
--	    compile_deplibs="$deplib $compile_deplibs"
--	    finalize_deplibs="$deplib $finalize_deplibs"
--	  else
--	    deplibs="$deplib $deplibs"
--	    if test "$linkmode" = lib ; then
--	      newdependency_libs="$deplib $newdependency_libs"
--	    fi
--	  fi
--	  continue
--	  ;;
- 	-L*)
- 	  case $linkmode in
- 	  lib)
-@@ -1922,11 +2187,11 @@
- 	    fi
- 	    if test "$pass" = scan; then
- 	      deplibs="$deplib $deplibs"
--	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    else
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
-+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    ;;
- 	  *)
- 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2219,22 @@
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+		set dummy $deplibs_check_method
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | $SED 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
- 	      $echo
- 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
- 	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2004,15 +2284,15 @@
- 	esac # case $deplib
- 	if test "$found" = yes || test -f "$lib"; then :
- 	else
--	  $echo "$modename: cannot find the library \`$lib'" 1>&2
--	  exit 1
-+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# Check to see that this really is a libtool archive.
- 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- 	else
- 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2308,8 @@
- 	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
- 	shouldnotlink=no
-+	avoidtemprpath=
-+
- 
- 	# Read the .la file
- 	case $lib in
-@@ -2035,13 +2317,6 @@
- 	*) . ./$lib ;;
- 	esac
- 
--	case $host in
--	*-*-darwin*)
--	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
--	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
--	  ;;
--	esac
--
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2327,32 @@
- 	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
- 	  deplibs="$lib $deplibs"
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    #echo "Adding $deplib to \$deplibs"
--	    deplibs="$deplib $deplibs"
--            if test "X$duplicate_deps" = "Xyes" ; then
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
--            fi
--	    tmp_libs="$tmp_libs $deplib"
--	  done
- 	  if test -z "$libdir"; then
- 	    if test -z "$old_library"; then
- 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	      exit 1
-+	      exit $EXIT_FAILURE
- 	    fi
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+              if test "X$duplicate_deps" = "Xyes" ; then
-+	        case "$tmp_libs " in
-+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	        esac
-+              fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  continue
- 	fi # $pass = conv
- 
--    
-+
- 	# Get the name of the library we link against.
- 	linklib=
- 	for l in $old_library $library_names; do
-@@ -2086,16 +2360,18 @@
- 	done
- 	if test -z "$linklib"; then
- 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# This library was specified with -dlopen.
- 	if test "$pass" = dlopen; then
- 	  if test -z "$libdir"; then
- 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
--	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	  if test -z "$dlname" ||
-+	     test "$dlopen_support" != yes ||
-+	     test "$build_libtool_libs" = no; then
- 	    # If there is no dlname, no dlopen support or we're linking
- 	    # statically, we need to preload.  We also need to preload any
- 	    # dependent libraries so libltdl's deplib preloader doesn't
-@@ -2129,14 +2405,28 @@
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
- 	fi # $installed = yes
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
-@@ -2144,7 +2434,7 @@
- 	if test "$pass" = dlpreopen; then
- 	  if test -z "$libdir"; then
- 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
- 	  # are required to link).
-@@ -2171,7 +2461,7 @@
- 	  continue
- 	fi
- 
--    
-+
- 	if test "$linkmode" = prog && test "$pass" != link; then
- 	  newlib_search_path="$newlib_search_path $ladir"
- 	  deplibs="$lib $deplibs"
-@@ -2209,12 +2499,12 @@
- 	  if test -n "$library_names" &&
- 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	    # We need to hardcode the library path
--	    if test -n "$shlibpath_var"; then
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath " in
- 	      *" $dir "*) ;;
- 	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $dir" ;;
-+	      *) temp_rpath="$temp_rpath $absdir" ;;
- 	      esac
- 	    fi
- 
-@@ -2251,24 +2541,29 @@
- 	fi
- 
- 	link_static=no # Whether the deplib will be linked statically
-+	use_static_libs=$prefer_static_libs
-+	if test "$use_static_libs" = built && test "$installed" = yes ; then
-+	  use_static_libs=no
-+	fi
- 	if test -n "$library_names" &&
--	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
- 	  if test "$installed" = no; then
- 	    notinst_deplibs="$notinst_deplibs $lib"
--	    need_relink=yes
-+	    need_relink=no
- 	  fi
- 	  # This is a shared library
--	
--      # Warn about portability, can't link against -module's on some systems (darwin)
--      if test "$shouldnotlink" = yes && test "$pass" = link ; then
-+
-+	  # Warn about portability, can't link against -module's on
-+	  # some systems (darwin)
-+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
- 	    $echo
- 	    if test "$linkmode" = prog; then
- 	      $echo "*** Warning: Linking the executable $output against the loadable module"
- 	    else
- 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
- 	    fi
--	    $echo "*** $linklib is not portable!"    
--      fi	  
-+	    $echo "*** $linklib is not portable!"
-+	  fi
- 	  if test "$linkmode" = lib &&
- 	     test "$hardcode_into_libs" = yes; then
- 	    # Hardcode the library path.
-@@ -2326,9 +2621,10 @@
- 	    else
- 	      $show "extracting exported symbol list from \`$soname'"
- 	      save_ifs="$IFS"; IFS='~'
--	      eval cmds=\"$extract_expsyms_cmds\"
-+	      cmds=$extract_expsyms_cmds
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd" || exit $?
- 	      done
-@@ -2339,9 +2635,10 @@
- 	    if test -f "$output_objdir/$newlib"; then :; else
- 	      $show "generating import library for \`$soname'"
- 	      save_ifs="$IFS"; IFS='~'
--	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-+	      cmds=$old_archive_from_expsyms_cmds
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd" || exit $?
- 	      done
-@@ -2362,11 +2659,15 @@
- 	      if test "$hardcode_direct" = no; then
- 		add="$dir/$linklib"
- 		case $host in
--		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-+		    *-*-unixware7*) add_dir="-L$dir" ;;
- 		  *-*-darwin* )
--		    # if the lib is a module then we can not link against it, someone
--		    # is ignoring the new warnings I added
--		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
-+		    # if the lib is a module then we can not link against
-+		    # it, someone is ignoring the new warnings I added
-+		    if /usr/bin/file -L $add 2> /dev/null |
-+                      $EGREP ": [^:]* bundle" >/dev/null ; then
- 		      $echo "** Warning, lib $linklib is a module, not a shared library"
- 		      if test -z "$old_library" ; then
- 		        $echo
-@@ -2374,7 +2675,7 @@
- 		        $echo "** The link will probably fail, sorry"
- 		      else
- 		        add="$dir/$old_library"
--		      fi 
-+		      fi
- 		    fi
- 		esac
- 	      elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2698,9 @@
- 		add_dir="-L$dir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
--		  case "$libdir" in
-+		  case $libdir in
- 		    [\\/]*)
--		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		      ;;
- 		  esac
- 		fi
-@@ -2416,7 +2717,7 @@
- 
- 	    if test "$lib_linked" != yes; then
- 	      $echo "$modename: configuration error: unsupported hardcode properties"
--	      exit 1
-+	      exit $EXIT_FAILURE
- 	    fi
- 
- 	    if test -n "$add_shlibpath"; then
-@@ -2459,7 +2760,8 @@
- 	      esac
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
--	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+	      if test -n "$inst_prefix_dir" &&
-+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
- 	        add="$inst_prefix_dir$libdir/$linklib"
- 	      else
- 	        add="$libdir/$linklib"
-@@ -2469,9 +2771,9 @@
- 	      add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
--		case "$libdir" in
-+		case $libdir in
- 		  [\\/]*)
--		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
- 		    ;;
- 		esac
- 	      fi
-@@ -2530,17 +2832,16 @@
- 	      fi
- 	    fi
- 	  else
--	    convenience="$convenience $dir/$old_library"
--	    old_convenience="$old_convenience $dir/$old_library"
- 	    deplibs="$dir/$old_library $deplibs"
- 	    link_static=yes
- 	  fi
- 	fi # link shared/static library?
- 
- 	if test "$linkmode" = lib; then
--	  #if test -n "$dependency_libs" &&
--	  #   { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
--	  #     test "$link_static" = yes; }; then
-+	  if test -n "$dependency_libs" &&
-+	     { test "$hardcode_into_libs" != yes ||
-+	       test "$build_old_libs" = yes ||
-+	       test "$link_static" = yes; }; then
- 	    # Extract -R from dependency_libs
- 	    temp_deplibs=
- 	    for libdir in $dependency_libs; do
-@@ -2554,7 +2855,7 @@
- 	      esac
- 	    done
- 	    dependency_libs="$temp_deplibs"
--	  #fi
-+	  fi
- 
- 	  newlib_search_path="$newlib_search_path $absdir"
- 	  # Link against this library
-@@ -2596,20 +2897,18 @@
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
- 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
--		    exit 1
-+		    exit $EXIT_FAILURE
- 		  fi
- 		  if test "$absdir" != "$libdir"; then
--		    # Sure, some shells/systems don't implement the -ef.
--		    # Those will have to live with the warning.
--		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
--		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- 		  fi
- 		  path="$absdir"
- 		fi
- 		depdepl=
- 		case $host in
- 		*-*-darwin*)
--		  # we do not want to link against static libs, but need to link against shared
-+		  # we do not want to link against static libs,
-+		  # but need to link against shared
- 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- 		  if test -n "$deplibrary_names" ; then
- 		    for tmp in $deplibrary_names ; do
-@@ -2617,46 +2916,36 @@
- 		    done
- 		    if test -f "$path/$depdepl" ; then
- 		      depdepl="$path/$depdepl"
--		   fi
-+		    fi
- 		    # do not add paths which are already there
- 		    case " $newlib_search_path " in
- 		    *" $path "*) ;;
- 		    *) newlib_search_path="$newlib_search_path $path";;
- 		    esac
--		    path=""
- 		  fi
-+		  path=""
- 		  ;;
- 		*)
--		path="-L$path"
--		;;
--		esac 
--		
-+		  path="-L$path"
-+		  ;;
-+		esac
- 		;;
--		  -l*)
-+	      -l*)
- 		case $host in
- 		*-*-darwin*)
--		 # Again, we only want to link against shared libraries
--		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
--		 for tmp in $newlib_search_path ; do
--		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
--		       eval depdepl="$tmp/lib$tmp_libs.dylib"
--		       break
--		     fi  
--         done
--         path=""
-+		  # Again, we only want to link against shared libraries
-+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-+		  for tmp in $newlib_search_path ; do
-+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-+		      break
-+		    fi
-+		  done
-+		  path=""
- 		  ;;
- 		*) continue ;;
--		esac  		  
--		;;
--
--	      *.ltframework)
--		case $host in
--		  *-*-darwin*)
--		    depdepl="$deplib"
--		    ;;
- 		esac
- 		;;
--
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
-@@ -2660,12 +2949,12 @@
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$deplibs $depdepl" ;;
--	      esac	      
--	      case " $deplibs " in
- 	      *" $path "*) ;;
--	      *) deplibs="$deplibs $path" ;;
-+	      *) deplibs="$path $deplibs" ;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $depdepl "*) ;;
-+	      *) deplibs="$depdepl $deplibs" ;;
- 	      esac
- 	    done
- 	  fi # link_all_deplibs != no
-@@ -2752,7 +3041,8 @@
- 	  eval $var=\"$tmp_libs\"
- 	done # for var
-       fi
--      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
-+      # Last step: remove runtime libs from dependency_libs
-+      # (they stay in deplibs)
-       tmp_libs=
-       for i in $dependency_libs ; do
- 	case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3102,19 @@
-       case $outputname in
-       lib*)
- 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
--	eval shared_ext=\"$shrext\"
-+	eval shared_ext=\"$shrext_cmds\"
- 	eval libname=\"$libname_spec\"
- 	;;
-       *)
- 	if test "$module" = no; then
- 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	if test "$need_lib_prefix" != no; then
- 	  # Add the "lib" prefix for modules if required
- 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--	  eval shared_ext=\"$shrext\"
-+	  eval shared_ext=\"$shrext_cmds\"
- 	  eval libname=\"$libname_spec\"
- 	else
- 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3125,7 @@
-       if test -n "$objs"; then
- 	if test "$deplibs_check_method" != pass_all; then
- 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	else
- 	  $echo
- 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3173,13 @@
- 	if test -n "$8"; then
- 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# convert absolute version numbers to libtool ages
- 	# this retains compatibility with .la files and attempts
- 	# to make the code below a bit more comprehensible
--	
-+
- 	case $vinfo_number in
- 	yes)
- 	  number_major="$2"
-@@ -2929,36 +3219,36 @@
- 
- 	# Check that each of the things are valid numbers.
- 	case $current in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
- 	case $revision in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
- 	case $age in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
--	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
- 	if test "$age" -gt "$current"; then
- 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# Calculate the version variables.
-@@ -2975,7 +3265,7 @@
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
-@@ -3047,7 +3337,7 @@
- 	*)
- 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
- 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
-@@ -3098,9 +3388,15 @@
- 	tempremovelist=`$echo "$output_objdir/*"`
- 	for p in $tempremovelist; do
- 	  case $p in
--	    *.$objext | *$exeext)
-+	    *.$objext)
- 	       ;;
- 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+	       if test "X$precious_files_regex" != "X"; then
-+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-+	         then
-+		   continue
-+		 fi
-+	       fi
- 	       removelist="$removelist $p"
- 	       ;;
- 	    *) ;;
-@@ -3122,9 +3418,9 @@
- 
-       # Eliminate all temporary directories.
-       for path in $notinst_path; do
--	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
--	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
--	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-       done
- 
-       if test -n "$xrpath"; then
-@@ -3137,7 +3433,7 @@
- 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
- 	  esac
- 	done
--	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- 	  dependency_libs="$temp_xrpath $dependency_libs"
- 	fi
-       fi
-@@ -3170,14 +3466,19 @@
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C library is in the System framework
--	    deplibs="$deplibs System.ltframework"
-+	    deplibs="$deplibs -framework System"
- 	    ;;
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
--	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-sco3.2v5* | *-*-sco5v6*)
-+	    # Causes problems with __ctype
-+	    ;;
-+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+	    # Compiler inserts libc in the correct place for threads to work
- 	    ;;
-  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
-@@ -3221,11 +3522,11 @@
- 	  int main() { return 0; }
- EOF
- 	  $rm conftest
--	  $LTCC -o conftest conftest.c $deplibs
-+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- 	  if test "$?" -eq 0 ; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" -ne "0"; then
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3262,11 +3563,11 @@
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
-+	      name=`expr $i : '-l\(.*\)'`
- 	      # If $name is empty we are operating on a -L argument.
-               if test "$name" != "" && test "$name" != "0"; then
- 		$rm conftest
--		$LTCC -o conftest conftest.c $i
-+		$LTCC $LTCFLAGS -o conftest conftest.c $i
- 		# Did it work?
- 		if test "$?" -eq 0 ; then
- 		  ldd_output=`ldd conftest`
-@@ -3314,7 +3615,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
-             if test "$name" != "" && test  "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3383,7 +3684,7 @@
- 	  set dummy $deplibs_check_method
- 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name=`expr $a_deplib : '-l\(.*\)'`
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test -n "$name" && test "$name" != "0"; then
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3463,7 +3764,7 @@
- 	case $host in
- 	*-*-rhapsody* | *-*-darwin1.[012])
- 	  # On Rhapsody replace the C library is the System framework
--	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
- 	  ;;
- 	esac
- 
-@@ -3509,17 +3810,39 @@
- 	    fi
- 	  fi
- 	fi
--	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
--	case $host in
--	  *-*-darwin*)
--	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	    ;;
--	esac
- 	# Done checking deplibs!
- 	deplibs=$newdeplibs
-       fi
- 
-+
-+      # move library search paths that coincide with paths to not yet
-+      # installed libraries to the beginning of the library search list
-+      new_libs=
-+      for path in $notinst_path; do
-+	case " $new_libs " in
-+	*" -L$path/$objdir "*) ;;
-+	*)
-+	  case " $deplibs " in
-+	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      for deplib in $deplibs; do
-+	case $deplib in
-+	-L*)
-+	  case " $new_libs " in
-+	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
-+	  esac
-+	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
-+	esac
-+      done
-+      deplibs="$new_libs"
-+
-+
-       # All the library-specific variables (install_libdir is set above).
-       library_names=
-       old_library=
-@@ -3532,7 +3855,7 @@
- 	  hardcode_libdirs=
- 	  dep_rpath=
- 	  rpath="$finalize_rpath"
--	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
-@@ -3587,7 +3910,7 @@
- 	fi
- 
- 	# Get the real and link names of the library.
--	eval shared_ext=\"$shrext\"
-+	eval shared_ext=\"$shrext_cmds\"
- 	eval library_names=\"$library_names_spec\"
- 	set dummy $library_names
- 	realname="$2"
-@@ -3603,6 +3926,7 @@
- 	fi
- 
- 	lib="$output_objdir/$realname"
-+	linknames=
- 	for link
- 	do
- 	  linknames="$linknames $link"
-@@ -3617,10 +3941,11 @@
- 	    $show "generating symbol list for \`$libname.la'"
- 	    export_symbols="$output_objdir/$libname.exp"
- 	    $run $rm $export_symbols
--	    eval cmds=\"$export_symbols_cmds\"
-+	    cmds=$export_symbols_cmds
- 	    save_ifs="$IFS"; IFS='~'
- 	    for cmd in $cmds; do
- 	      IFS="$save_ifs"
-+	      eval cmd=\"$cmd\"
- 	      if len=`expr "X$cmd" : ".*"` &&
- 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	        $show "$cmd"
-@@ -3630,6 +3955,9 @@
- 	        # The command line is too long to execute in one step.
- 	        $show "using reloadable object file for export list..."
- 	        skipped_export=:
-+		# Break out early, otherwise skipped_export may be
-+		# set to false by a later but shorter cmd.
-+		break
- 	      fi
- 	    done
- 	    IFS="$save_ifs"
-@@ -3650,12 +3978,12 @@
- 	for test_deplib in $deplibs; do
- 		case " $convenience " in
- 		*" $test_deplib "*) ;;
--		*) 
-+		*)
- 			tmp_deplibs="$tmp_deplibs $test_deplib"
- 			;;
- 		esac
- 	done
--	deplibs="$tmp_deplibs" 
-+	deplibs="$tmp_deplibs"
- 
- 	if test -n "$convenience"; then
- 	  if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +3991,13 @@
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
- 	    generated="$generated $gentop"
- 
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
--
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "$mkdir $xdir"
--	      $run $mkdir "$xdir"
--	      status=$?
--	      if test "$status" -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      # We will extract separately just the conflicting names and we will no
--	      # longer touch any unique names. It is faster to leave these extract
--	      # automatically by $AR in one run.
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--		:
--	      else
--		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--		$AR t "$xabs" | sort | uniq -cd | while read -r count name
--		do
--		  i=1
--		  while test "$i" -le "$count"
--		  do
--		   # Put our $i before any first dot (extension)
--		   # Never overwrite any file
--		   name_to="$name"
--		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		   do
--		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		   done
--		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		   i=`expr $i + 1`
--		  done
--		done
--	      fi
--
--	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	    done
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	  fi
- 	fi
--
-+	
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linker_flags="$linker_flags $flag"
-@@ -3734,31 +4008,27 @@
- 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
- 	fi
- 
--	# Add all flags from the command line.  We here create a library,
--	# but those flags were only added to compile_command and
--	# finalize_command, which are only used when creating executables.
--	# So do it by hand here.
--	compiler_flags="$compiler_flags $add_flags"
--	# Only add it to commands which use CC, instead of LD, i.e.
--	# only to $compiler_flags
--	#linker_flags="$linker_flags $add_flags"
--
- 	# Do each of the archive commands.
- 	if test "$module" = yes && test -n "$module_cmds" ; then
- 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
--	    eval cmds=\"$module_expsym_cmds\"
-+	    eval test_cmds=\"$module_expsym_cmds\"
-+	    cmds=$module_expsym_cmds
- 	  else
--	    eval cmds=\"$module_cmds\"
-+	    eval test_cmds=\"$module_cmds\"
-+	    cmds=$module_cmds
- 	  fi
- 	else
- 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
--	  eval cmds=\"$archive_expsym_cmds\"
-+	  eval test_cmds=\"$archive_expsym_cmds\"
-+	  cmds=$archive_expsym_cmds
- 	else
--	  eval cmds=\"$archive_cmds\"
-+	  eval test_cmds=\"$archive_cmds\"
-+	  cmds=$archive_cmds
- 	  fi
- 	fi
- 
--	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-+	if test "X$skipped_export" != "X:" &&
-+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  :
- 	else
-@@ -3777,6 +4047,7 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
-+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -3786,13 +4057,13 @@
- 	  delfiles=
- 	  last_robj=
- 	  k=1
--	  output=$output_objdir/$save_output-${k}.$objext
-+	  output=$output_objdir/$output_la-${k}.$objext
- 	  # Loop over the list of objects to be linked.
- 	  for obj in $save_libobjs
- 	  do
- 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- 	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*"` &&
-+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 		 test "$len" -le "$max_cmd_len"; }; then
- 	      objlist="$objlist $obj"
- 	    else
-@@ -3806,9 +4077,9 @@
- 		# the last one created.
- 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- 	      fi
--	      last_robj=$output_objdir/$save_output-${k}.$objext
-+	      last_robj=$output_objdir/$output_la-${k}.$objext
- 	      k=`expr $k + 1`
--	      output=$output_objdir/$save_output-${k}.$objext
-+	      output=$output_objdir/$output_la-${k}.$objext
- 	      objlist=$obj
- 	      len=1
- 	    fi
-@@ -3828,13 +4099,13 @@
- 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-           fi
- 
--	  # Set up a command to remove the reloadale object files
-+	  # Set up a command to remove the reloadable object files
- 	  # after they are used.
- 	  i=0
- 	  while test "$i" -lt "$k"
- 	  do
- 	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- 	  done
- 
- 	  $echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +4130,54 @@
- 	  # value of $libobjs for piecewise linking.
- 
- 	  # Do each of the archive commands.
-+	  if test "$module" = yes && test -n "$module_cmds" ; then
-+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+	      cmds=$module_expsym_cmds
-+	    else
-+	      cmds=$module_cmds
-+	    fi
-+	  else
- 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
--	    eval cmds=\"$archive_expsym_cmds\"
-+	    cmds=$archive_expsym_cmds
- 	  else
--	    eval cmds=\"$archive_cmds\"
-+	    cmds=$archive_cmds
-+	    fi
- 	  fi
- 
- 	  # Append the command to remove the reloadable object files
- 	  # to the just-reset $cmds.
--	  eval cmds=\"\$cmds~$rm $delfiles\"
-+	  eval cmds=\"\$cmds~\$rm $delfiles\"
- 	fi
- 	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
-+	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
-+	  $run eval "$cmd" || {
-+	    lt_exit=$?
-+
-+	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
-+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	    fi
-+
-+	    exit $lt_exit
-+	  }
- 	done
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
- 	if test "$mode" = relink; then
- 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
--	  exit 0
-+
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      $show "${rm}r $gentop"
-+	      $run ${rm}r "$gentop"
-+	    fi
-+	  fi
-+
-+	  exit $EXIT_SUCCESS
- 	fi
- 
- 	# Create links to the real library.
-@@ -3928,7 +4225,7 @@
-       *.lo)
- 	if test -n "$objs$old_deplibs"; then
- 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	libobj="$output"
- 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3957,64 +4254,10 @@
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "$mkdir $gentop"
--	  $run $mkdir "$gentop"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
- 	  generated="$generated $gentop"
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
--
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "$mkdir $xdir"
--	    $run $mkdir "$xdir"
--	    status=$?
--	    if test "$status" -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    # We will extract separately just the conflicting names and we will no
--	    # longer touch any unique names. It is faster to leave these extract
--	    # automatically by $AR in one run.
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	      :
--	    else
--	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	      do
--		i=1
--		while test "$i" -le "$count"
--		do
--		 # Put our $i before any first dot (extension)
--		 # Never overwrite any file
--		 name_to="$name"
--		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--		 do
--		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--		 done
--		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--		 i=`expr $i + 1`
--		done
--	      done
--	    fi
--
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--	  done
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-@@ -4022,10 +4265,11 @@
-       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
--      eval cmds=\"$reload_cmds\"
-+      cmds=$reload_cmds
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
-+	eval cmd=\"$cmd\"
- 	$show "$cmd"
- 	$run eval "$cmd" || exit $?
-       done
-@@ -4038,7 +4282,7 @@
- 	  $run ${rm}r $gentop
- 	fi
- 
--	exit 0
-+	exit $EXIT_SUCCESS
-       fi
- 
-       if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4295,18 @@
- 	# accidentally link it into a program.
- 	# $show "echo timestamp > $libobj"
- 	# $run eval "echo timestamp > $libobj" || exit $?
--	exit 0
-+	exit $EXIT_SUCCESS
-       fi
- 
-       if test -n "$pic_flag" || test "$pic_mode" != default; then
- 	# Only do commands if we really have different PIC objects.
- 	reload_objs="$libobjs $reload_conv_objs"
- 	output="$libobj"
--	eval cmds=\"$reload_cmds\"
-+	cmds=$reload_cmds
- 	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
-+	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
- 	  $run eval "$cmd" || exit $?
- 	done
-@@ -4073,7 +4318,7 @@
- 	$run ${rm}r $gentop
-       fi
- 
--      exit 0
-+      exit $EXIT_SUCCESS
-       ;;
- 
-     prog)
-@@ -4098,24 +4343,50 @@
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
- 	# On Rhapsody replace the C library is the System framework
--	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
--	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
- 	;;
-       esac
- 
-       case $host in
--      *-*-darwin*)
-+      *darwin*)
-         # Don't allow lazy linking, it breaks C++ global constructors
-         if test "$tagname" = CXX ; then
-         compile_command="$compile_command ${wl}-bind_at_load"
-         finalize_command="$finalize_command ${wl}-bind_at_load"
-         fi
--	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
--	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-         ;;
-       esac
- 
-+
-+      # move library search paths that coincide with paths to not yet
-+      # installed libraries to the beginning of the library search list
-+      new_libs=
-+      for path in $notinst_path; do
-+	case " $new_libs " in
-+	*" -L$path/$objdir "*) ;;
-+	*)
-+	  case " $compile_deplibs " in
-+	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      for deplib in $compile_deplibs; do
-+	case $deplib in
-+	-L*)
-+	  case " $new_libs " in
-+	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
-+	  esac
-+	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
-+	esac
-+      done
-+      compile_deplibs="$new_libs"
-+
-+
-       compile_command="$compile_command $compile_deplibs"
-       finalize_command="$finalize_command $finalize_deplibs"
- 
-@@ -4160,10 +4431,15 @@
- 	fi
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
- 	  *) dllsearchpath="$dllsearchpath:$libdir";;
- 	  esac
-+	  case :$dllsearchpath: in
-+	  *":$testbindir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  esac
- 	  ;;
- 	esac
-       done
-@@ -4277,13 +4553,25 @@
- 
- 	    # Prepare the list of exported symbols
- 	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$output.exp"
-+	      export_symbols="$output_objdir/$outputname.exp"
- 	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+              case $host in
-+              *cygwin* | *mingw* )
-+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-+                ;;
-+              esac
- 	    else
--	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
--	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
-+              case $host in
-+              *cygwin* | *mingw* )
-+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-+                ;;
-+              esac
- 	    fi
- 	  fi
- 
-@@ -4334,7 +4622,26 @@
- #endif
- 
- /* The mapping between symbol names and symbols. */
-+"
-+
-+	    case $host in
-+	    *cygwin* | *mingw* )
-+	  $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs */
-+struct {
-+"
-+	      ;;
-+	    * )
-+	  $echo >> "$output_objdir/$dlsyms" "\
- const struct {
-+"
-+	      ;;
-+	    esac
-+
-+
-+	  $echo >> "$output_objdir/$dlsyms" "\
-   const char *name;
-   lt_ptr address;
- }
-@@ -4381,20 +4688,33 @@
- 	  esac
- 
- 	  # Now compile the dynamic symbol file.
--	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
--	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
- 
- 	  # Clean up the generated files.
- 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
- 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
- 
- 	  # Transform the symbol file into the correct name.
--	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
--	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+          case $host in
-+          *cygwin* | *mingw* )
-+            if test -f "$output_objdir/${outputname}.def" ; then
-+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+            else
-+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+             fi
-+            ;;
-+          * )
-+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+            ;;
-+          esac
- 	  ;;
- 	*)
- 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
-       else
-@@ -4407,17 +4727,6 @@
- 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-       fi
- 
--      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
--      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
--      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
--      # This does not apply on AIX for ia64, which uses a SysV linker.
--      case "$host" in
--        ia64-*-aix5*) ;;
--        *-*-aix4* | *-*-aix5*)
--                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
--                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
--      esac
--
-       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- 	# Replace the output file specification.
- 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-@@ -4426,7 +4735,7 @@
- 	# We have no uninstalled library dependencies, so finalize right now.
- 	$show "$link_command"
- 	$run eval "$link_command"
--	status=$?
-+	exit_status=$?
- 
- 	# Delete the generated files.
- 	if test -n "$dlsyms"; then
-@@ -4434,7 +4743,7 @@
- 	  $run $rm "$output_objdir/${outputname}S.${objext}"
- 	fi
- 
--	exit $status
-+	exit $exit_status
-       fi
- 
-       if test -n "$shlibpath_var"; then
-@@ -4493,7 +4802,7 @@
- 	# Link the executable and exit
- 	$show "$link_command"
- 	$run eval "$link_command" || exit $?
--	exit 0
-+	exit $EXIT_SUCCESS
-       fi
- 
-       if test "$hardcode_action" = relink; then
-@@ -4548,10 +4857,10 @@
-       fi
- 
-       # Quote $echo for shipping.
--      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
--	case $0 in
--	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
--	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-+	case $progpath in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- 	esac
- 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-       else
-@@ -4573,11 +4882,13 @@
- 	  *) exeext= ;;
- 	esac
- 	case $host in
--	  *mingw* )
--	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
--	    cwrapper=`$echo ${output}.exe`
--	    $rm $cwrappersource $cwrapper
--	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-+	  *cygwin* | *mingw* )
-+            output_name=`basename $output`
-+            output_path=`dirname $output`
-+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-+            cwrapper="$output_path/$output_name.exe"
-+            $rm $cwrappersource $cwrapper
-+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
- 
- 	    cat > $cwrappersource <<EOF
- 
-@@ -4586,7 +4897,7 @@
- 
-    The $output program cannot be directly executed until all the libtool
-    libraries that it depends on are installed.
--   
-+
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
- 
-@@ -4602,6 +4913,9 @@
- #include <malloc.h>
- #include <stdarg.h>
- #include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <sys/stat.h>
- 
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
-@@ -4612,15 +4926,19 @@
- #endif
- 
- #ifndef DIR_SEPARATOR
--#define DIR_SEPARATOR '/'
-+# define DIR_SEPARATOR '/'
-+# define PATH_SEPARATOR ':'
- #endif
- 
- #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-   defined (__OS2__)
--#define HAVE_DOS_BASED_FILE_SYSTEM
--#ifndef DIR_SEPARATOR_2 
--#define DIR_SEPARATOR_2 '\\'
--#endif
-+# define HAVE_DOS_BASED_FILE_SYSTEM
-+# ifndef DIR_SEPARATOR_2
-+#  define DIR_SEPARATOR_2 '\\'
-+# endif
-+# ifndef PATH_SEPARATOR_2
-+#  define PATH_SEPARATOR_2 ';'
-+# endif
- #endif
- 
- #ifndef DIR_SEPARATOR_2
-@@ -4630,17 +4948,32 @@
-         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
- #endif /* DIR_SEPARATOR_2 */
- 
-+#ifndef PATH_SEPARATOR_2
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-+#else /* PATH_SEPARATOR_2 */
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-+#endif /* PATH_SEPARATOR_2 */
-+
- #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
- #define XFREE(stale) do { \
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
-+/* -DDEBUG is fairly common in CFLAGS.  */
-+#undef DEBUG
-+#if defined DEBUGWRAPPER
-+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-+#else
-+# define DEBUG(format, ...)
-+#endif
-+
- const char *program_name = NULL;
- 
- void * xmalloc (size_t num);
- char * xstrdup (const char *string);
--char * basename (const char *name);
--char * fnqualify(const char *path);
-+const char * base_name (const char *name);
-+char * find_executable(const char *wrapper);
-+int    check_executable(const char *path);
- char * strendzap(char *str, const char *pat);
- void lt_fatal (const char *message, ...);
- 
-@@ -4649,30 +4982,52 @@
- {
-   char **newargz;
-   int i;
--  
--  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-+
-+  program_name = (char *) xstrdup (base_name (argv[0]));
-+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-+  DEBUG("(main) program_name : %s\n",program_name);
-   newargz = XMALLOC(char *, argc+2);
- EOF
- 
--	    cat >> $cwrappersource <<EOF
--  newargz[0] = "$SHELL";
-+            cat >> $cwrappersource <<EOF
-+  newargz[0] = (char *) xstrdup("$SHELL");
- EOF
- 
--	    cat >> $cwrappersource <<"EOF"
--  newargz[1] = fnqualify(argv[0]);
-+            cat >> $cwrappersource <<"EOF"
-+  newargz[1] = find_executable(argv[0]);
-+  if (newargz[1] == NULL)
-+    lt_fatal("Couldn't find %s", argv[0]);
-+  DEBUG("(main) found exe at : %s\n",newargz[1]);
-   /* we know the script has the same name, without the .exe */
-   /* so make sure newargz[1] doesn't end in .exe */
--  strendzap(newargz[1],".exe"); 
-+  strendzap(newargz[1],".exe");
-   for (i = 1; i < argc; i++)
-     newargz[i+1] = xstrdup(argv[i]);
-   newargz[argc+1] = NULL;
-+
-+  for (i=0; i<argc+1; i++)
-+  {
-+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-+    ;
-+  }
-+
- EOF
- 
--	    cat >> $cwrappersource <<EOF
-+            case $host_os in
-+              mingw*)
-+                cat >> $cwrappersource <<EOF
-+  execv("$SHELL",(char const **)newargz);
-+EOF
-+              ;;
-+              *)
-+                cat >> $cwrappersource <<EOF
-   execv("$SHELL",newargz);
- EOF
-+              ;;
-+            esac
- 
--	    cat >> $cwrappersource <<"EOF"
-+            cat >> $cwrappersource <<"EOF"
-+  return 127;
- }
- 
- void *
-@@ -4685,59 +5040,159 @@
-   return p;
- }
- 
--char * 
-+char *
- xstrdup (const char *string)
- {
-   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
- ;
- }
- 
--char *
--basename (const char *name)
-+const char *
-+base_name (const char *name)
- {
-   const char *base;
- 
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-   /* Skip over the disk name in MSDOS pathnames. */
--  if (isalpha (name[0]) && name[1] == ':') 
-+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-     name += 2;
- #endif
- 
-   for (base = name; *name; name++)
-     if (IS_DIR_SEPARATOR (*name))
-       base = name + 1;
--  return (char *) base;
-+  return base;
-+}
-+
-+int
-+check_executable(const char * path)
-+{
-+  struct stat st;
-+
-+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if ((stat (path, &st) >= 0) &&
-+      (
-+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-+#if defined (S_IXOTH)
-+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-+#endif
-+#if defined (S_IXGRP)
-+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-+#endif
-+       ((st.st_mode & S_IXUSR) == S_IXUSR))
-+      )
-+    return 1;
-+  else
-+    return 0;
- }
- 
--char * 
--fnqualify(const char *path)
-+/* Searches for the full path of the wrapper.  Returns
-+   newly allocated full path name if found, NULL otherwise */
-+char *
-+find_executable (const char* wrapper)
- {
--  size_t size;
--  char *p;
-+  int has_slash = 0;
-+  const char* p;
-+  const char* p_next;
-+  /* static buffer for getcwd */
-   char tmp[LT_PATHMAX + 1];
-+  int tmp_len;
-+  char* concat_name;
-+
-+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
- 
--  assert(path != NULL);
-+  if ((wrapper == NULL) || (*wrapper == '\0'))
-+    return NULL;
- 
--  /* Is it qualified already? */
-+  /* Absolute path? */
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
--  if (isalpha (path[0]) && path[1] == ':')
--    return xstrdup (path);
-+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-+  {
-+    concat_name = xstrdup (wrapper);
-+    if (check_executable(concat_name))
-+      return concat_name;
-+    XFREE(concat_name);
-+  }
-+  else
-+  {
-+#endif
-+    if (IS_DIR_SEPARATOR (wrapper[0]))
-+    {
-+      concat_name = xstrdup (wrapper);
-+      if (check_executable(concat_name))
-+        return concat_name;
-+      XFREE(concat_name);
-+    }
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  }
- #endif
--  if (IS_DIR_SEPARATOR (path[0]))
--    return xstrdup (path);
- 
--  /* prepend the current directory */
--  /* doesn't handle '~' */
-+  for (p = wrapper; *p; p++)
-+    if (*p == '/')
-+    {
-+      has_slash = 1;
-+      break;
-+    }
-+  if (!has_slash)
-+  {
-+    /* no slashes; search PATH */
-+    const char* path = getenv ("PATH");
-+    if (path != NULL)
-+    {
-+      for (p = path; *p; p = p_next)
-+      {
-+        const char* q;
-+        size_t p_len;
-+        for (q = p; *q; q++)
-+          if (IS_PATH_SEPARATOR(*q))
-+            break;
-+        p_len = q - p;
-+        p_next = (*q == '\0' ? q : q + 1);
-+        if (p_len == 0)
-+        {
-+          /* empty path: current directory */
-+          if (getcwd (tmp, LT_PATHMAX) == NULL)
-+            lt_fatal ("getcwd failed");
-+          tmp_len = strlen(tmp);
-+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-+          memcpy (concat_name, tmp, tmp_len);
-+          concat_name[tmp_len] = '/';
-+          strcpy (concat_name + tmp_len + 1, wrapper);
-+        }
-+        else
-+        {
-+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-+          memcpy (concat_name, p, p_len);
-+          concat_name[p_len] = '/';
-+          strcpy (concat_name + p_len + 1, wrapper);
-+        }
-+        if (check_executable(concat_name))
-+          return concat_name;
-+        XFREE(concat_name);
-+      }
-+    }
-+    /* not found in PATH; assume curdir */
-+  }
-+  /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
-     lt_fatal ("getcwd failed");
--  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
--  p = XMALLOC(char, size);
--  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
--  return p;
-+  tmp_len = strlen(tmp);
-+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-+  memcpy (concat_name, tmp, tmp_len);
-+  concat_name[tmp_len] = '/';
-+  strcpy (concat_name + tmp_len + 1, wrapper);
-+
-+  if (check_executable(concat_name))
-+    return concat_name;
-+  XFREE(concat_name);
-+  return NULL;
- }
- 
- char *
--strendzap(char *str, const char *pat) 
-+strendzap(char *str, const char *pat)
- {
-   size_t len, patlen;
- 
-@@ -4757,7 +5212,7 @@
- }
- 
- static void
--lt_error_core (int exit_status, const char * mode, 
-+lt_error_core (int exit_status, const char * mode,
-           const char * message, va_list ap)
- {
-   fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4777,16 +5232,16 @@
-   va_end (ap);
- }
- EOF
--	  # we should really use a build-platform specific compiler
--	  # here, but OTOH, the wrappers (shell script and this C one)
--	  # are only useful if you want to execute the "real" binary.
--	  # Since the "real" binary is built for $host, then this
--	  # wrapper might as well be built for $host, too.
--	  $run $LTCC -s -o $cwrapper $cwrappersource
--	  ;;
--	esac
--	$rm $output
--	trap "$rm $output; exit 1" 1 2 15
-+          # we should really use a build-platform specific compiler
-+          # here, but OTOH, the wrappers (shell script and this C one)
-+          # are only useful if you want to execute the "real" binary.
-+          # Since the "real" binary is built for $host, then this
-+          # wrapper might as well be built for $host, too.
-+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-+          ;;
-+        esac
-+        $rm $output
-+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
- 
- 	$echo > $output "\
- #! $SHELL
-@@ -4807,7 +5262,7 @@
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
-@@ -4886,7 +5341,7 @@
-       else
- 	$echo \"\$relink_command_output\" >&2
- 	$rm \"\$progdir/\$file\"
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
-     fi
- 
-@@ -4936,34 +5391,32 @@
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
--      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 
- 	*)
--	  # Need to set LD_LIBRARY_PATH, to the value already
--	  # computed within libtool.
- 	  $echo >> $output "\
--      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- 	  ;;
- 	esac
- 	$echo >> $output "\
-       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
-   else
-     # The program doesn't exist.
--    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$echo \"This script is just a wrapper for \$program.\" 1>&2
-     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-   fi
- fi\
- "
- 	chmod +x $output
-       fi
--      exit 0
-+      exit $EXIT_SUCCESS
-       ;;
-     esac
- 
-@@ -4986,78 +5439,78 @@
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "$mkdir $gentop"
--	$run $mkdir "$gentop"
--	status=$?
--	if test "$status" -ne 0 && test ! -d "$gentop"; then
--	  exit $status
--	fi
- 	generated="$generated $gentop"
- 
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
--	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
--
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "$mkdir $xdir"
--	  $run $mkdir "$xdir"
--	  status=$?
--	  if test "$status" -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  # We will extract separately just the conflicting names and we will no
--	  # longer touch any unique names. It is faster to leave these extract
--	  # automatically by $AR in one run.
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
--	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
--	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
--	    do
--	      i=1
--	      while test "$i" -le "$count"
--	      do
--	       # Put our $i before any first dot (extension)
--	       # Never overwrite any file
--	       name_to="$name"
--	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
--	       do
--		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
--	       done
--	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
--	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
--	       i=`expr $i + 1`
--	      done
--	    done
--	  fi
--
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
--      compiler_flags="$compiler_flags $add_flags"
--
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
--	eval cmds=\"$old_archive_from_new_cmds\"
-+       cmds=$old_archive_from_new_cmds
-       else
-+	# POSIX demands no paths to be encoded in archives.  We have
-+	# to avoid creating archives with duplicate basenames if we
-+	# might have to extract them afterwards, e.g., when creating a
-+	# static archive out of a convenience library, or when linking
-+	# the entirety of a libtool archive into another (currently
-+	# not supported by libtool).
-+	if (for obj in $oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $echo "copying selected object files to avoid basename conflicts..."
-+
-+	  if test -z "$gentop"; then
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "$mkdir $gentop"
-+	    $run $mkdir "$gentop"
-+	    exit_status=$?
-+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $exit_status
-+	    fi
-+	  fi
-+
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  counter=1
-+	  for obj in $save_oldobjs
-+	  do
-+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	    case " $oldobjs " in
-+	    " ") oldobjs=$obj ;;
-+	    *[\ /]"$objbase "*)
-+	      while :; do
-+		# Make sure we don't pick an alternate name that also
-+		# overlaps.
-+		newobj=lt$counter-$objbase
-+		counter=`expr $counter + 1`
-+		case " $oldobjs " in
-+		*[\ /]"$newobj "*) ;;
-+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+		esac
-+	      done
-+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      $run ln "$obj" "$gentop/$newobj" ||
-+	      $run cp "$obj" "$gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
-+	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
-+	    esac
-+	  done
-+	fi
-+
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	if len=`expr "X$cmds" : ".*"` &&
- 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
--	  :
-+	  cmds=$old_archive_cmds
- 	else
- 	  # the command line is too long to link in one step, link in parts
- 	  $echo "using piecewise archive linking..."
-@@ -5066,31 +5519,18 @@
- 	  objlist=
- 	  concat_cmds=
- 	  save_oldobjs=$oldobjs
--	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
--	  # encoded into archives.  This makes 'ar r' malfunction in
--	  # this piecewise linking case whenever conflicting object
--	  # names appear in distinct ar calls; check, warn and compensate.
--	    if (for obj in $save_oldobjs
--	    do
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	    :
--	  else
--	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
--	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
--	    AR_FLAGS=cq
--	  fi
-+
- 	  # Is there a better way of finding the last object in the list?
- 	  for obj in $save_oldobjs
- 	  do
- 	    last_oldobj=$obj
--	  done  
-+	  done
- 	  for obj in $save_oldobjs
- 	  do
- 	    oldobjs="$objlist $obj"
- 	    objlist="$objlist $obj"
- 	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*"` &&
-+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- 	       test "$len" -le "$max_cmd_len"; then
- 	      :
- 	    else
-@@ -5098,7 +5538,7 @@
- 	      oldobjs=$objlist
- 	      if test "$obj" = "$last_oldobj" ; then
- 	        RANLIB=$save_RANLIB
--	      fi  
-+	      fi
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
- 	      objlist=
-@@ -5109,12 +5549,13 @@
- 	  if test "X$oldobjs" = "X" ; then
- 	    eval cmds=\"\$concat_cmds\"
- 	  else
--	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
- 	  fi
- 	fi
-       fi
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-+        eval cmd=\"$cmd\"
- 	IFS="$save_ifs"
- 	$show "$cmd"
- 	$run eval "$cmd" || exit $?
-@@ -5146,11 +5587,13 @@
- 	fi
-       done
-       # Quote the link command for shipping.
--      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-       if test "$hardcode_automatic" = yes ; then
--        relink_command=
--      fi  
-+	relink_command=
-+      fi
-+
-+
-       # Only create the output if not a dry run.
-       if test -z "$run"; then
- 	for installed in no yes; do
-@@ -5162,13 +5605,17 @@
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		if test -z "$libdir"; then
- 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
--		  exit 1
-+		  exit $EXIT_FAILURE
- 		fi
- 		newdependency_libs="$newdependency_libs $libdir/$name"
- 		;;
-@@ -5182,7 +5629,7 @@
- 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 	      if test -z "$libdir"; then
- 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--		exit 1
-+		exit $EXIT_FAILURE
- 	      fi
- 	      newdlfiles="$newdlfiles $libdir/$name"
- 	    done
-@@ -5193,11 +5640,30 @@
- 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 	      if test -z "$libdir"; then
- 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--		exit 1
-+		exit $EXIT_FAILURE
- 	      fi
- 	      newdlprefiles="$newdlprefiles $libdir/$name"
- 	    done
- 	    dlprefiles="$newdlprefiles"
-+	  else
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+		*) abs=`pwd`"/$lib" ;;
-+	      esac
-+	      newdlfiles="$newdlfiles $abs"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+		*) abs=`pwd`"/$lib" ;;
-+	      esac
-+	      newdlprefiles="$newdlprefiles $abs"
-+	    done
-+	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $rm $output
- 	  # place dlname in correct position for cygwin
-@@ -5241,7 +5707,7 @@
- 
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
--	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
-+	  if test "$installed" = no && test "$need_relink" = yes; then
- 	    $echo >> $output "\
- relink_command=\"$relink_command\""
- 	  fi
-@@ -5254,7 +5720,7 @@
-       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-       ;;
-     esac
--    exit 0
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   # libtool install mode
-@@ -5265,11 +5731,11 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+       $echo "X$nonopt" | grep shtool > /dev/null; then
-       # Aesthetically quote it.
-       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5278,14 +5744,14 @@
-       shift
-     else
-       install_prog=
--      arg="$nonopt"
-+      arg=$nonopt
-     fi
- 
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-     case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-     esac
-@@ -5303,28 +5769,31 @@
-     do
-       if test -n "$dest"; then
- 	files="$files $dest"
--	dest="$arg"
-+	dest=$arg
- 	continue
-       fi
- 
-       case $arg in
-       -d) isdir=yes ;;
--      -f) prev="-f" ;;
--      -g) prev="-g" ;;
--      -m) prev="-m" ;;
--      -o) prev="-o" ;;
-+      -f) 
-+      	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o) prev=$arg ;;
-       -s)
- 	stripme=" -s"
- 	continue
- 	;;
--      -*) ;;
--
-+      -*)
-+	;;
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
- 	  prev=
- 	else
--	  dest="$arg"
-+	  dest=$arg
- 	  continue
- 	fi
- 	;;
-@@ -5333,7 +5802,7 @@
-       # Aesthetically quote the argument.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	arg="\"$arg\""
- 	;;
-       esac
-@@ -5343,13 +5812,13 @@
-     if test -z "$install_prog"; then
-       $echo "$modename: you must specify an install program" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     if test -n "$prev"; then
-       $echo "$modename: the \`$prev' option requires an argument" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     if test -z "$files"; then
-@@ -5359,7 +5828,7 @@
- 	$echo "$modename: you must specify a destination" 1>&2
-       fi
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     # Strip any trailing slash from the destination.
-@@ -5380,7 +5849,7 @@
-       if test "$#" -gt 2; then
- 	$echo "$modename: \`$dest' is not a directory" 1>&2
- 	$echo "$help" 1>&2
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
-     fi
-     case $destdir in
-@@ -5392,7 +5861,7 @@
- 	*)
- 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
-       done
-@@ -5421,7 +5890,7 @@
- 	else
- 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	library_names=
-@@ -5461,10 +5930,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit 1
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
-@@ -5478,7 +5950,7 @@
- 	  if $run eval "$relink_command"; then :
- 	  else
- 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	fi
- 
-@@ -5502,23 +5974,36 @@
- 
- 	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
- 	    for linkname
- 	    do
- 	      if test "$linkname" != "$realname"; then
--		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
--		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- 	      fi
- 	    done
- 	  fi
- 
- 	  # Do each command in the postinstall commands.
- 	  lib="$destdir/$realname"
--	  eval cmds=\"$postinstall_cmds\"
-+	  cmds=$postinstall_cmds
- 	  save_ifs="$IFS"; IFS='~'
- 	  for cmd in $cmds; do
- 	    IFS="$save_ifs"
-+	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
-+	    $run eval "$cmd" || {
-+	      lt_exit=$?
-+
-+	      # Restore the uninstalled library and exit
-+	      if test "$mode" = relink; then
-+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+	      fi
-+
-+	      exit $lt_exit
-+	    }
- 	  done
- 	  IFS="$save_ifs"
- 	fi
-@@ -5556,7 +6041,7 @@
- 	*)
- 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
-@@ -5574,7 +6059,7 @@
- 	  $show "$install_prog $staticobj $staticdest"
- 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
- 	fi
--	exit 0
-+	exit $EXIT_SUCCESS
- 	;;
- 
-       *)
-@@ -5612,23 +6097,21 @@
- 	  notinst_deplibs=
- 	  relink_command=
- 
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
- 	  if test -z "$notinst_deplibs"; then
- 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 
- 	  finalize=yes
-@@ -5650,30 +6133,21 @@
- 	  done
- 
- 	  relink_command=
--	  # To insure that "foo" is sourced, and not "foo.exe",
--	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
--	  # which disallows the automatic-append-.exe behavior.
--	  case $build in
--	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
--	  *) wrapperdot=${wrapper} ;;
--	  esac
-+	  # Note that it is not necessary on cygwin/mingw to append a dot to
-+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+	  # `FILE.' does not work on cygwin managed mounts.
-+	  #
- 	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . ${wrapperdot} ;;
--	  *) . ./${wrapperdot} ;;
-+	  case $wrapper in
-+	  */* | *\\*) . ${wrapper} ;;
-+	  *) . ./${wrapper} ;;
- 	  esac
- 
- 	  outputname=
- 	  if test "$fast_install" = no && test -n "$relink_command"; then
- 	    if test "$finalize" = yes && test -z "$run"; then
--	      tmpdir="/tmp"
--	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
--	      tmpdir="$tmpdir/libtool-$$"
--	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
--	      else
--		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
--		continue
--	      fi
-+	      tmpdir=`func_mktempdir`
- 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- 	      outputname="$tmpdir/$file"
- 	      # Replace the output file specification.
-@@ -5697,7 +6171,7 @@
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
--	# one anyways
-+	# one anyway 
- 	case $install_prog,$host in
- 	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
-@@ -5729,16 +6203,17 @@
-       $show "$install_prog $file $oldlib"
-       $run eval "$install_prog \$file \$oldlib" || exit $?
- 
--      if test -n "$stripme" && test -n "$striplib"; then
-+      if test -n "$stripme" && test -n "$old_striplib"; then
- 	$show "$old_striplib $oldlib"
- 	$run eval "$old_striplib $oldlib" || exit $?
-       fi
- 
-       # Do each command in the postinstall commands.
--      eval cmds=\"$old_postinstall_cmds\"
-+      cmds=$old_postinstall_cmds
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
-+	eval cmd=\"$cmd\"
- 	$show "$cmd"
- 	$run eval "$cmd" || exit $?
-       done
-@@ -5752,9 +6227,9 @@
-     if test -n "$current_libdirs"; then
-       # Maybe just do a dry run.
-       test -n "$run" && current_libdirs=" -n$current_libdirs"
--      exec_cmd='$SHELL $0 --finish$current_libdirs'
-+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-     else
--      exit 0
-+      exit $EXIT_SUCCESS
-     fi
-     ;;
- 
-@@ -5773,10 +6248,11 @@
-       for libdir in $libdirs; do
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
--	  eval cmds=\"$finish_cmds\"
-+	  cmds=$finish_cmds
- 	  save_ifs="$IFS"; IFS='~'
- 	  for cmd in $cmds; do
- 	    IFS="$save_ifs"
-+	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
- 	    $run eval "$cmd" || admincmds="$admincmds
-        $cmd"
-@@ -5793,9 +6269,9 @@
-     fi
- 
-     # Exit here if they wanted silent mode.
--    exit 0
-+    test "$show" = : && exit $EXIT_SUCCESS
- 
--    $echo "----------------------------------------------------------------------"
-+    $echo "X----------------------------------------------------------------------" | $Xsed
-     $echo "Libraries have been installed in:"
-     for libdir in $libdirs; do
-       $echo "   $libdir"
-@@ -5828,8 +6304,8 @@
-     $echo
-     $echo "See any operating system documentation about shared libraries for"
-     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    $echo "----------------------------------------------------------------------"
--    exit 0
-+    $echo "X----------------------------------------------------------------------" | $Xsed
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   # libtool execute mode
-@@ -5841,7 +6317,7 @@
-     if test -z "$cmd"; then
-       $echo "$modename: you must specify a COMMAND" 1>&2
-       $echo "$help"
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     # Handle -dlopen flags immediately.
-@@ -5849,7 +6325,7 @@
-       if test ! -f "$file"; then
- 	$echo "$modename: \`$file' is not a file" 1>&2
- 	$echo "$help" 1>&2
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       dir=
-@@ -5860,7 +6336,7 @@
- 	else
- 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# Read the libtool library.
-@@ -5887,7 +6363,7 @@
- 	  dir="$dir/$objdir"
- 	else
- 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	;;
- 
-@@ -5967,7 +6443,7 @@
- 	$echo "export $shlibpath_var"
-       fi
-       $echo "$cmd$args"
--      exit 0
-+      exit $EXIT_SUCCESS
-     fi
-     ;;
- 
-@@ -5995,7 +6471,7 @@
-     if test -z "$rm"; then
-       $echo "$modename: you must specify an RM program" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     rmdirs=
-@@ -6045,15 +6521,24 @@
- 	    rmfiles="$rmfiles $objdir/$n"
- 	  done
- 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
--	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- 
--	  if test "$mode" = uninstall; then
-+	  case "$mode" in
-+	  clean)
-+	    case "  $library_names " in
-+	    # "  " in the beginning catches empty $dlname
-+	    *" $dlname "*) ;;
-+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+	    esac
-+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	    ;;
-+	  uninstall)
- 	    if test -n "$library_names"; then
- 	      # Do each command in the postuninstall commands.
--	      eval cmds=\"$postuninstall_cmds\"
-+	      cmds=$postuninstall_cmds
- 	      save_ifs="$IFS"; IFS='~'
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd"
- 		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6550,11 @@
- 
- 	    if test -n "$old_library"; then
- 	      # Do each command in the old_postuninstall commands.
--	      eval cmds=\"$old_postuninstall_cmds\"
-+	      cmds=$old_postuninstall_cmds
- 	      save_ifs="$IFS"; IFS='~'
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd"
- 		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6078,7 +6564,8 @@
- 	      IFS="$save_ifs"
- 	    fi
- 	    # FIXME: should reinstall the best remaining shared library.
--	  fi
-+	    ;;
-+	  esac
- 	fi
- 	;;
- 
-@@ -6107,7 +6594,7 @@
- 	if test "$mode" = clean ; then
- 	  noexename=$name
- 	  case $file in
--	  *.exe) 
-+	  *.exe)
- 	    file=`$echo $file|${SED} 's,.exe$,,'`
- 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
- 	    # $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6639,20 @@
-   "")
-     $echo "$modename: you must specify a MODE" 1>&2
-     $echo "$generic_help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-     ;;
-   esac
- 
-   if test -z "$exec_cmd"; then
-     $echo "$modename: invalid operation mode \`$mode'" 1>&2
-     $echo "$generic_help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-   fi
- fi # test -z "$show_help"
- 
- if test -n "$exec_cmd"; then
-   eval exec $exec_cmd
--  exit 1
-+  exit $EXIT_FAILURE
- fi
- 
- # We need to display help for each of the modes.
-@@ -6201,7 +6688,7 @@
- a more detailed description of MODE.
- 
- Report bugs to <bug-libtool@gnu.org>."
--  exit 0
-+  exit $EXIT_SUCCESS
-   ;;
- 
- clean)
-@@ -6313,6 +6800,8 @@
-   -no-undefined     declare that a library does not refer to external symbols
-   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-   -objectlist FILE  Use a list of object files found in FILE to specify objects
-+  -precious-files-regex REGEX
-+                    don't remove output files matching REGEX
-   -release RELEASE  specify package release information
-   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-@@ -6354,14 +6843,14 @@
- *)
-   $echo "$modename: invalid operation mode \`$mode'" 1>&2
-   $echo "$help" 1>&2
--  exit 1
-+  exit $EXIT_FAILURE
-   ;;
- esac
- 
- $echo
- $echo "Try \`$modename --help' for more information about other modes."
- 
--exit 0
-+exit $?
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
-@@ -6375,12 +6864,11 @@
- # configuration.  But we'll never go from static-only to shared-only.
- 
- # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
--build_libtool_libs=no
--build_old_libs=yes
-+disable_libs=shared
- # ### END LIBTOOL TAG CONFIG: disable-shared
- 
- # ### BEGIN LIBTOOL TAG CONFIG: disable-static
--build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-+disable_libs=static
- # ### END LIBTOOL TAG CONFIG: disable-static
- 
- # Local Variables:
diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk
index 5b480bb9fc..b48e3d2423 100644
--- a/package/multimedia/taglib/taglib.mk
+++ b/package/multimedia/taglib/taglib.mk
@@ -3,18 +3,18 @@
 # taglib
 #
 #############################################################
-TAGLIB_VERSION = 1.5
+TAGLIB_VERSION = 1.7
 TAGLIB_SOURCE = taglib-$(TAGLIB_VERSION).tar.gz
 TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src
-TAGLIB_LIBTOOL_PATCH = NO
 TAGLIB_INSTALL_STAGING = YES
 
-TAGLIB_CONF_ENV = \
-	DO_NOT_COMPILE='bindings tests examples' \
-	ac_cv_header_cppunit_extensions_HelperMacros_h=no \
-	ac_cv_header_zlib_h=$(if $(BR2_PACKAGE_ZLIB),yes,no)
+ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y)
+TAGLIB_CONF_OPT += -DWITH_ASF=ON
+endif
 
-TAGLIB_CONF_OPT = --disable-libsuffix
+ifeq ($(BR2_PACKAGE_TAGLIB_MP4),y)
+TAGLIB_CONF_OPT += -DWITH_MP4=ON
+endif
 
 define TAGLIB_REMOVE_DEVFILE
 	rm -f $(TARGET_DIR)/usr/bin/taglib-config
@@ -24,4 +24,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,taglib))
+$(eval $(call CMAKETARGETS,package/multimedia,taglib))

From da9ebfbe9c12711d9dc8561bd11c0f3ae615c61d Mon Sep 17 00:00:00 2001
From: Frederic Bassaler <frederic.bassaler@gmail.com>
Date: Sun, 14 Aug 2011 16:08:08 +0200
Subject: [PATCH 0691/6849] acpid: bump to 2.0.11

acpid 2.0.6 does not compile? So bump to 2.0.11

Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/acpid/acpid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index d61ca4164f..cc4e45b6ab 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -3,7 +3,7 @@
 # acpid
 #
 #############################################################
-ACPID_VERSION = 2.0.6
+ACPID_VERSION = 2.0.11
 ACPID_SOURCE = acpid_$(ACPID_VERSION).orig.tar.gz
 ACPID_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
 

From 29903084043bb00b67a7ca1eede1bf4d564fec37 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Fri, 23 Sep 2011 11:17:23 +0200
Subject: [PATCH 0692/6849] dbus: bump to 1.4.16

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 9db8ea666c..6834feef8f 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,11 +3,10 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.4.14
+DBUS_VERSION = 1.4.16
 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES
-DBUS_INSTALL_TARGET = YES
 
 DBUS_DEPENDENCIES = host-pkg-config
 

From fa3410b60605f74b7b14f606b8c827a7f99284bd Mon Sep 17 00:00:00 2001
From: Wade Berrier <wberrier@gmail.com>
Date: Sat, 10 Sep 2011 12:59:16 -0600
Subject: [PATCH 0693/6849] new package: ngrep (lightweight alternative to
 tcpdump)

Signed-off-by: Wade Berrier <wberrier@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/ngrep/Config.in                    |  8 +++++++
 package/ngrep/ngrep-1.45-make-objs.patch   | 23 ++++++++++++++++++++
 package/ngrep/ngrep-1.45-pcre-header.patch | 16 ++++++++++++++
 package/ngrep/ngrep.mk                     | 25 ++++++++++++++++++++++
 5 files changed, 73 insertions(+)
 create mode 100644 package/ngrep/Config.in
 create mode 100644 package/ngrep/ngrep-1.45-make-objs.patch
 create mode 100644 package/ngrep/ngrep-1.45-pcre-header.patch
 create mode 100644 package/ngrep/ngrep.mk

diff --git a/package/Config.in b/package/Config.in
index 12fd0dcf9c..790ed3ad50 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -438,6 +438,7 @@ source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/nfs-utils/Config.in"
 source "package/ngircd/Config.in"
+source "package/ngrep/Config.in"
 source "package/ntp/Config.in"
 source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
diff --git a/package/ngrep/Config.in b/package/ngrep/Config.in
new file mode 100644
index 0000000000..cd91225791
--- /dev/null
+++ b/package/ngrep/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_NGREP
+	bool "ngrep"
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_PCRE
+	help
+	  Network grep.
+
+	  http://ngrep.sourceforge.net/
diff --git a/package/ngrep/ngrep-1.45-make-objs.patch b/package/ngrep/ngrep-1.45-make-objs.patch
new file mode 100644
index 0000000000..8b55e3f456
--- /dev/null
+++ b/package/ngrep/ngrep-1.45-make-objs.patch
@@ -0,0 +1,23 @@
+ngrep: don't include regex objects since we're using pcre
+
+Signed-off-by: Wade Berrier <wberrier@gmail.com>
+
+--- ngrep-1.45/Makefile.in.orig	2006-11-28 06:35:37.000000000 -0700
++++ ngrep-1.45/Makefile.in	2011-06-29 14:05:27.000000000 -0600
+@@ -32,13 +32,13 @@
+ 
+ INSTALL = ./install-sh
+ 
+-REGEX_DIR=@REGEX_DIR@
+-REGEX_OBJS=@REGEX_OBJS@
++REGEX_DIR=
++REGEX_OBJS=
+ 
+ 
+ all: $(TARGET) 
+ 
+-$(TARGET): $(REGEX_OBJS) $(OBJS) 
++$(TARGET): $(OBJS) 
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
+ 
+ debug: $(REGEX_OBJS) $(OBJS)
diff --git a/package/ngrep/ngrep-1.45-pcre-header.patch b/package/ngrep/ngrep-1.45-pcre-header.patch
new file mode 100644
index 0000000000..40b9234dbc
--- /dev/null
+++ b/package/ngrep/ngrep-1.45-pcre-header.patch
@@ -0,0 +1,16 @@
+ngrep: don't use versioned header
+
+Signed-off-by: Wade Berrier <wberrier@gmail.com>
+
+diff -ur ngrep-1.45/ngrep.c ngrep-1.45.mod/ngrep.c
+--- ngrep-1.45/ngrep.c  Tue Nov 28 15:38:43 2006
++++ ngrep-1.45.mod/ngrep.c      Sat May 19 10:21:27 2007
+@@ -92,7 +92,7 @@
+ #endif
+ 
+ #if USE_PCRE
+-#include "pcre-5.0/pcre.h"
++#include "pcre.h"
+ #else
+ #include "regex-0.12/regex.h"
+ #endif
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
new file mode 100644
index 0000000000..26594dcd59
--- /dev/null
+++ b/package/ngrep/ngrep.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# ngrep
+#
+#############################################################
+
+NGREP_VERSION = 1.45
+NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
+NGREP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep/ngrep/$(NGREP_VERSION)
+NGREP_INSTALL_STAGING = YES
+NGREP_INSTALL_TARGET = YES
+NGREP_CONF_ENV = LDFLAGS="-lpcre"
+NGREP_CONF_OPT =  \
+	--with-pcap-includes=$(STAGING_DIR)/usr/include \
+	--enable-pcre \
+	--with-pcre=$(STAGING_DIR)/usr \
+	--disable-dropprivs
+
+ifeq ($(BR2_INET_IPV6),y)
+NGREP_CONF_OPT += --enable-ipv6
+endif
+
+NGREP_DEPENDENCIES = libpcap pcre
+
+$(eval $(call AUTOTARGETS,package,ngrep))

From f83cacf3b5e3f8b32a16f7557b29241f5a2da246 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Sep 2011 21:35:12 +0200
Subject: [PATCH 0694/6849] busybox: add 1.19.2 tail fix

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.19.2/busybox-1.19.2-tail.patch  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch

diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch
new file mode 100644
index 0000000000..f3cc79814e
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch
@@ -0,0 +1,43 @@
+--- busybox-1.19.2/coreutils/tail.c
++++ busybox-1.19.2-tail/coreutils/tail.c
+@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv)
+ 		int fd = fds[i];
+ 
+ 		if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
+-			continue; /* may happen with -E */
++			continue; /* may happen with -F */
+ 
+ 		if (nfiles > header_threshhold) {
+ 			tail_xprint_header(fmt, argv[i]);
+@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv)
+ 		 * Used only by +N code ("start from Nth", 1-based): */
+ 		seen = 1;
+ 		newlines_seen = 0;
+-		while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) {
++		while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
+ 			if (G.from_top) {
+ 				int nwrite = nread;
+ 				if (seen < count) {
+ 					/* We need to skip a few more bytes/lines */
+ 					if (COUNT_BYTES) {
+ 						nwrite -= (count - seen);
+-						seen = count;
++						seen += nread;
+ 					} else {
+ 						char *s = buf;
+ 						do {
+--- busybox-1.19.2/testsuite/tail.tests
++++ busybox-1.19.2-tail/testsuite/tail.tests
+@@ -14,4 +14,12 @@ testing "tail: +N with N > file length" 
+ 	"0\n" \
+ 	"" "qw"
+ 
++testing "tail: -c +N with largish N" \
++	"
++	dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c;
++	dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c;
++	" \
++	"8185\n8177\n" \
++	"" ""
++
+ exit $FAILCOUNT

From fd68d696eacbb7b8363be1948365957a641041a8 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 26 Sep 2011 15:23:57 +0200
Subject: [PATCH 0695/6849] sqlite: bump to version 3.7.8

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index db9c53eb54..4579eaa596 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3070701
+SQLITE_VERSION = 3070800
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From b766ed21e8b5499dd2237d80358229de04ddab9a Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 26 Sep 2011 14:31:17 +0200
Subject: [PATCH 0696/6849] kexec: fix compilation with gcc 4.6

gcc 4.6 has stricter checks for invalid command-line options.
Fix compilation by passing linker options with -Wl,

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/kexec-fix-linker-options.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/kexec/kexec-fix-linker-options.patch

diff --git a/package/kexec/kexec-fix-linker-options.patch b/package/kexec/kexec-fix-linker-options.patch
new file mode 100644
index 0000000000..7bd5f1d459
--- /dev/null
+++ b/package/kexec/kexec-fix-linker-options.patch
@@ -0,0 +1,15 @@
+Fix compilation with gcc 4.6 by correcting the way that linker options
+are passed to gcc.
+
+Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
+--- kexec-2.0.2/purgatory/Makefile.orig	2011-09-26 14:16:44.256595912 +0200
++++ kexec-2.0.2/purgatory/Makefile	2011-09-26 14:17:01.606621357 +0200
+@@ -56,7 +56,7 @@
+ 			-I$(srcdir)/include \
+ 			-I$(shell $(CC) -print-file-name=include)
+ $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
+-			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
++			-Wl,-no-undefined -nostartfiles -nostdlib -nodefaultlibs \
+ 			-e purgatory_start -r
+ 
+ $(PURGATORY): $(PURGATORY_OBJS)

From 62fc4c0f77a4c042704468c1ecd40d7776f9a0bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Sep 2011 22:17:12 +0200
Subject: [PATCH 0697/6849] kexec: tweak zlib option name

To match other _ZLIB options.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kexec/Config.in b/package/kexec/Config.in
index f028480433..6f10b89d53 100644
--- a/package/kexec/Config.in
+++ b/package/kexec/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_KEXEC
 	  http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 
 config BR2_PACKAGE_KEXEC_ZLIB
-	bool "Kexec with zlib support"
+	bool "zlib support"
 	depends on BR2_PACKAGE_KEXEC
 	select BR2_PACKAGE_ZLIB
 	help

From 49b058c8e766ee0aa1d57131731d2ee601bb5d65 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 26 Sep 2011 14:47:06 +0300
Subject: [PATCH 0698/6849] valgrind: fix build on Linux kernel 3.x

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rind-3.6.1-configure-support-linux-3.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch

diff --git a/package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch b/package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch
new file mode 100644
index 0000000000..a3b24825f0
--- /dev/null
+++ b/package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch
@@ -0,0 +1,30 @@
+Add support for kernel 3.x. From upstream r11796 (via Debian).
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+
+Index: valgrind-3.6.1/configure.in
+===================================================================
+--- valgrind-3.6.1.orig/configure.in	2011-02-15 18:31:17.000000000 +0100
++++ valgrind-3.6.1/configure.in	2011-07-08 22:36:36.051563848 +0200
+@@ -220,7 +220,7 @@
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*) 
++             2.6.*|3.*) 
+         	    AC_MSG_RESULT([2.6 family (${kernel})])
+         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
+         	    ;;
+Index: valgrind-3.6.1/configure
+===================================================================
+--- valgrind-3.6.1.orig/configure	2011-07-08 22:37:18.911240743 +0200
++++ valgrind-3.6.1/configure	2011-07-08 22:37:44.847045178 +0200
+@@ -5348,7 +5348,7 @@
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*)
++             2.6.*|3.*)
+         	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6 family (${kernel})" >&5
+ $as_echo "2.6 family (${kernel})" >&6; }
+ 

From 6bad62cb7806bbbc1b6a2ebecda4298868a1a4e6 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 26 Sep 2011 14:47:07 +0300
Subject: [PATCH 0699/6849] valgrind: workaround for segmentation fault on
 PowerPC

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rind-3.6.1-workaround-SIGSEGV-on-PPC.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch

diff --git a/package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch
new file mode 100644
index 0000000000..a7885119ae
--- /dev/null
+++ b/package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch
@@ -0,0 +1,28 @@
+From db894abcaa12555f60880a15840010f81d354806 Mon Sep 17 00:00:00 2001
+From: Pierre Habouzit <madcoder@debian.org>
+Date: Tue, 10 May 2011 23:11:45 +0200
+Subject: [PATCH] workaround SIGSEGV on PPC.
+
+Signed-off-by: Pierre Habouzit <madcoder@debian.org>
+---
+ coregrind/m_machine.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
+index 8dc3e17..7921502 100644
+--- a/coregrind/m_machine.c
++++ b/coregrind/m_machine.c
+@@ -28,6 +28,10 @@
+    The GNU General Public License is contained in the file COPYING.
+ */
+ 
++#ifdef __powerpc__
++#  pragma GCC optimize ("-O0")
++#endif
++
+ #include "pub_core_basics.h"
+ #include "pub_core_vki.h"
+ #include "pub_core_threadstate.h"
+-- 
+1.7.5.1.290.g2095dc
+

From c20ab0fecada71f12b1e7f49a10c03b4250267a5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 23:42:57 +0200
Subject: [PATCH 0700/6849] cifs-utils: new package

[Peter: fix Config.in]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/cifs-utils/Config.in     | 13 +++++++++++++
 package/cifs-utils/cifs-utils.mk |  5 +++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/cifs-utils/Config.in
 create mode 100644 package/cifs-utils/cifs-utils.mk

diff --git a/package/Config.in b/package/Config.in
index 790ed3ad50..5f9af597d7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -399,6 +399,7 @@ source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/ctorrent/Config.in"
+source "package/cifs-utils/Config.in"
 source "package/cups/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in
new file mode 100644
index 0000000000..43319865f9
--- /dev/null
+++ b/package/cifs-utils/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_CIFS_UTILS
+	bool "cifs-utils"
+	help
+	  The in-kernel CIFS filesystem is generally the preferred
+	  method for mounting SMB/CIFS shares on Linux. The in-kernel
+	  CIFS filesystem relies on a set of user-space tools. That
+	  package of tools is called cifs-utils. Although not really
+	  part of Samba proper, these tools were originally part of
+	  the Samba package. For several reasons, shipping these tools
+	  as part of Samba was problematic and it was deemed better to
+	  split them off into their own package.
+
+	  http://wiki.samba.org/index.php/LinuxCIFS_utils
diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
new file mode 100644
index 0000000000..dfb853ac99
--- /dev/null
+++ b/package/cifs-utils/cifs-utils.mk
@@ -0,0 +1,5 @@
+CIFS_UTILS_VERSION = 5.0
+CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
+CIFS_UTILS_SITE    = ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
+
+$(eval $(call AUTOTARGETS,package,cifs-utils))

From 4353fec6d7e5f6ab607af4fc897a02eeca637f85 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Sep 2011 22:37:46 +0200
Subject: [PATCH 0701/6849] cifs-utils: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index dfb853ac99..bc800a6f93 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,4 +1,4 @@
-CIFS_UTILS_VERSION = 5.0
+CIFS_UTILS_VERSION = 5.1
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
 

From 06c3e2159686a886e52b2522a47e60c300cfb7f7 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 30 Aug 2011 15:36:11 +0200
Subject: [PATCH 0702/6849] New package: bluez-utils

Bluetooth utils often used in embedded system, add it to package.

[Peter: fix dbus dependency]
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/bluez_utils/Config.in      | 35 +++++++++++++++++++++++
 package/bluez_utils/bluez_utils.mk | 46 ++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 package/bluez_utils/Config.in
 create mode 100644 package/bluez_utils/bluez_utils.mk

diff --git a/package/Config.in b/package/Config.in
index 5f9af597d7..3d04056601 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -390,6 +390,7 @@ menu "Networking applications"
 source "package/argus/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
+source "package/bluez_utils/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/boa/Config.in"
 endif
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
new file mode 100644
index 0000000000..ea6b44c976
--- /dev/null
+++ b/package/bluez_utils/Config.in
@@ -0,0 +1,35 @@
+config BR2_PACKAGE_BLUEZ_UTILS
+	bool "bluez-utils"
+	depends on BR2_USE_WCHAR # libglib2
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_EXPAT if !BR2_PACKAGE_DBUS_LIBXML2
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  bluez utils
+
+	  http://www.kernel.org/pub/linux/bluetooth
+
+if BR2_PACKAGE_BLUEZ_UTILS
+
+config BR2_PACKAGE_BLUEZ_UTILS_COMPAT
+	bool "BlueZ 3.x compatibility binaries"
+	help
+	  BlueZ 3.x compatibility binaries like pand, hidd, sdp
+
+config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
+	bool "audio support"
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_LIBSNDFILE
+	help
+	  Audio support
+
+config BR2_PACKAGE_BLUEZ_UTILS_USB
+	bool "USB support"
+	select BR2_PACKAGE_LIBUSB
+	help
+	  USB support
+
+endif
+
+comment "bluez-utils require a toolchain with WCHAR support"
+	depends on !(BR2_USE_WCHAR)
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
new file mode 100644
index 0000000000..cbadf33136
--- /dev/null
+++ b/package/bluez_utils/bluez_utils.mk
@@ -0,0 +1,46 @@
+#############################################################
+#
+# bluez_utils
+#
+#############################################################
+BLUEZ_UTILS_VERSION = 4.96
+BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
+BLUEZ_UTILS_SITE = http://www.kernel.org/pub/linux/bluetooth/
+BLUEZ_UTILS_INSTALL_STAGING = YES
+BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
+BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
+
+# BlueZ 3.x compatibility
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
+BLUEZ_UTILS_CONF_OPT +=	\
+	--enable-hidd	\
+	--enable-pand	\
+	--enable-sdp	\
+	--enable-dund
+endif
+
+# audio support
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
+BLUEZ_UTILS_DEPENDENCIES +=	\
+	alsa-lib		\
+	libsndfile
+BLUEZ_UTILS_CONF_OPT +=	\
+	--enable-alsa	\
+	--enable-audio
+else
+BLUEZ_UTILS_CONF_OPT +=	\
+	--disable-alsa	\
+	--disable-audio
+endif
+
+# USB support
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
+BLUEZ_UTILS_DEPENDENCIES += libusb
+BLUEZ_UTILS_CONF_OPT +=	\
+	--enable-usb
+else
+BLUEZ_UTILS_CONF_OPT +=	\
+	--disable-usb
+endif
+
+$(eval $(call AUTOTARGETS,package,bluez_utils))

From a404b4443b69e21d0594dc531317fd62ea3865da Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Sep 2011 23:20:53 +0200
Subject: [PATCH 0703/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGES b/CHANGES
index 04537497d0..2643641d66 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,19 +16,19 @@
 	Linux: Kernel extensions infrastructure support, Xenomai +
 	RTAI support.
 
-	Updated/fixed packages: busybox, dbus, dbus-glib, directfb,
-	dnsmasq, e2fsprogs, ethtool, fakeroot, fbdump, freetype, fuse,
-	gamin, gmp, jpeg, ipsec-tools, ipset, iptables, iw, leafpad,
-	libargtable2, libao, libconfuse, libcuefile, libcurl,
-	libevent, libreplaygain, libsamplerate, libsndfile, libsoup,
-	libsvgtiny, lighttpd, lzo, lzop, mpd, mpfr, mpg123, musepack,
-	mysql_client, netcat, netsnmp, ntfs-3g, ntfsprogs, openssh,
-	openssl, python, qt, radvd, samba, sdl_sound, sqlite, squid,
-	sylpheed, taglib, tar, tcpreplay, tslib, usbutils, util-linux,
-	xterm
-
-	New packages: fluxbox, libev, libftdi, libgeotiff, portaudio,
-	rtai, xenomai.
+	Updated/fixed packages: acpid, busybox, dbus, dbus-glib,
+	directfb, dnsmasq, e2fsprogs, ethtool, fakeroot, fbdump,
+	freetype, fuse, gamin, gmp, jpeg, ipsec-tools, ipset,
+	iptables, iw, kexec, leafpad, libargtable2, libao, libconfuse,
+	libcuefile, libcurl, libevent, libreplaygain, libsamplerate,
+	libsndfile, libsoup, libsvgtiny, lighttpd, lzo, lzop, mpd,
+	mpfr, mpg123, musepack, mysql_client, netcat, netsnmp,
+	ntfs-3g, ntfsprogs, openssh, openssl, python, qt, radvd,
+	samba, sdl_sound, sqlite, squid, sylpheed, taglib, tar,
+	tcpreplay, tslib, usbutils, util-linux, valgrind, xterm
+
+	New packages: bluez-utils, cifs-utils, fluxbox, libev,
+	libftdi, libgeotiff, ngrep, openocd, portaudio, rtai, xenomai.
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 11285bd2c7be86cf8c2e6145bce59cad5286a51e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Sep 2011 11:52:50 +0200
Subject: [PATCH 0704/6849] gstreamer: add option to disable gst_debug tracing
 functionality

Shrinks gst library sizes with ~1MB (depending on the amount of plugins
enabled).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/Config.in    | 9 +++++++++
 package/multimedia/gstreamer/gstreamer.mk | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 7de904c8c9..4d279b8b1c 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -7,5 +7,14 @@ config BR2_PACKAGE_GSTREAMER
 
 	  http://gstreamer.freedesktop.org/
 
+config BR2_PACKAGE_GSTREAMER_GST_DEBUG
+	bool "enable gst-debug trace support"
+	default y
+	depends on BR2_PACKAGE_GSTREAMER
+	help
+	  Enable support for the gst-debug tracing functionality
+	  in gstreamer. This has limited CPU overhead, but does
+	  increase the rootfs size somewhat.
+
 comment "gstreamer requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index db5ccaf650..ffc8745559 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -1,3 +1,4 @@
+
 #############################################################
 #
 # gstreamer
@@ -19,7 +20,8 @@ GSTREAMER_CONF_OPT = \
 		--disable-examples \
 		--disable-tests \
 		--disable-failing-tests \
-		--disable-loadsave
+		--disable-loadsave \
+		$(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug)
 
 GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config
 

From 2aa09fd4605a2a0717b683a1e8af455d1d893cef Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 27 Sep 2011 11:48:05 +0200
Subject: [PATCH 0705/6849] libglib2: bump to 2.28.8

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index cf2665e7fd..cb66a32fb1 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 LIBGLIB2_VERSION_MAJOR = 2.28
-LIBGLIB2_VERSION_MINOR = 6
+LIBGLIB2_VERSION_MINOR = 8
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)

From 0a775837fb869ff6ac0996a08b8a3c9ead8fdbf0 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 27 Sep 2011 12:17:43 +0200
Subject: [PATCH 0706/6849] rsync: bump to 3.0.9

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rsync/rsync.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 5030faeb19..e99b650ebb 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -4,10 +4,9 @@
 #
 #############################################################
 
-RSYNC_VERSION := 3.0.8
-RSYNC_SOURCE := rsync-$(RSYNC_VERSION).tar.gz
-RSYNC_SITE := http://rsync.samba.org/ftp/rsync/src
-RSYNC_INSTALL_STAGING = NO
+RSYNC_VERSION = 3.0.9
+RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
+RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
 RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 RSYNC_CONF_OPT = --with-included-popt
 

From 3fac21ef8d794b47f731003b399e704349c54346 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 6 Sep 2011 23:16:08 +0200
Subject: [PATCH 0707/6849] cpio: fix boot with dynamic /dev

Devtmpfs doesn't get automounted by the kernel when an initramfs is used.
Since cpio archives are used almost exclusively as an initramfs, the same
fix should be applied to it as for the initramfs.

Cfr. commit 424888e47431db738f5f9b3c6392435bfce7a842 and
10a130f91e5b947e2d2558443ff09b1686eac273.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cpio/cpio.mk | 24 +++++++++++++++++++-----
 fs/cpio/init    |  7 +++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100755 fs/cpio/init

diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index ab7d546185..aa20b41074 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -4,15 +4,29 @@
 #
 #############################################################
 
-define ROOTFS_CPIO_INIT_SYMLINK
-	rm -f $(TARGET_DIR)/init
-	ln -s sbin/init $(TARGET_DIR)/init
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+
+define ROOTFS_CPIO_ADD_INIT
+        if [ ! -e $(TARGET_DIR)/init ]; then \
+                ln -sf sbin/init $(TARGET_DIR)/init; \
+        fi
+endef
+
+else
+# devtmpfs does not get automounted when initramfs is used.
+# Add a pre-init script to mount it before running init
+define ROOTFS_CPIO_ADD_INIT
+        if [ ! -e $(TARGET_DIR)/init ]; then \
+                $(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \
+        fi
 endef
 
-ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_INIT_SYMLINK
+endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
+
+ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT
 
 define ROOTFS_CPIO_CMD
 	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@
 endef
 
-$(eval $(call ROOTFS_TARGET,cpio))
\ No newline at end of file
+$(eval $(call ROOTFS_TARGET,cpio))
diff --git a/fs/cpio/init b/fs/cpio/init
new file mode 100755
index 0000000000..a275482177
--- /dev/null
+++ b/fs/cpio/init
@@ -0,0 +1,7 @@
+#!/bin/sh
+# devtmpfs does not get automounted for initramfs
+/bin/mount -t devtmpfs devtmpfs /dev
+exec 0</dev/console
+exec 1>/dev/console
+exec 2>/dev/console
+exec /sbin/init $*

From 13a3afc536b845e8de8eea9b91bbc6e7430c4566 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 6 Sep 2011 23:16:09 +0200
Subject: [PATCH 0708/6849] fs/initramfs: refactor with fs/cpio

An initramfs is in fact the same as a cpio archive, but embedded in
the kernel.  So instead of duplicating the cpio infrastructure,
we can simply build images/rootfs.cpio and link that into the
kernel.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/initramfs/Config.in             |  13 +-
 fs/initramfs/gen_initramfs_list.sh | 203 -----------------------------
 fs/initramfs/init                  |   7 -
 fs/initramfs/initramfs.mk          |  35 ++---
 linux/linux.mk                     |  17 +--
 5 files changed, 25 insertions(+), 250 deletions(-)
 delete mode 100644 fs/initramfs/gen_initramfs_list.sh
 delete mode 100755 fs/initramfs/init

diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index abb3c0cc03..bbc2ab0b72 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -1,20 +1,21 @@
 config BR2_TARGET_ROOTFS_INITRAMFS
 	bool "initramfs for initial ramdisk of linux kernel"
 	depends on BR2_LINUX_KERNEL
+	select BR2_TARGET_ROOTFS_CPIO
 	help
 	  Integrate the root filesystem generated by Buildroot as an
 	  initramfs inside the kernel image. This integration will
 	  take place automatically.
 
-	  The rootfs.initramfs file generated in the images/ directory
-	  is only a text file describing the contents of the initramfs
-	  in a format understood by the CONFIG_INITRAMFS_SOURCE kernel
-	  configuration option.
+	  A rootfs.cpio file will be generated in the images/ directory.
+	  This is the archive that will be included in the kernel image.
+	  The rootfs in the kernel will always be gzip'ed, regardless
+	  of how buildroot's cpio archive is configured.
 
-	  Note that enabling initramfs together with other filesystem
+	  Note that enabling initramfs together with another filesystem
 	  formats doesn't make sense: you would end up having two
 	  identical root filesystems, one embedded inside the kernel
-	  image, and one separatly.
+	  image, and one separately.
 
 comment "initramfs requires a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL
diff --git a/fs/initramfs/gen_initramfs_list.sh b/fs/initramfs/gen_initramfs_list.sh
deleted file mode 100644
index 26252b6199..0000000000
--- a/fs/initramfs/gen_initramfs_list.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/sh
-# Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
-# Released under the terms of the GNU GPL
-#
-# Generate a newline separated list of entries from the file/directory
-# supplied as an argument.
-#
-# If a file/directory is not supplied then generate a small dummy file.
-#
-# The output is suitable for gen_init_cpio built from usr/gen_init_cpio.c.
-#
-
-default_initramfs() {
-	cat <<-EOF
-		# This is a very simple, default initramfs
-
-		dir /dev 0755 0 0
-		nod /dev/console 0600 0 0 c 5 1
-		dir /root 0700 0 0
-	EOF
-}
-
-filetype() {
-	local argv1="$1"
-
-	# symlink test must come before file test
-	if [ -L "$argv1" ]; then
-		echo "slink"
-	elif [ -f "$argv1" ]; then
-		echo "file"
-	elif [ -d "$argv1" ]; then
-		echo "dir"
-	elif [ -b "$argv1" -o -c "$argv1" ]; then
-		echo "nod"
-	elif [ -p "$argv1" ]; then
-		echo "pipe"
-	elif [ -S "$argv1" ]; then
-		echo "sock"
-	else
-		echo "invalid"
-	fi
-	return 0
-}
-
-print_mtime() {
-	local argv1="$1"
-	local mymtime="0"
-
-	if [ -e "$argv1" ]; then
-		mymtime=$(find "$argv1" -printf "%T@\n" | sort -r | head -n 1)
-	fi
-	
-	echo "# Last modified: $mymtime"
-	echo
-}
-
-parse() {
-	local location="$1"
-	local name=$(echo "$location" | sed -e "s,$srcdir,,")
-	# change '//' into '/'
-	name=$(echo $name | sed -e 's,/[/]*,/,g')
-	local mode="$2"
-	local uid="$3"
-	local gid="$4"
-	local ftype=$(filetype "$location")
-	# remap uid/gid to 0 if necessary
-	[ "x$uid" != "x" ] && [ $uid -eq $root_uid ] && uid=0
-	[ "x$gid" != "x" ] && [ $gid -eq $root_gid ] && gid=0
-	local str="$mode $uid $gid"
-
-	[ "$ftype" = "invalid" ] && return 0
-	[ "$location" = "$srcdir" ] && return 0
-
-	case "$ftype" in
-		"file")
-			str="$ftype $name $location $str"
-			;;
-		"nod")
-			local devtype=
-			local maj=$(LC_ALL=C ls -l "$location" | \
-					awk '{sub(/,/, "", $5); print $5}')
-			local min=$(LC_ALL=C ls -l "$location" | \
-					awk '{print $6}')
-
-			if [ -b "$location" ]; then
-				devtype="b"
-			else
-				devtype="c"
-			fi
-			str="$ftype $name $str $devtype $maj $min"
-			;;
-		"slink")
-			local target=$(LC_ALL=C ls -l "$location" | \
-					awk '{print $11}')
-			str="$ftype $name $target $str"
-			;;
-		*)
-			str="$ftype $name $str"
-			;;
-	esac
-
-	echo "$str"
-
-	return 0
-}
-
-usage() {
-	printf    "Usage:\n"
-	printf    "$0 [ [-u <root_uid>] [-g <root_gid>] [-d | <cpio_source>] ] . . .\n"
-	printf    "\n"
-	printf -- "-u <root_uid>  User ID to map to user ID 0 (root).\n"
-	printf    "               <root_uid> is only meaningful if <cpio_source>\n"
-	printf    "               is a directory.\n"
-	printf -- "-g <root_gid>  Group ID to map to group ID 0 (root).\n"
-	printf    "               <root_gid> is only meaningful if <cpio_source>\n"
-	printf    "               is a directory.\n"
-	printf    "<cpio_source>  File list or directory for cpio archive.\n"
-	printf    "               If <cpio_source> is not provided then a\n"
-	printf    "               a default list will be output.\n"
-	printf -- "-d             Output the default cpio list.  If no <cpio_source>\n"
-	printf    "               is given then the default cpio list will be output.\n"
-	printf    "\n"
-	printf    "All options may be repeated and are interpreted sequentially\n"
-	printf    "and immediately.  -u and -g states are preserved across\n"
-	printf    "<cpio_source> options so an explicit \"-u 0 -g 0\" is required\n"
-	printf    "to reset the root/group mapping.\n"
-}
-
-build_list() {
-	printf "\n#####################\n# $cpio_source\n"
-
-	if [ -f "$cpio_source" ]; then
-		print_mtime "$cpio_source"
-		cat "$cpio_source"
-	elif [ -d "$cpio_source" ]; then
-		srcdir=$(echo "$cpio_source" | sed -e 's://*:/:g;s:/$::')
-		dirlist=$(find "$srcdir" -printf "%p %m %U %G\n" 2>/dev/null)
-
-		# If $dirlist is only one line, then the directory is empty
-		if [  "$(echo "$dirlist" | wc -l)" -gt 1 ]; then
-			print_mtime "$cpio_source"
-		
-			echo "$dirlist" | \
-			while read x; do
-				parse $x
-			done
-		else
-			# Failsafe in case directory is empty
-			default_initramfs
-		fi
-	else
-		echo "  $0: Cannot open '$cpio_source'" >&2
-		exit 1
-	fi
-}
-
-
-root_uid=0
-root_gid=0
-
-while [ $# -gt 0 ]; do
-	arg="$1"
-	shift
-	case "$arg" in
-		"-u")
-			root_uid="$1"
-			shift
-			;;
-		"-g")
-			root_gid="$1"
-			shift
-			;;
-		"-d")
-			default_list="$arg"
-			default_initramfs
-			;;
-		"-h")
-			usage
-			exit 0
-			;;
-		*)
-			case "$arg" in
-				"-"*)
-					printf "ERROR: unknown option \"$arg\"\n" >&2
-					printf "If the filename validly begins with '-', then it must be prefixed\n" >&2
-					printf "by './' so that it won't be interpreted as an option." >&2
-					printf "\n" >&2
-					usage >&2
-					exit 1
-					;;
-				*)
-					cpio_source="$arg"
-					build_list
-					;;
-			esac
-			;;
-	esac
-done
-
-# spit out the default cpio list if a source hasn't been specified
-[ -z "$cpio_source" -a -z "$default_list" ] && default_initramfs
-
-exit 0
diff --git a/fs/initramfs/init b/fs/initramfs/init
deleted file mode 100755
index a275482177..0000000000
--- a/fs/initramfs/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# devtmpfs does not get automounted for initramfs
-/bin/mount -t devtmpfs devtmpfs /dev
-exec 0</dev/console
-exec 1>/dev/console
-exec 2>/dev/console
-exec /sbin/init $*
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 1cd48b6c8b..f1eb8b6e68 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -1,36 +1,23 @@
 #############################################################
 #
-# Make a initramfs_list file to be used by gen_init_cpio
-# gen_init_cpio is part of the 2.6 linux kernels to build an
-# initial ramdisk filesystem based on cpio
+# Build a kernel with an integrated initial ramdisk
+# filesystem based on cpio.
 #
 #############################################################
 
-ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+ROOTFS_INITRAMFS_DEPENDENCIES += rootfs-cpio
 
-define ROOTFS_INITRAMFS_ADD_INIT
-	if [ ! -e $(TARGET_DIR)/init ]; then \
-		ln -sf sbin/init $(TARGET_DIR)/init; \
-	fi
-endef
+ROOTFS_INITRAMFS_POST_TARGETS += linux26-rebuild-with-initramfs
 
-else
-# devtmpfs does not get automounted when initramfs is used.
-# Add a pre-init script to mount it before running init
-define ROOTFS_INITRAMFS_ADD_INIT
-	if [ ! -e $(TARGET_DIR)/init ]; then \
-		$(INSTALL) -m 0755 fs/initramfs/init $(TARGET_DIR)/init; \
-	fi
-endef
 
-endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
+# The generic fs infrastructure isn't very useful here.
 
-ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_ADD_INIT
+rootfs-initramfs: $(ROOTFS_INITRAMFS_DEPENDENCIES) $(ROOTFS_INITRAMFS_POST_TARGETS)
 
-define ROOTFS_INITRAMFS_CMD
-	$(SHELL) fs/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@
-endef
+rootfs-initramfs-show-depends:
+	@echo $(ROOTFS_INITRAMFS_DEPENDENCIES)
 
-ROOTFS_INITRAMFS_POST_TARGETS += linux26-rebuild-with-initramfs
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+TARGETS += rootfs-initramfs
+endif
 
-$(eval $(call ROOTFS_TARGET,initramfs))
diff --git a/linux/linux.mk b/linux/linux.mk
index f249d96701..600b14d752 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -126,13 +126,13 @@ define LINUX_CONFIGURE_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
 		$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
 	# As the kernel gets compiled before root filesystems are
-	# built, we create a fake initramfs file list. It'll be
-	# replaced later by the real list, and the kernel will be
+	# built, we create a fake cpio file. It'll be
+	# replaced later by the real cpio archive, and the kernel will be
 	# rebuilt using the linux26-rebuild-with-initramfs target.
 	$(if $(BR2_TARGET_ROOTFS_INITRAMFS),
-		touch $(BINARIES_DIR)/rootfs.initramfs
+		touch $(BINARIES_DIR)/rootfs.cpio
 		$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
-		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
+		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
 		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
 		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
 		$(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
@@ -190,13 +190,10 @@ linux-savedefconfig linux26-savedefconfig: dirs $(LINUX_DIR)/.stamp_configured
 	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
 
-# Support for rebuilding the kernel after the initramfs file list has
-# been generated in $(BINARIES_DIR)/rootfs.initramfs.
-$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.initramfs
+# Support for rebuilding the kernel after the cpio archive has
+# been generated in $(BINARIES_DIR)/rootfs.cpio.
+$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
-	# Remove the previously generated initramfs which was empty,
-	# to make sure the kernel will actually regenerate it.
-	$(RM) -f $(@D)/usr/initramfs_data.cpio*
 	# Build the kernel.
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	# Copy the kernel image to its final destination

From 57194c2bd87045def1a01335336feb0d71715c91 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Sep 2011 11:04:48 -0300
Subject: [PATCH 0709/6849] ncurses: fix host build breakage

Disable GPM support for host ncurses build since it sometimes breaks the
build.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index ac4c12b56d..8c8ae3641d 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -131,7 +131,7 @@ define HOST_NCURSES_BUILD_CMDS
 endef
 
 HOST_NCURSES_CONF_OPT = \
-	--without-shared
+	--without-shared --without-gpm
 
 $(eval $(call AUTOTARGETS,package,ncurses))
 $(eval $(call AUTOTARGETS,package,ncurses,host))

From c6fe0f1ee7246649c04370bf126c6d766f6e0f19 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Sep 2011 23:32:28 +0200
Subject: [PATCH 0710/6849] libroxml: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...{libroxml-2.1.0-werror.patch => libroxml-2.1.1-werror.patch} | 0
 package/libroxml/libroxml.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/libroxml/{libroxml-2.1.0-werror.patch => libroxml-2.1.1-werror.patch} (100%)

diff --git a/package/libroxml/libroxml-2.1.0-werror.patch b/package/libroxml/libroxml-2.1.1-werror.patch
similarity index 100%
rename from package/libroxml/libroxml-2.1.0-werror.patch
rename to package/libroxml/libroxml-2.1.1-werror.patch
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 88d3e664d8..ccaf4921d4 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
 # libroxml
 #
 
-LIBROXML_VERSION = 2.1.0
+LIBROXML_VERSION = 2.1.1
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 

From 6fc42cda363292b05d16d8eabaceba6376edc318 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 28 Sep 2011 22:18:29 +0200
Subject: [PATCH 0711/6849] package: add json-c library

json-c is a JSON library written in C.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/json-c/Config.in | 11 +++++++++++
 package/json-c/json-c.mk | 11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/json-c/Config.in
 create mode 100644 package/json-c/json-c.mk

diff --git a/package/Config.in b/package/Config.in
index 3d04056601..a849266bac 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -370,6 +370,7 @@ endmenu
 menu "JSON/XML"
 source "package/expat/Config.in"
 source "package/ezxml/Config.in"
+source "package/json-c/Config.in"
 source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
diff --git a/package/json-c/Config.in b/package/json-c/Config.in
new file mode 100644
index 0000000000..dbdd75bf58
--- /dev/null
+++ b/package/json-c/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_JSON_C
+	bool "json-c"
+	help
+	  JSON-C - A JSON implementation in C
+
+	  JSON-C implements a reference counting object model that
+	  allows you to easily construct JSON objects in C, output
+	  them as JSON formatted strings and parse JSON formatted
+	  strings back into the C representation of JSON objects.
+
+	  http://oss.metaparadigm.com/json-c/
diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
new file mode 100644
index 0000000000..295c55e0c4
--- /dev/null
+++ b/package/json-c/json-c.mk
@@ -0,0 +1,11 @@
+################################################################################
+#
+# json-c
+#
+################################################################################
+
+JSON_C_VERSION = 0.9
+JSON_C_SITE = http://oss.metaparadigm.com/json-c/
+JSON_C_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,json-c))

From 8d6aaaa6ffa519ab601896063b66d7dd6760db25 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 28 Sep 2011 23:32:32 +0200
Subject: [PATCH 0712/6849] package: add fftw library

fftw is a library for fast fourier transforms.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/fftw/Config.in | 11 +++++++++++
 package/fftw/fftw.mk   | 11 +++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/fftw/Config.in
 create mode 100644 package/fftw/fftw.mk

diff --git a/package/Config.in b/package/Config.in
index a849266bac..8b9c81666e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -338,6 +338,7 @@ source "package/libupnp/Config.in"
 endmenu
 
 menu "Other"
+source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
 source "package/libatomic_ops/Config.in"
diff --git a/package/fftw/Config.in b/package/fftw/Config.in
new file mode 100644
index 0000000000..36f849f12b
--- /dev/null
+++ b/package/fftw/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FFTW
+	bool "fftw"
+	help
+	  Library for computing Fast Fourier Transforms.
+
+	  This library computes Fast Fourier Transforms (FFT) in one
+	  or more dimensions.  It is extremely fast. This package
+	  contains the shared library version of the fftw libraries in
+	  double precision.
+
+	  http://www.fftw.org
diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
new file mode 100644
index 0000000000..a5b3588624
--- /dev/null
+++ b/package/fftw/fftw.mk
@@ -0,0 +1,11 @@
+################################################################################
+#
+# fftw
+#
+################################################################################
+
+FFTW_VERSION = 3.3
+FFTW_SITE = http://www.fftw.org
+FFTW_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,fftw))

From 1b99a279565fb10c59b93c41f30c8bb835d63331 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 10:40:58 +0200
Subject: [PATCH 0713/6849] libtool: install into staging

libtool provides libltdl, so install it into staging to make it usable
by other packages.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtool/libtool.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 3306244059..d796f9b46b 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -6,6 +6,7 @@
 LIBTOOL_VERSION = 2.2.10
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
+LIBTOOL_INSTALL_STAGING = YES
 
 HOST_LIBTOOL_LIBTOOL_PATCH = NO
 

From 25fd4e724eea1417ddaf06654d9d2558824959f3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 14:31:32 +0200
Subject: [PATCH 0714/6849] qemu_x86_defconfig: use 3.0.4 linux kernel

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-2.6.36.config => linux-3.0.config} | 9 +--------
 configs/qemu_x86_defconfig                               | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)
 rename board/qemu/x86/{linux-2.6.36.config => linux-3.0.config} (88%)

diff --git a/board/qemu/x86/linux-2.6.36.config b/board/qemu/x86/linux-3.0.config
similarity index 88%
rename from board/qemu/x86/linux-2.6.36.config
rename to board/qemu/x86/linux-3.0.config
index a578041bd2..20ef541670 100644
--- a/board/qemu/x86/linux-2.6.36.config
+++ b/board/qemu/x86/linux-3.0.config
@@ -1,16 +1,12 @@
 CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_SCHED_OMIT_FRAME_POINTER is not set
-# CONFIG_NO_BOOTMEM is not set
-# CONFIG_X86_RESERVE_LOW_64K is not set
 # CONFIG_MTRR_SANITIZER is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_RELOCATABLE is not set
@@ -29,7 +25,6 @@ CONFIG_IP_PNP=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 CONFIG_ATA_PIIX=y
@@ -44,10 +39,10 @@ CONFIG_8139CP=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_SERIO_SERPORT is not set
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
 # CONFIG_MFD_SUPPORT is not set
@@ -63,9 +58,7 @@ CONFIG_NFS_FS=y
 CONFIG_ROOT_NFS=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_VIRTUALIZATION is not set
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 04314c2da0..d60b38d5b1 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -12,6 +12,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.0.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-2.6.36.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.0.config"

From 946a0ff97a574f2963434bba9c587d4832498bca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 14:46:39 +0200
Subject: [PATCH 0715/6849] qemu/x86: enable alsa/hda support in kernel

For easy sound testing using qemu-system-i386 -soundhw hda

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/linux-3.0.config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/board/qemu/x86/linux-3.0.config b/board/qemu/x86/linux-3.0.config
index 20ef541670..5bf6944e3d 100644
--- a/board/qemu/x86/linux-3.0.config
+++ b/board/qemu/x86/linux-3.0.config
@@ -46,6 +46,9 @@ CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
 # CONFIG_MFD_SUPPORT is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set

From 167b504bcd2bb2fd49e36dcdcc341509d78921c7 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 27 Sep 2011 14:27:07 +0200
Subject: [PATCH 0716/6849] gst-plugins-good: sort plug-ins alphabetically

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/Config.in | 24 +++++-----
 .../gst-plugins-good/gst-plugins-good.mk      | 48 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index b431603663..e560ea8596 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -36,9 +36,6 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB
 
 comment "dependency-less plugins"
 
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER
-	bool "videofilter"
-
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA
 	bool "alpha"
 
@@ -76,6 +73,15 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV
 	bool "flv"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX
+	bool "flx"
+
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM
+	bool "goom"
+
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1
+	bool "goom2k1"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX
 	bool "id3demux (*.mp3 audio)"
 
@@ -88,15 +94,6 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE
 	bool "interleave"
 
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX
-	bool "flx"
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM
-	bool "goom"
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1
-	bool "goom2k1"
-
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW
 	bool "law"
 
@@ -152,6 +149,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP
 	bool "videocrop"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER
+	bool "videofilter"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER
 	bool "videomixer"
 
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index ff7b4c0c8b..eeff26600e 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -54,12 +54,6 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-alpha
 else
@@ -132,6 +126,24 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-flv
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-flx
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-flx
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-goom
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-goom
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-id3demux
 else
@@ -156,24 +168,6 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-interleave
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flx
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flx
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-goom
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-goom
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-law
 else
@@ -276,6 +270,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-videocrop
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-videomixer
 else

From cd142e80ab09ddd517f5cec6f50cd87174577e42 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 16:40:50 +0200
Subject: [PATCH 0717/6849] gstreamer: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/gstreamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index ffc8745559..b1456e255e 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -4,7 +4,7 @@
 # gstreamer
 #
 #############################################################
-GSTREAMER_VERSION = 0.10.32
+GSTREAMER_VERSION = 0.10.35
 GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER_INSTALL_STAGING = YES

From def45ab622f942c9639ebe1ede79ac4dd590d8fb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 16:42:55 +0200
Subject: [PATCH 0718/6849] gst-plugins-base: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 79ced3004a..a260f89a78 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -3,7 +3,7 @@
 # gst-plugins-base
 #
 #############################################################
-GST_PLUGINS_BASE_VERSION = 0.10.32
+GST_PLUGINS_BASE_VERSION = 0.10.35
 GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES

From 531d31d286de113d9653bf5b592932bc8295725c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 16:55:08 +0200
Subject: [PATCH 0719/6849] gst-plugins-good: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/Config.in |  9 ++++++---
 .../gst-plugins-good/gst-plugins-good.mk      | 20 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index e560ea8596..1fc66a3572 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -45,6 +45,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX
 	bool "audiofx"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS
+	bool "audioparsers"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE
 	bool "auparse"
 
@@ -94,6 +97,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE
 	bool "interleave"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4
+	bool "isomp4"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW
 	bool "law"
 
@@ -112,9 +118,6 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART
 	bool "multipart"
 
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_QTDEMUX
-	bool "qtdemux"
-
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN
 	bool "replaygain"
 
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index eeff26600e..202e60e70f 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -3,7 +3,7 @@
 # gst-plugins-good
 #
 #############################################################
-GST_PLUGINS_GOOD_VERSION = 0.10.28
+GST_PLUGINS_GOOD_VERSION = 0.10.30
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 
@@ -72,6 +72,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-audiofx
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-audioparsers
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-audioparsers
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-auparse
 else
@@ -168,6 +174,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-interleave
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-isomp4
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-isomp4
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-law
 else
@@ -204,12 +216,6 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-multipart
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_QTDEMUX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-qtdemux
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-qtdemux
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-replaygain
 else

From 6fd3be048d98f2bd1a9fe45734ec413a1852aeb5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 16:56:52 +0200
Subject: [PATCH 0720/6849] gst-plugins-ugly: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index ab557a386d..c3a3d8b744 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -3,7 +3,7 @@
 # gst-plugins-ugly
 #
 #############################################################
-GST_PLUGINS_UGLY_VERSION = 0.10.17
+GST_PLUGINS_UGLY_VERSION = 0.10.18
 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 

From 30f416cc86c115c34984b0499b76a00c8482abeb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 21:02:14 +0200
Subject: [PATCH 0721/6849] gst-plugins-bad: bump version

And sort options alphabetically.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in  |  84 ++++++---
 .../gst-plugins-bad/gst-plugins-bad.mk        | 161 +++++++++++++-----
 2 files changed, 186 insertions(+), 59 deletions(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 5ccaa1639b..cd9249a482 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -24,38 +24,30 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX
 	bool "asfmux"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
-	bool "apexsink"
-	select BR2_PACKAGE_OPENSSL
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS
 	bool "audioparsers"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT
 	bool "autoconvert"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER
+	bool "bayer"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN
 	bool "camerabin"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2
+	bool "camerabin2"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE
+	bool "cdxaparse"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS
 	bool "coloreffects"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE
 	bool "colorspace"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE
-	bool "legacyresample"
-
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER
-	bool "bayer"
-
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO
-	bool "cdaudio"
-	select BR2_PACKAGE_LIBCDAUDIO
-
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE
-	bool "cdxaparse"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC
 	bool "dataurisrc"
 
@@ -77,6 +69,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL
 	bool "festival"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
+	bool "fieldanalysis"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
 	bool "freeze"
 
@@ -98,6 +93,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE
 	bool "hdvparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS
+	bool "hls"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG
+	bool "id3tag"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE
 	bool "interlace"
 
@@ -113,6 +114,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT
 	bool "jpegformat"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE
+	bool "legacyresample"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB
 	bool "librfb"
 
@@ -125,6 +129,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX
 	bool "mpegpsmux"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
+	bool "mpegtsdemux"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX
 	bool "mpegtsmux"
 
@@ -146,15 +153,15 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX
 	bool "nuvdemux"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT
+	bool "patchdetect"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE
 	bool "pcapparse"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM
 	bool "pnm"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_QTMUX
-	bool "qtmux"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE
 	bool "rawparse"
 
@@ -164,9 +171,15 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX
 	bool "rtpmux"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8
+	bool "rtpvp8"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO
 	bool "scaletempo"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI
+	bool "sdi"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP
 	bool "sdp"
 
@@ -188,12 +201,18 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA
 	bool "tta"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS
+	bool "videofilters"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE
 	bool "videomaxrate"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
 	bool "videomeasure"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS
+	bool "videoparsers"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
 	bool "videosignal"
 
@@ -205,6 +224,22 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
 
 comment "plugins with external dependencies (there may be more available)"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
+	bool "apexsink"
+	select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2
+	bool "bz2"
+	select BR2_PACKAGE_BZIP2
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO
+	bool "cdaudio"
+	select BR2_PACKAGE_LIBCDAUDIO
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL
+	bool "curl"
+	select BR2_PACKAGE_LIBCURL
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
 	select BR2_PACKAGE_DIRECTFB
@@ -219,10 +254,19 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON
 	bool "neon"
 	select BR2_PACKAGE_NEON
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
+	bool "rsvg"
+	depends on BR2_PACKAGE_LIBGTK2
+	select BR2_PACKAGE_LIBRSVG
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
 	select BR2_PACKAGE_SDL
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE
+	bool "sndfile"
+	select BR2_PACKAGE_LIBSNDFILE
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
 	bool "vcd"
 
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 5012be2e00..dee440a173 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -3,7 +3,7 @@
 # gst-plugins-bad
 #
 #############################################################
-GST_PLUGINS_BAD_VERSION = 0.10.21
+GST_PLUGINS_BAD_VERSION = 0.10.22
 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 
@@ -40,13 +40,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-asfmux
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-apexsink
-GST_PLUGINS_BAD_DEPENDENCIES += openssl
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-apexsink
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-audioparsers
 else
@@ -59,34 +52,22 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-autoconvert
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-colorspace
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-bayer
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-colorspace
+GST_PLUGINS_BAD_CONF_OPT += --disable-bayer
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-legacyresample
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-legacyresample
+GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-bayer
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-bayer
+GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin2
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
@@ -95,11 +76,16 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-cdxaparse
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
-GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+GST_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-colorspace
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-colorspace
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
@@ -144,6 +130,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-festival
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-fieldanalysis
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-freeze
 else
@@ -186,6 +178,18 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-hls
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-hls
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-id3tag
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-id3tag
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-interlace
 else
@@ -222,6 +226,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-legacyresample
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-legacyresample
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-librfb
 else
@@ -246,6 +256,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsdemux
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-mpegtsdemux
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
 else
@@ -288,6 +304,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-nuvdemux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-patchdetect
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-patchdetect
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-pcapparse
 else
@@ -300,12 +322,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-pnm
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_QTMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-qtmux
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-qtmux
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-rawparse
 else
@@ -324,12 +340,24 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-rtpmux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-rtpvp8
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-rtpvp8
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-scaletempo
 else
 GST_PLUGINS_BAD_CONF_OPT += --disable-scaletempo
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-sdi
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-sdi
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-sdp
 else
@@ -372,6 +400,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-tta
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-videofilters
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-videofilters
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-videomaxrate
 else
@@ -384,6 +418,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-videoparsers
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-videoparsers
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-videosignal
 else
@@ -402,6 +442,35 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-y4m
 endif
 
+# plugins with deps
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-apexsink
+GST_PLUGINS_BAD_DEPENDENCIES += openssl
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-apexsink
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-bz2
+GST_PLUGINS_BAD_DEPENDENCIES += bz2ip
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-bz2
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
+GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-curl
+GST_PLUGINS_BAD_DEPENDENCIES += libcurl
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-curl
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-directfb
 GST_PLUGINS_BAD_DEPENDENCIES += directfb
@@ -428,6 +497,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-neon
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-rsvg
+GST_PLUGINS_BAD_DEPENDENCIES += librsvg
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-rsvg
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y)
 GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
 GST_PLUGINS_BAD_CONF_OPT += --enable-sdl
@@ -436,6 +512,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-sndfile
+GST_PLUGINS_BAD_DEPENDENCIES += libsndfile
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-sndfile
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
 else

From 5ebe28cce6fe5218058aa6b610325f142e930386 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 21:38:56 +0200
Subject: [PATCH 0722/6849] gst-plugins-bad: audioparsers plugin is moved to
 -good

Thanks to Sven for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in          | 3 ---
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index cd9249a482..cfd9b707f4 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -24,9 +24,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX
 	bool "asfmux"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS
-	bool "audioparsers"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT
 	bool "autoconvert"
 
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index dee440a173..9b2a738c3b 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -40,12 +40,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-asfmux
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-audioparsers
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-audioparsers
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
 else

From da76f0f1558698dd398c74393afc35cebfcc7dc7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:37 +0200
Subject: [PATCH 0723/6849] package: enhance infrastructure to support source
 dir override

When a variable <pkg>_OVERRIDE_SRCDIR is defined, then Buildroot will
no longer try to download, extract and patch the package. It will
simply use the value of this variable as the source directory for the
package. The contents of the package sources will be rsynced to the
package build directory in $(O)/build/pkg-version/.

This can be used to tell Buildroot that the sources for a given
package are inside some directory that you control, and which can be
versioned in Git/SVN, or handled in whichever way you want.

Those <pkg>_OVERRIDE_SRCDIR variables will be defined by a local
makefile included by Buildroot, which will be handled in a later
commit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 54 +++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index e2d0e28cef..15fc08541e 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -251,6 +251,25 @@ $(BUILD_DIR)/%/.stamp_extracted:
 	$(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 
+# Rsync the source directory if the <pkg>_OVERRIDE_SRCDIR feature is
+# used.
+$(BUILD_DIR)/%/.stamp_rsynced:
+	@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
+	@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
+	rsync -au $(SRCDIR)/ $(@D)
+	$(Q)touch $@
+
+# Handle the SOURCE_CHECK and SHOW_EXTERNAL_DEPS cases for rsynced
+# packages
+$(BUILD_DIR)/%/.stamp_rsync_sourced:
+ifeq ($(DL_MODE),SOURCE_CHECK)
+	test -d $(SRCDIR)
+else ifeq ($(DL_MODE),SHOW_EXTERNAL_DEPS)
+	echo "file://$(SRCDIR)"
+else
+	@true # Nothing to do to source a local package
+endif
+
 # Patch
 #
 # The RAWNAME variable is the lowercased package name, which allows to
@@ -384,6 +403,10 @@ $(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)
 $(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
 $(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
 
+ifneq ($$($(2)_OVERRIDE_SRCDIR),)
+$(2)_VERSION = custom
+endif
+
 ifndef $(2)_SOURCE
  ifdef $(3)_SOURCE
   $(2)_SOURCE = $($(3)_SOURCE)
@@ -429,6 +452,8 @@ $(2)_TARGET_INSTALL_IMAGES =	$$($(2)_DIR)/.stamp_images_installed
 $(2)_TARGET_INSTALL_HOST =      $$($(2)_DIR)/.stamp_host_installed
 $(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
 $(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
+$(2)_TARGET_RSYNC =	        $$($(2)_DIR)/.stamp_rsynced
+$(2)_TARGET_RSYNC_SOURCE =      $$($(2)_DIR)/.stamp_rsync_sourced
 $(2)_TARGET_PATCH =		$$($(2)_DIR)/.stamp_patched
 $(2)_TARGET_EXTRACT =		$$($(2)_DIR)/.stamp_extracted
 $(2)_TARGET_SOURCE =		$$($(2)_DIR)/.stamp_downloaded
@@ -489,6 +514,13 @@ $(1)-install-host:      $(1)-build $$($(2)_TARGET_INSTALL_HOST)
 $(1)-build:		$(1)-configure \
 			$$($(2)_TARGET_BUILD)
 
+ifeq ($$($(2)_OVERRIDE_SRCDIR),)
+# In the normal case (no package override), the sequence of steps is
+#  source, by downloading
+#  depends
+#  extract
+#  patch
+#  configure
 $(1)-configure:		$(1)-patch $(1)-depends \
 			$$($(2)_TARGET_CONFIGURE)
 
@@ -499,11 +531,25 @@ $(1)-extract:		$(1)-source \
 
 $(1)-depends:		$$($(2)_DEPENDENCIES)
 
+$(1)-source:		$$($(2)_TARGET_SOURCE)
+else
+# In the package override case, the sequence of steps
+#  source, by rsyncing
+#  depends
+#  configure
+$(1)-configure:		$(1)-depends \
+			$$($(2)_TARGET_CONFIGURE)
+
+$(1)-depends:		$(1)-rsync $$($(2)_DEPENDENCIES)
+
+$(1)-rsync:		$$($(2)_TARGET_RSYNC)
+
+$(1)-source:		$$($(2)_TARGET_RSYNC_SOURCE)
+endif
+
 $(1)-show-depends:
 			@echo $$($(2)_DEPENDENCIES)
 
-$(1)-source:		$$($(2)_TARGET_SOURCE)
-
 $(1)-uninstall:		$(1)-configure $$($(2)_TARGET_UNINSTALL)
 
 $(1)-clean:		$(1)-uninstall \
@@ -519,6 +565,10 @@ $$($(2)_TARGET_INSTALL_IMAGES):		PKG=$(2)
 $$($(2)_TARGET_INSTALL_HOST):           PKG=$(2)
 $$($(2)_TARGET_BUILD):			PKG=$(2)
 $$($(2)_TARGET_CONFIGURE):		PKG=$(2)
+$$($(2)_TARGET_RSYNC):                  SRCDIR=$$($(2)_OVERRIDE_SRCDIR)
+$$($(2)_TARGET_RSYNC):                  PKG=$(2)
+$$($(2)_TARGET_RSYNC_SOURCE):		SRCDIR=$$($(2)_OVERRIDE_SRCDIR)
+$$($(2)_TARGET_RSYNC_SOURCE):		PKG=$(2)
 $$($(2)_TARGET_PATCH):			PKG=$(2)
 $$($(2)_TARGET_PATCH):			RAWNAME=$(patsubst host-%,%,$(1))
 $$($(2)_TARGET_EXTRACT):		PKG=$(2)

From ee0246e1e1d83f41985489c85dfef07098a2026d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:38 +0200
Subject: [PATCH 0724/6849] package: add configuration option to specify a
 local override file

The user can now create a custom local override file to override the
source directory for various packages.

An example override file:

 ZLIB_OVERRIDE_SRCDIR = /tmp/zlib
 STRACE_OVERRIDE_SRCDIR = /opt/strace-4.5.20

would tell Buildroot to use the zlib and strace source code from the
specified directories, instead of download, extracting and patching
the code has done usually by Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in | 10 ++++++++++
 Makefile  |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/Config.in b/Config.in
index 2fce9d7900..3aa3ad8cea 100644
--- a/Config.in
+++ b/Config.in
@@ -334,6 +334,16 @@ config BR2_HAVE_DEVFILES
 	  Install headers and static libraries in the
 	  target filesystem
 
+config BR2_PACKAGE_OVERRIDE_FILE
+	string "location of a package override file"
+	default "$(TOPDIR)/local.mk"
+	help
+	  A package override file is a short makefile that contains
+	  variable definitions of the form <pkg>_OVERRIDE_SRCDIR,
+	  which allows to tell Buildroot to use an existing directory
+	  as the source directory for a particular package. See the
+	  Buildroot documentation for more details on this feature.
+
 endmenu
 
 source "toolchain/Config.in"
diff --git a/Makefile b/Makefile
index a20d3e2a89..8525b7ddd8 100644
--- a/Makefile
+++ b/Makefile
@@ -309,6 +309,13 @@ else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
 include toolchain/toolchain-crosstool-ng.mk
 endif
 
+# Include the package override file if one has been provided in the
+# configuration.
+PACKAGE_OVERRIDE_FILE=$(call qstrip,$(BR2_PACKAGE_OVERRIDE_FILE))
+ifneq ($(PACKAGE_OVERRIDE_FILE),)
+-include $(PACKAGE_OVERRIDE_FILE)
+endif
+
 include package/*/*.mk
 
 include boot/common.mk

From 4ed4e5016b741341059ed826416dad3291df0b2c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:39 +0200
Subject: [PATCH 0725/6849] package: add <pkg>-rebuild and <pkg>-reconfigure

We are often asked "how can I restart the build of a package ?" or
"how can I restart the build of package from the configure part
?". Obviously, tweaking with stamp files is possible, but not very
user friendly.

Therefore this patch adds two new per-package targets: <pkg>-rebuild
and <pkg>-reconfigure. They will remove the right stamp files and
restart the complete build process (by using the 'all' target, so that
not only the package is reconfigured, recompiled and reinstalled, but
the root filesystem images are also regenerated).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 15fc08541e..53cc8eba0b 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -557,6 +557,22 @@ $(1)-clean:		$(1)-uninstall \
 
 $(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)
 
+$(1)-clean-for-rebuild:
+ifneq ($$($(2)_OVERRIDE_SRCDIR),)
+			rm -f $$($(2)_TARGET_RSYNC)
+endif
+			rm -f $$($(2)_TARGET_BUILD)
+			rm -f $$($(2)_TARGET_INSTALL_STAGING)
+			rm -f $$($(2)_TARGET_INSTALL_TARGET)
+			rm -f $$($(2)_TARGET_INSTALL_HOST)
+
+$(1)-rebuild:		$(1)-clean-for-rebuild all
+
+$(1)-clean-for-reconfigure: $(1)-clean-for-rebuild
+			rm -f $$($(2)_TARGET_CONFIGURE)
+
+$(1)-reconfigure:	$(1)-clean-for-reconfigure all
+
 # define the PKG variable for all targets, containing the
 # uppercase package variable prefix
 $$($(2)_TARGET_INSTALL_TARGET):		PKG=$(2)

From 793a2ea5174e5352ec18ca32f7914c7071bf3108 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:40 +0200
Subject: [PATCH 0726/6849] package: implement a 'local' site method

The new override source directory mechanism allows to tell Buildroot
to use a particular directory as the source directory for a
package. However, this mechanism works with a local override makefile
and not directly within the package recipe itself.

For some use cases, it might be desirable to write a package recipe
which always refers to a local source directory (and not a http, git,
svn or bazaar download). This commit makes this possible by adding the
'local' site method. It allows to write package recipes as follows:

MYPKG_SITE = /tmp/mypkg-source-code
MYPKG_SITE_METHOD = local

[...]

$(eval $(call GENTARGETS,package,mypkg))

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 53cc8eba0b..5987d3823b 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -439,6 +439,12 @@ ifndef $(2)_SITE_METHOD
  endif
 endif
 
+ifeq ($$($(2)_SITE_METHOD),local)
+ifeq ($$($(2)_OVERRIDE_SRCDIR),)
+$(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
+endif
+endif
+
 $(2)_DEPENDENCIES		?=
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO

From e055aea216cff4d12cf55eab2e35ca1459edaa91 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:41 +0200
Subject: [PATCH 0727/6849] package: add helper functions to get package name
 and directory magically

This commit adds the functions "pkgname" and "pkgdir", which can then
be used to automatically find the name of the package and the
directory of the package which does the call to
GENTARGETS/AUTOTARGETS/CMAKETARGETS. These functions use the
$(MAKEFILE_LIST) variable, which make automatically makes available,
and which contains the list of included Makefiles, with the current
Makefile being last. Thanks to this variable and a little bit of
string manipulation, we can easily find out automatically the package
name and the directory it is part of.

These functions are used in later commits to simplify the GENTARGETS,
AUTOTARGETS and CMAKETARGETS calls.

[Peter: Rename to pkgmakefile->pkgdir, pkgdir->pkgparentdir as that's what it is]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 5987d3823b..afa8d0e9f5 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -55,6 +55,24 @@ define KCONFIG_DISABLE_OPT
        echo "# $(1) is not set" >> $(2)
 endef
 
+# Helper functions to determine the name of a package and its
+# directory from its makefile directory, using the $(MAKEFILE_LIST)
+# variable provided by make. This is used by the *TARGETS macros to
+# automagically find where the package is located. Note that the
+# pkgdir macro is carefully written to handle the case of the Linux
+# package, for which the package directory is an empty string.
+define pkgdir
+$(dir $(lastword $(MAKEFILE_LIST)))
+endef
+
+define pkgname
+$(lastword $(subst /, ,$(call pkgdir)))
+endef
+
+define pkgparentdir
+$(patsubst %$(call pkgname)/,%,$(call pkgdir))
+endef
+
 # Define extractors for different archive suffixes
 INFLATE.bz2  = $(BZCAT)
 INFLATE.gz   = $(ZCAT)

From 0849e8193ef429f29945b8c2a54eafc8635e0969 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:42 +0200
Subject: [PATCH 0728/6849] package: remove useless arguments from GENTARGETS

Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk                 |  2 +-
 boot/at91dataflashboot/at91dataflashboot.mk         |  2 +-
 boot/barebox/barebox.mk                             |  2 +-
 boot/syslinux/syslinux.mk                           |  2 +-
 boot/uboot/uboot.mk                                 |  2 +-
 boot/xloader/xloader.mk                             |  2 +-
 linux/linux.mk                                      |  2 +-
 package/Makefile.package.in                         | 10 ++++------
 package/acpid/acpid.mk                              |  2 +-
 package/axel/axel.mk                                |  2 +-
 package/bsdiff/bsdiff.mk                            |  2 +-
 package/busybox/busybox.mk                          |  2 +-
 package/bzip2/bzip2.mk                              |  4 ++--
 package/cgilua/cgilua.mk                            |  2 +-
 package/cloop/cloop.mk                              |  4 ++--
 package/cmake/cmake.mk                              |  4 ++--
 package/copas/copas.mk                              |  2 +-
 package/coxpcall/coxpcall.mk                        |  2 +-
 package/cramfs/cramfs.mk                            |  4 ++--
 package/dhcpdump/dhcpdump.mk                        |  2 +-
 package/dhrystone/dhrystone.mk                      |  2 +-
 package/dnsmasq/dnsmasq.mk                          |  2 +-
 package/dosfstools/dosfstools.mk                    |  2 +-
 package/dsp-tools/dsp-tools.mk                      |  2 +-
 package/ebtables/ebtables.mk                        |  2 +-
 package/eeprog/eeprog.mk                            |  2 +-
 package/ezxml/ezxml.mk                              |  2 +-
 package/fbgrab/fbgrab.mk                            |  2 +-
 package/fbset/fbset.mk                              |  2 +-
 package/fconfig/fconfig.mk                          |  2 +-
 package/gadgetfs-test/gadgetfs-test.mk              |  2 +-
 package/gdisk/gdisk.mk                              |  2 +-
 package/genromfs/genromfs.mk                        |  4 ++--
 package/hdparm/hdparm.mk                            |  2 +-
 package/hwdata/hwdata.mk                            |  2 +-
 package/i2c-tools/i2c-tools.mk                      |  2 +-
 package/input-event-daemon/input-event-daemon.mk    |  2 +-
 package/input-tools/input-tools.mk                  |  2 +-
 package/iostat/iostat.mk                            |  2 +-
 package/iproute2/iproute2.mk                        |  2 +-
 package/irda-utils/irda-utils.mk                    |  2 +-
 package/iw/iw.mk                                    |  2 +-
 package/libaio/libaio.mk                            |  2 +-
 package/libcap/libcap.mk                            |  4 ++--
 package/liberation/liberation.mk                    |  2 +-
 package/libnss/libnss.mk                            |  2 +-
 package/libroxml/libroxml.mk                        |  2 +-
 package/libsvgtiny/libsvgtiny.mk                    |  2 +-
 package/libv4l/libv4l.mk                            |  2 +-
 package/libxml-parser-perl/libxml-parser-perl.mk    |  4 ++--
 package/linux-fusion/linux-fusion.mk                |  2 +-
 package/lm-sensors/lm-sensors.mk                    |  2 +-
 package/lmbench/lmbench.mk                          |  2 +-
 package/lockfile-progs/lockfile-progs.mk            |  2 +-
 package/logrotate/logrotate.mk                      |  2 +-
 package/lsof/lsof.mk                                |  2 +-
 package/ltrace/ltrace.mk                            |  2 +-
 package/lua/lua.mk                                  |  2 +-
 package/luafilesystem/luafilesystem.mk              |  2 +-
 package/luasocket/luasocket.mk                      |  2 +-
 package/makedevs/makedevs.mk                        |  4 ++--
 package/memstat/memstat.mk                          |  2 +-
 package/memtester/memtester.mk                      |  2 +-
 package/midori/midori.mk                            |  2 +-
 package/mii-diag/mii-diag.mk                        |  2 +-
 package/mrouted/mrouted.mk                          |  2 +-
 package/mtd/mtd.mk                                  |  4 ++--
 package/multimedia/gst-dsp/gst-dsp.mk               |  2 +-
 package/multimedia/gst-omapfb/gst-omapfb.mk         |  2 +-
 package/multimedia/live555/live555.mk               |  2 +-
 package/multimedia/mplayer/mplayer.mk               |  2 +-
 package/multimedia/python-mad/python-mad.mk         |  2 +-
 package/multimedia/tidsp-binaries/tidsp-binaries.mk |  2 +-
 package/netplug/netplug.mk                          |  2 +-
 package/nuttcp/nuttcp.mk                            |  2 +-
 package/olsr/olsr.mk                                |  2 +-
 package/openssl/openssl.mk                          |  2 +-
 package/pciutils/pciutils.mk                        |  2 +-
 package/portmap/portmap.mk                          |  2 +-
 package/pppd/pppd.mk                                |  2 +-
 package/pptp-linux/pptp-linux.mk                    |  2 +-
 package/procps/procps.mk                            |  2 +-
 package/python-serial/python-serial.mk              |  2 +-
 package/qt/qt.mk                                    |  2 +-
 package/rings/rings.mk                              |  2 +-
 package/rsh-redone/rsh-redone.mk                    |  2 +-
 package/scons/scons.mk                              |  2 +-
 package/slang/slang.mk                              |  2 +-
 package/squashfs/squashfs.mk                        |  4 ++--
 package/squashfs3/squashfs3.mk                      |  4 ++--
 package/sredird/sredird.mk                          |  2 +-
 package/sstrip/sstrip.mk                            |  4 ++--
 package/statserial/statserial.mk                    |  2 +-
 package/sysklogd/sysklogd.mk                        |  2 +-
 package/sysvinit/sysvinit.mk                        |  2 +-
 package/ti-utils/ti-utils.mk                        |  2 +-
 package/uboot-tools/uboot-tools.mk                  |  4 ++--
 package/usb_modeswitch/usb_modeswitch.mk            |  2 +-
 package/usbmount/usbmount.mk                        |  2 +-
 package/vsftpd/vsftpd.mk                            |  2 +-
 package/whetstone/whetstone.mk                      |  2 +-
 package/wipe/wipe.mk                                |  2 +-
 package/wireless_tools/wireless_tools.mk            |  2 +-
 package/wsapi/wsapi.mk                              |  2 +-
 package/xavante/xavante.mk                          |  2 +-
 package/xl2tp/xl2tp.mk                              |  2 +-
 package/zlib/zlib.mk                                |  4 ++--
 107 files changed, 124 insertions(+), 126 deletions(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 871b0ffb49..a7a856c6e7 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -29,7 +29,7 @@ define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS
 	cp $(@D)/$(AT91BOOTSTRAP_BINARY) $(BINARIES_DIR)
 endef
 
-$(eval $(call GENTARGETS,boot,at91bootstrap))
+$(eval $(call GENTARGETS))
 
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 # we NEED a board name unless we're at make source
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 14fb8c54d3..6c0188a1e9 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -19,4 +19,4 @@ define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
 	cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR)
 endef
 
-$(eval $(call GENTARGETS,boot,at91dataflashboot))
+$(eval $(call GENTARGETS))
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index c3510fd4c3..0cbe64118a 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -72,7 +72,7 @@ define BAREBOX_INSTALL_TARGET_CMDS
 endef
 endif
 
-$(eval $(call GENTARGETS,boot,barebox))
+$(eval $(call GENTARGETS))
 
 ifeq ($(BR2_TARGET_BAREBOX),y)
 # we NEED a board defconfig file unless we're at make source
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 686124fe59..fa5af07014 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -26,4 +26,4 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS,boot,syslinux))
+$(eval $(call GENTARGETS))
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 202995a73b..cf22312113 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -88,7 +88,7 @@ define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 endef
 
-$(eval $(call GENTARGETS,boot,uboot))
+$(eval $(call GENTARGETS))
 
 ifeq ($(BR2_TARGET_UBOOT),y)
 # we NEED a board name unless we're at make source
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index 8d8cce3b9e..e8dd380979 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -19,7 +19,7 @@ define XLOADER_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/MLO $(BINARIES_DIR)/
 endef
 
-$(eval $(call GENTARGETS,boot,xloader))
+$(eval $(call GENTARGETS))
 
 #############################################################
 #
diff --git a/linux/linux.mk b/linux/linux.mk
index 600b14d752..99f464966a 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -179,7 +179,7 @@ endef
 
 include linux/linux-ext-*.mk
 
-$(eval $(call GENTARGETS,,linux))
+$(eval $(call GENTARGETS))
 
 linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
 	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index afa8d0e9f5..069a868920 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -648,18 +648,16 @@ endef # GENTARGETS_INNER
 ################################################################################
 # GENTARGETS -- the target generator macro for generic packages
 #
-# Argument 1 is the package directory prefix [mandatory]
-# Argument 2 is the lowercase package name   [mandatory]
-# Argument 3 is "target" or "host"           [optional, default: "target"]
+# Argument 1 is "target" or "host"           [optional, default: "target"]
 ################################################################################
 
 define GENTARGETS
-ifeq ($(3),host)
+ifeq ($(1),host)
 # In the case of host packages, turn the package name "pkg" into "host-pkg"
-$(call GENTARGETS_INNER,$(3)-$(2),$(call UPPERCASE,$(3)-$(2)),$(call UPPERCASE,$(2)),$(1),host)
+$(call GENTARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 else
 # In the case of target packages, keep the package name "pkg"
-$(call GENTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(call UPPERCASE,$(2)),$(1),target)
+$(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
 endif
 endef
 
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index cc4e45b6ab..317cb16688 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -30,4 +30,4 @@ define ACPID_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,acpid))
+$(eval $(call GENTARGETS))
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 1bf4d813f2..91f6d1e0da 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -44,4 +44,4 @@ define AXEL_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,axel))
+$(eval $(call GENTARGETS))
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 276c6be1a3..66a7722f07 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -28,4 +28,4 @@ define BSDIFF_CLEAN_CMDS
 	rm -f $(@D)/bsdiff $(@D)/bspatch
 endef
 
-$(eval $(call GENTARGETS,package,bsdiff))
+$(eval $(call GENTARGETS))
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1782a730cb..0751f6a2a5 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -176,7 +176,7 @@ define BUSYBOX_CLEAN_CMDS
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,busybox))
+$(eval $(call GENTARGETS))
 
 busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 123e579fc2..d3bb2b04a5 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -101,5 +101,5 @@ define HOST_BZIP2_INSTALL_CMDS
 	$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS,package,bzip2))
-$(eval $(call GENTARGETS,package,bzip2,host))
\ No newline at end of file
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
\ No newline at end of file
diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
index 9d524cd33b..d46c2a6145 100644
--- a/package/cgilua/cgilua.mk
+++ b/package/cgilua/cgilua.mk
@@ -17,4 +17,4 @@ define CGILUA_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/lua/cgilua.lua"
 endef
 
-$(eval $(call GENTARGETS,package,cgilua))
+$(eval $(call GENTARGETS))
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index fa47a5f5f5..52567dd959 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -14,5 +14,5 @@ define HOST_CLOOP_INSTALL_CMDS
 	$(INSTALL) -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin
 endef
 
-$(eval $(call GENTARGETS,package,cloop))
-$(eval $(call GENTARGETS,package,cloop,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 1b458c2194..af88eea824 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -17,5 +17,5 @@ define HOST_CMAKE_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS,package,cmake))
-$(eval $(call GENTARGETS,package,cmake,host))
\ No newline at end of file
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/copas/copas.mk b/package/copas/copas.mk
index 1baed83563..28b822c2d7 100644
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -17,4 +17,4 @@ define COPAS_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/lua/copas.lua"
 endef
 
-$(eval $(call GENTARGETS,package,copas))
+$(eval $(call GENTARGETS))
diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
index b9475711d3..81125d7408 100644
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -17,4 +17,4 @@ define COXPCALL_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/lua/coxpcall.lua"
 endef
 
-$(eval $(call GENTARGETS,package,coxpcall))
+$(eval $(call GENTARGETS))
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 9073ae5424..4a0ec1c797 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -29,5 +29,5 @@ define HOST_CRAMFS_INSTALL_CMDS
  install -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
 endef
 
-$(eval $(call GENTARGETS,package,cramfs))
-$(eval $(call GENTARGETS,package,cramfs,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
index cca6749842..dd454bf9dc 100644
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -18,4 +18,4 @@ define DHCPDUMP_INSTALL_TARGET_CMDS
 	install -m 0755 -D $(@D)/dhcpdump $(TARGET_DIR)/usr/bin/dhcpdump
 endef
 
-$(eval $(call GENTARGETS,package,dhcpdump))
+$(eval $(call GENTARGETS))
diff --git a/package/dhrystone/dhrystone.mk b/package/dhrystone/dhrystone.mk
index a03beecf61..45eb91c456 100644
--- a/package/dhrystone/dhrystone.mk
+++ b/package/dhrystone/dhrystone.mk
@@ -24,7 +24,7 @@ define DHRYSTONE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/dhrystone
 endef
 
-$(eval $(call GENTARGETS,package,dhrystone))
+$(eval $(call GENTARGETS))
 
 $(BUILD_DIR)/dhrystone-$(DHRYSTONE_VERSION)/.stamp_extracted:
 	@$(call MESSAGE,"Extracting")
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index f62ec216e1..1b2b95b105 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -64,4 +64,4 @@ define DNSMASQ_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/dnsmasq.8
 endef
 
-$(eval $(call GENTARGETS,package,dnsmasq))
+$(eval $(call GENTARGETS))
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index c2d763ddba..e1b6a33c82 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -34,4 +34,4 @@ define DOSFSTOOLS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,dosfstools))
+$(eval $(call GENTARGETS))
diff --git a/package/dsp-tools/dsp-tools.mk b/package/dsp-tools/dsp-tools.mk
index ab31afb74c..b9fed0bcbf 100644
--- a/package/dsp-tools/dsp-tools.mk
+++ b/package/dsp-tools/dsp-tools.mk
@@ -15,4 +15,4 @@ define DSP_TOOLS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/dsp-, load probe test exec)
 endef
 
-$(eval $(call GENTARGETS,package,dsp-tools))
+$(eval $(call GENTARGETS))
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 67c0d92466..6cfdfdc5ac 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -27,4 +27,4 @@ define EBTABLES_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/sbin/ebtables
 endef
 
-$(eval $(call GENTARGETS,package,ebtables))
+$(eval $(call GENTARGETS))
diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk
index e61aecb45a..40b059e7ba 100644
--- a/package/eeprog/eeprog.mk
+++ b/package/eeprog/eeprog.mk
@@ -19,4 +19,4 @@ define EEPROG_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/eeprog
 endef
 
-$(eval $(call GENTARGETS,package,eeprog))
+$(eval $(call GENTARGETS))
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 58d2624962..321e466fc9 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -37,4 +37,4 @@ define EZXML_CLEAN_CMDS
 	-$(MAKE) -C $(@D) -f GNUmakefile clean
 endef
 
-$(eval $(call GENTARGETS,package,ezxml))
+$(eval $(call GENTARGETS))
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index 37f82ea418..892043ea2c 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -15,4 +15,4 @@ define FBGRAB_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/fbgrab
 endef
 
-$(eval $(call GENTARGETS,package,fbgrab))
+$(eval $(call GENTARGETS))
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index b5b5ab8090..95d8aa7b83 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -29,4 +29,4 @@ define FBSET_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,fbset))
+$(eval $(call GENTARGETS))
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index c595678304..8144a16b43 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -25,4 +25,4 @@ define FCONFIG_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,fconfig))
+$(eval $(call GENTARGETS))
diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index 1464ec1ae1..46bfd2424d 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -29,4 +29,4 @@ define GADGETFS_TEST_CLEAN_CMDS
 	-$(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) clean
 endef
 
-$(eval $(call GENTARGETS,package,gadgetfs-test))
+$(eval $(call GENTARGETS))
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
index bc7bc32538..a53ee83c79 100644
--- a/package/gdisk/gdisk.mk
+++ b/package/gdisk/gdisk.mk
@@ -36,4 +36,4 @@ endef
 
 endif
 
-$(eval $(call GENTARGETS,package,gdisk))
+$(eval $(call GENTARGETS))
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 10b8d7d4bc..d6f48752a0 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -27,5 +27,5 @@ define HOST_GENROMFS_INSTALL_CMDS
   $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
-$(eval $(call GENTARGETS,package,genromfs))
-$(eval $(call GENTARGETS,package,genromfs,host))
\ No newline at end of file
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
\ No newline at end of file
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index 4e3cfe5983..d19dff00c6 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -33,4 +33,4 @@ define HDPARM_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,hdparm))
+$(eval $(call GENTARGETS))
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk
index 7a0cef8080..e4f72a51be 100644
--- a/package/hwdata/hwdata.mk
+++ b/package/hwdata/hwdata.mk
@@ -18,4 +18,4 @@ define HWDATA_UNINSTALL_TARGET_CMDS
 	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
 endef
 
-$(eval $(call GENTARGETS,package,hwdata))
+$(eval $(call GENTARGETS))
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index d96bad3f81..8628eaf2a7 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -19,4 +19,4 @@ define I2C_TOOLS_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS,package,i2c-tools))
+$(eval $(call GENTARGETS))
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index c335be3fc4..a938ae715d 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -33,4 +33,4 @@ define INPUT_EVENT_DAEMON_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/input-event-daemon.conf
 endef
 
-$(eval $(call GENTARGETS,package,input-event-daemon))
+$(eval $(call GENTARGETS))
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 0c5b523c6f..38db2ea540 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -45,4 +45,4 @@ define INPUT_TOOLS_CLEAN_CMDS
 	rm -f $(addprefix $(@D)/,$(INPUT_TOOLS_TARGETS_y))
 endef
 
-$(eval $(call GENTARGETS,package,input-tools))
+$(eval $(call GENTARGETS))
diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk
index de7e1ff74c..83eea07ae2 100644
--- a/package/iostat/iostat.mk
+++ b/package/iostat/iostat.mk
@@ -28,4 +28,4 @@ define IOSTAT_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/iostat.8
 endef
 
-$(eval $(call GENTARGETS,package,iostat))                                                   
+$(eval $(call GENTARGETS))
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 0e6a431b98..dd2506cbda 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -54,4 +54,4 @@ define IPROUTE2_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/sbin/, $(IPROUTE2_TARGET_SBINS))
 endef
 
-$(eval $(call GENTARGETS,package,iproute2))
+$(eval $(call GENTARGETS))
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index e1935c68bd..cbc68869b0 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -43,4 +43,4 @@ define IRDA_UTILS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(IRDA_UTILS_SBINS-))
 endef
 
-$(eval $(call GENTARGETS,package,irda-utils))
+$(eval $(call GENTARGETS))
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 5fcdc7215f..9f1d65f4d7 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -32,4 +32,4 @@ define IW_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/iw.8*
 endef
 
-$(eval $(call GENTARGETS,package,iw))
+$(eval $(call GENTARGETS))
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 6124e1a283..3ffc49cd30 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -20,5 +20,5 @@ define LIBAIO_INSTALL_TARGET_CMDS
   $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call GENTARGETS,package,libaio))
+$(eval $(call GENTARGETS))
 
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 458f8e8115..a7b33a0ee4 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -34,5 +34,5 @@ define HOST_LIBCAP_INSTALL_CMDS
 		prefix=/usr lib=lib install
 endef
 
-$(eval $(call GENTARGETS,package,libcap))
-$(eval $(call GENTARGETS,package,libcap,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index 89987d6db6..3686d55879 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -18,4 +18,4 @@ define LIBERATION_CLEAN_CMDS
 	rm -rf $(LIBERATION_TARGET_DIR)
 endef
 
-$(eval $(call GENTARGETS,package,liberation))
+$(eval $(call GENTARGETS))
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 3f7642f899..ea6a3296d2 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -64,4 +64,4 @@ define LIBNSS_CLEAN_CMDS
 					BUILD_OPT=1
 endef
 
-$(eval $(call GENTARGETS,package,libnss))
+$(eval $(call GENTARGETS))
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index ccaf4921d4..f494348935 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -30,4 +30,4 @@ define LIBROXML_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,libroxml))
+$(eval $(call GENTARGETS))
diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index 1a7ce378fd..275ae74469 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -39,4 +39,4 @@ define LIBSVGTINY_CLEAN_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,libsvgtiny))
+$(eval $(call GENTARGETS))
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 1ea859aa32..4df64fc7bb 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -38,5 +38,5 @@ define LIBV4L_INSTALL_TARGET_CMDS
 			DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install; done
 endef
 
-$(eval $(call GENTARGETS,package,libv4l))
+$(eval $(call GENTARGETS))
 
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 9f80cf9f06..ecc2cc9a93 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -30,6 +30,6 @@ define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS,package,libxml-parser-perl))
-$(eval $(call GENTARGETS,package,libxml-parser-perl,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
 
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index be1cc7113d..4dba98f1cd 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -48,4 +48,4 @@ define LINUX_FUSION_UNINSTALL_TARGET_CMDS
 	rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules
 endef
 
-$(eval $(call GENTARGETS,package,linux-fusion))
+$(eval $(call GENTARGETS))
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index eec969deaa..99a8e3bd22 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -42,4 +42,4 @@ define LM_SENSORS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,lm-sensors))
+$(eval $(call GENTARGETS))
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index 535fc8c357..bb4abf9f68 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -27,4 +27,4 @@ define LMBENCH_CLEAN_CMDS
 	$(MAKE) -C $(@D)/src clean
 endef
 
-$(eval $(call GENTARGETS,package,lmbench))
+$(eval $(call GENTARGETS))
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 031712e4f4..4a7f25cf2e 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -30,4 +30,4 @@ define LOCKFILE_PROGS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,lockfile-progs))
+$(eval $(call GENTARGETS))
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 0e41d6a72f..20317f127f 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -33,4 +33,4 @@ define LOGROTATE_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,logrotate))
+$(eval $(call GENTARGETS))
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 167cb20411..547382f319 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -63,4 +63,4 @@ define LSOF_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,lsof))
+$(eval $(call GENTARGETS))
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index e7947f1cb9..23094c8e82 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -39,4 +39,4 @@ define LTRACE_INSTALL_TARGET_CMDS
 	$(LTRACE_INSTALL_DOCUMENTATION)
 endef
 
-$(eval $(call GENTARGETS,package,ltrace))
+$(eval $(call GENTARGETS))
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 598eea140c..c95e18a67e 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -121,4 +121,4 @@ define LUA_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,lua))
+$(eval $(call GENTARGETS))
diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index 5f1119a630..928e1545aa 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -28,4 +28,4 @@ define LUAFILESYSTEM_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,luafilesystem))
+$(eval $(call GENTARGETS))
diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
index e0faf034f1..daca2482bc 100644
--- a/package/luasocket/luasocket.mk
+++ b/package/luasocket/luasocket.mk
@@ -33,4 +33,4 @@ define LUASOCKET_CLEAN_CMDS
 	$(MAKE) -C $(@D) -f makefile clean
 endef
 
-$(eval $(call GENTARGETS,package,luasocket))
+$(eval $(call GENTARGETS))
diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index b7c9343e66..31dc95d48b 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -31,5 +31,5 @@ define HOST_MAKEDEVS_INSTALL_CMDS
 	install -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs
 endef
 
-$(eval $(call GENTARGETS,package,makedevs))
-$(eval $(call GENTARGETS,package,makedevs,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk
index 0ad8eba3bb..7d3f5b2cec 100644
--- a/package/memstat/memstat.mk
+++ b/package/memstat/memstat.mk
@@ -24,4 +24,4 @@ define MEMSTAT_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/memstat
 endef
 
-$(eval $(call GENTARGETS,package,memstat))
+$(eval $(call GENTARGETS))
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index a92c5d2b1a..00e312475d 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -26,4 +26,4 @@ define MEMTESTER_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,memtester))
+$(eval $(call GENTARGETS))
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 0bf431b76d..99b5a48ea3 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -35,4 +35,4 @@ define MIDORI_INSTALL_TARGET_CMDS
        (cd $(@D); ./waf --destdir=$(TARGET_DIR) install)
 endef
 
-$(eval $(call GENTARGETS,package,midori))
+$(eval $(call GENTARGETS))
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 6d3743a158..0731bf73bb 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -32,4 +32,4 @@ define MII_DIAG_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,mii-diag))
+$(eval $(call GENTARGETS))
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 9ebb857790..99b54bcbd6 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -24,4 +24,4 @@ define MROUTED_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,mrouted))
+$(eval $(call GENTARGETS))
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 58b5ce100b..ef876e2d32 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -98,5 +98,5 @@ define MTD_INSTALL_TARGET_CMDS
  done
 endef
 
-$(eval $(call GENTARGETS,package,mtd))
-$(eval $(call GENTARGETS,package,mtd,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index f55f5109a0..17eb18966f 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -16,4 +16,4 @@ endef
 
 GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries
 
-$(eval $(call GENTARGETS,package/multimedia,gst-dsp))
+$(eval $(call GENTARGETS))
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/multimedia/gst-omapfb/gst-omapfb.mk
index 726ef83fe9..f3956bc14a 100644
--- a/package/multimedia/gst-omapfb/gst-omapfb.mk
+++ b/package/multimedia/gst-omapfb/gst-omapfb.mk
@@ -16,4 +16,4 @@ endef
 
 GST_OMAPFB_DEPENDENCIES = gstreamer
 
-$(eval $(call GENTARGETS,package/multimedia,gst-omapfb))
+$(eval $(call GENTARGETS))
diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
index 45a037582a..0051ea0684 100644
--- a/package/multimedia/live555/live555.mk
+++ b/package/multimedia/live555/live555.mk
@@ -45,4 +45,4 @@ define LIVE555_UNINSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS,package/multimedia,live555))
+$(eval $(call GENTARGETS))
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index f735464d1b..4c03440190 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -145,4 +145,4 @@ define MPLAYER_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package/multimedia,mplayer))
+$(eval $(call GENTARGETS))
diff --git a/package/multimedia/python-mad/python-mad.mk b/package/multimedia/python-mad/python-mad.mk
index 52d13a650e..7d898eddcc 100644
--- a/package/multimedia/python-mad/python-mad.mk
+++ b/package/multimedia/python-mad/python-mad.mk
@@ -38,4 +38,4 @@ define PYTHON_MAD_INSTALL_TARGET_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS,package,python-mad))
+$(eval $(call GENTARGETS))
diff --git a/package/multimedia/tidsp-binaries/tidsp-binaries.mk b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
index 102791fabc..0b64fb8481 100644
--- a/package/multimedia/tidsp-binaries/tidsp-binaries.mk
+++ b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
@@ -10,4 +10,4 @@ define TIDSP_BINARIES_UNINSTALL_TARGET_CMDS
 	$(RM) -r $(TARGET_DIR)/lib/dsp
 endef
 
-$(eval $(call GENTARGETS,package/multimedia,tidsp-binaries))
+$(eval $(call GENTARGETS))
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index 98d15044c7..db76021184 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -25,4 +25,4 @@ define NETPLUG_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,netplug))
+$(eval $(call GENTARGETS))
diff --git a/package/nuttcp/nuttcp.mk b/package/nuttcp/nuttcp.mk
index e3867ea429..8c0203c9ad 100644
--- a/package/nuttcp/nuttcp.mk
+++ b/package/nuttcp/nuttcp.mk
@@ -22,4 +22,4 @@ define NUTTCP_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/nuttcp
 endef
 
-$(eval $(call GENTARGETS,package,nuttcp))
+$(eval $(call GENTARGETS))
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index 03a8a02a0b..9ed4d5b46e 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -38,4 +38,4 @@ define OLSR_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,olsr))
+$(eval $(call GENTARGETS))
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 82a4fc4a0f..51a00dd83b 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -120,4 +120,4 @@ define OPENSSL_UNINSTALL_CMDS
 	rm -rf $(addprefix $(STAGING_DIR)/usr/lib/,ssl engines libcrypto* libssl* pkgconfig/libcrypto.pc)
 endef
 
-$(eval $(call GENTARGETS,package,openssl))
+$(eval $(call GENTARGETS))
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 782d348ea8..52f5f67ff4 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -45,4 +45,4 @@ define PCIUTILS_INSTALL_TARGET_CMDS
 		SHARED=$(PCIUTILS_SHARED) install-lib
 endef
 
-$(eval $(call GENTARGETS,package,pciutils))
+$(eval $(call GENTARGETS))
diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk
index e996824307..cb7c0e3a38 100644
--- a/package/portmap/portmap.mk
+++ b/package/portmap/portmap.mk
@@ -43,4 +43,4 @@ define PORTMAP_UNINSTALL_TARGET_CMDS
 		$(addsuffix .8,$(PORTMAP_SBINS)))
 endef
 
-$(eval $(call GENTARGETS,package,portmap))
+$(eval $(call GENTARGETS))
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 05c1c32c9d..2137f6a4e1 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -102,4 +102,4 @@ define PPPD_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS,package,pppd))
+$(eval $(call GENTARGETS))
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 605f30d578..77ae34d8de 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -25,4 +25,4 @@ define PPTP_LINUX_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/pptp.8
 endef
 
-$(eval $(call GENTARGETS,package,pptp-linux))
+$(eval $(call GENTARGETS))
diff --git a/package/procps/procps.mk b/package/procps/procps.mk
index a27998751b..8228052a07 100644
--- a/package/procps/procps.mk
+++ b/package/procps/procps.mk
@@ -20,4 +20,4 @@ define PROCPS_INSTALL_TARGET_CMDS
 		ldconfig=true install
 endef
 
-$(eval $(call GENTARGETS,package,procps))
+$(eval $(call GENTARGETS))
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index 048930bae8..4c8a891f5b 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -18,4 +18,4 @@ define PYTHON_SERIAL_INSTALL_TARGET_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS,package,python-serial))
+$(eval $(call GENTARGETS))
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ed95b2cc70..cc035bfe3f 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -637,4 +637,4 @@ define QT_UNINSTALL_TARGET_CMDS
 	-rm $(TARGET_DIR)/usr/lib/libphonon.so.*
 endef
 
-$(eval $(call GENTARGETS,package,qt))
+$(eval $(call GENTARGETS))
diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index 36fe666d66..4862fad17c 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -26,4 +26,4 @@ define RINGS_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,rings))
+$(eval $(call GENTARGETS))
diff --git a/package/rsh-redone/rsh-redone.mk b/package/rsh-redone/rsh-redone.mk
index 6217cb1101..0c2b8389d8 100644
--- a/package/rsh-redone/rsh-redone.mk
+++ b/package/rsh-redone/rsh-redone.mk
@@ -33,4 +33,4 @@ define RSH_REDONE_UNINSTALL_TARGET_CMDS
 		$(addprefix $(TARGET_DIR)/usr/sbin/,$(rsh-redone-sbin-y))
 endef
 
-$(eval $(call GENTARGETS,package,rsh-redone))
+$(eval $(call GENTARGETS))
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index f8fe84b3ae..73c68ed961 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -10,4 +10,4 @@ define HOST_SCONS_INSTALL_CMDS
 	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS,package,scons,host))
+$(eval $(call GENTARGETS,host))
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 0c604d9cd4..2f5787cc22 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -51,4 +51,4 @@ define SLANG_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,slang))
+$(eval $(call GENTARGETS))
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 7aa8ca9080..4d0ad518bf 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -72,5 +72,5 @@ define HOST_SQUASHFS_INSTALL_CMDS
    -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
 endef
 
-$(eval $(call GENTARGETS,package,squashfs))
-$(eval $(call GENTARGETS,package,squashfs,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 69aab1489f..178543b864 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -25,6 +25,6 @@ define HOST_SQUASHFS3_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
 endef
 
-$(eval $(call GENTARGETS,package,squashfs3))
-$(eval $(call GENTARGETS,package,squashfs3,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
 
diff --git a/package/sredird/sredird.mk b/package/sredird/sredird.mk
index ad91f6a412..44fe16d3bd 100644
--- a/package/sredird/sredird.mk
+++ b/package/sredird/sredird.mk
@@ -24,4 +24,4 @@ define SREDIRD_CLEAN_CMDS
 	rm -f $(@D)/sredird
 endef
 
-$(eval $(call GENTARGETS,package,sredird))
+$(eval $(call GENTARGETS))
diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
index 2dc383d4ee..9a5aedecf8 100644
--- a/package/sstrip/sstrip.mk
+++ b/package/sstrip/sstrip.mk
@@ -41,5 +41,5 @@ define HOST_SSTRIP_UNINSTALL_CMDS
 	rm -f $(HOST_DIR)/usr/bin/$(HOST_SSTRIP_BINARY)
 endef
 
-$(eval $(call GENTARGETS,package,sstrip))
-$(eval $(call GENTARGETS,package,sstrip,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
index b6a8a0fc2a..8c396931e6 100644
--- a/package/statserial/statserial.mk
+++ b/package/statserial/statserial.mk
@@ -16,4 +16,4 @@ define STATSERIAL_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/statserial $(TARGET_DIR)/usr/bin/statserial
 endef
 
-$(eval $(call GENTARGETS,package,statserial))
+$(eval $(call GENTARGETS))
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index e08f048e1f..a5dedf2c2e 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -52,4 +52,4 @@ define SYSKLOGD_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,sysklogd))
+$(eval $(call GENTARGETS))
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index af5ec42035..0d65c43a4c 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -46,4 +46,4 @@ define SYSVINIT_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,sysvinit))
+$(eval $(call GENTARGETS))
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index 037e0c9eb9..15e620cbe6 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -28,4 +28,4 @@ define TI_UTILS_UNINSTALL_TARGET_CMDS
 	rm -fr $(TARGET_DIR)/usr/share/ti-utils
 endef
 
-$(eval $(call GENTARGETS,package,ti-utils))
+$(eval $(call GENTARGETS))
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index b9e0f215bf..e20560ab23 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -51,5 +51,5 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS
 	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
 endef
 
-$(eval $(call GENTARGETS,package,uboot-tools))
-$(eval $(call GENTARGETS,package,uboot-tools,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 620c5d05a3..7b982d818e 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -25,5 +25,5 @@ define USB_MODESWITCH_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1
 endef
 
-$(eval $(call GENTARGETS,package,usb_modeswitch))
+$(eval $(call GENTARGETS))
 
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 0f93e5babf..8434570055 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -31,4 +31,4 @@ define USBMOUNT_UNINSTALL_TARGET_CMDS
 		$(TARGET_DIR)/media/usb?
 endef
 
-$(eval $(call GENTARGETS,package,usbmount))
+$(eval $(call GENTARGETS))
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 64a56ccf22..44902875d1 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -51,4 +51,4 @@ define VSFTPD_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,vsftpd))
+$(eval $(call GENTARGETS))
diff --git a/package/whetstone/whetstone.mk b/package/whetstone/whetstone.mk
index d47fbcda72..48a3adf43c 100644
--- a/package/whetstone/whetstone.mk
+++ b/package/whetstone/whetstone.mk
@@ -24,7 +24,7 @@ define WHETSTONE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/whetstone
 endef
 
-$(eval $(call GENTARGETS,package,whetstone))
+$(eval $(call GENTARGETS))
 
 $(BUILD_DIR)/whetstone-$(WHETSTONE_VERSION)/.stamp_extracted:
 	@$(call MESSAGE,"Extracting")
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index d2273894aa..54283f9120 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -33,4 +33,4 @@ define WIPE_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,wipe))
+$(eval $(call GENTARGETS))
diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
index d8358ba09b..b05983983c 100644
--- a/package/wireless_tools/wireless_tools.mk
+++ b/package/wireless_tools/wireless_tools.mk
@@ -42,4 +42,4 @@ define WIRELESS_TOOLS_UNINSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" uninstall
 endef
 
-$(eval $(call GENTARGETS,package,wireless_tools))
+$(eval $(call GENTARGETS))
diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
index c0f9c8bdb5..f9ab334d56 100644
--- a/package/wsapi/wsapi.mk
+++ b/package/wsapi/wsapi.mk
@@ -18,4 +18,4 @@ define WSAPI_UNINSTALL_TARGET_CMDS
 	rm -rf "$(TARGET_DIR)/usr/share/lua/wsapi"
 endef
 
-$(eval $(call GENTARGETS,package,wsapi))
+$(eval $(call GENTARGETS))
diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index 525b09f40d..e6dd312201 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -20,4 +20,4 @@ define XAVANTE_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/sajax.lua"
 endef
 
-$(eval $(call GENTARGETS,package,xavante))
+$(eval $(call GENTARGETS))
diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk
index bcaacf3ba7..e44b75f5e2 100644
--- a/package/xl2tp/xl2tp.mk
+++ b/package/xl2tp/xl2tp.mk
@@ -30,4 +30,4 @@ define XL2TP_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,xl2tp))
+$(eval $(call GENTARGETS))
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 18e7068ff2..fbe923e69b 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -73,5 +73,5 @@ define HOST_ZLIB_UNINSTALL_TARGET_CMDS
 	$(MAKE1) -C $(@D) uninstall
 endef
 
-$(eval $(call GENTARGETS,package,zlib))
-$(eval $(call GENTARGETS,package,zlib,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))

From 300f9c9c9dcf2b47ea89c45d5b1ea05e7305bd49 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:43 +0200
Subject: [PATCH 0729/6849] package: remove useless arguments from AUTOTARGETS

Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/grub/grub.mk                                      |  2 +-
 package/Makefile.autotools.in                          | 10 ++++------
 package/acl/acl.mk                                     |  2 +-
 package/alsamixergui/alsamixergui.mk                   |  2 +-
 package/argp-standalone/argp-standalone.mk             |  2 +-
 package/argus/argus.mk                                 |  2 +-
 package/at/at.mk                                       |  2 +-
 package/atk/atk.mk                                     |  4 ++--
 package/attr/attr.mk                                   |  2 +-
 package/autoconf/autoconf.mk                           |  4 ++--
 package/automake/automake.mk                           |  4 ++--
 package/avahi/avahi.mk                                 |  2 +-
 package/bash/bash.mk                                   |  2 +-
 package/beecrypt/beecrypt.mk                           |  2 +-
 package/berkeleydb/berkeleydb.mk                       |  2 +-
 package/bind/bind.mk                                   |  2 +-
 package/binutils/binutils.mk                           |  4 ++--
 package/bison/bison.mk                                 |  4 ++--
 package/blackbox/blackbox.mk                           |  2 +-
 package/bluez_utils/bluez_utils.mk                     |  2 +-
 package/bmon/bmon.mk                                   |  2 +-
 package/boa/boa.mk                                     |  2 +-
 package/bonnie/bonnie.mk                               |  2 +-
 package/bootutils/bootutils.mk                         |  2 +-
 package/bridge-utils/bridge-utils.mk                   |  2 +-
 package/bwm-ng/bwm-ng.mk                               |  2 +-
 package/cairo/cairo.mk                                 |  2 +-
 package/can-utils/can-utils.mk                         |  2 +-
 package/ccache/ccache.mk                               |  4 ++--
 package/cifs-utils/cifs-utils.mk                       |  2 +-
 package/coreutils/coreutils.mk                         |  2 +-
 package/crosstool-ng/crosstool-ng.mk                   |  2 +-
 package/ctorrent/ctorrent.mk                           |  2 +-
 package/cvs/cvs.mk                                     |  2 +-
 package/dash/dash.mk                                   |  2 +-
 package/dbus-glib/dbus-glib.mk                         |  4 ++--
 package/dbus-python/dbus-python.mk                     |  2 +-
 package/dbus/dbus.mk                                   |  4 ++--
 package/dhcp/dhcp.mk                                   |  2 +-
 package/dialog/dialog.mk                               |  2 +-
 package/diffutils/diffutils.mk                         |  2 +-
 package/directfb-examples/directfb-examples.mk         |  2 +-
 package/directfb/directfb.mk                           |  4 ++--
 package/distcc/distcc.mk                               |  2 +-
 package/divine/divine.mk                               |  2 +-
 package/dmalloc/dmalloc.mk                             |  2 +-
 package/dmraid/dmraid.mk                               |  2 +-
 package/docker/docker.mk                               |  2 +-
 package/dropbear/dropbear.mk                           |  2 +-
 package/e2fsprogs/e2fsprogs.mk                         |  4 ++--
 package/ed/ed.mk                                       |  2 +-
 package/enchant/enchant.mk                             |  2 +-
 package/ethtool/ethtool.mk                             |  2 +-
 package/expat/expat.mk                                 |  4 ++--
 package/fakeroot/fakeroot.mk                           |  4 ++--
 package/fbdump/fbdump.mk                               |  2 +-
 package/fbv/fbv.mk                                     |  2 +-
 package/fftw/fftw.mk                                   |  2 +-
 package/file/file.mk                                   |  4 ++--
 package/findutils/findutils.mk                         |  2 +-
 package/flex/flex.mk                                   |  4 ++--
 package/fltk/fltk.mk                                   |  2 +-
 package/fluxbox/fluxbox.mk                             |  2 +-
 package/fontconfig/fontconfig.mk                       |  4 ++--
 package/freetype/freetype.mk                           |  4 ++--
 package/games/gnuchess/gnuchess.mk                     |  2 +-
 package/games/prboom/prboom.mk                         |  2 +-
 package/games/rubix/rubix.mk                           |  2 +-
 package/gamin/gamin.mk                                 |  2 +-
 package/gawk/gawk.mk                                   |  4 ++--
 package/gdk-pixbuf/gdk-pixbuf.mk                       |  4 ++--
 package/genext2fs/genext2fs.mk                         |  4 ++--
 package/gmp/gmp.mk                                     |  4 ++--
 package/gmpc/gmpc.mk                                   |  2 +-
 package/gnutls/gnutls.mk                               |  2 +-
 package/gob2/gob2.mk                                   |  4 ++--
 package/gperf/gperf.mk                                 |  4 ++--
 package/gpsd/gpsd.mk                                   |  2 +-
 package/gqview/gqview.mk                               |  2 +-
 package/grep/grep.mk                                   |  2 +-
 package/gtk2-engines/gtk2-engines.mk                   |  2 +-
 .../gtk2-theme-hicolor/gtk2-theme-hicolor.mk           |  2 +-
 package/gtkperf/gtkperf.mk                             |  2 +-
 package/gvfs/gvfs.mk                                   |  2 +-
 package/gzip/gzip.mk                                   |  2 +-
 package/haserl/haserl.mk                               |  2 +-
 package/hostapd/hostapd.mk                             |  2 +-
 package/htop/htop.mk                                   |  2 +-
 package/icu/icu.mk                                     |  4 ++--
 package/ifplugd/ifplugd.mk                             |  2 +-
 package/imagemagick/imagemagick.mk                     |  2 +-
 package/inotify-tools/inotify-tools.mk                 |  2 +-
 package/intltool/intltool.mk                           |  4 ++--
 package/iperf/iperf.mk                                 |  2 +-
 package/ipkg/ipkg.mk                                   |  2 +-
 package/ipsec-tools/ipsec-tools.mk                     |  2 +-
 package/ipset/ipset.mk                                 |  2 +-
 package/iptables/iptables.mk                           |  2 +-
 package/java/classpath/classpath.mk                    |  2 +-
 package/java/jamvm/jamvm.mk                            |  2 +-
 package/jpeg/jpeg.mk                                   |  2 +-
 package/json-c/json-c.mk                               |  2 +-
 package/kbd/kbd.mk                                     |  2 +-
 package/kexec/kexec.mk                                 |  2 +-
 package/kismet/kismet.mk                               |  2 +-
 package/leafpad/leafpad.mk                             |  2 +-
 package/less/less.mk                                   |  2 +-
 package/libarchive/libarchive.mk                       |  2 +-
 package/libargtable2/libargtable2.mk                   |  2 +-
 package/libart/libart.mk                               |  2 +-
 package/libatomic_ops/libatomic_ops.mk                 |  2 +-
 package/libcgi/libcgi.mk                               |  2 +-
 package/libcgicc/libcgicc.mk                           |  2 +-
 package/libconfig/libconfig.mk                         |  2 +-
 package/libconfuse/libconfuse.mk                       |  2 +-
 package/libcurl/libcurl.mk                             |  2 +-
 package/libdaemon/libdaemon.mk                         |  2 +-
 package/libdnet/libdnet.mk                             |  2 +-
 package/libdrm/libdrm.mk                               |  2 +-
 package/libeXosip2/libeXosip2.mk                       |  2 +-
 package/libelf/libelf.mk                               |  2 +-
 package/libev/libev.mk                                 |  2 +-
 package/libevent/libevent.mk                           |  2 +-
 package/libexif/libexif.mk                             |  2 +-
 package/libffi/libffi.mk                               |  2 +-
 package/libftdi/libftdi.mk                             |  2 +-
 package/libfuse/libfuse.mk                             |  2 +-
 package/libgail/libgail.mk                             |  2 +-
 package/libgcrypt/libgcrypt.mk                         |  2 +-
 package/libgeotiff/libgeotiff.mk                       |  2 +-
 package/libglade/libglade.mk                           |  2 +-
 package/libglib2/libglib2.mk                           |  4 ++--
 package/libgpg-error/libgpg-error.mk                   |  2 +-
 package/libgtk2/libgtk2.mk                             |  4 ++--
 package/libhid/libhid.mk                               |  2 +-
 package/libiconv/libiconv.mk                           |  2 +-
 package/libidn/libidn.mk                               |  2 +-
 package/libiqrf/libiqrf.mk                             |  2 +-
 package/liblockfile/liblockfile.mk                     |  2 +-
 package/libmicrohttpd/libmicrohttpd.mk                 |  2 +-
 package/libmnl/libmnl.mk                               |  2 +-
 package/libnl/libnl.mk                                 |  2 +-
 package/libnspr/libnspr.mk                             |  2 +-
 package/liboil/liboil.mk                               |  2 +-
 package/libosip2/libosip2.mk                           |  2 +-
 package/libpcap/libpcap.mk                             |  2 +-
 package/libpng/libpng.mk                               |  4 ++--
 package/libraw/libraw.mk                               |  2 +-
 package/libraw1394/libraw1394.mk                       |  2 +-
 package/librsvg/librsvg.mk                             |  2 +-
 package/librsync/librsync.mk                           |  2 +-
 package/libsexy/libsexy.mk                             |  2 +-
 package/libsigc/libsigc.mk                             |  2 +-
 package/libsoup/libsoup.mk                             |  2 +-
 package/libsysfs/libsysfs.mk                           |  2 +-
 package/libtool/libtool.mk                             |  4 ++--
 package/libungif/libungif.mk                           |  2 +-
 package/libupnp/libupnp.mk                             |  2 +-
 package/libusb-compat/libusb-compat.mk                 |  2 +-
 package/libusb/libusb.mk                               |  2 +-
 package/libxml2/libxml2.mk                             |  4 ++--
 package/libxslt/libxslt.mk                             |  4 ++--
 package/libyaml/libyaml.mk                             |  2 +-
 package/lighttpd/lighttpd.mk                           |  2 +-
 package/links/links.mk                                 |  2 +-
 package/lite/lite.mk                                   |  2 +-
 package/lrzsz/lrzsz.mk                                 |  2 +-
 package/lsuio/lsuio.mk                                 |  2 +-
 package/ltp-testsuite/ltp-testsuite.mk                 |  2 +-
 package/lvm2/lvm2.mk                                   |  2 +-
 package/lzma/lzma.mk                                   |  4 ++--
 package/lzo/lzo.mk                                     |  4 ++--
 package/lzop/lzop.mk                                   |  2 +-
 package/m4/m4.mk                                       |  4 ++--
 package/make/make.mk                                   |  2 +-
 package/matchbox/matchbox-common/matchbox-common.mk    |  2 +-
 package/matchbox/matchbox-desktop/matchbox-desktop.mk  |  2 +-
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk  |  2 +-
 .../matchbox/matchbox-keyboard/matchbox-keyboard.mk    |  2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk          |  2 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk      |  2 +-
 .../matchbox-startup-monitor.mk                        |  2 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk            |  2 +-
 package/mdadm/mdadm.mk                                 |  2 +-
 package/metacity/metacity.mk                           |  2 +-
 package/module-init-tools/module-init-tools.mk         |  4 ++--
 package/mpc/mpc.mk                                     |  4 ++--
 package/mpfr/mpfr.mk                                   |  4 ++--
 package/multimedia/alsa-lib/alsa-lib.mk                |  2 +-
 package/multimedia/alsa-utils/alsa-utils.mk            |  2 +-
 package/multimedia/aumix/aumix.mk                      |  2 +-
 package/multimedia/faad2/faad2.mk                      |  2 +-
 package/multimedia/ffmpeg/ffmpeg.mk                    |  2 +-
 package/multimedia/flac/flac.mk                        |  2 +-
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk            |  2 +-
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk  |  2 +-
 .../multimedia/gst-plugins-base/gst-plugins-base.mk    |  2 +-
 .../multimedia/gst-plugins-good/gst-plugins-good.mk    |  2 +-
 .../multimedia/gst-plugins-ugly/gst-plugins-ugly.mk    |  2 +-
 package/multimedia/gstreamer/gstreamer.mk              |  2 +-
 package/multimedia/lame/lame.mk                        |  2 +-
 package/multimedia/libao/libao.mk                      |  2 +-
 package/multimedia/libcdaudio/libcdaudio.mk            |  2 +-
 package/multimedia/libcue/libcue.mk                    |  2 +-
 package/multimedia/libdvdnav/libdvdnav.mk              |  2 +-
 package/multimedia/libdvdread/libdvdread.mk            |  2 +-
 package/multimedia/libid3tag/libid3tag.mk              |  2 +-
 package/multimedia/libmad/libmad.mk                    |  2 +-
 package/multimedia/libmms/libmms.mk                    |  2 +-
 package/multimedia/libmpd/libmpd.mk                    |  2 +-
 package/multimedia/libmpeg2/libmpeg2.mk                |  2 +-
 package/multimedia/libogg/libogg.mk                    |  2 +-
 package/multimedia/libreplaygain/libreplaygain.mk      |  2 +-
 package/multimedia/libsamplerate/libsamplerate.mk      |  2 +-
 package/multimedia/libsndfile/libsndfile.mk            |  2 +-
 package/multimedia/libtheora/libtheora.mk              |  2 +-
 package/multimedia/libvorbis/libvorbis.mk              |  2 +-
 package/multimedia/madplay/madplay.mk                  |  2 +-
 package/multimedia/mpd/mpd.mk                          |  2 +-
 package/multimedia/mpg123/mpg123.mk                    |  2 +-
 package/multimedia/portaudio/portaudio.mk              |  2 +-
 package/multimedia/speex/speex.mk                      |  2 +-
 package/multimedia/swfdec/swfdec.mk                    |  2 +-
 package/multimedia/tremor/tremor.mk                    |  2 +-
 package/multimedia/vorbis-tools/vorbis-tools.mk        |  2 +-
 package/multimedia/wavpack/wavpack.mk                  |  2 +-
 package/mutt/mutt.mk                                   |  2 +-
 package/mxml/mxml.mk                                   |  2 +-
 package/mysql_client/mysql_client.mk                   |  2 +-
 package/nano/nano.mk                                   |  2 +-
 package/nasm/nasm.mk                                   |  4 ++--
 package/nbd/nbd.mk                                     |  2 +-
 package/ncftp/ncftp.mk                                 |  2 +-
 package/ncurses/ncurses.mk                             |  4 ++--
 package/neon/neon.mk                                   |  2 +-
 package/netcat/netcat.mk                               |  2 +-
 package/netperf/netperf.mk                             |  2 +-
 package/netsnmp/netsnmp.mk                             |  2 +-
 package/netstat-nat/netstat-nat.mk                     |  2 +-
 package/nfs-utils/nfs-utils.mk                         |  2 +-
 package/ngircd/ngircd.mk                               |  2 +-
 package/ngrep/ngrep.mk                                 |  2 +-
 package/ntfs-3g/ntfs-3g.mk                             |  2 +-
 package/ntfsprogs/ntfsprogs.mk                         |  2 +-
 package/ntp/ntp.mk                                     |  2 +-
 package/openntpd/openntpd.mk                           |  2 +-
 package/openocd/openocd.mk                             |  2 +-
 package/openssh/openssh.mk                             |  2 +-
 package/openvpn/openvpn.mk                             |  2 +-
 package/oprofile/oprofile.mk                           |  2 +-
 package/orc/orc.mk                                     |  2 +-
 package/pango/pango.mk                                 |  2 +-
 package/patch/patch.mk                                 |  2 +-
 package/pcmanfm/pcmanfm.mk                             |  2 +-
 package/pcre/pcre.mk                                   |  2 +-
 package/php/php.mk                                     |  2 +-
 package/pixman/pixman.mk                               |  4 ++--
 package/pkg-config/pkg-config.mk                       |  4 ++--
 package/popt/popt.mk                                   |  2 +-
 package/proftpd/proftpd.mk                             |  2 +-
 package/psmisc/psmisc.mk                               |  2 +-
 package/python/python.mk                               |  4 ++--
 package/quagga/quagga.mk                               |  2 +-
 package/radvd/radvd.mk                                 |  2 +-
 package/rdesktop/rdesktop.mk                           |  2 +-
 package/readline/readline.mk                           |  2 +-
 package/rng-tools/rng-tools.mk                         |  2 +-
 package/rp-pppoe/rp-pppoe.mk                           |  2 +-
 package/rpm/rpm.mk                                     |  2 +-
 package/rrdtool/rrdtool.mk                             |  2 +-
 package/rsync/rsync.mk                                 |  2 +-
 package/rsyslog/rsyslog.mk                             |  2 +-
 package/rtai/rtai.mk                                   |  2 +-
 package/ruby/ruby.mk                                   |  4 ++--
 package/samba/samba.mk                                 |  2 +-
 package/sawman/sawman.mk                               |  2 +-
 package/screen/screen.mk                               |  2 +-
 package/sdl/sdl.mk                                     |  2 +-
 package/sdl_gfx/sdl_gfx.mk                             |  2 +-
 package/sdl_image/sdl_image.mk                         |  2 +-
 package/sdl_mixer/sdl_mixer.mk                         |  2 +-
 package/sdl_net/sdl_net.mk                             |  2 +-
 package/sdl_sound/sdl_sound.mk                         |  2 +-
 package/sdl_ttf/sdl_ttf.mk                             |  2 +-
 package/sdparm/sdparm.mk                               |  2 +-
 package/sed/sed.mk                                     |  2 +-
 package/ser2net/ser2net.mk                             |  2 +-
 package/setserial/setserial.mk                         |  2 +-
 package/shared-mime-info/shared-mime-info.mk           |  4 ++--
 package/smartmontools/smartmontools.mk                 |  2 +-
 package/socat/socat.mk                                 |  2 +-
 package/spawn-fcgi/spawn-fcgi.mk                       |  2 +-
 package/sqlite/sqlite.mk                               |  2 +-
 package/squid/squid.mk                                 |  2 +-
 package/sshfs/sshfs.mk                                 |  2 +-
 package/startup-notification/startup-notification.mk   |  2 +-
 package/strace/strace.mk                               |  2 +-
 package/stunnel/stunnel.mk                             |  2 +-
 package/sudo/sudo.mk                                   |  2 +-
 package/sylpheed/sylpheed.mk                           |  2 +-
 package/synergy/synergy.mk                             |  2 +-
 package/sysstat/sysstat.mk                             |  2 +-
 package/tar/tar.mk                                     |  2 +-
 package/tcl/tcl.mk                                     |  2 +-
 package/tcpdump/tcpdump.mk                             |  2 +-
 package/tcpreplay/tcpreplay.mk                         |  2 +-
 package/tftpd/tftpd.mk                                 |  2 +-
 package/thttpd/thttpd.mk                               |  2 +-
 package/tiff/tiff.mk                                   |  2 +-
 package/tn5250/tn5250.mk                               |  2 +-
 package/torsmo/torsmo.mk                               |  2 +-
 package/tslib/tslib.mk                                 |  2 +-
 package/udev/udev.mk                                   |  2 +-
 package/udpcast/udpcast.mk                             |  2 +-
 package/usbutils/usbutils.mk                           |  2 +-
 package/util-linux/util-linux.mk                       |  2 +-
 package/valgrind/valgrind.mk                           |  2 +-
 package/vim/vim.mk                                     |  2 +-
 package/vtun/vtun.mk                                   |  2 +-
 package/webkit/webkit.mk                               |  2 +-
 package/wget/wget.mk                                   |  2 +-
 package/which/which.mk                                 |  2 +-
 package/wpa_supplicant/wpa_supplicant.mk               |  2 +-
 package/x11r7/libxcb/libxcb.mk                         |  4 ++--
 package/x11r7/mesa3d/mesa3d.mk                         |  2 +-
 package/x11r7/pthread-stubs/pthread-stubs.mk           |  4 ++--
 package/x11r7/xapp_appres/xapp_appres.mk               |  2 +-
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk           |  4 ++--
 package/x11r7/xapp_beforelight/xapp_beforelight.mk     |  2 +-
 package/x11r7/xapp_bitmap/xapp_bitmap.mk               |  2 +-
 package/x11r7/xapp_editres/xapp_editres.mk             |  2 +-
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk       |  2 +-
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk         |  2 +-
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk             |  2 +-
 package/x11r7/xapp_iceauth/xapp_iceauth.mk             |  2 +-
 package/x11r7/xapp_ico/xapp_ico.mk                     |  2 +-
 package/x11r7/xapp_listres/xapp_listres.mk             |  2 +-
 package/x11r7/xapp_luit/xapp_luit.mk                   |  2 +-
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk         |  4 ++--
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk     |  4 ++--
 package/x11r7/xapp_oclock/xapp_oclock.mk               |  2 +-
 package/x11r7/xapp_rgb/xapp_rgb.mk                     |  2 +-
 package/x11r7/xapp_rstart/xapp_rstart.mk               |  2 +-
 package/x11r7/xapp_scripts/xapp_scripts.mk             |  2 +-
 package/x11r7/xapp_sessreg/xapp_sessreg.mk             |  2 +-
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk         |  2 +-
 package/x11r7/xapp_showfont/xapp_showfont.mk           |  2 +-
 package/x11r7/xapp_smproxy/xapp_smproxy.mk             |  2 +-
 package/x11r7/xapp_twm/xapp_twm.mk                     |  2 +-
 package/x11r7/xapp_viewres/xapp_viewres.mk             |  2 +-
 package/x11r7/xapp_x11perf/xapp_x11perf.mk             |  2 +-
 package/x11r7/xapp_xauth/xapp_xauth.mk                 |  2 +-
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk       |  2 +-
 package/x11r7/xapp_xbiff/xapp_xbiff.mk                 |  2 +-
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                 |  2 +-
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk       |  2 +-
 package/x11r7/xapp_xclock/xapp_xclock.mk               |  2 +-
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk               |  2 +-
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk       |  2 +-
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk         |  2 +-
 package/x11r7/xapp_xditview/xapp_xditview.mk           |  2 +-
 package/x11r7/xapp_xdm/xapp_xdm.mk                     |  2 +-
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk           |  2 +-
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk           |  2 +-
 package/x11r7/xapp_xedit/xapp_xedit.mk                 |  2 +-
 package/x11r7/xapp_xev/xapp_xev.mk                     |  2 +-
 package/x11r7/xapp_xeyes/xapp_xeyes.mk                 |  2 +-
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk             |  2 +-
 package/x11r7/xapp_xfd/xapp_xfd.mk                     |  2 +-
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk           |  2 +-
 package/x11r7/xapp_xfs/xapp_xfs.mk                     |  2 +-
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk             |  2 +-
 package/x11r7/xapp_xgamma/xapp_xgamma.mk               |  2 +-
 package/x11r7/xapp_xgc/xapp_xgc.mk                     |  2 +-
 package/x11r7/xapp_xhost/xapp_xhost.mk                 |  2 +-
 package/x11r7/xapp_xinit/xapp_xinit.mk                 |  2 +-
 package/x11r7/xapp_xinput/xapp_xinput.mk               |  2 +-
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk             |  4 ++--
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk               |  2 +-
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk           |  2 +-
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk           |  2 +-
 package/x11r7/xapp_xkill/xapp_xkill.mk                 |  2 +-
 package/x11r7/xapp_xload/xapp_xload.mk                 |  2 +-
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                 |  2 +-
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk           |  2 +-
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk       |  2 +-
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk           |  2 +-
 package/x11r7/xapp_xmag/xapp_xmag.mk                   |  2 +-
 package/x11r7/xapp_xman/xapp_xman.mk                   |  2 +-
 package/x11r7/xapp_xmessage/xapp_xmessage.mk           |  2 +-
 package/x11r7/xapp_xmh/xapp_xmh.mk                     |  2 +-
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk             |  2 +-
 package/x11r7/xapp_xmore/xapp_xmore.mk                 |  2 +-
 package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk   |  2 +-
 package/x11r7/xapp_xpr/xapp_xpr.mk                     |  2 +-
 .../xapp_xprehashprinterlist.mk                        |  2 +-
 package/x11r7/xapp_xprop/xapp_xprop.mk                 |  2 +-
 package/x11r7/xapp_xrandr/xapp_xrandr.mk               |  2 +-
 package/x11r7/xapp_xrdb/xapp_xrdb.mk                   |  2 +-
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk           |  2 +-
 package/x11r7/xapp_xset/xapp_xset.mk                   |  2 +-
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk           |  2 +-
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk     |  2 +-
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk           |  2 +-
 package/x11r7/xapp_xsm/xapp_xsm.mk                     |  2 +-
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk           |  2 +-
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk           |  2 +-
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk               |  2 +-
 package/x11r7/xapp_xwd/xapp_xwd.mk                     |  2 +-
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk           |  2 +-
 package/x11r7/xapp_xwud/xapp_xwud.mk                   |  2 +-
 package/x11r7/xcb-proto/xcb-proto.mk                   |  4 ++--
 package/x11r7/xcb-util/xcb-util.mk                     |  2 +-
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk         |  2 +-
 .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk |  2 +-
 .../xdriver_xf86-input-acecad.mk                       |  2 +-
 .../xdriver_xf86-input-aiptek.mk                       |  2 +-
 .../xdriver_xf86-input-evdev.mk                        |  2 +-
 .../xdriver_xf86-input-joystick.mk                     |  2 +-
 .../xdriver_xf86-input-keyboard.mk                     |  2 +-
 .../xdriver_xf86-input-mouse.mk                        |  2 +-
 .../xdriver_xf86-input-synaptics.mk                    |  2 +-
 .../xdriver_xf86-input-vmmouse.mk                      |  2 +-
 .../xdriver_xf86-input-void/xdriver_xf86-input-void.mk |  2 +-
 .../xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk   |  2 +-
 .../xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk   |  2 +-
 .../xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk   |  2 +-
 .../xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk   |  2 +-
 .../xdriver_xf86-video-chips.mk                        |  2 +-
 .../xdriver_xf86-video-cirrus.mk                       |  2 +-
 .../xdriver_xf86-video-dummy.mk                        |  2 +-
 .../xdriver_xf86-video-fbdev.mk                        |  2 +-
 .../xdriver_xf86-video-geode.mk                        |  2 +-
 .../xdriver_xf86-video-glide.mk                        |  2 +-
 .../xdriver_xf86-video-glint.mk                        |  2 +-
 .../xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk |  2 +-
 .../xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk |  2 +-
 .../xdriver_xf86-video-intel.mk                        |  2 +-
 .../xdriver_xf86-video-mach64.mk                       |  2 +-
 .../xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk   |  2 +-
 .../xdriver_xf86-video-neomagic.mk                     |  2 +-
 .../xdriver_xf86-video-newport.mk                      |  2 +-
 .../xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk     |  2 +-
 .../xdriver_xf86-video-openchrome.mk                   |  2 +-
 .../xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk |  2 +-
 .../xdriver_xf86-video-rendition.mk                    |  2 +-
 .../xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk     |  2 +-
 .../xdriver_xf86-video-s3virge.mk                      |  2 +-
 .../xdriver_xf86-video-savage.mk                       |  2 +-
 .../xdriver_xf86-video-siliconmotion.mk                |  2 +-
 .../xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk   |  2 +-
 .../xdriver_xf86-video-sisusb.mk                       |  2 +-
 .../xdriver_xf86-video-suncg14.mk                      |  2 +-
 .../xdriver_xf86-video-suncg3.mk                       |  2 +-
 .../xdriver_xf86-video-suncg6.mk                       |  2 +-
 .../xdriver_xf86-video-sunffb.mk                       |  2 +-
 .../xdriver_xf86-video-sunleo.mk                       |  2 +-
 .../xdriver_xf86-video-suntcx.mk                       |  2 +-
 .../xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk |  2 +-
 .../xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk   |  2 +-
 .../xdriver_xf86-video-trident.mk                      |  2 +-
 .../xdriver_xf86-video-tseng.mk                        |  2 +-
 .../xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk   |  2 +-
 .../xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk |  2 +-
 .../xdriver_xf86-video-vmware.mk                       |  2 +-
 .../xdriver_xf86-video-voodoo.mk                       |  2 +-
 .../xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk |  2 +-
 .../xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk   |  2 +-
 .../xdriver_xf86-video-xgixp.mk                        |  2 +-
 package/x11r7/xfont_encodings/xfont_encodings.mk       |  4 ++--
 .../xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk |  2 +-
 .../xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk   |  2 +-
 .../xfont_font-adobe-utopia-100dpi.mk                  |  2 +-
 .../xfont_font-adobe-utopia-75dpi.mk                   |  2 +-
 .../xfont_font-adobe-utopia-type1.mk                   |  2 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk     |  2 +-
 .../xfont_font-arabic-misc/xfont_font-arabic-misc.mk   |  2 +-
 .../x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk |  2 +-
 .../x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk   |  2 +-
 .../xfont_font-bh-lucidatypewriter-100dpi.mk           |  2 +-
 .../xfont_font-bh-lucidatypewriter-75dpi.mk            |  2 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk   |  2 +-
 .../x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk   |  2 +-
 .../xfont_font-bitstream-100dpi.mk                     |  2 +-
 .../xfont_font-bitstream-75dpi.mk                      |  2 +-
 .../xfont_font-bitstream-speedo.mk                     |  2 +-
 .../xfont_font-bitstream-type1.mk                      |  2 +-
 .../xfont_font-cronyx-cyrillic.mk                      |  2 +-
 .../xfont_font-cursor-misc/xfont_font-cursor-misc.mk   |  2 +-
 .../xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk   |  2 +-
 .../x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk   |  2 +-
 .../x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk |  2 +-
 .../x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk |  2 +-
 .../x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk   |  2 +-
 .../xfont_font-micro-misc/xfont_font-micro-misc.mk     |  2 +-
 .../xfont_font-misc-cyrillic.mk                        |  2 +-
 .../xfont_font-misc-ethiopic.mk                        |  2 +-
 .../xfont_font-misc-meltho/xfont_font-misc-meltho.mk   |  2 +-
 .../x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk |  3 +--
 .../x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk |  2 +-
 .../xfont_font-schumacher-misc.mk                      |  2 +-
 .../xfont_font-screen-cyrillic.mk                      |  2 +-
 .../x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk |  2 +-
 .../x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk   |  2 +-
 package/x11r7/xfont_font-util/xfont_font-util.mk       |  4 ++--
 .../xfont_font-winitzki-cyrillic.mk                    |  2 +-
 .../xfont_font-xfree86-type1.mk                        |  2 +-
 package/x11r7/xkeyboard-config/xkeyboard-config.mk     |  2 +-
 package/x11r7/xlib_libFS/xlib_libFS.mk                 |  2 +-
 package/x11r7/xlib_libICE/xlib_libICE.mk               |  2 +-
 package/x11r7/xlib_libSM/xlib_libSM.mk                 |  2 +-
 package/x11r7/xlib_libX11/xlib_libX11.mk               |  4 ++--
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk |  2 +-
 package/x11r7/xlib_libXau/xlib_libXau.mk               |  4 ++--
 package/x11r7/xlib_libXaw/xlib_libXaw.mk               |  2 +-
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk |  2 +-
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk       |  2 +-
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk       |  2 +-
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk           |  4 ++--
 package/x11r7/xlib_libXext/xlib_libXext.mk             |  2 +-
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk         |  2 +-
 package/x11r7/xlib_libXfont/xlib_libXfont.mk           |  4 ++--
 package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk |  2 +-
 package/x11r7/xlib_libXft/xlib_libXft.mk               |  2 +-
 package/x11r7/xlib_libXi/xlib_libXi.mk                 |  2 +-
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk     |  2 +-
 package/x11r7/xlib_libXmu/xlib_libXmu.mk               |  2 +-
 package/x11r7/xlib_libXp/xlib_libXp.mk                 |  2 +-
 package/x11r7/xlib_libXpm/xlib_libXpm.mk               |  2 +-
 .../xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk     |  2 +-
 package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk |  2 +-
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk         |  2 +-
 package/x11r7/xlib_libXrender/xlib_libXrender.mk       |  2 +-
 package/x11r7/xlib_libXres/xlib_libXres.mk             |  2 +-
 package/x11r7/xlib_libXt/xlib_libXt.mk                 |  2 +-
 package/x11r7/xlib_libXtst/xlib_libXtst.mk             |  2 +-
 package/x11r7/xlib_libXv/xlib_libXv.mk                 |  2 +-
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk             |  2 +-
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk     |  2 +-
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk       |  2 +-
 package/x11r7/xlib_libdmx/xlib_libdmx.mk               |  2 +-
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk       |  4 ++--
 package/x11r7/xlib_liboldX/xlib_liboldX.mk             |  2 +-
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk   |  2 +-
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk       |  4 ++--
 package/x11r7/xlib_libxkbui/xlib_libxkbui.mk           |  2 +-
 package/x11r7/xlib_xtrans/xlib_xtrans.mk               |  4 ++--
 .../x11r7/xproto_applewmproto/xproto_applewmproto.mk   |  2 +-
 .../x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk   |  2 +-
 .../xproto_compositeproto/xproto_compositeproto.mk     |  2 +-
 package/x11r7/xproto_damageproto/xproto_damageproto.mk |  2 +-
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk       |  2 +-
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk     |  2 +-
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk   |  2 +-
 .../xproto_fontcacheproto/xproto_fontcacheproto.mk     |  4 ++--
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk   |  4 ++--
 package/x11r7/xproto_glproto/xproto_glproto.mk         |  2 +-
 package/x11r7/xproto_inputproto/xproto_inputproto.mk   |  4 ++--
 package/x11r7/xproto_kbproto/xproto_kbproto.mk         |  4 ++--
 package/x11r7/xproto_printproto/xproto_printproto.mk   |  2 +-
 package/x11r7/xproto_randrproto/xproto_randrproto.mk   |  2 +-
 package/x11r7/xproto_recordproto/xproto_recordproto.mk |  2 +-
 package/x11r7/xproto_renderproto/xproto_renderproto.mk |  2 +-
 .../x11r7/xproto_resourceproto/xproto_resourceproto.mk |  2 +-
 .../xproto_scrnsaverproto/xproto_scrnsaverproto.mk     |  2 +-
 package/x11r7/xproto_videoproto/xproto_videoproto.mk   |  2 +-
 .../xproto_windowswmproto/xproto_windowswmproto.mk     |  2 +-
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk |  4 ++--
 package/x11r7/xproto_xextproto/xproto_xextproto.mk     |  4 ++--
 .../xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk |  4 ++--
 .../x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk   |  2 +-
 .../x11r7/xproto_xf86driproto/xproto_xf86driproto.mk   |  2 +-
 .../x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk |  2 +-
 .../xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk |  2 +-
 .../x11r7/xproto_xineramaproto/xproto_xineramaproto.mk |  2 +-
 package/x11r7/xproto_xproto/xproto_xproto.mk           |  4 ++--
 .../x11r7/xserver_xorg-server/xserver_xorg-server.mk   |  2 +-
 package/x11r7/xutil_makedepend/xutil_makedepend.mk     |  4 ++--
 package/x11r7/xutil_util-macros/xutil_util-macros.mk   |  4 ++--
 package/x11vnc/x11vnc.mk                               |  2 +-
 package/xenomai/xenomai.mk                             |  2 +-
 package/xerces/xerces.mk                               |  2 +-
 package/xmlstarlet/xmlstarlet.mk                       |  2 +-
 package/xstroke/xstroke.mk                             |  2 +-
 package/xterm/xterm.mk                                 |  2 +-
 package/xvkbd/xvkbd.mk                                 |  2 +-
 package/xz/xz.mk                                       |  4 ++--
 587 files changed, 660 insertions(+), 663 deletions(-)

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 2ce8eabc90..fbff867112 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -82,4 +82,4 @@ define GRUB_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/boot/grub
 endef
 
-$(eval $(call AUTOTARGETS,boot,grub))
+$(eval $(call AUTOTARGETS))
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 4cd63a36e8..3f523dc5e5 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -294,15 +294,13 @@ endef
 ################################################################################
 # AUTOTARGETS -- the target generator macro for autotools packages
 #
-# Argument 1 is the package directory prefix [mandatory]
-# Argument 2 is the lowercase package name   [mandatory]
-# Argument 3 is "target" or "host"           [optional, default: "target"]
+# Argument 1 is "target" or "host"           [optional, default: "target"]
 ################################################################################
 
 define AUTOTARGETS
-ifeq ($(3),host)
-$(call AUTOTARGETS_INNER,$(3)-$(2),$(call UPPERCASE,$(3)-$(2)),$(call UPPERCASE,$(2)),$(1),host)
+ifeq ($(1),host)
+$(call AUTOTARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 else
-$(call AUTOTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(call UPPERCASE,$(2)),$(1),target)
+$(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
 endif
 endef
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index 11768f617d..48db8ae6c4 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -25,4 +25,4 @@ ACL_INSTALL_TARGET_OPT = 			\
 	exec_prefix=$(TARGET_DIR)/usr 		\
 	install install-lib
 
-$(eval $(call AUTOTARGETS,package,acl))
+$(eval $(call AUTOTARGETS))
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index a8ed0ef660..e8c8ddae7c 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -14,5 +14,5 @@ ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
 
 ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib
 
-$(eval $(call AUTOTARGETS,package,alsamixergui))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk
index f48d0e699e..ac0890d391 100644
--- a/package/argp-standalone/argp-standalone.mk
+++ b/package/argp-standalone/argp-standalone.mk
@@ -18,4 +18,4 @@ define ARGP_STANDALONE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/argp.h $(TARGET_DIR)/usr/include/argp.h
 endef
 
-$(eval $(call AUTOTARGETS,package,argp-standalone))
+$(eval $(call AUTOTARGETS))
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index 1a90b10123..ac07db2645 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -17,4 +17,4 @@ endef
 
 ARGUS_POST_PATCH_HOOKS += ARGUS_DEBIAN_PATCH_APPLY
 
-$(eval $(call AUTOTARGETS,package,argus))
+$(eval $(call AUTOTARGETS))
diff --git a/package/at/at.mk b/package/at/at.mk
index e9873f8f8b..4270c838bc 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -41,4 +41,4 @@ define AT_UNINSTALL_TARGET_CMDS
 		at.1 atq.1 atrm.1 batch.1 at_allow.5 at_deny.5 atd.8 atrun.8)
 endef
 
-$(eval $(call AUTOTARGETS,package,at))
+$(eval $(call AUTOTARGETS))
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 9ea8a9094a..f0e96a5e39 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -57,5 +57,5 @@ HOST_ATK_DEPENDENCIES = host-libglib2 host-pkg-config
 HOST_ATK_CONF_OPT = \
 		--disable-glibtest
 
-$(eval $(call AUTOTARGETS,package,atk))
-$(eval $(call AUTOTARGETS,package,atk,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index b744ef6d1b..beecb31837 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -24,4 +24,4 @@ ATTR_INSTALL_TARGET_OPT = 			\
 	exec_prefix=$(TARGET_DIR)/usr 		\
 	install install-lib
 
-$(eval $(call AUTOTARGETS,package,attr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 45bb635309..7c42bf951b 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -17,8 +17,8 @@ HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
 
-$(eval $(call AUTOTARGETS,package,autoconf))
-$(eval $(call AUTOTARGETS,package,autoconf,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 8857e98827..7f35f3fcdb 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -23,8 +23,8 @@ endef
 HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
 HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
 
-$(eval $(call AUTOTARGETS,package,automake))
-$(eval $(call AUTOTARGETS,package,automake,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # variables used by other packages
 AUTOMAKE = $(HOST_DIR)/usr/bin/automake
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index fdf039086a..739c5f281e 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -164,4 +164,4 @@ ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT
 endif
 
-$(eval $(call AUTOTARGETS,package,avahi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 2bcf0c43a7..b20f6a8c34 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -34,4 +34,4 @@ define BASH_UNINSTALL_TARGET_CMDS
 	fi
 endef
 
-$(eval $(call AUTOTARGETS,package,bash))
+$(eval $(call AUTOTARGETS))
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index 5fffd1f2fd..06c359e9bc 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -13,4 +13,4 @@ BEECRYPT_CONF_OPT =  --without-cplusplus \
 		--without-python  \
 		--disable-rpath
 
-$(eval $(call AUTOTARGETS,package,beecrypt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index eb20ba9ca6..ed70486ccb 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -52,4 +52,4 @@ BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
 
 endif
 
-$(eval $(call AUTOTARGETS,package,berkeleydb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 0530934be3..b62c8ea036 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -55,4 +55,4 @@ define BIND_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S81named
 endef
 
-$(eval $(call AUTOTARGETS,package,bind))
+$(eval $(call AUTOTARGETS))
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 5454af89c4..2d60ce0747 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -51,5 +51,5 @@ define BINUTILS_INSTALL_TARGET_CMDS
 		DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call AUTOTARGETS,package,binutils))
-$(eval $(call AUTOTARGETS,package,binutils,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 93026e9d38..d365e33cdb 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -13,5 +13,5 @@ endef
 
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
-$(eval $(call AUTOTARGETS,package,bison))
-$(eval $(call AUTOTARGETS,package,bison,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index e3c8c341b3..6836c96b60 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -20,4 +20,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 BLACKBOX_DEPENDENCIES += libiconv
 endif
 
-$(eval $(call AUTOTARGETS,package,blackbox))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index cbadf33136..860ecbd093 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -43,4 +43,4 @@ BLUEZ_UTILS_CONF_OPT +=	\
 	--disable-usb
 endif
 
-$(eval $(call AUTOTARGETS,package,bluez_utils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index ef2dcf0481..98c0ab7bcb 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -29,4 +29,4 @@ define BMON_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/bmon
 endef
 
-$(eval $(call AUTOTARGETS,package,bmon))
+$(eval $(call AUTOTARGETS))
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index 702193d2e8..c09e87f2d8 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -25,4 +25,4 @@ define BOA_UNINSTALL_TARGET_CMDS
 		$(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa
 endef
 
-$(eval $(call AUTOTARGETS,package,boa))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
index 9a6188fa40..2251ebc7ca 100644
--- a/package/bonnie/bonnie.mk
+++ b/package/bonnie/bonnie.mk
@@ -15,4 +15,4 @@ define BONNIE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/bonnie++ $(TARGET_DIR)/usr/sbin/zcav
 endef
 
-$(eval $(call AUTOTARGETS,package,bonnie))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
index d5748124f0..35df95b014 100644
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -8,4 +8,4 @@ BOOTUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge
 
 BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
 
-$(eval $(call AUTOTARGETS,package,bootutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index 680749393d..7e942ef37e 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -15,4 +15,4 @@ define BRIDGE_UTILS_UNINSTALL_TARGET_CMDS
 		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
 endef
 
-$(eval $(call AUTOTARGETS,package,bridge-utils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
index a33f4f211e..618a61f3e2 100644
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -13,4 +13,4 @@ BWM_NG_CONF_OPT += --with-ncurses
 BWM_NG_DEPENDENCIES += ncurses
 endif
 
-$(eval $(call AUTOTARGETS,package,bwm-ng))
+$(eval $(call AUTOTARGETS))
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 7955e08c31..1746efff29 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -87,4 +87,4 @@ HOST_CAIRO_CONF_OPT = \
 		--disable-png \
 		--disable-svg
 
-$(eval $(call AUTOTARGETS,package,cairo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
index f602490bda..198c38dcbd 100644
--- a/package/can-utils/can-utils.mk
+++ b/package/can-utils/can-utils.mk
@@ -8,4 +8,4 @@ CAN_UTILS_VERSION = 1235
 CAN_UTILS_SITE = svn://svn.berlios.de/socketcan/trunk/can-utils
 CAN_UTILS_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS,package,can-utils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index dd25b76f14..87a64e5d5c 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -23,8 +23,8 @@ endef
 HOST_CCACHE_POST_CONFIGURE_HOOKS += \
 	HOST_CCACHE_FIX_CCACHE_DIR
 
-$(eval $(call AUTOTARGETS,package,ccache))
-$(eval $(call AUTOTARGETS,package,ccache,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 ifeq ($(BR2_CCACHE),y)
 ccache-stats: host-ccache
diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index bc800a6f93..52ad5ceeed 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -2,4 +2,4 @@ CIFS_UTILS_VERSION = 5.1
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
 
-$(eval $(call AUTOTARGETS,package,cifs-utils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index fed5e90e3a..7ee37b19f8 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -78,4 +78,4 @@ COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_POST_INSTALL
 # If both coreutils and busybox are selected, the corresponding applets
 # may need to be reinstated by the clean targets.
 
-$(eval $(call AUTOTARGETS,package,coreutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 076be282fe..8f53a77c87 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -6,4 +6,4 @@ CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
 HOST_CROSSTOOL_NG_DEPENDENCIES = host-gawk host-automake $(if $(BR2_CCACHE),host-ccache)
 
-$(eval $(call AUTOTARGETS,package,crosstool-ng,host))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index aa22153155..f086447ba4 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -14,4 +14,4 @@ else
 CTORRENT_CONF_OPT+=--with-ssl=no
 endif
 
-$(eval $(call AUTOTARGETS,package,ctorrent))
+$(eval $(call AUTOTARGETS))
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 8d56a21071..b3074b0d24 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -48,6 +48,6 @@ define CVS_INSTALL_TARGET_CMDS
 	install -D $(@D)/src/cvs $(TARGET_DIR)/usr/bin/cvs
 endef
 
-$(eval $(call AUTOTARGETS,package,cvs))
+$(eval $(call AUTOTARGETS))
 
 
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index e5da642dd6..db2d4e5a50 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -17,4 +17,4 @@ define DASH_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/bin/dash
 endef
 
-$(eval $(call AUTOTARGETS,package,dash))
+$(eval $(call AUTOTARGETS))
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 7c4e65b3c6..8717f63c4f 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -32,8 +32,8 @@ HOST_DBUS_GLIB_CONF_OPT = \
 		--disable-doxygen-docs \
 		--enable-asserts=yes
 
-$(eval $(call AUTOTARGETS,package,dbus-glib))
-$(eval $(call AUTOTARGETS,package,dbus-glib,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # dbus-glib for the host
 DBUS_GLIB_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-binding-tool
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index b2e9f56ecd..d027f2fce7 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -21,4 +21,4 @@ DBUS_PYTHON_CONF_OPT = --disable-html-docs --disable-api-docs
 
 DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python
 
-$(eval $(call AUTOTARGETS,package,dbus-python))
+$(eval $(call AUTOTARGETS))
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 6834feef8f..e18e2917c5 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -84,5 +84,5 @@ HOST_DBUS_GEN_INTROSPECT = \
 
 HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT
 
-$(eval $(call AUTOTARGETS,package,dbus))
-$(eval $(call AUTOTARGETS,package,dbus,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 58fd47c8ad..f520d77568 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -61,4 +61,4 @@ define DHCP_INSTALL_TARGET_CMDS
 	$(DHCP_INSTALL_CLIENT)
 endef
 
-$(eval $(call AUTOTARGETS,package,dhcp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index e8f025f750..0a4f792f54 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -23,4 +23,4 @@ define DIALOG_POST_CLEAN
 	rm -f $(TARGET_DIR)/usr/bin/dialog
 endef
 
-$(eval $(call AUTOTARGETS,package,dialog))
+$(eval $(call AUTOTARGETS))
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 6ce71c9270..693b0c8f67 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -61,4 +61,4 @@ DIFFUTILS_CONF_ENV = ac_cv_func_strtod=yes
 		jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no
 
-$(eval $(call AUTOTARGETS,package,diffutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index aed97901ec..cea1eb2dde 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -101,5 +101,5 @@ define DIRECTFB_EXAMPLES_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call AUTOTARGETS,package,directfb-examples))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index aa5784526d..af645429f8 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -140,8 +140,8 @@ endef
 
 DIRECTFB_POST_INSTALL_STAGING_HOOKS += DIRECTFB_STAGING_CONFIG_FIXUP
 
-$(eval $(call AUTOTARGETS,package,directfb))
-$(eval $(call AUTOTARGETS,package,directfb,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # directfb-csource for the host
 DIRECTFB_HOST_BINARY:=$(HOST_DIR)/usr/bin/directfb-csource
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index f3d13bda6e..40961972e4 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -20,4 +20,4 @@ define DISTCC_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS,package,distcc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 554ee63a6f..0b60adcfec 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -11,4 +11,4 @@ DIVINE_INSTALL_STAGING = YES
 DIVINE_INSTALL_TARGET = YES
 DIVINE_DEPENDENCIES = directfb
 
-$(eval $(call AUTOTARGETS,package,divine))
+$(eval $(call AUTOTARGETS))
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index dca0488d53..4de324e0d2 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -55,4 +55,4 @@ define DMALLOC_CLEAN_CMDS
 endef
 
 
-$(eval $(call AUTOTARGETS,package,dmalloc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index e98161c3da..7763aaae40 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -26,4 +26,4 @@ define DMRAID_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S20dmraid
 endef
 
-$(eval $(call AUTOTARGETS,package,dmraid))
+$(eval $(call AUTOTARGETS))
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 5b4cd3a341..59282a2734 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -21,4 +21,4 @@ DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
 
 DOCKER_DEPENDENCIES = host-pkg-config libglib2 xserver_xorg-server
 
-$(eval $(call AUTOTARGETS,package,docker))
+$(eval $(call AUTOTARGETS))
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 6ef5dec44e..e9da42df07 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -62,4 +62,4 @@ define DROPBEAR_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S50dropbear
 endef
 
-$(eval $(call AUTOTARGETS,package,dropbear))
+$(eval $(call AUTOTARGETS))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index b2c30bf37f..cf9b089629 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -99,5 +99,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
 E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
 endif
 
-$(eval $(call AUTOTARGETS,package,e2fsprogs))
-$(eval $(call AUTOTARGETS,package,e2fsprogs,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index e7016bf4df..2196af0f0d 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -9,4 +9,4 @@ ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"
 
-$(eval $(call AUTOTARGETS,package,ed))
+$(eval $(call AUTOTARGETS))
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 9be3f1a8e0..e29137acb2 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -12,4 +12,4 @@ ENCHANT_INSTALL_TARGET = YES
 
 ENCHANT_DEPENDENCIES = libglib2 host-pkg-config
 
-$(eval $(call AUTOTARGETS,package,enchant))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index af066dd990..a42169c4b0 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -7,4 +7,4 @@
 ETHTOOL_VERSION = 3.0
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool/
 
-$(eval $(call AUTOTARGETS,package,ethtool))
+$(eval $(call AUTOTARGETS))
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index e7185e2936..64a14163b0 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -14,5 +14,5 @@ EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
 
 EXPAT_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS,package,expat))
-$(eval $(call AUTOTARGETS,package,expat,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 1271e7cda2..c69f31e2c9 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -18,5 +18,5 @@ FAKEROOT_POST_PATCH_HOOKS += FAKEROOT_PATCH_FAKEROOT_IN
 # The package for the target cannot be selected (build problems when
 # largefile is enabled), but is needed for the host package to work
 # due to deficiencies in the package infrastructure.
-$(eval $(call AUTOTARGETS,package,fakeroot))
-$(eval $(call AUTOTARGETS,package,fakeroot,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index 521b0fdebb..8a5a44e464 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -8,5 +8,5 @@ FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
 FBDUMP_AUTORECONF = NO
 
-$(eval $(call AUTOTARGETS,package,fbdump))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 7305c6e6e0..855a0d42cd 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -33,4 +33,4 @@ define FBV_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS,package,fbv))
+$(eval $(call AUTOTARGETS))
diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index a5b3588624..f9d0fba22b 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -8,4 +8,4 @@ FFTW_VERSION = 3.3
 FFTW_SITE = http://www.fftw.org
 FFTW_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,fftw))
+$(eval $(call AUTOTARGETS))
diff --git a/package/file/file.mk b/package/file/file.mk
index d405c26e0a..4b3fdf9073 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -14,5 +14,5 @@ define FILE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/libmagic.*
 endef
 
-$(eval $(call AUTOTARGETS,package,file))
-$(eval $(call AUTOTARGETS,package,file,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 7ab6b0b88a..7c9e596c8e 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -9,4 +9,4 @@ FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
 FINDUTILS_CONF_ENV = gl_cv_func_stdin=yes \
 			gl_cv_func_wcwidth_works=yes
 
-$(eval $(call AUTOTARGETS,package,findutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 41c9505f3c..706b89d232 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -40,5 +40,5 @@ FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
 FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
 endif
 
-$(eval $(call AUTOTARGETS,package,flex))
-$(eval $(call AUTOTARGETS,package,flex,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 41bb6786c6..164c51874d 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -18,4 +18,4 @@ FLTK_CONF_OPT = --enable-threads --with-x
 
 FLTK_DEPENDENCIES = xserver_xorg-server xlib_libXt
 
-$(eval $(call AUTOTARGETS,package,fltk))
+$(eval $(call AUTOTARGETS))
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 0cd1328864..85a8eae41c 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -13,4 +13,4 @@ FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 
 FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
-$(eval $(call AUTOTARGETS,package,fluxbox))
+$(eval $(call AUTOTARGETS))
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index a875e7490a..fc6ad68d7a 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -27,5 +27,5 @@ HOST_FONTCONFIG_CONF_OPT = \
 		--disable-docs \
 		--disable-static
 
-$(eval $(call AUTOTARGETS,package,fontconfig))
-$(eval $(call AUTOTARGETS,package,fontconfig,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 90ba373d69..fe6e5d6979 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -31,5 +31,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 FREETYPE_POST_INSTALL_TARGET_HOOKS += FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE
 endif
 
-$(eval $(call AUTOTARGETS,package,freetype))
-$(eval $(call AUTOTARGETS,package,freetype,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/games/gnuchess/gnuchess.mk b/package/games/gnuchess/gnuchess.mk
index 8e331a469f..a6278446c5 100644
--- a/package/games/gnuchess/gnuchess.mk
+++ b/package/games/gnuchess/gnuchess.mk
@@ -9,5 +9,5 @@ GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
 
 GNUCHESS_DEPENDENCIES = $(if $(BR2_PACKAGE_READLINE),readline)
 
-$(eval $(call AUTOTARGETS,package/games,gnuchess))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk
index dd749dca1e..9ffecee428 100644
--- a/package/games/prboom/prboom.mk
+++ b/package/games/prboom/prboom.mk
@@ -41,4 +41,4 @@ define PRBOOM_UINSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/games/prboom
 endef
 
-$(eval $(call AUTOTARGETS,package/games,prboom))
+$(eval $(call AUTOTARGETS))
diff --git a/package/games/rubix/rubix.mk b/package/games/rubix/rubix.mk
index 3440c2313d..2fb051a1c4 100644
--- a/package/games/rubix/rubix.mk
+++ b/package/games/rubix/rubix.mk
@@ -14,5 +14,5 @@ RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB=
 
 RUBIX_DEPENDENCIES = xserver_xorg-server
 
-$(eval $(call AUTOTARGETS,package/games,rubix))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index 326fd62afb..5858138423 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -22,5 +22,5 @@ endif
 
 GAMIN_DEPENDENCIES = libglib2
 
-$(eval $(call AUTOTARGETS,package,gamin))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 8a544d8804..445414b588 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -22,5 +22,5 @@ define GAWK_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/awk
 endef
 
-$(eval $(call AUTOTARGETS,package,gawk))
-$(eval $(call AUTOTARGETS,package,gawk,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index cf915bbd08..65b3dbde75 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -50,7 +50,7 @@ endef
 
 GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_POST_INSTALL_TWEAKS
 
-$(eval $(call AUTOTARGETS,package,gdk-pixbuf))
+$(eval $(call AUTOTARGETS))
 
 HOST_GDK_PIXBUF_CONF_OPT = \
 	--without-libjpeg \
@@ -58,4 +58,4 @@ HOST_GDK_PIXBUF_CONF_OPT = \
 
 HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng
 
-$(eval $(call AUTOTARGETS,package,gdk-pixbuf,host))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index b4a8e70c8f..1863cf119c 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -8,5 +8,5 @@ GENEXT2FS_VERSION=1.4.1
 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
 
-$(eval $(call AUTOTARGETS,package,genext2fs))
-$(eval $(call AUTOTARGETS,package,genext2fs,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index c9e37938ed..5eb6ecc6ee 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -9,5 +9,5 @@ GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,gmp))
-$(eval $(call AUTOTARGETS,package,gmp,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 62c64275fc..d6b6e937a4 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -20,4 +20,4 @@ else
 GMPC_CONF_OPT += --disable-sm
 endif
 
-$(eval $(call AUTOTARGETS,package,gmpc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index db5d583a3c..b8523d0721 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -11,4 +11,4 @@ GNUTLS_DEPENDENCIES = libgcrypt
 GNUTLS_CONF_OPT += --without-libgcrypt-prefix
 GNUTLS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,gnutls))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index 04b3798f79..39aa5547e9 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -12,8 +12,8 @@ GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
 
 HOST_GOB2_DEPENDENCIES = host-libglib2
 
-$(eval $(call AUTOTARGETS,package,gob2))
-$(eval $(call AUTOTARGETS,package,gob2,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # gob2 for the host
 GOB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/gob2
diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index 3593637ac7..faea97823e 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -7,5 +7,5 @@
 GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
 
-$(eval $(call AUTOTARGETS,package,gperf))
-$(eval $(call AUTOTARGETS,package,gperf,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index b47e4d0b7b..10e66ba69f 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -182,4 +182,4 @@ define GPSD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S50gpsd
 endef
 
-$(eval $(call AUTOTARGETS,package,gpsd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 1bd76e2269..25d9739085 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -12,5 +12,5 @@ GQVIEW_INSTALL_TARGET = YES
 
 GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
 
-$(eval $(call AUTOTARGETS,package,gqview))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index bfc9116633..e8b9cfef20 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -15,4 +15,4 @@ GREP_CONF_ENV += LIBS=-liconv
 GREP_DEPENDENCIES += libiconv
 endif
 
-$(eval $(call AUTOTARGETS,package,grep))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index aa9e4c3baa..b8694ad1fc 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -83,4 +83,4 @@ GTK2_ENGINES_CONF_OPT = \
 		--disable-paranoia \
 		--disable-deprecated
 
-$(eval $(call AUTOTARGETS,package,gtk2-engines))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index 8aac899a72..055205c4ae 100644
--- a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -9,4 +9,4 @@ GTK2_THEME_HICOLOR_SITE = http://icon-theme.freedesktop.org/releases/
 
 GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS,package/gtk2-themes,gtk2-theme-hicolor))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index 8d314ee68f..cf135943a8 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -9,5 +9,5 @@ GTKPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gt
 GTKPERF_INSTALL_TARGET = YES
 GTKPERF_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS,package,gtkperf))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 37b4accf99..b33b7e5185 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -78,4 +78,4 @@ GVFS_POST_INSTALL_TARGET_HOOKS += \
 	GVFS_REMOVE_TARGET_SCHEMAS	\
 	GVFS_COMPILE_SCHEMAS
 
-$(eval $(call AUTOTARGETS,package,gvfs))
+$(eval $(call AUTOTARGETS))
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 672172dd37..f712f987cf 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -7,4 +7,4 @@ GZIP_VERSION:=1.4
 GZIP_SOURCE:=gzip-$(GZIP_VERSION).tar.gz
 GZIP_SITE:=$(BR2_GNU_MIRROR)/gzip
 
-$(eval $(call AUTOTARGETS,package,gzip))
+$(eval $(call AUTOTARGETS))
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index 605cbfcd53..c8a88add8b 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -19,4 +19,4 @@ endef
 
 HASERL_POST_INSTALL_TARGET_HOOKS += HASERL_REMOVE_EXAMPLES
 
-$(eval $(call AUTOTARGETS,package,haserl))
+$(eval $(call AUTOTARGETS))
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index d733999dd0..6ffca0a45c 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -108,4 +108,4 @@ define HOSTAPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/hostapd
 endef
 
-$(eval $(call AUTOTARGETS,package,hostapd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 3f27b3e9b9..5a8eb0d674 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -10,4 +10,4 @@ HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERS
 HTOP_DEPENDENCIES = ncurses
 HTOP_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS,package,htop))
+$(eval $(call AUTOTARGETS))
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index c1d4d00556..bf0663ced3 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -24,5 +24,5 @@ endef
 
 ICU_POST_INSTALL_TARGET_HOOKS += ICU_PREFIX_FIXUP
 
-$(eval $(call AUTOTARGETS,package,icu))
-$(eval $(call AUTOTARGETS,package,icu,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 5e66cea573..33c4367ee6 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -32,4 +32,4 @@ endef
 
 IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP
 
-$(eval $(call AUTOTARGETS,package,ifplugd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 7955db7f5d..0bb76f38ee 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -90,4 +90,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 IMAGEMAGICK_POST_INSTALL_TARGET_HOOKS += IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS,package,imagemagick))
+$(eval $(call AUTOTARGETS))
diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index d6378bb050..ad47909e05 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -5,4 +5,4 @@
 #############################################################
 INOTIFY_TOOLS_VERSION = 3.14
 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
-$(eval $(call AUTOTARGETS,package,inotify-tools))
+$(eval $(call AUTOTARGETS))
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 746ebb1d5f..1ee0497f7f 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -11,6 +11,6 @@ HOST_INTLTOOL_DEPENDENCIES = host-libxml-parser-perl
 HOST_INTLTOOL_CONF_OPT = \
   PERLLIB=$(HOST_DIR)/usr/lib/perl
 
-$(eval $(call AUTOTARGETS,package,intltool))
-$(eval $(call AUTOTARGETS,package,intltool,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 769923ff6a..b774cc3251 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -21,4 +21,4 @@ IPERF_CONF_OPT = \
 	--disable-dependency-tracking \
 	--disable-web100
 
-$(eval $(call AUTOTARGETS,package,iperf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
index 30a27c0680..64dd0d57ce 100644
--- a/package/ipkg/ipkg.mk
+++ b/package/ipkg/ipkg.mk
@@ -11,4 +11,4 @@ IPKG_AUTORECONF = NO
 IPKG_INSTALL_STAGING = YES
 IPKG_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package,ipkg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index dbc27a7a8c..9781f3bea2 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -66,4 +66,4 @@ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
 IPSEC_TOOLS_CONF_OPT+= --enable-security-context=kernel
 endif
 
-$(eval $(call AUTOTARGETS,package,ipsec-tools))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 260b2b632a..f98f73f8a7 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -10,4 +10,4 @@ IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
 IPSET_DEPENDENCIES = libmnl host-pkg-config
 
-$(eval $(call AUTOTARGETS,package,ipset))
+$(eval $(call AUTOTARGETS))
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index c6d1a0725b..777baf987e 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -44,4 +44,4 @@ define IPTABLES_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/xtables
 endef
 
-$(eval $(call AUTOTARGETS,package,iptables))
+$(eval $(call AUTOTARGETS))
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 5832c704bf..872c06acb2 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -83,4 +83,4 @@ endif
 
 
 
-$(eval $(call AUTOTARGETS,package/java,classpath))
+$(eval $(call AUTOTARGETS))
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index da999ce5e7..4b2e32ccef 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -90,4 +90,4 @@ ifeq ($(BR2_avr32),y)
 		CC="$(STAGING_DIR)/usr/bin/avr32-linux-gcc"
 endif
 
-$(eval $(call AUTOTARGETS,package/java,jamvm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index adbe330596..bac5f3e91e 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -15,4 +15,4 @@ endef
 
 JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
 
-$(eval $(call AUTOTARGETS,package,jpeg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
index 295c55e0c4..81a02b0457 100644
--- a/package/json-c/json-c.mk
+++ b/package/json-c/json-c.mk
@@ -8,4 +8,4 @@ JSON_C_VERSION = 0.9
 JSON_C_SITE = http://oss.metaparadigm.com/json-c/
 JSON_C_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,json-c))
+$(eval $(call AUTOTARGETS))
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index ec67c5f037..af30e8e59d 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -4,4 +4,4 @@ KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 
 KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
-$(eval $(call AUTOTARGETS,package,kbd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index 43a0614b55..ed01494bc7 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -20,4 +20,4 @@ endef
 
 KEXEC_POST_INSTALL_TARGET_HOOKS += KEXEC_REMOVE_LIB_TOOLS
 
-$(eval $(call AUTOTARGETS,package,kexec))
+$(eval $(call AUTOTARGETS))
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index b143ef3816..4c7d6e237e 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -63,4 +63,4 @@ define KISMET_UNINSTALL_TARGET_CMDS
 	$(KISMET_UNINSTALL_TARGET_CONFIGS)
 endef
 
-$(eval $(call AUTOTARGETS,package,kismet))
+$(eval $(call AUTOTARGETS))
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index bc042494f7..e855b0382b 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -12,5 +12,5 @@ LEAFPAD_INSTALL_TARGET = YES
 
 LEAFPAD_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS,package,leafpad))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/less/less.mk b/package/less/less.mk
index 2379c8f260..d20c2323e1 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -16,4 +16,4 @@ define LESS_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/less
 endef
 
-$(eval $(call AUTOTARGETS,package,less))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index d53904768d..53b3676415 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -24,4 +24,4 @@ else
 LIBARCHIVE_CONF_OPT += --without-xml2
 endif
 
-$(eval $(call AUTOTARGETS,package,libarchive))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index 4241e73963..d1929230f7 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -14,4 +14,4 @@ LIBARGTABLE2_CONF_OPT= --disable-example \
 		--enable-lib \
 		--enable-util
 
-$(eval $(call AUTOTARGETS,package,libargtable2))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libart/libart.mk b/package/libart/libart.mk
index ec66c2f5ba..a37095da52 100644
--- a/package/libart/libart.mk
+++ b/package/libart/libart.mk
@@ -10,4 +10,4 @@ LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/
 LIBART_AUTORECONF = YES
 LIBART_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libart))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index f26a5fa915..e0b19f4ec2 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -9,4 +9,4 @@ LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
 LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
 LIBATOMIC_OPS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libatomic_ops))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk
index 8e8bbeb6d5..5867ff99db 100644
--- a/package/libcgi/libcgi.mk
+++ b/package/libcgi/libcgi.mk
@@ -8,4 +8,4 @@ LIBCGI_SOURCE:=libcgi-$(LIBCGI_VERSION).tar.gz
 LIBCGI_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcgi
 LIBCGI_INSTALL_STAGING=YES
 
-$(eval $(call AUTOTARGETS,package,libcgi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index dbc9073fb6..0ea63b5012 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -13,4 +13,4 @@ LIBCGICC_CONF_OPT = \
 	--disable-demos \
 	--disable-doc
 
-$(eval $(call AUTOTARGETS,package,libcgicc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 6e232a4613..28b3d5f501 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -14,4 +14,4 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 LIBCONFIG_CONF_OPT:=--disable-cxx
 endif
 
-$(eval $(call AUTOTARGETS,package,libconfig))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index 79ff6871f6..ea10d6eefe 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -11,4 +11,4 @@ LIBCONFUSE_INSTALL_STAGING = YES
 
 LIBCONFUSE_CONF_OPT = --disable-rpath
 
-$(eval $(call AUTOTARGETS,package,libconfuse))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 5773570e81..a4204668cc 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -30,7 +30,7 @@ endef
 
 LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
 
-$(eval $(call AUTOTARGETS,package,libcurl))
+$(eval $(call AUTOTARGETS))
 
 curl: libcurl
 curl-clean: libcurl-clean
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 6972a717b4..2bfd38bfae 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -14,4 +14,4 @@ LIBDAEMON_CONF_OPT = --disable-lynx
 
 LIBDAEMON_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS,package,libdaemon))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index ae4c9ff16d..3786bb8f61 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -37,4 +37,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT
 endif
 
-$(eval $(call AUTOTARGETS,package,libdnet))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index f1d7c314c1..e88a16308d 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -28,4 +28,4 @@ ifneq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI),y)
 LIBDRM_CONF_OPT += --disable-radeon
 endif
 
-$(eval $(call AUTOTARGETS,package,libdrm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 565a259c75..69fdca3264 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -25,4 +25,4 @@ endif
 
 LIBEXOSIP2_POST_PATCH_HOOKS += LIBEXOSIP2_DEBIAN_PATCHES
 
-$(eval $(call AUTOTARGETS,package,libeXosip2))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 853b7da22c..13ad371a43 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -18,4 +18,4 @@ LIBELF_CONF_OPT = --disable-sanity-checks \
 		$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
 		$(if $(BR2_LARGEFILE),--enable-elf64)
 
-$(eval $(call AUTOTARGETS,package,libelf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index b0db1237fc..8beaa8eeaf 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -8,4 +8,4 @@ LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
 LIBEV_SITE = http://dist.schmorp.de/libev/
 LIBEV_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index fa66f578f0..31122fe408 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -21,4 +21,4 @@ ifneq ($(BR2_PACKAGE_PYTHON),y)
 LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 
-$(eval $(call AUTOTARGETS,package,libevent))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index 17c44aff9d..1832a7ecac 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -11,4 +11,4 @@ LIBEXIF_INSTALL_STAGING = YES
 LIBEXIF_CONF_OPT = --disable-docs
 LIBEXIF_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS,package,libexif))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 0c5184df96..660a034787 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -29,5 +29,5 @@ endef
 
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
-$(eval $(call AUTOTARGETS,package,libffi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index 315fe167c5..55481d924b 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -20,4 +20,4 @@ else
 LIBFDTI_CONF_OPT += --disable-libftdipp
 endif
 
-$(eval $(call AUTOTARGETS,package,libftdi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 86e57ff9ac..25cc45f0f5 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -26,4 +26,4 @@ define LIBFUSE_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/lib/libfuse.so*
 endef
 
-$(eval $(call AUTOTARGETS,package,libfuse))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index 006e0d8e3c..cc3c2fffa3 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -19,4 +19,4 @@ endif
 
 LIBGAIL_DEPENDENCIES = host-pkg-config libgtk2 pango
 
-$(eval $(call AUTOTARGETS,package,libgail))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index 8b08c3eefd..68c6c47404 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -17,4 +17,4 @@ LIBGCRYPT_CONF_OPT = \
 
 LIBGCRYPT_DEPENDENCIES = libgpg-error
 
-$(eval $(call AUTOTARGETS,package,libgcrypt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
index f159eba655..a704754012 100644
--- a/package/libgeotiff/libgeotiff.mk
+++ b/package/libgeotiff/libgeotiff.mk
@@ -9,4 +9,4 @@ LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
 LIBGEOTIFF_DEPENDENCIES = tiff
 LIBGEOTIFF_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libgeotiff))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index df62039050..1bb9d143de 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -16,4 +16,4 @@ endef
 
 LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX
 
-$(eval $(call AUTOTARGETS,package,libglade))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index cb66a32fb1..0832ac335e 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -81,7 +81,7 @@ ifneq ($(BR2_PACKAGE_GDB),y)
 LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_GDB_FILES
 endif
 
-$(eval $(call AUTOTARGETS,package,libglib2))
-$(eval $(call AUTOTARGETS,package,libglib2,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index ab62d7325d..45a348e726 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -9,4 +9,4 @@ LIBGPG_ERROR_SITE:=ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error
 
 LIBGPG_ERROR_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libgpg-error))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index f9872b67ca..9a8c2bb5d6 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -152,5 +152,5 @@ define HOST_LIBGTK2_INSTALL_CMDS
  cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
 endef
 
-$(eval $(call AUTOTARGETS,package,libgtk2))
-$(eval $(call AUTOTARGETS,package,libgtk2,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index ec6e5bb625..7730af8392 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -14,4 +14,4 @@ LIBHID_INSTALL_STAGING = YES
 LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(TARGET_PATH)
 LIBHID_CONF_OPT = --disable-swig --without-doxygen --disable-package-config
 
-$(eval $(call AUTOTARGETS,package,libhid))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index 27977a847b..9d02a4afe8 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -22,7 +22,7 @@ endef
 LIBICONV_POST_INSTALL_TARGET_HOOKS += LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS
 LIBICONV_POST_INSTALL_STAGING_HOOKS += LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS
 
-$(eval $(call AUTOTARGETS,package,libiconv))
+$(eval $(call AUTOTARGETS))
 
 # Configurations where the toolchain supports locales and the libiconv
 # package is enabled are incorrect, because the toolchain already
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 7b6abbb666..470886211d 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -30,4 +30,4 @@ define LIBIDN_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/idn
 endef
 
-$(eval $(call AUTOTARGETS,package,libidn))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index e3c4bb1da2..81e8421416 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -10,5 +10,5 @@ LIBIQRF_INSTALL_STAGING = YES
 
 LIBIQRF_DEPENDENCIES = libusb
 
-$(eval $(call AUTOTARGETS,package,libiqrf))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 2b635658d4..7c8cd8a66e 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -29,4 +29,4 @@ define LIBLOCKFILE_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS,package,liblockfile))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index 7a1925ec1f..ff2b55d317 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -16,4 +16,4 @@ else
 LIBMICROHTTPD_CONF_OPT += --disable-https
 endif
 
-$(eval $(call AUTOTARGETS,package,libmicrohttpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 6749756b7e..6871034ed3 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -9,4 +9,4 @@ LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libmnl))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 6edb1f8e5f..dd0d7fb14a 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -16,4 +16,4 @@ define LIBNL_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/libnl
 endef
 
-$(eval $(call AUTOTARGETS,package,libnl))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 9ba7431219..24b537070e 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -14,4 +14,4 @@ LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
 # NSPR mixes up --build and --host
 LIBNSPR_CONF_OPT = --host=$(GNU_HOST_NAME)
 
-$(eval $(call AUTOTARGETS,package,libnspr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/liboil/liboil.mk b/package/liboil/liboil.mk
index 4350c0fd77..16f6d13588 100644
--- a/package/liboil/liboil.mk
+++ b/package/liboil/liboil.mk
@@ -38,4 +38,4 @@ endef
 
 LIBOIL_POST_INSTALL_TARGET_HOOKS += LIBOIL_TARGET_CLEANUP
 
-$(eval $(call AUTOTARGETS,package,liboil))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index da3f9a277b..29d2a55141 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -23,4 +23,4 @@ endif
 
 LIBOSIP2_POST_PATCH_HOOKS += LIBOSIP2_DEBIAN_PATCHES
 
-$(eval $(call AUTOTARGETS,package,libosip2))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index a2d0376b7d..6b44e49450 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -18,4 +18,4 @@ LIBPCAP_CONF_ENV:=ac_cv_linux_vers=2 \
 		  ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux
 
-$(eval $(call AUTOTARGETS,package,libpcap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index c4c37d8528..d2aa3299f8 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -31,5 +31,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS,package,libpng))
-$(eval $(call AUTOTARGETS,package,libpng,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index 7d03f40f41..2430c9da3a 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -13,4 +13,4 @@ LIBRAW_CONF_OPT += --disable-examples --disable-lcms \
 			--disable-openmp --disable-demosaic-pack-gpl2 \
 			--disable-demosaic-pack-gpl3
 
-$(eval $(call AUTOTARGETS,package,libraw))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index 196c7217ab..b7c844ce1b 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -8,4 +8,4 @@ LIBRAW1394_SOURCE:=libraw1394-$(LIBRAW1394_VERSION).tar.gz
 LIBRAW1394_SITE:=http://www.kernel.org/pub/linux/libs/ieee1394/
 LIBRAW1394_INSTALL_STAGING=YES
 
-$(eval $(call AUTOTARGETS,package,libraw1394))
+$(eval $(call AUTOTARGETS))
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index daa34ab193..de73f6eb60 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -14,4 +14,4 @@ LIBRSVG_INSTALL_TARGET = YES
 LIBRSVG_CONF_OPT = --disable-tools
 LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 libgtk2
 
-$(eval $(call AUTOTARGETS,package,librsvg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index 31b1aa0af8..5019af7e26 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -11,4 +11,4 @@ LIBRSYNC_INSTALL_TARGET = YES
 
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 
-$(eval $(call AUTOTARGETS,package,librsync))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
index 2533218f10..aca4f7f773 100644
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -12,4 +12,4 @@ LIBSEXY_DEPENDENCIES = libgtk2 libxml2
 LIBSEXY_INSTALL_TARGET = YES
 LIBSEXY_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/libsexy,libsexy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 0b1de1466a..4c443eb9fe 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -8,4 +8,4 @@ LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.bz2
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2
 LIBSIGC_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libsigc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 79a8d5509d..147b220a29 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -30,4 +30,4 @@ else
 LIBSOUP_CONF_OPT += --disable-ssl
 endif
 
-$(eval $(call AUTOTARGETS,package,libsoup))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index f8233fe313..39cf0304cf 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -26,4 +26,4 @@ LIBSYSFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/l
 LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz
 LIBSYSFS_INSTALL_STAGING=YES
 
-$(eval $(call AUTOTARGETS,package,libsysfs))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index d796f9b46b..6c69394423 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -10,8 +10,8 @@ LIBTOOL_INSTALL_STAGING = YES
 
 HOST_LIBTOOL_LIBTOOL_PATCH = NO
 
-$(eval $(call AUTOTARGETS,package,libtool))
-$(eval $(call AUTOTARGETS,package,libtool,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # variables used by other packages
 LIBTOOL:=$(HOST_DIR)/usr/bin/libtool
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index d8dc814e4e..100c5b9055 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -23,4 +23,4 @@ endef
 
 LIBUNGIF_POST_INSTALL_TARGET_HOOKS += LIBUNGIF_BINS_CLEANUP
 
-$(eval $(call AUTOTARGETS,package,libungif))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 1bd0356347..d5b4ee12cf 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -11,4 +11,4 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
 
 LIBUPNP_INSTALL_STAGING:=YES
 
-$(eval $(call AUTOTARGETS,package,libupnp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 1668614c3b..e39cdd82fd 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -18,4 +18,4 @@ endef
 
 LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
 
-$(eval $(call AUTOTARGETS,package,libusb-compat))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 050e2ba812..af75f5f9ac 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -10,4 +10,4 @@ LIBUSB_DEPENDENCIES = host-pkg-config
 LIBUSB_INSTALL_STAGING = YES
 LIBUSB_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package,libusb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 8f2878d656..0687137a58 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -33,8 +33,8 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS,package,libxml2))
-$(eval $(call AUTOTARGETS,package,libxml2,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # libxml2 for the host
 LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 07f669787b..fec85f023c 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -40,5 +40,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS,package,libxslt))
-$(eval $(call AUTOTARGETS,package,libxslt,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index 563b1ba8a7..34580a248b 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -8,5 +8,5 @@ LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
 LIBYAML_SITE = http://pyyaml.org/download/libyaml/
 LIBYAML_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,libyaml))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index ba5f5cf96e..10aa4c8e46 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -55,4 +55,4 @@ define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/lighttpd
 endef
 
-$(eval $(call AUTOTARGETS,package,lighttpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/links/links.mk b/package/links/links.mk
index b8520d4a04..44bf9ecac0 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -32,4 +32,4 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 LINKS_DEPENDENCIES += zlib
 endif
 
-$(eval $(call AUTOTARGETS,package,links))
+$(eval $(call AUTOTARGETS))
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index 678be865cd..9b840e29ad 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -22,4 +22,4 @@ endef
 
 LITE_POST_INSTALL_TARGET_HOOKS += LITE_FINALIZE_INSTALL
 
-$(eval $(call AUTOTARGETS,package,lite))
+$(eval $(call AUTOTARGETS))
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index e9b975fd74..0d3347f8de 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -47,4 +47,4 @@ define LRZSZ_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS,package,lrzsz))
+$(eval $(call AUTOTARGETS))
diff --git a/package/lsuio/lsuio.mk b/package/lsuio/lsuio.mk
index 2a867b7995..3cdd84605b 100644
--- a/package/lsuio/lsuio.mk
+++ b/package/lsuio/lsuio.mk
@@ -8,4 +8,4 @@ LSUIO_VERSION = 0.2.0
 LSUIO_SOURCE = lsuio-$(LSUIO_VERSION).tar.gz
 LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user
 
-$(eval $(call AUTOTARGETS,package,lsuio))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 1a55c41174..f0a57aefa6 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -7,4 +7,4 @@ LTP_TESTSUITE_VERSION = 20101031
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
 LTP_TESTSUITE_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
 
-$(eval $(call AUTOTARGETS,package,ltp-testsuite))
+$(eval $(call AUTOTARGETS))
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 2e9f2d8514..40e015254d 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -51,4 +51,4 @@ define LVM2_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/lib/,libdevmapper.so*)
 endef
 
-$(eval $(call AUTOTARGETS,package,lvm2))
+$(eval $(call AUTOTARGETS))
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 9bdcc35295..4614116c36 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -10,7 +10,7 @@ LZMA_INSTALL_STAGING = YES
 LZMA_INSTALL_TARGET = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
-$(eval $(call AUTOTARGETS,package,lzma))
-$(eval $(call AUTOTARGETS,package,lzma,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 LZMA=$(HOST_DIR)/usr/bin/lzma
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 9bd1a6f824..84f31f0d00 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -7,5 +7,5 @@ LZO_VERSION = 2.06
 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
 LZO_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,lzo))
-$(eval $(call AUTOTARGETS,package,lzo,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index b278e5976e..6d1d674edb 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -8,4 +8,4 @@ LZOP_SOURCE = lzop-$(LZOP_VERSION).tar.gz
 LZOP_SITE = http://www.lzop.org/download/
 LZOP_DEPENDENCIES = lzo
 
-$(eval $(call AUTOTARGETS,package,lzop))
+$(eval $(call AUTOTARGETS))
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index d713b6dbf5..4f18aa47c9 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -15,5 +15,5 @@ endif
 
 HOST_M4_CONF_OPT = --disable-static
 
-$(eval $(call AUTOTARGETS,package,m4))
-$(eval $(call AUTOTARGETS,package,m4,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/make/make.mk b/package/make/make.mk
index 12d236ada0..288603233a 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -13,4 +13,4 @@ MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
 		GLOBINC='-I$(@D)/glob' \
 		GLOBLIB=glob/libglob.a
 
-$(eval $(call AUTOTARGETS,package,make))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index d35d11bca5..0468d997ba 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -15,4 +15,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-common))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index d5f61c1f13..611323db20 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -21,4 +21,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-desktop))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index dc448b8ce0..4246626590 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -20,4 +20,4 @@ MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-fakekey))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 3d7178d142..558a4f7a27 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -28,4 +28,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-keyboard))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 817a8da8f0..b0be393d3c 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -55,4 +55,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-lib))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index 573e3231d9..fe43cb9915 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -21,4 +21,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-panel))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 954709a823..2540e4b50f 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -12,4 +12,4 @@ MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-startup-monitor))
+$(eval $(call AUTOTARGETS))
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 0334d0f0c1..4b32073766 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -39,4 +39,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS,package/matchbox,matchbox-wm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index fbd5f16cb3..087a2d2c70 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -25,4 +25,4 @@ define MDADM_CONFIGURE_CMDS
 	# Do nothing
 endef
 
-$(eval $(call AUTOTARGETS,package,mdadm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 04cfa107de..5f5fcfaa41 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -25,4 +25,4 @@ endef
 
 METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION
 
-$(eval $(call AUTOTARGETS,package,metacity))
+$(eval $(call AUTOTARGETS))
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 27d01593ea..d7e7c24019 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -18,6 +18,6 @@ MODULE_INIT_TOOLS_AUTORECONF=YES
 HOST_MODULE_INIT_TOOLS_AUTORECONF=YES
 HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
 
-$(eval $(call AUTOTARGETS,package,module-init-tools))
-$(eval $(call AUTOTARGETS,package,module-init-tools,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index b344f2862f..608c9f4a3b 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -12,5 +12,5 @@ MPC_AUTORECONF = YES
 HOST_MPC_AUTORECONF = YES
 HOST_MPC_DEPENDENCIES = host-gmp host-mpfr
 
-$(eval $(call AUTOTARGETS,package,mpc))
-$(eval $(call AUTOTARGETS,package,mpc,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 0aeecbe9be..7f335998c5 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -12,5 +12,5 @@ MPFR_DEPENDENCIES = gmp
 MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
 HOST_MPFR_DEPENDENCIES = host-gmp
 
-$(eval $(call AUTOTARGETS,package,mpfr))
-$(eval $(call AUTOTARGETS,package,mpfr,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 9374037e06..62a3b1d3ea 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -78,4 +78,4 @@ define ALSA_LIB_UNINSTALL_STAGING_CMDS
 	-rm -rf $(STAGING_DIR)/usr/share/alsa
 endef
 
-$(eval $(call AUTOTARGETS,package/multimedia,alsa-lib))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index f3954200e5..59579c23d6 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -57,4 +57,4 @@ define ALSA_UTILS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/,$(ALSA_UTILS_TARGETS_) $(ALSA_UTILS_TARGETS_y))
 endef
 
-$(eval $(call AUTOTARGETS,package/multimedia,alsa-utils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index 65d9d396c9..b6fbdd2cde 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
@@ -18,4 +18,4 @@ AUMIX_CONF_OPT = \
 
 AUMIX_DEPENDENCIES = ncurses
 
-$(eval $(call AUTOTARGETS,package/multimedia,aumix))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk
index 04aee1833e..366515cf71 100644
--- a/package/multimedia/faad2/faad2.mk
+++ b/package/multimedia/faad2/faad2.mk
@@ -8,4 +8,4 @@ FAAD2_VERSION = 2.7
 FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac
 FAAD2_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,faad2))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b50503b05c..ca41892fc7 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -172,4 +172,4 @@ define FFMPEG_CONFIGURE_CMDS
 	)
 endef
 
-$(eval $(call AUTOTARGETS,package/multimedia,ffmpeg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk
index 4c278b4a0f..79ecfd199e 100644
--- a/package/multimedia/flac/flac.mk
+++ b/package/multimedia/flac/flac.mk
@@ -20,4 +20,4 @@ else
 FLAC_CONF_OPT += --disable-ogg
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,flac))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index ebe87dcb78..41a7f3be3b 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -15,4 +15,4 @@ ifeq ($(BR2_PACKAGE_BZIP2),y)
 GST_FFMPEG_DEPENDENCIES += bzip2
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,gst-ffmpeg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 9b2a738c3b..4cd2771a8e 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -519,4 +519,4 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-vcd
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-bad))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index a260f89a78..87ee80dc12 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -170,4 +170,4 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-vorbis
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-base))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 202e60e70f..c2dcd24db2 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -359,4 +359,4 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-speex
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-good))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index c3a3d8b744..5237bc95fa 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -74,4 +74,4 @@ else
 GST_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-ugly))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index b1456e255e..274b87a9d6 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -25,4 +25,4 @@ GSTREAMER_CONF_OPT = \
 
 GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config
 
-$(eval $(call AUTOTARGETS,package/multimedia,gstreamer))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index 281c1e865b..7609f2db33 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -27,4 +27,4 @@ endif
 
 LAME_POST_CONFIGURE_HOOKS += LAME_BIGENDIAN_ARCH
 
-$(eval $(call AUTOTARGETS,package/multimedia,lame))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libao/libao.mk b/package/multimedia/libao/libao.mk
index 83d31545a1..617b1ee8f6 100644
--- a/package/multimedia/libao/libao.mk
+++ b/package/multimedia/libao/libao.mk
@@ -18,4 +18,4 @@ else
 LIBAO_CONF_OPT += --disable-alsa
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,libao))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libcdaudio/libcdaudio.mk b/package/multimedia/libcdaudio/libcdaudio.mk
index 2f37cc24af..d240c0765e 100644
--- a/package/multimedia/libcdaudio/libcdaudio.mk
+++ b/package/multimedia/libcdaudio/libcdaudio.mk
@@ -12,4 +12,4 @@ LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
 LIBCDAUDIO_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,libcdaudio))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libcue/libcue.mk b/package/multimedia/libcue/libcue.mk
index 2de0423147..b815c0fbb8 100644
--- a/package/multimedia/libcue/libcue.mk
+++ b/package/multimedia/libcue/libcue.mk
@@ -10,4 +10,4 @@ LIBCUE_SOURCE = libcue-$(LIBCUE_VERSION).tar.bz2
 LIBCUE_DEPENDENCIES = flex
 LIBCUE_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,libcue))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libdvdnav/libdvdnav.mk b/package/multimedia/libdvdnav/libdvdnav.mk
index b3fea2fd2e..4e9a92ba18 100644
--- a/package/multimedia/libdvdnav/libdvdnav.mk
+++ b/package/multimedia/libdvdnav/libdvdnav.mk
@@ -17,4 +17,4 @@ LIBDVDNAV_DEPENDENCIES = libdvdread
 # of cross compilation, we prefer using pkg-config.
 LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 
-$(eval $(call AUTOTARGETS,package/multimedia,libdvdnav))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libdvdread/libdvdread.mk b/package/multimedia/libdvdread/libdvdread.mk
index 98b2ef5c32..3f456efe13 100644
--- a/package/multimedia/libdvdread/libdvdread.mk
+++ b/package/multimedia/libdvdread/libdvdread.mk
@@ -12,4 +12,4 @@ LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES
 LIBDVDREAD_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,libdvdread))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk
index bcb110f8c2..def2dbc848 100644
--- a/package/multimedia/libid3tag/libid3tag.mk
+++ b/package/multimedia/libid3tag/libid3tag.mk
@@ -11,4 +11,4 @@ LIBID3TAG_INSTALL_STAGING=YES
 LIBID3TAG_DEPENDENCIES=zlib
 LIBID3TAG_LIBTOOL_PATCH=NO
 
-$(eval $(call AUTOTARGETS,package/multimedia,libid3tag))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk
index d129aad326..a469fece12 100644
--- a/package/multimedia/libmad/libmad.mk
+++ b/package/multimedia/libmad/libmad.mk
@@ -32,4 +32,4 @@ LIBMAD_CONF_OPT = \
 		--disable-debugging \
 		--enable-speed
 
-$(eval $(call AUTOTARGETS,package/multimedia,libmad))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk
index d11f0bead3..50ece53fe8 100644
--- a/package/multimedia/libmms/libmms.mk
+++ b/package/multimedia/libmms/libmms.mk
@@ -13,4 +13,4 @@ LIBMMS_INSTALL_TARGET = YES
 
 LIBMMS_DEPENDENCIES = host-pkg-config libglib2
 
-$(eval $(call AUTOTARGETS,package/multimedia,libmms))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libmpd/libmpd.mk b/package/multimedia/libmpd/libmpd.mk
index 47a802abeb..a58b537d1c 100644
--- a/package/multimedia/libmpd/libmpd.mk
+++ b/package/multimedia/libmpd/libmpd.mk
@@ -9,4 +9,4 @@ LIBMPD_SITE = http://download.sarine.nl/download/Programs/gmpc/$(LIBMPD_VERSION)
 LIBMPD_INSTALL_STAGING = YES
 LIBMPD_DEPENDENCIES = libglib2
 
-$(eval $(call AUTOTARGETS,package/multimedia,libmpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/multimedia/libmpeg2/libmpeg2.mk
index 8bcc99967b..8713c8797a 100644
--- a/package/multimedia/libmpeg2/libmpeg2.mk
+++ b/package/multimedia/libmpeg2/libmpeg2.mk
@@ -26,4 +26,4 @@ endef
 LIBMPEG2_POST_INSTALL_TARGET_HOOKS += LIBMPEG2_REMOVE_BINS
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,libmpeg2))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk
index 0fd6b27b32..86d5b0110f 100644
--- a/package/multimedia/libogg/libogg.mk
+++ b/package/multimedia/libogg/libogg.mk
@@ -12,4 +12,4 @@ LIBOGG_INSTALL_TARGET = YES
 
 LIBOGG_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS,package/multimedia,libogg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libreplaygain/libreplaygain.mk b/package/multimedia/libreplaygain/libreplaygain.mk
index cc023a0906..47bf586424 100644
--- a/package/multimedia/libreplaygain/libreplaygain.mk
+++ b/package/multimedia/libreplaygain/libreplaygain.mk
@@ -11,4 +11,4 @@ LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
 LIBREPLAYGAIN_AUTORECONF = YES
 LIBREPLAYGAIN_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,libreplaygain))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libsamplerate/libsamplerate.mk b/package/multimedia/libsamplerate/libsamplerate.mk
index f20026a3b8..d03a5d9926 100644
--- a/package/multimedia/libsamplerate/libsamplerate.mk
+++ b/package/multimedia/libsamplerate/libsamplerate.mk
@@ -14,4 +14,4 @@ ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 LIBSAMPLERATE_DEPENDENCIES += libsndfile
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,libsamplerate))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk
index 52ecce5ed9..5480618877 100644
--- a/package/multimedia/libsndfile/libsndfile.mk
+++ b/package/multimedia/libsndfile/libsndfile.mk
@@ -8,4 +8,4 @@ LIBSNDFILE_VERSION = 1.0.25
 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
 LIBSNDFILE_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,libsndfile))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libtheora/libtheora.mk b/package/multimedia/libtheora/libtheora.mk
index e572d1a204..89489b7876 100644
--- a/package/multimedia/libtheora/libtheora.mk
+++ b/package/multimedia/libtheora/libtheora.mk
@@ -17,4 +17,4 @@ LIBTHEORA_CONF_OPT = \
 
 LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkg-config
 
-$(eval $(call AUTOTARGETS,package/multimedia,libtheora))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index 0570ea65d7..dfe7bce6fa 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -15,4 +15,4 @@ LIBVORBIS_CONF_OPT = --disable-oggtest
 
 LIBVORBIS_DEPENDENCIES = host-pkg-config libogg
 
-$(eval $(call AUTOTARGETS,package/multimedia,libvorbis))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index a2ac14d384..9fad45f67d 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -16,4 +16,4 @@ MADPLAY_CONF_OPT+=--with-alsa
 MADPLAY_DEPENDENCIES+=alsa-lib
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,madplay))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index b85e077bed..2a4889ab3f 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -126,4 +126,4 @@ endef
 
 MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
 
-$(eval $(call AUTOTARGETS,package/multimedia,mpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 43f631c62b..17d398e814 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -41,4 +41,4 @@ MPG123_CONF_OPT += --with-audio=alsa
 MPG123_DEPENDENCIES += alsa-lib
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,mpg123))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/portaudio/portaudio.mk b/package/multimedia/portaudio/portaudio.mk
index f403d002a6..a82473593f 100644
--- a/package/multimedia/portaudio/portaudio.mk
+++ b/package/multimedia/portaudio/portaudio.mk
@@ -18,4 +18,4 @@ PORTAUDIO_CONF_OPT = \
        $(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \
        $(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx)
 
-$(eval $(call AUTOTARGETS,package/multimedia,portaudio))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk
index 7de3b38305..dfb426bca6 100644
--- a/package/multimedia/speex/speex.mk
+++ b/package/multimedia/speex/speex.mk
@@ -33,4 +33,4 @@ define SPEEX_BUILD_CMDS
 	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 endef
 
-$(eval $(call AUTOTARGETS,package/multimedia,speex))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/swfdec/swfdec.mk b/package/multimedia/swfdec/swfdec.mk
index 9b4b72953c..f88d7db1d6 100644
--- a/package/multimedia/swfdec/swfdec.mk
+++ b/package/multimedia/swfdec/swfdec.mk
@@ -29,7 +29,7 @@ else
 SWFDEC_CONF_OPT += --disable-gtk
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,swfdec))
+$(eval $(call AUTOTARGETS))
 
 # swfdec uses glib-* at install time
 # Notice: must come after AUTOTARGETS as that's where these variables gets set
diff --git a/package/multimedia/tremor/tremor.mk b/package/multimedia/tremor/tremor.mk
index 654a403ee0..cf228b8e3f 100644
--- a/package/multimedia/tremor/tremor.mk
+++ b/package/multimedia/tremor/tremor.mk
@@ -12,4 +12,4 @@ TREMOR_AUTORECONF = YES
 TREMOR_INSTALL_STAGING = YES
 TREMOR_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/multimedia,tremor))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/vorbis-tools/vorbis-tools.mk b/package/multimedia/vorbis-tools/vorbis-tools.mk
index 6fd6c2a8e7..fc79b3f70f 100644
--- a/package/multimedia/vorbis-tools/vorbis-tools.mk
+++ b/package/multimedia/vorbis-tools/vorbis-tools.mk
@@ -17,4 +17,4 @@ ifeq ($(BR2_PACKAGE_SPEEX),y)
 VORBIS_TOOLS_DEPENDENCIES += speex
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,vorbis-tools))
+$(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
index 035963a573..8b0af0baa9 100644
--- a/package/multimedia/wavpack/wavpack.mk
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -13,4 +13,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 WAVPACK_DEPENDENCIES += libiconv
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,wavpack))
+$(eval $(call AUTOTARGETS))
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 886768cf37..4b75cc84ba 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -22,4 +22,4 @@ endef
 
 MUTT_POST_PATCH_HOOKS += MUTT_APPLY_DEBIAN_PATCHES
 
-$(eval $(call AUTOTARGETS,package,mutt))
\ No newline at end of file
+$(eval $(call AUTOTARGETS))
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index e45abe920b..fb736706ae 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -12,4 +12,4 @@ MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
 MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) uninstall
 MXML_UNINSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) uninstall
 
-$(eval $(call AUTOTARGETS,package,mxml))
+$(eval $(call AUTOTARGETS))
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 49a7033e16..9addf33428 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -42,4 +42,4 @@ endef
 MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
 MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_ADD_MYSQL_LIB_PATH
 
-$(eval $(call AUTOTARGETS,package,mysql_client))
+$(eval $(call AUTOTARGETS))
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 87852a15ff..c4162c1006 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -18,4 +18,4 @@ define NANO_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/nano
 endef
 
-$(eval $(call AUTOTARGETS,package,nano))
+$(eval $(call AUTOTARGETS))
diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index 03e8394486..b819df04b2 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -14,5 +14,5 @@ NASM_VERSION=2.08.01
 NASM_SOURCE=nasm-$(NASM_VERSION).tar.bz2
 NASM_SITE=http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/
 
-$(eval $(call AUTOTARGETS,package,nasm))
-$(eval $(call AUTOTARGETS,package,nasm,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index a09b10b74a..69a55ae68d 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -23,4 +23,4 @@ endef
 
 NBD_POST_INSTALL_TARGET_HOOKS += NBD_CLEANUP_AFTER_INSTALL
 
-$(eval $(call AUTOTARGETS,package,nbd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index f3f47805f2..7fdee9ae20 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -41,4 +41,4 @@ define NCFTP_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS) ncftpspooler)
 endef
 
-$(eval $(call AUTOTARGETS,package,ncftp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 8c8ae3641d..a1353ed6c2 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -133,5 +133,5 @@ endef
 HOST_NCURSES_CONF_OPT = \
 	--without-shared --without-gpm
 
-$(eval $(call AUTOTARGETS,package,ncurses))
-$(eval $(call AUTOTARGETS,package,ncurses,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 87eb9829d9..4e171886e5 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -53,4 +53,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS,package,neon))
+$(eval $(call AUTOTARGETS))
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 31f6b716c9..dfd0b5ad5c 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -11,4 +11,4 @@ NETCAT_AUTORECONF:=NO
 NETCAT_INSTALL_STAGING:=NO
 NETCAT_INSTALL_TARGET:=YES
 
-$(eval $(call AUTOTARGETS,package,netcat))
+$(eval $(call AUTOTARGETS))
diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index 6bf9b5c172..a66d4ef705 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -20,4 +20,4 @@ define NETPERF_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/netserver
 endef
 
-$(eval $(call AUTOTARGETS,package,netperf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 05d8db74f4..5d789b9c46 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -83,4 +83,4 @@ endef
 
 NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
 
-$(eval $(call AUTOTARGETS,package,netsnmp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk
index 412b6fe766..fbe1939e50 100644
--- a/package/netstat-nat/netstat-nat.mk
+++ b/package/netstat-nat/netstat-nat.mk
@@ -7,4 +7,4 @@
 NETSTAT_NAT_VERSION = 1.4.10
 NETSTAT_NAT_SITE = http://tweegy.nl/download
 
-$(eval $(call AUTOTARGETS,package,netstat-nat))
+$(eval $(call AUTOTARGETS))
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 382676cc38..bbe25fee06 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -29,4 +29,4 @@ endef
 
 NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
 
-$(eval $(call AUTOTARGETS,package,nfs-utils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index d2aed23a3f..a55f7baf61 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -8,4 +8,4 @@ NGIRCD_VERSION = 17.1
 NGIRCD_SITE = ftp://ftp.berlios.de/pub/ngircd/
 NGIRCD_DEPENDENCIES = zlib
 
-$(eval $(call AUTOTARGETS,package,ngircd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index 26594dcd59..e4ee525ad6 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -22,4 +22,4 @@ endif
 
 NGREP_DEPENDENCIES = libpcap pcre
 
-$(eval $(call AUTOTARGETS,package,ngrep))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index baabff220a..99fc20cb33 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -10,4 +10,4 @@ NTFS_3G_SITE = http://tuxera.com/opensource
 NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,ntfs-3g))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk
index ea8a2a4555..32b9cb256c 100644
--- a/package/ntfsprogs/ntfsprogs.mk
+++ b/package/ntfsprogs/ntfsprogs.mk
@@ -23,4 +23,4 @@ define NTFSPROGS_UNINSTALL_TARGET_CMDS
 	-unlink $(TARGET_DIR)/sbin/mkfs.ntfs
 endef
 
-$(eval $(call AUTOTARGETS,package,ntfsprogs))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 72e462efbe..5f2f99309a 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -58,4 +58,4 @@ endef
 
 NTP_POST_PATCH_HOOKS += NTP_PATCH_FIXUPS
 
-$(eval $(call AUTOTARGETS,package,ntp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index 3555ffa6cb..3358905d73 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -14,4 +14,4 @@ define OPENNTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man?/ntpd*
 endef
 
-$(eval $(call AUTOTARGETS,package,openntpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 74585d3632..5f613673fa 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -29,4 +29,4 @@ ifeq ($(BR2_PACKAGE_OPENOCD_VSLLINK),y)
 OPENOCD_CONF_OPT += --enable-vsllink
 endif
 
-$(eval $(call AUTOTARGETS,package,openocd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 02a23e1ff6..08bb499bb7 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -18,4 +18,4 @@ endef
 
 OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS,package,openssh))
+$(eval $(call AUTOTARGETS))
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index b7587fd047..587368b190 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -34,4 +34,4 @@ define OPENVPN_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/openvpn
 endef
 
-$(eval $(call AUTOTARGETS,package,openvpn))
+$(eval $(call AUTOTARGETS))
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 4522cda487..ae4cddeb13 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -38,4 +38,4 @@ define OPROFILE_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/oprofile
 endef
 
-$(eval $(call AUTOTARGETS,package,oprofile))
+$(eval $(call AUTOTARGETS))
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 37b6e991cf..d4ff3e28f3 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -21,4 +21,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
 endif
 
-$(eval $(call AUTOTARGETS,package,orc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 5636b73df4..2691b884db 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -60,4 +60,4 @@ endef
 
 PANGO_POST_INSTALL_TARGET_HOOKS += PANGO_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS,package,pango))
+$(eval $(call AUTOTARGETS))
diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index 5c46c779c0..2062b9f727 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -7,4 +7,4 @@
 PATCH_VERSION = 2.6
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
 
-$(eval $(call AUTOTARGETS,package,patch))
+$(eval $(call AUTOTARGETS))
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 370cf801af..72c2369eab 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -14,5 +14,5 @@ PCMANFM_CONF_OPT = --disable-hal
 
 PCMANFM_DEPENDENCIES = host-pkg-config libgtk2 gamin startup-notification xserver_xorg-server
 
-$(eval $(call AUTOTARGETS,package,pcmanfm))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index d2a13318fc..453565691f 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -29,4 +29,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 PCRE_POST_INSTALL_TARGET_HOOKS += PCRE_TARGET_REMOVE_PCRE_CONFIG
 endif
 
-$(eval $(call AUTOTARGETS,package,pcre))
+$(eval $(call AUTOTARGETS))
diff --git a/package/php/php.mk b/package/php/php.mk
index ad0ae43c18..a1dde5172e 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -195,4 +195,4 @@ endef
 
 PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)"
 
-$(eval $(call AUTOTARGETS,package,php))
+$(eval $(call AUTOTARGETS))
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 8c7a2334b0..2b39a77c0f 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -9,5 +9,5 @@ PIXMAN_SITE = http://cairographics.org/releases/
 PIXMAN_AUTORECONF = NO
 PIXMAN_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package,pixman))
-$(eval $(call AUTOTARGETS,package,pixman,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 7189c91aa4..f347a53079 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -18,7 +18,7 @@ HOST_PKG_CONFIG_CONF_OPT = \
 
 HOST_PKG_CONFIG_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS,package,pkg-config))
-$(eval $(call AUTOTARGETS,package,pkg-config,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index 4fdc01d4d4..98f438d930 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -15,4 +15,4 @@ POPT_CONF_ENV += am_cv_lib_iconv=yes
 POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
 endif
 
-$(eval $(call AUTOTARGETS,package,popt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 3733cd643b..2523dd20da 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -42,4 +42,4 @@ define PROFTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/proftpd.conf
 endef
 
-$(eval $(call AUTOTARGETS,package,proftpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 3cbf9418e8..dca502168e 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -13,4 +13,4 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 PSMISC_DEPENDENCIES += busybox
 endif
 
-$(eval $(call AUTOTARGETS,package,psmisc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/python/python.mk b/package/python/python.mk
index 596770acc1..9ef2ccc482 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -159,5 +159,5 @@ PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES
 
 PYTHON_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS,package,python))
-$(eval $(call AUTOTARGETS,package,python,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index eb3b301012..b7a23abbf3 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -87,4 +87,4 @@ else
 QUAGGA_CONF_OPT+=--disable-opaque-lsa
 endif
 
-$(eval $(call AUTOTARGETS,package,quagga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 6b7468a440..ac0c0e9bcb 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -14,4 +14,4 @@ endef
 
 RADVD_POST_INSTALL_TARGET_HOOKS += RADVD_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS,package,radvd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index a55d58f837..732a08b047 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -10,4 +10,4 @@ RDESKTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/
 RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
 RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
 
-$(eval $(call AUTOTARGETS,package,rdesktop))
+$(eval $(call AUTOTARGETS))
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index e34c6506d7..03a5377637 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -24,4 +24,4 @@ define READLINE_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
 endef
 
-$(eval $(call AUTOTARGETS,package,readline))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index 9ae5616269..7642c82af0 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -9,4 +9,4 @@ RNG_TOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge
 RNG_TOOLS_CONF_ENV = LIBS="-largp"
 RNG_TOOLS_DEPENDENCIES = argp-standalone
 
-$(eval $(call AUTOTARGETS,package,rng-tools))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index cac994aea0..30bc1a4674 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -33,4 +33,4 @@ define RP_PPPOE_UNINSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call AUTOTARGETS,package,rp-pppoe))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 1a4c10b8f1..3407f49d33 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -32,4 +32,4 @@ RPM_MAKE = $(MAKE1)
 
 RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install
 
-$(eval $(call AUTOTARGETS,package,rpm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 80789c665d..55aed9eff6 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -25,4 +25,4 @@ define RRDTOOL_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/librrd*
 endef
 
-$(eval $(call AUTOTARGETS,package,rrdtool))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index e99b650ebb..12a33c612d 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -10,4 +10,4 @@ RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
 RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 RSYNC_CONF_OPT = --with-included-popt
 
-$(eval $(call AUTOTARGETS,package,rsync))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index af7ac2ed8e..6582812b75 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -23,4 +23,4 @@ endef
 
 RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF_SCRIPT
 
-$(eval $(call AUTOTARGETS,package,rsyslog))
+$(eval $(call AUTOTARGETS))
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
index a4a69f9988..2dc1468d91 100644
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -12,4 +12,4 @@ RTAI_CONF_OPT = \
 
 RTAI_MAKE = $(MAKE1)
 
-$(eval $(call AUTOTARGETS,package,rtai))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 966a6a1610..34953336fd 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -31,5 +31,5 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 	RUBY_DEPENDENCIES += zlib
 endif
 
-$(eval $(call AUTOTARGETS,package,ruby))
-$(eval $(call AUTOTARGETS,package,ruby,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index f36da8572e..de2c13b0e5 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -186,4 +186,4 @@ endef
 
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_INITSCRIPTS_CONFIG
 
-$(eval $(call AUTOTARGETS,package,samba))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index d2d15d8d22..71d52ae27a 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -9,5 +9,5 @@ SAWMAN_SITE:=http://www.directfb.org/downloads/Extras
 SAWMAN_INSTALL_STAGING = YES
 SAWMAN_DEPENDENCIES = directfb
 
-$(eval $(call AUTOTARGETS,package,sawman))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index 54a9c9c9df..2dfb8f2a35 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -11,4 +11,4 @@ SCREEN_CONF_ENV = CFLAGS=-DSYSV=1
 SCREEN_MAKE_OPT = -j1
 SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
-$(eval $(call AUTOTARGETS,package,screen))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index af462c40d6..b5d9152882 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -67,4 +67,4 @@ define SDL_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
 endef
 
-$(eval $(call AUTOTARGETS,package,sdl))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index c5a6d7eb26..b8c5d80797 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -23,4 +23,4 @@ else
 SDL_GFX_CONF_OPT += --disable-mmx
 endif
 
-$(eval $(call AUTOTARGETS,package,sdl_gfx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index ab838b1550..8dec4728f8 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -34,4 +34,4 @@ SDL_IMAGE_DEPENDENCIES:=sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff)
 
-$(eval $(call AUTOTARGETS,package,sdl_image))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 01129faabe..eee3e14292 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -41,4 +41,4 @@ define SDL_MIXER_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS,package,sdl_mixer))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index 7b7e12a55f..bc99f6ce53 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -14,4 +14,4 @@ SDL_NET_INSTALL_STAGING = YES
 
 SDL_NET_DEPENDENCIES = sdl
 
-$(eval $(call AUTOTARGETS,package,sdl_net))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 0a0fe5bf3c..7075967390 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -55,4 +55,4 @@ define SDL_SOUND_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/libSDL_sound*so*
 endef
 
-$(eval $(call AUTOTARGETS,package,sdl_sound))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index 0a8a9e97a1..efba5fa047 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -14,4 +14,4 @@ SDL_TTF_CONF_OPT = --without-x \
 		--with-sdl-prefix=$(STAGING_DIR)/usr
 
 SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
-$(eval $(call AUTOTARGETS,package,sdl_ttf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index ecb30c5d02..21befd6001 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -2,4 +2,4 @@ SDPARM_VERSION = 1.06
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
 SDPARM_SITE = http://sg.danny.cz/sg/p/
 
-$(eval $(call AUTOTARGETS,package,sdparm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 1a313eb1ce..79467ef62a 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -23,4 +23,4 @@ endef
 
 SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
 
-$(eval $(call AUTOTARGETS,package,sed))
+$(eval $(call AUTOTARGETS))
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 9c3d136c95..1fd589c380 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -8,4 +8,4 @@ SER2NET_VERSION = 2.7
 SER2NET_SOURCE = ser2net-$(SER2NET_VERSION).tar.gz
 SER2NET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ser2net
 
-$(eval $(call AUTOTARGETS,package,ser2net))
+$(eval $(call AUTOTARGETS))
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index 33c8478d9f..80dbb12cec 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -19,4 +19,4 @@ endef
 
 SETSERIAL_POST_PATCH_HOOKS += SETSERIAL_APPLY_DEBIAN_PATCHES
 
-$(eval $(call AUTOTARGETS,package,setserial))
+$(eval $(call AUTOTARGETS))
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index b24540dfa2..dc53fcec73 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -25,8 +25,8 @@ define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache
 endef
 
-$(eval $(call AUTOTARGETS,package,shared-mime-info))
-$(eval $(call AUTOTARGETS,package,shared-mime-info,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # shared-mime-info for the host
 SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index d982863e47..d941504e20 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -7,4 +7,4 @@
 SMARTMONTOOLS_VERSION = 5.40
 SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
 
-$(eval $(call AUTOTARGETS,package,smartmontools))
+$(eval $(call AUTOTARGETS))
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index b110790b84..5f7feacc2b 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -12,4 +12,4 @@ SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
 		 sc_cv_sys_tabdly_shift=11 \
 		 sc_cv_sys_csize_shift=4
 
-$(eval $(call AUTOTARGETS,package,socat))
+$(eval $(call AUTOTARGETS))
diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index 5070f73fce..2502b11f2a 100644
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -12,4 +12,4 @@ ifneq ($(BR2_INET_IPV6),y)
 SPAWN_FCGI_CONF_OPT = --disable-ipv6
 endif
 
-$(eval $(call AUTOTARGETS,package,spawn-fcgi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 4579eaa596..10fe9fea40 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -41,4 +41,4 @@ define SQLITE_UNINSTALL_STAGING_CMDS
 	rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
 endef
 
-$(eval $(call AUTOTARGETS,package,sqlite))
+$(eval $(call AUTOTARGETS))
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index fbcdc4875f..a77e34cb0b 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -32,4 +32,4 @@ endef
 
 SQUID_POST_INSTALL_TARGET_HOOKS += SQUID_CLEANUP_TARGET
 
-$(eval $(call AUTOTARGETS,package,squid))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index ae837bbf53..81eb4c6f6d 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -12,4 +12,4 @@ SSHFS_DEPENDENCIES = \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv)
 
-$(eval $(call AUTOTARGETS,package,sshfs))
+$(eval $(call AUTOTARGETS))
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index ad669ac07d..bebb8e9365 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -16,5 +16,5 @@ STARTUP_NOTIFICATION_CONF_OPT = --with-x \
 	--x-includes="$(STAGING_DIR)/usr/include/X11" \
 	--x-libraries="$(STAGING_DIR)/usr/lib"
 
-$(eval $(call AUTOTARGETS,package,startup-notification))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 85e82c1e6c..8cda09ba56 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -18,4 +18,4 @@ endef
 
 STRACE_POST_INSTALL_TARGET_HOOKS += STRACE_REMOVE_STRACE_GRAPH
 
-$(eval $(call AUTOTARGETS,package,strace))
+$(eval $(call AUTOTARGETS))
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 9b31fd2ee5..1f40397110 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -22,4 +22,4 @@ endef
 
 STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF_SCRIPT
 
-$(eval $(call AUTOTARGETS,package,stunnel))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 688df16437..4263762d9c 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -21,4 +21,4 @@ define SUDO_INSTALL_TARGET_CMDS
 	install -m 0440 -D $(@D)/sudoers $(TARGET_DIR)/etc/sudoers
 endef
 
-$(eval $(call AUTOTARGETS,package,sudo))
\ No newline at end of file
+$(eval $(call AUTOTARGETS))
\ No newline at end of file
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 371341f8dd..3ed0ff1d81 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -21,4 +21,4 @@ else
 SYLPHEED_CONF_OPT += --disable-ssl
 endif
 
-$(eval $(call AUTOTARGETS,package,sylpheed))
+$(eval $(call AUTOTARGETS))
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index d56bd3e8f3..5a09359f80 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -12,4 +12,4 @@ SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 
 SYNERGY_DEPENDENCIES = xserver_xorg-server xlib_libXtst
 
-$(eval $(call AUTOTARGETS,package,synergy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 09e5177d49..30eaa7324c 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -22,4 +22,4 @@ endif
 # among other things. So we don't install it.
 SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
 
-$(eval $(call AUTOTARGETS,package,sysstat))
+$(eval $(call AUTOTARGETS))
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index bab2ca21e8..c797de9be1 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -7,4 +7,4 @@
 TAR_VERSION = 1.26
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
 
-$(eval $(call AUTOTARGETS,package,tar))
+$(eval $(call AUTOTARGETS))
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 532cacfa08..cf9a409f87 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -24,4 +24,4 @@ endef
 
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
 
-$(eval $(call AUTOTARGETS,package,tcl))
+$(eval $(call AUTOTARGETS))
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 720a29acfb..153454319a 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -21,4 +21,4 @@ endef
 
 TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY
 
-$(eval $(call AUTOTARGETS,package,tcpdump))
+$(eval $(call AUTOTARGETS))
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 296f4eba35..3a526a74ea 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -11,5 +11,5 @@ TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
 
 TCPREPLAY_DEPENDENCIES = uclibc libpcap
 
-$(eval $(call AUTOTARGETS,package,tcpreplay))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index c3b9e1df27..98c3c2a061 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -13,4 +13,4 @@ define TFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/
 endef
 
-$(eval $(call AUTOTARGETS,package,tftpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index 46c87a13c2..98d45ca028 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -48,4 +48,4 @@ define THTTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/syslogtocern
 endef
 
-$(eval $(call AUTOTARGETS,package,thttpd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 84e5a5fdc1..1d57db7602 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -18,4 +18,4 @@ define TIFF_INSTALL_TARGET_CMDS
 	-cp -a $(@D)/libtiff/.libs/libtiff.so* $(TARGET_DIR)/usr/lib/
 endef
 
-$(eval $(call AUTOTARGETS,package,tiff))
+$(eval $(call AUTOTARGETS))
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 63c6c6c76c..7a4c0f2be3 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -29,4 +29,4 @@ define TN5250_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/tn5250
 endef
 
-$(eval $(call AUTOTARGETS,package,tn5250))
+$(eval $(call AUTOTARGETS))
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index 2b1cb8d8bc..f81ce51f2a 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -16,5 +16,5 @@ TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries=
 
 TORSMO_DEPENDENCIES = xserver_xorg-server
 
-$(eval $(call AUTOTARGETS,package,torsmo))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index a65e72e9e9..885bd884c8 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -9,4 +9,4 @@ TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
-$(eval $(call AUTOTARGETS,package,tslib))
+$(eval $(call AUTOTARGETS))
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 567bbfb295..78c243f23f 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -33,4 +33,4 @@ endef
 
 UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS,package,udev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index 8672dd599c..212609fe92 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -26,4 +26,4 @@ ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y)
 UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_RECEIVER
 endif
 
-$(eval $(call AUTOTARGETS,package,udpcast))
+$(eval $(call AUTOTARGETS))
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 7b5e47b31f..7da8eda972 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -45,4 +45,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_DEVFILES
 endif
 
-$(eval $(call AUTOTARGETS,package,usbutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 49c528aeae..b77e326f07 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -67,7 +67,7 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
 
-$(eval $(call AUTOTARGETS,package,util-linux))
+$(eval $(call AUTOTARGETS))
 
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
 # one, so it disappears
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 551aecf4dc..537639f658 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -26,4 +26,4 @@ endef
 
 VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_INSTALL_UCLIBC_SUPP
 
-$(eval $(call AUTOTARGETS,package,valgrind))
+$(eval $(call AUTOTARGETS))
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 917d1d47c8..f5988d19fd 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -38,4 +38,4 @@ ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS
 endif
 
-$(eval $(call AUTOTARGETS,package,vim))
+$(eval $(call AUTOTARGETS))
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 78ea44f3bb..07334adafc 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -16,4 +16,4 @@ VTUN_CONF_OPT = \
 		--with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \
 		--with-lzo-lib=$(STAGING_DIR)/usr/lib
 
-$(eval $(call AUTOTARGETS,package,vtun))
+$(eval $(call AUTOTARGETS))
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 3a06f433c6..b71103ac4b 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -21,4 +21,4 @@ endif
 
 WEBKIT_CONF_OPT += --disable-video
 
-$(eval $(call AUTOTARGETS,package,webkit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 23c82af4f7..c34a51c42b 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -12,4 +12,4 @@ ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	WGET_DEPENDENCIES += openssl
 endif
 
-$(eval $(call AUTOTARGETS,package,wget))
+$(eval $(call AUTOTARGETS))
diff --git a/package/which/which.mk b/package/which/which.mk
index 3bdfaca505..628711d0d2 100644
--- a/package/which/which.mk
+++ b/package/which/which.mk
@@ -10,4 +10,4 @@ WHICH_AUTORECONF:=NO
 WHICH_INSTALL_STAGING:=NO
 WHICH_INSTALL_TARGET:=YES
 
-$(eval $(call AUTOTARGETS,package,which))
+$(eval $(call AUTOTARGETS))
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 443a358532..4636042b2c 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -107,4 +107,4 @@ define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
 endef
 
-$(eval $(call AUTOTARGETS,package,wpa_supplicant))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index a3c87d1010..249217ccfe 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -21,6 +21,6 @@ HOST_LIBXCB_DEPENDENCIES = \
 	host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp \
 	host-xlib_libXau host-python
 
-$(eval $(call AUTOTARGETS,package/x11r7,libxcb))
-$(eval $(call AUTOTARGETS,package/x11r7,libxcb,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index cb0690dc07..1fc1631de6 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -13,4 +13,4 @@ MESA3D_INSTALL_STAGING = YES
 
 MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat
 
-$(eval $(call AUTOTARGETS,package/x11r7,mesa3d))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index 75980c85d6..25b4433316 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -9,6 +9,6 @@ PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
 
 PTHREAD_STUBS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
-$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index 308634c5a9..faa9937952 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -10,4 +10,4 @@ XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_APPRES_AUTORECONF = NO
 XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_appres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 0350a87412..c2f5896325 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -11,5 +11,5 @@ XAPP_BDFTOPCF_AUTORECONF = NO
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 HOST_XAPP_BDFTOPCF_DEPENDENCIES = host-xlib_libXfont
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index 8c1273f1fa..8d4cb75e32 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -10,4 +10,4 @@ XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BEFORELIGHT_AUTORECONF = NO
 XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_beforelight))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 252507e578..4cca623803 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -10,4 +10,4 @@ XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BITMAP_AUTORECONF = NO
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_bitmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index 54f1b017f7..a2ab2aa500 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -10,4 +10,4 @@ XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_EDITRES_AUTORECONF = NO
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_editres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index 00b64f1086..6c8ebccf74 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -10,4 +10,4 @@ XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FONTTOSFNT_AUTORECONF = NO
 XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_fonttosfnt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index 469fb4c297..737a4308ba 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -10,4 +10,4 @@ XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FSLSFONTS_AUTORECONF = NO
 XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_fslsfonts))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index 052b572fda..e555179a2b 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -10,4 +10,4 @@ XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FSTOBDF_AUTORECONF = NO
 XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_fstobdf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 3b9e373e7d..19c429730c 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -10,4 +10,4 @@ XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICEAUTH_AUTORECONF = NO
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_iceauth))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 9edeacb16b..41031f5ba2 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -10,4 +10,4 @@ XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICO_AUTORECONF = NO
 XAPP_ICO_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_ico))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index f856d7c0cf..b86d181dfb 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -10,4 +10,4 @@ XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LISTRES_AUTORECONF = NO
 XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_listres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index dc53e050a5..ec7d894870 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -10,4 +10,4 @@ XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LUIT_AUTORECONF = NO
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_luit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 443b44f34b..ece5dd332e 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -11,5 +11,5 @@ XAPP_MKFONTDIR_AUTORECONF = NO
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index beec9f1c88..1c460d65a7 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -11,5 +11,5 @@ XAPP_MKFONTSCALE_AUTORECONF = NO
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
 HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index d3f09c0fec..00bb64451d 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -10,4 +10,4 @@ XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_OCLOCK_AUTORECONF = NO
 XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_oclock))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 95ee70bbf9..e8c89fe16f 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -10,4 +10,4 @@ XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RGB_AUTORECONF = NO
 XAPP_RGB_DEPENDENCIES = xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_rgb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index aa37f29a52..e5fb08408c 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -10,4 +10,4 @@ XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RSTART_AUTORECONF = NO
 XAPP_RSTART_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_rstart))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index 00fb6956aa..a2a050cf2f 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -10,4 +10,4 @@ XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SCRIPTS_AUTORECONF = NO
 XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_scripts))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 699537d70c..b207f2c479 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -10,4 +10,4 @@ XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SESSREG_AUTORECONF = NO
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_sessreg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index 7c9d0f823d..e5be0779f5 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -10,4 +10,4 @@ XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SETXKBMAP_AUTORECONF = NO
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_setxkbmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index 21273e401f..a5ff670c72 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -10,4 +10,4 @@ XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SHOWFONT_AUTORECONF = NO
 XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_showfont))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index fa2acb3b5b..d1e79aee77 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -10,4 +10,4 @@ XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SMPROXY_AUTORECONF = NO
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_smproxy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index bc35293e44..7e633539a2 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -10,4 +10,4 @@ XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_TWM_AUTORECONF = NO
 XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_twm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index a2cd1ea691..7396d93210 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -10,4 +10,4 @@ XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_VIEWRES_AUTORECONF = NO
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_viewres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index ac8cd7a61f..b08dfc9ce2 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -10,4 +10,4 @@ XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_X11PERF_AUTORECONF = NO
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_x11perf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index c0ab92d08a..a2212666a2 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -10,4 +10,4 @@ XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XAUTH_AUTORECONF = NO
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xauth))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 9da0c65a67..f5afa5ca73 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -10,4 +10,4 @@ XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBACKLIGHT_AUTORECONF = NO
 XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbacklight))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index 6959398253..38627940e1 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -10,4 +10,4 @@ XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBIFF_AUTORECONF = NO
 XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbiff))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index e3ef39c56d..a6f0fc1e10 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -11,4 +11,4 @@ XAPP_XCALC_AUTORECONF = NO
 XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcalc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 9cfeddd258..a7ff739034 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -10,4 +10,4 @@ XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLIPBOARD_AUTORECONF = NO
 XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xclipboard))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 56b22fca67..96fad9109c 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -10,4 +10,4 @@ XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLOCK_AUTORECONF = NO
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xclock))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 06af50de75..11b17f59d8 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -10,4 +10,4 @@ XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCMSDB_AUTORECONF = NO
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcmsdb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 746564ffd9..55ddcdc0bc 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -10,4 +10,4 @@ XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_AUTORECONF = NO
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcursorgen))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 9f8135798b..aa57f7cc51 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -10,4 +10,4 @@ XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDBEDIZZY_AUTORECONF = NO
 XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdbedizzy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 9d69d81bd9..5241e43ff9 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -10,4 +10,4 @@ XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDITVIEW_AUTORECONF = NO
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xditview))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index e05ffc8adf..8d17d5ca64 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -11,4 +11,4 @@ XAPP_XDM_AUTORECONF = NO
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 36cc0679b5..663c1e1756 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -10,4 +10,4 @@ XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDPYINFO_AUTORECONF = NO
 XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdpyinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index ce4716dca5..3be1fb156e 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -10,4 +10,4 @@ XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDRIINFO_AUTORECONF = NO
 XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdriinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index 888d54ec4b..72f2f7b42b 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -10,4 +10,4 @@ XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEDIT_AUTORECONF = NO
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xedit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 19be2c166f..3662c2356a 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -10,4 +10,4 @@ XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEV_AUTORECONF = NO
 XAPP_XEV_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 74358d543b..270ad6c324 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -10,4 +10,4 @@ XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEYES_AUTORECONF = NO
 XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xeyes))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index da141ae4f6..fb78f1ac89 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -10,4 +10,4 @@ XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XF86DGA_AUTORECONF = NO
 XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xf86dga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 622dafd9a4..f132c60047 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -10,4 +10,4 @@ XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFD_AUTORECONF = NO
 XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index 2b271605df..b1c39b8b23 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -10,4 +10,4 @@ XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFONTSEL_AUTORECONF = NO
 XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfontsel))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index 2398d6b1cb..b01c756867 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -10,4 +10,4 @@ XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFS_AUTORECONF = NO
 XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfs))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index 1ea7306416..c0fb6008db 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -10,4 +10,4 @@ XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFSINFO_AUTORECONF = NO
 XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfsinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 2bdaa27377..2505306113 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -10,4 +10,4 @@ XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGAMMA_AUTORECONF = NO
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xgamma))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index 9e642e2d1a..f9de6418b5 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -10,4 +10,4 @@ XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGC_AUTORECONF = NO
 XAPP_XGC_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xgc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index fd8153750a..f5cdc5cdc4 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -10,4 +10,4 @@ XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XHOST_AUTORECONF = NO
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xhost))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index 52105c2e65..48637f2267 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -9,4 +9,4 @@ XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 423c7c2f0b..38c45cbff5 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -10,4 +10,4 @@ XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINPUT_AUTORECONF = NO
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index e9f7174a87..04a558e033 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -11,5 +11,5 @@ XAPP_XKBCOMP_AUTORECONF = NO
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 48d65656fa..efd3c374ad 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -10,4 +10,4 @@ XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBEVD_AUTORECONF = NO
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbevd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index ec96c94487..214ccc10c8 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -10,4 +10,4 @@ XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBPRINT_AUTORECONF = NO
 XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbprint))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 07a34f4681..7daca60bee 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -10,4 +10,4 @@ XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBUTILS_AUTORECONF = NO
 XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index 894c552a8b..d9364c5c31 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -10,4 +10,4 @@ XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKILL_AUTORECONF = NO
 XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkill))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index e1ae662d61..9130096060 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -10,4 +10,4 @@ XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOAD_AUTORECONF = NO
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xload))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index eb35a6dc8b..205703106b 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -11,4 +11,4 @@ XAPP_XLOGO_AUTORECONF = NO
 XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
 			  xlib_libXft host-pkg-config
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlogo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index d202114623..379994d5fb 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -10,4 +10,4 @@ XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSATOMS_AUTORECONF = NO
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsatoms))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index cd522db83f..2374215a47 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -10,4 +10,4 @@ XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSCLIENTS_AUTORECONF = NO
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsclients))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 120669c11e..944c6fcea2 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -10,4 +10,4 @@ XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSFONTS_AUTORECONF = NO
 XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsfonts))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index 518fe484d8..f848601946 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -10,4 +10,4 @@ XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAG_AUTORECONF = NO
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmag))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 8ef0a1fd2c..703d8dcd33 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -15,4 +15,4 @@ XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
 
 XAPP_XMAN_CONF_OPT = --disable-IPv6
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xman))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 9f1aa743ef..4a0ecc8197 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -10,4 +10,4 @@ XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMESSAGE_AUTORECONF = NO
 XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmessage))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 500801b106..ed8276a6bf 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -10,4 +10,4 @@ XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMH_AUTORECONF = NO
 XAPP_XMH_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmh))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index df4280b125..d498d98ba9 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -10,4 +10,4 @@ XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMODMAP_AUTORECONF = NO
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmodmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index 0b68e71963..ecbdbafce3 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -10,4 +10,4 @@ XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMORE_AUTORECONF = NO
 XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmore))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
index e16733bf00..b39e4b5f75 100644
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -10,4 +10,4 @@ XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPLSPRINTERS_AUTORECONF = NO
 XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xplsprinters))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 257d10b14d..871d711e3c 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -10,4 +10,4 @@ XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPR_AUTORECONF = NO
 XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xpr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
index e9f8f43001..00c429cfcd 100644
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -10,4 +10,4 @@ XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/
 XAPP_XPREHASHPRINTERLIST_AUTORECONF = NO
 XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xprehashprinterlist))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 7bcd1f00b7..5b315064ab 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -10,4 +10,4 @@ XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPROP_AUTORECONF = NO
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xprop))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 70c7e1a2d2..254feadcb6 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -11,4 +11,4 @@ XAPP_XRANDR_AUTORECONF = NO
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
 XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrandr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index c7b24b5f74..425cef43aa 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -10,4 +10,4 @@ XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRDB_AUTORECONF = NO
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrdb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index 9a9022c423..d6d04d68c2 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -10,4 +10,4 @@ XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XREFRESH_AUTORECONF = NO
 XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrefresh))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 51ddd98c18..fcd8df06db 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -10,4 +10,4 @@ XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSET_AUTORECONF = NO
 XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xset))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 23db1f93e4..650afb041d 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -10,4 +10,4 @@ XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETMODE_AUTORECONF = NO
 XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetmode))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 7c65bc716e..5f9ef251b8 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -10,4 +10,4 @@ XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETPOINTER_AUTORECONF = NO
 XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetpointer))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 523c89a842..0f797a33ed 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -10,4 +10,4 @@ XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETROOT_AUTORECONF = NO
 XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetroot))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index 76cc07b118..30175524b1 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -10,4 +10,4 @@ XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSM_AUTORECONF = NO
 XAPP_XSM_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index 6137974932..b0b996065f 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -10,4 +10,4 @@ XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSTDCMAP_AUTORECONF = NO
 XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xstdcmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 039da1883e..e89dc5d95e 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -10,4 +10,4 @@ XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVIDTUNE_AUTORECONF = NO
 XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xvidtune))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index 59d8ad3f44..9541c2d072 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -10,4 +10,4 @@ XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVINFO_AUTORECONF = NO
 XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xvinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index bdd6182d65..3a966276d4 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -10,4 +10,4 @@ XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWD_AUTORECONF = NO
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index 36f11f779a..7c7012cd74 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -10,4 +10,4 @@ XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWININFO_AUTORECONF = NO
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwininfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index 0640f78eed..97ecf0f2cc 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -10,4 +10,4 @@ XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWUD_AUTORECONF = NO
 XAPP_XWUD_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwud))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 47a38cb671..3479a23b47 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -11,6 +11,6 @@ XCB_PROTO_INSTALL_STAGING = YES
 
 XCB_PROTO_DEPENDENCIES = host-python
 
-$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto))
-$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index 2983280dce..0158c9f095 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -8,5 +8,5 @@ XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
 XCB_UTIL_DEPENDENCIES = host-gperf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xcb-util))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index c1bb3010ac..e400934066 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -11,4 +11,4 @@ XDATA_XBITMAPS_AUTORECONF = NO
 XDATA_XBITMAPS_INSTALL_STAGING = YES
 XDATA_XBITMAPS_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdata_xbitmaps))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index da928f4fda..fe5c0dadc7 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -11,4 +11,4 @@ XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
 XDATA_XCURSOR_THEMES_INSTALL_TARGET = YES
 XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdata_xcursor-themes))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
index d6f958cbdb..2b9acfb54d 100644
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = NO
 XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-acecad))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index aa93fdc497..6b92700e88 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = NO
 XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-aiptek))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index bb5a1d7289..0195876547 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = NO
 XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-evdev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index f6d561957a..dbd1bdead6 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individu
 XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = NO
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-joystick))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index 15b07155a6..b28843dfab 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individu
 XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = NO
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-keyboard))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 6be28c7d1e..5be5cb969d 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = NO
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-mouse))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 4cb16ea0f4..129f2120bb 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individ
 XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-synaptics))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 3526236608..20328b217d 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individua
 XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = NO
 XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-vmmouse))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index fb16bb7fea..c92af152f0 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_INPUT_VOID_AUTORECONF = NO
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-void))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index c0f4b82e4d..162e9b3656 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_APM_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-apm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 744270644b..2976ae4a18 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_ARK_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ark))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index daa94bbd88..c77c7acce2 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION)
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_AST_AUTORECONF = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ast))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 8a5a1d0b3d..a357cf21c5 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index 0dc5dd108c..532fda138f 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-chips))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 47c3c9ba88..64548d3030 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-cirrus))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 2121748587..4a4ce7a336 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-dummy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 97c20fa53f..6964a358e4 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-fbdev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index cd94246f5c..8284d048e4 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_GEODE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-geode))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 0115cec959..122837bf16 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_GLIDE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glide))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 5d50da1f3f..2ff7669529 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 63c9ad7e10..96628cf85c 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i128))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
index 493fd348ec..2b137d72ac 100644
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_I740_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i740))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 83d0a4419b..a24a24170a 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -11,4 +11,4 @@ XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = --enable-dri
 XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 5b727691b0..063608545a 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mach64))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 033a32c9f4..64bae465ad 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index db9c2c0cd7..759d5b2521 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individu
 XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-neomagic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index b9bf3e7911..f532f2e9bf 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individua
 XDRIVER_XF86_VIDEO_NEWPORT_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-newport))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index 9f969e5915..50080f982c 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/dri
 XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-nv))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 19d67cc6ae..c16655932d 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -24,4 +24,4 @@ XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
 
 XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-openchrome))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index 0e74607a15..8430d73a30 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-r128))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index dc03a877fd..9684f41194 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individ
 XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-rendition))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
index d6f732718e..f9c6f08fc1 100644
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/dri
 XDRIVER_XF86_VIDEO_S3_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-s3))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
index 9c7b2c26ed..08c527d503 100644
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individua
 XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-s3virge))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 44707366ae..32ef7f58bf 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-savage))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 97e416a596..8b52933f8d 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/ind
 XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-siliconmotion))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 0fb335c915..8343761451 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index 3cd6012bed..aaf86f2325 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sisusb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
index 6a0fb0494b..7e9e1c7400 100644
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individua
 XDRIVER_XF86_VIDEO_SUNCG14_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg14))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
index 7ba7ecd921..939d4dee64 100644
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SUNCG3_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg3))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
index 7234e98321..f5e1a7b302 100644
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SUNCG6_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg6))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
index 7c6019b6db..0e365d8381 100644
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunffb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
index 38af6d0f31..81dc5f5abe 100644
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunleo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
index b26d659b77..4c1f35a648 100644
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SUNTCX_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suntcx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index c11e40806e..dd2643a9f3 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tdfx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index 68e58fbe4c..c6c55d6078 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_TGA_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index da3edbbec1..4a722b8c4f 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individua
 XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-trident))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index 6ad802378d..21cb2dbc19 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tseng))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index dffcf13e0b..2e265b7a3a 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_V4L_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-v4l))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index 5d0ed12ad6..bc4c38edc6 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vesa))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index a92bc3b487..255bde1bd7 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vmware))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index dadd3f4b98..8fc7fa4be8 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-voodoo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index e71715a7e9..da7a5c6c95 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_WSFB_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-wsfb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
index 49fb8b0af9..837c9dd2dc 100644
--- a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
+++ b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_XGI_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_XGI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_XGI_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-xgi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
index c55390ac2c..a3edd207d8 100644
--- a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
+++ b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_XGIXP_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_XGIXP_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_XGIXP_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-xgixp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index ed94e49bd3..3bf7bc0717 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -12,5 +12,5 @@ XFONT_ENCODINGS_MAKE_OPT =
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 HOST_XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings))
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 2b9c50c246..9a7503c47b 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-100dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index 2d7791a51d..82ae78b36a 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-75dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index 2ed27f4951..fad8dcde37 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFO
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-100dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index ead419635d..e6bd35f47a 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFON
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-75dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 983bab6dbd..bb553ee8e3 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFON
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-type1))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 1e85f3ed6d..29cb3698af 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST
 XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-alias))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index 5a1253a6f2..5d20d571bc 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-arabic-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index f2f796a3ad..8003d2bc63 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-100dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 4d08be40ba..42369230bf 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-75dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index a7897c261b..dafc4eb6cf 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DI
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-lucidatypewriter-100dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 04a3246243..6812fc7a4a 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-lucidatypewriter-75dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index ea2c82a26c..13c8c4d2b5 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-ttf))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 3f5a025d01..b4b612fb91 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-type1))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index a89db53e3a..2fb3b3cb8f 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-100dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index ea2fd41eb9..b815f7c791 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-75dpi))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
index f867c7ebb3..19d4107838 100644
--- a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
+++ b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_SPEEDO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-speedo))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 75a60de155..df1bc9735c 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-type1))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 484bf4b8ff..919738a422 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-cronyx-cyrillic))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 755f6ec70b..05a5262045 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-cursor-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index c66bbbbc35..d6514f3159 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-daewoo-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index 9c510a1d59..00dc6767ba 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-dec-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 075f4baccc..f03eb4f648 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-ibm-type1))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 5635ff6f2d..db66a74561 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-isas-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 4f1a74ed3e..3f00e32e4f 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-jis-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 0b1f35cd93..73672871b8 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-micro-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index 3ae408d021..a537b37b05 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-cyrillic))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index e0937813f7..f7ffcf6bb2 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-ethiopic))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index e04f01d9d4..3f5d5365ce 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-meltho))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index f6a5564938..8e28f9c9e6 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -12,5 +12,4 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-misc))
-
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 28995ef7b9..494c1cc50d 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-mutt-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 86dc54be48..37f0b70e28 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-schumacher-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index d0db502f2c..ecb2d805f3 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-screen-cyrillic))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 7fc9cbfba6..75d5baa8aa 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-sony-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 9364e4a38d..8419842b95 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-sun-misc))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 82b66a5d0c..680fdc7cbd 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -13,5 +13,5 @@ XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
 HOST_XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 377f281df9..66eac4e33d 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONT
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-winitzki-cyrillic))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 6e3e564695..7d3d8cace7 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-xfree86-type1))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index f5ad44d7fb..955c5233f2 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -13,5 +13,5 @@ XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
 
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
-$(eval $(call AUTOTARGETS,package/x11r7,xkeyboard-config))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index f121f246ea..75281027de 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -12,4 +12,4 @@ XLIB_LIBFS_INSTALL_STAGING = YES
 XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
 XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libFS))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 168f899f22..338d74bec2 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -11,4 +11,4 @@ XLIB_LIBICE_AUTORECONF = NO
 XLIB_LIBICE_INSTALL_STAGING = YES
 XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libICE))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index e22c04b5a0..0b92f9368f 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -12,4 +12,4 @@ XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libSM))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 95b1483508..e017feabce 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -39,5 +39,5 @@ endef
 
 XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 4b60fdc50e..479cd35aa7 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -12,4 +12,4 @@ XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
 XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
 XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXScrnSaver))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 2b008e9c25..2404a3e408 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -13,5 +13,5 @@ XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 
 HOST_XLIB_LIBXAU_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index d06ff6ed9a..1142c76173 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -11,4 +11,4 @@ XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
 XLIB_LIBXAW_CONF_OPT = --disable-docs
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXaw))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index e1a1852a56..9a5a33ab22 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -11,4 +11,4 @@ XLIB_LIBXCOMPOSITE_AUTORECONF = NO
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
 XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcomposite))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index a6bbcc8754..ffe1b4d592 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -11,4 +11,4 @@ XLIB_LIBXCURSOR_AUTORECONF = NO
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcursor))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 3240355932..c2ba616ce3 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -11,4 +11,4 @@ XLIB_LIBXDAMAGE_AUTORECONF = NO
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
 XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdamage))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 8d03fc8aef..1aec4de64d 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -13,5 +13,5 @@ XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
 HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 6b60042e2f..c97a9a5cac 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -12,4 +12,4 @@ XLIB_LIBXEXT_INSTALL_STAGING = YES
 XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXext))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 2d07d69570..2450bcec8b 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFIXES_AUTORECONF = NO
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfixes))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index b30a88c06a..303992fcc8 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -15,5 +15,5 @@ XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 HOST_XLIB_LIBXFONT_DEPENDENCIES = host-freetype host-xlib_libfontenc host-xlib_xtrans host-xproto_fontcacheproto host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index bf64a4dbde..d90a962411 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -12,4 +12,4 @@ XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
 XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
 XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfontcache))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 942b9a62a1..44ddcbe6d9 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXft))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index 3cca1e6b3c..d6ce633e9c 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -12,4 +12,4 @@ XLIB_LIBXI_INSTALL_STAGING = YES
 XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
 XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index fe7c5ede7a..0b8262232e 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -12,4 +12,4 @@ XLIB_LIBXINERAMA_INSTALL_STAGING = YES
 XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
 XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXinerama))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index c1c9503e6f..ceebc149e8 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -11,4 +11,4 @@ XLIB_LIBXMU_AUTORECONF = NO
 XLIB_LIBXMU_INSTALL_STAGING = YES
 XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXmu))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index f030082e2a..bc8bfcd4f1 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -12,4 +12,4 @@ XLIB_LIBXP_INSTALL_STAGING = YES
 XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
 XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 459a299381..ef67b6dde6 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -11,4 +11,4 @@ XLIB_LIBXPM_AUTORECONF = NO
 XLIB_LIBXPM_INSTALL_STAGING = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXpm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index f98059497a..c9b2924fd4 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -11,4 +11,4 @@ XLIB_LIBXPRINTAPPUTIL_AUTORECONF = NO
 XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintAppUtil))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index ed801ff389..cf6ec1efd6 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -11,4 +11,4 @@ XLIB_LIBXPRINTUTIL_AUTORECONF = NO
 XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintUtil))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 20b61d1119..96e71ea06f 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRANDR_INSTALL_STAGING = YES
 XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
 XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrandr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 1148a6cbd7..36495034dc 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrender))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 51451a08f8..cf7fc10d84 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRES_INSTALL_STAGING = YES
 XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
 XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 41bf26d6f1..765f0d55cd 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -12,4 +12,4 @@ XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
 XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index dd1cfd01ac..feab32a528 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -15,4 +15,4 @@ XLIB_LIBXTST_DEPENDENCIES = \
 	xlib_libXi \
 	xproto_recordproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXtst))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index c827938a18..fed9ce49a7 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -12,4 +12,4 @@ XLIB_LIBXV_INSTALL_STAGING = YES
 XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
 XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXv))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index e2a5aed3e9..6a99b9b3dd 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -12,4 +12,4 @@ XLIB_LIBXVMC_INSTALL_STAGING = YES
 XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
 XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXvMC))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index 2a8ef9fbe2..acfd08a958 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
 XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
 XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86dga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index a73ba6b55b..c80d5b3077 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86VM_INSTALL_STAGING = YES
 XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
 XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86vm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 073005ca18..3de2537cfb 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -12,4 +12,4 @@ XLIB_LIBDMX_INSTALL_STAGING = YES
 XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
 XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libdmx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index c2ce11f105..20cfc8dbb9 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -13,5 +13,5 @@ XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
 HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 94a38fabef..0d576ef8f8 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -12,4 +12,4 @@ XLIB_LIBOLDX_INSTALL_STAGING = YES
 XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
 XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_liboldX))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 5929a62fd6..6c78225123 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -9,4 +9,4 @@ XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 96420c3a37..35b61715a6 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -13,5 +13,5 @@ XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
 HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index 8253ac59d8..c822a4d2d8 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -11,4 +11,4 @@ XLIB_LIBXKBUI_AUTORECONF = NO
 XLIB_LIBXKBUI_INSTALL_STAGING = YES
 XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbui))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index aaf2208366..62fb51d5a5 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -10,5 +10,5 @@ XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_AUTORECONF = NO
 XLIB_XTRANS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_xtrans))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_xtrans,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index 189c24f735..2d7b5d1f50 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -11,4 +11,4 @@ XPROTO_APPLEWMPROTO_AUTORECONF = NO
 XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
 XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_applewmproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index 7ae7795b32..bb4af54fdc 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -11,4 +11,4 @@ XPROTO_BIGREQSPROTO_AUTORECONF = NO
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
 XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_bigreqsproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index b176b69843..e5a34c0cf8 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -11,4 +11,4 @@ XPROTO_COMPOSITEPROTO_AUTORECONF = NO
 XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
 XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_compositeproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index a2f8c715ea..5eb25fd533 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -11,4 +11,4 @@ XPROTO_DAMAGEPROTO_AUTORECONF = NO
 XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
 XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_damageproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index ff31e7e7e5..0fcf00d193 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -11,4 +11,4 @@ XPROTO_DMXPROTO_AUTORECONF = NO
 XPROTO_DMXPROTO_INSTALL_STAGING = YES
 XPROTO_DMXPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_dmxproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index f3b37c909a..a441c9bc8f 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -11,4 +11,4 @@ XPROTO_DRI2PROTO_AUTORECONF = NO
 XPROTO_DRI2PROTO_INSTALL_STAGING = YES
 XPROTO_DRI2PROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_dri2proto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index 1395e0c985..d569de85b4 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -11,4 +11,4 @@ XPROTO_FIXESPROTO_AUTORECONF = NO
 XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fixesproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 40917cd804..fec4e87a90 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -11,5 +11,5 @@ XPROTO_FONTCACHEPROTO_AUTORECONF = NO
 XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
 XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontcacheproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontcacheproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 5e2a64a600..d947009b4d 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -11,5 +11,5 @@ XPROTO_FONTSPROTO_AUTORECONF = NO
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES
 XPROTO_FONTSPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontsproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontsproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index 98c6b2fa0e..7bdf057e40 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -11,4 +11,4 @@ XPROTO_GLPROTO_AUTORECONF = NO
 XPROTO_GLPROTO_INSTALL_STAGING = YES
 XPROTO_GLPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_glproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 825ebed4c4..d8fa543124 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -11,5 +11,5 @@ XPROTO_INPUTPROTO_AUTORECONF = NO
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index ecdabf127d..9b30fbb881 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -11,5 +11,5 @@ XPROTO_KBPROTO_AUTORECONF = NO
 XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
index c06c5c3800..82ba8218f6 100644
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -11,4 +11,4 @@ XPROTO_PRINTPROTO_AUTORECONF = NO
 XPROTO_PRINTPROTO_INSTALL_STAGING = YES
 XPROTO_PRINTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_printproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index e6befea457..cfbb213460 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -11,4 +11,4 @@ XPROTO_RANDRPROTO_AUTORECONF = NO
 XPROTO_RANDRPROTO_INSTALL_STAGING = YES
 XPROTO_RANDRPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_randrproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 83178bd5c7..4c35605237 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -11,4 +11,4 @@ XPROTO_RECORDPROTO_AUTORECONF = NO
 XPROTO_RECORDPROTO_INSTALL_STAGING = YES
 XPROTO_RECORDPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_recordproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index 1763efdf69..796051741a 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -11,4 +11,4 @@ XPROTO_RENDERPROTO_AUTORECONF = NO
 XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_renderproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index c5e0d47337..081297873a 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -11,4 +11,4 @@ XPROTO_RESOURCEPROTO_AUTORECONF = NO
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
 XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_resourceproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index f7f53e6d78..2705a3ae75 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -11,4 +11,4 @@ XPROTO_SCRNSAVERPROTO_AUTORECONF = NO
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
 XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_scrnsaverproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 3b98370892..4dafe3b89d 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -11,4 +11,4 @@ XPROTO_VIDEOPROTO_AUTORECONF = NO
 XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
 XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_videoproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index 827d7975f6..bf0b59b247 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -11,4 +11,4 @@ XPROTO_WINDOWSWMPROTO_AUTORECONF = NO
 XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
 XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_windowswmproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 1846f20043..59f2592421 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -11,5 +11,5 @@ XPROTO_XCMISCPROTO_AUTORECONF = NO
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 1fd39c91d6..0a61fb23eb 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -11,5 +11,5 @@ XPROTO_XEXTPROTO_AUTORECONF = NO
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index 1872873b56..d7524e625e 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -11,5 +11,5 @@ XPROTO_XF86BIGFONTPROTO_AUTORECONF = NO
 XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index d654a1c4b5..41fcfed281 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86DGAPROTO_AUTORECONF = NO
 XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86dgaproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 4c37fa12c9..c8ec7fc00e 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86DRIPROTO_AUTORECONF = NO
 XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86driproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
index 032b839dac..d4145ecec1 100644
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86RUSHPROTO_AUTORECONF = NO
 XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
 XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86rushproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index c3f3fe5926..0910867dfe 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86VIDMODEPROTO_AUTORECONF = NO
 XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
 XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86vidmodeproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index bca3c8fd65..a73ded9e47 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -11,4 +11,4 @@ XPROTO_XINERAMAPROTO_AUTORECONF = NO
 XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
 XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xineramaproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index c1e24495fd..65510e93ed 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -11,5 +11,5 @@ XPROTO_XPROTO_AUTORECONF = NO
 XPROTO_XPROTO_INSTALL_STAGING = YES
 XPROTO_XPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 70ba8b20fd..54f98b784d 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -153,4 +153,4 @@ else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
 endif
 
-$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 660323de91..657a2fce1a 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -13,5 +13,5 @@ XUTIL_MAKEDEPEND_INSTALL_TARGET = YES
 
 HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto_xproto
 
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend))
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index b600a46942..8bb7f8f13c 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -11,5 +11,5 @@ XUTIL_UTIL_MACROS_AUTORECONF = NO
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros))
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 9e1db05a50..b423f46dee 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -14,4 +14,4 @@ X11VNC_CONF_OPT = \
 
 X11VNC_DEPENDENCIES = xserver_xorg-server xlib_libXt
 
-$(eval $(call AUTOTARGETS,package,x11vnc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index d2306c4449..f79557999b 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -124,4 +124,4 @@ endef
 
 XENOMAI_POST_UNINSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UDEV_RULES
 
-$(eval $(call AUTOTARGETS,package,xenomai))
+$(eval $(call AUTOTARGETS))
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 305fee336e..2a8817cf67 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -23,4 +23,4 @@ else
 XERCES_CONF_OPT += --disable-network
 endif
 
-$(eval $(call AUTOTARGETS,package,xerces))
+$(eval $(call AUTOTARGETS))
diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index d7613f8085..bb42f5de6d 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -18,4 +18,4 @@ XMLSTARLET_CONF_OPT += --disable-static-libs \
 	--with-libxslt-prefix=${STAGING_DIR}/usr \
 	--with-libiconv-prefix=${STAGING_DIR}/usr
 
-$(eval $(call AUTOTARGETS,package,xmlstarlet))
+$(eval $(call AUTOTARGETS))
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index f6795b5a2a..16b45d758a 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -9,5 +9,5 @@ XSTROKE_SITE = http://avr32linux.org/twiki/pub/Main/XStroke
 
 XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm
 
-$(eval $(call AUTOTARGETS,package,xstroke))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index 92ddd1e735..fa362284cc 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -10,4 +10,4 @@ XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw
 XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-$(eval $(call AUTOTARGETS,package,xterm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index fc66554a10..9d7d506e2d 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -15,5 +15,5 @@ XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
 
 XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw xlib_libXtst
 
-$(eval $(call AUTOTARGETS,package,xvkbd))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index ed4734b964..8f2e0f1d83 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -9,5 +9,5 @@ XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
-$(eval $(call AUTOTARGETS,package,xz))
-$(eval $(call AUTOTARGETS,package,xz,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 9e4aeb3c2b92435f406ff165965475ba774705d0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:44 +0200
Subject: [PATCH 0730/6849] package: remove useless arguments from CMAKETARGETS

Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.cmake.in                   | 10 ++++------
 package/cdrkit/cdrkit.mk                    |  4 ++--
 package/multimedia/libcuefile/libcuefile.mk |  2 +-
 package/multimedia/musepack/musepack.mk     |  2 +-
 package/multimedia/taglib/taglib.mk         |  2 +-
 package/yajl/yajl.mk                        |  2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in
index 1263eb993a..38e459b80c 100644
--- a/package/Makefile.cmake.in
+++ b/package/Makefile.cmake.in
@@ -183,15 +183,13 @@ endef
 ################################################################################
 # CMAKETARGETS -- the target generator macro for CMake packages
 #
-# Argument 1 is the package directory prefix [mandatory]
-# Argument 2 is the lowercase package name   [mandatory]
-# Argument 3 is "target" or "host"           [optional, default: "target"]
+# Argument 1 is "target" or "host"           [optional, default: "target"]
 ################################################################################
 
 define CMAKETARGETS
-ifeq ($(3),host)
-$(call CMAKETARGETS_INNER,$(3)-$(2),$(call UPPERCASE,$(3)-$(2)),$(call UPPERCASE,$(2)),$(1),host)
+ifeq ($(1),host)
+$(call CMAKETARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 else
-$(call CMAKETARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(call UPPERCASE,$(2)),$(1),target)
+$(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
 endif
 endef
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index a57a8fd112..9eebe6e075 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -20,5 +20,5 @@ CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)"
 HOST_CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(HOST_DIR)/usr/include"
 HOST_CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
 
-$(eval $(call CMAKETARGETS,package,cdrkit))
-$(eval $(call CMAKETARGETS,package,cdrkit,host))
+$(eval $(call CMAKETARGETS))
+$(eval $(call CMAKETARGETS,host))
diff --git a/package/multimedia/libcuefile/libcuefile.mk b/package/multimedia/libcuefile/libcuefile.mk
index 765c5a2e31..7e1c8430ed 100644
--- a/package/multimedia/libcuefile/libcuefile.mk
+++ b/package/multimedia/libcuefile/libcuefile.mk
@@ -20,4 +20,4 @@ endef
 LIBCUEFILE_POST_INSTALL_STAGING_HOOKS += LIBCUEFILE_INSTALL_STAGING_INCLUDES
 LIBCUEFILE_POST_INSTALL_TARGET_HOOKS += LIBCUEFILE_INSTALL_TARGET_INCLUDES
 
-$(eval $(call CMAKETARGETS,package/multimedia,libcuefile))
+$(eval $(call CMAKETARGETS))
diff --git a/package/multimedia/musepack/musepack.mk b/package/multimedia/musepack/musepack.mk
index 1e5ebcfe84..ac3660f6f4 100644
--- a/package/multimedia/musepack/musepack.mk
+++ b/package/multimedia/musepack/musepack.mk
@@ -11,4 +11,4 @@ MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
 MUSEPACK_INSTALL_STAGING = YES
 MUSEPACK_MAKE = $(MAKE1)
 
-$(eval $(call CMAKETARGETS,package/multimedia,musepack))
+$(eval $(call CMAKETARGETS))
diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk
index b48e3d2423..ce6adeb90f 100644
--- a/package/multimedia/taglib/taglib.mk
+++ b/package/multimedia/taglib/taglib.mk
@@ -24,4 +24,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
 endif
 
-$(eval $(call CMAKETARGETS,package/multimedia,taglib))
+$(eval $(call CMAKETARGETS))
diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk
index e67a7dadfe..723cce4a98 100644
--- a/package/yajl/yajl.mk
+++ b/package/yajl/yajl.mk
@@ -8,4 +8,4 @@ YAJL_VERSION = 2.0.2
 YAJL_SITE = git://github.com/lloyd/yajl.git
 YAJL_INSTALL_STAGING = YES
 
-$(eval $(call CMAKETARGETS,package,yajl))
+$(eval $(call CMAKETARGETS))

From 2690e76aa2adb4475c85405dd49c7697cc64ea9d Mon Sep 17 00:00:00 2001
From: David Wagner <david.wagner@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:46 +0200
Subject: [PATCH 0731/6849] Add support for local packages through 'file://'
 pseudo-protocol

This can be used this way :

<pkg>_VERSION = 42
<pkg>_SITE = file:///some/local/directory
<pkg>_SOURCE = mypkg-$(<pkg>_VERSION).tar.bz2

Can be useful to integrate a home-made project or for testing purposes.
The default command to retrieve files is 'cp' but 'rsync' could also be used.
Through sshfs, it should also be possible to get non-public remote files on a
ssh server.

[ Thomas Petazzoni: use $(PKG)_SITE and $(PKG)_SOURCE variables
  instead of $(1) and $(2) ]
[ Peter: don't append $(QUIET), cp doesn't handle -q]
Signed-off-by: David Wagner <david.wagner@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                   |  4 ++++
 package/Makefile.package.in | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Config.in b/Config.in
index 3aa3ad8cea..0cf4d497ce 100644
--- a/Config.in
+++ b/Config.in
@@ -32,6 +32,10 @@ config BR2_GIT
 	string "Git command"
 	default "git"
 
+config BR2_LOCALFILES
+	string "Local files retrieval command"
+	default "cp"
+
 config BR2_ZCAT
 	string "zcat command"
 	default "gzip -d -c"
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 069a868920..4fb16e83d9 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -92,6 +92,7 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
 BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
 GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
+LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
 
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
 # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
@@ -104,18 +105,18 @@ DL_DIR:=$(TOPDIR)/dl
 endif
 
 ################################################################################
-# The DOWNLOAD_{GIT,SVN,BZR} helpers are in charge of getting a
+# The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a
 # working copy of the source repository for their corresponding SCM,
 # checking out the requested version / commit / tag, and create an
 # archive out of it. DOWNLOAD_WGET is the normal wget-based download
 # mechanism.
 #
-# The SOURCE_CHECK_{GIT,SVN,BZR,WGET} helpers are in charge of simply
+# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES} helpers are in charge of simply
 # checking that the source is available for download. This can be used
 # to make sure one will be able to get all the sources needed for
 # one's build configuration.
 #
-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET} helpers simply output to
+# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES} helpers simply output to
 # the console the names of the files that will be downloaded, or path
 # and revision of the source repositories, producing a list of all the
 # "external dependencies" of a given build configuration.
@@ -189,6 +190,19 @@ define SHOW_EXTERNAL_DEPS_WGET
   echo $(2)
 endef
 
+define DOWNLOAD_LOCALFILES
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+		$(LOCALFILES) $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE) $(DL_DIR)
+endef
+
+define SOURCE_CHECK_LOCALFILES
+  test -e $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE)
+endef
+
+define SHOW_EXTERNAL_DEPS_LOCALFILES
+  echo $($(PKG)_SITE)/$($(PKG)_SOURCE)
+endef
+
 ################################################################################
 # DOWNLOAD -- Download helper. Will try to download source from:
 # 1) BR2_PRIMARY_SITE if enabled
@@ -211,6 +225,7 @@ define DOWNLOAD
 			git) $($(DL_MODE)_GIT) && exit ;; \
 			svn) $($(DL_MODE)_SVN) && exit ;; \
 			bzr) $($(DL_MODE)_BZR) && exit ;; \
+			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 		esac ; \
 	fi ; \

From 069203887856f85b39aba2d54fbeace6ebb0bbc0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 23:26:09 +0200
Subject: [PATCH 0732/6849] Makefile.package.in: SVN/BZR/GIT: don't append
 $(QUIET)

svn/bzr/git commands don't accept the -q option for quiet operation.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 4fb16e83d9..10212061f9 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -89,9 +89,9 @@ TERM_RESET := $(shell tput rmso)
 
 # Download method commands
 WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
-SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
-BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
-GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
+SVN:=$(call qstrip,$(BR2_SVN))
+BZR:=$(call qstrip,$(BR2_BZR))
+GIT:=$(call qstrip,$(BR2_GIT))
 LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
 
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'

From 44e42c61c44017a273b187ea19a78b60b499823c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:48 +0200
Subject: [PATCH 0733/6849] dhrystone: use the <pkg>_EXTRACT_CMDS mechanism

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhrystone/dhrystone.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/package/dhrystone/dhrystone.mk b/package/dhrystone/dhrystone.mk
index 45eb91c456..098b9f1593 100644
--- a/package/dhrystone/dhrystone.mk
+++ b/package/dhrystone/dhrystone.mk
@@ -8,6 +8,11 @@ DHRYSTONE_VERSION = 2
 DHRYSTONE_SOURCE = dhry-c
 DHRYSTONE_SITE = http://www.netlib.org/benchmark/
 
+define DHRYSTONE_EXTRACT_CMDS
+	(cd $(@D) && $(SHELL) $(DL_DIR)/$($(PKG)_SOURCE))
+	$(Q)cp $($(PKG)_DIR_PREFIX)/dhrystone/Makefile $(@D)/
+endef
+
 define DHRYSTONE_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
@@ -25,10 +30,3 @@ define DHRYSTONE_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-
-$(BUILD_DIR)/dhrystone-$(DHRYSTONE_VERSION)/.stamp_extracted:
-	@$(call MESSAGE,"Extracting")
-	$(Q)mkdir -p $(@D)
-	$(Q)cd $(@D) && $(SHELL) $(DL_DIR)/$($(PKG)_SOURCE)
-	$(Q)cp $($(PKG)_DIR_PREFIX)/dhrystone/Makefile $(@D)/
-	$(Q)touch $@

From 4ad5533832eba4bf386b81d33ecaaf92a4a145fe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:49 +0200
Subject: [PATCH 0734/6849] whetstone: use the <pkg>_EXTRACT_CMDS mechanism

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/whetstone/whetstone.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/package/whetstone/whetstone.mk b/package/whetstone/whetstone.mk
index 48a3adf43c..048f4de6fc 100644
--- a/package/whetstone/whetstone.mk
+++ b/package/whetstone/whetstone.mk
@@ -8,6 +8,10 @@ WHETSTONE_VERSION = 1.2
 WHETSTONE_SOURCE = whetstone.c
 WHETSTONE_SITE = http://www.netlib.org/benchmark/
 
+define WHETSTONE_EXTRACT_CMDS
+	cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
+endef
+
 define WHETSTONE_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) LDLIBS="-lm" -C $(@D) whetstone
 endef
@@ -25,9 +29,3 @@ define WHETSTONE_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-
-$(BUILD_DIR)/whetstone-$(WHETSTONE_VERSION)/.stamp_extracted:
-	@$(call MESSAGE,"Extracting")
-	$(Q)mkdir -p $(@D)
-	$(Q)cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
-	$(Q)touch $@

From 190700ab034670084fd71f80a42a664ade2130a8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:50 +0200
Subject: [PATCH 0735/6849] mcookie: convert to the GENTARGETS infrastructure

[Peter: fix missing newline at eof]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mcookie/mcookie.mk | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk
index 12ef475799..030dd74b29 100644
--- a/package/x11r7/mcookie/mcookie.mk
+++ b/package/x11r7/mcookie/mcookie.mk
@@ -4,17 +4,19 @@
 #
 #############################################################
 
-$(TARGET_DIR)/usr/bin/mcookie: package/x11r7/mcookie/mcookie.c
-	$(TARGET_CC) -Wall -Os -s package/x11r7/mcookie/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie
+# Source included in Buildroot
+MCOOKIE_SOURCE =
 
+define MCOOKIE_EXTRACT_CMDS
+	cp package/x11r7/mcookie/mcookie.c $(@D)/
+endef
 
-mcookie: $(TARGET_DIR)/usr/bin/mcookie
+define MCOOKIE_BUILD_CMDS
+	(cd $(@D); $(TARGET_CC) -Wall -Os -s mcookie.c -o mcookie)
+endef
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MCOOKIE),y)
-TARGETS+=mcookie
-endif
+define MCOOKIE_INSTALL_TARGET_CMDS
+	install -m 0755 -D $(@D)/mcookie $(TARGET_DIR)/usr/bin/mcookie
+endef
+
+$(eval $(call GENTARGETS))

From 9e045df4e12b268417f62f70df4afc1441f8efbf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Sep 2011 23:34:02 +0200
Subject: [PATCH 0736/6849] mcookie: fix Config.in indentation

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mcookie/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/x11r7/mcookie/Config.in b/package/x11r7/mcookie/Config.in
index 1462a7b50f..2e9cfc76ea 100644
--- a/package/x11r7/mcookie/Config.in
+++ b/package/x11r7/mcookie/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MCOOKIE
 	bool "mcookie"
 	help
-		cookie generator for X server
-
-		http://www.x.org
+	  cookie generator for X server
 
+	  http://www.x.org

From 767ad6900a68fe92f4d725ecb1e6dfa248ab53f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Sep 2011 21:57:51 +0200
Subject: [PATCH 0737/6849] package: normalize output of 'make external-deps'

For wget-downloaded packages, only the tarball name was displayed,
while for svn/git/bzr packages, the complete repository URL was
shown. As discussed on the list, what we want for 'make external-deps'
is only the tarball name even for git/svn/bzr downloads.

For local packages, we of course keep the full path since it's the
only information that we can provide.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 10212061f9..353ba72a03 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -141,7 +141,7 @@ define SOURCE_CHECK_GIT
 endef
 
 define SHOW_EXTERNAL_DEPS_GIT
-  echo "$($(PKG)_SITE) [git: $($(PKG)_DL_VERSION)]"
+	echo $($(PKG)_SOURCE)
 endef
 
 
@@ -155,7 +155,7 @@ define SOURCE_CHECK_BZR
 endef
 
 define SHOW_EXTERNAL_DEPS_BZR
-	echo "$($(PKG)_SITE) [bzr: $($(PKG)_DL_VERSION)]"
+	echo $($(PKG)_SOURCE)
 endef
 
 
@@ -173,7 +173,7 @@ define SOURCE_CHECK_SVN
 endef
 
 define SHOW_EXTERNAL_DEPS_SVN
-  echo "$($(PKG)_SITE) [svn: $($(PKG)_DL_VERSION)]"
+  echo $($(PKG)_SOURCE)
 endef
 
 

From 8511728696a298ccdb8b902b60ab398d8f67e745 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 29 Sep 2011 12:42:33 +0200
Subject: [PATCH 0738/6849] gnutls: bump to version 2.10.5

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index b8523d0721..4cda9976fc 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 2.10.3
+GNUTLS_VERSION = 2.10.5
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = http://ftp.gnu.org/gnu/gnutls/
 GNUTLS_DEPENDENCIES = libgcrypt

From b2a6615b11281b503227a3d18cffa617ee850147 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Sep 2011 10:15:27 +0200
Subject: [PATCH 0739/6849] mpd: ffmpeg needs ipv6, so add proper dependencies

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index a6ded1337e..6de1e5b487 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -60,6 +60,7 @@ config BR2_PACKAGE_MPD_FFMPEG
 	bool "ffmpeg"
 	select BR2_PACKAGE_FFMPEG
 	depends on BR2_LARGEFILE
+	depends on BR2_INET_IPV6
 	help
 	  Enable ffmpeg input support.
 	  Select this if you want to play back files supported by ffmpeg.

From 54b60ba6aa0ff1b6c851e704bc36945ca052b2b3 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 30 Sep 2011 16:48:33 +0200
Subject: [PATCH 0740/6849] gst-plugins-base: disable parallel build

Parallel builds sometimes break when audio/testchannels is
compiled before the gstinterfaces library.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 87ee80dc12..aad0a7bb95 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -8,6 +8,8 @@ GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES
 
+GST_PLUGINS_BASE_MAKE = $(MAKE1)
+
 # freetype is only used by examples, but if it is not found
 # and the host has a freetype-config script, then the host
 # include dirs are added to the search path causing trouble

From d6e9b16b37940fc1377f7f3dc2c5cac3a4baca76 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 30 Sep 2011 16:48:34 +0200
Subject: [PATCH 0741/6849] gst-plugins-bad: add more config options

The recent update added some new plugins. This commit makes
them selectable in buildroot.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in  | 10 ++++++++++
 .../gst-plugins-bad/gst-plugins-bad.mk        | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index cfd9b707f4..a8d01bcadb 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -54,6 +54,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 	bool "debugutils"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK
+	bool "decklink"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
 	bool "dtmf"
 
@@ -117,6 +120,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB
 	bool "librfb"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS
+	bool "linsys"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER
 	bool "liveadder"
 
@@ -247,6 +253,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV
 	bool "fbdev"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
+	bool "libmms"
+	select BR2_PACKAGE_LIBMMS
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON
 	bool "neon"
 	select BR2_PACKAGE_NEON
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 4cd2771a8e..bebff40d56 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -100,6 +100,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-debugutils
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-decklink
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-decklink
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-dtmf
 else
@@ -232,6 +238,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-librfb
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-linsys
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-linsys
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-liveadder
 else
@@ -484,6 +496,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-fbdev
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-libmms
+GST_PLUGINS_BAD_DEPENDENCIES += libmms
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-libmms
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-neon
 GST_PLUGINS_BAD_DEPENDENCIES += neon

From 31960961497ebc1059978c54c7d65a08a8b7e821 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 30 Sep 2011 20:45:56 +0200
Subject: [PATCH 0742/6849] package: fix bootloader building

The changes in e055aea216cff4d12cf55eab2e35ca1459edaa91 and
0849e8193ef429f29945b8c2a54eafc8635e0969 have broken the bootloader
support.

This is because the 'pkgparentdir' macro returns the string 'boot/'
for bootloaders, while the GENTARGETS_INNER macro was testing this
against 'boot' to know if the configuration option to check for this
package is BR2_PACKAGE_* or BR2_TARGET_*.

So, instead of testing against 'boot', we test against 'boot/'.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 353ba72a03..b5ef57bb19 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -637,7 +637,7 @@ $$($(2)_TARGET_DIRCLEAN):		PKG=$(2)
 # kernel case, the bootloaders case, and the normal packages case.
 ifeq ($(1),linux)
 $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL
-else ifeq ($(4),boot)
+else ifeq ($(4),boot/)
 $(2)_KCONFIG_VAR = BR2_TARGET_$(2)
 else
 $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2)

From 455eb18a5a26d55ba98a2ac969a7e45f14f3f79d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Sep 2011 16:47:29 -0300
Subject: [PATCH 0743/6849] mpg123: bump to version 1.13.4

Bump mpg123 to version 1.13.4, fixes for very long files (endless
streams).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 17d398e814..53b7b39f37 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.13.3
+MPG123_VERSION = 1.13.4
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From b4773c05628da483bb847d7f571c893084ad76f8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Sep 2011 16:47:32 -0300
Subject: [PATCH 0744/6849] smartmontools: bump to version 5.41

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/smartmontools/smartmontools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index d941504e20..d14e740ad2 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SMARTMONTOOLS_VERSION = 5.40
+SMARTMONTOOLS_VERSION = 5.41
 SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
 
 $(eval $(call AUTOTARGETS))

From 2b16f70148eb4707854df5fc60d8fa9c8a281192 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Sep 2011 16:47:31 -0300
Subject: [PATCH 0745/6849] mpd: fixup sample config

Fix sample mpd.conf so that the playlists directory lives inside the
main mpd data directory.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.conf b/package/multimedia/mpd/mpd.conf
index 1a08ed0ffb..5956b75e24 100644
--- a/package/multimedia/mpd/mpd.conf
+++ b/package/multimedia/mpd/mpd.conf
@@ -7,7 +7,7 @@
 music_directory		"/var/lib/mpd/music"
 
 # Directory where user-made playlists are stored (RW)
-playlist_directory	"/mnt/mpd/playlists"
+playlist_directory	"/var/lib/mpd/playlists"
 
 # Database file (RW)
 db_file			"/var/lib/mpd/database"

From 1c20b39cf31bff85a8cf35e3bb2d8a9bbf436b16 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Oct 2011 21:13:57 +0200
Subject: [PATCH 0746/6849] gst-plugins-base: fix build by disabling
 testchannels example

Testchannels doesn't build because it forgets to link with libgstinterfaces.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0.10.35-disable-testchannels-example.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch b/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch
new file mode 100644
index 0000000000..e991c4e333
--- /dev/null
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch
@@ -0,0 +1,26 @@
+[PATCH] disable testchannels example
+
+The testchannels example doesn't build because it forgets to link with
+libgstinterfaces. Unfortunately testchannels gets built even though
+--disable-examples is used, so instead disable it in Makefile.in
+(package doesn't autoreconf cleanly, so don't edit Makefile.am)
+
+Problem is fixed upstream in 0.11 branch (940291dd38be66fa).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ gst-libs/gst/audio/Makefile.in |    1 -
+ 1 file changed, 1 deletion(-)
+
+Index: gst-plugins-base-0.10.35/gst-libs/gst/audio/Makefile.in
+===================================================================
+--- gst-plugins-base-0.10.35.orig/gst-libs/gst/audio/Makefile.in
++++ gst-plugins-base-0.10.35/gst-libs/gst/audio/Makefile.in
+@@ -45,7 +45,6 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = testchannels$(EXEEXT)
+ DIST_COMMON = $(libgstaudio_@GST_MAJORMINOR@include_HEADERS) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/common/gst-glib-gen.mak TODO

From a1c10778092702f8856c1cc92126ef9801952d74 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Oct 2011 23:19:10 +0200
Subject: [PATCH 0747/6849] binutils: build host version statically

Otherwise we end up with libbfd/libopcodes in host/usr/$BUILD/$TARGET/lib,
used by the binaries. Unfortunately it also adds rpaths, which first look
in the build directory before here, causing trouble if the toolchain is
used outside BR (E.G. for a SDK) and the build directory location reused
for another incompatible build (E.G. another ARCH), as the binutils
binaries then end up using the wrong libs.

Fix it by linking statically instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 2d60ce0747..5123568ec5 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -30,6 +30,7 @@ endif
 # We just keep the convention of "host utility" for now
 HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			--target=$(REAL_GNU_TARGET_NAME) \
+			--disable-shared --enable-static \
 			$(BR2_CONFIGURE_STAGING_SYSROOT) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 

From cedbad56db97718e7960f1e288a8f6ee68797e02 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Oct 2011 22:38:47 +0200
Subject: [PATCH 0748/6849] Revert "gst-plugins-base: disable parallel build"

This reverts commit 54b60ba6aa0ff1b6c851e704bc36945ca052b2b3.

As requested by Sven. Not needed as we now have fixed the testchannels
issue.
---
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index aad0a7bb95..87ee80dc12 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -8,8 +8,6 @@ GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES
 
-GST_PLUGINS_BASE_MAKE = $(MAKE1)
-
 # freetype is only used by examples, but if it is not found
 # and the host has a freetype-config script, then the host
 # include dirs are added to the search path causing trouble

From d1c54ade86e8cae6f0aa1bf1709941c70cea1af7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Oct 2011 00:15:47 +0200
Subject: [PATCH 0749/6849] imagemagick: add optional fftw support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imagemagick/imagemagick.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 0bb76f38ee..b2a65e1363 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -80,6 +80,15 @@ else
 IMAGEMAGICK_CONF_OPT += --without-tiff
 endif
 
+ifeq ($(BR2_PACKAGE_FFTW),y)
+# configure script misdetects these leading to build errors
+IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes
+IMAGEMAGICK_CONF_OPT += --with-fftw
+IMAGEMAGICK_DEPENDENCIES += fftw
+else
+IMAGEMAGICK_CONF_OPT += --without-fftw
+endif
+
 define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
 	$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,	\
 		   $(addsuffix -config,			\

From fca4aa233659fa15c7518a3cc83bc2331beb87bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Oct 2011 09:39:38 +0200
Subject: [PATCH 0750/6849] mpg123: tweak audio module selection

Fix build if host has libarts-dev, and add optional sdl+portaudio support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 53b7b39f37..c01c8adb46 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -9,6 +9,7 @@ MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
 MPG123_INSTALL_STAGING = YES
+
 MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)
 
 ifeq ($(BR2_arm),y)
@@ -34,11 +35,26 @@ endif
 
 MPG123_CONF_OPT += --with-cpu=$(MPG123_CPU)
 
-# Check if ALSA is built, then we should configure after alsa-lib so
-# ./configure can find alsa-lib.
+MPG123_AUDIO = dummy oss
+
+ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
+MPG123_AUDIO += portaudio
+MPG123_CONF_OPT += --with-default-audio=portaudio
+MPG123_DEPENDENCIES += portaudio
+endif
+
+ifeq ($(BR2_PACKAGE_SDL),y)
+MPG123_AUDIO += sdl
+MPG123_CONF_OPT += --with-default-audio=sdl
+MPG123_DEPENDENCIES += sdl
+endif
+
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-MPG123_CONF_OPT += --with-audio=alsa
+MPG123_AUDIO += alsa
+MPG123_CONF_OPT += --with-default-audio=alsa
 MPG123_DEPENDENCIES += alsa-lib
 endif
 
+MPG123_CONF_OPT += --with-audio=$(shell echo $(MPG123_AUDIO) | tr ' ' ,)
+
 $(eval $(call AUTOTARGETS))

From 6b19842c678e3edb6413906f5d3c72abf5414be9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Oct 2011 11:05:44 +0200
Subject: [PATCH 0751/6849] gst-plugins-bad: fix bzip2 typo

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index bebff40d56..20aad76fb3 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -458,7 +458,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-bz2
-GST_PLUGINS_BAD_DEPENDENCIES += bz2ip
+GST_PLUGINS_BAD_DEPENDENCIES += bzip2
 else
 GST_PLUGINS_BAD_CONF_OPT += --disable-bz2
 endif

From 6e3e5a99f7c148ef2fcdb6a033c36e9fe6d7ba94 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 4 Oct 2011 18:10:40 -0500
Subject: [PATCH 0752/6849] pkg-stats: update grep tests for package type

Update the grep tests used to determine the package type.

The package name and directory are now worked out magically due to:

 package: add helper functions to get package name and directory magically

Because of this the extra arguments were removed by patches:

 package: remove useless arguments from GENTARGETS
 package: remove useless arguments from AUTOTARGETS
 package: remove useless arguments from CMAKETARGETS

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index bb1c27d87a..8602b0f953 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -98,27 +98,27 @@ for i in $(find package/ -name '*.mk') ; do
     is_manual_target=0
     is_manual_host=0
 
-    if grep -E "\(call AUTOTARGETS,[^,]*,[^,]*,host\)" $i > /dev/null ; then
+    if grep -E "\(call AUTOTARGETS,host\)" $i > /dev/null ; then
 	is_auto_host=1
     fi
 
-    if grep -E "\(call AUTOTARGETS,[^,]*,[^,]*(,target|)\)" $i > /dev/null ; then
+    if grep -E "\(call AUTOTARGETS\)" $i > /dev/null ; then
 	is_auto_target=1
     fi
 
-    if grep -E "\(call GENTARGETS,[^,]*,[^,]*,host\)" $i > /dev/null ; then
+    if grep -E "\(call GENTARGETS,host\)" $i > /dev/null ; then
 	is_pkg_host=1
     fi
 
-    if grep -E "\(call GENTARGETS,[^,]*,[^,]*(,target|)\)" $i > /dev/null ; then
+    if grep -E "\(call GENTARGETS\)" $i > /dev/null ; then
 	is_pkg_target=1
     fi
 
-    if grep -E "\(call CMAKETARGETS,[^,]*,[^,]*,host\)" $i > /dev/null ; then
+    if grep -E "\(call CMAKETARGETS,host\)" $i > /dev/null ; then
 	is_cmake_host=1
     fi
 
-    if grep -E "\(call CMAKETARGETS,[^,]*,[^,]*(,target|)\)" $i > /dev/null ; then
+    if grep -E "\(call CMAKETARGETS\)" $i > /dev/null ; then
 	is_cmake_target=1
     fi
 

From 3b3d129c377e657fa1c2d64c45e9ccd90a1b8077 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 4 Oct 2011 13:45:32 -0500
Subject: [PATCH 0753/6849] package/libcgi/Config.in: help text should be
 indented by <tab> and 2 spaces

Fix the help text for package/libcgi/Config.in.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcgi/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/libcgi/Config.in b/package/libcgi/Config.in
index 491ae2e307..430039e559 100644
--- a/package/libcgi/Config.in
+++ b/package/libcgi/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_LIBCGI
 	bool "libcgi"
 	help
-		LibCGI is a library written from scratch to easily make
-		CGI applications in C.
+	  LibCGI is a library written from scratch to easily make
+	  CGI applications in C.
 
-		There are a lot of functions like string manipulation,
-		session and cookie support, GET and POST methods manipulation
-		etc..., to help you to quickly write powerful CGI programs.
+	  There are a lot of functions like string manipulation,
+	  session and cookie support, GET and POST methods manipulation
+	  etc..., to help you to quickly write powerful CGI programs.
 
-		http://libcgi.sourceforge.net/
+	  http://libcgi.sourceforge.net/

From 3903c3a73dabcdbdf13d3ff09dedef6a8589ab4a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 4 Oct 2011 11:05:47 +0200
Subject: [PATCH 0754/6849] gdb: bump to 7.3.1

this version fixes compilation issue on some old build systems like
openSUSE 10.3 saying some host libraries were too old

[Peter: drop bugfix number from config name, similar to kernel-headers]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 8295f798b2..6bf7fd441d 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -59,6 +59,11 @@ choice
 		depends on !BR2_bfin
 		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
 
+	config BR2_GDB_VERSION_7_3
+		bool "gdb 7.3.x"
+		depends on !BR2_bfin
+		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
+
 endchoice
 
 config BR2_GDB_VERSION
@@ -69,3 +74,4 @@ config BR2_GDB_VERSION
 	default "6.8"      if BR2_GDB_VERSION_6_8
 	default "7.0.1"    if BR2_GDB_VERSION_7_0_1
 	default "7.1"      if BR2_GDB_VERSION_7_1
+	default "7.3.1"    if BR2_GDB_VERSION_7_3

From 37f0d1bb7b5a379161e647b730f5a57b814122bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Oct 2011 16:14:26 +0200
Subject: [PATCH 0755/6849] gdb: misc cleanup

Only use 6.6 on bfin, remove 6.7.1, mark 6.8 + 7.0 as deprecated and
default to 7.3.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../6.7.1/600-fix-compile-flag-mismatch.patch | 31 -------------------
 toolchain/gdb/Config.in                       | 13 +++-----
 2 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 toolchain/gdb/6.7.1/600-fix-compile-flag-mismatch.patch

diff --git a/toolchain/gdb/6.7.1/600-fix-compile-flag-mismatch.patch b/toolchain/gdb/6.7.1/600-fix-compile-flag-mismatch.patch
deleted file mode 100644
index 13b72bb96d..0000000000
--- a/toolchain/gdb/6.7.1/600-fix-compile-flag-mismatch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/gdb/gdbserver/configure
-+++ b/gdb/gdbserver/configure
-@@ -1239,7 +1239,7 @@
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
--      if test "x$ac_old_val" != "x$ac_new_val"; then
-+      if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
- 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=
- 
- ac_unique_file="main.c"
--ac_subdirs_all="$ac_subdirs_all doc testsuite"
-+ac_subdirs_all="$ac_subdirs_all doc"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-@@ -3077,7 +3077,7 @@
- 
- 
- 
--subdirs="$subdirs doc testsuite"
-+subdirs="$subdirs doc"
- 
- 
- # Provide defaults for some variables set by the per-host and per-target
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 6bf7fd441d..28279a3b4b 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -26,20 +26,16 @@ config BR2_PACKAGE_GDB_HOST
 
 choice
 	prompt "GDB debugger Version"
-	default BR2_GDB_VERSION_6_8 if !BR2_avr32
+	default BR2_GDB_VERSION_6_6 if !BR2_bfin
 	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
+	default BR2_GDB_VERSION_7_3
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
 	help
 	  Select the version of gdb you wish to use.
 
 	config BR2_GDB_VERSION_6_6
 		bool "gdb 6.6"
-		depends on !BR2_avr32
-		depends on BR2_DEPRECATED || BR2_bfin
-
-	config BR2_GDB_VERSION_6_7_1
-		depends on !(BR2_avr32 || BR2_bfin)
-		bool "gdb 6.7.1"
+		depends on BR2_bfin
 
 	config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
 		depends on BR2_avr32
@@ -48,10 +44,12 @@ choice
 	config BR2_GDB_VERSION_6_8
 		bool "gdb 6.8"
 		depends on !(BR2_avr32 || BR2_bfin)
+		depends on BR2_DEPRECATED
 
 	config BR2_GDB_VERSION_7_0_1
 		bool "gdb 7.0.1"
 		depends on !BR2_bfin
+		depends on BR2_DEPRECATED
 		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
 
 	config BR2_GDB_VERSION_7_1
@@ -69,7 +67,6 @@ endchoice
 config BR2_GDB_VERSION
 	string
 	default "6.6"      if BR2_GDB_VERSION_6_6
-	default "6.7.1"    if BR2_GDB_VERSION_6_7_1
 	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
 	default "6.8"      if BR2_GDB_VERSION_6_8
 	default "7.0.1"    if BR2_GDB_VERSION_7_0_1

From c5da6f9553ac82fefbefb655ac0207bc58615ae4 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 13 Sep 2011 23:57:29 +0200
Subject: [PATCH 0756/6849] toolchain/gdb: strip tarball component when
 extracting

For some tarballs of gdb (see next patch), the extracted directory is
*not* named after the version string (eg. gdb-6.6a extract into gdb-6.6/)

Create the appropriate directory first, then use --strip-{components,path}
when extracting gdb (the same way it is done for the generic package
infrastructure).

At the same time, get rid of the snapshot special case, because:
 1- it's no longer available in the menu
 2- it would be handled by the above change

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/gdb.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 4622616787..85b892fdf4 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -28,13 +28,8 @@ $(DL_DIR)/$(GDB_SOURCE):
 
 gdb-unpacked: $(GDB_DIR)/.unpacked
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
-	mkdir -p $(TOOLCHAIN_DIR)
-	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-ifeq ($(GDB_VERSION),snapshot)
-	GDB_REAL_DIR=$(shell \
-		tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1)
-	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
-endif
+	mkdir -p $(GDB_DIR)
+	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
 endif

From e23d0d7dd25dcd7cfcee171a2ffd3348b75afa3e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 13 Sep 2011 23:57:30 +0200
Subject: [PATCH 0757/6849] toolchain/gdb: fixup version strings

The gdb tarballs have been re-released after a GPL compliance
issue was found:
  http://sourceware.org/ml/gdb/2011-09/msg00030.html

So all versions were re-packaged.

In the process, an 'a' was appended to the version strings, and
unlike the binutils people, the gdb folks are not inclined in
providing legacy symlinks:
  http://sourceware.org/ml/gdb/2011-09/msg00036.html

So, this patch fixes the issue by renaming version strings. It is to be
noted that, although the versions got bumped to include an 'a' at the end,
the directory contained in the tarball is still named after the version
string without the 'a'. For example:
 - old version      : 6.6
 - new version      : 6.6a
 - tarball name     : gdb-6.6a.tar.bz2
 - directory name   : gdb-6.6/

In fact, it does not pose any problem for buildroot, as the extract process
explicitly mkdirs the directory to extract into, *and* strips the first level
of the tree extracted from the tarball.

[Peter: fixup patch to apply to head, don't rename config symbols]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/{6.6 => 6.6a}/100-uclibc-conf.patch         | 0
 .../gdb/{6.6 => 6.6a}/600-fix-compile-flag-mismatch.patch | 0
 toolchain/gdb/{6.6 => 6.6a}/gdb-6.6-bfin-gdbserver.patch  | 0
 .../gdb/{6.8 => 6.8a}/600-fix-compile-flag-mismatch.patch | 0
 toolchain/gdb/Config.in                                   | 8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/gdb/{6.6 => 6.6a}/100-uclibc-conf.patch (100%)
 rename toolchain/gdb/{6.6 => 6.6a}/600-fix-compile-flag-mismatch.patch (100%)
 rename toolchain/gdb/{6.6 => 6.6a}/gdb-6.6-bfin-gdbserver.patch (100%)
 rename toolchain/gdb/{6.8 => 6.8a}/600-fix-compile-flag-mismatch.patch (100%)

diff --git a/toolchain/gdb/6.6/100-uclibc-conf.patch b/toolchain/gdb/6.6a/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gdb/6.6/100-uclibc-conf.patch
rename to toolchain/gdb/6.6a/100-uclibc-conf.patch
diff --git a/toolchain/gdb/6.6/600-fix-compile-flag-mismatch.patch b/toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch
similarity index 100%
rename from toolchain/gdb/6.6/600-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch
diff --git a/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch b/toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch
similarity index 100%
rename from toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch
rename to toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch
diff --git a/toolchain/gdb/6.8/600-fix-compile-flag-mismatch.patch b/toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch
similarity index 100%
rename from toolchain/gdb/6.8/600-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 28279a3b4b..a5dc71c1f2 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -66,9 +66,9 @@ endchoice
 
 config BR2_GDB_VERSION
 	string
-	default "6.6"      if BR2_GDB_VERSION_6_6
+	default "6.6a"     if BR2_GDB_VERSION_6_6
 	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
-	default "6.8"      if BR2_GDB_VERSION_6_8
-	default "7.0.1"    if BR2_GDB_VERSION_7_0_1
-	default "7.1"      if BR2_GDB_VERSION_7_1
+	default "6.8a"     if BR2_GDB_VERSION_6_8
+	default "7.0.1a"   if BR2_GDB_VERSION_7_0_1
+	default "7.1a"     if BR2_GDB_VERSION_7_1
 	default "7.3.1"    if BR2_GDB_VERSION_7_3

From 228bde4dbe81254785ffa9986c81c79f5567c241 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Oct 2011 16:58:55 +0200
Subject: [PATCH 0758/6849] gdb: add 7.2a version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index a5dc71c1f2..e593698d23 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -57,6 +57,11 @@ choice
 		depends on !BR2_bfin
 		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
 
+	config BR2_GDB_VERSION_7_2
+		bool "gdb 7.2.x"
+		depends on !BR2_bfin
+		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
+
 	config BR2_GDB_VERSION_7_3
 		bool "gdb 7.3.x"
 		depends on !BR2_bfin
@@ -71,4 +76,5 @@ config BR2_GDB_VERSION
 	default "6.8a"     if BR2_GDB_VERSION_6_8
 	default "7.0.1a"   if BR2_GDB_VERSION_7_0_1
 	default "7.1a"     if BR2_GDB_VERSION_7_1
+	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3

From b7b75b71679a03d92850890e1980d7e3cc42b096 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 5 Oct 2011 11:47:54 -0500
Subject: [PATCH 0759/6849] pkg-stats: cnt should start with 0

The package count, cnt, should start with an initial value of 0.  It
is incremented as each package *.mk file is checked.  Starting with a
value of 1 makes the first ID = 2 and results in the TOTAL being off
by 1.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 8602b0f953..3e89bd14b8 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -73,7 +73,7 @@ convert_to_generic_target=0
 convert_to_generic_host=0
 convert_to_autotools=0
 total_patch_count=0
-cnt=1
+cnt=0
 for i in $(find package/ -name '*.mk') ; do
 
     if test \

From 9bc7b1d4ae694b818f941410d1ff59316a2bba6e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:57:38 +0200
Subject: [PATCH 0760/6849] x11r7: make package globally visible

All x11r7 .mk files were only included into the global chain of
makefile includes if the BR2_PACKAGE_XORG7 option was enabled. This is
not the standard way to do things in Buildroot, and it even breaks
things like running "make <pkg>-*" for a x11r7 package even if X.org
is not selected.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/x11r7.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/x11r7.mk b/package/x11r7/x11r7.mk
index 7c7ae6905b..ea0363f6a0 100644
--- a/package/x11r7/x11r7.mk
+++ b/package/x11r7/x11r7.mk
@@ -1,3 +1 @@
-ifeq ($(BR2_PACKAGE_XORG7),y)
 include package/x11r7/*/*.mk
-endif

From aeaa5e9422955c53b7c904a987a475ca0ec04369 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:57:40 +0200
Subject: [PATCH 0761/6849] xdata_xcursor-themes: add dependency on host
 xapp_xcursorgen

As reported in bug #3331, xdata_xcursor_themes needs the xcursorgen
application installed on the host. This commit adds this dependency,
together with the needed host libraries required for xapp_cursorgen to
build properly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk           | 3 +++
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 2 +-
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk           | 3 +++
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk             | 3 +++
 package/x11r7/xlib_libXrender/xlib_libXrender.mk           | 3 +++
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk       | 1 +
 package/x11r7/xproto_renderproto/xproto_renderproto.mk     | 1 +
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 55ddcdc0bc..75c113517e 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -10,4 +10,7 @@ XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_AUTORECONF = NO
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
+HOST_XAPP_XCURSORGEN_DEPENDENCIES = host-libpng host-xlib_libX11 host-xlib_libXcursor
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index fe5c0dadc7..b62b51c4cd 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -9,6 +9,6 @@ XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XCURSOR_THEMES_AUTORECONF = NO
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
 XDATA_XCURSOR_THEMES_INSTALL_TARGET = YES
-XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor
+XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index ffe1b4d592..6f3a776496 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -11,4 +11,7 @@ XLIB_LIBXCURSOR_AUTORECONF = NO
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
+HOST_XLIB_LIBXCURSOR_DEPENDENCIES = host-xlib_libX11 host-xlib_libXfixes host-xlib_libXrender host-xproto_xproto
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 2450bcec8b..72cd848bdc 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -11,4 +11,7 @@ XLIB_LIBXFIXES_AUTORECONF = NO
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
+HOST_XLIB_LIBXFIXES_DEPENDENCIES = host-xproto_fixesproto host-xlib_libX11 host-xproto_xextproto host-xproto_xproto
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 36495034dc..57781358f0 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -12,4 +12,7 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
 
+HOST_XLIB_LIBXRENDER_DEPENDENCIES = host-xlib_libX11 host-xproto_renderproto host-xproto_xproto
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index d569de85b4..a91e6cb21a 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -12,3 +12,4 @@ XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index 796051741a..dac3424bcb 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -12,3 +12,4 @@ XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 42a28105f12e006e8b01579d0004c8cb3edc0acb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:57:41 +0200
Subject: [PATCH 0762/6849] x11r7: AUTORECONF=NO is the default, remove

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk                                   | 1 -
 package/x11r7/mesa3d/mesa3d.mk                                   | 1 -
 package/x11r7/xapp_appres/xapp_appres.mk                         | 1 -
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk                     | 1 -
 package/x11r7/xapp_beforelight/xapp_beforelight.mk               | 1 -
 package/x11r7/xapp_bitmap/xapp_bitmap.mk                         | 1 -
 package/x11r7/xapp_editres/xapp_editres.mk                       | 1 -
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk                 | 1 -
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk                   | 1 -
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk                       | 1 -
 package/x11r7/xapp_iceauth/xapp_iceauth.mk                       | 1 -
 package/x11r7/xapp_ico/xapp_ico.mk                               | 1 -
 package/x11r7/xapp_listres/xapp_listres.mk                       | 1 -
 package/x11r7/xapp_luit/xapp_luit.mk                             | 1 -
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk                   | 1 -
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk               | 1 -
 package/x11r7/xapp_oclock/xapp_oclock.mk                         | 1 -
 package/x11r7/xapp_rgb/xapp_rgb.mk                               | 1 -
 package/x11r7/xapp_rstart/xapp_rstart.mk                         | 1 -
 package/x11r7/xapp_scripts/xapp_scripts.mk                       | 1 -
 package/x11r7/xapp_sessreg/xapp_sessreg.mk                       | 1 -
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk                   | 1 -
 package/x11r7/xapp_showfont/xapp_showfont.mk                     | 1 -
 package/x11r7/xapp_smproxy/xapp_smproxy.mk                       | 1 -
 package/x11r7/xapp_twm/xapp_twm.mk                               | 1 -
 package/x11r7/xapp_viewres/xapp_viewres.mk                       | 1 -
 package/x11r7/xapp_x11perf/xapp_x11perf.mk                       | 1 -
 package/x11r7/xapp_xauth/xapp_xauth.mk                           | 1 -
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk                 | 1 -
 package/x11r7/xapp_xbiff/xapp_xbiff.mk                           | 1 -
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                           | 1 -
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk                 | 1 -
 package/x11r7/xapp_xclock/xapp_xclock.mk                         | 1 -
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk                         | 1 -
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk                 | 1 -
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk                   | 1 -
 package/x11r7/xapp_xditview/xapp_xditview.mk                     | 1 -
 package/x11r7/xapp_xdm/xapp_xdm.mk                               | 1 -
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk                     | 1 -
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk                     | 1 -
 package/x11r7/xapp_xedit/xapp_xedit.mk                           | 1 -
 package/x11r7/xapp_xev/xapp_xev.mk                               | 1 -
 package/x11r7/xapp_xeyes/xapp_xeyes.mk                           | 1 -
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk                       | 1 -
 package/x11r7/xapp_xfd/xapp_xfd.mk                               | 1 -
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk                     | 1 -
 package/x11r7/xapp_xfs/xapp_xfs.mk                               | 1 -
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk                       | 1 -
 package/x11r7/xapp_xgamma/xapp_xgamma.mk                         | 1 -
 package/x11r7/xapp_xgc/xapp_xgc.mk                               | 1 -
 package/x11r7/xapp_xhost/xapp_xhost.mk                           | 1 -
 package/x11r7/xapp_xinput/xapp_xinput.mk                         | 1 -
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk                       | 1 -
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk                         | 1 -
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk                     | 1 -
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk                     | 1 -
 package/x11r7/xapp_xkill/xapp_xkill.mk                           | 1 -
 package/x11r7/xapp_xload/xapp_xload.mk                           | 1 -
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                           | 1 -
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk                     | 1 -
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk                 | 1 -
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk                     | 1 -
 package/x11r7/xapp_xmag/xapp_xmag.mk                             | 1 -
 package/x11r7/xapp_xman/xapp_xman.mk                             | 1 -
 package/x11r7/xapp_xmessage/xapp_xmessage.mk                     | 1 -
 package/x11r7/xapp_xmh/xapp_xmh.mk                               | 1 -
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk                       | 1 -
 package/x11r7/xapp_xmore/xapp_xmore.mk                           | 1 -
 package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk             | 1 -
 package/x11r7/xapp_xpr/xapp_xpr.mk                               | 1 -
 .../x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk   | 1 -
 package/x11r7/xapp_xprop/xapp_xprop.mk                           | 1 -
 package/x11r7/xapp_xrandr/xapp_xrandr.mk                         | 1 -
 package/x11r7/xapp_xrdb/xapp_xrdb.mk                             | 1 -
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk                     | 1 -
 package/x11r7/xapp_xset/xapp_xset.mk                             | 1 -
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk                     | 1 -
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk               | 1 -
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk                     | 1 -
 package/x11r7/xapp_xsm/xapp_xsm.mk                               | 1 -
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk                     | 1 -
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk                     | 1 -
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk                         | 1 -
 package/x11r7/xapp_xwd/xapp_xwd.mk                               | 1 -
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk                     | 1 -
 package/x11r7/xapp_xwud/xapp_xwud.mk                             | 1 -
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk                   | 1 -
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk       | 1 -
 .../x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk | 1 -
 .../x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk | 1 -
 .../x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk   | 1 -
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk   | 1 -
 .../xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk   | 1 -
 .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk   | 1 -
 .../xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk | 1 -
 .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk     | 1 -
 package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk | 1 -
 package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk   | 1 -
 package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk   | 1 -
 package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk   | 1 -
 .../x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk   | 1 -
 .../x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk | 1 -
 .../x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk   | 1 -
 .../x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk   | 1 -
 .../x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk   | 1 -
 .../x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk   | 1 -
 package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk | 1 -
 package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk | 1 -
 .../xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk   | 1 -
 .../xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk     | 1 -
 package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk     | 1 -
 .../xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk | 1 -
 package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk     | 1 -
 .../xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk     | 1 -
 .../xdriver_xf86-video-siliconmotion.mk                          | 1 -
 .../x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk | 1 -
 .../xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk     | 1 -
 .../x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk | 1 -
 .../x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk | 1 -
 .../x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk | 1 -
 .../x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk | 1 -
 .../x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk | 1 -
 package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk   | 1 -
 .../xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk     | 1 -
 .../x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk   | 1 -
 package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk   | 1 -
 .../x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk | 1 -
 .../x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk | 1 -
 package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk | 1 -
 package/x11r7/xfont_encodings/xfont_encodings.mk                 | 1 -
 package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 1 -
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk   | 1 -
 .../xfont_font-adobe-utopia-100dpi.mk                            | 1 -
 .../xfont_font-adobe-utopia-75dpi.mk                             | 1 -
 .../xfont_font-adobe-utopia-type1.mk                             | 1 -
 package/x11r7/xfont_font-alias/xfont_font-alias.mk               | 1 -
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk   | 1 -
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk       | 1 -
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk         | 1 -
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                     | 1 -
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                      | 1 -
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk             | 1 -
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk         | 1 -
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk   | 1 -
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk     | 1 -
 .../xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk   | 1 -
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk     | 1 -
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk     | 1 -
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk   | 1 -
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk   | 1 -
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk         | 1 -
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk       | 1 -
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk       | 1 -
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk         | 1 -
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk     | 1 -
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk   | 1 -
 .../x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk   | 1 -
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk   | 1 -
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk       | 1 -
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk       | 1 -
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk     | 1 -
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk     | 1 -
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk       | 1 -
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk         | 1 -
 .../xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 1 -
 .../x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk   | 1 -
 package/x11r7/xkeyboard-config/xkeyboard-config.mk               | 1 -
 package/x11r7/xlib_libFS/xlib_libFS.mk                           | 1 -
 package/x11r7/xlib_libICE/xlib_libICE.mk                         | 1 -
 package/x11r7/xlib_libSM/xlib_libSM.mk                           | 1 -
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk           | 1 -
 package/x11r7/xlib_libXau/xlib_libXau.mk                         | 1 -
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk           | 1 -
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk                 | 1 -
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk                 | 1 -
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                     | 1 -
 package/x11r7/xlib_libXext/xlib_libXext.mk                       | 1 -
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk                   | 1 -
 package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk           | 1 -
 package/x11r7/xlib_libXi/xlib_libXi.mk                           | 1 -
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk               | 1 -
 package/x11r7/xlib_libXmu/xlib_libXmu.mk                         | 1 -
 package/x11r7/xlib_libXp/xlib_libXp.mk                           | 1 -
 package/x11r7/xlib_libXpm/xlib_libXpm.mk                         | 1 -
 package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk     | 1 -
 package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk           | 1 -
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk                   | 1 -
 package/x11r7/xlib_libXrender/xlib_libXrender.mk                 | 1 -
 package/x11r7/xlib_libXres/xlib_libXres.mk                       | 1 -
 package/x11r7/xlib_libXv/xlib_libXv.mk                           | 1 -
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                       | 1 -
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk               | 1 -
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk                 | 1 -
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                         | 1 -
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk                 | 1 -
 package/x11r7/xlib_liboldX/xlib_liboldX.mk                       | 1 -
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk                 | 1 -
 package/x11r7/xlib_libxkbui/xlib_libxkbui.mk                     | 1 -
 package/x11r7/xlib_xtrans/xlib_xtrans.mk                         | 1 -
 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk         | 1 -
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk         | 1 -
 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk     | 1 -
 package/x11r7/xproto_damageproto/xproto_damageproto.mk           | 1 -
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk                 | 1 -
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk               | 1 -
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk             | 1 -
 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk     | 1 -
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk             | 1 -
 package/x11r7/xproto_glproto/xproto_glproto.mk                   | 1 -
 package/x11r7/xproto_inputproto/xproto_inputproto.mk             | 1 -
 package/x11r7/xproto_kbproto/xproto_kbproto.mk                   | 1 -
 package/x11r7/xproto_printproto/xproto_printproto.mk             | 1 -
 package/x11r7/xproto_randrproto/xproto_randrproto.mk             | 1 -
 package/x11r7/xproto_recordproto/xproto_recordproto.mk           | 1 -
 package/x11r7/xproto_renderproto/xproto_renderproto.mk           | 1 -
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk       | 1 -
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk     | 1 -
 package/x11r7/xproto_videoproto/xproto_videoproto.mk             | 1 -
 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk     | 1 -
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk           | 1 -
 package/x11r7/xproto_xextproto/xproto_xextproto.mk               | 1 -
 package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk | 1 -
 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk         | 1 -
 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk         | 1 -
 package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk       | 1 -
 package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk | 1 -
 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk       | 1 -
 package/x11r7/xproto_xproto/xproto_xproto.mk                     | 1 -
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk         | 1 -
 package/x11r7/xutil_makedepend/xutil_makedepend.mk               | 1 -
 package/x11r7/xutil_util-macros/xutil_util-macros.mk             | 1 -
 231 files changed, 231 deletions(-)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 249217ccfe..106a8a4264 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -9,7 +9,6 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/
 
 LIBXCB_INSTALL_STAGING = YES
 
-LIBXCB_AUTORECONF = NO
 LIBXCB_DEPENDENCIES = \
 	host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
 	host-xcb-proto host-python
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 1fc1631de6..095d66d602 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -7,7 +7,6 @@ MESA3D_VERSION:=7.6.1
 MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
 MESA3D_SITE:=ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 
-MESA3D_AUTORECONF = NO
 MESA3D_CONF_OPT = --disable-egl --disable-glu --disable-glw --disable-glut --disable-gallium --with-driver=dri --with-dri-drivers=swrast
 MESA3D_INSTALL_STAGING = YES
 
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index faa9937952..a91a4163ac 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -7,7 +7,6 @@
 XAPP_APPRES_VERSION = 1.0.1
 XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2
 XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_APPRES_AUTORECONF = NO
 XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index c2f5896325..c2d63354de 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -7,7 +7,6 @@
 XAPP_BDFTOPCF_VERSION = 1.0.2
 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_BDFTOPCF_AUTORECONF = NO
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 HOST_XAPP_BDFTOPCF_DEPENDENCIES = host-xlib_libXfont
 
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index 8d4cb75e32..d806231536 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -7,7 +7,6 @@
 XAPP_BEFORELIGHT_VERSION = 1.0.2
 XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2
 XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_BEFORELIGHT_AUTORECONF = NO
 XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 4cca623803..5fdc260030 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -7,7 +7,6 @@
 XAPP_BITMAP_VERSION = 1.0.3
 XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2
 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_BITMAP_AUTORECONF = NO
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index a2ab2aa500..794985f465 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -7,7 +7,6 @@
 XAPP_EDITRES_VERSION = 1.0.2
 XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2
 XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_EDITRES_AUTORECONF = NO
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index 6c8ebccf74..b71819acfb 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -7,7 +7,6 @@
 XAPP_FONTTOSFNT_VERSION = 1.0.3
 XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2
 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_FONTTOSFNT_AUTORECONF = NO
 XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index 737a4308ba..f18424e9a0 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -7,7 +7,6 @@
 XAPP_FSLSFONTS_VERSION = 1.0.1
 XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2
 XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_FSLSFONTS_AUTORECONF = NO
 XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index e555179a2b..190bab876e 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -7,7 +7,6 @@
 XAPP_FSTOBDF_VERSION = 1.0.2
 XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2
 XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_FSTOBDF_AUTORECONF = NO
 XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 19c429730c..93d55dc696 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -7,7 +7,6 @@
 XAPP_ICEAUTH_VERSION = 1.0.3
 XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_ICEAUTH_AUTORECONF = NO
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 41031f5ba2..1dd4604144 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -7,7 +7,6 @@
 XAPP_ICO_VERSION = 1.0.2
 XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2
 XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_ICO_AUTORECONF = NO
 XAPP_ICO_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index b86d181dfb..49224bb221 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -7,7 +7,6 @@
 XAPP_LISTRES_VERSION = 1.0.1
 XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2
 XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_LISTRES_AUTORECONF = NO
 XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index ec7d894870..bab80450c5 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -7,7 +7,6 @@
 XAPP_LUIT_VERSION = 1.0.4
 XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
 XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_LUIT_AUTORECONF = NO
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index ece5dd332e..3957ba6198 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -7,7 +7,6 @@
 XAPP_MKFONTDIR_VERSION = 1.0.5
 XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_MKFONTDIR_AUTORECONF = NO
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale
 
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 1c460d65a7..a4218b0fd2 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -7,7 +7,6 @@
 XAPP_MKFONTSCALE_VERSION = 1.0.7
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_MKFONTSCALE_AUTORECONF = NO
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
 HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
 
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 00bb64451d..1300e6388f 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -7,7 +7,6 @@
 XAPP_OCLOCK_VERSION = 1.0.1
 XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2
 XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_OCLOCK_AUTORECONF = NO
 XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index e8c89fe16f..0b0d541b58 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -7,7 +7,6 @@
 XAPP_RGB_VERSION = 1.0.1
 XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
 XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_RGB_AUTORECONF = NO
 XAPP_RGB_DEPENDENCIES = xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index e5fb08408c..cd7189058c 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -7,7 +7,6 @@
 XAPP_RSTART_VERSION = 1.0.2
 XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2
 XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_RSTART_AUTORECONF = NO
 XAPP_RSTART_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index a2a050cf2f..3e844b45e5 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -7,7 +7,6 @@
 XAPP_SCRIPTS_VERSION = 1.0.1
 XAPP_SCRIPTS_SOURCE = scripts-$(XAPP_SCRIPTS_VERSION).tar.bz2
 XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_SCRIPTS_AUTORECONF = NO
 XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index b207f2c479..a1f3f4b75c 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -7,7 +7,6 @@
 XAPP_SESSREG_VERSION = 1.0.5
 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
 XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_SESSREG_AUTORECONF = NO
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index e5be0779f5..f503a473b8 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -7,7 +7,6 @@
 XAPP_SETXKBMAP_VERSION = 1.1.0
 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
 XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_SETXKBMAP_AUTORECONF = NO
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index a5ff670c72..4c8b6898dd 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -7,7 +7,6 @@
 XAPP_SHOWFONT_VERSION = 1.0.1
 XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2
 XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_SHOWFONT_AUTORECONF = NO
 XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index d1e79aee77..3082cb11e6 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -7,7 +7,6 @@
 XAPP_SMPROXY_VERSION = 1.0.3
 XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
 XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_SMPROXY_AUTORECONF = NO
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index 7e633539a2..18de28f206 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -7,7 +7,6 @@
 XAPP_TWM_VERSION = 1.0.3
 XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
 XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_TWM_AUTORECONF = NO
 XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 7396d93210..69d8598d3a 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -7,7 +7,6 @@
 XAPP_VIEWRES_VERSION = 1.0.1
 XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2
 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_VIEWRES_AUTORECONF = NO
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index b08dfc9ce2..61127690b9 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -7,7 +7,6 @@
 XAPP_X11PERF_VERSION = 1.5.1
 XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_X11PERF_AUTORECONF = NO
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index a2212666a2..93977f9579 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -7,7 +7,6 @@
 XAPP_XAUTH_VERSION = 1.0.4
 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XAUTH_AUTORECONF = NO
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index f5afa5ca73..8be5d37270 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -7,7 +7,6 @@
 XAPP_XBACKLIGHT_VERSION = 1.1.1
 XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2
 XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XBACKLIGHT_AUTORECONF = NO
 XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index 38627940e1..78adad985f 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -7,7 +7,6 @@
 XAPP_XBIFF_VERSION = 1.0.1
 XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2
 XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XBIFF_AUTORECONF = NO
 XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index a6f0fc1e10..beb1313c6e 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -7,7 +7,6 @@
 XAPP_XCALC_VERSION = 1.0.2
 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2
 XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XCALC_AUTORECONF = NO
 XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index a7ff739034..28a93b9837 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -7,7 +7,6 @@
 XAPP_XCLIPBOARD_VERSION = 1.0.1
 XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2
 XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XCLIPBOARD_AUTORECONF = NO
 XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 96fad9109c..271b1b07f8 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -7,7 +7,6 @@
 XAPP_XCLOCK_VERSION = 1.0.3
 XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2
 XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XCLOCK_AUTORECONF = NO
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 11b17f59d8..deab354f80 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -7,7 +7,6 @@
 XAPP_XCMSDB_VERSION = 1.0.2
 XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
 XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XCMSDB_AUTORECONF = NO
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 75c113517e..2634fd5c81 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -7,7 +7,6 @@
 XAPP_XCURSORGEN_VERSION = 1.0.4
 XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XCURSORGEN_AUTORECONF = NO
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
 HOST_XAPP_XCURSORGEN_DEPENDENCIES = host-libpng host-xlib_libX11 host-xlib_libXcursor
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index aa57f7cc51..8559a16e73 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -7,7 +7,6 @@
 XAPP_XDBEDIZZY_VERSION = 1.0.2
 XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
 XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDBEDIZZY_AUTORECONF = NO
 XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 5241e43ff9..3b1152d80a 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -7,7 +7,6 @@
 XAPP_XDITVIEW_VERSION = 1.0.1
 XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2
 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDITVIEW_AUTORECONF = NO
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 8d17d5ca64..4dc0d02899 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -7,7 +7,6 @@
 XAPP_XDM_VERSION = 1.1.6
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDM_AUTORECONF = NO
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 663c1e1756..9cd6c9730f 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -7,7 +7,6 @@
 XAPP_XDPYINFO_VERSION = 1.1.0
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDPYINFO_AUTORECONF = NO
 XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index 3be1fb156e..3e7284b710 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -7,7 +7,6 @@
 XAPP_XDRIINFO_VERSION = 1.0.3
 XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDRIINFO_AUTORECONF = NO
 XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index 72f2f7b42b..fd4158ebfd 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -7,7 +7,6 @@
 XAPP_XEDIT_VERSION = 1.0.2
 XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
 XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XEDIT_AUTORECONF = NO
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 3662c2356a..4fa50fee9f 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -7,7 +7,6 @@
 XAPP_XEV_VERSION = 1.0.4
 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XEV_AUTORECONF = NO
 XAPP_XEV_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 270ad6c324..8019aa9ebc 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -7,7 +7,6 @@
 XAPP_XEYES_VERSION = 1.0.1
 XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2
 XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XEYES_AUTORECONF = NO
 XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index fb78f1ac89..9975916e8b 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -7,7 +7,6 @@
 XAPP_XF86DGA_VERSION = 1.0.2
 XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
 XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XF86DGA_AUTORECONF = NO
 XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index f132c60047..5717875866 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -7,7 +7,6 @@
 XAPP_XFD_VERSION = 1.0.1
 XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XFD_AUTORECONF = NO
 XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index b1c39b8b23..9556fca3e0 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -7,7 +7,6 @@
 XAPP_XFONTSEL_VERSION = 1.0.1
 XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2
 XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XFONTSEL_AUTORECONF = NO
 XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index b01c756867..611b642677 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -7,7 +7,6 @@
 XAPP_XFS_VERSION = 1.0.5
 XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
 XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XFS_AUTORECONF = NO
 XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index c0fb6008db..bef0aedf0b 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -7,7 +7,6 @@
 XAPP_XFSINFO_VERSION = 1.0.1
 XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2
 XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XFSINFO_AUTORECONF = NO
 XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 2505306113..0993482225 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -7,7 +7,6 @@
 XAPP_XGAMMA_VERSION = 1.0.3
 XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
 XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XGAMMA_AUTORECONF = NO
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index f9de6418b5..e39d268893 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -7,7 +7,6 @@
 XAPP_XGC_VERSION = 1.0.1
 XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2
 XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XGC_AUTORECONF = NO
 XAPP_XGC_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index f5cdc5cdc4..7859f2303c 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -7,7 +7,6 @@
 XAPP_XHOST_VERSION = 1.0.3
 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XHOST_AUTORECONF = NO
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 38c45cbff5..4e6884d060 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -7,7 +7,6 @@
 XAPP_XINPUT_VERSION = 1.5.0
 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XINPUT_AUTORECONF = NO
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 04a558e033..f37d1062bd 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -7,7 +7,6 @@
 XAPP_XKBCOMP_VERSION = 1.1.1
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XKBCOMP_AUTORECONF = NO
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile
 
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index efd3c374ad..e8f7a36fc9 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -7,7 +7,6 @@
 XAPP_XKBEVD_VERSION = 1.1.0
 XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
 XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XKBEVD_AUTORECONF = NO
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index 214ccc10c8..98c7560c92 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -7,7 +7,6 @@
 XAPP_XKBPRINT_VERSION = 1.0.1
 XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2
 XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XKBPRINT_AUTORECONF = NO
 XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 7daca60bee..1ccbdb9cd6 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -7,7 +7,6 @@
 XAPP_XKBUTILS_VERSION = 1.0.2
 XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2
 XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XKBUTILS_AUTORECONF = NO
 XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index d9364c5c31..16c3760260 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -7,7 +7,6 @@
 XAPP_XKILL_VERSION = 1.0.2
 XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2
 XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XKILL_AUTORECONF = NO
 XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index 9130096060..f84c1588e1 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -7,7 +7,6 @@
 XAPP_XLOAD_VERSION = 1.0.2
 XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLOAD_AUTORECONF = NO
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index 205703106b..f79eafad1b 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -7,7 +7,6 @@
 XAPP_XLOGO_VERSION = 1.0.1
 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLOGO_AUTORECONF = NO
 XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
 			  xlib_libXft host-pkg-config
 
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index 379994d5fb..887f815771 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -7,7 +7,6 @@
 XAPP_XLSATOMS_VERSION = 1.0.2
 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLSATOMS_AUTORECONF = NO
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index 2374215a47..5a8563a1ce 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -7,7 +7,6 @@
 XAPP_XLSCLIENTS_VERSION = 1.0.2
 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLSCLIENTS_AUTORECONF = NO
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 944c6fcea2..6f997d8d19 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -7,7 +7,6 @@
 XAPP_XLSFONTS_VERSION = 1.0.1
 XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2
 XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLSFONTS_AUTORECONF = NO
 XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index f848601946..caf7bf6693 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -7,7 +7,6 @@
 XAPP_XMAG_VERSION = 1.0.2
 XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2
 XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMAG_AUTORECONF = NO
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 703d8dcd33..e3f623e503 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -6,7 +6,6 @@
 XAPP_XMAN_VERSION:=1.0.3
 XAPP_XMAN_SOURCE:=xman-$(XAPP_XMAN_VERSION).tar.bz2
 XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMAN_AUTORECONF = NO
 XAPP_XMAN_INSTALL_TARGET = YES
 
 XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 4a0ecc8197..3f47b26d2e 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -7,7 +7,6 @@
 XAPP_XMESSAGE_VERSION = 1.0.2
 XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2
 XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMESSAGE_AUTORECONF = NO
 XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index ed8276a6bf..280b7e74c6 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -7,7 +7,6 @@
 XAPP_XMH_VERSION = 1.0.1
 XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMH_AUTORECONF = NO
 XAPP_XMH_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index d498d98ba9..1a6c44a34e 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -7,7 +7,6 @@
 XAPP_XMODMAP_VERSION = 1.0.4
 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMODMAP_AUTORECONF = NO
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index ecbdbafce3..bd371eae91 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -7,7 +7,6 @@
 XAPP_XMORE_VERSION = 1.0.1
 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMORE_AUTORECONF = NO
 XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
index b39e4b5f75..08a1b4a8f9 100644
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -7,7 +7,6 @@
 XAPP_XPLSPRINTERS_VERSION = 1.0.1
 XAPP_XPLSPRINTERS_SOURCE = xplsprinters-$(XAPP_XPLSPRINTERS_VERSION).tar.bz2
 XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPLSPRINTERS_AUTORECONF = NO
 XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 871d711e3c..4ac3da436e 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -7,7 +7,6 @@
 XAPP_XPR_VERSION = 1.0.3
 XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
 XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPR_AUTORECONF = NO
 XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
index 00c429cfcd..1bb7365cb8 100644
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -7,7 +7,6 @@
 XAPP_XPREHASHPRINTERLIST_VERSION = 1.0.1
 XAPP_XPREHASHPRINTERLIST_SOURCE = xprehashprinterlist-$(XAPP_XPREHASHPRINTERLIST_VERSION).tar.bz2
 XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPREHASHPRINTERLIST_AUTORECONF = NO
 XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 5b315064ab..1615ac2371 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -7,7 +7,6 @@
 XAPP_XPROP_VERSION = 1.1.0
 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPROP_AUTORECONF = NO
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 254feadcb6..74bf97bb04 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -7,7 +7,6 @@
 XAPP_XRANDR_VERSION = 1.3.2
 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
 XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XRANDR_AUTORECONF = NO
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
 XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
 
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 425cef43aa..3a0cfdc784 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -7,7 +7,6 @@
 XAPP_XRDB_VERSION = 1.0.6
 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XRDB_AUTORECONF = NO
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index d6d04d68c2..ac7ed7c506 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -7,7 +7,6 @@
 XAPP_XREFRESH_VERSION = 1.0.3
 XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2
 XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XREFRESH_AUTORECONF = NO
 XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index fcd8df06db..32d6722a4f 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -7,7 +7,6 @@
 XAPP_XSET_VERSION = 1.1.0
 XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSET_AUTORECONF = NO
 XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 650afb041d..158318d329 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -7,7 +7,6 @@
 XAPP_XSETMODE_VERSION = 1.0.0
 XAPP_XSETMODE_SOURCE = xsetmode-$(XAPP_XSETMODE_VERSION).tar.bz2
 XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSETMODE_AUTORECONF = NO
 XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 5f9ef251b8..1a02542e83 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -7,7 +7,6 @@
 XAPP_XSETPOINTER_VERSION = 1.0.0
 XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
 XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSETPOINTER_AUTORECONF = NO
 XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 0f797a33ed..937f3e5ae3 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -7,7 +7,6 @@
 XAPP_XSETROOT_VERSION = 1.0.3
 XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSETROOT_AUTORECONF = NO
 XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index 30175524b1..c7e261fb88 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -7,7 +7,6 @@
 XAPP_XSM_VERSION = 1.0.1
 XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2
 XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSM_AUTORECONF = NO
 XAPP_XSM_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index b0b996065f..e33a51e078 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -7,7 +7,6 @@
 XAPP_XSTDCMAP_VERSION = 1.0.1
 XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2
 XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSTDCMAP_AUTORECONF = NO
 XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index e89dc5d95e..0fd91db829 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -7,7 +7,6 @@
 XAPP_XVIDTUNE_VERSION = 1.0.1
 XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2
 XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XVIDTUNE_AUTORECONF = NO
 XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index 9541c2d072..fe1062844a 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -7,7 +7,6 @@
 XAPP_XVINFO_VERSION = 1.1.0
 XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2
 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XVINFO_AUTORECONF = NO
 XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 3a966276d4..95d60988ed 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -7,7 +7,6 @@
 XAPP_XWD_VERSION = 1.0.3
 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XWD_AUTORECONF = NO
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index 7c7012cd74..541efde89d 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -7,7 +7,6 @@
 XAPP_XWININFO_VERSION = 1.0.5
 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XWININFO_AUTORECONF = NO
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index 97ecf0f2cc..69bb22814f 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -7,7 +7,6 @@
 XAPP_XWUD_VERSION = 1.0.2
 XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XWUD_AUTORECONF = NO
 XAPP_XWUD_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index e400934066..b94531b1ed 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -7,7 +7,6 @@
 XDATA_XBITMAPS_VERSION = 1.1.0
 XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
 XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
-XDATA_XBITMAPS_AUTORECONF = NO
 XDATA_XBITMAPS_INSTALL_STAGING = YES
 XDATA_XBITMAPS_INSTALL_TARGET = YES
 
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index b62b51c4cd..c954bec488 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -6,7 +6,6 @@
 XDATA_XCURSOR_THEMES_VERSION = 1.0.2
 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2
 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data
-XDATA_XCURSOR_THEMES_AUTORECONF = NO
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
 XDATA_XCURSOR_THEMES_INSTALL_TARGET = YES
 XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
index 2b9acfb54d..e55f979eb2 100644
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.4.0
 XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = NO
 XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index 6b92700e88..c3299ac59c 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.3.0
 XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = NO
 XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 0195876547..d1964b2cf1 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.3.0
 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = NO
 XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index dbd1bdead6..afbf2866d8 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.4.99.2
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = NO
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index b28843dfab..e0b57deb97 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.4.0
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = NO
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 5be5cb969d..55c6370122 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.5.0
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = NO
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 129f2120bb..6f9d66d4e0 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 20328b217d..386c4d170b 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.6.5
 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = NO
 XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index c92af152f0..1beed2e729 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_INPUT_VOID_VERSION = 1.3.0
 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_VOID_AUTORECONF = NO
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index 162e9b3656..ab6e8fbc46 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.2
 XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_APM_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 2976ae4a18..6cb689e524 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.2
 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_ARK_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index c77c7acce2..f71b7071d6 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -7,6 +7,5 @@
 XDRIVER_XF86_VIDEO_AST_VERSION = 0.89.9
 XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_AST_AUTORECONF = NO
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index 532fda138f..5e9d9ab16d 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.2
 XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 64548d3030..774688d3ee 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.3.2
 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 4a4ce7a336..91182fe0d6 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.2
 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 6964a358e4..600335e7e1 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.1
 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index 8284d048e4..faee8ca10f 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.6
 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_GEODE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 122837bf16..cd611b6e3e 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.0.3
 XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_GLIDE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 96628cf85c..4188dc5e42 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.3
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
index 2b137d72ac..47ba28d9ec 100644
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_I740_VERSION = 1.3.2
 XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_I740_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 759d5b2521..27e028bf2d 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.4
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index f532f2e9bf..113874415b 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.3
 XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWPORT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_NEWPORT_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index 50080f982c..4886fe8fa6 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.15
 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index 9684f41194..51efbd47b6 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.3
 XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
index f9c6f08fc1..6c619c9827 100644
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_S3_VERSION = 0.6.3
 XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_S3_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
index 08c527d503..68b0acc690 100644
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.10.4
 XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 8b52933f8d..9f5d7fd0d6 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.3
 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index aaf86f2325..e9e529da9e 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.3
 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
index 7e9e1c7400..f7c4f647b2 100644
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SUNCG14_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_SUNCG14_SOURCE = xf86-video-suncg14-$(XDRIVER_XF86_VIDEO_SUNCG14_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNCG14_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
index 939d4dee64..adef006a0e 100644
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SUNCG3_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_SUNCG3_SOURCE = xf86-video-suncg3-$(XDRIVER_XF86_VIDEO_SUNCG3_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNCG3_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
index f5e1a7b302..0d1f11ef73 100644
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SUNCG6_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_SUNCG6_SOURCE = xf86-video-suncg6-$(XDRIVER_XF86_VIDEO_SUNCG6_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNCG6_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
index 0e365d8381..be667a255f 100644
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.2.1
 XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
index 81dc5f5abe..b0cc953a97 100644
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SUNLEO_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_SUNLEO_SOURCE = xf86-video-sunleo-$(XDRIVER_XF86_VIDEO_SUNLEO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
index 4c1f35a648..135ddd7b9a 100644
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_SUNTCX_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_SUNTCX_SOURCE = xf86-video-suntcx-$(XDRIVER_XF86_VIDEO_SUNTCX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNTCX_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index c6c55d6078..fb69d516ab 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.1
 XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_TGA_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 4a722b8c4f..af44f694ef 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.3
 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index 21cb2dbc19..dc3d8fa75f 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.3
 XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index 2e265b7a3a..214fc674e3 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0
 XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_V4L_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 255bde1bd7..4425112d96 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.8
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 8fc7fa4be8..86caaae45f 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.3
 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index da7a5c6c95..7dfbd8d671 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -7,7 +7,6 @@
 XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.3.0
 XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_WSFB_AUTORECONF = NO
 XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 3bf7bc0717..8c4aac454e 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -7,7 +7,6 @@
 XFONT_ENCODINGS_VERSION = 1.0.3
 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_ENCODINGS_AUTORECONF = NO
 XFONT_ENCODINGS_MAKE_OPT =
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 HOST_XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 9a7503c47b..45029e1ab3 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.1
 XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ADOBE_100DPI_AUTORECONF = NO
 XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index 82ae78b36a..e172323f97 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.1
 XFONT_FONT_ADOBE_75DPI_SOURCE = font-adobe-75dpi-$(XFONT_FONT_ADOBE_75DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ADOBE_75DPI_AUTORECONF = NO
 XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index fad8dcde37..cbb78adb43 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.2
 XFONT_FONT_ADOBE_UTOPIA_100DPI_SOURCE = font-adobe-utopia-100dpi-$(XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ADOBE_UTOPIA_100DPI_AUTORECONF = NO
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index e6bd35f47a..f4e9c8b214 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION = 1.0.2
 XFONT_FONT_ADOBE_UTOPIA_75DPI_SOURCE = font-adobe-utopia-75dpi-$(XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ADOBE_UTOPIA_75DPI_AUTORECONF = NO
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index bb553ee8e3..5056e63e3a 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.2
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_AUTORECONF = NO
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 29cb3698af..34b52e2d16 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ALIAS_VERSION = 1.0.2
 XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2
 XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ALIAS_AUTORECONF = NO
 XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index 5d20d571bc..e26f998e08 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ARABIC_MISC_VERSION = 1.0.1
 XFONT_FONT_ARABIC_MISC_SOURCE = font-arabic-misc-$(XFONT_FONT_ARABIC_MISC_VERSION).tar.bz2
 XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ARABIC_MISC_AUTORECONF = NO
 XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 8003d2bc63..52e30b5ead 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BH_100DPI_VERSION = 1.0.1
 XFONT_FONT_BH_100DPI_SOURCE = font-bh-100dpi-$(XFONT_FONT_BH_100DPI_VERSION).tar.bz2
 XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BH_100DPI_AUTORECONF = NO
 XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 42369230bf..58ebb96020 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BH_75DPI_VERSION = 1.0.1
 XFONT_FONT_BH_75DPI_SOURCE = font-bh-75dpi-$(XFONT_FONT_BH_75DPI_VERSION).tar.bz2
 XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BH_75DPI_AUTORECONF = NO
 XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index dafc4eb6cf..7f3e82af6f 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.1
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE = font-bh-lucidatypewriter-100dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION).tar.bz2
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_AUTORECONF = NO
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 6812fc7a4a..35b1ecc675 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.1
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE = font-bh-lucidatypewriter-75dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION).tar.bz2
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_AUTORECONF = NO
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index 13c8c4d2b5..2ded871cfd 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BH_TTF_VERSION = 1.0.1
 XFONT_FONT_BH_TTF_SOURCE = font-bh-ttf-$(XFONT_FONT_BH_TTF_VERSION).tar.bz2
 XFONT_FONT_BH_TTF_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BH_TTF_AUTORECONF = NO
 XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index b4b612fb91..524bbc611e 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BH_TYPE1_VERSION = 1.0.1
 XFONT_FONT_BH_TYPE1_SOURCE = font-bh-type1-$(XFONT_FONT_BH_TYPE1_VERSION).tar.bz2
 XFONT_FONT_BH_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BH_TYPE1_AUTORECONF = NO
 XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index 2fb3b3cb8f..46fe2f7478 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.1
 XFONT_FONT_BITSTREAM_100DPI_SOURCE = font-bitstream-100dpi-$(XFONT_FONT_BITSTREAM_100DPI_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BITSTREAM_100DPI_AUTORECONF = NO
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index b815f7c791..f489def9dd 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.1
 XFONT_FONT_BITSTREAM_75DPI_SOURCE = font-bitstream-75dpi-$(XFONT_FONT_BITSTREAM_75DPI_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BITSTREAM_75DPI_AUTORECONF = NO
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
index 19d4107838..72dd7ccc1e 100644
--- a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
+++ b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BITSTREAM_SPEEDO_VERSION = 1.0.1
 XFONT_FONT_BITSTREAM_SPEEDO_SOURCE = font-bitstream-speedo-$(XFONT_FONT_BITSTREAM_SPEEDO_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_SPEEDO_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BITSTREAM_SPEEDO_AUTORECONF = NO
 XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_SPEEDO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index df1bc9735c..5ee876e763 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.1
 XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BITSTREAM_TYPE1_AUTORECONF = NO
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 919738a422..7b8c25aec3 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.1
 XFONT_FONT_CRONYX_CYRILLIC_SOURCE = font-cronyx-cyrillic-$(XFONT_FONT_CRONYX_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_CRONYX_CYRILLIC_AUTORECONF = NO
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 05a5262045..47c54332e6 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_CURSOR_MISC_VERSION = 1.0.1
 XFONT_FONT_CURSOR_MISC_SOURCE = font-cursor-misc-$(XFONT_FONT_CURSOR_MISC_VERSION).tar.bz2
 XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_CURSOR_MISC_AUTORECONF = NO
 XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index d6514f3159..7b2d16d95b 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.1
 XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSION).tar.bz2
 XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_DAEWOO_MISC_AUTORECONF = NO
 XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index 00dc6767ba..d90733d8d7 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_DEC_MISC_VERSION = 1.0.1
 XFONT_FONT_DEC_MISC_SOURCE = font-dec-misc-$(XFONT_FONT_DEC_MISC_VERSION).tar.bz2
 XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_DEC_MISC_AUTORECONF = NO
 XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index f03eb4f648..561179dfa4 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_IBM_TYPE1_VERSION = 1.0.1
 XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.bz2
 XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_IBM_TYPE1_AUTORECONF = NO
 XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index db66a74561..837ed13e53 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_ISAS_MISC_VERSION = 1.0.1
 XFONT_FONT_ISAS_MISC_SOURCE = font-isas-misc-$(XFONT_FONT_ISAS_MISC_VERSION).tar.bz2
 XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_ISAS_MISC_AUTORECONF = NO
 XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 3f00e32e4f..742a995110 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_JIS_MISC_VERSION = 1.0.1
 XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz2
 XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_JIS_MISC_AUTORECONF = NO
 XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 73672871b8..6f0bd589fc 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_MICRO_MISC_VERSION = 1.0.1
 XFONT_FONT_MICRO_MISC_SOURCE = font-micro-misc-$(XFONT_FONT_MICRO_MISC_VERSION).tar.bz2
 XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_MICRO_MISC_AUTORECONF = NO
 XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index a537b37b05..716e04a871 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.1
 XFONT_FONT_MISC_CYRILLIC_SOURCE = font-misc-cyrillic-$(XFONT_FONT_MISC_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_MISC_CYRILLIC_AUTORECONF = NO
 XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index f7ffcf6bb2..2af5345104 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.1
 XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2
 XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_MISC_ETHIOPIC_AUTORECONF = NO
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index 3f5d5365ce..3707c1fe64 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_MISC_MELTHO_VERSION = 1.0.1
 XFONT_FONT_MISC_MELTHO_SOURCE = font-misc-meltho-$(XFONT_FONT_MISC_MELTHO_VERSION).tar.bz2
 XFONT_FONT_MISC_MELTHO_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_MISC_MELTHO_AUTORECONF = NO
 XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index 8e28f9c9e6..af4cc314b7 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_MISC_MISC_VERSION = 1.1.0
 XFONT_FONT_MISC_MISC_SOURCE = font-misc-misc-$(XFONT_FONT_MISC_MISC_VERSION).tar.bz2
 XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_MISC_MISC_AUTORECONF = NO
 XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 494c1cc50d..7c24ed9bd6 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_MUTT_MISC_VERSION = 1.0.1
 XFONT_FONT_MUTT_MISC_SOURCE = font-mutt-misc-$(XFONT_FONT_MUTT_MISC_VERSION).tar.bz2
 XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_MUTT_MISC_AUTORECONF = NO
 XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 37f0b70e28..2cf822e9f1 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.0
 XFONT_FONT_SCHUMACHER_MISC_SOURCE = font-schumacher-misc-$(XFONT_FONT_SCHUMACHER_MISC_VERSION).tar.bz2
 XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_SCHUMACHER_MISC_AUTORECONF = NO
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index ecb2d805f3..7db1b532d8 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.2
 XFONT_FONT_SCREEN_CYRILLIC_SOURCE = font-screen-cyrillic-$(XFONT_FONT_SCREEN_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_SCREEN_CYRILLIC_AUTORECONF = NO
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 75d5baa8aa..53036af833 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_SONY_MISC_VERSION = 1.0.1
 XFONT_FONT_SONY_MISC_SOURCE = font-sony-misc-$(XFONT_FONT_SONY_MISC_VERSION).tar.bz2
 XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_SONY_MISC_AUTORECONF = NO
 XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 8419842b95..7001e5de9f 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_SUN_MISC_VERSION = 1.0.1
 XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.bz2
 XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_SUN_MISC_AUTORECONF = NO
 XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 66eac4e33d..8a55a5040d 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.1
 XFONT_FONT_WINITZKI_CYRILLIC_SOURCE = font-winitzki-cyrillic-$(XFONT_FONT_WINITZKI_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_WINITZKI_CYRILLIC_AUTORECONF = NO
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 7d3d8cace7..999b7894b9 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -7,7 +7,6 @@
 XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.2
 XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2
 XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_XFREE86_TYPE1_AUTORECONF = NO
 XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 955c5233f2..61cd9fcfd2 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -6,7 +6,6 @@
 XKEYBOARD_CONFIG_VERSION = 2.0
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_AUTORECONF = NO
 XKEYBOARD_CONFIG_INSTALL_STAGING = NO
 XKEYBOARD_CONFIG_INSTALL_TARGET = YES
 XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 75281027de..d6334aa316 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -7,7 +7,6 @@
 XLIB_LIBFS_VERSION = 1.0.2
 XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBFS_AUTORECONF = NO
 XLIB_LIBFS_INSTALL_STAGING = YES
 XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
 XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 338d74bec2..566e1ded09 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -7,7 +7,6 @@
 XLIB_LIBICE_VERSION = 1.0.6
 XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
 XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBICE_AUTORECONF = NO
 XLIB_LIBICE_INSTALL_STAGING = YES
 XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
 
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index 0b92f9368f..7ff5830017 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -7,7 +7,6 @@
 XLIB_LIBSM_VERSION = 1.1.1
 XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
 XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBSM_AUTORECONF = NO
 XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 479cd35aa7..00cc45218a 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXSCRNSAVER_VERSION = 1.2.0
 XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
 XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXSCRNSAVER_AUTORECONF = NO
 XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
 XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
 XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 2404a3e408..f7eb3bdec6 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXAU_VERSION = 1.0.5
 XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXAU_AUTORECONF = NO
 XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index 9a5a33ab22..919d6fc831 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXCOMPOSITE_VERSION = 0.4.1
 XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2
 XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXCOMPOSITE_AUTORECONF = NO
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
 XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
 
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 6f3a776496..3c72bbbfe8 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXCURSOR_VERSION = 1.1.10
 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXCURSOR_AUTORECONF = NO
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index c2ba616ce3..9f10e56266 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXDAMAGE_VERSION = 1.1.2
 XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2
 XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXDAMAGE_AUTORECONF = NO
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
 XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
 
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 1aec4de64d..6f513cfa82 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXDMCP_VERSION = 1.0.3
 XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXDMCP_AUTORECONF = NO
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index c97a9a5cac..2cdffa6819 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXEXT_VERSION = 1.1.1
 XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXEXT_AUTORECONF = NO
 XLIB_LIBXEXT_INSTALL_STAGING = YES
 XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 72cd848bdc..2d8b7fa8bc 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXFIXES_VERSION = 4.0.4
 XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXFIXES_AUTORECONF = NO
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index d90a962411..1b1d4dbaec 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXFONTCACHE_VERSION = 1.0.5
 XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2
 XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXFONTCACHE_AUTORECONF = NO
 XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
 XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
 XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index d6ce633e9c..8c14007d7f 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXI_VERSION = 1.3
 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXI_AUTORECONF = NO
 XLIB_LIBXI_INSTALL_STAGING = YES
 XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
 XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index 0b8262232e..aadf129e88 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXINERAMA_VERSION = 1.1
 XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXINERAMA_AUTORECONF = NO
 XLIB_LIBXINERAMA_INSTALL_STAGING = YES
 XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
 XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index ceebc149e8..ad0d49d4e6 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXMU_VERSION = 1.0.5
 XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
 XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXMU_AUTORECONF = NO
 XLIB_LIBXMU_INSTALL_STAGING = YES
 XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index bc8bfcd4f1..1df392f7f6 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXP_VERSION = 1.0.0
 XLIB_LIBXP_SOURCE = libXp-$(XLIB_LIBXP_VERSION).tar.bz2
 XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXP_AUTORECONF = NO
 XLIB_LIBXP_INSTALL_STAGING = YES
 XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
 XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index ef67b6dde6..6819f57fc6 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXPM_VERSION = 3.5.8
 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPM_AUTORECONF = NO
 XLIB_LIBXPM_INSTALL_STAGING = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index c9b2924fd4..f942626c42 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXPRINTAPPUTIL_VERSION = 1.0.1
 XLIB_LIBXPRINTAPPUTIL_SOURCE = libXprintAppUtil-$(XLIB_LIBXPRINTAPPUTIL_VERSION).tar.bz2
 XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPRINTAPPUTIL_AUTORECONF = NO
 XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index cf6ec1efd6..b693b28a55 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXPRINTUTIL_VERSION = 1.0.1
 XLIB_LIBXPRINTUTIL_SOURCE = libXprintUtil-$(XLIB_LIBXPRINTUTIL_VERSION).tar.bz2
 XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPRINTUTIL_AUTORECONF = NO
 XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
 
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 96e71ea06f..038494b68b 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXRANDR_VERSION = 1.3.0
 XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXRANDR_AUTORECONF = NO
 XLIB_LIBXRANDR_INSTALL_STAGING = YES
 XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
 XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 57781358f0..9a2abe3e64 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXRENDER_VERSION = 0.9.5
 XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXRENDER_AUTORECONF = NO
 XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index cf7fc10d84..79c3bcfae2 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXRES_VERSION = 1.0.4
 XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXRES_AUTORECONF = NO
 XLIB_LIBXRES_INSTALL_STAGING = YES
 XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
 XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index fed9ce49a7..c51e4d0fc9 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXV_VERSION = 1.0.5
 XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXV_AUTORECONF = NO
 XLIB_LIBXV_INSTALL_STAGING = YES
 XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
 XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 6a99b9b3dd..725fa1ecf6 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXVMC_VERSION = 1.0.5
 XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXVMC_AUTORECONF = NO
 XLIB_LIBXVMC_INSTALL_STAGING = YES
 XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
 XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index acfd08a958..515bf51ad6 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXXF86DGA_VERSION = 1.1.1
 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXXF86DGA_AUTORECONF = NO
 XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
 XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
 XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index c80d5b3077..b7a3292da5 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXXF86VM_VERSION = 1.1.0
 XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXXF86VM_AUTORECONF = NO
 XLIB_LIBXXF86VM_INSTALL_STAGING = YES
 XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
 XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 3de2537cfb..bd21f229d9 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -7,7 +7,6 @@
 XLIB_LIBDMX_VERSION = 1.1.0
 XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBDMX_AUTORECONF = NO
 XLIB_LIBDMX_INSTALL_STAGING = YES
 XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
 XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 20cfc8dbb9..948e244103 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -7,7 +7,6 @@
 XLIB_LIBFONTENC_VERSION = 1.0.5
 XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBFONTENC_AUTORECONF = NO
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 0d576ef8f8..56895ab422 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -7,7 +7,6 @@
 XLIB_LIBOLDX_VERSION = 1.0.1
 XLIB_LIBOLDX_SOURCE = liboldX-$(XLIB_LIBOLDX_VERSION).tar.bz2
 XLIB_LIBOLDX_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBOLDX_AUTORECONF = NO
 XLIB_LIBOLDX_INSTALL_STAGING = YES
 XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
 XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 35b61715a6..d80fa0fd98 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXKBFILE_VERSION = 1.0.6
 XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
 XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXKBFILE_AUTORECONF = NO
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index c822a4d2d8..d605989075 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -7,7 +7,6 @@
 XLIB_LIBXKBUI_VERSION = 1.0.2
 XLIB_LIBXKBUI_SOURCE = libxkbui-$(XLIB_LIBXKBUI_VERSION).tar.bz2
 XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXKBUI_AUTORECONF = NO
 XLIB_LIBXKBUI_INSTALL_STAGING = YES
 XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
 
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 62fb51d5a5..a153f4a951 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -7,7 +7,6 @@
 XLIB_XTRANS_VERSION = 1.2.5
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_XTRANS_AUTORECONF = NO
 XLIB_XTRANS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index 2d7b5d1f50..0ba58305a3 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -7,7 +7,6 @@
 XPROTO_APPLEWMPROTO_VERSION = 1.4.1
 XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2
 XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_APPLEWMPROTO_AUTORECONF = NO
 XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
 XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index bb4af54fdc..c9ce4cc023 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -7,7 +7,6 @@
 XPROTO_BIGREQSPROTO_VERSION = 1.1.0
 XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
 XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_BIGREQSPROTO_AUTORECONF = NO
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
 XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index e5a34c0cf8..becf87f702 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -7,7 +7,6 @@
 XPROTO_COMPOSITEPROTO_VERSION = 0.4.1
 XPROTO_COMPOSITEPROTO_SOURCE = compositeproto-$(XPROTO_COMPOSITEPROTO_VERSION).tar.bz2
 XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_COMPOSITEPROTO_AUTORECONF = NO
 XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
 XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index 5eb25fd533..eb2d0a910d 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -7,7 +7,6 @@
 XPROTO_DAMAGEPROTO_VERSION = 1.2.0
 XPROTO_DAMAGEPROTO_SOURCE = damageproto-$(XPROTO_DAMAGEPROTO_VERSION).tar.bz2
 XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DAMAGEPROTO_AUTORECONF = NO
 XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
 XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index 0fcf00d193..eb6a4b11ad 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -7,7 +7,6 @@
 XPROTO_DMXPROTO_VERSION = 2.3
 XPROTO_DMXPROTO_SOURCE = dmxproto-$(XPROTO_DMXPROTO_VERSION).tar.bz2
 XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DMXPROTO_AUTORECONF = NO
 XPROTO_DMXPROTO_INSTALL_STAGING = YES
 XPROTO_DMXPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index a441c9bc8f..5fe2252a05 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -7,7 +7,6 @@
 XPROTO_DRI2PROTO_VERSION = 2.3
 XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2
 XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DRI2PROTO_AUTORECONF = NO
 XPROTO_DRI2PROTO_INSTALL_STAGING = YES
 XPROTO_DRI2PROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index a91e6cb21a..3ead64fd5a 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -7,7 +7,6 @@
 XPROTO_FIXESPROTO_VERSION = 4.1.1
 XPROTO_FIXESPROTO_SOURCE = fixesproto-$(XPROTO_FIXESPROTO_VERSION).tar.bz2
 XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_FIXESPROTO_AUTORECONF = NO
 XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index fec4e87a90..5e5ff5e8a9 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -7,7 +7,6 @@
 XPROTO_FONTCACHEPROTO_VERSION = 0.1.3
 XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2
 XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_FONTCACHEPROTO_AUTORECONF = NO
 XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
 XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index d947009b4d..33c1a80b49 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -7,7 +7,6 @@
 XPROTO_FONTSPROTO_VERSION = 2.1.0
 XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
 XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_FONTSPROTO_AUTORECONF = NO
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES
 XPROTO_FONTSPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index 7bdf057e40..d5816cdaae 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -7,7 +7,6 @@
 XPROTO_GLPROTO_VERSION = 1.4.10
 XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
 XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_GLPROTO_AUTORECONF = NO
 XPROTO_GLPROTO_INSTALL_STAGING = YES
 XPROTO_GLPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index d8fa543124..063a7f3724 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -7,7 +7,6 @@
 XPROTO_INPUTPROTO_VERSION = 2.0
 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_INPUTPROTO_AUTORECONF = NO
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index 9b30fbb881..b2478f2cf3 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -7,7 +7,6 @@
 XPROTO_KBPROTO_VERSION = 1.0.4
 XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
 XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_KBPROTO_AUTORECONF = NO
 XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
index 82ba8218f6..b5000022ae 100644
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -7,7 +7,6 @@
 XPROTO_PRINTPROTO_VERSION = 1.0.3
 XPROTO_PRINTPROTO_SOURCE = printproto-$(XPROTO_PRINTPROTO_VERSION).tar.bz2
 XPROTO_PRINTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_PRINTPROTO_AUTORECONF = NO
 XPROTO_PRINTPROTO_INSTALL_STAGING = YES
 XPROTO_PRINTPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index cfbb213460..dd60b7fe79 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -7,7 +7,6 @@
 XPROTO_RANDRPROTO_VERSION = 1.3.1
 XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2
 XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RANDRPROTO_AUTORECONF = NO
 XPROTO_RANDRPROTO_INSTALL_STAGING = YES
 XPROTO_RANDRPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 4c35605237..d37eec7331 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -7,7 +7,6 @@
 XPROTO_RECORDPROTO_VERSION = 1.14
 XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2
 XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RECORDPROTO_AUTORECONF = NO
 XPROTO_RECORDPROTO_INSTALL_STAGING = YES
 XPROTO_RECORDPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index dac3424bcb..49d2fbc1bc 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -7,7 +7,6 @@
 XPROTO_RENDERPROTO_VERSION = 0.11
 XPROTO_RENDERPROTO_SOURCE = renderproto-$(XPROTO_RENDERPROTO_VERSION).tar.bz2
 XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RENDERPROTO_AUTORECONF = NO
 XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index 081297873a..134c76cbf8 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -7,7 +7,6 @@
 XPROTO_RESOURCEPROTO_VERSION = 1.1.0
 XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
 XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RESOURCEPROTO_AUTORECONF = NO
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
 XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 2705a3ae75..7eee0f8195 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -7,7 +7,6 @@
 XPROTO_SCRNSAVERPROTO_VERSION = 1.2.0
 XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
 XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_SCRNSAVERPROTO_AUTORECONF = NO
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
 XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 4dafe3b89d..1fd61a8233 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -7,7 +7,6 @@
 XPROTO_VIDEOPROTO_VERSION = 2.3.0
 XPROTO_VIDEOPROTO_SOURCE = videoproto-$(XPROTO_VIDEOPROTO_VERSION).tar.bz2
 XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_VIDEOPROTO_AUTORECONF = NO
 XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
 XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index bf0b59b247..4e1ea806d7 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -7,7 +7,6 @@
 XPROTO_WINDOWSWMPROTO_VERSION = 1.0.4
 XPROTO_WINDOWSWMPROTO_SOURCE = windowswmproto-$(XPROTO_WINDOWSWMPROTO_VERSION).tar.bz2
 XPROTO_WINDOWSWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_WINDOWSWMPROTO_AUTORECONF = NO
 XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
 XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 59f2592421..f8e498d76a 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XCMISCPROTO_VERSION = 1.2.0
 XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
 XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XCMISCPROTO_AUTORECONF = NO
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 0a61fb23eb..881ab70391 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XEXTPROTO_VERSION = 7.1.1
 XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
 XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XEXTPROTO_AUTORECONF = NO
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index d7524e625e..87b607e2cc 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XF86BIGFONTPROTO_VERSION = 1.2.0
 XPROTO_XF86BIGFONTPROTO_SOURCE = xf86bigfontproto-$(XPROTO_XF86BIGFONTPROTO_VERSION).tar.bz2
 XPROTO_XF86BIGFONTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86BIGFONTPROTO_AUTORECONF = NO
 XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index 41fcfed281..e8aed3c76b 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XF86DGAPROTO_VERSION = 2.1
 XPROTO_XF86DGAPROTO_SOURCE = xf86dgaproto-$(XPROTO_XF86DGAPROTO_VERSION).tar.bz2
 XPROTO_XF86DGAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86DGAPROTO_AUTORECONF = NO
 XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index c8ec7fc00e..0eb57f6a1c 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XF86DRIPROTO_VERSION = 2.1.0
 XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2
 XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86DRIPROTO_AUTORECONF = NO
 XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
index d4145ecec1..577e325052 100644
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XF86RUSHPROTO_VERSION = 1.1.2
 XPROTO_XF86RUSHPROTO_SOURCE = xf86rushproto-$(XPROTO_XF86RUSHPROTO_VERSION).tar.bz2
 XPROTO_XF86RUSHPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86RUSHPROTO_AUTORECONF = NO
 XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
 XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index 0910867dfe..01940700de 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XF86VIDMODEPROTO_VERSION = 2.3
 XPROTO_XF86VIDMODEPROTO_SOURCE = xf86vidmodeproto-$(XPROTO_XF86VIDMODEPROTO_VERSION).tar.bz2
 XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86VIDMODEPROTO_AUTORECONF = NO
 XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
 XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index a73ded9e47..ad2357cfd1 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XINERAMAPROTO_VERSION = 1.2
 XPROTO_XINERAMAPROTO_SOURCE = xineramaproto-$(XPROTO_XINERAMAPROTO_VERSION).tar.bz2
 XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XINERAMAPROTO_AUTORECONF = NO
 XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
 XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index 65510e93ed..8f81d05650 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -7,7 +7,6 @@
 XPROTO_XPROTO_VERSION = 7.0.16
 XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
 XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XPROTO_AUTORECONF = NO
 XPROTO_XPROTO_INSTALL_STAGING = YES
 XPROTO_XPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 54f98b784d..df7ba9a9f0 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -8,7 +8,6 @@ XSERVER_XORG_SERVER_VERSION = 1.7.5
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
-XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
 
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 657a2fce1a..5c7bfd3d60 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -7,7 +7,6 @@
 XUTIL_MAKEDEPEND_VERSION = 1.0.2
 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2
 XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
-XUTIL_MAKEDEPEND_AUTORECONF = NO
 XUTIL_MAKEDEPEND_INSTALL_STAGING = NO
 XUTIL_MAKEDEPEND_INSTALL_TARGET = YES
 
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 8bb7f8f13c..c06cf01d2b 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -7,7 +7,6 @@
 XUTIL_UTIL_MACROS_VERSION = 1.3.0
 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
-XUTIL_UTIL_MACROS_AUTORECONF = NO
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 

From efb5aefbfe5221a3e49702c02ec80428311dc17a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Wed, 21 Sep 2011 12:24:10 +0200
Subject: [PATCH 0763/6849] libiconv: bump to 1.14

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libiconv/libiconv.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index 9d02a4afe8..48a380f53d 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -3,12 +3,10 @@
 # libiconv
 #
 #############################################################
-LIBICONV_VERSION = 1.12
+LIBICONV_VERSION = 1.14
 LIBICONV_SOURCE = libiconv-$(LIBICONV_VERSION).tar.gz
 LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
-LIBICONV_AUTORECONF = NO
 LIBICONV_INSTALL_STAGING = YES
-LIBICONV_INSTALL_TARGET = YES
 
 # Remove not used preloadable libiconv.so
 define LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS

From 08540f43b63abccfc243834c637a5624ef69952f Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@free-electrons.com>
Date: Mon, 3 Oct 2011 12:10:31 +0200
Subject: [PATCH 0764/6849] Add the picocom package

[Peter: fix Config.in help text indentation]
Signed-off-by: Maxime Ripard <maxime@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/picocom/Config.in  |  8 ++++++++
 package/picocom/picocom.mk | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/picocom/Config.in
 create mode 100644 package/picocom/picocom.mk

diff --git a/package/Config.in b/package/Config.in
index 8b9c81666e..7dfcc5597b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -193,6 +193,7 @@ source "package/ntfs-3g/Config.in"
 source "package/ntfsprogs/Config.in"
 source "package/openocd/Config.in"
 source "package/pciutils/Config.in"
+source "package/picocom/Config.in"
 source "package/rng-tools/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
diff --git a/package/picocom/Config.in b/package/picocom/Config.in
new file mode 100644
index 0000000000..bd584e20e0
--- /dev/null
+++ b/package/picocom/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PICOCOM
+	bool "picocom"
+	help
+	  picocom is a minimal dumb-terminal emulation program. It
+	  is, in principle, very much like minicom, only it's pico
+	  instead of mini!
+
+	  http://code.google.com/p/picocom/
diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
new file mode 100644
index 0000000000..fa02594130
--- /dev/null
+++ b/package/picocom/picocom.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# picocom
+#
+#############################################################
+
+PICOCOM_VERSION = 1.6
+PICOCOM_SITE    = http://picocom.googlecode.com/files/
+
+define PICOCOM_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define PICOCOM_INSTALL_TARGET_CMDS
+	install -D -m 0755 $(@D)/picocom $(TARGET_DIR)/usr/bin/picocom
+endef
+
+$(eval $(call GENTARGETS,package,picocom))

From 63b7450072c72a1b2f4af6c893e70dd9658e9fb3 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@free-electrons.com>
Date: Mon, 3 Oct 2011 12:10:33 +0200
Subject: [PATCH 0765/6849] Add lame support in gstreamer

Signed-off-by: Maxime Ripard <maxime@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-ugly/Config.in           | 4 ++++
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/gst-plugins-ugly/Config.in b/package/multimedia/gst-plugins-ugly/Config.in
index 94e2b9d554..c0046e422f 100644
--- a/package/multimedia/gst-plugins-ugly/Config.in
+++ b/package/multimedia/gst-plugins-ugly/Config.in
@@ -38,6 +38,10 @@ config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA
 
 comment "plugins with external dependencies (there may be more available)"
 
+config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME
+	bool "lame (*.mp3 audio encoder)"
+	select BR2_PACKAGE_LAME
+
 config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD
 	bool "mad (*.mp3 audio)"
 	select BR2_PACKAGE_LIBID3TAG
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index 5237bc95fa..e46b515cc3 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -60,6 +60,13 @@ else
 GST_PLUGINS_UGLY_CONF_OPT += --disable-synaesthesia
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME),y)
+GST_PLUGINS_UGLY_CONF_OPT += --enable-lame
+GST_PLUGINS_UGLY_DEPENDENCIES += lame
+else
+GST_PLUGINS_UGLY_CONF_OPT += --disable-lame
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y)
 GST_PLUGINS_UGLY_CONF_OPT += --enable-mad
 GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad

From a5094a056ad99da7763d93a97b8e61630f60d170 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Oct 2011 22:50:41 +0200
Subject: [PATCH 0766/6849] openocd: remove fixed ldflags breaking build

The openocd configure script would forcibly add -L/usr/lib to LDFLAGS,
causing the cross compiler to use host libraries, breaking the build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../openocd-0005-dont-force-ldflags.patch     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/openocd/openocd-0005-dont-force-ldflags.patch

diff --git a/package/openocd/openocd-0005-dont-force-ldflags.patch b/package/openocd/openocd-0005-dont-force-ldflags.patch
new file mode 100644
index 0000000000..1880e00504
--- /dev/null
+++ b/package/openocd/openocd-0005-dont-force-ldflags.patch
@@ -0,0 +1,37 @@
+[PATCH] don't force library search path / rpath settings
+
+openocd adds -L$exec_prefix/lib -Wl,rpath,$exec_prefix/lib to the compile
+LDFLAGS if it isn't installed into /usr/local, which breaks cross compilation
+as the compiler ends up using host libraries.
+---
+ configure.in |   17 -----------------
+ 1 file changed, 17 deletions(-)
+
+Index: openocd-0.5.0/configure.in
+===================================================================
+--- openocd-0.5.0.orig/configure.in
++++ openocd-0.5.0/configure.in
+@@ -174,23 +174,6 @@
+ # Let make expand exec_prefix.
+ test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix"
+ 
+-# what matters is the "exec-prefix"
+-if test "$OCDxprefix" != "$ac_default_prefix"
+-then
+-    # We are installing in a non-standard place
+-    # Nonstandard --prefix and/or --exec-prefix
+-    # We have an override of some sort.
+-    # use build specific install library dir
+-
+-    LDFLAGS="$LDFLAGS -L$OCDxprefix/lib"
+-    # RPATH becomes an issue on Linux only
+-    if test $host_os = linux-gnu || test $host_os = linux ; then
+-      LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
+-    fi
+-    # The "INCDIR" is also usable
+-    CFLAGS="$CFLAGS -I$includedir"
+-fi
+-
+ AC_ARG_WITH(ftd2xx,
+    AS_HELP_STRING([--with-ftd2xx=<PATH>],[This option has been removed.]),
+   [

From e684cecbfa9c01ed8b7494e4b294c8b6b303747e Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 5 Oct 2011 15:34:59 -0500
Subject: [PATCH 0767/6849] pkg-stats: use correct variable names for
 convert_to_*autotools

The variable convert_to_autotools is not used in the script.  The correct
variables are convert_to_target_autotools and convert_to_host_autotools.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 3e89bd14b8..30a21f20f8 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -71,7 +71,8 @@ tr.correct td {
 
 convert_to_generic_target=0
 convert_to_generic_host=0
-convert_to_autotools=0
+convert_to_target_autotools=0
+convert_to_host_autotools=0
 total_patch_count=0
 cnt=0
 for i in $(find package/ -name '*.mk') ; do

From b426e34dbc6908774e311023e6b2e0e4c6817f84 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 5 Oct 2011 17:28:01 -0500
Subject: [PATCH 0768/6849] less: bump version to 444

less-444 was released on 9 Jun 2011.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/less/less.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/less/less.mk b/package/less/less.mk
index d20c2323e1..5f74f5c048 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LESS_VERSION = 443
+LESS_VERSION = 444
 LESS_SITE = http://www.greenwoodsoftware.com/less
 LESS_DEPENDENCIES = ncurses
 

From b706e4d0e46a047d84554fe03bf4c2f2c5d1cf66 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 5 Oct 2011 18:57:26 -0500
Subject: [PATCH 0769/6849] pkg-stats: update list of .mk to ignore

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 30a21f20f8..0a030c1ab5 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -80,6 +80,7 @@ for i in $(find package/ -name '*.mk') ; do
     if test \
 	$i = "package/java/java.mk" -o \
 	$i = "package/games/games.mk" -o \
+	$i = "package/gtk2-themes/gtk2-themes.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \
 	$i = "package/customize/customize.mk" -o \
 	$i = "package/matchbox/matchbox.mk" -o \

From ddb3e10707eb5da80d0a9d57d251fbf626127178 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@free-electrons.com>
Date: Mon, 3 Oct 2011 12:10:34 +0200
Subject: [PATCH 0770/6849] Add the libplayer package

[Peter: use select instead of depends for mplayer/gstreamer, small tweaks]
Signed-off-by: Maxime Ripard <maxime@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in              |  1 +
 package/multimedia/libplayer/Config.in    | 30 ++++++++++++++++
 package/multimedia/libplayer/libplayer.mk | 44 +++++++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 package/multimedia/libplayer/Config.in
 create mode 100644 package/multimedia/libplayer/libplayer.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 40760b742f..7b63c1421b 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -26,6 +26,7 @@ source "package/multimedia/libmms/Config.in"
 source "package/multimedia/libmpd/Config.in"
 source "package/multimedia/libmpeg2/Config.in"
 source "package/multimedia/libogg/Config.in"
+source "package/multimedia/libplayer/Config.in"
 source "package/multimedia/libreplaygain/Config.in"
 source "package/multimedia/libsamplerate/Config.in"
 source "package/multimedia/libsndfile/Config.in"
diff --git a/package/multimedia/libplayer/Config.in b/package/multimedia/libplayer/Config.in
new file mode 100644
index 0000000000..c9add532ca
--- /dev/null
+++ b/package/multimedia/libplayer/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_LIBPLAYER
+	depends on BR2_LARGEFILE
+	bool "libplayer"
+	help
+	  libplayer provides a generic A/V API that relies on various multimedia
+	  player for Linux systems. It currently supports MPlayer, xine VLC and
+	  GStreamer only
+
+	  http://libplayer.geexbox.org/
+
+if BR2_PACKAGE_LIBPLAYER
+config BR2_PACKAGE_LIBPLAYER_MPLAYER
+	bool "mplayer backend"
+	select BR2_PACKAGE_MPLAYER
+
+config BR2_PACKAGE_LIBPLAYER_GSTREAMER
+	bool "gstreamer backend"
+	depends on BR2_USE_WCHAR # glib2
+	select BR2_PACKAGE_GSTREAMER
+
+comment "gstreamer backend requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
+config BR2_PACKAGE_LIBPLAYER_PYTHON
+	depends on BR2_PACKAGE_PYTHON
+	bool "Libplayer python bindings"
+endif
+
+comment "libplayer requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/multimedia/libplayer/libplayer.mk b/package/multimedia/libplayer/libplayer.mk
new file mode 100644
index 0000000000..15524316cf
--- /dev/null
+++ b/package/multimedia/libplayer/libplayer.mk
@@ -0,0 +1,44 @@
+#############################################################
+#
+# libplayer
+#
+#############################################################
+LIBPLAYER_VERSION = 2.0.1
+LIBPLAYER_SITE = http://libplayer.geexbox.org/releases/
+LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2
+
+# When passing the standard buildroot configure arguments, the configure script
+# breaks on --target and --host options. Thus we need to define a configure cmd
+# ourselves.
+define LIBPLAYER_CONFIGURE_CMDS
+	(cd $(@D) && rm -rf config.cache && \
+	$(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_CONFIGURE_ARGS) \
+	./configure \
+		--prefix=/usr \
+		--cross-compile \
+		$(SHARED_STATIC_LIBS_OPTS) \
+		$(QUIET) $(LIBPLAYER_CONF_OPT) \
+	)
+endef
+
+ifeq ($(BR2_PACKAGE_LIBPLAYER_MPLAYER),y)
+	LIBPLAYER_DEPENDENCIES += mplayer
+	LIBPLAYER_CONF_OPT += --enable-mplayer
+else
+	LIBPLAYER_CONF_OPT += --disable-mplayer
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y)
+	LIBPLAYER_DEPENDENCIES += gstreamer
+	LIBPLAYER_CONF_OPT += --enable-gstreamer
+else
+	LIBPLAYER_CONF_OPT += --disable-gstreamer
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y)
+	LIBPLAYER_DEPENDENCIES += python
+	LIBPLAYER_CONF_OPT += --enable-binding-python
+endif
+
+$(eval $(call AUTOTARGETS,package,libplayer))

From 2e2244d6a439c2c5fa0dfeb11a6fa949158b0adf Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 6 Oct 2011 14:39:12 +0200
Subject: [PATCH 0771/6849] picocom: remove useless arguments from GENTARGETS

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/picocom/picocom.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index fa02594130..fce50d9f22 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -15,4 +15,4 @@ define PICOCOM_INSTALL_TARGET_CMDS
 	install -D -m 0755 $(@D)/picocom $(TARGET_DIR)/usr/bin/picocom
 endef
 
-$(eval $(call GENTARGETS,package,picocom))
+$(eval $(call GENTARGETS))

From 77ffba834f81a1fb6a9d499c004eb9a8cd82085a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Oct 2011 14:48:15 +0200
Subject: [PATCH 0772/6849] libplayer: remove unneeded extra AUTOTARGETS
 parameters

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libplayer/libplayer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libplayer/libplayer.mk b/package/multimedia/libplayer/libplayer.mk
index 15524316cf..093821e403 100644
--- a/package/multimedia/libplayer/libplayer.mk
+++ b/package/multimedia/libplayer/libplayer.mk
@@ -41,4 +41,4 @@ ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y)
 	LIBPLAYER_CONF_OPT += --enable-binding-python
 endif
 
-$(eval $(call AUTOTARGETS,package,libplayer))
+$(eval $(call AUTOTARGETS))

From bc9954e6d6b67556ccb4bcbf9b1e96e24a18b7e1 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 6 Oct 2011 14:37:27 +0200
Subject: [PATCH 0773/6849] pkg-stats: update script location in usage
 instructions

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 0a030c1ab5..64aae5faed 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -22,7 +22,7 @@
 #
 # Run the script from the Buildroot toplevel directory:
 #
-#  ./scripts/pkg-stats > /tmp/pkg.html
+#  ./support/scripts/pkg-stats > /tmp/pkg.html
 #
 
 echo "<head>

From 811fab1b26f7590c2696801b82347767bbbc0809 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 4 Oct 2011 10:02:03 +0200
Subject: [PATCH 0774/6849] package: add the poco C++ libraries collection

Add the C++ Portable Components libraries.

The Data/ODBC components is disabled because its dependency (unixODBC) is not
in Buildroot.

The Data/MySQL component is build tested only. It probably requires an
additional RPATH to actually run, because libmysqlclient resides in a
non-standard location under /usr/lib/mysql.

[Peter: use depends on for toolchain options]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/poco/Config.in                        | 57 +++++++++++++
 .../poco-1.4.2p1-add-cross-build-config.patch | 82 +++++++++++++++++++
 ...poco-1.4.2p1-add-staging-search-path.patch | 22 +++++
 .../poco-1.4.2p1-dont-build-debug-libs.patch  | 19 +++++
 package/poco/poco.mk                          | 57 +++++++++++++
 6 files changed, 238 insertions(+)
 create mode 100644 package/poco/Config.in
 create mode 100644 package/poco/poco-1.4.2p1-add-cross-build-config.patch
 create mode 100644 package/poco/poco-1.4.2p1-add-staging-search-path.patch
 create mode 100644 package/poco/poco-1.4.2p1-dont-build-debug-libs.patch
 create mode 100644 package/poco/poco.mk

diff --git a/package/Config.in b/package/Config.in
index 7dfcc5597b..173e19d461 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -354,6 +354,7 @@ source "package/libnspr/Config.in"
 source "package/liboil/Config.in"
 source "package/libsigc/Config.in"
 source "package/orc/Config.in"
+source "package/poco/Config.in"
 source "package/startup-notification/Config.in"
 endmenu
 
diff --git a/package/poco/Config.in b/package/poco/Config.in
new file mode 100644
index 0000000000..241e304309
--- /dev/null
+++ b/package/poco/Config.in
@@ -0,0 +1,57 @@
+config BR2_PACKAGE_POCO
+	bool "poco"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PCRE
+	help
+	  The C++ Portable Components Libraries
+
+	  http://pocoproject.org
+
+if BR2_PACKAGE_POCO
+
+comment "poco components"
+
+config BR2_PACKAGE_POCO_XML
+	bool "xml"
+	select BR2_PACKAGE_EXPAT
+
+config BR2_PACKAGE_POCO_UTIL
+	bool "util"
+	select BR2_PACKAGE_POCO_XML
+
+config BR2_PACKAGE_POCO_NET
+	bool "net"
+
+config BR2_PACKAGE_POCO_CRYPTO
+	bool "crypto"
+	select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_POCO_NETSSL_OPENSSL
+	bool "netssl_openssl"
+	select BR2_PACKAGE_POCO_NET
+	select BR2_PACKAGE_POCO_CRYPTO
+	select BR2_PACKAGE_POCO_UTIL
+	select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_POCO_ZIP
+	bool "zip"
+
+config BR2_PACKAGE_POCO_DATA
+	bool
+
+config BR2_PACKAGE_POCO_DATA_SQLITE
+	bool "sqlite"
+	select BR2_PACKAGE_POCO_DATA
+	select BR2_PACKAGE_SQLITE
+
+config BR2_PACKAGE_POCO_DATA_MYSQL
+	bool "mysql"
+	select BR2_PACKAGE_POCO_DATA
+	select BR2_PACKAGE_MYSQL_CLIENT
+
+endif # BR2_PACKAGE_POCO
+
+comment "poco requires a toolchain with WCHAR and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/poco/poco-1.4.2p1-add-cross-build-config.patch b/package/poco/poco-1.4.2p1-add-cross-build-config.patch
new file mode 100644
index 0000000000..a08783833b
--- /dev/null
+++ b/package/poco/poco-1.4.2p1-add-cross-build-config.patch
@@ -0,0 +1,82 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Subject: [PATCH] poco: add Linux configuration file for generic cross build
+
+This patch adds the Linux-CrossEnv config file to poco. This file is identical
+to the Linux one, except the added CROSSENV variable that allows setting of
+the toolchain prefix.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+diff -Nuar poco-1.4.1p1-dist/build/config/Linux-CrossEnv poco-1.4.1p1/build/config/Linux-CrossEnv
+--- poco-1.4.1p1-dist/build/config/Linux-CrossEnv	1970-01-01 02:00:00.000000000 +0200
++++ poco-1.4.1p1/build/config/Linux-CrossEnv	2011-08-02 18:51:03.682047719 +0300
+@@ -0,0 +1,69 @@
++#
++# Linux
++#
++# Make settings for cross compiled Linux
++#
++#
++
++#
++# General Settings
++#
++LINKMODE ?= SHARED
++
++#
++# Define Tools
++#
++CC      = $(CROSSENV)gcc
++CXX     = $(CROSSENV)g++
++LINK    = $(CXX)
++LIB     = $(CROSSENV)ar -cr
++RANLIB  = $(CROSSENV)ranlib
++SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
++SHLIBLN = $(POCO_BASE)/build/script/shlibln
++STRIP   = $(CROSSENV)strip
++DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
++SHELL   = sh
++RM      = rm -rf
++CP      = cp
++MKDIR   = mkdir -p
++
++#
++# Extension for Shared Libraries
++#
++SHAREDLIBEXT     = .so.$(target_version)
++SHAREDLIBLINKEXT = .so
++
++#
++# Compiler and Linker Flags
++#
++CFLAGS          = 
++CFLAGS32        =
++CFLAGS64        =
++CXXFLAGS        = -Wall -Wno-sign-compare
++CXXFLAGS32      =
++CXXFLAGS64      =
++LINKFLAGS       =
++LINKFLAGS32     =
++LINKFLAGS64     =
++STATICOPT_CC    =
++STATICOPT_CXX   =
++STATICOPT_LINK  = -static
++SHAREDOPT_CC    = -fPIC
++SHAREDOPT_CXX   = -fPIC
++SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
++DEBUGOPT_CC     = -g -D_DEBUG
++DEBUGOPT_CXX    = -g -D_DEBUG
++DEBUGOPT_LINK   = -g
++RELEASEOPT_CC   = -O2 -DNDEBUG
++RELEASEOPT_CXX  = -O2 -DNDEBUG
++RELEASEOPT_LINK = -O2
++
++#
++# System Specific Flags
++#
++SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL
++
++#
++# System Specific Libraries
++#
++SYSLIBS  = -lpthread -ldl -lrt
diff --git a/package/poco/poco-1.4.2p1-add-staging-search-path.patch b/package/poco/poco-1.4.2p1-add-staging-search-path.patch
new file mode 100644
index 0000000000..18ee076eba
--- /dev/null
+++ b/package/poco/poco-1.4.2p1-add-staging-search-path.patch
@@ -0,0 +1,22 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Subject: [PATCH] poco: add the staging path to search path
+
+Add the mysql headers and client libraries to the search path of the
+preprocessor and the linker. The $MYSQL_LIBDIR variable must be set from the
+make command line.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+--- 
+--- poco-1.4.1p1-all-dist/Data/MySQL/Makefile	2011-02-09 11:13:00.000000000 +0200
++++ poco-1.4.1p1-all/Data/MySQL/Makefile	2011-08-07 09:03:37.106161274 +0300
+@@ -8,8 +8,8 @@
+ 
+ include $(POCO_BASE)/build/rules/global
+ 
+-SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
+-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
++SYSLIBS += -L$(MYSQL_LIBDIR) -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
++INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I=/mysql
+ SYSFLAGS += -DTHREADSAFE -DNO_TCL
+ 
+ objects = Binder Extractor SessionImpl Connector \
diff --git a/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch b/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch
new file mode 100644
index 0000000000..7480963721
--- /dev/null
+++ b/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch
@@ -0,0 +1,19 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Subject: [PATCH] poco: don't build debug libraries
+
+Remove the debug libraries build dependency from the default target.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+--- poco-1.4.1p1-dist/build/rules/compile	2011-02-09 11:12:24.000000000 +0200
++++ poco-1.4.1p1/build/rules/compile	2011-08-03 07:51:42.946044176 +0300
+@@ -14,7 +14,7 @@
+ 
+ all: $(DEFAULT_TARGET)
+ all_static: static_debug static_release
+-all_shared: shared_debug shared_release
++all_shared: shared_release
+ all_debug: static_debug shared_debug
+ all_release: static_release shared_release
+ 
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
new file mode 100644
index 0000000000..4823935772
--- /dev/null
+++ b/package/poco/poco.mk
@@ -0,0 +1,57 @@
+#############################################################
+#
+# poco
+#
+#############################################################
+POCO_VERSION = 1.4.2p1
+POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
+POCO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poco
+POCO_INSTALL_STAGING = YES
+
+POCO_DEPENDENCIES = zlib pcre					\
+	$(if $(BR2_PACKAGE_POCO_XML),expat)			\
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl)		\
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl)	\
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite)		\
+	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql_client)
+
+POCO_OMIT = Data/ODBC PageCompiler					\
+	$(if $(BR2_PACKAGE_POCO_XML),,XML)				\
+	$(if $(BR2_PACKAGE_POCO_UTIL),,Util)				\
+	$(if $(BR2_PACKAGE_POCO_NET),,Net)				\
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL)	\
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto)			\
+	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip)				\
+	$(if $(BR2_PACKAGE_POCO_DATA),,Data)				\
+	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL)		\
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
+
+ifeq ($(LIBC),uclibc)
+POCO_CONF_OPT += --no-fpenvironment --no-wstring
+endif
+
+define POCO_CONFIGURE_CMDS
+	(cd $(@D); ./configure \
+		--config=Linux-CrossEnv	\
+		--prefix=/usr		\
+		--omit="$(POCO_OMIT)"	\
+		$(POCO_CONF_OPT)	\
+		--unbundled		\
+		--no-tests		\
+		--no-samples)
+endef
+
+define POCO_BUILD_CMDS
+	$(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \
+		MYSQL_LIBDIR=$(TARGET_DIR)/usr/lib/mysql -C $(@D)
+endef
+
+define POCO_INSTALL_STAGING_CMDS
+	$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
+endef
+
+define POCO_INSTALL_TARGET_CMDS
+	$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
+endef
+
+$(eval $(call GENTARGETS))

From 7f7cff5239a29e9a8e6436650ea4fad3a736d90d Mon Sep 17 00:00:00 2001
From: Roeland Van Praet <roelvp@mind.be>
Date: Fri, 7 Oct 2011 09:04:26 +0200
Subject: [PATCH 0775/6849] package: add 'pv' (Pipe-Viewer)

Signed-off-by: Roeland Van Praet <roelvp@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in               |  1 +
 package/pv/Config.in            |  8 ++++++++
 package/pv/pv-1.2.0-fixld.patch | 21 +++++++++++++++++++++
 package/pv/pv.mk                | 11 +++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 package/pv/Config.in
 create mode 100644 package/pv/pv-1.2.0-fixld.patch
 create mode 100644 package/pv/pv.mk

diff --git a/package/Config.in b/package/Config.in
index 173e19d461..904ebb6e9a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -31,6 +31,7 @@ source "package/oprofile/Config.in"
 source "package/strace/Config.in"
 source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
+source "package/pv/Config.in"
 endmenu
 
 menu "Development tools"
diff --git a/package/pv/Config.in b/package/pv/Config.in
new file mode 100644
index 0000000000..671f78e8c9
--- /dev/null
+++ b/package/pv/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PV
+	bool "pv"
+	help
+	  Pipe Viewer - is a terminal-based tool for
+	  monitoring the progress of data through a
+	  pipeline.
+
+	  http://www.ivarch.com/programs/pv.shtml
diff --git a/package/pv/pv-1.2.0-fixld.patch b/package/pv/pv-1.2.0-fixld.patch
new file mode 100644
index 0000000000..9df279de52
--- /dev/null
+++ b/package/pv/pv-1.2.0-fixld.patch
@@ -0,0 +1,21 @@
+[PATCH] fix linker variable
+
+The linker variable LD was always set to 'ld' instead of the value from
+the environment. This breaks any linking, especially when dealing with
+a cross-compiler toolchain.
+The fix takes the CC variable and changes the 'gcc' extension to 'ld'.
+
+Signed-off-by: Roeland Van Praet <roelvp@mind.be>
+---
+diff -ruN a/autoconf/make/vars.mk b/autoconf/make/vars.mk
+--- a/autoconf/make/vars.mk	2010-03-11 00:43:19.000000000 +0100
++++ b/autoconf/make/vars.mk	2011-10-06 15:47:18.000000000 +0200
+@@ -30,7 +30,7 @@
+ @SET_MAKE@
+ SHELL = /bin/sh
+ CC = @CC@
+-LD = ld
++LD = $(CC:gcc=ld)
+ DO_GZIP = @DO_GZIP@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
new file mode 100644
index 0000000000..5f15f5b54d
--- /dev/null
+++ b/package/pv/pv.mk
@@ -0,0 +1,11 @@
+#######################
+#
+# pv - Pipe Viewer
+#
+#######################
+
+PV_VERSION = 1.2.0
+PV_SOURCE = pv-$(PV_VERSION).tar.bz2
+PV_SITE = http://pipeviewer.googlecode.com/files
+
+$(eval $(call AUTOTARGETS))

From 8181103018e3d655965866e975bba0143bb66d09 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 6 Oct 2011 15:35:32 -0500
Subject: [PATCH 0776/6849] libevent: bump version to 2.0.14

Released 2011-08-31.  Mostly bugfixes.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libevent/libevent.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 31122fe408..76fb627a17 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -3,9 +3,9 @@
 # libevent
 #
 #############################################################
-LIBEVENT_VERSION = 2.0.13
+LIBEVENT_VERSION = 2.0.14
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
-LIBEVENT_SITE = http://monkey.org/~provos/
+LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
 
 LIBEVENT_AUTORECONF = NO
 LIBEVENT_INSTALL_STAGING = YES

From 3b661b77212f08117b21c9fa3101fe101f864ea3 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 4 Oct 2011 12:51:16 +0200
Subject: [PATCH 0777/6849] directfb: bump to version 1.4.15

Remove patch that has been included upstream.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../directfb-1.4.13-ppc-compile-fix.patch       | 17 -----------------
 package/directfb/directfb.mk                    |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 package/directfb/directfb-1.4.13-ppc-compile-fix.patch

diff --git a/package/directfb/directfb-1.4.13-ppc-compile-fix.patch b/package/directfb/directfb-1.4.13-ppc-compile-fix.patch
deleted file mode 100644
index 2514eae6ed..0000000000
--- a/package/directfb/directfb-1.4.13-ppc-compile-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- lib/direct/ppcasm_memcpy_cachable.S |    2 --
- 1 file changed, 2 deletions(-)
-
-Index: DirectFB-1.2.7/lib/direct/ppcasm_memcpy_cachable.S
-===================================================================
---- DirectFB-1.2.7.orig/lib/direct/ppcasm_memcpy_cachable.S
-+++ DirectFB-1.2.7/lib/direct/ppcasm_memcpy_cachable.S
-@@ -34,8 +34,6 @@
- 
- #define __ASSEMBLY__
- 
--#include <linux/config.h>
--
- #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
- #define L1_CACHE_LINE_SIZE       16
- #define LG_L1_CACHE_LINE_SIZE     4 
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index af645429f8..977d272199 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 DIRECTFB_VERSION_MAJOR = 1.4
-DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).13
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).15
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_AUTORECONF = YES

From 16c8c56ade8a3ec0d9974a59cb08620d34c9c616 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 4 Oct 2011 12:51:17 +0200
Subject: [PATCH 0778/6849] linux-fusion: bump to version 8.7.0

Remove patch that has become obsolete.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...sion-8.1.2-fix-warnings-at-link-time.patch | 40 -------------------
 package/linux-fusion/linux-fusion.mk          |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch

diff --git a/package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch b/package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch
deleted file mode 100644
index 7c46eaff00..0000000000
--- a/package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7884688ba7a2e4cb7772cbedb34245a7fc9bf9d9 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <llandwerlin@gmail.com>
-Date: Wed, 3 Nov 2010 10:25:17 +0100
-Subject: [PATCH] Fix warnings at link time
-
-Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
----
- linux/drivers/char/fusion/entries.c   |    2 +-
- linux/drivers/char/fusion/fusiondev.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/linux/drivers/char/fusion/entries.c b/linux/drivers/char/fusion/entries.c
-index 11edd43..8d102cf 100644
---- a/linux/drivers/char/fusion/entries.c
-+++ b/linux/drivers/char/fusion/entries.c
-@@ -28,7 +28,7 @@
- #include "fusiondev.h"
- #include "entries.h"
- 
--struct timeval now;
-+static struct timeval now;
- 
- void
- fusion_entries_init(FusionEntries * entries,
-diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c
-index 2457bc1..7c7680d 100644
---- a/linux/drivers/char/fusion/fusiondev.c
-+++ b/linux/drivers/char/fusion/fusiondev.c
-@@ -64,7 +64,7 @@
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Denis Oliver Kropp <dok@directfb.org>");
- 
--struct proc_dir_entry *proc_fusion_dir;
-+static struct proc_dir_entry *proc_fusion_dir;
- 
- static int fusion_major = FUSION_MAJOR;
- 
--- 
-1.6.0.6
-
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 4dba98f1cd..2e62dba02c 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
 # linux-fusion
 #
 #############################################################
-LINUX_FUSION_VERSION = 8.1.2
+LINUX_FUSION_VERSION = 8.7.0
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES

From 9db9779a3f240b10bb4f1a3e649f1829b6f35c6b Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 4 Oct 2011 13:45:48 +0200
Subject: [PATCH 0779/6849] sawman: bump to version 1.4.15

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sawman/sawman.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index 71d52ae27a..504cc9ecff 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -3,11 +3,10 @@
 # SAWMAN
 #
 #############################################################
-SAWMAN_VERSION:=1.4.11
-SAWMAN_SOURCE:=SaWMan-$(SAWMAN_VERSION).tar.gz
-SAWMAN_SITE:=http://www.directfb.org/downloads/Extras
+SAWMAN_VERSION = 1.4.15
+SAWMAN_SOURCE = SaWMan-$(SAWMAN_VERSION).tar.gz
+SAWMAN_SITE = http://www.directfb.org/downloads/Extras
 SAWMAN_INSTALL_STAGING = YES
 SAWMAN_DEPENDENCIES = directfb
 
 $(eval $(call AUTOTARGETS))
-

From faf408f4affa448a042448d905b2dbe2402fbd02 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Oct 2011 12:25:21 -0300
Subject: [PATCH 0780/6849] lsof: bump to version 4.85

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{lsof-4.84-makefile.patch => lsof-4.85-makefile.patch}     | 0
 .../{lsof-4.84-noportmap.patch => lsof-4.85-noportmap.patch}   | 0
 ...4-override-cflags.patch => lsof-4.85-override-cflags.patch} | 0
 ...acy-funcs.patch => lsof-4.85-remove-susvlegacy-funcs.patch} | 0
 package/lsof/lsof.mk                                           | 3 ++-
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename package/lsof/{lsof-4.84-makefile.patch => lsof-4.85-makefile.patch} (100%)
 rename package/lsof/{lsof-4.84-noportmap.patch => lsof-4.85-noportmap.patch} (100%)
 rename package/lsof/{lsof-4.84-override-cflags.patch => lsof-4.85-override-cflags.patch} (100%)
 rename package/lsof/{lsof-4.84-remove-susvlegacy-funcs.patch => lsof-4.85-remove-susvlegacy-funcs.patch} (100%)

diff --git a/package/lsof/lsof-4.84-makefile.patch b/package/lsof/lsof-4.85-makefile.patch
similarity index 100%
rename from package/lsof/lsof-4.84-makefile.patch
rename to package/lsof/lsof-4.85-makefile.patch
diff --git a/package/lsof/lsof-4.84-noportmap.patch b/package/lsof/lsof-4.85-noportmap.patch
similarity index 100%
rename from package/lsof/lsof-4.84-noportmap.patch
rename to package/lsof/lsof-4.85-noportmap.patch
diff --git a/package/lsof/lsof-4.84-override-cflags.patch b/package/lsof/lsof-4.85-override-cflags.patch
similarity index 100%
rename from package/lsof/lsof-4.84-override-cflags.patch
rename to package/lsof/lsof-4.85-override-cflags.patch
diff --git a/package/lsof/lsof-4.84-remove-susvlegacy-funcs.patch b/package/lsof/lsof-4.85-remove-susvlegacy-funcs.patch
similarity index 100%
rename from package/lsof/lsof-4.84-remove-susvlegacy-funcs.patch
rename to package/lsof/lsof-4.85-remove-susvlegacy-funcs.patch
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 547382f319..ff76f92c6d 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -3,7 +3,8 @@
 # lsof
 #
 #############################################################
-LSOF_VERSION = 4.84
+
+LSOF_VERSION = 4.85
 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
 LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 

From 21f91bbba5dda53625e14f20e6f551f9cc268aed Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 7 Oct 2011 21:31:40 +0200
Subject: [PATCH 0781/6849] lsof: no longer needs rpc support in toolchain

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lsof/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/lsof/Config.in b/package/lsof/Config.in
index 22b7f5eac1..cc7512c258 100644
--- a/package/lsof/Config.in
+++ b/package/lsof/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_LSOF
 	bool "lsof"
-	depends on BR2_INET_RPC
 	help
 	  lsof (LiSt Open Files)
 	  The lsof tool lists information about files opened by
 	  processes.
 
 	  ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
-
-comment "lsof requires a toolchain with RPC support"
-	depends on !BR2_INET_RPC

From 41ea5c9ff3f317a6eacc9266ddc79899c1f90d1f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Oct 2011 17:29:01 -0300
Subject: [PATCH 0782/6849] busybox: add 1.19.2 tftp fix

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch

diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch
new file mode 100644
index 0000000000..15dc9e1d13
--- /dev/null
+++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch
@@ -0,0 +1,12 @@
+--- busybox-1.19.2/networking/tftp.c
++++ busybox-1.19.2-tftp/networking/tftp.c
+@@ -813,7 +813,8 @@ int tftpd_main(int argc UNUSED_PARAM, ch
+ 		goto err;
+ 	}
+ 	mode = local_file + strlen(local_file) + 1;
+-	if (mode >= block_buf + result || strcmp(mode, "octet") != 0) {
++	/* RFC 1350 says mode string is case independent */
++	if (mode >= block_buf + result || strcasecmp(mode, "octet") != 0) {
+ 		goto err;
+ 	}
+ # if ENABLE_FEATURE_TFTP_BLOCKSIZE

From 0fccab65a3006d67a1805f30ca7f1af41c98e14d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 8 Oct 2011 21:49:58 +0200
Subject: [PATCH 0783/6849] lite: unbreak build

lite breaks because of a conflict with 'stat'. Fix taken from LiTE git.

At the same time rename and fixup no-tests patch to apply.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lite/lite-dfbspy-stat.patch           | 53 +++++++++++++++++++
 .../{no_tests.patch => lite-no-tests.patch}   |  4 +-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 package/lite/lite-dfbspy-stat.patch
 rename package/lite/{no_tests.patch => lite-no-tests.patch} (73%)

diff --git a/package/lite/lite-dfbspy-stat.patch b/package/lite/lite-dfbspy-stat.patch
new file mode 100644
index 0000000000..5ca73691ed
--- /dev/null
+++ b/package/lite/lite-dfbspy-stat.patch
@@ -0,0 +1,53 @@
+From upstream git (git://git.directfb.org/git/directfb/libs/LiTE.git)
+
+From ffe0ce78327a63ddb1265328ea9b5b03acdca019 Mon Sep 17 00:00:00 2001
+From: Denis Oliver Kropp <dok@directfb.org>
+Date: Fri, 1 Apr 2011 20:20:26 +0200
+Subject: [PATCH] dfbspy: Build fix for dfbspy example.
+
+---
+ examples/dfbspy.c |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/examples/dfbspy.c b/examples/dfbspy.c
+index 5f36f0b..c7f9725 100644
+--- a/examples/dfbspy.c
++++ b/examples/dfbspy.c
+@@ -89,9 +89,9 @@ read_stat( FusionStat *stat, int world )
+ 
+ /**************************************************************************************************/
+ 
+-#define CALC(x)     stat.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f)
++#define CALC(x)     stats.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f)
+ 
+-static FusionStat last_stat, stat;
++static FusionStat last_stat, stats;
+ static long long  last_millis;
+ 
+ static int
+@@ -145,14 +145,14 @@ static const struct {
+      void          (*update)( LiteLabel *label, void *ctx );
+      void           *ctx;
+ } list[] = {
+-     { "lease/purchase", update_number, &stat.lease_purchase },
+-     { "cede",           update_number, &stat.cede },
+-     { "attach",         update_number, &stat.attach },
+-     { "detach",         update_number, &stat.detach },
+-     { "ref up",         update_number, &stat.ref_up },
+-     { "ref down",       update_number, &stat.ref_down },
+-     { "prevail/swoop",  update_number, &stat.prevail_swoop },
+-     { "dismiss",        update_number, &stat.dismiss }
++     { "lease/purchase", update_number, &stats.lease_purchase },
++     { "cede",           update_number, &stats.cede },
++     { "attach",         update_number, &stats.attach },
++     { "detach",         update_number, &stats.detach },
++     { "ref up",         update_number, &stats.ref_up },
++     { "ref down",       update_number, &stats.ref_down },
++     { "prevail/swoop",  update_number, &stats.prevail_swoop },
++     { "dismiss",        update_number, &stats.dismiss }
+ };
+ 
+ #define NUM_LIST    (sizeof(list)/sizeof(list[0]))
+-- 
+1.7.6.3
+
diff --git a/package/lite/no_tests.patch b/package/lite/lite-no-tests.patch
similarity index 73%
rename from package/lite/no_tests.patch
rename to package/lite/lite-no-tests.patch
index c6e8092ff8..3a47186512 100644
--- a/package/lite/no_tests.patch
+++ b/package/lite/lite-no-tests.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-07-07 13:07:12.000000000 +0200
-+++ Makefile.in	2008-07-07 13:07:05.000000000 +0200
+--- a/Makefile.in.orig	2008-07-07 13:07:12.000000000 +0200
++++ b/Makefile.in	2008-07-07 13:07:05.000000000 +0200
 @@ -202,7 +202,7 @@
  target_vendor = @target_vendor@
  top_builddir = @top_builddir@

From ddb8c639c312fd9f65dbb123837c100281495d50 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 8 Oct 2011 22:39:29 +0200
Subject: [PATCH 0784/6849] libplayer: mark python bindings as broken

As it doesn't build.

- upstream didn't adjust player_init call when prototype changed:
  http://hg.geexbox.org/libplayer/rev/e3705df5ce2e

- It tries to build the extension for the host, and not the target:

building 'player' extension
/usr/bin/gcc -pthread -fno-strict-aliasing -O2 ..
/usr/bin/ld: skipping incompatible ./../../src/libplayer.so when
searching for -lplayer.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libplayer/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/multimedia/libplayer/Config.in b/package/multimedia/libplayer/Config.in
index c9add532ca..fe851ac6b9 100644
--- a/package/multimedia/libplayer/Config.in
+++ b/package/multimedia/libplayer/Config.in
@@ -23,6 +23,7 @@ comment "gstreamer backend requires a toolchain with WCHAR support"
 
 config BR2_PACKAGE_LIBPLAYER_PYTHON
 	depends on BR2_PACKAGE_PYTHON
+	depends on BROKEN # player_init params, builds for host
 	bool "Libplayer python bindings"
 endif
 

From 610d64b4b934caff1772ce3d30546b53cba53d34 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 8 Oct 2011 23:06:43 +0200
Subject: [PATCH 0785/6849] poco: unbreak mysql support

Update patch to also pass include directory for mysql headers, and get
rid of host directories in -L / -I arguments. Finally look in
staging rather than target for libmysqlclient.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/poco-1.4.2p1-add-staging-search-path.patch | 9 +++++----
 package/poco/poco.mk                                    | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/poco/poco-1.4.2p1-add-staging-search-path.patch b/package/poco/poco-1.4.2p1-add-staging-search-path.patch
index 18ee076eba..638ee2ad14 100644
--- a/package/poco/poco-1.4.2p1-add-staging-search-path.patch
+++ b/package/poco/poco-1.4.2p1-add-staging-search-path.patch
@@ -2,9 +2,10 @@ From: Baruch Siach <baruch@tkos.co.il>
 Subject: [PATCH] poco: add the staging path to search path
 
 Add the mysql headers and client libraries to the search path of the
-preprocessor and the linker. The $MYSQL_LIBDIR variable must be set from the
-make command line.
+preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables
+must be set from the make command line.
 
+[Peter: Remove host dirs, add MYSQL_INCDIR]
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 --- 
 --- poco-1.4.1p1-all-dist/Data/MySQL/Makefile	2011-02-09 11:13:00.000000000 +0200
@@ -15,8 +16,8 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  
 -SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
 -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
-+SYSLIBS += -L$(MYSQL_LIBDIR) -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
-+INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I=/mysql
++SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient
++INCLUDE += -I$(MYSQL_INCDIR)
  SYSFLAGS += -DTHREADSAFE -DNO_TCL
  
  objects = Binder Extractor SessionImpl Connector \
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 4823935772..5d07972d8b 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -43,7 +43,8 @@ endef
 
 define POCO_BUILD_CMDS
 	$(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \
-		MYSQL_LIBDIR=$(TARGET_DIR)/usr/lib/mysql -C $(@D)
+		MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \
+		MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql -C $(@D)
 endef
 
 define POCO_INSTALL_STAGING_CMDS

From cec7128dc1a30880523011a115ff52d7a27c403d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Oct 2011 19:39:01 -0300
Subject: [PATCH 0786/6849] noip: new package

[Peter: use install -D / proper permissions]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/noip/Config.in |  6 ++++++
 package/noip/noip.mk   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/noip/Config.in
 create mode 100644 package/noip/noip.mk

diff --git a/package/Config.in b/package/Config.in
index 904ebb6e9a..7dc8887397 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -443,6 +443,7 @@ endif
 source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
+source "package/noip/Config.in"
 source "package/nfs-utils/Config.in"
 source "package/ngircd/Config.in"
 source "package/ngrep/Config.in"
diff --git a/package/noip/Config.in b/package/noip/Config.in
new file mode 100644
index 0000000000..02039dd979
--- /dev/null
+++ b/package/noip/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_NOIP
+	bool "noip"
+	help
+	  Dynamic DNS update client for no-ip.com
+
+	  http://www.no-ip.com/downloads.php
diff --git a/package/noip/noip.mk b/package/noip/noip.mk
new file mode 100644
index 0000000000..0fe427a335
--- /dev/null
+++ b/package/noip/noip.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# noip
+#
+#############################################################
+
+NOIP_VERSION = 2.1.9
+NOIP_SITE = http://www.no-ip.com/client/linux
+NOIP_SOURCE = noip-duc-linux.tar.gz
+
+define NOIP_BUILD_CMDS
+	sed -i -e "s:\(#define CONFIG_FILENAME\).*:\1 \"/etc/no-ip2.conf\":" \
+		$(@D)/noip2.c
+	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		PREFIX=/usr CONFDIR=/etc
+endef
+
+define NOIP_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/noip2 $(TARGET_DIR)/usr/sbin/noip2
+endef
+
+define NOIP_UNINSTALL_TARGET_CMDS
+	rm -f "$(TARGET_DIR)/usr/sbin/noip2"
+endef
+
+define NOIP_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS))

From 2c23e937660f43131f68f6cbf2ff3fe3d0417032 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 2 Oct 2011 21:20:09 +0200
Subject: [PATCH 0787/6849] external toolchain: slightly optimize the copy of
 the toolchain sysroot

The sysroot of an ARM CodeSourcery toolchain takes about 1.4 GB of
space, but 1.1+ GB of this space consists in locale-related
information which Buildroot doesn't use. By skipping the copy of those
unused files, we save quite a bit of time while importing the
toolchain sysroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 4d90d15ecb..7f3efaa40d 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -79,6 +79,9 @@ copy_toolchain_lib_root = \
 #    non-default architecture variant is used. Without this, the
 #    compiler fails to find libraries and headers.
 #
+# Note that the 'locale' directories are not copied. They are huge
+# (400+MB) in CodeSourcery toolchains, and they are not really useful.
+#
 # $1: main sysroot directory of the toolchain
 # $2: arch specific sysroot directory of the toolchain
 # $3: arch specific subdirectory in the sysroot
@@ -89,7 +92,7 @@ copy_toolchain_sysroot = \
 	ARCH_SUBDIR="$(strip $3)"; \
 	for i in etc lib sbin usr ; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
-			cp -a $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
+			rsync -au --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
 		fi ; \
 	done ; \
 	if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \

From c72f54bba491a76e353c44c678258ac8029e2bdf Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Sun, 2 Oct 2011 21:20:10 +0200
Subject: [PATCH 0788/6849] toolchain-external: allow specifying extra external
 libraries

Custom toolchains may provide extra libraries that need to be copied to the
target. This patch adds a configuration option for this.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 8 ++++++++
 toolchain/toolchain-external/ext-tool.mk | 1 +
 2 files changed, 9 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ff7e8db97e..b6fa9bd267 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -322,6 +322,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CXX
 	  support. If you don't know, leave the default value,
 	  Buildroot will tell you if it's correct or not.
 
+config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS
+	string "Extra toolchain libraries to be copied to target"
+	help
+	  If your external toolchain provides extra libraries that
+	  need to be copied to the target filesystem, enter them
+	  here, separated by spaces. They will be copied to the
+	  target's /lib directory.
+
 endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 endif # BR2_TOOLCHAIN_EXTERNAL
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b9d932f685..bac39cf3a9 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -51,6 +51,7 @@
 #  of Buildroot is handled identical for the 2 toolchain types.
 
 LIB_EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
+LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
 LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so
 endif

From ae2364676f6a0d5390142791b7cb4200dc55ad9e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 2 Oct 2011 21:20:11 +0200
Subject: [PATCH 0789/6849] ext-toolchain: Add CodeSourcery SH uClinux 2011.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index b6fa9bd267..ac712ba7bb 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -152,6 +152,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
+	bool "CodeSourcery SH 2011.03"
+	depends on BR2_sh2a
+	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_LARGEFILE
+	select BR2_INET_RPC
+	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the SuperH architecture, from CodeSourcery. It
+	  uses gcc 4.5.2, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
+	  kernel headers 2.6.38. It has support for
+	  the following variants:
+            - SH2A, uClibc, big endian
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	bool "CodeSourcery SH 2010.09"
 	depends on BR2_sh2a
@@ -223,6 +239,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
+	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index bac39cf3a9..48c11eb17b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -191,6 +191,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2

From 062288f17338251e28a84b7ae37bd8a31e8988d1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 2 Oct 2011 21:20:12 +0200
Subject: [PATCH 0790/6849] ext-toolchain: Bump version of CodeSourcery MIPS
 2011.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 48c11eb17b..c8a214d9ba 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -180,8 +180,8 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package8715/public/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-53-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9055/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-93-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 42c0fb4dc36ef2568fd89949c9699c4f3bf44048 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 2 Oct 2011 21:20:13 +0200
Subject: [PATCH 0791/6849] ext-toolchain: Add CodeSourcery SH GNU/Linux
 2011.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 16 ++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ac712ba7bb..c50acc888a 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -137,6 +137,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
             - e500mc glibc, 32 bits
             - 970 glibc hard-float, 64 bits
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
+	bool "CodeSourcery SH 2011.03"
+	depends on BR2_sh4a || BR2_sh4aeb
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the SuperH architecture, from CodeSourcery. It
+	  uses gcc 4.5.2, binutils 2.20, glibc 2.13, uClibc 0.9.30,
+	  gdb 7.2.50 and kernel headers 2.6.38. It has support for
+	  the following variants:
+            - SH4A, glibc, little endian
+            - SH4A, glibc, big endian
+            - SH4A, uClibc, little endian
+            - SH4A, uClibc, big endian
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "CodeSourcery SH 2010.09"
 	depends on BR2_sh4a || BR2_sh4aeb
@@ -238,6 +253,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
+	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index c8a214d9ba..266252052b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -188,6 +188,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-g
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/superh/portal/package8759/public/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2

From 1459fc24c58edb589c4baf99c88b53af3b558f52 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 2 Oct 2011 21:20:14 +0200
Subject: [PATCH 0792/6849] ext-toolchain: Add CodeSoucery x86 GNU/Linux
 2010.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 16 ++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c50acc888a..9fbc224e6e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -199,6 +199,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  the following variants:
             - SH2A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
+	bool "CodeSourcery x86/x86_64 2010.09"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the x86/x86_64 architectures, from
+	  CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
+	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
+	  the following variants:
+	    - Intel Pentium 4, glibc, 32 bits
+            - Intel Atom, glibc, 32 bits
+            - Intel Xeon, glibc, 64 bits
+            - Intel Core 2, glibc, 64 bits
+
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	bool "Blackfin.uclinux.org 2010RC1"
 	depends on BR2_bfin
@@ -256,6 +271,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
+	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 266252052b..6e34e05e92 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -197,6 +197,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/ia32/portal/package7682/public/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=ia32-2010.09-44-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2

From 3a7149347c6290e1ab7045dd4f70e06d9426b716 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 2 Oct 2011 21:20:15 +0200
Subject: [PATCH 0793/6849] ext-toolchain: Take into account Mentor Graphics
 acquisition of CodeSoucery

Now that CodeSourcery has been bought by Mentor Graphics, the
toolchains are named "Sourcery CodeBench". We rename the config short
description and adjust the help text, but we keep the option name in
order not to break existing configurations.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 130 ++++++++++++-------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9fbc224e6e..0a4b922054 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -4,85 +4,85 @@ choice
 	prompt "Toolchain"
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
-	bool "CodeSourcery ARM 2011.03"
+	bool "Sourcery CodeBench ARM 2011.03"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20.51, glibc 2.13 and gdb 7.2.50,
-	  kernel headers 2.6.38. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
+	  2.13 and gdb 7.2.50, kernel headers 2.6.38. It has support
+	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
-	bool "CodeSourcery ARM 2010.09"
+	bool "Sourcery CodeBench ARM 2010.09"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.5.1, binutils 2.20, glibc 2.11 and gdb 7.2.50,
-	  kernel headers 2.6.35.2. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.5.1, binutils 2.20, glibc
+	  2.11 and gdb 7.2.50, kernel headers 2.6.35.2. It has support
+	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
-	bool "CodeSourcery ARM 2010q1"
+	bool "Sourcery CodeBench ARM 2010q1"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.4.1, binutils 2.19, glibc 2.11, gdb 7.0.50 and
-	  kernel headers 2.6.32. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
+	  2.11, gdb 7.0.50 and kernel headers 2.6.32. It has support
+	  for the following variants:
              - ARMv5T, little endian, soft-float, glibc
              - ARMv4T, little endian, soft-float, glibc
              - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
-	bool "CodeSourcery ARM 2009q3"
+	bool "Sourcery CodeBench ARM 2009q3"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.4.1, binutils 2.19, glibc 2.10 and gdb 6.8 and
-	  kernel headers 2.6.30. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
+	  2.10 and gdb 6.8 and kernel headers 2.6.30. It has support
+	  for the following variants:
             - ARMv5T, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
-	bool "CodeSourcery ARM 2009q1"
+	bool "Sourcery CodeBench ARM 2009q1"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.3.3, binutils 2.19, glibc 2.8 and gdb 6.8 and
-	  kernel headers 2.6.30. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.3.3, binutils 2.19, glibc 2.8
+	  and gdb 6.8 and kernel headers 2.6.30. It has support for
+	  the following variants:
             - ARMv5T, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
-	bool "CodeSourcery MIPS 2011.03"
+	bool "Sourcery CodeBench MIPS 2011.03"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the MIPS architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20.51, glibc 2.13, uClibc 0.9.30
-	  and gdb 7.2.50, kernel headers 2.6.38. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
+	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
+	  2.6.38. It has support for the following variants:
             - MIPS32 O32 big endian glibc
             - MIPS32 O32 little endian glibc
             - MIPS32 big endian soft float glibc
@@ -97,15 +97,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
             - MIPS32 little endian soft float uclibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
-	bool "CodeSourcery MIPS 4.4"
+	bool "Sourcery CodeBench MIPS 4.4"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the MIPS architecture, from CodeSourcery. It
-	  uses gcc 4.4.1, binutils 2.19, glibc 2.11, uClibc 0.9.30 and
-	  gdb 7.0, kernel headers 2.6.32. It has support for the
-	  following variants:
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
+	  2.11, uClibc 0.9.30 and gdb 7.0, kernel headers 2.6.32. It
+	  has support for the following variants:
             - MIPS32 O32 big endian glibc
             - MIPS32 O32 little endian glibc
             - MIPS32 big endian soft float glibc
@@ -120,15 +120,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
             - MIPS32 little endian soft float uclibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
-	bool "CodeSourcery PowerPC 2010.09"
+	bool "Sourcery CodeBench PowerPC 2010.09"
 	depends on BR2_powerpc
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the PowerPC architecture, from
-	  CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
-	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the PowerPC architecture,
+	  from Sourcery CodeBench. It uses gcc 4.5.1, binutils 2.20,
+	  glibc 2.11, gdb 7.2.50 and kernel headers 2.6.35.2. It has
+	  support for the following variants:
             - 603 glibc, 32 bits
             - 603 soft float glibc, 32 bits
             - e600 altivec glibc, 32 bits
@@ -138,37 +138,37 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
             - 970 glibc hard-float, 64 bits
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
-	bool "CodeSourcery SH 2011.03"
+	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20, glibc 2.13, uClibc 0.9.30,
-	  gdb 7.2.50 and kernel headers 2.6.38. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
+	  glibc 2.13, uClibc 0.9.30, gdb 7.2.50 and kernel headers
+	  2.6.38. It has support for the following variants:
             - SH4A, glibc, little endian
             - SH4A, glibc, big endian
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
-	bool "CodeSourcery SH 2010.09"
+	bool "Sourcery CodeBench SH 2010.09"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.1, binutils 2.20, glibc 2.11, uClibc 0.9.30,
-	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
+	  glibc 2.11, uClibc 0.9.30, gdb 7.2.50 and kernel headers
+	  2.6.35.2. It has support for the following variants:
             - SH4A, glibc, little endian
             - SH4A, glibc, big endian
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
-	bool "CodeSourcery SH 2011.03"
+	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
@@ -177,14 +177,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
-	  kernel headers 2.6.38. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
+	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has
+	  support for the following variants:
             - SH2A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
-	bool "CodeSourcery SH 2010.09"
+	bool "Sourcery CodeBench SH 2010.09"
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
@@ -193,22 +193,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.1, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
-	  kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
+	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It
+	  has support for the following variants:
             - SH2A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
-	bool "CodeSourcery x86/x86_64 2010.09"
+	bool "Sourcery CodeBench x86/x86_64 2010.09"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the x86/x86_64 architectures, from
-	  CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
-	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the x86/x86_64
+	  architectures, from Mentor Graphics. It uses gcc 4.5.1,
+	  binutils 2.20, glibc 2.11, gdb 7.2.50 and kernel headers
+	  2.6.35.2. It has support for the following variants:
 	    - Intel Pentium 4, glibc, 32 bits
             - Intel Atom, glibc, 32 bits
             - Intel Xeon, glibc, 64 bits

From 839ee761878b3e242f4fe4b4a95dfbf161b6b82a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 9 Oct 2011 22:02:51 +0200
Subject: [PATCH 0794/6849] openocd: libusb patch: append rather than override
 LDFLAGS

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0001-fix-cross-compilation-host-libsub-was-used-before.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch b/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
index 99ff04eb7c..caf1a8b6fc 100644
--- a/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
+++ b/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
@@ -23,7 +23,7 @@ index dfa1e8f..cfe2218 100644
 +  dnl check for libusb
 +  PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
 +  CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
-+  LDFLAGS="$LFFLAGS $LIBUSB_LDFLAGS"
++  LDFLAGS="$LDFLAGS $LIBUSB_LDFLAGS"
 +  LIBS="$LIBS $LIBUSB_LIBS"
    build_usb=yes
  fi

From b367d67afa9e3f3202355bf79665afe8ad0d5d43 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 9 Oct 2011 22:41:42 +0200
Subject: [PATCH 0795/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2643641d66..70d4a79f6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,25 +10,37 @@
 	menuconfig options.
 
 	Toolchain: Update external codesourcery toolchain download
-	URLs after Codesourcery got bought by Mentor. Fix uClibc
-	0.9.32 builds for e500 PPC.
+	URLs after Codesourcery got bought by Mentor, add x86
+	toolchain, update toolchain versions and optimize toolchain
+	sysroot copying. Fix uClibc 0.9.32 builds for e500 PPC,
+	updated GDB versions / download URLs. Binutils
+	libbfd/libopcodes static/dynamic linking fix.
+
+	Package infrastructure: Support for local packages /
+	overrides, package dir / name arguments dropped from
+	{GEN,AUTO,CMAKE}TARGETS.
 
 	Linux: Kernel extensions infrastructure support, Xenomai +
 	RTAI support.
 
 	Updated/fixed packages: acpid, busybox, dbus, dbus-glib,
-	directfb, dnsmasq, e2fsprogs, ethtool, fakeroot, fbdump,
-	freetype, fuse, gamin, gmp, jpeg, ipsec-tools, ipset,
-	iptables, iw, kexec, leafpad, libargtable2, libao, libconfuse,
-	libcuefile, libcurl, libevent, libreplaygain, libsamplerate,
-	libsndfile, libsoup, libsvgtiny, lighttpd, lzo, lzop, mpd,
-	mpfr, mpg123, musepack, mysql_client, netcat, netsnmp,
-	ntfs-3g, ntfsprogs, openssh, openssl, python, qt, radvd,
-	samba, sdl_sound, sqlite, squid, sylpheed, taglib, tar,
-	tcpreplay, tslib, usbutils, util-linux, valgrind, xterm
-
-	New packages: bluez-utils, cifs-utils, fluxbox, libev,
-	libftdi, libgeotiff, ngrep, openocd, portaudio, rtai, xenomai.
+	directfb, dnsmasq, drystone, e2fsprogs, ethtool, fakeroot,
+	fbdump, freetype, fuse, gamin, gmp, gnutls,
+	gst-plugins-{base,bad,good,ugly}, gstreamer, imagemagick,
+	ipsec-tools, ipset, iptables, iw, jpeg, kexec, leafpad, less,
+	libargtable2, libao, libconfuse, libcuefile, libcurl,
+	libevent, libglib2, libiconv, libreplaygain, libroxml,
+	libsamplerate, libsndfile, libsoup, libsvgtiny, libtool,
+	lighttpd, linux-fusion, lite, lsof, lzo, lzop, mcookie,
+	mpg123, mpd, mpfr, musepack, mysql_client, ncurses, netcat,
+	netsnmp, ntfs-3g, ntfsprogs, openssh, openssl, python, qt,
+	radvd, rsync, samba, sawman, sdl_sound, smartmontools, sqlite,
+	squid, sylpheed, taglib, tar, tcpreplay, tslib, usbutils,
+	util-linux, valgrind, whetstone, xdata_xcursor-themes, xterm
+
+	New packages: bluez-utils, cifs-utils, fftw, fluxbox, json-c,
+	libev, libftdi, libgeotiff, libplayer, ngrep, noip, openocd,
+	picocom, poco, portaudio, pv, rtai, xenomai.
 
 	Issues resolved (http://bugs.uclibc.org):
 
@@ -42,6 +54,12 @@
 	#2917: Qt: Add declarative module
 	#3145: jffs2 image generation fails
 	#3271: netperf-2.4.5 fails to compile
+	#3331: xdata_xcursor-themes depends on xcursorgen
+	#3343: Add file:// download SITE_METHOD
+	#3391: Add support for specifying an external kernel tree
+	#3631: Error while compiling with Xorg
+	#3925: midori not getting compile
+	#4045: Add support for downloading i386 toolchains from codesourcery
 	#4183: Codesourcery toolchain download site has changed
 
 2011.08, Released August 31th, 2011:

From 95af4fbfa56977d7c93ef6339c37829a47275f77 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 9 Oct 2011 23:26:39 +0200
Subject: [PATCH 0796/6849] makedevs: remove compiler warning about
 used-but-set

Closes #4171

Based on patch by Hector Oron <hector.oron@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                     | 1 +
 package/makedevs/makedevs.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 70d4a79f6c..6dc8789e5a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -60,6 +60,7 @@
 	#3631: Error while compiling with Xorg
 	#3925: midori not getting compile
 	#4045: Add support for downloading i386 toolchains from codesourcery
+	#4171: makedevs-unused-but-set-variable.patch
 	#4183: Codesourcery toolchain download site has changed
 
 2011.08, Released August 31th, 2011:
diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c
index 95c079a9fe..5d5668de6e 100644
--- a/package/makedevs/makedevs.c
+++ b/package/makedevs/makedevs.c
@@ -536,5 +536,5 @@ int main(int argc, char **argv)
 	}
 	fclose(table);
 
-	return 0;
+	return ret;
 }

From 54bcf87b452c7a7738009fb808d19610fdb31df8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 10 Oct 2011 00:14:27 +0200
Subject: [PATCH 0797/6849] lrzsz: fix repeated target install

Closes #4165

Use ln -sf in case destination already exists from an earlier install,
and use install -D rather than cp while we're at it.

Based on patch by Hector Oron <hector.oron@gmail.com>

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                | 1 +
 package/lrzsz/lrzsz.mk | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6dc8789e5a..63452106d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -60,6 +60,7 @@
 	#3631: Error while compiling with Xorg
 	#3925: midori not getting compile
 	#4045: Add support for downloading i386 toolchains from codesourcery
+	#4165: lrzsz-fix-symlink-at-rebuild.patch
 	#4171: makedevs-unused-but-set-variable.patch
 	#4183: Codesourcery toolchain download site has changed
 
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 0d3347f8de..314f46a4ad 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -36,10 +36,10 @@ define LRZSZ_BUILD_HOOKS
 endef
 
 define LRZSZ_INSTALL_TARGET_CMDS
-	cp $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz
-	cp $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz
-	ln -s rz $(TARGET_DIR)/usr/bin/lrz
-	ln -s sz $(TARGET_DIR)/usr/bin/lsz
+	$(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz
+	$(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz
+	ln -sf rz $(TARGET_DIR)/usr/bin/lrz
+	ln -sf sz $(TARGET_DIR)/usr/bin/lsz
 endef
 
 define LRZSZ_CLEAN_CMDS

From ce1940ddea7d82e5da1e0b8c14395a1302d29086 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 10 Oct 2011 07:20:29 +0200
Subject: [PATCH 0798/6849] barebox: add 2011.10, mark 2011.08 as deprecated

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 71d530fdd6..8dfaeb2d4d 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,16 +8,20 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2011_09
+	default BR2_TARGET_BAREBOX_2011_10
 	help
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_2011_08
+	depends on BR2_DEPRECATED
 	bool "2011.08"
 
 config BR2_TARGET_BAREBOX_2011_09
 	bool "2011.09"
 
+config BR2_TARGET_BAREBOX_2011_10
+	bool "2011.10"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -37,6 +41,7 @@ config BR2_TARGET_BAREBOX_VERSION
 	string
 	default "2011.08.0"	if BR2_TARGET_BAREBOX_2011_08
 	default "2011.09.0"	if BR2_TARGET_BAREBOX_2011_09
+	default "2011.10.0"	if BR2_TARGET_BAREBOX_2011_10
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 2e57043b4d1659b54cd5954ad98884e1a1c3848a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Oct 2011 19:44:31 +0200
Subject: [PATCH 0799/6849] external-toolchain: Slightly optimize toolchain
 extraction

Some CodeSourcery toolchains contain a huge number of locales that are
not useful, even though they account for 70-80% of the total toolchain
size. By skipping the extraction of those useless locales, we make the
toolchain extraction process slightly faster, and also make the output
directory size a lot smaller (host/opt/ is 213 MB instead of 1.5 GB
with a 2010.09 ARM CodeSourcery toolchain).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6e34e05e92..828791660a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -250,7 +250,8 @@ $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 	mkdir -p $(@D)
-	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
 	$(Q)touch $@
 endif
 

From da6353c9e7e6e6accfe72ee4cb5165bdf580b18a Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 9 Oct 2011 19:44:32 +0200
Subject: [PATCH 0800/6849] toolchain: speed up sysroot lib copying

The copy_toolchain_lib_root helper searches the entire sysroot, but is
only interested in files in certain subdirs.  So rather than waste time
in walking the entire tree, walk the few subdirs at the depth level we
are actually going to be poaching files from.

Some simplification suggested by Yann E. MORIN
<yann.morin.1998@anciens.enib.fr> and Arnout Vandecappelle
<arnout@mind.be>, added by Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 7f3efaa40d..5585f45fe3 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -22,9 +22,8 @@ copy_toolchain_lib_root = \
 	DESTDIR="$(strip $3)" ; \
  \
 	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
-		find -L . -path "./lib/$${LIB}.*"     -o \
-			  -path "./usr/lib/$${LIB}.*" -o \
-			  -path "./usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*/$${LIB}.*" \
+		find -L lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib* \
+			-maxdepth 1 -name "$${LIB}.*" 2>/dev/null \
 		)` ; \
 	for FILE in $${LIBS} ; do \
 		LIB=`basename $${FILE}`; \

From 8ece8e2775cb189874a0e490934cea2f39dbb734 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Oct 2011 09:11:21 +0200
Subject: [PATCH 0801/6849] neon: bump version

Closes #4321

Old neon version wasn't compatible with our openssl version, so bump
the version. This also fixes some security related bugs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES              | 3 ++-
 package/neon/neon.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 63452106d3..cac5053b06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -32,7 +32,7 @@
 	libevent, libglib2, libiconv, libreplaygain, libroxml,
 	libsamplerate, libsndfile, libsoup, libsvgtiny, libtool,
 	lighttpd, linux-fusion, lite, lsof, lzo, lzop, mcookie,
-	mpg123, mpd, mpfr, musepack, mysql_client, ncurses, netcat,
+	mpg123, mpd, mpfr, musepack, mysql_client, ncurses, neon, netcat,
 	netsnmp, ntfs-3g, ntfsprogs, openssh, openssl, python, qt,
 	radvd, rsync, samba, sawman, sdl_sound, smartmontools, sqlite,
 	squid, sylpheed, taglib, tar, tcpreplay, tslib, usbutils,
@@ -63,6 +63,7 @@
 	#4165: lrzsz-fix-symlink-at-rebuild.patch
 	#4171: makedevs-unused-but-set-variable.patch
 	#4183: Codesourcery toolchain download site has changed
+	#4231: libneon.so: undefined reference to `SSL_SESSION_cmp'
 
 2011.08, Released August 31th, 2011:
 
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 4e171886e5..95664d7dc4 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -3,7 +3,7 @@
 # neon
 #
 #############################################################
-NEON_VERSION:=0.28.3
+NEON_VERSION:=0.29.6
 NEON_SITE:=http://www.webdav.org/neon/
 NEON_INSTALL_STAGING:=YES
 NEON_CONF_OPT:=--without-gssapi --disable-rpath

From 66e09abc57f88bfea7bebd50b9dff7d56e99689e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Oct 2011 09:23:25 +0200
Subject: [PATCH 0802/6849] neon: cleanup

Whitespace fixes / removal of redundant lines. No functional change.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/neon.mk | 55 ++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 95664d7dc4..272d5e0844 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -3,46 +3,45 @@
 # neon
 #
 #############################################################
-NEON_VERSION:=0.29.6
-NEON_SITE:=http://www.webdav.org/neon/
-NEON_INSTALL_STAGING:=YES
-NEON_CONF_OPT:=--without-gssapi --disable-rpath
+NEON_VERSION= 0.29.6
+NEON_SITE = http://www.webdav.org/neon/
+NEON_INSTALL_STAGING = YES
+NEON_CONF_OPT = --without-gssapi --disable-rpath
 
-NEON_DEPENDENCIES:=host-pkg-config
+NEON_DEPENDENCIES = host-pkg-config
 
-ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y)
-NEON_CONF_OPT+=--with-libxml2=yes
-NEON_CONF_OPT+=--with-expat=no
-NEON_CONF_ENV+=ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
-NEON_DEPENDENCIES+=libxml2
-endif
 ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
-NEON_CONF_OPT+=--with-zlib=$(STAGING_DIR)
-NEON_DEPENDENCIES+=zlib
+NEON_CONF_OPT += --with-zlib=$(STAGING_DIR)
+NEON_DEPENDENCIES += zlib
 else
-NEON_CONF_OPT+=--without-zlib
+NEON_CONF_OPT += --without-zlib
 endif
+
 ifeq ($(BR2_PACKAGE_NEON_SSL),y)
-NEON_CONF_OPT+=--with-ssl
-NEON_DEPENDENCIES+=openssl
+NEON_CONF_OPT += --with-ssl
+NEON_DEPENDENCIES += openssl
 else
-NEON_CONF_OPT+=--without-ssl
+NEON_CONF_OPT += --without-ssl
 endif
+
 ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
-NEON_CONF_OPT+=--with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
-NEON_CONF_OPT+=--with-libxml2=no
-NEON_DEPENDENCIES+=expat
-endif
-ifeq ($(BR2_PACKAGE_NEON_NOXML),y)
-# webdav needs xml support
-NEON_CONF_OPT+=--disable-webdav
+NEON_CONF_OPT += --with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
+NEON_DEPENDENCIES += expat
+else
+NEON_CONF_OPT += --with-expat=no
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-NEON_CONF_OPT+=--with-ssl
-NEON_DEPENDENCIES+=openssl
+ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y)
+NEON_CONF_OPT += --with-libxml2=yes
+NEON_CONF_ENV += ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
+NEON_DEPENDENCIES += libxml2
 else
-NEON_CONF_OPT+=--without-ssl
+NEON_CONF_OPT += --with-libxml2=no
+endif
+
+ifeq ($(BR2_PACKAGE_NEON_NOXML),y)
+# webdav needs xml support
+NEON_CONF_OPT += --disable-webdav
 endif
 
 define NEON_REMOVE_CONFIG_SCRIPTS

From da653dd4ea233aeaf314f8784c5312b6472a2a2a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Oct 2011 09:54:17 +0200
Subject: [PATCH 0803/6849] neon: default to xml support if dependencies are
 available

Use expat support if expat package is enabled, libxml2 if enabled and
otherwise noxml.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/neon/Config.in b/package/neon/Config.in
index 5ebd64d4a3..53cc8f5686 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -21,7 +21,6 @@ config BR2_PACKAGE_NEON_SSL
 
 choice
 	prompt "XML Support"
-	default BR2_PACKAGE_NEON_NOXML
 	depends on BR2_PACKAGE_NEON
 	help
 	  Select which XML library to use...

From f35348c3f6435e7e1a420fb07b335c1fd110aa46 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Oct 2011 09:52:17 +0200
Subject: [PATCH 0804/6849] rpm: only show xz dependency comment if enabled

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpm/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 8d4c6a3baa..a80a5a7975 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -15,16 +15,16 @@ config BR2_PACKAGE_RPM
 
 	  http://rpm5.org
 
+if BR2_PACKAGE_RPM
+
 config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
 	bool "support for bzip2 payloads"
-	depends on BR2_PACKAGE_RPM
 	select BR2_PACKAGE_BZIP2
 	help
 	  Support for bzip2 payloads in RPM.
 
 config BR2_PACKAGE_RPM_XZ_PAYLOADS
 	bool "support for xz payloads"
-	depends on BR2_PACKAGE_RPM
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Support for xz payloads in RPM.
@@ -32,4 +32,6 @@ config BR2_PACKAGE_RPM_XZ_PAYLOADS
 comment "xz payload support requires a toolchain with c++ support"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
+endif
+
 

From 760d4afd44f95db88b64897dca056ec426323dc0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Oct 2011 13:52:10 +0200
Subject: [PATCH 0805/6849] neon: additional white space fix

Missed from 66e09abc57 (neon: cleanup).

Thanks to Michael S. Zick for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/neon.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 272d5e0844..6e365b3d26 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -3,7 +3,7 @@
 # neon
 #
 #############################################################
-NEON_VERSION= 0.29.6
+NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPT = --without-gssapi --disable-rpath

From 744070ee6495259ac2f47f24d42912d2151ea64e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:02:52 -0300
Subject: [PATCH 0806/6849] gawk: show it in config menu when toolchain lacks
 wchar

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/gawk/Config.in b/package/gawk/Config.in
index 62ca860e6e..82c970f1df 100644
--- a/package/gawk/Config.in
+++ b/package/gawk/Config.in
@@ -7,3 +7,6 @@ config BR2_PACKAGE_GAWK
 	  with just a few lines of code.
 
 	  http://www.gnu.org/software/gawk/
+
+comment "gawk requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From 3325bc627cdf262bd7d230589f03b3aee02551bd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:02:53 -0300
Subject: [PATCH 0807/6849] sed: show it in config menu when toolchain lacks
 wchar

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sed/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/sed/Config.in b/package/sed/Config.in
index 950701c9c0..1430915aea 100644
--- a/package/sed/Config.in
+++ b/package/sed/Config.in
@@ -6,4 +6,5 @@ config BR2_PACKAGE_SED
 
 	  http://sed.sourceforge.net/
 
-	  Most people will answer Y.
+comment "sed requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From ea28972734663094a76a08126f707d2f8133dfbb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:02:56 -0300
Subject: [PATCH 0808/6849] cvs: show it in config menu when toolchain lacks
 wchar

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cvs/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/cvs/Config.in b/package/cvs/Config.in
index 2e61834c81..f9d5955f47 100644
--- a/package/cvs/Config.in
+++ b/package/cvs/Config.in
@@ -12,3 +12,6 @@ config BR2_PACKAGE_CVS_SERVER
 	depends on BR2_PACKAGE_CVS
 	help
 	  Enable cvs server code
+
+comment "cvs requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From 3bb3143d5c274a0aa9b2d40a88a365e3e428d2e2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:02:54 -0300
Subject: [PATCH 0809/6849] portmap: use common syntax for RPC support needed
 comment

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/portmap/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index 1f22ab6cbb..5914357f2b 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_PORTMAP
 
 	  http://neil.brown.name/portmap/
 
-comment "portmap requires a toolchain with 'Enable RPC' selected"
+comment "portmap requires a toolchain with RPC support"
 	depends on !BR2_INET_RPC

From bde4564fa74cc25a088aa4173709894d2acf5844 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:02:55 -0300
Subject: [PATCH 0810/6849] radvd: show it in config menu when toolchain lacks
 ipv6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index c7753f0387..20e7e55031 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -7,3 +7,6 @@ config BR2_PACKAGE_RADVD
 	  IPv6 Router Advertisement Daemon.
 
 	  http://www.litech.org/radvd/
+
+comment "radvd requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6

From 211916ed46e99c8b5c82ddba62f20371e6a86b01 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 14 Oct 2011 09:50:02 +0200
Subject: [PATCH 0811/6849] dependencies: additional check for PERL_MM_OPT

When the user has Perl local::lib installed, its environment contains
a PERL_MM_OPT variables which defines
INSTALL_BASE="/some/location". Unfortunately, having this makes the
build of libxml-parser-perl (and probably other Perl related packages)
fail, because it complains that both PREFIX (passed in our .mk file)
and INSTALL_BASE (passed from the PERL_MM_OPT environment variable)
are defined. Since in Buildroot we want our PREFIX to be considered,
we error out when the user has PERL_MM_OPT defined.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/dependencies/dependencies.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 410f663fab..2b9c0b373c 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -40,6 +40,14 @@ if test -n "$PATH" ; then
 	fi
 fi;
 
+if test -n "$PERL_MM_OPT" ; then
+    /bin/echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib"
+    /bin/echo -e "is installed on your system. Please unset this variable"
+    /bin/echo -e "before starting Buildroot, otherwise the compilation of"
+    /bin/echo -e "Perl related packages will fail"
+    exit 1
+fi
+
 # Verify that which is installed
 if ! which which > /dev/null ; then
 	/bin/echo -e "\nYou must install 'which' on your build machine\n";

From deac48ea63a755e5a28ab10a1c9fe334a9e46d9d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:15 -0300
Subject: [PATCH 0812/6849] quagga: security bump to version 0.99.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/quagga-fix-no-ipv6.patch |  48 ---------
 package/quagga/quagga-fix-opaque.patch  | 127 ------------------------
 package/quagga/quagga-zlog.patch        |  43 --------
 package/quagga/quagga.mk                |   2 +-
 4 files changed, 1 insertion(+), 219 deletions(-)
 delete mode 100644 package/quagga/quagga-fix-no-ipv6.patch
 delete mode 100644 package/quagga/quagga-fix-opaque.patch
 delete mode 100644 package/quagga/quagga-zlog.patch

diff --git a/package/quagga/quagga-fix-no-ipv6.patch b/package/quagga/quagga-fix-no-ipv6.patch
deleted file mode 100644
index acf8fec387..0000000000
--- a/package/quagga/quagga-fix-no-ipv6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3bde17f1af635c9ca19df0b3516cb8ad0376e6d3 Mon Sep 17 00:00:00 2001
-From: Paul Jakma <paul@quagga.net>
-Date: Wed, 23 Mar 2011 10:30:30 +0000
-Subject: [PATCH 1/1] bgpd: Fix compile failure if IPv6 build was disabled.
-
-* bgp_route.c: ({no_,}ipv6_bgp_network_ttl_cmd) depends on ipv6_bgp_network
-  which is HAVE_IPV6, so these should be too.
-  (bgp_route_init) and the installs should be similarly ifdefed
----
- bgpd/bgp_route.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
-index 8c05ba6..5c516f0 100644
---- a/bgpd/bgp_route.c
-+++ b/bgpd/bgp_route.c
-@@ -4327,6 +4327,7 @@ ALIAS_DEPRECATED (no_bgp_network_mask_natural,
-        "Specify a BGP backdoor route\n"
-        "AS-Path hopcount limit attribute\n"
-        "AS-Pathlimit TTL, in number of AS-Path hops\n")
-+#ifdef HAVE_IPV6
- ALIAS_DEPRECATED (ipv6_bgp_network,
-        ipv6_bgp_network_ttl_cmd,
-        "network X:X::X:X/M pathlimit <0-255>",
-@@ -4342,6 +4343,7 @@ ALIAS_DEPRECATED (no_ipv6_bgp_network,
-        "IPv6 prefix <network>/<length>\n"
-        "AS-Path hopcount limit attribute\n"
-        "AS-Pathlimit TTL, in number of AS-Path hops\n")
-+#endif /* HAVE_IPV6 */
- 
- /* Aggreagete address:
- 
-@@ -12958,9 +12960,11 @@ bgp_route_init (void)
-   install_element (BGP_IPV4M_NODE, &no_bgp_network_backdoor_ttl_cmd);
-   install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_backdoor_ttl_cmd);
-   install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_backdoor_ttl_cmd);
--  
-+
-+#ifdef HAVE_IPV6
-   install_element (BGP_IPV6_NODE, &ipv6_bgp_network_ttl_cmd);
-   install_element (BGP_IPV6_NODE, &no_ipv6_bgp_network_ttl_cmd);
-+#endif
- }
- 
- void
--- 
-1.7.4
-
diff --git a/package/quagga/quagga-fix-opaque.patch b/package/quagga/quagga-fix-opaque.patch
deleted file mode 100644
index 17a970e163..0000000000
--- a/package/quagga/quagga-fix-opaque.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From d71ea65270408a45e4bec036671ec73b24b994b4 Mon Sep 17 00:00:00 2001
-From: Paul Jakma <paul@quagga.net>
-Date: Tue, 22 Mar 2011 15:23:55 +0000
-Subject: [PATCH 1/1] ospfd: Compile fix for opaque support
-
-* ospfd: Refresher logic cleanup broke OSPF opaque, which does its own thing
-  with regard to refresher logic and which also, in the protocol, requires
-  implementations to keep state of which OI an LSA is received on (rather
-  than providing information in the LSA to allow it to be looked up - as
-  other LSAs requiring such assocation were careful to do).
-* ospf_lsa.h: (struct ospf_interface) Add back the pointer to oi, but only
-  for type-9 now.
-* ospf_nsm.c: (ospf_db_summary_add) check the oi actually exists first -
-  doesn't obviate the need for opaque to ensure oi pointers get cleaned up
-  when ospf_interfaces disappear.
-* ospf_opaque.{c,h}: (ospf_opaque_functab,ospf_opaque_lsa_refresh) Refresher
-  LSA functions now need to return the LSA to the general refresh logic,
-  to indicate whether the LSA was refreshed.
----
- ospfd/ospf_lsa.h    |    3 +++
- ospfd/ospf_nsm.c    |    2 +-
- ospfd/ospf_opaque.c |   13 +++++++------
- ospfd/ospf_opaque.h |    4 ++--
- 4 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/ospfd/ospf_lsa.h b/ospfd/ospf_lsa.h
-index fee3470..72e2f8a 100644
---- a/ospfd/ospf_lsa.h
-+++ b/ospfd/ospf_lsa.h
-@@ -114,6 +114,9 @@ struct ospf_lsa
- 
-   /* Refreshement List or Queue */
-   int refresh_list;
-+  
-+  /* For Type-9 Opaque-LSAs */
-+  struct ospf_interface *oi;
- };
- 
- /* OSPF LSA Link Type. */
-diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
-index 279d2a0..cbc3171 100644
---- a/ospfd/ospf_nsm.c
-+++ b/ospfd/ospf_nsm.c
-@@ -216,7 +216,7 @@ ospf_db_summary_add (struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
-     {
-     case OSPF_OPAQUE_LINK_LSA:
-       /* Exclude type-9 LSAs that does not have the same "oi" with "nbr". */
--      if (lsa->oi != nbr->oi)
-+      if (nbr->oi && ospf_if_exists (lsa->oi) != nbr->oi)
-           return 0;
-       break;
-     case OSPF_OPAQUE_AREA_LSA:
-diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
-index 6e90011..aa126e1 100644
---- a/ospfd/ospf_opaque.c
-+++ b/ospfd/ospf_opaque.c
-@@ -251,7 +251,7 @@ struct ospf_opaque_functab
-   void (* config_write_debug )(struct vty *vty);
-   void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa);
-   int  (* lsa_originator)(void *arg);
--  void (* lsa_refresher )(struct ospf_lsa *lsa);
-+  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa);
-   int (* new_lsa_hook)(struct ospf_lsa *lsa);
-   int (* del_lsa_hook)(struct ospf_lsa *lsa);
- };
-@@ -354,7 +354,7 @@ ospf_register_opaque_functab (
-   void (* config_write_debug )(struct vty *vty),
-   void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa),
-   int  (* lsa_originator)(void *arg),
--  void (* lsa_refresher )(struct ospf_lsa *lsa),
-+  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa),
-   int (* new_lsa_hook)(struct ospf_lsa *lsa),
-   int (* del_lsa_hook)(struct ospf_lsa *lsa))
- {
-@@ -1608,12 +1608,13 @@ out:
-   return new;
- }
- 
--void
-+struct ospf_lsa *
- ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
- {
-   struct ospf *ospf;
-   struct ospf_opaque_functab *functab;
--
-+  struct ospf_lsa *new = NULL;
-+  
-   ospf = ospf_lookup ();
- 
-   if ((functab = ospf_opaque_functab_lookup (lsa)) == NULL
-@@ -1633,9 +1634,9 @@ ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
-       ospf_lsa_flush (ospf, lsa);
-     }
-   else
--    (* functab->lsa_refresher)(lsa);
-+    new = (* functab->lsa_refresher)(lsa);
- 
--  return;
-+  return new;
- }
- 
- /*------------------------------------------------------------------------*
-diff --git a/ospfd/ospf_opaque.h b/ospfd/ospf_opaque.h
-index f49fe46..2273064 100644
---- a/ospfd/ospf_opaque.h
-+++ b/ospfd/ospf_opaque.h
-@@ -120,7 +120,7 @@ ospf_register_opaque_functab (
-   void (* config_write_debug )(struct vty *vty),
-   void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa),
-   int  (* lsa_originator)(void *arg),
--  void (* lsa_refresher )(struct ospf_lsa *lsa),
-+  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa),
-   int (* new_lsa_hook)(struct ospf_lsa *lsa),
-   int (* del_lsa_hook)(struct ospf_lsa *lsa)
- );
-@@ -143,7 +143,7 @@ extern void ospf_opaque_lsa_originate_schedule (struct ospf_interface *oi,
- 						int *init_delay);
- extern struct ospf_lsa *ospf_opaque_lsa_install (struct ospf_lsa *,
- 						 int rt_recalc);
--extern void ospf_opaque_lsa_refresh (struct ospf_lsa *lsa);
-+extern struct ospf_lsa *ospf_opaque_lsa_refresh (struct ospf_lsa *lsa);
- 
- extern void ospf_opaque_lsa_reoriginate_schedule (void *lsa_type_dependent,
- 						  u_char lsa_type,
--- 
-1.7.4
-
diff --git a/package/quagga/quagga-zlog.patch b/package/quagga/quagga-zlog.patch
deleted file mode 100644
index ad75bfef6d..0000000000
--- a/package/quagga/quagga-zlog.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fc95186c30884c96543aecfc56cfe5b08774525b Mon Sep 17 00:00:00 2001
-From: Christian Hammers <ch@debian.org>
-Date: Wed, 23 Mar 2011 13:07:55 +0300
-Subject: [PATCH] lib: fix more format warnings (#637)
-
-The following patch was also neccessary to compile.
-
-* command.c: (config_logmsg_cmd) use "%s" format spec
-* if.c: (connected_log) ditto
----
- lib/command.c |    2 +-
- lib/if.c      |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/command.c b/lib/command.c
-index 5a13f39..264e0f7 100644
---- a/lib/command.c
-+++ b/lib/command.c
-@@ -3056,7 +3056,7 @@ DEFUN (config_logmsg,
-   if ((level = level_match(argv[0])) == ZLOG_DISABLED)
-     return CMD_ERR_NO_MATCH;
- 
--  zlog(NULL, level, ((message = argv_concat(argv, argc, 1)) ? message : ""));
-+  zlog(NULL, level, "%s", ((message = argv_concat(argv, argc, 1)) ? message : ""));
-   if (message)
-     XFREE(MTYPE_TMP, message);
-   return CMD_SUCCESS;
-diff --git a/lib/if.c b/lib/if.c
-index b61bdbf..86f754b 100644
---- a/lib/if.c
-+++ b/lib/if.c
-@@ -664,7 +664,7 @@ connected_log (struct connected *connected, char *str)
-       strncat (logbuf, inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
- 	       BUFSIZ - strlen(logbuf));
-     }
--  zlog (NULL, LOG_INFO, logbuf);
-+  zlog (NULL, LOG_INFO, "%s", logbuf);
- }
- 
- /* If two connected address has same prefix return 1. */
--- 
-1.7.4
-
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index b7a23abbf3..bcc3f46120 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QUAGGA_VERSION = 0.99.18
+QUAGGA_VERSION = 0.99.20
 QUAGGA_SITE = http://www.quagga.net/download
 
 QUAGGA_DEPENDENCIES = host-gawk

From 635a7f5e10d552ebb901f81bc56e019bde00c6ee Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:16 -0300
Subject: [PATCH 0813/6849] radvd: security bump to version 1.8.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index ac0c0e9bcb..5d07ff6c5d 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -3,10 +3,10 @@
 # radvd
 #
 #############################################################
-RADVD_VERSION:=1.6
-RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz
-RADVD_SITE:=http://www.litech.org/radvd/dist/
-RADVD_DEPENDENCIES:=flex host-flex
+
+RADVD_VERSION = 1.8.2
+RADVD_SITE = http://www.litech.org/radvd/dist/
+RADVD_DEPENDENCIES = flex host-flex
 
 define RADVD_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d

From b8684494837ca9dee7defe84cbc6079a593cf2ae Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:17 -0300
Subject: [PATCH 0814/6849] which: style cleanup

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/which/which.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/which/which.mk b/package/which/which.mk
index 628711d0d2..a7bb577b2d 100644
--- a/package/which/which.mk
+++ b/package/which/which.mk
@@ -3,11 +3,8 @@
 # which
 #
 #############################################################
-WHICH_VERSION:=2.20
-WHICH_SOURCE:=which-$(WHICH_VERSION).tar.gz
-WHICH_SITE:=http://www.xs4all.nl/~carlo17/which/
-WHICH_AUTORECONF:=NO
-WHICH_INSTALL_STAGING:=NO
-WHICH_INSTALL_TARGET:=YES
+
+WHICH_VERSION = 2.20
+WHICH_SITE = http://carlo17.home.xs4all.nl/which
 
 $(eval $(call AUTOTARGETS))

From 5c57141228fbc7ae6642f4f6d3309da15466cbe8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:18 -0300
Subject: [PATCH 0815/6849] xmlstarlet: bump to version 1.3.0 and style fix

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xmlstarlet/xmlstarlet.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index bb42f5de6d..24637ec554 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -4,11 +4,8 @@
 #
 #############################################################
 
-XMLSTARLET_VERSION:=1.0.4
-XMLSTARLET_SOURCE:=xmlstarlet-$(XMLSTARLET_VERSION).tar.gz
-XMLSTARLET_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
-XMLSTARLET_INSTALL_STAGING:=NO
-XMLSTARLET_INSTALL_TARGET:=YES
+XMLSTARLET_VERSION = 1.3.0
+XMLSTARLET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
 
 XMLSTARLET_DEPENDENCIES += libxml2 libxslt \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)

From a8edc3aed0d63dbf6b38d95fc28f7b9d4f8e8f49 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:19 -0300
Subject: [PATCH 0816/6849] file: bump to version 5.0.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index 4b3fdf9073..d9a533f4d8 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FILE_VERSION = 5.05
+FILE_VERSION = 5.09
 FILE_SITE = ftp://ftp.astron.com/pub/file/
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib

From 2b87acaa8b2256a22fb9cd3db85cef311655d1e6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:20 -0300
Subject: [PATCH 0817/6849] sudo: bump to version 1.7.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 4263762d9c..9c62c49f52 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.7.6p2
+SUDO_VERSION = 1.7.7
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 
 SUDO_CONF_OPT = \
@@ -21,4 +21,4 @@ define SUDO_INSTALL_TARGET_CMDS
 	install -m 0440 -D $(@D)/sudoers $(TARGET_DIR)/etc/sudoers
 endef
 
-$(eval $(call AUTOTARGETS))
\ No newline at end of file
+$(eval $(call AUTOTARGETS))

From 933693d81c209b3bb612d5addad3166aae19f8a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:21 -0300
Subject: [PATCH 0818/6849] config menu: which is also provided by busybox

Busybox has a which applet so hide regular which unless
BR2_BUSYBOX_SHOW_OTHERS is true.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/Config.in b/package/Config.in
index 7dc8887397..39a80a25b2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -515,7 +515,9 @@ source "package/lockfile-progs/Config.in"
 source "package/logrotate/Config.in"
 source "package/screen/Config.in"
 source "package/sudo/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/which/Config.in"
+endif
 source "package/xmlstarlet/Config.in"
 endmenu
 

From a872ee462e3ec9c601a8a06aefb00234b6ed61dc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:22 -0300
Subject: [PATCH 0819/6849] psmisc: bump to version 22.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../psmisc/psmisc-link-against-libintl.patch  | 42 ++++++++++++-------
 package/psmisc/psmisc.mk                      |  2 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/package/psmisc/psmisc-link-against-libintl.patch b/package/psmisc/psmisc-link-against-libintl.patch
index 985e232779..fca49c616a 100644
--- a/package/psmisc/psmisc-link-against-libintl.patch
+++ b/package/psmisc/psmisc-link-against-libintl.patch
@@ -14,30 +14,44 @@ the "autopoint" program, which itself depends on CVS being installed,
 for some strange reasons. That's the reason why we fall back to the
 hacky solution of modifying the Makefile.in file.
 
-It replaces a hack which was mistakenly removed by commit
-542fbe8520c981f9c96705a57e4263f34f2ab2e6.
+Forward-ported Thomas's patch to psmisc 22.14
+from commit f066ed70cd6939838d4057f66798cbc1d972cc73
 
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-Index: psmisc-22.13/src/Makefile.in
-===================================================================
---- psmisc-22.13.orig/src/Makefile.in	2011-05-21 15:12:17.212412293 +0200
-+++ psmisc-22.13/src/Makefile.in	2011-05-21 16:08:50.220326032 +0200
-@@ -216,12 +216,15 @@
- 	$(am__append_4) $(am__append_6) $(am__append_8) \
+diff -Nura psmisc-22.14.orig/src/Makefile.in psmisc-22.14/src/Makefile.in
+--- psmisc-22.14.orig/src/Makefile.in	2011-10-12 12:12:09.711983726 -0300
++++ psmisc-22.14/src/Makefile.in	2011-10-12 12:14:01.733350322 -0300
+@@ -70,16 +70,16 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT)
+ fuser_OBJECTS = $(am_fuser_OBJECTS)
+-fuser_LDADD = $(LDADD)
++fuser_LDADD = $(LDADD) @INTLLIBS@
+ am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT)
+ killall_OBJECTS = $(am_killall_OBJECTS)
+ killall_DEPENDENCIES =
+ am_peekfd_OBJECTS = peekfd.$(OBJEXT)
+ peekfd_OBJECTS = $(am_peekfd_OBJECTS)
+-peekfd_LDADD = $(LDADD)
++peekfd_LDADD = $(LDADD) @INTLLIBS@
+ am_prtstat_OBJECTS = prtstat.$(OBJEXT)
+ prtstat_OBJECTS = $(am_prtstat_OBJECTS)
+-prtstat_LDADD = $(LDADD)
++prtstat_LDADD = $(LDADD) @INTLLIBS@
+ am_pstree_OBJECTS = pstree.$(OBJEXT)
+ pstree_OBJECTS = $(am_pstree_OBJECTS)
+ pstree_DEPENDENCIES =
+@@ -217,10 +217,10 @@
  	$(am__append_10)
- fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
-+fuser_LDADD = @INTLLIBS@
+ fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
  killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
 -killall_LDADD = @SELINUX_LIB@
 +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
  peekfd_SOURCES = peekfd.c
-+peekfd_LDADD = @INTLLIBS@
  pstree_SOURCES = pstree.c comm.h i18n.h
 -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
 +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
  prtstat_SOURCES = prtstat.c prtstat.h
-+prtstat_LDADD = @INTLLIBS@
  BUILT_SOURCES = signames.h
  EXTRA_DIST = signames.c 
- CLEANFILES = signames.h
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index dca502168e..df116fc949 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PSMISC_VERSION = 22.13
+PSMISC_VERSION = 22.14
 PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
 PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 

From 6c4b16f06298698b227a2bce1cf8de9b160f0007 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:23 -0300
Subject: [PATCH 0820/6849] dash: bump to version 0.5.7-2 and style cleanup

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rs.patch => dash-0.5.7-no-config.h-for-helpers.patch} | 0
 package/dash/dash.mk                                     | 9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename package/dash/{dash-0.5.5.1-no-config.h-for-helpers.patch => dash-0.5.7-no-config.h-for-helpers.patch} (100%)

diff --git a/package/dash/dash-0.5.5.1-no-config.h-for-helpers.patch b/package/dash/dash-0.5.7-no-config.h-for-helpers.patch
similarity index 100%
rename from package/dash/dash-0.5.5.1-no-config.h-for-helpers.patch
rename to package/dash/dash-0.5.7-no-config.h-for-helpers.patch
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index db2d4e5a50..26c6431b65 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -3,10 +3,11 @@
 # dash
 #
 #############################################################
-DASH_VERSION:=0.5.5.1
-DASH_SOURCE:=dash_$(DASH_VERSION).orig.tar.gz
-DASH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash
-DASH_PATCH:=dash_$(DASH_VERSION)-6.diff.gz
+
+DASH_VERSION = 0.5.7
+DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
+DASH_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash
+DASH_PATCH = dash_$(DASH_VERSION)-2.diff.gz
 
 define DASH_INSTALL_TARGET_CMDS
 	cp -a $(@D)/src/dash $(TARGET_DIR)/bin/dash

From fadf98522870fee6d91fd0e0e622600f3fdf28c4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:24 -0300
Subject: [PATCH 0821/6849] sysstat: bump to version 10.0.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sysstat/sysstat.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 30eaa7324c..0a17b4debd 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-SYSSTAT_VERSION = 9.1.7
+SYSSTAT_VERSION = 10.0.2
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
-SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
+SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
 SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors
 
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)

From 2500d3001872c591cc3f92be7c6946e27f22ae08 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:25 -0300
Subject: [PATCH 0822/6849] usbutils: build after busybox if enabled

Build after busybox if it's enabled since full-blown lsusb is better
than busybox lsusb.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 7da8eda972..e89f02e099 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -15,6 +15,11 @@ else
 	USBUTILS_CONF_OPT = --disable-zlib
 endif
 
+# Build after busybox since it's got a lightweight lsusb
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	USBUTILS_DEPENDENCIES += busybox
+endif
+
 define USBUTILS_TARGET_CLEANUP
 	rm -f $(TARGET_DIR)/usr/bin/usb-devices
 	rm -f $(TARGET_DIR)/usr/sbin/update-usbids.sh

From 7f4f23eb1b45c28378cd63629b13b4b2069b00d8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:26 -0300
Subject: [PATCH 0823/6849] pciutils: bump to version 3.1.8 and other fixes

Bump to pciutils version 3.1.8
Also make it build after busybox because it's got a lightweight
lspci whereas the full-blown is preferred.
Ditch the pci.ids skeleton comment since it's been shipped for some time
now.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/Config.in   | 3 ---
 package/pciutils/pciutils.mk | 7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/pciutils/Config.in b/package/pciutils/Config.in
index 7b318dae7f..a082f23997 100644
--- a/package/pciutils/Config.in
+++ b/package/pciutils/Config.in
@@ -4,7 +4,4 @@ config BR2_PACKAGE_PCIUTILS
 	  Various utilities dealing with the PCI bus.
 	  Provides things like setpci and lspci.
 
-	  You'll need a copy of pci.ids or pci.ids.gz in your
-	  target skeleton to enjoy verbose output.
-
 	  http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 52f5f67ff4..28f80d4626 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCIUTILS_VERSION = 3.1.7
+PCIUTILS_VERSION = 3.1.8
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 	PCIUTILS_ZLIB=yes
@@ -15,6 +15,11 @@ endif
 PCIUTILS_DNS=no
 PCIUTILS_SHARED=yes
 
+# Build after busybox since it's got a lightweight lspci
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	PCIUTILS_DEPENDENCIES += busybox
+endif
+
 define PCIUTILS_CONFIGURE_CMDS
 	$(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh
 	$(SED) 's/uname -s/echo Linux/' \

From 5a9d386ca96960d0c7d7db4268f3877688662e10 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:27 -0300
Subject: [PATCH 0824/6849] gob2: bump to version 2.0.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gob2/gob2.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index 39aa5547e9..c5572884fd 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -3,13 +3,10 @@
 # gob2
 #
 #############################################################
-GOB2_VERSION = 2.0.15
-GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.gz
-GOB2_SITE = http://ftp.5z.com/pub/gob/
-IPERF_CONF_ENV = ac_cv_lib_lex=-lfl
 
+GOB2_VERSION = 2.0.18
+GOB2_SITE = http://ftp.5z.com/pub/gob
 GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
-
 HOST_GOB2_DEPENDENCIES = host-libglib2
 
 $(eval $(call AUTOTARGETS))

From a0739590154345f9db9627e3e6f669e7902b4bbd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:28 -0300
Subject: [PATCH 0825/6849] libmpd: bump to version 11.8.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libmpd/libmpd.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/multimedia/libmpd/libmpd.mk b/package/multimedia/libmpd/libmpd.mk
index a58b537d1c..9fd12f5a2b 100644
--- a/package/multimedia/libmpd/libmpd.mk
+++ b/package/multimedia/libmpd/libmpd.mk
@@ -3,9 +3,9 @@
 # libmpd
 #
 #############################################################
-LIBMPD_VERSION = 0.17.0
-LIBMPD_SOURCE = libmpd-$(LIBMPD_VERSION).tar.gz
-LIBMPD_SITE = http://download.sarine.nl/download/Programs/gmpc/$(LIBMPD_VERSION)/
+
+LIBMPD_VERSION = 11.8.17
+LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/11.8.16
 LIBMPD_INSTALL_STAGING = YES
 LIBMPD_DEPENDENCIES = libglib2
 

From 491be12ca5237e3f0febc7c468dcd4b8760c9589 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:29 -0300
Subject: [PATCH 0826/6849] vala: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/vala/Config.in | 14 ++++++++++++++
 package/vala/vala.mk   | 15 +++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/vala/Config.in
 create mode 100644 package/vala/vala.mk

diff --git a/package/Config.in b/package/Config.in
index 39a80a25b2..30a9dcb39a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -144,6 +144,7 @@ source "package/rdesktop/Config.in"
 source "package/sylpheed/Config.in"
 source "package/synergy/Config.in"
 source "package/torsmo/Config.in"
+source "package/vala/Config.in"
 source "package/x11vnc/Config.in"
 source "package/xstroke/Config.in"
 source "package/xterm/Config.in"
diff --git a/package/vala/Config.in b/package/vala/Config.in
new file mode 100644
index 0000000000..89b4459332
--- /dev/null
+++ b/package/vala/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_VALA
+	bool "vala"
+	depends on BR2_USE_WCHAR # glib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  Compiler for the GObject type system.
+
+	  http://live.gnome.org/Vala
+
+comment "vala requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
new file mode 100644
index 0000000000..b1217cbeef
--- /dev/null
+++ b/package/vala/vala.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# vala
+#
+#############################################################
+
+VALA_VERSION = 0.12.1
+VALA_SITE = http://download.gnome.org/sources/vala/0.12
+VALA_SOURCE = vala-$(VALA_VERSION).tar.bz2
+VALA_DEPENDENCIES = host-flex libglib2 \
+		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+HOST_VALA_DEPENDENCIES = host-flex host-libglib2
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 2da2281cbcdc67ffb9419e76650f3636a5313d62 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:30 -0300
Subject: [PATCH 0827/6849] gmpc: bump to version 11.8.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmpc/Config.in |  8 ++++++--
 package/gmpc/gmpc.mk   | 21 +++++++--------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 7bfe611ea9..f86945c9e8 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -2,14 +2,18 @@ config BR2_PACKAGE_GMPC
 	bool "gmpc"
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBMPD
-	select BR2_PACKAGE_LIBCURL
-	select BR2_PACKAGE_LIBGLADE
+	select BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBSM
+	select BR2_PACKAGE_XLIB_LIBX11
 	help
 	  Gnome Music Player Client is a GNOME/GTK2.2 client for
 	  Music Player Daemon.
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index d6b6e937a4..1db5346558 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -3,21 +3,14 @@
 # gmpc
 #
 #############################################################
-GMPC_VERSION = 0.17.0
-GMPC_SOURCE = gmpc-$(GMPC_VERSION).tar.gz
-GMPC_SITE = http://download.sarine.nl/download/Programs/gmpc/$(GMPC_VERSION)/
-GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \
-		ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
-GMPC_CONF_OPT = --disable-mmkeys
 
-GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool \
+GMPC_VERSION = 11.8.16
+GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
+GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
+GMPC_CONF_OPT = --disable-mmkeys --disable-unique
+GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkg-config host-vala \
+	libglib2 libgtk2 libmpd libsoup sqlite \
+	xlib_libICE xlib_libSM xlib_libX11 \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
-ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
-GMPC_DEPENDENCIES += xlib_libSM
-GMPC_CONF_OPT += --enable-sm
-else
-GMPC_CONF_OPT += --disable-sm
-endif
-
 $(eval $(call AUTOTARGETS))

From c36b5d89c5616f7ca0a7295cbb5c231606beb71e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:31 -0300
Subject: [PATCH 0828/6849] bind: version bump to 9.6-ESV-R5 and server option

Bump to version 9.6-ESV-R5.
Also add the server option in case users just want the tools.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/Config.in | 16 +++++++++++++---
 package/bind/bind.mk   | 14 +++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/package/bind/Config.in b/package/bind/Config.in
index 827ee261f0..9b9c7eeb7d 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BIND
 	bool "bind"
+	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE
 	help
 	  BIND (Berkeley Internet Name Domain) is an implementation of
@@ -21,11 +22,20 @@ config BR2_PACKAGE_BIND
 
 	  http://www.isc.org/sw/bind/
 
+if BR2_PACKAGE_BIND
+
+config BR2_PACKAGE_BIND_SERVER
+	bool "Install server components"
+	default y
+	help
+	  Install server components (named, lwresd)
+
 config BR2_PACKAGE_BIND_TOOLS
 	bool "Install tools"
-	depends on BR2_PACKAGE_BIND
 	help
 	  Install tools (host, nslookup, dig, nsupdate)
 
-comment "bind requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+endif
+
+comment "bind requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE || BR2_INET_IPV6)
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index b62c8ea036..4c7a612394 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R4
+BIND_VERSION = 9.6-ESV-R5
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
@@ -40,17 +40,25 @@ endef
 
 BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_INSTALL_FIXES
 
+define BIND_TARGET_REMOVE_SERVER
+	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SBINS))
+endef
+
 define BIND_TARGET_REMOVE_TOOLS
 	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))
 endef
 
+ifneq ($(BR2_PACKAGE_BIND_SERVER),y)
+BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER
+endif
+
 ifneq ($(BR2_PACKAGE_BIND_TOOLS),y)
 BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_TOOLS
 endif
 
 define BIND_UNINSTALL_TARGET_CMDS
-	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SBINS))
-	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))
+	$(BIND_TARGET_REMOVE_SERVER)
+	$(BIND_TARGET_REMOVE_TOOLS)
 	rm -rf $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))
 	rm -f $(TARGET_DIR)/etc/init.d/S81named
 endef

From c245be2bc7f427a51a673a1d64c951ee63a1afb9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:32 -0300
Subject: [PATCH 0829/6849] mpd: bump to version 0.16.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 2a4889ab3f..0bf38a2771 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.4
+MPD_VERSION = 0.16.5
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2

From b79ab02d462596566f8f2e2db518dad158bae5eb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:33 -0300
Subject: [PATCH 0830/6849] wget: bump to version 1.13.4 and improvements

* Bump wget to version 1.13.4
* Enable wget again on !wchar toolchains
* Enable support for gnutls

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wget/Config.in |  4 ----
 package/wget/wget.mk   | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/package/wget/Config.in b/package/wget/Config.in
index 172359c24a..3877a3af5b 100644
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_WGET
 	bool "wget"
-	depends on BR2_USE_WCHAR
 	help
 	  Network utility to retrieve files from http, https and ftp.
 
 	  http://www.gnu.org/software/wget/
-
-comment "wget requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index c34a51c42b..b14cd92bb3 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -4,12 +4,30 @@
 #
 #############################################################
 
-WGET_VERSION = 1.12
+WGET_VERSION = 1.13.4
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
 
+# Prefer full-blown wget over busybox
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	WGET_DEPENDENCIES += busybox
+endif
+
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+	WGET_CONF_OPT += --with-ssl=gnutls \
+		--with-libgnutls-prefix=$(STAGING_DIR)
+	WGET_DEPENDENCIES += gnutls
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-	WGET_CONF_OPT += --with-ssl --with-libssl-prefix=$(STAGING_DIR)
+	WGET_CONF_OPT += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR)
 	WGET_DEPENDENCIES += openssl
 endif
 
+# --with-ssl is default
+ifneq ($(BR2_PACKAGE_GNUTLS),y)
+ifneq ($(BR2_PACKAGE_OPENSSL),y)
+	WGET_CONF_OPT += --without-ssl
+endif
+endif
+
 $(eval $(call AUTOTARGETS))

From 16eb3ed2f1d498533157c11c4b4aabb719dcb9f5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:34 -0300
Subject: [PATCH 0831/6849] ifplugd: misc fixes

* Busybox provides ifplugd, so build after it and make the menu option
  conditional on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
* Style cleanup

[Peter: really make it depend on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  2 ++
 package/ifplugd/ifplugd.mk | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 30a9dcb39a..5a378da9b6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -417,7 +417,9 @@ source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
 source "package/hostapd/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
+endif
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 33c4367ee6..cb06b63489 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -3,19 +3,20 @@
 # ifplugd
 #
 #############################################################
+
 IFPLUGD_VERSION = 0.28
-IFPLUGD_SOURCE = ifplugd-$(IFPLUGD_VERSION).tar.gz
-IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd/
+IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
 IFPLUGD_AUTORECONF = YES
-IFPLUGD_INSTALL_STAGING = NO
-IFPLUGD_INSTALL_TARGET = YES
 # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
 IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
-
 IFPLUGD_CONF_OPT = --disable-lynx
-
 IFPLUGD_DEPENDENCIES = libdaemon
 
+# Prefer big ifplugd
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	IFPLUGD_DEPENDENCIES += busybox
+endif
+
 define IFPLUGD_INSTALL_FIXUP
 	$(INSTALL) -d $(TARGET_DIR)/etc/ifplugd
 	@if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \

From 69037a484728d1f284fe71df13af6b157c695133 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:35 -0300
Subject: [PATCH 0832/6849] libdaemon: style cleanup

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdaemon/libdaemon.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 2bfd38bfae..c04537af97 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -5,13 +5,10 @@
 #############################################################
 
 LIBDAEMON_VERSION = 0.14
-LIBDAEMON_SOURCE = libdaemon-$(LIBDAEMON_VERSION).tar.gz
-LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon/
-LIBDAEMON_AUTORECONF = NO
+LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon
 LIBDAEMON_INSTALL_STAGING = YES
 LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
 LIBDAEMON_CONF_OPT = --disable-lynx
-
 LIBDAEMON_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS))

From 5222067783a0b4f20f5a68e6aa57817cca5c35a3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:36 -0300
Subject: [PATCH 0833/6849] stunnel: bump to version 4.44

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/stunnel/stunnel.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 1f40397110..6088e589e0 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -4,10 +4,9 @@
 #
 #############################################################
 
-STUNNEL_VERSION = 4.36
-STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/obsolete/4.x/
+STUNNEL_VERSION = 4.44
+STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel
 STUNNEL_DEPENDENCIES = openssl
-
 STUNNEL_CONF_OPT += \
 	--with-ssl=$(STAGING_DIR)/usr \
 	--with-threads=fork

From e447322c341fef72058ebe5f034f7a0fcc5823d7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:37 -0300
Subject: [PATCH 0834/6849] hostapd: add HT40 patch

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../hostapd-0.7.3-ht40-secondary.patch        | 52 +++++++++++++++++++
 package/hostapd/hostapd.mk                    |  1 -
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 package/hostapd/hostapd-0.7.3-ht40-secondary.patch

diff --git a/package/hostapd/hostapd-0.7.3-ht40-secondary.patch b/package/hostapd/hostapd-0.7.3-ht40-secondary.patch
new file mode 100644
index 0000000000..7664f03606
--- /dev/null
+++ b/package/hostapd/hostapd-0.7.3-ht40-secondary.patch
@@ -0,0 +1,52 @@
+From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni.malinen@atheros.com>
+Date: Fri, 12 Nov 2010 18:31:56 +0200
+Subject: [PATCH] AP: Verify that HT40 secondary channel is supported
+
+Refuse to enable HT40 mode AP unless both the primary and secondary
+channels are enabled for AP use.
+(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304)
+---
+ src/ap/hw_features.c |   26 ++++++++++++++++++++++++++
+ 1 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
+index 0159c72..7fc5b83 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
+ 			break;
+ 		}
+ 	}
++	if (ok && iface->conf->secondary_channel) {
++		int sec_ok = 0;
++		int sec_chan = iface->conf->channel +
++			iface->conf->secondary_channel * 4;
++		for (j = 0; j < iface->current_mode->num_channels; j++) {
++			struct hostapd_channel_data *chan =
++				&iface->current_mode->channels[j];
++			if (!(chan->flag & HOSTAPD_CHAN_DISABLED) &&
++			    (chan->chan == sec_chan)) {
++				sec_ok = 1;
++				break;
++			}
++		}
++		if (!sec_ok) {
++			hostapd_logger(iface->bss[0], NULL,
++				       HOSTAPD_MODULE_IEEE80211,
++				       HOSTAPD_LEVEL_WARNING,
++				       "Configured HT40 secondary channel "
++				       "(%d) not found from the channel list "
++				       "of current mode (%d) %s",
++				       sec_chan, iface->current_mode->mode,
++				       hostapd_hw_mode_txt(
++					       iface->current_mode->mode));
++			ok = 0;
++		}
++	}
+ 	if (iface->conf->channel == 0) {
+ 		/* TODO: could request a scan of neighboring BSSes and select
+ 		 * the channel automatically */
+-- 
+1.7.4-rc1
+
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 6ffca0a45c..0d6c2c53a5 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -9,7 +9,6 @@ HOSTAPD_SITE = http://hostap.epitest.fi/releases
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
-
 HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
 
 # libnl needs -lm (for rint) if linking statically

From 1f5fd14f58215eecdc088fe9c03601cc5d6fda95 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:38 -0300
Subject: [PATCH 0835/6849] wpa_supplicant: add ht40, nl80211 and dbus patches

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._supplicant-0.7.3-dbus-emit-property.patch | 61 +++++++++++++
 .../wpa_supplicant-0.7.3-ht40-secondary.patch | 52 +++++++++++
 ...pplicant-0.7.3-nl80211-cipher-suites.patch | 89 +++++++++++++++++++
 package/wpa_supplicant/wpa_supplicant.mk      |  1 -
 4 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch

diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch
new file mode 100644
index 0000000000..4c50020036
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch
@@ -0,0 +1,61 @@
+From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Fri, 17 Dec 2010 15:56:01 +0200
+Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
+
+The supplicant was not emitting property changed events when the BSSs
+property changed.
+
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
+---
+ wpa_supplicant/dbus/dbus_new.c |    6 ++++++
+ wpa_supplicant/dbus/dbus_new.h |    1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index bdfbbac..c66640a 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ 			wpas_dbus_getter_current_network;
+ 		prop = "CurrentNetwork";
+ 		break;
++	case WPAS_DBUS_PROP_BSSS:
++		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++		prop = "BSSs";
++		break;
+ 	default:
+ 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ 			   __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ 
+diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
+index 80ea98c..9cdefcb 100644
+--- a/wpa_supplicant/dbus/dbus_new.h
++++ b/wpa_supplicant/dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ 	WPAS_DBUS_PROP_STATE,
+ 	WPAS_DBUS_PROP_CURRENT_BSS,
+ 	WPAS_DBUS_PROP_CURRENT_NETWORK,
++	WPAS_DBUS_PROP_BSSS,
+ };
+ 
+ enum wpas_dbus_bss_prop {
+-- 
+1.7.4-rc1
+
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch
new file mode 100644
index 0000000000..7664f03606
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch
@@ -0,0 +1,52 @@
+From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni.malinen@atheros.com>
+Date: Fri, 12 Nov 2010 18:31:56 +0200
+Subject: [PATCH] AP: Verify that HT40 secondary channel is supported
+
+Refuse to enable HT40 mode AP unless both the primary and secondary
+channels are enabled for AP use.
+(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304)
+---
+ src/ap/hw_features.c |   26 ++++++++++++++++++++++++++
+ 1 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
+index 0159c72..7fc5b83 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
+ 			break;
+ 		}
+ 	}
++	if (ok && iface->conf->secondary_channel) {
++		int sec_ok = 0;
++		int sec_chan = iface->conf->channel +
++			iface->conf->secondary_channel * 4;
++		for (j = 0; j < iface->current_mode->num_channels; j++) {
++			struct hostapd_channel_data *chan =
++				&iface->current_mode->channels[j];
++			if (!(chan->flag & HOSTAPD_CHAN_DISABLED) &&
++			    (chan->chan == sec_chan)) {
++				sec_ok = 1;
++				break;
++			}
++		}
++		if (!sec_ok) {
++			hostapd_logger(iface->bss[0], NULL,
++				       HOSTAPD_MODULE_IEEE80211,
++				       HOSTAPD_LEVEL_WARNING,
++				       "Configured HT40 secondary channel "
++				       "(%d) not found from the channel list "
++				       "of current mode (%d) %s",
++				       sec_chan, iface->current_mode->mode,
++				       hostapd_hw_mode_txt(
++					       iface->current_mode->mode));
++			ok = 0;
++		}
++	}
+ 	if (iface->conf->channel == 0) {
+ 		/* TODO: could request a scan of neighboring BSSes and select
+ 		 * the channel automatically */
+-- 
+1.7.4-rc1
+
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch
new file mode 100644
index 0000000000..231498e994
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch
@@ -0,0 +1,89 @@
+From d0f3f451f0002339ad75b43e79f1322f2e2e4ed1 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni.malinen@atheros.com>
+Date: Mon, 13 Dec 2010 21:08:53 +0200
+Subject: [PATCH] nl80211: Set cipher suites when using user space SME
+
+Previously, pairwise and group cipher suites were configured only
+when kernel SME (nl80211 connect API) was used. However, mac80211
+needs this information even in the user space SME case for one
+thing: to disable HT when TKIP/WEP is used. Add
+NL80211_ATTR_CIPHER_SUITES_PAIRWISE to fix this special case with
+user space SME. This allows mac80211 to disable HT properly when
+the AP is configured with configuration that is not allowed.
+(cherry picked from commit aca016054885c17d58c41888698761f2e1ce2b39)
+---
+ src/drivers/driver_nl80211.c |   44 ++++++++++++++++++++++++++++++++++++++++++
+ wpa_supplicant/sme.c         |    2 +
+ 2 files changed, 46 insertions(+), 0 deletions(-)
+
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index 364158c..fb75c2e 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -3940,6 +3940,50 @@ static int wpa_driver_nl80211_associate(
+ 		NLA_PUT(msg, NL80211_ATTR_IE, params->wpa_ie_len,
+ 			params->wpa_ie);
+ 
++	if (params->pairwise_suite != CIPHER_NONE) {
++		int cipher;
++
++		switch (params->pairwise_suite) {
++		case CIPHER_WEP40:
++			cipher = WLAN_CIPHER_SUITE_WEP40;
++			break;
++		case CIPHER_WEP104:
++			cipher = WLAN_CIPHER_SUITE_WEP104;
++			break;
++		case CIPHER_CCMP:
++			cipher = WLAN_CIPHER_SUITE_CCMP;
++			break;
++		case CIPHER_TKIP:
++		default:
++			cipher = WLAN_CIPHER_SUITE_TKIP;
++			break;
++		}
++		wpa_printf(MSG_DEBUG, "  * pairwise=0x%x\n", cipher);
++		NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE, cipher);
++	}
++
++	if (params->group_suite != CIPHER_NONE) {
++		int cipher;
++
++		switch (params->group_suite) {
++		case CIPHER_WEP40:
++			cipher = WLAN_CIPHER_SUITE_WEP40;
++			break;
++		case CIPHER_WEP104:
++			cipher = WLAN_CIPHER_SUITE_WEP104;
++			break;
++		case CIPHER_CCMP:
++			cipher = WLAN_CIPHER_SUITE_CCMP;
++			break;
++		case CIPHER_TKIP:
++		default:
++			cipher = WLAN_CIPHER_SUITE_TKIP;
++			break;
++		}
++		wpa_printf(MSG_DEBUG, "  * group=0x%x\n", cipher);
++		NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, cipher);
++	}
++
+ #ifdef CONFIG_IEEE80211W
+ 	if (params->mgmt_frame_protection == MGMT_FRAME_PROTECTION_REQUIRED)
+ 		NLA_PUT_U32(msg, NL80211_ATTR_USE_MFP, NL80211_MFP_REQUIRED);
+diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
+index 5604e97..878bbf0 100644
+--- a/wpa_supplicant/sme.c
++++ b/wpa_supplicant/sme.c
+@@ -333,6 +333,8 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
+ 	params.wpa_ie = wpa_s->sme.assoc_req_ie_len ?
+ 		wpa_s->sme.assoc_req_ie : NULL;
+ 	params.wpa_ie_len = wpa_s->sme.assoc_req_ie_len;
++	params.pairwise_suite = cipher_suite2driver(wpa_s->pairwise_cipher);
++	params.group_suite = cipher_suite2driver(wpa_s->group_cipher);
+ #ifdef CONFIG_IEEE80211R
+ 	if (auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) {
+ 		params.wpa_ie = wpa_s->sme.ft_ies;
+-- 
+1.7.4-rc1
+
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 4636042b2c..b2e7be3b34 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -6,7 +6,6 @@
 
 WPA_SUPPLICANT_VERSION = 0.7.3
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
-WPA_SUPPLICANT_DEPENDENCIES =
 WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
 WPA_SUPPLICANT_SUBDIR = wpa_supplicant
 WPA_SUPPLICANT_TARGET_BINS = wpa_cli wpa_supplicant wpa_passphrase

From 01a07559a7b808ab5ab7fb4484e485999ba27845 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Oct 2011 00:07:39 -0300
Subject: [PATCH 0836/6849] squid: bump to version 3.1.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index a77e34cb0b..c5f66f6161 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.15
+SQUID_VERSION = 3.1.16
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \

From 3d19fbd26836af63b977c4b48e0487f66d53b06d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 15 Oct 2011 23:27:46 +0200
Subject: [PATCH 0837/6849] package/Config.in: sort network applications
 alpabetically

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 5a378da9b6..5d4fde21f6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -458,11 +458,11 @@ source "package/openssh/Config.in"
 source "package/openvpn/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
-source "package/radvd/Config.in"
-source "package/rp-pppoe/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
 source "package/quagga/Config.in"
+source "package/radvd/Config.in"
+source "package/rp-pppoe/Config.in"
 source "package/rsh-redone/Config.in"
 source "package/rsync/Config.in"
 source "package/samba/Config.in"

From 6d3f11d2bb1c56f02f606158229e6109cf55360d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:27 -0300
Subject: [PATCH 0838/6849] vala: bump to version 0.14.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index b1217cbeef..0a1aed0d91 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-VALA_VERSION = 0.12.1
-VALA_SITE = http://download.gnome.org/sources/vala/0.12
+VALA_VERSION = 0.14.0
+VALA_SITE = http://download.gnome.org/sources/vala/0.14
 VALA_SOURCE = vala-$(VALA_VERSION).tar.bz2
 VALA_DEPENDENCIES = host-flex libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)

From 16eebdc45f2304acf9a25f88847fc30e8a5b09dc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:28 -0300
Subject: [PATCH 0839/6849] openntpd: style fix - don't capitalize in menu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openntpd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in
index 6b8beb8282..e9c3bb503b 100644
--- a/package/openntpd/Config.in
+++ b/package/openntpd/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_OPENNTPD
-	bool "OpenNTPD"
+	bool "openntpd"
 	help
 	     OpenNTPD is an easy to use implementation of the Network Time
 	     Protocol. It provides the ability to sync the local clock

From 117550b68715b079cf2c5cafa634b22b4da06bdb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 17 Oct 2011 23:27:15 +0200
Subject: [PATCH 0840/6849] openntpd: fix help text

Help text should be indented with <tab><space><space> and contain a link
to the upstream website.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openntpd/Config.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in
index e9c3bb503b..32d0d8b06f 100644
--- a/package/openntpd/Config.in
+++ b/package/openntpd/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_OPENNTPD
 	bool "openntpd"
 	help
-	     OpenNTPD is an easy to use implementation of the Network Time
-	     Protocol. It provides the ability to sync the local clock
-	     to remote NTP servers and can act as NTP server itself,
-	     redistributing the local clock. It just works.
+	  OpenNTPD is an easy to use implementation of the Network Time
+	  Protocol. It provides the ability to sync the local clock
+	  to remote NTP servers and can act as NTP server itself,
+	  redistributing the local clock. It just works.
+
+	  http://www.openntpd.org/

From 78a8ff844bd9c2fda3af9d6233977a3201e5831d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:29 -0300
Subject: [PATCH 0841/6849] package/Config.in: more sort fixes for network apps

Send xl2tp to the bottom of the network applications menu to respect
sort order.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 5d4fde21f6..3b2769de17 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -427,7 +427,6 @@ source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
-source "package/xl2tp/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lighttpd/Config.in"
 endif
@@ -490,6 +489,7 @@ source "package/wget/Config.in"
 endif
 source "package/wireless_tools/Config.in"
 source "package/wpa_supplicant/Config.in"
+source "package/xl2tp/Config.in"
 
 endmenu
 

From 9a83a8a03599d1ebdf8237a879693975a95e95fc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:30 -0300
Subject: [PATCH 0842/6849] ntp: bump to version 4.2.6p4 and enhance

* Bump to version 4.2.6p4
* Add new ntpsnmpd option
* Fix style

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntp/Config.in | 18 +++++++++---------
 package/ntp/ntp.mk    | 25 ++++++++++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index 1b2ab4b33a..5996596098 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -6,22 +6,21 @@ config BR2_PACKAGE_NTP
 
 	  http://www.ntp.org/
 
+if BR2_PACKAGE_NTP
+
 config BR2_PACKAGE_NTP_SNTP
 	bool "sntp"
-	depends on BR2_PACKAGE_NTP
 	help
 	  Simple network time protocol program
 
 config BR2_PACKAGE_NTP_NTP_KEYGEN
 	bool "ntp-keygen"
-	depends on BR2_PACKAGE_NTP
 	help
 	  Create a NTP host key
 
 config BR2_PACKAGE_NTP_NTP_WAIT
 	bool "ntp-wait"
 	depends on BR2_PACKAGE_MICROPERL
-	depends on BR2_PACKAGE_NTP
 	help
 	  ntp-wait waits until the locally running ntpd is in state 4
 	  (synchronized). This could be useful at boot time, to delay the
@@ -29,7 +28,6 @@ config BR2_PACKAGE_NTP_NTP_WAIT
 
 config BR2_PACKAGE_NTP_NTPD
 	bool "ntpd"
-	depends on BR2_PACKAGE_NTP
 	default y
 	help
 	  ntpd is the time synchronization daemon keeping your local
@@ -38,29 +36,30 @@ config BR2_PACKAGE_NTP_NTPD
 
 config BR2_PACKAGE_NTP_NTPDATE
 	bool "ntpdate"
-	depends on BR2_PACKAGE_NTP
 	help
 	  The ntpdate utility program is used to set the local date and time
 	  from an NTP server given as an argument.
 
 config BR2_PACKAGE_NTP_NTPDC
 	bool "ntpdc"
-	depends on BR2_PACKAGE_NTP
 	help
 	  The ntpdc utility program is used to query an NTP daemon about
 	  its current state and to request changes in that state.
 
 config BR2_PACKAGE_NTP_NTPQ
 	bool "ntpq"
-	depends on BR2_PACKAGE_NTP
 	help
 	  The ntpq utility program is used to query NTP servers requesting
 	  information about current state and/or changes in that state.
 
+config BR2_PACKAGE_NTP_NTPSNMPD
+	bool "ntpsnmpd"
+	help
+	  Install ntpsnmpd NTP SNMP MIB agent.
+
 config BR2_PACKAGE_NTP_NTPTRACE
 	bool "ntptrace"
 	depends on BR2_PACKAGE_MICROPERL
-	depends on BR2_PACKAGE_NTP
 	help
 	  ntptrace is a perl script that uses the ntpq utility program to
 	  follow the chain of NTP servers from a given host back to the
@@ -68,6 +67,7 @@ config BR2_PACKAGE_NTP_NTPTRACE
 
 config BR2_PACKAGE_NTP_TICKADJ
 	bool "tickadj"
-	depends on BR2_PACKAGE_NTP
 	help
 	  set time-related kernel variables
+
+endif
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 5f2f99309a..f17193f201 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -3,26 +3,32 @@
 # ntp
 #
 #############################################################
-NTP_VERSION = 4.2.6p3
-NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
-NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 
+NTP_VERSION = 4.2.6p4
+NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
 
 ifneq ($(BR2_INET_IPV6),y)
-NTP_CONF_ENV += isc_cv_have_in6addr_any=no
+	NTP_CONF_ENV += isc_cv_have_in6addr_any=no
 endif
 
 NTP_CONF_OPT = --with-shared \
 		--program-transform-name=s,,, \
-		--disable-tickadj \
-		--without-ntpsnmpd
+		--disable-tickadj
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-NTP_CONF_OPT += --with-crypto
-NTP_DEPENDENCIES += openssl
+	NTP_CONF_OPT += --with-crypto
+	NTP_DEPENDENCIES += openssl
+else
+	NTP_CONF_OPT += --without-crypto
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTPSNMPD),y)
+	NTP_CONF_OPT += \
+		--with-net-snmp-config=$(STAGING_DIR)/usr/bin/net-snmp-config
+	NTP_DEPENDENCIES += netsnmp
 else
-NTP_CONF_OPT += --without-crypto
+	NTP_CONF_OPT += --without-ntpsnmpd
 endif
 
 define NTP_PATCH_FIXUPS
@@ -35,6 +41,7 @@ NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_WAIT) += scripts/ntp-wait
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDATE) += ntpdate/ntpdate
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDC) += ntpdc/ntpdc
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPQ) += ntpq/ntpq
+NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPSNMPD) += ntpsnmpd/ntpsnmpd
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPTRACE) += scripts/ntptrace
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_SNTP) += sntp/sntp
 NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_TICKADJ) += util/tickadj

From f6674a4d37c3cc1db03b9a8407c225f3c0f91b7f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:31 -0300
Subject: [PATCH 0843/6849] links: bump to version 2.3pre2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/links/links.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/links/links.mk b/package/links/links.mk
index 44bf9ecac0..470b13d502 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-LINKS_VERSION = 2.3pre1
+LINKS_VERSION = 2.3pre2
 LINKS_SITE = http://links.twibright.com/download
 LINKS_CONF_OPT = --without-x
+LINKS_DEPENDENCIES = host-pkg-config
 
 ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
 LINKS_CONF_OPT += --enable-graphics

From 79f5d0e3b97edcf6f43c270a505d0462bcdab4e8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:32 -0300
Subject: [PATCH 0844/6849] mutt: bump to version 1.5.21

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...14-nodoc.patch => mutt-1.5.21-nodoc.patch} |  0
 package/mutt/mutt.mk                          | 22 +++++--------------
 2 files changed, 5 insertions(+), 17 deletions(-)
 rename package/mutt/{mutt-1.5.17+20080114-nodoc.patch => mutt-1.5.21-nodoc.patch} (100%)

diff --git a/package/mutt/mutt-1.5.17+20080114-nodoc.patch b/package/mutt/mutt-1.5.21-nodoc.patch
similarity index 100%
rename from package/mutt/mutt-1.5.17+20080114-nodoc.patch
rename to package/mutt/mutt-1.5.21-nodoc.patch
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 4b75cc84ba..4c8e3991ee 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -3,23 +3,11 @@
 # mutt
 #
 #############################################################
-MUTT_VERSION:=1.5.17+20080114
-MUTT_SOURCE:=mutt_$(MUTT_VERSION).orig.tar.gz
-MUTT_PATCH:=mutt_$(MUTT_VERSION)-1.diff.gz
-MUTT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mutt/
-MUTT_DEPENDENCIES=ncurses
-MUTT_CONF_OPT = \
-		--disable-smtp \
-		--disable-iconv \
-		--without-wc-funcs
-MUTT_AUTORECONF=YES
 
-define MUTT_APPLY_DEBIAN_PATCHES
-        if [ -d $(@D)/debian/patches ]; then \
-                support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
-        fi
-endef
-
-MUTT_POST_PATCH_HOOKS += MUTT_APPLY_DEBIAN_PATCHES
+MUTT_VERSION = 1.5.21
+MUTT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mutt
+MUTT_DEPENDENCIES = ncurses
+MUTT_CONF_OPT = --disable-iconv --disable-smtp
+MUTT_AUTORECONF = YES
 
 $(eval $(call AUTOTARGETS))

From ea729ab3e5936011e91d3ba636bf6e0a0bf51528 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Oct 2011 00:04:33 -0300
Subject: [PATCH 0845/6849] ncftp: bump to version 3.2.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncftp/Config.in |  4 ----
 package/ncftp/ncftp.mk  | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index a29934abcd..7b6ae644fb 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_NCFTP
 	bool "ncftp"
-	depends on BR2_LARGEFILE
 	help
 	  NcFTP Client (also known as just NcFTP) is a set of FREE application
 	  programs implementing the File Transfer Protocol (FTP).
@@ -31,6 +30,3 @@ config BR2_PACKAGE_NCFTP_BOOKMARKS
 	select BR2_PACKAGE_NCURSES
 
 endmenu
-
-comment "ncftp requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 7fdee9ae20..3000e7a6c1 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -3,33 +3,33 @@
 # ncftp client
 #
 #############################################################
-NCFTP_VERSION:=3.2.4
-NCFTP_SOURCE:=ncftp-$(NCFTP_VERSION)-src.tar.bz2
-NCFTP_SITE:=ftp://ftp.ncftp.com/ncftp
 
-NCFTP_TARGET_BINS:=ncftp
+NCFTP_VERSION = 3.2.5
+NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.bz2
+NCFTP_SITE = ftp://ftp.ncftp.com/ncftp
+NCFTP_TARGET_BINS = ncftp
 
 ifeq ($(BR2_PACKAGE_NCFTP_GET),y)
-NCFTP_TARGET_BINS+=ncftpget
+	NCFTP_TARGET_BINS += ncftpget
 endif
 
 ifeq ($(BR2_PACKAGE_NCFTP_PUT),y)
-NCFTP_TARGET_BINS+=ncftpput
+	NCFTP_TARGET_BINS += ncftpput
 endif
 
 ifeq ($(BR2_PACKAGE_NCFTP_LS),y)
-NCFTP_TARGET_BINS+=ncftpls
+	NCFTP_TARGET_BINS += ncftpls
 endif
 
 ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y)
-NCFTP_TARGET_BINS+=ncftpbatch
-NCFTP_INSTALL_NCFTP_BATCH = \
-	ln -s /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler
+	NCFTP_TARGET_BINS += ncftpbatch
+	NCFTP_INSTALL_NCFTP_BATCH = \
+		ln -s /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler
 endif
 
 ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y)
-NCFTP_TARGET_BINS+=ncftpbookmarks
-NCFTP_DEPENDENCIES:=ncurses
+	NCFTP_TARGET_BINS += ncftpbookmarks
+	NCFTP_DEPENDENCIES += ncurses
 endif
 
 define NCFTP_INSTALL_TARGET_CMDS

From 6161049aeda617a3ed93253c1b0122aecf90d4c7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 18 Oct 2011 13:14:42 +0200
Subject: [PATCH 0846/6849] busybox: only install S01logging / S10mdev if not
 present in fs skeleton

To allow custom syslogd / mdev configutations.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 0751f6a2a5..c95190d2ad 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -31,7 +31,9 @@ endif
 # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 define BUSYBOX_INSTALL_MDEV_SCRIPT
-	install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d
+	[ -f $(TARGET_DIR)/etc/init.d/S10mdev ] ||
+		install -D -m 0755 package/busybox/S10mdev \
+			$(TARGET_DIR)/etc/init.d/S10mdev
 endef
 define BUSYBOX_INSTALL_MDEV_CONF
 	[ -f $(TARGET_DIR)/etc/mdev.conf ] || \
@@ -129,8 +131,9 @@ endif
 
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
 	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
-		$(INSTALL) -m 0755 -D package/busybox/S01logging \
-			$(TARGET_DIR)/etc/init.d/S01logging; \
+		[ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \
+			$(INSTALL) -m 0755 -D package/busybox/S01logging \
+				$(TARGET_DIR)/etc/init.d/S01logging; \
 	else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
 endef
 

From 6206828e3f39721fc0a567818d967236b1afc97c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 20 Oct 2011 16:07:46 +0200
Subject: [PATCH 0847/6849] mpg123: fix module loading with libtool /
 !HAVE_DEVFILES

mpg123 enables loadable modules support if libtool is detected, but
by default tries to load <module>.la, which we strip from the
rootfs unless HAVE_DEVFILES is enabled.

Fix it by directly loading .so files instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index c01c8adb46..8ea05a88f5 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -57,4 +57,11 @@ endif
 
 MPG123_CONF_OPT += --with-audio=$(shell echo $(MPG123_AUDIO) | tr ' ' ,)
 
+ifeq ($(BR2_PACKAGE_LIBTOOL),y)
+MPG123_DEPENDENCIES += libtool
+# .la files gets stripped unless HAVE_DEVFILES is enabled, so directly
+# load .so files rather than .la
+MPG123_CONF_OPT += --with-modules --with-module-suffix=.so
+endif
+
 $(eval $(call AUTOTARGETS))

From d96e977e372a9b7b7c681fc7bc6902211273ea1e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 19 Oct 2011 15:25:11 +0200
Subject: [PATCH 0848/6849] package: add pulseaudio

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                |  1 +
 package/multimedia/pulseaudio/Config.in     | 21 +++++++++++
 package/multimedia/pulseaudio/pulseaudio.mk | 40 +++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/multimedia/pulseaudio/Config.in
 create mode 100644 package/multimedia/pulseaudio/pulseaudio.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 7b63c1421b..ebf93146a1 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -39,6 +39,7 @@ source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
 source "package/multimedia/portaudio/Config.in"
+source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/python-mad/Config.in"
 source "package/multimedia/speex/Config.in"
 source "package/multimedia/swfdec/Config.in"
diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
new file mode 100644
index 0000000000..6e6d64c66e
--- /dev/null
+++ b/package/multimedia/pulseaudio/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_PULSEAUDIO
+	bool "pulseaudio"
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_JSON_C
+	select BR2_PACKAGE_LIBSNDFILE
+	select BR2_PACKAGE_SPEEX
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+	help
+	  PulseAudio is a sound system for POSIX OSes, meaning that it
+	  is a proxy for your sound applications. It allows you to do
+	  advanced operations on your sound data as it passes between
+	  your application and your hardware. Things like transferring
+	  the audio to a different machine, changing the sample format
+	  or channel count and mixing several sounds into one are
+	  easily achieved using a sound server.
+
+	  http://pulseaudio.org
+
+comment "pulseaudio requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
new file mode 100644
index 0000000000..0686d39aee
--- /dev/null
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# pulseaudio
+#
+################################################################################
+
+PULSEAUDIO_VERSION = 1.0
+PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
+PULSEAUDIO_INSTALL_STAGING = YES
+PULSEAUDIO_CONF_OPT = \
+	--localstatedir=/var \
+	--disable-default-build-tests \
+	--disable-legacy-runtime-dir \
+	--disable-legacy-database-entry-format
+
+PULSEAUDIO_DEPENDENCIES = \
+	host-pkg-config libtool json-c libsndfile speex \
+	$(if $(BR2_PACKAGE_LIBINTL),libintl) \
+	$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
+	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
+	$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
+	$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
+	$(if $(BR2_PACKAGE_LIBGTK2),libgtk2) \
+	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
+	$(if $(BR2_PACKAGE_DBUS),dbus) \
+	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
+	$(if $(BR2_PACKAGE_UDEV),udev) \
+	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
+	$(if $(BR2_PACKAGE_FFTW),fftw) \
+	$(if $(BR2_PACKAGE_ORC),orc)
+
+ifneq ($(BR2_PACKAGE_VALA),y)
+define PULSEAUDIO_REMOVE_VALA
+	rm -rf $(TARGET_DIR)/usr/share/vala
+endef
+
+PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA
+endif
+
+$(eval $(call AUTOTARGETS))

From bd96e4d70e6318d5865a5b5a6d01a574ff588eb7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 20 Oct 2011 16:21:47 +0200
Subject: [PATCH 0849/6849] mpd: add pulseaudio support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/Config.in | 6 ++++++
 package/multimedia/mpd/mpd.mk    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 6de1e5b487..27bd309b43 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -30,6 +30,12 @@ config BR2_PACKAGE_MPD_AO
 	help
 	  Enable libao output support.
 
+config BR2_PACKAGE_MPD_PULSEAUDIO
+	bool "pulseaudio"
+	select BR2_PACKAGE_PULSEAUDIO
+	help
+	  Enable pulseaudio output support.
+
 config BR2_PACKAGE_MPD_BZIP2
 	bool "bzip2"
 	select BR2_PACKAGE_BZIP2
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 0bf38a2771..b29b9f7a59 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -22,6 +22,11 @@ MPD_DEPENDENCIES += libao
 MPD_CONF_OPT += --enable-ao
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y)
+MPD_DEPENDENCIES += pulseaudio
+MPD_CONF_OPT += --enable-pulse
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_BZIP2),y)
 MPD_DEPENDENCIES += bzip2
 MPD_CONF_OPT += --enable-bzip2

From 1fd04dd41f01ba76b860136799099254e54a3859 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 20 Oct 2011 16:46:35 +0200
Subject: [PATCH 0850/6849] gst-plugins-good: add pulseaudio support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/Config.in           | 4 ++++
 package/multimedia/gst-plugins-good/gst-plugins-good.mk | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 1fc66a3572..33ecb5c32c 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -192,6 +192,10 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
 	bool "oss4 (Open Sound System 4)"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
+	select BR2_PACKAGE_PULSEAUDIO
+	bool "pulseaudio"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
 	select BR2_PACKAGE_LIBSOUP
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index c2dcd24db2..c7afed4c7f 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -345,6 +345,13 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-oss4
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-pulse
+GST_PLUGINS_GOOD_DEPENDENCIES += pulseaudio
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-pulse
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-soup
 GST_PLUGINS_GOOD_DEPENDENCIES += libsoup

From 0ca7b726683879f93032b348aba0759f0ef8b520 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 20 Oct 2011 19:09:18 +0200
Subject: [PATCH 0851/6849] package: add opencv

OpenCV is a free, open-source, cross-platform computer vision library

[Peter: fix deps, misc cleanup]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |   1 +
 package/opencv/Config.in |  85 ++++++++++++++++++++++++++
 package/opencv/opencv.mk | 125 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 211 insertions(+)
 create mode 100644 package/opencv/Config.in
 create mode 100644 package/opencv/opencv.mk

diff --git a/package/Config.in b/package/Config.in
index 3b2769de17..c6ca350bbc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -297,6 +297,7 @@ source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
+source "package/opencv/Config.in"
 source "package/pango/Config.in"
 source "package/pixman/Config.in"
 source "package/tiff/Config.in"
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
new file mode 100644
index 0000000000..1f454b6776
--- /dev/null
+++ b/package/opencv/Config.in
@@ -0,0 +1,85 @@
+config BR2_PACKAGE_OPENCV
+	bool "opencv"
+	select BR2_PACKAGE_ZLIB
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	help
+	  OpenCV (Open Source Computer Vision) is a library of programming
+	  functions for real time computer vision.
+
+	  http://opencv.willowgarage.com/wiki/
+
+if BR2_PACKAGE_OPENCV
+
+config BR2_PACKAGE_OPENCV_BUILD_TESTS
+	bool "build tests"
+
+config BR2_PACKAGE_OPENCV_INSTALL_DATA
+	bool "install extra data"
+	help
+	  Install various data that is used by cv libraries and/or demo
+	  applications, specifically for haarcascades and lbpcascades
+	  features.
+
+	  For further information: see OpenCV documentation.
+
+comment "Build options"
+
+config BR2_PACKAGE_OPENCV_WITH_PYTHON
+	bool "python support"
+	depends on BR2_PACKAGE_PYTHON
+
+config BR2_PACKAGE_OPENCV_WITH_FFMPEG
+	bool "ffmpeg support"
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_FFMPEG_SWSCALE
+	help
+	  Use ffmpeg from the target system.
+
+config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
+	bool "gstreamer support"
+	select BR2_PACKAGE_GSTREAMER
+	select BR2_PACKAGE_GST_PLUGINS_BASE
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
+
+config BR2_PACKAGE_OPENCV_WITH_GTK
+	bool "gtk support"
+	depends on BR2_PACKAGE_LIBGTK2
+
+config BR2_PACKAGE_OPENCV_WITH_QT
+	bool "qt backend support"
+	depends on BR2_PACKAGE_QT
+	default y
+
+config BR2_PACKAGE_OPENCV_WITH_JPEG
+	bool "jpeg support"
+	select BR2_PACKAGE_JPEG
+	help
+	  Use shared libjpeg from the target system.
+
+config BR2_PACKAGE_OPENCV_WITH_PNG
+	bool "png support"
+	select BR2_PACKAGE_LIBPNG
+	help
+	  Use shared libpng from the target system.
+
+config BR2_PACKAGE_OPENCV_WITH_TIFF
+	bool "tiff support"
+	select BR2_PACKAGE_TIFF
+	help
+	  Use shared libtiff from the target system.
+
+config BR2_PACKAGE_OPENCV_WITH_V4L
+	bool "v4l support"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBV4L
+	help
+	  Enable Video 4 Linux support.
+
+comment "v4l support requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
+
+endif # BR2_PACKAGE_OPENCV
+
+comment "opencv requires a toolchain with C++ and WCHAR support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
new file mode 100644
index 0000000000..202e0598e4
--- /dev/null
+++ b/package/opencv/opencv.mk
@@ -0,0 +1,125 @@
+#############################################################
+#
+# OpenCV (Open Source Computer Vision)
+#
+#############################################################
+OPENCV_SERIES  = 2.3
+OPENCV_VERSION = $(OPENCV_SERIES).0
+OPENCV_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_SERIES)
+OPENCV_SOURCE  = OpenCV-$(OPENCV_VERSION).tar.bz2
+OPENCV_INSTALL_STAGING = YES
+
+OPENCV_CONF_OPT = \
+	-DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \
+	-DBUILD_DOCS=$(if $(BR2_HAVE_DOCUMENTATION),ON,OFF) \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_PACKAGE=OFF \
+	-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \
+	-DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \
+	-DINSTALL_C_EXAMPLES=OFF \
+	-DINSTALL_PYTHON_EXAMPLES=OFF \
+	-DOPENCV_BUILD_3RDPARTY_LIBS=OFF \
+	-DENABLE_PROFILING=OFF \
+	-DCMAKE_SKIP_RPATH=OFF \
+	-DUSE_FAST_MATH=ON \
+	-DUSE_OMIT_FRAME_POINTER=ON \
+	-DUSE_PRECOMPILED_HEADERS=OFF \
+	-DWITH_1394=OFF \
+	-DWITH_CUDA=OFF \
+	-DWITH_EIGEN=OFF \
+	-DWITH_IPP=OFF \
+	-DWITH_JASPER=OFF \
+	-DWITH_OPENEXR=OFF \
+	-DWITH_OPENNI=OFF \
+	-DWITH_PVAPI=OFF \
+	-DWITH_TBB=OFF \
+	-DWITH_UNICAP=OFF \
+	-DWITH_XINE=OFF
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_PYTHON),y)
+OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=ON
+OPENCV_DEPENDENCIES += python
+else
+OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y)
+OPENCV_CONF_OPT += -DWITH_FFMPEG=ON
+OPENCV_DEPENDENCIES += ffmpeg
+else
+OPENCV_CONF_OPT += -DWITH_FFMPEG=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y)
+OPENCV_CONF_OPT += -DWITH_GSTREAMER=ON
+OPENCV_DEPENDENCIES += gstreamer gst-plugins-base
+else
+OPENCV_CONF_OPT += -DWITH_GSTREAMER=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)
+OPENCV_CONF_OPT += -DWITH_GTK=ON
+OPENCV_DEPENDENCIES += libgtk2
+else
+OPENCV_CONF_OPT += -DWITH_GTK=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_JPEG),y)
+OPENCV_CONF_OPT += -DWITH_JPEG=ON
+OPENCV_DEPENDENCIES += jpeg
+else
+OPENCV_CONF_OPT += -DWITH_JPEG=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_PNG),y)
+OPENCV_CONF_OPT += -DWITH_PNG=ON
+OPENCV_DEPENDENCIES += libpng
+else
+OPENCV_CONF_OPT += -DWITH_PNG=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y)
+OPENCV_CONF_OPT += -DWITH_QT=ON -DWITH_QT_OPENGL=OFF
+OPENCV_DEPENDENCIES += qt
+else
+OPENCV_CONF_OPT += -DWITH_QT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y)
+OPENCV_CONF_OPT += -DWITH_TIFF=ON
+OPENCV_DEPENDENCIES += tiff
+else
+OPENCV_CONF_OPT += -DWITH_TIFF=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENCV_WITH_V4L),y)
+OPENCV_CONF_OPT += -DWITH_V4L=ON
+OPENCV_DEPENDENCIES += libv4l
+else
+OPENCV_CONF_OPT += -DWITH_V4L=OFF
+endif
+
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+define OPENCV_CLEAN_INSTALL_DOC
+	$(RM) -fr $(TARGET_DIR)/usr/share/opencv/doc
+endef
+
+OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC
+endif
+
+ifneq ($(BR2_PACKAGE_CMAKE),y)
+define OPENCV_CLEAN_INSTALL_CMAKE
+	$(RM) -f $(TARGET_DIR)/usr/share/opencv/OpenCVConfig.cmake
+endef
+OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE
+endif
+
+ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y)
+define OPENCV_CLEAN_INSTALL_DATA
+	$(RM) -fr $(TARGET_DIR)/usr/share/opencv/haarcascades \
+		$(TARGET_DIR)/usr/share/opencv/lbpcascades
+endef
+OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DATA
+endif
+
+$(eval $(call CMAKETARGETS))

From 5889480ec61ecba3e6abe0d9cb70c1b7507a6ee5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 24 Oct 2011 14:23:30 +0200
Subject: [PATCH 0852/6849] orc: add host support

Some packages use orc to generate C code at build time using orcc, so we
need to build orc for the host as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/orc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index d4ff3e28f3..97c80f29e9 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -6,6 +6,7 @@
 ORC_VERSION = 0.4.14
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_INSTALL_STAGING = YES
+ORC_DEPENDENCIES = host-orc
 
 define ORC_REMOVE_BUGREPORT
 	rm -f $(TARGET_DIR)/usr/bin/orc-bugreport
@@ -22,3 +23,4 @@ ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
 endif
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 19e022a92f268d924f0c718ec89eb4bde29065ae Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 11:54:02 -0300
Subject: [PATCH 0853/6849] kernel-headers: bump to version 3.0.7 and add
 version 3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++++--
 toolchain/kernel-headers/kernel-headers.mk                | 2 +-
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.7-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index b827ec5be0..8be9186beb 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_0
+	default BR2_KERNEL_HEADERS_3_1
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -33,6 +33,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_0
 		bool "Linux 3.0.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_1
+		bool "Linux 3.1.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -54,6 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.4"		if BR2_KERNEL_HEADERS_3_0
+	default "3.0.7"		if BR2_KERNEL_HEADERS_3_0
+	default "3.1"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 044fcf9477..72c600766d 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -29,7 +29,7 @@ LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL)$(SUBLEVEL)$(EXTRAVERSION)
 ifeq ($(findstring x2.6.,x$(DEFAULT_KERNEL_HEADERS)),x2.6.)
 LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
 else
-LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v3.0/
+LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
 endif
 LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
 LINUX_HEADERS_CAT:=$(BZCAT)
diff --git a/toolchain/kernel-headers/linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.7-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.4-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.7-headers_install-fix-__packed-in-exported-kernel-head.patch

From 80d7b68167a5c8893e906ace6b5f0b0166336406 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 11:54:03 -0300
Subject: [PATCH 0854/6849] linux: bump default kernel to version 3.1

Bump default kernel vesion to 3.1 to match headers.
Also implement downloads for 3.x series kernels.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 10 +++++-----
 linux/linux.mk  |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 56552867fb..774aaf818c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_2_6_39
+	default BR2_LINUX_KERNEL_3_1
 
-config BR2_LINUX_KERNEL_2_6_39
-	bool "2.6.39.4"
+config BR2_LINUX_KERNEL_3_1
+	bool "3.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.39.4"
+	default "3.1"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.39.4" if BR2_LINUX_KERNEL_2_6_39
+	default "3.1" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
diff --git a/linux/linux.mk b/linux/linux.mk
index 99f464966a..6b6fd5c4ae 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -18,9 +18,11 @@ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
 # to use the $(word) function. We support versions such as 3.1,
 # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
-LINUX_VERSION_MAJOR = $(word 1,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
-LINUX_VERSION_MINOR = $(word 2,$(subst ., ,$(subst -, ,$(LINUX_VERSION))))
-LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(LINUX_VERSION_MAJOR).$(LINUX_VERSION_MINOR)/
+ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
+LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+else
+LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
+endif
 # release candidates are in testing/ subdir
 ifneq ($(findstring -rc,$(LINUX_VERSION)),)
 LINUX_SITE := $(LINUX_SITE)testing/

From c4b0af9885ab6649aa547aa01943cb1ee2d18f09 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 16:42:09 -0300
Subject: [PATCH 0855/6849] linux: vmlinux target is valid for powerpc too

The vmlinux kernel target is valid for powerpc kernels too.
In fact this broke the qemu sample config.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 774aaf818c..469fd7ca9a 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -146,7 +146,7 @@ config BR2_LINUX_KERNEL_VMLINUX_BIN
 
 config BR2_LINUX_KERNEL_VMLINUX
 	bool "vmlinux"
-	depends on BR2_mips || BR2_mipsel
+	depends on BR2_mips || BR2_mipsel || BR2_powerpc
 
 config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
 	bool "custom target"

From 79e288f1fd0b1b3d95ffeefc1f45ceddcd4039e3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 16:42:10 -0300
Subject: [PATCH 0856/6849] qemu_arm_versatile: use kernel 3.1 and add readme

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../arm-versatile/{linux-2.6.38.config => linux-3.1.config} | 0
 board/qemu/arm-versatile/readme.txt                         | 6 ++++++
 configs/qemu_arm_versatile_defconfig                        | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename board/qemu/arm-versatile/{linux-2.6.38.config => linux-3.1.config} (100%)
 create mode 100644 board/qemu/arm-versatile/readme.txt

diff --git a/board/qemu/arm-versatile/linux-2.6.38.config b/board/qemu/arm-versatile/linux-3.1.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-2.6.38.config
rename to board/qemu/arm-versatile/linux-3.1.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
new file mode 100644
index 0000000000..834b0e006c
--- /dev/null
+++ b/board/qemu/arm-versatile/readme.txt
@@ -0,0 +1,6 @@
+Run the emulation with:
+
+  qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer.
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index e4a70245c1..b629ba9907 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-2.6.38.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.1.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 34920fa79a2d4e2137c5769d6e82b2df700664af Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 16:42:11 -0300
Subject: [PATCH 0857/6849] qemu_mipsel_malta: update to kernel 3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mipsel-malta/{linux-2.6.38.config => linux-3.1.config}    | 0
 configs/qemu_mipsel_malta_defconfig                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/mipsel-malta/{linux-2.6.38.config => linux-3.1.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-2.6.38.config b/board/qemu/mipsel-malta/linux-3.1.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-2.6.38.config
rename to board/qemu/mipsel-malta/linux-3.1.config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index f95fe2418d..3f558fea9e 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-2.6.38.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.1.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 6b48629f484a84f29853fe6d587e3c1c2327dc8b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 16:42:14 -0300
Subject: [PATCH 0858/6849] qemu_ppc_g3beige: update to kernel 3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../powerpc-g3beige/{linux-2.6.36.config => linux-3.1.config} | 0
 configs/qemu_ppc_g3beige_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-2.6.36.config => linux-3.1.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-2.6.36.config b/board/qemu/powerpc-g3beige/linux-3.1.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-2.6.36.config
rename to board/qemu/powerpc-g3beige/linux-3.1.config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index db7ef74323..cf875f0a4a 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-2.6.36.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.1.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 9dd51dce953818f050d55a6cf6e53ad2806df5f6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Oct 2011 09:32:19 +0200
Subject: [PATCH 0859/6849] intltool: style/white space cleanup

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/intltool/intltool.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 1ee0497f7f..6d13cc10c9 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -3,9 +3,10 @@
 # intltool
 #
 #############################################################
-INTLTOOL_VERSION:=0.40.6
-INTLTOOL_SOURCE:=intltool-$(INTLTOOL_VERSION).tar.bz2
-INTLTOOL_SITE:=http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/
+
+INTLTOOL_VERSION = 0.40.6
+INTLTOOL_SOURCE = intltool-$(INTLTOOL_VERSION).tar.bz2
+INTLTOOL_SITE = http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/
 
 HOST_INTLTOOL_DEPENDENCIES = host-libxml-parser-perl
 HOST_INTLTOOL_CONF_OPT = \

From e55af699b5cb3d9286e19e19c8aaeb14bcdf0a38 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Oct 2011 09:41:23 +0200
Subject: [PATCH 0860/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index cac5053b06..9957d58bd3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,24 +23,29 @@
 	Linux: Kernel extensions infrastructure support, Xenomai +
 	RTAI support.
 
-	Updated/fixed packages: acpid, busybox, dbus, dbus-glib,
-	directfb, dnsmasq, drystone, e2fsprogs, ethtool, fakeroot,
-	fbdump, freetype, fuse, gamin, gmp, gnutls,
-	gst-plugins-{base,bad,good,ugly}, gstreamer, imagemagick,
-	ipsec-tools, ipset, iptables, iw, jpeg, kexec, leafpad, less,
-	libargtable2, libao, libconfuse, libcuefile, libcurl,
-	libevent, libglib2, libiconv, libreplaygain, libroxml,
+	Updated/fixed packages: acpid, bind, busybox, dash, dbus,
+	dbus-glib, directfb, dnsmasq, drystone, e2fsprogs, ethtool,
+	fakeroot, fbdump, file, freetype, fuse, gamin, gmp, gmpc,
+	gnutls, gob2, gst-plugins-{base,bad,good,ugly}, gstreamer,
+	hostapd, ifplugd, imagemagick, intltool, ipsec-tools, ipset,
+	iptables, iw, jpeg, kexec, leafpad, less, libargtable2, libao,
+	libconfuse, libcuefile, libcurl, libdaemon, libevent,
+	libglib2, libiconv, libmpd, libreplaygain, libroxml,
 	libsamplerate, libsndfile, libsoup, libsvgtiny, libtool,
-	lighttpd, linux-fusion, lite, lsof, lzo, lzop, mcookie,
-	mpg123, mpd, mpfr, musepack, mysql_client, ncurses, neon, netcat,
-	netsnmp, ntfs-3g, ntfsprogs, openssh, openssl, python, qt,
-	radvd, rsync, samba, sawman, sdl_sound, smartmontools, sqlite,
-	squid, sylpheed, taglib, tar, tcpreplay, tslib, usbutils,
-	util-linux, valgrind, whetstone, xdata_xcursor-themes, xterm
+	lighttpd, links, linux-fusion, lite, lrzsz, lsof, lzo, lzop,
+	makedevs, mcookie, mpg123, mpd, mpfr, musepack, mutt,
+	mysql_client, ncftp, ncurses, neon, netcat, netsnmp, ntfs-3g,
+	ntfsprogs, ntp, openntpd, openssh, openssl, orc, pciutils,
+	psmisc, python, qt, quagga, radvd, rpm, rsync, samba, sawman,
+	sdl_sound, smartmontools, sqlite, squid, stunnel, sudo,
+	sylpheed, sysstat, taglib, tar, tcpreplay, tslib, usbutils,
+	util-linux, valgrind, wget, whetstone, which, wpa-supplicant,
+	xdata_xcursor-themes, xmlstarlet, xterm
 
 	New packages: bluez-utils, cifs-utils, fftw, fluxbox, json-c,
-	libev, libftdi, libgeotiff, libplayer, ngrep, noip, openocd,
-	picocom, poco, portaudio, pv, rtai, xenomai.
+	libev, libftdi, libgeotiff, libplayer, ngrep, noip, opencv,
+	openocd, picocom, poco, portaudio, pulseaudio, pv, rtai, vala,
+	xenomai.
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 41c1cb44cd60819f8ba20024e23e431c00b279d7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 10 Oct 2011 10:46:39 +0200
Subject: [PATCH 0861/6849] manual: convert existing documentation to the
 asciidoc format

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotargets.txt  | 171 +++++++++++
 docs/manual/adding-packages-cmaketargets.txt | 142 +++++++++
 docs/manual/adding-packages-conclusion.txt   |  10 +
 docs/manual/adding-packages-directory.txt    |  75 +++++
 docs/manual/adding-packages-gentargets.txt   | 307 +++++++++++++++++++
 docs/manual/adding-packages-gettext.txt      |  44 +++
 docs/manual/adding-packages-handwritten.txt  | 167 ++++++++++
 docs/manual/adding-packages.txt              |  21 ++
 docs/manual/board-support.txt                |  35 +++
 docs/manual/ccache-support.txt               |  21 ++
 docs/manual/customize-busybox-config.txt     |  24 ++
 docs/manual/customize-kernel-config.txt      |  12 +
 docs/manual/customize-rootfs.txt             |  36 +++
 docs/manual/customize-uclibc-config.txt      |  32 ++
 docs/manual/customize.txt                    |  10 +
 docs/manual/download-location.txt            |  26 ++
 docs/manual/external-toolchain.txt           |  84 +++++
 docs/manual/getting.txt                      |  23 ++
 docs/manual/how-buildroot-works.txt          |  59 ++++
 docs/manual/introduction.txt                 |  69 +++++
 docs/manual/manual.txt                       |  32 ++
 docs/manual/rebuilding-packages.txt          |  62 ++++
 docs/manual/using-buildroot-toolchain.txt    |  20 ++
 docs/manual/using.txt                        | 183 +++++++++++
 24 files changed, 1665 insertions(+)
 create mode 100644 docs/manual/adding-packages-autotargets.txt
 create mode 100644 docs/manual/adding-packages-cmaketargets.txt
 create mode 100644 docs/manual/adding-packages-conclusion.txt
 create mode 100644 docs/manual/adding-packages-directory.txt
 create mode 100644 docs/manual/adding-packages-gentargets.txt
 create mode 100644 docs/manual/adding-packages-gettext.txt
 create mode 100644 docs/manual/adding-packages-handwritten.txt
 create mode 100644 docs/manual/adding-packages.txt
 create mode 100644 docs/manual/board-support.txt
 create mode 100644 docs/manual/ccache-support.txt
 create mode 100644 docs/manual/customize-busybox-config.txt
 create mode 100644 docs/manual/customize-kernel-config.txt
 create mode 100644 docs/manual/customize-rootfs.txt
 create mode 100644 docs/manual/customize-uclibc-config.txt
 create mode 100644 docs/manual/customize.txt
 create mode 100644 docs/manual/download-location.txt
 create mode 100644 docs/manual/external-toolchain.txt
 create mode 100644 docs/manual/getting.txt
 create mode 100644 docs/manual/how-buildroot-works.txt
 create mode 100644 docs/manual/introduction.txt
 create mode 100644 docs/manual/manual.txt
 create mode 100644 docs/manual/rebuilding-packages.txt
 create mode 100644 docs/manual/using-buildroot-toolchain.txt
 create mode 100644 docs/manual/using.txt

diff --git a/docs/manual/adding-packages-autotargets.txt b/docs/manual/adding-packages-autotargets.txt
new file mode 100644
index 0000000000..cb41eadfd9
--- /dev/null
+++ b/docs/manual/adding-packages-autotargets.txt
@@ -0,0 +1,171 @@
+Infrastructure for autotools-based packages
+-------------------------------------------
+
+[[autotargets-tutorial]]
+
++AUTOTARGETS+ tutorial
+~~~~~~~~~~~~~~~~~~~~~~
+
+First, let's see how to write a +.mk+ file for an autotools-based
+package, with an example :
+
+------------------------
+01: #############################################################
+02: #
+03: # libfoo
+04: #
+05: #############################################################
+06: LIBFOO_VERSION = 1.0
+07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+08: LIBFOO_SITE = http://www.foosoftware.org/download
+09: LIBFOO_INSTALL_STAGING = YES
+10: LIBFOO_INSTALL_TARGET = YES
+11: LIBFOO_CONF_OPT = --enable-shared
+12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
+13:
+14: $(eval $(call AUTOTARGETS,package,libfoo))
+------------------------
+
+On line 6, we declare the version of the package.
+
+On line 7 and 8, we declare the name of the tarball and the location
+of the tarball on the Web. Buildroot will automatically download the
+tarball from this location.
+
+On line 9, we tell Buildroot to install the package to the staging
+directory. The staging directory, located in +output/staging/+
+is the directory where all the packages are installed, including their
+development files, etc. By default, packages are not installed to the
+staging directory, since usually, only libraries need to be installed in
+the staging directory: their development files are needed to compile
+other libraries or applications depending on them. Also by default, when
+staging installation is enabled, packages are installed in this location
+using the +make install+ command.
+
+On line 10, we tell Buildroot to also install the package to the
+target directory. This directory contains what will become the root
+filesystem running on the target. Usually, we try not to install header
+files and to install stripped versions of the binary. By default, target
+installation is enabled, so in fact, this line is not strictly
+necessary. Also by default, packages are installed in this location
+using the +make install+ command.
+
+On line 11, we tell Buildroot to pass a custom configure option, that
+will be passed to the +./configure+ script before configuring
+and building the package.
+
+On line 12, we declare our dependencies, so that they are built
+before the build process of our package starts.
+
+Finally, on line line 14, we invoke the +AUTOTARGETS+
+macro that generates all the Makefile rules that actually allows the
+package to be built.
+
+[[autotargets-reference]]
+
++AUTOTARGETS+ reference
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The main macro of the autotools package infrastructure is
++AUTOTARGETS+. It has the same number of arguments and the
+same semantic as the +GENTARGETS+ macro, which is the main
+macro of the generic package infrastructure. For autotools packages, the
+ability to have target and host packages is also available (and is
+actually widely used).
+
+Just like the generic infrastructure, the autotools infrastructure
+works by defining a number of variables before calling the
++AUTOTARGETS+ macro.
+
+First, all the package metadata information variables that exist in the
+generic infrastructure also exist in the autotools infrastructure:
++LIBFOO_VERSION+, +LIBFOO_SOURCE+,
++LIBFOO_PATCH+, +LIBFOO_SITE+,
++LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+,
++LIBFOO_INSTALL_STAGING+, +LIBFOO_INSTALL_TARGET+.
+
+A few additional variables, specific to the autotools infrastructure,
+can also be defined. Many of them are only useful in very specific
+cases, typical packages will therefore only use a few of them.
+
+* +LIBFOO_SUBDIR+ may contain the name of a subdirectory
+  inside the package that contains the configure script. This is useful,
+  if for example, the main configure script is not at the root of the
+  tree extracted by the tarball. If +HOST_LIBFOO_SUBDIR+ is
+  not specified, it defaults to +LIBFOO_SUBDIR+.
+
+* +LIBFOO_CONF_ENV+, to specify additional environment
+  variables to pass to the configure script. By default, empty.
+
+* +LIBFOO_CONF_OPT+, to specify additional configure
+  options to pass to the configure script. By default, empty.
+
+* +LIBFOO_MAKE+, to specify an alternate +make+
+  command. This is typically useful when parallel make is enabled in
+  the configuration (using +BR2_JLEVEL+) but that this
+  feature should be disabled for the given package, for one reason or
+  another. By default, set to +$(MAKE)+. If parallel building
+  is not supported by the package, then it should be set to
+  +LIBFOO_MAKE=$(MAKE1)+.
+
+* +LIBFOO_MAKE_ENV+, to specify additional environment
+  variables to pass to make in the build step. These are passed before
+  the +make+ command. By default, empty.
+
+* +LIBFOO_MAKE_OPT+, to specify additional variables to
+  pass to make in the build step. These are passed after the
+  +make+ command. By default, empty.
+
+* +LIBFOO_AUTORECONF+, tells whether the package should
+  be autoreconfigured or not (i.e, if the configure script and
+  Makefile.in files should be re-generated by re-running autoconf,
+  automake, libtool, etc.). Valid values are +YES+ and
+  +NO+. By default, the value is +NO+
+
+* +LIBFOO_AUTORECONF_OPT+ to specify additional options
+  passed to the 'autoreconf' program if
+  +LIBFOO_AUTORECONF=YES+. By default, empty.
+
+* +LIBFOO_LIBTOOL_PATCH+ tells whether the Buildroot
+  patch to fix libtool cross-compilation issues should be applied or
+  not. Valid values are +YES+ and +NO+. By
+  default, the value is +YES+
+
+* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options
+  used to install the package to the staging directory. By default, the
+  value is +DESTDIR=$$(STAGING_DIR) install+, which is
+  correct for most autotools packages. It is still possible to override
+  it.
+
+* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options
+  used to install the package to the target directory. By default, the
+  value is +DESTDIR=$$(TARGET_DIR) install+. The default
+  value is correct for most autotools packages, but it is still possible
+  to override it if needed.
+
+* +LIBFOO_CLEAN_OPT+ contains the make options used to
+  clean the package. By default, the value is +clean+.
+
+* +LIBFOO_UNINSTALL_STAGING_OPT+, contains the make
+  options used to uninstall the package from the staging directory. By
+  default, the value is +DESTDIR=$$(STAGING_DIR) uninstall+.
+
+* +LIBFOO_UNINSTALL_TARGET_OPT+, contains the make
+  options used to uninstall the package from the target directory. By
+  default, the value is +DESTDIR=$$(TARGET_DIR) uninstall+.
+
+With the autotools infrastructure, all the steps required to build
+and install the packages are already defined, and they generally work
+well for most autotools-based packages. However, when required, it is
+still possible to customize what is done in any particular step:
+
+* By adding a post-operation hook (after extract, patch, configure,
+  build or install). See the reference documentation of the generic
+  infrastructure for details.
+
+* By overriding one of the steps. For example, even if the autotools
+  infrastructure is used, if the package +.mk+ file defines its
+  own +LIBFOO_CONFIGURE_CMDS+ variable, it will be used
+  instead of the default autotools one. However, using this method
+  should be restricted to very specific cases. Do not use it in the
+  general case.
diff --git a/docs/manual/adding-packages-cmaketargets.txt b/docs/manual/adding-packages-cmaketargets.txt
new file mode 100644
index 0000000000..b03eb6894d
--- /dev/null
+++ b/docs/manual/adding-packages-cmaketargets.txt
@@ -0,0 +1,142 @@
+Infrastructure for CMake-based packages
+---------------------------------------
+
+[[cmaketargets-tutorial]]
+
++CMAKETARGETS+ tutorial
+~~~~~~~~~~~~~~~~~~~~~~~
+
+First, let's see how to write a +.mk+ file for a CMake-based package,
+with an example :
+
+------------------------
+01: #############################################################
+02: #
+03: # libfoo
+04: #
+05: #############################################################
+06: LIBFOO_VERSION = 1.0
+07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+08: LIBFOO_SITE = http://www.foosoftware.org/download
+09: LIBFOO_INSTALL_STAGING = YES
+10: LIBFOO_INSTALL_TARGET = YES
+11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
+12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
+13:
+14: $(eval $(call CMAKETARGETS,package,libfoo))
+------------------------
+
+On line 6, we declare the version of the package.
+
+On line 7 and 8, we declare the name of the tarball and the location
+of the tarball on the Web. Buildroot will automatically download the
+tarball from this location.
+
+On line 9, we tell Buildroot to install the package to the staging
+directory. The staging directory, located in +output/staging/+
+is the directory where all the packages are installed, including their
+development files, etc. By default, packages are not installed to the
+staging directory, since usually, only libraries need to be installed in
+the staging directory: their development files are needed to compile
+other libraries or applications depending on them. Also by default, when
+staging installation is enabled, packages are installed in this location
+using the +make install+ command.
+
+On line 10, we tell Buildroot to also install the package to the
+target directory. This directory contains what will become the root
+filesystem running on the target. Usually, we try not to install header
+files and to install stripped versions of the binary. By default, target
+installation is enabled, so in fact, this line is not strictly
+necessary. Also by default, packages are installed in this location
+using the +make install+ command.
+
+On line 11, we tell Buildroot to pass custom options to CMake when it is
+configuring the package.
+
+On line 12, we declare our dependencies, so that they are built
+before the build process of our package starts.
+
+Finally, on line line 14, we invoke the +CMAKETARGETS+
+macro that generates all the Makefile rules that actually allows the
+package to be built.
+
+[[cmaketargets-reference]]
+
++CMAKETARGETS+ reference
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The main macro of the CMake package infrastructure is
++CMAKETARGETS+. It has the same number of arguments and the same
+semantic as the +GENTARGETS+ macro, which is the main macro of the
+generic package infrastructure. For CMake packages, the ability to
+have target and host packages is also available.
+
+Just like the generic infrastructure, the CMake infrastructure works
+by defining a number of variables before calling the +CMAKETARGETS+
+macro.
+
+First, all the package metadata information variables that exist in
+the generic infrastructure also exist in the CMake infrastructure:
++LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+,
++LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+,
++LIBFOO_INSTALL_TARGET+.
+
+A few additional variables, specific to the CMake infrastructure, can
+also be defined. Many of them are only useful in very specific cases,
+typical packages will therefore only use a few of them.
+
+* +LIBFOO_SUBDIR+ may contain the name of a subdirectory inside the
+  package that contains the main CMakeLists.txt file. This is useful,
+  if for example, the main CMakeLists.txt file is not at the root of
+  the tree extracted by the tarball. If +HOST_LIBFOO_SUBDIR+ is not
+  specified, it defaults to +LIBFOO_SUBDIR+.
+
+* +LIBFOO_CONF_ENV+, to specify additional environment variables to
+  pass to CMake. By default, empty.
+
+* +LIBFOO_CONF_OPT+, to specify additional configure options to pass
+  to CMake. By default, empty.
+
+* +LIBFOO_MAKE+, to specify an alternate +make+ command. This is
+  typically useful when parallel make is enabled in the configuration
+  (using +BR2_JLEVEL+) but that this feature should be disabled for
+  the given package, for one reason or another. By default, set to
+  +$(MAKE)+. If parallel building is not supported by the package,
+  then it should be set to +LIBFOO_MAKE=$(MAKE1)+.
+
+* +LIBFOO_MAKE_ENV+, to specify additional environment variables to
+  pass to make in the build step. These are passed before the +make+
+  command. By default, empty.
+
+* +LIBFOO_MAKE_OPT+, to specify additional variables to pass to make
+  in the build step. These are passed after the +make+ command. By
+  default, empty.
+
+* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options used to
+  install the package to the staging directory. By default, the value
+  is +DESTDIR=$$(STAGING_DIR) install+, which is correct for most
+  CMake packages. It is still possible to override it.
+
+* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options used to
+  install the package to the target directory. By default, the value
+  is +DESTDIR=$$(TARGET_DIR) install+. The default value is correct
+  for most CMake packages, but it is still possible to override it if
+  needed.
+
+* +LIBFOO_CLEAN_OPT+ contains the make options used to clean the
+  package. By default, the value is +clean+.
+
+With the CMake infrastructure, all the steps required to build and
+install the packages are already defined, and they generally work well
+for most CMake-based packages. However, when required, it is still
+possible to customize what is done in any particular step:
+
+* By adding a post-operation hook (after extract, patch, configure,
+  build or install). See the reference documentation of the generic
+  infrastructure for details.
+
+* By overriding one of the steps. For example, even if the CMake
+  infrastructure is used, if the package +.mk+ file defines its own
+  +LIBFOO_CONFIGURE_CMDS+ variable, it will be used instead of the
+  default CMake one. However, using this method should be restricted
+  to very specific cases. Do not use it in the general case.
diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt
new file mode 100644
index 0000000000..3475827275
--- /dev/null
+++ b/docs/manual/adding-packages-conclusion.txt
@@ -0,0 +1,10 @@
+Conclusion
+----------
+
+As you can see, adding a software package to Buildroot is simply a
+matter of writing a Makefile using an  existing example and modifying it
+according to the compilation process required by the package.
+
+If you package software that might be useful for other people, don't
+forget to send a patch to Buildroot developers!
+
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
new file mode 100644
index 0000000000..058ebad1cc
--- /dev/null
+++ b/docs/manual/adding-packages-directory.txt
@@ -0,0 +1,75 @@
+Package directory
+-----------------
+
+First of all, create a directory under the +package+ directory for
+your software, for example +libfoo+.
+
+Some packages have been grouped by topic in a sub-directory:
++multimedia+, +java+, +x11r7+, and +games+. If your package fits in
+one of these categories, then create your package directory in these.
+
++Config.in+ file
+~~~~~~~~~~~~~~~~
+
+Then, create a file named +Config.in+. This file will contain the
+option descriptions related to our +libfoo+ software that will be used
+and displayed in the configuration tool. It should basically contain :
+
+---------------------------
+config BR2_PACKAGE_LIBFOO
+	bool "libfoo"
+	help
+	  This is a comment that explains what libfoo is.
+
+	  http://foosoftware.org/libfoo/
+---------------------------
+
+Of course, you can add other options to configure particular things in
+your software. You can look at examples in other packages. The syntax
+of the +Config.in+ file is the same as the one for the kernel Kconfig
+file. The documentation for this syntax is available at
+http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt[]
+
+Finally you have to add your new +libfoo/Config.in+ to
++package/Config.in+ (or in a category subdirectory if you decided to
+put your package in one of the existing categories). The files
+included there are 'sorted alphabetically' per category and are 'NOT'
+supposed to contain anything but the 'bare' name of the package.
+
+--------------------------
+source "package/libfoo/Config.in"
+--------------------------
+
+The +.mk+ file
+~~~~~~~~~~~~~~
+
+Finally, here's the hardest part. Create a file named +libfoo.mk+. It
+describes how the package should be downloaded, configured, built,
+installed, etc.
+
+Depending on the package type, the +.mk+ file must be written in a
+different way, using different infrastructures:
+
+* *Makefiles for generic packages* (not using autotools): These are
+  based on an infrastructure similar to the one used for
+  autotools-based packages, but requires a little more work from the
+  developer. They specify what should be done for the configuration,
+  compilation, installation and cleanup of the package. This
+  infrastructure must be used for all packages that do not use the
+  autotools as their build system. In the future, other specialized
+  infrastructures might be written for other build systems.  We cover
+  them through in a xref:gentargets-tutorial[tutorial] and a
+  xref:gentargets-reference[reference].
+
+* *Makefiles for autotools-based software* (autoconf, automake, etc.):
+  We provide a dedicated infrastructure for such packages, since
+  autotools is a very common build system. This infrastructure 'must'
+  be used for new packages that rely on the autotools as their build
+  system. We cover them through a xref:autotargets-tutorial[tutorial]
+  and xref:autotargets-reference[reference].
+
+* *Hand-written Makefiles:* These are currently obsolete, and no new
+  manual Makefiles should be added. However, since there are still
+  many of them in the tree, we keep them documented in a
+  xref:handwritten-tutorial[tutorial].
+
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
new file mode 100644
index 0000000000..9a319d1611
--- /dev/null
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -0,0 +1,307 @@
+Infrastructure for packages with specific build systems
+-------------------------------------------------------
+
+By 'packages with specific build systems' we mean all the packages
+whose build system is not one of the standard ones, such as
+'autotools' or 'CMake'. This typically includes packages whose build
+system is based on hand-written Makefiles or shell scripts.
+
+[[gentargets-tutorial]]
+
++GENTARGETS+ Tutorial
+~~~~~~~~~~~~~~~~~~~~~
+
+------------------------------
+01: #############################################################
+02: #
+03: # libfoo
+04: #
+05: #############################################################
+06: LIBFOO_VERSION = 1.0
+07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+08: LIBFOO_SITE = http://www.foosoftware.org/download
+09: LIBFOO_INSTALL_STAGING = YES
+10: LIBFOO_DEPENDENCIES = host-libaaa libbbb
+11:
+12: define LIBFOO_BUILD_CMDS
+13: 	$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) all
+14: endef
+15:
+16: define LIBFOO_INSTALL_STAGING_CMDS
+17: 	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
+18: 	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
+19: 	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
+20: endef
+21:
+22: define LIBFOO_INSTALL_TARGET_CMDS
+23: 	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
+24: 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
+25: endef
+26:
+27: $(eval $(call GENTARGETS,package,libfoo))
+--------------------------------
+
+The Makefile begins on line 6 to 8 with metadata information: the
+version of the package (+LIBFOO_VERSION+), the name of the
+tarball containing the package (+LIBFOO_SOURCE+) and the
+Internet location at which the tarball can be downloaded
+(+LIBFOO_SITE+). All variables must start with the same prefix,
++LIBFOO_+ in this case. This prefix is always the uppercased
+version of the package name (see below to understand where the package
+name is defined).
+
+On line 9, we specify that this package wants to install something to
+the staging space. This is often needed for libraries, since they must
+install header files and other development files in the staging space.
+This will ensure that the commands listed in the
++LIBFOO_INSTALL_STAGING_CMDS+ variable will be executed.
+
+On line 10, we specify the list of dependencies this package relies
+on. These dependencies are listed in terms of lower-case package names,
+which can be packages for the target (without the +host-+
+prefix) or packages for the host (with the +host-+) prefix).
+Buildroot will ensure that all these packages are built and installed
+'before' the current package starts its configuration.
+
+The rest of the Makefile defines what should be done at the different
+steps of the package configuration, compilation and installation.
++LIBFOO_BUILD_CMDS+ tells what steps should be performed to
+build the package. +LIBFOO_INSTALL_STAGING_CMDS+ tells what
+steps should be performed to install the package in the staging space.
++LIBFOO_INSTALL_TARGET_CMDS+ tells what steps should be
+performed to install the package in the target space.
+
+All these steps rely on the +$(@D)+ variable, which
+contains the directory where the source code of the package has been
+extracted.
+
+Finally, on line 27, we call the +GENTARGETS+ which
+generates, according to the variables defined previously, all the
+Makefile code necessary to make your package working.
+
+[[gentargets-reference]]
+
++GENTARGETS+ Reference
+~~~~~~~~~~~~~~~~~~~~~~
+
+The +GENTARGETS+ macro takes three arguments:
+
+* The first argument is the package directory prefix. If your package
+  is in +package/libfoo+, then the directory prefix is +package+. If
+  your package is in +package/editors/foo+, then the directory prefix
+  must be +package/editors+.
+
+* The second argument is the lower-cased package name. It must match
+  the prefix of the variables in the +.mk+ file and must match the
+  configuration option name in the +Config.in+ file. For example, if
+  the package name is +libfoo+, then the variables in the +.mk+ file
+  must start with +LIBFOO_+ and the configuration option in the
+  +Config.in+ file must be +BR2_PACKAGE_LIBFOO+.
+
+* The third argument is optional. It can be used to tell if the
+  package is a target package (cross-compiled for the target) or a
+  host package (natively compiled for the host). If unspecified, it is
+  assumed that it is a target package. See below for details.
+
+For a given package, in a single +.mk+ file, it is possible to call
+GENTARGETS twice, once to create the rules to generate a target
+package and once to create the rules to generate a host package:
+
+----------------------
+$(eval $(call GENTARGETS,package,libfoo))
+$(eval $(call GENTARGETS,package,libfoo,host))
+----------------------
+
+This might be useful if the compilation of the target package requires
+some tools to be installed on the host. If the package name is
++libfoo+, then the name of the package for the target is also
++libfoo+, while the name of the package for the host is
++host-libfoo+. These names should be used in the DEPENDENCIES
+variables of other packages, if they depend on +libfoo+ or
++host-libfoo+.
+
+The call to the +GENTARGETS+ macro *must* be at the end of the +.mk+
+file, after all variable definitions.
+
+For the target package, the +GENTARGETS+ uses the variables defined by
+the .mk file and prefixed by the uppercased package name:
++LIBFOO_*+. For the host package, it uses the +HOST_LIBFOO_*+. For
+'some' variables, if the +HOST_LIBFOO_+ prefixed variable doesn't
+exist, the package infrastructure uses the corresponding variable
+prefixed by +LIBFOO_+. This is done for variables that are likely to
+have the same value for both the target and host packages. See below
+for details.
+
+The list of variables that can be set in a +.mk+ file to give metadata
+information is (assuming the package name is +libfoo+) :
+
+* +LIBFOO_VERSION+, mandatory, must contain the version of the
+  package. Note that if +HOST_LIBFOO_VERSION+ doesn't exist, it is
+  assumed to be the same as +LIBFOO_VERSION+. It can also be a
+  Subversion or Git branch or tag, for packages that are fetched
+  directly from their revision control system. +
+  Example: +LIBFOO_VERSION = 0.1.2+
+
+* +LIBFOO_SOURCE+ may contain the name of the tarball of
+  the package. If +HOST_LIBFOO_SOURCE+ is not specified, it
+  defaults to +LIBFOO_VERSION+. If none are specified, then
+  the value is assumed to be
+  +packagename-$(LIBFOO_VERSION).tar.gz+. +
+  Example: +LIBFOO_SOURCE = foobar-$(LIBFOO_VERSION).tar.bz2+
+
+* +LIBFOO_PATCH+ may contain the name of a patch, that will be
+  downloaded from the same location as the tarball indicated in
+  +LIBFOO_SOURCE+. If +HOST_LIBFOO_PATCH+ is not specified, it
+  defaults to +LIBFOO_PATCH+. Also note that another mechanism is
+  available to patch a package: all files of the form
+  +packagename-packageversion-description.patch+ present in the
+  package directory inside Buildroot will be applied to the package
+  after extraction.
+
+* +LIBFOO_SITE+ may contain the Internet location of the package. It
+  can either be the HTTP or FTP location of a tarball, or the URL of a
+  Git or Subversion repository (see +LIBFOO_SITE_METHOD+ below). If
+  +HOST_LIBFOO_SITE+ is not specified, it defaults to
+  +LIBFOO_SITE+. If none are specified, then the location is assumed
+  to be
+  +http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename+. +
+  Examples: +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ +
+  +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+
+
+* +LIBFOO_SITE_METHOD+ may contain the method to fetch the package
+  source code. It can either be +wget+ (for normal FTP/HTTP downloads
+  of tarballs), +svn+, +git+ or +bzr+.  When not specified, it is
+  guessed from the URL given in +LIBFOO_SITE+: +svn://+, +git://+ and
+  +bzr://+ URLs will use the +svn+, +git+ and +bzr+ methods
+  respectively. All other URL-types will use the +wget+ method. So for
+  example, in the case of a package whose source code is available
+  through Subversion repository on HTTP, one 'must' specifiy
+  +LIBFOO_SITE_METHOD=svn+. For +svn+ and +git+ methods, what
+  Buildroot does is a checkout/clone of the repository which is then
+  tarballed and stored into the download cache. Next builds will not
+  checkout/clone again, but will use the tarball directly. When
+  +HOST_LIBFOO_SITE_METHOD+ is not specified, it defaults to the value
+  of +LIBFOO_SITE_METHOD+. See +package/multimedia/tremor/+ for an
+  example.
+
+* +LIBFOO_DEPENDENCIES+ lists the dependencies (in terms of package
+  name) that are required for the current target package to
+  compile. These dependencies are guaranteed to be compiled and
+  installed before the configuration of the current package starts. In
+  a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependency for
+  the current host package.
+
+* +LIBFOO_INSTALL_STAGING+ can be set to +YES+ or +NO+ (default). If
+  set to +YES+, then the commands in the +LIBFOO_INSTALL_STAGING_CMDS+
+  variables are executed to install the package into the staging
+  directory.
+
+* +LIBFOO_INSTALL_TARGET+ can be set to +YES+ (default) or +NO+. If
+  set to +YES+, then the commands in the +LIBFOO_INSTALL_TARGET_CMDS+
+  variables are executed to install the package into the target
+  directory.
+
+The recommended way to define these variables is to use the following
+syntax:
+
+----------------------
+LIBFOO_VERSION = 2.32
+----------------------
+
+Now, the variables that define what should be performed at the
+different steps of the build process.
+
+* +LIBFOO_CONFIGURE_CMDS+, used to list the actions to be performed to
+  configure the package before its compilation
+
+* +LIBFOO_BUILD_CMDS+, used to list the actions to be performed to
+  compile the package
+
+* +HOST_LIBFOO_INSTALL_CMDS+, used to list the actions to be performed
+  to install the package, when the package is a host package. The
+  package must install its files to the directory given by
+  +$(HOST_DIR)+. All files, including development files such as
+  headers should be installed, since other packages might be compiled
+  on top of this package.
+
+* +LIBFOO_INSTALL_TARGET_CMDS+, used to list the actions to be
+  performed to install the package to the target directory, when the
+  package is a target package. The package must install its files to
+  the directory given by +$(TARGET_DIR)+. Only the files required for
+  'documentation' and 'execution' of the package should be
+  installed. Header files should not be installed, they will be copied
+  to the target, if the +development files in target filesystem+
+  option is selected.
+
+* +LIBFOO_INSTALL_STAGING_CMDS+, used to list the actions to be
+  performed to install the package to the staging directory, when the
+  package is a target package. The package must install its files to
+  the directory given by +$(STAGING_DIR)+. All development files
+  should be installed, since they might be needed to compile other
+  packages.
+
+* +LIBFOO_CLEAN_CMDS+, used to list the actions to perform to clean up
+  the build directory of the package.
+
+* +LIBFOO_UNINSTALL_TARGET_CMDS+, used to list the actions to
+  uninstall the package from the target directory +$(TARGET_DIR)+
+
+* +LIBFOO_UNINSTALL_STAGING_CMDS+, used to list the actions to
+  uninstall the package from the staging directory +$(STAGING_DIR)+.
+
+The preferred way to define these variables is:
+
+----------------------
+define LIBFOO_CONFIGURE_CMDS
+	action 1
+	action 2
+	action 3
+endef
+----------------------
+
+In the action definitions, you can use the following variables:
+
+* +$(@D)+, which contains the directory in which the package source
+  code has been uncompressed.
+
+* +$(TARGET_CC)+, +$(TARGET_LD)+, etc. to get the target
+  cross-compilation utilities
+
+* +$(TARGET_CROSS)+ to get the cross-compilation toolchain prefix
+
+* Of course the +$(HOST_DIR)+, +$(STAGING_DIR)+ and +$(TARGET_DIR)+
+  variables to install the packages properly.
+
+The last feature of the generic infrastructure is the ability to add
+hooks. These define further actions to perform after existing steps.
+Most hooks aren't really useful for generic packages, since the +.mk+
+file already has full control over the actions performed in each step
+of the package construction. The hooks are more useful for packages
+using the autotools infrastructure described below.  However, since
+they are provided by the generic infrastructure, they are documented
+here. The exception is +LIBFOO_POST_PATCH_HOOKS+.  Patching the
+package is not user definable, so +LIBFOO_POST_PATCH_HOOKS+ will be
+userful for generic packages.
+
+The following hook points are available:
+
+* +LIBFOO_POST_PATCH_HOOKS+
+* +LIBFOO_PRE_CONFIGURE_HOOKS+
+* +LIBFOO_POST_CONFIGURE_HOOKS+
+* +LIBFOO_POST_BUILD_HOOKS+
+* +LIBFOO_POST_INSTALL_HOOKS+ (for host packages only)
+* +LIBFOO_POST_INSTALL_STAGING_HOOKS+ (for target packages only)
+* +LIBFOO_POST_INSTALL_TARGET_HOOKS+ (for target packages only)
+
+These variables are 'lists' of variable names containing actions to be
+performed at this hook point. This allows several hooks to be
+registered at a given hook point. Here is an example:
+
+----------------------
+define LIBFOO_POST_PATCH_FIXUP
+	action1
+	action2
+endef
+
+LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
+----------------------
diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt
new file mode 100644
index 0000000000..1ed834e152
--- /dev/null
+++ b/docs/manual/adding-packages-gettext.txt
@@ -0,0 +1,44 @@
+Gettext integration and interaction with packages
+-------------------------------------------------
+
+Many packages that support internationalization use the gettext
+library. Dependencies for this library are fairly complicated and
+therefore, deserves some explanation.
+
+The 'uClibc' C library doesn't implement gettext functionality,
+therefore with this C library, a separate gettext must be compiled. On
+the other hand, the 'glibc' C library does integrate its own gettext,
+and in this case, the separate gettext library should not be compiled,
+because it creates various kinds of build failures.
+
+Additionally, some packages (such as +libglib2+) do require gettext
+unconditionally, while other packages (those who support
++--disable-nls+ in general) only require gettext when locale support
+is enabled.
+
+Therefore, Buildroot defines two configuration options:
+
+* +BR2_NEEDS_GETTEXT+, which is true as soon as the toolchain doesn't
+  provide its own gettext implementation
+
+* +BR2_NEEDS_GETTEXT_IF_LOCALE+, which is true if the toolchain
+  doesn't provide its own gettext implementation and if locale support
+  is enabled
+
+Therefore, packages that unconditionally need gettext should:
+
+* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT+ and possibly
+  +select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT+, if libintl is
+  also needed
+
+* Use +$(if $(BR2_NEEDS_GETTEXT),gettext)+ in the package
+  +DEPENDENCIES+ variable
+
+Packages that need gettext only when locale support is enabled should:
+
+* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE+ and
+  possibly +select BR2_PACKAGE_LIBINTL if
+  BR2_NEEDS_GETTEXT_IF_LOCALE+, if libintl is also needed
+
+* Use +$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)+ in the package
+  +DEPENDENCIES+ variable
diff --git a/docs/manual/adding-packages-handwritten.txt b/docs/manual/adding-packages-handwritten.txt
new file mode 100644
index 0000000000..a9d247ca8e
--- /dev/null
+++ b/docs/manual/adding-packages-handwritten.txt
@@ -0,0 +1,167 @@
+[[handwritten-tutorial]]
+
+Manual Makefile
+---------------
+
+*NOTE: new manual makefiles should not be created, and existing manual
+makefiles should be converted either to the generic, autotools or
+cmake infrastructure. This section is only kept to document the
+existing manual makefiles and to help understand how they work.*
+
+------------------------
+01: #############################################################
+02: #
+03: # libfoo
+04: #
+05: #############################################################
+06: LIBFOO_VERSION:=1.0
+07: LIBFOO_SOURCE:=libfoo-$(LIBFOO_VERSION).tar.gz
+08: LIBFOO_SITE:=http://www.foosoftware.org/downloads
+09: LIBFOO_DIR:=$(BUILD_DIR)/foo-$(FOO_VERSION)
+10: LIBFOO_BINARY:=foo
+11: LIBFOO_TARGET_BINARY:=usr/bin/foo
+12:
+13: $(DL_DIR)/$(LIBFOO_SOURCE):
+14: 	$(call DOWNLOAD,$(LIBFOO_SITE),$(LIBFOO_SOURCE))
+15:
+16: $(LIBFOO_DIR)/.source: $(DL_DIR)/$(LIBFOO_SOURCE)
+17: 	$(ZCAT) $(DL_DIR)/$(LIBFOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+18: 	touch $@
+19:
+20: $(LIBFOO_DIR)/.configured: $(LIBFOO_DIR)/.source
+21: 	(cd $(LIBFOO_DIR); rm -rf config.cache; \
+22: 		$(TARGET_CONFIGURE_OPTS) \
+23: 		$(TARGET_CONFIGURE_ARGS) \
+24: 		./configure \
+25: 		--target=$(GNU_TARGET_NAME) \
+26: 		--host=$(GNU_TARGET_NAME) \
+27: 		--build=$(GNU_HOST_NAME) \
+28: 		--prefix=/usr \
+29: 		--sysconfdir=/etc \
+30: 	)
+31: 	touch $@
+32:
+33: $(LIBFOO_DIR)/$(LIBFOO_BINARY): $(LIBFOO_DIR)/.configured
+34: 	$(MAKE) CC=$(TARGET_CC) -C $(LIBFOO_DIR)
+35:
+36: $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY): $(LIBFOO_DIR)/$(LIBFOO_BINARY)
+37: 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIBFOO_DIR) install-strip
+38: 	rm -Rf $(TARGET_DIR)/usr/man
+39:
+40: libfoo: uclibc ncurses $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY)
+41:
+42: libfoo-source: $(DL_DIR)/$(LIBFOO_SOURCE)
+43:
+44: libfoo-clean:
+45: 	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBFOO_DIR) uninstall
+46: 	-$(MAKE) -C $(LIBFOO_DIR) clean
+47:
+48: libfoo-dirclean:
+49: 	rm -rf $(LIBFOO_DIR)
+50:
+51: #############################################################
+52: #
+53: # Toplevel Makefile options
+54: #
+55: #############################################################
+56: ifeq ($(BR2_PACKAGE_LIBFOO),y)
+57: TARGETS+=libfoo
+58: endif
+------------------------
+
+First of all, this Makefile example works for a package which
+comprises a single binary executable. For other software, such as
+libraries or more complex stuff with multiple binaries, it must be
+qqadapted. For examples look at the other +*.mk+ files in the
++package+ directory.
+
+At lines 6-11, a couple of useful variables are defined:
+
+* +LIBFOO_VERSION+: The version of 'libfoo' that should be downloaded.
+
+* +LIBFOO_SOURCE+: The name of the tarball of 'libfoo' on the download
+  website or FTP site. As you can see +LIBFOO_VERSION+ is used.
+
+* +LIBFOO_SITE+: The HTTP or FTP site from which 'libfoo' archive is
+  downloaded. It must include the complete path to the directory where
+  +LIBFOO_SOURCE+ can be found.
+
+* +LIBFOO_DIR+: The directory into which the software will be
+  configured and compiled. Basically, it's a subdirectory of
+  +BUILD_DIR+ which is created upon decompression of the tarball.
+
+* +LIBFOO_BINARY+: Software binary name. As said previously, this is
+  an example for a package with a single binary.
+
+* +LIBFOO_TARGET_BINARY+: The full path of the binary inside the
+  target filesystem.  Lines 13-14 define a target that downloads the
+  tarball from the remote site to the download directory (+DL_DIR+).
+
+Lines 16-18 define a target and associated rules that uncompress the
+downloaded tarball. As you can see, this target depends on the tarball
+file so that the previous target (lines 13-14) is called before
+executing the rules of the current target. Uncompressing is followed
+by 'touching' a hidden file to mark the software as having been
+uncompressed. This trick is used everywhere in a Buildroot Makefile to
+split steps (download, uncompress, configure, compile, install) while
+still having correct dependencies.
+
+Lines 20-31 define a target and associated rules that configure the
+software. It depends on the previous target (the hidden +.source+
+file) so that we are sure the software has been uncompressed. In order
+to configure the package, it basically runs the well-known
++./configure+ script. As we may be doing cross-compilation, +target+,
++host+ and +build+ arguments are given. The prefix is also set to
++/usr+, not because the software will be installed in +/usr+ on your
+host system, but because the software will be installed in + /usr+ on
+the target filesystem. Finally it creates a +.configured+ file to mark
+the software as configured.
+
+Lines 33-34 define a target and a rule that compile the software. This
+target will create the binary file in the compilation directory and
+depends on the software being already configured (hence the reference
+to the +.configured+ file).  It basically runs +make+ inside the
+source directory.
+
+Lines 36-38 define a target and associated rules that install the
+software inside the target filesystem. They depend on the binary file
+in the source directory to make sure the software has been
+compiled. They use the +install-strip+ target of the software
++Makefile+ by passing a +DESTDIR+ argument so that the +Makefile+
+doesn't try to install the software in the host +/usr+ but rather in
+the target +/usr+. After the installation, the +/usr/man + directory
+inside the target filesystem is removed to save space.
+
+Line 40 defines the main target of the software &mdash; the one that
+will eventually be used by the top level +Makefile+ to download,
+compile, and then install this package. This target should first of
+all depend on all needed dependencies of the software (in our example,
+'uclibc' and 'ncurses') and also depend on the final binary. This last
+dependency will call all previous dependencies in the correct order.
+
+Line 42 defines a simple target that only downloads the code
+source. This is not used during normal operation of Buildroot, but is
+needed if you intend to download all required sources at once for
+later offline build. Note that if you add a new package, providing a
++libfoo-source+ target is 'mandatory' to support users that wish to do
+offline-builds. Furthermore, it eases checking if all package-sources
+are downloadable.
+
+Lines 44-46 define a simple target to clean the software build by
+calling the Makefile with the appropriate options.  The +-clean+
+target should run +make clean+ on $(BUILD_DIR)/package-version and
+MUST uninstall all files of the package from $(STAGING_DIR) and from
+$(TARGET_DIR).
+
+Lines 48-49 define a simple target to completely remove the directory
+in which the software was uncompressed, configured and compiled. The
++-dirclean+ target MUST completely rm $(BUILD_DIR)/ package-version.
+
+Lines 51-58 add the target +libfoo+ to the list of targets to be
+compiled by Buildroot, by first checking if the configuration option
+for this package has been enabled using the configuration tool. If so,
+it then &quot;subscribes&quot; this package to be compiled by adding
+the package to the TARGETS global variable.  The name added to the
+TARGETS global variable is the name of this package's target, as
+defined on line 40, which is used by Buildroot to download, compile,
+and then install this package.
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
new file mode 100644
index 0000000000..0217e9f4b0
--- /dev/null
+++ b/docs/manual/adding-packages.txt
@@ -0,0 +1,21 @@
+Adding new packages to Buildroot
+================================
+
+This section covers how new packages (userspace libraries or
+applications) can be integrated into Buildroot. It also shows how
+existing packages are integrated, which is needed for fixing issues or
+tuning their configuration.
+
+include::adding-packages-directory.txt[]
+
+include::adding-packages-gentargets.txt[]
+
+include::adding-packages-autotargets.txt[]
+
+include::adding-packages-cmaketargets.txt[]
+
+include::adding-packages-handwritten.txt[]
+
+include::adding-packages-gettext.txt[]
+
+include::adding-packages-conclusion.txt[]
diff --git a/docs/manual/board-support.txt b/docs/manual/board-support.txt
new file mode 100644
index 0000000000..d1d9d63801
--- /dev/null
+++ b/docs/manual/board-support.txt
@@ -0,0 +1,35 @@
+Creating your own board support
+===============================
+
+Creating your own board support in Buildroot allows users of a
+particular hardware platform to easily build a system that is known to
+work.
+
+To do so, you need to create a normal Buildroot configuration that
+builds a basic system for the hardware: toolchain, kernel, bootloader,
+filesystem and a simple Busybox-only userspace. No specific package
+should be selected: the configuration should be as minimal as
+possible, and should only build a working basic Busybox system for the
+target platform. You can of course use more complicated configurations
+for your internal projects, but the Buildroot project will only
+integrate basic board configurations. This is because package
+selections are highly application-specific.
+
+Once you have a known working configuration, run +make
+savedefconfig+. This will generate a minimal +defconfig+ file at the
+root of the Buildroot source tree. Move this file into the +configs/+
+directory, and rename it +MYBOARD_defconfig+.
+
+It is recommended to use as much as possible upstream versions of the
+Linux kernel and bootloaders, and to use as much as possible default
+kernel and bootloader configurations. If they are incorrect for your
+platform, we encourage you to send fixes to the corresponding upstream
+projects.
+
+However, in the mean time, you may want to store kernel or bootloader
+configuration or patches specific to your target platform. To do so,
+create a directory +board/MANUFACTURER+ and a subdirectory
++board/MANUFACTURER/BOARDNAME+ (after replacing, of course,
+MANUFACTURER and BOARDNAME with the appropriate values, in lower case
+letters). You can then store your patches and configurations in these
+directories, and reference them from the main Buildroot configuration.
diff --git a/docs/manual/ccache-support.txt b/docs/manual/ccache-support.txt
new file mode 100644
index 0000000000..ab8cbad1de
--- /dev/null
+++ b/docs/manual/ccache-support.txt
@@ -0,0 +1,21 @@
+Using +ccache+ in Buildroot
+===========================
+
+http://ccache.samba.org[ccache] is a compiler cache. It stores the
+object files resulting from each compilation process, and is able to
+skip future compilation of the same source file (with same compiler
+and same arguments) by using the pre-existing object files. When doing
+almost identical builds from scratch a number of times, it can nicely
+speed up the build process.
+
++ccache+ support is integrated in Buildroot. You just have to enable
++Enable compiler cache+ in +Build options+. This will automatically
+build +ccache+ and use it for every host and target compilation.
+
+The cache is located in +$HOME/.buildroot-ccache+. It is stored
+outside of Buildroot output directory so that it can be shared by
+separate Buildroot builds. If you want to get rid of the cache, simply
+remove this directory.
+
+You can get statistics on the cache (its size, number of hits,
+misses, etc.) by running +make ccache-stats+.
diff --git a/docs/manual/customize-busybox-config.txt b/docs/manual/customize-busybox-config.txt
new file mode 100644
index 0000000000..60e6a55618
--- /dev/null
+++ b/docs/manual/customize-busybox-config.txt
@@ -0,0 +1,24 @@
+Customizing the Busybox configuration
+-------------------------------------
+[[busybox-custom]]
+
+http://www.busybox.net/[Busybox] is very configurable, and you may
+want to customize it. You can follow these simple steps to do so. This
+method isn't optimal, but it's simple, and it works:
+
+* Do an initial compilation of Buildroot, with busybox, without
+  trying to customize it.
+
+* Invoke +make busybox-menuconfig+.
+  The nice configuration tool appears, and you can
+  customize everything.
+
+* Run the compilation of Buildroot again.
+
+Otherwise, you can simply change the
++package/busybox/busybox-<version>.config+ file, if you know the
+options you want to change, without using the configuration tool.
+
+If you want to use an existing config file for busybox, then see
+section xref:env-vars[].
+
diff --git a/docs/manual/customize-kernel-config.txt b/docs/manual/customize-kernel-config.txt
new file mode 100644
index 0000000000..6bafe46d71
--- /dev/null
+++ b/docs/manual/customize-kernel-config.txt
@@ -0,0 +1,12 @@
+Customizing the Linux kernel configuration
+------------------------------------------
+
+The Linux kernel configuration can be customized just like
+xref:busybox-custom[BusyBox] and xref:uclibc-custom[uClibc] using
++make linux-menuconfig+. Make sure you have enabled the kernel build
+in +make menuconfig+ first. Once done, run +make+ to (re)build
+everything.
+
+If you want to use an existing config file for Linux, then see
+xref:env-vars[].
+
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
new file mode 100644
index 0000000000..8c3ea82ad5
--- /dev/null
+++ b/docs/manual/customize-rootfs.txt
@@ -0,0 +1,36 @@
+Customizing the generated target filesystem
+-------------------------------------------
+
+There are a few ways to customize the resulting target filesystem:
+
+* Customize the target filesystem directly and rebuild the image.  The
+  target filesystem is available under +output/target/+.  You can
+  simply make your changes here and run make afterwards - this will
+  rebuild the target filesystem image. This method allows you to do
+  anything to the target filesystem, but if you decide to completely
+  rebuild your toolchain and tools, these changes will be lost.
+
+* Create your own 'target skeleton'. You can start with the default
+  skeleton available under +fs/skeleton+ and then customize it to suit
+  your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
+  +BR2_ROOTFS_SKELETON_CUSTOM_PATH+ will allow you to specify the
+  location of your custom skeleton. At build time, the contents of the
+  skeleton are copied to output/target before any package
+  installation.
+
+* In the Buildroot configuration, you can specify the path to a
+  post-build script, that gets called 'after' Buildroot builds all the
+  selected software, but 'before' the rootfs packages are
+  assembled. The destination root filesystem folder is given as the
+  first argument to this script, and this script can then be used to
+  copy programs, static data or any other needed file to your target
+  filesystem. You should, however, use this feature with care.
+  Whenever you find that a certain package generates wrong or unneeded
+  files, you should fix that package rather than work around it with a
+  post-build cleanup script.
+
+* A special package, 'customize', stored in +package/customize+ can be
+  used. You can put all the files that you want to see in the final
+  target root filesystem in +package/customize/source+, and then
+  enable this special package in the configuration system.
+
diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt
new file mode 100644
index 0000000000..e2e6799200
--- /dev/null
+++ b/docs/manual/customize-uclibc-config.txt
@@ -0,0 +1,32 @@
+Customizing the uClibc configuration
+------------------------------------
+[[uclibc-custom]]
+
+Just like xref:busybox-custom[BusyBox], http://www.uclibc.org/[uClibc]
+offers a lot of configuration options. They allow you to select
+various functionalities depending on your needs and limitations.
+
+The easiest way to modify the configuration of uClibc is to
+follow these steps:
+
+* Do an initial compilation of Buildroot without trying to customize
+  uClibc.
+
+* Invoke +make uclibc-menuconfig+.  The nice configuration assistant,
+  similar to the one used in the Linux kernel or Buildroot,
+  appears. Make your configuration changes as appropriate.
+
+* Copy the +$(O)/toolchain/uclibc-VERSION/.config+ file to a different
+  place (like +toolchain/uClibc/uClibc-myconfig.config+, or
+  +board/mymanufacturer/myboard/uClibc.config+) and adjust the uClibc
+  configuration (configuration option +BR2_UCLIBC_CONFIG+) to use this
+  configuration instead of the default one.
+
+* Run the compilation of Buildroot again.
+
+Otherwise, you can simply change +toolchain/uClibc/uClibc.config+,
+without running the configuration assistant.
+
+If you want to use an existing config file for uclibc, then see
+xref:env-vars[].
+
diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt
new file mode 100644
index 0000000000..c9f4dfd41a
--- /dev/null
+++ b/docs/manual/customize.txt
@@ -0,0 +1,10 @@
+Customization
+=============
+
+include::customize-rootfs.txt[]
+
+include::customize-busybox-config.txt[]
+
+include::customize-uclibc-config.txt[]
+
+include::customize-kernel-config.txt[]
diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
new file mode 100644
index 0000000000..cb6147f2bb
--- /dev/null
+++ b/docs/manual/download-location.txt
@@ -0,0 +1,26 @@
+Location of downloaded packages
+===============================
+
+It might be useful to know that the various tarballs that are
+downloaded by the Makefiles are all stored in the +DL_DIR+ which by
+default is the +dl+ directory. It's useful, for example, if you want
+to keep a complete version of Buildroot which is known to be working
+with the associated tarballs. This will allow you to regenerate the
+toolchain and the target filesystem with exactly the same versions.
+
+If you maintain several Buildroot trees, it might be better to have a
+shared download location. This can be accessed by creating a symbolic
+link from the +dl+ directory to the shared download location:
+
+-----------------
+ $ ln -s <shared download location> dl
+-----------------
+
+Another way of accessing a shared download location is to create the
++BUILDROOT_DL_DIR+ environment variable.  If this is set, then the
+value of DL_DIR in the project is overridden. The following line
+should be added to +<~/.bashrc>+.
+
+-----------------
+ $ export BUILDROOT_DL_DIR <shared download location>
+-----------------
diff --git a/docs/manual/external-toolchain.txt b/docs/manual/external-toolchain.txt
new file mode 100644
index 0000000000..20eebdb202
--- /dev/null
+++ b/docs/manual/external-toolchain.txt
@@ -0,0 +1,84 @@
+Using an external toolchain
+===========================
+
+Using an already existing toolchain is useful for different
+reasons:
+
+* you already have a toolchain that is known to work for your specific
+  CPU
+
+* you want to speed up the Buildroot build process by skipping the
+  long toolchain build part
+
+* the toolchain generation feature of Buildroot is not sufficiently
+  flexible for you (for example if you need to generate a system with
+  'glibc' instead of 'uClibc')
+
+Buildroot supports using existing toolchains through a mechanism
+called 'external toolchain'. The external toolchain mechanism is
+enabled in the +Toolchain+ menu, by selecting +External toolchain+ in
++Toolchain type+.
+
+Then, you have three solutions to use an external toolchain:
+
+* Use a predefined external toolchain profile, and let Buildroot
+  download, extract and install the toolchain. Buildroot already knows
+  about a few CodeSourcery toolchains for ARM, PowerPC, MIPS and
+  SuperH. Just select the toolchain profile in +Toolchain+ through the
+  available ones. This is definitely the easiest solution.
+
+* Use a predefined external toolchain profile, but instead of having
+  Buildroot download and extract the toolchain, you can tell Buildroot
+  where your toolchain is already installed on your system. Just
+  select the toolchain profile in +Toolchain+ through the available
+  ones, unselect +Download toolchain automatically+, and fill the
+  +Toolchain path+ text entry with the path to your cross-compiling
+  toolchain.
+
+* Use a completely custom external toolchain. This is particularly
+  useful for toolchains generated using crosstool-NG. To do this,
+  select the +Custom toolchain+ solution in the +Toolchain+ list. You
+  need to fill the +Toolchain path+, +Toolchain prefix+ and +External
+  toolchain C library+ options. Then, you have to tell Buildroot what
+  your external toolchain supports. If your external toolchain uses
+  the 'glibc' library, you only have to tell whether your toolchain
+  supports C++ or not. If your external toolchain uses the 'uclibc'
+  library, then you have to tell Buildroot if it supports largefile,
+  IPv6, RPC, wide-char, locale, program invocation, threads and
+  C++. At the beginning of the execution, Buildroot will tell you if
+  the selected options do not match the toolchain configuration.
+
+
+Our external toolchain support has been tested with toolchains from
+CodeSourcery, toolchains generated by
+http://crosstool-ng.org[crosstool-NG], and toolchains generated by
+Buildroot itself. In general, all toolchains that support the
+'sysroot' feature should work. If not, do not hesitate to contact the
+developers.
+
+We do not support toolchains from the
+http://www.denx.de/wiki/DULG/ELDK[ELDK] of Denx, for two reasons:
+
+* The ELDK does not contain a pure toolchain (i.e just the compiler,
+  binutils, the C and C++ libraries), but a toolchain that comes with
+  a very large set of pre-compiled libraries and programs. Therefore,
+  Buildroot cannot import the 'sysroot' of the toolchain, as it would
+  contain hundreds of megabytes of pre-compiled libraries that are
+  normally built by Buildroot.
+
+* The ELDK toolchains have a completely non-standard custom mechanism
+  to handle multiple library variants. Instead of using the standard
+  GCC 'multilib' mechanism, the ARM ELDK uses different symbolic links
+  to the compiler to differentiate between library variants (for ARM
+  soft-float and ARM VFP), and the PowerPC ELDK compiler uses a
+  +CROSS_COMPILE+ environment variable. This non-standard behaviour
+  makes it difficult to support ELDK in Buildroot.
+
+We also do not support using the distribution toolchain (i.e the
+gcc/binutils/C library installed by your distribution) as the
+toolchain to build software for the target. This is because your
+distribution toolchain is not a "pure" toolchain (i.e only with the
+C/C++ library), so we cannot import it properly into the Buildroot
+build environment. So even if you are building a system for a x86 or
+x86_64 target, you have to generate a cross-compilation toolchain with
+Buildroot or crosstool-NG.
diff --git a/docs/manual/getting.txt b/docs/manual/getting.txt
new file mode 100644
index 0000000000..42ca0098d3
--- /dev/null
+++ b/docs/manual/getting.txt
@@ -0,0 +1,23 @@
+Getting Buildroot
+=================
+
+Buildroot releases are made approximately every 3 months. Direct Git
+access and daily snapshots are also available, if you want more
+bleeding edge.
+
+Releases are available at http://buildroot.net/downloads/[].
+
+The latest snapshot is always available at
+http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2[],
+and previous snapshots are also available at
+http://buildroot.net/downloads/snapshots/[].
+
+To download Buildroot using Git, you can simply follow the rules
+described on the "Accessing Git" page
+(http://buildroot.net/git.html[]) of the Buildroot website
+(http://buildroot.net[]).  For the impatient, here's a quick recipe:
+
+---------------------
+ $ git clone git://git.buildroot.net/buildroot
+---------------------
+
diff --git a/docs/manual/how-buildroot-works.txt b/docs/manual/how-buildroot-works.txt
new file mode 100644
index 0000000000..481e5a480d
--- /dev/null
+++ b/docs/manual/how-buildroot-works.txt
@@ -0,0 +1,59 @@
+How Buildroot works
+===================
+
+As mentioned above, Buildroot is basically a set of Makefiles that
+download, configure, and compile software with the correct options. It
+also includes patches for various software packages - mainly the ones
+involved in the cross-compilation tool chain (+gcc+, +binutils+ and
++uClibc+).
+
+There is basically one Makefile per software package, and they are
+named with the +.mk+ extension. Makefiles are split into three main
+sections:
+
+* *toolchain* (in the +toolchain/+ directory) contains the Makefiles
+  and associated files for all software related to the
+  cross-compilation toolchain: +binutils+, +gcc+, +gdb+,
+  +kernel-headers+ and +uClibc+.
+
+* *package* (in the +package/+ directory) contains the Makefiles and
+  associated files for all user-space tools that Buildroot can compile
+  and add to the target root filesystem. There is one sub-directory
+  per tool.
+
+* *target* (in the +target+ directory) contains the Makefiles and
+  associated files for software related to the generation of the
+  target root filesystem image. Four types of filesystems are
+  supported: ext2, jffs2, cramfs and squashfs. For each of them there
+  is a sub-directory with the required files. There is also a
+  +default/+ directory that contains the target filesystem skeleton.
+
+Each directory contains at least 2 files:
+
+* +something.mk+ is the Makefile that downloads, configures,
+  compiles and installs the package +something+.
+
+* +Config.in+ is a part of the configuration tool
+  description file. It describes the options related to the
+  package.
+
+The main Makefile performs the following steps (once the
+configuration is done):
+
+* Create all the output directories: +staging+, +target+, +build+,
+  +stamps+, etc. in the output directory (+output/+ by default,
+  another value can be specified using +O=+)
+
+* Generate all the targets listed in the +BASE_TARGETS+ variable. When
+  an internal toolchain is used, this means generating the
+  cross-compilation toolchain. When an external toolchain is used,
+  this means checking the features of the external toolchain and
+  importing it into the Buildroot environment.
+
+* Generate all the targets listed in the +TARGETS+ variable. This
+  variable is filled by all the individual components'
+  Makefiles. Generating these targets will trigger the compilation of
+  the userspace packages (libraries, programs), the kernel, the
+  bootloader and the generation of the root filesystem images,
+  depending on the configuration.
+
diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt
new file mode 100644
index 0000000000..476ce257be
--- /dev/null
+++ b/docs/manual/introduction.txt
@@ -0,0 +1,69 @@
+About Buildroot
+===============
+
+Buildroot is a set of Makefiles and patches that allows you to easily
+generate a cross-compilation toolchain, a root filesystem and a Linux
+kernel image for your target. Buildroot can be used for one, two or
+all of these options, independently.
+
+Buildroot is useful mainly for people working with embedded systems.
+Embedded systems often use processors that are not the regular x86
+processors everyone is used to having in his PC. They can be PowerPC
+processors, MIPS processors, ARM processors, etc.
+
+A compilation toolchain is the set of tools that allows you to compile
+code for your system. It consists of a compiler (in our case, +gcc+),
+binary utils like assembler and linker (in our case, +binutils+) and a
+C standard library (for example
+http://www.gnu.org/software/libc/libc.html[GNU Libc],
+http://www.uclibc.org/[uClibc] or
+http://www.fefe.de/dietlibc/[dietlibc]). The system installed on your
+development station certainly already has a compilation toolchain that
+you can use to compile an application that runs on your system. If
+you're using a PC, your compilation toolchain runs on an x86 processor
+and generates code for an x86 processor. Under most Linux systems, the
+compilation toolchain uses the GNU libc (glibc) as the C standard
+library.  This compilation toolchain is called the "host compilation
+toolchain". The machine on which it is running, and on which you're
+working, is called the "host system". The compilation toolchain is
+provided by your distribution, and Buildroot has nothing to do with it
+(other than using it to build a cross-compilation toolchain and other
+tools that are run on the development host).
+
+As said above, the compilation toolchain that comes with your system
+runs on and generates code for the processor in your host system. As
+your embedded system has a different processor, you need a
+cross-compilation toolchain - a compilation toolchain that runs on
+your host system but generates code for your target system (and target
+processor). For example, if your host system uses x86 and your target
+system uses ARM, the regular compilation toolchain on your host runs on
+x86 and generates code for x86, while the cross-compilation toolchain
+runs on x86 and generates code for ARM.
+
+Even if your embedded system uses an x86 processor, you might be
+interested in Buildroot for two reasons:
+
+* The compilation toolchain on your host certainly uses the GNU Libc
+  which is a complete but huge C standard library. Instead of using
+  GNU Libc on your target system, you can use uClibc which is a tiny C
+  standard library. If you want to use this C library, then you need a
+  compilation toolchain to generate binaries linked with it. Buildroot
+  can do that for you.
+
+* Buildroot automates the building of a root filesystem with all
+  needed tools like busybox. That makes it much easier than doing it
+  by hand.
+
+You might wonder why such a tool is needed when you can compile +gcc+,
++binutils+, +uClibc+ and all the other tools by hand. Of course doing
+so is possible but, dealing with all of the configure options and
+problems of every +gcc+ or +binutils+ version is very time-consuming
+and uninteresting.  Buildroot automates this process through the use
+of Makefiles and has a collection of patches for each +gcc+ and
++binutils+ version to make them work on most architectures.
+
+Moreover, Buildroot provides an infrastructure for reproducing the
+build process of your kernel, cross-toolchain, and embedded root
+filesystem. Being able to reproduce the build process will be useful
+when a component needs to be patched or updated or when another person
+is supposed to take over the project.
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
new file mode 100644
index 0000000000..10ce69508f
--- /dev/null
+++ b/docs/manual/manual.txt
@@ -0,0 +1,32 @@
+The Buildroot user manual
+=========================
+:toc:
+
+Buildroot usage and documentation by Thomas Petazzoni. Contributions
+from Karsten Kruse, Ned Ludd, Martin Herren and others.
+
+image::logo.png[]
+
+:leveloffset: 1
+
+include::introduction.txt[]
+
+include::getting.txt[]
+
+include::using.txt[]
+
+include::customize.txt[]
+
+include::rebuilding-packages.txt[]
+
+include::how-buildroot-works.txt[]
+
+include::using-buildroot-toolchain.txt[]
+
+include::external-toolchain.txt[]
+
+include::ccache-support.txt[]
+
+include::download-location.txt[]
+
+include::adding-packages.txt[]
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
new file mode 100644
index 0000000000..9a41a88ac3
--- /dev/null
+++ b/docs/manual/rebuilding-packages.txt
@@ -0,0 +1,62 @@
+Understanding how to rebuild packages
+=====================================
+
+One of the most common questions asked by Buildroot users is how to
+rebuild a given package or how to remove a package without rebuilding
+everything from scratch.
+
+Removing a package is currently unsupported by Buildroot without
+rebuilding from scratch. This is because Buildroot doesn't keep track
+of which package installs what files in the +output/staging+ and
++output/target+ directories. However, implementing clean package
+removal is on the TODO-list of Buildroot developers.
+
+The easiest way to rebuild a single package from scratch is to remove
+its build directory in +output/build+. Buildroot will then re-extract,
+re-configure, re-compile and re-install this package from scratch.
+
+However, if you don't want to rebuild the package completely from
+scratch, a better understanding of the Buildroot internals is
+needed. Internally, to keep track of which steps have been done and
+which steps remain to be done, Buildroot maintains stamp files (empty
+files that just tell whether this or that action has been done). The
+problem is that these stamp files are not uniformly named and handled
+by the different packages, so some understanding of the particular
+package is needed.
+
+For packages relying on Buildroot packages infrastructures (see
+xref:add-packages[this section] for details), the following stamp
+files are relevant:
+
+* +output/build/packagename-version/.stamp_configured+. If removed,
+  Buildroot will trigger the recompilation of the package from the
+  configuration step (execution of +./configure+).
+
+* +output/build/packagename-version/.stamp_built+. If removed,
+  Buildroot will trigger the recompilation of the package from the
+  compilation step (execution of +make+).
+
+For other packages, an analysis of the specific 'package.mk' file is
+needed. For example, the zlib Makefile used to look like this (before
+it was converted to the generic package infrastructure):
+
+-----------------
+$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
+	(cd $(ZLIB_DIR); rm -rf config.cache; \
+		[...]
+	)
+	touch $@
+
+$(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured
+	$(MAKE) -C $(ZLIB_DIR) all libz.a
+	touch -c $@
+-----------------
+
+If you want to trigger the reconfiguration, you need to remove
++output/build/zlib-version/.configured+. If you want to trigger only
+the recompilation, you need to remove
++output/build/zlib-version/libz.a+.
+
+Note that most packages, if not all, will progressively be ported over
+to the generic or autotools infrastructure, making it much easier to
+rebuild individual packages.
diff --git a/docs/manual/using-buildroot-toolchain.txt b/docs/manual/using-buildroot-toolchain.txt
new file mode 100644
index 0000000000..712e9a89ee
--- /dev/null
+++ b/docs/manual/using-buildroot-toolchain.txt
@@ -0,0 +1,20 @@
+Using the generated toolchain outside Buildroot
+===============================================
+
+You may want to compile, for your target, your own programs or other
+software that are not packaged in Buildroot. In order to do this you
+can use the toolchain that was generated by Buildroot.
+
+The toolchain generated by Buildroot is located by default in
++output/host/+. The simplest way to use it is to add
++output/host/usr/bin/+ to your PATH environment variable and then to
+use +ARCH-linux-gcc+, +ARCH-linux-objdump+, +ARCH-linux-ld+, etc.
+
+It is possible to relocate the toolchain - but then +--sysroot+ must
+be passed every time the compiler is called to tell where the
+libraries and header files are.
+
+It is also possible to generate the Buildroot toolchain in a directory
+other than +output/host+ by using the +Build options -> Host dir+
+option.  This could be useful if the toolchain must be shared with
+other users.
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
new file mode 100644
index 0000000000..8d7f0a7bca
--- /dev/null
+++ b/docs/manual/using.txt
@@ -0,0 +1,183 @@
+Using Buildroot
+===============
+
+Configuration and general usage
+-------------------------------
+
+Buildroot has a nice configuration tool similar to the one you can
+find in the http://www.kernel.org/[Linux kernel] or in
+http://www.busybox.org/[Busybox]. Note that you can (and should) build
+everything as a normal user. There is no need to be root to configure
+and use Buildroot. The first step is to run the configuration
+assistant:
+
+--------------------
+ $ make menuconfig
+--------------------
+
+to run the curses-based configurator, or
+
+--------------------
+ $ make xconfig
+--------------------
+
+or
+
+--------------------
+ $ make gconfig
+--------------------
+
+to run the Qt or GTK-based configurators.
+
+All of these "make" commands will need to build a configuration
+utility, so you may need to install "development" packages for
+relevant libraries used by the configuration utilities. On Debian-like
+systems, the +libncurses5-dev+ package is required to use the
+'menuconfig' interface, +libqt4-dev+ is required to use the 'xconfig'
+interface, and +libglib2.0-dev, libgtk2.0-dev and libglade2-dev+ are
+needed to use the 'gconfig' interface.
+
+For each menu entry in the configuration tool, you can find associated
+help that describes the purpose of the entry.
+
+Once everything is configured, the configuration tool generates a
++.config+ file that contains the description of your
+configuration. It will be used by the Makefiles to do what's needed.
+
+Let's go:
+
+--------------------
+ $ make
+--------------------
+
+You *should never* use +make -jN+ with Buildroot: it does not support
+'top-level parallel make'. Instead, use the +BR2_JLEVEL+ option to
+tell Buildroot to run each package compilation with +make -jN+.
+
+This command will generally perform the following steps:
+
+* Download source files (as required)
+* Configure, build and install the cross-compiling toolchain if an
+  internal toolchain is used, or import a toolchain if an external
+  toolchain is used
+* Build/install selected target packages
+* Build a kernel image, if selected
+* Build a bootloader image, if selected
+* Create a root filesystem in selected formats
+
+Buildroot output is stored in a single directory, +output/+.
+This directory contains several subdirectories:
+
+* +images/+ where all the images (kernel image, bootloader and root
+  filesystem images) are stored.
+
+* +build/+ where all the components except for the cross-compilation
+  toolchain are built (this includes tools needed to run Buildroot on
+  the host and packages compiled for the target). The +build/+
+  directory contains one subdirectory for each of these components.
+
+* +staging/+ which contains a hierarchy similar to a root filesystem
+  hierarchy. This directory contains the installation of the
+  cross-compilation toolchain and all the userspace packages selected
+  for the target. However, this directory is 'not' intended to be
+  the root filesystem for the target: it contains a lot of development
+  files, unstripped binaries and libraries that make it far too big
+  for an embedded system. These development files are used to compile
+  libraries and applications for the target that depend on other
+  libraries.
+
+* +target/+ which contains 'almost' the complete root filesystem for
+  the target: everything needed is present except the device files in
+  +/dev/+ (Buildroot can't create them because Buildroot doesn't run
+  as root and doesn't want to run as root). Therefore, this directory
+  *should not be used on your target*.  Instead, you should use one of
+  the images built in the +images/+ directory. If you need an
+  extracted image of the root filesystem for booting over NFS, then
+  use the tarball image generated in +images/+ and extract it as
+  root. Compared to +staging/+, +target/+ contains only the files and
+  libraries needed to run the selected target applications: the
+  development files (headers, etc.) are not present, unless the
+  +development files in target filesystem+ option is selected.
+
+* +host/+ contains the installation of tools compiled for the host
+  that are needed for the proper execution of Buildroot, including the
+  cross-compilation toolchain.
+
+* +toolchain/+ contains the build directories for the various
+  components of the cross-compilation toolchain.
+
+Offline builds
+--------------
+
+If you intend to do an offline build and just want to download
+all sources that you previously selected in the configurator
+('menuconfig', 'xconfig' or 'gconfig'), then issue:
+
+--------------------
+ $ make source
+--------------------
+
+You can now disconnect or copy the content of your +dl+
+directory to the build-host.
+
+Building out-of-tree
+--------------------
+
+Buildroot supports building out of tree with a syntax similar to the
+Linux kernel. To use it, add +O=<directory>+ to the make command line:
+
+--------------------
+ $ make O=/tmp/build
+--------------------
+
+Or:
+
+--------------------
+ $ cd /tmp/build; make O=$PWD -C path/to/buildroot
+--------------------
+
+All the output files will be located under +/tmp/build+.
+
+When using out-of-tree builds, the Buildroot +.config+ and temporary
+files are also stored in the output directory. This means that you can
+safely run multiple builds in parallel using the same source tree as
+long as they use unique output directories.
+
+For ease of use, Buildroot generates a Makefile wrapper in the output
+directory - So after the first run, you no longer need to pass +O=..+
+and +-C ..+, simply run (in the output directory):
+
+--------------------
+ $ make <target>
+--------------------
+
+Environment variables
+---------------------
+[[env-vars]]
+
+Buildroot also honors some environment variables, when they are passed
+to +make+ or set in the environment:
+
+* +HOSTCXX+, the host C++ compiler to use
+* +HOSTCC+, the host C compiler to use
+* +UCLIBC_CONFIG_FILE=<path/to/.config>+, path to
+  the uClibc configuration file, used to compile uClibc, if an
+  internal toolchain is being built
+* +BUSYBOX_CONFIG_FILE=<path/to/.config>+, path to
+  the Busybox configuration file
+* +BUILDROOT_DL_DIR+ to override the directory in which
+  Buildroot stores/retrieves downloaded files
+
+An example that uses config files located in the toplevel directory and
+in your $HOME:
+
+--------------------
+ $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
+--------------------
+
+If you want to use a compiler other than the default +gcc+
+or +g+++ for building helper-binaries on your host, then do
+
+--------------------
+ $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
+--------------------

From 8792cf9e0d290b9e49d934d5e3025466ed0bd286 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 10 Oct 2011 10:46:40 +0200
Subject: [PATCH 0862/6849] manual: provide make targets to build the
 documentation

Special thanks for Yann E. Morin for giving input and suggestions to
implement this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
[Peter: skip double mention of manual target in make help]
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8525b7ddd8..be90f47fc5 100644
--- a/Makefile
+++ b/Makefile
@@ -671,6 +671,14 @@ ifeq ($(BR2_TARGET_BAREBOX),y)
 	@echo '  barebox-menuconfig     - Run barebox menuconfig'
 	@echo '  barebox-savedefconfig  - Run barebox savedefconfig'
 endif
+	@echo
+	@echo 'Documentation:'
+	@echo '  manual                 - build manual in HTML, split HTML, PDF and txt'
+	@echo '  manual-html            - build manual in HTML'
+	@echo '  manual-split-html      - build manual in split HTML'
+	@echo '  manual-pdf             - build manual in PDF'
+	@echo '  manual-txt             - build manual in txt'
+	@echo '  manual-epub            - build manual in ePub'
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
@@ -683,7 +691,7 @@ endif
 	@$(foreach b, $(sort $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig))), \
 	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
 	@echo
-	@echo 'See docs/README and docs/buildroot.html for further details'
+	@echo 'See docs/README, or generate the Buildroot manual for further details'
 	@echo
 
 release: OUT=buildroot-$(BR2_VERSION)
@@ -691,5 +699,39 @@ release: OUT=buildroot-$(BR2_VERSION)
 release:
 	git archive --format=tar --prefix=$(OUT)/ master|gzip -9 >$(OUT).tar.gz
 
+MANUAL_SOURCES = $(wildcard docs/manual/*.txt)
+
+manual: manual-html manual-split-html manual-pdf manual-txt manual-epub
+
+manual-html: $(MANUAL_SOURCES)
+	@echo "HTML manual..."
+	$(Q)mkdir -p $(O)/docs/manual
+	$(Q)a2x -f xhtml -d book -L -r docs/images -D $(O)/docs/manual/ \
+		docs/manual/manual.txt
+
+manual-split-html: $(MANUAL_SOURCES)
+	@echo "Split HTML manual..."
+	$(Q)mkdir -p $(O)/docs/manual
+	$(Q)a2x -f chunked -d book -L -r docs/images -D $(O)/docs/manual/ \
+		docs/manual/manual.txt
+
+manual-pdf: $(MANUAL_SOURCES)
+	@echo "PDF manual..."
+	$(Q)mkdir -p $(O)/docs/manual
+	$(Q)a2x --dblatex-opts "-P latex.output.revhistory=0" -f pdf -d book -L -D $(O)/docs/manual/ \
+		docs/manual/manual.txt
+
+manual-txt: $(MANUAL_SOURCES)
+	@echo "Text manual..."
+	$(Q)mkdir -p $(O)/docs/manual
+	$(Q)a2x -f text -d book -L -D $(O)/docs/manual/ \
+		docs/manual/manual.txt
+
+manual-epub: $(MANUAL_SOURCES)
+	@echo "EPUB manual..."
+	$(Q)mkdir -p $(O)/docs/manual
+	$(Q)a2x -f epub -d book -L -r docs/images/ -D $(O)/docs/manual/ \
+		docs/manual/manual.txt
+
 .PHONY: $(noconfig_targets)
 

From 22c547fba97d4733f047c2d8bf753adc63e3ad90 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 11 Oct 2011 22:59:52 +0200
Subject: [PATCH 0863/6849] manual: refactor the targets into GENDOC macro.

Also add a clean target, give absolute path to a2x, add a dependency
on the output file, and add to .PHONY.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[Peter: build in docs/manual/<format>, fix clean targets]
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 85 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index be90f47fc5..d95aa3a278 100644
--- a/Makefile
+++ b/Makefile
@@ -699,39 +699,58 @@ release: OUT=buildroot-$(BR2_VERSION)
 release:
 	git archive --format=tar --prefix=$(OUT)/ master|gzip -9 >$(OUT).tar.gz
 
-MANUAL_SOURCES = $(wildcard docs/manual/*.txt)
-
-manual: manual-html manual-split-html manual-pdf manual-txt manual-epub
-
-manual-html: $(MANUAL_SOURCES)
-	@echo "HTML manual..."
-	$(Q)mkdir -p $(O)/docs/manual
-	$(Q)a2x -f xhtml -d book -L -r docs/images -D $(O)/docs/manual/ \
-		docs/manual/manual.txt
-
-manual-split-html: $(MANUAL_SOURCES)
-	@echo "Split HTML manual..."
-	$(Q)mkdir -p $(O)/docs/manual
-	$(Q)a2x -f chunked -d book -L -r docs/images -D $(O)/docs/manual/ \
-		docs/manual/manual.txt
-
-manual-pdf: $(MANUAL_SOURCES)
-	@echo "PDF manual..."
-	$(Q)mkdir -p $(O)/docs/manual
-	$(Q)a2x --dblatex-opts "-P latex.output.revhistory=0" -f pdf -d book -L -D $(O)/docs/manual/ \
-		docs/manual/manual.txt
-
-manual-txt: $(MANUAL_SOURCES)
-	@echo "Text manual..."
-	$(Q)mkdir -p $(O)/docs/manual
-	$(Q)a2x -f text -d book -L -D $(O)/docs/manual/ \
-		docs/manual/manual.txt
-
-manual-epub: $(MANUAL_SOURCES)
-	@echo "EPUB manual..."
-	$(Q)mkdir -p $(O)/docs/manual
-	$(Q)a2x -f epub -d book -L -r docs/images/ -D $(O)/docs/manual/ \
-		docs/manual/manual.txt
+################################################################################
+# GENDOC -- generates the make targets needed to build a specific type of
+#           asciidoc documentation.
+#
+#  argument 1 is the name of the document and must be a subdirectory of docs/;
+#             the top-level asciidoc file must have the same name
+#  argument 2 is the type of document to generate (-f argument of a2x)
+#  argument 3 is the document type as used in the make target
+#  argument 4 is the output file extension for the document type
+#  argument 5 is the human text for the document type
+#  argument 6 (optional) are extra arguments for a2x
+#
+# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
+################################################################################
+define GENDOC_INNER
+$(1): $(1)-$(3)
+.PHONY: $(1)-$(3)
+$(1)-$(3): $$(O)/docs/$(1)/$(2)/$(1).$(4)
+
+$$(O)/docs/$(1)/$(2)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
+	@echo "Generating $(5) $(1)..."
+	$(Q)mkdir -p $$(O)/docs/$(1)/$(2)
+	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
+	  -D $$(@D) $$<
+
+clean-$(1): clean-$(1)-$(3)
+.PHONY: clean-$(1)-$(3)
+clean-$(1)-$(3):
+	$(Q)$(RM) -rf $(O)/docs/$(1)/$(2)
+
+endef
+
+################################################################################
+# GENDOC -- generates the make targets needed to build asciidoc documentation.
+#
+#  argument 1 is the name of the document and must be a subdirectory of docs/;
+#             the top-level asciidoc file must have the same name
+#
+# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
+################################################################################
+define GENDOC
+$(call GENDOC_INNER,$(1),xhtml,html,html,HTML)
+$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML)
+$(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
+$(call GENDOC_INNER,$(1),text,txt,text,Text)
+$(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
+clean: clean-$(1)
+.PHONY: $(1) clean-$(1)
+endef
+
+MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)
+$(eval $(call GENDOC,manual))
 
 .PHONY: $(noconfig_targets)
 

From d9944722c1bffdb65e1937bcda307d31e72dffee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 10 Oct 2011 10:46:42 +0200
Subject: [PATCH 0864/6849] remove Glibc_vs_uClibc document

This document has nothing to do with Buildroot, and is probably a
leftover from the uClibc documentation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/Glibc_vs_uClibc.html | 240 --------------------------------------
 1 file changed, 240 deletions(-)
 delete mode 100644 docs/Glibc_vs_uClibc.html

diff --git a/docs/Glibc_vs_uClibc.html b/docs/Glibc_vs_uClibc.html
deleted file mode 100644
index c14eb8cf20..0000000000
--- a/docs/Glibc_vs_uClibc.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!--#include file="header.html" -->
-
-<h2>uClibc vs. glibc</h2>
-
-<p>
-  uClibc and Glibc are not the same -- there are a number of differences which
-  may or may not cause you problems.  This document attempts to list these 
-  differences and, when completed, will contain a full list of all relevant 
-  differences. 
-  <br><br></p>
- <ol>
-  <li>uClibc is smaller than glibc.  We attempt to maintain a glibc compatible
-  interface, allowing applications that compile with glibc to easily compile with
-  uClibc.  However, we do not include _everything_ that glibc includes, and
-  therefore some applications may not compile.  If this happens to you, please
-  report the failure to the uclibc mailing list, with detailed error messages.
-  </li><br>
-  <li>uClibc is much more configurable then glibc.  This means that a developer
-  may have compiled uClibc in such a way that significant amounts of
-  functionality have been omitted.
-  </li><br>
-  <li>uClibc does not even attempt to ensure binary compatibility across releases.
-  When a new version of uClibc is released, you may or may not need to recompile
-  all your binaries.
-  </li><br>
-  <li><ul><li> malloc(0) in glibc returns a valid pointer to something(!?!?) while in
-  uClibc calling malloc(0) returns a NULL.  The behavior of malloc(0) is listed
-  as implementation-defined by SuSv3, so both libraries are equally correct.
-  This difference also applies to realloc(NULL, 0).  I personally feel glibc's
-  behavior is not particularly safe.  To enable glibc behavior, one has to
-  explicitly enable the MALLOC_GLIBC_COMPAT option.
-  </li><br><li>
-  glibc's malloc() implementation has behavior that is tunable via the
-  MALLOC_CHECK_ environment variable.  This is primarily used to provide extra
-  malloc debugging features.  These extended malloc debugging features are not
-  available within uClibc.  There are many good malloc debugging libraries
-  available for Linux (dmalloc, electric fence, valgrind, etc) that work much
-  better than the glibc extended malloc debugging.  So our omitting this
-  functionality from uClibc is not a great loss.
-  </li><br>
-  </ul></li>
-  <li>uClibc does not provide a database library (libdb).
-  </li><br>
-  <li>uClibc does not support NSS (/lib/libnss_*), which allows glibc to easily
-  support various methods of authentication and DNS resolution.  uClibc only
-  supports flat password files and shadow password files for storing
-  authentication information.  If you need something more complex than this,
-  you can compile and install pam.
-  </li><br>
-  <li>uClibc's libresolv is only a stub.  Some, but not all of the functionality
-  provided by glibc's libresolv is provided internal to uClibc.  Other functions
-  are not at all implemented.
-  </li><br>
-  <li>libnsl provides support for Network Information Service (NIS) which was
-  originally called "Yellow Pages" or "YP", which is an extension of RPC invented
-  by Sun to share Unix password files over the network.  I personally think NIS
-  is an evil abomination and should not be used.  These days, using ldap is much
-  more effective mechanism for doing the same thing.  uClibc provides a stub
-  libnsl, but has no actual support for Network Information Service (NIS).
-  We therefore, also do not provide any of the headers files provided by glibc
-  under /usr/include/rpcsvc.
-  </li><br>
-  <li>uClibc's locale support is not 100% complete yet.  We are working on it.
-  </li><br>
-  <li>uClibc's math library only supports long double as inlines, and even
-  then the long double support is quite limited.  Also, very few of the
-  float math functions are implemented.  Stick with double and you should
-  be just fine.
-  </li><br>
-  <li>uClibc's libcrypt does not support the reentrant crypt_r, setkey_r and
-  encrypt_r, since these are not required by SuSv3.
-  </li><br>
-  <li>uClibc directly uses kernel types to define most opaque data types.
-  </li><br>
-  <li>uClibc directly uses the linux kernel's arch specific 'stuct stat'.
-  </li><br>
-  <li>uClibc's librt library currently lacks all aio routines, all clock
-    routines, and all shm routines (only the timer routines and the mq
-    routines are implemented). 
-   </li><br>
-</ol> 
-<hr>
-<h3>Manuel's Notes</h3>
-
-  Some general comments...<br>
-  <p>
-  The intended target for all my uClibc code is ANSI/ISO C99 and SUSv3
-  compliance.  While some glibc extensions are present, many will eventually
-  be configurable.  Also, even when present, the glibc-like extensions may
-  differ slightly or be more restrictive than the native glibc counterparts.
-  They are primarily meant to be porting _aides_ and not necessarily
-  drop-in replacements.
-  </p><br>
-Now for some details...<br><br>
-
-<u>time functions</u><br>
-<ol>
-<li>Leap seconds are not supported.</li><br>
-<li>/etc/timezone and the whole zoneinfo directory tree are not supported.
-   To set the timezone, set the TZ environment variable as specified in
-   http://www.opengroup.org/onlinepubs/007904975/basedefs/xbd_chap08.html
-   or you may also create an /etc/TZ file of a single line, ending with a
-   newline, containing the TZ setting.  For example
-   echo CST6CDT > /etc/TZ
-</li><br>
-<li>Currently, locale specific eras and alternate digits are not supported.
-   They are on my TODO list.
-</li>
-</ol><br>
-<u>wide char support</u><br>
-<ol>
-<li>The only multibyte encoding currently supported is UTF-8.  The various
-   ISO-8859-* encodings are (optionally) supported.  The internal
-   representation of wchar's is assumed to be 31 bit unicode values in
-   native endian representation.  Also, the underlying char encoding is
-   assumed to match ASCII in the range 0-0x7f.
-</li>
-<li>In the next iteration of locale support, I plan to add support for
-   (at least some) other multibyte encodings.
-</li>
-</ol>
-<u>locale support</u><br>
-<ol>
-<li>The target for support is SUSv3 locale functionality.  While nl_langinfo
-   has been extended, similar to glibc, it only returns values for related
-   locale entries.
-</li>
-<li>Currently, all SUSv3 libc locale functionality should be implemented
-   except for wcsftime and collating item support in regex.
-</li>
-</ol>
-<u>stdio</u><br>
-<ol>
-<li>Conversion of large magnitude floating-point values by printf suffers a loss
-   of precision due to the algorithm used.
-</li><br>
-<li>uClibc's printf is much stricter than glibcs, especially regarding positional
-   args.  The entire format string is parsed first and an error is returned if
-   a problem is detected.  In locales other than C, the format string is checked
-   to be a valid multibyte sequence as well.  Also, currently at most 10 positional
-   args are allowed (although this is configurable).
-</li><br>
-<li>BUFSIZ is configurable, but no attempt is made at automatic tuning of internal
-   buffer sizes for stdio streams.  In fact, the stdio code in general sacrifices
-   sophistication/performace for minimal size.
-</li><br>
-<li>uClibc allows glibc-like custom printf functions.  However, while not
-   currently checked, the specifier must be <= 0x7f.
-</li><br>
-<li>uClibc allows glibc-like custom streams.  However, no in-buffer seeking is
-   done.
-</li><br>
-<li>The functions fcloseall() and __fpending() can behave differently than their
-   glibc counterparts.
-</li><br>
-<li>uClibc's setvbuf is more restrictive about when it can be called than glibc's
-   is.  The standards specify that setvbuf must occur before any other operations
-   take place on the stream.
-</li><br>
-<li>Right now, %m is not handled properly by printf when the format uses positional
-   args.
-</li><br>
-<li>The FILEs created by glibc's fmemopen(), open_memstream(), and fopencookie()
-   are not capable of wide orientation.  The corresponding uClibc routines do
-   not have this limitation.
-</li><br>
-<li>For scanf, the C99 standard states "The fscanf function returns the value of
-    the macro EOF if an input failure occurs before any conversion."  But glibc's
-    scanf does not respect conversions for which assignment was surpressed, even
-    though the standard states that the value is converted but not stored.
-</li></ol><br>
-<hr><h3>Glibc bugs</h3><br>
-glibc bugs that Ulrich Drepper has refused to acknowledge or comment on
-  ( <a href="http://sources.redhat.com/ml/libc-alpha/2003-09/">http://sources.redhat.com/ml/libc-alpha/2003-09/</a> )
-<br>
-<ol>
-<li>The C99 standard says that for printf, a %s conversion makes no special
-   provisions for multibyte characters.  SUSv3 is even more clear, stating
-   that bytes are written and a specified precision is in bytes.  Yet glibc
-   treats the arg as a multibyte string when a precision is specified and
-   not otherwise.
-</li><br>
-<li>Both C99 and C89 state that the %c conversion for scanf reads the exact
-   number of bytes specified by the optional field width (or 1 if not specified).
-   uClibc complies with the standard.  There is an argument that perhaps the
-   specified width should be treated as an upper bound, based on some historical
-   use.  However, such behavior should be mentioned in the Conformance document.
-</li><br>
-<li>glibc's scanf is broken regarding some numeric patterns.  Some invalid
-   strings are accepted as valid ("0x.p", "1e", digit grouped strings).
-   In spite of my posting examples clearly illustrating the bugs, they remain
-   unacknowledged by the glibc developers.
-</li><br>
-<li>glibc's scanf seems to require a 'p' exponent for hexadecimal float strings.
-   According to the standard, this is optional.
-</li><br>
-<li>C99 requires that once an EOF is encountered, the stream should be treated
-   as if at end-of-file even if more data becomes available.  Further reading
-   can be attempted by clearing the EOF flag though, via clearerr() or a file
-   positioning function.  For details concerning the original change, see
-   Defect Report #141.  glibc is currently non-compliant, and the developers
-   did not comment when I asked for their official position on this issue.
-</li><br>
-<li>glibc's collation routines and/or localedef are broken regarding implicit
-   and explicit UNDEFINED rules.
-</li><br></ol>
-More to follow as I think of it...
-<br><br><hr>
-<h3>Profiling:</h3>
-<p>
-uClibc no longer supports 'gcc -fprofile-arcs  -pg' style profiling, which
-causes your application to generate a 'gmon.out' file that can then be analyzed
-by 'gprof'.  Not only does this require explicit extra support in uClibc, it
-requires that you rebuild everything with profiling support.  There is both a
-size and performance penalty to profiling your applications this way, as well
-as Heisenberg effects, where the act of measuring changes what is measured.
-</p>
-<p>
-There exist a number of less invasive alternatives that do not require you to
-specially instrument your application, and recompile and relink everything.
-</p><p>
-The OProfile system-wide profiler is an excellent alternative:
-      <a href="http://oprofile.sourceforge.net/">http://oprofile.sourceforge.net/</a>
-</p><p>
-Many people have had good results using the combination of Valgrind
-to generate profiling information and KCachegrind for analysis:
-      <a href="http://developer.kde.org/~sewardj/">http://developer.kde.org/~sewardj/</a>
-      <a href="http://kcachegrind.sourceforge.net/">http://kcachegrind.sourceforge.net/</a>
-</p><p>
-Prospect is another alternative based on OProfile:
-      <a href="http://prospect.sourceforge.net/">http://prospect.sourceforge.net/</a>
-</p><p>
-And the Linux Trace Toolkit (LTT) is also a fine tool:
-    <a href="http://www.opersys.com/LTT/">http://www.opersys.com/LTT/</a>
-</p><p>
-FunctionCheck:
-	<a href="http://www710.univ-lyon1.fr/~yperret/fnccheck/">http://www710.univ-lyon1.fr/~yperret/fnccheck/</a>
-</p>
-
-<!--#include file="footer.html" -->

From 1836d23386d8976a8b9b75b4ac02c5a40a4857f8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Oct 2011 16:42:13 -0300
Subject: [PATCH 0865/6849] qemu_sh4_r2d: update to kernel 3.1 and update
 readme

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...sing-consts-to-sys_execve-declaration.patch | 17 -----------------
 .../linux-sh-fix-kconfig-warning.patch         | 13 -------------
 .../{linux-2.6.36.config => linux-3.1.config}  |  0
 board/qemu/sh4-r2d/readme.txt                  | 18 +++---------------
 configs/qemu_sh4_r2d_defconfig                 |  9 ++++++---
 5 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch
 delete mode 100644 board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch
 rename board/qemu/sh4-r2d/{linux-2.6.36.config => linux-3.1.config} (100%)

diff --git a/board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch b/board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch
deleted file mode 100644
index f702abe042..0000000000
--- a/board/qemu/sh4-r2d/kernel-patches/linux-06-17-SH-Add-missing-consts-to-sys_execve-declaration.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
-index be201fd..454538a 100644
---- a/arch/sh/include/asm/syscalls_32.h
-+++ b/arch/sh/include/asm/syscalls_32.h
-@@ -19,8 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
- asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
- 			 unsigned long r6, unsigned long r7,
- 			 struct pt_regs __regs);
--asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv,
--			  char __user * __user *uenvp, unsigned long r7,
-+asmlinkage int sys_execve(const char __user *ufilename,
-+			  const char __user *const __user *uargv,
-+			  const char __user *const __user *uenvp,
-+			  unsigned long r7,
- 			  struct pt_regs __regs);
- asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
- 			      unsigned long r6, unsigned long r7,
diff --git a/board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch b/board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch
deleted file mode 100644
index 0ac07f2b66..0000000000
--- a/board/qemu/sh4-r2d/kernel-patches/linux-sh-fix-kconfig-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
-index 33990fa..06645b6 100644
---- a/arch/sh/Kconfig
-+++ b/arch/sh/Kconfig
-@@ -45,7 +45,7 @@ config SUPERH32
- 	select HAVE_ARCH_KGDB
- 	select HAVE_HW_BREAKPOINT
- 	select HAVE_MIXED_BREAKPOINTS_REGS
--	select PERF_EVENTS if HAVE_HW_BREAKPOINT
-+	select PERF_EVENTS
- 	select ARCH_HIBERNATION_POSSIBLE if MMU
- 
- config SUPERH64
diff --git a/board/qemu/sh4-r2d/linux-2.6.36.config b/board/qemu/sh4-r2d/linux-3.1.config
similarity index 100%
rename from board/qemu/sh4-r2d/linux-2.6.36.config
rename to board/qemu/sh4-r2d/linux-3.1.config
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index b237596eaa..76eafac5e9 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -1,17 +1,5 @@
-This little documentation explains how to build a kernel and a rootfs
-for qemu with sh4 architecture.
+Run the emulation with:
 
-1) Select qemu sh4 configuration and compile it :
+  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda noiotrap"
 
-make sh4_defconfig
-make all
-
-2) Run qemu-system-sh4 with the kernel and rootfs previously generated
-
-It's recommended to use a git release for qemu (the current stable
-version has framebuffer display issues). If you want to avoid building
-all target, you can use this option on qemu configure :
---target-list=sh4-softmmu
-
-The command is :
-qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide,format=raw -append root=/dev/sda console=ttySC1,115200 noiotrap
+The login prompt will appear in the graphical window.
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index f40633c62f..32835decdb 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -2,6 +2,10 @@
 BR2_sh=y
 BR2_sh4=y
 
+# system
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="tty1"
+
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -14,8 +18,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.36"
-BR2_LINUX_KERNEL_PATCH="board/qemu/sh4-r2d/kernel-patches/"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-2.6.36.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.1.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 28eeaba8eaa217b7b39175a132b26c7803f2a8bd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Oct 2011 12:38:16 +0200
Subject: [PATCH 0866/6849] kernel-headers: bump 3.0.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                              | 2 +-
 ...-headers_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/kernel-headers/{linux-3.0.7-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.8-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 8be9186beb..701a02de7d 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.7"		if BR2_KERNEL_HEADERS_3_0
+	default "3.0.8"		if BR2_KERNEL_HEADERS_3_0
 	default "3.1"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.7-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.8-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.7-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.8-headers_install-fix-__packed-in-exported-kernel-head.patch

From 2e1e0191d67d989eef5bcbf1919e5e46e42a513c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Oct 2011 18:01:35 +0200
Subject: [PATCH 0867/6849] pulseaudio: alsa backend needs pcm+mixer apis

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 0686d39aee..b73c103855 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -29,6 +29,11 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_ORC),orc)
 
+# pulseaudio alsa backend needs pcm/mixer apis
+ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+PULSEAUDIO_CONF_OPT += --disable-alsa
+endif
+
 ifneq ($(BR2_PACKAGE_VALA),y)
 define PULSEAUDIO_REMOVE_VALA
 	rm -rf $(TARGET_DIR)/usr/share/vala

From 6fe0b202a21d5d0899e691df3feab0686b6cfab9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Oct 2011 07:46:40 +0200
Subject: [PATCH 0868/6849] pulseaudio: gtk supports needs x backend

Uses X11 specific apis.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index b73c103855..5e68dfbaeb 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -34,6 +34,11 @@ ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa
 endif
 
+# gtk support needs x backend
+ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG),yy)
+PULSEAUDIO_CONF_OPT += --disable-gtk2
+endif
+
 ifneq ($(BR2_PACKAGE_VALA),y)
 define PULSEAUDIO_REMOVE_VALA
 	rm -rf $(TARGET_DIR)/usr/share/vala

From 67a7d7b7d37c5cbedce75da2de314bdf81f4feb1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Oct 2011 07:52:03 +0200
Subject: [PATCH 0869/6849] Makefile: build all manuals in $(O)/docs/manual

Like Arnouts' patch originally did.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d95aa3a278..80ca587ab2 100644
--- a/Makefile
+++ b/Makefile
@@ -716,19 +716,13 @@ release:
 define GENDOC_INNER
 $(1): $(1)-$(3)
 .PHONY: $(1)-$(3)
-$(1)-$(3): $$(O)/docs/$(1)/$(2)/$(1).$(4)
+$(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
 
-$$(O)/docs/$(1)/$(2)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
+$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
 	@echo "Generating $(5) $(1)..."
 	$(Q)mkdir -p $$(O)/docs/$(1)/$(2)
 	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
 	  -D $$(@D) $$<
-
-clean-$(1): clean-$(1)-$(3)
-.PHONY: clean-$(1)-$(3)
-clean-$(1)-$(3):
-	$(Q)$(RM) -rf $(O)/docs/$(1)/$(2)
-
 endef
 
 ################################################################################
@@ -746,6 +740,8 @@ $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhist
 $(call GENDOC_INNER,$(1),text,txt,text,Text)
 $(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
 clean: clean-$(1)
+clean-$(1):
+	$(Q)$(RM) -rf $(O)/docs/$(1)
 .PHONY: $(1) clean-$(1)
 endef
 

From 6f5df8bcfe4c59997329c1ef8cdcf834894679a4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Oct 2011 09:10:30 -0300
Subject: [PATCH 0870/6849] securetty: update to add ttySC for sh4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/securetty | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/skeleton/etc/securetty b/fs/skeleton/etc/securetty
index fd0ec8ee9f..4ab956f0f2 100644
--- a/fs/skeleton/etc/securetty
+++ b/fs/skeleton/etc/securetty
@@ -40,3 +40,5 @@ ttyO3
 ttyAM0
 ttyAM1
 ttyAM2
+ttySC0
+ttySC1

From 40fcbc359e84dc92662324168ad97f83dbf031ed Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Oct 2011 09:10:31 -0300
Subject: [PATCH 0871/6849] qemu_sh4_r2d: update to fix serial console support

sh4-r2d has a serial port, however it's the second SH UART that's
emulated by Qemu so we need to adjust the kernel configuration for it to
see the relevant UART and adjust the qemu command line for it too.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sh4-r2d/linux-3.1.config | 1 -
 board/qemu/sh4-r2d/readme.txt       | 6 ++++--
 configs/qemu_sh4_r2d_defconfig      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/board/qemu/sh4-r2d/linux-3.1.config b/board/qemu/sh4-r2d/linux-3.1.config
index 638e4e031b..287f36a65c 100644
--- a/board/qemu/sh4-r2d/linux-3.1.config
+++ b/board/qemu/sh4-r2d/linux-3.1.config
@@ -48,7 +48,6 @@ CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=1
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_SPI=y
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 76eafac5e9..875e3d02f8 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -1,5 +1,7 @@
 Run the emulation with:
 
-  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda noiotrap"
+  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio
+
+The login prompt will appear in the terminal that started Qemu.
+The graphical window is the framebuffer.
 
-The login prompt will appear in the graphical window.
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 32835decdb..8f92a938cc 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -4,7 +4,7 @@ BR2_sh4=y
 
 # system
 BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="tty1"
+BR2_TARGET_GENERIC_GETTY_PORT="ttySC1"
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y

From aeea387d82fc84272ebc216665cf9aeb5567438e Mon Sep 17 00:00:00 2001
From: Will Moore <will.moore@beraninstruments.com>
Date: Tue, 25 Oct 2011 13:22:18 +0100
Subject: [PATCH 0872/6849] dropbear: add options to disable wtmp / lastlog
 logging

Buildroot does not have wtmp or lastlog support by default so allow dropbear
to be configured to stop using them and hence to stop generating system log
error messages.

[Peter: invert to positive options, and disable by default]
Signed-off-by: Will Moore <will.moore@beraninstruments.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/Config.in   | 14 ++++++++++++++
 package/dropbear/dropbear.mk |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index c30228f202..0903ad1602 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -23,3 +23,17 @@ config BR2_PACKAGE_DROPBEAR_SMALL
 
 	  Tradeoffs are slower hashes and ciphers, and disabling of the
 	  blowfish cipher and zlib.
+
+config BR2_PACKAGE_DROPBEAR_WTMP
+	bool "log dropbear access to wtmp"
+	depends on BR2_PACKAGE_DROPBEAR
+	help
+	  Enable logging of dropbear access to wtmp. Notice that
+	  Buildroot does not generate wtmp by default.
+
+config BR2_PACKAGE_DROPBEAR_LASTLOG
+	bool "log dropbear access to lastlog"
+	depends on BR2_PACKAGE_DROPBEAR
+	help
+	  Enable logging of dropbear access to lastlog. Notice that
+	  Buildroot does not generate lastlog by default.
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index e9da42df07..bced0ef4e8 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -46,6 +46,14 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
 DROPBEAR_DEPENDENCIES += zlib
 endif
 
+ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)
+DROPBEAR_CONF_OPT += --disable-wtmp
+endif
+
+ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y)
+DROPBEAR_CONF_OPT += --disable-lastlog
+endif
+
 define DROPBEAR_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear
 	for f in $(DROPBEAR_TARGET_BINS); do \

From 9d7c922c5c738f4c9520152d52f83c385a4f1a2f Mon Sep 17 00:00:00 2001
From: Philippe Pepiot <phil@philpep.org>
Date: Wed, 26 Oct 2011 23:09:39 +0200
Subject: [PATCH 0873/6849] busybox: Fix syntax error when installing S10mdev

Signed-off-by: Philippe Pepiot <phil@philpep.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index c95190d2ad..9ca4c93df7 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -31,7 +31,7 @@ endif
 # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 define BUSYBOX_INSTALL_MDEV_SCRIPT
-	[ -f $(TARGET_DIR)/etc/init.d/S10mdev ] ||
+	[ -f $(TARGET_DIR)/etc/init.d/S10mdev ] || \
 		install -D -m 0755 package/busybox/S10mdev \
 			$(TARGET_DIR)/etc/init.d/S10mdev
 endef

From 8d04fa9cc676f7584658a41ccf2194a23eb8e0fe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Oct 2011 21:21:42 -0300
Subject: [PATCH 0874/6849] toolchain/gcc: bump 4.6.x version to 4.6.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.6.1 => 4.6.2}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.6.1 => 4.6.2}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.6.1 => 4.6.2}/302-c99-snprintf.patch           | 0
 .../gcc/{4.6.1 => 4.6.2}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.6.1 => 4.6.2}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.6.1 => 4.6.2}/820-arm-unbreak-armv4t.patch     | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/820-arm-unbreak-armv4t.patch (100%)
 rename toolchain/gcc/{4.6.1 => 4.6.2}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.6.1/100-uclibc-conf.patch b/toolchain/gcc/4.6.2/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.6.1/100-uclibc-conf.patch
rename to toolchain/gcc/4.6.2/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.6.1/301-missing-execinfo_h.patch b/toolchain/gcc/4.6.2/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.6.1/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.6.2/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.6.1/302-c99-snprintf.patch b/toolchain/gcc/4.6.2/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.6.1/302-c99-snprintf.patch
rename to toolchain/gcc/4.6.2/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.6.1/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.6.2/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.6.1/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.6.2/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.6.1/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.6.2/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.6.1/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.6.2/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.6.1/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.6.2/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.6.1/820-arm-unbreak-armv4t.patch
rename to toolchain/gcc/4.6.2/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.6.1/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.6.2/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.6.1/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.6.2/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cfc7aec1b5..590526211b 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -64,7 +64,7 @@ config BR2_GCC_VERSION
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
-	default "4.6.1"     if BR2_GCC_VERSION_4_6_X
+	default "4.6.2"     if BR2_GCC_VERSION_4_6_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

From 48391acd2c63ea373f9771210b3acd54ec97fb00 Mon Sep 17 00:00:00 2001
From: Benoit Mauduit <benoit.mauduit@openwide.fr>
Date: Wed, 8 Jun 2011 15:57:26 +0200
Subject: [PATCH 0875/6849] binutils: Makefile and Config.in rework for
 oprofile ext toolchain compilation

  * When select full binutils binaries use the default INSTALL_TARGET_CMDS
    from AUTOTARGET.
  * Menu config improvement.
  * Install libiberty into Staging dir.

[Peter: Fix typos, Config.in fixes, install libiberty to target as well]
Signed-off-by: Benoit Mauduit <benoit.mauduit@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in   |  7 ++-----
 package/binutils/binutils.mk | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index 9e4821a7ff..e068b20d40 100644
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,12 +1,9 @@
 config BR2_PACKAGE_BINUTILS
-	bool "libbfd (binutils)"
-	depends on BR2_TOOLCHAIN_BUILDROOT
+	bool "binutils"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  Install libbfd from binutils in the target.
-
-	  This is used by oprofile to avoid a full-blown target binutils.
+	  Install binutils on the target
 
 config BR2_PACKAGE_BINUTILS_TARGET
 	bool "binutils binaries"
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 5123568ec5..20de45a854 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -4,7 +4,13 @@
 #
 #############################################################
 
+# Version is set when using buildroot toolchain.
+# If not, we do like other packages
 BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
+ifeq ($(BINUTILS_VERSION),)
+BINUTILS_VERSION = 2.21
+endif
+
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_SITE = $(BR2_GNU_MIRROR)/binutils
 ifeq ($(ARCH),avr32)
@@ -34,23 +40,19 @@ HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			$(BR2_CONFIGURE_STAGING_SYSROOT) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
-# We just want libbfd, not the full-blown binutils in staging
+# We just want libbfd and libiberty, not the full-blown binutils in staging
 define BINUTILS_INSTALL_STAGING_CMDS
 	$(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install
+	$(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install
 endef
 
-# only libbfd in the target...
-BINUTILS_INSTALL_FROM = $(@D)/bfd
-
-# unless we want full...
-ifeq ($(BR2_PACKAGE_BINUTILS_TARGET),y)
-BINUTILS_INSTALL_FROM = $(@D)
-endif
-
+# If we don't want full binutils on target
+ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y)
 define BINUTILS_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(BINUTILS_INSTALL_FROM) \
-		DESTDIR=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install
+	$(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install
 endef
+endif
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 2a56a141e09b1540875abb572229e5eaec68aef8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Oct 2011 21:21:43 -0300
Subject: [PATCH 0876/6849] oprofile: bump to version 0.9.7 and fixes

* Bump to version 0.9.7
* Style fixes
* Build fix for x86: i386 is expected, not some other random i?86 as arch

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...9.7-001-avr32-enable-lookup_dcookie.patch} |  0
 ...oprofile-0.9.7-002-no-query-modules.patch} |  0
 package/oprofile/oprofile.mk                  | 21 ++++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)
 rename package/oprofile/{oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch => oprofile-0.9.7-001-avr32-enable-lookup_dcookie.patch} (100%)
 rename package/oprofile/{oprofile-0.9.4-002-no-query-modules.patch => oprofile-0.9.7-002-no-query-modules.patch} (100%)

diff --git a/package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch b/package/oprofile/oprofile-0.9.7-001-avr32-enable-lookup_dcookie.patch
similarity index 100%
rename from package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
rename to package/oprofile/oprofile-0.9.7-001-avr32-enable-lookup_dcookie.patch
diff --git a/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch b/package/oprofile/oprofile-0.9.7-002-no-query-modules.patch
similarity index 100%
rename from package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
rename to package/oprofile/oprofile-0.9.7-002-no-query-modules.patch
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index ae4cddeb13..734839f240 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -3,25 +3,26 @@
 # oprofile
 #
 #############################################################
-OPROFILE_VERSION := 0.9.6
-OPROFILE_CONF_OPT :=	--localstatedir=/var \
-			--with-kernel-support
 
-OPROFILE_BINARIES := utils/ophelp
-OPROFILE_BINARIES += pp/opannotate pp/oparchive pp/opgprof pp/opreport opjitconv/opjitconv
-OPROFILE_BINARIES += daemon/oprofiled
+OPROFILE_VERSION = 0.9.7
+OPROFILE_CONF_OPT = --localstatedir=/var --with-kernel-support
+OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof
+OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled
 
+ifeq ($(BR2_i386),y)
+OPROFILE_ARCH = i386
+endif
 ifeq ($(BR2_powerpc),y)
-OPROFILE_ARCH := ppc
+OPROFILE_ARCH = ppc
 endif
 ifeq ($(BR2_x86_64),y)
-OPROFILE_ARCH := x86-64
+OPROFILE_ARCH = x86-64
 endif
 ifeq ($(OPROFILE_ARCH),)
-OPROFILE_ARCH := $(BR2_ARCH)
+OPROFILE_ARCH = $(BR2_ARCH)
 endif
 
-OPROFILE_DEPENDENCIES := popt binutils
+OPROFILE_DEPENDENCIES = popt binutils
 
 define OPROFILE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin

From 7f9c4c0aa5dcd2329fc5eb17959f634fd9c9a822 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Oct 2011 14:05:49 +0200
Subject: [PATCH 0877/6849] oprofile: allow builds with external toolchains

Based on patch by Benoit Mauduit. Now that we can build binutils for
the target with external toolchains, oprofile is also available.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/oprofile/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index 0e3652d39b..562c9105e9 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_OPROFILE
 	bool "oprofile"
-	# The dependency on binutils_target does not work with
-	# external toolchains since the binutils version was not
-	# choosen in the config. This will have to be fixed later.
-	depends on !BR2_TOOLCHAIN_EXTERNAL
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_BINUTILS
 	depends on BR2_INSTALL_LIBSTDCPP

From ccd96a3559324b742f357ce6bd8969c6318fe94b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 9 Sep 2011 16:05:07 +0200
Subject: [PATCH 0878/6849] Cleanup cramfs package declaration.

Cramfs still passes the device table to mkcramfs, which is irrelevant
now with fakeroot, remove this behaviour and the associated patch.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cramfs/cramfs.mk                           |    6 +-
 package/cramfs/cramfs-01-devtable.patch       | 1269 -----------------
 ...02-endian.patch => cramfs-01-endian.patch} |   68 +-
 package/cramfs/cramfs-02-cygwin_IO.patch      |   15 +
 package/cramfs/cramfs-03-cygwin_IO.patch      |   13 -
 5 files changed, 52 insertions(+), 1319 deletions(-)
 delete mode 100644 package/cramfs/cramfs-01-devtable.patch
 rename package/cramfs/{cramfs-02-endian.patch => cramfs-01-endian.patch} (86%)
 create mode 100644 package/cramfs/cramfs-02-cygwin_IO.patch
 delete mode 100644 package/cramfs/cramfs-03-cygwin_IO.patch

diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index e0deb7e2af..9b0141f48b 100644
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -9,14 +9,10 @@ else
 CRAMFS_OPTS=-l
 endif
 
-ifneq ($(ROOTFS_DEVICE_TABLE),)
-CRAMFS_OPTS += -D $(ROOTFS_DEVICE_TABLE)
-endif
-
 define ROOTFS_CRAMFS_CMD
  $(HOST_DIR)/usr/bin/mkcramfs -q $(CRAMFS_OPTS) $(TARGET_DIR) $$@
 endef
 
 ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
 
-$(eval $(call ROOTFS_TARGET,cramfs))
\ No newline at end of file
+$(eval $(call ROOTFS_TARGET,cramfs))
diff --git a/package/cramfs/cramfs-01-devtable.patch b/package/cramfs/cramfs-01-devtable.patch
deleted file mode 100644
index 884eb8cb83..0000000000
--- a/package/cramfs/cramfs-01-devtable.patch
+++ /dev/null
@@ -1,1269 +0,0 @@
---- cramfs-1.1.orig/cramfsck.c	2002-02-22 17:00:42.000000000 -0700
-+++ cramfs-1.1/cramfsck.c	2002-12-21 01:25:17.000000000 -0700
-@@ -51,10 +51,11 @@
- #include <utime.h>
- #include <sys/ioctl.h>
- #define _LINUX_STRING_H_
--#include <linux/fs.h>
--#include <linux/cramfs_fs.h>
-+#include "linux/cramfs_fs.h"
- #include <zlib.h>
- 
-+#define BLKGETSIZE	_IO(0x12,96) /* return device size /512 (long *arg) */
-+
- /* Exit codes used by fsck-type programs */
- #define FSCK_OK          0	/* No errors */
- #define FSCK_NONDESTRUCT 1	/* File system errors corrected */
-@@ -75,7 +76,7 @@
- static int opt_verbose = 0;	/* 1 = verbose (-v), 2+ = very verbose (-vv) */
- #ifdef INCLUDE_FS_TESTS
- static int opt_extract = 0;		/* extract cramfs (-x) */
--static char *extract_dir = "root";	/* extraction directory (-x) */
-+static char *extract_dir = "/";	/* extraction directory (-x) */
- static uid_t euid;			/* effective UID */
- 
- /* (cramfs_super + start) <= start_dir < end_dir <= start_data <= end_data */
-@@ -155,7 +156,7 @@
- 	}
- 
- 	if (*length < sizeof(struct cramfs_super)) {
--		die(FSCK_UNCORRECTED, 0, "file length too short");
-+		die(FSCK_UNCORRECTED, 0, "filesystem smaller than a cramfs superblock!");
- 	}
- 
- 	/* find superblock */
-@@ -190,7 +191,8 @@
- 			die(FSCK_UNCORRECTED, 0, "zero file count");
- 		}
- 		if (*length < super.size) {
--			die(FSCK_UNCORRECTED, 0, "file length too short");
-+			die(FSCK_UNCORRECTED, 0, "file length too short, %lu is smaller than %lu",
-+				*length, super.size);
- 		}
- 		else if (*length > super.size) {
- 			fprintf(stderr, "warning: file extends past end of filesystem\n");
-@@ -267,11 +269,11 @@
- #ifdef INCLUDE_FS_TESTS
- static void print_node(char type, struct cramfs_inode *i, char *name)
- {
--	char info[10];
-+	char info[11];
- 
- 	if (S_ISCHR(i->mode) || (S_ISBLK(i->mode))) {
- 		/* major/minor numbers can be as high as 2^12 or 4096 */
--		snprintf(info, 10, "%4d,%4d", major(i->size), minor(i->size));
-+		snprintf(info, 11, "%4d,%4d", major(i->size), minor(i->size));
- 	}
- 	else {
- 		/* size be as high as 2^24 or 16777216 */
-@@ -445,8 +447,10 @@
- 	}
- 	/* TODO: Do we need to check end_dir for empty case? */
- 	memcpy(newpath, path, pathlen);
--	newpath[pathlen] = '/';
--	pathlen++;
-+	if (pathlen > 1) {
-+	    newpath[pathlen] = '/';
-+	    pathlen++;
-+	}
- 	if (opt_verbose) {
- 		print_node('d', i, path);
- 	}
---- cramfs-1.1.orig/device_table.txt	1969-12-31 17:00:00.000000000 -0700
-+++ cramfs-1.1/device_table.txt	2003-01-01 05:13:44.000000000 -0700
-@@ -0,0 +1,129 @@
-+# When building a target filesystem, it is desirable to not have to
-+# become root and then run 'mknod' a thousand times.  Using a device 
-+# table you can create device nodes and directories "on the fly".
-+#
-+# This is a sample device table file for use with mkcramfs.  You can
-+# do all sorts of interesting things with a device table file.  For
-+# example, if you want to adjust the permissions on a particular file
-+# you can just add an entry like:
-+#   /sbin/foobar	f	2755	0	0	-	-	-	-	-
-+# and (assuming the file /sbin/foobar exists) it will be made setuid
-+# root (regardless of what its permissions are on the host filesystem.
-+# Furthermore, you can use a single table entry to create a many device
-+# minors.  For example, if I wanted to create /dev/hda and /dev/hda[0-15]
-+# I could just use the following two table entries:
-+#   /dev/hda	b	640	0	0	3	0	0	0	-
-+#   /dev/hda	b	640	0	0	3	1	1	1	15
-+# 
-+# Device table entries take the form of:
-+# <name>    <type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-+# where name is the file name,  type can be one of: 
-+#	f	A regular file
-+#	d	Directory
-+#	c	Character special device file
-+#	b	Block special device file
-+#	p	Fifo (named pipe)
-+# uid is the user id for the target file, gid is the group id for the
-+# target file.  The rest of the entries (major, minor, etc) apply only 
-+# to device special files.
-+
-+# Have fun
-+# -Erik Andersen <andersen@codepoet.org>
-+#
-+
-+#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-+/dev		d	755	0	0	-	-	-	-	-
-+/dev/mem	c	640	0	0	1	1	0	0	-
-+/dev/kmem	c	640	0	0	1	2	0	0	-
-+/dev/null	c	640	0	0	1	3	0	0	-
-+/dev/zero	c	640	0	0	1	5	0	0	-
-+/dev/random	c	640	0	0	1	8	0	0	-
-+/dev/urandom	c	640	0	0	1	9	0	0	-
-+/dev/tty	c	666	0	0	5	0	0	0	-
-+/dev/tty	c	666	0	0	4	0	0	1	6
-+/dev/console	c	640	0	0	5	1	0	0	-
-+/dev/ram	b	640	0	0	1	1	0	0	-
-+/dev/ram	b	640	0	0	1	0	0	1	4
-+/dev/loop	b	640	0	0	7	0	0	1	2
-+/dev/ptmx	c	666	0	0	5	2	0	0	-
-+#/dev/ttyS	c	640	0	0	4	64	0	1	4
-+#/dev/psaux	c	640	0	0	10	1	0	0	-
-+#/dev/rtc	c	640	0	0	10	135	0	0	-
-+
-+# Adjust permissions on some normal files
-+#/etc/shadow	f	600	0	0	-	-	-	-	-
-+#/bin/tinylogin	f	4755	0	0	-	-	-	-	-
-+
-+# User-mode Linux stuff
-+/dev/ubda	b	640	0	0	98	0	0	0	-
-+/dev/ubda	b	640	0	0	98	1	1	1	15
-+
-+# IDE Devices
-+/dev/hda	b	640	0	0	3	0	0	0	-
-+/dev/hda	b	640	0	0	3	1	1	1	15
-+/dev/hdb	b	640	0	0	3	64	0	0	-
-+/dev/hdb	b	640	0	0	3	65	1	1	15
-+#/dev/hdc	b	640	0	0	22	0	0	0	-
-+#/dev/hdc	b	640	0	0	22	1	1	1	15
-+#/dev/hdd	b	640	0	0	22	64	0	0	-
-+#/dev/hdd	b	640	0	0	22	65	1	1	15
-+#/dev/hde	b	640	0	0	33	0	0	0	-
-+#/dev/hde	b	640	0	0	33	1	1	1	15
-+#/dev/hdf	b	640	0	0	33	64	0	0	-
-+#/dev/hdf	b	640	0	0	33	65	1	1	15
-+#/dev/hdg	b	640	0	0	34	0	0	0	-
-+#/dev/hdg	b	640	0	0	34	1	1	1	15
-+#/dev/hdh	b	640	0	0	34	64	0	0	-
-+#/dev/hdh	b	640	0	0	34	65	1	1	15
-+
-+# SCSI Devices
-+#/dev/sda	b	640	0	0	8	0	0	0	-
-+#/dev/sda	b	640	0	0	8	1	1	1	15
-+#/dev/sdb	b	640	0	0	8	16	0	0	-
-+#/dev/sdb	b	640	0	0	8	17	1	1	15
-+#/dev/sdc	b	640	0	0	8	32	0	0	-
-+#/dev/sdc	b	640	0	0	8	33	1	1	15
-+#/dev/sdd	b	640	0	0	8	48	0	0	-
-+#/dev/sdd	b	640	0	0	8	49	1	1	15
-+#/dev/sde	b	640	0	0	8	64	0	0	-
-+#/dev/sde	b	640	0	0	8	65	1	1	15
-+#/dev/sdf	b	640	0	0	8	80	0	0	-
-+#/dev/sdf	b	640	0	0	8	81	1	1	15
-+#/dev/sdg	b	640	0	0	8	96	0	0	-
-+#/dev/sdg	b	640	0	0	8	97	1	1	15
-+#/dev/sdh	b	640	0	0	8	112	0	0	-
-+#/dev/sdh	b	640	0	0	8	113	1	1	15
-+#/dev/sg		c	640	0	0	21	0	0	1	15
-+#/dev/scd	b	640	0	0	11	0	0	1	15
-+#/dev/st		c	640	0	0	9	0	0	1	8
-+#/dev/nst	c	640	0	0	9	128	0	1	8
-+#/dev/st	c	640	0	0	9	32	1	1	4
-+#/dev/st	c	640	0	0	9	64	1	1	4
-+#/dev/st	c	640	0	0	9	96	1	1	4
-+
-+# Floppy disk devices
-+#/dev/fd		b	640	0	0	2	0	0	1	2
-+#/dev/fd0d360	b	640	0	0	2	4	0	0	-
-+#/dev/fd1d360	b	640	0	0	2	5	0	0	-
-+#/dev/fd0h1200	b	640	0	0	2	8	0	0	-
-+#/dev/fd1h1200	b	640	0	0	2	9	0	0	-
-+#/dev/fd0u1440	b	640	0	0	2	28	0	0	-
-+#/dev/fd1u1440	b	640	0	0	2	29	0	0	-
-+#/dev/fd0u2880	b	640	0	0	2	32	0	0	-
-+#/dev/fd1u2880	b	640	0	0	2	33	0	0	-
-+
-+# All the proprietary cdrom devices in the world
-+#/dev/aztcd	b	640	0	0	29	0	0	0	-
-+#/dev/bpcd	b	640	0	0	41	0	0	0	-
-+#/dev/capi20	c	640	0	0	68	0	0	1	2
-+#/dev/cdu31a	b	640	0	0	15	0	0	0	-
-+#/dev/cdu535	b	640	0	0	24	0	0	0	-
-+#/dev/cm206cd	b	640	0	0	32	0	0	0	-
-+#/dev/sjcd	b	640	0	0	18	0	0	0	-
-+#/dev/sonycd	b	640	0	0	15	0	0	0	-
-+#/dev/gscd	b	640	0	0	16	0	0	0	-
-+#/dev/sbpcd	b	640	0	0	25	0	0	0	-
-+#/dev/sbpcd	b	640	0	0	25	0	0	1	4
-+#/dev/mcd	b	640	0	0	23	0	0	0	-
-+#/dev/optcd	b	640	0	0	17	0	0	0	-
-+
---- cramfs-1.1.orig/mkcramfs.c	2002-02-20 01:03:32.000000000 -0700
-+++ cramfs-1.1/mkcramfs.c	2002-12-21 01:25:17.000000000 -0700
-@@ -1,3 +1,4 @@
-+/* vi: set sw=8 ts=8: */
- /*
-  * mkcramfs - make a cramfs file system
-  *
-@@ -16,12 +17,21 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Added device table support (code taken from mkfs.jffs2.c, credit to
-+ * Erik Andersen <andersen@codepoet.org>) as well as an option to squash
-+ * permissions. - Russ Dill <Russ.Dill@asu.edu> September 2002
-+ *
-+ * Reworked, cleaned up, and updated for cramfs-1.1, December 2002
-+ *  - Erik Andersen <andersen@codepoet.org>
-+ *
-  */
- 
- /*
-  * If you change the disk format of cramfs, please update fs/cramfs/README.
-  */
- 
-+#define _GNU_SOURCE
- #include <sys/types.h>
- #include <stdio.h>
- #include <sys/stat.h>
-@@ -33,8 +43,15 @@
- #include <errno.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <libgen.h>
-+#include <ctype.h>
-+#include <assert.h>
-+#include <getopt.h>
- #include <linux/cramfs_fs.h>
- #include <zlib.h>
-+#ifdef DMALLOC
-+#include <dmalloc.h>
-+#endif
- 
- /* Exit codes used by mkfs-type programs */
- #define MKFS_OK          0	/* No errors */
-@@ -71,11 +88,17 @@
- 		  + (1 << CRAMFS_SIZE_WIDTH) - 1 /* filesize */ \
- 		  + (1 << CRAMFS_SIZE_WIDTH) * 4 / PAGE_CACHE_SIZE /* block pointers */ )
- 
-+
-+/* The kernel assumes PAGE_CACHE_SIZE as block size. */
-+#define PAGE_CACHE_SIZE (4096)
-+
-+
- static const char *progname = "mkcramfs";
- static unsigned int blksize = PAGE_CACHE_SIZE;
- static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
- static int image_length = 0;
- 
-+
- /*
-  * If opt_holes is set, then mkcramfs can create explicit holes in the
-  * data, which saves 26 bytes per hole (which is a lot smaller a
-@@ -91,10 +114,12 @@
- static int opt_holes = 0;
- static int opt_pad = 0;
- static int opt_verbose = 0;
-+static int opt_squash = 0;
- static char *opt_image = NULL;
- static char *opt_name = NULL;
- 
- static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid;
-+static const char *const memory_exhausted = "memory exhausted";
- 
- /* In-core version of inode / directory entry. */
- struct entry {
-@@ -123,7 +148,7 @@
- {
- 	FILE *stream = status ? stderr : stdout;
- 
--	fprintf(stream, "usage: %s [-h] [-e edition] [-i file] [-n name] dirname outfile\n"
-+	fprintf(stream, "usage: %s [-h] [-e edition] [-i file] [-n name] [-D file] dirname outfile\n"
- 		" -h         print this help\n"
- 		" -E         make all warnings errors (non-zero exit status)\n"
- 		" -e edition set edition number (part of fsid)\n"
-@@ -133,39 +158,157 @@
- 		" -s         sort directory entries (old option, ignored)\n"
- 		" -v         be more verbose\n"
- 		" -z         make explicit holes (requires >= 2.3.39)\n"
--		" dirname    root of the directory tree to be compressed\n"
-+		" -D         Use the named FILE as a device table file\n"
-+		" -q         squash permissions (make everything owned by root)\n"
-+		" dirname    root of the filesystem to be compressed\n"
- 		" outfile    output file\n", progname, PAD_SIZE);
- 
- 	exit(status);
- }
- 
--static void die(int status, int syserr, const char *fmt, ...)
-+static void verror_msg(const char *s, va_list p)
-+{
-+	fflush(stdout);
-+	fprintf(stderr, "mkcramfs: ");
-+	vfprintf(stderr, s, p);
-+}
-+
-+static void vperror_msg(const char *s, va_list p)
-+{
-+	int err = errno;
-+
-+	if (s == 0)
-+		s = "";
-+	verror_msg(s, p);
-+	if (*s)
-+		s = ": ";
-+	fprintf(stderr, "%s%s\n", s, strerror(err));
-+}
-+
-+static void perror_msg(const char *s, ...)
-+{
-+	va_list p;
-+
-+	va_start(p, s);
-+	vperror_msg(s, p);
-+	va_end(p);
-+}
-+
-+static void error_msg_and_die(const char *s, ...)
-+{
-+	va_list p;
-+
-+	va_start(p, s);
-+	verror_msg(s, p);
-+	va_end(p);
-+	putc('\n', stderr);
-+	exit(MKFS_ERROR);
-+}
-+
-+static void perror_msg_and_die(const char *s, ...)
-+{
-+	va_list p;
-+
-+	va_start(p, s);
-+	vperror_msg(s, p);
-+	va_end(p);
-+	exit(MKFS_ERROR);
-+}
-+#ifndef DMALLOC
-+extern char *xstrdup(const char *s)
-+{
-+	char *t;
-+
-+	if (s == NULL)
-+		return NULL;
-+	t = strdup(s);
-+	if (t == NULL)
-+		error_msg_and_die(memory_exhausted);
-+	return t;
-+}
-+
-+extern void *xmalloc(size_t size)
-+{
-+	void *ptr = malloc(size);
-+
-+	if (ptr == NULL && size != 0)
-+		error_msg_and_die(memory_exhausted);
-+	return ptr;
-+}
-+
-+extern void *xcalloc(size_t nmemb, size_t size)
-+{
-+	void *ptr = calloc(nmemb, size);
-+
-+	if (ptr == NULL && nmemb != 0 && size != 0)
-+		error_msg_and_die(memory_exhausted);
-+	return ptr;
-+}
-+
-+extern void *xrealloc(void *ptr, size_t size)
-+{
-+	ptr = realloc(ptr, size);
-+	if (ptr == NULL && size != 0)
-+		error_msg_and_die(memory_exhausted);
-+	return ptr;
-+}
-+#endif
-+
-+static FILE *xfopen(const char *path, const char *mode)
- {
--	va_list arg_ptr;
--	int save = errno;
-+	FILE *fp;
-+
-+	if ((fp = fopen(path, mode)) == NULL)
-+		perror_msg_and_die("%s", path);
-+	return fp;
-+}
- 
--	fflush(0);
--	va_start(arg_ptr, fmt);
--	fprintf(stderr, "%s: ", progname);
--	vfprintf(stderr, fmt, arg_ptr);
--	if (syserr) {
--		fprintf(stderr, ": %s", strerror(save));
-+extern int xopen(const char *pathname, int flags, mode_t mode)
-+{
-+	int ret;
-+	
-+	if (flags & O_CREAT)
-+		ret = open(pathname, flags, mode);
-+	else
-+		ret = open(pathname, flags);
-+	if (ret == -1) {
-+		perror_msg_and_die("%s", pathname);
- 	}
--	fprintf(stderr, "\n");
--	va_end(arg_ptr);
--	exit(status);
-+	return ret;
- }
- 
-+extern char *xreadlink(const char *path)
-+{                       
-+	static const int GROWBY = 80; /* how large we will grow strings by */
-+
-+	char *buf = NULL;   
-+	int bufsize = 0, readsize = 0;
-+
-+	do {
-+		buf = xrealloc(buf, bufsize += GROWBY);
-+		readsize = readlink(path, buf, bufsize); /* 1st try */
-+		if (readsize == -1) {
-+		    perror_msg("%s:%s", progname, path);
-+		    return NULL;
-+		}
-+	}           
-+	while (bufsize < readsize + 1);
-+
-+	buf[readsize] = '\0';
-+
-+	return buf;
-+}       
-+
- static void map_entry(struct entry *entry)
- {
- 	if (entry->path) {
- 		entry->fd = open(entry->path, O_RDONLY);
- 		if (entry->fd < 0) {
--			die(MKFS_ERROR, 1, "open failed: %s", entry->path);
-+			error_msg_and_die("open failed: %s", entry->path);
- 		}
- 		entry->uncompressed = mmap(NULL, entry->size, PROT_READ, MAP_PRIVATE, entry->fd, 0);
- 		if (entry->uncompressed == MAP_FAILED) {
--			die(MKFS_ERROR, 1, "mmap failed: %s", entry->path);
-+			error_msg_and_die("mmap failed: %s", entry->path);
- 		}
- 	}
- }
-@@ -174,8 +317,9 @@
- {
- 	if (entry->path) {
- 		if (munmap(entry->uncompressed, entry->size) < 0) {
--			die(MKFS_ERROR, 1, "munmap failed: %s", entry->path);
-+			error_msg_and_die("munmap failed: %s", entry->path);
- 		}
-+		entry->uncompressed=NULL;
- 		close(entry->fd);
- 	}
- }
-@@ -204,7 +348,8 @@
- 		find_identical_file(orig->next, newfile));
- }
- 
--static void eliminate_doubles(struct entry *root, struct entry *orig) {
-+static void eliminate_doubles(struct entry *root, struct entry *orig) 
-+{
- 	if (orig) {
- 		if (orig->size && (orig->path || orig->uncompressed))
- 			find_identical_file(root, orig);
-@@ -232,10 +377,7 @@
- 
- 	/* Set up the path. */
- 	/* TODO: Reuse the parent's buffer to save memcpy'ing and duplication. */
--	path = malloc(len + 1 + MAX_INPUT_NAMELEN + 1);
--	if (!path) {
--		die(MKFS_ERROR, 1, "malloc failed");
--	}
-+	path = xmalloc(len + 1 + MAX_INPUT_NAMELEN + 1);
- 	memcpy(path, name, len);
- 	endpath = path + len;
- 	*endpath = '/';
-@@ -245,7 +387,7 @@
- 	dircount = scandir(name, &dirlist, 0, cramsort);
- 
- 	if (dircount < 0) {
--		die(MKFS_ERROR, 1, "scandir failed: %s", name);
-+		error_msg_and_die("scandir failed: %s", name);
- 	}
- 
- 	/* process directory */
-@@ -269,25 +411,20 @@
- 		}
- 		namelen = strlen(dirent->d_name);
- 		if (namelen > MAX_INPUT_NAMELEN) {
--			die(MKFS_ERROR, 0,
--				"very long (%u bytes) filename found: %s\n"
--				"please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile",
-+			error_msg_and_die(
-+				"Very long (%u bytes) filename `%s' found.\n"
-+				" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n",
- 				namelen, dirent->d_name);
- 		}
- 		memcpy(endpath, dirent->d_name, namelen + 1);
- 
- 		if (lstat(path, &st) < 0) {
-+			perror(endpath);
- 			warn_skip = 1;
- 			continue;
- 		}
--		entry = calloc(1, sizeof(struct entry));
--		if (!entry) {
--			die(MKFS_ERROR, 1, "calloc failed");
--		}
--		entry->name = strdup(dirent->d_name);
--		if (!entry->name) {
--			die(MKFS_ERROR, 1, "strdup failed");
--		}
-+		entry = xcalloc(1, sizeof(struct entry));
-+		entry->name = xstrdup(dirent->d_name);
- 		/* truncate multi-byte UTF-8 filenames on character boundary */
- 		if (namelen > CRAMFS_MAXPATHLEN) {
- 			namelen = CRAMFS_MAXPATHLEN;
-@@ -297,24 +434,25 @@
- 				namelen--;
- 				/* are we reasonably certain it was UTF-8 ? */
- 				if (entry->name[namelen] < 0x80 || !namelen) {
--					die(MKFS_ERROR, 0, "cannot truncate filenames not encoded in UTF-8");
-+					error_msg_and_die("cannot truncate filenames not encoded in UTF-8");
- 				}
- 			}
- 			entry->name[namelen] = '\0';
- 		}
- 		entry->mode = st.st_mode;
- 		entry->size = st.st_size;
--		entry->uid = st.st_uid;
-+		entry->uid = opt_squash ? 0 : st.st_uid;
- 		if (entry->uid >= 1 << CRAMFS_UID_WIDTH)
- 			warn_uid = 1;
--		entry->gid = st.st_gid;
--		if (entry->gid >= 1 << CRAMFS_GID_WIDTH)
-+		entry->gid = opt_squash ? 0 : st.st_gid;
-+		if (entry->gid >= 1 << CRAMFS_GID_WIDTH) {
- 			/* TODO: We ought to replace with a default
- 			   gid instead of truncating; otherwise there
- 			   are security problems.  Maybe mode should
- 			   be &= ~070.  Same goes for uid once Linux
- 			   supports >16-bit uids. */
- 			warn_gid = 1;
-+		}
- 		size = sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
- 		*fslen_ub += size;
- 		if (S_ISDIR(st.st_mode)) {
-@@ -325,21 +463,15 @@
- 					warn_skip = 1;
- 					continue;
- 				}
--				entry->path = strdup(path);
--				if (!entry->path) {
--					die(MKFS_ERROR, 1, "strdup failed");
--				}
-+				entry->path = xstrdup(path);
- 				if ((entry->size >= 1 << CRAMFS_SIZE_WIDTH)) {
- 					warn_size = 1;
- 					entry->size = (1 << CRAMFS_SIZE_WIDTH) - 1;
- 				}
- 			}
- 		} else if (S_ISLNK(st.st_mode)) {
--			entry->uncompressed = malloc(entry->size);
-+			entry->uncompressed = xreadlink(path);
- 			if (!entry->uncompressed) {
--				die(MKFS_ERROR, 1, "malloc failed");
--			}
--			if (readlink(path, entry->uncompressed, entry->size) < 0) {
- 				warn_skip = 1;
- 				continue;
- 			}
-@@ -351,7 +483,7 @@
- 			if (entry->size & -(1<<CRAMFS_SIZE_WIDTH))
- 				warn_dev = 1;
- 		} else {
--			die(MKFS_ERROR, 0, "bogus file type: %s", entry->name);
-+			error_msg_and_die("bogus file type: %s", entry->name);
- 		}
- 
- 		if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
-@@ -378,7 +510,9 @@
- 	struct cramfs_super *super = (struct cramfs_super *) base;
- 	unsigned int offset = sizeof(struct cramfs_super) + image_length;
- 
--	offset += opt_pad;	/* 0 if no padding */
-+	if (opt_pad) {
-+		offset += opt_pad;	/* 0 if no padding */
-+	}
- 
- 	super->magic = CRAMFS_MAGIC;
- 	super->flags = CRAMFS_FLAG_FSID_VERSION_2 | CRAMFS_FLAG_SORTED_DIRS;
-@@ -414,10 +548,10 @@
- 	struct cramfs_inode *inode = (struct cramfs_inode *) (base + entry->dir_offset);
- 
- 	if ((offset & 3) != 0) {
--		die(MKFS_ERROR, 0, "illegal offset of %lu bytes", offset);
-+		error_msg_and_die("illegal offset of %lu bytes", offset);
- 	}
- 	if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) {
--		die(MKFS_ERROR, 0, "filesystem too big");
-+		error_msg_and_die("filesystem too big");
- 	}
- 	inode->offset = (offset >> 2);
- }
-@@ -429,7 +563,7 @@
-  */
- static void print_node(struct entry *e)
- {
--	char info[10];
-+	char info[12];
- 	char type = '?';
- 
- 	if (S_ISREG(e->mode)) type = 'f';
-@@ -442,11 +576,11 @@
- 
- 	if (S_ISCHR(e->mode) || (S_ISBLK(e->mode))) {
- 		/* major/minor numbers can be as high as 2^12 or 4096 */
--		snprintf(info, 10, "%4d,%4d", major(e->size), minor(e->size));
-+		snprintf(info, 11, "%4d,%4d", major(e->size), minor(e->size));
- 	}
- 	else {
- 		/* size be as high as 2^24 or 16777216 */
--		snprintf(info, 10, "%9d", e->size);
-+		snprintf(info, 11, "%9d", e->size);
- 	}
- 
- 	printf("%c %04o %s %5d:%-3d %s\n",
-@@ -462,17 +596,9 @@
- {
- 	int stack_entries = 0;
- 	int stack_size = 64;
--	struct entry **entry_stack;
--
--	entry_stack = malloc(stack_size * sizeof(struct entry *));
--	if (!entry_stack) {
--		die(MKFS_ERROR, 1, "malloc failed");
--	}
--
--	if (opt_verbose) {
--		printf("root:\n");
--	}
-+	struct entry **entry_stack = NULL;
- 
-+	entry_stack = xmalloc(stack_size * sizeof(struct entry *));
- 	for (;;) {
- 		int dir_start = stack_entries;
- 		while (entry) {
-@@ -506,10 +632,7 @@
- 			if (entry->child) {
- 				if (stack_entries >= stack_size) {
- 					stack_size *= 2;
--					entry_stack = realloc(entry_stack, stack_size * sizeof(struct entry *));
--					if (!entry_stack) {
--						die(MKFS_ERROR, 1, "realloc failed");
--					}
-+					entry_stack = xrealloc(entry_stack, stack_size * sizeof(struct entry *));
- 				}
- 				entry_stack[stack_entries] = entry;
- 				stack_entries++;
-@@ -543,7 +666,7 @@
- 
- 		set_data_offset(entry, base, offset);
- 		if (opt_verbose) {
--			printf("%s:\n", entry->name);
-+		    printf("'%s':\n", entry->name);
- 		}
- 		entry = entry->child;
- 	}
-@@ -553,16 +676,21 @@
- 
- static int is_zero(char const *begin, unsigned len)
- {
--	/* Returns non-zero iff the first LEN bytes from BEGIN are all NULs. */
--	return (len-- == 0 ||
--		(begin[0] == '\0' &&
--		 (len-- == 0 ||
--		  (begin[1] == '\0' &&
--		   (len-- == 0 ||
--		    (begin[2] == '\0' &&
--		     (len-- == 0 ||
--		      (begin[3] == '\0' &&
--		       memcmp(begin, begin + 4, len) == 0))))))));
-+	if (opt_holes)
-+		/* Returns non-zero iff the first LEN bytes from BEGIN are
-+		   all NULs. */
-+		return (len-- == 0 ||
-+			(begin[0] == '\0' &&
-+			 (len-- == 0 ||
-+			  (begin[1] == '\0' &&
-+			   (len-- == 0 ||
-+			    (begin[2] == '\0' &&
-+			     (len-- == 0 ||
-+			      (begin[3] == '\0' &&
-+			       memcmp(begin, begin + 4, len) == 0))))))));
-+	else
-+		/* Never create holes. */
-+		return 0;
- }
- 
- /*
-@@ -575,37 +703,34 @@
-  * Note that size > 0, as a zero-sized file wouldn't ever
-  * have gotten here in the first place.
-  */
--static unsigned int do_compress(char *base, unsigned int offset, char const *name, char *uncompressed, unsigned int size)
-+static unsigned int do_compress(char *base, unsigned int offset, struct entry *entry)
- {
-+	unsigned int size = entry->size;
- 	unsigned long original_size = size;
- 	unsigned long original_offset = offset;
- 	unsigned long new_size;
- 	unsigned long blocks = (size - 1) / blksize + 1;
- 	unsigned long curr = offset + 4 * blocks;
- 	int change;
-+	char *uncompressed = entry->uncompressed;
- 
--	total_blocks += blocks;
-+	total_blocks += blocks; 
- 
- 	do {
- 		unsigned long len = 2 * blksize;
- 		unsigned int input = size;
--		int err;
--
- 		if (input > blksize)
- 			input = blksize;
- 		size -= input;
--		if (!(opt_holes && is_zero (uncompressed, input))) {
--			err = compress2(base + curr, &len, uncompressed, input, Z_BEST_COMPRESSION);
--			if (err != Z_OK) {
--				die(MKFS_ERROR, 0, "compression error: %s", zError(err));
--			}
-+		if (!is_zero (uncompressed, input)) {
-+			compress(base + curr, &len, uncompressed, input);
- 			curr += len;
- 		}
- 		uncompressed += input;
- 
- 		if (len > blksize*2) {
- 			/* (I don't think this can happen with zlib.) */
--			die(MKFS_ERROR, 0, "AIEEE: block \"compressed\" to > 2*blocklength (%ld)", len);
-+			error_msg_and_die("AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n", len);
- 		}
- 
- 		*(u32 *) (base + offset) = curr;
-@@ -618,10 +743,12 @@
- 	   st_blocks * 512.  But if you say that then perhaps
- 	   administrative data should also be included in both. */
- 	change = new_size - original_size;
--	if (opt_verbose > 1) {
--		printf("%6.2f%% (%+d bytes)\t%s\n",
--		       (change * 100) / (double) original_size, change, name);
-+#if 0
-+	if (opt_verbose) {
-+	    printf("%6.2f%% (%+d bytes)\t%s\n",
-+		    (change * 100) / (double) original_size, change, entry->name);
- 	}
-+#endif
- 
- 	return curr;
- }
-@@ -644,7 +771,7 @@
- 				set_data_offset(entry, base, offset);
- 				entry->offset = offset;
- 				map_entry(entry);
--				offset = do_compress(base, offset, entry->name, entry->uncompressed, entry->size);
-+				offset = do_compress(base, offset, entry);
- 				unmap_entry(entry);
- 			}
- 		}
-@@ -660,13 +787,10 @@
- 	int fd;
- 	char *buf;
- 
--	fd = open(file, O_RDONLY);
--	if (fd < 0) {
--		die(MKFS_ERROR, 1, "open failed: %s", file);
--	}
-+	fd = xopen(file, O_RDONLY, 0);
- 	buf = mmap(NULL, image_length, PROT_READ, MAP_PRIVATE, fd, 0);
- 	if (buf == MAP_FAILED) {
--		die(MKFS_ERROR, 1, "mmap failed");
-+		error_msg_and_die("mmap failed");
- 	}
- 	memcpy(base + offset, buf, image_length);
- 	munmap(buf, image_length);
-@@ -679,6 +803,328 @@
- 	return (offset + image_length);
- }
- 
-+static struct entry *find_filesystem_entry(struct entry *dir, char *name, mode_t type)
-+{
-+	struct entry *e = dir;
-+
-+	if (S_ISDIR(dir->mode)) {
-+		e = dir->child;
-+	}
-+	while (e) {
-+		/* Only bother to do the expensive strcmp on matching file types */
-+		if (type == (e->mode & S_IFMT) && e->name) {
-+			if (S_ISDIR(e->mode)) {
-+				int len = strlen(e->name);
-+
-+				/* Check if we are a parent of the correct path */
-+				if (strncmp(e->name, name, len) == 0) {
-+					/* Is this an _exact_ match? */
-+					if (strcmp(name, e->name) == 0) {
-+						return (e);
-+					}
-+					/* Looks like we found a parent of the correct path */
-+					if (name[len] == '/') {
-+						if (e->child) {
-+							return (find_filesystem_entry (e, name + len + 1, type));
-+						} else {
-+							return NULL;
-+						}
-+					}
-+				}
-+			} else {
-+				if (strcmp(name, e->name) == 0) {
-+					return (e);
-+				}
-+			}
-+		}
-+		e = e->next;
-+	}
-+	return (NULL);
-+}
-+
-+void modify_entry(char *full_path, unsigned long uid, unsigned long gid, 
-+	unsigned long mode, unsigned long rdev, struct entry *root, loff_t *fslen_ub)
-+{
-+	char *name, *path, *full;
-+	struct entry *curr, *parent, *entry, *prev;
-+	
-+	full = xstrdup(full_path);
-+	path = xstrdup(dirname(full));
-+	name = full_path + strlen(path) + 1;
-+	free(full);
-+	if (strcmp(path, "/") == 0) {
-+		parent = root;
-+		name = full_path + 1;
-+	} else {
-+		if (!(parent = find_filesystem_entry(root, path+1, S_IFDIR)))
-+			error_msg_and_die("%s/%s: could not find parent\n", path, name);
-+	}
-+	if ((entry = find_filesystem_entry(parent, name, (mode & S_IFMT)))) {
-+		/* its there, just modify permissions */
-+		entry->mode = mode;
-+		entry->uid = uid;
-+		entry->gid = gid;
-+	} else { /* make a new entry */
-+	
-+		/* code partially replicated from parse_directory() */
-+		size_t namelen;
-+		if (S_ISREG(mode)) {
-+			error_msg_and_die("%s: regular file from device_table file must exist on disk!", full_path);
-+		}
-+
-+		namelen = strlen(name);
-+		if (namelen > MAX_INPUT_NAMELEN) {
-+			error_msg_and_die(
-+				"Very long (%u bytes) filename `%s' found.\n"
-+				" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n",
-+				namelen, name);
-+		}
-+		entry = xcalloc(1, sizeof(struct entry));
-+		entry->name = xstrdup(name);
-+		/* truncate multi-byte UTF-8 filenames on character boundary */
-+		if (namelen > CRAMFS_MAXPATHLEN) {
-+			namelen = CRAMFS_MAXPATHLEN;
-+			warn_namelen = 1;
-+			/* the first lost byte must not be a trail byte */
-+			while ((entry->name[namelen] & 0xc0) == 0x80) {
-+				namelen--;
-+				/* are we reasonably certain it was UTF-8 ? */
-+				if (entry->name[namelen] < 0x80 || !namelen) {
-+					error_msg_and_die("cannot truncate filenames not encoded in UTF-8");
-+				}
-+			}
-+			entry->name[namelen] = '\0';
-+		}
-+		entry->mode = mode;
-+		entry->uid = uid;
-+		entry->gid = gid;
-+		entry->size = 0;
-+		if (S_ISBLK(mode) || S_ISCHR(mode)) {
-+			entry->size = rdev;
-+			if (entry->size & -(1<<CRAMFS_SIZE_WIDTH))
-+				warn_dev = 1;
-+		}
-+		
-+		/* ok, now we have to backup and correct the size of all the entries above us */
-+		*fslen_ub += sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
-+		parent->size += sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
-+
-+		/* alright, time to link us in */
-+		curr = parent->child;
-+		prev = NULL;
-+		while (curr && strcmp(name, curr->name) > 0) {
-+			prev = curr;
-+			curr = curr->next;
-+		}
-+		if (!prev) parent->child = entry;
-+		else prev->next = entry;
-+		entry->next = curr;
-+		entry->child = NULL;
-+	}
-+	if (entry->uid >= 1 << CRAMFS_UID_WIDTH)
-+		warn_uid = 1;
-+	if (entry->gid >= 1 << CRAMFS_GID_WIDTH) {
-+		/* TODO: We ought to replace with a default
-+		   gid instead of truncating; otherwise there
-+		   are security problems.  Maybe mode should
-+		   be &= ~070.  Same goes for uid once Linux
-+		   supports >16-bit uids. */
-+		warn_gid = 1;
-+	}
-+	free(path);
-+}
-+
-+/* the GNU C library has a wonderful scanf("%as", string) which will
-+ allocate the string with the right size, good to avoid buffer overruns. 
-+ the following macros use it if available or use a hacky workaround...
-+ */
-+
-+#ifdef __GNUC__
-+#define SCANF_PREFIX "a"
-+#define SCANF_STRING(s) (&s)
-+#define GETCWD_SIZE 0
-+#else
-+#define SCANF_PREFIX "511"
-+#define SCANF_STRING(s) (s = xmalloc(512))
-+#define GETCWD_SIZE -1
-+inline int snprintf(char *str, size_t n, const char *fmt, ...)
-+{
-+	int ret;
-+	va_list ap;
-+
-+	va_start(ap, fmt);
-+	ret = vsprintf(str, fmt, ap);
-+	va_end(ap);
-+	return ret;
-+}
-+#endif
-+
-+/*  device table entries take the form of:
-+    <path>	<type> <mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-+    /dev/mem     c    640       0       0         1       1       0     0         -
-+
-+    type can be one of: 
-+	f	A regular file
-+	d	Directory
-+	c	Character special device file
-+	b	Block special device file
-+	p	Fifo (named pipe)
-+
-+    I don't bother with symlinks (permissions are irrelevant), hard
-+    links (special cases of regular files), or sockets (why bother).
-+
-+    Regular files must exist in the target root directory.  If a char,
-+    block, fifo, or directory does not exist, it will be created.
-+*/
-+
-+static int interpret_table_entry(char *line, struct entry *root, loff_t *fslen_ub)
-+{
-+	char type, *name = NULL;
-+	unsigned long mode = 0755, uid = 0, gid = 0, major = 0, minor = 0;
-+	unsigned long start = 0, increment = 1, count = 0;
-+
-+	if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
-+		 SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
-+		 &start, &increment, &count) < 0) 
-+	{
-+		return 1;
-+	}
-+
-+	if (!strcmp(name, "/")) {
-+		error_msg_and_die("Device table entries require absolute paths");
-+	}
-+
-+	switch (type) {
-+	case 'd':
-+		mode |= S_IFDIR;
-+		modify_entry(name, uid, gid, mode, 0, root, fslen_ub);
-+		break;
-+	case 'f':
-+		mode |= S_IFREG;
-+		modify_entry(name, uid, gid, mode, 0, root, fslen_ub);
-+		break;
-+	case 'p':
-+		mode |= S_IFIFO;
-+		modify_entry(name, uid, gid, mode, 0, root, fslen_ub);
-+		break;
-+	case 'c':
-+	case 'b':
-+		mode |= (type == 'c') ? S_IFCHR : S_IFBLK;
-+		if (count > 0) {
-+			char *buf;
-+			unsigned long i;
-+			dev_t rdev;
-+
-+			for (i = start; i < count; i++) {
-+				asprintf(&buf, "%s%lu", name, i);
-+				rdev = makedev(major, minor + (i * increment - start));
-+				modify_entry(buf, uid, gid, mode, rdev, root, fslen_ub);
-+				free(buf);
-+			}
-+		} else {
-+			dev_t rdev = makedev(major, minor);
-+			modify_entry(name, uid, gid, mode, rdev, root, fslen_ub);
-+		}
-+		break;
-+	default:
-+		error_msg_and_die("Unsupported file type");
-+	}
-+	free(name);
-+	return 0;
-+}
-+
-+static int parse_device_table(FILE *file, struct entry *root, loff_t *fslen_ub)
-+{
-+	char *line;
-+	int status = 0;
-+	size_t length = 0;
-+
-+	/* Turn off squash, since we must ensure that values
-+	 * entered via the device table are not squashed */
-+	opt_squash = 0;
-+
-+	/* Looks ok so far.  The general plan now is to read in one
-+	 * line at a time, check for leading comment delimiters ('#'),
-+	 * then try and parse the line as a device table.  If we fail
-+	 * to parse things, try and help the poor fool to fix their
-+	 * device table with a useful error msg... */
-+	line = NULL;
-+	while (getline(&line, &length, file) != -1) {
-+		/* First trim off any whitespace */
-+		int len = strlen(line);
-+
-+		/* trim trailing whitespace */
-+		while (len > 0 && isspace(line[len - 1]))
-+			line[--len] = '\0';
-+		/* trim leading whitespace */
-+		memmove(line, &line[strspn(line, " \n\r\t\v")], len);
-+
-+		/* How long are we after trimming? */
-+		len = strlen(line);
-+
-+		/* If this is NOT a comment line, try to interpret it */
-+		if (len && *line != '#') {
-+			if (interpret_table_entry(line, root, fslen_ub))
-+				status = 1;
-+		}
-+
-+		free(line);
-+		line = NULL;
-+	}
-+	free(line);
-+	fclose(file);
-+
-+	return status;
-+}
-+
-+void traverse(struct entry *entry, int depth)
-+{
-+	struct entry *curr = entry;
-+	int i;
-+
-+	while (curr) {
-+		for (i = 0; i < depth; i++) putchar(' ');
-+		printf("%s: size=%d mode=%d same=%p\n",
-+			(curr->name)? (char*)curr->name : "/", 
-+			curr->size, curr->mode, curr->same);
-+		if (curr->child) traverse(curr->child, depth + 4);
-+		curr = curr->next;
-+	}
-+}
-+
-+static void free_filesystem_entry(struct entry *dir)
-+{
-+	struct entry *e = dir, *last;
-+
-+	if (S_ISDIR(dir->mode)) {
-+		e = dir->child;
-+	}
-+	while (e) {
-+		if (e->name)
-+			free(e->name);
-+		if (e->path)
-+			free(e->path);
-+		if (e->uncompressed)
-+			free(e->uncompressed);
-+		last = e;
-+		if (e->child) {
-+			free_filesystem_entry(e);
-+		}
-+		e = e->next;
-+		free(last);
-+	}
-+}
-+
-+
-+/*
-+ * Usage:
-+ *
-+ *      mkcramfs directory-name outfile
-+ *
-+ * where "directory-name" is simply the root of the directory
-+ * tree that we want to generate a compressed filesystem out
-+ * of.
-+ */
- int main(int argc, char **argv)
- {
- 	struct stat st;		/* used twice... */
-@@ -692,6 +1138,7 @@
- 	u32 crc;
- 	int c;			/* for getopt */
- 	char *ep;		/* for strtoul */
-+	FILE *devtable = NULL;
- 
- 	total_blocks = 0;
- 
-@@ -699,7 +1146,7 @@
- 		progname = argv[0];
- 
- 	/* command line options */
--	while ((c = getopt(argc, argv, "hEe:i:n:psvz")) != EOF) {
-+	while ((c = getopt(argc, argv, "hEe:i:n:psvzD:q")) != EOF) {
- 		switch (c) {
- 		case 'h':
- 			usage(MKFS_OK);
-@@ -715,7 +1162,7 @@
- 		case 'i':
- 			opt_image = optarg;
- 			if (lstat(opt_image, &st) < 0) {
--				die(MKFS_ERROR, 1, "lstat failed: %s", opt_image);
-+				error_msg_and_die("lstat failed: %s", opt_image);
- 			}
- 			image_length = st.st_size; /* may be padded later */
- 			fslen_ub += (image_length + 3); /* 3 is for padding */
-@@ -736,6 +1183,16 @@
- 		case 'z':
- 			opt_holes = 1;
- 			break;
-+		case 'q':
-+			opt_squash = 1;
-+			break;
-+		case 'D':
-+			devtable = xfopen(optarg, "r");
-+			if (fstat(fileno(devtable), &st) < 0)
-+				perror_msg_and_die(optarg);
-+			if (st.st_size < 10)
-+				error_msg_and_die("%s: not a proper device table file\n", optarg);
-+			break;
- 		}
- 	}
- 
-@@ -745,25 +1202,23 @@
- 	outfile = argv[optind + 1];
- 
- 	if (stat(dirname, &st) < 0) {
--		die(MKFS_USAGE, 1, "stat failed: %s", dirname);
--	}
--	fd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
--	if (fd < 0) {
--		die(MKFS_USAGE, 1, "open failed: %s", outfile);
-+		error_msg_and_die("stat failed: %s", dirname);
- 	}
-+	fd = xopen(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
- 
--	root_entry = calloc(1, sizeof(struct entry));
--	if (!root_entry) {
--		die(MKFS_ERROR, 1, "calloc failed");
--	}
-+	root_entry = xcalloc(1, sizeof(struct entry));
- 	root_entry->mode = st.st_mode;
- 	root_entry->uid = st.st_uid;
- 	root_entry->gid = st.st_gid;
- 
- 	root_entry->size = parse_directory(root_entry, dirname, &root_entry->child, &fslen_ub);
- 
-+	if (devtable) {
-+		parse_device_table(devtable, root_entry, &fslen_ub);
-+	}
-+
- 	/* always allocate a multiple of blksize bytes because that's
--	   what we're going to write later on */
-+           what we're going to write later on */
- 	fslen_ub = ((fslen_ub - 1) | (blksize - 1)) + 1;
- 
- 	if (fslen_ub > MAXFSLEN) {
-@@ -790,7 +1245,7 @@
- 	rom_image = mmap(NULL, fslen_ub?fslen_ub:1, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- 
- 	if (rom_image == MAP_FAILED) {
--		die(MKFS_ERROR, 1, "mmap failed");
-+		error_msg_and_die("mmap failed");
- 	}
- 
- 	/* Skip the first opt_pad bytes for boot loader code */
-@@ -807,6 +1262,7 @@
- 	}
- 
- 	offset = write_directory_structure(root_entry->child, rom_image, offset);
-+	if (opt_verbose)
- 	printf("Directory data: %d bytes\n", offset);
- 
- 	offset = write_data(root_entry, rom_image, offset);
-@@ -814,30 +1270,38 @@
- 	/* We always write a multiple of blksize bytes, so that
- 	   losetup works. */
- 	offset = ((offset - 1) | (blksize - 1)) + 1;
-+	if (opt_verbose)
- 	printf("Everything: %d kilobytes\n", offset >> 10);
- 
- 	/* Write the superblock now that we can fill in all of the fields. */
- 	write_superblock(root_entry, rom_image+opt_pad, offset);
-+	if (opt_verbose)
- 	printf("Super block: %d bytes\n", sizeof(struct cramfs_super));
- 
- 	/* Put the checksum in. */
- 	crc = crc32(0L, Z_NULL, 0);
- 	crc = crc32(crc, (rom_image+opt_pad), (offset-opt_pad));
- 	((struct cramfs_super *) (rom_image+opt_pad))->fsid.crc = crc;
-+	if (opt_verbose)
- 	printf("CRC: %x\n", crc);
- 
- 	/* Check to make sure we allocated enough space. */
- 	if (fslen_ub < offset) {
--		die(MKFS_ERROR, 0, "not enough space allocated for ROM image (%Ld allocated, %d used)", fslen_ub, offset);
-+		error_msg_and_die("not enough space allocated for ROM "
-+			"image (%Ld allocated, %d used)", fslen_ub, offset);
- 	}
- 
- 	written = write(fd, rom_image, offset);
- 	if (written < 0) {
--		die(MKFS_ERROR, 1, "write failed");
-+		error_msg_and_die("write failed");
- 	}
- 	if (offset != written) {
--		die(MKFS_ERROR, 0, "ROM image write failed (wrote %d of %d bytes)", written, offset);
-+		error_msg_and_die("ROM image write failed (wrote %d of %d bytes)", written, offset);
- 	}
-+	
-+	/* Free up memory */
-+	free_filesystem_entry(root_entry);
-+	free(root_entry);
- 
- 	/* (These warnings used to come at the start, but they scroll off the
- 	   screen too quickly.) */
diff --git a/package/cramfs/cramfs-02-endian.patch b/package/cramfs/cramfs-01-endian.patch
similarity index 86%
rename from package/cramfs/cramfs-02-endian.patch
rename to package/cramfs/cramfs-01-endian.patch
index 0da55bfae6..b2eda5a1db 100644
--- a/package/cramfs/cramfs-02-endian.patch
+++ b/package/cramfs/cramfs-01-endian.patch
@@ -1,14 +1,16 @@
---- cramfs-1.1/mkcramfs.c.orig	2005-04-13 05:55:57.000000000 -0600
-+++ cramfs-1.1/mkcramfs.c	2005-04-13 16:19:57.000000000 -0600
-@@ -117,6 +117,7 @@
- static int opt_squash = 0;
+Index: cramfs-1.1/mkcramfs.c
+===================================================================
+--- cramfs-1.1.orig/mkcramfs.c	2002-02-20 09:03:32.000000000 +0100
++++ cramfs-1.1/mkcramfs.c	2011-09-09 15:11:00.980895119 +0200
+@@ -93,6 +93,7 @@
+ static int opt_verbose = 0;
  static char *opt_image = NULL;
  static char *opt_name = NULL;
 +static int swap_endian = 0;
  
  static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid;
- static const char *const memory_exhausted = "memory exhausted";
-@@ -155,6 +156,8 @@
+ 
+@@ -130,6 +131,8 @@
  		" -i file    insert a file image into the filesystem (requires >= 2.4.0)\n"
  		" -n name    set name of cramfs filesystem\n"
  		" -p         pad by %d bytes for boot code\n"
@@ -17,7 +19,7 @@
  		" -s         sort directory entries (old option, ignored)\n"
  		" -v         be more verbose\n"
  		" -z         make explicit holes (requires >= 2.3.39)\n"
-@@ -504,6 +506,50 @@
+@@ -372,6 +375,50 @@
  	return totalsize;
  }
  
@@ -68,7 +70,7 @@
  /* Returns sizeof(struct cramfs_super), which includes the root inode. */
  static unsigned int write_superblock(struct entry *root, char *base, int size)
  {
-@@ -539,6 +585,7 @@
+@@ -405,6 +452,7 @@
  	super->root.gid = root->gid;
  	super->root.size = root->size;
  	super->root.offset = offset >> 2;
@@ -76,9 +78,9 @@
  
  	return offset;
  }
-@@ -553,7 +600,10 @@
+@@ -419,7 +467,10 @@
  	if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) {
- 		error_msg_and_die("filesystem too big");
+ 		die(MKFS_ERROR, 0, "filesystem too big");
  	}
 -	inode->offset = (offset >> 2);
 +	if (swap_endian)
@@ -88,7 +90,7 @@
  }
  
  /*
-@@ -638,6 +688,7 @@
+@@ -515,6 +566,7 @@
  				stack_entries++;
  			}
  			entry = entry->next;
@@ -96,7 +98,7 @@
  		}
  
  		/*
-@@ -734,6 +785,7 @@
+@@ -609,6 +661,7 @@
  		}
  
  		*(u32 *) (base + offset) = curr;
@@ -104,16 +106,16 @@
  		offset += 4;
  	} while (size);
  
-@@ -1146,7 +1198,7 @@
+@@ -699,7 +752,7 @@
  		progname = argv[0];
  
  	/* command line options */
--	while ((c = getopt(argc, argv, "hEe:i:n:psvzD:q")) != EOF) {
-+	while ((c = getopt(argc, argv, "hEe:i:n:psvzD:qlb")) != EOF) {
+-	while ((c = getopt(argc, argv, "hEe:i:n:psvz")) != EOF) {
++	while ((c = getopt(argc, argv, "hEe:i:n:psvzlb")) != EOF) {
  		switch (c) {
  		case 'h':
  			usage(MKFS_OK);
-@@ -1174,6 +1227,18 @@
+@@ -727,6 +780,18 @@
  			opt_pad = PAD_SIZE;
  			fslen_ub += PAD_SIZE;
  			break;
@@ -132,8 +134,10 @@
  		case 's':
  			/* old option, ignored */
  			break;
---- cramfs-1.1/cramfsck.c.orig	2005-04-25 11:50:31.000000000 -0700
-+++ cramfs-1.1/cramfsck.c	2005-04-25 16:53:25.000000000 -0700
+Index: cramfs-1.1/cramfsck.c
+===================================================================
+--- cramfs-1.1.orig/cramfsck.c	2002-02-23 01:00:42.000000000 +0100
++++ cramfs-1.1/cramfsck.c	2011-09-09 15:10:06.810894275 +0200
 @@ -30,6 +30,7 @@
   * 2000/07/15: Daniel Quinlan (initial support for block devices)
   * 2002/01/10: Daniel Quinlan (additional checks, test more return codes,
@@ -142,23 +146,23 @@
   */
  
  /* compile-time options */
-@@ -51,6 +52,7 @@
- #include <utime.h>
- #include <sys/ioctl.h>
+@@ -53,6 +54,7 @@
  #define _LINUX_STRING_H_
+ #include <linux/fs.h>
+ #include <linux/cramfs_fs.h>
 +#include <byteswap.h>
- #include "linux/cramfs_fs.h"
  #include <zlib.h>
  
-@@ -74,6 +76,7 @@
+ /* Exit codes used by fsck-type programs */
+@@ -73,6 +75,7 @@
  static char *filename;		/* ROM image filename */
  struct cramfs_super super;	/* just find the cramfs superblock once */
  static int opt_verbose = 0;	/* 1 = verbose (-v), 2+ = very verbose (-vv) */
 +static int need_swapping = 0;   /* fs and host dont have the same endianness */
  #ifdef INCLUDE_FS_TESTS
  static int opt_extract = 0;		/* extract cramfs (-x) */
- static char *extract_dir = "/";	/* extraction directory (-x) */
-@@ -85,6 +88,9 @@
+ static char *extract_dir = "root";	/* extraction directory (-x) */
+@@ -84,6 +87,9 @@
  static unsigned long start_data = ~0UL;	/* start of the data (256 MB = max) */
  static unsigned long end_data = 0;	/* end of the data */
  
@@ -168,7 +172,7 @@
  /* Guarantee access to at least 8kB at a time */
  #define ROMBUFFER_BITS	13
  #define ROMBUFFERSIZE	(1 << ROMBUFFER_BITS)
-@@ -166,20 +172,34 @@
+@@ -165,20 +171,34 @@
  	if (super.magic == CRAMFS_MAGIC) {
  		*start = 0;
  	}
@@ -205,7 +209,7 @@
  	if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) {
  		die(FSCK_ERROR, 0, "unsupported filesystem features");
  	}
-@@ -215,7 +235,10 @@
+@@ -213,7 +233,10 @@
  		die(FSCK_USAGE, 0, "unable to test CRC: old cramfs format");
  #endif /* not INCLUDE_FS_TESTS */
  	}
@@ -217,7 +221,7 @@
  	crc = crc32(0L, Z_NULL, 0);
  
  	buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-@@ -300,12 +323,23 @@
+@@ -298,12 +321,23 @@
  
  static struct cramfs_inode *cramfs_iget(struct cramfs_inode * i)
  {
@@ -242,7 +246,7 @@
  	return inode;
  }
  
-@@ -324,9 +358,9 @@
+@@ -322,9 +356,9 @@
   */
  static struct cramfs_inode *read_super(void)
  {
@@ -255,7 +259,7 @@
  		die(FSCK_UNCORRECTED, 0, "root inode is not directory");
  	if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) &&
  	    ((offset != sizeof(struct cramfs_super)) &&
-@@ -334,7 +368,7 @@
+@@ -332,7 +366,7 @@
  	{
  		die(FSCK_UNCORRECTED, 0, "bad root offset (%lu)", offset);
  	}
@@ -264,7 +268,7 @@
  }
  
  static int uncompress_block(void *src, int len)
-@@ -366,7 +400,7 @@
+@@ -364,7 +398,7 @@
  
  	do {
  		unsigned long out = PAGE_CACHE_SIZE;
@@ -273,7 +277,7 @@
  
  		if (next > end_data) {
  			end_data = next;
-@@ -529,7 +563,7 @@
+@@ -525,7 +559,7 @@
  {
  	unsigned long offset = i->offset << 2;
  	unsigned long curr = offset + 4;
diff --git a/package/cramfs/cramfs-02-cygwin_IO.patch b/package/cramfs/cramfs-02-cygwin_IO.patch
new file mode 100644
index 0000000000..8be333f01b
--- /dev/null
+++ b/package/cramfs/cramfs-02-cygwin_IO.patch
@@ -0,0 +1,15 @@
+Index: cramfs-1.1/cramfsck.c
+===================================================================
+--- cramfs-1.1.orig/cramfsck.c	2011-09-09 15:10:06.000000000 +0200
++++ cramfs-1.1/cramfsck.c	2011-09-09 15:13:49.950897747 +0200
+@@ -57,6 +57,10 @@
+ #include <byteswap.h>
+ #include <zlib.h>
+ 
++#ifdef __CYGWIN__
++#define _IO(type,nr)   _IOC(_IOC_NONE,(type),(nr),0)
++#endif /* __CYGWIN__ */
++
+ /* Exit codes used by fsck-type programs */
+ #define FSCK_OK          0	/* No errors */
+ #define FSCK_NONDESTRUCT 1	/* File system errors corrected */
diff --git a/package/cramfs/cramfs-03-cygwin_IO.patch b/package/cramfs/cramfs-03-cygwin_IO.patch
deleted file mode 100644
index 4ea358ede3..0000000000
--- a/package/cramfs/cramfs-03-cygwin_IO.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cramfs-1.1/cramfsck.c.orig	2006-12-22 22:16:59.328125000 +1100
-+++ cramfs-1.1/cramfsck.c	2006-12-19 01:02:05.531250000 +1100
-@@ -56,6 +56,10 @@
- #include "linux/cramfs_fs.h"
- #include <zlib.h>
- 
-+#ifdef __CYGWIN__
-+#define _IO(type,nr)	_IOC(_IOC_NONE,(type),(nr),0)
-+#endif /* __CYGWIN__ */
-+
- #define BLKGETSIZE	_IO(0x12,96) /* return device size /512 (long *arg) */
- 
- /* Exit codes used by fsck-type programs */

From c1485d51e8d66c0608935135ef41f5c5deabc587 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Tue, 20 Sep 2011 17:01:26 +0800
Subject: [PATCH 0879/6849] Add vmlinuz support in Kernel binary format for
 MIPS.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++++
 linux/linux.mk  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 469fd7ca9a..0082ca88de 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -148,6 +148,10 @@ config BR2_LINUX_KERNEL_VMLINUX
 	bool "vmlinux"
 	depends on BR2_mips || BR2_mipsel || BR2_powerpc
 
+config BR2_LINUX_KERNEL_VMLINUZ
+	bool "vmlinuz"
+	depends on BR2_mips || BR2_mipsel
+
 config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
 	bool "custom target"
 	help
diff --git a/linux/linux.mk b/linux/linux.mk
index 6b6fd5c4ae..9beb706453 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -65,6 +65,8 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
 LINUX_IMAGE_NAME=vmlinux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
 LINUX_IMAGE_NAME=vmlinux
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
+LINUX_IMAGE_NAME=vmlinuz
 endif
 endif
 
@@ -82,6 +84,8 @@ endif
 
 ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
 LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
+LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else
 ifeq ($(KERNEL_ARCH),avr32)
 LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)

From 30bcdbbb70bd5943949c738702b0b38f12a1f325 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Tue, 20 Sep 2011 17:01:27 +0800
Subject: [PATCH 0880/6849] live555: install to staging

Install live555 library to staging for mplayer.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/live555/live555.mk | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
index 0051ea0684..9e0ef14bdd 100644
--- a/package/multimedia/live555/live555.mk
+++ b/package/multimedia/live555/live555.mk
@@ -7,6 +7,7 @@
 LIVE555_VERSION = 2011.06.16
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
 LIVE555_SITE = http://www.live555.com/liveMedia/public/
+LIVE555_INSTALL_STAGING = YES
 LIVE555_INSTALL_TARGET = YES
 
 define LIVE555_CONFIGURE_CMDS
@@ -26,6 +27,18 @@ define LIVE555_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
+LIVE555_HEADERS_TO_INSTALL = \
+	liveMedia/include \
+	groupsock/include \
+	UsageEnvironment/include \
+	BasicUsageEnvironment/include
+
+LIVE555_LIBS_TO_INSTALL = \
+	liveMedia/libliveMedia.a \
+	groupsock/libgroupsock.a \
+	UsageEnvironment/libUsageEnvironment.a \
+	BasicUsageEnvironment/libBasicUsageEnvironment.a
+
 LIVE555_FILES_TO_INSTALL- =
 LIVE555_FILES_TO_INSTALL-y =
 LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP
@@ -33,12 +46,29 @@ LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live5
 LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer
 LIVE555_FILES_TO_INSTALL- += $(LIVE555_FILES_TO_INSTALL-y)
 
+define LIVE555_INSTALL_STAGING_CMDS
+	for i in $(LIVE555_HEADERS_TO_INSTALL); do \
+		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+	done; \
+	for i in $(LIVE555_LIBS_TO_INSTALL); do \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
+	done
+endef
+
 define LIVE555_INSTALL_TARGET_CMDS
 	for i in $(LIVE555_FILES_TO_INSTALL-y); do \
 		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i`; \
 	done
 endef
 
+define LIVE555_UNINSTALL_STAGING_CMDS
+	rm -rf $(STAGING_DIR)/usr/include/live
+	for i in $(LIVE555_LIBS_TO_INSTALL); do \
+		rm -f $(addprefix $(STAGING_DIR)/usr/lib/, `basename $$i`); \
+	done
+endef
+
 define LIVE555_UNINSTALL_TARGET_CMDS
 	for i in $(LIVE555_FILES_TO_INSTALL-); do \
 		rm -f $(addprefix $(TARGET_DIR)/usr/bin/, `basename $$i`); \

From 939f0074ec4a7764647b8bdadcaa0d0403e0d9d9 Mon Sep 17 00:00:00 2001
From: Phil Edworthy <phil.edworthy@renesas.com>
Date: Wed, 19 Oct 2011 11:59:40 +0100
Subject: [PATCH 0881/6849] sh: Add ttySC* to securetty

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/securetty | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/skeleton/etc/securetty b/fs/skeleton/etc/securetty
index 4ab956f0f2..6c07d7f4fe 100644
--- a/fs/skeleton/etc/securetty
+++ b/fs/skeleton/etc/securetty
@@ -42,3 +42,7 @@ ttyAM1
 ttyAM2
 ttySC0
 ttySC1
+ttySC2
+ttySC3
+ttySC4
+ttySC5

From 9b3526f56af35ae1db41b3620513f7065dcfc8d4 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Wed, 19 Oct 2011 12:35:56 +0200
Subject: [PATCH 0882/6849] Add libmodbus package

Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/libmodbus/Config.in    |  8 ++++++++
 package/libmodbus/libmodbus.mk | 11 +++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/libmodbus/Config.in
 create mode 100644 package/libmodbus/libmodbus.mk

diff --git a/package/Config.in b/package/Config.in
index c6ca350bbc..33dd59e3bd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -333,6 +333,7 @@ source "package/libidn/Config.in"
 source "package/libmicrohttpd/Config.in"
 source "package/neon/Config.in"
 source "package/libmnl/Config.in"
+source "package/libmodbus/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
diff --git a/package/libmodbus/Config.in b/package/libmodbus/Config.in
new file mode 100644
index 0000000000..ccf11906fc
--- /dev/null
+++ b/package/libmodbus/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBMODBUS
+	bool "libmodbus"
+	help
+	  libmodbus is a free software library to send/receive data according
+	  to the Modbus protocol. This library is written in C and supports
+	  RTU (serial) and TCP (Ethernet) communications.
+
+	  http://libmodbus.org
diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
new file mode 100644
index 0000000000..ab134fdb4c
--- /dev/null
+++ b/package/libmodbus/libmodbus.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# libmodbus
+#
+#############################################################
+LIBMODBUS_VERSION = 3.0.1
+LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
+LIBMODBUS_SOURCE = libmodbus-$(LIBMODBUS_VERSION).tar.gz
+LIBMODBUS_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From 934fb90437e06209145387d9bdfe8a8b5426d31d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 23 Oct 2011 20:51:12 +0200
Subject: [PATCH 0883/6849] crosstool-ng: fix ccache dependencies order

avoid gawk complaining when running 'make ctng-menuconfig' in a
clean/distclean tree in which ccache and crosstool-ng are enabled

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 8f53a77c87..84e218e9d3 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -4,6 +4,6 @@ CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO
 CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
-HOST_CROSSTOOL_NG_DEPENDENCIES = host-gawk host-automake $(if $(BR2_CCACHE),host-ccache)
+HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake
 
 $(eval $(call AUTOTARGETS,host))

From de23afb030d5c762701ba83b6cde3ef4fdd02352 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Tue, 25 Oct 2011 11:52:11 +0200
Subject: [PATCH 0884/6849] udev: install in staging

will provide libudev.h and libudev.so in staging

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/udev.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 78c243f23f..1825396c34 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -6,6 +6,7 @@
 UDEV_VERSION = 173
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
+UDEV_INSTALL_STAGING = YES
 
 UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\

From d384d6cf3209e3f04b9c94c9719f9ee5c7e513c5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Oct 2011 09:19:58 -0300
Subject: [PATCH 0885/6849] dnsmasq: bump to version 2.59

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 1b2b95b105..0f8db9d68d 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.58
+DNSMASQ_VERSION = 2.59
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

From eb8f0522f89c3f679fe73d1acff673110fe38107 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Oct 2011 09:19:59 -0300
Subject: [PATCH 0886/6849] freetype: security bump to version 2.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index fe6e5d6979..142a1ec69e 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -3,11 +3,11 @@
 # freetype
 #
 #############################################################
-FREETYPE_VERSION = 2.4.6
+
+FREETYPE_VERSION = 2.4.7
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES
-FREETYPE_INSTALL_TARGET = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_DEPENDENCIES = host-pkg-config $(if $(BR2_PACKAGE_ZLIB),zlib)
 

From 2c8502e8211d6153830929110611ce18956ae42c Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 19 Oct 2011 09:36:02 +0200
Subject: [PATCH 0887/6849] /etc/profile: read in /etc/profile.d/*.sh files

For custom projects, it is more maintainable to add custom profile settings
in a separate file, than directly in /etc/profile.

This patch modifies /etc/profile to read in *.sh files from /etc/profile.d/,
a technique commonly used in Linux distributions.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/profile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/skeleton/etc/profile b/fs/skeleton/etc/profile
index cc2e0beb87..31d3180c0d 100644
--- a/fs/skeleton/etc/profile
+++ b/fs/skeleton/etc/profile
@@ -46,3 +46,10 @@ if [ "$PS1" ]; then
     alias calc='calc -Cd '
     alias bc='calc -Cd '
 fi;
+
+# Source configuration files from /etc/profile.d
+for i in /etc/profile.d/*.sh ; do
+    if [ -r "$i" ]; then
+        . $i
+    fi
+done

From 92bf824b7d71ba735f40d3d43c116dea1cddde72 Mon Sep 17 00:00:00 2001
From: Danomi Mocelopolis <d_mo1234@yahoo.com>
Date: Fri, 28 Oct 2011 15:09:23 +0200
Subject: [PATCH 0888/6849] lighttpd: add lua support

Closes #4381

Signed-off-by: Danomi Mocelopolis <d_mo1234@yahoo.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                      | 1 +
 package/lighttpd/Config.in   | 7 +++++++
 package/lighttpd/lighttpd.mk | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9957d58bd3..74ec64facf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -69,6 +69,7 @@
 	#4171: makedevs-unused-but-set-variable.patch
 	#4183: Codesourcery toolchain download site has changed
 	#4231: libneon.so: undefined reference to `SSL_SESSION_cmp'
+	#4381: Add option to lighttpd to enable Lua support
 
 2011.08, Released August 31th, 2011:
 
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index a822d9021d..cb759ff465 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -44,4 +44,11 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV
 	help
 	  Enable webdav support. Needed to support mod_webdav
 
+config BR2_PACKAGE_LIGHTTPD_LUA
+	bool "lua support"
+	depends on BR2_PACKAGE_LIGHTTPD
+	select BR2_PACKAGE_LUA
+	help
+	  Enable Lua support. Needed to support mod_magnet
+
 endif
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 10aa4c8e46..3f11be33bb 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -49,6 +49,13 @@ else
 LIGHTTPD_CONF_OPT += --without-webdav-props --without-webdav-locks
 endif
 
+ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y)
+LIGHTTPD_DEPENDENCIES += lua
+LIGHTTPD_CONF_OPT += --with-lua
+else
+LIGHTTPD_CONF_OPT += --without-lua
+endif
+
 define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/lighttpd
 	rm -f $(TARGET_DIR)/usr/sbin/lighttpd-angel

From db697f96b77199c015f57a9fdfd5dd7f0374b8bb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Oct 2011 09:32:09 -0300
Subject: [PATCH 0889/6849] ntfsprogs: mark as deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfsprogs/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in
index 836a2b6fe4..561c1d4488 100644
--- a/package/ntfsprogs/Config.in
+++ b/package/ntfsprogs/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_NTFSPROGS
 	bool "ntfsprogs"
 	depends on BR2_USE_WCHAR
 	depends on BR2_LARGEFILE
+	depends on BR2_DEPRECATED
 	help
 	  wide collection of NTFS utilities
 

From fb97591e228b19f40c840f99893830b2dd022ab5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Oct 2011 09:32:10 -0300
Subject: [PATCH 0890/6849] ntfs-3g: bump to version 2011.4.12 and enhance

ntfsprogs is now included into ntfs-3g so add an option to
enable/disable it.
It probably doesn't make sense to build ntfsprogs alone so it's not
implemented.

Add the encrypted volume support option now that we've got gnutls.

Also add support for libuuid if it's present.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/Config.in  | 15 +++++++++++++++
 package/ntfs-3g/ntfs-3g.mk | 23 +++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index 865f9b41f7..5301038896 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -12,5 +12,20 @@ config BR2_PACKAGE_NTFS_3G
 
 	  http://www.ntfs-3g.org/
 
+if BR2_PACKAGE_NTFS_3G
+
+config BR2_PACKAGE_NTFS_3G_ENCRYPTED
+	bool "encrypted volumes"
+	select BR2_PACKAGE_GNUTLS
+	help
+	  Enable support for NTFS encrypted volumes.
+
+config BR2_PACKAGE_NTFS_3G_NTFSPROGS
+	bool "ntfsprogs"
+	help
+	  Install NTFS utilities.
+
+endif
+
 comment "ntfs-3g requires a toolchain with LARGEFILE and WCHAR support"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 99fc20cb33..f6462bb0bb 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -4,10 +4,29 @@
 #
 #############################################################
 
-NTFS_3G_VERSION = 2010.10.2
-NTFS_3G_SOURCE = ntfs-3g-$(NTFS_3G_VERSION).tgz
+NTFS_3G_VERSION = 2011.4.12
+NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
 NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
+NTFS_3G_DEPENDENCIES = host-pkg-config
+
+ifeq ($(BR2_PACKAGE_LIBFUSE),y)
+	NTFS_3G_CONF_OPT += --with-fuse=external
+	NTFS_3G_DEPENDENCIES += libfuse
+endif
+
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
+	NTFS_3G_DEPENDENCIES += util-linux
+endif
+
+ifeq ($(BR2_PACKAGE_NTFS_3G_ENCRYPTED),y)
+	NTFS_3G_CONF_OPT += --enable-crypto
+	NTFS_3G_DEPENDENCIES += gnutls
+endif
+
+ifneq ($(BR2_PACKAGE_NTFS_3G_NTFSPROGS),y)
+	NTFS_3G_CONF_OPT += --disable-ntfsprogs
+endif
 
 $(eval $(call AUTOTARGETS))

From f3c4d8e53398850f96eae6d3f9a59303d3003e64 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 29 Oct 2011 15:00:22 +0200
Subject: [PATCH 0891/6849] busybox: bump 1.19.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |  2 +-
 .../busybox-1.19.2-buildsys.patch             | 19 -------
 .../busybox-1.19.2-chpasswd.patch             | 55 -------------------
 .../busybox-1.19.2/busybox-1.19.2-crond.patch | 12 ----
 .../busybox-1.19.2/busybox-1.19.2-inetd.patch | 47 ----------------
 .../busybox-1.19.2-syslogd.patch              | 20 -------
 .../busybox-1.19.2/busybox-1.19.2-tail.patch  | 43 ---------------
 .../busybox-1.19.2/busybox-1.19.2-tftp.patch  | 12 ----
 8 files changed, 1 insertion(+), 209 deletions(-)
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch
 delete mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 52aef86307..4176020d36 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -41,7 +41,7 @@ config BR2_BUSYBOX_VERSION
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
-	default "1.19.2"	if BR2_BUSYBOX_VERSION_1_19_X
+	default "1.19.3"	if BR2_BUSYBOX_VERSION_1_19_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch
deleted file mode 100644
index 8e0c4c33ee..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- busybox-1.19.2/applets/applet_tables.c
-+++ busybox-1.19.2-buildsys/applets/applet_tables.c
-@@ -80,8 +80,15 @@ int main(int argc, char **argv)
- 
- 	printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
- 	if (NUM_APPLETS == 1) {
-+		char *dash_to_underscore, *p;
- 		printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
--		printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
-+		/* Example: "ether-wake" -> "ether_wake" */
-+		p = dash_to_underscore = strdup(applets[0].name);
-+		p--;
-+		while (*++p)
-+			if (*p == '-')
-+				*p = '_';
-+		printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore);
- 	}
- 	printf("\n");
- 
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch
deleted file mode 100644
index 0cba0e219a..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-chpasswd.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- busybox-1.19.2/loginutils/chpasswd.c
-+++ busybox-1.19.2-chpasswd/loginutils/chpasswd.c
-@@ -33,9 +33,8 @@ static const char chpasswd_longopts[] AL
- int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int chpasswd_main(int argc UNUSED_PARAM, char **argv)
- {
--	char *name, *pass;
--	char salt[sizeof("$N$XXXXXXXX")];
--	int opt, rc;
-+	char *name;
-+	int opt;
- 
- 	if (getuid() != 0)
- 		bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-@@ -45,6 +44,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
- 	opt = getopt32(argv, "em");
- 
- 	while ((name = xmalloc_fgetline(stdin)) != NULL) {
-+		char *free_me;
-+		char *pass;
-+		int rc;
-+
- 		pass = strchr(name, ':');
- 		if (!pass)
- 			bb_error_msg_and_die("missing new password");
-@@ -52,7 +55,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
- 
- 		xuname2uid(name); /* dies if there is no such user */
- 
-+		free_me = NULL;
- 		if (!(opt & OPT_ENC)) {
-+			char salt[sizeof("$N$XXXXXXXX")];
-+
- 			crypt_make_salt(salt, 1);
- 			if (opt & OPT_MD5) {
- 				salt[0] = '$';
-@@ -60,7 +66,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
- 				salt[2] = '$';
- 				crypt_make_salt(salt + 3, 4);
- 			}
--			pass = pw_encrypt(pass, salt, 0);
-+			free_me = pass = pw_encrypt(pass, salt, 0);
- 		}
- 
- 		/* This is rather complex: if user is not found in /etc/shadow,
-@@ -81,8 +87,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
- 			bb_info_msg("Password for '%s' changed", name);
- 		logmode = LOGMODE_STDIO;
- 		free(name);
--		if (!(opt & OPT_ENC))
--			free(pass);
-+		free(free_me);
- 	}
- 	return EXIT_SUCCESS;
- }
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch
deleted file mode 100644
index 043a846ca4..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-crond.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.19.2/miscutils/crond.c
-+++ busybox-1.19.2-crond/miscutils/crond.c
-@@ -861,7 +861,8 @@ int crond_main(int argc UNUSED_PARAM, ch
- 
- 	/* "-b after -f is ignored", and so on for every pair a-b */
- 	opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
--			":l+:d+"; /* -l and -d have numeric param */
-+			/* -l and -d have numeric param */
-+			":l+" IF_FEATURE_CROND_D(":d+");
- 	opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
- 			&G.log_level, &G.log_filename, &G.crontab_dir_name
- 			IF_FEATURE_CROND_D(,&G.log_level));
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch
deleted file mode 100644
index e1395a6b3b..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-inetd.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- busybox-1.19.2/networking/inetd.c
-+++ busybox-1.19.2-inetd/networking/inetd.c
-@@ -1278,6 +1278,7 @@ int inetd_main(int argc UNUSED_PARAM, ch
- 							sep->se_count = 0;
- 							rearm_alarm(); /* will revive it in RETRYTIME sec */
- 							restore_sigmask(&omask);
-+							maybe_close(new_udp_fd);
- 							maybe_close(accepted_fd);
- 							continue; /* -> check next fd in fd set */
- 						}
-@@ -1298,17 +1299,18 @@ int inetd_main(int argc UNUSED_PARAM, ch
- 					bb_perror_msg("vfork"+1);
- 					sleep(1);
- 					restore_sigmask(&omask);
-+					maybe_close(new_udp_fd);
- 					maybe_close(accepted_fd);
- 					continue; /* -> check next fd in fd set */
- 				}
- 				if (pid == 0)
- 					pid--; /* -1: "we did fork and we are child" */
- 			}
--			/* if pid == 0 here, we never forked */
-+			/* if pid == 0 here, we didn't fork */
- 
- 			if (pid > 0) { /* parent */
- 				if (sep->se_wait) {
--					/* tcp wait: we passed listening socket to child,
-+					/* wait: we passed socket to child,
- 					 * will wait for child to terminate */
- 					sep->se_wait = pid;
- 					remove_fd_from_set(sep->se_fd);
-@@ -1345,9 +1347,13 @@ int inetd_main(int argc UNUSED_PARAM, ch
- 			setsid();
- 			/* "nowait" udp */
- 			if (new_udp_fd >= 0) {
--				len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
-+				len_and_sockaddr *lsa;
-+				int r;
-+
-+				close(new_udp_fd);
-+				lsa = xzalloc_lsa(sep->se_family);
- 				/* peek at the packet and remember peer addr */
--				int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
-+				r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
- 					&lsa->u.sa, &lsa->len);
- 				if (r < 0)
- 					goto do_exit1;
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch
deleted file mode 100644
index d54f5d4307..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.19.2/sysklogd/syslogd.c
-+++ busybox-1.19.2-syslogd/sysklogd/syslogd.c
-@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char 
- 	parser_t *parser;
- 
- 	parser = config_open2(file ? file : "/etc/syslog.conf",
--				file ? xfopen_for_read : fopen_or_warn_stdin);
-+				file ? xfopen_for_read : fopen_for_read);
- 	if (!parser)
- 		/* didn't find default /etc/syslog.conf */
- 		/* proceed as if we built busybox without config support */
-@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c
- 	if (LOG_PRI(pri) < G.logLevel) {
- #if ENABLE_FEATURE_IPC_SYSLOG
- 		if ((option_mask32 & OPT_circularlog) && G.shbuf) {
--			log_to_shmem(msg);
-+			log_to_shmem(G.printbuf);
- 			return;
- 		}
- #endif
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch
deleted file mode 100644
index f3cc79814e..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-tail.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- busybox-1.19.2/coreutils/tail.c
-+++ busybox-1.19.2-tail/coreutils/tail.c
-@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv)
- 		int fd = fds[i];
- 
- 		if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
--			continue; /* may happen with -E */
-+			continue; /* may happen with -F */
- 
- 		if (nfiles > header_threshhold) {
- 			tail_xprint_header(fmt, argv[i]);
-@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv)
- 		 * Used only by +N code ("start from Nth", 1-based): */
- 		seen = 1;
- 		newlines_seen = 0;
--		while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) {
-+		while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
- 			if (G.from_top) {
- 				int nwrite = nread;
- 				if (seen < count) {
- 					/* We need to skip a few more bytes/lines */
- 					if (COUNT_BYTES) {
- 						nwrite -= (count - seen);
--						seen = count;
-+						seen += nread;
- 					} else {
- 						char *s = buf;
- 						do {
---- busybox-1.19.2/testsuite/tail.tests
-+++ busybox-1.19.2-tail/testsuite/tail.tests
-@@ -14,4 +14,12 @@ testing "tail: +N with N > file length" 
- 	"0\n" \
- 	"" "qw"
- 
-+testing "tail: -c +N with largish N" \
-+	"
-+	dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c;
-+	dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c;
-+	" \
-+	"8185\n8177\n" \
-+	"" ""
-+
- exit $FAILCOUNT
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch
deleted file mode 100644
index 15dc9e1d13..0000000000
--- a/package/busybox/busybox-1.19.2/busybox-1.19.2-tftp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.19.2/networking/tftp.c
-+++ busybox-1.19.2-tftp/networking/tftp.c
-@@ -813,7 +813,8 @@ int tftpd_main(int argc UNUSED_PARAM, ch
- 		goto err;
- 	}
- 	mode = local_file + strlen(local_file) + 1;
--	if (mode >= block_buf + result || strcmp(mode, "octet") != 0) {
-+	/* RFC 1350 says mode string is case independent */
-+	if (mode >= block_buf + result || strcasecmp(mode, "octet") != 0) {
- 		goto err;
- 	}
- # if ENABLE_FEATURE_TFTP_BLOCKSIZE

From 296eb11299d1240b3570aba5abb8374a0911bf44 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 29 Oct 2011 16:35:47 +0200
Subject: [PATCH 0892/6849] pulseaudio: needs host-intltool

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 5e68dfbaeb..a2d055239f 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -14,7 +14,7 @@ PULSEAUDIO_CONF_OPT = \
 	--disable-legacy-database-entry-format
 
 PULSEAUDIO_DEPENDENCIES = \
-	host-pkg-config libtool json-c libsndfile speex \
+	host-pkg-config libtool json-c libsndfile speex host-intltool \
 	$(if $(BR2_PACKAGE_LIBINTL),libintl) \
 	$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \

From c872a748b0ac0ea832d36e44a6700d750e618034 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 1 Nov 2011 11:58:31 +0100
Subject: [PATCH 0893/6849] toolchain/ct-ng: update to 1.13.0

Update the version in the package description. Update the default
configuration files for the three different C libraries.

[Peter: Removed unneeded changes as noticed by Baruch Siach]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk          |  2 +-
 .../crosstool-ng.config-eglibc                | 99 +++++++++++--------
 .../crosstool-ng.config-glibc                 | 89 +++++++++--------
 .../crosstool-ng.config-uClibc                | 83 +++++++++-------
 4 files changed, 153 insertions(+), 120 deletions(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 84e218e9d3..f6766972ce 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.12.1
+CROSSTOOL_NG_VERSION           = 1.13.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 66744bc078..682afb112e 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,14 +1,11 @@
 #
 # Automatically generated make config: don't edit
-# The crosstool-NG configuration menu
-# Sun Aug  7 15:40:17 2011
+# crosstool-NG 1.13.0 Configuration
+# Sat Oct 29 16:35:00 2011
 #
+CT_CONFIGURE_has_xzutils=y
 CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
-CT_CONFIGURE_static_link_ok=y
-CT_CONFIGURE_has_static_libstdcxx=y
-CT_CONFIGURE_has_expat=y
-CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -39,9 +36,9 @@ CT_REMOVE_DOCS=y
 #
 # CT_FORBID_DOWNLOAD is not set
 # CT_FORCE_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
 CT_CONNECT_TIMEOUT=10
 # CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
 
 #
 # Extracting
@@ -65,11 +62,12 @@ CT_PATCH_ORDER="bundled"
 #
 # Build options hiden
 #
-CT_PARALLEL_JOBS=1
+CT_PARALLEL_JOBS=0
 CT_LOAD=0
 CT_USE_PIPES=y
-CT_CONFIG_SHELL="custom"
+CT_EXTRA_FLAGS_FOR_HOST=""
 CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
+CT_CONFIG_SHELL="/bin/sh"
 
 #
 # Logging
@@ -88,25 +86,31 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="x86"
+CT_ARCH="arm"
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
+CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_DEFAULT_HAS_MMU=y
+CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
-# CT_ARCH_32 is not set
-CT_ARCH_64=y
-CT_ARCH_BITNESS=64
-CT_ARCH_FLOAT_HW=y
-# CT_ARCH_FLOAT_SW is not set
+CT_ARCH_FPU=""
+CT_ARCH_BE=y
+# CT_ARCH_LE is not set
+CT_ARCH_32=y
+CT_ARCH_BITNESS=32
+# CT_ARCH_FLOAT_HW is not set
+CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-CT_ARCH_x86=y
-CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_arm=y
+CT_ARCH_arm_AVAILABLE=y
 
 #
 # Generic target options
@@ -117,6 +121,13 @@ CT_ARCH_USE_MMU=y
 # Target optimisations
 #
 
+#
+# arm other options
+#
+CT_ARCH_ARM_MODE="arm"
+CT_ARCH_ARM_MODE_ARM=y
+CT_ARCH_ARM_EABI=y
+
 #
 # Toolchain options
 #
@@ -128,7 +139,7 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
-CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_WANTS_STATIC_LINK=y
 CT_TOOLCHAIN_PKGVERSION=""
 CT_TOOLCHAIN_BUGURL=""
 
@@ -137,7 +148,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
+CT_TARGET_ALIAS="armeb-linux"
 
 #
 # Toolchain type
@@ -157,23 +168,22 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.8"
+CT_KERNEL_VERSION="2.6.39.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+# CT_KERNEL_V_3_0_4 is not set
+# CT_KERNEL_V_3_0_3 is not set
+# CT_KERNEL_V_3_0_2 is not set
+# CT_KERNEL_V_3_0_1 is not set
 # CT_KERNEL_V_3_0 is not set
-# CT_KERNEL_V_2_6_39_3 is not set
-# CT_KERNEL_V_2_6_39_2 is not set
-# CT_KERNEL_V_2_6_39_1 is not set
-# CT_KERNEL_V_2_6_39 is not set
-CT_KERNEL_V_2_6_38_8=y
+CT_KERNEL_V_2_6_39_4=y
+# CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_35_14 is not set
 # CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_16 is not set
-# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_33_19 is not set
+# CT_KERNEL_V_2_6_32_46 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_59 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
@@ -200,12 +210,11 @@ CT_ARCH_BINFMT_ELF=y
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_20_1 is not set
-CT_BINUTILS_V_2_20=y
-# CT_BINUTILS_V_2_19_1 is not set
-# CT_BINUTILS_V_2_19 is not set
-# CT_BINUTILS_V_2_18 is not set
-CT_BINUTILS_VERSION="2.20"
+# CT_BINUTILS_V_2_21_1a is not set
+CT_BINUTILS_V_2_20_1a=y
+# CT_BINUTILS_V_2_19_1a is not set
+# CT_BINUTILS_V_2_18a is not set
+CT_BINUTILS_VERSION="2.20.1a"
 CT_BINUTILS_2_20_or_later=y
 CT_BINUTILS_2_19_or_later=y
 CT_BINUTILS_2_18_or_later=y
@@ -257,7 +266,7 @@ CT_CC_SUPPORT_OBJCXX=y
 #
 # Additional supported languages:
 #
-# CT_CC_LANG_CXX is not set
+CT_CC_LANG_CXX=y
 # CT_CC_LANG_JAVA is not set
 
 #
@@ -293,21 +302,23 @@ CT_CC_GCC_LDBL_128=m
 # C-library
 #
 CT_LIBC="eglibc"
-CT_LIBC_VERSION="2_10"
+CT_LIBC_VERSION="2_12"
 CT_LIBC_eglibc=y
 CT_LIBC_eglibc_AVAILABLE=y
-# CT_LIBC_EGLIBC_V_2_12 is not set
+CT_LIBC_EGLIBC_V_2_12=y
 # CT_LIBC_EGLIBC_V_2_11 is not set
-CT_LIBC_EGLIBC_V_2_10=y
+# CT_LIBC_EGLIBC_V_2_10 is not set
 # CT_LIBC_EGLIBC_V_2_9 is not set
 # CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_LIBC_EGLIBC_2_12_or_later=y
+CT_LIBC_EGLIBC_2_11_or_later=y
 CT_LIBC_EGLIBC_2_10_or_later=y
 CT_LIBC_EGLIBC_2_9_or_later=y
 CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL=y
 CT_EGLIBC_REVISION="HEAD"
 # CT_EGLIBC_HTTP is not set
 # CT_EGLIBC_CHECKOUT is not set
-# CT_EGLIBC_OPT_SIZE is not set
+CT_EGLIBC_OPT_SIZE=y
 # CT_EGLIBC_CUSTOM_CONFIG is not set
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_NPTL=y
@@ -324,6 +335,7 @@ CT_LIBC_XLDD=y
 #
 # eglibc other options
 #
+CT_LIBC_GLIBC_MAY_FORCE_PORTS=y
 CT_LIBC_glibc_familly=y
 CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_LIBC_GLIBC_CONFIGPARMS=""
@@ -354,10 +366,11 @@ CT_LIBC_ADDONS_LIST=""
 #
 #   or try again later... :-(                            
 #
+# CT_LIBC_LOCALES is not set
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.8"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.39.4"
 
 #
 # Debug facilities
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 9513432fdc..8fb90b8540 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,14 +1,11 @@
 #
 # Automatically generated make config: don't edit
-# The crosstool-NG configuration menu
-# Sun Aug  7 15:49:35 2011
+# crosstool-NG 1.13.0 Configuration
+# Sat Oct 29 16:14:07 2011
 #
+CT_CONFIGURE_has_xzutils=y
 CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
-CT_CONFIGURE_static_link_ok=y
-CT_CONFIGURE_has_static_libstdcxx=y
-CT_CONFIGURE_has_expat=y
-CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -39,9 +36,9 @@ CT_REMOVE_DOCS=y
 #
 # CT_FORBID_DOWNLOAD is not set
 # CT_FORCE_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
 CT_CONNECT_TIMEOUT=10
 # CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
 
 #
 # Extracting
@@ -65,11 +62,12 @@ CT_PATCH_ORDER="bundled"
 #
 # Build options hiden
 #
-CT_PARALLEL_JOBS=1
+CT_PARALLEL_JOBS=0
 CT_LOAD=0
 CT_USE_PIPES=y
-CT_CONFIG_SHELL="custom"
+CT_EXTRA_FLAGS_FOR_HOST=""
 CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
+CT_CONFIG_SHELL="/bin/sh"
 
 #
 # Logging
@@ -88,25 +86,31 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="x86"
+CT_ARCH="arm"
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
+CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_DEFAULT_HAS_MMU=y
+CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
-# CT_ARCH_32 is not set
-CT_ARCH_64=y
-CT_ARCH_BITNESS=64
-CT_ARCH_FLOAT_HW=y
-# CT_ARCH_FLOAT_SW is not set
+CT_ARCH_FPU=""
+CT_ARCH_BE=y
+# CT_ARCH_LE is not set
+CT_ARCH_32=y
+CT_ARCH_BITNESS=32
+# CT_ARCH_FLOAT_HW is not set
+CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-CT_ARCH_x86=y
-CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_arm=y
+CT_ARCH_arm_AVAILABLE=y
 
 #
 # Generic target options
@@ -117,6 +121,13 @@ CT_ARCH_USE_MMU=y
 # Target optimisations
 #
 
+#
+# arm other options
+#
+CT_ARCH_ARM_MODE="arm"
+CT_ARCH_ARM_MODE_ARM=y
+CT_ARCH_ARM_EABI=y
+
 #
 # Toolchain options
 #
@@ -128,7 +139,7 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
-CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_WANTS_STATIC_LINK=y
 CT_TOOLCHAIN_PKGVERSION=""
 CT_TOOLCHAIN_BUGURL=""
 
@@ -137,7 +148,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
+CT_TARGET_ALIAS="armeb-linux"
 
 #
 # Toolchain type
@@ -157,23 +168,22 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.0"
+CT_KERNEL_VERSION="2.6.39.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_3_0=y
-# CT_KERNEL_V_2_6_39_3 is not set
-# CT_KERNEL_V_2_6_39_2 is not set
-# CT_KERNEL_V_2_6_39_1 is not set
-# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_3_0_4 is not set
+# CT_KERNEL_V_3_0_3 is not set
+# CT_KERNEL_V_3_0_2 is not set
+# CT_KERNEL_V_3_0_1 is not set
+# CT_KERNEL_V_3_0 is not set
+CT_KERNEL_V_2_6_39_4=y
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_35_14 is not set
 # CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_16 is not set
-# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_33_19 is not set
+# CT_KERNEL_V_2_6_32_46 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_59 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
@@ -200,12 +210,11 @@ CT_ARCH_BINFMT_ELF=y
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_20_1 is not set
-CT_BINUTILS_V_2_20=y
-# CT_BINUTILS_V_2_19_1 is not set
-# CT_BINUTILS_V_2_19 is not set
-# CT_BINUTILS_V_2_18 is not set
-CT_BINUTILS_VERSION="2.20"
+# CT_BINUTILS_V_2_21_1a is not set
+CT_BINUTILS_V_2_20_1a=y
+# CT_BINUTILS_V_2_19_1a is not set
+# CT_BINUTILS_V_2_18a is not set
+CT_BINUTILS_VERSION="2.20.1a"
 CT_BINUTILS_2_20_or_later=y
 CT_BINUTILS_2_19_or_later=y
 CT_BINUTILS_2_18_or_later=y
@@ -257,7 +266,7 @@ CT_CC_SUPPORT_OBJCXX=y
 #
 # Additional supported languages:
 #
-# CT_CC_LANG_CXX is not set
+CT_CC_LANG_CXX=y
 # CT_CC_LANG_JAVA is not set
 
 #
@@ -308,6 +317,7 @@ CT_THREADS="nptl"
 #
 CT_THREADS_NPTL=y
 CT_LIBC_XLDD=y
+CT_LIBC_GLIBC_MAY_FORCE_PORTS=y
 CT_LIBC_glibc_familly=y
 CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_LIBC_GLIBC_CONFIGPARMS=""
@@ -318,10 +328,11 @@ CT_LIBC_OLDEST_ABI=""
 CT_LIBC_GLIBC_FORCE_UNWIND=y
 CT_LIBC_GLIBC_USE_PORTS=y
 CT_LIBC_ADDONS_LIST=""
+# CT_LIBC_LOCALES is not set
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.0"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.39.4"
 
 #
 # glibc other options
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 52969231a5..7f7b3e2553 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,14 +1,11 @@
 #
 # Automatically generated make config: don't edit
-# The crosstool-NG configuration menu
-# Sun Aug  7 15:06:46 2011
+# crosstool-NG 1.13.0 Configuration
+# Sat Oct 29 17:00:56 2011
 #
+CT_CONFIGURE_has_xzutils=y
 CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
-CT_CONFIGURE_static_link_ok=y
-CT_CONFIGURE_has_static_libstdcxx=y
-CT_CONFIGURE_has_expat=y
-CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -39,9 +36,9 @@ CT_REMOVE_DOCS=y
 #
 # CT_FORBID_DOWNLOAD is not set
 # CT_FORCE_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
 CT_CONNECT_TIMEOUT=10
 # CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
 
 #
 # Extracting
@@ -65,11 +62,12 @@ CT_PATCH_ORDER="bundled"
 #
 # Build options hiden
 #
-CT_PARALLEL_JOBS=1
+CT_PARALLEL_JOBS=0
 CT_LOAD=0
 CT_USE_PIPES=y
-CT_CONFIG_SHELL="custom"
+CT_EXTRA_FLAGS_FOR_HOST=""
 CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
+CT_CONFIG_SHELL="/bin/sh"
 
 #
 # Logging
@@ -88,25 +86,31 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="x86"
+CT_ARCH="arm"
+CT_ARCH_SUPPORTS_BOTH_MMU=y
+CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
+CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_DEFAULT_HAS_MMU=y
+CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
-# CT_ARCH_32 is not set
-CT_ARCH_64=y
-CT_ARCH_BITNESS=64
-CT_ARCH_FLOAT_HW=y
-# CT_ARCH_FLOAT_SW is not set
+CT_ARCH_FPU=""
+CT_ARCH_BE=y
+# CT_ARCH_LE is not set
+CT_ARCH_32=y
+CT_ARCH_BITNESS=32
+# CT_ARCH_FLOAT_HW is not set
+CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-CT_ARCH_x86=y
-CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_arm=y
+CT_ARCH_arm_AVAILABLE=y
 
 #
 # Generic target options
@@ -117,6 +121,13 @@ CT_ARCH_USE_MMU=y
 # Target optimisations
 #
 
+#
+# arm other options
+#
+CT_ARCH_ARM_MODE="arm"
+CT_ARCH_ARM_MODE_ARM=y
+CT_ARCH_ARM_EABI=y
+
 #
 # Toolchain options
 #
@@ -128,7 +139,7 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
-CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_WANTS_STATIC_LINK=y
 CT_TOOLCHAIN_PKGVERSION=""
 CT_TOOLCHAIN_BUGURL=""
 
@@ -137,7 +148,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
+CT_TARGET_ALIAS="armeb-linux"
 
 #
 # Toolchain type
@@ -160,20 +171,19 @@ CT_KERNEL="linux"
 CT_KERNEL_VERSION="2.6.38.8"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+# CT_KERNEL_V_3_0_4 is not set
+# CT_KERNEL_V_3_0_3 is not set
+# CT_KERNEL_V_3_0_2 is not set
+# CT_KERNEL_V_3_0_1 is not set
 # CT_KERNEL_V_3_0 is not set
-# CT_KERNEL_V_2_6_39_3 is not set
-# CT_KERNEL_V_2_6_39_2 is not set
-# CT_KERNEL_V_2_6_39_1 is not set
-# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_2_6_39_4 is not set
 CT_KERNEL_V_2_6_38_8=y
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_35_14 is not set
 # CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_16 is not set
-# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_33_19 is not set
+# CT_KERNEL_V_2_6_32_46 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_59 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
@@ -200,12 +210,11 @@ CT_ARCH_BINFMT_ELF=y
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_20_1 is not set
-CT_BINUTILS_V_2_20=y
-# CT_BINUTILS_V_2_19_1 is not set
-# CT_BINUTILS_V_2_19 is not set
-# CT_BINUTILS_V_2_18 is not set
-CT_BINUTILS_VERSION="2.20"
+# CT_BINUTILS_V_2_21_1a is not set
+CT_BINUTILS_V_2_20_1a=y
+# CT_BINUTILS_V_2_19_1a is not set
+# CT_BINUTILS_V_2_18a is not set
+CT_BINUTILS_VERSION="2.20.1a"
 CT_BINUTILS_2_20_or_later=y
 CT_BINUTILS_2_19_or_later=y
 CT_BINUTILS_2_18_or_later=y
@@ -256,7 +265,7 @@ CT_CC_SUPPORT_OBJCXX=y
 #
 # Additional supported languages:
 #
-# CT_CC_LANG_CXX is not set
+CT_CC_LANG_CXX=y
 # CT_CC_LANG_JAVA is not set
 
 #
@@ -310,7 +319,7 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
 # CT_LIBC_UCLIBC_DEBUG_LEVEL_1 is not set
 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
-CT_LIBC_UCLIBC_CONFIG_FILE=""
+CT_LIBC_UCLIBC_CONFIG_FILE="/home/ymorin/dev/buildroot/O/build/build-toolchain/libc.config"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_LINUXTHREADS=y
 CT_LIBC_SUPPORT_THREADS_NONE=y

From 9d885487ea49824293ebb410b571dc2f590f56f4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 31 Oct 2011 09:02:18 -0300
Subject: [PATCH 0894/6849] busybox: add 1.19.3 getty and modinfo fixes

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.19.3/busybox-1.19.3-getty.patch        | 12 ++++++++++++
 .../busybox-1.19.3/busybox-1.19.3-modinfo.patch      | 10 ++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
 create mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch

diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
new file mode 100644
index 0000000000..84dad6f1bc
--- /dev/null
+++ b/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
@@ -0,0 +1,12 @@
+--- busybox-1.19.3/loginutils/getty.c
++++ busybox-1.19.3-getty/loginutils/getty.c
+@@ -271,7 +271,9 @@ static void termios_init(int speed)
+ #ifdef CMSPAR
+ 		| CMSPAR  /* mark or space parity */
+ #endif
++#ifdef CBAUD
+ 		| CBAUD   /* (output) baud rate */
++#endif
+ #ifdef CBAUDEX
+ 		| CBAUDEX /* (output) baud rate */
+ #endif
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
new file mode 100644
index 0000000000..9dd5c103a5
--- /dev/null
+++ b/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
@@ -0,0 +1,10 @@
+--- busybox-1.19.3/modutils/modinfo.c
++++ busybox-1.19.3-modinfo/modutils/modinfo.c
+@@ -13,6 +13,7 @@
+ //config:config MODINFO
+ //config:	bool "modinfo"
+ //config:	default y
++//config:	select PLATFORM_LINUX
+ //config:	help
+ //config:	  Show information about a Linux Kernel module
+ 

From d64c4ed3f787802d2b3953a5db787984d9a6626e Mon Sep 17 00:00:00 2001
From: Stany MARCEL <stanypub@gmail.com>
Date: Tue, 1 Nov 2011 01:53:38 +0100
Subject: [PATCH 0895/6849] toolchain: Correct test for external tools symlink
 creation

When the external tools chain is installed in a path that match one of
the first case test, all symlink are created to the external
wrapper. The proposed solution is to test only the base name not the
full path.

Signed-off-by: Stany MARCEL <stanypub@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 828791660a..572917ff0b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -318,9 +318,9 @@ $(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
 	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
 	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
-		case "$$i" in \
+		base=$${i##*/}; \
+		case "$$base" in \
 		*cc|*cc-*|*++|*++-*|*cpp) \
-			base=$${i##*/}; \
 			ln -sf $(@F) $$base; \
 			;; \
 		*) \

From 3fb6010dca4447576fa36f4b5f845af986d39364 Mon Sep 17 00:00:00 2001
From: Stany MARCEL <stanypub@gmail.com>
Date: Tue, 1 Nov 2011 13:19:16 +0100
Subject: [PATCH 0896/6849] toolchain: Add the possibility to have a mcpu
 option with wrapper

Permit to define the mcpu of the external toolchain wrapper, based on
BR2_GCC_TARGET_CPU.

Signed-off-by: Stany MARCEL <stanypub@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk             | 5 +++++
 toolchain/toolchain-external/ext-toolchain-wrapper.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 572917ff0b..a52621cd7b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -127,6 +127,7 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \
 	-DBR_SYSROOT='"$(STAGING_DIR)"'
 
 CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))
 CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
 CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
 
@@ -140,6 +141,10 @@ ifneq ($(CC_TARGET_ARCH_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"'
 endif
+ifneq ($(CC_TARGET_CPU_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mcpu=$(CC_TARGET_CPU_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_CPU='"$(CC_TARGET_CPU_)"'
+endif
 ifneq ($(CC_TARGET_ABI_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 3e23061610..cc404f3e94 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -28,6 +28,9 @@ static char *predef_args[] = {
 #ifdef BR_TUNE
 	"-mtune=" BR_TUNE,
 #endif /* BR_TUNE */
+#ifdef BR_CPU
+	"-mcpu=" BR_CPU,
+#endif
 #ifdef BR_ABI
 	"-mabi=" BR_ABI,
 #endif

From 6473f6c035863ee846f3b1ebc239cabdcb497301 Mon Sep 17 00:00:00 2001
From: Danomi Mocelopolis <d_mo1234@yahoo.com>
Date: Wed, 2 Nov 2011 12:00:52 +0100
Subject: [PATCH 0897/6849] mtd: make sure that dest dir exists before
 installing mtd files

Closes #4387

Signed-off-by: Danomi Mocelopolis <d_mo1234@yahoo.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 3 ++-
 package/mtd/mtd.mk | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 74ec64facf..0043126bf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,7 +33,7 @@
 	libglib2, libiconv, libmpd, libreplaygain, libroxml,
 	libsamplerate, libsndfile, libsoup, libsvgtiny, libtool,
 	lighttpd, links, linux-fusion, lite, lrzsz, lsof, lzo, lzop,
-	makedevs, mcookie, mpg123, mpd, mpfr, musepack, mutt,
+	makedevs, mcookie, mpg123, mpd, mpfr, mtd, musepack, mutt,
 	mysql_client, ncftp, ncurses, neon, netcat, netsnmp, ntfs-3g,
 	ntfsprogs, ntp, openntpd, openssh, openssl, orc, pciutils,
 	psmisc, python, qt, quagga, radvd, rpm, rsync, samba, sawman,
@@ -70,6 +70,7 @@
 	#4183: Codesourcery toolchain download site has changed
 	#4231: libneon.so: undefined reference to `SSL_SESSION_cmp'
 	#4381: Add option to lighttpd to enable Lua support
+	#4387: Make sure that dest dir exists before installing mtd files
 
 2011.08, Released August 31th, 2011:
 
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index ef876e2d32..1b23e83575 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -91,10 +91,10 @@ endef
 
 define MTD_INSTALL_TARGET_CMDS
  for f in $(MTD_TARGETS_y) ; do \
-  install -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
+  install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
  done ; \
  for f in $(MTD_TARGETS_UBI_y) ; do \
-  install -m 0755 $(@D)/ubi-utils/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
+  install -D -m 0755 $(@D)/ubi-utils/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
  done
 endef
 

From a43020192fb49ff49b9b3d2b6b1c7c0b0f13ce1c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Oct 2011 11:53:09 -0300
Subject: [PATCH 0898/6849] uClibc: add patches to fix daylight saving issues

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ....1-fix-daylight-saving-time-handling.patch | 36 +++++++++++++++++++
 ...32-fix-daylight-saving-time-handling.patch | 36 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch
new file mode 100644
index 0000000000..5a96113877
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch
@@ -0,0 +1,36 @@
+From 47f3da1cf49377c25772bb54d07db55225bbb142 Mon Sep 17 00:00:00 2001
+From: Guillaume Bourcier <guillaumebourcier@free.fr>
+Date: Tue, 11 Oct 2011 13:45:33 +0200
+Subject: [PATCH] libc: fix daylight saving time handling
+
+The algorithm computing daylight saving time incorrectly adds a day for
+each month after January for leap years. The clock shift from/to DST can
+be delayed if the last Sunday of a transition month is exactly seven
+days before the first of the following month.
+
+This change adds a day for the February month only.
+
+Signed-off-by: Guillaume Bourcier <guillaumebourcier@free.fr>
+Signed-off-by: Richard Braun <rbraun@sceen.net>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/misc/time/time.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
+index 19d68e1..8e2ebf1 100644
+--- a/libc/misc/time/time.c
++++ b/libc/misc/time/time.c
+@@ -689,7 +689,7 @@ static int tm_isdst(register const struct tm *__restrict ptm,
+ 					++day;
+ 				}
+ 				monlen = 31 + day_cor[r->month -1] - day_cor[r->month];
+-				if (isleap && (r->month > 1)) {
++				if (isleap && (r->month == 2)) {
+ 					++monlen;
+ 				}
+ 				/* Wweekday (0 is Sunday) of 1st of the month
+-- 
+1.7.3.4
+
diff --git a/toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch b/toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch
new file mode 100644
index 0000000000..5a96113877
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch
@@ -0,0 +1,36 @@
+From 47f3da1cf49377c25772bb54d07db55225bbb142 Mon Sep 17 00:00:00 2001
+From: Guillaume Bourcier <guillaumebourcier@free.fr>
+Date: Tue, 11 Oct 2011 13:45:33 +0200
+Subject: [PATCH] libc: fix daylight saving time handling
+
+The algorithm computing daylight saving time incorrectly adds a day for
+each month after January for leap years. The clock shift from/to DST can
+be delayed if the last Sunday of a transition month is exactly seven
+days before the first of the following month.
+
+This change adds a day for the February month only.
+
+Signed-off-by: Guillaume Bourcier <guillaumebourcier@free.fr>
+Signed-off-by: Richard Braun <rbraun@sceen.net>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/misc/time/time.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
+index 19d68e1..8e2ebf1 100644
+--- a/libc/misc/time/time.c
++++ b/libc/misc/time/time.c
+@@ -689,7 +689,7 @@ static int tm_isdst(register const struct tm *__restrict ptm,
+ 					++day;
+ 				}
+ 				monlen = 31 + day_cor[r->month -1] - day_cor[r->month];
+-				if (isleap && (r->month > 1)) {
++				if (isleap && (r->month == 2)) {
+ 					++monlen;
+ 				}
+ 				/* Wweekday (0 is Sunday) of 1st of the month
+-- 
+1.7.3.4
+

From 6fed97eb0d82c6adfaf957d1b2f00362d1653453 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Oct 2011 11:53:10 -0300
Subject: [PATCH 0899/6849] uClibc 0.9.31.1: add patch to export strverscmp for
 real

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uClibc-0.9.31.1-export-strverscmp.patch   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch b/toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch
new file mode 100644
index 0000000000..19bc021b88
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch
@@ -0,0 +1,30 @@
+From 139b8f0c673fed465d27f99c98568e5d5e1b9b72 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 4 Jun 2010 13:36:30 +0200
+Subject: [PATCH] strverscmp: I forgot to export it
+
+Result was:
+
+strverscmp.o:
+000000ec T __GI_strverscmp
+
+i.e. no plain "strverscmp"!
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/string/strverscmp.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libc/string/strverscmp.c b/libc/string/strverscmp.c
+index 74ae4c6..b19e8f0 100644
+--- a/libc/string/strverscmp.c
++++ b/libc/string/strverscmp.c
+@@ -115,3 +115,4 @@ int strverscmp (const char *s1, const char *s2)
+       return state;
+   }
+ }
++libc_hidden_def(strverscmp)
+-- 
+1.7.3.4
+

From 922f19fe80358403e29b14c6e8f1f32821d467c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Oct 2011 11:56:42 -0300
Subject: [PATCH 0900/6849] uClibc: update snapshot config to avoid stalling

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-snapshot.config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index bff7584694..a3fe2005eb 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -88,9 +88,12 @@ LDSO_LDD_SUPPORT=y
 # LDSO_CACHE_SUPPORT is not set
 LDSO_PRELOAD_ENV_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
+# LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
@@ -164,6 +167,7 @@ UCLIBC_USE_NETLINK=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
 UCLIBC_HAS_LIBRESOLV_STUB=y
 UCLIBC_HAS_LIBNSL_STUB=y
 

From d453d0bc9c15fb0f15f116cbe0c14ce7cd9501ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 13 Oct 2011 13:18:51 -0300
Subject: [PATCH 0901/6849] ext-toolchain: fix ct-ng as external rsync issues

When using a CT-NG toolchain as external toolchain (not with the
integration) and said toolchain has u-w directories rsync fails.
So instruct rsync to chmod u+w directories in the target copy to avoid
the issue.

[Peter: notice that this is a workaround for a rsync 3.0.8 bug]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 5585f45fe3..96919d4b13 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -91,7 +91,7 @@ copy_toolchain_sysroot = \
 	ARCH_SUBDIR="$(strip $3)"; \
 	for i in etc lib sbin usr ; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
-			rsync -au --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
+			rsync -au --chmod=Du+w --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
 		fi ; \
 	done ; \
 	if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \

From c1fa253a1b9180d349bcf9ada4898494d2221fc3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 2 Nov 2011 12:58:04 +0100
Subject: [PATCH 0902/6849] libxcb: needs pkg-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: �ukasz Pułka <lukasz@oxnet.pl>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 106a8a4264..8fb3dd3e85 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -11,7 +11,7 @@ LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_DEPENDENCIES = \
 	host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
-	host-xcb-proto host-python
+	host-xcb-proto host-python host-pkg-config
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
 	XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages

From da8ecfeceff9daecc0ffb19520c4db130171c8e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Nov 2011 13:05:36 -0300
Subject: [PATCH 0903/6849] radvd: security bump to version 1.8.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 5d07ff6c5d..d4b9a73f86 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RADVD_VERSION = 1.8.2
+RADVD_VERSION = 1.8.3
 RADVD_SITE = http://www.litech.org/radvd/dist/
 RADVD_DEPENDENCIES = flex host-flex
 

From 3456a6a66cb4ee821efb11fc64f0f18d70f3c968 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 7 Nov 2011 23:11:46 +0100
Subject: [PATCH 0904/6849] toolchain/gcc: add 4.3 / 4.4 fix for gcc pr 39429

Patch from OSELAS.Toolchain-2011.03.1.

See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39429 for details.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.3.6/gcc-43-pr39429.patch | 24 ++++++++++++++++++++++++
 toolchain/gcc/4.4.6/gcc-44-pr39429.patch | 24 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 toolchain/gcc/4.3.6/gcc-43-pr39429.patch
 create mode 100644 toolchain/gcc/4.4.6/gcc-44-pr39429.patch

diff --git a/toolchain/gcc/4.3.6/gcc-43-pr39429.patch b/toolchain/gcc/4.3.6/gcc-43-pr39429.patch
new file mode 100644
index 0000000000..4e1dc9ef73
--- /dev/null
+++ b/toolchain/gcc/4.3.6/gcc-43-pr39429.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: Fix: compiler create bad asm codes.
+
+See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39429 for details.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ gcc/config/arm/arm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/gcc/config/arm/arm.c
+===================================================================
+--- a/gcc/config/arm/arm.c
++++ b/gcc/config/arm/arm.c
+@@ -6838,7 +6838,7 @@ adjacent_mem_locations (rtx a, rtx b)
+       /* Don't accept any offset that will require multiple
+ 	 instructions to handle, since this would cause the
+ 	 arith_adjacentmem pattern to output an overlong sequence.  */
+-      if (!const_ok_for_op (PLUS, val0) || !const_ok_for_op (PLUS, val1))
++      if (!const_ok_for_op (val0, PLUS) || !const_ok_for_op (val1, PLUS))
+ 	return 0;
+ 
+       /* Don't allow an eliminable register: register elimination can make
diff --git a/toolchain/gcc/4.4.6/gcc-44-pr39429.patch b/toolchain/gcc/4.4.6/gcc-44-pr39429.patch
new file mode 100644
index 0000000000..4e1dc9ef73
--- /dev/null
+++ b/toolchain/gcc/4.4.6/gcc-44-pr39429.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: Fix: compiler create bad asm codes.
+
+See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39429 for details.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ gcc/config/arm/arm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/gcc/config/arm/arm.c
+===================================================================
+--- a/gcc/config/arm/arm.c
++++ b/gcc/config/arm/arm.c
+@@ -6838,7 +6838,7 @@ adjacent_mem_locations (rtx a, rtx b)
+       /* Don't accept any offset that will require multiple
+ 	 instructions to handle, since this would cause the
+ 	 arith_adjacentmem pattern to output an overlong sequence.  */
+-      if (!const_ok_for_op (PLUS, val0) || !const_ok_for_op (PLUS, val1))
++      if (!const_ok_for_op (val0, PLUS) || !const_ok_for_op (val1, PLUS))
+ 	return 0;
+ 
+       /* Don't allow an eliminable register: register elimination can make

From 69f34bafa8dc8af6d66e86f8a965c423552e1eb3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 8 Nov 2011 17:06:13 +0100
Subject: [PATCH 0905/6849] toolchain-external: fix x86 codesourcery config
 symbol typo

As noticed on irc.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 4 ++--
 toolchain/toolchain-external/ext-tool.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 0a4b922054..678babd257 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -199,7 +199,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  has support for the following variants:
             - SH2A, uClibc, big endian
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	bool "Sourcery CodeBench x86/x86_64 2010.09"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -271,7 +271,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
-	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
+	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a52621cd7b..2ac4973784 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -202,7 +202,7 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009),y)
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/ia32/portal/package7682/public/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2010.09-44-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)

From d7139cd936e0cb793dc552ddf484aacac1b8dd45 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 5 Oct 2011 17:23:38 -0300
Subject: [PATCH 0906/6849] gmp: work around ARM thumb build breakage

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 5eb6ecc6ee..2222465c8f 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -9,5 +9,10 @@ GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES
 
+# Bad ARM assembly breaks on pure thumb
+ifeq ($(ARCH),arm)
+GMP_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -marm"
+endif
+
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 789a7cf4069b86f1bd44c55d69205aff1837f906 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Oct 2011 12:53:15 -0300
Subject: [PATCH 0907/6849] util-linux: fix partx build breakage

addpart, delpart and partx are enabled by default so --disable now to
avoid build breaking when we lack libblkid.
Also select libblkid when it's enabled now.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in     | 7 ++++---
 package/util-linux/util-linux.mk | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 816130dafa..43a84440ff 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -67,6 +67,10 @@ config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
 config BR2_PACKAGE_UTIL_LINUX_WALL
 	bool "build \"wall\""
 
+config BR2_PACKAGE_UTIL_LINUX_PARTX
+	bool "build \"addpart, delpart, partx\""
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+
 ############################################
 # default disabled and should be enabled by
 #  --enable-foo
@@ -86,9 +90,6 @@ config BR2_PACKAGE_UTIL_LINUX_LAST
 config BR2_PACKAGE_UTIL_LINUX_MESG
 	bool "build \"mesg\""
 
-config BR2_PACKAGE_UTIL_LINUX_PARTX
-	bool "build \"addpart, delpart, partx\""
-
 config BR2_PACKAGE_UTIL_LINUX_RAW
 	bool "build \"raw\""
 
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index b77e326f07..a3d6e139cd 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -49,7 +49,8 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),,--disable-unshare) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall)
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx)
 
 #############################################
 #
@@ -61,7 +62,6 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \

From f5e5aeb7125c065c535ecb0774ab48cb7ef4622e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Nov 2011 00:00:05 +0100
Subject: [PATCH 0908/6849] webif: remove deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 -
 package/webif/Config.in                       |  28 --
 package/webif/files/etc/httpd.conf            |   8 -
 package/webif/files/usr/lib/webif/apply.sh    |  76 ---
 .../webif/files/usr/lib/webif/categories.awk  |  27 --
 package/webif/files/usr/lib/webif/common.awk  |  38 --
 package/webif/files/usr/lib/webif/form.awk    | 100 ----
 .../files/usr/lib/webif/lang/ca/common.txt    | 226 ---------
 .../files/usr/lib/webif/lang/cz/common.txt    | 225 ---------
 .../files/usr/lib/webif/lang/de/common.txt    | 228 ---------
 .../files/usr/lib/webif/lang/dk/common.txt    | 231 ---------
 .../files/usr/lib/webif/lang/ee/common.txt    | 230 ---------
 .../files/usr/lib/webif/lang/es/common.txt    | 227 ---------
 .../files/usr/lib/webif/lang/fr/common.txt    | 238 ---------
 .../files/usr/lib/webif/lang/hr/common.txt    | 199 --------
 .../files/usr/lib/webif/lang/hu/common.txt    | 227 ---------
 .../files/usr/lib/webif/lang/it/common.txt    | 226 ---------
 .../files/usr/lib/webif/lang/nl/common.txt    | 224 ---------
 .../files/usr/lib/webif/lang/no/common.txt    | 230 ---------
 .../files/usr/lib/webif/lang/pl/common.txt    | 228 ---------
 .../files/usr/lib/webif/lang/pt/common.txt    | 454 ------------------
 .../files/usr/lib/webif/lang/ru/common.txt    | 223 ---------
 .../files/usr/lib/webif/lang/se/common.txt    | 223 ---------
 .../webif/files/usr/lib/webif/languages.awk   |  12 -
 .../files/usr/lib/webif/subcategories.awk     |  12 -
 .../webif/files/usr/lib/webif/validate.awk    | 151 ------
 package/webif/files/usr/lib/webif/webif.sh    | 286 -----------
 package/webif/files/www/cgi-bin/webif.sh      |   2 -
 .../webif/files/www/cgi-bin/webif/.categories |   2 -
 .../webif/files/www/cgi-bin/webif/about.sh    |  31 --
 .../webif/files/www/cgi-bin/webif/config.sh   |  46 --
 .../webif/files/www/cgi-bin/webif/index.sh    |   8 -
 package/webif/files/www/cgi-bin/webif/info.sh |  44 --
 package/webif/files/www/cgi-bin/webif/ipkg.sh |   2 -
 .../www/cgi-bin/webif/status-connection.sh    |  29 --
 .../files/www/cgi-bin/webif/status-dhcp.sh    |  38 --
 .../www/cgi-bin/webif/status-wireless.sh      |  12 -
 package/webif/files/www/index.html            |  16 -
 package/webif/files/www/webif.css             | 296 ------------
 package/webif/files/www/webif.js              |  33 --
 package/webif/src/bstrip.c                    |  75 ---
 package/webif/src/webif-page.c                | 289 -----------
 package/webif/webif.mk                        |  71 ---
 43 files changed, 5572 deletions(-)
 delete mode 100644 package/webif/Config.in
 delete mode 100644 package/webif/files/etc/httpd.conf
 delete mode 100755 package/webif/files/usr/lib/webif/apply.sh
 delete mode 100644 package/webif/files/usr/lib/webif/categories.awk
 delete mode 100644 package/webif/files/usr/lib/webif/common.awk
 delete mode 100644 package/webif/files/usr/lib/webif/form.awk
 delete mode 100644 package/webif/files/usr/lib/webif/lang/ca/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/cz/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/de/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/dk/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/ee/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/es/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/fr/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/hr/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/hu/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/it/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/nl/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/no/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/pl/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/pt/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/ru/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/lang/se/common.txt
 delete mode 100644 package/webif/files/usr/lib/webif/languages.awk
 delete mode 100644 package/webif/files/usr/lib/webif/subcategories.awk
 delete mode 100644 package/webif/files/usr/lib/webif/validate.awk
 delete mode 100755 package/webif/files/usr/lib/webif/webif.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif.sh
 delete mode 100644 package/webif/files/www/cgi-bin/webif/.categories
 delete mode 100755 package/webif/files/www/cgi-bin/webif/about.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/config.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/index.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/info.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/ipkg.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/status-connection.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/status-dhcp.sh
 delete mode 100755 package/webif/files/www/cgi-bin/webif/status-wireless.sh
 delete mode 100644 package/webif/files/www/index.html
 delete mode 100644 package/webif/files/www/webif.css
 delete mode 100644 package/webif/files/www/webif.js
 delete mode 100644 package/webif/src/bstrip.c
 delete mode 100644 package/webif/src/webif-page.c
 delete mode 100644 package/webif/webif.mk

diff --git a/package/Config.in b/package/Config.in
index 33dd59e3bd..da0a093b9d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -485,7 +485,6 @@ source "package/udpcast/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
-source "package/webif/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
diff --git a/package/webif/Config.in b/package/webif/Config.in
deleted file mode 100644
index 2ecbf36566..0000000000
--- a/package/webif/Config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-config BR2_PACKAGE_WEBIF
-	bool "webif - Status Console"
-	depends on BR2_PACKAGE_BUSYBOX # httpd
-	depends on BR2_DEPRECATED
-	select BR2_PACKAGE_HASERL
-	help
-	  A web interface for showing different network status. This package
-	  requires awk support on the system, either the one provided by
-	  Busybox or gawk.
-
-	  The default login on the status web pages are root/root and
-	  admin/admin. This can be changed in the etc/httpd.conf file.
-
-config BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML
-	bool "instal index.html in /www which redirects to webif"
-	depends on BR2_PACKAGE_WEBIF
-	help
-	  Installs a /www/index.html which redirects to the status console cgi
-	  scripts.
-
-config BR2_PACKAGE_WEBIF_LANGUAGES
-	bool "install language support"
-	depends on BR2_PACKAGE_WEBIF
-	help
-	  This option installs support for other languages than english.
-
-	  Supported languages: ca, cz, de, dk, ee, es, fr, hr, hu, it, nl, no,
-	                       pl, pt, ru and se.
diff --git a/package/webif/files/etc/httpd.conf b/package/webif/files/etc/httpd.conf
deleted file mode 100644
index 9e125daba2..0000000000
--- a/package/webif/files/etc/httpd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-.asp:text/html
-/cgi-bin/webif:root:root
-/cgi-bin/webif:admin:admin
-.svg:image/svg+xml
-.png:image/png
-.gif:image/gif
-.jpg:image/jpg
-
diff --git a/package/webif/files/usr/lib/webif/apply.sh b/package/webif/files/usr/lib/webif/apply.sh
deleted file mode 100755
index 9cbadf44a2..0000000000
--- a/package/webif/files/usr/lib/webif/apply.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/ash
-#
-# Default handlers for config files
-#
-HANDLERS_config='
-	wireless) reload_wireless;;
-	network) reload_network;;
-	system) reload_system;;
-'
-HANDLERS_file='
-	hosts) rm -f /etc/hosts; mv $config /etc/hosts; killall -HUP dnsmasq ;;
-	ethers) rm -f /etc/ethers; mv $config /etc/ethers; killall -HUP dnsmasq ;;
-	firewall) mv /tmp/.webif/file-firewall /etc/config/firewall && /etc/init.d/S45firewall;;
-'
-
-# for some reason a for loop with "." doesn't work
-eval "$(cat /usr/lib/webif/apply-*.sh 2>&-)"
-
-reload_network() {
-	echo '@TR<<Reloading>> @TR<<networking settings>> ...'
-	grep '^wan_' config-network >&- 2>&- && {
-		ifdown wan
-		ifup wan
-		killall -HUP dnsmasq
-	}
-	
-	grep '^lan_' config-network >&- 2>&- && {
-		ifdown lan
-		ifup lan
-		killall dnsmasq
-		/etc/init.d/S??dnsmasq
-	}
-}
-
-reload_wireless() {
-	echo '@TR<<Reloading>> @TR<<wireless settings>> ...'
-	killall nas >&- 2>&- && sleep 2
-	(
-		/sbin/wifi
-		[ -f /etc/init.d/S41wpa ] && /etc/init.d/S41wpa
-	) >&- 2>&- <&-
-}
-
-reload_system() {
-	echo '@TR<<Applying>> @TR<<system settings>> ...'
-	echo "$(nvram get wan_hostname)" > /proc/sys/kernel/hostname
-}
-
-cd /tmp/.webif
-
-# file-* 		other config files
-for config in $(ls file-* 2>&-); do
-	name=${config#file-}
-	echo "@TR<<Processing>> @TR<<config file>>: $name"
-	eval 'case "$name" in
-		'"$HANDLERS_file"'
-	esac'
-done
-
-# config-*		simple config files
-(
-	cd /proc/self
-	cat /tmp/.webif/config-* 2>&- | grep '=' >&- 2>&- && {
-		cat /tmp/.webif/config-* 2>&- | tee fd/1 | xargs -n1 nvram set
-		echo "@TR<<Committing>> NVRAM ..."
-		nvram commit
-	}
-)
-for config in $(ls config-* 2>&-); do 
-	name=${config#config-}
-	eval 'case "$name" in
-		'"$HANDLERS_config"'
-	esac'
-done
-sleep 2
-rm -f config-*
diff --git a/package/webif/files/usr/lib/webif/categories.awk b/package/webif/files/usr/lib/webif/categories.awk
deleted file mode 100644
index 00312c93da..0000000000
--- a/package/webif/files/usr/lib/webif/categories.awk
+++ /dev/null
@@ -1,27 +0,0 @@
-BEGIN {
-	n = 0
-	sel = 0
-	FS=":"
-}
-($3 == "category") && (categories !~ /:$4:/) {
-	categories = categories ":" $4 ":";
- 	n++
-	if ($4 ~ "^" selected "$") sel = n
-	c[n] = $4
-	if (f[$4] == "") f[$4] = rootdir "/" indexpage "?cat=" $4
-}
-($3 == "name") && ((p[$4] == 0) || (p[$4] > int($5))) {
-	gsub(/^.*\//, "", $1);
-	p[$4] = int($5) + 1
-	f[$4] = rootdir "/" $1
-}
-END {
-	print "<div id=\"mainmenu\"><h3><strong>@TR<<Categories>>:</strong></h3><ul>"
-	
-	for (i = 1; i <= n; i++) {
-		if (sel == i) print "<li class=\"selected-maincat\"><a href=\"" f[c[i]] "\">&raquo;@TR<<" c[i] ">>&laquo;</a></li>"
-		else print "<li><a href=\"" f[c[i]] "\">&nbsp;@TR<<" c[i] ">>&nbsp;</a></li>";
-	}
-  
-	print "</ul></div>"
-}
diff --git a/package/webif/files/usr/lib/webif/common.awk b/package/webif/files/usr/lib/webif/common.awk
deleted file mode 100644
index de3483e150..0000000000
--- a/package/webif/files/usr/lib/webif/common.awk
+++ /dev/null
@@ -1,38 +0,0 @@
-function start_form(title, field_opts, field_opts2) {
-	print "<div class=\"settings\"" field_opts ">"
-	if (title != "") print "<div class=\"settings-title\"><h3><strong>" title "</strong></h3></div>"
-	print "<div class=\"settings-content\"" field_opts2 ">"
-}
-
-function end_form(form_help, form_help_link) {
-	print "</div>"
-	if (form_help != "") form_help = "<dl>" form_help "</dl>"
-	print "<div class=\"settings-help\"><blockquote><h3><strong>@TR<<Short help>>:</strong></h3>" form_help form_help_link "</blockquote></div>"
-	print "<div style=\"clear: both\">&nbsp;</div></div>"
-}
-
-function textinput(name, value) {
-	return "<input type=\"text\" name=\"" name "\" value=\"" value "\" />"
-}
-
-function hidden(name, value) {
-	return "<input type=\"hidden\" name=\"" name "\" value=\"" value "\" />"
-}
-
-function button(name, caption) {
-	return "<input type=\"submit\" name=\"" name "\" value=\"@TR<<" caption ">>\" />"
-}
-
-function helpitem(name) { 
-	return "<dt>@TR<<" name ">>: </dt>"
-}
-
-function helptext(short, name) { 
-	return "<dd>@TR<<" short "|" name ">>: </dd>"
-}
-
-function sel_option(name, caption, default, sel) {
-	if (default == name) sel = " selected=\"selected\""
-	else sel = ""
-	return "<option value=\"" name "\"" sel ">@TR<<" caption ">></option>"
-}
diff --git a/package/webif/files/usr/lib/webif/form.awk b/package/webif/files/usr/lib/webif/form.awk
deleted file mode 100644
index 808b99ebd9..0000000000
--- a/package/webif/files/usr/lib/webif/form.awk
+++ /dev/null
@@ -1,100 +0,0 @@
-# $1 = type
-# $2 = form variable name
-# $3 = form variable value
-# $4 = (radio button) value of button
-# $5 = string to append
-# $6 = additional attributes 
-
-BEGIN {
-	FS="|"
-}
-
-# trim leading whitespaces 
-{
-	gsub(/^[ \t]+/,"",$1)
-}
-
-$1 ~ /^onchange/ {
-	onchange = $2
-}
-
-($1 != "") && ($1 !~ /^option/) && (select_open == 1) {
-	select_open = 0
-	printf "</select>"
-}
-$1 ~ /^start_form/ {
-	if ($3 != "") field_opts=" id=\"" $3 "\""
-	else field_opts=""
-	if ($4 == "hidden") field_opts = field_opts " style=\"display: none\""
-	start_form($2, field_opts);
-	print "<table width=\"100%\" summary=\"Settings\">"
-	form_help = ""
-	form_help_link = ""
-}
-$1 ~ /^field/ {
-	if (field_open == 1) print "</td></tr>"
-	if ($3 != "") field_opts=" id=\"" $3 "\""
-	else field_opts=""
-	if ($4 == "hidden") field_opts = field_opts " style=\"display: none\""
-	print "<tr" field_opts ">"
-	if ($2 != "") print "<td width=\"50%\">" $2 "</td><td width=\"50%\">"
-	else print "<td colspan=\"2\">"
-
-	field_open=1
-}
-$1 ~ /^checkbox/ {
-	if ($3==$4) opts="checked=\"checked\" "
-	else opts=""
-	if (onchange != "") opts = opts " onClick=\"" onchange "()\" onChange=\"" onchange "()\""
-	print "<input id=\"" $2 "_" $4 "\" type=\"checkbox\" name=\"" $2 "\" value=\"" $4 "\" " opts " />"
-}
-$1 ~ /^radio/ {
-	if ($3==$4) opts="checked=\"checked\" "
-	else opts=""
-	if (onchange != "") opts = opts " onClick=\"" onchange "()\" onChange=\"" onchange "()\""
-	print "<input id=\"" $2 "_" $4 "\" type=\"radio\" name=\"" $2 "\" value=\"" $4 "\" " opts " />"
-}
-$1 ~ /^select/ {
-	opts = ""
-	if (onchange != "") opts = opts " onClick=\"" onchange "()\" onChange=\"" onchange "()\""
-	print "<select id=\"" $2 "\" name=\"" $2 "\"" opts ">"
-	select_id = $2
-	select_open = 1
-	select_default = $3
-}
-($1 ~ /^option/) && (select_open == 1) {
-	if ($2 == select_default) option_selected=" selected=\"selected\""
-	else option_selected=""
-	if ($3 != "") option_title = $3
-	else option_title = $2
-	print "<option id=\"" select_id "_" $2 "\"" option_selected " value=\"" $2 "\">" option_title "&nbsp;&nbsp;</option>"
-}
-($1 ~ /^listedit/) {
-	n = split($4 " ", items, " ")
-	for (i = 1; i <= n; i++) {
-		if (items[i] != "") print "<tr><td width=\"50%\">" items[i] "</td><td>&nbsp;<a href=\"" $3 $2 "remove=" items[i] "\">@TR<<Remove>></a></td></tr>"
-	}
-	print "<tr><td width=\"100%\" colspan=\"2\"><input type=\"text\" name=\"" $2 "add\" value=\"" $5 "\" /><input type=\"submit\" name=\"" $2 "submit\" value=\"@TR<<Add>>\" /></td></tr>"
-}
-$1 ~ /^caption/ { print "<b>" $2 "</b>" }
-$1 ~ /^string/ { print $2 }
-$1 ~ /^text/ { print "<input id=\"" $2 "\" type=\"text\" name=\"" $2 "\" value=\"" $3 "\" />" $4 }
-$1 ~ /^password/ { print "<input id=\"" $2 "\" type=\"password\" name=\"" $2 "\" value=\"" $3 "\" />" $4 }
-$1 ~ /^upload/ { print "<input id=\"" $2 "\" type=\"file\" name=\"" $2 "\"/>" }
-$1 ~ /^submit/ { print "<input type=\"submit\" name=\"" $2 "\" value=\"" $3 "\" />" }
-$1 ~ /^helpitem/ { form_help = form_help "<dt>@TR<<" $2 ">>: </dt>" }
-$1 ~ /^helptext/ { form_help = form_help "<dd>@TR<<" $2 ">> </dd>" }
-$1 ~ /^helplink/ { form_help_link = "<div class=\"more-help\"><a href=\"" $2 "\">@TR<<more...>></a></div>" }
-
-($1 ~ /^checkbox/) || ($1 ~ /^radio/) {
-	print $5
-}
-
-$1 ~ /^end_form/ {
-	if (field_open == 1) print "</td></tr>"
-	field_open = 0
-	print "</table>"
-	end_form(form_help, form_help_link);
-	form_help = ""
-	form_help_link = ""
-}
diff --git a/package/webif/files/usr/lib/webif/lang/ca/common.txt b/package/webif/files/usr/lib/webif/lang/ca/common.txt
deleted file mode 100644
index 3d19974bc9..0000000000
--- a/package/webif/files/usr/lib/webif/lang/ca/common.txt
+++ /dev/null
@@ -1,226 +0,0 @@
-lang => Català
-# Common
-Settings saved => Canvis desats
-Settings not saved => No s'han pogut desar els canvis
-Save Changes => Desar canvis
-Apply Changes => Aplicar canvis
-Clear Changes => Desfer canvis
-Review Changes => Comprovar canvis
-Host Name => Nom de l'equip
-Uptime => Uptime
-Load => Càrrega del sistema
-Version => Versió
-Categories => Categories
-Subcategories => Subcategories
-more... => més...
-Add => Afegir
-Remove => Eliminar
-Warning => Atenció
-Password_warning => No heu establert una clau d'accés pel router (accés web i ssh). Per favor, elegiu-ne una ara (el nom d'usuari serà 'root')
-
-# Categories
-Info => Info
-About => Quant a
-Router Info => Informació del router
-
-Status => Estat
-Connections => Connexions
-DHCP => DHCP
-Wireless => Wi-Fi
-
-System => Sistema
-Password => Clau
-Settings => Configuració
-Installed Software => Programes instal·lats
-Firmware Upgrade => Actualitzar Firmware
-
-Network => Xarxa
-LAN => LAN
-WAN => Internet
-Wireless => Wi-Fi
-Advanced Wireless => Wi-Fi (avançat)
-Hosts => Configuració de hosts
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Aquest programa és programari lliure; podeu redistribuir-lo i/o <br />modificar-lo baix els termes de la General Public License<br /> tal i com està publicada per la Free Sofware Foundation; bé la versió 2 d'aquesta Llicència o bé (segons la seva elecció) de qualsevol posterior.
-Contributions by => Contribuidors
-Layout based on => Aspecte basat en
-by => realitzat per
-
-
-No config change. => No hi ha hagut canvis a la configuració.
-Config discarded. => Els canvis no s'han acceptat.
-Config changes: => Configuració actual:
-Updating config... => Actualitzant la configuració...
-
-
-# 'Router Info' page
-Firmware Version => Versió del firmware
-Kernel Version => Versió del Kernel
-Current Date/Time => Data/Hora
-MAC Address => Adreça MAC
-
-
-# 'Connections' page
-Connection Status => Estat de les connexions
-Physical Connections => Connexions físiques
-Router Connections => Connexions del router
-
-
-# 'DHCP' page
-DHCP leases => Préstecs DHCP
-IP Address => Adreça IP
-Name => Nom
-Expires in => Caduca d'ara a
-
-
-# 'Wireless Status' page
-Wireless Status => Estat del Wi-Fi
-
-# 'Password' page
-Password Change => Canvi de la clau
-New Password => Nova clau
-Confirm Password => Confirmeu la clau
-
-# 'System Settings' page
-System Settings => Paràmetres del sistema
-Host Name => Nom de l'host
-Language => Idioma
-
-# 'Installed Software' page
-Installed Packages => Paquets instal·lats
-Update package lists => Actualització de la llista de paquets
-Uninstall => Desinstal·lar
-Install => Instal·lar
-
-
-# 'Firmware Upgrade' page
-Firmware format => Format del firmware
-Error => Error
-done => fet
-Invalid_formt => Format del firmware invàlid
-Erase_JFFS2 => Esborrar la partició JFFS2
-Options => Opcions
-Firmware_image => Fitxer del firmware
-Upgrade => Actualitzar
-Upgrading... => Actualitzant...
-
-# 'LAN Settings' page
-LAN Settings => Opcions LAN
-LAN Configuration => Configuració LAN
-Netmask => Màscara de subxarxa
-Default Gateway => Porta d'enllaç (gateway)
-DNS Servers => Servidor DNS
-DNS Address => Adreça IP del DNS
-
-Note => Nota
-
-# 'WAN Settings' page
-WAN Settings => Opcions d'Internet
-WAN Configuration => Configuració d'Internet
-PPTP Server IP => Adreça IP del servidor PPTP
-Connection Type => Tipus de connexió
-No WAN => Sense configuració d'Internet
-DHCP => DHCP
-Static IP => IP estàtica
-IP Settings => Opcions IP
-PPP Settings => Opcions PPP
-Redial Policy => Política de reconnexió
-Connect on Demand => Baix demanda
-Keep Alive => Connexió permanent
-Maximum Idle Time => Temps màxim d'inactivitat
-Redial Timeout => Temps de reconnexió
-MTU => MTU (mida dels paquets)
-Username => Nom d'usuari
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Configuració Wi-Fi
-Wireless Interface => Interfície Wi-Fi
-WEP Key => Clau WEP
-Selected WEP Key => Clau WEP seleccionada
-WPA PSK => WPA-PSK
-ESSID => ESSID
-Channel => Canal
-RADIUS IP Address => Adreça IP del servidor RADIUS
-RADIUS Server Key => Secret RADIUS
-Enabled => Actiu
-Disabled => Inactiu
-ESSID Broadcast => Difusió del SSID
-Show => Mostrar
-Hide => Ocultar
-WLAN Mode => Mode Wi-Fi
-Access Point => Punt d'accés
-Client => Client
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Operation mode => Mode de funcionament
-Encryption Settings => Paràmetres d'enriptació
-Encryption Type => Tipus d'encriptació
-PSK => PSK
-WPA Mode => Mode WPA
-WPA Algorithms => Algoritmes WPA
-WEP Keys => Clau WEP
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Configuració Wi-Fi avançada
-WDS Connections => Connexions WDS
-MAC Filter List => Filtrat per adreça MAC
-Filter Mode => Mode de filtrat
-Allow => Autoritzar
-Deny => Denegar
-Set => Establir
-Settings => Paràmetres
-Automatic WDS => WDS automàtic
-
-# "Hosts" page
-
-MAC Address => Adreça MAC
-Configured Hosts => Equips configurats
-DHCP Static => Entrades DHCP estàtiques
-Host Names => Nom dels equips
-
-Up => Pujar
-Down => Baixar
-Edit => Editar
-Delete => Esborrar
-Save => Desar
-Cancel => Rebutjar
-
-Forward => Redirigir
-Accept => Acceptar
-Drop => Rebutjar
-
-Firewall => Firewall
-Firewall Rules => Regles del Firewall
-Firewall Configuration => Configuració del Firewall
-
-New Rule => Nova regla
-Match => Filtrar
-Target => Acció
-Port => Port
-
-Protocol => Protocol
-Source IP => IP origen
-Destination IP => IP destí
-Source Ports => Ports origen
-Destination Ports => Ports destí
-
-Forward to => Redirigir a
-Port => Port
-
-Helptext ESSID => SSID
-Helptext DNS save => És recomanable desar els canvis abans d'afegir o eliminar servidors DNS a la llista
-
-Helptext Operation mode => Estableix el mode d'operació de la xarxa inalàmbrica (Wi-Fi) 'Client (bridge)' no canviarà la configuració de la interfície de xarxa. Simplement afegirà uns paràmetres que permetran que la interfície wireless actui en certa mida com un bridge.
-Helptext Encryption Type => 'WPA (RADIUS)' només pot emprar-se en mode Punt d'Accés.<br /> 'WPA (PSK)' no funciona en mode Ad-Hoc.
-Helptext IP Settings => Les opcions IP són opcionals per a DHCP y PPTP. Si les elegiu, s'empraran per defecte en cas de que la configuració automàtica falli.
-Helptext Idle Time => Nombre de segons sense activitat amb Internet que ha d'esperar el router abans de desconectar-se. (Només pel mode Baix Demanda).
-Helptext Redial Timeout => Nombre de segons sense rebre resposta del servidor que ha d'esperar el router per a tornar a connectar-se.
-
-# untranslated:
-Available packages => Paquets disponibles
-
diff --git a/package/webif/files/usr/lib/webif/lang/cz/common.txt b/package/webif/files/usr/lib/webif/lang/cz/common.txt
deleted file mode 100644
index 773e9d9011..0000000000
--- a/package/webif/files/usr/lib/webif/lang/cz/common.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-lang => &#268;esky
-# Common
-Settings saved => Nastaven&#237; ulo&#382;eno
-Settings not saved => Nastaven&#237; nebylo ulo&#382;eno
-Save Changes => Ulo&#382;it zm&#277;ny
-Apply Changes => Prov&#233;st zm&#277;ny
-Clear Changes => Vymazat zm&#277;ny
-Review Changes => Prohl&#233;dnout zm&#277;ny
-Host Name => Hostname
-Uptime => Uptime
-Load => Zat&#237;&#382;en&#237;
-Version => Verze
-Categories => Kategorie
-Subcategories => Podkategorie
-more... => v&#237;ce...
-Add => P&#345;idat
-Remove => Odebrat
-Warning => Varov&#225;n&#237;
-Password_warning => nen&#237; nastaveno &#382;&#225;dn&#233; heslo pro p&#345;&#237;stup do webov&#233; administrace a p&#345;es SSH.<br />Nastavte jej pros&#237;m nyn&#237; (Login ve webu pou&#382;&#237;vejte: 'root').
-
-# Categories
-Info => Info
-About => Projekt
-Router Info => Router
-
-Status => Stav
-Connections => P&#345;ipojen&#237;
-DHCP => DHCP
-Wireless => WLAN
-
-System => Syst&#233;m
-Password => Heslo
-Settings => Nastaven&#237;
-Installed Software => Nainstalovan&#253; software
-Firmware Upgrade => Flashnut&#237; firmware
-
-Network => S&#237;&#357;
-LAN => LAN
-WAN => WAN port
-Wireless => WLAN
-Advanced Wireless => WLAN (podrobn&#233;)
-Hosts => Stanice (hosts)
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Tento program pat&#345;&#237; mezi voln&#253; software, m&#367;&#382;ete jej distribuovat a/nebo m&#277;nit pod podm&#237;nkami uveden&#253;mi <br /> v licenci GNU GPL (General Public License) vydan&#253;mi Nadac&#237; pro svobodn&#253; software (Free Software Foundation), <br /> jej&#237; druh&#233; verze, p&#345;&#237;padn&#277; pozd&#277;j&#353;&#237;ch verz&#237;.
-Contributions by => S p&#345;isp&#277;n&#237;m
-Layout based on => Layout postaven na
-by => od
-
-
-No config change. => Nebyly provedeny &#382;&#225;dn&#233; zm&#277;ny konfigurace.
-Config discarded. => Va&#353;e nastaven&#237; byla zahozena.
-Config changes: => Aktu&#225;ln&#237; zm&#277;ny konfigurace:
-Updating config... => Aktualizuji konfiguraci...
-
-
-# 'Router Info' page
-Firmware Version => Verze firmware
-Kernel Version => Verze j&#225;dra
-Current Date/Time => Aktu&#225;ln&#237; datum/&#269;as
-MAC Address => MAC adresa
-
-
-# 'Connections' page
-Connection Status => Stav spojen&#237;
-Physical Connections => Obsah ARP cache - aktivn&#237; MAC/IP adresy
-Router Connections => Spojen&#237; na router
-
-
-# 'DHCP' page
-DHCP leases => DHCP v&#253;p&#367;j&#269;ky
-IP Address => IP adresa
-Name => Jm&#233;no
-Expires in => Vypr&#353;&#237;
-
-
-# 'Wireless Status' page
-Wireless Status => Stav wifi
-
-# 'Password' page
-Password Change => Zm&#277;na hesla
-New Password => Nov&#233; heslo
-Confirm Password => Nov&#233; heslo (potvrzen&#237;)
-
-# 'System Settings' page
-System Settings => Syst&#233;mov&#225; nastaven&#237;
-Host Name => Hostname
-Language => Jazyk
-
-# 'Installed Software' page
-Installed Packages => Nainstalovan&#233; bal&#237;&#269;ky
-Available packages => Dostupn&#233; bal&#237;&#269;ky
-Update package lists => Aktualizovat seznam bal&#237;&#269;k&#367;
-Uninstall => Odinstalovat
-Install => Nainstalovat
-
-
-# 'Firmware Upgrade' page
-Firmware format => Form&#225;t firmware
-Error => Chyba
-done => hotovo
-Invalid_format => Form&#225;t firmware je nezn&#225;m&#253;
-Erase_JFFS2 => Smazat JFFS2 oblast
-Options => Mo&#382;nosti
-Firmware_image => Soubor firmware:
-Upgrade => Flashnout
-Upgrading... => Flashuji...
-
-# 'LAN Settings' page
-LAN Settings => Nastaven&#237; LAN
-LAN Configuration => Konfigurace LAN
-Netmask => Maska
-Default Gateway => Br&#225;na
-DNS Servers => DNS servery
-DNS Address => Adresa DNS serveru
-
-Note => Pozn&#225;mka
-
-
-# 'WAN Settings' page
-WAN Settings => Nastaven&#237; WAN portu
-WAN Configuration => Konfigurace
-PPTP Server IP => Adresa PPTP serveru
-Connection Type => Typ p&#345;ipojen&#237;
-No WAN => Odpojeno
-DHCP => DHCP
-Static IP => Pevn&#225; IP
-IP Settings => Nastaven&#237; IP
-PPP Settings => Nastaven&#237; PPP
-Redial Policy =>  Nav&#225;z&#225;n&#237; spojen&#237;
-Connect on Demand => Na vy&#382;&#225;d&#225;n&#237; (Connect on Demand)
-Keep Alive => St&#225;le p&#345;ipojen (Keep Alive)
-Maximum Idle Time => Maxim&#225;ln&#237; &#269;as bez aktivity (Maximum Idle Time)
-Redial Timeout => Prodleva znovunav&#225;z&#225;n&#237; spojen&#237; po jeho ztr&#225;t&#277; (Redial Timeout)
-MTU => Maxim&#225;ln&#237; velikost paketu (MTU)
-Username => U&#382;ivatelsk&#233; jm&#233;no
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Konfigurace wifi
-Wireless Interface => Wifi rozhran&#237;
-WEP Key => WEP kl&#237;&#269;
-Selected WEP Key => Vybran&#253; WEP kl&#237;&#269;
-WPA PSK => WPA kl&#237;&#269;
-ESSID => ESSID
-Channel => Kan&#225;l
-RADIUS IP Address => Adresa RADIUS serveru
-RADIUS Server Key => Heslo RADIUS serveru
-Enabled => Zapnuto
-Disabled => Vypnuto
-ESSID Broadcast => Skryt&#237; ESSID (ESSID-Broadcast) 
-Show => Zobrazeno
-Hide => Skryto
-WLAN Mode => Opera&#269;n&#237; m&#243;d
-Access Point => Access Point
-Client => Klient
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Encryption Settings => &#352;ifrov&#225;n&#237; p&#345;enosu
-Encryption Type => Typ &#353;ifrov&#225;n&#237;
-PSK => WPA PSK
-WPA Mode => M&#243;d WPA
-WPA Algorithms => WPA algoritmus
-WEP Keys => WEP kl&#237;&#269;e
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Roz&#353;&#237;&#345;en&#233; nastaven&#237; wifi
-WDS Connections => WDS spojen&#237;
-MAC Filter List => Seznam MAC filtru
-Filter Mode => M&#243;d MAC filtru
-Allow => Povolit MAC v seznamu
-Deny => Zak&#225;zat MAC s seznamu
-Set => Nastavit
-Settings => Nastaven&#237;
-Automatic WDS => Automatick&#233; WDS spojen&#237; (LazyWDS)
-
-# "Hosts" page
-
-MAC Address => MAC adresa
-Configured Hosts => Konfigurace stanic (hosts)
-DHCP Static => Pevn&#233; p&#345;id&#277;len&#237; IP podle MAC (DHCP)
-Host Names => Jm&#233;na stanic (hosts)
-
-
-Up => Nahoru
-Down => Dol&#367;
-Edit => Editovat
-Delete => Smazat
-Save => Ulo&#382;it
-Cancel => Storno
-
-Forward => Forward
-Accept => Accept
-Drop => Drop
-
-Firewall => Firewall
-Firewall Rules => Pravidla firewallu
-Firewall Configuration => Konfigurace firewallu
-
-New Rule => Nov&#233; pravidlo
-Match => Filtr
-Target => C&#237;l
-Port => Port
-
-Protocol => Protokol
-Source IP => Zdrojov&#225; IP
-Destination IP => C&#237;lov&#225; IP
-Source Ports => Zdrojov&#253; port
-Destination Ports => C&#237;lov&#253; port
-
-Forward to => Forward na
-Port => Port
-
-Helptext ESSID => N&#225;zev Va&#353;&#237; bezdr&#225;tov&#233; s&#237;t&#277;
-Helptext DNS save => P&#345;ed &#250;pravou nastaven&#237; DNS server&#367; ulo&#382;te ostatn&#237; zm&#277;ny na t&#233;to str&#225;nce.
-
-Helptext Operation mode => Toto nastaven&#237; m&#277;n&#237; m&#243;d bezdr&#225;tov&#233; s&#237;t&#277;. Volbou Klient (bridge) se nezm&#277;n&#237; nastaven&#237; s&#237;&#357;ov&#253;ch rozhran&#237;, pouze se nastav&#237; n&#277;kter&#233; parametry ovlada&#269;e wifi, kter&#233; umo&#382;n&#237; funk&#269;n&#277; omezenou mo&#382;nost vytvo&#345;en&#237; bridge nad rozhran&#237;mi.
-Helptext Encryption Type => 'WPA (RADIUS)' lze pou&#382;&#237;t pouze v m&#243;du Access Point. <br /> 'WPA (PSK)' nelze pou&#382;&#237;t v Ad-Hoc m&#243;du. 
-Helptext IP Settings => Nastaven&#237; IP je pro mo&#382;nost DHCP a PPTP voliteln&#233;. Zadan&#225; adresa se pou&#382;ije v p&#345;&#237;pad&#277;, &#382;e nen&#237; DHCP server dostupn&#253;.
-Helptext Idle Time => &#268;as v sekund&#225;ch, po kter&#253; kdy&#382; nedojde k &#382;&#225;dn&#233; aktivit&#277;, je spojen&#237; do Internetu uzav&#345;eno. (pouze pro volbu Connect on Demand)
-Helptext Redial Timeout => &#268;as po odpojen&#237;, po kter&#253; router &#269;ek&#225;, ne&#382; se pokus&#237; znovu nav&#225;zat spojen&#237;.
diff --git a/package/webif/files/usr/lib/webif/lang/de/common.txt b/package/webif/files/usr/lib/webif/lang/de/common.txt
deleted file mode 100644
index f8ab28df1d..0000000000
--- a/package/webif/files/usr/lib/webif/lang/de/common.txt
+++ /dev/null
@@ -1,228 +0,0 @@
-lang => Deutsch
-# Common
-Settings saved => Einstellungen gespeichert
-Settings not saved => Einstellungen nicht gespeichert
-Save Changes => Speichern
-Apply Changes => &Uuml;bernehmen
-Clear Changes => Verwerfen
-Review Changes => Anzeigen
-Host Name => Hostname
-Uptime => Uptime
-Load => Systemlast
-Version => Version
-Categories => Kategorien
-Subcategories => Unterkategorien
-more... => Weitere Informationen...
-Add => Hinzuf&uuml;gen
-Remove => Entfernen
-Warning => Warnung
-Password_warning => es wurde noch kein Passwort f&uuml;r Web-Administration und SSH gesetzt.<br />Bitte geben Sie jetzt ein neues Passwort ein (Benutzername im Browser: 'root').
-
-# Categories
-Info => Info
-About => &Uuml;ber
-Router Info => Routerinformationen
-
-Status => Status
-Connections => Netzwerkverbindungen
-DHCP => DHCP
-Wireless => WLAN
-
-System => System
-Password => Passwort
-Settings => Einstellungen
-Installed Software => Installierte Software
-Firmware Upgrade => Firmware aktualisieren
-
-Network => Netzwerk
-LAN => LAN
-WAN => Internet
-Wireless => WLAN
-Advanced Wireless => WLAN (erweitert)
-Hosts => Host-Konfiguration
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Dieses Programm ist freie Software. Sie k&ouml;nnen es unter den Bedingungen der GNU General Public License,<br /> wie von der Free Software Foundation ver&ouml;ffentlicht, weitergeben und/oder modifizieren,<br /> entweder gem&auml;&szlig; Version 2 der Lizenz oder (nach Ihrer Option) jeder sp&auml;teren Version.
-Contributions by => Mit Beitr&auml;gen von
-Layout based on => Layout basiert auf
-by => von
-
-
-No config change. => Es wurden keine Konfigurations&auml;nderungen vorgenommen.
-Config discarded. => Ihre Konfigurations&auml;nderungen wurden verworfen.
-Config changes: => Aktuelle Konfigurations&auml;nderungen:
-Updating config... => Aktualisiere die Konfiguration...
-
-
-# 'Router Info' page
-Firmware Version => Firmwareversion
-Kernel Version => Kernelversion
-Current Date/Time => Datum/Uhrzeit
-MAC Address => MAC-Adresse
-
-
-# 'Connections' page
-Connection Status => Verbindungsstatus
-Physical Connections => Netzwerkschnittstellen
-Router Connections => Netzwerkverbindungen auf dem Router
-
-
-# 'DHCP' page
-DHCP leases => DHCP-Leases
-IP Address => IP-Adresse
-Name => Name
-Expires in => G&uuml;ltigkeitsdauer
-
-
-# 'Wireless Status' page
-Wireless Status => WLAN-Status
-
-# 'Password' page
-Password Change => Passwort &auml;ndern
-New Password => Neues Passwort
-Confirm Password => Passwort best&auml;tigen
-
-# 'System Settings' page
-System Settings => Systemeinstellungen
-Host Name => Hostname
-Language => Sprache
-
-# 'Installed Software' page
-Installed Packages => Installierte Pakete
-Update package lists => Paketlisten aktualisieren
-Uninstall => Deinstallieren
-Install => Installieren
-
-
-# 'Firmware Upgrade' page
-Firmware format => Firmware-Format
-Error => Fehler
-done => fertig
-Invalid_format => Das Dateiformat der Firmware ist ung&uuml;ltig
-Erase_JFFS2 => JFFS2-Partition l&ouml;schen
-Options => Optionen
-Firmware_image => Firmware-Datei:
-Upgrade => Aktualisieren
-Upgrading... => Aktualisiere...
-
-# 'LAN Settings' page
-LAN Settings => Netzwerkeinstellungen
-LAN Configuration => Netzwerkkonfiguration
-Netmask => Subnetzmaske
-Default Gateway => Standardgateway
-DNS Servers => DNS-Server
-DNS Address => DNS-Serveradresse
-
-Note => Hinweis
-
-
-# 'WAN Settings' page
-WAN Settings => Internet-Einstellungen
-WAN Configuration => Internet-Konfiguration
-PPTP Server IP => PPTP-Serveradresse
-Connection Type => Verbindungsart
-No WAN => Keine Verbindung
-DHCP => DHCP
-Static IP => Statische Konfiguration
-IP Settings => IP-Konfiguration
-PPP Settings => PPP-Einstellungen
-Redial Policy => Verbindungsaufbau
-Connect on Demand => Bei Bedarf
-Keep Alive => Verbindung aufrechterhalten
-Maximum Idle Time => Wartezeit bei Inaktivit&auml;t
-Redial Timeout => Wartezeit bei unterbrochener Verbindung
-MTU => Maximale Paketgr&ouml;&szlig;e
-Username => Benutzername
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => WLAN-Konfiguration
-Wireless Interface => WLAN-Interface
-WEP Key => WEP-Schl&uuml;ssel
-Selected WEP Key => Ausgew&auml;hlter WEP Schl&uuml;ssel
-WPA PSK => WPA-Schl&uuml;ssel
-ESSID => ESSID
-Channel => Kanal
-RADIUS IP Address => RADIUS-Serveradresse
-RADIUS Server Key => RADIUS-Serverpasswort
-Enabled => Aktiviert
-Disabled => Deaktiviert
-ESSID Broadcast => ESSID-Broadcast 
-Show => Anzeigen
-Hide => Verstecken
-WLAN Mode => Betriebsmodus
-Access Point => Access Point
-Client => Client
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Encryption Settings => Verschl&uuml;sselungseinstellungen
-Encryption Type => Verschl&uuml;sselungsart
-PSK => Passwort
-WPA Mode => WPA-Modus
-WPA Algorithms => WPA-Verschl&uuml;sselungsalgorithmen
-WEP Keys => WEP-Schl&uuml;ssel
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => WLAN-Konfiguration (erweitert)
-WDS Connections => WDS-Verbindungen
-MAC Filter List => Zugriffsbeschr&auml;nkung (MAC-Adresse)
-Filter Mode => Filtermodus
-Allow => Erlauben
-Deny => Verweigern
-Set => Setzen
-Settings => Einstellungen
-Automatic WDS => Automatische WDS-Verbindung
-
-# "Hosts" page
-
-MAC Address => MAC-Adresse
-Configured Hosts => Konfigurierte Hosts
-DHCP Static => Statische DHCP-Eintr&auml;ge
-Host Names => Host-Eintr&auml;ge
-
-
-Up => Hoch
-Down => Runter
-Edit => Bearbeiten
-Delete => L&ouml;schen
-Save => Speichern
-Cancel => Abbrechen
-
-Forward => Weiterleiten
-Accept => Zulassen
-Drop => Verweigern
-
-Firewall => Firewall
-Firewall Rules => Firewall-Regeln
-Firewall Configuration => Firewall-Konfiguration
-
-New Rule => Neue Regel
-Match => Filter
-Target => Ziel
-Port => Port
-
-Protocol => Protokoll
-Source IP => Quell-IP
-Destination IP => Ziel-IP
-Source Ports => Quell-Ports
-Destination Ports => Ziel-Ports
-
-Forward to => Weiterleiten an
-Port => Port
-
-Helptext ESSID => Name des Funknetzwerks
-Helptext DNS save => Sie m&uuml;ssen Ihre &Auml;nderungen an dieser Seite speichern, bevor Sie DNS-Server hinzuf&uuml;gen oder entfernen
-
-Helptext Operation mode => Setzt den Betriebsmodus f&uuml;r das  WLAN-Interface. Die Einstellung 'Client (Bridge)' &auml;ndert nichts an den eigentlichen Netzwerkeinstellungen, es &auml;ndert lediglich einige Parameter im WLAN-Treiber, damit man das Interface eingeschr&auml;nkt in einer Bridge verwenden kann.
-Helptext Encryption Type => 'WPA (RADIUS)' wird nur im Access-Point-Modus unterstützt. <br /> 'WPA (PSK)' funktioniert nicht im Ad-Hoc-Modus. 
-Helptext IP Settings => IP-Einstellungen sind optional für DHCP und PPTP. Wenn sie gesetzt sind, werden sie als Standardwerte verwendet, falls kein DHCP-Server erreichbar ist. 
-Helptext Idle Time => Wartezeit in Sekunden, nach der bei Inaktivität die Internetverbindung getrennt wird.
-Helptext Redial Timeout => Maximale Zeit, die der Router auf Antwort vom Provider warten soll, bevor die Verbindung neu aufgebaut wird.
-
-# untranslated:
-Available packages => Verf&uuml;gbare Pakete
-
diff --git a/package/webif/files/usr/lib/webif/lang/dk/common.txt b/package/webif/files/usr/lib/webif/lang/dk/common.txt
deleted file mode 100644
index bd8f86745a..0000000000
--- a/package/webif/files/usr/lib/webif/lang/dk/common.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-lang => Dansk
-# Common
-Settings saved => Indstillingerne er gemt
-Settings not saved => Indstillinger er ikke gemt
-Save Changes => Gem &aelig;ndringerne
-Apply Changes => Aktiver &aelig;ndringer
-Clear Changes => Glem &aelig;ndringerne
-Review Changes => Se &aelig;ndringer
-Host Name => V&aelig;rtsnavn
-Uptime => Oppetid
-Load => Systembelastning
-Version => Version
-Categories => Kategorier
-Subcategories => Underkategorier
-more... => mere...
-Add => Tilf&oslash;je
-Remove => Fjern
-Warning => Advarsel
-Password_warning => Der er ikke sat noget kodeord eller l&oslash;sen p&aring; hverken Webadministration eller SSH.<br />V&aelig;r venlig at v&aelig;lge og/eller indtaste dit kodeord (Brugernavn er 'root' med sm&aring; bogstaver).
-
-# Categories
-Info => Info
-About => Om
-Router Info => Routerinformation
-
-Status => Status
-Connections => Netv&aelig;rksforbindelser
-DHCP => DHCP
-Wireless => Tr&aring;dl&oslash;s
-
-System => System
-Password => Kodeord
-Settings => Indstillinger
-Installed Software => Installeret programmel
-Firmware Upgrade => Firmware opgradering
-
-Network => Netv&aelig;rk
-LAN => Lokalnet
-WAN => Internet
-Wireless => Tr&aring;dl&oslash;s
-Advanced Wireless => Avanceret tr&aring;dl&oslash;s
-Hosts => V&aelig;rtsnavne
-
-
-# 'About' page
-Copyright => Ophavsret
-
-GPL_Text => Dette program er fri software.  De m&aring; bruge, &aelig;ndre og videredistribuere det under betingelserne for "GNU General Public License",<br /> som offentliggjort af "Free Software Foundation" (Den frie softwarebev&aelig;gelse), enten i version 2 af licensen eller (efter deres valg), en hvilkensomhelst senere version.
-
-Contributions by => Bidrag fra
-Layout based on => Layoutet er baseret p&aring;
-by => af
-
-
-No config change. => Ingen konfigurations&aelig;ndring foretaget
-Config discarded. => Konfigurations&aelig;ndringerne blev kasseret
-Config changes: => Forel&oslash;bige &aelig;ndringer
-Updating config... => S&aelig;tter &aelig;ndringerne i kraft
-
-# 'Router Info' page
-Firmware Version => Firmwareversion
-Kernel Version => Kerneversion
-Current Date/Time => Aktuel dato/tid
-MAC Address => MAC adresse
-
-
-# 'Connections' page
-Connection Status => Forbindelsesstatus
-Physical Connections => Fysiske forbindelser
-Router Connections => Routerens forbindelser
-
-
-# 'DHCP' page
-DHCP leases => DHCP leasinger
-IP Address => IP adresse
-Name => Navn
-Expires in => Udl&oslash;bstid
-
-
-# 'Wireless Status' page
-Wireless Status => Tr&aring;dl&oslash;s status
-
-# 'Password' page
-Password Change => &AElig;ndre kodeord
-New Password => Nyt kodeord
-Confirm Password => Nyt kodeord igen
-
-# 'System Settings' page
-System Settings => Systemindstillinger
-Host Name => V&aelig;rtsnavn
-Language => Sprog
-
-# 'Installed Software' page
-Installed Packages => Installerede pakker
-Update package lists => Opdater pakkelisten
-Uninstall => Afindstaller
-Install => Installer
-
-
-# 'Firmware Upgrade' page
-Firmware format => Firmwareformat
-Error => Fejl
-done => f&aelig;rdig
-Invalid_format => Ubrugelig_format
-Erase_JFFS2 => Slet JFFS2 partitionen
-Options => Tilvalg
-Firmware_image => Firmwarefil:
-Upgrade => Opgradere
-Upgrading... => Opgraderer...
-
-# 'LAN Settings' page
-LAN Settings => Lokale netindstillinger
-LAN Configuration => Lokal netv&aelig;rkskonfiguration
-Netmask => Undernetmaske
-Default Gateway => Standard gateway
-DNS Servers => DNS-Server
-DNS Address => DNS-Serveradresse
-
-Note => Bem&aelig;rk
-
-
-# 'WAN Settings' page
-WAN Settings => Internet indstillinger
-WAN Configuration => Internetkonfiguration
-PPTP Server IP => PPTP-serveradresse
-Connection Type => Forbindelsestype
-No WAN => Ingen Internetops&aelig;tning
-DHCP => DHCP
-Static IP => Statisk IP
-IP Settings => IP indstillinger
-PPP Settings => PPP indstillinger
-Redial Policy => Genopkaldspolitik
-Connect on Demand => Forbind n&aring;r behovet er der
-Keep Alive => Hold forbindelsen i live (keep alive)
-Maximum Idle Time => Maksimal tid i tomgang (max idle)
-Redial Timeout => Opkaldstimeout
-MTU => Maksimal pakkest&oslash;relse (MTU)
-Username => Brugernavn
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Tr&aring;dl&oslash;s konfiguration
-Wireless Interface => Tr&aring;dl&oslash;s netkort
-WEP Key => WEP n&oslash;gle
-Selected WEP Key => Valgt WEP n&oslash;gle
-WPA PSK => WPA n&oslash;gle
-ESSID => ESSID
-Channel => Kanal
-RADIUS IP Address => IP adressen p&aring; RADIUS server
-RADIUS Server Key => Kodeord til RADIUS server
-Enabled => Aktiveret
-Disabled => Deaktiveret
-ESSID Broadcast => ESSID-Broadcast 
-Show => Vis
-Hide => Skjul
-WLAN Mode => Tr&aring;dl&oslash;s tilstand
-Access Point => Access Point
-Client => Klient
-Bridge => bro
-Ad-Hoc => Ad-Hoc
-Encryption Settings => Krypteringsindstillinger
-Encryption Type => Krypteringstype
-PSK => PSK kode
-WPA Mode => WPA tilstand
-WPA Algorithms => WPA krypteringsalgoritme
-WEP Keys => WEP n&oslash;gler
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Avanceret ops&aelig;tning af tr&aring;dl&oslash;s
-WDS Connections => WDS forbindelser (WDS repeater)
-MAC Filter List => Filteringsliste (MAC-numre)
-Filter Mode => Filtreingstilstand
-Allow => Tillad
-Deny => Forbyd
-Set => S&aelig;t
-Settings => Indstillinger
-Automatic WDS => Automatisk WDS forbindelse
-
-# "Hosts" page
-
-MAC Address => MAC adresse
-Configured Hosts => V&aelig;rtsnavne
-DHCP Static => Statiske IP adresser til DHCP
-Host Names => V&aelig;rtsnavne
-
-
-Up => Op
-Down => Ned
-Edit => Rette
-Delete => Slette
-Save => Gemme
-Cancel => Annullere
-
-Forward => Forward (videresend)
-Accept => Accept (tillad)
-Drop => Drop (smid v&aelig;k)
-
-Firewall => Firewall
-Firewall Rules => Firewall regler
-Firewall Configuration => Firewallkonfiguration
-
-New Rule => Ny regel
-Match => Match (sammenlign)
-Target => Target (G&aring; til)
-Port => Port
-
-Protocol => Protokol
-Source IP => Afsenders IP
-Destination IP => Modtagers IP
-Source Ports => Afsender porte
-Destination Ports => Modtager porte
-
-Forward to => Send videre til
-Port => Port
-
-Helptext ESSID => Navn p&aring; tr&aring;dl&oslash;s netv&aelig;rk
-Helptext DNS save => Gem &aelig;ndringer p&aring; denne side f&oslash;r du tilf&oslash;jer eller fjerner DNS servere. (Hvis ikke du vil miste dem.)
-
-Helptext Operation mode => S&aelig;tter driftstilstanden for den tr&aring;dl&oslash;se del af routeren.  'Klient' og 'Klient (bro)' bruges til at forbinde 2 tr&aring;dl&oslash;se routere.  I mange tilf&aelig;lde er WDS en bedre (men mere avanceret) l&oslash;sning.  'Klient' udnytter dog b&aring;ndbredden bedst, hvis du vitterlig kun har en maskine tilsluttet.  <br /> Indstillingen 'Klient (bro)' &aelig;ndrer ikke direkte ved netv&aelig;rksindstillingerne. Det er et beskidt hack som f&aring;r routeren til at foregiver at kun en maskine (et MAC nummer) er tilsluttet. Det sker for at overvinde et problem i 802.11 protokollen, som forhindrer at man problemfrit (i almindelig 'Klient'-tilstand) kan bruge den tr&aring;dl&oslash;se forbindelse fra flere maskiner samtidig. <br /> AP bruges til en standalone router, hvor f.eks. b&aelig;rbare computere skal have adgang til Internet og/eller lokalnet. <br /> Hvis du ikke ved hvad 'Ad Hoc' tilstanden g&oslash;r, har du h&oslash;jst sandsynligt ikke brug for den.
-
-Helptext Encryption Type => 'WPA (RADIUS)' er kun underst&oslash;ttet i AP (Access Point) tilstand. <br /> 'WPA (PSK)' fungerer ikke i 'Ad-Hoc' tilstand.
-
-Helptext IP Settings => IP indstilinger er frivillig for DHCP og PPTP.  N&aring;r de er sat, bliver de brugt som standv&aelig;rdiger, hvis der ikke er en tilg&aelig;ngelig DHCP server.
-
-Helptext Idle Time => Ventetid i sekunder f&oslash;r inaktivitet bliver &aring;rsagen til at forbindelsen afbrydes.
-
-Helptext Redial Timeout => Ventetid f&oslash;r der pr&oslash;ves at ringe op igen.
-
-# untranslated:
-Available packages => Available packages
diff --git a/package/webif/files/usr/lib/webif/lang/ee/common.txt b/package/webif/files/usr/lib/webif/lang/ee/common.txt
deleted file mode 100644
index e3690cd5f5..0000000000
--- a/package/webif/files/usr/lib/webif/lang/ee/common.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-lang => Eesti
-#Common 
-Settings saved => S&auml;tted salvestatud
-Settings not saved => S&auml;tted on salvestamata
-Save Changes => Salvesta muudatused
-Apply Changes => Rakenda muudatused
-Clear Changes => Kustuta muudatused
-Review Changes => Vaata tehtud muudatusi
-Host Name => Hostinimi
-Uptime => T&ouml;&ouml;v&otilde;imeaega seni
-Load => Koormus
-Version => Versioon
-Categories => Kategooriad
-Subcategories => Alamkategooriad
-more... => veel... 
-Add => Lisa
-Remove => Eemalda
-Warning => Hoiatus
-Password_warning => veebilidese ja SSH salas&otilde;na on seadmata<br />Palun, sisesta see (veebiliidese kasutajanimi on 'root').
- 
-# Categories 
-Info => Info
-About => Teavet
-Router Info => Marsruuteri info
- 
-Status => Olek
-Connections => &Uuml;hendused
-DHCP => DHCP 
-Wireless => Raadioliides
- 
-System => S&uuml;steem
-Password => Parool
-Settings => S&auml;tted
-Installed Software => Installitud tarkvara
-Firmware Upgrade => P&uuml;sivara uuendamine
- 
-Network => V&otilde;rk
-LAN => LAN 
-WAN => WAN 
-Wireless => Raadioliides
-Advanced Wireless => Raadioliidese t&auml;psemad s&auml;tted
-Hosts => Hostid
- 
-
-# About page 
-Copyright => Copyright 
- 
-GPL_Text => K&auml;esolev programm on vabavara; seda v&otilde;ib levitada ja/v&otilde;i <br >modifitseerida vastavalt Free Software Foundationi <br > avaldatud avaliku litsentsi GNU General Public License 2. versiooni v&otilde;i <br > (teie valikul) mis tahes uuema versiooni tingimustele.
- 
-Contributions by => Kaasaaitajad
-Layout based on => Kujunduse idee
-by => autor
- 
- 
-No config change. => Konfiguratsioon muutmata. 
-Config discarded. => Konfiguratsioon h&uuml;ljatud. 
-Config changes: => Konfiguratsiooni muudatused: 
-Updating config... => Uuendan konfiguratsiooni... 
- 
-# Router Info page 
-Firmware Version => P&uuml;sivara versioon
-Kernel Version => Kerneli versioon
-Current Date/Time => Praegune kuup&auml;ev/kellaaeg
-MAC Address => MAC-aadress 
- 
- 
-# Connections page 
-Connection Status => &Uuml;henduse olek
-Physical Connections => F&uuml;&uuml;silised &uuml;hendused
-Router Connections => Marsruuteri&uuml;hendused
- 
- 
-# DHCP page 
-DHCP leases => DHCP antud aadressid 
-IP Address => IP-aadress
-Name => Nimi
-Expires in => Aegub
- 
- 
-# Wireless Status page 
-Wireless Status => Raadioliidese olek
- 
-# Password page 
-Password Change => Parooli muutmine
-New Password => Uus parool
-Confirm Password => Korrake parooli
- 
-# System Settings page 
-System Settings => S&uuml;steemi s&auml;tted
-Host Name => Hostinimi
-Language => Keel
- 
-# Installed Software page 
-Installed Packages => Installitud paketid
-Update package lists => V&auml;rskenda paketiloendit
-Uninstall => Desinstalli
-Install => Installi
-Available packages => Saadaolevad paketid 
- 
-# Firmware Upgrade page 
-Firmware format => P&uuml;sivara vorming
-Error => T&otilde;rge
-done => valmis
-Invalid_format => Vale vorming
-Erase_JFFS2 => Kustuta JFFS2 
-Options => Valikud
-Firmware_image => P&uuml;sivara t&otilde;mmis
-Upgrade => Versiooniuuendus
-Upgrading... => Uuendan... 
- 
-# LAN Settings page 
-LAN Settings => LAN-i s&auml;tted 
-LAN Configuration => LAN-i konfiguratsioon 
-Netmask => V&otilde;rgu mask
-Default Gateway => Vaikel&uuml;&uuml;s
-DNS Servers => DNS-serverid 
-DNS Address => DNS-i aadress
- 
-Note => M&auml;rkus
- 
- 
-# WAN Settings page 
-WAN Settings => WAN-i s&auml;tted
-WAN Configuration => WAN-i konfiguratsioon
-PPTP Server IP => PPTP-serveri IP 
-Connection Type => &Uuml;henduse t&uuml;&uuml;p
-No WAN => WAN-i ei kasutata
-DHCP => DHCP 
-Static IP => Staatiline IP
-IP Settings => IP-s&auml;tted
-PPP Settings => PPP-s&auml;tted
-Redial Policy => Kordusvalimispoliitika
-Connect on Demand => &Uuml;henda n&otilde;udmisel
-Keep Alive => Hoia &uuml;hendust t&ouml;&ouml;s
-Maximum Idle Time => Maksimaalne j&otilde;udeaeg
-Redial Timeout => Kordusvalimise aegumine
-MTU => MTU 
-Username => Kasutajanimi
- 
- 
-# Wireless Configuration page 
-Wireless Configuration => Raadioliidese konfiguratsioon 
-Wireless Interface => Raadioliides
-WEP Key => WEP-v&otilde;ti 
-Selected WEP Key => Valitud WEP-v&otilde;ti 
-WPA PSK => WPA PSK 
-ESSID => ESSID 
-Channel => Kanal
-RADIUS IP Address => RADIUS IP-aadress
-RADIUS Server Key => RADIUS-serveri v&otilde;ti 
-Enabled => Lubatud
-Disabled => Keelatud
-ESSID Broadcast => ESSID-i levindamine 
-Show => N&auml;ita
-Hide => Peida
-WLAN Mode => WLAN-i rez"iim
-Access Point => AP
-Client => Klient
-Bridge => Sild
-Ad-Hoc => Ad-Hoc 
-Encryption Settings => Kr&uuml;pteerimise s&auml;tted
-Encryption Type => Kr&uuml;pteerimise t&uuml;&uuml;p
-PSK => PSK 
-WPA Mode => WPA rez"iim 
-WPA Algorithms => WPA algoritmid 
-WEP Keys => WEP-v&otilde;tmed 
- 
- 
-# Advanced Wireless Configuration page 
-Advanced Wireless Configuration => Raadioliidese t&auml;psem konfiguratsioon
-WDS Connections => WDS-&uuml;hendused 
-MAC Filter List => MAC-filtri loend 
-Filter Mode => Filtri rez"iim
-Allow => Luba
-Deny => Keela
-Set => Sea 
-Settings => S&auml;tted
-Automatic WDS => Automaatne WDS
- 
-# "Hosts" page 
- 
-MAC Address => MAC-aadress 
-Configured Hosts => Konfigureeritud hostid
-DHCP Static => Staatiline DHCP
-Host Names => Hostinimed
- 
- 
-Up => &Uuml;les
-Down => Alla
-Edit => Muuda
-Delete => Kustuta
-Save => Salvesta
-Cancel => Loobu
- 
-Forward => Forward
-Accept => Accept
-Drop => Drop
- 
-Firewall => Tulem&uuml;&uuml;r
-Firewall Rules => Tulem&uuml;&uuml;ri reeglid
-Firewall Configuration => Tulem&uuml;&uuml;ri konfiguratsioon
- 
-New Rule => Uus reegel
-Match => Vastavus
-Target => Sihtkoht
-Port => Port 
- 
-Protocol => Protokoll
-Source IP => Saatja IP
-Destination IP => Saaja IP 
-Source Ports => Saatja pordid
-Destination Ports => Saaja pordid
- 
-Forward to => Suuna:
-Port => Port 
- 
-Helptext ESSID => Teie traadita v&otilde;rgu v&otilde;rgunimi
-
-Helptext DNS save => Sellel lehel tehtud muudatused tuleb enne DNS-serverite lisamist/eemaldamist salvestada
- 
-Helptext Operation mode => M&auml;&auml;rab teie traadita v&otilde;rgu t&ouml;&ouml;reziimi. S&auml;te "Klient (Sild)" ei muuda v&otilde;rguliidese s&auml;tteid. Muudetakse ainult raadioliidese draiveri teatud parameetreid, mis on seotud liidese sillarez"iimi piirangute lubamisega
- 
-Helptext Encryption Type => 'WPA (RADIUS)' on lubatud ainult rez"iimis "AP". <br /> S&auml;te 'WPA (PSK)' ei t&ouml;&ouml;ta v&otilde;rd&otilde;igusv&otilde;rgurez"iimis (Ad-Hoc)
- 
-Helptext IP Settings => IP-s&auml;tted on DHCP ja PPTP puhul valikulised. Kui muudate neid s&auml;tteid, siis rakendatakse need vaikes&auml;tetena juhul, kui DHCP-server pole saadaval.
- 
-Helptext Idle Time => Aeg sekundites, mille v&auml;ltel marsruuter enne Interneti-&uuml;henduse katkestamist ootab (ainult s&auml;tte Connect on Demand puhul).
- 
-Helptext Redial Timeout => Aeg sekundites, kui kaua marsruuter p&auml;rast teenusepakkuja v&otilde;rgust teate "pole vastust" saamist ootab, enne kui asub &uuml;hendust taastama.
-
diff --git a/package/webif/files/usr/lib/webif/lang/es/common.txt b/package/webif/files/usr/lib/webif/lang/es/common.txt
deleted file mode 100644
index d488d1f433..0000000000
--- a/package/webif/files/usr/lib/webif/lang/es/common.txt
+++ /dev/null
@@ -1,227 +0,0 @@
-lang => Espa&ntilde;ol
-# Common
-Settings saved => Cambios guardados
-Settings not saved => No se han podido guardar los cambios
-Save Changes => Guardar cambios
-Apply Changes => Aplicar cambios
-Clear Changes => Deshacer cambios
-Review Changes => Comprobar cambios
-Host Name => Nombre del equipo
-Uptime => Uptime
-Load => Carga del sistema
-Version => Versi&oacute;n
-Categories => Categor&iacute;as
-Subcategories => Subcategor&iacute;s
-more... => m&aacute;s...
-Add => A&ntilde;adir
-Remove => Eliminar
-Warning => Atenci&oacute;n
-Password_warning => no has establecido una contrase&ntilde;a de protecci&oacute;n para el router (acceso web y ssh). Por favor, elija una ahora (el nombre de usuario ser&aacute; 'root')
-
-# Categories
-Info => Info
-About => Acerca de
-Router Info => Informaci&oacute;n del router
-
-Status => Estado
-Connections => Conexiones
-DHCP => DHCP
-Wireless => Wi-Fi
-
-System => Sistema
-Password => Contrase&ntilde;a
-Settings => Configuraci&oacute;n
-Installed Software => Programas instalados
-Firmware Upgrade => Actualizar Firmware
-
-Network => Red
-LAN => LAN
-WAN => Internet
-Wireless => Wi-Fi
-Advanced Wireless => Wi-Fi (avanzado)
-Hosts => Configuration de hosts
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Este programa es software libre; Usted puede distribuirlo y/o <br />modificarlo bajo los t&eacute;rminos de la General Public License<br />como est&aacute; publicada por la Free Sofware Foundation; bien de la versi&oacute;n 2 de dicha Licencia o bien (seg&uacute;n su elecci&oacute;n) de cualquier versi&oacute;n posterior.
-Contributions by => Contribuidores
-Layout based on => Aspecto basado en
-by => por
-
-
-No config change. => No ha habido cambios de configuraci&oacute;n.
-Config discarded. => Los cambios no se han aceptado.
-Config changes: => Configuraci&oacute;n actual:
-Updating config... => Actualizando la configuraci&oacute;n...
-
-
-# 'Router Info' page
-Firmware Version => Versi&oacute;n del firmware
-Kernel Version => Versi&oacute;n del Kernel
-Current Date/Time => Fecha/Hora
-MAC Address => Direcci&oacute;n MAC
-
-
-# 'Connections' page
-Connection Status => Estado de las conexiones
-Physical Connections => Conexiones f&iacute;sicas
-Router Connections => Conexiones del router
-
-
-# 'DHCP' page
-DHCP leases => Pr&eacute;stamos DHCP
-IP Address => Direcci&oacute;n IP
-Name => Nombre
-Expires in => Caduca en
-
-
-# 'Wireless Status' page
-Wireless Status => Estado del Wi-Fi
-
-# 'Password' page
-Password Change => Cambio de la contrase&ntilde;a
-New Password => Nueva contrase&ntilde;a
-Confirm Password => Confirme la contrase&ntilde;a
-
-# 'System Settings' page
-System Settings => Par&aacute;metros del sistema
-Host Name => Nombre del host
-Language => Idioma
-
-# 'Installed Software' page
-Installed Packages => Paquetes instalados
-Update package lists => Actualizaci&oacute;n de la lista de paquetes
-Uninstall => Desinstalar
-Install => Instalar
-
-
-# 'Firmware Upgrade' page
-Firmware format => Formato del firmware
-Error => Error
-done => hecho
-Invalid_formt => Formato del firmware inv&aacute;lido
-Erase_JFFS2 => Borrar la partici&oacute;n JFFS2
-Options => Opciones
-Firmware_image => Archivo del firmware
-Upgrade => Actualizar
-Upgrading... => Actualizaci&oacute;n...
-
-# 'LAN Settings' page
-LAN Settings => Configuraci&oacute;n LAN
-LAN Configuration => Configuraci&oacute;n LAN
-Netmask => M&aacute;scara de subred
-Default Gateway => Puerta de enlace (gateway)
-DNS Servers => Servidor DNS
-DNS Address => Direcci&oacute;n IP del DNS
-
-Note => Nota
-
-# 'WAN Settings' page
-WAN Settings => Configuraci&oacute;n de Internet
-WAN Configuration => Configuraci&oacute;n de Internet
-PPTP Server IP => Direcci&oacute;n IP del servidor PPTP
-Connection Type => Tipo de conexi&oacute;n
-No WAN => Sin configuraci&oacute;n de Internet
-DHCP => DHCP
-Static IP => IP est&aacute;tica
-IP Settings => Configuraci&oacute;n IP
-PPP Settings => Configuraci&oacute;n PPP
-Redial Policy => Opciones de reconexi&oacute;n
-Connect on Demand => Bajo demanda
-Keep Alive => Conexi&oacute;n permanente
-Maximum Idle Time => Tiempo m&aacute;ximo de inactividad
-Redial Timeout => Tiempo de reconexi&oacute;n
-MTU => MTU (tama&ntilde;o de los paquetes)
-Username => Nombre de usuario
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Configuraci&oacute;n Wi-Fi
-Wireless Interface => Interfaz Wi-Fi
-WEP Key => Clave WEP
-Selected WEP Key => Clave WEP seleccionada
-WPA PSK => WPA-PSK
-ESSID => ESSID
-Channel => Canal
-RADIUS IP Address => Direcci&oacute;n IP del servidor RADIUS
-RADIUS Server Key => Secreto RADIUS
-Enabled => Activado
-Disabled => Desactivado
-ESSID Broadcast => Difusi&oacute;n del SSID
-Show => Mostrar
-Hide => Ocultar
-WLAN Mode => Modo Wi-Fi
-Access Point => Punto de acceso
-Client => Cliente
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Operation mode => Modo de funcionamiento
-Encryption Settings => Par&aacute;metros de enriptaci&oacute;n
-Encryption Type => Tipo de encriptaci&oacute;n
-PSK => PSK
-WPA Mode => Modo WPA
-WPA Algorithms => Algoritmos WPA
-WEP Keys => Clave WEP
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Configuraci&oacute;n Wi-Fi avanzada
-WDS Connections => Conexiones WDS
-MAC Filter List => Filtrar por direcci&oacute;n MAC
-Filter Mode => Modo de filtrado
-Allow => Autorizar
-Deny => Denegar
-Set => Establecer
-Settings => Par&aacute;metros
-Automatic WDS => WDS autom&aacute;tico
-
-# "Hosts" page
-
-MAC Address => Direcci&oacute;n MAC
-Configured Hosts => Equipos configurados
-DHCP Static => Entradas DHCP est&aacute;ticas
-Host Names => Nombre de los equipos
-
-Up => Subir
-Down => Bajar
-Edit => Editar
-Delete => Borrar
-Save => Guardar
-Cancel => Cancelar
-
-Forward => Redirigir
-Accept => Aceptar
-Drop => Descartar
-
-Firewall => Firewall
-Firewall Rules => Reglas del Firewall
-Firewall Configuration => Configuraci&oacute;n del Firewall
-
-New Rule => Nueva regla
-Match => Filtrar
-Target => Acci&oacute;n
-Port => Puerto
-
-Protocol => Protocolo
-Source IP => IP origen
-Destination IP => IP destino
-Source Ports => Puertos origen
-Destination Ports => Puertos destino
-
-Forward to => Redirigir a
-Port => Puerto
-
-Helptext ESSID => SSID
-Helptext DNS save => Es recomendable guardar los cambios antes de a&ntilde;adir o eliminar servidores de DNS de la lista
-
-Helptext Operation mode => Establece el modo de operaci&oacute;n de tu red wireless. Eligiendo 'Client (bridge)' no cambiar&aacute; la configuraci&oacute;n de la interfaz de red. Simplemente a&ntilde;adir&aacute; unos par&aacute;metros que permitir&aacute;n que la interfaz wireless act&uacute;e en cierta medida en modo bridge.
-Helptext Encryption Type => 'WPA (RADIUS)' s&oacute;lo puede usarse en modo Punto de Acceso.<br /> 'WPA (PSK)' no funciona en modo Ad-Hoc.
-Helptext IP Settings => Las opciones IP son opcionales para DHCP y PPTP. Si las eliges, se utilizar&aacute;n por defecto en caso de que la configuraci&oacute;n autom&aacute;tica falle.
-Helptext Idle Time => N&uacute;mero de segundos sin actividad con Internet que debe esperar el router antes de desconectarse. (S&oacute;lo para el modo Bajo Demanda).
-Helptext Redial Timeout => N&uacute;mero de segundos sin recibir respuesta del servidor que debe esperar el router para volver a conectarse.
-
-
-# untranslated:
-Available packages => Available packages
-
diff --git a/package/webif/files/usr/lib/webif/lang/fr/common.txt b/package/webif/files/usr/lib/webif/lang/fr/common.txt
deleted file mode 100644
index 96cdb83a77..0000000000
--- a/package/webif/files/usr/lib/webif/lang/fr/common.txt
+++ /dev/null
@@ -1,238 +0,0 @@
-lang => Fran&ccedil;ais
-Encoding => UTF-8
-
-# Common
-Settings saved => Sauvegard&eacute;
-Settings not saved => Non sauvegard&eacute;
-Save Changes => Sauvegarder
-Apply Changes => Appliquer
-Clear Changes => Effacer
-Review Changes => Revoir
-Host Name => Nom de machine
-Uptime => Uptime
-Load => Charge syst&egrave;me
-Version => Version
-Categories => Cat&eacute;gories
-Subcategories => Sous-cat&eacute;tgories
-more... => davantage...
-Add => Ajouter
-Remove => Enlever
-
-Warning => Attention
-Password_warning => vous n'avez pas configur&eacute; de mot de passe pour l'interface Web et l'acc&egrave;s SSH<br /> Entrez en un maintenant (le nom d'utilisateur dans le navigateur sera 'root'). 
-
-# Categories
-Info => Info
-About => A propos
-Router Info => Informations routeur
-
-Status => Statut
-Connections => Connexions r&eacute;seau
-DHCP => DHCP
-Wireless => Wi-Fi
-
-System => Syst&egrave;me
-Password => Mot de passe
-Settings => Param&egrave;tres
-Installed Software => Logiciels install&eacute;s
-Firmware Upgrade => Mise &agrave; jour firmware
-
-Network => R&eacute;seau
-LAN => LAN
-WAN => Internet
-Wireless => Wi-Fi
-Advanced Wireless => Wi-Fi (avanc&eacute;)
-Hosts => Configuration des h&ocirc;tes
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Ce programme est un logiciel libre; vous pouvez le redistribuer
-et/ou le modifier sous les termes de la General Public License telle qu'elle
-est publi&eacute;e par la Free Sofware Foundation; que ce soit sous la version
-2 de la license, ou (&agrave; votre convenance) une version ult&eacute;rieure
-Contributions by => Contributions par
-Layout based on => Pr&eacute;sentation bas&eacute;e sur
-by => par
-
-
-No config change. => Pas de changements.
-Config discarded. => Pas de prise en compte.
-Config changes: => Configuration actuelle:
-Updating config... => Mise &agrave; jour...
-
-
-# 'Router Info' page
-Firmware Version => Version du firmware
-Kernel Version => Version du noyau
-Current Date/Time => Date et heure
-MAC Address => Adresse MAC
-
-
-# 'Connections' page
-Connection Status => Etat des connexions
-Physical Connections => Connexions physiques
-Router Connections => Connexions au routeur
-
-
-# 'DHCP' page
-DHCP leases => Baux DHCP
-IP Address => Adresse IP
-Name => Nom
-Expires in => Expire dans
-
-
-# 'Wireless Status' page
-Wireless Status => Etat du Wi-Fi
-
-# 'Password' page
-Password Change => Changement du mot de passe
-New Password => Nouveau mot de passe
-Confirm Password => Confirmez le mot de passe
-
-# 'System Settings' page
-System Settings => Param&egrave;tres du syst&egrave;me
-Host Name => Nom d'h&ocirc;te
-Language => Langue
-
-# 'Installed Software' page
-Installed Packages => Paquets logiciels install&eacute;s
-Update package lists => Mise &agrave; jour de la liste des paquets
-Uninstall => D&eacute;sinstaller
-Install => Installer
-
-
-# 'Firmware Upgrade' page
-Firmware format => Format du firmware
-Error => Erreur
-done => prêt
-Invalid_formt => Le firmware n'a pas un format valide
-Erase_JFFS2 => Effacer la partition JFFS2
-Options => Options
-Firmware_image => Fichier firmware
-Upgrade => Mettre &agrave; jour
-Upgrading... => Mise &agrave; jour en cours...
-
-# 'LAN Settings' page
-LAN Settings => Param&egrave;tres LAN
-LAN Configuration => Configuration LAN
-Netmask => Masque r&eacute;seau
-Default Gateway => Passerelle par d&eacute;faut
-DNS Servers => Serveur DNS
-DNS Address => Addresse DNS
-
-Note => Note
-
-
-# 'WAN Settings' page
-WAN Settings => Param&egrave;tres Internet
-WAN Configuration => Configuration Internet
-PPTP Server IP => Adresse IP du serveur PPTP
-Connection Type => Type de connexion
-No WAN => Pas de configuration WAN
-DHCP => DHCP
-Static IP => IP statique
-IP Settings => Param&egrave;tres IP
-PPP Settings => Param&egrave;tres PPP
-Redial Policy => Options de renum&eacute;rotation
-Connect on Demand => Sur demande
-Keep Alive => Toujours connect&eacute;
-Maximum Idle Time => D&eacute;lai maximal d'inactivt&eacute;
-Redial Timeout => D&eacute;lai  avant renumérotation
-MTU => Taille maximale des paquets
-Username => Nom d'utilisateur
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Configuration Wi-Fi
-Wireless Interface => Interface Wi-Fi
-WEP Key => Cl&eacute; WEP
-Selected WEP Key => Choix de la cl&eacute; WEP
-WPA PSK => WPA cl&eacute; pr&eacute;-partag&eacute;e
-ESSID => ESSID
-Channel => Canal
-RADIUS IP Address => Adresse IP du serveur RADIUS
-RADIUS Server Key => Secret partag&eacute; avec le serveur RADIUS
-Enabled => Activ&eacute;
-Disabled => D&eacute;sactiv&eacute;
-ESSID Broadcast => Diffusion du SSID
-Show => Montrer
-Hide => Cacher
-WLAN Mode => Mode de fonctionnement Wi-Fi
-Access Point => Point d'acc&egrave;s
-Client => Client
-Bridge => Pont-r&eacute;seau
-Ad-Hoc => Ad-Hoc
-Encryption Settings => Param&egrave;tres de chiffrement
-Encryption Type => Type de chiffrement
-PSK => Cl&eacute; pr&eacute;-partag&eacute;e
-WPA Mode => Mode WPA
-WPA Algorithms => Algorithmes WPA
-WEP Keys => Cl&eacute;s WEP
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Configuration Wi-Fi avanc&eacute;e
-WDS Connections => Connexions WDS
-MAC Filter List => Filtre par adresses MAC
-Filter Mode => Mode de filtrage
-Allow => Autoriser
-Deny => Refuser
-Set => Param&egrave;trer
-Settings => Param&egrave;tres
-Automatic WDS => WDS automatique
-WDS watchdog timeout => D&eacute;lai d'inactivit&eacute; WDS
-Antenna selection => S&eacute;lection de l'antenne
-
-# "Hosts" page
-
-MAC Address => Adresse MAC
-Configured Hosts => H&ocirc;tes configur&eacute;s
-DHCP Static => Entr&eacute;es DHCP statiques
-Host Names => Noms d'h&ocirc;tes
-
-Up => Monter
-Down => Descendre
-Edit => Editer
-Delete => Effacer
-Save => Sauvegarder
-Cancel => Annuler
-
-Forward => Transf&eacute;rer
-Accept => Accepter
-Drop => Ignorer
-
-Firewall => Pare-feu
-Firewall Rules => R&egrave;gles du pare-feu
-Firewall Configuration => Configuration du pare-feu
-
-New Rule => Nouvelle r&egrave;gle
-Match => Concordance
-Target => Destination
-Port => Port
-
-Protocol => Protocole
-Source IP => IP source
-Destination IP => IP de destination
-Source Ports => Ports source
-Destination Ports => Ports de destination
-
-Forward to => Transf&eacute;rer vers
-Port => Port
-
-
-Helptext ESSID => Nom du r&eacute;seau sans-fil
-Helptext DNS save => Il est recommand&eacute; de sauvegarder vos param&egrave;tres avant d'ajouter/enlever des serveurs DNS
-
-
-Helptext Operation mode => Configure le mode de fonctionnement de votre
-r&eacute;seau sans-fil. Le mode Client (Pont r&eacute;seau sans-fil) ne changera pas les param&egrave;tres de votre interface. Certains param&egrave;tres de la carte Wi-Fi seront modifi&eacute;s de mani&egrave;re &agrave; pouvoir fonctionner en mode r&eacute;seau sans-fil.
-Helptext Encryption Type => 'WPA (RADIUS)' ne fonctionne qu'en mode point d'acc&egrave;s. <br /> 'WPA (PSK)' ne fonctionne pas en mode Ad-hoc.
-Helptext IP Settings => Les param&egrave;tres IP sont optionnels pour DHCP et PPTP. Si vous les configurez, ils seront utilis&eacute; comme param&egrave;tres par d&eacute;faut dans le cas o&uacute; le serveur DHCP ne r&eacute;pond< pas.
-Helptext Idle Time => Nombre de secondes sans traffic internet &agrave; attendre avant que le routeur d&eacute;connecte d'Internet (Connexion &agrave; la demande)
-Helptext Redial Timeout => Nombre de secondes &agrave; attendre apr&egrave;s n'avoir recu aucune r&eacute;ponse du fournisseur avant un nouvel &eacute;ssai de connexion.
-
-
-Available packages => Paquetages disponibles
-
diff --git a/package/webif/files/usr/lib/webif/lang/hr/common.txt b/package/webif/files/usr/lib/webif/lang/hr/common.txt
deleted file mode 100644
index a6291a26a6..0000000000
--- a/package/webif/files/usr/lib/webif/lang/hr/common.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-lang => Hrvatski
-Encoding => UTF-8
-# Common
-Settings saved => Postavke Spremljene
-Settings not saved => Postavke Nisu Spremljene
-Save Changes => Spremi Postavke
-Apply Changes => Primijeni Postavke
-Clear Changes => Obri&scaron;i Postavke
-Review Changes => Pregledaj Izmjene
-Host Name => Naziv Hosta
-Uptime => U Pogonu Od
-Load => Optere&aelig;enje
-Version => Verzija
-Categories => Kategorije
-Subcategories => Podkategorije
-more... => nastavak...
-Add => Dodaj
-Remove => Makni
-Warning => Upozorenje
-Password_warning => Niste postavili lozinku za Web su&egrave;elje i SSH pristup
-Molimo vas unesite lozinku (korisni&egrave;ko ime u va&scaron;em pregledniku &aelig; biti 'root').
-# Categories
-Info => Informacije
-About => Opis
-Router Info => O ure&eth;aju
-Status => Status
-Connections => Veze
-DHCP => DHCP
-Wireless => Wireless
-System => Sustav
-Password => Lozinka
-Settings => Postavke
-Installed Software => Instalirani Softver
-Firmware Upgrade => Nadogradnja Firmware-a
-Network => Mre&zcaron;a
-LAN => LAN
-WAN => WAN
-Wireless => Wireless
-Advanced Wireless => Napredne Wireless Postavke
-Hosts => Konfigurirani Hostovi
-
-# 'About' page
-Copyright => Copyright
-GPL_Text => This program is free software; you can redistribute it and/or 
-modify it under the terms of the GNU General Public License 
-as published by the Free Software Foundation; either version 2 
-of the License, or (at your option) any later version. 
-
-Contributions by => Contributions by SL SOLUCIJE d.o.o.
-Layout based on => Layout based on SmartHop webif
-by => by Silvije Filipovic - silvije.filipovic@slsolucije.hr
-
-No config change. => Nema nikakvih promjena konfiguracije.
-Config discarded. => Va&scaron;e promjene konfiguracije su opozvane.
-Config changes: => Trenutne promjene konfiguracije:
-Updating config... => Konfiguracija se nadogra&eth;uje...
-
-# 'Router Info' page
-Firmware Version => Firmware Verzija
-Kernel Version => Kernel Verzija
-Current Date/Time => Trenutni Datum/ Vrijeme
-MAC Address => Mac Adresa
-
-# 'Connections' page
-Connection Status => Status Veza
-Physical Connections => Fizi&egrave;ke Veze
-Router Connections => Usmjeravanje
-
-# 'DHCP' page
-DHCP leases => DHCP dodjela
-IP Address => IP Adresa
-Name => Naziv
-Expires in => Rok istjecanja
-
-# 'Wireless Status' page
-Wireless Status => Wireless Status
-# 'Password' page
-Password Change => Promjena Lozinke
-New Password => Nova Lozinka
-Confirm Password => Potvrdi Lozinku
-# 'System Settings' page
-System Settings => Postavke Sustava
-Host Name => Naziv Hosta
-Language => Jezik
-# 'Installed Software' page
-Installed Packages => Instalirani Paketi
-Update package lists => A&zcaron;uriraj listu paketa
-Uninstall => Deinstaliraj
-Install => Instaliraj
-
-# 'Firmware Upgrade' page
-Firmware format => Firmware format
-Error => Gre&scaron;ka
-done => gotovo
-Invalid_formt => Neispravan Firmware Format
-Erase_JFFS2 => Izbri&scaron;i JFFS2 particiju
-Options => Opcije
-Firmware_image => Firmware image za upload
-Upgrade => Nadogradi
-Upgrading... => Nadogradnja u tijeku...
-# 'LAN Settings' page
-LAN Settings => LAN Postavke
-LAN Configuration => LAN Konfiguracija
-Netmask => Netmask
-Default Gateway => Default Gateway
-DNS Servers => DNS Serveri
-DNS Address => DNS Adresa
-Note => Bilje&scaron;ke
-# 'WAN Settings' page
-WAN Settings => WAN Postavke
-WAN Configuration => WAN Konfiguracija
-PPTP Server IP => PPTP Server IP
-Connection Type => Tip Konekcije
-No WAN => Bez WAN Konekcije
-DHCP => DHCP
-Static IP => Stati&egrave;ki IP
-IP Settings => IP Postavke
-PPP Settings => PPP Postavke
-Redial Policy => Redial Policy
-Connect on Demand => Spajanje na Zahtjev
-Keep Alive => Keep Alive
-Maximum Idle Time => Dozvoljeni Max. Idle Time
-Redial Timeout => Redial Timeout
-MTU => MTU
-Username => Korisni&egrave;ko Ime
-
-# 'Wireless Configuration' page
-Wireless Configuration => Wireless Konfiguracija
-Wireless Interface => Wireless Interface
-WEP Key => WEP Key
-Selected WEP Key => Odabrani WEP Key
-WPA PSK => WPA PSK
-ESSID => ESSID
-Channel => Kanal
-RADIUS IP Address => RADIUS IP Adresa
-RADIUS Server Key => RADIUS Server Key
-Enabled => Omogu&aelig;eno
-Disabled => Onemogu&aelig;eno
-ESSID Broadcast => ESSID Broadcast
-Show => Neskriveni
-Hide => Skriveni
-WLAN Mode => WLAN Mod
-Access Point => Access Point
-Client => Client
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Operation mode => Operaativni mod
-Encryption Settings => Postavke Enkripcije
-Encryption Type => Tip Enkripcije
-PSK => PSK
-WPA Mode => WPA Mod
-WPA Algorithms => WPA Algoritmi
-WEP Keys => WEP Keys
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Napredne Wireless Postavke
-WDS Connections => WDS Veze
-MAC Filter List => MAC Filter Lista
-Filter Mode => Filter Mod
-Allow => Dozvoli
-Deny => Zabrani
-Set => Postavi
-Settings => Postavke
-Automatic WDS => Automatski WDS
-# "Hosts" page
-MAC Address => MAC Adresa
-Configured Hosts => Konfigurirani Hostovi
-DHCP Static => Stati&egrave;ki DHCP
-Host Names => Nazivi Hostova
-Up => Gore
-Down => Dolje
-Edit => Uredi
-Delete => Bri&scaron;i
-Save => Spremi
-Cancel => Odustani
-Forward => Naprijed
-Accept => Prihvati
-Drop => Otka&zcaron;i
-Firewall => Firewall
-Firewall Rules => Firewall Pravila
-Firewall Configuration => Firewall Konfiguracija
-New Rule => Novo Pravilo
-Match => Uvjet
-Target => Cilj
-Port => Port
-Protocol => Protokol
-Source IP => Ishodi&scaron;ni IP
-Destination IP => Odredi&scaron;ni IP
-Source Ports => Ishodi&scaron;ni Portovi
-Destination Ports => Odredi&scaron;ni Portovi
-Forward to => Preusmjeravanje na
-Port => Port
-Helptext ESSID => Naziv Wireless Mre&zcaron;e
-Helptext DNS save => Trebali biste spremiti va&scaron;e postavke na ovoj stranici prije dodavanja/brisanja DNS poslju&zcaron;itelja
-Helptext Operation mode => Ova opcija odre&eth;uje operativni mod rada va&scaron;e wireless mre&zcaron;e. Odabir 'Client (Bridge)' ne&aelig;e promijeniti postavke mre&zcaron;nog su&egrave;elja. Samo &aelig;e biti dodani parametri u pogonski program koji omogu&aelig;avaju ograni&egrave;ene bridging funkcije su&egrave;elja.
-Helptext Encryption Type => 'WPA (RADIUS)' je podr&zcaron;an samo u Access Point modu. 
-'WPA (PSK)' ne radi u Ad-Hoc modu.
-Helptext IP Settings => IP Postavke su opcionalne za DHCP i PPTP. Ukoliko su postavljene, koriste se kao pretpostavljene, u slu&egrave;aju kada  DHCP poslu&zcaron;itelj nije dostupan.
-Helptext Idle Time => Vrijeme u sekundama bez internet prometa do kojeg ure&eth;aj treba &egrave;ekati prije prekida veze (samo kod Spajanja na Zahtjev)
-Helptext Redial Timeout => Vrijeme u sekundama za prijem odgovora od prividera prije ponovnog spajanja
diff --git a/package/webif/files/usr/lib/webif/lang/hu/common.txt b/package/webif/files/usr/lib/webif/lang/hu/common.txt
deleted file mode 100644
index a8a08e6588..0000000000
--- a/package/webif/files/usr/lib/webif/lang/hu/common.txt
+++ /dev/null
@@ -1,227 +0,0 @@
-lang => Magyar
-# Common
-Settings saved => Be&aacute;ll&iacute;t&aacute;sok elmentve
-Settings not saved => Be&aacute;ll&iacute;t&aacute;sok ment&eacute;s&eacute;nek mell&#337;z&eacute;se
-Save Changes => V&aacute;ltozat&aacute;sok ment&eacute;se
-Apply Changes => V&aacute;ltoztat&aacute;sok alkalmaz&aacute;sa
-Clear Changes => V&aacute;ltoztat&aacute;sok eldob&aacute;sa
-Review Changes => V&aacute;ltoztat&aacute;sok megtekint&eacute;se
-Host Name => Host n&eacute;v
-Uptime => &Uuml;zemid&#337;
-Load => Rendszer terhel&eacute;s
-Version => Verzi&oacute;
-Categories => Kategori&aacute;k
-Subcategories => Alkateg&oacute;ri&aacute;k
-more... => Tov&aacute;bbi inform&aacute;ci&oacute;k...
-Add => Hozz&aacute;ad
-Remove => Elt&aacute;vol&iacute;t
-Warning => Vigy&aacute;zat
-Password_warning => A Web-Adminisztr&aacute;toenak &eacute;s az SSH hozz&aacute;f&eacute;r&eacute;shez m&eacute;g nincs jelsz&oacute; be&aacute;ll&iacute;tva.<br />Adjon meg most egy &uacute;j jelsz&oacute;t (felhaszn&aacute;l&oacute;n&eacute;v a b&ouml;ng&eacute;sz&#337;ben: 'root').
-
-# Categories
-Info => Inform&aacute;ci&oacute;
-About => R&oacute;lunk
-Router Info => Router inform&aacute;ci&oacute;
-
-Status => &Aacute;llapot
-Connections => H&aacute;l&oacute;zati kapcsolatok
-DHCP => DHCP
-Wireless => WLAN
-
-System => Rendszer
-Password => Jelsz&oacute;
-Settings => Be&aacute;ll&iacute;t&aacute;sok
-Installed Software => Telep&iacute;t&eacute;s
-Firmware Upgrade => Firmware friss&iacute;t&eacute;s
-
-Network => H&aacute;l&oacute;zat
-LAN => LAN
-WAN => Internet
-Wireless => WLAN
-Advanced Wireless => WLAN (halad&oacute;)
-Hosts => Host konfigur&aacute;ci&oacute;
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => This program is free software; you can redistribute it and/or <br >modify it under the terms of the GNU General Public License <br >as published by the Free Software Foundation; either version 2 <br > of the License, or (at your option) any later version. 
-Contributions by => Contributions by
-Layout based on => Layout based on
-by => by
-
-No config change. => A konfigur&aacute;ci&oacute;ban nincs v&aacute;ltoz&aacute;s.
-Config discarded. => Konfigur&aacute;ci&oacute; v&aacute;ltoztat&aacute;sok eldobva.
-Config changes: => Konfigur&aacute;ci&oacute; m&oacute;dod&iacute;t&aacute;sok:
-Updating config... => Konfigur&aacute;ci&oacute; friss&iacute;t&eacute;se...
-
-
-# 'Router Info' page
-Firmware Version => Firmware verzi&oacute;
-Kernel Version => Kernel verzi&oacute;
-Current Date/Time => Aktu&aacute;lis d&aacute;tum/id&#337;
-MAC Address => MAC Address
-
-
-# 'Connections' page
-Connection Status => Kapcsolatok
-Physical Connections => Fizikai kapcsolatok
-Router Connections => Router kapcsolatok
-
-
-# 'DHCP' page
-DHCP leases => DHCP b&eacute;rletek
-IP Address => IP c&iacute;m
-Name => N&eacute;v
-Expires in => Lej&aacute;r
-
-
-# 'Wireless Status' page
-Wireless Status => WLAN &aacute;llapot
-
-# 'Password' page
-Password Change => Jelsz&oacute; csere
-New Password => &Uacute;j jelsz&oacute;
-Confirm Password => Jelsz&oacute; m&eacute;gegyszer
-
-# 'System Settings' page
-System Settings => Rendszer be&aacute;ll&iacute;t&aacute;sok
-Host Name => Host n&eacute;v
-Language => Nyelv
-
-# 'Installed Software' page
-Installed Packages => Telep&iacute;tett csomagok
-Update package lists => Csomaglista friss&iacute;t&eacute;se
-Uninstall => Elt&aacute;vol&iacute;t&aacute;s
-Install => Telep&iacute;t&eacute;s
-
-
-# 'Firmware Upgrade' page
-Firmware format => Firmware format
-Error => Hiba
-done => K&eacute;sz
-Invalid_format => &Eacute;rv&eacute;nytelen Firmware
-Erase_JFFS2 => JFFS2 part&iacute;ci&oacute; t&ouml;rl&eacute;se
-Options => Opci&oacute;k
-Firmware_image => Firmware
-Upgrade => Friss&iacute;t&eacute;s
-Upgrading... => Friss&iacute;t&eacute;s folyamatban...
-
-# 'LAN Settings' page
-LAN Settings => H&aacute;l&oacute;zat be&aacute;ll&iacute;t&aacute;sok
-LAN Configuration => H&aacute;l&oacute;zat konfigur&aacute;ci&oacute;
-Netmask => H&aacute;l&oacute;zati maszk
-Default Gateway => Alap&eacute;rtelmezett &aacute;tj&aacute;r&oacute;
-DNS Servers => DNS szerverek
-DNS Address => DNS szerver c&iacute;m
-
-Note => Megjegyz&eacute;s
-
-
-# 'WAN Settings' page
-WAN Settings => Internet be&aacute;ll&iacute;t&aacute;sok
-WAN Configuration => Internet konfigur&aacute;ci&oacute;
-PPTP Server IP => PPTP szerver c&iacute;m
-Connection Type => Kapcsolat t&iacute;pusa
-No WAN => Nincs internet
-DHCP => DHCP
-Static IP => Statikus IP konfigur&aacute;ci&oacute;
-IP Settings => IP be&aacute;ll&iacute;t&aacute;sok
-PPP Settings => PPP be&aacute;ll&iacute;t&aacute;sok
-Redial Policy => &Uacute;jrat&aacute;rcs&aacute;z&aacute;s szab&aacute;lya
-Connect on Demand => Csatlakoz&aacute;s k&eacute;r&eacute;s eset&eacute;n
-Keep Alive => Tartsd &eacute;letben
-Maximum Idle Time => Maximum inakt&iacute;v &iacute;d&#337;
-Redial Timeout => &Uacute;jrat&aacute;rcs&aacute;z&aacute;si id&#337;
-MTU => Maximal Transfer Unit
-Username => Felhaszn&aacute;l&oacute;
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => WLAN konfigur&aacute;ci&oacute;
-Wireless Interface => WLAN interf&eacute;sz
-WEP Key => WEP kulcs
-Selected WEP Key => V&aacute;lasztott WEP kulcs
-WPA PSK => WPA PSK
-ESSID => ESSID
-Channel => Csatorna
-RADIUS IP Address => RADIUS szerver c&iacute;m
-RADIUS Server Key => RADIUS szerver kulcs
-Enabled => Enged&eacute;lyezve
-Disabled => Tiltva
-ESSID Broadcast => ESSID hirdet&eacute;se (sz&oacute;r&aacute;sa)
-Show => Enged&eacute;lyezve
-Hide => Tiltva
-WLAN Mode => WLAN m&oacute;d
-Access Point => Access Point
-Client => Client
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Encryption Settings => Titkos&iacute;t&aacute;s be&aacute;ll&iacute;t&aacute;sok
-Encryption Type => Titkos&iacute;t&aacute;s t&iacute;pusa
-PSK => PSK
-WPA Mode => WPA m&oacute;d
-WPA Algorithms => WPA algoritmus
-WEP Keys => WEP kulcsok
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => WLAN konfigur&aacute;ci&oacute; (halad&oacute;)
-WDS Connections => WDS kapcsolatok
-MAC Filter List => MAC Address sz&uuml;r&eacute;s
-Filter Mode => Sz&uuml;r&#337; m&oacute;d
-Allow => Enged&eacute;lyez&#337;
-Deny => Tilt&oacute;
-Set => Be&aacute;ll&iacute;t&aacute;s
-Settings => Be&aacute;ll&iacute;t&aacute;sok
-Automatic WDS => Automatikus WDS
-
-# "Hosts" page
-
-MAC Address => MAC-Address
-Configured Hosts => Konfigur&aacute;lt g&eacute;pek
-DHCP Static => Statikus DHCP be&aacute;ll&iacute;t&aacute;sok
-Host Names => Host nevek
-
-
-Up => Fel
-Down => Le
-Edit => Szerkeszt&eacute;s
-Delete => T&ouml;rl&eacute;s
-Save => Ment&eacute;s
-Cancel => M&eacute;gse
-
-Forward => Tov&aacute;bb&iacute;t
-Accept => Elfogad
-Drop => Eldob
-
-Firewall => T&#369;zfal
-Firewall Rules => T&#369;zfal szab&aacute;lyok
-Firewall Configuration => T&#369;zfal konfigur&aacute;ci&oacute;
-
-New Rule => &Uacute;j szab&aacute;ly
-Match => Illeszt
-Target => C&eacute;l
-Port => Port
-
-Protocol => Protokoll
-Source IP => Forr&aacute;s-IP
-Destination IP => C&eacute;l-IP
-Source Ports => Forr&aacute;s-Portok
-Destination Ports => C&eacute;l-Portok
-
-Forward to => Tov&aacute;bb&iacute;t
-Port => Port
-
-Helptext ESSID => A vezet&eacute;k n&eacute;lk&uuml;li h&aacute;l&oacute;zat neve.
-Helptext DNS save => Mentsd el a be&aacute;ll&iacute;t&aacute;sokat, miel&#337;tt ezen az oldalon hozz&aacute;adsz ill. elt&aacute;vol&iacute;tasz DNS szervert.
-
-Helptext Operation mode => Ezek a be&aacute;ll&iacute;tsok a vezet&eacute;k n&eacute;lk&uuml;li h&aacute;lozat m&#369;k&ouml;d&eacute;s&eacute;t hat&aacute;rozz&aacute;k meg. A 'Client (Bridge)' m&oacute;d a h&aacute;l&oacute;zati csatol&oacute; be&aacute;ll&iacute;t&aacute;sait nem m&oacute;dos&iacute;tja. Csak n&eacute;h&aacute;ny param&eacute;tert &aacute;ll&iacute;t a vezet&eacute;kn&eacute;lk&uuml;li eszk&ouml;zmeghajt&oacute;ban, a korl&aacute;tozott &aacute;thidal&aacute;shoz.
-Helptext Encryption Type => 'WPA (RADIUS)' csak Access-Pont m&oacute;dban t&aacute;mogatott. <br /> 'WPA (PSK)' nem m&#369;k&ouml;dik Ad-Hoc m&oacute;dban. 
-Helptext IP Settings => IP be&aacute;ll&iacute;t&aacute;sok opcion&aacute;lisak a DHCP-hez &eacute;s a PPTP-hez. Az itt be&aacute;ll&iacute;tott &eacute;rt&eacute;kek lesznek az alap&eacute;rtelmezettek, ha a DHCP szerver nem el&eacute;rhet&#337;. 
-Helptext Idle Time => Maxim&aacute;lis id&#337; m&aacute;sodpercben internet forgalom n&eacute;lk&uuml;l, amennyit a router v&aacute;r miel&#337;tt bontja a kapcsolatot (csak 'Csatlakoz&aacute;s k&eacute;r&eacute;s eset&eacute;n' m&oacute;dban).
-Helptext Redial Timeout => Maxim&aacute;lis id&#337; m&aacute;sodpercben az &uacute;jrat&aacute;rcs&aacute;z&aacute;s el&#337;tt, ha a szolg&aacute;ltat&oacute; nem v&aacute;laszol.
-
-# untranslated:
-Available packages => Haszn&aacute;lhat&oacute; csomagok
-
diff --git a/package/webif/files/usr/lib/webif/lang/it/common.txt b/package/webif/files/usr/lib/webif/lang/it/common.txt
deleted file mode 100644
index 8607facf21..0000000000
--- a/package/webif/files/usr/lib/webif/lang/it/common.txt
+++ /dev/null
@@ -1,226 +0,0 @@
-lang => Italiano
-# Common
-Settings saved => Cambiamenti salvati
-Settings not saved => Cambiamenti non salvati
-Save Changes => Salva cambiamenti
-Apply Changes => Applica cambiamenti
-Clear Changes => Elimina cambiamenti
-Review Changes => Controlla cambiamenti
-Host Name => Nome Host
-Uptime => Uptime
-Load => Caricamento del sistema
-Version => Versione
-Categories => Categoria
-Subcategories => Sottocategoria
-more... => altro...
-Add => Aggiungi
-Remove => Elimina
-Warning => Attenzione
-Password_warning => non e' stata ancora impostata una password di protezione per il router (accesso web o ssh). Per favore, inseriscine una ora (il nome utente sara': 'root')
-
-# Categories
-Info => Info
-About => Ringraziamenti
-Router Info => Informazioni del router
-
-Status => Stato
-Connections => Connessioni
-DHCP => DHCP
-Wireless => Wireless
-
-System => Sistema
-Password => Password
-Settings => Configurazione
-Installed Software => Programmi installati
-Firmware Upgrade => Aggiornamento Firmware
-
-Network => Rete
-LAN => LAN
-WAN => Internet
-Wireless => Wireless
-Advanced Wireless => Wireless (avanzato)
-Hosts => Configurazione Host
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Questo programma  software  libero;  lecito ridistribuirlo e/o <br />modificarlo secondo i  termini della Licenza Pubblica Generica GNU <br />come pubblicata  dalla Free Software Foundation; o la versione 2 della licenza o (a scelta) una versione successiva.
-Contributions by => Contributi
-Layout based on => Interfaccia basata su
-by => da
-
-
-No config change. => Nessun cambiamento della configurazione.
-Config discarded. => I cambiamenti non sono stati accettati.
-Config changes: => Cambiamenti configurazione:
-Updating config... => Aggiornamento configurazione...
-
-
-# 'Router Info' page
-Firmware Version => Versione del firmware
-Kernel Version => Versione del Kernel
-Current Date/Time => Data/Ora
-MAC Address => Indirizzo MAC
-
-
-# 'Connections' page
-Connection Status => Stato della connessione
-Physical Connections => Connessioni fisiche
-Router Connections => Connessioni del router
-
-
-# 'DHCP' page
-DHCP leases => lease DHCP
-IP Address => Indirizzo IP
-Name => Nome
-Expires in => Scade il
-
-
-# 'Wireless Status' page
-Wireless Status => Stato Wireless
-
-# 'Password' page
-Password Change => Cambio password
-New Password => Nuova password
-Confirm Password => Confema password
-
-# 'System Settings' page
-System Settings => Parametri di sistema
-Host Name => Nome dell'host
-Language => Linguaggio
-
-# 'Installed Software' page
-Installed Packages => Pacchetti installati
-Update package lists => Aggiorna la lista dei pacchetti
-Uninstall => Disinstalla
-Install => Installa
-
-
-# 'Firmware Upgrade' page
-Firmware format => Formato del firmware
-Error => Errore
-done => eseguito
-Invalid_formt => Formato del firmware invalido
-Erase_JFFS2 => Cancella la partizione JFFS2
-Options => Opzioni
-Firmware_image => Immagine del firmware
-Upgrade => Aggiorna
-Upgrading... => Aggiornamento in corso...
-
-# 'LAN Settings' page
-LAN Settings => Parametri LAN
-LAN Configuration => Configuzione LAN
-Netmask => Netmask
-Default Gateway => Default Gateway
-DNS Servers => Server DNS
-DNS Address => Indirizzo IP del DNS
-
-Note => Nota
-
-# 'WAN Settings' page
-WAN Settings => Parametri Internet
-WAN Configuration => Configurazione Internet
-PPTP Server IP => Indirizzo IP del server PPTP
-Connection Type => Tipo di connessione
-No WAN => No WAN
-DHCP => DHCP
-Static IP => IP statico
-IP Settings => Paramentri IP
-PPP Settings => Parametri PPP
-Redial Policy => Opzioni di riconnessione
-Connect on Demand => Connessione su richiesta
-Keep Alive => Connessione permanente
-Maximum Idle Time => Tempo di inattivita' massimo
-Redial Timeout => Tempo di riconnessione
-MTU => MTU (grandezza pacchetti)
-Username => Nome utente
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Parametri Wireless
-Wireless Interface => Interfaccia Wireless
-WEP Key => Chiave WEP
-Selected WEP Key => Chiave WEP selezionata
-WPA PSK => WPA-PSK
-ESSID => ESSID
-Channel => Canale
-RADIUS IP Address => Indirizzo IP del server RADIUS
-RADIUS Server Key => Server Key RADIUS
-Enabled => Attivato
-Disabled => Disattivato
-ESSID Broadcast => SSID Broadcast
-Show => Mostra
-Hide => Nascondi
-WLAN Mode => Modo WLAN
-Access Point => Punto di accesso
-Client => Client
-Bridge => Bridge
-Ad-Hoc => Ad-Hoc
-Operation mode => Modo di funzionamento
-Encryption Settings => Parametri di encryption
-Encryption Type => Tipo di encryption
-PSK => PSK
-WPA Mode => Modo WPA
-WPA Algorithms => Algoritmo WPA
-WEP Keys => Chiave WEP
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Configurazione Wireless avanzata
-WDS Connections => Connessioni WDS
-MAC Filter List => Filtro per indirizzo MAC
-Filter Mode => Metodo di filtraggio
-Allow => Autorizza
-Deny => Nega
-Set => Setta
-Settings => Parametri
-Automatic WDS => WDS Automatico
-
-# "Hosts" page
-
-MAC Address => Indirizzo MAC
-Configured Hosts => Host configurati
-DHCP Static => DHCP Statico
-Host Names => Nome Host
-
-Up => Su
-Down => Giu'
-Edit => Edita
-Delete => Elimina
-Save => Salva
-Cancel => Cancella
-
-Forward => Ridirigi
-Accept => Accetta
-Drop => Scarta
-
-Firewall => Firewall
-Firewall Rules => Regole del Firewall
-Firewall Configuration => Configurazione del Firewall
-
-New Rule => Nuova regola
-Match => Filtro
-Target => Obiettivo
-Port => Porta
-
-Protocol => Protocollo
-Source IP => IP di origine
-Destination IP => IP di destinazione
-Source Ports => Porta di origine
-Destination Ports => Porta di destinazione
-
-Forward to => Redirigi su
-Port => Porta
-
-Helptext ESSID => SSID
-Helptext DNS save => E' consigliabile salvare i cambiamenti prima di aggiungere o eliminare server DNS dalla lista
-
-Helptext Operation mode => Imposta il metodo di utilizzo della rete wireless. Scegliendo 'Client (bridge)' non cambiera' la configurazione dell'interfaccia di rete.
-Helptext Encryption Type => 'WPA (RADIUS)' puo' essere usato solo nel modo Access Point.<br /> 'WPA (PSK)' non funziona nel modo Ad-Hoc.
-Helptext IP Settings => Le opzioni IP sono opzioni per DHCP e PPTP.
-Helptext Idle Time => Numero di secondi che deve aspettare il router prima di disconnettersi. (Solo nel metodo ' Connessione su richiesta').
-Helptext Redial Timeout => Numero di secondi che il router deve aspettare per effettuare una nuova riconnessione.
-
-# untranslated:
-Available packages => Available packages
-
diff --git a/package/webif/files/usr/lib/webif/lang/nl/common.txt b/package/webif/files/usr/lib/webif/lang/nl/common.txt
deleted file mode 100644
index 875ba6c0ce..0000000000
--- a/package/webif/files/usr/lib/webif/lang/nl/common.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-lang => Nederlands
-# Common
-Settings saved => Instellingen bewaard
-Settings not saved => Instellingen niet bewaard
-Save Changes => Bewaar wijzigingen
-Apply Changes => Gebruik wijzigingen
-Clear Changes => Wis wijzigingen
-Review Changes => Bekijk wijzigingen
-Host Name => Host naam
-Uptime => Uptime
-Load => Laad
-Version => Versie
-Categories => Categorie
-Subcategories => Subcategorie
-more... => meer...
-Add => Bijvoegen
-Remove => Verwijder
-Warning => Waarschuwing
-Password_warning => U hebt nog geen wachtwoord ingesteld voor de Web interface en SSH toegang. Gelieve er nu een in te geven (de gebruikersnaam in uw browser zal 'root' zijn).
-
-# Categories
-Info => Info
-About => Over
-Router Info => Router Info
-
-Status => Status
-Connections => Connecties
-DHCP => DHCP
-Wireless => Draadloos
-
-System => Systeem
-Password => Wachtwoord
-Settings => Instellingen
-Installed Software => Geinstalleerde Software
-Firmware Upgrade => Firmware Upgrade
-
-Network => Netwerk
-LAN => LAN
-WAN => WAN
-Wireless => Draadloos
-Advanced Wireless => Geavanceerd Draadloos
-Hosts => Geconfigureerde Hosts
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Dit programma is vrije software; u mag het verdelen en/of wijzigen onder de voorwaarden van GNU General Public License zoals gepubliceerd door de Free Software Foundation; ofwel versie 2 van de licentie, of (volgens Uw keuze) iedere latere versie.
-
-Contributions by => Bijdragen door
-Layout based on => Layout gebasseerd op
-by => door
-
-
-No config change. => Er werden geen configuratie wijzigingen aangebracht.
-Config discarded. => Uw configuratie wijzigingen werden verworpen.
-Config changes: => Huidige configuratie wijzigingen:
-Updating config... => Uw configuratie wordt aangepast...
-
-
-# 'Router Info' page
-Firmware Version => Firmware Versie
-Kernel Version => Kernel Versie
-Current Date/Time => Huidige Datum/Tijd
-MAC Address => MAC Adres
-
-
-# 'Connections' page
-Connection Status => Verbindings Status
-Physical Connections => Fysieke Verbindingen
-Router Connections => Router Verbindingen
-
-
-# 'DHCP' page
-DHCP leases => DHCP leases
-IP Address => IP Adres
-Name => Naam
-Expires in => Vervalt binnen
-
-
-# 'Wireless Status' page
-Wireless Status => Draadloos Status
-
-# 'Password' page
-Password Change => Wachtwoord Wijzigen
-New Password => Nieuw Wachtwoord
-Confirm Password => Bevestig Wachtwoord
-
-# 'System Settings' page
-System Settings => Systeem Instellingen
-Host Name => Host naam
-Language => Taal
-
-# 'Installed Software' page
-Installed Packages => Geinstalleerde Pakketten
-Available packages => Beschikbare pakketten
-Update package lists => Aanpassen Pakketlijst
-Uninstall => Deinstalleren
-Install => Installeren
-
-
-# 'Firmware Upgrade' page
-Firmware format => Firmware Formaat
-Error => Fout
-done => voltooid
-Erase_JFFS2 => Wis JFFS2 partitie
-Options => Opties
-Firmware_image => Firmware image om te laden
-Upgrade => Upgrade
-Upgrading... => Upgrading...
-
-# 'LAN Settings' page
-LAN Settings => LAN Instellingen
-LAN Configuration => LAN Configuratie
-Netmask => Netmask
-Default Gateway => Standaard Gateway
-DNS Servers => DNS Servers
-DNS Address => DNS Adres
-
-Note => Nota
-
-# 'WAN Settings' page
-WAN Settings => WAN Instellingen
-WAN Configuration => WAN configuratie
-PPTP Server IP => PPTP Server IP
-Connection Type => Connectie Type
-No WAN => Geen WAN
-DHCP => DHCP
-Static IP => Statisch IP
-IP Settings => IP Instellingen
-PPP Settings => PPP Instellingen
-Redial Policy => Opnieuw bel beleid
-Redial Timeout => Bel vertraging
-Connect on Demand => Verbinden op Aanvraag
-Keep Alive => Hou actief
-Maximum Idle Time => Maximale Idle Time
-MTU => MTU
-Username => Gebruikersnaam
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Draadloos Configuratie
-Wireless Interface => Draadloos Interface
-WEP Key => WEP Sleutel
-Selected WEP Key => Geselecteerde WEP sleutely
-WPA PSK => WPA PSK
-ESSID => ESSID
-Channel => Kanaal
-RADIUS IP Address => RADIUS IP Adres
-RADIUS Server Key => RADIUS Server Sleutel
-Enabled => Ingeschakeld
-Disabled => Uitgeschakeld
-ESSID Broadcast => ESSID Broadcast
-Show => Toon
-Hide => Verberg
-WLAN Mode => WLAN Mode
-Access Point => Toegangs Punt
-# Was "Klant" first which can only be translated as an economical client, i.e. a customer. AFAIK Dutch doesn't provide any true translation for Client in this context
-Client => Client
-Bridge => Brug
-Ad-Hoc => Ad-Hoc
-Operation mode => Operation mode
-Encryption Settings => Encryptie Instelligen
-Encryption Type => Encryptie Type
-PSK => PSK
-WPA Mode => WPA Mode
-WPA Algorithms => WPA Algoritmen
-WEP Keys => WEP Sleutels
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Geavanceerde Draadloze Configuratie
-WDS Connections => WDS Verbindingen
-MAC Filter List => MAC Filter Lijst
-Filter Mode => Filter Mode
-Allow => Toelaten
-Deny => Weigeren
-Set => Stel
-Settings => Instellingen
-Automatic WDS => Automatische WDS
-
-# "Hosts" page
-
-MAC Address => MAC Adres
-Configured Hosts => Geconfigureerde Hosts
-DHCP Static => DHCP Statisch
-Host Names => Host Namen
-
-Up => Op
-Down => Neer
-Edit => Wijzig
-Delete => Wis
-Save => Bewaar
-Cancel => Afbreken
-
-Forward => Doorsturen
-Accept => Accepteren
-Drop => Negeren
-
-Firewall => Firewall
-Firewall Rules => Firewall Regels
-Firewall Configuration => Firewall Configuratie
-
-New Rule => Nieuwe Regel
-Match => Overeenstemmen
-Target => Doel
-Port => Poort
-
-Protocol => Protocol
-Source IP => Bron IP
-Destination IP => Bestemmings IP
-Source Ports => Bron Poorten
-Destination Ports => Bestemmings Poorten
-
-Forward to => Doorsturen naar
-Port => Poort
-
-Helptext ESSID => Naam van uw Draadloos Netwerk
-Helptext DNS save => U moet de instellingen op deze pagina bewaren alvorens DNS servers te wijzigen/verwijderen
-
-Helptext Operation mode => Dit stelt de Operatie Mode voor uw draadloos netwerk in. Door 'Client (Brug)' te kiezen zullen uw network interface instellingen niet wijzigen. Er zullen alleen enkele parameters ingesteld worden in de draadloze driver die gelimiteerde overbrugging van de interface mogelijk maakt.
-Helptext Encryption Type => 'WPA (RADIUS)' wordt enkel ondersteund in de Toegangs Punt mode.<br />'WPA (PSK)' werkt niet in Ad-Hoc mode.
-Helptext IP Settings => IP instellingen zijn optioneel voor DHCP en PPTP. Indien U ze instelt dan worden ze als standaardwaarden gebruikt indien de DHCP server onbeschikbaar is.
-Helptext Idle Time => Het aantal seconden zonder internet verkeer dat de router zou moeten wachten alvorens zich af te sluiten van het Internet (Alleen bij Verbinden op Aanvraag)
-Helptext Redial Timeout => Het aantal seconden dat gewacht moet worden alvorens opnieuw een verbinding wordt gemaakt indien deze geweigerd werd door uw ISP.
diff --git a/package/webif/files/usr/lib/webif/lang/no/common.txt b/package/webif/files/usr/lib/webif/lang/no/common.txt
deleted file mode 100644
index f94684fa5e..0000000000
--- a/package/webif/files/usr/lib/webif/lang/no/common.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-lang => Norsk
-# Common
-Settings saved => Innstillingene ble lagret
-Settings not saved => Innstillingene ble ikke lagret
-Save Changes => Lagre endringer
-Apply Changes => Aktiver endringer
-Clear Changes => Glem endringer
-Review Changes => Se endringer
-Host Name => Vertsnavn
-Uptime => Oppetid
-Load => Systembelastning
-Version => Versjon
-Categories => Kategorier
-Subcategories => Underkategorier
-more... => mer...
-Add => Legg til
-Remove => Fjern
-Warning => Advarsel
-Password_warning => Det er ikke satt et passord p&aring; hverken Webadministrasjon eller SSH.<br />Vennligst velg eller tast inn ditt passord (Brukernavn er 'root' med sm&aring; bokstaver).
-
-# Categories
-Info => Info
-About => Om
-Router Info => Routerinformasjon
-
-Status => Status
-Connections => Nettverksforbindelser
-DHCP => DHCP
-Wireless => Tr&aring;dl&oslash;s
-
-System => System
-Password => Passord
-Settings => Innstillinger
-Installed Software => Installerte programmer
-Firmware Upgrade => Firmwareoppgradering
-
-Network => Nettverk
-LAN => Lokalnett
-WAN => Internett
-Wireless => Tr&aring;dl&oslash;s
-Advanced Wireless => Avansert tr&aring;dl&oslash;s
-Hosts => Vertsnavn
-
-
-# 'About' page
-Copyright => Opphavsrett
-
-GPL_Text => Dette programmet er fri programvare.  Du m&aring; bruke, endre og videredistribuere det under betingelsene i "GNU General Public License",<br /> som offentliggjort av "Free Software Foundation" (Den frie programbevegelse), enten i versjon 2 av lisensen eller (etter ditt valg), en hvilkensomhelst senere versjon.
-
-Contributions by => Bidrag fra
-Layout based on => Layout er basert p&aring;
-by => av
-
-
-No config change. => Ingen konfigurasjonsendring foretatt
-Config discarded. => Konfigurasjonsendringerne ble forkastet
-Config changes: => Forel&oslash;pige endringer
-Updating config... => Oppdaterer konfigurasjonen
-
-# 'Router Info' page
-Firmware Version => Firmwareversjon
-Kernel Version => Kjerneversjon
-Current Date/Time => N&aring;v&aelig;rende tid/dato
-MAC Address => MAC adresse
-
-
-# 'Connections' page
-Connection Status => Forbindelsesstatus
-Physical Connections => Fysiske forbindelser
-Router Connections => Routerens forbindelser
-
-
-# 'DHCP' page
-DHCP leases => DHCP leasinger
-IP Address => IP adresse
-Name => Navn
-Expires in => Utl&oslash;pstid
-
-
-# 'Wireless Status' page
-Wireless Status => Tr&aring;dl&oslash;s status
-
-# 'Password' page
-Password Change => Endre passord
-New Password => Nytt passord
-Confirm Password => Nytt passord igjen
-
-# 'System Settings' page
-System Settings => Systeminnstillinger
-Host Name => Vertsnavn
-Language => Spr&aring;k
-
-# 'Installed Software' page
-Installed Packages => Installerte pakker
-Update package lists => Oppdater pakkelisten
-Uninstall => Avinstaller
-Install => Installer
-Available packages => Tilgjengelige pakker
-
-
-# 'Firmware Upgrade' page
-Firmware format => Firmwareformat
-Error => Feil
-done => ferdig
-Invalid_format => Ugyldig_format
-Erase_JFFS2 => Slett_JFFS2_partisjonen
-Options => Alternativer
-Firmware_image => Firmwarefil
-Upgrade => Oppgrader
-Upgrading... => Oppgraderer...
-
-# 'LAN Settings' page
-LAN Settings => Lokale nettinnstillinger
-LAN Configuration => Lokal nettverkskonfigurasjon
-Netmask => Undernettmaske
-Default Gateway => Standard gateway
-DNS Servers => DNS-tjenere
-DNS Address => DNS-tjeneradresse
-
-Note => Merk
-
-
-# 'WAN Settings' page
-WAN Settings => WAN-innstillinger
-WAN Configuration => WAN-konfigurasjon
-PPTP Server IP => PPTP-tjeneradresse
-Connection Type => Forbindelsestype
-No WAN => Ingen WAN
-DHCP => DHCP
-Static IP => Statisk IP
-IP Settings => IP-innstillinger
-PPP Settings => PPP-innstillinger
-Redial Policy => Gjenoppringingspolise
-Connect on Demand => Ring opp n&aring;r behovet er der
-Keep Alive => Hold forbindelsen i live (keep alive)
-Maximum Idle Time => Maksimal tid i tomgang (max idle)
-Redial Timeout => Gjenoppringningsavbrekkstid
-MTU => MTU
-Username => Brukernavn
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => Tr&aring;dl&oslash;s konfigurasjon
-Wireless Interface => Tr&aring;dl&oslash;st nettkort
-WEP Key => WEP n&oslash;kler
-Selected WEP Key => Valgt WEP n&oslash;kkel
-WPA PSK => WPA n&oslash;kler
-ESSID => ESSID
-Channel => Kanal
-RADIUS IP Address => IP adressen p&aring; RADIUS server
-RADIUS Server Key => Passord til RADIUS server
-Enabled => Aktivert
-Disabled => Deaktivert
-ESSID Broadcast => ESSID-Kringkasting 
-Show => Vis
-Hide => Skjul
-WLAN Mode => Tr&aring;dl&oslash;s tilstand
-Access Point => Tilgangspunkt
-Client => Klient
-Bridge => Bro
-Ad-Hoc => Ad-Hoc
-Encryption Settings => Krypteringsinnstillinger
-Encryption Type => Krypteringstype
-PSK => PSK-kode
-WPA Mode => WPA tilstand
-WPA Algorithms => WPA krypteringsalgoritme
-WEP Keys => WEP n&oslash;kler
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Avansert oppsett av tr&aring;dl&oslash;s
-WDS Connections => WDS forbindelser (WDS repeater)
-MAC Filter List => Filteringsliste (MAC-nummer)
-Filter Mode => Filtreringstilstand
-Allow => Tillat
-Deny => Forby
-Set => Sett
-Settings => Innstillinger
-Automatic WDS => Automatisk WDS-forbindelse
-
-# "Hosts" page
-
-MAC Address => MAC-adresse
-Configured Hosts => Vertsnavn
-DHCP Static => Statiske IP adresser til DHCP
-Host Names => Vertsnavn
-
-
-Up => Opp
-Down => Ned
-Edit => Endre
-Delete => Slette
-Save => Lagre
-Cancel => Annuller
-
-Forward => Forward (videresend)
-Accept => Accept (tillat)
-Drop => Drop (kast)
-
-Firewall => Brannmur
-Firewall Rules => Brannmurregler
-Firewall Configuration => Brannmurkonfigurasjon
-
-New Rule => Ny regel
-Match => Match (sammenlign)
-Target => Target (G&aring; til)
-Port => Port
-
-Protocol => Protokoll
-Source IP => Avsenders IP
-Destination IP => Mottakers IP
-Source Ports => Avsenders porter
-Destination Ports => Mottakers porter
-
-Forward to => Send videre til
-Port => Port
-
-Helptext ESSID => Navn p&aring; tr&aring;dl&oslash;s nettverk
-Helptext DNS save => Lagre endringer p&aring; denne siden f&oslash;r du legger til eller fjerner DNS-tjenere (Hvis du ikke vil miste dem.)
-
-Helptext Operation mode => Setter driftstilstanden for den tr&aring;dl&oslash;se delen av routeren. 'Klient' og 'Klient (bro)' brukes for &aring; koble 2 tr&aring;dl&oslash;se routere. I mange tilfeller er WDS en bedre (men mer avansert) l&oslash;ning. 'Klient' utnytter dog b&aring;ndbredden best, hvis du kun har en maskin tilkoblet. <br /> Innstillingen 'Klient (bro)' endrer ikke direkte ved nettverksinnstillingene. Det er et lite 'hack' som f&aring; routeren til &aring; tro at kun en maskin (en MAC-adresse) er tilkoblet. Det er gjort for &aring; overvinne begrensninger i 802.11-protokollen, som forhindrer at man problemfritt (i vanlig 'Klient'-tilstand) kan bruke den tr&aring;dl&oslash;se forbindelsen fra flere maskiner samtidig. <br /> AP brukes til en standalone router, hvor f.eks b&aelig;rbare pc'er skal ha tilgang til Internett og/eller lokalt nettverk. <br /> Hvis du ikke vet hva 'Ad Hoc'-tilstanden gj&oslash;, har du sannsynligvis ikke bruk for den.
-
-Helptext Encryption Type => 'WPA (RADIUS)' er kun st&oslash;ttet i AP (Tilgangspunkt)-tilstand. <br /> 'WPA (PSK)' fungerer ikke i 'Ad-Hoc' tilstand.
-
-Helptext IP Settings => IP-innstillinger er frivillig for DHCP og PPTP. N&aring; de er satt, blir de brukt som standardverdier hvis en DHCP-tjener ikke er tilgjengelig.
-
-Helptext Idle Time => Ventetid med inaktivitet f&oslash;r routeren kobler ned forbindelesen.
-
-Helptext Redial Timeout => Ventetid f&oslash;r routeren fors&oslash;ker &aring; ringe opp igjen.
-
diff --git a/package/webif/files/usr/lib/webif/lang/pl/common.txt b/package/webif/files/usr/lib/webif/lang/pl/common.txt
deleted file mode 100644
index c01b20c838..0000000000
--- a/package/webif/files/usr/lib/webif/lang/pl/common.txt
+++ /dev/null
@@ -1,228 +0,0 @@
-lang => Polski
-# Common
-Settings saved => Ustawienia zosta&#322;y zapisane
-Settings not saved => Ustawienia niezosta&#322;y zapisane
-Save Changes => Zapisz zmiany
-Apply Changes => Zastosuj zmiany
-Clear Changes => Czy&#347;&#263; zmiany
-Review Changes => Przej&#380;yj zmiany
-Host Name => Hostname
-Uptime => Czas pracy
-Load => Obci&#261;&#380;enie
-Version => Wersja
-Categories => Kategorie
-Subcategories => Podkategorie
-more... => Wi&#281;cej Informacji...
-Add => Dodaj
-Remove => Usu&#324;
-Warning => Uwaga
-Password_warning => Niemasz ustawionego has&#322;a dost&#281;pu do WWW oraz SSH<br />Prosze wpisz je teraz(nazwa u&#380;ytkownika to 'root')
-
-# Categories
-Info => Info
-About => O Autorze
-Router Info => Info o WRT
-
-Status => Status
-Connections => Po&#322;aczenia
-DHCP => DHCP
-Wireless => WLAN
-
-System => System
-Password => Has&#322;o
-Settings => Ustawienia
-Installed Software => Zainstalowane pakiety
-Firmware Upgrade => Aktualizacja opr.
-
-Network => Sie&#263;
-LAN => LAN
-WAN => Internet(WAN)
-Wireless => WLAN
-Advanced Wireless => Zaawansowane WLAN
-Hosts => Konfiguracja Hostów
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => This program is free software; you can redistribute it and/or <br >modify it under the terms of the GNU General Public License <br >as published by the Free Software Foundation; either version 2 <br > of the License, or (at your option) any later version. 
-Contributions by => Wspólpracownicy
-Layout based on => Layout bazuje na
-by => by
-
-
-No config change. => Nie dokonano zmian.
-Config discarded. => Zmiany zosta&#322;y anulowane.
-Config changes: => Aktualna konfiguracja:
-Updating config... => Aktualizacja konfiguracji...
-
-
-# 'Router Info' page
-Firmware Version => Wersja Opr.
-Kernel Version => Wersja kernela
-Current Date/Time => Aktualna Data/Czas
-MAC Address => Adres MAC
-
-
-# 'Connections' page
-Connection Status => Stan po&#322;acze&#324;
-Physical Connections => Po&#322;&#261;czenia fizyczne
-Router Connections => Po&#322;&#261;czenia do routera
-
-
-# 'DHCP' page
-DHCP leases => Dzier&#380;awa DHCP
-IP Address => Adres IP
-Name => Nazwa
-Expires in => Wygasa za
-
-
-# 'Wireless Status' page
-Wireless Status => Status WLAN
-
-# 'Password' page
-Password Change => Zmien has&#322;o
-New Password => Nowe has&#322;o
-Confirm Password => Potwierdz has&#322;o
-
-# 'System Settings' page
-System Settings => Ustawienia Systemu
-Host Name => Hostname
-Language => J&#281;zyk
-
-# 'Installed Software' page
-Installed Packages => Zainstalowane pakiety
-Update package lists => Aktualizuj liste pakietów
-Uninstall => Usu&#324;
-Install => Instaluj
-
-
-# 'Firmware Upgrade' page
-Firmware format => Format pliku firmware
-Error => B&#322;&#261;d
-done => Gotowe
-Invalid_format => B&#322;&#281;dny format firmware
-Erase_JFFS2 => Formatuj JFFS2
-Options => Opcje
-Firmware_image => Obraz FW:
-Upgrade => Aktualizuj
-Upgrading... => Aktualizuje...
-
-# 'LAN Settings' page
-LAN Settings => Ustawienia LAN
-LAN Configuration => Konfiguracja LAN
-Netmask => Maska sieci
-Default Gateway => Brama domy&#347;lna
-DNS Servers => Serwer DNS
-DNS Address => Adres DNS
-
-Note => Notatka
-
-
-# 'WAN Settings' page
-WAN Settings => Ustawienia WAN
-WAN Configuration => Konfiguracja WAN
-PPTP Server IP => Adres serwera PPTP
-Connection Type => Po&#322;aczenie
-No WAN => Bez WAN
-DHCP => DHCP
-Static IP => Statyczne IP
-IP Settings => Ustawienia IP
-PPP Settings => Ustawienia PPP
-Redial Policy => Rodzaj wydzwaniania
-Connect on Demand => Po&#322;&#261;czenia na &#380;adanie
-Keep Alive => Trzymaj po&#322;&#261;czenie
-Maximum Idle Time => Max. czas bezczynno&#347;ci
-	
-MTU => MTU
-Username => Nazwa uzyt.
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => WLAN-Konfiguracja
-Wireless Interface => Intefejs WLAN
-WEP Key => Klucz WEP
-Selected WEP Key => Wybrany klucz WEP
-WPA PSK => WPA PSK
-ESSID => ESSID
-Channel => Kana&#322;
-RADIUS IP Address => Adres IP RADIUS
-RADIUS Server Key => Klucz RADIUS
-Enabled => W&#322;aczone
-Disabled => Wy&#322;&#261;czone
-ESSID Broadcast => Rozsy&#322;anie ESSID 
-Show => Poka&#380;
-Hide => Ukryj
-WLAN Mode => Tryb Radiowy
-Access Point => Punkt Dost&#281;powy
-Client => Klient
-Bridge => Most
-Ad-Hoc => Ad-Hoc
-Encryption Settings => Ustawienia kodowania
-Encryption Type => Rodzaj kodowania
-PSK => PSK
-WPA Mode => Tryb WPA
-WPA Algorithms => Algorytm WPA
-WEP Keys => Klucze WEP
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Zaawansowane WLAN
-WDS Connections => Po&#322;&#261;czenie WDS
-MAC Filter List => Filtrowanie MAC
-Filter Mode => Rodzaj filtra
-Allow => Udzielaj dost&#281;pu
-Deny => Odrzucaj dost&#281;p
-Set => Ustaw
-Settings => Ustawienia
-Automatic WDS => Automatyczny WDS
-
-# "Hosts" page
-
-MAC Address => Adres MAC
-Configured Hosts => Konfiguracja Host&#243;w
-DHCP Static => Statyczne DHCP
-Host Names => Lista Host&#243;w
-
-
-Up => W g&#243;r&#281;
-Down => W d&#243;&#322;
-Edit => Edytuj
-Delete => Kasuj
-Save => Zapisz
-Cancel => Anuluj
-
-Forward => Przekieruj
-Accept => Akceptuj
-Drop => Odrzu&#263;
-
-Firewall => Firewall
-Firewall Rules => Regu&#322;y Firewalla
-Firewall Configuration => Konfiguracja Firewalla
-
-New Rule => Nowa regu&#322;a
-Match => Dotyczy
-Target => Cel
-Port => Port
-
-Protocol => Protok&#243;&#322;
-Source IP => IP &#380;r&#243;d&#322;owe
-Destination IP => IP docelowe
-Source Ports => Port &#380;r&#243;d&#322;owy
-Destination Ports => Port docelowy
-
-Forward to => Przekieruj do
-Port => Port
-
-Helptext ESSID => Nazwa sieci radiowej
-Helptext DNS save => Musisz zapisa&#263; ustawienia przed dodaniem/usuni&#281;ciem serwera DNS
-
-Helptext Operation mode => Umo&#380;liwia wyb&#243;r pracy urz&#261;dzenia.
-Helptext Encryption Type => 'WPA (RADIUS)' dzia&#322;a tylko w trybie Access Point <br /> 'WPA (PSK)' nie dzia&#322;a w trybie Ad-Hoc. 
-Helptext IP Settings => Ustawienia numeru IP dla DHCP i PPTP jest niekonieczne. Je&#380;eli je ustawisz, b&#281;da u&#380;ywane jako domy&#347;lnje w przypadku , gdy serwer DHCP bedzie niedost&#281;pny.
-Helptext Idle Time => Czas w sekundach bezruchu internetowego, po up&#322;ywie kt&#243;rych nast&#281;puje roz&#322;aczenie (tylko Po&#322;&#261;czenie na z&#261;danie)
-Helptext Redial Timeout => Liczba sekund, kt&#243;re trzeba odczekac po tym, jak nie otrzymales odpowiedzi od providera (przed ponowna proba podlaczenia)
-
-# untranslated:
-Available packages => Available packages
-
diff --git a/package/webif/files/usr/lib/webif/lang/pt/common.txt b/package/webif/files/usr/lib/webif/lang/pt/common.txt
deleted file mode 100644
index 2fb4693a0b..0000000000
--- a/package/webif/files/usr/lib/webif/lang/pt/common.txt
+++ /dev/null
@@ -1,454 +0,0 @@
-lang => Português
-
-# Common
-
-Settings saved => Alterações guardadas
-
-Settings not saved => Alterações não foram guardadas
-
-Save Changes => Guardar alterações
-
-Apply Changes => Aplicar alterações
-
-Clear Changes => Eliminar alterações
-
-Review Changes => Verificar alterações
-
-Host Name => Nome do sistema
-
-Uptime => Uptime
-
-Load => Carga do sistema
-
-Version => Versão
-
-Categories => Categorias
-
-Subcategories => Subcategorias
-
-more... => mais
-
-Add => Adicionar
-
-Remove => Eliminar
-
-Warning => Atenção
-
-Password_warning => Não foi estabelecida uma palavra-chave para o acesso ao router (acesso web e ssh). Por favor, estabeleça uma palavra-chave agora (o nome de utilizador será ‘root’)
-
- 
-
-# Categories
-
-Info => Informação
-
-About => Acerca de
-
-Router Info => Informações do router
-
- 
-
-Status => Estado
-
-Connections => Ligações
-
-DHCP => DHCP
-
-Wireless => Wi-Fi
-
- 
-
-System => Sistema
-
-Password => Palavra-chave
-
-Settings => Configurações
-
-Installed Software => Software instalado
-
-Firmware Upgrade => Actualizar Firmware
-
- 
-
-Network => Rede
-
-LAN => LAN
-
-WAN => Internet
-
-Wireless => Rede sem fios
-
-Advanced Wireless => Rede sem fios (avançado)
-
-Hosts => Configuração de sistemas (hosts)
-
- 
-
- 
-
-# 'About' page
-
-Copyright => Copyright
-
- 
-
-GPL_Text => Este programa é livre e poderá ser distribuído e/ou <br>modificado segundo os termos da licença GPL (General Public License)<br>tal como publicada pela Free Software Foundation como está publicada por la Free Sofware Foundation; quer pela versão 2<br> quer por qualquer versão posterior (à sua escolha).
-
-Contributions by => Contribuidores
-
-Layout based on => Layout baseado em
-
-by => por
-
- 
-
- 
-
-No config change. => Não existem alterações de configurações.
-
-Config discarded. => As alterações foram ignoradas.
-
-Config changes: => Configuração actual:
-
-Updating config... => Actualizando as alterações...
-
- 
-
- 
-
-# 'Router Info' page
-
-Firmware Version => Versão do firmware
-
-Kernel Version => Versão do Kernel
-
-Current Date/Time => Data/Hora
-
-MAC Address => Endereço MAC
-
- 
-
- 
-
-# 'Connections' page
-
-Connection Status => Estado das ligações
-
-Physical Connections => Ligações físicas
-
-Router Connections => Ligações do router
-
- 
-
- 
-
-# 'DHCP' page
-
-DHCP leases => Préstimos de DHCP
-
-IP Address => Endereço IP
-
-Name => Nome
-
-Expires in => Expira em
-
- 
-
- 
-
-# 'Wireless Status' page
-
-Wireless Status => Estado da rede sem fios
-
- 
-
-# 'Password' page
-
-Password Change => Alteração da palavra-chave
-
-New Password => Nova palavra-chave
-
-Confirm Password => Confirme a palavra-chave
-
- 
-
-# 'System Settings' page
-
-System Settings => Parâmetros do sistema
-
-Host Name => Nome do sistema
-
-Language => Idioma
-
- 
-
-# 'Installed Software' page
-
-Installed Packages => Pacotes (packages) instalados
-
-Update package lists => Actualização da lista de pacotes
-
-Uninstall => Remover
-
-Install => Instalar
-
-Available packages => Pacotes disponíveis
-
- 
-
- 
-
-# 'Firmware Upgrade' page
-
-Firmware format => Formato do firmware
-
-Error => Erro
-
-done => terminado
-
-Invalid_formt => Formato de firmware inválido
-
-Erase_JFFS2 => Apagar partição JFFS2
-
-Options => Opções
-
-Firmware_image => Ficheiro de firmware
-
-Upgrade => Actualizar
-
-Upgrading... => Actualizando...
-
- 
-
-# 'LAN Settings' page
-
-LAN Settings => Configurações da LAN (rede local)
-
-LAN Configuration => Parâmetros LAN
-
-Netmask => Máscara da sub rede (netmask)
-
-Default Gateway => Gateway
-
-DNS Servers => Servidor DNS
-
-DNS Address => Endereço IP do DNS
-
- 
-
-Note => Nota
-
- 
-
-# 'WAN Settings' page
-
-WAN Settings => Configurações Internet
-
-WAN Configuration => Parâmetros de Internet
-
-PPTP Server IP => Endereço IP do servidor PPTP
-
-Connection Type => Tipo de ligação
-
-No WAN => Sem ligação à Internet
-
-DHCP => DHCP
-
-Static IP => IP estático
-
-IP Settings => Configurações IP
-
-PPP Settings => Configurações PPP
-
-Redial Policy => Opções de restabelecimento da ligação
-
-Connect on Demand => Ligar quando necessário
-
-Keep Alive => Manter ligação sempre activa
-
-Maximum Idle Time => Tempo máximo de inactividade
-
-Redial Timeout => Tempo de restabelecimento da ligação
-
-MTU => MTU (tamanho dos pacotes)
-
-Username => Nome do utilizador
-
- 
-
- 
-
-# 'Wireless Configuration' page
-
-Wireless Configuration => Configurações rede sem fios
-
-Wireless Interface => Interface rede sem fios
-
-WEP Key => Chave WEP
-
-Selected WEP Key => Palavra-chave WEP seleccionada
-
-WPA PSK => WPA-PSK
-
-ESSID => ESSID
-
-Channel => Canal
-
-RADIUS IP Address => Endereço IP do servidor RADIUS
-
-RADIUS Server Key => Palavra-chave RADIUS
-
-Enabled => Activo
-
-Disabled => Inactivo
-
-ESSID Broadcast => Difusão do SSID
-
-Show => Mostrar
-
-Hide => Ocultar
-
-WLAN Mode => Modo rede sem fios
-
-Access Point => Ponto de acesso
-
-Client => Cliente
-
-Bridge => Ponte (Bridge)
-
-Ad-Hoc => Ad-Hoc
-
-Operation mode => Modo de funcionamento
-
-Encryption Settings => Parâmetros de encriptação
-
-Encryption Type => Tipo de encriptação
-
-PSK => PSK
-
-WPA Mode => Modo WPA
-
-WPA Algorithms => Algoritmos WPA
-
-WEP Keys => Palavra-chave WEP
-
- 
-
-# 'Advanced Wireless Configuration' page
-
-Advanced Wireless Configuration => Configurações rede sem fios (avançadas)
-
-WDS Connections => Ligações WDS
-
-MAC Filter List => Filtrar por endereço MAC
-
-Filter Mode => Tipo de filtro
-
-Allow => Autorizar
-
-Deny => Negar
-
-Set => Estabelecer
-
-Settings => Parâmetros
-
-Automatic WDS => WDS automático
-
- 
-
-# "Hosts" page
-
- 
-
-MAC Address => Endereço MAC
-
-Configured Hosts => Sistemas configurados
-
-DHCP Static => DHCP estático
-
-Host Names => Nome dos sistemas
-
- 
-
-Up => Subir
-
-Down => Baixar
-
-Edit => Editar
-
-Delete => eliminar
-
-Save => Guardar
-
-Cancel => Cancelar
-
- 
-
-Forward => Redireccionar
-
-Accept => Aceitar
-
-Drop => Descartar
-
- 
-
-Firewall => Firewall
-
-Firewall Rules => Regras da Firewall
-
-Firewall Configuration => Configurações da Firewall
-
- 
-
-New Rule => Nova regra
-
-Match => Filtrar
-
-Target => Destino
-
-Port => Porta
-
- 
-
-Protocol => Protocolo
-
-Source IP => IP de origem
-
-Destination IP => IP de destino
-
-Source Ports => Portas de origem
-
-Destination Ports => Portas de destino
-
- 
-
-Forward to => Redireccionar para
-
-Port => Porta
-
- 
-
-Helptext ESSID => SSID
-
-Helptext DNS save => É recomendável guardar as alterações antes de adicionar ou eliminar servidores DNS
-
- 
-
-Helptext Operation mode => Estabelece o modo de operação da rede sem fios. Escolhendo ‘Client (bridge)’ não altera a configuração da interface de rede. Irá simplesmente configurar alguns parâmetros da rede sem fios para operar em modo ponte (bridge).
-
- 
-
-Helptext Encryption Type => 'WPA (RADIUS)' só pode ser usado em modo ‘Ponto de acesso’.<br /> 'WPA (PSK)' não funciona em modo Ad-Hoc.
-
- 
-
-Helptext IP Settings => As opções IP são opcionais para os modos DHCP e PPTP. Apenas serão usadas caso alguma das configurações automática falhe
-
-.
-
-Helptext Idle Time => Número de segundos sem actividade na Internet que o router deve esperar antes de se desligar da Internet.
-
-(Apenas para o modo ‘Ligar quando necessário’ (connect on demand))
-
- 
-Helptext Redial Timeout => Número de segundo sem receber resposta que o router deve esperar para voltar a estabelecer ligação à Internet.
\ No newline at end of file
diff --git a/package/webif/files/usr/lib/webif/lang/ru/common.txt b/package/webif/files/usr/lib/webif/lang/ru/common.txt
deleted file mode 100644
index 1d490bdfbf..0000000000
--- a/package/webif/files/usr/lib/webif/lang/ru/common.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-lang => &#x420;&#x443;&#x441;&#x441;&#x43A;&#x438;&#x439;
-# Common
-Settings saved => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x441;&#x43E;&#x445;&#x440;&#x430;&#x43D;&#x435;&#x43D;&#x44B;
-Settings not saved => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x43D;&#x435; &#x441;&#x43E;&#x445;&#x440;&#x430;&#x43D;&#x435;&#x43D;&#x44B;
-Save Changes => &#x421;&#x43E;&#x445;&#x440;&#x430;&#x43D;&#x438;&#x442;&#x44C; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;
-Apply Changes => &#x41F;&#x440;&#x438;&#x43C;&#x435;&#x43D;&#x438;&#x442;&#x44C; &#x438;&#x437;&#x43C;&#x435;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-Clear Changes => &#x41E;&#x442;&#x43C;&#x435;&#x43D;&#x438;&#x442;&#x44C; &#x438;&#x437;&#x43C;&#x435;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-Review Changes => &#x41F;&#x435;&#x440;&#x435;&#x441;&#x43C;&#x43E;&#x442;&#x440;&#x435;&#x442;&#x44C; &#x438;&#x437;&#x43C;&#x435;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-Host Name => &#x418;&#x43C;&#x44F; &#x443;&#x437;&#x43B;&#x430;
-Uptime => &#x412;&#x440;&#x435;&#x43C;&#x44F; &#x440;&#x430;&#x431;&#x43E;&#x442;&#x44B;
-Load => &#x417;&#x430;&#x433;&#x440;&#x443;&#x437;&#x43A;&#x430;
-Version => &#x412;&#x435;&#x440;&#x441;&#x438;&#x44F;
-Categories => &#x41A;&#x430;&#x442;&#x435;&#x433;&#x43E;&#x440;&#x438;&#x438;
-Subcategories => &#x41F;&#x43E;&#x434;&#x43A;&#x430;&#x442;&#x435;&#x433;&#x43E;&#x440;&#x438;&#x438;
-more... => &#x434;&#x430;&#x43B;&#x435;&#x435;...
-Add => &#x414;&#x43E;&#x431;&#x430;&#x432;&#x438;&#x442;&#x44C;
-Remove => &#x423;&#x434;&#x430;&#x43B;&#x438;&#x442;&#x44C;
-Warning => &#x41F;&#x440;&#x435;&#x434;&#x443;&#x43F;&#x440;&#x435;&#x436;&#x434;&#x435;&#x43D;&#x438;&#x435;
-Password_warning => &#x41F;&#x430;&#x440;&#x43E;&#x43B;&#x44C; &#x434;&#x43B;&#x44F; &#x432;&#x435;&#x431;-&#x438;&#x43D;&#x442;&#x435;&#x440;&#x444;&#x435;&#x439;&#x441;&#x430; &#x438; &#x434;&#x43E;&#x441;&#x442;&#x443;&#x43F;&#x430; &#x43F;&#x43E; SSH &#x43D;&#x435; &#x437;&#x430;&#x434;&#x430;&#x43D;<br/>&#x412;&#x432;&#x435;&#x434;&#x438;&#x442;&#x435; &#x43D;&#x43E;&#x432;&#x44B;&#x439; &#x43F;&#x430;&#x440;&#x43E;&#x43B;&#x44C; (&#x438;&#x43C;&#x44F; &#x43F;&#x43E;&#x43B;&#x44C;&#x437;&#x43E;&#x432;&#x430;&#x442;&#x435;&#x43B;&#x44F; &#x432; web-&#x438;&#x43D;&#x442;&#x435;&#x440;&#x444;&#x435;&#x439;&#x441;&#x435;: 'root').
-
-# Categories
-Info => &#x418;&#x43D;&#x444;&#x43E;&#x440;&#x43C;&#x430;&#x446;&#x438;&#x44F;
-About => &#x41E; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x435;
-Router Info => &#x41C;&#x430;&#x440;&#x448;&#x440;&#x443;&#x442;&#x438;&#x437;&#x430;&#x442;&#x43E;&#x440;
-
-Status => &#x421;&#x442;&#x430;&#x442;&#x443;&#x441;
-Connections => &#x421;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-DHCP => DHCP
-Wireless => &#x411;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x430;&#x44F; &#x441;&#x435;&#x442;&#x44C;
-
-System => &#x421;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x430;
-Password => &#x41F;&#x430;&#x440;&#x43E;&#x43B;&#x44C;
-Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;
-Installed Software => &#x423;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x43D;&#x44B;&#x435; &#x43F;&#x430;&#x43A;&#x435;&#x442;&#x44B;
-Firmware Upgrade => &#x41E;&#x431;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x438;&#x435; &#x43F;&#x440;&#x43E;&#x448;&#x438;&#x432;&#x43A;&#x438;
-
-Network => &#x421;&#x435;&#x442;&#x44C;
-LAN => &#x41B;&#x43E;&#x43A;&#x430;&#x43B;&#x44C;&#x43D;&#x430;&#x44F;
-WAN => &#x412;&#x43D;&#x435;&#x448;&#x43D;&#x44F;&#x44F;
-Wireless => &#x411;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x430;&#x44F;
-Advanced Wireless => &#x411;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x430;&#x44F; (&#x43F;&#x43E;&#x434;&#x440;&#x43E;&#x431;&#x43D;&#x435;&#x435;)
-Hosts => &#x423;&#x437;&#x43B;&#x44B;
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => &#x42D;&#x442;&#x43E; &#x441;&#x432;&#x43E;&#x431;&#x43E;&#x434;&#x43D;&#x43E;&#x435; &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x43C;&#x43D;&#x43E;&#x435; &#x43E;&#x431;&#x435;&#x441;&#x43F;&#x435;&#x447;&#x435;&#x43D;&#x438;&#x435;. &#x41E;&#x43D;&#x43E; &#x440;&#x430;&#x441;&#x43F;&#x440;&#x43E;&#x441;&#x442;&#x440;&#x430;&#x43D;&#x44F;&#x435;&#x442;&#x441;&#x44F; &#x438; &#x43C;&#x43E;&#x434;&#x438;&#x444;&#x438;&#x446;&#x438;&#x440;&#x443;&#x435;&#x442;&#x441;&#x44F; &#x432; &#x441;&#x43E;&#x43E;&#x442;&#x432;&#x435;&#x442;&#x441;&#x442;&#x432;&#x438;&#x438; &#x441; &#x43B;&#x438;&#x446;&#x435;&#x43D;&#x437;&#x438;&#x435;&#x439; GNU General Public License,<br/> &#x43E;&#x43F;&#x443;&#x431;&#x43B;&#x438;&#x43A;&#x43E;&#x432;&#x430;&#x43D;&#x43D;&#x43E;&#x439; Free Software Foundation; &#x432;&#x435;&#x440;&#x441;&#x438;&#x438; 2 &#x438;&#x43B;&#x438; &#x43F;&#x43E; &#x443;&#x441;&#x43C;&#x43E;&#x442;&#x440;&#x435;&#x43D;&#x438;&#x44E; &#x43F;&#x43E;&#x43B;&#x44C;&#x437;&#x43E;&#x432;&#x430;&#x442;&#x435;&#x43B;&#x44F; &#x43B;&#x44E;&#x431;&#x43E;&#x439; &#x431;&#x43E;&#x43B;&#x435;&#x435; &#x43F;&#x43E;&#x437;&#x434;&#x43D;&#x435;&#x439; &#x432;&#x435;&#x440;&#x441;&#x438;&#x438;.
-Contributions by => &#x41F;&#x43E;&#x43C;&#x43E;&#x449;&#x43D;&#x438;&#x43A;&#x438;
-Layout based on => &#x414;&#x438;&#x437;&#x430;&#x439;&#x43D;&#x435;&#x440;
-by => &#x43E;&#x442;
-
-
-No config change. => &#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F; &#x43D;&#x435; &#x438;&#x437;&#x43C;&#x435;&#x43D;&#x44F;&#x43B;&#x430;&#x441;&#x44C;.
-Config discarded. => &#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F; &#x43E;&#x442;&#x43A;&#x43B;&#x43E;&#x43D;&#x435;&#x43D;&#x430;.
-Config changes: => &#x418;&#x437;&#x43C;&#x435;&#x43D;&#x435;&#x43D;&#x438;&#x435; &#x43A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x438;:
-Updating config... => &#x41E;&#x431;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x438;&#x435; &#x43A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x438;...
-
-
-# 'Router Info' page
-Firmware Version => &#x412;&#x435;&#x440;&#x441;&#x438;&#x44F; &#x43F;&#x440;&#x43E;&#x448;&#x438;&#x432;&#x43A;&#x438;
-Kernel Version => &#x412;&#x435;&#x440;&#x441;&#x438;&#x44F; &#x44F;&#x434;&#x440;&#x430;
-Current Date/Time => &#x412;&#x440;&#x435;&#x43C;&#x44F; &#x438; &#x434;&#x430;&#x442;&#x430;
-MAC Address => MAC-&#x430;&#x434;&#x440;&#x435;&#x441;
-
-# 'Connections' page
-Connection Status => &#x421;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x435;
-Physical Connections => &#x410;&#x43F;&#x43F;&#x430;&#x440;&#x430;&#x442;&#x43D;&#x44B;&#x435; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-Router Connections => &#x41F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x43C;&#x43D;&#x44B;&#x435; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F; &#x43C;&#x430;&#x440;&#x448;&#x440;&#x443;&#x442;&#x438;&#x437;&#x430;&#x442;&#x43E;&#x440;&#x430;
-
-
-# 'DHCP' page
-DHCP leases => DHCP &#x43A;&#x43B;&#x438;&#x435;&#x43D;&#x442;&#x44B;
-IP Address => IP &#x430;&#x434;&#x440;&#x435;&#x441;
-Name => &#x418;&#x43C;&#x44F;
-Expires in => &#x418;&#x441;&#x442;&#x435;&#x43A;&#x430;&#x435;&#x442;
-
-
-# 'Wireless Status' page
-Wireless Status => &#x411;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x430;&#x44F; &#x441;&#x435;&#x442;&#x44C;
-
-# 'Password' page
-Password Change => &#x418;&#x437;&#x43C;&#x435;&#x43D;&#x438;&#x442;&#x44C; &#x43F;&#x430;&#x440;&#x43E;&#x43B;&#x44C;
-New Password => &#x41D;&#x43E;&#x432;&#x44B;&#x439; &#x43F;&#x430;&#x440;&#x43E;&#x43B;&#x44C;
-Confirm Password => &#x41F;&#x43E;&#x434;&#x442;&#x432;&#x435;&#x440;&#x436;&#x434;&#x435;&#x43D;&#x438;&#x435; &#x43F;&#x430;&#x440;&#x43E;&#x43B;&#x44F;
-
-# 'System Settings' page
-System Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x44B;
-Host Name => &#x418;&#x43C;&#x44F; &#x443;&#x437;&#x43B;&#x430;
-Language => &#x42F;&#x437;&#x44B;&#x43A;
-
-# 'Installed Software' page
-Installed Packages => &#x423;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x43D;&#x44B;&#x435; &#x43F;&#x430;&#x43A;&#x435;&#x442;&#x44B;
-Update package lists => &#x41E;&#x431;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x44C; &#x441;&#x43F;&#x438;&#x441;&#x43E;&#x43A; &#x43F;&#x430;&#x43A;&#x435;&#x442;&#x43E;&#x432;
-Available packages => &#x414;&#x43E;&#x441;&#x442;&#x443;&#x43F;&#x43D;&#x44B;&#x435; &#x43F;&#x430;&#x43A;&#x435;&#x442;&#x44B;
-Uninstall => &#x423;&#x434;&#x430;&#x43B;&#x438;&#x442;&#x44C;
-Install => &#x423;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x44C;
-
-
-# 'Firmware Upgrade' page
-Firmware format => &#x424;&#x43E;&#x440;&#x43C;&#x430;&#x442; &#x43F;&#x440;&#x43E;&#x448;&#x438;&#x432;&#x43A;&#x438;
-Error => &#x41E;&#x448;&#x438;&#x431;&#x43A;&#x430;
-done => &#x433;&#x43E;&#x442;&#x43E;&#x432;&#x43E;
-Invalid_format => &#x41D;&#x435;&#x438;&#x437;&#x432;&#x435;&#x441;&#x442;&#x43D;&#x44B;&#x439; &#x444;&#x43E;&#x440;&#x43C;&#x430;&#x442; &#x43F;&#x440;&#x43E;&#x448;&#x438;&#x432;&#x43A;&#x438;
-Erase_JFFS2 => &#x41E;&#x447;&#x438;&#x441;&#x442;&#x438;&#x442;&#x44C; &#x440;&#x430;&#x437;&#x434;&#x435;&#x43B; jffs2
-Options => &#x41F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440;&#x44B;
-Firmware_image => &#x41E;&#x431;&#x440;&#x430;&#x437; &#x43F;&#x440;&#x43E;&#x448;&#x438;&#x432;&#x43A;&#x438;:
-Upgrade => &#x41E;&#x431;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x44C;
-Upgrading... => &#x41E;&#x431;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x438;&#x435;...
-
-# 'LAN Settings' page
-LAN Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x441;&#x435;&#x442;&#x438;
-LAN Configuration => &#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F; &#x441;&#x435;&#x442;&#x438;
-Netmask => &#x41C;&#x430;&#x441;&#x43A;&#x430; &#x43F;&#x43E;&#x434;&#x441;&#x435;&#x442;&#x438;
-Default Gateway => &#x428;&#x43B;&#x44E;&#x437; &#x43F;&#x43E; &#x443;&#x43C;&#x43E;&#x43B;&#x447;&#x430;&#x43D;&#x438;&#x44E;
-DNS Servers => &#x441;&#x435;&#x440;&#x432;&#x435;&#x440;&#x430; DNS
-DNS Address => &#x430;&#x434;&#x440;&#x435;&#x441; DNS
-
-Note => &#x417;&#x430;&#x43C;&#x435;&#x442;&#x43A;&#x430;
-
-
-# 'WAN Settings' page
-WAN Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x432;&#x43D;&#x435;&#x448;&#x43D;&#x435;&#x439; &#x441;&#x435;&#x442;&#x438;
-WAN Configuration => &#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F; &#x432;&#x43D;&#x435;&#x448;&#x43D;&#x435;&#x439; &#x441;&#x435;&#x442;&#x438;
-PPTP Server IP => &#x430;&#x434;&#x440;&#x435;&#x441; IP &#x441;&#x435;&#x440;&#x432;&#x435;&#x440;&#x430; PPTP
-Connection Type => &#x422;&#x438;&#x43F; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-No WAN => &#x41D;&#x435;&#x442; &#x432;&#x43D;&#x435;&#x448;&#x43D;&#x435;&#x439; &#x441;&#x435;&#x442;&#x438;
-DHCP => DHCP
-Static IP => &#x421;&#x442;&#x430;&#x442;&#x438;&#x447;&#x435;&#x441;&#x43A;&#x438;&#x439; IP
-IP Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; IP
-PPP Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; PPP
-Redial Policy => &#x420;&#x430;&#x437;&#x440;&#x44B;&#x432; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F;
-Connect on Demand => &#x421;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x44F;&#x442;&#x44C;&#x441;&#x44F; &#x43F;&#x43E; &#x442;&#x440;&#x435;&#x431;&#x43E;&#x432;&#x430;&#x43D;&#x438;&#x44E;
-Keep Alive => &#x41F;&#x43E;&#x434;&#x434;&#x435;&#x440;&#x436;&#x438;&#x432;&#x430;&#x442;&#x44C; &#x441;&#x432;&#x44F;&#x437;&#x44C;
-Maximum Idle Time => &#x41D;&#x430;&#x438;&#x431;&#x43E;&#x43B;&#x44C;&#x448;&#x435;&#x435; &#x432;&#x440;&#x435;&#x43C;&#x44F; &#x43F;&#x440;&#x43E;&#x441;&#x442;&#x43E;&#x44F;
-Redial Timeout => &#x417;&#x430;&#x434;&#x435;&#x440;&#x436;&#x43A;&#x430; &#x43F;&#x435;&#x440;&#x435;&#x434; &#x43F;&#x43E;&#x432;&#x442;&#x43E;&#x440;&#x43D;&#x44B;&#x43C; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x435;&#x43C;
-MTU => MTU
-Username => &#x418;&#x43C;&#x44F; &#x43F;&#x43E;&#x43B;&#x44C;&#x437;&#x43E;&#x432;&#x430;&#x442;&#x435;&#x43B;&#x44F;
-
-
-# 'Wireless Configuration' page
-Wireless Configuration => &#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F; &#x431;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x441;&#x435;&#x442;&#x438;
-Wireless Interface => &#x411;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x438;&#x43D;&#x442;&#x435;&#x440;&#x444;&#x435;&#x439;&#x441;
-WEP Key => &#x41A;&#x43B;&#x44E;&#x447; WEP
-Selected WEP Key => &#x412;&#x44B;&#x431;&#x440;&#x430;&#x43D;&#x43D;&#x44B;&#x439; &#x43A;&#x43B;&#x44E;&#x447; WEP
-WPA PSK => WPA &#x440;&#x430;&#x437;&#x434;&#x435;&#x43B;&#x44F;&#x435;&#x43C;&#x44B;&#x439; &#x43A;&#x43B;&#x44E;&#x447;
-ESSID => ESSID
-Channel => &#x41A;&#x430;&#x43D;&#x430;&#x43B;
-RADIUS IP Address => &#x410;&#x434;&#x440;&#x435;&#x441; IP &#x441;&#x435;&#x440;&#x432;&#x435;&#x440;&#x430; RADIUS
-RADIUS Server Key => &#x41A;&#x43B;&#x44E;&#x447; &#x441;&#x435;&#x440;&#x432;&#x435;&#x440;&#x430; RADIUS
-Enabled => &#x412;&#x43A;&#x43B;&#x44E;&#x447;&#x451;&#x43D;
-Disabled => &#x412;&#x44B;&#x43A;&#x43B;&#x44E;&#x447;&#x435;&#x43D;
-ESSID Broadcast => &#x412;&#x435;&#x449;&#x430;&#x43D;&#x438;&#x435; ESSID
-Show => &#x41F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x442;&#x44C;
-Hide => &#x421;&#x43F;&#x440;&#x44F;&#x442;&#x430;&#x442;&#x44C;
-WLAN Mode => &#x420;&#x435;&#x436;&#x438;&#x43C; &#x431;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x441;&#x435;&#x442;&#x438;
-Access Point => &#x422;&#x43E;&#x447;&#x43A;&#x430; &#x434;&#x43E;&#x441;&#x442;&#x443;&#x43F;&#x430;
-Client => &#x41A;&#x43B;&#x438;&#x435;&#x43D;&#x442;
-Bridge => &#x41C;&#x43E;&#x441;&#x442;
-Ad-Hoc => &#x41F;&#x43E; &#x437;&#x430;&#x43F;&#x440;&#x43E;&#x441;&#x443;
-Encryption Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x431;&#x435;&#x437;&#x43E;&#x43F;&#x430;&#x441;&#x43D;&#x43E;&#x441;&#x442;&#x438;
-Encryption Type => &#x422;&#x438;&#x43F; &#x448;&#x438;&#x444;&#x440;&#x43E;&#x432;&#x430;&#x43D;&#x438;&#x44F;
-PSK => &#x41F;&#x430;&#x440;&#x43E;&#x43B;&#x44C;
-WPA Mode => &#x420;&#x435;&#x436;&#x438;&#x43C; WPA
-WPA Algorithms => &#x410;&#x43B;&#x433;&#x43E;&#x440;&#x438;&#x442;&#x43C; WPA
-WEP Keys => WEP &#x43A;&#x43B;&#x44E;&#x447;&#x438;
-
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => &#x420;&#x430;&#x441;&#x448;&#x438;&#x440;&#x435;&#x43D;&#x43D;&#x430;&#x44F; &#x43A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F; &#x431;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x441;&#x435;&#x442;&#x438;
-WDS Connections => &#x421;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x435; WDS
-MAC Filter List => &#x424;&#x438;&#x43B;&#x44C;&#x442;&#x440; MAC-&#x430;&#x434;&#x440;&#x435;&#x441;&#x43E;&#x432;
-Filter Mode => &#x440;&#x435;&#x436;&#x438;&#x43C; &#x444;&#x438;&#x43B;&#x44C;&#x442;&#x440;&#x430;
-Allow => &#x41F;&#x440;&#x43E;&#x43F;&#x443;&#x441;&#x442;&#x438;&#x442;&#x44C;
-Deny => &#x41E;&#x442;&#x43A;&#x43B;&#x43E;&#x43D;&#x438;&#x442;&#x44C;
-Set => &#x423;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x44C;
-Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;
-Automatic WDS => &#x410;&#x432;&#x442;&#x43E;&#x43C;&#x430;&#x442;&#x438;&#x447;&#x435;&#x441;&#x43A;&#x438;&#x439; WDS
-
-# "Hosts" page
-
-MAC Address => MAC-&#x430;&#x434;&#x440;&#x435;&#x441;
-Configured Hosts => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x435;&#x43D;&#x43D;&#x44B;&#x435; &#x443;&#x437;&#x43B;&#x44B;
-DHCP Static => &#x421;&#x442;&#x430;&#x442;&#x438;&#x447;&#x435;&#x441;&#x43A;&#x438;&#x439; DHCP
-Host Names => &#x418;&#x43C;&#x435;&#x43D;&#x430; &#x443;&#x437;&#x43B;&#x43E;&#x432;
-
-
-Up => &#x412;&#x432;&#x435;&#x440;&#x445;
-Down => &#x412;&#x43D;&#x438;&#x437;
-Edit => &#x41F;&#x440;&#x430;&#x432;&#x43A;&#x430;
-Delete => &#x423;&#x434;&#x430;&#x43B;&#x438;&#x442;&#x44C;
-Save => &#x421;&#x43E;&#x445;&#x440;&#x430;&#x43D;&#x438;&#x442;&#x44C;
-Cancel => &#x41E;&#x442;&#x43C;&#x435;&#x43D;&#x438;&#x442;&#x44C;
-
-Forward => &#x41F;&#x435;&#x440;&#x435;&#x43D;&#x430;&#x43F;&#x440;&#x430;&#x432;&#x438;&#x442;&#x44C;
-Accept => &#x41F;&#x440;&#x438;&#x43D;&#x44F;&#x442;&#x44C;
-Drop => &#x41E;&#x442;&#x43A;&#x43B;&#x43E;&#x43D;&#x438;&#x442;&#x44C;
-
-Firewall => &#x421;&#x435;&#x442;&#x435;&#x432;&#x43E;&#x439; &#x44D;&#x43A;&#x440;&#x430;&#x43D;
-Firewall Rules => &#x41F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x430; &#x441;&#x435;&#x442;&#x435;&#x432;&#x43E;&#x433;&#x43E; &#x44D;&#x43A;&#x440;&#x430;&#x43D;&#x430;
-Firewall Configuration => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x441;&#x435;&#x442;&#x435;&#x432;&#x43E;&#x433;&#x43E; &#x44D;&#x43A;&#x440;&#x430;&#x43D;&#x430;
-
-New Rule => &#x41D;&#x43E;&#x432;&#x43E;&#x435; &#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x43E;
-Match => &#x424;&#x438;&#x43B;&#x44C;&#x442;&#x440;
-Target => &#x426;&#x435;&#x43B;&#x44C;
-Port => &#x41F;&#x43E;&#x440;&#x442;
-
-Protocol => &#x41F;&#x440;&#x43E;&#x442;&#x43E;&#x43A;&#x43E;&#x43B;
-Source IP => IP &#x43E;&#x442;&#x43F;&#x440;&#x430;&#x432;&#x438;&#x442;&#x435;&#x43B;&#x44F;
-Destination IP => IP &#x43F;&#x43E;&#x43B;&#x443;&#x447;&#x430;&#x442;&#x435;&#x43B;&#x44F;
-Source Ports => &#x41F;&#x43E;&#x440;&#x442;&#x44B; &#x43E;&#x442;&#x43F;&#x440;&#x430;&#x432;&#x438;&#x442;&#x435;&#x43B;&#x44F;
-Destination Ports => &#x41F;&#x43E;&#x440;&#x442;&#x44B; &#x43F;&#x43E;&#x43B;&#x443;&#x447;&#x430;&#x442;&#x435;&#x43B;&#x44F;
-
-Forward to => &#x41F;&#x435;&#x440;&#x435;&#x43D;&#x430;&#x43F;&#x440;&#x430;&#x432;&#x438;&#x442;&#x44C; &#x43D;&#x430;
-Port => &#x41F;&#x43E;&#x440;&#x442;
-
-Helptext ESSID => &#x418;&#x43C;&#x44F; &#x431;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x441;&#x435;&#x442;&#x438;
-Helptext DNS save => &#x41D;&#x443;&#x436;&#x43D;&#x43E; &#x441;&#x43E;&#x445;&#x440;&#x430;&#x43D;&#x438;&#x442;&#x44C; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x43D;&#x430; &#x44D;&#x442;&#x43E;&#x439; &#x441;&#x442;&#x440;&#x430;&#x43D;&#x438;&#x446;&#x435; &#x43F;&#x435;&#x440;&#x435;&#x434; &#x43F;&#x440;&#x430;&#x432;&#x43A;&#x43E;&#x439; DNS &#x441;&#x435;&#x440;&#x432;&#x435;&#x440;&#x43E;&#x432;.
-Helptext Operation mode => &#x42D;&#x442;&#x430; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x430; &#x437;&#x430;&#x434;&#x430;&#x451;&#x442; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x440;&#x430;&#x431;&#x43E;&#x442;&#x44B; &#x431;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x441;&#x435;&#x442;&#x438;. &#x412;&#x44B;&#x431;&#x43E;&#x440; '&#x41A;&#x43B;&#x438;&#x435;&#x43D;&#x442; &#x438;&#x43B;&#x438; &#x41C;&#x43E;&#x441;&#x442;' &#x43D;&#x435;&#x43F;&#x43E;&#x432;&#x43B;&#x438;&#x44F;&#x435;&#x442; &#x43D;&#x430; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; &#x441;&#x435;&#x442;&#x435;&#x432;&#x43E;&#x433;&#x43E; &#x438;&#x43D;&#x442;&#x435;&#x440;&#x444;&#x435;&#x439;&#x441;&#x430;. &#x411;&#x443;&#x434;&#x443;&#x442; &#x43E;&#x431;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x44B; &#x442;&#x43E;&#x43B;&#x44C;&#x43A;&#x43E; &#x43D;&#x435;&#x43A;&#x43E;&#x442;&#x43E;&#x440;&#x44B;&#x435; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440;&#x44B; &#x434;&#x440;&#x430;&#x439;&#x432;&#x435;&#x440;&#x430; &#x431;&#x435;&#x441;&#x43F;&#x440;&#x43E;&#x432;&#x43E;&#x434;&#x43D;&#x43E;&#x439; &#x441;&#x435;&#x442;&#x438;, &#x43A;&#x43E;&#x442;&#x43E;&#x440;&#x44B;&#x439; &#x43F;&#x43E;&#x437;&#x432;&#x43E;&#x43B;&#x44F;&#x442; &#x43C;&#x430;&#x440;&#x448;&#x440;&#x443;&#x442;&#x438;&#x437;&#x430;&#x446;&#x438;&#x44E; &#x43F;&#x430;&#x43A;&#x435;&#x442;&#x43E;&#x432; &#x441; &#x44D;&#x442;&#x43E;&#x433;&#x43E; &#x438;&#x43D;&#x442;&#x435;&#x440;&#x444;&#x435;&#x439;&#x441;&#x430;.
-Helptext Encryption Type => 'WPA (RADIUS)' &#x43F;&#x43E;&#x434;&#x434;&#x435;&#x440;&#x436;&#x438;&#x432;&#x430;&#x435;&#x442;&#x441;&#x44F; &#x442;&#x43E;&#x43B;&#x44C;&#x43A;&#x43E; &#x432; &#x440;&#x435;&#x436;&#x438;&#x43C;&#x435; &#x442;&#x43E;&#x447;&#x43A;&#x438; &#x434;&#x43E;&#x441;&#x442;&#x443;&#x43F;&#x430;<br/> 'WPA (PSK)' &#x43D;&#x435; &#x440;&#x430;&#x431;&#x43E;&#x442;&#x430;&#x435;&#x442; &#x432; &#x440;&#x435;&#x436;&#x438;&#x43C;&#x435; &#x43F;&#x43E; &#x437;&#x430;&#x43F;&#x440;&#x43E;&#x441;&#x443;.
-Helptext IP Settings => &#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438; IP &#x43C;&#x43E;&#x433;&#x443;&#x442; &#x43D;&#x435; &#x437;&#x430;&#x434;&#x430;&#x432;&#x430;&#x442;&#x44C;&#x441;&#x44F; &#x432; &#x440;&#x435;&#x436;&#x438;&#x43C;&#x430;&#x445; DHCP &#x438; PPTP. &#x415;&#x441;&#x43B;&#x438; DHCP &#x441;&#x435;&#x440;&#x432;&#x435;&#x440; &#x431;&#x443;&#x434;&#x435;&#x442; &#x43D;&#x435;&#x434;&#x43E;&#x441;&#x442;&#x443;&#x43F;&#x435;&#x43D;, &#x431;&#x443;&#x434;&#x443;&#x442; &#x438;&#x441;&#x43F;&#x43E;&#x43B;&#x44C;&#x437;&#x43E;&#x432;&#x430;&#x442;&#x44C;&#x441;&#x44F; &#x437;&#x430;&#x434;&#x430;&#x43D;&#x43D;&#x44B;&#x435; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;.
-Helptext Idle Time => &#x41F;&#x440;&#x43E;&#x43C;&#x435;&#x436;&#x443;&#x442;&#x43E;&#x43A; &#x432;&#x440;&#x435;&#x43C;&#x435;&#x43D;&#x438; &#x432; &#x441;&#x435;&#x43A;&#x443;&#x43D;&#x434;&#x430;&#x445; &#x43F;&#x43E; &#x438;&#x441;&#x442;&#x435;&#x447;&#x435;&#x43D;&#x438;&#x44E; &#x43A;&#x43E;&#x442;&#x43E;&#x440;&#x43E;&#x433;&#x43E; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x435; &#x431;&#x443;&#x434;&#x435;&#x442; &#x440;&#x430;&#x437;&#x43E;&#x440;&#x432;&#x430;&#x43D;&#x43E;, &#x435;&#x441;&#x43B;&#x438; &#x434;&#x430;&#x43D;&#x43D;&#x44B;&#x435; &#x43D;&#x435; &#x43F;&#x435;&#x440;&#x435;&#x434;&#x43E;&#x432;&#x430;&#x43B;&#x438;&#x441;&#x44C; &#x43F;&#x43E; &#x432;&#x43D;&#x435;&#x448;&#x43D;&#x435;&#x43C;&#x443; &#x438;&#x43D;&#x442;&#x435;&#x440;&#x444;&#x435;&#x439;&#x441;&#x443; (&#x438;&#x441;&#x43F;&#x43E;&#x43B;&#x44C;&#x437;&#x443;&#x435;&#x442;&#x441;&#x44F; &#x442;&#x43E;&#x43B;&#x44C;&#x43A;&#x43E; &#x432; &#x440;&#x435;&#x436;&#x438;&#x43C;&#x435; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F; &#x43F;&#x43E; &#x437;&#x430;&#x43F;&#x440;&#x43E;&#x441;&#x443;).
-Helptext Redial Timeout => &#x417;&#x430;&#x434;&#x435;&#x440;&#x436;&#x43A;&#x430; &#x432; &#x441;&#x435;&#x43A;&#x443;&#x43D;&#x434;&#x430;&#x445; &#x43F;&#x435;&#x440;&#x435;&#x434; &#x43F;&#x43E;&#x43F;&#x44B;&#x442;&#x43A;&#x43E;&#x439; &#x443;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x43A;&#x438; &#x43F;&#x43E;&#x432;&#x442;&#x43E;&#x440;&#x43D;&#x43E;&#x433;&#x43E; &#x441;&#x43E;&#x435;&#x434;&#x438;&#x43D;&#x435;&#x43D;&#x438;&#x44F; &#x441; &#x43F;&#x440;&#x43E;&#x432;&#x430;&#x439;&#x434;&#x435;&#x440;&#x43E;&#x43C;.
diff --git a/package/webif/files/usr/lib/webif/lang/se/common.txt b/package/webif/files/usr/lib/webif/lang/se/common.txt
deleted file mode 100644
index 1c019f501d..0000000000
--- a/package/webif/files/usr/lib/webif/lang/se/common.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-lang => Svenska
-# Common
-Settings saved => Inst&auml;llningar sparade
-Settings not saved => Inst&auml;llningar inte sparade
-Save Changes => Spara f&ouml;r&auml;ndringar
-Apply Changes => Applicera f&ouml;r&auml;ndringar
-Clear Changes => Ta bort f&ouml;r&auml;ndringar
-Review Changes => Se gjorda f&ouml;r&auml;ndringar
-Host Name => V&auml;rdnamn
-Uptime => Tid uppe
-Load => Ladda
-Version => Version
-Categories => Kategorier
-Subcategories => Underkategorier
-more... => mer...
-Add => L&auml;gg till
-Remove => Ta bort
-Warning => Varning
-Password_warning => Du har inte satt n&aring;got l&ouml;senord f&ouml;r Web-gr&auml;nssnittet och SSH accessen <br />Var v&auml;nlig och g&ouml;r detta nu (anv&auml;ndarnamnet i din browser kommer vara 'root').
-# Categories
-Info => Info
-About => Om
-Router Info => Router Info
-
-Status => Status
-Connections => Anslutningar
-DHCP => DHCP
-Wireless => Tr&aring;dl&ouml;s
-
-System => System
-Password => L&ouml;senord
-Settings => Inst&auml;llningar
-Installed Software => Installerad mjukvara
-Firmware Upgrade => Firmware uppgradering
-
-Network => N&auml;tverk
-LAN => LAN
-WAN => WAN
-Wireless => Tr&aring;dl&ouml;s
-Advanced Wireless => Avancerad Tr&aring;dl&ouml;s
-Hosts => Konfigurerade V&auml;rdar
-
-
-# 'About' page
-Copyright => Copyright
-
-GPL_Text => Detta program &auml;r &ouml;ppen programvara; du kan &aring;terdistribuera den och/eller <br /> modifiera den under villkoren av best&auml;mmelserna i GNU General Public License <br /> publicerad av Free Software Foundation; antingen version 2 <br /> av licensen eller senare. <br />
-Contributions by => Bidrag av
-Layout based on => Layout baserad p&aring;
-by => av
-
-
-No config change. => Inga &auml;ndringar i inst&auml;llningarna gjordes.
-Config discarded. => Dina &auml;ndringar i inst&auml;llningarna har avbrutits. 
-Config changes: => Nuvarande &auml;ndringar i inst&auml;llningarna: 
-Updating config... => Uppdaterar dina inst&auml;llningar...
-
-# 'Router Info' page
-Firmware Version => Firmware Version
-Kernel Version => Kernel Version
-Current Date/Time => Nuvarande Datum/Tid
-MAC Address => Mac Adress
-
-
-# 'Connections' page
-Connection Status => Anslutningsstatus
-Physical Connections => Fysiska anslutningar
-Router Connections => Router anslutningar
-
-
-# 'DHCP' page
-DHCP leases => DHCP leases
-IP Address => IP Adress
-Name => Namn
-Expires in => Utg&aring;r om
-
-
-# 'Wireless Status' page
-Wireless Status => Tr&aring;dl&ouml;s Status
-
-# 'Password' page
-Password Change => Byt l&ouml;senord
-New Password => Nytt l&ouml;senord
-Confirm Password => Bekr&auml;fta nytt l&ouml;senord
-
-# 'System Settings' page
-System Settings => System Inst&auml;llningar
-Host Name => V&auml;rdnamn
-Language => Spr&aring;k
-
-# 'Installed Software' page
-Installed Packages => Installerade mjukvaror
-Update package lists => Uppdatera mjukvarulista
-Uninstall => Avinstallera
-Install => Installera
-
-
-# 'Firmware Upgrade' page
-Firmware format => Firmware format
-Error => Fel
-done => utf&ouml;rd
-Invalid_formt => Felaktigt Firmware Format
-Erase_JFFS2 => Ta bort JFFS2 partition
-Options => M&ouml;jligheter
-Firmware_image => Firmware att ladda upp 
-Upgrade => Uppgradering
-Upgrading... => Uppgradering...
-
-# 'LAN Settings' page
-LAN Settings => LAN Inst&auml;llningar
-LAN Configuration => LAN Inst&auml;llningar
-Netmask => Netmask
-Default Gateway => Default Gateway
-DNS Servers => DNS Servrar
-DNS Address => DNS Adress
-
-Note => Noteringar
-
-# 'WAN Settings' page
-WAN Settings => WAN Inst&auml;llningar
-WAN Configuration => WAN Inst&auml;llningar
-PPTP Server IP => PPTP Server IP
-Connection Type => Anslutningstyp
-No WAN => Ingen
-DHCP => DHCP
-Static IP => Statisk IP
-IP Settings => IP Inst&auml;llningar
-PPP Settings => PPP Inst&auml;llningar
-Redial Policy => &Aring;teruppringsnings Policy
-Connect on Demand => Anslut p&aring; beg&auml;ran 
-Keep Alive => H&aring;ll levande
-Maximum Idle Time => Maximum tid i vila
-Redial Timeout => Timeout f&ouml;r &aring;teruppringning
-MTU => MTU
-Username => Anv&auml;ndarnamn
-
-# 'Wireless Configuration' page
-Wireless Configuration => Tr&aring;dl&ouml;sa Inst&auml;llningar
-Wireless Interface => Tr&aring;dl&ouml;st Gr&auml;nssnitt
-WEP Key => WEP Nyckel
-Selected WEP Key => Vald WEP Nyckel
-WPA PSK => WPA PSK
-ESSID => ESSID
-Channel => Kanal
-RADIUS IP Address => RADIUS IP Adress
-RADIUS Server Key => RADIUS Server Nyckel
-Enabled => P&aring;satt
-Disabled => Avst&auml;ngd
-ESSID Broadcast => ESSID Broadcast
-Show => Visa
-Hide => G&ouml;m
-WLAN Mode => WLAN L&auml;ge
-Access Point => Accesspunkt 
-Client => Klient
-Bridge => Brygga
-Ad-Hoc => Ad-Hoc
-Operation mode => Tillst&aring;ndsl&auml;ge
-Encryption Settings => Krypteringsinst&auml;llningar 
-Encryption Type => Krypteringstyp
-PSK => PSK
-WPA Mode => WPA L&auml;ge
-WPA Algorithms => WPA Algoritmer
-WEP Keys => WEP Nyckel
-
-# 'Advanced Wireless Configuration' page
-Advanced Wireless Configuration => Avancerad Tr&aring;dl&ouml;s Inst&auml;llning
-WDS Connections => WDS Anslutningar
-MAC Filter List => MAC Filter Lista
-Filter Mode => Filterl&auml;ge
-Allow => Till&aring;t
-Deny => Neka
-Set => S&auml;tt
-Settings => Settings
-Automatic WDS => Automatisk WDS
-
-# "Hosts" page
-
-MAC Address => MAC Adress
-Configured Hosts => Konfigurerade V&auml;rdar
-DHCP Static => Statisk DHCP 
-Host Names => V&auml;rdnamn
-
-Up => Upp
-Down => Ned
-Edit => Editera
-Delete => Ta bort
-Save => Spara
-Cancel => Avbryt
-
-Forward => Fram&aring;t
-Accept => Acceptera
-Drop => Tappa
-
-Firewall => Brandv&auml;gg
-Firewall Rules => Brandv&auml;ggsregler 
-Firewall Configuration => Brandv&auml;ggsinst&auml;llningar
-
-New Rule => Ny Regel
-Match => Match
-Target => M&aring;l
-Port => Port
-
-Protocol => Protokoll
-Source IP => K&auml;ll IP
-Destination IP => Destinations IP
-Source Ports => K&auml;llport
-Destination Ports => Destinationsport
-
-Forward to => Skicka till
-Port => Port
-
-Helptext ESSID => Namn p&aring; ditt tr&aring;dl&ouml;sa N&auml;tverk
-Helptext DNS save => Du b&ouml;r spara dina inst&auml;llningar p&aring; denna sida f&ouml;re du l&auml;gger till/tar bort DNS servrar
-
-Helptext Operation mode => Detta s&auml;tter l&auml;gesinst&auml;llningen f&ouml;r ditt tr&aring;dl&ouml;sa n&auml;tverk. Att v&auml;lja 'Klient (Brygga)' kommer inte &auml;ndra ditt n&auml;tverks gr&auml;nssnittsinst&auml;llningar. Det kommer endast att s&auml;tta n&aring;gra parametrar i drivrutinerna som till&aring;ter en begr&auml;nsad bryggning av gr&auml;nssnittet. 
-Helptext Encryption Type => 'WPA (RADIUS)' st&ouml;djs endast i Accesspunktsl&auml;ge. <br /> 'WPA (PSK)' fungerar inte i Ad-Hoc l&auml;ge.
-Helptext IP Settings => IP inst&auml;llningar &auml;r inte obligatoriska f&ouml;r DHCP och PPTP. Om du s&auml;tter dem s&aring; anv&auml;nds de som standard om DHCP-servern inte &auml;r tillg&auml;nlig. 
-Helptext Idle Time => Antalet sekunder utan internet trafik som routern skall v&auml;nta p&aring; innan den fr&aring;nkopplar sig fr&aring;n Internet. (Anslut endast p&aring; beg&auml;ran)
-Helptext Redial Timeout => Antalet sekunder att v&auml;nta i innan f&ouml;rs&ouml;k till ny uppkoppling g&ouml;rs. (om ingen kontakt kunnat uppr&auml;ttas med tillhandah&aring;llaren)
-
-# untranslated:
-Available packages => Available packages
-
diff --git a/package/webif/files/usr/lib/webif/languages.awk b/package/webif/files/usr/lib/webif/languages.awk
deleted file mode 100644
index f0111dd26f..0000000000
--- a/package/webif/files/usr/lib/webif/languages.awk
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN {
-	print "option|en|English"
-}
-
-/webif\/lang\/[a-zA-Z][a-zA-Z]*/ {
-	gsub(/^.*webif\/lang\//, "")
-	shortname = $0
-	gsub(/\/.*$/, "", shortname)
-	gsub(/^.*=>[ \t]*/, "")
-	longname = $0
-	print "option|" shortname "|" longname
-}
diff --git a/package/webif/files/usr/lib/webif/subcategories.awk b/package/webif/files/usr/lib/webif/subcategories.awk
deleted file mode 100644
index 8891ce44db..0000000000
--- a/package/webif/files/usr/lib/webif/subcategories.awk
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN {
-	FS=":"
-	print "<div id=\"submenu\"><h3><strong>@TR<<Subcategories>>:</strong></h3><ul>"
-}
-{
-	if ($5 ~ "^" selected "$") print "<li class=\"selected-maincat\"><a href=\"" rootdir "/" $6 "\">&raquo;@TR<<" $5 ">>&laquo;</a></li>"
-	else print "<li><a href=\"" rootdir "/" $6 "\">&nbsp;@TR<<" $5 ">>&nbsp;</a></li>"
-}
-END {
-	print "</ul></div>"
-}
-
diff --git a/package/webif/files/usr/lib/webif/validate.awk b/package/webif/files/usr/lib/webif/validate.awk
deleted file mode 100644
index 60b5915e24..0000000000
--- a/package/webif/files/usr/lib/webif/validate.awk
+++ /dev/null
@@ -1,151 +0,0 @@
-# $1 = type
-# $2 = variable name
-# $3 = field name
-# $4 = options
-# $5 = value
-BEGIN {
-	FS="|"
-	output=""
-}
-
-{ 
-	valid_type = 0
-	valid = 1
-	# XXX: weird hack, but it works...
-	n = split($0, param, "|")
-	value = param[5]
-	for (i = 6; i <= n; i++) value = value FS param[i]
-	verr = ""
-}
-
-$1 == "int" {
-	valid_type = 1
-	if (value !~ /^[0-9]*$/) { valid = 0; verr = "@TR<<Invalid value>>" }
-}
-
-# FIXME: add proper netmask validation
-($1 == "ip") || ($1 == "netmask") {
-	valid_type = 1
-	if ((value != "") && (value !~ /^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$/)) valid = 0
-	else {
-		split(value, ipaddr, "\\.")
-		for (i = 1; i <= 4; i++) {
-			if ((ipaddr[i] < 0) || (ipaddr[i] > 255)) valid = 0
-		}
-	}
-	if (valid == 0) verr = "@TR<<Invalid value>>"
-}
-
-$1 == "wep" {
-	valid_type = 1
-	if (value !~ /^[0-9A-Fa-f]*$/) {
-		valid = 0
-		verr = "@TR<<Invalid value>>"
-	} else if ((length(value) != 0) && (length(value) != 10) && (length(value) != 26)) {
-		valid = 0
-		verr = "Invalid key length"
-	} else if (value ~ /0$/) {
-		valid = 0
-		verr = "Key must not end with '0'"
-	}
-}
-
-$1 == "hostname" {
-	valid_type = 1
-	if (value !~ /^[0-9a-zA-z\.\-]*$/) {
-		valid = 0
-		verr = "@TR<<Invalid value>>"
-	}
-}
-
-$1 == "string" {
-	valid_type = 1
-}
-
-$1 == "mac" {
-	valid_type = 1
-	if ((value != "") && (value !~ /^[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]$/)) {
-		valid = 0
-		verr = "@TR<<Invalid value>>"
-	}
-}
-
-$1 == "port" {
-	valid_type = 1
-	if (value !~ /^[0-9]*$/) {
-		valid = 0
-		verr = "@TR<<Invalid value>>"
-	}
-}
-
-$1 == "ports" {
-	valid_type = 1
-	n = split(value ",", ports, ",")
-	for (i = 1; i <= n; i++) {
-		if ((ports[i] !~ /^[0-9]*$/) && (ports[i] !~ /^[0-9][0-9]*-[0-9][0-9]*$/)) {
-			valid = 0
-			verr = "@TR<<Invalid value>>"
-		}
-	}
-}
-
-$1 == "wpapsk" {
-	valid_type = 1
-	if (length(value) > 64) {
-		valid = 0
-		verr = "String too long"
-	}
-	if ((length(value) != 0) && (length(value) < 8)) {
-		valid = 0
-		verr = "String too short"
-	}
-	if ((length(value) == 64) && (value ~ /[^0-9a-fA-F]/)) {
-		valid = 0
-		verr = "Invalid hex key"
-	}
-}
-
-valid_type != 1 { valid = 0 }
-
-valid == 1 {
-	n = split($4, options, " ")
-	for (i = 1; (valid == 1) && (i <= n); i++) {
-		if (options[i] == "required") {
-			if (value == "") { valid = 0; verr = "No value entered" }
-		} else if ((options[i] ~ /^min=/) && (value != "")) {
-			min = options[i]
-			sub(/^min=/, "", min)
-			min = int(min)
-			if ($1 == "int") {
-				if (value < min) { valid = 0; verr = "Value too small (minimum: " min ")" }
-			} else if ($1 == "string") {
-				if (length(value) < min) { valid = 0; verr = "Value too small (minimum length: " min ")"}
-			}
-		} else if ((options[i] ~ /^max=/) && (value != ""))  {
-			max = options[i]
-			sub(/^max=/, "", max)
-			max = int(max)
-			if ($1 == "int") {
-				if (value > max) { valid = 0; verr = "@TR<<Value too large>> (@TR<<maximum>>: " max ")" }
-			} else if ($1 == "string") {
-				if (length(value) > max) { valid = 0; verr = "@TR<<String too short>> (@TR<<maximum>>: " max ")" }
-			}
-		} else if ((options[i] == "nodots") && ($1 == "hostname")) {
-			if (value ~ /\./) {
-				valid = 0
-				verr = "@TR<<Invalid value>>"
-			}
-		}
-	}
-}
-
-valid_type == 1 {
-	if (valid == 1) output = output $2 "=\"" value "\";\n"
-	else error = error "Error in " $3 ": " verr "<br />"
-}
-
-END {
-	print output "ERROR=\"" error "\";\n"
-	if (error == "") print "return 0"
-	else print "return 255"
-}
diff --git a/package/webif/files/usr/lib/webif/webif.sh b/package/webif/files/usr/lib/webif/webif.sh
deleted file mode 100755
index e6147fd6dd..0000000000
--- a/package/webif/files/usr/lib/webif/webif.sh
+++ /dev/null
@@ -1,286 +0,0 @@
-libdir=/usr/lib/webif
-wwwdir=/www
-cgidir=/www/cgi-bin/webif
-rootdir=/cgi-bin/webif
-indexpage=index.sh
-
-# workarounds for stupid busybox slowness on [ ]
-empty() {
-	case "$1" in
-		"") return 0 ;;
-		*) return 255 ;;
-	esac
-}
-equal() {
-	case "$1" in
-		"$2") return 0 ;;
-		*) return 255 ;;
-	esac
-}
-neq() {
-	case "$1" in
-		"$2") return 255 ;;
-		*) return 0 ;;
-	esac
-}
-# very crazy, but also very fast :-)
-exists() {
-	( < $1 ) 2>&-
-}
-
-categories() {
-	grep '##WEBIF:' $cgidir/.categories $cgidir/*.sh 2>/dev/null | \
-		awk -v "selected=$1" \
-			-v "rootdir=$rootdir" \
-			-v "indexpage=$indexpage" \
-			-f /usr/lib/webif/categories.awk -
-}
-
-subcategories() {
-	grep -H "##WEBIF:name:$1:" $cgidir/*.sh 2>/dev/null | \
-		sed -e 's,^.*/\([a-zA-Z0-9_\.\-]*\):\(.*\)$,\2:\1,' | \
-		sort -n | \
-		awk -v "selected=$2" \
-			-v "rootdir=$rootdir" \
-			-f /usr/lib/webif/subcategories.awk -
-}
-
-update_changes() {
-	CHANGES=$(($( (cat /tmp/.webif/config-* ; ls /tmp/.webif/file-*) 2>&- | wc -l)))
-}
-
-header() {
-	empty "$ERROR" && {
-		_saved_title="${SAVED:+: @TR<<Settings saved>>}"
-	} || {
-		FORM_submit="";
-		ERROR="<h3>$ERROR</h3><br /><br />"
-		_saved_title=": @TR<<Settings not saved>>"
-	}
-
-	_category="$1"
-	_uptime="$(uptime)"
-	_loadavg="${_uptime#*load average: }"
-	_uptime="${_uptime#*up }"
-	_uptime="${_uptime%%,*}"
-	_hostname=$(cat /proc/sys/kernel/hostname)
-	_version=$( grep "(" /etc/banner )
-	_version="${_version%% ---*}"
-	_head="${3:+<div class=\"settings-block-title\"><h2>$3$_saved_title</h2></div>}"
-	_form="${5:+<form enctype=\"multipart/form-data\" action=\"$5\" method=\"post\"><input type=\"hidden\" name=\"submit\" value=\"1\" />}"
-	_savebutton="${5:+<p><input type=\"submit\" name=\"action\" value=\"@TR<<Save Changes>>\" /></p>}"
-	_categories=$(categories $1)
-	_subcategories=${2:+$(subcategories "$1" "$2")}
-	
-	empty "$REMOTE_USER" && neq "${SCRIPT_NAME#/cgi-bin/}" "webif.sh" && grep 'root:!' /etc/passwd >&- 2>&- && {
-		_nopasswd=1
-		_form=""
-		_savebutton=""
-	}
-
-	update_changes
-	cat <<EOF
-Content-Type: text/html
-Pragma: no-cache
-
-<?xml version="1.0" encoding="@TR<<Encoding|ISO-8859-1>>"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-	<head>
-    	<title>@TR<<Web Status Console>></title>
-		<link rel="stylesheet" type="text/css" href="/webif.css" />
-		<!--[if IE]> <style> #container { height: 100%; }</style> <![endif]-->
-		<meta http-equiv="Content-Type" content="text/html; charset=@TR<<Encoding|ISO-8859-1>>" />
-	</head>
-	<body $4><div id="container">
-	    <div id="header">
-	        <div id="header-title">
-				<div id="openwrt-title"><h1>Web Status Console</h1></div>
-				<div id="short-status">
-					<h3><strong>Status:</strong></h3>
-					<ul>
-						<li><strong>@TR<<Host Name>>:</strong> $_hostname</li>
-						<li><strong>@TR<<Uptime>>:</strong> $_uptime</li>
-						<li><strong>@TR<<Load>>:</strong> $_loadavg</li>
-						<li><strong>@TR<<Version>>:</strong> $_version</li>
-					</ul>
-				</div>
-			</div>
-			$_categories
-			$_subcategories
-		</div>
-		$_form
-		<div id="content">
-			<div class="settings-block">
-				$_head
-				$ERROR
-EOF
-	empty "$REMOTE_USER" && neq "${SCRIPT_NAME#/cgi-bin/}" "webif.sh" && {
-		empty "$FORM_passwd1" || {
-			echo '<pre>'
-			(
-				echo "$FORM_passwd1"
-				sleep 1
-				echo "$FORM_passwd2"
-			) | passwd root 2>&1 && apply_passwd
-			echo '</pre>'
-			footer
-			exit
-		}
-		
-		equal "$_nopasswd" 1 && {
-			cat <<EOF
-<br />
-<br />
-<br />
-<h3>@TR<<Warning>>: @TR<<Password_warning|you haven't set a password for the Web interface and SSH access<br />Please enter one now (the user name in your browser will be 'root').>></h3>
-<br />
-<br />
-EOF
-			empty "$NOINPUT" && cat <<EOF
-<form enctype="multipart/form-data" action="$SCRIPT_NAME" method="POST">
-<table>
-	<tr>
-		<td>@TR<<New Password>>:</td>
-		<td><input type="password" name="passwd1" /></td>
-	</tr>
-	<tr>
-		<td>@TR<<Confirm Password>>: &nbsp; </td>
-		<td><input type="password" name="passwd2" /></td>
-	</tr>
-	<tr>
-		<td />
-		<td><input type="submit" name="action" value="@TR<<Set>>" /></td>
-	</tr>
-</table>
-</form>
-EOF
-			footer
-			exit
-		} || {
-			apply_passwd
-		}
-	}
-}
-
-footer() {
-	_changes=${CHANGES#0}
-	_changes=${_changes:+(${_changes})}
-	_endform=${_savebutton:+</form>}
-	cat <<EOF
-			</div>
-			<hr width="40%" />
-		</div>
-		<br />
-		<div id="save">
-			<div class="page-save">
-				<div> </div>
-			</div>
-			<div class="apply">
-				<div> </div>
-			</div>
-		</div>
-		$_endform
-    </div></body>
-</html>
-EOF
-}
-
-apply_passwd() {
-	case ${SERVER_SOFTWARE%% *} in
-		mini_httpd/*)
-			grep '^root:' /etc/passwd | cut -d: -f1,2 > $cgidir/.htpasswd
-			killall -HUP mini_httpd
-			;;
-	esac
-}
-
-display_form() {
-	if empty "$1"; then
-		awk -F'|' -f /usr/lib/webif/common.awk -f /usr/lib/webif/form.awk
-	else
-		echo "$1" | awk -F'|' -f /usr/lib/webif/common.awk -f /usr/lib/webif/form.awk
-	fi
-}
-
-list_remove() {
-	echo "$1 " | awk '
-BEGIN {
-	RS=" "
-	FS=":"
-}
-($0 !~ /^'"$2"'/) && ($0 != "") {
-	printf " " $0
-	first = 0
-}'
-}
-
-handle_list() {
-	# $1 - remove
-	# $2 - add
-	# $3 - submit
-	# $4 - validate
-	
-	empty "$1" || {
-		LISTVAL="$(list_remove "$LISTVAL" "$1") "
-		LISTVAL="${LISTVAL# }"
-		LISTVAL="${LISTVAL%% }"
-		_changed=1
-	}
-	
-	empty "$3" || {
-		validate "${4:-none}|$2" && {
-			if empty "$LISTVAL"; then
-				LISTVAL="$2"
-			else
-				LISTVAL="$LISTVAL $2"
-			fi
-			_changed=1
-		}
-	}
-
-	LISTVAL="${LISTVAL# }"
-	LISTVAL="${LISTVAL%% }"
-	LISTVAL="${LISTVAL:- }"
-
-	if empty "$_changed"; then
-		return 255
-	else
-		return 0
-	fi
-}
-
-load_settings() {
-	equal "$1" "nvram" || {
-		exists /etc/config/$1 && . /etc/config/$1
-	}
-	exists /tmp/.webif/config-$1 && . /tmp/.webif/config-$1
-}
-
-validate() {
-	if empty "$1"; then
-		eval "$(awk -f /usr/lib/webif/validate.awk)"
-	else
-		eval "$(echo "$1" | awk -f /usr/lib/webif/validate.awk)"
-	fi
-}
-
-
-save_setting() {
-	exists /tmp/.webif/* || mkdir -p /tmp/.webif
-	oldval=$(eval "echo \${$2}")
-	oldval=${oldval:-$(nvram get "$2")}
-	grep "^$2=" /tmp/.webif/config-$1 >&- 2>&- && {
-		grep -v "^$2=" /tmp/.webif/config-$1 > /tmp/.webif/config-$1-new 2>&- 
-		mv /tmp/.webif/config-$1-new /tmp/.webif/config-$1 2>&- >&-
-		oldval=""
-	}
-	equal "$oldval" "$3" || echo "$2=\"$3\"" >> /tmp/.webif/config-$1
-}
-
-
-is_bcm947xx() {
-	read _systype < /proc/cpuinfo
-	equal "${_systype##* }" "BCM947XX"
-}
-
diff --git a/package/webif/files/www/cgi-bin/webif.sh b/package/webif/files/www/cgi-bin/webif.sh
deleted file mode 100755
index 63ed48f5cb..0000000000
--- a/package/webif/files/www/cgi-bin/webif.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./webif/info.sh
diff --git a/package/webif/files/www/cgi-bin/webif/.categories b/package/webif/files/www/cgi-bin/webif/.categories
deleted file mode 100644
index 331d4dfd1c..0000000000
--- a/package/webif/files/www/cgi-bin/webif/.categories
+++ /dev/null
@@ -1,2 +0,0 @@
-##WEBIF:category:Info
-##WEBIF:category:Status
diff --git a/package/webif/files/www/cgi-bin/webif/about.sh b/package/webif/files/www/cgi-bin/webif/about.sh
deleted file mode 100755
index a0049c2267..0000000000
--- a/package/webif/files/www/cgi-bin/webif/about.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-header "Info" "About" "@TR<<About>>..."
-?>
-
-<h3>webif - @TR<<OpenWrt Administrative Console>></h3>
-<br />
-@TR<<GPL_Text|This program is free software; you can redistribute it and/or <br />modify it under the terms of the GNU General Public License <br />as published by the Free Software Foundation; either version 2 <br />of the License, or (at your option) any later version. <br /> >>
-<br />
-@TR<<Copyright>> &copy; 2005-2006 OpenWrt.org <br />
-<br />
-@TR<<Contributions by>>:
-<ul class="about">
-	<li class="about">Philipp Kewisch &lt;<a href="mailto:openwrt@kewis.ch">openwrt@kewis.ch</a>&gt;</li>
-	<li class="about">Spectra &lt;<a href="mailto:spectra@gmx.ch">spectra@gmx.ch</a>&gt;</li>
-	<li class="about">Jeremy Collake &lt;<a href="mailto:jeremy.collake@gmail.com">jeremy.collake@gmail.com</a>&gt;</li>
-	<li class="about">Travis Kemen &lt;<a href="mailto:kemen04@gmail.com">kemen04@gmail.com</a>&gt;</li>
-	<li class="about">Markus Wigge</li>
-	<li class="about">SeDkY</li>
-	<li class="about">Ivoshiee</li>
-	<li class="about">arteqw</li>
-	<li class="about">silver71</li>
-	<li class="about">@TR<<Layout based on>> <a href="http://www.openwebdesign.org/design/1773/prosimii/">&quot;Prosimii&quot;</a> @TR<<by>> haran</li>
-</ul>
-
-
-<? footer ?>
-<!--
-##WEBIF:name:Info:20:About
--->
diff --git a/package/webif/files/www/cgi-bin/webif/config.sh b/package/webif/files/www/cgi-bin/webif/config.sh
deleted file mode 100755
index 0259537aa4..0000000000
--- a/package/webif/files/www/cgi-bin/webif/config.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-
-update_changes
-
-case "$CHANGES" in
-	""|0)FORM_mode=nochange
-esac
-case "$FORM_mode" in 
-	nochange) header $FORM_cat . "@TR<<No config change.|No configuration changes were made.>>";;
-	clear)
-		rm -rf /tmp/.webif >&- 2>&- 
-		header $FORM_cat . "@TR<<Config discarded.|Your configuration changes have been discarded.>>"
-		CHANGES=""
-		echo "${FORM_prev:+<meta http-equiv=\"refresh\" content=\"2; URL=$FORM_prev\" />}"
-		;;
-	review)
-		header $FORM_cat . "@TR<<Config changes:|Current configuration changes:>>"
-		cd /tmp/.webif
-		for configname in config-*; do
-			grep = $configname >&- 2>&- && {
-				echo -n "<h3>${configname#config-}</h3><br /><pre>"
-				cat $configname
-				echo '</pre><br />'
-			}
-		done
-		CONFIGFILES=""
-		for configname in file-*; do
-			exists "$configname" && CONFIGFILES="$CONFIGFILES ${configname#file-}"
-		done
-		CONFIGFILES="${CONFIGFILES:+<h3 style="display:inline">Config files: </h3>$CONFIGFILES<br />}"
-		echo $CONFIGFILES
-		;;
-	save)
-		header $FORM_cat . "@TR<<Updating config...|Updating your configuration...>>"
-		CHANGES=""
-		echo "<pre>"
-		sh /usr/lib/webif/apply.sh 2>&1
-		echo "</pre>${FORM_prev:+<meta http-equiv=\"refresh\" content=\"2; URL=$FORM_prev\" />}"
-		;;
-esac
-
-footer
-
-?>
diff --git a/package/webif/files/www/cgi-bin/webif/index.sh b/package/webif/files/www/cgi-bin/webif/index.sh
deleted file mode 100755
index 466b34d208..0000000000
--- a/package/webif/files/www/cgi-bin/webif/index.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-category=$FORM_cat
-empty "$category" && category=Info
-header $category 1
-
-footer ?>
diff --git a/package/webif/files/www/cgi-bin/webif/info.sh b/package/webif/files/www/cgi-bin/webif/info.sh
deleted file mode 100755
index cc7639702c..0000000000
--- a/package/webif/files/www/cgi-bin/webif/info.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-header "Info" "Router Info" "@TR<<Router Info>>"
-
-?>
-<pre><?
-_version=$( grep "(" /etc/banner )
-_version="${_version%% ---*}"
-_kversion="$( cat /proc/version )"
-_date="$(date)"
-_mac="$(/sbin/ifconfig eth0 | grep HWaddr | cut -b39-)"
-sed -e 's/&/&amp;/g' < /etc/banner
-cat <<EOF
-</pre>
-<br />
-<br />
-<table style="width: 90%; text-align: left;" border="0" cellpadding="2" cellspacing="2" align="center">
-<tbody>
-	<tr>
-		<td>@TR<<Firmware Version>></td>
-		<td>$_version</td>
-	</tr>
-	<tr>
-		<td>@TR<<Kernel Version>></td>
-		<td>$_kversion</td>
-	</tr>
-	<tr>
-		<td>@TR<<Current Date/Time>></td>
-		<td>$_date</td>
-	</tr>
-	<tr>
-		<td>@TR<<MAC Address>></td>
-		<td>$_mac</td>
-	</tr>
-</tbody>
-</table>
-EOF
-
-footer
-?>
-<!--
-##WEBIF:name:Info:10:Router Info
--->
diff --git a/package/webif/files/www/cgi-bin/webif/ipkg.sh b/package/webif/files/www/cgi-bin/webif/ipkg.sh
deleted file mode 100755
index 62c0fae90b..0000000000
--- a/package/webif/files/www/cgi-bin/webif/ipkg.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./system-ipkg.sh
diff --git a/package/webif/files/www/cgi-bin/webif/status-connection.sh b/package/webif/files/www/cgi-bin/webif/status-connection.sh
deleted file mode 100755
index fbf329b1b3..0000000000
--- a/package/webif/files/www/cgi-bin/webif/status-connection.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-header "Status" "Connections" "@TR<<Connection Status>>"
-?>
-<table style="width: 90%; text-align: left;" border="0" cellpadding="2" cellspacing="2" align="center">
-<tbody>
-	<tr>
-		<th><b>@TR<<Physical Connections|Ethernet/Wireless Physical Connections>></b></th>
-	</tr>
-	<tr>
-		<td><pre><? cat /proc/net/arp ?></pre></td>
-	</tr>
-	
-	<tr><td><br /><br /></td></tr>
-
-	<tr>
-		<th><b>@TR<<Router Connections|Connections to the Router>></b></th>
-	</tr>
-	<tr>
-		<td><pre><? netstat -n 2>&- | awk '$0 ~ /^Active UNIX/ {ignore = 1}; ignore != 1 { print $0 }' ?></pre></td>
-	</tr>
-</tbody>
-</table>
-
-<? footer ?>
-<!--
-##WEBIF:name:Status:100:Connections
--->
diff --git a/package/webif/files/www/cgi-bin/webif/status-dhcp.sh b/package/webif/files/www/cgi-bin/webif/status-dhcp.sh
deleted file mode 100755
index 5517b781f4..0000000000
--- a/package/webif/files/www/cgi-bin/webif/status-dhcp.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-header "Status" "DHCP" "@TR<<DHCP leases>>"
-?>
-<table style="width: 90%; text-align: left;" border="0" cellpadding="2" cellspacing="2" align="center">
-<tbody>
-	<tr>
-		<th>@TR<<MAC Address>></th>
-		<th>@TR<<IP Address>></th>
-		<th>@TR<<Name>></th>
-		<th>@TR<<Expires in>></th>
-	</tr>
-<? [ -e /tmp/dhcp.leases ] && awk -vdate="$(date +%s)" '
-$1 > 0 {
-	print "<tr>"
-	print "<td>" $2 "</td>"
-	print "<td>" $3 "</td>"
-	print "<td>" $4 "</td>"
-	print "<td>"
-	t = $1 - date
-	h = int(t / 60 / 60)
-	if (h > 0) printf h "h "
-	m = int(t / 60 % 60)
-	if (m > 0) printf m "min "
-	s = int(t % 60)
-	printf s "sec "
-	printf "</td>"
-	print "</tr>"
-}
-' /tmp/dhcp.leases ?>
-</tbody>
-</table>
-
-<? footer ?>
-<!--
-##WEBIF:name:Status:150:DHCP
--->
diff --git a/package/webif/files/www/cgi-bin/webif/status-wireless.sh b/package/webif/files/www/cgi-bin/webif/status-wireless.sh
deleted file mode 100755
index c7ad0a3068..0000000000
--- a/package/webif/files/www/cgi-bin/webif/status-wireless.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/webif-page
-<? 
-. /usr/lib/webif/webif.sh
-header "Status" "Wireless" "@TR<<Wireless Status>>"
-?>
-
-<pre><? iwconfig 2>&1 | grep -v 'no wireless' | grep '\w' ?></pre>
-
-<? footer ?>
-<!--
-##WEBIF:name:Status:200:Wireless
--->
diff --git a/package/webif/files/www/index.html b/package/webif/files/www/index.html
deleted file mode 100644
index 72a918726e..0000000000
--- a/package/webif/files/www/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Pragma" CONTENT="no-cache">
-		<meta http-equiv="Expires" CONTENT="-1">
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-		<meta http-equiv="refresh" content="0; URL=/cgi-bin/webif.sh" />
-		<title>Web Administrative Console</title>
-	</head>
-	<body style="margin: 0pt auto; height:100%; color: #C3C4D2; background-color: #213242;">
-		<div style="width: 100%; height: 100%; position: fixed; display: table;">
-			<p style="display: table-cell; line-height: 4em; vertical-align: middle; text-align: center;">Web Administrative Console<br />Redirecting to : <a style="color: inherit;" href="/cgi-bin/webif.sh">main page</a></p>
-		</div>
-	</body>
-</html>
diff --git a/package/webif/files/www/webif.css b/package/webif/files/www/webif.css
deleted file mode 100644
index 86c5a62f90..0000000000
--- a/package/webif/files/www/webif.css
+++ /dev/null
@@ -1,296 +0,0 @@
-/* layout */
-
-* {
-	margin: 0;
-	padding: 0;
-}
-
-html, body {
-	width: inherit;
-	height: 100%;
-}
-
-dd {
-	margin-left: 1em;
-	margin-bottom: 0.2em;
-}
-
-ul {
-	display: inline;
-	list-style-type: none;
-}
-
-ul.about {
-	list-style-type: disc;
-}
-
-li.about {
-	margin-left: 2em;
-}
-
-hr,
-#submenu h3,
-#short-status h3,
-#content .settings-block .settings .settings-help h3 {
-	display: none;
-}
-
-ul.about,
-hr.separator {
-	display: block;
-}
-
-option {
-	padding-right: 1em;
-}
-
-#container {
-	position: relative;
-	min-height: 100%;
-}
-
-#header {
-	position: relative;
-	width: 100%;
-}
-
-#header-title {
-	padding-top: 2em;
-	padding-bottom: 0.2em;
-}
-
-#openwrt-title {
-	position: relative;
-	float: left;
-	left: 1em;
-	top: 0.7em;
-}
-
-#short-status {
-	position: relative;
-	right: 1em;
-	line-height: 1.2em;
-	padding-bottom:	0.2em;
-}
-
-#mainmenu,
-#submenu {
-	position: absolute;
-	width: 100%;
-	padding-top: 0.2em;
-	padding-bottom:	0.2em;
-}
-
-#mainmenu
-{
-	top: 0;
-	left: 0;
-}
-
-#mainmenu h3 {
-	padding-left: 1em;
-	float: left;
-}
-
-#mainmenu li {
-	font-size: 0.9em;
-	float: left;
-	margin-left: 1.5em;
-}
-
-#submenu li {
-	float: left;
-	margin-left: 1em;
-}
-
-
-#content {
-	padding-top: 2em;
-	margin-left: 1em;
-	padding-bottom: 6em;
-}
-
-#content .settings-block {
-	margin-bottom: 1.5em;
-}
-
-#content .settings-block .settings-block-title {
-	margin-bottom: 10px;
-}
-
-#content .settings-block .settings {
-	clear: both;
-	margin-left: 1.5em;
-	padding-right: 1em;
-}
-
-#content .settings-block .settings-block-title,
-#content .settings-block .settings .settings-title {
-	padding: 0.2em;
-}
-
-#content .settings-block .settings .settings-content {
-	padding-top: 1em;
-	margin-left: 1em;
-	float: left;
-	width: 58%;
-	padding-bottom: 0.5em;
-}
-
-#content .settings-block .settings .settings-content select,
-#content .settings-block .settings .settings-content input {
-	margin-top: 0.8em;
-}
-
-#content .settings-block .settings .settings-help {
-	padding: 0.4em;
-	padding-top: 1.4em;
-	margin-left: 42%;
-}
-
-#content .settings-block .settings .settings-help .more-help {
-	margin-right: 10%;
-	text-align: right;
-}
-
-#save {
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-}
-
-#save .page-save div {
-	float: right;
-	width: 15em;
-	height: 1.5em;
-	padding-right: 1em;
-	padding-top: 0.5em;
-	padding-bottom:	0.4em;
-}
-
-#save .apply {
-	clear: both;
-	width: 100%;
-	height: 5em;
-}
-
-#save .apply div {
-	float: right;
-	width: 15em;
-	height: 4em;
-	padding-right: 1em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-th {
-	text-align: left;
-}
-
-#content .settings-block .settings .settings-help .more-help,
-#save,
-#short-status {
-	text-align: right;
-}
-
-/* font */
-body {
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 1.0em;
-}
-
-dt,
-.selected-maincat,
-#mainmenu a:active,
-#submenu a {
-	font-weight: bold;
-}
-
-
-
-#openwrt-title h1 {
-	font-size: 2.8em;
-}
-
-
-#short-status ul {
-	font-size: 0.8em;
-}
-
-#mainmenu h3,
-#mainmenu li,
-#short-status h3 {
-	font-size: 0.9em;
-}
-
-#mainmenu a,
-#submenu a,
-#save a {
-	text-decoration: none;
-}
-
-#save a:hover {
-	text-decoration: underline;
-}
-
-#mainmenu h3 {
-	text-transform: uppercase;
-}
-
-#save a {
-	font-weight: normal;
-	font-size: 1.1em;
-}
-
-
-/* color */
-
-#header-title,
-#submenu,
-#submenu a,
-#save a,
-#save .page-save
-{
-	color: #fff;
-}
-
-#header-title,
-#save .apply div {
-	background-color: #3D5C7A;
-}
-
-#mainmenu {
-	color: #C3C4D2;
-	background-color: #213242;
-}
-
-#mainmenu a {
-	color: #C3C4D2;
-}
-
-#mainmenu a:hover {
-	color: rgb(193,102,90);
-}
-
-#submenu,
-#save div {
-	background-color: #7590AE;
-}
-
-#content .settings-block .settings-block-title h2 {
-	color: #7590AE;
-}
-
-#submenu a:hover {
-	color: #FB0;
-}
-
-#content .settings-block .settings .settings-title {
-	color: #000;
-	background-color: #CCC;
-}
-
-#save .page-save {
-	background-color: #FFF;
-}
-
diff --git a/package/webif/files/www/webif.js b/package/webif/files/www/webif.js
deleted file mode 100644
index 64d26cd8b5..0000000000
--- a/package/webif/files/www/webif.js
+++ /dev/null
@@ -1,33 +0,0 @@
-function value(name)
-{
-	var item = document.getElementById(name);
-	return (item ? item.value : "");
-}
-function isset(name, val)
-{
-	return (value(name) == val);
-}
-function checked(name)
-{
-	var item = document.getElementById(name);
-	return ((item) && item.checked);
-}
-function hide(name)
-{
-	var item = document.getElementById(name);
-	if (item) 
-		item.style.display = 'none';
-}
-function show(name)
-{
-	var item = document.getElementById(name);
-	if (item)
-		item.style.display = '';
-}
-function set_visible(name, value)
-{
-	if (value)
-		show(name)
-	else
-		hide(name)
-}
diff --git a/package/webif/src/bstrip.c b/package/webif/src/bstrip.c
deleted file mode 100644
index 1e17d4e00a..0000000000
--- a/package/webif/src/bstrip.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define BUF_SIZE 1024
-#define READ_LEN 14
-
-static int read_len = READ_LEN;
-static char rbuf[32];
-static char rbuflen = 0;
-
-int do_gets(char *buf)
-{
-	int r = 0, c = 0;
-	char *m;
-
-	if (rbuflen > 0)
-		memcpy(buf, rbuf, rbuflen);
-	c += rbuflen;
-
-	while ((c + read_len < BUF_SIZE) && ((r = read(0, &buf[c], read_len)) > 0)) {
-		m = NULL;
-
-		if ((m = memchr(&buf[c], '\n', r)) != NULL) {
-			rbuflen = r - (m - &buf[c] + 1);
-			if (rbuflen > 0)
-				memcpy(rbuf, m + 1, rbuflen);
-			c += m - &buf[c] + 1;
-		} else {
-			rbuflen = 0;
-			c += r;
-		}
-
-		if ((c > 3) && (memcmp(&buf[c - 3], "---", 3) == 0))
-			read_len = 1;
-
-		if (m != NULL)
-			return c;
-	}
-
-	return c;
-}
-
-int main(int argc, char **argv)
-{
-	char buf[BUF_SIZE];
-	char buf1[BUF_SIZE];
-	char *tmp;
-	int len, r = 0, r1 = 0;
-
-	if (argc != 2) {
-		fprintf(stderr, "Syntax: %s (name|data <boundary>)\n", argv[0]);
-		exit(1);
-	}
-	while (tmp = strchr(argv[1], '\r'))
-		*tmp = 0;
-
-	len = strlen(argv[1]);
-
-	*buf = 0;
-	while ((strncmp(buf, argv[1], len) != 0) &&
-		(strncmp(buf + 2, argv[1], len) != 0)) {
-		if (r > 0) {
-			if (r1 > 0)
-				write (1, buf1, r1);
-			r1 = r;
-			memcpy(buf1, buf, r);
-		}
-		if ((r = do_gets(buf)) <= 0)
-			exit(1);
-	}
-
-	if (r1 > 2)
-		write(1, buf1, r1 - 2);
-}
diff --git a/package/webif/src/webif-page.c b/package/webif/src/webif-page.c
deleted file mode 100644
index 13e70937ec..0000000000
--- a/package/webif/src/webif-page.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Webif page translator
- *
- * Copyright (C) 2005 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glob.h>
-#include <ctype.h>
-#ifdef NVRAM
-#include <bcmnvram.h>
-#endif
-
-#define HASH_MAX	100
-#define LINE_BUF	1024 /* max. buffer allocated for one line */
-#define MAX_TR		32	 /* max. translations done on one line */
-#define TR_START	"@TR<<"
-#define TR_END		">>"
-
-struct lstr {
-	char *name;
-	char *value;
-	struct lstr *next;
-};
-typedef struct lstr lstr;
-
-static lstr *ltable[HASH_MAX];
-static char buf[LINE_BUF], buf2[LINE_BUF];
-
-/* djb2 hash function */
-static inline unsigned long hash(char *str)
-{
-	unsigned long hash = 5381;
-	int c;
-
-	while ((c = *str++))
-		hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
-	
-	return hash;
-}
-
-static inline char *translate_lookup(char *str)
-{
-	char *name, *def, *p, *res = NULL;
-	lstr *i;
-	int h;
-	
-	def = name = str;
-	if (((p = strchr(str, '|')) != NULL)
-		|| ((p = strchr(str, '#')) != NULL)) {
-		def = p + 1;
-		*p = 0;
-	}
-	
-	h = hash(name) % HASH_MAX;
-	i = ltable[h];
-	while ((res == NULL) && (i != NULL)) {
-		if (strcmp(name, i->name) == 0)
-			res = i->value;
-		i = i->next;
-	}
-	
-	if (res == NULL)
-		res = def;
-	
-	return res;
-}
-
-static inline void add_line(char *name, char *value)
-{
-	int h = hash(name) % HASH_MAX;
-	lstr *s = malloc(sizeof(lstr));
-	lstr *p;
-
-	s->name = strdup(name);
-	s->value = strdup(value);
-	s->next = NULL;
-	
-	if (ltable[h] == NULL)
-		ltable[h] = s;
-	else {
-		for(p = ltable[h]; p->next != NULL; p = p->next);
-		p->next = s;
-	}
-}
-
-static char *translate_line(char *line)
-{
-	static char *tok[MAX_TR * 3];
-	char *l, *p, *p2, *res;
-	int len = 0, pos = 0, i;
-
-	l = line;
-	while (l != NULL) {
-		if ((p = strstr(l, TR_START)) == NULL) {
-			len += strlen((tok[pos++] = l));
-			break;
-		}
-
-		p2 = strstr(p, TR_END);
-		if (p2 == NULL)
-			break;
-
-		*p = 0;
-		*p2 = 0;
-		len += strlen((tok[pos++] = l));
-		len += strlen((tok[pos++] = translate_lookup(p + strlen(TR_START))));
-
-		l = p2;
-		l += strlen(TR_END);
-	}
-	len++;
-	
-	if (len > LINE_BUF)
-		p = malloc(len);
-	else
-		p = buf2;
-
-	p[0] = 0;
-	res = p;
-	for (i = 0; i < pos; i++) {
-		strcat(p, tok[i]);
-		p += strlen(tok[i]);
-	}
-
-	return res;
-}
-
-/* load and parse language file */
-static void load_lang(char *file)
-{
-	FILE *f;
-	char *b, *name, *value;
-
-	f = fopen(file, "r");
-	while (!feof(f) && (fgets(buf, LINE_BUF - 1, f) != NULL)) {
-		b = buf;
-		while (isspace(*b))
-			b++; /* skip leading spaces */
-		if (!*b)
-			continue;
-		
-		name = b;
-		if ((b = strstr(name, "=>")) == NULL)
-			continue; /* separator not found */
-
-		value = b + 2;
-		if (!*value)
-			continue;
-		
-		*b = 0;
-		for (b--; isspace(*b); b--)
-			*b = 0; /* remove trailing spaces */
-		
-		while (isspace(*value))
-			value++; /* skip leading spaces */
-
-		for (b = value + strlen(value) - 1; isspace(*b); b--)
-			*b = 0; /* remove trailing spaces */
-		
-		if (!*value)
-			continue;
-
-		add_line(name, value);
-	}
-}
-
-int main (int argc, char **argv)
-{
-	FILE *f;
-	int len, i, done;
-	char line[LINE_BUF], *tmp, *arg;
-	glob_t langfiles;
-	char *lang = NULL;
-	char *proc = "/usr/bin/haserl";
-
-	memset(ltable, 0, HASH_MAX * sizeof(lstr *));
-#ifdef NVRAM
-	if ((lang = nvram_get("language")) != NULL) {
-#else
-	if ((f = fopen("/etc/config/webif", "r")) != NULL) {
-		int n, i;
-		
-		while (!feof(f) && (lang == NULL)) {
-			fgets(line, LINE_BUF - 1, f);
-			
-			if (strncasecmp(line, "lang", 4) != 0)
-				goto nomatch;
-			
-			lang = line + 4;
-			while (isspace(*lang))
-				lang++;
-			
-			if (*lang != '=')
-				goto nomatch;
-
-			lang++;
-
-			while (isspace(*lang))
-				lang++;
-
-			for (i = 0; isalpha(lang[i]) && (i < 32); i++);
-			lang[i] = 0;
-			continue;
-nomatch:
-			lang = NULL;
-		}
-		fclose(f);
-#endif
-
-		sprintf(buf, "/usr/lib/webif/lang/%s/*.txt", lang);
-		i = glob(buf, GLOB_ERR | GLOB_MARK, NULL, &langfiles);
-		if (i == GLOB_NOSPACE || i == GLOB_ABORTED || i == GLOB_NOMATCH) {
-			// no language files found
-		} else {
-			for (i = 0; i < langfiles.gl_pathc; i++) {
-				load_lang(langfiles.gl_pathv[i]);
-			}
-		}
-	}
-
-	/*
-	 * command line options for this parser are stored in argv[1] only.
-	 * filename to be processed is in argv[2]
-	 */
-	done = 0;
-	i = 1;
-	while (!done) {
-		if (argv[1] == NULL) {
-			done = 1;
-		} else if (strncmp(argv[1], "-e", 2) == 0) {
-			argv[1] = strchr(argv[1], ' ');
-			argv[1]++;
-			if (argv[1] != NULL) {
-				arg = argv[1];
-				if ((tmp = strchr(argv[1], ' ')) != NULL) {
-					*tmp = 0;
-					argv[1] = &tmp[1];
-				} else {
-					argv[1] = NULL;
-					i++;
-				}
-				system(arg);
-			}
-		} else if (strncmp(argv[1], "-p", 2) == 0) {
-			argv[1] = strchr(argv[1], ' ');
-			argv[1]++;
-			if (argv[1] != NULL) {
-				arg = argv[1];
-				if ((tmp = strchr(argv[1], ' ')) != NULL) {
-					*tmp = 0;
-					argv[1] = &tmp[1];
-				} else {
-					argv[1] = NULL;
-					i++;
-				}
-				proc = strdup(arg);
-			}
-		} else {
-			done = 1;
-		}
-	}
-
-	strcpy(buf, proc);
-	while (argv[i]) {
-		sprintf(buf + strlen(buf), " %s", argv[i++]);
-	}
-	f = popen(buf, "r");
-	
-	while (!feof(f) && (fgets(buf, LINE_BUF - 1, f)) != NULL) {
-		fprintf(stdout, "%s", translate_line(buf));
-		fflush(stdout);
-	}
-	
-	return 0;
-}
diff --git a/package/webif/webif.mk b/package/webif/webif.mk
deleted file mode 100644
index d9f3e049ba..0000000000
--- a/package/webif/webif.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#############################################################
-#
-# webif
-#
-#############################################################
-WEBIF_VERSION:=0.2
-WEBIF_SOURCE:=package/webif
-WEBIF_SITE:=https://svn.openwrt.org/openwrt/tags/whiterussian_0.9/package/webif
-WEBIF_DIR:=$(BUILD_DIR)/webif-$(WEBIF_VERSION)
-
-$(WEBIF_DIR)/.unpacked:
-	mkdir -p $(WEBIF_DIR)
-	touch $@
-
-$(WEBIF_DIR)/.built: $(WEBIF_DIR)/.unpacked
-	$(TARGET_CC) $(TARGET_CFLAGS) -o $(WEBIF_DIR)/webif-page $(WEBIF_SOURCE)/src/webif-page.c
-	$(TARGET_CC) $(TARGET_CFLAGS) -o $(WEBIF_DIR)/bstrip $(WEBIF_SOURCE)/src/bstrip.c
-	$(STRIPCMD) --strip-unneeded $(WEBIF_DIR)/webif-page $(WEBIF_DIR)/bstrip
-	touch $@
-
-$(TARGET_DIR)/www/webif.css: $(WEBIF_DIR)/.built
-	mkdir -p $(TARGET_DIR)/etc
-	mkdir -p $(TARGET_DIR)/usr/bin
-	mkdir -p $(TARGET_DIR)/usr/lib
-	mkdir -p $(TARGET_DIR)/www
-	cat $(WEBIF_SOURCE)/files/etc/httpd.conf >> $(TARGET_DIR)/etc/httpd.conf
-	cp -dpfr $(WEBIF_SOURCE)/files/usr/lib/webif $(TARGET_DIR)/usr/lib/
-ifneq ($(BR2_PACKAGE_WEBIF_LANGUAGES),y)
-	rm -rf $(TARGET_DIR)/usr/lib/webif/lang
-endif
-	$(INSTALL) -m0755 $(WEBIF_DIR)/webif-page $(TARGET_DIR)/usr/bin/
-	$(INSTALL) -m0755 $(WEBIF_DIR)/bstrip $(TARGET_DIR)/usr/bin/
-ifeq ($(BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML),y)
-	@if [ -f "$(TARGET_DIR)/www/index.html" ]; then			\
-		echo;							\
-		echo "webif WARNING:";					\
-		echo "There is already a $(TARGET_DIR)/www/index.html";	\
-		echo "webif might be replacing another package;"	\
-		echo;							\
-		echo "Sleeping for 10 seconds";				\
-		sleep 10;						\
-	fi
-	cp -dpf $(WEBIF_SOURCE)/files/www/index.html $(TARGET_DIR)/www/
-endif
-	cp -dpfr $(WEBIF_SOURCE)/files/www/cgi-bin $(TARGET_DIR)/www/
-	cp -dpfr $(WEBIF_SOURCE)/files/www/webif.* $(TARGET_DIR)/www/
-	@if [ ! -f $(TARGET_DIR)/etc/banner ]; then	\
-		ln -sf issue $(TARGET_DIR)/etc/banner;	\
-	fi
-	touch $@
-
-webif: busybox $(TARGET_DIR)/www/webif.css
-
-webif-clean:
-	rm -rf $(TARGET_DIR)/www/cgi-bin/webif* $(TARGET_DIR)/www/webif.*
-	rm -rf $(TARGET_DIR)/usr/lib/webif
-	rm -f $(TARGET_DIR)/usr/bin/bstrip $(TARGET_DIR)/usr/bin/webif-page
-	rm -r $(WEBIF_DIR)/bstrip $(WEBIF_DIR)/webif-page
-
-webif-source:
-
-webif-dirclean:
-	rm -rf $(WEBIF_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_WEBIF),y)
-TARGETS+=webif
-endif

From 7998d1d3e5fb07370758513a4c13daff32507370 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:38:29 -0300
Subject: [PATCH 0909/6849] sfdisk: remove deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  4 --
 package/sfdisk/Config.in                      |  5 --
 .../sfdisk.001.include_sys_syscalls_h.patch   | 12 -----
 package/sfdisk/sfdisk.005.no-llseek-fix.patch | 21 --------
 .../sfdisk.010.index-rindex-fix-2.patch       | 45 -----------------
 package/sfdisk/sfdisk.mk                      | 49 -------------------
 6 files changed, 136 deletions(-)
 delete mode 100644 package/sfdisk/Config.in
 delete mode 100644 package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
 delete mode 100644 package/sfdisk/sfdisk.005.no-llseek-fix.patch
 delete mode 100644 package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
 delete mode 100644 package/sfdisk/sfdisk.mk

diff --git a/package/Config.in b/package/Config.in
index da0a093b9d..52fe824357 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -199,10 +199,6 @@ source "package/picocom/Config.in"
 source "package/rng-tools/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-# busybox has fdisk
-source "package/sfdisk/Config.in"
-endif
 source "package/smartmontools/Config.in"
 source "package/squashfs/Config.in"
 source "package/squashfs3/Config.in"
diff --git a/package/sfdisk/Config.in b/package/sfdisk/Config.in
deleted file mode 100644
index c5b84be9e8..0000000000
--- a/package/sfdisk/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_PACKAGE_SFDISK
-	bool "sfdisk"
-	depends on BR2_DEPRECATED
-	help
-	  Partition table manipulator for Linux.
diff --git a/package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch b/package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
deleted file mode 100644
index dd35951786..0000000000
--- a/package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sfdisk/sfdisk.c.oorig	2006-10-09 16:24:06.000000000 +0200
-+++ sfdisk/sfdisk.c	2006-10-09 16:24:20.000000000 +0200
-@@ -47,6 +47,9 @@
- #include <sys/stat.h>
- #include <sys/utsname.h>
- #ifdef __linux__
-+#define _LIBC
-+#include <sys/syscall.h>
-+#undef _LIBC
- #include <linux/unistd.h>	/* _syscall */
- #endif
- #include "nls.h"
diff --git a/package/sfdisk/sfdisk.005.no-llseek-fix.patch b/package/sfdisk/sfdisk.005.no-llseek-fix.patch
deleted file mode 100644
index 4ea571ce47..0000000000
--- a/package/sfdisk/sfdisk.005.no-llseek-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sfdisk_vanilla/sfdisk.c sfdisk_llseek-fix/sfdisk.c
---- sfdisk_vanilla/sfdisk.c	2004-01-13 13:03:11.000000000 +0000
-+++ sfdisk_llseek-fix/sfdisk.c	2008-04-17 08:42:35.000000000 +0000
-@@ -134,9 +137,17 @@
-  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
-  */
- #if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
-+#if defined(_llseek)
- static
- _syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
-        loff_t *, res, unsigned int, wh);
-+#else
-+static int _llseek (unsigned int fd, unsigned long oh,
-+		unsigned long ol, long long *result,
-+		unsigned int origin) {
-+	return syscall (__NR__llseek, fd, oh, ol, result, origin);
-+#endif
-+}
- #endif
- 
- static int
diff --git a/package/sfdisk/sfdisk.010.index-rindex-fix-2.patch b/package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
deleted file mode 100644
index b3ca81d908..0000000000
--- a/package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru sfdisk_vanilla/sfdisk.c sfdisk_index-rindex-fix/sfdisk.c
---- sfdisk_vanilla/sfdisk.c	2004-01-13 13:03:11.000000000 +0000
-+++ sfdisk_index-rindex-fix/sfdisk.c	2008-04-17 13:44:40.000000000 +0000
-@@ -40,7 +40,7 @@
- #include <unistd.h>		/* read, write */
- #include <fcntl.h>		/* O_RDWR */
- #include <errno.h>		/* ERANGE */
--#include <string.h>		/* index() */
-+#include <string.h>		/* strchr, strrchr */
- #include <ctype.h>
- #include <getopt.h>
- #include <sys/ioctl.h>
-@@ -1672,12 +1672,12 @@
- 	eof = 1;
- 	return RD_EOF;
-     }
--    if (!(lp = index(lp, '\n')))
-+    if (!(lp = strchr(lp, '\n')))
-       fatal(_("long or incomplete input line - quitting\n"));
-     *lp = 0;
- 
-     /* remove comments, if any */
--    if ((lp = index(line+2, '#')) != 0)
-+    if ((lp = strchr(line+2, '#')) != 0)
-       *lp = 0;
- 
-     /* recognize a few commands - to be expanded */
-@@ -1687,7 +1687,7 @@
-     }
- 
-     /* dump style? - then bad input is fatal */
--    if ((ip = index(line+2, ':')) != 0) {
-+    if ((ip = strchr(line+2, ':')) != 0) {
- 	struct dumpfld *d;
- 
-       nxtfld:
-@@ -2436,7 +2436,7 @@
- 
-     if (argc < 1)
-       fatal(_("no command?\n"));
--    if ((progn = rindex(argv[0], '/')) == NULL)
-+    if ((progn = strrchr(argv[0], '/')) == NULL)
-       progn = argv[0];
-     else
-       progn++;
diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk
deleted file mode 100644
index 22ebeaaae9..0000000000
--- a/package/sfdisk/sfdisk.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#############################################################
-#
-# sfdisk support
-#
-#############################################################
-SFDISK_VERSION:=
-SFDISK_SOURCE=sfdisk$(SFDISK_VERSION).tar.bz2
-SFDISK_CAT:=$(BZCAT)
-SFDISK_SITE:=http://www.uclibc.org/
-SFDISK_DIR=$(BUILD_DIR)/sfdisk$(SFDISK_VERSION)
-
-$(DL_DIR)/$(SFDISK_SOURCE):
-	$(call DOWNLOAD,$(SFDISK_SITE),$(SFDISK_SOURCE))
-
-$(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
-	$(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
-	touch $@
-
-
-$(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)/.patched
-	$(MAKE) \
-		CROSS=$(TARGET_CROSS) DEBUG=false OPTIMIZATION="$(TARGET_CFLAGS)" \
-		DOLFS=$(if $(BR2_LARGEFILE),true,false) -C $(SFDISK_DIR)
-	-$(STRIPCMD) $(SFDISK_DIR)/sfdisk
-	touch -c $(SFDISK_DIR)/sfdisk
-
-$(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk
-	cp $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk
-	touch -c $(TARGET_DIR)/sbin/sfdisk
-
-sfdisk: $(TARGET_DIR)/sbin/sfdisk
-
-sfdisk-source: $(DL_DIR)/$(SFDISK_SOURCE)
-
-sfdisk-clean:
-	rm -f $(TARGET_DIR)/sbin/sfdisk
-	-$(MAKE) -C $(SFDISK_DIR) clean
-
-sfdisk-dirclean:
-	rm -rf $(SFDISK_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SFDISK),y)
-TARGETS+=sfdisk
-endif

From 3ac00334d6373c47e5b45f7e2d3801411417c52f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:38:30 -0300
Subject: [PATCH 0910/6849] swfdec: remove deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in        |  1 -
 package/multimedia/swfdec/Config.in | 36 ----------------------------
 package/multimedia/swfdec/swfdec.mk | 37 -----------------------------
 3 files changed, 74 deletions(-)
 delete mode 100644 package/multimedia/swfdec/Config.in
 delete mode 100644 package/multimedia/swfdec/swfdec.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index ebf93146a1..d50e4fc326 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -42,7 +42,6 @@ source "package/multimedia/portaudio/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/python-mad/Config.in"
 source "package/multimedia/speex/Config.in"
-source "package/multimedia/swfdec/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
 source "package/multimedia/taglib/Config.in"
 source "package/multimedia/tremor/Config.in"
diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in
deleted file mode 100644
index 46119fc4a6..0000000000
--- a/package/multimedia/swfdec/Config.in
+++ /dev/null
@@ -1,36 +0,0 @@
-config BR2_PACKAGE_SWFDEC
-	bool "swfdec"
-	depends on BR2_DEPRECATED
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_INSTALL_LIBSTDCPP # pango
-	select BR2_PACKAGE_LIBOIL
-	select BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_PANGO
-	select BR2_PACKAGE_CAIRO
-	select BR2_PACKAGE_CAIRO_PNG
-	help
-	  Library to play Flash files
-
-	  http://swfdec.freedesktop.org/
-
-config BR2_PACKAGE_SWFDEC_GTK_SUPPORT
-	bool "gtk support"
-	depends on BR2_PACKAGE_SWFDEC
-	depends on BR2_PACKAGE_LIBGTK2
-	select BR2_PACKAGE_LIBSOUP
-	default y
-	help
-	  Swfdec-gtk library is used for easy integration
-	  of swfdec in GTK applications
-
-config BR2_PACKAGE_SWFDEC_GSTREAMER
-	bool "gstreamer support"
-	depends on BR2_PACKAGE_SWFDEC
-	depends on BR2_PACKAGE_GSTREAMER
-	select BR2_PACKAGE_GST_PLUGINS_BASE
-	default y
-	help
-	  Enables GStreamer support
-
-comment "swfdec requires a toolchain with WCHAR and C++ support"
-	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/swfdec/swfdec.mk b/package/multimedia/swfdec/swfdec.mk
deleted file mode 100644
index f88d7db1d6..0000000000
--- a/package/multimedia/swfdec/swfdec.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################################################
-#
-# Swfdec
-#
-#############################################################
-SWFDEC_VERSION_MAJOR = 0.8
-SWFDEC_VERSION_MINOR = 4
-SWFDEC_VERSION = $(SWFDEC_VERSION_MAJOR).$(SWFDEC_VERSION_MINOR)
-SWFDEC_SOURCE = swfdec-$(SWFDEC_VERSION).tar.gz
-SWFDEC_SITE = http://swfdec.freedesktop.org/download/swfdec/$(SWFDEC_VERSION_MAJOR)
-SWFDEC_MAKE_OPT = \
-	GLIB_MKENUMS=$(HOST_DIR)/usr/bin/glib-mkenums \
-	GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal
-
-SWFDEC_INSTALL_STAGING = YES
-SWFDEC_INSTALL_TARGET = YES
-
-SWFDEC_DEPENDENCIES = liboil alsa-lib pango cairo host-pkg-config
-
-ifeq ($(BR2_PACKAGE_SWFDEC_GSTREAMER),y)
-SWFDEC_DEPENDENCIES += gstreamer gst-plugins-base
-else
-SWFDEC_CONF_OPT += --disable-gstreamer
-endif
-
-ifeq ($(BR2_PACKAGE_SWFDEC_GTK_SUPPORT),y)
-SWFDEC_DEPENDENCIES += libgtk2 libsoup
-else
-SWFDEC_CONF_OPT += --disable-gtk
-endif
-
-$(eval $(call AUTOTARGETS))
-
-# swfdec uses glib-* at install time
-# Notice: must come after AUTOTARGETS as that's where these variables gets set
-SWFDEC_INSTALL_TARGET_OPT += $(SWFDEC_MAKE_OPT)
-SWFDEC_INSTALL_STAGING_OPT += $(SWFDEC_MAKE_OPT)

From 8bb17cd44168ee55573330d0288a8b349dfbc498 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Oct 2011 11:38:31 -0300
Subject: [PATCH 0911/6849] liboil: remove deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 -
 package/liboil/Config.in                      |  7 ----
 package/liboil/liboil-0.3.15-arm-vfp.patch    | 16 --------
 ...0.3.15-fixes-arm-softfloat-build.patch.arm | 39 ------------------
 .../liboil/liboil-0.3.15-no-examples.patch    | 34 ---------------
 package/liboil/liboil.mk                      | 41 -------------------
 6 files changed, 138 deletions(-)
 delete mode 100644 package/liboil/Config.in
 delete mode 100644 package/liboil/liboil-0.3.15-arm-vfp.patch
 delete mode 100644 package/liboil/liboil-0.3.15-fixes-arm-softfloat-build.patch.arm
 delete mode 100644 package/liboil/liboil-0.3.15-no-examples.patch
 delete mode 100644 package/liboil/liboil.mk

diff --git a/package/Config.in b/package/Config.in
index 52fe824357..4b5e5d81a6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -351,7 +351,6 @@ source "package/libev/Config.in"
 source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
 source "package/libnspr/Config.in"
-source "package/liboil/Config.in"
 source "package/libsigc/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
diff --git a/package/liboil/Config.in b/package/liboil/Config.in
deleted file mode 100644
index ad7a3d8fd0..0000000000
--- a/package/liboil/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_LIBOIL
-	bool "liboil"
-	depends on BR2_DEPRECATED
-	help
-	  Library of simple functions that are optimized for various CPUs.
-
-	  http://liboil.freedesktop.org/
diff --git a/package/liboil/liboil-0.3.15-arm-vfp.patch b/package/liboil/liboil-0.3.15-arm-vfp.patch
deleted file mode 100644
index 815c9bb9a6..0000000000
--- a/package/liboil/liboil-0.3.15-arm-vfp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 06a0ac9..b8d1640 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -158,7 +158,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
-     true)
- fi
- 
--if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
-+AC_ARG_ENABLE(vfp,
-+  AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
-+  enable_vfp=$enableval,enable_vfp=yes)
-+if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
-   AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
-     [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"],
-     true)
diff --git a/package/liboil/liboil-0.3.15-fixes-arm-softfloat-build.patch.arm b/package/liboil/liboil-0.3.15-fixes-arm-softfloat-build.patch.arm
deleted file mode 100644
index c9a2be30d3..0000000000
--- a/package/liboil/liboil-0.3.15-fixes-arm-softfloat-build.patch.arm
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch generated from:
-http://cgit.freedesktop.org/liboil/commit/?id=227782d45d14ca0d68ee73b54eab71c1582dcbfa
-
-From 227782d45d14ca0d68ee73b54eab71c1582dcbfa Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <adrian.bunk@movial.com>
-Date: Wed, 09 Sep 2009 13:31:40 +0000
-Subject: fix ARM -mfloat-abi=soft builds
-
-If __SOFTFP__ is defined, VFP support is not available
-even when __VFP_FP__ is defined.
----
-diff --git a/liboil/arm/math_vfp.c b/liboil/arm/math_vfp.c
-index ffd3981..0bed96e 100644
---- a/liboil/arm/math_vfp.c
-+++ b/liboil/arm/math_vfp.c
-@@ -30,7 +30,7 @@
- #include <liboil/liboilclasses.h>
- #include <liboil/liboilfunction.h>
- 
--#if __VFP_FP__
-+#if defined(__VFP_FP__) && !defined(__SOFTFP__)
- 
- extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n);
- extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n);
-diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S
-index ea68dba..ae5c803 100644
---- a/liboil/arm/math_vfp_asm.S
-+++ b/liboil/arm/math_vfp_asm.S
-@@ -24,7 +24,7 @@
-  * SUCH DAMAGE.
-  */
- 
--#if __VFP_FP__
-+#if defined(__VFP_FP__) && !defined(__SOFTFP__)
- /* 
- ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp
- **
---
-cgit v0.8.3-6-g21f6
diff --git a/package/liboil/liboil-0.3.15-no-examples.patch b/package/liboil/liboil-0.3.15-no-examples.patch
deleted file mode 100644
index a79b5e7503..0000000000
--- a/package/liboil/liboil-0.3.15-no-examples.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-[patch] liboil: don't build examples
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile.am |    2 +-
- Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: liboil-0.3.15/Makefile.am
-===================================================================
---- liboil-0.3.15.orig/Makefile.am
-+++ liboil-0.3.15/Makefile.am
-@@ -1,7 +1,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = liboil testsuite examples doc
-+SUBDIRS = liboil testsuite doc
- 
- EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
- 
-Index: liboil-0.3.15/Makefile.in
-===================================================================
---- liboil-0.3.15.orig/Makefile.in
-+++ liboil-0.3.15/Makefile.in
-@@ -259,7 +259,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = liboil testsuite examples doc
-+SUBDIRS = liboil testsuite doc
- EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc
diff --git a/package/liboil/liboil.mk b/package/liboil/liboil.mk
deleted file mode 100644
index 16f6d13588..0000000000
--- a/package/liboil/liboil.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#############################################################
-#
-# liboil
-#
-#############################################################
-LIBOIL_VERSION = 0.3.15
-LIBOIL_SOURCE = liboil-$(LIBOIL_VERSION).tar.gz
-LIBOIL_SITE = http://liboil.freedesktop.org/download
-LIBOIL_AUTORECONF = YES
-LIBOIL_INSTALL_STAGING = YES
-LIBOIL_INSTALL_TARGET = YES
-
-# Checking if unaligned memory access works correctly cannot be done when cross
-# compiling. For the following architectures there is no information available
-# in the configure script.
-ifeq ($(BR2_avr32),y)
-LIBOIL_CONF_ENV = as_cv_unaligned_access=no
-endif
-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
-
-ifeq ($(BR2_VFP_FLOAT),y)
-LIBOIL_CONF_OPT+=--enable-vfp
-endif
-
-LIBOIL_DEPENDENCIES = $(LIBOIL_GLIB_DEP)
-
-define LIBOIL_TARGET_CLEANUP
-	rm -f $(TARGET_DIR)/usr/bin/oil-bugreport
-endef
-
-LIBOIL_POST_INSTALL_TARGET_HOOKS += LIBOIL_TARGET_CLEANUP
-
-$(eval $(call AUTOTARGETS))

From 805de39555682475e3738cca1c3b6a70257ba0aa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 Nov 2011 00:33:13 +0100
Subject: [PATCH 0912/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0043126bf7..2c4c161d89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,12 @@
 	Move misc scripts and support stuff to support/. Rename
 	patch-kernel.sh to support/scripts/apply-patches.sh.
 
+	Documentation: Moved to asciidoc format, make targets to
+	generate text/html/pdf/epub output added.
+
+	Defconfigs: Qemu configs updated to 3.1 kernel and readmes
+	added.
+
 	Bootloaders: Add support for custom git tree / tarballs for
 	barebox, similar to how it's handled for u-boot. Clean up
 	menuconfig options.
@@ -14,7 +20,8 @@
 	toolchain, update toolchain versions and optimize toolchain
 	sysroot copying. Fix uClibc 0.9.32 builds for e500 PPC,
 	updated GDB versions / download URLs. Binutils
-	libbfd/libopcodes static/dynamic linking fix.
+	libbfd/libopcodes static/dynamic linking fix. GCC 4.6.2 added,
+	use ctng-1.13.0.
 
 	Package infrastructure: Support for local packages /
 	overrides, package dir / name arguments dropped from
@@ -32,20 +39,22 @@
 	libconfuse, libcuefile, libcurl, libdaemon, libevent,
 	libglib2, libiconv, libmpd, libreplaygain, libroxml,
 	libsamplerate, libsndfile, libsoup, libsvgtiny, libtool,
-	lighttpd, links, linux-fusion, lite, lrzsz, lsof, lzo, lzop,
-	makedevs, mcookie, mpg123, mpd, mpfr, mtd, musepack, mutt,
-	mysql_client, ncftp, ncurses, neon, netcat, netsnmp, ntfs-3g,
-	ntfsprogs, ntp, openntpd, openssh, openssl, orc, pciutils,
-	psmisc, python, qt, quagga, radvd, rpm, rsync, samba, sawman,
-	sdl_sound, smartmontools, sqlite, squid, stunnel, sudo,
-	sylpheed, sysstat, taglib, tar, tcpreplay, tslib, usbutils,
-	util-linux, valgrind, wget, whetstone, which, wpa-supplicant,
-	xdata_xcursor-themes, xmlstarlet, xterm
+	libxcb, lighttpd, links, linux-fusion, lite, lrzsz, lsof, lzo,
+	lzop, makedevs, mcookie, mpg123, mpd, mpfr, mtd, musepack,
+	mutt, mysql_client, ncftp, ncurses, neon, netcat, netsnmp,
+	ntfs-3g, ntfsprogs, ntp, openntpd, openssh, openssl, oprofile,
+	orc, pciutils, psmisc, python, qt, quagga, radvd, rpm, rsync,
+	samba, sawman, sdl_sound, smartmontools, sqlite, squid,
+	stunnel, sudo, sylpheed, sysstat, taglib, tar, tcpreplay,
+	tslib, usbutils, util-linux, valgrind, wget, whetstone, which,
+	wpa-supplicant, xdata_xcursor-themes, xmlstarlet, xterm
 
 	New packages: bluez-utils, cifs-utils, fftw, fluxbox, json-c,
-	libev, libftdi, libgeotiff, libplayer, ngrep, noip, opencv,
-	openocd, picocom, poco, portaudio, pulseaudio, pv, rtai, vala,
-	xenomai.
+	libev, libftdi, libgeotiff, libmodbus, libplayer, live555,
+	ngrep, noip, opencv, openocd, picocom, poco, portaudio,
+	pulseaudio, pv, rtai, vala, xenomai.
+
+	Removed packages: liboil, sfdisk, swfdec, webif
 
 	Issues resolved (http://bugs.uclibc.org):
 

From b66156835ea8ef253dac8e96fed9dbb4cb30f204 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 Nov 2011 09:38:41 +0100
Subject: [PATCH 0913/6849] gpsd: garmintxt driver gets enabled by default, so
 disable if not selected

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/gpsd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 10e66ba69f..be6daeb8ad 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -58,8 +58,8 @@ endif
 ifneq ($(BR2_PACKAGE_GPSD_GARMIN),y)
 	GPSD_CONF_OPT += --disable-garmin
 endif
-ifeq ($(BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT),y)
-	GPSD_CONF_OPT += --enable-garmintxt
+ifneq ($(BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT),y)
+	GPSD_CONF_OPT += --disable-garmintxt
 endif
 ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
 	GPSD_CONF_OPT += --disable-gpsclock

From 891ba7a4efcf90aeabd13f215fbddd8c754f1da4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 Nov 2011 09:42:22 +0100
Subject: [PATCH 0914/6849] gpsd: fix navcom driver build when no other drivers
 using binary are enabled

Patch sent upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/gpsd-2.95-navcom.patch | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/gpsd/gpsd-2.95-navcom.patch

diff --git a/package/gpsd/gpsd-2.95-navcom.patch b/package/gpsd/gpsd-2.95-navcom.patch
new file mode 100644
index 0000000000..659cea1d81
--- /dev/null
+++ b/package/gpsd/gpsd-2.95-navcom.patch
@@ -0,0 +1,47 @@
+[PATCH] Navcom needs binary support
+
+Enable binary support when navcom driver is enabled, otherwise the build
+errors out with:
+
+./libgpsd.so: undefined reference to `navcom_binary'
+
+If no other drivers needing binary support are enabled.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ driver_navcom.c |    4 ++--
+ gpsd.h-tail     |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: gpsd-2.95/driver_navcom.c
+===================================================================
+--- gpsd-2.95.orig/driver_navcom.c
++++ gpsd-2.95/driver_navcom.c
+@@ -44,7 +44,7 @@
+ #include <stdio.h>
+ #include "gpsd.h"
+ 
+-#if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE)
++#if defined(NAVCOM_ENABLE)
+ #include "bits.h"
+ 
+ /* Have data which is 24 bits long */
+@@ -1339,4 +1339,4 @@
+ };
+ /* *INDENT-ON* */
+ 
+-#endif /* defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) */
++#endif /* defined(NAVCOM_ENABLE) */
+Index: gpsd-2.95/gpsd.h-tail
+===================================================================
+--- gpsd-2.95.orig/gpsd.h-tail
++++ gpsd-2.95/gpsd.h-tail
+@@ -30,7 +30,7 @@
+ #ifdef EARTHMATE_ENABLE
+ #define ZODIAC_ENABLE	
+ #endif
+-#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE)
++#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(NAVCOM_ENABLE)
+ #define BINARY_ENABLE	
+ #endif
+ #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE)

From 4e8fd936f580d5a5e6938e175811a57f7d3e080f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 8 Nov 2011 23:03:12 -0300
Subject: [PATCH 0915/6849] devmem2: undeprecate and conver to gentargets

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/devmem2/Config.in  |  1 -
 package/devmem2/devmem2.mk | 49 +++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/package/devmem2/Config.in b/package/devmem2/Config.in
index 233b4b0e32..cb00a51632 100644
--- a/package/devmem2/Config.in
+++ b/package/devmem2/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_DEVMEM2
 	bool "devmem2"
-	depends on BR2_DEPRECATED
 	help
 	  Simple program to read/write from/to any location in memory.
 
diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk
index 457a181020..f477589429 100644
--- a/package/devmem2/devmem2.mk
+++ b/package/devmem2/devmem2.mk
@@ -4,39 +4,28 @@
 #
 #############################################################
 
-DEVMEM2_SOURCE:=devmem2.c
-DEVMEM2_SITE:=http://free-electrons.com/pub/mirror
-DEVMEM2_BINARY:=devmem2
-DEVMEM2_DIR:=$(BUILD_DIR)/devmem2
+DEVMEM2_SITE = http://free-electrons.com/pub/mirror
+DEVMEM2_SOURCE = devmem2.c
+DEVMEM2_VERSION = 1
 
-$(DL_DIR)/$(DEVMEM2_SOURCE):
-	$(call DOWNLOAD,$(DEVMEM2_SITE),$(DEVMEM2_SOURCE))
+define DEVMEM2_EXTRACT_CMDS
+	cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
+endef
 
-$(DEVMEM2_DIR)/$(DEVMEM2_SOURCE): $(DL_DIR)/$(DEVMEM2_SOURCE)
-	mkdir -p $(@D)
-	cp $^ $@
+define DEVMEM2_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) devmem2
+endef
 
-$(DEVMEM2_DIR)/$(DEVMEM2_BINARY): $(DEVMEM2_DIR)/$(DEVMEM2_SOURCE)
-	$(TARGET_CC) $(TARGET_CFLAGS) -o $@ $^
+define DEVMEM2_CLEAN_CMDS
+	rm -f $(@D)/devmem2
+endef
 
-$(TARGET_DIR)/sbin/$(DEVMEM2_BINARY): $(DEVMEM2_DIR)/$(DEVMEM2_BINARY)
-	cp $^ $@
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
+define DEVMEM2_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/devmem2 $(TARGET_DIR)/sbin/devmem2
+endef
 
-devmem2: $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY)
+define DEVMEM2_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/sbin/devmem2
+endef
 
-devmem2-source: $(DL_DIR)/$(DEVMEM2_SOURCE)
-
-devmem2-clean:
-	rm -f $(TARGET_DIR/sbin/$(DEVMEM2_BINARY)
-
-devmem2-dirclean:
-	rm -rf $(DEVMEM2_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DEVMEM2),y)
-TARGETS+=devmem2
-endif
+$(eval $(call GENTARGETS))

From eb3785fca4f07ef170feac3c60ce7926466d5457 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Nov 2011 08:30:59 -0300
Subject: [PATCH 0916/6849] dhcp: security bump to version 4.1-ESV-R3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index f520d77568..7548f41da7 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -3,9 +3,9 @@
 # dhcp
 #
 #############################################################
-DHCP_VERSION  = 4.1.1-P1
-DHCP_SOURCE   = dhcp-$(DHCP_VERSION).tar.gz
-DHCP_SITE     = http://ftp.isc.org/isc/dhcp/
+
+DHCP_VERSION  = 4.1-ESV-R3
+DHCP_SITE     = http://ftp.isc.org/isc/dhcp
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes
 DHCP_CONF_OPT = \
 	--localstatedir=/var/lib/dhcp \

From 88b5a31f31c12abb0ed15290efc1d09e3ac84fc2 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Tue, 8 Nov 2011 19:16:17 +0800
Subject: [PATCH 0917/6849] mplayer: Enable live and tv options

1.Enable TV interface.
2.Enable LIVE555 Streaming Media if live555 is available.

[Peter: cleanup CFLAGS/LDFLAGS handling]
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 4c03440190..776cc68eea 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -8,6 +8,9 @@ MPLAYER_VERSION = 32726
 # MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
 MPLAYER_SITE = svn://svn.mplayerhq.hu/mplayer/trunk
 
+MPLAYER_CFLAGS = $(TARGET_CFLAGS)
+MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
+
 # mplayer needs pcm+mixer support, but configure fails to check for it
 ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
 MPLAYER_DEPENDENCIES += alsa-lib
@@ -75,6 +78,17 @@ else
 MPLAYER_CONF_OPTS += --disable-mad
 endif
 
+ifeq ($(BR2_PACKAGE_LIVE555),y)
+MPLAYER_DEPENDENCIES += live555
+MPLAYER_CONF_OPTS += --enable-live
+MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment
+MPLAYER_CFLAGS += \
+	$(addprefix -I$(STAGING_DIR)/usr/include/live/,$(MPLAYER_LIVE555))
+MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++
+else
+MPLAYER_CONF_OPTS += --disable-live
+endif
+
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
@@ -106,15 +120,13 @@ define MPLAYER_CONFIGURE_CMDS
 		--cc="$(TARGET_CC)" \
 		--as="$(TARGET_AS)" \
 		--charset=UTF-8 \
-		--extra-cflags="$(TARGET_CFLAGS)" \
-		--extra-ldflags="$(TARGET_LDFLAGS)" \
+		--extra-cflags="$(MPLAYER_CFLAGS)" \
+		--extra-ldflags="$(MPLAYER_LDFLAGS)" \
 		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_CONF_OPTS) \
 		--enable-cross-compile \
 		--disable-ivtv \
-		--disable-tv \
-		--disable-live \
 		--enable-dynamic-plugins \
 	)
 endef

From e9c52d715bb599539102e77e954dcc7239ee1237 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 11 Nov 2011 11:38:45 +0100
Subject: [PATCH 0918/6849] CHANGES: #507 is resolved

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 2c4c161d89..0800c1f7f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,7 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#505:  live555: new package
+	#507:  Enable live and tv options in MPlayer-1.0rc2
 	#531:  let e2fsprogs package to export headers to staging dir if needed
 	#1171: Linuxthreads new cannot find sysdep.h
 	#2107: New package: input-event-daemon

From dd3177cc1a3b8b3925f71ee36e62e24b2dd0cb02 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 13:06:49 -0300
Subject: [PATCH 0919/6849] oprofile: fix mipsel build

Closes #3709

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                      | 1 +
 package/oprofile/oprofile.mk | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 0800c1f7f5..3fed3d03e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -73,6 +73,7 @@
 	#3343: Add file:// download SITE_METHOD
 	#3391: Add support for specifying an external kernel tree
 	#3631: Error while compiling with Xorg
+	#3709: oprofile doesn't build for mipsel
 	#3925: midori not getting compile
 	#4045: Add support for downloading i386 toolchains from codesourcery
 	#4165: lrzsz-fix-symlink-at-rebuild.patch
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 734839f240..5da794badc 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -12,6 +12,9 @@ OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled
 ifeq ($(BR2_i386),y)
 OPROFILE_ARCH = i386
 endif
+ifeq ($(BR2_mipsel),y)
+OPROFILE_ARCH = mips
+endif
 ifeq ($(BR2_powerpc),y)
 OPROFILE_ARCH = ppc
 endif

From 7062aff3d1cc22a4c341c8629842c6d8251c2a6f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 11 Nov 2011 20:01:05 +0100
Subject: [PATCH 0920/6849] CHANGES: #1357 is resolved

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 3fed3d03e9..0eab0e3c4d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -62,6 +62,7 @@
 	#507:  Enable live and tv options in MPlayer-1.0rc2
 	#531:  let e2fsprogs package to export headers to staging dir if needed
 	#1171: Linuxthreads new cannot find sysdep.h
+	#1357: Add bluez to buildroot system
 	#2107: New package: input-event-daemon
 	#2599: New package: orc (Oil Runtime Compiler)
 	#2605: gstreamer: Update to 0.10.30

From 0900c12556ced3155ef890ef0f23c2a6b66945e2 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 14 Oct 2011 16:56:56 +0200
Subject: [PATCH 0921/6849] linux: add linux-update-config and
 linux-update-defconfig targets

In analogy to build targets uclibc-update and busybox-update, add
extra targets to copy the current configuration to the custom
configuration file set in buildroot. These targets facilitate the
work of developers adding support for a specific board.

linux-update-config copies .config directly.
linux-update-defconfig first creates a defconfig and copies that.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index 9beb706453..5c5a1d2967 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -196,6 +196,17 @@ linux-savedefconfig linux26-savedefconfig: dirs $(LINUX_DIR)/.stamp_configured
 	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
 
+ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
+linux-update-config linux26-update-config: $(LINUX_DIR)/.config
+	cp -f $(LINUX_DIR)/.config $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+
+linux-update-defconfig linux26-update-defconfig: linux-savedefconfig
+	cp -f $(LINUX_DIR)/defconfig $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+else
+linux-update-config linux26-update-config: ;
+linux-update-defconfig linux26-update-defconfig: ;
+endif
+
 # Support for rebuilding the kernel after the cpio archive has
 # been generated in $(BINARIES_DIR)/rootfs.cpio.
 $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio

From 96474df156953cc936ef7f8b25cb182089acf885 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 14 Oct 2011 16:56:57 +0200
Subject: [PATCH 0922/6849] busybox: rename busybox-update to
 busybox-update-config

The original name busybox-update is confusing as it only updates a
configuration file.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 9ca4c93df7..9e91136054 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -187,5 +187,5 @@ busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
 	rm -f $(BUSYBOX_DIR)/.stamp_built
 	rm -f $(BUSYBOX_DIR)/.stamp_target_installed
 
-busybox-update:
+busybox-update-config:
 	cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE)

From 2af8cace6f82db28f4c4cdd28289d70515da9aa8 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 14 Oct 2011 16:56:58 +0200
Subject: [PATCH 0923/6849] uclibc: rename uclibc-update to
 uclibc-update-config

The original name uclibc-update is confusing as it only updates a
configuration file.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 0fc5a817eb..6335e6a5b7 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -500,7 +500,7 @@ uclibc-config: $(UCLIBC_DIR)/.config
 
 uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
 
-uclibc-update: uclibc-config
+uclibc-update-config: uclibc-config
 	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
 uclibc-configured: gcc_initial kernel-headers $(UCLIBC_DIR)/.configured

From 1507c39b7634fec3b6d561da5ff5f18867f6b28c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 11 Nov 2011 20:26:00 +0100
Subject: [PATCH 0924/6849] Update for 2011.11-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  4 ++--
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0eab0e3c4d..7f74346a3b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,8 @@
-2011.11, Not released yet:
+2011.11-rc1, Released November 11th, 2011:
 
 	Fixes all over the tree and new features.
 
-	Move misc scripts and support stuff to support/. Rename
+	Moved misc scripts and support stuff to support/. Renamed
 	patch-kernel.sh to support/scripts/apply-patches.sh.
 
 	Documentation: Moved to asciidoc format, make targets to
diff --git a/Makefile b/Makefile
index 80ca587ab2..df2f8599c4 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.11-git
+export BR2_VERSION:=2011.11-rc1
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index a397fe0c87..81ad2a7690 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,15 +13,15 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.08.tar.bz2">buildroot-2011.08.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2011.08-rc2</b>, which can be
+
+The latest release candidate is <b>2011.11-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.08-rc2.tar.gz">buildroot-2011.08-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2011.11-rc1.tar.gz">buildroot-2011.11-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.08-rc2.tar.bz2">buildroot-2011.08-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.11-rc1.tar.bz2">buildroot-2011.11-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 658d82a7a3..ba5f7d01c0 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>11 November 2011 -- 2011.11-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.11_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.11-rc1.tar.bz2">2011.11-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>31 August 2011 -- 2011.08 released</b>
 
     <p>The stable 2011.08 release is out - Thanks to everyone

From 1f52b2ae1d2bbc5784c10dda397493236fb1ed5a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 16:04:54 -0300
Subject: [PATCH 0925/6849] libgpg-error: bump to version 1.10

Bump to version 1.10, closes bug #3403
Switch to gnupg.org mirror, closes bug #3409

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgpg-error/libgpg-error.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 45a348e726..1b78b17cee 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -3,10 +3,9 @@
 # libgpg-error
 #
 #############################################################
-LIBGPG_ERROR_VERSION:=1.8
-LIBGPG_ERROR_SOURCE:=libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
-LIBGPG_ERROR_SITE:=ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error
 
+LIBGPG_ERROR_VERSION = 1.10
+LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 LIBGPG_ERROR_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From 309e91930e33ec137be55d6e67241d30b95bd48c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 16:55:11 -0300
Subject: [PATCH 0926/6849] qemu_x86: update to kernel 3.1 and add readme

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-3.0.config => linux-3.1.config} | 0
 board/qemu/x86/readme.txt                             | 5 +++++
 configs/qemu_x86_defconfig                            | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename board/qemu/x86/{linux-3.0.config => linux-3.1.config} (100%)
 create mode 100644 board/qemu/x86/readme.txt

diff --git a/board/qemu/x86/linux-3.0.config b/board/qemu/x86/linux-3.1.config
similarity index 100%
rename from board/qemu/x86/linux-3.0.config
rename to board/qemu/x86/linux-3.1.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
new file mode 100644
index 0000000000..c06d24faae
--- /dev/null
+++ b/board/qemu/x86/readme.txt
@@ -0,0 +1,5 @@
+Run the emulation with:
+
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+
+The login prompt will appear in the graphical window.
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index d60b38d5b1..8efe9ae434 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -4,6 +4,7 @@ BR2_x86_pentiumpro=y
 
 # system
 BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
@@ -12,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.0.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.0.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.1.config"

From 3e974ba2d218df614877270431ee1043503bc2d5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 16:55:12 -0300
Subject: [PATCH 0927/6849] qemu_x86_64: add new qemu defconfig

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86_64/linux-3.1.config | 67 ++++++++++++++++++++++++++++++
 board/qemu/x86_64/readme.txt       |  5 +++
 configs/qemu_x86_64_defconfig      | 17 ++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 board/qemu/x86_64/linux-3.1.config
 create mode 100644 board/qemu/x86_64/readme.txt
 create mode 100644 configs/qemu_x86_64_defconfig

diff --git a/board/qemu/x86_64/linux-3.1.config b/board/qemu/x86_64/linux-3.1.config
new file mode 100644
index 0000000000..5bf6944e3d
--- /dev/null
+++ b/board/qemu/x86_64/linux-3.1.config
@@ -0,0 +1,67 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_SCHED_OMIT_FRAME_POINTER is not set
+# CONFIG_MTRR_SANITIZER is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_RELOCATABLE is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_BLK_DEV is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_X86_PLATFORM_DEVICES is not set
+# CONFIG_DMIID is not set
+CONFIG_EXT2_FS=y
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
+# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_FRAME_POINTER is not set
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
new file mode 100644
index 0000000000..c06d24faae
--- /dev/null
+++ b/board/qemu/x86_64/readme.txt
@@ -0,0 +1,5 @@
+Run the emulation with:
+
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+
+The login prompt will appear in the graphical window.
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
new file mode 100644
index 0000000000..e6a59ac242
--- /dev/null
+++ b/configs/qemu_x86_64_defconfig
@@ -0,0 +1,17 @@
+# Architecture
+BR2_x86_64=y
+
+# system
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="tty1"
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.1.config"

From 2c1035097755db14cb219752e188d5c4e862fbab Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 9 Nov 2011 15:57:52 +0100
Subject: [PATCH 0928/6849] iw: bump to 3.2

version 3.2 provides support for libnl 3.x, so remove the relevant patch

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw-libnl-30-support.patch | 47 ----------------------------
 package/iw/iw.mk                     |  2 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 package/iw/iw-libnl-30-support.patch

diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
deleted file mode 100644
index 48a179fb28..0000000000
--- a/package/iw/iw-libnl-30-support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
----
- Makefile |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -24,6 +24,7 @@
-
- NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
- NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
-+NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
-
- ifeq ($(NL1FOUND),Y)
- NLLIBNAME = libnl-1
-@@ -35,6 +36,12 @@
- NLLIBNAME = libnl-2.0
- endif
-
-+ifeq ($(NL3FOUND),Y)
-+CFLAGS += -DCONFIG_LIBNL20
-+LIBS += -lnl-genl
-+NLLIBNAME = libnl-3.0
-+endif
-+
- ifeq ($(NLLIBNAME),)
- $(error Cannot find development files for any supported version of libnl)
- endif
-@@ -53,6 +60,8 @@
- all: version_check $(ALL)
-
- version_check:
-+ifeq ($(NL3FOUND),Y)
-+else
- ifeq ($(NL2FOUND),Y)
- else
- ifeq ($(NL1FOUND),Y)
-@@ -60,6 +69,7 @@
- 	$(error No libnl found)
- endif
- endif
-+endif
-
-
- VERSION_OBJS := $(filter-out version.o, $(OBJS))
-
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 9f1d65f4d7..ab6c676811 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.1
+IW_VERSION = 3.2
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From ba2a0cf5a135873ab0029a43de7d0bf82d6578df Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 9 Nov 2011 15:57:53 +0100
Subject: [PATCH 0929/6849] usbmount: bump to 0.0.22

FSTYPE detection bug was fixed upstream, so delete relevant patch

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../usbmount-fstype-detection-fix.patch       | 25 -------------------
 package/usbmount/usbmount.mk                  |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 package/usbmount/usbmount-fstype-detection-fix.patch

diff --git a/package/usbmount/usbmount-fstype-detection-fix.patch b/package/usbmount/usbmount-fstype-detection-fix.patch
deleted file mode 100644
index a3686f1c47..0000000000
--- a/package/usbmount/usbmount-fstype-detection-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-newer blkid version shows two parameter with TYPE within:
-
-/dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos"
-PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1"
-
-change regular expression to take " TYPE" only
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
----
- usbmount |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/usbmount
-===================================================================
---- a/usbmount
-+++ b/usbmount
-@@ -88,7 +88,7 @@
-     #   FIXME: improvement: implement mounting by label (notice that labels
-     #   can contain spaces, which makes things a little bit less comfortable).
-     DEVINFO=$(/sbin/blkid -p $DEVNAME)
--    FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-+    FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-     UUID=$(echo "$DEVINFO"   | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-     USAGE=$(echo "$DEVINFO"  | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 8434570055..a6b2d43db0 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -3,7 +3,7 @@
 # usbmount
 #
 #############################################################
-USBMOUNT_VERSION = 0.0.21
+USBMOUNT_VERSION = 0.0.22
 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
 USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount
 USBMOUNT_DEPENDENCIES = udev lockfile-progs util-linux

From 7c60be98b2d898e5d49b0fa305b7f56dec59a366 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Nov 2011 08:25:25 -0300
Subject: [PATCH 0930/6849] module-init-tools: bump to version 3.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...nit-tools-3.15-add-manpages-config-option.patch} |  0
 package/module-init-tools/module-init-tools.mk      | 13 +++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename package/module-init-tools/{module-init-tools-3.11-add-manpages-config-option.patch => module-init-tools-3.15-add-manpages-config-option.patch} (100%)

diff --git a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
similarity index 100%
rename from package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch
rename to package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index d7e7c24019..ad92a1ac91 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -3,19 +3,20 @@
 # module-init-tools
 #
 #############################################################
-MODULE_INIT_TOOLS_VERSION=3.12
-MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
-MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
+
+MODULE_INIT_TOOLS_VERSION = 3.15
+MODULE_INIT_TOOLS_SOURCE = module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
+MODULE_INIT_TOOLS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
 MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
 MODULE_INIT_TOOLS_CONF_OPT = \
 	--disable-static-utils \
 	--disable-builddir \
 	--program-transform-name=''
 
-# module-init-tools-3.11-add-manpages-config-option.patch is modifying
+# module-init-tools-3.15-add-manpages-config-option.patch is modifying
 # configure.ac and Makefile.am
-MODULE_INIT_TOOLS_AUTORECONF=YES
-HOST_MODULE_INIT_TOOLS_AUTORECONF=YES
+MODULE_INIT_TOOLS_AUTORECONF = YES
+HOST_MODULE_INIT_TOOLS_AUTORECONF = YES
 HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
 
 $(eval $(call AUTOTARGETS))

From a1dd178f3a11a0f19aaf4fe76c61869ea8836a55 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Nov 2011 08:25:26 -0300
Subject: [PATCH 0931/6849] flex: bump to version 2.5.35-10 and cleanup style

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rog-ar.patch => flex-2.5.35-prog-ar.patch} |  0
 package/flex/flex.mk                          | 23 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)
 rename package/flex/{flex-2.5.33-prog-ar.patch => flex-2.5.35-prog-ar.patch} (100%)

diff --git a/package/flex/flex-2.5.33-prog-ar.patch b/package/flex/flex-2.5.35-prog-ar.patch
similarity index 100%
rename from package/flex/flex-2.5.33-prog-ar.patch
rename to package/flex/flex-2.5.35-prog-ar.patch
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 706b89d232..df1b4201bf 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -3,24 +3,25 @@
 # flex
 #
 #############################################################
-FLEX_VERSION:=2.5.35
-FLEX_PATCH_VERSION:=9.1
-FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
-FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
-FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
-FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
-FLEX_INSTALL_STAGING=YES
+
+FLEX_VERSION = 2.5.35
+FLEX_PATCH_VERSION = 10
+FLEX_SOURCE = flex_$(FLEX_VERSION).orig.tar.gz
+FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
+FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
+FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
+FLEX_INSTALL_STAGING = YES
 FLEX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBINTL),libintl)
 
 # lex -> flex
 define FLEX_INSTALL_LEX
-cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
+	cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
 endef
 
 define FLEX_UNINSTALL_LEX
--rm $(TARGET_DIR)/usr/bin/lex
+	-rm $(TARGET_DIR)/usr/bin/lex
 endef
 
 FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
@@ -29,11 +30,11 @@ FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
 # libfl installation
 ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
 define FLEX_INSTALL_LIBFL
-install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
+	install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
 endef
 
 define FLEX_UNINSTALL_LIBFL
--rm $(STAGING_DIR)/lib/libfl.a
+	-rm $(STAGING_DIR)/lib/libfl.a
 endef
 
 FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL

From 8b56bfe8385826c6417dbc8dc731ad535b0de3b5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Nov 2011 08:25:27 -0300
Subject: [PATCH 0932/6849] dropbear: bump to version 2011.54

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dropbear-0.53.1-static_build_fix.patch    | 26 -------------------
 .../dropbear/dropbear-2011.54-no-ipv6.patch   | 18 +++++++++++++
 package/dropbear/dropbear.mk                  |  3 +--
 3 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 package/dropbear/dropbear-0.53.1-static_build_fix.patch
 create mode 100644 package/dropbear/dropbear-2011.54-no-ipv6.patch

diff --git a/package/dropbear/dropbear-0.53.1-static_build_fix.patch b/package/dropbear/dropbear-0.53.1-static_build_fix.patch
deleted file mode 100644
index 0e0a91a27e..0000000000
--- a/package/dropbear/dropbear-0.53.1-static_build_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-dropbear: fix static build
-
-the -lcrypt is missing during the link
-
-svr-authpasswd.o: In function `svr_auth_password':
-svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
-collect2: ld returned 1 exit status
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -77,7 +77,7 @@ STRIP=@STRIP@
- INSTALL=@INSTALL@
- CPPFLAGS=@CPPFLAGS@
- CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
--LIBS+=@LIBS@
-+LIBS+=@CRYPTLIB@ @LIBS@
- LDFLAGS=@LDFLAGS@
- 
- EXEEXT=@EXEEXT@
diff --git a/package/dropbear/dropbear-2011.54-no-ipv6.patch b/package/dropbear/dropbear-2011.54-no-ipv6.patch
new file mode 100644
index 0000000000..4ee9aaa660
--- /dev/null
+++ b/package/dropbear/dropbear-2011.54-no-ipv6.patch
@@ -0,0 +1,18 @@
+Check for IPV6_TCLASS instead of IPPROTO_IPV6 since
+it's present on non-IPv6 enabled toolchains too.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura dropbear-2011.54.orig/dbutil.c dropbear-2011.54/dbutil.c
+--- dropbear-2011.54.orig/dbutil.c	2011-11-08 09:48:15.000000000 -0300
++++ dropbear-2011.54/dbutil.c	2011-11-09 12:14:59.430074138 -0300
+@@ -164,7 +164,7 @@
+ 	/* set the TOS bit for either ipv4 or ipv6 */
+ #ifdef IPTOS_LOWDELAY
+ 	val = IPTOS_LOWDELAY;
+-#ifdef IPPROTO_IPV6
++#ifdef IPV6_TCLASS
+ 	setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
+ #endif
+ 	setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index bced0ef4e8..5fa50bafa2 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,8 +4,7 @@
 #
 #############################################################
 
-DROPBEAR_VERSION = 0.53.1
-DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
+DROPBEAR_VERSION = 2011.54
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \

From 1b972b2189fd32f9d0faf300c0a59790f1972ebf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 11 Nov 2011 21:59:57 +0100
Subject: [PATCH 0933/6849] news.html: add 2011.11-rc1 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index ba5f7d01c0..1e4e5eaf13 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.11_rc1">CHANGES</a>
-    file for details.
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2011-November/047395.html">announcement</a>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2011.11-rc1.tar.bz2">2011.11-rc1

From b847ed050d85e7b0befc5521f4acff7cc1f31693 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 18:12:46 -0300
Subject: [PATCH 0934/6849] uClibc: fix sparc build breakage

Fix build breakage for sparc as reported in bug #4021
Patches from Konrad Eisele <konrad@gaisler.com>
Submitted in the uclibc mailing list.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch      | 11 +++++++++++
 toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch  | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
new file mode 100644
index 0000000000..44d06cb62f
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
@@ -0,0 +1,11 @@
+--- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S	2011-11-11 15:57:25.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	 restore %g0,%g0,%o0
+ 
+ .Lerror:
+-	call	HIDDEN_JUMPTARGET(__errno_location)
++	call	__errno_location
+ 	 or	%g0,EINVAL,%i0
+ 	st	%i0,[%o0]
+ 	ret
diff --git a/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch
new file mode 100644
index 0000000000..44d06cb62f
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch
@@ -0,0 +1,11 @@
+--- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S	2011-11-11 15:57:25.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	 restore %g0,%g0,%o0
+ 
+ .Lerror:
+-	call	HIDDEN_JUMPTARGET(__errno_location)
++	call	__errno_location
+ 	 or	%g0,EINVAL,%i0
+ 	st	%i0,[%o0]
+ 	ret

From 5ae731063619966f58ed8b58eeeda6cda5b0ed25 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 18:12:47 -0300
Subject: [PATCH 0935/6849] qemu_sparc: add new qemu defconfig

Add a new qemu sample config for the SPARC architecture.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sparc-ss10/readme.txt  |  7 +++++++
 configs/qemu_sparc_ss10_defconfig | 14 ++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 board/qemu/sparc-ss10/readme.txt
 create mode 100644 configs/qemu_sparc_ss10_defconfig

diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
new file mode 100644
index 0000000000..5f01efa074
--- /dev/null
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -0,0 +1,7 @@
+Run the emulation with:
+
+  qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append "root=/dev/sda console=ttyS0,115200" -serial stdio
+
+The login prompt will appear in the terminal that started Qemu.
+The graphical window is the framebuffer.
+
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
new file mode 100644
index 0000000000..20cd9fbf57
--- /dev/null
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -0,0 +1,14 @@
+# Architecture
+BR2_sparc=y
+BR2_sparc_supersparc=y
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Linux kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
+BR2_LINUX_KERNEL_ZIMAGE=y

From f7c26a26780d6160dca1473c120507058dc2550f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 11 Nov 2011 22:45:28 +0100
Subject: [PATCH 0936/6849] kickoff 2012.02 development cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index df2f8599c4..84cea1c951 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.11-rc1
+export BR2_VERSION:=2012.02-git
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:

From 939d0ab264bea00f18cb6085547580df43c50653 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:54:43 +0100
Subject: [PATCH 0937/6849] doc: suggest how to add suboptions

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 058ebad1cc..a262a8c627 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -24,10 +24,11 @@ config BR2_PACKAGE_LIBFOO
 	  http://foosoftware.org/libfoo/
 ---------------------------
 
-Of course, you can add other options to configure particular things in
-your software. You can look at examples in other packages. The syntax
-of the +Config.in+ file is the same as the one for the kernel Kconfig
-file. The documentation for this syntax is available at
+Of course, you can add other sub-options into a +if
+BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things
+in your software. You can look at examples in other packages. The
+syntax of the +Config.in+ file is the same as the one for the kernel
+Kconfig file. The documentation for this syntax is available at
 http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt[]
 
 Finally you have to add your new +libfoo/Config.in+ to

From d031a031bdfbccec41a5d7c4c566765b4bb4b6a5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:54:44 +0100
Subject: [PATCH 0938/6849] doc: mention how to format the Config.in file

[Peter: s/but/should as suggested by Michael S. Zick]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index a262a8c627..2e8786a20c 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -24,6 +24,11 @@ config BR2_PACKAGE_LIBFOO
 	  http://foosoftware.org/libfoo/
 ---------------------------
 
+The +bool+ line, +help+ line and other meta-informations about the
+configuration option must be indented with one tab. The help text
+itself should be indented with one tab and two spaces, and it must
+mention the upstream URL of the project.
+
 Of course, you can add other sub-options into a +if
 BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things
 in your software. You can look at examples in other packages. The

From d0afbdad6b5a5b0fe7b0665cc0d9a337f0ace412 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:54:45 +0100
Subject: [PATCH 0939/6849] doc: more details about expressing dependencies in
 Config.in

[Peter: Minor tweak]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 2e8786a20c..58f0262612 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -46,6 +46,51 @@ supposed to contain anything but the 'bare' name of the package.
 source "package/libfoo/Config.in"
 --------------------------
 
+The +Config.in+ file of your package must also ensure that
+dependencies are enabled. Typically, Buildroot uses the following
+rules:
+
+* Use a +select+ type of dependency for dependencies on
+  libraries. These dependencies are generally not obvious and it
+  therefore make sense to have the kconfig system ensure that the
+  dependencies are selected. For example, the _libgtk2_ package uses
+  +select BR2_PACKAGE_LIBGLIB2+ to make sure this library is also
+  enabled.
+
+* Use a +depends on+ type of dependency when the user really needs to
+  be aware of the dependency. Typically, Buildroot uses this type of
+  dependency for dependencies on toolchain options (large file
+  support, RPC support, IPV6 support), or for dependencies on "big"
+  things, such as the X.org system. In some cases, especially
+  dependency on toolchain options, it is recommended to add a
+  +comment+ displayed when the option is not enabled, so that the user
+  knows why the package is not available.
+
+An example illustrates both the usage of +select+ and +depends on+.
+
+--------------------------
+config BR2_PACKAGE_ACL
+        bool "acl"
+        select BR2_PACKAGE_ATTR
+        depends on BR2_LARGEFILE
+        help
+          POSIX Access Control Lists, which are used to define more
+          fine-grained discretionary access rights for files and
+          directories.
+          This package also provides libacl.
+
+          http://savannah.nongnu.org/projects/acl
+
+comment "acl requires a toolchain with LARGEFILE support"
+        depends on !BR2_LARGEFILE
+--------------------------
+
+
+Note that such dependencies will make sure that the dependency option
+is also enabled, but not necessarily built before your package. To do
+so, the dependency also needs to be expressed in the +.mk+ file of the
+package.
+
 The +.mk+ file
 ~~~~~~~~~~~~~~
 

From bcd0158e311cea8e3bc6fa9091fe81ab651084f3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:54:46 +0100
Subject: [PATCH 0940/6849] doc: mention the CMAKETARGETS infrastructure in the
 list of infrastructures

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 58f0262612..0852b045f1 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -101,8 +101,8 @@ installed, etc.
 Depending on the package type, the +.mk+ file must be written in a
 different way, using different infrastructures:
 
-* *Makefiles for generic packages* (not using autotools): These are
-  based on an infrastructure similar to the one used for
+* *Makefiles for generic packages* (not using autotools or CMake):
+  These are based on an infrastructure similar to the one used for
   autotools-based packages, but requires a little more work from the
   developer. They specify what should be done for the configuration,
   compilation, installation and cleanup of the package. This
@@ -119,6 +119,13 @@ different way, using different infrastructures:
   system. We cover them through a xref:autotargets-tutorial[tutorial]
   and xref:autotargets-reference[reference].
 
+* *Makefiles for cmake-based software*: We provide a dedicated
+   infrastructure for such packages, as CMake is a more and more
+   commonly used build system and has a standardized behaviour. This
+   infrastructure 'must' be used for new packages that rely on
+   CMake. We cover them through a xref:cmaketargets-tutorial[tutorial]
+   and xref:cmaketargets-reference[reference].
+
 * *Hand-written Makefiles:* These are currently obsolete, and no new
   manual Makefiles should be added. However, since there are still
   many of them in the tree, we keep them documented in a

From e17418480719803f4454c4393c5be5d2c0f8033a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:54:47 +0100
Subject: [PATCH 0941/6849] doc: update GENTARGETS/AUTOTARGETS/CMAKETARGETS on
 the number of arguments

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotargets.txt  |  2 +-
 docs/manual/adding-packages-cmaketargets.txt |  2 +-
 docs/manual/adding-packages-gentargets.txt   | 29 ++++++--------------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/docs/manual/adding-packages-autotargets.txt b/docs/manual/adding-packages-autotargets.txt
index cb41eadfd9..428a1822be 100644
--- a/docs/manual/adding-packages-autotargets.txt
+++ b/docs/manual/adding-packages-autotargets.txt
@@ -23,7 +23,7 @@ package, with an example :
 11: LIBFOO_CONF_OPT = --enable-shared
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
 13:
-14: $(eval $(call AUTOTARGETS,package,libfoo))
+14: $(eval $(call AUTOTARGETS))
 ------------------------
 
 On line 6, we declare the version of the package.
diff --git a/docs/manual/adding-packages-cmaketargets.txt b/docs/manual/adding-packages-cmaketargets.txt
index b03eb6894d..3e400ec14e 100644
--- a/docs/manual/adding-packages-cmaketargets.txt
+++ b/docs/manual/adding-packages-cmaketargets.txt
@@ -23,7 +23,7 @@ with an example :
 11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
 13:
-14: $(eval $(call CMAKETARGETS,package,libfoo))
+14: $(eval $(call CMAKETARGETS))
 ------------------------
 
 On line 6, we declare the version of the package.
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 9a319d1611..29fc64028c 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -38,7 +38,7 @@ system is based on hand-written Makefiles or shell scripts.
 24: 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
 25: endef
 26:
-27: $(eval $(call GENTARGETS,package,libfoo))
+27: $(eval $(call GENTARGETS))
 --------------------------------
 
 The Makefile begins on line 6 to 8 with metadata information: the
@@ -84,32 +84,19 @@ Makefile code necessary to make your package working.
 +GENTARGETS+ Reference
 ~~~~~~~~~~~~~~~~~~~~~~
 
-The +GENTARGETS+ macro takes three arguments:
-
-* The first argument is the package directory prefix. If your package
-  is in +package/libfoo+, then the directory prefix is +package+. If
-  your package is in +package/editors/foo+, then the directory prefix
-  must be +package/editors+.
-
-* The second argument is the lower-cased package name. It must match
-  the prefix of the variables in the +.mk+ file and must match the
-  configuration option name in the +Config.in+ file. For example, if
-  the package name is +libfoo+, then the variables in the +.mk+ file
-  must start with +LIBFOO_+ and the configuration option in the
-  +Config.in+ file must be +BR2_PACKAGE_LIBFOO+.
-
-* The third argument is optional. It can be used to tell if the
-  package is a target package (cross-compiled for the target) or a
-  host package (natively compiled for the host). If unspecified, it is
-  assumed that it is a target package. See below for details.
+The +GENTARGETS+ macro takes one optional argument. This argument can
+be used to tell if the package is a target package (cross-compiled for
+the target) or a host package (natively compiled for the host). If
+unspecified, it is assumed that it is a target package. See below for
+details.
 
 For a given package, in a single +.mk+ file, it is possible to call
 GENTARGETS twice, once to create the rules to generate a target
 package and once to create the rules to generate a host package:
 
 ----------------------
-$(eval $(call GENTARGETS,package,libfoo))
-$(eval $(call GENTARGETS,package,libfoo,host))
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
 ----------------------
 
 This might be useful if the compilation of the target package requires

From 33b8c556afbe7bf544fee4e0e7263bb4b9284ac1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:55:54 +0100
Subject: [PATCH 0942/6849] gdb: do not allow native gdb on SuperH architecture

The gdb debugger does not have support for running as the native
debugger on the SuperH architecture:

 configure: error: "*** Gdb does not support native target sh4-unknown-linux-gnu"

See also http://lists.debian.org/debian-superh/2010/04/msg00000.html.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index e593698d23..af6e56aacd 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
+	depends on !BR2_sh && !BR2_sh64
 	help
 	    Build the full gdb debugger to run on the target.
 

From 0d2a03cc5a682266e1a00c3eb312dcf089e2323d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:55:55 +0100
Subject: [PATCH 0943/6849] crosstool-ng: add patch to use wget instead of curl

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rosstool-ng-001-wget-instead-of-curl.patch | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch

diff --git a/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch b/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch
new file mode 100644
index 0000000000..d40f178b8b
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch
@@ -0,0 +1,52 @@
+Use wget instead of curl
+
+While crosstool-NG did support either curl or wget in the past, it now
+only supports curl. Unfortunately, Buildroot uses wget for all its
+downloads, so wget is a hard dependency of Buildroot, while curl
+isn't.
+
+Instead of adding curl as a new Buildroot dependency, or building curl
+for the host, we simply tweak crosstool-NG to use wget instead of
+curl.
+
+The script/functions change has been provided by Yann E. Morin.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: crosstool-ng-1.13.0/configure
+===================================================================
+--- crosstool-ng-1.13.0.orig/configure
++++ crosstool-ng-1.13.0/configure
+@@ -496,7 +496,7 @@
+              ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)'   \
+              err="'libtoolize' 1.5.26 or above was not found"
+ has_or_abort prog=stat
+-has_or_abort prog="curl"
++has_or_abort prog="wget"
+ has_or_abort prog=patch
+ has_or_abort prog=tar
+ has_or_abort prog=gzip
+Index: crosstool-ng-1.13.0/scripts/functions
+===================================================================
+--- crosstool-ng-1.13.0.orig/scripts/functions
++++ crosstool-ng-1.13.0/scripts/functions
+@@ -456,13 +456,12 @@
+     # Some company networks have firewalls to connect to the internet, but it's
+     # not easy to detect them, so force a global ${CT_CONNECT_TIMEOUT}-second
+     # timeout.
+-    # For curl, no good progress indicator is available. So, be silent.
+-    if CT_DoExecLog ALL curl --ftp-pasv                                 \
+-                             --retry 3                                  \
+-                             --connect-timeout ${CT_CONNECT_TIMEOUT}    \
+-                             --location --fail --silent                 \
+-                             --output "${tmp}"                          \
+-                             "${url}"
++    if CT_DoExecLog ALL wget --passive-ftp --tries=3 -nc    \
++                             -T ${CT_CONNECT_TIMEOUT}       \
++                             -O "${tmp}"                    \
++                              "${url}"
++
++
+     then
+         # Success, we got it, good!
+         mv "${tmp}" "${dest}"

From 096c185c19d66c6904109b621e14a6ef44c7d9ac Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Nov 2011 09:55:56 +0100
Subject: [PATCH 0944/6849] target gdb: depend on thread support

Compiling gdb for the target requires thread support in the C library,
otherwise:

/home/test/outputs/test-888/toolchain/gdb-7.3.1/gdb/gdb_thread_db.h:37:21: fatal error: pthread.h: No such file or directory

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index af6e56aacd..8a02255304 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_sh && !BR2_sh64
 	help
 	    Build the full gdb debugger to run on the target.

From f1ec29eaec46d901ad32acf7bc6dec19f5bfe7e4 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Nov 2011 22:50:32 +0100
Subject: [PATCH 0945/6849] toolchain/crosstool-NG: update to 1.13.1

crosstool-ng-1.13.1 contains a fix for the UBI breakage in
the installed kernel headers.
Refresh a patch.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch | 2 +-
 package/crosstool-ng/crosstool-ng.mk                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
index 4f66744725..b875e3f1a0 100644
--- a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
+++ b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
@@ -18,7 +18,7 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
 diff -du crosstool-ng-1.12.0/Makefile.in host-crosstool-ng-1.12.0/Makefile.in
 --- crosstool-ng-1.12.0/Makefile.in     2011-08-01 01:21:34.000000000 +0200
 +++ host-crosstool-ng-1.12.0/Makefile.in        2011-08-07 21:39:16.055958219 +0200
-@@ -95,9 +95,14 @@
+@@ -101,9 +101,14 @@
  # level.
  # This has the side effect of only showing the real targets, and hiding our
  # internal ones. :-)
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index f6766972ce..82c1fbe00c 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.13.0
+CROSSTOOL_NG_VERSION           = 1.13.1
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO

From e88733af5746c723e6a3a3c5fd1974faa11fa38b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:49 -0300
Subject: [PATCH 0946/6849] lame: bump to version 3.99

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/lame/lame-no-static.patch | 28 --------------------
 package/multimedia/lame/lame.mk              |  3 ++-
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 package/multimedia/lame/lame-no-static.patch

diff --git a/package/multimedia/lame/lame-no-static.patch b/package/multimedia/lame/lame-no-static.patch
deleted file mode 100644
index f507f7f708..0000000000
--- a/package/multimedia/lame/lame-no-static.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-We don't want statically compiled binaries by force so nuke that.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura lame-3.98.4/frontend/Makefile.am lame-3.98.4.nostatic/frontend/Makefile.am
---- lame-3.98.4/frontend/Makefile.am	2006-09-30 06:17:05.000000000 -0300
-+++ lame-3.98.4.nostatic/frontend/Makefile.am	2011-02-10 13:46:05.512559590 -0300
-@@ -52,7 +52,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
- 
-diff -Nura lame-3.98.4/frontend/Makefile.in lame-3.98.4.nostatic/frontend/Makefile.in
---- lame-3.98.4/frontend/Makefile.in	2008-06-25 09:17:51.000000000 -0300
-+++ lame-3.98.4.nostatic/frontend/Makefile.in	2011-02-10 13:45:54.752559590 -0300
-@@ -152,7 +152,7 @@
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index 7609f2db33..fbf0ddae53 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -4,11 +4,12 @@
 #
 #############################################################
 
-LAME_VERSION = 3.98.4
+LAME_VERSION = 3.99
 LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lame
 LAME_DEPENDENCIES = host-pkg-config
 LAME_INSTALL_STAGING = YES
 LAME_CONF_ENV = GTK_CONFIG=/bin/false
+LAME_CONF_OPT = --enable-dynamic-frontends
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 LAME_DEPENDENCIES += libsndfile

From 6ba2d9e28ce3df01efa8dd68bb963311889a4805 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:50 -0300
Subject: [PATCH 0947/6849] bash: bump to version 4.2 pl10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bash/bash-4.1-001.patch               |  48 ---
 package/bash/bash-4.1-002.patch               |  65 ----
 package/bash/bash-4.1-003.patch               |  48 ---
 package/bash/bash-4.1-004.patch               |  47 ---
 package/bash/bash-4.1-005.patch               |  56 ---
 package/bash/bash-4.1-006.patch               |  76 -----
 package/bash/bash-4.1-007.patch               |  47 ---
 package/bash/bash-4.1-008.patch               |  49 ---
 package/bash/bash-4.1-009.patch               |  48 ---
 package/bash/bash-4.2-001.patch               |  78 +++++
 package/bash/bash-4.2-002.patch               |  60 ++++
 package/bash/bash-4.2-003.patch               | 318 ++++++++++++++++++
 package/bash/bash-4.2-004.patch               |  53 +++
 package/bash/bash-4.2-005.patch               | 131 ++++++++
 package/bash/bash-4.2-006.patch               |  46 +++
 package/bash/bash-4.2-007.patch               |  46 +++
 package/bash/bash-4.2-008.patch               |  74 ++++
 package/bash/bash-4.2-009.patch               |  82 +++++
 package/bash/bash-4.2-010.patch               |  61 ++++
 ....patch => bash-4.2-mkbuiltins-cross.patch} |   0
 package/bash/bash.mk                          |   3 +-
 21 files changed, 951 insertions(+), 485 deletions(-)
 delete mode 100644 package/bash/bash-4.1-001.patch
 delete mode 100644 package/bash/bash-4.1-002.patch
 delete mode 100644 package/bash/bash-4.1-003.patch
 delete mode 100644 package/bash/bash-4.1-004.patch
 delete mode 100644 package/bash/bash-4.1-005.patch
 delete mode 100644 package/bash/bash-4.1-006.patch
 delete mode 100644 package/bash/bash-4.1-007.patch
 delete mode 100644 package/bash/bash-4.1-008.patch
 delete mode 100644 package/bash/bash-4.1-009.patch
 create mode 100644 package/bash/bash-4.2-001.patch
 create mode 100644 package/bash/bash-4.2-002.patch
 create mode 100644 package/bash/bash-4.2-003.patch
 create mode 100644 package/bash/bash-4.2-004.patch
 create mode 100644 package/bash/bash-4.2-005.patch
 create mode 100644 package/bash/bash-4.2-006.patch
 create mode 100644 package/bash/bash-4.2-007.patch
 create mode 100644 package/bash/bash-4.2-008.patch
 create mode 100644 package/bash/bash-4.2-009.patch
 create mode 100644 package/bash/bash-4.2-010.patch
 rename package/bash/{bash-4.1-mkbuiltins-cross.patch => bash-4.2-mkbuiltins-cross.patch} (100%)

diff --git a/package/bash/bash-4.1-001.patch b/package/bash/bash-4.1-001.patch
deleted file mode 100644
index be5f9823e8..0000000000
--- a/package/bash/bash-4.1-001.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-001
-
-Bug-Reported-by:	Yann Rouillard <yann@pleiades.fr.eu.org>
-Bug-Reference-ID:	<4B44A410.4070107@pleiades.fr.eu.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html
-
-Bug-Description:
-
-A prototype for vsnprintf was incorrect, and caused compilation failures
-on systems that did not have a suitable vsnprintf, but had a declaration in
-one of the system header files.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/printf.def	2009-11-20 15:31:23.000000000 -0500
---- ./builtins/printf.def	2010-01-07 08:50:06.000000000 -0500
-***************
-*** 173,177 ****
-  
-  #if !HAVE_VSNPRINTF
-! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-  #endif
-  
---- 173,177 ----
-  
-  #if !HAVE_VSNPRINTF
-! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
-  #endif
-  
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 0
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-002.patch b/package/bash/bash-4.1-002.patch
deleted file mode 100644
index 7601ab2d65..0000000000
--- a/package/bash/bash-4.1-002.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-002
-
-Bug-Reported-by:	guillaume.outters@free.fr
-Bug-Reference-ID:	<20100105230441.70D171AA7F52@asterix.local>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html
-
-Bug-Description:
-
-Bash-4.1/Readline-6.1 introduced a hook function that allows applications
-to rewrite or modify filenames read from the file system before comparing
-them with a word to be completed.  The converted filename, if it matches,
-needs to be inserted into the line buffer, replacing the original contents.
-
-This fixes a completion bug on Mac OS X involving filenames containing
-UTF-8 characters.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/lib/readline/complete.c	2009-11-29 18:39:30.000000000 -0500
---- ./lib/readline/complete.c	2010-01-06 08:30:23.000000000 -0500
-***************
-*** 2139,2143 ****
-        if (filename_len == 0)
-  	{
-! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
-  	    continue;
-  
---- 2139,2143 ----
-        if (filename_len == 0)
-  	{
-! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
-  	    continue;
-  
-***************
-*** 2220,2224 ****
-  	    }
-  
-! 	  strcpy (temp + dirlen, entry->d_name);
-  	}
-        else
---- 2220,2224 ----
-  	    }
-  
-! 	  strcpy (temp + dirlen, convfn);
-  	}
-        else
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-003.patch b/package/bash/bash-4.1-003.patch
deleted file mode 100644
index fc12bb54d5..0000000000
--- a/package/bash/bash-4.1-003.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-003
-
-Bug-Reported-by:	coyote@wariat.org.pl
-Bug-Reference-ID:	<4b64a1f8.06e2660a.60af.4bfb@mx.google.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html
-
-Bug-Description:
-
-If command completion is attempted on a word with a quoted globbing
-character (e.g., `*' or `?'), bash can reference a NULL pointer and
-dump core.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/bashline.c	2009-10-24 14:10:19.000000000 -0400
---- ./bashline.c	2010-01-30 21:53:49.000000000 -0500
-***************
-*** 1681,1685 ****
-       characters in the common prefix are bad) will ever be returned on
-       regular completion. */
-!   if (glob_pattern_p (hint))
-      {
-        if (state == 0)
---- 1681,1685 ----
-       characters in the common prefix are bad) will ever be returned on
-       regular completion. */
-!   if (globpat)
-      {
-        if (state == 0)
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-004.patch b/package/bash/bash-4.1-004.patch
deleted file mode 100644
index a6b83358e1..0000000000
--- a/package/bash/bash-4.1-004.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-004
-
-Bug-Reported-by:	Crestez Dan Leonard <cdleonard@gmail.com>
-Bug-Reference-ID:	<1265592839.30682.21.camel@deskbox>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html
-
-Bug-Description:
-
-When running in Posix mode and executing a shell function without local
-variables, bash will not propagate a variable in a special builtin's temporary
-environment to have global scope.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/variables.c	2009-11-03 14:13:58.000000000 -0500
---- ./variables.c	2010-02-08 17:36:18.000000000 -0500
-***************
-*** 3809,3812 ****
---- 3809,3817 ----
-    if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
-      {
-+       /* Make sure we have a hash table to store the variable in while it is
-+ 	 being propagated down to the global variables table.  Create one if
-+ 	 we have to */
-+       if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
-+ 	shell_variables->table = hash_create (0);
-        /* XXX - should we set v->context here? */
-        v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-005.patch b/package/bash/bash-4.1-005.patch
deleted file mode 100644
index 79745475cc..0000000000
--- a/package/bash/bash-4.1-005.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-005
-
-Bug-Reported-by:	werner@suse.de
-Bug-Reference-ID:	<201002251238.o1PCcYcg016893@boole.suse.de>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html
-
-Bug-Description:
-
-When the `read' builtin times out after the timeout specified with -t is
-exceeded, it does not reset the flags that tell signal handlers to process
-signals immediately instead of deferring their handling.  This can result
-in unsafe functions being called from signal handlers, which can cause bash
-to hang or dump core.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/read.def	2009-10-08 11:35:46.000000000 -0400
---- ./builtins/read.def	2010-03-17 17:35:39.000000000 -0400
-***************
-*** 616,621 ****
-      zsyncfd (fd);
-  
--   interrupt_immediately--;
--   terminate_immediately--;
-    discard_unwind_frame ("read_builtin");
-  
---- 616,619 ----
-***************
-*** 624,627 ****
---- 622,628 ----
-  assign_vars:
-  
-+   interrupt_immediately--;
-+   terminate_immediately--;
-+ 
-  #if defined (ARRAY_VARS)
-    /* If -a was given, take the string read, break it into a list of words,
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-006.patch b/package/bash/bash-4.1-006.patch
deleted file mode 100644
index c33d0bd0fe..0000000000
--- a/package/bash/bash-4.1-006.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-006
-
-Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID:	<201003210155.56618.vapier@gentoo.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
-
-Bug-Description:
-
-Bash did not correctly print/reproduce here documents attached to commands
-inside compound commands such as for and while.  This affected the
-execution of such commands inside a shell function when the function
-definition is saved and later restored using `.' or `eval'.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
---- ./print_cmd.c	2010-03-22 21:15:30.000000000 -0400
-***************
-*** 114,117 ****
---- 114,123 ----
-  #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
-  
-+ #define PRINT_DEFERRED_HEREDOCS(x) \
-+   do { \
-+     if (deferred_heredocs) \
-+       print_deferred_heredocs (x); \
-+   } while (0)
-+ 
-  /* Non-zero means the stuff being printed is inside of a function def. */
-  static int inside_function_def;
-***************
-*** 561,571 ****
-  {
-    print_for_command_head (for_command);
-- 
-    cprintf (";");
-    newline ("do\n");
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-    semicolon ();
-    indentation -= indentation_amount;
-    newline ("done");
-  }
---- 566,578 ----
-  {
-    print_for_command_head (for_command);
-    cprintf (";");
-    newline ("do\n");
-+ 
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-+   PRINT_DEFERRED_HEREDOCS ("");
-    semicolon ();
-    indentation -= indentation_amount;
-+ 
-    newline ("done");
-  }
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-007.patch b/package/bash/bash-4.1-007.patch
deleted file mode 100644
index a421b0c418..0000000000
--- a/package/bash/bash-4.1-007.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-007
-
-Bug-Reported-by:	Rob Robason <rob@robason.net>
-Bug-Reference-ID:	<1269513145.22336.9.camel@home.robason.homelinux.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html
-
-Bug-Description:
-
-A typo caused bash to not honor a precision specification in a printf
-format.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/printf.def	2010-01-18 10:50:22.000000000 -0500
---- ./builtins/printf.def	2010-03-25 09:40:56.000000000 -0400
-***************
-*** 118,122 ****
-        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-      else if (have_precision) \
-!       nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
-      else \
-        nw = vflag ? vbprintf (f, func) : printf (f, func); \
---- 118,122 ----
-        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-      else if (have_precision) \
-!       nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
-      else \
-        nw = vflag ? vbprintf (f, func) : printf (f, func); \
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-008.patch b/package/bash/bash-4.1-008.patch
deleted file mode 100644
index 72b855ee70..0000000000
--- a/package/bash/bash-4.1-008.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-008
-
-Bug-Reported-by:	Dennis van Dok <dvandok@gmail.com>
-Bug-Reference-ID:	<4BBF2501.5050703@gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
-
-Bug-Description:
-
-When declaring an associative array and implicitly assigning a value
-to element "0", bash does not correctly allocate memory, leading to
-a segmentation violation when that element or the array itself is
-unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
---- ./builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
-***************
-*** 513,517 ****
-  	      /* let bind_{array,assoc}_variable take care of this. */
-  	      if (assoc_p (var))
-! 		bind_assoc_variable (var, name, "0", value, aflags);
-  	      else
-  		bind_array_variable (name, 0, value, aflags);
---- 519,523 ----
-  	      /* let bind_{array,assoc}_variable take care of this. */
-  	      if (assoc_p (var))
-! 		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
-  	      else
-  		bind_array_variable (name, 0, value, aflags);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-009.patch b/package/bash/bash-4.1-009.patch
deleted file mode 100644
index ed136a9fd7..0000000000
--- a/package/bash/bash-4.1-009.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.1
-Patch-ID:	bash41-009
-
-Bug-Reported-by:	Tomas Trnka <tomastrnka@gmx.com>
-Bug-Reference-ID:	<201003242030.02166.tomastrnka@gmx.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
-
-Bug-Description:
-
-An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
-or read(2) from a terminal.  This results in an error message and truncated
-input or output.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.1-patched/sig.c	Fri Aug 14 16:31:52 2009
---- ./sig.c	Fri Mar 26 22:34:11 2010
-***************
-*** 655,660 ****
---- 655,663 ----
-      act.sa_flags |= SA_INTERRUPT;	/* XXX */
-    else
-      act.sa_flags |= SA_RESTART;		/* XXX */
-+ #else
-+   if (sig == SIGCHLD)
-+     act.sa_flags |= SA_RESTART;
-  #endif
-    sigemptyset (&act.sa_mask);
-    sigemptyset (&oact.sa_mask);
-*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
---- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
-
diff --git a/package/bash/bash-4.2-001.patch b/package/bash/bash-4.2-001.patch
new file mode 100644
index 0000000000..b5c0aa905c
--- /dev/null
+++ b/package/bash/bash-4.2-001.patch
@@ -0,0 +1,78 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-001
+
+Bug-Reported-by:	Juergen Daubert <jue@jue.li>
+Bug-Reference-ID:	<20110214175132.GA19813@jue.netz>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html
+
+Bug-Description:
+
+When running in Posix mode, bash does not correctly expand the right-hand
+side of a double-quoted word expansion containing single quotes.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2011-01-02 16:12:51.000000000 -0500
+--- ./subst.c	2011-02-19 00:00:00.000000000 -0500
+***************
+*** 1380,1387 ****
+  
+    /* The handling of dolbrace_state needs to agree with the code in parse.y:
+!      parse_matched_pair() */
+!   dolbrace_state = 0;
+!   if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+!     dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM;
+  
+    i = *sindex;
+--- 1380,1389 ----
+  
+    /* The handling of dolbrace_state needs to agree with the code in parse.y:
+!      parse_matched_pair().  The different initial value is to handle the
+!      case where this function is called to parse the word in
+!      ${param op word} (SX_WORD). */
+!   dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM;
+!   if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP))
+!     dolbrace_state = DOLBRACE_QUOTE;
+  
+    i = *sindex;
+***************
+*** 7177,7181 ****
+        /* Extract the contents of the ${ ... } expansion
+  	 according to the Posix.2 rules. */
+!       value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0);
+        if (string[sindex] == RBRACE)
+  	sindex++;
+--- 7181,7185 ----
+        /* Extract the contents of the ${ ... } expansion
+  	 according to the Posix.2 rules. */
+!       value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD);
+        if (string[sindex] == RBRACE)
+  	sindex++;
+*** ../bash-4.2-patched/subst.h	2010-12-02 20:21:29.000000000 -0500
+--- ./subst.h	2011-02-16 21:12:09.000000000 -0500
+***************
+*** 57,60 ****
+--- 57,61 ----
+  #define SX_ARITHSUB	0x0080	/* extracting $(( ... )) (currently unused) */
+  #define SX_POSIXEXP	0x0100	/* extracting new Posix pattern removal expansions in extract_dollar_brace_string */
++ #define SX_WORD		0x0200	/* extracting word in ${param op word} */
+  
+  /* Remove backslashes which are quoting backquotes from STRING.  Modifies
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 0
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 1
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-002.patch b/package/bash/bash-4.2-002.patch
new file mode 100644
index 0000000000..0d35ad2671
--- /dev/null
+++ b/package/bash/bash-4.2-002.patch
@@ -0,0 +1,60 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-002
+
+Bug-Reported-by:	Clark J. Wang <dearvoid@gmail.com>
+Bug-Reference-ID:	<AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
+
+Bug-Description:
+
+The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
+entire line.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/readline/vi_mode.c	2010-11-20 19:51:39.000000000 -0500
+--- ./lib/readline/vi_mode.c	2011-02-17 20:24:25.000000000 -0500
+***************
+*** 1115,1119 ****
+        _rl_vi_last_motion = c;
+        RL_UNSETSTATE (RL_STATE_VIMOTION);
+!       return (0);
+      }
+  #if defined (READLINE_CALLBACKS)
+--- 1115,1119 ----
+        _rl_vi_last_motion = c;
+        RL_UNSETSTATE (RL_STATE_VIMOTION);
+!       return (vidomove_dispatch (m));
+      }
+  #if defined (READLINE_CALLBACKS)
+*** ../bash-4.2-patched/lib/readline/callback.c	2010-06-06 12:18:58.000000000 -0400
+--- ./lib/readline/callback.c	2011-02-17 20:43:28.000000000 -0500
+***************
+*** 149,152 ****
+--- 149,155 ----
+  	  /* Should handle everything, including cleanup, numeric arguments,
+  	     and turning off RL_STATE_VIMOTION */
++ 	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
++ 	    _rl_internal_char_cleanup ();
++ 
+  	  return;
+  	}
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 1
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 2
+  
+  #endif /* _PATCHLEVEL_H_ */
+
diff --git a/package/bash/bash-4.2-003.patch b/package/bash/bash-4.2-003.patch
new file mode 100644
index 0000000000..a17b12764c
--- /dev/null
+++ b/package/bash/bash-4.2-003.patch
@@ -0,0 +1,318 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-003
+
+Bug-Reported-by:	Clark J. Wang <dearvoid@gmail.com>
+Bug-Reference-ID:	<AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html
+
+Bug-Description:
+
+When using the pattern replacement and pattern removal word expansions, bash
+miscalculates the possible match length in the presence of an unescaped left
+bracket without a closing right bracket, resulting in a failure to match
+the pattern.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/glob/gmisc.c	2011-02-05 16:11:17.000000000 -0500
+--- ./lib/glob/gmisc.c	2011-02-18 23:53:42.000000000 -0500
+***************
+*** 78,83 ****
+       size_t wmax;
+  {
+!   wchar_t wc, *wbrack;
+!   int matlen, t, in_cclass, in_collsym, in_equiv;
+  
+    if (*wpat == 0)
+--- 78,83 ----
+       size_t wmax;
+  {
+!   wchar_t wc;
+!   int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
+  
+    if (*wpat == 0)
+***************
+*** 119,123 ****
+  	case L'[':
+  	  /* scan for ending `]', skipping over embedded [:...:] */
+! 	  wbrack = wpat;
+  	  wc = *wpat++;
+  	  do
+--- 119,123 ----
+  	case L'[':
+  	  /* scan for ending `]', skipping over embedded [:...:] */
+! 	  bracklen = 1;
+  	  wc = *wpat++;
+  	  do
+***************
+*** 125,140 ****
+  	      if (wc == 0)
+  		{
+! 	          matlen += wpat - wbrack - 1;	/* incremented below */
+! 	          break;
+  	        }
+  	      else if (wc == L'\\')
+  		{
+! 		  wc = *wpat++;
+! 		  if (*wpat == 0)
+! 		    break;
+  		}
+  	      else if (wc == L'[' && *wpat == L':')	/* character class */
+  		{
+  		  wpat++;
+  		  in_cclass = 1;
+  		}
+--- 125,148 ----
+  	      if (wc == 0)
+  		{
+! 		  wpat--;			/* back up to NUL */
+! 	          matlen += bracklen;
+! 	          goto bad_bracket;
+  	        }
+  	      else if (wc == L'\\')
+  		{
+! 		  /* *wpat == backslash-escaped character */
+! 		  bracklen++;
+! 		  /* If the backslash or backslash-escape ends the string,
+! 		     bail.  The ++wpat skips over the backslash escape */
+! 		  if (*wpat == 0 || *++wpat == 0)
+! 		    {
+! 		      matlen += bracklen;
+! 		      goto bad_bracket;
+! 		    }
+  		}
+  	      else if (wc == L'[' && *wpat == L':')	/* character class */
+  		{
+  		  wpat++;
++ 		  bracklen++;
+  		  in_cclass = 1;
+  		}
+***************
+*** 142,145 ****
+--- 150,154 ----
+  		{
+  		  wpat++;
++ 		  bracklen++;
+  		  in_cclass = 0;
+  		}
+***************
+*** 147,152 ****
+  		{
+  		  wpat++;
+  		  if (*wpat == L']')	/* right bracket can appear as collating symbol */
+! 		    wpat++;
+  		  in_collsym = 1;
+  		}
+--- 156,165 ----
+  		{
+  		  wpat++;
++ 		  bracklen++;
+  		  if (*wpat == L']')	/* right bracket can appear as collating symbol */
+! 		    {
+! 		      wpat++;
+! 		      bracklen++;
+! 		    }
+  		  in_collsym = 1;
+  		}
+***************
+*** 154,157 ****
+--- 167,171 ----
+  		{
+  		  wpat++;
++ 		  bracklen++;
+  		  in_collsym = 0;
+  		}
+***************
+*** 159,164 ****
+  		{
+  		  wpat++;
+  		  if (*wpat == L']')	/* right bracket can appear as equivalence class */
+! 		    wpat++;
+  		  in_equiv = 1;
+  		}
+--- 173,182 ----
+  		{
+  		  wpat++;
++ 		  bracklen++;
+  		  if (*wpat == L']')	/* right bracket can appear as equivalence class */
+! 		    {
+! 		      wpat++;
+! 		      bracklen++;
+! 		    }
+  		  in_equiv = 1;
+  		}
+***************
+*** 166,174 ****
+--- 184,196 ----
+  		{
+  		  wpat++;
++ 		  bracklen++;
+  		  in_equiv = 0;
+  		}
++ 	      else
++ 		bracklen++;
+  	    }
+  	  while ((wc = *wpat++) != L']');
+  	  matlen++;		/* bracket expression can only match one char */
++ bad_bracket:
+  	  break;
+  	}
+***************
+*** 214,219 ****
+       size_t max;
+  {
+!   char c, *brack;
+!   int matlen, t, in_cclass, in_collsym, in_equiv;
+  
+    if (*pat == 0)
+--- 236,241 ----
+       size_t max;
+  {
+!   char c;
+!   int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
+  
+    if (*pat == 0)
+***************
+*** 255,259 ****
+  	case '[':
+  	  /* scan for ending `]', skipping over embedded [:...:] */
+! 	  brack = pat;
+  	  c = *pat++;
+  	  do
+--- 277,281 ----
+  	case '[':
+  	  /* scan for ending `]', skipping over embedded [:...:] */
+! 	  bracklen = 1;
+  	  c = *pat++;
+  	  do
+***************
+*** 261,276 ****
+  	      if (c == 0)
+  		{
+! 	          matlen += pat - brack - 1;	/* incremented below */
+! 	          break;
+  	        }
+  	      else if (c == '\\')
+  		{
+! 		  c = *pat++;
+! 		  if (*pat == 0)
+! 		    break;
+  		}
+  	      else if (c == '[' && *pat == ':')	/* character class */
+  		{
+  		  pat++;
+  		  in_cclass = 1;
+  		}
+--- 283,306 ----
+  	      if (c == 0)
+  		{
+! 		  pat--;			/* back up to NUL */
+! 		  matlen += bracklen;
+! 		  goto bad_bracket;
+  	        }
+  	      else if (c == '\\')
+  		{
+! 		  /* *pat == backslash-escaped character */
+! 		  bracklen++;
+! 		  /* If the backslash or backslash-escape ends the string,
+! 		     bail.  The ++pat skips over the backslash escape */
+! 		  if (*pat == 0 || *++pat == 0)
+! 		    {
+! 		      matlen += bracklen;
+! 		      goto bad_bracket;
+! 		    }
+  		}
+  	      else if (c == '[' && *pat == ':')	/* character class */
+  		{
+  		  pat++;
++ 		  bracklen++;
+  		  in_cclass = 1;
+  		}
+***************
+*** 278,281 ****
+--- 308,312 ----
+  		{
+  		  pat++;
++ 		  bracklen++;
+  		  in_cclass = 0;
+  		}
+***************
+*** 283,288 ****
+  		{
+  		  pat++;
+  		  if (*pat == ']')	/* right bracket can appear as collating symbol */
+! 		    pat++;
+  		  in_collsym = 1;
+  		}
+--- 314,323 ----
+  		{
+  		  pat++;
++ 		  bracklen++;
+  		  if (*pat == ']')	/* right bracket can appear as collating symbol */
+! 		    {
+! 		      pat++;
+! 		      bracklen++;
+! 		    }
+  		  in_collsym = 1;
+  		}
+***************
+*** 290,293 ****
+--- 325,329 ----
+  		{
+  		  pat++;
++ 		  bracklen++;
+  		  in_collsym = 0;
+  		}
+***************
+*** 295,300 ****
+  		{
+  		  pat++;
+  		  if (*pat == ']')	/* right bracket can appear as equivalence class */
+! 		    pat++;
+  		  in_equiv = 1;
+  		}
+--- 331,340 ----
+  		{
+  		  pat++;
++ 		  bracklen++;
+  		  if (*pat == ']')	/* right bracket can appear as equivalence class */
+! 		    {
+! 		      pat++;
+! 		      bracklen++;
+! 		    }
+  		  in_equiv = 1;
+  		}
+***************
+*** 302,310 ****
+--- 342,354 ----
+  		{
+  		  pat++;
++ 		  bracklen++;
+  		  in_equiv = 0;
+  		}
++ 	      else
++ 		bracklen++;
+  	    }
+  	  while ((c = *pat++) != ']');
+  	  matlen++;		/* bracket expression can only match one char */
++ bad_bracket:
+  	  break;
+  	}
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 2
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 3
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-004.patch b/package/bash/bash-4.2-004.patch
new file mode 100644
index 0000000000..fe419fa772
--- /dev/null
+++ b/package/bash/bash-4.2-004.patch
@@ -0,0 +1,53 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-004
+
+Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID:	<201102182106.17834.vapier@gentoo.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html
+
+Bug-Description:
+
+When used in contexts where word splitting and quote removal were not
+performed, such as pattern removal or pattern substitution, empty strings
+(either literal or resulting from quoted variables that were unset or
+null) were not matched correctly, resulting in failure.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2011-01-02 16:12:51.000000000 -0500
+--- ./subst.c	2011-02-18 22:30:13.000000000 -0500
+***************
+*** 3373,3379 ****
+    if (string == 0 || *string == '\0')
+      return (WORD_LIST *)NULL;
+  
+!   td.flags = 0;
+    td.word = string;
+    tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
+    return (tresult);
+--- 3373,3379 ----
+    if (string == 0 || *string == '\0')
+      return (WORD_LIST *)NULL;
+  
+!   td.flags = W_NOSPLIT2;		/* no splitting, remove "" and '' */
+    td.word = string;
+    tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
+    return (tresult);
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 3
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 4
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-005.patch b/package/bash/bash-4.2-005.patch
new file mode 100644
index 0000000000..c53a4e9c96
--- /dev/null
+++ b/package/bash/bash-4.2-005.patch
@@ -0,0 +1,131 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-005
+
+Bug-Reported-by:	Dennis Williamson <dennistwilliamson@gmail.com>
+Bug-Reference-ID:	<AANLkTikDbEV5rnbPc0zOfmZfBcg0xGetzLLzK+KjRiNa@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html
+
+Bug-Description:
+
+Systems that use tzset() to set the local timezone require the TZ variable
+to be in the environment.  Bash must make sure the environment has been
+modified with any updated value for TZ before calling tzset().  This
+affects prompt string expansions and the `%T' printf conversion specification
+on systems that do not allow bash to supply a replacement for getenv(3).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/variables.h	2010-12-02 20:22:01.000000000 -0500
+--- ./variables.h	2011-02-19 19:57:12.000000000 -0500
+***************
+*** 314,317 ****
+--- 314,318 ----
+  extern void sort_variables __P((SHELL_VAR **));
+  
++ extern int chkexport __P((char *));
+  extern void maybe_make_export_env __P((void));
+  extern void update_export_env_inplace __P((char *, int, char *));
+*** ../bash-4.2-patched/variables.c	2011-01-24 20:07:48.000000000 -0500
+--- ./variables.c	2011-02-19 20:04:50.000000000 -0500
+***************
+*** 3654,3657 ****
+--- 3654,3673 ----
+  }
+  
++ int
++ chkexport (name)
++      char *name;
++ {
++   SHELL_VAR *v;
++ 
++   v = find_variable (name);
++   if (exported_p (v))
++     {
++       array_needs_making = 1;
++       maybe_make_export_env ();
++       return 1;
++     }
++   return 0;
++ }
++ 
+  void
+  maybe_make_export_env ()
+***************
+*** 4215,4219 ****
+    { "TEXTDOMAINDIR", sv_locale },
+  
+! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
+    { "TZ", sv_tz },
+  #endif
+--- 4231,4235 ----
+    { "TEXTDOMAINDIR", sv_locale },
+  
+! #if defined (HAVE_TZSET)
+    { "TZ", sv_tz },
+  #endif
+***************
+*** 4559,4568 ****
+  #endif /* HISTORY */
+  
+! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
+  void
+  sv_tz (name)
+       char *name;
+  {
+!   tzset ();
+  }
+  #endif
+--- 4575,4585 ----
+  #endif /* HISTORY */
+  
+! #if defined (HAVE_TZSET)
+  void
+  sv_tz (name)
+       char *name;
+  {
+!   if (chkexport (name))
+!     tzset ();
+  }
+  #endif
+*** ../bash-4.2-patched/parse.y	2011-01-02 15:48:11.000000000 -0500
+--- ./parse.y	2011-02-19 20:05:00.000000000 -0500
+***************
+*** 5136,5139 ****
+--- 5136,5142 ----
+  	      /* Make the current time/date into a string. */
+  	      (void) time (&the_time);
++ #if defined (HAVE_TZSET)
++ 	      sv_tz ("TZ");		/* XXX -- just make sure */
++ #endif
+  	      tm = localtime (&the_time);
+  
+*** ../bash-4.2-patched/builtins/printf.def	2010-11-23 10:02:55.000000000 -0500
+--- ./builtins/printf.def	2011-02-19 20:05:04.000000000 -0500
+***************
+*** 466,469 ****
+--- 466,472 ----
+  		else
+  		  secs = arg;
++ #if defined (HAVE_TZSET)
++ 		sv_tz ("TZ");		/* XXX -- just make sure */
++ #endif
+  		tm = localtime (&secs);
+  		n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 4
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 5
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-006.patch b/package/bash/bash-4.2-006.patch
new file mode 100644
index 0000000000..ce8d9890d7
--- /dev/null
+++ b/package/bash/bash-4.2-006.patch
@@ -0,0 +1,46 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-006
+
+Bug-Reported-by:	Allan McRae <allan@archlinux.org>
+Bug-Reference-ID:	<4D6D0D0B.50908@archlinux.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html
+
+Bug-Description:
+
+A problem with bash42-005 caused it to dump core if TZ was unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/variables.c	2011-02-25 12:07:41.000000000 -0500
+--- ./variables.c	2011-03-01 10:13:04.000000000 -0500
+***************
+*** 3661,3665 ****
+  
+    v = find_variable (name);
+!   if (exported_p (v))
+      {
+        array_needs_making = 1;
+--- 3661,3665 ----
+  
+    v = find_variable (name);
+!   if (v && exported_p (v))
+      {
+        array_needs_making = 1;
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 5
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 6
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-007.patch b/package/bash/bash-4.2-007.patch
new file mode 100644
index 0000000000..6fca89662c
--- /dev/null
+++ b/package/bash/bash-4.2-007.patch
@@ -0,0 +1,46 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-007
+
+Bug-Reported-by:	Matthias Klose <doko@debian.org>
+Bug-Reference-ID:	<4D6FD2AC.1010500@debian.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html
+
+Bug-Description:
+
+When used in contexts where word splitting and quote removal were not
+performed, such as case statement word expansion, empty strings
+(either literal or resulting from quoted variables that were unset or
+null) were not expanded correctly, resulting in failure.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2011-02-25 12:03:58.000000000 -0500
+--- ./subst.c	2011-03-03 14:08:23.000000000 -0500
+***************
+*** 4609,4614 ****
+--- 4611,4617 ----
+    if (ifs_firstc == 0)
+  #endif
+      word->flags |= W_NOSPLIT;
++   word->flags |= W_NOSPLIT2;
+    result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
+    expand_no_split_dollar_star = 0;
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 6
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-008.patch b/package/bash/bash-4.2-008.patch
new file mode 100644
index 0000000000..91f888272c
--- /dev/null
+++ b/package/bash/bash-4.2-008.patch
@@ -0,0 +1,74 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-008
+
+Bug-Reported-by:	Doug McMahon <mc2man@optonline.net>
+Bug-Reference-ID:	<1299441211.2535.11.camel@doug-XPS-M1330>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html
+
+Bug-Description:
+
+Bash-4.2 does not attempt to save the shell history on receipt of a
+terminating signal that is handled synchronously.  Unfortunately, the
+`close' button on most X11 terminal emulators sends SIGHUP, which
+kills the shell.
+
+This is a very small patch to save the history in the case that an
+interactive shell receives a SIGHUP or SIGTERM while in readline and
+reading a command.
+
+The next version of bash will do this differently.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/sig.c	Tue Nov 23 08:21:22 2010
+--- ./sig.c	Tue Mar  8 21:28:32 2011
+***************
+*** 47,50 ****
+--- 47,51 ----
+  #if defined (READLINE)
+  #  include "bashline.h"
++ #  include <readline/readline.h>
+  #endif
+  
+***************
+*** 63,66 ****
+--- 64,68 ----
+  extern int history_lines_this_session;
+  #endif
++ extern int no_line_editing;
+  
+  extern void initialize_siglist ();
+***************
+*** 506,510 ****
+  #if defined (HISTORY)
+        /* XXX - will inhibit history file being written */
+!       history_lines_this_session = 0;
+  #endif
+        terminate_immediately = 0;
+--- 508,515 ----
+  #if defined (HISTORY)
+        /* XXX - will inhibit history file being written */
+! #  if defined (READLINE)
+!       if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0))
+! #  endif
+!         history_lines_this_session = 0;
+  #endif
+        terminate_immediately = 0;
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-009.patch b/package/bash/bash-4.2-009.patch
new file mode 100644
index 0000000000..a4a5ded81a
--- /dev/null
+++ b/package/bash/bash-4.2-009.patch
@@ -0,0 +1,82 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-009
+
+Bug-Reported-by:	<piuma@piumalab.org>
+Bug-Reference-ID:	<4DAAC0DB.7060606@piumalab.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html
+
+Bug-Description:
+
+Under certain circumstances, running `fc -l' two times in succession with a
+relative history offset at the end of the history will result in an incorrect
+calculation of the last history entry and a seg fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/fc.def	2010-05-30 18:25:38.000000000 -0400
+--- ./builtins/fc.def	2011-04-19 15:46:17.000000000 -0400
+***************
+*** 305,309 ****
+  
+    /* XXX */
+!   if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0)
+      while (last_hist >= 0 && hlist[last_hist] == 0)
+        last_hist--;
+--- 305,309 ----
+  
+    /* XXX */
+!   if (i == last_hist && hlist[last_hist] == 0)
+      while (last_hist >= 0 && hlist[last_hist] == 0)
+        last_hist--;
+***************
+*** 476,480 ****
+  {
+    int sign, n, clen, rh;
+!   register int i, j;
+    register char *s;
+  
+--- 476,480 ----
+  {
+    int sign, n, clen, rh;
+!   register int i, j, last_hist;
+    register char *s;
+  
+***************
+*** 496,500 ****
+       calculation as if it were on. */
+    rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
+!   i -= rh + hist_last_line_added;
+  
+    /* No specification defaults to most recent command. */
+--- 496,508 ----
+       calculation as if it were on. */
+    rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
+!   last_hist = i - rh - hist_last_line_added;
+! 
+!   if (i == last_hist && hlist[last_hist] == 0)
+!     while (last_hist >= 0 && hlist[last_hist] == 0)
+!       last_hist--;
+!   if (last_hist < 0)
+!     return (-1);
+! 
+!   i = last_hist;
+  
+    /* No specification defaults to most recent command. */
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-010.patch b/package/bash/bash-4.2-010.patch
new file mode 100644
index 0000000000..0970c37754
--- /dev/null
+++ b/package/bash/bash-4.2-010.patch
@@ -0,0 +1,61 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-010
+
+Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID:	<201104122356.20160.vapier@gentoo.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html
+
+Bug-Description:
+
+Bash did not correctly print/reproduce here documents attached to commands
+inside compound commands such as arithmetic for loops and user-specified
+subshells.  This affected the execution of such commands inside a shell
+function when the function definition is saved and later restored using
+`.' or `eval'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/print_cmd.c	2010-05-30 18:34:08.000000000 -0400
+--- ./print_cmd.c	2011-04-14 10:43:18.000000000 -0400
+***************
+*** 316,319 ****
+--- 317,321 ----
+  	  skip_this_indent++;
+  	  make_command_string_internal (command->value.Subshell->command);
++ 	  PRINT_DEFERRED_HEREDOCS ("");
+  	  cprintf (" )");
+  	  break;
+***************
+*** 593,596 ****
+--- 606,610 ----
+    indentation += indentation_amount;
+    make_command_string_internal (arith_for_command->action);
++   PRINT_DEFERRED_HEREDOCS ("");
+    semicolon ();
+    indentation -= indentation_amount;
+***************
+*** 654,657 ****
+--- 668,672 ----
+  
+    make_command_string_internal (group_command->command);
++   PRINT_DEFERRED_HEREDOCS ("");
+  
+    if (inside_function_def)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.1-mkbuiltins-cross.patch b/package/bash/bash-4.2-mkbuiltins-cross.patch
similarity index 100%
rename from package/bash/bash-4.1-mkbuiltins-cross.patch
rename to package/bash/bash-4.2-mkbuiltins-cross.patch
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index b20f6a8c34..f1f951c3ab 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-BASH_VERSION = 4.1
+BASH_VERSION = 4.2
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
 BASH_DEPENDENCIES = ncurses
+BASH_CONF_ENV = bash_cv_job_control_missing=no
 
 # Make sure we build after busybox so that /bin/sh links to bash
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From 28df108c9b446ec582530721636584fefe27b564 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:51 -0300
Subject: [PATCH 0948/6849] bison: bump to version 2.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../bison-2.4.3-uclibc-sched_param-def.patch  | 19 -------------------
 package/bison/bison.mk                        |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 package/bison/bison-2.4.3-uclibc-sched_param-def.patch

diff --git a/package/bison/bison-2.4.3-uclibc-sched_param-def.patch b/package/bison/bison-2.4.3-uclibc-sched_param-def.patch
deleted file mode 100644
index 50652d8bab..0000000000
--- a/package/bison/bison-2.4.3-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-
---- m4-1.4.14/lib/spawn.in.h
-+++ m4-1.4.14/lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index d365e33cdb..759592e166 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BISON_VERSION = 2.4.3
+BISON_VERSION = 2.5
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 
 define BISON_DISABLE_EXAMPLES

From f00bc8ac3b93e5e2aa5c8b2c8354de7453d9b60a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:52 -0300
Subject: [PATCH 0949/6849] gawk: bump to version 4.0.0

Bump gawk to version 4.0.0
Also build after busybox if it's enabled.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/gawk-no-versioned.patch | 37 ++++++----------------------
 package/gawk/gawk.mk                 |  7 +++++-
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/package/gawk/gawk-no-versioned.patch b/package/gawk/gawk-no-versioned.patch
index 6f74f52847..ff28581eaf 100644
--- a/package/gawk/gawk-no-versioned.patch
+++ b/package/gawk/gawk-no-versioned.patch
@@ -1,20 +1,13 @@
-From 9cb7ff17dd7f81589f0891413efa5d4aec1a1598 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 7 Jun 2010 11:33:50 -0300
-Subject: [PATCH] Disabled versioned installation to save space and use symlinks where it's appropiate
-
+Disabled versioned installation of binaries to save space.
+Also use symlinks where it's appropiate.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 ---
- Makefile.in     |    3 ++-
- doc/Makefile.in |    2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index f946ee1..a3d467a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -392,7 +392,7 @@ CLEANFILES = core core.*
+diff -Nura gawk-4.0.0.orig/Makefile.in gawk-4.0.0/Makefile.in
+--- gawk-4.0.0.orig/Makefile.in	2011-06-24 05:16:13.000000000 -0300
++++ gawk-4.0.0/Makefile.in	2011-11-11 15:31:16.429577288 -0300
+@@ -403,7 +403,7 @@
  MAINTAINERCLEANFILES = version.c
  
  # We want hard links for install-exec-hook, below
@@ -23,7 +16,7 @@ index f946ee1..a3d467a 100644
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -993,6 +993,7 @@ uninstall-am: uninstall-binPROGRAMS
+@@ -1011,6 +1011,7 @@
  # (This is done universally, which may not always be right, but
  # there's no easy way to distinguish GNU from non-GNU systems.)
  install-exec-hook:
@@ -31,19 +24,3 @@ index f946ee1..a3d467a 100644
  	(cd $(DESTDIR)$(bindir); \
  	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
  	$(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index b1533e7..8b91694 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -272,7 +272,7 @@ AWKCARD = awkcard.ps
- # make pgawk.1 a link to gawk.1 in the installed man directory.
- 
- # We want hard links for install-data-hook, below
--LN = ln
-+LN = $(LN_S)
- all: all-am
- 
- .SUFFIXES:
--- 
-1.6.4.4
-
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 445414b588..7fd85eea4d 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -4,10 +4,15 @@
 #
 #############################################################
 
-GAWK_VERSION = 3.1.8
+GAWK_VERSION = 4.0.0
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_TARGET_BINS = awk gawk igawk pgawk
 
+# Prefer full-blown gawk over busybox awk
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+GAWK_DEPENDENCIES += busybox
+endif
+
 define GAWK_CREATE_SYMLINK
 	ln -sf /usr/bin/gawk $(TARGET_DIR)/usr/bin/awk
 endef

From a0f4ddfbe02a2eec7f6f2158d3258a511a55bf56 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:53 -0300
Subject: [PATCH 0950/6849] diffutils: bump to version 3.2

Bump to diffutils version 3.2
Drop all unnecessary configure hints.
There's no point in installing diffutils to staging so drop that too.
Build after busybox if it's enabled to prefer full-blown diff.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/diffutils/Config.in                   |  4 ++
 .../diffutils/diffutils-2.8.1-__mempcpy.patch | 47 ---------------
 package/diffutils/diffutils.mk                | 57 ++-----------------
 3 files changed, 9 insertions(+), 99 deletions(-)
 delete mode 100644 package/diffutils/diffutils-2.8.1-__mempcpy.patch

diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
index df3e426dd1..86da5d3a4f 100644
--- a/package/diffutils/Config.in
+++ b/package/diffutils/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_DIFFUTILS
 	bool"diffutils"
+	depends on BR2_USE_WCHAR
 	help
 	  GNU diff. Compare files per line.
 
 	  http://www.gnu.org/software/diffutils/diffutils.html
+
+comment "diffutils requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/diffutils/diffutils-2.8.1-__mempcpy.patch b/package/diffutils/diffutils-2.8.1-__mempcpy.patch
deleted file mode 100644
index 94144c1713..0000000000
--- a/package/diffutils/diffutils-2.8.1-__mempcpy.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-[PATCH] diffutils: Don't use glibc specific __mempcpy
-
-The configure script checks for mempcpy, but the code uses the (glibc
-specific) __mempcpy instead. Fix it to use mempcpy which is more
-portable.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>x
----
- lib/getopt.c |    4 ++--
- lib/regex.c  |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: diffutils-2.8.1/lib/getopt.c
-===================================================================
---- diffutils-2.8.1.orig/lib/getopt.c
-+++ diffutils-2.8.1/lib/getopt.c
-@@ -334,7 +334,7 @@ exchange (argv)
- 	nonoption_flags_len = nonoption_flags_max_len = 0;
-       else
- 	{
--	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
-+	  memset (mempcpy (new_str, __getopt_nonoption_flags,
- 			     nonoption_flags_max_len),
- 		  '\0', top + 1 - nonoption_flags_max_len);
- 	  nonoption_flags_max_len = top + 1;
-@@ -445,7 +445,7 @@ _getopt_initialize (argc, argv, optstrin
- 	      if (__getopt_nonoption_flags == NULL)
- 		nonoption_flags_max_len = -1;
- 	      else
--		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
-+		memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
- 			'\0', nonoption_flags_max_len - len);
- 	    }
- 	}
-Index: diffutils-2.8.1/lib/regex.c
-===================================================================
---- diffutils-2.8.1.orig/lib/regex.c
-+++ diffutils-2.8.1/lib/regex.c
-@@ -8314,7 +8314,7 @@ regerror (errcode, preg, errbuf, errbuf_
-       if (msg_size > errbuf_size)
-         {
- #if defined HAVE_MEMPCPY || defined _LIBC
--	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
-+	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
- #else
-           memcpy (errbuf, msg, errbuf_size - 1);
-           errbuf[errbuf_size - 1] = 0;
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 693b0c8f67..6d1896afa2 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -3,62 +3,15 @@
 # diffutils
 #
 #############################################################
-DIFFUTILS_VERSION=2.8.1
-DIFFUTILS_SOURCE:=diffutils-$(DIFFUTILS_VERSION).tar.gz
-DIFFUTILS_SITE:=$(BR2_GNU_MIRROR)/diffutils
-
-DIFFUTILS_INSTALL_STAGING = YES
 
+DIFFUTILS_VERSION = 3.2
+DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBINTL),libintl)
 
-DIFFUTILS_CONF_ENV = ac_cv_func_strtod=yes
-		ac_fsusage_space=yes \
-		fu_cv_sys_stat_statfs2_bsize=yes \
-		ac_cv_func_closedir_void=no \
-		ac_cv_func_getloadavg=no \
-		ac_cv_lib_util_getloadavg=no \
-		ac_cv_lib_getloadavg_getloadavg=no \
-		ac_cv_func_getgroups=yes \
-		ac_cv_func_getgroups_works=yes \
-		ac_cv_func_chown_works=yes \
-		ac_cv_have_decl_euidaccess=no \
-		ac_cv_func_euidaccess=no \
-		ac_cv_have_decl_strnlen=yes \
-		ac_cv_func_strnlen_working=yes \
-		ac_cv_func_lstat_dereferences_slashed_symlink=yes \
-		ac_cv_func_lstat_empty_string_bug=no \
-		ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no \
-		ac_cv_have_decl_nanosleep=yes \
-		jm_cv_func_nanosleep_works=yes \
-		gl_cv_func_working_utimes=yes \
-		ac_cv_func_utime_null=yes \
-		ac_cv_have_decl_strerror_r=yes \
-		ac_cv_func_strerror_r_char_p=no \
-		jm_cv_func_svid_putenv=yes \
-		ac_cv_func_getcwd_null=yes \
-		ac_cv_func_getdelim=yes \
-		ac_cv_func_mkstemp=yes \
-		utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no \
-		jm_cv_func_gettimeofday_clobber=no \
-		am_cv_func_working_getline=yes \
-		gl_cv_func_working_readdir=yes \
-		jm_ac_cv_func_link_follows_symlink=no \
-		utils_cv_localtime_cache=no \
-		ac_cv_struct_st_mtim_nsec=no \
-		gl_cv_func_tzset_clobber=no \
-		gl_cv_func_getcwd_null=yes \
-		gl_cv_func_getcwd_path_max=yes \
-		ac_cv_func_fnmatch_gnu=yes \
-		am_getline_needs_run_time_check=no \
-		am_cv_func_working_getline=yes \
-		gl_cv_func_mkdir_trailing_slash_bug=no \
-		gl_cv_func_mkstemp_limitations=no \
-		ac_cv_func_working_mktime=yes \
-		jm_cv_func_working_re_compile_pattern=yes \
-		ac_use_included_regex=no
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+DIFFUTILS_DEPENDENCIES += busybox
+endif
 
 $(eval $(call AUTOTARGETS))

From 3e70816f54c987060bb3f5deabfa7dec7713ab25 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:54 -0300
Subject: [PATCH 0951/6849] m4: bump to version 1.4.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../m4/m4-1.4.15-uclibc-sched_param-def.patch | 19 -------------------
 ...X.patch => m4-1.4.16-001-MB_CUR_MAX.patch} |  0
 package/m4/m4.mk                              |  4 ++--
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 package/m4/m4-1.4.15-uclibc-sched_param-def.patch
 rename package/m4/{m4-1.4.8-001-MB_CUR_MAX.patch => m4-1.4.16-001-MB_CUR_MAX.patch} (100%)

diff --git a/package/m4/m4-1.4.15-uclibc-sched_param-def.patch b/package/m4/m4-1.4.15-uclibc-sched_param-def.patch
deleted file mode 100644
index 47bdd3d84a..0000000000
--- a/package/m4/m4-1.4.15-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-Index: m4-1.4.14/lib/spawn.in.h
-===================================================================
---- m4-1.4.14.orig/lib/spawn.in.h	2010-06-01 14:27:59.394242980 -0700
-+++ m4-1.4.14/lib/spawn.in.h	2010-06-01 14:28:28.202332200 -0700
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/package/m4/m4-1.4.8-001-MB_CUR_MAX.patch b/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
similarity index 100%
rename from package/m4/m4-1.4.8-001-MB_CUR_MAX.patch
rename to package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index 4f18aa47c9..173bba85c5 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -3,10 +3,10 @@
 # m4
 #
 #############################################################
-M4_VERSION = 1.4.15
+
+M4_VERSION = 1.4.16
 M4_SOURCE = m4-$(M4_VERSION).tar.bz2
 M4_SITE = $(BR2_GNU_MIRROR)/m4
-
 M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
 
 ifneq ($(BR2_USE_WCHAR),y)

From 14520a6866e89d504947443bcf5633ffb34d3a92 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:55 -0300
Subject: [PATCH 0952/6849] nano: bump to version 2.3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nano/nano.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index c4162c1006..2bf712156a 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-NANO_VERSION = 2.2.6
-NANO_SITE = http://www.nano-editor.org/dist/v2.2
+NANO_VERSION = 2.3.1
+NANO_SITE = http://www.nano-editor.org/dist/v2.3
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
 NANO_CONF_OPT = --without-slang --enable-tiny
 NANO_DEPENDENCIES = ncurses

From 7dbf60b29dfe14b46f3a54afba609f73a22e370f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:56 -0300
Subject: [PATCH 0953/6849] grep: bump to version 2.9

Bump grep to version 2.9
Also make it build after busybox if it's enabled, we prefer full-blown
utilities.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/grep/grep.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index e8b9cfef20..e039135b3e 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GREP_VERSION = 2.7
+GREP_VERSION = 2.9
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
@@ -15,4 +15,9 @@ GREP_CONF_ENV += LIBS=-liconv
 GREP_DEPENDENCIES += libiconv
 endif
 
+# Full grep preferred over busybox grep
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+GREP_DEPENDENCIES += busybox
+endif
+
 $(eval $(call AUTOTARGETS))

From ddfb134399b295dbf3410be3ee4bb52d7b97e6ed Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:58 -0300
Subject: [PATCH 0954/6849] coreutils: bump to version 8.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ostname-man.patch => coreutils-8.14-hostname-man.patch} | 0
 package/coreutils/coreutils.mk                             | 7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename package/coreutils/{coreutils-8.9-hostname-man.patch => coreutils-8.14-hostname-man.patch} (100%)

diff --git a/package/coreutils/coreutils-8.9-hostname-man.patch b/package/coreutils/coreutils-8.14-hostname-man.patch
similarity index 100%
rename from package/coreutils/coreutils-8.9-hostname-man.patch
rename to package/coreutils/coreutils-8.14-hostname-man.patch
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 7ee37b19f8..eb88535cfb 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -3,9 +3,10 @@
 # coreutils
 #
 #############################################################
-COREUTILS_VERSION = 8.9
-COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.gz
+
+COREUTILS_VERSION = 8.14
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
+COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
 
 # If both coreutils and busybox are selected, make certain coreutils
 # wins the fight over who gets to have their utils actually installed.
@@ -20,6 +21,7 @@ COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false hostnam
 COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
 		ac_cv_func_chown_works=yes \
 		ac_cv_func_euidaccess=no \
+		ac_cv_func_fstatat=yes \
 		ac_cv_func_getdelim=yes \
 		ac_cv_func_getgroups=yes \
 		ac_cv_func_getgroups_works=yes \
@@ -41,6 +43,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
 		gl_cv_func_getcwd_null=yes \
 		gl_cv_func_getcwd_path_max=yes \
 		gl_cv_func_gettimeofday_clobber=no \
+		gl_cv_func_fstatat_zero_flag=no \
 		gl_cv_func_link_follows_symlink=no \
 		gl_cv_func_re_compile_pattern_working=yes \
 		gl_cv_func_svid_putenv=yes \

From 8795caa082382f600f006c15275d20df00ce1179 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Nov 2011 19:27:57 -0300
Subject: [PATCH 0955/6849] tar: build after busybox if enabled

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tar/tar.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index c797de9be1..edbd9bdc76 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -7,4 +7,9 @@
 TAR_VERSION = 1.26
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
 
+# Prefer full-blown tar over buybox's version
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+TAR_DEPENDENCIES += busybox
+endif
+
 $(eval $(call AUTOTARGETS))

From 534c6a682e5d7785669ec22fd0d34878edb151fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 10:16:49 +0100
Subject: [PATCH 0956/6849] rrdtool: fix build when host has libart/freetype
 development files

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...configure-dont-hardcode-include-dirs.patch | 26 +++++++++++++++++++
 package/rrdtool/rrdtool.mk                    |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch

diff --git a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch
new file mode 100644
index 0000000000..43b57a1b22
--- /dev/null
+++ b/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch
@@ -0,0 +1,26 @@
+[PATCH] configure.ac: don't hardcode include files search paths
+
+Breaks cross compilation if host has libart/freetype.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: rrdtool-1.2.30/configure.ac
+===================================================================
+--- rrdtool-1.2.30.orig/configure.ac
++++ rrdtool-1.2.30/configure.ac
+@@ -524,10 +524,10 @@
+ 
+ CORE_LIBS="$LIBS"
+ 
+-EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
++EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, "")
+ EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.3,  http://www.gzip.org/zlib/, "")
+ EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.10,  http://prdownloads.sourceforge.net/libpng/, "")
+-EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,		    freetype2,   2.1.10,  http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
++EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,		    freetype2,   2.1.10,  http://prdownloads.sourceforge.net/freetype/, "")
+ 
+ if test "$EX_CHECK_ALL_ERR" = "YES"; then
+   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 55aed9eff6..55bdd51046 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -7,6 +7,7 @@
 RRDTOOL_VERSION = 1.2.30
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
 RRDTOOL_DEPENDENCIES = host-pkg-config freetype libart libpng zlib
+RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES
 RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
 			ac_cv_func_mmap_fixed_mapped=yes

From 3acf323e9e92042b34f98065b65cee16f214aa54 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 11:52:48 +0100
Subject: [PATCH 0957/6849] libxcb: don't build doxygen documentation

In most situations we don't care about documentation, and newer doxygen
versions (1.7.x) seems to have issues with it, breaking the build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 8fb3dd3e85..cf015341a7 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -15,11 +15,14 @@ LIBXCB_DEPENDENCIES = \
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
 	XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+HOST_LIBXCB_CONF_OPT = --disable-build-docs
 
 HOST_LIBXCB_DEPENDENCIES = \
 	host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp \
 	host-xlib_libXau host-python
 
+HOST_LIBXCB_CONF_OPT = --disable-build-docs
+
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))
 

From e796a1fd7cda4d93a372a2d89d0fc0e5deb6c7f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 12:39:15 +0100
Subject: [PATCH 0958/6849] tftpd: fix build without ipv6

tftpd's configure script uses a nonstandard --without-ipv6 option to
disable ipv6 support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tftpd/tftpd.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 98c3c2a061..728319b27f 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -8,6 +8,10 @@ TFTPD_SOURCE   = tftp-hpa-$(TFTPD_VERSION).tar.bz2
 TFTPD_SITE     = $(BR2_KERNEL_MIRROR)/software/network/tftp/
 TFTPD_CONF_OPT = --without-tcpwrappers
 
+ifneq ($(BR2_INET_IPV6),y)
+TFTPD_CONF_OPT += --without-ipv6
+endif
+
 define TFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd
 	$(INSTALL) -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/

From 0268d6ededb519929bda8fc019b57f4bb61f7868 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 13:11:29 +0100
Subject: [PATCH 0959/6849] libxcb: really disable doxygen documentation for
 target

Thanks to Baruch Siach for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index cf015341a7..a68779dda5 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -15,7 +15,7 @@ LIBXCB_DEPENDENCIES = \
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
 	XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-HOST_LIBXCB_CONF_OPT = --disable-build-docs
+LIBXCB_CONF_OPT = --disable-build-docs
 
 HOST_LIBXCB_DEPENDENCIES = \
 	host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp \

From da9ab19c4a87226304108d0a039cd7079c71303d Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 14 Nov 2011 10:07:03 +0100
Subject: [PATCH 0960/6849] kernel-headers: update stable kernel version to
 3.1.1

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 701a02de7d..7ac5dad15d 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,6 +58,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.8"		if BR2_KERNEL_HEADERS_3_0
-	default "3.1"		if BR2_KERNEL_HEADERS_3_1
+	default "3.1.1"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 0693e5c9c78d7126fa7fadcb990bf6ac8a1f3dff Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 14 Nov 2011 10:07:04 +0100
Subject: [PATCH 0961/6849] linux: update stable kernel version to 3.1.1

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 0082ca88de..67381dc02c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_1
 
 config BR2_LINUX_KERNEL_3_1
-	bool "3.1"
+	bool "3.1.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1"
+	default "3.1.1"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1" if BR2_LINUX_KERNEL_3_1
+	default "3.1.1" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e9668efcd2a3e6520a717326756748a3b3354739 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 13:14:46 +0100
Subject: [PATCH 0962/6849] kernel-headers: bump 3.0.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                              | 2 +-
 ...-headers_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/kernel-headers/{linux-3.0.8-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.9-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 7ac5dad15d..334e24178e 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.8"		if BR2_KERNEL_HEADERS_3_0
+	default "3.0.9"		if BR2_KERNEL_HEADERS_3_0
 	default "3.1.1"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.8-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.9-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.8-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.9-headers_install-fix-__packed-in-exported-kernel-head.patch

From 0a93b0f4185071962b206392a5e202f4811f4dfa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 14:29:57 +0100
Subject: [PATCH 0963/6849] distcc: fix upstream url

Old upstream URL was no longer valid. While we're at it, fix a few
whitespace issues.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/distcc/distcc.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index 40961972e4..dc3b36b2ea 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -3,9 +3,9 @@
 # distcc
 #
 #############################################################
-DISTCC_VERSION:=2.18.3
-DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2
-DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/
+DISTCC_VERSION = 2.18.3
+DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2
+DISTCC_SITE = http://distcc.googlecode.com/files/
 
 DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome
 

From a276ff90301ee82a4955fa15c8410fb2e3cf7ddd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 16:16:17 +0100
Subject: [PATCH 0964/6849] file: install to staging as well

file provides libmagic, which other packages might use - So install it
into staging.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/file/file.mk b/package/file/file.mk
index d9a533f4d8..753605698a 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -8,6 +8,7 @@ FILE_VERSION = 5.09
 FILE_SITE = ftp://ftp.astron.com/pub/file/
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib
+FILE_INSTALL_STAGING = YES
 
 define FILE_UNINSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) uninstall -C $(FILE_DIR)

From 03d9092659216bd02b7447b55c8e4a105b6ba89e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 16:17:14 +0100
Subject: [PATCH 0965/6849] rpm: use external (BR versions) of file and pcre

Saves space in rootfs, and fixes build issues (internal pcre needs
C++ support for unit test, internal file breaks with incompatible
file versions on host).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpm/rpm.mk | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 3407f49d33..4d8fe21fa6 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -10,14 +10,28 @@ RPM_AUTORECONF = NO
 RPM_DEPENDENCIES = zlib beecrypt neon popt
 
 RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
-		ac_cv_va_copy=yes 
+		ac_cv_va_copy=yes
 
 RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 	--without-selinux \
 	--without-python --without-perl \
 	--with-zlib=$(STAGING_DIR) \
 	--with-libbeecrypt=$(STAGING_DIR) \
-	--with-popt=$(STAGING_DIR) 
+	--with-popt=$(STAGING_DIR)
+
+ifeq ($(BR2_PACKAGE_PCRE),y)
+RPM_DEPENDENCIES += pcre
+RPM_CONF_OPT += --with-pcre=external
+else
+RPM_CONF_OPT += --with-pcre=no
+endif
+
+ifeq ($(BR2_PACKAGE_FILE),y)
+RPM_DEPENDENCIES += file
+RPM_CONF_OPT += --with-file=external
+else
+RPM_CONF_OPT += --with-file=no
+endif
 
 ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
 RPM_CONF_OPT+=--with-xz

From 73d757b714becaa64d3b5d389094369c39524150 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 21 Sep 2011 08:46:16 +0200
Subject: [PATCH 0966/6849] linux: make vmlinux target available to all
 architectures

The 'vmlinux' target in the linux build directory is a generic target. It may
not be directly bootable for all architectures, but for projects where a custom
bootloader is used, it can be of value.

Previously, this target was only available for mips architectures. This patch
removes this restriction.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 67381dc02c..c304d869c5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -146,7 +146,6 @@ config BR2_LINUX_KERNEL_VMLINUX_BIN
 
 config BR2_LINUX_KERNEL_VMLINUX
 	bool "vmlinux"
-	depends on BR2_mips || BR2_mipsel || BR2_powerpc
 
 config BR2_LINUX_KERNEL_VMLINUZ
 	bool "vmlinuz"

From fd38100e1189d19cad87a64c52df2c773eb47e40 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Nov 2011 22:14:53 +0100
Subject: [PATCH 0967/6849] mplayer: fix build on i386

Mplayer needs to be built with -fomit-frame-pointer on x86, otherwise
gcc errors out on the inline asm with too few registers.

Also disable yasm support, both because this mplayer revision forgets
to build the gpl'ed asm snippets (fixed in r32736), breaking the build
- And also to ensure the build is reproducable and doesn't use host
components behind the users' back (E.G. if yasm is available on host).

Once we have added yasm as a package, this can get removed again (and
mplayer svn rev bumped) for the performance boost it gives.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 776cc68eea..2ac5e16e2f 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -108,6 +108,12 @@ ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a)
 MPLAYER_CONF_OPTS += --enable-neon
 endif
 
+ifeq ($(BR2_i386),y)
+# inline asm breaks with "can't find a register in class 'GENERAL_REGS'"
+# inless we free up ebp
+MPLAYER_CFLAGS += -fomit-frame-pointer
+endif
+
 define MPLAYER_CONFIGURE_CMDS
 	(cd $(@D); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -122,6 +128,7 @@ define MPLAYER_CONFIGURE_CMDS
 		--charset=UTF-8 \
 		--extra-cflags="$(MPLAYER_CFLAGS)" \
 		--extra-ldflags="$(MPLAYER_LDFLAGS)" \
+		--yasm='' \
 		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_CONF_OPTS) \

From d6fb91bf7ae609f9690e89c77902d0daf7687c3d Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 15 Nov 2011 17:31:17 +0000
Subject: [PATCH 0968/6849] clean-for-rebuild: also remove images_installed
 stamp

Without this, a linux-rebuild or bootloader-rebuild will not install
the rebuilt image in the images directory.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index b5ef57bb19..bd9ceb50be 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -603,6 +603,7 @@ endif
 			rm -f $$($(2)_TARGET_BUILD)
 			rm -f $$($(2)_TARGET_INSTALL_STAGING)
 			rm -f $$($(2)_TARGET_INSTALL_TARGET)
+			rm -f $$($(2)_TARGET_INSTALL_IMAGES)
 			rm -f $$($(2)_TARGET_INSTALL_HOST)
 
 $(1)-rebuild:		$(1)-clean-for-rebuild all

From bcde677598286b8fa39dce48112f1d209c40484e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 16 Nov 2011 22:53:33 +0100
Subject: [PATCH 0969/6849] gst-plugins-bad: decklink plugin needs C++ support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index a8d01bcadb..e772930b25 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -55,8 +55,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 	bool "debugutils"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK
+	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
 
+comment "decklink requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
 	bool "dtmf"
 

From 8e6c8198e0788e3990b57c0c76bd9ecf17e48f67 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 17 Nov 2011 06:54:58 +0100
Subject: [PATCH 0970/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGES b/CHANGES
index 7f74346a3b..8219cfa904 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2011.11, Not released yet:
+
+	Fixes all over the tree and new features.
+
+	Updated asciidoc documentation
+
+	Toolchain: Bumped 3.x stable kernel headers, use wget in
+	crosstool-ng as well, bump crosstool-ng version, gdb fixes.
+
+	Updated/fixed packages: distcc, file, gst-plugins-bad, libxcb,
+	mplayer, rpm, rrdtool, tar, tftpd
+
 2011.11-rc1, Released November 11th, 2011:
 
 	Fixes all over the tree and new features.

From 8c38a0a44b91579c20dac437c4715b51abeddcdd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Nov 2011 18:12:46 -0300
Subject: [PATCH 0971/6849] uClibc: fix sparc build breakage

Closes #4021

Fix build breakage for sparc as reported in bug #4021
Patches from Konrad Eisele <konrad@gaisler.com>
Submitted in the uclibc mailing list.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                               |  4 ++++
 .../uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch      | 11 +++++++++++
 toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch  | 11 +++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch

diff --git a/CHANGES b/CHANGES
index 8219cfa904..6435f99018 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,10 @@
 	Updated/fixed packages: distcc, file, gst-plugins-bad, libxcb,
 	mplayer, rpm, rrdtool, tar, tftpd
 
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4021: uClibc: undefined reference to `__GI___errno_location'
+
 2011.11-rc1, Released November 11th, 2011:
 
 	Fixes all over the tree and new features.
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
new file mode 100644
index 0000000000..44d06cb62f
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
@@ -0,0 +1,11 @@
+--- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S	2011-11-11 15:57:25.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	 restore %g0,%g0,%o0
+ 
+ .Lerror:
+-	call	HIDDEN_JUMPTARGET(__errno_location)
++	call	__errno_location
+ 	 or	%g0,EINVAL,%i0
+ 	st	%i0,[%o0]
+ 	ret
diff --git a/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch
new file mode 100644
index 0000000000..44d06cb62f
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch
@@ -0,0 +1,11 @@
+--- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S	2011-11-11 15:57:25.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	 restore %g0,%g0,%o0
+ 
+ .Lerror:
+-	call	HIDDEN_JUMPTARGET(__errno_location)
++	call	__errno_location
+ 	 or	%g0,EINVAL,%i0
+ 	st	%i0,[%o0]
+ 	ret

From 6e223241e1bb58a27eb890291f9f5c1fcc6a0818 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@free-electrons.com>
Date: Wed, 12 Oct 2011 17:22:11 +0200
Subject: [PATCH 0972/6849] Add Transmission package

Initial work by marcus.osdoba@googlemail.com

[Peter: add -daemon option, tweak Config.in]
Signed-off-by: Maxime Ripard <maxime@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |   1 +
 package/transmission/Config.in       |  39 +++++++
 package/transmission/S92transmission | 161 +++++++++++++++++++++++++++
 package/transmission/transmission.mk |  52 +++++++++
 4 files changed, 253 insertions(+)
 create mode 100644 package/transmission/Config.in
 create mode 100644 package/transmission/S92transmission
 create mode 100644 package/transmission/transmission.mk

diff --git a/package/Config.in b/package/Config.in
index 4b5e5d81a6..cc26f20a92 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -475,6 +475,7 @@ source "package/thttpd/Config.in"
 source "package/tinyhttpd/Config.in"
 endif
 source "package/tn5250/Config.in"
+source "package/transmission/Config.in"
 source "package/ttcp/Config.in"
 source "package/udpcast/Config.in"
 source "package/vpnc/Config.in"
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
new file mode 100644
index 0000000000..5284446902
--- /dev/null
+++ b/package/transmission/Config.in
@@ -0,0 +1,39 @@
+config BR2_PACKAGE_TRANSMISSION
+	bool "transmission"
+	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBEVENT
+	help
+	  Transmission is a cross-platform BitTorrent client.
+
+if BR2_PACKAGE_TRANSMISSION
+
+config BR2_PACKAGE_TRANSMISSION_UTP
+	bool "Transmission uTP support"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Install support for uTorrent Transport Protocol
+
+comment "uTP requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_TRANSMISSION_CLI
+	bool "transmission-cli"
+	help
+	  Install transmission command line interface.
+
+config BR2_PACKAGE_TRANSMISSION_DAEMON
+	bool "transmission-daemon"
+	help
+	  Install transmission daemon.
+
+config BR2_PACKAGE_TRANSMISSION_REMOTE
+	bool "transmission-remote"
+	help
+	  Install transmission remote management tool.
+endif
+
+comment "Transmission requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/transmission/S92transmission b/package/transmission/S92transmission
new file mode 100644
index 0000000000..f226154892
--- /dev/null
+++ b/package/transmission/S92transmission
@@ -0,0 +1,161 @@
+#!/bin/sh
+
+# Original Author: Lennart A. Jtte, based on Rob Howell's script
+# Modified by Maarten Van Coile & others (on IRC)
+
+# Changes for buildroot:
+# USERNAME points to 'default' in standard installation
+# TODO: set logfile with --logfile option
+
+# Do NOT "set -e"
+
+#
+# ----- CONFIGURATION -----
+#
+# For the default location Transmission uses, visit:
+# http://trac.transmissionbt.com/wiki/ConfigFiles
+# For a guide on how set the preferences, visit:
+# http://trac.transmissionbt.com/wiki/EditConfigFiles
+# For the available environement variables, visit:
+# http://trac.transmissionbt.com/wiki/EnvironmentVariables
+#
+# The name of the user that should run Transmission.
+# It's RECOMENDED to run Transmission in it's own user,
+# by default, this is set to 'transmission'.
+# For the sake of security you shouldn't set a password
+# on this user
+#USERNAME=transmission
+USERNAME=default
+
+
+
+# ----- *ADVANCED* CONFIGURATION -----
+# Only change these options if you know what you are doing!
+#
+# The folder where Transmission stores the config & web files.
+# ONLY change this you have it at a non-default location
+#TRANSMISSION_HOME="/var/config/transmission-daemon"
+#TRANSMISSION_WEB_HOME="/usr/share/transmission/web"
+#
+# The arguments passed on to transmission-daemon.
+# ONLY change this you need to, otherwise use the
+# settings file as per above.
+#TRANSMISSION_ARGS=""
+
+
+# ----- END OF CONFIGURATION -----
+#
+# PATH should only include /usr/* if it runs after the mountnfs.sh script.
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+DESC="bittorrent client"
+NAME=transmission-daemon
+DAEMON=$(which $NAME)
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+#
+# Function that starts the daemon/service
+#
+
+do_start()
+{
+    # Export the configuration/web directory, if set
+    if [ -n "$TRANSMISSION_HOME" ]; then
+          export TRANSMISSION_HOME
+    fi
+    if [ -n "$TRANSMISSION_WEB_HOME" ]; then
+          export TRANSMISSION_WEB_HOME
+    fi
+
+    # Return
+    #   0 if daemon has been started
+    #   1 if daemon was already running
+    #   2 if daemon could not be started
+    start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \
+            --exec $DAEMON --background --test -- -f $TRANSMISSION_ARGS > /dev/null \
+            || return 1
+    start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \
+            --exec $DAEMON --background -- -f $TRANSMISSION_ARGS \
+            || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+        # Return
+        #   0 if daemon has been stopped
+        #   1 if daemon was already stopped
+        #   2 if daemon could not be stopped
+        #   other if a failure occurred
+        start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --name $NAME
+        RETVAL="$?"
+        [ "$RETVAL" = 2 ] && return 2
+
+        # Wait for children to finish too if this is a daemon that forks
+        # and if the daemon is only ever run from this initscript.
+        # If the above conditions are not satisfied then add some other code
+        # that waits for the process to drop all resources that could be
+        # needed by services started subsequently.  A last resort is to
+        # sleep for some time.
+
+        start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+        [ "$?" = 2 ] && return 2
+
+        # Many daemons don't delete their pidfiles when they exit.
+        rm -f $PIDFILE
+
+        return "$RETVAL"
+}
+
+case "$1" in
+  start)
+        echo "Starting $DESC" "$NAME..."
+        do_start
+        case "$?" in
+                0|1) echo "   Starting $DESC $NAME succeeded" ;;
+                *)   echo "   Starting $DESC $NAME failed" ;;
+        esac
+        ;;
+  stop)
+        echo "Stopping $DESC $NAME..."
+        do_stop
+        case "$?" in
+                0|1) echo "   Stopping $DESC $NAME succeeded" ;;
+                *)   echo "   Stopping $DESC $NAME failed" ;;
+        esac
+        ;;
+  restart|force-reload)
+        #
+        # If the "reload" option is implemented then remove the
+        # 'force-reload' alias
+        #
+        echo "Restarting $DESC $NAME..."
+        do_stop
+        case "$?" in
+          0|1)
+                do_start
+                case "$?" in
+                    0|1) echo "   Restarting $DESC $NAME succeeded" ;;
+                    *)   echo "   Restarting $DESC $NAME failed: couldn't start $NAME" ;;
+                esac
+                ;;
+          *)
+                echo "   Restarting $DESC $NAME failed: couldn't stop $NAME" ;;
+        esac
+        ;;
+  *)
+        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+        exit 3
+        ;;
+esac
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
new file mode 100644
index 0000000000..db06692816
--- /dev/null
+++ b/package/transmission/transmission.mk
@@ -0,0 +1,52 @@
+#############################################################
+#
+# transmission
+#
+#############################################################
+TRANSMISSION_VERSION = 2.33
+TRANSMISSION_SITE = http://download.transmissionbt.com/files/
+TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2
+TRANSMISSION_DEPENDENCIES = \
+	host-pkg-config \
+	libcurl \
+	libevent \
+	openssl \
+	zlib
+
+TRANSMISSION_CONF_OPT = \
+	--disable-gtk \
+	--disable-libnotify \
+	--enable-lightweight
+
+define TRANSMISSION_INIT_SCRIPT_INSTALL
+	[ -f $(TARGET_DIR)/etc/init.d/S92transmission ] || \
+		$(INSTALL) -m 0755 -D package/transmission/S92transmission \
+			$(TARGET_DIR)/etc/init.d/S92transmission
+endef
+
+ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y)
+	TRANSMISSION_CONF_OPT += --enable-utp
+else
+	TRANSMISSION_CONF_OPT += --disable-utp
+endif
+
+ifeq ($(BR2_PACKAGE_TRANSMISSION_CLI),y)
+	TRANSMISSION_CONF_OPT += --enable-cli
+else
+	TRANSMISSION_CONF_OPT += --disable-cli
+endif
+
+ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
+	TRANSMISSION_CONF_OPT += --enable-daemon
+	TRANSMISSION_POST_INSTALL_TARGET_HOOKS += TRANSMISSION_INIT_SCRIPT_INSTALL
+else
+	TRANSMISSION_CONF_OPT += --disable-daemon
+endif
+
+ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y)
+	TRANSMISSION_CONF_OPT += --enable-remote
+else
+	TRANSMISSION_CONF_OPT += --disable-remote
+endif
+
+$(eval $(call AUTOTARGETS))

From 2211f63e79d9bc3057e94179fba22284b6b635a8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 17 Nov 2011 20:57:23 +0100
Subject: [PATCH 0973/6849] transmission: add gtk support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/transmission/Config.in       | 7 +++++++
 package/transmission/transmission.mk | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 5284446902..3fcf017fd9 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -33,6 +33,13 @@ config BR2_PACKAGE_TRANSMISSION_REMOTE
 	bool "transmission-remote"
 	help
 	  Install transmission remote management tool.
+
+config BR2_PACKAGE_TRANSMISSION_GTK
+	bool "transmission-gtk"
+	depends on BR2_PACKAGE_LIBGTK2
+	help
+	  Install transmission GTK-based GUI interface.
+
 endif
 
 comment "Transmission requires a toolchain with IPv6 support"
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index db06692816..c0d763bc4f 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -14,7 +14,6 @@ TRANSMISSION_DEPENDENCIES = \
 	zlib
 
 TRANSMISSION_CONF_OPT = \
-	--disable-gtk \
 	--disable-libnotify \
 	--enable-lightweight
 
@@ -49,4 +48,11 @@ else
 	TRANSMISSION_CONF_OPT += --disable-remote
 endif
 
+ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y)
+	TRANSMISSION_CONF_OPT += --enable-gtk
+	TRANSMISSION_DEPENDENCIES += libgtk2
+else
+	TRANSMISSION_CONF_OPT += --disable-gtk
+endif
+
 $(eval $(call AUTOTARGETS))

From 4932c8a7cc94277b3d53cecd935f725b91cfa9fe Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 10 Nov 2011 20:31:51 +0100
Subject: [PATCH 0974/6849] dependencies: check core dependencies before
 anything else

Currently, the dependencies target (that runs dependencies.sh) depends on
DEPENDENCIES_HOST_PREREQ. This means that the dependencies listed in
DEPENDENCIES_HOST_PREREQ (currently host-sstrip if sstrip is selected) are
built *before* the dependencies.sh script is run.

As a result, if e.g. there is no gcc compiler present on the build system, the
dependencies in DEPENDENCIES_HOST_PREREQ will fail to build, and buildroot
will fail non-gracefully.

This patch makes sure that the DEPENDENCIES_HOST_PREREQ are checked *after* the
dependencies.sh script, so that any problem in the build system is reported in
a clean way by dependencies.sh.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/dependencies/dependencies.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolchain/dependencies/dependencies.mk b/toolchain/dependencies/dependencies.mk
index 6eac05df8d..24d66663bb 100644
--- a/toolchain/dependencies/dependencies.mk
+++ b/toolchain/dependencies/dependencies.mk
@@ -16,12 +16,14 @@ DL_TOOLS = \
 	$(findstring git,$(DL_TOOLS_DEPENDENCIES)) \
 	$(findstring bzr,$(DL_TOOLS_DEPENDENCIES))
 
-dependencies: $(DEPENDENCIES_HOST_PREREQ)
+core-dependencies:
 	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
 		CONFIG_FILE="$(CONFIG_DIR)/.config" \
 		DL_TOOLS="$(DL_TOOLS)" \
 		$(TOPDIR)/toolchain/dependencies/dependencies.sh
 
+dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
+
 dependencies-source:
 
 dependencies-clean:
@@ -35,5 +37,5 @@ dependencies-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-.PHONY: dependencies
+.PHONY: dependencies core-dependencies
 

From 8810f5a1956bfee8bdbed6bdc48a8d18fb47ef96 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 10 Nov 2011 20:32:00 +0100
Subject: [PATCH 0975/6849] dependencies: remove unused lzma checking scripts

Files package/lzma/lzmacheck.sh and toolchain/dependencies/check-host-lzma.sh
are present since the very beginning of buildroot, but do not appear to be
used (anymore). Let's remove them.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzma/lzmacheck.sh                 |  9 ---------
 toolchain/dependencies/check-host-lzma.sh | 13 -------------
 2 files changed, 22 deletions(-)
 delete mode 100755 package/lzma/lzmacheck.sh
 delete mode 100755 toolchain/dependencies/check-host-lzma.sh

diff --git a/package/lzma/lzmacheck.sh b/package/lzma/lzmacheck.sh
deleted file mode 100755
index bcb0423d1b..0000000000
--- a/package/lzma/lzmacheck.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-bin=$(toolchain/dependencies/check-host-lzma.sh)
-if [ "x$bin" = "x" ] ; then
-  echo build-lzma-host-binary
-else
-  echo use-lzma-host-binary
-fi
-
diff --git a/toolchain/dependencies/check-host-lzma.sh b/toolchain/dependencies/check-host-lzma.sh
deleted file mode 100755
index 34e8f03792..0000000000
--- a/toolchain/dependencies/check-host-lzma.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-ok=""
-
-for bin in /usr/bin/lzma $LZMA
-do
-# TODO: add check for proper functionality here..
-  $bin --version > /dev/null 2>&1 && ok="$bin"
-  if test "x$ok" != "x" ; then
-    break
-  fi
-done
-echo "$ok"

From 2b8643f0a4ca50af0cd5f456c66caffe320847ce Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 17 Nov 2011 23:56:44 +0100
Subject: [PATCH 0976/6849] CHANGES: #3355 is resolved

Got fixed by fd38100e (mplayer: fix build on i386).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 6435f99018..5021bd3e30 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3355: mplayer fails to build
 	#4021: uClibc: undefined reference to `__GI___errno_location'
 
 2011.11-rc1, Released November 11th, 2011:

From a028c31ed07681d31ae6aba873fd60ad9b2f656d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 12:08:02 +0100
Subject: [PATCH 0977/6849] qt: ensure cross pkg-config is used

Closes #4297

Tweak qmake.conf to ensure our cross pkg-config is used, instead of
whatever is first in the path. In order to do this, tweak the
QT_QMAKE_SET to be able to handle variables which aren't prefixed with
QMAKE_.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES          |  3 ++-
 package/qt/qt.mk | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5021bd3e30..b728084150 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,12 +8,13 @@
 	crosstool-ng as well, bump crosstool-ng version, gdb fixes.
 
 	Updated/fixed packages: distcc, file, gst-plugins-bad, libxcb,
-	mplayer, rpm, rrdtool, tar, tftpd
+	mplayer, qt, rpm, rrdtool, tar, tftpd
 
 	Issues resolved (http://bugs.uclibc.org):
 
 	#3355: mplayer fails to build
 	#4021: uClibc: undefined reference to `__GI___errno_location'
+	#4297: Qt's qmake uses wrong pkg-config
 
 2011.11-rc1, Released November 11th, 2011:
 
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index cc035bfe3f..28a477ae1b 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -434,11 +434,11 @@ endif
 QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
 
 ################################################################################
-# QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
+# QT_QMAKE_SET -- helper macro to set <variable> = <value> in
 # the qmake.conf file. Will remove existing variable declaration if
 # available.
 #
-# Argument 1 is the variable name (without QMAKE_)
+# Argument 1 is the variable name
 # Argument 2 is the value to set variable to
 # Argument 3 is the base source directory of Qt
 #
@@ -446,8 +446,8 @@ QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
 # $(call QT_QMAKE_SET,variable,value,directory)
 ################################################################################
 define QT_QMAKE_SET
-	$(SED) '/QMAKE_$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '/include.*qws.conf/a$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
 endef
 
 ifneq ($(BR2_INET_IPV6),y)
@@ -468,17 +468,18 @@ define QT_CONFIGURE_CMDS
 	$(QT_CONFIGURE_IPV6)
 	$(QT_CONFIGURE_CONFIG_FILE)
 	# Fix compiler path
-	$(call QT_QMAKE_SET,CC,$(TARGET_CC),$(@D))
-	$(call QT_QMAKE_SET,CXX,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,LINK,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs,$(@D))
-	$(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY),$(@D))
-	$(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB),$(@D))
-	$(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP),$(@D))
-	$(call QT_QMAKE_SET,CFLAGS,$(QT_CFLAGS),$(@D))
-	$(call QT_QMAKE_SET,CXXFLAGS,$(QT_CXXFLAGS),$(@D))
-	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_CC,$(TARGET_CC),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_CXX,$(TARGET_CXX),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_LINK,$(TARGET_CXX),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_LINK_SHLIB,$(TARGET_CXX),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_AR,$(TARGET_AR) cqs,$(@D))
+	$(call QT_QMAKE_SET,QMAKE_OBJCOPY,$(TARGET_OBJCOPY),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_RANLIB,$(TARGET_RANLIB),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(TARGET_LDFLAGS),$(@D))
+	$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D))
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.
 	(cd $(@D); \

From adaebbcccde5c7dc69ce06fad4cc2c0ad457f32c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 13:08:59 +0100
Subject: [PATCH 0978/6849] libgtk2: bump stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...=> host-libgtk2-reduce-dependencies.patch} | 22 +++++++++----------
 package/libgtk2/libgtk2.mk                    |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename package/libgtk2/{host-libgtk2-2.20.1-reduce-dependencies.patch => host-libgtk2-reduce-dependencies.patch} (94%)

diff --git a/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch b/package/libgtk2/host-libgtk2-reduce-dependencies.patch
similarity index 94%
rename from package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch
rename to package/libgtk2/host-libgtk2-reduce-dependencies.patch
index 49acf753ea..091eeb0e58 100644
--- a/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch
+++ b/package/libgtk2/host-libgtk2-reduce-dependencies.patch
@@ -8,11 +8,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  configure.in |  101 ++---------------------------------------------------------
  1 file changed, 4 insertions(+), 97 deletions(-)
 
-Index: gtk+-2.22.0/configure.in
+Index: gtk+-2.24.8/configure.in
 ===================================================================
---- gtk+-2.22.0.orig/configure.in
-+++ gtk+-2.22.0/configure.in
-@@ -258,12 +258,12 @@
+--- gtk+-2.24.8.orig/configure.in
++++ gtk+-2.24.8/configure.in
+@@ -259,12 +259,12 @@
    gdktarget=x11
  fi
  
@@ -27,7 +27,7 @@ Index: gtk+-2.22.0/configure.in
    *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
  esac
  
-@@ -373,9 +373,6 @@
+@@ -374,9 +374,6 @@
  ## annoying to construct
  PKG_CHECK_MODULES(BASE_DEPENDENCIES,
    [glib-2.0 >= glib_required_version dnl
@@ -37,7 +37,7 @@ Index: gtk+-2.22.0/configure.in
     gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
  
  ## In addition to checking that cairo is present, we also need to
-@@ -388,8 +385,6 @@
+@@ -389,8 +386,6 @@
  if test "x$cairo_backend" = "xx11"; then
     cairo_backend=xlib
  fi
@@ -46,7 +46,7 @@ Index: gtk+-2.22.0/configure.in
  
  if test "$os_win32" != yes; then
      # libtool option to control which symbols are exported
-@@ -1270,50 +1265,6 @@
+@@ -1280,50 +1275,6 @@
  fi
  
  
@@ -94,10 +94,10 @@ Index: gtk+-2.22.0/configure.in
 -  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
 -fi
 -
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+ GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
  GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
  #
-@@ -1321,7 +1272,7 @@
+@@ -1331,7 +1282,7 @@
  # into the pkg-config files
  #
  if test $enable_explicit_deps != yes ; then
@@ -106,7 +106,7 @@ Index: gtk+-2.22.0/configure.in
    GDK_EXTRA_LIBS=
  fi
  
-@@ -1331,37 +1282,7 @@
+@@ -1341,37 +1292,7 @@
  AC_SUBST(GDK_DEP_LIBS)
  AC_SUBST(GDK_DEP_CFLAGS)
  
@@ -145,7 +145,7 @@ Index: gtk+-2.22.0/configure.in
  if test "x$gdktarget" = "xx11"; then
    GTK_PACKAGES="$GTK_PACKAGES pangoft2"
  fi
-@@ -1517,20 +1438,6 @@
+@@ -1527,20 +1448,6 @@
  gtk_save_cppflags="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
  
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 9a8c2bb5d6..52edf477b8 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -3,8 +3,8 @@
 # libgtk2.0
 #
 #############################################################
-LIBGTK2_VERSION_MAJOR:=2.24
-LIBGTK2_VERSION_MINOR:=4
+LIBGTK2_VERSION_MAJOR = 2.24
+LIBGTK2_VERSION_MINOR = 8
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2

From 61d8d88d4023be0b9e0138bf415cc3f922bdd68a Mon Sep 17 00:00:00 2001
From: Daniele Salvatore Albano <info@daccii.it>
Date: Mon, 7 Mar 2011 16:55:36 +0100
Subject: [PATCH 0979/6849] nano: make tiny flag optional

Closes #3421

[Peter: tweak Config.in]
Signed-off-by: Daniele Salvatore Albano <info@daccii.it>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nano/Config.in | 7 +++++++
 package/nano/nano.mk   | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/nano/Config.in b/package/nano/Config.in
index 8c780960f8..ef7f69df36 100644
--- a/package/nano/Config.in
+++ b/package/nano/Config.in
@@ -6,3 +6,10 @@ config BR2_PACKAGE_NANO
 	  Great editor for new users.
 
 	  http://www.nano-editor.org/
+
+config BR2_PACKAGE_NANO_TINY
+	bool "optimize for size"
+	default y
+	depends on BR2_PACKAGE_NANO
+	help
+	  Disable all features for the sake of size.
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 2bf712156a..439f58349b 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -7,9 +7,13 @@
 NANO_VERSION = 2.3.1
 NANO_SITE = http://www.nano-editor.org/dist/v2.3
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
-NANO_CONF_OPT = --without-slang --enable-tiny
+NANO_CONF_OPT = --without-slang
 NANO_DEPENDENCIES = ncurses
 
+ifeq ($(BR2_PACKAGE_NANO_TINY),y)
+	NANO_CONF_OPT += --enable-tiny
+endif
+
 define NANO_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano
 endef

From b4ddc194d00a6e7db8501861af5e32e14e0c28a1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 13:52:34 +0100
Subject: [PATCH 0980/6849] newt: disable parallel build

The newt build system contains a race condition, which sometimes breaks
the build with high BR2_JLEVEL settings.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/newt/newt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index 28b5321e7a..eb944a92fd 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -42,7 +42,7 @@ $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
 	touch $(NEWT_DIR)/.configured
 
 $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION): $(NEWT_DIR)/.configured
-	$(MAKE) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR)
+	$(MAKE1) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR)
 	touch -c $@
 
 $(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION)

From 630fd4f1f62140e9f52881af8438614b7004df4f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 13:56:39 +0100
Subject: [PATCH 0981/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b728084150..1b5a4886f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,11 @@
 	Updated asciidoc documentation
 
 	Toolchain: Bumped 3.x stable kernel headers, use wget in
-	crosstool-ng as well, bump crosstool-ng version, gdb fixes.
+	crosstool-ng as well, bump crosstool-ng version, gdb fixes,
+	uClibc sparc fix.
 
 	Updated/fixed packages: distcc, file, gst-plugins-bad, libxcb,
-	mplayer, qt, rpm, rrdtool, tar, tftpd
+	mplayer, newt, qt, rpm, rrdtool, tar, tftpd
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 6088ac0140b1b4f89f4049d72e62b2821089a29e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 14:00:24 +0100
Subject: [PATCH 0982/6849] Update for 2011.11-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1b5a4886f2..bb6bae910f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2011.11, Not released yet:
+2011.11-rc2, Released November 18th, 2011:
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index df2f8599c4..052fc3dc6f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.11-rc1
+export BR2_VERSION:=2011.11-rc2
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index 81ad2a7690..0ef382acd2 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2011.08.tar.bz2">buildroot-2011.08.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2011.11-rc1</b>, which can be
+The latest release candidate is <b>2011.11-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.11-rc1.tar.gz">buildroot-2011.11-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2011.11-rc2.tar.gz">buildroot-2011.11-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.11-rc1.tar.bz2">buildroot-2011.11-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.11-rc2.tar.bz2">buildroot-2011.11-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 1e4e5eaf13..cde1c84e0a 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>18 November 2011 -- 2011.11-rc2 released</b>
+
+    <p>Another week, another release candidate with a bunch of
+    cleanups and build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.11_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.11-rc2.tar.bz2">2011.11-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>11 November 2011 -- 2011.11-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From c94b24a85184134fb38ab8f31969978ea695bdfd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 16:06:39 +0100
Subject: [PATCH 0983/6849] xapp_xf86dga: fix dependencies

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index 9975916e8b..726d5edbd7 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -7,6 +7,12 @@
 XAPP_XF86DGA_VERSION = 1.0.2
 XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
 XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga
+XAPP_XF86DGA_DEPENDENCIES = \
+	host-pkg-config \
+	xlib_libX11 \
+	xlib_libXxf86dga \
+	xlib_libXt \
+	xlib_libXaw \
+	xlib_libXmu
 
 $(eval $(call AUTOTARGETS))

From 08d78545cc1bc1ead30016b41906736eacf7caf5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Nov 2011 23:44:27 +0100
Subject: [PATCH 0984/6849] mtd-utils: bump version, cleanup

flash_eraseall / flash_info are no more, and simplify build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/Config.in |  8 --------
 package/mtd/mtd.mk    | 34 ++++++----------------------------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 692654ca84..7330dd598c 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -20,14 +20,6 @@ config BR2_PACKAGE_MTD_FLASH_ERASE
 	bool "flash_erase"
 	default y
 
-config BR2_PACKAGE_MTD_FLASH_ERASEALL
-	bool "flash_eraseall"
-	default y
-
-config BR2_PACKAGE_MTD_FLASH_INFO
-	bool "flash_info"
-	default y
-
 config BR2_PACKAGE_MTD_FLASH_LOCK
 	bool "flash_lock"
 	default y
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 1b23e83575..ea72ba83a4 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION = 1.4.6
+MTD_VERSION = 1.4.7
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
@@ -29,8 +29,6 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK)		+= docfdisk
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS)	+= doc_loadbios
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP)		+= flashcp
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE)	+= flash_erase
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL)	+= flash_eraseall
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO)	+= flash_info
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK)	+= flash_lock
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP)	+= flash_otp_dump
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO)	+= flash_otp_info
@@ -64,37 +62,17 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL)	+= ubirmvol
 MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL)	+= ubirsvol
 MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
 
-MTD_MAKE_COMMON_FLAGS = \
-	$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
-	WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1
-
-define MTD_TARGETS_BUILD
-	$(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
-		BUILDDIR=$(@D) \
-		-C $(@D) \
-		$(addprefix $(@D)/, lib/libmtd.a $(MTD_TARGETS_y))
-endef
-
-ifneq ($(MTD_TARGETS_UBI_y),)
-define MTD_TARGETS_UBI_BUILD
-	$(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
-		BUILDDIR=$(@D)/ubi-utils/ \
-		-C $(@D)/ubi-utils \
-		$(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y))
-endef
-endif
+MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
 
 define MTD_BUILD_CMDS
- $(MTD_TARGETS_BUILD)
- $(MTD_TARGETS_UBI_BUILD)
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
+		BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \
+		$(addprefix $(@D)/,$(MTD_TARGETS_y))
 endef
 
 define MTD_INSTALL_TARGET_CMDS
  for f in $(MTD_TARGETS_y) ; do \
-  install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
- done ; \
- for f in $(MTD_TARGETS_UBI_y) ; do \
-  install -D -m 0755 $(@D)/ubi-utils/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
+  install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
  done
 endef
 

From c29fad1e1b6a438b0012bc5703ae044370eb7222 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 Nov 2011 15:56:48 +0100
Subject: [PATCH 0985/6849] mplayer: external tremor support needs ogg as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 2ac5e16e2f..96b4e736e4 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -67,8 +67,8 @@ else
 MPLAYER_CONF_OPTS += --disable-mencoder
 endif
 
-ifeq ($(BR2_PACKAGE_TREMOR),y)
-MPLAYER_DEPENDENCIES += tremor
+ifeq ($(BR2_PACKAGE_TREMOR)$(BR2_PACKAGE_LIBOGG),yy)
+MPLAYER_DEPENDENCIES += tremor libogg
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
 endif
 

From e993877714fd8381dbfbb39fdea36583ffc7ffc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Sat, 19 Nov 2011 15:31:34 +0100
Subject: [PATCH 0986/6849] gst-dsp: upgrade to 0.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: fix white space while we're at it]
Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-dsp/gst-dsp.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index 17eb18966f..cd856c1381 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -1,6 +1,5 @@
-GST_DSP_VERSION=0.8.0
-GST_DSP_SOURCE=gst-dsp-$(GST_DSP_VERSION).tar.gz
-GST_DSP_SITE=http://gst-dsp.googlecode.com/files/
+GST_DSP_VERSION = 0.9.0
+GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
 
 define GST_DSP_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e

From b5a574afcc52972762ddb426d89079304815ffab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 Nov 2011 17:01:18 +0100
Subject: [PATCH 0987/6849] barebox: add 2011.11.0, remove 2011.08.0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 8dfaeb2d4d..0342a33b1f 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,20 +8,20 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2011_10
+	default BR2_TARGET_BAREBOX_2011_11
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2011_08
-	depends on BR2_DEPRECATED
-	bool "2011.08"
-
 config BR2_TARGET_BAREBOX_2011_09
+	depends on BR2_DEPRECATED
 	bool "2011.09"
 
 config BR2_TARGET_BAREBOX_2011_10
 	bool "2011.10"
 
+config BR2_TARGET_BAREBOX_2011_11
+	bool "2011.11"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -39,9 +39,9 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2011.08.0"	if BR2_TARGET_BAREBOX_2011_08
 	default "2011.09.0"	if BR2_TARGET_BAREBOX_2011_09
 	default "2011.10.0"	if BR2_TARGET_BAREBOX_2011_10
+	default "2011.11.0"	if BR2_TARGET_BAREBOX_2011_11
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 376a535fb38ebc35b05a98cbb184d37c381ba124 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 Nov 2011 19:56:50 +0100
Subject: [PATCH 0988/6849] u-boot: fix CUSTOM_PATCH_DIR documentation

We're using uboot-<version>-*.patch, and not u-boot-<version>-*.patch

Reported-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index daccd8bbcd..506f35405c 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -61,7 +61,7 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	help
 	  If your board requires custom patches, add the path to the
 	  directory containing the patches here. The patches must be
-	  named u-boot-<version>-<something>.patch.
+	  named uboot-<version>-<something>.patch.
 
 	  Most users may leave this empty
 

From 39ea7bcec02c31dcb91f0e606e0c598a24afb4b7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 Nov 2011 21:51:58 +0100
Subject: [PATCH 0989/6849] mtd-utils: bump version

Identical to 1.4.7, except that the version number in the Makefile is
correct.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index ea72ba83a4..6b014407cd 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION = 1.4.7
+MTD_VERSION = 1.4.8
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

From c83738b2a41fbab73472d48cb676182c8fae48d6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 Nov 2011 22:40:33 +0100
Subject: [PATCH 0990/6849] opencv: ffmpeg supports needs largefile / ipv6

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opencv/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 1f454b6776..961282f5e7 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -31,11 +31,16 @@ config BR2_PACKAGE_OPENCV_WITH_PYTHON
 
 config BR2_PACKAGE_OPENCV_WITH_FFMPEG
 	bool "ffmpeg support"
+	depends on BR2_LARGEFILE
+	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	help
 	  Use ffmpeg from the target system.
 
+comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
+
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
 	bool "gstreamer support"
 	select BR2_PACKAGE_GSTREAMER

From 32bea4a1cf9968a4e46a6ecd7fd878e6f0159511 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 20 Nov 2011 21:51:17 +0100
Subject: [PATCH 0991/6849] toolchain/crosstool-NG: update to 1.13.2

crosstool-NG 1.13.2 contains an important fix related to building
the ncurses libraries: the latest ncurses version requires tic to
be either in ${TIC_PATH}, or to be exactly /usr/bin/tic.

Also contains a few minor fixes:
 - CLooG extraction
 - prescott is a i686

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 82c1fbe00c..0337bf1fef 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.13.1
+CROSSTOOL_NG_VERSION           = 1.13.2
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO

From a51194985af9ffa7e9c956b58ef32132748c7d0b Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Mon, 21 Nov 2011 17:06:46 -0500
Subject: [PATCH 0992/6849] docs: Configuration path update

Update the procedure for modifying /etc/inittab's getty line with
the correct port and baud values to reflect their current names and
locations in the Buildroot configuration.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/buildroot.html b/docs/buildroot.html
index 2314d1095c..d5be1276c3 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -1787,9 +1787,9 @@ <h3 id="faq-boot-hangs">The boot hangs after <code>Starting
     <p>then it means that your system is running, but didn't start a
     shell on the serial console. In order to have the system start a
     shell on your serial console, you have to go in the Buildroot
-    configuration, <code>Target options</code>, enable <code>Generic
-    serial port config</code>, and select the serial port and speed
-    you would like to use for the shell. This will automatically tune
+    configuration, <code>System configuration</code>, and modify
+    <code>Port to run a getty (login prompt) on</code> and
+    <code>Baudrate to use</code> as appropriate. This will automatically tune
     the <code>/etc/inittab</code> file of the generated system so that
     a shell starts on the correct serial port.</p>
 

From f4642c8bae842243f5a98d1d8028ce08d1962612 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Nov 2011 22:59:21 -0300
Subject: [PATCH 0993/6849] freetype: security bump to version 2.4.8

Bump freetype to version 2.4.8 to fix CVE-2011-3439.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 142a1ec69e..6eb6b29e7f 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FREETYPE_VERSION = 2.4.7
+FREETYPE_VERSION = 2.4.8
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES

From 66bdd2a27b5fca501365c7f0d25691bb842e3270 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Nov 2011 23:14:46 -0300
Subject: [PATCH 0994/6849] kernel-headers: update to 3.1.2 and 3.0.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.9-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.10-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 334e24178e..b94d4c02ea 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.9"		if BR2_KERNEL_HEADERS_3_0
-	default "3.1.1"		if BR2_KERNEL_HEADERS_3_1
+	default "3.0.10"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.2"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.9-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.10-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.9-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.10-headers_install-fix-__packed-in-exported-kernel-head.patch

From 9fec836b7e477ec64aae4f02c593311792f3c88d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Nov 2011 23:14:47 -0300
Subject: [PATCH 0995/6849] linux: update stable kernel to 3.1.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index c304d869c5..591ab3d419 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_1
 
 config BR2_LINUX_KERNEL_3_1
-	bool "3.1.1"
+	bool "3.1.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1.1"
+	default "3.1.2"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1.1" if BR2_LINUX_KERNEL_3_1
+	default "3.1.2" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 7a63f1a08c4e7d9df4bf3d0eed48b4d5447e6c26 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Tue, 22 Nov 2011 12:55:16 -0500
Subject: [PATCH 0996/6849] docs: Fix assumed copy+paste error.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html                        | 2 +-
 docs/manual/adding-packages-gentargets.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/buildroot.html b/docs/buildroot.html
index d5be1276c3..e13e8f7528 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -1031,7 +1031,7 @@ <h4 id="generic-reference">Makefile for generic packages : reference</h4>
 
       <li><code>LIBFOO_SOURCE</code> may contain the name of the tarball of
       the package. If <code>HOST_LIBFOO_SOURCE</code> is not specified, it
-      defaults to <code>LIBFOO_VERSION</code>. If none are specified, then
+      defaults to <code>LIBFOO_SOURCE</code>. If none are specified, then
       the value is assumed to be
       <code>packagename-$(LIBFOO_VERSION).tar.gz</code>.<br/>Example:
       <code>LIBFOO_SOURCE = foobar-$(LIBFOO_VERSION).tar.bz2</code></li>
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 29fc64028c..b344494648 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -131,7 +131,7 @@ information is (assuming the package name is +libfoo+) :
 
 * +LIBFOO_SOURCE+ may contain the name of the tarball of
   the package. If +HOST_LIBFOO_SOURCE+ is not specified, it
-  defaults to +LIBFOO_VERSION+. If none are specified, then
+  defaults to +LIBFOO_SOURCE+. If none are specified, then
   the value is assumed to be
   +packagename-$(LIBFOO_VERSION).tar.gz+. +
   Example: +LIBFOO_SOURCE = foobar-$(LIBFOO_VERSION).tar.bz2+

From 1fccc2031412d1025deda5f44c8b0a42c045f929 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 23 Nov 2011 23:28:30 +0100
Subject: [PATCH 0997/6849] rsyslog: only install S01rsyslog if not present in
 fs skeleton

To allow custom configurations.

Reported-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rsyslog/rsyslog.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 6582812b75..b7576cd5c2 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -13,8 +13,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 
 define RSYSLOG_INSTALL_CONF_SCRIPT
-	$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
-		$(TARGET_DIR)/etc/init.d/S01rsyslog
+	[ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \
+		$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
+			$(TARGET_DIR)/etc/init.d/S01rsyslog
 	[ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \
 		$(INSTALL) -m 0644 -D $(@D)/rsyslog.conf \
 			$(TARGET_DIR)/etc/rsyslog.conf

From e9985f5d5fb10d3441479bc2b89dfec862fe1d85 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 23 Nov 2011 23:31:23 +0100
Subject: [PATCH 0998/6849] gdb: fix version logic for bfin

GDB should default to 6.6 on bfin, not on !bfin.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 8a02255304..2a2844aab3 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -28,7 +28,7 @@ config BR2_PACKAGE_GDB_HOST
 
 choice
 	prompt "GDB debugger Version"
-	default BR2_GDB_VERSION_6_6 if !BR2_bfin
+	default BR2_GDB_VERSION_6_6 if BR2_bfin
 	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
 	default BR2_GDB_VERSION_7_3
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST

From 468f1cac8a2dad537bea6cbdabbf34031ceaae42 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 23 Nov 2011 23:36:32 +0100
Subject: [PATCH 0999/6849] busybox: remove old unused quirk handling

The definition of these variables were removed back in June
(7d814728 / f1e4aac4).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 9e91136054..d18b6d0b13 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -141,8 +141,6 @@ endef
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
 define BUSYBOX_CONFIGURE_CMDS
-	$(BUSYBOX_SET_SYSKLOGD)
-	$(BUSYBOX_SET_BB_PWD)
 	$(BUSYBOX_SET_LARGEFILE)
 	$(BUSYBOX_SET_IPV6)
 	$(BUSYBOX_SET_RPC)

From 5931db0de902d2da434fbf682d4177e3b3c7e31b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 24 Nov 2011 14:26:52 +0100
Subject: [PATCH 1000/6849] gdb: fix kconfig dependency handling with
 !BR_TOOLCHAIN_BUILDROOT

Newer versions of GDB need pthread debugging support if threads are
enabled, which is always the case for glibc but is a configure option
for uClibc.

We have solved this for internal toolchains by selecting the
BR2_PTHREAD_DEBUG option from the GDB selection if needed, but as this
option isn't available when ctng/external toolchains are used, mconf
prints ugly warnings and the build may fail if an external uClibc
toolchain without pthread debugging support is used.

Fix it by introducing 2 more hidden config options:
 - BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 - BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED

The first tells us if the toolchain HAS pthreads debugging support,
and is checked by check_uclibc_feature in helper.mk for external uClibc
based toolchains.

The second tells us if the toolchain is ABLE TO provide pthreads debugging
support if threads are enabled, either because it's an internal toolchain
where we can force enable it or an external glibc/eglibc toolchain or
uClibc with the option enabled.

Crosstool-ng forcibly enables this support, so those will always work.
The preconfigured uClibc-based toolchains we have also all enable it.

Finally, show a comment if this isn't the case so the (external toolchain)
user knows why. This is placed outside the choice option, as menuconfig
has a bug where it doesn't show choice selections which only contain
comments.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in                    |  2 ++
 toolchain/gdb/Config.in                | 16 ++++++++++++----
 toolchain/helpers.mk                   |  3 ++-
 toolchain/toolchain-common.in          |  8 ++++++++
 toolchain/toolchain-external/Config.in | 14 ++++++++++++++
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 5ff2a91523..2f4709a421 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -11,6 +11,7 @@ choice
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
@@ -22,6 +23,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 	help
 	  Say 'y' if you want to generate the toolchain with crosstool-NG
 	  ( http://ymorin.is-a-geek.org/projects/crosstool )
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 2a2844aab3..9868580c90 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -52,25 +52,33 @@ choice
 		bool "gdb 7.0.1"
 		depends on !BR2_bfin
 		depends on BR2_DEPRECATED
-		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
+		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
 	config BR2_GDB_VERSION_7_1
 		bool "gdb 7.1"
 		depends on !BR2_bfin
-		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
+		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
 	config BR2_GDB_VERSION_7_2
 		bool "gdb 7.2.x"
 		depends on !BR2_bfin
-		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
+		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
 	config BR2_GDB_VERSION_7_3
 		bool "gdb 7.3.x"
 		depends on !BR2_bfin
-		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
+		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
 endchoice
 
+comment "gdb 7.x support needs pthread debug support in toolchain"
+	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+
 config BR2_GDB_VERSION
 	string
 	default "6.6a"     if BR2_GDB_VERSION_6_6
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 96919d4b13..65cc9982d5 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -195,7 +195,8 @@ check_uclibc = \
 	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
-	$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support)
+	$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\
+	$(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support)
 
 #
 # Check that the Buildroot configuration of the ABI matches the
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 2d11008098..56ac85f5c1 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -26,6 +26,14 @@ config BR2_INSTALL_LIBSTDCPP
 config BR2_TOOLCHAIN_HAS_THREADS
 	bool
 
+config BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+	bool
+
+config BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+	default y if !BR2_TOOLCHAIN_HAS_THREADS
+	bool
+
 config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	bool
 
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 678babd257..eadfe50cf8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -175,6 +175,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	select BR2_INET_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
@@ -191,6 +192,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	select BR2_INET_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
@@ -224,6 +226,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	select BR2_INET_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	help
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
@@ -285,6 +288,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
 	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
@@ -361,6 +365,16 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 	  support. If you don't know, leave the default value,
 	  Buildroot will tell you if it's correct or not.
 
+config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
+	bool "Toolchain has threads debugging support?"
+	depends on BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	default y
+	help
+	  Select this option if your external toolchain has thread
+	  debugging support. If you don't know, leave the default
+	  value, Buildroot will tell you if it's correct or not.
+
 endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_CXX

From 1db649c6feb27568655f70452c2fad3e75584508 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 24 Nov 2011 22:29:46 +0100
Subject: [PATCH 1001/6849] uClibc: remove trailer from linuxthreads-errno
 patches confusing modern patch

Modern versions of patch (2.6.1.81 / 85 tested) gets confused by the empty
git trailer referencing uClibc_errno.h (from when patch was forward ported
from 0.9.31), so drop it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch   | 2 --
 toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch | 2 --
 2 files changed, 4 deletions(-)

diff --git a/toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch
index 73351737e2..c4d0d00df9 100644
--- a/toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch
+++ b/toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch
@@ -63,8 +63,6 @@ index 6e520fa..f4a9ebb 100644
  
  #  ifdef __UCLIBC_HAS_THREADS__
  /* When using threads, errno is a per-thread value.  */
-diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
-index 9c15618..79eb7e6 100644
 -- 
 1.7.1
 
diff --git a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
index 73351737e2..c4d0d00df9 100644
--- a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
+++ b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
@@ -63,8 +63,6 @@ index 6e520fa..f4a9ebb 100644
  
  #  ifdef __UCLIBC_HAS_THREADS__
  /* When using threads, errno is a per-thread value.  */
-diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
-index 9c15618..79eb7e6 100644
 -- 
 1.7.1
 

From 0ff53f128d865dacfd7a46a5ee9e36c2f28cd89f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 24 Nov 2011 23:03:42 +0100
Subject: [PATCH 1002/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES b/CHANGES
index bb6bae910f..289a6b2631 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+2011.11, Not released yet:
+
+	Fixes all over the tree.
+
+	Toolchain: Fix gdb dependencies for external toolchains,
+	adjust uClibc patches so they don't confuse modern versions of
+	patch, bump crosstool-ng, kernel headers and linux versions.
+
+	Updated/fixed packages: busybox, freetype, mplayer, opencv,
+	rsyslog, xapp_xf86dga
+
 2011.11-rc2, Released November 18th, 2011:
 
 	Fixes all over the tree and new features.

From 9f930d2d7f6ca80d9ccc9a38e631704c1b931f43 Mon Sep 17 00:00:00 2001
From: Damian Kaczmarek <damian@veritymedical.co.uk>
Date: Fri, 21 Oct 2011 00:05:23 +0200
Subject: [PATCH 1003/6849] lsof: fix permission of extracted files

Closes #4369

Default tar permissiong make it impossible to apply patches to some of
the files.

Change extraction command to skip permissions by using "-O" tar option
and a pipe tar chain.

Solution suggested by: Arnout Vandecappelle <arnout@mind.be>

[Peter: rework to use define as suggested by Thomas]
Signed-off-by: Damian Kaczmarek <damian@veritymedical.co.uk>
Tested-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES              | 4 ++++
 package/lsof/lsof.mk | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 289a6b2631..9fbfe9f58f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@
 	Updated/fixed packages: busybox, freetype, mplayer, opencv,
 	rsyslog, xapp_xf86dga
 
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4369: Fix permissions on untared lsof archive
+
 2011.11-rc2, Released November 18th, 2011:
 
 	Fixes all over the tree and new features.
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index ff76f92c6d..c07fb2da36 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -33,13 +33,12 @@ endef
 endif
 
 # The .tar.bz2 contains another .tar, which contains the source code.
-define LSOF_EXTRACT_TAR
-	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -xf $(@D)/lsof_$(LSOF_VERSION)_src.tar -C $(@D)
-	rm -f $(@D)/lsof_$(LSOF_VERSION)_src.tar
+define LSOF_EXTRACT_CMDS
+        $(INFLATE.bz2) $(DL_DIR)/$(LSOF_SOURCE) | \
+                $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \
+        $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -
 endef
 
-LSOF_POST_EXTRACT_HOOKS += LSOF_EXTRACT_TAR
-
 define LSOF_CONFIGURE_CMDS
 	(cd $(@D) ; \
 		echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" \

From 7948b0c621adab123f7585a32c0cf6810f83ca91 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Nov 2011 11:48:30 -0300
Subject: [PATCH 1004/6849] thttpd: fix build breakage with eglibc/glibc

Fix getline() function conflict with glibc/eglibc by renaming it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/thttpd/thttpd-2.25b-getline.patch | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/thttpd/thttpd-2.25b-getline.patch

diff --git a/package/thttpd/thttpd-2.25b-getline.patch b/package/thttpd/thttpd-2.25b-getline.patch
new file mode 100644
index 0000000000..35c366aef1
--- /dev/null
+++ b/package/thttpd/thttpd-2.25b-getline.patch
@@ -0,0 +1,26 @@
+Fix glibc/eglibc getline() conflicting functions.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
+--- thttpd-2.25b.orig/extras/htpasswd.c	2001-12-18 21:08:08.000000000 -0300
++++ thttpd-2.25b/extras/htpasswd.c	2011-11-25 11:42:47.198582812 -0300
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int get_line(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(get_line(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;

From 30ed378a978e322e5b0243409c84b550f945f13a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Nov 2011 12:49:04 -0300
Subject: [PATCH 1005/6849] php: fix build breakage

The zip extension requires zlib, so select it.

[Peter: Only select zlib, not php zlib extension]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/Config.ext | 1 +
 package/php/php.mk     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 4f1614e1d2..bd630eeb60 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -125,6 +125,7 @@ config BR2_PACKAGE_PHP_EXT_SYSVSHM
 
 config BR2_PACKAGE_PHP_EXT_ZIP
 	bool "zip"
+	select BR2_PACKAGE_ZLIB
 	help
 	  Zip read/write support
 
diff --git a/package/php/php.mk b/package/php/php.mk
index a1dde5172e..7f848b178c 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -70,7 +70,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
 	PHP_CONF_OPT += --enable-simplexml
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
+ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
 	PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += zlib
 endif

From fc11bb0ab4db4c44f50b8985b5d1a6f7ca7f5b84 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Nov 2011 08:35:11 -0300
Subject: [PATCH 1006/6849] ruby: fix build breakage

Fix build breakage regarding invalid file format of
/usr/lib/libpthread.so
This is because ruby has rpath enabled by default and was throwing in
the runtime paths and pulling in host libraries into the mix.
So disable rpath.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 34953336fd..a34a2512ab 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -10,7 +10,7 @@ RUBY_AUTORECONF = YES
 HOST_RUBY_AUTORECONF = YES
 RUBY_DEPENDENCIES = host-ruby
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
-RUBY_CONF_OPT = --disable-install-doc
+RUBY_CONF_OPT = --disable-install-doc --disable-rpath
 
 HOST_RUBY_CONF_OPT = --disable-install-doc
 

From 150124b9525c5db8f1f70e092ac6b00a7fb7e898 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Nov 2011 08:35:12 -0300
Subject: [PATCH 1007/6849] ruby: fix host build breakage

When building host-ruby with ncurses enabled on an x86_64 host we get a
"relocation R_X86_64_32 against `_nc_globals' can not be used when making
a shared object; recompile with -fPIC" error when building.
Just disable ncurses and readline support for the host version - we
don't need it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index a34a2512ab..ad791f8f4e 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -11,8 +11,7 @@ HOST_RUBY_AUTORECONF = YES
 RUBY_DEPENDENCIES = host-ruby
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
-
-HOST_RUBY_CONF_OPT = --disable-install-doc
+HOST_RUBY_CONF_OPT = --disable-install-doc --without-ncurses --without-readline
 
 # Force optionals to build before we do
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)

From 1d7299194c7107fa295c4fdbc6aef96324700aa5 Mon Sep 17 00:00:00 2001
From: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Date: Wed, 23 Nov 2011 18:36:48 +0000
Subject: [PATCH 1008/6849] htop: Bump version to 1.0

htop 1.0 was released 11-2011.  Bumping version in BuildRoot
from 0.9 to 1.0.

[Peter: Don't use old-style AUTOTARGETS]
Signed-off-by:  Andy Kennedy <Andy.Kennedy@Adtran.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/htop/htop.mk    |  3 +-
 package/htop/htop.patch | 88 +++++++++--------------------------------
 2 files changed, 21 insertions(+), 70 deletions(-)

diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 5a8eb0d674..07b750c59b 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 
-HTOP_VERSION = 0.9
+HTOP_VERSION = 1.0
 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.gz
 HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERSION)
 HTOP_DEPENDENCIES = ncurses
 HTOP_AUTORECONF = YES
+HTOP_CONF_OPT += --disable-unicode
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/htop/htop.patch b/package/htop/htop.patch
index 776561468f..bf68e53ed1 100644
--- a/package/htop/htop.patch
+++ b/package/htop/htop.patch
@@ -1,75 +1,25 @@
-# This patch removes the hard dependency on backtrace by checking for
-# it at compile time and adds a cross-compile /proc check.
-# Patch given to me by Hisham <hisham.hm@gmail.com> (htop-general)
-#
-# This patch is taken from upstream svn (r213, r215)
+# This patch removes the check for native_affinity for cross compiling.
+# This patch has been pushed to htop on 23 November 2011, however, is
+# not in the 1.0 release and may not be exactly what Hisham puts into
+# the official build.
 #
 # Signed-off-by: Andy Kennedy <Andy.Kennedy@adtran.com>
-diff -Naur a/CRT.c b/CRT.c
---- a/CRT.c    2010-11-23 09:56:32.000000000 -0600
-+++ b/CRT.c    2011-03-21 17:08:21.000000000 -0500
-@@ -11,7 +11,9 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include "String.h"
-
-@@ -125,12 +127,14 @@
-    CRT_done();
-    #if __linux
-    fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n");
--   #else
--   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
--   #endif
-+   #ifdef HAVE_EXECINFO_H
-    size_t size = backtrace(backtraceArray, sizeof(backtraceArray));
-    fprintf(stderr, "Backtrace: \n");
-    backtrace_symbols_fd(backtraceArray, size, 2);
-+   #endif
-+   #else
-+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
-+   #endif
-    abort();
- }
-
-diff -Naur a/CRT.h b/CRT.h
---- a/CRT.h    2010-11-23 09:56:32.000000000 -0600
-+++ b/CRT.h    2011-03-21 17:06:16.000000000 -0500
-@@ -14,7 +14,9 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include "String.h"
-
 diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac    2010-11-23 09:56:32.000000000 -0600
-+++ b/configure.ac    2011-03-21 17:06:16.000000000 -0500
-@@ -25,6 +25,7 @@
- AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
-   missing_headers="$missing_headers $ac_header"
- ])
-+AC_CHECK_HEADERS([execinfo.h],[:],[:])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
-@@ -99,10 +100,10 @@
-   AC_MSG_ERROR([missing headers: $missing_headers])
- fi
-
--
--
-+if test "$cross_compiling" = "no"; then
+--- a/configure.ac     2011-11-20 20:46:48.000000000 -0600
++++ b/configure.ac     2011-11-23 10:41:44.000000000 -0600
+@@ -111,7 +111,6 @@
+ if test "$cross_compiling" = "no"; then
  AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
  AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
+-fi
+ 
+ AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes")
+ if test "x$enable_native_affinity" = xyes; then
+@@ -130,6 +129,7 @@
+       AC_MSG_RESULT([yes])],
+      [AC_MSG_RESULT([no])])
+ fi
 +fi
-
- AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes")
- PLPA_INCLUDED
+ 
+ AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support for CPU affinity])],, enable_hwloc="no")
+ if test "x$enable_hwloc" = xyes

From 6d985f97c87a963674c6d9230b5fc6fe9982ff87 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 26 Nov 2011 21:51:42 +0100
Subject: [PATCH 1009/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 9fbfe9f58f..b8bb451af6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
 	patch, bump crosstool-ng, kernel headers and linux versions.
 
 	Updated/fixed packages: busybox, freetype, mplayer, opencv,
-	rsyslog, xapp_xf86dga
+	php, rsyslog, ruby, thttpd, xapp_xf86dga
 
 	Issues resolved (http://bugs.uclibc.org):
 

From ec02a34b0aaa06b61e26ec284370dea9896805f1 Mon Sep 17 00:00:00 2001
From: Danomi Mocelopolis <d_mo1234@yahoo.com>
Date: Sat, 26 Nov 2011 21:56:25 +0100
Subject: [PATCH 1010/6849] Prevent patch commands from accessing source
 control

Closes #4357

Add -g0 option to patch to ensure it doesn't try to access source control.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                          | 1 +
 boot/grub/grub.mk                | 2 +-
 support/scripts/apply-patches.sh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b8bb451af6..3173fe6ddd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#4357: Prevent patch commands from accessing source control
 	#4369: Fix permissions on untared lsof archive
 
 2011.11-rc2, Released November 18th, 2011:
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index fbff867112..1b5ca0dd21 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -41,7 +41,7 @@ GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
 define GRUB_DEBIAN_PATCHES
 	# Apply the patches from the Debian patch
 	(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \
-		cat debian/patches/$$f | patch -p1 ; \
+		cat debian/patches/$$f | patch -g0 -p1 ; \
 	done)
 endef
 
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 76cb9f7533..1aef47ebf7 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -21,7 +21,7 @@ if [ ! -d "${patchdir}" ] ; then
 fi
     
 for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do 
-    apply="patch -p1 -E -d"
+    apply="patch -g0 -p1 -E -d"
     uncomp_parm=""
     if [ -d "${patchdir}/$i" ] ; then
 	type="directory overlay"

From 4dc18dc51495079c15c81877ec862ab54992b691 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 26 Nov 2011 22:04:24 +0100
Subject: [PATCH 1011/6849] Update for 2011.11-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3173fe6ddd..744b6f3877 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2011.11, Not released yet:
+2011.11-rc3, Released November 26th, 2011:
 
 	Fixes all over the tree.
 
diff --git a/Makefile b/Makefile
index 052fc3dc6f..e70813fdf8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.11-rc2
+export BR2_VERSION:=2011.11-rc3
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index 0ef382acd2..d227667d67 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2011.08.tar.bz2">buildroot-2011.08.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2011.11-rc2</b>, which can be
+The latest release candidate is <b>2011.11-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.11-rc2.tar.gz">buildroot-2011.11-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2011.11-rc3.tar.gz">buildroot-2011.11-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.11-rc2.tar.bz2">buildroot-2011.11-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.11-rc3.tar.bz2">buildroot-2011.11-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index cde1c84e0a..e02029afcf 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>26 November 2011 -- 2011.11-rc3 released</b>
+
+    <p>RC3 is out with more bugfixes - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.11_rc3">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.11-rc3.tar.bz2">2011.11-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>18 November 2011 -- 2011.11-rc2 released</b>
 
     <p>Another week, another release candidate with a bunch of

From e4c61e5ea4b09bf112c94b86cde78784476c4014 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 27 Nov 2011 22:16:40 +0100
Subject: [PATCH 1012/6849] ruby: really disable ncurses/readline for host

Commit 150124b (ruby: fix host build breakage) tried to fix host-ruby
build failures by disabling ncurses/readline extensions, but the
ruby configure script doesn't understand --without-ncurses /
--without-readline arguments, so the commit didn't do anything.

Fix it by really disabling them using the --with-out-ext argument.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index ad791f8f4e..d99fd1ee5a 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -11,7 +11,7 @@ HOST_RUBY_AUTORECONF = YES
 RUBY_DEPENDENCIES = host-ruby
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
-HOST_RUBY_CONF_OPT = --disable-install-doc --without-ncurses --without-readline
+HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
 
 # Force optionals to build before we do
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)

From c61788f097670acd7643288c21fb86c2cc34d28a Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 19 Oct 2011 09:25:40 +0200
Subject: [PATCH 1013/6849] GENTARGETS: add support for scp://

This patch adds support for scp:// both for use in the package Makefiles, as for
the BR2_PRIMARY_SITE variable.

This patch was based on the work of Richard Guy Briggs
(see https://bugs.busybox.net/show_bug.cgi?id=3343).

[Peter: small whitespace fixes]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                   | 13 ++++++++-
 package/Makefile.package.in | 55 +++++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/Config.in b/Config.in
index 0cf4d497ce..280ff03293 100644
--- a/Config.in
+++ b/Config.in
@@ -36,6 +36,14 @@ config BR2_LOCALFILES
 	string "Local files retrieval command"
 	default "cp"
 
+config BR2_SCP
+	string "Secure copy (scp) command"
+	default "scp"
+
+config BR2_SSH
+	string "Secure shell (ssh) command"
+	default "ssh"
+
 config BR2_ZCAT
 	string "zcat command"
 	default "gzip -d -c"
@@ -102,7 +110,10 @@ config BR2_PRIMARY_SITE
 	  Primary site to download from. If this option is set then buildroot
 	  will try to download package source first from this site and try the
 	  default if the file is not found.
-	  NOTE: This only works for packages using the Makefile.autotools.in
+	  Valid URIs are URIs recognized by $(WGET) and scp URIs of the form
+	  scp://[user@]host:path.
+	  NOTE: This works for all packages using the central package
+	  infrastructure (generic, autotools, cmake, ...)
 
 config BR2_BACKUP_SITE
 	string "Backup download site"
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index b5ef57bb19..7eddf171c8 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -92,6 +92,8 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN:=$(call qstrip,$(BR2_SVN))
 BZR:=$(call qstrip,$(BR2_BZR))
 GIT:=$(call qstrip,$(BR2_GIT))
+SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
+SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
 LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
 
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
@@ -104,20 +106,39 @@ ifeq ($(DL_DIR),)
 DL_DIR:=$(TOPDIR)/dl
 endif
 
+#
+# URI scheme helper functions
+# Example URIs:
+# * http://www.example.com/dir/file
+# * scp://www.example.com:dir/file (with domainseparator :)
+#
+# geturischeme: http
+geturischeme=$(firstword $(subst ://, ,$(call qstrip,$(1))))
+# stripurischeme: www.example.com/dir/file
+stripurischeme=$(lastword $(subst ://, ,$(call qstrip,$(1))))
+# domain: www.example.com
+domain=$(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1))))
+# notdomain: dir/file
+notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1)))
+#
+# default domainseparator is /, specify alternative value as first argument
+domainseparator=$(if $(1),$(1),/)
+
 ################################################################################
 # The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a
 # working copy of the source repository for their corresponding SCM,
 # checking out the requested version / commit / tag, and create an
-# archive out of it. DOWNLOAD_WGET is the normal wget-based download
+# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with
+# ssh authentication. DOWNLOAD_WGET is the normal wget-based download
 # mechanism.
 #
-# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES} helpers are in charge of simply
-# checking that the source is available for download. This can be used
+# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers are in charge of
+# simply checking that the source is available for download. This can be used
 # to make sure one will be able to get all the sources needed for
 # one's build configuration.
 #
-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES} helpers simply output to
-# the console the names of the files that will be downloaded, or path
+# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers simply output
+# to the console the names of the files that will be downloaded, or path
 # and revision of the source repositories, producing a list of all the
 # "external dependencies" of a given build configuration.
 ################################################################################
@@ -176,6 +197,22 @@ define SHOW_EXTERNAL_DEPS_SVN
   echo $($(PKG)_SOURCE)
 endef
 
+# SCP URIs should be of the form scp://[user@]host:filepath
+# Note that filepath is relative to the user's home directory, so you may want
+# to prepend the path with a slash: scp://[user@]host:/absolutepath
+define DOWNLOAD_SCP
+	test -e $(DL_DIR)/$(2) || \
+	$(SCP) $(call stripurischeme,$(call qstrip,$(1)))/$(2) $(DL_DIR)
+endef
+
+define SOURCE_CHECK_SCP
+	$(SSH) $(call domain,$(1),:) ls $(call notdomain,$(1)/$(2),:) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_SCP
+	echo $(2)
+endef
+
 
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
@@ -218,7 +255,10 @@ endef
 
 define DOWNLOAD
 	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
-		$(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ; \
+		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
+			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+		esac ; \
 	fi ; \
 	if test -n "$(1)" ; then \
 		case "$($(PKG)_SITE_METHOD)" in \
@@ -226,6 +266,7 @@ define DOWNLOAD
 			svn) $($(DL_MODE)_SVN) && exit ;; \
 			bzr) $($(DL_MODE)_BZR) && exit ;; \
 			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
+			scp) $($(DL_MODE)_SCP) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 		esac ; \
 	fi ; \
@@ -655,6 +696,8 @@ else ifeq ($$($(2)_SITE_METHOD),git)
 DL_TOOLS_DEPENDENCIES += git
 else ifeq ($$($(2)_SITE_METHOD),bzr)
 DL_TOOLS_DEPENDENCIES += bzr
+else ifeq ($$($(2)_SITE_METHOD),scp)
+DL_TOOLS_DEPENDENCIES += scp ssh
 endif # SITE_METHOD
 
 endif # $(2)_KCONFIG_VAR

From f694c0761d15901b74e972b08938fecfda3b510b Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 19 Oct 2011 09:25:47 +0200
Subject: [PATCH 1014/6849] Add support for packages stored in Mercurial (hg)
 repositories

Add support for packages stored in Mercurial (hg) repositories.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                   |  4 ++++
 package/Makefile.package.in | 33 +++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Config.in b/Config.in
index 280ff03293..ab77ef3489 100644
--- a/Config.in
+++ b/Config.in
@@ -44,6 +44,10 @@ config BR2_SSH
 	string "Secure shell (ssh) command"
 	default "ssh"
 
+config BR2_HG
+	string "Mercurial (hg) command"
+	default "hg"
+
 config BR2_ZCAT
 	string "zcat command"
 	default "gzip -d -c"
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 7eddf171c8..8985d5a9fc 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -92,6 +92,7 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN:=$(call qstrip,$(BR2_SVN))
 BZR:=$(call qstrip,$(BR2_BZR))
 GIT:=$(call qstrip,$(BR2_GIT))
+HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
 SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
 SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
 LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
@@ -125,20 +126,20 @@ notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(c
 domainseparator=$(if $(1),$(1),/)
 
 ################################################################################
-# The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a
+# The DOWNLOAD_{GIT,SVN,BZR,HG,LOCALFILES} helpers are in charge of getting a
 # working copy of the source repository for their corresponding SCM,
 # checking out the requested version / commit / tag, and create an
 # archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with
 # ssh authentication. DOWNLOAD_WGET is the normal wget-based download
 # mechanism.
 #
-# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers are in charge of
+# The SOURCE_CHECK_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers are in charge of
 # simply checking that the source is available for download. This can be used
 # to make sure one will be able to get all the sources needed for
 # one's build configuration.
 #
-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers simply output
-# to the console the names of the files that will be downloaded, or path
+# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers simply
+# output to the console the names of the files that will be downloaded, or path
 # and revision of the source repositories, producing a list of all the
 # "external dependencies" of a given build configuration.
 ################################################################################
@@ -214,6 +215,27 @@ define SHOW_EXTERNAL_DEPS_SCP
 endef
 
 
+define DOWNLOAD_HG
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+	(pushd $(DL_DIR) > /dev/null && \
+	$(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
+	$(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \
+	              --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \
+	rm -rf $($(PKG)_DL_DIR) && \
+	popd > /dev/null)
+endef
+
+# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
+# repository
+define SOURCE_CHECK_HG
+  $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_HG
+  echo $($(PKG)_SOURCE)
+endef
+
+
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
 	$(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2)
@@ -267,6 +289,7 @@ define DOWNLOAD
 			bzr) $($(DL_MODE)_BZR) && exit ;; \
 			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
 			scp) $($(DL_MODE)_SCP) && exit ;; \
+			hg) $($(DL_MODE)_HG) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 		esac ; \
 	fi ; \
@@ -698,6 +721,8 @@ else ifeq ($$($(2)_SITE_METHOD),bzr)
 DL_TOOLS_DEPENDENCIES += bzr
 else ifeq ($$($(2)_SITE_METHOD),scp)
 DL_TOOLS_DEPENDENCIES += scp ssh
+else ifeq ($$($(2)_SITE_METHOD),hg)
+DL_TOOLS_DEPENDENCIES += hg
 endif # SITE_METHOD
 
 endif # $(2)_KCONFIG_VAR

From c71833418e5bff75c95e99aec1758580257e97f7 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Sun, 27 Nov 2011 20:14:45 +0100
Subject: [PATCH 1015/6849] kernel-headers: update to 3.1.3 and 3.0.11

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.10-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.11-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index b94d4c02ea..497a0585a8 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.10"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.2"		if BR2_KERNEL_HEADERS_3_1
+	default "3.0.11"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.3"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.10-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.11-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.10-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.11-headers_install-fix-__packed-in-exported-kernel-head.patch

From c6932d21480dfd0b7e0afbcb1f1ae05b52de8189 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Sun, 27 Nov 2011 20:14:46 +0100
Subject: [PATCH 1016/6849] linux: update stable kernel to 3.1.3

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 591ab3d419..2ceaef0dc7 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_1
 
 config BR2_LINUX_KERNEL_3_1
-	bool "3.1.2"
+	bool "3.1.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1.2"
+	default "3.1.3"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1.2" if BR2_LINUX_KERNEL_3_1
+	default "3.1.3" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From effecb4a014d1809293b9b61f1cc2a61f2512e78 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 Nov 2011 09:16:48 +0100
Subject: [PATCH 1017/6849] kernel-headers: bump 3.0.x / 3.1.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.11-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.12-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 497a0585a8..9e72b00d2a 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.11"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.3"		if BR2_KERNEL_HEADERS_3_1
+	default "3.0.12"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.4"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.11-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.12-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.11-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.12-headers_install-fix-__packed-in-exported-kernel-head.patch

From 47c46ea1fc4a4c18be830f9092a8b9d8b3feda38 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 Nov 2011 09:18:30 +0100
Subject: [PATCH 1018/6849] linux: update stable kernel to 3.1.4

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 2ceaef0dc7..dc6aa733a5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_1
 
 config BR2_LINUX_KERNEL_3_1
-	bool "3.1.3"
+	bool "3.1.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1.3"
+	default "3.1.4"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1.3" if BR2_LINUX_KERNEL_3_1
+	default "3.1.4" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e3c6b3853ef054efe3ab9800392aec7aa7656dd3 Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Tue, 29 Nov 2011 18:19:46 +0100
Subject: [PATCH 1019/6849] libroxml: bump version to 2.1.2

Fix some xpath bugs

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...{libroxml-2.1.1-werror.patch => libroxml-2.1.2-werror.patch} | 0
 package/libroxml/libroxml.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/libroxml/{libroxml-2.1.1-werror.patch => libroxml-2.1.2-werror.patch} (100%)

diff --git a/package/libroxml/libroxml-2.1.1-werror.patch b/package/libroxml/libroxml-2.1.2-werror.patch
similarity index 100%
rename from package/libroxml/libroxml-2.1.1-werror.patch
rename to package/libroxml/libroxml-2.1.2-werror.patch
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index f494348935..5c0bf011d1 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
 # libroxml
 #
 
-LIBROXML_VERSION = 2.1.1
+LIBROXML_VERSION = 2.1.2
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 

From c29253ef2e2a473e597637b7ada9fb268dfa8767 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 1 Dec 2011 00:08:44 +0100
Subject: [PATCH 1020/6849] Update for 2011.11

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  8 ++++++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  8 ++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 744b6f3877..e5311f0576 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+2011.11, Released November 30th, 2011:
+
+	Fixes all over the tree.
+
+	Bump kernel headers / default Linux version to 3.1.4.
+
+	Updated/fixed packages: ruby
+
 2011.11-rc3, Released November 26th, 2011:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index e70813fdf8..0d6714319f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2011.11-rc3
+export BR2_VERSION:=2011.11
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index d227667d67..4a52fb7dbf 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2011.08</b>, which can be downloaded
+The latest stable release is <b>2011.11</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2011.08.tar.gz">buildroot-2011.08.tar.gz</a>
+<a href="/downloads/buildroot-2011.11.tar.gz">buildroot-2011.11.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.08.tar.bz2">buildroot-2011.08.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.11.tar.bz2">buildroot-2011.11.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2011.11-rc3</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.11-rc3.tar.bz2">buildroot-2011.11-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index e02029afcf..2e54a9e94f 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,14 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>30 November 2011 -- 2011.11 released</b>
+
+    <p>The stable 2011.11 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.11">CHANGES</a>
+    file for more details, and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2011.11.tar.bz2">2011.11 release</a>.</p>
+
   <li><b>26 November 2011 -- 2011.11-rc3 released</b>
 
     <p>RC3 is out with more bugfixes - See the <a

From 0239612fb2af681984af222c9a84bf06ce9b77ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 1 Dec 2011 12:04:57 -0300
Subject: [PATCH 1021/6849] u-boot: add version 2011.09

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 506f35405c..dd49a2c230 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2011_06
+	default BR2_TARGET_UBOOT_2011_09
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2011_09
+	bool "2011.09"
+
 config BR2_TARGET_UBOOT_2011_06
 	bool "2011.06"
 
@@ -48,6 +51,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
 	default "2011.03"	if BR2_TARGET_UBOOT_2011_03
 	default "2010.12"	if BR2_TARGET_UBOOT_2010_12

From a03182ad020e01744f783a8668c29cc6e8008122 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 1 Dec 2011 12:04:58 -0300
Subject: [PATCH 1022/6849] u-boot: add support for u-boot-nand.bin

Add support for the u-boot-nand.bin target file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 3 +++
 boot/uboot/uboot.mk  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index dd49a2c230..f154bd1233 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -85,6 +85,9 @@ choice
 config BR2_TARGET_UBOOT_FORMAT_BIN
 	bool "u-boot.bin"
 
+config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
+	bool "u-boot-nand.bin"
+
 config BR2_TARGET_UBOOT_FORMAT_KWB
 	depends on BR2_arm
 	bool "u-boot.kwb (Marvell)"
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index cf22312113..db9de8d3cd 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -27,6 +27,8 @@ UBOOT_BIN          = u-boot.kwb
 UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
+UBOOT_BIN          = u-boot-nand.bin
 else
 UBOOT_BIN          = u-boot.bin
 endif

From 657d3155d5e54e8f650a7b00d83c128895514462 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 1 Dec 2011 23:09:52 +0100
Subject: [PATCH 1023/6849] news.html: add 2011.11 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 2e54a9e94f..345dc0ecfa 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,9 @@ <h3>News</h3>
     <p>The stable 2011.11 release is out - Thanks to everyone
     contributing and testing the release candidates. See the
     <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.11">CHANGES</a>
-    file for more details, and go to the <a href="/downloads/">downloads page</a> to pick up the
+    file for more details, read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2011-November/047926.html">announcement</a>
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2011.11.tar.bz2">2011.11 release</a>.</p>
 
   <li><b>26 November 2011 -- 2011.11-rc3 released</b>

From 2dda9ea0d31d30c990a2cb76b764e80c4ed06ca3 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Thu, 1 Dec 2011 18:02:37 +0100
Subject: [PATCH 1024/6849] dbus-glib: bump to version 0.98

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus-glib/dbus-glib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 8717f63c4f..397996e309 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -3,7 +3,7 @@
 # dbus-glib
 #
 #############################################################
-DBUS_GLIB_VERSION = 0.94
+DBUS_GLIB_VERSION = 0.98
 DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib/
 DBUS_GLIB_INSTALL_STAGING = YES

From 2c6390a5d0c01420879e9f23bc89afb19976da4a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Dec 2011 20:23:04 +0100
Subject: [PATCH 1025/6849] dependencies: check for extract tools as well

Most of the extract tools (gzip/bzip/..) we already check for explicitly
in dependencies.sh (as they are used outside GENTARGETS), but not for
xzcat.
The .xz format is used fairly rarely, and it is likely to not be available
on build hosts, so an explicit (hardcoded) check for it isn't optimal.
Instead, add the inflate tools used to DL_TOOLS_DEPENDENCIES, similar to
how we do it for svn/git/bzr/...

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in            | 2 ++
 toolchain/dependencies/dependencies.mk | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 2349b05af8..e85eb15490 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -726,6 +726,8 @@ else ifeq ($$($(2)_SITE_METHOD),hg)
 DL_TOOLS_DEPENDENCIES += hg
 endif # SITE_METHOD
 
+DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE))))
+
 endif # $(2)_KCONFIG_VAR
 endef # GENTARGETS_INNER
 
diff --git a/toolchain/dependencies/dependencies.mk b/toolchain/dependencies/dependencies.mk
index 24d66663bb..ea8bf252bd 100644
--- a/toolchain/dependencies/dependencies.mk
+++ b/toolchain/dependencies/dependencies.mk
@@ -10,16 +10,10 @@ ifeq ($(BR2_STRIP_sstrip),y)
 DEPENDENCIES_HOST_PREREQ+=host-sstrip
 endif
 
-# Remove duplicate entries from $(DL_TOOLS_DEPENDENCIES)
-DL_TOOLS = \
-	$(findstring svn,$(DL_TOOLS_DEPENDENCIES)) \
-	$(findstring git,$(DL_TOOLS_DEPENDENCIES)) \
-	$(findstring bzr,$(DL_TOOLS_DEPENDENCIES))
-
 core-dependencies:
 	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
 		CONFIG_FILE="$(CONFIG_DIR)/.config" \
-		DL_TOOLS="$(DL_TOOLS)" \
+		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
 		$(TOPDIR)/toolchain/dependencies/dependencies.sh
 
 dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)

From 2077f955ef64b48c3832e0be31a18aaf04d786da Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Dec 2011 21:39:02 +0100
Subject: [PATCH 1026/6849] bison: fix m4 dependency

Bison needs m4 (at runtime). In addition, the bison 2.5 configure script
checks for m4 4.1.6 or newer, and bails out otherwise, but ends up looking
at whatever the build host has rather than the cross version, which might
not be the correct version (or even available).

Fix it by short circuiting the check.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/Config.in | 1 +
 package/bison/bison.mk  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/package/bison/Config.in b/package/bison/Config.in
index e8aa0b60f0..da0ac3f1ef 100644
--- a/package/bison/Config.in
+++ b/package/bison/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BISON
 	bool "bison"
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_M4
 	help
 	  General-purpose parser generator that converts a
 	  grammar description for an LALR context-free grammar into a C
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 759592e166..c277e96ad0 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -7,11 +7,16 @@
 BISON_VERSION = 2.5
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 
+BISON_CONF_ENV += ac_cv_path_M4=/usr/bin/m4
+BISON_DEPENDENCIES += m4
+
 define BISON_DISABLE_EXAMPLES
 	echo 'all install:' > $(@D)/examples/Makefile
 endef
 
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
+HOST_BISON_DEPENDENCIES += host-m4
+
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 72958d1e4cddfc349527f9c9479f174b08ae7203 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Nov 2011 08:10:59 -0300
Subject: [PATCH 1027/6849] nbd: bump to version 2.9.24

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 69a55ae68d..d9d0a8546c 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-NBD_VERSION = 2.9.15
+NBD_VERSION = 2.9.24
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
-NBD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/
+NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
 NBD_DEPENDENCIES = libglib2
 

From 4c730a2c16d64f628079952a4218d6de476cad67 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Nov 2011 08:11:00 -0300
Subject: [PATCH 1028/6849] binutils: remove deprecated versions

Remove already deprecated binutils version 2.18, 2.19 and 2.19.1.
Keep 2.18-avr32.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host               | 18 --------
 .../binutils-2.18/100-makeinfo-version.patch  | 32 --------------
 .../binutils-2.18/110-arm-eabi-conf.patch     | 24 -----------
 .../300-001_ld_makefile_patch.patch           | 24 -----------
 .../300-012_check_ldrunpath_length.patch      | 21 ----------
 .../binutils-2.19.1/110-arm-eabi-conf.patch   | 24 -----------
 .../binutils-2.19.1/120-sh-conf.patch         | 42 -------------------
 .../300-001_ld_makefile_patch.patch           | 24 -----------
 .../300-012_check_ldrunpath_length.patch      | 21 ----------
 .../binutils-2.19/110-arm-eabi-conf.patch     | 24 -----------
 .../binutils/binutils-2.19/120-sh-conf.patch  | 42 -------------------
 .../300-001_ld_makefile_patch.patch           | 24 -----------
 .../300-012_check_ldrunpath_length.patch      | 21 ----------
 13 files changed, 341 deletions(-)
 delete mode 100644 package/binutils/binutils-2.18/100-makeinfo-version.patch
 delete mode 100644 package/binutils/binutils-2.18/110-arm-eabi-conf.patch
 delete mode 100644 package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch
 delete mode 100644 package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch
 delete mode 100644 package/binutils/binutils-2.19.1/110-arm-eabi-conf.patch
 delete mode 100644 package/binutils/binutils-2.19.1/120-sh-conf.patch
 delete mode 100644 package/binutils/binutils-2.19.1/300-001_ld_makefile_patch.patch
 delete mode 100644 package/binutils/binutils-2.19.1/300-012_check_ldrunpath_length.patch
 delete mode 100644 package/binutils/binutils-2.19/110-arm-eabi-conf.patch
 delete mode 100644 package/binutils/binutils-2.19/120-sh-conf.patch
 delete mode 100644 package/binutils/binutils-2.19/300-001_ld_makefile_patch.patch
 delete mode 100644 package/binutils/binutils-2.19/300-012_check_ldrunpath_length.patch

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index f87298a756..756bc5899b 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -8,25 +8,10 @@ choice
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_18
-		depends on !BR2_avr32
-		depends on BR2_DEPRECATED
-		bool "binutils 2.18"
-
 	config BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
 	       depends on BR2_avr32
 	       bool "binutils 2.18-avr32-1.0.1"
 
-	config BR2_BINUTILS_VERSION_2_19
-		depends on !BR2_avr32
-		depends on BR2_DEPRECATED
-		bool "binutils 2.19"
-
-	config BR2_BINUTILS_VERSION_2_19_1
-		depends on !BR2_avr32
-		depends on BR2_DEPRECATED
-		bool "binutils 2.19.1"
-
 	config BR2_BINUTILS_VERSION_2_20
 		depends on !BR2_avr32
 		bool "binutils 2.20"
@@ -47,10 +32,7 @@ endchoice
 
 config BR2_BINUTILS_VERSION
 	string
-	default "2.18"		if BR2_BINUTILS_VERSION_2_18
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "2.19"		if BR2_BINUTILS_VERSION_2_19
-	default "2.19.1"	if BR2_BINUTILS_VERSION_2_19_1
 	default "2.20"		if BR2_BINUTILS_VERSION_2_20
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
diff --git a/package/binutils/binutils-2.18/100-makeinfo-version.patch b/package/binutils/binutils-2.18/100-makeinfo-version.patch
deleted file mode 100644
index d911d6236e..0000000000
--- a/package/binutils/binutils-2.18/100-makeinfo-version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u binutils-2.18-orig/configure binutils-2.18/configure
---- binutils-2.18-orig/configure	2007-08-06 16:29:40.000000000 -0400
-+++ binutils-2.18/configure	2007-09-27 22:41:51.000000000 -0400
-@@ -6125,10 +6125,10 @@
-   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-   *)
- 
--    # For an installed makeinfo, we require it to be from texinfo 4.4 or
-+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac
---- binutils-2.18-orig/configure.ac	2007-08-28 16:24:26.000000000 -0400
-+++ binutils-2.18/configure.ac	2007-09-27 22:41:00.000000000 -0400
-@@ -2400,10 +2400,10 @@
-   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-   *)
- changequote(,)
--    # For an installed makeinfo, we require it to be from texinfo 4.4 or
-+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
diff --git a/package/binutils/binutils-2.18/110-arm-eabi-conf.patch b/package/binutils/binutils-2.18/110-arm-eabi-conf.patch
deleted file mode 100644
index 04e19bea39..0000000000
--- a/package/binutils/binutils-2.18/110-arm-eabi-conf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/configure binutils-2.17.50.0.17/configure
---- binutils-2.17.50.0.17.oorig/configure	2007-06-18 19:29:28.000000000 +0200
-+++ binutils-2.17.50.0.17/configure	2007-06-25 09:58:36.000000000 +0200
-@@ -2224,7 +2224,7 @@
-   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-     ;;
-diff -u binutils-2.17.50.0.17.oorig/configure.ac binutils-2.17.50.0.17/configure.ac
---- binutils-2.17.50.0.17.oorig/configure.ac	2007-06-18 19:29:28.000000000 +0200
-+++ binutils-2.17.50.0.17/configure.ac	2007-06-25 09:58:36.000000000 +0200
-@@ -513,7 +513,7 @@
-   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-     ;;
diff --git a/package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 5cb0f614d8..0000000000
--- a/package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 6e809213d8..0000000000
--- a/package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/package/binutils/binutils-2.19.1/110-arm-eabi-conf.patch b/package/binutils/binutils-2.19.1/110-arm-eabi-conf.patch
deleted file mode 100644
index af26329d90..0000000000
--- a/package/binutils/binutils-2.19.1/110-arm-eabi-conf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
diff --git a/package/binutils/binutils-2.19.1/120-sh-conf.patch b/package/binutils/binutils-2.19.1/120-sh-conf.patch
deleted file mode 100644
index 071d15a41b..0000000000
--- a/package/binutils/binutils-2.19.1/120-sh-conf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -rdup binutils-2.18.50.0.9.old/configure binutils-2.18.50.0.9/configure
---- binutils-2.18.50.0.9.old/configure	2008-08-23 17:36:13.000000000 +0200
-+++ binutils-2.18.50.0.9/configure	2008-10-14 14:25:22.000000000 +0200
-@@ -2281,7 +2281,7 @@ case "${target}" in
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -2606,7 +2606,7 @@ case "${target}" in
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[3456789]86-*-vsta) ;; # don't add gprof back in
-       i[3456789]86-*-go32*) ;; # don't add gprof back in
-diff -rdup binutils-2.18.50.0.9.old/configure.ac binutils-2.18.50.0.9/configure.ac
---- binutils-2.18.50.0.9.old/configure.ac	2008-08-23 17:36:13.000000000 +0200
-+++ binutils-2.18.50.0.9/configure.ac	2008-10-14 14:25:11.000000000 +0200
-@@ -530,7 +530,7 @@ case "${target}" in
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;    
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -855,7 +855,7 @@ case "${target}" in
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[[3456789]]86-*-vsta) ;; # don't add gprof back in
-       i[[3456789]]86-*-go32*) ;; # don't add gprof back in
diff --git a/package/binutils/binutils-2.19.1/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.19.1/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 5cb0f614d8..0000000000
--- a/package/binutils/binutils-2.19.1/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.19.1/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.19.1/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 6e809213d8..0000000000
--- a/package/binutils/binutils-2.19.1/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/package/binutils/binutils-2.19/110-arm-eabi-conf.patch b/package/binutils/binutils-2.19/110-arm-eabi-conf.patch
deleted file mode 100644
index af26329d90..0000000000
--- a/package/binutils/binutils-2.19/110-arm-eabi-conf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
diff --git a/package/binutils/binutils-2.19/120-sh-conf.patch b/package/binutils/binutils-2.19/120-sh-conf.patch
deleted file mode 100644
index 071d15a41b..0000000000
--- a/package/binutils/binutils-2.19/120-sh-conf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -rdup binutils-2.18.50.0.9.old/configure binutils-2.18.50.0.9/configure
---- binutils-2.18.50.0.9.old/configure	2008-08-23 17:36:13.000000000 +0200
-+++ binutils-2.18.50.0.9/configure	2008-10-14 14:25:22.000000000 +0200
-@@ -2281,7 +2281,7 @@ case "${target}" in
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -2606,7 +2606,7 @@ case "${target}" in
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[3456789]86-*-vsta) ;; # don't add gprof back in
-       i[3456789]86-*-go32*) ;; # don't add gprof back in
-diff -rdup binutils-2.18.50.0.9.old/configure.ac binutils-2.18.50.0.9/configure.ac
---- binutils-2.18.50.0.9.old/configure.ac	2008-08-23 17:36:13.000000000 +0200
-+++ binutils-2.18.50.0.9/configure.ac	2008-10-14 14:25:11.000000000 +0200
-@@ -530,7 +530,7 @@ case "${target}" in
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;    
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -855,7 +855,7 @@ case "${target}" in
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[[3456789]]86-*-vsta) ;; # don't add gprof back in
-       i[[3456789]]86-*-go32*) ;; # don't add gprof back in
diff --git a/package/binutils/binutils-2.19/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.19/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 5cb0f614d8..0000000000
--- a/package/binutils/binutils-2.19/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.19/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.19/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 6e809213d8..0000000000
--- a/package/binutils/binutils-2.19/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,

From 2e9f7d6fd5df09e32c3313ee5ec1bf8a595ff5dd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Nov 2011 08:11:01 -0300
Subject: [PATCH 1029/6849] binutils: add version 2.22

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host               |  7 ++++-
 .../binutils/binutils-2.22/120-sh-conf.patch  | 29 +++++++++++++++++++
 .../300-001_ld_makefile_patch.patch           | 24 +++++++++++++++
 .../300-012_check_ldrunpath_length.patch      | 21 ++++++++++++++
 4 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 package/binutils/binutils-2.22/120-sh-conf.patch
 create mode 100644 package/binutils/binutils-2.22/300-001_ld_makefile_patch.patch
 create mode 100644 package/binutils/binutils-2.22/300-012_check_ldrunpath_length.patch

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 756bc5899b..f8295499cf 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -3,7 +3,7 @@ comment "Binutils Options"
 choice
 	prompt "Binutils Version"
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
-	default BR2_BINUTILS_VERSION_2_21_1 if (BR2_UCLIBC_VERSION_0_9_32 || BR2_UCLIBC_VERSION_SNAPSHOT)
+	default BR2_BINUTILS_VERSION_2_22 if (BR2_UCLIBC_VERSION_0_9_32 || BR2_UCLIBC_VERSION_SNAPSHOT)
 	default BR2_BINUTILS_VERSION_2_21
 	help
 	  Select the version of binutils you wish to use.
@@ -28,6 +28,10 @@ choice
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.21.1"
 
+	config BR2_BINUTILS_VERSION_2_22
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
+		bool "binutils 2.22"
+
 endchoice
 
 config BR2_BINUTILS_VERSION
@@ -37,6 +41,7 @@ config BR2_BINUTILS_VERSION
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
+	default "2.22"		if BR2_BINUTILS_VERSION_2_22
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
diff --git a/package/binutils/binutils-2.22/120-sh-conf.patch b/package/binutils/binutils-2.22/120-sh-conf.patch
new file mode 100644
index 0000000000..ea3d1b6068
--- /dev/null
+++ b/package/binutils/binutils-2.22/120-sh-conf.patch
@@ -0,0 +1,29 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+--- a/configure
++++ b/configure
+@@ -1495,7 +1495,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,7 +712,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/package/binutils/binutils-2.22/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.22/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..5cb0f614d8
--- /dev/null
+++ b/package/binutils/binutils-2.22/300-001_ld_makefile_patch.patch
@@ -0,0 +1,24 @@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
+@@ -18,7 +18,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
+@@ -287,7 +287,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.22/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.22/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..df783109bb
--- /dev/null
+++ b/package/binutils/binutils-2.22/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1497,6 +1499,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)

From 7e96cbcc065b0ffdb5171e2701f4e6d7201fa867 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Dec 2011 12:53:04 +0100
Subject: [PATCH 1030/6849] binutils: 2.22 powerpc textrels fix

See http://thread.gmane.org/gmane.comp.embedded.crossdev/106 for details.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../binutils-2.22/999-ppc-textrels.patch      | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 package/binutils/binutils-2.22/999-ppc-textrels.patch

diff --git a/package/binutils/binutils-2.22/999-ppc-textrels.patch b/package/binutils/binutils-2.22/999-ppc-textrels.patch
new file mode 100644
index 0000000000..c1efacf249
--- /dev/null
+++ b/package/binutils/binutils-2.22/999-ppc-textrels.patch
@@ -0,0 +1,80 @@
+http://bugs.gentoo.org/392645
+http://sourceware.org/bugzilla/show_bug.cgi?id=13470
+
+2011-12-03  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13470
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Revert substantive
+	change in 2011-07-01 commit.  Comment.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+
+===================================================================
+RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
+retrieving revision 1.302.2.1
+retrieving revision 1.302.2.2
+diff -u -r1.302.2.1 -r1.302.2.2
+--- src/bfd/elf32-ppc.c	2011/11/15 11:36:52	1.302.2.1
++++ src/bfd/elf32-ppc.c	2011/12/03 00:58:01	1.302.2.2
+@@ -2987,10 +2987,6 @@
+   edir->elf.needs_plt |= eind->elf.needs_plt;
+   edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
+ 
+-  /* If we were called to copy over info for a weak sym, that's all.  */
+-  if (eind->elf.root.type != bfd_link_hash_indirect)
+-    return;
+-
+   if (eind->dyn_relocs != NULL)
+     {
+       if (edir->dyn_relocs != NULL)
+@@ -3022,6 +3018,16 @@
+       eind->dyn_relocs = NULL;
+     }
+ 
++  /* If we were called to copy over info for a weak sym, that's all.
++     You might think dyn_relocs need not be copied over;  After all,
++     both syms will be dynamic or both non-dynamic so we're just
++     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
++     code in ppc_elf_adjust_dynamic_symbol needs to check for
++     dyn_relocs in read-only sections, and it does so on what is the
++     DIR sym here.  */
++  if (eind->elf.root.type != bfd_link_hash_indirect)
++    return;
++
+   /* Copy over the GOT refcount entries that we may have already seen to
+      the symbol which just became indirect.  */
+   edir->elf.got.refcount += eind->elf.got.refcount;
+===================================================================
+RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
+retrieving revision 1.363.2.4
+retrieving revision 1.363.2.5
+diff -u -r1.363.2.4 -r1.363.2.5
+--- src/bfd/elf64-ppc.c	2011/11/08 13:46:36	1.363.2.4
++++ src/bfd/elf64-ppc.c	2011/12/03 00:58:02	1.363.2.5
+@@ -4435,10 +4435,6 @@
+   edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
+   edir->elf.needs_plt |= eind->elf.needs_plt;
+ 
+-  /* If we were called to copy over info for a weak sym, that's all.  */
+-  if (eind->elf.root.type != bfd_link_hash_indirect)
+-    return;
+-
+   /* Copy over any dynamic relocs we may have on the indirect sym.  */
+   if (eind->dyn_relocs != NULL)
+     {
+@@ -4471,6 +4467,16 @@
+       eind->dyn_relocs = NULL;
+     }
+ 
++  /* If we were called to copy over info for a weak sym, that's all.
++     You might think dyn_relocs need not be copied over;  After all,
++     both syms will be dynamic or both non-dynamic so we're just
++     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
++     code in ppc64_elf_adjust_dynamic_symbol needs to check for
++     dyn_relocs in read-only sections, and it does so on what is the
++     DIR sym here.  */
++  if (eind->elf.root.type != bfd_link_hash_indirect)
++    return;
++
+   /* Copy over got entries that we may have already seen to the
+      symbol which just became indirect.  */
+   if (eind->elf.got.glist != NULL)

From a521a0d2e7f0735600e5640be7328f7658ba12ef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Nov 2011 08:11:02 -0300
Subject: [PATCH 1031/6849] ruby: bump to version 1.9.2-p290

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby-configure2.patch     | 26 -------------
 package/ruby/ruby-openssl1.0-fix.patch | 53 --------------------------
 package/ruby/ruby.mk                   |  2 +-
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 package/ruby/ruby-configure2.patch
 delete mode 100644 package/ruby/ruby-openssl1.0-fix.patch

diff --git a/package/ruby/ruby-configure2.patch b/package/ruby/ruby-configure2.patch
deleted file mode 100644
index 405fc41a95..0000000000
--- a/package/ruby/ruby-configure2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ac89b1414c84dbc038f623591c738b0637745415 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Thu, 4 Nov 2010 18:31:38 -0300
-Subject: [PATCH] Fix bad sed in configure.in
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e97216f..a978c97 100644
---- a/configure.in
-+++ b/configure.in
-@@ -152,7 +152,7 @@ AC_MSG_RESULT([$ARCH_FLAG])
- AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
- # RUBY_UNIVERSAL_ARCH begin
- test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
--test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
-+test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
- unset ARCH_FLAG universal_binary universal_archnames
- if test ${target_archs+set}; then
-     AC_MSG_CHECKING([target architectures])
--- 
-1.7.2.2
-
diff --git a/package/ruby/ruby-openssl1.0-fix.patch b/package/ruby/ruby-openssl1.0-fix.patch
deleted file mode 100644
index 5591d998ea..0000000000
--- a/package/ruby/ruby-openssl1.0-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b983e73adf7a7d3fd07fdf493eee51c22881a6e6 Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-Date: Wed, 6 Apr 2011 02:28:09 +0900
-Subject: [PATCH] Add option which enable SSLv2 support
-
-From openssl 1.0, SSLv2 becomes disable by default.
-If you want to use SSLv2 in ruby, you need config with --enable-opensslv2.
-The SSLv2 support is disable by default.
-
-Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
----
- ext/openssl/extconf.rb |    8 ++++++++
- ext/openssl/ossl_ssl.c |    2 ++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-index b1f2d88..89c6f19 100644
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -33,6 +33,14 @@ if with_config("debug") or enable_config("debug")
-   end
- end
- 
-+## 
-+## From openssl 1.0, SSLv2 becomes disable by default.
-+## If you want to use SSLv2 in ruby, you need config with --enable-opensslv2.
-+##
-+if enable_config("opensslv2")
-+  $defs << "-DENABLE_OPENSSLV2"
-+end
-+
- message "=== Checking for system dependent stuff... ===\n"
- have_library("nsl", "t_open")
- have_library("socket", "socket")
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
-index d8951fb..d0c9059 100644
---- a/ext/openssl/ossl_ssl.c
-+++ b/ext/openssl/ossl_ssl.c
-@@ -107,9 +107,11 @@ struct {
-     OSSL_SSL_METHOD_ENTRY(TLSv1),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-+#if defined(ENABLE_OPENSSLV2)
-     OSSL_SSL_METHOD_ENTRY(SSLv2),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
--- 
-1.7.4.1
-
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index d99fd1ee5a..26db93121a 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RUBY_VERSION = 1.9.2-p0
+RUBY_VERSION = 1.9.2-p290
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_AUTORECONF = YES
 HOST_RUBY_AUTORECONF = YES

From 90424fe30b363b0639727cadc1b7cacb3c6089b0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Dec 2011 23:33:19 +0100
Subject: [PATCH 1032/6849] nbd: fix !BR2_LARGEFILE builds

Patch sent upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd-fix-non-lfs.patch | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/nbd/nbd-fix-non-lfs.patch

diff --git a/package/nbd/nbd-fix-non-lfs.patch b/package/nbd/nbd-fix-non-lfs.patch
new file mode 100644
index 0000000000..41a80cdd81
--- /dev/null
+++ b/package/nbd/nbd-fix-non-lfs.patch
@@ -0,0 +1,37 @@
+From 8dd182693e9995bc1aeb907f9fd4ec06c18fc56f Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Dec 2011 23:27:30 +0100
+Subject: [PATCH] lfs.h: fix !LFS builds
+
+Commit 448637fba4 (Fix 32/64 bit confusion) broke !LFS builds as it
+added the PARAM_OFFT defines inside the wrong conditional.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ lfs.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lfs.h b/lfs.h
+index 64a03de..68d3b81 100644
+--- a/lfs.h
++++ b/lfs.h
+@@ -6,14 +6,14 @@
+ #define _FILE_OFFSET_BITS 64
+ #ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE
++#endif
+ #define PARAM_OFFT PARAM_INT64
+ #else
+ #define PARAM_OFFT PARAM_INT
+-#endif
++#endif /* NBD_LFS */
+ #ifdef HAVE_SYNC_FILE_RANGE
+ #define USE_SYNC_FILE_RANGE
+ #define _GNU_SOURCE
+ #endif /* HAVE_SYNC_FILE_RANGE */
+-#endif /* NBD_LFS */
+ 
+ #endif /* LFS_H */
+-- 
+1.7.7.1
+

From 09be7e24e567c3cb93bec0978a9ee64c396168cc Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Fri, 2 Dec 2011 11:49:11 +0100
Subject: [PATCH 1033/6849] dnsmasq: create runtime directory

$(TARGET_DIR)/var/lib/misc/ is the location where dnsmasq stores its
lease files. Create it to make the daemon work.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 0f8db9d68d..fc43abdf0e 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -57,6 +57,7 @@ endef
 
 define DNSMASQ_INSTALL_TARGET_CMDS
 	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install
+	mkdir -p $(TARGET_DIR)/var/lib/misc/
 endef
 
 define DNSMASQ_UNINSTALL_TARGET_CMDS

From fe83751e8fcbe1c3b1883c1773c2e0e7a520730b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 6 Dec 2011 10:00:46 +0100
Subject: [PATCH 1034/6849] fs/skeleton: make /var/lib/misc a symlink to /tmp

Similar to the other symlinks, so you can use E.G. dnsmasq with a read
only rootfs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/var/lib/misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 fs/skeleton/var/lib/misc

diff --git a/fs/skeleton/var/lib/misc b/fs/skeleton/var/lib/misc
new file mode 120000
index 0000000000..f1fde8c107
--- /dev/null
+++ b/fs/skeleton/var/lib/misc
@@ -0,0 +1 @@
+../../tmp
\ No newline at end of file

From 60859a1e1ac717aafc3543f92adeccba9ed33b29 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 6 Dec 2011 10:43:23 +0100
Subject: [PATCH 1035/6849] netsnmp: bump to 5.7.1 LTS

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 5d789b9c46..959e39f154 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.6.1.1
+NETSNMP_VERSION = 5.7.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES

From 0c8407a9bcf6369f62a682a2b663894dc8157355 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 6 Dec 2011 12:02:32 +0100
Subject: [PATCH 1036/6849] Revert "netsnmp: bump to 5.7.1 LTS"

Gustavoz reported that 5.7 series segfault on powerpc.

This reverts commit 60859a1e1ac717aafc3543f92adeccba9ed33b29.
---
 package/netsnmp/netsnmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 959e39f154..5d789b9c46 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.7.1
+NETSNMP_VERSION = 5.6.1.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES

From 8a28f7e8acd7e9d2ae67a83698603a03f19fc17c Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 6 Dec 2011 17:50:11 +0100
Subject: [PATCH 1037/6849] netsnmp: bump to 5.7.1 LTS

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp-swinst-crash.patch | 17 +++++++++++++++++
 package/netsnmp/netsnmp.mk                 |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 package/netsnmp/netsnmp-swinst-crash.patch

diff --git a/package/netsnmp/netsnmp-swinst-crash.patch b/package/netsnmp/netsnmp-swinst-crash.patch
new file mode 100644
index 0000000000..f7298a6a52
--- /dev/null
+++ b/package/netsnmp/netsnmp-swinst-crash.patch
@@ -0,0 +1,17 @@
+Fixes runtime error with uClibc (and possibly others).
+
+Original patch and bug description:
+http://sourceforge.net/tracker/?func=detail&aid=3436528&group_id=12694&atid=312694
+
+--- net-snmp-5.7.1/agent/mibgroup/host/data_access/swinst_pkginfo.c
++++ /home/fabled//net-snmp-5.7.1.patched/agent/mibgroup/host/data_access/swinst_pkginfo.c
+@@ -140,7 +140,8 @@
+         memcpy( entry->swDate, cp, date_len );
+         entry->swDate_len = date_len;
+     }
+-    closedir( d );
++    if (d != NULL)
++        closedir( d );
+ 
+     DEBUGMSGTL(("swinst:load:arch"," loaded %d entries\n",
+                 (int)CONTAINER_SIZE(container)));
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 5d789b9c46..959e39f154 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.6.1.1
+NETSNMP_VERSION = 5.7.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES

From 96c8f0b2165b476feac7d8598002dd27759207fd Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 6 Dec 2011 00:27:01 +0100
Subject: [PATCH 1038/6849] Add package connman

The ConnMan project provides a daemon for managing internet connections
within embedded devices running the Linux operating system. The
Connection Manager is designed to be slim and to use as few resources as
possible, so it can be easily integrated. It is a fully modular system
that can be extended, through plug-ins, to support all kinds of wired or
wireless technologies. Also, configuration methods, like DHCP and domain
name resolving, are implemented using plug-ins. The plug-in approach
allows for easy adaption and modification for various use cases.

The location for released tarballs is still unavailable due to the
recent kernel.org outage, hence the package obtains the sources from git
for now.

[Peter: Ensure it can only be selected with workable toolchains,
	use start-stop-daemon in initscript, and install cm if selected]
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/connman/Config.in  | 47 ++++++++++++++++++++++++++++++++++++++
 package/connman/S45connman | 22 ++++++++++++++++++
 package/connman/connman.mk | 39 +++++++++++++++++++++++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 package/connman/Config.in
 create mode 100755 package/connman/S45connman
 create mode 100644 package/connman/connman.mk

diff --git a/package/Config.in b/package/Config.in
index cc26f20a92..e949649dc4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -402,6 +402,7 @@ source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
+source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cifs-utils/Config.in"
 source "package/cups/Config.in"
diff --git a/package/connman/Config.in b/package/connman/Config.in
new file mode 100644
index 0000000000..237c30e128
--- /dev/null
+++ b/package/connman/Config.in
@@ -0,0 +1,47 @@
+config BR2_PACKAGE_CONNMAN
+	bool "connman"
+	depends on BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_IPTABLES
+	depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc
+	help
+	  The Connection Manager (ConnMan) project provides a daemon for
+	  managing internet connections within embedded devices running
+	  the Linux operating system.
+
+	  For more information, see http://connman.net/
+
+if BR2_PACKAGE_CONNMAN
+
+config BR2_PACKAGE_CONNMAN_THREADS
+	bool "enable threading support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	default y
+
+config BR2_PACKAGE_CONNMAN_ETHERNET
+	bool "enable Ethernet support"
+	default y
+
+config BR2_PACKAGE_CONNMAN_WIFI
+	bool "enable WiFi support"
+	select BR2_PACKAGE_WPA_SUPPLICANT
+
+config BR2_PACKAGE_CONNMAN_BLUETOOTH
+	bool "enable Bluetooth support"
+
+config BR2_PACKAGE_CONNMAN_LOOPBACK
+	bool "enable loopback support"
+
+config BR2_PACKAGE_CONNMAN_NTPD
+	bool "enable ntpd support"
+
+config BR2_PACKAGE_CONNMAN_DEBUG
+	bool "enable compiling with debugging information"
+
+config BR2_PACKAGE_CONNMAN_CLIENT
+	bool "enable command line client"
+
+endif # BR2_PACKAGE_CONNMAN
+
+comment "connman needs DBus enabled and a toolchain with resolver support"
+	depends on !BR2_PACKAGE_DBUS || !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc)
diff --git a/package/connman/S45connman b/package/connman/S45connman
new file mode 100755
index 0000000000..a8afd68717
--- /dev/null
+++ b/package/connman/S45connman
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		echo -n "Starting connman ... "
+		start-stop-daemon -S -q -m -b -p /var/run/connmand.pid --exec /usr/sbin/connmand -- -n
+		echo "done."
+		;;
+	stop)
+		echo -n "Stopping connman ..."
+		start-stop-daemon -K -q -p /var/run/connmand.pid
+		echo "done."
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+		;;
+esac
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
new file mode 100644
index 0000000000..6b9bbe67e1
--- /dev/null
+++ b/package/connman/connman.mk
@@ -0,0 +1,39 @@
+#######################################################
+#
+# connman - open source connection manager
+#
+#######################################################
+
+CONNMAN_VERSION = 0.78
+CONNMAN_SITE = git://git.kernel.org/pub/scm/network/connman/connman.git
+CONNMAN_DEPENDENCIES = libglib2 dbus iptables
+CONNMAN_INSTALL_STAGING = YES
+CONNMAN_CONF_OPT += --localstatedir=/var \
+	$(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads)		\
+	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)		\
+	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet)	\
+	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi)			\
+	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth)	\
+	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback)	\
+	$(if $(BR2_PACKAGE_CONNMAN_NTPD),--enable-ntpd,--disable-ntpd)
+
+# as long as sources are obtained from git, we need to generate the autofoo stuff
+CONNMAN_AUTORECONF = YES
+
+define CONNMAN_INSTALL_INITSCRIPT
+	$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
+endef
+
+CONNMAN_POST_INSTALL_TARGET_HOOKS = CONNMAN_INSTALL_INITSCRIPT
+
+ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
+CONNMAN_CONF_OPT += --enable-client
+
+define CONNMAN_INSTALL_CM
+	$(INSTALL) -m 0755 -D $(@D)/client/cm $(TARGET_DIR)/usr/bin/cm
+endef
+
+CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM
+endif
+
+$(eval $(call AUTOTARGETS))

From 07225ca919c3ac75245b3003b3fb14eb57d39a09 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 7 Dec 2011 16:54:41 +0100
Subject: [PATCH 1039/6849] qemu/arm-versatile: readme: enable ethernet
 emulation

We build the kernel with smc91x support, so also document how to enable
the emulation of it in qemu.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-versatile/readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 834b0e006c..2ca5dec512 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:
 
-  qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio
+  qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=smc91c111 -net user
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.

From 88f95f82b71faf845a0041c93011939d8f560350 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Fri, 18 Nov 2011 19:17:52 +0100
Subject: [PATCH 1040/6849] Add Armadeus systems APF9328 support.

The APF9328 is an i.MXL+FPGA based SOM (System On Module). Here only minimal
support is added: booting Linux kernel (UART, Ethernet and NOR), Buildroot
toolchain and JFFS2 rootfs.

[Peter: Remove redundant BR2_TARGET_OPTIMIZATION]
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...001-fixes_arm_mach-types_for_apf9328.patch | 26 ++++++++++++++++
 ...dd_missing_config_option_for_apf9328.patch | 16 ++++++++++
 configs/armadeus_apf9328_defconfig            | 31 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 board/armadeus/apf9328/linux-3.1.1-0001-fixes_arm_mach-types_for_apf9328.patch
 create mode 100644 board/armadeus/apf9328/linux-3.1.1-0002-add_missing_config_option_for_apf9328.patch
 create mode 100644 configs/armadeus_apf9328_defconfig

diff --git a/board/armadeus/apf9328/linux-3.1.1-0001-fixes_arm_mach-types_for_apf9328.patch b/board/armadeus/apf9328/linux-3.1.1-0001-fixes_arm_mach-types_for_apf9328.patch
new file mode 100644
index 0000000000..aa464a3445
--- /dev/null
+++ b/board/armadeus/apf9328/linux-3.1.1-0001-fixes_arm_mach-types_for_apf9328.patch
@@ -0,0 +1,26 @@
+From 053ba505eb0d40287ac5750daf454af0aed2ce75 Mon Sep 17 00:00:00 2001
+From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
+Date: Tue, 4 Oct 2011 14:19:58 +0200
+Subject: [PATCH 1/2] [ARM] mach-types: Re-add apf9328
+
+
+Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
+---
+ arch/arm/tools/mach-types |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
+index fff68d0..07811a7 100644
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -188,6 +188,7 @@ omap_2430sdp		MACH_OMAP_2430SDP	OMAP_2430SDP		900
+ davinci_evm		MACH_DAVINCI_EVM	DAVINCI_EVM		901
+ palmz72			MACH_PALMZ72		PALMZ72			904
+ nxdb500			MACH_NXDB500		NXDB500			905
++apf9328			MACH_APF9328		APF9328			906
+ palmt5			MACH_PALMT5		PALMT5			917
+ palmtc			MACH_PALMTC		PALMTC			918
+ omap_apollon		MACH_OMAP_APOLLON	OMAP_APOLLON		919
+-- 
+1.7.3.4
+
diff --git a/board/armadeus/apf9328/linux-3.1.1-0002-add_missing_config_option_for_apf9328.patch b/board/armadeus/apf9328/linux-3.1.1-0002-add_missing_config_option_for_apf9328.patch
new file mode 100644
index 0000000000..312b9a03d8
--- /dev/null
+++ b/board/armadeus/apf9328/linux-3.1.1-0002-add_missing_config_option_for_apf9328.patch
@@ -0,0 +1,16 @@
+APF9328 needs CONFIG_MTD_CFI_INTELEXT to boot on its NOR FLASH.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+
+Index: linux-3.1.1/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-3.1.1.orig/arch/arm/mach-imx/Kconfig	2011-11-16 14:45:55.000000000 +0100
++++ linux-3.1.1/arch/arm/mach-imx/Kconfig	2011-11-16 14:47:20.000000000 +0100
+@@ -84,6 +84,7 @@
+ 	bool "APF9328"
+ 	select SOC_IMX1
+ 	select IMX_HAVE_PLATFORM_IMX_UART
++	select MTD_CFI_INTELEXT
+ 	help
+ 	  Say Yes here if you are using the Armadeus APF9328 development board
+ 
diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig
new file mode 100644
index 0000000000..945d3855ca
--- /dev/null
+++ b/configs/armadeus_apf9328_defconfig
@@ -0,0 +1,31 @@
+# Architecture
+BR2_arm=y
+BR2_arm920t=y
+
+# Toolchain
+BR2_STRIP_sstrip=y
+BR2_GCC_VERSION_4_4_X=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_HOST=y
+BR2_ENABLE_LOCALE_PURGE=y
+BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
+BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
+BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="apf9328"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# Filesystem
+BR2_TARGET_ROOTFS_JFFS2=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1.1"
+BR2_LINUX_KERNEL_PATCH="board/armadeus/apf9328"
+BR2_LINUX_KERNEL_DEFCONFIG="mx1"

From a15d47f09014441482eb97b1316f0509fd07db99 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Mon, 5 Dec 2011 13:33:18 +0100
Subject: [PATCH 1041/6849] wpa_supplicant: add CONFIG_AP support

[Peter: Fix indentation]
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/Config.in         |  8 ++++++++
 package/wpa_supplicant/wpa_supplicant.mk | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index e3df2b4d88..a4e0fba0f7 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -23,3 +23,11 @@ config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE
 	help
 	  Install wpa_passphrase command line utility
 
+config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
+	bool "Enable support for soft AP"
+	depends on BR2_PACKAGE_WPA_SUPPLICANT
+	help
+	  With this option enabled, wpa_supplicant can act as
+	  access point. This can be used for open and WPA2-Personal networks
+	  (optionally, with WPS); this links in parts of hostapd functionality
+	  into wpa_supplicant.
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index b2e7be3b34..baa739bfdb 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -25,6 +25,16 @@ define WPA_SUPPLICANT_EAP_CONFIG
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y)
+define WPA_SUPPLICANT_AP_CONFIG
+	echo "CONFIG_AP=y" >>$(WPA_SUPPLICANT_CONFIG)
+endef
+else
+define WPA_SUPPLICANT_AP_CONFIG
+	$(SED) "s/^CONFIG_AP=y//" $(WPA_SUPPLICANT_CONFIG)
+endef
+endif
+
 define WPA_SUPPLICANT_CRYPTO_CONFIG
 	echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG)
 	echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
@@ -69,6 +79,7 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS
 	$(WPA_SUPPLICANT_EAP_CONFIG)
 	$(WPA_SUPPLICANT_LIBNL_CONFIG)
 	$(WPA_SUPPLICANT_DBUS_CONFIG)
+	$(WPA_SUPPLICANT_AP_CONFIG)
 endef
 
 define WPA_SUPPLICANT_REMOVE_CLI

From b87f2942f0ab9e8ee003cac08a172d2a51a3535f Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 10 Oct 2011 11:21:58 +0200
Subject: [PATCH 1042/6849] fluxbox: add xsession profile

add .xsession profile to get fluxbox being started automatically
by XDM.

[Peter: Only install if not available in skeleton, use install -D,
	Make it an executable script and don't hide it]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fluxbox/fluxbox.mk | 7 +++++++
 package/fluxbox/xsession   | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100644 package/fluxbox/xsession

diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 85a8eae41c..5a123f0e9c 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -13,4 +13,11 @@ FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 
 FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
+define FLUXBOX_INSTALL_XSESSION_FILE
+	[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
+		package/fluxbox/xsession $(TARGET_DIR)/root/.xsession
+endef
+
+FLUXBOX_POST_INSTALL_TARGET_HOOKS += FLUXBOX_INSTALL_XSESSION_FILE
+
 $(eval $(call AUTOTARGETS))
diff --git a/package/fluxbox/xsession b/package/fluxbox/xsession
new file mode 100644
index 0000000000..b51acff48d
--- /dev/null
+++ b/package/fluxbox/xsession
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec startfluxbox

From bdb40d8bac210a8457140f2521a045d425ca8e29 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 10 Oct 2011 11:21:59 +0200
Subject: [PATCH 1043/6849] xdm: bump to 1.1.11

[Peter: Minor whitespace fix]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xdm/xapp_xdm.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 4dc0d02899..ce38503316 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-XAPP_XDM_VERSION = 1.1.6
+XAPP_XDM_VERSION = 1.1.11
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx \
+		    --with-wtmp-file=/var/adm/wtmpx
 
 $(eval $(call AUTOTARGETS))

From 72a6bd4b5d2734f2c4f2f37589db3ba82829d770 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 10 Oct 2011 11:22:00 +0200
Subject: [PATCH 1044/6849] xdm: install startup script

install S99xdm to /etc/init.d to start XDM automatically

[Peter: Small cleanups]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xdm/S99xdm      | 25 +++++++++++++++++++++++++
 package/x11r7/xapp_xdm/xapp_xdm.mk |  7 +++++++
 2 files changed, 32 insertions(+)
 create mode 100644 package/x11r7/xapp_xdm/S99xdm

diff --git a/package/x11r7/xapp_xdm/S99xdm b/package/x11r7/xapp_xdm/S99xdm
new file mode 100644
index 0000000000..4dd1cd8882
--- /dev/null
+++ b/package/x11r7/xapp_xdm/S99xdm
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+XDM_BIN=/usr/bin/xdm
+
+case "$1" in
+    start)
+        echo -n "Starting XDM: "
+        $XDM_BIN
+        echo "done"
+        ;;
+    stop)
+	echo "Stopping XDM"
+        killall -q xdm
+        ;;
+    restart)
+	$0 stop
+	$0 start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index ce38503316..7268d5d381 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -12,4 +12,11 @@ XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXa
 XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx \
 		    --with-wtmp-file=/var/adm/wtmpx
 
+define XAPP_XDM_INSTALL_STARTUP_SCRIPT
+	$(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \
+		$(TARGET_DIR)/etc/init.d/S99xdm
+endef
+
+XAPP_XDM_POST_INSTALL_TARGET_HOOKS += XAPP_XDM_INSTALL_STARTUP_SCRIPT
+
 $(eval $(call AUTOTARGETS))

From 7cbb85c15065aa02c425747c4d5df15c1934fd33 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 4 Dec 2011 08:45:18 -0300
Subject: [PATCH 1045/6849] ebtables: bump to version 2.0.10-3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ebtables/ebtables.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 6cfdfdc5ac..b29c462b04 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -3,7 +3,8 @@
 # ebtables
 #
 #############################################################
-EBTABLES_VERSION = 2.0.10-1
+
+EBTABLES_VERSION = 2.0.10-3
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
 

From eb9e933292d3e262debda5cc7d0a6a295d2ba479 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Dec 2011 09:01:34 -0300
Subject: [PATCH 1046/6849] uClibc: remove deprecated 0.9.30 series

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |   6 -
 ...libc-0.9.30.3-fix-error-locale-utf-8.patch |  17 --
 ...libc-0.9.30.3-xtensa-000p-fix-procfs.patch |  24 --
 ...Clibc-0.9.30.3-xtensa-005-sigcontext.patch |  45 ----
 ...Clibc-0.9.30.3-xtensa-009-testandset.patch |  59 -----
 ...libc-0.9.30.3-xtensa-010-sigaction.c.patch |  11 -
 .../uClibc-0.9.30.3-xtensa-011-sysdep.h.patch |  19 --
 ...bc-0.9.30.3-xtensa-012-fnmatch_old.c.patch |  11 -
 .../uClibc-0.9.30.3-xtensa-013-atomic.h.patch | 165 ------------
 ...uClibc-0.9.30.3-xtensa-014-setjump.S.patch |  11 -
 toolchain/uClibc/uClibc-0.9.30.config         | 247 ------------------
 11 files changed, 615 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-fix-error-locale-utf-8.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-000p-fix-procfs.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-005-sigcontext.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-009-testandset.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-010-sigaction.c.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-011-sysdep.h.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-012-fnmatch_old.c.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-013-atomic.h.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.3-xtensa-014-setjump.S.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.30.config

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 34aaa13dd7..4b480fd452 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -10,10 +10,6 @@ choice
 	help
 	  Select the version of uClibc you wish to use.
 
-	config BR2_UCLIBC_VERSION_0_9_30
-		depends on BR2_DEPRECATED
-		bool "uClibc 0.9.30.x"
-
 	config BR2_UCLIBC_VERSION_0_9_31
 		bool "uClibc 0.9.31.x"
 
@@ -35,14 +31,12 @@ config BR2_USE_UCLIBC_SNAPSHOT
 
 config BR2_UCLIBC_VERSION_STRING
 	string
-	default 0.9.30.3	if BR2_UCLIBC_VERSION_0_9_30
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32		if BR2_UCLIBC_VERSION_0_9_32
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
-	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30
 	default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31
 	default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
 	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-fix-error-locale-utf-8.patch b/toolchain/uClibc/uClibc-0.9.30.3-fix-error-locale-utf-8.patch
deleted file mode 100644
index 2fe6c508cb..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-fix-error-locale-utf-8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- extra/locale/gen_wc8bit.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: uClibc-0.9.30.3/extra/locale/gen_wc8bit.c
-===================================================================
---- uClibc-0.9.30.3.orig/extra/locale/gen_wc8bit.c
-+++ uClibc-0.9.30.3/extra/locale/gen_wc8bit.c
-@@ -119,7 +119,7 @@
- 		}
- 
-  locale_failure:
--		printf("could not find a UTF8 locale ... please enable en_US.UTF-8\n");
-+		fprintf(stderr, "could not find a UTF8 locale ... please enable en_US.UTF-8\n");
- 		return EXIT_FAILURE;
-  locale_success:
- 		pclose(fp);
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-000p-fix-procfs.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-000p-fix-procfs.patch
deleted file mode 100644
index 8e62d205f9..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-000p-fix-procfs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- uClibc-0.9.29-orig/libc/sysdeps/linux/xtensa/sys/procfs.h	2007-11-16 23:21:00.000000000 -0800
-+++ uClibc-0.9.29/libc/sysdeps/linux/xtensa/sys/procfs.h	2007-11-16 23:26:59.000000000 -0800
-@@ -32,19 +32,11 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/user.h>
-+#include <asm/elf.h>
- 
- __BEGIN_DECLS
- 
--/* Type for a general-purpose register.  */
--typedef unsigned long elf_greg_t;
--
--#define ELF_NGREG 128
--typedef elf_greg_t elf_gregset_t[ELF_NGREG];
--
--/* Register set for the floating-point registers.  */
--#define ELF_NFPREG 18
--typedef unsigned long elf_fpreg_t;
--typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-+/* Note: we get elf_gregset_t and elf_fpregset_t from <asm/elf.h>.  */
- 
- /* Signal info.  */
- struct elf_siginfo
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-005-sigcontext.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-005-sigcontext.patch
deleted file mode 100644
index 7d7d684b1f..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-005-sigcontext.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -u /dev/null uClibc-0.9.30/libc/sysdeps/linux/xtensa/bits/sigcontext.h
---- /dev/null
-+++ uClibc-0.9.30/libc/sysdeps/linux/xtensa/bits/sigcontext.h
-@@ -0,0 +1,41 @@
-+/* Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-+   Boston, MA 02110-1301, USA.  */
-+
-+#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H
-+# error "Never use <bits/sigcontext.h> directly; include <signal.h> instead."
-+#endif
-+
-+#ifndef _BITS_SIGCONTEXT_H
-+#define _BITS_SIGCONTEXT_H 1
-+
-+struct sigcontext
-+{
-+  unsigned long sc_pc;
-+  unsigned long sc_ps;
-+  unsigned long sc_lbeg;
-+  unsigned long sc_lend;
-+  unsigned long sc_lcount;
-+  unsigned long sc_sar;
-+  unsigned long sc_acclo;
-+  unsigned long sc_acchi;
-+  void *sc_xtregs;
-+  unsigned long sc_a[16];
-+};
-+
-+#endif /* _BITS_SIGCONTEXT_H */
-+
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-009-testandset.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-009-testandset.patch
deleted file mode 100644
index f0e4eb272b..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-009-testandset.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- uClibc-0.9.29/libpthread/linuxthreads.old/sysdeps/xtensa/pt-machine.h.orig	2008-09-12 09:51:50.000000000 -0700
-+++ uClibc-0.9.29/libpthread/linuxthreads.old/sysdeps/xtensa/pt-machine.h	2008-10-04 12:14:57.000000000 -0700
-@@ -26,19 +26,51 @@
- #include <asm/unistd.h>
- 
- #ifndef PT_EI
--# define PT_EI __extern_always_inline
-+# define PT_EI extern inline __attribute__ ((gnu_inline))
- #endif
- 
--/* Memory barrier.  */
- #define MEMORY_BARRIER() __asm__ ("memw" : : : "memory")
-+#define HAS_COMPARE_AND_SWAP
-+
-+extern long int testandset (int *spinlock);
-+extern int __compare_and_swap (long int *p, long int oldval, long int newval);
- 
- /* Spinlock implementation; required.  */
- PT_EI long int
- testandset (int *spinlock)
- {
--  int unused = 0;
--  return INTERNAL_SYSCALL (xtensa, , 4, SYS_XTENSA_ATOMIC_SET,
--			   spinlock, 1, unused);
-+	unsigned long tmp;
-+	__asm__ volatile (
-+"	movi	%0, 0			\n"
-+"	wsr	%0, SCOMPARE1		\n"
-+"	movi	%0, 1			\n"
-+"	s32c1i	%0, %1, 0		\n"
-+	: "=&a" (tmp)
-+	: "a" (spinlock)
-+	: "memory"
-+	);
-+	return tmp;
-+}
-+
-+PT_EI int
-+__compare_and_swap (long int *p, long int oldval, long int newval)
-+{
-+        unsigned long tmp;
-+        unsigned long value;
-+        __asm__ volatile (
-+"1:     l32i    %0, %2, 0            \n"
-+"       bne     %0, %4, 2f           \n"
-+"       wsr     %0, SCOMPARE1        \n"
-+"       mov     %1, %0               \n"
-+"       mov     %0, %3               \n"
-+"       s32c1i  %0, %2, 0            \n"
-+"       bne     %1, %0, 1b           \n"
-+"2:                                  \n"
-+          : "=&a" (tmp), "=&a" (value)
-+          : "a" (p), "a" (newval), "a" (oldval)
-+          : "memory" );
-+
-+        return tmp == oldval;
- }
- 
- /* Get some notion of the current stack.  Need not be exactly the top
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-010-sigaction.c.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-010-sigaction.c.patch
deleted file mode 100644
index 5717c2582c..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-010-sigaction.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libc/sysdeps/linux/xtensa/sigaction.c	2008-09-23 21:11:02.000000000 -0700
-+++ b/libc/sysdeps/linux/xtensa/sigaction.c	2008-09-23 21:12:31.000000000 -0700
-@@ -17,6 +17,8 @@
- 
- #define SA_RESTORER	0x04000000	
- 
-+extern __typeof(sigaction) __libc_sigaction;
-+
- extern void __default_sa_restorer (void);
- 
- libc_hidden_proto(memcpy)
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-011-sysdep.h.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-011-sysdep.h.patch
deleted file mode 100644
index 692b0a7222..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-011-sysdep.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libc/sysdeps/linux/xtensa/sysdep.h	2008-09-23 21:17:42.000000000 -0700
-+++ b/libc/sysdeps/linux/xtensa/sysdep.h	2008-09-23 21:17:59.000000000 -0700
-@@ -114,15 +114,7 @@
- 
- #define ret_ERRVAL retw
- 
--#if RTLD_PRIVATE_ERRNO
--# define SYSCALL_ERROR_HANDLER						      \
--0:	movi	a4, rtld_errno;						      \
--	neg	a2, a2;							      \
--	s32i	a2, a4, 0;						      \
--	movi	a2, -1;							      \
--	j	.Lpseudo_end;
--
--#elif defined _LIBC_REENTRANT
-+#if defined _LIBC_REENTRANT
- 
- # if USE___THREAD
- #  ifndef NOT_IN_libc
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-012-fnmatch_old.c.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-012-fnmatch_old.c.patch
deleted file mode 100644
index 66cb1f6092..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-012-fnmatch_old.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libc/misc/fnmatch/fnmatch_old.c	2008-09-23 21:23:13.000000000 -0700
-+++ b/libc/misc/fnmatch/fnmatch_old.c	2008-09-23 21:23:33.000000000 -0700
-@@ -15,7 +15,7 @@
- not, write to the Free Software Foundation, Inc., 675 Mass Ave,
- Cambridge, MA 02139, USA.  */
- 
--#if HAVE_CONFIG_H
-+#ifdef HAVE_CONFIG_H
- # include <config.h>
- #endif
- 
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-013-atomic.h.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-013-atomic.h.patch
deleted file mode 100644
index fd2037111d..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-013-atomic.h.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- /dev/null	2008-09-18 06:50:54.356228028 -0700
-+++ uClibc-0.9.29/libc/sysdeps/linux/xtensa/bits/atomic.h	2008-10-04 11:40:21.000000000 -0700
-@@ -0,0 +1,162 @@
-+/*
-+ * Copyright (C) 2008 Tensilica, Inc.
-+ * Contributed by Joe Taylor <joe@tensilica.com> 2008
-+ *
-+ * This file is subject to the terms and conditions of the GNU Lesser General
-+ * Public License.  See the file "COPYING.LIB" in the main directory of this
-+ * archive for more details.
-+ */
-+
-+#ifndef _XTENSA_BITS_ATOMIC_H
-+#define _XTENSA_BITS_ATOMIC_H  1
-+
-+/* Xtensa has only a 32-bit form of a store-conditional instruction,
-+   so just stub out the rest. */
-+
-+/* Atomically store NEWVAL in *MEM if *MEM is equal to OLDVAL.
-+   Return the old *MEM value.  */
-+
-+#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)  \
-+  ({__typeof__(*(mem)) __tmp, __value;                               \
-+    __asm__ __volatile__(                                            \
-+      "1:     l32i    %1, %2, 0               \n"                    \
-+      "       bne     %1, %4, 2f              \n"                    \
-+      "       wsr     %1, SCOMPARE1           \n"                    \
-+      "       mov     %0, %1                  \n"                    \
-+      "       mov     %1, %3                  \n"                    \
-+      "       s32c1i  %1, %2, 0               \n"                    \
-+      "       bne     %0, %1, 1b              \n"                    \
-+      "2:                                     \n"                    \
-+      : "=&a" (__value), "=&a" (__tmp)                               \
-+      : "a" (mem), "a" (newval), "a" (oldval)                        \
-+      : "memory" );                                                  \
-+    __tmp;                                                           \
-+  })
-+
-+/* Atomically store NEWVAL in *MEM if *MEM is equal to OLDVAL.
-+   Return zero if *MEM was changed or non-zero if no exchange happened.  */
-+
-+#define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \
-+  ({__typeof__(*(mem)) __tmp, __value;                               \
-+    __asm__ __volatile__(                                            \
-+      "1:     l32i    %0, %2, 0               \n"                    \
-+      "       sub     %1, %4, %0              \n"                    \
-+      "       bnez    %1, 2f                  \n"                    \
-+      "       wsr     %0, SCOMPARE1           \n"                    \
-+      "       mov     %1, %3                  \n"                    \
-+      "       s32c1i  %1, %2, 0               \n"                    \
-+      "       bne     %0, %1, 1b              \n"                    \
-+      "       movi    %1, 0                   \n"                    \
-+      "2:                                     \n"                    \
-+      : "=&a" (__value), "=&a" (__tmp)                               \
-+      : "a" (mem), "a" (newval), "a" (oldval)                        \
-+      : "memory" );                                                  \
-+    __tmp != 0;                                                      \
-+  })
-+
-+/* Store NEWVALUE in *MEM and return the old value.  */
-+
-+#define __arch_exchange_32_acq(mem, newval)                          \
-+  ({__typeof__(*(mem)) __tmp, __value;                               \
-+    __asm__ __volatile__(                                            \
-+      "1:     l32i    %0, %2, 0               \n"                    \
-+      "       wsr     %0, SCOMPARE1           \n"                    \
-+      "       mov     %1, %3                  \n"                    \
-+      "       s32c1i  %1, %2, 0               \n"                    \
-+      "       bne     %0, %1, 1b              \n"                    \
-+      : "=&a" (__value), "=&a" (__tmp)                               \
-+      : "a" (mem), "a" (newval)                                      \
-+      : "memory" );                                                  \
-+    __tmp;                                                           \
-+  })
-+
-+/* Add VALUE to *MEM and return the old value of *MEM.  */
-+
-+#define __arch_atomic_exchange_and_add_32(mem, value)                \
-+  ({__typeof__(*(mem)) __tmp, __value;                               \
-+    __asm__ __volatile__(                                            \
-+      "1:     l32i    %0, %2, 0               \n"                    \
-+      "       wsr     %0, SCOMPARE1           \n"                    \
-+      "       add     %1, %0, %3              \n"                    \
-+      "       s32c1i  %1, %2, 0               \n"                    \
-+      "       bne     %0, %1, 1b              \n"                    \
-+      : "=&a" (__value), "=&a" (__tmp)                               \
-+      : "a" (mem), "a" (value)                                       \
-+      : "memory" );                                                  \
-+    __tmp;                                                           \
-+  })
-+
-+/* Subtract VALUE from *MEM and return the old value of *MEM.  */
-+
-+#define __arch_atomic_exchange_and_sub_32(mem, value)                \
-+  ({__typeof__(*(mem)) __tmp, __value;                               \
-+    __asm__ __volatile__(                                            \
-+      "1:     l32i    %0, %2, 0               \n"                    \
-+      "       wsr     %0, SCOMPARE1           \n"                    \
-+      "       sub     %1, %0, %3              \n"                    \
-+      "       s32c1i  %1, %2, 0               \n"                    \
-+      "       bne     %0, %1, 1b              \n"                    \
-+      : "=&a" (__value), "=&a" (__tmp)                               \
-+      : "a" (mem), "a" (value)                                       \
-+      : "memory" );                                                  \
-+    __tmp;                                                           \
-+  })
-+
-+/* Decrement *MEM if it is > 0, and return the old value.  */
-+
-+#define __arch_atomic_decrement_if_positive_32(mem)                  \
-+  ({__typeof__(*(mem)) __tmp, __value;                               \
-+    __asm__ __volatile__(                                            \
-+      "1:     l32i    %0, %2, 0               \n"                    \
-+      "       blti    %0, 1, 2f               \n"                    \
-+      "       wsr     %0, SCOMPARE1           \n"                    \
-+      "       addi    %1, %0, -1              \n"                    \
-+      "       s32c1i  %1, %2, 0               \n"                    \
-+      "       bne     %0, %1, 1b              \n"                    \
-+      "2:                                     \n"                    \
-+      : "=&a" (__value), "=&a" (__tmp)                               \
-+      : "a" (mem)                                                    \
-+      : "memory" );                                                  \
-+    __tmp;                                                           \
-+  })
-+
-+
-+/* These are the preferred public interfaces: */
-+
-+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval)     \
-+  ({                                                                 \
-+    if (sizeof (*mem) != 4)                                          \
-+      abort();                                                       \
-+    __arch_compare_and_exchange_val_32_acq(mem, newval, oldval);     \
-+  })
-+
-+#define atomic_exchange_acq(mem, newval)                             \
-+  ({                                                                 \
-+    if (sizeof(*(mem)) != 4)                                         \
-+      abort();                                                       \
-+    __arch_exchange_32_acq(mem, newval);                             \
-+  })
-+
-+#define atomic_exchange_and_add(mem, newval)                         \
-+  ({                                                                 \
-+    if (sizeof(*(mem)) != 4)                                         \
-+      abort();                                                       \
-+    __arch_atomic_exchange_and_add_32(mem, newval);                  \
-+  })
-+
-+#define atomic_exchange_and_sub(mem, newval)                         \
-+  ({                                                                 \
-+    if (sizeof(*(mem)) != 4)                                         \
-+      abort();                                                       \
-+    __arch_atomic_exchange_and_sub_32(mem, newval);                  \
-+  })
-+
-+#define atomic_decrement_if_positive(mem)                            \
-+  ({                                                                 \
-+    if (sizeof(*(mem)) != 4)                                         \
-+      abort();                                                       \
-+    __arch_atomic_decrement_if_positive_32(mem);                     \
-+  })
-+
-+#endif /* _XTENSA_BITS_ATOMIC_H */
-+
diff --git a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-014-setjump.S.patch b/toolchain/uClibc/uClibc-0.9.30.3-xtensa-014-setjump.S.patch
deleted file mode 100644
index 720b44b581..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.3-xtensa-014-setjump.S.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uClibc-0.9.30/libc/sysdeps/linux/xtensa/setjmp.S.orig	2009-05-01 16:57:16.195893000 -0700
-+++ uClibc-0.9.30/libc/sysdeps/linux/xtensa/setjmp.S	2009-05-01 16:58:03.885160000 -0700
-@@ -86,7 +86,7 @@ ENTRY (__sigsetjmp)
- 	/* Copy 0-8 words from the register overflow area.  */
- 	extui	a3, a0, 30, 2
- 	blti	a3, 2, .Lendsj
--	l32i	a7, a1, 4
-+	l32i	a7, a5, 4
- 	slli	a4, a3, 4
- 	sub	a5, a7, a4
- 	addi	a6, a2, 16
diff --git a/toolchain/uClibc/uClibc-0.9.30.config b/toolchain/uClibc/uClibc-0.9.30.config
deleted file mode 100644
index 49ac3ef4cb..0000000000
--- a/toolchain/uClibc/uClibc-0.9.30.config
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="none"
-FORCE_OPTIONS_FOR_ARCH=y
-# ARCH_LITTLE_ENDIAN is not set
-# ARCH_BIG_ENDIAN is not set
-# ARCH_WANTS_LITTLE_ENDIAN is not set
-# ARCH_WANTS_BIG_ENDIAN is not set
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/src/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-# LDSO_CACHE_SUPPORT is not set
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-UCLIBC_HAS_NONREENTRANT=y
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_24=y
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
-# UCLIBC_HAS_RPC is not set
-# UCLIBC_HAS_FULL_RPC is not set
-# UCLIBC_HAS_REENTRANT_RPC is not set
-UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-# UCLIBC_HAS_STRING_GENERIC_OPT is not set
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-UCLIBC_HAS_CTYPE_ENFORCED=y
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-# UCLIBC_HAS_STDIO_GETC_MACRO is not set
-# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-# UCLIBC_HAS_GNU_GETSUBOPT is not set
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-# UCLIBC_HAS_WORDEXP is not set
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
-# SSP_QUICK_CANARY is not set
-PROPOLICE_BLOCK_ABRT=y
-# PROPOLICE_BLOCK_SEGV is not set
-# UCLIBC_BUILD_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
-
-# USE_BX is not set
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_CORTEX_M3 is not set
-# CONFIG_ARM_CORTEX_M1 is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set
-

From 7dc413255ba6a6e9edf88bf4881f50344ebda682 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Dec 2011 10:00:41 -0300
Subject: [PATCH 1047/6849] uClibc: add unshare() syscall support

Add unshare() syscall support for uClibc 0.9.31 and 0.9.32 series.
This is required by newer versions of iproute2.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uClibc/uClibc-0.9.31.1-unshare.patch      | 74 +++++++++++++++++
 toolchain/uClibc/uClibc-0.9.32-unshare.patch  | 82 +++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.31.1-unshare.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.32-unshare.patch

diff --git a/toolchain/uClibc/uClibc-0.9.31.1-unshare.patch b/toolchain/uClibc/uClibc-0.9.31.1-unshare.patch
new file mode 100644
index 0000000000..ad440d9dc2
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.31.1-unshare.patch
@@ -0,0 +1,74 @@
+Backport of unshare() syscall.
+From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+---
+diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h
+--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h	2011-06-08 15:58:40.000000000 -0300
++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h	2011-12-05 08:10:02.491978849 -0300
+@@ -58,7 +58,13 @@
+ 				      force CLONE_PTRACE on this clone.  */
+ # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
+ 					  the child.  */
+-# define CLONE_STOPPED	0x02000000 /* Start in stopped state.  */
++# define CLONE_STOPPED 0x02000000 /* Start in stopped state.  */
++# define CLONE_NEWUTS  0x04000000      /* New utsname group.  */
++# define CLONE_NEWIPC  0x08000000      /* New ipcs.  */
++# define CLONE_NEWUSER 0x10000000      /* New user namespace.  */
++# define CLONE_NEWPID  0x20000000      /* New pid namespace.  */
++# define CLONE_NEWNET  0x40000000      /* New network namespace.  */
++# define CLONE_IO      0x80000000      /* Clone I/O context.  */
+ #endif
+ 
+ /* The official definition.  */
+@@ -74,11 +80,9 @@
+ extern int clone (int (*__fn) (void *__arg), void *__child_stack,
+ 		  int __flags, void *__arg, ...) __THROW;
+ 
+-#if 0
+ /* Unshare the specified resources.  */
+ extern int unshare (int __flags) __THROW;
+ #endif
+-#endif
+ 
+ __END_DECLS
+ 
+diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in
+--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in	2011-06-08 15:58:40.000000000 -0300
++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in	2011-12-05 08:23:28.353757602 -0300
+@@ -31,7 +31,8 @@
+ 	remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
+ 	sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
+ 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
+-	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC))
++	sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \
++	vhangup.c,$(CSRC))
+ endif
+ 
+ ifneq ($(UCLIBC_BSD_SPECIFIC),y)
+diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c
+--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c	1969-12-31 21:00:00.000000000 -0300
++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c	2011-12-05 08:22:45.954453512 -0300
+@@ -0,0 +1,21 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * unshare() for uClibc
++ *
++ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <sched.h>
++
++#if defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__
++_syscall1(int, unshare, int, flags)
++#else
++int unshare(int flags) 
++{   
++    __set_errno(ENOSYS);
++    return -1;
++}
++#endif
diff --git a/toolchain/uClibc/uClibc-0.9.32-unshare.patch b/toolchain/uClibc/uClibc-0.9.32-unshare.patch
new file mode 100644
index 0000000000..5820e15bbe
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.32-unshare.patch
@@ -0,0 +1,82 @@
+Backport of unshare() syscall.
+From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+---
+diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h
+--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h	2011-12-02 23:54:30.571841170 -0300
++++ uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h	2011-12-02 23:57:45.874205079 -0300
+@@ -58,7 +58,13 @@
+ 				      force CLONE_PTRACE on this clone.  */
+ # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
+ 					  the child.  */
+-# define CLONE_STOPPED	0x02000000 /* Start in stopped state.  */
++# define CLONE_STOPPED 0x02000000 /* Start in stopped state.  */
++# define CLONE_NEWUTS  0x04000000      /* New utsname group.  */
++# define CLONE_NEWIPC  0x08000000      /* New ipcs.  */
++# define CLONE_NEWUSER 0x10000000      /* New user namespace.  */
++# define CLONE_NEWPID  0x20000000      /* New pid namespace.  */
++# define CLONE_NEWNET  0x40000000      /* New network namespace.  */
++# define CLONE_IO      0x80000000      /* Clone I/O context.  */
+ #endif
+ 
+ /* The official definition.  */
+@@ -74,11 +80,9 @@
+ extern int clone (int (*__fn) (void *__arg), void *__child_stack,
+ 		  int __flags, void *__arg, ...) __THROW;
+ 
+-#if 0
+ /* Unshare the specified resources.  */
+ extern int unshare (int __flags) __THROW;
+ #endif
+-#endif
+ 
+ __END_DECLS
+ 
+diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in
+--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in	2011-12-02 23:54:30.577841215 -0300
++++ uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in	2011-12-02 23:56:08.801527166 -0300
+@@ -24,7 +24,8 @@
+ 	remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
+ 	sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
+ 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
+-	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c
++	sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \
++	vhangup.c
+ # NPTL needs these internally: madvise.c
+ CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c
+ ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c
+--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c	2011-12-02 23:54:30.577841215 -0300
++++ uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c	2011-12-02 23:58:18.803435042 -0300
+@@ -278,6 +278,10 @@
+ make_stub(umount2)
+ #endif
+ 
++#if !defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__
++make_stub(unshare)
++#endif
++
+ #ifndef __NR_utimensat
+ make_stub(futimens)
+ make_stub(utimensat)
+diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c
+--- uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c	1969-12-31 21:00:00.000000000 -0300
++++ uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c	2011-12-02 23:58:42.693601880 -0300
+@@ -0,0 +1,15 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * unshare() for uClibc
++ *
++ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <sched.h>
++
++#if defined __NR_unshare
++_syscall1(int, unshare, int, flags)
++#endif

From 8c9a74836aef0c0a6e7e8aee614982225a89d5cf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Dec 2011 10:00:42 -0300
Subject: [PATCH 1048/6849] iproute2: bump to version 3.1.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2-xt-v6.patch | 39 ---------------------------
 package/iproute2/iproute2.mk          |  4 +--
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 package/iproute2/iproute2-xt-v6.patch

diff --git a/package/iproute2/iproute2-xt-v6.patch b/package/iproute2/iproute2-xt-v6.patch
deleted file mode 100644
index 4856e3609d..0000000000
--- a/package/iproute2/iproute2-xt-v6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Andreas Henriksson <andreas@fatal.se>
-Forwarded: yes
-Subject: [PATCH] iproute2: Fix building xt module against xtables version 6
-
-
-diff --git a/tc/m_xt.c b/tc/m_xt.c
-index 651a59e..13bf19f 100644
---- a/tc/m_xt.c
-+++ b/tc/m_xt.c
-@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- 					return -1;
- 				}
- 				tcipt_globals.opts =
--				    xtables_merge_options(tcipt_globals.opts,
--				                          m->extra_opts,
--				                          &m->option_offset);
-+				    xtables_merge_options(
-+#if (XTABLES_VERSION_CODE >= 6)
-+				        tcipt_globals.orig_opts,
-+#endif
-+				        tcipt_globals.opts,
-+				        m->extra_opts,
-+				        &m->option_offset);
- 			} else {
- 				fprintf(stderr," failed to find target %s\n\n", optarg);
- 				return -1;
-@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
- 			}
- 
- 			tcipt_globals.opts =
--			    xtables_merge_options(tcipt_globals.opts,
-+			    xtables_merge_options(
-+#if (XTABLES_VERSION_CODE >= 6)
-+				                  tcipt_globals.orig_opts,
-+#endif
-+				                  tcipt_globals.opts,
- 			                          m->extra_opts,
- 			                          &m->option_offset);
- 		} else {
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index dd2506cbda..100f20aa24 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 2.6.39
-IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
+IPROUTE2_VERSION = 3.1.0
+IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 
 # If both iproute2 and busybox are selected, make certain we win

From 713bb00aa2ab6da400766bc8683f6b95fbacdece Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 3 Dec 2011 10:53:43 -0300
Subject: [PATCH 1049/6849] uclibc: update internal toolchain build

Update the uClibc build procedure to accomodate for the new build
system, otherwise it breaks with snapshot versions.
As pointed by linuxjacques on IRC.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 6335e6a5b7..fbfb0dfd1d 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -384,6 +384,7 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		HOSTCC="$(HOSTCC)" \
 		oldconfig
 	touch $@
@@ -401,6 +402,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		HOSTCC="$(HOSTCC)" headers \
 		lib/crt1.o lib/crti.o lib/crtn.o \
 		install_headers
@@ -421,6 +423,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate) $(LIBFLO
 		PREFIX= \
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		HOSTCC="$(HOSTCC)" \
 		all
 	touch -c $@
@@ -431,6 +434,7 @@ uclibc-menuconfig: dirs $(UCLIBC_DIR)/.config
 		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		HOSTCC="$(HOSTCC)" \
 		menuconfig && \
 	touch -c $(UCLIBC_DIR)/.config
@@ -442,6 +446,7 @@ $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		install_runtime install_dev
 	# Install the kernel headers to the staging dir if necessary
 	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
@@ -471,6 +476,7 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		install_runtime
 	touch -c $@
 

From d6dfc2109c7149a795f7bda963a9a583685dec3f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Dec 2011 11:21:49 +0100
Subject: [PATCH 1050/6849] transmission: gtk client needs locale support in
 toolchain

Otherwise configure errors out with:

configure: error: "The gtk client cannot be built without nls support.
Try adding either --enable-nls or --disable-gtk"

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/transmission/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 3fcf017fd9..e7e9f66f4b 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -36,10 +36,12 @@ config BR2_PACKAGE_TRANSMISSION_REMOTE
 
 config BR2_PACKAGE_TRANSMISSION_GTK
 	bool "transmission-gtk"
-	depends on BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_LIBGTK2 && BR2_ENABLE_LOCALE
 	help
 	  Install transmission GTK-based GUI interface.
 
+comment "transmission-gtk requires a toolchain with locale support"
+	depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE
 endif
 
 comment "Transmission requires a toolchain with IPv6 support"

From 11eb9e7fbec3f458fa2146558d9ad162615d63be Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Dec 2011 23:09:24 +0100
Subject: [PATCH 1051/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGES b/CHANGES
index e5311f0576..330ac6a2dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,29 @@
+2012.02, Not yet released:
+
+	Fixes all over the tree and new features.
+
+	Gentargets: scp and mercurial support.
+
+	defconfigs: qemu configs for x86-64 and sparc.
+
+	uClibc: remove 0.9.30, backport unshare() support.
+
+	Updated/fixed packages: barebox, bash, binutils, bison,
+	coreutils, dbus-glib, diffutils, dropbear, ebtables, flex,
+	fluxbox, gawk, grep, gst-dsp, htop, iproute2, iw, lame,
+	libgpg-error, libgtk2, libroxml, m4, module-init-tools,
+	mtd-utils, nano, nbd, netsnmp, ruby, u-boot, usbmount,
+	wpa_supplicant, xdm
+
+	New packages: connman, transmission
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#743:  Add Transmission bit torrent option to buildroot
+	#3403: libgpg-error: bump to version 1.10
+	#3409: libgpg-error: download from gnupg.org
+	#3421: nano: make tiny flag optional
+
 2011.11, Released November 30th, 2011:
 
 	Fixes all over the tree.

From 7d7873df78c3f6745a188baf5d41abab7cfe3f23 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Dec 2011 23:32:23 +0100
Subject: [PATCH 1052/6849] binutils: don't default to 2.22

Lots of packages are failing with binutils 2.22 with undefined symbols,
as it defaults to --no-copy-dt-needed-entries. Long term, the packages
should get fixed, but let's keep it at 2.21.1 for now.

For more details, see:
- http://wiki.debian.org/ToolChain/DSOLinking
- https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index f8295499cf..aec51b3ce0 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -3,7 +3,7 @@ comment "Binutils Options"
 choice
 	prompt "Binutils Version"
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
-	default BR2_BINUTILS_VERSION_2_22 if (BR2_UCLIBC_VERSION_0_9_32 || BR2_UCLIBC_VERSION_SNAPSHOT)
+	default BR2_BINUTILS_VERSION_2_21_1 if (BR2_UCLIBC_VERSION_0_9_32 || BR2_UCLIBC_VERSION_SNAPSHOT)
 	default BR2_BINUTILS_VERSION_2_21
 	help
 	  Select the version of binutils you wish to use.

From c1ae7cdd69b52a054b5ae822232634123281887b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Dec 2011 23:37:15 +0100
Subject: [PATCH 1053/6849] gcc: default to 4.5.x

The 4.3.x series is getting quite old, so let's use 4.5 instead.

There were reports of problems in the past, which is why this is done
early in the cycle.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 590526211b..e3d2587882 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -4,7 +4,7 @@ comment "GCC Options"
 
 choice
 	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_4_3_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+	default BR2_GCC_VERSION_4_5_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
 	help

From 7cfa3acbbe699998df03dbced331477b2a3d2110 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Dec 2011 23:39:57 +0100
Subject: [PATCH 1054/6849] gcc: remove old 4.2.4 version

We unfortunately cannot remove the avr32 variant yet.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.2.4/100-uclibc-conf.patch     | 200 ------------------
 toolchain/gcc/4.2.4/1000-aapcs-linux.patch    |  17 --
 .../4.2.4/1001-gcc-4.2.x-inhibit-libc.patch   |  66 ------
 .../4.2.4/103-uclibc-conf-noupstream.patch    |  11 -
 .../gcc/4.2.4/104-gnuhurd-uclibc-conf.patch   |  13 --
 toolchain/gcc/4.2.4/300-libstdc++-pic.patch   |  50 -----
 .../gcc/4.2.4/301-missing-execinfo_h.patch    |  11 -
 toolchain/gcc/4.2.4/302-c99-snprintf.patch    |  11 -
 .../gcc/4.2.4/303-c99-complex-ugly-hack.patch |  12 --
 toolchain/gcc/4.2.4/304-index_macro.patch     |  24 ---
 .../4.2.4/305-libmudflap-susv3-legacy.patch   |  49 -----
 toolchain/gcc/4.2.4/307-locale_facets.patch   |  26 ---
 .../4.2.4/402-libbackend_dep_gcov-iov.h.patch |  13 --
 toolchain/gcc/4.2.4/800-arm-bigendian.patch   |  67 ------
 .../4.2.4/904-flatten-switch-stmt-00.patch    | 153 --------------
 toolchain/gcc/4.2.4/910-soft-float.patch      |  26 ---
 toolchain/gcc/4.2.4/920-soft-float.patch      |  21 --
 toolchain/gcc/Config.in                       |   7 +-
 18 files changed, 1 insertion(+), 776 deletions(-)
 delete mode 100644 toolchain/gcc/4.2.4/100-uclibc-conf.patch
 delete mode 100644 toolchain/gcc/4.2.4/1000-aapcs-linux.patch
 delete mode 100644 toolchain/gcc/4.2.4/1001-gcc-4.2.x-inhibit-libc.patch
 delete mode 100644 toolchain/gcc/4.2.4/103-uclibc-conf-noupstream.patch
 delete mode 100644 toolchain/gcc/4.2.4/104-gnuhurd-uclibc-conf.patch
 delete mode 100644 toolchain/gcc/4.2.4/300-libstdc++-pic.patch
 delete mode 100644 toolchain/gcc/4.2.4/301-missing-execinfo_h.patch
 delete mode 100644 toolchain/gcc/4.2.4/302-c99-snprintf.patch
 delete mode 100644 toolchain/gcc/4.2.4/303-c99-complex-ugly-hack.patch
 delete mode 100644 toolchain/gcc/4.2.4/304-index_macro.patch
 delete mode 100644 toolchain/gcc/4.2.4/305-libmudflap-susv3-legacy.patch
 delete mode 100644 toolchain/gcc/4.2.4/307-locale_facets.patch
 delete mode 100644 toolchain/gcc/4.2.4/402-libbackend_dep_gcov-iov.h.patch
 delete mode 100644 toolchain/gcc/4.2.4/800-arm-bigendian.patch
 delete mode 100644 toolchain/gcc/4.2.4/904-flatten-switch-stmt-00.patch
 delete mode 100644 toolchain/gcc/4.2.4/910-soft-float.patch
 delete mode 100644 toolchain/gcc/4.2.4/920-soft-float.patch

diff --git a/toolchain/gcc/4.2.4/100-uclibc-conf.patch b/toolchain/gcc/4.2.4/100-uclibc-conf.patch
deleted file mode 100644
index 4243ff7b91..0000000000
--- a/toolchain/gcc/4.2.4/100-uclibc-conf.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- gcc/libgomp/configure
-+++ gcc/libgomp/configure
-@@ -3771,7 +3771,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/gcc/config/cris/linux.h
-+++ gcc/gcc/config/cris/linux.h
-@@ -74,7 +74,11 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -4276,7 +4276,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/zlib/configure
-+++ gcc/zlib/configure
-@@ -3422,7 +3422,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libobjc/configure
-+++ gcc/libobjc/configure
-@@ -3309,7 +3309,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libgfortran/configure
-+++ gcc/libgfortran/configure
-@@ -3695,7 +3695,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libmudflap/configure
-+++ gcc/libmudflap/configure
-@@ -5378,7 +5378,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/boehm-gc/configure
-+++ gcc/boehm-gc/configure
-@@ -4316,7 +4316,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libffi/configure
-+++ gcc/libffi/configure
-@@ -3453,7 +3453,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libssp/configure
-+++ gcc/libssp/configure
-@@ -4409,7 +4409,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/contrib/regression/objs-gcc.sh
-+++ gcc/contrib/regression/objs-gcc.sh
-@@ -105,6 +105,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
---- gcc/libjava/classpath/configure
-+++ gcc/libjava/classpath/configure
-@@ -4665,7 +4665,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libjava/configure
-+++ gcc/libjava/configure
-@@ -5212,7 +5212,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libtool.m4
-+++ gcc/libtool.m4
-@@ -739,7 +739,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/ltconfig
-+++ gcc/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/toolchain/gcc/4.2.4/1000-aapcs-linux.patch b/toolchain/gcc/4.2.4/1000-aapcs-linux.patch
deleted file mode 100644
index 80c5afc19f..0000000000
--- a/toolchain/gcc/4.2.4/1000-aapcs-linux.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-2008-10-07  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
-
-	* config.gcc (arm*-*-*): Add aapcs-linux to supported ABIs.
-
-Index: gcc/gcc/config.gcc
-===================================================================
---- gcc/gcc/config.gcc	(revision 140935)
-+++ gcc/gcc/config.gcc	(revision 140936)
-@@ -2656,7 +2656,7 @@
- 
- 		case "$with_abi" in
- 		"" \
--		| apcs-gnu | atpcs | aapcs | iwmmxt )
-+		| apcs-gnu | atpcs | aapcs | iwmmxt | aapcs-linux )
- 			#OK
- 			;;
- 		*)
diff --git a/toolchain/gcc/4.2.4/1001-gcc-4.2.x-inhibit-libc.patch b/toolchain/gcc/4.2.4/1001-gcc-4.2.x-inhibit-libc.patch
deleted file mode 100644
index b039dfc3d7..0000000000
--- a/toolchain/gcc/4.2.4/1001-gcc-4.2.x-inhibit-libc.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- gcc-4.2.4/gcc/unwind-sjlj.c.khem	2010-08-11 12:45:28.000000000 -0700
-+++ gcc-4.2.4/gcc/unwind-sjlj.c	2010-08-11 12:45:50.000000000 -0700
-@@ -28,6 +28,8 @@
-    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.  */
- 
-+#ifndef inhibit_libc
-+
- #include "tconfig.h"
- #include "tsystem.h"
- #include "coretypes.h"
-@@ -326,3 +328,4 @@ uw_identify_context (struct _Unwind_Cont
- #include "unwind.inc"
- 
- #endif /* USING_SJLJ_EXCEPTIONS */
-+#endif
---- gcc-4.2.4/gcc/unwind-dw2.c.khem	2010-08-11 12:42:45.000000000 -0700
-+++ gcc-4.2.4/gcc/unwind-dw2.c	2010-08-11 12:43:17.000000000 -0700
-@@ -28,6 +28,8 @@
-    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.  */
- 
-+#ifndef inhibit_libc
-+
- #include "tconfig.h"
- #include "tsystem.h"
- #include "coretypes.h"
-@@ -1537,3 +1539,5 @@ alias (_Unwind_SetIP);
- #endif
- 
- #endif /* !USING_SJLJ_EXCEPTIONS */
-+#endif
-+
---- gcc-4.2.4/gcc/unwind-dw2-fde-glibc.c.khem	2010-08-11 12:44:25.000000000 -0700
-+++ gcc-4.2.4/gcc/unwind-dw2-fde-glibc.c	2010-08-11 12:44:48.000000000 -0700
-@@ -29,6 +29,8 @@
-    segment and dl_iterate_phdr to avoid register/deregister calls at
-    DSO load/unload.  */
- 
-+#ifndef inhibit_libc
-+
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
-@@ -438,3 +440,4 @@ _Unwind_Find_FDE (void *pc, struct dwarf
- #if defined (USE_GAS_SYMVER) && defined (SHARED) && defined (USE_LIBUNWIND_EXCEPTIONS)
- alias (_Unwind_Find_FDE);
- #endif
-+#endif
---- gcc-4.2.4/gcc/unwind-dw2-fde.c	2005-06-25 03:02:01.000000000 +0100
-+++ gcc-4.2.4/gcc/unwind-dw2-fde.c	2010-08-12 10:43:24.221690613 +0100
-@@ -29,6 +29,8 @@
- Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.  */
-
-+#ifndef inhibit_libc
-+
- #ifndef _Unwind_Find_FDE
- #include "tconfig.h"
- #include "tsystem.h"
-@@ -1028,3 +1030,5 @@
-
-   return f;
- }
-+
-+#endif
diff --git a/toolchain/gcc/4.2.4/103-uclibc-conf-noupstream.patch b/toolchain/gcc/4.2.4/103-uclibc-conf-noupstream.patch
deleted file mode 100644
index 09c9bbecfb..0000000000
--- a/toolchain/gcc/4.2.4/103-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/gcc/config.gcc.uclibc100-sh~	2006-03-06 20:46:56 +0100
-+++ gcc/gcc/config.gcc	2006-03-10 15:02:41 +0100
-@@ -1905,7 +1905,7 @@
- 	;;
- sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
--  sh-*-linux* | sh[346lbe]*-*-linux* | \
-+  sh*-*-linux* | sh[346lbe]*-*-linux* | \
-   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
-    sh64-*-netbsd* | sh64l*-*-netbsd*)
- 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"
diff --git a/toolchain/gcc/4.2.4/104-gnuhurd-uclibc-conf.patch b/toolchain/gcc/4.2.4/104-gnuhurd-uclibc-conf.patch
deleted file mode 100644
index c04dd9ff00..0000000000
--- a/toolchain/gcc/4.2.4/104-gnuhurd-uclibc-conf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rdup gcc-4.2.1.oorig/gcc/config.gcc gcc-4.2.1/gcc/config.gcc
---- gcc-4.2.1.oorig/gcc/config.gcc	2007-10-01 11:52:52.000000000 +0200
-+++ gcc-4.2.1/gcc/config.gcc	2007-10-01 13:22:12.000000000 +0200
-@@ -494,6 +494,9 @@ case ${target} in
-     alpha*)
-       tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
-       ;;
-+    i[34567]86-*hurd*-*)
-+      tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/gnu.h gnu.h ${tm_file}"
-+      ;;
-     i[34567]86-*-*)
-       tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
-       ;;
diff --git a/toolchain/gcc/4.2.4/300-libstdc++-pic.patch b/toolchain/gcc/4.2.4/300-libstdc++-pic.patch
deleted file mode 100644
index 560bcb237b..0000000000
--- a/toolchain/gcc/4.2.4/300-libstdc++-pic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# DP: Build and install libstdc++_pic.a library.
-
---- gcc/libstdc++-v3/src/Makefile.am
-+++ gcc/libstdc++-v3/src/Makefile.am
-@@ -214,6 +214,12 @@
- 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
- 
- 
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
-+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Added bits to build debug library.
- if GLIBCXX_BUILD_DEBUG
- all-local: build_debug
---- gcc/libstdc++-v3/src/Makefile.in
-+++ gcc/libstdc++-v3/src/Makefile.in
-@@ -627,7 +627,7 @@
- 
- install-data-am: install-data-local
- 
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
- 
- install-info: install-info-am
- 
-@@ -660,6 +660,7 @@
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
- 	install-data-am install-data-local install-exec \
-+	install-exec-local \
- 	install-exec-am install-info install-info-am install-man \
- 	install-strip install-toolexeclibLTLIBRARIES installcheck \
- 	installcheck-am installdirs maintainer-clean \
-@@ -743,6 +743,13 @@
- install_debug:
- 	(cd ${debugdir} && $(MAKE) \
- 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
-+
-+install-exec-local:
-+ifeq ($(enable_shared),yes)
-+	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
-+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
-+endif
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/toolchain/gcc/4.2.4/301-missing-execinfo_h.patch b/toolchain/gcc/4.2.4/301-missing-execinfo_h.patch
deleted file mode 100644
index 0e2092f3fb..0000000000
--- a/toolchain/gcc/4.2.4/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
-+++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
-@@ -500,7 +500,7 @@
- #ifdef __linux__
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/toolchain/gcc/4.2.4/302-c99-snprintf.patch b/toolchain/gcc/4.2.4/302-c99-snprintf.patch
deleted file mode 100644
index dfb22d681b..0000000000
--- a/toolchain/gcc/4.2.4/302-c99-snprintf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h-orig	2005-04-29 00:08:41.000000000 -0500
-+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h	2005-04-29 00:08:45.000000000 -0500
-@@ -142,7 +142,7 @@
-   using ::vsprintf;
- }
- 
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/toolchain/gcc/4.2.4/303-c99-complex-ugly-hack.patch b/toolchain/gcc/4.2.4/303-c99-complex-ugly-hack.patch
deleted file mode 100644
index 2ccc80d9bb..0000000000
--- a/toolchain/gcc/4.2.4/303-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc-4.0.0/libstdc++-v3/configure-old	2005-04-30 22:04:48.061603912 -0500
-+++ gcc-4.0.0/libstdc++-v3/configure	2005-04-30 22:06:13.678588152 -0500
-@@ -7194,6 +7194,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <complex.h>
-+#ifdef __UCLIBC__
-+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
-+#endif
- int
- main ()
- {
diff --git a/toolchain/gcc/4.2.4/304-index_macro.patch b/toolchain/gcc/4.2.4/304-index_macro.patch
deleted file mode 100644
index d8e476555d..0000000000
--- a/toolchain/gcc/4.2.4/304-index_macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
-@@ -59,6 +59,9 @@
- #include <bits/allocator.h>
- #include <ext/hash_fun.h>
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- #   define __GC_CONST const
- # else
---- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
-+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
-@@ -53,6 +53,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
-   using std::size_t;
diff --git a/toolchain/gcc/4.2.4/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.2.4/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 374b1f8659..0000000000
--- a/toolchain/gcc/4.2.4/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gcc-4.2/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)
-+++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)
-@@ -427,7 +427,7 @@
- {
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
--  bzero (s, n);
-+  memset (s, 0, n);
- }
- 
- 
-@@ -437,7 +437,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
-   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
--  bcopy (src, dest, n);
-+  memmove (dest, src, n);
- }
- 
- 
-@@ -447,7 +447,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
-   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
--  return bcmp (s1, s2, n);
-+  return n == 0 ? 0 : memcmp (s1, s2, n);
- }
- 
- 
-@@ -456,7 +456,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
--  return index (s, c);
-+  return strchr (s, c);
- }
- 
- 
-@@ -465,7 +465,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
--  return rindex (s, c);
-+  return strrchr (s, c);
- }
- 
- /* XXX:  stpcpy, memccpy */
diff --git a/toolchain/gcc/4.2.4/307-locale_facets.patch b/toolchain/gcc/4.2.4/307-locale_facets.patch
deleted file mode 100644
index 412f8657dc..0000000000
--- a/toolchain/gcc/4.2.4/307-locale_facets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch fixes a bug into ostream::operator<<(double) due to the wrong size
-passed into the __convert_from_v method. The wrong size is then passed to
-std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.
-
-Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-
---- gcc-4.2.1/libstdc++-v3/include/bits/locale_facets.tcc	2006-10-17 18:43:47.000000000 +0200
-+++ gcc-4.2.1-st/libstdc++-v3/include/bits/locale_facets.tcc	2007-08-22 18:54:23.000000000 +0200
-@@ -1143,7 +1143,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
- 	const int __cs_size = __fixed ? __max_exp + __prec + 4
- 	                              : __max_digits * 2 + __prec;
- 	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
--	__len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, 
-+	__len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf, 
- 				      __prec, __v);
- #endif
- 
-@@ -1777,7 +1777,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
-       // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
-       const int __cs_size = numeric_limits<long double>::max_exponent10 + 3;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
--      int __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, "%.*Lf", 
-+      int __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, "%.*Lf", 
- 					0, __units);
- #endif
-       string_type __digits(__len, char_type());
diff --git a/toolchain/gcc/4.2.4/402-libbackend_dep_gcov-iov.h.patch b/toolchain/gcc/4.2.4/402-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index 0bf115c45d..0000000000
--- a/toolchain/gcc/4.2.4/402-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.2/gcc/Makefile.in
-===================================================================
---- gcc-4.2/gcc/Makefile.in	(revision 121758)
-+++ gcc-4.2/gcc/Makefile.in	(working copy)
-@@ -2658,7 +2658,7 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H) 
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
-   insn-config.h insn-flags.h insn-codes.h insn-constants.h \
--  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- 	  -DTARGET_NAME=\"$(target_noncanonical)\" \
- 	  -DLOCALEDIR=\"$(localedir)\" \
diff --git a/toolchain/gcc/4.2.4/800-arm-bigendian.patch b/toolchain/gcc/4.2.4/800-arm-bigendian.patch
deleted file mode 100644
index 07c6093379..0000000000
--- a/toolchain/gcc/4.2.4/800-arm-bigendian.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
---- gcc-4.2.0/gcc/config/arm/linux-elf.h
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h
-@@ -28,19 +28,33 @@
- #undef  TARGET_VERSION
- #define TARGET_VERSION  fputs (" (ARM GNU/Linux with ELF)", stderr);
- 
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
-+#define TARGET_ENDIAN_OPTION "mbig-endian"
-+#define TARGET_LINKER_EMULATION "armelfb_linux"
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#define TARGET_ENDIAN_OPTION "mlittle-endian"
-+#define TARGET_LINKER_EMULATION "armelf_linux"
-+#endif
-+
- #undef  TARGET_DEFAULT_FLOAT_ABI
- #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
- 
- #undef  TARGET_DEFAULT
--#define TARGET_DEFAULT (0)
-+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
- 
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
- 
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
- 
- #undef  MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--	{ "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+	{ "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
- 
- /* Now we define the strings used to build the spec file.  */
- #undef  LIB_SPEC
-@@ -61,7 +75,7 @@
-    %{rdynamic:-export-dynamic} \
-    %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
-    -X \
--   %{mbig-endian:-EB}" \
-+   %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
- #undef  LINK_SPEC
---- gcc-4.2.0/gcc/config.gcc.orig	2006-09-22 14:53:41.000000000 +0200
-+++ gcc-4.2.0/gcc/config.gcc	2006-09-25 10:45:21.000000000 +0200
-@@ -696,6 +696,11 @@
- 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
- 	tmake_file="${tmake_file} t-linux arm/t-arm"
- 	case ${target} in
-+	arm*b-*)
-+		tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+		;;
-+	esac
-+	case ${target} in
- 	arm*-*-linux-*eabi)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
diff --git a/toolchain/gcc/4.2.4/904-flatten-switch-stmt-00.patch b/toolchain/gcc/4.2.4/904-flatten-switch-stmt-00.patch
deleted file mode 100644
index 8fac37c4df..0000000000
--- a/toolchain/gcc/4.2.4/904-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15  Bernhard Fischer  <..>
-
-	* stmt.c (expand_case): Do not create a complex binary tree when
-	optimizing for size but rather use the simple ordered list.
-	(emit_case_nodes): do not emit jumps to the default_label when
-	optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i  -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i  -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
-   text	   data	    bss	    dec	    hex	filename
-    169	      0	      0	    169	     a9	switch-2.95.o
-    115	      0	      0	    115	     73	switch-3.3.o
-    103	      0	      0	    103	     67	switch-3.4.o
-    124	      0	      0	    124	     7c	switch-4.0.o
-    124	      0	      0	    124	     7c	switch-4.1.o
-    124	      0	      0	    124	     7c	switch-4.2.orig-HEAD.o
-     95	      0	      0	     95	     5f	switch-4.3-HEAD.o
-    124	      0	      0	    124	     7c	switch-4.3.orig-HEAD.o
-    166	      0	      0	    166	     a6	switch-CHAIN-2.95.o
-    111	      0	      0	    111	     6f	switch-CHAIN-3.3.o
-     95	      0	      0	     95	     5f	switch-CHAIN-3.4.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.0.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.1.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.2.orig-HEAD.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.3-HEAD.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
-Index: gcc-4.2.0/gcc/stmt.c
-===================================================================
---- gcc-4.2.0.orig/gcc/stmt.c	(revision 123843)
-+++ gcc-4.2.0/gcc/stmt.c	(working copy)
-@@ -2517,7 +2517,11 @@ expand_case (tree exp)
- 	  use_cost_table
- 	    = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- 	       && estimate_case_costs (case_list));
--	  balance_case_nodes (&case_list, NULL);
-+	  /* When optimizing for size, we want a straight list to avoid
-+	     jumps as much as possible. This basically creates an if-else
-+	     chain.  */
-+	  if (!optimize_size)
-+	    balance_case_nodes (&case_list, NULL);
- 	  emit_case_nodes (index, case_list, default_label, index_type);
- 	  emit_jump (default_label);
- 	}
-@@ -3075,6 +3079,7 @@ emit_case_nodes (rtx index, case_node_pt
- 	    {
- 	      if (!node_has_low_bound (node, index_type))
- 		{
-+		  if (!optimize_size) /* don't jl to the .default_label. */
- 		  emit_cmp_and_jump_insns (index,
- 					   convert_modes
- 					   (mode, imode,
-
-
-Content-Type: text/x-csrc; charset=us-ascii
-Content-Disposition: attachment; filename="switch.c"
-
-int
-commutative_tree_code (int code)
-{
-#define CASE(val, ret) case val:/* __asm__("# val="#val ",ret="#ret);*/ return ret;
-#ifndef CHAIN
-  switch (code)
-    {
-# if 1
-  CASE(1,3)
-  CASE(3,2)
-  CASE(5,8)
-  CASE(7,1)
-  CASE(33,4)
-  CASE(44,9)
-  CASE(55,10)
-  CASE(66,-1)
-  CASE(77,99)
-  CASE(666,0)
-# else
-    case 1:
-      return 3;
-    case 3:
-      return 2;
-    case 5:
-      return 8;
-    case 7:
-      return 1;
-    case 33:
-      return 4;
-    case 44:
-      return 9;
-    case 55:
-      return 10;
-    case 66:
-      return -1;
-    case 77:
-      return 99;
-    case 666:
-      return 0;
-# endif
-    default:
-      break;
-    }
-  return 4711;
-
-#else
-   if (code == 1)
-	return 3;
-  else if (code == 3)
-	return 2;
-  else if (code == 5)
-	return 8;
-  else if (code == 7)
-	return 1;
-  else if (code == 33)
-	return 4;
-  else if (code == 44)
-	return 9;
-  else if (code == 55)
-	return 10;
-  else if (code == 66)
-	return -1;
-  else if (code == 77)
-	return 99;
-  else if (code == 666)
-	return 0;
-  else
-	return 4711;
-#endif
-}
-
-
---AhhlLboLdkugWU4S--
-
diff --git a/toolchain/gcc/4.2.4/910-soft-float.patch b/toolchain/gcc/4.2.4/910-soft-float.patch
deleted file mode 100644
index 3f886acbf5..0000000000
--- a/toolchain/gcc/4.2.4/910-soft-float.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gcc-4.2-20061205/gcc/config/arm/t-linux    2006-12-08 15:18:33.000000000 -0800
-+++ gcc-4.2-20061205/gcc/config/arm/t-linux    2006-12-08 15:18:33.000000000 -0800
-@@ -4,7 +4,10 @@
- LIBGCC2_DEBUG_CFLAGS = -g0
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+      _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+      _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+      _fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-
---- gcc-4.2-20061205/gcc/config/arm/linux-elf.h        2006-12-08 15:18:33.000000000 -0800
-+++ gcc-4.2-20061205/gcc/config/arm/linux-elf.h        2006-12-08 15:18:33.000000000 -0800
-@@ -63,7 +63,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
diff --git a/toolchain/gcc/4.2.4/920-soft-float.patch b/toolchain/gcc/4.2.4/920-soft-float.patch
deleted file mode 100644
index 4287bfae27..0000000000
--- a/toolchain/gcc/4.2.4/920-soft-float.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNpr gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c
---- gcc-4.2.1_orig/gcc/config/rs6000/darwin-ldouble.c	2007-03-05 11:54:00.000000000 -0500
-+++ gcc-4.2.1/gcc/config/rs6000/darwin-ldouble.c	2008-01-31 17:51:24.000000000 -0500
-@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
-    but GCC currently generates poor code when a union is used to turn
-    a long double into a pair of doubles.  */
- 
-+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
-+
- long double __gcc_qadd (double, double, double, double);
- long double __gcc_qsub (double, double, double, double);
- long double __gcc_qmul (double, double, double, double);
-@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
-   return z.ldval;
- }
- 
--#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
--
- long double __gcc_qneg (double, double);
- int __gcc_qeq (double, double, double, double);
- int __gcc_qne (double, double, double, double);
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e3d2587882..dbcbbd3fdb 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -14,10 +14,6 @@ choice
 	       depends on BR2_avr32
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
-	config BR2_GCC_VERSION_4_2_4
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
-		bool "gcc 4.2.4"
-
 	config BR2_GCC_VERSION_4_3_X
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.3.x"
@@ -41,7 +37,7 @@ endchoice
 
 config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 	bool
-	default y if !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+	default y if !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 
 config BR2_GCC_SNAP_DATE
 	string "GCC snapshot date"
@@ -60,7 +56,6 @@ config BR2_GCC_SNAP_DATE
 config BR2_GCC_VERSION
 	string
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
-	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X

From c8623910ed01805ccd7408a0582ddabb7997a1a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Dec 2011 09:15:35 -0300
Subject: [PATCH 1055/6849] ipset: bump to version 6.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset-drop-modules.patch | 100 -------------------------
 package/ipset/ipset.mk                 |   3 +-
 2 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 package/ipset/ipset-drop-modules.patch

diff --git a/package/ipset/ipset-drop-modules.patch b/package/ipset/ipset-drop-modules.patch
deleted file mode 100644
index ee29d434a3..0000000000
--- a/package/ipset/ipset-drop-modules.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Drop all the kernel checks and let the user deal with having a new enough
-version of the kernel to enjoy this.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-
-diff -Nura ipset-6.8.orig//Makefile.am ipset-6.8/Makefile.am
---- ipset-6.8.orig//Makefile.am	2011-08-17 16:10:41.999386034 -0300
-+++ ipset-6.8/Makefile.am	2011-08-17 16:17:34.108702969 -0300
-@@ -4,11 +4,6 @@
- 
- include $(top_srcdir)/Make_global.am
- 
--if ! WITH_KBUILDDIR
--KBUILD_OUTPUT=/lib/modules/`uname -r`/build
--else
--KBUILD_OUTPUT=$(KBUILDDIR)
--endif
- if ! WITH_MAXSETS
- IP_SET_MAX=256
- else
-@@ -22,23 +17,6 @@
- 
- SUBDIRS		= lib src
- 
--modules_sparse:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
--			V=$V C=2 CF=-D__CHECK_ENDIAN__ \
--			IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
--
--modules:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \
--			IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
--
--modules_install:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
--			KDIR=$$PWD/kernel modules_install
--
--modules_clean:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
--			KDIR=$$PWD/kernel clean
--
- update_includes:
- 	./update ip_set.h
- 	./update ip_set_bitmap.h
-diff -Nura ipset-6.8.orig//configure.ac ipset-6.8/configure.ac
---- ipset-6.8.orig//configure.ac	2011-08-17 16:10:42.015387986 -0300
-+++ ipset-6.8/configure.ac	2011-08-17 16:18:01.578056869 -0300
-@@ -11,51 +11,6 @@
- *) AC_MSG_ERROR([Linux systems supported exclusively!]);;
- esac
- 
--dnl Additional arguments
--dnl Kernel build directory or source tree
--AC_ARG_WITH([kbuild],
--            AS_HELP_STRING([--with-kbuild=PATH],
--                           [Path to kernel build directory]),
--            [KBUILDDIR="$withval";])
--AC_ARG_WITH([ksource],
--            AS_HELP_STRING([--with-ksource=PATH],
--                           [Path to kernel source directory, if not the same as the kernel build directory]),
--            [KSOURCEDIR="$withval";])
--AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "")
--AC_SUBST(KBUILDDIR)
--
--dnl Sigh: check kernel version dependencies
--if test "$KBUILDDIR" != ""
--then
--	kbuilddir="$KBUILDDIR"
--else
--	kbuilddir="/lib/modules/`uname -r`/build"
--fi
--
--if test -n "$KSOURCEDIR"; then
--	ksourcedir="$KSOURCEDIR"
--elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then
--	ksourcedir="$kbuilddir"
--else
--	ksourcedir="/lib/modules/$(uname -r)/source"
--fi
--if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h"
--then
--	AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
--fi
--
--if test ! -e "$kbuilddir/.config"
--then
--	AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
--fi
--
--AC_PROG_GREP
--
--if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
--then
--	AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
--fi
--
- dnl Maximal number of sets supported by the kernel, default 256
- AC_ARG_WITH([maxsets],
- 	    AS_HELP_STRING([--with-maxsets=256],
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index f98f73f8a7..d8df0263a4 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.9.1
+IPSET_VERSION = 6.10
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
 IPSET_DEPENDENCIES = libmnl host-pkg-config
+IPSET_CONF_OPT = --with-kmod=no
 
 $(eval $(call AUTOTARGETS))

From 43ba7c1af8f89be7092516cada8e95e147f79e72 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Dec 2011 09:39:19 -0300
Subject: [PATCH 1056/6849] proftpd: security bump to version 1.3.3g

Security bump version to 1.3.3g, fix for CVE-2011-4130

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ... proftpd-1.3.3g-fix-kernel-header-capability-version.patch} | 0
 package/proftpd/proftpd.mk                                     | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename package/proftpd/{proftpd-1.3.3e-fix-kernel-header-capability-version.patch => proftpd-1.3.3g-fix-kernel-header-capability-version.patch} (100%)

diff --git a/package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.3g-fix-kernel-header-capability-version.patch
similarity index 100%
rename from package/proftpd/proftpd-1.3.3e-fix-kernel-header-capability-version.patch
rename to package/proftpd/proftpd-1.3.3g-fix-kernel-header-capability-version.patch
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 2523dd20da..5352ea7170 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -3,7 +3,8 @@
 # proftpd
 #
 #############################################################
-PROFTPD_VERSION = 1.3.3e
+
+PROFTPD_VERSION = 1.3.3g
 PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2
 PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source/
 

From 5ddcdb4ceb4eba32d4e32b1e2201df2836bbabf2 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 17 Oct 2011 10:41:05 +0200
Subject: [PATCH 1057/6849] New package: ImLib2

[Peter: Config.in tweaks, fix build without X]
Signed-off-by: Frederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: Matias Garcia <mgarcia@rossvideo.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Tested-By: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/imlib2/Config.in | 38 +++++++++++++++++++++++++++
 package/imlib2/imlib2.mk | 56 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 package/imlib2/Config.in
 create mode 100644 package/imlib2/imlib2.mk

diff --git a/package/Config.in b/package/Config.in
index e949649dc4..50fbfc0d52 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -279,6 +279,7 @@ source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
 source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
+source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
 source "package/libart/Config.in"
 source "package/libdrm/Config.in"
diff --git a/package/imlib2/Config.in b/package/imlib2/Config.in
new file mode 100644
index 0000000000..16a94d6ebb
--- /dev/null
+++ b/package/imlib2/Config.in
@@ -0,0 +1,38 @@
+config BR2_PACKAGE_IMLIB2
+	bool "imlib2"
+	select BR2_PACKAGE_FREETYPE
+	help
+	  Imlib 2 is the successor to Imlib. This library provides
+	  routines to load, save and render images in various formats.
+
+	  http://freshmeat.net/projects/imlib2/
+
+if BR2_PACKAGE_IMLIB2
+
+config BR2_PACKAGE_IMLIB2_JPEG
+	bool "JPEG support"
+	select BR2_PACKAGE_JPEG
+
+config BR2_PACKAGE_IMLIB2_PNG
+	bool "PNG support"
+	select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_IMLIB2_GIF
+	bool "GIF support"
+	select BR2_PACKAGE_LIBUNGIF
+
+config BR2_PACKAGE_IMLIB2_TIFF
+	bool "TIFF support"
+	select BR2_PACKAGE_TIFF
+
+config BR2_PACKAGE_IMLIB2_ID3
+	bool "ID3 support"
+	select BR2_PACKAGE_LIBID3TAG
+
+config BR2_PACKAGE_IMLIB2_X
+	bool "X support"
+	default y
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBX11
+endif
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
new file mode 100644
index 0000000000..5f10503da1
--- /dev/null
+++ b/package/imlib2/imlib2.mk
@@ -0,0 +1,56 @@
+#############################################################
+#
+## IMLIB2
+#
+##############################################################
+IMLIB2_VERSION = 1.4.5
+IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
+IMLIB2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
+IMLIB2_INSTALL_STAGING = YES
+IMLIB2_DEPENDENCIES = host-pkg-config freetype
+IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
+
+ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
+	IMLIB2_CONF_OPT += --with-x
+	IMLIB2_DEPENDENCIES += xlib_libX11 xlib_libXext
+else
+	IMLIB2_CONF_OPT += --without-x
+endif
+
+ifeq ($(BR2_PACKAGE_IMLIB2_JPEG),y)
+	IMLIB2_CONF_OPT += --with-jpeg
+	IMLIB2_DEPENDENCIES += jpeg
+else
+	IMLIB2_CONF_OPT += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_IMLIB2_PNG),y)
+	IMLIB2_CONF_OPT += --with-png
+	IMLIB2_DEPENDENCIES += libpng
+else
+	IMLIB2_CONF_OPT += --without-png
+endif
+
+ifeq ($(BR2_PACKAGE_IMLIB2_GIF),y)
+	IMLIB2_CONF_OPT += --with-gif
+	IMLIB2_DEPENDENCIES += libungif
+else
+	IMLIB2_CONF_OPT += --without-gif
+endif
+
+ifeq ($(BR2_PACKAGE_IMLIB2_TIFF),y)
+	IMLIB2_CONF_OPT += --with-tiff
+	IMLIB2_DEPENDENCIES += tiff
+else
+	IMLIB2_CONF_OPT += --without-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_IMLIB2_ID3),y)
+	IMLIB2_CONF_OPT += --with-id3
+	IMLIB2_DEPENDENCIES += libid3tag
+else
+	IMLIB2_CONF_OPT += --without-id3
+endif
+
+$(eval $(call AUTOTARGETS))
+

From 8ad1885adbf14bfe731873dedd4e47ef72674b17 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 10 Dec 2011 21:11:37 +0100
Subject: [PATCH 1058/6849] imlib2: fixup imlib2-config

Ensure it doesn't add library search paths (-L<dir>) to linker flags.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imlib2/imlib2.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index 5f10503da1..f32b86512b 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -52,5 +52,13 @@ else
 	IMLIB2_CONF_OPT += --without-id3
 endif
 
+# drop -L<dir> from linker flags
+define IMLIB2_FIXUP_IMLIB2_CONFIG
+	$(SED) 's/-L[^ ]*//g' \
+		$(STAGING_DIR)/usr/bin/imlib2-config
+endef
+
+IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG
+
 $(eval $(call AUTOTARGETS))
 

From 5917191b3fd88104493165c1bcb0e116b1f848da Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 17 Oct 2011 10:41:06 +0200
Subject: [PATCH 1059/6849] New package: giblib

[Peter: Needs X support and X support in imlib2]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Tested-By: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/giblib/Config.in | 10 ++++++++++
 package/giblib/giblib.mk | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/giblib/Config.in
 create mode 100644 package/giblib/giblib.mk

diff --git a/package/Config.in b/package/Config.in
index 50fbfc0d52..cf0f400413 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -277,6 +277,7 @@ source "package/cairo/Config.in"
 source "package/fltk/Config.in"
 source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
+source "package/giblib/Config.in"
 source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
 source "package/imlib2/Config.in"
diff --git a/package/giblib/Config.in b/package/giblib/Config.in
new file mode 100644
index 0000000000..7153bd5273
--- /dev/null
+++ b/package/giblib/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_GIBLIB
+	bool "giblib"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_IMLIB2
+	select BR2_PACKAGE_IMLIB2_X
+	help
+	  Giblib is a simple library which wraps imlib2.
+
+	  http://linuxbrit.co.uk/giblib/
+
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
new file mode 100644
index 0000000000..8288b743be
--- /dev/null
+++ b/package/giblib/giblib.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# giblib
+#
+#############################################################
+GIBLIB_VERSION = 1.2.4
+GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz
+GIBLIB_SITE = http://linuxbrit.co.uk/downloads/
+GIBLIB_INSTALL_STAGING = YES
+GIBLIB_DEPENDENCIES = imlib2
+GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr/lib \
+		  --with-imlib2-exec-prefix=$(STAGING)/usr/bin
+
+$(eval $(call AUTOTARGETS))

From 507e88bea8d57136a0966e3716b4698872d45d70 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 17 Oct 2011 10:41:07 +0200
Subject: [PATCH 1060/6849] New package: feh

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Tested-By: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |  1 +
 package/feh/Config.in | 14 ++++++++++++++
 package/feh/feh.mk    | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/feh/Config.in
 create mode 100644 package/feh/feh.mk

diff --git a/package/Config.in b/package/Config.in
index cf0f400413..eb93b1c45b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -133,6 +133,7 @@ source "package/fluxbox/Config.in"
 comment "X applications"
 source "package/alsamixergui/Config.in"
 source "package/docker/Config.in"
+source "package/feh/Config.in"
 source "package/gqview/Config.in"
 source "package/gmpc/Config.in"
 source "package/gob2/Config.in"
diff --git a/package/feh/Config.in b/package/feh/Config.in
new file mode 100644
index 0000000000..31e7239b55
--- /dev/null
+++ b/package/feh/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_FEH
+	bool "feh"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXINERAMA
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_IMLIB2_PNG
+	select BR2_PACKAGE_IMLIB2_JPEG
+	select BR2_PACKAGE_IMLIB2_X
+	select BR2_PACKAGE_GIBLIB
+	select BR2_PACKAGE_LIBCURL
+	help
+	  feh is an X11 image viewer aimed mostly at console users.
+
+	  http://feh.finalrewind.org/
diff --git a/package/feh/feh.mk b/package/feh/feh.mk
new file mode 100644
index 0000000000..eb682774e4
--- /dev/null
+++ b/package/feh/feh.mk
@@ -0,0 +1,21 @@
+FEH_VERSION = 2.0
+FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
+FEH_SITE = http://feh.finalrewind.org/
+FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt
+
+define FEH_BUILD_CMDS
+	$(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
+		-C $(@D) all
+endef
+
+define FEH_INSTALL_TARGET_CMDS
+	$(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \
+		DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+define FEH_UNINSTALL_TARGET_CMDS
+	$(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \
+		DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+endef
+
+$(eval $(call GENTARGETS))

From 97dad8faa977aafc54e10fc9f750f01ab8634847 Mon Sep 17 00:00:00 2001
From: Lukasz Pulka <lukasz@oxnet.pl>
Date: Sat, 10 Dec 2011 17:58:37 +0100
Subject: [PATCH 1061/6849] gst-dsp: Bump to version 0.10.0

Signed-off-by: Lukasz Pulka <lukasz@oxnet.pl>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-dsp/gst-dsp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index cd856c1381..1e1894deb4 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -1,4 +1,4 @@
-GST_DSP_VERSION = 0.9.0
+GST_DSP_VERSION = 0.10.0
 GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
 
 define GST_DSP_BUILD_CMDS

From 1d0aabccd4ec7f5601d54b0df7608342ab647943 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 9 Dec 2011 17:38:23 +0100
Subject: [PATCH 1062/6849] pcre: bump to 8.20

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/pcre.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 453565691f..d64106ed10 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCRE_VERSION = 7.9
+PCRE_VERSION = 8.20
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_INSTALL_STAGING = YES
 

From f113cc334059093a5a4aa8d04908f161835f7386 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Dec 2011 11:15:11 -0300
Subject: [PATCH 1063/6849] ffmpeg: bump to version 0.8.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../multimedia/ffmpeg/ffmpeg-sdlconfig.patch   | 18 +++++++++---------
 package/multimedia/ffmpeg/ffmpeg.mk            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
index de2c004c66..64371b29f3 100644
--- a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
+++ b/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
@@ -3,15 +3,15 @@ So just pass the whole string to make things simpler.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura ffmpeg-0.6.1/configure ffmpeg-0.6.1.sdl/configure
---- ffmpeg-0.6.1/configure	2010-06-15 16:44:30.000000000 -0300
-+++ ffmpeg-0.6.1.sdl/configure	2011-02-25 17:13:12.979168176 -0300
-@@ -2640,7 +2640,7 @@
-     die "ERROR: No version of libdc1394 found "
- fi
+diff -Nura ffmpeg-0.8.7.orig/configure ffmpeg-0.8.7/configure
+--- ffmpeg-0.8.7.orig/configure	2011-11-21 16:49:30.000000000 -0300
++++ ffmpeg-0.8.7/configure	2011-12-02 08:13:36.746619395 -0300
+@@ -2957,7 +2957,7 @@
+ enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore
+ enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
  
 -SDL_CONFIG="${cross_prefix}sdl-config"
 +SDL_CONFIG="${SDL_CONFIG}"
- if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
-     sdl_cflags=$("${SDL_CONFIG}" --cflags)
-     sdl_libs=$("${SDL_CONFIG}" --libs)
+ if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
+     check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
+     enable sdl &&
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index ca41892fc7..ef97674c1a 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FFMPEG_VERSION = 0.6.3
+FFMPEG_VERSION = 0.8.7
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From 4a9d409aba0c1d30645204d163517044fd56a7e5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Dec 2011 11:15:12 -0300
Subject: [PATCH 1064/6849] gst-ffmpeg: bump to version 0.10.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index 41a7f3be3b..c95563238e 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -4,11 +4,11 @@
 #
 #############################################################
 
-GST_FFMPEG_VERSION = 0.10.11
+GST_FFMPEG_VERSION = 0.10.13
 GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
 GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
 GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
+GST_FFMPEG_DEPENDENCIES = host-pkg-config gstreamer gst-plugins-base ffmpeg
 GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)

From 265356b6b979c960a899cdf3419a0a1c2b2f537c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Dec 2011 11:15:13 -0300
Subject: [PATCH 1065/6849] mpd: bump to version 0.16.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index b29b9f7a59..009fabbcaf 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.5
+MPD_VERSION = 0.16.6
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2

From 848fa1d24369a7e3cdd25b10a0d31ed1de501d01 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Dec 2011 21:54:52 +0100
Subject: [PATCH 1066/6849] opencv: bump version to fix ffmpeg support build

A newer version of opencv is needed after the ffmpeg version bump. This
version does need a minor patch for fabsl on uClibc though.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-uclibc-optional-long-double-support.patch | 40 +++++++++++++++++++
 package/opencv/opencv.mk                      |  5 +--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch

diff --git a/package/opencv/opencv-uclibc-optional-long-double-support.patch b/package/opencv/opencv-uclibc-optional-long-double-support.patch
new file mode 100644
index 0000000000..b319849fb1
--- /dev/null
+++ b/package/opencv/opencv-uclibc-optional-long-double-support.patch
@@ -0,0 +1,40 @@
+Upstream: https://code.ros.org/trac/opencv/ticket/1515
+
+[PATCH] Fix compile issue in flann module on uClibc without long double support
+
+uClibc configured without UCLIBC_HAS_LONG_DOUBLE_MATH (because of user
+choice or simply that the arch doesn't provide long doubles) doesn't
+provide fabsl(), breaking the build in the flann module.
+
+Work around it by not providing the long double template specialization.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ modules/flann/include/opencv2/flann/dist.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h
+===================================================================
+--- opencv-2.3.1a.orig/modules/flann/include/opencv2/flann/dist.h
++++ opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h
+@@ -40,6 +40,7 @@
+ #else
+ #include <stdint.h>
+ #endif
++#include <features.h>
+ 
+ #include "defines.h"
+ 
+@@ -59,9 +60,11 @@
+ template<>
+ inline double abs<double>(double x) { return fabs(x); }
+ 
++/* uClibc configured without long double math doesn't provide fabsl */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__))
+ template<>
+ inline long double abs<long double>(long double x) { return fabsl(x); }
+-
++#endif
+ 
+ template<typename T>
+ struct Accumulator { typedef T Type; };
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 202e0598e4..d415e5192e 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -3,9 +3,8 @@
 # OpenCV (Open Source Computer Vision)
 #
 #############################################################
-OPENCV_SERIES  = 2.3
-OPENCV_VERSION = $(OPENCV_SERIES).0
-OPENCV_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_SERIES)
+OPENCV_VERSION = 2.3.1a
+OPENCV_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1
 OPENCV_SOURCE  = OpenCV-$(OPENCV_VERSION).tar.bz2
 OPENCV_INSTALL_STAGING = YES
 

From 64be796285685d0a451f79d08108bd4c0198bce2 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 7 Dec 2011 20:00:07 +0100
Subject: [PATCH 1067/6849] sqlite: bump to version 3.7.9

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 10fe9fea40..5391d863b6 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3070800
+SQLITE_VERSION = 3070900
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From c0e8772a7fba6a4f7d010bdd1ffe39e12f42f3f2 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 7 Dec 2011 20:00:08 +0100
Subject: [PATCH 1068/6849] sqlite: remove obsolete configure options

Drop options that are unknown to the configure script.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 5391d863b6..f587f47705 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -16,11 +16,9 @@ ifneq ($(BR2_LARGEFILE),y)
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
 endif
 
-SQLITE_CONF_OPT =	--enable-tempstore=yes \
-			--enable-threadsafe \
-			--enable-releasemode \
-			--disable-tcl \
-			--localstatedir=/var
+SQLITE_CONF_OPT = \
+	--enable-threadsafe \
+	--localstatedir=/var
 
 ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
 SQLITE_DEPENDENCIES += ncurses readline

From d2e7ec721f28a360b6bda2ed7e0f26218accc292 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 7 Dec 2011 20:00:09 +0100
Subject: [PATCH 1069/6849] sqlite: refactor how CFLAGS are passed to the
 configure script

Change the way the SQLITE_CONF_ENV variable is constructed in
preparation of passing other CFLAGS to the configure script.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index f587f47705..0bee337e77 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -13,9 +13,11 @@ ifneq ($(BR2_LARGEFILE),y)
 # the sqlite configure script fails to define SQLITE_DISABLE_LFS when
 # --disable-largefile is passed, breaking the build. Work around it by
 # simply adding it to CFLAGS for configure instead
-SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
+SQLITE_CFLAGS += -DSQLITE_DISABLE_LFS
 endif
 
+SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
+
 SQLITE_CONF_OPT = \
 	--enable-threadsafe \
 	--localstatedir=/var

From 9bb9a6db18f9c54df3356bc5116ac064637e8368 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 7 Dec 2011 20:00:10 +0100
Subject: [PATCH 1070/6849] sqlite: add option to enable additional query
 optimizations (stat3)

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/Config.in | 8 ++++++++
 package/sqlite/sqlite.mk | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index f9b12ae9f2..25aaa3ff85 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -14,3 +14,11 @@ config BR2_PACKAGE_SQLITE_READLINE
 	help
 	  Enable command-line editing. This requires ncurses and readline.
 
+config BR2_PACKAGE_SQLITE_STAT3
+	bool "Additional query optimizations (stat3)"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  Adds additional logic to the ANALYZE command and to the query
+	  planner that can help SQLite to choose a better query plan under
+	  certain situations.
+
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 0bee337e77..042c7f91f9 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -16,6 +16,10 @@ ifneq ($(BR2_LARGEFILE),y)
 SQLITE_CFLAGS += -DSQLITE_DISABLE_LFS
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
+endif
+
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
 SQLITE_CONF_OPT = \

From 267e1672166741ec1d5049061cc010294545e512 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 9 Dec 2011 22:43:14 +0100
Subject: [PATCH 1071/6849] kernel-headers: bump 3.0.x / 3.1.x stable versions

[Peter: rename headers_install patch so it gets applied]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.12-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.13-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 9e72b00d2a..04407d1b39 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.12"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.4"		if BR2_KERNEL_HEADERS_3_1
+	default "3.0.13"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.5"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.12-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.13-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.12-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.13-headers_install-fix-__packed-in-exported-kernel-head.patch

From d170a72498c32302d49320004b1706e327104198 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 9 Dec 2011 22:43:15 +0100
Subject: [PATCH 1072/6849] linux: update stable kernel to 3.1.5

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index dc6aa733a5..3022b917f0 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_1
 
 config BR2_LINUX_KERNEL_3_1
-	bool "3.1.4"
+	bool "3.1.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1.4"
+	default "3.1.5"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1.4" if BR2_LINUX_KERNEL_3_1
+	default "3.1.5" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 1010c311c49b9f498e38941d86ba0a375bad1b8d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Dec 2011 22:35:35 +0100
Subject: [PATCH 1073/6849] barebox: add 2011.12 release, remove 2011.09

And mark 2011.10 as deprecated.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 0342a33b1f..b8e2b95d78 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,20 +8,20 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2011_11
+	default BR2_TARGET_BAREBOX_2011_12
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2011_09
-	depends on BR2_DEPRECATED
-	bool "2011.09"
-
 config BR2_TARGET_BAREBOX_2011_10
+	depends on BR2_DEPRECATED
 	bool "2011.10"
 
 config BR2_TARGET_BAREBOX_2011_11
 	bool "2011.11"
 
+config BR2_TARGET_BAREBOX_2011_12
+	bool "2011.12"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -39,9 +39,9 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2011.09.0"	if BR2_TARGET_BAREBOX_2011_09
 	default "2011.10.0"	if BR2_TARGET_BAREBOX_2011_10
 	default "2011.11.0"	if BR2_TARGET_BAREBOX_2011_11
+	default "2011.12.0"	if BR2_TARGET_BAREBOX_2011_12
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From b224dc9e0103d41396a9f59cc1e43b6d9578875d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Dec 2011 12:25:56 -0300
Subject: [PATCH 1074/6849] squid: bump to version 3.1.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index c5f66f6161..a2160f1ff6 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.16
+SQUID_VERSION = 3.1.18
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \

From 5806dd23ed28818b3787e027647f516f0bef352b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Dec 2011 12:25:57 -0300
Subject: [PATCH 1075/6849] vsftpd: bump to version 2.3.4

Bump vsftpd to version 2.3.4
Fixes build issues with binutils 2.22+ and changed upstream URL

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rgefile.patch => vsftpd-2.3.4-dont-force-largefile.patch} | 0
 package/vsftpd/vsftpd.mk                                     | 5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename package/vsftpd/{vsftpd-2.3.2-dont-force-largefile.patch => vsftpd-2.3.4-dont-force-largefile.patch} (100%)

diff --git a/package/vsftpd/vsftpd-2.3.2-dont-force-largefile.patch b/package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch
similarity index 100%
rename from package/vsftpd/vsftpd-2.3.2-dont-force-largefile.patch
rename to package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 44902875d1..e67ab4abfd 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -3,10 +3,9 @@
 # vsftpd
 #
 #############################################################
-VSFTPD_VERSION = 2.3.2
-VSFTPD_SOURCE = vsftpd-$(VSFTPD_VERSION).tar.gz
-VSFTPD_SITE = ftp://vsftpd.beasts.org/users/cevans
 
+VSFTPD_VERSION = 2.3.4
+VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
 
 define VSFTPD_ENABLE_SSL

From 190ec1134b69750b493ed356a9ff6b871c8fa09e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Dec 2011 12:26:00 -0300
Subject: [PATCH 1076/6849] xf86-video-sis: bump to version 0.10.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 8343761451..69a5d52ead 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.2
+XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.3
 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES

From e1d1c379e9f9aad3956f19a2c3d67eb7701cb48f Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sat, 10 Dec 2011 11:46:29 +0100
Subject: [PATCH 1077/6849] libcgi: build for target, not host

[Peter: Ensure correct CFLAGS are used, whitespace cleanup]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcgi/libcgi.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk
index 5867ff99db..5a52fa613d 100644
--- a/package/libcgi/libcgi.mk
+++ b/package/libcgi/libcgi.mk
@@ -3,9 +3,11 @@
 # libcgi
 #
 #############################################################
-LIBCGI_VERSION:=1.0
-LIBCGI_SOURCE:=libcgi-$(LIBCGI_VERSION).tar.gz
-LIBCGI_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcgi
-LIBCGI_INSTALL_STAGING=YES
+
+LIBCGI_VERSION = 1.0
+LIBCGI_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcgi
+LIBCGI_INSTALL_STAGING = YES
+# use cross CC/AR rather than host
+LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)"
 
 $(eval $(call AUTOTARGETS))

From 792b018b3712effe16da39787c8f75629fde8362 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 11 Dec 2011 23:20:35 +0100
Subject: [PATCH 1078/6849] libeXosip2: bump version

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/libeXosip2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 69fdca3264..4a00a2b2f1 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -3,7 +3,7 @@
 # libeXosip2
 #
 #############################################################
-LIBEXOSIP2_VERSION = 3.3.0
+LIBEXOSIP2_VERSION = 3.5.0
 LIBEXOSIP2_SOURCE = libexosip2_$(LIBEXOSIP2_VERSION).orig.tar.gz
 LIBEXOSIP2_PATCH = libexosip2_$(LIBEXOSIP2_VERSION)-1.diff.gz
 LIBEXOSIP2_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libe/libexosip2

From b6ec7ae656aaf629f1fc96c6ae27bbb8376e63b8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Fri, 14 Oct 2011 17:02:53 +0200
Subject: [PATCH 1079/6849] New package: xinput-calibrator

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 +
 package/x11r7/xapp_xinput_calibrator/Config.in       |  9 +++++++++
 .../xapp_xinput_calibrator/xapp_xinput-calibrator.mk | 12 ++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/x11r7/xapp_xinput_calibrator/Config.in
 create mode 100644 package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index c0c0043ba3..50816f23e9 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -129,6 +129,7 @@ endmenu
 		source package/x11r7/xapp_xhost/Config.in
 		source package/x11r7/xapp_xinit/Config.in
 		source package/x11r7/xapp_xinput/Config.in
+		source package/x11r7/xapp_xinput_calibrator/Config.in
 		source package/x11r7/xapp_xkbcomp/Config.in
 		source package/x11r7/xapp_xkbevd/Config.in
 		source package/x11r7/xapp_xkbprint/Config.in
diff --git a/package/x11r7/xapp_xinput_calibrator/Config.in b/package/x11r7/xapp_xinput_calibrator/Config.in
new file mode 100644
index 0000000000..47c607c8ec
--- /dev/null
+++ b/package/x11r7/xapp_xinput_calibrator/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR
+	bool "xinput-calibrator"
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXI
+	help
+	  A generic touchscreen calibration program for X.Org.
+
+	  http://www.freedesktop.org/wiki/Software/xinput_calibrator
+
diff --git a/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
new file mode 100644
index 0000000000..f84d1c2193
--- /dev/null
+++ b/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# xapp_xinput-calibrator
+#
+################################################################################
+
+XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5
+XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz
+XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator
+XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi
+
+$(eval $(call AUTOTARGETS))

From a877a07ee83878d6dae0dc364aacd4962fcf169a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Dec 2011 23:33:27 +0100
Subject: [PATCH 1080/6849] i2c-tools: fix Config.in whitespace

Purely cosmetical.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/i2c-tools/Config.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/i2c-tools/Config.in b/package/i2c-tools/Config.in
index 47d06420f3..43f5e05ae8 100644
--- a/package/i2c-tools/Config.in
+++ b/package/i2c-tools/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_I2C_TOOLS
-    bool "i2c-tools"
-    help
-        Heterogeneous set of I2C tools for Linux
+	bool "i2c-tools"
+	help
+	  Heterogeneous set of I2C tools for Linux
 
-        This package contains a heterogeneous set of I2C tools for Linux:
-        a bus probing tool, a chip dumper, register-level access helpers,
-        EEPROM decoding scripts, and more.
+	  This package contains a heterogeneous set of I2C tools for Linux:
+	  a bus probing tool, a chip dumper, register-level access helpers,
+	  EEPROM decoding scripts, and more.
 
-        http://www.lm-sensors.org
+	  http://www.lm-sensors.org

From 22acade2ec3116021304f82d157b3c09ab22f45e Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 6 Dec 2011 12:45:57 +0100
Subject: [PATCH 1081/6849] libffi: remove invalid variable 'includedir' in .pc
 file

Fixes the following error:

  Variable 'includedir' not defined in '/home/daniel/buildroot/output/host/usr/arm-unknown-linux-gnueabi/sysroot/usr/lib/pkgconfig/libffi.pc'

Also, use $(SED) instead of 'sed -i'.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 660a034787..5ada36d6f6 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -13,7 +13,8 @@ LIBFFI_INSTALL_STAGING = YES
 # accordingly
 define LIBFFI_MOVE_STAGING_HEADERS
 	mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/
-	sed -i '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
+	$(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
+	$(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
 endef
 
@@ -23,7 +24,8 @@ LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
 define LIBFFI_MOVE_TARGET_HEADERS
 	install -d $(TARGET_DIR)/usr/include/
 	mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/
-	sed -i '/^includedir.*/d' $(TARGET_DIR)/usr/lib/pkgconfig/libffi.pc
+	$(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
+	$(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
 endef
 

From d9c35d5ceaaf32b939e90277edc8f14153e9524c Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 6 Dec 2011 12:45:58 +0100
Subject: [PATCH 1082/6849] libffi: enable host target

libffi is a new requirement for libglib, and as libglib has to be built
for the host as well, libffi has to follow.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 5ada36d6f6..e9e87ef242 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -32,4 +32,5 @@ endef
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 

From 1bde07d6edb12a686203e8be7d65a3d62a88e0da Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Dec 2011 23:54:12 +0100
Subject: [PATCH 1083/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 330ac6a2dd..515e3db138 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 	Fixes all over the tree and new features.
 
+	Toolchain: Default to GCC 4.5.x, add binutils 2.22.
+
 	Gentargets: scp and mercurial support.
 
 	defconfigs: qemu configs for x86-64 and sparc.
@@ -9,13 +11,16 @@
 	uClibc: remove 0.9.30, backport unshare() support.
 
 	Updated/fixed packages: barebox, bash, binutils, bison,
-	coreutils, dbus-glib, diffutils, dropbear, ebtables, flex,
-	fluxbox, gawk, grep, gst-dsp, htop, iproute2, iw, lame,
-	libgpg-error, libgtk2, libroxml, m4, module-init-tools,
-	mtd-utils, nano, nbd, netsnmp, ruby, u-boot, usbmount,
-	wpa_supplicant, xdm
-
-	New packages: connman, transmission
+	coreutils, dbus-glib, diffutils, dropbear, ebtables, ffmpeg,
+	flex, fluxbox, gawk, grep, gst-dsp, gst-ffmpeg, htop,
+	i2c-tools, iproute2, ipset, iw, lame, libcgi, libeXosip2,
+	libffi, libgpg-error, libgtk2, libroxml, m4,
+	module-init-tools, mpd, mtd-utils, nano, nbd, netsnmp, opencv,
+	pcre, proftpd, ruby, sqlite, squid, u-boot, usbmount, vsftpd,
+	wpa_supplicant, xdm, xf86-video-sis
+
+	New packages: connman, gliblib, feh, imlib2, transmission,
+	xinput-calibrator
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 40955025d880ca9029dc7d4bcfc5fec3750718fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Dec 2011 08:58:40 +0100
Subject: [PATCH 1084/6849] xinput-calibrator: needs C++ support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xinput_calibrator/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/x11r7/xapp_xinput_calibrator/Config.in b/package/x11r7/xapp_xinput_calibrator/Config.in
index 47c607c8ec..ac98b8d0d3 100644
--- a/package/x11r7/xapp_xinput_calibrator/Config.in
+++ b/package/x11r7/xapp_xinput_calibrator/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR
 	bool "xinput-calibrator"
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXI
 	help
@@ -7,3 +8,5 @@ config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR
 
 	  http://www.freedesktop.org/wiki/Software/xinput_calibrator
 
+comment "xinput-calibrator requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP

From 12c9f7dd6dee9c6029b4f9a12d6aac1516911ab4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Dec 2011 10:25:50 +0100
Subject: [PATCH 1085/6849] Makefile: ensure CONFIG_SITE isn't set

Fixes lib/lib64 issue when building on OpenSUSE.

Reported-by: Guillaume Gardet <guillaume.gardet@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 84cea1c951..242265f2cf 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,7 @@ unexport CPP
 unexport CFLAGS
 unexport CXXFLAGS
 unexport GREP_OPTIONS
+unexport CONFIG_SITE
 
 GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 

From 62c10600ab3a0958c9a141de7f99cfbf55308cd9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Dec 2011 21:13:34 +0100
Subject: [PATCH 1086/6849] libosip: bump version, use upstream directly

Instead of Debian.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libosip2/libosip2.mk | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 29d2a55141..1d53f76b4b 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -3,24 +3,10 @@
 # libosip2
 #
 #############################################################
-LIBOSIP2_VERSION = 3.3.0
-LIBOSIP2_SOURCE = libosip2_$(LIBOSIP2_VERSION).orig.tar.gz
-LIBOSIP2_PATCH = libosip2_$(LIBOSIP2_VERSION)-1.diff.gz
-LIBOSIP2_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libo/libosip2
-LIBOSIP2_INSTALL_STAGING = YES
-
-ifneq ($(LIBOSIP2_PATCH),)
-define LIBOSIP2_DEBIAN_PATCHES
-	if [ -d $(@D)/debian/patches ]; then \
-		(cd $(@D)/debian/patches && for i in *; \
-		 do $(SED) 's,^\+\+\+ .*cvs-$(LIBOSIP2_VERSION)/,+++ cvs-$(LIBOSIP2_VERSION)/,' $$i; \
-		 done; \
-		); \
-		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
-	fi
-endef
-endif
 
-LIBOSIP2_POST_PATCH_HOOKS += LIBOSIP2_DEBIAN_PATCHES
+LIBOSIP2_VERSION = 3.6.0
+LIBOSIP2_SOURCE = libosip2-$(LIBOSIP2_VERSION).tar.gz
+LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
+LIBOSIP2_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From d8ce8742e2b87c9e8fb34d5c5ce565cf3b3a3891 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Dec 2011 17:19:01 +0100
Subject: [PATCH 1087/6849] libeXosip2: fix openssl handling

Build libeXosip2 after openssl if enabled, and explicitly disable support
for it otherwise, so configure doesn't end up looking for it on host.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/libeXosip2.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 4a00a2b2f1..7c4753df33 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -11,6 +11,13 @@ LIBEXOSIP2_INSTALL_STAGING = YES
 
 LIBEXOSIP2_DEPENDENCIES = host-pkg-config libosip2
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBEXOSIP2_DEPENDENCIES += openssl
+LIBEXOSIP2_CONF_OPT += --enable-openssl
+else
+LIBEXOSIP2_CONF_OPT += --disable-openssl
+endif
+
 ifneq ($(LIBEXOSIP2_PATCH),)
 define LIBEXOSIP2_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \

From 02ad75e9ee750782a8186d6aec8c478528735f1b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 12 Dec 2011 20:35:16 +0100
Subject: [PATCH 1088/6849] libeXosip: bump version, use upstream directly

Instead of Debian.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libeXosip2-fix-non-ipv6-build.patch       | 22 +++++++++++++++++++
 package/libeXosip2/libeXosip2.mk              | 22 ++++---------------
 2 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 package/libeXosip2/libeXosip2-fix-non-ipv6-build.patch

diff --git a/package/libeXosip2/libeXosip2-fix-non-ipv6-build.patch b/package/libeXosip2/libeXosip2-fix-non-ipv6-build.patch
new file mode 100644
index 0000000000..bec833fb73
--- /dev/null
+++ b/package/libeXosip2/libeXosip2-fix-non-ipv6-build.patch
@@ -0,0 +1,22 @@
+[PATCH] Fix build on systems without IPV6_TCLASS support
+
+The wrong variable name was used.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/eXtl_udp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libeXosip2-3.6.0/src/eXtl_udp.c
+===================================================================
+--- libeXosip2-3.6.0.orig/src/eXtl_udp.c
++++ libeXosip2-3.6.0/src/eXtl_udp.c
+@@ -178,7 +178,7 @@
+ 		res = setsockopt(udp_socket, IPPROTO_IPV6, IPV6_TCLASS,
+ 			(SOCKET_OPTION_VALUE)&tos, sizeof(tos));
+ #else
+-		retval = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS,
++		res = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS,
+ 			(SOCKET_OPTION_VALUE)&tos, sizeof(tos));
+ #endif
+ 	}
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 7c4753df33..4b778a98e6 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -3,10 +3,10 @@
 # libeXosip2
 #
 #############################################################
-LIBEXOSIP2_VERSION = 3.5.0
-LIBEXOSIP2_SOURCE = libexosip2_$(LIBEXOSIP2_VERSION).orig.tar.gz
-LIBEXOSIP2_PATCH = libexosip2_$(LIBEXOSIP2_VERSION)-1.diff.gz
-LIBEXOSIP2_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libe/libexosip2
+
+LIBEXOSIP2_VERSION = 3.6.0
+LIBEXOSIP2_SOURCE = libeXosip2-$(LIBEXOSIP2_VERSION).tar.gz
+LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
 LIBEXOSIP2_INSTALL_STAGING = YES
 
 LIBEXOSIP2_DEPENDENCIES = host-pkg-config libosip2
@@ -18,18 +18,4 @@ else
 LIBEXOSIP2_CONF_OPT += --disable-openssl
 endif
 
-ifneq ($(LIBEXOSIP2_PATCH),)
-define LIBEXOSIP2_DEBIAN_PATCHES
-	if [ -d $(@D)/debian/patches ]; then \
-		(cd $(@D)/debian/patches && for i in *; \
-		 do $(SED) 's,^\+\+\+ .*cvs-$(LIBEXOSIP2_VERSION)/,+++ cvs-$(LIBEXOSIP2_VERSION)/,' $$i; \
-		 done; \
-		); \
-		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
-	fi
-endef
-endif
-
-LIBEXOSIP2_POST_PATCH_HOOKS += LIBEXOSIP2_DEBIAN_PATCHES
-
 $(eval $(call AUTOTARGETS))

From 8145105ee348fe560222cb8a244188659d636690 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Dec 2011 15:19:20 +0100
Subject: [PATCH 1089/6849] beecrypt: bump version, build with C++ support if
 available

The issue with cppglue.cxx is still present in 4.2.1, but the previous
workaround had to be extended to allow builds with C++ support.
Similary, the ICU check didn't handle cross compilation.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/beecrypt/Config.in                    |  4 +++
 .../beecrypt/beecrypt-4.1.2_no-cxx-glue.patch | 12 -------
 .../beecrypt-cppglue.cxx-cplusplus-only.patch | 28 +++++++++++++++++
 .../beecrypt-icu-check-cross-compile.patch    | 31 +++++++++++++++++++
 package/beecrypt/beecrypt.mk                  | 23 +++++++++++---
 5 files changed, 81 insertions(+), 17 deletions(-)
 delete mode 100644 package/beecrypt/beecrypt-4.1.2_no-cxx-glue.patch
 create mode 100644 package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch
 create mode 100644 package/beecrypt/beecrypt-icu-check-cross-compile.patch

diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index 264516eba4..2673877bae 100644
--- a/package/beecrypt/Config.in
+++ b/package/beecrypt/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_BEECRYPT
 	bool "beecrypt"
+	select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
 	help
 	  Beecrypt is a general-purpose cryptography library.
 
 	  http://beecrypt.sf.net
+
+comment "beecrypt C++ support requires a toolchain with WCHAR enabled"
+	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR
diff --git a/package/beecrypt/beecrypt-4.1.2_no-cxx-glue.patch b/package/beecrypt/beecrypt-4.1.2_no-cxx-glue.patch
deleted file mode 100644
index 6c4093677c..0000000000
--- a/package/beecrypt/beecrypt-4.1.2_no-cxx-glue.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru beecrypt-4.1.2_vanilla/Makefile.am beecrypt-4.1.2_disable-cxxglue/Makefile.am
---- beecrypt-4.1.2_vanilla/Makefile.am	2004-12-22 07:06:31.000000000 +0000
-+++ beecrypt-4.1.2_disable-cxxglue/Makefile.am	2008-03-21 23:24:51.000000000 +0000
-@@ -49,7 +49,7 @@
- 
- libalt_LTLIBRARIES = libbeecrypt.la
- 
--libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c cppglue.cxx
-+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c
- libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
- libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo
- libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
diff --git a/package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch b/package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch
new file mode 100644
index 0000000000..298e3eba93
--- /dev/null
+++ b/package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch
@@ -0,0 +1,28 @@
+Makefile.am: Only compile/link cppglue.cxx if --with-cplusplus is used
+
+Bloats libbeecrypt for no use and breaks build on systems without a C++
+compiler.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile.am |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+Index: beecrypt-4.2.1/Makefile.am
+===================================================================
+--- beecrypt-4.2.1.orig/Makefile.am
++++ beecrypt-4.2.1/Makefile.am
+@@ -62,7 +62,12 @@
+ 
+ lib_LTLIBRARIES = libbeecrypt.la
+ 
+-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx
++libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c
++
++if WITH_CPLUSPLUS
++libbeecrypt_la_SOURCES += cppglue.cxx
++endif
++
+ libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
+ libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS)
+ libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
diff --git a/package/beecrypt/beecrypt-icu-check-cross-compile.patch b/package/beecrypt/beecrypt-icu-check-cross-compile.patch
new file mode 100644
index 0000000000..cc02116506
--- /dev/null
+++ b/package/beecrypt/beecrypt-icu-check-cross-compile.patch
@@ -0,0 +1,31 @@
+configure: Use AC_COMPILE_IFELSE for ICU check for cross compilation compat
+
+AC_RUN_IFELSE doesn't work when cross compiling, but we can do the
+check in the preprocessor instead, so use AC_COMPILE_IFELSE instead.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: beecrypt-4.2.1/configure.ac
+===================================================================
+--- beecrypt-4.2.1.orig/configure.ac
++++ beecrypt-4.2.1/configure.ac
+@@ -295,13 +295,13 @@
+ if test "$ac_with_cplusplus" = yes; then
+   AC_MSG_CHECKING([for IBM's ICU library version >= 2.8])
+   AC_LANG_PUSH(C)
+-  AC_RUN_IFELSE([
++  AC_COMPILE_IFELSE([
+     AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[
+       #if U_ICU_VERSION_MAJOR_NUM < 2
+-      exit(1);
++      #error too old
+       #elif U_ICU_VERSION_MAJOR_NUM == 2
+       # if U_ICU_VERSION_MINOR_NUM < 8
+-      exit(1);
++      #error too old
+       # else
+       exit(0);
+       # endif
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index 06c359e9bc..a0187cee6c 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -3,14 +3,27 @@
 # beecrypt
 #
 #############################################################
-BEECRYPT_VERSION = 4.1.2
+BEECRYPT_VERSION = 4.2.1
 BEECRYPT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/beecrypt
 BEECRYPT_AUTORECONF = YES
 BEECRYPT_INSTALL_STAGING = YES
-
-BEECRYPT_CONF_OPT =  --without-cplusplus \
+BEECRYPT_CONF_OPT = \
 		--without-java \
-		--without-python  \
-		--disable-rpath
+		--without-python
+
+ifeq ($(BR2_PACKAGE_ICU),y)
+# C++ support needs icu
+BEECRYPT_DEPENDENCIES += icu
+else
+BEECRYPT_CONF_OPT += --without-cplusplus
+
+# automake/libtool uses the C++ compiler to link libbeecrypt because of
+# (the optional) cppglue.cxx. Force it to use the C compiler instead.
+define BEECRYPT_LINK_WITH_CC
+	$(SED) 's/--tag=CXX/--tag=CC/g' $(@D)/Makefile
+endef
+
+BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC
+endif
 
 $(eval $(call AUTOTARGETS))

From 0bf480856ecec5c5f27622b36a9800172f41f865 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 16 Dec 2011 17:22:59 +0100
Subject: [PATCH 1090/6849] repair ML search knob

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 docs/lists.html | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/lists.html b/docs/lists.html
index 31d47d4d01..b806d77db7 100644
--- a/docs/lists.html
+++ b/docs/lists.html
@@ -21,16 +21,20 @@ <h3>Search the List Archives</h3>
 <p>
 
 <center>
-<form method="GET" action="http://www.google.com/custom">
-<input type="hidden" name="domains" value="lists.busybox.net">
-<input type="hidden" name="sitesearch" value="lists.busybox.net">
-<input type="text" name="q" size="31" maxlength="255" value="">
-<br>
-<input type="submit" name="sa" value="search the mailing list archives">
-<br>
-<a href="http://www.google.com/"><img src="http://www.google.com/logos/Logo_25wht.gif" border="0" alt="Google" height="32" width="75" align="middle"></a>
-<br>
-</form>
+<div id="cse" style="width: 100%;">Loading</div>
+<script src="http://www.google.com/jsapi" type="text/javascript"></script>
+<script type="text/javascript">
+	google.load('search', '1', {language : 'en'});
+	google.setOnLoadCallback(function() {
+		var customSearchControl = new google.search.CustomSearchControl(
+					      '009810735161915413714:3rfmqierl8s');
+		customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+		var customSearchOptions = new google.search.DrawOptions();
+		customSearchOptions.enableSearchboxOnly("http://google.com/cse?cx=009810735161915413714:3rfmqierl8s");
+		customSearchControl.draw('cse', customSearchOptions);
+	}, true);
+</script>
+<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
 </center>
 
 <!--#include file="footer.html" -->

From b008550f7fbaae2eae926b5906ce70d075190756 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Dec 2011 16:04:09 +0100
Subject: [PATCH 1091/6849] mtd-utils: bump version

Fixes an issue with erases on NOR flash with linux 3.2+.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 6b014407cd..42fa7aa8b2 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION = 1.4.8
+MTD_VERSION = 1.4.9
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

From 54b2f131067003fc53240b9bd4497a25c145591a Mon Sep 17 00:00:00 2001
From: Henri Bragge <henri.bragge@gmail.com>
Date: Fri, 16 Dec 2011 22:08:59 +0200
Subject: [PATCH 1092/6849] uboot-tools: fix install commands

Signed-off-by: Henri Bragge <henri.bragge@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uboot-tools/uboot-tools.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index e20560ab23..00592d6eb2 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -13,13 +13,13 @@ endef
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y)
 define UBOOT_TOOLS_INSTALL_MKIMAGE
-	install -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin/mkimage
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
 define UBOOT_TOOLS_INSTALL_FWPRINTENV
-	install -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin
+	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 endef
 endif
@@ -48,7 +48,7 @@ define HOST_UBOOT_TOOLS_BUILD_CMDS
 endef
 
 define HOST_UBOOT_TOOLS_INSTALL_CMDS
-	install -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin
+	$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
 endef
 
 $(eval $(call GENTARGETS))

From 2d7d697fbfc2273ed1decd3b1c13411ba7ba24a4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Dec 2011 22:00:33 +0100
Subject: [PATCH 1093/6849] busybox: add 1.19.3 for wget redirect handling

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.19.3/busybox-1.19.3-wget.patch  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch

diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
new file mode 100644
index 0000000000..e98a506cbb
--- /dev/null
+++ b/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
@@ -0,0 +1,29 @@
+--- busybox-1.19.3/networking/wget.c
++++ busybox-1.19.3-wget/networking/wget.c
+@@ -552,6 +552,7 @@ static void download_one_url(const char 
+ 	FILE *dfp;                      /* socket to ftp server (data)      */
+ 	char *proxy = NULL;
+ 	char *fname_out_alloc;
++	char *redirected_path = NULL;
+ 	struct host_info server;
+ 	struct host_info target;
+ 
+@@ -794,8 +795,8 @@ However, in real world it was observed t
+ 					bb_error_msg_and_die("too many redirections");
+ 				fclose(sfp);
+ 				if (str[0] == '/') {
+-					free(target.allocated);
+-					target.path = target.allocated = xstrdup(str+1);
++					free(redirected_path);
++					target.path = redirected_path = xstrdup(str+1);
+ 					/* lsa stays the same: it's on the same server */
+ 				} else {
+ 					parse_url(str, &target);
+@@ -850,6 +851,7 @@ However, in real world it was observed t
+ 	free(server.allocated);
+ 	free(target.allocated);
+ 	free(fname_out_alloc);
++	free(redirected_path);
+ }
+ 
+ int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

From 4e20e8fe00b7125e2fe4538c69c6560f5bb75121 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Dec 2011 23:11:14 +0100
Subject: [PATCH 1094/6849] package: add Javascript menu and jQuery package

A lot of open source Javascript libraries can be interesting to use on
embedded systems, so add a specific Javascript menu and the probably most
well known library of them all, jQuery.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  4 ++++
 package/jquery/Config.in |  8 ++++++++
 package/jquery/jquery.mk | 17 +++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/jquery/Config.in
 create mode 100644 package/jquery/jquery.mk

diff --git a/package/Config.in b/package/Config.in
index eb93b1c45b..b8eb066144 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -322,6 +322,10 @@ source "package/java/concierge/Config.in"
 endmenu
 endif
 
+menu "Javascript"
+source "package/jquery/Config.in"
+endmenu
+
 menu "Networking"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
diff --git a/package/jquery/Config.in b/package/jquery/Config.in
new file mode 100644
index 0000000000..92f5604270
--- /dev/null
+++ b/package/jquery/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_JQUERY
+	bool "jQuery"
+	help
+	  jQuery is a fast and concise JavaScript Library that
+	  simplifies HTML document traversing, event handling,
+	  animating, and Ajax interactions for rapid web development.
+
+	  http://jquery.com
diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
new file mode 100644
index 0000000000..aba6301cae
--- /dev/null
+++ b/package/jquery/jquery.mk
@@ -0,0 +1,17 @@
+JQUERY_VERSION = 1.7.1
+JQUERY_SITE = http://code.jquery.com
+JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js
+
+define JQUERY_EXTRACT_CMDS
+	cp $(DL_DIR)/$(JQUERY_SOURCE) $(@D)
+endef
+
+define JQUERY_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/$(JQUERY_SOURCE) $(TARGET_DIR)/var/www/jquery.js
+endef
+
+define JQUERY_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/var/www/jquery.js
+endef
+
+$(eval $(call GENTARGETS))

From 50e00c3b6d2a40ea69716cb3df160a40892e19fe Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Dec 2011 23:26:31 +0100
Subject: [PATCH 1095/6849] package: add jQuery Validation plugin

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                              |  1 +
 package/jquery-validation/Config.in            |  9 +++++++++
 package/jquery-validation/jquery-validation.mk | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/jquery-validation/Config.in
 create mode 100644 package/jquery-validation/jquery-validation.mk

diff --git a/package/Config.in b/package/Config.in
index b8eb066144..2c15f23a87 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -324,6 +324,7 @@ endif
 
 menu "Javascript"
 source "package/jquery/Config.in"
+source "package/jquery-validation/Config.in"
 endmenu
 
 menu "Networking"
diff --git a/package/jquery-validation/Config.in b/package/jquery-validation/Config.in
new file mode 100644
index 0000000000..2a764c1017
--- /dev/null
+++ b/package/jquery-validation/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_JQUERY_VALIDATION
+	bool "jQuery-Validation"
+	select BR2_PACKAGE_JQUERY
+	help
+	  The jQuery Validation Plugin provides drop-in validation for
+	  your existing forms, while making all kinds of
+	  customizations to fit your application really easy.
+
+	  http://bassistance.de/jquery-plugins/jquery-plugin-validation/
diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
new file mode 100644
index 0000000000..5f25b58e95
--- /dev/null
+++ b/package/jquery-validation/jquery-validation.mk
@@ -0,0 +1,18 @@
+JQUERY_VALIDATION_VERSION = 1.9.0
+JQUERY_VALIDATION_SITE = http://jquery.bassistance.de/validate
+JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip
+
+define JQUERY_VALIDATION_EXTRACT_CMDS
+	unzip -d $(BUILD_DIR) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)
+endef
+
+define JQUERY_VALIDATION_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/jquery.validate.min.js \
+		$(TARGET_DIR)/var/www/jquery.validate.js
+endef
+
+define JQUERY_VALIDATION_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/var/www/jquery.validate.js
+endef
+
+$(eval $(call GENTARGETS))

From 645ff758fea4c640d1afc8d1a00da1a5f0b076ab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Dec 2011 23:40:11 +0100
Subject: [PATCH 1096/6849] package: add jQuery sparkline plugin

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/jquery-sparkline/Config.in           | 13 +++++++++++++
 package/jquery-sparkline/jquery-sparkline.mk | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/jquery-sparkline/Config.in
 create mode 100644 package/jquery-sparkline/jquery-sparkline.mk

diff --git a/package/Config.in b/package/Config.in
index 2c15f23a87..5520279830 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -324,6 +324,7 @@ endif
 
 menu "Javascript"
 source "package/jquery/Config.in"
+source "package/jquery-sparkline/Config.in"
 source "package/jquery-validation/Config.in"
 endmenu
 
diff --git a/package/jquery-sparkline/Config.in b/package/jquery-sparkline/Config.in
new file mode 100644
index 0000000000..ae66364aa6
--- /dev/null
+++ b/package/jquery-sparkline/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_JQUERY_SPARKLINE
+	bool "jQuery-Sparkline"
+	select BR2_PACKAGE_JQUERY
+	help
+	  This jQuery plugin generates sparklines (small inline
+	  charts) directly in the browser using data supplied either
+	  inline in the HTML, or via javascript.
+
+	  The plugin is compatible with most modern browsers and has
+	  been tested with Firefox 2+, Safari 3+, Opera 9, Google
+	  Chrome and Internet Explorer 6, 7 & 8.
+
+	  http://www.omnipotent.net/jquery.sparkline/
diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
new file mode 100644
index 0000000000..93dddf094a
--- /dev/null
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -0,0 +1,18 @@
+JQUERY_SPARKLINE_VERSION = 1.6
+JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
+JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
+
+define JQUERY_SPARKLINE_EXTRACT_CMDS
+	cp $(DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D)
+endef
+
+define JQUERY_SPARKLINE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/$(JQUERY_SPARKLINE_SOURCE) \
+		$(TARGET_DIR)/var/www/jquery.sparkline.js
+endef
+
+define JQUERY_SPARKLINE_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/var/www/jquery.sparkline.js
+endef
+
+$(eval $(call GENTARGETS))

From a8342a525bb2287846d1dcfd279e54b1bfc2d3db Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 19 Dec 2011 00:01:43 +0100
Subject: [PATCH 1097/6849] package: add flot jQuery plugin

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/flot/Config.in | 59 ++++++++++++++++++++++++++++++++++++++++++
 package/flot/flot.mk   | 23 ++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 package/flot/Config.in
 create mode 100644 package/flot/flot.mk

diff --git a/package/Config.in b/package/Config.in
index 5520279830..bfa4b405f4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -323,6 +323,7 @@ endmenu
 endif
 
 menu "Javascript"
+source "package/flot/Config.in"
 source "package/jquery/Config.in"
 source "package/jquery-sparkline/Config.in"
 source "package/jquery-validation/Config.in"
diff --git a/package/flot/Config.in b/package/flot/Config.in
new file mode 100644
index 0000000000..60534c1da9
--- /dev/null
+++ b/package/flot/Config.in
@@ -0,0 +1,59 @@
+config BR2_PACKAGE_FLOT
+	bool "flot"
+	select BR2_PACKAGE_JQUERY
+	help
+	  Flot is a pure Javascript plotting library for jQuery. It
+	  produces graphical plots of arbitrary datasets on-the-fly
+	  client-side.
+
+	  The focus is on simple usage (all settings are optional),
+	  attractive looks and interactive features like zooming and
+	  mouse tracking.
+
+	  The plugin works with Internet Explorer 6+, Firefox 2.x+,
+	  Safari 3.0+, Opera 9.5+ and Konqueror 4.x+ with the HTML
+	  canvas tag.
+
+	  https://code.google.com/p/flot/
+
+if BR2_PACKAGE_FLOT
+
+comment "flot plugins"
+
+config BR2_PACKAGE_FLOT_NAVIGATE
+	bool "navigate"
+	help
+	  Flot plugin for adding panning and zooming capabilities to a plot
+
+config BR2_PACKAGE_FLOT_PIE
+	bool "pie"
+	help
+	  Flot plugin for rendering pie charts
+
+config BR2_PACKAGE_FLOT_RESIZE
+	bool "resize"
+	help
+	  Flot plugin for automatically redrawing plots when the
+	  placeholder size changes.
+
+config BR2_PACKAGE_FLOT_SELECTION
+	bool "selection"
+	help
+	  Flot plugin for selecting regions
+
+config BR2_PACKAGE_FLOT_STACK
+	bool "stack"
+	help
+	  Flot plugin for stacking data sets
+
+config BR2_PACKAGE_FLOT_SYMBOL
+	bool "symbol"
+	help
+	  Flot plugin that adds some extra symbols for plotting points
+
+config BR2_PACKAGE_FLOT_THRESHOLD
+	bool "threshold"
+	help
+	  Flot plugin for thresholding data
+
+endif
diff --git a/package/flot/flot.mk b/package/flot/flot.mk
new file mode 100644
index 0000000000..df3f4d18af
--- /dev/null
+++ b/package/flot/flot.mk
@@ -0,0 +1,23 @@
+FLOT_VERSION = 0.7
+FLOT_SITE = http://flot.googlecode.com/files
+FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
+	$(if $(BR2_PACKAGE_FLOT_NAVIGATE),navigate) \
+	$(if $(BR2_PACKAGE_FLOT_PIE),pie) \
+	$(if $(BR2_PACKAGE_FLOT_RESIZE),resize) \
+	$(if $(BR2_PACKAGE_FLOT_SELECTION),selection) \
+	$(if $(BR2_PACKAGE_FLOT_STACK),stack) \
+	$(if $(BR2_PACKAGE_FLOT_SYMBOL),symbol) \
+	$(if $(BR2_PACKAGE_FLOT_THRESHOLD),threshold) \
+	)
+
+define FLOT_INSTALL_TARGET_CMDS
+	for i in $(FLOT_FILES); do \
+		$(INSTALL) -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js; \
+	done
+endef
+
+define FLOT_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/var/www/jquery.flot*
+endef
+
+$(eval $(call GENTARGETS))

From 1886506b6b9e45f678f98e3d8e50bbcde1acad95 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 19 Dec 2011 00:07:46 +0100
Subject: [PATCH 1098/6849] package: add explorercanvas

Explorercanvas is a HTML5 canvas tag emulation library for IE<9.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/explorercanvas/Config.in         | 10 ++++++++++
 package/explorercanvas/explorercanvas.mk | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/explorercanvas/Config.in
 create mode 100644 package/explorercanvas/explorercanvas.mk

diff --git a/package/Config.in b/package/Config.in
index bfa4b405f4..1c62ea37eb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -323,6 +323,7 @@ endmenu
 endif
 
 menu "Javascript"
+source "package/explorercanvas/Config.in"
 source "package/flot/Config.in"
 source "package/jquery/Config.in"
 source "package/jquery-sparkline/Config.in"
diff --git a/package/explorercanvas/Config.in b/package/explorercanvas/Config.in
new file mode 100644
index 0000000000..9714a580ce
--- /dev/null
+++ b/package/explorercanvas/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_EXPLORERCANVAS
+	bool "explorercanvas"
+	help
+	  Modern browsers like Firefox, Safari, Chrome and Opera
+	  support the HTML5 canvas tag to allow 2D command-based
+	  drawing. ExplorerCanvas brings the same functionality to
+	  Internet Explorer (<v9). To use, web developers only need to
+	  include a single script tag in their existing web pages.
+
+	  http://excanvas.sf.net/
diff --git a/package/explorercanvas/explorercanvas.mk b/package/explorercanvas/explorercanvas.mk
new file mode 100644
index 0000000000..93dcb1f836
--- /dev/null
+++ b/package/explorercanvas/explorercanvas.mk
@@ -0,0 +1,18 @@
+EXPLORERCANVAS_VERSION = r3
+EXPLORERCANVAS_SITE = http://explorercanvas.googlecode.com/files/
+EXPLORERCANVAS_SOURCE = excanvas_$(EXPLORERCANVAS_VERSION).zip
+
+define EXPLORERCANVAS_EXTRACT_CMDS
+	unzip -d $(@D) $(DL_DIR)/$(EXPLORERCANVAS_SOURCE)
+endef
+
+define EXPLORERCANVAS_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/excanvas.compiled.js \
+		$(TARGET_DIR)/var/www/excanvas.js
+endef
+
+define EXPLORERCANVAS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/var/www/excanvas.js
+endef
+
+$(eval $(call GENTARGETS))

From 4565a1d75f7576c4b654152e1e5162f8b932f1ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 19 Dec 2011 15:53:40 +0100
Subject: [PATCH 1099/6849] package: add jsmin (javascript minimizer)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/jsmin/Config.in | 11 +++++++++++
 package/jsmin/jsmin.mk  | 25 +++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/jsmin/Config.in
 create mode 100644 package/jsmin/jsmin.mk

diff --git a/package/Config.in b/package/Config.in
index 1c62ea37eb..adebd4be76 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -328,6 +328,7 @@ source "package/flot/Config.in"
 source "package/jquery/Config.in"
 source "package/jquery-sparkline/Config.in"
 source "package/jquery-validation/Config.in"
+source "package/jsmin/Config.in"
 endmenu
 
 menu "Networking"
diff --git a/package/jsmin/Config.in b/package/jsmin/Config.in
new file mode 100644
index 0000000000..d0948b8914
--- /dev/null
+++ b/package/jsmin/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_JSMIN
+	bool "jsmin"
+	help
+	  JSMin is a filter which removes comments and unnecessary
+	  whitespace from JavaScript files. It typically reduces
+	  filesize by half, resulting in faster downloads. It also
+	  encourages a more expressive programming style because it
+	  eliminates the download cost of clean, literate
+	  self-documentation.
+
+	  http://www.crockford.com/javascript/jsmin.html
diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
new file mode 100644
index 0000000000..1c414ff904
--- /dev/null
+++ b/package/jsmin/jsmin.mk
@@ -0,0 +1,25 @@
+JSMIN_VERSION = a9b47554d5684a55301a2eb7ca8480b7ee7630d4
+JSMIN_SITE = git://github.com/douglascrockford/JSMin.git
+
+define JSMIN_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin
+endef
+
+define JSMIN_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/jsmin $(TARGET_DIR)/usr/bin/jsmin
+endef
+
+define INPUT_EVENT_DAEMON_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/jsmin
+endef
+
+define HOST_JSMIN_BUILD_CMDS
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin
+endef
+
+define HOST_JSMIN_INSTALL_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/jsmin $(HOST_DIR)/usr/bin/jsmin
+endef
+
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))

From 601bf47ef8a68f773393210b5a7c54f9020ec91a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 20 Dec 2011 11:24:29 +0100
Subject: [PATCH 1100/6849] package: don't install javascript files as
 executable

install defaults to mode 0755, not 0644, so explicitly pass mode to
ensure .js files aren't made executable.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flot/flot.mk                           | 2 +-
 package/jquery-sparkline/jquery-sparkline.mk   | 2 +-
 package/jquery-validation/jquery-validation.mk | 2 +-
 package/jquery/jquery.mk                       | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index df3f4d18af..8b51b55213 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -12,7 +12,7 @@ FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
 
 define FLOT_INSTALL_TARGET_CMDS
 	for i in $(FLOT_FILES); do \
-		$(INSTALL) -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js; \
+		$(INSTALL) -m 0644 -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js; \
 	done
 endef
 
diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index 93dddf094a..d0b478a4cc 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -7,7 +7,7 @@ define JQUERY_SPARKLINE_EXTRACT_CMDS
 endef
 
 define JQUERY_SPARKLINE_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/$(JQUERY_SPARKLINE_SOURCE) \
+	$(INSTALL) -m 0644 -D $(@D)/$(JQUERY_SPARKLINE_SOURCE) \
 		$(TARGET_DIR)/var/www/jquery.sparkline.js
 endef
 
diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
index 5f25b58e95..5fee4c16f5 100644
--- a/package/jquery-validation/jquery-validation.mk
+++ b/package/jquery-validation/jquery-validation.mk
@@ -7,7 +7,7 @@ define JQUERY_VALIDATION_EXTRACT_CMDS
 endef
 
 define JQUERY_VALIDATION_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/jquery.validate.min.js \
+	$(INSTALL) -m 0644 -D $(@D)/jquery.validate.min.js \
 		$(TARGET_DIR)/var/www/jquery.validate.js
 endef
 
diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index aba6301cae..08dd4a37fb 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -7,7 +7,8 @@ define JQUERY_EXTRACT_CMDS
 endef
 
 define JQUERY_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/$(JQUERY_SOURCE) $(TARGET_DIR)/var/www/jquery.js
+	$(INSTALL) -m 0644 -D $(@D)/$(JQUERY_SOURCE) \
+		$(TARGET_DIR)/var/www/jquery.js
 endef
 
 define JQUERY_UNINSTALL_TARGET_CMDS

From 47f20335f548994216e8299eac9dd6295c042773 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 20 Dec 2011 13:10:17 +0100
Subject: [PATCH 1101/6849] jsmin: fix typo in uninstall target

Thanks to Thomas for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jsmin/jsmin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index 1c414ff904..491bb3e5b7 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -9,7 +9,7 @@ define JSMIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/jsmin $(TARGET_DIR)/usr/bin/jsmin
 endef
 
-define INPUT_EVENT_DAEMON_UNINSTALL_TARGET_CMDS
+define JSMIN_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/jsmin
 endef
 

From 7f4a2bbcf397fb843a8abac78901a692fa576c5f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 21 Dec 2011 10:12:17 +0100
Subject: [PATCH 1102/6849] lighttpd: bump version, security fix

Important changes:

- [mod_auth] Fix signedness error in http_auth (CVE-2011-4362)
- ssl: disable client initiated renegotiations
- ssl: support mitigating BEAST attack
- fix connection stalls

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/lighttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 3f11be33bb..b8aa310c96 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIGHTTPD_VERSION = 1.4.29
+LIGHTTPD_VERSION = 1.4.30
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_DEPENDENCIES = host-pkg-config
 LIGHTTPD_CONF_OPT = \

From a9326c9aabac95d43ac10937ff5ff2b4c2437eb6 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Wed, 14 Dec 2011 16:04:07 +0100
Subject: [PATCH 1103/6849] package: add libesmtp

This is a library for sending email through SMTP.

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libesmtp/Config.in   |  6 ++++++
 package/libesmtp/libesmtp.mk | 11 +++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/libesmtp/Config.in
 create mode 100644 package/libesmtp/libesmtp.mk

diff --git a/package/Config.in b/package/Config.in
index adebd4be76..b6df18ab5b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -336,6 +336,7 @@ source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
 source "package/libcurl/Config.in"
 source "package/libdnet/Config.in"
+source "package/libesmtp/Config.in"
 source "package/libeXosip2/Config.in"
 source "package/libidn/Config.in"
 source "package/libmicrohttpd/Config.in"
diff --git a/package/libesmtp/Config.in b/package/libesmtp/Config.in
new file mode 100644
index 0000000000..4e9e455d81
--- /dev/null
+++ b/package/libesmtp/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBESMTP
+	bool "libesmtp"
+	help
+	  Library for sending emails through SMTP.
+
+	  http://www.stafford.uklinux.net/libesmtp
diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
new file mode 100644
index 0000000000..63f31923c8
--- /dev/null
+++ b/package/libesmtp/libesmtp.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# libesmtp
+#
+#############################################################
+LIBESMTP_VERSION = 1.0.6
+LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
+LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
+LIBESMTP_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From d134ce8b56175b84614bda58191075c3582ce6cc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 14 Dec 2011 12:15:16 -0300
Subject: [PATCH 1104/6849] ethtool: bump to version 3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index a42169c4b0..04f7dacf31 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.0
-ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool/
+ETHTOOL_VERSION = 3.1
+ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 
 $(eval $(call AUTOTARGETS))

From b2b55b459c5e61575b5ff3e10e5161f87c0da8df Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 14 Dec 2011 12:15:17 -0300
Subject: [PATCH 1105/6849] libcap: security bump to version 2.22

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...m.patch => libcap-2.22-build-system.patch} | 34 +++++++++----------
 package/libcap/libcap.mk                      |  7 ++--
 2 files changed, 22 insertions(+), 19 deletions(-)
 rename package/libcap/{libcap-2.20-build-system.patch => libcap-2.22-build-system.patch} (74%)

diff --git a/package/libcap/libcap-2.20-build-system.patch b/package/libcap/libcap-2.22-build-system.patch
similarity index 74%
rename from package/libcap/libcap-2.20-build-system.patch
rename to package/libcap/libcap-2.22-build-system.patch
index 397aff2a60..8915a69ecc 100644
--- a/package/libcap/libcap-2.20-build-system.patch
+++ b/package/libcap/libcap-2.22-build-system.patch
@@ -3,21 +3,33 @@ Also install the shared lib +x
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules
---- libcap-2.20/Make.Rules	2011-01-19 02:06:44.000000000 -0300
-+++ libcap-2.20-build/Make.Rules	2011-04-19 14:07:53.544903094 -0300
+diff -Nura libcap-2.22.orig/libcap/Makefile libcap-2.22/libcap/Makefile
+--- libcap-2.22.orig/libcap/Makefile	2010-08-08 19:26:04.000000000 -0300
++++ libcap-2.22/libcap/Makefile	2011-12-14 11:33:51.761800334 -0300
+@@ -65,7 +65,7 @@
+ 	install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ 	mkdir -p -m 0755 $(LIBDIR)
+ 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
+-	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
++	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
+ ifeq ($(FAKEROOT),)
+diff -Nura libcap-2.22.orig/Make.Rules libcap-2.22/Make.Rules
+--- libcap-2.22.orig/Make.Rules	2011-07-24 23:18:23.000000000 -0300
++++ libcap-2.22/Make.Rules	2011-12-14 11:33:28.707278685 -0300
 @@ -47,25 +47,25 @@
  KERNEL_HEADERS := $(topdir)/libcap/include
  IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  
 -CC := gcc
--CFLAGS := -O2
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 -BUILD_CC := $(CC)
 -BUILD_CFLAGS := $(CFLAGS) $(IPATH)
 -AR := ar
 -RANLIB := ranlib
 +CC ?= gcc
-+CFLAGS ?= -O2
++CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 +BUILD_CC ?= $(CC)
 +BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
 +AR ?= ar
@@ -40,15 +52,3 @@ diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules
  INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
  LIBATTR := yes
-diff -Nura libcap-2.20/libcap/Makefile libcap-2.20-build/libcap/Makefile
---- libcap-2.20/libcap/Makefile	2010-08-08 19:26:04.000000000 -0300
-+++ libcap-2.20-build/libcap/Makefile	2011-04-19 14:08:29.377146094 -0300
-@@ -65,7 +65,7 @@
- 	install -m 0644 include/sys/capability.h $(INCDIR)/sys
- 	mkdir -p -m 0755 $(LIBDIR)
- 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
--	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
-+	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
- ifeq ($(FAKEROOT),)
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index a7b33a0ee4..9d6acf2e38 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -4,8 +4,11 @@
 #
 #############################################################
 
-LIBCAP_VERSION = 2.20
-LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
+LIBCAP_VERSION = 2.22
+# Until kernel.org is completely back up use debian mirror
+#LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
+LIBCAP_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libc/libcap2
+LIBCAP_SOURCE = libcap2_$(LIBCAP_VERSION).orig.tar.gz
 LIBCAP_DEPENDENCIES = host-libcap
 LIBCAP_INSTALL_STAGING = YES
 

From ef3fe1bef6581c66af3858d540343e011cb9fdd6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 14 Dec 2011 12:15:18 -0300
Subject: [PATCH 1106/6849] cdrkit: bump to version 1.1.11 and adjust style

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0-no-rcmd.patch => cdrkit-1.1.11-no-rcmd.patch} |  0
 package/cdrkit/cdrkit.mk                           | 14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 rename package/cdrkit/{cdrkit-1.1.10-no-rcmd.patch => cdrkit-1.1.11-no-rcmd.patch} (100%)

diff --git a/package/cdrkit/cdrkit-1.1.10-no-rcmd.patch b/package/cdrkit/cdrkit-1.1.11-no-rcmd.patch
similarity index 100%
rename from package/cdrkit/cdrkit-1.1.10-no-rcmd.patch
rename to package/cdrkit/cdrkit-1.1.11-no-rcmd.patch
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index 9eebe6e075..fc22c18865 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -1,9 +1,13 @@
-CDRKIT_VERSION=1.1.10
-CDRKIT_SOURCE=cdrkit-$(CDRKIT_VERSION).tar.gz
-CDRKIT_SITE=http://www.cdrkit.org/releases/
+#############################################################
+#
+# cdrkit
+#
+#############################################################
 
-CDRKIT_DEPENDENCIES=libcap bzip2 zlib
-HOST_CDRKIT_DEPENDENCIES=host-libcap host-bzip2 host-zlib
+CDRKIT_VERSION = 1.1.11
+CDRKIT_SITE = http://www.cdrkit.org/releases
+CDRKIT_DEPENDENCIES = libcap bzip2 zlib
+HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib
 
 ifeq ($(BR2_ENDIAN),"BIG")
 CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1

From 808bfd0731c4aa97582e056533b173d3a10b1ca8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 21 Dec 2011 23:57:41 +0100
Subject: [PATCH 1107/6849] kernel-headers: bump 3.0.x / 3.1.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.13-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.14-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 04407d1b39..e092651146 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -57,7 +57,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.13"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.5"		if BR2_KERNEL_HEADERS_3_1
+	default "3.0.14"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.6"		if BR2_KERNEL_HEADERS_3_1
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.13-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.14-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.13-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.14-headers_install-fix-__packed-in-exported-kernel-head.patch

From 3f83273eefb1f72194ee7a9e26d995e37cd53684 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 23 Dec 2011 12:15:04 +0100
Subject: [PATCH 1108/6849] xapp_xman: fix dependencies

xman needs libXaw, has optional Xprintutil support and doesn't have a
--disable-IPv6 option.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xman/Config.in    | 1 +
 package/x11r7/xapp_xman/xapp_xman.mk | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xman/Config.in b/package/x11r7/xapp_xman/Config.in
index af9525bf40..4f4f067e31 100644
--- a/package/x11r7/xapp_xman/Config.in
+++ b/package/x11r7/xapp_xman/Config.in
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_XAPP_XMAN
 	bool "xman"
+	select BR2_PACKAGE_XLIB_LIBXAW
 	help
 	  Manual page display program for the X Window System
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index e3f623e503..2706d61a5f 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -7,11 +7,14 @@ XAPP_XMAN_VERSION:=1.0.3
 XAPP_XMAN_SOURCE:=xman-$(XAPP_XMAN_VERSION).tar.bz2
 XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAN_INSTALL_TARGET = YES
+XAPP_XMAN_DEPENDENCIES = xlib_libXaw
 
 XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
 		ac_cv_file__etc_man_config=no \
 		ac_cv_file__etc_manpath_config=no
 
-XAPP_XMAN_CONF_OPT = --disable-IPv6
+ifeq ($(BR2_PACKAGE_XLIB_LIBXPRINTUTIL),y)
+XAPP_XMAN_CONF_OPT += --enable-xprint
+endif
 
 $(eval $(call AUTOTARGETS))

From 39ae9160d419944193b1d77f7f8f86112de0a629 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 24 Dec 2011 14:06:58 +0100
Subject: [PATCH 1109/6849] xapp_xman: drop optional xprint option

When built with --enable-xprint, xman needs libXaw8 (rather than libXaw7),
which we don't have in buildroot.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xman/xapp_xman.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 2706d61a5f..6caaf3fa33 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -13,8 +13,4 @@ XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
 		ac_cv_file__etc_man_config=no \
 		ac_cv_file__etc_manpath_config=no
 
-ifeq ($(BR2_PACKAGE_XLIB_LIBXPRINTUTIL),y)
-XAPP_XMAN_CONF_OPT += --enable-xprint
-endif
-
 $(eval $(call AUTOTARGETS))

From 24c80c9bfdac00e185b9239a43c2e897d4763cd3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 24 Dec 2011 16:22:06 +0100
Subject: [PATCH 1110/6849] git.html: fix cgit link

There's an issue with the cgit installation, which causes
git.buildroot.net/buildroot (no trailing /) requests to return stale
results. The osuosl people are looking into it, but until then atleast
use the the correct URL on the website link.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/git.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/git.html b/docs/git.html
index 111a29a305..bf894b9fc4 100644
--- a/docs/git.html
+++ b/docs/git.html
@@ -4,7 +4,7 @@
 <h3>Git Access</h3>
 
 The buildroot repository can be browsed online through cgit at
-<a href="http://git.buildroot.net/buildroot">http://git.buildroot.net/buildroot</a>.
+<a href="http://git.buildroot.net/buildroot/">http://git.buildroot.net/buildroot</a>.
 To grab a copy of the repository use
 
 <pre>

From 4f266b685f487d92208f07c0f5b2fa50e042bf06 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Sat, 3 Dec 2011 18:03:28 +0100
Subject: [PATCH 1111/6849] libnl: bump to version 3.2.3

This newer version splits the library code into libnl, libnl-route,
libnl-genl and libnl-nf, each individually selectable via pkgconfig.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index dd0d7fb14a..612908bc1d 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.0
+LIBNL_VERSION = 3.2.3
 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES

From 11f7a7b4fb676ae6db33c03402e624ad5b5d6968 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Sat, 3 Dec 2011 18:03:29 +0100
Subject: [PATCH 1112/6849] hostapd: fix build with new libnl-3

The CFLAGS have to be augmented for the include dir and a small patch
will make the binary link to libnl-3 and libnl-genl-3 instead of libnl
and libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd-0.7.3-libnl3.patch | 15 +++++++++++++++
 package/hostapd/hostapd.mk                 |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 package/hostapd/hostapd-0.7.3-libnl3.patch

diff --git a/package/hostapd/hostapd-0.7.3-libnl3.patch b/package/hostapd/hostapd-0.7.3-libnl3.patch
new file mode 100644
index 0000000000..e47da73dd6
--- /dev/null
+++ b/package/hostapd/hostapd-0.7.3-libnl3.patch
@@ -0,0 +1,15 @@
+--- a/src/drivers/drivers.mak	2011-11-29 19:09:23.889942913 +0100
++++ b/src/drivers/drivers.mak	2011-11-29 19:09:40.637381428 +0100
+@@ -31,10 +31,10 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
++DRV_LIBS += -lnl-3
+ 
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
++DRV_LIBS += -lnl-genl-3
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 0d6c2c53a5..26ebf1de0b 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -18,6 +18,7 @@ endif
 
 define HOSTAPD_LIBNL_CONFIG
 	echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG)
+	echo "CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG)
 endef
 
 define HOSTAPD_CRYPTO_CONFIG

From 2ed19cb1debbf31407ea3d704ce921d1b51ac13f Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Sat, 3 Dec 2011 18:03:30 +0100
Subject: [PATCH 1113/6849] wpa_supplicant: fix build with new libnl-3

The CFLAGS have to be augmented for the include dir and a small patch
will make the binary link to libnl-3 and libnl-genl-3 instead of libnl
and libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../wpa_supplicant-0.7.3-libnl-3.patch            | 15 +++++++++++++++
 package/wpa_supplicant/wpa_supplicant.mk          |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch

diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
new file mode 100644
index 0000000000..a460c2aba0
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
@@ -0,0 +1,15 @@
+--- a/src/drivers/drivers.mak	2011-11-29 19:19:56.684221050 +0100
++++ b/src/drivers/drivers.mak	2011-11-29 19:20:12.199609246 +0100
+@@ -31,10 +31,10 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
++DRV_LIBS += -lnl-3
+ 
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
++DRV_LIBS += -lnl-genl-3
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index baa739bfdb..f722b818dd 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -66,7 +66,7 @@ endif
 
 define WPA_SUPPLICANT_CONFIGURE_CMDS
 	cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
-	echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
+	echo "CFLAGS += $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(WPA_SUPPLICANT_CONFIG)
 	echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
 	echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
 	$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)

From 9c4a7dc9036591a0eaf14eb52f7456657603733f Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Sat, 3 Dec 2011 18:03:31 +0100
Subject: [PATCH 1114/6849] iw: using the git version fixes build with new
 libnl-3

The current git version copes well with libnl-3, so use this one until
the next official release is made.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index ab6c676811..d89fc6c400 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-IW_VERSION = 3.2
-IW_SOURCE = iw-$(IW_VERSION).tar.bz2
-IW_SITE = http://wireless.kernel.org/download/iw
+IW_VERSION = a82abc2cac9dea7def53070565201145c76c8c6c
+IW_SITE = git://git.sipsolutions.net/iw.git
 IW_DEPENDENCIES = host-pkg-config libnl
 IW_CONFIG = $(IW_DIR)/.config
 IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \

From f472b915c0b394ba637553da931c5797b07c0b59 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Sat, 3 Dec 2011 18:03:32 +0100
Subject: [PATCH 1115/6849] kismet: fix build with new libnl-3

The CPPFLAGS have to be augmented, so configure finds the correct include
dir, and the patch needs to be tweaked to make the binary link to
libnl-3 instead of libnl-gen.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/kismet-libnl-30-support.patch | 13 +++++++++----
 package/kismet/kismet.mk                     |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/kismet/kismet-libnl-30-support.patch b/package/kismet/kismet-libnl-30-support.patch
index cf3c845f66..dca6151d3c 100644
--- a/package/kismet/kismet-libnl-30-support.patch
+++ b/package/kismet/kismet-libnl-30-support.patch
@@ -35,7 +35,7 @@ Index: b/configure
    libnl20_CFLAGS
                C compiler flags for libnl20, overriding pkg-config
    libnl20_LIBS
-@@ -6760,6 +6768,75 @@
+@@ -6760,6 +6768,76 @@
  	fi
  fi
 
@@ -103,6 +103,7 @@ Index: b/configure
 +	libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS
 +	libnl30_LIBS=$pkg_cv_libnl30_LIBS
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++	CPPFLAGS="$CPPFLAGS $libnl30_CFLAGS"
 +$as_echo "yes" >&6; }
 +	libnl30=yes
 +fi
@@ -111,13 +112,17 @@ Index: b/configure
  pkg_failed=no
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5
  $as_echo_n "checking for libnl20... " >&6; }
-@@ -6897,7 +6974,7 @@
+@@ -6897,7 +6974,11 @@
  $as_echo "yes" >&6; }
  	libnl1=yes
  fi
 -	if test "$libnl20" = "yes"; then
-+	if test "$libnl20" = "yes" -o "$libnl30" = "yes"; then
-
++	if test "$libnl30" = "yes"; then
++$as_echo "#define HAVE_LIBNL 1" >>confdefs.h
++$as_echo "#define HAVE_LIBNL20 1" >>confdefs.h
++               NLLIBS="-lnl-genl-3 -lnl-3"
++	elif test "$libnl20" = "yes"; then
+ 
  $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
 
 
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 4c7d6e237e..854c9dd22b 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -10,6 +10,7 @@ KISMET_DEPENDENCIES = libpcap ncurses
 
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	KISMET_DEPENDENCIES += libnl
+	KISMET_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/"
 endif
 ifeq ($(BR2_PACKAGE_PCRE),y)
 	KISMET_DEPENDENCIES += pcre

From 68902f743729b3482bb6bc2ae9d0306aa9c00f65 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Dec 2011 19:33:43 +0100
Subject: [PATCH 1116/6849] ti-utils: unbreak build after libnl version bump

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ti-utils/ti-utils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index 15e620cbe6..71a610d588 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -10,8 +10,8 @@ TI_UTILS_DEPENDENCIES = libnl
 
 define TI_UTILS_BUILD_CMDS
 	$(MAKE1) NFSROOT="$(STAGING_DIR)" \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-		-C $(@D) all
+		CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -I$(STAGING_DIR)/usr/include/libnl3" \
+		LIBS="-lnl-3 -lnl-genl-3 -lm" -C $(@D) all
 endef
 
 define TI_UTILS_INSTALL_TARGET_CMDS

From e991961d4ef6282f5ace22eade80edc75a9c100b Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Fri, 2 Dec 2011 13:13:09 +0100
Subject: [PATCH 1117/6849] Add package for Gnome NetworkManager

Even though it's most commonly used on desktops, this piece of software
also works well on embedded devices.

The package file only resolved mandatory dependencies. Things like
iptables and dnsmasq are only required if 'shared' connections are used,
and have hence not been made hard prerequisites.

There are probably too many i18n related files installed to the target.
That might need some more tweaking.

[Peter: fix Kconfig dependencies, add execinfo patch, fix libgcrypt-config
        path, uClibc build fix]
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/network-manager/Config.in             | 30 +++++++++++
 package/network-manager/S45network-manager    | 46 +++++++++++++++++
 .../network-manager-execinfo.patch            | 31 ++++++++++++
 package/network-manager/network-manager.mk    | 50 +++++++++++++++++++
 5 files changed, 158 insertions(+)
 create mode 100644 package/network-manager/Config.in
 create mode 100755 package/network-manager/S45network-manager
 create mode 100644 package/network-manager/network-manager-execinfo.patch
 create mode 100644 package/network-manager/network-manager.mk

diff --git a/package/Config.in b/package/Config.in
index b6df18ab5b..dc12ad5192 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -456,6 +456,7 @@ endif
 source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
+source "package/network-manager/Config.in"
 source "package/noip/Config.in"
 source "package/nfs-utils/Config.in"
 source "package/ngircd/Config.in"
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
new file mode 100644
index 0000000000..6e51f53d70
--- /dev/null
+++ b/package/network-manager/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_NETWORK_MANAGER
+	bool "NetworkManager"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	depends on BR2_PACKAGE_DBUS
+	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE # acl
+	depends on BR2_USE_WCHAR # libglib2
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_UDEV
+	select BR2_PACKAGE_UDEV_ALL_EXTRAS
+	select BR2_PACKAGE_LIBNL
+	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_LIBNL
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_WIRELESS_TOOLS
+	select BR2_PACKAGE_WIRELESS_TOOLS_LIB
+	help
+	  NetworkManager is a set of co-operative tools that make networking
+	  simple and straightforward. Whether WiFi, wired, 3G, or Bluetooth,
+	  NetworkManager allows you to quickly move from one network to
+	  another: once a network has been configured and joined once, it
+	  can be detected and re-joined automatically the next time it's
+	  available.
+
+	  http://projects.gnome.org/NetworkManager/
+
+comment "NetworkManager requires DBus and a toolchain with IPV6, LARGEFILE and WCHAR support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_PACKAGE_DBUS
+
diff --git a/package/network-manager/S45network-manager b/package/network-manager/S45network-manager
new file mode 100755
index 0000000000..112aa660e5
--- /dev/null
+++ b/package/network-manager/S45network-manager
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+prefix=/usr
+exec_prefix=/usr
+sbindir=${exec_prefix}/sbin
+
+NETWORKMANAGER_BIN=${sbindir}/NetworkManager
+
+[ -x $NETWORKMANAGER_BIN ] || exit 0
+
+PID=`pidof -o %PPID NetworkManager`
+case "$1" in
+	start)
+		echo -n "Starting NetworkManager ... "
+		[ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager
+		if [ -z "$PID" ]; then
+			$NETWORKMANAGER_BIN
+		fi
+		if [ ! -z "$PID" -o $? -gt 0 ]; then
+			echo "failed!"
+		else
+			echo "done."
+		fi
+		;;
+	stop)
+		echo -n "Stopping NetworkManager ... "
+			[ ! -z "$PID" ] && kill $PID &> /dev/null
+		if [ $? -gt 0 ]; then
+			echo "failed!"
+		else
+			echo "done."
+		fi
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart|sleep|wake}"
+		;;
+esac
+exit 0
+
+
+
diff --git a/package/network-manager/network-manager-execinfo.patch b/package/network-manager/network-manager-execinfo.patch
new file mode 100644
index 0000000000..8dc83f0bf2
--- /dev/null
+++ b/package/network-manager/network-manager-execinfo.patch
@@ -0,0 +1,31 @@
+From ff9471b7d83545614100a270e2d85b7b272abe97 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 2 Jan 2012 14:45:16 +0100
+Subject: [PATCH] [PATCH] only include execinfo.h if crashtrace support is
+ enabled
+
+On systems without backtrace suport (E.G. uClibc depending on config),
+execinfo.h might not be available, breaking the build.
+
+Fix it by only including it if enabled.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/logging/nm-logging.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
+index ca6a709..26c8670 100644
+--- a/src/logging/nm-logging.c
++++ b/src/logging/nm-logging.c
+@@ -23,7 +23,6 @@
+ 
+ #include <dlfcn.h>
+ #include <syslog.h>
+-#include <execinfo.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-- 
+1.7.7.1
+
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
new file mode 100644
index 0000000000..cfcf32cc28
--- /dev/null
+++ b/package/network-manager/network-manager.mk
@@ -0,0 +1,50 @@
+#############################################################
+#
+# NetworkManager
+#
+#############################################################
+NETWORK_MANAGER_VERSION = 0.9.2.0
+NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
+NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
+NETWORK_MANAGER_INSTALL_STAGING = YES
+NETWORK_MANAGER_DEPENDENCIES = host-pkg-config udev dbus-glib libnl wireless_tools gnutls util-linux
+
+NETWORK_MANAGER_CONF_ENV = \
+	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+
+NETWORK_MANAGER_CONF_OPT = \
+		--mandir=$(STAGING_DIR)/usr/man/ \
+		--with-dbus-user=dbus \
+		--disable-tests \
+		--disable-more-warnings \
+		--without-docs \
+		--disable-gtk-doc \
+		--disable-asserts \
+		--enable-abstract-sockets \
+		--disable-selinux \
+		--disable-xml-docs \
+		--disable-doxygen-docs \
+		--disable-static \
+		--enable-dnotify \
+		--localstatedir=/var \
+		--with-crypto=gnutls \
+		--with-distro=arch \
+		--disable-ppp \
+		--with-iptables=/usr/sbin/iptables
+
+# uClibc by default doesn't have backtrace support, so don't use it
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+NETWORK_MANAGER_CONF_OPT += --disable-crashtrace
+endif
+
+# The target was built for the archlinux distribution, so we need
+# to move around things after installation
+define NETWORK_MANAGER_INSTALL_INITSCRIPT
+	$(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager
+	rm -f $(TARGET_DIR)/etc/rc.d/networkmanager
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/rc.d
+endef
+
+NETWORK_MANAGER_POST_INSTALL_TARGET_HOOKS += NETWORK_MANAGER_INSTALL_INITSCRIPT
+
+$(eval $(call AUTOTARGETS))

From bea251c69668ce002420cd68d2c490c8f8d8ddf0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 15:07:08 +0100
Subject: [PATCH 1118/6849] valgrind: bump to 3.7.0 and fix build with ccache

After bumping to 3.7.0, the valgrind-3.6.1-configure-support-linux-3.patch is
no longer necessary since it was added upstream. The
valgrind-3.7.0-compiler-check.patch patch is added to fix a compiler version
check issue (patch taken from the upstream Subversion repository). The
valgrind-3.7.0-fix-ccache-support.patch is added to fix the build process when
ccache is used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rind-3.6.1-configure-support-linux-3.patch | 30 --------
 .../valgrind-3.7.0-compiler-check.patch       | 76 +++++++++++++++++++
 .../valgrind-3.7.0-fix-ccache-support.patch   | 51 +++++++++++++
 ...e.patch => valgrind-3.7.0-largefile.patch} | 22 +++---
 ...patch => valgrind-3.7.0-more-ioctls.patch} | 34 ++++-----
 ...ind-3.7.0-workaround-SIGSEGV-on-PPC.patch} | 15 ++--
 package/valgrind/valgrind.mk                  |  3 +-
 7 files changed, 162 insertions(+), 69 deletions(-)
 delete mode 100644 package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch
 create mode 100644 package/valgrind/valgrind-3.7.0-compiler-check.patch
 create mode 100644 package/valgrind/valgrind-3.7.0-fix-ccache-support.patch
 rename package/valgrind/{valgrind-3.6.1-largefile.patch => valgrind-3.7.0-largefile.patch} (71%)
 rename package/valgrind/{valgrind-3.6.1-more-ioctls.patch => valgrind-3.7.0-more-ioctls.patch} (90%)
 rename package/valgrind/{valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch => valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch} (60%)

diff --git a/package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch b/package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch
deleted file mode 100644
index a3b24825f0..0000000000
--- a/package/valgrind/valgrind-3.6.1-configure-support-linux-3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Add support for kernel 3.x. From upstream r11796 (via Debian).
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-
-Index: valgrind-3.6.1/configure.in
-===================================================================
---- valgrind-3.6.1.orig/configure.in	2011-02-15 18:31:17.000000000 +0100
-+++ valgrind-3.6.1/configure.in	2011-07-08 22:36:36.051563848 +0200
-@@ -220,7 +220,7 @@
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*) 
-+             2.6.*|3.*) 
-         	    AC_MSG_RESULT([2.6 family (${kernel})])
-         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
-         	    ;;
-Index: valgrind-3.6.1/configure
-===================================================================
---- valgrind-3.6.1.orig/configure	2011-07-08 22:37:18.911240743 +0200
-+++ valgrind-3.6.1/configure	2011-07-08 22:37:44.847045178 +0200
-@@ -5348,7 +5348,7 @@
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*)
-+             2.6.*|3.*)
-         	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6 family (${kernel})" >&5
- $as_echo "2.6 family (${kernel})" >&6; }
- 
diff --git a/package/valgrind/valgrind-3.7.0-compiler-check.patch b/package/valgrind/valgrind-3.7.0-compiler-check.patch
new file mode 100644
index 0000000000..4a9fcbac17
--- /dev/null
+++ b/package/valgrind/valgrind-3.7.0-compiler-check.patch
@@ -0,0 +1,76 @@
+Fix the compiler version check so that it doesn't misdetect the
+version when the compiler version contains parenthesis.
+
+Taken from upstream r12274.
+
+Index: valgrind-3.7.0/configure.in
+===================================================================
+--- valgrind-3.7.0.orig/configure.in	2011-12-22 15:21:22.269669307 +0100
++++ valgrind-3.7.0/configure.in	2011-12-22 15:21:54.029135051 +0100
+@@ -98,18 +98,21 @@
+ # We don't want gcc < 3.0
+ AC_MSG_CHECKING([for a supported version of gcc])
+ 
+-# Try to get the gcc version, sed-ing out some unexpected stuff
+-# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
+-# Without this, the version number comes out as 686, 10 or 11 :-(
++# Obtain the compiler version.
+ # 
+-# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
+-# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# A few examples of how the ${CC} --version output looks like:
++#
++# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
++# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
++# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
++# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
++# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
++# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# Clang: clang version 2.9 (tags/RELEASE_29/final)
+ #
+ [gcc_version=`${CC} --version \
+-             | head -n 1 \
+-             | $SED 's/i686-apple-darwin10//' \
+-             | $SED 's/i686-apple-darwin11//' \
+-             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
++             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
++                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
+ 
+ is_clang="notclang"
+ if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
+Index: valgrind-3.7.0/configure
+===================================================================
+--- valgrind-3.7.0.orig/configure	2011-12-22 15:22:05.138948143 +0100
++++ valgrind-3.7.0/configure	2011-12-22 15:23:34.807439246 +0100
+@@ -5122,18 +5122,22 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a supported version of gcc" >&5
+ $as_echo_n "checking for a supported version of gcc... " >&6; }
+ 
+-# Try to get the gcc version, sed-ing out some unexpected stuff
+-# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
+-# Without this, the version number comes out as 686, 10 or 11 :-(
++# Obtain the compiler version.
++# 
++# A few examples of how the ${CC} --version output looks like:
+ #
+-# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
+-# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
++# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
++# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
++# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
++# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
++# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# Clang: clang version 2.9 (tags/RELEASE_29/final)
+ #
+ gcc_version=`${CC} --version \
+-             | head -n 1 \
+-             | $SED 's/i686-apple-darwin10//' \
+-             | $SED 's/i686-apple-darwin11//' \
+-             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`
++             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
++                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`
++
+ 
+ is_clang="notclang"
+ if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/package/valgrind/valgrind-3.7.0-fix-ccache-support.patch b/package/valgrind/valgrind-3.7.0-fix-ccache-support.patch
new file mode 100644
index 0000000000..56d984b0ba
--- /dev/null
+++ b/package/valgrind/valgrind-3.7.0-fix-ccache-support.patch
@@ -0,0 +1,51 @@
+Fix link_tool_exe_linux.in to work with ccache
+
+The link_tool_exe_linux.in Perl script makes the assumption that the
+compilation command line is always:
+
+  gcc -o foobar foobar.c -someflags
+
+I.e, it assumes that the compiler is the first word of the command
+line. However, this is not true with ccache, where the command line
+is:
+
+  /path/to/ccache /path/to/crossgcc -o foobar foobar.c -someflags
+
+Since this Perl script simply needs to add additional flags to the
+command line, we simply add them at the end of the command line
+instead of trying to add them at the beginning.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: valgrind-3.6.1/coregrind/link_tool_exe_linux.in
+===================================================================
+--- valgrind-3.6.1.orig/coregrind/link_tool_exe_linux.in	2011-12-22 13:59:08.933499060 +0100
++++ valgrind-3.6.1/coregrind/link_tool_exe_linux.in	2011-12-22 13:59:50.302782709 +0100
+@@ -55,25 +55,13 @@
+     if (($#ARGV + 1) < 5);
+ 
+ my $ala = $ARGV[0];
++shift;
+ 
+ # check for plausible-ish alt load address
+ die "Bogus alt-load address"
+     if (length($ala) < 3 || index($ala, "0x") != 0);
+ 
+-# The cc invokation to do the final link
+-my $cc = $ARGV[1];
+-
+-# and the 'restargs' are argv[2 ..]
+-
+-# so, build up the complete command here:
+-# 'cc' -static -Ttext='ala' 'restargs'
+-
+-my $cmd="$cc -static -Wl,-Ttext=$ala";
+-
+-# Add the rest of the parameters
+-foreach my $n (2 .. $#ARGV) {
+-   $cmd = "$cmd $ARGV[$n]";
+-}
++my $cmd=join(" ", @ARGV) . " -static -Wl,-Ttext=$ala";
+ 
+ #print "link_tool_exe_linux: $cmd\n";
+ 
diff --git a/package/valgrind/valgrind-3.6.1-largefile.patch b/package/valgrind/valgrind-3.7.0-largefile.patch
similarity index 71%
rename from package/valgrind/valgrind-3.6.1-largefile.patch
rename to package/valgrind/valgrind-3.7.0-largefile.patch
index d04877bd64..53b6e6fa8a 100644
--- a/package/valgrind/valgrind-3.6.1-largefile.patch
+++ b/package/valgrind/valgrind-3.7.0-largefile.patch
@@ -6,11 +6,11 @@ is detected.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 
-Index: valgrind-3.6.1/coregrind/m_initimg/initimg-linux.c
+Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
 ===================================================================
---- valgrind-3.6.1.orig/coregrind/m_initimg/initimg-linux.c	2011-07-06 09:45:10.203070009 +0200
-+++ valgrind-3.6.1/coregrind/m_initimg/initimg-linux.c	2011-07-06 09:45:17.343070005 +0200
-@@ -54,7 +54,11 @@
+--- valgrind-3.7.0.orig/coregrind/m_initimg/initimg-linux.c	2011-10-26 23:24:43.000000000 +0200
++++ valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c	2011-12-22 14:53:12.798185055 +0100
+@@ -55,7 +55,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #define _GNU_SOURCE
@@ -22,11 +22,11 @@ Index: valgrind-3.6.1/coregrind/m_initimg/initimg-linux.c
  /* This is for ELF types etc, and also the AT_ constants. */
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.6.1/coregrind/m_main.c
+Index: valgrind-3.7.0/coregrind/m_main.c
 ===================================================================
---- valgrind-3.6.1.orig/coregrind/m_main.c	2011-07-06 09:44:22.203070033 +0200
-+++ valgrind-3.6.1/coregrind/m_main.c	2011-07-06 09:44:42.803070024 +0200
-@@ -2797,7 +2797,11 @@
+--- valgrind-3.7.0.orig/coregrind/m_main.c	2011-10-26 23:24:45.000000000 +0200
++++ valgrind-3.7.0/coregrind/m_main.c	2011-12-22 14:53:12.798185055 +0100
+@@ -2743,7 +2743,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #define _GNU_SOURCE
@@ -38,10 +38,10 @@ Index: valgrind-3.6.1/coregrind/m_main.c
  /* This is in order to get AT_NULL and AT_PAGESIZE. */
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.6.1/coregrind/m_ume/elf.c
+Index: valgrind-3.7.0/coregrind/m_ume/elf.c
 ===================================================================
---- valgrind-3.6.1.orig/coregrind/m_ume/elf.c	2011-07-06 09:44:51.343070018 +0200
-+++ valgrind-3.6.1/coregrind/m_ume/elf.c	2011-07-06 09:44:58.833070015 +0200
+--- valgrind-3.7.0.orig/coregrind/m_ume/elf.c	2011-10-26 23:24:41.000000000 +0200
++++ valgrind-3.7.0/coregrind/m_ume/elf.c	2011-12-22 14:53:12.798185055 +0100
 @@ -48,7 +48,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
diff --git a/package/valgrind/valgrind-3.6.1-more-ioctls.patch b/package/valgrind/valgrind-3.7.0-more-ioctls.patch
similarity index 90%
rename from package/valgrind/valgrind-3.6.1-more-ioctls.patch
rename to package/valgrind/valgrind-3.7.0-more-ioctls.patch
index 62f013528e..fb58381201 100644
--- a/package/valgrind/valgrind-3.6.1-more-ioctls.patch
+++ b/package/valgrind/valgrind-3.7.0-more-ioctls.patch
@@ -4,11 +4,11 @@ Patch initially written by Eric Andersen <andersen@codepoet.org>.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
+Index: valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c
 ===================================================================
---- valgrind-3.6.1.orig/coregrind/m_syswrap/syswrap-linux.c	2011-07-06 09:50:32.243069845 +0200
-+++ valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c	2011-07-06 09:53:39.783069751 +0200
-@@ -3900,7 +3900,33 @@
+--- valgrind-3.7.0.orig/coregrind/m_syswrap/syswrap-linux.c	2011-10-27 12:55:05.000000000 +0200
++++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c	2011-12-22 14:53:16.258126390 +0100
+@@ -4058,7 +4058,33 @@
     case VKI_SG_GET_SG_TABLESIZE: /* 0x227f */
        PRE_MEM_WRITE( "ioctl(SG_GET_SG_TABLESIZE)", ARG3, sizeof(int) );
        break;
@@ -42,7 +42,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_IIOCGETCPS:
        PRE_MEM_WRITE( "ioctl(IIOCGETCPS)", ARG3,
  		     VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
-@@ -4215,6 +4241,8 @@
+@@ -4373,6 +4399,8 @@
     case VKI_BLKROGET:
        PRE_MEM_WRITE( "ioctl(BLKROGET)", ARG3, sizeof(int));
        break;
@@ -51,7 +51,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_BLKGETSIZE:
        PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
        break;
-@@ -4223,6 +4251,8 @@
+@@ -4381,6 +4409,8 @@
     case VKI_BLKRAGET:
        PRE_MEM_WRITE( "ioctl(BLKRAGET)", ARG3, sizeof(long));
        break;
@@ -60,7 +60,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_BLKFRASET:
        break;
     case VKI_BLKFRAGET:
-@@ -4289,6 +4319,8 @@
+@@ -4447,6 +4477,8 @@
        PRE_MEM_WRITE( "ioctl(CDROMREADTOCENTRY)", ARG3, 
  		     sizeof(struct vki_cdrom_tocentry));
        break;
@@ -69,7 +69,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_CDROMMULTISESSION: /* 0x5310 */
        PRE_MEM_WRITE( "ioctl(CDROMMULTISESSION)", ARG3,
  		     sizeof(struct vki_cdrom_multisession));
-@@ -4989,7 +5021,28 @@
+@@ -5321,7 +5353,28 @@
     case VKI_SG_GET_SG_TABLESIZE:
        POST_MEM_WRITE(ARG3, sizeof(int));
        break;      
@@ -98,7 +98,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_IIOCGETCPS:
        POST_MEM_WRITE( ARG3, VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
        break;
-@@ -5210,6 +5263,8 @@
+@@ -5542,6 +5595,8 @@
     case VKI_BLKROGET:
        POST_MEM_WRITE(ARG3, sizeof(int));
        break;
@@ -107,7 +107,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_BLKGETSIZE:
        POST_MEM_WRITE(ARG3, sizeof(unsigned long));
        break;
-@@ -5218,6 +5273,8 @@
+@@ -5550,6 +5605,8 @@
     case VKI_BLKRAGET:
        POST_MEM_WRITE(ARG3, sizeof(long));
        break;
@@ -116,7 +116,7 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_BLKFRASET:
        break;
     case VKI_BLKFRAGET:
-@@ -5259,6 +5316,8 @@
+@@ -5591,6 +5648,8 @@
     case VKI_CDROMREADTOCENTRY:
        POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_tocentry));
        break;
@@ -125,11 +125,11 @@ Index: valgrind-3.6.1/coregrind/m_syswrap/syswrap-linux.c
     case VKI_CDROMMULTISESSION:
        POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_multisession));
        break;
-Index: valgrind-3.6.1/include/vki/vki-linux.h
+Index: valgrind-3.7.0/include/vki/vki-linux.h
 ===================================================================
---- valgrind-3.6.1.orig/include/vki/vki-linux.h	2011-07-06 09:48:16.733069914 +0200
-+++ valgrind-3.6.1/include/vki/vki-linux.h	2011-07-06 09:49:49.413069868 +0200
-@@ -1646,7 +1646,9 @@
+--- valgrind-3.7.0.orig/include/vki/vki-linux.h	2011-10-26 23:24:31.000000000 +0200
++++ valgrind-3.7.0/include/vki/vki-linux.h	2011-12-22 14:53:16.258126390 +0100
+@@ -1654,7 +1654,9 @@
  
  #define VKI_BLKROSET   _VKI_IO(0x12,93)	/* set device read-only (0 = read-write) */
  #define VKI_BLKROGET   _VKI_IO(0x12,94)	/* get read-only status (0 = read_write) */
@@ -139,7 +139,7 @@ Index: valgrind-3.6.1/include/vki/vki-linux.h
  #define VKI_BLKRASET   _VKI_IO(0x12,98)	/* set read ahead for block device */
  #define VKI_BLKRAGET   _VKI_IO(0x12,99)	/* get current read ahead setting */
  #define VKI_BLKFRASET  _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-@@ -1721,6 +1723,53 @@
+@@ -1729,6 +1731,53 @@
  //#define SG_GET_COMMAND_Q 0x2270   /* Yields 0 (queuing off) or 1 (on) */
  #define VKI_SG_SET_COMMAND_Q 0x2271   /* Change queuing state with 0 or 1 */
  
@@ -193,7 +193,7 @@ Index: valgrind-3.6.1/include/vki/vki-linux.h
  //----------------------------------------------------------------------
  // From linux-2.6.8.1/include/linux/cdrom.h
  //----------------------------------------------------------------------
-@@ -1730,6 +1779,7 @@
+@@ -1738,6 +1787,7 @@
                                             (struct cdrom_tochdr) */
  #define VKI_CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
                                             (struct cdrom_tocentry) */
diff --git a/package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch
similarity index 60%
rename from package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch
rename to package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch
index a7885119ae..ea91a007e9 100644
--- a/package/valgrind/valgrind-3.6.1-workaround-SIGSEGV-on-PPC.patch
+++ b/package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch
@@ -8,11 +8,11 @@ Signed-off-by: Pierre Habouzit <madcoder@debian.org>
  coregrind/m_machine.c |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
 
-diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
-index 8dc3e17..7921502 100644
---- a/coregrind/m_machine.c
-+++ b/coregrind/m_machine.c
-@@ -28,6 +28,10 @@
+Index: valgrind-3.7.0/coregrind/m_machine.c
+===================================================================
+--- valgrind-3.7.0.orig/coregrind/m_machine.c	2011-10-27 12:45:52.000000000 +0200
++++ valgrind-3.7.0/coregrind/m_machine.c	2011-12-22 14:53:19.758067046 +0100
+@@ -27,6 +27,10 @@
     The GNU General Public License is contained in the file COPYING.
  */
  
@@ -22,7 +22,4 @@ index 8dc3e17..7921502 100644
 +
  #include "pub_core_basics.h"
  #include "pub_core_vki.h"
- #include "pub_core_threadstate.h"
--- 
-1.7.5.1.290.g2095dc
-
+ #include "pub_core_libcsetjmp.h"   // setjmp facilities
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 537639f658..24523bf6bd 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,10 +4,9 @@
 #
 #############################################################
 
-VALGRIND_VERSION = 3.6.1
+VALGRIND_VERSION = 3.7.0
 VALGRIND_SITE    = http://valgrind.org/downloads/
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
-
 VALGRIND_CONF_OPT = --disable-tls
 
 # On ARM, Valgrind only supports ARMv7, and uses the arch part of the

From 9fd4c35058684fde99e84261343ef9aa24e64a90 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Dec 2011 17:10:00 -0300
Subject: [PATCH 1119/6849] uClibc: bump 0.9.32.x version to 0.9.32.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |  2 +-
 ...Clibc-0.9.32-Fix-e500-fpu-libm-build.patch | 31 ----------------
 ...32-fix-daylight-saving-time-handling.patch | 36 -------------------
 ....9.32-honor-UCLIBC_HAS_FENV-for-e500.patch | 28 ---------------
 ..._epoll_pwait-compile-failure-on-x86.patch} |  0
 ...-__fe_nomask_env-use-of-__set_errno.patch} |  0
 ...ibc-0.9.32.1-linuxthreads-errno-fix.patch} |  0
 ... => uClibc-0.9.32.1-sparc-errno-fix.patch} |  0
 ...re.patch => uClibc-0.9.32.1-unshare.patch} |  0
 9 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch
 rename toolchain/uClibc/{uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch => uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch => uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.32-linuxthreads-errno-fix.patch => uClibc-0.9.32.1-linuxthreads-errno-fix.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.32-sparc-errno-fix.patch => uClibc-0.9.32.1-sparc-errno-fix.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.32-unshare.patch => uClibc-0.9.32.1-unshare.patch} (100%)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 4b480fd452..19c71e0642 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -32,7 +32,7 @@ config BR2_USE_UCLIBC_SNAPSHOT
 config BR2_UCLIBC_VERSION_STRING
 	string
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
-	default 0.9.32		if BR2_UCLIBC_VERSION_0_9_32
+	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
diff --git a/toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch b/toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch
deleted file mode 100644
index a228bc1f0b..0000000000
--- a/toolchain/uClibc/uClibc-0.9.32-Fix-e500-fpu-libm-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
->From 826984dee547b41238dc9572a1c756506a3c9148 Mon Sep 17 00:00:00 2001
-From: Jason Woodward <jason.woodward@timesys.com>
-Date: Sat, 11 Jun 2011 19:09:53 -0400
-Subject: [PATCH] Fix e500 fpu libm build
-
-Define libm_ARCH_fpu_OUT in libm/powerpc/e500/Makefile.arch as it is used
-in libm/powerpc/e500/fpu/Makefile.arch
-
- libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
-
-This appears to have been broken since cd3a494e99fa4bcad1c2a621b71361005528bead
-
-Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
----
- libm/powerpc/e500/Makefile.arch |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libm/powerpc/e500/Makefile.arch b/libm/powerpc/e500/Makefile.arch
-index 912ce7f..febde67 100644
---- a/libm/powerpc/e500/Makefile.arch
-+++ b/libm/powerpc/e500/Makefile.arch
-@@ -6,5 +6,6 @@
- #
- 
- libm_ARCH_fpu_DIR := $(libm_SUBARCH_DIR)/fpu
-+libm_ARCH_fpu_OUT := $(libm_SUBARCH_OUT)/fpu
- -include $(libm_ARCH_fpu_DIR)/Makefile.arch
- 
--- 
-1.7.0.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch b/toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch
deleted file mode 100644
index 5a96113877..0000000000
--- a/toolchain/uClibc/uClibc-0.9.32-fix-daylight-saving-time-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 47f3da1cf49377c25772bb54d07db55225bbb142 Mon Sep 17 00:00:00 2001
-From: Guillaume Bourcier <guillaumebourcier@free.fr>
-Date: Tue, 11 Oct 2011 13:45:33 +0200
-Subject: [PATCH] libc: fix daylight saving time handling
-
-The algorithm computing daylight saving time incorrectly adds a day for
-each month after January for leap years. The clock shift from/to DST can
-be delayed if the last Sunday of a transition month is exactly seven
-days before the first of the following month.
-
-This change adds a day for the February month only.
-
-Signed-off-by: Guillaume Bourcier <guillaumebourcier@free.fr>
-Signed-off-by: Richard Braun <rbraun@sceen.net>
-Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- libc/misc/time/time.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
-index 19d68e1..8e2ebf1 100644
---- a/libc/misc/time/time.c
-+++ b/libc/misc/time/time.c
-@@ -689,7 +689,7 @@ static int tm_isdst(register const struct tm *__restrict ptm,
- 					++day;
- 				}
- 				monlen = 31 + day_cor[r->month -1] - day_cor[r->month];
--				if (isleap && (r->month > 1)) {
-+				if (isleap && (r->month == 2)) {
- 					++monlen;
- 				}
- 				/* Wweekday (0 is Sunday) of 1st of the month
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch b/toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch
deleted file mode 100644
index c90c34c19e..0000000000
--- a/toolchain/uClibc/uClibc-0.9.32-honor-UCLIBC_HAS_FENV-for-e500.patch
+++ /dev/null
@@ -1,28 +0,0 @@
->From 69d9cf20955d0222a5a2631021bc10854ea98128 Mon Sep 17 00:00:00 2001
-From: Jason Woodward <jason.woodward@timesys.com>
-Date: Sat, 11 Jun 2011 20:39:33 -0400
-Subject: [PATCH] honor UCLIBC_HAS_FENV for e500
-
-Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
----
- libm/powerpc/e500/fpu/Makefile.arch |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libm/powerpc/e500/fpu/Makefile.arch b/libm/powerpc/e500/fpu/Makefile.arch
-index 8f00e09..904561e 100644
---- a/libm/powerpc/e500/fpu/Makefile.arch
-+++ b/libm/powerpc/e500/fpu/Makefile.arch
-@@ -6,8 +6,10 @@
- #
- 
- 
-+ifeq ($(UCLIBC_HAS_FENV),y)
- libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c)
- libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
-+endif
- 
- libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
- 
--- 
-1.7.0.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/toolchain/uClibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
rename to toolchain/uClibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch b/toolchain/uClibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
rename to toolchain/uClibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32-linuxthreads-errno-fix.patch
rename to toolchain/uClibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.32.1-sparc-errno-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32-sparc-errno-fix.patch
rename to toolchain/uClibc/uClibc-0.9.32.1-sparc-errno-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32-unshare.patch b/toolchain/uClibc/uClibc-0.9.32.1-unshare.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32-unshare.patch
rename to toolchain/uClibc/uClibc-0.9.32.1-unshare.patch

From 7f63d39eeb12d1d833e71ff690a638a396ed2bba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Dec 2011 12:02:17 -0300
Subject: [PATCH 1120/6849] u-boot: add version 2011.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index f154bd1233..281a909121 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2011_09
+	default BR2_TARGET_UBOOT_2011_12
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2011_12
+	bool "2011.12"
+
 config BR2_TARGET_UBOOT_2011_09
 	bool "2011.09"
 
@@ -51,6 +54,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
 	default "2011.03"	if BR2_TARGET_UBOOT_2011_03

From 0c5f68a4d31c1c437fbc920c2ecdad03301fb5da Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jan 2012 17:00:34 +0100
Subject: [PATCH 1121/6849] u-boot: remove 2010.x versions, deprecate 2011.03 /
 2011.06

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 281a909121..c8db9fb013 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -24,18 +24,11 @@ config BR2_TARGET_UBOOT_2011_09
 
 config BR2_TARGET_UBOOT_2011_06
 	bool "2011.06"
+	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_2011_03
 	bool "2011.03"
-
-config BR2_TARGET_UBOOT_2010_12
-	bool "2010.12"
-
-config BR2_TARGET_UBOOT_2010_09
-	bool "2010.09"
-
-config BR2_TARGET_UBOOT_2010_06
-	bool "2010.06"
+	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"
@@ -58,9 +51,6 @@ config BR2_TARGET_UBOOT_VERSION
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
 	default "2011.03"	if BR2_TARGET_UBOOT_2011_03
-	default "2010.12"	if BR2_TARGET_UBOOT_2010_12
-	default "2010.09"	if BR2_TARGET_UBOOT_2010_09
-	default "2010.06"	if BR2_TARGET_UBOOT_2010_06
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 

From f026f825cecc5bf106e433c0307f07fed2ae842b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Dec 2011 12:51:32 -0300
Subject: [PATCH 1122/6849] samba: security bump to version 3.5.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index de2c13b0e5..4e02682ab6 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -3,9 +3,9 @@
 # samba
 #
 #############################################################
-SAMBA_VERSION = 3.5.11
-SAMBA_SOURCE = samba-$(SAMBA_VERSION).tar.gz
-SAMBA_SITE = http://ftp.samba.org/pub/samba/stable/
+
+SAMBA_VERSION = 3.5.12
+SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 
 SAMBA_SUBDIR = source3
 SAMBA_AUTORECONF = NO

From a1c3efb52cd8a2fd98a95aed638ec3f822a73e6b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jan 2012 19:53:27 +0100
Subject: [PATCH 1123/6849] configs: at91sam9g20dfc: use modern u-boot /
 mainline linux

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9g20dfc_defconfig | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 16fd023d57..4a4b09c398 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -9,14 +9,12 @@ BR2_TARGET_AT91BOOTSTRAP_DATAFLASHCARD=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9g20ek"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="at91sam9g20ek_nandflash"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.33"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.33-at91.patch.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1.6"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="at91sam9g20ek"
 

From cca999969535bb59ae8c87404beccb4adb795580 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 2 Jan 2012 17:43:20 +0100
Subject: [PATCH 1124/6849] linux: update stable kernel to 3.1.6

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 3022b917f0..892a503124 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_1
 
 config BR2_LINUX_KERNEL_3_1
-	bool "3.1.5"
+	bool "3.1.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1.5"
+	default "3.1.6"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1.5" if BR2_LINUX_KERNEL_3_1
+	default "3.1.6" if BR2_LINUX_KERNEL_3_1
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f94f9a23971220a317865d15051e508f2c1b37cb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 29 Dec 2011 17:48:53 +0100
Subject: [PATCH 1125/6849] docs: change official IRC channel to #buildroot

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/docs.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs.html b/docs/docs.html
index 57f4bf64ec..851d1d28cc 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -20,8 +20,8 @@ <h3>Documentation</h3>
   <li>On the <a href="lists.html">buildroot mailing list</a>
   at <code>buildroot at uclibc.org</code></li>
 
-  <li>On the <a href="irc://freenode.net/#uclibc">Buildroot IRC
-  channel</a>, <code>#uclibc</code> on Freenode</li>
+  <li>On the <a href="irc://freenode.net/#buildroot">Buildroot IRC
+  channel</a>, <code>#buildroot</code> on Freenode</li>
 
   <li>On our <a href="https://bugs.uclibc.org">bugtracker</a>.</li>
 

From 27ad470d7df5509ae4a96edd04521211900090e4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 24 Dec 2011 11:28:37 +0100
Subject: [PATCH 1126/6849] igh-ethercat: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/igh-ethercat/Config.in       | 23 ++++++++++++++++
 package/igh-ethercat/igh-ethercat.mk | 41 ++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 package/igh-ethercat/Config.in
 create mode 100644 package/igh-ethercat/igh-ethercat.mk

diff --git a/package/Config.in b/package/Config.in
index dc12ad5192..0e514939c5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -431,6 +431,7 @@ source "package/hostapd/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
 endif
+source "package/igh-ethercat/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
new file mode 100644
index 0000000000..764a021c50
--- /dev/null
+++ b/package/igh-ethercat/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_IGH_ETHERCAT
+	bool "igh-ethercat"
+	depends on BR2_LINUX_KERNEL
+	help
+	  IgH EtherCAT Master for Linux.
+
+	  http://www.etherlab.org/en/ethercat/index.php
+
+if BR2_PACKAGE_IGH_ETHERCAT
+
+config BR2_PACKAGE_IGH_ETHERCAT_8139TOO
+	bool "8139too driver"
+
+config BR2_PACKAGE_IGH_ETHERCAT_E100
+	bool "e100 driver"
+
+config BR2_PACKAGE_IGH_ETHERCAT_E1000
+	bool "e1000 driver"
+
+config BR2_PACKAGE_IGH_ETHERCAT_R8169
+	bool "r8169 driver"
+
+endif
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
new file mode 100644
index 0000000000..b6ac5b8241
--- /dev/null
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -0,0 +1,41 @@
+IGH_ETHERCAT_VERSION = stable-1.5
+IGH_ETHERCAT_SITE    = http://etherlabmaster.hg.sourceforge.net/hgweb/etherlabmaster/etherlabmaster/archive/
+IGH_ETHERCAT_SOURCE  = $(IGH_ETHERCAT_VERSION).tar.bz2
+
+IGH_ETHERCAT_AUTORECONF      = YES
+IGH_ETHERCAT_DEPENDENCIES    = linux
+IGH_ETHERCAT_INSTALL_STAGING = YES
+
+IGH_ETHERCAT_CONF_OPT = \
+	--with-linux-dir=$(LINUX_DIR)
+
+IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too)
+IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100)
+IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000)
+IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169)
+
+# Since we download ethercat from source control, we have to emulate
+# the bootstrap script that creates the ChangeLog file before running
+# autoreconf.  We don't want to run that script directly, since we
+# leave to the autotargets infrastructure the responsability of
+# running 'autoreconf' so that the dependencies on host-automake,
+# host-autoconf and al. are correct.
+define IGH_ETHERCAT_CREATE_CHANGELOG
+	touch $(@D)/ChangeLog
+endef
+
+IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG
+
+define IGH_ETHERCAT_BUILD_MODULES
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) modules
+endef
+
+IGH_ETHERCAT_POST_BUILD_HOOKS += IGH_ETHERCAT_BUILD_MODULES
+
+define IGH_ETHERCAT_INSTALL_MODULES
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) modules_install
+endef
+
+IGH_ETHERCAT_POST_INSTALL_TARGET_HOOKS += IGH_ETHERCAT_INSTALL_MODULES
+
+$(eval $(call AUTOTARGETS))

From 43f8bb8c250b2e0fbf9fb73a240c299a60511cc4 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 11 Dec 2011 00:23:31 +0100
Subject: [PATCH 1127/6849] package: add libmbus library

libmbus is an open source M-bus (Meter-Bus) library.

The Meter-Bus is a standard for reading out meter data from electricity
meters, heat meters, gas meters, etc.

[Peter: minor whitespace fixes]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Reviewed-by: Luca Ceresoli<luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libmbus/Config.in  |  8 ++++++++
 package/libmbus/libmbus.mk | 15 +++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libmbus/Config.in
 create mode 100644 package/libmbus/libmbus.mk

diff --git a/package/Config.in b/package/Config.in
index 0e514939c5..eb5bfa935b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -343,6 +343,7 @@ source "package/libmicrohttpd/Config.in"
 source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
+source "package/libmbus/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
diff --git a/package/libmbus/Config.in b/package/libmbus/Config.in
new file mode 100644
index 0000000000..1e2a8de7ad
--- /dev/null
+++ b/package/libmbus/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBMBUS
+	bool "libmbus"
+	help
+	  libmbus is a library for communicating with energy metering devices.
+	  It supports TCP and RS232 M-bus gateways.
+	  (M-bus standard: http://www.m-bus.com/)
+
+	  http://www.freescada.com/libmbus
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
new file mode 100644
index 0000000000..9abb2bf8d4
--- /dev/null
+++ b/package/libmbus/libmbus.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libmbus
+#
+#############################################################
+
+LIBMBUS_VERSION = 0.6.1
+LIBMBUS_SITE = http://www.freescada.com/public-dist/
+LIBMBUS_INSTALL_STAGING = YES
+
+# Without this the build yields an error:
+#   cannot find input file: `test/Makefile.in'
+LIBMBUS_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS))

From 2d75c7927f044e9e847f7f91db9365e8b711bb2b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 22 Dec 2011 13:13:38 +0100
Subject: [PATCH 1128/6849] rt-tests: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/rt-tests/Config.in                    | 13 ++++++
 .../rt-tests/rt-tests-fix-build-system.patch  | 43 +++++++++++++++++++
 package/rt-tests/rt-tests.mk                  | 25 +++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 package/rt-tests/Config.in
 create mode 100644 package/rt-tests/rt-tests-fix-build-system.patch
 create mode 100644 package/rt-tests/rt-tests.mk

diff --git a/package/Config.in b/package/Config.in
index eb5bfa935b..92b80e66c1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -28,6 +28,7 @@ source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
 source "package/oprofile/Config.in"
+source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
 source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
new file mode 100644
index 0000000000..e6452668c2
--- /dev/null
+++ b/package/rt-tests/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_RT_TESTS
+	bool "rt-tests"
+	help
+	  Set of utilities for testing the real-time behaviour of a
+	  Linux system.
+
+	  All tools are simple C programs with no dependencies, except
+	  the hwlatdetect utility, which is a Python script and
+	  therefore requires the Python interpreter. It will only be
+	  installed if a Python interpreter has been selected in the
+	  Buildroot configuration.
+
+	  http://rt.wiki.kernel.org
diff --git a/package/rt-tests/rt-tests-fix-build-system.patch b/package/rt-tests/rt-tests-fix-build-system.patch
new file mode 100644
index 0000000000..9d6aa0523c
--- /dev/null
+++ b/package/rt-tests/rt-tests-fix-build-system.patch
@@ -0,0 +1,43 @@
+Fix various minor issues with rt-tests build system
+
+The issues fixed are :
+
+ * Remove the automatic NUMA detection from the host
+   architecture. This is broken when doing cross-compilation. One can
+   still set NUMA=1 if NUMA support is desired.
+
+ * Expand the CFLAGS provided through the environment instead of
+   overriding it.
+
+ * Provide a HASPYTHON variable to tell whether the target system has
+   Python or not. Otherwise, the build system simply tests whether
+   Python is available on the host. The PYLIB variable is also changed
+   so that it can be overriden from the environment, in order to
+   provide the correct Python module location for the target.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: rt-tests/Makefile
+===================================================================
+--- rt-tests.orig/Makefile
++++ rt-tests/Makefile
+@@ -14,15 +14,11 @@
+ mandir	?= $(prefix)/share/man
+ srcdir	?= $(prefix)/src
+ 
+-machinetype = $(shell uname -m | \
+-    sed -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/')
+-ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
+-NUMA 	:= 1
+-endif
+-
+-CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
++override CFLAGS += -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
+ 
+-PYLIB  := $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
++ifeq ($(HASPYTHON),1)
++PYLIB ?= $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
++endif
+ 
+ ifndef DEBUG
+ 	CFLAGS	+= -O2
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
new file mode 100644
index 0000000000..222733f3d0
--- /dev/null
+++ b/package/rt-tests/rt-tests.mk
@@ -0,0 +1,25 @@
+RT_TESTS_SITE    = http://snapshot.debian.org/archive/debian/20111202T222101Z/pool/main/r/rt-tests/
+RT_TESTS_VERSION = 0.83
+RT_TESTS_SOURCE  = rt-tests_$(RT_TESTS_VERSION).orig.tar.gz
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+RT_TESTS_DEPENDENCIES = python
+endif
+
+define RT_TESTS_BUILD_CMDS
+	$(MAKE) -C $(@D) 			\
+		CC="$(TARGET_CC)" 		\
+		CFLAGS="$(TARGET_CFLAGS)"	\
+		prefix=/usr
+endef
+
+define RT_TESTS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) 				\
+		DESTDIR="$(TARGET_DIR)" 		\
+		prefix=/usr 				\
+		$(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \
+		install
+endef
+
+$(eval $(call GENTARGETS))
+

From b12dfaf15cd9c1df55eed225754389303f76b013 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 24 Dec 2011 11:17:51 +0100
Subject: [PATCH 1129/6849] busybox: enable CONFIG_FEATURE_MDEV_RENAME

Our default mdev.conf file in package/busybox has lines like:

  pcm.*           root:audio 660 =snd/
  event[0-9]+     root:root 640 =input/

that are used to create the device is the appropriate /dev
subdirectory. However, this feature requires
CONFIG_FEATURE_MDEV_RENAME to be enabled, otherwise mdev complains
with:

  mdev: bad line 25

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox-1.16.x.config | 2 +-
 package/busybox/busybox-1.17.x.config | 2 +-
 package/busybox/busybox-1.18.x.config | 2 +-
 package/busybox/busybox-1.19.x.config | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/busybox/busybox-1.16.x.config b/package/busybox/busybox-1.16.x.config
index e5f51023a6..24a27bfb99 100644
--- a/package/busybox/busybox-1.16.x.config
+++ b/package/busybox/busybox-1.16.x.config
@@ -516,7 +516,7 @@ CONFIG_LSPCI=y
 CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
-# CONFIG_FEATURE_MDEV_RENAME is not set
+CONFIG_FEATURE_MDEV_RENAME=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 CONFIG_FEATURE_MDEV_EXEC=y
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
diff --git a/package/busybox/busybox-1.17.x.config b/package/busybox/busybox-1.17.x.config
index d131dd6385..edf9c6dbde 100644
--- a/package/busybox/busybox-1.17.x.config
+++ b/package/busybox/busybox-1.17.x.config
@@ -547,7 +547,7 @@ CONFIG_LSPCI=y
 CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
-# CONFIG_FEATURE_MDEV_RENAME is not set
+CONFIG_FEATURE_MDEV_RENAME=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 CONFIG_FEATURE_MDEV_EXEC=y
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
diff --git a/package/busybox/busybox-1.18.x.config b/package/busybox/busybox-1.18.x.config
index 502048d22d..9e41550bb1 100644
--- a/package/busybox/busybox-1.18.x.config
+++ b/package/busybox/busybox-1.18.x.config
@@ -555,7 +555,7 @@ CONFIG_LSPCI=y
 CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
-# CONFIG_FEATURE_MDEV_RENAME is not set
+CONFIG_FEATURE_MDEV_RENAME=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 CONFIG_FEATURE_MDEV_EXEC=y
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
diff --git a/package/busybox/busybox-1.19.x.config b/package/busybox/busybox-1.19.x.config
index 9f4603dd2e..bf5e8df765 100644
--- a/package/busybox/busybox-1.19.x.config
+++ b/package/busybox/busybox-1.19.x.config
@@ -563,7 +563,7 @@ CONFIG_LSPCI=y
 CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
-# CONFIG_FEATURE_MDEV_RENAME is not set
+CONFIG_FEATURE_MDEV_RENAME=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 CONFIG_FEATURE_MDEV_EXEC=y
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set

From 43695a98920a8b2856f8973b8afac2c012cf0f45 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 24 Dec 2011 13:07:03 +0100
Subject: [PATCH 1130/6849] autotools: add escaping when using HOST_MAKE_ENV
 and TARGET_MAKE_ENV

Without this escaping, the evaluation of HOST_MAKE_ENV and
TARGET_MAKE_ENV is done when the AUTOTARGETS_INNER macro is defined,
not when it is instantiated by the various packages. The result is
that the $(PKG_CONFIG_HOST_BINARY) variable, used in $(HOST_MAKE_ENV)
gets expanded before it is defined.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 3f523dc5e5..c84afa0b19 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -212,11 +212,11 @@ endif
 ifndef $(2)_BUILD_CMDS
 ifeq ($(5),target)
 define $(2)_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 else
 define $(2)_BUILD_CMDS
-	$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 endif
@@ -227,7 +227,7 @@ endif
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -C $$($$(PKG)_SRCDIR) install
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -C $$($$(PKG)_SRCDIR) install
 endef
 endif
 
@@ -237,7 +237,7 @@ endif
 #
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
 	for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
 		cp -f $$$$i $$$$i~; \
 		$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
@@ -251,7 +251,7 @@ endif
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
@@ -261,7 +261,7 @@ endif
 #
 ifndef $(2)_CLEAN_CMDS
 define $(2)_CLEAN_CMDS
-	-$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE)  $$($$(PKG)_CLEAN_OPT) -C $$($$(PKG)_SRCDIR)
+	-$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE)  $$($$(PKG)_CLEAN_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
@@ -271,7 +271,7 @@ endif
 #
 ifndef $(2)_UNINSTALL_STAGING_CMDS
 define $(2)_UNINSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
@@ -281,7 +281,7 @@ endif
 #
 ifndef $(2)_UNINSTALL_TARGET_CMDS
 define $(2)_UNINSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 

From 5ec8da031b9fad064d4cc6ee70106af12cb109b2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jan 2012 23:34:15 +0100
Subject: [PATCH 1131/6849] libesmtp: add optional openssl support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libesmtp/libesmtp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index 63f31923c8..f9be7cc0d6 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -8,4 +8,6 @@ LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
 LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
 LIBESMTP_INSTALL_STAGING = YES
 
+LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
+
 $(eval $(call AUTOTARGETS))

From a01db91eb17219f397cfa28906324b48928d6712 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jan 2012 23:25:00 +0100
Subject: [PATCH 1132/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 515e3db138..1dc1f365bd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,19 +8,26 @@
 
 	defconfigs: qemu configs for x86-64 and sparc.
 
-	uClibc: remove 0.9.30, backport unshare() support.
+	uClibc: remove 0.9.30, backport unshare() support, add
+	0.9.32.1.
 
-	Updated/fixed packages: barebox, bash, binutils, bison,
-	coreutils, dbus-glib, diffutils, dropbear, ebtables, ffmpeg,
-	flex, fluxbox, gawk, grep, gst-dsp, gst-ffmpeg, htop,
-	i2c-tools, iproute2, ipset, iw, lame, libcgi, libeXosip2,
-	libffi, libgpg-error, libgtk2, libroxml, m4,
-	module-init-tools, mpd, mtd-utils, nano, nbd, netsnmp, opencv,
-	pcre, proftpd, ruby, sqlite, squid, u-boot, usbmount, vsftpd,
-	wpa_supplicant, xdm, xf86-video-sis
+	Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions.
 
-	New packages: connman, gliblib, feh, imlib2, transmission,
-	xinput-calibrator
+	Updated/fixed packages: barebox, bash, beecrypt, binutils,
+	bison, busybox, cdrkit, coreutils, dbus-glib, diffutils,
+	dropbear, ebtables, ethtool, ffmpeg, flex, fluxbox, gawk,
+	grep, gst-dsp, gst-ffmpeg, hostapd, htop, i2c-tools, iproute2,
+	ipset, iw, kismet, lame, libcap, libcgi, libeXosip2, libffi,
+	libgpg-error, libgtk2, libnl, libosip, libroxml, lighttpd, m4,
+	module-init-tools, mpd, mtd-utils, nano, nbd, netsnmp, opencv,
+	pcre, proftpd, ruby, samba, sqlite, squid, ti-utils, uboot,
+	uboot-tools, usbmount, valgrind, vsftpd, wpa_supplicant,
+	xapp_xman, xdm, xf86-video-sis
+
+	New packages: connman, explorercanvas, feh, flot, giblib,
+	igh-ethercat, imlib2, jquery, jquery-sparklines,
+	jquery-validation, jsmin, libesmtp, libmbus, NetworkManager,
+	rt-tests, transmission, xinput-calibrator
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 5528286147492aafa8740c09db63290042b79cb0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 Jan 2012 09:15:17 +0100
Subject: [PATCH 1133/6849] rt-tests: fix build issues on uClibc

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rt-tests/rt-tests-uclibc.patch | 103 +++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 package/rt-tests/rt-tests-uclibc.patch

diff --git a/package/rt-tests/rt-tests-uclibc.patch b/package/rt-tests/rt-tests-uclibc.patch
new file mode 100644
index 0000000000..b8e1ac5a2f
--- /dev/null
+++ b/package/rt-tests/rt-tests-uclibc.patch
@@ -0,0 +1,103 @@
+[PATCH] fix build with uClibc
+
+Fix two build issues with (modern) uClibc:
+- uClibc has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME,
+  conflicting with emulation function
+- uClibc doesn't provide utmpx.h if not built with UCLIBC_HAS_UTMPX, which
+  is included in several files (but not needed).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/backfire/sendme.c         |    1 -
+ src/cyclictest/cyclictest.c   |    3 ++-
+ src/pmqtest/pmqtest.c         |    1 -
+ src/ptsematest/ptsematest.c   |    1 -
+ src/sigwaittest/sigwaittest.c |    2 --
+ src/svsematest/svsematest.c   |    1 -
+ 6 files changed, 2 insertions(+), 7 deletions(-)
+
+Index: rt-tests-0.83/src/backfire/sendme.c
+===================================================================
+--- rt-tests-0.83.orig/src/backfire/sendme.c
++++ rt-tests-0.83/src/backfire/sendme.c
+@@ -32,7 +32,6 @@
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ 
+-#include <utmpx.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+Index: rt-tests-0.83/src/cyclictest/cyclictest.c
+===================================================================
+--- rt-tests-0.83.orig/src/cyclictest/cyclictest.c
++++ rt-tests-0.83/src/cyclictest/cyclictest.c
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <errno.h>
++#include <features.h>
+ #include <limits.h>
+ #include <linux/unistd.h>
+ 
+@@ -53,7 +54,7 @@
+ #define gettid() syscall(__NR_gettid)
+ #define sigev_notify_thread_id _sigev_un._tid
+ 
+-#ifdef __UCLIBC__
++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_ADVANCED_REALTIME__)
+ #define MAKE_PROCESS_CPUCLOCK(pid, clock) \
+ 	((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
+ #define CPUCLOCK_SCHED          2
+Index: rt-tests-0.83/src/pmqtest/pmqtest.c
+===================================================================
+--- rt-tests-0.83.orig/src/pmqtest/pmqtest.c
++++ rt-tests-0.83/src/pmqtest/pmqtest.c
+@@ -33,7 +33,6 @@
+ #include <sys/time.h>
+ #include <sys/mman.h>
+ #include <linux/unistd.h>
+-#include <utmpx.h>
+ #include <mqueue.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+Index: rt-tests-0.83/src/ptsematest/ptsematest.c
+===================================================================
+--- rt-tests-0.83.orig/src/ptsematest/ptsematest.c
++++ rt-tests-0.83/src/ptsematest/ptsematest.c
+@@ -33,7 +33,6 @@
+ #include <sys/time.h>
+ #include <sys/mman.h>
+ #include <linux/unistd.h>
+-#include <utmpx.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ 
+Index: rt-tests-0.83/src/sigwaittest/sigwaittest.c
+===================================================================
+--- rt-tests-0.83.orig/src/sigwaittest/sigwaittest.c
++++ rt-tests-0.83/src/sigwaittest/sigwaittest.c
+@@ -31,11 +31,9 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <time.h>
+-#include <utmpx.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <linux/unistd.h>
+-#include <utmpx.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ 
+Index: rt-tests-0.83/src/svsematest/svsematest.c
+===================================================================
+--- rt-tests-0.83.orig/src/svsematest/svsematest.c
++++ rt-tests-0.83/src/svsematest/svsematest.c
+@@ -31,7 +31,6 @@
+ #include <sched.h>
+ #include <string.h>
+ #include <time.h>
+-#include <utmpx.h>
+ 
+ #include <linux/unistd.h>
+ 

From e082ababc98b7fe15e14592e993b53f71cdbeaca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:14 -0300
Subject: [PATCH 1134/6849] kernel-headers: bump 3.0 & 3.1 stable versions, add
 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                     | 10 +++++++---
 ...install-fix-__packed-in-exported-kernel-head.patch} |  0
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.14-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.15-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index e092651146..ccd7a30964 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_1
+	default BR2_KERNEL_HEADERS_3_2
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -36,6 +36,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_1
 		bool "Linux 3.1.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_2
+		bool "Linux 3.2.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -57,7 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.14"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.6"		if BR2_KERNEL_HEADERS_3_1
+	default "3.0.15"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.7"		if BR2_KERNEL_HEADERS_3_1
+	default "3.2"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.14-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.15-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.14-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.15-headers_install-fix-__packed-in-exported-kernel-head.patch

From dbfcdc68369abf6106c22b8359ba9f908ca9da9c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:15 -0300
Subject: [PATCH 1135/6849] linux: update stable kernel to version 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 892a503124..db364fe3f5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_3_1
+	default BR2_LINUX_KERNEL_3_2
 
-config BR2_LINUX_KERNEL_3_1
-	bool "3.1.6"
+config BR2_LINUX_KERNEL_3_2
+	bool "3.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.1.6"
+	default "3.2"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.1.6" if BR2_LINUX_KERNEL_3_1
+	default "3.2" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 2c0b0ab8993c380aa9fe479dba7497a1c28a9cb4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:16 -0300
Subject: [PATCH 1136/6849] qemu/arm-versatile: update to use kernel version
 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qemu/arm-versatile/{linux-3.1.config => linux-3.2.config} | 0
 configs/qemu_arm_versatile_defconfig                          | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.1.config b/board/qemu/arm-versatile/linux-3.2.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.1.config
rename to board/qemu/arm-versatile/linux-3.2.config
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index b629ba9907..17aa833c0d 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 37f488843cb7d5c2cca3d6455e5a19808e3c70eb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:17 -0300
Subject: [PATCH 1137/6849] qemu/mipsel-malta: update readme and use kernel
 version 3.2

Update configuration to use kernel version 3.2
Also update the readme to use buildroot basedir as a reference for
kernel and rootfs like the other samples do.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qemu/mipsel-malta/{linux-3.1.config => linux-3.2.config}  | 0
 board/qemu/mipsel-malta/readme.txt                            | 2 +-
 configs/qemu_mipsel_malta_defconfig                           | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename board/qemu/mipsel-malta/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-3.1.config b/board/qemu/mipsel-malta/linux-3.2.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.1.config
rename to board/qemu/mipsel-malta/linux-3.2.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index b494976452..94e959df93 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:
 
- qemu-system-mipsel -M malta -kernel vmlinux -serial stdio -hda rootfs.ext2 -append "root=/dev/hda"
+ qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 3f558fea9e..a46f886c2c 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 9adf75d95d7c9692e3d0b57e10eb198cf094492a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:18 -0300
Subject: [PATCH 1138/6849] qemu/sh4-r2d: update to use kernel 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sh4-r2d/{linux-3.1.config => linux-3.2.config} | 0
 configs/qemu_sh4_r2d_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/sh4-r2d/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/sh4-r2d/linux-3.1.config b/board/qemu/sh4-r2d/linux-3.2.config
similarity index 100%
rename from board/qemu/sh4-r2d/linux-3.1.config
rename to board/qemu/sh4-r2d/linux-3.2.config
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 8f92a938cc..a35e2fa8a7 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -18,7 +18,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 369888f7a42afc79e09a3b37dbcbaf9d5dd8f464 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:19 -0300
Subject: [PATCH 1139/6849] qemu/x86: update to use kernel version 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-3.1.config => linux-3.2.config} | 0
 configs/qemu_x86_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/x86/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/x86/linux-3.1.config b/board/qemu/x86/linux-3.2.config
similarity index 100%
rename from board/qemu/x86/linux-3.1.config
rename to board/qemu/x86/linux-3.2.config
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 8efe9ae434..314b124cb6 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -13,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config"

From e84d41681ad6e75bd515bf54d74838e2f4518036 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:20 -0300
Subject: [PATCH 1140/6849] qemu/x86-64: update to use kernel version 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86_64/{linux-3.1.config => linux-3.2.config} | 0
 configs/qemu_x86_64_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/x86_64/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.1.config b/board/qemu/x86_64/linux-3.2.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.1.config
rename to board/qemu/x86_64/linux-3.2.config
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index e6a59ac242..cf3c0e1cfa 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -12,6 +12,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.2.config"

From d7cb5c080c945f87738854f9e8b425183f7dfdd8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:21 -0300
Subject: [PATCH 1141/6849] qemu/mips-malta: add new sample config

Add a new qemu_mips_malta sample configuration for big endian MIPS
testing.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/mips-malta/linux-3.2.config | 76 ++++++++++++++++++++++++++
 board/qemu/mips-malta/readme.txt       |  7 +++
 configs/qemu_mips_malta_defconfig      | 19 +++++++
 3 files changed, 102 insertions(+)
 create mode 100644 board/qemu/mips-malta/linux-3.2.config
 create mode 100644 board/qemu/mips-malta/readme.txt
 create mode 100644 configs/qemu_mips_malta_defconfig

diff --git a/board/qemu/mips-malta/linux-3.2.config b/board/qemu/mips-malta/linux-3.2.config
new file mode 100644
index 0000000000..7549ccc3c8
--- /dev/null
+++ b/board/qemu/mips-malta/linux-3.2.config
@@ -0,0 +1,76 @@
+CONFIG_MIPS_MALTA=y
+CONFIG_CPU_MIPS32_R2=y
+CONFIG_MIPS_MT_SMP=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HZ_100=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PCI=y
+CONFIG_PM=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_MISC_DEVICES is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_I8042 is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+CONFIG_FB=y
+CONFIG_FB_CIRRUS=y
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_QUOTA=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_ROOT_NFS=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
new file mode 100644
index 0000000000..0e21a3c9b8
--- /dev/null
+++ b/board/qemu/mips-malta/readme.txt
@@ -0,0 +1,7 @@
+Run the emulation with:
+
+ qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer. No keyboard support has been
+enabled.
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
new file mode 100644
index 0000000000..d6ab8410cc
--- /dev/null
+++ b/configs/qemu_mips_malta_defconfig
@@ -0,0 +1,19 @@
+# Architecture
+BR2_mips=y
+BR2_mips_32r2=y
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.2.config"
+BR2_LINUX_KERNEL_VMLINUX=y
+
+# Serial port config
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"

From 606e2f6ede9d7a41469a8fb7c4270e3f74876b9b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 13:30:22 -0300
Subject: [PATCH 1142/6849] qemu/sparc-ss10: update to use kernel version 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 20cd9fbf57..834514f45f 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -9,6 +9,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 454057b4ee25336129eecdeb04ab72696e8560b2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:14 -0300
Subject: [PATCH 1143/6849] libmnl: bump to version 1.0.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmnl/libmnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 6871034ed3..407ca52a59 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBMNL_VERSION = 1.0.1
+LIBMNL_VERSION = 1.0.2
 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES

From bd2d10389003f21d47d9b247f4cc3b8ead19ae76 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:15 -0300
Subject: [PATCH 1144/6849] iptables: bump to version 1.4.12.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 777baf987e..36fb64fb58 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.12.1
+IPTABLES_VERSION = 1.4.12.2
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 8fce387097f001c19cdc2761ce6d5f4007d7796f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:16 -0300
Subject: [PATCH 1145/6849] links: bump to version 2.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/links/links.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/links/links.mk b/package/links/links.mk
index 470b13d502..52a71f1df4 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LINKS_VERSION = 2.3pre2
+LINKS_VERSION = 2.5
 LINKS_SITE = http://links.twibright.com/download
 LINKS_CONF_OPT = --without-x
 LINKS_DEPENDENCIES = host-pkg-config

From 19f280c3116bf924e935f0e3ea8e9552f39dff94 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:17 -0300
Subject: [PATCH 1146/6849] openssl: security bump to version 1.0.0f

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 51a00dd83b..0354f586da 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0e
+OPENSSL_VERSION = 1.0.0f
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From 99befa6d000c0ec9812f486a6537a1b6781625cf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:18 -0300
Subject: [PATCH 1147/6849] openvpn: bump to version 2.2.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/openvpn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 587368b190..bcb121d060 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.2.1
+OPENVPN_VERSION = 2.2.2
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_CONF_OPT = --enable-small --disable-plugins
 

From 34ac5cda025af01a1c4342e06cab4412e1406925 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:19 -0300
Subject: [PATCH 1148/6849] ebtables: bump to version 2.0.10-4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ebtables/ebtables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index b29c462b04..ddda9850bb 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-EBTABLES_VERSION = 2.0.10-3
+EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
 

From c2e372b097c6eb8176930735b8c32ec1d2b5baf8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:20 -0300
Subject: [PATCH 1149/6849] ffmpeg: bump to version 0.8.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index ef97674c1a..38f04aafc7 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FFMPEG_VERSION = 0.8.7
+FFMPEG_VERSION = 0.8.8
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From b52a0b2a8b959ff252765fa03e43b05012f24a3e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:21 -0300
Subject: [PATCH 1150/6849] ed: bump to version 1.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ed/ed.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 2196af0f0d..f5a4b225f2 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ED_VERSION = 1.5
+ED_VERSION = 1.6
 ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"

From 8f0b667cd2b9cec7794bc0d35c049a9acd6094ba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:22 -0300
Subject: [PATCH 1151/6849] dialog: bump to version 1.1-20111020

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dialog/dialog.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 0a4f792f54..175ed9351c 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -3,9 +3,10 @@
 # dialog
 #
 #############################################################
-DIALOG_VERSION:=1.1-20100428
-DIALOG_SOURCE:=dialog-$(DIALOG_VERSION).tgz
-DIALOG_SITE:=ftp://invisible-island.net/dialog
+
+DIALOG_VERSION = 1.1-20111020
+DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
+DIALOG_SITE = ftp://invisible-island.net/dialog
 DIALOG_CONF_OPT = --with-ncurses
 DIALOG_CONF_ENV = ac_cv_path_NCURSES_CONFIG=true LIBS=-lncurses
 DIALOG_DEPENDENCIES = ncurses

From 1c2e5b09aaa1fda2656f4803476f7014ccd51040 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 15:26:23 -0300
Subject: [PATCH 1152/6849] file: bump to version 5.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index 753605698a..bb1b6bd1b2 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-FILE_VERSION = 5.09
-FILE_SITE = ftp://ftp.astron.com/pub/file/
+FILE_VERSION = 5.10
+FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib
 FILE_INSTALL_STAGING = YES

From fa1c862617ac0d2b60a7bbbc148a1e96912036f7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 3 Jan 2012 21:48:46 +0100
Subject: [PATCH 1153/6849] xenomai: bump to 2.6.0

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in                   | 60 -----------------
 package/xenomai/xenomai-fix-lfs-issue.patch | 72 +++++++++++++++++++++
 package/xenomai/xenomai.mk                  | 11 +---
 3 files changed, 73 insertions(+), 70 deletions(-)
 create mode 100644 package/xenomai/xenomai-fix-lfs-issue.patch

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index cfeaa04289..98ebf0a648 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -43,66 +43,6 @@ config BR2_PACKAGE_XENOMAI_SMP
 	  This option allows to enable or disable SMP support. It has
 	  to match your kernel configuration.
 
-choice
-	prompt "Xenomai ARM CPU type"
-	depends on BR2_arm
-	default BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM
-	help
-	  On the ARM architecture, Xenomai needs to be configured for
-	  a specific sub-architecture.  Select the appropriate
-	  sub-architecture from the list.
-
-	config BR2_PACKAGE_XENOMAI_CPU_AT91RM9200
-		bool "Atmel AT91RM9200"
-
-	config BR2_PACKAGE_XENOMAI_CPU_AT91SAM926X
-		bool "Atmel AT91SAM926X"
-
-	config BR2_PACKAGE_XENOMAI_CPU_INTEGRATOR
-		bool "ARM Ltd. Integrator"
-
-	config BR2_PACKAGE_XENOMAI_CPU_IXP4XX
-		bool "Intel IXP4XX (XScale)"
-
-	config BR2_PACKAGE_XENOMAI_CPU_IMX
-		bool "Freescale i.MX (MX1/MXL)"
-
-	config BR2_PACKAGE_XENOMAI_CPU_IMX21
-		bool "Freescale i.MX21"
-
-	config BR2_PACKAGE_XENOMAI_CPU_MX2
-		bool "Freescale MXC/MX2"
-
-	config BR2_PACKAGE_XENOMAI_CPU_MX3
-		bool "Freescale MXC/MX3"
-
-	config BR2_PACKAGE_XENOMAI_CPU_SA1100
-		bool "StrongARM SA1100"
-
-	config BR2_PACKAGE_XENOMAI_CPU_S3C2410
-		bool "S3C2410"
-
-	config BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM
-		bool "Generic ARM"
-
-endchoice
-
-# Now set CPU type. We force manually selected type even if detected in case
-# user takes the risk.
-config BR2_PACKAGE_XENOMAI_CPU_TYPE
-	string
-	depends on BR2_PACKAGE_XENOMAI && BR2_arm
-	default "at91rm9200"  if BR2_PACKAGE_XENOMAI_CPU_AT91RM9200
-	default "at91sam926x" if BR2_PACKAGE_XENOMAI_CPU_AT91SAM926X
-	default "integrator"  if BR2_PACKAGE_XENOMAI_CPU_INTEGRATOR
-	default "ixp4xx"      if BR2_PACKAGE_XENOMAI_CPU_IXP4XX
-	default "generic"     if BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM
-	default "imx"         if BR2_PACKAGE_XENOMAI_CPU_IMX
-	default "imx21"       if BR2_PACKAGE_XENOMAI_CPU_IMX21
-	default "mx2"         if BR2_PACKAGE_XENOMAI_CPU_MX2
-	default "mx3"         if BR2_PACKAGE_XENOMAI_CPU_MX3
-	default "s3c2410"     if BR2_PACKAGE_XENOMAI_CPU_S3C2410
-
 config BR2_PACKAGE_XENOMAI_TESTSUITE
        bool "Install testsuite"
        help
diff --git a/package/xenomai/xenomai-fix-lfs-issue.patch b/package/xenomai/xenomai-fix-lfs-issue.patch
new file mode 100644
index 0000000000..157c8e25cf
--- /dev/null
+++ b/package/xenomai/xenomai-fix-lfs-issue.patch
@@ -0,0 +1,72 @@
+From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
+Date: Sat, 5 Nov 2011 20:59:01 +0000 (+0100)
+Subject: posix: fix compilation for LFS
+X-Git-Url: http://git.xenomai.org/?p=xenomai-2.6.git;a=commitdiff_plain;h=06ae5c5e47fbfd9d8dbbe6fcf1a1db0c14bad9de;hp=8f6feff876029244dabc1257cdf13209fbd64fb5
+
+posix: fix compilation for LFS
+---
+
+diff --git a/include/posix/sys/mman.h b/include/posix/sys/mman.h
+index 455e565..a304755 100644
+--- a/include/posix/sys/mman.h
++++ b/include/posix/sys/mman.h
+@@ -63,17 +63,16 @@ int __real_shm_open(const char *name, int oflag, mode_t mode);
+ 
+ int __real_shm_unlink(const char *name);
+ 
+-#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64
+ void *__real_mmap(void *addr,
+ 		  size_t len,
+ 		  int prot,
+ 		  int flags,
+ 		  int fildes,
+ 		  long off);
+-#else
+-#define __real_mmap __real_mmap64
+-#endif
+-#ifdef _LARGEFILE64_SOURCE
++
++#if __WORDSIZE == 32
++#if defined(_LARGEFILE64_SOURCE) \
++	|| defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+ void *__real_mmap64(void *addr,
+ 		    size_t len,
+ 		    int prot,
+@@ -82,6 +81,11 @@ void *__real_mmap64(void *addr,
+ 		    long long off);
+ #endif
+ 
++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#define __real_mmap __real_mmap64
++#endif
++#endif
++
+ int __real_munmap(void *addr, size_t len);
+ 
+ #ifdef __cplusplus
+diff --git a/include/posix/unistd.h b/include/posix/unistd.h
+index 49463a0..90cce86 100644
+--- a/include/posix/unistd.h
++++ b/include/posix/unistd.h
+@@ -54,13 +54,17 @@ int ftruncate(int fildes, off_t length);
+ extern "C" {
+ #endif
+ 
+-#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64
+ int __real_ftruncate(int fildes, long length);
+-#else
++
++#if __WORDSIZE == 32
++#if defined(_LARGEFILE64_SOURCE) \
++	|| defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++int __real_ftruncate64(int fildes, long long length);
++#endif
++
++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+ #define __real_ftruncate __real_ftruncate64
+ #endif
+-#ifdef _LARGEFILE64_SOURCE
+-int __real_ftruncate64(int fildes, long long length);
+ #endif
+ 
+ ssize_t __real_read(int fd, void *buf, size_t nbyte);
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index f79557999b..b1a492f13d 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -7,7 +7,7 @@
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
 ifeq ($(XENOMAI_VERSION),)
-XENOMAI_VERSION = 2.5.6
+XENOMAI_VERSION = 2.6.0
 endif
 
 XENOMAI_SITE = http://download.gna.org/xenomai/stable/
@@ -15,15 +15,6 @@ XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
 
 XENOMAI_INSTALL_STAGING = YES
 
-ifeq ($(BR2_arm),y)
-XENOMAI_CPU_TYPE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CPU_TYPE))
-# Set "generic" if not defined
-ifeq ($(XENOMAI_CPU_TYPE),)
-XENOMAI_CPU_TYPE = generic
-endif
-XENOMAI_CONF_OPT += --enable-arm-mach=$(XENOMAI_CPU_TYPE)
-endif #BR2_arm
-
 ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y)
 XENOMAI_CONF_OPT += --enable-smp
 endif

From 8d472bb50ce83d02bba28df6557b65efc2e0db48 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 3 Jan 2012 21:48:47 +0100
Subject: [PATCH 1154/6849] xenomai: restrict to the set of supported
 architectures

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in       | 2 ++
 package/xenomai/Config.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 8a9f87ec46..b304efd9aa 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -3,6 +3,8 @@ menu "Linux Kernel Extensions"
 # Xenomai
 config BR2_LINUX_KERNEL_EXT_XENOMAI
 	bool "Adeos/Xenomai Real-time patch"
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
+		   BR2_bfin || BR2_powerpc || BR2_sh4
 	select BR2_PACKAGE_XENOMAI
 	help
 	  Xenomai Kernel part.
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 98ebf0a648..ecab23e6f0 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_XENOMAI
 	bool "Xenomai Userspace"
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
+		   BR2_bfin || BR2_powerpc || BR2_sh4
 	help
 	  Real-Time Framework for Linux
 	  http://www.xenomai.org

From c2c06aad27b59dc85d8747a05433aae51781a775 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 3 Jan 2012 21:48:48 +0100
Subject: [PATCH 1155/6849] xenomai: mention which kernel versions are
 supported

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index b304efd9aa..172fa76c75 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -9,6 +9,12 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
 	help
 	  Xenomai Kernel part.
 
+	  In the current version of Xenomai, the following kernel
+	  versions are supported: on Blackfin, 2.6.34 and 2.6.36.9, on
+	  SH4, 2.6.32.10, on x86, 2.6.35.9, 2.6.37.6, 2.6.38.8, on
+	  ARM, 2.6.35.9, 2.6.37.6, 2.6.38.8, on NIOS2, 2.6.35, on
+	  PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8.
+
 config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 	depends on BR2_LINUX_KERNEL_EXT_XENOMAI
 	string "Path for Adeos patch file"

From 5a6087d62e5c2a272278606ebf1cc62830cf4c68 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Jan 2012 16:31:43 -0300
Subject: [PATCH 1156/6849] toolchain: add powerpc SPE ABI support

Add the ability for buildroot to build an SPE ABI enabled toolchain.

This is mandatory for e500v1/v2 cores since they don't support classic
FPU mode as the e500mc does.

Useful for Freescale's PowerQUICC III and single/dual-core QorIQ
line of processors.

The new TARGET_ABI variable is used rather than TARGET_CFLAGS for
uclibc's UCLIBC_EXTRA_CFLAGS to avoid breakish CFLAGS leaking in, a
good example being -mthumb for ARM.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in        | 17 ++++++++++++++++-
 target/Config.in.arch      | 21 ++++++++++++++++++++-
 toolchain/gcc/Makefile.in  |  5 +++++
 toolchain/uClibc/uclibc.mk |  8 +++++++-
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index c3af5d3ea5..dc8d0383c1 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -31,6 +31,21 @@ ABI=eabi
 endif
 endif
 
+# For FSL PowerPC there's SPE
+ifeq ($(BR2_powerpc_SPE),y)
+ABI=spe
+# MPC8540s are e500v1 with single precision FP
+ifeq ($(BR2_powerpc_8540),y)
+TARGET_ABI+=-mabi=spe -mfloat-gprs=single -Wa,-me500
+endif
+ifeq ($(BR2_powerpc_8548),y)
+TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500x2
+endif
+ifeq ($(BR2_powerpc_e500mc),y)
+TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc
+endif
+endif
+
 REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
 
 STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sysroot
@@ -60,7 +75,7 @@ ifeq ($(BR2_DEBUG_3),y)
 TARGET_DEBUGGING=-g3
 endif
 
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
+TARGET_CFLAGS=$(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 ifeq ($(BR2_x86_64),y)
diff --git a/target/Config.in.arch b/target/Config.in.arch
index 5e9fad4869..417441d211 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -447,7 +447,9 @@ config BR2_powerpc_860
 config BR2_powerpc_970
 	bool "970"
 config BR2_powerpc_8540
-	bool "8540"
+	bool "8540 / e500v1"
+config BR2_powerpc_8548
+	bool "8548 / e500v2"
 comment "e300c2 needs gcc >= 4.4.x"
 config BR2_powerpc_e300c2
 	bool "e300c2"
@@ -459,6 +461,22 @@ config BR2_powerpc_e500mc
 	bool "e500mc"
 endchoice
 
+choice
+	prompt "Target ABI"
+	depends on BR2_powerpc
+	default BR2_powerpc_CLASSIC if BR2_powerpc_e500mc
+	default BR2_powerpc_SPE if BR2_powerpc_8540 || BR2_powerpc_8548
+	help
+	  Application Binary Interface to use
+
+config BR2_powerpc_CLASSIC
+	bool "Classic"
+	depends on !(BR2_powerpc_8540 || BR2_powerpc_8548)
+config BR2_powerpc_SPE
+	bool "SPE"
+	depends on BR2_powerpc_8540 || BR2_powerpc_8548 || BR2_powerpc_e500mc
+endchoice
+
 config BR2_ARCH
 	string
 	default "arm"		if BR2_arm
@@ -614,6 +632,7 @@ config BR2_GCC_TARGET_TUNE
 	default 860		if BR2_powerpc_860
 	default 970		if BR2_powerpc_970
 	default 8540		if BR2_powerpc_8540
+	default	8548		if BR2_powerpc_8548
 	default e300c2		if BR2_powerpc_e300c2
 	default e300c3		if BR2_powerpc_e300c3
 	default e500mc		if BR2_powerpc_e500mc
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index 2e55ed0f7b..d9efcf0634 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -47,6 +47,11 @@ EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap
 SOFT_FLOAT_CONFIG_OPTION:=
 endif
 
+# Disable mudflap and enable proper double/long double for SPE ABI
+ifeq ($(BR2_powerpc_SPE),y)
+EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap --enable-e500_double --with-long-double-128
+endif
+
 ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
 EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
 
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index fbfb0dfd1d..ee474bbb61 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -217,7 +217,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sparc)
 	$(SED) 's/^.*$(UCLIBC_SPARC_TYPE)[^B].*/$(UCLIBC_SPARC_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(UCLIBC_TARGET_ARCH),powerpc)
-ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_e500mc),y)
+ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_8548)$(BR2_powerpc_e500mc),y)
 	/bin/echo "# CONFIG_CLASSIC is not set" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "CONFIG_E500=y" >> $(UCLIBC_DIR)/.oldconfig
 else
@@ -385,6 +385,7 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
 		oldconfig
 	touch $@
@@ -403,6 +404,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" headers \
 		lib/crt1.o lib/crti.o lib/crtn.o \
 		install_headers
@@ -424,6 +426,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate) $(LIBFLO
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
 		all
 	touch -c $@
@@ -435,6 +438,7 @@ uclibc-menuconfig: dirs $(UCLIBC_DIR)/.config
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
 		menuconfig && \
 	touch -c $(UCLIBC_DIR)/.config
@@ -447,6 +451,7 @@ $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		install_runtime install_dev
 	# Install the kernel headers to the staging dir if necessary
 	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
@@ -477,6 +482,7 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		install_runtime
 	touch -c $@
 

From d67a67efaa8fb7fd24e0ee0f5b261a8a57583d35 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Jan 2012 12:30:00 +0100
Subject: [PATCH 1157/6849] Python: add external modules option

all external python packages/libraries should reside in
"external python modules" section.

Move existing modules python-serial and python-mad there

Move python-mad from package/multimedia to package

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                 | 7 ++++++-
 package/multimedia/Config.in                      | 1 -
 package/{multimedia => }/python-mad/Config.in     | 0
 package/{multimedia => }/python-mad/python-mad.mk | 0
 4 files changed, 6 insertions(+), 2 deletions(-)
 rename package/{multimedia => }/python-mad/Config.in (100%)
 rename package/{multimedia => }/python-mad/python-mad.mk (100%)

diff --git a/package/Config.in b/package/Config.in
index 92b80e66c1..78174e5acd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -237,6 +237,12 @@ endif
 source "package/microperl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
+if BR2_PACKAGE_PYTHON
+menu "external python modules"
+source "package/python-mad/Config.in"
+source "package/python-serial/Config.in"
+endmenu
+endif
 source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 endmenu
@@ -313,7 +319,6 @@ source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
-source "package/python-serial/Config.in"
 endmenu
 
 if BROKEN
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index d50e4fc326..a05d1d983a 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -40,7 +40,6 @@ source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
 source "package/multimedia/portaudio/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
-source "package/multimedia/python-mad/Config.in"
 source "package/multimedia/speex/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
 source "package/multimedia/taglib/Config.in"
diff --git a/package/multimedia/python-mad/Config.in b/package/python-mad/Config.in
similarity index 100%
rename from package/multimedia/python-mad/Config.in
rename to package/python-mad/Config.in
diff --git a/package/multimedia/python-mad/python-mad.mk b/package/python-mad/python-mad.mk
similarity index 100%
rename from package/multimedia/python-mad/python-mad.mk
rename to package/python-mad/python-mad.mk

From 649915fb753d75a456bf627192204a182aae609f Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Jan 2012 12:30:01 +0100
Subject: [PATCH 1158/6849] Python: enable zlib support for the host package

zlib is needed for the host-setuptools package

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/python/python.mk b/package/python/python.mk
index 9ef2ccc482..78895d412d 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -28,7 +28,6 @@ HOST_PYTHON_CONF_OPT += 	\
 	--disable-bsddb		\
 	--disable-test-modules	\
 	--disable-bz2		\
-	--disable-zlib		\
 	--disable-ssl
 
 HOST_PYTHON_MAKE_ENV = \
@@ -52,7 +51,7 @@ endef
 
 PYTHON_DEPENDENCIES  = host-python libffi
 
-HOST_PYTHON_DEPENDENCIES = host-expat
+HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
 
 PYTHON_INSTALL_STAGING = YES
 

From bdd274110a160ec67fceae642d14a5c3f77a87aa Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Jan 2012 12:30:02 +0100
Subject: [PATCH 1159/6849] New package: python-dpkt

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/python-dpkt/Config.in      | 11 +++++++++++
 package/python-dpkt/python-dpkt.mk | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/python-dpkt/Config.in
 create mode 100644 package/python-dpkt/python-dpkt.mk

diff --git a/package/Config.in b/package/Config.in
index 78174e5acd..d70f9b05c3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -239,6 +239,7 @@ source "package/php/Config.in"
 source "package/python/Config.in"
 if BR2_PACKAGE_PYTHON
 menu "external python modules"
+source "package/python-dpkt/Config.in"
 source "package/python-mad/Config.in"
 source "package/python-serial/Config.in"
 endmenu
diff --git a/package/python-dpkt/Config.in b/package/python-dpkt/Config.in
new file mode 100644
index 0000000000..aac9f09c9a
--- /dev/null
+++ b/package/python-dpkt/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_DPKT
+	bool "python-dpkt"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_ZLIB
+	help
+	  Fast, simple packet creation / parsing, with definitions
+	  for the basic TCP/IP protocols.
+
+	  http://code.google.com/p/dpkt/
+
+
diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk
new file mode 100644
index 0000000000..7ac873c950
--- /dev/null
+++ b/package/python-dpkt/python-dpkt.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# python-dpkt
+#
+#############################################################
+
+PYTHON_DPKT_VERSION = 1.7
+PYTHON_DPKT_SOURCE  = dpkt-$(PYTHON_DPKT_VERSION).tar.gz
+PYTHON_DPKT_SITE    = http://dpkt.googlecode.com/files
+
+PYTHON_DPKT_DEPENDENCIES = python
+
+define PYTHON_DPKT_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_DPKT_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(call GENTARGETS))
+

From 0717f0357db48198a01233b0629251ba5399ca27 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Jan 2012 12:30:03 +0100
Subject: [PATCH 1160/6849] New package: python-setuptools

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/python-setuptools/Config.in           |  8 +++++
 .../python-setuptools/python-setuptools.mk    | 34 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/python-setuptools/Config.in
 create mode 100644 package/python-setuptools/python-setuptools.mk

diff --git a/package/Config.in b/package/Config.in
index d70f9b05c3..bfb6ac93d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -242,6 +242,7 @@ menu "external python modules"
 source "package/python-dpkt/Config.in"
 source "package/python-mad/Config.in"
 source "package/python-serial/Config.in"
+source "package/python-setuptools/Config.in"
 endmenu
 endif
 source "package/ruby/Config.in"
diff --git a/package/python-setuptools/Config.in b/package/python-setuptools/Config.in
new file mode 100644
index 0000000000..63c2b01817
--- /dev/null
+++ b/package/python-setuptools/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_SETUPTOOLS
+	bool "python-setuptools"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_ZLIB
+	help
+	  Download, build, install, upgrade, and uninstall Python packages.
+
+	  http://pypi.python.org/pypi/setuptools
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
new file mode 100644
index 0000000000..b75987bad7
--- /dev/null
+++ b/package/python-setuptools/python-setuptools.mk
@@ -0,0 +1,34 @@
+#############################################################
+#
+# python-setuptools
+#
+#############################################################
+
+PYTHON_SETUPTOOLS_VERSION = 0.6c11
+PYTHON_SETUPTOOLS_SOURCE  = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
+PYTHON_SETUPTOOLS_SITE    = http://pypi.python.org/packages/source/s/setuptools
+PYTHON_SETUPTOOLS_DEPENDENCIES = python
+HOST_PYTHON_SETUPTOOLS_DEPENDENCIES = host-python
+
+
+define HOST_PYTHON_SETUPTOOLS_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_SETUPTOOLS_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define HOST_PYTHON_SETUPTOOLS_INSTALL_CMDS
+	(cd $(@D); PYTHONPATH="$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"\
+	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
+endef
+
+define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
+	(cd $(@D); PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"\
+	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))
+

From e64b34e957522c355ed77f6356666862c99a1b96 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Jan 2012 12:30:04 +0100
Subject: [PATCH 1161/6849] New package: python-distutilscross

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-distutilscross.mk                  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/python-distutilscross/python-distutilscross.mk

diff --git a/package/python-distutilscross/python-distutilscross.mk b/package/python-distutilscross/python-distutilscross.mk
new file mode 100644
index 0000000000..9003189d1f
--- /dev/null
+++ b/package/python-distutilscross/python-distutilscross.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# python-distutilscross
+#
+#############################################################
+
+PYTHON_DISTUTILSCROSS_VERSION = 0.1
+PYTHON_DISTUTILSCROSS_SOURCE  = distutilscross-$(PYTHON_DISTUTILSCROSS_VERSION).tar.gz
+PYTHON_DISTUTILSCROSS_SITE    = http://pypi.python.org/packages/source/d/distutilscross
+
+HOST_PYTHON_DISTUTILSCROSS_DEPENDENCIES = host-python host-python-setuptools
+
+define HOST_PYTHON_DISTUTILSCROSS_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define HOST_PYTHON_DISTUTILSCROSS_INSTALL_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
+endef
+
+$(eval $(call GENTARGETS,host))

From 221d609bcf6baed80ac07230e80da49d1522e069 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Jan 2012 12:30:05 +0100
Subject: [PATCH 1162/6849] New package: python-netifaces

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/python-netifaces/Config.in            |  8 +++
 .../python-netifaces-fix-cross-build.patch    | 54 +++++++++++++++++++
 package/python-netifaces/python-netifaces.mk  | 25 +++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 package/python-netifaces/Config.in
 create mode 100644 package/python-netifaces/python-netifaces-fix-cross-build.patch
 create mode 100644 package/python-netifaces/python-netifaces.mk

diff --git a/package/Config.in b/package/Config.in
index bfb6ac93d3..a82c658758 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -241,6 +241,7 @@ if BR2_PACKAGE_PYTHON
 menu "external python modules"
 source "package/python-dpkt/Config.in"
 source "package/python-mad/Config.in"
+source "package/python-netifaces/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
 endmenu
diff --git a/package/python-netifaces/Config.in b/package/python-netifaces/Config.in
new file mode 100644
index 0000000000..b9d66d8b64
--- /dev/null
+++ b/package/python-netifaces/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_NETIFACES
+	bool "python-netifaces"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS
+	help
+	  Portable access to network interfaces from Python.
+
+	  http://alastairs-place.net/projects/netifaces
diff --git a/package/python-netifaces/python-netifaces-fix-cross-build.patch b/package/python-netifaces/python-netifaces-fix-cross-build.patch
new file mode 100644
index 0000000000..5a11b61951
--- /dev/null
+++ b/package/python-netifaces/python-netifaces-fix-cross-build.patch
@@ -0,0 +1,54 @@
+fix cross-compilation issues:
+
+- don't execute cross-compiled binaries
+- pass LDFLAGS to linker
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ setup.py |   19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
+
+Index: b/setup.py
+===================================================================
+--- a/setup.py
++++ b/setup.py
+@@ -67,17 +67,8 @@
+                                                   libraries=libraries,
+                                                   debug=self.debug)
+                     if execute:
+-                        abspath = os.path.abspath(os.path.join(self.build_temp,
+-                                                               'conftest'))
+-                        pipe = os.popen(abspath, 'r')
+-                        result = pipe.read().strip()
+-                        status = pipe.close()
+-                        if status is None:
+-                            status = 0
+-                        if result == '':
+-                            result = True
+-                        if status != 0:
+-                            result = False
++                        # cross-compiled code can't be executed
++                        result = True
+                         
+             finally:
+                 os.dup2(mystdout, 1)
+@@ -89,6 +80,10 @@
+         return result
+ 
+     def check_requirements(self):
++        # get library dirs
++	if os.environ.has_key('LDFLAGS'):
++	    lib_dirs = os.environ['LDFLAGS']
++
+         # Load the cached config data from a previous run if possible; compiling
+         # things to test for features is slow
+         cache_file = os.path.join(self.build_temp, 'config.cache')
+@@ -356,7 +351,7 @@
+                                                    in optional_headers]),
+                             'sockaddr': sockaddr }
+ 
+-                    if self.test_build(testrig, execute=False):
++                    if self.test_build(testrig, execute=False, library_dirs = [lib_dirs]):
+                         result.append(sockaddr)
+                 
+             if result:
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
new file mode 100644
index 0000000000..e9a7099cd9
--- /dev/null
+++ b/package/python-netifaces/python-netifaces.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# python-netifaces
+#
+#############################################################
+
+PYTHON_NETIFACES_VERSION = 0.6
+PYTHON_NETIFACES_SOURCE  = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
+PYTHON_NETIFACES_SITE    = http://alastairs-place.net/projects/netifaces
+
+PYTHON_NETIFACES_DEPENDENCIES = python host-python-setuptools host-python-distutilscross
+
+define PYTHON_NETIFACES_BUILD_CMDS
+	(cd $(@D); \
+		PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+	$(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_NETIFACES_INSTALL_TARGET_CMDS
+	(cd $(@D); PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(call GENTARGETS))

From bcf3103f0eee3c3d127f7e45f8cd4b94e7f418fc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 8 Jan 2012 18:16:07 +0100
Subject: [PATCH 1163/6849] ccache: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/ccache.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 87a64e5d5c..9155441087 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-CCACHE_VERSION = 3.1.4
+CCACHE_VERSION = 3.1.7
 CCACHE_SITE    = http://samba.org/ftp/ccache
 CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
 

From 747946b596a4543dc737213349d1c19f32fb16ce Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 9 Jan 2012 09:47:28 +0100
Subject: [PATCH 1164/6849] barebox: add 2012.01, remove 2011.10

And mark 2011.11 as deprecated.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index b8e2b95d78..b98878b94c 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,20 +8,20 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2011_12
+	default BR2_TARGET_BAREBOX_2012_01
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2011_10
-	depends on BR2_DEPRECATED
-	bool "2011.10"
-
 config BR2_TARGET_BAREBOX_2011_11
+	depends on BR2_DEPRECATED
 	bool "2011.11"
 
 config BR2_TARGET_BAREBOX_2011_12
 	bool "2011.12"
 
+config BR2_TARGET_BAREBOX_2012_01
+	bool "2012.01"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -39,9 +39,9 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2011.10.0"	if BR2_TARGET_BAREBOX_2011_10
 	default "2011.11.0"	if BR2_TARGET_BAREBOX_2011_11
 	default "2011.12.0"	if BR2_TARGET_BAREBOX_2011_12
+	default "2012.01.0"	if BR2_TARGET_BAREBOX_2012_01
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From f7950dbfe55a95237e3a5f1d80e86a5a2c4bd1b9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 9 Jan 2012 10:50:30 -0300
Subject: [PATCH 1165/6849] kernel-headers: bump 3.1.x series to version 3.1.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index ccd7a30964..e6b2909bb9 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -61,7 +61,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.15"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.7"		if BR2_KERNEL_HEADERS_3_1
+	default "3.1.8"		if BR2_KERNEL_HEADERS_3_1
 	default "3.2"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From b10a8058206f246d8234c4adff9c6b29a6d3759c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 9 Jan 2012 08:42:07 +0100
Subject: [PATCH 1166/6849] python-netifaces: add -x option to fix
 cross-compilation

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-netifaces/python-netifaces.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index e9a7099cd9..5bfa326231 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -14,7 +14,7 @@ define PYTHON_NETIFACES_BUILD_CMDS
 	(cd $(@D); \
 		PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
 		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-	$(HOST_DIR)/usr/bin/python setup.py build)
+	$(HOST_DIR)/usr/bin/python setup.py build -x)
 endef
 
 define PYTHON_NETIFACES_INSTALL_TARGET_CMDS

From 3c57ebe4dd97e123a6ede9869d094eb50f0fbd05 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 10 Jan 2012 13:41:49 +0100
Subject: [PATCH 1167/6849] python-netifaces: fix build on setups without
 getifaddrs

E.G. default uClibc configuration. Patch sent upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-netifaces-ifaddrs-uclibc.patch     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/python-netifaces/python-netifaces-ifaddrs-uclibc.patch

diff --git a/package/python-netifaces/python-netifaces-ifaddrs-uclibc.patch b/package/python-netifaces/python-netifaces-ifaddrs-uclibc.patch
new file mode 100644
index 0000000000..375b08da15
--- /dev/null
+++ b/package/python-netifaces/python-netifaces-ifaddrs-uclibc.patch
@@ -0,0 +1,31 @@
+[PATCH] fix compile error in ifaddrs() for HAVE_SOCKET_IOCTLS variant
+
+Used on E.G. uClibc. This variant seems to have bitrotten somewhat.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ netifaces.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: netifaces-0.6/netifaces.c
+===================================================================
+--- netifaces-0.6.orig/netifaces.c
++++ netifaces-0.6/netifaces.c
+@@ -624,7 +624,7 @@
+   if (ioctl (sock, SIOCGIFHWADDR, &ifr) == 0) {
+     found = TRUE;
+ 
+-    if (string_from_sockaddr (ifr->CNAME(ifr_addr), buffer, sizeof (buffer)) == 0) {
++    if (string_from_sockaddr ((struct sockaddr *)&ifr.CNAME(ifr_addr), buffer, sizeof (buffer)) == 0) {
+       PyObject *hwaddr = PyString_FromString (buffer);
+       PyObject *dict = PyDict_New ();
+       PyObject *list = PyList_New (1);
+@@ -633,7 +633,7 @@
+       if (!hwaddr || !dict || !list || !family) {
+         Py_XDECREF (hwaddr);
+         Py_XDECREF (dict);
+-        Py_XDECREF (list)
++        Py_XDECREF (list);
+         Py_XDECREF (family);
+         Py_XDECREF (result);
+         close (sock);

From 60033b8f88b477841239fc383349eea5c357fb99 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 10 Jan 2012 15:41:38 +0100
Subject: [PATCH 1168/6849] Add ttyGS0 to securetty

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/securetty | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/skeleton/etc/securetty b/fs/skeleton/etc/securetty
index 6c07d7f4fe..547ceda573 100644
--- a/fs/skeleton/etc/securetty
+++ b/fs/skeleton/etc/securetty
@@ -46,3 +46,4 @@ ttySC2
 ttySC3
 ttySC4
 ttySC5
+ttyGS0

From b0ff93adfbb44ada2c685713cb95b32c2ce801e4 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Tue, 10 Jan 2012 07:18:59 -0500
Subject: [PATCH 1169/6849] New package: sane-backends

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/sane-backends/Config.in        |  7 +++++++
 package/sane-backends/sane-backends.mk | 13 +++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 package/sane-backends/Config.in
 create mode 100644 package/sane-backends/sane-backends.mk

diff --git a/package/Config.in b/package/Config.in
index a82c658758..276806b8f7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -199,6 +199,7 @@ source "package/openocd/Config.in"
 source "package/pciutils/Config.in"
 source "package/picocom/Config.in"
 source "package/rng-tools/Config.in"
+source "package/sane-backends/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
 source "package/smartmontools/Config.in"
diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
new file mode 100644
index 0000000000..fb734358c5
--- /dev/null
+++ b/package/sane-backends/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SANE_BACKENDS
+	bool "sane-backends"
+	select BR2_PACKAGE_LIBUSB
+	help
+	  SANE - Scanner Access Now Easy
+
+	  http://www.sane-project.org
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
new file mode 100644
index 0000000000..1188d187d1
--- /dev/null
+++ b/package/sane-backends/sane-backends.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# sane-backends
+#
+#############################################################
+SANE_BACKENDS_VERSION = 1.0.22
+SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
+SANE_BACKENDS_SITE = ftp://ftp2.sane-project.org/pub/sane/sane-backends-$(SANE_BACKENDS_VERSION)
+
+SANE_BACKENDS_DEPENDENCIES += libusb
+SANE_BACKENDS_CONF_OPT += --enable-libusb_1_0
+
+$(eval $(call AUTOTARGETS))

From dda08e492d724e0bbe5896b1c97b5a8ea1b40b59 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Wed, 11 Jan 2012 12:06:49 +0100
Subject: [PATCH 1170/6849] Add pygame package

[Peter: drop menu for suboptions]
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |   1 +
 package/python-pygame/Config.in        |  49 +++++++++++
 package/python-pygame/python-pygame.mk | 111 +++++++++++++++++++++++++
 3 files changed, 161 insertions(+)
 create mode 100644 package/python-pygame/Config.in
 create mode 100644 package/python-pygame/python-pygame.mk

diff --git a/package/Config.in b/package/Config.in
index 276806b8f7..ac14d2c654 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -243,6 +243,7 @@ menu "external python modules"
 source "package/python-dpkt/Config.in"
 source "package/python-mad/Config.in"
 source "package/python-netifaces/Config.in"
+source "package/python-pygame/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
 endmenu
diff --git a/package/python-pygame/Config.in b/package/python-pygame/Config.in
new file mode 100644
index 0000000000..1b0a8b96bb
--- /dev/null
+++ b/package/python-pygame/Config.in
@@ -0,0 +1,49 @@
+config BR2_PACKAGE_PYTHON_PYGAME
+	bool "pygame"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_SDL
+	help
+	  Pygame is a cross-platfrom library designed to make it easy to write
+	  multimedia software, such as games, in Python. Pygame requires the
+	  Python language and SDL multimedia library.
+	  It can also make use of several other popular libraries.
+
+	  http://www.pygame.org/
+
+if BR2_PACKAGE_PYTHON_PYGAME
+config BR2_PACKAGE_PYTHON_PYGAME_IMAGE
+	bool "pygame.image"
+	select BR2_PACKAGE_SDL_IMAGE
+	select BR2_PACKAGE_SDL_IMAGE_PNG
+	select BR2_PACKAGE_SDL_IMAGE_JPEG
+	help
+	  pygame module for loading, saving and transfering images.
+	  Will autoselect sdl_image with png and jpeg support.
+
+config BR2_PACKAGE_PYTHON_PYGAME_FONT
+	bool "pygame.font"
+	select BR2_PACKAGE_SDL_TTF
+	help
+	  pygame module for loading and rendering fonts.
+	  Will autoselect sdl_ttf.
+
+config BR2_PACKAGE_PYTHON_PYGAME_MIXER
+	bool "pygame.mixer"
+	select BR2_PACKAGE_SDL_MIXER
+	help
+	  pygame module for loading and playing sounds.
+	  Will autoselect sdl_mixer.
+
+config BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC
+	bool "pygame.mixer.music"
+	depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER
+	help
+	  pygame module for controlling streamed audio
+
+config BR2_PACKAGE_PYTHON_PYGAME_SCRAP
+	bool "pygame.scrap"
+	depends on BR2_PACKAGE_SDL_X11
+	help
+	  pygame module for clipboard support (X11 needed)
+
+endif
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
new file mode 100644
index 0000000000..f5603b6684
--- /dev/null
+++ b/package/python-pygame/python-pygame.mk
@@ -0,0 +1,111 @@
+#############################################################
+#
+# Pygame
+#
+#############################################################
+# stable 1.9.1 release requires V4L which has been wiped out of recent Linux
+# kernels, so use latest mercurial revision until next stable release is out.
+PYTHON_PYGAME_VERSION = f0bb4a4b365d
+PYTHON_PYGAME_SOURCE  = pygame-$(PYTHON_PYGAME_VERSION).tar.gz
+PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame
+PYTHON_PYGAME_SITE_METHOD = hg
+
+ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
+PYTHON_PYGAME_OPT_DEPENDS += sdl_image
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y)
+PYTHON_PYGAME_OPT_DEPENDS += sdl_ttf
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
+PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer
+endif
+
+PYTHON_PYGAME_DEPENDENCIES = python sdl $(PYTHON_PYGAME_OPT_DEPENDS)
+
+ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
+define PYTHON_PYGAME_UNCONFIGURE_IMAGE
+	$(SED) 's/^imageext/#imageext/' $(@D)/Setup
+endef
+endif
+
+ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y)
+define PYTHON_PYGAME_UNCONFIGURE_FONT
+	$(SED) 's/^font/#font/' $(@D)/Setup
+endef
+endif
+
+ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
+define PYTHON_PYGAME_UNCONFIGURE_MIXER
+	$(SED) 's/^mixer/#mixer/g' $(@D)/Setup
+endef
+endif
+
+# Both require numpy or numeric python module
+define PYTHON_PYGAME_UNCONFIGURE_SNDARRAY
+	$(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup
+endef
+
+define PYTHON_PYGAME_UNCONFIGURE_SURFARRAY
+	$(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup
+endef
+
+# Requires smpeg
+define PYTHON_PYGAME_UNCONFIGURE_MOVIE
+	$(SED) 's/^movie/#movie/' $(@D)/Setup
+endef
+
+ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_SCRAP),y)
+define PYTHON_PYGAME_UNCONFIGURE_SCRAP
+	$(SED) 's/^scrap/#scrap/' $(@D)/Setup
+endef
+endif
+
+PYTHON_PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
+PYTHON_PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
+
+# Pygame needs a Setup file where options should be commented out if
+# dependencies are not available
+define PYTHON_PYGAME_CONFIGURE_CMDS
+	cp -f $(@D)/Setup.in $(@D)/Setup
+	$(SED) 's~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~' $(@D)/Setup
+	$(SED) 's/^pypm/#pypm/' $(@D)/Setup
+	$(PYTHON_PYGAME_UNCONFIGURE_IMAGE)
+	$(PYTHON_PYGAME_UNCONFIGURE_FONT)
+	$(PYTHON_PYGAME_UNCONFIGURE_MIXER)
+	$(PYTHON_PYGAME_UNCONFIGURE_SNDARRAY)
+	$(PYTHON_PYGAME_UNCONFIGURE_SURFARRAY)
+	$(PYTHON_PYGAME_UNCONFIGURE_MOVIE)
+	$(PYTHON_PYGAME_UNCONFIGURE_SCRAP)
+endef
+
+define PYTHON_PYGAME_BUILD_CMDS
+	(cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		LDSHARED="$(TARGET_CROSS)gcc -shared" \
+		CROSS_COMPILING=yes \
+		_python_sysroot=$(STAGING_DIR) \
+		_python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
+		_python_prefix=/usr \
+		_python_exec_prefix=/usr \
+		$(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+define PYTHON_PYGAME_REMOVE_DOC
+	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
+endef
+endif
+
+define PYTHON_PYGAME_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install \
+		--prefix=$(TARGET_DIR)/usr)
+	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests
+	$(PYTHON_PYGAME_REMOVE_DOC)
+endef
+
+define PYTHON_PYGAME_UNINSTALL_TARGET_CMDS
+	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame*
+endef
+
+$(eval $(call GENTARGETS))

From 7360f16a22af3e0a1a2e5891a275a7c86e7e5cc3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Jan 2012 11:11:58 -0300
Subject: [PATCH 1171/6849] unionfs: new package

Add the unionfs FUSE unification filesystem.

[Peter: whitespace/help text fix]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                         |  1 +
 package/unionfs/Config.in                 | 11 +++++++++++
 package/unionfs/unionfs-make-mandir.patch | 15 +++++++++++++++
 package/unionfs/unionfs.mk                | 20 ++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 package/unionfs/Config.in
 create mode 100644 package/unionfs/unionfs-make-mandir.patch
 create mode 100644 package/unionfs/unionfs.mk

diff --git a/package/Config.in b/package/Config.in
index ac14d2c654..1042d95fb8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -212,6 +212,7 @@ source "package/sysstat/Config.in"
 source "package/ti-utils/Config.in"
 source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
+source "package/unionfs/Config.in"
 source "package/usb_modeswitch/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in
new file mode 100644
index 0000000000..a974c8ca24
--- /dev/null
+++ b/package/unionfs/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UNIONFS
+	bool "unionfs (FUSE)"
+	select BR2_PACKAGE_LIBFUSE
+	depends on BR2_LARGEFILE
+	help
+	  A userspace unionfs implementation.
+
+	  http://podgorny.cz/moin/UnionFsFuse
+
+comment "unionfs requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/unionfs/unionfs-make-mandir.patch b/package/unionfs/unionfs-make-mandir.patch
new file mode 100644
index 0000000000..bf3c241c64
--- /dev/null
+++ b/package/unionfs/unionfs-make-mandir.patch
@@ -0,0 +1,15 @@
+Make the man directory if it's missing before installing the man page.
+Already upstream see http://hg.podgorny.cz/unionfs-fuse/rev/6ca07ad1b855
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura unionfs-fuse-0.24.orig/Makefile unionfs-fuse-0.24/Makefile
+--- unionfs-fuse-0.24.orig/Makefile	2010-05-20 08:04:08.000000000 -0300
++++ unionfs-fuse-0.24/Makefile	2012-01-11 08:08:02.382667776 -0300
+@@ -9,5 +9,6 @@
+ 
+ install: build
+ 	install -d $(DESTDIR)$(PREFIX)$(BINDIR)
++	install -d $(DESTDIR)$(PREFIX)/share/man/man8
+ 	install -m 0755 src/unionfs $(DESTDIR)$(PREFIX)$(BINDIR)
+ 	install -m 0644 man/unionfs-fuse.8 $(DESTDIR)$(PREFIX)/share/man/man8/
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
new file mode 100644
index 0000000000..b0bc93b56d
--- /dev/null
+++ b/package/unionfs/unionfs.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# unionfs
+#
+#############################################################
+
+UNIONFS_VERSION = 0.24
+UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
+UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.bz2
+UNIONFS_DEPENDENCIES = libfuse
+
+define UNIONFS_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define UNIONFS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS))

From e6480f2bb91e2df46096ed5f6ef8d3138cd38470 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Jan 2012 11:11:59 -0300
Subject: [PATCH 1172/6849] sshfs: bump to version 2.3, adjust SITE and
 description

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sshfs/Config.in | 5 +----
 package/sshfs/sshfs.mk  | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 1d9f75978e..73d552fa0a 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -9,10 +9,7 @@ config BR2_PACKAGE_SSHFS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	help
-	  FUSE makes it possible to implement a filesystem in a userspace
-	  program. Features include: simple yet comprehensive API, secure
-	  mounting by non-root users, support for 2.4 and 2.6 Linux
-	  kernels, multi-threaded operation. etc...
+	  FUSE filesystem client based on the SSH File Transfer Protocol.
 
 	  http://fuse.sourceforge.net/sshfs.html
 
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 81eb4c6f6d..738b4d0675 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-SSHFS_VERSION = 2.2
-SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)/sshfs-fuse
+SSHFS_VERSION = 2.3
+SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)
 SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = \
 	libglib2 libfuse openssh \

From a0aa54eb0d741108743d230bce2f2deb054ba9c5 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 11 Jan 2012 18:09:22 +0100
Subject: [PATCH 1173/6849] Rework of shutdown policy in inittab

This commit follows commit ad501b66. Start up of the busybox logging
daemons were moved to an init script but the shutdown were still
performed in inittab. This commit moves the shutdown policy to an
rcK script that calls the stop function of all the init scripts in
a reversed order.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/init.d/rcK | 27 +++++++++++++++++++++++++++
 fs/skeleton/etc/inittab    |  3 +--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100755 fs/skeleton/etc/init.d/rcK

diff --git a/fs/skeleton/etc/init.d/rcK b/fs/skeleton/etc/init.d/rcK
new file mode 100755
index 0000000000..59e9c54ff9
--- /dev/null
+++ b/fs/skeleton/etc/init.d/rcK
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+
+# Stop all init scripts in /etc/init.d
+# executing them in reversed numerical order.
+#
+for i in $(ls -r /etc/init.d/S??*) ;do
+
+     # Ignore dangling symlinks (if any).
+     [ ! -f "$i" ] && continue
+
+     case "$i" in
+	*.sh)
+	    # Source shell script for speed.
+	    (
+		trap - INT QUIT TSTP
+		set stop
+		. $i
+	    )
+	    ;;
+	*)
+	    # No sh extension, so fork subprocess.
+	    $i stop
+	    ;;
+    esac
+done
+
diff --git a/fs/skeleton/etc/inittab b/fs/skeleton/etc/inittab
index ac410d6e4e..85881f4607 100644
--- a/fs/skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
@@ -30,8 +30,7 @@ null::sysinit:/bin/hostname -F /etc/hostname
 ::ctrlaltdel:/sbin/reboot
 
 # Stuff to do before rebooting
-null::shutdown:/usr/bin/killall klogd
-null::shutdown:/usr/bin/killall syslogd
+null::shutdown:/etc/init.d/rcK
 null::shutdown:/bin/umount -a -r
 null::shutdown:/sbin/swapoff -a
 

From 234dd8e6a2ce006283a5419f457973c3336558ca Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 11 Jan 2012 18:09:23 +0100
Subject: [PATCH 1174/6849] Update the CHANGES file to mention this new policy

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1dc1f365bd..8f6870baa3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@
 
 	Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions.
 
+	Buildroot now calls the stop function of scripts in /etc/init.d at
+	shutdown.
+
 	Updated/fixed packages: barebox, bash, beecrypt, binutils,
 	bison, busybox, cdrkit, coreutils, dbus-glib, diffutils,
 	dropbear, ebtables, ethtool, ffmpeg, flex, fluxbox, gawk,

From 0e6695fc365df202ec8e27c7deb322a34ae3abf9 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 11 Jan 2012 15:34:39 +0100
Subject: [PATCH 1175/6849] pkg-stats: fix table layout

The "Patch count" cell needs rowspan=2, otherwise the host/target cells are
misaligned.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 64aae5faed..822827455c 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -51,7 +51,7 @@ tr.correct td {
 <tr>
 <td rowspan=\"2\">Id</td>
 <td rowspan=\"2\">Package</td>
-<td>Patch count</td>
+<td rowspan=\"2\">Patch count</td>
 <td colspan=\"2\" class=\"centered\">AUTOTARGETS</td>
 <td colspan=\"2\" class=\"centered\">GENTARGETS</td>
 <td colspan=\"2\" class=\"centered\">CMAKETARGETS</td>

From af42c27da6485464087cee123a4b0208d0721cfa Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Wed, 11 Jan 2012 22:12:01 -0500
Subject: [PATCH 1176/6849] tiff: add utility commands and library options

Added support for compiling tiffcp and tiff2pdf.

Added options for compiling out various libtiff features. By default,
all libtiff features are built so that the result is the same as before
this change.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tiff/Config.in | 71 ++++++++++++++++++++++++++++++++++++++++--
 package/tiff/tiff.mk   | 66 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/package/tiff/Config.in b/package/tiff/Config.in
index c6336e23d6..7850965b31 100644
--- a/package/tiff/Config.in
+++ b/package/tiff/Config.in
@@ -1,8 +1,75 @@
 config BR2_PACKAGE_TIFF
 	bool "tiff"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_JPEG
 	help
 	  Library for handling TIFF (Tag Image File Format) images.
 
 	  http://www.libtiff.org/
+
+if BR2_PACKAGE_TIFF
+menu "tiff Options"
+
+config BR2_PACKAGE_TIFF_CCITT
+	bool "CCITT Group 3 & 4 support"
+	default y
+
+config BR2_PACKAGE_TIFF_PACKBITS
+	bool "Macintosh PackBits algorithm"
+	default y
+
+config BR2_PACKAGE_TIFF_LZW
+	bool "LZW algorithm"
+	default y
+
+config BR2_PACKAGE_TIFF_THUNDER
+	bool "ThunderScan 4-bit RLE algorithm"
+	default y
+
+config BR2_PACKAGE_TIFF_NEXT
+	bool "NeXT 2-bit RLE algorithm"
+	default y
+
+config BR2_PACKAGE_TIFF_LOGLUV
+	bool "LogLuv high dynamic range encoding"
+	default y
+
+config BR2_PACKAGE_TIFF_MDI
+	bool "Microsoft Document Imaging"
+	default y
+
+config BR2_PACKAGE_TIFF_ZLIB
+	bool "Zlib usage (required for Deflate compression)"
+	select BR2_PACKAGE_ZLIB
+	default y
+
+config BR2_PACKAGE_TIFF_PIXARLOG
+	bool "Pixar log-format algorithm (requires Zlib)"
+	select BR2_PACKAGE_TIFF_ZLIB
+	default y
+
+config BR2_PACKAGE_TIFF_JPEG
+	bool "JPEG compression"
+	select BR2_PACKAGE_JPEG
+	default y
+
+config BR2_PACKAGE_TIFF_OLD_JPEG
+	bool "Old JPEG decompression"
+	default y
+
+config BR2_PACKAGE_TIFF_JBIG
+	bool "JBIG compression"
+	default y
+endmenu
+
+endif
+
+config BR2_PACKAGE_TIFF_TIFF2PDF
+	bool "tiff2pdf"
+	depends on BR2_PACKAGE_TIFF
+	help
+	  tiff2pdf utility
+
+config BR2_PACKAGE_TIFF_TIFFCP
+	bool "tiffcp"
+	depends on BR2_PACKAGE_TIFF
+	help
+	  tiffcp utility
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 1d57db7602..ed05bf1965 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -12,10 +12,74 @@ TIFF_CONF_OPT = \
 	--disable-cxx \
 	--without-x \
 
-TIFF_DEPENDENCIES = host-pkg-config zlib jpeg
+TIFF_DEPENDENCIES = host-pkg-config
+
+TIFF_TOOLS_LIST =
+ifeq ($(BR2_PACKAGE_TIFF_TIFF2PDF),y)
+	TIFF_TOOLS_LIST += tiff2pdf
+endif
+ifeq ($(BR2_PACKAGE_TIFF_TIFFCP),y)
+	TIFF_TOOLS_LIST += tiffcp
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_CCITT),y)
+	TIFF_CONF_OPT += --disable-ccitt
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y)
+	TIFF_CONF_OPT += --disable-packbits
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_LZW),y)
+	TIFF_CONF_OPT += --disable-lzw
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_THUNDER),y)
+	TIFF_CONF_OPT += --disable-thunder
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_NEXT),y)
+	TIFF_CONF_OPT += --disable-next
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_LOGLUV),y)
+	TIFF_CONF_OPT += --disable-logluv
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_MDI),y)
+	TIFF_CONF_OPT += --disable-mdi
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_ZLIB),y)
+	TIFF_CONF_OPT += --disable-zlib
+else
+	TIFF_DEPENDENCIES += zlib
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_PIXARLOG),y)
+	TIFF_CONF_OPT += --disable-pixarlog
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_JPEG),y)
+	TIFF_CONF_OPT += --disable-jpeg
+else
+	TIFF_DEPENDENCIES += jpeg
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y)
+	TIFF_CONF_OPT += --disable-old-jpeg
+endif
+
+ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
+	TIFF_CONF_OPT += --disable-jbig
+endif
 
 define TIFF_INSTALL_TARGET_CMDS
 	-cp -a $(@D)/libtiff/.libs/libtiff.so* $(TARGET_DIR)/usr/lib/
+	for i in $(TIFF_TOOLS_LIST); \
+	do \
+		$(INSTALL) -m 755 -D $(@D)/tools/$$i $(TARGET_DIR)/usr/bin/$$i; \
+	done
 endef
 
 $(eval $(call AUTOTARGETS))

From d242cb20945bf00d3e0603ee446044a2067f3d18 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 12 Jan 2012 10:02:01 +0100
Subject: [PATCH 1177/6849] libnl: bump to 3.2.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 612908bc1d..fc37c7d1c5 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.3
+LIBNL_VERSION = 3.2.4
 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
 LIBNL_INSTALL_STAGING = YES

From 74b46041e4622a00e9d7392986c974eb6c455d61 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 12 Jan 2012 10:02:02 +0100
Subject: [PATCH 1178/6849] bluez_utils: bump to 4.97

patch removes dependency for check package

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...move-libcheck-under-TEST-conditional.patch | 85 +++++++++++++++++++
 package/bluez_utils/bluez_utils.mk            |  3 +-
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100755 package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch

diff --git a/package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch b/package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch
new file mode 100755
index 0000000000..b2f5303fbf
--- /dev/null
+++ b/package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch
@@ -0,0 +1,85 @@
+From bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Tue, 27 Dec 2011 20:09:56 -0800
+Subject: [PATCH] build: Move libcheck under TEST conditional
+
+---
+ Makefile.am  |    5 ++++-
+ acinclude.m4 |    8 +++++++-
+ configure.ac |    3 +--
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9112483..5cf287c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -449,6 +449,7 @@ endif
+ 
+ unit_objects =
+ 
++if TEST
+ unit_tests = unit/test-eir
+ 
+ noinst_PROGRAMS += $(unit_tests)
+@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
+ unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
+ unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
+ unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
+-unit_test_eir_SHORTNAME = unit
+ unit_objects += $(unit_test_eir_OBJECTS)
++else
++unit_tests =
++endif
+ 
+ TESTS = $(unit_tests)
+ 
+diff --git a/acinclude.m4 b/acinclude.m4
+index 2097d77..753b994 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
+ 		[])
+ ])
+ 
++AC_DEFUN([AC_PATH_CHECK], [
++	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
++	AC_SUBST(CHECK_CFLAGS)
++	AC_SUBST(CHECK_LIBS)
++])
++
+ AC_DEFUN([AC_PATH_OUI], [
+ 	AC_ARG_WITH(ouifile,
+ 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
+@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
+ 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
+ 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
+-	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
++	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
+ 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
+ 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
+ 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
+diff --git a/configure.ac b/configure.ac
+index 3a5dfde..a7670da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,8 +24,6 @@ AC_PROG_YACC
+ AM_PROG_LEX
+ AM_PROG_MKDIR_P
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+-
+ m4_define([_LT_AC_TAGCONFIG], [])
+ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
+ 
+@@ -50,6 +48,7 @@ AC_PATH_UDEV
+ AC_PATH_SNDFILE
+ AC_PATH_OUI
+ AC_PATH_READLINE
++AC_PATH_CHECK
+ 
+ AC_ARG_BLUEZ
+ 
+-- 
+1.7.6.5
+
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 860ecbd093..fe0f43f31f 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -3,12 +3,13 @@
 # bluez_utils
 #
 #############################################################
-BLUEZ_UTILS_VERSION = 4.96
+BLUEZ_UTILS_VERSION = 4.97
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
 BLUEZ_UTILS_SITE = http://www.kernel.org/pub/linux/bluetooth/
 BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
+BLUEZ_UTILS_AUTORECONF = YES
 
 # BlueZ 3.x compatibility
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)

From b0bcafc6a0e03e5ee7506a051ebbb0b93c94941b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 12 Jan 2012 22:08:56 +0100
Subject: [PATCH 1179/6849] Remove java support

Has been marked as broken since July 2010 (39e6ba1b), and nobody has
stepped up to support it, so now finally remove it completely.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html                        |    2 +-
 package/Config.in                          |    8 -
 package/java/Config.in                     |    5 -
 package/java/classpath/Config.in           |    9 -
 package/java/classpath/classpath.mk        |   86 --
 package/java/concierge/Config.in           |   10 -
 package/java/concierge/concierge.mk        |   40 -
 package/java/concierge/files/concierge     |    2 -
 package/java/concierge/files/init.xargs    |   10 -
 package/java/jamvm/Config.in               |    8 -
 package/java/jamvm/jamvm-1.5.0.patch.avr32 | 1473 --------------------
 package/java/jamvm/jamvm.mk                |   93 --
 package/java/java.mk                       |    1 -
 toolchain/gcc/Config.in                    |   12 -
 toolchain/gcc/gcc-uclibc-4.x.mk            |   19 -
 15 files changed, 1 insertion(+), 1777 deletions(-)
 delete mode 100644 package/java/Config.in
 delete mode 100644 package/java/classpath/Config.in
 delete mode 100644 package/java/classpath/classpath.mk
 delete mode 100644 package/java/concierge/Config.in
 delete mode 100644 package/java/concierge/concierge.mk
 delete mode 100644 package/java/concierge/files/concierge
 delete mode 100644 package/java/concierge/files/init.xargs
 delete mode 100644 package/java/jamvm/Config.in
 delete mode 100644 package/java/jamvm/jamvm-1.5.0.patch.avr32
 delete mode 100644 package/java/jamvm/jamvm.mk
 delete mode 100644 package/java/java.mk

diff --git a/docs/buildroot.html b/docs/buildroot.html
index e13e8f7528..0c1cddfff2 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -816,7 +816,7 @@ <h3 id="package-directory">Package directory</h3>
     directory for your software, for example <code>libfoo</code>.</p>
 
     <p>Some packages have been grouped by topic in a sub-directory:
-    <code>multimedia</code>, <code>java</code>, <code>x11r7</code>, and
+    <code>multimedia</code>, <code>x11r7</code>, and
     <code>games</code>. If your package fits in one of these
     categories, then create your package directory in these.</p>
 
diff --git a/package/Config.in b/package/Config.in
index 1042d95fb8..8518f0641f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -222,7 +222,6 @@ endmenu
 
 menu "Interpreter languages and scripting"
 source "package/haserl/Config.in"
-source "package/java/jamvm/Config.in"
 source "package/lua/Config.in"
 if BR2_PACKAGE_LUA
 menu "LUA libraries/modules"
@@ -327,13 +326,6 @@ source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 endmenu
 
-if BROKEN
-menu "Java"
-source "package/java/classpath/Config.in"
-source "package/java/concierge/Config.in"
-endmenu
-endif
-
 menu "Javascript"
 source "package/explorercanvas/Config.in"
 source "package/flot/Config.in"
diff --git a/package/java/Config.in b/package/java/Config.in
deleted file mode 100644
index 3f17f91adf..0000000000
--- a/package/java/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-menu "Java"
-source "package/java/classpath/Config.in"
-source "package/java/jamvm/Config.in"
-source "package/java/concierge/Config.in"
-endmenu
diff --git a/package/java/classpath/Config.in b/package/java/classpath/Config.in
deleted file mode 100644
index 5677f8c327..0000000000
--- a/package/java/classpath/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_CLASSPATH
-	bool "classpath"
-	help
-	  GNU Classpath, Essential Libraries for Java, is a GNU
-	  project to create free core class libraries for use with
-	  virtual machines and compilers for the java programming
-	  language.
-
-	  http://www.classpath.org/
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
deleted file mode 100644
index 872c06acb2..0000000000
--- a/package/java/classpath/classpath.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#############################################################
-#
-# classpath 0.96.1
-#
-#############################################################
-CLASSPATH_VERSION = 0.98
-CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz
-CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
-CLASSPATH_AUTORECONF = NO
-CLASSPATH_INSTALL_STAGING = YES
-CLASSPATH_INSTALL_TARGET = YES
-CLASSPATH_DIR_PREFIX = package/java
-
-CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
-		glib_cv_uscore=no ac_cv_func_strtod=yes \
-		ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
-		ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
-		ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
-		ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
-		ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
-		ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
-		ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
-		ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
-		jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
-		ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
-		ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
-		ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
-		ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no \
-		jm_cv_func_gettimeofday_clobber=no \
-		gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
-		utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
-		gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
-		gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
-		am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
-		gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
-		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
-		ac_use_included_regex=no gl_cv_c_restrict=no \
-		ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \
-		ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
-
-
-CLASSPATH_CONF_OPT = \
-		--libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-glibtest --enable-explicit-deps=no \
-		--disable-debug \
-		--disable-gconf-peer --disable-examples --disable-plugin \
-		--disable-Werror
-
-CLASSPATH_DEPENDENCIES = host-pkg-config libpng jpeg
-
-ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-	CLASSPATH_DEPENDENCIES+= alsa-lib
-	CLASSPATH_CONF_OPT+= --enable-alsa
-else
-	CLASSPATH_CONF_OPT+= --disable-alsa
-endif
-
-ifeq ($(BR2_PACKAGE_QT),y)
-	CLASSPATH_DEPENDENCIES+= qt
-	CLASSPATH_CONF_OPT+= --enable-qt-peer
-else
-	CLASSPATH_CONF_OPT+= --disable-qt-peer
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-	CLASSPATH_DEPENDENCIES+= libgtk2
-	CLASSPATH_CONF_OPT+= --enable-gtk-peer
-else
-	CLASSPATH_CONF_OPT+= --disable-gtk-peer
-endif
-
-ifeq ($(BR2_PACKAGE_XORG7),y)
-	CLASSPATH_DEPENDENCIES+= xserver_xorg-server
-	CLASSPATH_CONF_OPT+= --with-x \
-		--x-includes=$(STAGING_DIR)/usr/include/X11 \
-		--x-libraries=$(STAGING_DIR)/usr/lib
-else
-	CLASSPATH_CONF_OPT+= --without-x
-endif
-
-
-
-$(eval $(call AUTOTARGETS))
diff --git a/package/java/concierge/Config.in b/package/java/concierge/Config.in
deleted file mode 100644
index b099b3a59e..0000000000
--- a/package/java/concierge/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_CONCIERGE
-	bool "concierge"
-        depends on BR2_PACKAGE_JAMVM
-
-	help
-	  Concierge is an optimized OSGi R3 framework implementations
-	  with a file footprint of about 80 kBytes. This makes it
-	  ideal for mobile or embedded devices.
-
-	  http://concierge.sourceforge.net/
diff --git a/package/java/concierge/concierge.mk b/package/java/concierge/concierge.mk
deleted file mode 100644
index 8a40eb8451..0000000000
--- a/package/java/concierge/concierge.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#############################################################
-#
-# concierge 1.0-RC2
-#
-#############################################################
-CONCIERGE_VERSION = 1.0_RC2
-CONCIERGE_SOURCE = concierge-$(CONCIERGE_VERSION).jar
-CONCIERGE_SITE = http://ovh.dl.sourceforge.net/sourceforge/concierge/
-CONCIERGE_DIR=$(BUILD_DIR)/concierge-$(CONCIERGE_VERSION)
-CONCIERGE_SITE_BUNDLES = http://concierge.sourceforge.net/bundles/
-
-$(DL_DIR)/concierge:
-	 mkdir -p $(DL_DIR)/concierge/
-	 $(call DOWNLOAD,$(CONCIERGE_SITE),concierge-$(CONCIERGE_VERSION).jar)
-	 $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar)
-	 $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar)
-	 $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar)
-
-$(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge
-	mkdir -p $(TARGET_DIR)/usr/lib
-	mkdir -p $(TARGET_DIR)/usr/lib/concierge
-	cp -dpf $(DL_DIR)/concierge/* $(TARGET_DIR)/usr/lib/concierge/
-	cp -dpf package/java/concierge/files/init.xargs $(TARGET_DIR)/usr/lib/concierge/
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/concierge:
-	cp -dpf package/java/concierge/files/concierge $(TARGET_DIR)/usr/bin/
-	chmod +x $(TARGET_DIR)/usr/bin/concierge
-	touch -c $@
-
-concierge: $(TARGET_DIR)/usr/lib/concierge $(TARGET_DIR)/usr/bin/concierge
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CONCIERGE),y)
-TARGETS+=concierge
-endif
diff --git a/package/java/concierge/files/concierge b/package/java/concierge/files/concierge
deleted file mode 100644
index c463753f25..0000000000
--- a/package/java/concierge/files/concierge
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/jamvm -jar /usr/lib/concierge/concierge-1.0_RC2.jar
diff --git a/package/java/concierge/files/init.xargs b/package/java/concierge/files/init.xargs
deleted file mode 100644
index 7848721ce6..0000000000
--- a/package/java/concierge/files/init.xargs
+++ /dev/null
@@ -1,10 +0,0 @@
--init
--all
--Dch.ethz.iks.concierge.debug=true
--Dch.ethz.iks.concierge.log.enabled=true
--Dch.ethz.iks.concierge.log.level=4
-
-
-#-istart shell-1.0.0.RC2.jar
-#-istart service-tracker-1.0.0.RC2.jar
-#-istart event-admin-1.0.0.RC2.jar
diff --git a/package/java/jamvm/Config.in b/package/java/jamvm/Config.in
deleted file mode 100644
index 59ac593aae..0000000000
--- a/package/java/jamvm/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_JAMVM
-	bool "jamvm"
-        depends on BR2_PACKAGE_CLASSPATH
-	help
-	  JamVM is a new Java Virtual Machine which conforms to
-	  the JVM specification version 2 (blue book).
-
-	  http://jamvm.sourceforge.net/
diff --git a/package/java/jamvm/jamvm-1.5.0.patch.avr32 b/package/java/jamvm/jamvm-1.5.0.patch.avr32
deleted file mode 100644
index 27c905ecdb..0000000000
--- a/package/java/jamvm/jamvm-1.5.0.patch.avr32
+++ /dev/null
@@ -1,1473 +0,0 @@
-diff -urpN jamvm-1.5.0/configure jamvm-1.5.0-avr32/configure
---- jamvm-1.5.0/configure	2007-10-29 06:37:06.000000000 +0100
-+++ jamvm-1.5.0-avr32/configure	2008-02-08 09:20:37.000000000 +0100
-@@ -2550,6 +2550,7 @@ i386-*-openbsd*) host_os=bsd libdl_neede
- i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
- x86_64-*-linux*) host_os=linux ;;
- hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
-+avr32*-*-linux*) host_cpu=avr32 host_os=linux ;;
- mipsel-*-linux*) host_cpu=mips host_os=linux ;;
- amd64-*-openbsd*) host_os=bsd libdl_needed=no ;;
- amd64-*-freebsd*) host_os=bsd libdl_needed=no ;;
-@@ -22839,7 +22840,7 @@ fi
- ac_config_links="$ac_config_links src/arch.h:src/arch/$arch.h"
- 
- 
--ac_config_files="$ac_config_files Makefile src/Makefile src/interp/Makefile src/interp/engine/Makefile src/arch/Makefile src/os/Makefile src/os/linux/Makefile src/os/darwin/Makefile src/os/bsd/Makefile src/os/linux/powerpc/Makefile src/os/linux/arm/Makefile src/os/linux/i386/Makefile src/os/linux/x86_64/Makefile src/os/linux/parisc/Makefile src/os/linux/mips/Makefile src/os/darwin/i386/Makefile src/os/darwin/powerpc/Makefile src/os/bsd/powerpc/Makefile src/os/bsd/arm/Makefile src/os/bsd/i386/Makefile src/os/bsd/x86_64/Makefile lib/Makefile lib/java/Makefile lib/java/lang/Makefile lib/jamvm/Makefile lib/jamvm/java/Makefile lib/jamvm/java/lang/Makefile lib/java/lang/reflect/Makefile lib/java/security/Makefile lib/gnu/Makefile lib/sun/reflect/annotation/Makefile lib/sun/reflect//Makefile lib/sun/Makefile lib/gnu/classpath/Makefile"
-+ac_config_files="$ac_config_files Makefile src/Makefile src/interp/Makefile src/interp/engine/Makefile src/arch/Makefile src/os/Makefile src/os/linux/Makefile src/os/darwin/Makefile src/os/bsd/Makefile src/os/linux/powerpc/Makefile src/os/linux/arm/Makefile src/os/linux/i386/Makefile src/os/linux/x86_64/Makefile src/os/linux/avr32/Makefile src/os/linux/parisc/Makefile src/os/linux/mips/Makefile src/os/darwin/i386/Makefile src/os/darwin/powerpc/Makefile src/os/bsd/powerpc/Makefile src/os/bsd/arm/Makefile src/os/bsd/i386/Makefile src/os/bsd/x86_64/Makefile lib/Makefile lib/java/Makefile lib/java/lang/Makefile lib/jamvm/Makefile lib/jamvm/java/Makefile lib/jamvm/java/lang/Makefile lib/java/lang/reflect/Makefile lib/java/security/Makefile lib/gnu/Makefile lib/sun/reflect/annotation/Makefile lib/sun/reflect//Makefile lib/sun/Makefile lib/gnu/classpath/Makefile"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -23475,6 +23476,7 @@ do
-     "src/os/linux/i386/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/linux/i386/Makefile" ;;
-     "src/os/linux/x86_64/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/linux/x86_64/Makefile" ;;
-     "src/os/linux/parisc/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/linux/parisc/Makefile" ;;
-+    "src/os/linux/avr32/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/linux/avr32/Makefile" ;;
-     "src/os/linux/mips/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/linux/mips/Makefile" ;;
-     "src/os/darwin/i386/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/darwin/i386/Makefile" ;;
-     "src/os/darwin/powerpc/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/darwin/powerpc/Makefile" ;;
-diff -urpN jamvm-1.5.0/src/alloc.c jamvm-1.5.0-avr32/src/alloc.c
---- jamvm-1.5.0/src/alloc.c	2007-10-22 01:24:22.000000000 +0200
-+++ jamvm-1.5.0-avr32/src/alloc.c	2008-02-08 09:20:38.000000000 +0100
-@@ -274,6 +274,11 @@ void initialiseAlloc(InitArgs *args) {
- #else
-     char *mem = (char*)mmap(0, args->max_heap, PROT_READ|PROT_WRITE,
-                                                MAP_PRIVATE|MAP_ANON, -1, 0);
-+//    char *mem = (char*)mmap(0, 8196, PROT_READ|PROT_WRITE,
-+//                                               MAP_PRIVATE|MAP_ANON, -1, 0);
-+//TODO: lto
-+//jam_printf("trying to mmap max:%lo min:%lo heap\n",args->max_heap , args->max_heap);
-+//jam_printf("mem: %d %d\n",mem,MAP_FAILED);
-     if(mem == MAP_FAILED) {
- #endif
-         perror("Aborting the VM -- couldn't allocate the heap");
-@@ -2214,7 +2219,7 @@ void *sysMalloc(int size) {
-     int n = size < sizeof(void*) ? sizeof(void*) : size;
-     void *mem = malloc(n);
- 
--    if(mem == NULL) {
-+    if(mem == NULL && n != 0) {
-         jam_fprintf(stderr, "Malloc failed - aborting VM...\n");
-         exitVM(1);
-     }
-diff -urpN jamvm-1.5.0/src/arch/avr32.h jamvm-1.5.0-avr32/src/arch/avr32.h
---- jamvm-1.5.0/src/arch/avr32.h	1970-01-01 01:00:00.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/arch/avr32.h	2008-02-08 09:20:41.000000000 +0100
-@@ -0,0 +1,109 @@
-+/*
-+ * Copyright (C) 2003, 2004, 2005, 2006, 2007
-+ * Robert Lougher <rob@lougher.org.uk>.
-+ *
-+ * This file is part of JamVM.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#define OS_ARCH "avr32"
-+//#ifndef DEBUG
-+//#define DEBUG
-+//#endif
-+
-+/* Override default min and max heap sizes.  AVR32 machines are
-+   usually embedded, and the standard defaults are too large. */
-+#define DEFAULT_MAX_HEAP 8*MB
-+#define DEFAULT_MIN_HEAP 1*MB
-+
-+#define HANDLER_TABLE_T static const void
-+#define DOUBLE_1_BITS 0x3ff0000000000000LL
-+
-+#define READ_DBL(v,p,l)	v = ((u8)p[0]<<56)|((u8)p[1]<<48)|((u8)p[2]<<40) \
-+                            |((u8)p[3]<<32)|((u8)p[4]<<24)|((u8)p[5]<<16) \
-+                            |((u8)p[6]<<8)|(u8)p[7]; p+=8
-+
-+//extern void setDoublePrecision();
-+#define FPU_HACK
-+
-+//#define COMPARE_AND_SWAP(addr, old_val, new_val)    ({char result;result;})
-+//static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned int old,
-+//					  unsigned int new)
-+//{
-+//	int ret;
-+//	//printf("compare and swap %d %d %s:line%d\n",old,new,__FILE__,__LINE__);
-+//	asm volatile(
-+//		"1:	ssrf	5\n"
-+//		"	ld.w	%[ret], %[m]\n"
-+//		"	cp.w		%[ret], %[old]\n"
-+//		"	brne	2f\n"
-+//		"	stcond	%[m], %[new]\n"
-+//		"	brne	1b\n"
-+//		"2:\n"
-+//		: [ret] "=&r"(ret), [m] "=m"(*m)
-+//		: "m"(*m), [new] "r"(new), [old] "r"(old)
-+//		: "memory", "cc");
-+//	return ret;
-+//}
-+
-+//see C:\Cygwin\usr\local\avr32-linux\include\bits\atomicity.h
-+//see http://www.avr32linux.org/twiki/bin/view/Main/AtomicOperations
-+//see http://www.mail-archive.com/uclibc@uclibc.org/msg00914.html
-+//http://www.avr32linux.org/twiki/pub/Main/MicroClibcPatches/uClibc-0.9.28-avr32-20060621.patch
-+//http://www.google.com/codesearch?hl=en&q=+cmpxchg+avr32+show:WwwDfOAAdbA:L2BlPHy6h_g:nY7RakaTOnE&sa=N&cd=1&ct=rc&cs_p=http://gobo.calica.com/packages/official/Linux--2.6.20.4-r1--i686.tar.bz2&cs_f=Linux/2.6.20.4/Resources/Unmanaged/Files/Compile/Sources/linux-2.6.20.4/include/asm-avr32/system.h#first
-+//#define  COMPARE_AND_SWAP(p, oldval, newval)({	\
-+//	printf("compare and swap %d %d %s:line%d\n",oldval,newval,__FILE__,__LINE__);	\ 
-+//	__cmpxchg_u32(p,oldval,newval);\
-+//})
-+
-+//	printf("compare and swap %d %d %s:line %d\n",old_val,new_val,__FILE__,__LINE__); 
-+#define COMPARE_AND_SWAP(addr, old_val, new_val)	    			\
-+({                                                  	\
-+	int result;											\
-+	__asm__ __volatile__ ("								\
-+		1:	ssrf	5;									\
-+			ld.w	%[ret], %[m];						\
-+			cp.w	%[ret], %[old];						\
-+			brne	2f;									\
-+			stcond	%[m], %[new];						\
-+			brne	1b;									\
-+		2:"												\
-+		: [ret] "=&r" (result), [m] "=m" (*addr)		\
-+		: "m" (*addr), [old] "r" (old_val), [new] "r" (new_val)	\
-+		: "memory", "cc");								\
-+	result;												\
-+})
-+
-+//ssrf 5	:set lock bit
-+//stcond	:store param2 when lock is set
-+//sreq		:If equal set register to true or false
-+//brne		:Branch when not equal
-+//brne 1b	:When the lock wasn't set anymore, try again
-+//label 1b 2f	:first label named 1/2 before/after
-+#define FLUSH_CACHE(addr, length)
-+
-+#define LOCKWORD_READ(addr) *addr
-+#define LOCKWORD_WRITE(addr, value) *addr = value
-+#define LOCKWORD_COMPARE_AND_SWAP(addr, old_val, new_val) \
-+        COMPARE_AND_SWAP(addr, old_val, new_val)
-+
-+#define UNLOCK_MBARRIER() __asm__ __volatile__ ("" ::: "memory")
-+#define JMM_LOCK_MBARRIER() __asm__ __volatile__ ("" ::: "memory")
-+#define JMM_UNLOCK_MBARRIER() __asm__ __volatile__ ("" ::: "memory")
-+
-+//TODO: lto
-+#define MBARRIER() __asm__ __volatile__ ("" ::: "memory")
-+//#define MBARRIER() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" ::: "memory")
-diff -urpN jamvm-1.5.0/src/arch/Makefile.am jamvm-1.5.0-avr32/src/arch/Makefile.am
---- jamvm-1.5.0/src/arch/Makefile.am	2007-10-28 00:19:26.000000000 +0200
-+++ jamvm-1.5.0-avr32/src/arch/Makefile.am	2008-02-08 09:20:41.000000000 +0100
-@@ -19,4 +19,4 @@
- ## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ##
- 
--EXTRA_DIST = powerpc.h arm.h i386.h x86_64.h parisc.h mips.h
-+EXTRA_DIST = powerpc.h arm.h i386.h x86_64.h parisc.h mips.h avr32.h
-diff -urpN jamvm-1.5.0/src/arch/Makefile.in jamvm-1.5.0-avr32/src/arch/Makefile.in
---- jamvm-1.5.0/src/arch/Makefile.in	2007-10-29 07:02:36.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/arch/Makefile.in	2008-02-08 09:20:41.000000000 +0100
-@@ -162,7 +162,7 @@ top_srcdir = @top_srcdir@
- use_zip_no = @use_zip_no@
- use_zip_yes = @use_zip_yes@
- with_classpath_install_dir = @with_classpath_install_dir@
--EXTRA_DIST = powerpc.h arm.h i386.h x86_64.h parisc.h mips.h
-+EXTRA_DIST = powerpc.h arm.h i386.h x86_64.h parisc.h mips.h avr32.h
- all: all-am
- 
- .SUFFIXES:
-diff -urpN jamvm-1.5.0/src/class.c jamvm-1.5.0-avr32/src/class.c
---- jamvm-1.5.0/src/class.c	2007-10-29 05:45:32.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/class.c	2008-02-08 09:20:37.000000000 +0100
-@@ -40,6 +40,8 @@
- #define SCAVENGE(ptr) FALSE
- #define FOUND(ptr) ptr
- 
-+#define TRACE(fmt, ...) jam_printf(fmt, ## __VA_ARGS__)
-+
- static int verbose;
- static char *bootpath;
- static char *classpath;
-@@ -1273,6 +1275,9 @@ Class *findSystemClass0(char *classname)
- }
- 
- Class *findSystemClass(char *classname) {
-+#ifdef DEBUG
-+  	TRACE(">>>>>>finding class: %s\n", classname);
-+#endif
-    Class *class = findSystemClass0(classname);
- 
-    if(!exceptionOccurred())
-@@ -1383,18 +1388,32 @@ Class *findClassFromClassLoader(char *cl
- }
- 
- Object *getSystemClassLoader() {
-+#ifdef DEBUG
-+	printf("%s: %d: trying to find ClassLoader\n",__FILE__,__LINE__);
-+#endif
-     Class *class_loader = findSystemClass("java/lang/ClassLoader");
- 
-     if(!exceptionOccurred()) {
-+#ifdef DEBUG
-+    	printf("%s: %d: found ClassLoader\n",__FILE__,__LINE__);
-+#endif    	
-         MethodBlock *mb;
- 
-         if((mb = findMethod(class_loader, "getSystemClassLoader",
-                                           "()Ljava/lang/ClassLoader;")) != NULL) {
-+#ifdef DEBUG
-+            printf("%s: %d: executing static SystemClassLoader",__FILE__,__LINE__);
-+#endif
-+                                          	
-             Object *system_loader = *(Object**)executeStaticMethod(class_loader, mb);
- 
-             if(!exceptionOccurred()) 
-                 return system_loader;
-         }
-+#ifdef DEBUG
-+    }else{
-+    	printf("%s: %d: found ClassLoader WITH EXCEPTION\n",__FILE__,__LINE__);
-+#endif
-     }
-     return NULL;
- }
-diff -urpN jamvm-1.5.0/src/interp/direct.c jamvm-1.5.0-avr32/src/interp/direct.c
---- jamvm-1.5.0/src/interp/direct.c	2007-10-26 05:10:47.000000000 +0200
-+++ jamvm-1.5.0-avr32/src/interp/direct.c	2008-02-08 09:20:40.000000000 +0100
-@@ -31,7 +31,7 @@
- #include "interp.h"
- 
- #ifdef TRACEDIRECT
--#define TRACE(fmt, ...) jam_printf(fmt, ## __VA_ARGS__)
-+#define TRACE(fmt, ...) printf(fmt, ## __VA_ARGS__)
- #else
- #define TRACE(fmt, ...)
- #endif
-Binary files jamvm-1.5.0/src/interp/engine/compute_relocatability and jamvm-1.5.0-avr32/src/interp/engine/compute_relocatability differ
-diff -urpN jamvm-1.5.0/src/os/linux/avr32/dll_md.c jamvm-1.5.0-avr32/src/os/linux/avr32/dll_md.c
---- jamvm-1.5.0/src/os/linux/avr32/dll_md.c	1970-01-01 01:00:00.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/os/linux/avr32/dll_md.c	2008-02-08 09:20:38.000000000 +0100
-@@ -0,0 +1,669 @@
-+/*
-+ * Copyright (C) 2003, 2004, 2005, 2006, 2007
-+ * Robert Lougher <rob@lougher.org.uk>.
-+ *
-+ * This file is part of JamVM.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include "../../../jam.h"
-+
-+#ifndef USE_FFI
-+#include <string.h>
-+#include "../../../sig.h"
-+
-+#define RET_VOID    0
-+#define RET_DOUBLE  1
-+#define RET_LONG    2
-+#define RET_FLOAT   3
-+#define RET_DFLT    4
-+
-+int nativeExtraArg(MethodBlock *mb) {
-+	//printf("!!!!!!!!!!nativeExtraArg (name=%s) (type=%s)!!!!!!!\n",mb->name,mb->type);
-+    int len = strlen(mb->type);
-+    if(mb->type[len-2] == ')')
-+        switch(mb->type[len-1]) {
-+            case 'V':
-+                return RET_VOID;
-+            case 'D':
-+                return RET_DOUBLE;
-+            case 'J':
-+                return RET_LONG;
-+            case 'F':
-+                return RET_FLOAT;
-+        }
-+
-+    return RET_DFLT;
-+}
-+
-+//calls the f function pointer and takes care of the return type
-+#define perform_f(label,...)													\
-+		switch(ret_type) {														\
-+        	case RET_VOID:														\
-+            	(*(void (*)())f)(__VA_ARGS__);									\
-+				goto label;														\
-+        	case RET_DOUBLE:													\
-+	        	*(double*)ostack = (*(double (*)())f)(__VA_ARGS__);				\
-+            	ostack += 2;													\
-+				goto label;														\
-+        	case RET_LONG:														\
-+	        	*(long long*)ostack = (*(long long (*)())f)(__VA_ARGS__);		\
-+            	ostack += 2;													\
-+				goto label;														\
-+        	case RET_FLOAT:														\
-+	        	*(float*)ostack = (*(float (*)())f)(__VA_ARGS__);				\
-+            	ostack++;														\
-+				goto label;														\
-+        	default:															\
-+	            *ostack++ = (*(u4 (*)())f)(__VA_ARGS__);						\
-+				goto label;														\
-+	    }
-+
-+#define write_ops_to_stack(x)	    											\
-+	/*write x operands to the stack	*/											\
-+	int i;																		\
-+	for(i=0; i < x; i++){														\
-+		__asm__ __volatile__(													\
-+    	"ld.w r11,%0		\n\t"												\
-+    	"st.w --sp,r11		" 													\
-+    	:: "m"(*--opntr)														\
-+    	:"sp","r11");															\
-+	}										
-+	
-+u4 *callJNIMethod(void *env, Class *class, char *sig, int ret_type, u4 *ostack, unsigned char *f, int args) {
-+	u4 *opntr = ostack + args;
-+	int nrofopsonstack = 0;
-+	if(class && args > 3){
-+		nrofopsonstack = args - 3;
-+	}else if(class){
-+		nrofopsonstack = 0;
-+	}else if(args > 4){
-+		nrofopsonstack = args -4;
-+	}else{
-+		nrofopsonstack = 0;
-+	}
-+	
-+	if(args == 0){
-+		if(class){
-+			perform_f(done,env,class);
-+		}else{
-+			perform_f(done,env);
-+		}
-+	}else if(args == 1){
-+		if(class){
-+    		perform_f(done,env,class,*--opntr);
-+		}else{
-+    		perform_f(done,env,*--opntr);
-+		}
-+	}else if(args == 2){
-+		if(class){
-+    		perform_f(done,env,class,*--opntr,*--opntr);
-+		}else{
-+    		perform_f(done,env,*--opntr,*--opntr);
-+		}
-+	}else if(args == 3){
-+		if(class){
-+    		perform_f(done,env,class,*--opntr,*--opntr,*--opntr);
-+		}else{
-+    		perform_f(done,env,*--opntr,*--opntr,*--opntr);
-+		}
-+	}else{
-+		write_ops_to_stack(nrofopsonstack)
-+		if(class){
-+    		perform_f(empty_stack,env,class,*--opntr,*--opntr,*--opntr);
-+		}else{
-+    		perform_f(empty_stack,env,*--opntr,*--opntr,*--opntr,*--opntr);
-+		}
-+	}
-+	
-+	empty_stack:
-+	//Increment stack pointer to loose all operands we put there
-+	if(nrofopsonstack > 0) {
-+ 		__asm__ __volatile__("add sp,%0" ::"r"((nrofopsonstack) * sizeof(u4)): "sp");
-+	}
-+		
-+	done:
-+	return ostack;
-+}
-+
-+/*
-+    int i;
-+    int nrofopsonstack,nrofopsinregister;
-+	u4 *opntr = ostack + args;
-+	register int *r5 asm ("r5");
-+	*r5 = *f;
-+	
-+//	register unsigned char *r6 asm ("r6");
-+//	register int *r7 asm ("r7");
-+//	register int *r8 asm ("r8");
-+//	register int *r9 asm ("r9");
-+//	register int *r10 asm ("r10");
-+//	register int *r11 asm ("r11");
-+//	register int *r12 asm ("r12");
-+	
-+	if(class && args > 3){
-+		nrofopsonstack = args - 3;
-+		nrofopsinregister = 3;
-+	}else if(class){
-+		nrofopsonstack = 0;
-+		nrofopsinregister = args;
-+	}else if(args > 4){
-+		nrofopsonstack = args -4;
-+		nrofopsinregister = 4;
-+	}else{
-+		nrofopsonstack = 0;
-+		nrofopsinregister = args;
-+	}
-+
-+	//write all operands except 3 or 4 to the stack	
-+	for(i=0; i < nrofopsonstack; i++){
-+		//printf("!!!!!writing arg %d to stack\n",i);
-+    	__asm__ __volatile__(
-+    	"ld.w r11,%0		\n\t"
-+    	"st.w --sp,r11		" 
-+    	:: "m"(*--opntr)
-+    	:"sp","r11");
-+	}
-+
-+	
-+	//TODO: make sure none of the registers above have been changed
-+	switch(ret_type) {
-+        case RET_VOID:
-+        	goto do_void_function;
-+        case RET_DOUBLE:
-+        	goto do_double_function;
-+        case RET_LONG:
-+        	goto do_longlong_function;
-+        case RET_FLOAT:
-+        	goto do_float_function;
-+        default:
-+        	goto do_default_function;
-+    }
-+
-+	do_void_function:
-+			WRITE_PARAMS(label_void)
-+			__asm__ __volatile__(
-+				"icall r5"
-+				::"m"(f));
-+			label_void:
-+            (*(void (*)())f)();
-+            //printf("!!!!!!!!!!!!! called void JNIMethod %s!!!!!!!!!!\n",sig);
-+            goto empty_stack;
-+            
-+	do_double_function:
-+			WRITE_PARAMS(label_double)
-+			label_double:
-+        	*(double*)ostack = (*(double (*)())f)();
-+            ostack += 2;
-+            //printf("!!!!!!!!!!!!! called double JNIMethod %s %l!!!!!!!!!!\n",sig,*ostack);
-+            goto empty_stack;
-+
-+	do_longlong_function:
-+			WRITE_PARAMS(label_longlong)
-+			label_longlong:
-+        	*(long long*)ostack = (*(long long (*)())f)();
-+            ostack += 2;
-+            //printf("!!!!!!!!!!!!! called long JNIMethod %s %l!!!!!!!!!!\n",sig,*ostack);
-+            goto empty_stack;
-+
-+	do_float_function:
-+			WRITE_PARAMS(label_float)
-+			label_float:
-+        	*(float*)ostack = (*(float (*)())f)();
-+            ostack++;
-+            //printf("!!!!!!!!!!!!! called float JNIMethod %s %f!!!!!!!!!!\n",sig,*ostack);
-+            goto empty_stack;
-+
-+	do_default_function:
-+			WRITE_PARAMS(label_default)
-+			label_default:
-+            *ostack++ = (*(u4 (*)())f)();
-+            //printf("!!!!!!!!!!!!! called default JNIMethod %s!!!!!!!!!!\n",sig);
-+        	goto empty_stack;
-+    
-+    empty_stack:
-+
-+	//Get rid of the items on the stack
-+	if(nrofopsonstack > 0) {
-+ 		__asm__ __volatile__("add sp,%0" ::"r"(nrofopsonstack): "sp");
-+	}
-+    return ostack;*/
-+
-+
-+//    	r8 = (u4*)(*--opntr);
-+//    	r9 = (u4*)(*--opntr);
-+//    	r10 = (u4*)(*--opntr);
-+//    	r11 = (u4*)(*--opntr);
-+//    	r12 = env;
-+
-+
-+
-+/*    
-+   	//write all operands to register
-+    if(!class){
-+    	switch(nrofopsinregister){
-+    	case 4:
-+   		__asm__ __volatile__(
-+   			"ld.w r8,%[r8]		\n\t"
-+   			"ld.w r9,%[r9]		\n\t"
-+   			"ld.w r10,%[r10]	\n\t"
-+   			"ld.w r11,%[r11]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [r8]"m"(*--opntr),[r9]"m"(*--opntr),[r10]"m"(*--opntr),[r11]"m"(*--opntr),[env]"m"(env)
-+   			:"r8","r9","r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	case 3:
-+   		__asm__ __volatile__(
-+   			"ld.w r9,%[r9]		\n\t"
-+   			"ld.w r10,%[r10]	\n\t"
-+   			"ld.w r11,%[r11]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [r9]"m"(*--opntr),[r10]"m"(*--opntr),[r11]"m"(*--opntr),[env]"m"(env)
-+   			:"r9","r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	case 2:
-+   		__asm__ __volatile__(
-+   			"ld.w r10,%[r10]	\n\t"
-+   			"ld.w r11,%[r11]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [r10]"m"(*--opntr),[r11]"m"(*--opntr),[env]"m"(env)
-+   			:"r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	case 1:
-+   		__asm__ __volatile__(
-+   			"ld.w r11,%[r11]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			::[r11]"m"(*--opntr),[env]"m"(env)
-+   			:"r11","r12"
-+   			);
-+   			goto select_function;
-+   		case 0:
-+   		__asm__ __volatile__(
-+   			"ld.w r12,%[env]"
-+   			::[env]"m"(env)
-+   			:"r12"
-+   			);
-+   			goto select_function;
-+   		}
-+    }else{//class needs to be written to r11 
-+    	switch(nrofopsinregister){
-+    	case 3:
-+   		__asm__ __volatile__(
-+   			"ld.w r8,%[r8]		\n\t"
-+   			"ld.w r9,%[r9]		\n\t"
-+   			"ld.w r10,%[r10]	\n\t"
-+   			"ld.w r11,%[class]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [r8]"m"(*--opntr),[r9]"m"(*--opntr),[r10]"m"(*--opntr),[class]"m"(class),[env]"m"(env)
-+   			:"r8","r9","r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	case 2:
-+   		__asm__ __volatile__(
-+   			"ld.w r9,%[r9]		\n\t"
-+   			"ld.w r10,%[r10]	\n\t"
-+   			"ld.w r11,%[class]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [r9]"m"(*--opntr),[r10]"m"(*--opntr),[class]"m"(class),[env]"m"(env)
-+   			:"r9","r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	case 1:
-+   		__asm__ __volatile__(
-+   			"ld.w r10,%[r10]	\n\t"
-+   			"ld.w r11,%[class]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [r10]"m"(*--opntr),[class]"m"(class),[env]"m"(env)
-+   			:"r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	case 0:
-+   		__asm__ __volatile__(
-+   			"ld.w r11,%[class]	\n\t"
-+   			"ld.w r12,%[env]"
-+   			:: [class]"m"(class),[env]"m"(env)
-+   			:"r10","r11","r12"
-+   			);
-+   			goto select_function;
-+    	}
-+    }
-+	select_function: //This label is put here to make some cleaner assembler jumps above
-+	*/
-+
-+//    int isstatic;
-+//    if(class){
-+//    	isstatic = 1; 
-+//    }else{
-+//    	isstatic = 0;
-+//    }
-+//    printf("!!!!!!!!!!!!! calling JNIMethod (sig:%s) (type:%d) (argcount:%d) (static:%d)!!!!!!!!!!\n",sig,ret_type,args,isstatic);
-+
-+//Dit werkt!!!    
-+//    if(args == 3 && isstatic == 0 && ret_type == RET_DFLT){
-+//       printf("I am here..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,*--opntr,*--opntr,*--opntr);
-+//	   return ostack;
-+//    }
-+/*
-+    u4 *opntr = ostack + args;
-+    long long *result;
-+	if(class){
-+		//printf("I am static!!!!!!!\n");
-+		if(args == 0){
-+      		//*ostack = (*(u4 (*)())f)(env,class);
-+      		*result = (*(long long (*)())f)(env,class);
-+    	}else if(args == 1){
-+       		*result = (*(long long (*)())f)(env,class,*--opntr);
-+       	}else if(args == 2){
-+       		*result = (*(long long (*)())f)(env,class,*--opntr,*--opntr);
-+       	}else if(args == 3){
-+       		*result = (*(long long (*)())f)(env,class,*--opntr,*--opntr,*--opntr);
-+       	}else if(args == 4){
-+       		*result = (*(long long (*)())f)(env,class,*--opntr,*--opntr,*--opntr,*--opntr);
-+       	}else if(args == 5){
-+       		*result = (*(long long (*)())f)(env,class,*--opntr,*--opntr,*--opntr,*--opntr,*--opntr);
-+       	}
-+	}else{
-+      	//printf("I am not static!!!!!!!\n");
-+		if(args == 0){
-+       		*result = (*(long long (*)())f)(env);
-+       	}else if(args == 1){
-+       		*result = (*(long long (*)())f)(env,*--opntr);
-+       	}else if(args == 2){
-+       		*result = (*(long long (*)())f)(env,*--opntr,*--opntr);
-+       	}else if(args == 3){
-+       		*result = (*(long long (*)())f)(env,*--opntr,*--opntr,*--opntr);
-+       	}else if(args == 4){
-+       		*result = (*(long long (*)())f)(env,*--opntr,*--opntr,*--opntr,*--opntr);
-+       	}else if(args == 5){
-+       		*result = (*(long long (*)())f)(env,*--opntr,*--opntr,*--opntr,*--opntr,*--opntr);
-+       	}
-+	}
-+	
-+	switch(ret_type) {
-+        case RET_VOID:
-+			printf("-------->Performed void function %s\n",sig);
-+            break;
-+
-+        case RET_DOUBLE:
-+        	*(double*)ostack = *(double(*))result;
-+        	ostack += 2;
-+			printf("-------->Performed double function %s,casting to %d\n",sig, ret_type);
-+        	//printf("returned a double %f\n",*ostack);
-+            break;
-+
-+        case RET_LONG:
-+        	*(long long*)ostack = *(long long(*))result;
-+        	ostack += 2;
-+			printf("-------->Performed long function %s,casting to %d\n",sig, ret_type);
-+        	//printf("returned a long %l\n",*ostack);
-+            break;
-+
-+        case RET_FLOAT:
-+        	*(float*)ostack = *(float(*))result;
-+        	ostack++;
-+			printf("-------->Performed float function %s,casting to %d\n",sig, ret_type);
-+        	//printf("returned a float %f\n",*ostack);
-+            break;
-+
-+        default:
-+        	*ostack++ = *(u4(*))result;
-+            //ostack++;
-+			printf("-------->Performed default function %s,casting to %d\n",sig, ret_type);
-+        	//printf("returned a default %d\n",*ostack);
-+        	break;
-+    }
-+    return ostack;
-+    */
-+
-+
-+
-+
-+//    if(args == 3 && isstatic == 0 && ret_type == RET_DFLT){
-+//       printf("I am here!!!!!!!\n");
-+//       u4 *result = (*(u4 (*)())f)(env,*--opntr,*--opntr,*--opntr);
-+//       *ostack++ = result;
-+//       //*ostack++ = (*(u4 (*)())f)(env,*--opntr,*--opntr,*--opntr);
-+//	   return ostack;
-+//    }
-+//    if(args == 2 && isstatic == 0 && ret_type == RET_DFLT){
-+//       printf("I am here..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,*--opntr,*--opntr);
-+//	   return ostack;
-+//    }
-+//    if(args == 1 && isstatic == 0 && ret_type == RET_DFLT){
-+//       printf("I am here..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,*--opntr);
-+//	   return ostack;
-+//    }
-+//    
-+//    if(args == 6 && isstatic == 1 && ret_type == RET_DFLT){
-+//       printf("I am here for 7 args..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,class,*--opntr,*--opntr,*--opntr,*--opntr,*--opntr,*--opntr);
-+//	   return ostack;
-+//    }
-+//    if(args == 4 && isstatic == 1 && ret_type == RET_DFLT){
-+//       printf("I am here for 5 args..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,class,*--opntr,*--opntr,*--opntr,*--opntr);
-+//	   return ostack;
-+//    }
-+//    if(args == 3 && isstatic == 1 && ret_type == RET_DFLT){
-+//       printf("I am here..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,class,*--opntr,*--opntr,*--opntr);
-+//	   return ostack;
-+//    }
-+//    if(args == 2 && isstatic == 1 && ret_type == RET_DFLT){
-+//       printf("I am here..\n");
-+//      *ostack++ = (*(u4 (*)())f)(env,class,*--opntr,*--opntr);
-+//	   return ostack;
-+//   }
-+//    if(args == 1 && isstatic == 1 && ret_type == RET_DFLT){
-+//       printf("I am here..\n");
-+//       *ostack++ = (*(u4 (*)())f)(env,class,*--opntr);
-+//	   return ostack;
-+//    }
-+    
-+    //int i;
-+
-+    //for(i = 0; i < args; i++){
-+    //	printf("!!!!!should write arg %d\n",i);
-+    	//__asm__ __volatile__("ld.w r11,%0" :: "m"(*--opntr):"r11");
-+        //__asm__ __volatile__("st.w --sp,r11" ::: "sp","r11");
-+    //}
-+
-+//	int i=args;
-+//    if(class) {
-+//    	for(i=args;i>3;i--){
-+//	    	__asm__ __volatile__("ld.w r8,%0" :: "m"(*--opntr):"r8");
-+//    		__asm__ __volatile__("st.w --sp,r8" ::: "sp","r8");
-+//    	}
-+//    	if(args >= 3){
-+//    		__asm__ __volatile__("ld.w r8,%0" :: "m"(*--opntr):"r8");
-+//    	}
-+//    	if(args >= 2){
-+//    		__asm__ __volatile__("ld.w r9,%0" :: "m"(*--opntr):"r9");
-+//    	}
-+//    	if(args >= 1){
-+//    		__asm__ __volatile__("ld.w r10,%0" :: "m"(*--opntr):"r10");
-+//    	}
-+//    	__asm__ __volatile__("ld.w r11,%0" :: "m"(class):"r11");
-+//	   	__asm__ __volatile__("ld.w r12,%0" :: "m"(env):"r12");
-+//    }else{//static, don't add class variable
-+//	   	for(i=args;i>4;i--){
-+//	   		//r8 will be reused by the last register argument
-+//    		__asm__ __volatile__("ld.w r8,%0" :: "m"(*--opntr):"r8");
-+//    		__asm__ __volatile__("st.w --sp,r8" ::: "sp","r8");
-+//    	}
-+//    	if(args >= 4){
-+//    		__asm__ __volatile__("ld.w r8,%0" :: "m"(*--opntr):"r8");
-+//    	}
-+//    	if(args >= 3){
-+//    		__asm__ __volatile__("ld.w r9,%0" :: "m"(*--opntr):"r9");
-+//    	}
-+//    	if(args >= 2){
-+//    		__asm__ __volatile__("ld.w r10,%0" :: "m"(*--opntr):"r10");
-+//    	}
-+//    	if(args >= 1){
-+//    		__asm__ __volatile__("ld.w r11,%0" :: "m"(*--opntr):"r11");
-+//    	}
-+//    	__asm__ __volatile__("ld.w r12,%0" :: "m"(env):"r12");
-+//    }
-+
-+//    printf("!!!!!pushing environment to r12\n");
-+
-+    //printf("!!!!!!!!!!!!! switching ret_type %s %d ,nr of args: %d!!!!!!!!!!\n",sig, ret_type,args);
-+//    switch(ret_type) {
-+//        case RET_VOID:
-+//            (*(void (*)())f)();
-+//            //printf("!!!!!!!!!!!!! called void JNIMethod %s!!!!!!!!!!\n",sig);
-+//            break;
-+//
-+//        case RET_DOUBLE:
-+//        	*(double*)ostack = (*(double (*)())f)();
-+//            ostack += 2;
-+//            //printf("!!!!!!!!!!!!! called double JNIMethod %s %l!!!!!!!!!!\n",sig,*ostack);
-+//            break;
-+//
-+//        case RET_LONG:
-+//        	*(long long*)ostack = (*(long long (*)())f)();
-+//            ostack += 2;
-+//            //printf("!!!!!!!!!!!!! called long JNIMethod %s %l!!!!!!!!!!\n",sig,*ostack);
-+//            break;
-+//
-+//        case RET_FLOAT:
-+//        	*(float*)ostack = (*(float (*)())f)();
-+//            ostack++;
-+//            //printf("!!!!!!!!!!!!! called float JNIMethod %s %f!!!!!!!!!!\n",sig,*ostack);
-+//            break;
-+//
-+//        default:
-+//            *ostack++ = (*(u4 (*)())f)();
-+//            //printf("!!!!!!!!!!!!! called default JNIMethod %s!!!!!!!!!!\n",sig);
-+//        	break;
-+//    }
-+//
-+// if(class && args > 3) {
-+// 		int to_add = args-3;
-+// 		__asm__ __volatile__("add sp,%0" ::"r"(to_add): "sp");
-+// }else if(!class && args > 4){
-+// 		int to_add = args-4;
-+// 		__asm__ __volatile__("add sp,%0" ::"r"(to_add): "sp");
-+// }
-+//    //printf("!!!!!!!!!!!!! returning JNIMethod (sig:%s) (type:%d) (argcount:%d)!!!!!!!!!!\n",sig,ret_type,args);
-+//    //printf("!!!!!!!!!!!!! returning %s %d ,nr of args: %d!!!!!!!!!!\n",sig, ret_type,args);
-+//    //printf("!!!!!!!!!!!!! returning JNIMethod !!!!!!!!!!\n");
-+//    //__asm__ __volatile__ ("addl %0,%%esp" :: "r" ((args + 1) * sizeof(u4)) : "cc", "sp");
-+//    
-+//    return ostack;
-+
-+
-+//write all operands, class and env to register
-+#define WRITE_PARAMS(label)								\
-+    if(!class){											\
-+    	switch(nrofopsinregister){						\
-+    	case 4:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r8,%[r8]		\n\t"					\
-+   			"ld.w r9,%[r9]		\n\t"					\
-+   			"ld.w r10,%[r10]	\n\t"					\
-+   			"ld.w r11,%[r11]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [r8]"m"(*--opntr),[r9]"m"(*--opntr),[r10]"m"(*--opntr),[r11]"m"(*--opntr),[env]"m"(env)						\
-+   			:"r8","r9","r10","r11","r12"				\
-+   			);											\
-+   			goto label;									\
-+    	case 3:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r9,%[r9]		\n\t"					\
-+   			"ld.w r10,%[r10]	\n\t"					\
-+   			"ld.w r11,%[r11]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [r9]"m"(*--opntr),[r10]"m"(*--opntr),[r11]"m"(*--opntr),[env]"m"(env)						\
-+   			:"r9","r10","r11","r12"						\
-+   			);											\
-+   			goto label;									\
-+    	case 2:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r10,%[r10]	\n\t"					\
-+   			"ld.w r11,%[r11]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [r10]"m"(*--opntr),[r11]"m"(*--opntr),[env]"m"(env)						\
-+   			:"r10","r11","r12"							\
-+   			);											\
-+   			goto label;									\
-+    	case 1:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r11,%[r11]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			::[r11]"m"(*--opntr),[env]"m"(env)			\
-+   			:"r11","r12"								\
-+   			);											\
-+   			goto label;									\
-+   		case 0:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r12,%[env]"							\
-+   			::[env]"m"(env)								\
-+   			:"r12"										\
-+   			);											\
-+   			goto label;									\
-+   		}												\
-+    }else{												\
-+    	switch(nrofopsinregister){						\
-+    	case 3:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r8,%[r8]		\n\t"					\
-+   			"ld.w r9,%[r9]		\n\t"					\
-+   			"ld.w r10,%[r10]	\n\t"					\
-+   			"ld.w r11,%[class]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [r8]"m"(*--opntr),[r9]"m"(*--opntr),[r10]"m"(*--opntr),[class]"m"(class),[env]"m"(env)						\
-+   			:"r8","r9","r10","r11","r12"				\
-+   			);											\
-+   			goto label;									\
-+    	case 2:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r9,%[r9]		\n\t"					\
-+   			"ld.w r10,%[r10]	\n\t"					\
-+   			"ld.w r11,%[class]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [r9]"m"(*--opntr),[r10]"m"(*--opntr),[class]"m"(class),[env]"m"(env)						\
-+   			:"r9","r10","r11","r12"						\
-+   			);											\
-+   			goto label;									\
-+    	case 1:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r10,%[r10]	\n\t"					\
-+   			"ld.w r11,%[class]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [r10]"m"(*--opntr),[class]"m"(class),[env]"m"(env)						\
-+   			:"r10","r11","r12"							\
-+   			);											\
-+   			goto label;									\
-+    	case 0:											\
-+   		__asm__ __volatile__(							\
-+   			"ld.w r11,%[class]	\n\t"					\
-+   			"ld.w r12,%[env]"							\
-+   			:: [class]"m"(class),[env]"m"(env)			\
-+   			:"r10","r11","r12"							\
-+   			);											\
-+   			goto label;									\
-+    	}												\
-+    }													\
-+	//This label is put here to make some cleaner assembler jumps above
-+#endif
-diff -urpN jamvm-1.5.0/src/os/linux/avr32/init.c jamvm-1.5.0-avr32/src/os/linux/avr32/init.c
---- jamvm-1.5.0/src/os/linux/avr32/init.c	1970-01-01 01:00:00.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/os/linux/avr32/init.c	2008-02-08 09:20:38.000000000 +0100
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (C) 2003, 2004, 2006, 2007
-+ * Robert Lougher <rob@lougher.org.uk>.
-+ *
-+ * This file is part of JamVM.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+//#include <fpu_control.h>
-+//#include <stdio.h>
-+
-+/* Change floating point precision to double (64-bit) from
-+ * the extended (80-bit) Linux default. */
-+
-+//void setDoublePrecision() {
-+//    fpu_control_t cw;
-+//
-+//    _FPU_GETCW(cw);
-+//    cw &= ~_FPU_EXTENDED;
-+//    cw |= _FPU_DOUBLE;
-+//    _FPU_SETCW(cw);
-+//}
-+
-+void initialisePlatform() {
-+	//TODO: is this needed for avr32?    setDoublePrecision();
-+}
-diff -urpN jamvm-1.5.0/src/os/linux/avr32/Makefile.am jamvm-1.5.0-avr32/src/os/linux/avr32/Makefile.am
---- jamvm-1.5.0/src/os/linux/avr32/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/os/linux/avr32/Makefile.am	2008-02-08 09:20:38.000000000 +0100
-@@ -0,0 +1,25 @@
-+##
-+## Copyright (C) 2003, 2004, 2005, 2006, 2007
-+## Robert Lougher <rob@lougher.org.uk>.
-+##
-+## This file is part of JamVM.
-+##
-+## This program is free software; you can redistribute it and/or
-+## modify it under the terms of the GNU General Public License
-+## as published by the Free Software Foundation; either version 2,
-+## or (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful,
-+## but WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+## GNU General Public License for more details.
-+##
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+##
-+
-+noinst_LTLIBRARIES = libnative.la
-+libnative_la_SOURCES = init.c dll_md.c
-+
-+AM_CPPFLAGS = -I$(top_builddir)/src
-diff -urpN jamvm-1.5.0/src/os/linux/avr32/Makefile.in jamvm-1.5.0-avr32/src/os/linux/avr32/Makefile.in
---- jamvm-1.5.0/src/os/linux/avr32/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/os/linux/avr32/Makefile.in	2008-02-08 09:20:38.000000000 +0100
-@@ -0,0 +1,446 @@
-+# Makefile.in generated by automake 1.10 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = src/os/linux/avr32
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/src/config.h
-+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libnative_la_LIBADD =
-+am_libnative_la_OBJECTS = init.lo dll_md.lo
-+libnative_la_OBJECTS = $(am_libnative_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+SOURCES = $(libnative_la_SOURCES)
-+DIST_SOURCES = $(libnative_la_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCAS = @CCAS@
-+CCASDEPMODE = @CCASDEPMODE@
-+CCASFLAGS = @CCASFLAGS@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAVAC = @JAVAC@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+RANLIB = @RANLIB@
-+SED = @SED@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+arch = @arch@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+interp_cflags = @interp_cflags@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+os = @os@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+use_zip_no = @use_zip_no@
-+use_zip_yes = @use_zip_yes@
-+with_classpath_install_dir = @with_classpath_install_dir@
-+noinst_LTLIBRARIES = libnative.la
-+libnative_la_SOURCES = init.c dll_md.c
-+AM_CPPFLAGS = -I$(top_builddir)/src
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/os/linux/avr32/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  src/os/linux/avr32/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libnative.la: $(libnative_la_OBJECTS) $(libnative_la_DEPENDENCIES) 
-+	$(LINK)  $(libnative_la_OBJECTS) $(libnative_la_LIBADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dll_md.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-+	mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urpN jamvm-1.5.0/src/os/linux/Makefile.am jamvm-1.5.0-avr32/src/os/linux/Makefile.am
---- jamvm-1.5.0/src/os/linux/Makefile.am	2007-10-28 00:19:26.000000000 +0200
-+++ jamvm-1.5.0-avr32/src/os/linux/Makefile.am	2008-02-08 09:20:38.000000000 +0100
-@@ -20,7 +20,7 @@
- ##
- 
- SUBDIRS = @arch@
--DIST_SUBDIRS = powerpc arm i386 x86_64 parisc mips
-+DIST_SUBDIRS = powerpc arm i386 x86_64 parisc mips avr32
- 
- noinst_LTLIBRARIES = libos.la
- libos_la_SOURCES = os.c
-diff -urpN jamvm-1.5.0/src/os/linux/Makefile.in jamvm-1.5.0-avr32/src/os/linux/Makefile.in
---- jamvm-1.5.0/src/os/linux/Makefile.in	2007-10-29 07:02:37.000000000 +0100
-+++ jamvm-1.5.0-avr32/src/os/linux/Makefile.in	2008-02-08 09:20:38.000000000 +0100
-@@ -191,7 +191,7 @@ use_zip_no = @use_zip_no@
- use_zip_yes = @use_zip_yes@
- with_classpath_install_dir = @with_classpath_install_dir@
- SUBDIRS = @arch@
--DIST_SUBDIRS = powerpc arm i386 x86_64 parisc mips
-+DIST_SUBDIRS = powerpc arm i386 x86_64 parisc mips avr32
- noinst_LTLIBRARIES = libos.la
- libos_la_SOURCES = os.c
- AM_CPPFLAGS = -I$(top_builddir)/src
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
deleted file mode 100644
index 4b2e32ccef..0000000000
--- a/package/java/jamvm/jamvm.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#############################################################
-#
-# jamvm 1.5.0
-#
-#############################################################
-JAMVM_VERSION = 1.5.0
-JAMVM_SOURCE = jamvm-$(JAMVM_VERSION).tar.gz
-JAMVM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/jamvm/
-JAMVM_AUTORECONF = NO
-JAMVM_INSTALL_STAGING = YES
-JAMVM_INSTALL_TARGET = YES
-
-JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
-		glib_cv_uscore=no ac_cv_func_strtod=yes \
-		ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
-		ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
-		ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
-		ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
-		ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
-		ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
-		ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
-		ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
-		jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
-		ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
-		ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
-		ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
-		ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no \
-		jm_cv_func_gettimeofday_clobber=no \
-		gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
-		utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
-		gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
-		gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
-		am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
-		gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
-		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
-		ac_use_included_regex=no gl_cv_c_restrict=no \
-		ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
-
-JAMVM_CONF_OPT = \
-		--libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-glibtest --enable-explicit-deps=no \
-		--disable-debug --with-classpath-install-dir=/usr
-
-
-JAMVM_DEPENDENCIES = host-pkg-config classpath
-
-#Include X libraries when we have an X server
-ifeq ($(BR2_PACKAGE_XORG7),y)
-	JAMVM_DEPENDENCIES+= xserver_xorg-server
-	JAMVM_CONF_OPT+= --with-x \
-		--x-includes=$(STAGING_DIR)/usr/include/X11 \
-		--x-libraries=$(STAGING_DIR)/usr/lib
-else
-	JAMVM_CONF_OPT+= --without-x
-endif
-
-
-#Enable or disable alsa
-ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-	JAMVM_DEPENDENCIES+= alsa-lib
-	JAMVM_CONF_OPT+= --with-alsa
-else
-	JAMVM_CONF_OPT+= --without-alsa
-endif
-
-#Enable or disable gtk
-ifeq ($(BR2_PACKAGE_LIBGTK2),y)
-	JAMVM_DEPENDENCIES+= libgtk2
-	JAMVM_CONF_OPT+= --enable-gtk-peer
-else
-	JAMVM_CONF_OPT+= --disable-gtk-peer
-endif
-
-#Enable or disable qt backend
-ifeq ($(BR2_PACKAGE_QT),y)
-	JAMVM_DEPENDENCIES+= qt
-	JAMVM_CONF_OPT+= --enable-qt-peer
-else
-	JAMVM_CONF_OPT+= --disable-qt-peer
-endif
-
-
-# I have no clue but if this is not passed to configure, the assembler crashes
-ifeq ($(BR2_avr32),y)
-	JAMVM_CONF_OPT+= \
-		CFLAGS="-g0" \
-		CC="$(STAGING_DIR)/usr/bin/avr32-linux-gcc"
-endif
-
-$(eval $(call AUTOTARGETS))
diff --git a/package/java/java.mk b/package/java/java.mk
deleted file mode 100644
index 123a0d09b5..0000000000
--- a/package/java/java.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/java/*/*.mk
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index dbcbbd3fdb..acaa3a88dc 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -68,18 +68,6 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	help
 	  Any additional gcc configure options you may want to include....
 
-config BR2_GCC_CROSS_JAVA
-       bool
-
-config BR2_INSTALL_LIBGCJ
-	bool "Build/install java compiler and libgcj?"
-	depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP
-	select BR2_GCC_CROSS_JAVA
-	select BR2_LARGEFILE
-	depends on BROKEN
-	help
-	  Build/install java compiler and libgcj?
-
 config BR2_INSTALL_OBJC
 	bool "Build/install Objective-C compiler and runtime?"
 	depends on !BR2_avr32
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index a2253c9fa2..3074799d99 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -75,15 +75,11 @@ endif
 ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
 GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran
 endif
-ifeq ($(BR2_GCC_CROSS_JAVA),y)
-GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),java
-endif
 ifeq ($(BR2_GCC_CROSS_OBJC),y)
 GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
 endif
 
 GCC_COMMON_PREREQ=$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libgcj*)\
 $(wildcard $(BR2_DEPENDS_DIR)/br2/install/objc*)\
 $(wildcard $(BR2_DEPENDS_DIR)/br2/install/fortran*)\
 $(wildcard $(BR2_DEPENDS_DIR)/br2/prefer/ima*)\
@@ -100,10 +96,6 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),c++
 endif
 
-ifeq ($(BR2_INSTALL_LIBGCJ),y)
-GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),java
-endif
-
 ifeq ($(BR2_INSTALL_OBJC),y)
 GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc
 endif
@@ -466,17 +458,6 @@ ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so*
 endif
 endif
-ifeq ($(BR2_INSTALL_LIBGCJ),y)
-	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(STAGING_DIR)/usr/lib/
-	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(TARGET_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/security
-	mkdir -p $(TARGET_DIR)/usr/lib/security
-	cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \
-		$(STAGING_DIR)/usr/lib/security/
-	cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \
-		$(TARGET_DIR)/usr/lib/security/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgcj.so*
-endif
 ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
 	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(STAGING_DIR)/usr/lib/
 	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(TARGET_DIR)/usr/lib/

From 3a9d3bc0c320614c8d831d77d9c28a7b90ad21da Mon Sep 17 00:00:00 2001
From: Sergio Prado <sergiosiena@gmail.com>
Date: Sat, 24 Dec 2011 14:51:04 -0200
Subject: [PATCH 1180/6849] Adding xf86-input-tslib driver

Adding xf86-input-tslib driver so X11 can talk directly to
touchscreen devices.

[Peter: Add tslib deps and upstream URL]
Signed-off-by: Sergio Prado <sergiosiena@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                         |  1 +
 .../x11r7/xdriver_xf86-input-tslib/Config.in    | 11 +++++++++++
 .../xdriver_xf86-input-tslib.mk                 | 17 +++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-input-tslib/Config.in
 create mode 100644 package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 50816f23e9..664226f85e 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -174,6 +174,7 @@ endmenu
 		source package/x11r7/xdriver_xf86-input-keyboard/Config.in
 		source package/x11r7/xdriver_xf86-input-mouse/Config.in
 		source package/x11r7/xdriver_xf86-input-synaptics/Config.in
+		source package/x11r7/xdriver_xf86-input-tslib/Config.in
 		source package/x11r7/xdriver_xf86-input-vmmouse/Config.in
 		source package/x11r7/xdriver_xf86-input-void/Config.in
 		source package/x11r7/xdriver_xf86-video-apm/Config.in
diff --git a/package/x11r7/xdriver_xf86-input-tslib/Config.in b/package/x11r7/xdriver_xf86-input-tslib/Config.in
new file mode 100644
index 0000000000..51852734b9
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tslib/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
+	bool "xf86-input-tslib"
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_TSLIB
+	help
+	  Touch screen library input driver
+
+	  http://www.ptxdist.org/software/xf86-input-tslib/index_en.html
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
new file mode 100644
index 0000000000..eaf8f2a2fc
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# xdriver_xf86-input-tslib -- Touch screen library input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
+XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.ptxdist.org/software/xf86-input-tslib/download
+XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \
+	xproto_inputproto \
+	xserver_xorg-server \
+	xproto_randrproto \
+	xproto_xproto \
+	tslib
+
+$(eval $(call AUTOTARGETS))

From b4c493d376aef81981a6f767e87f758dff22906e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 12 Jan 2012 22:11:51 -0300
Subject: [PATCH 1181/6849] kernel-headers: bump 3.0.x, 3.1.x and 3.2.x series

Bump 3.0.x series to 3.0.17, 3.1.x series to 3.1.9 and 3.2.x series to
3.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.15-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.17-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index e6b2909bb9..cf2ac4e6c6 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.15"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.8"		if BR2_KERNEL_HEADERS_3_1
-	default "3.2"		if BR2_KERNEL_HEADERS_3_2
+	default "3.0.17"	if BR2_KERNEL_HEADERS_3_0
+	default "3.1.9"		if BR2_KERNEL_HEADERS_3_1
+	default "3.2.1"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.15-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.17-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.15-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.17-headers_install-fix-__packed-in-exported-kernel-head.patch

From 51a6c849629881bc78a4ecff4bafb9040599e4bc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 12 Jan 2012 22:11:52 -0300
Subject: [PATCH 1182/6849] linux: update stable kernel to version 3.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index db364fe3f5..6a40b20fd5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_2
 
 config BR2_LINUX_KERNEL_3_2
-	bool "3.2"
+	bool "3.2.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.2"
+	default "3.2.1"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2" if BR2_LINUX_KERNEL_3_2
+	default "3.2.1" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 8f8d414b61bf3b27a77ad38dfc493ae412b65471 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 13 Jan 2012 20:23:23 +0100
Subject: [PATCH 1183/6849] Fix typo buiding -> building

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-common.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 56ac85f5c1..fb87a888e6 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -105,4 +105,4 @@ config BR2_TARGET_OPTIMIZATION
 config BR2_TARGET_LDFLAGS
 	string "Target linker options"
 	help
-	  Extra options to pass to the linker when buiding for the target.
+	  Extra options to pass to the linker when building for the target.

From 21f540be4e247b4468d0e8adbf9e3a7575f8a085 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 13 Jan 2012 12:48:28 +0100
Subject: [PATCH 1184/6849] kconfig: sync with linux-3.0

And drop unused make-write-deps patch.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/kconfig/Makefile                      |  68 ++++-----
 support/kconfig/conf.c                        |   2 +-
 support/kconfig/confdata.c                    |  20 +--
 support/kconfig/expr.h                        |   4 -
 support/kconfig/gconf.c                       |  12 +-
 support/kconfig/lex.zconf.c_shipped           |  33 +++--
 support/kconfig/nconf.c                       |  14 +-
 .../03-change-config-option-prefix.patch      |  22 +--
 .../patches/05-really-clean-everything.patch  |  29 ----
 .../06-br-build-system-integration.patch      |  47 +++---
 .../kconfig/patches/08-make-write-deps.patch  | 139 ------------------
 .../09-implement-kconfig-probability.patch    |  10 +-
 .../patches/12-fix-glade-file-path.patch      |   2 +-
 .../14-support-out-of-tree-config.patch       |  42 +++---
 support/kconfig/patches/series                |   2 -
 support/kconfig/qconf.cc                      |   5 +-
 support/kconfig/streamline_config.pl          |   2 +-
 support/kconfig/util.c                        | 117 +--------------
 support/kconfig/zconf.l                       |  33 +++--
 19 files changed, 149 insertions(+), 454 deletions(-)
 delete mode 100644 support/kconfig/patches/05-really-clean-everything.patch
 delete mode 100644 support/kconfig/patches/08-make-write-deps.patch

diff --git a/support/kconfig/Makefile b/support/kconfig/Makefile
index ece2a822fc..f2def76f0a 100644
--- a/support/kconfig/Makefile
+++ b/support/kconfig/Makefile
@@ -77,14 +77,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 # The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
 	$(Q)echo "  GEN config"
-	$(Q)xgettext --default-domain=linux              \
-	    --add-comments --keyword=_ --keyword=N_      \
-	    --from-code=UTF-8                            \
-	    --files-from=scripts/kconfig/POTFILES.in     \
+	$(Q)xgettext --default-domain=linux                         \
+	    --add-comments --keyword=_ --keyword=N_                 \
+	    --from-code=UTF-8                                       \
+	    --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \
+	    --directory=$(srctree) --directory=$(objtree)           \
 	    --output $(obj)/config.pot
 	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-	$(Q)(for i in `ls arch/*/Kconfig`;               \
+	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig
+	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
 	    do                                           \
 		echo "  GEN $$i";                        \
 		$(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
 	    done )
 	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
 	    --output $(obj)/linux.pot
-	$(Q)rm -f arch/um/Kconfig.arch
+	$(Q)rm -f $(srctree)/arch/um/Kconfig
 	$(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -168,56 +169,44 @@ conf-objs	:= conf.o  zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs	:= kxgettext.o zconf.tab.o
+qconf-cxxobjs	:= qconf.o
+qconf-objs	:= kconfig_load.o zconf.tab.o
+gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
 
-hostprogs-y := conf qconf gconf kxgettext
+hostprogs-y := conf
 
-ifeq ($(MAKECMDGOALS),nconfig)
+ifeq ($(MAKECMDGOALS),nconf)
 	hostprogs-y += nconf
 endif
-ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf)
-       hostprogs-y += nconf
-endif
 
-ifeq ($(MAKECMDGOALS),menuconfig)
+ifeq ($(MAKECMDGOALS),mconf)
 	hostprogs-y += mconf
 endif
-ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)
-       hostprogs-y += mconf
-endif
 
-ifeq ($(MAKECMDGOALS),xconfig)
-	qconf-target := 1
-endif
-ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)
-	qconf-target := 1
+ifeq ($(MAKECMDGOALS),update-po-config)
+	hostprogs-y += kxgettext
 endif
 
-ifeq ($(MAKECMDGOALS),gconfig)
-	gconf-target := 1
+ifeq ($(MAKECMDGOALS),qconf)
+	qconf-target := 1
 endif
-ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf)
+ifeq ($(MAKECMDGOALS),gconf)
 	gconf-target := 1
 endif
 
+
 ifeq ($(qconf-target),1)
-qconf-cxxobjs	:= qconf.o
-qconf-objs	:= kconfig_load.o zconf.tab.o
+	hostprogs-y += qconf
 endif
 
 ifeq ($(gconf-target),1)
-gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
+	hostprogs-y += gconf
 endif
 
-clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
-               .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
-clean-files += config.pot linux.pot
-clean-files += conf $(conf-objs)
-clean-files += mconf $(mconf-objs)
-clean-files += nconf $(nconf-objs)
-clean-files += qconf qconf.o
-clean-files += gconf gconf.o
-clean-files += kconfig_load.o zconf.tab.o
-clean-files += $(kxgettext-objs)
+clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files	+= zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files     += mconf qconf gconf nconf
+clean-files     += config.pot linux.pot
 
 # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
 PHONY += $(obj)/dochecklxdialog
@@ -339,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h
 	$(KC_QT_MOC) -i $< -o $@
 
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
-	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+	$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
-	intltool-extract --type=gettext/glade $(obj)/gconf.glade
+	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
+	$(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf
diff --git a/support/kconfig/conf.c b/support/kconfig/conf.c
index 652e079a60..ed9402a602 100644
--- a/support/kconfig/conf.c
+++ b/support/kconfig/conf.c
@@ -332,7 +332,7 @@ static int conf_choice(struct menu *menu)
 		}
 		if (!child)
 			continue;
-		if (line[strlen(line) - 1] == '?') {
+		if (line[0] && line[strlen(line) - 1] == '?') {
 			print_help(child);
 			continue;
 		}
diff --git a/support/kconfig/confdata.c b/support/kconfig/confdata.c
index c9f13eec74..54f20ca96a 100644
--- a/support/kconfig/confdata.c
+++ b/support/kconfig/confdata.c
@@ -559,8 +559,6 @@ int conf_write(const char *name)
 	const char *basename;
 	const char *str;
 	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
-	time_t now;
-	int use_timestamp = 1;
 	char *env;
 
 	if (!name)
@@ -600,19 +598,11 @@ int conf_write(const char *name)
 	if (!out)
 		return 1;
 
-	time(&now);
-	env = getenv("KCONFIG_NOTIMESTAMP");
-	if (env && *env)
-		use_timestamp = 0;
-
 	fprintf(out, _("#\n"
 		       "# Automatically generated make config: don't edit\n"
 		       "# %s\n"
-		       "%s%s"
 		       "#\n"),
-		     rootmenu.prompt->text,
-		     use_timestamp ? "# " : "",
-		     use_timestamp ? ctime(&now) : "");
+		     rootmenu.prompt->text);
 
 	if (!conf_get_changed())
 		sym_clear_all_valid();
@@ -801,7 +791,6 @@ int conf_write_autoconf(void)
 	const char *str;
 	const char *name;
 	FILE *out, *tristate, *out_h;
-	time_t now;
 	int i;
 	char dir[PATH_MAX+1], buf[PATH_MAX+1];
 	char *s;
@@ -841,22 +830,19 @@ int conf_write_autoconf(void)
 		return 1;
 	}
 
-	time(&now);
 	fprintf(out, "#\n"
 		     "# Automatically generated make config: don't edit\n"
 		     "# %s\n"
-		     "# %s"
 		     "#\n",
-		     rootmenu.prompt->text, ctime(&now));
+		     rootmenu.prompt->text);
 	fprintf(tristate, "#\n"
 			  "# Automatically generated - do not edit\n"
 			  "\n");
 	fprintf(out_h, "/*\n"
 		       " * Automatically generated C config: don't edit\n"
 		       " * %s\n"
-		       " * %s"
 		       " */\n",
-		       rootmenu.prompt->text, ctime(&now));
+		       rootmenu.prompt->text);
 
 	for_all_symbols(i, sym) {
 		sym_calc_value(sym);
diff --git a/support/kconfig/expr.h b/support/kconfig/expr.h
index 3d238db497..16bfae2d32 100644
--- a/support/kconfig/expr.h
+++ b/support/kconfig/expr.h
@@ -20,12 +20,8 @@ struct file {
 	struct file *parent;
 	const char *name;
 	int lineno;
-	int flags;
 };
 
-#define FILE_BUSY		0x0001
-#define FILE_SCANNED		0x0002
-
 typedef enum tristate {
 	no, mod, yes
 } tristate;
diff --git a/support/kconfig/gconf.c b/support/kconfig/gconf.c
index f9daf987d9..79479c3239 100644
--- a/support/kconfig/gconf.c
+++ b/support/kconfig/gconf.c
@@ -253,7 +253,7 @@ void init_left_tree(void)
 
 	gtk_tree_view_set_model(view, model1);
 	gtk_tree_view_set_headers_visible(view, TRUE);
-	gtk_tree_view_set_rules_hint(view, FALSE);
+	gtk_tree_view_set_rules_hint(view, TRUE);
 
 	column = gtk_tree_view_column_new();
 	gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void)
 
 	gtk_tree_view_set_model(view, model2);
 	gtk_tree_view_set_headers_visible(view, TRUE);
-	gtk_tree_view_set_rules_hint(view, FALSE);
+	gtk_tree_view_set_rules_hint(view, TRUE);
 
 	column = gtk_tree_view_column_new();
 	gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data)
 void on_single_clicked(GtkButton * button, gpointer user_data)
 {
 	view_mode = SINGLE_VIEW;
-	gtk_paned_set_position(GTK_PANED(hpaned), 0);
 	gtk_widget_hide(tree1_w);
 	current = &rootmenu;
 	display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data)
 void on_full_clicked(GtkButton * button, gpointer user_data)
 {
 	view_mode = FULL_VIEW;
-	gtk_paned_set_position(GTK_PANED(hpaned), 0);
 	gtk_widget_hide(tree1_w);
 	if (tree2)
 		gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu)
                 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
 		    || (view_mode == FULL_VIEW)
 		    || (view_mode == SPLIT_VIEW))*/
+
+		/* Change paned position if the view is not in 'split mode' */
+		if (view_mode == SINGLE_VIEW || view_mode == FULL_VIEW) {
+			gtk_paned_set_position(GTK_PANED(hpaned), 0);
+		}
+
 		if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
 		    || (view_mode == FULL_VIEW)
 		    || (view_mode == SPLIT_VIEW)) {
diff --git a/support/kconfig/lex.zconf.c_shipped b/support/kconfig/lex.zconf.c_shipped
index 6eb0397182..d9182916f7 100644
--- a/support/kconfig/lex.zconf.c_shipped
+++ b/support/kconfig/lex.zconf.c_shipped
@@ -2363,11 +2363,11 @@ void zconf_initscan(const char *name)
 
 	current_file = file_lookup(name);
 	current_file->lineno = 1;
-	current_file->flags = FILE_BUSY;
 }
 
 void zconf_nextfile(const char *name)
 {
+	struct file *iter;
 	struct file *file = file_lookup(name);
 	struct buffer *buf = malloc(sizeof(*buf));
 	memset(buf, 0, sizeof(*buf));
@@ -2383,18 +2383,25 @@ void zconf_nextfile(const char *name)
 	buf->parent = current_buf;
 	current_buf = buf;
 
-	if (file->flags & FILE_BUSY) {
-		printf("%s:%d: do not source '%s' from itself\n",
-		       zconf_curname(), zconf_lineno(), name);
-		exit(1);
-	}
-	if (file->flags & FILE_SCANNED) {
-		printf("%s:%d: file '%s' is already sourced from '%s'\n",
-		       zconf_curname(), zconf_lineno(), name,
-		       file->parent->name);
-		exit(1);
+	for (iter = current_file->parent; iter; iter = iter->parent ) {
+		if (!strcmp(current_file->name,iter->name) ) {
+			printf("%s:%d: recursive inclusion detected. "
+			       "Inclusion path:\n  current file : '%s'\n",
+			       zconf_curname(), zconf_lineno(),
+			       zconf_curname());
+			iter = current_file->parent;
+			while (iter && \
+			       strcmp(iter->name,current_file->name)) {
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno-1);
+				iter = iter->parent;
+			}
+			if (iter)
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno+1);
+			exit(1);
+		}
 	}
-	file->flags |= FILE_BUSY;
 	file->lineno = 1;
 	file->parent = current_file;
 	current_file = file;
@@ -2404,8 +2411,6 @@ static void zconf_endfile(void)
 {
 	struct buffer *parent;
 
-	current_file->flags |= FILE_SCANNED;
-	current_file->flags &= ~FILE_BUSY;
 	current_file = current_file->parent;
 
 	parent = current_buf->parent;
diff --git a/support/kconfig/nconf.c b/support/kconfig/nconf.c
index db56377393..488dd74107 100644
--- a/support/kconfig/nconf.c
+++ b/support/kconfig/nconf.c
@@ -373,18 +373,18 @@ static void print_function_line(void)
 	const int skip = 1;
 
 	for (i = 0; i < function_keys_num; i++) {
-		wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
+		(void) wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
 		mvwprintw(main_window, LINES-3, offset,
 				"%s",
 				function_keys[i].key_str);
-		wattrset(main_window, attributes[FUNCTION_TEXT]);
+		(void) wattrset(main_window, attributes[FUNCTION_TEXT]);
 		offset += strlen(function_keys[i].key_str);
 		mvwprintw(main_window, LINES-3,
 				offset, "%s",
 				function_keys[i].func);
 		offset += strlen(function_keys[i].func) + skip;
 	}
-	wattrset(main_window, attributes[NORMAL]);
+	(void) wattrset(main_window, attributes[NORMAL]);
 }
 
 /* help */
@@ -953,16 +953,16 @@ static void show_menu(const char *prompt, const char *instructions,
 	current_instructions = instructions;
 
 	clear();
-	wattrset(main_window, attributes[NORMAL]);
+	(void) wattrset(main_window, attributes[NORMAL]);
 	print_in_middle(stdscr, 1, 0, COLS,
 			menu_backtitle,
 			attributes[MAIN_HEADING]);
 
-	wattrset(main_window, attributes[MAIN_MENU_BOX]);
+	(void) wattrset(main_window, attributes[MAIN_MENU_BOX]);
 	box(main_window, 0, 0);
-	wattrset(main_window, attributes[MAIN_MENU_HEADING]);
+	(void) wattrset(main_window, attributes[MAIN_MENU_HEADING]);
 	mvwprintw(main_window, 0, 3, " %s ", prompt);
-	wattrset(main_window, attributes[NORMAL]);
+	(void) wattrset(main_window, attributes[NORMAL]);
 
 	set_menu_items(curses_menu, curses_menu_items);
 
diff --git a/support/kconfig/patches/03-change-config-option-prefix.patch b/support/kconfig/patches/03-change-config-option-prefix.patch
index d387236e7e..4c51eaa9b8 100644
--- a/support/kconfig/patches/03-change-config-option-prefix.patch
+++ b/support/kconfig/patches/03-change-config-option-prefix.patch
@@ -4,10 +4,10 @@
  menu.c     |    2 +-
  3 files changed, 31 insertions(+), 30 deletions(-)
 
-Index: config/confdata.c
+Index: kconfig/confdata.c
 ===================================================================
---- config.orig/confdata.c
-+++ config/confdata.c
+--- kconfig.orig/confdata.c
++++ kconfig/confdata.c
 @@ -12,6 +12,7 @@
  #include <string.h>
  #include <time.h>
@@ -125,7 +125,7 @@ Index: config/confdata.c
  		break;
  	case S_OTHER:
  	case S_UNKNOWN:
-@@ -844,17 +845,17 @@
+@@ -830,17 +831,17 @@
  			case no:
  				break;
  			case mod:
@@ -151,7 +151,7 @@ Index: config/confdata.c
  				break;
  			}
  			break;
-@@ -864,14 +865,14 @@
+@@ -850,14 +851,14 @@
  		case S_HEX:
  			str = sym_get_string_value(sym);
  			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
@@ -170,10 +170,10 @@ Index: config/confdata.c
  			break;
  		default:
  			break;
-Index: config/lkc.h
+Index: kconfig/lkc.h
 ===================================================================
---- config.orig/lkc.h
-+++ config/lkc.h
+--- kconfig.orig/lkc.h
++++ kconfig/lkc.h
 @@ -42,7 +42,7 @@
  #define N_(text) (text)
  
@@ -183,10 +183,10 @@ Index: config/lkc.h
  #endif
  
  #define TF_COMMAND	0x0001
-Index: config/menu.c
+Index: kconfig/menu.c
 ===================================================================
---- config.orig/menu.c
-+++ config/menu.c
+--- kconfig.orig/menu.c
++++ kconfig/menu.c
 @@ -597,7 +597,7 @@
  
  	if (menu_has_help(menu)) {
diff --git a/support/kconfig/patches/05-really-clean-everything.patch b/support/kconfig/patches/05-really-clean-everything.patch
deleted file mode 100644
index a1517542ea..0000000000
--- a/support/kconfig/patches/05-really-clean-everything.patch
+++ /dev/null
@@ -1,29 +0,0 @@
----
- Makefile |   14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-Index: config/Makefile
-===================================================================
---- config.orig/Makefile
-+++ config/Makefile
-@@ -196,10 +196,16 @@
- gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
- endif
- 
--clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
--		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
--clean-files     += mconf qconf gconf nconf
--clean-files     += config.pot linux.pot
-+clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
-+               .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
-+clean-files += config.pot linux.pot
-+clean-files += conf $(conf-objs)
-+clean-files += mconf $(mconf-objs)
-+clean-files += nconf $(nconf-objs)
-+clean-files += qconf qconf.o
-+clean-files += gconf gconf.o
-+clean-files += kconfig_load.o zconf.tab.o
-+clean-files += $(kxgettext-objs)
- 
- # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
- PHONY += $(obj)/dochecklxdialog
diff --git a/support/kconfig/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.patch
index 8a27e251ea..feb166d36c 100644
--- a/support/kconfig/patches/06-br-build-system-integration.patch
+++ b/support/kconfig/patches/06-br-build-system-integration.patch
@@ -1,40 +1,35 @@
 ---
- Makefile |   14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
+ Makefile |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: config/Makefile
+Index: kconfig/Makefile
 ===================================================================
---- config.orig/Makefile
-+++ config/Makefile
-@@ -174,18 +174,30 @@
- ifeq ($(MAKECMDGOALS),nconfig)
+--- kconfig.orig/Makefile
++++ kconfig/Makefile
+@@ -175,11 +175,11 @@
+ 
+ hostprogs-y := conf
+ 
+-ifeq ($(MAKECMDGOALS),nconfig)
++ifeq ($(MAKECMDGOALS),nconf)
  	hostprogs-y += nconf
  endif
-+ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf)
-+       hostprogs-y += nconf
-+endif
  
- ifeq ($(MAKECMDGOALS),menuconfig)
+-ifeq ($(MAKECMDGOALS),menuconfig)
++ifeq ($(MAKECMDGOALS),mconf)
  	hostprogs-y += mconf
  endif
-+ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)
-+       hostprogs-y += mconf
-+endif
  
- ifeq ($(MAKECMDGOALS),xconfig)
+@@ -187,10 +187,10 @@
+ 	hostprogs-y += kxgettext
+ endif
+ 
+-ifeq ($(MAKECMDGOALS),xconfig)
++ifeq ($(MAKECMDGOALS),qconf)
  	qconf-target := 1
  endif
-+ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)
-+	qconf-target := 1
-+endif
-+
- ifeq ($(MAKECMDGOALS),gconfig)
+-ifeq ($(MAKECMDGOALS),gconfig)
++ifeq ($(MAKECMDGOALS),gconf)
  	gconf-target := 1
  endif
--
-+ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf)
-+	gconf-target := 1
-+endif
  
- ifeq ($(qconf-target),1)
- qconf-cxxobjs	:= qconf.o
diff --git a/support/kconfig/patches/08-make-write-deps.patch b/support/kconfig/patches/08-make-write-deps.patch
deleted file mode 100644
index e5a21c3861..0000000000
--- a/support/kconfig/patches/08-make-write-deps.patch
+++ /dev/null
@@ -1,139 +0,0 @@
----
- util.c |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 116 insertions(+), 1 deletion(-)
-
-Index: kconfig/util.c
-===================================================================
---- kconfig.orig/util.c
-+++ kconfig/util.c
-@@ -29,6 +29,121 @@
- 	return file;
- }
- 
-+static char* br2_symbol_printer(const char * const in)
-+{
-+	ssize_t i, j, len = strlen(in);
-+	char *ret;
-+	if (len < 1)
-+		return NULL;
-+	ret = malloc(len+1);
-+	if (!ret) {
-+		printf("Out of memory!");
-+		exit(1);
-+	}
-+	memset(ret, 0, len+1);
-+	i = j = 0;
-+	if (strncmp("BR2_", in, 4) == 0)
-+		i += 4;
-+	if (strncmp("PACKAGE_", in + i, 8) == 0)
-+		i += 8;
-+	else if (strncmp("TARGET_", in + i, 7) == 0)
-+		i += 7;
-+	while (i <= len)
-+		ret[j++] = tolower(in[i++]);
-+	return ret;
-+}
-+
-+/* write dependencies of the individual config-symbols */
-+static int write_make_deps(const char *name)
-+{
-+	char *str;
-+	char dir[PATH_MAX+1], buf[PATH_MAX+1], buf2[PATH_MAX+1];
-+	struct menu *menu;
-+	struct symbol *sym;
-+	struct property *prop, *p;
-+	unsigned done;
-+	const char * const name_tmp = "..make.deps.tmp";
-+	FILE *out;
-+	if (!name)
-+		name = ".auto.deps";
-+
-+	strcpy(dir, conf_get_configname());
-+	str = strrchr(dir, '/');
-+	if (str)
-+		str[1] = 0;
-+	else
-+		dir[0] = 0;
-+
-+	sprintf(buf, "%s%s", dir, name_tmp);
-+	out = fopen(buf, "w");
-+	if (!out)
-+		return 1;
-+	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-+		"# See support/kconfig/util.c write_make_deps()\n#\n");
-+	menu = &rootmenu;//rootmenu.list;
-+	while (menu) {
-+		sym = menu->sym;
-+		if (!sym) {
-+			if (!menu_is_visible(menu))
-+				goto next;
-+		} else if (!(sym->flags & SYMBOL_CHOICE)) {
-+			sym_calc_value(sym);
-+			if (sym->type == S_BOOLEAN
-+			    && sym_get_tristate_value(sym) != no) {
-+			    done = 0;
-+			    for_all_prompts(sym, prop) {
-+			        struct expr *e;
-+//printf("\nname=%s\n", sym->name);
-+			        for_all_properties(sym, p, P_SELECT) {
-+				    e = p->expr;
-+				    if (e && e->left.sym->name) {
-+				        if (!done) {
-+					    fprintf(out, "%s: $(BASE_TARGETS)", br2_symbol_printer(sym->name));
-+					    done = 1;
-+					}
-+//printf("SELECTS %s\n",e->left.sym->name);
-+					fprintf(out, " %s",br2_symbol_printer(e->left.sym->name));
-+				    }
-+				}
-+				if (done)
-+				    fprintf(out, "\n");
-+#if 0
-+				e = sym->rev_dep.expr;
-+				if (e && e->type == E_SYMBOL
-+					&& e->left.sym->name) {
-+				    fprintf(out, "%s: %s", br2_symbol_printer(e->left.sym->name),
-+						br2_symbol_printer(sym->name));
-+printf("%s is Selected BY: %s", sym->name, e->left.sym->name);
-+				}
-+#endif
-+			    }
-+			}
-+		}
-+next:
-+		if (menu->list) {
-+			menu = menu->list;
-+			continue;
-+		}
-+		if (menu->next)
-+			menu = menu->next;
-+		else while ((menu = menu->parent)) {
-+			if (menu->next) {
-+				menu = menu->next;
-+				break;
-+			}
-+		}
-+	}
-+	fclose(out);
-+	sprintf(buf2, "%s%s", dir, name);
-+	rename(buf, buf2);
-+	printf(_("#\n"
-+		 "# make dependencies written to %s\n"
-+		 "# ATTENTION buildroot devels!\n"
-+		 "# See top of this file before playing with this auto-preprequisites!\n"
-+		 "#\n"), name);
-+	return 0;
-+}
-+
- /* write a dependency file as used by kbuild to track dependencies */
- int file_write_dep(const char *name)
- {
-@@ -71,7 +186,7 @@
- 	fprintf(out, "\n$(deps_config): ;\n");
- 	fclose(out);
- 	rename("..config.tmp", name);
--	return 0;
-+	return write_make_deps(NULL);
- }
- 
- 
diff --git a/support/kconfig/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
index 3f09673b81..3b6eb898f8 100644
--- a/support/kconfig/patches/09-implement-kconfig-probability.patch
+++ b/support/kconfig/patches/09-implement-kconfig-probability.patch
@@ -2,11 +2,11 @@
  confdata.c |   22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)
 
-Index: config/confdata.c
+Index: kconfig/confdata.c
 ===================================================================
---- config.orig/confdata.c
-+++ config/confdata.c
-@@ -996,7 +996,16 @@
+--- kconfig.orig/confdata.c
++++ kconfig/confdata.c
+@@ -982,7 +982,16 @@
  void conf_set_all_new_symbols(enum conf_def_mode mode)
  {
  	struct symbol *sym, *csym;
@@ -24,7 +24,7 @@ Index: config/confdata.c
  
  	for_all_symbols(i, sym) {
  		if (sym_has_value(sym))
-@@ -1015,8 +1024,15 @@
+@@ -1001,8 +1010,15 @@
  				sym->def[S_DEF_USER].tri = no;
  				break;
  			case def_random:
diff --git a/support/kconfig/patches/12-fix-glade-file-path.patch b/support/kconfig/patches/12-fix-glade-file-path.patch
index 681dce160d..badfc91d81 100644
--- a/support/kconfig/patches/12-fix-glade-file-path.patch
+++ b/support/kconfig/patches/12-fix-glade-file-path.patch
@@ -6,7 +6,7 @@ Index: kconfig/gconf.c
 ===================================================================
 --- kconfig.orig/gconf.c
 +++ kconfig/gconf.c
-@@ -1521,7 +1521,7 @@
+@@ -1525,7 +1525,7 @@
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
  	if (env)
diff --git a/support/kconfig/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
index 9fa6384d31..8d76df2e65 100644
--- a/support/kconfig/patches/14-support-out-of-tree-config.patch
+++ b/support/kconfig/patches/14-support-out-of-tree-config.patch
@@ -4,10 +4,10 @@
  util.c     |   16 +++++++++++++--
  3 files changed, 61 insertions(+), 18 deletions(-)
 
-Index: config/conf.c
+Index: kconfig/conf.c
 ===================================================================
---- config.orig/conf.c
-+++ config/conf.c
+--- kconfig.orig/conf.c
++++ kconfig/conf.c
 @@ -503,7 +503,6 @@
  	}
  	name = av[optind];
@@ -16,10 +16,10 @@ Index: config/conf.c
  	if (sync_kconfig) {
  		name = conf_get_configname();
  		if (stat(name, &tmpstat)) {
-Index: config/confdata.c
+Index: kconfig/confdata.c
 ===================================================================
---- config.orig/confdata.c
-+++ config/confdata.c
+--- kconfig.orig/confdata.c
++++ kconfig/confdata.c
 @@ -71,9 +71,7 @@
  
  const char *conf_get_autoconfig_name(void)
@@ -31,8 +31,8 @@ Index: config/confdata.c
  }
  
  static char *conf_expand_value(const char *in)
-@@ -565,6 +563,9 @@
- 	int use_timestamp = 1;
+@@ -563,6 +561,9 @@
+ 	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
  	char *env;
  
 +	if (!name)
@@ -41,7 +41,7 @@ Index: config/confdata.c
  	dirname[0] = 0;
  	if (name && name[0]) {
  		struct stat st;
-@@ -671,6 +672,7 @@
+@@ -661,6 +662,7 @@
  {
  	const char *name;
  	char path[PATH_MAX+1];
@@ -49,7 +49,7 @@ Index: config/confdata.c
  	char *s, *d, c;
  	struct symbol *sym;
  	struct stat sb;
-@@ -679,8 +681,20 @@
+@@ -669,8 +671,20 @@
  	name = conf_get_autoconfig_name();
  	conf_read_simple(name, S_DEF_AUTO);
  
@@ -72,7 +72,7 @@ Index: config/confdata.c
  
  	res = 0;
  	for_all_symbols(i, sym) {
-@@ -773,9 +787,11 @@
+@@ -763,9 +777,11 @@
  		close(fd);
  	}
  out:
@@ -87,9 +87,9 @@ Index: config/confdata.c
  	return res;
  }
  
-@@ -787,25 +803,38 @@
+@@ -776,25 +792,38 @@
+ 	const char *name;
  	FILE *out, *tristate, *out_h;
- 	time_t now;
  	int i;
 +	char dir[PATH_MAX+1], buf[PATH_MAX+1];
 +	char *s;
@@ -130,7 +130,7 @@ Index: config/confdata.c
  	if (!out_h) {
  		fclose(out);
  		fclose(tristate);
-@@ -885,19 +914,22 @@
+@@ -871,19 +900,22 @@
  	name = getenv("KCONFIG_AUTOHEADER");
  	if (!name)
  		name = "include/generated/autoconf.h";
@@ -156,11 +156,11 @@ Index: config/confdata.c
  		return 1;
  
  	return 0;
-Index: config/util.c
+Index: kconfig/util.c
 ===================================================================
---- config.orig/util.c
-+++ config/util.c
-@@ -147,6 +147,8 @@
+--- kconfig.orig/util.c
++++ kconfig/util.c
+@@ -32,6 +32,8 @@
  /* write a dependency file as used by kbuild to track dependencies */
  int file_write_dep(const char *name)
  {
@@ -169,7 +169,7 @@ Index: config/util.c
  	struct symbol *sym, *env_sym;
  	struct expr *e;
  	struct file *file;
-@@ -154,7 +156,16 @@
+@@ -39,7 +41,16 @@
  
  	if (!name)
  		name = ".kconfig.d";
@@ -187,13 +187,13 @@ Index: config/util.c
  	if (!out)
  		return 1;
  	fprintf(out, "deps_config := \\\n");
-@@ -185,7 +196,8 @@
+@@ -70,7 +81,8 @@
  
  	fprintf(out, "\n$(deps_config): ;\n");
  	fclose(out);
 -	rename("..config.tmp", name);
 +	sprintf(buf2, "%s%s", dir, name);
 +	rename(buf, buf2);
- 	return write_make_deps(NULL);
+ 	return 0;
  }
  
diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series
index defdf58996..573911bdd3 100644
--- a/support/kconfig/patches/series
+++ b/support/kconfig/patches/series
@@ -1,9 +1,7 @@
 01-kconfig-kernel-to-buildroot.patch
 02-cpp-comments-to-c-comments.patch
 03-change-config-option-prefix.patch
-05-really-clean-everything.patch
 06-br-build-system-integration.patch
-08-make-write-deps.patch
 09-implement-kconfig-probability.patch
 10-br-build-system.patch
 11-use-mktemp-for-lxdialog.patch
diff --git a/support/kconfig/qconf.cc b/support/kconfig/qconf.cc
index 06dd2e3358..c2796b866f 100644
--- a/support/kconfig/qconf.cc
+++ b/support/kconfig/qconf.cc
@@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void)
 	QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
 	if (s.isNull())
 		return;
-	if (conf_write(QFile::encodeName(s)))
-		QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+	saveConfig();
 }
 
 void ConfigMainWindow::searchConfig(void)
@@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
 	mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
 	switch (mb.exec()) {
 	case QMessageBox::Yes:
-		conf_write(NULL);
+		saveConfig();
 	case QMessageBox::No:
 		e->accept();
 		break;
diff --git a/support/kconfig/streamline_config.pl b/support/kconfig/streamline_config.pl
index fd81fc33d6..a4fe923c01 100644
--- a/support/kconfig/streamline_config.pl
+++ b/support/kconfig/streamline_config.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copywrite 2005-2009 - Steven Rostedt
+# Copyright 2005-2009 - Steven Rostedt
 # Licensed under the terms of the GNU GPL License version 2
 #
 #  It's simple enough to figure out how this works.
diff --git a/support/kconfig/util.c b/support/kconfig/util.c
index 8a5efaa172..6edd8a3d12 100644
--- a/support/kconfig/util.c
+++ b/support/kconfig/util.c
@@ -29,121 +29,6 @@ struct file *file_lookup(const char *name)
 	return file;
 }
 
-static char* br2_symbol_printer(const char * const in)
-{
-	ssize_t i, j, len = strlen(in);
-	char *ret;
-	if (len < 1)
-		return NULL;
-	ret = malloc(len+1);
-	if (!ret) {
-		printf("Out of memory!");
-		exit(1);
-	}
-	memset(ret, 0, len+1);
-	i = j = 0;
-	if (strncmp("BR2_", in, 4) == 0)
-		i += 4;
-	if (strncmp("PACKAGE_", in + i, 8) == 0)
-		i += 8;
-	else if (strncmp("TARGET_", in + i, 7) == 0)
-		i += 7;
-	while (i <= len)
-		ret[j++] = tolower(in[i++]);
-	return ret;
-}
-
-/* write dependencies of the individual config-symbols */
-static int write_make_deps(const char *name)
-{
-	char *str;
-	char dir[PATH_MAX+1], buf[PATH_MAX+1], buf2[PATH_MAX+1];
-	struct menu *menu;
-	struct symbol *sym;
-	struct property *prop, *p;
-	unsigned done;
-	const char * const name_tmp = "..make.deps.tmp";
-	FILE *out;
-	if (!name)
-		name = ".auto.deps";
-
-	strcpy(dir, conf_get_configname());
-	str = strrchr(dir, '/');
-	if (str)
-		str[1] = 0;
-	else
-		dir[0] = 0;
-
-	sprintf(buf, "%s%s", dir, name_tmp);
-	out = fopen(buf, "w");
-	if (!out)
-		return 1;
-	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-		"# See support/kconfig/util.c write_make_deps()\n#\n");
-	menu = &rootmenu;//rootmenu.list;
-	while (menu) {
-		sym = menu->sym;
-		if (!sym) {
-			if (!menu_is_visible(menu))
-				goto next;
-		} else if (!(sym->flags & SYMBOL_CHOICE)) {
-			sym_calc_value(sym);
-			if (sym->type == S_BOOLEAN
-			    && sym_get_tristate_value(sym) != no) {
-			    done = 0;
-			    for_all_prompts(sym, prop) {
-			        struct expr *e;
-//printf("\nname=%s\n", sym->name);
-			        for_all_properties(sym, p, P_SELECT) {
-				    e = p->expr;
-				    if (e && e->left.sym->name) {
-				        if (!done) {
-					    fprintf(out, "%s: $(BASE_TARGETS)", br2_symbol_printer(sym->name));
-					    done = 1;
-					}
-//printf("SELECTS %s\n",e->left.sym->name);
-					fprintf(out, " %s",br2_symbol_printer(e->left.sym->name));
-				    }
-				}
-				if (done)
-				    fprintf(out, "\n");
-#if 0
-				e = sym->rev_dep.expr;
-				if (e && e->type == E_SYMBOL
-					&& e->left.sym->name) {
-				    fprintf(out, "%s: %s", br2_symbol_printer(e->left.sym->name),
-						br2_symbol_printer(sym->name));
-printf("%s is Selected BY: %s", sym->name, e->left.sym->name);
-				}
-#endif
-			    }
-			}
-		}
-next:
-		if (menu->list) {
-			menu = menu->list;
-			continue;
-		}
-		if (menu->next)
-			menu = menu->next;
-		else while ((menu = menu->parent)) {
-			if (menu->next) {
-				menu = menu->next;
-				break;
-			}
-		}
-	}
-	fclose(out);
-	sprintf(buf2, "%s%s", dir, name);
-	rename(buf, buf2);
-	printf(_("#\n"
-		 "# make dependencies written to %s\n"
-		 "# ATTENTION buildroot devels!\n"
-		 "# See top of this file before playing with this auto-preprequisites!\n"
-		 "#\n"), name);
-	return 0;
-}
-
 /* write a dependency file as used by kbuild to track dependencies */
 int file_write_dep(const char *name)
 {
@@ -198,7 +83,7 @@ int file_write_dep(const char *name)
 	fclose(out);
 	sprintf(buf2, "%s%s", dir, name);
 	rename(buf, buf2);
-	return write_make_deps(NULL);
+	return 0;
 }
 
 
diff --git a/support/kconfig/zconf.l b/support/kconfig/zconf.l
index 3dbaec185c..b22f884f90 100644
--- a/support/kconfig/zconf.l
+++ b/support/kconfig/zconf.l
@@ -294,11 +294,11 @@ void zconf_initscan(const char *name)
 
 	current_file = file_lookup(name);
 	current_file->lineno = 1;
-	current_file->flags = FILE_BUSY;
 }
 
 void zconf_nextfile(const char *name)
 {
+	struct file *iter;
 	struct file *file = file_lookup(name);
 	struct buffer *buf = malloc(sizeof(*buf));
 	memset(buf, 0, sizeof(*buf));
@@ -314,18 +314,25 @@ void zconf_nextfile(const char *name)
 	buf->parent = current_buf;
 	current_buf = buf;
 
-	if (file->flags & FILE_BUSY) {
-		printf("%s:%d: do not source '%s' from itself\n",
-		       zconf_curname(), zconf_lineno(), name);
-		exit(1);
-	}
-	if (file->flags & FILE_SCANNED) {
-		printf("%s:%d: file '%s' is already sourced from '%s'\n",
-		       zconf_curname(), zconf_lineno(), name,
-		       file->parent->name);
-		exit(1);
+	for (iter = current_file->parent; iter; iter = iter->parent ) {
+		if (!strcmp(current_file->name,iter->name) ) {
+			printf("%s:%d: recursive inclusion detected. "
+			       "Inclusion path:\n  current file : '%s'\n",
+			       zconf_curname(), zconf_lineno(),
+			       zconf_curname());
+			iter = current_file->parent;
+			while (iter && \
+			       strcmp(iter->name,current_file->name)) {
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno-1);
+				iter = iter->parent;
+			}
+			if (iter)
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno+1);
+			exit(1);
+		}
 	}
-	file->flags |= FILE_BUSY;
 	file->lineno = 1;
 	file->parent = current_file;
 	current_file = file;
@@ -335,8 +342,6 @@ static void zconf_endfile(void)
 {
 	struct buffer *parent;
 
-	current_file->flags |= FILE_SCANNED;
-	current_file->flags &= ~FILE_BUSY;
 	current_file = current_file->parent;
 
 	parent = current_buf->parent;

From d0880f70fa9c0cfa398dbb06011b4d3eb48bd263 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 15 Jan 2012 20:59:37 +0100
Subject: [PATCH 1185/6849] gcc-uclibc-4.x.mk: get rid of BR2_DEPENDS_DIR

Now that we have dropped the make-write-deps patch.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                        |  6 ++----
 toolchain/gcc/gcc-uclibc-4.x.mk | 13 -------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 242265f2cf..912012fa4f 100644
--- a/Makefile
+++ b/Makefile
@@ -278,8 +278,6 @@ TARGET_DIR:=$(BASE_DIR)/target
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_SKELETON=$(TOPDIR)/fs/skeleton
 
-BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
-
 ifeq ($(BR2_CCACHE),y)
 CCACHE:=$(HOST_DIR)/usr/bin/ccache
 CCACHE_CACHE_DIR=$(HOME)/.buildroot-ccache
@@ -360,7 +358,7 @@ HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
 $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
 dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
+	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 $(BASE_TARGETS): dirs $(O)/toolchainfile.cmake
 
@@ -391,7 +389,7 @@ $(O)/toolchainfile.cmake:
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
 	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
+	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 #############################################################
 #
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 3074799d99..5eb7505048 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -79,19 +79,6 @@ ifeq ($(BR2_GCC_CROSS_OBJC),y)
 GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
 endif
 
-GCC_COMMON_PREREQ=$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/install/objc*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/install/fortran*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/prefer/ima*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/toolchain/sysroot*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/use/sjlj/exceptions*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/shared/libgcc*)
-GCC_TARGET_PREREQ+=$(GCC_COMMON_PREREQ) \
-$(wildcard $(BR2_DEPENDS_DIR)/br2/extra/target/gcc/config/options*)
-GCC_STAGING_PREREQ+=$(GCC_COMMON_PREREQ) \
-$(wildcard $(BR2_DEPENDS_DIR)/br2/extra/gcc/config/options*)\
-$(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/cross/*)
-
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),c++
 endif

From 8c7c0ab34469ac7bfe1f5ccb9fc3c74c9ef0b4c7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Jan 2012 10:30:43 +0100
Subject: [PATCH 1186/6849] sane-backends: make libusb optional, add optional
 jpeg, tiff, avahi and snmp deps

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sane-backends/Config.in        |  1 -
 package/sane-backends/sane-backends.mk | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
index fb734358c5..03865d1bb1 100644
--- a/package/sane-backends/Config.in
+++ b/package/sane-backends/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SANE_BACKENDS
 	bool "sane-backends"
-	select BR2_PACKAGE_LIBUSB
 	help
 	  SANE - Scanner Access Now Easy
 
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 1188d187d1..d9f3690873 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -7,7 +7,30 @@ SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
 SANE_BACKENDS_SITE = ftp://ftp2.sane-project.org/pub/sane/sane-backends-$(SANE_BACKENDS_VERSION)
 
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
 SANE_BACKENDS_CONF_OPT += --enable-libusb_1_0
+else
+SANE_BACKENDS_CONF_OPT += --disable-libusb
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+SANE_BACKENDS_DEPENDENCIES += jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+SANE_BACKENDS_DEPENDENCIES += tiff
+endif
+
+ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy)
+SANE_BACKENDS_DEPENDENCIES += avahi
+SANE_BACKENDS_CONF_OPT += --enable-avahi
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+SANE_BACKENDS_DEPENDENCIES += netsnmp
+else
+SANE_BACKENDS_CONF_OPT += --without-snmp
+endif
 
 $(eval $(call AUTOTARGETS))

From 4861aed1f1fccd20bf092127b255562eaaf183c1 Mon Sep 17 00:00:00 2001
From: Frederik Pasch <fpasch@googlemail.com>
Date: Mon, 16 Jan 2012 13:54:57 +0100
Subject: [PATCH 1187/6849] setlocalversion: fix i18n issue with svn

Closes #4700

Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                         | 1 +
 support/scripts/setlocalversion | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8f6870baa3..19f6e7cd69 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@
 	#3403: libgpg-error: bump to version 1.10
 	#3409: libgpg-error: download from gnupg.org
 	#3421: nano: make tiny flag optional
+	#4700: setlocalversion not working for combination svn/ubuntu 11.10...
 
 2011.11, Released November 30th, 2011:
 
diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion
index 8d6fe909f9..a6edd7194c 100755
--- a/support/scripts/setlocalversion
+++ b/support/scripts/setlocalversion
@@ -56,9 +56,9 @@ if hgid=`hg id 2>/dev/null`; then
 fi
 
 # Check for svn and a svn repo.
-if rev=`LANG=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
+if rev=`LC_ALL=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
 	rev=`echo $rev | awk '{print $NF}'`
-	changes=`LANG=C svn status 2>/dev/null | grep '^[AMD]' | wc -l`
+	changes=`LC_ALL=C svn status 2>/dev/null | grep '^[AMD]' | wc -l`
 
 	# Are there uncommitted changes?
 	if [ $changes != 0 ]; then

From 9e42c6d04e43b562fc6683c34179426dff9d5a84 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 16 Jan 2012 16:04:35 +0100
Subject: [PATCH 1188/6849] ethtool: bump to 3.2

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 04f7dacf31..101d0a180d 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.1
+ETHTOOL_VERSION = 3.2
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 
 $(eval $(call AUTOTARGETS))

From cb749b51266bfcf8bbc0d249b75c3f653b808c67 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 16 Jan 2012 16:04:36 +0100
Subject: [PATCH 1189/6849] New package: kmod

[Peter: needs host-pkg-config]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      | 1 +
 package/kmod/Config.in | 7 +++++++
 package/kmod/kmod.mk   | 8 ++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 package/kmod/Config.in
 create mode 100644 package/kmod/kmod.mk

diff --git a/package/Config.in b/package/Config.in
index 8518f0641f..67b80948ec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -549,6 +549,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
 source "package/htop/Config.in"
+source "package/kmod/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/procps/Config.in"
diff --git a/package/kmod/Config.in b/package/kmod/Config.in
new file mode 100644
index 0000000000..f83237e2dd
--- /dev/null
+++ b/package/kmod/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KMOD
+	bool "kmod"
+	help
+	  handle kernel modules
+
+	  http://git.profusion.mobi/cgit.cgi/kmod.git/
+
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
new file mode 100644
index 0000000000..a7a5bf5168
--- /dev/null
+++ b/package/kmod/kmod.mk
@@ -0,0 +1,8 @@
+KMOD_VERSION = 3
+KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.bz2
+KMOD_SITE = http://git.profusion.mobi/cgit.cgi/kmod.git/snapshot
+KMOD_INSTALL_STAGING =YES
+KMOD_AUTORECONF = YES
+KMOD_DEPENDENCIES = host-pkg-config
+
+$(eval $(call AUTOTARGETS))

From 9ffd5ee4e96080051ff5a37c3dc376b0fe66699e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 18 Nov 2011 23:08:19 +0000
Subject: [PATCH 1190/6849] linux: remove default for custom kernel version

There already is a default kernel version, so it makes little sense to have
a default custom kernel version as well.  This default breaks the 'make
savedefconfig' if we want to force a specific version.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 6a40b20fd5..bbef487c93 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -58,7 +58,6 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "3.2.1"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"

From 723cc255f74321967df80a6ff821edad5a35830b Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Thu, 12 Jan 2012 15:03:02 +0100
Subject: [PATCH 1191/6849] Add package for open2300

Open2300 is a package of software tools that reads (and writes) data
from a Lacrosse WS2300/WS2305/WS2310/WS2315 Weather Station.

This package will install all the binaries on the target.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/open2300/Config.in   |  7 +++++++
 package/open2300/open2300.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/open2300/Config.in
 create mode 100644 package/open2300/open2300.mk

diff --git a/package/Config.in b/package/Config.in
index 67b80948ec..2e91427d0a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -195,6 +195,7 @@ source "package/memtester/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/ntfsprogs/Config.in"
+source "package/open2300/Config.in"
 source "package/openocd/Config.in"
 source "package/pciutils/Config.in"
 source "package/picocom/Config.in"
diff --git a/package/open2300/Config.in b/package/open2300/Config.in
new file mode 100644
index 0000000000..df0a969fa6
--- /dev/null
+++ b/package/open2300/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_OPEN2300
+	bool "open2300"
+	help
+	  open2300 reads (and writes) data from a Lacrosse
+	  WS2300/WS2305/WS2310/WS2315 Weather Station
+
+	  http://www.lavrsen.dk/foswiki/bin/view/Open2300/WebHome
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
new file mode 100644
index 0000000000..450b990514
--- /dev/null
+++ b/package/open2300/open2300.mk
@@ -0,0 +1,29 @@
+############################################################
+#
+# Open2300
+#
+############################################################
+
+OPEN2300_SITE        = http://www.lavrsen.dk/svn/open2300/trunk/
+OPEN2300_SITE_METHOD = svn
+OPEN2300_VERSION     = 12
+
+OPEN2300_BINS = open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \
+		histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300
+
+ifeq ($(BR2_PACKAGE_MYSQL),y)
+	OPEN2300_DEPENDENCIES += mysql_client
+	OPEN2300_BINS         += mysql2300 mysqlhistlog2300
+endif
+
+define OPEN2300_BUILD_CMDS
+	$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) $(OPEN2300_BINS)
+endef
+
+define OPEN2300_INSTALL_TARGET_CMDS
+	for prog in $(OPEN2300_BINS); do \
+		$(INSTALL) -D -m 0755 $(@D)/$$prog $(TARGET_DIR)/usr/bin/$$prog ; \
+	done
+endef
+
+$(eval $(call GENTARGETS))

From b65e08c5764305f0bef34426b9cce5d77d6ebc9f Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 17 Jan 2012 08:18:37 +0100
Subject: [PATCH 1192/6849] sane-backends: mention in help message which
 libraries may be selected

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sane-backends/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
index 03865d1bb1..04222fc6d8 100644
--- a/package/sane-backends/Config.in
+++ b/package/sane-backends/Config.in
@@ -4,3 +4,7 @@ config BR2_PACKAGE_SANE_BACKENDS
 	  SANE - Scanner Access Now Easy
 
 	  http://www.sane-project.org
+
+	  Backends are included automatically based on the libraries that have
+	  been selected: libusb, jpeg, tiff, avahi (with dbus and libglib2),
+	  and netsnmp.

From fcc7cd3c7b42a2ff829a0cf7d28894cff3a89660 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 Jan 2012 16:24:58 +0100
Subject: [PATCH 1193/6849] cairo: remove remaining host variables

host support was removed in 7b38fc20ba (cairo: remove host variant),
but it forgot to remove the HOST_CAIRO_CONF_OPT assignment.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/cairo.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 1746efff29..2230587bd0 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -79,12 +79,4 @@ else
 	CAIRO_CONF_OPT += --disable-svg
 endif
 
-HOST_CAIRO_CONF_OPT = \
-		--enable-ps \
-		--enable-pdf \
-		--enable-xlib \
-		--with-x \
-		--disable-png \
-		--disable-svg
-
 $(eval $(call AUTOTARGETS))

From bbc53fa8446a4106eb666310f19a9bfbd0b4f3c7 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:35 +0100
Subject: [PATCH 1194/6849] package: derive HOST_FOO_DEPENDENCIES from
 FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 10 ++++++++++
 package/Makefile.package.in   |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index c84afa0b19..495a075809 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -200,6 +200,16 @@ define AUTORECONF_HOOK
 	fi
 endef
 
+# This must be repeated from GENTARGETS_INNER, otherwise we get an empty
+# _DEPENDENCIES if _AUTORECONF is YES.  Also filter the result of _AUTORECONF
+# away from the non-host rule
+ifndef $(2)_DEPENDENCIES
+ ifdef $(3)_DEPENDENCIES
+  $(2)_DEPENDENCIES = $(filter-out host-automake host-autoconf host-libtool,\
+    $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
+ endif
+endif
+
 ifeq ($$($(2)_AUTORECONF),YES)
 $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK
 $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index e85eb15490..a27804b811 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -542,7 +542,12 @@ $(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
 endif
 endif
 
-$(2)_DEPENDENCIES		?=
+ifndef $(2)_DEPENDENCIES
+ ifdef $(3)_DEPENDENCIES
+  $(2)_DEPENDENCIES = $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
+ endif
+endif
+
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO
 $(2)_INSTALL_TARGET		?= YES

From 62939dbd289f0fdc5e45d607669caf3aeaab6fc1 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:36 +0100
Subject: [PATCH 1195/6849] atk: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index f0e96a5e39..d84d08cc40 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -52,8 +52,6 @@ endif
 
 ATK_DEPENDENCIES = libglib2 host-pkg-config
 
-HOST_ATK_DEPENDENCIES = host-libglib2 host-pkg-config
-
 HOST_ATK_CONF_OPT = \
 		--disable-glibtest
 

From 3b49bfe67631978be0b90dc91c867325a911532f Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:37 +0100
Subject: [PATCH 1196/6849] cramfs: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cramfs/cramfs.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 4a0ec1c797..57dbe40b5e 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -9,7 +9,6 @@ CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz
 CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs
 
 CRAMFS_DEPENDENCIES = zlib
-HOST_CRAMFS_DEPENDENCIES = host-zlib
 
 define CRAMFS_BUILD_CMDS
  $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)

From cfd73405e082ca2d955c689ebadacccc168530e0 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:38 +0100
Subject: [PATCH 1197/6849] libpng: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpng/libpng.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index d2aa3299f8..f78b61d874 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -10,8 +10,6 @@ LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkg-config zlib
 
-HOST_LIBPNG_DEPENDENCIES = host-pkg-config host-zlib
-
 define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
 		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \

From e7143fd26c57484c01a7fbdf013118ed81e3aea2 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:39 +0100
Subject: [PATCH 1198/6849] fontconfig: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fontconfig/fontconfig.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index fc6ad68d7a..39815edab5 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -22,7 +22,6 @@ FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \
 
 FONTCONFIG_DEPENDENCIES = freetype expat
 
-HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat
 HOST_FONTCONFIG_CONF_OPT = \
 		--disable-docs \
 		--disable-static

From c5afc3717c39e00e660cffdd0c3036a2df9d8c79 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:40 +0100
Subject: [PATCH 1199/6849] mpc: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpc/mpc.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 608c9f4a3b..e5ee4896f5 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -10,7 +10,6 @@ MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
 MPC_AUTORECONF = YES
 HOST_MPC_AUTORECONF = YES
-HOST_MPC_DEPENDENCIES = host-gmp host-mpfr
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 4b116eb0f2732c9a7e8f6885f3beca434623fc1e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:41 +0100
Subject: [PATCH 1200/6849] libxml-parser-perl: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml-parser-perl/libxml-parser-perl.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index ecc2cc9a93..9e6f2ecc85 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -8,7 +8,6 @@ LIBXML_PARSER_PERL_SOURCE:=XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
 LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/
 
 LIBXML_PARSER_PERL_DEPENDENCIES = expat
-HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat
 
 define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
  (cd $(@D) ; \

From c05f907d059224aa2f5127fae88b6d394da09203 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:42 +0100
Subject: [PATCH 1201/6849] squashfs3: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squashfs3/squashfs3.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 178543b864..81cdf79f53 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -3,7 +3,6 @@ SQUASHFS3_SOURCE=squashfs$(SQUASHFS3_VERSION).tar.gz
 SQUASHFS3_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
 
 SQUASHFS3_DEPENDENCIES = zlib
-HOST_SQUASHFS3_DEPENDENCIES = host-zlib
 
 define SQUASHFS3_BUILD_CMDS
  $(TARGET_MAKE_ENV) $(MAKE)    \

From 014f85f91bbf442af8a5a087a91ca0d5499c8b3e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:43 +0100
Subject: [PATCH 1202/6849] mpfr: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 7f335998c5..6876d6f18a 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -10,7 +10,6 @@ MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_INSTALL_STAGING = YES
 MPFR_DEPENDENCIES = gmp
 MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
-HOST_MPFR_DEPENDENCIES = host-gmp
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From f8245eb1952598d1c028ef3565def8550d6290aa Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:44 +0100
Subject: [PATCH 1203/6849] xapp_mkfontscale: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index a4218b0fd2..02e782452f 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -8,7 +8,6 @@ XAPP_MKFONTSCALE_VERSION = 1.0.7
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
-HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 89432d78bd30038a477c9ee9bcbabbf1e10d4366 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:45 +0100
Subject: [PATCH 1204/6849] xlib_libXdmcp: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 6f513cfa82..530820645a 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -10,7 +10,5 @@ XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
-HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From deae09e965de114e281b954714e26931b09c7a9f Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:46 +0100
Subject: [PATCH 1205/6849] xfont_encodings: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_encodings/xfont_encodings.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 8c4aac454e..3207b06522 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -9,7 +9,6 @@ XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_ENCODINGS_MAKE_OPT =
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
-HOST_XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From b52f9a6c5fe379f6a9850ee951840f971832dafe Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:47 +0100
Subject: [PATCH 1206/6849] xlib_libXfont: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXfont/xlib_libXfont.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 303992fcc8..2b47e4e58d 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -13,7 +13,6 @@ XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcac
 XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 
 HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
-HOST_XLIB_LIBXFONT_DEPENDENCIES = host-freetype host-xlib_libfontenc host-xlib_xtrans host-xproto_fontcacheproto host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 45ab97089242d6edd70c5da5190c38ff29ff2236 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:48 +0100
Subject: [PATCH 1207/6849] xlib_libXau: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXau/xlib_libXau.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index f7eb3bdec6..8d67501187 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -10,7 +10,5 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 
-HOST_XLIB_LIBXAU_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 70bef8e49504de24df85ea72cdbc9212a1539785 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:49 +0100
Subject: [PATCH 1208/6849] xapp_xkbcomp: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index f37d1062bd..f92588cb5b 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -8,7 +8,6 @@ XAPP_XKBCOMP_VERSION = 1.1.1
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
-HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 605d22042b69378588bb3642533a3d0e6ec3a013 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:50 +0100
Subject: [PATCH 1209/6849] libxcb: removed redundant HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index a68779dda5..3e15951fe3 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -17,10 +17,6 @@ LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
 	XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 LIBXCB_CONF_OPT = --disable-build-docs
 
-HOST_LIBXCB_DEPENDENCIES = \
-	host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp \
-	host-xlib_libXau host-python
-
 HOST_LIBXCB_CONF_OPT = --disable-build-docs
 
 $(eval $(call AUTOTARGETS))

From 2859aeb84ee1898b484f01f30313494eaa5ba0c4 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:51 +0100
Subject: [PATCH 1210/6849] xlib_libX11: removed redundant
 HOST_FOO_DEPENDENCIES and incorrect target dependency

By deriving HOST_XLIB_LIBX11_DEPENDENCIES from XLIB_LIBX11_DEPENDENCIES, it
turned out that that one had a redundant dependency on xproto_bigreqsproto.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index e017feabce..4d12a8449d 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -9,7 +9,7 @@ XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBX11_AUTORECONF = YES
 XLIB_LIBX11_INSTALL_STAGING = YES
-XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto host-xproto_xproto
+XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_xcmiscproto host-xproto_xproto
 XLIB_LIBX11_CONF_OPT = \
 	--disable-malloc0returnsnull \
 	--with-xcb \
@@ -19,8 +19,6 @@ XLIB_LIBX11_CONF_OPT = \
 HOST_XLIB_LIBX11_CONF_OPT = \
 	--disable-specs
 
-HOST_XLIB_LIBX11_DEPENDENCIES = host-xproto_xextproto host-libxcb host-xutil_util-macros host-xlib_xtrans host-xlib_libXau host-xlib_libXdmcp host-xproto_kbproto host-xproto_xproto host-xproto_xextproto host-xproto_inputproto host-xproto_xf86bigfontproto xproto_bigreqsproto host-xproto_xcmiscproto
-
 # src/util/makekeys is executed at build time to generate ks_tables.h, so
 # it should get compiled for the host. The libX11 makefile unfortunately
 # doesn't know about cross compilation so this doesn't work.

From ea8805eb74fb71854f674b16a1e0d70509fd2677 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:52 +0100
Subject: [PATCH 1211/6849] xapp_bdftopcf: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index c2d63354de..00ce3392a7 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -8,7 +8,6 @@ XAPP_BDFTOPCF_VERSION = 1.0.2
 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
-HOST_XAPP_BDFTOPCF_DEPENDENCIES = host-xlib_libXfont
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 8a1ee4db48bdd74abc1d0abfa144ff1f531f14c3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:53 +0100
Subject: [PATCH 1212/6849] xlib_libxkbfile: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index d80fa0fd98..b964593576 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -10,7 +10,5 @@ XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
-HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 0b109bd2bdc64425f099c9c7e0aca57d39708edd Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:54 +0100
Subject: [PATCH 1213/6849] xfont_font-util: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-util/xfont_font-util.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 680fdc7cbd..c5243ad391 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -11,7 +11,5 @@ XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
 XFONT_FONT_UTIL_INSTALL_STAGING = YES
 XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
-HOST_XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From efa734844b126a28a317d80a77d9e1b57e342c1b Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:55 +0100
Subject: [PATCH 1214/6849] xlib_libfontenc: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 948e244103..eef592a50e 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -10,7 +10,5 @@ XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
-HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 38faeafab7cf0272093ad996225b2f7dbdaa2d42 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 16 Jan 2012 14:58:56 +0100
Subject: [PATCH 1215/6849] xapp_mkfontdir: removed redundant
 HOST_FOO_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 3957ba6198..8047b21134 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -8,7 +8,6 @@ XAPP_MKFONTDIR_VERSION = 1.0.5
 XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
-HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 1b07928aa647074f790a01f0302f241391b5c923 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 15:54:55 +0100
Subject: [PATCH 1216/6849] Only derrive HOST_FOO_DEPENDENCIES from
 FOO_DEPENDENCIES if not set, not nonempty

In make, ifndef VAR means if 'VAR is not set to the empty string', and
NOT 'VAR is not defined', which meant that you couldn't specify empty
FOO_HOST_DEPENDENCIES.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 7 ++-----
 package/Makefile.package.in   | 6 +-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 495a075809..0f9b2c60f4 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -203,12 +203,9 @@ endef
 # This must be repeated from GENTARGETS_INNER, otherwise we get an empty
 # _DEPENDENCIES if _AUTORECONF is YES.  Also filter the result of _AUTORECONF
 # away from the non-host rule
-ifndef $(2)_DEPENDENCIES
- ifdef $(3)_DEPENDENCIES
-  $(2)_DEPENDENCIES = $(filter-out host-automake host-autoconf host-libtool,\
+$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool,\
     $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
- endif
-endif
+
 
 ifeq ($$($(2)_AUTORECONF),YES)
 $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index a27804b811..e57bfed1b6 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -542,11 +542,7 @@ $(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
 endif
 endif
 
-ifndef $(2)_DEPENDENCIES
- ifdef $(3)_DEPENDENCIES
-  $(2)_DEPENDENCIES = $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
- endif
-endif
+$(2)_DEPENDENCIES ?= $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
 
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO

From 1944b48a3f16c5d93bba46b7e353230c06f859fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 10:47:39 +0100
Subject: [PATCH 1217/6849] binutils: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 20de45a854..8632d67556 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -40,6 +40,8 @@ HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			$(BR2_CONFIGURE_STAGING_SYSROOT) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
+HOST_BINUTILS_DEPENDENCIES =
+
 # We just want libbfd and libiberty, not the full-blown binutils in staging
 define BINUTILS_INSTALL_STAGING_CMDS
 	$(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install

From 880438cba4b1ac8b4411618313b10fcd7581ff37 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 10:49:28 +0100
Subject: [PATCH 1218/6849] bison: remove redundant HOST_M4_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index c277e96ad0..a1de39aa79 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -16,7 +16,5 @@ endef
 
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
-HOST_BISON_DEPENDENCIES += host-m4
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From fcf418180a5200ac347f980a3e01a3f5a42cf321 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 10:50:28 +0100
Subject: [PATCH 1219/6849] cdrkit: remove redundant HOST_CDRKIT_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cdrkit/cdrkit.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index fc22c18865..a060b0334b 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -7,7 +7,6 @@
 CDRKIT_VERSION = 1.1.11
 CDRKIT_SITE = http://www.cdrkit.org/releases
 CDRKIT_DEPENDENCIES = libcap bzip2 zlib
-HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib
 
 ifeq ($(BR2_ENDIAN),"BIG")
 CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1

From 9e7663e2992032d8fe2b5e8b7c6041e7a1028f31 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 10:55:36 +0100
Subject: [PATCH 1220/6849] e2fsprogs: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index cf9b089629..d945a12263 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -28,6 +28,8 @@ E2FSPROGS_MAKE_OPT = \
 define HOST_E2FSPROGS_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
 endef
+# we don't have a host-util-linux
+HOST_E2FSPROGS_DEPENDENCIES = host-pkg-config
 
 # binaries to keep or remove
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks

From f009b7b93eb0bb4d766f1b0da78ba9d1bdd94bd3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:15:24 +0100
Subject: [PATCH 1221/6849] flex: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/flex.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index df1b4201bf..041aba8abe 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -14,6 +14,8 @@ FLEX_INSTALL_STAGING = YES
 FLEX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBINTL),libintl)
+# we don't have a host-gettext/libintl
+HOST_FLEX_DEPENDENCIES =
 
 # lex -> flex
 define FLEX_INSTALL_LEX

From 12b199c0c268e9558901bf96c455e2bb2f9c7549 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:17:26 +0100
Subject: [PATCH 1222/6849] gawk: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/gawk.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 7fd85eea4d..f1a6472101 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -13,6 +13,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
+# we don't have a host-busybox
+HOST_GAWK_DEPENDENCIES =
+
 define GAWK_CREATE_SYMLINK
 	ln -sf /usr/bin/gawk $(TARGET_DIR)/usr/bin/awk
 endef

From 66382bac307bdf5eefdbf59688f66f493093d03f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:20:01 +0100
Subject: [PATCH 1223/6849] icu: unbreak host build after auto-host-deps change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/icu/icu.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index bf0663ced3..d4c220bad6 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -8,6 +8,7 @@ ICU_VERSION = 4.4.2
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_DEPENDENCIES = host-icu
+HOST_ICU_DEPENDENCIES =
 ICU_INSTALL_STAGING = YES
 ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
 		--disable-tests

From 24c0ee47f0fe00483c89f74c87e5a53e7dae89f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:22:36 +0100
Subject: [PATCH 1224/6849] libcap: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap/libcap.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 9d6acf2e38..4683121c51 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -10,6 +10,7 @@ LIBCAP_VERSION = 2.22
 LIBCAP_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libc/libcap2
 LIBCAP_SOURCE = libcap2_$(LIBCAP_VERSION).orig.tar.gz
 LIBCAP_DEPENDENCIES = host-libcap
+HOST_LIBCAP_DEPENDENCIES =
 LIBCAP_INSTALL_STAGING = YES
 
 define LIBCAP_BUILD_CMDS

From db8fcd04ba94ce8b2916c624a8231d6505beb301 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:26:20 +0100
Subject: [PATCH 1225/6849] libxslt: cleanup

get rid of unused EXTRA variables.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxslt/libxslt.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index fec85f023c..2a1730e94c 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -8,18 +8,18 @@ LIBXSLT_VERSION = 1.1.26
 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
 LIBXSLT_INSTALL_STAGING = YES
 
+LIBXSLT_CONF_OPT = --with-gnu-ld --without-debug \
+		--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
+
+LIBXSLT_DEPENDENCIES = libxml2
+
 # If we have enabled libgcrypt then use it, else disable crypto support.
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-LIBXSLT_DEPENDENCIES_EXTRA=libgcrypt
+LIBXSLT_DEPENDENCIES += libgcrypt
 else
-LIBXSLT_XTRA_CONF_OPT = --without-crypto
+LIBXSLT_CONF_OPT = --without-crypto
 endif
 
-LIBXSLT_CONF_OPT = --with-gnu-ld $(LIBXSLT_XTRA_CONF_OPT) --without-debug \
-		--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
-
-LIBXSLT_DEPENDENCIES = libxml2 $(LIBXSLT_DEPENDENCIES_EXTRA)
-
 HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto
 
 HOST_LIBXSLT_DEPENDENCIES = host-libxml2

From 79f7d48fb7440a2dbb54e90a0090243ff5173313 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:29:51 +0100
Subject: [PATCH 1226/6849] ncurses: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index a1353ed6c2..eb8a043fd8 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -130,6 +130,8 @@ define HOST_NCURSES_BUILD_CMDS
 	$(MAKE) -C $(@D)/progs tic
 endef
 
+HOST_NCURSES_DEPENDENCIES =
+
 HOST_NCURSES_CONF_OPT = \
 	--without-shared --without-gpm
 

From 7adabb75c78ed4624aa331cdaffebe716ed38602 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:31:36 +0100
Subject: [PATCH 1227/6849] orc: unbreak host build after auto-host-deps change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/orc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 97c80f29e9..6602e36cd5 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -7,6 +7,7 @@ ORC_VERSION = 0.4.14
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_INSTALL_STAGING = YES
 ORC_DEPENDENCIES = host-orc
+HOST_ORC_DEPENDENCIES =
 
 define ORC_REMOVE_BUGREPORT
 	rm -f $(TARGET_DIR)/usr/bin/orc-bugreport

From a7544cf97e63fb07a86a834873fb8df7709e18ab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:32:33 +0100
Subject: [PATCH 1228/6849] pkg-config: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-config/pkg-config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index f347a53079..137800cedb 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -17,6 +17,7 @@ HOST_PKG_CONFIG_CONF_OPT = \
 		--disable-static
 
 HOST_PKG_CONFIG_AUTORECONF = YES
+HOST_PKG_CONFIG_DEPENDENCIES =
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From bbb3879666ab06e8d1bbd853496d56ff2ba9e7ec Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:33:41 +0100
Subject: [PATCH 1229/6849] python-setuptools: remove redundant
 HOST_PYTHON_SETUPTOOLS_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-setuptools/python-setuptools.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index b75987bad7..70ebb85a74 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -8,8 +8,6 @@ PYTHON_SETUPTOOLS_VERSION = 0.6c11
 PYTHON_SETUPTOOLS_SOURCE  = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
 PYTHON_SETUPTOOLS_SITE    = http://pypi.python.org/packages/source/s/setuptools
 PYTHON_SETUPTOOLS_DEPENDENCIES = python
-HOST_PYTHON_SETUPTOOLS_DEPENDENCIES = host-python
-
 
 define HOST_PYTHON_SETUPTOOLS_BUILD_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)

From ef52202c15af9fe9e24f7722ee51974e72e0612c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:35:02 +0100
Subject: [PATCH 1230/6849] ruby: unbreak host build after auto-host-deps
 change

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 26db93121a..c984d67ed9 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -9,6 +9,7 @@ RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_AUTORECONF = YES
 HOST_RUBY_AUTORECONF = YES
 RUBY_DEPENDENCIES = host-ruby
+HOST_RUBY_DEPENDENCIES =
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
 HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline

From 9e896860ae7c5ebecd2e5dc4e0ac1734526e1916 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:41:57 +0100
Subject: [PATCH 1231/6849] xapp_xcursorgen: remove redundant
 HOST_XAPP_XCURSORGEN_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 2634fd5c81..f191ecbd72 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -9,7 +9,5 @@ XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
-HOST_XAPP_XCURSORGEN_DEPENDENCIES = host-libpng host-xlib_libX11 host-xlib_libXcursor
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From c601f4661f217510b2fefb72c35b61871ccff1e6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:44:15 +0100
Subject: [PATCH 1232/6849] xfont_encodings: cleanup

MAKE_OPT defaults to the empty string, so drop it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_encodings/xfont_encodings.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 3207b06522..ead8ace71b 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -7,7 +7,6 @@
 XFONT_ENCODINGS_VERSION = 1.0.3
 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_ENCODINGS_MAKE_OPT =
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS))

From 97fc987c5f437e7fd42779407a8efaaf3702a303 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:47:03 +0100
Subject: [PATCH 1233/6849] xlib_libXcursor: remove redundant
 HOST_XLIB_LIBXCURSOR_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 3c72bbbfe8..d12520a1ed 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -10,7 +10,5 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
-HOST_XLIB_LIBXCURSOR_DEPENDENCIES = host-xlib_libX11 host-xlib_libXfixes host-xlib_libXrender host-xproto_xproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 0b3daf7849422785696fe197d91631cf9838d1df Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:49:52 +0100
Subject: [PATCH 1234/6849] xlib_libXfixes: remove redundant
 HOST_XLIB_LIBXFIXES_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 2d8b7fa8bc..2db9b36128 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -10,7 +10,5 @@ XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
-HOST_XLIB_LIBXFIXES_DEPENDENCIES = host-xproto_fixesproto host-xlib_libX11 host-xproto_xextproto host-xproto_xproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 8ab51b67a856e3513eb11e44cdff395a92b92c6e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:52:12 +0100
Subject: [PATCH 1235/6849] xlib_libXrender: remove redundant
 HOST_XLIB_LIBXRENDER_DEPENDENCIES

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 9a2abe3e64..7a0a45e4e1 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -11,7 +11,5 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
 
-HOST_XLIB_LIBXRENDER_DEPENDENCIES = host-xlib_libX11 host-xproto_renderproto host-xproto_xproto
-
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From a058d3415157b686127ca524b2f71f9bd93edf74 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 11:54:03 +0100
Subject: [PATCH 1236/6849] xutil_makedepend: cleanup, fix target deps

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xutil_makedepend/xutil_makedepend.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 5c7bfd3d60..a69d21f59a 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -7,10 +7,8 @@
 XUTIL_MAKEDEPEND_VERSION = 1.0.2
 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2
 XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
-XUTIL_MAKEDEPEND_INSTALL_STAGING = NO
-XUTIL_MAKEDEPEND_INSTALL_TARGET = YES
 
-HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto_xproto
+XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 2e913392dfbef405ecc194bf5f47803e17629045 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Jan 2012 19:14:42 +0100
Subject: [PATCH 1237/6849] kernel-headers: bump 3.1.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index cf2ac4e6c6..36bb719900 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -61,7 +61,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.17"	if BR2_KERNEL_HEADERS_3_0
-	default "3.1.9"		if BR2_KERNEL_HEADERS_3_1
+	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.1"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From f05c8a432c1e009b3dd03aab5d957bcc3b70e790 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 19 Jan 2012 09:41:57 +0100
Subject: [PATCH 1238/6849] libxslt: fix typo from db8fcd04ba94ce8 (libxslt:
 cleanup)

--without-crypto should be appended to the configure opts, not replace them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxslt/libxslt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 2a1730e94c..15b6e6aa9b 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -17,7 +17,7 @@ LIBXSLT_DEPENDENCIES = libxml2
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 LIBXSLT_DEPENDENCIES += libgcrypt
 else
-LIBXSLT_CONF_OPT = --without-crypto
+LIBXSLT_CONF_OPT += --without-crypto
 endif
 
 HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto

From 95632704cd966b32c3391aa732eaad10d24fe0fb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 19 Jan 2012 12:25:22 +0100
Subject: [PATCH 1239/6849] kmod: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index a7a5bf5168..0e3bc3404a 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,8 +1,7 @@
-KMOD_VERSION = 3
-KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.bz2
-KMOD_SITE = http://git.profusion.mobi/cgit.cgi/kmod.git/snapshot
-KMOD_INSTALL_STAGING =YES
-KMOD_AUTORECONF = YES
+KMOD_VERSION = 4
+KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
+KMOD_SITE = http://packages.profusion.mobi/kmod/
+KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS))

From b367ca32e53a774c174899e44c77ed1d128cbcdc Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 19 Jan 2012 13:22:08 +0100
Subject: [PATCH 1240/6849] bash: Adding features that can not be automatically
 detected while cross-compiling

There are some bash features that can not be detected automatically during
configure stage while cross-compiling. This commit forces them on.

Signed-off-by: Arkady Gilinsky <arcadyg@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bash/bash.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index f1f951c3ab..44f9337750 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -7,7 +7,11 @@
 BASH_VERSION = 4.2
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
 BASH_DEPENDENCIES = ncurses
-BASH_CONF_ENV = bash_cv_job_control_missing=no
+BASH_CONF_ENV +=                       \
+   bash_cv_job_control_missing=present \
+   bash_cv_sys_named_pipes=present     \
+   bash_cv_func_sigsetjmp=present      \
+   bash_cv_printf_a_format=yes
 
 # Make sure we build after busybox so that /bin/sh links to bash
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From f076d71d3bf201f0911bc574e7d61e79a652ff86 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 20 Jan 2012 15:49:58 +0100
Subject: [PATCH 1241/6849] open2300: quote TARGET_{CC,LD}

TARGET_CC / TARGET_LD may contain spaces (E.G. when ccache is used), so
ensure they are properly quoted when passed to make.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/open2300/open2300.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index 450b990514..59be66f581 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -17,7 +17,7 @@ ifeq ($(BR2_PACKAGE_MYSQL),y)
 endif
 
 define OPEN2300_BUILD_CMDS
-	$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) $(OPEN2300_BINS)
+	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) $(OPEN2300_BINS)
 endef
 
 define OPEN2300_INSTALL_TARGET_CMDS

From 3c5be770be0bab1975af3d908299f6c46d83fab1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 16:30:45 +0100
Subject: [PATCH 1242/6849] libv4l: bump version

Jpeg decompression is now done using libjpeg.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/libv4l.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 4df64fc7bb..dbd8769fc3 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -3,11 +3,12 @@
 # libv4l
 #
 #############################################################
-LIBV4L_VERSION = 0.8.3
+LIBV4L_VERSION = 0.8.5
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils/
 LIBV4L_INSTALL_STAGING = YES
 LIBV4L_MAKE_OPTS = PREFIX=/usr
+LIBV4L_DEPENDENCIES = jpeg
 
 LIBV4L_DIRS_y += lib
 LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_DECODE_TM6000)	+= utils/decode_tm6000

From b66293db17a2378b6934225b5fd11613da88c407 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 16:31:46 +0100
Subject: [PATCH 1243/6849] libv4l: move under Libraries/Hardware handling

The libv4 package mainly provides a library, so it makes more sense to
locate it here.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 2e91427d0a..f219e37ce7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -185,7 +185,6 @@ source "package/input-tools/Config.in"
 source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
-source "package/libv4l/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lsuio/Config.in"
 source "package/lvm2/Config.in"
@@ -325,6 +324,7 @@ source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
+source "package/libv4l/Config.in"
 endmenu
 
 menu "Javascript"

From 0376a2bc112107434eeedac0dd1b5220e503ec6e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 21:08:15 +0100
Subject: [PATCH 1244/6849] sane-backends: fix libv4l dependency

Patch from Fedora.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sane-backends-1.0.22-v4l.patch            | 66 +++++++++++++++++++
 package/sane-backends/sane-backends.mk        |  4 ++
 2 files changed, 70 insertions(+)
 create mode 100644 package/sane-backends/sane-backends-1.0.22-v4l.patch

diff --git a/package/sane-backends/sane-backends-1.0.22-v4l.patch b/package/sane-backends/sane-backends-1.0.22-v4l.patch
new file mode 100644
index 0000000000..e9bdd20236
--- /dev/null
+++ b/package/sane-backends/sane-backends-1.0.22-v4l.patch
@@ -0,0 +1,66 @@
+From Fedora git: http://pkgs.fedoraproject.org/gitweb/?p=sane-backends.git;a=blob;f=sane-backends-1.0.22-v4l.patch;hb=4c4b8135b896ef9f00b926ce5f435ae5c9b156d5
+
+From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 14 Mar 2011 13:35:05 +0100
+Subject: [PATCH] patch: v4l
+
+Squashed commit of the following:
+
+commit 23381932c76846191b42a48e505b37cd74711265
+Author: Julien BLACHE <jb@jblache.org>
+Date:   Wed Feb 16 19:37:43 2011 +0100
+
+    Fix v4l build with libv4l 0.8.3+
+
+    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
+
+    Conflicts:
+
+    	ChangeLog
+
+    Signed-off-by: Nils Philippsen <nils@redhat.com>
+---
+ backend/v4l.c |    3 +--
+ backend/v4l.h |    3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
++++ b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #include "../include/sane/sanei_config.h"
+ #define V4L_CONFIG_FILE "v4l.conf"
+ 
+-#include "v4l.h"
+-
+ #include <libv4l1.h>
++#include "v4l.h"
+ 
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586 100644
+--- a/backend/v4l.h
++++ b/backend/v4l.h
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+ 
++#ifndef __LINUX_VIDEODEV_H
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+ 
+@@ -165,7 +166,7 @@ struct video_channel
+ 
+ 
+ /* end of kernel interface */
+-
++#endif /* !__LINUX_VIDEODEV_H */
+ 
+ #include <../include/sane/sane.h>
+ 
+-- 
+1.7.4
+
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index d9f3690873..621cff577c 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_TIFF),y)
 SANE_BACKENDS_DEPENDENCIES += tiff
 endif
 
+ifeq ($(BR2_PACKAGE_LIBV4L),y)
+SANE_BACKENDS_DEPENDENCIES += libv4l
+endif
+
 ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy)
 SANE_BACKENDS_DEPENDENCIES += avahi
 SANE_BACKENDS_CONF_OPT += --enable-avahi

From e098308f8dbc013c9749cc242fe5be0d23c882b0 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 18 Jan 2012 10:31:31 +0100
Subject: [PATCH 1245/6849] iw: bump to 3.3

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index d89fc6c400..38bb125688 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,8 +4,9 @@
 #
 #############################################################
 
-IW_VERSION = a82abc2cac9dea7def53070565201145c76c8c6c
-IW_SITE = git://git.sipsolutions.net/iw.git
+IW_VERSION = 3.3
+IW_SOURCE = iw-$(IW_VERSION).tar.bz2
+IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl
 IW_CONFIG = $(IW_DIR)/.config
 IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \

From 42c675281afd039f6c5423c114eab69889906697 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 20 Jan 2012 16:14:22 -0300
Subject: [PATCH 1246/6849] libidn: bump to version 1.24

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libidn/libidn.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 470886211d..935240bd65 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-LIBIDN_VERSION = 1.19
-LIBIDN_SITE = http://ftp.gnu.org/gnu/libidn/
+LIBIDN_VERSION = 1.24
+LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"
 LIBIDN_CONF_OPT = --disable-java --enable-csharp=no

From 6d8abaf9f13d9ec9358ca6be2fc9986d2d13d251 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 20 Jan 2012 16:14:23 -0300
Subject: [PATCH 1247/6849] openssl: security bump to version 1.0.0g

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 0354f586da..cb29fe459d 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0f
+OPENSSL_VERSION = 1.0.0g
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From 95375f81f7abf539864a1dfdf6b81dc64e92c5ed Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 22:45:52 +0100
Subject: [PATCH 1248/6849] ctng: use internal toolchain uClibc config, build
 uClibc 0.9.32

So the uClibc configurations are kept in sync between the two toolchain
methods.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../crosstool-ng.config-uClibc                |   6 +-
 .../toolchain-crosstool-ng/crosstool-ng.mk    |   2 +-
 .../toolchain-crosstool-ng/uClibc.config      | 246 ------------------
 3 files changed, 4 insertions(+), 250 deletions(-)
 delete mode 100644 toolchain/toolchain-crosstool-ng/uClibc.config

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 7f7b3e2553..50603c6625 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -301,11 +301,11 @@ CT_CC_GCC_LDBL_128=m
 # C-library
 #
 CT_LIBC="uClibc"
-CT_LIBC_VERSION="0.9.30.3"
+CT_LIBC_VERSION="0.9.32"
 CT_LIBC_uClibc=y
 CT_LIBC_uClibc_AVAILABLE=y
-# CT_LIBC_UCLIBC_V_0_9_32 is not set
-CT_LIBC_UCLIBC_V_0_9_30_3=y
+CT_LIBC_UCLIBC_V_0_9_32=y
+#CT_LIBC_UCLIBC_V_0_9_30_3 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_2 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_1 is not set
 # CT_LIBC_UCLIBC_V_0_9_30 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 3a205dd873..a316cddcbb 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -10,7 +10,7 @@
 
 CTNG_DIR := $(BUILD_DIR)/build-toolchain
 
-CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/toolchain-crosstool-ng/uClibc.config
+CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/uClibc/uClibc-0.9.32.config
 CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 
 # Hack! ct-ng is in fact a Makefile script. As such, it accepts all
diff --git a/toolchain/toolchain-crosstool-ng/uClibc.config b/toolchain/toolchain-crosstool-ng/uClibc.config
deleted file mode 100644
index 76a3427460..0000000000
--- a/toolchain/toolchain-crosstool-ng/uClibc.config
+++ /dev/null
@@ -1,246 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.30
-# Fri Nov 21 09:26:34 2008
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-TARGET_x86_64=y
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="x86_64"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_ARM_OABI is not set
-# CONFIG_ARM_EABI is not set
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_CORTEX_M3 is not set
-# CONFIG_ARM_CORTEX_M1 is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-# ARCH_WANTS_BIG_ENDIAN is not set
-# ARCH_WANTS_LITTLE_ENDIAN is not set
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-UCLIBC_HAS_FENV=y
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-UCLIBC_STATIC_LDCONFIG=y
-# LDSO_RUNPATH is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-# MALLOC_GLIBC_COMPAT is not set
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_24=y
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-# UCLIBC_BSD_SPECIFIC is not set
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-UCLIBC_HAS_CTYPE_ENFORCED=y
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
-# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-# UCLIBC_HAS_WORDEXP is not set
-# UCLIBC_HAS_FTW is not set
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"
-RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/"
-DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/"
-
-#
-# Security options
-#
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-# DOSTRIP is not set
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

From 5fd3015c7e20889e9c81c1e893620c8eef8347f8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 22:53:19 +0100
Subject: [PATCH 1249/6849] ctng: use 3.0.4 kernel headers

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc | 6 +++---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc  | 6 +++---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 682afb112e..ffe85dfe3f 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -168,15 +168,15 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.39.4"
+CT_KERNEL_VERSION="3.0.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_V_3_0_4 is not set
+CT_KERNEL_V_3_0_4=y
 # CT_KERNEL_V_3_0_3 is not set
 # CT_KERNEL_V_3_0_2 is not set
 # CT_KERNEL_V_3_0_1 is not set
 # CT_KERNEL_V_3_0 is not set
-CT_KERNEL_V_2_6_39_4=y
+# CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 8fb90b8540..35c464aaf6 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -168,15 +168,15 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.39.4"
+CT_KERNEL_VERSION="3.0.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_V_3_0_4 is not set
+CT_KERNEL_V_3_0_4=y
 # CT_KERNEL_V_3_0_3 is not set
 # CT_KERNEL_V_3_0_2 is not set
 # CT_KERNEL_V_3_0_1 is not set
 # CT_KERNEL_V_3_0 is not set
-CT_KERNEL_V_2_6_39_4=y
+# CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 50603c6625..dcc0527cbe 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -168,16 +168,16 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.8"
+CT_KERNEL_VERSION="3.0.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_V_3_0_4 is not set
+CT_KERNEL_V_3_0_4=y
 # CT_KERNEL_V_3_0_3 is not set
 # CT_KERNEL_V_3_0_2 is not set
 # CT_KERNEL_V_3_0_1 is not set
 # CT_KERNEL_V_3_0 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
-CT_KERNEL_V_2_6_38_8=y
+# CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
 # CT_KERNEL_V_2_6_35_14 is not set

From 5c8747d2c426323aabbbe07a34b2796bdfb68ca7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 22:54:58 +0100
Subject: [PATCH 1250/6849] ctng: use gcc 4.4.6

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc | 6 +++---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc  | 6 +++---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index ffe85dfe3f..c1ab6793fa 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -230,12 +230,12 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C compiler
 #
 CT_CC="gcc"
-CT_CC_VERSION="4.4.3"
+CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
-# CT_CC_V_4_4_6 is not set
+CT_CC_V_4_4_6=y
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
-CT_CC_V_4_4_3=y
+# CT_CC_V_4_4_3 is not set
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 35c464aaf6..4a555c7acc 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -230,12 +230,12 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C compiler
 #
 CT_CC="gcc"
-CT_CC_VERSION="4.4.3"
+CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
-# CT_CC_V_4_4_6 is not set
+CT_CC_V_4_4_6=y
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
-CT_CC_V_4_4_3=y
+# CT_CC_V_4_4_3 is not set
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index dcc0527cbe..0e442f0023 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -229,12 +229,12 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C compiler
 #
 CT_CC="gcc"
-CT_CC_VERSION="4.4.3"
+CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
-# CT_CC_V_4_4_6 is not set
+CT_CC_V_4_4_6=y
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
-CT_CC_V_4_4_3=y
+# CT_CC_V_4_4_4_3 is not set
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set

From 48558c83cbc961dac6e4a51cc202a98374436fbe Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 21 Jan 2012 22:39:34 +0100
Subject: [PATCH 1251/6849] syslinux: bump to version 4.04

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/syslinux/syslinux-3.85-makefile.patch | 17 -----------------
 boot/syslinux/syslinux.mk                  |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 boot/syslinux/syslinux-3.85-makefile.patch

diff --git a/boot/syslinux/syslinux-3.85-makefile.patch b/boot/syslinux/syslinux-3.85-makefile.patch
deleted file mode 100644
index ff85b8dc9f..0000000000
--- a/boot/syslinux/syslinux-3.85-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: syslinux-3.85/Makefile
-===================================================================
---- syslinux-3.85.orig/Makefile
-+++ syslinux-3.85/Makefile
-@@ -43,7 +43,7 @@
- 	mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
- 	mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
- 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
--	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
-+	gpxe/gpxelinux.0 dos/syslinux.com \
- 	dosutil/*.com dosutil/*.sys \
- 	$(MODULES)
- 
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index fa5af07014..da30d5a203 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-SYSLINUX_VERSION = 3.85
+SYSLINUX_VERSION = 4.04
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
-SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
+SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
 
 SYSLINUX_INSTALL_TARGET = NO
 SYSLINUX_INSTALL_IMAGES = YES

From d0252d7e39bd8c0b536c53f018661cb56cefb9f6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 21 Jan 2012 22:52:39 +0100
Subject: [PATCH 1252/6849] pkg-infra: fix missing 3993 for AUTOTARGET's SUBDIR

Ensure <pkg>_SUBDIR gets resolved late, so that E.G. the default values
for host packages are taken into consideration.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 0f9b2c60f4..64e0730b8a 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -93,7 +93,7 @@ $(2)_CLEAN_OPT			?= clean
 $(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall
 $(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall
 
-$(2)_SRCDIR                     = $$($(2)_DIR)/$($(2)_SUBDIR)
+$(2)_SRCDIR                     = $$($(2)_DIR)/$$($(2)_SUBDIR)
 
 #
 # Configure step. Only define it if not already defined by the package

From 4e20ad196d33d957541ac11b3a460ac2971cdc0e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 22 Jan 2012 13:04:16 +0100
Subject: [PATCH 1253/6849] ffmpeg: depends on host-nasm if MMX is enabled

[Peter: slightly reordered]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 38f04aafc7..dc572de900 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -123,9 +123,14 @@ else
 FFMPEG_CONF_OPT += --disable-zlib
 endif
 
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
 # MMX on is default for x86, disable it for lowly x86-type processors
 ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
 FFMPEG_CONF_OPT += --disable-mmx
+else
+# If it is enabled, nasm is required
+FFMPEG_DEPENDENCIES += host-nasm
+endif
 endif
 
 # ARM defaults to v5: clear if less, add extra if more

From c847b4a63993d48482a406471b5ebd89ee79453a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Jan 2012 23:48:36 +0100
Subject: [PATCH 1254/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 19f6e7cd69..6b893cd672 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,35 +2,49 @@
 
 	Fixes all over the tree and new features.
 
-	Toolchain: Default to GCC 4.5.x, add binutils 2.22.
+	Toolchain: Default to GCC 4.5.x, add binutils 2.22. Java
+	support removed, Powerpc SPE ABI support.
 
 	Gentargets: scp and mercurial support.
+	Autotools: derrive host dependencies from target by default.
 
-	defconfigs: qemu configs for x86-64 and sparc.
+	defconfigs: qemu configs for x86-64, mips and sparc.
 
 	uClibc: remove 0.9.30, backport unshare() support, add
-	0.9.32.1.
+	0.9.32.1, use same config for ctng.
 
-	Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions.
+	Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions,
+	Barebox: add 2012.01, remove 2011.10.
 
 	Buildroot now calls the stop function of scripts in /etc/init.d at
 	shutdown.
 
-	Updated/fixed packages: barebox, bash, beecrypt, binutils,
-	bison, busybox, cdrkit, coreutils, dbus-glib, diffutils,
-	dropbear, ebtables, ethtool, ffmpeg, flex, fluxbox, gawk,
-	grep, gst-dsp, gst-ffmpeg, hostapd, htop, i2c-tools, iproute2,
-	ipset, iw, kismet, lame, libcap, libcgi, libeXosip2, libffi,
-	libgpg-error, libgtk2, libnl, libosip, libroxml, lighttpd, m4,
-	module-init-tools, mpd, mtd-utils, nano, nbd, netsnmp, opencv,
-	pcre, proftpd, ruby, samba, sqlite, squid, ti-utils, uboot,
-	uboot-tools, usbmount, valgrind, vsftpd, wpa_supplicant,
-	xapp_xman, xdm, xf86-video-sis
+	Updated/fixed packages: atk, barebox, bash, beecrypt, binutils,
+	bison, bluez_utils, busybox, cairo, ccache, cdrkit, coreutils,
+	cramfs, dbus-glib, dialog, diffutils, dropbear, e2fsprogs,
+	ebtables, ed, ethtool, ffmpeg, file, flex, fluxbox,
+	fontconfig, gawk, grep, gst-dsp, gst-ffmpeg, hostapd, htop,
+	i2c-tools, icu, iproute2, ipset, iptables, iw, kismet, lame,
+	libcap, libcgi, libeXosip2, libffi, libgpg-error, libgtk2,
+	libidn, libmnl, libnl, libosip, libpng, libroxml, libv4l,
+	libxcb, libxml-parser-perl, libxslt, lighttpd, links, m4,
+	module-init-tools, mpc, mpd, mpfr, mtd-utils, nano, nbd,
+	ncurses, netsnmp, opencv, openssl, openvpn, orc, pcre,
+	pkg-config, proftpd, python, ruby, samba, squashfs3, sshfs,
+	sqlite, squid, syslinux, ti-utils, tiff, uboot, uboot-tools,
+	usbmount, valgrind, vsftpd, wpa_supplicant,
+	xapp_{bdftopcf,mkfontdir,mkfontscale,xkbcomp,xcursorgen,xman},
+	xdm, xenomai, xf86-video-sis, xfont_{encodings,font-util},
+	xlib_lib{fontenc,X11,Xau,Xcursor,Xdmcp,Xfixes,Xfont,Xrender},
+	xlib_libxkbfile, xutil_makedepend
 
 	New packages: connman, explorercanvas, feh, flot, giblib,
 	igh-ethercat, imlib2, jquery, jquery-sparklines,
-	jquery-validation, jsmin, libesmtp, libmbus, NetworkManager,
-	rt-tests, transmission, xinput-calibrator
+	jquery-validation, jsmin, kmod, libesmtp, libmbus,
+	NetworkManager, open2300, python-distutilscross, python-dpkt,
+	python-netifaces, python-pygame, python-setuptools, rt-tests,
+	sane-backends, transmission, unionfs, xf86-input-tslib,
+	xinput-calibrator
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 90a939e2bdd6c121acd7d95e5b6fe0fa8e1e3dc4 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 23 Jan 2012 10:09:08 +0100
Subject: [PATCH 1255/6849] jpeg: bump to v8d

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jpeg/jpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index bac5f3e91e..555c3e15ea 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -3,7 +3,7 @@
 # jpeg (libraries needed by some apps)
 #
 #############################################################
-JPEG_VERSION = 8c
+JPEG_VERSION = 8d
 JPEG_SITE = http://www.ijg.org/files/
 JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES

From 0a4b5206d2431a22a0dbc2ce339ac054ee9ab835 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 23 Jan 2012 10:09:09 +0100
Subject: [PATCH 1256/6849] feh: bump to 2.2

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index eb682774e4..f036393575 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.0
+FEH_VERSION = 2.2
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From c034b33f241ca90918cfbb0901160f0e874e0c24 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 23 Jan 2012 10:09:10 +0100
Subject: [PATCH 1257/6849] fluxbox: bump to 1.3.2

- Peter's patch (iconv fix) went upstream, so delete it

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fluxbox/fluxbox-1.3.1-iconv.patch | 37 -----------------------
 package/fluxbox/fluxbox.mk                |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 package/fluxbox/fluxbox-1.3.1-iconv.patch

diff --git a/package/fluxbox/fluxbox-1.3.1-iconv.patch b/package/fluxbox/fluxbox-1.3.1-iconv.patch
deleted file mode 100644
index 82b4507f15..0000000000
--- a/package/fluxbox/fluxbox-1.3.1-iconv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3ed2d03446cdf53fd10c8ad056d9f86db9923666 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 9 Sep 2011 20:35:49 +0200
-Subject: [PATCH] FbString: fix build without iconv
-
-Commit 690d926 (introduced FbTk::BidiString) broke building without
-HAVE_ICONV, because of wrong variable name and use of iconv_t type.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/FbTk/FbString.cc |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
-index fd34693..5295a66 100644
---- a/src/FbTk/FbString.cc
-+++ b/src/FbTk/FbString.cc
-@@ -150,6 +150,7 @@ enum ConvType { FB2X = 0, X2FB, LOCALE2FB, FB2LOCALE, CONVSIZE };
- #ifdef HAVE_ICONV
- static iconv_t *iconv_convs = 0;
- #else
-+typedef int iconv_t;
- static int iconv_convs[CONVSIZE];
- #endif // HAVE_ICONV
- 
-@@ -292,7 +293,7 @@ string recode(iconv_t cd, const string &in) {
- 
-     return ret;
- #else
--    return str;
-+    return in;
- #endif // HAVE_ICONV
- }
- 
--- 
-1.7.5.4
-
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 5a123f0e9c..5848606bd9 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FLUXBOX_VERSION = 1.3.1
+FLUXBOX_VERSION = 1.3.2
 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
 FLUXBOX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fluxbox/
 

From afb6e3ed52142ef8d9450a743f9487c4fedf9a0f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Jan 2012 12:46:37 +0100
Subject: [PATCH 1258/6849] gdb: also force ELF support for gdbhost

Similar to how we do for target (ee39d53ce3ee (Fix GDB BFD test linking)).

Gdb comes with an embedded copy of libiberty, but binutils also installs
libiberty.a into HOST_DIR. The gdb configure script tries to link against
this one rather than the gdb version when it checks for ELF support.
This may fail if those versions are not compatible, leading to obscure
error messages from gdb at runtime such as:

I'm sorry, Dave, I can't do that. Symbol format `elf32-$ARCH' unknown.

Fix it by forcing ELF support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/gdb.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 85b892fdf4..56faf49977 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -195,6 +195,8 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked
 	touch $@
 
 $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured
+	# force ELF support since it fails due to BFD linking problems
+	gdb_cv_var_elf=yes \
 	$(MAKE) -C $(GDB_HOST_DIR)
 	strip $(GDB_HOST_DIR)/gdb/gdb
 

From 9baaa5b4a39145f4cc64c6bba1a6aa8cec48f00a Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 23 Jan 2012 21:19:29 +0100
Subject: [PATCH 1259/6849] syslinux: add support for host-install

This makes it possible to build the syslinux/extlinux installer, so a
bootable USB drive, CompactFlash or SD card can be created by a user
script.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/syslinux/syslinux.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index da30d5a203..3e89bdfca5 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -26,4 +26,18 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
 	done
 endef
 
+
+define HOST_SYSLINUX_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_SYSLINUX_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLROOT=$(HOST_DIR) install
+endef
+
+define HOST_SYSLINUX_CLEAN_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) clean
+endef
+
 $(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))

From e9c61ecb585b05cc43da5682d05c28a4350a2bd5 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 23 Jan 2012 22:08:54 +0100
Subject: [PATCH 1260/6849] sqlite: bump to version 3.7.10

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 042c7f91f9..18617e86a2 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3070900
+SQLITE_VERSION = 3071000
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From e0cfcc4719782b2ffd74cc709c1fcf53f484606b Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 23 Jan 2012 21:23:24 +0100
Subject: [PATCH 1261/6849] tcl: add host version

Also formatting cleanup.

Host version is needed to build sqlcipher.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcl/tcl.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index cf9a409f87..7bde8c7134 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -3,15 +3,20 @@
 # TCL8.4
 #
 #############################################################
-TCL_VERSION:=8.4.19
-TCL_SOURCE:=tcl$(TCL_VERSION)-src.tar.gz
-TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
+TCL_VERSION = 8.4.19
+TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
+TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
 TCL_SUBDIR = unix
 TCL_CONF_OPT = \
 		--disable-symbols \
 		--disable-langinfo \
 		--disable-framework
 
+HOST_TCL_CONF_OPT = \
+		--disable-symbols \
+		--disable-langinfo \
+		--disable-framework
+
 define TCL_POST_INSTALL_CLEANUP
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
 	-if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
@@ -25,3 +30,4 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 1541d648aa2d72f3d889a0ff78af9f3add9f4fa7 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 23 Jan 2012 21:23:25 +0100
Subject: [PATCH 1262/6849] sqlcipher: new package

SQLCipher is a fork of SQLite that adds AES encryption using OpenSSL.
It relies on tcl to generate some of its source code, so host-tcl is
required.

[Peter: select openssl]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/sqlcipher/Config.in    | 28 +++++++++++++++++
 package/sqlcipher/sqlcipher.mk | 56 ++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 package/sqlcipher/Config.in
 create mode 100644 package/sqlcipher/sqlcipher.mk

diff --git a/package/Config.in b/package/Config.in
index f219e37ce7..b245da8f96 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -272,6 +272,7 @@ endmenu
 menu "Database"
 source "package/berkeleydb/Config.in"
 source "package/mysql_client/Config.in"
+source "package/sqlcipher/Config.in"
 source "package/sqlite/Config.in"
 endmenu
 
diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
new file mode 100644
index 0000000000..8970115fa3
--- /dev/null
+++ b/package/sqlcipher/Config.in
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_SQLCIPHER
+	bool "sqlcipher"
+	depends on !BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_OPENSSL
+	help
+	  SQLCipher is an SQLite extension that provides 256 bits AES
+	  encryption of database files.  Note that it is a fork of SQLite
+	  and they cannot be installed side-by-side.
+	  http://sqlcipher.net
+
+config BR2_PACKAGE_SQLCIPHER_READLINE
+	bool "Command-line editing"
+	depends on BR2_PACKAGE_SQLCIPHER
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	help
+	  Enable command-line editing. This requires ncurses and readline.
+
+config BR2_PACKAGE_SQLCIPHER_STAT3
+	bool "Additional query optimizations (stat3)"
+	depends on BR2_PACKAGE_SQLCIPHER
+	help
+	  Adds additional logic to the ANALYZE command and to the query
+	  planner that can help SQLite to choose a better query plan under
+	  certain situations.
+
+comment "sqlcipher conflicts with sqlite"
+	depends on BR2_PACKAGE_SQLITE
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
new file mode 100644
index 0000000000..9ad3e555ab
--- /dev/null
+++ b/package/sqlcipher/sqlcipher.mk
@@ -0,0 +1,56 @@
+#############################################################
+#
+# Sqlcipher extension of sqlite
+# http://sqlcipher.net
+#
+#############################################################
+SQLCIPHER_VERSION = 1.1.9
+SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
+SQLCIPHER_DEPENDENCIES = openssl host-tcl
+SQLCIPHER_INSTALL_STAGING = YES
+
+SQLCIPHER_CONF_ENV = \
+	CFLAGS+=" $(SQLCIPHER_CFLAGS)" \
+	LDFLAGS+=" $(SQLCIPHER_LDFLAGS)" \
+	TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh8.4
+
+SQLCIPHER_CONF_OPT = \
+	--enable-threadsafe \
+	--localstatedir=/var
+
+SQLCIPHER_CFLAGS += -DSQLITE_HAS_CODEC # Required according to the README
+SQLCIPHER_LDFLAGS += -lcrypto
+
+ifneq ($(BR2_LARGEFILE),y)
+# the sqlite configure script fails to define SQLITE_DISABLE_LFS when
+# --disable-largefile is passed, breaking the build. Work around it by
+# simply adding it to CFLAGS for configure instead
+SQLCIPHER_CFLAGS += -DSQLITE_DISABLE_LFS
+endif
+
+ifeq ($(BR2_PACKAGE_SQLCIPHER_STAT3),y)
+SQLCIPHER_CFLAGS += -DSQLITE_ENABLE_STAT3
+endif
+
+ifeq ($(BR2_PACKAGE_SQLCIPHER_READLINE),y)
+SQLCIPHER_DEPENDENCIES += ncurses readline
+SQLCIPHER_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+else
+SQLCIPHER_CONF_OPT += --disable-readline
+endif
+
+define SQLCIPHER_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/sqlite3
+	rm -f $(TARGET_DIR)/usr/lib/libsqlite3*
+	rm -f $(TARGET_DIR)/usr/lib/pkgconfig/sqlite3.pc
+	rm -f $(TARGET_DIR)/usr/include/sqlite3*.h
+endef
+
+define SQLCIPHER_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/usr/bin/sqlite3
+	rm -f $(STAGING_DIR)/usr/lib/libsqlite3*
+	rm -f $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
+	rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
+endef
+
+$(eval $(call AUTOTARGETS))

From 16b17c9a15509f926579ced17285e9b38952b548 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Jan 2012 14:59:26 +0100
Subject: [PATCH 1263/6849] tcl: add _VERSION_MAJOR / _VERSION_MINOR and use
 instead of hardcoded 8.4

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlcipher/sqlcipher.mk | 2 +-
 package/tcl/tcl.mk             | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 9ad3e555ab..3e69a962bd 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -12,7 +12,7 @@ SQLCIPHER_INSTALL_STAGING = YES
 SQLCIPHER_CONF_ENV = \
 	CFLAGS+=" $(SQLCIPHER_CFLAGS)" \
 	LDFLAGS+=" $(SQLCIPHER_LDFLAGS)" \
-	TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh8.4
+	TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
 
 SQLCIPHER_CONF_OPT = \
 	--enable-threadsafe \
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 7bde8c7134..8ed81ab37d 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -3,7 +3,9 @@
 # TCL8.4
 #
 #############################################################
-TCL_VERSION = 8.4.19
+TCL_VERSION_MAJOR = 8.4
+TCL_VERSION_MINOR = 19
+TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
 TCL_SUBDIR = unix
@@ -20,10 +22,10 @@ HOST_TCL_CONF_OPT = \
 define TCL_POST_INSTALL_CLEANUP
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
 	-if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
-	rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \
+	rm -Rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*; \
 	fi
 	-if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" = "y" ]; then \
-	rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \
+	rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR); \
 	fi
 endef
 

From 21f39f524ff52e0649c88acf32fb78d3592fb3c8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Jan 2012 22:28:47 +0100
Subject: [PATCH 1264/6849] gdb: add 7.4, mark 7.1 as deprecated

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 9868580c90..8501983aa4 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -30,7 +30,7 @@ choice
 	prompt "GDB debugger Version"
 	default BR2_GDB_VERSION_6_6 if BR2_bfin
 	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
-	default BR2_GDB_VERSION_7_3
+	default BR2_GDB_VERSION_7_4
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
 	help
 	  Select the version of gdb you wish to use.
@@ -58,6 +58,7 @@ choice
 	config BR2_GDB_VERSION_7_1
 		bool "gdb 7.1"
 		depends on !BR2_bfin
+		depends on BR2_DEPRECATED
 		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
@@ -73,6 +74,12 @@ choice
 		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
+	config BR2_GDB_VERSION_7_4
+		bool "gdb 7.4.x"
+		depends on !BR2_bfin
+		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
+
 endchoice
 
 comment "gdb 7.x support needs pthread debug support in toolchain"
@@ -88,3 +95,4 @@ config BR2_GDB_VERSION
 	default "7.1a"     if BR2_GDB_VERSION_7_1
 	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
+	default "7.4"      if BR2_GDB_VERSION_7_4

From f8cdf54d4dcd1d17c1e53cd2d7e4c1facac2de99 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Jan 2012 23:34:15 +0100
Subject: [PATCH 1265/6849] libgtk2: bump version

Tarball is (so far?) only available as .xz

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/libgtk2.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 52edf477b8..cfdc8f9215 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 LIBGTK2_VERSION_MAJOR = 2.24
-LIBGTK2_VERSION_MINOR = 8
+LIBGTK2_VERSION_MINOR = 9
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
-LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
+LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
 LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR)
 LIBGTK2_AUTORECONF = NO
 LIBGTK2_INSTALL_STAGING = YES

From 70b489f2d9da688c5b4005b34576b4bbe6eb67dd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 24 Jan 2012 13:29:05 -0300
Subject: [PATCH 1266/6849] sudo: bump to version 1.7.8p1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 9c62c49f52..f10d294e17 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.7.7
+SUDO_VERSION = 1.7.8p1
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 
 SUDO_CONF_OPT = \

From ce7a7896c5cdc4ecc6a5ca16f9403c57d0a329f9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 24 Jan 2012 13:29:07 -0300
Subject: [PATCH 1267/6849] grep: bump to version 2.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/grep/grep.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index e039135b3e..a4391d7dee 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,8 +4,9 @@
 #
 #############################################################
 
-GREP_VERSION = 2.9
+GREP_VERSION = 2.10
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
+GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 

From 5bedeb2fb36d8b36dc1e7392a2fc16e0bd1a0e81 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 24 Jan 2012 13:29:06 -0300
Subject: [PATCH 1268/6849] bash: bump to version 4.2 pl20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bash/bash-4.2-011.patch |  46 ++++++++++
 package/bash/bash-4.2-012.patch | 151 ++++++++++++++++++++++++++++++++
 package/bash/bash-4.2-013.patch |  52 +++++++++++
 package/bash/bash-4.2-014.patch |  47 ++++++++++
 package/bash/bash-4.2-015.patch |  81 +++++++++++++++++
 package/bash/bash-4.2-016.patch |  46 ++++++++++
 package/bash/bash-4.2-017.patch |  47 ++++++++++
 package/bash/bash-4.2-018.patch |  74 ++++++++++++++++
 package/bash/bash-4.2-019.patch |  47 ++++++++++
 package/bash/bash-4.2-020.patch |  60 +++++++++++++
 10 files changed, 651 insertions(+)
 create mode 100644 package/bash/bash-4.2-011.patch
 create mode 100644 package/bash/bash-4.2-012.patch
 create mode 100644 package/bash/bash-4.2-013.patch
 create mode 100644 package/bash/bash-4.2-014.patch
 create mode 100644 package/bash/bash-4.2-015.patch
 create mode 100644 package/bash/bash-4.2-016.patch
 create mode 100644 package/bash/bash-4.2-017.patch
 create mode 100644 package/bash/bash-4.2-018.patch
 create mode 100644 package/bash/bash-4.2-019.patch
 create mode 100644 package/bash/bash-4.2-020.patch

diff --git a/package/bash/bash-4.2-011.patch b/package/bash/bash-4.2-011.patch
new file mode 100644
index 0000000000..802c1f1229
--- /dev/null
+++ b/package/bash/bash-4.2-011.patch
@@ -0,0 +1,46 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-011
+
+Bug-Reported-by:	"David Parks" <davidparks21@yahoo.com>
+Bug-Reference-ID:	<014101cc82c6$46ac1540$d4043fc0$@com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html
+
+Bug-Description:
+
+Overwriting a value in an associative array causes the memory allocated to
+store the key on the second and subsequent assignments to leak.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/assoc.c	2009-08-05 20:19:40.000000000 -0400
+--- ./assoc.c	2011-10-04 20:23:07.000000000 -0400
+***************
+*** 78,81 ****
+--- 78,86 ----
+    if (b == 0)
+      return -1;
++   /* If we are overwriting an existing element's value, we're not going to
++      use the key.  Nothing in the array assignment code path frees the key
++      string, so we can free it here to avoid a memory leak. */
++   if (b->key != key)
++     free (key);
+    FREE (b->data);
+    b->data = value ? savestring (value) : (char *)0;
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-012.patch b/package/bash/bash-4.2-012.patch
new file mode 100644
index 0000000000..9a1c49c714
--- /dev/null
+++ b/package/bash/bash-4.2-012.patch
@@ -0,0 +1,151 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-012
+
+Bug-Reported-by:	Rui Santos <rsantos@grupopie.com>
+Bug-Reference-ID:	<4E04C6D0.2020507@grupopie.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html
+
+Bug-Description:
+
+When calling the parser to recursively parse a command substitution within
+an arithmetic expansion, the shell overwrote the saved shell input line and
+associated state, resulting in a garbled command.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/parse.y	2011-02-26 19:19:05.000000000 -0500
+--- ./parse.y	2011-06-24 20:08:22.000000000 -0400
+***************
+*** 3843,3846 ****
+--- 3849,3853 ----
+  {
+    sh_parser_state_t ps;
++   sh_input_line_state_t ls;
+    int orig_ind, nc, sflags;
+    char *ret, *s, *ep, *ostring;
+***************
+*** 3850,3857 ****
+--- 3857,3866 ----
+    ostring = string;
+  
++ /*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/
+    sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE;
+    if (flags & SX_NOLONGJMP)
+      sflags |= SEVAL_NOLONGJMP;
+    save_parser_state (&ps);
++   save_input_line_state (&ls);
+  
+    /*(*/
+***************
+*** 3862,3865 ****
+--- 3871,3876 ----
+    restore_parser_state (&ps);
+    reset_parser ();
++   /* reset_parser clears shell_input_line and associated variables */
++   restore_input_line_state (&ls);
+    if (interactive)
+      token_to_read = 0;
+***************
+*** 5909,5912 ****
+--- 5920,5929 ----
+    ps->echo_input_at_read = echo_input_at_read;
+  
++   ps->token = token;
++   ps->token_buffer_size = token_buffer_size;
++   /* Force reallocation on next call to read_token_word */
++   token = 0;
++   token_buffer_size = 0;
++ 
+    return (ps);
+  }
+***************
+*** 5950,5953 ****
+--- 5967,6006 ----
+    expand_aliases = ps->expand_aliases;
+    echo_input_at_read = ps->echo_input_at_read;
++ 
++   FREE (token);
++   token = ps->token;
++   token_buffer_size = ps->token_buffer_size;
++ }
++ 
++ sh_input_line_state_t *
++ save_input_line_state (ls)
++      sh_input_line_state_t *ls;
++ {
++   if (ls == 0)
++     ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t));
++   if (ls == 0)
++     return ((sh_input_line_state_t *)NULL);
++ 
++   ls->input_line = shell_input_line;
++   ls->input_line_size = shell_input_line_size;
++   ls->input_line_len = shell_input_line_len;
++   ls->input_line_index = shell_input_line_index;
++ 
++   /* force reallocation */
++   shell_input_line = 0;
++   shell_input_line_size = shell_input_line_len = shell_input_line_index = 0;
++ }
++ 
++ void
++ restore_input_line_state (ls)
++      sh_input_line_state_t *ls;
++ {
++   FREE (shell_input_line);
++   shell_input_line = ls->input_line;
++   shell_input_line_size = ls->input_line_size;
++   shell_input_line_len = ls->input_line_len;
++   shell_input_line_index = ls->input_line_index;
++ 
++   set_line_mbstate ();
+  }
+  
+*** ../bash-4.2-patched/shell.h	2011-01-06 22:16:55.000000000 -0500
+--- ./shell.h	2011-06-24 19:12:25.000000000 -0400
+***************
+*** 137,140 ****
+--- 139,145 ----
+    int *token_state;
+  
++   char *token;
++   int token_buffer_size;
++ 
+    /* input line state -- line number saved elsewhere */
+    int input_line_terminator;
+***************
+*** 167,171 ****
+--- 172,186 ----
+  } sh_parser_state_t;
+  
++ typedef struct _sh_input_line_state_t {
++   char *input_line;
++   int input_line_index;
++   int input_line_size;
++   int input_line_len;
++ } sh_input_line_state_t;
++ 
+  /* Let's try declaring these here. */
+  extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
+  extern void restore_parser_state __P((sh_parser_state_t *));
++ 
++ extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *));
++ extern void restore_input_line_state __P((sh_input_line_state_t *));
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-013.patch b/package/bash/bash-4.2-013.patch
new file mode 100644
index 0000000000..06840a356c
--- /dev/null
+++ b/package/bash/bash-4.2-013.patch
@@ -0,0 +1,52 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-013
+
+Bug-Reported-by:	Marten Wikstrom <marten.wikstrom@keystream.se>
+Bug-Reference-ID:	<BANLkTikKECAh94ZEX68iQvxYuPeEM_xoSQ@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html
+
+Bug-Description:
+
+An off-by-one error caused the shell to skip over CTLNUL characters,
+which are used internally to mark quoted null strings.  The effect
+was to have stray 0x7f characters left after expanding words like
+""""""""aa.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2011-03-06 14:11:11.000000000 -0500
+--- ./subst.c	2011-05-11 11:23:33.000000000 -0400
+***************
+*** 3707,3711 ****
+  	}
+        else if (string[i] == CTLNUL)
+! 	i++;
+  
+        prev_i = i;
+--- 3710,3717 ----
+  	}
+        else if (string[i] == CTLNUL)
+! 	{
+! 	  i++;
+! 	  continue;
+! 	}
+  
+        prev_i = i;
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-014.patch b/package/bash/bash-4.2-014.patch
new file mode 100644
index 0000000000..d6652eb5a4
--- /dev/null
+++ b/package/bash/bash-4.2-014.patch
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-014
+
+Bug-Reported-by:	Shawn Bohrer <sbohrer@rgmadvisors.com>
+Bug-Reference-ID:	<20110504152320.6E8F28130527@dev1.rgmadvisors.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html
+
+Bug-Description:
+
+The regular expression matching operator did not correctly match
+expressions with an embedded ^A.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/pathexp.c	2010-08-13 23:21:57.000000000 -0400
+--- ./pathexp.c	2011-05-05 16:40:58.000000000 -0400
+***************
+*** 197,201 ****
+  	  if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
+  	    continue;
+! 	  if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
+  	    continue;
+  	  temp[j++] = '\\';
+--- 197,201 ----
+  	  if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
+  	    continue;
+! 	  if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
+  	    continue;
+  	  temp[j++] = '\\';
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-015.patch b/package/bash/bash-4.2-015.patch
new file mode 100644
index 0000000000..5bcca34cea
--- /dev/null
+++ b/package/bash/bash-4.2-015.patch
@@ -0,0 +1,81 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-015
+
+Bug-Reported-by:	<dnade.ext@orange-ftgroup.com>
+Bug-Reference-ID:	<728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html
+
+Bug-Description:
+
+When in a context where arithmetic evaluation is not taking place, the
+evaluator should not check for division by 0.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/expr.c	2010-12-21 11:12:13.000000000 -0500
+--- ./expr.c	2011-08-02 20:58:28.000000000 -0400
+***************
+*** 477,480 ****
+--- 481,492 ----
+        if (special)
+  	{
++ 	  if ((op == DIV || op == MOD) && value == 0)
++ 	    {
++ 	      if (noeval == 0)
++ 		evalerror (_("division by 0"));
++ 	      else
++ 	        value = 1;
++ 	    }
++ 
+  	  switch (op)
+  	    {
+***************
+*** 483,493 ****
+  	      break;
+  	    case DIV:
+- 	      if (value == 0)
+- 		evalerror (_("division by 0"));
+  	      lvalue /= value;
+  	      break;
+  	    case MOD:
+- 	      if (value == 0)
+- 		evalerror (_("division by 0"));
+  	      lvalue %= value;
+  	      break;
+--- 495,501 ----
+***************
+*** 805,809 ****
+  
+        if (((op == DIV) || (op == MOD)) && (val2 == 0))
+! 	evalerror (_("division by 0"));
+  
+        if (op == MUL)
+--- 813,822 ----
+  
+        if (((op == DIV) || (op == MOD)) && (val2 == 0))
+! 	{
+! 	  if (noeval == 0)
+! 	    evalerror (_("division by 0"));
+! 	  else
+! 	    val2 = 1;
+! 	}
+  
+        if (op == MUL)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-016.patch b/package/bash/bash-4.2-016.patch
new file mode 100644
index 0000000000..04f9432d0c
--- /dev/null
+++ b/package/bash/bash-4.2-016.patch
@@ -0,0 +1,46 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-016
+
+Bug-Reported-by:	Martin von Gagern <Martin.vGagern@gmx.net>
+Bug-Reference-ID:	<4E43AD9E.8060501@gmx.net>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html
+
+Bug-Description:
+
+Bash should not check for mail while executing the `eval' builtin.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/parse.y	Fri Feb 25 12:07:41 2011
+--- ./parse.y	Thu Aug 11 19:02:26 2011
+***************
+*** 2500,2504 ****
+  	 is the mail alarm reset; nothing takes place in check_mail ()
+  	 except the checking of mail.  Please don't change this. */
+!       if (prompt_is_ps1 && time_to_check_mail ())
+  	{
+  	  check_mail ();
+--- 2498,2502 ----
+  	 is the mail alarm reset; nothing takes place in check_mail ()
+  	 except the checking of mail.  Please don't change this. */
+!       if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ())
+  	{
+  	  check_mail ();
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-017.patch b/package/bash/bash-4.2-017.patch
new file mode 100644
index 0000000000..fdecffa22f
--- /dev/null
+++ b/package/bash/bash-4.2-017.patch
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-017
+
+Bug-Reported-by:	Curtis Doty <Curtis@GreenKey.net>
+Bug-Reference-ID:	<20110621035324.A4F70849F59@mx1.iParadigms.net>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html
+
+Bug-Description:
+
+Using `read -a foo' where foo was an already-declared associative array
+caused the shell to die with a segmentation fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/read.def	2011-01-04 11:43:36.000000000 -0500
+--- ./builtins/read.def	2011-06-21 10:31:02.000000000 -0400
+***************
+*** 643,646 ****
+--- 642,651 ----
+  	  return EXECUTION_FAILURE;	/* readonly or noassign */
+  	}
++       if (assoc_p (var))
++ 	{
++           builtin_error (_("%s: cannot convert associative to indexed array"), arrayname);
++ 	  xfree (input_string);
++ 	  return EXECUTION_FAILURE;	/* existing associative array */
++ 	}
+        array_flush (array_cell (var));
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-018.patch b/package/bash/bash-4.2-018.patch
new file mode 100644
index 0000000000..c96b901f3e
--- /dev/null
+++ b/package/bash/bash-4.2-018.patch
@@ -0,0 +1,74 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-018
+
+Bug-Reported-by:	Thomas Cort <tcort@minix3.org>
+Bug-Reference-ID:	<BANLkTik-ebGGw3k_1YtB=RyfV1bsqdxC_g@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
+
+Bug-Description:
+
+Bash fails to compile unless JOB_CONTROL is defined.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/execute_cmd.c	2011-02-09 17:32:25.000000000 -0500
+--- ./execute_cmd.c	2011-11-06 15:12:48.000000000 -0500
+***************
+*** 2197,2200 ****
+--- 2315,2319 ----
+      cmd->flags |= CMD_IGNORE_RETURN;
+  
++ #if defined (JOB_CONTROL)
+    lastpipe_flag = 0;
+    begin_unwind_frame ("lastpipe-exec");
+***************
+*** 2216,2228 ****
+  	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
+  	}
+!       cmd->flags |= CMD_LASTPIPE;
+      }	  
+    if (prev >= 0)
+      add_unwind_protect (close, prev);
+  
+    exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
+  
+    if (lstdin > 0)
+      restore_stdin (lstdin);
+  
+    if (prev >= 0)
+--- 2335,2351 ----
+  	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
+  	}
+!       if (cmd)
+! 	cmd->flags |= CMD_LASTPIPE;
+      }	  
+    if (prev >= 0)
+      add_unwind_protect (close, prev);
++ #endif
+  
+    exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
+  
++ #if defined (JOB_CONTROL)
+    if (lstdin > 0)
+      restore_stdin (lstdin);
++ #endif
+  
+    if (prev >= 0)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-019.patch b/package/bash/bash-4.2-019.patch
new file mode 100644
index 0000000000..01603a933a
--- /dev/null
+++ b/package/bash/bash-4.2-019.patch
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-019
+
+Bug-Reported-by:	Diego Augusto Molina <diegoaugustomolina@gmail.com>
+Bug-Reference-ID:	<CAGOxLdHcSQu3ck9Qy3pRjj_NBU5tAPSAvNm-95-nLQ9Szwb6aA@mail.gmail.com>
+Bug-Reference-URL:	lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html
+
+Bug-Description:
+
+Using `declare' with attributes and an invalid array variable name or
+assignment reference resulted in a segmentation fault instead of a
+declaration error.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
+--- ./builtins/declare.def	2011-09-15 15:20:20.000000000 -0400
+***************
+*** 514,517 ****
+--- 514,522 ----
+  	      var = assign_array_element (name, value, 0);	/* XXX - not aflags */
+  	      *subscript_start = '\0';
++ 	      if (var == 0)	/* some kind of assignment error */
++ 		{
++ 		  assign_error++;
++ 		  NEXT_VARIABLE ();
++ 		}
+  	    }
+  	  else if (simple_array_assign)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-020.patch b/package/bash/bash-4.2-020.patch
new file mode 100644
index 0000000000..77e31dfa1c
--- /dev/null
+++ b/package/bash/bash-4.2-020.patch
@@ -0,0 +1,60 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-020
+
+Bug-Reported-by:	Vincent Sheffer <vince.sheffer@apisphere.com>
+Bug-Reference-ID:	<F13C1C4F-C44C-4071-BFED-4BB6D13CF92F@apisphere.com>
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html
+
+Bug-Description:
+
+The shared object helper script needs to be updated for Mac OS X 10.7
+(Lion, darwin11).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/support/shobj-conf	2009-10-28 09:20:21.000000000 -0400
+--- ./support/shobj-conf	2011-08-27 13:25:23.000000000 -0400
+***************
+*** 158,162 ****
+  
+  # Darwin/MacOS X
+! darwin[89]*|darwin10*)
+  	SHOBJ_STATUS=supported
+  	SHLIB_STATUS=supported
+--- 172,176 ----
+  
+  # Darwin/MacOS X
+! darwin[89]*|darwin1[012]*)
+  	SHOBJ_STATUS=supported
+  	SHLIB_STATUS=supported
+***************
+*** 187,191 ****
+  
+  	case "${host_os}" in
+! 	darwin[789]*|darwin10*)	SHOBJ_LDFLAGS=''
+  			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+  			;;
+--- 201,205 ----
+  
+  	case "${host_os}" in
+! 	darwin[789]*|darwin1[012]*)	SHOBJ_LDFLAGS=''
+  			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+  			;;
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */

From 0d2a304ef39fa838824b31e4453dcef21b5302ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 24 Jan 2012 13:29:08 -0300
Subject: [PATCH 1269/6849] coreutils: bump to version 8.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../coreutils-8.14-hostname-man.patch         | 51 -------------------
 package/coreutils/coreutils.mk                |  2 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 package/coreutils/coreutils-8.14-hostname-man.patch

diff --git a/package/coreutils/coreutils-8.14-hostname-man.patch b/package/coreutils/coreutils-8.14-hostname-man.patch
deleted file mode 100644
index 5f8fa1ee26..0000000000
--- a/package/coreutils/coreutils-8.14-hostname-man.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- /dev/null	2010-09-18 00:21:07.280000001 -0700
-+++ b/man/hostname.1	2010-09-23 12:08:06.000000000 -0700
-@@ -0,0 +1,48 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-+.TH HOSTNAME "1" "January 2011" "GNU coreutils 8.9" "User Commands"
-+.SH NAME
-+hostname \- set or print the name of the current host system
-+.SH SYNOPSIS
-+.B hostname
-+[\fINAME\fR]
-+.br
-+.B hostname
-+\fIOPTION\fR
-+.SH DESCRIPTION
-+.\" Add any additional description here
-+.PP
-+Print or set the hostname of the current system.
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.SH AUTHOR
-+Written by Jim Meyering.
-+.SH "REPORTING BUGS"
-+Report hostname bugs to bug\-coreutils at gnu.org
-+.br
-+GNU coreutils home page: <http://www.gnu.org/software/coreutils/>
-+.br
-+General help using GNU software: <http://www.gnu.org/gethelp/>
-+.br
-+Report hostname translation bugs to <http://translationproject.org/team/>
-+.SH COPYRIGHT
-+Copyright \(co 2010 Free Software Foundation, Inc.
-+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
-+.br
-+This is free software: you are free to change and redistribute it.
-+There is NO WARRANTY, to the extent permitted by law.
-+.SH "SEE ALSO"
-+The full documentation for
-+.B hostname
-+is maintained as a Texinfo manual.  If the
-+.B info
-+and
-+.B hostname
-+programs are properly installed at your site, the command
-+.IP
-+.B info coreutils \(aqhostname invocation\(aq
-+.PP
-+should give you access to the complete manual.
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index eb88535cfb..0a85586c55 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-COREUTILS_VERSION = 8.14
+COREUTILS_VERSION = 8.15
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
 

From 01e5bee40f7ae083a5d62c99667bb9709d266f16 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Jan 2012 12:03:10 +0100
Subject: [PATCH 1270/6849] yajl: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{yajl-2.0.2-math-link.patch => yajl-2.0.4-math-link.patch}  | 0
 package/yajl/yajl.mk                                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/yajl/{yajl-2.0.2-math-link.patch => yajl-2.0.4-math-link.patch} (100%)

diff --git a/package/yajl/yajl-2.0.2-math-link.patch b/package/yajl/yajl-2.0.4-math-link.patch
similarity index 100%
rename from package/yajl/yajl-2.0.2-math-link.patch
rename to package/yajl/yajl-2.0.4-math-link.patch
diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk
index 723cce4a98..1c0df383b0 100644
--- a/package/yajl/yajl.mk
+++ b/package/yajl/yajl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-YAJL_VERSION = 2.0.2
+YAJL_VERSION = 2.0.4
 YAJL_SITE = git://github.com/lloyd/yajl.git
 YAJL_INSTALL_STAGING = YES
 

From 2f7496e938bedbeff8d1f2e943a0a4b7d4673816 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Jan 2012 12:19:40 +0100
Subject: [PATCH 1271/6849] libmms: bump version

Patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ibmms-prevent-unaligned-dereferences.patch | 84 -------------------
 package/multimedia/libmms/libmms.mk           |  4 +-
 2 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 package/multimedia/libmms/libmms-prevent-unaligned-dereferences.patch

diff --git a/package/multimedia/libmms/libmms-prevent-unaligned-dereferences.patch b/package/multimedia/libmms/libmms-prevent-unaligned-dereferences.patch
deleted file mode 100644
index 9c606eb29e..0000000000
--- a/package/multimedia/libmms/libmms-prevent-unaligned-dereferences.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 4fd16633a8c379971425f7fd482152f163b09158 Mon Sep 17 00:00:00 2001
-From: Paul Burton <Paul.Burton@imgtec.com>
-Date: Fri, 17 Sep 2010 14:08:57 +0100
-Subject: [PATCH] Endianness macros should not dereference unaligned pointers
-
-The LE_*/BE_* macros previously worked by casting the pointer passed to them to a pointer to the correct integer type, then dereferencing it. This will not work on architectures which don't allow unaligned data access. Instead, access one byte at a time and shift to form the value.
----
- src/bswap.h |   59 +++++++++++++++++++++++++++++++++++++++++++----------------
- 1 files changed, 43 insertions(+), 16 deletions(-)
-
-diff --git a/src/bswap.h b/src/bswap.h
-index b731da7..59e8716 100644
---- a/src/bswap.h
-+++ b/src/bswap.h
-@@ -21,23 +21,50 @@
-  */
- 
- 
--/* Go cheap now, will rip out glib later. *Sigh* */
--#include <glib.h>
--
--/* NOTE:
-- * Now, to clear up confusion: LE_XX means "from LE to native, XX bits wide"
-- * I know it's not very clear naming (tell me about it, I
-- * misinterpreted in first version and caused bad nasty bug, *sigh*),
-- * but that's inherited code, will clean up as things go
-- * Oh, and one more thing -- they take *pointers*, not actual ints
-- */
-+#include <stdint.h>
-+
-+#define SWAP_ENDIAN_16(val) \
-+	(val[1] | (val[0] << 8))
-+#define SWAP_ENDIAN_32(val) \
-+	(val[3] | (val[2] << 8) | (val[1] << 16) | (val[0] << 24))
-+#define SWAP_ENDIAN_64(val) \
-+	(val[7] | (val[6] << 8) | (val[5] << 16) | (val[4] << 24) | \
-+	((uint64_t)val[3] << 32) | ((uint64_t)val[2] << 40) | \
-+	((uint64_t)val[1] << 48) | ((uint64_t)val[0] << 56))
-+
-+#define SAME_ENDIAN_16(val) \
-+	(val[0] | (val[1] << 8))
-+#define SAME_ENDIAN_32(val) \
-+	(val[0] | (val[1] << 8) | (val[2] << 16) | (val[3] << 24))
-+#define SAME_ENDIAN_64(val) \
-+	(val[0] | (val[1] << 8) | (val[2] << 16) | (val[3] << 24) | \
-+	((uint64_t)val[4] << 32) | ((uint64_t)val[5] << 40) | \
-+	((uint64_t)val[6] << 48) | ((uint64_t)val[7] << 56))
-+
-+#ifndef WORDS_BIGENDIAN
-+
-+/* Little endian */
-+
-+#define LE_16(val) SAME_ENDIAN_16(((uint8_t *)(val)))
-+#define LE_32(val) SAME_ENDIAN_32(((uint8_t *)(val)))
-+#define LE_64(val) SAME_ENDIAN_64(((uint8_t *)(val)))
-+#define BE_16(val) SWAP_ENDIAN_16(((uint8_t *)(val)))
-+#define BE_32(val) SWAP_ENDIAN_32(((uint8_t *)(val)))
-+#define BE_64(val) SWAP_ENDIAN_64(((uint8_t *)(val)))
-+
-+#elif WORDS_BIGENDIAN == 1
-+
-+/* Big endian */
- 
--#define LE_16(val) (GINT16_FROM_LE (*((u_int16_t*)(val))))
--#define BE_16(val) (GINT16_FROM_BE (*((u_int16_t*)(val))))
--#define LE_32(val) (GINT32_FROM_LE (*((u_int32_t*)(val))))
--#define BE_32(val) (GINT32_FROM_BE (*((u_int32_t*)(val))))
-+#define LE_16(val) SWAP_ENDIAN_16(((uint8_t *)(val)))
-+#define LE_32(val) SWAP_ENDIAN_32(((uint8_t *)(val)))
-+#define LE_64(val) SWAP_ENDIAN_64(((uint8_t *)(val)))
-+#define BE_16(val) SAME_ENDIAN_16(((uint8_t *)(val)))
-+#define BE_32(val) SAME_ENDIAN_32(((uint8_t *)(val)))
-+#define BE_64(val) SAME_ENDIAN_64(((uint8_t *)(val)))
- 
--#define LE_64(val) (GINT64_FROM_LE (*((u_int64_t*)(val))))
--#define BE_64(val) (GINT64_FROM_BE (*((u_int64_t*)(val))))
-+#else
-+#error Unknown endianness!
-+#endif
- 
- #endif /* BSWAP_H_INCLUDED */
--- 
-1.7.2.2
-
diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk
index 50ece53fe8..45d1844da2 100644
--- a/package/multimedia/libmms/libmms.mk
+++ b/package/multimedia/libmms/libmms.mk
@@ -3,13 +3,11 @@
 # libmms
 #
 #############################################################
-LIBMMS_VERSION = 0.6
+LIBMMS_VERSION = 0.6.2
 LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz
 LIBMMS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libmms
 
-LIBMMS_AUTORECONF = NO
 LIBMMS_INSTALL_STAGING = YES
-LIBMMS_INSTALL_TARGET = YES
 
 LIBMMS_DEPENDENCIES = host-pkg-config libglib2
 

From 90a83c0b37a1de9e8d933fabacf9a45531654c1c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Jan 2012 13:37:10 +0100
Subject: [PATCH 1272/6849] pciutils: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 28f80d4626..37a17c4750 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCIUTILS_VERSION = 3.1.8
+PCIUTILS_VERSION = 3.1.9
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 	PCIUTILS_ZLIB=yes

From 5f3dc70b4fcd45dea7c83bd946f3a531ac76fbd3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Jan 2012 14:33:13 +0100
Subject: [PATCH 1273/6849] tremor: bump version

Previous snapshot is now more than 2 years, and numerous fixes have been
added to svn. Old Patch is now upstream, libogg is required.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../tremor/tremor-export-all-symbols.patch    | 32 -------------------
 package/multimedia/tremor/tremor.mk           |  8 ++---
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 package/multimedia/tremor/tremor-export-all-symbols.patch

diff --git a/package/multimedia/tremor/tremor-export-all-symbols.patch b/package/multimedia/tremor/tremor-export-all-symbols.patch
deleted file mode 100644
index 127d16bc56..0000000000
--- a/package/multimedia/tremor/tremor-export-all-symbols.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- tremor-16259-orig/configure.in	2009-12-02 11:45:11.000000000 +0100
-+++ tremor-16259/configure.in	2009-12-03 16:50:19.000000000 +0100
-@@ -72,23 +72,6 @@
- LDFLAGS="$LDFLAGS $ldflags_save"
- 
- 
--# Test whenever ld supports -version-script
--AC_PROG_LD
--AC_PROG_LD_GNU
--if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
--   SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
--
--   dnl Set extra linker options
--   case "$target_os" in
--  linux* | solaris* )
--    SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
--    ;;
--  *)
--    ;;
--   esac
--   LDFLAGS="$LDFLAGS $SHLIB_VERSION_ARG"
--fi
--
- dnl --------------------------------------------------
- dnl Options 
- dnl --------------------------------------------------
-@@ -128,4 +111,4 @@
- AC_SUBST(DEBUG)
- AC_SUBST(PROFILE)
- 
--AC_OUTPUT(Makefile Version_script)
-+AC_OUTPUT(Makefile)
diff --git a/package/multimedia/tremor/tremor.mk b/package/multimedia/tremor/tremor.mk
index cf228b8e3f..b836010989 100644
--- a/package/multimedia/tremor/tremor.mk
+++ b/package/multimedia/tremor/tremor.mk
@@ -4,12 +4,12 @@
 #
 ############################################################
 
-TREMOR_SITE:=http://svn.xiph.org/trunk/Tremor/
-TREMOR_SITE_METHOD:=svn
-TREMOR_VERSION:=16259
+TREMOR_SITE = http://svn.xiph.org/trunk/Tremor/
+TREMOR_SITE_METHOD = svn
+TREMOR_VERSION = 18153
 
 TREMOR_AUTORECONF = YES
 TREMOR_INSTALL_STAGING = YES
-TREMOR_INSTALL_TARGET = YES
+TREMOR_DEPENDENCIES = libogg
 
 $(eval $(call AUTOTARGETS))

From 0327c24e5f14e7d8eb000d74b0c6bf29c0ed92a5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Jan 2012 14:35:18 +0100
Subject: [PATCH 1274/6849] mplayer: tremor now automatically pulls in libogg

So no need to explicitly depend on it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 96b4e736e4..2ac5e16e2f 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -67,8 +67,8 @@ else
 MPLAYER_CONF_OPTS += --disable-mencoder
 endif
 
-ifeq ($(BR2_PACKAGE_TREMOR)$(BR2_PACKAGE_LIBOGG),yy)
-MPLAYER_DEPENDENCIES += tremor libogg
+ifeq ($(BR2_PACKAGE_TREMOR),y)
+MPLAYER_DEPENDENCIES += tremor
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
 endif
 

From 28f9df141ed47badcc1ab9d8a44513fae39f78ad Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Jan 2012 14:37:03 +0100
Subject: [PATCH 1275/6849] libogg: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libogg/libogg.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk
index 86d5b0110f..c40f04eac4 100644
--- a/package/multimedia/libogg/libogg.mk
+++ b/package/multimedia/libogg/libogg.mk
@@ -3,12 +3,10 @@
 # libogg
 #
 #############################################################
-LIBOGG_VERSION = 1.2.2
+LIBOGG_VERSION = 1.3.0
 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
-LIBOGG_AUTORECONF = NO
 LIBOGG_INSTALL_STAGING = YES
-LIBOGG_INSTALL_TARGET = YES
 
 LIBOGG_DEPENDENCIES = host-pkg-config
 

From e157720be341daa04296bcee9f7d310e861dedc0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Jan 2012 09:03:05 +0100
Subject: [PATCH 1276/6849] kernel-headers: bump 3.0.x / 3.2.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.17-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.18-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 36bb719900..701fe7f76e 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.17"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.18"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.1"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.2"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.17-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.18-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.17-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.18-headers_install-fix-__packed-in-exported-kernel-head.patch

From cd97b5d2b103c83dce09af6c4ae11d98038d92e7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Jan 2012 09:03:55 +0100
Subject: [PATCH 1277/6849] linux: bump default 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index bbef487c93..132f87eba1 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_2
 
 config BR2_LINUX_KERNEL_3_2
-	bool "3.2.1"
+	bool "3.2.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2.1" if BR2_LINUX_KERNEL_3_2
+	default "3.2.2" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 208e2388dfc5f80b36661c0ddd6cb63d80028717 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Jan 2012 11:30:29 +0100
Subject: [PATCH 1278/6849] gst-plugins-base: fix build with updated tremor

Patch sent upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gst-plugins-base-0.10.35-tremor.patch     | 139 ++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch b/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch
new file mode 100644
index 0000000000..fa8785bed4
--- /dev/null
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch
@@ -0,0 +1,139 @@
+From 0088753651350de3060ece22c1be4153b6009515 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Wed, 25 Jan 2012 23:53:04 +0100
+Subject: [PATCH] base: vorbisdeclib: support modern Tremor versions
+
+Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=668726
+
+Tremor changed to use standard libogg rather than its own incompatible
+copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail.
+
+Tremolo so far unfortunately hasn't been updated. Restructure
+vorbisdeclib.h so the legacy _ogg_packet_wrapper code is only used for
+Tremolo.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ ext/vorbis/gstvorbisdeclib.h |   77 ++++++++++++++++++++++-------------------
+ 1 files changed, 41 insertions(+), 36 deletions(-)
+
+diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h
+index ca00af9..e147591 100644
+--- a/ext/vorbis/gstvorbisdeclib.h
++++ b/ext/vorbis/gstvorbisdeclib.h
+@@ -29,11 +29,6 @@
+ 
+ #ifndef TREMOR
+ 
+-#include <vorbis/codec.h>
+-
+-typedef float                          vorbis_sample_t;
+-typedef ogg_packet                     ogg_packet_wrapper;
+-
+ #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio"
+ 
+ #define GST_VORBIS_DEC_SRC_CAPS \
+@@ -47,6 +42,42 @@ typedef ogg_packet                     ogg_packet_wrapper;
+ 
+ #define GST_VORBIS_DEC_GLIB_TYPE_NAME      GstVorbisDec
+ 
++#else /* TREMOR */
++
++#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
++
++#define GST_VORBIS_DEC_SRC_CAPS \
++    GST_STATIC_CAPS ("audio/x-raw-int, "   \
++        "rate = (int) [ 1, MAX ], "        \
++        "channels = (int) [ 1, 6 ], "      \
++        "endianness = (int) BYTE_ORDER, "  \
++        "width = (int) { 16, 32 }, "       \
++        "depth = (int) 16, "               \
++        "signed = (boolean) true")
++
++#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH           (16)
++
++/* we need a different type name here */
++#define GST_VORBIS_DEC_GLIB_TYPE_NAME      GstIVorbisDec
++
++/* and still have it compile */
++typedef struct _GstVorbisDec               GstIVorbisDec;
++typedef struct _GstVorbisDecClass          GstIVorbisDecClass;
++
++#endif /* TREMOR */
++
++#ifndef USE_TREMOLO
++
++#ifdef TREMOR
++ #include <tremor/ivorbiscodec.h>
++ typedef ogg_int32_t                    vorbis_sample_t;
++#else
++ #include <vorbis/codec.h>
++ typedef float                          vorbis_sample_t;
++#endif
++
++typedef ogg_packet                     ogg_packet_wrapper;
++
+ static inline guint8 *
+ gst_ogg_packet_data (ogg_packet * p)
+ {
+@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet)
+   return packet;
+ }
+ 
+-#else
+-
+-#ifdef USE_TREMOLO
+-  #include <Tremolo/ivorbiscodec.h>
+-  #include <Tremolo/codec_internal.h>
+-  typedef ogg_int16_t                    vorbis_sample_t;
+-#else
+-  #include <tremor/ivorbiscodec.h>
+-  typedef ogg_int32_t                    vorbis_sample_t;
+-#endif
++#else /* USE_TREMOLO */
+ 
++#include <Tremolo/ivorbiscodec.h>
++#include <Tremolo/codec_internal.h>
++typedef ogg_int16_t                    vorbis_sample_t;
+ typedef struct _ogg_packet_wrapper     ogg_packet_wrapper;
+ 
+ struct _ogg_packet_wrapper {
+@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper {
+   ogg_buffer          buf;
+ };
+ 
+-#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
+-
+-#define GST_VORBIS_DEC_SRC_CAPS \
+-    GST_STATIC_CAPS ("audio/x-raw-int, "   \
+-        "rate = (int) [ 1, MAX ], "        \
+-        "channels = (int) [ 1, 6 ], "      \
+-        "endianness = (int) BYTE_ORDER, "  \
+-        "width = (int) { 16, 32 }, "       \
+-        "depth = (int) 16, "               \
+-        "signed = (boolean) true")
+-
+-#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH           (16)
+-
+-/* we need a different type name here */
+-#define GST_VORBIS_DEC_GLIB_TYPE_NAME      GstIVorbisDec
+-
+-/* and still have it compile */
+-typedef struct _GstVorbisDec               GstIVorbisDec;
+-typedef struct _GstVorbisDecClass          GstIVorbisDecClass;
+-
+ /* compensate minor variation */
+ #define vorbis_synthesis(a, b)             vorbis_synthesis (a, b, 1)
+ 
+@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet)
+   return &(packet->packet);
+ }
+ 
+-#endif
++#endif /* USE_TREMOLO */
+ 
+ typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in,
+                            guint samples, gint channels, gint width);
+-- 
+1.7.8.3
+

From 7c4c38403df01c4cbbb89c8b327d184f5a4b4dc6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Jan 2012 15:19:26 +0100
Subject: [PATCH 1279/6849] avahi: S05avahi-setup.sh: fix s/pid/ipd/ typo

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/S05avahi-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/avahi/S05avahi-setup.sh b/package/avahi/S05avahi-setup.sh
index 002f0c8925..f42a4d318f 100755
--- a/package/avahi/S05avahi-setup.sh
+++ b/package/avahi/S05avahi-setup.sh
@@ -2,7 +2,7 @@
 
 case "$1" in
     start|"")
-	if [ ! -d /tmp/avahi-autopid ]; then
+	if [ ! -d /tmp/avahi-autoipd ]; then
 	    rm -rf /tmp/avahi-autoipd
 	    mkdir /tmp/avahi-autoipd
 	    chown default.default /tmp/avahi-autoipd

From ce2977d9e0850b689a213d3bf0714ec5e5f626f4 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 26 Jan 2012 16:13:22 +0100
Subject: [PATCH 1280/6849] New package: linux-firmware

add infrastructure for closed binary blobs

[Peter: whitespace/Kconfig fixes, use tar to copy to TARGET_DIR]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/linux-firmware/Config.in         | 44 ++++++++++++++++++
 package/linux-firmware/linux-firmware.mk | 59 ++++++++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 package/linux-firmware/Config.in
 create mode 100644 package/linux-firmware/linux-firmware.mk

diff --git a/package/Config.in b/package/Config.in
index b245da8f96..251da85494 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -185,6 +185,7 @@ source "package/input-tools/Config.in"
 source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
+source "package/linux-firmware/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lsuio/Config.in"
 source "package/lvm2/Config.in"
diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
new file mode 100644
index 0000000000..9ce1a75d85
--- /dev/null
+++ b/package/linux-firmware/Config.in
@@ -0,0 +1,44 @@
+config BR2_PACKAGE_LINUX_FIRMWARE
+	bool "linux-firmware"
+	help
+	  This package provides various binary firmware files (closed
+	  binary blobs) for such devices like LAN, WLAN cards etc.
+
+	  https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+
+if BR2_PACKAGE_LINUX_FIRMWARE
+
+menu "Ralink"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
+	bool "Ralink rt2501/rt61"
+	help
+	  Ralink rt2501/rt61
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73
+	bool "Ralink rt73"
+	help
+	  Ralink rt73
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX
+	bool "Ralink rt27xx/rt28xx/rt30xx"
+	help
+	  Ralink rt27xx/rt28xx/rt30xx
+
+endmenu
+
+menu "Texas Instruments"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X
+	bool "wl127X"
+	help
+	  Firmware files for WLAN and Bluetooth modules wl1271 and wl1273
+
+config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X
+	bool "wl128X"
+	help
+	  Firmware files for WLAN and Bluetooth modules wl128x
+
+endmenu
+
+endif
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
new file mode 100644
index 0000000000..d5987ab6c5
--- /dev/null
+++ b/package/linux-firmware/linux-firmware.mk
@@ -0,0 +1,59 @@
+#############################################################
+#
+# linux-firmware
+#
+#############################################################
+LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
+LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+LINUX_FIRMWARE_SITE_METHOD = git
+
+# rt2501/rt61
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61) += \
+	rt2561.bin rt2561s.bin rt2661.bin LICENCE.ralink-firmware.txt
+
+
+# rt73
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73) += \
+	rt73.bin LICENCE.ralink-firmware.txt
+
+# rt2xx
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \
+	rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin 	\
+	LICENCE.ralink-firmware.txt
+
+# wl127x
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
+	ti-connectivity/wl1271-fw-2.bin				\
+	ti-connectivity/wl1271-fw-ap.bin			\
+	ti-connectivity/wl1271-fw.bin				\
+	ti-connectivity/wl1271-nvs.bin				\
+	ti-connectivity/wl127x-fw-3.bin				\
+	ti-connectivity/wl127x-fw-plt-3.bin			\
+	ti-connectivity/wl127x-nvs.bin				\
+	ti-connectivity/TIInit_7.2.31.bts 			\
+	LICENCE.ti-connectivity
+
+# wl128x
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
+	ti-connectivity/wl128x-fw-3.bin				\
+	ti-connectivity/wl128x-fw-ap.bin			\
+	ti-connectivity/wl128x-fw-plt-3.bin			\
+	ti-connectivity/wl128x-fw.bin				\
+	ti-connectivity/wl1271-nvs.bin				\
+	ti-connectivity/wl128x-nvs.bin				\
+	ti-connectivity/wl12xx-nvs.bin				\
+	ti-connectivity/TIInit_7.2.31.bts 			\
+	LICENCE.ti-connectivity
+
+
+ifneq ($(LINUX_FIRMWARE_FILES_y),)
+
+define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware
+	$(TAR) c -C $(@D) $(LINUX_FIRMWARE_FILES_y) | \
+		$(TAR) x -C $(TARGET_DIR)/lib/firmware
+endef
+
+endif
+
+$(eval $(call GENTARGETS))

From f2619d0576659fc86a0bf276716aad799aa50fee Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:20 -0300
Subject: [PATCH 1281/6849] bind: security bump to version 9.6-ESV-R5-P1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 4c7a612394..0de986da85 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R5
+BIND_VERSION = 9.6-ESV-R5-P1
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From 6d7a5607197921ac1c84c889e002b4f36c2040e0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:21 -0300
Subject: [PATCH 1282/6849] ntp: bump to version 4.2.6p5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntp/ntp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index f17193f201..8076ce7d15 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NTP_VERSION = 4.2.6p4
+NTP_VERSION = 4.2.6p5
 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
 

From 39820e507df144c1af8b2dd90e9051fafd170966 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:22 -0300
Subject: [PATCH 1283/6849] libraw1394: bump to version 2.0.7

[Peter: fixup whitespace]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libraw1394/Config.in     | 9 +++------
 package/libraw1394/libraw1394.mk | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/package/libraw1394/Config.in b/package/libraw1394/Config.in
index 49399e3291..7a64959a52 100644
--- a/package/libraw1394/Config.in
+++ b/package/libraw1394/Config.in
@@ -1,10 +1,7 @@
 config BR2_PACKAGE_LIBRAW1394
 	bool "libraw1394"
 	help
-		Library for direct access to IEEE 1394 bus.
+	  libraw1394 provides direct access to the IEEE 1394 bus through
+	  the Linux 1394 subsystem's raw1394 user space interface.
 
-		Through libraw1394/raw1394, applications can directly
-		send to and receive from other nodes without requiring
-		a kernel driver for the protocol in question.
-
-		http://www.linux1394.org/
+	  http://sourceforge.net/projects/libraw1394/
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index b7c844ce1b..2f77a48e87 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -3,9 +3,9 @@
 # libraw1394
 #
 #############################################################
-LIBRAW1394_VERSION:=1.2.1
-LIBRAW1394_SOURCE:=libraw1394-$(LIBRAW1394_VERSION).tar.gz
-LIBRAW1394_SITE:=http://www.kernel.org/pub/linux/libs/ieee1394/
-LIBRAW1394_INSTALL_STAGING=YES
+
+LIBRAW1394_VERSION = 2.0.7
+LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
+LIBRAW1394_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From 362281b466a44b37fc088632e390e39e3beaa808 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:23 -0300
Subject: [PATCH 1284/6849] bluez_utils: bump to version 4.98

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...move-libcheck-under-TEST-conditional.patch | 85 -------------------
 package/bluez_utils/bluez_utils.mk            |  5 +-
 2 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100755 package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch

diff --git a/package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch b/package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch
deleted file mode 100755
index b2f5303fbf..0000000000
--- a/package/bluez_utils/bluez_utils-move-libcheck-under-TEST-conditional.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Tue, 27 Dec 2011 20:09:56 -0800
-Subject: [PATCH] build: Move libcheck under TEST conditional
-
----
- Makefile.am  |    5 ++++-
- acinclude.m4 |    8 +++++++-
- configure.ac |    3 +--
- 3 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 9112483..5cf287c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -449,6 +449,7 @@ endif
- 
- unit_objects =
- 
-+if TEST
- unit_tests = unit/test-eir
- 
- noinst_PROGRAMS += $(unit_tests)
-@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
- unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
- unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
- unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
--unit_test_eir_SHORTNAME = unit
- unit_objects += $(unit_test_eir_OBJECTS)
-+else
-+unit_tests =
-+endif
- 
- TESTS = $(unit_tests)
- 
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2097d77..753b994 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
- 		[])
- ])
- 
-+AC_DEFUN([AC_PATH_CHECK], [
-+	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
-+	AC_SUBST(CHECK_CFLAGS)
-+	AC_SUBST(CHECK_LIBS)
-+])
-+
- AC_DEFUN([AC_PATH_OUI], [
- 	AC_ARG_WITH(ouifile,
- 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
-@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
- 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
- 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
--	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
-+	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
- 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
- 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
- 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
-diff --git a/configure.ac b/configure.ac
-index 3a5dfde..a7670da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,8 +24,6 @@ AC_PROG_YACC
- AM_PROG_LEX
- AM_PROG_MKDIR_P
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
--
- m4_define([_LT_AC_TAGCONFIG], [])
- m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
- 
-@@ -50,6 +48,7 @@ AC_PATH_UDEV
- AC_PATH_SNDFILE
- AC_PATH_OUI
- AC_PATH_READLINE
-+AC_PATH_CHECK
- 
- AC_ARG_BLUEZ
- 
--- 
-1.7.6.5
-
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index fe0f43f31f..025f31adbd 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -3,9 +3,10 @@
 # bluez_utils
 #
 #############################################################
-BLUEZ_UTILS_VERSION = 4.97
+
+BLUEZ_UTILS_VERSION = 4.98
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
-BLUEZ_UTILS_SITE = http://www.kernel.org/pub/linux/bluetooth/
+BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools

From 9b22dc764d7708a241900ea728278f114b014b72 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:24 -0300
Subject: [PATCH 1285/6849] netperf: bump to version 2.5.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netperf/netperf-2.4.5-dccp.patch      | 38 --------------
 package/netperf/netperf-2.4.5-netserver.patch | 51 -------------------
 package/netperf/netperf.mk                    |  2 +-
 3 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 package/netperf/netperf-2.4.5-dccp.patch
 delete mode 100644 package/netperf/netperf-2.4.5-netserver.patch

diff --git a/package/netperf/netperf-2.4.5-dccp.patch b/package/netperf/netperf-2.4.5-dccp.patch
deleted file mode 100644
index ae84cee6d0..0000000000
--- a/package/netperf/netperf-2.4.5-dccp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] fix build on systems where IPROTO_DCCP is defined, but SOCK_DCCP isn't
-
-On some systems (E.G. uClibc 0.9.31) IPROTO_DCCP is defined, but SOCK_DCCP
-isn't - Causing the build to break. Fix it by checking for both before
-using.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/netsh.c       |    2 +-
- src/nettest_bsd.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: netperf-2.4.5/src/netsh.c
-===================================================================
---- netperf-2.4.5.orig/src/netsh.c
-+++ netperf-2.4.5/src/netsh.c
-@@ -452,7 +452,7 @@ parse_protocol(char protocol_string[])
-     return IPPROTO_SDP;
-   }
- #endif
--#ifdef IPPROTO_DCCP
-+#if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-   if (!strcasecmp(temp,"dccp")) {
-     socket_type = SOCK_DCCP;
-     return IPPROTO_DCCP;
-Index: netperf-2.4.5/src/nettest_bsd.c
-===================================================================
---- netperf-2.4.5.orig/src/nettest_bsd.c
-+++ netperf-2.4.5/src/nettest_bsd.c
-@@ -712,7 +712,7 @@ complete_addrinfo(char *controlhost, cha
- 	 that we did this so the code for the Solaris kludge can do
- 	 the fix-up for us.  also flip error over to EAI_AGAIN and
- 	 make sure we don't "count" this time around the loop. */
--#if defined(IPPROTO_DCCP)
-+#if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-       /* only tweak on this one the second time around, after we've
- 	 kludged the ai_protocol field */
-       if ((hints.ai_socktype == SOCK_DCCP) &&
diff --git a/package/netperf/netperf-2.4.5-netserver.patch b/package/netperf/netperf-2.4.5-netserver.patch
deleted file mode 100644
index d841c1c70a..0000000000
--- a/package/netperf/netperf-2.4.5-netserver.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch?view=log
-# Set DEBUG_LOG_FILE location
-# Fix compiler warnings (bug #337422):
-	netserver.c: In function ‘process_requests’:
-	netserver.c:287: warning: array subscript is above array bounds
-	inlined from ‘process_requests’ at netserver.c:268:
-	/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
-	inlined from ‘process_requests’ at netserver.c:284:
-	/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
-
---- a/src/netserver.c
-+++ b/src/netserver.c
-@@ -142,7 +142,7 @@
- 
- #ifndef DEBUG_LOG_FILE
- #ifndef WIN32
--#define DEBUG_LOG_FILE "/tmp/netperf.debug"
-+#define DEBUG_LOG_FILE "/var/log/netperf.debug"
- #else
- #define DEBUG_LOG_FILE "c:\\temp\\netperf.debug"
- #endif  /* WIN32 */
-@@ -266,7 +266,7 @@
- 	      (!strstr(local_machine,delims[i])) &&
- 	      (!strstr(local_version,delims[i]))) {
- 	    snprintf((char *)netperf_response.content.test_specific_data,
--		     sizeof(netperf_response) - 7,
-+		     MAXSPECDATA,
- 		     "%c%s%c%s%c%s%c%s",
- 		     delims[i][0],
- 		     local_sysname,
-@@ -282,15 +282,15 @@
- 	if (i == 4) {
- 	  /* none of the delimiters were unique, use the last one */
- 	  snprintf((char *)netperf_response.content.test_specific_data,
--		   sizeof(netperf_response) - 7,
-+		   MAXSPECDATA,
- 		   "%c%s%c%s%c%s%c%s",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique");
- 	}
- 	send_response_n(0);
diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index a66d4ef705..6a8acedbfc 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETPERF_VERSION = 2.4.5
+NETPERF_VERSION = 2.5.0
 NETPERF_SITE = ftp://ftp.netperf.org/netperf
 NETPERF_CONF_ENV = ac_cv_func_setpgrp_void=set
 

From bc83dd2706082b140203a29084ca33c293cf6469 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:25 -0300
Subject: [PATCH 1286/6849] expat: fix style and drop stray file

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/expat/Makefile.in | 3 ---
 package/expat/expat.mk    | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 package/expat/Makefile.in

diff --git a/package/expat/Makefile.in b/package/expat/Makefile.in
deleted file mode 100644
index 1d5d6bc0bf..0000000000
--- a/package/expat/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(BR2_PACKAGE_EXPAT),y)
-TARGETS+=expat
-endif
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 64a14163b0..b179383fff 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -5,13 +5,10 @@
 #############################################################
 
 EXPAT_VERSION = 2.0.1
-EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
 EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
 EXPAT_INSTALL_STAGING = YES
-EXPAT_INSTALL_TARGET = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
-
 EXPAT_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS))

From 008f2c205090c1fde8c3646f2b104da7d02648d2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:26 -0300
Subject: [PATCH 1287/6849] lm-sensors: bump to version 3.3.1 and fix pwmconfig
 install

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lm-sensors/lm-sensors.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 99a8e3bd22..a351329952 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -3,7 +3,8 @@
 # lm-sensors
 #
 #############################################################
-LM_SENSORS_VERSION = 3.2.0
+
+LM_SENSORS_VERSION = 3.3.1
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES
@@ -13,6 +14,7 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_FANCONTROL) += sbin/fancontrol
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISADUMP) += sbin/isadump
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISASET) += sbin/isaset
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 define LM_SENSORS_BUILD_CMDS

From c72d3a2a7e2c041f1e7566d78368ca01efa8f3f8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:27 -0300
Subject: [PATCH 1288/6849] i2c-tools: bump to version 3.1.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/i2c-tools/i2c-tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 8628eaf2a7..aeabf02bd0 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-I2C_TOOLS_VERSION = 3.0.3
+I2C_TOOLS_VERSION = 3.1.0
 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.bz2
-I2C_TOOLS_SITE = http://dl.lm-sensors.org/i2c-tools/releases/
+I2C_TOOLS_SITE = http://dl.lm-sensors.org/i2c-tools/releases
 
 define I2C_TOOLS_BUILD_CMDS
  $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From e4280ff8f05735be43bb2a624d33e9e8deba3164 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:28 -0300
Subject: [PATCH 1289/6849] hdparm: bump to version 9.38

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hdparm/hdparm.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index d19dff00c6..abbb0c3254 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -3,8 +3,8 @@
 # hdparm
 #
 #############################################################
-HDPARM_VERSION = 9.36
-HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz
+
+HDPARM_VERSION = 9.38
 HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
 
 define HDPARM_BUILD_CMDS

From f8a117435a184e77102fdb64f1698d35d519a6f6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:29 -0300
Subject: [PATCH 1290/6849] e2fsprogs: bump to version 1.42

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/Config.in                   |  3 +++
 ...progs-add-missing-dep-of-tst_uuid-o.patch} |  0
 package/e2fsprogs/e2fsprogs-fallocate.patch   | 22 +++++++++++++++++++
 ...bs.patch => e2fsprogs-sem-init-libs.patch} |  0
 package/e2fsprogs/e2fsprogs.mk                |  3 ++-
 5 files changed, 27 insertions(+), 1 deletion(-)
 rename package/e2fsprogs/{e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch => e2fsprogs-add-missing-dep-of-tst_uuid-o.patch} (100%)
 create mode 100644 package/e2fsprogs/e2fsprogs-fallocate.patch
 rename package/e2fsprogs/{e2fsprogs-1.41.9-sem-init-libs.patch => e2fsprogs-sem-init-libs.patch} (100%)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index a98c49efa3..d4f4405331 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -47,6 +47,9 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
 	bool "e2undo"
 	default y
 
+config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
+	bool "e4defrag"
+
 config BR2_PACKAGE_E2FSPROGS_FILEFRAG
 	bool "filefrag"
 	default y
diff --git a/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
similarity index 100%
rename from package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
rename to package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
diff --git a/package/e2fsprogs/e2fsprogs-fallocate.patch b/package/e2fsprogs/e2fsprogs-fallocate.patch
new file mode 100644
index 0000000000..4d952a5df7
--- /dev/null
+++ b/package/e2fsprogs/e2fsprogs-fallocate.patch
@@ -0,0 +1,22 @@
+We assume that fallocate is supported somehow
+but we need to check if we have fallocate()
+this problem shows up on uclibc systems since
+uclibc does not have fallocate() implemented
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
+===================================================================
+--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c	2012-01-17 17:24:34.290780625 -0800
++++ e2fsprogs-1.42/lib/ext2fs/unix_io.c	2012-01-17 17:25:37.338783680 -0800
+@@ -895,7 +895,7 @@
+ 		goto unimplemented;
+ #endif
+ 	} else {
+-#ifdef FALLOC_FL_PUNCH_HOLE
++#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE
+ 		/*
+ 		 * If we are not on block device, try to use punch hole
+ 		 * to reclaim free space.
diff --git a/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch b/package/e2fsprogs/e2fsprogs-sem-init-libs.patch
similarity index 100%
rename from package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
rename to package/e2fsprogs/e2fsprogs-sem-init-libs.patch
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index d945a12263..912deab6c6 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.41.14
+E2FSPROGS_VERSION = 1.42
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \
@@ -39,6 +39,7 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo
+E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave

From 17bbd07af452bf76b6b2a605fc669a487a362986 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:30 -0300
Subject: [PATCH 1291/6849] libpcap: bump to version 1.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpcap/libpcap.mk | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 6b44e49450..0b88a42114 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -4,18 +4,17 @@
 #
 #############################################################
 
-LIBPCAP_VERSION:=1.1.1
-LIBPCAP_SITE:=http://www.tcpdump.org/release
-LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz
-LIBPCAP_INSTALL_STAGING:=YES
+LIBPCAP_VERSION = 1.2.1
+LIBPCAP_SITE = http://www.tcpdump.org/release
+LIBPCAP_INSTALL_STAGING = YES
 # doesn't have an install-strip
 LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
 	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
 LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
 	$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
-LIBPCAP_DEPENDENCIES:=zlib
-LIBPCAP_CONF_ENV:=ac_cv_linux_vers=2 \
-		  ac_cv_header_linux_wireless_h=yes # configure misdetects this
-LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux
+LIBPCAP_DEPENDENCIES = zlib
+LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
+		ac_cv_header_linux_wireless_h=yes # configure misdetects this
+LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
 $(eval $(call AUTOTARGETS))

From bee85e782fa5d2ed06d6cf94ec5e29f9c4d7b9e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:31 -0300
Subject: [PATCH 1292/6849] tcpdump: bump to version 4.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpdump/tcpdump-4.1.1-vfork.patch | 127 ----------------------
 package/tcpdump/tcpdump.mk                |  12 +-
 2 files changed, 6 insertions(+), 133 deletions(-)
 delete mode 100644 package/tcpdump/tcpdump-4.1.1-vfork.patch

diff --git a/package/tcpdump/tcpdump-4.1.1-vfork.patch b/package/tcpdump/tcpdump-4.1.1-vfork.patch
deleted file mode 100644
index 8213f35f59..0000000000
--- a/package/tcpdump/tcpdump-4.1.1-vfork.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3120897&group_id=53066&atid=469575
-
-From 6f8927c609d1f986a45010b7acae0eb570668642 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 27 Nov 2010 17:18:05 -0500
-Subject: [PATCH] add support for nommu systems
-
-Rather than hardcode the WIN32 define, add proper fork checks to the
-configure script and check those.  This fixes building for nommu systems
-which lack the fork function.
-
-While we're here though, add support for this functionality via vfork
-so that it does work on nommu systems.  And fix an old bug where we
-exit properly in the forked child when the exec failed instead of just
-returning to the calling code (which isn't expecting it).
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
-
---- tcpdump-4.0.0/config.h.in
-+++ tcpdump-4.0.0/config.h.in
-@@ -151,6 +151,9 @@
- /* Define to 1 if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
- 
-+/* Define to 1 if you have the `fork' function. */
-+#undef HAVE_FORK
-+
- /* Define to 1 if you have the `getnameinfo' function. */
- #undef HAVE_GETNAMEINFO
- 
-@@ -274,6 +277,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the `vfork' function. */
-+#undef HAVE_VFORK
-+
- /* Define to 1 if you have the `vfprintf' function. */
- #undef HAVE_VFPRINTF
- 
---- tcpdump-4.0.0/configure
-+++ tcpdump-4.0.0/configure
-@@ -7976,7 +7976,7 @@ done
- 
- 
- 
--for ac_func in strftime
-+for ac_func in fork vfork strftime
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-diff --git a/tcpdump.c b/tcpdump.c
-index c8da36b..abf3e69 100644
---- a/tcpdump.c
-+++ b/tcpdump.c
-@@ -1250,8 +1250,10 @@ main(int argc, char **argv)
- 	(void)setsignal(SIGPIPE, cleanup);
- 	(void)setsignal(SIGTERM, cleanup);
- 	(void)setsignal(SIGINT, cleanup);
--	(void)setsignal(SIGCHLD, child_cleanup);
- #endif /* WIN32 */
-+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
-+	(void)setsignal(SIGCHLD, child_cleanup);
-+#endif
- 	/* Cooperate with nohup(1) */
- #ifndef WIN32	
- 	if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
-@@ -1464,13 +1466,13 @@ cleanup(int signo _U_)
-   On windows, we do not use a fork, so we do not care less about
-   waiting a child processes to die
-  */
--#ifndef WIN32
-+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
- static RETSIGTYPE
- child_cleanup(int signo _U_)
- {
-   wait(NULL);
- }
--#endif /* WIN32 */
-+#endif /* HAVE_FORK || HAVE_VFORK */
- 
- static void
- info(register int verbose)
-@@ -1514,11 +1516,15 @@ info(register int verbose)
- 	infoprint = 0;
- }
- 
--#ifndef WIN32
-+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
- static void
- compress_savefile(const char *filename)
- {
-+# ifdef HAVE_FORK
- 	if (fork())
-+# else
-+	if (vfork())
-+# endif
- 		return;
- 	/*
- 	 * Set to lowest priority so that this doesn't disturb the capture
-@@ -1534,15 +1540,20 @@ compress_savefile(const char *filename)
- 			zflag,
- 			filename,
- 			strerror(errno));
-+# ifdef HAVE_FORK
-+	exit(1);
-+# else
-+	_exit(1);
-+# endif
- }
--#else  /* WIN32 */
-+#else  /* HAVE_FORK || HAVE_VFORK */
- static void
- compress_savefile(const char *filename)
- {
- 	fprintf(stderr,
--		"compress_savefile failed. Functionality not implemented under windows\n");
-+		"compress_savefile failed. Functionality not implemented under your system\n");
- }
--#endif /* WIN32 */
-+#endif /* HAVE_FORK || HAVE_VFORK */
- 
- static void
- dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
--- 
-1.7.3.1
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 153454319a..cf23df3913 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -6,13 +6,13 @@
 # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
 
-TCPDUMP_VERSION:=4.1.1
-TCPDUMP_SITE:=http://www.tcpdump.org/release
-TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz
-TCPDUMP_CONF_ENV:=ac_cv_linux_vers=2
-TCPDUMP_CONF_OPT:=--without-crypto \
+TCPDUMP_VERSION = 4.2.1
+TCPDUMP_SITE = http://www.tcpdump.org/release
+TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
+TCPDUMP_CONF_ENV = ac_cv_linux_vers=2
+TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
-TCPDUMP_DEPENDENCIES:=zlib libpcap
+TCPDUMP_DEPENDENCIES = zlib libpcap
 
 # make install installs an unneeded extra copy of the tcpdump binary
 define TCPDUMP_REMOVE_DUPLICATED_BINARY

From bae709907c30aaf6f84f44d188f9f399038bd410 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jan 2012 13:51:32 -0300
Subject: [PATCH 1293/6849] ipset: bump to version 6.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index d8df0263a4..06393f4e94 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.10
+IPSET_VERSION = 6.11
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES

From c1d52aea4960c93b1ea939642ef1f69a9c93306f Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:14 +0000
Subject: [PATCH 1294/6849] jpeg: Allow building of libjpeg for the host

Signed-off-by: Will Newton <will.newton@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jpeg/jpeg.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 555c3e15ea..a88226843b 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -16,3 +16,4 @@ endef
 JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From cd21fa2d661f0c2bbdfd93f4aded7a8a61caf504 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:17 +0000
Subject: [PATCH 1295/6849] lua: Allow building lua for the host

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/lua.mk | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index c95e18a67e..1dabedf465 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -21,6 +21,10 @@ else
 	LUA_MYCFLAGS += -DLUA_USE_POSIX
 endif
 
+HOST_LUA_DEPENDENCIES =
+HOST_LUA_MYCFLAGS = -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
+HOST_LUA_MYLIBS = -ldl
+
 define LUA_BUILD_CMDS
 	sed -i -e 's/-O2//' $(@D)/src/Makefile
 	sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
@@ -31,6 +35,15 @@ define LUA_BUILD_CMDS
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef
 
+define HOST_LUA_BUILD_CMDS
+	sed -i -e 's/-O2//' $(@D)/src/Makefile
+	sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
+	$(MAKE) \
+	MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
+	MYLIBS="$(HOST_LUA_MYLIBS)" \
+	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
+endef
+
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_STAGING_SHARED_LIB
 	$(INSTALL) -D $(@D)/src/liblua.so.$(LUA_VERSION) \
@@ -94,6 +107,21 @@ define LUA_INSTALL_TARGET_CMDS
 	$(LUA_INSTALL_DEVFILES)
 endef
 
+define HOST_LUA_INSTALL_CMDS
+	$(INSTALL) $(@D)/src/lua $(HOST_DIR)/usr/bin
+	$(INSTALL) $(@D)/src/luac $(HOST_DIR)/usr/bin
+	$(INSTALL) $(@D)/src/liblua.so.$(LUA_VERSION) \
+		$(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
+	ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so
+	$(INSTALL) $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a
+	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
+		$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
+	$(INSTALL) $(@D)/src/lua.h $(HOST_DIR)/usr/include
+	$(INSTALL) $(@D)/src/luaconf.h $(HOST_DIR)/usr/include
+	$(INSTALL) $(@D)/src/lualib.h $(HOST_DIR)/usr/include
+	$(INSTALL) $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include
+endef
+
 LUA_INSTALLED_FILES = \
 	/usr/include/lua.h \
 	/usr/include/luaconf.h \
@@ -117,8 +145,19 @@ define LUA_UNINSTALL_TARGET_CMDS
 	done
 endef
 
+define HOST_LUA_UNINSTALL_TARGET_CMDS
+	for i in $(LUA_INSTALLED_FILES); do \
+		rm -f $(HOST_DIR)$$i; \
+	done
+endef
+
 define LUA_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
+define HOST_LUA_CLEAN_CMDS
+	-$(MAKE) -C $(@D) clean
+endef
+
 $(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))

From 5a05d31da25a28e8acaae116e923541be012bb0c Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:22 +0000
Subject: [PATCH 1296/6849] xcb-util: Install xcb-util libraries into staging

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xcb-util/xcb-util.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index 0158c9f095..c43e4cbba2 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -6,6 +6,7 @@
 XCB_UTIL_VERSION = 0.3.6
 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
+XCB_UTIL_INSTALL_STAGING = YES
 XCB_UTIL_DEPENDENCIES = host-gperf
 
 $(eval $(call AUTOTARGETS))

From 66c1b5f4088382da8b607bed7809169fc1edad8f Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:25 +0000
Subject: [PATCH 1297/6849] libeina: Add new package along with EFL
 infrastructure

[Peter: drop autoreconf, add URL]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/efl/Config.in          | 16 ++++++++++++++++
 package/efl/efl.mk             |  1 +
 package/efl/libeina/Config.in  |  6 ++++++
 package/efl/libeina/libeina.mk | 15 +++++++++++++++
 5 files changed, 39 insertions(+)
 create mode 100644 package/efl/Config.in
 create mode 100644 package/efl/efl.mk
 create mode 100644 package/efl/libeina/Config.in
 create mode 100644 package/efl/libeina/libeina.mk

diff --git a/package/Config.in b/package/Config.in
index 251da85494..65c2a98c65 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -118,6 +118,7 @@ source "package/sdl_ttf/Config.in"
 source "package/sdl_gfx/Config.in"
 
 comment "other GUIs"
+source "package/efl/Config.in"
 source "package/qt/Config.in"
 source "package/x11r7/Config.in"
 
diff --git a/package/efl/Config.in b/package/efl/Config.in
new file mode 100644
index 0000000000..cc677cb39b
--- /dev/null
+++ b/package/efl/Config.in
@@ -0,0 +1,16 @@
+menuconfig BR2_PACKAGE_EFL
+	bool "Enlightenment Foundation Libraries"
+	depends on BR2_USE_WCHAR
+	help
+	  Enlightenment Foundation Libraries
+
+	  http://enlightenment.org
+
+if BR2_PACKAGE_EFL
+
+source "package/efl/libeina/Config.in"
+
+endif # BR2_PACKAGE_EFL
+
+comment "EFL requires WCHAR support in toolchain"
+	depends on !BR2_USE_WCHAR
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
new file mode 100644
index 0000000000..d8d53cf396
--- /dev/null
+++ b/package/efl/efl.mk
@@ -0,0 +1 @@
+include package/efl/*/*.mk
diff --git a/package/efl/libeina/Config.in b/package/efl/libeina/Config.in
new file mode 100644
index 0000000000..80600ad340
--- /dev/null
+++ b/package/efl/libeina/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBEINA
+	bool "libeina"
+	help
+	  Eina is a tiny library to handle data types (list, hash, etc.)
+
+	  http://trac.enlightenment.org/e/wiki/Eina
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
new file mode 100644
index 0000000000..b457e3ff82
--- /dev/null
+++ b/package/efl/libeina/libeina.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libeina
+#
+#############################################################
+
+LIBEINA_VERSION = 1.1.0
+LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
+LIBEINA_SITE = http://download.enlightenment.org/releases/
+LIBEINA_INSTALL_STAGING = YES
+
+LIBEINA_DEPENDENCIES = host-pkg-config
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From cc06f041fcffecf9a62c64eeff40a00f522bcddf Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:29 +0000
Subject: [PATCH 1298/6849] libeet: Add new package

[Peter: add URL, drop _INSTALL_TARGET]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in        |  1 +
 package/efl/libeet/Config.in | 11 +++++++++++
 package/efl/libeet/libeet.mk | 15 +++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/efl/libeet/Config.in
 create mode 100644 package/efl/libeet/libeet.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index cc677cb39b..8ca514d15c 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -9,6 +9,7 @@ menuconfig BR2_PACKAGE_EFL
 if BR2_PACKAGE_EFL
 
 source "package/efl/libeina/Config.in"
+source "package/efl/libeet/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libeet/Config.in b/package/efl/libeet/Config.in
new file mode 100644
index 0000000000..48631a055e
--- /dev/null
+++ b/package/efl/libeet/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBEET
+	bool "libeet"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBEINA
+	help
+	  Eet is a tiny library designed to write an arbitary set of
+	  chunks of data to a file and optionally compress each chunk
+	  (very much like a zip file).
+
+	  http://trac.enlightenment.org/e/wiki/Eet
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
new file mode 100644
index 0000000000..f9af219b71
--- /dev/null
+++ b/package/efl/libeet/libeet.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libeet
+#
+#############################################################
+
+LIBEET_VERSION = 1.5.0
+LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
+LIBEET_SITE = http://download.enlightenment.org/releases/
+LIBEET_INSTALL_STAGING = YES
+
+LIBEET_DEPENDENCIES = host-pkg-config zlib jpeg libeina
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 5796753b6b4caba703cf23f45f68b7715d1150a4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 27 Jan 2012 11:18:52 +0100
Subject: [PATCH 1299/6849] mplayer: add optional vorbis dependency

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 2ac5e16e2f..216bb4684c 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -72,6 +72,11 @@ MPLAYER_DEPENDENCIES += tremor
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
 endif
 
+ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+MPLAYER_DEPENDENCIES += libvorbis
+MPLAYER_CONF_OPTS += --enable-libvorbis
+endif
+
 ifeq ($(BR2_PACKAGE_LIBMAD),y)
 MPLAYER_DEPENDENCIES += libmad
 else

From 5d2df61ebd0ee06b5c7cec6fc9c06286dbf85eae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 28 Jan 2012 23:01:05 +0100
Subject: [PATCH 1300/6849] vala: bump version

Tarball is only available as .xz

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 0a1aed0d91..52a85102cb 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-VALA_VERSION = 0.14.0
-VALA_SITE = http://download.gnome.org/sources/vala/0.14
-VALA_SOURCE = vala-$(VALA_VERSION).tar.bz2
+VALA_VERSION_MAJOR = 0.15
+VALA_VERSION_MINOR = 1
+VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
+VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
+VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
 VALA_DEPENDENCIES = host-flex libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 HOST_VALA_DEPENDENCIES = host-flex host-libglib2

From 73b942e57efa4fe27e61030f798a092412e08561 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:33 +0000
Subject: [PATCH 1301/6849] libevas: Add new package

[Peter: Config.in tweaks]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in          |   1 +
 package/efl/libevas/Config.in  | 240 +++++++++++++++++++++++++++++++++
 package/efl/libevas/libevas.mk | 187 +++++++++++++++++++++++++
 3 files changed, 428 insertions(+)
 create mode 100644 package/efl/libevas/Config.in
 create mode 100644 package/efl/libevas/libevas.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 8ca514d15c..27d1f9519e 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -10,6 +10,7 @@ if BR2_PACKAGE_EFL
 
 source "package/efl/libeina/Config.in"
 source "package/efl/libeet/Config.in"
+source "package/efl/libevas/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
new file mode 100644
index 0000000000..5b48af22ed
--- /dev/null
+++ b/package/efl/libevas/Config.in
@@ -0,0 +1,240 @@
+config BR2_PACKAGE_LIBEVAS
+	bool "libevas"
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_LIBEINA
+	help
+	  Evas is a clean display canvas API for several target
+	  display systems that can draw anti-aliased text, smooth
+	  super and sub-sampled scaled images, alpha-blend objects
+	  much and more.
+
+if BR2_PACKAGE_LIBEVAS
+
+comment "libevas rendering options"
+
+config BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE
+	bool "libevas sampling scaler"
+	help
+	  This enables the sampling scaler code. This is the fastest
+	  image scaling code, but also the lowest quality.
+
+config BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH
+	bool "libevas smooth scaler"
+	help
+	  This is the nicest looking scaler that is not that much
+	  slower than tri-linear, but it looks really good.
+
+config BR2_PACKAGE_LIBEVAS_SMALL_DITHERING
+	bool "libevas small dithering"
+	help
+	  This uses a 4x4 dither mask instead of 128x128. On desktop
+	  boxes these days (Pentium, Pentium2, amd etc.) the speed
+	  difference is not really measurable, but the quality of the
+	  128x128 dither mask is quite a lot better.
+
+config BR2_PACKAGE_LIBEVAS_LINE_DITHERING
+	bool "libevas line dithering"
+
+config BR2_PACKAGE_LIBEVAS_NO_DITHERING
+	bool "libevas no dithering"
+
+
+comment "libevas backends"
+
+config BR2_PACKAGE_LIBEVAS_BUFFER
+	bool "libevas buffer backend"
+	depends on BR2_PACKAGE_XORG7
+	help
+	  This enables the software buffer rendering engine. There is
+	  no hardware assist here.
+
+config BR2_PACKAGE_LIBEVAS_DIRECTFB
+	bool "libevas DirectFB backend"
+	depends on BR2_PACKAGE_DIRECTFB
+	default y
+	help
+	  This is the DirectFB engine that uses the DirectFB library
+	  (http://www.directfb.org) on Linux to access the framebuffer
+	  with (or maybe without) acceleration.
+
+config BR2_PACKAGE_LIBEVAS_FB
+	bool "libevas frame buffer backend"
+	help
+	  This is the software framebuffer driving engine. this uses
+	  the linux framebuffer device (/dev/fb<x>) and will currently
+	  just inherit the current framebuffer settings on the fb
+	  device and use them to run in.
+
+config BR2_PACKAGE_LIBEVAS_SDL
+	bool "libevas SDL backend"
+	select BR2_PACKAGE_SDL
+	help
+	  This is the software SDL engine that uses SDL library
+	  (http://www.libsdl.org). This library should work on many
+	  operating systems.
+
+config BR2_PACKAGE_LIBEVAS_SDL_GL
+	bool "libevas SDL OpenGL backend"
+	depends on BR2_PACKAGE_SDL_X11
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	help
+	  This is the SDL OpenGL engine that uses SDL library
+	  and OpenGL to render. This may be hardware accelerated.
+
+config BR2_PACKAGE_LIBEVAS_X11
+	bool "libevas X11 backend"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  This enables the software X11 rendering engine that renders
+	  to X drawable targets using highly optimised software
+	  routines. There is no hardware assist here.
+
+config BR2_PACKAGE_LIBEVAS_X11_GLX
+	bool "libevas X11 GLX backend"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	help
+	  This enables the OpenGL X11 rendering engine that renders
+	  using GLX which may be hardware accelerated.
+
+config BR2_PACKAGE_LIBEVAS_XCB
+	bool "libevas XCB backend"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XCB_UTIL
+	select BR2_PACKAGE_XCB_PROTO
+	select BR2_PACKAGE_PIXMAN
+	help
+	  This enable the software XCB rendering engine. It allows the
+	  same features than the software X11 engine.
+
+config BR2_PACKAGE_LIBEVAS_XCB_GLX
+	bool "libevas XCB GLX backend"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XCB_UTIL
+	select BR2_PACKAGE_XCB_PROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	help
+	  This enables the OpenGL X11 XCB rendering engine that renders
+	  using GLX which may be hardware accelerated.
+
+choice
+	prompt "libevas OpenGL flavor"
+	depends on BR2_PACKAGE_LIBEVAS_SDL_GL || BR2_PACKAGE_LIBEVAS_X11_GLX || BR2_PACKAGE_LIBEVAS_XCB_GLX
+	default BR2_PACKAGE_LIBEVAS_GL
+
+config BR2_PACKAGE_LIBEVAS_GL
+       bool "generic OpenGL"
+
+config BR2_PACKAGE_LIBEVAS_GLES_SGX
+       bool "OpenGL-ES SGX"
+
+config BR2_PACKAGE_LIBEVAS_GLES_S3C6410
+       bool "OpenGL-ES S3C6410"
+endchoice
+
+
+comment "libevas code tuning"
+
+config BR2_PACKAGE_LIBEVAS_DISABLE_C
+	bool "libevas disable C code"
+	depends on BR2_PACKAGE_LIBEVAS_MMX || BR2_PACKAGE_LIBEVAS_SSE || BR2_PACKAGE_LIBEVAS_SSE3
+	help
+	  This disables the generic C fallback code which is not required
+	  if MMX or SSE is used instead.
+
+config BR2_PACKAGE_LIBEVAS_MMX
+	bool "libevas MMX routines"
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  This enables the MMX optimized routines. this works for
+	  Pentium, Pentium 2, Pentium 3, Pentium 4, Athlon and Duron
+	  processors.
+
+config BR2_PACKAGE_LIBEVAS_SSE
+	bool "libevas SSE routines"
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  This enables SSE optimizations available in the Pentium 3 and
+	  4 cpus (not Athlon and Duron or Pentium 2 or Pentium cpus).
+
+config BR2_PACKAGE_LIBEVAS_SSE3
+	bool "libevas SSE3 routines"
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  This enables SSE3 optimizations available in the Pentium 4 and
+	  above cpus.
+
+config BR2_PACKAGE_LIBEVAS_ALTIVEC
+	bool "libevas altivec routines"
+	depends on BR2_powerpc
+	help
+	  This enables AltiVec optimizations available in some PowerPC cpus.
+
+config BR2_PACKAGE_LIBEVAS_NEON
+	bool "libevas neon routines"
+	depends on BR2_arm
+	help
+	  This enables NEON optimizations available in some ARM cpus.
+
+
+comment "libevas loaders"
+
+config BR2_PACKAGE_LIBEVAS_PNG
+	bool "libevas png loader"
+	select BR2_PACKAGE_LIBPNG
+	help
+	  This enables the loader code that loads png files using
+	  libpng.
+
+config BR2_PACKAGE_LIBEVAS_JPEG
+	bool "libevas jpeg loader"
+	select BR2_PACKAGE_JPEG
+	help
+	  This enables the loader code that loads jpeg files using
+	  libjpeg.
+
+config BR2_PACKAGE_LIBEVAS_GIF
+	bool "libevas gif loader"
+	select BR2_PACKAGE_LIBUNGIF
+	help
+	  This enables the loader code that loads gif files using
+	  libungif.
+
+config BR2_PACKAGE_LIBEVAS_PMAPS
+	bool "libevas pmaps loader"
+	help
+	  This enables the loader code that loads pmaps files.
+
+config BR2_PACKAGE_LIBEVAS_TIFF
+	bool "libevas tiff loader"
+	select BR2_PACKAGE_TIFF
+	help
+	  This enables the loader code that loads tiff files.
+
+config BR2_PACKAGE_LIBEVAS_SVG
+	bool "libevas svg loader"
+	help
+	  This enables the loader code that loads svg files.
+
+config BR2_PACKAGE_LIBEVAS_XPM
+	bool "libevas xpm loader"
+	help
+	  This enables the loader code that loads xpm files.
+
+config BR2_PACKAGE_LIBEVAS_EET
+	bool "libevas eet image loader"
+	select BR2_PACKAGE_LIBEET
+	help
+	  This enables the loader code that loads images using libeet.
+
+config BR2_PACKAGE_LIBEVAS_EET_FONT
+	bool "libevas eet font loader"
+	select BR2_PACKAGE_LIBEET
+	help
+	  This enables the loader code that loads fonts using libeet.
+
+endif # BR2_PACKAGE_LIBEVAS
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
new file mode 100644
index 0000000000..1a96551fe4
--- /dev/null
+++ b/package/efl/libevas/libevas.mk
@@ -0,0 +1,187 @@
+#############################################################
+#
+# libevas
+#
+#############################################################
+
+LIBEVAS_VERSION = 1.1.0
+LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
+LIBEVAS_SITE = http://download.enlightenment.org/releases/
+LIBEVAS_INSTALL_STAGING = YES
+
+LIBEVAS_DEPENDENCIES = host-pkg-config zlib libeina freetype
+
+HOST_LIBEVAS_DEPENDENCIES = host-pkg-config host-zlib host-libeina \
+				host-freetype host-libpng
+HOST_LIBEVAS_CONF_OPT += --enable-image-loader-png
+
+# rendering options
+ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)
+LIBEVAS_CONF_OPT += --enable-scale-sample
+else
+LIBEVAS_CONF_OPT += --disable-scale-sample
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH),y)
+LIBEVAS_CONF_OPT += --enable-scale-smooth
+else
+LIBEVAS_CONF_OPT += --disable-scale-smooth
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SMALL_DITHERING),y)
+LIBEVAS_CONF_OPT += --enable-small-dither-mask
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_LINE_DITHERING),y)
+LIBEVAS_CONF_OPT += --enable-line-dither-mask
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_NO_DITHERING),y)
+LIBEVAS_CONF_OPT += --enable-no-dither-mask
+endif
+
+# backends
+ifeq ($(BR2_PACKAGE_LIBEVAS_BUFFER),y)
+LIBEVAS_CONF_OPT += --enable-buffer
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y)
+LIBEVAS_CONF_OPT += --enable-software-xlib
+LIBEVAS_DEPENDENCIES += xproto_xproto
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)
+LIBEVAS_CONF_OPT += --enable-gl-xlib
+LIBEVAS_DEPENDENCIES += xproto_glproto xlib_libX11
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_XCB),y)
+LIBEVAS_CONF_OPT += --enable-software-xcb
+LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util pixman
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_XCB_GLX),y)
+LIBEVAS_CONF_OPT += --enable-gl-xcb
+LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util xproto_glproto
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_FB),y)
+LIBEVAS_CONF_OPT += --enable-fb
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_DIRECTFB),y)
+LIBEVAS_CONF_OPT += --enable-directfb
+LIBEVAS_DEPENDENCIES += directfb
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SDL),y)
+LIBEVAS_CONF_OPT += --enable-software-sdl
+LIBEVAS_DEPENDENCIES += sdl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
+LIBEVAS_CONF_OPT += --enable-gl-sdl
+LIBEVAS_DEPENDENCIES += sdl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)
+LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-sgx
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_S3C6410),y)
+LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
+endif
+
+# code options
+ifeq ($(BR2_PACKAGE_LIBEVAS_DISABLE_C),y)
+LIBEVAS_CONF_OPT += --disable-cpu-c
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_MMX),y)
+LIBEVAS_CONF_OPT += --enable-cpu-mmx
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SSE),y)
+LIBEVAS_CONF_OPT += --enable-cpu-sse
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SSE3),y)
+LIBEVAS_CONF_OPT += --enable-cpu-sse3
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_ALTIVEC),y)
+LIBEVAS_CONF_OPT += --enable-cpu-altivec
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_NEON),y)
+LIBEVAS_CONF_OPT += --enable-cpu-neon
+endif
+
+# loaders
+ifeq ($(BR2_PACKAGE_LIBEVAS_PNG),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-png
+LIBEVAS_DEPENDENCIES += libpng
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-png
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_JPEG),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-jpeg
+LIBEVAS_DEPENDENCIES += jpeg
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_GIF),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-gif
+LIBEVAS_DEPENDENCIES += libungif
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-gif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_PMAPS),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-pmaps
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-pmaps
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_SVG),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-svg
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-svg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_TIFF),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-tiff
+LIBEVAS_DEPENDENCIES += tiff
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_XPM),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-xpm
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-xpm
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_EET),y)
+LIBEVAS_CONF_OPT += --enable-image-loader-eet
+LIBEVAS_DEPENDENCIES += libeet
+else
+LIBEVAS_CONF_OPT += --disable-image-loader-eet
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_EET_FONT),y)
+LIBEVAS_CONF_OPT += --enable-font-loader-eet
+LIBEVAS_DEPENDENCIES += libeet
+else
+LIBEVAS_CONF_OPT += --disable-font-loader-eet
+endif
+
+# documentation
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBEVAS_CONF_OPT += --disable-doc
+endif
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From d4e64bd61b29b70de69172628ef722b82d928510 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 29 Jan 2012 00:21:11 +0100
Subject: [PATCH 1302/6849] libevas: autodetect cpu variant code tuning options

Similar to how we do it for ffmpeg.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in  | 44 ----------------------------------
 package/efl/libevas/libevas.mk | 25 +++++++++----------
 2 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 5b48af22ed..637d895533 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -137,50 +137,6 @@ config BR2_PACKAGE_LIBEVAS_GLES_S3C6410
 endchoice
 
 
-comment "libevas code tuning"
-
-config BR2_PACKAGE_LIBEVAS_DISABLE_C
-	bool "libevas disable C code"
-	depends on BR2_PACKAGE_LIBEVAS_MMX || BR2_PACKAGE_LIBEVAS_SSE || BR2_PACKAGE_LIBEVAS_SSE3
-	help
-	  This disables the generic C fallback code which is not required
-	  if MMX or SSE is used instead.
-
-config BR2_PACKAGE_LIBEVAS_MMX
-	bool "libevas MMX routines"
-	depends on BR2_i386 || BR2_x86_64
-	help
-	  This enables the MMX optimized routines. this works for
-	  Pentium, Pentium 2, Pentium 3, Pentium 4, Athlon and Duron
-	  processors.
-
-config BR2_PACKAGE_LIBEVAS_SSE
-	bool "libevas SSE routines"
-	depends on BR2_i386 || BR2_x86_64
-	help
-	  This enables SSE optimizations available in the Pentium 3 and
-	  4 cpus (not Athlon and Duron or Pentium 2 or Pentium cpus).
-
-config BR2_PACKAGE_LIBEVAS_SSE3
-	bool "libevas SSE3 routines"
-	depends on BR2_i386 || BR2_x86_64
-	help
-	  This enables SSE3 optimizations available in the Pentium 4 and
-	  above cpus.
-
-config BR2_PACKAGE_LIBEVAS_ALTIVEC
-	bool "libevas altivec routines"
-	depends on BR2_powerpc
-	help
-	  This enables AltiVec optimizations available in some PowerPC cpus.
-
-config BR2_PACKAGE_LIBEVAS_NEON
-	bool "libevas neon routines"
-	depends on BR2_arm
-	help
-	  This enables NEON optimizations available in some ARM cpus.
-
-
 comment "libevas loaders"
 
 config BR2_PACKAGE_LIBEVAS_PNG
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 1a96551fe4..3a1e42d2ed 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -93,27 +93,28 @@ LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
 endif
 
 # code options
-ifeq ($(BR2_PACKAGE_LIBEVAS_DISABLE_C),y)
-LIBEVAS_CONF_OPT += --disable-cpu-c
-endif
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_MMX),y)
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+# enable if cpu variant has mmx support
+ifneq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
 LIBEVAS_CONF_OPT += --enable-cpu-mmx
-endif
 
-ifeq ($(BR2_PACKAGE_LIBEVAS_SSE),y)
+ifneq ($(BR2_x86_pentium_mmx)$(BR2_x86_pentium2)$(BR2_x86_k6)$(BR2_x86_k6_2)$(BR2_x86_athlon)$(BR2_x86_c3)$(BR2_x86_winchip_c6)$(BR2_x86_winchip2),y)
 LIBEVAS_CONF_OPT += --enable-cpu-sse
-endif
 
-ifeq ($(BR2_PACKAGE_LIBEVAS_SSE3),y)
+ifneq ($(BR2_x86_pentium3)$(BR2_x86_pentium4)$(BR2_x86_prescott)$(BR2_x86_athlon_4)$(BR2_x86_opteron)$(BR2_x86_c32)$(BR2_x86_64_opteron),y)
 LIBEVAS_CONF_OPT += --enable-cpu-sse3
-endif
 
-ifeq ($(BR2_PACKAGE_LIBEVAS_ALTIVEC),y)
+endif # sse3
+endif # sse
+endif # mmx
+endif # x86
+
+ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)
 LIBEVAS_CONF_OPT += --enable-cpu-altivec
 endif
 
-ifeq ($(BR2_PACKAGE_LIBEVAS_NEON),y)
+ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
+# NEON is optional for A9
 LIBEVAS_CONF_OPT += --enable-cpu-neon
 endif
 

From bf7d98d8410955b192f99dc412503c89fa14a57e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 29 Jan 2012 10:49:11 +0100
Subject: [PATCH 1303/6849] libevas: Config.in: add upstream URL

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 637d895533..6ec05d5205 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBEVAS
 	  super and sub-sampled scaled images, alpha-blend objects
 	  much and more.
 
+	  http://trac.enlightenment.org/e/wiki/Evas
+
 if BR2_PACKAGE_LIBEVAS
 
 comment "libevas rendering options"

From dc6bf5b173ad439f77c3e5737646d5f5d8420ba6 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:36 +0000
Subject: [PATCH 1304/6849] libecore: Add new package

[Peter: Config.in fixes, dependencies, build makekeys for host]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in            |  1 +
 package/efl/libecore/Config.in   | 42 +++++++++++++++++
 package/efl/libecore/libecore.mk | 77 ++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+)
 create mode 100644 package/efl/libecore/Config.in
 create mode 100644 package/efl/libecore/libecore.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 27d1f9519e..3007783985 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -9,6 +9,7 @@ menuconfig BR2_PACKAGE_EFL
 if BR2_PACKAGE_EFL
 
 source "package/efl/libeina/Config.in"
+source "package/efl/libecore/Config.in"
 source "package/efl/libeet/Config.in"
 source "package/efl/libevas/Config.in"
 
diff --git a/package/efl/libecore/Config.in b/package/efl/libecore/Config.in
new file mode 100644
index 0000000000..6c887f573e
--- /dev/null
+++ b/package/efl/libecore/Config.in
@@ -0,0 +1,42 @@
+config BR2_PACKAGE_LIBECORE
+	bool "libecore"
+	select BR2_PACKAGE_LIBEINA
+	help
+	  Ecore is the event/X abstraction layer that makes doing
+	  selections, Xdnd, general X stuff, event loops, timeouts and
+	  idle handlers fast, optimized, and convenient.
+
+	  http://trac.enlightenment.org/e/wiki/Ecore
+
+if BR2_PACKAGE_LIBECORE
+
+config BR2_PACKAGE_LIBECORE_DIRECTFB
+	bool "libecore DirectFB support"
+	depends on BR2_PACKAGE_DIRECTFB
+	default y
+
+config BR2_PACKAGE_LIBECORE_FB
+	bool "libecore framebuffer support"
+
+config BR2_PACKAGE_LIBECORE_SDL
+	bool "libecore SDL support"
+	select BR2_PACKAGE_SDL
+
+config BR2_PACKAGE_LIBECORE_X
+	bool "libecore X support"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+
+config BR2_PACKAGE_LIBECORE_X_XCB
+	bool "libecore XCB support"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XCB_UTIL
+
+config BR2_PACKAGE_LIBECORE_EVAS
+	bool "libecore Evas support"
+	select BR2_PACKAGE_LIBEVAS
+
+endif # BR2_PACKAGE_LIBECORE
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
new file mode 100644
index 0000000000..0088480729
--- /dev/null
+++ b/package/efl/libecore/libecore.mk
@@ -0,0 +1,77 @@
+#############################################################
+#
+# libecore
+#
+#############################################################
+
+LIBECORE_VERSION = 1.1.0
+LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
+LIBECORE_SITE = http://download.enlightenment.org/releases/
+LIBECORE_INSTALL_STAGING = YES
+
+LIBECORE_DEPENDENCIES = host-pkg-config libeina
+
+HOST_LIBECORE_DEPENDENCIES = host-pkg-config host-libeina host-libevas
+HOST_LIBECORE_CONF_OPT += --enable-ecore-evas
+
+# default options
+LIBECORE_CONF_OPT = --disable-simple-x11
+
+# libecore
+ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
+LIBECORE_CONF_OPT += --enable-ecore-directfb
+else
+LIBECORE_CONF_OPT += --disable-ecore-directfb
+endif
+
+ifeq ($(BR2_PACKAGE_LIBECORE_FB),y)
+LIBECORE_CONF_OPT += --enable-ecore-fb
+LIBECORE_DEPENDENCIES += directfb
+else
+LIBECORE_CONF_OPT += --disable-ecore-fb
+endif
+
+ifeq ($(BR2_PACKAGE_LIBECORE_SDL),y)
+LIBECORE_CONF_OPT += --enable-ecore-sdl
+LIBECORE_DEPENDENCIES += sdl
+else
+LIBECORE_CONF_OPT += --disable-ecore-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBECORE_X),y)
+LIBECORE_CONF_OPT += --enable-ecore-x
+LIBECORE_DEPENDENCIES += xlib_libXext xlib_libX11
+else
+LIBECORE_CONF_OPT += --disable-ecore-x
+endif
+
+ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)
+LIBECORE_CONF_OPT += --enable-ecore-x-xcb
+LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util
+
+# src/util/makekeys is executed at build time to generate
+# ecore_xcb_keysym_table.h, so it should get compiled for the host.
+# The ecore makefile unfortunately doesn't know about cross
+# compilation so this doesn't work.  Long term, we should probably
+# teach it about CC_FOR_BUILD, but for now simply build makekeys by
+# hand in advance
+define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
+	cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+		-o makekeys makekeys.c
+endef
+
+LIBECORE_POST_CONFIGURE_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
+else
+LIBECORE_CONF_OPT += --disable-ecore-x-xcb
+endif
+
+# libecore-evas
+ifeq ($(BR2_PACKAGE_LIBECORE_EVAS),y)
+LIBECORE_CONF_OPT += --enable-ecore-evas
+LIBECORE_DEPENDENCIES += libevas
+else
+LIBECORE_CONF_OPT += --disable-ecore-evas
+endif
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From dc662b1a6c7a8ec0cde8b4b623d7c07fb3f65f80 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 29 Jan 2012 20:03:13 +0100
Subject: [PATCH 1305/6849] libxcb: fix help text indentation

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/Config.in | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/package/x11r7/libxcb/Config.in b/package/x11r7/libxcb/Config.in
index fb48a02651..9554529fc2 100644
--- a/package/x11r7/libxcb/Config.in
+++ b/package/x11r7/libxcb/Config.in
@@ -5,10 +5,8 @@ config BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXAU
 	help
-		The X protocol C-language Binding (XCB) is a replacement for
-		Xlib featuring a small footprint, latency hiding, direct access
-		to the protocol, improved threading support, and extensibility.
-
-		http://xcb.freedesktop.org/
-
+	  The X protocol C-language Binding (XCB) is a replacement for
+	  Xlib featuring a small footprint, latency hiding, direct access
+	  to the protocol, improved threading support, and extensibility.
 
+	  http://xcb.freedesktop.org/

From 20c79086f11c7e87e304350041732376d1e01781 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:39 +0000
Subject: [PATCH 1306/6849] libembryo: Add new package

[Peter: add upstream URL, remove redundant _INSTALL_TARGET]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in              |  1 +
 package/efl/libembryo/Config.in    |  9 +++++++++
 package/efl/libembryo/libembryo.mk | 15 +++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/efl/libembryo/Config.in
 create mode 100644 package/efl/libembryo/libembryo.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 3007783985..0e27dab7e5 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -12,6 +12,7 @@ source "package/efl/libeina/Config.in"
 source "package/efl/libecore/Config.in"
 source "package/efl/libeet/Config.in"
 source "package/efl/libevas/Config.in"
+source "package/efl/libembryo/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libembryo/Config.in b/package/efl/libembryo/Config.in
new file mode 100644
index 0000000000..63c706415b
--- /dev/null
+++ b/package/efl/libembryo/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBEMBRYO
+	bool "libembryo"
+	select BR2_PACKAGE_LIBEINA
+	help
+	  Embryo is primarily a shared library that gives you an API
+	  to load and control interpreted programs compiled into an
+	  abstract machine bytecode that it understands.
+
+	  http://trac.enlightenment.org/e/wiki/Embryo
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
new file mode 100644
index 0000000000..0054ff41c8
--- /dev/null
+++ b/package/efl/libembryo/libembryo.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libembryo
+#
+#############################################################
+
+LIBEMBRYO_VERSION = 1.1.0
+LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
+LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
+LIBEMBRYO_INSTALL_STAGING = YES
+
+LIBEMBRYO_DEPENDENCIES = host-pkg-config libeina
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From bbceb3c9ea5aa341e66785727155e2f1f54f3ada Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:42 +0000
Subject: [PATCH 1307/6849] libedje: Add new package

[Peter: add upstream URL, remove redundant _INSTALL_TARGET]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in          |  1 +
 package/efl/libedje/Config.in  | 21 +++++++++++++++++++++
 package/efl/libedje/libedje.mk | 24 ++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/efl/libedje/Config.in
 create mode 100644 package/efl/libedje/libedje.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 0e27dab7e5..7d9c1ffdfb 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -13,6 +13,7 @@ source "package/efl/libecore/Config.in"
 source "package/efl/libeet/Config.in"
 source "package/efl/libevas/Config.in"
 source "package/efl/libembryo/Config.in"
+source "package/efl/libedje/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libedje/Config.in b/package/efl/libedje/Config.in
new file mode 100644
index 0000000000..f0985dd3f1
--- /dev/null
+++ b/package/efl/libedje/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_LIBEDJE
+	bool "libedje"
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBEET
+	select BR2_PACKAGE_LIBECORE
+	select BR2_PACKAGE_LIBECORE_EVAS
+	select BR2_PACKAGE_LIBEMBRYO
+	select BR2_PACKAGE_LIBEVAS
+	select BR2_PACKAGE_LUA
+	help
+	  A graphical layout and animation library for animated
+	  resizable, compressed and scalable themes.
+
+	  http://trac.enlightenment.org/e/wiki/Edje
+
+config BR2_PACKAGE_LIBEDJE_CC
+	bool "build edje_cc"
+	depends on BR2_PACKAGE_LIBEDJE
+	help
+	  Build and install the Edje compiler for the target. Normally this
+	  is not required.
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
new file mode 100644
index 0000000000..5252d6ec15
--- /dev/null
+++ b/package/efl/libedje/libedje.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# libedje
+#
+#############################################################
+
+LIBEDJE_VERSION = 1.1.0
+LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
+LIBEDJE_SITE =  http://download.enlightenment.org/releases/
+LIBEDJE_INSTALL_STAGING = YES
+
+LIBEDJE_DEPENDENCIES = host-pkg-config lua libeina libeet libecore libevas \
+			libembryo
+
+ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
+LIBEDJE_CONF_OPT += --enable-edje-cc
+else
+LIBEDJE_CONF_OPT += --disable-edje-cc
+endif
+
+HOST_LIBEDJE_CONF_OPT = --enable-edje-cc
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From d9382d641a542d6fa152c895b12ebcf2c0554f37 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 29 Jan 2012 21:33:27 +0100
Subject: [PATCH 1308/6849] libevas: force smooth scaling option on

libevas fails to build if smooth scaling isn't enabled with unresolved
references to evas_common_map_rgba_internal and
evas_common_scale_rgba_in_to_out_clip_smooth.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 6ec05d5205..f5e79b3ced 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBEVAS
 	bool "libevas"
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LIBEINA
+	# required to build so far
+	select BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH
 	help
 	  Evas is a clean display canvas API for several target
 	  display systems that can draw anti-aliased text, smooth

From d9632d5985845dc93657bab591c07df1e529de36 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:46 +0000
Subject: [PATCH 1309/6849] expedite: Add new package

Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in            |  1 +
 package/efl/expedite/Config.in   | 14 ++++++++++++++
 package/efl/expedite/expedite.mk | 11 +++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/efl/expedite/Config.in
 create mode 100644 package/efl/expedite/expedite.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 7d9c1ffdfb..258d99ae79 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -8,6 +8,7 @@ menuconfig BR2_PACKAGE_EFL
 
 if BR2_PACKAGE_EFL
 
+source "package/efl/expedite/Config.in"
 source "package/efl/libeina/Config.in"
 source "package/efl/libecore/Config.in"
 source "package/efl/libeet/Config.in"
diff --git a/package/efl/expedite/Config.in b/package/efl/expedite/Config.in
new file mode 100644
index 0000000000..9e131f3777
--- /dev/null
+++ b/package/efl/expedite/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_EXPEDITE
+	bool "expedite"
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBEVAS
+	select BR2_PACKAGE_LIBEET
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Expedite is the official Evas benchmark tool. It can test different
+	  engines, such as X11, XRender, OpenGL (also ES variant), SDL,
+	  DirectFB and so on. Its tests are quite extensive, trying to
+	  reproduce real world usage cases.
+
+comment "expedite requires C++ support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
new file mode 100644
index 0000000000..4c011900a2
--- /dev/null
+++ b/package/efl/expedite/expedite.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# expedite
+#
+#############################################################
+
+EXPEDITE_VERSION = 1.1.0
+EXPEDITE_SITE = http://download.enlightenment.org/releases/
+EXPEDITE_DEPENDENCIES = libevas libeina libeet
+
+$(eval $(call AUTOTARGETS))

From eed21084821591a7537f00edf826e427c7123078 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:49 +0000
Subject: [PATCH 1310/6849] libefreet: Add new package

[Peter: add upstream URL]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in              |  1 +
 package/efl/libefreet/Config.in    | 10 ++++++++++
 package/efl/libefreet/libefreet.mk | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/efl/libefreet/Config.in
 create mode 100644 package/efl/libefreet/libefreet.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 258d99ae79..b747953ace 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -12,6 +12,7 @@ source "package/efl/expedite/Config.in"
 source "package/efl/libeina/Config.in"
 source "package/efl/libecore/Config.in"
 source "package/efl/libeet/Config.in"
+source "package/efl/libefreet/Config.in"
 source "package/efl/libevas/Config.in"
 source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
diff --git a/package/efl/libefreet/Config.in b/package/efl/libefreet/Config.in
new file mode 100644
index 0000000000..8687db4672
--- /dev/null
+++ b/package/efl/libefreet/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBEFREET
+	bool "libefreet"
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBEET
+	select BR2_PACKAGE_LIBECORE
+	help
+	  Efreet is a library designed to help apps work with several of the
+	  Freedesktop.org standards regarding Icons, Desktop files and Menus.
+
+	  http://trac.enlightenment.org/e/wiki/Efreet
diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
new file mode 100644
index 0000000000..14fb8cb13d
--- /dev/null
+++ b/package/efl/libefreet/libefreet.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libefreet
+#
+################################################################################
+
+LIBEFREET_VERSION = 1.1.0
+LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
+LIBEFREET_SITE = http://download.enlightenment.org/releases/
+LIBEFREET_INSTALL_STAGING = YES
+
+LIBEFREET_DEPENDENCIES = libeina libeet libecore
+
+$(eval $(call AUTOTARGETS))

From 151583964233c7e1de2927396ca3ff48ee75e510 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:52 +0000
Subject: [PATCH 1311/6849] libethumb: Add new package

[Peter: add ecore-evas dep, upstream URL]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in              |  1 +
 package/efl/libethumb/Config.in    | 11 +++++++++++
 package/efl/libethumb/libethumb.mk | 16 ++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/efl/libethumb/Config.in
 create mode 100644 package/efl/libethumb/libethumb.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index b747953ace..1632290a32 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -16,6 +16,7 @@ source "package/efl/libefreet/Config.in"
 source "package/efl/libevas/Config.in"
 source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
+source "package/efl/libethumb/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libethumb/Config.in b/package/efl/libethumb/Config.in
new file mode 100644
index 0000000000..fb0032a2e1
--- /dev/null
+++ b/package/efl/libethumb/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBETHUMB
+	bool "libethumb"
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBEVAS
+	select BR2_PACKAGE_LIBECORE
+	select BR2_PACKAGE_LIBECORE_EVAS
+	select BR2_PACKAGE_LIBEDJE
+	help
+	  Ethumb is a library for generating thumbnail images of documents.
+
+	  http://trac.enlightenment.org/e/wiki/Ethumb
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
new file mode 100644
index 0000000000..16b2ba9553
--- /dev/null
+++ b/package/efl/libethumb/libethumb.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libethumb
+#
+################################################################################
+
+LIBETHUMB_VERSION = 0.1.1.65643
+LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
+LIBETHUMB_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBETHUMB_INSTALL_STAGING = YES
+
+LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
+
+LIBETHUMB_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
+
+$(eval $(call AUTOTARGETS))

From 9c3e2f9789d2b1536157a19379d352840e76f85a Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:56 +0000
Subject: [PATCH 1312/6849] libelementary: Add new package

[Peter: Add upstream URL, remove examples option/patches]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in                      |  1 +
 package/efl/libelementary/Config.in        | 12 ++++++++++++
 package/efl/libelementary/libelementary.mk | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/efl/libelementary/Config.in
 create mode 100644 package/efl/libelementary/libelementary.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 1632290a32..ec8c5137c7 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -17,6 +17,7 @@ source "package/efl/libevas/Config.in"
 source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
 source "package/efl/libethumb/Config.in"
+source "package/efl/libelementary/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libelementary/Config.in b/package/efl/libelementary/Config.in
new file mode 100644
index 0000000000..59af80ec93
--- /dev/null
+++ b/package/efl/libelementary/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBELEMENTARY
+	bool "libelementary"
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBEVAS
+	select BR2_PACKAGE_LIBECORE
+	select BR2_PACKAGE_LIBEDJE
+	help
+	  Elementary is a widget toolkit and EFL wrapper and convenience
+	  library to make it easy to build applications and tools with UIs
+	  with less code.
+
+	  http://trac.enlightenment.org/e/wiki/Elementary
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
new file mode 100644
index 0000000000..475fd45775
--- /dev/null
+++ b/package/efl/libelementary/libelementary.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# libelementary
+#
+################################################################################
+
+LIBELEMENTARY_VERSION = 0.8.0.65643
+LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
+LIBELEMENTARY_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBELEMENTARY_INSTALL_STAGING = YES
+
+LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
+				host-libeet
+
+LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+
+$(eval $(call AUTOTARGETS))

From 7ba2e23d8b3e8ac212bc045f63abb698fc61363f Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 26 Jan 2012 17:42:59 +0000
Subject: [PATCH 1313/6849] libedbus: Add new package

[Peter: select dbus, add upstream URL, remove unneeded autoreconf]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/Config.in            |  1 +
 package/efl/libedbus/Config.in   | 11 +++++++++++
 package/efl/libedbus/libedbus.mk | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/efl/libedbus/Config.in
 create mode 100644 package/efl/libedbus/libedbus.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index ec8c5137c7..c783d7f078 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -18,6 +18,7 @@ source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
 source "package/efl/libethumb/Config.in"
 source "package/efl/libelementary/Config.in"
+source "package/efl/libedbus/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
new file mode 100644
index 0000000000..3844b52c14
--- /dev/null
+++ b/package/efl/libedbus/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBEDBUS
+	bool "libedbus"
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBECORE
+	depends on BR2_PACKAGE_DBUS
+	help
+	  E_Dbus is a set of wrappers around D-Bus APIs so they can be
+	  easily used by EFL applications, automatically providing
+	  Ecore/main loop integration, as well as Eina data types.
+
+	  http://trac.enlightenment.org/e/wiki/E_Dbus
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
new file mode 100644
index 0000000000..34f34a7c04
--- /dev/null
+++ b/package/efl/libedbus/libedbus.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libedbus
+#
+#############################################################
+
+LIBEDBUS_VERSION = 1.1.0
+LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
+LIBEDBUS_SITE = http://download.enlightenment.org/releases/
+LIBEDBUS_INSTALL_STAGING = YES
+
+LIBEDBUS_DEPENDENCIES = host-pkg-config dbus libeina libecore
+
+$(eval $(call AUTOTARGETS))

From f64a740f360439bbab6526b8a08588a57ea8fd52 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegor_sub1@visionsystems.de>
Date: Thu, 13 Oct 2011 12:39:12 +0200
Subject: [PATCH 1314/6849] boost: New package added. Version 1.47

[Peter: Config.in tweaks]
Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/boost/Config.in | 79 +++++++++++++++++++++++++++++++++++++++
 package/boost/boost.mk  | 83 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+)
 create mode 100644 package/boost/Config.in
 create mode 100644 package/boost/boost.mk

diff --git a/package/Config.in b/package/Config.in
index 65c2a98c65..eb3abe80d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -364,6 +364,7 @@ menu "Other"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
+source "package/boost/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
 source "package/libdaemon/Config.in"
diff --git a/package/boost/Config.in b/package/boost/Config.in
new file mode 100644
index 0000000000..7598d0268f
--- /dev/null
+++ b/package/boost/Config.in
@@ -0,0 +1,79 @@
+config BR2_PACKAGE_BOOST
+	bool "boost"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_ZLIB
+	help
+	  A general purpose C++ library
+
+	  http://www.boost.org/
+
+if BR2_PACKAGE_BOOST
+
+config BR2_PACKAGE_BOOST_MULTITHREADED
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	bool "boost-multithreaded"
+	help
+	  Build the boost libraries as multithreaded
+
+config BR2_PACKAGE_BOOST_CHRONO
+	bool "boost-chrono"
+
+config BR2_PACKAGE_BOOST_DATE_TIME
+	bool "boost-date_time"
+
+config BR2_PACKAGE_BOOST_EXCEPTION
+	bool "boost-exception"
+
+config BR2_PACKAGE_BOOST_FILESYSTEM
+	bool "boost-filesystem"
+
+config BR2_PACKAGE_BOOST_GRAPH
+	bool "boost-graph"
+
+config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
+	bool "boost-graph_parallel"
+
+config BR2_PACKAGE_BOOST_ICU
+        select BR2_PACKAGE_ICU
+	bool "boost-icu"
+
+config BR2_PACKAGE_BOOST_IOSTREAMS
+	bool "boost-iostreams"
+
+config BR2_PACKAGE_BOOST_MATH
+	bool "boost-math"
+
+config BR2_PACKAGE_BOOST_MPI
+	bool "boost-mpi"
+
+config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	bool "boost-program_options"
+
+config BR2_PACKAGE_BOOST_RANDOM
+	bool "boost-random"
+
+config BR2_PACKAGE_BOOST_REGEX
+	bool "boost-regex"
+
+config BR2_PACKAGE_BOOST_SERIALIZATION
+	bool "boost-serialization"
+
+config BR2_PACKAGE_BOOST_SIGNALS
+	bool "boost-signals"
+
+config BR2_PACKAGE_BOOST_SYSTEM
+	bool "boost-system"
+
+config BR2_PACKAGE_BOOST_TEST
+	bool "boost-test"
+
+config BR2_PACKAGE_BOOST_THREAD
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	bool "boost-thread"
+
+config BR2_PACKAGE_BOOST_WAVE
+	bool "boost-wave"
+
+endif
+
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
new file mode 100644
index 0000000000..4bbc869045
--- /dev/null
+++ b/package/boost/boost.mk
@@ -0,0 +1,83 @@
+#############################################################
+#
+# Boost
+#
+#############################################################
+
+BOOST_VERSION = 1.47.0
+BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
+BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
+BOOST_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/boost
+BOOST_INSTALL_STAGING = YES
+
+TARGET_CC_VERSION = $(shell $(TARGET_CC) --version | head -n 1 | sed -e "s/.*[[:space:]]\([[:digit:].]\+$$\)/\1/g" )
+
+BOOST_DEPENDENCIES = bzip2 zlib
+
+BOOST_FLAGS =
+BOOST_WITHOUT_FLAGS = python
+
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave)
+
+ifeq ($(BR2_PACKAGE_BOOST_ICU),y)
+BOOST_FLAGS += --with-icu
+BOOST_DEPENDENCIES += icu
+else
+BOOST_FLAGS += --without-icu
+endif
+
+BOOST_LINK = $(if $(BR2_PREFER_STATIC_LIB),static,shared)
+BOOST_MULTI = $(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single)
+BOOST_VARIANT = $(if $(BR2_ENABLE_DEBUG),debug,release)
+
+BOOST_WITHOUT_FLAGS_COMMASEPERATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS)))
+BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPERATED))
+
+define BOOST_CONFIGURE_CMDS
+	(cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS))
+	echo "using gcc : $(TARGET_CC_VERSION) : \"$(TARGET_CXX)\" : <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam
+	echo "" >> $(@D)/user-config.jam
+endef
+
+define BOOST_INSTALL_TARGET_CMDS
+	(cd $(@D) && ./b2 -q -d+2 \
+	--user-config=$(@D)/user-config.jam \
+	toolset=gcc \
+	variant=$(BOOST_VARIANT) \
+	link=$(BOOST_LINK) \
+	threading=$(BOOST_MULTI) \
+	runtime-link=$(BOOST_LINK) \
+	--prefix=$(TARGET_DIR)/usr \
+	--layout=system install )
+endef
+
+define BOOST_INSTALL_STAGING_CMDS
+	(cd $(@D) && ./bjam -d+2 \
+	--user-config=$(@D)/user-config.jam \
+	toolset=gcc \
+	variant=$(BOOST_VARIANT) \
+	link=$(BOOST_LINK) \
+	threading=$(BOOST_MULTI) \
+	runtime-link=$(BOOST_LINK) \
+	--prefix=$(STAGING_DIR)/usr \
+	--layout=system install)
+endef
+
+$(eval $(call GENTARGETS))

From a4e27b11607113f178366469c4c2a827941be283 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Wed, 28 Sep 2011 15:29:55 +0100
Subject: [PATCH 1315/6849] dmalloc: Fix install path for headers and info
 files.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dmalloc/dmalloc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 4de324e0d2..89d067ddff 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -37,7 +37,7 @@ define DMALLOC_INSTALL_STAGING_CMDS
 		bindir="$(STAGING_DIR)/usr/bin" \
 		libdir="$(STAGING_DIR)/usr/lib" \
 		shlibdir="$(STAGING_DIR)/usr/lib" \
-		includedir="$(STAGING_DIR)/usr/share/info/" \
+		infodir="$(STAGING_DIR)/usr/share/info/" \
 		-C $(@D) install
 endef
 

From a52db793e944d61947042eac6dc686577e82bd47 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Jan 2012 08:52:52 +0100
Subject: [PATCH 1316/6849] libevas: forcibly disable cpu optimization options
 if not applicable

Otherwise the configure script will automatically enable them for
potentially compatible targets.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 3a1e42d2ed..6ad1126e77 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -103,19 +103,28 @@ LIBEVAS_CONF_OPT += --enable-cpu-sse
 
 ifneq ($(BR2_x86_pentium3)$(BR2_x86_pentium4)$(BR2_x86_prescott)$(BR2_x86_athlon_4)$(BR2_x86_opteron)$(BR2_x86_c32)$(BR2_x86_64_opteron),y)
 LIBEVAS_CONF_OPT += --enable-cpu-sse3
-
+else
+LIBEVAS_CONF_OPT += --disable-cpu-sse3
 endif # sse3
+else
+LIBEVAS_CONF_OPT += --disable-cpu-sse
 endif # sse
+else
+LIBEVAS_CONF_OPT += --disable-cpu-mmx
 endif # mmx
 endif # x86
 
 ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)
 LIBEVAS_CONF_OPT += --enable-cpu-altivec
+else
+LIBEVAS_CONF_OPT += --disable-cpu-altivec
 endif
 
 ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
 # NEON is optional for A9
 LIBEVAS_CONF_OPT += --enable-cpu-neon
+else
+LIBEVAS_CONF_OPT += --disable-cpu-neon
 endif
 
 # loaders

From 0e80ba177970516e74e280f8091c12d22261380c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Jan 2012 14:44:06 +0100
Subject: [PATCH 1317/6849] busybox: add 1.19.3 mdev fix

For details, see
http://lists.busybox.net/pipermail/busybox/2012-January/077236.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch  | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch

diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
new file mode 100644
index 0000000000..653ac35c50
--- /dev/null
+++ b/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
@@ -0,0 +1,11 @@
+--- busybox-1.19.3/util-linux/mdev.c
++++ busybox-1.19.3-mdev/util-linux/mdev.c
+@@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 				int seqlen;
+ 				char seqbuf[sizeof(int)*3 + 2];
+ 
+-				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
++				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
+ 				if (seqlen < 0) {
+ 					seq = NULL;
+ 					break;

From 4aadcac1684e4af54baa7e42b5e0fb73aa4b33b3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Jan 2012 17:58:22 +0100
Subject: [PATCH 1318/6849] boost: fix build with ccache

Drop quotes around TARGET_CXX as the boost buildsystem does handle
spaces in the compiler command name, but treats it as a single command
(and errors out) if quotes are used and ccache enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 4bbc869045..4577f2dcc0 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -52,7 +52,7 @@ BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$
 
 define BOOST_CONFIGURE_CMDS
 	(cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS))
-	echo "using gcc : $(TARGET_CC_VERSION) : \"$(TARGET_CXX)\" : <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam
+	echo "using gcc : $(TARGET_CC_VERSION) : $(TARGET_CXX) : <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam
 	echo "" >> $(@D)/user-config.jam
 endef
 

From cf96a9bec0c2ad40b820c6f465c2ac17d3bc4e03 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Jan 2012 23:22:51 +0100
Subject: [PATCH 1319/6849] libevas: really fix x86 cpu optimization options
 handling

Disable all options by default, and only enable the applicable one.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 6ad1126e77..acb2f4bd9d 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -94,6 +94,9 @@ endif
 
 # code options
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
+# defaults
+LIBEVAS_CONF_OPT += --disable-cpu-mmx --disable-cpu-sse --disable-cpu-sse3
+
 # enable if cpu variant has mmx support
 ifneq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
 LIBEVAS_CONF_OPT += --enable-cpu-mmx
@@ -103,14 +106,8 @@ LIBEVAS_CONF_OPT += --enable-cpu-sse
 
 ifneq ($(BR2_x86_pentium3)$(BR2_x86_pentium4)$(BR2_x86_prescott)$(BR2_x86_athlon_4)$(BR2_x86_opteron)$(BR2_x86_c32)$(BR2_x86_64_opteron),y)
 LIBEVAS_CONF_OPT += --enable-cpu-sse3
-else
-LIBEVAS_CONF_OPT += --disable-cpu-sse3
 endif # sse3
-else
-LIBEVAS_CONF_OPT += --disable-cpu-sse
 endif # sse
-else
-LIBEVAS_CONF_OPT += --disable-cpu-mmx
 endif # mmx
 endif # x86
 

From 2e8aac22944c9670021f1b1b1fd72573040827a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 31 Jan 2012 10:24:24 +0100
Subject: [PATCH 1320/6849] news.html: announce buildroot developer day at
 FOSDEM

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index 345dc0ecfa..0b10084191 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>31 January 2012 -- Buildroot Developer Day</b>
+
+    <p>Another <i>Buildroot Developer Day</i> will take place on
+    Friday, February 3rd in Brussels, Belgium - The day before <a
+    href="http://fosdem.org">FOSDEM</a>. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-January/049340.html">announcement</a>
+    or the <a href="http://free-electrons.com/blog/bdd-2012-brussels/">Free Electrons blog</a>
+    for more info.</p>
+
   <li><b>30 November 2011 -- 2011.11 released</b>
 
     <p>The stable 2011.11 release is out - Thanks to everyone

From 14e9f44c07fba19b621cb21f3a72f47193ae3a94 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 31 Jan 2012 10:25:30 +0100
Subject: [PATCH 1321/6849] header.html: fixup cgit link

The strange caching issue still not resolved, so atleast make sure we're
using the working variant.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/header.html b/docs/header.html
index c8cb135f55..c9dcf31289 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -49,7 +49,7 @@
     <br><a href="/about.html">About</a>
     <br><a href="/news.html">Latest News</a>
     <br><a href="/download.html">Download</a>
-    <br><a href="http://git.buildroot.net/buildroot">Browse Source</a>
+    <br><a href="http://git.buildroot.net/buildroot/">Browse Source</a>
     <br><a href="/git.html">Accessing Source</a>
     <br><a href="https://bugs.uclibc.org/">Bug Tracking</a>
     <br><a href="/docs.html">Documentation</a>

From cae6aa9a41d1a3ffe3fa437b05c3000624a4ef65 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 31 Jan 2012 10:21:38 +0100
Subject: [PATCH 1322/6849] New package: libical

[Peter: small Config.in tweaks]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libical/Config.in  | 11 +++++++++++
 package/libical/libical.mk | 12 ++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libical/Config.in
 create mode 100644 package/libical/libical.mk

diff --git a/package/Config.in b/package/Config.in
index eb3abe80d3..f5c76011f3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -373,6 +373,7 @@ source "package/libevent/Config.in"
 source "package/libev/Config.in"
 source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
+source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
 source "package/orc/Config.in"
diff --git a/package/libical/Config.in b/package/libical/Config.in
new file mode 100644
index 0000000000..5907548bea
--- /dev/null
+++ b/package/libical/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBICAL
+	bool "libical"
+	depends on BR2_USE_WCHAR
+	help
+	  libical is an Open Source (MPL/LGPL) implementation of the IETF's
+	  iCalendar Calendaring and Scheduling protocols.
+
+	  http://www.citadel.org/doku.php/documentation:featured_projects:libical
+
+comment "libical requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
new file mode 100644
index 0000000000..ee251eb2e2
--- /dev/null
+++ b/package/libical/libical.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libical
+#
+#############################################################
+
+LIBICAL_VERSION = 0.48
+LIBICAL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)
+LIBICAL_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))
+

From e9378d9f1ee27d19a3652e6ecdc4611a976a77b9 Mon Sep 17 00:00:00 2001
From: "Shawn J. Goff" <shawn7400@gmail.com>
Date: Mon, 30 Jan 2012 10:42:29 -0500
Subject: [PATCH 1323/6849] Documentation: quotes around TARGET_CC command.

When ccache is enabled, TARGET_CC is "ccache gcc". Without quotes,
when assigning CC=$(TARGET_CC), only "ccache" gets assigned to CC.

Signed-off-by: Shawn J. Goff <shawn7400@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html                        | 2 +-
 docs/manual/adding-packages-gentargets.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/buildroot.html b/docs/buildroot.html
index 0c1cddfff2..ddfb20a740 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -905,7 +905,7 @@ <h4 id="generic-tutorial">Makefile for generic packages : tutorial</h4>
 <span style="color: #000000">10:</span><span style="color: #009900"> LIBFOO_DEPENDENCIES</span> = host-libaaa libbbb
 <span style="color: #000000">11:</span>
 <span style="color: #000000">12:</span> define LIBFOO_BUILD_CMDS
-<span style="color: #000000">13:</span> 	<span style="color: #009900">$(MAKE)</span> CC=<span style="color: #009900">$(TARGET_CC)</span> LD=<span style="color: #009900">$(TARGET_LD)</span> -C <span style="color: #009900">$(@D)</span> all
+<span style="color: #000000">13:</span> 	<span style="color: #009900">$(MAKE)</span> CC=<span style="color: #009900">"$(TARGET_CC)"</span> LD=<span style="color: #009900">"$(TARGET_LD)"</span> -C <span style="color: #009900">$(@D)</span> all
 <span style="color: #000000">14:</span> endef
 <span style="color: #000000">15:</span>
 <span style="color: #000000">16:</span> define LIBFOO_INSTALL_STAGING_CMDS
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index b344494648..92fce2ca47 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -24,7 +24,7 @@ system is based on hand-written Makefiles or shell scripts.
 10: LIBFOO_DEPENDENCIES = host-libaaa libbbb
 11:
 12: define LIBFOO_BUILD_CMDS
-13: 	$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) all
+13: 	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
 14: endef
 15:
 16: define LIBFOO_INSTALL_STAGING_CMDS

From ec35c076e1c20856baa48d461ebf968ef9fbd74f Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 31 Jan 2012 11:45:52 +0100
Subject: [PATCH 1324/6849] python-netifaces: bump to 0.7

cross-compilation changes were applied upstream, so remove the patch

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-netifaces-fix-cross-build.patch    | 54 -------------------
 package/python-netifaces/python-netifaces.mk  |  2 +-
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 package/python-netifaces/python-netifaces-fix-cross-build.patch

diff --git a/package/python-netifaces/python-netifaces-fix-cross-build.patch b/package/python-netifaces/python-netifaces-fix-cross-build.patch
deleted file mode 100644
index 5a11b61951..0000000000
--- a/package/python-netifaces/python-netifaces-fix-cross-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-fix cross-compilation issues:
-
-- don't execute cross-compiled binaries
-- pass LDFLAGS to linker
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
----
- setup.py |   19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -67,17 +67,8 @@
-                                                   libraries=libraries,
-                                                   debug=self.debug)
-                     if execute:
--                        abspath = os.path.abspath(os.path.join(self.build_temp,
--                                                               'conftest'))
--                        pipe = os.popen(abspath, 'r')
--                        result = pipe.read().strip()
--                        status = pipe.close()
--                        if status is None:
--                            status = 0
--                        if result == '':
--                            result = True
--                        if status != 0:
--                            result = False
-+                        # cross-compiled code can't be executed
-+                        result = True
-                         
-             finally:
-                 os.dup2(mystdout, 1)
-@@ -89,6 +80,10 @@
-         return result
- 
-     def check_requirements(self):
-+        # get library dirs
-+	if os.environ.has_key('LDFLAGS'):
-+	    lib_dirs = os.environ['LDFLAGS']
-+
-         # Load the cached config data from a previous run if possible; compiling
-         # things to test for features is slow
-         cache_file = os.path.join(self.build_temp, 'config.cache')
-@@ -356,7 +351,7 @@
-                                                    in optional_headers]),
-                             'sockaddr': sockaddr }
- 
--                    if self.test_build(testrig, execute=False):
-+                    if self.test_build(testrig, execute=False, library_dirs = [lib_dirs]):
-                         result.append(sockaddr)
-                 
-             if result:
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index 5bfa326231..b5185f0db1 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PYTHON_NETIFACES_VERSION = 0.6
+PYTHON_NETIFACES_VERSION = 0.7
 PYTHON_NETIFACES_SOURCE  = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
 PYTHON_NETIFACES_SITE    = http://alastairs-place.net/projects/netifaces
 

From c312adc9852413a21f671016b17a0a58bc5c7679 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 27 Jan 2012 00:41:27 +0100
Subject: [PATCH 1325/6849] dbus: make it easier to select an XML library
 (select rather than depends on)

D-Bus requires an XML library, expat or libxml2.  There already is a choice
between them in the config menu, but it requires the user to first select
one of the libraries, and then select dbus.  With this patch, the choice
automatically selects the XML library.  Note that this removes the
automatic choice of libxml2 for dbus if libxml2 had already been selected,
i.e. in that case both libxml2 and expat will be selected unless the user
takes action.

An alternative would be to remove the choice completely, and to take the
path of bluez-utils: select BR2_PACKAGE_EXPAT if !BR2_PACKAGE_DBUS_LIBXML2

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/Config.in | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index c625382b8a..54a8540cf9 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -1,18 +1,13 @@
 config BR2_PACKAGE_DBUS
 	bool "dbus"
-	depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
 	help
 	  The D-Bus message bus system.
 
 	  http://www.freedesktop.org/wiki/Software/dbus
 
-comment "dbus not available (need expat or libxml2)"
-	depends on !BR2_PACKAGE_EXPAT && !BR2_PACKAGE_LIBXML2
-
 choice
 	prompt "XML library to use"
 	depends on BR2_PACKAGE_DBUS
-	default BR2_DBUS_LIBXML2 if (BR2_PACKAGE_LIBXML2 && !BR2_PACKAGE_EXPAT)
 	default BR2_DBUS_EXPAT
 	help
 	  Select the XML library to use with D-Bus. Select Expat
@@ -21,10 +16,10 @@ choice
 
 	config BR2_DBUS_EXPAT
 		bool "Expat"
-		depends on BR2_PACKAGE_EXPAT
+		select BR2_PACKAGE_EXPAT
 
 	config BR2_DBUS_LIBXML2
 		bool "libxml2"
-		depends on BR2_PACKAGE_LIBXML2
+		select BR2_PACKAGE_LIBXML2
 
 endchoice

From cc57dfebacb28ce088d76705263710aa35ac2633 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 27 Jan 2012 00:41:28 +0100
Subject: [PATCH 1326/6849] bluez_utils: remove redundant selection of expat

expat/libxml2 is selected by dbus.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index ea6b44c976..3517407d8f 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_BLUEZ_UTILS
 	bool "bluez-utils"
 	depends on BR2_USE_WCHAR # libglib2
 	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_EXPAT if !BR2_PACKAGE_DBUS_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  bluez utils

From 25728f9a5707a5b03271a22edb92005c88b64ea7 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 27 Jan 2012 00:41:29 +0100
Subject: [PATCH 1327/6849] samba: avahi: replace dependency on dbus by select

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index 3a777766a8..a5a5c295f7 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -249,12 +249,12 @@ config BR2_PACKAGE_SAMBA_AVAHI
 	default y
 	depends on BR2_PACKAGE_SAMBA
 	depends on BR2_PACKAGE_AVAHI_DAEMON
-	depends on BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS
 	help
 	  Include support for avahi
 
-comment "support avahi - disabled (requires avahi-daemon/dbus)"
-	depends on !BR2_PACKAGE_AVAHI_DAEMON || !BR2_PACKAGE_DBUS
+comment "support avahi - disabled (requires avahi-daemon)"
+	depends on !BR2_PACKAGE_AVAHI_DAEMON
 
 config BR2_PACKAGE_SAMBA_GAMIN
 	bool "support gamin"

From d018125508c1d13f69b71702384c00c7095986a1 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 27 Jan 2012 00:41:30 +0100
Subject: [PATCH 1328/6849] qt: qt-dbus: replace dependency on dbus by select

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index ab231d9bd0..3a552d090f 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -280,12 +280,9 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 	  If unsure, say n.
 endif
 
-comment "Qt Dbus module not available (needs dbus)"
-	depends on !BR2_PACKAGE_DBUS
-
 config BR2_PACKAGE_QT_DBUS
 	bool "DBus Module"
-	depends on BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS
 	help
 	  Build the Qt DBus module.
 

From 0a63f874a2869baaa919ced8f3054f904e493854 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 27 Jan 2012 00:41:31 +0100
Subject: [PATCH 1329/6849] network-manager: replace dependency on dbus by
 select

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/network-manager/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 6e51f53d70..9708a11004 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_NETWORK_MANAGER
 	bool "NetworkManager"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
-	depends on BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # acl
 	depends on BR2_USE_WCHAR # libglib2
@@ -25,6 +25,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
 
 	  http://projects.gnome.org/NetworkManager/
 
-comment "NetworkManager requires DBus and a toolchain with IPV6, LARGEFILE and WCHAR support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_PACKAGE_DBUS
+comment "NetworkManager requires a toolchain with IPV6, LARGEFILE and WCHAR support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR
 

From 91a3f5aec6e901bff1892b3251896c6d6bd0b571 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 27 Jan 2012 00:41:32 +0100
Subject: [PATCH 1330/6849] connman: replace dependency on dbus by select

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 237c30e128..2801b87b05 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_CONNMAN
 	bool "connman"
-	depends on BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_IPTABLES
 	depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc
@@ -43,5 +43,5 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs DBus enabled and a toolchain with resolver support"
-	depends on !BR2_PACKAGE_DBUS || !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc)
+comment "connman needs a toolchain with resolver support"
+	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc)

From 08f46cc60c97a49faa8289fc59ac7aa2e43aeb0a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 31 Jan 2012 13:48:44 +0100
Subject: [PATCH 1331/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 55 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6b893cd672..b10fff801d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@
 	Fixes all over the tree and new features.
 
 	Toolchain: Default to GCC 4.5.x, add binutils 2.22. Java
-	support removed, Powerpc SPE ABI support.
+	support removed, Powerpc SPE ABI support. GDB ELF support fix,
+	GDB 7.4.
 
 	Gentargets: scp and mercurial support.
 	Autotools: derrive host dependencies from target by default.
@@ -19,31 +20,37 @@
 	Buildroot now calls the stop function of scripts in /etc/init.d at
 	shutdown.
 
-	Updated/fixed packages: atk, barebox, bash, beecrypt, binutils,
-	bison, bluez_utils, busybox, cairo, ccache, cdrkit, coreutils,
-	cramfs, dbus-glib, dialog, diffutils, dropbear, e2fsprogs,
-	ebtables, ed, ethtool, ffmpeg, file, flex, fluxbox,
-	fontconfig, gawk, grep, gst-dsp, gst-ffmpeg, hostapd, htop,
-	i2c-tools, icu, iproute2, ipset, iptables, iw, kismet, lame,
-	libcap, libcgi, libeXosip2, libffi, libgpg-error, libgtk2,
-	libidn, libmnl, libnl, libosip, libpng, libroxml, libv4l,
-	libxcb, libxml-parser-perl, libxslt, lighttpd, links, m4,
-	module-init-tools, mpc, mpd, mpfr, mtd-utils, nano, nbd,
-	ncurses, netsnmp, opencv, openssl, openvpn, orc, pcre,
-	pkg-config, proftpd, python, ruby, samba, squashfs3, sshfs,
-	sqlite, squid, syslinux, ti-utils, tiff, uboot, uboot-tools,
-	usbmount, valgrind, vsftpd, wpa_supplicant,
+	Updated/fixed packages: atk, avahi, barebox, bash, beecrypt,
+	bind, binutils, bison, bluez_utils, busybox, cairo, ccache,
+	cdrkit, coreutils, cramfs, dbus, dbus-glib, dialog, diffutils,
+	dmalloc, dropbear, e2fsprogs, ebtables, ed, ethtool, expat,
+	ffmpeg, file, flex, fluxbox, fontconfig, gawk, grep, gst-dsp,
+	gst-ffmpeg, gst-plugins-base, hdparm, hostapd, htop,
+	i2c-tools, icu, iproute2, ipset, iptables, iw, jpeg, kismet,
+	lame, libcap, libcgi, libeXosip2, libffi, libgpg-error,
+	libgtk2, libidn, libmms, libmnl, libnl, libogg, libosip,
+	libpcap, libpng, libraw1394, libroxml, libv4l, libxcb,
+	libxml-parser-perl, libxslt, lighttpd, links, lm-sensors, lua,
+	m4, module-init-tools, mpc, mpd, mpfr, mplayer, mtd-utils,
+	nano, nbd, ncurses, netperf, netsnmp, ntp, opencv, openssl,
+	openvpn, orc, pciutils, pcre, pkg-config, proftpd, python, qt,
+	ruby, samba, squashfs3, sshfs, sqlite, squid, sudo, syslinux,
+	tcl, tcpdump, ti-utils, tiff, tremor, uboot, uboot-tools,
+	usbmount, vala, valgrind, vsftpd, wpa_supplicant,
 	xapp_{bdftopcf,mkfontdir,mkfontscale,xkbcomp,xcursorgen,xman},
-	xdm, xenomai, xf86-video-sis, xfont_{encodings,font-util},
+	xcb-util, xdm, xenomai, xf86-video-sis,
+	xfont_{encodings,font-util},
 	xlib_lib{fontenc,X11,Xau,Xcursor,Xdmcp,Xfixes,Xfont,Xrender},
-	xlib_libxkbfile, xutil_makedepend
-
-	New packages: connman, explorercanvas, feh, flot, giblib,
-	igh-ethercat, imlib2, jquery, jquery-sparklines,
-	jquery-validation, jsmin, kmod, libesmtp, libmbus,
-	NetworkManager, open2300, python-distutilscross, python-dpkt,
-	python-netifaces, python-pygame, python-setuptools, rt-tests,
-	sane-backends, transmission, unionfs, xf86-input-tslib,
+	xlib_libxkbfile, xutil_makedepend, yajl
+
+	New packages: boost, connman, expedite, explorercanvas, feh,
+	flot, giblib, igh-ethercat, imlib2, jquery, jquery-sparklines,
+	jquery-validation, jsmin, kmod, libecore, libedbus, libedje,
+	libeet, libeina, libelementary, libesmtp, libethumb, libevas,
+	libical, libmbus, linux-firmware, NetworkManager, open2300,
+	python-distutilscross, python-dpkt, python-netifaces,
+	python-pygame, python-setuptools, rt-tests, sane-backends,
+	sqlcipher, transmission, unionfs, xf86-input-tslib,
 	xinput-calibrator
 
 	Issues resolved (http://bugs.uclibc.org):

From f3967173cc073938936e59af61a8c8bc057d77c1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 31 Jan 2012 23:11:01 +0100
Subject: [PATCH 1332/6849] gst-dsp: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-dsp/gst-dsp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index 1e1894deb4..549c5530c7 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -1,4 +1,4 @@
-GST_DSP_VERSION = 0.10.0
+GST_DSP_VERSION = 0.10.1
 GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
 
 define GST_DSP_BUILD_CMDS

From 5ba5301cdc9e7c7d4348f7bfdf567592fcc7882f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:39:59 +0100
Subject: [PATCH 1333/6849] linux: use the depmod built in HOST_DIR

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 5c5a1d2967..dbe1ad78c5 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -40,7 +40,8 @@ LINUX_MAKE_FLAGS = \
 	ARCH=$(KERNEL_ARCH) \
 	INSTALL_MOD_PATH=$(TARGET_DIR) \
 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-	LZMA="$(LZMA)"
+	LZMA="$(LZMA)" \
+	DEPMOD=$(HOST_DIR)/usr/sbin/depmod
 
 # Get the real Linux version, which tells us where kernel modules are
 # going to be installed in the target filesystem.

From 971e0b0c5faa579b6d07c39bdfacf6c7d8a9b176 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:00 +0100
Subject: [PATCH 1334/6849] liburcu: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          | 1 +
 package/liburcu/Config.in  | 9 +++++++++
 package/liburcu/liburcu.mk | 7 +++++++
 3 files changed, 17 insertions(+)
 create mode 100644 package/liburcu/Config.in
 create mode 100644 package/liburcu/liburcu.mk

diff --git a/package/Config.in b/package/Config.in
index f5c76011f3..d15e9344f3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -376,6 +376,7 @@ source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
+source "package/liburcu/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
 source "package/startup-notification/Config.in"
diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in
new file mode 100644
index 0000000000..5a6e4b226b
--- /dev/null
+++ b/package/liburcu/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBURCU
+	bool "liburcu"
+	help
+	  Userspace implementation of the Read-Copy-Update (RCU)
+	  synchronization mechanism. This library is mainly used by
+	  the LTTng tracing infrastructure, but can be used for other
+	  purposes as well.
+
+	  http://lttng.org/urcu
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
new file mode 100644
index 0000000000..a34079d24f
--- /dev/null
+++ b/package/liburcu/liburcu.mk
@@ -0,0 +1,7 @@
+LIBURCU_VERSION = 0.6.7
+LIBURCU_SITE    = http://lttng.org/files/bundles/20111214/
+LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
+
+LIBURCU_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From 16891da22d99ec73696aa22c7564083146d664ec Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:01 +0100
Subject: [PATCH 1335/6849] lttng-modules: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/lttng-modules/Config.in        | 18 ++++++++++++++++++
 package/lttng-modules/lttng-modules.mk | 15 +++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/lttng-modules/Config.in
 create mode 100644 package/lttng-modules/lttng-modules.mk

diff --git a/package/Config.in b/package/Config.in
index d15e9344f3..d437e6e2fe 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -24,6 +24,7 @@ source "package/kexec/Config.in"
 source "package/lmbench/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
+source "package/lttng-modules/Config.in"
 source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
diff --git a/package/lttng-modules/Config.in b/package/lttng-modules/Config.in
new file mode 100644
index 0000000000..2a0f938b89
--- /dev/null
+++ b/package/lttng-modules/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LTTNG_MODULES
+	bool "lttng-modules"
+	depends on BR2_LINUX_KERNEL
+	help
+	  Kernel modules for the LTTng 2.0 kernel tracing
+	  infrastructure.
+
+	  Your kernel must have CONFIG_TRACEPOINTS enabled for this
+	  package to build something useful. You may also want to have
+	  CONFIG_PERF_EVENTS to access perf event counters from
+	  ltt-ng. Note that system call tracing is only available on
+	  architectures that support CONFIG_HAVE_SYSCALL_TRACEPOINTS.
+
+	  The packaged version is compatible with kernel 2.6.38,
+	  2.6.39, 3.0 and 3.1.0. See
+	  http://lttng.org/files/bundles/20111214/README.compatible.kernels.txt
+
+	  http://lttng.org
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
new file mode 100644
index 0000000000..1820c8fddf
--- /dev/null
+++ b/package/lttng-modules/lttng-modules.mk
@@ -0,0 +1,15 @@
+LTTNG_MODULES_VERSION = 2.0-pre11
+LTTNG_MODULES_SITE    = http://lttng.org/files/bundles/20111214/
+LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
+
+LTTNG_MODULES_DEPENDENCIES = linux
+
+define LTTNG_MODULES_BUILD_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR)
+endef
+
+define LTTNG_MODULES_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR) modules_install
+endef
+
+$(eval $(call GENTARGETS))

From dc77b0824e6d7adf40b4543243cbca8d8d03695b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:02 +0100
Subject: [PATCH 1336/6849] lttng-libust: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/lttng-libust/Config.in                | 10 +++++++
 .../lttng-libust-fix-overflow-32-bits.patch   | 26 +++++++++++++++++++
 package/lttng-libust/lttng-libust.mk          |  8 ++++++
 4 files changed, 45 insertions(+)
 create mode 100644 package/lttng-libust/Config.in
 create mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
 create mode 100644 package/lttng-libust/lttng-libust.mk

diff --git a/package/Config.in b/package/Config.in
index d437e6e2fe..ed916053c2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -378,6 +378,7 @@ source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
 source "package/liburcu/Config.in"
+source "package/lttng-libust/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
 source "package/startup-notification/Config.in"
diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in
new file mode 100644
index 0000000000..335a956886
--- /dev/null
+++ b/package/lttng-libust/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LTTNG_LIBUST
+	bool "lttng-libust"
+	select BR2_PACKAGE_LIBURCU
+	help
+	  Userspace tracing library for the Lttng tracing
+	  infrastructure. It allows userspace programs to create
+	  custom trace events that are integrated with all other
+	  events gathered by LTTng.
+
+	  http://lttng.org
diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
new file mode 100644
index 0000000000..c2a4dd295b
--- /dev/null
+++ b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
@@ -0,0 +1,26 @@
+From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001
+From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+Date: Wed, 21 Dec 2011 16:24:48 -0500
+Subject: [PATCH] Fix clock source overflow on 32-bit archs
+
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+---
+ liblttng-ust/clock.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
+index b5d3e77..23294d2 100644
+--- a/liblttng-ust/clock.h
++++ b/liblttng-ust/clock.h
+@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void)
+ 	struct timespec ts;
+ 
+ 	clock_gettime(CLOCK_MONOTONIC, &ts);
+-	return (ts.tv_sec * 1000000000) + ts.tv_nsec;
++	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
+ }
+ 
+ static __inline__ uint32_t trace_clock_freq_scale(void)
+-- 
+1.7.2.5
+
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
new file mode 100644
index 0000000000..a2cef2a7fd
--- /dev/null
+++ b/package/lttng-libust/lttng-libust.mk
@@ -0,0 +1,8 @@
+LTTNG_LIBUST_SITE    = http://lttng.org/files/bundles/20111214/
+LTTNG_LIBUST_VERSION = 1.9.2
+LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz
+
+LTTNG_LIBUST_INSTALL_STAGING = YES
+LTTNG_LIBUST_DEPENDENCIES    = liburcu
+
+$(eval $(call AUTOTARGETS))

From a7dfa29d128a2edf91f33f1d66dc55fa41ac0b4a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:03 +0100
Subject: [PATCH 1337/6849] lttng-tools: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/lttng-tools/Config.in      | 20 ++++++++++++++++++++
 package/lttng-tools/lttng-tools.mk | 11 +++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/lttng-tools/Config.in
 create mode 100644 package/lttng-tools/lttng-tools.mk

diff --git a/package/Config.in b/package/Config.in
index ed916053c2..7c3eb2e0f3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -25,6 +25,7 @@ source "package/lmbench/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/lttng-modules/Config.in"
+source "package/lttng-tools/Config.in"
 source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
new file mode 100644
index 0000000000..cc7496605c
--- /dev/null
+++ b/package/lttng-tools/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_LTTNG_TOOLS
+	bool "lttng-tools"
+	depends on BR2_PACKAGE_LTTNG_MODULES
+	select BR2_PACKAGE_LIBURCU
+	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_LTTNG_LIBUST
+	help
+	  Userspace utilities for the LTTng 2.0 tracing
+	  infrastructure.
+
+	  Those utilities are required on the target system to start
+	  and stop tracing sessions. Analysis of the trace can be done
+	  on the host machine using the babeltrace utility. This
+	  utility is automatically built by Buildroot in
+	  $(O)/host/usr/bin/babeltrace, as a dependency of
+	  lttng-tools. However, there is also a lttng-babeltrace
+	  package for the target, if babeltrace on the target is
+	  interesting.
+
+	  http://lttng.org
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
new file mode 100644
index 0000000000..9e874808cc
--- /dev/null
+++ b/package/lttng-tools/lttng-tools.mk
@@ -0,0 +1,11 @@
+LTTNG_TOOLS_VERSION = 2.0-pre15
+LTTNG_TOOLS_SITE    = http://lttng.org/files/bundles/20111214/
+LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
+
+# The host-lttng-babeltrace technically isn't a required build
+# dependency. However, having the babeltrace utilities built for the
+# host is very useful, since those tools allow to convert the binary
+# trace format into an human readable format.
+LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace lttng-libust
+
+$(eval $(call AUTOTARGETS))

From 6b6e0c8204c64868d656e35ba25dd5e2bf1bf7ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:04 +0100
Subject: [PATCH 1338/6849] popt: add host variant for host-lttng-babeltrace

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/popt/popt.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index 98f438d930..fd25caad96 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -16,3 +16,4 @@ POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
 endif
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 421344df699f7545cf405048acbf4f9cd496b359 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:05 +0100
Subject: [PATCH 1339/6849] util-linux: add host variant for
 host-lttng-babeltrace

lttng-babeltrace needs libuuid, which is provided by util-linux, and
since we want to build lttng-babeltrace for the host, we need to build
libuuid for the host. It's a shame that libuuid is part of such a big
package as util-linux.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index a3d6e139cd..86d970f011 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -13,6 +13,9 @@ UTIL_LINUX_DEPENDENCIES = host-pkg-config
 
 UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
 
+# We don't want the host-busybox dependency to be added automatically
+HOST_UTIL_LINUX_DEPENDENCIES = host-pkg-config
+
 # If both util-linux and busybox are selected, make certain util-linux
 # wins the fight over who gets to have their utils actually installed
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -67,7 +70,18 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
 
+# In the host version of util-linux, we so far only require libuuid,
+# and none of the util-linux utilities, so we disable all of them.
+HOST_UTIL_LINUX_CONF_OPT += \
+	--enable-libuuid \
+	--disable-mount --disable-fsck --disable-libmount \
+	--disable-uuidd --disable-libblkid --disable-agetty \
+	--disable-cramfs --disable-switch_root --disable-pivot_root \
+	--disable-fallocate --disable-unshare --disable-rename \
+	--disable-schedutils --disable-wall --disable-partx
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
 
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
 # one, so it disappears

From d2605833a3207c1037337c296a0bd0d1be15c7fc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jan 2012 20:40:06 +0100
Subject: [PATCH 1340/6849] lttng-babeltrace: new package

[Peter: drop redundant HOST_.._DEPENDENCIES setting]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/lttng-babeltrace/Config.in           | 22 ++++++++++++++++++++
 package/lttng-babeltrace/lttng-babeltrace.mk | 15 +++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/lttng-babeltrace/Config.in
 create mode 100644 package/lttng-babeltrace/lttng-babeltrace.mk

diff --git a/package/Config.in b/package/Config.in
index 7c3eb2e0f3..c506df8b91 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -24,6 +24,7 @@ source "package/kexec/Config.in"
 source "package/lmbench/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
+source "package/lttng-babeltrace/Config.in"
 source "package/lttng-modules/Config.in"
 source "package/lttng-tools/Config.in"
 source "package/ltrace/Config.in"
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
new file mode 100644
index 0000000000..e6f3845ec6
--- /dev/null
+++ b/package/lttng-babeltrace/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_LTTNG_BABELTRACE
+	bool "lttng-babeltrace"
+	depends on BR2_PACKAGE_LTTNG_TOOLS
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  Babeltrace is part of the LTTng 2.x project.
+
+	  This project provides trace read and write libraries, as
+	  well as a trace converter. A plugin can be created for any
+	  trace format to allow its conversion to/from another trace
+	  format.
+
+	  Having this tool on the target is not mandatory. You can
+	  transfer the binary trace output from the target to your
+	  development workstation, and use babeltrace here. Buildroot
+	  automatically builds a host babeltrace in
+	  $(O)/host/usr/bin/babeltrace as a dependency of the
+	  lttng-tools package.
+
+	  http://lttng.org
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
new file mode 100644
index 0000000000..51730286f1
--- /dev/null
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -0,0 +1,15 @@
+LTTNG_BABELTRACE_SITE    = http://lttng.org/files/bundles/20111214/
+LTTNG_BABELTRACE_VERSION = 0.8
+LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
+
+# Needed to fix libtool handling, otherwise the build fails when
+# building the ctf-parser-test program, which depends on libctf-ast.so
+# which itself depends on libbabeltrace_types.so.0 (and libtool gets
+# lost in the middle of this).
+LTTNG_BABELTRACE_AUTORECONF      = YES
+HOST_LTTNG_BABELTRACE_AUTORECONF = YES
+
+LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 2a273b6129efaf07e01b9fc4a70d7730481c68d6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 1 Feb 2012 09:18:17 +0100
Subject: [PATCH 1341/6849] libevas: disable sse3 optimizations for host builds

There's not really any advantage to adding it, and it depends on
immintrin.h which was added in gcc 4.4, so it breaks with older
host compilers.

For details, see:

http://trac.enlightenment.org/e/ticket/942

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index acb2f4bd9d..e34967b9c1 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -13,7 +13,7 @@ LIBEVAS_DEPENDENCIES = host-pkg-config zlib libeina freetype
 
 HOST_LIBEVAS_DEPENDENCIES = host-pkg-config host-zlib host-libeina \
 				host-freetype host-libpng
-HOST_LIBEVAS_CONF_OPT += --enable-image-loader-png
+HOST_LIBEVAS_CONF_OPT += --enable-image-loader-png --disable-cpu-sse3
 
 # rendering options
 ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)

From a67631eb6edec288e3a8f8f1db0f7ca10c000bdd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 1 Feb 2012 17:34:18 +0100
Subject: [PATCH 1342/6849] libevas: explicitly set host configure options

So the build doesn't fail if any of the dependencies aren't available.
Also enable the jpeg loader as that is needed by the libelementary build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index e34967b9c1..7758b183c2 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -12,8 +12,21 @@ LIBEVAS_INSTALL_STAGING = YES
 LIBEVAS_DEPENDENCIES = host-pkg-config zlib libeina freetype
 
 HOST_LIBEVAS_DEPENDENCIES = host-pkg-config host-zlib host-libeina \
-				host-freetype host-libpng
-HOST_LIBEVAS_CONF_OPT += --enable-image-loader-png --disable-cpu-sse3
+				host-freetype host-libpng host-jpeg
+HOST_LIBEVAS_CONF_OPT += \
+	--enable-image-loader-png \
+	--enable-image-loader-jpeg \
+	--disable-image-loader-gif \
+	--disable-image-loader-tiff \
+	--disable-image-loader-eet \
+	--disable-font-loader-eet \
+	--disable-cpu-sse3 \
+	--disable-software-sdl \
+	--disable-gl-sdl \
+	--disable-software-xlib \
+	--disable-gl-xlib \
+	--enable-software-xcb \
+	--disable-gl-xcb
 
 # rendering options
 ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)

From 7a2934c84cbe6e51281661b0f9fe7fef4ab0e78a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 30 Jan 2012 15:46:23 +0100
Subject: [PATCH 1343/6849] xapp_xinit: bump to 1.3.2

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xinit/xapp_xinit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index 48637f2267..dc1decf04c 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XINIT_VERSION = 1.2.1
+XAPP_XINIT_VERSION = 1.3.2
 XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11

From f8a9fe6406786b46a80538aba1b58c3092636a0a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 30 Jan 2012 15:46:24 +0100
Subject: [PATCH 1344/6849] xapp_xinput: bump to 1.5.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xinput/xapp_xinput.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 4e6884d060..4bc5879aa0 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XINPUT_VERSION = 1.5.0
+XAPP_XINPUT_VERSION = 1.5.4
 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi

From d2f1e0a2f214dc7a60ba5ed285762400f4da37ad Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 30 Jan 2012 15:46:25 +0100
Subject: [PATCH 1345/6849] xterm: bump to 278

bump version and add project's URL

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xterm/Config.in | 1 +
 package/xterm/xterm.mk  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/xterm/Config.in b/package/xterm/Config.in
index 99c89cfc78..33adf25f4f 100644
--- a/package/xterm/Config.in
+++ b/package/xterm/Config.in
@@ -6,3 +6,4 @@ config BR2_PACKAGE_XTERM
 	help
 	  xterm terminal emulator
 
+	  http://invisible-island.net/xterm/
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index fa362284cc..f462c7fa89 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-XTERM_VERSION = 271
+XTERM_VERSION = 278
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
 XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw

From f372dca94f2e75ebd0fec48edabf83cfcb036d36 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 27 Jan 2012 11:14:06 +0100
Subject: [PATCH 1346/6849] sdparm: bump to 1.07

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdparm/sdparm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index 21befd6001..9d2b00b319 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -1,4 +1,4 @@
-SDPARM_VERSION = 1.06
+SDPARM_VERSION = 1.07
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
 SDPARM_SITE = http://sg.danny.cz/sg/p/
 

From 2444085bdc3b2931c4826e455b938ce75d10821c Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 11 Jan 2012 18:53:38 +0100
Subject: [PATCH 1347/6849] Add support for package-declared devices

Add a way for packages to declare files they need instead of relying
only on device tables, which creates files no matter if the package is
indeed enabled, as we can see for busybox.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/common.mk                | 4 ++++
 package/Makefile.package.in | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/fs/common.mk b/fs/common.mk
index f793ff962b..d426f37966 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -50,6 +50,10 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
 	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+	echo -e '$(subst $(sep),\n,$(PACKAGES_DEVICES_TABLE))' >> $(FULL_DEVICE_TABLE)
+endif
+	echo -e '$(subst $(sep),\n,$(PACKAGES_PERMISSIONS_TABLE))' >> $(FULL_DEVICE_TABLE)
 	echo "$(HOST_DIR)/usr/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 endif
 	echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index e57bfed1b6..31f5ab6465 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -714,6 +714,8 @@ endif
 ifeq ($$($$($(2)_KCONFIG_VAR)),y)
 
 TARGETS += $(1)
+PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep)
+PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep)
 
 ifeq ($$($(2)_SITE_METHOD),svn)
 DL_TOOLS_DEPENDENCIES += svn

From c7746857d102e69e54202763eeb785a45755845d Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 11 Jan 2012 18:53:39 +0100
Subject: [PATCH 1348/6849] Convert busybox to the device declaration method

Busybox used to declare and create files even if the package was not
enabled through the device table. Remove the entries for busybox in the
device table and move them to the package declaration.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk      | 5 +++++
 target/generic/device_table.txt | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d18b6d0b13..59448d5a2f 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -28,6 +28,11 @@ ifndef BUSYBOX_CONFIG_FILE
 	BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
 endif
 
+define BUSYBOX_PERMISSIONS
+/bin/busybox			 f 4755	0 0 - - - - -
+/usr/share/udhcpc/default.script f 755  0 0 - - - - -
+endef
+
 # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 define BUSYBOX_INSTALL_MDEV_SCRIPT
diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt
index 12f35b2755..d3e394ba99 100644
--- a/target/generic/device_table.txt
+++ b/target/generic/device_table.txt
@@ -10,13 +10,11 @@
 /tmp					d	1777	0	0	-	-	-	-	-
 /etc					d	755	0	0	-	-	-	-	-
 /home/default				d	2755	1000	1000	-	-	-	-	-
-/bin/busybox				f	4755	0	0	-	-	-	-	-
 /etc/shadow				f	600	0	0	-	-	-	-	-
 /etc/passwd				f	644	0	0	-	-	-	-	-
 /etc/network/if-up.d			d	755	0	0	-	-	-	-	-
 /etc/network/if-pre-up.d		d	755	0	0	-	-	-	-	-
 /etc/network/if-down.d			d	755	0	0	-	-	-	-	-
 /etc/network/if-post-down.d		d	755	0	0	-	-	-	-	-
-/usr/share/udhcpc/default.script	f	755	0	0	-	-	-	-	-
 # uncomment this to allow starting x as non-root
 #/usr/X11R6/bin/Xfbdev		     	f	4755	0	0	-	-	-	-	-

From df8fa1712c06d748a6ae99b1084e480b68dd4bc1 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 11 Jan 2012 18:53:40 +0100
Subject: [PATCH 1349/6849] Migrate Xenomai to the new infrastructure

Xenomai used to have commented out devices to be created in the device
table that the user had to uncomment. Use the new infrastructure to do
just that.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/xenomai.mk          | 8 ++++++--
 target/generic/device_table_dev.txt | 5 -----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index b1a492f13d..72100f0f90 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -89,8 +89,12 @@ endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
 
-# If you use static /dev creation don't forget to update your
-#  device_table_dev.txt
+define XENOMAI_DEVICES
+/dev/rtheap  c  666  0  0  10  254  0  0  -
+/dev/rtscope c  666  0  0  10  253  0  0  -
+/dev/rtp     c  666  0  0  150 0    0  1  32
+endef
+
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
 XENOMAI_DEPENDENCIES += udev
 
diff --git a/target/generic/device_table_dev.txt b/target/generic/device_table_dev.txt
index 71cd083495..a3d53d460a 100644
--- a/target/generic/device_table_dev.txt
+++ b/target/generic/device_table_dev.txt
@@ -141,8 +141,3 @@
 
 # I2C device nodes
 /dev/i2c-	c	666	0	0	89	0	0	1	4
-
-# Xenomai
-#/dev/rtheap     c       666     0       0       10      254     0       0       -
-#/dev/rtscope    c       666     0       0       10      253     0       0       -
-#/dev/rtp        c       666     0       0       150     0       0       1       32

From d36f64e8d9ffcfd4d62adcb08f1c73419423072d Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 11 Jan 2012 18:53:41 +0100
Subject: [PATCH 1350/6849] doc: document <foo>_DEVICES / _PERMISSIONS

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gentargets.txt | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 92fce2ca47..d3731a2e54 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -38,7 +38,15 @@ system is based on hand-written Makefiles or shell scripts.
 24: 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
 25: endef
 26:
-27: $(eval $(call GENTARGETS))
+27: define LIBFOO_DEVICES
+28: 	/dev/foo  c  666  0  0  42  0  -  -  -
+29: endef
+30:
+31: define LIBFOO_PERMISSIONS
+32: 	/bin/foo  f  4755  0  0  -  -  -  -  -
+33: endef
+34:
+35: $(eval $(call GENTARGETS))
 --------------------------------
 
 The Makefile begins on line 6 to 8 with metadata information: the
@@ -75,7 +83,7 @@ All these steps rely on the +$(@D)+ variable, which
 contains the directory where the source code of the package has been
 extracted.
 
-Finally, on line 27, we call the +GENTARGETS+ which
+Finally, on line 35, we call the +GENTARGETS+ which
 generates, according to the variables defined previously, all the
 Makefile code necessary to make your package working.
 
@@ -188,6 +196,13 @@ information is (assuming the package name is +libfoo+) :
   variables are executed to install the package into the target
   directory.
 
+* +LIBFOO_DEVICES+ lists the device files to be created by Buildroot
+  when using the static device table. The syntax to use is the
+  makedevs one.
+
+* +LIBFOO_PERMISSIONS+ lists the changes of permissions to be done at
+  the end of the build process. The syntax is once again the makedevs one.
+
 The recommended way to define these variables is to use the following
 syntax:
 

From 14b600203b31f69d4ca90572b2fbf096053c29e0 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <abelloni@adeneo-embedded.com>
Date: Thu, 5 Jan 2012 12:03:48 +0100
Subject: [PATCH 1351/6849] boot: Reorder entries alphabetically

Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/Config.in b/boot/Config.in
index 2a97695d57..7e3d108459 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -1,11 +1,11 @@
 menu "Bootloaders"
 
+source "boot/at91bootstrap/Config.in"
+source "boot/at91dataflashboot/Config.in"
 source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
 source "boot/syslinux/Config.in"
 source "boot/uboot/Config.in"
-source "boot/at91bootstrap/Config.in"
-source "boot/at91dataflashboot/Config.in"
 source "boot/xloader/Config.in"
 
 endmenu

From 20695936ad63f602662bc4c6124a26312c46ff52 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <abelloni@adeneo-embedded.com>
Date: Thu, 5 Jan 2012 12:03:49 +0100
Subject: [PATCH 1352/6849] lpc32xx: Add CDL to the available bootloaders

This will build kickstart and s1l for the selected board and install
them alongside u-boot.

Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/Config.in                                |   1 +
 boot/lpc32xxcdl/Config.in                     |  10 +
 .../lpc32xxcdl-2.11-compiler_name.patch       |  52 +
 ...c32xxcdl-2.11-delete_redundant_files.patch | 969 ++++++++++++++++++
 .../lpc32xxcdl-2.11-libnosys_gnu.patch        | 188 ++++
 boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch | 521 ++++++++++
 boot/lpc32xxcdl/lpc32xxcdl.mk                 |  60 ++
 7 files changed, 1801 insertions(+)
 create mode 100644 boot/lpc32xxcdl/Config.in
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl.mk

diff --git a/boot/Config.in b/boot/Config.in
index 7e3d108459..f8ab1cff5f 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -4,6 +4,7 @@ source "boot/at91bootstrap/Config.in"
 source "boot/at91dataflashboot/Config.in"
 source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
+source "boot/lpc32xxcdl/Config.in"
 source "boot/syslinux/Config.in"
 source "boot/uboot/Config.in"
 source "boot/xloader/Config.in"
diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in
new file mode 100644
index 0000000000..b6cbcfd211
--- /dev/null
+++ b/boot/lpc32xxcdl/Config.in
@@ -0,0 +1,10 @@
+config BR2_TARGET_LPC32XXCDL
+	depends on BR2_arm
+	bool "LPC32XX CDL (kickstart and S1L)"
+
+if BR2_TARGET_LPC32XXCDL
+
+config BR2_TARGET_LPC32XXCDL_BOARDNAME
+	string "LPC32xx board name"
+
+endif #BR2_TARGET_LPC32XXCDL
diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
new file mode 100644
index 0000000000..6aecbdeba6
--- /dev/null
+++ b/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
@@ -0,0 +1,52 @@
+Use CROSS_COMPILE as compiler name and stop using libc
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+ makerule/lpc32xx/make.lpc32xx.gnu |   22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu
+index 1014c28..3277d99 100644
+--- a/makerule/lpc32xx/make.lpc32xx.gnu
++++ b/makerule/lpc32xx/make.lpc32xx.gnu
+@@ -27,19 +27,19 @@ CFLAGS   += -mno-sched-prolog -fno-hosted -mno-thumb-interwork -ffunction-sectio
+ CFLAGS   += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
+ AFLAGS   = -mcpu=arm926ej-s
+ AFLAGS   += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
+-CC       = arm-none-eabi-gcc
+-AS       = arm-none-eabi-as
+-AR       = arm-none-eabi-ar -r
+-LD       = arm-none-eabi-gcc
+-NM       = arm-none-eabi-nm
+-OBJDUMP  = arm-none-eabi-objdump
+-OBJCOPY  = arm-none-eabi-objcopy
+-READELF  = arm-none-eabi-readelf
++CC       = $(CROSS_COMPILE)gcc
++AS       = $(CROSS_COMPILE)as
++AR       = $(CROSS_COMPILE)ar -r
++LD       = $(CROSS_COMPILE)gcc
++NM       = $(CROSS_COMPILE)nm
++OBJDUMP  = $(CROSS_COMPILE)objdump
++OBJCOPY  = $(CROSS_COMPILE)objcopy
++READELF  = $(CROSS_COMPILE)readelf
+ LDFLAGS  += -Wl,--gc-sections
+ 
+ LK       =  -static
+ LK       += -Wl,--start-group $(TARGET_CSP_LIB) $(TARGET_BSP_LIB) $(TARGET_GEN_LIB)
+-LK       +=  -lgcc -lc -lg -lm -lstdc++ -lsupc++ 
++LK       +=  -nostdlib -lgcc #-lc -lg -lm -lstdc++ -lsupc++ 
+ LK       += -Wl,--end-group
+ MAP      = -Xlinker -Map -Xlinker
+ LDESC    = -Xlinker -T  
+@@ -47,6 +47,6 @@ ENTRY    = -e
+ BIN      = -bin
+ EXT      = .elf
+ LEXT     = 
+-ELFTOREC =arm-none-eabi-objcopy -O srec --strip-all --verbose
+-ELFTOBIN =arm-none-eabi-objcopy -I elf32-littlearm -O binary --strip-all --verbose
++ELFTOREC = $(OBJCOPY) -O srec --strip-all --verbose
++ELFTOBIN = $(OBJCOPY) -I elf32-littlearm -O binary --strip-all --verbose
+ REC      =.srec
+-- 
+1.7.7.3
+
diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
new file mode 100644
index 0000000000..39966f01e9
--- /dev/null
+++ b/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
@@ -0,0 +1,969 @@
+Remove duplicated files to stop the linker from complaining about duplicate
+symbols
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+--- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sysapi_timer.c	2011-10-05 19:10:37.000000000 +0200
++++ /dev/null	2012-01-01 16:39:47.918907000 +0100
+@@ -1,212 +0,0 @@
+-/***********************************************************************
+- * $Id:: sysapi_timer.c 3394 2010-05-06 17:56:27Z usb10132             $
+- *
+- * Project: Time support functions
+- *
+- * Description:
+- *     Implements the following functions required for the S1L API
+- *         time_init
+- *         time_reset
+- *         time_start
+- *         time_stop
+- *         time_get
+- *         time_get_rate
+- *
+- ***********************************************************************
+- * Software that is described herein is for illustrative purposes only  
+- * which provides customers with programming information regarding the  
+- * products. This software is supplied "AS IS" without any warranties.  
+- * NXP Semiconductors assumes no responsibility or liability for the 
+- * use of the software, conveys no license or title under any patent, 
+- * copyright, or mask work right to the product. NXP Semiconductors 
+- * reserves the right to make changes in the software without 
+- * notification. NXP Semiconductors also make no representation or 
+- * warranty that such application will be suitable for the specified 
+- * use without further testing or modification. 
+- **********************************************************************/
+-
+-#include "s1l_sys_inf.h"
+-#include "lpc32xx_intc_driver.h"
+-#include "lpc32xx_timer_driver.h"
+-
+-static UNS_64 base_rate;
+-static INT_32 tdev = 0;
+-
+-/***********************************************************************
+- *
+- * Function: time_init
+- *
+- * Purpose: Initializes time system
+- *
+- * Processing: Initializes the system timer.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: 0 if the init failed, otherwise non-zero
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-INT_32 time_init(void)
+-{
+-	TMR_PSCALE_SETUP_T pscale;
+-
+-	/* Open timer driver */
+-	if (tdev == 0)
+-	{
+-		tdev = timer_open((void *) TIMER_CNTR0, 0);
+-		if (tdev != 0)
+-		{
+-			/* Use a prescale count to 100000 */
+-			pscale.ps_tick_val = 100000;
+-			pscale.ps_us_val = 0; /* Not needed when ps_tick_val != 0 */
+-			timer_ioctl(tdev, TMR_SETUP_PSCALE, (INT_32) &pscale);
+-
+-			/* Get timer clock rate */
+-			base_rate = (UNS_64) timer_ioctl(tdev, TMR_GET_STATUS,
+-				TMR_GET_CLOCK);
+-		}
+-	}
+-
+-	return tdev;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_reset
+- *
+- * Purpose: Resets system timer
+- *
+- * Processing:
+- *     See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void time_reset(void)
+-{
+-	if (tdev != 0)
+-	{
+-		timer_ioctl(tdev, TMR_RESET, 1);
+-	}
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_start
+- *
+- * Purpose: Starts system timer
+- *
+- * Processing:
+- *     See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void time_start(void)
+-{
+-	if (tdev != 0)
+-	{
+-		timer_ioctl(tdev, TMR_ENABLE, 1);
+-	}
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_stop
+- *
+- * Purpose: Stops system timer
+- *
+- * Processing:
+- *     See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void time_stop(void)
+-{
+-	if (tdev != 0)
+-	{
+-		timer_ioctl(tdev, TMR_ENABLE, 0);
+-	}
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_get
+- *
+- * Purpose: Returns current system time value
+- *
+- * Processing:
+- *     See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: The number of ticks of the timer counter
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-UNS_64 time_get(void)
+-{
+-	TMR_COUNTS_T tcounts;
+-	UNS_64 ticks = 0;
+-
+-	if (tdev != 0)
+-	{
+-		timer_ioctl(tdev, TMR_GET_COUNTS, (INT_32) &tcounts);
+-
+-		/* Compute number of timer ticks */
+-		ticks = (UNS_64) tcounts.count_val * 100000;
+-		ticks = ticks + (UNS_64) tcounts.ps_count_val;
+-	}
+-
+-	return ticks;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: time_get_rate
+- *
+- * Purpose:
+- *     Returns base tick rate (ticks per second) of the time counter
+- *
+- * Processing:
+- *     See function.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: The timer tick rate (in ticks per second)
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-UNS_64 time_get_rate(void)
+-{
+-	return base_rate;
+-}
+-
+--- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sys_mmu_cmd_group.c	2011-10-05 19:10:37.000000000 +0200
++++ /dev/null	2012-01-01 16:39:47.918907000 +0100
+@@ -1,746 +0,0 @@
+-/***********************************************************************
+- * $Id:: sys_mmu_cmd_group.c 3430 2010-05-07 17:39:08Z usb10132        $
+- *
+- * Project: Command processor for peek, poke, dump, and fill
+- *
+- * Description:
+- *     Processes commands from the command prompt
+- *
+- ***********************************************************************
+- * Software that is described herein is for illustrative purposes only  
+- * which provides customers with programming information regarding the  
+- * products. This software is supplied "AS IS" without any warranties.  
+- * NXP Semiconductors assumes no responsibility or liability for the 
+- * use of the software, conveys no license or title under any patent, 
+- * copyright, or mask work right to the product. NXP Semiconductors 
+- * reserves the right to make changes in the software without 
+- * notification. NXP Semiconductors also make no representation or 
+- * warranty that such application will be suitable for the specified 
+- * use without further testing or modification. 
+- **********************************************************************/
+-
+-#include "lpc_arm922t_cp15_driver.h"
+-#include "lpc_string.h"
+-#include "startup.h"
+-#include "s1l_cmds.h"
+-#include "s1l_sys_inf.h"
+-
+-/* dcache command */
+-BOOL_32 cmd_dcache(void);
+-static UNS_32 cmd_dcache_plist[] =
+-{
+-	(PARSE_TYPE_STR), /* The "dcache" command */
+-	(PARSE_TYPE_DEC | PARSE_TYPE_END)
+-};
+-static CMD_ROUTE_T core_dcache_cmd =
+-{
+-	(UNS_8 *) "dcache",
+-	cmd_dcache,
+-	(UNS_8 *) "Enables, disables, or flushes data cache",
+-	(UNS_8 *) "dcache [0(disable), 1(enable), 2(flush)]",
+-	cmd_dcache_plist,
+-	NULL
+-};
+-
+-/* icache command */
+-BOOL_32 cmd_icache(void);
+-static UNS_32 cmd_icache_plist[] =
+-{
+-	(PARSE_TYPE_STR), /* The "icache" command */
+-	(PARSE_TYPE_DEC | PARSE_TYPE_END)
+-};
+-static CMD_ROUTE_T core_icache_cmd =
+-{
+-	(UNS_8 *) "icache",
+-	cmd_icache,
+-	(UNS_8 *) "Enables or disables instruction cache",
+-	(UNS_8 *) "icache [0(disable), 1(enable)]",
+-	cmd_icache_plist,
+-	NULL
+-};
+-
+-/* inval command */
+-BOOL_32 cmd_inval(void);
+-static UNS_32 cmd_inval_plist[] =
+-{
+-	(PARSE_TYPE_STR | PARSE_TYPE_END) /* The "inval" command */
+-};
+-static CMD_ROUTE_T core_inval_cmd =
+-{
+-	(UNS_8 *) "inval",
+-	cmd_inval,
+-	(UNS_8 *) "Flushes data cache and invalidates instruction cache",
+-	(UNS_8 *) "inval",
+-	cmd_inval_plist,
+-	NULL
+-};
+-
+-/* mmuenab command */
+-BOOL_32 cmd_mmuenab(void);
+-static UNS_32 cmd_mmuenab_plist[] =
+-{
+-	(PARSE_TYPE_STR), /* The "mmuenab" command */
+-	(PARSE_TYPE_DEC | PARSE_TYPE_END)
+-};
+-static CMD_ROUTE_T core_mmuenab_cmd =
+-{
+-	(UNS_8 *) "mmuenab",
+-	cmd_mmuenab,
+-	(UNS_8 *) "Enables or disables the MMU",
+-	(UNS_8 *) "mmuenab [0(disable), 1(enable)]",
+-	cmd_mmuenab_plist,
+-	NULL
+-};
+-
+-/* map command */
+-BOOL_32 cmd_map(void);
+-static UNS_32 cmd_map_plist[] =
+-{
+-	(PARSE_TYPE_STR), /* The "map" command */
+-	(PARSE_TYPE_HEX),
+-	(PARSE_TYPE_HEX),
+-	(PARSE_TYPE_DEC),
+-	(PARSE_TYPE_DEC | PARSE_TYPE_END),
+-};
+-static CMD_ROUTE_T core_map_cmd =
+-{
+-	(UNS_8 *) "map",
+-	cmd_map,
+-	(UNS_8 *) "Maps a range of physical address sections to virtual addresses",
+-	(UNS_8 *) "map [virt hex addr][phy hex addr][sections][0(uncached), 1(cached), 2(unmap)]",
+-	cmd_map_plist,
+-	NULL
+-};
+-
+-/* mmuinfo command */
+-static BOOL_32 cmd_mmuinfo(void);
+-static UNS_32 cmd_mmuinfo_plist[] =
+-{
+-	(PARSE_TYPE_STR | PARSE_TYPE_END) /* The "mmuinfo" command */
+-};
+-static CMD_ROUTE_T core_mmuinfo_cmd =
+-{
+-	(UNS_8 *) "mmuinfo",
+-	cmd_mmuinfo,
+-	(UNS_8 *) "Dumps page table and MMU info",
+-	(UNS_8 *) "mmuinfo",
+-	cmd_mmuinfo_plist,
+-	NULL
+-};
+-
+-/* MMU group */
+-static GROUP_LIST_T mmu_group =
+-{
+-	(UNS_8 *) "mmu", /* mmu group */
+-	(UNS_8 *) "MMU command group",
+-	NULL,
+-	NULL
+-};
+-
+-static UNS_8 enabled_msg [] =" enabled";
+-static UNS_8 disabled_msg [] =" disabled";
+-static UNS_8 dcache_msg[] = "Data cache";
+-static UNS_8 icache_msg[] = "Instruction cache";
+-static UNS_8 pagetab_msg[] = "Page table at address: ";
+-static UNS_8 slist_msg[] = "Type        Virt       Phy        fl Size";
+-static UNS_8 mmu_msg [] ="MMU";
+-static UNS_8 cpage_msg[] = "Coarse page:";
+-static UNS_8 fpage_msg[] = "Fine page  :";
+-static UNS_8 sect_msg[] =  "Section    :";
+-static UNS_8 mbytes_msg[] = "M";
+-static UNS_8 map1_err_msg[] =
+-	"Error : section addresses must be aligned on a 32-bit boundary";
+-static UNS_8 map2_err_msg[] =
+-	"Error : Number of sections exceeds address range of device";
+-static UNS_8 phya_msg[] = "Virtual address ";
+-static UNS_8 mapped_msg[] = " mapped to physical address ";
+-static UNS_8 unmapped_msg[] = " unmapped from physical address ";
+-static UNS_8 cached_msg[] = " (cached)";
+-static UNS_8 inval_msg[] = " invalidated";
+-static UNS_8 caches_msg [] ="Caches";
+-static UNS_8 flushed_msg[] = " flushed";
+-
+-/***********************************************************************
+- *
+- * Function: show_section
+- *
+- * Purpose: Display section information
+- *
+- * Processing:
+- *     See function.
+- *
+- * Parameters:
+- *     mmu_reg   : MMU settings for this section
+- *     virt_addr : Starting virtual address for this section
+- *     segs      : Number of 1M segments for this section
+- *
+- * Outputs: None
+- *
+- * Returns: Nothing
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static void show_section(UNS_32 mmu_reg,
+-						 UNS_32 virt_addr,
+-						 UNS_32 segs) 
+-{
+-	UNS_8 straddr [16];
+-	UNS_32 mmu_phy;
+-
+-	if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) !=
+-		ARM922T_L1D_TYPE_FAULT) 
+-	{
+-		if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
+-			ARM922T_L1D_TYPE_CPAGE) 
+-		{
+-			term_dat_out(cpage_msg);
+-		}
+-		else if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
+-			ARM922T_L1D_TYPE_FPAGE) 
+-		{
+-			term_dat_out(fpage_msg);
+-		}
+-		else
+-		{
+-			term_dat_out(sect_msg);
+-		}
+-
+-		/* Compute virtual address */
+-		str_makehex(straddr, virt_addr, 8);
+-		term_dat_out(straddr);
+-		term_dat_out((UNS_8 *) " ");
+-
+-		/* Compute mapped physical address */
+-		if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
+-		ARM922T_L1D_TYPE_SECTION) 
+-		{
+-			mmu_phy = mmu_reg & 0xFFF00000;
+-		}
+-		else 
+-		{
+-			/* Don't compute addresses for non-sections */
+-			mmu_phy = 0;
+-		}
+-		str_makehex(straddr, mmu_phy, 8);
+-		term_dat_out(straddr);
+-		term_dat_out((UNS_8 *) " ");
+-
+-		/* MMU flags */
+-		if ((mmu_reg & ARM922T_L1D_BUFFERABLE) != 0) 
+-		{
+-			term_dat_out((UNS_8 *) "b");
+-		}
+-		else 
+-		{
+-			term_dat_out((UNS_8 *) " ");
+-		}
+-		if ((mmu_reg & ARM922T_L1D_CACHEABLE) != 0) 
+-		{
+-			term_dat_out((UNS_8 *) "c");
+-		}
+-		else 
+-		{
+-			term_dat_out((UNS_8 *) " ");
+-		}
+-		term_dat_out((UNS_8 *) " ");
+-
+-		/* Displays used megabytes */
+-		str_makedec(straddr, segs);
+-		term_dat_out(straddr);
+-		term_dat_out_crlf(mbytes_msg);
+-	}
+-}
+-
+-/***********************************************************************
+- *
+- * Function: mmu_dumpinfo
+- *
+- * Purpose: Display MMU info
+- *
+- * Processing:
+- *     Display the MMU information, including enable status, cache
+- *     status, and page table.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static BOOL_32 mmu_dumpinfo(void) 
+-{
+-	UNS_32 segsz, last_mmu_reg, mmu_vrt, mmu_reg, mmu_vrtsav = 0, *pt;
+-	UNS_32 mlast_mmu_reg, mmmu_reg;
+-	int idx;
+-	UNS_8 hexaddr [16];
+-
+-	term_dat_out(mmu_msg);
+-	if (cp15_mmu_enabled() == FALSE) 
+-	{
+-		term_dat_out_crlf(disabled_msg);
+-	}
+-	else 
+-	{
+-		term_dat_out_crlf(enabled_msg);
+-
+-	    /* Get MMU control register word */
+-  		mmu_reg = cp15_get_mmu_control_reg();
+-
+-		/* Instruction cache status */
+-		term_dat_out(icache_msg);
+-		if ((mmu_reg & ARM922T_MMU_CONTROL_I) == 0) 
+-		{
+-			term_dat_out_crlf(disabled_msg);
+-		}
+-		else 
+-		{
+-			term_dat_out_crlf(enabled_msg);
+-		}
+-
+-		/* Data cache status */
+-		term_dat_out(dcache_msg);
+-		if ((mmu_reg & ARM922T_MMU_CONTROL_C) == 0) 
+-		{
+-			term_dat_out_crlf(disabled_msg);
+-		}
+-		else 
+-		{
+-			term_dat_out_crlf(enabled_msg);
+-		}
+-
+-		term_dat_out(pagetab_msg);
+-		mmu_reg = (UNS_32) cp15_get_ttb();
+-		str_makehex(hexaddr, mmu_reg, 8);
+-		term_dat_out_crlf(hexaddr);
+-		term_dat_out_crlf(slist_msg);
+-
+-		/* Process MMU table - assume that the physical and
+-		   virtual locations of table are the same */
+-		pt = (UNS_32 *) mmu_reg;
+-		mmu_vrt = 0x0;
+-		segsz = 0xFFFFFFFF;
+-		last_mmu_reg = mlast_mmu_reg = 0xFFFFFFFF;
+-		for (idx = 0; idx < 4096; idx++) 
+-		{
+-			mmu_reg = *pt;
+-			mmmu_reg = (mmu_reg & (ARM922T_L1D_TYPE_PG_SN_MASK |
+-				ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE));
+-			segsz = segsz + 1;
+-
+-			if ((last_mmu_reg != 0xFFFFFFFF) &&
+-				(mlast_mmu_reg != mmmu_reg))
+-			{
+-				show_section(last_mmu_reg, mmu_vrtsav, segsz);
+-				segsz = 0;
+-			}
+-
+-			if (mlast_mmu_reg != mmmu_reg) 
+-			{
+-				mmu_vrtsav = mmu_vrt;
+-				last_mmu_reg = mmu_reg;
+-				mlast_mmu_reg = mmmu_reg;
+-			}
+-
+-			pt++;
+-			mmu_vrt += 0x00100000;
+-		}
+-	}
+-
+-	return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: mmu_dumpmap
+- *
+- * Purpose: Map a virtual address range to a physical range
+- *
+- * Processing:
+- *     From the input addresses and number of sections, generate the
+- *     appropriate entries in the page table.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static BOOL_32 mmu_dumpmap(UNS_32 vrt,
+-						   UNS_32 phy,
+-						   UNS_32 sections,
+-						   UNS_32 cache) 
+-{
+-	BOOL_32 processed = FALSE;
+-	UNS_32 mmu_phy, mmu_vrt, tmp1 = 0, tmp2, *pt;
+-	UNS_8 hexaddr [16];
+-
+-	/* Verify address boundaries are sectional */
+-	mmu_vrt = vrt & ~ARM922T_L2D_SN_BASE_MASK;
+-	mmu_phy = phy & ~ARM922T_L2D_SN_BASE_MASK;
+-	if ((mmu_vrt != 0) || (mmu_phy != 0)) 
+-	{
+-		term_dat_out_crlf(map1_err_msg);
+-	}
+-	else 
+-	{
+-		/* Verify that address range and section count will not
+-		   exceed address range of device */
+-		tmp1 = vrt >> 20;
+-		tmp1 = (tmp1 + sections) - 1;
+-		tmp2 = phy >> 20;
+-		tmp2 = (tmp2 + sections) - 1;
+-		if ((tmp1 < 4096) && (tmp2 < 4096)) 
+-		{
+-			/* Good address range and good section count */
+-			processed = TRUE;
+-		}
+-		else 
+-		{
+-			term_dat_out_crlf(map2_err_msg);
+-		}
+-	}
+-	
+-	/* Generate static part of MMU word */
+-	if (cache == 0) 
+-	{
+-		/* Section mapped with cache disabled */
+-		tmp1 = ARM922T_L1D_TYPE_SECTION;
+-	}
+-	else if (cache == 1)
+-	{
+-		/* Section mapped with cache enabled */
+-		tmp1 = (ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE |
+-			ARM922T_L1D_TYPE_SECTION);
+-	}
+-	else if (cache == 2)
+-	{
+-		/* Section unmapped */
+-		tmp1 = ARM922T_L1D_TYPE_FAULT;
+-	}
+-	tmp1 |= ARM922T_L1D_AP_ALL;
+-
+-	/* Offset into page table for virtual address */
+-	tmp2 = (vrt >> 20);
+-	pt = cp15_get_ttb() + tmp2;
+-
+-	/* Loop until all sections are complete */
+-	while ((sections > 0) && (processed == TRUE)) 
+-	{
+-		/* Add in physical address */
+-		tmp2 = tmp1 | (phy & ARM922T_L2D_SN_BASE_MASK);
+-
+-		/* Save new section descriptor for virtual address */
+-		*pt = tmp2;
+-
+-		/* Output message shown the map */
+-		term_dat_out(phya_msg);
+-		str_makehex(hexaddr, phy, 8);
+-		term_dat_out(hexaddr);
+-		if (cache == 2) 
+-		{
+-			term_dat_out(unmapped_msg);
+-		}
+-		else 
+-		{
+-			term_dat_out(mapped_msg);
+-		}
+-		str_makehex(hexaddr, vrt, 8);
+-		term_dat_out(hexaddr);
+-		if (cache == 1) 
+-		{
+-			term_dat_out(cached_msg);
+-		}
+-		term_dat_out_crlf((UNS_8 *) "");
+-
+-		/* Next section and page table entry*/
+-		phy += 0x00100000;
+-		vrt += 0x00100000;
+-		pt++;
+-		sections--;
+-	}
+-
+-	return processed;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_mmuinfo
+- *
+- * Purpose: Display MMU information
+- *
+- * Processing:
+- *     See function. 
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-static BOOL_32 cmd_mmuinfo(void) 
+-{
+-	mmu_dumpinfo();
+-
+-	return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_map
+- *
+- * Purpose: Map a physical address region to a virtual region
+- *
+- * Processing:
+- *     See function. 
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_map(void) 
+-{
+-	UNS_32 phy, virt, sects, ce = 0;
+-
+-	/* Get arguments */
+-	virt = cmd_get_field_val(1);
+-	phy = cmd_get_field_val(2);
+-	sects = cmd_get_field_val(3);
+-	ce = cmd_get_field_val(4);
+-
+-	if (ce <= 2) 
+-	{
+-		mmu_dumpmap(virt, phy, sects, ce);
+-	}
+-
+-	return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_inval
+- *
+- * Purpose: MMU cache flush and invalidate
+- *
+- * Processing:
+- *     See function. 
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_inval(void) 
+-{
+-	dcache_flush();
+-	icache_inval();
+-	term_dat_out(caches_msg);
+-	term_dat_out(inval_msg);
+-
+-	return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_dcache
+- *
+- * Purpose: MMU data cache enable and disable
+- *
+- * Processing:
+- *     If the value passed in the parser is 1, enable the data cache,
+- *     otherwise disable the data cache.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_dcache(void) 
+-{
+-	UNS_32 cenable;
+-	UNS_8 *ppar;
+-
+-	/* Get argument */
+-	cenable = cmd_get_field_val(1);
+-
+-	switch (cenable)
+-	{
+-		case 0:
+-			dcache_flush();
+-			cp15_set_dcache(0);
+-			ppar = disabled_msg;
+-			break;
+-
+-		case 1:
+-			cp15_invalidate_cache();
+-			cp15_set_dcache(1);
+-			ppar = enabled_msg;
+-			break;
+-
+-		case 2:
+-		default:
+-			dcache_flush();
+-			ppar = flushed_msg;
+-			break;
+-	}
+-
+-	term_dat_out(dcache_msg);
+-	term_dat_out_crlf(ppar);
+-
+-	return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: cmd_icache
+- *
+- * Purpose: MMU instruction cache enable and disable
+- *
+- * Processing:
+- *     If the value passed in the parser is 1, enable the instruction
+- *     cache, otherwise disable the instruction cache.
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_icache(void)
+-{
+-	UNS_32 cenable;
+-	UNS_8 *ppar;
+-
+-	/* Get argument */
+-	cenable = cmd_get_field_val(1);
+-
+-	if (cenable == 1) 
+-	{
+-		dcache_flush();
+-		cp15_invalidate_cache();
+-		cp15_set_icache(1);
+-		ppar = enabled_msg;
+-	}
+-	else
+-	{
+-		cp15_set_icache(0);
+-		ppar = disabled_msg;
+-	}
+-
+-	term_dat_out(icache_msg);
+-	term_dat_out_crlf(ppar);
+-
+-	return TRUE;
+-}
+-
+-
+-/***********************************************************************
+- *
+- * Function: cmd_mmuenab
+- *
+- * Purpose: Enable or disable MMU
+- *
+- * Processing:
+- *     See function. 
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: TRUE if the command was processed, otherwise FALSE
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-BOOL_32 cmd_mmuenab(void) 
+-{
+-	UNS_8 *ppar;
+-	UNS_32 cenable;
+-
+-	term_dat_out_crlf((UNS_8 *) "Warning: Changing MMU status on "
+-		" cached and buffered code can cause system crashes.");
+-
+-	/* Get argument */
+-	cenable = cmd_get_field_val(1);
+-
+-	if (cenable == 1) 
+-	{
+-		if ((cp15_get_mmu_control_reg() & ARM922T_MMU_CONTROL_C) != 0)
+-		{
+-			cp15_invalidate_cache();
+-		}
+-
+-		cp15_set_mmu(1);
+-		ppar = enabled_msg;
+-	}
+-	else
+-	{
+-		cp15_dcache_flush();
+-		cp15_write_buffer_flush();
+-		cp15_invalidate_cache();
+-		cp15_set_mmu(0);
+-		ppar = disabled_msg;
+-	}
+-
+-	term_dat_out(mmu_msg);
+-	term_dat_out_crlf(ppar);
+-
+-	return TRUE;
+-}
+-
+-/***********************************************************************
+- *
+- * Function: mmu_cmd_group_init
+- *
+- * Purpose: Initialize MMU command group
+- *
+- * Processing:
+- *     See function. 
+- *
+- * Parameters: None
+- *
+- * Outputs: None
+- *
+- * Returns: Nothin
+- *
+- * Notes: None
+- *
+- **********************************************************************/
+-void mmu_cmd_group_init(void)
+-{
+-	/* Add MMU group */
+-	cmd_add_group(&mmu_group);
+-
+-	/* Add commands to the MMU group */
+-	cmd_add_new_command(&mmu_group, &core_dcache_cmd);
+-	cmd_add_new_command(&mmu_group, &core_icache_cmd);
+-	cmd_add_new_command(&mmu_group, &core_inval_cmd);
+-	cmd_add_new_command(&mmu_group, &core_mmuenab_cmd);
+-	cmd_add_new_command(&mmu_group, &core_map_cmd);
+-	cmd_add_new_command(&mmu_group, &core_mmuinfo_cmd);
+-}
diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
new file mode 100644
index 0000000000..cfd77bead6
--- /dev/null
+++ b/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
@@ -0,0 +1,188 @@
+Fix compilation and eabi issues
+
+Since we are not linking with libc anymore, we need to define our own memset,
+strlen and memcpy. Also, as we are using a *libc compiler, we need to "handle"
+exceptions (mostly division by 0) by defining raise() and
+__aeabi_unwind_cpp_pr0.
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+ csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c  |   41 +++++++++++++++++++++++
+ csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c |   41 +++++++++++++++++++++++
+ csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c |   41 +++++++++++++++++++++++
+ 3 files changed, 123 insertions(+), 0 deletions(-)
+
+diff --git a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
+index 385b0ab..f1f0a0a 100644
+--- a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
++++ b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ 
+ /* errno definition */
+ #undef errno
+@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
+     return 0;
+ }
+ 
++void * memset(void * s,int c,size_t count)
++{
++        char *xs = (char *) s;
++
++        while (count--)
++                *xs++ = c;
++
++        return s;
++}
++
++
++size_t strlen(const char * s)
++{
++        const char *sc;
++
++        for (sc = s; *sc != '\0'; ++sc)
++                /* nothing */;
++        return sc - s;
++}
++
++void * memcpy(void * dest,const void *src,size_t count)
++{
++        char *tmp = (char *) dest, *s = (char *) src;
++
++        while (count--)
++                *tmp++ = *s++;
++
++        return dest;
++}
++
++
++/* Dummy functions to avoid linker complaints */
++void __aeabi_unwind_cpp_pr0(void)
++{
++};
++
++void raise(void)
++{
++};
++
+ #endif /*__GNUC__*/
+diff --git a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
+index 385b0ab..f1f0a0a 100644
+--- a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
++++ b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ 
+ /* errno definition */
+ #undef errno
+@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
+     return 0;
+ }
+ 
++void * memset(void * s,int c,size_t count)
++{
++        char *xs = (char *) s;
++
++        while (count--)
++                *xs++ = c;
++
++        return s;
++}
++
++
++size_t strlen(const char * s)
++{
++        const char *sc;
++
++        for (sc = s; *sc != '\0'; ++sc)
++                /* nothing */;
++        return sc - s;
++}
++
++void * memcpy(void * dest,const void *src,size_t count)
++{
++        char *tmp = (char *) dest, *s = (char *) src;
++
++        while (count--)
++                *tmp++ = *s++;
++
++        return dest;
++}
++
++
++/* Dummy functions to avoid linker complaints */
++void __aeabi_unwind_cpp_pr0(void)
++{
++};
++
++void raise(void)
++{
++};
++
+ #endif /*__GNUC__*/
+diff --git a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
+index cfdb674..6b50c60 100644
+--- a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
++++ b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <sys/times.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ 
+ /* errno definition */
+ #undef errno
+@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
+     return 0;
+ }
+ 
++void * memset(void * s,int c,size_t count)
++{
++        char *xs = (char *) s;
++
++        while (count--)
++                *xs++ = c;
++
++        return s;
++}
++
++
++size_t strlen(const char * s)
++{
++        const char *sc;
++
++        for (sc = s; *sc != '\0'; ++sc)
++                /* nothing */;
++        return sc - s;
++}
++
++void * memcpy(void * dest,const void *src,size_t count)
++{
++        char *tmp = (char *) dest, *s = (char *) src;
++
++        while (count--)
++                *tmp++ = *s++;
++
++        return dest;
++}
++
++
++/* Dummy functions to avoid linker complaints */
++void __aeabi_unwind_cpp_pr0(void)
++{
++};
++
++void raise(void)
++{
++};
++
+ #endif /*__GNUC__*/
+-- 
+1.7.7.3
+
diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
new file mode 100644
index 0000000000..94c184780e
--- /dev/null
+++ b/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
@@ -0,0 +1,521 @@
+Use slashes instead of backslashes
+
+Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
+---
+ .../bsps/common/examples/buildfiles/makefile       |   10 +++---
+ .../startup/examples/burners/makefile.burner       |   16 +++++-----
+ csps/lpc32xx/bsps/ea3250/source/makefile           |   10 +++---
+ csps/lpc32xx/bsps/fdi3250/source/makefile          |   12 ++++----
+ csps/lpc32xx/bsps/phy3250/examples/makefile        |    2 +-
+ csps/lpc32xx/bsps/phy3250/source/makefile          |    2 +-
+ .../examples/Burners/nor/kickstart/makefile        |    2 +-
+ .../startup/examples/Burners/nor/norerase/makefile |    2 +-
+ .../startup/examples/Burners/nor/s1lapp/makefile   |    2 +-
+ .../examples/Burners/spi/kickstart/makefile        |    2 +-
+ csps/lpc32xx/source/makefile                       |   10 +++---
+ lpc/source/makefile                                |   10 +++---
+ makefile                                           |    2 +-
+ makerule/common/make.rules.environment             |   30 ++++++++++----------
+ makerule/lpc32xx/make.lpc32xx.gnu                  |    2 +-
+ makerule/lpc32xx/make.lpc32xx.iar                  |   12 ++++----
+ makerule/lpc32xx/make.lpc32xx.keil                 |    6 ++--
+ makerule/lpc32xx/make.lpc32xx.rvw                  |    2 +-
+ 18 files changed, 67 insertions(+), 67 deletions(-)
+
+diff --git a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile
+index cf4977c..1da2201 100644
+--- a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile
++++ b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile
+@@ -25,16 +25,16 @@
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ ########################################################################
+ #
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
+-AFLAGS +=-I..\Include
+-CFLAGS +=-I..\Include
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
++AFLAGS +=-I../Include
++CFLAGS +=-I../Include
+ 
+ ########################################################################
+ #
+@@ -42,6 +42,6 @@ CFLAGS +=-I..\Include
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
+ 
+ 
+diff --git a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner
+index fca3947..18bd703 100644
+--- a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner
++++ b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner
+@@ -22,9 +22,9 @@
+ #
+ ########################################################################
+ 
+-COMMON_BASE := $(NXPMCU_SOFTWARE)\csps\$(CSP)\bsps\common
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
+-include $(COMMON_BASE)\startup\examples\buildfiles\make.env
++COMMON_BASE := $(NXPMCU_SOFTWARE)/csps/$(CSP)/bsps/common
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
++include $(COMMON_BASE)/startup/examples/buildfiles/make.env
+ 
+ ########################################################################
+ # ARM Realview
+@@ -38,7 +38,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}"
+ #AFLAGS += --predefine "RW_RELOC SETL {TRUE}"
+ 
+ # This runs from IRAM
+-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld
++LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld
+ LDFLAGS = --remove
+ MAP = --map --info=totals,sizes,unused --symbols --list
+ endif
+@@ -55,7 +55,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}"
+ #AFLAGS += --predefine "RW_RELOC SETL {TRUE}"
+ 
+ # This runs from IRAM
+-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld
++LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld
+ LDFLAGS = --remove
+ MAP = --map --info=totals,sizes,unused --symbols --list
+ endif
+@@ -72,7 +72,7 @@ AFLAGS += --defsym USE_ALL_STACKS=1
+ #AFLAGS += --defsym RW_RELOC=1
+ 
+ # This runs from IRAM
+-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_gnu.ld
++LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_gnu.ld
+ 
+ endif
+ 
+@@ -108,7 +108,7 @@ endif
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
+ 
+ ########################################################################
+ #
+@@ -157,6 +157,6 @@ endif
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
+ 
+ .PHONY: debug bin
+diff --git a/csps/lpc32xx/bsps/ea3250/source/makefile b/csps/lpc32xx/bsps/ea3250/source/makefile
+index 7cada25..2899b20 100644
+--- a/csps/lpc32xx/bsps/ea3250/source/makefile
++++ b/csps/lpc32xx/bsps/ea3250/source/makefile
+@@ -22,16 +22,16 @@
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ ########################################################################
+ #
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
+-AFLAGS +=-I..\Include
+-CFLAGS +=-I..\Include
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
++AFLAGS +=-I../Include
++CFLAGS +=-I../Include
+ 
+ ########################################################################
+ #
+@@ -64,7 +64,7 @@ realclean: lib_realclean
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
+ 
+ .PHONY: all lib_clean lib_realclean
+ 
+diff --git a/csps/lpc32xx/bsps/fdi3250/source/makefile b/csps/lpc32xx/bsps/fdi3250/source/makefile
+index 4e153bb..11e4b63 100644
+--- a/csps/lpc32xx/bsps/fdi3250/source/makefile
++++ b/csps/lpc32xx/bsps/fdi3250/source/makefile
+@@ -22,16 +22,16 @@
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ ########################################################################
+ #
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
+-AFLAGS +=-I..\Include
+-CFLAGS +=-I..\Include
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
++AFLAGS +=-I../Include
++CFLAGS +=-I../Include
+ 
+ ########################################################################
+ #
+@@ -53,7 +53,7 @@ lib_clean:
+ # delete all targets this Makefile can make and all built libraries
+ # linked in
+ lib_realclean: 
+-	-@$(RM) $(BSP_LIB_DIR)\*.a
++	-@$(RM) $(BSP_LIB_DIR)/*.a
+ 	-@$(RMDIR) $(BSP_LIB_DIR)
+ 	
+ clean: lib_clean
+@@ -65,7 +65,7 @@ realclean: lib_realclean
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
+ 
+ .PHONY: all lib_clean lib_realclean
+ 
+diff --git a/csps/lpc32xx/bsps/phy3250/examples/makefile b/csps/lpc32xx/bsps/phy3250/examples/makefile
+index b939252..e7feaa6 100644
+--- a/csps/lpc32xx/bsps/phy3250/examples/makefile
++++ b/csps/lpc32xx/bsps/phy3250/examples/makefile
+@@ -25,7 +25,7 @@
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ SUBDIRS = adc dram_self_refresh hstimer hsuart i2c kscan lcd_colorbars
+ SUBDIRS += lcd_tsc mi2c mstimer pwm pwm_simple rtc sdcard sdcard_dma
+diff --git a/csps/lpc32xx/bsps/phy3250/source/makefile b/csps/lpc32xx/bsps/phy3250/source/makefile
+index 7c48e7d..750b776 100644
+--- a/csps/lpc32xx/bsps/phy3250/source/makefile
++++ b/csps/lpc32xx/bsps/phy3250/source/makefile
+@@ -32,7 +32,7 @@ include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
+ AFLAGS +=-I../Include
+ CFLAGS +=-I../Include
+ 
+diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile
+index 01e2b38..526d6cc 100644
+--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile
++++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile
+@@ -78,7 +78,7 @@ endif
+ 
+ ########################################################################
+ #
+-# Compiler\linker specific stuff
++# Compiler/linker specific stuff
+ #
+ ########################################################################
+ 
+diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile
+index ce329f5..e81b8db 100644
+--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile
++++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile
+@@ -77,7 +77,7 @@ endif
+ 
+ ########################################################################
+ #
+-# Compiler\linker specific stuff
++# Compiler/linker specific stuff
+ #
+ ########################################################################
+ 
+diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile
+index 4426fc7..196faec 100644
+--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile
++++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile
+@@ -77,7 +77,7 @@ endif
+ 
+ ########################################################################
+ #
+-# Compiler\linker specific stuff
++# Compiler/linker specific stuff
+ #
+ ########################################################################
+ 
+diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile
+index dc73b64..39fc304 100644
+--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile
++++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile
+@@ -78,7 +78,7 @@ endif
+ 
+ ########################################################################
+ #
+-# Compiler\linker specific stuff
++# Compiler/linker specific stuff
+ #
+ ########################################################################
+ 
+diff --git a/csps/lpc32xx/source/makefile b/csps/lpc32xx/source/makefile
+index 8e05456..16bd944 100644
+--- a/csps/lpc32xx/source/makefile
++++ b/csps/lpc32xx/source/makefile
+@@ -25,16 +25,16 @@
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ ########################################################################
+ #
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
+-AFLAGS +=-I..\Include
+-CFLAGS +=-I..\Include
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
++AFLAGS +=-I../Include
++CFLAGS +=-I../Include
+ 
+ 
+ ########################################################################
+@@ -68,7 +68,7 @@ realclean: lib_realclean
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
+ 
+ .PHONY: all lib_clean lib_realclean
+ 
+diff --git a/lpc/source/makefile b/lpc/source/makefile
+index 2860db9..ae7d612 100644
+--- a/lpc/source/makefile
++++ b/lpc/source/makefile
+@@ -25,16 +25,16 @@
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ ########################################################################
+ #
+ # Pick up the assembler and C source files in the directory  
+ #
+ ########################################################################
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
+-AFLAGS +=-I..\Include
+-CFLAGS +=-I..\Include
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
++AFLAGS +=-I../Include
++CFLAGS +=-I../Include
+ 
+ ########################################################################
+ #
+@@ -67,7 +67,7 @@ realclean: lib_realclean
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
+ 
+ .PHONY: all lib_clean lib_realclean
+ 
+diff --git a/makefile b/makefile
+index 8645fcc..86fa6bc 100644
+--- a/makefile
++++ b/makefile
+@@ -34,7 +34,7 @@ TARGETS_CLN	=gen_clean csp_clean bsp_clean
+ #
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
++include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
+ 
+ ########################################################################
+ #
+diff --git a/makerule/common/make.rules.environment b/makerule/common/make.rules.environment
+index d5737fe..4e6df48 100644
+--- a/makerule/common/make.rules.environment
++++ b/makerule/common/make.rules.environment
+@@ -52,7 +52,7 @@ ASTYLE          =astyle --options=$(BUILD_ROOT)/tools/astyle.cfg
+ #
+ ########################################################################
+   
+-CSP_LIB_DIR  =$(BUILD_ROOT)\csps\$(CSP)\lib
++CSP_LIB_DIR  =$(BUILD_ROOT)/csps/$(CSP)/lib
+ 
+ ########################################################################
+ #
+@@ -60,7 +60,7 @@ CSP_LIB_DIR  =$(BUILD_ROOT)\csps\$(CSP)\lib
+ #
+ ########################################################################
+ 
+-BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib
++BSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)/lib
+ 
+ ########################################################################
+ #
+@@ -68,7 +68,7 @@ BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib
+ #
+ ########################################################################
+ 
+-GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib
++GEN_LIB_DIR =$(BUILD_ROOT)/$(GEN)/lib
+ 
+ ########################################################################
+ # 
+@@ -76,9 +76,9 @@ GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib
+ # 
+ ########################################################################
+ 
+-CSP_DIR     =$(BUILD_ROOT)\csps\$(CSP)
+-CSP_SRC_DIR =$(CSP_DIR)\source
+-CSP_INC_DIR =$(CSP_DIR)\include
++CSP_DIR     =$(BUILD_ROOT)/csps/$(CSP)
++CSP_SRC_DIR =$(CSP_DIR)/source
++CSP_INC_DIR =$(CSP_DIR)/include
+ 
+ ########################################################################
+ # 
+@@ -86,9 +86,9 @@ CSP_INC_DIR =$(CSP_DIR)\include
+ # 
+ ########################################################################
+ 
+-BSP_DIR     =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)
+-BSP_SRC_DIR =$(BSP_DIR)\source
+-BSP_INC_DIR =$(BSP_DIR)\include
++BSP_DIR     =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)
++BSP_SRC_DIR =$(BSP_DIR)/source
++BSP_INC_DIR =$(BSP_DIR)/include
+ 
+ ########################################################################
+ # 
+@@ -96,9 +96,9 @@ BSP_INC_DIR =$(BSP_DIR)\include
+ # 
+ ########################################################################
+ 
+-GEN_DIR     =$(BUILD_ROOT)\$(GEN)
+-GEN_SRC_DIR =$(GEN_DIR)\source
+-GEN_INC_DIR =$(GEN_DIR)\include
++GEN_DIR     =$(BUILD_ROOT)/$(GEN)
++GEN_SRC_DIR =$(GEN_DIR)/source
++GEN_INC_DIR =$(GEN_DIR)/include
+ 
+ ########################################################################
+ #
+@@ -151,6 +151,6 @@ endif
+ # 
+ ########################################################################
+ 
+-TARGET_CSP_LIB =$(CSP_LIB_DIR)\$(CSP_ARCHIVE)
+-TARGET_BSP_LIB =$(BSP_LIB_DIR)\$(BSP_ARCHIVE)
+-TARGET_GEN_LIB =$(GEN_LIB_DIR)\$(GEN_ARCHIVE)
++TARGET_CSP_LIB =$(CSP_LIB_DIR)/$(CSP_ARCHIVE)
++TARGET_BSP_LIB =$(BSP_LIB_DIR)/$(BSP_ARCHIVE)
++TARGET_GEN_LIB =$(GEN_LIB_DIR)/$(GEN_ARCHIVE)
+diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu
+index 3277d99..d80b98d 100644
+--- a/makerule/lpc32xx/make.lpc32xx.gnu
++++ b/makerule/lpc32xx/make.lpc32xx.gnu
+@@ -19,7 +19,7 @@
+ # use without further testing or modification. 
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
+ 
+ CPU      = arm926ej-s
+ CFLAGS   = -mcpu=arm926ej-s -Wall -Os
+diff --git a/makerule/lpc32xx/make.lpc32xx.iar b/makerule/lpc32xx/make.lpc32xx.iar
+index 238ebbf..27d163f 100644
+--- a/makerule/lpc32xx/make.lpc32xx.iar
++++ b/makerule/lpc32xx/make.lpc32xx.iar
+@@ -19,12 +19,12 @@
+ # use without further testing or modification. 
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
+ 
+-IARBASE   = $(IAR_ROOT)\ARM
+-IARTOOLS  = $(IARBASE)\bin
+-IAR_LIB   = $(IARBASE)\lib
+-IAR_INC   = $(IARBASE)\inc
++IARBASE   = $(IAR_ROOT)/ARM
++IARTOOLS  = $(IARBASE)/bin
++IAR_LIB   = $(IARBASE)/lib
++IAR_INC   = $(IARBASE)/inc
+ CC        = iccarm
+ CCP       = iccarm
+ AS        = iasmarm
+@@ -36,7 +36,7 @@ CFLAGS    += -I"$(IAR_INC)"
+ AFLAGS    = --cpu 5TEJ
+ LDFLAGS   = 
+ LK        = "$(TARGET_GEN_LIB)" "$(TARGET_CSP_LIB)" "$(TARGET_BSP_LIB)"
+-;LK        += "$(IAR_LIB)\dl4tpannl8f.r79"
++;LK        += "$(IAR_LIB)/dl4tpannl8f.r79"
+ MAP       = --map
+ LDESC     = --config
+ ENTRY     = --entry
+diff --git a/makerule/lpc32xx/make.lpc32xx.keil b/makerule/lpc32xx/make.lpc32xx.keil
+index dd27583..7334d3f 100644
+--- a/makerule/lpc32xx/make.lpc32xx.keil
++++ b/makerule/lpc32xx/make.lpc32xx.keil
+@@ -19,7 +19,7 @@
+ # use without further testing or modification. 
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
+ 
+ CC        =armcc
+ CCP       =armcc
+@@ -27,11 +27,11 @@ AS        =armasm
+ LD        =armlink
+ AR        =armar -r -s
+ CFLAGS    =--arm -O3 -g --device DARMP3 -D__MICROLIB 
+-CFLAGS    +=-I$(KEIL_RVCT)\inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 
++CFLAGS    +=-I$(KEIL_RVCT)/inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 
+ AFLAGS    =--arm --device=DARMP3 
+ AFLAGS    +=-I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
+ LDFLAGS   =--noremove
+-LK        =--device DARMP3 --libpath $(KEIL_RVCT)\lib --scan $(TARGET_CSP_LIB)
++LK        =--device DARMP3 --libpath $(KEIL_RVCT)/lib --scan $(TARGET_CSP_LIB)
+ LK        +=--scan $(TARGET_BSP_LIB) 
+ LK        +=--scan $(TARGET_GEN_LIB)
+ MAP       =--map --list
+diff --git a/makerule/lpc32xx/make.lpc32xx.rvw b/makerule/lpc32xx/make.lpc32xx.rvw
+index 59961dd..2419976 100644
+--- a/makerule/lpc32xx/make.lpc32xx.rvw
++++ b/makerule/lpc32xx/make.lpc32xx.rvw
+@@ -19,7 +19,7 @@
+ # use without further testing or modification. 
+ ########################################################################
+ 
+-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
++include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
+ 
+ CC        =armcc
+ CCP       =armcpp
+-- 
+1.7.7.3
+
diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
new file mode 100644
index 0000000000..80f3493a2e
--- /dev/null
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -0,0 +1,60 @@
+#############################################################
+#
+# LPC32XX CDL
+#
+#############################################################
+
+LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11
+LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git
+LPC32XXCDL_SITE_METHOD = git
+
+LPC32XXCDL_INSTALL_TARGET = NO
+LPC32XXCDL_INSTALL_IMAGES = YES
+
+ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"ea3250")
+LPC32XXCDL_KICKSTART = kickstart/nand
+LPC32XXCDL_KICKSTART_BURNER = nand/kickstart
+LPC32XXCDL_S1L = s1l
+LPC32XXCDL_S1L_BURNER = nand/s1lapp
+endif
+
+ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"phy3250")
+LPC32XXCDL_KICKSTART = kickstart/kickstart_nand
+LPC32XXCDL_KICKSTART_BURNER = nand/kickstart
+LPC32XXCDL_S1L = s1l/s1l_nand_boot
+LPC32XXCDL_S1L_BURNER = nand/s1lapp
+endif
+
+ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"fdi3250")
+LPC32XXCDL_KICKSTART = kickstart/nand
+LPC32XXCDL_KICKSTART_BURNER = nand/kickstart_jtag
+LPC32XXCDL_S1L = s1l
+LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag
+endif
+
+LPC32XXCDL_BUILD_FLAGS = \
+	CROSS_COMPILE=$(TARGET_CROSS)           \
+	NXPMCU_WINBASE=$(@D)                    \
+	NXPMCU_SOFTWARE=$(@D)                   \
+	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME)  \
+	CSP=lpc32xx TOOL=gnu GEN=lpc
+
+LPC32XXCDL_BOARD_STARTUP_DIR = \
+	csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/
+
+define LPC32XXCDL_BUILD_CMDS
+	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)
+	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)
+	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)
+	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)
+	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)
+endef
+
+define LPC32XXCDL_INSTALL_IMAGES_CMDS
+	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)/*gnu.bin $(BINARIES_DIR)
+	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)/*gnu.bin $(BINARIES_DIR)
+	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)/*gnu.bin $(BINARIES_DIR)
+	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)/*gnu.bin $(BINARIES_DIR)
+endef
+
+$(eval $(call GENTARGETS))

From 390ed5d2014a54ce7968d150156d8f8569aec8d0 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <abelloni@adeneo-embedded.com>
Date: Thu, 5 Jan 2012 12:03:50 +0100
Subject: [PATCH 1353/6849] Add defconfigs for LPC3250 boards

ea3250: Embedded Artists
http://www.embeddedartists.com/products/kits/lpc3250_kit.php

fdi3250: Future Designs Inc.
http://www.teamfdi.com/development-tools-kits/products/6/SOMDIMM-LPC3250

phy3250: Phytec
http://www.phytec.com/products/som/ARM-XScale/phyCORE-ARM9-LPC3250.html

Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/ea3250_defconfig  | 39 +++++++++++++++++++++++++++++++++++++++
 configs/fdi3250_defconfig | 39 +++++++++++++++++++++++++++++++++++++++
 configs/phy3250_defconfig | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 configs/ea3250_defconfig
 create mode 100644 configs/fdi3250_defconfig
 create mode 100644 configs/phy3250_defconfig

diff --git a/configs/ea3250_defconfig b/configs/ea3250_defconfig
new file mode 100644
index 0000000000..da84c7e3df
--- /dev/null
+++ b/configs/ea3250_defconfig
@@ -0,0 +1,39 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+BR2_ARM_TYPE="ARM926T"
+BR2_ARM_EABI=y
+
+#
+# GCC Options
+# We need to force GCC 4.3.x because it is the last version
+# that will compile a kernel with ethernet working correctly
+BR2_GCC_VERSION_4_3_X=y
+
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="ea3250"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_LPC32XXCDL=y
+BR2_TARGET_LPC32XXCDL_BOARDNAME="ea3250"
+
+
+#
+# Kernel
+#
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
+BR2_LINUX_KERNEL_VERSION="master"
+BR2_LINUX_KERNEL_PATCH=""
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="ea3250"
+BR2_LINUX_KERNEL_UIMAGE=y
+
diff --git a/configs/fdi3250_defconfig b/configs/fdi3250_defconfig
new file mode 100644
index 0000000000..505dc8b899
--- /dev/null
+++ b/configs/fdi3250_defconfig
@@ -0,0 +1,39 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+BR2_ARM_TYPE="ARM926T"
+BR2_ARM_EABI=y
+
+#
+# GCC Options
+# We need to force GCC 4.3.x because it is the last version
+# that will compile a kernel with ethernet working correctly
+BR2_GCC_VERSION_4_3_X=y
+
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="fdi3250"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_LPC32XXCDL=y
+BR2_TARGET_LPC32XXCDL_BOARDNAME="fdi3250"
+
+
+#
+# Kernel
+#
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
+BR2_LINUX_KERNEL_VERSION="master"
+BR2_LINUX_KERNEL_PATCH=""
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="fdi3250"
+BR2_LINUX_KERNEL_UIMAGE=y
+
diff --git a/configs/phy3250_defconfig b/configs/phy3250_defconfig
new file mode 100644
index 0000000000..d46d7190e4
--- /dev/null
+++ b/configs/phy3250_defconfig
@@ -0,0 +1,39 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+BR2_ARM_TYPE="ARM926T"
+BR2_ARM_EABI=y
+
+#
+# GCC Options
+# We need to force GCC 4.3.x because it is the last version
+# that will compile a kernel with ethernet working correctly
+BR2_GCC_VERSION_4_3_X=y
+
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="phy3250"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_LPC32XXCDL=y
+BR2_TARGET_LPC32XXCDL_BOARDNAME="phy3250"
+
+
+#
+# Kernel
+#
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
+BR2_LINUX_KERNEL_VERSION="master"
+BR2_LINUX_KERNEL_PATCH=""
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="phy3250"
+BR2_LINUX_KERNEL_UIMAGE=y
+

From a82b3262b26c0aa0510bb9572ed789d135e9205c Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Sun, 29 Jan 2012 22:31:47 +0100
Subject: [PATCH 1354/6849] configs: at91sam926* use latest u-boot and mainline
 linux

While upgrading the configs, it proved necessary to make more space on
the dataflash for u-boot since it grew because of relocation.

dataflash is then repartitionned to make more room for u-boot and a redundant
environment.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...bootstrap-1.16-u-boot-relocation-fix.patch | 299 ++++++++++++++++++
 ...2-change-kernel-address-in-dataflash.patch | 181 +++++++++++
 configs/at91sam9260dfc_defconfig              |  10 +-
 configs/at91sam9261ek_defconfig               |  11 +-
 configs/at91sam9263ek_defconfig               |  13 +-
 5 files changed, 493 insertions(+), 21 deletions(-)
 create mode 100644 boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
 create mode 100644 boot/uboot/uboot-v2011.12-change-kernel-address-in-dataflash.patch

diff --git a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
new file mode 100644
index 0000000000..884519c518
--- /dev/null
+++ b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
@@ -0,0 +1,299 @@
+Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because
+of the relocation changes.
+
+We have to get JUMP_ADDR consistant with what is used by u-boot
+(CONFIG_SYS_TEXT_BASE).
+
+I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be
+converted yet. But anyway, that means that it is either not working or
+doesn't care so changing it here shouldn't harm.
+
+I also chose to "repartition" the dataflash. u-boot is now living at
+0x4000, letting 16kB for the bootstrap. We also have to increase the
+IMG_SIZE as u-boot as grown larger than the default value.
+As requested on the u-boot ML, we assume that it could be up to 512kB
+big.
+
+It means that now, you have to flash your kernel at 0x0008C000 instead
+of 0x00042000. And so you also have to load it from that adress from
+u-boot.
+
+Then, remember that you could decrease IMG_SIZE to boot faster.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+---
+ board/at91sam9260ek/dataflash/at91sam9260ek.h      |    6 +++---
+ board/at91sam9260ek/nandflash/at91sam9260ek.h      |    2 +-
+ board/at91sam9261ek/dataflash/at91sam9261ek.h      |    6 +++---
+ board/at91sam9261ek/nandflash/at91sam9261ek.h      |    2 +-
+ board/at91sam9263ek/dataflash/at91sam9263ek.h      |    6 +++---
+ board/at91sam9263ek/nandflash/at91sam9263ek.h      |    2 +-
+ board/at91sam9g10ek/dataflash/at91sam9g10ek.h      |    6 +++---
+ board/at91sam9g10ek/nandflash/at91sam9g10ek.h      |    2 +-
+ board/at91sam9g20ek/dataflash/at91sam9g20ek.h      |    6 +++---
+ board/at91sam9g20ek/nandflash/at91sam9g20ek.h      |    2 +-
+ board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h  |    4 ++--
+ .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h  |    4 ++--
+ board/at91sam9rlek/dataflash/at91sam9rlek.h        |    6 +++---
+ board/at91sam9rlek/nandflash/at91sam9rlek.h        |    2 +-
+ board/at91sam9xeek/dataflash/at91sam9xeek.h        |    6 +++---
+ board/at91sam9xeek/nandflash/at91sam9xeek.h        |    2 +-
+ 16 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h
+index 1834246..5c52bc6 100644
+--- a/board/at91sam9260ek/dataflash/at91sam9260ek.h
++++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h
+@@ -73,11 +73,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS1_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
+ 
+ #define MACH_TYPE       0x44B       /* AT91SAM9260-EK */
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9260ek.h
+index 2cac601..f8fdff2 100644
+--- a/board/at91sam9260ek/nandflash/at91sam9260ek.h
++++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h
+@@ -92,7 +92,7 @@
+ #define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
+ 
+ #define MACH_TYPE       	0x44B		/* AT91SAM9260-EK */
+-#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000	/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h
+index 8ce30e9..675f80b 100644
+--- a/board/at91sam9261ek/dataflash/at91sam9261ek.h
++++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h
+@@ -96,11 +96,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
+ 
+ #define MACH_TYPE       0x350       /* AT91SAM9261-EK */
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9261ek.h
+index badc3ac..e628c97 100644
+--- a/board/at91sam9261ek/nandflash/at91sam9261ek.h
++++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h
+@@ -114,7 +114,7 @@
+ #define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
+ 
+ #define MACH_TYPE       	0x350		/* AT91SAM9261-EK */
+-#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000	/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h
+index 5c9da4b..d07b5d1 100644
+--- a/board/at91sam9263ek/dataflash/at91sam9263ek.h
++++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h
+@@ -95,11 +95,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 			0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE			0x33900			/* Image Size in DataFlash    */
++#define IMG_ADDRESS 			0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE			0x80000			/* Image Size in DataFlash    */
+ 
+ #define MACH_TYPE       		0x4B2       		/* AT91SAM9263-EK */
+-#define JUMP_ADDR			0x23F00000		/* Final Jump Address 	      */
++#define JUMP_ADDR			0x21F00000		/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9263ek.h
+index 505afc7..8ab4f46 100644
+--- a/board/at91sam9263ek/nandflash/at91sam9263ek.h
++++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h
+@@ -108,7 +108,7 @@
+ #define	IMG_SIZE	0x40000		/* Image Size in NandFlash    */
+ 
+ #define MACH_TYPE       1202       	/* AT91SAM9263-EK */
+-#define JUMP_ADDR	0x23F00000	/* Final Jump Address 	      */
++#define JUMP_ADDR	0x21F00000	/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
+index b2faf44..0882644 100644
+--- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
++++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
+@@ -97,11 +97,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
+ 
+ #define MACH_TYPE       0x350       /* AT91SAM9261-EK */
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
+index 66c40a3..6c3ecda 100644
+--- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
++++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h
+@@ -115,7 +115,7 @@
+ #define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
+ 
+ #define MACH_TYPE       	0x350		/* AT91SAM9G10-EK */
+-#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000	/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
+index eea0439..44bd578 100644
+--- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
++++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
+@@ -74,11 +74,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS1_DATAFLASH	/* Boot on SPI NCS1 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash */
+ 
+ #define MACH_TYPE		0x658			/* AT91SAM9G20-EK */
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
+index 31bd499..e797e4d 100644
+--- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
++++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h
+@@ -93,7 +93,7 @@
+ #define	IMG_SIZE		0x40000			/* Image Size in NandFlash */
+ 
+ #define MACH_TYPE		0x658			/* AT91SAM9G20-EK */
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
+index a60fd41..144dd6d 100644
+--- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
++++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
+@@ -88,8 +88,8 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash */
+ 
+ #define MACH_TYPE		0x9CD			/* AT91SAM9M10-EKES */
+ #define JUMP_ADDR		0x73F00000		/* Final Jump Address */
+diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
+index 5c726b5..3152b79 100644
+--- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
++++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
+@@ -84,8 +84,8 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash */
+ 
+ #define MACH_TYPE		0x726			/* AT91SAM9M10G45-EK */
+ #define JUMP_ADDR		0x73F00000		/* Final Jump Address */
+diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h
+index 05c42dc..be277b6 100644
+--- a/board/at91sam9rlek/dataflash/at91sam9rlek.h
++++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h
+@@ -88,11 +88,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
+ 
+-#define IMG_ADDRESS 	0x8400		/* Image Address in DataFlash */
+-#define	IMG_SIZE	0x33900		/* Image Size in DataFlash    */
++#define IMG_ADDRESS 	0x4000		/* Image Address in DataFlash */
++#define	IMG_SIZE	0x80000		/* Image Size in DataFlash    */
+ 
+ #define MACH_TYPE       1326       	/* AT91SAM9RL-EK */
+-#define JUMP_ADDR	0x23F00000	/* Final Jump Address 	      */
++#define JUMP_ADDR	0x21F00000	/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rlek.h
+index 656b4ba..594db8f 100644
+--- a/board/at91sam9rlek/nandflash/at91sam9rlek.h
++++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h
+@@ -112,7 +112,7 @@
+ #define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
+ 
+ #define MACH_TYPE       1326       		/* AT91SAM9RL-EK */
+-#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000	/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h
+index 27d1822..e3172da 100644
+--- a/board/at91sam9xeek/dataflash/at91sam9xeek.h
++++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h
+@@ -73,11 +73,11 @@
+ /* ******************************************************************* */
+ #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS1_DATAFLASH	/* Boot on SPI NCS1 */
+ 
+-#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+-#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
++#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
+ 
+ #define MACH_TYPE		0x44B			/* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xeek.h
+index 5dbc63e..9fac7cb 100644
+--- a/board/at91sam9xeek/nandflash/at91sam9xeek.h
++++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h
+@@ -94,7 +94,7 @@
+ #define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
+ 
+ #define MACH_TYPE		0x44B			/* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
+-#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
++#define JUMP_ADDR		0x21F00000		/* Final Jump Address 	      */
+ 
+ /* ******************************************************************* */
+ /* Application Settings                                                */
+-- 
+1.7.5.4
+
diff --git a/boot/uboot/uboot-v2011.12-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-v2011.12-change-kernel-address-in-dataflash.patch
new file mode 100644
index 0000000000..4cdbb98ff4
--- /dev/null
+++ b/boot/uboot/uboot-v2011.12-change-kernel-address-in-dataflash.patch
@@ -0,0 +1,181 @@
+From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@piout.net>
+Date: Mon, 2 Jan 2012 03:51:11 +0100
+Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
+
+On at91sam platforms, u-boot grew larger than the allocated size in
+dataflash, the layout was:
+bootstrap  0x00000000
+ubootenv   0x00004200
+uboot      0x00008400
+kernel     0x00042000
+
+u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
+0x39C00 bytes anymore.
+
+Now, the layout is:
+bootstrap  0x00000000
+uboot      0x00004000
+ubootenv   0x00084000
+ubootenv2  0x00088000
+kernel     0x0008C000
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+---
+ include/configs/at91sam9260ek.h |   18 ++++++++++++------
+ include/configs/at91sam9261ek.h |   18 ++++++++++++------
+ include/configs/at91sam9263ek.h |   10 +++++++---
+ include/configs/at91sam9rlek.h  |   10 +++++++---
+ 4 files changed, 38 insertions(+), 18 deletions(-)
+
+diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
+index db52ee6..b537760 100644
+--- a/include/configs/at91sam9260ek.h
++++ b/include/configs/at91sam9260ek.h
+@@ -185,10 +185,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -199,10 +201,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS1 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -231,6 +235,8 @@
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ #define CONFIG_SYS_LONGHELP		1
+ #define CONFIG_CMDLINE_EDITING	1
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
+index 5140b26..fa461da 100644
+--- a/include/configs/at91sam9261ek.h
++++ b/include/configs/at91sam9261ek.h
+@@ -187,10 +187,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET	0x4200
++#define CONFIG_ENV_OFFSET	0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -201,10 +203,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS3 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
+-#define CONFIG_ENV_OFFSET	0x4200
++#define CONFIG_ENV_OFFSET	0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -233,6 +237,8 @@
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ #define CONFIG_SYS_LONGHELP
+ #define CONFIG_CMDLINE_EDITING
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
+index 8399246..253bee4 100644
+--- a/include/configs/at91sam9263ek.h
++++ b/include/configs/at91sam9263ek.h
+@@ -314,10 +314,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
+ 				"root=/dev/mtdblock0 " \
+ 				"mtdparts=atmel_nand:-(root) "\
+@@ -347,6 +349,8 @@
+ #define CONFIG_AUTO_COMPLETE
+ #define CONFIG_SYS_HUSH_PARSER
+ #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
+index 79ea1f2..423f523 100644
+--- a/include/configs/at91sam9rlek.h
++++ b/include/configs/at91sam9rlek.h
+@@ -153,10 +153,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
+ 				"root=/dev/mtdblock0 " \
+ 				"mtdparts=atmel_nand:-(root) "\
+@@ -183,6 +185,8 @@
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ #define CONFIG_SYS_LONGHELP		1
+ #define CONFIG_CMDLINE_EDITING		1
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+-- 
+1.7.5.4
+
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 13748d37a5..de7ac42f61 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -1,21 +1,19 @@
 # Architecture
 BR2_arm=y
+BR2_arm926t=y
 
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASHCARD=y
+BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek_dataflash_cs0"
+BR2_TARGET_UBOOT_2011_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.33"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.33-at91.patch.gz"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260ek"
 
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index cea28cbd95..73edd8976d 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -5,20 +5,17 @@ BR2_arm926t=y
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9261ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASHCARD=y
+BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek_dataflash_cs0"
+BR2_TARGET_UBOOT_2011_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.33"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.33-at91.patch.gz"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261ek"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261"
 
 # Filesystem
 BR2_TARGET_ROOTFS_TAR=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 1a79482709..e4a44f11ea 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -5,20 +5,17 @@ BR2_arm926t=y
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9263ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASHCARD=y
+BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9263ek"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="at91sam9263ek_dataflash_cs0"
+BR2_TARGET_UBOOT_2011_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.33"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.33-at91.patch.gz"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9263ek"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9263"
 
 # Filesystem
-BR2_TARGET_ROOTFS_TAR=y
\ No newline at end of file
+BR2_TARGET_ROOTFS_TAR=y

From a18e5eb09b7817986a365ba701259454ac51a80a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 1 Feb 2012 23:36:47 +0100
Subject: [PATCH 1355/6849] boot: only show vendor-specific bootloaders for
 applicable arm variant

Atmel at91sam9 and NXP lpc32xx are both all arm926t, so only show
then if that arm variant is selected.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/Config.in     | 2 +-
 boot/at91dataflashboot/Config.in | 2 +-
 boot/lpc32xxcdl/Config.in        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index ff968cdbe9..b232b3b78e 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -1,5 +1,5 @@
 config BR2_TARGET_AT91BOOTSTRAP
-	depends on BR2_arm
+	depends on BR2_arm926t
 	bool "AT91 Bootstrap"
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index a4efe11926..7537548f6c 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
 config BR2_TARGET_AT91DATAFLASHBOOT
-       depends on BR2_arm
+       depends on BR2_arm926t
        bool "AT91 DataFlashBoot"
diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in
index b6cbcfd211..ce7589c35c 100644
--- a/boot/lpc32xxcdl/Config.in
+++ b/boot/lpc32xxcdl/Config.in
@@ -1,5 +1,5 @@
 config BR2_TARGET_LPC32XXCDL
-	depends on BR2_arm
+	depends on BR2_arm926t
 	bool "LPC32XX CDL (kickstart and S1L)"
 
 if BR2_TARGET_LPC32XXCDL

From aea3ac7a9fc1caeac500df33afe2c40cc32d5c8a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 00:34:12 +0100
Subject: [PATCH 1356/6849] uClibc: add 0.9.33

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in            |   6 +
 toolchain/uClibc/uClibc-0.9.33.config | 272 ++++++++++++++++++++++++++
 2 files changed, 278 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.config

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 19c71e0642..ed9d2f5b82 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -17,6 +17,10 @@ choice
 		bool "uClibc 0.9.32.x"
 		depends on !(BR2_avr32 || BR2_sh)
 
+	config BR2_UCLIBC_VERSION_0_9_33
+		bool "uClibc 0.9.33.x"
+		depends on !(BR2_avr32 || BR2_sh)
+
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
 
@@ -33,12 +37,14 @@ config BR2_UCLIBC_VERSION_STRING
 	string
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
+	default 0.9.33		if BR2_UCLIBC_VERSION_0_9_33
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
 	default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31
 	default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
+	default "toolchain/uClibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
 	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
 	help
 	  Some people may wish to use their own modified uClibc configuration
diff --git a/toolchain/uClibc/uClibc-0.9.33.config b/toolchain/uClibc/uClibc-0.9.33.config
new file mode 100644
index 0000000000..a3fe2005eb
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.config
@@ -0,0 +1,272 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.32-git
+# Fri Jul  9 22:31:59 2010
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+# TARGET_c6x is not set
+
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_CORTEX_M3 is not set
+# CONFIG_ARM_CORTEX_M1 is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+
+USE_BX=y
+
+TARGET_SUBARCH=""
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="none"
+FORCE_OPTIONS_FOR_ARCH=y
+#
+# Using ELF file format
+#
+# ARCH_LITTLE_ENDIAN is not set
+# ARCH_BIG_ENDIAN is not set
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# DO_XSI_MATH is not set
+# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS="/usr/src/linux/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+# LDSO_CACHE_SUPPORT is not set
+LDSO_PRELOAD_ENV_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+# LDSO_NO_CLEANUP is not set
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+LINUXTHREADS_OLD=y
+# LINUXTHREADS_NEW is not set
+# UCLIBC_HAS_THREADS_NATIVE is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+# UCLIBC_HAS_IPV6 is not set
+# UCLIBC_HAS_RPC is not set
+# UCLIBC_HAS_FULL_RPC is not set
+# UCLIBC_HAS_REENTRANT_RPC is not set
+UCLIBC_USE_NETLINK=y
+# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+# UCLIBC_HAS_STRING_GENERIC_OPT is not set
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+# UCLIBC_HAS_CTYPE_CHECKED is not set
+UCLIBC_HAS_CTYPE_ENFORCED=y
+# UCLIBC_HAS_WCHAR is not set
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+# UCLIBC_HAS_STDIO_GETC_MACRO is not set
+# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+# UCLIBC_HAS_GNU_GETSUBOPT is not set
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+# UCLIBC_HAS_WORDEXP is not set
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+# UCLIBC_HAS_UTMPX is not set
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+PROPOLICE_BLOCK_ABRT=y
+# PROPOLICE_BLOCK_SEGV is not set
+# UCLIBC_BUILD_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set

From 8ed392f3d649ef373f2cebce3b4dbab60a867a4e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 09:04:48 +0100
Subject: [PATCH 1357/6849] toolchain-buildroot: enable / default to NPTL fr
 uClibc 0.9.33 as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index e3fe337841..7f2f68f70f 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -68,7 +68,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32) && !BR2_ARM_OABI
+	default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -91,7 +91,7 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 	        select BR2_TOOLCHAIN_HAS_THREADS
-		depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32
+		depends on !BR2_UCLIBC_VERSION_0_9_31
 		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 endchoice

From 4461b3213d35a4ea4a6ccfd395663eb0b7a5f88a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 09:05:26 +0100
Subject: [PATCH 1358/6849] binutils: default to 2.21.1 for uClibc 0.9.33 as
 well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index aec51b3ce0..a13d61b4e5 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -3,7 +3,7 @@ comment "Binutils Options"
 choice
 	prompt "Binutils Version"
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
-	default BR2_BINUTILS_VERSION_2_21_1 if (BR2_UCLIBC_VERSION_0_9_32 || BR2_UCLIBC_VERSION_SNAPSHOT)
+	default BR2_BINUTILS_VERSION_2_21_1 if (!BR2_UCLIBC_VERSION_0_9_31)
 	default BR2_BINUTILS_VERSION_2_21
 	help
 	  Select the version of binutils you wish to use.
@@ -25,11 +25,11 @@ choice
 		bool "binutils 2.21"
 
 	config BR2_BINUTILS_VERSION_2_21_1
-		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.21.1"
 
 	config BR2_BINUTILS_VERSION_2_22
-		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.22"
 
 endchoice

From 4a4937957148f4d82b35923c55619fe37407d7d2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 10:06:44 +0100
Subject: [PATCH 1359/6849] uClibc: tweak 0.9.33 / snapshot configs

With default values so it doesn't stop build and ask user. Also disable
2.4 modules support by default like upstream does.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-0.9.33.config   | 8 +++++++-
 toolchain/uClibc/uClibc-snapshot.config | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/toolchain/uClibc/uClibc-0.9.33.config b/toolchain/uClibc/uClibc-0.9.33.config
index a3fe2005eb..2a6754c8d6 100644
--- a/toolchain/uClibc/uClibc-0.9.33.config
+++ b/toolchain/uClibc/uClibc-0.9.33.config
@@ -49,6 +49,7 @@
 # CONFIG_ARM_XSCALE is not set
 # CONFIG_ARM_IWMMXT is not set
 
+# COMPILE_IN_THUMB_MODE is not set
 USE_BX=y
 
 TARGET_SUBARCH=""
@@ -93,6 +94,7 @@ LDSO_PRELOAD_ENV_SUPPORT=y
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
@@ -139,7 +141,8 @@ UCLIBC_GRP_BUFFER_SIZE=256
 #
 # Support various families of functions
 #
-UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
 UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
@@ -154,6 +157,8 @@ UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
 UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
 UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
@@ -205,6 +210,7 @@ UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
 # UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
 UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
 UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
 UCLIBC_HAS_PRINTF_M_SPEC=y
 UCLIBC_HAS_ERRNO_MESSAGES=y
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index a3fe2005eb..2a6754c8d6 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -49,6 +49,7 @@
 # CONFIG_ARM_XSCALE is not set
 # CONFIG_ARM_IWMMXT is not set
 
+# COMPILE_IN_THUMB_MODE is not set
 USE_BX=y
 
 TARGET_SUBARCH=""
@@ -93,6 +94,7 @@ LDSO_PRELOAD_ENV_SUPPORT=y
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
@@ -139,7 +141,8 @@ UCLIBC_GRP_BUFFER_SIZE=256
 #
 # Support various families of functions
 #
-UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
 UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
@@ -154,6 +157,8 @@ UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
 UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
 UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
@@ -205,6 +210,7 @@ UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
 # UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
 UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
 UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
 UCLIBC_HAS_PRINTF_M_SPEC=y
 UCLIBC_HAS_ERRNO_MESSAGES=y

From e8b320a7080cc75ed2de49728812681803b29c0d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 12 May 2010 15:32:17 -0500
Subject: [PATCH 1360/6849] fis: make fis list more like RedBoot's output

The output of 'fis list' does not fit cleanly on an 80 column
terminal.  This modifies the output to fit and more closely
resemble the output from RedBoot.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fis/fis-003-list_output.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/fis/fis-003-list_output.patch

diff --git a/package/fis/fis-003-list_output.patch b/package/fis/fis-003-list_output.patch
new file mode 100644
index 0000000000..6c1e4eb9dd
--- /dev/null
+++ b/package/fis/fis-003-list_output.patch
@@ -0,0 +1,21 @@
+--- fis.orig/fis.c	2010-05-12 10:22:10.000000000 -0700
++++ fis/fis.c	2010-05-12 10:19:24.000000000 -0700
+@@ -142,8 +142,8 @@
+ 
+ static void dump_desc(FILE* f, const struct fis_image_desc* d)
+ {
+-  fprintf(f,"%16s: flash addr = 0x%08x, mem addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n",
+-             d->name, d->flash_base, d->mem_base, d->size, d->file_cksum);
++  fprintf(f,"%-16s  0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n",
++             d->name, d->flash_base, d->mem_base, d->size, d->entry_point, d->file_cksum);
+   for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) {
+     if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip"
+       uint32_t offset = d->skips[i+1];
+@@ -400,6 +400,7 @@
+   CHECK(fd=open(device,O_RDONLY),-1);
+   dir_t dir;
+   load_dir(fd,offset,&size,swap_endianness,&dir);
++  fprintf(stdout,"Name              FLASH addr  Mem addr    Length      Entry point Checksum\n");
+   FOR_EACH_DIR_ENTRY(dir,i) {
+     dump_desc(stdout,get(i));
+   }

From 5256c77b46fb2fd9bf84dd790a7b8de873b7dcd9 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 12 May 2010 13:17:59 -0500
Subject: [PATCH 1361/6849] fis: sort output of fis list

This sorts the output of 'fis list' using the flash_base address
similar to the output from RedBoot.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fis/fis-004-sorted_list.patch | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/fis/fis-004-sorted_list.patch

diff --git a/package/fis/fis-004-sorted_list.patch b/package/fis/fis-004-sorted_list.patch
new file mode 100644
index 0000000000..6854977ba4
--- /dev/null
+++ b/package/fis/fis-004-sorted_list.patch
@@ -0,0 +1,30 @@
+--- fis.orig/fis.c	2010-05-12 11:09:22.000000000 -0700
++++ fis/fis.c	2010-05-12 11:05:45.000000000 -0700
+@@ -401,9 +401,24 @@
+   dir_t dir;
+   load_dir(fd,offset,&size,swap_endianness,&dir);
+   fprintf(stdout,"Name              FLASH addr  Mem addr    Length      Entry point Checksum\n");
+-  FOR_EACH_DIR_ENTRY(dir,i) {
+-    dump_desc(stdout,get(i));
+-  }
++  uint32_t last_addr = 0;
++  bool image_found;
++  do {
++    uint32_t lowest_addr = 0xffffffff;
++    iter_t index;
++    image_found = false;
++    FOR_EACH_DIR_ENTRY(dir,i) {
++      const struct fis_image_desc *d = get(i);
++      if ((d->flash_base >= last_addr) && (d->flash_base < lowest_addr)) {
++        lowest_addr = d->flash_base;
++        image_found = true;
++        index = i;
++      }
++    }
++    if (image_found)
++      dump_desc(stdout,get(index));
++    last_addr = lowest_addr + 1;
++  } while (image_found == true);
+ }
+ 
+ 

From cee43cbcbd698f95025ecf3fe0697ecedf5f4aab Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 2 Feb 2012 11:28:11 +0000
Subject: [PATCH 1362/6849] liboauth: Add new package

[Peter: swap libcurl test around]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/liboauth/Config.in   | 10 ++++++++++
 package/liboauth/liboauth.mk | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/liboauth/Config.in
 create mode 100644 package/liboauth/liboauth.mk

diff --git a/package/Config.in b/package/Config.in
index c506df8b91..66ee266932 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -350,6 +350,7 @@ source "package/libdnet/Config.in"
 source "package/libesmtp/Config.in"
 source "package/libeXosip2/Config.in"
 source "package/libidn/Config.in"
+source "package/liboauth/Config.in"
 source "package/libmicrohttpd/Config.in"
 source "package/neon/Config.in"
 source "package/libmnl/Config.in"
diff --git a/package/liboauth/Config.in b/package/liboauth/Config.in
new file mode 100644
index 0000000000..77a78f115a
--- /dev/null
+++ b/package/liboauth/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBOAUTH
+	bool "liboauth"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  liboauth is a collection of c functions implementing the oAuth
+	  Core 1.0 Rev A standard API. liboauth provides basic functions to
+	  escape and encode parameters according to oAuth specs and offers
+	  high-level functions to sign requests or verify signatures.
+
+	  http://liboauth.sourceforge.net/
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
new file mode 100644
index 0000000000..8646947914
--- /dev/null
+++ b/package/liboauth/liboauth.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# liboauth
+#
+#############################################################
+LIBOAUTH_VERSION = 0.9.6
+LIBOAUTH_SOURCE = liboauth-$(LIBOAUTH_VERSION).tar.gz
+LIBOAUTH_SITE = http://liboauth.sourceforge.net/pool
+LIBOAUTH_INSTALL_STAGING = YES
+
+LIBOAUTH_DEPENDENCIES += host-pkg-config openssl
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LIBOAUTH_DEPENDENCIES += libcurl
+else
+LIBOAUTH_CONF_OPT += --disable-libcurl
+endif
+
+$(eval $(call AUTOTARGETS))

From a2a9f6358d3c1442028a7fd5366651b8826d4547 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 2 Feb 2012 11:31:09 +0000
Subject: [PATCH 1363/6849] pixman: Bump version to 0.24.2

[Peter: depend on pkg-config, forcibly disable gtk-based demos]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pixman/pixman-0.10.0-no-tests.patch | 11 -----------
 package/pixman/pixman.mk                    |  6 ++++--
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch

diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch
deleted file mode 100644
index fbd0d26892..0000000000
--- a/package/pixman/pixman-0.10.0-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig	2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in	2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 2b39a77c0f..a2e1832250 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,11 +3,13 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.17.6
+PIXMAN_VERSION = 0.24.2
 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
 PIXMAN_SITE = http://cairographics.org/releases/
-PIXMAN_AUTORECONF = NO
 PIXMAN_INSTALL_STAGING = YES
+PIXMAN_DEPENDENCIES = host-pkg-config
+# don't build gtk based demos
+PIXMAN_CONF_OPT = --disable-gtk
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From dfa93b47f721c4161dcb782cd48cb2fb52493d73 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Thu, 2 Feb 2012 12:00:23 +0000
Subject: [PATCH 1364/6849] cairo: Bump version to 1.10.2

Update the DirectFB patch as it no longer applied cleanly.

[Peter: drop redundant AUTORECONF = NO line]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/cairo-1.10.2-directfb.patch | 36 +++++++++++++++++++++
 package/cairo/cairo-1.8.10-directfb.patch | 39 -----------------------
 package/cairo/cairo.mk                    |  4 +--
 3 files changed, 37 insertions(+), 42 deletions(-)
 create mode 100644 package/cairo/cairo-1.10.2-directfb.patch
 delete mode 100644 package/cairo/cairo-1.8.10-directfb.patch

diff --git a/package/cairo/cairo-1.10.2-directfb.patch b/package/cairo/cairo-1.10.2-directfb.patch
new file mode 100644
index 0000000000..8b4c6f73a8
--- /dev/null
+++ b/package/cairo/cairo-1.10.2-directfb.patch
@@ -0,0 +1,36 @@
+--- cairo-1.10.2/src/cairo-directfb-surface.c	2010-06-18 12:47:12.000000000 +0100
++++ cairo-1.10.2.mod/src/cairo-directfb-surface.c	2012-02-02 11:40:57.835273391 +0000
+@@ -700,6 +700,7 @@
+ 	surface->dfbsurface->Blit (surface->dfbsurface,
+ 				   buffer, NULL,
+ 				   image_rect->x, image_rect->y);
++        surface->dfbsurface->ReleaseSource (surface->dfbsurface);
+     }
+ 
+     cairo_surface_destroy (&image->base);
+@@ -928,6 +929,9 @@
+                             cairo_surface_attributes_t *src_attr)
+ {
+     _cairo_pattern_release_surface (src_pattern, src, src_attr);
++
++    if (dst->dfbsurface)
++        dst->dfbsurface->ReleaseSource (dst->dfbsurface);
+ }
+ #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
+ 
+@@ -1584,6 +1588,7 @@
+ 
+ 	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,
+ 					 cache->dfbsurface, NULL, 0, 0);
++            new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
+ 
+ 	    _directfb_destroy_font_cache (cache);
+ 	    scaled_font->surface_private = cache = new_cache;
+@@ -1809,6 +1814,7 @@
+     RUN_CLIPPED (dst, clip_region, NULL,
+ 		 dst->dfbsurface->BatchBlit (dst->dfbsurface,
+ 					     cache->dfbsurface, rects, points, num));
++    dst->dfbsurface->ReleaseSource (dst->dfbsurface);
+ 
+     return CAIRO_STATUS_SUCCESS;
+ }
diff --git a/package/cairo/cairo-1.8.10-directfb.patch b/package/cairo/cairo-1.8.10-directfb.patch
deleted file mode 100644
index 12a51ec5eb..0000000000
--- a/package/cairo/cairo-1.8.10-directfb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
-index bb02dbf..65f2d55 100644
---- a/src/cairo-directfb-surface.c
-+++ b/src/cairo-directfb-surface.c
-@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void                  *abstract_surf
- 		     surface->dfbsurface->Blit (surface->dfbsurface,
- 						buffer, NULL,
- 						image_rect->x, image_rect->y));
-+
-+    surface->dfbsurface->ReleaseSource (surface->dfbsurface);
-     }
- 
-     cairo_surface_destroy (&image->base);
-@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t   *dst,
-                             cairo_surface_attributes_t *src_attr)
- {
-     _cairo_pattern_release_surface (src_pattern, src, src_attr);
-+
-+    if (dst->dfbsurface)
-+         dst->dfbsurface->ReleaseSource( dst->dfbsurface );
- }
- #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
- 
-@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
- 
- 	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,
- 					 cache->dfbsurface, NULL, 0, 0);
-+        new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
- 
- 	    _directfb_destroy_font_cache (cache);
- 	    scaled_font->surface_private = cache = new_cache;
-@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void                *abstract_dst,
-     RUN_CLIPPED (dst, NULL,
- 		 dst->dfbsurface->BatchBlit (dst->dfbsurface,
- 					     cache->dfbsurface, rects, points, num));
-+    dst->dfbsurface->ReleaseSource (dst->dfbsurface);
- 
-     return CAIRO_STATUS_SUCCESS;
- }
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 2230587bd0..55068dd092 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,12 +3,10 @@
 # cairo
 #
 #############################################################
-CAIRO_VERSION = 1.8.10
+CAIRO_VERSION = 1.10.2
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
 CAIRO_SITE = http://cairographics.org/releases
-CAIRO_AUTORECONF = NO
 CAIRO_INSTALL_STAGING = YES
-CAIRO_INSTALL_TARGET = YES
 
 CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \

From 84babf1c1a5fb26d56ee5c534b2ac2c3f9825af2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 16:02:48 +0100
Subject: [PATCH 1365/6849] lpc32xxcdl: fix patch step

The lpc32xxcdl files have dos newlines, which our patch infrastructure
doesn't handle. Work around it by converting the affected files to unix
newlines before patching.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/lpc32xxcdl/lpc32xxcdl.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index 80f3493a2e..d11be6cf2c 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -42,6 +42,16 @@ LPC32XXCDL_BUILD_FLAGS = \
 LPC32XXCDL_BOARD_STARTUP_DIR = \
 	csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/
 
+# Source files are with dos newlines, which our patch infrastructure doesn't
+# handle. Work around it by converting the affected files to unix newlines
+# before patching
+define LPC32XXCDL_DOS2UNIX_FOR_PATCH
+	sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \
+		boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//'
+endef
+
+LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH
+
 define LPC32XXCDL_BUILD_CMDS
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)

From 88404d6b80a58b6d0729de1617822c69c7dfd7ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 16:07:02 +0100
Subject: [PATCH 1366/6849] u-boot: only apply 2011.12 at91 patch if building
 2011.12

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uboot-2011.12-change-kernel-address-in-dataflash.patch}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename boot/uboot/{uboot-v2011.12-change-kernel-address-in-dataflash.patch => uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch} (100%)

diff --git a/boot/uboot/uboot-v2011.12-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
similarity index 100%
rename from boot/uboot/uboot-v2011.12-change-kernel-address-in-dataflash.patch
rename to boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch

From faf266b460c339019aab446c454b358492887c45 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 2 Feb 2012 15:01:54 +0100
Subject: [PATCH 1367/6849] python-serial: bump to 2.6

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-serial/python-serial.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index 4c8a891f5b..add96678bd 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PYTHON_SERIAL_VERSION = 2.5
+PYTHON_SERIAL_VERSION = 2.6
 PYTHON_SERIAL_SOURCE  = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
 PYTHON_SERIAL_SITE    = http://pypi.python.org/packages/source/p/pyserial/
 

From d06e802223b20a1ee3e365cbfbce4ae2ca7da1b6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:49 +0100
Subject: [PATCH 1368/6849] Add basic config infrastructure for host utilities

Most of the host packages don't have to be exposed to the user as they
are only used as build dependencies of target packages.

However, some host utilities, such as flashing utilities, image
creation programs, specific debuggers, might be useful and should be
presented to the user.

Therefore, we have a new global menu, which lists those host
utilities. These utilities are described in package/*/Config.in.host
files, which will be sourced by package/Config.in.host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in              | 2 ++
 package/Config.in.host | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 package/Config.in.host

diff --git a/Config.in b/Config.in
index ab77ef3489..8579a63b18 100644
--- a/Config.in
+++ b/Config.in
@@ -371,6 +371,8 @@ source "target/generic/Config.in"
 
 source "package/Config.in"
 
+source "package/Config.in.host"
+
 source "fs/Config.in"
 
 source "boot/Config.in"
diff --git a/package/Config.in.host b/package/Config.in.host
new file mode 100644
index 0000000000..54f6a5985d
--- /dev/null
+++ b/package/Config.in.host
@@ -0,0 +1,3 @@
+menu "Host utilities"
+
+endmenu

From 6b04b2dda6bf87dc12650774aff3d99aa4290ff2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:50 +0100
Subject: [PATCH 1369/6849] uboot-tools: expose host package in menuconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host             | 2 ++
 package/uboot-tools/Config.in.host | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 package/uboot-tools/Config.in.host

diff --git a/package/Config.in.host b/package/Config.in.host
index 54f6a5985d..b8f8aab028 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,3 +1,5 @@
 menu "Host utilities"
 
+source "package/uboot-tools/Config.in.host"
+
 endmenu
diff --git a/package/uboot-tools/Config.in.host b/package/uboot-tools/Config.in.host
new file mode 100644
index 0000000000..7a844e91c1
--- /dev/null
+++ b/package/uboot-tools/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_UBOOT_TOOLS
+	bool "host u-boot tools"
+	help
+	  Companion tools for Das U-Boot bootloader.
+
+	  http://www.denx.de/wiki/U-Boot/WebHome

From 66ac654d8ebeffde1414d58bda4945fbd68e7de7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:53 +0100
Subject: [PATCH 1370/6849] libusb: add host variant

[Peter: remove redundant HOST_*_DEPENDENCIES]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libusb/libusb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index af75f5f9ac..fce0c28011 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -8,6 +8,6 @@ LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
 LIBUSB_DEPENDENCIES = host-pkg-config
 LIBUSB_INSTALL_STAGING = YES
-LIBUSB_INSTALL_TARGET = YES
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From ee673bae770285eb8ab568fc486bfe4488e24ecc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:52 +0100
Subject: [PATCH 1371/6849] libusb-compat: add host variant

[Peter: remove redundant HOST_*_DEPENDENCIES]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libusb-compat/libusb-compat.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index e39cdd82fd..4f16489d2d 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -19,3 +19,4 @@ endef
 LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 76cd6b18e3b6720f7dc5997dac0831ef7e62912d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:51 +0100
Subject: [PATCH 1372/6849] libftdi: add host variant

[Peter: remove redundant HOST_LIBFTDI_DEPENDENCIES]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libftdi/libftdi.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index 55481d924b..d84fc32d3c 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -21,3 +21,4 @@ LIBFDTI_CONF_OPT += --disable-libftdipp
 endif
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 375d68d110a0548aff7a7e54b65bbb92051911ff Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:54 +0100
Subject: [PATCH 1373/6849] openocd: add host variant

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host         |  1 +
 package/openocd/Config.in.host |  6 ++++++
 package/openocd/openocd.mk     | 10 ++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 package/openocd/Config.in.host

diff --git a/package/Config.in.host b/package/Config.in.host
index b8f8aab028..6bc828b89a 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,5 +1,6 @@
 menu "Host utilities"
 
+source "package/openocd/Config.in.host"
 source "package/uboot-tools/Config.in.host"
 
 endmenu
diff --git a/package/openocd/Config.in.host b/package/openocd/Config.in.host
new file mode 100644
index 0000000000..2380942563
--- /dev/null
+++ b/package/openocd/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_OPENOCD
+	bool "host openocd"
+	help
+	  OpenOCD - Open On-Chip Debugger
+
+	  http://openocd.berlios.de/web/
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 5f613673fa..d79b33b70e 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -29,4 +29,14 @@ ifeq ($(BR2_PACKAGE_OPENOCD_VSLLINK),y)
 OPENOCD_CONF_OPT += --enable-vsllink
 endif
 
+HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
+
+HOST_OPENOCD_CONF_OPT = 	\
+	--disable-doxygen-html 	\
+	--enable-dummy 		\
+	--enable-ft2232_libftdi \
+	--enable-jlink 		\
+	--enable-vsllink
+
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 2b81a500f923a97e7a27c5c50466c23438fd5527 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 Feb 2012 21:05:47 +0100
Subject: [PATCH 1374/6849] openocd: fix libftdi dependency if _FT2XXX option
 is selected

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openocd/openocd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index d79b33b70e..a12ba6c8c3 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -19,6 +19,7 @@ OPENOCD_DEPENDENCIES = libusb-compat
 # Adapters
 ifeq ($(BR2_PACKAGE_OPENOCD_FT2XXX),y)
 OPENOCD_CONF_OPT += --enable-ft2232_libftdi
+OPENOCD_DEPENDENCIES += libftdi
 endif
 
 ifeq ($(BR2_PACKAGE_OPENOCD_JLINK),y)

From a23c0e59684628f69615e25ad1b9dbca972a3815 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 18:42:55 +0100
Subject: [PATCH 1375/6849] sam-ba: new package with host variant only

sam-ba is a tool needed to reprogram AT91-based systems using an USB
connection or a serial port connection.

[Peter: Add upstream URL]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host        |  1 +
 package/sam-ba/Config.in.host |  8 ++++++++
 package/sam-ba/sam-ba.mk      | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/sam-ba/Config.in.host
 create mode 100644 package/sam-ba/sam-ba.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index 6bc828b89a..1f49e79a7e 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,6 +1,7 @@
 menu "Host utilities"
 
 source "package/openocd/Config.in.host"
+source "package/sam-ba/Config.in.host"
 source "package/uboot-tools/Config.in.host"
 
 endmenu
diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host
new file mode 100644
index 0000000000..f2ea01f2fe
--- /dev/null
+++ b/package/sam-ba/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_SAM_BA
+	bool "host sam-ba"
+	help
+	  Atmel SAM-BA software provides an open set of tools for
+	  programming the Atmel SAM3, SAM7 and SAM9 ARM-based
+	  microcontrollers.
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools
diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
new file mode 100644
index 0000000000..d00575cf51
--- /dev/null
+++ b/package/sam-ba/sam-ba.mk
@@ -0,0 +1,22 @@
+SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents/
+SAM_BA_VERSION = 2.10
+SAM_BA_SOURCE  = sam-ba_$(SAM_BA_VERSION).zip
+
+define HOST_SAM_BA_EXTRACT_CMDS
+        unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
+        mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D)
+        rmdir $(BUILD_DIR)/sam-ba_cdc_linux/
+endef
+
+# Since it's a prebuilt application and it does not conform to the
+# usual Unix hierarchy, we install it in $(HOST_DIR)/opt/sam-ba and
+# then create a symbolic link from $(HOST_DIR)/usr/bin to the
+# application binary, for easier usage.
+
+define HOST_SAM_BA_INSTALL_CMDS
+	mkdir -p $(HOST_DIR)/opt/sam-ba/
+	cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/
+	ln -s ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba
+endef
+
+$(eval $(call GENTARGETS,host))

From 5fe4b2c3998bdeae8a1546ce57e00aad5cdeb17a Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 21 Jan 2012 01:01:12 +0100
Subject: [PATCH 1376/6849] pkg-infra: improve reliability of foo-install

Running foo-uninstall has a high likelyhood of failing, because we
remove a lot of directories from the target.  To improve the reliability,
remove the stamp files before calling the uninstall commands, and add
the -k option to the sub-make.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.autotools.in | 5 ++++-
 package/Makefile.package.in   | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 64e0730b8a..fd118dc47a 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -285,10 +285,13 @@ endif
 #
 # Uninstall from target step. Only define it if not already defined
 # by the package .mk file.
+# Autotools Makefiles do uninstall with ( cd ...; rm -f ... )
+# Since we remove a lot of directories in target-finalize, this is likely
+# to fail.  Therefore add -k flag.
 #
 ifndef $(2)_UNINSTALL_TARGET_CMDS
 define $(2)_UNINSTALL_TARGET_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -k $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 31f5ab6465..1ace683c2a 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -442,12 +442,13 @@ $(BUILD_DIR)/%/.stamp_cleaned:
 	rm -f $(@D)/.stamp_built
 
 # Uninstall package from target and staging
+# Uninstall commands tend to fail, so remove the stamp files first
 $(BUILD_DIR)/%/.stamp_uninstalled:
 	@$(call MESSAGE,"Uninstalling")
-	$($(PKG)_UNINSTALL_STAGING_CMDS)
 	rm -f $($(PKG)_TARGET_INSTALL_STAGING)
-	$($(PKG)_UNINSTALL_TARGET_CMDS)
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET)
+	$($(PKG)_UNINSTALL_STAGING_CMDS)
+	$($(PKG)_UNINSTALL_TARGET_CMDS)
 
 # Remove package sources
 $(BUILD_DIR)/%/.stamp_dircleaned:

From 8c3e2cbb53b0383f5b273a0a0c908b8b232d1072 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 23 Jan 2012 12:28:51 +0100
Subject: [PATCH 1377/6849] Introduce /run directory

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/run | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 fs/skeleton/run

diff --git a/fs/skeleton/run b/fs/skeleton/run
new file mode 120000
index 0000000000..1c2f433de1
--- /dev/null
+++ b/fs/skeleton/run
@@ -0,0 +1 @@
+tmp
\ No newline at end of file

From 1b1fcb638e0c7506f6b5b50df3142539424f050e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 2 Feb 2012 23:29:25 +0100
Subject: [PATCH 1378/6849] poco: the Zip module depends on XML, Net and Util
 modules

Without this, in a configuration where the Zip module is selected but
not the XML module, the build fails due to missing expat.h. This is
because POCO builds the XML module as soon as the Zip module is
enabled.

This fixes the build breakage visible at:

  http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-output.bz2

with the configuration visible at:

  http://free-electrons.com/~thomas/buildroot/test-output-2011-12-02/test-920-config

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index 241e304309..36d8de91f1 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -37,6 +37,9 @@ config BR2_PACKAGE_POCO_NETSSL_OPENSSL
 
 config BR2_PACKAGE_POCO_ZIP
 	bool "zip"
+	select BR2_PACKAGE_POCO_XML
+	select BR2_PACKAGE_POCO_NET
+	select BR2_PACKAGE_POCO_UTIL
 
 config BR2_PACKAGE_POCO_DATA
 	bool

From 502465e435610b54b247b44cf61e7f0ba3d05a22 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 2 Feb 2012 23:29:26 +0100
Subject: [PATCH 1379/6849] at91bootstrap: allow specification of a custom
 patch directory

Fixes bug #4664.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                             | 1 +
 boot/at91bootstrap/Config.in        | 9 +++++++++
 boot/at91bootstrap/at91bootstrap.mk | 9 +++++++++
 3 files changed, 19 insertions(+)

diff --git a/CHANGES b/CHANGES
index b10fff801d..dfc7d7122c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,7 @@
 	#3403: libgpg-error: bump to version 1.10
 	#3409: libgpg-error: download from gnupg.org
 	#3421: nano: make tiny flag optional
+	#4664: Cannot patch AT91Bootstrap
 	#4700: setlocalversion not working for combination svn/ubuntu 11.10...
 
 2011.11, Released November 30th, 2011:
diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index b232b3b78e..9cbaf81eef 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -10,6 +10,15 @@ config BR2_TARGET_AT91BOOTSTRAP
 
 if	BR2_TARGET_AT91BOOTSTRAP
 
+config BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR
+	string "custom patch dir"
+	help
+	  If your board requires custom patches, add the path to the
+	  directory containing the patches here. The patches must be
+	  named at91bootstrap-<version>-<something>.patch.
+
+	  Most users may leave this empty
+
 config BR2_TARGET_AT91BOOTSTRAP_BOARD
 	string "Bootstrap board"
 	default ""
diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index a7a856c6e7..5592d37375 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -21,6 +21,15 @@ define AT91BOOTSTRAP_EXTRACT_CMDS
 	rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)
 endef
 
+ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),)
+define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \
+		at91bootstrap-$(AT91BOOTSTRAP_VERSION)-\*.patch
+endef
+
+AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
+endif
+
 define AT91BOOTSTRAP_BUILD_CMDS
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR)
 endef

From aead8be336c74098eacf16c0475195c1478ba70a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 Feb 2012 14:38:48 +0100
Subject: [PATCH 1380/6849] CHANGES: #2617 / # 3691 closed

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index dfc7d7122c..4a1b552445 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,9 +56,11 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#743:  Add Transmission bit torrent option to buildroot
+	#2617: Pixman 0.19.2 & Cairo 1.10.0
 	#3403: libgpg-error: bump to version 1.10
 	#3409: libgpg-error: download from gnupg.org
 	#3421: nano: make tiny flag optional
+	#3691: New EFL packages
 	#4664: Cannot patch AT91Bootstrap
 	#4700: setlocalversion not working for combination svn/ubuntu 11.10...
 

From 2ba094de31bbc9f986b6d5bce7932d5bb7443829 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 Feb 2012 14:00:57 +0100
Subject: [PATCH 1381/6849] crosstool-ng: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 0337bf1fef..6f05ce4bed 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.13.2
+CROSSTOOL_NG_VERSION           = 1.13.3
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO

From 27a35801b8b506c0d8e562b73f5cca6ff8f2b32f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 Feb 2012 21:22:50 +0100
Subject: [PATCH 1382/6849] CHANGES: #755 / #2299 closed

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4a1b552445..a18ebc6f8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,6 +56,8 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#743:  Add Transmission bit torrent option to buildroot
+	#755:  Add Boost libraries as a package
+	#2299: Add crypto support to libsoup
 	#2617: Pixman 0.19.2 & Cairo 1.10.0
 	#3403: libgpg-error: bump to version 1.10
 	#3409: libgpg-error: download from gnupg.org

From d8f71a4c5695657c4deb5557b990b614a6a45488 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:42 +0100
Subject: [PATCH 1383/6849] liburcu: add patch to fix build with uClibc

Under uClibc, defining _GNU_SOURCE is strictly needed to access the
CPU_*() macros.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../liburcu/liburcu-0.6.7-missing-gnu-source.patch  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 package/liburcu/liburcu-0.6.7-missing-gnu-source.patch

diff --git a/package/liburcu/liburcu-0.6.7-missing-gnu-source.patch b/package/liburcu/liburcu-0.6.7-missing-gnu-source.patch
new file mode 100644
index 0000000000..f34120cdcd
--- /dev/null
+++ b/package/liburcu/liburcu-0.6.7-missing-gnu-source.patch
@@ -0,0 +1,13 @@
+Define _GNU_SOURCE to access CPU_ZERO() macro in uClibc
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: userspace-rcu-0.6.7/tests/urcutorture.c
+===================================================================
+--- userspace-rcu-0.6.7.orig/tests/urcutorture.c	2012-02-01 10:17:09.938804402 +0100
++++ userspace-rcu-0.6.7/tests/urcutorture.c	2012-02-01 10:17:15.308713372 +0100
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE
+ #include <string.h>
+ #include <sys/time.h>
+ #include <poll.h>

From e2531c0178ef6fb8046efd798dcd376c171e0f22 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:43 +0100
Subject: [PATCH 1384/6849] lttng-tools: fix build on uClibc due to
 sync_file_range()

Add a patch to use fdatasync() instead of sync_file_range() when the
latter is not available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0-pre15-no-sync-file-range-in-uclibc.patch | 87 +++++++++++++++++++
 package/lttng-tools/lttng-tools.mk            |  2 +
 2 files changed, 89 insertions(+)
 create mode 100644 package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch

diff --git a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch
new file mode 100644
index 0000000000..861686b012
--- /dev/null
+++ b/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch
@@ -0,0 +1,87 @@
+Make sync_file_range() usage optional
+
+Under uClibc, sync_file_range() is not available under all
+architectures, so we fall back to fdatasync() in this case.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: lttng-tools-2.0-pre15/configure.ac
+===================================================================
+--- lttng-tools-2.0-pre15.orig/configure.ac	2012-02-01 16:31:31.140978817 +0100
++++ lttng-tools-2.0-pre15/configure.ac	2012-02-01 16:31:42.110783708 +0100
+@@ -96,7 +96,7 @@
+ 
+ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
+ 
+-AC_CHECK_FUNCS([sched_getcpu sysconf])
++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
+ 
+ # Option to only build the consumer daemon and its libraries
+ AC_ARG_WITH([consumerd-only],
+Index: lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c
+===================================================================
+--- lttng-tools-2.0-pre15.orig/liblttng-consumer/lttng-consumer.c	2012-02-01 16:36:00.876292596 +0100
++++ lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c	2012-02-01 16:36:23.435901163 +0100
+@@ -527,11 +527,15 @@
+ 	if (orig_offset < stream->chan->max_sb_size) {
+ 		return;
+ 	}
++#ifdef HAVE_SYNC_FILE_RANGE
+ 	sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
+ 			stream->chan->max_sb_size,
+ 			SYNC_FILE_RANGE_WAIT_BEFORE
+ 			| SYNC_FILE_RANGE_WRITE
+ 			| SYNC_FILE_RANGE_WAIT_AFTER);
++#else
++	fdatasync(outfd);
++#endif
+ 	/*
+ 	 * Give hints to the kernel about how we access the file:
+ 	 * POSIX_FADV_DONTNEED : we won't re-access data in a near future after
+Index: lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c
+===================================================================
+--- lttng-tools-2.0-pre15.orig/liblttng-kconsumer/lttng-kconsumer.c	2012-02-01 16:36:36.215679416 +0100
++++ lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c	2012-02-01 16:59:08.622203348 +0100
+@@ -71,8 +71,12 @@
+ 			goto end;
+ 		}
+ 		/* This won't block, but will start writeout asynchronously */
++#ifdef HAVE_SYNC_FILE_RANGE
+ 		sync_file_range(outfd, stream->out_fd_offset, ret,
+ 				SYNC_FILE_RANGE_WRITE);
++#else
++		fdatasync(outfd);
++#endif
+ 		stream->out_fd_offset += ret;
+ 	}
+ 
+@@ -121,8 +125,12 @@
+ 		}
+ 		len -= ret;
+ 		/* This won't block, but will start writeout asynchronously */
++#ifdef HAVE_SYNC_FILE_RANGE
+ 		sync_file_range(outfd, stream->out_fd_offset, ret,
+ 				SYNC_FILE_RANGE_WRITE);
++#else
++		fdatasync(outfd);
++#endif
+ 		stream->out_fd_offset += ret;
+ 	}
+ 	lttng_consumer_sync_trace_file(stream, orig_offset);
+Index: lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c
+===================================================================
+--- lttng-tools-2.0-pre15.orig/liblttng-ustconsumer/lttng-ustconsumer.c	2012-02-01 16:37:11.495067263 +0100
++++ lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c	2012-02-01 16:37:31.224724916 +0100
+@@ -70,8 +70,12 @@
+ 			goto end;
+ 		}
+ 		/* This won't block, but will start writeout asynchronously */
++#ifdef HAVE_SYNC_FILE_RANGE
+ 		sync_file_range(outfd, stream->out_fd_offset, ret,
+ 				SYNC_FILE_RANGE_WRITE);
++#else
++		fdatasync(outfd);
++#endif
+ 		stream->out_fd_offset += ret;
+ 	}
+ 
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 9e874808cc..bcf2f678f3 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -8,4 +8,6 @@ LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 # trace format into an human readable format.
 LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace lttng-libust
 
+LTTNG_AUTORECONF = YES
+
 $(eval $(call AUTOTARGETS))

From 7733fad43c8b76cb1ebf7f02485ae966cf5192ef Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:44 +0100
Subject: [PATCH 1385/6849] lttng-babeltrace: make sure WCHAR and LARGEFILE are
 enabled

Since lttng-babeltrace depends on util-linux and libglib2, we need to
make sure WCHAR and LARGEFILE are enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-babeltrace/Config.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index e6f3845ec6..6f47304c15 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -4,6 +4,11 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_LIBGLIB2
+	# libglib2 needs gettext which needs wchar support, and we
+	# also depends on util-linux which needs wchar
+	depends on BR2_USE_WCHAR
+	# util-linux depends on largefile support
+	depends on BR2_LARGEFILE
 	help
 	  Babeltrace is part of the LTTng 2.x project.
 
@@ -20,3 +25,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	  lttng-tools package.
 
 	  http://lttng.org
+
+comment "lttng-babeltrace needs WCHAR and LARGEFILE support"
+	depends on BR2_PACKAGE_LTTNG_TOOLS && !(BR2_USE_WCHAR || BR2_LARGEFILE)

From 3e40b680fb485eacc3d9c1d64cbce2140fb47178 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:45 +0100
Subject: [PATCH 1386/6849] lttng-libust: add the dependency on util-linux

This dependency was missing in the initial addition of the package to
Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-libust/Config.in       | 8 ++++++++
 package/lttng-libust/lttng-libust.mk | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in
index 335a956886..ae74bedf10 100644
--- a/package/lttng-libust/Config.in
+++ b/package/lttng-libust/Config.in
@@ -1,6 +1,11 @@
 config BR2_PACKAGE_LTTNG_LIBUST
 	bool "lttng-libust"
 	select BR2_PACKAGE_LIBURCU
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	# util-linux needs wchar and largefile
+	depends on BR2_USE_WCHAR
+	depends on BR2_LARGEFILE
 	help
 	  Userspace tracing library for the Lttng tracing
 	  infrastructure. It allows userspace programs to create
@@ -8,3 +13,6 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	  events gathered by LTTng.
 
 	  http://lttng.org
+
+comment "lttng-libust needs WCHAR and LARGEFILE support"
+	depends on !(BR2_USE_WCHAR || BR2_LARGEFILE)
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index a2cef2a7fd..ebe14cad13 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -3,6 +3,6 @@ LTTNG_LIBUST_VERSION = 1.9.2
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
-LTTNG_LIBUST_DEPENDENCIES    = liburcu
+LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux
 
 $(eval $(call AUTOTARGETS))

From 4a6f72650681ea55370cbe21ef02aca266daf5ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:46 +0100
Subject: [PATCH 1387/6849] lttng-tools: make the dependency on lttng-libust
 optional

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-tools/Config.in      | 4 +++-
 package/lttng-tools/lttng-tools.mk | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index cc7496605c..3040af6129 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	depends on BR2_PACKAGE_LTTNG_MODULES
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_POPT
-	select BR2_PACKAGE_LTTNG_LIBUST
 	help
 	  Userspace utilities for the LTTng 2.0 tracing
 	  infrastructure.
@@ -17,4 +16,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  package for the target, if babeltrace on the target is
 	  interesting.
 
+	  If userspace tracing is desired, you need to enable
+	  lttng-libust.
+
 	  http://lttng.org
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index bcf2f678f3..8e6fc1abce 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -6,8 +6,15 @@ LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 # dependency. However, having the babeltrace utilities built for the
 # host is very useful, since those tools allow to convert the binary
 # trace format into an human readable format.
-LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace lttng-libust
+LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace
 
 LTTNG_AUTORECONF = YES
 
+ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
+LTTNG_TOOLS_CONF_OPT += --enable-lttng-ust
+LTTNG_TOOLS_DEPENDENCIES += lttng-libust
+else
+LTTNG_TOOLS_CONF_OPT += --disable-lttng-ust
+endif
+
 $(eval $(call AUTOTARGETS))

From 42852b31ef5e70f56138dcc9b8863a69cd98308e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:47 +0100
Subject: [PATCH 1388/6849] lttng-libust: add patch to fix build issue when C++
 support is not available

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...t-build-cxx-tests-when-not-available.patch | 50 +++++++++++++++++++
 package/lttng-libust/lttng-libust.mk          |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch

diff --git a/package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch
new file mode 100644
index 0000000000..d7be22d2fe
--- /dev/null
+++ b/package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch
@@ -0,0 +1,50 @@
+Do not build C++ example if a C++ compiler isn't available
+
+By default lttng-ust builds a hello.cxx C++ example that demonstrates
+the usage of the userspace tracing library in a C++
+program. Unfortunately, when no C++ support is available, the build
+of lttng-ust fails just because of this example code. So we make the
+compilation of this code conditional on whether a working C++ compiler
+was found.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: lttng-ust-1.9.2/configure.ac
+===================================================================
+--- lttng-ust-1.9.2.orig/configure.ac	2012-02-04 14:49:45.387325814 +0100
++++ lttng-ust-1.9.2/configure.ac	2012-02-04 14:50:08.156920117 +0100
+@@ -38,6 +38,18 @@
+ AC_PROG_MAKE_SET
+ LT_INIT
+ 
++# rw_PROG_CXX_WORKS
++# Check whether the C++ compiler works.
++AC_CACHE_CHECK([whether the C++ compiler works],
++               [rw_cv_prog_cxx_works],
++               [AC_LANG_PUSH([C++])
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
++                               [rw_cv_prog_cxx_works=yes],
++                               [rw_cv_prog_cxx_works=no])
++                AC_LANG_POP([C++])])
++
++AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
++
+ ## Checks for libraries.
+ AC_CHECK_LIB([dl], [dlopen])
+ AC_CHECK_LIB([pthread], [pthread_create])
+Index: lttng-ust-1.9.2/tests/Makefile.am
+===================================================================
+--- lttng-ust-1.9.2.orig/tests/Makefile.am	2012-02-04 14:49:49.157258640 +0100
++++ lttng-ust-1.9.2/tests/Makefile.am	2012-02-04 14:50:15.096796474 +0100
+@@ -1,6 +1,10 @@
+-SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo hello.cxx
++SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo
+ #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
+ 
++if CXX_WORKS
++SUBDIRS += hello.cxx
++endif
++
+ dist_noinst_SCRIPTS = test_loop runtests trace_matches
+ 
+ noinst_LIBRARIES = libtap.a
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index ebe14cad13..f54999ee4c 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,4 +5,6 @@ LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux
 
+LTTNG_LIBUST_AUTORECONF = YES
+
 $(eval $(call AUTOTARGETS))

From d8bf70e01e8c2712ce4be8069d90025231a7ac49 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 4 Feb 2012 15:48:48 +0100
Subject: [PATCH 1389/6849] lttng-babeltrace: fix build on uClibc due to
 missing posix_fallocate()

[Peter: add explicit #include <features.h>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ace-0.8-no-posix-fallocate-in-uclibc.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch

diff --git a/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch
new file mode 100644
index 0000000000..d77825fab6
--- /dev/null
+++ b/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch
@@ -0,0 +1,37 @@
+Do not call posix_fallocate() on uClibc
+
+uClibc does not implement posix_fallocate(), and posix_fallocate() is
+mostly only an hint to the kernel that we will need such or such
+amount of space inside a file. So we just don't call posix_fallocate()
+when building against uClibc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Peter: add #include <features.h>
+---
+ formats/ctf/ctf.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: lttng-babeltrace-0.8/formats/ctf/ctf.c
+===================================================================
+--- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c
++++ lttng-babeltrace-0.8/formats/ctf/ctf.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <features.h>
+ #include <glib.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -384,9 +385,11 @@
+ 		}
+ 		pos->content_size = -1U;	/* Unknown at this point */
+ 		pos->packet_size = WRITE_PACKET_LEN;
++#ifndef __UCLIBC__
+ 		off = posix_fallocate(pos->fd, pos->mmap_offset,
+ 				      pos->packet_size / CHAR_BIT);
+ 		assert(off >= 0);
++#endif
+ 		pos->offset = 0;
+ 	} else {
+ 	read_next_packet:

From 7b236b937df3507d4d7abd1fc58dae523df5a59e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 5 Feb 2012 22:14:54 +0100
Subject: [PATCH 1390/6849] libvorbis: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libvorbis/libvorbis.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index dfe7bce6fa..68444144a7 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -4,12 +4,10 @@
 #
 #############################################################
 
-LIBVORBIS_VERSION = 1.3.2
+LIBVORBIS_VERSION = 1.3.3
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
 LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
-LIBVORBIS_AUTORECONF = NO
 LIBVORBIS_INSTALL_STAGING = YES
-LIBVORBIS_INSTALL_TARGET = YES
 
 LIBVORBIS_CONF_OPT = --disable-oggtest
 

From 80a7e8216e53cd7195e78e30e90821584b537b53 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Feb 2012 17:14:39 +0100
Subject: [PATCH 1391/6849] mesa3d: don't depend on the X server

There's no particular reason why you shouldn't be able to build mesa
without the X server (E.G. for remote X), so remove it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mesa3d/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index 596eea3919..47ded29002 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
-	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
 	depends on BR2_PACKAGE_XSERVER_xorg
 	depends on BR2_INSTALL_LIBSTDCPP
 	help

From 5d425d3334231340790677e6f6e8212901e6dc23 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Feb 2012 17:19:53 +0100
Subject: [PATCH 1392/6849] mesa3d: fix build

We build mesa3d with dri support, which doesn't work with static builds,
so disable it.

From configure.ac:

dri)
    # DRI must be shared, I think
    if test "$enable_static" = yes; then
        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
    fi

At the same time fixup minor style issues (:= vs =, long lines).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mesa3d/mesa3d.mk | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 095d66d602..1e9ec77c30 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -3,13 +3,29 @@
 # mesa3d
 #
 #############################################################
-MESA3D_VERSION:=7.6.1
-MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
-MESA3D_SITE:=ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 
-MESA3D_CONF_OPT = --disable-egl --disable-glu --disable-glw --disable-glut --disable-gallium --with-driver=dri --with-dri-drivers=swrast
+MESA3D_VERSION = 7.6.1
+MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
+MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 MESA3D_INSTALL_STAGING = YES
 
-MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat
+MESA3D_CONF_OPT = \
+	--disable-egl \
+	--disable-glu \
+	--disable-glw \
+	--disable-glut \
+	--disable-gallium \
+	--with-driver=dri \
+	--with-dri-drivers=swrast \
+	--disable-static
+
+MESA3D_DEPENDENCIES = \
+	xproto_glproto \
+	xlib_libXxf86vm \
+	xlib_libXdamage \
+	xlib_libXfixes \
+	xproto_dri2proto \
+	libdrm \
+	expat
 
 $(eval $(call AUTOTARGETS))

From 436ceeafbc59ad8a68f995f8cd5f11dc3abfd2ae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Feb 2012 17:24:19 +0100
Subject: [PATCH 1393/6849] kernel-headers: bump 3.0.x / 3.2.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.18-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.19-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 701fe7f76e..eda3fa9c66 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.18"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.19"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.2"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.4"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.18-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.19-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.18-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.19-headers_install-fix-__packed-in-exported-kernel-head.patch

From e3b84754d43f0eecd0abe88bd698a00d15b3e69e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 Feb 2012 17:26:58 +0100
Subject: [PATCH 1394/6849] linux: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 132f87eba1..970146b7cd 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_2
 
 config BR2_LINUX_KERNEL_3_2
-	bool "3.2.2"
+	bool "3.2.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2.2" if BR2_LINUX_KERNEL_3_2
+	default "3.2.4" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 7487e914da8562cecd551d657022037a165e0b19 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 6 Feb 2012 10:55:33 +0100
Subject: [PATCH 1395/6849] feh: bump to 2.3

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index f036393575..f459f8a911 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.2
+FEH_VERSION = 2.3
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From 0802fc24e999ca42cbc7ac1a8596ded6d6d8c729 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 6 Feb 2012 10:55:34 +0100
Subject: [PATCH 1396/6849] libev: bump to 4.11

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libev/libev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index 8beaa8eeaf..6656d15249 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -3,7 +3,7 @@
 # libev
 #
 #############################################################
-LIBEV_VERSION = 4.04
+LIBEV_VERSION = 4.11
 LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
 LIBEV_SITE = http://dist.schmorp.de/libev/
 LIBEV_INSTALL_STAGING = YES

From defa3768eafbefbd85a03ee1a671a3d1f1de6a27 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Mon, 6 Feb 2012 15:29:41 +0100
Subject: [PATCH 1397/6849] barebox: add 2012.02, remove 2011.11

And mark 2011.12 as deprecated.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index b98878b94c..c335af06bc 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,20 +8,20 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_01
+	default BR2_TARGET_BAREBOX_2012_02
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2011_11
-	depends on BR2_DEPRECATED
-	bool "2011.11"
-
 config BR2_TARGET_BAREBOX_2011_12
+	depends on BR2_DEPRECATED
 	bool "2011.12"
 
 config BR2_TARGET_BAREBOX_2012_01
 	bool "2012.01"
 
+config BR2_TARGET_BAREBOX_2012_02
+	bool "2012.02"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -39,9 +39,9 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2011.11.0"	if BR2_TARGET_BAREBOX_2011_11
 	default "2011.12.0"	if BR2_TARGET_BAREBOX_2011_12
 	default "2012.01.0"	if BR2_TARGET_BAREBOX_2012_01
+	default "2012.02.0"	if BR2_TARGET_BAREBOX_2012_02
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 93e56f52109c505a76579c19d23316cac4c8ae29 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 6 Feb 2012 21:41:08 +0100
Subject: [PATCH 1398/6849] manual: update download helper information

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gentargets.txt | 44 ++++++++++++++--------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index d3731a2e54..3656a530db 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -133,9 +133,12 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_VERSION+, mandatory, must contain the version of the
   package. Note that if +HOST_LIBFOO_VERSION+ doesn't exist, it is
   assumed to be the same as +LIBFOO_VERSION+. It can also be a
-  Subversion or Git branch or tag, for packages that are fetched
+  revision number, branch or tag for packages that are fetched
   directly from their revision control system. +
-  Example: +LIBFOO_VERSION = 0.1.2+
+  Examples: +
+    +LIBFOO_VERSION = 0.1.2+ +
+    +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ +
+    +LIBFOO_VERSION = stable+
 
 * +LIBFOO_SOURCE+ may contain the name of the tarball of
   the package. If +HOST_LIBFOO_SOURCE+ is not specified, it
@@ -154,28 +157,37 @@ information is (assuming the package name is +libfoo+) :
   after extraction.
 
 * +LIBFOO_SITE+ may contain the Internet location of the package. It
-  can either be the HTTP or FTP location of a tarball, or the URL of a
-  Git or Subversion repository (see +LIBFOO_SITE_METHOD+ below). If
-  +HOST_LIBFOO_SITE+ is not specified, it defaults to
+  can either be the HTTP, FTP or SCP location of a tarball, or the URL
+  of a Git, Subversion, Mercurial or Bazaar repository (see
+  +LIBFOO_SITE_METHOD+ below). +
+  SCP URLs should be of the form +scp://[user@]host:filepath+. Note
+  that filepath is relative to the user's home directory, so you may want
+  to prepend the path with a slash for absolute paths:
+  +scp://[user@]host:/absolutepath+. +
+  If +HOST_LIBFOO_SITE+ is not specified, it defaults to
   +LIBFOO_SITE+. If none are specified, then the location is assumed
   to be
   +http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename+. +
-  Examples: +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ +
-  +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+
+  Examples: +
+    +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ +
+    +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+ +
+    +LIBFOO_SITE=git://github.com/kergoth/tslib.git+
 
 * +LIBFOO_SITE_METHOD+ may contain the method to fetch the package
   source code. It can either be +wget+ (for normal FTP/HTTP downloads
-  of tarballs), +svn+, +git+ or +bzr+.  When not specified, it is
-  guessed from the URL given in +LIBFOO_SITE+: +svn://+, +git://+ and
-  +bzr://+ URLs will use the +svn+, +git+ and +bzr+ methods
+  of tarballs), +scp+ (for downloads over SSH with scp), +svn+, +git+,
+  +hg+ or +bzr+.  When not specified, it is guessed from the URL given
+  in +LIBFOO_SITE+: +scp://+, +svn://+, +git://+ and
+  +bzr://+ URLs will use the +scp+, +svn+, +git+ and +bzr+ methods
   respectively. All other URL-types will use the +wget+ method. So for
   example, in the case of a package whose source code is available
-  through Subversion repository on HTTP, one 'must' specifiy
-  +LIBFOO_SITE_METHOD=svn+. For +svn+ and +git+ methods, what
-  Buildroot does is a checkout/clone of the repository which is then
-  tarballed and stored into the download cache. Next builds will not
-  checkout/clone again, but will use the tarball directly. When
-  +HOST_LIBFOO_SITE_METHOD+ is not specified, it defaults to the value
+  through a Subversion repository on HTTP, one 'must' specifiy
+  +LIBFOO_SITE_METHOD=svn+. Similarly, for Mercurial repositories, one
+  'must' specify +LIBFOO_SITE_METHOD=hg+. For +svn+, +git+, +hg+ and
+  +bzr+ methods, what Buildroot does is a checkout/clone of the repository
+  which is then tarballed and stored into the download cache. Next
+  builds will not checkout/clone again, but will use the tarball directly.
+  When +HOST_LIBFOO_SITE_METHOD+ is not specified, it defaults to the value
   of +LIBFOO_SITE_METHOD+. See +package/multimedia/tremor/+ for an
   example.
 

From 3ec57751fa54a1c8ad7d974a7e5a036af68d935c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 Feb 2012 10:49:40 +0100
Subject: [PATCH 1399/6849] Makefile: GENDOC_INNER: don't create subdirs for
 generated manuals

The output files are generated directly in $(O)/docs/manual.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 912012fa4f..7aeee962f8 100644
--- a/Makefile
+++ b/Makefile
@@ -719,7 +719,7 @@ $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
 
 $$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
 	@echo "Generating $(5) $(1)..."
-	$(Q)mkdir -p $$(O)/docs/$(1)/$(2)
+	$(Q)mkdir -p $$(@D)
 	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
 	  -D $$(@D) $$<
 endef

From 134ab1ce4f34837587d68e7b4f9fabd5cfc4a537 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 Feb 2012 22:03:29 +0100
Subject: [PATCH 1400/6849] make release: add html/text/pdf manual and create
 .tar.bz2 format as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7aeee962f8..e1621f965e 100644
--- a/Makefile
+++ b/Makefile
@@ -695,8 +695,15 @@ endif
 
 release: OUT=buildroot-$(BR2_VERSION)
 
+# Create release tarballs. We need to fiddle a bit to add the generated
+# documentation to the git output
 release:
-	git archive --format=tar --prefix=$(OUT)/ master|gzip -9 >$(OUT).tar.gz
+	git archive --format=tar --prefix=$(OUT)/ master > $(OUT).tar
+	$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
+	tar rf $(OUT).tar $(OUT)
+	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
+	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
+	rm -rf $(OUT) $(OUT).tar
 
 ################################################################################
 # GENDOC -- generates the make targets needed to build a specific type of

From 4baff8bb2266f5dd2bdd84ee9244ca4f591675a8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 7 Feb 2012 10:18:30 +0100
Subject: [PATCH 1401/6849] libmodbus: bump to 3.0.2

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmodbus/libmodbus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index ab134fdb4c..4dcfe23c36 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -3,7 +3,7 @@
 # libmodbus
 #
 #############################################################
-LIBMODBUS_VERSION = 3.0.1
+LIBMODBUS_VERSION = 3.0.2
 LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
 LIBMODBUS_SOURCE = libmodbus-$(LIBMODBUS_VERSION).tar.gz
 LIBMODBUS_INSTALL_STAGING = YES

From 57c7706bacd7f43696724df97cf78364a6712751 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 7 Feb 2012 11:33:31 +0100
Subject: [PATCH 1402/6849] wpa_supplicant: add config option to enable support
 for WPS

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/Config.in         | 6 ++++++
 package/wpa_supplicant/wpa_supplicant.mk | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index a4e0fba0f7..8ac2576f83 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -31,3 +31,9 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
 	  access point. This can be used for open and WPA2-Personal networks
 	  (optionally, with WPS); this links in parts of hostapd functionality
 	  into wpa_supplicant.
+
+config BR2_PACKAGE_WPA_SUPPLICANT_WPS
+	bool "Enable support for WPS"
+	depends on BR2_PACKAGE_WPA_SUPPLICANT
+	help
+	  Enable support for Wi-Fi Protected Setup (WPS)
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index f722b818dd..0a672eee28 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -35,6 +35,12 @@ define WPA_SUPPLICANT_AP_CONFIG
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y)
+define WPA_SUPPLICANT_WPS_CONFIG
+	echo "CONFIG_WPS=y" >>$(WPA_SUPPLICANT_CONFIG)
+endef
+endif
+
 define WPA_SUPPLICANT_CRYPTO_CONFIG
 	echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG)
 	echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
@@ -77,6 +83,7 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS
 	$(WPA_SUPPLICANT_CRYPTO_CONFIG)
 	$(WPA_SUPPLICANT_TLS_CONFIG)
 	$(WPA_SUPPLICANT_EAP_CONFIG)
+	$(WPA_SUPPLICANT_WPS_CONFIG)
 	$(WPA_SUPPLICANT_LIBNL_CONFIG)
 	$(WPA_SUPPLICANT_DBUS_CONFIG)
 	$(WPA_SUPPLICANT_AP_CONFIG)

From a5617a52d0401a42a70f733bb3f593497f117f2d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 Feb 2012 23:13:25 +0100
Subject: [PATCH 1403/6849] libevas: x11 glx option needs Xrender, Xext and
 libeet

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in  | 3 +++
 package/efl/libevas/libevas.mk | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index f5e79b3ced..e2f5349d70 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -98,7 +98,10 @@ config BR2_PACKAGE_LIBEVAS_X11_GLX
 	bool "libevas X11 GLX backend"
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_LIBEET
 	help
 	  This enables the OpenGL X11 rendering engine that renders
 	  using GLX which may be hardware accelerated.
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 7758b183c2..14f49bb6d2 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -65,7 +65,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)
 LIBEVAS_CONF_OPT += --enable-gl-xlib
-LIBEVAS_DEPENDENCIES += xproto_glproto xlib_libX11
+LIBEVAS_DEPENDENCIES += xproto_glproto xlib_libX11 xlib_libXrender \
+			xlib_libXext libeet
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_XCB),y)

From 79f22504d7b5be45170063837d551c099e0c75d0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 Feb 2012 23:19:21 +0100
Subject: [PATCH 1404/6849] libevas: generic opengl option needs mesa

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in  | 1 +
 package/efl/libevas/libevas.mk | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index e2f5349d70..3afba1bd5c 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -134,6 +134,7 @@ choice
 	default BR2_PACKAGE_LIBEVAS_GL
 
 config BR2_PACKAGE_LIBEVAS_GL
+       select BR2_PACKAGE_MESA3D
        bool "generic OpenGL"
 
 config BR2_PACKAGE_LIBEVAS_GLES_SGX
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 14f49bb6d2..9f1cf799fb 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -98,6 +98,10 @@ LIBEVAS_CONF_OPT += --enable-gl-sdl
 LIBEVAS_DEPENDENCIES += sdl
 endif
 
+ifeq ($(BR2_PACKAGE_LIBEVAS_GL),y)
+LIBEVAS_DEPENDENCIES += mesa3d
+endif
+
 ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)
 LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-sgx
 endif

From 5aeca1f6692755154d339233bd4e2578593bbdcf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 Feb 2012 23:21:53 +0100
Subject: [PATCH 1405/6849] sdl: ensure mesa3d gets built before if enabled for
 opengl support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index b5d9152882..1b9bb9b30c 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -44,6 +44,10 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 SDL_DEPENDENCIES += alsa-lib
 endif
 
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+SDL_DEPENDENCIES += mesa3d
+endif
+
 SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-arts \
 		--disable-esd \

From fc09aae5b471980f67bd5b589ab1af3f71014760 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 Feb 2012 23:27:58 +0100
Subject: [PATCH 1406/6849] sdl: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 1b9bb9b30c..f15a5213cc 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -3,9 +3,10 @@
 # SDL
 #
 #############################################################
-SDL_VERSION:=1.2.14
-SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
-SDL_SITE:=http://www.libsdl.org/release
+
+SDL_VERSION = 1.2.15
+SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz
+SDL_SITE = http://www.libsdl.org/release
 SDL_INSTALL_STAGING = YES
 SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
 

From 9b9765b8a3dfb1aa2f0f48092df19523aac78f8a Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 7 Feb 2012 21:51:22 +0100
Subject: [PATCH 1407/6849] Add package dstat (python script for system
 stats/profiling)

[Peter: depend on WCHAR as python needs it, fix white space]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/dstat/Config.in | 23 +++++++++++++++++++++++
 package/dstat/dstat.mk  | 15 +++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/dstat/Config.in
 create mode 100644 package/dstat/dstat.mk

diff --git a/package/Config.in b/package/Config.in
index 66ee266932..c679652078 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -19,6 +19,7 @@ endmenu
 menu "Debugging, profiling and benchmark"
 source "package/bonnie/Config.in"
 source "package/dhrystone/Config.in"
+source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
 source "package/kexec/Config.in"
 source "package/lmbench/Config.in"
diff --git a/package/dstat/Config.in b/package/dstat/Config.in
new file mode 100644
index 0000000000..1439c8b095
--- /dev/null
+++ b/package/dstat/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_DSTAT
+	bool "dstat"
+	depends on BR2_USE_WCHAR # python
+	select BR2_PACKAGE_PYTHON
+	help
+	  Dstat, written in Python, is a versatile replacement for vmstat,
+	  iostat, netstat and ifstat. Dstat overcomes some of their limitations
+	  and adds some extra features, more counters and flexibility. Dstat is
+	  handy for monitoring systems during performance tuning tests,
+	  benchmarks or troubleshooting.
+	  Dstat allows you to view all of your system resources in real-time,
+	  you can e.g. compare disk utilization in combination with interrupts
+	  from your IDE controller, or compare the network bandwidth numbers
+	  directly with the disk throughput (in the same interval).
+
+	  Note that to get proper output, your terminal size should be known by
+	  the termios subsystem. This can be done by running the 'resize'
+	  utility of busybox.
+
+	  http://dag.wieers.com/home-made/dstat/
+
+comment "dstat requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk
new file mode 100644
index 0000000000..a19d1d4e24
--- /dev/null
+++ b/package/dstat/dstat.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# dstat
+#
+#############################################################
+
+DSTAT_VERSION = 0.7.2
+DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2
+DSTAT_SITE = http://dag.wieers.com/home-made/dstat
+
+define DSTAT_INSTALL_TARGET_CMDS
+       $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS))

From e1231afc0190d6dbb0d1ed704637b70ff50d2927 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 09:55:31 +0100
Subject: [PATCH 1408/6849] libevas: software buffer backend doesn't need X11

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 3afba1bd5c..4615749b3f 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -47,7 +47,6 @@ comment "libevas backends"
 
 config BR2_PACKAGE_LIBEVAS_BUFFER
 	bool "libevas buffer backend"
-	depends on BR2_PACKAGE_XORG7
 	help
 	  This enables the software buffer rendering engine. There is
 	  no hardware assist here.

From 9a9fdf92893c0b5e3ed904b59bd30e63ba8987c3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 11:42:23 +0100
Subject: [PATCH 1409/6849] sdl: fix X11 dependencies

No need to build the entire X server to build SDL with X11 support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/Config.in | 2 ++
 package/sdl/sdl.mk    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/sdl/Config.in b/package/sdl/Config.in
index 869173d88f..65ac8a2469 100644
--- a/package/sdl/Config.in
+++ b/package/sdl/Config.in
@@ -24,5 +24,7 @@ config BR2_PACKAGE_SDL_QTOPIA
 config BR2_PACKAGE_SDL_X11
 	bool "SDL X11 video driver"
 	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
 
 endif
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index f15a5213cc..5460f51e6b 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -32,7 +32,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_SDL_X11),y)
 SDL_CONF_OPT+=--enable-video-x11=yes
-SDL_DEPENDENCIES += xserver_xorg-server
+SDL_DEPENDENCIES += xlib_libX11 xlib_libXext \
+	$(if $(BR2_PACKAGE_XLIB_LIBXRENDER), xlib_libXrender) \
+	$(if $(BR2_PACKAGE_XLIB_LIBXRANDR), xlib_libXrandr)
 else
 SDL_CONF_OPT+=--enable-video-x11=no
 endif

From 38071138ee1cf3b904a8fc25a4a9bcefe0d9be6a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 14:29:36 +0100
Subject: [PATCH 1410/6849] libevas: SDL GL backend doesn't need glproto

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 4615749b3f..b5fb50e9a6 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -79,7 +79,6 @@ config BR2_PACKAGE_LIBEVAS_SDL
 config BR2_PACKAGE_LIBEVAS_SDL_GL
 	bool "libevas SDL OpenGL backend"
 	depends on BR2_PACKAGE_SDL_X11
-	select BR2_PACKAGE_XPROTO_GLPROTO
 	help
 	  This is the SDL OpenGL engine that uses SDL library
 	  and OpenGL to render. This may be hardware accelerated.

From 3a9b75fe04296e0533bc085e05b357e8e7ea2324 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 14:30:06 +0100
Subject: [PATCH 1411/6849] libevas: fix SDL GL backend build

libeet is needed by all backends building the generic OpenGL support,
and the configure script forgets to check / expand libeet CFLAGS/libs
when the SDL GL backend is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in  | 6 +++---
 package/efl/libevas/libevas.mk | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index b5fb50e9a6..fa254859c1 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -99,7 +99,6 @@ config BR2_PACKAGE_LIBEVAS_X11_GLX
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XPROTO_GLPROTO
-	select BR2_PACKAGE_LIBEET
 	help
 	  This enables the OpenGL X11 rendering engine that renders
 	  using GLX which may be hardware accelerated.
@@ -132,8 +131,9 @@ choice
 	default BR2_PACKAGE_LIBEVAS_GL
 
 config BR2_PACKAGE_LIBEVAS_GL
-       select BR2_PACKAGE_MESA3D
-       bool "generic OpenGL"
+	bool "generic OpenGL"
+	select BR2_PACKAGE_MESA3D
+	select BR2_PACKAGE_LIBEET
 
 config BR2_PACKAGE_LIBEVAS_GLES_SGX
        bool "OpenGL-ES SGX"
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 9f1cf799fb..e716cea566 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -96,10 +96,14 @@ endif
 ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
 LIBEVAS_CONF_OPT += --enable-gl-sdl
 LIBEVAS_DEPENDENCIES += sdl
+# configure script forgets to check for eet / fill this out
+LIBEVAS_CONF_ENV += \
+	GL_EET_CFLAGS='-I$(STAGING_DIR)/usr/include/eet-1' \
+	GL_EET_LIBS='-leet'
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GL),y)
-LIBEVAS_DEPENDENCIES += mesa3d
+LIBEVAS_DEPENDENCIES += mesa3d libeet
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)

From 6d27a63e450807a384751b750e58bfcf0faafd22 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 14:38:19 +0100
Subject: [PATCH 1412/6849] libevas: SDL OpenGL backend needs modular X.org
 (for mesa)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index fa254859c1..f701886c00 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -79,10 +79,14 @@ config BR2_PACKAGE_LIBEVAS_SDL
 config BR2_PACKAGE_LIBEVAS_SDL_GL
 	bool "libevas SDL OpenGL backend"
 	depends on BR2_PACKAGE_SDL_X11
+	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X
 	help
 	  This is the SDL OpenGL engine that uses SDL library
 	  and OpenGL to render. This may be hardware accelerated.
 
+comment "SDL OpenGL backend needs modular X.org and X11 support in SDL"
+	depends on !(BR2_PACKAGE_SDL_X11 && BR2_PACKAGE_XSERVER_xorg)
+
 config BR2_PACKAGE_LIBEVAS_X11
 	bool "libevas X11 backend"
 	depends on BR2_PACKAGE_XORG7

From d390906f667ec9486e5a4f29d3e5a2c6a938d62c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 8 Feb 2012 10:50:24 +0100
Subject: [PATCH 1413/6849] kmod: bump to 5

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 0e3bc3404a..acf5f0a915 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 4
+KMOD_VERSION = 5
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = http://packages.profusion.mobi/kmod/
 KMOD_INSTALL_STAGING = YES

From f94818b0fa77644b989bab5aa0866de7fe4ffbb1 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 8 Feb 2012 10:50:25 +0100
Subject: [PATCH 1414/6849] udev: bump to 181 and other fixes

Changes:
- Linux kernel requirement: 2.6.34 and above (devtmpfs is mandatory)
(this also applies to the chosen toolchain, because of Kernel headers)
- optional dependency on libusb and usbutils removed
- added dependency on kmod
- added dependency on util-linux for libblkid
- install in /lib/udev instead of /usr/libexec/udev
- udevd moved to /lib/udev
- fixed path to pci.ids and usb.ids
- persistent rules generator is disabled by default, so option
is introduced to enable this option if desired

[Peter: fix build on uClibc, Config.in tweaks]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/Config.in   | 22 +++++++++++++---------
 package/udev/S10udev     |  4 ++--
 package/udev/udev.mk     | 23 +++++++++++++++--------
 target/generic/Config.in |  5 +++++
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/package/udev/Config.in b/package/udev/Config.in
index 391c71810b..d3244d1a96 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -1,29 +1,33 @@
 config BR2_PACKAGE_UDEV
 	bool "udev"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_KMOD
 	help
 	  Userspace device daemon.
 
+	  udev requires a Linux kernel >= 2.6.34: it relies on devtmpfs.
+
 	  ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 
 if BR2_PACKAGE_UDEV
 
+config BR2_PACKAGE_UDEV_RULES_GEN
+	bool "enable rules generator"
+	help
+	  Enable persistant rules generator
+
 config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "enable all extras"
-	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2
 	select BR2_PACKAGE_ACL
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_USBUTILS
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enable all extras with external dependencies like
-	  libacl, libusb, libusb-compat, usbutils, hwdata
-
-comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	  libacl, hwdata and libglib2
 
 endif
 
diff --git a/package/udev/S10udev b/package/udev/S10udev
index 29eb1075c3..70a7c3422f 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -2,7 +2,7 @@
 #
 # udev	This is a minimal non-LSB version of a UDEV startup script.  It
 #	was derived by stripping down the udev-058 LSB version for use
-#	with buildroot on embedded hardware using Linux 2.6.12+ kernels.
+#	with buildroot on embedded hardware using Linux 2.6.34+ kernels.
 #
 #	You may need to customize this for your system's resource limits
 #	(including startup time!) and administration.  For example, if
@@ -17,7 +17,7 @@
 #
 
 # Check for missing binaries
-UDEV_BIN=/sbin/udevd
+UDEV_BIN=/lib/udev/udevd
 test -x $UDEV_BIN || exit 5
 
 # Check for config file and read it
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 1825396c34..d445a2f08f 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,28 +3,35 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 173
+UDEV_VERSION = 181
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_INSTALL_STAGING = YES
 
+# mq_getattr is in librt
+UDEV_CONF_ENV += LIBS=-lrt
+
 UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\
 	--with-rootlibdir=/lib	\
-	--libexecdir=/lib/udev	\
+	--libexecdir=/lib	\
+	--with-usb-ids-path=/usr/share/hwdata/usb.ids	\
+	--with-pci-ids-path=/usr/share/hwdata/pci.ids	\
+	--with-firmware-path=/lib/firmware		\
 	--disable-introspection
 
-UDEV_DEPENDENCIES = host-gperf host-pkg-config
+UDEV_DEPENDENCIES = host-gperf host-pkg-config util-linux kmod
+
+ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y)
+UDEV_CONF_OPT += --enable-rule_generator
+endif
 
 ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
-UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
-UDEV_CONF_OPT +=							\
-	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
-	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\
+UDEV_DEPENDENCIES += acl hwdata libglib2
+UDEV_CONF_OPT +=		\
 	--enable-udev_acl
 else
 UDEV_CONF_OPT +=		\
-	--disable-hwdb		\
 	--disable-gudev
 endif
 
diff --git a/target/generic/Config.in b/target/generic/Config.in
index a91de32124..88f0718e2c 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -28,8 +28,13 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
 
 config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	bool "Dynamic using udev"
+	depends on BR2_LARGEFILE # udev
+	depends on BR2_USE_WCHAR # udev
 	select BR2_PACKAGE_UDEV
 
+comment "udev requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+
 endchoice
 
 config BR2_ROOTFS_DEVICE_TABLE

From 779c9699f912131420291c6958db43a9d890e678 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 22:31:39 +0100
Subject: [PATCH 1415/6849] iptables: no need to autoreconf

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 36fb64fb58..95134e3f48 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -8,7 +8,6 @@ IPTABLES_VERSION = 1.4.12.2
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES
-IPTABLES_AUTORECONF = YES
 IPTABLES_DEPENDENCIES = host-pkg-config
 
 IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR)

From 7100a2cc337976b1a88a393881402a9590d42f2d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Feb 2012 23:40:20 +0100
Subject: [PATCH 1416/6849] dependencies.sh: fix host g++ check when ccache is
 used

Similar to how we do it for gcc.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/dependencies/dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 2b9c0b373c..c47ffcf43c 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -101,7 +101,7 @@ if [ $COMPILER_MAJOR -lt 3 -o $COMPILER_MAJOR -eq 2 -a $COMPILER_MINOR -lt 95 ]
 fi;
 
 # check for host CXX
-CXXCOMPILER=$(which $HOSTCXX 2> /dev/null)
+CXXCOMPILER=$(which $HOSTCXX_NOCCACHE 2> /dev/null)
 if [ -z "$CXXCOMPILER" ] ; then
 	CXXCOMPILER=$(which c++ 2> /dev/null)
 fi

From 3da83717450bc512343dc46c5121721edb85e205 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Feb 2012 00:40:45 +0100
Subject: [PATCH 1417/6849] iptables: fix build with 3.2 kernel headers

Based on upstream post-1.14.12.2 change.

linux/if_packet.h changed to use the newly introduced __aligned_u64
type in 3.2, which iptables' embedded linux/types.h doesn't provide.
Fix it by updating linux/types.h.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../iptables/iptables-3.2-headers-fix.patch   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/iptables/iptables-3.2-headers-fix.patch

diff --git a/package/iptables/iptables-3.2-headers-fix.patch b/package/iptables/iptables-3.2-headers-fix.patch
new file mode 100644
index 0000000000..5ef65398d6
--- /dev/null
+++ b/package/iptables/iptables-3.2-headers-fix.patch
@@ -0,0 +1,34 @@
+From dbe77cc974cee656eae37e75039dd1a410a4535b Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: Sun, 28 Aug 2011 14:19:43 +0200
+Subject: [PATCH] include: refresh include files from kernel 3.1-rc3
+
+[Peter: trimmed to bare essentials for buildroot]
+Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
+---
+diff --git a/include/linux/types.h b/include/linux/types.h
+index 8b483c8..630cd3b 100644
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -34,5 +34,18 @@ typedef __u64 __bitwise __be64;
+ typedef __u16 __bitwise __sum16;
+ typedef __u32 __bitwise __wsum;
+ 
++/*
++ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
++ * common 32/64-bit compat problems.
++ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
++ * architectures) and to 8-byte boundaries on 64-bit architetures.  The new
++ * aligned_64 type enforces 8-byte alignment so that structs containing
++ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
++ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
++ */
++#define __aligned_u64 __u64 __attribute__((aligned(8)))
++#define __aligned_be64 __be64 __attribute__((aligned(8)))
++#define __aligned_le64 __le64 __attribute__((aligned(8)))
++
+ #endif /*  __ASSEMBLY__ */
+ #endif /* _LINUX_TYPES_H */
+-- 
+1.7.8.3
+

From 2987a6fef5b2d5cd136217ecd806eb1fcc7168bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Feb 2012 08:51:36 +0100
Subject: [PATCH 1418/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index eda3fa9c66..3c4b3dbeb7 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -62,6 +62,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.19"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.4"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.5"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From bdca8ee84b16a8a5046216d77975447a0e437477 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Feb 2012 08:52:32 +0100
Subject: [PATCH 1419/6849] linux: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 970146b7cd..86dc32ad12 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_2
 
 config BR2_LINUX_KERNEL_3_2
-	bool "3.2.4"
+	bool "3.2.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2.4" if BR2_LINUX_KERNEL_3_2
+	default "3.2.5" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 0829989046404df89c9603014d0ae54d0d4904c0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Feb 2012 11:20:35 +0100
Subject: [PATCH 1420/6849] libevas: X OpenGL backends needs modular X.org (for
 mesa)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index f701886c00..ddac49ef36 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -98,7 +98,7 @@ config BR2_PACKAGE_LIBEVAS_X11
 
 config BR2_PACKAGE_LIBEVAS_X11_GLX
 	bool "libevas X11 GLX backend"
-	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXEXT
@@ -120,7 +120,7 @@ config BR2_PACKAGE_LIBEVAS_XCB
 
 config BR2_PACKAGE_LIBEVAS_XCB_GLX
 	bool "libevas XCB GLX backend"
-	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X
 	select BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XCB_UTIL
 	select BR2_PACKAGE_XCB_PROTO

From 1e39b8a6ff5ba330688bc1a60d1e509d716b6900 Mon Sep 17 00:00:00 2001
From: Frederik Pasch <fpasch@googlemail.com>
Date: Thu, 9 Feb 2012 21:20:12 +0100
Subject: [PATCH 1421/6849] qt: needs host-pkg-config

Closes #4760

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES          | 1 +
 package/qt/qt.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a18ebc6f8d..30ac42b3bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -65,6 +65,7 @@
 	#3691: New EFL packages
 	#4664: Cannot patch AT91Bootstrap
 	#4700: setlocalversion not working for combination svn/ubuntu 11.10...
+	#4760: Qt: add host-pkg-config to dependency-list
 
 2011.11, Released November 30th, 2011:
 
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 28a477ae1b..34f05f9253 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -15,7 +15,7 @@
 QT_VERSION = 4.7.4
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://get.qt.nokia.com/qt/source
-
+QT_DEPENDENCIES = host-pkg-config
 QT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)

From a792668b58fd5f551f30d40c2352f16011f1f92f Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 8 Feb 2012 17:22:16 +0100
Subject: [PATCH 1422/6849] dependencies: move from toolchain/ to support/

As suggested by Arnout Vandecappelle, move toolchain/dependencies to
support/dependencies, as it really is not toolchain-specific anymore.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                            | 2 ++
 {toolchain => support}/dependencies/dependencies.mk | 2 +-
 {toolchain => support}/dependencies/dependencies.sh | 0
 toolchain/toolchain-buildroot.mk                    | 1 -
 toolchain/toolchain-crosstool-ng.mk                 | 1 -
 toolchain/toolchain-external.mk                     | 1 -
 6 files changed, 3 insertions(+), 4 deletions(-)
 rename {toolchain => support}/dependencies/dependencies.mk (94%)
 rename {toolchain => support}/dependencies/dependencies.sh (100%)

diff --git a/Makefile b/Makefile
index e1621f965e..90d1a9d502 100644
--- a/Makefile
+++ b/Makefile
@@ -297,6 +297,8 @@ include package/Makefile.in
 
 all: world
 
+include support/dependencies/dependencies.mk
+
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
diff --git a/toolchain/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
similarity index 94%
rename from toolchain/dependencies/dependencies.mk
rename to support/dependencies/dependencies.mk
index ea8bf252bd..3e621e9dd2 100644
--- a/toolchain/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -14,7 +14,7 @@ core-dependencies:
 	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
 		CONFIG_FILE="$(CONFIG_DIR)/.config" \
 		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
-		$(TOPDIR)/toolchain/dependencies/dependencies.sh
+		$(TOPDIR)/support/dependencies/dependencies.sh
 
 dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
 
diff --git a/toolchain/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
similarity index 100%
rename from toolchain/dependencies/dependencies.sh
rename to support/dependencies/dependencies.sh
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index c611562765..f21cefdb19 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -1,6 +1,5 @@
 # Include files required for the internal toolchain backend
 
-include toolchain/dependencies/dependencies.mk
 include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index e480da981c..f6cc2b917e 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -2,7 +2,6 @@
 
 # Explicit ordering:
 include toolchain/helpers.mk
-include toolchain/dependencies/dependencies.mk
 include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index d67405b00b..d5b2aacbd0 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -1,7 +1,6 @@
 # Required includes for the external toolchain backend
 
 include toolchain/helpers.mk
-include toolchain/dependencies/dependencies.mk
 include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk

From 0edfb24c3840dd8df7cd69b8bdc3d4244334d2a1 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 8 Feb 2012 17:22:17 +0100
Subject: [PATCH 1423/6849] dependencies: check minimal make version early on

Although support/dependencies/dependencies.sh checks for the version of make,
this script doesn't get a chance to run if make encounters a syntax error as a
result of being too old.

For example, the following syntax is only supported from make 3.81 onwards:

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
include toolchain/toolchain-buildroot.mk
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
include toolchain/toolchain-external.mk
else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
include toolchain/toolchain-crosstool-ng.mk
endif

This patch adds a check for the version of make very early in the Makefile, so
that old make versions are handled gracefully.

[Peter: simplify check]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 90d1a9d502..2b228f7c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,12 @@
 # Set and export the version string
 export BR2_VERSION:=2012.02-git
 
+# Check for minimal make version (note: this check will break at make 10.x)
+MIN_MAKE_VERSION=3.81
+ifeq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MAKE_VERSION))
+$(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
+endif
+
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
 

From ee7f92e19f3568a740ee7874112cbd1217ffab05 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 8 Feb 2012 17:22:19 +0100
Subject: [PATCH 1424/6849] Makefile: change order of dirs and dependencies

If during the dependencies step, a package needs to be downloaded, the
download directory already has to be present. If not, the file will be
downloaded under the name 'dl' instead of in the directory 'dl'.

This patch changes the order of dirs and dependencies in the world target to
fix this.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2b228f7c3a..d3e861063c 100644
--- a/Makefile
+++ b/Makefile
@@ -375,7 +375,7 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
 
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
-world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
+world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 
 $(O)/toolchainfile.cmake:
 	@echo -en "\

From 8139e21c978d2c82f559849343ebcec3dd886607 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Feb 2012 22:58:05 +0100
Subject: [PATCH 1425/6849] Makefile: fix old make check thinko

So it doesn't fail with 3.81.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d3e861063c..25da853d18 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ export BR2_VERSION:=2012.02-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
-ifeq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MAKE_VERSION))
+ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION))
 $(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
 endif
 

From d83f347c254f194b8da517e92cc5bb565b1ffd73 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 9 Feb 2012 22:31:55 +0100
Subject: [PATCH 1426/6849] toolchain/crosstool-ng: update to 1.13.4

Update to fix downloads from sourceforge (the 'mesh' network
no longer works).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 6f05ce4bed..a2069a90c2 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.13.3
+CROSSTOOL_NG_VERSION           = 1.13.4
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO

From 1bbf39bd733007f2bda799622147924008a5d44c Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 8 Feb 2012 17:22:18 +0100
Subject: [PATCH 1427/6849] dependencies: add function suitable-host-package

Sometimes, buildroot needs a certain host tool to do its job, e.g. tar. In
many cases, we expect this tool to be present on the host system, but this is
not always the case. Or maybe, the version on the host system is not
suitable, and we need a more recent one.

In some of these cases, instead of bailing out, buildroot could build the
package first (but only if the existing system package is not suitable).

To aid in detecting if a host package is suitable or not, this patch adds a
function suitable-host-package. When called with parameter foo, it will
execute check-host-foo.sh. This script should return either the path to the
suitable host package, or the empty string if no suitable package can be found.
The rules to determine whether something is suitable or not is left to
check-host-foo.sh and depends on foo.

An example usage of suitable-host-package is:
DEPENDENCIES_HOST_PREREQ += $(if $(call suitable-host-package,foo),,host-foo)

To avoid cluttering the existing dependencies.mk file, it includes any
check-host-foo.mk file. These files can be used to hold appropriate
dependency-related actions for foo.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
v1 Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index 3e621e9dd2..cee2a4842d 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -6,6 +6,16 @@
 ######################################################################
 
 DEPENDENCIES_HOST_PREREQ:=
+
+# suitable-host-pkg: calls check-host-$(1).sh shell script. Parameter (2)
+# can be the candidate to be checked. If not present, the check-host-$(1).sh
+# script should use 'which' to find a candidate. The script should return
+# the path to the suitable host tool, or nothing if no suitable tool was found.
+define suitable-host-package
+$(shell support/dependencies/check-host-$(1).sh $(2))
+endef
+-include support/dependencies/check-host-*.mk
+
 ifeq ($(BR2_STRIP_sstrip),y)
 DEPENDENCIES_HOST_PREREQ+=host-sstrip
 endif

From fd10b42ab8db0cd5d2f3c9076d54244c6e0e60a8 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 8 Feb 2012 17:22:20 +0100
Subject: [PATCH 1428/6849] dependencies: build a host-tar if no suitable tar
 can be found

Some toolchains, like the one built with buildroot itself, use hardlinks (for
example to link between the c++ and g++ binary). Unpacking such a toolchain
with the --strip-components options does not work correctly if the system tar
is too old (<1.17). Even recent releases of RedHat/CentOS still ship with
tar 1.15.

This patch checks for a suitable tar version (tar 1.17+) on the host system,
and adds host-tar to the host dependencies if none can be found.

host-tar is download and extracted as cpio.gz instead of tar.gz, to prevent
chicken-egg problem.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
v4 Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in            | 12 ---------
 package/tar/tar.mk                     | 13 ++++++++++
 support/dependencies/check-host-tar.mk |  9 +++++++
 support/dependencies/check-host-tar.sh | 35 ++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 support/dependencies/check-host-tar.mk
 create mode 100755 support/dependencies/check-host-tar.sh

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 1ace683c2a..33461b4dcb 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -299,18 +299,6 @@ define DOWNLOAD
 	exit 1
 endef
 
-# Utility programs used to build packages
-TAR ?= tar
-
-# Automatically detect tar --strip-path/components option
-TAR_STRIP_COMPONENTS := \
-  $(shell $(TAR) --help | grep strip-path > /dev/null ; \
-  if test $$? = 0 ; then \
-   echo '--strip-path' ; \
-  else \
-   echo '--strip-components' ; \
-  fi)
-
 # Needed for the foreach loops to loop over the list of hooks, so that
 # each hook call is properly separated by a newline.
 define sep
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index edbd9bdc76..9e856b53f5 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -10,6 +10,19 @@ TAR_SITE = $(BR2_GNU_MIRROR)/tar
 # Prefer full-blown tar over buybox's version
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 TAR_DEPENDENCIES += busybox
+HOST_TAR_DEPENDENCIES =
 endif
 
 $(eval $(call AUTOTARGETS))
+
+# host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem
+# of needing tar to build tar.
+HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz
+define HOST_TAR_EXTRACT_CMDS
+	mkdir -p $(@D)
+	cd $(@D) && \
+		$(INFLATE.gz) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i
+	mv $(@D)/tar-$(TAR_VERSION)/* $(@D)
+	rmdir $(@D)/tar-$(TAR_VERSION)
+endef
+$(eval $(call AUTOTARGETS,host))
diff --git a/support/dependencies/check-host-tar.mk b/support/dependencies/check-host-tar.mk
new file mode 100644
index 0000000000..010bde7a51
--- /dev/null
+++ b/support/dependencies/check-host-tar.mk
@@ -0,0 +1,9 @@
+TAR ?= tar
+
+ifeq (,$(call suitable-host-package,tar,$(TAR)))
+  DEPENDENCIES_HOST_PREREQ += host-tar
+  TAR = $(HOST_DIR)/usr/bin/tar
+endif
+
+# Since TAR is at least 1.17, it will certainly support --strip-components
+TAR_STRIP_COMPONENTS = --strip-components
diff --git a/support/dependencies/check-host-tar.sh b/support/dependencies/check-host-tar.sh
new file mode 100755
index 0000000000..2cfc2b3cc2
--- /dev/null
+++ b/support/dependencies/check-host-tar.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+candidate="$1"
+
+tar=`which $candidate`
+if [ ! -x "$tar" ]; then
+	tar=`which tar`
+	if [ ! -x "$tar" ]; then
+		# echo nothing: no suitable tar found
+		exit 1
+	fi
+fi
+
+# Output of 'tar --version' examples:
+# tar (GNU tar) 1.15.1
+# tar (GNU tar) 1.25
+version=`$tar --version | head -n 1 | sed 's/^.*\s\([0-9]\+\.\S\+\).*$/\1/'`
+major=`echo "$version" | cut -d. -f1`
+minor=`echo "$version" | cut -d. -f2`
+bugfix=`echo "$version" | cut -d. -f3`
+
+# Minimal version = 1.17 (previous versions do not correctly unpack archives
+# containing hard-links if the --strip-components option is used).
+major_min=1
+minor_min=17
+if [ $major -gt $major_min ]; then
+	echo $tar
+else
+	if [ $major -eq $major_min -a $minor -ge $minor_min ]; then
+		echo $tar
+	else
+		# echo nothing: no suitable tar found
+		exit 1
+	fi
+fi

From 2c4de62b14cf5c661ea6f999a031e9a4f115782e Mon Sep 17 00:00:00 2001
From: Samuel MARTIN <s.martin49@gmail.com>
Date: Wed, 8 Feb 2012 23:20:54 +0100
Subject: [PATCH 1429/6849] docs: Add customizing toolchain section

Signed-off-by: Samuel MARTIN <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-toolchain.txt | 45 +++++++++++++++++++++++++++++
 docs/manual/customize.txt           |  2 ++
 docs/manual/external-toolchain.txt  |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 docs/manual/customize-toolchain.txt

diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
new file mode 100644
index 0000000000..a54e2e2202
--- /dev/null
+++ b/docs/manual/customize-toolchain.txt
@@ -0,0 +1,45 @@
+Customizing the toolchain
+-------------------------
+[[toolchain-custom]]
+
+There are three distinct types of toolchain backend supported in Buildroot,
+available under the menu +Toolchain+, invoking +make menuconfig+.
+
+Using the external toolchain backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There is no way of tuning an external toolchain since Buildroot does not
+generate it.
+
+It also requires to set the Buildroot settings according to the toolchain ones
+(see xref:external-toolchain[]).
+
+Using the internal Buildroot toolchain backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The internal Buildroot toolchain backend *only* allows to generate
+*http://www.uclibc.org/[uClibc]-based toolchains*.
+
+However, it allows to tune major settings, such as:
+
+* Linux header version
+
+* http://www.uclibc.org/[uClibc] configuration (see xref:uclibc-custom[uClibc])
+
+* Binutils, GCC, Gdb and toolchain options
+
+This is directly avaiblable after selecting the +Buildroot toolchain+ type in
+the menu +Toolchain+.
+
+Using the Crosstool-NG backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The http://crosstool-ng.org[crosstool-NG] toolchain backend enables a rather
+limited set of settings under the Buildroot +Toolchain+ menu (ie. when invoking
++make menuconfig+); mostly:
+
+* The http://crosstool-ng.org[crosstool-NG] configuration file
+
+* Gdb and some toolchain options
+
+Then, the toolchain can be finely tuned invoking +make ctng-menuconfig+.
diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt
index c9f4dfd41a..e8235dee86 100644
--- a/docs/manual/customize.txt
+++ b/docs/manual/customize.txt
@@ -8,3 +8,5 @@ include::customize-busybox-config.txt[]
 include::customize-uclibc-config.txt[]
 
 include::customize-kernel-config.txt[]
+
+include::customize-toolchain.txt[]
diff --git a/docs/manual/external-toolchain.txt b/docs/manual/external-toolchain.txt
index 20eebdb202..62eb0a386f 100644
--- a/docs/manual/external-toolchain.txt
+++ b/docs/manual/external-toolchain.txt
@@ -1,5 +1,6 @@
 Using an external toolchain
 ===========================
+[[external-toolchain]]
 
 Using an already existing toolchain is useful for different
 reasons:

From 731f3dfa21f1560d7d6f52d12d921292f227db91 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 9 Feb 2012 23:32:02 +0100
Subject: [PATCH 1430/6849] docs: customize-toolchain: fix typo

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-toolchain.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index a54e2e2202..08b60a264e 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -28,7 +28,7 @@ However, it allows to tune major settings, such as:
 
 * Binutils, GCC, Gdb and toolchain options
 
-This is directly avaiblable after selecting the +Buildroot toolchain+ type in
+This is directly available after selecting the +Buildroot toolchain+ type in
 the menu +Toolchain+.
 
 Using the Crosstool-NG backend

From e8850ffdd5cd0c70832f73c69749203abfe83e5f Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Thu, 9 Feb 2012 17:25:13 -0500
Subject: [PATCH 1431/6849] bzip2: add so.1 link

In addition to the .so link add a .so.1 link for the target rootfs.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bzip2/bzip2.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index d3bb2b04a5..1bc44497cc 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -59,6 +59,7 @@ define BZIP2_INSTALL_TARGET_CMDS
 	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/
 	(cd $(TARGET_DIR)/usr/lib; \
 		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \
+		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1; \
 		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \
 	)
 	(cd $(TARGET_DIR)/usr/bin; \
@@ -102,4 +103,4 @@ define HOST_BZIP2_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
\ No newline at end of file
+$(eval $(call GENTARGETS,host))

From 7b911b583ad473cfac19297edd76852338901fec Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Feb 2012 10:44:47 +0100
Subject: [PATCH 1432/6849] linux: drop LZMA environment variable

Not used anymore.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index dbe1ad78c5..ae236d45dd 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -40,7 +40,6 @@ LINUX_MAKE_FLAGS = \
 	ARCH=$(KERNEL_ARCH) \
 	INSTALL_MOD_PATH=$(TARGET_DIR) \
 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-	LZMA="$(LZMA)" \
 	DEPMOD=$(HOST_DIR)/usr/sbin/depmod
 
 # Get the real Linux version, which tells us where kernel modules are

From 2e727571cc41a2a20cdea42998ae2739e4cce11b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Feb 2012 11:41:52 +0100
Subject: [PATCH 1433/6849] freetype: add optional bzip2 dependency

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 6eb6b29e7f..32099da167 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -9,7 +9,9 @@ FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = host-pkg-config $(if $(BR2_PACKAGE_ZLIB),zlib)
+FREETYPE_DEPENDENCIES = host-pkg-config \
+	$(if $(BR2_PACKAGE_ZLIB),zlib) \
+	$(if $(BR2_PACKAGE_BZIP2),bzip2)
 
 HOST_FREETYPE_DEPENDENCIES = host-pkg-config
 

From f37b7823e521f7989f8f35b5182330335ac9e530 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Feb 2012 13:57:27 +0100
Subject: [PATCH 1434/6849] ipsec-tools: add option for dead peer detection
 support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipsec-tools/Config.in      | 5 +++++
 package/ipsec-tools/ipsec-tools.mk | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 8a5f3d1e41..d4c62c6013 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -33,6 +33,11 @@ config BR2_PACKAGE_IPSEC_TOOLS_FRAG
 	  Enable IKE fragmentation, which is a workaround for
 	  broken routers that drop fragmented packets
 
+config BR2_PACKAGE_IPSEC_TOOLS_DPD
+	bool "Enable DPD (Dead Peer Detection)"
+	help
+	  Enable dead peer detection support
+
 config BR2_PACKAGE_IPSEC_TOOLS_STATS
 	default y
 	bool "Enable statistics logging function."
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 9781f3bea2..d7f8e35516 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -38,6 +38,12 @@ else
 IPSEC_TOOLS_CONF_OPT+= --disable-frag
 endif
 
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_DPD), y)
+IPSEC_TOOLS_CONF_OPT+= --enable-dpd
+else
+IPSEC_TOOLS_CONF_OPT+= --disable-dpd
+endif
+
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y)
 IPSEC_TOOLS_CONF_OPT+= --enable-stats
 else

From 6252ef7fc3a3e85678da62c69436c5f656c348fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Feb 2012 13:58:19 +0100
Subject: [PATCH 1435/6849] ipsec-tools: cleanup: remove trailing . after
 option text

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipsec-tools/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index d4c62c6013..6f6dc372be 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -10,7 +10,7 @@ if BR2_PACKAGE_IPSEC_TOOLS
 
 config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
 	default y
-	bool "Enable racoonctl(8)."
+	bool "Enable racoonctl(8)"
 	help
 	  Lets racoon to listen to racoon admin port, which is to
 	  be contacted by racoonctl(8).
@@ -28,7 +28,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_NATT
 	  NAT-Traversal might infringe a patent.
 
 config BR2_PACKAGE_IPSEC_TOOLS_FRAG
-	bool "Enable IKE fragmentation."
+	bool "Enable IKE fragmentation"
 	help
 	  Enable IKE fragmentation, which is a workaround for
 	  broken routers that drop fragmented packets
@@ -40,11 +40,11 @@ config BR2_PACKAGE_IPSEC_TOOLS_DPD
 
 config BR2_PACKAGE_IPSEC_TOOLS_STATS
 	default y
-	bool "Enable statistics logging function."
+	bool "Enable statistics logging function"
 
 config BR2_PACKAGE_IPSEC_TOOLS_READLINE
 	select BR2_PACKAGE_READLINE
-	bool "Enable readline input support if available."
+	bool "Enable readline input support"
 
 choice
 	prompt "Security context"

From cda6b7fe0f6335d202bc797091c68a78278118f2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Feb 2012 14:02:20 +0100
Subject: [PATCH 1436/6849] ipsec-tools: get rid of explicit ipv6 handling

This is taken care of by autotargets.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipsec-tools/ipsec-tools.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index d7f8e35516..f24e4a4abf 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -50,12 +50,6 @@ else
 IPSEC_TOOLS_CONF_OPT+= --disable-stats
 endif
 
-ifeq ($(BR2_INET_IPV6),y)
-IPSEC_TOOLS_CONF_OPT+= --enable-ipv6
-else
-IPSEC_TOOLS_CONF_OPT+= --disable-ipv6
-endif
-
 ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y)
 IPSEC_TOOLS_CONF_OPT+= --without-readline
 else

From 615ba54394649c1a83c6b9d5d06406ac86d7cac5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 10 Feb 2012 16:00:07 +0100
Subject: [PATCH 1437/6849] package: add libvncserver

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/libvncserver/Config.in       |  6 ++++
 package/libvncserver/libvncserver.mk | 50 ++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 package/libvncserver/Config.in
 create mode 100644 package/libvncserver/libvncserver.mk

diff --git a/package/Config.in b/package/Config.in
index c679652078..8a7c9c4a5a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -363,6 +363,7 @@ source "package/libosip2/Config.in"
 source "package/librsync/Config.in"
 source "package/libsoup/Config.in"
 source "package/libupnp/Config.in"
+source "package/libvncserver/Config.in"
 endmenu
 
 menu "Other"
diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in
new file mode 100644
index 0000000000..ff83e343dd
--- /dev/null
+++ b/package/libvncserver/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBVNCSERVER
+	bool "libvncserver"
+	help
+	  libvncserver is a VNC server/client library.
+
+	  http://libvncserver.sourceforge.net/
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
new file mode 100644
index 0000000000..c98fba3db5
--- /dev/null
+++ b/package/libvncserver/libvncserver.mk
@@ -0,0 +1,50 @@
+#############################################################
+#
+# libvncserver
+#
+#############################################################
+
+LIBVNCSERVER_VERSION = 0.9.8.2
+LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
+LIBVNCSERVER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver/$(LIBVNCSERVER_VERSION)
+
+LIBVNCSERVER_INSTALL_STAGING = YES
+
+# only used for examples
+LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false
+
+ifneq ($(BR2_INET_IPV6),y)
+LIBVNCSERVER_CONF_OPT += --without-ipv6
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBVNCSERVER_DEPENDENCIES += openssl
+else
+LIBVNCSERVER_CONF_OPT += --without-crypto
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+LIBVNCSERVER_DEPENDENCIES += libgcrypt
+else
+LIBVNCSERVER_CONF_OPT += --without-gcrypt
+endif
+
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+LIBVNCSERVER_DEPENDENCIES += gnutls host-pkg-config
+else
+LIBVNCSERVER_CONF_OPT += --without-gnutls
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+LIBVNCSERVER_DEPENDENCIES += jpeg
+else
+LIBVNCSERVER_CONF_OPT += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBVNCSERVER_DEPENDENCIES += zlib
+else
+LIBVNCSERVER_CONF_OPT += --without-zlib
+endif
+
+$(eval $(call AUTOTARGETS))

From c6a3b7bff287442038465882c6b7798879eb2bc2 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 11 Feb 2012 02:04:34 +0200
Subject: [PATCH 1438/6849] gst-dsp: add dependency to pkg-config

It's used in the Makefile.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-dsp/gst-dsp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index 549c5530c7..b79ccf171f 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -13,6 +13,6 @@ define GST_DSP_UNINSTALL_TARGET_CMDS
 	$(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstdsp.so
 endef
 
-GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries
+GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkg-config
 
 $(eval $(call GENTARGETS))

From 94f70d581073822012d4124b5076b172098d40c3 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 11 Feb 2012 02:02:45 +0200
Subject: [PATCH 1439/6849] gst-plugins-base: add missing orc dependency

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 87ee80dc12..3b21c2701e 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -26,6 +26,10 @@ GST_PLUGINS_BASE_CONF_OPT = \
 
 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer
 
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST_PLUGINS_BASE_DEPENDENCIES += orc
+endif
+
 # alsa support needs pcm+mixer support, but configure fails to check for it
 ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
 GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib

From 718e1ecf5fb8f509c0cf9e7498ce7250470c3456 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 20:29:50 +0100
Subject: [PATCH 1440/6849] libecore: fix directfb dependency

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 0088480729..5bc6532ccd 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -20,13 +20,13 @@ LIBECORE_CONF_OPT = --disable-simple-x11
 # libecore
 ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
 LIBECORE_CONF_OPT += --enable-ecore-directfb
+LIBECORE_DEPENDENCIES += directfb
 else
 LIBECORE_CONF_OPT += --disable-ecore-directfb
 endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_FB),y)
 LIBECORE_CONF_OPT += --enable-ecore-fb
-LIBECORE_DEPENDENCIES += directfb
 else
 LIBECORE_CONF_OPT += --disable-ecore-fb
 endif

From 832068e494c8387c209905d2aa18b24d0d7d7116 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 20:31:09 +0100
Subject: [PATCH 1441/6849] libecore: add optional
 tslib/glib/openssl/gnutls/curl support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 5bc6532ccd..8c462693e2 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -17,6 +17,26 @@ HOST_LIBECORE_CONF_OPT += --enable-ecore-evas
 # default options
 LIBECORE_CONF_OPT = --disable-simple-x11
 
+ifeq ($(BR2_PACKAGE_TSLIB),y)
+LIBECORE_DEPENDENCIES += tslib
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+LIBECORE_DEPENDENCIES += libglib2
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBECORE_DEPENDENCIES += openssl
+endif
+
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+LIBECORE_DEPENDENCIES += gnutls
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LIBECORE_DEPENDENCIES += libcurl
+endif
+
 # libecore
 ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
 LIBECORE_CONF_OPT += --enable-ecore-directfb

From 342a3d8dab64c00a6132a1bb1adeab032ee344ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 20:52:05 +0100
Subject: [PATCH 1442/6849] libecore: fix build error when X support is
 disabled but host has X headers

Forcibly disable imf-xim as it requires the X support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 8c462693e2..2b668ab94f 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -62,7 +62,7 @@ ifeq ($(BR2_PACKAGE_LIBECORE_X),y)
 LIBECORE_CONF_OPT += --enable-ecore-x
 LIBECORE_DEPENDENCIES += xlib_libXext xlib_libX11
 else
-LIBECORE_CONF_OPT += --disable-ecore-x
+LIBECORE_CONF_OPT += --disable-ecore-x --disable-ecore-imf-xim
 endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)

From 46b71cb0be27c0e6b7c93afb49fc80779bf310e3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 22:05:43 +0100
Subject: [PATCH 1443/6849] mplayer: fix libtheora linking issue

We cannot (easily) move to a newer upstream version where this is fixed
as ffmpeg moved to git / is no longer bundled, so instead this fix
is backported (upstream r34498 + r34503).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mplayer/mplayer-theora-fix.patch          | 374 ++++++++++++++++++
 1 file changed, 374 insertions(+)
 create mode 100644 package/multimedia/mplayer/mplayer-theora-fix.patch

diff --git a/package/multimedia/mplayer/mplayer-theora-fix.patch b/package/multimedia/mplayer/mplayer-theora-fix.patch
new file mode 100644
index 0000000000..08bb29b44a
--- /dev/null
+++ b/package/multimedia/mplayer/mplayer-theora-fix.patch
@@ -0,0 +1,374 @@
+[PATCH] fix libtheora linking issue with modern theora versions
+
+This is a squash/backport of upstream r34498 (configure: Simplify
+Theora check) and r34503 (Port libtheora glue code to Theora 1.0 API).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure               |   56 ++++--------------------------------
+ libmpcodecs/vd_theora.c |   74 +++++++++++++++++++++++++-----------------------
+ libmpdemux/demux_ogg.c  |   54 ++++++++++++++++++-----------------
+ 3 files changed, 74 insertions(+), 110 deletions(-)
+
+Index: mplayer-32726/configure
+===================================================================
+--- mplayer-32726.orig/configure
++++ mplayer-32726/configure
+@@ -6404,57 +6404,15 @@
+ echocheck "OggTheora support"
+ if test "$_theora" = auto ; then
+   _theora=no
+-    cat > $TMPC << EOF
+-#include <theora/theora.h>
+-#include <string.h>
+-int main(void) {
+-  /* Theora is in flux, make sure that all interface routines and datatypes
+-   * exist and work the way we expect it, so we don't break MPlayer. */
+-  ogg_packet op;
+-  theora_comment tc;
+-  theora_info inf;
+-  theora_state st;
+-  yuv_buffer yuv;
+-  int r;
+-  double t;
+-
+-  theora_info_init(&inf);
+-  theora_comment_init(&tc);
+-
+-  return 0;
+-
+-  /* we don't want to execute this kind of nonsense; just for making sure
+-   * that compilation works... */
+-  memset(&op, 0, sizeof(op));
+-  r = theora_decode_header(&inf, &tc, &op);
+-  r = theora_decode_init(&st, &inf);
+-  t = theora_granule_time(&st, op.granulepos);
+-  r = theora_decode_packetin(&st, &op);
+-  r = theora_decode_YUVout(&st, &yuv);
+-  theora_clear(&st);
+-
+-  return 0;
+-}
+-EOF
+-  _ld_theora=$($_pkg_config --silence-errors --libs theora)
+-  _inc_theora=$($_pkg_config --silence-errors --cflags theora)
+-  cc_check $_inc_theora $_ld_theora && extra_ldflags="$extra_ldflags $_ld_theora" &&
+-    extra_cflags="$extra_cflags $_inc_theora" && _theora=yes
++  ld_theora="-ltheoradec -logg"
++  statement_check theora/theoradec.h 'theora_info_init(NULL)' $ld_theora &&
++    extra_ldflags="$extra_ldflags $ld_theora" && _theora=yes
+   if test _theora = no; then
+-    _ld_theora="-ltheora -logg"
+-    cc_check $_ld_theora && extra_ldflags="$extra_ldflags $_ld_theora" && _theora=yes
+-  fi
+-  if test "$_theora" = no && test "$_tremor_internal" = yes; then
+-    _ld_theora=$($_pkg_config --silence-errors --libs theora)
+-    _inc_theora=$($_pkg_config --silence-errors --cflags theora)
+-    cc_check tremor/bitwise.c $_inc_theora $_ld_theora &&
++    _ld_theora=$($_pkg_config --silence-errors --libs theoradec)
++    _inc_theora=$($_pkg_config --silence-errors --cflags theoradec)
++    statement_check theora/theoradec.h 'theora_info_init(NULL)' $inc_theora $ld_theora &&
+       extra_ldflags="$extra_ldflags $_ld_theora" &&
+       extra_cflags="$extra_cflags $_inc_theora" && _theora=yes
+-    if test _theora = no; then
+-      _ld_theora="-ltheora -logg"
+-      cc_check tremor/bitwise.c $_ld_theora &&
+-        extra_ldflags="$extra_ldflags $_ld_theora" && _theora=yes
+-    fi
+   fi
+ fi
+ if test "$_theora" = yes ; then
+@@ -6462,7 +6420,7 @@
+   codecmodules="libtheora $codecmodules"
+   # when --enable-theora is forced, we'd better provide a probably sane
+   # $_ld_theora than nothing
+-  test -z "$_ld_theora" && extra_ldflags="$extra_ldflags -ltheora -logg"
++  test -z "$_ld_theora" && extra_ldflags="$extra_ldflags -ltheoradec -logg"
+ else
+   def_theora='#undef CONFIG_OGGTHEORA'
+   nocodecmodules="libtheora $nocodecmodules"
+Index: mplayer-32726/libmpcodecs/vd_theora.c
+===================================================================
+--- mplayer-32726.orig/libmpcodecs/vd_theora.c
++++ mplayer-32726/libmpcodecs/vd_theora.c
+@@ -39,22 +39,23 @@
+ 
+ LIBVD_EXTERN(theora)
+ 
+-#include <theora/theora.h>
++#include <theora/theoradec.h>
+ 
+ #define THEORA_NUM_HEADER_PACKETS 3
+ 
+ typedef struct theora_struct_st {
+-    theora_state st;
+-    theora_comment cc;
+-    theora_info inf;
++    th_setup_info *tsi;
++    th_dec_ctx    *tctx;
++    th_comment     tc;
++    th_info        ti;
+ } theora_struct_t;
+ 
+ /** Convert Theora pixelformat to the corresponding IMGFMT_ */
+-static uint32_t theora_pixelformat2imgfmt(theora_pixelformat fmt){
++static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt){
+     switch(fmt) {
+-       case OC_PF_420: return IMGFMT_YV12;
+-       case OC_PF_422: return IMGFMT_422P;
+-       case OC_PF_444: return IMGFMT_444P;
++       case TH_PF_420: return IMGFMT_YV12;
++       case TH_PF_422: return IMGFMT_422P;
++       case TH_PF_444: return IMGFMT_444P;
+     }
+     return 0;
+ }
+@@ -64,7 +65,7 @@
+     theora_struct_t *context = sh->context;
+     switch(cmd) {
+     case VDCTRL_QUERY_FORMAT:
+-        if (*(int*)arg == theora_pixelformat2imgfmt(context->inf.pixelformat))
++        if (*(int*)arg == theora_pixelformat2imgfmt(context->ti.pixel_fmt))
+ 	    return CONTROL_TRUE;
+ 	return CONTROL_FALSE;
+     }
+@@ -88,8 +89,9 @@
+     if (!context)
+         goto err_out;
+ 
+-    theora_info_init(&context->inf);
+-    theora_comment_init(&context->cc);
++    th_info_init(&context->ti);
++    th_comment_init(&context->tc);
++    context->tsi = NULL;
+ 
+     /* Read all header packets, pass them to theora_decode_header. */
+     for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)
+@@ -109,7 +111,7 @@
+             op.b_o_s = 1;
+         }
+ 
+-        if ( (errorCode = theora_decode_header (&context->inf, &context->cc, &op)) )
++        if ( (errorCode = th_decode_headerin (&context->ti, &context->tc, &context->tsi, &op)) < 0)
+         {
+             mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode);
+             goto err_out;
+@@ -117,23 +119,25 @@
+     }
+ 
+     /* now init codec */
+-    errorCode = theora_decode_init (&context->st, &context->inf);
+-    if (errorCode)
++    context->tctx = th_decode_alloc (&context->ti, context->tsi);
++    if (!context->tctx)
+     {
+-        mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode init failed: %i \n", errorCode);
++        mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode init failed\n");
+         goto err_out;
+     }
++    /* free memory used for decoder setup information */
++    th_setup_free(context->tsi);
+ 
+-    if(sh->aspect==0.0 && context->inf.aspect_denominator!=0)
++    if(sh->aspect==0.0 && context->ti.aspect_denominator!=0)
+     {
+-       sh->aspect = ((double)context->inf.aspect_numerator * context->inf.width)/
+-          ((double)context->inf.aspect_denominator * context->inf.height);
++       sh->aspect = ((double)context->ti.aspect_numerator * context->ti.frame_width)/
++          ((double)context->ti.aspect_denominator * context->ti.frame_height);
+     }
+ 
+     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
+-    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Frame: %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->inf.width, context->inf.height, context->inf.frame_width, context->inf.frame_height, context->inf.offset_x, context->inf.offset_y);
++    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Frame: %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->ti.frame_width, context->ti.frame_height, context->ti.pic_width, context->ti.pic_height, context->ti.pic_x, context->ti.pic_y);
+ 
+-    return mpcodecs_config_vo (sh,context->inf.width,context->inf.height,theora_pixelformat2imgfmt(context->inf.pixelformat));
++    return mpcodecs_config_vo (sh,context->ti.frame_width,context->ti.frame_height,theora_pixelformat2imgfmt(context->ti.pixel_fmt));
+ 
+ err_out:
+     free(context);
+@@ -150,9 +154,9 @@
+ 
+    if (context)
+    {
+-      theora_info_clear(&context->inf);
+-      theora_comment_clear(&context->cc);
+-      theora_clear (&context->st);
++      th_info_clear(&context->ti);
++      th_comment_clear(&context->tc);
++      th_decode_free (context->tctx);
+       free (context);
+    }
+ }
+@@ -165,7 +169,7 @@
+    theora_struct_t *context = sh->context;
+    int errorCode = 0;
+    ogg_packet op;
+-   yuv_buffer yuv;
++   th_ycbcr_buffer ycbcrbuf;
+    mp_image_t* mpi;
+ 
+    // no delayed frames
+@@ -177,31 +181,31 @@
+    op.packet = data;
+    op.granulepos = -1;
+ 
+-   errorCode = theora_decode_packetin (&context->st, &op);
+-   if (errorCode)
++   errorCode = th_decode_packetin (context->tctx, &op, NULL);
++   if (errorCode < 0)
+    {
+       mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode packetin failed: %i \n",
+ 	     errorCode);
+       return NULL;
+    }
+ 
+-   errorCode = theora_decode_YUVout (&context->st, &yuv);
+-   if (errorCode)
++   errorCode = th_decode_ycbcr_out (context->tctx, ycbcrbuf);
++   if (errorCode < 0)
+    {
+       mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode YUVout failed: %i \n",
+ 	     errorCode);
+       return NULL;
+    }
+ 
+-    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, yuv.y_width, yuv.y_height);
++    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, ycbcrbuf[0].width, ycbcrbuf[0].height);
+     if(!mpi) return NULL;
+ 
+-    mpi->planes[0]=yuv.y;
+-    mpi->stride[0]=yuv.y_stride;
+-    mpi->planes[1]=yuv.u;
+-    mpi->stride[1]=yuv.uv_stride;
+-    mpi->planes[2]=yuv.v;
+-    mpi->stride[2]=yuv.uv_stride;
++    mpi->planes[0]=ycbcrbuf[0].data;
++    mpi->stride[0]=ycbcrbuf[0].stride;
++    mpi->planes[1]=ycbcrbuf[1].data;
++    mpi->stride[1]=ycbcrbuf[1].stride;
++    mpi->planes[2]=ycbcrbuf[2].data;
++    mpi->stride[2]=ycbcrbuf[2].stride;
+ 
+     return mpi;
+ }
+Index: mplayer-32726/libmpdemux/demux_ogg.c
+===================================================================
+--- mplayer-32726.orig/libmpdemux/demux_ogg.c
++++ mplayer-32726/libmpdemux/demux_ogg.c
+@@ -49,21 +49,21 @@
+ #endif
+ 
+ #ifdef CONFIG_OGGTHEORA
+-#include <theora/theora.h>
+-int _ilog (unsigned int); /* defined in many places in theora/lib/ */
++#include <theora/theoradec.h>
+ #endif
+ 
+ #define BLOCK_SIZE 4096
+ 
+ /* Theora decoder context : we won't be able to interpret granule positions
+- * without using theora_granule_time with the theora_state of the stream.
++ * without using th_granule_time with the th_dec_ctx of the stream.
+  * This is duplicated in `vd_theora.c'; put this in a common header?
+  */
+ #ifdef CONFIG_OGGTHEORA
+ typedef struct theora_struct_st {
+-    theora_state   st;
+-    theora_comment cc;
+-    theora_info    inf;
++    th_setup_info *tsi;
++    th_dec_ctx    *tctx;
++    th_comment     tc;
++    th_info        ti;
+ } theora_struct_t;
+ #endif
+ 
+@@ -116,7 +116,7 @@
+     float   samplerate; /// granulpos 2 time
+     int64_t lastpos;
+     int32_t lastsize;
+-    int     keyframe_frequency_force;
++    int     keyframe_granule_shift;
+ 
+     // Logical stream state
+     ogg_stream_state stream;
+@@ -299,11 +299,10 @@
+            have theora_state st, until all header packets were passed to the
+            decoder. */
+         if (!pack->bytes || !(*data&0x80)) {
+-            int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1);
+-            int64_t iframemask = (1 << keyframe_granule_shift) - 1;
++            int64_t iframemask = (1 << os->keyframe_granule_shift) - 1;
+ 
+             if (pack->granulepos >= 0) {
+-                os->lastpos  = pack->granulepos >> keyframe_granule_shift;
++                os->lastpos  = pack->granulepos >> os->keyframe_granule_shift;
+                 os->lastpos += pack->granulepos & iframemask;
+                 *flags = (pack->granulepos & iframemask) == 0;
+             } else {
+@@ -892,14 +891,15 @@
+ #ifdef CONFIG_OGGTHEORA
+         } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
+             int errorCode = 0;
+-            theora_info inf;
+-            theora_comment cc;
++            th_info ti;
++            th_comment tc;
++            th_setup_info *tsi = NULL;
+ 
+-            theora_info_init (&inf);
+-            theora_comment_init (&cc);
++            th_info_init (&ti);
++            th_comment_init (&tc);
+ 
+-            errorCode = theora_decode_header (&inf, &cc, &pack);
+-            if (errorCode) {
++            errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack);
++            if (errorCode < 0) {
+                 mp_msg(MSGT_DEMUX, MSGL_ERR,
+                        "Theora header parsing failed: %i \n", errorCode);
+             } else {
+@@ -908,30 +908,32 @@
+                 sh_v->bih = calloc(1, sizeof(*sh_v->bih));
+                 sh_v->bih->biSize        = sizeof(*sh_v->bih);
+                 sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA;
+-                sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator;
+-                sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator;
+-                sh_v->disp_w = sh_v->bih->biWidth  = inf.frame_width;
+-                sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height;
++                sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator;
++                sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator;
++                sh_v->i_bps  = ti.target_bitrate / 8;
++                sh_v->disp_w = sh_v->bih->biWidth  = ti.frame_width;
++                sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height;
+                 sh_v->bih->biBitCount  = 24;
+                 sh_v->bih->biPlanes    = 3;
+                 sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight);
+                 ogg_d->subs[ogg_d->num_sub].samplerate               = sh_v->fps;
+                 ogg_d->subs[ogg_d->num_sub].theora                   = 1;
+-                ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force;
++                ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift   = ti.keyframe_granule_shift;
+                 ogg_d->subs[ogg_d->num_sub].id                       = n_video;
+                 n_video++;
+                 mp_msg(MSGT_DEMUX, MSGL_INFO,
+                        "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n",
+                        ogg_d->num_sub,
+-                       (int)inf.version_major,
+-                       (int)inf.version_minor,
+-                       (int)inf.version_subminor,
++                       (int)ti.version_major,
++                       (int)ti.version_minor,
++                       (int)ti.version_subminor,
+                        n_video - 1);
+                 if (mp_msg_test(MSGT_HEADER, MSGL_V))
+                     print_video_header(sh_v->bih, MSGL_V);
+             }
+-            theora_comment_clear(&cc);
+-            theora_info_clear(&inf);
++            th_comment_clear(&tc);
++            th_info_clear(&ti);
++            th_setup_free(tsi);
+ #endif /* CONFIG_OGGTHEORA */
+         } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
+             sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio, NULL);

From eaf412b548b99a949bdbb37f26d1ff8555aca613 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 22:56:15 +0100
Subject: [PATCH 1444/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 88 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/CHANGES b/CHANGES
index 30ac42b3bb..22dfd7f1f9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,54 +4,68 @@
 
 	Toolchain: Default to GCC 4.5.x, add binutils 2.22. Java
 	support removed, Powerpc SPE ABI support. GDB ELF support fix,
-	GDB 7.4.
+	GDB 7.4, crosstool-NG 1.13.4.
 
 	Gentargets: scp and mercurial support.
-	Autotools: derrive host dependencies from target by default.
+	Autotools: derive host dependencies from target by default.
+	Packages can now declare device table snippets.
 
-	defconfigs: qemu configs for x86-64, mips and sparc.
+	Host utilities menu with commonly used host tools.
+
+	defconfigs: qemu configs for x86-64, mips and sparc, at91
+	defconfigs now use moder U-Boot / mainline Linux, added
+	lpc3250 defconfigs.
 
 	uClibc: remove 0.9.30, backport unshare() support, add
-	0.9.32.1, use same config for ctng.
+	0.9.32.1 / 0.9.33, use same config for ctng.
 
 	Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions,
-	Barebox: add 2012.01, remove 2011.10.
+	Barebox: add 2012.01/02, remove 2011.10/11, LPC32xx
+	bootloaders added.
+
+	Various manual updates. Release tarballs now contain generated
+	manual in text/html/pdf formats.
 
-	Buildroot now calls the stop function of scripts in /etc/init.d at
-	shutdown.
+	Buildroot now calls the stop function of scripts in
+	/etc/init.d at shutdown.
 
 	Updated/fixed packages: atk, avahi, barebox, bash, beecrypt,
-	bind, binutils, bison, bluez_utils, busybox, cairo, ccache,
-	cdrkit, coreutils, cramfs, dbus, dbus-glib, dialog, diffutils,
-	dmalloc, dropbear, e2fsprogs, ebtables, ed, ethtool, expat,
-	ffmpeg, file, flex, fluxbox, fontconfig, gawk, grep, gst-dsp,
-	gst-ffmpeg, gst-plugins-base, hdparm, hostapd, htop,
-	i2c-tools, icu, iproute2, ipset, iptables, iw, jpeg, kismet,
-	lame, libcap, libcgi, libeXosip2, libffi, libgpg-error,
-	libgtk2, libidn, libmms, libmnl, libnl, libogg, libosip,
-	libpcap, libpng, libraw1394, libroxml, libv4l, libxcb,
-	libxml-parser-perl, libxslt, lighttpd, links, lm-sensors, lua,
-	m4, module-init-tools, mpc, mpd, mpfr, mplayer, mtd-utils,
-	nano, nbd, ncurses, netperf, netsnmp, ntp, opencv, openssl,
-	openvpn, orc, pciutils, pcre, pkg-config, proftpd, python, qt,
-	ruby, samba, squashfs3, sshfs, sqlite, squid, sudo, syslinux,
-	tcl, tcpdump, ti-utils, tiff, tremor, uboot, uboot-tools,
-	usbmount, vala, valgrind, vsftpd, wpa_supplicant,
-	xapp_{bdftopcf,mkfontdir,mkfontscale,xkbcomp,xcursorgen,xman},
-	xcb-util, xdm, xenomai, xf86-video-sis,
-	xfont_{encodings,font-util},
+	bind, binutils, bison, bluez_utils, bzip2, busybox, cairo,
+	ccache, cdrkit, coreutils, cramfs, dbus, dbus-glib, dialog,
+	diffutils, dmalloc, dropbear, e2fsprogs, ebtables, ed,
+	ethtool, expat, ffmpeg, file, fis, flex, fluxbox, fontconfig,
+	freetype, gawk, grep, gst-dsp, gst-ffmpeg, gst-plugins-base,
+	hdparm, hostapd, htop, i2c-tools, icu, iproute2, ipsec-tools,
+	ipset, iptables, iw, jpeg, kismet, lame, libcap, libcgi,
+	libev, libeXosip2, libffi, libftdi, libgpg-error, libgtk2,
+	libidn, libmms, libmnl, libmodbus, libnl, libogg, libosip,
+	libpcap, libpng, libraw1394, libroxml, libusb, libusb-compat,
+	libv4l, libvorbis, libxcb, libxml-parser-perl, libxslt,
+	lighttpd, links, lm-sensors, lua, m4, module-init-tools, mpc,
+	mesa3d, mpd, mpfr, mplayer, mtd-utils, nano, nbd, ncurses,
+	netperf, netsnmp, ntp, opencv, openocd, openssl, openvpn, orc,
+	pciutils, pcre, pixman, pkg-config, poco, popt, proftpd,
+	python, python-serial, qt, ruby, samba, sdl, sdparm,
+	squashfs3, sshfs, sqlite, squid, sudo, syslinux, tcl, tcpdump,
+	ti-utils, tiff, tremor, uboot, uboot-tools, udev, usbmount,
+	util-linux, vala, valgrind, vsftpd, wpa_supplicant,
+	xapp_{bdftopcf,mkfontdir,mkfontscale,xkbcomp,xcursorgen,xinit},
+	xapp_xinput, xapp_xman, xcb-util, xdm, xenomai,
+	xf86-video-sis, xfont_{encodings,font-util},
 	xlib_lib{fontenc,X11,Xau,Xcursor,Xdmcp,Xfixes,Xfont,Xrender},
-	xlib_libxkbfile, xutil_makedepend, yajl
-
-	New packages: boost, connman, expedite, explorercanvas, feh,
-	flot, giblib, igh-ethercat, imlib2, jquery, jquery-sparklines,
-	jquery-validation, jsmin, kmod, libecore, libedbus, libedje,
-	libeet, libeina, libelementary, libesmtp, libethumb, libevas,
-	libical, libmbus, linux-firmware, NetworkManager, open2300,
-	python-distutilscross, python-dpkt, python-netifaces,
-	python-pygame, python-setuptools, rt-tests, sane-backends,
-	sqlcipher, transmission, unionfs, xf86-input-tslib,
-	xinput-calibrator
+	xlib_libxkbfile, xterm, xutil_makedepend, yajl
+
+	New packages: boost, connman, dstat, expedite, explorercanvas,
+	feh, flot, giblib, igh-ethercat, imlib2, jquery,
+	jquery-sparklines, jquery-validation, jsmin, kmod, libecore,
+	libedbus, libedje, libeet, libeina, libelementary, libesmtp,
+	libethumb, libevas, libical, libmbus, liboauth, liburcu,
+	libvncserver, linux-firmware,
+	lttng-{babeltrace,libust,modules,tools}, NetworkManager,
+	open2300, python-distutilscross, python-dpkt,
+	python-netifaces, python-pygame, python-setuptools, rt-tests,
+	sam-ba, sane-backends, sqlcipher, transmission, unionfs,
+	xf86-input-tslib, xinput-calibrator
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 14c2442858aac16aa0529099c5de9e3d2a76d4d0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 23:22:29 +0100
Subject: [PATCH 1445/6849] Update for 2012.02-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 22dfd7f1f9..21de451718 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2012.02, Not yet released:
+2012.02-rc1: Released February 12th, 2012:
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 25da853d18..7d8dd2ed2e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.02-git
+export BR2_VERSION:=2012.02-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 4a52fb7dbf..3e43cdf139 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,15 +13,15 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2011.11.tar.bz2">buildroot-2011.11.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2011.11-rc3</b>, which can be
+
+The latest release candidate is <b>2012.02-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2011.11-rc3.tar.gz">buildroot-2011.11-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2012.02-rc1.tar.gz">buildroot-2012.02-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.11-rc3.tar.bz2">buildroot-2011.11-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.02-rc1.tar.bz2">buildroot-2012.02-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 0b10084191..4dbdd7f79a 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>12 December 2012 -- 2012.02-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.02_rc1">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.02-rc1.tar.bz2">2012.02-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>31 January 2012 -- Buildroot Developer Day</b>
 
     <p>Another <i>Buildroot Developer Day</i> will take place on

From 8b67554a3feb2f226184b7d5b767d8d681351cc9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 Feb 2012 23:58:45 +0100
Subject: [PATCH 1446/6849] news.html: add 2012.02-rc1 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 4dbdd7f79a..9b50a550f1 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.02_rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-February/050234.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.02-rc1.tar.bz2">2012.02-rc1

From 7b462167eefb25138669c9ed632cd9ed16d5550f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 13 Feb 2012 11:25:18 +0100
Subject: [PATCH 1447/6849] zlib: bump version

Patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../zlib/zlib-1.2.5-fix-static-install.patch  | 24 -------------------
 package/zlib/zlib.mk                          |  9 +++----
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 package/zlib/zlib-1.2.5-fix-static-install.patch

diff --git a/package/zlib/zlib-1.2.5-fix-static-install.patch b/package/zlib/zlib-1.2.5-fix-static-install.patch
deleted file mode 100644
index 0a885f742f..0000000000
--- a/package/zlib/zlib-1.2.5-fix-static-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] fix make install for static builds
-
-Only try to install shared lib if we've built one.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile.in |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-Index: zlib-1.2.5/Makefile.in
-===================================================================
---- zlib-1.2.5.orig/Makefile.in
-+++ zlib-1.2.5/Makefile.in
-@@ -168,7 +168,9 @@ install-libs: $(LIBS)
- 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- 	cp $(STATICLIB) $(DESTDIR)$(libdir)
--	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
-+	if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-+	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
-+	fi
- 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
- 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
- 	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index fbe923e69b..eca98b876a 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -3,10 +3,11 @@
 # zlib
 #
 #############################################################
-ZLIB_VERSION:=1.2.5
-ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
-ZLIB_INSTALL_STAGING=YES
+
+ZLIB_VERSION = 1.2.6
+ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
+ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+ZLIB_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 ZLIB_PIC :=

From 08bd8712efa26ea78c4674524abaa078cbc5b929 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 13 Feb 2012 11:26:42 +0100
Subject: [PATCH 1448/6849] libvncserver: ensure target libgcrypt-config is
 used

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libvncserver/libvncserver.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index c98fba3db5..90c021d9c6 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -24,6 +24,7 @@ LIBVNCSERVER_CONF_OPT += --without-crypto
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+LIBVNCSERVER_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 LIBVNCSERVER_DEPENDENCIES += libgcrypt
 else
 LIBVNCSERVER_CONF_OPT += --without-gcrypt

From 3c61d732098c7eacc23ad9f4322a637739ce71d5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 13 Feb 2012 22:26:26 +0100
Subject: [PATCH 1449/6849] ffmpeg: fix altivec typo

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index dc572de900..bed37287af 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -150,7 +150,7 @@ endif
 # Set powerpc altivec appropriately
 ifeq ($(BR2_powerpc),y)
 ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)
-FFMPEG_CONF_OPT -= --enable-altivec
+FFMPEG_CONF_OPT += --enable-altivec
 else
 FFMPEG_CONF_OPT += --disable-altivec
 endif

From 74c7b15a90c78098ca170757b11b8068e2d46d52 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 Feb 2012 00:13:09 +0100
Subject: [PATCH 1450/6849] kernel-headers: bump 3.0.x / 3.2.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.19-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.21-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 3c4b3dbeb7..86d6c3242c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.19"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.21"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.5"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.6"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.19-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.21-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.19-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.21-headers_install-fix-__packed-in-exported-kernel-head.patch

From 6a180a9a1f97e6c71840211603017f1da6ab1adc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 Feb 2012 00:26:35 +0100
Subject: [PATCH 1451/6849] linux: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 86dc32ad12..26032fdaf0 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_2
 
 config BR2_LINUX_KERNEL_3_2
-	bool "3.2.5"
+	bool "3.2.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2.5" if BR2_LINUX_KERNEL_3_2
+	default "3.2.6" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 40281284ad5ab41fea4058d57c130cbae0fb9d70 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 Feb 2012 10:32:30 +0100
Subject: [PATCH 1452/6849] python: workaround distutils issue with binary
 extensions

distutils adds -L$LIBDIR (/usr/lib), breaking build of binary extensions.
Seen with netifaces, but other extensions may be affected as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/python/python.mk b/package/python/python.mk
index 78895d412d..28e215c585 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -131,6 +131,15 @@ PYTHON_MAKE_ENV = \
 	PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
 	PYTHON_MODULES_LIB="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib"
 
+# python distutils adds -L$LIBDIR when linking binary extensions, causing
+# trouble for cross compilation
+define PYTHON_FIXUP_LIBDIR
+	$(SED) 's|^LIBDIR=.*|LIBDIR= $(STAGING_DIR)/usr/lib|' \
+	   $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/Makefile
+endef
+
+PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_FIXUP_LIBDIR
+
 #
 # Development files removal
 #

From 7a7bd4b87390d63532b8cce619d6ed1b00b47128 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 Feb 2012 10:51:12 +0100
Subject: [PATCH 1453/6849] busybox: bump 1.19.x stable version

Identical to 1.19.3 + patches.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |  2 +-
 .../busybox-1.19.3/busybox-1.19.3-getty.patch | 12 --------
 .../busybox-1.19.3/busybox-1.19.3-mdev.patch  | 11 -------
 .../busybox-1.19.3-modinfo.patch              | 10 -------
 .../busybox-1.19.3/busybox-1.19.3-wget.patch  | 29 -------------------
 5 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
 delete mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
 delete mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
 delete mode 100644 package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 4176020d36..c206509649 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -41,7 +41,7 @@ config BR2_BUSYBOX_VERSION
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
-	default "1.19.3"	if BR2_BUSYBOX_VERSION_1_19_X
+	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
deleted file mode 100644
index 84dad6f1bc..0000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.19.3/loginutils/getty.c
-+++ busybox-1.19.3-getty/loginutils/getty.c
-@@ -271,7 +271,9 @@ static void termios_init(int speed)
- #ifdef CMSPAR
- 		| CMSPAR  /* mark or space parity */
- #endif
-+#ifdef CBAUD
- 		| CBAUD   /* (output) baud rate */
-+#endif
- #ifdef CBAUDEX
- 		| CBAUDEX /* (output) baud rate */
- #endif
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
deleted file mode 100644
index 653ac35c50..0000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-mdev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.19.3/util-linux/mdev.c
-+++ busybox-1.19.3-mdev/util-linux/mdev.c
-@@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 				int seqlen;
- 				char seqbuf[sizeof(int)*3 + 2];
- 
--				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
-+				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
- 				if (seqlen < 0) {
- 					seq = NULL;
- 					break;
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
deleted file mode 100644
index 9dd5c103a5..0000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-modinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.19.3/modutils/modinfo.c
-+++ busybox-1.19.3-modinfo/modutils/modinfo.c
-@@ -13,6 +13,7 @@
- //config:config MODINFO
- //config:	bool "modinfo"
- //config:	default y
-+//config:	select PLATFORM_LINUX
- //config:	help
- //config:	  Show information about a Linux Kernel module
- 
diff --git a/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch b/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
deleted file mode 100644
index e98a506cbb..0000000000
--- a/package/busybox/busybox-1.19.3/busybox-1.19.3-wget.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- busybox-1.19.3/networking/wget.c
-+++ busybox-1.19.3-wget/networking/wget.c
-@@ -552,6 +552,7 @@ static void download_one_url(const char 
- 	FILE *dfp;                      /* socket to ftp server (data)      */
- 	char *proxy = NULL;
- 	char *fname_out_alloc;
-+	char *redirected_path = NULL;
- 	struct host_info server;
- 	struct host_info target;
- 
-@@ -794,8 +795,8 @@ However, in real world it was observed t
- 					bb_error_msg_and_die("too many redirections");
- 				fclose(sfp);
- 				if (str[0] == '/') {
--					free(target.allocated);
--					target.path = target.allocated = xstrdup(str+1);
-+					free(redirected_path);
-+					target.path = redirected_path = xstrdup(str+1);
- 					/* lsa stays the same: it's on the same server */
- 				} else {
- 					parse_url(str, &target);
-@@ -850,6 +851,7 @@ However, in real world it was observed t
- 	free(server.allocated);
- 	free(target.allocated);
- 	free(fname_out_alloc);
-+	free(redirected_path);
- }
- 
- int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

From cf2486bf317e4bbf88c801fb96183ba62be78cc8 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 14 Feb 2012 10:56:52 +0100
Subject: [PATCH 1454/6849] DOWNLOAD_WGET: use -O instead of -P to set output
 file

Some URLs use url-encoded arguments to specify the file to download.
Wget will then use an output file name which includes all the ampersands
and such.  However, this is not what we see from buildroot.

E.g.:
FOO_SITE="http://git.foo.com/?p=foo.git;a=blob;f="
FOO_SOURCE="foo.tgz"

wget will download this into $(DL_DIR)/index.html?p=foo.git;a=blob;f=foo.tgz
buildroot thinks it's in $(DL_DIR)/foo.tgz

To make sure the view of wget and buildroot are consistent, specify
the output file explicitly.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 33461b4dcb..ea44c6cef3 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -238,7 +238,7 @@ endef
 
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
-	$(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2)
+	$(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2)
 endef
 
 define SOURCE_CHECK_WGET

From 451a887894faddef019e9a0628c21b5f2e9eee56 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 Feb 2012 12:58:25 +0100
Subject: [PATCH 1455/6849] Makefile: use /etc/os-release for version info
 rather than /etc/br-version

/etc/os-release is becoming a standard interface for distribution
name/version info, so let's use that instead of the nonstandard
/etc/br-version. Format of the file is something like:

NAME=Buildroot
VERSION=2012.02-rc1-00003-g2d10e81
ID=buildroot
VERSION_ID=2012.02-rc1
PRETTY_NAME="Buildroot 2012.02-rc1"

For more details, see:

http://0pointer.de/public/systemd-man/os-release.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7d8dd2ed2e..8a8b6760cb 100644
--- a/Makefile
+++ b/Makefile
@@ -477,7 +477,13 @@ endif
 	else \
 		/sbin/ldconfig -r $(TARGET_DIR); \
 	fi
-	echo $(BR2_VERSION_FULL) > $(TARGET_DIR)/etc/br-version
+	( \
+		echo "NAME=Buildroot"; \
+		echo "VERSION=$(BR2_VERSION_FULL)"; \
+		echo "ID=buildroot"; \
+		echo "VERSION_ID=$(BR2_VERSION)"; \
+		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
+	) >  $(TARGET_DIR)/etc/os-release
 
 ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
 	$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)

From d54dc133e19051c24c58b327eda6b9f496f876e7 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Tue, 14 Feb 2012 18:04:50 +0000
Subject: [PATCH 1456/6849] mxml: Use correct paths when installing into
 staging.

The DSTROOT option passed for the staging install would install
into the target directory, which is not what was intended.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mxml/mxml.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index fb736706ae..c05c3a7060 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -7,9 +7,9 @@ MXML_VERSION = 2.6
 MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6
 MXML_INSTALL_STAGING = YES
 
-MXML_INSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
 MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
-MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) uninstall
+MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) uninstall
 MXML_UNINSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) uninstall
 
 $(eval $(call AUTOTARGETS))

From 68f651954705e3f90ede5b3fb647ccdb6c9226bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 15 Feb 2012 08:41:05 +0100
Subject: [PATCH 1457/6849] avahi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 739c5f281e..3392614802 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
 # either version 2.1 of the License, or (at your option) any
 # later version.
 
-AVAHI_VERSION = 0.6.30
+AVAHI_VERSION = 0.6.31
 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
 AVAHI_INSTALL_STAGING = YES

From d6628bca393f9f01c9b320f2eb60db51519ae54d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 15 Feb 2012 23:22:23 +0100
Subject: [PATCH 1458/6849] libecore: tweak makekeys workaround for make 3.82

It seems that make 3.82 gets confused and considers makekeys
out of date when there isn't a makekeys.o, so ensure that we
create both makekeys and makekeys.o before building.

Also move the workaround to the extract step so we can build using
make's default rules rather than explicitly calling gcc.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 2b668ab94f..db14356ae6 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -76,11 +76,10 @@ LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util
 # teach it about CC_FOR_BUILD, but for now simply build makekeys by
 # hand in advance
 define LIBECORE_BUILD_MAKEKEYS_FOR_HOST
-	cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
-		-o makekeys makekeys.c
+	$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/src/util makekeys.o makekeys
 endef
 
-LIBECORE_POST_CONFIGURE_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
+LIBECORE_POST_EXTRACT_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
 else
 LIBECORE_CONF_OPT += --disable-ecore-x-xcb
 endif

From 7553f043ad7e682e65867e3504f7dbf220b10bd7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 16 Feb 2012 12:20:01 +0100
Subject: [PATCH 1459/6849] uClibc: add upstream 0.9.33 fixes

Fixes build on E.G. powerpc.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch |  30 +++
 ...t-fstat-Use-64bit-version-of-syscall.patch | 179 ++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
 create mode 100644 toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch b/toolchain/uClibc/uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
new file mode 100644
index 0000000000..68077f57d4
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
@@ -0,0 +1,30 @@
+From ca457af92be7835edf77f34bead94f504fbc2d4b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 3 Feb 2012 10:57:44 -0800
+Subject: [PATCH 2/4] Declare __err and pass it to INTERNAL_SYSCALL_NCS so
+ subsequent macros can use it
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/syscalls-common.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/syscalls-common.h b/libc/sysdeps/linux/common/bits/syscalls-common.h
+index faebd1b..0f5a929 100644
+--- a/libc/sysdeps/linux/common/bits/syscalls-common.h
++++ b/libc/sysdeps/linux/common/bits/syscalls-common.h
+@@ -59,8 +59,8 @@
+ #ifndef INLINE_SYSCALL_NOERR_NCS
+ # define INLINE_SYSCALL_NOERR_NCS(name, nr, args...)			\
+ ({									\
+-	/*INTERNAL_SYSCALL_DECL(__err);*/					\
+-	long __res = INTERNAL_SYSCALL_NCS(name, /*__err*/, nr, args);	\
++	INTERNAL_SYSCALL_DECL(__err);					\
++	long __res = INTERNAL_SYSCALL_NCS(name, __err, nr, args);	\
+ 	__res;								\
+ })
+ #endif
+-- 
+1.7.8.3
+
diff --git a/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch b/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch
new file mode 100644
index 0000000000..a9d1c960c3
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch
@@ -0,0 +1,179 @@
+From b813377f6c746118a9d2625e6b29ffeec4233663 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 3 Feb 2012 20:06:55 -0800
+Subject: [PATCH 3/4] lstat/stat/fstat: Use 64bit version of syscall if
+ available
+
+This is needed for stat'ing loop devices > 255
+since otherwise kernel returns EOVERFLOW becasue
+it needs st_rdev/st_dev to be larger than 16bits but
+in kernel it uses __old_kernel_stat for stat
+syscall which has st_rdev/st_dev as unsigned short
+
+Add a testcase
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/fstat.c |   18 ++++++++++++++----
+ libc/sysdeps/linux/common/lstat.c |   19 ++++++++++++++-----
+ libc/sysdeps/linux/common/stat.c  |   18 ++++++++++++++----
+ test/stat/stat-loop256.c          |   32 ++++++++++++++++++++++++++++++++
+ 4 files changed, 74 insertions(+), 13 deletions(-)
+ create mode 100644 test/stat/stat-loop256.c
+
+diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
+index acc639b..4726a68 100644
+--- a/libc/sysdeps/linux/common/fstat.c
++++ b/libc/sysdeps/linux/common/fstat.c
+@@ -12,18 +12,28 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+ 
+-#define __NR___syscall_fstat __NR_fstat
+-static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf)
+-
+ int fstat(int fd, struct stat *buf)
+ {
+ 	int result;
++#ifdef __NR_fstat64
++	/* normal stat call has limited values for various stat elements
++	 * e.g. uid device major/minor etc.
++	 * so we use 64 variant if available
++	 * in order to get newer versions of stat elements
++	 */
++	struct kernel_stat64 kbuf;
++	result = INLINE_SYSCALL(fstat64, 2, fd, &kbuf);
++	if (result == 0) {
++		__xstat32_conv(&kbuf, buf);
++	}
++#else
+ 	struct kernel_stat kbuf;
+ 
+-	result = __syscall_fstat(fd, &kbuf);
++	result = INLINE_SYSCALL(fstat, 2, fd, &kbuf);
+ 	if (result == 0) {
+ 		__xstat_conv(&kbuf, buf);
+ 	}
++#endif
+ 	return result;
+ }
+ libc_hidden_def(fstat)
+diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
+index aa77447..db72d1f 100644
+--- a/libc/sysdeps/linux/common/lstat.c
++++ b/libc/sysdeps/linux/common/lstat.c
+@@ -12,19 +12,28 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+ 
+-#define __NR___syscall_lstat __NR_lstat
+-static __inline__ _syscall2(int, __syscall_lstat,
+-		const char *, file_name, struct kernel_stat *, buf)
+-
+ int lstat(const char *file_name, struct stat *buf)
+ {
+ 	int result;
++#ifdef __NR_lstat64
++	/* normal stat call has limited values for various stat elements
++	 * e.g. uid device major/minor etc.
++	 * so we use 64 variant if available
++	 * in order to get newer versions of stat elements
++	 */
++	struct kernel_stat64 kbuf;
++	result = INLINE_SYSCALL(lstat64, 2, file_name, &kbuf);
++	if (result == 0) {
++		__xstat32_conv(&kbuf, buf);
++	}
++#else
+ 	struct kernel_stat kbuf;
+ 
+-	result = __syscall_lstat(file_name, &kbuf);
++	result = INLINE_SYSCALL(lstat, 2, file_name, &kbuf);
+ 	if (result == 0) {
+ 		__xstat_conv(&kbuf, buf);
+ 	}
++#endif
+ 	return result;
+ }
+ libc_hidden_def(lstat)
+diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
+index a6ab291..829f35a 100644
+--- a/libc/sysdeps/linux/common/stat.c
++++ b/libc/sysdeps/linux/common/stat.c
+@@ -12,20 +12,30 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+ 
+-#define __NR___syscall_stat __NR_stat
+ #undef stat
+-static __inline__ _syscall2(int, __syscall_stat,
+-		const char *, file_name, struct kernel_stat *, buf)
+ 
+ int stat(const char *file_name, struct stat *buf)
+ {
+ 	int result;
++#ifdef __NR_stat64
++	/* normal stat call has limited values for various stat elements
++	 * e.g. uid device major/minor etc.
++	 * so we use 64 variant if available
++	 * in order to get newer versions of stat elements
++	 */
++	struct kernel_stat64 kbuf;
++	result = INLINE_SYSCALL(stat64, 2, file_name, &kbuf);
++	if (result == 0) {
++		__xstat32_conv(&kbuf, buf);
++	}
++#else
+ 	struct kernel_stat kbuf;
+ 
+-	result = __syscall_stat(file_name, &kbuf);
++	result = INLINE_SYSCALL(stat, 2, file_name, &kbuf);
+ 	if (result == 0) {
+ 		__xstat_conv(&kbuf, buf);
+ 	}
++#endif
+ 	return result;
+ }
+ libc_hidden_def(stat)
+diff --git a/test/stat/stat-loop256.c b/test/stat/stat-loop256.c
+new file mode 100644
+index 0000000..14284c1
+--- /dev/null
++++ b/test/stat/stat-loop256.c
+@@ -0,0 +1,32 @@
++#include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <sys/stat.h>
++int main()
++{
++    struct stat statbuf;
++    int ret = 0;
++    char* loop255 = "/dev/loop255";
++    char* loop256 = "/dev/loop256";
++    mode_t mode = 0660;
++    mknod(loop255, mode, 0x7ff);
++    mknod(loop256, mode, 0x100700);
++    ret = stat(loop255, &statbuf);
++    if(ret < 0) {
++	printf("stat: Cant stat %s\n",loop255);
++	unlink(loop255);
++	exit(1);
++    }
++    ret = stat(loop256, &statbuf);
++    if(ret < 0) {
++        printf("stat: Cant stat %s\n",loop256);
++	unlink(loop255);
++	unlink(loop256);
++        exit(1);
++    }
++
++    unlink(loop255);
++    unlink(loop256);
++    exit(0);
++}
++
+-- 
+1.7.8.3
+

From 5207e68a8c73f57f0a8cddc09239f5d85a2c5420 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 16 Feb 2012 22:11:27 +0100
Subject: [PATCH 1460/6849] gst-dsp: bump version for DSP_API=2 bugfix

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-dsp/gst-dsp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index b79ccf171f..96829627dd 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -1,4 +1,4 @@
-GST_DSP_VERSION = 0.10.1
+GST_DSP_VERSION = 0.10.2
 GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
 
 define GST_DSP_BUILD_CMDS

From 28df1bc780c17f5fb340665ff89f05c9030b8b6f Mon Sep 17 00:00:00 2001
From: Mathieu Briand <mbriand@adeneo-embedded.com>
Date: Mon, 13 Feb 2012 10:43:46 +0100
Subject: [PATCH 1461/6849] configs: Add Freescale MX53 support

Buildroot config and Linux Kernel config.
Freescale binaries (xf86 video driver and multimedia codecs) not supported yet.

Signed-off-by: Mathieu Briand <mbriand@adeneo-embedded.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/mx53loco_defconfig | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 configs/mx53loco_defconfig

diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
new file mode 100644
index 0000000000..eab5b18691
--- /dev/null
+++ b/configs/mx53loco_defconfig
@@ -0,0 +1,18 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a8=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx53_loco"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="http://opensource.freescale.com/pub/scm/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="http://opensource.freescale.com/pub/scm/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"
+BR2_LINUX_KERNEL_DEFCONFIG="imx5"

From 6fdc1c3b55cbdf04502ca99986c13a0d3c80f6c9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 19 Feb 2012 22:54:17 +0100
Subject: [PATCH 1462/6849] defconfigs: mx53loco_defconfig: misc tweaks

- Use git:// URLs for freescale git trees
- Enable hard fpu for A8
- Board uses uSD cards, so enable ext2 filesystem

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/mx53loco_defconfig | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index eab5b18691..ff3948b277 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -1,18 +1,23 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a8=y
+# BR2_SOFT_FLOAT is not set
+BR2_VFP_FLOAT=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx53_loco"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="http://opensource.freescale.com/pub/scm/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
 BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"
 
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="http://opensource.freescale.com/pub/scm/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
 BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"
 BR2_LINUX_KERNEL_DEFCONFIG="imx5"

From 00dbf19c38b3286b848ac885ea28e5233ce692ba Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 17 Feb 2012 15:30:58 -0800
Subject: [PATCH 1463/6849] Add documentation for makedev

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gentargets.txt |  5 +-
 docs/manual/appendix.txt                   |  4 ++
 docs/manual/makedev-syntax.txt             | 54 ++++++++++++++++++++++
 docs/manual/manual.txt                     |  2 +
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 docs/manual/appendix.txt
 create mode 100644 docs/manual/makedev-syntax.txt

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 3656a530db..cfcee8c8df 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -210,10 +210,13 @@ information is (assuming the package name is +libfoo+) :
 
 * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot
   when using the static device table. The syntax to use is the
-  makedevs one.
+  makedevs one. You can find some documentation for this syntax in the
+  xref:makedev-syntax[]. This variable is optional.
 
 * +LIBFOO_PERMISSIONS+ lists the changes of permissions to be done at
   the end of the build process. The syntax is once again the makedevs one.
+  You can find some documentation for this syntax in the xref:makedev-syntax[].
+  This variable is optional.
 
 The recommended way to define these variables is to use the following
 syntax:
diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
new file mode 100644
index 0000000000..f41c82cdbf
--- /dev/null
+++ b/docs/manual/appendix.txt
@@ -0,0 +1,4 @@
+Appendix
+========
+
+include::makedev-syntax.txt[]
diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt
new file mode 100644
index 0000000000..4728c4bebc
--- /dev/null
+++ b/docs/manual/makedev-syntax.txt
@@ -0,0 +1,54 @@
+[[makedev-syntax]]
+Makedev syntax documentation
+----------------------------
+
+The makedev syntax is used across several places in Buildroot to
+define changes to be made for permissions or which device files to
+create and how to create them, in order to avoid to call mkdnod every
+now and then.
+
+This syntax is derived from the makedev utility, and a more complete
+documentation can be found in the +package/makedevs/README+ file.
+
+It takes the form of a line for each file, with the following layout:
+
+|===========================================================
+|name |type |mode |uid |gid |major |minor |start |inc |count
+|===========================================================
+
+There is a few non-trivial blocks here:
+
+- +name+ is the path to the file you want to create/modify
+- +type+ is the type of the file, being one of :
+  * f: a regular file
+  * d: a directory
+  * c: a character device file
+  * b: a block device file
+  * p: a named pipe
+- +mode+, +uid+ and +gid+ are the usual permissions stuff
+- +major+ and +minor+ are here for device files
+- +start+, +inc+ and +count+ are when you want to create a whole batch
+  of files, and can be reduced to a loop, beginning at +start+,
+  incrementing its counter by +inc+ until it reaches +count+
+
+Let's say you want to change the permissions of a given file, using
+this syntax, you will need to put:
+-------------------------------------------------------------------
+/usr/bin/foobar	f	644	0	0	-	-	-	-	-
+-------------------------------------------------------------------
+
+On the other hand, if you want to create the device file +/dev/hda+
+and the corresponding 15 files for the partitions, you will need for
++/dev/hda+:
+
+-------------------------------------------------------------------
+/dev/hda	b	640	0	0	3	0	0	0	-
+-------------------------------------------------------------------
+
+and then for device files corresponding to the partitions of
++/dev/hda+, +/dev/hdaX+, +X+ ranging from 1 to 15:
+
+-------------------------------------------------------------------
+/dev/hda	b	640	0	0	3	1	1	1	15
+-------------------------------------------------------------------
+
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 10ce69508f..732b50cbcd 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -30,3 +30,5 @@ include::ccache-support.txt[]
 include::download-location.txt[]
 
 include::adding-packages.txt[]
+
+include::appendix.txt[]

From 53d2eaaaca78f6c3c14d765a7735d9c8a1f44691 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:41 -0300
Subject: [PATCH 1464/6849] qemu/ppc-g3beige: update readme and use kernel
 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../powerpc-g3beige/{linux-3.1.config => linux-3.2.config}    | 0
 board/qemu/powerpc-g3beige/readme.txt                         | 2 +-
 configs/qemu_ppc_g3beige_defconfig                            | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-3.1.config b/board/qemu/powerpc-g3beige/linux-3.2.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.1.config
rename to board/qemu/powerpc-g3beige/linux-3.2.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index 1006af9aac..a481b11dda 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:
 
-  qemu-system-ppc -M g3beige -kernel vmlinux -hda rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index cf875f0a4a..432a74617b 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 0e954d1765bdb5f4d156b46e6d5925ebffb0b37b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:42 -0300
Subject: [PATCH 1465/6849] qemu/arm-versatile: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 17aa833c0d..fdc2e72b66 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 820da7ce598a9925a5bfba7215d61f54adbc15b1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:43 -0300
Subject: [PATCH 1466/6849] qemu/x86: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 314b124cb6..d20850a7f3 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -13,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config"

From 8802291b959b2b854d7ca355d2e359d3531a2fc8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:44 -0300
Subject: [PATCH 1467/6849] qemu/x86_64: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index cf3c0e1cfa..6da334c780 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -12,6 +12,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.2.config"

From 93861aafd61dbf107ce4ceeea0ccc311917b7b17 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:45 -0300
Subject: [PATCH 1468/6849] qemu/mips-malta: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mips_malta_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index d6ab8410cc..db94790755 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 53238716fcc33b3923b81e23184020503766a510 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:46 -0300
Subject: [PATCH 1469/6849] qemu/mipsel-malta: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mipsel_malta_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index a46f886c2c..0ccd4e6ab9 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 03227980a71a2766d8db729a843b2b4f16a58e51 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:47 -0300
Subject: [PATCH 1470/6849] qemu/sparc-ss10: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 834514f45f..6d69379166 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -9,6 +9,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 2d7baf62728d63d4eec0c52034e9f1b38e9efd2e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:48 -0300
Subject: [PATCH 1471/6849] qemu/sh4-r2d: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index a35e2fa8a7..8794b181d4 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -18,7 +18,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 25d88d92814aae41c97a95e5c6be1373125b4f7e Mon Sep 17 00:00:00 2001
From: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Date: Thu, 16 Feb 2012 00:38:00 -0200
Subject: [PATCH 1472/6849] linux-firmware: add support for the atheros ar9271
 firmware

Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 9 +++++++++
 package/linux-firmware/linux-firmware.mk | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 9ce1a75d85..b15896ca5a 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -8,6 +8,15 @@ config BR2_PACKAGE_LINUX_FIRMWARE
 
 if BR2_PACKAGE_LINUX_FIRMWARE
 
+menu "Atheros"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
+	bool "Atheros 9271"
+	help
+	  Firmware files for the Atheros 9271 module
+
+endmenu
+
 menu "Ralink"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index d5987ab6c5..eedef2f786 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -21,6 +21,10 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \
 	rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin 	\
 	LICENCE.ralink-firmware.txt
 
+# ar9271
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271) += \
+	LICENCE.atheros_firmware ar9271.fw
+
 # wl127x
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
 	ti-connectivity/wl1271-fw-2.bin				\

From eb8fad28055b94906e0690f4ae789fbd30bafd17 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 17 Feb 2012 17:12:48 +0100
Subject: [PATCH 1473/6849] Print a message before executing the post-build
 script

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 8a8b6760cb..d5cd8f03d7 100644
--- a/Makefile
+++ b/Makefile
@@ -486,6 +486,7 @@ endif
 	) >  $(TARGET_DIR)/etc/os-release
 
 ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
+	@$(call MESSAGE,"Executing post-build script")
 	$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
 endif
 

From 3175e72e054a9b088903cf625a66ccfe9fd4404e Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Fri, 17 Feb 2012 10:39:03 -0300
Subject: [PATCH 1474/6849] Avoid the warnings about the redefinition of
 LUA_USE_DLOPEN, when BR2_PACKAGE_LUA_INTERPRETER_READLINE is set

See src/luaconf.h lines 36-40

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/lua.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 1dabedf465..30e95b4575 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -9,7 +9,7 @@ LUA_SITE = http://www.lua.org/ftp
 LUA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
-	LUA_MYCFLAGS += -fPIC -DLUA_USE_DLOPEN
+	LUA_MYCFLAGS += -fPIC
 	LUA_MYLIBS += -ldl
 endif
 
@@ -18,7 +18,7 @@ ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
 	LUA_MYLIBS += -lreadline -lhistory -lncurses
 	LUA_MYCFLAGS += -DLUA_USE_LINUX
 else
-	LUA_MYCFLAGS += -DLUA_USE_POSIX
+	LUA_MYCFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 endif
 
 HOST_LUA_DEPENDENCIES =

From 3d6ff4f5271f6b5c139ffd226b6ab6c90d2a81aa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 19 Feb 2012 23:16:50 +0100
Subject: [PATCH 1475/6849] Update for 2012.02-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 15 ++++++++++++++-
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 15 ++++++++++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 21de451718..b2f8d7a2fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,17 @@
-2012.02-rc1: Released February 12th, 2012:
+2012.02-rc2, Released February 19th, 2012:
+
+	Fixes all over the tree.
+
+	Toolchain: uClibc: Added upstream post-0.9.33 fixes, Bump
+	linux-headers 3.0.x / 3.2.x stable versions.
+
+	Documentation: Added makedev / <pkg>_DEVICES /
+	<pkg>_PERMISSIONS documentation.
+
+	Updated/fixed packages: busybox, ffmpeg, gst-dsp, libecore,
+	libvncserver, mxml, python.
+
+2012.02-rc1, Released February 12th, 2012:
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 7d8dd2ed2e..428084b38b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.02-rc1
+export BR2_VERSION:=2012.02-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 3e43cdf139..ae6a261de6 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2011.11.tar.bz2">buildroot-2011.11.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2012.02-rc1</b>, which can be
+The latest release candidate is <b>2012.02-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.02-rc1.tar.gz">buildroot-2012.02-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2012.02-rc2.tar.gz">buildroot-2012.02-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.02-rc1.tar.bz2">buildroot-2012.02-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.02-rc2.tar.bz2">buildroot-2012.02-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 9b50a550f1..4871245f40 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,7 +5,20 @@ <h3>News</h3>
 <p>
 
 <ul>
-  <li><b>12 December 2012 -- 2012.02-rc1 released</b>
+  <li><b>19 February 2012 -- 2012.02-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.02_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.02-rc2.tar.bz2">2012.02-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>12 February 2012 -- 2012.02-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a

From 457d9c592f1f5c605041e81ced6848b68bf05406 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 23 Feb 2012 23:19:53 +0100
Subject: [PATCH 1476/6849] libarchive: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libarchive/libarchive.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 53b3676415..c9e5d07bb0 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -3,7 +3,7 @@
 # libarchive (reusable C library for archive formats)
 #
 #############################################################
-LIBARCHIVE_VERSION = 2.8.4
+LIBARCHIVE_VERSION = 2.8.5
 LIBARCHIVE_SITE = http://libarchive.googlecode.com/files/
 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz
 LIBARCHIVE_INSTALL_STAGING = YES

From 086bdfd378a0eeb85fc18fa7c05fdff64d1a3bea Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 24 Feb 2012 14:11:16 +0100
Subject: [PATCH 1477/6849] dropbear: bump version, fixes CVE-2012-0920

From the release notes:

Security: Fix use-after-free bug that could be triggered if command="..."
authorized_keys restrictions are used.  Could allow arbitrary code
execution or bypass of the command="..." restriction to an authenticated
user.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dropbear/dropbear-2011.54-no-ipv6.patch    | 18 ------------------
 package/dropbear/dropbear.mk                   |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 package/dropbear/dropbear-2011.54-no-ipv6.patch

diff --git a/package/dropbear/dropbear-2011.54-no-ipv6.patch b/package/dropbear/dropbear-2011.54-no-ipv6.patch
deleted file mode 100644
index 4ee9aaa660..0000000000
--- a/package/dropbear/dropbear-2011.54-no-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Check for IPV6_TCLASS instead of IPPROTO_IPV6 since
-it's present on non-IPv6 enabled toolchains too.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-
-diff -Nura dropbear-2011.54.orig/dbutil.c dropbear-2011.54/dbutil.c
---- dropbear-2011.54.orig/dbutil.c	2011-11-08 09:48:15.000000000 -0300
-+++ dropbear-2011.54/dbutil.c	2011-11-09 12:14:59.430074138 -0300
-@@ -164,7 +164,7 @@
- 	/* set the TOS bit for either ipv4 or ipv6 */
- #ifdef IPTOS_LOWDELAY
- 	val = IPTOS_LOWDELAY;
--#ifdef IPPROTO_IPV6
-+#ifdef IPV6_TCLASS
- 	setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
- #endif
- 	setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 5fa50bafa2..fea96d6aa5 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DROPBEAR_VERSION = 2011.54
+DROPBEAR_VERSION = 2012.55
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \

From bba4bdfc5354582f335dbb17faa30403f0499ea1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 24 Feb 2012 14:36:49 +0100
Subject: [PATCH 1478/6849] kernel-headers: bump 3.0.x / 3.2.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.21-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.22-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 86d6c3242c..60cebbed57 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.21"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.22"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.6"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.7"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.21-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.22-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.21-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.22-headers_install-fix-__packed-in-exported-kernel-head.patch

From dcb7f907a99e628548f810d03e158918a12fee28 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 22 Feb 2012 10:23:33 -0300
Subject: [PATCH 1479/6849] libpng: security bump to version 1.4.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpng/libpng.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index f78b61d874..4017871daf 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,7 +3,8 @@
 # libpng (Portable Network Graphic library)
 #
 #############################################################
-LIBPNG_VERSION = 1.4.8
+
+LIBPNG_VERSION = 1.4.9
 LIBPNG_SERIES = 14
 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2

From bf6a6e441a8a924ba25298cbff6d20665403c0c3 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Wed, 22 Feb 2012 14:47:57 +0100
Subject: [PATCH 1480/6849] sdl_net: bump version, fix tarball name

Bump version & cleanup variables setting while we are at it.

Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_net/sdl_net.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index bc99f6ce53..4992b8c504 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -3,8 +3,9 @@
 # SDL_net: network addon for SDL
 #
 #############################################################
-SDL_NET_VERSION:=1.2.7
-SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release
+SDL_NET_VERSION = 1.2.8
+SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
+SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
 
 SDL_NET_CONF_OPT = --localstatedir=/var \
 		--with-sdl-prefix=$(STAGING_DIR)/usr \

From 5ddfc1270324eb4abae18dfa41cbc8269132c4e0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 22 Feb 2012 07:59:01 -0300
Subject: [PATCH 1481/6849] ffmpeg: security bump to version 0.8.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index bed37287af..92eb14f775 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FFMPEG_VERSION = 0.8.8
+FFMPEG_VERSION = 0.8.10
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From 24bc2ff8c1d55b13b11faa110dabfb45f73083da Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 25 Feb 2012 22:52:02 +0100
Subject: [PATCH 1482/6849] qt: bump version

Webkit support runs pkg-config at build time, so we need to ensure our
version gets picked up.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qt-4.7.4-pthread_getattr_np_webkit.patch  | 68 -------------------
 ...7.4-configure.patch => qt-configure.patch} |  0
 ...r_np.patch => qt-pthread_getattr_np.patch} |  0
 ...ui.patch => qt-script-qtdbus-no-gui.patch} |  0
 package/qt/qt.mk                              | 14 ++--
 5 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch
 rename package/qt/{qt-4.7.4-configure.patch => qt-configure.patch} (100%)
 rename package/qt/{qt-4.7.4-pthread_getattr_np.patch => qt-pthread_getattr_np.patch} (100%)
 rename package/qt/{qt-4.7.4-script-qtdbus-no-gui.patch => qt-script-qtdbus-no-gui.patch} (100%)

diff --git a/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch
deleted file mode 100644
index 934c332f47..0000000000
--- a/package/qt/qt-4.7.4-pthread_getattr_np_webkit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-09-10 11:05:22.000000000 +0200
-+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-11-15 16:39:53.000000000 +0100
-@@ -70,6 +70,19 @@
- #endif
- #include <unistd.h>
-
-+#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.32 with linuxthreads.old and below do not have
-+// pthread_getattr_np or pthread_attr_getstack.
-+#if __UCLIBC_MAJOR__ == 0 && \
-+    (__UCLIBC_MINOR__ < 9 || \
-+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \
-+    defined(__LINUXTHREADS_OLD__)
-+#define UCLIBC_USE_PROC_SELF_MAPS 1
-+#include <stdio_ext.h>
-+extern int* __libc_stack_end;
-+#endif
-+#endif
-+
- #if OS(SOLARIS)
- #include <thread.h>
- #else
-@@ -580,6 +592,37 @@
-     get_thread_info(find_thread(NULL), &threadInfo);
-     return threadInfo.stack_end;
- #elif OS(UNIX)
-+#ifdef UCLIBC_USE_PROC_SELF_MAPS
-+    // Read /proc/self/maps and locate the line whose address
-+    // range contains __libc_stack_end.
-+    FILE* file = fopen("/proc/self/maps", "r");
-+    if (!file)
-+        return 0;
-+    __fsetlocking(file, FSETLOCKING_BYCALLER);
-+    char* line = 0;
-+    size_t lineLen = 0;
-+    while (!feof_unlocked(file)) {
-+        if (getdelim(&line, &lineLen, '\n', file) <= 0)
-+            break;
-+
-+        long from;
-+        long to;
-+        if (sscanf (line, "%lx-%lx", &from, &to) != 2)
-+            continue;
-+        if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
-+            fclose(file);
-+            free(line);
-+#ifdef _STACK_GROWS_UP
-+            return (void *)from;
-+#else
-+            return (void *)to;
-+#endif
-+        }
-+    }
-+    fclose(file);
-+    free(line);
-+    return 0;
-+#else
-     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
-     MutexLocker locker(mutex);
-     static void* stackBase = 0;
-@@ -603,6 +646,7 @@
-         stackThread = thread;
-     }
-     return static_cast<char*>(stackBase) + stackSize;
-+#endif
- #elif OS(WINCE)
-     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
-     MutexLocker locker(mutex);
diff --git a/package/qt/qt-4.7.4-configure.patch b/package/qt/qt-configure.patch
similarity index 100%
rename from package/qt/qt-4.7.4-configure.patch
rename to package/qt/qt-configure.patch
diff --git a/package/qt/qt-4.7.4-pthread_getattr_np.patch b/package/qt/qt-pthread_getattr_np.patch
similarity index 100%
rename from package/qt/qt-4.7.4-pthread_getattr_np.patch
rename to package/qt/qt-pthread_getattr_np.patch
diff --git a/package/qt/qt-4.7.4-script-qtdbus-no-gui.patch b/package/qt/qt-script-qtdbus-no-gui.patch
similarity index 100%
rename from package/qt/qt-4.7.4-script-qtdbus-no-gui.patch
rename to package/qt/qt-script-qtdbus-no-gui.patch
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 34f05f9253..fe85daebff 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION = 4.7.4
+QT_VERSION = 4.8.0
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://get.qt.nokia.com/qt/source
 QT_DEPENDENCIES = host-pkg-config
@@ -59,7 +59,10 @@ endif
 
 # ensure glib is built first if enabled for Qt's glib support
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+QT_CONFIGURE_OPTS += -glib
 QT_DEPENDENCIES += libglib2
+else
+QT_CONFIGURE_OPTS += -no-glib
 endif
 
 
@@ -222,9 +225,7 @@ ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
 QT_CONFIGURE_OPTS += -no-gui
 endif
 
-ifeq ($(BR2_PACKAGE_QT_GIF),y)
-QT_CONFIGURE_OPTS += -qt-gif
-else
+ifneq ($(BR2_PACKAGE_QT_GIF),y)
 QT_CONFIGURE_OPTS += -no-gif
 endif
 
@@ -490,9 +491,6 @@ define QT_CONFIGURE_CMDS
 		$(if $(VERBOSE),-verbose,-silent) \
 		-force-pkg-config \
 		$(QT_CONFIGURE_OPTS) \
-		-no-gfx-qnx \
-		-no-kbd-qnx \
-		-no-mouse-qnx \
 		-no-xinerama \
 		-no-cups \
 		-no-nis \
@@ -507,7 +505,7 @@ define QT_CONFIGURE_CMDS
 endef
 
 define QT_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 

From ed7791e2e8cdade564a5f484cdfe62ffe16cb981 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 25 Feb 2012 23:18:03 +0100
Subject: [PATCH 1483/6849] Makefile: move cmake toolchain file to
 $HOST_DIR/usr/share/buildroot

To make it part of the SDK installation.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                  | 5 +++--
 package/Makefile.cmake.in | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d5cd8f03d7..9a07f9f798 100644
--- a/Makefile
+++ b/Makefile
@@ -368,7 +368,7 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
-$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake
+$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
 
 $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
 	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
@@ -377,7 +377,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
 world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 
-$(O)/toolchainfile.cmake:
+$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
+	mkdir -p $(@D)
 	@echo -en "\
 	set(CMAKE_SYSTEM_NAME Linux)\n\
 	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in
index 38e459b80c..aea1185196 100644
--- a/package/Makefile.cmake.in
+++ b/package/Makefile.cmake.in
@@ -72,7 +72,7 @@ define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
 	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
-		-DCMAKE_TOOLCHAIN_FILE="$$(BASE_DIR)/toolchainfile.cmake" \
+		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		$$($$(PKG)_CONF_OPT) \
 	)

From 261cb20a08e9dddb047381aa059c7f9e351e6109 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 Feb 2012 08:24:23 +0100
Subject: [PATCH 1484/6849] Makefile.cmake.in: fix automatic host deps
 calculation

We need similar handling as in autotools because of the host-cmake addition.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.cmake.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/Makefile.cmake.in b/package/Makefile.cmake.in
index 38e459b80c..4a4ad6e2d4 100644
--- a/package/Makefile.cmake.in
+++ b/package/Makefile.cmake.in
@@ -96,6 +96,10 @@ endef
 endif
 endif
 
+# This must be repeated from GENTARGETS_INNER, otherwise we only get
+# host-cmake in _DEPENDENCIES because of the following line
+$(2)_DEPENDENCIES ?= $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
+
 $(2)_DEPENDENCIES += host-cmake
 
 #

From 8661ae32ad14c68f763e4311aad19b3b81177eb4 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Sat, 11 Feb 2012 17:41:09 +0100
Subject: [PATCH 1485/6849] pkg-stats: update list of packages to be skipped

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 822827455c..06d9d0de93 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -78,7 +78,7 @@ cnt=0
 for i in $(find package/ -name '*.mk') ; do
 
     if test \
-	$i = "package/java/java.mk" -o \
+	$i = "package/efl/efl.mk" -o \
 	$i = "package/games/games.mk" -o \
 	$i = "package/gtk2-themes/gtk2-themes.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \

From 0a19eea3ec5e4fe9324033958132b93c179d8349 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 Feb 2012 20:52:26 +0100
Subject: [PATCH 1486/6849] customize: deprecate package

As described in the buildroot dev day report, using a post-build script
is nowadays the preferred way of adding stuff to the rootfs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/customize/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/customize/Config.in b/package/customize/Config.in
index 97f864668e..8f8aaa21b8 100644
--- a/package/customize/Config.in
+++ b/package/customize/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CUSTOMIZE
 	bool "customize"
+	depends on BR2_DEPRECATED
 	help
 	  Add custom stuff to your buildroot.
 

From a2befc3a380c5fd41441a4370ea22a7bfd4c109d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:42 -0300
Subject: [PATCH 1487/6849] qemu/arm-versatile: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 17aa833c0d..fdc2e72b66 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 3f1832f674a94d124ef8c1794d255d120953d85a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:43 -0300
Subject: [PATCH 1488/6849] qemu/x86: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 314b124cb6..d20850a7f3 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -13,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config"

From 066a388c6b60ddfe701ecbaff396718158237aba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:44 -0300
Subject: [PATCH 1489/6849] qemu/x86_64: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index cf3c0e1cfa..6da334c780 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -12,6 +12,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.2.config"

From c24c2c629ce51db8a6a39a48db8dfca04ebde756 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:45 -0300
Subject: [PATCH 1490/6849] qemu/mips-malta: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mips_malta_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index d6ab8410cc..db94790755 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 717ce1a949fa7b2c050c0feb45941329147753cd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:46 -0300
Subject: [PATCH 1491/6849] qemu/mipsel-malta: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mipsel_malta_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index a46f886c2c..0ccd4e6ab9 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 8eb5dcf34b9c5d90b6d078e09cb7998fbfe98298 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:47 -0300
Subject: [PATCH 1492/6849] qemu/sparc-ss10: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 834514f45f..6d69379166 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -9,6 +9,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From c5b15fe4f9bc7451447cdb19cc84c1dc38642985 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:48 -0300
Subject: [PATCH 1493/6849] qemu/sh4-r2d: update to use kernel 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index a35e2fa8a7..8794b181d4 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -18,7 +18,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From fbfda06cb9d9aa1708915ec4148d08a0ca36cbc2 Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael.luceno@gmail.com>
Date: Sun, 26 Feb 2012 10:13:06 -0200
Subject: [PATCH 1494/6849] qt: simplify arch handling

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index fe85daebff..68f93483ce 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -199,9 +199,7 @@ else
 QT_CONFIGURE_OPTS += -big-endian
 endif
 
-ifeq ($(BR2_arm),y)
-QT_EMB_PLATFORM = arm
-else ifeq ($(BR2_armeb),y)
+ifeq ($(BR2_arm)$(BR2_armeb),y)
 QT_EMB_PLATFORM = arm
 else ifeq ($(BR2_avr32),y)
 QT_EMB_PLATFORM = avr32
@@ -209,9 +207,7 @@ else ifeq ($(BR2_i386),y)
 QT_EMB_PLATFORM = x86
 else ifeq ($(BR2_x86_64),y)
 QT_EMB_PLATFORM = x86_64
-else ifeq ($(BR2_mips),y)
-QT_EMB_PLATFORM = mips
-else ifeq ($(BR2_mipsel),y)
+else ifeq ($(BR2_mips)$(BR2_mipsel),y)
 QT_EMB_PLATFORM = mips
 else ifeq ($(BR2_powerpc),y)
 QT_EMB_PLATFORM = powerpc

From 974a0da6e1bf73c5091d21f1e89e08974b078432 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 Feb 2012 22:23:45 +0100
Subject: [PATCH 1495/6849] qt: fix build with gcc 4.6.x on arm

As noted by Ismael Luceno. For details, see:
http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 68f93483ce..776eb63afb 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -201,6 +201,11 @@ endif
 
 ifeq ($(BR2_arm)$(BR2_armeb),y)
 QT_EMB_PLATFORM = arm
+ifeq ($(BR2_GCC_VERSION_4_6_X),y)
+# workaround for gcc issue
+# http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html
+QT_CXXFLAGS += -fno-strict-volatile-bitfields
+endif
 else ifeq ($(BR2_avr32),y)
 QT_EMB_PLATFORM = avr32
 else ifeq ($(BR2_i386),y)

From 73662a63c662fcefec09533fe03ba28d44dd114e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 18 Feb 2012 16:30:41 -0300
Subject: [PATCH 1496/6849] qemu/ppc-g3beige: update readme and use kernel
 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../powerpc-g3beige/{linux-3.1.config => linux-3.2.config}    | 0
 board/qemu/powerpc-g3beige/readme.txt                         | 2 +-
 configs/qemu_ppc_g3beige_defconfig                            | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-3.1.config => linux-3.2.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-3.1.config b/board/qemu/powerpc-g3beige/linux-3.2.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.1.config
rename to board/qemu/powerpc-g3beige/linux-3.2.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index 1006af9aac..a481b11dda 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:
 
-  qemu-system-ppc -M g3beige -kernel vmlinux -hda rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index cf875f0a4a..432a74617b 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.1.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.2.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 4280c150393d03350d94f7d7457aad6fb9bc49de Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 27 Feb 2012 10:48:56 +0100
Subject: [PATCH 1497/6849] uClibc: rename 0.9.33 syscall_ncs patch

No need for double dashes - Purely cosmetical.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ....9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename toolchain/uClibc/{uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch => uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch} (100%)

diff --git a/toolchain/uClibc/uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch b/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33--Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
rename to toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch

From 7e4936dfa4c3d2c3192c6c69e9b51f1d4a646fa8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 27 Feb 2012 16:32:28 +0100
Subject: [PATCH 1498/6849] vala: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 52a85102cb..a3ad037766 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 VALA_VERSION_MAJOR = 0.15
-VALA_VERSION_MINOR = 1
+VALA_VERSION_MINOR = 2
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz

From 6d24b41b097df67f73afc52babe8c454ebb30710 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 27 Feb 2012 16:29:50 +0100
Subject: [PATCH 1499/6849] Update for 2012.02-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 15 +++++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index b2f8d7a2fe..fbb8c07d3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+2012.02-rc3, Released February 27th, 2012:
+
+	Fixes all over the tree.
+
+	Automatic host dependencies handling for cmake packages
+	fixed. Customize package deprecated as using a post-build
+	script is nowadays the preferred way of adding extra stuff to
+	the rootfs.
+
+	Linux-headers 3.0.x / 3.2.x stable version bumped.
+
+	QEMU defconfigs updated to 3.2.x kernels and readme fixed.
+
+	Updated/fixed packages: dropbear, ffmpeg, libpng
+
 2012.02-rc2, Released February 19th, 2012:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 428084b38b..5e2d381c03 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.02-rc2
+export BR2_VERSION:=2012.02-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index ae6a261de6..672e11450a 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2011.11.tar.bz2">buildroot-2011.11.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2012.02-rc2</b>, which can be
+The latest release candidate is <b>2012.02-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.02-rc2.tar.gz">buildroot-2012.02-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2012.02-rc3.tar.gz">buildroot-2012.02-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.02-rc2.tar.bz2">buildroot-2012.02-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.02-rc3.tar.bz2">buildroot-2012.02-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 4871245f40..5fcbdd43ba 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>27 February 2012 -- 2012.02-rc3 released</b>
+
+    <p>RC3 is out with more bugfixes - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.02_rc3">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.02-rc3.tar.bz2">2012.02-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>19 February 2012 -- 2012.02-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From 328fc5747279ff00fcc619d1eda81bf139f3221c Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 27 Feb 2012 13:38:54 +0100
Subject: [PATCH 1500/6849] gamin: fix compilation with glib 2.30

G_CONST_RETURN is deprecated in glib 2.30 so remove occurences
to avoid build failures.

Patch taken from http://patches.openembedded.org/patch/13079/

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gamin/gamin-0.1.10-no-const-return.patch  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 package/gamin/gamin-0.1.10-no-const-return.patch

diff --git a/package/gamin/gamin-0.1.10-no-const-return.patch b/package/gamin/gamin-0.1.10-no-const-return.patch
new file mode 100644
index 0000000000..3e6e905214
--- /dev/null
+++ b/package/gamin/gamin-0.1.10-no-const-return.patch
@@ -0,0 +1,57 @@
+G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
+build failures.
+
+Upstream-Status: Pending
+
+Index: gamin-0.1.10/server/gam_node.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_node.c	2011-10-12 15:25:45.217178314 +0100
++++ gamin-0.1.10/server/gam_node.c	2011-10-12 15:26:17.807178293 +0100
+@@ -122,7 +122,7 @@
+  * it has finished with the string.  If it must keep it longer, it
+  * should makes its own copy.  The returned string must not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+     g_assert(node);
+Index: gamin-0.1.10/server/gam_node.h
+===================================================================
+--- gamin-0.1.10.orig/server/gam_node.h	2011-10-12 15:25:46.857178269 +0100
++++ gamin-0.1.10/server/gam_node.h	2011-10-12 15:26:28.637178297 +0100
+@@ -58,7 +58,7 @@
+ void                  gam_node_set_is_dir          (GamNode         *node,
+ 						   gboolean        is_dir);
+ 	
+-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
++const char  *gam_node_get_path            (GamNode         *node);
+ 
+ GList                *gam_node_get_subscriptions   (GamNode         *node);
+ 
+Index: gamin-0.1.10/server/gam_subscription.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_subscription.c	2011-10-12 15:25:40.497177525 +0100
++++ gamin-0.1.10/server/gam_subscription.c	2011-10-12 15:26:39.867178304 +0100
+@@ -141,7 +141,7 @@
+  * @param sub the GamSubscription
+  * @returns The path being monitored.  It should not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+     if (sub == NULL)
+Index: gamin-0.1.10/server/gam_subscription.h
+===================================================================
+--- gamin-0.1.10.orig/server/gam_subscription.h	2011-10-12 15:25:28.507178266 +0100
++++ gamin-0.1.10/server/gam_subscription.h	2011-10-12 15:25:58.817178285 +0100
+@@ -21,7 +21,7 @@
+ 
+ int                  gam_subscription_get_reqno    (GamSubscription *sub);
+ 
+-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
++const char *gam_subscription_get_path     (GamSubscription *sub);
+ 
+ GamListener         *gam_subscription_get_listener (GamSubscription *sub);
+ 

From 4fd8bdc7da9e69d7c7515f1577de3e5c427dde89 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 27 Feb 2012 13:38:55 +0100
Subject: [PATCH 1501/6849] libglib2: update to version 2.30.2

Update to latest stable release and add a dependency on libffi which
is needed by GObject.

[Peter: fixup build on uClibc]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/Config.in                    |  1 +
 ...x-compilation-with-no-builtin-atomic.patch | 25 -------------------
 package/libglib2/libglib2.mk                  | 16 ++++++------
 3 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 3d42430735..d1d7231b00 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBFFI
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_USE_WCHAR # gettext
 	help
diff --git a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch b/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch
deleted file mode 100644
index 39c0510781..0000000000
--- a/package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <llandwerlin@gmail.com>
-Date: Sat, 6 Nov 2010 14:56:15 +0100
-Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers
-
-Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
----
- glib/gatomic.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/glib/gatomic.c b/glib/gatomic.c
-index 845c866..01468ce 100644
---- a/glib/gatomic.c
-+++ b/glib/gatomic.c
-@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi
- #endif /* DEFINE_WITH_WIN32_INTERLOCKED */
- 
- #ifdef DEFINE_WITH_MUTEXES
-+# include "gthread.h"
- /* We have to use the slow, but safe locking method */
- static GMutex *g_atomic_mutex; 
- 
--- 
-1.7.2.3
-
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 0832ac335e..d0d9c5c2ec 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,8 +3,8 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.28
-LIBGLIB2_VERSION_MINOR = 8
+LIBGLIB2_VERSION_MAJOR = 2.30
+LIBGLIB2_VERSION_MINOR = 2
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
@@ -13,7 +13,7 @@ LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
-LIBGLIB2_CONF_ENV =	\
+LIBGLIB2_CONF_ENV = \
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
 		ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
@@ -41,24 +41,24 @@ LIBGLIB2_CONF_ENV =	\
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
-		ac_cv_func_posix_getgrgid_r=no \
+		ac_cv_func_posix_getgrgid_r=no glib_cv_have_qsort_r=yes \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
 
-LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
-HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib
+HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
-LIBGLIB2_DEPENDENCIES+=libiconv
+LIBGLIB2_DEPENDENCIES += libiconv
 endif
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 LIBGLIB2_CONF_OPT += --with-libiconv=gnu
-LIBGLIB2_DEPENDENCIES+=libiconv
+LIBGLIB2_DEPENDENCIES += libiconv
 endif
 
 define LIBGLIB2_REMOVE_DEV_FILES

From 01ffa2e8684d2a3114469cc423e6ee992fd71599 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 27 Feb 2012 13:38:56 +0100
Subject: [PATCH 1502/6849] glib-networking: new package

glib-networking provides network-related GIO modules for glib.
It is used by newer versions of libsoup to implement SSL/TLS
support.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/glib-networking/Config.in          | 11 +++++++++++
 package/glib-networking/glib-networking.mk | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/glib-networking/Config.in
 create mode 100644 package/glib-networking/glib-networking.mk

diff --git a/package/Config.in b/package/Config.in
index 8a7c9c4a5a..41cbb8c1a0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -344,6 +344,7 @@ source "package/jsmin/Config.in"
 endmenu
 
 menu "Networking"
+source "package/glib-networking/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
 source "package/libcurl/Config.in"
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
new file mode 100644
index 0000000000..16f0d4a22f
--- /dev/null
+++ b/package/glib-networking/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_GLIB_NETWORKING
+	bool "glib-networking"
+	depends on BR2_USE_WCHAR # glib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+	help
+	  Network-related GIO modules for glib.
+
+comment "glib-networking requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
new file mode 100644
index 0000000000..b1ad621101
--- /dev/null
+++ b/package/glib-networking/glib-networking.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# glib-networking
+#
+#############################################################
+
+GLIB_NETWORKING_MAJOR_VERSION = 2.30
+GLIB_NETWORLING_MINOR_VERSION = 2
+GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORLING_MINOR_VERSION)
+GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION)
+GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
+
+GLIB_NETWORKING_INSTALL_STAGING = YES
+
+GLIB_NETWORKING_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2
+
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+GLIB_NETWORKING_DEPENDENCIES += gnutls
+GLIB_NETWORKING_CONF_OPT = --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+endif
+
+$(eval $(call AUTOTARGETS))

From 8d485749e136ed43b5f1129dee08b7e4200182fa Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 27 Feb 2012 13:38:57 +0100
Subject: [PATCH 1503/6849] libsoup: update to version 2.36.1

Update to latest stable release. SSL support now depends on
glib-networking with gnutls support instead of using gnutls
directly.

Remove libsoup-CVE-2011-2054.patch, this is fixed upstream.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoup/Config.in                   |  1 +
 package/libsoup/libsoup-CVE-2011-2054.patch | 32 ---------------------
 package/libsoup/libsoup.mk                  | 19 ++++++------
 3 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 package/libsoup/libsoup-CVE-2011-2054.patch

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 347687cfef..eee6adecc3 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBSOUP
 
 config BR2_PACKAGE_LIBSOUP_SSL
 	bool "https support"
+	select BR2_PACKAGE_GLIB_NETWORKING
 	select BR2_PACKAGE_GNUTLS
 	depends on BR2_PACKAGE_LIBSOUP
 	help
diff --git a/package/libsoup/libsoup-CVE-2011-2054.patch b/package/libsoup/libsoup-CVE-2011-2054.patch
deleted file mode 100644
index 0dc5eccf9d..0000000000
--- a/package/libsoup/libsoup-CVE-2011-2054.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4617b6ef6dd21931a0153070c5b5ff7ef21b46f8 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Wed, 29 Jun 2011 10:04:06 -0400
-Subject: [PATCH] SoupServer: fix to not allow smuggling ".." into path
-
-When SoupServer:raw-paths was set (the default), it was possible to
-sneak ".." segments into the path passed to the SoupServerHandler,
-which could then end up tricking some handlers into retrieving
-arbitrary files from the filesystem. Fix that.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=653258
-
-diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
-index d56efd1..7225337 100644
---- a/libsoup/soup-server.c
-+++ b/libsoup/soup-server.c
-@@ -779,6 +779,15 @@ got_headers (SoupMessage *req, SoupClientContext *client)
- 
- 		uri = soup_message_get_uri (req);
- 		decoded_path = soup_uri_decode (uri->path);
-+
-+		if (strstr (decoded_path, "/../") ||
-+		    g_str_has_suffix (decoded_path, "/..")) {
-+			/* Introducing new ".." segments is not allowed */
-+			g_free (decoded_path);
-+			soup_message_set_status (req, SOUP_STATUS_BAD_REQUEST);
-+			return;
-+		}
-+
- 		soup_uri_set_path (uri, decoded_path);
- 		g_free (decoded_path);
- 	}
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 147b220a29..6572585061 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 
-LIBSOUP_MAJOR_VERSION:=2.32
-LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
-LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
-LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
+LIBSOUP_MAJOR_VERSION = 2.36
+LIBSOUP_MINOR_VERSION = 1
+LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION)
+LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2
+LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
 LIBSOUP_INSTALL_STAGING = YES
 
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
@@ -16,18 +17,14 @@ ifneq ($(BR2_INET_IPV6),y)
 LIBSOUP_CONF_ENV += soup_cv_ipv6=no
 endif
 
-LIBSOUP_CONF_OPT = \
-	--disable-explicit-deps \
-	--disable-glibtest	\
-	--without-gnome
+LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
 LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
-LIBSOUP_DEPENDENCIES += gnutls
-LIBSOUP_CONF_OPT += --enable-ssl --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+LIBSOUP_DEPENDENCIES += glib-networking
 else
-LIBSOUP_CONF_OPT += --disable-ssl
+LIBSOUP_CONF_OPT += --disable-tls-check
 endif
 
 $(eval $(call AUTOTARGETS))

From e8255618956eb8e4ed259d98aa3865510288b182 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 28 Feb 2012 12:22:33 +0100
Subject: [PATCH 1504/6849] e2fsprogs: disable build of e4defrag unless
 explicitly enabled

The e2fsprogs configure script enables the build of the e4defrag
utility by default. Disable it unless BR2_PACKAGE_E2FSPROGS_E4DEFRAG
is selected.

Also the --disable-blkid option is not recognized by the configure
script. Use --disable-libblkid instead.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 912deab6c6..f3d44f6fa8 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -12,9 +12,10 @@ E2FSPROGS_CONF_OPT = \
 	--enable-elf-shlibs \
 	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
 	--disable-uuidd \
-	--disable-blkid \
+	--disable-libblkid \
 	--disable-libuuid \
 	--enable-fsck \
 	--disable-e2initrd-helper \

From 97165f123bd67b8d1a9a0a3bb41f2c4b8475156d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 28 Feb 2012 21:52:03 +0100
Subject: [PATCH 1505/6849] libglib2: fix build with legacy uClibc versions

qsort_r was only added in uClibc 0.9.33, so only enable it when we're sure
it's available. For external/ctng toolchains we cannot easily know, so
simply disable it there.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index d0d9c5c2ec..d2445a148a 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -41,9 +41,16 @@ LIBGLIB2_CONF_ENV = \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
-		ac_cv_func_posix_getgrgid_r=no glib_cv_have_qsort_r=yes \
+		ac_cv_func_posix_getgrgid_r=no \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
+# old uClibc versions don't provide qsort_r
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
+else
+LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
+endif
+
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \

From def11d79227d42976ae7c918f4a0ba44c94a0813 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 Feb 2012 23:35:48 +0100
Subject: [PATCH 1506/6849] libecore: fix build of host-libecore when X11 not
 available

The host-libecore build tries to build the X11 backend. This works if
you have X11 headers/libraries installed on your build machine, but
fails if you don't, and Buildroot shouldn't depend on such things
being installed.

Therefore, we force host-libecore to not build any of the graphical
backends (X, XCB or DirectFB).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index db14356ae6..c76b3ffa2a 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -12,7 +12,13 @@ LIBECORE_INSTALL_STAGING = YES
 LIBECORE_DEPENDENCIES = host-pkg-config libeina
 
 HOST_LIBECORE_DEPENDENCIES = host-pkg-config host-libeina host-libevas
-HOST_LIBECORE_CONF_OPT += --enable-ecore-evas
+HOST_LIBECORE_CONF_OPT += 		\
+	--enable-ecore-evas 		\
+	--disable-simple-x11 		\
+	--disable-ecore-directfb 	\
+	--disable-ecore-x 		\
+	--disable-ecore-x-xcb 		\
+	--disable-ecore-imf-xim
 
 # default options
 LIBECORE_CONF_OPT = --disable-simple-x11

From 03ceab6d1611cf378ac9bec92134354bcdd963d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 29 Feb 2012 23:19:47 +0100
Subject: [PATCH 1507/6849] Update for 2012.02

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  6 +++++-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  9 +++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index fbb8c07d3c..9c1db259f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2012.02, Released February 29th, 2012:
+
+	Updated/fixed packages: libecore
+
 2012.02-rc3, Released February 27th, 2012:
 
 	Fixes all over the tree.
@@ -41,7 +45,7 @@
 	Host utilities menu with commonly used host tools.
 
 	defconfigs: qemu configs for x86-64, mips and sparc, at91
-	defconfigs now use moder U-Boot / mainline Linux, added
+	defconfigs now use modern U-Boot / mainline Linux, added
 	lpc3250 defconfigs.
 
 	uClibc: remove 0.9.30, backport unshare() support, add
diff --git a/Makefile b/Makefile
index 5e2d381c03..c9f0eab150 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.02-rc3
+export BR2_VERSION:=2012.02
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 672e11450a..2802609f1f 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2011.11</b>, which can be downloaded
+The latest stable release is <b>2012.02</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2011.11.tar.gz">buildroot-2011.11.tar.gz</a>
+<a href="/downloads/buildroot-2012.02.tar.gz">buildroot-2012.02.tar.gz</a>
 or
-<a href="/downloads/buildroot-2011.11.tar.bz2">buildroot-2011.11.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2012.02-rc3</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.02-rc3.tar.bz2">buildroot-2012.02-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 5fcbdd43ba..650184a3d4 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>29 February 2012 -- 2012.02 released</b>
+
+    <p>The stable 2012.02 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.02">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.02.tar.bz2">2012.02 release</a>.</p>
+
   <li><b>27 February 2012 -- 2012.02-rc3 released</b>
 
     <p>RC3 is out with more bugfixes - See the <a

From 7182cf9a01814a2a22fed3cd3073a186029052ef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 1 Mar 2012 13:58:40 +0100
Subject: [PATCH 1508/6849] docs/news.html: add 2012.02 announcement mail link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 650184a3d4..26a8ccb267 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>The stable 2012.02 release is out - Thanks to everyone
     contributing and testing the release candidates. See the
     <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.02">CHANGES</a>
-    file for more details,
+    file for more details, read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-February/050752.html">announcement</a>
     and go to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.02.tar.bz2">2012.02 release</a>.</p>
 

From 5c3a337387570911d13e86eadbbc2f846d36fd54 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 1 Mar 2012 14:03:39 +0100
Subject: [PATCH 1509/6849] kickoff 2012.05 development cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 9c1db259f6..6f58d52abd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2012.05, Not released yet:
+
 2012.02, Released February 29th, 2012:
 
 	Updated/fixed packages: libecore
diff --git a/Makefile b/Makefile
index c9f0eab150..02405ddc5a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.02
+export BR2_VERSION:=2012.05-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From 9fc43591447c8c8c61843f1f537660855b6d049b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 1 Mar 2012 14:04:54 +0100
Subject: [PATCH 1510/6849] Update copyright year

We're in 2012 by now.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile           | 2 +-
 docs/copyright.txt | 2 +-
 docs/footer.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 02405ddc5a..bf7a6f4769 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for buildroot2
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2006-2011 by the Buildroot developers <buildroot@uclibc.org>
+# Copyright (C) 2006-2012 by the Buildroot developers <buildroot@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/docs/copyright.txt b/docs/copyright.txt
index 83382f4cfb..3614616dbf 100644
--- a/docs/copyright.txt
+++ b/docs/copyright.txt
@@ -1,6 +1,6 @@
 
 The code and graphics on this website (and it's mirror sites, if any) are
-Copyright (c) 1999-2005 by Erik Andersen, 2006-2011 The Buildroot
+Copyright (c) 1999-2005 by Erik Andersen, 2006-2012 The Buildroot
 developers. All rights reserved.
 
 Documents on this Web site including their graphical elements, design, and
diff --git a/docs/footer.html b/docs/footer.html
index 86e7ffa7b2..2bfcf0aede 100644
--- a/docs/footer.html
+++ b/docs/footer.html
@@ -10,7 +10,7 @@
     <p>
     <font face="arial, helvetica, sans-serif" size="-1">
 	<a HREF="/copyright.txt">Copyright &copy; 1999-2005 Erik Andersen,
-	2006-2011 The Buildroot developers</a>
+	2006-2012 The Buildroot developers</a>
 	<br>
 	Mail all comments, insults, suggestions and bribes to
 	<br>

From dca6e03eac0ec70bb01492e378c694d8dabcedfd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 1 Mar 2012 14:07:29 +0100
Subject: [PATCH 1511/6849] kernel-headers: bump 3.0.x / 3.2.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.22-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.23-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 60cebbed57..2ab0fc82a9 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.22"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.23"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.7"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.9"		if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.22-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.23-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.22-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.23-headers_install-fix-__packed-in-exported-kernel-head.patch

From f3a01cb0870b14776eda509bf3d592f9a8d349a7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 11:42:49 +0100
Subject: [PATCH 1512/6849] Add x86_64 variants to BR2_GCC_TARGET_ARCH

With the Sourcery CodeBench IA32/AMD64 toolchain, the proper -march=
switch must be passed. So, on x86_64, we make sure that
BR2_GCC_TARGET_ARCH gets defined to the correct value, just as we do
on x86.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 417441d211..73cecaf495 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -678,6 +678,11 @@ config BR2_GCC_TARGET_ARCH
 	default athlon-4	if BR2_x86_athlon_4
 	default winchip-c6	if BR2_x86_winchip_c6
 	default winchip2	if BR2_x86_winchip2
+	default nocona		if BR2_x86_64_nocona
+	default core2		if BR2_x86_64_core2
+	default k8		if BR2_x86_64_opteron
+	default k8-sse3		if BR2_x86_64_opteron_sse3
+	default barcelona	if BR2_x86_64_barcelona
 	default c3		if BR2_x86_c3
 	default c3-2		if BR2_x86_c32
 	default geode		if BR2_x86_geode

From b5bebeaebd873af7ca6899ab2b9088d33a429b19 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 11:43:53 +0100
Subject: [PATCH 1513/6849] Add the Atom processor in the list of supported
 x86/x86_64 processors

This allows to easily select the corresponding Atom multilib variant
in the Sourcery CodeBench toolchain.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 73cecaf495..25c6e50083 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -266,6 +266,9 @@ config BR2_x86_nocona
 	bool "nocona"
 config BR2_x86_core2
 	bool "core2"
+config BR2_x86_atom
+	bool "atom"
+comment "atom needs gcc >= 4.5.x"
 config BR2_x86_k6
 	bool "k6"
 config BR2_x86_k6_2
@@ -311,6 +314,9 @@ config BR2_x86_64_nocona
 	bool "nocona"
 config BR2_x86_64_core2
 	bool "core2"
+config BR2_x86_64_atom
+	bool "atom"
+comment "atom needs gcc >= 4.5.x"
 endchoice
 
 choice
@@ -500,6 +506,7 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_pentiumpro
 	default "i686"		if BR2_x86_nocona
 	default "i686"		if BR2_x86_core2
+	default "i686"		if BR2_x86_atom
 	default "i686"		if BR2_x86_opteron
 	default "i686"		if BR2_x86_opteron_sse3
 	default "i686"		if BR2_x86_barcelona
@@ -525,6 +532,7 @@ config BR2_ARCH
 	default "x86_64"	if BR2_x86_64_generic
 	default "x86_64"	if BR2_x86_64_nocona
 	default "x86_64"	if BR2_x86_64_core2
+	default "x86_64"	if BR2_x86_64_atom
 	default "x86_64"	if BR2_x86_64_opteron
 	default "x86_64"	if BR2_x86_64_opteron_sse3
 	default "x86_64"	if BR2_x86_64_barcelona
@@ -554,6 +562,7 @@ config BR2_GCC_TARGET_TUNE
 	default prescott	if BR2_x86_prescott
 	default nocona		if BR2_x86_nocona
 	default core2		if BR2_x86_core2
+	default atom		if BR2_x86_atom
 	default k8		if BR2_x86_opteron
 	default k8-sse3		if BR2_x86_opteron_sse3
 	default barcelona	if BR2_x86_barcelona
@@ -569,6 +578,7 @@ config BR2_GCC_TARGET_TUNE
 	default generic		if BR2_x86_64_generic
 	default nocona		if BR2_x86_64_nocona
 	default core2		if BR2_x86_64_core2
+	default atom		if BR2_x86_64_atom
 	default k8		if BR2_x86_64_opteron
 	default k8-sse3		if BR2_x86_64_opteron_sse3
 	default barcelona	if BR2_x86_64_barcelona
@@ -669,6 +679,7 @@ config BR2_GCC_TARGET_ARCH
 	default prescott	if BR2_x86_prescott
 	default nocona		if BR2_x86_nocona
 	default core2		if BR2_x86_core2
+	default atom		if BR2_x86_atom
 	default k8		if BR2_x86_opteron
 	default k8-sse3		if BR2_x86_opteron_sse3
 	default barcelona	if BR2_x86_barcelona
@@ -680,6 +691,7 @@ config BR2_GCC_TARGET_ARCH
 	default winchip2	if BR2_x86_winchip2
 	default nocona		if BR2_x86_64_nocona
 	default core2		if BR2_x86_64_core2
+	default atom		if BR2_x86_64_atom
 	default k8		if BR2_x86_64_opteron
 	default k8-sse3		if BR2_x86_64_opteron_sse3
 	default barcelona	if BR2_x86_64_barcelona

From 0729b544b3f943f238042d8169ccb8e2f6c88a95 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 11:57:15 +0100
Subject: [PATCH 1514/6849] Improve external toolchain logic to support IA32
 Sourcery CodeBench toolchain

The IA32 Sourcery CodeBench toolchain has a relatively special
structure, with the following multilib variants:

 * Intel Pentium 4, 32 bits, the multilib variant is in ./ relative to
   the main sysroot, with the libraries in the lib/ directory.

 * Intel Xeon Nocona, 64 bits, the multilib variant is in ./ relative
   to the main sysroot, with the libraries in the lib64/ directory.

 * Intel Atom 32 bits, the multilib variant is in atom/ relative to
   the main sysroot, with the libraries in the lib/ directory.

 * Intel Core 2 64 bits, the multilib variant is in core2/ relative to
   the main sysroot, with the libraries in lib64/ directory.

So the first two variants are in the same sysroot, only the name of
the directory for the libraries is different.

Therefore, we introduce a new ARCH_LIB_DIR variable, which contains
either 'lib' or 'lib64'. This variable is defined according to the
location of the libc.a file for the selected multilib variant, and is
then used when copying the libraries to the target and to the staging
directory.

In addition to this, we no longer use the -print-multi-directory to
get the ARCH_SUBDIR, since in the case of the 64 bits variants of this
toolchain, it returns just '64' and not a real path. Instead, we
simply compute the difference between the arch-specific sysroot and
the main sysroot.

We also take that opportunity to expand the documentation on the
meaning of the different variables.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk                     | 19 +++++---
 toolchain/toolchain-external/ext-tool.mk | 57 ++++++++++++++++++------
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 65cc9982d5..4c3f2406ff 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -10,19 +10,22 @@
 # Most toolchains have their libraries either in /lib or /usr/lib
 # relative to their ARCH_SYSROOT_DIR. Buildroot toolchains, however,
 # have basic libraries in /lib, and libstdc++/libgcc_s in
-# /usr/<target-name>/lib(64).
+# /usr/<target-name>/lib(64). Thanks to ARCH_LIB_DIR we also take into
+# account toolchains that have the libraries in lib64 and usr/lib64.
 #
 # $1: arch specific sysroot directory
-# $2: library name
-# $3: destination directory of the libary, relative to $(TARGET_DIR)
+# $2: library directory ('lib' or 'lib64') from which libraries must be copied
+# $3: library name
+# $4: destination directory of the libary, relative to $(TARGET_DIR)
 #
 copy_toolchain_lib_root = \
 	ARCH_SYSROOT_DIR="$(strip $1)"; \
-	LIB="$(strip $2)"; \
-	DESTDIR="$(strip $3)" ; \
+	ARCH_LIB_DIR="$(strip $2)" ; \
+	LIB="$(strip $3)"; \
+	DESTDIR="$(strip $4)" ; \
  \
 	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
-		find -L lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib* \
+		find -L $${ARCH_LIB_DIR} usr/$${ARCH_LIB_DIR} usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \
 			-maxdepth 1 -name "$${LIB}.*" 2>/dev/null \
 		)` ; \
 	for FILE in $${LIBS} ; do \
@@ -84,12 +87,14 @@ copy_toolchain_lib_root = \
 # $1: main sysroot directory of the toolchain
 # $2: arch specific sysroot directory of the toolchain
 # $3: arch specific subdirectory in the sysroot
+# $4: directory of libraries ('lib' or 'lib64')
 #
 copy_toolchain_sysroot = \
 	SYSROOT_DIR="$(strip $1)"; \
 	ARCH_SYSROOT_DIR="$(strip $2)"; \
 	ARCH_SUBDIR="$(strip $3)"; \
-	for i in etc lib sbin usr ; do \
+	ARCH_LIB_DIR="$(strip $4)" ; \
+	for i in etc $${ARCH_LIB_DIR} sbin usr ; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
 			rsync -au --chmod=Du+w --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
 		fi ; \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2ac4973784..eb8ed4f6b5 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -267,10 +267,8 @@ endif
 $(STAMP_DIR)/ext-toolchain-checked:
 	@echo "Checking external toolchain settings"
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
-	$(Q)SYSROOT_DIR=`$(TOOLCHAIN_EXTERNAL_CC) -print-sysroot 2>/dev/null` ; \
-	if test -z "$${SYSROOT_DIR}" ; then \
-		SYSROOT_DIR=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
-	fi ; \
+	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
@@ -292,27 +290,60 @@ $(STAMP_DIR)/ext-toolchain-checked:
 # and the variant-specific sysroot, then copy the needed libraries to
 # the $(TARGET_DIR) and copy the whole sysroot (libraries and headers)
 # to $(STAGING_DIR).
+#
+# Variables are defined as follows:
+#
+#  LIBC_A_LOCATION:     location of the libc.a file in the default
+#                       multilib variant (allows to find the main
+#                       sysroot directory)
+#                       Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/usr/lib/libc.a
+#
+#  SYSROOT_DIR:         the main sysroot directory, deduced from
+#                       LIBC_A_LOCATION by removing the
+#                       usr/lib[64]/libc.a part of the path.
+#                       Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/
+#
+# ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected
+#                       multilib variant (taking into account the
+#                       CFLAGS). Allows to find the sysroot of the
+#                       selected multilib variant.
+#                       Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/libc.a
+#
+# ARCH_SYSROOT_DIR:     the sysroot of the selected multilib variant,
+#                       deduced from ARCH_LIBC_A_LOCATION by removing
+#                       usr/lib[64]/libc.a at the end of the path.
+#                       Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/
+#
+# ARCH_LIB_DIR:         'lib' or 'lib64' depending on where libraries are
+#                       stored. Deduced from ARCH_LIBC_A_LOCATION by
+#                       looking at usr/lib??/libc.a.
+#                       Ex: lib
+#
+# ARCH_SUBDIR:          the relative location of the sysroot of the selected
+#                       multilib variant compared to the main sysroot.
+#			Ex: mips16/soft-float/el
+
 $(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
-	$(Q)SYSROOT_DIR=`$(TOOLCHAIN_EXTERNAL_CC) -print-sysroot 2>/dev/null` ; \
-	if test -z "$${SYSROOT_DIR}" ; then \
-		SYSROOT_DIR=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a) |sed -r -e 's:usr/lib/libc\.a::;'` ; \
-	fi ; \
+	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
-	ARCH_SUBDIR=`$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-multi-directory` ; \
-	ARCH_SYSROOT_DIR=$${SYSROOT_DIR}/$${ARCH_SUBDIR} ; \
+	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
+	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
+	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/libc.a:\1:'` ; \
+	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
 	echo "Copy external toolchain libraries to target..." ; \
 	for libs in $(LIB_EXTERNAL_LIBS); do \
-		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$$libs,/lib); \
+		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
 	done ; \
 	for libs in $(USR_LIB_EXTERNAL_LIBS); do \
-		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$$libs,/usr/lib); \
+		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
 	done ; \
 	echo "Copy external toolchain sysroot to staging..." ; \
-	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR}) ; \
+	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR}) ; \
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
 	fi ; \

From 50ac5f9a573d3918cc5257a30a7c85db7841ac42 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:02:52 +0100
Subject: [PATCH 1515/6849] Support multilib variants in sub-subdirectories

When an external toolchain has multiple variants organized in
sub-directories, Buildroot only copies the selected sysroot and not
all sysroots. In order to make this work, Buildroot creates a symbolic
link of the name of the original selected sysroot to the main sysroot
to trick the compiler so that it finds its libraries at the expected
location.

I.e, if the toolchain as the following organization (example take on
the ARM CodeSourcery toolchain) :

     .	    	for ARMv5T
     armv4  	for ARMv4T
     thumb2 	for ARMv7-A/Thumb

and ARMv4T is selected, then Buildroot will copy the contents of
armv4t/ from the toolchain into its $(STAGING_DIR) and then create a
$(STAGING_DIR)/armv4t symbolic link to $(STAGING_DIR).

However, our logic to do so only works when there was one directory
level for multilib sysroots. But in the MIPS CodeSourcery toolchain
there are multiple levels. For example, the MIPS16 soft-float
little-endian sysroot variant is in mips16/soft-float/el/ compared to
the main sysroot.

This patch improves our logic to support this case. The logic is a bit
more complicated as we don't want to create a symbolic link to an
absolute path, but a symbolic link to a relative path, because we want
the host/ directory to be relocatable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 4c3f2406ff..3f4818f226 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -103,7 +103,14 @@ copy_toolchain_sysroot = \
 		if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
 			cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \
 		fi ; \
-		ln -s . $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
+		mkdir -p `dirname $(STAGING_DIR)/$${ARCH_SUBDIR}` ; \
+		relpath="./" ; \
+		nbslashs=`echo -n $${ARCH_SUBDIR} | sed 's%[^/]%%g' | wc -c` ; \
+		for slash in `seq 1 $${nbslashs}` ; do \
+			relpath=$${relpath}"../" ; \
+		done ; \
+		ln -s $${relpath} $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
+		echo "Symlinking $(STAGING_DIR)/$${ARCH_SUBDIR} -> $${relpath}" ; \
 	fi ; \
 	find $(STAGING_DIR) -type d | xargs chmod 755
 

From b95e436ee0c9e4638dc79766da0d17927c6641ce Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:09:33 +0100
Subject: [PATCH 1516/6849] Expand external toolchain wrapper to custom flags

The BR2_TARGET_OPTIMIZATION flags were not used by the external
toolchain wrapper, which broke the multilib selection logic of
multilib external toolchains. It also simplifies the compilation of
external programs since all flags are properly passed automatically by
the toolchain wrapper.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk             | 8 ++++++++
 toolchain/toolchain-external/ext-toolchain-wrapper.c | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index eb8ed4f6b5..dde6f22833 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -150,6 +150,14 @@ TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
 endif
 
+ifneq ($(BR2_TARGET_OPTIMIZATION),)
+TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
+# We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each
+# flag is a separate argument when used in execv() by the external
+# toolchain wrapper.
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ADDITIONAL_CFLAGS='$(foreach f,$(call qstrip,$(BR2_TARGET_OPTIMIZATION)),"$(f)",)'
+endif
+
 ifeq ($(BR2_SOFT_FLOAT),y)
 TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index cc404f3e94..719f13bd16 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -40,6 +40,9 @@ static char *predef_args[] = {
 #ifdef BR_VFPFLOAT
 	"-mfpu=vfp",
 #endif /* BR_VFPFLOAT */
+#ifdef BR_ADDITIONAL_CFLAGS
+	BR_ADDITIONAL_CFLAGS
+#endif
 };
 
 static const char *get_basename(const char *name)

From 17b8cc930c2a9d092b4ede12c01ea6200818a343 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:11:24 +0100
Subject: [PATCH 1517/6849] external-toolchain: remove 2009q1 ARM Sourcery
 toolchain

We are going to add one more ARM Sourcery toolchain version, so it's
time to remove the oldest version.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 15 ---------------
 toolchain/toolchain-external/ext-tool.mk |  5 +----
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index eadfe50cf8..f983727e70 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -59,20 +59,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
-	bool "Sourcery CodeBench ARM 2009q1"
-	depends on BR2_arm
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the ARM architecture, from
-	  Mentor Graphics. It uses gcc 4.3.3, binutils 2.19, glibc 2.8
-	  and gdb 6.8 and kernel headers 2.6.30. It has support for
-	  the following variants:
-            - ARMv5T, little endian, soft-float, glibc
-            - ARMv4T, little endian, soft-float, glibc
-            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	bool "Sourcery CodeBench MIPS 2011.03"
 	depends on BR2_mips || BR2_mipsel
@@ -262,7 +248,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index dde6f22833..883fbdb759 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -174,10 +174,7 @@ else
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(STAMP_DIR)/ext-toolchain-checked
 endif
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package4571/public/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q1-203-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package5383/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q3-67-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1),y)

From 102c6b5fa19537985fbd7b24794fa9f77114b9d6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:18:23 +0100
Subject: [PATCH 1518/6849] external-toolchain: add Sourcery CodeBench ARM
 2011.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f983727e70..8e5d53fe9d 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,20 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
+	bool "Sourcery CodeBench ARM 2011.09"
+	depends on BR2_arm
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.6.1, binutils 2.21.53, glibc
+	  2.13 and gdb 7.2.50, kernel headers 3.0.1. It has support
+	  for the following variants:
+            - ARMv5TE, little endian, soft-float, glibc
+            - ARMv4T, little endian, soft-float, glibc
+            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	bool "Sourcery CodeBench ARM 2011.03"
 	depends on BR2_arm
@@ -252,6 +266,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
+	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 883fbdb759..ab9b0c22e6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -186,6 +186,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package8739/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 851508dedda25637767a020f43f75450a477eb4f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:19:51 +0100
Subject: [PATCH 1519/6849] external-toolchain: bump MIPS 2011.03 from -93 to
 -110

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index ab9b0c22e6..1e8e03e442 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -193,8 +193,8 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9055/public/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-93-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9469/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-110-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 22e0698eb8e2d8ebd12cf78c03641850e1a24cfb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:28:34 +0100
Subject: [PATCH 1520/6849] external-toolchain: add Sourcery CodeBench PowerPC
 2011.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 19 +++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 8e5d53fe9d..fea1565479 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -119,6 +119,24 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
             - MIPS32 big endian soft float uclibc
             - MIPS32 little endian soft float uclibc
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
+	bool "Sourcery CodeBench PowerPC 2011.03"
+	depends on BR2_powerpc
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the PowerPC architecture,
+	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51,
+	  glibc 2.13, gdb 7.2.50 and kernel headers 2.6.38. It has
+	  support for the following variants:
+            - 603 glibc, 32 bits
+            - 603 soft float glibc, 32 bits
+            - e600 altivec glibc, 32 bits
+            - e500v1 glibc, 32 bits
+            - e500v2 glibc, 32 bits
+            - e500mc glibc, 32 bits
+            - 970 glibc hard-float, 64 bits
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	bool "Sourcery CodeBench PowerPC 2010.09"
 	depends on BR2_powerpc
@@ -270,6 +288,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
+	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 1e8e03e442..409355e449 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -198,6 +198,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-110-mips-linux-gnu-i686-pc-linux-gnu.tar.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=freescale-2011.03-38-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2

From d00bd2a1f79855cb37db57bea18181683b194302 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:34:33 +0100
Subject: [PATCH 1521/6849] external-toolchain: add Sourcery CodeBench
 x86/x86_64 2011.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 16 ++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index fea1565479..a552cc2f27 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -219,6 +219,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  has support for the following variants:
             - SH2A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
+	bool "Sourcery CodeBench x86/x86_64 2011.09"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the x86/x86_64
+	  architectures, from Mentor Graphics. It uses gcc 4.6.1,
+	  binutils 2.21.53, glibc 2.13, gdb 7.2.50 and kernel headers
+	  3.0.1. It has support for the following variants:
+	    - Intel Pentium 4, glibc, 32 bits
+            - Intel Atom, glibc, 32 bits
+            - Intel Xeon, glibc, 64 bits
+            - Intel Core 2, glibc, 64 bits
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	bool "Sourcery CodeBench x86/x86_64 2010.09"
 	depends on BR2_i386 || BR2_x86_64
@@ -294,6 +309,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
+	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 409355e449..a6a5028b40 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -216,6 +216,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/ia32/portal/package7682/public/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2010.09-44-i686-pc-linux-gnu-i386-linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2

From 91d4336cbc22846e5d6fa3c26d74849721163d33 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 12:39:12 +0100
Subject: [PATCH 1522/6849] external-toolchain: Blackfin.uclinux.org 2011R1-RC4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index a552cc2f27..6fb9ef6163 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -249,6 +249,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
             - Intel Xeon, glibc, 64 bits
             - Intel Core 2, glibc, 64 bits
 
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
+	bool "Blackfin.uclinux.org 2011R1-RC4"
+	depends on BR2_bfin
+	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_INET_RPC
+	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	help
+	  Toolchain for the Blackfin architecture, from
+	  http://blackfin.uclinux.org.
+
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	bool "Blackfin.uclinux.org 2010RC1"
 	depends on BR2_bfin
@@ -312,6 +327,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a6a5028b40..132aacd8f2 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -225,6 +225,12 @@ TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8386/
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2010R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
+TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9509/
+TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9517/
+TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else
 # A value must be set (even if unused), otherwise the
 # $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main
@@ -237,7 +243,7 @@ endif
 # contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
 # which themselves contain the toolchain. This is why we strip more
 # components than usual.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1),$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 

From c5c1064e494a4524622d366ea20c230afc575692 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 15:38:22 +0100
Subject: [PATCH 1523/6849] external-toolchain: details on selecting the
 multilib variants

Each multilib variant need to be selected using a special combination
of flags, requiring specific choices of the Buildroot options. This
commit documents those configuration choices to make it easier to use
the various multilib variants.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 123 +++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 6fb9ef6163..d3b591d6d9 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -14,8 +14,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	  2.13 and gdb 7.2.50, kernel headers 3.0.1. It has support
 	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
+              Select ARM926T, ARM10T, XScale or another ARMv5 core
+              Select BR2_SOFT_FLOAT
             - ARMv4T, little endian, soft-float, glibc
+              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+              Select BR2_SOFT_FLOAT
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	bool "Sourcery CodeBench ARM 2011.03"
@@ -28,8 +35,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	  2.13 and gdb 7.2.50, kernel headers 2.6.38. It has support
 	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
+              Select ARM926T, ARM10T, XScale or another ARMv5 core
+              Select BR2_SOFT_FLOAT
             - ARMv4T, little endian, soft-float, glibc
+              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+              Select BR2_SOFT_FLOAT
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	bool "Sourcery CodeBench ARM 2010.09"
@@ -42,8 +56,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	  2.11 and gdb 7.2.50, kernel headers 2.6.35.2. It has support
 	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
+	      Select ARM926T, ARM10T, XScale or another ARMv5 core
+              Select BR2_SOFT_FLOAT
             - ARMv4T, little endian, soft-float, glibc
+              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+              Select BR2_SOFT_FLOAT
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	bool "Sourcery CodeBench ARM 2010q1"
@@ -56,8 +77,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	  2.11, gdb 7.0.50 and kernel headers 2.6.32. It has support
 	  for the following variants:
              - ARMv5T, little endian, soft-float, glibc
+               Select ARM926T, ARM10T, XScale or another ARMv5 core
+               Select BR2_SOFT_FLOAT
              - ARMv4T, little endian, soft-float, glibc
+               Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+               Select BR2_SOFT_FLOAT
              - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+               Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+               Select BR2_SOFT_FLOAT
+               Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	bool "Sourcery CodeBench ARM 2009q3"
@@ -70,8 +98,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	  2.10 and gdb 6.8 and kernel headers 2.6.30. It has support
 	  for the following variants:
             - ARMv5T, little endian, soft-float, glibc
+              Select ARM926T, ARM10T, XScale or another ARMv5 core
+              Select BR2_SOFT_FLOAT
             - ARMv4T, little endian, soft-float, glibc
+              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+              Select BR2_SOFT_FLOAT
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	bool "Sourcery CodeBench MIPS 2011.03"
@@ -84,17 +119,43 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
 	  2.6.38. It has support for the following variants:
             - MIPS32 O32 big endian glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
             - MIPS32 O32 little endian glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL
             - MIPS32 big endian soft float glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
             - MIPS32 little endian soft float glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL
             - MIPS32 big endian microMIPS glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mips16
             - MIPS32 little endian microMIPS glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
             - MIPS32 big endian soft float microMIPS glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mips16
             - MIPS32 little endian soft float microMIPS glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
             - MIPS32 big endian uclibc
+              Not usable in Buildroot yet.
             - MIPS32 little endian uclibc
+              Not usable in Buildroot yet.
             - MIPS32 big endian soft float uclibc
+              Not usable in Buildroot yet.
             - MIPS32 little endian soft float uclibc
+              Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	bool "Sourcery CodeBench MIPS 4.4"
@@ -107,17 +168,43 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	  2.11, uClibc 0.9.30 and gdb 7.0, kernel headers 2.6.32. It
 	  has support for the following variants:
             - MIPS32 O32 big endian glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
             - MIPS32 O32 little endian glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL
             - MIPS32 big endian soft float glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
             - MIPS32 little endian soft float glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL
             - MIPS32 big endian microMIPS glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mips16
             - MIPS32 little endian microMIPS glibc
+              Select a MIPS generic core
+              Disable BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
             - MIPS32 big endian soft float microMIPS glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -mips16
             - MIPS32 little endian soft float microMIPS glibc
+              Select a MIPS generic core
+              Select BR2_SOFT_FLOAT
+              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
             - MIPS32 big endian uclibc
+              Not usable in Buildroot yet.
             - MIPS32 little endian uclibc
+              Not usable in Buildroot yet.
             - MIPS32 big endian soft float uclibc
+              Not usable in Buildroot yet.
             - MIPS32 little endian soft float uclibc
+              Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
@@ -130,12 +217,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	  glibc 2.13, gdb 7.2.50 and kernel headers 2.6.38. It has
 	  support for the following variants:
             - 603 glibc, 32 bits
+	      Select a generic PowerPC core
+	      Disable BR2_SOFT_FLOAT
             - 603 soft float glibc, 32 bits
+	      Select a generic PowerPC core
+	      Enable BR2_SOFT_FLOAT
             - e600 altivec glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te600
             - e500v1 glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te500v1
             - e500v2 glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te500v2
             - e500mc glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te500mc
             - 970 glibc hard-float, 64 bits
+              Set BR2_TARGET_OPTIMIZATION to -m64
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	bool "Sourcery CodeBench PowerPC 2010.09"
@@ -148,12 +244,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	  glibc 2.11, gdb 7.2.50 and kernel headers 2.6.35.2. It has
 	  support for the following variants:
             - 603 glibc, 32 bits
+	      Select a generic PowerPC core
+	      Disable BR2_SOFT_FLOAT
             - 603 soft float glibc, 32 bits
+	      Select a generic PowerPC core
+	      Enable BR2_SOFT_FLOAT
             - e600 altivec glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te600
             - e500v1 glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te500v1
             - e500v2 glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te500v2
             - e500mc glibc, 32 bits
+              Set BR2_TARGET_OPTIMIZATION to -te500mc
             - 970 glibc hard-float, 64 bits
+              Set BR2_TARGET_OPTIMIZATION to -m64
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
@@ -166,9 +271,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	  glibc 2.13, uClibc 0.9.30, gdb 7.2.50 and kernel headers
 	  2.6.38. It has support for the following variants:
             - SH4A, glibc, little endian
+              Default.
             - SH4A, glibc, big endian
+              Add -mb to BR2_TARGET_OPTIMIZATION
             - SH4A, uClibc, little endian
+              Not usable in Buildroot yet.
             - SH4A, uClibc, big endian
+              Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "Sourcery CodeBench SH 2010.09"
@@ -181,9 +290,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	  glibc 2.11, uClibc 0.9.30, gdb 7.2.50 and kernel headers
 	  2.6.35.2. It has support for the following variants:
             - SH4A, glibc, little endian
+              Default.
             - SH4A, glibc, big endian
+              Add -mb to BR2_TARGET_OPTIMIZATION
             - SH4A, uClibc, little endian
+              Not usable in Buildroot yet.
             - SH4A, uClibc, big endian
+              Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	bool "Sourcery CodeBench SH 2011.03"
@@ -230,9 +343,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	  binutils 2.21.53, glibc 2.13, gdb 7.2.50 and kernel headers
 	  3.0.1. It has support for the following variants:
 	    - Intel Pentium 4, glibc, 32 bits
+              Default, nothing special to do.
             - Intel Atom, glibc, 32 bits
+              Select an Atom core
             - Intel Xeon, glibc, 64 bits
+              Set BR2_TARGET_OPTIMIZATION to -m64
             - Intel Core 2, glibc, 64 bits
+              Select a Core 2 core
+              Set BR2_TARGET_OPTIMIZATION to -m64
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	bool "Sourcery CodeBench x86/x86_64 2010.09"
@@ -245,9 +363,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	  binutils 2.20, glibc 2.11, gdb 7.2.50 and kernel headers
 	  2.6.35.2. It has support for the following variants:
 	    - Intel Pentium 4, glibc, 32 bits
+              Default, nothing special to do.
             - Intel Atom, glibc, 32 bits
+              Select an Atom core
             - Intel Xeon, glibc, 64 bits
+              Set BR2_TARGET_OPTIMIZATION to -m64
             - Intel Core 2, glibc, 64 bits
+              Select a Core 2 core
+              Set BR2_TARGET_OPTIMIZATION to -m64
 
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	bool "Blackfin.uclinux.org 2011R1-RC4"

From 3367d5ce770ac409e7b3f5bba2c7ed1a819b3ef7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 16:13:58 +0100
Subject: [PATCH 1524/6849] external-toolchain: run checks even on extracted
 toolchains

When the mechanism that allows Buildroot to download external
toolchains automatically was added, all the sanity checks on the
external toolchains were not performed. This commit re-enables those
checks that we already do on external toolchains that are not
downloaded/extracted by Buildroot. This makes the toolchain checks
more consistent accross various configurations.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 132aacd8f2..8132caa4f2 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -170,8 +170,6 @@ endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
-else
-TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(STAMP_DIR)/ext-toolchain-checked
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
@@ -284,7 +282,7 @@ endif
 # location, check that it supports sysroot, and then verify that it
 # matches the configuration provided in Buildroot: ABI, C++ support,
 # type of C library and all C library features.
-$(STAMP_DIR)/ext-toolchain-checked:
+$(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 	@echo "Checking external toolchain settings"
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
@@ -343,7 +341,7 @@ $(STAMP_DIR)/ext-toolchain-checked:
 #                       multilib variant compared to the main sysroot.
 #			Ex: mips16/soft-float/el
 
-$(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
+$(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
 	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \

From 090d486441e6ee1898a6a27f8827076464cf2110 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 31 Dec 2011 16:15:43 +0100
Subject: [PATCH 1525/6849] external-toolchain: adjust check for uClibc static
 toolchains

The current check for uClibc toolchain was verifying that a
ld-uClibc.so dynamic loader was present. However, with static-only
uClibc toolchains, this does not work. Instead, we check for an
uClibc-specific header file in the sysroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 3f4818f226..6e7f1f4c9d 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -196,7 +196,7 @@ check_uclibc_feature = \
 #
 check_uclibc = \
 	SYSROOT_DIR="$(strip $1)"; \
-	if ! test -f $${SYSROOT_DIR}/lib/ld*-uClibc.so.* ; then \
+	if ! test -f $${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; then \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \

From 2ec3e6db46e35ee90bc8eef0d5aedb2891764e8a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 15 Jan 2012 20:02:11 +0100
Subject: [PATCH 1526/6849] external-toolchain: fix description of PowerPC
 2010.09 from Mentor Graphics

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index d3b591d6d9..f3f49e93ad 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -240,7 +240,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the PowerPC architecture,
-	  from Sourcery CodeBench. It uses gcc 4.5.1, binutils 2.20,
+	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
 	  glibc 2.11, gdb 7.2.50 and kernel headers 2.6.35.2. It has
 	  support for the following variants:
             - 603 glibc, 32 bits

From e6e60becb008dd389c51d2d75cbfd63551300dae Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 28 Jan 2012 17:12:02 +0100
Subject: [PATCH 1527/6849] external-toolchain: add support for Linaro 2012.01

Linaro has just released a new pre-built toolchain, available as a
tarball, which is a pure toolchain (only the C library is
included). This makes this new Linaro 2012.01 toolchain usable in
Buildroot, so let's integrate the support for it.

In addition to simply adding the new external toolchain at the usual
locations, this patch allows need to adapt a few things to support
Linaro toolchains. Most toolchains store their libraries in the "lib/"
or "usr/lib" directories relative to the toolchain. Buildroot
toolchains on the other hand, store the libraries in the
"usr/<target-name>/lib" directory. And the Linaro toolchain has
choosen to use the "lib/<target-name>" directory. Therefore, this
patch adjust:

 * The logic to search a particular library when that library needs to
   be copied to the target directory

 * The logic to deduce the sysroot directory from the libc.a file
   location in the toolchain: removing "(usr/?)lib(64?)" is no longer
   sufficient, we need to take into account the "lib/<target-name>/"
   case.

Since the Linaro toolchain generates code for Cortex-A processors
only, the selection of this toolchain is limited to Cortex-A8 and
Cortex-A9.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk                     | 31 +++++++++++++++++++-----
 toolchain/toolchain-external/Config.in   | 15 ++++++++++++
 toolchain/toolchain-external/ext-tool.mk | 11 ++++++---
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 6e7f1f4c9d..bb1ea90404 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -7,11 +7,30 @@
 # directory to the target directory. Also optionaly strips the
 # library.
 #
-# Most toolchains have their libraries either in /lib or /usr/lib
-# relative to their ARCH_SYSROOT_DIR. Buildroot toolchains, however,
-# have basic libraries in /lib, and libstdc++/libgcc_s in
-# /usr/<target-name>/lib(64). Thanks to ARCH_LIB_DIR we also take into
-# account toolchains that have the libraries in lib64 and usr/lib64.
+# Most toolchains (CodeSourcery ones) have their libraries either in
+# /lib or /usr/lib relative to their ARCH_SYSROOT_DIR, so we search
+# libraries in:
+#
+#  $${ARCH_LIB_DIR}
+#  usr/$${ARCH_LIB_DIR}
+#
+# Buildroot toolchains, however, have basic libraries in /lib, and
+# libstdc++/libgcc_s in /usr/<target-name>/lib(64), so we also need to
+# search libraries in:
+#
+#  usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR}
+#
+# Finally, Linaro toolchains have the libraries in lib/<target-name>/,
+# so we need to search libraries in:
+#
+#  $${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX)
+#
+# Thanks to ARCH_LIB_DIR we also take into account toolchains that
+# have the libraries in lib64 and usr/lib64.
+#
+# Please be very careful to check the major toolchain sources:
+# Buildroot, Crosstool-NG, CodeSourcery and Linaro before doing any
+# modification on the below logic.
 #
 # $1: arch specific sysroot directory
 # $2: library directory ('lib' or 'lib64') from which libraries must be copied
@@ -25,7 +44,7 @@ copy_toolchain_lib_root = \
 	DESTDIR="$(strip $4)" ; \
  \
 	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
-		find -L $${ARCH_LIB_DIR} usr/$${ARCH_LIB_DIR} usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \
+		find -L $${ARCH_LIB_DIR} usr/$${ARCH_LIB_DIR} usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} $${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \
 			-maxdepth 1 -name "$${LIB}.*" 2>/dev/null \
 		)` ; \
 	for FILE in $${LIBS} ; do \
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f3f49e93ad..9db5cb64e7 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,20 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
+	bool "Linaro 2012.01"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.01 (based on gcc 4.6), Linaro GDB 2011.12, eglibc
+	  2.13. It generates code that runs on all Cortex-A profile
+	  devices, but tuned for the Cortex-A9. The code generated is
+	  Thumb 2, with the softfp calling convention, and uses the
+	  VFPv3-D16 FPU instructions.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
 	depends on BR2_arm
@@ -433,6 +447,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 8132caa4f2..a638381d14 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -187,6 +187,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01),y)
+TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.01/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.01-20120125_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
@@ -286,7 +289,7 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 	@echo "Checking external toolchain settings"
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
@@ -343,14 +346,14 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 
 $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \
-	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/libc.a:\1:'` ; \
+	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
+	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
 	echo "Copy external toolchain libraries to target..." ; \

From eb54983fdf8f822e6a1000d5622bf6e13f7c259f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 3 Mar 2012 22:52:14 +0100
Subject: [PATCH 1528/6849] imagemagick: bump version, fix build with zlib

The recent zlib bump broke imagemagick. This has been fixed upstream
in 6.7.5, but the xml2-config fix is still not upstream and 6.7.5
needs autoconf 2.67 to autoreconf (and we have 2.65), so we cannot
easily use that.

Instead move to the most recent version using autoconf 2.64 and
backport the fix from imagemagick svn. At the same time also
ensure zlib+bzip2 support is picked up if enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../imagemagick-6.6.4-8-use-xml2-config.patch |  31 ---
 .../imagemagick/imagemagick-zlib-fix.patch    | 227 ++++++++++++++++++
 package/imagemagick/imagemagick.mk            |  24 +-
 3 files changed, 247 insertions(+), 35 deletions(-)
 delete mode 100644 package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch
 create mode 100644 package/imagemagick/imagemagick-zlib-fix.patch

diff --git a/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch b/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch
deleted file mode 100644
index bff4c73646..0000000000
--- a/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Use the detected xml2-config script
-
-The AC_CHECK_PROG() macro allows to find the location of a particular
-program. In ImageMagick, it is used to find the location of
-xml2-config, and fills it into the xml2_config
-variable. Unfortunately, the check just below hardcodes `xml2-config
---prefix`, without using the variable, which defeats the whole purpose
-of having AC_CHECK_PROG().
-
-So, let's use the ${xml2_config} variable instead. This allows to fix
-cross-compilation issues when a non-standard xml2-config location
-needs to be specified.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: imagemagick-6.6.4-8/configure.ac
-===================================================================
---- imagemagick-6.6.4-8.orig/configure.ac
-+++ imagemagick-6.6.4-8/configure.ac
-@@ -2549,7 +2549,7 @@
-         # Debian installs libxml headers under /usr/include/libxml2/libxml with
-         # the shared library installed under /usr/lib, whereas the package
-         # installs itself under $prefix/libxml and $prefix/lib.
--        xml2_prefix=`xml2-config --prefix`
-+        xml2_prefix=`${xml2_config} --prefix`
-         if test -d "${xml2_prefix}/include/libxml2"; then
-             CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
-         fi
diff --git a/package/imagemagick/imagemagick-zlib-fix.patch b/package/imagemagick/imagemagick-zlib-fix.patch
new file mode 100644
index 0000000000..1a147af1d0
--- /dev/null
+++ b/package/imagemagick/imagemagick-zlib-fix.patch
@@ -0,0 +1,227 @@
+[PATCH] Fix build with recent versions of zlib
+
+From upstream:
+r6633 + r6636 @ https://www.imagemagick.org/subversion/ImageMagick
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ magick/blob.c |   68 ++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 40 insertions(+), 28 deletions(-)
+
+Index: ImageMagick-6.7.2-10/magick/blob.c
+===================================================================
+--- ImageMagick-6.7.2-10.orig/magick/blob.c
++++ ImageMagick-6.7.2-10/magick/blob.c
+@@ -120,8 +120,20 @@
+   StreamType
+     type;
+ 
+-  FILE
+-    *file;
++  union {
++    FILE
++      *file;
++
++#if defined(MAGICKCORE_ZLIB_DELEGATE)
++    gzFile
++      gzfile;
++#endif
++
++#if defined(MAGICKCORE_BZLIB_DELEGATE)
++    BZFILE
++      *bzfile;
++#endif
++  };
+ 
+   struct stat
+     properties;
+@@ -505,14 +517,14 @@
+     case ZipStream:
+     {
+ #if defined(MAGICKCORE_ZLIB_DELEGATE)
+-      (void) gzerror(image->blob->file,&status);
++      (void) gzerror(image->blob->gzfile,&status);
+ #endif
+       break;
+     }
+     case BZipStream:
+     {
+ #if defined(MAGICKCORE_BZLIB_DELEGATE)
+-      (void) BZ2_bzerror((BZFILE *) image->blob->file,&status);
++      (void) BZ2_bzerror(image->blob->bzfile,&status);
+ #endif
+       break;
+     }
+@@ -546,14 +558,14 @@
+     case ZipStream:
+     {
+ #if defined(MAGICKCORE_ZLIB_DELEGATE)
+-      status=gzclose(image->blob->file);
++      status=gzclose(image->blob->gzfile);
+ #endif
+       break;
+     }
+     case BZipStream:
+     {
+ #if defined(MAGICKCORE_BZLIB_DELEGATE)
+-      BZ2_bzclose((BZFILE *) image->blob->file);
++      BZ2_bzclose(image->blob->bzfile);
+ #endif
+       break;
+     }
+@@ -843,7 +855,7 @@
+         status;
+ 
+       status=0;
+-      (void) BZ2_bzerror((BZFILE *) image->blob->file,&status);
++      (void) BZ2_bzerror(image->blob->bzfile,&status);
+       image->blob->eof=status == BZ_UNEXPECTED_EOF ? MagickTrue : MagickFalse;
+ #endif
+       break;
+@@ -2486,8 +2498,8 @@
+                 ((int) magick[2] == 0x08))
+               {
+                 (void) fclose(image->blob->file);
+-                image->blob->file=(FILE *) gzopen(filename,type);
+-                if (image->blob->file != (FILE *) NULL)
++                image->blob->gzfile=gzopen(filename,type);
++                if (image->blob->gzfile != (gzFile) NULL)
+                   image->blob->type=ZipStream;
+                }
+ #endif
+@@ -2495,8 +2507,8 @@
+             if (strncmp((char *) magick,"BZh",3) == 0)
+               {
+                 (void) fclose(image->blob->file);
+-                image->blob->file=(FILE *) BZ2_bzopen(filename,type);
+-                if (image->blob->file != (FILE *) NULL)
++                image->blob->bzfile=BZ2_bzopen(filename,type);
++                if (image->blob->bzfile != (BZFILE *) NULL)
+                   image->blob->type=BZipStream;
+               }
+ #endif
+@@ -2555,8 +2567,8 @@
+           {
+             if (mode == WriteBinaryBlobMode)
+               type="wb";
+-            image->blob->file=(FILE *) gzopen(filename,type);
+-            if (image->blob->file != (FILE *) NULL)
++            image->blob->gzfile=gzopen(filename,type);
++            if (image->blob->gzfile != (gzFile) NULL)
+               image->blob->type=ZipStream;
+           }
+         else
+@@ -2564,8 +2576,8 @@
+ #if defined(MAGICKCORE_BZLIB_DELEGATE)
+           if (LocaleCompare(extension,".bz2") == 0)
+             {
+-              image->blob->file=(FILE *) BZ2_bzopen(filename,type);
+-              if (image->blob->file != (FILE *) NULL)
++              image->blob->bzfile=BZ2_bzopen(filename,type);
++              if (image->blob->bzfile != (BZFILE *) NULL)
+                 image->blob->type=BZipStream;
+             }
+           else
+@@ -2771,12 +2783,12 @@
+       {
+         default:
+         {
+-          count=(ssize_t) gzread(image->blob->file,q,(unsigned int) length);
++          count=(ssize_t) gzread(image->blob->gzfile,q,(unsigned int) length);
+           break;
+         }
+         case 2:
+         {
+-          c=gzgetc(image->blob->file);
++          c=gzgetc(image->blob->gzfile);
+           if (c == EOF)
+             break;
+           *q++=(unsigned char) c;
+@@ -2784,7 +2796,7 @@
+         }
+         case 1:
+         {
+-          c=gzgetc(image->blob->file);
++          c=gzgetc(image->blob->gzfile);
+           if (c == EOF)
+             break;
+           *q++=(unsigned char) c;
+@@ -2799,7 +2811,7 @@
+     case BZipStream:
+     {
+ #if defined(MAGICKCORE_BZLIB_DELEGATE)
+-      count=(ssize_t) BZ2_bzread((BZFILE *) image->blob->file,q,(int) length);
++      count=(ssize_t) BZ2_bzread(image->blob->bzfile,q,(int) length);
+ #endif
+       break;
+     }
+@@ -3527,7 +3539,7 @@
+     case ZipStream:
+     {
+ #if defined(MAGICKCORE_ZLIB_DELEGATE)
+-      if (gzseek(image->blob->file,(off_t) offset,whence) < 0)
++      if (gzseek(image->blob->gzfile,(off_t) offset,whence) < 0)
+         return(-1);
+ #endif
+       image->blob->offset=TellBlob(image);
+@@ -3791,14 +3803,14 @@
+     case ZipStream:
+     {
+ #if defined(MAGICKCORE_ZLIB_DELEGATE)
+-      status=gzflush(image->blob->file,Z_SYNC_FLUSH);
++      status=gzflush(image->blob->gzfile,Z_SYNC_FLUSH);
+ #endif
+       break;
+     }
+     case BZipStream:
+     {
+ #if defined(MAGICKCORE_BZLIB_DELEGATE)
+-      status=BZ2_bzflush((BZFILE *) image->blob->file);
++      status=BZ2_bzflush(image->blob->bzfile);
+ #endif
+       break;
+     }
+@@ -3865,7 +3877,7 @@
+     case ZipStream:
+     {
+ #if defined(MAGICKCORE_ZLIB_DELEGATE)
+-      offset=(MagickOffsetType) gztell(image->blob->file);
++      offset=(MagickOffsetType) gztell(image->blob->gzfile);
+ #endif
+       break;
+     }
+@@ -4014,20 +4026,20 @@
+       {
+         default:
+         {
+-          count=(ssize_t) gzwrite(image->blob->file,(void *) data,
++          count=(ssize_t) gzwrite(image->blob->gzfile,(void *) data,
+             (unsigned int) length);
+           break;
+         }
+         case 2:
+         {
+-          c=gzputc(image->blob->file,(int) *p++);
++          c=gzputc(image->blob->gzfile,(int) *p++);
+           if (c == EOF)
+             break;
+           count++;
+         }
+         case 1:
+         {
+-          c=gzputc(image->blob->file,(int) *p++);
++          c=gzputc(image->blob->gzfile,(int) *p++);
+           if (c == EOF)
+             break;
+           count++;
+@@ -4041,8 +4053,8 @@
+     case BZipStream:
+     {
+ #if defined(MAGICKCORE_BZLIB_DELEGATE)
+-      count=(ssize_t) BZ2_bzwrite((BZFILE *) image->blob->file,(void *) data,
+-        (int) length);
++      count=(ssize_t) BZ2_bzwrite(image->blob->bzfile,(void *) data,(int)
++        length);
+ #endif
+       break;
+     }
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index b2a65e1363..602b7a5a40 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-IMAGEMAGICK_MAJOR = 6.6.7
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-6
+IMAGEMAGICK_MAJOR = 6.7.2
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-10
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
-IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
+IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick/legacy
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 
@@ -30,6 +30,8 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
 		--without-fpx \
 		--without-x
 
+IMAGEMAGICK_DEPENDENCIES = host-pkg-config
+
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 IMAGEMAGICK_CONF_OPT += --with-fontconfig
 IMAGEMAGICK_DEPENDENCIES += fontconfig
@@ -67,7 +69,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 IMAGEMAGICK_CONF_OPT += --with-xml
-IMAGEMAGICK_CONF_ENV += ac_cv_prog_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config
+IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config
 IMAGEMAGICK_DEPENDENCIES += libxml2
 else
 IMAGEMAGICK_CONF_OPT += --without-xml
@@ -89,6 +91,20 @@ else
 IMAGEMAGICK_CONF_OPT += --without-fftw
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+IMAGEMAGICK_CONF_OPT += --with-zlib
+IMAGEMAGICK_DEPENDENCIES += zlib
+else
+IMAGEMAGICK_CONF_OPT += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+IMAGEMAGICK_CONF_OPT += --with-bzlib
+IMAGEMAGICK_DEPENDENCIES += bzip2
+else
+IMAGEMAGICK_CONF_OPT += --without-bzip2
+endif
+
 define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
 	$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,	\
 		   $(addsuffix -config,			\

From 3fc84ed29266e41533185c8dd8dce04f801cdb9b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Mar 2012 09:09:52 +0100
Subject: [PATCH 1529/6849] gcc: bump 4.6.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.6.2 => 4.6.3}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.6.2 => 4.6.3}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.6.2 => 4.6.3}/302-c99-snprintf.patch           | 0
 .../gcc/{4.6.2 => 4.6.3}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.6.2 => 4.6.3}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.6.2 => 4.6.3}/820-arm-unbreak-armv4t.patch     | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/820-arm-unbreak-armv4t.patch (100%)
 rename toolchain/gcc/{4.6.2 => 4.6.3}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.6.2/100-uclibc-conf.patch b/toolchain/gcc/4.6.3/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.6.2/100-uclibc-conf.patch
rename to toolchain/gcc/4.6.3/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.6.2/301-missing-execinfo_h.patch b/toolchain/gcc/4.6.3/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.6.2/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.6.3/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.6.2/302-c99-snprintf.patch b/toolchain/gcc/4.6.3/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.6.2/302-c99-snprintf.patch
rename to toolchain/gcc/4.6.3/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.6.2/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.6.2/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.6.2/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.6.2/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.6.2/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.6.2/820-arm-unbreak-armv4t.patch
rename to toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.6.2/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.6.2/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index acaa3a88dc..349d9df3ab 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -59,7 +59,7 @@ config BR2_GCC_VERSION
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
-	default "4.6.2"     if BR2_GCC_VERSION_4_6_X
+	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

From 77cb845b43f9013fa916d0c5fb08492c51dfe2c2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Mar 2012 11:00:39 +0100
Subject: [PATCH 1530/6849] mtd: build after busybox if enabled

Busybox also provides flash applets nowadays, so ensure the mtd version
takes precedence if both are enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 42fa7aa8b2..8ccd4dd04c 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -10,6 +10,10 @@ ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 MTD_DEPENDENCIES = zlib lzo
 endif
 
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+MTD_DEPENDENCIES += busybox
+endif
+
 HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
 
 define HOST_MTD_BUILD_CMDS

From 06ef58efc45dabf078c93358a6ce37f178ae8df5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Mar 2012 11:02:48 +0100
Subject: [PATCH 1531/6849] imagemagick: re-add xml2-config patch

The patch somehow got removed from eb5498 (bump version, fix build) by
accident, so add it again.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../imagemagick-use-xml2-config.patch         | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/imagemagick/imagemagick-use-xml2-config.patch

diff --git a/package/imagemagick/imagemagick-use-xml2-config.patch b/package/imagemagick/imagemagick-use-xml2-config.patch
new file mode 100644
index 0000000000..bff4c73646
--- /dev/null
+++ b/package/imagemagick/imagemagick-use-xml2-config.patch
@@ -0,0 +1,31 @@
+Use the detected xml2-config script
+
+The AC_CHECK_PROG() macro allows to find the location of a particular
+program. In ImageMagick, it is used to find the location of
+xml2-config, and fills it into the xml2_config
+variable. Unfortunately, the check just below hardcodes `xml2-config
+--prefix`, without using the variable, which defeats the whole purpose
+of having AC_CHECK_PROG().
+
+So, let's use the ${xml2_config} variable instead. This allows to fix
+cross-compilation issues when a non-standard xml2-config location
+needs to be specified.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: imagemagick-6.6.4-8/configure.ac
+===================================================================
+--- imagemagick-6.6.4-8.orig/configure.ac
++++ imagemagick-6.6.4-8/configure.ac
+@@ -2549,7 +2549,7 @@
+         # Debian installs libxml headers under /usr/include/libxml2/libxml with
+         # the shared library installed under /usr/lib, whereas the package
+         # installs itself under $prefix/libxml and $prefix/lib.
+-        xml2_prefix=`xml2-config --prefix`
++        xml2_prefix=`${xml2_config} --prefix`
+         if test -d "${xml2_prefix}/include/libxml2"; then
+             CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
+         fi

From 9ab01a85d2efc8d2037a45ccca781df75a9c1214 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Mar 2012 16:58:17 +0100
Subject: [PATCH 1532/6849] atk: fix build after glib2 bump

Remove G_CONST_RETURN references, similar to how we did for gamin.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk-glib-fix.patch | 681 +++++++++++++++++++++++++++++++++
 1 file changed, 681 insertions(+)
 create mode 100644 package/atk/atk-glib-fix.patch

diff --git a/package/atk/atk-glib-fix.patch b/package/atk/atk-glib-fix.patch
new file mode 100644
index 0000000000..3cbb47b070
--- /dev/null
+++ b/package/atk/atk-glib-fix.patch
@@ -0,0 +1,681 @@
+[PATCH] Fix build with modern glib versions
+
+G_CONST_RETURN is deprecated, so replace with 'const' instead.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ atk/atkaction.c            |    8 ++++----
+ atk/atkaction.h            |   16 ++++++++--------
+ atk/atkdocument.c          |    6 +++---
+ atk/atkdocument.h          |   12 ++++++------
+ atk/atkimage.c             |    4 ++--
+ atk/atkimage.h             |    8 ++++----
+ atk/atkobject.c            |   18 +++++++++---------
+ atk/atkobject.h            |   12 ++++++------
+ atk/atkrelation.c          |    2 +-
+ atk/atkrelation.h          |    2 +-
+ atk/atkstate.c             |    2 +-
+ atk/atkstate.h             |    2 +-
+ atk/atkstreamablecontent.c |    2 +-
+ atk/atkstreamablecontent.h |   10 +++++-----
+ atk/atktable.c             |    4 ++--
+ atk/atktable.h             |    8 ++++----
+ atk/atktext.c              |    4 ++--
+ atk/atktext.h              |    4 ++--
+ atk/atkutil.c              |    6 +++---
+ atk/atkutil.h              |   10 +++++-----
+ tests/testrelation.c       |    6 +++---
+ tests/teststateset.c       |    2 +-
+ 22 files changed, 74 insertions(+), 74 deletions(-)
+
+Index: atk-1.33.6/atk/atkaction.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkaction.c
++++ atk-1.33.6/atk/atkaction.c
+@@ -101,7 +101,7 @@
+  * Returns a description string, or %NULL
+  * if @action does not implement this interface.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_description (AtkAction *obj,
+                             gint      i)
+ {
+@@ -140,7 +140,7 @@
+  * Returns a name string, or %NULL
+  * if @action does not implement this interface.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_name (AtkAction *obj,
+                      gint      i)
+ {
+@@ -166,7 +166,7 @@
+  * Returns a name string, or %NULL
+  * if @action does not implement this interface.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_localized_name (AtkAction *obj,
+                                gint      i)
+ {
+@@ -203,7 +203,7 @@
+  * if there is no keybinding for this action.
+  *
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_keybinding (AtkAction *obj,
+                            gint      i)
+ {
+Index: atk-1.33.6/atk/atkaction.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkaction.h
++++ atk-1.33.6/atk/atkaction.h
+@@ -55,16 +55,16 @@
+   gboolean                (*do_action)         (AtkAction         *action,
+                                                 gint              i);
+   gint                    (*get_n_actions)     (AtkAction         *action);
+-  G_CONST_RETURN gchar*   (*get_description)   (AtkAction         *action,
++  const gchar*   (*get_description)   (AtkAction         *action,
+                                                 gint              i);
+-  G_CONST_RETURN gchar*   (*get_name)          (AtkAction         *action,
++  const gchar*   (*get_name)          (AtkAction         *action,
+                                                 gint              i);
+-  G_CONST_RETURN gchar*   (*get_keybinding)    (AtkAction         *action,
++  const gchar*   (*get_keybinding)    (AtkAction         *action,
+                                                 gint              i);
+   gboolean                (*set_description)   (AtkAction         *action,
+                                                 gint              i,
+                                                 const gchar       *desc);
+-  G_CONST_RETURN gchar*   (*get_localized_name)(AtkAction         *action,
++  const gchar*   (*get_localized_name)(AtkAction         *action,
+ 						gint              i);
+   AtkFunction             pad2;
+ };
+@@ -85,11 +85,11 @@
+ gboolean   atk_action_do_action                (AtkAction         *action,
+                                             gint              i);
+ gint   atk_action_get_n_actions            (AtkAction *action);
+-G_CONST_RETURN gchar* atk_action_get_description  (AtkAction         *action,
++const gchar* atk_action_get_description  (AtkAction         *action,
+                                                    gint              i);
+-G_CONST_RETURN gchar* atk_action_get_name         (AtkAction         *action,
++const gchar* atk_action_get_name         (AtkAction         *action,
+                                                    gint              i);
+-G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
++const gchar* atk_action_get_keybinding   (AtkAction         *action,
+                                                    gint              i);
+ gboolean              atk_action_set_description  (AtkAction         *action,
+                                                    gint              i,
+@@ -97,7 +97,7 @@
+ 
+ /* NEW in ATK 1.1: */
+ 
+-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction       *action,
++const gchar* atk_action_get_localized_name (AtkAction       *action,
+ 						     gint            i);
+ 
+ /*
+Index: atk-1.33.6/atk/atkdocument.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkdocument.c
++++ atk-1.33.6/atk/atkdocument.c
+@@ -93,7 +93,7 @@
+  *
+  * Returns: a string indicating the document type
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_document_get_document_type (AtkDocument *document)
+ {
+   AtkDocumentIface *iface;
+@@ -155,7 +155,7 @@
+  *          locale of the document content as a whole, or NULL if
+  *          the document content does not specify a locale.
+  **/
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_document_get_locale (AtkDocument *document)
+ {
+   AtkDocumentIface *iface;
+@@ -219,7 +219,7 @@
+  *    document, or NULL if a value for #attribute_name has not been specified
+  *    for this document.
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_document_get_attribute_value (AtkDocument *document, 
+ 				  const gchar *attribute_name)
+ {
+Index: atk-1.33.6/atk/atkdocument.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkdocument.h
++++ atk-1.33.6/atk/atkdocument.h
+@@ -49,12 +49,12 @@
+ struct _AtkDocumentIface
+ {
+   GTypeInterface parent;
+-  G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument              *document);
++  const gchar* ( *get_document_type) (AtkDocument              *document);
+   gpointer              ( *get_document)      (AtkDocument              *document);
+ 
+-  G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument              *document);
++  const gchar* ( *get_document_locale) (AtkDocument              *document);
+   AtkAttributeSet *     ( *get_document_attributes) (AtkDocument        *document);
+-  G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument   *document,
++  const gchar* ( *get_document_attribute_value) (AtkDocument   *document,
+                                                           const gchar   *attribute_name);
+   gboolean              ( *set_document_attribute) (AtkDocument         *document,
+                                                     const gchar         *attribute_name,
+@@ -68,11 +68,11 @@
+ 
+ GType  atk_document_get_type             (void);
+ 
+-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument   *document);
++const gchar* atk_document_get_document_type (AtkDocument   *document);
+ gpointer atk_document_get_document (AtkDocument   *document);
+-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
++const gchar* atk_document_get_locale (AtkDocument *document);
+ AtkAttributeSet*      atk_document_get_attributes (AtkDocument *document);
+-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document, 
++const gchar* atk_document_get_attribute_value (AtkDocument *document, 
+                                                         const gchar *attribute_name);
+ gboolean              atk_document_set_attribute_value (AtkDocument *document,
+                                                         const gchar *attribute_name,
+Index: atk-1.33.6/atk/atkimage.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkimage.c
++++ atk-1.33.6/atk/atkimage.c
+@@ -46,7 +46,7 @@
+  *
+  * Returns: a string representing the image description
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_image_get_image_description (AtkImage *image)
+ {
+   AtkImageIface *iface;
+@@ -192,7 +192,7 @@
+  * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale. 
+  *
+  */
+-G_CONST_RETURN gchar* 
++const gchar* 
+ atk_image_get_image_locale (AtkImage   *image)
+ {
+ 	
+Index: atk-1.33.6/atk/atkimage.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkimage.h
++++ atk-1.33.6/atk/atkimage.h
+@@ -53,13 +53,13 @@
+                                                    gint                  *x,
+ 				                   gint	                 *y,
+     			                           AtkCoordType	         coord_type);
+-  G_CONST_RETURN gchar* ( *get_image_description) (AtkImage              *image);
++  const gchar* ( *get_image_description) (AtkImage              *image);
+   void                  ( *get_image_size)        (AtkImage              *image,
+                                                    gint                  *width,
+                                                    gint                  *height);
+   gboolean              ( *set_image_description) (AtkImage              *image,
+                                                    const gchar           *description);
+-  G_CONST_RETURN gchar* ( *get_image_locale)      (AtkImage              *image);
++  const gchar* ( *get_image_locale)      (AtkImage              *image);
+ 
+   AtkFunction           pad1;
+ 	
+@@ -67,7 +67,7 @@
+ 
+ GType  atk_image_get_type             (void);
+ 
+-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage   *image);
++const gchar* atk_image_get_image_description (AtkImage   *image);
+ 
+ void     atk_image_get_image_size        (AtkImage           *image,
+                                           gint               *width,
+@@ -80,7 +80,7 @@
+ 					  gint	             *y,
+     					  AtkCoordType	     coord_type);
+ 
+-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage   *image);
++const gchar* atk_image_get_image_locale (AtkImage   *image);
+ 
+ G_END_DECLS
+ 
+Index: atk-1.33.6/atk/atkobject.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkobject.c
++++ atk-1.33.6/atk/atkobject.c
+@@ -285,9 +285,9 @@
+                                                      GValue          *value,
+                                                      GParamSpec      *pspec);
+ static void            atk_object_finalize          (GObject         *object);
+-static G_CONST_RETURN gchar*
++static const gchar*
+                        atk_object_real_get_name     (AtkObject       *object);
+-static G_CONST_RETURN gchar*
++static const gchar*
+                        atk_object_real_get_description    
+                                                    (AtkObject       *object);
+ static AtkObject*      atk_object_real_get_parent  (AtkObject       *object);
+@@ -692,7 +692,7 @@
+  *
+  * Returns: a character string representing the accessible name of the object.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_object_get_name (AtkObject *accessible)
+ {
+   AtkObjectClass *klass;
+@@ -716,7 +716,7 @@
+  * of the accessible.
+  *
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_object_get_description (AtkObject *accessible)
+ {
+   AtkObjectClass *klass;
+@@ -1125,7 +1125,7 @@
+                                 AtkState  state,
+                                 gboolean  value)
+ {
+-  G_CONST_RETURN gchar* name;
++  const gchar* name;
+ 
+   g_return_if_fail (ATK_IS_OBJECT (accessible));
+ 
+@@ -1323,13 +1323,13 @@
+   G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+ 
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_name (AtkObject *object)
+ {
+   return object->name;
+ }
+ 
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_description (AtkObject *object)
+ {
+   return object->description;
+@@ -1491,7 +1491,7 @@
+  *
+  * Returns: the string describing the AtkRole
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_role_get_name (AtkRole role)
+ {
+   if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
+@@ -1518,7 +1518,7 @@
+  *
+  * Returns: the localized string describing the AtkRole
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_role_get_localized_name (AtkRole role)
+ {
+   gettext_initialization ();
+Index: atk-1.33.6/atk/atkobject.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkobject.h
++++ atk-1.33.6/atk/atkobject.h
+@@ -381,11 +381,11 @@
+   /*
+    * Gets the accessible name of the object
+    */
+-  G_CONST_RETURN gchar*    (* get_name)            (AtkObject                *accessible);
++  const gchar*    (* get_name)            (AtkObject                *accessible);
+   /*
+    * Gets the accessible description of the object
+    */
+-  G_CONST_RETURN gchar*    (* get_description)     (AtkObject                *accessible);
++  const gchar*    (* get_description)     (AtkObject                *accessible);
+   /*
+    * Gets the accessible parent of the object
+    */
+@@ -535,8 +535,8 @@
+  * Properties directly supported by AtkObject
+  */
+ 
+-G_CONST_RETURN gchar*   atk_object_get_name                       (AtkObject *accessible);
+-G_CONST_RETURN gchar*   atk_object_get_description                (AtkObject *accessible);
++const gchar*   atk_object_get_name                       (AtkObject *accessible);
++const gchar*   atk_object_get_description                (AtkObject *accessible);
+ AtkObject*              atk_object_get_parent                     (AtkObject *accessible);
+ gint                    atk_object_get_n_accessible_children      (AtkObject *accessible);
+ AtkObject*              atk_object_ref_accessible_child           (AtkObject *accessible,
+@@ -571,7 +571,7 @@
+ void                 atk_object_initialize                       (AtkObject                     *accessible,
+                                                                   gpointer                      data);
+                                     
+-G_CONST_RETURN gchar* atk_role_get_name      (AtkRole         role);
++const gchar* atk_role_get_name      (AtkRole         role);
+ AtkRole               atk_role_for_name      (const gchar     *name);
+ 
+ 
+@@ -582,7 +582,7 @@
+ gboolean              atk_object_remove_relationship           (AtkObject      *object,
+ 								AtkRelationType relationship,
+ 								AtkObject      *target);
+-G_CONST_RETURN gchar* atk_role_get_localized_name              (AtkRole     role);
++const gchar* atk_role_get_localized_name              (AtkRole     role);
+ 
+ /* */
+ 
+Index: atk-1.33.6/atk/atkrelation.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkrelation.c
++++ atk-1.33.6/atk/atkrelation.c
+@@ -130,7 +130,7 @@
+  *
+  * Returns: the string describing the AtkRelationType
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_relation_type_get_name (AtkRelationType type)
+ {
+   GTypeClass *type_class;
+Index: atk-1.33.6/atk/atkrelation.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkrelation.h
++++ atk-1.33.6/atk/atkrelation.h
+@@ -61,7 +61,7 @@
+ GType atk_relation_get_type (void);
+ 
+ AtkRelationType       atk_relation_type_register      (const gchar     *name);
+-G_CONST_RETURN gchar* atk_relation_type_get_name      (AtkRelationType type);
++const gchar* atk_relation_type_get_name      (AtkRelationType type);
+ AtkRelationType       atk_relation_type_for_name      (const gchar     *name);
+ 
+ /*
+Index: atk-1.33.6/atk/atkstate.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkstate.c
++++ atk-1.33.6/atk/atkstate.c
+@@ -57,7 +57,7 @@
+  *
+  * Returns: the string describing the AtkStateType
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_state_type_get_name (AtkStateType type)
+ {
+   GTypeClass *type_class;
+Index: atk-1.33.6/atk/atkstate.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkstate.h
++++ atk-1.33.6/atk/atkstate.h
+@@ -170,7 +170,7 @@
+ 
+ AtkStateType atk_state_type_register            (const gchar *name);
+ 
+-G_CONST_RETURN gchar* atk_state_type_get_name   (AtkStateType type);
++const gchar* atk_state_type_get_name   (AtkStateType type);
+ AtkStateType          atk_state_type_for_name   (const gchar  *name);
+ 
+ G_END_DECLS
+Index: atk-1.33.6/atk/atkstreamablecontent.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkstreamablecontent.c
++++ atk-1.33.6/atk/atkstreamablecontent.c
+@@ -73,7 +73,7 @@
+  * Returns : a gchar* representing the specified mime type; the caller
+  * should not free the character string.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+                                       gint                 i)
+ {
+Index: atk-1.33.6/atk/atkstreamablecontent.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkstreamablecontent.h
++++ atk-1.33.6/atk/atkstreamablecontent.h
+@@ -54,11 +54,11 @@
+    * at index 0 should be considered the "default" data type for the stream.
+    *
+    * This assumes that the strings for the mime types are stored in the
+-   * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
++   * AtkStreamableContent. Alternatively the const could be removed
+    * and the caller would be responsible for calling g_free() on the
+    * returned value.
+    */
+-  G_CONST_RETURN gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
++  const gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
+                                                    gint                     i);
+   /*
+    * One possible implementation for this method is that it constructs the
+@@ -80,7 +80,7 @@
+  * constructed.  Note that it is possible for get_uri to return NULL but for
+  * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
+  */
+-    G_CONST_RETURN  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
++    const  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
+                                                    const gchar              *mime_type);
+ 
+ 
+@@ -92,12 +92,12 @@
+ 
+ gint                   atk_streamable_content_get_n_mime_types (AtkStreamableContent     *streamable);
+                                                        
+-G_CONST_RETURN gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
++const gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
+                                                                 gint                     i);
+ GIOChannel*             atk_streamable_content_get_stream       (AtkStreamableContent     *streamable,
+                                                                  const gchar              *mime_type);
+ 
+-G_CONST_RETURN gchar*  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
++const gchar*  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
+                                                                 const gchar              *mime_type);
+ 
+ G_END_DECLS
+Index: atk-1.33.6/atk/atktable.c
+===================================================================
+--- atk-1.33.6.orig/atk/atktable.c
++++ atk-1.33.6/atk/atktable.c
+@@ -301,7 +301,7 @@
+  * Returns: a gchar* representing the column description, or %NULL
+  * if value does not implement this interface.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_column_description (AtkTable *table,
+                                   gint     column)
+ {
+@@ -405,7 +405,7 @@
+  * Returns: a gchar* representing the row description, or %NULL
+  * if value does not implement this interface.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_row_description (AtkTable *table,
+                                gint      row)
+ {
+Index: atk-1.33.6/atk/atktable.h
+===================================================================
+--- atk-1.33.6.orig/atk/atktable.h
++++ atk-1.33.6/atk/atktable.h
+@@ -69,12 +69,12 @@
+                                                   gint          column);
+   AtkObject*
+                     (* get_caption)              (AtkTable      *table);
+-  G_CONST_RETURN gchar*
++  const gchar*
+                     (* get_column_description)   (AtkTable      *table,
+                                                   gint          column);
+   AtkObject*        (* get_column_header)        (AtkTable      *table,
+ 						  gint		column);
+-  G_CONST_RETURN gchar*
++  const gchar*
+                     (* get_row_description)      (AtkTable      *table,
+                                                   gint          row);
+   AtkObject*        (* get_row_header)           (AtkTable      *table,
+@@ -163,12 +163,12 @@
+                                                   gint             column);
+ AtkObject*
+                   atk_table_get_caption          (AtkTable         *table);
+-G_CONST_RETURN gchar*
++const gchar*
+                   atk_table_get_column_description (AtkTable         *table,
+                                                   gint             column);
+ AtkObject*        atk_table_get_column_header    (AtkTable         *table,
+ 						  gint		   column);
+-G_CONST_RETURN gchar*
++const gchar*
+                   atk_table_get_row_description  (AtkTable         *table,
+                                                   gint             row);
+ AtkObject*        atk_table_get_row_header       (AtkTable         *table,
+Index: atk-1.33.6/atk/atktext.c
+===================================================================
+--- atk-1.33.6.orig/atk/atktext.c
++++ atk-1.33.6/atk/atktext.c
+@@ -1054,7 +1054,7 @@
+  *
+  * Returns: a string containing the name; this string should not be freed
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_text_attribute_get_name (AtkTextAttribute attr)
+ {
+   GTypeClass *type_class;
+@@ -1150,7 +1150,7 @@
+  * Returns: a string containing the value; this string should not be freed;
+  * NULL is returned if there are no values maintained for the attr value. 
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_text_attribute_get_value (AtkTextAttribute attr,
+                               gint             index)
+ {
+Index: atk-1.33.6/atk/atktext.h
+===================================================================
+--- atk-1.33.6.orig/atk/atktext.h
++++ atk-1.33.6/atk/atktext.h
+@@ -355,9 +355,9 @@
+                                                            AtkTextClipType  y_clip_type);
+ void          atk_text_free_ranges                        (AtkTextRange     **ranges);
+ void 	      atk_attribute_set_free                      (AtkAttributeSet  *attrib_set);
+-G_CONST_RETURN gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
++const gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
+ AtkTextAttribute       atk_text_attribute_for_name        (const gchar      *name);
+-G_CONST_RETURN gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
++const gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
+                                                            gint             index_);
+ 
+ G_END_DECLS
+Index: atk-1.33.6/atk/atkutil.c
+===================================================================
+--- atk-1.33.6.orig/atk/atkutil.c
++++ atk-1.33.6/atk/atkutil.c
+@@ -342,7 +342,7 @@
+  *
+  * Returns: name string for the GUI toolkit implementing ATK for this application
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_get_toolkit_name (void)
+ {
+   const gchar *retval;
+@@ -367,7 +367,7 @@
+  *
+  * Returns: version string for the GUI toolkit implementing ATK for this application
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_get_toolkit_version (void)
+ {
+   const gchar *retval;
+@@ -394,7 +394,7 @@
+  *
+  * Since: 1.20
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_get_version (void)
+ {
+   return VERSION;
+Index: atk-1.33.6/atk/atkutil.h
+===================================================================
+--- atk-1.33.6.orig/atk/atkutil.h
++++ atk-1.33.6/atk/atkutil.h
+@@ -147,8 +147,8 @@
+ 						  gpointer data);
+    void         (* remove_key_event_listener)    (guint               listener_id);
+    AtkObject*   (* get_root)                     (void);
+-   G_CONST_RETURN gchar* (* get_toolkit_name)    (void);
+-   G_CONST_RETURN gchar* (* get_toolkit_version) (void);
++   const gchar* (* get_toolkit_name)    (void);
++   const gchar* (* get_toolkit_version) (void);
+ };
+ GType atk_util_get_type (void);
+ 
+@@ -229,17 +229,17 @@
+ /*
+  * Returns name string for the GUI toolkit.
+  */
+-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
++const gchar *atk_get_toolkit_name (void);
+ 
+ /*
+  * Returns version string for the GUI toolkit.
+  */
+-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
++const gchar *atk_get_toolkit_version (void);
+ 
+ /*
+  * Gets the current version of ATK
+  */
+-G_CONST_RETURN gchar *atk_get_version (void);
++const gchar *atk_get_version (void);
+ 
+ /* --- GType boilerplate --- */
+ /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
+Index: atk-1.33.6/tests/testrelation.c
+===================================================================
+--- atk-1.33.6.orig/tests/testrelation.c
++++ atk-1.33.6/tests/testrelation.c
+@@ -28,7 +28,7 @@
+ test_relation (void)
+ {
+   AtkRelationType type1, type2;
+-  G_CONST_RETURN gchar *name;
++  const gchar *name;
+   AtkObject *obj;
+   gboolean ret_value;
+   AtkRelationSet *set;
+@@ -169,7 +169,7 @@
+ test_role (void)
+ {
+   AtkRole role1, role2;
+-  G_CONST_RETURN gchar *name;
++  const gchar *name;
+ 
+   name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
+   g_return_val_if_fail (name, FALSE);
+@@ -230,7 +230,7 @@
+ test_text_attr (void)
+ {
+   AtkTextAttribute attr1, attr2;
+-  G_CONST_RETURN gchar *name;
++  const gchar *name;
+ 
+   name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
+   g_return_val_if_fail (name, FALSE);
+Index: atk-1.33.6/tests/teststateset.c
+===================================================================
+--- atk-1.33.6.orig/tests/teststateset.c
++++ atk-1.33.6/tests/teststateset.c
+@@ -208,7 +208,7 @@
+ test_state (void)
+ {
+   AtkStateType type1, type2;
+-  G_CONST_RETURN gchar *name;
++  const gchar *name;
+ 
+   name = atk_state_type_get_name (ATK_STATE_VISIBLE);
+   g_return_val_if_fail (name, FALSE);

From b38f41736e33df75a802828dfc5f6673f6419e8b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Mar 2012 20:34:02 +0100
Subject: [PATCH 1533/6849] glib-networking: fix build without gnutls

configure errors out when it doesn't find gnutls unless explicitly
disabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/glib-networking/glib-networking.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index b1ad621101..47415d85d6 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -16,7 +16,9 @@ GLIB_NETWORKING_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libin
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 GLIB_NETWORKING_DEPENDENCIES += gnutls
-GLIB_NETWORKING_CONF_OPT = --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+GLIB_NETWORKING_CONF_OPT += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+GLIB_NETWORKING_CONF_OPT += --without-gnutls
 endif
 
 $(eval $(call AUTOTARGETS))

From 3d2e77d5cbbded4a365d324c699bfae058bc97ad Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Wed, 15 Feb 2012 16:26:43 +0000
Subject: [PATCH 1534/6849] lite: Remove excess slashes from pkg-config file.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lite/lite-pkg-config.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/lite/lite-pkg-config.patch

diff --git a/package/lite/lite-pkg-config.patch b/package/lite/lite-pkg-config.patch
new file mode 100644
index 0000000000..cdd24162c7
--- /dev/null
+++ b/package/lite/lite-pkg-config.patch
@@ -0,0 +1,22 @@
+From 7982cccbb6ad58f3802bb266467290200d130a48 Mon Sep 17 00:00:00 2001
+From: Ville Syrjala <syrjala@sci.fi>
+Date: Sat, 27 Nov 2010 01:14:25 +0200
+Subject: [PATCH] Too many '\' characters in the .pc file
+
+---
+ lite.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lite.pc.in b/lite.pc.in
+index 48eb969..3a21eaa 100644
+--- a/lite.pc.in
++++ b/lite.pc.in
+@@ -9,4 +9,4 @@ Description: "LiTE" is a Toolkit Engine
+ Requires: directfb >= @DFB_REQUIRED_VERSION@
+ Version: @VERSION@
+ Libs: -L${libdir} -llite
+-Cflags: -I${includedir} -DLITEFONTDIR=\\\"@LITEFONTDIR@\\\"
++Cflags: -I${includedir} -DLITEFONTDIR=\"@LITEFONTDIR@\"
+--
+1.7.1
+

From 15fe22062229886848e02bb98ccd8ce62f8a2f34 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 4 Mar 2012 22:07:52 +0100
Subject: [PATCH 1535/6849] at91sam9260dfc_defconfig: fix kernel defconfig name

at91sam9260_defconfig contains support for the EVM (since v3.2).

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9260dfc_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index de7ac42f61..3cd58ac7eb 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -15,7 +15,7 @@ BR2_TARGET_UBOOT_2011_12=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260ek"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260"
 
 # Filesystem
 BR2_TARGET_ROOTFS_TAR=y

From 3311e41dc0f36967bbadc972839269197c5e88a1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 5 Mar 2012 11:06:23 +0100
Subject: [PATCH 1536/6849] package: fix WGET download method

In cf2486bf317e4bbf88c801fb96183ba62be78cc8, we changed from using the
-P option of wget (to set the output *directory*) to using the -O
option (to set the output *file*). Unfortunately, wget -O has a
strange behaviour: it creates an empty 0-byte file even if the
download fails (for example when there is no network connection).

The problem is that then Buildroot thinks the download was successful
and therefore goes on with extracting the tarball.

The following succession of events makes Buildroot think that the
download has been sucessful:

 * Buildroot calls the DOWNLOAD_WGET macro with the URL of the
   official site

   * It tests if the file exists in the download directory, it doesn't
     exist.

   * It calls wget. wget fails to download the file and returns an
     error code, but leaves an empty file with the correct name in the
     downloaded directory.

 * Since the previously download failed, Buildroot tries another
   download from the Buildroot mirror (sources.buildroot.net)

   * It tests if the file exists in the download directory... and it
     exists! So this second download returns with success, and
     Buildroot assumes the file has been downloaded properly.

This scenario brings us with the following result, where the download
fails, but Buildroot continues its execution and tries to extract the
tarball:

$ rm /opt/dl/glib-2.30.2.tar.bz2
rm: cannot remove `/opt/dl/glib-2.30.2.tar.bz2': No such file or directory
$ rm -rf build/host-libglib2-2.30.2/
$ make
make -C /home/thomas/projets/buildroot O=/opt/outputs/udisks/.
>>> host-libglib2 2.30.2 Downloading
--2012-03-03 12:06:25--  http://ftp.gnome.org/pub/gnome/sources/glib/2.30/glib-2.30.2.tar.bz2
Resolving ftp.gnome.org... failed: Name or service not known.
wget: unable to resolve host address `ftp.gnome.org'
>>> host-libglib2 2.30.2 Extracting
bzcat /opt/dl//glib-2.30.2.tar.bz2 | tar --strip-components=1 -C /opt/outputs/udisks/build/host-libglib2-2.30.2  -xf -
bzcat: Compressed file ends unexpectedly;
	perhaps it is corrupted?  *Possible* reason follows.
[...]
tar: This does not look like a tar archive
tar: Exiting with failure status due to previous errors
make[1]: *** [/opt/outputs/udisks/build/host-libglib2-2.30.2/.stamp_extracted] Error 2
make: *** [all] Error 2
$ ls -l /opt/dl/glib-2.30.2.tar.bz2
-rw-r--r-- 1 thomas thomas 0 Mar  3 12:12 /opt/dl/glib-2.30.2.tar.bz2

Therefore, this commit modifies DOWNLOAD_WGET so that it removes the
downloaded file if wget returns with an error.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.package.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index ea44c6cef3..59adce1b01 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -235,10 +235,14 @@ define SHOW_EXTERNAL_DEPS_HG
   echo $($(PKG)_SOURCE)
 endef
 
-
+# Download a file using wget. Only download the file if it doesn't
+# already exist in the download directory. If the download fails,
+# remove the file (because wget -O creates a 0-byte file even if the
+# download fails).
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
-	$(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2)
+	$(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2) || \
+	(rm -f $(DL_DIR)/$(2) ; exit 1)
 endef
 
 define SOURCE_CHECK_WGET

From e482a430ec4f8507f5a5caf06b3e72f4c30edfea Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 6 Mar 2012 09:10:43 -0300
Subject: [PATCH 1537/6849] expat: add security patch for CVE-2009-3560

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/expat/expat-2.0.1-CVE-2009-3560.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 package/expat/expat-2.0.1-CVE-2009-3560.patch

diff --git a/package/expat/expat-2.0.1-CVE-2009-3560.patch b/package/expat/expat-2.0.1-CVE-2009-3560.patch
new file mode 100644
index 0000000000..7cadc47b07
--- /dev/null
+++ b/package/expat/expat-2.0.1-CVE-2009-3560.patch
@@ -0,0 +1,14 @@
+http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
+
+--- a/lib/xmlparse.c
++++ b/lib/xmlparse.c
+@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
++      case -XML_TOK_PROLOG_S:
++        tok = -tok;
++        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */

From cb9a5877b88787f176215c5addb8c1be225a39d0 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 4 Mar 2012 22:09:05 +0100
Subject: [PATCH 1538/6849] microperl: fix host build

It misses -lm when compiling miniperl

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/microperl/microperl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index b68e82548a..de5ecd6d86 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -32,7 +32,7 @@ $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
 
 $(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source
 	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR); ./Configure -Dcc="$(HOSTCC)" -de  )
+	(cd $(MICROPERL_DIR); ./Configure -Dcc="$(HOSTCC)" -de -A libs='-lm' )
 	touch $@
 
 

From dc0589b7d6aa057cad083370cb3d9b5547be60e0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 6 Mar 2012 22:55:30 +0100
Subject: [PATCH 1539/6849] barebox: add 2012.03 release

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index c335af06bc..5cc7dca1b3 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,7 +8,7 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_02
+	default BR2_TARGET_BAREBOX_2012_03
 	help
 	  Select the specific Barebox version you want to use
 
@@ -22,6 +22,9 @@ config BR2_TARGET_BAREBOX_2012_01
 config BR2_TARGET_BAREBOX_2012_02
 	bool "2012.02"
 
+config BR2_TARGET_BAREBOX_2012_03
+	bool "2012.03"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -42,6 +45,7 @@ config BR2_TARGET_BAREBOX_VERSION
 	default "2011.12.0"	if BR2_TARGET_BAREBOX_2011_12
 	default "2012.01.0"	if BR2_TARGET_BAREBOX_2012_01
 	default "2012.02.0"	if BR2_TARGET_BAREBOX_2012_02
+	default "2012.03.0"	if BR2_TARGET_BAREBOX_2012_02
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From b5410b6a19db7ef75af8df2fa5659c539ad37c47 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 5 Mar 2012 00:16:08 +0100
Subject: [PATCH 1540/6849] gpsd: dbus interface requires dbus-glib

gpsd uses dbus-glib as the dbus interface, so it should only be built if
libglib2 has been selected.  To simplify things, build dbus support only
if dbus-glib is selected.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/Config.in | 2 ++
 package/gpsd/gpsd.mk   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index d387abdd91..16635dc0db 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -8,6 +8,8 @@ config BR2_PACKAGE_GPSD
 	  making all data on the location/course/velocity of the sensors
 	  available to be queried on TCP port 2947 of the host computer.
 
+	  The D-Bus interface is included if dbus-glib is enabled.
+
 	  http://gpsd.berlios.de/
 
 config BR2_PACKAGE_GPSD_DEVICES
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index be6daeb8ad..94f39aaa6a 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -30,9 +30,9 @@ ifeq ($(BR2_PACKAGE_LIBUSB),y)
 	GPSD_DEPENDENCIES += libusb
 endif
 
-ifeq ($(strip $(BR2_PACKAGE_DBUS)),y)
+ifeq ($(BR2_PACKAGE_DBUS_GLIB),y)
 	GPSD_CONF_OPT += --enable-dbus
-	GPSD_DEPENDENCIES += dbus dbus-glib
+	GPSD_DEPENDENCIES += dbus-glib
 endif
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)

From 6131e47af0359c1cfb92bfebebb1890802e8cfb0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 6 Mar 2012 23:38:39 +0100
Subject: [PATCH 1541/6849] toolchain-external: add linaro 2012.02

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9db5cb64e7..7f57952e0c 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,20 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
+	bool "Linaro 2012.02"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.02 (based on gcc 4.6), Linaro GDB 2012.02, eglibc
+	  2.13. It generates code that runs on all Cortex-A profile
+	  devices, but tuned for the Cortex-A9. The code generated is
+	  Thumb 2, with the softfp calling convention, and uses the
+	  VFPv3-D16 FPU instructions.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
 	bool "Linaro 2012.01"
 	depends on BR2_arm
@@ -448,6 +462,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
+	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a638381d14..01ab91fed5 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -190,6 +190,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01),y)
 TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.01/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.01-20120125_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02),y)
+TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.02/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.02-20120222_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From b50f7a832de2801aeee33146ff5a81945f4078c2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 7 Mar 2012 16:26:50 +0100
Subject: [PATCH 1542/6849] barebox: fix 2012.03 typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Eric Bénard for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 5cc7dca1b3..4048d97dcd 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -45,7 +45,7 @@ config BR2_TARGET_BAREBOX_VERSION
 	default "2011.12.0"	if BR2_TARGET_BAREBOX_2011_12
 	default "2012.01.0"	if BR2_TARGET_BAREBOX_2012_01
 	default "2012.02.0"	if BR2_TARGET_BAREBOX_2012_02
-	default "2012.03.0"	if BR2_TARGET_BAREBOX_2012_02
+	default "2012.03.0"	if BR2_TARGET_BAREBOX_2012_03
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From de66776330813806aaf2dc6e349044ef71e83f11 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Mar 2012 22:36:51 +0100
Subject: [PATCH 1543/6849] kmod: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index acf5f0a915..028d351637 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,6 +1,6 @@
-KMOD_VERSION = 5
+KMOD_VERSION = 6
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
-KMOD_SITE = http://packages.profusion.mobi/kmod/
+KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkg-config
 

From 335260afd429d694cddd7ada705184ad6717826a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 7 Mar 2012 13:52:42 -0300
Subject: [PATCH 1544/6849] microperl: bump to version 5.12.4 and convert to
 gentargets

* Convert microperl to gentargets infrastructure
* Bump to a more modern version 5.12.4
* Introduce the bundle options to simplify people's lives

host-microperl is a fully-fledged perl.

For the time being we can't build XS modules thus breaking
target automake support for example since it requires IO.

target-automake was broken before anyway since the automake version
bump.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/microperl/Config.in                   |  27 +-
 .../microperl-no-signal-handlers.patch        |  22 ++
 package/microperl/microperl-uudmap.patch      |  47 ++++
 package/microperl/microperl.mk                | 250 ++++++++++--------
 4 files changed, 228 insertions(+), 118 deletions(-)
 create mode 100644 package/microperl/microperl-no-signal-handlers.patch
 create mode 100644 package/microperl/microperl-uudmap.patch

diff --git a/package/microperl/Config.in b/package/microperl/Config.in
index 82f964c74c..256e271a67 100644
--- a/package/microperl/Config.in
+++ b/package/microperl/Config.in
@@ -3,12 +3,25 @@ config BR2_PACKAGE_MICROPERL
 	help
 	  Perl without operating-specific functions such as readdir.
 
+if BR2_PACKAGE_MICROPERL
+
 config BR2_PACKAGE_MICROPERL_MODULES
-	string "microperl modules"
-	default ""
-	depends on BR2_PACKAGE_MICROPERL
+	string "additional modules"
+	help
+	  List of space-separated microperl modules to copy to the rootfs.
+
+	  Examples: warnings.pm Getopt/Std.pm Time::Local
+
+	  Module dependencies are not automatic so check your needs.
+	  You can't use XS modules like IO.
+
+menu "module bundles"
+
+config BR2_PACKAGE_MICROPERL_BUNDLE_CGI
+	bool "CGI"
 	help
-	  List of microperl modules to copy to the rootfs.
-	  E.g.
-	  warnings.pm warnings/register.pm strict.pm constant.pm vars.pm
-	  Exporter.pm Exporter/Heavy.pm Carp.pm Getopt/Long.pm
+	  Copy required modules to do CGI scripting.
+
+endmenu
+
+endif
diff --git a/package/microperl/microperl-no-signal-handlers.patch b/package/microperl/microperl-no-signal-handlers.patch
new file mode 100644
index 0000000000..3c9aa418ea
--- /dev/null
+++ b/package/microperl/microperl-no-signal-handlers.patch
@@ -0,0 +1,22 @@
+Backport of http://perl5.git.perl.org/perl.git/commitdiff/01d65469392dfc0a?hp=a82b5f080d91ffe184d8ac4795ac71e72e612c2f
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura perl-5.12.3/miniperlmain.c perl-5.12.3-nosig/miniperlmain.c
+--- perl-5.12.3/miniperlmain.c	2011-01-09 17:20:57.000000000 -0300
++++ perl-5.12.3-nosig/miniperlmain.c	2011-04-14 10:16:53.564639438 -0300
+@@ -116,12 +116,14 @@
+     if (!exitstatus)
+         perl_run(my_perl);
+ 
++#ifndef PERL_MICRO
+     /* Unregister our signal handler before destroying my_perl */
+     for (i = 0; PL_sig_name[i]; i++) {
+ 	if (rsignal_state(PL_sig_num[i]) == (Sighandler_t) PL_csighandlerp) {
+ 	    rsignal(PL_sig_num[i], (Sighandler_t) SIG_DFL);
+ 	}
+     }
++#endif
+ 
+     exitstatus = perl_destruct(my_perl);
+ 
diff --git a/package/microperl/microperl-uudmap.patch b/package/microperl/microperl-uudmap.patch
new file mode 100644
index 0000000000..c72f9c9a14
--- /dev/null
+++ b/package/microperl/microperl-uudmap.patch
@@ -0,0 +1,47 @@
+From a82b5f080d91ffe184d8ac4795ac71e72e612c2f Mon Sep 17 00:00:00 2001
+From: David Leadbeater <dgl@dgl.cx>
+Date: Mon, 7 Mar 2011 18:40:55 +0000
+Subject: [PATCH] microperl: Update generate_uudmap in Makefile.micro
+
+Makefile.micro hadn't kept up with the changes for generate_uudmap,
+make it match the real Makefile.
+---
+ Makefile.micro |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.micro b/Makefile.micro
+index 4b738f5..567d98a 100644
+--- a/Makefile.micro
++++ b/Makefile.micro
+@@ -35,7 +35,7 @@ H = av.h uconfig.h cop.h cv.h embed.h embedvar.h form.h gv.h handy.h \
+ HE = $(H) EXTERN.h
+ 
+ clean:
+-	-rm -f $(O) microperl generate_uudmap$(_X) uudmap.h
++	-rm -f $(O) microperl generate_uudmap$(_X) uudmap.h bitcount.h
+ 
+ distclean:	clean
+ 
+@@ -74,7 +74,7 @@ udoop$(_O):	$(HE) doop.c
+ udump$(_O):	$(HE) dump.c regcomp.h regnodes.h
+ 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) dump.c
+ 
+-uglobals$(_O):	$(H) globals.c INTERN.h perlapi.h
++uglobals$(_O):	$(H) globals.c INTERN.h perlapi.h uudmap.h bitcount.h
+ 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) globals.c
+ 
+ ugv$(_O):	$(HE) gv.c
+@@ -173,8 +173,8 @@ uutil$(_O):	$(HE) util.c
+ uperlapi$(_O):	$(HE) perlapi.c perlapi.h
+ 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c
+ 
+-uudmap.h: generate_uudmap$(_X)
+-	$(RUN) ./generate_uudmap$(_X) >uudmap.h
++uudmap.h bitcount.h: generate_uudmap$(_X)
++	$(RUN) ./generate_uudmap$(_X) uudmap.h bitcount.h
+ 
+ generate_uudmap$(_O): generate_uudmap.c
+ 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c
+-- 
+1.6.5.2.74.g610f9.dirty
+
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index de5ecd6d86..d5b5a7c4e5 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -3,122 +3,150 @@
 # microperl
 #
 #############################################################
-MICROPERL_MAJ=5
-MICROPERL_VERSION=$(MICROPERL_MAJ).8.8
-MICROPERL_SOURCE=perl-$(MICROPERL_VERSION).tar.bz2
-MICROPERL_CAT:=$(BZCAT)
-MICROPERL_SITE=ftp://ftp.cpan.org/pub/CPAN/src/5.0
-MICROPERL_DIR=$(BUILD_DIR)/perl-$(MICROPERL_VERSION)
 
-MICROPERL_MODS_DIR=/usr/lib/perl$(MICROPERL_MAJ)/$(MICROPERL_VERSION)
-MICROPERL_MODS=$(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES))
-ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
-MICROPERL_MODS+=File/Basename.pm Errno.pm Config.pm IO/File.pm Symbol.pm \
-	SelectSaver.pm IO/Seekable.pm IO/Handle.pm IO.pm XSLoader.pm \
-	DynaLoader.pm AutoLoader.pm Carp/Heavy.pm
+MICROPERL_VERSION = 5.12.4
+MICROPERL_SITE = http://www.cpan.org/src/5.0
+MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2
+MICROPERL_DEPENDENCIES = host-microperl
+MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION)
+MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(REAL_GNU_TARGET_NAME)
+MICROPERL_MODS = $(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES))
+
+# Minimal set of modules required for 'perl -V' to work
+MICROPERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl
+MICROPERL_BASE_MODS = strict.pm
+
+# CGI bundle
+ifeq ($(BR2_PACKAGE_MICROPERL_BUNDLE_CGI),y)
+MICROPERL_MODS += constant.pm CGI CGI.pm Carp.pm Exporter.pm overload.pm \
+	vars.pm warnings.pm warnings/register.pm
 endif
-$(DL_DIR)/$(MICROPERL_SOURCE):
-	$(call DOWNLOAD,$(MICROPERL_SITE),$(MICROPERL_SOURCE))
 
-$(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
-	$(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	# makedepend contains bashisms
-	$(SED) 's~sh ./makedepend~bash ./makedepend~' \
-		$(MICROPERL_DIR)/Makefile.SH \
-		$(MICROPERL_DIR)/x2p/Makefile.SH \
-		$(MICROPERL_DIR)/pod/Makefile.SH
-	chmod -R u+w $(MICROPERL_DIR)
-	touch $@
-
-$(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source
-	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR); ./Configure -Dcc="$(HOSTCC)" -de -A libs='-lm' )
-	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
-	$(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
-	$(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))" \
-	)
-	(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",' \
-		 ./uconfig.h; \
-	)
-	touch $@
-
-$(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.configured
-	$(MAKE) -f $(MICROPERL_DIR)/Makefile.micro CC="$(TARGET_CC)" \
-		OPTIMIZE="$(TARGET_CFLAGS)" -C $(MICROPERL_DIR)
-ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
-	#(cd $(@D); \
-	# CONFIG=uconfig.h $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
-	#)
+# Host microperl is actually full-blown perl
+define HOST_MICROPERL_CONFIGURE_CMDS
+	cd $(@D) ; \
+	./Configure -Dcc="$(HOSTCC)" -Dprefix="$(HOST_DIR)/usr" \
+		-Dloclibpth='/lib /lib64 /usr/lib /usr/lib64' -des
+endef
+
+define HOST_MICROPERL_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_MICROPERL_INSTALL_CMDS
+	$(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_ENDIAN),"BIG")
+define MICROPERL_BIGENDIAN
+	$(SED) '/^byteorder=/d' $(@D)/uconfig.sh
+	echo "byteorder='4321'" >>$(@D)/uconfig.sh
+endef
 endif
 
-$(TARGET_DIR)/usr/bin/microperl: $(MICROPERL_DIR)/microperl
-ifneq ($(MICROPERL_MODS),)
-	(cd $(MICROPERL_DIR); \
-	 for i in $(patsubst %,$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/%,$(dir $(MICROPERL_MODS))); do \
-		[ -d $$i ] || mkdir -p $$i; \
-	 done; \
-	 for i in $(MICROPERL_MODS); do \
-	 cp -dpf $(MICROPERL_DIR)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
-	 done; \
-	)
-endif
-	cp -dpf $(MICROPERL_DIR)/microperl $@
-ifneq ($(BR2_STRIP_none),y)
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
+ifeq ($(BR2_LARGEFILE),y)
+define MICROPERL_LARGEFILE
+	$(SED) '/^uselargefiles=/d' $(@D)/uconfig.sh
+	echo "uselargefiles='define'" >>$(@D)/uconfig.sh
+endef
 endif
-	(cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;)
-
-microperl: $(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
-	-rmdir $(TARGET_DIR)/usr/lib/perl$(MICROPERL_MAJ)
-	-$(MAKE) -C $(MICROPERL_DIR) -f Makefile.micro clean
-
-microperl-dirclean:
-	rm -rf $(MICROPERL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MICROPERL),y)
-TARGETS+=microperl
+ifeq ($(BR2_USE_WCHAR),y)
+define MICROPERL_WCHAR
+	$(SED) '/^d_mbstowcs=/d' -e '/^d_mbtowc=/d' -e '/^d_wcstombs=/d' \
+		-e '/^d_wctomb=/d' $(@D)/uconfig.sh
+	echo "d_mbstowcs='define'" >>$(@D)/uconfig.sh
+	echo "d_mbtowc='define'" >>$(@D)/uconfig.sh
+	echo "d_wcstombs='define'" >>$(@D)/uconfig.sh
+	echo "d_wctomb='define'" >>$(@D)/uconfig.sh
+endef
 endif
+
+define MICROPERL_CONFIGURE_CMDS
+	$(SED) '/^archlib=/d' -e '/^archlibexp=/d' -e '/^optimize=/d' \
+		-e '/^archname=/d' -e '/^d_poll=/d' -e '/^i_poll=/d' \
+		-e '/^osname=/d' -e '/^u32type=/d' -e '/^d_archlib=/d' \
+		-e '/^d_memset=/d' -e '/^i_fcntl=/d' -e '/^useperlio=/d' \
+		-e '/^need_va_copy=/d' $(@D)/uconfig.sh
+	$(SED) 's/5.12/$(MICROPERL_VERSION)/' $(@D)/uconfig.sh
+	echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh
+	echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh
+	echo "d_archlib='define'" >>$(@D)/uconfig.sh
+	echo "archname='$(REAL_GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh
+	echo "osname='linux'" >>$(@D)/uconfig.sh
+	echo "cc='$(TARGET_CC)'" >>$(@D)/uconfig.sh
+	echo "ccflags='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh
+	echo "optimize='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh
+	echo "usecrosscompile='define'" >>$(@D)/uconfig.sh
+	echo "d_memset='define'" >>$(@D)/uconfig.sh
+	echo "i_fcntl='define'" >>$(@D)/uconfig.sh
+	echo "useperlio='define'" >>$(@D)/uconfig.sh
+	echo "u32type='unsigned int'" >>$(@D)/uconfig.sh
+	echo "need_va_copy='define'" >>$(@D)/uconfig.sh
+	echo "d_poll='define'" >>$(@D)/uconfig.sh
+	echo "i_poll='define'" >>$(@D)/uconfig.sh
+	$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
+	$(SED) 's/local\///' $(@D)/uconfig.sh
+	$(MICROPERL_BIGENDIAN)
+	$(MICROPERL_LARGEFILE)
+	$(MICROPERL_WCHAR)
+	$(MAKE) -C $(@D) -f Makefile.micro regen_uconfig
+	cp -f $(@D)/uconfig.h $(@D)/config.h
+	cp -f $(@D)/uconfig.sh $(@D)/config.sh
+	echo "ccname='$(TARGET_CC)'" >>$(@D)/config.sh
+	echo "PERL_CONFIG_SH=true" >>$(@D)/config.sh
+	cd $(@D) ; $(HOST_DIR)/usr/bin/perl make_patchnum.pl ; \
+	$(HOST_DIR)/usr/bin/perl configpm
+endef
+
+define MICROPERL_BUILD_CMDS
+	$(MAKE) -f Makefile.micro -C $(@D) \
+		CC="$(HOSTCC)" bitcount.h
+	$(MAKE) -f Makefile.micro -C $(@D) \
+		CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)"
+endef
+
+# Some extensions don't need a build run
+# We try to build anyway to avoid a huge black list
+# Just ignore make_ext.pl warning/errors
+define MICROPERL_BUILD_EXTENSIONS
+	for i in $(MICROPERL_MODS); do \
+	cd $(@D); ln -sf $(HOST_DIR)/usr/bin/perl miniperl; \
+		PERL5LIB=$(TARGET_DIR)/$(MICROPERL_ARCH_DIR) \
+		$(HOST_DIR)/usr/bin/perl make_ext.pl MAKE="$(MAKE)" --nonxs \
+		`echo $$i|sed -e 's/.pm//'`; \
+	done
+endef
+
+define MICROPERL_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/microperl $(TARGET_DIR)/usr/bin/microperl
+	ln -sf microperl $(TARGET_DIR)/usr/bin/perl
+	for i in $(MICROPERL_ARCH_MODS); do \
+		$(INSTALL) -m 0644 -D $(@D)/lib/$$i \
+			$(TARGET_DIR)/$(MICROPERL_ARCH_DIR)/$$i; \
+	done
+	for i in $(MICROPERL_BASE_MODS); do \
+		$(INSTALL) -m 0644 -D $(@D)/lib/$$i \
+			$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+	done
+	$(MICROPERL_BUILD_EXTENSIONS)
+	for i in $(MICROPERL_MODS); do \
+		j=`echo $$i|cut -d : -f 1` ; \
+		[ -d $(@D)/lib/$$j ] && cp -af $(@D)/lib/$$j \
+			$(TARGET_DIR)/$(MICROPERL_MODS_DIR) ; \
+		[ -f $(@D)/lib/$$i ] && $(INSTALL) -m 0644 -D $(@D)/lib/$$i \
+			$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+	done
+	# Remove test files
+	find $(TARGET_DIR)/$(MICROPERL_MODS_DIR) -type f -name *.t \
+		-exec rm -f {} \;
+endef
+
+define MICROPERL_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/perl
+	rm -f $(TARGET_DIR)/usr/bin/microperl
+	rm -rf $(TARGET_DIR)/usr/lib/perl5
+endef
+
+$(eval $(call GENTARGETS))
+$(eval $(call GENTARGETS,host))

From 7ea11dafff37c5403432f691cf3c46d1d5566e46 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 7 Mar 2012 20:26:49 +0100
Subject: [PATCH 1545/6849] ccache: Force ccache to use its internal zlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The problem is that without this, ccache would link against the zlib
of the build system, but we might build and install a different
version of zlib in $(O)/host afterwards, which ccache will pick
up. This might break if there is a version mismatch. A solution would
be to add host-zlib has a dependency of ccache, but it would require
tuning the zlib .mk file to use HOSTCC_NOCCACHE as the
compiler. Instead, we take the easy path: tell ccache to use its
internal copy of zlib, so that ccache has zero dependency besides the
C library.

Fixes bug #4808.

Thanks to Raúl Sánchez Siles <rsanchezs@infoglobal.es> for reporting
the bug and testing the proposed solution.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/ccache.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 9155441087..393989f546 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -14,6 +14,17 @@ CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
 HOST_CCACHE_CONF_ENV = \
 	CC="$(HOSTCC_NOCCACHE)"
 
+# Force ccache to use its internal zlib. The problem is that without
+# this, ccache would link against the zlib of the build system, but we
+# might build and install a different version of zlib in $(O)/host
+# afterwards, which ccache will pick up. This might break if there is
+# a version mismatch. A solution would be to add host-zlib has a
+# dependency of ccache, but it would require tuning the zlib .mk file
+# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy
+# path: tell ccache to use its internal copy of zlib, so that ccache
+# has zero dependency besides the C library.
+HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no
+
 # We directly hardcode the cache location into the binary, as it is
 # much easier to handle than passing an environment variable.
 define HOST_CCACHE_FIX_CCACHE_DIR

From f044e03776652d4f822c2f3787142bda34364965 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 7 Mar 2012 20:26:50 +0100
Subject: [PATCH 1546/6849] ccache: set COMPILERCHECK to 'none'

This allows ccache to re-use its cache contents even if the compiler
binary mtime has changed. It is the simplest approach to solve this
problem, and it works for the internal, external and crosstool-ng
toolchain backends.

Of course, it leaves the user responsible for invalidating the cache
when necessary, but there doesn't seem to be a real good solution that
allows both to: 1/ keep the cache contents accross builds and re-use
it and 2/ invalidate the cache automatically when the compiler chances
in an incompatible way.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                |  7 +++++++
 package/ccache/ccache.mk | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Config.in b/Config.in
index 8579a63b18..2002996fe3 100644
--- a/Config.in
+++ b/Config.in
@@ -191,6 +191,13 @@ config BR2_CCACHE
 	  up future builds. The cache is stored in
 	  $HOME/.buildroot-ccache.
 
+	  Note that Buildroot does not try to invalidate the cache
+	  contents when the compiler changes in an incompatible
+	  way. Therefore, if you make a change to the compiler version
+	  and/or configuration, you are responsible for purging the
+	  ccache cache by removing the $HOME/.buildroot-ccache
+	  directory.
+
 config BR2_DEPRECATED
 	bool "Show packages that are deprecated or obsolete"
 	help
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 393989f546..f71376ee85 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -25,10 +25,18 @@ HOST_CCACHE_CONF_ENV = \
 # has zero dependency besides the C library.
 HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no
 
-# We directly hardcode the cache location into the binary, as it is
-# much easier to handle than passing an environment variable.
+# We directly hardcode configuration into the binary, as it is much
+# easier to handle than passing an environment variable. Our
+# configuration is:
+#  - the cache location
+#  - the fact that ccache shouldn't use the compiler binary mtime to
+#  - detect a change in the compiler, because in the context of
+#  - Buildroot, that completely defeats the purpose of ccache. Of
+#  - course, that leaves the user responsible for purging its cache
+#  - when the compiler changes.
 define HOST_CCACHE_FIX_CCACHE_DIR
 	sed -i 's,getenv("CCACHE_DIR"),"$(CCACHE_CACHE_DIR)",' $(@D)/ccache.c
+	sed -i 's,getenv("CCACHE_COMPILERCHECK"),"none",' $(@D)/ccache.c
 endef
 
 HOST_CCACHE_POST_CONFIGURE_HOOKS += \

From 608e6af167bd692611c9f60efe4f57dadc8b7fd7 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 9 Mar 2012 13:18:03 +0000
Subject: [PATCH 1547/6849] New package minicom

[Peter: fix whitespace and deps (wchar, ncurses, only iconv if !locale)]
Signed-off-by: Simon Dawson <spdawson at gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/minicom/Config.in  | 14 ++++++++++++++
 package/minicom/minicom.mk | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 package/minicom/Config.in
 create mode 100644 package/minicom/minicom.mk

diff --git a/package/Config.in b/package/Config.in
index 41cbb8c1a0..c582f8a5ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -197,6 +197,7 @@ source "package/lvm2/Config.in"
 source "package/makedevs/Config.in"
 source "package/mdadm/Config.in"
 source "package/memtester/Config.in"
+source "package/minicom/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/ntfsprogs/Config.in"
diff --git a/package/minicom/Config.in b/package/minicom/Config.in
new file mode 100644
index 0000000000..a8a2635382
--- /dev/null
+++ b/package/minicom/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_MINICOM
+	bool "minicom"
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_NCURSES
+	help
+	  Minicom is a menu driven communications program.
+	  It emulates ANSI and VT102 terminals. It has a
+	  dialing directory and auto zmodem download.
+
+	  http://alioth.debian.org/projects/minicom
+
+comment "minicom requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
new file mode 100644
index 0000000000..cb09b839f1
--- /dev/null
+++ b/package/minicom/minicom.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# minicom
+#
+#############################################################
+MINICOM_VERSION = 2.6
+MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
+MINICOM_SITE = http://alioth.debian.org/frs/download.php/3689/
+
+# pkg-config is only used to check for liblockdev, which we don't have
+# in BR, so instead of adding host-pkg-config as a dependency, simply
+# make sure the host version isn't used so we don't end up with problems
+# if people have liblockdev1-dev installed
+MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
+
+MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv)
+
+$(eval $(call AUTOTARGETS))

From edd2748149ee386aeb336ed3584dacbb596bf490 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Mar 2012 15:29:43 +0100
Subject: [PATCH 1548/6849] minicom: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/minicom/minicom.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index cb09b839f1..ab65bb6c04 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -3,9 +3,9 @@
 # minicom
 #
 #############################################################
-MINICOM_VERSION = 2.6
+MINICOM_VERSION = 2.6.1
 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
-MINICOM_SITE = http://alioth.debian.org/frs/download.php/3689/
+MINICOM_SITE = http://alioth.debian.org/frs/download.php/3700/
 
 # pkg-config is only used to check for liblockdev, which we don't have
 # in BR, so instead of adding host-pkg-config as a dependency, simply

From 7f65decfa7a3dcaa49d63a367a872094167b5edc Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 9 Mar 2012 15:39:46 +0100
Subject: [PATCH 1549/6849] tiff: bump to 4.0.1

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tiff/tiff.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index ed05bf1965..3ab0d4f8fb 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -3,11 +3,10 @@
 # tiff
 #
 #############################################################
-TIFF_VERSION:=3.9.4
-TIFF_SITE:=ftp://ftp.remotesensing.org/pub/libtiff
-TIFF_SOURCE:=tiff-$(TIFF_VERSION).tar.gz
+TIFF_VERSION = 4.0.1
+TIFF_SITE = ftp://ftp.remotesensing.org/pub/libtiff
+TIFF_SOURCE = tiff-$(TIFF_VERSION).tar.gz
 TIFF_INSTALL_STAGING = YES
-TIFF_INSTALL_TARGET = YES
 TIFF_CONF_OPT = \
 	--disable-cxx \
 	--without-x \

From 27602a43f86b97722046b75806c732e9e992fb73 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 9 Mar 2012 15:39:47 +0100
Subject: [PATCH 1550/6849] feh: bump to 2.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index f459f8a911..c461ac6948 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.3
+FEH_VERSION = 2.4
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From 96f8e3db09dfc8290a7259ce3645f5cd17c3ec2b Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 9 Mar 2012 15:39:49 +0100
Subject: [PATCH 1551/6849] xdriver_xf86-video-fbdev: bump to 0.4.2

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 600335e7e1..7634d92904 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.1
+XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.2
 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From e2b124d2a848660d022e9f1d74badf34454b6b0c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 9 Mar 2012 15:39:48 +0100
Subject: [PATCH 1552/6849] network-manager: remove double libnl dependency

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/network-manager/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 9708a11004..fb0c0e9eed 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS
-	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_UTIL_LINUX

From 6ab7f49529d18ac079e595003794806e8b87d156 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 9 Mar 2012 15:39:50 +0100
Subject: [PATCH 1553/6849] bluez_utils: bump to 4.99

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 025f31adbd..eb42e239b3 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BLUEZ_UTILS_VERSION = 4.98
+BLUEZ_UTILS_VERSION = 4.99
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES

From 790fcac794c5144b1d5ca20a4560f46a7a7f2f9f Mon Sep 17 00:00:00 2001
From: Phil Edworthy <phil.edworthy@renesas.com>
Date: Fri, 9 Mar 2012 09:43:42 +0000
Subject: [PATCH 1554/6849] sh: Add additional ttySCs

There are a couple of Renesas SH devices with 8 serial ports used.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/securetty           | 2 ++
 target/generic/device_table_dev.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/skeleton/etc/securetty b/fs/skeleton/etc/securetty
index 547ceda573..c96f2fb9f3 100644
--- a/fs/skeleton/etc/securetty
+++ b/fs/skeleton/etc/securetty
@@ -46,4 +46,6 @@ ttySC2
 ttySC3
 ttySC4
 ttySC5
+ttySC6
+ttySC7
 ttyGS0
diff --git a/target/generic/device_table_dev.txt b/target/generic/device_table_dev.txt
index a3d53d460a..d1d1e110c5 100644
--- a/target/generic/device_table_dev.txt
+++ b/target/generic/device_table_dev.txt
@@ -32,7 +32,7 @@
 /dev/ttyCPM	c	666	0	0	204	46	0	1	4
 /dev/ttyAMA	c	666	0	0	204	64	0	1	4
 /dev/ttySAC	c	666	0	0	204	64	0	1	4
-/dev/ttySC	c	666	0	0	204	8	0	1	6
+/dev/ttySC	c	666	0	0	204	8	0	1	8
 /dev/ttyPSC	c	666	0	0	204	148	0	1	4
 /dev/ttyUL	c	666	0	0	204	187	0	1	4
 /dev/ttymxc	c	666	0	0	207	16	0	1	3

From d2fd57efe371a6757c85fe20e58d1a26e820df3d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Mar 2012 11:59:27 -0300
Subject: [PATCH 1555/6849] packages: remove redundant AUTORECONF=NO
 declarations

[Peter: handle libgtk2 as well]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/blackbox/blackbox.mk                         | 1 -
 package/docker/docker.mk                             | 1 -
 package/fbdump/fbdump.mk                             | 1 -
 package/fltk/fltk.mk                                 | 4 ----
 package/gqview/gqview.mk                             | 1 -
 package/gvfs/gvfs.mk                                 | 1 -
 package/iperf/iperf.mk                               | 3 ---
 package/ipkg/ipkg.mk                                 | 1 -
 package/leafpad/leafpad.mk                           | 1 -
 package/libconfig/libconfig.mk                       | 1 -
 package/libconfuse/libconfuse.mk                     | 2 --
 package/libevent/libevent.mk                         | 2 --
 package/libgtk2/libgtk2.mk                           | 1 -
 package/libsexy/libsexy.mk                           | 1 -
 package/mdadm/mdadm.mk                               | 3 ---
 package/multimedia/speex/speex.mk                    | 1 -
 package/netcat/netcat.mk                             | 1 -
 package/pcmanfm/pcmanfm.mk                           | 1 -
 package/rpm/rpm.mk                                   | 2 --
 package/samba/samba.mk                               | 3 ---
 package/startup-notification/startup-notification.mk | 1 -
 package/torsmo/torsmo.mk                             | 1 -
 package/xvkbd/xvkbd.mk                               | 1 -
 23 files changed, 35 deletions(-)

diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index 6836c96b60..8e8ebc9959 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -7,7 +7,6 @@
 BLACKBOX_VERSION:=0.70.1
 BLACKBOX_SOURCE:=blackbox-$(BLACKBOX_VERSION).tar.bz2
 BLACKBOX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/blackboxwm/
-BLACKBOX_AUTORECONF:=NO
 BLACKBOX_INSTALL_STAGING:=NO
 BLACKBOX_INSTALL_TARGET:=YES
 
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 59282a2734..0e9eeaa9b6 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -6,7 +6,6 @@
 DOCKER_VERSION = 1.5
 DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
 DOCKER_SITE = http://icculus.org/openbox/2/docker
-DOCKER_AUTORECONF = NO
 DOCKER_INSTALL_STAGING = NO
 DOCKER_INSTALL_TARGET = YES
 
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index 8a5a44e464..eca432e217 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -6,7 +6,6 @@
 FBDUMP_VERSION:=0.4.2
 FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
-FBDUMP_AUTORECONF = NO
 
 $(eval $(call AUTOTARGETS))
 
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 164c51874d..ea2bef022c 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -7,15 +7,11 @@
 FLTK_VERSION = 1.1.7
 FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.bz2
 FLTK_SITE = http://ftp.easysw.com/pub/fltk/1.1.7/
-FLTK_AUTORECONF = NO
 FLTK_INSTALL_STAGING = YES
 FLTK_INSTALL_TARGET = YES
-
 FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
-
 FLTK_CONF_OPT = --enable-threads --with-x
-
 FLTK_DEPENDENCIES = xserver_xorg-server xlib_libXt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 25d9739085..5695bf7c68 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -6,7 +6,6 @@
 GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
-GQVIEW_AUTORECONF = NO
 GQVIEW_INSTALL_STAGING = NO
 GQVIEW_INSTALL_TARGET = YES
 
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index b33b7e5185..05a54a31d4 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -10,7 +10,6 @@ GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
 GVFS_INSTALL_TARGET = YES
-GVFS_AUTORECONF = NO
 GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
 
 GVFS_CONF_OPT = \
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index b774cc3251..50cb3151fe 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -6,9 +6,6 @@
 IPERF_VERSION = 2.0.5
 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
 IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
-
-IPERF_AUTORECONF = NO
-
 IPERF_INSTALL_STAGING = NO
 IPERF_INSTALL_TARGET = YES
 
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
index 64dd0d57ce..6d5ff5d20f 100644
--- a/package/ipkg/ipkg.mk
+++ b/package/ipkg/ipkg.mk
@@ -7,7 +7,6 @@
 IPKG_VERSION = 0.99.163
 IPKG_SOURCE = ipkg-$(IPKG_VERSION).tar.gz
 IPKG_SITE = http://www.handhelds.org/download/packages/ipkg
-IPKG_AUTORECONF = NO
 IPKG_INSTALL_STAGING = YES
 IPKG_INSTALL_TARGET = YES
 
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index e855b0382b..9f5b0b7b03 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -6,7 +6,6 @@
 LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
-LEAFPAD_AUTORECONF = NO
 LEAFPAD_INSTALL_STAGING = NO
 LEAFPAD_INSTALL_TARGET = YES
 
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 28b3d5f501..38e9a59d8e 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -6,7 +6,6 @@
 LIBCONFIG_VERSION:=1.4.6
 LIBCONFIG_SOURCE:=libconfig-$(LIBCONFIG_VERSION).tar.gz
 LIBCONFIG_SITE:=http://www.hyperrealm.com/libconfig/
-LIBCONFIG_AUTORECONF:=NO
 LIBCONFIG_INSTALL_STAGING:=YES
 LIBCONFIG_INSTALL_TARGET:=YES
 
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index ea10d6eefe..feababf825 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -6,9 +6,7 @@
 LIBCONFUSE_VERSION = 2.7
 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
 LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
-LIBCONFUSE_AUTORECONF = NO
 LIBCONFUSE_INSTALL_STAGING = YES
-
 LIBCONFUSE_CONF_OPT = --disable-rpath
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 76fb627a17..73ad2b06bc 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -6,8 +6,6 @@
 LIBEVENT_VERSION = 2.0.14
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
 LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
-
-LIBEVENT_AUTORECONF = NO
 LIBEVENT_INSTALL_STAGING = YES
 LIBEVENT_INSTALL_TARGET = YES
 
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index cfdc8f9215..a6abd077e6 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -9,7 +9,6 @@ LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
 LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR)
-LIBGTK2_AUTORECONF = NO
 LIBGTK2_INSTALL_STAGING = YES
 LIBGTK2_INSTALL_TARGET = YES
 
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
index aca4f7f773..9f33d29f28 100644
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -7,7 +7,6 @@
 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 = libgtk2 libxml2
 LIBSEXY_INSTALL_TARGET = YES
 LIBSEXY_INSTALL_STAGING = YES
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 087a2d2c70..581984ae7f 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -6,9 +6,6 @@
 MDADM_VERSION:=2.6.9
 MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
 MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
-
-MDADM_AUTORECONF = NO
-
 MDADM_INSTALL_STAGING = NO
 MDADM_INSTALL_TARGET = YES
 
diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk
index dfb426bca6..0aca871e6a 100644
--- a/package/multimedia/speex/speex.mk
+++ b/package/multimedia/speex/speex.mk
@@ -6,7 +6,6 @@
 SPEEX_VERSION=1.2rc1
 SPEEX_SOURCE=speex-$(SPEEX_VERSION).tar.gz
 SPEEX_SITE=http://downloads.us.xiph.org/releases/speex
-SPEEX_AUTORECONF = NO
 SPEEX_INSTALL_STAGING = YES
 SPEEX_INSTALL_TARGET = YES
 SPEEX_DEPENDENCIES = libogg
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index dfd0b5ad5c..834262271f 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -7,7 +7,6 @@
 NETCAT_VERSION:=0.7.1
 NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz
 NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netcat
-NETCAT_AUTORECONF:=NO
 NETCAT_INSTALL_STAGING:=NO
 NETCAT_INSTALL_TARGET:=YES
 
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 72c2369eab..ba0da468d9 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -6,7 +6,6 @@
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
-PCMANFM_AUTORECONF = NO
 PCMANFM_INSTALL_STAGING = NO
 PCMANFM_INSTALL_TARGET = YES
 
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 4d8fe21fa6..9f42ee18d5 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -5,8 +5,6 @@
 #############################################################
 RPM_VERSION = 5.2.0
 RPM_SITE = http://rpm5.org/files/rpm/rpm-5.2/
-RPM_AUTORECONF = NO
-
 RPM_DEPENDENCIES = zlib beecrypt neon popt
 
 RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 4e02682ab6..5887065964 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -6,10 +6,7 @@
 
 SAMBA_VERSION = 3.5.12
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
-
 SAMBA_SUBDIR = source3
-SAMBA_AUTORECONF = NO
-
 SAMBA_INSTALL_STAGING = YES
 SAMBA_INSTALL_TARGET = YES
 
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index bebb8e9365..cbcaad3a3f 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -6,7 +6,6 @@
 STARTUP_NOTIFICATION_VERSION = 0.9
 STARTUP_NOTIFICATION_SOURCE = startup-notification-$(STARTUP_NOTIFICATION_VERSION).tar.gz
 STARTUP_NOTIFICATION_SITE = http://freedesktop.org/software/startup-notification/releases
-STARTUP_NOTIFICATION_AUTORECONF = NO
 STARTUP_NOTIFICATION_INSTALL_STAGING = YES
 STARTUP_NOTIFICATION_INSTALL_TARGET = YES
 STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index f81ce51f2a..7cce110a8a 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -6,7 +6,6 @@
 TORSMO_VERSION = 0.18
 TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
 TORSMO_SITE = http://avr32linux.org/twiki/pub/Main/Torsmo
-TORSMO_AUTORECONF = NO
 TORSMO_INSTALL_STAGING = NO
 TORSMO_INSTALL_TARGET = YES
 
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 9d7d506e2d..cdc8ddedfd 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -6,7 +6,6 @@
 XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
-XVKBD_AUTORECONF = NO
 XVKBD_INSTALL_STAGING = NO
 XVKBD_INSTALL_TARGET = YES
 

From f0f84dfde55fda967ca77d66e5db7948dea43764 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Mar 2012 11:59:28 -0300
Subject: [PATCH 1556/6849] packages: remove redundant INSTALL_STAGING=NO
 declarations

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/at/at.mk                                   | 2 --
 package/blackbox/blackbox.mk                       | 1 -
 package/crosstool-ng/crosstool-ng.mk               | 1 -
 package/docker/docker.mk                           | 1 -
 package/games/rubix/rubix.mk                       | 1 -
 package/gqview/gqview.mk                           | 1 -
 package/iperf/iperf.mk                             | 1 -
 package/leafpad/leafpad.mk                         | 1 -
 package/mdadm/mdadm.mk                             | 1 -
 package/netcat/netcat.mk                           | 1 -
 package/pcmanfm/pcmanfm.mk                         | 3 ---
 package/torsmo/torsmo.mk                           | 1 -
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 --
 package/x11vnc/x11vnc.mk                           | 1 -
 package/xvkbd/xvkbd.mk                             | 1 -
 15 files changed, 19 deletions(-)

diff --git a/package/at/at.mk b/package/at/at.mk
index 4270c838bc..92fb838d61 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -9,9 +9,7 @@ AT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
 # missing deps for parsetime.l
 AT_MAKE = $(MAKE1)
 AT_AUTORECONF = YES
-AT_INSTALL_STAGING = NO
 AT_INSTALL_TARGET = YES
-
 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex)
 
 AT_CONF_OPT = \
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index 8e8ebc9959..fd7525507f 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -7,7 +7,6 @@
 BLACKBOX_VERSION:=0.70.1
 BLACKBOX_SOURCE:=blackbox-$(BLACKBOX_VERSION).tar.bz2
 BLACKBOX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/blackboxwm/
-BLACKBOX_INSTALL_STAGING:=NO
 BLACKBOX_INSTALL_TARGET:=YES
 
 BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index a2069a90c2..217b2f51ea 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,7 +1,6 @@
 CROSSTOOL_NG_VERSION           = 1.13.4
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
-CROSSTOOL_NG_INSTALL_STAGING   = NO
 CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
 HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 0e9eeaa9b6..ce25e4da67 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -6,7 +6,6 @@
 DOCKER_VERSION = 1.5
 DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
 DOCKER_SITE = http://icculus.org/openbox/2/docker
-DOCKER_INSTALL_STAGING = NO
 DOCKER_INSTALL_TARGET = YES
 
 DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
diff --git a/package/games/rubix/rubix.mk b/package/games/rubix/rubix.mk
index 2fb051a1c4..5248b9e83e 100644
--- a/package/games/rubix/rubix.mk
+++ b/package/games/rubix/rubix.mk
@@ -6,7 +6,6 @@
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
 RUBIX_SITE = http://avr32linux.org/twiki/pub/Main/Rubix
-RUBIX_INSTALL_STAGING = NO
 RUBIX_INSTALL_TARGET = YES
 RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 5695bf7c68..a86d895855 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -6,7 +6,6 @@
 GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
-GQVIEW_INSTALL_STAGING = NO
 GQVIEW_INSTALL_TARGET = YES
 
 GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 50cb3151fe..7f6b1b8f89 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -6,7 +6,6 @@
 IPERF_VERSION = 2.0.5
 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
 IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
-IPERF_INSTALL_STAGING = NO
 IPERF_INSTALL_TARGET = YES
 
 IPERF_CONF_ENV = \
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index 9f5b0b7b03..56c25dfc0d 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -6,7 +6,6 @@
 LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
-LEAFPAD_INSTALL_STAGING = NO
 LEAFPAD_INSTALL_TARGET = YES
 
 LEAFPAD_DEPENDENCIES = libgtk2
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 581984ae7f..4d8e1af434 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -6,7 +6,6 @@
 MDADM_VERSION:=2.6.9
 MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
 MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
-MDADM_INSTALL_STAGING = NO
 MDADM_INSTALL_TARGET = YES
 
 MDADM_MAKE_OPT = \
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 834262271f..a668e9a748 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -7,7 +7,6 @@
 NETCAT_VERSION:=0.7.1
 NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz
 NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netcat
-NETCAT_INSTALL_STAGING:=NO
 NETCAT_INSTALL_TARGET:=YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index ba0da468d9..d1d3377927 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -6,11 +6,8 @@
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
-PCMANFM_INSTALL_STAGING = NO
 PCMANFM_INSTALL_TARGET = YES
-
 PCMANFM_CONF_OPT = --disable-hal
-
 PCMANFM_DEPENDENCIES = host-pkg-config libgtk2 gamin startup-notification xserver_xorg-server
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index 7cce110a8a..fb97639205 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -6,7 +6,6 @@
 TORSMO_VERSION = 0.18
 TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
 TORSMO_SITE = http://avr32linux.org/twiki/pub/Main/Torsmo
-TORSMO_INSTALL_STAGING = NO
 TORSMO_INSTALL_TARGET = YES
 
 # help2man doesn't work when cross compiling
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 61cd9fcfd2..fd3f02d8cb 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -6,10 +6,8 @@
 XKEYBOARD_CONFIG_VERSION = 2.0
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_INSTALL_STAGING = NO
 XKEYBOARD_CONFIG_INSTALL_TARGET = YES
 XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
-
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index b423f46dee..0fc885c825 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -6,7 +6,6 @@
 X11VNC_VERSION = 0.9.3
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
 X11VNC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver
-X11VNC_INSTALL_STAGING = NO
 X11VNC_INSTALL_TARGET = YES
 
 X11VNC_CONF_OPT = \
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index cdc8ddedfd..7e03c93128 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -6,7 +6,6 @@
 XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
-XVKBD_INSTALL_STAGING = NO
 XVKBD_INSTALL_TARGET = YES
 
 XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \

From 9ae23e391146914b3ae29294210e15d7be0e7b61 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 6 Mar 2012 09:22:30 -0300
Subject: [PATCH 1557/6849] packages: remove redundant INSTALL_TARGET=YES
 declarations

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/at/at.mk                                           | 1 -
 package/atk/atk.mk                                         | 1 -
 package/avahi/avahi.mk                                     | 1 -
 package/blackbox/blackbox.mk                               | 1 -
 package/dbus-python/dbus-python.mk                         | 1 -
 package/directfb-examples/directfb-examples.mk             | 1 -
 package/divine/divine.mk                                   | 1 -
 package/docker/docker.mk                                   | 1 -
 package/enchant/enchant.mk                                 | 3 ---
 package/fltk/fltk.mk                                       | 1 -
 package/fontconfig/fontconfig.mk                           | 1 -
 package/games/rubix/rubix.mk                               | 1 -
 package/gqview/gqview.mk                                   | 2 --
 package/gtkperf/gtkperf.mk                                 | 1 -
 package/gvfs/gvfs.mk                                       | 1 -
 package/iperf/iperf.mk                                     | 1 -
 package/ipkg/ipkg.mk                                       | 1 -
 package/jpeg/jpeg.mk                                       | 1 -
 package/leafpad/leafpad.mk                                 | 2 --
 package/libarchive/libarchive.mk                           | 1 -
 package/libconfig/libconfig.mk                             | 1 -
 package/libdnet/libdnet.mk                                 | 1 -
 package/libevent/libevent.mk                               | 1 -
 package/libgail/libgail.mk                                 | 2 --
 package/librsvg/librsvg.mk                                 | 1 -
 package/librsync/librsync.mk                               | 2 --
 package/libsexy/libsexy.mk                                 | 1 -
 package/libsvgtiny/libsvgtiny.mk                           | 2 --
 package/libungif/libungif.mk                               | 2 --
 package/libusb-compat/libusb-compat.mk                     | 1 -
 package/lite/lite.mk                                       | 1 -
 package/lzma/lzma.mk                                       | 1 -
 package/mdadm/mdadm.mk                                     | 1 -
 package/midori/midori.mk                                   | 2 --
 package/multimedia/alsa-lib/alsa-lib.mk                    | 1 -
 package/multimedia/libcdaudio/libcdaudio.mk                | 1 -
 package/multimedia/libdvdnav/libdvdnav.mk                  | 1 -
 package/multimedia/libdvdread/libdvdread.mk                | 1 -
 package/multimedia/live555/live555.mk                      | 1 -
 package/multimedia/speex/speex.mk                          | 1 -
 package/mysql_client/mysql_client.mk                       | 1 -
 package/netcat/netcat.mk                                   | 1 -
 package/ngrep/ngrep.mk                                     | 1 -
 package/pango/pango.mk                                     | 1 -
 package/pcmanfm/pcmanfm.mk                                 | 1 -
 package/readline/readline.mk                               | 3 ---
 package/samba/samba.mk                                     | 1 -
 package/sdl_gfx/sdl_gfx.mk                                 | 3 ---
 package/sdl_image/sdl_image.mk                             | 1 -
 package/sdl_sound/sdl_sound.mk                             | 1 -
 package/startup-notification/startup-notification.mk       | 2 --
 package/torsmo/torsmo.mk                                   | 1 -
 package/x11r7/xapp_xman/xapp_xman.mk                       | 1 -
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk             | 1 -
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 1 -
 package/x11r7/xkeyboard-config/xkeyboard-config.mk         | 1 -
 package/x11vnc/x11vnc.mk                                   | 2 --
 package/xvkbd/xvkbd.mk                                     | 1 -
 58 files changed, 73 deletions(-)

diff --git a/package/at/at.mk b/package/at/at.mk
index 92fb838d61..c9d503ae7d 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -9,7 +9,6 @@ AT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
 # missing deps for parsetime.l
 AT_MAKE = $(MAKE1)
 AT_AUTORECONF = YES
-AT_INSTALL_TARGET = YES
 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex)
 
 AT_CONF_OPT = \
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index d84d08cc40..4ac96ffc4a 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -8,7 +8,6 @@ ATK_VERSION = $(ATK_VERSION_MAJOR).6
 ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
 ATK_INSTALL_STAGING = YES
-ATK_INSTALL_TARGET = YES
 ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 3392614802..32e3df7f9b 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -14,7 +14,6 @@ AVAHI_VERSION = 0.6.31
 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
 AVAHI_INSTALL_STAGING = YES
-AVAHI_INSTALL_TARGET = YES
 
 AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
 		ac_fsusage_space=yes \
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index fd7525507f..600ba6ca19 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -7,7 +7,6 @@
 BLACKBOX_VERSION:=0.70.1
 BLACKBOX_SOURCE:=blackbox-$(BLACKBOX_VERSION).tar.bz2
 BLACKBOX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/blackboxwm/
-BLACKBOX_INSTALL_TARGET:=YES
 
 BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index d027f2fce7..83e3aeeb99 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -7,7 +7,6 @@ DBUS_PYTHON_VERSION = 0.83.0
 DBUS_PYTHON_SOURCE = dbus-python-$(DBUS_PYTHON_VERSION).tar.gz
 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python/
 DBUS_PYTHON_INSTALL_STAGING = YES
-DBUS_PYTHON_INSTALL_TARGET = YES
 
 DBUS_PYTHON_CONF_ENV = am_cv_pathless_PYTHON=python \
 		ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index cea1eb2dde..d8e61f7beb 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -7,7 +7,6 @@ DIRECTFB_EXAMPLES_VERSION:=1.2.0
 DIRECTFB_EXAMPLES_SITE:=http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_INSTALL_STAGING = YES
-DIRECTFB_EXAMPLES_INSTALL_TARGET = YES
 DIRECTFB_EXAMPLES_DEPENDENCIES = directfb
 
 DIRECTFB_EXAMPLES_TARGETS_ :=
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 0b60adcfec..3e8d093ff3 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -8,7 +8,6 @@ DIVINE_VERSION := 0.4.0
 DIVINE_SITE := http://www.directfb.org/downloads/Extras
 DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz
 DIVINE_INSTALL_STAGING = YES
-DIVINE_INSTALL_TARGET = YES
 DIVINE_DEPENDENCIES = directfb
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index ce25e4da67..fd12cce843 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -6,7 +6,6 @@
 DOCKER_VERSION = 1.5
 DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
 DOCKER_SITE = http://icculus.org/openbox/2/docker
-DOCKER_INSTALL_TARGET = YES
 
 DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
 					CFLAGS="-I$(STAGING_DIR)/usr/include \
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index e29137acb2..9d7ae0e341 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -6,10 +6,7 @@
 ENCHANT_VERSION = 1.5.0
 ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
-
 ENCHANT_INSTALL_STAGING = YES
-ENCHANT_INSTALL_TARGET = YES
-
 ENCHANT_DEPENDENCIES = libglib2 host-pkg-config
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index ea2bef022c..1686a58e59 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -8,7 +8,6 @@ FLTK_VERSION = 1.1.7
 FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.bz2
 FLTK_SITE = http://ftp.easysw.com/pub/fltk/1.1.7/
 FLTK_INSTALL_STAGING = YES
-FLTK_INSTALL_TARGET = YES
 FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_CONF_OPT = --enable-threads --with-x
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 39815edab5..329f8198bb 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -8,7 +8,6 @@ FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SITE = http://fontconfig.org/release
 FONTCONFIG_AUTORECONF = YES
 FONTCONFIG_INSTALL_STAGING = YES
-FONTCONFIG_INSTALL_TARGET = YES
 # This package does not like using the target cflags for some reason.
 FONTCONFIG_CONF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2"
 
diff --git a/package/games/rubix/rubix.mk b/package/games/rubix/rubix.mk
index 5248b9e83e..a66e6e1dde 100644
--- a/package/games/rubix/rubix.mk
+++ b/package/games/rubix/rubix.mk
@@ -6,7 +6,6 @@
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
 RUBIX_SITE = http://avr32linux.org/twiki/pub/Main/Rubix
-RUBIX_INSTALL_TARGET = YES
 RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 
 RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index a86d895855..b87ad768aa 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -6,8 +6,6 @@
 GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
-GQVIEW_INSTALL_TARGET = YES
-
 GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index cf135943a8..5459e69cf7 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -6,7 +6,6 @@
 GTKPERF_VERSION:=0.40
 GTKPERF_SOURCE:=gtkperf_$(GTKPERF_VERSION).tar.gz
 GTKPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gtkperf
-GTKPERF_INSTALL_TARGET = YES
 GTKPERF_DEPENDENCIES = libgtk2
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 05a54a31d4..f56c14a4bb 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -9,7 +9,6 @@ GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
-GVFS_INSTALL_TARGET = YES
 GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
 
 GVFS_CONF_OPT = \
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 7f6b1b8f89..26cd3fb59e 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -6,7 +6,6 @@
 IPERF_VERSION = 2.0.5
 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
 IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
-IPERF_INSTALL_TARGET = YES
 
 IPERF_CONF_ENV = \
 	ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
index 6d5ff5d20f..ecb97b6817 100644
--- a/package/ipkg/ipkg.mk
+++ b/package/ipkg/ipkg.mk
@@ -8,6 +8,5 @@ IPKG_VERSION = 0.99.163
 IPKG_SOURCE = ipkg-$(IPKG_VERSION).tar.gz
 IPKG_SITE = http://www.handhelds.org/download/packages/ipkg
 IPKG_INSTALL_STAGING = YES
-IPKG_INSTALL_TARGET = YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index a88226843b..a6523817b9 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -7,7 +7,6 @@ JPEG_VERSION = 8d
 JPEG_SITE = http://www.ijg.org/files/
 JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES
-JPEG_INSTALL_TARGET = YES
 
 define JPEG_REMOVE_USELESS_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index 56c25dfc0d..7e4d1792ea 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -6,8 +6,6 @@
 LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
-LEAFPAD_INSTALL_TARGET = YES
-
 LEAFPAD_DEPENDENCIES = libgtk2
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index c9e5d07bb0..087032d209 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -7,7 +7,6 @@ LIBARCHIVE_VERSION = 2.8.5
 LIBARCHIVE_SITE = http://libarchive.googlecode.com/files/
 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz
 LIBARCHIVE_INSTALL_STAGING = YES
-LIBARCHIVE_INSTALL_TARGET = YES
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 LIBARCHIVE_DEPENDENCIES = zlib
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 38e9a59d8e..03825e1261 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -7,7 +7,6 @@ LIBCONFIG_VERSION:=1.4.6
 LIBCONFIG_SOURCE:=libconfig-$(LIBCONFIG_VERSION).tar.gz
 LIBCONFIG_SITE:=http://www.hyperrealm.com/libconfig/
 LIBCONFIG_INSTALL_STAGING:=YES
-LIBCONFIG_INSTALL_TARGET:=YES
 
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 LIBCONFIG_CONF_OPT:=--disable-cxx
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 3786bb8f61..f351d6b3bf 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -8,7 +8,6 @@ LIBDNET_VERSION = 1.11
 LIBDNET_SOURCE = libdnet-$(LIBDNET_VERSION).tar.gz
 LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdnet/
 LIBDNET_INSTALL_STAGING = YES
-LIBDNET_INSTALL_TARGET = YES
 LIBDNET_AUTORECONF = YES
 LIBDNET_CONF_OPT = \
 	--with-gnu-ld \
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 73ad2b06bc..733e29d2ce 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -7,7 +7,6 @@ LIBEVENT_VERSION = 2.0.14
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
 LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
 LIBEVENT_INSTALL_STAGING = YES
-LIBEVENT_INSTALL_TARGET = YES
 
 define LIBEVENT_REMOVE_PYSCRIPT
 	rm $(TARGET_DIR)/usr/bin/event_rpcgen.py
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index cc3c2fffa3..3c42e6cd75 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -8,10 +8,8 @@ LIBGAIL_VERSION_MINOR = 3
 LIBGAIL_VERSION = $(LIBGAIL_VERSION_MAJOR).$(LIBGAIL_VERSION_MINOR)
 LIBGAIL_SOURCE = gail-$(LIBGAIL_VERSION).tar.bz2
 LIBGAIL_SITE = http://ftp.gnome.org/pub/gnome/sources/gail/$(LIBGAIL_VERSION_MAJOR)
-
 LIBGAIL_AUTORECONF = YES
 LIBGAIL_INSTALL_STAGING = YES
-LIBGAIL_INSTALL_TARGET = YES
 
 ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 LIBGAIL_CONF_OPT += --disable-x
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index de73f6eb60..f5c223e809 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -10,7 +10,6 @@ LIBRSVG_VERSION:=$(LIBRSVG_VERSION_MAJOR).$(LIBRSVG_VERSION_MINOR)
 LIBRSVG_SOURCE:=librsvg-$(LIBRSVG_VERSION).tar.gz
 LIBRSVG_SITE:=http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/
 LIBRSVG_INSTALL_STAGING = YES
-LIBRSVG_INSTALL_TARGET = YES
 LIBRSVG_CONF_OPT = --disable-tools
 LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 libgtk2
 
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index 5019af7e26..0d765ea5b0 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -7,8 +7,6 @@ LIBRSYNC_VERSION:=0.9.7
 LIBRSYNC_SOURCE:=librsync-$(LIBRSYNC_VERSION).tar.gz
 LIBRSYNC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/librsync/
 LIBRSYNC_INSTALL_STAGING = YES
-LIBRSYNC_INSTALL_TARGET = YES
-
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
index 9f33d29f28..905089bacf 100644
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -8,7 +8,6 @@ LIBSEXY_VERSION = 0.1.11
 LIBSEXY_SOURCE = libsexy-$(LIBSEXY_VERSION).tar.gz
 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy/
 LIBSEXY_DEPENDENCIES = libgtk2 libxml2
-LIBSEXY_INSTALL_TARGET = YES
 LIBSEXY_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index 275ae74469..f53f88f5df 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -6,9 +6,7 @@
 
 LIBSVGTINY_SITE = svn://svn.netsurf-browser.org/trunk/libsvgtiny
 LIBSVGTINY_VERSION = 12121
-
 LIBSVGTINY_INSTALL_STAGING = YES
-LIBSVGTINY_INSTALL_TARGET = YES
 LIBSVGTINY_DEPENDENCIES = libxml2 host-gperf host-pkg-config
 
 define LIBSVGTINY_BUILD_CMDS
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 100c5b9055..3484ec479c 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -7,8 +7,6 @@ LIBUNGIF_VERSION:=4.1.4
 LIBUNGIF_SOURCE:=libungif-$(LIBUNGIF_VERSION).tar.bz2
 LIBUNGIF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/giflib
 LIBUNGIF_INSTALL_STAGING = YES
-LIBUNGIF_INSTALL_TARGET = YES
-
 LIBUNGIF_CONF_OPT = --without-x
 
 LIBUNGIF_BINS = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 4f16489d2d..42a9aae899 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -8,7 +8,6 @@ LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
 LIBUSB_COMPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
 LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb
 LIBUSB_COMPAT_INSTALL_STAGING = YES
-LIBUSB_COMPAT_INSTALL_TARGET = YES
 
 define LIBUSB_COMPAT_FIXUP_CONFIG
 	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index 9b840e29ad..d331d9dfb8 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -7,7 +7,6 @@ LITE_VERSION:=0.8.10
 LITE_SOURCE:=LiTE-$(LITE_VERSION).tar.gz
 LITE_SITE:=http://www.directfb.org/downloads/Libs
 LITE_INSTALL_STAGING = YES
-LITE_INSTALL_TARGET = YES
 LITE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
 LITE_DEPENDENCIES = directfb
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 4614116c36..e195049329 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -7,7 +7,6 @@ LZMA_VERSION:=4.32.7
 LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz
 LZMA_SITE:=http://tukaani.org/lzma/
 LZMA_INSTALL_STAGING = YES
-LZMA_INSTALL_TARGET = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 4d8e1af434..39dbea0a27 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -6,7 +6,6 @@
 MDADM_VERSION:=2.6.9
 MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
 MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
-MDADM_INSTALL_TARGET = YES
 
 MDADM_MAKE_OPT = \
 	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(MDADM_DIR) mdadm
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 99b5a48ea3..3e46b1aba1 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -7,8 +7,6 @@
 MIDORI_VERSION = 0.3.6
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
-MIDORI_INSTALL_TARGET = YES
-
 MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
 
 ifneq ($(BR2_PACKAGE_XORG7),y)
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 62a3b1d3ea..aa6ca512f1 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -7,7 +7,6 @@ ALSA_LIB_VERSION = 1.0.24.1
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
 ALSA_LIB_INSTALL_STAGING = YES
-ALSA_LIB_INSTALL_TARGET = YES
 
 ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
 
diff --git a/package/multimedia/libcdaudio/libcdaudio.mk b/package/multimedia/libcdaudio/libcdaudio.mk
index d240c0765e..8ceb87a4d1 100644
--- a/package/multimedia/libcdaudio/libcdaudio.mk
+++ b/package/multimedia/libcdaudio/libcdaudio.mk
@@ -10,6 +10,5 @@ LIBCDAUDIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/li
 LIBCDAUDIO_AUTORECONF = YES
 LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
-LIBCDAUDIO_INSTALL_TARGET = YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/libdvdnav/libdvdnav.mk b/package/multimedia/libdvdnav/libdvdnav.mk
index 4e9a92ba18..7f68533fe2 100644
--- a/package/multimedia/libdvdnav/libdvdnav.mk
+++ b/package/multimedia/libdvdnav/libdvdnav.mk
@@ -9,7 +9,6 @@ LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 LIBDVDNAV_SITE = http://www.mplayerhq.hu/MPlayer/releases/dvdnav
 LIBDVDNAV_AUTORECONF = YES
 LIBDVDNAV_INSTALL_STAGING = YES
-LIBDVDNAV_INSTALL_TARGET = YES
 
 LIBDVDNAV_DEPENDENCIES = libdvdread
 
diff --git a/package/multimedia/libdvdread/libdvdread.mk b/package/multimedia/libdvdread/libdvdread.mk
index 3f456efe13..52264140da 100644
--- a/package/multimedia/libdvdread/libdvdread.mk
+++ b/package/multimedia/libdvdread/libdvdread.mk
@@ -10,6 +10,5 @@ LIBDVDREAD_SITE = http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
 LIBDVDREAD_AUTORECONF = YES
 LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES
-LIBDVDREAD_INSTALL_TARGET = YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
index 9e0ef14bdd..c987fa27bb 100644
--- a/package/multimedia/live555/live555.mk
+++ b/package/multimedia/live555/live555.mk
@@ -8,7 +8,6 @@ LIVE555_VERSION = 2011.06.16
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
 LIVE555_SITE = http://www.live555.com/liveMedia/public/
 LIVE555_INSTALL_STAGING = YES
-LIVE555_INSTALL_TARGET = YES
 
 define LIVE555_CONFIGURE_CMDS
 	echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(TARGET_CFLAGS)' >> $(@D)/config.linux
diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk
index 0aca871e6a..c9d9ed3ef0 100644
--- a/package/multimedia/speex/speex.mk
+++ b/package/multimedia/speex/speex.mk
@@ -7,7 +7,6 @@ SPEEX_VERSION=1.2rc1
 SPEEX_SOURCE=speex-$(SPEEX_VERSION).tar.gz
 SPEEX_SITE=http://downloads.us.xiph.org/releases/speex
 SPEEX_INSTALL_STAGING = YES
-SPEEX_INSTALL_TARGET = YES
 SPEEX_DEPENDENCIES = libogg
 SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
 		 --with-ogg-includes=$(STAGING_DIR)/usr/include \
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 9addf33428..70970163ea 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -6,7 +6,6 @@
 MYSQL_CLIENT_VERSION = 5.1.53
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.mysql.com/archives/mysql-5.1/
-MYSQL_CLIENT_INSTALL_TARGET = YES
 MYSQL_CLIENT_INSTALL_STAGING = YES
 MYSQL_CLIENT_DEPENDENCIES = readline ncurses
 MYSQL_CLIENT_AUTORECONF=YES
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index a668e9a748..bc58af287e 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -7,6 +7,5 @@
 NETCAT_VERSION:=0.7.1
 NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz
 NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netcat
-NETCAT_INSTALL_TARGET:=YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index e4ee525ad6..e9c640a042 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -8,7 +8,6 @@ NGREP_VERSION = 1.45
 NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
 NGREP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep/ngrep/$(NGREP_VERSION)
 NGREP_INSTALL_STAGING = YES
-NGREP_INSTALL_TARGET = YES
 NGREP_CONF_ENV = LDFLAGS="-lpcre"
 NGREP_CONF_OPT =  \
 	--with-pcap-includes=$(STAGING_DIR)/usr/include \
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 2691b884db..f46bdc64c6 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -11,7 +11,6 @@ PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2
 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_AUTORECONF = YES
 PANGO_INSTALL_STAGING = YES
-PANGO_INSTALL_TARGET = YES
 
 PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index d1d3377927..f2112f0516 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -6,7 +6,6 @@
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
-PCMANFM_INSTALL_TARGET = YES
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkg-config libgtk2 gamin startup-notification xserver_xorg-server
 
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 03a5377637..cd9946e6b6 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -8,10 +8,7 @@ READLINE_VERSION = 6.2
 READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
 READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES
-READLINE_INSTALL_TARGET = YES
-
 READLINE_DEPENDENCIES = ncurses
-
 READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes
 
 define READLINE_INSTALL_TARGET_CMDS
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 5887065964..c15efca3b8 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -8,7 +8,6 @@ SAMBA_VERSION = 3.5.12
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES
-SAMBA_INSTALL_TARGET = YES
 
 
 SAMBA_DEPENDENCIES = \
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index b8c5d80797..a25987dd36 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -7,10 +7,7 @@ SDL_GFX_VERSION:=2.0.19
 SDL_GFX_SOURCE:=SDL_gfx-$(SDL_GFX_VERSION).tar.gz
 SDL_GFX_SITE:=http://www.ferzkopp.net/Software/SDL_gfx-2.0/
 SDL_GFX_INSTALL_STAGING:=YES
-SDL_GFX_INSTALL_TARGET:=YES
-
 SDL_GFX_DEPENDENCIES:=sdl
-
 SDL_GFX_CONF_OPT = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 8dec4728f8..b93dc08d95 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -7,7 +7,6 @@ SDL_IMAGE_VERSION:=1.2.6
 SDL_IMAGE_SOURCE:=SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 SDL_IMAGE_SITE:=http://www.libsdl.org/projects/SDL_image/release
 SDL_IMAGE_INSTALL_STAGING:=YES
-SDL_IMAGE_INSTALL_TARGET:=YES
 
 SDL_IMAGE_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 7075967390..f95d6bc728 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -7,7 +7,6 @@ SDL_SOUND_VERSION:=1.0.3
 SDL_SOUND_SOURCE:=SDL_sound-$(SDL_SOUND_VERSION).tar.gz
 SDL_SOUND_SITE:=http://icculus.org/SDL_sound/downloads/
 SDL_SOUND_INSTALL_STAGING:=YES
-SDL_SOUND_INSTALL_TARGET:=YES
 SDL_SOUND_DEPENDENCIES = sdl
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index cbcaad3a3f..60778ca80c 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -7,9 +7,7 @@ STARTUP_NOTIFICATION_VERSION = 0.9
 STARTUP_NOTIFICATION_SOURCE = startup-notification-$(STARTUP_NOTIFICATION_VERSION).tar.gz
 STARTUP_NOTIFICATION_SITE = http://freedesktop.org/software/startup-notification/releases
 STARTUP_NOTIFICATION_INSTALL_STAGING = YES
-STARTUP_NOTIFICATION_INSTALL_TARGET = YES
 STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11
-
 STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes
 STARTUP_NOTIFICATION_CONF_OPT = --with-x \
 	--x-includes="$(STAGING_DIR)/usr/include/X11" \
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index fb97639205..df97c5ed76 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -6,7 +6,6 @@
 TORSMO_VERSION = 0.18
 TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
 TORSMO_SITE = http://avr32linux.org/twiki/pub/Main/Torsmo
-TORSMO_INSTALL_TARGET = YES
 
 # help2man doesn't work when cross compiling
 TORSMO_CONF_ENV = ac_cv_path_HELP2MAN=''
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 6caaf3fa33..c14a5ba23c 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -6,7 +6,6 @@
 XAPP_XMAN_VERSION:=1.0.3
 XAPP_XMAN_SOURCE:=xman-$(XAPP_XMAN_VERSION).tar.bz2
 XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMAN_INSTALL_TARGET = YES
 XAPP_XMAN_DEPENDENCIES = xlib_libXaw
 
 XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index b94531b1ed..52b21eacee 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -8,6 +8,5 @@ XDATA_XBITMAPS_VERSION = 1.1.0
 XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
 XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XBITMAPS_INSTALL_STAGING = YES
-XDATA_XBITMAPS_INSTALL_TARGET = YES
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index c954bec488..08a88553e5 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -7,7 +7,6 @@ XDATA_XCURSOR_THEMES_VERSION = 1.0.2
 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2
 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
-XDATA_XCURSOR_THEMES_INSTALL_TARGET = YES
 XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
 
 $(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index fd3f02d8cb..453f86211b 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -6,7 +6,6 @@
 XKEYBOARD_CONFIG_VERSION = 2.0
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_INSTALL_TARGET = YES
 XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 0fc885c825..f130e426cf 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -6,8 +6,6 @@
 X11VNC_VERSION = 0.9.3
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
 X11VNC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver
-X11VNC_INSTALL_TARGET = YES
-
 X11VNC_CONF_OPT = \
 	--without-avahi
 
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 7e03c93128..8b03e65c6e 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -6,7 +6,6 @@
 XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
-XVKBD_INSTALL_TARGET = YES
 
 XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
 				CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib"

From 584dbc2f0a30bb4011d5e14a69ba3bba99b89613 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Mar 2012 12:00:34 -0300
Subject: [PATCH 1558/6849] libxslt: add multiple security patches

Add security patches for CVE-2011-1202 and CVE-2011-3970.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...e.patch => libxslt-1.1.26-configure.patch} |  0
 .../libxslt-1.1.26-id-generation.patch        | 56 +++++++++++++++++++
 ...lt-1.1.26-pattern-out-of-bounds-read.patch | 27 +++++++++
 3 files changed, 83 insertions(+)
 rename package/libxslt/{libxslt-configure.patch => libxslt-1.1.26-configure.patch} (100%)
 create mode 100644 package/libxslt/libxslt-1.1.26-id-generation.patch
 create mode 100644 package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch

diff --git a/package/libxslt/libxslt-configure.patch b/package/libxslt/libxslt-1.1.26-configure.patch
similarity index 100%
rename from package/libxslt/libxslt-configure.patch
rename to package/libxslt/libxslt-1.1.26-configure.patch
diff --git a/package/libxslt/libxslt-1.1.26-id-generation.patch b/package/libxslt/libxslt-1.1.26-id-generation.patch
new file mode 100644
index 0000000000..f8f4c2a955
--- /dev/null
+++ b/package/libxslt/libxslt-1.1.26-id-generation.patch
@@ -0,0 +1,56 @@
+From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 22 Feb 2011 02:14:23 +0000
+Subject: Fix generate-id() to not expose object addresses
+
+As pointed out by Chris Evans <scarybeasts@gmail.com> it's better
+security wise to not expose object addresses directly, use a diff
+w.r.t. the document root own address to avoid this
+* libxslt/functions.c: fix IDs generation code
+---
+diff --git a/libxslt/functions.c b/libxslt/functions.c
+index 4720c7a..de962f4 100644
+--- a/libxslt/functions.c
++++ b/libxslt/functions.c
+@@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
+ void
+ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+     xmlNodePtr cur = NULL;
+-    unsigned long val;
+-    xmlChar str[20];
++    long val;
++    xmlChar str[30];
++    xmlDocPtr doc;
+ 
+     if (nargs == 0) {
+ 	cur = ctxt->context->node;
+@@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+      * Okay this is ugly but should work, use the NodePtr address
+      * to forge the ID
+      */
+-    val = (unsigned long)((char *)cur - (char *)0);
+-    val /= sizeof(xmlNode);
+-    sprintf((char *)str, "id%ld", val);
++    if (cur->type != XML_NAMESPACE_DECL)
++        doc = cur->doc;
++    else {
++        xmlNsPtr ns = (xmlNsPtr) cur;
++
++        if (ns->context != NULL)
++            doc = ns->context;
++        else
++            doc = ctxt->context->doc;
++
++    }
++
++    val = (long)((char *)cur - (char *)doc);
++    if (val >= 0) {
++      sprintf((char *)str, "idp%ld", val);
++    } else {
++      sprintf((char *)str, "idm%ld", -val);
++    }
+     valuePush(ctxt, xmlXPathNewString(str));
+ }
+ 
+--
+cgit v0.8.3.4
diff --git a/package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch b/package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch
new file mode 100644
index 0000000000..cd2e292f47
--- /dev/null
+++ b/package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch
@@ -0,0 +1,27 @@
+From fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b Mon Sep 17 00:00:00 2001
+From: Abhishek Arya <inferno@chromium.org>
+Date: Sun, 22 Jan 2012 17:47:50 +0800
+Subject: [PATCH] Fix some case of pattern parsing errors
+
+We could accidentally hit an off by one string array access
+due to improper loop exit when parsing patterns
+---
+ libxslt/pattern.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libxslt/pattern.c b/libxslt/pattern.c
+index 6161376..1155b54 100644
+--- a/libxslt/pattern.c
++++ b/libxslt/pattern.c
+@@ -1867,6 +1867,8 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
+ 		while ((pattern[end] != 0) && (pattern[end] != '"'))
+ 		    end++;
+ 	    }
++	    if (pattern[end] == 0)
++	        break;
+ 	    end++;
+ 	}
+ 	if (current == end) {
+-- 
+1.7.8.4
+

From aa5d9ba3b86f21be934fdb436525a833bf120305 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Mar 2012 12:00:35 -0300
Subject: [PATCH 1559/6849] libxml2: add multiple security patches

Fixes for CVE-2011-1944, CVE-2011-2821, CVE-2011-2834, CVE-2011-3919,
CVE-2012-0841 and others from upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ....8-allocation-error-copying-entities.patch |  21 ++
 .../libxml2/libxml2-2.7.8-error-xpath.patch   |  62 ++++
 .../libxml2-2.7.8-hardening-xpath.patch       | 224 +++++++++++++
 .../libxml2-2.7.8-hash-randomization.patch    | 297 ++++++++++++++++++
 .../libxml2-2.7.8-reallocation-failures.patch | 101 ++++++
 .../libxml2/libxml2-2.7.8-xpath-freeing.patch |  32 ++
 .../libxml2-2.7.8-xpath-freeing2.patch        |  28 ++
 .../libxml2/libxml2-2.7.8-xpath-memory.patch  |  29 ++
 package/libxml2/libxml2.mk                    |   1 +
 9 files changed, 795 insertions(+)
 create mode 100644 package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-error-xpath.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-hardening-xpath.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-hash-randomization.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-reallocation-failures.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-xpath-freeing.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-xpath-freeing2.patch
 create mode 100644 package/libxml2/libxml2-2.7.8-xpath-memory.patch

diff --git a/package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch b/package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch
new file mode 100644
index 0000000000..c0d943311f
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch
@@ -0,0 +1,21 @@
+From 5bd3c061823a8499b27422aee04ea20aae24f03e Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 16 Dec 2011 10:53:35 +0000
+Subject: Fix an allocation error when copying entities
+
+---
+diff --git a/parser.c b/parser.c
+index 4e5dcb9..c55e41d 100644
+--- a/parser.c
++++ b/parser.c
+@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
+ 
+ 		buffer[nbchars++] = '&';
+ 		if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
+-		    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
++		    growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
+ 		}
+ 		for (;i > 0;i--)
+ 		    buffer[nbchars++] = *cur++;
+--
+cgit v0.9.0.2
diff --git a/package/libxml2/libxml2-2.7.8-error-xpath.patch b/package/libxml2/libxml2-2.7.8-error-xpath.patch
new file mode 100644
index 0000000000..a12a050741
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-error-xpath.patch
@@ -0,0 +1,62 @@
+From 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 11 Oct 2011 08:34:34 +0000
+Subject: Fix missing error status in XPath evaluation
+
+Started by Chris Evans, I added a few more place where the
+error should have been set in the evaluation context.
+---
+diff --git a/xpath.c b/xpath.c
+index bcee2ea..d9d902c 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value)
+                                              sizeof(ctxt->valueTab[0]));
+         if (tmp == NULL) {
+             xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
++            ctxt->error = XPATH_MEMORY_ERROR;
+             return (0);
+         }
+         ctxt->valueMax *= 2;
+@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) {
+ 		if ( (ch & 0xc0) != 0xc0 ) {
+ 		    xmlGenericError(xmlGenericErrorContext,
+ 			"xmlXPathTranslateFunction: Invalid UTF8 string\n");
++                    /* not asserting an XPath error is probably better */
+ 		    break;
+ 		}
+ 		/* then skip over remaining bytes for this char */
+@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) {
+ 		    if ( (*cptr++ & 0xc0) != 0x80 ) {
+ 			xmlGenericError(xmlGenericErrorContext,
+ 			    "xmlXPathTranslateFunction: Invalid UTF8 string\n");
++                        /* not asserting an XPath error is probably better */
+ 			break;
+ 		    }
+ 		if (ch & 0x80) /* must have had error encountered */
+@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+                         xmlGenericError(xmlGenericErrorContext,
+             "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n",
+                                     (char *) op->value4, (char *)op->value5);
++                        ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
+                         return (total);
+                     }
+ 		    val = xmlXPathVariableLookupNS(ctxt->context,
+@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+             "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
+                                     (char *)op->value4, (char *)op->value5);
+                             xmlXPathPopFrame(ctxt, frame);
++                            ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
+                             return (total);
+                         }
+                         func = xmlXPathFunctionLookupNS(ctxt->context,
+@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+     }
+     xmlGenericError(xmlGenericErrorContext,
+                     "XPath: unknown precompiled operation %d\n", op->op);
++    ctxt->error = XPATH_INVALID_OPERAND;
+     return (total);
+ }
+ 
+--
+cgit v0.9.0.2
diff --git a/package/libxml2/libxml2-2.7.8-hardening-xpath.patch b/package/libxml2/libxml2-2.7.8-hardening-xpath.patch
new file mode 100644
index 0000000000..8e699ec8c0
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-hardening-xpath.patch
@@ -0,0 +1,224 @@
+From f5048b3e71fc30ad096970b8df6e7af073bae4cb Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 18 Aug 2011 09:10:13 +0000
+Subject: Hardening of XPath evaluation
+
+Add a mechanism of frame for XPath evaluation when entering a function
+or a scoped evaluation, also fix a potential problem in predicate
+evaluation.
+---
+diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
+index 1a9e30e..ddd9dd8 100644
+--- a/include/libxml/xpath.h
++++ b/include/libxml/xpath.h
+@@ -68,7 +68,8 @@ typedef enum {
+     XPATH_UNDEF_PREFIX_ERROR,
+     XPATH_ENCODING_ERROR,
+     XPATH_INVALID_CHAR_ERROR,
+-    XPATH_INVALID_CTXT
++    XPATH_INVALID_CTXT,
++    XPATH_STACK_ERROR
+ } xmlXPathError;
+ 
+ /*
+@@ -380,6 +381,8 @@ struct _xmlXPathParserContext {
+     xmlXPathCompExprPtr comp;		/* the precompiled expression */
+     int xptr;				/* it this an XPointer expression */
+     xmlNodePtr         ancestor;	/* used for walking preceding axis */
++
++    int              valueFrame;        /* used to limit Pop on the stack */
+ };
+ 
+ /************************************************************************
+diff --git a/xpath.c b/xpath.c
+index b59ac5a..bcee2ea 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = {
+     "Encoding error\n",
+     "Char out of XML range\n",
+     "Invalid or incomplete context\n",
++    "Stack usage errror\n",
+     "?? Unknown error ??\n"	/* Must be last in the list! */
+ };
+ #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) /	\
+@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) {
+  ************************************************************************/
+ 
+ /**
++ * xmlXPathSetFrame:
++ * @ctxt: an XPath parser context
++ *
++ * Set the callee evaluation frame
++ *
++ * Returns the previous frame value to be restored once done
++ */
++static int
++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) {
++    int ret;
++
++    if (ctxt == NULL)
++        return(0);
++    ret = ctxt->valueFrame;
++    ctxt->valueFrame = ctxt->valueNr;
++    return(ret);
++}
++
++/**
++ * xmlXPathPopFrame:
++ * @ctxt: an XPath parser context
++ * @frame: the previous frame value
++ *
++ * Remove the callee evaluation frame
++ */
++static void
++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) {
++    if (ctxt == NULL)
++        return;
++    if (ctxt->valueNr < ctxt->valueFrame) {
++        xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
++    }
++    ctxt->valueFrame = frame;
++}
++
++/**
+  * valuePop:
+  * @ctxt: an XPath evaluation context
+  *
+@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt)
+ 
+     if ((ctxt == NULL) || (ctxt->valueNr <= 0))
+         return (NULL);
++
++    if (ctxt->valueNr <= ctxt->valueFrame) {
++        xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
++        return (NULL);
++    }
++
+     ctxt->valueNr--;
+     if (ctxt->valueNr > 0)
+         ctxt->value = ctxt->valueTab[ctxt->valueNr - 1];
+@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) {
+     ret->valueNr = 0;
+     ret->valueMax = 10;
+     ret->value = NULL;
++    ret->valueFrame = 0;
+ 
+     ret->context = ctxt;
+     ret->comp = comp;
+@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ 	xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
+ 	xmlNodePtr oldContextNode, contextNode = NULL;
+ 	xmlXPathContextPtr xpctxt = ctxt->context;
++        int frame;
+ 
+ #ifdef LIBXML_XPTR_ENABLED
+ 	    /*
+@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ 	*/
+ 	exprOp = &ctxt->comp->steps[op->ch2];
+ 	for (i = 0; i < set->nodeNr; i++) {
++            xmlXPathObjectPtr tmp;
++
+ 	    if (set->nodeTab[i] == NULL)
+ 		continue;
+ 
+@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ 		xmlXPathNodeSetAddUnique(contextObj->nodesetval,
+ 		    contextNode);
+ 
++            frame = xmlXPathSetFrame(ctxt);
+ 	    valuePush(ctxt, contextObj);
+ 	    res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
++            tmp = valuePop(ctxt);
++            xmlXPathPopFrame(ctxt, frame);
+ 
+ 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
+-	        xmlXPathObjectPtr tmp;
+-		/* pop the result if any */
+-		tmp = valuePop(ctxt);
+-                if (tmp != contextObj) {
++                while (tmp != contextObj) {
+                     /*
+                      * Free up the result
+                      * then pop off contextObj, which will be freed later
+                      */
+                     xmlXPathReleaseObject(xpctxt, tmp);
+-                    valuePop(ctxt);
++                    tmp = valuePop(ctxt);
+                 }
+ 		goto evaluation_error;
+ 	    }
++            /* push the result back onto the stack */
++            valuePush(ctxt, tmp);
+ 
+ 	    if (res)
+ 		pos++;
+@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+                 xmlXPathFunction func;
+                 const xmlChar *oldFunc, *oldFuncURI;
+ 		int i;
++                int frame;
+ 
++                frame = xmlXPathSetFrame(ctxt);
+                 if (op->ch1 != -1)
+                     total +=
+                         xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
+@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+ 		    xmlGenericError(xmlGenericErrorContext,
+ 			    "xmlXPathCompOpEval: parameter error\n");
+ 		    ctxt->error = XPATH_INVALID_OPERAND;
++                    xmlXPathPopFrame(ctxt, frame);
+ 		    return (total);
+ 		}
+-		for (i = 0; i < op->value; i++)
++		for (i = 0; i < op->value; i++) {
+ 		    if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
+ 			xmlGenericError(xmlGenericErrorContext,
+ 				"xmlXPathCompOpEval: parameter error\n");
+ 			ctxt->error = XPATH_INVALID_OPERAND;
++                        xmlXPathPopFrame(ctxt, frame);
+ 			return (total);
+ 		    }
++                }
+                 if (op->cache != NULL)
+                     XML_CAST_FPTR(func) = op->cache;
+                 else {
+@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+                             xmlGenericError(xmlGenericErrorContext,
+             "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
+                                     (char *)op->value4, (char *)op->value5);
++                            xmlXPathPopFrame(ctxt, frame);
+                             return (total);
+                         }
+                         func = xmlXPathFunctionLookupNS(ctxt->context,
+@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+                 func(ctxt, op->value);
+                 ctxt->context->function = oldFunc;
+                 ctxt->context->functionURI = oldFuncURI;
++                xmlXPathPopFrame(ctxt, frame);
+                 return (total);
+             }
+         case XPATH_OP_ARG:
+@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool)
+ 	ctxt->valueNr = 0;
+ 	ctxt->valueMax = 10;
+ 	ctxt->value = NULL;
++        ctxt->valueFrame = 0;
+     }
+ #ifdef XPATH_STREAMING
+     if (ctxt->comp->stream) {
+diff --git a/xpointer.c b/xpointer.c
+index 7a42d02..37afa3a 100644
+--- a/xpointer.c
++++ b/xpointer.c
+@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) {
+ 	ctxt->valueNr = 0;
+ 	ctxt->valueMax = 10;
+ 	ctxt->value = NULL;
++	ctxt->valueFrame = 0;
+     }
+     SKIP_BLANKS;
+     if (CUR == '/') {
+--
+cgit v0.9.0.2
diff --git a/package/libxml2/libxml2-2.7.8-hash-randomization.patch b/package/libxml2/libxml2-2.7.8-hash-randomization.patch
new file mode 100644
index 0000000000..47db59d076
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-hash-randomization.patch
@@ -0,0 +1,297 @@
+From 8973d58b7498fa5100a876815476b81fd1a2412a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Sat, 4 Feb 2012 19:07:44 +0800
+Subject: [PATCH] Add hash randomization to hash and dict structures
+
+Following http://www.ocert.org/advisories/ocert-2011-003.html
+it seems that having hash randomization might be a good idea
+when using XML with untrusted data
+* configure.in: lookup for rand, srand and time
+* dict.c: add randomization to dictionaries hash tables
+* hash.c: add randomization to normal hash tables
+---
+ configure.in |    1 +
+ dict.c       |   81 ++++++++++++++++++++++++++++++++++++++++-----------------
+ hash.c       |   38 ++++++++++++++++++++++++++-
+ 3 files changed, 95 insertions(+), 25 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fa80375..828b66a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -512,6 +512,7 @@ AC_CHECK_FUNCS(strdup strndup strerror)
+ AC_CHECK_FUNCS(finite isnand fp_class class fpclass)
+ AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)
+ AC_CHECK_FUNCS(stat _stat signal)
++AC_CHECK_FUNCS(rand srand time)
+ 
+ dnl Checking the standard string functions availability
+ AC_CHECK_FUNCS(printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf,,
+diff --git a/dict.c b/dict.c
+index 3eff231..ae4966b 100644
+--- a/dict.c
++++ b/dict.c
+@@ -2,7 +2,7 @@
+  * dict.c: dictionary of reusable strings, just used to avoid allocation
+  *         and freeing operations.
+  *
+- * Copyright (C) 2003 Daniel Veillard.
++ * Copyright (C) 2003-2012 Daniel Veillard.
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -19,6 +19,28 @@
+ #define IN_LIBXML
+ #include "libxml.h"
+ 
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
++/*
++ * Following http://www.ocert.org/advisories/ocert-2011-003.html
++ * it seems that having hash randomization might be a good idea
++ * when using XML with untrusted data
++ * Note1: that it works correctly only if compiled with WITH_BIG_KEY
++ *  which is the default.
++ * Note2: the fast function used for a small dict won't protect very
++ *  well but since the attack is based on growing a very big hash
++ *  list we will use the BigKey algo as soon as the hash size grows
++ *  over MIN_DICT_SIZE so this actually works
++ */
++#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME)
++#define DICT_RANDOMIZATION
++#endif
++
+ #include <string.h>
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+@@ -44,23 +66,23 @@ typedef unsigned __int32 uint32_t;
+ #define WITH_BIG_KEY
+ 
+ #ifdef WITH_BIG_KEY
+-#define xmlDictComputeKey(dict, name, len)			\
+-    (((dict)->size == MIN_DICT_SIZE) ?				\
+-     xmlDictComputeFastKey(name, len) :				\
+-     xmlDictComputeBigKey(name, len))
+-
+-#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\
+-    (((prefix) == NULL) ?					\
+-      (xmlDictComputeKey(dict, name, len)) :			\
+-      (((dict)->size == MIN_DICT_SIZE) ?			\
+-       xmlDictComputeFastQKey(prefix, plen, name, len) :	\
+-       xmlDictComputeBigQKey(prefix, plen, name, len)))
++#define xmlDictComputeKey(dict, name, len)                              \
++    (((dict)->size == MIN_DICT_SIZE) ?                                  \
++     xmlDictComputeFastKey(name, len, (dict)->seed) :                   \
++     xmlDictComputeBigKey(name, len, (dict)->seed))
++
++#define xmlDictComputeQKey(dict, prefix, plen, name, len)               \
++    (((prefix) == NULL) ?                                               \
++      (xmlDictComputeKey(dict, name, len)) :                             \
++      (((dict)->size == MIN_DICT_SIZE) ?                                \
++       xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) :	\
++       xmlDictComputeBigQKey(prefix, plen, name, len, (dict)->seed)))
+ 
+ #else /* !WITH_BIG_KEY */
+-#define xmlDictComputeKey(dict, name, len)			\
+-        xmlDictComputeFastKey(name, len)
+-#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\
+-        xmlDictComputeFastQKey(prefix, plen, name, len)
++#define xmlDictComputeKey(dict, name, len)                              \
++        xmlDictComputeFastKey(name, len, (dict)->seed)
++#define xmlDictComputeQKey(dict, prefix, plen, name, len)               \
++        xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed)
+ #endif /* WITH_BIG_KEY */
+ 
+ /*
+@@ -98,6 +120,8 @@ struct _xmlDict {
+     xmlDictStringsPtr strings;
+ 
+     struct _xmlDict *subdict;
++    /* used for randomization */
++    int seed;
+ };
+ 
+ /*
+@@ -125,6 +149,9 @@ static int xmlInitializeDict(void) {
+     if ((xmlDictMutex = xmlNewRMutex()) == NULL)
+         return(0);
+ 
++#ifdef DICT_RANDOMIZATION
++    srand(time(NULL));
++#endif
+     xmlDictInitialized = 1;
+     return(1);
+ }
+@@ -277,13 +304,13 @@ found_pool:
+  */
+ 
+ static uint32_t
+-xmlDictComputeBigKey(const xmlChar* data, int namelen) {
++xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) {
+     uint32_t hash;
+     int i;
+ 
+     if (namelen <= 0 || data == NULL) return(0);
+ 
+-    hash = 0;
++    hash = seed;
+ 
+     for (i = 0;i < namelen; i++) {
+         hash += data[i];
+@@ -310,12 +337,12 @@ xmlDictComputeBigKey(const xmlChar* data, int namelen) {
+  */
+ static unsigned long
+ xmlDictComputeBigQKey(const xmlChar *prefix, int plen,
+-                      const xmlChar *name, int len)
++                      const xmlChar *name, int len, int seed)
+ {
+     uint32_t hash;
+     int i;
+ 
+-    hash = 0;
++    hash = seed;
+ 
+     for (i = 0;i < plen; i++) {
+         hash += prefix[i];
+@@ -346,8 +373,8 @@ xmlDictComputeBigQKey(const xmlChar *prefix, int plen,
+  * for low hash table fill.
+  */
+ static unsigned long
+-xmlDictComputeFastKey(const xmlChar *name, int namelen) {
+-    unsigned long value = 0L;
++xmlDictComputeFastKey(const xmlChar *name, int namelen, int seed) {
++    unsigned long value = seed;
+ 
+     if (name == NULL) return(0);
+     value = *name;
+@@ -381,9 +408,9 @@ xmlDictComputeFastKey(const xmlChar *name, int namelen) {
+  */
+ static unsigned long
+ xmlDictComputeFastQKey(const xmlChar *prefix, int plen,
+-                       const xmlChar *name, int len)
++                       const xmlChar *name, int len, int seed)
+ {
+-    unsigned long value = 0L;
++    unsigned long value = (unsigned long) seed;
+ 
+     if (plen == 0)
+ 	value += 30 * (unsigned long) ':';
+@@ -460,6 +487,11 @@ xmlDictCreate(void) {
+ 	dict->subdict = NULL;
+         if (dict->dict) {
+ 	    memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry));
++#ifdef DICT_RANDOMIZATION
++            dict->seed = rand();
++#else
++            dict->seed = 0;
++#endif
+ 	    return(dict);
+         }
+         xmlFree(dict);
+@@ -486,6 +518,7 @@ xmlDictCreateSub(xmlDictPtr sub) {
+ #ifdef DICT_DEBUG_PATTERNS
+         fprintf(stderr, "R");
+ #endif
++        dict->seed = sub->seed;
+         dict->subdict = sub;
+ 	xmlDictReference(dict->subdict);
+     }
+diff --git a/hash.c b/hash.c
+index b78bc2d..fe1424f 100644
+--- a/hash.c
++++ b/hash.c
+@@ -3,7 +3,7 @@
+  *
+  * Reference: Your favorite introductory book on algorithms
+  *
+- * Copyright (C) 2000 Bjorn Reese and Daniel Veillard.
++ * Copyright (C) 2000,2012 Bjorn Reese and Daniel Veillard.
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -21,6 +21,22 @@
+ #include "libxml.h"
+ 
+ #include <string.h>
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
++/*
++ * Following http://www.ocert.org/advisories/ocert-2011-003.html
++ * it seems that having hash randomization might be a good idea
++ * when using XML with untrusted data
++ */
++#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME)
++#define HASH_RANDOMIZATION
++#endif
++
+ #include <libxml/parser.h>
+ #include <libxml/hash.h>
+ #include <libxml/xmlmemory.h>
+@@ -31,6 +47,10 @@
+ 
+ /* #define DEBUG_GROW */
+ 
++#ifdef HASH_RANDOMIZATION
++static int hash_initialized = 0;
++#endif
++
+ /*
+  * A single entry in the hash table
+  */
+@@ -53,6 +73,9 @@ struct _xmlHashTable {
+     int size;
+     int nbElems;
+     xmlDictPtr dict;
++#ifdef HASH_RANDOMIZATION
++    int random_seed;
++#endif
+ };
+ 
+ /*
+@@ -65,6 +88,9 @@ xmlHashComputeKey(xmlHashTablePtr table, const xmlChar *name,
+     unsigned long value = 0L;
+     char ch;
+     
++#ifdef HASH_RANDOMIZATION
++    value = table->random_seed;
++#endif
+     if (name != NULL) {
+ 	value += 30 * (*name);
+ 	while ((ch = *name++) != 0) {
+@@ -92,6 +118,9 @@ xmlHashComputeQKey(xmlHashTablePtr table,
+     unsigned long value = 0L;
+     char ch;
+     
++#ifdef HASH_RANDOMIZATION
++    value = table->random_seed;
++#endif
+     if (prefix != NULL)
+ 	value += 30 * (*prefix);
+     else
+@@ -156,6 +185,13 @@ xmlHashCreate(int size) {
+         table->table = xmlMalloc(size * sizeof(xmlHashEntry));
+         if (table->table) {
+   	    memset(table->table, 0, size * sizeof(xmlHashEntry));
++#ifdef HASH_RANDOMIZATION
++            if (!hash_initialized) {
++                srand(time(NULL));
++                hash_initialized = 1;
++            }
++            table->random_seed = rand();
++#endif
+   	    return(table);
+         }
+         xmlFree(table);
+-- 
+1.7.8.4
+
diff --git a/package/libxml2/libxml2-2.7.8-reallocation-failures.patch b/package/libxml2/libxml2-2.7.8-reallocation-failures.patch
new file mode 100644
index 0000000000..a18756cb87
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-reallocation-failures.patch
@@ -0,0 +1,101 @@
+From d7958b21e7f8c447a26bb2436f08402b2c308be4 Mon Sep 17 00:00:00 2001
+From: Chris Evans <scarybeasts@gmail.com>
+Date: Wed, 23 Mar 2011 00:13:06 +0000
+Subject: Fix some potential problems on reallocation failures
+
+The count was incremented before the allocation
+and not fixed in case of failure
+* xpath.c: corrects a few instances where the available count of some
+           structure is updated before we know the allocation actually
+           succeeds
+---
+diff --git a/xpath.c b/xpath.c
+index 8b56189..608fe00 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) {
+     } else if (cur->nodeNr == cur->nodeMax) {
+         xmlNodePtr *temp;
+ 
+-        cur->nodeMax *= 2;
+-	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
++	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
+ 				      sizeof(xmlNodePtr));
+ 	if (temp == NULL) {
+ 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
+ 	    return;
+ 	}
++        cur->nodeMax *= 2;
+ 	cur->nodeTab = temp;
+     }
+     cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
+@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) {
+     } else if (cur->nodeNr == cur->nodeMax) {
+         xmlNodePtr *temp;
+ 
+-        cur->nodeMax *= 2;
+-	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
++	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
+ 				      sizeof(xmlNodePtr));
+ 	if (temp == NULL) {
+ 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
+ 	    return;
+ 	}
+ 	cur->nodeTab = temp;
++        cur->nodeMax *= 2;
+     }
+     if (val->type == XML_NAMESPACE_DECL) {
+ 	xmlNsPtr ns = (xmlNsPtr) val;
+@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {
+ 	} else if (val1->nodeNr == val1->nodeMax) {
+ 	    xmlNodePtr *temp;
+ 
+-	    val1->nodeMax *= 2;
+-	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
++	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 *
+ 					     sizeof(xmlNodePtr));
+ 	    if (temp == NULL) {
+ 	        xmlXPathErrMemory(NULL, "merging nodeset\n");
+ 		return(NULL);
+ 	    }
+ 	    val1->nodeTab = temp;
++	    val1->nodeMax *= 2;
+ 	}
+ 	if (n2->type == XML_NAMESPACE_DECL) {
+ 	    xmlNsPtr ns = (xmlNsPtr) n2;
+@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
+ 	    } else if (set1->nodeNr >= set1->nodeMax) {
+ 		xmlNodePtr *temp;
+ 
+-		set1->nodeMax *= 2;
+ 		temp = (xmlNodePtr *) xmlRealloc(
+-		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
++		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
+ 		if (temp == NULL) {
+ 		    xmlXPathErrMemory(NULL, "merging nodeset\n");
+ 		    return(NULL);
+ 		}
+ 		set1->nodeTab = temp;
++		set1->nodeMax *= 2;
+ 	    }
+ 	    if (n2->type == XML_NAMESPACE_DECL) {
+ 		xmlNsPtr ns = (xmlNsPtr) n2;
+@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
+ 	    } else if (set1->nodeNr >= set1->nodeMax) {
+ 		xmlNodePtr *temp;
+ 
+-		set1->nodeMax *= 2;
+ 		temp = (xmlNodePtr *) xmlRealloc(
+-		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
++		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
+ 		if (temp == NULL) {
+ 		    xmlXPathErrMemory(NULL, "merging nodeset\n");
+ 		    return(NULL);
+ 		}
+ 		set1->nodeTab = temp;
++		set1->nodeMax *= 2;
+ 	    }
+ 	    set1->nodeTab[set1->nodeNr++] = n2;
+ 	}
+--
+cgit v0.9
diff --git a/package/libxml2/libxml2-2.7.8-xpath-freeing.patch b/package/libxml2/libxml2-2.7.8-xpath-freeing.patch
new file mode 100644
index 0000000000..3509a48daf
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-xpath-freeing.patch
@@ -0,0 +1,32 @@
+From df83c17e5a2646bd923f75e5e507bc80d73c9722 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Wed, 17 Nov 2010 13:12:14 +0000
+Subject: Fix a potential freeing error in XPath
+
+---
+diff --git a/xpath.c b/xpath.c
+index 81e33f6..1447be5 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ 
+ 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
+ 	        xmlXPathObjectPtr tmp;
+-		/* pop the result */
++		/* pop the result if any */
+ 		tmp = valuePop(ctxt);
+-		xmlXPathReleaseObject(xpctxt, tmp);
+-		/* then pop off contextObj, which will be freed later */
+-		valuePop(ctxt);
++                if (tmp != contextObj)
++                    /*
++                     * Free up the result
++                     * then pop off contextObj, which will be freed later
++                     */
++                    xmlXPathReleaseObject(xpctxt, tmp);
++                    valuePop(ctxt);
+ 		goto evaluation_error;
+ 	    }
+ 
+--
+cgit v0.8.3.1
diff --git a/package/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/package/libxml2/libxml2-2.7.8-xpath-freeing2.patch
new file mode 100644
index 0000000000..17059418b2
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-xpath-freeing2.patch
@@ -0,0 +1,28 @@
+From fec31bcd452e77c10579467ca87a785b41115de6 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 18 Nov 2010 10:07:24 +0000
+Subject: Small fix for previous commit
+
+---
+diff --git a/xpath.c b/xpath.c
+index 1447be5..8b56189 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ 	        xmlXPathObjectPtr tmp;
+ 		/* pop the result if any */
+ 		tmp = valuePop(ctxt);
+-                if (tmp != contextObj)
++                if (tmp != contextObj) {
+                     /*
+                      * Free up the result
+                      * then pop off contextObj, which will be freed later
+                      */
+                     xmlXPathReleaseObject(xpctxt, tmp);
+                     valuePop(ctxt);
++                }
+ 		goto evaluation_error;
+ 	    }
+ 
+--
+cgit v0.8.3.1
diff --git a/package/libxml2/libxml2-2.7.8-xpath-memory.patch b/package/libxml2/libxml2-2.7.8-xpath-memory.patch
new file mode 100644
index 0000000000..f94350d277
--- /dev/null
+++ b/package/libxml2/libxml2-2.7.8-xpath-memory.patch
@@ -0,0 +1,29 @@
+From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 15 Nov 2010 11:06:29 +0000
+Subject: Fix a potential memory access error
+
+in case of a previus allocation error
+---
+diff --git a/xpath.c b/xpath.c
+index 4d6826d..81e33f6 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -3575,13 +3575,13 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) {
+     } else if (cur->nodeNr == cur->nodeMax) {
+         xmlNodePtr *temp;
+ 
+-        cur->nodeMax *= 2;
+-	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
++	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
+ 				      sizeof(xmlNodePtr));
+ 	if (temp == NULL) {
+ 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
+ 	    return;
+ 	}
++        cur->nodeMax *= 2;
+ 	cur->nodeTab = temp;
+     }
+     if (val->type == XML_NAMESPACE_DECL) {
+--
+cgit v0.8.3.1
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 0687137a58..54ad123d1e 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -7,6 +7,7 @@
 LIBXML2_VERSION = 2.7.8
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
+LIBXML2_AUTORECONF = YES
 
 ifneq ($(BR2_LARGEFILE),y)
 LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"

From d88a3cc40d070f2fa5ec5e936c9aaf4e3a2e2f55 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 Feb 2012 17:30:13 -0300
Subject: [PATCH 1560/6849] libcurl: security bump to version 7.24.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index a4204668cc..e094e31cde 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-LIBCURL_VERSION = 7.21.7
+LIBCURL_VERSION = 7.24.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
-LIBCURL_SITE = http://curl.haxx.se/download/
+LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_INSTALL_STAGING = YES
 LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
 

From 51dc5df8ab124f91695f87ea9e3971c0a5a0c421 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 Feb 2012 17:30:03 -0300
Subject: [PATCH 1561/6849] dhcp: security bump to version 4.1-ESV-R4

Bump to version 4.1-ESV-R4 to fix CVE-2011-4539

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 7548f41da7..10bdc2e33e 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DHCP_VERSION  = 4.1-ESV-R3
+DHCP_VERSION  = 4.1-ESV-R4
 DHCP_SITE     = http://ftp.isc.org/isc/dhcp
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes
 DHCP_CONF_OPT = \

From 7d13f3ad3b1cabe489dcbbd431ce516abfe36a2f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:50 -0300
Subject: [PATCH 1562/6849] squid: bump to version 3.1.19

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index a2160f1ff6..9cdbeb5a3a 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.18
+SQUID_VERSION = 3.1.19
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \

From 20fe184b08e1bec1ef6e1f6868c80836bf12ac88 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:51 -0300
Subject: [PATCH 1563/6849] gmp: bump to version 5.0.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 2222465c8f..7899b71d9c 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMP_VERSION = 5.0.2
+GMP_VERSION = 5.0.4
 GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES

From 95fa3586e1661e9c362630e786f6615d3f5b73ab Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:52 -0300
Subject: [PATCH 1564/6849] mpd: bump to version 0.16.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 009fabbcaf..89cf7b2d80 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.6
+MPD_VERSION = 0.16.7
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
 MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2

From 3e18ec75f8bf04ed2abcf6f8a09a872fde047d5c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 11 Mar 2012 23:05:42 +0100
Subject: [PATCH 1565/6849] mpd: autoreconf no longer needed

configure.ac patch got dropped with the 0.16.3 version bump.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 89cf7b2d80..e3b5331235 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -6,7 +6,6 @@
 
 MPD_VERSION = 0.16.7
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
-MPD_AUTORECONF = YES
 MPD_DEPENDENCIES = host-pkg-config libglib2
 
 # Some options need an explicit --disable or --enable

From bf6a940a519ea4304b1c8dbde514737ffc837fd4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:53 -0300
Subject: [PATCH 1566/6849] util-linux: bump to version 2.20.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux-script-libintl.patch           | 30 -------------------
 package/util-linux/util-linux.mk              |  3 +-
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 package/util-linux/util-linux-script-libintl.patch

diff --git a/package/util-linux/util-linux-script-libintl.patch b/package/util-linux/util-linux-script-libintl.patch
deleted file mode 100644
index 0700aa40f8..0000000000
--- a/package/util-linux/util-linux-script-libintl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 075f251b19509f588d828a81d91b40f47e63e3de Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 5 Sep 2011 21:46:25 +0200
-Subject: [PATCH] script.c: drop libintl.h include
-
-Commit 8fb810ff26 (script: include-what-you-use header check) added a
-<libintl.h> #include, which isn't needed as nls.h includes it (if
-enabled) - But worse, breaks the build for systems without libintl.h
-(like some uClibc configurations).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- term-utils/script.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/term-utils/script.c b/term-utils/script.c
-index d96ca2f..f708e91 100644
---- a/term-utils/script.c
-+++ b/term-utils/script.c
-@@ -55,7 +55,6 @@
- #include <getopt.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <libintl.h>
- #include <limits.h>
- #include <locale.h>
- #include <stddef.h>
--- 
-1.7.5.4
-
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 86d970f011..d8a3ac98fc 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -3,13 +3,14 @@
 # util-linux
 #
 #############################################################
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
 UTIL_LINUX_VERSION_MAJOR = 2.20
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkg-config
+UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
 
 UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
 

From 572fc1351eac9202d76a56707aedae9bc8eb5f26 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:54 -0300
Subject: [PATCH 1567/6849] radvd: bump version to 1.8.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index d4b9a73f86..e63e8e030b 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-RADVD_VERSION = 1.8.3
-RADVD_SITE = http://www.litech.org/radvd/dist/
+RADVD_VERSION = 1.8.5
+RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = flex host-flex
 
 define RADVD_INSTALL_INITSCRIPT

From 4e57e9ce7704916d3409f7e5d63c8ca3776c06f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:56 -0300
Subject: [PATCH 1568/6849] ntfs-3g: bump to version 2012.1.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/ntfs-3g.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index f6462bb0bb..8e616cb795 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NTFS_3G_VERSION = 2011.4.12
+NTFS_3G_VERSION = 2012.1.15
 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
 NTFS_3G_CONF_OPT = --disable-ldconfig

From b1a70b76ab77745b08d54c7aaaa64b6e9cd519b4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:57 -0300
Subject: [PATCH 1569/6849] ntfsprogs: remove deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 -
 package/ntfsprogs/Config.in                   | 12 ------
 ...ogs-2.0.0-no-pkgconfig-path-override.patch | 42 -------------------
 package/ntfsprogs/ntfsprogs.mk                | 26 ------------
 4 files changed, 81 deletions(-)
 delete mode 100644 package/ntfsprogs/Config.in
 delete mode 100644 package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch
 delete mode 100644 package/ntfsprogs/ntfsprogs.mk

diff --git a/package/Config.in b/package/Config.in
index c582f8a5ea..4838edc80e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -200,7 +200,6 @@ source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
-source "package/ntfsprogs/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
 source "package/pciutils/Config.in"
diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in
deleted file mode 100644
index 561c1d4488..0000000000
--- a/package/ntfsprogs/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_NTFSPROGS
-	bool "ntfsprogs"
-	depends on BR2_USE_WCHAR
-	depends on BR2_LARGEFILE
-	depends on BR2_DEPRECATED
-	help
-	  wide collection of NTFS utilities
-
-	  http://www.linux-ntfs.org/
-
-comment "ntfsprogs requires a toolchain with WCHAR and LARGEFILE support"
-	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE
diff --git a/package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch b/package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch
deleted file mode 100644
index bf7824d700..0000000000
--- a/package/ntfsprogs/ntfsprogs-2.0.0-no-pkgconfig-path-override.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-[PATCH] ntfsprogs: don't override PKG_CONFIG_PATH
-
-Adding hardcoded directories to the pkg-config search path breaks
-cross compilation (E.G. if the host has a .pc for a package the
-target doesn't have).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure    |    4 ----
- configure.ac |    4 ----
- 2 files changed, 8 deletions(-)
-
-Index: ntfsprogs-2.0.0/configure.ac
-===================================================================
---- ntfsprogs-2.0.0.orig/configure.ac
-+++ ntfsprogs-2.0.0/configure.ac
-@@ -168,10 +168,6 @@ AC_PROG_MAKE_SET
- AC_PROG_LIBTOOL
- PKG_PROG_PKG_CONFIG
- 
--# Libraries often install their metadata .pc files in directories not searched
--# by pkg-config. Let's workaround this. 
--export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig
--
- # Enable large file support.
- AC_SYS_LARGEFILE
- 
-Index: ntfsprogs-2.0.0/configure
-===================================================================
---- ntfsprogs-2.0.0.orig/configure
-+++ ntfsprogs-2.0.0/configure
-@@ -20210,10 +20210,6 @@ echo "${ECHO_T}no" >&6; }
- 
- fi
- 
--# Libraries often install their metadata .pc files in directories not searched
--# by pkg-config. Let's workaround this.
--export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig
--
- # Enable large file support.
- # Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then
diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk
deleted file mode 100644
index 32b9cb256c..0000000000
--- a/package/ntfsprogs/ntfsprogs.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#############################################################
-#
-# ntfsprogs
-#
-#############################################################
-NTFSPROGS_VERSION:=2.0.0
-NTFSPROGS_SOURCE:=ntfsprogs-$(NTFSPROGS_VERSION).tar.gz
-NTFSPROGS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-ntfs/
-NTFSPROGS_CONF_OPT:=--disable-gnome-vfs --disable-crypto
-NTFSPROGS_INSTALL_STAGING:=yes
-
-NTFSPROGS_BIN:=ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls
-NTFSPROGS_SBIN:=ntfsclone ntfscp ntfslabel ntfsresize ntfsundelete mkntfs
-
-ifeq ($(BR2_PACKAGE_LIBFUSE),y)
-NTFSPROGS_DEPENDENCIES += libfuse
-endif
-
-define NTFSPROGS_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/lib/libntfs.so*
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(NTFSPROGS_BIN))
-	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(NTFSPROGS_SBIN))
-	-unlink $(TARGET_DIR)/sbin/mkfs.ntfs
-endef
-
-$(eval $(call AUTOTARGETS))

From a92bcd381cb39ebeeaddaf0dc188fc0f1f881ac9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:00 -0300
Subject: [PATCH 1570/6849] smartmontools: bump to version 5.42

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/smartmontools/smartmontools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index d14e740ad2..3a6fce7626 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SMARTMONTOOLS_VERSION = 5.41
+SMARTMONTOOLS_VERSION = 5.42
 SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
 
 $(eval $(call AUTOTARGETS))

From 0785fbd88dc7d59573a066be7f9543981af76fb0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:58 -0300
Subject: [PATCH 1571/6849] libnl: bump to version 3.2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index fc37c7d1c5..661d7f2e86 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.4
-LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz
-LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
+LIBNL_VERSION = 3.2.7
+LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison
 LIBNL_MAKE = $(MAKE1)

From ce41184f06e5c8afb4f6cc891d430b88e7b9eb2c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:01 -0300
Subject: [PATCH 1572/6849] libfuse: bump to version 2.8.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/libfuse.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 25cc45f0f5..3616c65d6b 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFUSE_VERSION = 2.8.6
+LIBFUSE_VERSION = 2.8.7
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
 

From bc81fbb0529aaef35bdad5f983e2fc0bef91df45 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:59 -0300
Subject: [PATCH 1573/6849] nbd: bump to version 3.0

[Peter: only disable fallocate for uClibc toolchains]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd-fix-non-lfs.patch         | 37 -----------------------
 package/nbd/nbd-server-susv3-legacy.patch | 11 -------
 package/nbd/nbd.mk                        |  8 ++++-
 3 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 package/nbd/nbd-fix-non-lfs.patch
 delete mode 100644 package/nbd/nbd-server-susv3-legacy.patch

diff --git a/package/nbd/nbd-fix-non-lfs.patch b/package/nbd/nbd-fix-non-lfs.patch
deleted file mode 100644
index 41a80cdd81..0000000000
--- a/package/nbd/nbd-fix-non-lfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8dd182693e9995bc1aeb907f9fd4ec06c18fc56f Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 5 Dec 2011 23:27:30 +0100
-Subject: [PATCH] lfs.h: fix !LFS builds
-
-Commit 448637fba4 (Fix 32/64 bit confusion) broke !LFS builds as it
-added the PARAM_OFFT defines inside the wrong conditional.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- lfs.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lfs.h b/lfs.h
-index 64a03de..68d3b81 100644
---- a/lfs.h
-+++ b/lfs.h
-@@ -6,14 +6,14 @@
- #define _FILE_OFFSET_BITS 64
- #ifndef _LARGEFILE_SOURCE
- #define _LARGEFILE_SOURCE
-+#endif
- #define PARAM_OFFT PARAM_INT64
- #else
- #define PARAM_OFFT PARAM_INT
--#endif
-+#endif /* NBD_LFS */
- #ifdef HAVE_SYNC_FILE_RANGE
- #define USE_SYNC_FILE_RANGE
- #define _GNU_SOURCE
- #endif /* HAVE_SYNC_FILE_RANGE */
--#endif /* NBD_LFS */
- 
- #endif /* LFS_H */
--- 
-1.7.7.1
-
diff --git a/package/nbd/nbd-server-susv3-legacy.patch b/package/nbd/nbd-server-susv3-legacy.patch
deleted file mode 100644
index 58d38e1509..0000000000
--- a/package/nbd/nbd-server-susv3-legacy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nbd-2.9.11/nbd-server.c	2009-10-01 16:10:15.000000000 +0200
-+++ nbd-2.9.11/nbd-server.c	2009-10-01 16:10:32.000000000 +0200
-@@ -264,7 +264,7 @@
-   
-   	inet_aton(opts->clientname, &client);
- 	while (fgets(line,LINELEN,f)!=NULL) {
--		if((tmp=index(line, '/'))) {
-+		if((tmp=strchr(line, '/'))) {
- 			if(strlen(line)<=tmp-line) {
- 				msg4(LOG_CRIT, ERRMSG, line, opts->server->authname);
- 				return 0;
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index d9d0a8546c..452ed3429c 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -4,12 +4,18 @@
 #
 #############################################################
 
-NBD_VERSION = 2.9.24
+NBD_VERSION = 3.0
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
 NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
 NBD_DEPENDENCIES = libglib2
 
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+# We have linux/falloc.h
+# but uClibc lacks fallocate(2) which is a glibc-ism
+NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no
+endif
+
 ifneq ($(BR2_NBD_CLIENT),y)
 	NBD_TOREMOVE += nbd-client
 endif

From 59d38209bf0f31e7450da647358caea4b6d9613a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:02 -0300
Subject: [PATCH 1574/6849] hdparm: bump to version 9.39

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hdparm/hdparm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index abbb0c3254..fb90ce2417 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-HDPARM_VERSION = 9.38
+HDPARM_VERSION = 9.39
 HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
 
 define HDPARM_BUILD_CMDS

From 6f2e45599481dfa07df3071c49b9bf6629241396 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:03 -0300
Subject: [PATCH 1575/6849] sysstat: bump to version 10.0.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sysstat/sysstat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 0a17b4debd..55991c4399 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SYSSTAT_VERSION = 10.0.2
+SYSSTAT_VERSION = 10.0.3
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
 SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors

From b0820e0e0431387b549cf22eb0e1d13ccc5fc731 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:05 -0300
Subject: [PATCH 1576/6849] grep: bump to version 2.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/grep/grep.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index a4391d7dee..aa22910da7 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GREP_VERSION = 2.10
+GREP_VERSION = 2.11
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex

From 7804b7bda3d977cfb4a9615d3ea1c1cf13ec8718 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:06 -0300
Subject: [PATCH 1577/6849] file: bump to version 5.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index bb1b6bd1b2..c9846e437e 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FILE_VERSION = 5.10
+FILE_VERSION = 5.11
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib

From 1f8442b5c287660050b59951a8f0a1e32cb7be4d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:07 -0300
Subject: [PATCH 1578/6849] wipe: bump to version 2.3.1 and switch to
 sourceforge

The original version is gone, so switch to sourceforge wipe and bump to
version 2.3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wipe/Config.in                 |  2 +-
 package/wipe/wipe-dont-force-lfs.patch | 16 ++++++++++++++++
 package/wipe/wipe.mk                   | 24 +++++-------------------
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 package/wipe/wipe-dont-force-lfs.patch

diff --git a/package/wipe/Config.in b/package/wipe/Config.in
index a053a72e94..0241c13715 100644
--- a/package/wipe/Config.in
+++ b/package/wipe/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_WIPE
 	  Wipe is a little command for securely erasing files
 	  from magnetic media. It compiles under various unix platforms.
 
-	  http://lambda-diode.com/software/wipe
+	  http://wipe.sourceforge.net
diff --git a/package/wipe/wipe-dont-force-lfs.patch b/package/wipe/wipe-dont-force-lfs.patch
new file mode 100644
index 0000000000..08916e24a8
--- /dev/null
+++ b/package/wipe/wipe-dont-force-lfs.patch
@@ -0,0 +1,16 @@
+LARGEFILE support shouldn't be forced into CFLAGS
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura wipe-2.3.1/configure.in wipe-2.3.1-lfs/configure.in
+--- wipe-2.3.1/configure.in	2009-06-15 22:55:11.000000000 -0300
++++ wipe-2.3.1-lfs/configure.in	2012-03-05 11:25:30.463221948 -0300
+@@ -91,7 +91,7 @@
+ test "$with_efence" = "yes" && temp2CFLAGS="$debugCFLAGS" && LIBS="-lefence"
+ 
+ DEBUG="$debugCFLAGS $fullCFLAGS"
+-fullCFLAGS="$temp2CFLAGS $fullCFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
++fullCFLAGS="$temp2CFLAGS $fullCFLAGS"
+ CFLAGS="$checkCFLAGS -D__USE_BSD -D_BSD_SOURCE -D__USE_POSIX -D_POSIX_SOURCE -D_POSIX_MAPPED_FILES"
+ 
+ dnl Checks for libraries.
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index 54283f9120..ec1b692a9a 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -4,20 +4,10 @@
 #
 #############################################################
 
-WIPE_VERSION = 0.22
-WIPE_SITE = http://lambda-diode.com/resources/wipe
-WIPE_CFLAGS = $(TARGET_CFLAGS) -DHAVE_DEV_URANDOM -DHAVE_OSYNC -DHAVE_STRCASECMP -DHAVE_RANDOM -DSYNC_WAITS_FOR_SYNC -DFIND_DEVICE_SIZE_BY_BLKGETSIZE
-
-ifeq ($(BR2_LARGEFILE),y)
-WIPE_CFLAGS += -DSIXTYFOUR
-endif
-
-define WIPE_BUILD_CMDS
-	# Fix busted git version logic
-	$(SED) "s/which/!which/" $(@D)/Makefile
-	$(MAKE) -C $(@D) linux CC_LINUX="$(TARGET_CC)" \
-		CCO_LINUX="$(WIPE_CFLAGS)"
-endef
+WIPE_VERSION = 2.3.1
+WIPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/wipe
+WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2
+WIPE_AUTORECONF = YES
 
 define WIPE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/wipe $(TARGET_DIR)/usr/bin/wipe
@@ -29,8 +19,4 @@ define WIPE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man1/wipe.1
 endef
 
-define WIPE_CLEAN_CMDS
-	$(MAKE) -C $(@D) clean
-endef
-
-$(eval $(call GENTARGETS))
+$(eval $(call AUTOTARGETS))

From dd23a8f52ad9da062dcb1a578c071e2131056ac0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:09 -0300
Subject: [PATCH 1579/6849] alsa-utils: bump to version 1.0.25

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../alsa-utils-exp10-workaround.patch         | 33 -------------------
 package/multimedia/alsa-utils/alsa-utils.mk   |  3 +-
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch

diff --git a/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch b/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch
deleted file mode 100644
index f4a520a5c3..0000000000
--- a/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 14 Mar 2011 09:19:18 +0100
-Subject: [PATCH] alsamixer: fix build on uClibc
-
-exp10 is a glibc extension, which isn't supported on uClibc. Luckily,
-exp10() is trivial to compute based on exp(), so add a wrapper for
-the uClibc case.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- alsamixer/volume_mapping.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c
-index 9cacad8..1c0d7c4 100644
---- a/alsamixer/volume_mapping.c
-+++ b/alsamixer/volume_mapping.c
-@@ -37,6 +37,11 @@
- #include <stdbool.h>
- #include "volume_mapping.h"
- 
-+#ifdef __UCLIBC__
-+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
-+#define exp10(x) (exp((x) * log(10)))
-+#endif /* __UCLIBC__ */
-+
- #define MAX_LINEAR_DB_SCALE	24
- 
- static inline bool use_linear_dB_scale(long dBmin, long dBmax)
--- 
-1.7.2.3
-
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 59579c23d6..744ec85dc2 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -3,7 +3,8 @@
 # alsa-utils
 #
 #############################################################
-ALSA_UTILS_VERSION = 1.0.24.2
+
+ALSA_UTILS_VERSION = 1.0.25
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
 ALSA_UTILS_INSTALL_STAGING = YES

From b548f936ab695497bffa02a5a50a2c3d2edff816 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:08 -0300
Subject: [PATCH 1580/6849] alsa-lib: bump to version 1.0.25

[Peter: swapped static/shared test around]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-inline.patch => alsa-lib-avr32-bad-inline.patch} |  0
 package/multimedia/alsa-lib/alsa-lib.mk              | 12 +++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename package/multimedia/alsa-lib/{alsa-lib-1.0.18-avr32-bad-inline.patch => alsa-lib-avr32-bad-inline.patch} (100%)

diff --git a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch b/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch
similarity index 100%
rename from package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
rename to package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index aa6ca512f1..2d27c960ca 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -3,18 +3,24 @@
 # alsa-lib
 #
 #############################################################
-ALSA_LIB_VERSION = 1.0.24.1
+
+ALSA_LIB_VERSION = 1.0.25
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
 ALSA_LIB_INSTALL_STAGING = YES
-
 ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
-
 ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
 		    --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
 		    --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
 		    --without-versioned
 
+# Can't build with static & shared at the same time (1.0.25+)
+ifeq ($(BR2_PREFER_STATIC),y)
+ALSA_LIB_CONF_OPT += --enable-shared=no
+else
+ALSA_LIB_CONF_OPT += --enable-static=no
+endif
+
 ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y)
 ALSA_LIB_CONF_OPT += --disable-aload
 endif

From 0592bea4ba5c6cff109dd95b8e1d015632f0af1d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:48:04 -0300
Subject: [PATCH 1581/6849] mpfr: bump to version 3.1.0-p6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr-3.0.1_p4.patch | 367 -----------------
 package/mpfr/mpfr-3.1.0-p6.patch | 673 +++++++++++++++++++++++++++++++
 package/mpfr/mpfr.mk             |   2 +-
 3 files changed, 674 insertions(+), 368 deletions(-)
 delete mode 100644 package/mpfr/mpfr-3.0.1_p4.patch
 create mode 100644 package/mpfr/mpfr-3.1.0-p6.patch

diff --git a/package/mpfr/mpfr-3.0.1_p4.patch b/package/mpfr/mpfr-3.0.1_p4.patch
deleted file mode 100644
index 9604635a28..0000000000
--- a/package/mpfr/mpfr-3.0.1_p4.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
-@@ -0,0 +1 @@
-+asin_exprange
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
-@@ -1 +1 @@
--3.0.1
-+3.0.1-p1
-diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
---- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -63,11 +63,14 @@
- 
-   compared = mpfr_cmp_ui (xp, 1);
- 
-+  MPFR_SAVE_EXPO_MARK (expo);
-+
-   if (MPFR_UNLIKELY (compared >= 0))
-     {
-       mpfr_clear (xp);
-       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
-         {
-+          MPFR_SAVE_EXPO_FREE (expo);
-           MPFR_SET_NAN (asin);
-           MPFR_RET_NAN;
-         }
-@@ -80,13 +83,11 @@
-               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
-               MPFR_CHANGE_SIGN (asin);
-             }
--          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
--          return inexact;
-+          mpfr_div_2ui (asin, asin, 1, rnd_mode);
-         }
-     }
--
--  MPFR_SAVE_EXPO_MARK (expo);
--
-+  else
-+    {
-   /* Compute exponent of 1 - ABS(x) */
-   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
-   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
-@@ -115,6 +116,7 @@
-   inexact = mpfr_set (asin, xp, rnd_mode);
- 
-   mpfr_clear (xp);
-+    }
- 
-   MPFR_SAVE_EXPO_FREE (expo);
-   return mpfr_check_range (asin, inexact, rnd_mode);
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1"
-+#define MPFR_VERSION_STRING "3.0.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
---- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -219,6 +219,49 @@
-   mpfr_clear (y);
- }
- 
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (1);
-+  mpfr_set_emax (1);
-+  mpfr_clear_flags ();
-+  inex = mpfr_asin (y, x, MPFR_RNDA);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
-+  ex_inex = -1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -226,6 +269,7 @@
- 
-   special ();
-   special_overflow ();
-+  reduced_expo_range ();
- 
-   test_generic (2, 100, 15);
- 
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1";
-+  return "3.0.1-p1";
- }
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
-@@ -0,0 +1 @@
-+rec_sqrt-carry
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p1
-+3.0.1-p2
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p1"
-+#define MPFR_VERSION_STRING "3.0.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
---- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
-@@ -375,20 +375,37 @@
-       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
-       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
-          we need to add or subtract the overlapping part {u + ln, un - ln} */
-+      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
-+         below (with size = th) mustn't be used. In such a case, the limb
-+         (carry) will be 0, so that this is semantically a no-op, but if
-+         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
-+         non-atomic read/write in a place that is not always allocated,
-+         with the possible consequences: a crash if the corresponding
-+         address is not mapped, or (rather unlikely) memory corruption
-+         if another process/thread writes at the same place; things may
-+         be worse with future GMP versions. Hence the tests carry != 0. */
-       if (neg == 0)
-         {
-           if (ln > 0)
-             MPN_COPY (x, u, ln);
-           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
-           /* add cu at x+un */
--          cy += mpn_add_1 (x + un, x + un, th, cu);
-+          if (cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy += mpn_add_1 (x + un, x + un, th, cu);
-+            }
-         }
-       else /* negative case */
-         {
-           /* subtract {u+ln, un-ln} from {x+ln,un} */
-           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
-           /* carry cy is at x+un, like cu */
--          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+          if (cy + cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+            }
-           /* cy cannot be zero, since the most significant bit of Xh is 1,
-              and the correction is bounded by 2^{-h+3} */
-           MPFR_ASSERTD(cy == 0);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p1";
-+  return "3.0.1-p2";
- }
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
-@@ -0,0 +1 @@
-+atan-expo-range
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p2
-+3.0.1-p3
-diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
---- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -431,5 +431,5 @@
-   MPFR_GROUP_CLEAR (group);
- 
-   MPFR_SAVE_EXPO_FREE (expo);
--  return mpfr_check_range (arctgt, inexact, rnd_mode);
-+  return mpfr_check_range (atan, inexact, rnd_mode);
- }
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p2"
-+#define MPFR_VERSION_STRING "3.0.1-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
---- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -535,6 +535,52 @@
-   mpfr_clears (a, x, y, (mpfr_ptr) 0);
- }
- 
-+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
-+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
-+ */
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (-5);
-+  mpfr_set_emax (-5);
-+  mpfr_clear_flags ();
-+  inex = mpfr_atan (y, x, MPFR_RNDN);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
-+  ex_inex = 1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -546,6 +592,7 @@
-   smallvals_atan2 ();
-   atan2_bug_20071003 ();
-   atan2_different_prec ();
-+  reduced_expo_range ();
- 
-   test_generic_atan  (2, 200, 17);
-   test_generic_atan2 (2, 200, 17);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p2";
-+  return "3.0.1-p3";
- }
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
-@@ -0,0 +1 @@
-+texp-zero
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p3
-+3.0.1-p4
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p3"
-+#define MPFR_VERSION_STRING "3.0.1-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
---- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
-@@ -170,7 +170,9 @@
-       mpfr_set_prec (x, prec);
-       mpfr_set_prec (y, prec);
-       mpfr_set_prec (z, prec);
--      mpfr_urandomb (x, RANDS);
-+      do
-+        mpfr_urandomb (x, RANDS);
-+      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
-       rnd = RND_RAND ();
-       mpfr_exp_2 (y, x, rnd);
-       mpfr_exp_3 (z, x, rnd);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p3";
-+  return "3.0.1-p4";
- }
diff --git a/package/mpfr/mpfr-3.1.0-p6.patch b/package/mpfr/mpfr-3.1.0-p6.patch
new file mode 100644
index 0000000000..edb852f490
--- /dev/null
+++ b/package/mpfr/mpfr-3.1.0-p6.patch
@@ -0,0 +1,673 @@
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
+@@ -0,0 +1 @@
++mpfr_unlikely
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
+@@ -1 +1 @@
+-3.1.0
++3.1.0-p1
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
+@@ -988,10 +988,11 @@
+  ******************************************************/
+ 
+ /* Theses macros help the compiler to determine if a test is
+- * likely or unlikely. */
++   likely or unlikely. The !! is necessary in case x is larger
++   than a long. */
+ #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
+ # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
+-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
+ #else
+ # define MPFR_LIKELY(x) (x)
+ # define MPFR_UNLIKELY(x) (x)
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0"
++#define MPFR_VERSION_STRING "3.1.0-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0";
++  return "3.1.0-p1";
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
+@@ -0,0 +1 @@
++lib-search-path
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p1
++3.1.0-p2
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p1"
++#define MPFR_VERSION_STRING "3.1.0-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p1";
++  return "3.1.0-p2";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
+--- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
+@@ -65,8 +65,24 @@
+ TESTS = $(check_PROGRAMS)
+ TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
+ 
+-# Option to prevent libtool from generating wrapper scripts for the tests.
++# The -no-install option prevents libtool from generating wrapper scripts
++# for the tests.
+ # This is useful to easily run the test scripts under valgrind or gdb.
+ # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
+ # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
+-AM_LDFLAGS = -no-install
++#
++# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
++# library is already installed in the corresponding lib directory: its
++# purpose is to make sure that the local .libs comes first in the library
++# search path (otherwise the tests are linked against the old MPFR library
++# by the LINK command -- see the generated Makefile). See:
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
++# and
++#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
++#
++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
+diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
+--- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
++++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
+@@ -1124,11 +1124,27 @@
+ TESTS = $(check_PROGRAMS)
+ TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
+ 
+-# Option to prevent libtool from generating wrapper scripts for the tests.
++# The -no-install option prevents libtool from generating wrapper scripts
++# for the tests.
+ # This is useful to easily run the test scripts under valgrind or gdb.
+ # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
+ # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
+-AM_LDFLAGS = -no-install
++#
++# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
++# library is already installed in the corresponding lib directory: its
++# purpose is to make sure that the local .libs comes first in the library
++# search path (otherwise the tests are linked against the old MPFR library
++# by the LINK command -- see the generated Makefile). See:
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
++#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
++# and
++#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
++#
++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
+ all: all-am
+ 
+ .SUFFIXES:
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
+@@ -0,0 +1 @@
++vasprintf
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p2
++3.1.0-p3
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p2"
++#define MPFR_VERSION_STRING "3.1.0-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
+--- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
+@@ -1178,7 +1178,7 @@
+   mpfr_exp_t exp;
+   char * str;
+   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
+-  const int keep_trailing_zeros = spec_g && spec.alt;
++  const int keep_trailing_zeros = !spec_g || spec.alt;
+ 
+   /* WARNING: an empty precision field is forbidden (it means precision = 6
+      and it should have been changed to 6 before the function call) */
+@@ -1356,7 +1356,7 @@
+   else
+     /* 1 <= |p| */
+     {
+-      size_t nsd;  /* Number of significant digits */
++      size_t str_len;
+ 
+       /* Determine the position of the most significant decimal digit. */
+       exp = floor_log10 (p);
+@@ -1365,12 +1365,10 @@
+         /* P is too large to print all its integral part digits */
+         return -1;
+ 
+-      np->ip_size = exp + 1;
+-
+-      nsd = spec.prec + np->ip_size;
+       if (dec_info == NULL)
+-        {
+-          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
++        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
++          str =
++            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
+           register_string (np->sl, str);
+         }
+       else
+@@ -1379,81 +1377,60 @@
+           str = dec_info->str;
+         }
+       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
++      str_len = strlen (str);
++
++      /* integral part */
++      if (exp > str_len)
++        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
++           power of 10 (p integer, so no fractional part) */
++        {
++          np->ip_trailing_zeros = exp - str_len;
++          np->ip_size = str_len;
++        }
++      else
++        np->ip_size = exp;
+ 
+       if (spec.group)
+         /* thousands separator in integral part */
+         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
+ 
+-      if (nsd == 0 || (spec_g && !spec.alt))
+-        /* compute how much non-zero digits in integral and fractional
+-           parts */
++      /* fractional part */
++      str += np->ip_size;
++      str_len -= np->ip_size;
++      if (!keep_trailing_zeros)
++        /* remove trailing zeros, if any */
+         {
+-          size_t str_len;
+-          str_len = strlen (str); /* note: the sign has been skipped */
+-
+-          if (exp > str_len)
+-            /* mpfr_get_str doesn't give the trailing zeros when p is a
+-               multiple of 10 (p integer, so no fractional part) */
+-            {
+-              np->ip_trailing_zeros = exp - str_len;
+-              np->ip_size = str_len;
+-              if (spec.alt)
+-                np->point = MPFR_DECIMAL_POINT;
+-            }
+-          else
+-            /* str may contain some digits which are in fractional part */
++          char *ptr = str + str_len - 1; /* pointer to the last digit of
++                                            str */
++          while ((*ptr == '0') && (str_len != 0))
+             {
+-              char *ptr;
+-
+-              ptr = str + str_len - 1; /* points to the end of str */
+-              str_len -= np->ip_size;  /* number of digits in fractional
+-                                          part */
+-
+-              if (!keep_trailing_zeros)
+-                /* remove trailing zeros, if any */
+-                {
+-                  while ((*ptr == '0') && (str_len != 0))
+-                    {
+-                      --ptr;
+-                      --str_len;
+-                    }
+-                }
+-
+-              if (str_len > INT_MAX)
+-                /* too many digits in fractional part */
+-                return -1;
+-
+-              if (str_len != 0)
+-                /* some digits in fractional part */
+-                {
+-                  np->point = MPFR_DECIMAL_POINT;
+-                  np->fp_ptr = str + np->ip_size;
+-                  np->fp_size = str_len;
+-                }
++              --ptr;
++              --str_len;
+             }
+         }
+-      else
+-        /* spec.prec digits in fractional part */
++
++      if (str_len > 0)
++        /* some nonzero digits in fractional part */
+         {
+-          if (np->ip_size == exp - 1)
+-            /* the absolute value of the number has been rounded up to a power
+-               of ten.
+-               Insert an additional zero in integral part and put the rest of
+-               them in fractional part. */
+-            np->ip_trailing_zeros = 1;
++          if (str_len > INT_MAX)
++            /* too many digits in fractional part */
++            return -1;
+ 
+-          if (spec.prec != 0)
+-            {
+-              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
+-              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
++          np->point = MPFR_DECIMAL_POINT;
++          np->fp_ptr = str;
++          np->fp_size = str_len;
++        }
+ 
+-              np->point = MPFR_DECIMAL_POINT;
+-              np->fp_ptr = str + np->ip_size;
+-              np->fp_size = spec.prec;
+-            }
+-          else if (spec.alt)
+-            np->point = MPFR_DECIMAL_POINT;
++      if (keep_trailing_zeros && str_len < spec.prec)
++        /* add missing trailing zeros */
++        {
++          np->point = MPFR_DECIMAL_POINT;
++          np->fp_trailing_zeros = spec.prec - np->fp_size;
+         }
++
++      if (spec.alt)
++        /* add decimal point even if no digits follow it */
++        np->point = MPFR_DECIMAL_POINT;
+     }
+ 
+   return 0;
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p2";
++  return "3.1.0-p3";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
+--- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
+@@ -475,6 +475,18 @@
+   check_sprintf ("-1.", "%- #0.1RG", x);
+ 
+   /* precision zero */
++  mpfr_set_d (x, 9.5, MPFR_RNDN);
++  check_sprintf ("9",    "%.0RDf", x);
++  check_sprintf ("10",    "%.0RUf", x);
++
++  mpfr_set_d (x, 19.5, MPFR_RNDN);
++  check_sprintf ("19",    "%.0RDf", x);
++  check_sprintf ("20",    "%.0RUf", x);
++
++  mpfr_set_d (x, 99.5, MPFR_RNDN);
++  check_sprintf ("99",    "%.0RDf", x);
++  check_sprintf ("100",   "%.0RUf", x);
++
+   mpfr_set_d (x, -9.5, MPFR_RNDN);
+   check_sprintf ("-10",    "%.0RDf", x);
+   check_sprintf ("-10",    "%.0RYf", x);
+@@ -1078,6 +1090,23 @@
+   mpfr_clear (x);
+ }
+ 
++static void
++bug20111102 (void)
++{
++  mpfr_t t;
++  char s[100];
++
++  mpfr_init2 (t, 84);
++  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
++  mpfr_sprintf (s, "%.20RNg", t);
++  if (strcmp (s, "1000") != 0)
++    {
++      printf ("Error in bug20111102, expected 1000, got %s\n", s);
++      exit (1);
++    }
++  mpfr_clear (t);
++}
++
+ /* In particular, the following test makes sure that the rounding
+  * for %Ra and %Rb is not done on the MPFR number itself (as it
+  * would overflow). Note: it has been reported on comp.std.c that
+@@ -1161,6 +1190,7 @@
+   locale = setlocale (LC_ALL, "C");
+ #endif
+ 
++  bug20111102 ();
+   native_types ();
+   hexadecimal ();
+   binary ();
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
+@@ -0,0 +1 @@
++gmp41compat
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p3
++3.1.0-p4
+diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
+--- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
++++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
+@@ -2994,11 +2994,12 @@
+ 
+    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
+      behavior no longer depends on the platform (assuming this is also
+-     true for GMP's random generator).  As a consequence, the returned
+-     values can be different between MPFR 3.1 and previous MPFR
+-     versions.  Note: as the reproducibility of these functions was not
+-     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
+-     as backward incompatible with previous versions.
++     true for GMP's random generator, which is not the case between GMP
++     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
++     the returned values can be different between MPFR 3.1 and previous
++     MPFR versions.  Note: as the reproducibility of these functions
++     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
++     regarded as backward incompatible with previous versions.
+ 
+ 
+ 
+@@ -4239,13 +4240,13 @@
+ Node: Type and Macro Changes129308
+ Node: Added Functions132029
+ Node: Changed Functions134972
+-Node: Removed Functions139167
+-Node: Other Changes139579
+-Node: Contributors141108
+-Node: References143574
+-Node: GNU Free Documentation License145315
+-Node: Concept Index167758
+-Node: Function and Type Index173677
++Node: Removed Functions139253
++Node: Other Changes139665
++Node: Contributors141194
++Node: References143660
++Node: GNU Free Documentation License145401
++Node: Concept Index167844
++Node: Function and Type Index173763
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
+--- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
+@@ -3466,8 +3466,9 @@
+ a lack of specification.
+ 
+ @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
+-Their behavior no longer depends on the platform (assuming this is also
+-true for GMP's random generator).  As a consequence, the returned values
++Their behavior no longer depends on the platform (assuming this is also true
++for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
++@code{gmp_randinit_default} is used).  As a consequence, the returned values
+ can be different between MPFR 3.1 and previous MPFR versions.
+ Note: as the reproducibility of these functions was not specified
+ before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p3"
++#define MPFR_VERSION_STRING "3.1.0-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p3";
++  return "3.1.0-p4";
+ }
+diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
+--- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
+@@ -114,21 +114,29 @@
+   mpfr_t x;
+   gmp_randstate_t s;
+ 
++#if __MPFR_GMP(4,2,0)
++# define C1 "0.895943"
++# define C2 "0.848824"
++#else
++# define C1 "0.479652"
++# define C2 "0.648529"
++#endif
++
+   gmp_randinit_default (s);
+   gmp_randseed_ui (s, 42);
+   mpfr_init2 (x, 17);
+   mpfr_urandomb (x, s);
+-  if (mpfr_cmp_str1 (x, "0.895943") != 0)
++  if (mpfr_cmp_str1 (x, C1) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.895943, got ");
++      printf ("Error in bug20100914, expected " C1 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+     }
+   mpfr_urandomb (x, s);
+-  if (mpfr_cmp_str1 (x, "0.848824") != 0)
++  if (mpfr_cmp_str1 (x, C2) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.848824, got ");
++      printf ("Error in bug20100914, expected " C2 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
+--- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
++++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
+@@ -160,23 +160,29 @@
+   mpfr_t x;
+   gmp_randstate_t s;
+ 
++#if __MPFR_GMP(4,2,0)
++# define C1 "0.8488312"
++# define C2 "0.8156509"
++#else
++# define C1 "0.6485367"
++# define C2 "0.9362717"
++#endif
++
+   gmp_randinit_default (s);
+   gmp_randseed_ui (s, 42);
+   mpfr_init2 (x, 17);
+   mpfr_urandom (x, s, MPFR_RNDN);
+-  /* the following values are obtained on a 32-bit computer, we should get
+-     the same values on a 64-bit computer */
+-  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
++  if (mpfr_cmp_str1 (x, C1) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.8488312, got ");
++      printf ("Error in bug20100914, expected " C1 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+     }
+   mpfr_urandom (x, s, MPFR_RNDN);
+-  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
++  if (mpfr_cmp_str1 (x, C2) != 0)
+     {
+-      printf ("Error in bug20100914, expected 0.8156509, got ");
++      printf ("Error in bug20100914, expected " C2 ", got ");
+       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
+       printf ("\n");
+       exit (1);
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
+@@ -0,0 +1 @@
++logging-freeze
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p4
++3.1.0-p5
+diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
+--- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
+@@ -34,7 +34,7 @@
+     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
+       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
+      ("a[%Pu]=%.*Rg inexact=%d",
+-      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
++      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
+ 
+   MPFR_SAVE_EXPO_MARK (expo);
+ 
+diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
+--- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
+@@ -29,7 +29,7 @@
+   MPFR_LOG_FUNC
+     (("x[%Pu]=%.*Rg u=%d rnd=%d",
+       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
+-     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
++     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
+ 
+   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
+     {
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p4"
++#define MPFR_VERSION_STRING "3.1.0-p5"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
+--- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
++++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
+@@ -34,7 +34,7 @@
+     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
+       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
+      ("a[%Pu]=%.*Rg inexact=%d",
+-      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
++      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
+ 
+   MPFR_SAVE_EXPO_MARK (expo);
+ 
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p4";
++  return "3.1.0-p5";
+ }
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
++++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
+@@ -0,0 +1 @@
++logging-varfmt
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
+@@ -1 +1 @@
+-3.1.0-p5
++3.1.0-p6
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
+@@ -1592,7 +1592,7 @@
+   do                                                                    \
+     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
+         (mpfr_log_current <= mpfr_log_level))                           \
+-      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
++      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
+                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
+   while (0)
+ 
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "3.1.0-p5"
++#define MPFR_VERSION_STRING "3.1.0-p6"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
++++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.0-p5";
++  return "3.1.0-p6";
+ }
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 6876d6f18a..c3df7105d1 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPFR_VERSION = 3.0.1
+MPFR_VERSION = 3.1.0
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
 MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_INSTALL_STAGING = YES

From 3df335ff8c5582771eceecd647323c8da528627b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 11 Mar 2012 18:47:55 -0300
Subject: [PATCH 1582/6849] usbutils: bump version to 005

Bump usbutils version to 005 and also switch to a debian mirror since
it's still missing upstream.

[Peter: add comment about autoreconf, use snapshot.debian.org]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index e89f02e099..a242f93d07 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,10 +4,13 @@
 #
 #############################################################
 
-USBUTILS_VERSION = 004
-USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
+USBUTILS_VERSION = 005
+USBUTILS_SITE = http://snapshot.debian.org/archive/debian/20111211T214105Z/pool/main/u/usbutils/
+USBUTILS_SOURCE = usbutils_$(USBUTILS_VERSION).orig.tar.gz
 USBUTILS_DEPENDENCIES = host-pkg-config libusb
 USBUTILS_INSTALL_STAGING = YES
+# no configure in tarball
+USBUTILS_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
 	USBUTILS_DEPENDENCIES += zlib

From 0ffcd60a25fa1d93809cdb5ed354a62adae72759 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 12 Mar 2012 11:47:21 +0100
Subject: [PATCH 1583/6849] can-utils: bump version and change download
 location

SocketCAN repository moved from Berlios.de to gitorious

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/can-utils/can-utils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
index 198c38dcbd..50390434b9 100644
--- a/package/can-utils/can-utils.mk
+++ b/package/can-utils/can-utils.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-CAN_UTILS_VERSION = 1235
-CAN_UTILS_SITE = svn://svn.berlios.de/socketcan/trunk/can-utils
+CAN_UTILS_VERSION = 50775159276d896d8b3102b6dbc658a91a2a1d53
+CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
 CAN_UTILS_AUTORECONF = YES
 
 $(eval $(call AUTOTARGETS))

From 8b51e3cfc8f386d1f59fa8f9447ce90428d2a267 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 12 Mar 2012 11:02:09 +0100
Subject: [PATCH 1584/6849] pixman: bump version and compilation fix

- bump to 2.5 and change download location
- disable iwmmxt support for CPU's that don't have
  this feature

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pixman/pixman.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index a2e1832250..3e056d4194 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,13 +3,18 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.24.2
-PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
-PIXMAN_SITE = http://cairographics.org/releases/
+PIXMAN_VERSION = 0.25.2
+PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_INSTALL_STAGING = YES
 PIXMAN_DEPENDENCIES = host-pkg-config
 # don't build gtk based demos
 PIXMAN_CONF_OPT = --disable-gtk
 
+# disable iwmmxt support for CPU's that don't have
+# this feature
+ifneq ($(BR2_iwmmxt),y)
+PIXMAN_CONF_OPT += --disable-arm-iwmmxt
+endif
+
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 1c42131ad0887c28284d80bf8216ddc96c09cf09 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 29 Feb 2012 14:51:34 +0100
Subject: [PATCH 1585/6849] avr32/defconfig: use current stable kernel instead
 of the old 2.6.35

Drop the patch for kernel >= 3.3

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/atngw100_defconfig                    |  4 +--
 ...32-select-generic-atomic64_t-support.patch | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 5373b44992..57e39bd628 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -18,7 +18,5 @@ BR2_TARGET_UBOOT_2010_09=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35"
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_PATCH="linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch"
 BR2_LINUX_KERNEL_DEFCONFIG="atngw100"
diff --git a/linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch b/linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch
new file mode 100644
index 0000000000..95f2cf9784
--- /dev/null
+++ b/linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch
@@ -0,0 +1,33 @@
+From 31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688 Mon Sep 17 00:00:00 2001
+From: Fabio Baltieri <fabio.baltieri@gmail.com>
+Date: Fri, 3 Feb 2012 15:37:14 -0800
+Subject: [PATCH 1/1] avr32: select generic atomic64_t support
+
+Enable use of the generic atomic64 implementation on AVR32 platforms.
+Without this the kernel fails to build as the architecture does not
+provide its version.
+
+Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
+Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
+Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ arch/avr32/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
+index 197e96f..3dea7231 100644
+--- a/arch/avr32/Kconfig
++++ b/arch/avr32/Kconfig
+@@ -8,6 +8,7 @@ config AVR32
+ 	select HAVE_KPROBES
+ 	select HAVE_GENERIC_HARDIRQS
+ 	select GENERIC_IRQ_PROBE
++	select GENERIC_ATOMIC64
+ 	select HARDIRQS_SW_RESEND
+ 	select GENERIC_IRQ_SHOW
+ 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
+-- 
+1.7.7
+

From 8429c5873fe40090668a27c33ca7dc1bdb30ea0c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Mar 2012 08:38:00 +0100
Subject: [PATCH 1586/6849] kernel-headers: bump 3.0.x / 3.2.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.23-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.24-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 2ab0fc82a9..75c13cc60f 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.23"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.24"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.9"		if BR2_KERNEL_HEADERS_3_2
+	default "3.2.10"	if BR2_KERNEL_HEADERS_3_2
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.23-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.24-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.23-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.24-headers_install-fix-__packed-in-exported-kernel-head.patch

From c0e244abc8779c9694b57bda067ec7f45b17e0a7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Mar 2012 08:43:00 +0100
Subject: [PATCH 1587/6849] linux: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 26032fdaf0..b89fcdc9db 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_2
 
 config BR2_LINUX_KERNEL_3_2
-	bool "3.2.6"
+	bool "3.2.10"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2.6" if BR2_LINUX_KERNEL_3_2
+	default "3.2.10" if BR2_LINUX_KERNEL_3_2
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From b204ace147efd73356d2df9da57c24d7c066488c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Mar 2012 13:08:07 +0100
Subject: [PATCH 1588/6849] atngw100_defconfig: drop atomic64_t patch as it is
 now upstream

Since 3.2.10.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/atngw100_defconfig                    |  1 -
 ...32-select-generic-atomic64_t-support.patch | 33 -------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 57e39bd628..9ab6c037b8 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -18,5 +18,4 @@ BR2_TARGET_UBOOT_2010_09=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_PATCH="linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch"
 BR2_LINUX_KERNEL_DEFCONFIG="atngw100"
diff --git a/linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch b/linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch
deleted file mode 100644
index 95f2cf9784..0000000000
--- a/linux/linux-3.2.5-0001-avr32-select-generic-atomic64_t-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688 Mon Sep 17 00:00:00 2001
-From: Fabio Baltieri <fabio.baltieri@gmail.com>
-Date: Fri, 3 Feb 2012 15:37:14 -0800
-Subject: [PATCH 1/1] avr32: select generic atomic64_t support
-
-Enable use of the generic atomic64 implementation on AVR32 platforms.
-Without this the kernel fails to build as the architecture does not
-provide its version.
-
-Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
-Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
-Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- arch/avr32/Kconfig |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
-index 197e96f..3dea7231 100644
---- a/arch/avr32/Kconfig
-+++ b/arch/avr32/Kconfig
-@@ -8,6 +8,7 @@ config AVR32
- 	select HAVE_KPROBES
- 	select HAVE_GENERIC_HARDIRQS
- 	select GENERIC_IRQ_PROBE
-+	select GENERIC_ATOMIC64
- 	select HARDIRQS_SW_RESEND
- 	select GENERIC_IRQ_SHOW
- 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
--- 
-1.7.7
-

From fbc242d78803a940f771d19f08e6a6959a4e7608 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Mar 2012 11:23:02 -0300
Subject: [PATCH 1589/6849] freetype: security bump to version 2.4.9

Bump freetype to version 2.4.9 to fix:
CVE-2012-1126, CVE-2012-1127, CVE-2012-1128, CVE-2012-1129,
CVE-2012-1130, CVE-2012-1131, CVE-2012-1132, CVE-2012-1133,
CVE-2012-1134, CVE-2012-1135, CVE-2012-1136, CVE-2012-1137,
CVE-2012-1138, CVE-2012-1139, CVE-2012-1140, CVE-2012-1141,
CVE-2012-1142, CVE-2012-1143, and CVE 2012-1144.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 32099da167..ded10d2e9d 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FREETYPE_VERSION = 2.4.8
+FREETYPE_VERSION = 2.4.9
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES

From 2b91ab7a20cf17db16cf3c8a93ef4e50dfb585b7 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 11 Mar 2012 12:16:39 +0100
Subject: [PATCH 1590/6849] Add target to print buildroot version

It's convenient to have a target to print the buildroot version, for use
in external scripts calling buildroot.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d508888b37..30099d99de 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setloca
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
 	defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	source-check
+	source-check print-version
 
 # Strip quotes and then whitespaces
 qstrip=$(strip $(subst ",,$(1)))
@@ -721,6 +721,9 @@ release:
 	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
 	rm -rf $(OUT) $(OUT).tar
 
+print-version:
+	@echo $(BR2_VERSION_FULL)
+
 ################################################################################
 # GENDOC -- generates the make targets needed to build a specific type of
 #           asciidoc documentation.

From ce6727f63046c49d5e778af72e7096ff2e3ad82c Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Sun, 11 Mar 2012 14:15:00 +0100
Subject: [PATCH 1591/6849] libethumb: Fix automagic dependencies on libedbus
 and libexif

libethumb will determine during configuration phase whether to build the
optional libexif and libedbus modules. It will enable this modules if
libedbus or libexif are present on the target system. Therefore, we need
to add these packages as optional dependencies to libethumb.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libethumb/libethumb.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
index 16b2ba9553..617de0d790 100644
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -13,4 +13,12 @@ LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
 
 LIBETHUMB_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
 
+ifeq ($(BR2_PACKAGE_LIBEXIF),y)
+LIBETHUMB_DEPENDENCIES += libexif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEDBUS),y)
+LIBETHUMB_DEPENDENCIES += libedbus
+endif
+
 $(eval $(call AUTOTARGETS))

From aa9f6a9b133104b54c1abc0db203c30b6c0ea364 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 12 Mar 2012 11:24:04 +0100
Subject: [PATCH 1592/6849] New package: parted

[Peter: needs largefile + wchar]
Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/parted/Config.in | 14 ++++++++++++++
 package/parted/parted.mk | 13 +++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/parted/Config.in
 create mode 100644 package/parted/parted.mk

diff --git a/package/Config.in b/package/Config.in
index 4838edc80e..36a221cfb0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -202,6 +202,7 @@ source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
+source "package/parted/Config.in"
 source "package/pciutils/Config.in"
 source "package/picocom/Config.in"
 source "package/rng-tools/Config.in"
diff --git a/package/parted/Config.in b/package/parted/Config.in
new file mode 100644
index 0000000000..610c04022f
--- /dev/null
+++ b/package/parted/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_PARTED
+	bool "parted"
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_READLINE
+	select BR2_PACKAGE_UTIL_LINUX
+	help
+	  parted, the GNU partition resizing program
+
+	  http://www.gnu.org/software/parted/
+
+comment "parted requires a toolchain with LARGEFILE+WCHAR support"
+        depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
new file mode 100644
index 0000000000..c4107e7b49
--- /dev/null
+++ b/package/parted/parted.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# parted
+#
+#############################################################
+
+PARTED_VERSION = 3.1
+PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
+PARTED_SITE = $(BR2_GNU_MIRROR)/parted
+PARTED_DEPENDENCIES = readline util-linux lvm2
+PARTED_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From d77ff16b11bde9832914224794ca07312711d0bd Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 11 Mar 2012 15:24:56 +0100
Subject: [PATCH 1593/6849] lua: fix non-shared library build

Building without BR2_PACKAGE_LUA_SHARED_LIBRARY failed because of
missing -ldl.  dl is used by lua's dynamic module loading.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/lua.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 30e95b4575..aa0b4bf3cc 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -10,9 +10,10 @@ LUA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 	LUA_MYCFLAGS += -fPIC
-	LUA_MYLIBS += -ldl
 endif
 
+LUA_MYLIBS += -ldl
+
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
 	LUA_DEPENDENCIES = readline ncurses
 	LUA_MYLIBS += -lreadline -lhistory -lncurses

From f1e2288d157b5cd8b4b8a037dfb77eb804703a53 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Mar 2012 10:20:15 -0300
Subject: [PATCH 1594/6849] dnsmasq: bump to version 2.60

Bump to version 2.60 of dnsmasq with the new lua scripting option.
Switch LDFLAGS from MAKE_ENV to MAKE_OPT to make it work properly.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/Config.in  | 13 ++++++++++---
 package/dnsmasq/dnsmasq.mk | 30 ++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index e9c4870af8..f434b8ba5d 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -6,26 +6,33 @@ config BR2_PACKAGE_DNSMASQ
 
 	  http://www.thekelleys.org.uk/dnsmasq/
 
+if BR2_PACKAGE_DNSMASQ
+
 config BR2_PACKAGE_DNSMASQ_TFTP
 	bool "tftp support"
 	default y
-	depends on BR2_PACKAGE_DNSMASQ
 	help
 	  Enable TFTP support in dnsmasq.
 
 config BR2_PACKAGE_DNSMASQ_DHCP
 	bool "dhcp support"
 	default y
-	depends on BR2_PACKAGE_DNSMASQ
 	help
 	  Enable DHCP server support in dnsmasq.
 
 config BR2_PACKAGE_DNSMASQ_IDN
 	bool "IDN support (BIG!)"
-	depends on BR2_PACKAGE_DNSMASQ
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBINTL
 	select BR2_PACKAGE_LIBIDN
 	help
 	  Enable IDN support in dnsmasq.
 	  This option is a big space taker since is pulls in many libraries.
+
+config BR2_PACKAGE_DNSMASQ_LUA
+	bool "Lua scripting support"
+	select BR2_PACKAGE_LUA
+	help
+	  Enable lua scripting for dnsmasq
+
+endif
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index fc43abdf0e..c1995a0a61 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,11 +4,11 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.59
+DNSMASQ_VERSION = 2.60
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
-DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
-DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR)
+DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 
 ifneq ($(BR2_INET_IPV6),y)
 	DNSMASQ_COPTS += -DNO_IPV6
@@ -25,7 +25,20 @@ endif
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
 	DNSMASQ_MAKE_OPT += all-i18n
 	DNSMASQ_DEPENDENCIES += libidn libintl
-	DNSMASQ_MAKE_ENV += LDFLAGS+="-lintl -lidn"
+	DNSMASQ_MAKE_OPT += LDFLAGS+="-lintl -lidn"
+endif
+
+ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
+	DNSMASQ_DEPENDENCIES += lua
+	DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl"
+endif
+
+ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
+define DNSMASQ_ENABLE_LUA
+	$(SED) 's/lua5.1/lua/g' $(DNSMASQ_DIR)/Makefile
+	$(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \
+		$(DNSMASQ_DIR)/src/config.h
+endef
 endif
 
 ifneq ($(BR2_LARGEFILE),y)
@@ -36,12 +49,15 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 	DNSMASQ_DEPENDENCIES += host-pkg-config dbus
 endif
 
+define DNSMASQ_FIX_PKGCONFIG
+	$(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \
+		$(DNSMASQ_DIR)/Makefile
+endef
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 define DNSMASQ_ENABLE_DBUS
 	$(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \
 		$(DNSMASQ_DIR)/src/config.h
-	$(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \
-		$(DNSMASQ_DIR)/Makefile
 endef
 else
 define DNSMASQ_ENABLE_DBUS
@@ -51,7 +67,9 @@ endef
 endif
 
 define DNSMASQ_BUILD_CMDS
+	$(DNSMASQ_FIX_PKGCONFIG)
 	$(DNSMASQ_ENABLE_DBUS)
+	$(DNSMASQ_ENABLE_LUA)
 	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT)
 endef
 

From e687bb71a028303f326aeebfaf94a3ac1c43b4e4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 13 Mar 2012 16:27:25 +0100
Subject: [PATCH 1595/6849] gcc: bump 4.4.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.4.6 => 4.4.7}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.4.6 => 4.4.7}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.4.6 => 4.4.7}/302-c99-snprintf.patch           | 0
 .../gcc/{4.4.6 => 4.4.7}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.4.6 => 4.4.7}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.4.6 => 4.4.7}/950-sparc-leon.patch             | 0
 toolchain/gcc/{4.4.6 => 4.4.7}/gcc-44-pr39429.patch             | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/950-sparc-leon.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/gcc-44-pr39429.patch (100%)
 rename toolchain/gcc/{4.4.6 => 4.4.7}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.4.6/100-uclibc-conf.patch b/toolchain/gcc/4.4.7/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/100-uclibc-conf.patch
rename to toolchain/gcc/4.4.7/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.4.6/301-missing-execinfo_h.patch b/toolchain/gcc/4.4.7/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.4.7/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.4.6/302-c99-snprintf.patch b/toolchain/gcc/4.4.7/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/302-c99-snprintf.patch
rename to toolchain/gcc/4.4.7/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.4.6/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.4.7/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.4.7/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.4.6/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.4.7/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.4.7/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.4.6/950-sparc-leon.patch b/toolchain/gcc/4.4.7/950-sparc-leon.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/950-sparc-leon.patch
rename to toolchain/gcc/4.4.7/950-sparc-leon.patch
diff --git a/toolchain/gcc/4.4.6/gcc-44-pr39429.patch b/toolchain/gcc/4.4.7/gcc-44-pr39429.patch
similarity index 100%
rename from toolchain/gcc/4.4.6/gcc-44-pr39429.patch
rename to toolchain/gcc/4.4.7/gcc-44-pr39429.patch
diff --git a/toolchain/gcc/4.4.6/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.4.6/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 349d9df3ab..a4ca0546f9 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -57,7 +57,7 @@ config BR2_GCC_VERSION
 	string
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
-	default "4.4.6"     if BR2_GCC_VERSION_4_4_X
+	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP

From 6b772b2f417112e6e12ba6a2eb05ebb8250fdc9a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Mar 2012 20:35:44 +0100
Subject: [PATCH 1596/6849] libxml2: ensure patches are applied in the correct
 order

Some of the patches depends on eachother, so rename them to ensure they
get applied in the correct order.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...es.patch => libxml2-0-allocation-error-copying-entities.patch} | 0
 ...ation-failures.patch => libxml2-1-reallocation-failures.patch} | 0
 ...ash-randomization.patch => libxml2-2-hash-randomization.patch} | 0
 ...xml2-2.7.8-xpath-memory.patch => libxml2-3-xpath-memory.patch} | 0
 ...l2-2.7.8-xpath-freeing.patch => libxml2-4-xpath-freeing.patch} | 0
 ...-2.7.8-xpath-freeing2.patch => libxml2-5-xpath-freeing2.patch} | 0
 ....7.8-hardening-xpath.patch => libxml2-6-hardening-xpath.patch} | 0
 ...ibxml2-2.7.8-error-xpath.patch => libxml2-7-error-xpath.patch} | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename package/libxml2/{libxml2-2.7.8-allocation-error-copying-entities.patch => libxml2-0-allocation-error-copying-entities.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-reallocation-failures.patch => libxml2-1-reallocation-failures.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-hash-randomization.patch => libxml2-2-hash-randomization.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-xpath-memory.patch => libxml2-3-xpath-memory.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-xpath-freeing.patch => libxml2-4-xpath-freeing.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-xpath-freeing2.patch => libxml2-5-xpath-freeing2.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-hardening-xpath.patch => libxml2-6-hardening-xpath.patch} (100%)
 rename package/libxml2/{libxml2-2.7.8-error-xpath.patch => libxml2-7-error-xpath.patch} (100%)

diff --git a/package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch b/package/libxml2/libxml2-0-allocation-error-copying-entities.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-allocation-error-copying-entities.patch
rename to package/libxml2/libxml2-0-allocation-error-copying-entities.patch
diff --git a/package/libxml2/libxml2-2.7.8-reallocation-failures.patch b/package/libxml2/libxml2-1-reallocation-failures.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-reallocation-failures.patch
rename to package/libxml2/libxml2-1-reallocation-failures.patch
diff --git a/package/libxml2/libxml2-2.7.8-hash-randomization.patch b/package/libxml2/libxml2-2-hash-randomization.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-hash-randomization.patch
rename to package/libxml2/libxml2-2-hash-randomization.patch
diff --git a/package/libxml2/libxml2-2.7.8-xpath-memory.patch b/package/libxml2/libxml2-3-xpath-memory.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-xpath-memory.patch
rename to package/libxml2/libxml2-3-xpath-memory.patch
diff --git a/package/libxml2/libxml2-2.7.8-xpath-freeing.patch b/package/libxml2/libxml2-4-xpath-freeing.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-xpath-freeing.patch
rename to package/libxml2/libxml2-4-xpath-freeing.patch
diff --git a/package/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/package/libxml2/libxml2-5-xpath-freeing2.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-xpath-freeing2.patch
rename to package/libxml2/libxml2-5-xpath-freeing2.patch
diff --git a/package/libxml2/libxml2-2.7.8-hardening-xpath.patch b/package/libxml2/libxml2-6-hardening-xpath.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-hardening-xpath.patch
rename to package/libxml2/libxml2-6-hardening-xpath.patch
diff --git a/package/libxml2/libxml2-2.7.8-error-xpath.patch b/package/libxml2/libxml2-7-error-xpath.patch
similarity index 100%
rename from package/libxml2/libxml2-2.7.8-error-xpath.patch
rename to package/libxml2/libxml2-7-error-xpath.patch

From 664260a38fe101ed84f27353bb2f465b87b3f5e7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Mar 2012 18:24:58 +0100
Subject: [PATCH 1597/6849] gstreamer: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/gstreamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 274b87a9d6..cc2993273b 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -4,7 +4,7 @@
 # gstreamer
 #
 #############################################################
-GSTREAMER_VERSION = 0.10.35
+GSTREAMER_VERSION = 0.10.36
 GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER_INSTALL_STAGING = YES

From 841a6dc0a95dcdef91ca222e9c8d3c9121f0124d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Mar 2012 18:25:47 +0100
Subject: [PATCH 1598/6849] gst-plugins-base: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0.10.35-disable-testchannels-example.patch | 26 -------------------
 ...or.patch => gst-plugins-base-tremor.patch} |  0
 .../gst-plugins-base/gst-plugins-base.mk      |  8 +++++-
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch
 rename package/multimedia/gst-plugins-base/{gst-plugins-base-0.10.35-tremor.patch => gst-plugins-base-tremor.patch} (100%)

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch b/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch
deleted file mode 100644
index e991c4e333..0000000000
--- a/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-disable-testchannels-example.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-[PATCH] disable testchannels example
-
-The testchannels example doesn't build because it forgets to link with
-libgstinterfaces. Unfortunately testchannels gets built even though
---disable-examples is used, so instead disable it in Makefile.in
-(package doesn't autoreconf cleanly, so don't edit Makefile.am)
-
-Problem is fixed upstream in 0.11 branch (940291dd38be66fa).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- gst-libs/gst/audio/Makefile.in |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: gst-plugins-base-0.10.35/gst-libs/gst/audio/Makefile.in
-===================================================================
---- gst-plugins-base-0.10.35.orig/gst-libs/gst/audio/Makefile.in
-+++ gst-plugins-base-0.10.35/gst-libs/gst/audio/Makefile.in
-@@ -45,7 +45,6 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = testchannels$(EXEEXT)
- DIST_COMMON = $(libgstaudio_@GST_MAJORMINOR@include_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/common/gst-glib-gen.mak TODO
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch b/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
similarity index 100%
rename from package/multimedia/gst-plugins-base/gst-plugins-base-0.10.35-tremor.patch
rename to package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 3b21c2701e..848eaf2909 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -3,7 +3,7 @@
 # gst-plugins-base
 #
 #############################################################
-GST_PLUGINS_BASE_VERSION = 0.10.35
+GST_PLUGINS_BASE_VERSION = 0.10.36
 GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES
@@ -174,4 +174,10 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-vorbis
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+GST_PLUGINS_BASE_DEPENDENCIES += zlib
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-zlib
+endif
+
 $(eval $(call AUTOTARGETS))

From bf15b5340f0a46d567ed19137d2c565bd13f655f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Mar 2012 18:26:24 +0100
Subject: [PATCH 1599/6849] gst-plugins-good: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/gst-plugins-good.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index c7afed4c7f..4e6b73e5da 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -3,7 +3,7 @@
 # gst-plugins-good
 #
 #############################################################
-GST_PLUGINS_GOOD_VERSION = 0.10.30
+GST_PLUGINS_GOOD_VERSION = 0.10.31
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 
@@ -21,8 +21,7 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 		--disable-aalibtest \
 		--disable-esd \
 		--disable-esdtest \
-		--disable-shout2 \
-		--disable-shout2test
+		--disable-shout2
 
 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
 

From 6f6059b9aa9fda0b7d76e5c23b1371a4f9236270 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Mar 2012 18:26:53 +0100
Subject: [PATCH 1600/6849] gst-plugins-ugly: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index e46b515cc3..37ed624541 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -3,7 +3,7 @@
 # gst-plugins-ugly
 #
 #############################################################
-GST_PLUGINS_UGLY_VERSION = 0.10.18
+GST_PLUGINS_UGLY_VERSION = 0.10.19
 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 

From b593af83c0eece47899f0bf7871376e784b1f0cf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Mar 2012 18:27:21 +0100
Subject: [PATCH 1601/6849] gst-plugins-bad: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in  | 24 ++++++--
 .../gst-plugins-bad/gst-plugins-bad.mk        | 56 ++++++++++++-------
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index e772930b25..cb50fbd84c 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -27,6 +27,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT
 	bool "autoconvert"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS
+	bool "audiovisualizers"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER
 	bool "bayer"
 
@@ -70,6 +73,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU
 	bool "dvdspu"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY
+	bool "faceoverlay"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL
 	bool "festival"
 
@@ -79,6 +85,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
 	bool "freeze"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB
+	bool "freeverb"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R
 	bool "frei0r"
 
@@ -103,12 +112,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG
 	bool "id3tag"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER
+	bool "inter"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE
 	bool "interlace"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE
-	bool "invtelecine"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE
 	bool "ivfparse"
 
@@ -142,9 +151,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX
 	bool "mpegtsmux"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEG4VIDEOPARSE
-	bool "mpeg4videoparse"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE
 	bool "mpegvideoparse"
 
@@ -175,6 +181,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL
 	bool "real"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE
+	bool "removesilence"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX
 	bool "rtpmux"
 
@@ -196,6 +205,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN
 	bool "siren"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH
+	bool "smooth"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED
 	bool "speed"
 
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 20aad76fb3..a737befea9 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -3,7 +3,7 @@
 # gst-plugins-bad
 #
 #############################################################
-GST_PLUGINS_BAD_VERSION = 0.10.22
+GST_PLUGINS_BAD_VERSION = 0.10.23
 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 
@@ -40,6 +40,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-asfmux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-audiovisualizers
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
 else
@@ -124,6 +130,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-dvdspu
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-faceoverlay
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-faceoverlay
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-festival
 else
@@ -142,6 +154,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-freeze
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-freeverb
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-freeverb
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-frei0r
 else
@@ -190,22 +208,16 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-id3tag
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-interlace
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-inter
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-interlace
+GST_PLUGINS_BAD_CONF_OPT += --disable-inter
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-invtelecine
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-invtelecine
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-invtelecine
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-interlace
 else
-GST_PLUGINS_BAD_CONF_OPT += --disable-invtelecine
+GST_PLUGINS_BAD_CONF_OPT += --disable-interlace
 endif
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
@@ -274,12 +286,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-mpegtsmux
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEG4VIDEOPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpeg4videoparse
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpeg4videoparse
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-mpegvideoparse
 else
@@ -340,6 +346,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-real
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-removesilence
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-removesilence
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
 else
@@ -382,6 +394,12 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-siren
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-smooth
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-smooth
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-speed
 else

From 39bd61c6f30e3d9548b5928488fcd9ccfb3fda70 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 14 Mar 2012 16:33:52 +0100
Subject: [PATCH 1602/6849] apply-patches.sh: remove any rejects before
 applying patches

[Peter: .rej files might be in subdirs, so just do find .. | xargs rm]
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 1aef47ebf7..e418cb6ec0 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -19,7 +19,13 @@ if [ ! -d "${patchdir}" ] ; then
     echo "Aborting.  '${patchdir}' is not a directory."
     exit 1
 fi
-    
+
+# Remove any rejects present BEFORE patching - Because if there are
+# any, even if patches are well applied, at the end it will complain
+# about rejects in targetdir.
+find ${targetdir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \
+    xargs -0 -r rm -f
+
 for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do 
     apply="patch -g0 -p1 -E -d"
     uncomp_parm=""

From a22dc0f2302c1879ad3bad4dc41348181c5807ef Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Mar 2012 23:30:00 +0100
Subject: [PATCH 1603/6849] ext-toolchain: Automatically set -m64 if the
 architecture is x86_64

Without the -m64, choosing the x86_64 architecture with a Sourcery external
toolchain will result in a 32-bit rootfs.

Also simplified the help text to reflect this change.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in        | 34 ++++++++++---------
 toolchain/toolchain-external/ext-tool.mk      |  4 +++
 .../ext-toolchain-wrapper.c                   |  3 ++
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 7f57952e0c..24cad9c0ef 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -371,14 +371,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	  binutils 2.21.53, glibc 2.13, gdb 7.2.50 and kernel headers
 	  3.0.1. It has support for the following variants:
 	    - Intel Pentium 4, glibc, 32 bits
-              Default, nothing special to do.
-            - Intel Atom, glibc, 32 bits
-              Select an Atom core
-            - Intel Xeon, glibc, 64 bits
-              Set BR2_TARGET_OPTIMIZATION to -m64
-            - Intel Core 2, glibc, 64 bits
-              Select a Core 2 core
-              Set BR2_TARGET_OPTIMIZATION to -m64
+	      Default for x86, nothing special to do.
+	    - Intel Atom, glibc, 32 bits
+	      Select an Atom core
+	    - Intel Xeon, glibc, 64 bits
+	      Default for x86_64, nothing special to do.
+	    - Intel Core 2, glibc, 64 bits
+	      Select a Core 2 core
+	  Other architecture variants (beyond Pentium-4/Xeon) are
+	  supported as well, but glibc is not optimised for it.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	bool "Sourcery CodeBench x86/x86_64 2010.09"
@@ -391,14 +392,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	  binutils 2.20, glibc 2.11, gdb 7.2.50 and kernel headers
 	  2.6.35.2. It has support for the following variants:
 	    - Intel Pentium 4, glibc, 32 bits
-              Default, nothing special to do.
-            - Intel Atom, glibc, 32 bits
-              Select an Atom core
-            - Intel Xeon, glibc, 64 bits
-              Set BR2_TARGET_OPTIMIZATION to -m64
-            - Intel Core 2, glibc, 64 bits
-              Select a Core 2 core
-              Set BR2_TARGET_OPTIMIZATION to -m64
+	      Default for x86, nothing special to do.
+	    - Intel Atom, glibc, 32 bits
+	      Select an Atom core
+	    - Intel Xeon, glibc, 64 bits
+	      Default for x86_64, nothing special to do.
+	    - Intel Core 2, glibc, 64 bits
+	      Select a Core 2 core
+	  Other architecture variants (beyond Pentium-4/Xeon) are
+	  supported as well, but glibc is not optimised for it.
 
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	bool "Blackfin.uclinux.org 2011R1-RC4"
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 01ab91fed5..dbd39b0688 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -133,6 +133,10 @@ CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
 
 # march/mtune/floating point mode needs to be passed to the external toolchain
 # to select the right multilib variant
+ifeq ($(BR2_x86_64),y)
+TOOLCHAIN_EXTERNAL_CFLAGS += -m64
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_64
+endif
 ifneq ($(CC_TARGET_TUNE_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mtune=$(CC_TARGET_TUNE_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_TUNE='"$(CC_TARGET_TUNE_)"'
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 719f13bd16..82595eaa72 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -40,6 +40,9 @@ static char *predef_args[] = {
 #ifdef BR_VFPFLOAT
 	"-mfpu=vfp",
 #endif /* BR_VFPFLOAT */
+#ifdef BR_64
+	"-m64",
+#endif
 #ifdef BR_ADDITIONAL_CFLAGS
 	BR_ADDITIONAL_CFLAGS
 #endif

From 8d3c0bcfebb7110e28aa7633ed712461b6430bb5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Mar 2012 09:12:47 +0100
Subject: [PATCH 1604/6849] libfuse: fix download URL

The old URL nowadays return a 404.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/libfuse.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 3616c65d6b..15c63ab907 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -6,7 +6,7 @@
 
 LIBFUSE_VERSION = 2.8.7
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
-LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
+LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_CONF_OPT= --disable-nls \

From afc69d8f5a139aedec23b12cf04d59986d500634 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Mar 2012 09:29:18 +0100
Subject: [PATCH 1605/6849] dhcp: fix download URL

Tarball is in a subdir.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 10bdc2e33e..9ec27d3497 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 DHCP_VERSION  = 4.1-ESV-R4
-DHCP_SITE     = http://ftp.isc.org/isc/dhcp
+DHCP_SITE     = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes
 DHCP_CONF_OPT = \
 	--localstatedir=/var/lib/dhcp \

From 6953341b71028294f4e1e818df40f522e730c6f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Mar 2012 09:35:03 +0100
Subject: [PATCH 1606/6849] nbd: fix download URL

The old URL nowadays return a 404.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 452ed3429c..62ae9be40c 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -6,7 +6,7 @@
 
 NBD_VERSION = 3.0
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
-NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/
+NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
 NBD_DEPENDENCIES = libglib2
 

From 5c3cb0ba00282ba2b7a16efdbb4fce96c29a6e3a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Mar 2012 11:06:36 +0100
Subject: [PATCH 1607/6849] util-linux: fix libmount build under uClibc

Patch taken from gentoo.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux-2.20.1-sscanf-no-ms-as.patch   | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch

diff --git a/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch b/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
new file mode 100644
index 0000000000..5b0ac36463
--- /dev/null
+++ b/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
@@ -0,0 +1,87 @@
+[PATCH] Fix libmount build under uClibc
+
+Taken from gentoo-hardened:
+http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=91879751
+
+For details, see https://bugs.gentoo.org/show_bug.cgi?id=406303
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c util-linux-2.20.1/libmount/src/tab_parse.c
+--- util-linux-2.20.1.orig/libmount/src/tab_parse.c	2011-12-12 20:51:06.646614964 -0500
++++ util-linux-2.20.1/libmount/src/tab_parse.c	2011-12-12 21:02:03.587865010 -0500
+@@ -51,19 +51,21 @@
+  */
+ static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
+ {
+-	int rc, n = 0;
+-	char *src, *fstype, *optstr;
+-
+-	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
+-			UL_SCNsA" "	/* (2) target */
+-			UL_SCNsA" "	/* (3) FS type */
+-			UL_SCNsA" "	/* (4) options */
++	int rc, n = 0, len = strlen (s) + 1;
++	char *src     = malloc (sizeof *src * len);
++  char *fstype  = malloc (sizeof *fstype * len);
++  char *optstr  = malloc (sizeof *optstr * len);
++
++	rc = sscanf(s,	"%s"" "	/* (1) source */
++			"%s"" "	/* (2) target */
++			"%s"" "	/* (3) FS type */
++			"%s"" "	/* (4) options */
+ 			"%n",		/* byte count */
+ 
+-			&src,
+-			&fs->target,
+-			&fstype,
+-			&optstr,
++			src,
++			fs->target,
++			fstype,
++			optstr,
+ 			&n);
+ 
+ 	if (rc == 4) {
+@@ -108,16 +110,20 @@
+  */
+ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
+ {
+-	int rc, end = 0;
++	int rc, end = 0, len = strlen (s) + 1;
+ 	unsigned int maj, min;
+ 	char *fstype, *src, *p;
+ 
++  fs->root        = malloc (sizeof *fs->root * len);
++  fs->target      = malloc (sizeof *fs->target * len);
++  fs->vfs_optstr  = malloc (sizeof *fs->vfs_optstr * len);
++
+ 	rc = sscanf(s,	"%u "		/* (1) id */
+ 			"%u "		/* (2) parent */
+ 			"%u:%u "	/* (3) maj:min */
+-			UL_SCNsA" "	/* (4) mountroot */
+-			UL_SCNsA" "	/* (5) target */
+-			UL_SCNsA	/* (6) vfs options (fs-independent) */
++			"%s"" "	/* (4) mountroot */
++			"%s"" "	/* (5) target */
++			"%s"	/* (6) vfs options (fs-independent) */
+ 			"%n",		/* number of read bytes */
+ 
+ 			&fs->id,
+@@ -139,9 +145,14 @@
+ 	}
+ 	s = p + 3;
+ 
+-	rc += sscanf(s,	UL_SCNsA" "	/* (8) FS type */
+-			UL_SCNsA" "	/* (9) source */
+-			UL_SCNsA,	/* (10) fs options (fs specific) */
++  len           = strlen (s) + 1;
++	fstype        = malloc (sizeof *fstype * len);
++  src           = malloc (sizeof *src * len);
++  fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len);
++
++	rc += sscanf(s,	"%s"" "	/* (8) FS type */
++			"%s"" "	/* (9) source */
++			"%s",	/* (10) fs options (fs specific) */
+ 
+ 			&fstype,
+ 			&src,

From 06211219a06c795d2c5d4352a1637a4d60f881ba Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 14 Mar 2012 17:38:16 +0100
Subject: [PATCH 1608/6849] new package: zeromq

[Peter: fix C++/LF deps, reformat help, install into staging]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/zeromq/Config.in | 25 +++++++++++++++++++++++++
 package/zeromq/zeromq.mk | 12 ++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/zeromq/Config.in
 create mode 100644 package/zeromq/zeromq.mk

diff --git a/package/Config.in b/package/Config.in
index 36a221cfb0..9eef96e63d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -366,6 +366,7 @@ source "package/librsync/Config.in"
 source "package/libsoup/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
+source "package/zeromq/Config.in"
 endmenu
 
 menu "Other"
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
new file mode 100644
index 0000000000..e1d3d520b8
--- /dev/null
+++ b/package/zeromq/Config.in
@@ -0,0 +1,25 @@
+comment "zeromq requires a toolchain with C++, LARGEFILE + WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP &&  BR2_LARGEFILE && BR2_USE_WCHAR)
+
+config BR2_PACKAGE_ZEROMQ
+	bool "zeromq"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	help
+	  ØMQ (ZeroMQ, 0MQ, zmq) looks like an embeddable networking
+	  library but acts like a concurrency framework. It gives you
+	  sockets that carry whole messages across various transports
+	  like in-process, inter- process, TCP, and multicast. You can
+	  connect sockets N-to-N with patterns like fanout, pub-sub,
+	  task distribution, and request-reply.  It's fast enough to
+	  be the fabric for clustered products. Its asynchronous I/O
+	  model gives you scalable multicore applications, built as
+	  asynchronous message-processing tasks. It has a score of
+	  language APIs and runs on most operating systems.
+
+	  ØMQ is from iMatix and is LGPL open source.
+
+	  http://www.zeromq.org/
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
new file mode 100644
index 0000000000..b6c499d18c
--- /dev/null
+++ b/package/zeromq/zeromq.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# zeromq
+#
+#############################################################
+
+ZEROMQ_VERSION = 2.1.11
+ZEROMQ_SITE = http://download.zeromq.org/
+ZEROMQ_INSTALL_STAGING = YES
+ZEROMQ_DEPENDENCIES = util-linux
+
+$(eval $(call AUTOTARGETS))

From b23df14888f1bf464657c57db49f09bdc33042a8 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 15 Mar 2012 16:15:47 +0000
Subject: [PATCH 1609/6849] squashfs3: fix build with uClibc

The squashfs3 package uses the old get_nprocs() GNU extension which does not
exist in uClibc. This has already been fixed in newer squashfs releases
(>=4.0). The patch is similar to the one committed in
dfa2a513e1aa7f6ec47f630c5d31d98cd098f408

[Peter: add patch header]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../squashfs3/squashfs3-3.4-get_nprocs.patch  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/squashfs3/squashfs3-3.4-get_nprocs.patch

diff --git a/package/squashfs3/squashfs3-3.4-get_nprocs.patch b/package/squashfs3/squashfs3-3.4-get_nprocs.patch
new file mode 100644
index 0000000000..db4b350026
--- /dev/null
+++ b/package/squashfs3/squashfs3-3.4-get_nprocs.patch
@@ -0,0 +1,33 @@
+squashfs3: fix build with uClibc
+
+The squashfs3 package uses the old get_nprocs() GNU extension which does not
+exist in uClibc. This has already been fixed in newer squashfs releases
+(>=4.0).
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Index: squashfs3-3.4/squashfs-tools/mksquashfs.c
+===================================================================
+--- squashfs3-3.4.orig/squashfs-tools/mksquashfs.c
++++ squashfs3-3.4/squashfs-tools/mksquashfs.c
+@@ -3178,7 +3178,7 @@ void initialise_threads()
+ 			processors = 1;
+ 		}
+ #else
+-		processors = get_nprocs();
++		processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ 	}
+ 
+Index: squashfs3-3.4/squashfs-tools/unsquashfs.c
+===================================================================
+--- squashfs3-3.4.orig/squashfs-tools/unsquashfs.c
++++ squashfs3-3.4/squashfs-tools/unsquashfs.c
+@@ -2428,7 +2428,7 @@ void initialise_threads(int fragment_buf
+ 			processors = 1;
+ 		}
+ #else
+-		processors = get_nprocs();
++		processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ 	}
+ 

From 1a994d58afcd401afd1581035f98adede78bcdd1 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 15 Mar 2012 22:08:09 +0100
Subject: [PATCH 1610/6849] Remove stray $ character from a bunch of init
 scripts

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/init.d/S40network | 2 +-
 package/at/S99at                  | 2 +-
 package/busybox/S01logging        | 2 +-
 package/busybox/S10mdev           | 2 +-
 package/dbus/S30dbus              | 2 +-
 package/dropbear/S50dropbear      | 2 +-
 package/gpsd/S50gpsd              | 2 +-
 package/multimedia/mpd/S95mpd     | 2 +-
 package/netplug/S29netplug        | 6 +++---
 package/openssh/S50sshd           | 2 +-
 package/rsyslog/S01rsyslog        | 2 +-
 package/stunnel/S50stunnel        | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fs/skeleton/etc/init.d/S40network b/fs/skeleton/etc/init.d/S40network
index ad6d250b5b..e69e61340a 100755
--- a/fs/skeleton/etc/init.d/S40network
+++ b/fs/skeleton/etc/init.d/S40network
@@ -17,7 +17,7 @@ case "$1" in
 	"$0" start
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/at/S99at b/package/at/S99at
index c3be80c64e..accaa316fa 100755
--- a/package/at/S99at
+++ b/package/at/S99at
@@ -31,7 +31,7 @@ case "$1" in
 	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/busybox/S01logging b/package/busybox/S01logging
index 581f192daa..edece39f56 100644
--- a/package/busybox/S01logging
+++ b/package/busybox/S01logging
@@ -19,7 +19,7 @@ case "$1" in
   restart|reload)
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/busybox/S10mdev b/package/busybox/S10mdev
index d2643d0234..c06aa20b5b 100644
--- a/package/busybox/S10mdev
+++ b/package/busybox/S10mdev
@@ -13,7 +13,7 @@ case "$1" in
   restart|reload)
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/dbus/S30dbus b/package/dbus/S30dbus
index d764e2969b..0d15c73043 100755
--- a/package/dbus/S30dbus
+++ b/package/dbus/S30dbus
@@ -72,7 +72,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo "Usage: $0 {start|stop|status|restart|condrestart|reload}"
         ;;
 esac
 exit $RETVAL
diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear
index 14101d874c..991a1219c4 100644
--- a/package/dropbear/S50dropbear
+++ b/package/dropbear/S50dropbear
@@ -48,7 +48,7 @@ case "$1" in
   	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/gpsd/S50gpsd b/package/gpsd/S50gpsd
index 31727eb095..6e5ce88dd4 100644
--- a/package/gpsd/S50gpsd
+++ b/package/gpsd/S50gpsd
@@ -33,7 +33,7 @@ case "$1" in
         restart
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart}"
+        echo "Usage: $0 {start|stop|restart}"
         exit 1
 esac
 
diff --git a/package/multimedia/mpd/S95mpd b/package/multimedia/mpd/S95mpd
index 7c242f432a..a4f1271cea 100644
--- a/package/multimedia/mpd/S95mpd
+++ b/package/multimedia/mpd/S95mpd
@@ -25,6 +25,6 @@ case "$1" in
 		start
 		;;
 	*)
-		echo $"Usage: $0 {start|stop|restart}"
+		echo "Usage: $0 {start|stop|restart}"
 		exit 1
 esac
diff --git a/package/netplug/S29netplug b/package/netplug/S29netplug
index e246674d53..d95554e895 100755
--- a/package/netplug/S29netplug
+++ b/package/netplug/S29netplug
@@ -39,7 +39,7 @@ fi
 case "$1" in
   start)
 	# Start daemon.
-	echo -n $"Starting network plug daemon: "
+	echo -n "Starting network plug daemon: "
 	start-stop-daemon -S -q -p /var/run/netplugd.pid -x /sbin/netplugd ${NETPLUGDARGS}
 	RETVAL=$?
 	echo
@@ -47,7 +47,7 @@ case "$1" in
 	;;
   stop)
 	# Stop daemon.
-	echo -n $"Shutting down network plug daemon: "
+	echo -n "Shutting down network plug daemon: "
 	start-stop-daemon -K -n netplugd
 	RETVAL=$?
 	echo
@@ -61,7 +61,7 @@ case "$1" in
 	[ -f /var/lock/subsys/netplugd ] && $0 restart || :
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	RETVAL=1
 	;;
 esac
diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd
index f0d2aef5ab..89f1b9a8d1 100644
--- a/package/openssh/S50sshd
+++ b/package/openssh/S50sshd
@@ -64,7 +64,7 @@ case "$1" in
   	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/rsyslog/S01rsyslog b/package/rsyslog/S01rsyslog
index 8c28e02f57..0c4bbc7325 100644
--- a/package/rsyslog/S01rsyslog
+++ b/package/rsyslog/S01rsyslog
@@ -30,7 +30,7 @@ case "$1" in
 	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/package/stunnel/S50stunnel b/package/stunnel/S50stunnel
index 5033e96375..95bb301871 100644
--- a/package/stunnel/S50stunnel
+++ b/package/stunnel/S50stunnel
@@ -29,7 +29,7 @@ case "$1" in
 	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac
 

From ccb44fd52f76bca3cbd6a89bc9407ada5ab47d65 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 15 Mar 2012 08:49:42 +0000
Subject: [PATCH 1611/6849] Added lcdproc package

[Peter: fix download URL, move to 'Hardware handling' section]
Signed-off-by: Simon Dawson <spdawson at gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/lcdproc/Config.in                     |  7 +++++++
 package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch | 18 ++++++++++++++++++
 package/lcdproc/lcdproc.mk                    | 14 ++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 package/lcdproc/Config.in
 create mode 100644 package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch
 create mode 100644 package/lcdproc/lcdproc.mk

diff --git a/package/Config.in b/package/Config.in
index 9eef96e63d..f0ce9631d1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -190,6 +190,7 @@ source "package/input-tools/Config.in"
 source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
+source "package/lcdproc/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lsuio/Config.in"
diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in
new file mode 100644
index 0000000000..6c8614d6d7
--- /dev/null
+++ b/package/lcdproc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LCDPROC
+       bool "lcdproc"
+       select BR2_PACKAGE_NCURSES
+       help
+         LCD display driver daemon and clients
+
+         http://lcdproc.org/
diff --git a/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch b/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch
new file mode 100644
index 0000000000..283ac8867b
--- /dev/null
+++ b/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch
@@ -0,0 +1,18 @@
+Fix the default LCDd configuration file, so that the DriverPath
+is set to the correct lcdproc library install path, rather than
+the dummy/default path.
+
+Signed-off-by: Simon Dawson <spdawson at gmail.com>
+---
+
+--- lcdproc-0.5.3/LCDd.conf.orig       2009-06-20 14:48:34.000000000 +0100
++++ lcdproc-0.5.3/LCDd.conf    2010-05-11 10:02:21.000000000 +0100
+@@ -34,7 +34,7 @@
+ #            the driver modules and will thus not be able to
+ #            function properly.
+ # NOTE: Always place a slash as last character !
+-DriverPath=server/drivers/
++DriverPath=/usr/lib/lcdproc/
+
+ # Tells the server to load the given drivers. Multiple lines can be given.
+ # The name of the driver is case sensitive and determines the section
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
new file mode 100644
index 0000000000..e8919e9c86
--- /dev/null
+++ b/package/lcdproc/lcdproc.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# lcdproc
+#
+#############################################################
+LCDPROC_VERSION = 0.5.5
+LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
+LCDPROC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
+
+LCDPROC_CONF_OPT = --enable-drivers=all
+
+LCDPROC_DEPENDENCIES = ncurses
+
+$(eval $(call AUTOTARGETS))

From c85f7f4082e480485e8a0f1549615b5b680d96ff Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 14 Mar 2012 23:49:56 +0100
Subject: [PATCH 1612/6849] debug: do not force installation of gdbserver

The BR2_ENABLE_DEBUG option selects the compilation and installation
of gdbserver on the target. This is a bit restrictive, especially for
external toolchains, which may already contain a gdbserver on the
target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Config.in b/Config.in
index 2002996fe3..e07e52f174 100644
--- a/Config.in
+++ b/Config.in
@@ -205,7 +205,6 @@ config BR2_DEPRECATED
 
 config BR2_ENABLE_DEBUG
 	bool "build packages with debugging symbols"
-	select BR2_PACKAGE_GDB_SERVER
 	help
 	  Build packages with debugging symbols
 	  enabled

From c56b58b4b71a5fd87d6d3d61e08a627c968acda1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 14 Mar 2012 23:49:57 +0100
Subject: [PATCH 1613/6849] debug: provide an option to copy the gdbserver to
 the target

When an external toolchain is used, it is very likely that it contains
a pre-built version of a gdbserver that has the same version as the
cross-gdb included in the external toolchain. So, we now provide an
option that allows to copy this pre-built gdbserver to the target.

As the location of the gdbserver in the external toolchain is not
standardized, we only support the CodeSourcery and Crosstool-NG
layouts for the moment. Other locations can be added later.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in                  |  8 ++++++++
 toolchain/toolchain-external/ext-tool.mk | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 8501983aa4..980666b0d5 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -14,10 +14,18 @@ comment "Gdb debugger for the target needs WCHAR support in toolchain"
 
 config BR2_PACKAGE_GDB_SERVER
 	bool "Build gdb server for the Target"
+	depends on !BR2_TOOLCHAIN_EXTERNAL
 	help
 	    Build the gdbserver stub to run on the target.
 	    A full gdb is needed to debug the progam.
 
+config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
+	bool "Copy gdb server to the Target"
+	depends on BR2_TOOLCHAIN_EXTERNAL
+	help
+	  Copy the gdbserver provided by the external toolchain to the
+	  target.
+
 config BR2_PACKAGE_GDB_HOST
 	bool "Build gdb for the Host"
 	# cross-gdb is supposed to be part of the external
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index dbd39b0688..31ba50f97b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -375,6 +375,20 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
 	fi ; \
+	if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \
+		gdbserver_found=0 ; \
+		for d in $${ARCH_SYSROOT_DIR} $${ARCH_SYSROOT_DIR}/../debug-root/ ; do \
+			if test -f $${d}/usr/bin/gdbserver ; then \
+				install -m 0755 -D $${d}/usr/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
+				gdbserver_found=1 ; \
+				break ; \
+			fi ; \
+		done ; \
+		if [ $${gdbserver_found} -eq 0 ] ; then \
+			echo "Could not find gdbserver in external toolchain" ; \
+			exit 1 ; \
+		fi ; \
+	fi ; \
 	touch $@
 
 # Build toolchain wrapper for preprocessor, C and C++ compiler, and setup

From a9a346768b1f7fe8da8776795b2795f5573b5555 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 14 Mar 2012 23:49:58 +0100
Subject: [PATCH 1614/6849] config: improve help text and prompt for debugging
 related options

The help text for the choice of different stripping levels is removed,
since it is not displayed by menuconfig. Instead, only the per-option
help text is visible, so this text is improved.

[Peter: slightly reworked text]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/Config.in b/Config.in
index e07e52f174..68abb9b3c4 100644
--- a/Config.in
+++ b/Config.in
@@ -206,8 +206,12 @@ config BR2_DEPRECATED
 config BR2_ENABLE_DEBUG
 	bool "build packages with debugging symbols"
 	help
-	  Build packages with debugging symbols
-	  enabled
+	  Build packages with debugging symbols enabled. All libraries
+	  and binaries in the 'staging' directory will have debugging
+	  symbols, which allows remote debugging even if libraries and
+	  binaries are stripped on the target. Whether libraries and
+	  binaries are stripped on the target is controlled by the
+	  BR2_STRIP_* options below.
 
 if BR2_ENABLE_DEBUG
 choice
@@ -240,32 +244,36 @@ endchoice
 endif
 
 choice
-	prompt "strip"
+	prompt "strip command for binaries on target"
 	default BR2_STRIP_strip
-	help
-	  Select whether to strip binaries and libraries for the target
-	  or not.
-	  strip   is the normal strip command
-	  sstrip  is a strip that discards more than the normal strip
-	  none    do not strip (only for debugging!)
 
 config BR2_STRIP_strip
 	bool "strip"
 	depends on !BR2_ELF2FLT
 	help
-	  strip   is the normal strip command
+	  Binaries and libraries in the target filesystem will be
+	  stripped using the normal 'strip' command. This allows to
+	  save space, mainly by removing debugging symbols. Debugging
+	  symbols on the target are needed for native debugging, but
+	  not when remote debugging is used.
 
 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
 	depends on !BR2_ELF2FLT
 	help
-	  sstrip  is a strip that discards more than the normal strip
+	  Binaries and libraries in the target filesystem will be
+	  stripped using the 'sstrip' command, which strips a little
+	  bit more than the traditional 'strip' command. This allows to
+	  save space, mainly by removing debugging symbols. Debugging
+	  symbols on the target are needed for native debugging, but
+	  not when remote debugging is used.
 
 config BR2_STRIP_none
 	bool "none"
 	help
-	  none    do not strip (only for debugging!)
+	  Do not strip binaries and libraries in the target
+	  filesystem.
 endchoice
 
 choice

From 5dce78c22a6135d0e7367025079c216107934111 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Mon, 12 Mar 2012 13:30:33 +0100
Subject: [PATCH 1615/6849] libffi: bump version to 3.0.10

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index e9e87ef242..2181ea1be5 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFFI_VERSION = 3.0.9
+LIBFFI_VERSION = 3.0.10
 LIBFFI_SITE    = ftp://sources.redhat.com/pub/libffi/
 
 LIBFFI_INSTALL_STAGING = YES

From 94b3f6064aa3fcaaece826710e8ac0c0e48fc367 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Mar 2012 18:02:20 -0300
Subject: [PATCH 1616/6849] openssl: security bump to version 1.0.0h

Bump to version 1.0.0h to fix CMS and S/MIME Bleichenbacher attack (CVE-2012-0884)

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index cb29fe459d..a304747f00 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0g
+OPENSSL_VERSION = 1.0.0h
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From 17c2d62b712a0bef22bc02e7c8fdbbfa12b5da4b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Mar 2012 23:59:32 +0100
Subject: [PATCH 1617/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6f58d52abd..284707c369 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,40 @@
 2012.05, Not released yet:
 
+	Fixes all over the tree and new features.
+
+	Use /etc/os-release for version info rather than
+	/etc/br-version.
+
+	CMake toolchain file moved to $HOST_DIR/usr/share/buildroot.
+
+	Defconfigs: mx53qsb, use 3.2.x for atngw100,
+
+	Atom processor support.
+
+	Toolchain: Add GCC 4.4.7, 4.6.3. 64bit fixes for external
+	toolchains, linaro ext toolchains, new sourcery codebench ext
+	toolchains.
+
+	Updated/fixed packages: alsa-lib, alsa-utils, atk, avahi,
+	barebox, bluez_utils, can-utils, ccache, dhcp, dnsmasq,
+	e2fsprogs, expat, feh, file, freetype, gamin, gmp, gpsd, grep,
+	gstreamer, gst-plugins-{bad,base,good,ugly}, hdparm,
+	imagemagick, kmod, libarchive, libcurl, libethumb, libffi,
+	libfuse, libglib2, libnl, libsoup, libxml2, libxslt,
+	linux-firmware, lite, lua, microperl, mpd, mpfr, mtd, nbd,
+	network-manager, ntfs-3g, openssl, pixman, qt, radvd, sdl_net,
+	smartmontools, squashfs3, squid, sysstat, tiff, usbutils,
+	util-linux, vala, wipe, xdriver_xf86-video-fbdev, zlib,
+
+	New packages: glib-networking, lcdprog, minicom, parted,
+	zeromq
+
+	Removed packages: ntfsprogs
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4880: New package lcdproc
+
 2012.02, Released February 29th, 2012:
 
 	Updated/fixed packages: libecore

From dbb8e687ba44ec2cdce24bad2525e2e0fb3c38de Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 16 Mar 2012 09:47:24 +0100
Subject: [PATCH 1618/6849] pulseaudio: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index a2d055239f..eefc497f72 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PULSEAUDIO_VERSION = 1.0
+PULSEAUDIO_VERSION = 1.1
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_CONF_OPT = \

From 9ec29c8acc4827d831640f807bb7212072998e0a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 16 Mar 2012 14:54:54 +0100
Subject: [PATCH 1619/6849] vsftpd: bump to 2.3.5

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/vsftpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index e67ab4abfd..8d3a01e24a 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-VSFTPD_VERSION = 2.3.4
+VSFTPD_VERSION = 2.3.5
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
 

From 3911c7bc8ebfffe750ee54138f63221530c1865d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Mar 2012 15:43:29 -0300
Subject: [PATCH 1620/6849] linux-firmware: update definition for atheros
 ar9271

ar9271.fw is the old convention for the firmware.
Starting with kernel 3.0 the new convention is htc_9271.fw which is a
newer version of the firmware so symlinking won't do it and there are no
guarantees that the newer firmware will work with the older driver
either.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/linux-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index eedef2f786..8d1dd000b6 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -23,7 +23,7 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \
 
 # ar9271
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271) += \
-	LICENCE.atheros_firmware ar9271.fw
+	LICENCE.atheros_firmware ar9271.fw htc_9271.fw
 
 # wl127x
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \

From b5cce59cf01d721cd607fc87594cbeb7fb8ae476 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 2 Mar 2012 15:43:30 -0300
Subject: [PATCH 1621/6849] linux-firmware: add ar7010 variant (ath9k_htc
 driver) firmware

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 5 +++++
 package/linux-firmware/linux-firmware.mk | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index b15896ca5a..5166800741 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -10,6 +10,11 @@ if BR2_PACKAGE_LINUX_FIRMWARE
 
 menu "Atheros"
 
+config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010
+	bool "Atheros 7010"
+	help
+	  Firmware files for the Atheros 7010 module
+
 config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
 	bool "Atheros 9271"
 	help
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 8d1dd000b6..e09f67d91c 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -21,6 +21,10 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \
 	rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin 	\
 	LICENCE.ralink-firmware.txt
 
+# ar7010
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010) += \
+	LICENCE.atheros_firmware ar7010.fw ar7010_1_1.fw htc_7010.fw
+
 # ar9271
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271) += \
 	LICENCE.atheros_firmware ar9271.fw htc_9271.fw

From f43f4f433e422e08d5d00a4bb6c1d93e70b67b89 Mon Sep 17 00:00:00 2001
From: Stephan Thamm <thammi@chaossource.net>
Date: Sat, 3 Mar 2012 21:00:05 +0100
Subject: [PATCH 1622/6849] boost: Add comment when C++ is missing

[Peter: move above boost option so sub options gets indented]
Signed-off-by: Stephan Thamm <thammi@chaossource.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 7598d0268f..578fced374 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -1,3 +1,6 @@
+comment "boost requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_BOOST
 	bool "boost"
 	depends on BR2_INSTALL_LIBSTDCPP

From cfb5fd9e10b1efeed316ed2cce2be1623c1efe65 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 16 Mar 2012 14:54:55 +0100
Subject: [PATCH 1623/6849] vsftpd: fix SSL dependency

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/vsftpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 8d3a01e24a..3c9aa65553 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -14,7 +14,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 VSFTPD_DEPENDENCIES += openssl
-VSFTPD_LIBS += -lssl
+VSFTPD_LIBS += -lssl -lcrypto
 VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL
 endif
 

From d444e1d4c328d88f1f8befe6912e816876c1cbf4 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Tue, 7 Feb 2012 12:01:25 +0100
Subject: [PATCH 1624/6849] Add lpc3250loader to the host tools

[Peter: use install -D for installation]
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host                 | 1 +
 package/lpc3250loader/Config.in.host   | 7 +++++++
 package/lpc3250loader/lpc3250loader.mk | 9 +++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 package/lpc3250loader/Config.in.host
 create mode 100644 package/lpc3250loader/lpc3250loader.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index 1f49e79a7e..861b7367db 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,5 +1,6 @@
 menu "Host utilities"
 
+source "package/lpc3250loader/Config.in.host"
 source "package/openocd/Config.in.host"
 source "package/sam-ba/Config.in.host"
 source "package/uboot-tools/Config.in.host"
diff --git a/package/lpc3250loader/Config.in.host b/package/lpc3250loader/Config.in.host
new file mode 100644
index 0000000000..750080be7c
--- /dev/null
+++ b/package/lpc3250loader/Config.in.host
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_LPC3250LOADER
+	bool "host lpc3250loader"
+	help
+	  lpc3250loader is a tool to load/burn programs (in particular kickstart
+	  and S1L) on an LPC3250 platform.
+
+	  https://gitorious.org/lpc3250loader
diff --git a/package/lpc3250loader/lpc3250loader.mk b/package/lpc3250loader/lpc3250loader.mk
new file mode 100644
index 0000000000..ed6485cef4
--- /dev/null
+++ b/package/lpc3250loader/lpc3250loader.mk
@@ -0,0 +1,9 @@
+HOST_LPC3250LOADER_SITE = git://gitorious.org/lpc3250loader/lpc3250loader.git
+HOST_LPC3250LOADER_VERSION = 1.0
+
+define HOST_LPC3250LOADER_INSTALL_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/LPC3250loader.py \
+		$(HOST_DIR)/usr/bin/LPC3250loader.py
+endef
+
+$(eval $(call GENTARGETS,host))

From 8991218447dabd885359c3880de205d408e47d6d Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Tue, 7 Feb 2012 12:01:26 +0100
Subject: [PATCH 1625/6849] Add lpc3250loader to lpc3250 configs

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/ea3250_defconfig  | 6 ++++++
 configs/fdi3250_defconfig | 6 ++++++
 configs/phy3250_defconfig | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/configs/ea3250_defconfig b/configs/ea3250_defconfig
index da84c7e3df..9cd7b3481d 100644
--- a/configs/ea3250_defconfig
+++ b/configs/ea3250_defconfig
@@ -12,6 +12,12 @@ BR2_ARM_EABI=y
 BR2_GCC_VERSION_4_3_X=y
 
 
+#
+# Host utilities
+#
+BR2_PACKAGE_HOST_LPC3250LOADER=y
+
+
 # Bootloaders
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="ea3250"
diff --git a/configs/fdi3250_defconfig b/configs/fdi3250_defconfig
index 505dc8b899..1fd0b05d1e 100644
--- a/configs/fdi3250_defconfig
+++ b/configs/fdi3250_defconfig
@@ -12,6 +12,12 @@ BR2_ARM_EABI=y
 BR2_GCC_VERSION_4_3_X=y
 
 
+#
+# Host utilities
+#
+BR2_PACKAGE_HOST_LPC3250LOADER=y
+
+
 # Bootloaders
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="fdi3250"
diff --git a/configs/phy3250_defconfig b/configs/phy3250_defconfig
index d46d7190e4..bc17d5c800 100644
--- a/configs/phy3250_defconfig
+++ b/configs/phy3250_defconfig
@@ -12,6 +12,12 @@ BR2_ARM_EABI=y
 BR2_GCC_VERSION_4_3_X=y
 
 
+#
+# Host utilities
+#
+BR2_PACKAGE_HOST_LPC3250LOADER=y
+
+
 # Bootloaders
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="phy3250"

From 277bd1ff42504f91fe15de163aa62152784665ac Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 18 Mar 2012 16:35:58 +0100
Subject: [PATCH 1626/6849] elf2flt: fix after conversion of binutils to
 package infrastructure

When binutils was converted to the package infrastructure (commit
009407e6b), the variable that elf2flt uses to find the binutils
libraries disappeared.  So use HOST_BINUTILS_DIR instead of
BINUTILS_DIR1.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/elf2flt/elf2flt.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index e74a6553bf..84a2c0119e 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -21,12 +21,12 @@ $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
 	(cd $(ELF2FLT_DIR); rm -rf config.cache; \
 		LDFLAGS=-lz \
 		$(ELF2FLT_DIR)/configure $(QUIET) \
-		--with-bfd-include-dir=$(BINUTILS_DIR1)/bfd/ \
-		--with-binutils-include-dir=$(BINUTILS_DIR)/include/ \
+		--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
+		--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
 		--target=$(REAL_GNU_TARGET_NAME) \
-		--with-libbfd=$(BINUTILS_DIR1)/bfd/libbfd.a \
-		--with-libiberty=$(BINUTILS_DIR1)/libiberty/libiberty.a \
-		--prefix=$(STAGING_DIR)/usr)
+		--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
+		--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
+		--prefix=$(HOST_DIR)/usr)
 	touch $@
 
 $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured

From a0b75003521e695e5ac852e8aba19ca90e30ed1c Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 15 Mar 2012 22:04:27 +0100
Subject: [PATCH 1627/6849] netsnmp: add option to enable debugging code

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/Config.in  | 9 +++++++++
 package/netsnmp/netsnmp.mk | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index 431be2d383..108ab83936 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -14,3 +14,12 @@ config BR2_PACKAGE_NETSNMP_ENABLE_MIBS
 	  The net-snmp package contains a selection of MIB files.
 	  Say yes if you want those MIB files installed on the target
 	  and enable the code that parses the MIB files.
+
+config BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING
+	bool "Enable debugging code"
+	depends on BR2_PACKAGE_NETSNMP
+	help
+	  By default net-snmp is compiled without debugging support
+	  (--disable-debugging). Enable this options if you need debugging
+	  support, including the ability to log with DEBUGMSG(),
+	  DEBUGMSGTL() and companion macros.
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 959e39f154..448e3fdb07 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -12,7 +12,7 @@ NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
 NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
 		--with-defaults --enable-mini-agent --without-rpm \
 		--with-logfile=none --without-kmem-usage $(DISABLE_IPV6) \
-		--enable-as-needed --disable-debugging --without-perl-modules \
+		--enable-as-needed --without-perl-modules \
 		--disable-embedded-perl --disable-perl-cc-checks \
 		--disable-scripts --with-default-snmp-version="1" \
 		--enable-silent-libtool --enable-mfd-rewrites \
@@ -55,6 +55,10 @@ define NETSNMP_REMOVE_MIBS_IPV6
 endef
 endif
 
+ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING),y)
+	NETSNMP_CONF_OPT += --disable-debugging
+endif
+
 define NETSNMP_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		DESTDIR=$(TARGET_DIR) install

From 955714a0b7d600860ff47a47f50ea0478c6d32f2 Mon Sep 17 00:00:00 2001
From: Samuel MARTIN <s.martin49@gmail.com>
Date: Sun, 18 Mar 2012 09:53:59 +0100
Subject: [PATCH 1628/6849] docs/buildroot.html: cleanup trailing whitespaces

Signed-off-by: Samuel MARTIN <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/buildroot.html b/docs/buildroot.html
index ddfb20a740..28aefe4f80 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -39,22 +39,22 @@ <h1>Buildroot</h1>
 
     <h2 id="about">About Buildroot</h2>
 
-    <p>Buildroot is a set of Makefiles and patches that allows you to easily 
-    generate a cross-compilation toolchain, a root filesystem and a Linux 
-    kernel image for your target. Buildroot can be used for one, two or all 
+    <p>Buildroot is a set of Makefiles and patches that allows you to easily
+    generate a cross-compilation toolchain, a root filesystem and a Linux
+    kernel image for your target. Buildroot can be used for one, two or all
     of these options, independently.</p>
 
-    <p>Buildroot is useful mainly for people working with embedded systems. 
-    Embedded systems often use processors that are not the regular x86 
-    processors everyone is used to having in his PC. They can be PowerPC 
+    <p>Buildroot is useful mainly for people working with embedded systems.
+    Embedded systems often use processors that are not the regular x86
+    processors everyone is used to having in his PC. They can be PowerPC
     processors, MIPS processors, ARM processors, etc.</p>
 
-    <p>A compilation toolchain is the set of tools that allows you to 
-    compile code for your system. It consists of a compiler (in our case, 
-    <code>gcc</code>), binary utils like assembler and linker (in our case, 
-    <code>binutils</code>) and a C standard library (for example 
-    <a href="http://www.gnu.org/software/libc/libc.html">GNU Libc</a>, 
-    <a href="http://www.uclibc.org/">uClibc</a> or 
+    <p>A compilation toolchain is the set of tools that allows you to
+    compile code for your system. It consists of a compiler (in our case,
+    <code>gcc</code>), binary utils like assembler and linker (in our case,
+    <code>binutils</code>) and a C standard library (for example
+    <a href="http://www.gnu.org/software/libc/libc.html">GNU Libc</a>,
+    <a href="http://www.uclibc.org/">uClibc</a> or
     <a href="http://www.fefe.de/dietlibc/">dietlibc</a>). The system installed
     on your development station certainly already has a compilation
     toolchain that you can use to compile an application that runs on your

From 1e06a030e6bc95bc55f4bfcebd5e80a03f48233f Mon Sep 17 00:00:00 2001
From: Samuel MARTIN <s.martin49@gmail.com>
Date: Sun, 18 Mar 2012 09:54:00 +0100
Subject: [PATCH 1629/6849] docs/buildroot.html: add new manual location and
 warning about this page

Signed-off-by: Samuel MARTIN <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/buildroot.html b/docs/buildroot.html
index 28aefe4f80..a01e1fcfd0 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -37,6 +37,21 @@ <h1>Buildroot</h1>
       <li><a href="#links">Resources</a></li>
     </ul>
 
+    <p><b>WARNING:</b> Since the 2011.11 release, this page is on its way to be
+    deprecated. Information may be incomplete and out-dated.</p>
+
+    <p>To get an up-to-date documentation for
+    <a href="http://buildroot.net/">Buildroot</a>-2011.11 or a git view, just
+    run:</p>
+<pre>
+  $ make manual
+</pre>
+    <p><i>This requires <code>asciidoc</code> installed on the host system.</i></p>
+
+    <p>For releases since <a href="http://buildroot.net/">Buildroot</a>-2012.02,
+    manuals (html, pdf and text) are available in the  <code>docs/manual</code>
+    directory.</p>
+
     <h2 id="about">About Buildroot</h2>
 
     <p>Buildroot is a set of Makefiles and patches that allows you to easily

From d41e115395071fe5c22f0cbd786426935d40d1d5 Mon Sep 17 00:00:00 2001
From: Samuel MARTIN <s.martin49@gmail.com>
Date: Sun, 18 Mar 2012 09:54:01 +0100
Subject: [PATCH 1630/6849] docs: fix busybox url

Signed-off-by: Samuel MARTIN <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/buildroot.html   | 2 +-
 docs/manual/using.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/buildroot.html b/docs/buildroot.html
index a01e1fcfd0..d178df1f56 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -154,7 +154,7 @@ <h2 id="using">Using Buildroot</h2>
     <p>Buildroot has a nice configuration tool similar to the one you can find
     in the Linux kernel
     (<a href="http://www.kernel.org/">http://www.kernel.org/</a>) or in Busybox
-    (<a href="http://www.busybox.org/">http://www.busybox.org/</a>). Note that
+    (<a href="http://www.busybox.net/">http://www.busybox.net/</a>). Note that
     you can (and should) build everything as a normal user. There is no need to
     be root to configure and use Buildroot. The first step is to run the
     configuration assistant:</p>
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 8d7f0a7bca..a5dc9e1aee 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -6,7 +6,7 @@ Configuration and general usage
 
 Buildroot has a nice configuration tool similar to the one you can
 find in the http://www.kernel.org/[Linux kernel] or in
-http://www.busybox.org/[Busybox]. Note that you can (and should) build
+http://www.busybox.net/[Busybox]. Note that you can (and should) build
 everything as a normal user. There is no need to be root to configure
 and use Buildroot. The first step is to run the configuration
 assistant:

From 22937a37507f6e032b4c6a09ed3c45a982296176 Mon Sep 17 00:00:00 2001
From: Samuel MARTIN <s.martin49@gmail.com>
Date: Sun, 18 Mar 2012 09:54:02 +0100
Subject: [PATCH 1631/6849] manual: fix typo

Signed-off-by: Samuel MARTIN <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt   |  3 ++-
 docs/manual/adding-packages-handwritten.txt | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 0852b045f1..04be820ce2 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -8,12 +8,13 @@ Some packages have been grouped by topic in a sub-directory:
 +multimedia+, +java+, +x11r7+, and +games+. If your package fits in
 one of these categories, then create your package directory in these.
 
+
 +Config.in+ file
 ~~~~~~~~~~~~~~~~
 
 Then, create a file named +Config.in+. This file will contain the
 option descriptions related to our +libfoo+ software that will be used
-and displayed in the configuration tool. It should basically contain :
+and displayed in the configuration tool. It should basically contain:
 
 ---------------------------
 config BR2_PACKAGE_LIBFOO
diff --git a/docs/manual/adding-packages-handwritten.txt b/docs/manual/adding-packages-handwritten.txt
index a9d247ca8e..54ccf650d8 100644
--- a/docs/manual/adding-packages-handwritten.txt
+++ b/docs/manual/adding-packages-handwritten.txt
@@ -14,12 +14,12 @@ existing manual makefiles and to help understand how they work.*
 03: # libfoo
 04: #
 05: #############################################################
-06: LIBFOO_VERSION:=1.0
-07: LIBFOO_SOURCE:=libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE:=http://www.foosoftware.org/downloads
-09: LIBFOO_DIR:=$(BUILD_DIR)/foo-$(FOO_VERSION)
-10: LIBFOO_BINARY:=foo
-11: LIBFOO_TARGET_BINARY:=usr/bin/foo
+06: LIBFOO_VERSION = 1.0
+07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+08: LIBFOO_SITE = http://www.foosoftware.org/downloads
+09: LIBFOO_DIR = $(BUILD_DIR)/foo-$(FOO_VERSION)
+10: LIBFOO_BINARY = foo
+11: LIBFOO_TARGET_BINARY = usr/bin/foo
 12:
 13: $(DL_DIR)/$(LIBFOO_SOURCE):
 14: 	$(call DOWNLOAD,$(LIBFOO_SITE),$(LIBFOO_SOURCE))
@@ -65,7 +65,7 @@ existing manual makefiles and to help understand how they work.*
 54: #
 55: #############################################################
 56: ifeq ($(BR2_PACKAGE_LIBFOO),y)
-57: TARGETS+=libfoo
+57: TARGETS += libfoo
 58: endif
 ------------------------
 

From 6372f4e64600335b5ff7d07e3b78baf2fa6cce59 Mon Sep 17 00:00:00 2001
From: Samuel MARTIN <s.martin49@gmail.com>
Date: Sun, 18 Mar 2012 09:54:03 +0100
Subject: [PATCH 1632/6849] manual: update Config.in dependency explainations

[Peter: adjusted according to Arnout's suggestions]
Signed-off-by: Samuel MARTIN <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 53 +++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 04be820ce2..2670f2fe9a 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -87,6 +87,59 @@ comment "acl requires a toolchain with LARGEFILE support"
 --------------------------
 
 
+Note that these two dependency types are only transitive with the
+dependencies of the same kind.
+
+This means, in the following example:
+
+--------------------------
+config BR2_PACKAGE_A
+        bool "Package A"
+
+config BR2_PACKAGE_B
+        bool "Package B"
+        depends on BR2_PACKAGE_A
+
+config BR2_PACKAGE_C
+        bool "Package C"
+        depends on BR2_PACKAGE_B
+
+config BR2_PACKAGE_D
+        bool "Package D"
+        select BR2_PACKAGE_B
+
+config BR2_PACKAGE_E
+        bool "Package E"
+        select BR2_PACKAGE_D
+--------------------------
+
+* Selecting +Package C+ will be visible if +Package B+ has been
+  selected, which in turn is only visible if +Package A+ has been
+  selected.
+
+* Selecting +Package E+ will select +Package D+, which will select
+  +Package B+, it will not check for the dependencies of +Package B+,
+  so it will not select +Package A+.
+
+* Since +Package B+ is selected but +Package A+ is not, this violates
+  the dependency of +Package B+ on +Package A+.  Therefore, in such a
+  situation, the transitive dependency has to be added explicitly:
+
+--------------------------
+config BR2_PACKAGE_D
+	bool "Package D"
+	select BR2_PACKAGE_B
+	depends on BR2_PACKAGE_A
+
+config BR2_PACKAGE_E
+	bool "Package E"
+	select BR2_PACKAGE_D
+	depends on BR2_PACKAGE_A
+--------------------------
+
+Overall, for package library dependencies, +select+ should be
+preferred.
+
 Note that such dependencies will make sure that the dependency option
 is also enabled, but not necessarily built before your package. To do
 so, the dependency also needs to be expressed in the +.mk+ file of the

From 0a4856ce27027e939fdcd350fb0b246cbda75e93 Mon Sep 17 00:00:00 2001
From: "Alvaro G. M" <alvaro.gamez@hazent.com>
Date: Fri, 16 Mar 2012 14:42:53 +0100
Subject: [PATCH 1633/6849] DOWNLOAD: change $1=DIRECTORY_URL, $2=FILE_NAME to
 $1=FULL_FILE_URL, $2=FILE_NAME

This modifies the definition of DOWNLOAD to receive two arguments:
the first one is the full URL of the file to download, whereas the second
(and optional) is the name the file will have once downloaded.

Same thing with the SOURCE_CHECK_WGET and SCP functions.

All calls to these functions have been changed to the shortest form of
the new API, except for toolchains acquisition. Since there is quite a
number of different toolchains this call to DOWNLOAD is better set to the
generic one.

Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Stephan Hoffmann <sho@relinux.de>
Downloading Microblaze LE toolchain works on a clean install
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-handwritten.txt |  2 +-
 linux/linux.mk                              |  2 +-
 package/Makefile.package.in                 | 18 +++++++++++-------
 package/cups/cups.mk                        |  2 +-
 package/fis/fis.mk                          |  2 +-
 package/games/doom-wad/doom-wads.mk         |  2 +-
 package/gettext/gettext.mk                  |  2 +-
 package/netkitbase/netkitbase.mk            |  2 +-
 package/netkittelnet/netkittelnet.mk        |  2 +-
 package/newt/newt.mk                        |  2 +-
 package/tinyhttpd/tinyhttpd.mk              |  2 +-
 package/ttcp/ttcp.mk                        |  2 +-
 package/uemacs/uemacs.mk                    |  2 +-
 package/vpnc/vpnc.mk                        |  2 +-
 package/xfsprogs/xfsprogs.mk                |  2 +-
 toolchain/gcc/gcc-uclibc-4.x.mk             |  2 +-
 toolchain/gdb/gdb.mk                        |  2 +-
 toolchain/kernel-headers/kernel-headers.mk  |  2 +-
 toolchain/toolchain-external/ext-tool.mk    |  6 +++---
 toolchain/uClibc/uclibc.mk                  |  2 +-
 20 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/docs/manual/adding-packages-handwritten.txt b/docs/manual/adding-packages-handwritten.txt
index 54ccf650d8..beb25f6877 100644
--- a/docs/manual/adding-packages-handwritten.txt
+++ b/docs/manual/adding-packages-handwritten.txt
@@ -22,7 +22,7 @@ existing manual makefiles and to help understand how they work.*
 11: LIBFOO_TARGET_BINARY = usr/bin/foo
 12:
 13: $(DL_DIR)/$(LIBFOO_SOURCE):
-14: 	$(call DOWNLOAD,$(LIBFOO_SITE),$(LIBFOO_SOURCE))
+14: 	$(call DOWNLOAD,$(LIBFOO_SITE)/$(LIBFOO_SOURCE))
 15:
 16: $(LIBFOO_DIR)/.source: $(DL_DIR)/$(LIBFOO_SOURCE)
 17: 	$(ZCAT) $(DL_DIR)/$(LIBFOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/linux/linux.mk b/linux/linux.mk
index ae236d45dd..58cbe8e925 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -98,7 +98,7 @@ define LINUX_DOWNLOAD_PATCHES
 	$(if $(LINUX_PATCHES),
 		@$(call MESSAGE,"Download additional patches"))
 	$(foreach patch,$(filter ftp://% http://%,$(LINUX_PATCHES)),\
-		$(call DOWNLOAD,$(dir $(patch)),$(notdir $(patch)))$(sep))
+		$(call DOWNLOAD,$(patch))$(sep))
 endef
 
 LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 59adce1b01..f7b65666fa 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -203,11 +203,11 @@ endef
 # to prepend the path with a slash: scp://[user@]host:/absolutepath
 define DOWNLOAD_SCP
 	test -e $(DL_DIR)/$(2) || \
-	$(SCP) $(call stripurischeme,$(call qstrip,$(1)))/$(2) $(DL_DIR)
+	$(SCP) '$(call stripurischeme,$(call qstrip,$(1)))' $(DL_DIR)/$(2)
 endef
 
 define SOURCE_CHECK_SCP
-	$(SSH) $(call domain,$(1),:) ls $(call notdomain,$(1)/$(2),:) > /dev/null
+	$(SSH) $(call domain,$(1),:) ls '$(call notdomain,$(1),:)' > /dev/null
 endef
 
 define SHOW_EXTERNAL_DEPS_SCP
@@ -241,12 +241,12 @@ endef
 # download fails).
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
-	$(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2) || \
+	$(WGET) -O $(DL_DIR)/$(2) '$(call qstrip,$(1))' || \
 	(rm -f $(DL_DIR)/$(2) ; exit 1)
 endef
 
 define SOURCE_CHECK_WGET
-  $(WGET) --spider $(call qstrip,$(1))/$(2)
+  $(WGET) --spider '$(call qstrip,$(1))'
 endef
 
 define SHOW_EXTERNAL_DEPS_WGET
@@ -280,6 +280,10 @@ endef
 ################################################################################
 
 define DOWNLOAD
+	$(call DOWNLOAD_INNER,$(1),$(if $(2),$(2),$(notdir $(1))))
+endef
+
+define DOWNLOAD_INNER
 	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
 		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
 			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
@@ -298,7 +302,7 @@ define DOWNLOAD
 		esac ; \
 	fi ; \
 	if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \
-		$(call $(DL_MODE)_WGET,$(BR2_BACKUP_SITE),$(2)) && exit ; \
+		$(call $(DL_MODE)_WGET,$(BR2_BACKUP_SITE)/$(2),$(2)) && exit ; \
 	fi ; \
 	exit 1
 endef
@@ -322,8 +326,8 @@ ifeq ($(DL_MODE),DOWNLOAD)
 		(test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \
 		$(call MESSAGE,"Downloading")
 endif
-	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)))
-	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
+	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_SOURCE)))
+	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_PATCH)))
 	$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
 ifeq ($(DL_MODE),DOWNLOAD)
 	$(Q)mkdir -p $(@D)
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 4e8db71aa9..9efd6e98d5 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -65,7 +65,7 @@ else
 endif
 
 $(DL_DIR)/$(CUPS_SOURCE):
-	 $(call DOWNLOAD,$(CUPS_SITE),$(CUPS_SOURCE))
+	 $(call DOWNLOAD,$(CUPS_SITE)/$(CUPS_SOURCE))
 
 $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
 	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index 29424491c2..0975f3fb0e 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -11,7 +11,7 @@ FIS_BINARY:=fis
 FIS_TARGET_BINARY:=sbin/fis
 
 $(DL_DIR)/$(FIS_SOURCE):
-	 $(call DOWNLOAD,$(FIS_SITE),$(FIS_SOURCE))
+	 $(call DOWNLOAD,$(FIS_SITE)/$(FIS_SOURCE))
 
 fis-source: $(DL_DIR)/$(FIS_SOURCE)
 
diff --git a/package/games/doom-wad/doom-wads.mk b/package/games/doom-wad/doom-wads.mk
index bae2420919..c0bf4fbfc0 100644
--- a/package/games/doom-wad/doom-wads.mk
+++ b/package/games/doom-wad/doom-wads.mk
@@ -10,7 +10,7 @@ DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/
 DOOM_WAD_DIR=$(BUILD_DIR)/doom-wad-$(DOOM_WAD_VERSION)
 
 $(DL_DIR)/$(DOOM_WAD_SOURCE):
-	 $(call DOWNLOAD,$(DOOM_WAD_SITE),$(DOOM_WAD_SOURCE))
+	 $(call DOWNLOAD,$(DOOM_WAD_SITE)/$(DOOM_WAD_SOURCE))
 
 doom-wad-source: $(DL_DIR)/$(DOOM_WAD_SOURCE)
 
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index f4c8c7671c..f3605da6f5 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -18,7 +18,7 @@ LIBINTL_TARGET_BINARY:=usr/lib/libintl.so
 endif
 
 $(DL_DIR)/$(GETTEXT_SOURCE):
-	 $(call DOWNLOAD,$(GETTEXT_SITE),$(GETTEXT_SOURCE))
+	 $(call DOWNLOAD,$(GETTEXT_SITE)/$(GETTEXT_SOURCE))
 
 gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
 
diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index dde8f9f6c0..83991f2088 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -12,7 +12,7 @@ NETKITBASE_BINARY:=inetd/inetd
 NETKITBASE_TARGET_BINARY:=usr/sbin/inetd
 
 $(DL_DIR)/$(NETKITBASE_SOURCE):
-	 $(call DOWNLOAD,$(NETKITBASE_SITE),$(NETKITBASE_SOURCE))
+	 $(call DOWNLOAD,$(NETKITBASE_SITE)/$(NETKITBASE_SOURCE))
 
 netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE)
 
diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index e9f40cad03..ff05318726 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -12,7 +12,7 @@ NETKITTELNET_BINARY:=telnetd/telnetd
 NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd
 
 $(DL_DIR)/$(NETKITTELNET_SOURCE):
-	 $(call DOWNLOAD,$(NETKITTELNET_SITE),$(NETKITTELNET_SOURCE))
+	 $(call DOWNLOAD,$(NETKITTELNET_SITE)/$(NETKITTELNET_SOURCE))
 
 netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE)
 
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index eb944a92fd..ac450e0c80 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -11,7 +11,7 @@ NEWT_VERSION=0.51.0
 NEWT_CFLAGS=-Os -g -fPIC
 
 $(DL_DIR)/$(NEWT_SOURCE):
-	$(call DOWNLOAD,$(NEWT_SITE),$(NEWT_SOURCE))
+	$(call DOWNLOAD,$(NEWT_SITE)/$(NEWT_SOURCE))
 
 $(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE)
 	$(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 739849f33b..0f95d06fbe 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -12,7 +12,7 @@ TINYHTTPD_BINARY:=httpd
 TINYHTTPD_TARGET_BINARY:=usr/sbin/tinyhttpd
 
 $(DL_DIR)/$(TINYHTTPD_SOURCE):
-	 $(call DOWNLOAD,$(TINYHTTPD_SITE),$(TINYHTTPD_SOURCE))
+	 $(call DOWNLOAD,$(TINYHTTPD_SITE)/$(TINYHTTPD_SOURCE))
 
 tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
 
diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index 006b74ca9c..1acf12048a 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -10,7 +10,7 @@ TTCP_SOURCE=ttcp$(TTCP_VERSION).c
 TTCP_DIR=$(BUILD_DIR)/ttcp$(TTCP_VERSION)
 
 $(DL_DIR)/$(TTCP_SOURCE):
-	 $(call DOWNLOAD,$(TTCP_SOURCE_URL),$(TTCP_SOURCE))
+	 $(call DOWNLOAD,$(TTCP_SOURCE_URL)/$(TTCP_SOURCE))
 
 $(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE)
 	-mkdir $(TTCP_DIR)
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 8355a7f960..62b0911af0 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -12,7 +12,7 @@ UEMACS_BINARY:=em
 UEMACS_TARGET_BINARY:=usr/bin/emacs
 
 $(DL_DIR)/$(UEMACS_SOURCE):
-	 $(call DOWNLOAD,$(UEMACS_SITE),$(UEMACS_SOURCE))
+	 $(call DOWNLOAD,$(UEMACS_SITE)/$(UEMACS_SOURCE))
 
 uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
 
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index 5a8c700368..d8d9654a47 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -15,7 +15,7 @@ VPNC_TARGET_BINARY:=$(VPNC_DEST_DIR)/vpnc
 VPNC_TARGET_SCRIPT:=$(TARGET_DIR)/etc/vpnc/default.conf
 
 $(DL_DIR)/$(VPNC_SOURCE):
-	$(call DOWNLOAD,$(VPNC_SITE),$(VPNC_SOURCE))
+	$(call DOWNLOAD,$(VPNC_SITE)/$(VPNC_SOURCE))
 
 $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
 	$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 68db2f7890..52fec0964f 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -18,7 +18,7 @@ XFSPROGS_STRIP_LIBDEP:= \
 	repair/xfs_repair quota/xfs_quota
 
 $(DL_DIR)/$(XFSPROGS_SOURCE):
-	 $(call DOWNLOAD,$(XFSPROGS_SITE),$(XFSPROGS_SOURCE))
+	 $(call DOWNLOAD,$(XFSPROGS_SITE)/$(XFSPROGS_SOURCE))
 
 xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE)
 
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 5eb7505048..d9547fbfbe 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -172,7 +172,7 @@ endif
 
 $(DL_DIR)/$(GCC_SOURCE):
 	mkdir -p $(DL_DIR)
-	$(call DOWNLOAD,$(GCC_SITE),$(GCC_SOURCE))
+	$(call DOWNLOAD,$(GCC_SITE)/$(GCC_SOURCE))
 
 gcc-unpacked: $(GCC_DIR)/.patched
 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 56faf49977..b5c085bca8 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -24,7 +24,7 @@ endif
 GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_VERSION)
 
 $(DL_DIR)/$(GDB_SOURCE):
-	$(call DOWNLOAD,$(GDB_SITE),$(GDB_SOURCE))
+	$(call DOWNLOAD,$(GDB_SITE)/$(GDB_SOURCE))
 
 gdb-unpacked: $(GDB_DIR)/.unpacked
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 72c600766d..c464c373de 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -81,7 +81,7 @@ $(DL_DIR)/$(LINUX_HEADERS_SOURCE):
 ifeq ($(BR2_KERNEL_HEADERS_SNAP),y)
 	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)
 endif
-	$(call DOWNLOAD,$(LINUX_HEADERS_SITE),$(LINUX_HEADERS_SOURCE))
+	$(call DOWNLOAD,$(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE))
 
 kernel-headers: $(LINUX_HEADERS_DIR)/.configured
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 31ba50f97b..3c97de16b0 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -253,10 +253,10 @@ endif
 # components than usual.
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1),$(TOOLCHAIN_EXTERNAL_SOURCE_1))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2),$(TOOLCHAIN_EXTERNAL_SOURCE_2))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
 	mkdir -p $(@D)
@@ -279,7 +279,7 @@ endif
 else
 # Download and extraction of a toolchain
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE),$(TOOLCHAIN_EXTERNAL_SOURCE))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE)$(TOOLCHAIN_EXTERNAL_SOURCE),$(TOOLCHAIN_EXTERNAL_SOURCE))
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 	mkdir -p $(@D)
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index ee474bbb61..32cbe46052 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -67,7 +67,7 @@ UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_ARM_TYPE))
 UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
-	$(call DOWNLOAD,$(UCLIBC_SITE),$(UCLIBC_SOURCE))
+	$(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE))
 
 uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)

From c4b6fea3a36697e45acd55935cbc79374eec1d03 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Mar 2012 22:33:00 +0100
Subject: [PATCH 1634/6849] doom-wad: convert to gentargets

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/games/doom-wad/doom-wad.mk  | 24 ++++++++++++++++++++
 package/games/doom-wad/doom-wads.mk | 35 -----------------------------
 2 files changed, 24 insertions(+), 35 deletions(-)
 create mode 100644 package/games/doom-wad/doom-wad.mk
 delete mode 100644 package/games/doom-wad/doom-wads.mk

diff --git a/package/games/doom-wad/doom-wad.mk b/package/games/doom-wad/doom-wad.mk
new file mode 100644
index 0000000000..1143b3dd66
--- /dev/null
+++ b/package/games/doom-wad/doom-wad.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# doom-wad
+#
+#############################################################
+
+DOOM_WAD_VERSION = 1.8
+DOOM_WAD_SOURCE = doom-$(DOOM_WAD_VERSION).wad.gz
+DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/
+
+define DOOM_WAD_EXTRACT_CMDS
+	$(ZCAT) $(DL_DIR)/$($(PKG)_SOURCE) > $(@D)/doom1.wad
+endef
+
+define DOOM_WAD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/doom1.wad \
+		$(TARGET_DIR)/usr/share/games/doom/doom1.wad
+endef
+
+define DOOM_WAD_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/share/games/doom/doom1.wad
+endef
+
+$(eval $(call GENTARGETS))
diff --git a/package/games/doom-wad/doom-wads.mk b/package/games/doom-wad/doom-wads.mk
deleted file mode 100644
index c0bf4fbfc0..0000000000
--- a/package/games/doom-wad/doom-wads.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#############################################################
-#
-# doom-wad
-#
-#############################################################
-
-DOOM_WAD_VERSION = 1.8
-DOOM_WAD_SOURCE = doom-$(DOOM_WAD_VERSION).wad.gz
-DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/
-DOOM_WAD_DIR=$(BUILD_DIR)/doom-wad-$(DOOM_WAD_VERSION)
-
-$(DL_DIR)/$(DOOM_WAD_SOURCE):
-	 $(call DOWNLOAD,$(DOOM_WAD_SITE)/$(DOOM_WAD_SOURCE))
-
-doom-wad-source: $(DL_DIR)/$(DOOM_WAD_SOURCE)
-
-$(DOOM_WAD_DIR)/.unpacked: $(DL_DIR)/$(DOOM_WAD_SOURCE)
-	$(INSTALL) -D $(DL_DIR)/$(DOOM_WAD_SOURCE) $(DOOM_WAD_DIR)/$(DOOM_WAD_SOURCE)
-	$(ZCAT) $(DOOM_WAD_DIR)/$(DOOM_WAD_SOURCE) > \
-		$(DOOM_WAD_DIR)/doom-$(DOOM_WAD_VERSION).wad
-	touch $@
-
-$(TARGET_DIR)/usr/share/games/doom/doom1.wad: $(DOOM_WAD_DIR)/.unpacked
-	$(INSTALL) -D $(DOOM_WAD_DIR)/doom-$(DOOM_WAD_VERSION).wad $@
-
-doom-wad: $(TARGET_DIR)/usr/share/games/doom/doom1.wad
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DOOM_WAD),y)
-TARGETS+=doom-wad
-endif

From 2110a29179f04983e731bc994ca01f1f699b9e84 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Mar 2012 22:46:56 +0100
Subject: [PATCH 1635/6849] fis: convert to gentargets

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fis/fis-002-makefile.patch | 10 ------
 package/fis/fis.mk                 | 55 ++++++++----------------------
 2 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 package/fis/fis-002-makefile.patch

diff --git a/package/fis/fis-002-makefile.patch b/package/fis/fis-002-makefile.patch
deleted file mode 100644
index 0b922a27e0..0000000000
--- a/package/fis/fis-002-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fis/Makefile0	1970-01-01 10:00:00.000000000 +1000
-+++ fis/Makefile	2007-10-18 12:08:56.000000000 +1000
-@@ -0,0 +1,7 @@
-+CFLAGS += -std=c99
-+
-+fis: fis.o crc.o
-+
-+clean:
-+	-rm -f fis *.o
-+
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index 0975f3fb0e..d2cd19685a 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -3,49 +3,22 @@
 # fis
 #
 #############################################################
-FIS_SOURCE:=fis.c
-FIS_SITE:=http://svn.chezphil.org/utils/trunk
-FIS_CAT:=$(ZCAT)
-FIS_DIR:=$(BUILD_DIR)/fis
-FIS_BINARY:=fis
-FIS_TARGET_BINARY:=sbin/fis
 
-$(DL_DIR)/$(FIS_SOURCE):
-	 $(call DOWNLOAD,$(FIS_SITE)/$(FIS_SOURCE))
+FIS_SITE = http://svn.chezphil.org/utils/trunk
+FIS_SITE_METHOD = svn
+FIS_VERSION = 2892
 
-fis-source: $(DL_DIR)/$(FIS_SOURCE)
+define FIS_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) -std=c99 -o $(@D)/fis \
+		$(@D)/fis.c $(@D)/crc.c $(TARGE_LDFLAGS)
+endef
 
-$(FIS_DIR)/.unpacked: $(DL_DIR)/$(FIS_SOURCE)
-	mkdir -p $(FIS_DIR)
-	cp -f $(DL_DIR)/$(FIS_SOURCE) $(FIS_DIR)
-	support/scripts/apply-patches.sh $(FIS_DIR) package/fis \*.patch
-	touch $@
+define FIS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/fis $(TARGET_DIR)/sbin/fis
+endef
 
-$(FIS_DIR)/$(FIS_BINARY): $(FIS_DIR)/.unpacked
-	$(MAKE) -C $(FIS_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -std=c99" \
-		LDFLAGS="$(TARGET_LDFLAGS)"
+define FIS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/sbin/fis
+endef
 
-$(TARGET_DIR)/$(FIS_TARGET_BINARY): $(FIS_DIR)/$(FIS_BINARY)
-	rm -f $(TARGET_DIR)/$(FIS_TARGET_BINARY)
-	$(INSTALL) -D -m 0755 $(FIS_DIR)/$(FIS_BINARY) $(TARGET_DIR)/$(FIS_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-fis: $(TARGET_DIR)/$(FIS_TARGET_BINARY)
-
-fis-clean:
-	-$(MAKE) -C $(FIS_DIR) clean
-	rm -f $(TARGET_DIR)/$(FIS_TARGET_BINARY)
-
-fis-dirclean:
-	rm -rf $(FIS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FIS),y)
-TARGETS+=fis
-endif
+$(eval $(call GENTARGETS))

From a6f2a787ab0272a2e4869541b3662fe328e86215 Mon Sep 17 00:00:00 2001
From: "Alvaro G. M" <alvaro.gamez@hazent.com>
Date: Fri, 16 Mar 2012 14:42:54 +0100
Subject: [PATCH 1636/6849] Microblaze: added architecture support for both big
 endian and low endian

Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
Tested-by: Stephan Hoffmann <sho@relinux.de>
Tested Microblaze LE on a clean install
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 25c6e50083..1910ff6ec6 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -21,6 +21,10 @@ config BR2_i386
 config BR2_m68k
 	bool "m68k"
 	depends on BROKEN # ice in uclibc / inet_ntoa_r
+config BR2_microblazeel
+	bool "Microblaze AXI (little-endian)"
+config BR2_microblazebe
+	bool "Microblaze non-AXI (big-endian)""
 config BR2_mips
 	bool "mips"
 config BR2_mipsel
@@ -40,6 +44,10 @@ config BR2_xtensa
 	bool "xtensa"
 endchoice
 
+config BR2_microblaze
+	bool
+	default y if BR2_microblazeel || BR2_microblazebe
+
 #
 # Keep the variants separate, there's no need to clutter everything else.
 # sh is fairly "special" in this regard, as virtually everyone else has
@@ -515,6 +523,7 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_athlon
 	default "i686"		if BR2_x86_athlon_4
 	default "m68k"		if BR2_m68k
+	default "microblaze"	if BR2_microblaze
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
 	default "powerpc"	if BR2_powerpc
@@ -542,10 +551,12 @@ config BR2_ARCH
 config BR2_ENDIAN
 	string
 	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \
-			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64
+			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64 || \
+			    BR2_microblazeel
 	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \
 			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \
-			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc
+			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc || \
+			    BR2_microblazebe
 
 config BR2_GCC_TARGET_TUNE
 	string

From bb7788fd861026e7772bb4f6c096e0c955a4e28e Mon Sep 17 00:00:00 2001
From: "Alvaro G. M" <alvaro.gamez@hazent.com>
Date: Fri, 16 Mar 2012 14:42:55 +0100
Subject: [PATCH 1637/6849] Microblaze: added external toolchain from Xilinx

Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
Tested-by: Stephan Hoffmann <sho@relinux.de>
Downloading Microblaze LE toolchain works on a clean install
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 21 +++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  6 ++++++
 2 files changed, 27 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 24cad9c0ef..014bfc5836 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -432,6 +432,25 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
 
+config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
+	bool "Xilinx Little Endian Microblaze GNU Tools"
+	depends on BR2_microblazeel
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_INET_RPC
+	select BR2_ENABLE_LOCALE
+	select BR2_USE_WCHAR
+	help
+	  Toolchain for the Microblaze architecture, from
+	  http://wiki.xilinx.com/mb-gnu-tools
+
+config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
+	bool "Xilinx Big Endian Microblaze GNU Tools"
+	depends on BR2_microblazebe
+	help
+	  Toolchain for the Microblaze architecture, from
+	  http://wiki.xilinx.com/mb-gnu-tools
+
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM
        bool "Custom toolchain"
        help
@@ -470,6 +489,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
+	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
+	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 3c97de16b0..51bce913b3 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -239,6 +239,12 @@ TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9517/
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
+TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0_le.git;a=blob;h=d7b493c5dbcc24ba9cc3be2e4c14d6d9701e6805;hb=00163583b771bb4e937632765dd0c5516b3e31c4;f=
+TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
+TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
 else
 # A value must be set (even if unused), otherwise the
 # $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main

From aaed42d15643e0cb64c96fa400a6097a19d19ef4 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Sat, 17 Mar 2012 10:46:55 +0100
Subject: [PATCH 1638/6849] Microblaze: build kernel with device tree

This patch adds the options needed to build the SimpleImage containing
the device tree structure needed for the Microblaze architecture.

Handling Device Tree and SimpleImage will be handled in a general way
in the future.

I provide this patch to be able to build the system in the meantime.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in |  8 ++++++++
 linux/linux.mk  | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index b89fcdc9db..a7fa89f1f4 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -120,6 +120,14 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	help
 	  Path to the kernel configuration file
 
+config BR2_LINUX_KERNEL_DTS_FILE
+    string "Device Tree dts file location"
+    depends on BR2_microblaze
+    help
+      Path from where the dts file has to be copied
+      The final "custom target" name depends on the
+      dts file name:
+          <name>.dts --> simpleImage.<name>
 #
 # Binary format
 #
diff --git a/linux/linux.mk b/linux/linux.mk
index 58cbe8e925..c0334d2b7e 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -117,6 +117,18 @@ endef
 
 LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
 
+ifeq ($(KERNEL_ARCH),microblaze)
+# on microblaze, we always want mkimage
+LINUX_DEPENDENCIES+=host-uboot-tools
+
+define LINUX_COPY_DTS
+    if test -f "$(BR2_LINUX_KERNEL_DTS_FILE)" ; then \
+        cp $(BR2_LINUX_KERNEL_DTS_FILE) $(@D)/arch/microblaze/boot/dts ; \
+    else \
+        echo "Cannot copy dts file!" ; \
+    fi
+endef
+endif
 
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
 KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
@@ -131,6 +143,8 @@ define LINUX_CONFIGURE_CMDS
 	$(if $(BR2_ARM_EABI),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
 		$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
+    $(if $(BR2_microblaze),
+        $(call LINUX_COPY_DTS))
 	# As the kernel gets compiled before root filesystems are
 	# built, we create a fake cpio file. It'll be
 	# replaced later by the real cpio archive, and the kernel will be
@@ -215,6 +229,8 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	# Copy the kernel image to its final destination
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
+	# If there is a .ub file copy it to the final destination
+	test -f $(LINUX_IMAGE_PATH).ub && cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
 	$(Q)touch $@
 
 # The initramfs building code must make sure this target gets called

From 49084a198247575650c155b6f5f147fb034becc5 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Sat, 17 Mar 2012 10:46:56 +0100
Subject: [PATCH 1639/6849] Microblaze: added defconfig for Avnet S6LX9
 Microboard

The Avnet S6LX9 Microboard is a small USB-Stick sized module
containing a Spartan6 FPGA capable of running the Microblaze
softcore processor together with RAM and FLASH memory.

This board support pachage assumes that the Microblaze Bitfile
available from the Avnet website is programmed into the FPGA.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/avnet/s6lx9_microboard/lx9_mmu.dts      | 247 ++++++++++++++++++
 .../avnet/s6lx9_microboard/lx9_mmu_defconfig  |  68 +++++
 board/avnet/s6lx9_microboard/readme.txt       |  70 +++++
 configs/s6lx9_microboard_defconfig            |  17 ++
 4 files changed, 402 insertions(+)
 create mode 100644 board/avnet/s6lx9_microboard/lx9_mmu.dts
 create mode 100644 board/avnet/s6lx9_microboard/lx9_mmu_defconfig
 create mode 100644 board/avnet/s6lx9_microboard/readme.txt
 create mode 100644 configs/s6lx9_microboard_defconfig

diff --git a/board/avnet/s6lx9_microboard/lx9_mmu.dts b/board/avnet/s6lx9_microboard/lx9_mmu.dts
new file mode 100644
index 0000000000..8ffedd9feb
--- /dev/null
+++ b/board/avnet/s6lx9_microboard/lx9_mmu.dts
@@ -0,0 +1,247 @@
+/*
+ * Device Tree Generator version: 1.3
+ *
+ * (C) Copyright 2007-2008 Xilinx, Inc.
+ * (C) Copyright 2007-2009 Michal Simek
+ *
+ * Michal SIMEK <monstr@monstr.eu>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * CAUTION: This file is automatically generated by libgen.
+ * Version: Xilinx EDK 13.2 EDK_O.61xd
+ *
+ * XPS project directory: device-tree_bsp_230-orig
+ */
+
+/dts-v1/;
+/ {
+    #address-cells = <1>;
+    #size-cells = <1>;
+    compatible = "xlnx,microblaze";
+    model = "testing";
+    MCB3_LPDDR: memory@80000000 {
+        device_type = "memory";
+        reg = < 0x80000000 0x4000000 >;
+    } ;
+    aliases {
+        ethernet0 = &Ethernet_MAC;
+        serial0 = &USB_Uart;
+    } ;
+    chosen {
+        bootargs = "console=ttyUL0";
+        linux,stdout-path = "/axi@0/serial@40600000";
+    } ;
+    cpus {
+        #address-cells = <1>;
+        #cpus = <0x1>;
+        #size-cells = <0>;
+        microblaze_0: cpu@0 {
+            clock-frequency = <66666667>;
+            compatible = "xlnx,microblaze-8.20.a";
+            d-cache-baseaddr = <0x80000000>;
+            d-cache-highaddr = <0x83ffffff>;
+            d-cache-line-size = <0x10>;
+            d-cache-size = <0x2000>;
+            device_type = "cpu";
+            i-cache-baseaddr = <0x80000000>;
+            i-cache-highaddr = <0x83ffffff>;
+            i-cache-line-size = <0x10>;
+            i-cache-size = <0x2000>;
+            model = "microblaze,8.20.a";
+            reg = <0>;
+            timebase-frequency = <66666667>;
+            xlnx,addr-tag-bits = <0xd>;
+            xlnx,allow-dcache-wr = <0x1>;
+            xlnx,allow-icache-wr = <0x1>;
+            xlnx,area-optimized = <0x0>;
+            xlnx,avoid-primitives = <0x0>;
+            xlnx,branch-target-cache-size = <0x0>;
+            xlnx,cache-byte-size = <0x2000>;
+            xlnx,d-axi = <0x1>;
+            xlnx,d-lmb = <0x1>;
+            xlnx,d-plb = <0x0>;
+            xlnx,data-size = <0x20>;
+            xlnx,dcache-addr-tag = <0xd>;
+            xlnx,dcache-always-used = <0x1>;
+            xlnx,dcache-byte-size = <0x2000>;
+            xlnx,dcache-data-width = <0x0>;
+            xlnx,dcache-force-tag-lutram = <0x0>;
+            xlnx,dcache-interface = <0x0>;
+            xlnx,dcache-line-len = <0x4>;
+            xlnx,dcache-use-fsl = <0x0>;
+            xlnx,dcache-use-writeback = <0x0>;
+            xlnx,dcache-victims = <0x0>;
+            xlnx,debug-enabled = <0x1>;
+            xlnx,div-zero-exception = <0x0>;
+            xlnx,dynamic-bus-sizing = <0x1>;
+            xlnx,ecc-use-ce-exception = <0x0>;
+            xlnx,edge-is-positive = <0x1>;
+            xlnx,endianness = <0x1>;
+            xlnx,family = "spartan6";
+            xlnx,fault-tolerant = <0x0>;
+            xlnx,fpu-exception = <0x0>;
+            xlnx,freq = <0x3f940ab>;
+            xlnx,fsl-data-size = <0x20>;
+            xlnx,fsl-exception = <0x0>;
+            xlnx,fsl-links = <0x0>;
+            xlnx,i-axi = <0x0>;
+            xlnx,i-lmb = <0x1>;
+            xlnx,i-plb = <0x0>;
+            xlnx,icache-always-used = <0x1>;
+            xlnx,icache-data-width = <0x0>;
+            xlnx,icache-force-tag-lutram = <0x0>;
+            xlnx,icache-interface = <0x0>;
+            xlnx,icache-line-len = <0x4>;
+            xlnx,icache-streams = <0x0>;
+            xlnx,icache-use-fsl = <0x0>;
+            xlnx,icache-victims = <0x0>;
+            xlnx,ill-opcode-exception = <0x0>;
+            xlnx,instance = "microblaze_0";
+            xlnx,interconnect = <0x2>;
+            xlnx,interconnect-m-axi-dc-aw-register = <0x0>;
+            xlnx,interconnect-m-axi-dc-read-issuing = <0x2>;
+            xlnx,interconnect-m-axi-dc-w-register = <0x0>;
+            xlnx,interconnect-m-axi-dc-write-issuing = <0x20>;
+            xlnx,interconnect-m-axi-dp-read-issuing = <0x1>;
+            xlnx,interconnect-m-axi-dp-write-issuing = <0x1>;
+            xlnx,interconnect-m-axi-ic-read-issuing = <0x2>;
+            xlnx,interconnect-m-axi-ip-read-issuing = <0x1>;
+            xlnx,interrupt-is-edge = <0x0>;
+            xlnx,lockstep-slave = <0x0>;
+            xlnx,mmu-dtlb-size = <0x1>;
+            xlnx,mmu-itlb-size = <0x1>;
+            xlnx,mmu-privileged-instr = <0x0>;
+            xlnx,mmu-tlb-access = <0x3>;
+            xlnx,mmu-zones = <0x2>;
+            xlnx,number-of-pc-brk = <0x1>;
+            xlnx,number-of-rd-addr-brk = <0x0>;
+            xlnx,number-of-wr-addr-brk = <0x0>;
+            xlnx,opcode-0x0-illegal = <0x0>;
+            xlnx,optimization = <0x0>;
+            xlnx,pvr = <0x0>;
+            xlnx,pvr-user1 = <0x0>;
+            xlnx,pvr-user2 = <0x0>;
+            xlnx,reset-msr = <0x0>;
+            xlnx,sco = <0x0>;
+            xlnx,stream-interconnect = <0x0>;
+            xlnx,unaligned-exceptions = <0x0>;
+            xlnx,use-barrel = <0x1>;
+            xlnx,use-branch-target-cache = <0x0>;
+            xlnx,use-dcache = <0x1>;
+            xlnx,use-div = <0x0>;
+            xlnx,use-ext-brk = <0x1>;
+            xlnx,use-ext-nm-brk = <0x1>;
+            xlnx,use-extended-fsl-instr = <0x0>;
+            xlnx,use-fpu = <0x0>;
+            xlnx,use-hw-mul = <0x1>;
+            xlnx,use-icache = <0x1>;
+            xlnx,use-interrupt = <0x1>;
+            xlnx,use-mmu = <0x3>;
+            xlnx,use-msr-instr = <0x1>;
+            xlnx,use-pcmp-instr = <0x0>;
+            xlnx,use-stack-protection = <0x0>;
+        } ;
+    } ;
+    axi4lite_0: axi@0 {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "xlnx,axi-interconnect-1.03.a", "simple-bus";
+        ranges ;
+        Ethernet_MAC: ethernet@40e00000 {
+            compatible = "xlnx,axi-ethernetlite-1.00.a", "xlnx,xps-ethernetlite-1.00.a";
+            device_type = "network";
+            interrupt-parent = <&microblaze_0_intc>;
+            interrupts = < 2 0 >;
+            local-mac-address = [ 00 0a 35 aa de 00 ];
+//            phy-handle = <&phy0>;
+            reg = < 0x40e00000 0x10000 >;
+            xlnx,duplex = <0x1>;
+            xlnx,family = "spartan6";
+            xlnx,include-global-buffers = <0x0>;
+            xlnx,include-internal-loopback = <0x0>;
+            xlnx,include-mdio = <0x1>;
+            xlnx,include-phy-constraints = <0x1>;
+            xlnx,interconnect-s-axi-read-acceptance = <0x1>;
+            xlnx,interconnect-s-axi-write-acceptance = <0x1>;
+            xlnx,rx-ping-pong = <0x0>;
+            xlnx,s-axi-aclk-period-ps = <0x3a98>;
+            xlnx,s-axi-id-width = <0x1>;
+            xlnx,s-axi-supports-narrow-burst = <0x0>;
+            xlnx,tx-ping-pong = <0x0>;
+/*
+            mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                phy0: phy@7 {
+                    compatible = "marvell,88e1111";
+                    device_type = "ethernet-phy";
+                    reg = <7>;
+                } ;
+            } ;
+*/
+        } ;
+        SPI_FLASH: spi@40a00000 {
+            compatible = "xlnx,axi-spi-1.01.a", "xlnx,xps-spi-2.00.a";
+            interrupt-parent = <&microblaze_0_intc>;
+            interrupts = < 1 2 >;
+            reg = < 0x40a00000 0x10000 >;
+            xlnx,family = "spartan6";
+            xlnx,fifo-exist = <0x1>;
+            xlnx,num-ss-bits = <0x1>;
+            xlnx,num-transfer-bits = <0x8>;
+            xlnx,sck-ratio = <0x4>;
+        } ;
+        USB_Uart: serial@40600000 {
+            clock-frequency = <66666667>;
+            compatible = "xlnx,axi-uartlite-1.02.a", "xlnx,xps-uartlite-1.00.a";
+            current-speed = <115200>;
+            device_type = "serial";
+            interrupt-parent = <&microblaze_0_intc>;
+            interrupts = < 3 0 >;
+            port-number = <0>;
+            reg = < 0x40600000 0x10000 >;
+            xlnx,baudrate = <0x1c200>;
+            xlnx,data-bits = <0x8>;
+            xlnx,family = "spartan6";
+            xlnx,odd-parity = <0x1>;
+            xlnx,s-axi-aclk-freq-hz = <0x3f940ab>;
+            xlnx,use-parity = <0x0>;
+        } ;
+        microblaze_0_intc: interrupt-controller@41200000 {
+            #interrupt-cells = <0x2>;
+            compatible = "xlnx,axi-intc-1.01.a", "xlnx,xps-intc-1.00.a";
+            interrupt-controller ;
+            reg = < 0x41200000 0x10000 >;
+            xlnx,kind-of-intr = <0xc>;
+            xlnx,num-intr-inputs = <0x4>;
+        } ;
+        system_timer: timer@41c00000 {
+            clock-frequency = <66666667>;
+            compatible = "xlnx,axi-timer-1.02.a", "xlnx,xps-timer-1.00.a";
+            interrupt-parent = <&microblaze_0_intc>;
+            interrupts = < 0 2 >;
+            reg = < 0x41c00000 0x10000 >;
+            xlnx,count-width = <0x20>;
+            xlnx,family = "spartan6";
+            xlnx,gen0-assert = <0x1>;
+            xlnx,gen1-assert = <0x1>;
+            xlnx,one-timer-only = <0x0>;
+            xlnx,trig0-assert = <0x1>;
+            xlnx,trig1-assert = <0x1>;
+        } ;
+    } ;
+} ;
diff --git a/board/avnet/s6lx9_microboard/lx9_mmu_defconfig b/board/avnet/s6lx9_microboard/lx9_mmu_defconfig
new file mode 100644
index 0000000000..5d01ca00a1
--- /dev/null
+++ b/board/avnet/s6lx9_microboard/lx9_mmu_defconfig
@@ -0,0 +1,68 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
+CONFIG_INITRAMFS_COMPRESSION_GZIP=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_HOTPLUG is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+# CONFIG_SIGNALFD is not set
+# CONFIG_SHMEM is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_OPT_LIB_ASM is not set
+CONFIG_KERNEL_BASE_ADDR=0x80000000
+CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan6"
+CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
+# CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR is not set
+CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
+CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
+CONFIG_XILINX_MICROBLAZE0_HW_VER="8.20.a"
+CONFIG_HZ_100=y
+CONFIG_MMU=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE_FORCE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_XILINX_EMACLITE=y
+# CONFIG_INPUT is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+# CONFIG_DNOTIFY is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_CIFS=y
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_INFO=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/board/avnet/s6lx9_microboard/readme.txt b/board/avnet/s6lx9_microboard/readme.txt
new file mode 100644
index 0000000000..3cb2ce982a
--- /dev/null
+++ b/board/avnet/s6lx9_microboard/readme.txt
@@ -0,0 +1,70 @@
+This is the buildroot board support for the Avnet Spartan6 LX9 MicroBoard.
+
+The Avnet S6LX9 Microboard is a small USB-Stick sized module containing
+a Spartan6 FPGA capable of running the Microblaze softcore processor
+together with RAM and FLASH memory.
+
+The board can be bought from Avnet (avnet.com) or from Trenz Electronic
+(www.trenz-electronic.de) for a low price.
+
+To run the Linux built with buildroot you have to install the FPGA bitfile
+and u-boot as described in the tutorial AvtS6LX9MicroBoard_SW302_PetaLinux
+available on http://www.em.avnet.com/s6microboard
+
+On this site also is a forum containing information on how to build your own
+Microblaze processor for the Microboard.
+
+The image file (default name is simpleImage.lx9_mmu.ub) has to be copied
+to your tftp folder (often /tftpboot/) or can be programmed into the
+board's SPI flash.
+
+Sample session:
+
+$ make s6lx9_microboard_defconfig
+$ make
+$ cp build/linux-<version>/arch/microblaze/boot/simpleImage.lx9_mmu.ub /tftpboot/br12.2a.ub
+$ minicom
+<hit the reset button on the S6LX9 Microboard>
+
+                Icache:ON
+                Dcache:ON
+        U-Boot Start:0x83f00000
+SF: Got idcode 20 ba 18 10 01
+*** Warning - bad CRC, using default environment
+
+Net:   Xilinx_Emaclite
+MAC:   00:0a:35:00:63:37
+U-BOOT for Avnet-LX9-Microboard-AXI-tiny-13.1
+
+BOOTP broadcast 1
+DHCP client bound to address 192.168.11.122
+Hit any key to stop autoboot:  0
+U-Boot-PetaLinux> tftp br12.2a.ub
+Using Xilinx_Emaclite device
+TFTP from server 192.168.11.10; our IP address is 192.168.11.122
+Filename 'br12.2a.ub'.
+Load address: 0x80002000
+Loading: #################################################################
+         #################################################################
+         #################################################################
+         #################################################################
+         #################################################################
+         ##############################
+done
+Bytes transferred = 5207724 (4f76ac hex)
+U-Boot-PetaLinux> bootm
+## Booting kernel from Legacy Image at 80002000 ...
+   Image Name:   Linux-3.1.0
+   Image Type:   MicroBlaze Linux Kernel Image (uncompressed)
+   Data Size:    5207660 Bytes =  5 MB
+   Load Address: 80000000
+   Entry Point:  80000000
+   Verifying Checksum ... OK
+   Loading Kernel Image ... OK
+OK
+## Transferring control to Linux (at address 80000000), 0x80000000 ramdisk 0x00000000, FDT 0x00000000...
+Early console on uartlite at 0x40600000
+..... boot log skipped
+
+Welcome to Microblaze Buildroot
+Microblaze login:
diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig
new file mode 100644
index 0000000000..5011766c48
--- /dev/null
+++ b/configs/s6lx9_microboard_defconfig
@@ -0,0 +1,17 @@
+BR2_microblaze=y
+BR2_microblazeel=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="microblazeel-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig"
+BR2_LINUX_KERNEL_DTS_FILE="board/avnet/s6lx9_microboard/lx9_mmu.dts"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="simpleImage.lx9_mmu"

From b6a507c71218b797104f5ccc63316634062f22ad Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Mar 2012 23:08:01 +0100
Subject: [PATCH 1640/6849] ttcp: deprecate package

Software is ancient, upstream is missing and the package hasn't seen any
significant changes since it was added in 2003.

Unless someone steps up to update it (E.G. to gentargets), it will
be removed during the 2012.05 cycle.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                | 2 ++
 package/ttcp/Config.in | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 284707c369..44079a51c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,8 @@
 	New packages: glib-networking, lcdprog, minicom, parted,
 	zeromq
 
+	Deprecated packages: ttcp
+
 	Removed packages: ntfsprogs
 
 	Issues resolved (http://bugs.uclibc.org):
diff --git a/package/ttcp/Config.in b/package/ttcp/Config.in
index a3f5a719f1..0262fc9e33 100644
--- a/package/ttcp/Config.in
+++ b/package/ttcp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TTCP
 	bool "ttcp"
+	depends on BR2_DEPRECATED
 	help
 	  Benchmarking tool for determining TCP and UDP performance.
 

From 9bf3dc764f76d85de3c2fcb25c5a247289334bfe Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Mar 2012 23:16:49 +0100
Subject: [PATCH 1641/6849] Config.in.arch: Fix microblaze-be double quote
 issue

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 1910ff6ec6..17e0236a90 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -24,7 +24,7 @@ config BR2_m68k
 config BR2_microblazeel
 	bool "Microblaze AXI (little-endian)"
 config BR2_microblazebe
-	bool "Microblaze non-AXI (big-endian)""
+	bool "Microblaze non-AXI (big-endian)"
 config BR2_mips
 	bool "mips"
 config BR2_mipsel

From 4a7462b34de06fd941dd59ddfe02063e77f54822 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 19 Mar 2012 00:26:01 +0100
Subject: [PATCH 1642/6849] toolchain: disallow internal/ctng toolchains for
 microblaze

While there's some microblaze support in mainline gcc from 4.6.x,
there still seems to be something missing with the uClibc support, so
disable these for now.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 2f4709a421..849b8e3f8c 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,6 +10,7 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
+	depends on !BR2_microblaze
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 
@@ -22,6 +23,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
+	depends on !BR2_microblaze
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 	help

From 9c7181036756a6ace3eb22057e2a58551e514e0c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 19 Mar 2012 07:21:48 -0300
Subject: [PATCH 1643/6849] kernel-headers: bump 3.2.x stable version and add
 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 75c13cc60f..c9ec72c5af 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_2
+	default BR2_KERNEL_HEADERS_3_3
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -39,6 +39,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_2
 		bool "Linux 3.2.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_3
+		bool "Linux 3.3.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -62,6 +65,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.24"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.10"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.11"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 317352947b229af3180e1d58bafccbd210f93cec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 19 Mar 2012 07:21:49 -0300
Subject: [PATCH 1644/6849] linux: add 3.3.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index a7fa89f1f4..6510a566b0 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_3_2
+	default BR2_LINUX_KERNEL_3_3
 
-config BR2_LINUX_KERNEL_3_2
-	bool "3.2.10"
+config BR2_LINUX_KERNEL_3_3
+	bool "3.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.2.10" if BR2_LINUX_KERNEL_3_2
+	default "3.3" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f21f4d43b325c3cbad126b8f10fd24498c6af285 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 19 Mar 2012 10:23:55 +0000
Subject: [PATCH 1645/6849] Added the libtpl package

[Peter: drop _INSTALL_TARGET = NO as it installs a shared lib]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libtpl/Config.in |  6 ++++++
 package/libtpl/libtpl.mk | 11 +++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/libtpl/Config.in
 create mode 100644 package/libtpl/libtpl.mk

diff --git a/package/Config.in b/package/Config.in
index f0ce9631d1..85583c61a0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -386,6 +386,7 @@ source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
+source "package/libtpl/Config.in"
 source "package/liburcu/Config.in"
 source "package/lttng-libust/Config.in"
 source "package/orc/Config.in"
diff --git a/package/libtpl/Config.in b/package/libtpl/Config.in
new file mode 100644
index 0000000000..a2c2c2de32
--- /dev/null
+++ b/package/libtpl/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBTPL
+	bool "libtpl"
+	help
+	  Easily store and retrieve binary data in C
+
+	  http://tpl.sourceforge.net/
diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
new file mode 100644
index 0000000000..e565bb9337
--- /dev/null
+++ b/package/libtpl/libtpl.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# libtpl
+#
+#############################################################
+LIBTPL_VERSION = 1.5
+LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
+LIBTPL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tpl
+LIBTPL_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From b4f650feb23ae45a6d1e881f032307e01120ca7b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 19 Mar 2012 08:42:08 -0300
Subject: [PATCH 1646/6849] e2fsprogs: bump to version 1.42.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index f3d44f6fa8..fee6f0a1ac 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42
+E2FSPROGS_VERSION = 1.42.1
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \

From 8125e977fb752e99f65f7318ad278ecf238ed763 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Mar 2012 16:40:05 +0100
Subject: [PATCH 1647/6849] transmission: add missing host-intltool dependency

Fixes the following build problem:

checking for intltool >= 0.35.0... ./configure: line 17915: intltool-update: command not found
 found
configure: error: Your intltool is too old.  You need intltool 0.35.0 or later.
make: *** [/home/test/test/output/build/transmission-2.33/.stamp_configured] Error 1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/transmission/transmission.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index c0d763bc4f..9ffd432c25 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -8,6 +8,7 @@ TRANSMISSION_SITE = http://download.transmissionbt.com/files/
 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2
 TRANSMISSION_DEPENDENCIES = \
 	host-pkg-config \
+	host-intltool \
 	libcurl \
 	libevent \
 	openssl \

From c45d64a678fe541ff959d3a64ba8478eba041237 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Mar 2012 16:40:06 +0100
Subject: [PATCH 1648/6849] at: uses fork(), so requires MMU

Fixes the following problem:

atd.o: In function `run_file':
atd.c:(.text+0x35c): undefined reference to `fork'
atd.c:(.text+0x75c): undefined reference to `fork'
daemon.o: In function `daemon_setup':
daemon.c:(.text+0x4bc): undefined reference to `fork'
collect2: ld returned 1 exit status
make[1]: *** [atd] Error 1
make[1]: Leaving directory `/home/test/test/output/build/at-3.1.12'
make: *** [/home/test/test/output/build/at-3.1.12/.stamp_built] Error 2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/at/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/at/Config.in b/package/at/Config.in
index a5d5ef8264..d4ddcb2c62 100644
--- a/package/at/Config.in
+++ b/package/at/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AT
 	bool "at"
+	depends on BR2_USE_MMU
 	help
 	 At and batch read shell commands from standard input and
 	 store them as jobs to be scheduled for execution in the

From 0b0e23660421ebbf233cec2e9979c9c99ef007ae Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Mar 2012 16:40:07 +0100
Subject: [PATCH 1649/6849] glib-networking: add missing host-intltool
 dependency

Fixes the following problem:

checking whether NLS is requested... yes
checking for intltool >= 0.35.0... ./configure: line 12323: intltool-update: command not found
 found
configure: error: Your intltool is too old.  You need intltool 0.35.0 or later.
make: *** [/home/test/test/output/build/glib-networking-2.30.2/.stamp_configured] Error 1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/glib-networking/glib-networking.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 47415d85d6..9165835c39 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -12,7 +12,11 @@ GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 
 GLIB_NETWORKING_INSTALL_STAGING = YES
 
-GLIB_NETWORKING_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2
+GLIB_NETWORKING_DEPENDENCIES = \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	host-pkg-config \
+	host-intltool \
+	libglib2
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 GLIB_NETWORKING_DEPENDENCIES += gnutls

From b5fd0f2709cab72f48da12a5804dd8670fffbf6e Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 19 Mar 2012 16:59:35 +0100
Subject: [PATCH 1650/6849] Change the /etc/mtab symlink to use an absolute
 path

As systemd checks if /etc/mtab is a symlink to /proc/mount or
/proc/self/mounts, we need to change it so that we can run systemd.

http://cgit.freedesktop.org/systemd/tree/src/main.c#n1082

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/mtab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/skeleton/etc/mtab b/fs/skeleton/etc/mtab
index e1c204547b..4c0a0948bc 120000
--- a/fs/skeleton/etc/mtab
+++ b/fs/skeleton/etc/mtab
@@ -1 +1 @@
-../proc/mounts
\ No newline at end of file
+/proc/mounts
\ No newline at end of file

From c433c5ad7c258b9d6fd8e60dd180dfb3a3446dfa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 20 Mar 2012 09:16:42 +0100
Subject: [PATCH 1651/6849] uClibc: default to 0.9.33

This is the current stable version, and E.G. systemd doesn't build with
earlier versions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index ed9d2f5b82..64c5a9f510 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -6,7 +6,7 @@ comment "uClibc Options"
 choice
 	prompt "uClibc C library Version"
 	default BR2_UCLIBC_VERSION_0_9_31 if (BR2_avr32 || BR2_sh) # 0.9.32 broken
-	default BR2_UCLIBC_VERSION_0_9_32
+	default BR2_UCLIBC_VERSION_0_9_33
 	help
 	  Select the version of uClibc you wish to use.
 

From ea33b9b83261bb886e0d71b792d1f1ebb5c50933 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 20 Mar 2012 09:17:38 +0100
Subject: [PATCH 1652/6849] uClibc: enable utmpx support in defconfigs

It adds very little size overhead as the functions are just wrappers
around utmp, and E.G. systemd needs it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-0.9.32.config   | 2 +-
 toolchain/uClibc/uClibc-0.9.33.config   | 2 +-
 toolchain/uClibc/uClibc-snapshot.config | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config
index e9f942d63b..7f21f1c302 100644
--- a/toolchain/uClibc/uClibc-0.9.32.config
+++ b/toolchain/uClibc/uClibc-0.9.32.config
@@ -223,7 +223,7 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-# UCLIBC_HAS_UTMPX is not set
+UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
diff --git a/toolchain/uClibc/uClibc-0.9.33.config b/toolchain/uClibc/uClibc-0.9.33.config
index 2a6754c8d6..7e4e7503df 100644
--- a/toolchain/uClibc/uClibc-0.9.33.config
+++ b/toolchain/uClibc/uClibc-0.9.33.config
@@ -233,7 +233,7 @@ UCLIBC_HAS_FTW=y
 # UCLIBC_HAS_FTS is not set
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-# UCLIBC_HAS_UTMPX is not set
+UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index 2a6754c8d6..7e4e7503df 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -233,7 +233,7 @@ UCLIBC_HAS_FTW=y
 # UCLIBC_HAS_FTS is not set
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-# UCLIBC_HAS_UTMPX is not set
+UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options

From d10dddf473b6e2cce9b8a12f67a26d69c22ef747 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 07:50:27 -0300
Subject: [PATCH 1653/6849] kernel-headers: bump 3.0.x and 3.2.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.24-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.25-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index c9ec72c5af..8ea037a881 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.24"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.25"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.11"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.12"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.24-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.25-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.24-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.25-headers_install-fix-__packed-in-exported-kernel-head.patch

From 68d2124d332a722422d59988183c20d7b254d0af Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Mar 2012 12:11:04 +0100
Subject: [PATCH 1654/6849] libatomic_ops: make it available only on supported
 architectures

libatomic_ops build fails on architectures such as MIPS or SuperH that
are not supported. So we make it possible to select the libatomic_ops
package only for the architectures that are known to be supported.

[Peter: add armeb as supported arch]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libatomic_ops/Config.in | 1 +
 package/libdrm/Config.in        | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/libatomic_ops/Config.in b/package/libatomic_ops/Config.in
index b9f14d1989..3d5d0a8242 100644
--- a/package/libatomic_ops/Config.in
+++ b/package/libatomic_ops/Config.in
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_LIBATOMIC_OPS
 	bool "libatomic_ops"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_sparc || BR2_powerpc || BR2_x86_64
 	help
 	  Atomic operations library
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index d68f9d5cb8..f3dab9a2c2 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -8,7 +8,10 @@ config BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_XLIB_LIBXMU
 	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_PTHREAD_STUBS
-	select BR2_PACKAGE_LIBATOMIC_OPS if BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
+	# libatomic_ops is only available on a subset of the supported
+	# architectures, and we make the assumption that the intel
+	# driver can only be used on x86 and x86_64 machines.
+	select BR2_PACKAGE_LIBATOMIC_OPS if (BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL && (BR2_i386 || BR2_x86_64))
 	help
 	  Direct Rendering Manager
 

From b71aea910eb8c24ba1b9c6a65a6f654ffe171959 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Mar 2012 13:24:22 +0100
Subject: [PATCH 1655/6849] libsigc: bump to 2.2.10 to fix build with gcc 4.6

The build of libsigc 2.2.8 fails with gcc 4.6 with the following error
message:

In file included from signal_base.cc:20:0:
../sigc++/signal_base.h:48:11: error: 'size_t' does not name a type In file included from ../sigc++/signal.h:8:0,

The 2.2.9 version was released with a fix for this build problem, so
we directly bump to the latest version 2.2.10, which builds fine under
gcc 4.6.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsigc/libsigc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 4c443eb9fe..8c20ba31d8 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -3,7 +3,7 @@
 # libsigc++
 #
 #############################################################
-LIBSIGC_VERSION = 2.2.8
+LIBSIGC_VERSION = 2.2.10
 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.bz2
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2
 LIBSIGC_INSTALL_STAGING = YES

From 579e74b150803a51b36831b9d67ab505104a65bb Mon Sep 17 00:00:00 2001
From: "Alvaro G. M" <alvaro.gamez@hazent.com>
Date: Mon, 19 Mar 2012 22:56:06 +0100
Subject: [PATCH 1656/6849] Config.in.arch: add help and less cryptic names to
 architecture menu

[Peter: fixup s/big-endian/big endian/ as pointed out by Thomas]
Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 112 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 99 insertions(+), 13 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 17e0236a90..a2c0037b0a 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -8,40 +8,126 @@ choice
 	  Select the target architecture family to build for.
 
 config BR2_arm
-	bool "arm"
+	bool "ARM (little endian)"
+	help
+	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
+	  set architecture (ISA) developed by ARM Holdings. Little endian.
+	  http://www.arm.com/
+	  http://en.wikipedia.org/wiki/ARM
+
 config BR2_armeb
-	bool "armeb"
+	bool "ARM (big endian)"
+	help
+	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
+	  set architecture (ISA) developed by ARM Holdings. Big endian.
+	  http://www.arm.com/
+	  http://en.wikipedia.org/wiki/ARM
+
 config BR2_avr32
-	bool "avr32"
+	bool "AVR32"
 	select BR2_SOFT_FLOAT
+	help
+	  The AVR32 is a 32-bit RISC microprocessor architecture designed by
+	  Atmel.
+	  http://www.atmel.com/
+	  http://en.wikipedia.org/wiki/Avr32
+
 config BR2_bfin
-	bool "bfin"
+	bool "Blackfin"
+	help
+	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
+	  manufactured and marketed by Analog Devices.
+	  http://www.analog.com/
+	  http://en.wikipedia.org/wiki/Blackfin
+
 config BR2_i386
 	bool "i386"
+	help
+	  Intel i386 architecture compatible microprocessor
+	  http://en.wikipedia.org/wiki/I386
+
 config BR2_m68k
 	bool "m68k"
 	depends on BROKEN # ice in uclibc / inet_ntoa_r
+	help
+	  Motorola 68000 family microprocessor
+	  http://en.wikipedia.org/wiki/M68k
+
 config BR2_microblazeel
-	bool "Microblaze AXI (little-endian)"
+	bool "Microblaze AXI (little endian)"
+	help
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus
+	  based architecture (little endian)
+	  http://www.xilinx.com
+	  http://en.wikipedia.org/wiki/Microblaze
+
 config BR2_microblazebe
-	bool "Microblaze non-AXI (big-endian)"
+	bool "Microblaze non-AXI (big endian)"
+	help
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus
+	  based architecture (non-AXI, big endian)
+	  http://www.xilinx.com
+	  http://en.wikipedia.org/wiki/Microblaze
+
 config BR2_mips
-	bool "mips"
+	bool "MIPS (big endian)"
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
 config BR2_mipsel
-	bool "mipsel"
+	bool "MIPS (little endian)"
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
 config BR2_powerpc
-	bool "powerpc"
+	bool "PowerPC"
+	help
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
+	  http://www.power.org/
+	  http://en.wikipedia.org/wiki/Powerpc
+
 config BR2_sh
-	bool "superh"
+	bool "SuperH"
+	help
+	  SuperH (or SH) is a 32-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by Hitachi.
+	  http://www.hitachi.com/
+	  http://en.wikipedia.org/wiki/SuperH
+
 config BR2_sh64
-	bool "superh64"
+	bool "SuperH64"
+	help
+	  SuperH64 (or SH) is a 64-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by Hitachi.
+	  http://www.hitachi.com/
+	  http://en.wikipedia.org/wiki/SuperH
+
 config BR2_sparc
-	bool "sparc"
+	bool "SPARC"
+	help
+	  SPARC (from Scalable Processor Architecture) is a RISC instruction
+	  set architecture (ISA) developed by Sun Microsystems.
+	  http://www.oracle.com/sun
+	  http://en.wikipedia.org/wiki/Sparc
+
 config BR2_x86_64
 	bool "x86_64"
 	select BR2_ARCH_IS_64
+	help
+	  x86-64 is an extension of the x86 instruction set (Intel i386
+	  architecture compatible microprocessor).
+	  http://en.wikipedia.org/wiki/X86_64
+
 config BR2_xtensa
-	bool "xtensa"
+	bool "Xtensa"
+	help
+	  Xtensa is a Tensilica processor IP architecture.
+	  http://en.wikipedia.org/wiki/Xtensa
+	  http://www.tensilica.com/
 endchoice
 
 config BR2_microblaze

From a7773ea4127b292172cbc7dd9507167dd0d3d3f4 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 14 Mar 2012 16:33:53 +0100
Subject: [PATCH 1657/6849] apply-patches.sh: rename targetdir to builddir

targetdir is not the output/target directory as it can suggest.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index e418cb6ec0..908ce22ecf 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -6,13 +6,13 @@
 # (c) 2002 Erik Andersen <andersen@codepoet.org>
 
 # Set directories from arguments, or use defaults.
-targetdir=${1-.}
+builddir=${1-.}
 patchdir=${2-../kernel-patches}
 shift 2
 patchpattern=${@-*}
 
-if [ ! -d "${targetdir}" ] ; then
-    echo "Aborting.  '${targetdir}' is not a directory."
+if [ ! -d "${builddir}" ] ; then
+    echo "Aborting.  '${builddir}' is not a directory."
     exit 1
 fi
 if [ ! -d "${patchdir}" ] ; then
@@ -22,8 +22,8 @@ fi
 
 # Remove any rejects present BEFORE patching - Because if there are
 # any, even if patches are well applied, at the end it will complain
-# about rejects in targetdir.
-find ${targetdir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \
+# about rejects in builddir.
+find ${builddir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \
     xargs -0 -r rm -f
 
 for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do 
@@ -54,8 +54,8 @@ for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
     esac fi
     echo ""
     echo "Applying ${i} using ${type}: " 
-	echo ${i} | cat >> ${targetdir}/.applied_patches_list
-    ${uncomp} ${patchdir}/${i} ${uncomp_parm} | ${apply} ${targetdir} 
+	echo ${i} | cat >> ${builddir}/.applied_patches_list
+    ${uncomp} ${patchdir}/${i} ${uncomp_parm} | ${apply} ${builddir}
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix $i!"
 	exit 1
@@ -63,10 +63,10 @@ for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
 done
 
 # Check for rejects...
-if [ "`find $targetdir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
+if [ "`find $builddir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
     echo "Aborting.  Reject files found."
     exit 1
 fi
 
 # Remove backup files
-find $targetdir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
+find $builddir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;

From 1b671d477bc3154c1c72e2a770b8a97e4566a359 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 14 Mar 2012 16:33:54 +0100
Subject: [PATCH 1658/6849] apply-patches.sh: cleanup

Add quoting and remove redundant command.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 908ce22ecf..c741a6320c 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -54,8 +54,8 @@ for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
     esac fi
     echo ""
     echo "Applying ${i} using ${type}: " 
-	echo ${i} | cat >> ${builddir}/.applied_patches_list
-    ${uncomp} ${patchdir}/${i} ${uncomp_parm} | ${apply} ${builddir}
+	echo ${i} >> ${builddir}/.applied_patches_list
+    ${uncomp} "${patchdir}/${i}" ${uncomp_parm} | ${apply} "${builddir}"
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix $i!"
 	exit 1

From 1b58957a9637d3b3d1ae13ec26096d737fdd1a45 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 14 Mar 2012 16:33:55 +0100
Subject: [PATCH 1659/6849] apply-patches.sh: directories are no more
 considered as overlays

When a directory is found in patchdir, it is skipped.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index c741a6320c..3d655f144a 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -30,10 +30,7 @@ for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
     apply="patch -g0 -p1 -E -d"
     uncomp_parm=""
     if [ -d "${patchdir}/$i" ] ; then
-	type="directory overlay"
-	uncomp="tar cf - --exclude=.svn --no-anchored -C"
-	uncomp_parm="."
-	apply="tar xvf - -C"
+	echo "${patchdir}/$i skipped"
     else case "$i" in
 	*.gz)
 	type="gzip"; uncomp="gunzip -dc"; ;; 

From 4f9e82da2a7d30f7e9e39238a3a2f0bd021a7be4 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 14 Mar 2012 16:33:56 +0100
Subject: [PATCH 1660/6849] apply-patches.sh: change archive management

The way archives were managed was incorrect because the uncompressed archives
were sent directly to the patch command. It means that alphabetical patch
order was not respected.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 48 +++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 3d655f144a..1f632aa88b 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -26,12 +26,10 @@ fi
 find ${builddir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \
     xargs -0 -r rm -f
 
-for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do 
-    apply="patch -g0 -p1 -E -d"
-    uncomp_parm=""
-    if [ -d "${patchdir}/$i" ] ; then
-	echo "${patchdir}/$i skipped"
-    else case "$i" in
+function apply_patch {
+    path=$1
+    patch=$2
+    case "$patch" in
 	*.gz)
 	type="gzip"; uncomp="gunzip -dc"; ;; 
 	*.bz)
@@ -42,22 +40,40 @@ for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
 	type="zip"; uncomp="unzip -d"; ;; 
 	*.Z)
 	type="compress"; uncomp="uncompress -c"; ;; 
-	*.tgz)
-	type="tar gzip"; uncomp="gunzip -dc"; apply="tar xvf - -C"; ;; 
-	*.tar)
-	type="tar"; uncomp="cat"; apply="tar xvf - -C"; ;; 
 	*)
 	type="plaintext"; uncomp="cat"; ;; 
-    esac fi
+    esac
     echo ""
-    echo "Applying ${i} using ${type}: " 
-	echo ${i} >> ${builddir}/.applied_patches_list
-    ${uncomp} "${patchdir}/${i}" ${uncomp_parm} | ${apply} "${builddir}"
+    echo "Applying $patch using ${type}: "
+	echo $patch >> ${builddir}/.applied_patches_list
+    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}"
     if [ $? != 0 ] ; then
-        echo "Patch failed!  Please fix $i!"
+        echo "Patch failed!  Please fix ${patch}!"
 	exit 1
     fi
-done
+}
+
+function scan_patchdir {
+    path=$1
+    shift 1
+    patches=${@-*}
+
+    for i in `cd $path; ls -d $patches 2> /dev/null` ; do
+        if [ -d "${path}/$i" ] ; then
+            echo "${path}/$i skipped"
+        elif echo "$i" | grep -q -E "\.tar(\..*)?$|\.tbz2?$|\.tgz$" ; then
+            unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked"
+            rm -rf "$unpackedarchivedir" 2> /dev/null
+            mkdir "$unpackedarchivedir"
+            tar -C "$unpackedarchivedir" --strip-components=1 -xaf "${path}/$i"
+            scan_patchdir "$unpackedarchivedir"
+        else
+            apply_patch "$path" "$i" || exit 1
+        fi
+    done
+}
+
+scan_patchdir $patchdir $patchpattern
 
 # Check for rejects...
 if [ "`find $builddir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then

From 6c29e50c94241e5179e0075fc15dab6c073f0d6f Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 14 Mar 2012 16:33:57 +0100
Subject: [PATCH 1661/6849] apply-patches.sh: use series file to apply patches
 in proper order

If a series file is present use it to determine the proper order to apply
patches instead of using ls sorting order.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
add a series file with a wrong patch order into an archive containing several
patches whose correct order is the alphabetical one
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 1f632aa88b..968e2a406c 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -58,19 +58,27 @@ function scan_patchdir {
     shift 1
     patches=${@-*}
 
-    for i in `cd $path; ls -d $patches 2> /dev/null` ; do
-        if [ -d "${path}/$i" ] ; then
-            echo "${path}/$i skipped"
-        elif echo "$i" | grep -q -E "\.tar(\..*)?$|\.tbz2?$|\.tgz$" ; then
-            unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked"
-            rm -rf "$unpackedarchivedir" 2> /dev/null
-            mkdir "$unpackedarchivedir"
-            tar -C "$unpackedarchivedir" --strip-components=1 -xaf "${path}/$i"
-            scan_patchdir "$unpackedarchivedir"
-        else
+    # If there is a series file, use it instead of using ls sort order
+    # to apply patches. Skip line starting with a dash.
+    if [ -e "${path}/series" ] ; then
+        for i in `grep -Ev "^#" ${path}/series 2> /dev/null` ; do
             apply_patch "$path" "$i" || exit 1
-        fi
-    done
+        done
+    else
+        for i in `cd $path; ls -d $patches 2> /dev/null` ; do
+            if [ -d "${path}/$i" ] ; then
+                echo "${path}/$i skipped"
+            elif echo "$i" | grep -q -E "\.tar(\..*)?$|\.tbz2?$|\.tgz$" ; then
+                unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked"
+                rm -rf "$unpackedarchivedir" 2> /dev/null
+                mkdir "$unpackedarchivedir"
+                tar -C "$unpackedarchivedir" --strip-components=1 -xaf "${path}/$i"
+                scan_patchdir "$unpackedarchivedir"
+            else
+                apply_patch "$path" "$i" || exit 1
+            fi
+        done
+    fi
 }
 
 scan_patchdir $patchdir $patchpattern

From 8402bc658afb7c6e9856f8dbe753388c64e53da3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Mar 2012 09:09:18 +0100
Subject: [PATCH 1662/6849] parted: make sure to select libuuid in util-linux

parted correctly depends on util-linux, but fails to select the
libuuid suboption of util-linux, causing the following build failure
if libuuid remains unselected:

checking for uuid_generate in -luuid... no
configure: error: GNU Parted requires libuuid - a part of the util-linux-ng package (but
usually distributed separately in libuuid-devel, uuid-dev or similar)
This can probably be found on your distribution's CD or FTP site or at:
    http://userweb.kernel.org/~kzak/util-linux-ng/
Note: originally, libuuid was part of the e2fsprogs package.  Later, it
moved to util-linux-ng-2.16, and that package is now the preferred source.
make: *** [/home/test/test/output/build/parted-3.1/.stamp_configured] Error 1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/parted/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/parted/Config.in b/package/parted/Config.in
index 610c04022f..7349763bd1 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_PARTED
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
 	  parted, the GNU partition resizing program
 

From 832b1ef746e7df252ff42b19f6083f3716f70eb9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Mar 2012 09:17:46 +0100
Subject: [PATCH 1663/6849] liburcu: only some architectures are supported

Make sure that liburcu (and the packages that select it) cannot be
enabled on the architectures that are not supported. At the moment,
only x86, x86-64, PowerPC and ARM are supported.

[Peter: add armeb as well]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liburcu/Config.in      | 1 +
 package/lttng-libust/Config.in | 2 ++
 package/lttng-tools/Config.in  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in
index 5a6e4b226b..69878b18c4 100644
--- a/package/liburcu/Config.in
+++ b/package/liburcu/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBURCU
 	bool "liburcu"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	help
 	  Userspace implementation of the Read-Copy-Update (RCU)
 	  synchronization mechanism. This library is mainly used by
diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in
index ae74bedf10..ab1296367a 100644
--- a/package/lttng-libust/Config.in
+++ b/package/lttng-libust/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	# util-linux needs wchar and largefile
 	depends on BR2_USE_WCHAR
 	depends on BR2_LARGEFILE
+	# liburcu only works on some architectures
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	help
 	  Userspace tracing library for the Lttng tracing
 	  infrastructure. It allows userspace programs to create
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index 3040af6129..b8547578b8 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -3,6 +3,8 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	depends on BR2_PACKAGE_LTTNG_MODULES
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_POPT
+	# liburcu only works on some architectures
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	help
 	  Userspace utilities for the LTTng 2.0 tracing
 	  infrastructure.

From 23d73ece1f04eaf633b45da5ffc42fe7e706e049 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 14:12:29 +0000
Subject: [PATCH 1664/6849] libupnp: bump to version 1.6.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libupnp/libupnp-1.6.15-no-ipv6.patch  | 23 +++++++++++++++++++
 .../libupnp-1.6.6-remove-sys_timeb.h.patch    | 11 ---------
 package/libupnp/libupnp.mk                    |  9 ++++----
 3 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 package/libupnp/libupnp-1.6.15-no-ipv6.patch
 delete mode 100644 package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch

diff --git a/package/libupnp/libupnp-1.6.15-no-ipv6.patch b/package/libupnp/libupnp-1.6.15-no-ipv6.patch
new file mode 100644
index 0000000000..929c309ba7
--- /dev/null
+++ b/package/libupnp/libupnp-1.6.15-no-ipv6.patch
@@ -0,0 +1,23 @@
+Fix missing knob to properly disable IPv6 support when headers lack it.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libupnp-1.6.15/upnp/src/ssdp/ssdp_device.c libupnp-1.6.15-noipv6/upnp/src/ssdp/ssdp_device.c
+--- libupnp-1.6.15/upnp/src/ssdp/ssdp_device.c	2011-11-04 19:33:59.000000000 -0300
++++ libupnp-1.6.15-noipv6/upnp/src/ssdp/ssdp_device.c	2012-03-20 21:00:26.274098343 -0300
+@@ -199,6 +199,7 @@
+ 		setsockopt(ReplySock, IPPROTO_IP, IP_MULTICAST_TTL,
+ 			   (char *)&ttl, sizeof(int));
+ 		socklen = sizeof(struct sockaddr_in);
++#ifdef UPNP_ENABLE_IPV6
+ 	} else if (DestAddr->sa_family == AF_INET6) {
+ 		inet_ntop(AF_INET6,
+ 			  &((struct sockaddr_in6 *)DestAddr)->sin6_addr,
+@@ -207,6 +208,7 @@
+ 			   (char *)&gIF_INDEX, sizeof(gIF_INDEX));
+ 		setsockopt(ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
+ 			   (char *)&hops, sizeof(hops));
++#endif
+ 	} else {
+ 		UpnpPrintf(UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+ 			   "Invalid destination address specified.");
diff --git a/package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch b/package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch
deleted file mode 100644
index e425392449..0000000000
--- a/package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN libupnp-1.6.6-0rig/configure libupnp-1.6.6/configure
---- libupnp-1.6.6-0rig/configure	2008-04-25 13:47:24.000000000 +0200
-+++ libupnp-1.6.6/configure	2009-01-14 21:55:16.000000000 +0100
-@@ -21096,7 +21096,6 @@
- 	sys/ioctl.h \
- 	sys/socket.h \
- 	sys/time.h \
--	sys/timeb.h \
- 	syslog.h \
- 	unistd.h \
- 
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index d5b4ee12cf..1fa07ca79b 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -3,12 +3,11 @@
 # libupnp
 #
 #############################################################
-LIBUPNP_VERSION:=1.6.6
-LIBUPNP_SOURCE:=libupnp-$(LIBUPNP_VERSION).tar.bz2
-LIBUPNP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pupnp
 
+LIBUPNP_VERSION = 1.6.15
+LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
+LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
-
-LIBUPNP_INSTALL_STAGING:=YES
+LIBUPNP_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From c9ccdf877a6a5af54ac8b6d2809361ed1ddcc221 Mon Sep 17 00:00:00 2001
From: Markus Kaindl <markus.kaindl@stusta.mhn.de>
Date: Wed, 21 Mar 2012 02:19:04 +0100
Subject: [PATCH 1665/6849] linux.mk: .ub-File copying after building initramfs

test should exit with Exit-Code 0 if no .ub-File present and copy the
file if Exit-Code 1, otherwise make fails

Signed-off-by: Markus Kaindl <markus.kaindl@stusta.mhn.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index c0334d2b7e..6cb1efc86a 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -230,7 +230,7 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI
 	# Copy the kernel image to its final destination
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 	# If there is a .ub file copy it to the final destination
-	test -f $(LINUX_IMAGE_PATH).ub && cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
+	test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
 	$(Q)touch $@
 
 # The initramfs building code must make sure this target gets called

From 64ac7199525f3dbd0ce49f7ec31715a2a1b63725 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Wed, 21 Mar 2012 14:26:27 +0100
Subject: [PATCH 1666/6849] apply-patches.sh: add recursivity when scanning
 patchdir

Recursivity is needed with some tarballs containing debian patches:
.
  debian
    changelog
    control
    patches
      02-COPYRIGHT.patch
[...]

Since we can find some files which are not patches in those directories, only
consider .patch* and .diff* files as valid patches.
Due to recursivity, strip-components option is no more necessary so it has
been removed.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 968e2a406c..e4b98bc057 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -40,8 +40,14 @@ function apply_patch {
 	type="zip"; uncomp="unzip -d"; ;; 
 	*.Z)
 	type="compress"; uncomp="uncompress -c"; ;; 
+	*.diff*)
+	type="diff"; uncomp="cat"; ;;
+	*.patch*)
+	type="patch"; uncomp="cat"; ;;
 	*)
-	type="plaintext"; uncomp="cat"; ;; 
+	echo "Unsupported format file for ${patch}, skip it";
+	return 0;
+	;;
     esac
     echo ""
     echo "Applying $patch using ${type}: "
@@ -67,12 +73,12 @@ function scan_patchdir {
     else
         for i in `cd $path; ls -d $patches 2> /dev/null` ; do
             if [ -d "${path}/$i" ] ; then
-                echo "${path}/$i skipped"
+                scan_patchdir "${path}/$i"
             elif echo "$i" | grep -q -E "\.tar(\..*)?$|\.tbz2?$|\.tgz$" ; then
                 unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked"
                 rm -rf "$unpackedarchivedir" 2> /dev/null
                 mkdir "$unpackedarchivedir"
-                tar -C "$unpackedarchivedir" --strip-components=1 -xaf "${path}/$i"
+                tar -C "$unpackedarchivedir" -xaf "${path}/$i"
                 scan_patchdir "$unpackedarchivedir"
             else
                 apply_patch "$path" "$i" || exit 1

From bfd26038c5eeac1483387598be82c4c22f463de9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 21 Mar 2012 09:02:31 -0300
Subject: [PATCH 1667/6849] libupnp: move to version 1.6.14

As pointed by Sagaert Johan in the mailing list and further testing version
1.6.15 has some issues.
So move to version 1.6.14 which is far more stable and compliant.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ibupnp-1.6.15-no-ipv6.patch => libupnp-1.6.14-no-ipv6.patch} | 0
 package/libupnp/libupnp.mk                                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/libupnp/{libupnp-1.6.15-no-ipv6.patch => libupnp-1.6.14-no-ipv6.patch} (100%)

diff --git a/package/libupnp/libupnp-1.6.15-no-ipv6.patch b/package/libupnp/libupnp-1.6.14-no-ipv6.patch
similarity index 100%
rename from package/libupnp/libupnp-1.6.15-no-ipv6.patch
rename to package/libupnp/libupnp-1.6.14-no-ipv6.patch
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 1fa07ca79b..5ac68c38a7 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBUPNP_VERSION = 1.6.15
+LIBUPNP_VERSION = 1.6.14
 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
 LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no

From 74783996061c54374ae3b947e2ee9703f8f59e5b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:06 -0300
Subject: [PATCH 1668/6849] qemu/sh4-r2d: update to use kernel 3.2.12

Unfortunately kernel 3.3 doesn't seem to work properly at the moment.
So lock down headers to version 3.2.x and kernel to 3.2.12.
Tested on qemu 1.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 8794b181d4..e344e716ba 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -10,6 +10,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Avoid 3.3+ headers
+BR2_KERNEL_HEADERS_3_2=y
+
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
 BR2_GCC_VERSION_4_5_X=y
@@ -18,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 13ce37ccc9eca4db21f925b043fdba6ba6e874a1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:07 -0300
Subject: [PATCH 1669/6849] qemu/arm-versatile: update to use kernel 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qemu/arm-versatile/{linux-3.2.config => linux-3.3.config} | 0
 configs/qemu_arm_versatile_defconfig                          | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.2.config b/board/qemu/arm-versatile/linux-3.3.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.2.config
rename to board/qemu/arm-versatile/linux-3.3.config
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index fdc2e72b66..f2c30b10a0 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 97b46132e6d149759988562acb0cc6a74c6890b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:08 -0300
Subject: [PATCH 1670/6849] qemu/mipsel-malta: update to use kernel 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qemu/mipsel-malta/{linux-3.2.config => linux-3.3.config}  | 0
 configs/qemu_mipsel_malta_defconfig                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/mipsel-malta/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-3.2.config b/board/qemu/mipsel-malta/linux-3.3.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.2.config
rename to board/qemu/mipsel-malta/linux-3.3.config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 0ccd4e6ab9..99d9cbad4e 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From ba51dccedf83f8ed072ffa2906e1a72419bf95ed Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:09 -0300
Subject: [PATCH 1671/6849] qemu/mips-malta: update to use kernel 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/mips-malta/{linux-3.2.config => linux-3.3.config} | 0
 configs/qemu_mips_malta_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/mips-malta/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/mips-malta/linux-3.2.config b/board/qemu/mips-malta/linux-3.3.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.2.config
rename to board/qemu/mips-malta/linux-3.3.config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index db94790755..2dc3f70278 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From f9d51149dfb631134df4afc4dc408c0d5ed2eee3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:10 -0300
Subject: [PATCH 1672/6849] qemu/ppc-g3beige: update to use kernel 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../powerpc-g3beige/{linux-3.2.config => linux-3.3.config}    | 0
 configs/qemu_ppc_g3beige_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-3.2.config b/board/qemu/powerpc-g3beige/linux-3.3.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.2.config
rename to board/qemu/powerpc-g3beige/linux-3.3.config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 432a74617b..a20d3e433f 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From ed1bdc37413961800987bddfce9cef28229becfe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:11 -0300
Subject: [PATCH 1673/6849] qemu/sparc-ss10: update to use kernel 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 6d69379166..77250f8aa7 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -9,6 +9,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 7815993d8a9745695d638e34509c97a708a84d5d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:12 -0300
Subject: [PATCH 1674/6849] qemu/x86_64: update to use kernel 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86_64/{linux-3.2.config => linux-3.3.config} | 0
 configs/qemu_x86_64_defconfig                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/x86_64/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.2.config b/board/qemu/x86_64/linux-3.3.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.2.config
rename to board/qemu/x86_64/linux-3.3.config
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 6da334c780..3c72b367aa 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -12,6 +12,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"

From 1775ca03a09c96613c7740c9954d33c420231031 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 20 Mar 2012 23:45:13 -0300
Subject: [PATCH 1675/6849] qemu/x86: update to use kernel 3.3

Also switch documentation to use qemu-system-i386

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-3.2.config => linux-3.3.config} | 0
 board/qemu/x86/readme.txt                             | 2 +-
 configs/qemu_x86_defconfig                            | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename board/qemu/x86/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/x86/linux-3.2.config b/board/qemu/x86/linux-3.3.config
similarity index 100%
rename from board/qemu/x86/linux-3.2.config
rename to board/qemu/x86/linux-3.3.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index c06d24faae..4ba6607f31 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -1,5 +1,5 @@
 Run the emulation with:
 
-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
 
 The login prompt will appear in the graphical window.
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index d20850a7f3..5d0e23b996 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -13,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"

From 5b84ec26c8981c6ab0e119b455e807152ded449a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 21 Mar 2012 12:02:36 +0100
Subject: [PATCH 1676/6849] libconfig: bump to 1.4.8 and cleanup

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfig/libconfig.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 03825e1261..8ef927b3db 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -3,13 +3,12 @@
 # libconfig
 #
 #############################################################
-LIBCONFIG_VERSION:=1.4.6
-LIBCONFIG_SOURCE:=libconfig-$(LIBCONFIG_VERSION).tar.gz
-LIBCONFIG_SITE:=http://www.hyperrealm.com/libconfig/
-LIBCONFIG_INSTALL_STAGING:=YES
+LIBCONFIG_VERSION = 1.4.8
+LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig/
+LIBCONFIG_INSTALL_STAGING = YES
 
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
-LIBCONFIG_CONF_OPT:=--disable-cxx
+LIBCONFIG_CONF_OPT = --disable-cxx
 endif
 
 $(eval $(call AUTOTARGETS))

From 8fce69fd2f42290d0794b4cc823312d4205ff9dc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 22 Mar 2012 11:57:15 +0100
Subject: [PATCH 1677/6849] kmod: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 028d351637..f71087c659 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 6
+KMOD_VERSION = 7
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From d0c4b0266491ae06d3b423a28bda50336a82bb5a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 22 Mar 2012 15:32:57 +0100
Subject: [PATCH 1678/6849] kmod: adjust upstream URL

kmod still doesn't have a real website, but git tree moved to
kernel.org, so update help to match.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/kmod/Config.in b/package/kmod/Config.in
index f83237e2dd..c5e8ca819c 100644
--- a/package/kmod/Config.in
+++ b/package/kmod/Config.in
@@ -3,5 +3,4 @@ config BR2_PACKAGE_KMOD
 	help
 	  handle kernel modules
 
-	  http://git.profusion.mobi/cgit.cgi/kmod.git/
-
+	  http://git.kernel.org/?p=utils/kernel/kmod/kmod.git

From 78f5ac2908b30aa6f67583a355e058d6703755ac Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 22 Mar 2012 16:02:14 +0100
Subject: [PATCH 1679/6849] kmod: add option to install module utilities

And ensure optional zlib+xz dependencies gets picked up.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/Config.in |  6 ++++++
 package/kmod/kmod.mk   | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/package/kmod/Config.in b/package/kmod/Config.in
index c5e8ca819c..6fdd92c445 100644
--- a/package/kmod/Config.in
+++ b/package/kmod/Config.in
@@ -4,3 +4,9 @@ config BR2_PACKAGE_KMOD
 	  handle kernel modules
 
 	  http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
+
+config BR2_PACKAGE_KMOD_TOOLS
+	bool "kmod utilities"
+	help
+	  Install kmod module utilities (depmod, insmod, lsmod,
+	  modinfo, modprobe, rmmod).
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index f71087c659..55cbdbbfd0 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -4,4 +4,30 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkg-config
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+KMOD_DEPENDENCIES += zlib
+KMOD_CONF_OPT += --with-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_XZ),y)
+KMOD_DEPENDENCIES += xz
+KMOD_CONF_OPT += --with-xz
+endif
+
+ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
+# take precedence over busybox / module-init-tools implementations
+KMOD_DEPENDENCIES += \
+	$(if $(BR2_PACKAGE_BUSYBOX),busybox) \
+	$(if $(BR2_PACKAGE_MODULE_INIT_TOOLS),module-init-tools)
+
+define KMOD_INSTALL_TOOLS
+	for i in depmod insmod lsmod modinfo modprobe rmmod; \
+	do ln -sf ../usr/bin/kmod $(TARGET_DIR)/sbin/$$i; done
+endef
+
+KMOD_POST_INSTALL_TARGET_HOOKS += KMOD_INSTALL_TOOLS
+else
+KMOD_CONF_OPT += --disable-tools
+endif
+
 $(eval $(call AUTOTARGETS))

From f3354649819e5012538217c8aea842b36846534d Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 22 Mar 2012 07:13:36 +0200
Subject: [PATCH 1680/6849] poco: bump to 1.4.3p1

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/poco.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 5d07972d8b..ddb5b258e8 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -3,7 +3,7 @@
 # poco
 #
 #############################################################
-POCO_VERSION = 1.4.2p1
+POCO_VERSION = 1.4.3p1
 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
 POCO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poco
 POCO_INSTALL_STAGING = YES

From 5347910b9d60cdd11cf7c4dc7dbfdd4cebacb651 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 22 Mar 2012 22:47:59 +0100
Subject: [PATCH 1681/6849] kmod: only show tools option if BUSYBOX_SHOW_OTHERS

As pointed out by Arnout.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/kmod/Config.in b/package/kmod/Config.in
index 6fdd92c445..26c2c6dd4a 100644
--- a/package/kmod/Config.in
+++ b/package/kmod/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_KMOD
 
 config BR2_PACKAGE_KMOD_TOOLS
 	bool "kmod utilities"
+	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
 	  Install kmod module utilities (depmod, insmod, lsmod,
 	  modinfo, modprobe, rmmod).

From bdd73ea91717390637fdcaf17606f78590543238 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 22 Mar 2012 16:00:59 +0100
Subject: [PATCH 1682/6849] New package: socketcand

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/socketcand/Config.in     |  8 ++++++++
 package/socketcand/socketcand.mk | 11 +++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/socketcand/Config.in
 create mode 100644 package/socketcand/socketcand.mk

diff --git a/package/Config.in b/package/Config.in
index 85583c61a0..b394f18680 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -504,6 +504,7 @@ source "package/rsync/Config.in"
 source "package/samba/Config.in"
 source "package/ser2net/Config.in"
 source "package/socat/Config.in"
+source "package/socketcand/Config.in"
 source "package/spawn-fcgi/Config.in"
 source "package/squid/Config.in"
 source "package/stunnel/Config.in"
diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
new file mode 100644
index 0000000000..0d1d983a59
--- /dev/null
+++ b/package/socketcand/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SOCKETCAND
+	bool "socketcand"
+	select BR2_PACKAGE_LIBCONFIG
+	help
+	  Socketcand is a daemon that provides access to CAN interfaces
+	  on a machine via a network interface.
+
+	  https://github.com/dschanoeh/socketcand
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
new file mode 100644
index 0000000000..97ab876dbe
--- /dev/null
+++ b/package/socketcand/socketcand.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# socketcand
+#
+#############################################################
+SOCKETCAND_VERSION = 7d06986fa4b5fd2c210ec4e248dab41107be1ccd
+SOCKETCAND_SITE = git://github.com/dschanoeh/socketcand.git
+SOCKETCAND_AUTORECONF = YES
+SOCKETCAND_DEPENDENCIES = libconfig
+
+$(eval $(call AUTOTARGETS))

From 6496d03156784646c501974b4aa2c89a7930f444 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 22 Mar 2012 16:01:00 +0100
Subject: [PATCH 1683/6849] udev: bump to 182

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/udev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index d445a2f08f..85f625452a 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 181
+UDEV_VERSION = 182
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_INSTALL_STAGING = YES

From 9127ab6eaa8ed4477850dd62470ac3c80f440eef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 24 Mar 2012 21:20:42 +0100
Subject: [PATCH 1684/6849] pango: fix compilation with glib 2.30

G_CONST_RETURN is deprecated in glib 2.30, so remove occurences
to avoid build failures.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pango/pango-no-const-return.patch | 475 ++++++++++++++++++++++
 1 file changed, 475 insertions(+)
 create mode 100644 package/pango/pango-no-const-return.patch

diff --git a/package/pango/pango-no-const-return.patch b/package/pango/pango-no-const-return.patch
new file mode 100644
index 0000000000..a0749a42e9
--- /dev/null
+++ b/package/pango/pango-no-const-return.patch
@@ -0,0 +1,475 @@
+From 4b060ca43c9605be2fdb219a379f8a17c33b0d98 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Thu, 9 Jun 2011 11:36:59 -0400
+Subject: [PATCH] Stop using G_CONST_RETURN in Pango
+
+Upstream: 4c7807daee7189f48
+
+G_CONST_RETURN is headed for deprecation (as per bug #644611).  Stop
+using it in Pango.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652202
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ modules/hebrew/hebrew-shaper.c |    2 +-
+ pango/fonts.c                  |    6 +++---
+ pango/pango-attributes.c       |    2 +-
+ pango/pango-attributes.h       |    2 +-
+ pango/pango-context.c          |    2 +-
+ pango/pango-context.h          |    6 +++---
+ pango/pango-font.h             |    6 +++---
+ pango/pango-fontmap.c          |    2 +-
+ pango/pango-language.c         |    6 +++---
+ pango/pango-language.h         |    6 +++---
+ pango/pango-layout.c           |    4 ++--
+ pango/pango-layout.h           |    2 +-
+ pango/pango-ot-ruleset.c       |    2 +-
+ pango/pango-renderer.c         |    2 +-
+ pango/pango-renderer.h         |    2 +-
+ pango/pango-script.c           |    8 ++++----
+ pango/pango-script.h           |   12 ++++++------
+ pango/pango-utils.c            |    4 ++--
+ pango/pango-utils.h            |   12 ++++++------
+ pango/pangocairo-context.c     |    4 ++--
+ pango/pangoft2.c               |    2 +-
+ pango/pangox-fontmap.c         |    4 ++--
+ 22 files changed, 49 insertions(+), 49 deletions(-)
+
+diff --git a/modules/hebrew/hebrew-shaper.c b/modules/hebrew/hebrew-shaper.c
+index 8aa3638..db3055b 100644
+--- a/modules/hebrew/hebrew-shaper.c
++++ b/modules/hebrew/hebrew-shaper.c
+@@ -167,7 +167,7 @@ static const gboolean compose_table[4][4] = {
+ #define	is_composible(cur_wc, nxt_wc)	(compose_table[char_type_table[ucs2iso8859_8 (cur_wc)]]\
+ 						      [char_type_table[ucs2iso8859_8 (nxt_wc)]])
+ 
+-G_CONST_RETURN char *
++const char *
+ hebrew_shaper_get_next_cluster(const char      *text,
+ 			       gint		length,
+ 			       gunichar        *cluster,
+diff --git a/pango/fonts.c b/pango/fonts.c
+index ab5397a..d9de7de 100644
+--- a/pango/fonts.c
++++ b/pango/fonts.c
+@@ -165,7 +165,7 @@ pango_font_description_set_family_static (PangoFontDescription *desc,
+  *               %NULL if not previously set.  This has the same life-time
+  *               as the font description itself and should not be freed.
+  **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_description_get_family (const PangoFontDescription *desc)
+ {
+   g_return_val_if_fail (desc != NULL, NULL);
+@@ -1927,7 +1927,7 @@ pango_font_family_init (PangoFontFamily *family G_GNUC_UNUSED)
+  * Return value: the name of the family. This string is owned
+  *   by the family object and must not be modified or freed.
+  **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_family_get_name (PangoFontFamily  *family)
+ {
+   g_return_val_if_fail (PANGO_IS_FONT_FAMILY (family), NULL);
+@@ -2060,7 +2060,7 @@ pango_font_face_is_synthesized (PangoFontFace  *face)
+  * Return value: the face name for the face. This string is
+  *   owned by the face object and must not be modified or freed.
+  **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_face_get_face_name (PangoFontFace *face)
+ {
+   g_return_val_if_fail (PANGO_IS_FONT_FACE (face), NULL);
+diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
+index 28c11de..373fba1 100644
+--- a/pango/pango-attributes.c
++++ b/pango/pango-attributes.c
+@@ -97,7 +97,7 @@ pango_attr_type_register (const gchar *name)
+  *
+  * Since: 1.22
+  **/
+-G_CONST_RETURN char *
++const char *
+ pango_attr_type_get_name (PangoAttrType type)
+ {
+   const char *result = NULL;
+diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
+index 866e35d..59f97a3 100644
+--- a/pango/pango-attributes.h
++++ b/pango/pango-attributes.h
+@@ -180,7 +180,7 @@ struct _PangoAttrFontDesc
+ };
+ 
+ PangoAttrType         pango_attr_type_register (const gchar        *name);
+-G_CONST_RETURN char * pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
++const char *          pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
+ 
+ void             pango_attribute_init        (PangoAttribute       *attr,
+ 					      const PangoAttrClass *klass);
+diff --git a/pango/pango-context.c b/pango/pango-context.c
+index 6ec0b56..3c9442a 100644
+--- a/pango/pango-context.c
++++ b/pango/pango-context.c
+@@ -188,7 +188,7 @@ pango_context_set_matrix (PangoContext       *context,
+  *
+  * Since: 1.6
+  **/
+-G_CONST_RETURN PangoMatrix *
++const PangoMatrix *
+ pango_context_get_matrix (PangoContext *context)
+ {
+   g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL);
+diff --git a/pango/pango-context.h b/pango/pango-context.h
+index d8c3cb8..d85928a 100644
+--- a/pango/pango-context.h
++++ b/pango/pango-context.h
+@@ -84,9 +84,9 @@ void                      pango_context_set_gravity_hint     (PangoContext
+ 							      PangoGravityHint            hint);
+ PangoGravityHint          pango_context_get_gravity_hint     (PangoContext               *context);
+ 
+-void                        pango_context_set_matrix (PangoContext      *context,
+-						      const PangoMatrix *matrix);
+-G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext      *context);
++void                      pango_context_set_matrix           (PangoContext      *context,
++						              const PangoMatrix *matrix);
++const PangoMatrix *       pango_context_get_matrix           (PangoContext      *context);
+ 
+ /* Break a string of Unicode characters into segments with
+  * consistent shaping/language engine and bidrectional level.
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index b5b2cf1..eea27b4 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -117,7 +117,7 @@ void                 pango_font_description_set_family        (PangoFontDescript
+ 							       const char           *family);
+ void                 pango_font_description_set_family_static (PangoFontDescription *desc,
+ 							       const char           *family);
+-G_CONST_RETURN char *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
++const char          *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
+ void                 pango_font_description_set_style         (PangoFontDescription *desc,
+ 							       PangoStyle            style);
+ PangoStyle           pango_font_description_get_style         (const PangoFontDescription *desc) G_GNUC_PURE;
+@@ -212,7 +212,7 @@ GType      pango_font_family_get_type       (void) G_GNUC_CONST;
+ void                 pango_font_family_list_faces (PangoFontFamily  *family,
+ 						   PangoFontFace  ***faces,
+ 						   int              *n_faces);
+-G_CONST_RETURN char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
++const char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
+ gboolean   pango_font_family_is_monospace         (PangoFontFamily  *family) G_GNUC_PURE;
+ 
+ #ifdef PANGO_ENABLE_BACKEND
+@@ -261,7 +261,7 @@ struct _PangoFontFamilyClass
+ GType      pango_font_face_get_type       (void) G_GNUC_CONST;
+ 
+ PangoFontDescription *pango_font_face_describe       (PangoFontFace  *face);
+-G_CONST_RETURN char  *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
++const char           *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
+ void                  pango_font_face_list_sizes     (PangoFontFace  *face,
+ 						      int           **sizes,
+ 						      int            *n_sizes);
+diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
+index 13f4263..78b1692 100644
+--- a/pango/pango-fontmap.c
++++ b/pango/pango-fontmap.c
+@@ -290,7 +290,7 @@ pango_font_map_real_load_fontset (PangoFontMap               *fontmap,
+  *
+  * Since: 1.4
+  **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
+ {
+   g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
+diff --git a/pango/pango-language.c b/pango/pango-language.c
+index bfde308..2bb294e 100644
+--- a/pango/pango-language.c
++++ b/pango/pango-language.c
+@@ -319,7 +319,7 @@ pango_language_from_string (const char *language)
+  * Returns: a string representing the language tag.  This is owned by
+  *          Pango and should not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ (pango_language_to_string) (PangoLanguage *language)
+ {
+   return pango_language_to_string (language);
+@@ -531,7 +531,7 @@ static const LangInfo lang_texts[] = {
+  * Return value: the sample string. This value is owned by Pango
+  *   and should not be freed.
+  **/
+-G_CONST_RETURN char *
++const char *
+ pango_language_get_sample_string (PangoLanguage *language)
+ {
+   const LangInfo *lang_info;
+@@ -592,7 +592,7 @@ pango_language_get_sample_string (PangoLanguage *language)
+  
+  * Since: 1.22
+  **/
+-G_CONST_RETURN PangoScript *
++const PangoScript *
+ pango_language_get_scripts (PangoLanguage *language,
+ 			    int           *num_scripts)
+ {
+diff --git a/pango/pango-language.h b/pango/pango-language.h
+index 37cdc16..31660ca 100644
+--- a/pango/pango-language.h
++++ b/pango/pango-language.h
+@@ -34,11 +34,11 @@ typedef struct _PangoLanguage PangoLanguage;
+ GType          pango_language_get_type    (void) G_GNUC_CONST;
+ PangoLanguage *pango_language_from_string (const char *language);
+ 
+-G_CONST_RETURN char *pango_language_to_string   (PangoLanguage *language) G_GNUC_CONST;
++const char    *pango_language_to_string   (PangoLanguage *language) G_GNUC_CONST;
+ /* For back compat.  Will have to keep indefinitely. */
+ #define pango_language_to_string(language) ((const char *)language)
+ 
+-G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
++const char    *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
+ PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
+ 
+ gboolean      pango_language_matches  (PangoLanguage *language,
+@@ -48,7 +48,7 @@ gboolean      pango_language_matches  (PangoLanguage *language,
+ 
+ gboolean		    pango_language_includes_script (PangoLanguage *language,
+ 							    PangoScript    script) G_GNUC_PURE;
+-G_CONST_RETURN PangoScript *pango_language_get_scripts	   (PangoLanguage *language,
++const PangoScript          *pango_language_get_scripts	   (PangoLanguage *language,
+ 							    int           *num_scripts);
+ 
+ G_END_DECLS
+diff --git a/pango/pango-layout.c b/pango/pango-layout.c
+index 12f9dee..2dc0c17 100644
+--- a/pango/pango-layout.c
++++ b/pango/pango-layout.c
+@@ -677,7 +677,7 @@ pango_layout_set_font_description (PangoLayout                 *layout,
+  *
+  * Since: 1.8
+  **/
+-G_CONST_RETURN PangoFontDescription *
++const PangoFontDescription *
+ pango_layout_get_font_description (PangoLayout *layout)
+ {
+   g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+@@ -1087,7 +1087,7 @@ pango_layout_set_text (PangoLayout *layout,
+  *
+  * Return value: the text in the @layout.
+  **/
+-G_CONST_RETURN char*
++const char*
+ pango_layout_get_text (PangoLayout *layout)
+ {
+   g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+diff --git a/pango/pango-layout.h b/pango/pango-layout.h
+index 3b769ff..d786dc6 100644
+--- a/pango/pango-layout.h
++++ b/pango/pango-layout.h
+@@ -116,7 +116,7 @@ void           pango_layout_set_markup_with_accel (PangoLayout    *layout,
+ void           pango_layout_set_font_description (PangoLayout                *layout,
+ 						  const PangoFontDescription *desc);
+ 
+-G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
++const PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
+ 
+ void           pango_layout_set_width            (PangoLayout                *layout,
+ 						  int                         width);
+diff --git a/pango/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c
+index b5e2795..8fe7b72 100644
+--- a/pango/pango-ot-ruleset.c
++++ b/pango/pango-ot-ruleset.c
+@@ -107,7 +107,7 @@ pango_ot_ruleset_finalize (GObject *object)
+  *
+  * Since: 1.18
+  **/
+-G_CONST_RETURN PangoOTRuleset *
++const PangoOTRuleset *
+ pango_ot_ruleset_get_for_description (PangoOTInfo                     *info,
+ 				      const PangoOTRulesetDescription *desc)
+ {
+diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
+index db75446..a1fea5e 100644
+--- a/pango/pango-renderer.c
++++ b/pango/pango-renderer.c
+@@ -1352,7 +1352,7 @@ pango_renderer_set_matrix (PangoRenderer     *renderer,
+  *
+  * Since: 1.8
+  **/
+-G_CONST_RETURN PangoMatrix *
++const PangoMatrix *
+ pango_renderer_get_matrix (PangoRenderer *renderer)
+ {
+   g_return_val_if_fail (PANGO_IS_RENDERER (renderer), NULL);
+diff --git a/pango/pango-renderer.h b/pango/pango-renderer.h
+index 354127b..5410a9f 100644
+--- a/pango/pango-renderer.h
++++ b/pango/pango-renderer.h
+@@ -249,7 +249,7 @@ PangoColor *pango_renderer_get_color (PangoRenderer    *renderer,
+ 
+ void                        pango_renderer_set_matrix (PangoRenderer     *renderer,
+ 						       const PangoMatrix *matrix);
+-G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer     *renderer);
++const PangoMatrix          *pango_renderer_get_matrix (PangoRenderer     *renderer);
+ 
+ PangoLayout     *pango_renderer_get_layout      (PangoRenderer     *renderer);
+ PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer     *renderer);
+diff --git a/pango/pango-script.c b/pango/pango-script.c
+index 605e46e..1d57a69 100644
+--- a/pango/pango-script.c
++++ b/pango/pango-script.c
+@@ -164,10 +164,10 @@ pango_script_iter_free (PangoScriptIter *iter)
+  * Since: 1.4
+  **/
+ void
+-pango_script_iter_get_range (PangoScriptIter      *iter,
+-			     G_CONST_RETURN char **start,
+-			     G_CONST_RETURN char **end,
+-			     PangoScript          *script)
++pango_script_iter_get_range (PangoScriptIter  *iter,
++                             const char      **start,
++                             const char      **end,
++                             PangoScript      *script)
+ {
+   if (start)
+     *start = iter->script_start;
+diff --git a/pango/pango-script.h b/pango/pango-script.h
+index 32ef737..ef5f698 100644
+--- a/pango/pango-script.h
++++ b/pango/pango-script.h
+@@ -128,12 +128,12 @@ PangoScript pango_script_for_unichar         (gunichar             ch) G_GNUC_CO
+ 
+ PangoScriptIter *pango_script_iter_new       (const char          *text,
+ 					      int                  length);
+-void             pango_script_iter_get_range (PangoScriptIter      *iter,
+-					      G_CONST_RETURN char **start,
+-					      G_CONST_RETURN char **end,
+-					      PangoScript          *script);
+-gboolean         pango_script_iter_next      (PangoScriptIter      *iter);
+-void             pango_script_iter_free      (PangoScriptIter      *iter);
++void             pango_script_iter_get_range (PangoScriptIter     *iter,
++                                              const char         **start,
++                                              const char         **end,
++                                              PangoScript         *script);
++gboolean         pango_script_iter_next      (PangoScriptIter     *iter);
++void             pango_script_iter_free      (PangoScriptIter     *iter);
+ 
+ #include <pango/pango-language.h>
+ 
+diff --git a/pango/pango-utils.c b/pango/pango-utils.c
+index 100dbc7..71deeef 100644
+--- a/pango/pango-utils.c
++++ b/pango/pango-utils.c
+@@ -689,7 +689,7 @@ DllMain (HINSTANCE hinstDLL,
+  * Return value: the Pango sysconf directory. The returned string should
+  * not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ pango_get_sysconf_subdirectory (void)
+ {
+ #ifdef G_OS_WIN32
+@@ -718,7 +718,7 @@ pango_get_sysconf_subdirectory (void)
+  * Return value: the Pango lib directory. The returned string should
+  * not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ pango_get_lib_subdirectory (void)
+ {
+ #ifdef G_OS_WIN32
+diff --git a/pango/pango-utils.h b/pango/pango-utils.h
+index 41a8bbb..f86c662 100644
+--- a/pango/pango-utils.h
++++ b/pango/pango-utils.h
+@@ -82,13 +82,13 @@ gboolean pango_parse_stretch (const char   *str,
+  * stored in the registry). The returned string should not be
+  * g_free'd.
+  */
+-G_CONST_RETURN char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
++const char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
+ 
+ /* Ditto for LIBDIR/pango. On Win32, use the same Pango
+  * installation directory. This returned string should not be
+  * g_free'd either.
+  */
+-G_CONST_RETURN char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
++const char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
+ 
+ #endif /* PANGO_ENABLE_BACKEND */
+ 
+@@ -131,12 +131,12 @@ gboolean pango_is_zero_width (gunichar ch) G_GNUC_CONST;
+ int pango_version (void) G_GNUC_CONST;
+ 
+ /* Return run-time Pango version as an string */
+-G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
++const char * pango_version_string (void) G_GNUC_CONST;
+ 
+ /* Check that run-time Pango is as new as required */
+-G_CONST_RETURN char * pango_version_check (int required_major,
+-					   int required_minor,
+-					   int required_micro) G_GNUC_CONST;
++const char * pango_version_check (int required_major,
++                                  int required_minor,
++                                  int required_micro) G_GNUC_CONST;
+ 
+ G_END_DECLS
+ 
+diff --git a/pango/pangocairo-context.c b/pango/pangocairo-context.c
+index 69432f0..f61e839 100644
+--- a/pango/pangocairo-context.c
++++ b/pango/pangocairo-context.c
+@@ -260,7 +260,7 @@ pango_cairo_context_set_font_options (PangoContext               *context,
+  *
+  * Since: 1.10
+  **/
+-G_CONST_RETURN cairo_font_options_t *
++const cairo_font_options_t *
+ pango_cairo_context_get_font_options (PangoContext *context)
+ {
+   PangoCairoContextInfo *info;
+@@ -286,7 +286,7 @@ pango_cairo_context_get_font_options (PangoContext *context)
+  * Return value: the combined set of font options. This value is owned
+  * by the context and must not be modified or freed.
+  **/
+-G_CONST_RETURN cairo_font_options_t *
++const cairo_font_options_t *
+ _pango_cairo_context_get_merged_font_options (PangoContext *context)
+ {
+   PangoCairoContextInfo *info = get_context_info (context, TRUE);
+diff --git a/pango/pangoft2.c b/pango/pangoft2.c
+index f4a3864..b41c468 100644
+--- a/pango/pangoft2.c
++++ b/pango/pangoft2.c
+@@ -520,7 +520,7 @@ ft_error_compare (const void *pkey,
+   return ((ft_error_description *) pkey)->code - ((ft_error_description *) pbase)->code;
+ }
+ 
+-G_CONST_RETURN char *
++const char *
+ _pango_ft2_ft_strerror (FT_Error error)
+ {
+ #undef __FTERRORS_H__
+diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
+index 6d5e547..3f5343f 100644
+--- a/pango/pangox-fontmap.c
++++ b/pango/pangox-fontmap.c
+@@ -1441,7 +1441,7 @@ pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
+ }
+ 
+ 
+-G_CONST_RETURN char *
++const char *
+ pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
+ 				Atom          atom)
+ {
+@@ -1645,7 +1645,7 @@ pango_x_family_list_faces (PangoFontFamily  *family,
+     }
+ }
+ 
+-static G_CONST_RETURN char *
++static const char *
+ pango_x_family_get_name (PangoFontFamily  *family)
+ {
+   PangoXFamily *xfamily = PANGO_X_FAMILY (family);
+-- 
+1.7.8.3
+

From 7a70788a2207af8ed97bbd26effaf5e461faf8af Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Mar 2012 09:06:17 +0200
Subject: [PATCH 1685/6849] microperl: fix MICROPERL_INSTALL_TARGET_CMDS

The MICROPERL_INSTALL_TARGET_CMDS used the following construct in a
for loop:

		[ -d $(@D)/lib/$$j ] && cp -af $(@D)/lib/$$j \
			$(TARGET_DIR)/$(MICROPERL_MODS_DIR) ; \
		[ -f $(@D)/lib/$$i ] && $(INSTALL) -m 0644 -D $(@D)/lib/$$i \
			$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \

The problem is that when at the last iteration, the second test (-f)
fails, then the whole loop ends with a non-zero error code, and makes
aborts the build. This happens for example if the last Perl modules in
the list is Time::Local, because such modules are taken care of by the
first condition (that copies a complete directory).

By moving to full if statements, we ensure that the return code is
zero even if the condition was false.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/microperl/microperl.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index d5b5a7c4e5..5bf4a2e4d5 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -132,10 +132,12 @@ define MICROPERL_INSTALL_TARGET_CMDS
 	$(MICROPERL_BUILD_EXTENSIONS)
 	for i in $(MICROPERL_MODS); do \
 		j=`echo $$i|cut -d : -f 1` ; \
-		[ -d $(@D)/lib/$$j ] && cp -af $(@D)/lib/$$j \
-			$(TARGET_DIR)/$(MICROPERL_MODS_DIR) ; \
-		[ -f $(@D)/lib/$$i ] && $(INSTALL) -m 0644 -D $(@D)/lib/$$i \
-			$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+		if [ -d $(@D)/lib/$$j ] ; then \
+			cp -af $(@D)/lib/$$j $(TARGET_DIR)/$(MICROPERL_MODS_DIR) ; \
+		fi ; \
+		if [ -f $(@D)/lib/$$i ] ; then \
+			$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+		fi ; \
 	done
 	# Remove test files
 	find $(TARGET_DIR)/$(MICROPERL_MODS_DIR) -type f -name *.t \

From d0e5eb281f0e3b323ecb3446c1b16baf7f3baa69 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Mar 2012 17:11:36 +0200
Subject: [PATCH 1686/6849] libxml-parser-perl: fix host-intltool breakage when
 microperl is enabled

Microperl will build host-microperl and install it into HOST_DIR/usr/bin,
where other packages will pick it up as _CONFIGURE_OPTS / _MAKE_ENV
prepends that to the path.

libxml-parser-perl didn't though, so it would still be built against
the system perl, causing host-intltool to fail when it would use
host-microperl together with libxml-parser-perl if the system perl
isn't compatible with host-microperl.

Fix it by using HOST_CONFIGURE_OPTS and ensuring it is built after
(host-)microperl if enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml-parser-perl/libxml-parser-perl.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 9e6f2ecc85..1022302bb9 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -9,9 +9,15 @@ LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/
 
 LIBXML_PARSER_PERL_DEPENDENCIES = expat
 
+ifeq ($(BR2_PACKAGE_MICROPERL),y)
+# microperl builds host-microperl, so ensure we build after that to build
+# against host-microperl instead of the system perl
+LIBXML_PARSER_PERL_DEPENDENCIES += microperl
+endif
+
 define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
  (cd $(@D) ; \
-   perl Makefile.PL \
+   $(HOST_CONFIGURE_OPTS) perl Makefile.PL \
         PREFIX=$(HOST_DIR)/usr \
         EXPATLIBPATH=$(HOST_DIR)/usr/lib \
         EXPATINCPATH=$(HOST_DIR)/usr/include \

From a3daa6f785285ee2354a55b55189930f18eb36a8 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 24 Mar 2012 09:14:44 +0000
Subject: [PATCH 1687/6849] Fix problem with undefined umode_t type in 3.3
 kernel headers

The 3.3 kernel headers define the umode_t type within a __KERNEL__
preprocessor ifdef region. This results in a broken kernel header in the
buildroot toolchain.

[Peter: This is discussed upstream here:
https://bugzilla.kernel.org/show_bug.cgi?id=42986
Long term socat/syslinux should stop using this header, but this hasn't
been fixed upstream yet]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../linux-3.3-fix-umode_t.patch               | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 toolchain/kernel-headers/linux-3.3-fix-umode_t.patch

diff --git a/toolchain/kernel-headers/linux-3.3-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3-fix-umode_t.patch
new file mode 100644
index 0000000000..9663662254
--- /dev/null
+++ b/toolchain/kernel-headers/linux-3.3-fix-umode_t.patch
@@ -0,0 +1,22 @@
+Fix a problem with the 3.3 kernel headers. Specifically, the umode_t type
+is defined within a __KERNEL__ preprocessor ifdef region, and so the type
+is not usable by non-kernel code. Visit the following URL for more details.
+
+* http://www.spinics.net/lists/linux-fsdevel/msg52638.html
+
+The commit that created the problem can be seen at the following URL.
+
+* http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commitdiff;h=0583fcc96bb117763c0fa74c123573c0112dec65
+
+diff -Nur a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
+--- a/include/linux/ext2_fs.h	2012-03-18 23:15:34.000000000 +0000
++++ b/include/linux/ext2_fs.h	2012-03-21 11:47:53.015548437 +0000
+@@ -209,7 +209,7 @@
+ #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL)
+ 
+ /* Mask out flags that are inappropriate for the given type of inode. */
+-static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
++static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags)
+ {
+ 	if (S_ISDIR(mode))
+ 		return flags;

From 11c20ebf77c4320c22ee5b97732fbfd6b5269106 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:24:57 -0300
Subject: [PATCH 1688/6849] gawk: bump to version 4.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/gawk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index f1a6472101..8f374cb00b 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GAWK_VERSION = 4.0.0
+GAWK_VERSION = 4.0.1
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_TARGET_BINS = awk gawk igawk pgawk
 

From 94058fc3dbf113fd607ee491dd6cfced83950c63 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:24:58 -0300
Subject: [PATCH 1689/6849] coreutils: bump to version 8.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/coreutils/coreutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 0a85586c55..b2cca39280 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-COREUTILS_VERSION = 8.15
+COREUTILS_VERSION = 8.16
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
 

From 180c7126dfe19ba7c22ae414d4d99501152f13ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:25:00 -0300
Subject: [PATCH 1690/6849] tftp-hpa: bump to version 5.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tftpd/tftpd.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 728319b27f..80f293596c 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -3,9 +3,10 @@
 # tftpd
 #
 #############################################################
-TFTPD_VERSION  = 5.0
+
+TFTPD_VERSION  = 5.2
 TFTPD_SOURCE   = tftp-hpa-$(TFTPD_VERSION).tar.bz2
-TFTPD_SITE     = $(BR2_KERNEL_MIRROR)/software/network/tftp/
+TFTPD_SITE     = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
 TFTPD_CONF_OPT = --without-tcpwrappers
 
 ifneq ($(BR2_INET_IPV6),y)

From 92459d7378b4d9034f0c7b7265861570a8782e5a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:25:02 -0300
Subject: [PATCH 1691/6849] sqlite: bump to version 3.7.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 18617e86a2..2065ce12b5 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071000
+SQLITE_VERSION = 3071100
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From 61d3d740dba46f469ea368b9080091ce614455a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:25:03 -0300
Subject: [PATCH 1692/6849] sudo: bump to version 1.8.4p4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index f10d294e17..71d7a20a71 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.7.8p1
+SUDO_VERSION = 1.8.4p4
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
-
 SUDO_CONF_OPT = \
 		--without-lecture \
 		--without-sendmail \
@@ -16,9 +15,11 @@ SUDO_CONF_OPT = \
 		--without-pam
 
 define SUDO_INSTALL_TARGET_CMDS
-	install -m 4555 -D $(@D)/sudo $(TARGET_DIR)/usr/bin/sudo
-	install -m 0555 -D $(@D)/visudo $(TARGET_DIR)/usr/sbin/visudo
-	install -m 0440 -D $(@D)/sudoers $(TARGET_DIR)/etc/sudoers
+	install -m 4555 -D $(@D)/src/sudo $(TARGET_DIR)/usr/bin/sudo
+	install -m 0555 -D $(@D)/plugins/sudoers/visudo  \
+		$(TARGET_DIR)/usr/sbin/visudo
+	install -m 0440 -D $(@D)/plugins/sudoers/sudoers \
+		$(TARGET_DIR)/etc/sudoers
 endef
 
 $(eval $(call AUTOTARGETS))

From 13ee02d0635005a8a3e917cf29d5b277328d6df5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Mar 2012 22:21:43 +0200
Subject: [PATCH 1693/6849] syslinux: add upstream URL

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/syslinux/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index 60f3b8f9cd..1928651ba3 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -5,6 +5,8 @@ config BR2_TARGET_SYSLINUX
 	  The syslinux bootloader for x86 systems.
 	  This includes: syslinux, pxelinux, extlinux.
 
+	  http://syslinux.org
+
 config BR2_TARGET_SYSLINUX_ISOLINUX
 	bool "Install isolinux"
 	depends on BR2_TARGET_SYSLINUX

From 953b0f4de8ebcb5b42c8da760c025873ce82550d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:25:01 -0300
Subject: [PATCH 1694/6849] psmisc: bump to version 22.16

[Peter: Don't disable stack protection if toolchain has ssp support]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../psmisc/psmisc-link-against-libintl.patch  | 38 ++++---------------
 package/psmisc/psmisc.mk                      |  9 ++++-
 2 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/package/psmisc/psmisc-link-against-libintl.patch b/package/psmisc/psmisc-link-against-libintl.patch
index fca49c616a..907e7e75bd 100644
--- a/package/psmisc/psmisc-link-against-libintl.patch
+++ b/package/psmisc/psmisc-link-against-libintl.patch
@@ -14,44 +14,20 @@ the "autopoint" program, which itself depends on CVS being installed,
 for some strange reasons. That's the reason why we fall back to the
 hacky solution of modifying the Makefile.in file.
 
-Forward-ported Thomas's patch to psmisc 22.14
+Forward-ported Thomas's patch to psmisc 22.16
 from commit f066ed70cd6939838d4057f66798cbc1d972cc73
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura psmisc-22.14.orig/src/Makefile.in psmisc-22.14/src/Makefile.in
---- psmisc-22.14.orig/src/Makefile.in	2011-10-12 12:12:09.711983726 -0300
-+++ psmisc-22.14/src/Makefile.in	2011-10-12 12:14:01.733350322 -0300
-@@ -70,16 +70,16 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT)
- fuser_OBJECTS = $(am_fuser_OBJECTS)
--fuser_LDADD = $(LDADD)
-+fuser_LDADD = $(LDADD) @INTLLIBS@
- am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT)
- killall_OBJECTS = $(am_killall_OBJECTS)
+diff -Nura psmisc-22.16.orig/src/Makefile.in psmisc-22.16/src/Makefile.in
+--- psmisc-22.16.orig/src/Makefile.in	2012-03-28 22:27:33.106660358 -0300
++++ psmisc-22.16/src/Makefile.in	2012-03-28 22:28:55.752219349 -0300
+@@ -76,7 +76,7 @@
  killall_DEPENDENCIES =
  am_peekfd_OBJECTS = peekfd.$(OBJEXT)
  peekfd_OBJECTS = $(am_peekfd_OBJECTS)
 -peekfd_LDADD = $(LDADD)
-+peekfd_LDADD = $(LDADD) @INTLLIBS@
++peekfd_LDADD = $(LDADD) @LIBINTL@
  am_prtstat_OBJECTS = prtstat.$(OBJEXT)
  prtstat_OBJECTS = $(am_prtstat_OBJECTS)
--prtstat_LDADD = $(LDADD)
-+prtstat_LDADD = $(LDADD) @INTLLIBS@
- am_pstree_OBJECTS = pstree.$(OBJEXT)
- pstree_OBJECTS = $(am_pstree_OBJECTS)
- pstree_DEPENDENCIES =
-@@ -217,10 +217,10 @@
- 	$(am__append_10)
- fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
- killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
--killall_LDADD = @SELINUX_LIB@
-+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
- peekfd_SOURCES = peekfd.c
- pstree_SOURCES = pstree.c comm.h i18n.h
--pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
-+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
- prtstat_SOURCES = prtstat.c prtstat.h
- BUILT_SOURCES = signames.h
- EXTRA_DIST = signames.c 
+ prtstat_DEPENDENCIES =
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index df116fc949..0b0e0465cb 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -4,10 +4,15 @@
 #
 #############################################################
 
-PSMISC_VERSION = 22.14
-PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
+PSMISC_VERSION = 22.16
+PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/psmisc/psmisc
 PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
+ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
+# Don't force -fstack-protector
+PSMISC_CONF_OPT = --disable-harden-flags
+endif
+
 # build after busybox, we prefer fat versions while we're at it
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 PSMISC_DEPENDENCIES += busybox

From 1b7f5285fbf6b03c14d48d614ae3ade91868f954 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Mar 2012 00:22:47 +0200
Subject: [PATCH 1695/6849] toolchain: add linaro 2012.03 external ARM
 toolchain

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 014bfc5836..991684fc06 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,20 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
+	bool "Linaro 2012.03"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.03 (based on gcc 4.6), Linaro GDB 2012.03, eglibc
+	  2.13. It generates code that runs on all Cortex-A profile
+	  devices, but tuned for the Cortex-A9. The code generated is
+	  Thumb 2, with the softfp calling convention, and uses the
+	  VFPv3-D16 FPU instructions.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
 	bool "Linaro 2012.02"
 	depends on BR2_arm
@@ -484,6 +498,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
+	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 51bce913b3..0a997a5931 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -197,6 +197,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.01-20120125_linux.ta
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02),y)
 TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.02/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.02-20120222_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03),y)
+TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.03/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.03-20120326_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 4bff1dde4b753e986c36858dd9e6afd04eb054ac Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 30 Mar 2012 09:04:52 +0100
Subject: [PATCH 1696/6849] libxml-parser-perl: Pass USE_MM_LD_RUN_PATH to
 MakeMaker.

Red Hat versions of perl do not honour the setting of LD_RUN_PATH
without this option. This leads to perl shared objects being installed
without an rpath set which causes problems for target tools when
searching for dependant shared libraries.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml-parser-perl/libxml-parser-perl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 1022302bb9..0d02981c29 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -24,6 +24,7 @@ define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
         INSTALLDIRS=site \
         INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
         INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
+        USE_MM_LD_RUN_PATH=1 \
  )
 endef
 

From 20b76e7c3588938e5e6dc71e7f96607f0207f5c2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Mar 2012 07:35:53 -0300
Subject: [PATCH 1697/6849] sudo: add fix for non-utmpx toolchains

The utmpx defines for when the target systems lacks utmpx is incomplete,
resulting in a build failure, so fix it.
This can be triggered by a uClibc toolchain that lacks UTMPX in the
configuration, or an older (<= 0.9.31) uClibc which lacks the
functionality.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo-1.8.4p4-utmpx.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/sudo/sudo-1.8.4p4-utmpx.patch

diff --git a/package/sudo/sudo-1.8.4p4-utmpx.patch b/package/sudo/sudo-1.8.4p4-utmpx.patch
new file mode 100644
index 0000000000..4e9740608b
--- /dev/null
+++ b/package/sudo/sudo-1.8.4p4-utmpx.patch
@@ -0,0 +1,19 @@
+Fix incomplete setutxent/endutxent defines for when there's no utmpx
+Upstream bug #551
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura sudo-1.8.4p4.orig/src/utmp.c sudo-1.8.4p4/src/utmp.c
+--- sudo-1.8.4p4.orig/src/utmp.c	2012-03-30 07:10:38.381706315 -0300
++++ sudo-1.8.4p4/src/utmp.c	2012-03-30 07:10:52.605802501 -0300
+@@ -63,8 +63,8 @@
+ #if !defined(HAVE_GETUTXID) && defined(HAVE_GETUTID)
+ # define getutxline(u)	getutline(u)
+ # define pututxline(u)	pututline(u)
+-# define setutxent	setutent(u)
+-# define endutxent	endutent(u)
++# define setutxent(u)	setutent(u)
++# define endutxent(u)	endutent(u)
+ #endif /* !HAVE_GETUTXID && HAVE_GETUTID */
+ 
+ #ifdef HAVE_GETUTXID

From f179d3315c781f2f3cbfc26092b67dc75417efd0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 23:24:59 -0300
Subject: [PATCH 1698/6849] vim: bump to version 7.3.487

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vim/Config.in |  2 +-
 package/vim/vim.mk    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/vim/Config.in b/package/vim/Config.in
index 30b73d3051..0da158fade 100644
--- a/package/vim/Config.in
+++ b/package/vim/Config.in
@@ -12,4 +12,4 @@ config BR2_PACKAGE_VIM_RUNTIME
 	depends on BR2_PACKAGE_VIM
 	help
 	  Install VIM runtime (syntax highlighing + macros).
-	  This option adds about 13MB of data to /usr/share/
+	  This option adds about 15MB of data to /usr/share/
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index f5988d19fd..ef8d9259bd 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-# svn r1889 == 7.2 release + patchlevel 446
-VIM_SITE = https://vim.svn.sourceforge.net/svnroot/vim/branches/vim7.2
-VIM_SITE_METHOD = svn
-VIM_VERSION = 1889
+# hg 21219ffc9790 = 7.3 release + patchlevel 487
+VIM_SITE = https://vim.googlecode.com/hg
+VIM_SITE_METHOD = hg
+VIM_VERSION = 21219ffc9790
 VIM_DEPENDENCIES = ncurses
 VIM_SUBDIR = src
 VIM_CONF_ENV = vim_cv_toupper_broken=no \
@@ -19,8 +19,8 @@ VIM_CONF_ENV = vim_cv_toupper_broken=no \
 		vim_cv_memmove_handles_overlap=yes \
 		ac_cv_sizeof_int=4 \
 		ac_cv_small_wchar_t=no
-
-VIM_CONF_OPT = --with-tlib=ncurses
+# GUI/X11 headers leak from the host so forcibly disable them
+VIM_CONF_OPT = --with-tlib=ncurses --enable-gui=no --without-x
 
 define VIM_INSTALL_TARGET_CMDS
 	cd $(@D)/src; \

From f4a5eed474c561557b0c21a05682ed9585c6c60a Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 23 Mar 2012 16:49:52 +0100
Subject: [PATCH 1699/6849] Add the systemd package

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/dbus/dbus.mk                         |  4 ++
 package/systemd/Config.in                    | 20 +++++++
 package/systemd/systemd-fix-getty-unit.patch | 34 +++++++++++
 package/systemd/systemd.mk                   | 62 ++++++++++++++++++++
 package/udev/udev.mk                         |  4 ++
 6 files changed, 125 insertions(+)
 create mode 100644 package/systemd/Config.in
 create mode 100644 package/systemd/systemd-fix-getty-unit.patch
 create mode 100644 package/systemd/systemd.mk

diff --git a/package/Config.in b/package/Config.in
index b394f18680..e1629c8861 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -578,6 +578,7 @@ source "package/rsyslog/Config.in"
 source "package/sysklogd/Config.in"
 source "package/sysvinit/Config.in"
 endif
+source "package/systemd/Config.in"
 source "package/util-linux/Config.in"
 source "package/dsp-tools/Config.in"
 endmenu
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index e18e2917c5..0942b33910 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -39,6 +39,10 @@ else
 DBUS_CONF_OPT += --without-x
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+DBUS_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system
+endif
+
 # fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink)
 define DBUS_REMOVE_VAR_LIB_DBUS
 	rm -rf $(TARGET_DIR)/var/lib/dbus
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
new file mode 100644
index 0000000000..8df3318f1e
--- /dev/null
+++ b/package/systemd/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_SYSTEMD
+	bool "systemd"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBCAP
+	help
+	  systemd is a system and service manager for Linux, compatible with
+	  SysV and LSB init scripts. systemd provides aggressive parallelization
+	  capabilities, uses socket and D-Bus activation for starting services,
+	  offers on-demand starting of daemons, keeps track of processes using
+	  Linux cgroups, supports snapshotting and restoring of the system
+	  state, maintains mount and automount points and implements an
+	  elaborate transactional dependency-based service control logic.
+	  It can work as a drop-in replacement for sysvinit.
+
+	  http://freedesktop.org/wiki/Software/systemd
+
+comment "systemd not available (depends on /dev management with udev and ipv6 support)"
+	depends on !(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV && BR2_INET_IPV6)
diff --git a/package/systemd/systemd-fix-getty-unit.patch b/package/systemd/systemd-fix-getty-unit.patch
new file mode 100644
index 0000000000..6df54b1325
--- /dev/null
+++ b/package/systemd/systemd-fix-getty-unit.patch
@@ -0,0 +1,34 @@
+Prefer getty to agetty in console setup systemd units
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ units/getty@.service.m4        |    2 +-
+ units/serial-getty@.service.m4 |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: systemd-37/units/getty@.service.m4
+===================================================================
+--- systemd-37.orig/units/getty@.service.m4
++++ systemd-37/units/getty@.service.m4
+@@ -32,7 +32,7 @@
+ 
+ [Service]
+ Environment=TERM=linux
+-ExecStart=-/sbin/agetty %I 38400
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Restart=always
+ RestartSec=0
+ UtmpIdentifier=%I
+Index: systemd-37/units/serial-getty@.service.m4
+===================================================================
+--- systemd-37.orig/units/serial-getty@.service.m4
++++ systemd-37/units/serial-getty@.service.m4
+@@ -32,7 +32,7 @@
+ 
+ [Service]
+ Environment=TERM=vt100
+-ExecStart=-/sbin/agetty -s %I 115200,38400,9600
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Restart=always
+ RestartSec=0
+ UtmpIdentifier=%I
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
new file mode 100644
index 0000000000..fc49f3c7f4
--- /dev/null
+++ b/package/systemd/systemd.mk
@@ -0,0 +1,62 @@
+#############################################################
+#
+# systemd
+#
+#############################################################
+SYSTEMD_VERSION = 37
+SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
+SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.bz2
+SYSTEMD_DEPENDENCIES = \
+	host-intltool \
+	libcap \
+	udev \
+	dbus
+
+# Make sure that systemd will always be built after busybox so that we have
+# a consistent init setup between two builds
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+	SYSTEMD_DEPENDENCIES += busybox
+endif
+
+SYSTEMD_CONF_OPT += \
+	--with-distro=other \
+	--disable-selinux \
+	--disable-pam \
+	--disable-libcryptsetup \
+	--disable-gtk \
+	--disable-plymouth \
+	--with-rootdir=/ \
+	--with-dbuspolicydir=/etc/dbus-1/system.d \
+	--with-dbussessionservicedir=/usr/share/dbus-1/services \
+	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
+	--with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+	--with-udevrulesdir=/etc/udev/rules.d \
+	--with-sysvinit-path=/etc/init.d/ \
+	--without-sysvrcd-path
+
+ifeq ($(BR2_PACKAGE_ACL),y)
+	SYSTEMD_CONF_OPT += --enable-acl
+	SYSTEMD_DEPENDENCIES += acl
+else
+	SYSTEMD_CONF_OPT += --disable-acl
+endif
+
+define SYSTEMD_INSTALL_INIT_HOOK
+	ln -fs ../bin/systemd $(TARGET_DIR)/sbin/init
+	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt
+	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff
+	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot
+
+	ln -fs ../../../../lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target
+endef
+
+define SYSTEMD_INSTALL_TTY_HOOK
+	rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
+	ln -fs ../../../../lib/systemd/system/serial-getty@.service $(TARGET_DIR)/etc/systemd/system/getty.target.wants/serial-getty@$(BR2_TARGET_GENERIC_GETTY_PORT).service
+endef
+
+SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
+	SYSTEMD_INSTALL_INIT_HOOK \
+	SYSTEMD_INSTALL_TTY_HOOK \
+
+$(eval $(call AUTOTARGETS))
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 85f625452a..726aed6eed 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -35,6 +35,10 @@ UDEV_CONF_OPT +=		\
 	--disable-gudev
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+	UDEV_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system/
+endif
+
 define UDEV_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
 endef

From 575d4712e1c4305acdba74e1af9277114ce99883 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 31 Mar 2012 23:57:35 +0200
Subject: [PATCH 1700/6849] systemd: fix build on uClibc

Patch based on similar patch in openembedded.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/systemd/systemd-uclibc-fix.patch | 40 ++++++++++++++++++++++++
 package/systemd/systemd.mk               |  3 ++
 2 files changed, 43 insertions(+)
 create mode 100644 package/systemd/systemd-uclibc-fix.patch

diff --git a/package/systemd/systemd-uclibc-fix.patch b/package/systemd/systemd-uclibc-fix.patch
new file mode 100644
index 0000000000..24c32ab94e
--- /dev/null
+++ b/package/systemd/systemd-uclibc-fix.patch
@@ -0,0 +1,40 @@
+[PATCH] fix build with uClibc
+
+Based on OE patch from Khem Raj:
+
+http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
+
+But extended to also cover execvpe (OE carries a patch adding execvpe
+support to uClibc).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/macro.h |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+Index: systemd-37/src/macro.h
+===================================================================
+--- systemd-37.orig/src/macro.h
++++ systemd-37/src/macro.h
+@@ -27,6 +27,21 @@
+ #include <sys/uio.h>
+ #include <inttypes.h>
+ 
++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extension */
++#define mkostemp(x,y) mkstemp(x)
++/* uclibc does not implement execvpe GNU extension */
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include <unistd.h>
++static inline int execvpe(const char *file, char *const argv[],
++                          char *const envp[])
++{
++        environ = (char **)envp;
++        return execvp(file, argv);
++}
++#endif
+ #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
+ #define _sentinel_ __attribute__ ((sentinel))
+ #define _noreturn_ __attribute__((noreturn))
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index fc49f3c7f4..eded472083 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -41,6 +41,9 @@ else
 	SYSTEMD_CONF_OPT += --disable-acl
 endif
 
+# mq_getattr needs -lrt
+SYSTEMD_MAKE_OPT += LIBS=-lrt
+
 define SYSTEMD_INSTALL_INIT_HOOK
 	ln -fs ../bin/systemd $(TARGET_DIR)/sbin/init
 	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt

From b41fb1507fa2975e09ebcd04f342d1bbd3681623 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 23 Mar 2012 09:14:28 -0300
Subject: [PATCH 1701/6849] libpng: bump to version 1.4.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpng/libpng.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 4017871daf..19d2a71e6d 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-LIBPNG_VERSION = 1.4.9
+LIBPNG_VERSION = 1.4.10
 LIBPNG_SERIES = 14
-LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkg-config zlib

From 90759a663629d3c936c0e4392088a4e618aaf5fe Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 23 Mar 2012 16:49:53 +0100
Subject: [PATCH 1702/6849] Enable cgroups in Linux if we use systemd

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index 6cb1efc86a..16f99163d8 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -162,6 +162,8 @@ define LINUX_CONFIGURE_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
 	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
 		$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
+	$(if $(BR2_PACKAGE_SYSTEMD),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config))
 	yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
 endef
 

From 60a395708d99b1787800bedd983450d0097ce6af Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 30 Mar 2012 14:50:26 +0200
Subject: [PATCH 1703/6849] pcre: bump to 8.30

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/pcre.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index d64106ed10..db896fd677 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCRE_VERSION = 8.20
+PCRE_VERSION = 8.30
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_INSTALL_STAGING = YES
 

From 09a1de0fb86f3af35878b26046df02b4620fe7b6 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 30 Mar 2012 16:08:31 +0200
Subject: [PATCH 1704/6849] iw: bump to 3.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 38bb125688..5cd40a3a21 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.3
+IW_VERSION = 3.4
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From d90dd7c5e8491135c50ae872a0c459556d304785 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 15 Mar 2012 23:54:09 +0100
Subject: [PATCH 1705/6849] package/giblib: fix breakage

Fix two things in the giblib package:

1- fix prefix breakage
   - s/STAGING/STAGING_DIR/ (Thomas)
   - prefix is .../usr, not .../usr/lib or .../usr/bin

2- fix the configure.ac/Makefile.am breakage
   - imlib2 sets IMLIB2_(LIBS|CFLAGS), not IMLIB_(LIBS|CFLAGS)
   - autoreconf the package, install missing files
     Note that both configure.ac and configure.in are present in the
     package, so both are fixed, although only configure.ac is used
     (configure.in is the legacy name).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../giblib/giblib-fix-imlib2-detection.patch  | 127 ++++++++++++++++++
 package/giblib/giblib.mk                      |   6 +-
 2 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 package/giblib/giblib-fix-imlib2-detection.patch

diff --git a/package/giblib/giblib-fix-imlib2-detection.patch b/package/giblib/giblib-fix-imlib2-detection.patch
new file mode 100644
index 0000000000..2323107941
--- /dev/null
+++ b/package/giblib/giblib-fix-imlib2-detection.patch
@@ -0,0 +1,127 @@
+configure.ac + Makefile.am: fix the imlib2 detection
+
+Although imlib2 is correctly checked for, the variables used to get
+the CFLAGS and LIBS are wrong (perhaps a remnant of the pre-imlib2
+era, when giblib was using imlib).
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/configure.ac b/configure.ac
+index 6807d86..c8874f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,16 +18,10 @@ AM_MAINTAINER_MODE
+ AM_WITH_DMALLOC
+ 
+ AC_PATH_GENERIC(imlib2, 1.0.0, [
+-  AC_SUBST(IMLIB_LIBS)
+-  AC_SUBST(IMLIB_CFLAGS) ],
++  AC_SUBST(IMLIB2_LIBS)
++  AC_SUBST(IMLIB2_CFLAGS) ],
+   AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+ 
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CFLAGS)
+-
+ LIBS="$LIBS -lm"
+ CFLAGS="$CFLAGS -Wall"
+ 
+@@ -48,7 +42,7 @@ $PACKAGE $VERSION
+ Configuration:
+ --------------
+ 
+-Imlib2 libs:	$IMLIB_LIBS
+-Imlib2 cflags:  $IMLIB_CFLAGS
++Imlib2 libs:	$IMLIB2_LIBS
++Imlib2 cflags:  $IMLIB2_CFLAGS
+ CFLAGS:			$CFLAGS
+ "
+diff --git a/configure.in b/configure.in
+index 432cb16..6999095 100644
+--- a/configure.in
++++ b/configure.in
+@@ -17,16 +17,10 @@ AM_MAINTAINER_MODE
+ AM_WITH_DMALLOC
+ 
+ AC_PATH_GENERIC(imlib2, 1.0.0, [
+-  AC_SUBST(IMLIB_LIBS)
+-  AC_SUBST(IMLIB_CFLAGS) ],
++  AC_SUBST(IMLIB2_LIBS)
++  AC_SUBST(IMLIB2_CFLAGS) ],
+   AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+ 
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CFLAGS)
+-
+ LIBS="$LIBS -lm"
+ CFLAGS="$CFLAGS -Wall"
+ 
+@@ -45,7 +39,7 @@ $PACKAGE $VERSION
+ Configuration:
+ --------------
+ 
+-Imlib2 libs:	$IMLIB_LIBS
+-Imlib2 cflags:  $IMLIB_CFLAGS
++Imlib2 libs:	$IMLIB2_LIBS
++Imlib2 cflags:  $IMLIB2_CFLAGS
+ CFLAGS:			$CFLAGS
+ "
+diff --git a/giblib-config.in b/giblib-config.in
+index f3a7db6..cef1620 100644
+--- a/giblib-config.in
++++ b/giblib-config.in
+@@ -42,11 +42,11 @@ while test $# -gt 0; do
+       if test @includedir@ != /usr/include ; then
+         includes=-I@includedir@
+       fi
+-      echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@
++      echo $includes -I$prefix/include/giblib @IMLIB2_CFLAGS@
+       ;;
+     --libs)
+       libdirs=-L@libdir@
+-      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB2_LIBS@
+       ;;
+     *)
+       echo "${usage}" 1>&2
+diff --git a/giblib.pc.in b/giblib.pc.in
+index df520ae..783e6e1 100644
+--- a/giblib.pc.in
++++ b/giblib.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: giblib
+ Description: wrapper library for imlib2, and other stuff
+ Version: @VERSION@
+-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
+-Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
++Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB2_LIBS@
++Cflags: -I${includedir} -I${includedir}/giblib @IMLIB2_CFLAGS@
+ 
+diff --git a/giblib/Makefile.am b/giblib/Makefile.am
+index d1edc09..49d8ac4 100644
+--- a/giblib/Makefile.am
++++ b/giblib/Makefile.am
+@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
+ 
+ INCLUDES = \
+ -I. -I$(top_srcdir) \
+--DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@
++-DPREFIX=\""$(prefix)"\" @IMLIB2_CFLAGS@
+ 
+ lib_LTLIBRARIES = libgiblib.la
+ 
+@@ -24,7 +24,7 @@ libgiblib_la_SOURCES = \
+     gib_utils.c gib_utils.h \
+ 	gib_queue.c gib_queue.h
+ 
+-libgiblib_la_LIBADD = @IMLIB_LIBS@
++libgiblib_la_LIBADD = @IMLIB2_LIBS@
+ libgiblib_la_DEPENDENCIES = giblib_config.h
+ libgiblib_la_LDFLAGS = -version-info 1:6:0
+ 
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 8288b743be..75012ea6de 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -8,7 +8,9 @@ GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz
 GIBLIB_SITE = http://linuxbrit.co.uk/downloads/
 GIBLIB_INSTALL_STAGING = YES
 GIBLIB_DEPENDENCIES = imlib2
-GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr/lib \
-		  --with-imlib2-exec-prefix=$(STAGING)/usr/bin
+GIBLIB_AUTORECONF = YES
+GIBLIB_AUTORECONF_OPT = --install
+GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \
+		  --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
 
 $(eval $(call AUTOTARGETS))

From 71cec7c82ce01706ec85155cb18850e025af8156 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 27 Mar 2012 19:41:35 -0300
Subject: [PATCH 1706/6849] kernel-headers: bump 3.0.x and 3.2.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.25-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.26-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 8ea037a881..0b029ad6d4 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.25"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.26"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.12"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.13"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.25-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.26-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.25-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.26-headers_install-fix-__packed-in-exported-kernel-head.patch

From 52201e2d1151f3a6fb61f73c7bf54814cf26b672 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 27 Mar 2012 19:58:07 -0300
Subject: [PATCH 1707/6849] expat: security bump to version 2.1.0

Fixes for CVE-2012-1147, CVE-2009-3720, CVE-2009-3560, CVE-2012-1148 and
CVE-2012-0876.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/expat/expat-2.0.1-CVE-2009-3560.patch | 14 --------------
 package/expat/expat.mk                        |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 package/expat/expat-2.0.1-CVE-2009-3560.patch

diff --git a/package/expat/expat-2.0.1-CVE-2009-3560.patch b/package/expat/expat-2.0.1-CVE-2009-3560.patch
deleted file mode 100644
index 7cadc47b07..0000000000
--- a/package/expat/expat-2.0.1-CVE-2009-3560.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
-
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
-         return XML_ERROR_UNCLOSED_TOKEN;
-       case XML_TOK_PARTIAL_CHAR:
-         return XML_ERROR_PARTIAL_CHAR;
-+      case -XML_TOK_PROLOG_S:
-+        tok = -tok;
-+        break;
-       case XML_TOK_NONE:
- #ifdef XML_DTD
-         /* for internal PE NOT referenced between declarations */
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index b179383fff..ea008db01c 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-EXPAT_VERSION = 2.0.1
-EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
+EXPAT_VERSION = 2.1.0
+EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
 EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib

From adae2f673d027c14ca294c7f1143f86741da9945 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 27 Mar 2012 21:44:54 -0300
Subject: [PATCH 1708/6849] iptables: bump to version 1.4.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../iptables/iptables-3.2-headers-fix.patch   | 34 -------------------
 package/iptables/iptables.mk                  |  2 +-
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 package/iptables/iptables-3.2-headers-fix.patch

diff --git a/package/iptables/iptables-3.2-headers-fix.patch b/package/iptables/iptables-3.2-headers-fix.patch
deleted file mode 100644
index 5ef65398d6..0000000000
--- a/package/iptables/iptables-3.2-headers-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From dbe77cc974cee656eae37e75039dd1a410a4535b Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@medozas.de>
-Date: Sun, 28 Aug 2011 14:19:43 +0200
-Subject: [PATCH] include: refresh include files from kernel 3.1-rc3
-
-[Peter: trimmed to bare essentials for buildroot]
-Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
----
-diff --git a/include/linux/types.h b/include/linux/types.h
-index 8b483c8..630cd3b 100644
---- a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -34,5 +34,18 @@ typedef __u64 __bitwise __be64;
- typedef __u16 __bitwise __sum16;
- typedef __u32 __bitwise __wsum;
- 
-+/*
-+ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
-+ * common 32/64-bit compat problems.
-+ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
-+ * architectures) and to 8-byte boundaries on 64-bit architetures.  The new
-+ * aligned_64 type enforces 8-byte alignment so that structs containing
-+ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
-+ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
-+ */
-+#define __aligned_u64 __u64 __attribute__((aligned(8)))
-+#define __aligned_be64 __be64 __attribute__((aligned(8)))
-+#define __aligned_le64 __le64 __attribute__((aligned(8)))
-+
- #endif /*  __ASSEMBLY__ */
- #endif /* _LINUX_TYPES_H */
--- 
-1.7.8.3
-
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 95134e3f48..87578d54ea 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.12.2
+IPTABLES_VERSION = 1.4.13
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 11c5f6971a8d179fb02a432ae988cde80b0f5212 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 18:17:20 -0300
Subject: [PATCH 1709/6849] gnutls: security bump to version 2.12.18

Fixes CVE-2012-1573

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 4cda9976fc..ce570d5f1d 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,11 +4,12 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 2.10.5
+GNUTLS_VERSION = 2.12.18
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
-GNUTLS_SITE = http://ftp.gnu.org/gnu/gnutls/
-GNUTLS_DEPENDENCIES = libgcrypt
-GNUTLS_CONF_OPT += --without-libgcrypt-prefix
+GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
+GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt
+GNUTLS_CONF_OPT = --with-libgcrypt --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
+		--without-p11-kit
 GNUTLS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From 29f8b8a920d862dcd46549351344d54a951949be Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Apr 2012 23:39:23 +0200
Subject: [PATCH 1710/6849] linux: bump default kernel version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 6510a566b0..5a2d28724c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3"
+	bool "3.3.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3" if BR2_LINUX_KERNEL_3_3
+	default "3.3.1" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e1443db85bc7dc2a863c4bbfdf6fe777f390ad70 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Apr 2012 23:46:55 +0200
Subject: [PATCH 1711/6849] kernel-headers: bump 3.{0,2,3}.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ...-3.3-fix-umode_t.patch => linux-3.3.1-fix-umode_t.patch} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.26-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.27-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3-fix-umode_t.patch => linux-3.3.1-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 0b029ad6d4..2cdd3e3fbf 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.26"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.27"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.13"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3"		if BR2_KERNEL_HEADERS_3_3
+	default "3.2.14"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3.1"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.26-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.27-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.26-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.27-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.1-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.1-fix-umode_t.patch

From 56ece03c81a792f2dba0c5cbff609a45a13bde59 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Apr 2012 07:07:55 -0300
Subject: [PATCH 1712/6849] libpng: security bump to version 1.4.11

Fixes CVE-2011-3048

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpng/libpng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 19d2a71e6d..56d037729b 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBPNG_VERSION = 1.4.10
+LIBPNG_VERSION = 1.4.11
 LIBPNG_SERIES = 14
 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2

From 21fb8e68ee656733a02ff3f574b991d5032cdfc3 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 3 Apr 2012 10:55:29 +0200
Subject: [PATCH 1713/6849] tinyhttpd: convert to gentargets

[Peter: misc fixes, make invocation, use install -D]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tinyhttpd/tinyhttpd.mk | 66 ++++++++++------------------------
 1 file changed, 18 insertions(+), 48 deletions(-)

diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 0f95d06fbe..6bc37d46e3 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -3,54 +3,24 @@
 # tinyhttpd
 #
 #############################################################
-TINYHTTPD_VER:=0.1.0
-TINYHTTPD_SOURCE:=tinyhttpd-$(TINYHTTPD_VER).tar.gz
-TINYHTTPD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/$(TINYHTTPD_SOURCE)
-TINYHTTPD_DIR:=$(BUILD_DIR)/tinyhttpd-$(TINYHTTPD_VER)
-TINYHTTPD_CAT:=$(ZCAT)
-TINYHTTPD_BINARY:=httpd
-TINYHTTPD_TARGET_BINARY:=usr/sbin/tinyhttpd
-
-$(DL_DIR)/$(TINYHTTPD_SOURCE):
-	 $(call DOWNLOAD,$(TINYHTTPD_SITE)/$(TINYHTTPD_SOURCE))
-
-tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
-
-#############################################################
-#
-# build tinyhttpd for use on the target system
-#
-#############################################################
-$(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE)
-	$(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
-	touch $(TINYHTTPD_DIR)/.unpacked
-
-$(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked
-	$(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) -C $(TINYHTTPD_DIR)
-
-$(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY)
-	$(INSTALL) -m 0755 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
-	$(INSTALL) -m 0755 package/tinyhttpd/S85tinyhttpd $(TARGET_DIR)/etc/init.d
+TINYHTTPD_VERSION = 0.1.0
+TINYHTTPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/
+
+define TINYHTTPD_BUILD_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define TINYHTTPD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/httpd
+	$(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \
+		$(TARGET_DIR)/etc/init.d/S85tinyhttpd
 	mkdir -p $(TARGET_DIR)/var/www
+endef
 
-tinyhttpd: $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
-
-tinyhttpd-clean:
-	-$(MAKE) -C $(TINYHTTPD_DIR) clean
-	@rm -f $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
-	@rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
-	@rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/var/www
+define TINYHTTPD_CLEAN_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/httpd
+	rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
+endef
 
-tinyhttpd-dirclean:
-	rm -rf $(TINYHTTPD_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_TINYHTTPD),y)
-TARGETS+=tinyhttpd
-endif
+$(eval $(call GENTARGETS))

From 9afba4fdc672662c39f088b51c2ee939679d51a2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 Apr 2012 22:50:30 +0200
Subject: [PATCH 1714/6849] tinyhttpd: fix white space issue in Config.in

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tinyhttpd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tinyhttpd/Config.in b/package/tinyhttpd/Config.in
index eb601637ee..5a6ee886cb 100644
--- a/package/tinyhttpd/Config.in
+++ b/package/tinyhttpd/Config.in
@@ -3,5 +3,5 @@ config BR2_PACKAGE_TINYHTTPD
 	help
 	  A relatively simple webserver written as a school project. It is
 	  exceedingly simple, threaded and handles basic CGI scripts.
-		
+
 	  http://sourceforge.net/projects/tinyhttpd/

From d58777fdf0d18da7c08f6b604d36f85aae2ec5bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 Apr 2012 22:51:05 +0200
Subject: [PATCH 1715/6849] tinyhttpd: fix initscript, install as
 /usr/sbin/tinyhttpd

The init script was expecting the binary to be called tinyhttpd, but httpd
was used. Fix it to install as tinyhttpd as httpd will conflict with other
web servers (E.G. the busybox one).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tinyhttpd/tinyhttpd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 6bc37d46e3..9b06589d3c 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -12,14 +12,14 @@ define TINYHTTPD_BUILD_CMDS
 endef
 
 define TINYHTTPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/httpd
+	$(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd
 	$(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \
 		$(TARGET_DIR)/etc/init.d/S85tinyhttpd
 	mkdir -p $(TARGET_DIR)/var/www
 endef
 
 define TINYHTTPD_CLEAN_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/httpd
+	rm -f $(TARGET_DIR)/usr/sbin/tinyhttpd
 	rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
 endef
 

From 5fd8f38fbc9742530efeec5f751c28fe7afbf4e0 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 3 Apr 2012 10:55:32 +0200
Subject: [PATCH 1716/6849] socketcand: fix installation on old systems

[Peter: adjust patch to do install -m 0644 and not -D]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../socketcand-replace-cp-by-install.patch    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch

diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
new file mode 100644
index 0000000000..4462ddfc46
--- /dev/null
+++ b/package/socketcand/socketcand-replace-cp-by-install.patch
@@ -0,0 +1,25 @@
+From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Tue, 3 Apr 2012 10:35:09 +0200
+Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 40d8193..290a8dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,6 +38,6 @@ install: socketcand
+ 	mkdir -p $(DESTDIR)$(sysroot)$(mandir)
+ 	cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
+ 	mkdir -p $(DESTDIR)$(sysroot)/etc/
+-	cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
++	install -m 0644 $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
+ 	if [ $(init_script) = yes ]; then mkdir -p $(DESTDIR)$(sysroot)/etc/init.d; install --mode=755 $(srcdir)/init.d/socketcand $(DESTDIR)$(sysroot)/etc/init.d/socketcand; fi
+ 	if [ $(rc_script) = yes ]; then install --mode=755 $(srcdir)/rc.d/socketcand $(DESTDIR)$(sysroot)/etc/rc.d/socketcand; fi
+-- 
+1.7.4.1
+

From f4e2d3bd7318e6581266d09d0183d404c5833f3d Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 3 Apr 2012 10:55:30 +0200
Subject: [PATCH 1717/6849] Bump version of ltrace

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../ltrace/ltrace-0.5.3-configure-fixes.patch | 128 ------------------
 .../ltrace/ltrace-0.5.3-susv3-legacy.patch    |  20 ---
 ...-in-ARM-arch_-dis-en-able_breakpoint.patch |  67 +++++++++
 package/ltrace/ltrace.mk                      |  40 +-----
 4 files changed, 72 insertions(+), 183 deletions(-)
 delete mode 100644 package/ltrace/ltrace-0.5.3-configure-fixes.patch
 delete mode 100644 package/ltrace/ltrace-0.5.3-susv3-legacy.patch
 create mode 100644 package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch

diff --git a/package/ltrace/ltrace-0.5.3-configure-fixes.patch b/package/ltrace/ltrace-0.5.3-configure-fixes.patch
deleted file mode 100644
index 8d95883bce..0000000000
--- a/package/ltrace/ltrace-0.5.3-configure-fixes.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Fix several issues with the configure script:
-
- * Allow option values to contains equal signs, like
-   CC="/foo/arm-linux-gcc --sysroot=/foobar/usr"
-
- * Parse the option before doing the tests so that CC/CFLAGS can be
-   used during the tests.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure |   72 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 37 insertions(+), 35 deletions(-)
-
-Index: ltrace-0.5.3/configure
-===================================================================
---- ltrace-0.5.3.orig/configure
-+++ ltrace-0.5.3/configure
-@@ -6,6 +6,38 @@
-   exit 1
- fi
- 
-+CC=gcc
-+CPPFLAGS=' -I /usr/include/libelf'
-+CFLAGS='-g -O2'
-+LIBS='-lelf '
-+INSTALL='/usr/bin/install -c'
-+iquote='-iquote '
-+iquoteend=''
-+
-+prefix=/usr/local
-+sysconfdir='${prefix}/etc'
-+bindir='${prefix}/bin'
-+mandir='${prefix}/share/man'
-+docdir='${prefix}/share/doc/ltrace'
-+for x_option
-+do
-+  if test -n "$x_prev"; then
-+    eval $x_prev=\$x_option
-+    x_prev=
-+    continue
-+  fi
-+  case $x_option in
-+    --*=* | *=*)
-+      x_var=`echo $x_option | sed 's/^--//' | sed 's/=.*//'`
-+      x_val=`echo $x_option | sed 's/^[^=]*=//'`
-+      eval $x_var=\"$x_val\"
-+      ;;
-+    --*)
-+      x_prev=`echo $x_option | sed 's/^--//'`
-+      ;;
-+  esac
-+done
-+
- echo -n "checking package name... "
- PACKAGE_NAME='ltrace'
- echo $PACKAGE_NAME
-@@ -30,9 +62,10 @@
-   return cplus_demangle();
- }
- EOF
--if gcc conftest.c -liberty 2>/dev/null
-+if $CC $CFLAGS conftest.c -liberty 2>/dev/null
- then
-   HAVE_LIBIBERTY=1
-+  LIBS="$LIBS -liberty"
-   echo "yes"
- else
-   unset HAVE_LIBIBERTY
-@@ -48,9 +81,10 @@
-   return __cxa_demangle();
- }
- EOF
--if gcc conftest.c -lsupc++ 2>/dev/null
-+if $CC $CFLAGS conftest.c -lsupc++ 2>/dev/null
- then
-   HAVE_LIBSUPC__=1
-+  LIBS="$LIBS -lsupc++"
-   echo "yes"
- else
-   unset HAVE_LIBSUPC__
-@@ -67,7 +101,7 @@
-   return 0;
- }
- EOF
--if gcc conftest.c 2>/dev/null
-+if $CC $CFLAGS conftest.c 2>/dev/null
- then
-   HAVE_ELF_C_READ_MMAP=1
-   echo "yes"
-@@ -77,38 +111,6 @@
- fi
- rm -f conftest.c a.out
- 
--CC=gcc
--CPPFLAGS=' -I /usr/include/libelf'
--CFLAGS='-g -O2'
--LIBS='-lelf -lsupc++ -liberty '
--INSTALL='/usr/bin/install -c'
--iquote='-iquote '
--iquoteend=''
--
--prefix=/usr/local
--sysconfdir='${prefix}/etc'
--bindir='${prefix}/bin'
--mandir='${prefix}/share/man'
--docdir='${prefix}/share/doc/ltrace'
--for x_option
--do
--  if test -n "$x_prev"; then
--    eval $x_prev=\$x_option
--    x_prev=
--    continue
--  fi
--  case $x_option in
--    --*=* | *=*)
--      x_var=`echo $x_option | sed 's/^--//' | sed 's/=.*//'`
--      x_val=`echo $x_option | sed 's/^.*=//'`
--      eval $x_var=$x_val
--      ;;
--    --*)
--      x_prev=`echo $x_option | sed 's/^--//'`
--      ;;
--  esac
--done
--
- echo "configure: creating Makefile"
- #
- # Makefile.in -> Makefile
diff --git a/package/ltrace/ltrace-0.5.3-susv3-legacy.patch b/package/ltrace/ltrace-0.5.3-susv3-legacy.patch
deleted file mode 100644
index 4c9bb8ae16..0000000000
--- a/package/ltrace/ltrace-0.5.3-susv3-legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use the strchr() function instead of the legacy index() function.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- read_config_file.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ltrace-0.5.3/read_config_file.c
-===================================================================
---- ltrace-0.5.3.orig/read_config_file.c
-+++ ltrace-0.5.3/read_config_file.c
-@@ -83,7 +83,7 @@
- 
- 	while (tmp->name) {
- 		if (!strncmp(*str, tmp->name, strlen(tmp->name))
--				&& index(" ,()#*;012345[", *(*str + strlen(tmp->name)))) {
-+				&& strchr(" ,()#*;012345[", *(*str + strlen(tmp->name)))) {
- 			*str += strlen(tmp->name);
- 			return lookup_prototype(tmp->pt);
- 		}
diff --git a/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch b/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
new file mode 100644
index 0000000000..c005932900
--- /dev/null
+++ b/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
@@ -0,0 +1,67 @@
+From c46448f4e5a4c124fbc75ca9b14697212e676893 Mon Sep 17 00:00:00 2001
+From: Michael K. Edwards <m.k.edwards@gmail.com>
+Date: Mon, 7 Mar 2011 16:15:48 +0000
+Subject: [PATCH] fix type punning in ARM arch_(dis|en)able_breakpoint
+
+---
+ sysdeps/linux-gnu/arm/breakpoint.c |   26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/sysdeps/linux-gnu/arm/breakpoint.c b/sysdeps/linux-gnu/arm/breakpoint.c
+index 4a5ab92..4e17940 100644
+--- a/sysdeps/linux-gnu/arm/breakpoint.c
++++ b/sysdeps/linux-gnu/arm/breakpoint.c
+@@ -35,10 +35,15 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
+ 	debug(1, "arch_enable_breakpoint(%d,%p)", pid, sbp->addr);
+ 
+ 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
+-		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+-		unsigned char *bytes = (unsigned char *)&a;
++		union _ { long l; unsigned char b[SIZEOF_LONG]; };
++		union _ orig, current;
++		unsigned char *bytes = current.b;
++		for (j = 0; j < sizeof(long); j++) {
++			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
++		}
++		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+ 
+-		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
++		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
+ 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
+ 
+ 			sbp->orig_value[i * sizeof(long) + j] = bytes[j];
+@@ -49,7 +54,7 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
+ 				bytes[j] = thumb_break_insn[i * sizeof(long) + j];
+ 			}
+ 		}
+-		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
++		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
+ 	}
+ }
+ 
+@@ -60,13 +65,18 @@ arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) {
+ 	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
+ 
+ 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
+-		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+-		unsigned char *bytes = (unsigned char *)&a;
++		union _ { long l; unsigned char b[SIZEOF_LONG]; };
++		union _ orig, current;
++		unsigned char *bytes = current.b;
++		for (j = 0; j < sizeof(long); j++) {
++			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
++		}
++		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
+ 
+-		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
++		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
+ 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
+ 			bytes[j] = sbp->orig_value[i * sizeof(long) + j];
+ 		}
+-		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
++		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
+ 	}
+ }
+-- 
+1.7.4.1
+
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 23094c8e82..8c0a145a96 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -3,40 +3,10 @@
 # ltrace
 #
 #############################################################
-LTRACE_VERSION      = 0.5.3
-LTRACE_SOURCE       = ltrace_$(LTRACE_VERSION).orig.tar.gz
-LTRACE_PATCH        = ltrace_$(LTRACE_VERSION)-2.1.diff.gz
-LTRACE_SITE         = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/ltrace
-LTRACE_MAKE         = $(MAKE1)
+LTRACE_VERSION      = 0.6.0
+LTRACE_SITE         = git://anonscm.debian.org/collab-maint/ltrace.git
 LTRACE_DEPENDENCIES = libelf
+LTRACE_AUTORECONF   = YES
+LTRACE_CONF_OPT     += --disable-werror
 
-# ltrace uses arch=ppc for powerpc
-LTRACE_ARCH:=$(KERNEL_ARCH:powerpc=ppc)
-ifeq ("$(strip $(ARCH))","armeb")
-LTRACE_ARCH:=arm
-endif
-
-define LTRACE_CONFIGURE_CMDS
-	(cd $(@D) ; ./configure 		\
-		--prefix=/usr			\
-		CC='$(TARGET_CC)' 		\
-		CFLAGS='$(TARGET_CFLAGS)')
-endef
-
-define LTRACE_BUILD_CMDS
-	$(MAKE) -C $(@D) ARCH=$(LTRACE_ARCH)
-endef
-
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-define LTRACE_INSTALL_DOCUMENTATION
-	$(INSTALL) -D $(@D)/ltrace.1 \
-		$(TARGET_DIR)/usr/share/man/man1/ltrace.1
-endef
-endif
-
-define LTRACE_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/ltrace $(TARGET_DIR)/usr/bin
-	$(LTRACE_INSTALL_DOCUMENTATION)
-endef
-
-$(eval $(call GENTARGETS))
+$(eval $(call AUTOTARGETS))

From 517b845a520bd50ea452614dd82fea412b92144f Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Thu, 22 Mar 2012 09:52:46 +0100
Subject: [PATCH 1718/6849] mysql_client : bump to 5.1.61 (fixes some security
 holes.)

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...che_check.patch => mysql_client-5.1.61-ac_cache_check.patch} | 0
 ...patch => mysql_client-5.1.61-configure-ps-cache-check.patch} | 0
 ...e.patch => mysql_client-5.1.61-use-new-readline-iface.patch} | 0
 package/mysql_client/mysql_client.mk                            | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename package/mysql_client/{mysql_client-5.1.53-ac_cache_check.patch => mysql_client-5.1.61-ac_cache_check.patch} (100%)
 rename package/mysql_client/{mysql_client-5.1.53-configure-ps-cache-check.patch => mysql_client-5.1.61-configure-ps-cache-check.patch} (100%)
 rename package/mysql_client/{mysql_client-5.1.53-use-new-readline-iface.patch => mysql_client-5.1.61-use-new-readline-iface.patch} (100%)

diff --git a/package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch b/package/mysql_client/mysql_client-5.1.61-ac_cache_check.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch
rename to package/mysql_client/mysql_client-5.1.61-ac_cache_check.patch
diff --git a/package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch b/package/mysql_client/mysql_client-5.1.61-configure-ps-cache-check.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch
rename to package/mysql_client/mysql_client-5.1.61-configure-ps-cache-check.patch
diff --git a/package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch b/package/mysql_client/mysql_client-5.1.61-use-new-readline-iface.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch
rename to package/mysql_client/mysql_client-5.1.61-use-new-readline-iface.patch
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 70970163ea..0803d10e76 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -3,7 +3,7 @@
 # MySQL 5.1 Client
 #
 #############################################################
-MYSQL_CLIENT_VERSION = 5.1.53
+MYSQL_CLIENT_VERSION = 5.1.61
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.mysql.com/archives/mysql-5.1/
 MYSQL_CLIENT_INSTALL_STAGING = YES

From 2e59d1d7ed669fc0a8e563a37b418ea424b6eefe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 Apr 2012 21:27:40 -0300
Subject: [PATCH 1719/6849] e2fsprogs: bump to version 1.42.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs-fallocate.patch | 22 ---------------------
 package/e2fsprogs/e2fsprogs.mk              |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 package/e2fsprogs/e2fsprogs-fallocate.patch

diff --git a/package/e2fsprogs/e2fsprogs-fallocate.patch b/package/e2fsprogs/e2fsprogs-fallocate.patch
deleted file mode 100644
index 4d952a5df7..0000000000
--- a/package/e2fsprogs/e2fsprogs-fallocate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-We assume that fallocate is supported somehow
-but we need to check if we have fallocate()
-this problem shows up on uclibc systems since
-uclibc does not have fallocate() implemented
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
-===================================================================
---- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c	2012-01-17 17:24:34.290780625 -0800
-+++ e2fsprogs-1.42/lib/ext2fs/unix_io.c	2012-01-17 17:25:37.338783680 -0800
-@@ -895,7 +895,7 @@
- 		goto unimplemented;
- #endif
- 	} else {
--#ifdef FALLOC_FL_PUNCH_HOLE
-+#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE
- 		/*
- 		 * If we are not on block device, try to use punch hole
- 		 * to reclaim free space.
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index fee6f0a1ac..5f87b40236 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42.1
+E2FSPROGS_VERSION = 1.42.2
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \

From 738b0b055513f559811bf545cf26f539d1edf422 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Apr 2012 20:53:26 +0200
Subject: [PATCH 1720/6849] qt: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-configure.patch          | 16 ++++++++++------
 package/qt/qt-pthread_getattr_np.patch | 24 +++++++++++++++---------
 package/qt/qt.mk                       |  2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/package/qt/qt-configure.patch b/package/qt/qt-configure.patch
index cef53e3faf..07c9630c90 100644
--- a/package/qt/qt-configure.patch
+++ b/package/qt/qt-configure.patch
@@ -17,13 +17,17 @@ in the $(STAGING_DIR) and on the target remains the same.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: qt-4.7.2/configure
-===================================================================
---- qt-4.7.2.orig/configure	2011-03-31 22:28:16.530647168 +0200
-+++ qt-4.7.2/configure	2011-03-31 22:29:38.908081695 +0200
-@@ -4456,15 +4456,15 @@
-
+---
+ configure |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
+Index: qt-everywhere-opensource-src-4.8.1/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.8.1.orig/configure
++++ qt-everywhere-opensource-src-4.8.1/configure
+@@ -4661,15 +4661,15 @@
+ 
+ 
  if [ ! -z "$QT_HOST_PREFIX" ]; then
 -    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
 -    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
diff --git a/package/qt/qt-pthread_getattr_np.patch b/package/qt/qt-pthread_getattr_np.patch
index 4b20bb2320..28f0c8411b 100644
--- a/package/qt/qt-pthread_getattr_np.patch
+++ b/package/qt/qt-pthread_getattr_np.patch
@@ -3,9 +3,15 @@ Add pthred_getattr_np / phread_attr_getstrack alternatives for uClibc
 Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webkit-for-uclibc.patch?rev=20371
 
 Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
---- qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	2010-02-11 16:55:20.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	2010-05-23 10:49:29.000000000 +0200
-@@ -75,6 +75,23 @@
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp |   61 ++++++++++
+ 1 file changed, 61 insertions(+)
+
+Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+===================================================================
+--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+@@ -70,6 +70,23 @@
  #endif
  #include <unistd.h>
  
@@ -29,7 +35,7 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
  #if OS(SOLARIS)
  #include <thread.h>
  #else
-@@ -667,18 +683,61 @@ static inline void* currentThreadStackBa
+@@ -648,6 +665,37 @@
      get_thread_info(find_thread(NULL), &threadInfo);
      return threadInfo.stack_end;
  #elif OS(UNIX)
@@ -67,7 +73,7 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
      AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
      MutexLocker locker(mutex);
      static void* stackBase = 0;
-     static size_t stackSize = 0;
+@@ -655,11 +703,23 @@
      static pthread_t stackThread;
      pthread_t thread = pthread_self();
      if (stackBase == 0 || thread != stackThread) {
@@ -91,11 +97,11 @@ Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
  #else
          // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
          pthread_getattr_np(thread, &sattr);
-@@ -690,6 +749,7 @@ static inline void* currentThreadStackBa
+@@ -671,6 +731,7 @@
          stackThread = thread;
      }
      return static_cast<char*>(stackBase) + stackSize;
 +#endif
- #elif OS(WINCE)
-     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
-     MutexLocker locker(mutex);
+ #else
+ #error Need a way to get the stack base on this platform
+ #endif
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 776eb63afb..7e6c5dd25a 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION = 4.8.0
+QT_VERSION = 4.8.1
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://get.qt.nokia.com/qt/source
 QT_DEPENDENCIES = host-pkg-config

From e42361bb01eb40c52e3f6de6e77bf761fff397c5 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 4 Apr 2012 10:23:44 +0100
Subject: [PATCH 1721/6849] rpm: Fix automagic dependency on openssl

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpm/rpm.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 9f42ee18d5..4ce2ecb80d 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -13,6 +13,7 @@ RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I
 RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 	--without-selinux \
 	--without-python --without-perl \
+	--with-openssl=external \
 	--with-zlib=$(STAGING_DIR) \
 	--with-libbeecrypt=$(STAGING_DIR) \
 	--with-popt=$(STAGING_DIR)

From 4fbff28b990276c9a37d04b4e1ab947f10b87ea4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Apr 2012 21:55:04 +0200
Subject: [PATCH 1722/6849] neon: use select rather than 'depends on' for xml
 dependencies

Similar to how we recently changed dbus. At the same time also reorder
options to put 'none' option in front (default).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/Config.in | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/neon/Config.in b/package/neon/Config.in
index 53cc8f5686..92af8da912 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -24,27 +24,27 @@ choice
 	depends on BR2_PACKAGE_NEON
 	help
 	  Select which XML library to use...
+	  none       do not build with XML support
 	  expat      use expat
 	  libxml2    use libxml2
-	  none       do not build with XML support
+
+config BR2_PACKAGE_NEON_NOXML
+	bool "none"
+	help
+	  none       don't use XML, if this is the only option
+	             and you want XML support, you must choose
+		     XML handling below.
 
 config BR2_PACKAGE_NEON_EXPAT
 	bool "expat"
-	depends on BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_EXPAT
 	help
 	  expat      use expat, a library for parsing XML.
 
 config BR2_PACKAGE_NEON_LIBXML2
 	bool "libxml2"
-	depends on BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBXML2
 	help
 	  libxml2    use libxml2, a library to read, modify and
 	             write XML and HTML files.
-
-config BR2_PACKAGE_NEON_NOXML
-	bool "none"
-	help
-	  none       don't use XML, if this is the only option
-	             and you want XML support, you must choose
-		     XML handling below.
 endchoice

From defa173e08a34723f7a168ea4b76b10578591d6c Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 23 Mar 2012 01:51:34 +0100
Subject: [PATCH 1723/6849] Add libcap-ng package.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/libcap-ng/Config.in    | 10 ++++++++++
 package/libcap-ng/libcap-ng.mk | 12 ++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/libcap-ng/Config.in
 create mode 100644 package/libcap-ng/libcap-ng.mk

diff --git a/package/Config.in b/package/Config.in
index e1629c8861..e4f7dd2b2d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -377,6 +377,7 @@ source "package/argp-standalone/Config.in"
 source "package/boost/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
+source "package/libcap-ng/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
diff --git a/package/libcap-ng/Config.in b/package/libcap-ng/Config.in
new file mode 100644
index 0000000000..d1663cdefc
--- /dev/null
+++ b/package/libcap-ng/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBCAP_NG
+	bool "libcap-ng"
+	help
+	  The libcap-ng library is intended to make programming with
+	  posix capabilities much easier than the traditional libcap
+	  library. It includes utilities that can analyse all currently
+	  running applications and print out any capabilities and whether
+	  or not it has an open ended bounding set.
+
+	  http://people.redhat.com/sgrubb/libcap-ng/
diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
new file mode 100644
index 0000000000..6ea5de4dc1
--- /dev/null
+++ b/package/libcap-ng/libcap-ng.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libcap-ng
+#
+#############################################################
+
+LIBCAP_NG_VERSION = 0.6.6
+LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng/
+LIBCAP_NG_SOURCE = libcap-ng-$(LIBCAP_NG_VERSION).tar.gz
+LIBCAP_NG_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From f8fcdcc041d547e9ac2b4fe243e8a7febf905097 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Apr 2012 22:08:41 +0200
Subject: [PATCH 1724/6849] lttng-libust: rename cxx-tests patch so the other
 patches gets used as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...=> lttng-libust-dont-build-cxx-tests-when-not-available.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/lttng-libust/{lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch => lttng-libust-dont-build-cxx-tests-when-not-available.patch} (100%)

diff --git a/package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
similarity index 100%
rename from package/lttng-libust/lttng-libust-1.9.2-dont-build-cxx-tests-when-not-available.patch
rename to package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch

From fd86fe21d59fb196ed27fd0f71ab9e09302618d0 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 27 Mar 2012 10:49:53 +0200
Subject: [PATCH 1725/6849] feh: bump to 2.5

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index c461ac6948..4f326ef1d1 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.4
+FEH_VERSION = 2.5
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From 360b31caf71477b07ed1c54b9ae4de5aa3c3176c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 27 Mar 2012 10:49:54 +0200
Subject: [PATCH 1726/6849] directfb: bump to 1.4.16

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 977d272199..071cdf4fcf 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 DIRECTFB_VERSION_MAJOR = 1.4
-DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).15
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).16
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_AUTORECONF = YES

From 1eb46725de8c74f28ed5d3894bd81b7d9ab35272 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 19 Mar 2012 16:48:24 -0300
Subject: [PATCH 1727/6849] toolchain/microblaze: fix up big-endian
 characteristics

The big-endian microblaze external toolchain is missing vital
characteristics being set, such as LARGEFILE support, IPV6 and so on.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Stephan Hoffmann <sho@reLinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 991684fc06..49ea7fa21b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -461,6 +461,11 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_INET_RPC
+	select BR2_ENABLE_LOCALE
+	select BR2_USE_WCHAR
 	help
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools

From 2bf6c987e68b6cfe1beb6818b90fb814a29af2fb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 19 Mar 2012 18:44:38 -0300
Subject: [PATCH 1728/6849] qemu/microblazeel-mmu: add new sample config

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Stephan Hoffmann <sho@reLinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/microblazeel-mmu/kernel-3.3.config |  67 ++++
 board/qemu/microblazeel-mmu/readme.txt        |   6 +
 board/qemu/microblazeel-mmu/system.dts        | 367 ++++++++++++++++++
 configs/qemu_microblazeel_mmu_defconfig       |  17 +
 4 files changed, 457 insertions(+)
 create mode 100644 board/qemu/microblazeel-mmu/kernel-3.3.config
 create mode 100644 board/qemu/microblazeel-mmu/readme.txt
 create mode 100644 board/qemu/microblazeel-mmu/system.dts
 create mode 100644 configs/qemu_microblazeel_mmu_defconfig

diff --git a/board/qemu/microblazeel-mmu/kernel-3.3.config b/board/qemu/microblazeel-mmu/kernel-3.3.config
new file mode 100644
index 0000000000..cdeb3242df
--- /dev/null
+++ b/board/qemu/microblazeel-mmu/kernel-3.3.config
@@ -0,0 +1,67 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
+CONFIG_INITRAMFS_COMPRESSION_GZIP=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_HOTPLUG is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+# CONFIG_SIGNALFD is not set
+# CONFIG_SHMEM is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3adsp"
+CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
+CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
+CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
+CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
+CONFIG_HZ_100=y
+CONFIG_MMU=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE_FORCE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_XILINX_EMACLITE=y
+# CONFIG_INPUT is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+# CONFIG_DNOTIFY is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_CIFS=y
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
new file mode 100644
index 0000000000..43a40e8920
--- /dev/null
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -0,0 +1,6 @@
+Run the emulation with:
+
+ qemu-system-microblazeel -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio
+
+The login prompt will appear in the terminal that started Qemu.
+
diff --git a/board/qemu/microblazeel-mmu/system.dts b/board/qemu/microblazeel-mmu/system.dts
new file mode 100644
index 0000000000..3f85df2b73
--- /dev/null
+++ b/board/qemu/microblazeel-mmu/system.dts
@@ -0,0 +1,367 @@
+/*
+ * Device Tree Generator version: 1.1
+ *
+ * (C) Copyright 2007-2008 Xilinx, Inc.
+ * (C) Copyright 2007-2009 Michal Simek
+ *
+ * Michal SIMEK <monstr@monstr.eu>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * CAUTION: This file is automatically generated by libgen.
+ * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
+ *
+ * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
+ */
+
+/dts-v1/;
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	compatible = "xlnx,microblaze";
+	hard-reset-gpios = <&LEDs_8Bit 2 1>;
+	model = "testing";
+	DDR2_SDRAM: memory@90000000 {
+		device_type = "memory";
+		reg = < 0x90000000 0x10000000 >;
+	} ;
+	aliases {
+		ethernet0 = &Hard_Ethernet_MAC;
+		serial0 = &RS232_Uart_1;
+	} ;
+	chosen {
+		bootargs = "console=ttyUL0,115200 highres=on";
+		linux,stdout-path = "/plb@0/serial@84000000";
+	} ;
+	cpus {
+		#address-cells = <1>;
+		#cpus = <0x1>;
+		#size-cells = <0>;
+		microblaze_0: cpu@0 {
+			clock-frequency = <125000000>;
+			compatible = "xlnx,microblaze-7.10.d";
+			d-cache-baseaddr = <0x90000000>;
+			d-cache-highaddr = <0x9fffffff>;
+			d-cache-line-size = <0x10>;
+			d-cache-size = <0x2000>;
+			device_type = "cpu";
+			i-cache-baseaddr = <0x90000000>;
+			i-cache-highaddr = <0x9fffffff>;
+			i-cache-line-size = <0x10>;
+			i-cache-size = <0x2000>;
+			model = "microblaze,7.10.d";
+			reg = <0>;
+			timebase-frequency = <125000000>;
+			xlnx,addr-tag-bits = <0xf>;
+			xlnx,allow-dcache-wr = <0x1>;
+			xlnx,allow-icache-wr = <0x1>;
+			xlnx,area-optimized = <0x0>;
+			xlnx,cache-byte-size = <0x2000>;
+			xlnx,d-lmb = <0x1>;
+			xlnx,d-opb = <0x0>;
+			xlnx,d-plb = <0x1>;
+			xlnx,data-size = <0x20>;
+			xlnx,dcache-addr-tag = <0xf>;
+			xlnx,dcache-always-used = <0x1>;
+			xlnx,dcache-byte-size = <0x2000>;
+			xlnx,dcache-line-len = <0x4>;
+			xlnx,dcache-use-fsl = <0x1>;
+			xlnx,debug-enabled = <0x1>;
+			xlnx,div-zero-exception = <0x1>;
+			xlnx,dopb-bus-exception = <0x0>;
+			xlnx,dynamic-bus-sizing = <0x1>;
+			xlnx,edge-is-positive = <0x1>;
+			xlnx,family = "virtex5";
+			xlnx,endianness = <0x1>;
+			xlnx,fpu-exception = <0x1>;
+			xlnx,fsl-data-size = <0x20>;
+			xlnx,fsl-exception = <0x0>;
+			xlnx,fsl-links = <0x0>;
+			xlnx,i-lmb = <0x1>;
+			xlnx,i-opb = <0x0>;
+			xlnx,i-plb = <0x1>;
+			xlnx,icache-always-used = <0x1>;
+			xlnx,icache-line-len = <0x4>;
+			xlnx,icache-use-fsl = <0x1>;
+			xlnx,ill-opcode-exception = <0x1>;
+			xlnx,instance = "microblaze_0";
+			xlnx,interconnect = <0x1>;
+			xlnx,interrupt-is-edge = <0x0>;
+			xlnx,iopb-bus-exception = <0x0>;
+			xlnx,mmu-dtlb-size = <0x4>;
+			xlnx,mmu-itlb-size = <0x2>;
+			xlnx,mmu-tlb-access = <0x3>;
+			xlnx,mmu-zones = <0x10>;
+			xlnx,number-of-pc-brk = <0x1>;
+			xlnx,number-of-rd-addr-brk = <0x0>;
+			xlnx,number-of-wr-addr-brk = <0x0>;
+			xlnx,opcode-0x0-illegal = <0x1>;
+			xlnx,pvr = <0x2>;
+			xlnx,pvr-user1 = <0x0>;
+			xlnx,pvr-user2 = <0x0>;
+			xlnx,reset-msr = <0x0>;
+			xlnx,sco = <0x0>;
+			xlnx,unaligned-exceptions = <0x1>;
+			xlnx,use-barrel = <0x1>;
+			xlnx,use-dcache = <0x1>;
+			xlnx,use-div = <0x1>;
+			xlnx,use-ext-brk = <0x1>;
+			xlnx,use-ext-nm-brk = <0x1>;
+			xlnx,use-extended-fsl-instr = <0x0>;
+			xlnx,use-fpu = <0x2>;
+			xlnx,use-hw-mul = <0x2>;
+			xlnx,use-icache = <0x1>;
+			xlnx,use-interrupt = <0x1>;
+			xlnx,use-mmu = <0x3>;
+			xlnx,use-msr-instr = <0x1>;
+			xlnx,use-pcmp-instr = <0x1>;
+		} ;
+	} ;
+	mb_plb: plb@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
+		ranges ;
+		FLASH: flash@a0000000 {
+			bank-width = <2>;
+			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
+			reg = < 0xa0000000 0x2000000 >;
+			xlnx,family = "virtex5";
+			xlnx,include-datawidth-matching-0 = <0x1>;
+			xlnx,include-datawidth-matching-1 = <0x0>;
+			xlnx,include-datawidth-matching-2 = <0x0>;
+			xlnx,include-datawidth-matching-3 = <0x0>;
+			xlnx,include-negedge-ioregs = <0x0>;
+			xlnx,include-plb-ipif = <0x1>;
+			xlnx,include-wrbuf = <0x1>;
+			xlnx,max-mem-width = <0x10>;
+			xlnx,mch-native-dwidth = <0x20>;
+			xlnx,mch-plb-clk-period-ps = <0x1f40>;
+			xlnx,mch-splb-awidth = <0x20>;
+			xlnx,mch0-accessbuf-depth = <0x10>;
+			xlnx,mch0-protocol = <0x0>;
+			xlnx,mch0-rddatabuf-depth = <0x10>;
+			xlnx,mch1-accessbuf-depth = <0x10>;
+			xlnx,mch1-protocol = <0x0>;
+			xlnx,mch1-rddatabuf-depth = <0x10>;
+			xlnx,mch2-accessbuf-depth = <0x10>;
+			xlnx,mch2-protocol = <0x0>;
+			xlnx,mch2-rddatabuf-depth = <0x10>;
+			xlnx,mch3-accessbuf-depth = <0x10>;
+			xlnx,mch3-protocol = <0x0>;
+			xlnx,mch3-rddatabuf-depth = <0x10>;
+			xlnx,mem0-width = <0x10>;
+			xlnx,mem1-width = <0x20>;
+			xlnx,mem2-width = <0x20>;
+			xlnx,mem3-width = <0x20>;
+			xlnx,num-banks-mem = <0x1>;
+			xlnx,num-channels = <0x0>;
+			xlnx,priority-mode = <0x0>;
+			xlnx,synch-mem-0 = <0x0>;
+			xlnx,synch-mem-1 = <0x0>;
+			xlnx,synch-mem-2 = <0x0>;
+			xlnx,synch-mem-3 = <0x0>;
+			xlnx,synch-pipedelay-0 = <0x2>;
+			xlnx,synch-pipedelay-1 = <0x2>;
+			xlnx,synch-pipedelay-2 = <0x2>;
+			xlnx,synch-pipedelay-3 = <0x2>;
+			xlnx,tavdv-ps-mem-0 = <0x1adb0>;
+			xlnx,tavdv-ps-mem-1 = <0x3a98>;
+			xlnx,tavdv-ps-mem-2 = <0x3a98>;
+			xlnx,tavdv-ps-mem-3 = <0x3a98>;
+			xlnx,tcedv-ps-mem-0 = <0x1adb0>;
+			xlnx,tcedv-ps-mem-1 = <0x3a98>;
+			xlnx,tcedv-ps-mem-2 = <0x3a98>;
+			xlnx,tcedv-ps-mem-3 = <0x3a98>;
+			xlnx,thzce-ps-mem-0 = <0x88b8>;
+			xlnx,thzce-ps-mem-1 = <0x1b58>;
+			xlnx,thzce-ps-mem-2 = <0x1b58>;
+			xlnx,thzce-ps-mem-3 = <0x1b58>;
+			xlnx,thzoe-ps-mem-0 = <0x1b58>;
+			xlnx,thzoe-ps-mem-1 = <0x1b58>;
+			xlnx,thzoe-ps-mem-2 = <0x1b58>;
+			xlnx,thzoe-ps-mem-3 = <0x1b58>;
+			xlnx,tlzwe-ps-mem-0 = <0x88b8>;
+			xlnx,tlzwe-ps-mem-1 = <0x0>;
+			xlnx,tlzwe-ps-mem-2 = <0x0>;
+			xlnx,tlzwe-ps-mem-3 = <0x0>;
+			xlnx,twc-ps-mem-0 = <0x2af8>;
+			xlnx,twc-ps-mem-1 = <0x3a98>;
+			xlnx,twc-ps-mem-2 = <0x3a98>;
+			xlnx,twc-ps-mem-3 = <0x3a98>;
+			xlnx,twp-ps-mem-0 = <0x11170>;
+			xlnx,twp-ps-mem-1 = <0x2ee0>;
+			xlnx,twp-ps-mem-2 = <0x2ee0>;
+			xlnx,twp-ps-mem-3 = <0x2ee0>;
+			xlnx,xcl0-linesize = <0x4>;
+			xlnx,xcl0-writexfer = <0x1>;
+			xlnx,xcl1-linesize = <0x4>;
+			xlnx,xcl1-writexfer = <0x1>;
+			xlnx,xcl2-linesize = <0x4>;
+			xlnx,xcl2-writexfer = <0x1>;
+			xlnx,xcl3-linesize = <0x4>;
+			xlnx,xcl3-writexfer = <0x1>;
+		} ;
+		Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "xlnx,compound";
+			ranges ;
+			ethernet@81c00000 {
+				compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
+				device_type = "network";
+				interrupt-parent = <&xps_intc_0>;
+				interrupts = < 5 2 >;
+				llink-connected = <&PIM3>;
+				local-mac-address = [ 00 0a 35 00 00 00 ];
+				reg = < 0x81c00000 0x40 >;
+				xlnx,bus2core-clk-ratio = <0x1>;
+				xlnx,phy-type = <0x1>;
+				xlnx,phyaddr = <0x1>;
+				xlnx,rxcsum = <0x0>;
+				xlnx,rxfifo = <0x1000>;
+				xlnx,temac-type = <0x0>;
+				xlnx,txcsum = <0x0>;
+				xlnx,txfifo = <0x1000>;
+			} ;
+		} ;
+		IIC_EEPROM: i2c@81600000 {
+			compatible = "xlnx,xps-iic-2.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 6 2 >;
+			reg = < 0x81600000 0x10000 >;
+			xlnx,clk-freq = <0x7735940>;
+			xlnx,family = "virtex5";
+			xlnx,gpo-width = <0x1>;
+			xlnx,iic-freq = <0x186a0>;
+			xlnx,scl-inertial-delay = <0x0>;
+			xlnx,sda-inertial-delay = <0x0>;
+			xlnx,ten-bit-adr = <0x0>;
+		} ;
+		LEDs_8Bit: gpio@81400000 {
+			compatible = "xlnx,xps-gpio-1.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 7 2 >;
+			reg = < 0x81400000 0x10000 >;
+			xlnx,all-inputs = <0x0>;
+			xlnx,all-inputs-2 = <0x0>;
+			xlnx,dout-default = <0x0>;
+			xlnx,dout-default-2 = <0x0>;
+			xlnx,family = "virtex5";
+			xlnx,gpio-width = <0x8>;
+			xlnx,interrupt-present = <0x1>;
+			xlnx,is-bidir = <0x1>;
+			xlnx,is-bidir-2 = <0x1>;
+			xlnx,is-dual = <0x0>;
+			xlnx,tri-default = <0xffffffff>;
+			xlnx,tri-default-2 = <0xffffffff>;
+			#gpio-cells = <2>;
+			gpio-controller;
+		} ;
+
+		gpio-leds {
+			compatible = "gpio-leds";
+
+			heartbeat {
+				label = "Heartbeat";
+				gpios = <&LEDs_8Bit 4 1>;
+				linux,default-trigger = "heartbeat";
+			};
+
+			yellow {
+				label = "Yellow";
+				gpios = <&LEDs_8Bit 5 1>;
+			};
+
+			red {
+				label = "Red";
+				gpios = <&LEDs_8Bit 6 1>;
+			};
+
+			green {
+				label = "Green";
+				gpios = <&LEDs_8Bit 7 1>;
+			};
+		} ;
+		RS232_Uart_1: serial@84000000 {
+			clock-frequency = <125000000>;
+			compatible = "xlnx,xps-uartlite-1.00.a";
+			current-speed = <115200>;
+			device_type = "serial";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 8 0 >;
+			port-number = <0>;
+			reg = < 0x84000000 0x10000 >;
+			xlnx,baudrate = <0x1c200>;
+			xlnx,data-bits = <0x8>;
+			xlnx,family = "virtex5";
+			xlnx,odd-parity = <0x0>;
+			xlnx,use-parity = <0x0>;
+		} ;
+		SysACE_CompactFlash: sysace@83600000 {
+			compatible = "xlnx,xps-sysace-1.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 4 2 >;
+			reg = < 0x83600000 0x10000 >;
+			xlnx,family = "virtex5";
+			xlnx,mem-width = <0x10>;
+		} ;
+		debug_module: debug@84400000 {
+			compatible = "xlnx,mdm-1.00.d";
+			reg = < 0x84400000 0x10000 >;
+			xlnx,family = "virtex5";
+			xlnx,interconnect = <0x1>;
+			xlnx,jtag-chain = <0x2>;
+			xlnx,mb-dbg-ports = <0x1>;
+			xlnx,uart-width = <0x8>;
+			xlnx,use-uart = <0x1>;
+			xlnx,write-fsl-ports = <0x0>;
+		} ;
+		mpmc@90000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "xlnx,mpmc-4.02.a";
+			ranges ;
+			PIM3: sdma@84600180 {
+				compatible = "xlnx,ll-dma-1.00.a";
+				interrupt-parent = <&xps_intc_0>;
+				interrupts = < 2 2 1 2 >;
+				reg = < 0x84600180 0x80 >;
+			} ;
+		} ;
+		xps_intc_0: interrupt-controller@81800000 {
+			#interrupt-cells = <0x2>;
+			compatible = "xlnx,xps-intc-1.00.a";
+			interrupt-controller ;
+			reg = < 0x81800000 0x10000 >;
+			xlnx,kind-of-intr = <0x100>;
+			xlnx,num-intr-inputs = <0x9>;
+		} ;
+		xps_timer_1: timer@83c00000 {
+			compatible = "xlnx,xps-timer-1.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 3 2 >;
+			reg = < 0x83c00000 0x10000 >;
+			xlnx,count-width = <0x20>;
+			xlnx,family = "virtex5";
+			xlnx,gen0-assert = <0x1>;
+			xlnx,gen1-assert = <0x1>;
+			xlnx,one-timer-only = <0x0>;
+			xlnx,trig0-assert = <0x1>;
+			xlnx,trig1-assert = <0x1>;
+		} ;
+	} ;
+}  ;
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
new file mode 100644
index 0000000000..61420b4593
--- /dev/null
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -0,0 +1,17 @@
+BR2_microblaze=y
+BR2_microblazeel=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="microblazeel-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
+BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazeel-mmu/system.dts"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="linux.bin"

From 082751ea823b5b887f88e2cebd7c093726c2a02b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 19 Mar 2012 18:44:39 -0300
Subject: [PATCH 1729/6849] qemu/microblazebe-mmu: add new sample config

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Stephan Hoffmann <sho@reLinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/microblazebe-mmu/kernel-3.3.config |  68 ++++
 board/qemu/microblazebe-mmu/readme.txt        |   6 +
 board/qemu/microblazebe-mmu/system.dts        | 367 ++++++++++++++++++
 configs/qemu_microblazebe_mmu_defconfig       |  16 +
 4 files changed, 457 insertions(+)
 create mode 100644 board/qemu/microblazebe-mmu/kernel-3.3.config
 create mode 100644 board/qemu/microblazebe-mmu/readme.txt
 create mode 100644 board/qemu/microblazebe-mmu/system.dts
 create mode 100644 configs/qemu_microblazebe_mmu_defconfig

diff --git a/board/qemu/microblazebe-mmu/kernel-3.3.config b/board/qemu/microblazebe-mmu/kernel-3.3.config
new file mode 100644
index 0000000000..7083cf568e
--- /dev/null
+++ b/board/qemu/microblazebe-mmu/kernel-3.3.config
@@ -0,0 +1,68 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
+CONFIG_INITRAMFS_COMPRESSION_GZIP=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_HOTPLUG is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+# CONFIG_EPOLL is not set
+# CONFIG_SIGNALFD is not set
+# CONFIG_SHMEM is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_OPT_LIB_ASM=y
+CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3adsp"
+CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
+CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
+CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
+CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
+CONFIG_HZ_100=y
+CONFIG_MMU=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE_FORCE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_XILINX_EMACLITE=y
+# CONFIG_INPUT is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+# CONFIG_DNOTIFY is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_CIFS=y
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_SLAB=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
new file mode 100644
index 0000000000..c59c0bde18
--- /dev/null
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -0,0 +1,6 @@
+Run the emulation with:
+
+ qemu-system-microblaze -M petalogix-s3adsp1800 -kernel output/images/linux.bin -serial stdio
+
+The login prompt will appear in the terminal that started Qemu.
+
diff --git a/board/qemu/microblazebe-mmu/system.dts b/board/qemu/microblazebe-mmu/system.dts
new file mode 100644
index 0000000000..3f85df2b73
--- /dev/null
+++ b/board/qemu/microblazebe-mmu/system.dts
@@ -0,0 +1,367 @@
+/*
+ * Device Tree Generator version: 1.1
+ *
+ * (C) Copyright 2007-2008 Xilinx, Inc.
+ * (C) Copyright 2007-2009 Michal Simek
+ *
+ * Michal SIMEK <monstr@monstr.eu>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * CAUTION: This file is automatically generated by libgen.
+ * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6
+ *
+ * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101
+ */
+
+/dts-v1/;
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	compatible = "xlnx,microblaze";
+	hard-reset-gpios = <&LEDs_8Bit 2 1>;
+	model = "testing";
+	DDR2_SDRAM: memory@90000000 {
+		device_type = "memory";
+		reg = < 0x90000000 0x10000000 >;
+	} ;
+	aliases {
+		ethernet0 = &Hard_Ethernet_MAC;
+		serial0 = &RS232_Uart_1;
+	} ;
+	chosen {
+		bootargs = "console=ttyUL0,115200 highres=on";
+		linux,stdout-path = "/plb@0/serial@84000000";
+	} ;
+	cpus {
+		#address-cells = <1>;
+		#cpus = <0x1>;
+		#size-cells = <0>;
+		microblaze_0: cpu@0 {
+			clock-frequency = <125000000>;
+			compatible = "xlnx,microblaze-7.10.d";
+			d-cache-baseaddr = <0x90000000>;
+			d-cache-highaddr = <0x9fffffff>;
+			d-cache-line-size = <0x10>;
+			d-cache-size = <0x2000>;
+			device_type = "cpu";
+			i-cache-baseaddr = <0x90000000>;
+			i-cache-highaddr = <0x9fffffff>;
+			i-cache-line-size = <0x10>;
+			i-cache-size = <0x2000>;
+			model = "microblaze,7.10.d";
+			reg = <0>;
+			timebase-frequency = <125000000>;
+			xlnx,addr-tag-bits = <0xf>;
+			xlnx,allow-dcache-wr = <0x1>;
+			xlnx,allow-icache-wr = <0x1>;
+			xlnx,area-optimized = <0x0>;
+			xlnx,cache-byte-size = <0x2000>;
+			xlnx,d-lmb = <0x1>;
+			xlnx,d-opb = <0x0>;
+			xlnx,d-plb = <0x1>;
+			xlnx,data-size = <0x20>;
+			xlnx,dcache-addr-tag = <0xf>;
+			xlnx,dcache-always-used = <0x1>;
+			xlnx,dcache-byte-size = <0x2000>;
+			xlnx,dcache-line-len = <0x4>;
+			xlnx,dcache-use-fsl = <0x1>;
+			xlnx,debug-enabled = <0x1>;
+			xlnx,div-zero-exception = <0x1>;
+			xlnx,dopb-bus-exception = <0x0>;
+			xlnx,dynamic-bus-sizing = <0x1>;
+			xlnx,edge-is-positive = <0x1>;
+			xlnx,family = "virtex5";
+			xlnx,endianness = <0x1>;
+			xlnx,fpu-exception = <0x1>;
+			xlnx,fsl-data-size = <0x20>;
+			xlnx,fsl-exception = <0x0>;
+			xlnx,fsl-links = <0x0>;
+			xlnx,i-lmb = <0x1>;
+			xlnx,i-opb = <0x0>;
+			xlnx,i-plb = <0x1>;
+			xlnx,icache-always-used = <0x1>;
+			xlnx,icache-line-len = <0x4>;
+			xlnx,icache-use-fsl = <0x1>;
+			xlnx,ill-opcode-exception = <0x1>;
+			xlnx,instance = "microblaze_0";
+			xlnx,interconnect = <0x1>;
+			xlnx,interrupt-is-edge = <0x0>;
+			xlnx,iopb-bus-exception = <0x0>;
+			xlnx,mmu-dtlb-size = <0x4>;
+			xlnx,mmu-itlb-size = <0x2>;
+			xlnx,mmu-tlb-access = <0x3>;
+			xlnx,mmu-zones = <0x10>;
+			xlnx,number-of-pc-brk = <0x1>;
+			xlnx,number-of-rd-addr-brk = <0x0>;
+			xlnx,number-of-wr-addr-brk = <0x0>;
+			xlnx,opcode-0x0-illegal = <0x1>;
+			xlnx,pvr = <0x2>;
+			xlnx,pvr-user1 = <0x0>;
+			xlnx,pvr-user2 = <0x0>;
+			xlnx,reset-msr = <0x0>;
+			xlnx,sco = <0x0>;
+			xlnx,unaligned-exceptions = <0x1>;
+			xlnx,use-barrel = <0x1>;
+			xlnx,use-dcache = <0x1>;
+			xlnx,use-div = <0x1>;
+			xlnx,use-ext-brk = <0x1>;
+			xlnx,use-ext-nm-brk = <0x1>;
+			xlnx,use-extended-fsl-instr = <0x0>;
+			xlnx,use-fpu = <0x2>;
+			xlnx,use-hw-mul = <0x2>;
+			xlnx,use-icache = <0x1>;
+			xlnx,use-interrupt = <0x1>;
+			xlnx,use-mmu = <0x3>;
+			xlnx,use-msr-instr = <0x1>;
+			xlnx,use-pcmp-instr = <0x1>;
+		} ;
+	} ;
+	mb_plb: plb@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus";
+		ranges ;
+		FLASH: flash@a0000000 {
+			bank-width = <2>;
+			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
+			reg = < 0xa0000000 0x2000000 >;
+			xlnx,family = "virtex5";
+			xlnx,include-datawidth-matching-0 = <0x1>;
+			xlnx,include-datawidth-matching-1 = <0x0>;
+			xlnx,include-datawidth-matching-2 = <0x0>;
+			xlnx,include-datawidth-matching-3 = <0x0>;
+			xlnx,include-negedge-ioregs = <0x0>;
+			xlnx,include-plb-ipif = <0x1>;
+			xlnx,include-wrbuf = <0x1>;
+			xlnx,max-mem-width = <0x10>;
+			xlnx,mch-native-dwidth = <0x20>;
+			xlnx,mch-plb-clk-period-ps = <0x1f40>;
+			xlnx,mch-splb-awidth = <0x20>;
+			xlnx,mch0-accessbuf-depth = <0x10>;
+			xlnx,mch0-protocol = <0x0>;
+			xlnx,mch0-rddatabuf-depth = <0x10>;
+			xlnx,mch1-accessbuf-depth = <0x10>;
+			xlnx,mch1-protocol = <0x0>;
+			xlnx,mch1-rddatabuf-depth = <0x10>;
+			xlnx,mch2-accessbuf-depth = <0x10>;
+			xlnx,mch2-protocol = <0x0>;
+			xlnx,mch2-rddatabuf-depth = <0x10>;
+			xlnx,mch3-accessbuf-depth = <0x10>;
+			xlnx,mch3-protocol = <0x0>;
+			xlnx,mch3-rddatabuf-depth = <0x10>;
+			xlnx,mem0-width = <0x10>;
+			xlnx,mem1-width = <0x20>;
+			xlnx,mem2-width = <0x20>;
+			xlnx,mem3-width = <0x20>;
+			xlnx,num-banks-mem = <0x1>;
+			xlnx,num-channels = <0x0>;
+			xlnx,priority-mode = <0x0>;
+			xlnx,synch-mem-0 = <0x0>;
+			xlnx,synch-mem-1 = <0x0>;
+			xlnx,synch-mem-2 = <0x0>;
+			xlnx,synch-mem-3 = <0x0>;
+			xlnx,synch-pipedelay-0 = <0x2>;
+			xlnx,synch-pipedelay-1 = <0x2>;
+			xlnx,synch-pipedelay-2 = <0x2>;
+			xlnx,synch-pipedelay-3 = <0x2>;
+			xlnx,tavdv-ps-mem-0 = <0x1adb0>;
+			xlnx,tavdv-ps-mem-1 = <0x3a98>;
+			xlnx,tavdv-ps-mem-2 = <0x3a98>;
+			xlnx,tavdv-ps-mem-3 = <0x3a98>;
+			xlnx,tcedv-ps-mem-0 = <0x1adb0>;
+			xlnx,tcedv-ps-mem-1 = <0x3a98>;
+			xlnx,tcedv-ps-mem-2 = <0x3a98>;
+			xlnx,tcedv-ps-mem-3 = <0x3a98>;
+			xlnx,thzce-ps-mem-0 = <0x88b8>;
+			xlnx,thzce-ps-mem-1 = <0x1b58>;
+			xlnx,thzce-ps-mem-2 = <0x1b58>;
+			xlnx,thzce-ps-mem-3 = <0x1b58>;
+			xlnx,thzoe-ps-mem-0 = <0x1b58>;
+			xlnx,thzoe-ps-mem-1 = <0x1b58>;
+			xlnx,thzoe-ps-mem-2 = <0x1b58>;
+			xlnx,thzoe-ps-mem-3 = <0x1b58>;
+			xlnx,tlzwe-ps-mem-0 = <0x88b8>;
+			xlnx,tlzwe-ps-mem-1 = <0x0>;
+			xlnx,tlzwe-ps-mem-2 = <0x0>;
+			xlnx,tlzwe-ps-mem-3 = <0x0>;
+			xlnx,twc-ps-mem-0 = <0x2af8>;
+			xlnx,twc-ps-mem-1 = <0x3a98>;
+			xlnx,twc-ps-mem-2 = <0x3a98>;
+			xlnx,twc-ps-mem-3 = <0x3a98>;
+			xlnx,twp-ps-mem-0 = <0x11170>;
+			xlnx,twp-ps-mem-1 = <0x2ee0>;
+			xlnx,twp-ps-mem-2 = <0x2ee0>;
+			xlnx,twp-ps-mem-3 = <0x2ee0>;
+			xlnx,xcl0-linesize = <0x4>;
+			xlnx,xcl0-writexfer = <0x1>;
+			xlnx,xcl1-linesize = <0x4>;
+			xlnx,xcl1-writexfer = <0x1>;
+			xlnx,xcl2-linesize = <0x4>;
+			xlnx,xcl2-writexfer = <0x1>;
+			xlnx,xcl3-linesize = <0x4>;
+			xlnx,xcl3-writexfer = <0x1>;
+		} ;
+		Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "xlnx,compound";
+			ranges ;
+			ethernet@81c00000 {
+				compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
+				device_type = "network";
+				interrupt-parent = <&xps_intc_0>;
+				interrupts = < 5 2 >;
+				llink-connected = <&PIM3>;
+				local-mac-address = [ 00 0a 35 00 00 00 ];
+				reg = < 0x81c00000 0x40 >;
+				xlnx,bus2core-clk-ratio = <0x1>;
+				xlnx,phy-type = <0x1>;
+				xlnx,phyaddr = <0x1>;
+				xlnx,rxcsum = <0x0>;
+				xlnx,rxfifo = <0x1000>;
+				xlnx,temac-type = <0x0>;
+				xlnx,txcsum = <0x0>;
+				xlnx,txfifo = <0x1000>;
+			} ;
+		} ;
+		IIC_EEPROM: i2c@81600000 {
+			compatible = "xlnx,xps-iic-2.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 6 2 >;
+			reg = < 0x81600000 0x10000 >;
+			xlnx,clk-freq = <0x7735940>;
+			xlnx,family = "virtex5";
+			xlnx,gpo-width = <0x1>;
+			xlnx,iic-freq = <0x186a0>;
+			xlnx,scl-inertial-delay = <0x0>;
+			xlnx,sda-inertial-delay = <0x0>;
+			xlnx,ten-bit-adr = <0x0>;
+		} ;
+		LEDs_8Bit: gpio@81400000 {
+			compatible = "xlnx,xps-gpio-1.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 7 2 >;
+			reg = < 0x81400000 0x10000 >;
+			xlnx,all-inputs = <0x0>;
+			xlnx,all-inputs-2 = <0x0>;
+			xlnx,dout-default = <0x0>;
+			xlnx,dout-default-2 = <0x0>;
+			xlnx,family = "virtex5";
+			xlnx,gpio-width = <0x8>;
+			xlnx,interrupt-present = <0x1>;
+			xlnx,is-bidir = <0x1>;
+			xlnx,is-bidir-2 = <0x1>;
+			xlnx,is-dual = <0x0>;
+			xlnx,tri-default = <0xffffffff>;
+			xlnx,tri-default-2 = <0xffffffff>;
+			#gpio-cells = <2>;
+			gpio-controller;
+		} ;
+
+		gpio-leds {
+			compatible = "gpio-leds";
+
+			heartbeat {
+				label = "Heartbeat";
+				gpios = <&LEDs_8Bit 4 1>;
+				linux,default-trigger = "heartbeat";
+			};
+
+			yellow {
+				label = "Yellow";
+				gpios = <&LEDs_8Bit 5 1>;
+			};
+
+			red {
+				label = "Red";
+				gpios = <&LEDs_8Bit 6 1>;
+			};
+
+			green {
+				label = "Green";
+				gpios = <&LEDs_8Bit 7 1>;
+			};
+		} ;
+		RS232_Uart_1: serial@84000000 {
+			clock-frequency = <125000000>;
+			compatible = "xlnx,xps-uartlite-1.00.a";
+			current-speed = <115200>;
+			device_type = "serial";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 8 0 >;
+			port-number = <0>;
+			reg = < 0x84000000 0x10000 >;
+			xlnx,baudrate = <0x1c200>;
+			xlnx,data-bits = <0x8>;
+			xlnx,family = "virtex5";
+			xlnx,odd-parity = <0x0>;
+			xlnx,use-parity = <0x0>;
+		} ;
+		SysACE_CompactFlash: sysace@83600000 {
+			compatible = "xlnx,xps-sysace-1.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 4 2 >;
+			reg = < 0x83600000 0x10000 >;
+			xlnx,family = "virtex5";
+			xlnx,mem-width = <0x10>;
+		} ;
+		debug_module: debug@84400000 {
+			compatible = "xlnx,mdm-1.00.d";
+			reg = < 0x84400000 0x10000 >;
+			xlnx,family = "virtex5";
+			xlnx,interconnect = <0x1>;
+			xlnx,jtag-chain = <0x2>;
+			xlnx,mb-dbg-ports = <0x1>;
+			xlnx,uart-width = <0x8>;
+			xlnx,use-uart = <0x1>;
+			xlnx,write-fsl-ports = <0x0>;
+		} ;
+		mpmc@90000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "xlnx,mpmc-4.02.a";
+			ranges ;
+			PIM3: sdma@84600180 {
+				compatible = "xlnx,ll-dma-1.00.a";
+				interrupt-parent = <&xps_intc_0>;
+				interrupts = < 2 2 1 2 >;
+				reg = < 0x84600180 0x80 >;
+			} ;
+		} ;
+		xps_intc_0: interrupt-controller@81800000 {
+			#interrupt-cells = <0x2>;
+			compatible = "xlnx,xps-intc-1.00.a";
+			interrupt-controller ;
+			reg = < 0x81800000 0x10000 >;
+			xlnx,kind-of-intr = <0x100>;
+			xlnx,num-intr-inputs = <0x9>;
+		} ;
+		xps_timer_1: timer@83c00000 {
+			compatible = "xlnx,xps-timer-1.00.a";
+			interrupt-parent = <&xps_intc_0>;
+			interrupts = < 3 2 >;
+			reg = < 0x83c00000 0x10000 >;
+			xlnx,count-width = <0x20>;
+			xlnx,family = "virtex5";
+			xlnx,gen0-assert = <0x1>;
+			xlnx,gen1-assert = <0x1>;
+			xlnx,one-timer-only = <0x0>;
+			xlnx,trig0-assert = <0x1>;
+			xlnx,trig1-assert = <0x1>;
+		} ;
+	} ;
+}  ;
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
new file mode 100644
index 0000000000..378e972903
--- /dev/null
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -0,0 +1,16 @@
+BR2_microblaze=y
+BR2_microblazebe=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
+BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazebe-mmu/system.dts"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="linux.bin"

From 006e073cca1532d2c845389c18697b018d368992 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 12:23:45 +0200
Subject: [PATCH 1730/6849] uClibc: add MSG_WAITFORONE / MSG_CMSG_CLOEXEC for
 0.9.33

Needed by E.G. systemd. Patch from yocto:

http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...Clibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch b/toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch
new file mode 100644
index 0000000000..c699b6b11f
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch
@@ -0,0 +1,28 @@
+Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
+
+From yocto:
+http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
+
+Upstream-Status: Pending
+
+Index: git/libc/sysdeps/linux/common/bits/socket.h
+===================================================================
+--- git.orig/libc/sysdeps/linux/common/bits/socket.h	2012-01-26 23:23:21.537456132 -0800
++++ git/libc/sysdeps/linux/common/bits/socket.h	2012-01-26 23:25:10.125461388 -0800
+@@ -235,8 +235,15 @@
+ #define	MSG_ERRQUEUE	MSG_ERRQUEUE
+     MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
+ #define	MSG_NOSIGNAL	MSG_NOSIGNAL
+-    MSG_MORE		= 0x8000  /* Sender will send more.  */
++    MSG_MORE		= 0x8000,  /* Sender will send more.  */
+ #define	MSG_MORE	MSG_MORE
++    MSG_WAITFORONE      = 0x10000, /* Wait for at least one packet to return.*/
++#define MSG_WAITFORONE  MSG_WAITFORONE
++
++    MSG_CMSG_CLOEXEC    = 0x40000000    /* Set close_on_exit for file
++                                           descriptor received through
++                                           SCM_RIGHTS.  */
++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
+   };
+ 
+ 

From 7a67da440db61b4f44d79c95c092efbf2d04d97d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 12:45:56 +0200
Subject: [PATCH 1731/6849] uClibc: add dup3() for 0.9.33

Needed by E.G. systemd. Patch from uClibc list:

http://lists.uclibc.org/pipermail/uclibc/2011-September/045702.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-0.9.33-dup3.patch | 54 +++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33-dup3.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33-dup3.patch b/toolchain/uClibc/uClibc-0.9.33-dup3.patch
new file mode 100644
index 0000000000..66b419e2bf
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33-dup3.patch
@@ -0,0 +1,54 @@
+From: Jonas Bonn <jonas@southpole.se>
+Subject: [RFC PATCH 16/38] Add dup3 syscall
+Date: Tue,  6 Sep 2011 10:30:40 +0200
+
+Signed-off-by: Jonas Bonn <jonas@southpole.se>
+---
+ include/unistd.h                 |    4 ++++
+ libc/sysdeps/linux/common/dup3.c |   15 +++++++++++++++
+ 2 files changed, 19 insertions(+), 0 deletions(-)
+ create mode 100644 libc/sysdeps/linux/common/dup3.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 9568790..7c2fa4a 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur;
+ extern int dup2 (int __fd, int __fd2) __THROW;
+ libc_hidden_proto(dup2)
+ 
++/* Duplicate FD to FD2, closing FD2 and making it open on the same file.  */
++extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
++libc_hidden_proto(dup3)
++
+ /* NULL-terminated array of "NAME=VALUE" environment variables.  */
+ extern char **__environ;
+ #ifdef __USE_GNU
+diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c
+new file mode 100644
+index 0000000..5fdab2e
+--- /dev/null
++++ b/libc/sysdeps/linux/common/dup3.c
+@@ -0,0 +1,15 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * dup3() for uClibc
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <unistd.h>
++
++
++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
++libc_hidden_def(dup3)
+-- 
+1.7.5.4
+
+_______________________________________________
+uClibc mailing list
+uClibc@uclibc.org
+http://lists.busybox.net/mailman/listinfo/uclibc

From 1cba5cf918c3c5f08f52f9c27802b89dbdbbcf9d Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 4 Apr 2012 16:46:59 +0200
Subject: [PATCH 1732/6849] Bump systemd to version 44

[Peter: handle missing posix_fallocate in uClibc patch]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/systemd/systemd-fix-page-size.patch | 43 +++++++++++++++++++++
 package/systemd/systemd-uclibc-fix.patch    | 31 ++++++++++++---
 package/systemd/systemd.mk                  | 24 +++++++-----
 3 files changed, 83 insertions(+), 15 deletions(-)
 create mode 100644 package/systemd/systemd-fix-page-size.patch

diff --git a/package/systemd/systemd-fix-page-size.patch b/package/systemd/systemd-fix-page-size.patch
new file mode 100644
index 0000000000..241ceb8c0b
--- /dev/null
+++ b/package/systemd/systemd-fix-page-size.patch
@@ -0,0 +1,43 @@
+commit 7264278fbbdc1dc6c30fedc902d1337594aa6ff6
+Author: Lennart Poettering <lennart@poettering.net>
+Date:   Wed Mar 21 23:47:44 2012 +0100
+
+    journal: PAGE_SIZE is not known on ppc and other archs
+    
+    Let's use NAME_MAX, as suggested by Dan Walsh
+
+diff --git a/src/journal/journald.c b/src/journal/journald.c
+index d27cb60..87390bd 100644
+--- a/src/journal/journald.c
++++ b/src/journal/journald.c
+@@ -29,7 +29,6 @@
+ #include <sys/ioctl.h>
+ #include <linux/sockios.h>
+ #include <sys/statvfs.h>
+-#include <sys/user.h>
+ 
+ #include <systemd/sd-journal.h>
+ #include <systemd/sd-login.h>
+@@ -2149,10 +2148,20 @@ static int process_event(Server *s, struct epoll_event *ev) {
+                         size_t label_len = 0;
+                         union {
+                                 struct cmsghdr cmsghdr;
++
++                                /* We use NAME_MAX space for the
++                                 * SELinux label here. The kernel
++                                 * currently enforces no limit, but
++                                 * according to suggestions from the
++                                 * SELinux people this will change and
++                                 * it will probably be identical to
++                                 * NAME_MAX. For now we use that, but
++                                 * this should be updated one day when
++                                 * the final limit is known.*/
+                                 uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
+                                             CMSG_SPACE(sizeof(struct timeval)) +
+-                                            CMSG_SPACE(sizeof(int)) +
+-                                            CMSG_SPACE(PAGE_SIZE)]; /* selinux label */
++                                            CMSG_SPACE(sizeof(int)) + /* fd */
++                                            CMSG_SPACE(NAME_MAX)]; /* selinux label */
+                         } control;
+                         ssize_t n;
+                         int v;
diff --git a/package/systemd/systemd-uclibc-fix.patch b/package/systemd/systemd-uclibc-fix.patch
index 24c32ab94e..9a208450ad 100644
--- a/package/systemd/systemd-uclibc-fix.patch
+++ b/package/systemd/systemd-uclibc-fix.patch
@@ -9,14 +9,15 @@ support to uClibc).
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 ---
- src/macro.h |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
+ src/journal/journal-file.c |    2 ++
+ src/macro.h                |   15 +++++++++++++++
+ 2 files changed, 17 insertions(+)
 
-Index: systemd-37/src/macro.h
+Index: systemd-44/src/macro.h
 ===================================================================
---- systemd-37.orig/src/macro.h
-+++ systemd-37/src/macro.h
-@@ -27,6 +27,21 @@
+--- systemd-44.orig/src/macro.h
++++ systemd-44/src/macro.h
+@@ -28,6 +28,21 @@
  #include <sys/uio.h>
  #include <inttypes.h>
  
@@ -38,3 +39,21 @@ Index: systemd-37/src/macro.h
  #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
  #define _sentinel_ __attribute__ ((sentinel))
  #define _noreturn_ __attribute__((noreturn))
+Index: systemd-44/src/journal/journal-file.c
+===================================================================
+--- systemd-44.orig/src/journal/journal-file.c
++++ systemd-44/src/journal/journal-file.c
+@@ -229,11 +229,13 @@
+                 }
+         }
+ 
++#ifndef __UCLIBC__
+         /* Note that the glibc fallocate() fallback is very
+            inefficient, hence we try to minimize the allocation area
+            as we can. */
+         if (posix_fallocate(f->fd, old_size, new_size - old_size) < 0)
+                 return -errno;
++#endif
+ 
+         if (fstat(f->fd, &f->last_stat) < 0)
+                 return -errno;
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index eded472083..717bdccf4c 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -3,9 +3,9 @@
 # systemd
 #
 #############################################################
-SYSTEMD_VERSION = 37
+SYSTEMD_VERSION = 44
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
-SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.bz2
+SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
 SYSTEMD_DEPENDENCIES = \
 	host-intltool \
 	libcap \
@@ -32,7 +32,8 @@ SYSTEMD_CONF_OPT += \
 	--with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
 	--with-udevrulesdir=/etc/udev/rules.d \
 	--with-sysvinit-path=/etc/init.d/ \
-	--without-sysvrcd-path
+	--without-sysvrcd-path \
+	--enable-split-usr
 
 ifeq ($(BR2_PACKAGE_ACL),y)
 	SYSTEMD_CONF_OPT += --enable-acl
@@ -41,21 +42,26 @@ else
 	SYSTEMD_CONF_OPT += --disable-acl
 endif
 
+ifneq ($(BR2_LARGEFILE),y)
+	SYSTEMD_CONF_OPT += --disable-largefile
+endif
+
 # mq_getattr needs -lrt
 SYSTEMD_MAKE_OPT += LIBS=-lrt
+SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl
 
 define SYSTEMD_INSTALL_INIT_HOOK
-	ln -fs ../bin/systemd $(TARGET_DIR)/sbin/init
-	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt
-	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff
-	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot
+	ln -fs ../usr/lib/systemd/systemd $(TARGET_DIR)/sbin/init
+	ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt
+	ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff
+	ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot
 
-	ln -fs ../../../../lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target
+	ln -fs ../../../usr/lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target
 endef
 
 define SYSTEMD_INSTALL_TTY_HOOK
 	rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
-	ln -fs ../../../../lib/systemd/system/serial-getty@.service $(TARGET_DIR)/etc/systemd/system/getty.target.wants/serial-getty@$(BR2_TARGET_GENERIC_GETTY_PORT).service
+	ln -fs ../../../../usr/lib/systemd/system/serial-getty@.service $(TARGET_DIR)/etc/systemd/system/getty.target.wants/serial-getty@$(BR2_TARGET_GENERIC_GETTY_PORT).service
 endef
 
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \

From 55c181fd0cb2d93b82564c5f9fcfb9adc13fd41b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 08:41:57 -0300
Subject: [PATCH 1733/6849] bind: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bind/Config.in b/package/bind/Config.in
index 9b9c7eeb7d..2944f1ffea 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_BIND
 	bool "bind"
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE
+	# fork()
+	depends on BR2_USE_MMU
 	help
 	  BIND (Berkeley Internet Name Domain) is an implementation of
 	  the Domain Name System (DNS) protocols and provides an openly

From 5b333ffe81ccf36d635c8889e094d1b4fc98fae9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 09:11:40 -0300
Subject: [PATCH 1734/6849] bind: security bump to 9.6-ESV-R6

Correct fix for CVE-2011-4313
9.6-ESV-R5-P1 used a restart workaround.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 0de986da85..987bd4e1ef 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R5-P1
+BIND_VERSION = 9.6-ESV-R6
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From bc28297ce49f7749f6eab268010d3efe473a1353 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 14:48:35 +0200
Subject: [PATCH 1735/6849] sawman: bump version

Old version was not compatible with dfb 1.4.16.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sawman/sawman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index 504cc9ecff..03bec895eb 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -3,7 +3,7 @@
 # SAWMAN
 #
 #############################################################
-SAWMAN_VERSION = 1.4.15
+SAWMAN_VERSION = 1.4.16
 SAWMAN_SOURCE = SaWMan-$(SAWMAN_VERSION).tar.gz
 SAWMAN_SITE = http://www.directfb.org/downloads/Extras
 SAWMAN_INSTALL_STAGING = YES

From eae71e805c57f2cc30291d0680b396a4e5cb9d33 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 15:22:41 +0200
Subject: [PATCH 1736/6849] linux-fusion: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-fusion/linux-fusion.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 2e62dba02c..a6d15e1ddf 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
 # linux-fusion
 #
 #############################################################
-LINUX_FUSION_VERSION = 8.7.0
+LINUX_FUSION_VERSION = 8.8.1
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES

From 6a996469e270f76e663004c6f448dee08c801ad6 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 14 Mar 2012 17:50:59 +0100
Subject: [PATCH 1737/6849] valgrind: allow selecting which tools to install

The full valgrind installation takes more than 20 MB, while one typically does
not use all of its tools. This patch adds extra config options to select which
tools to install.

[Peter: Don't default experimental tools to 'y' as suggested by Arnout]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/valgrind/Config.in   | 66 +++++++++++++++++++++++++
 package/valgrind/valgrind.mk | 95 ++++++++++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
index 0f656dc112..dacdd86554 100644
--- a/package/valgrind/Config.in
+++ b/package/valgrind/Config.in
@@ -6,3 +6,69 @@ config BR2_PACKAGE_VALGRIND
 	  Tool for debugging and profiling Linux programs.
 
 	  http://valgrind.kde.org/
+
+if BR2_PACKAGE_VALGRIND
+
+config BR2_PACKAGE_VALGRIND_MEMCHECK
+	bool "Memcheck: a memory error detector"
+	default y
+	help
+	  This option allows to install the Memcheck tool
+
+config BR2_PACKAGE_VALGRIND_CACHEGRIND
+	bool "Cachegrind: a cache and branch-prediction profiler"
+	default y
+	help
+	  This option allows to install the Cachegrind tool
+
+config BR2_PACKAGE_VALGRIND_CALLGRIND
+	bool "Callgrind: a call-graph generating cache and branch prediction profiler"
+	default y
+	help
+	  This option allows to install the Callgrind tool
+
+config BR2_PACKAGE_VALGRIND_HELGRIND
+	bool "Helgrind: a thread error detector"
+	default y
+	help
+	  This option allows to install the Helgrind tool
+
+config BR2_PACKAGE_VALGRIND_DRD
+	bool "DRD: a thread error detector"
+	default y
+	help
+	  This option allows to install the DRD tool
+
+config BR2_PACKAGE_VALGRIND_MASSIF
+	bool "Massif: a heap profiler"
+	default y
+	help
+	  This option allows to install the Massif tool
+
+config BR2_PACKAGE_VALGRIND_DHAT
+	bool "DHAT: a dynamic heap analysis tool"
+	default y
+	help
+	  This option allows to install the DHAT tool
+
+config BR2_PACKAGE_VALGRIND_PTRCHECK
+	bool "Ptrcheck: an experimental head, stack and global array overrun detector"
+	help
+	  This option allows to install the Ptrcheck tool
+
+config BR2_PACKAGE_VALGRIND_BBV
+	bool "BBV: an experimental basic block vector generation tool"
+	help
+	  This option allows to install the BBV tool
+
+config BR2_PACKAGE_VALGRIND_LACKEY
+	bool "Lackey: an example tool"
+	help
+	  This option allows to install the Lackey tool
+
+config BR2_PACKAGE_VALGRIND_NULGRIND
+	bool "Nulgrind: the minimal Valgrind tool"
+	help
+	  This option allows to install the Nulgrind tool
+
+endif
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 24523bf6bd..004c1ac024 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -25,4 +25,99 @@ endef
 
 VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_INSTALL_UCLIBC_SUPP
 
+ifeq ($(BR2_PACKAGE_VALGRIND_MEMCHECK),)
+define VALGRIND_REMOVE_MEMCHECK
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*memcheck*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MEMCHECK
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_CACHEGRIND),)
+define VALGRIND_REMOVE_CACHEGRIND
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*cachegrind*
+	for i in cg_annotate cg_diff cg_merge; do \
+		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
+	done
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_CACHEGRIND
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_CALLGRIND),)
+define VALGRIND_REMOVE_CALLGRIND
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*callgrind*
+	for i in callgrind_annotate callgrind_control ; do \
+		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
+	done
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_CALLGRIND
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_HELGRIND),)
+define VALGRIND_REMOVE_HELGRIND
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*helgrind*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_HELGRIND
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_DRD),)
+define VALGRIND_REMOVE_DRD
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*drd*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DRD
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_MASSIF),)
+define VALGRIND_REMOVE_MASSIF
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*massif*
+	rm -f $(TARGET_DIR)/usr/bin/ms_script
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MASSIF
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_DHAT),)
+define VALGRIND_REMOVE_DHAT
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*dhat*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DHAT
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_PTRCHECK),)
+define VALGRIND_REMOVE_PTRCHECK
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*ptrcheck*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_PTRCHECK
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_BBV),)
+define VALGRIND_REMOVE_BBV
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*bbv*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_BBV
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_LACKEY),)
+define VALGRIND_REMOVE_LACKEY
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*lackey*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_LACKEY
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND_NULGRIND),)
+define VALGRIND_REMOVE_NULGRIND
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/*none*
+endef
+
+VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_NULGRIND
+endif
+
 $(eval $(call AUTOTARGETS))

From a41cdcf78f0300909dc5e6acc68abd7d64418bba Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 22 Mar 2012 09:34:56 +0000
Subject: [PATCH 1738/6849] xfsprogs: Bump to 3.1.7 and convert to AUTOTARGET

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xfsprogs/xfsprogs.mk | 99 ++++--------------------------------
 1 file changed, 11 insertions(+), 88 deletions(-)

diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 52fec0964f..c59d4d8e30 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -3,96 +3,19 @@
 # xfsprogs
 #
 #############################################################
-XFSPROGS_VERSION:=3.0.3
-XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).tar.gz
+XFSPROGS_VERSION = 3.1.7
 XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
-XFSPROGS_DIR=$(BUILD_DIR)/xfsprogs-$(XFSPROGS_VERSION)
-XFSPROGS_CAT:=$(ZCAT)
-XFSPROGS_BINARY:=mkfs/mkfs.xfs
-XFSPROGS_TARGET_BINARY:=sbin/mkfs.xfs
 
-XFSPROGS_STRIP:= fsck/fsck.xfs mkfile/xfs_mkfile rtcp/xfs_rtcp
-XFSPROGS_STRIP_LIBDEP:= \
-	copy/xfs_copy db/xfs_db growfs/xfs_growfs io/xfs_io \
-	logprint/xfs_logprint mkfs/fstyp mkfs/mkfs.xfs \
-	repair/xfs_repair quota/xfs_quota
+XFSPROGS_DEPENDENCIES = util-linux
 
-$(DL_DIR)/$(XFSPROGS_SOURCE):
-	 $(call DOWNLOAD,$(XFSPROGS_SITE)/$(XFSPROGS_SOURCE))
+XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes
+XFSPROGS_CONF_OPT = \
+	--enable-lib64=no \
+	--enable-gettext=no \
+	INSTALL_USER=root \
+	INSTALL_GROUP=root
 
-xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE)
+XFSPROGS_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install
+XFSPROGS_UNINSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) uninstall
 
-$(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE)
-	$(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
-	touch $(XFSPROGS_DIR)/.unpacked
-
-#XFSPROGS_CONFIG_SHARED:=--disable-shared
-XFSPROGS_CONFIG_SHARED:=--enable-shared
-
-$(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked
-	(cd $(XFSPROGS_DIR); rm -rf config.cache; \
-		ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CPPFLAGS="-I$(E2FSPROGS_DIR)/lib" \
-		LDFLAGS="-L$(E2FSPROGS_DIR)/lib" \
-		INSTALL_USER=$(shell whoami) \
-		INSTALL_GROUP=$(shell groups | cut -d" " -f1) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--exec-prefix=/ \
-		--enable-gettext=no \
-		$(XFSPROGS_CONFIG_SHARED) \
-	)
-	touch $(XFSPROGS_DIR)/.configured
-
-$(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured
-	$(MAKE1) PATH=$(TARGET_PATH) CPPFLAGS="-I$(E2FSPROGS_DIR)/lib" \
-		LDFLAGS="-L$(E2FSPROGS_DIR)/lib" -C $(XFSPROGS_DIR)
-ifeq ($(XFSPROGS_CONFIG_SHARED),--enable-shared)
-	( \
-		cd $(XFSPROGS_DIR); \
-		$(STRIPCMD) $(XFSPROGS_STRIP); \
-		$(STRIPCMD) $(join $(dir $(XFSPROGS_STRIP_LIBDEP)), \
-				$(addprefix .libs/,$(notdir $(XFSPROGS_STRIP_LIBDEP)))) \
-	)
-	$(STRIPCMD) $(XFSPROGS_DIR)/lib*/.libs/lib*.so.*.*
-else
-	( \
-		cd $(XFSPROGS_DIR); \
-		$(STRIPCMD) $(XFSPROGS_STRIP) $(XFSPROGS_STRIP_LIBDEP) \
-	)
-	$(STRIPCMD) $(XFSPROGS_DIR)/lib*/lib*.so.*.*
-endif
-	touch -c $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
-
-$(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
-	$(MAKE1) PATH=$(TARGET_PATH) \
-	    DIST_ROOT=$(TARGET_DIR) \
-	    exec-prefix=/ \
-	    -C $(XFSPROGS_DIR) install
-	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-	touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
-
-xfsprogs: util-linux $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
-
-xfsprogs-clean:
-	rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs
-	rm -f $(TARGET_DIR)/usr/lib/libhandle.so*
-	rm -f $(TARGET_DIR)/usr/lib/libdisk.so* $(TARGET_DIR)/usr/lib/libxfs.so*
-	-$(MAKE1) -C $(XFSPROGS_DIR) clean
-
-xfsprogs-dirclean:
-	rm -rf $(XFSPROGS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XFSPROGS),y)
-TARGETS+=xfsprogs
-endif
+$(eval $(call AUTOTARGETS))

From 32f5d03a6e80484d65e88914b993995916488ab8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 17:10:22 +0200
Subject: [PATCH 1739/6849] xfsprogs: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xfsprogs/xfsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index c59d4d8e30..784f9b6ca5 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -3,7 +3,7 @@
 # xfsprogs
 #
 #############################################################
-XFSPROGS_VERSION = 3.1.7
+XFSPROGS_VERSION = 3.1.8
 XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
 
 XFSPROGS_DEPENDENCIES = util-linux

From f526c4d23c14920c1ce2a94fd50b245124d15d8e Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 15 Mar 2012 08:51:27 +0000
Subject: [PATCH 1740/6849] package: Add protobuf package

Closes: #4886

[Peter: fix whitespace, C++ dep, optional zlib dep]
Signed-off-by: Simon Dawson <spdawson at gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                      |  3 ++-
 package/Config.in            |  1 +
 package/protobuf/Config.in   | 11 +++++++++++
 package/protobuf/protobuf.mk | 21 +++++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 package/protobuf/Config.in
 create mode 100644 package/protobuf/protobuf.mk

diff --git a/CHANGES b/CHANGES
index 44079a51c3..6ff4004945 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,7 +27,7 @@
 	util-linux, vala, wipe, xdriver_xf86-video-fbdev, zlib,
 
 	New packages: glib-networking, lcdprog, minicom, parted,
-	zeromq
+	protobuf, zeromq
 
 	Deprecated packages: ttcp
 
@@ -36,6 +36,7 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#4880: New package lcdproc
+	#4886: New package protobuf
 
 2012.02, Released February 29th, 2012:
 
diff --git a/package/Config.in b/package/Config.in
index e4f7dd2b2d..c895cc14a4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -392,6 +392,7 @@ source "package/liburcu/Config.in"
 source "package/lttng-libust/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
+source "package/protobuf/Config.in"
 source "package/startup-notification/Config.in"
 endmenu
 
diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in
new file mode 100644
index 0000000000..b044ef03cf
--- /dev/null
+++ b/package/protobuf/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PROTOBUF
+	bool "protobuf"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Protocol buffers are Google's language-neutral, platform-neutral,
+	  extensible mechanism for serializing structured data.
+
+	  http://code.google.com/p/protobuf/
+
+comment "protobuf requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
new file mode 100644
index 0000000000..f18261e1ed
--- /dev/null
+++ b/package/protobuf/protobuf.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# protobuf
+#
+#############################################################
+PROTOBUF_VERSION = 2.4.1
+PROTOBUF_SOURCE = protobuf-$(PROTOBUF_VERSION).tar.gz
+PROTOBUF_SITE = http://protobuf.googlecode.com/files/
+
+# N.B. Need to use host protoc during cross compilation.
+PROTOBUF_DEPENDENCIES = host-protobuf
+PROTOBUF_CONF_OPT = --with-protoc=$(HOST_DIR)/usr/bin/protoc
+
+PROTOBUF_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+PROTOBUF_DEPENDENCIES += zlib
+endif
+
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))

From 0c8244251e730c9873776f2d8d86d23d5a12af6c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 20:20:05 +0200
Subject: [PATCH 1741/6849] fakeroot: bump version, cleanup package

LFS patch is now upstream, and we don't support building fakeroot for the
target anyway.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fakeroot/fakeroot-doc.patch        | 20 --------------------
 package/fakeroot/fakeroot-uclibc-LFS.patch | 14 --------------
 package/fakeroot/fakeroot.mk               | 18 +++---------------
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 package/fakeroot/fakeroot-doc.patch
 delete mode 100644 package/fakeroot/fakeroot-uclibc-LFS.patch

diff --git a/package/fakeroot/fakeroot-doc.patch b/package/fakeroot/fakeroot-doc.patch
deleted file mode 100644
index 51a64ca8de..0000000000
--- a/package/fakeroot/fakeroot-doc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fakeroot/Makefile.am.orig	2006-04-19 11:50:35.000000000 -0600
-+++ fakeroot/Makefile.am	2006-04-19 11:50:59.000000000 -0600
-@@ -1,5 +1,5 @@
- AUTOMAKE_OPTIONS=foreign
--SUBDIRS=scripts doc test
-+SUBDIRS=scripts test
- 
- noinst_LTLIBRARIES = libcommunicate.la
- libcommunicate_la_SOURCES = communicate.c
---- fakeroot/Makefile.in.orig	2006-04-19 11:50:43.000000000 -0600
-+++ fakeroot/Makefile.in	2006-04-19 11:51:21.000000000 -0600
-@@ -230,7 +230,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = scripts doc test
-+SUBDIRS = scripts test
- noinst_LTLIBRARIES = libcommunicate.la
- libcommunicate_la_SOURCES = communicate.c
- lib_LTLIBRARIES = libfakeroot.la
diff --git a/package/fakeroot/fakeroot-uclibc-LFS.patch b/package/fakeroot/fakeroot-uclibc-LFS.patch
deleted file mode 100644
index 53f0b8614b..0000000000
--- a/package/fakeroot/fakeroot-uclibc-LFS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN fakeroot-1.9.3.orig/communicate.h fakeroot-1.9.3/communicate.h
---- fakeroot-1.9.3.orig/communicate.h	2008-03-11 09:42:05.000000000 -0400
-+++ fakeroot-1.9.3/communicate.h	2008-03-11 10:58:10.000000000 -0400
-@@ -35,7 +35,9 @@
- #endif
- 
- /* Then decide whether we do or do not use the stat64 support */
--#if (defined(sun) && !defined(__SunOS_5_5_1) && !defined(_LP64)) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-+#if (defined(sun) && !defined(__SunOS_5_5_1) && !defined(_LP64)) \
-+    || (!defined __UCLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))) \
-+    || (defined __UCLIBC__ && defined UCLIBC_HAS_LFS)
- # define STAT64_SUPPORT
- #else
- # warning Not using stat64 support
\ No newline at end of file
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index c69f31e2c9..64203b8db5 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -3,20 +3,8 @@
 # fakeroot
 #
 #############################################################
-FAKEROOT_VERSION:=1.9.5
-FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
-FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
+FAKEROOT_VERSION = 1.18.2
+FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
+FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20111201T093630Z/pool/main/f/fakeroot/
 
-define FAKEROOT_PATCH_FAKEROOT_IN
-	# If using busybox getopt, make it be quiet.
-	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
-		$(@D)/scripts/fakeroot.in
-endef
-
-FAKEROOT_POST_PATCH_HOOKS += FAKEROOT_PATCH_FAKEROOT_IN
-
-# The package for the target cannot be selected (build problems when
-# largefile is enabled), but is needed for the host package to work
-# due to deficiencies in the package infrastructure.
-$(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From dc2a3048ebed15d6555fbfa601dee408038610e0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 21:11:00 +0200
Subject: [PATCH 1742/6849] haserl: fix lua support build on hosts without lua
 development package

Abuse lua2c_LDFLAGS to pass the correct host cflags/ldflags when lua2c
is built for the host.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/haserl.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index c8a88add8b..dfe4cf0bf8 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -10,7 +10,9 @@ HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ha
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
 		--with-lua-headers=$(STAGING_DIR)
-	HASERL_DEPENDENCIES += lua
+	HASERL_DEPENDENCIES += lua host-lua
+	# lua2c is built for host, so needs to find host libs/headers
+	HASERL_MAKE_OPT += lua2c_LDFLAGS='$(HOST_CFLAGS) $(HOST_LDFLAGS)'
 endif
 
 define HASERL_REMOVE_EXAMPLES

From 5ee4614c4e72dfab4e8f36186fc8ef4ab05fb9a9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Apr 2012 22:42:35 +0200
Subject: [PATCH 1743/6849] libcap-ng: explicit disable python bindings

The python bindings use swig, which we don't have in buildroot (but might be
installed on the host), so disable it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap-ng/libcap-ng.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index 6ea5de4dc1..4a5270270b 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -8,5 +8,7 @@ LIBCAP_NG_VERSION = 0.6.6
 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng/
 LIBCAP_NG_SOURCE = libcap-ng-$(LIBCAP_NG_VERSION).tar.gz
 LIBCAP_NG_INSTALL_STAGING = YES
+LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
+LIBCAP_NG_CONF_OPT = --without-python
 
 $(eval $(call AUTOTARGETS))

From 040f6a325f7b62c178fb6d17480adbae4e42e745 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Fri, 6 Apr 2012 18:44:22 +0200
Subject: [PATCH 1744/6849] Add documentation for <pkg>-rebuild and
 <pkg>-reconfigure

Since these two special make targets are very useful but not yet
mentioned in the documentation I added them to the make help and
the manual.

Signed-off-by: Stephan Hoffmann <sho@reLinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                            | 2 ++
 docs/manual/rebuilding-packages.txt | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 30099d99de..3a09417ad4 100644
--- a/Makefile
+++ b/Makefile
@@ -654,6 +654,8 @@ help:
 	@echo
 	@echo 'Build:'
 	@echo '  all                    - make world'
+	@echo '  <package>-rebuild      - force recompile <package>'
+	@echo '  <package>-reconfigure  - force reconfigure <package>'
 	@echo
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index 9a41a88ac3..f247dd04f8 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -15,6 +15,10 @@ The easiest way to rebuild a single package from scratch is to remove
 its build directory in +output/build+. Buildroot will then re-extract,
 re-configure, re-compile and re-install this package from scratch.
 
+For convenience, most packages support the special make targets
+<package>-reconfigure and <package>-rebuild to repeat the configure
+and build steps.
+
 However, if you don't want to rebuild the package completely from
 scratch, a better understanding of the Buildroot internals is
 needed. Internally, to keep track of which steps have been done and

From 80c4ea47087999e4c13377aa742a8c1d9295aeba Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 7 Apr 2012 21:10:45 +0200
Subject: [PATCH 1745/6849] gnutls: fix build on uClibc with C++ support
 enabled

Patch from openembedded:

http://git.openembedded.org/openembedded-core/plain/meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...s-correct_rpl_gettimeofday_signature.patch | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch

diff --git a/package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch b/package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch
new file mode 100644
index 0000000000..9188708aa1
--- /dev/null
+++ b/package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch
@@ -0,0 +1,58 @@
+[PATCH] fix build on uClibc
+
+Currently we fail on uclibc like below
+
+| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,
+|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
+|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
+|                  from ../../gl/signal.h:52,
+|                  from ../../gl/sys/select.h:58,
+|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
+|                  from ../../gl/sys/types.h:28,
+|                  from ../../lib/includes/gnutls/gnutls.h:46,
+|                  from ex-cxx.cpp:3:
+| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
+| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
+| make[4]: *** [ex-cxx.o] Error 1
+| make[4]: *** Waiting for unfinished jobs....
+
+
+GCC detects that we call 'restrict' as param name in function
+signatures and complains since both params are called 'restrict'
+therefore we use __restrict to denote the C99 keywork
+
+This only happens of uclibc since this code is not excercised with
+eglibc otherwise we will have same issue there too
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+
+Index: gnutls-2.12.14/gl/sys_time.in.h
+===================================================================
+--- gnutls-2.12.14.orig/gl/sys_time.in.h	2012-01-15 10:54:39.517285351 -0800
++++ gnutls-2.12.14/gl/sys_time.in.h	2012-01-15 10:59:23.773299108 -0800
+@@ -82,20 +82,20 @@
+ #    define gettimeofday rpl_gettimeofday
+ #   endif
+ _GL_FUNCDECL_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ _GL_CXXALIAS_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict));
++                  (struct timeval *__restrict, void *__restrict));
+ #  else
+ #   if !@HAVE_GETTIMEOFDAY@
+ _GL_FUNCDECL_SYS (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ #   endif
+ /* Need to cast, because on glibc systems, by default, the second argument is
+                                                   struct timezone *.  */
+ _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
+-                       (struct timeval *restrict, void *restrict));
++                       (struct timeval *__restrict, void *__restrict));
+ #  endif
+ _GL_CXXALIASWARN (gettimeofday);
+ # elif defined GNULIB_POSIXCHECK

From c6a9a13d833eff9e48aea8c4bfcf4447d85b1c9d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 8 Apr 2012 00:16:34 +0200
Subject: [PATCH 1746/6849] libgtk2: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/libgtk2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index a6abd077e6..b54743f53b 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 LIBGTK2_VERSION_MAJOR = 2.24
-LIBGTK2_VERSION_MINOR = 9
+LIBGTK2_VERSION_MINOR = 10
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz

From 0b9eb5713d971cb9af7c75e92a9647e0fd449a9e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 8 Apr 2012 08:24:25 +0200
Subject: [PATCH 1747/6849] gdk-pixbuf: bump version

The 2.26 series needs glib >= 2.31.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 65b3dbde75..de80706ba0 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-GDK_PIXBUF_MAJOR_VERSION = 2.22
-GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).0
-GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.bz2
+GDK_PIXBUF_MAJOR_VERSION = 2.24
+GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).1
+GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
 GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_MAJOR_VERSION)
 GDK_PIXBUF_INSTALL_STAGING = YES
 

From acf7bb7217d7de6981909112bdbd2af1faf680b5 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Sun, 1 Apr 2012 14:18:43 +0200
Subject: [PATCH 1748/6849] package: add fmtools

[Peter: fix install, help text]
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/fmtools/Config.in  |  9 +++++++++
 package/fmtools/fmtools.mk | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/fmtools/Config.in
 create mode 100644 package/fmtools/fmtools.mk

diff --git a/package/Config.in b/package/Config.in
index c895cc14a4..4c6d4d87f3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -174,6 +174,7 @@ source "package/e2fsprogs/Config.in"
 source "package/eeprog/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
+source "package/fmtools/Config.in"
 source "package/gadgetfs-test/Config.in"
 source "package/gdisk/Config.in"
 source "package/genext2fs/Config.in"
diff --git a/package/fmtools/Config.in b/package/fmtools/Config.in
new file mode 100644
index 0000000000..1591618899
--- /dev/null
+++ b/package/fmtools/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_FMTOOLS
+	bool "fmtools"
+	help
+	  fmtools is a pair of simple command-line utilities for
+	  "video4linux" radio tuner cards under Linux. It includes
+	  fm for power control, tuning, and volume and fmscan for
+	  scanning for stations.
+
+	  http://www.stanford.edu/~blp/fmtools/
diff --git a/package/fmtools/fmtools.mk b/package/fmtools/fmtools.mk
new file mode 100644
index 0000000000..f705173ec4
--- /dev/null
+++ b/package/fmtools/fmtools.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# fmtools
+#
+#############################################################
+
+FMTOOLS_VERSION = 1.0.2
+FMTOOLS_SITE = http://www.stanford.edu/~blp/fmtools/
+
+define FMTOOLS_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define FMTOOLS_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/fm $(TARGET_DIR)/usr/sbin/fm
+	$(INSTALL) -D -m 0755 $(@D)/fmscan $(TARGET_DIR)/usr/sbin/fmscan
+endef
+
+$(eval $(call GENTARGETS))

From 8876b6751e0bc19a3754290061808f0f8420708e Mon Sep 17 00:00:00 2001
From: Julian Lunz <git@jlunz.de>
Date: Sun, 8 Apr 2012 12:32:51 +0200
Subject: [PATCH 1749/6849] Fix makedevs to allow longer path names

Makedevs path name is currently limited to 40, changed it to
PATH_MAX 4096 from linux/include/linux/limits.h
Signed-off-by: Julian Lunz <git@jlunz.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/makedevs/makedevs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c
index 5d5668de6e..ab90b93b19 100644
--- a/package/makedevs/makedevs.c
+++ b/package/makedevs/makedevs.c
@@ -410,7 +410,7 @@ int main(int argc, char **argv)
 		unsigned int count = 0;
 		unsigned int increment = 0;
 		unsigned int start = 0;
-		char name[41];
+		char name[4096];
 		char user[41];
 		char group[41];
 		char *full_name;
@@ -419,7 +419,7 @@ int main(int argc, char **argv)
 
 		linenum++;
 
-		if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", name,
+		if ((2 > sscanf(line, "%4095s %c %o %40s %40s %u %u %u %u %u", name,
 						&type, &mode, user, group, &major,
 						&minor, &start, &increment, &count)) ||
 				((major | minor | start | count | increment) > 0xfffff))

From 9d4d2086351c1e85ad3571380511640426a40206 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 8 Apr 2012 21:07:32 +0200
Subject: [PATCH 1750/6849] gdk-pixbuf: cleanup

No need for empty line before help text, and AUTOTARGETS handle
--disable-largefile.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdk-pixbuf/Config.in     | 1 -
 package/gdk-pixbuf/gdk-pixbuf.mk | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 8b9cc3fb7a..28a0f12c1a 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_GDK_PIXBUF
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
-
 	  Gdk-Pixbuf is an image loader and scaler. It uses GObject
 	  and the GLib, to integrate well with GNOME applications.
 
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index de80706ba0..8dc1c47183 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -16,10 +16,6 @@ GDK_PIXBUF_CONF_ENV = \
 
 GDK_PIXBUF_CONF_OPT = --disable-glibtest
 
-ifneq ($(BR2_LARGEFILE),y)
-GDK_PIXBUF_CONF_OPT += --disable-largefile
-endif
-
 ifneq ($(BR2_PACKAGE_LIBPNG),y)
 GDK_PIXBUF_CONF_OPT += --without-libpng
 else

From 650195deb9168dd2e250b8145448ed580ea4601b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 14 Apr 2012 21:26:52 +0200
Subject: [PATCH 1751/6849] qt: fix build on uClibc without lfs support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-uClibc-lfs-fix.patch | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/qt/qt-uClibc-lfs-fix.patch

diff --git a/package/qt/qt-uClibc-lfs-fix.patch b/package/qt/qt-uClibc-lfs-fix.patch
new file mode 100644
index 0000000000..ea04a607ea
--- /dev/null
+++ b/package/qt/qt-uClibc-lfs-fix.patch
@@ -0,0 +1,41 @@
+From 6f88b27de256266947a7f6a3e70e18510754aab2 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Sat, 14 Apr 2012 20:36:07 +0200
+Subject: [PATCH] mkspecs/common/posix: fix !largefile builds on uClibc
+
+uClibc doesn't even define O_LARGEFILE when not configured with large file
+support, so ensure this define is only used when Qt is built with
+-largefile, otherwise the build fails with:
+
+io/qtemporaryfile.cpp: In function 'bool createFileFromTemplate(
+	NativeFileHandle&, QFileSystemEntry::NativePath&, size_t, size_t,
+	QSystemError&)':
+io/qtemporaryfile.cpp:197:57: error: 'O_LARGEFILE' was not declared in
+	this scope
+
+Reported-Upstream: https://bugreports.qt-project.org/browse/QTBUG-25321
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ mkspecs/common/posix/qplatformdefs.h |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h
+index daecc00..8a796cf 100644
+--- a/mkspecs/common/posix/qplatformdefs.h
++++ b/mkspecs/common/posix/qplatformdefs.h
+@@ -123,7 +123,12 @@
+ #define QT_READ                 ::read
+ #define QT_WRITE                ::write
+ 
++#ifdef QT_LARGEFILE_SUPPORT
+ #define QT_OPEN_LARGEFILE       O_LARGEFILE
++#else
++#define QT_OPEN_LARGEFILE       0
++#endif
++
+ #define QT_OPEN_RDONLY          O_RDONLY
+ #define QT_OPEN_WRONLY          O_WRONLY
+ #define QT_OPEN_RDWR            O_RDWR
+-- 
+1.7.8.3
+

From 8eaf4e5281c98f97a453e67547ec740174d9d417 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 14 Apr 2012 21:28:31 +0200
Subject: [PATCH 1752/6849] qt: tweak help text

Upstream URL of Qt is qt-project.org nowadays, and there's a single Qt
release for everyone.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 3a552d090f..1ce63489ae 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -5,9 +5,10 @@ menuconfig BR2_PACKAGE_QT
 	bool "Qt"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Qt for Embedded Linux.
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
 
-	  http://www.qtsoftware.com/products/platform/qt-for-embedded-linux
+	  http://qt-project.org
 
 if BR2_PACKAGE_QT
 

From f2201e3044384494f6e865c2e5e8aa783a639475 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 13 Apr 2012 15:45:45 -0300
Subject: [PATCH 1753/6849] kernel-headers: bump 3.{0, 2, 3}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ....3.1-fix-umode_t.patch => linux-3.3.2-fix-umode_t.patch} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.27-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.28-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3.1-fix-umode_t.patch => linux-3.3.2-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 2cdd3e3fbf..343096662b 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.27"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.28"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.14"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.1"		if BR2_KERNEL_HEADERS_3_3
+	default "3.2.15"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3.2"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.27-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.28-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.27-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.28-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.1-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.2-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.1-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.2-fix-umode_t.patch

From fb61e7be19741cb64ec33eb3d61e773d86966dec Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 12 Apr 2012 16:39:52 +0200
Subject: [PATCH 1754/6849] boost: bump to 1.49.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 4577f2dcc0..e25e24d84a 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BOOST_VERSION = 1.47.0
+BOOST_VERSION = 1.49.0
 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
 BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
 BOOST_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/boost

From 9cda7edc50e225d329228e08c74847c64098808f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 12 Apr 2012 11:14:40 -0300
Subject: [PATCH 1755/6849] toolchain/uClibc: fix default configs with respect
 to bug #5018

Switch from the strict UCLIBC_HAS_CTYPE_ENFORCED=y to the less
restrictive UCLIBC_HAS_CTYPE_CHECKED=y since it breaks dialog under
certain circumstances (bug #5018).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-0.9.31.config   | 4 ++--
 toolchain/uClibc/uClibc-0.9.32.config   | 4 ++--
 toolchain/uClibc/uClibc-0.9.33.config   | 4 ++--
 toolchain/uClibc/uClibc-snapshot.config | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
index 80210c5df8..fd1ab987ab 100644
--- a/toolchain/uClibc/uClibc-0.9.31.config
+++ b/toolchain/uClibc/uClibc-0.9.31.config
@@ -150,8 +150,8 @@ UCLIBC_HAS_STRING_ARCH_OPT=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-UCLIBC_HAS_CTYPE_ENFORCED=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
 # UCLIBC_HAS_WCHAR is not set
 # UCLIBC_HAS_LOCALE is not set
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config
index 7f21f1c302..0782b6f34a 100644
--- a/toolchain/uClibc/uClibc-0.9.32.config
+++ b/toolchain/uClibc/uClibc-0.9.32.config
@@ -175,8 +175,8 @@ UCLIBC_HAS_STRING_ARCH_OPT=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-UCLIBC_HAS_CTYPE_ENFORCED=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
 # UCLIBC_HAS_WCHAR is not set
 # UCLIBC_HAS_LOCALE is not set
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
diff --git a/toolchain/uClibc/uClibc-0.9.33.config b/toolchain/uClibc/uClibc-0.9.33.config
index 7e4e7503df..4ce643a825 100644
--- a/toolchain/uClibc/uClibc-0.9.33.config
+++ b/toolchain/uClibc/uClibc-0.9.33.config
@@ -184,8 +184,8 @@ UCLIBC_HAS_STRING_ARCH_OPT=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-UCLIBC_HAS_CTYPE_ENFORCED=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
 # UCLIBC_HAS_WCHAR is not set
 # UCLIBC_HAS_LOCALE is not set
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index 7e4e7503df..4ce643a825 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -184,8 +184,8 @@ UCLIBC_HAS_STRING_ARCH_OPT=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-UCLIBC_HAS_CTYPE_ENFORCED=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
 # UCLIBC_HAS_WCHAR is not set
 # UCLIBC_HAS_LOCALE is not set
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y

From 11c06f763423dabcf1cfe1c8b41c384a4b884222 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 12 Apr 2012 10:25:14 +0200
Subject: [PATCH 1756/6849] Bump sam-ba version to 2.11

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sam-ba/sam-ba.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index d00575cf51..d5ab9f6093 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -1,11 +1,11 @@
 SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents/
-SAM_BA_VERSION = 2.10
+SAM_BA_VERSION = 2.11
 SAM_BA_SOURCE  = sam-ba_$(SAM_BA_VERSION).zip
 
 define HOST_SAM_BA_EXTRACT_CMDS
         unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
-        mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D)
-        rmdir $(BUILD_DIR)/sam-ba_cdc_linux/
+        mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D)
+        rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/
 endef
 
 # Since it's a prebuilt application and it does not conform to the

From d6c110e77fce6ebaf79b02caa69f1f5659f86100 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Apr 2012 18:41:06 -0300
Subject: [PATCH 1757/6849] toolchain/uClibc: bump 0.9.33.x series to version
 0.9.33.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |   2 +-
 ...-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch |  30 ---
 ...t-fstat-Use-64bit-version-of-syscall.patch | 179 ------------------
 ...bc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch} |   0
 ...-dup3.patch => uClibc-0.9.33.1-dup3.patch} |   0
 ...mmap64-include-stdint.h-for-uint64_t.patch |  28 +++
 6 files changed, 29 insertions(+), 210 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch
 rename toolchain/uClibc/{uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch => uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.33-dup3.patch => uClibc-0.9.33.1-dup3.patch} (100%)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 64c5a9f510..55e2f8bc1e 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING
 	string
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
-	default 0.9.33		if BR2_UCLIBC_VERSION_0_9_33
+	default 0.9.33.1	if BR2_UCLIBC_VERSION_0_9_33
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
diff --git a/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch b/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
deleted file mode 100644
index 68077f57d4..0000000000
--- a/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ca457af92be7835edf77f34bead94f504fbc2d4b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 3 Feb 2012 10:57:44 -0800
-Subject: [PATCH 2/4] Declare __err and pass it to INTERNAL_SYSCALL_NCS so
- subsequent macros can use it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/sysdeps/linux/common/bits/syscalls-common.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common/bits/syscalls-common.h b/libc/sysdeps/linux/common/bits/syscalls-common.h
-index faebd1b..0f5a929 100644
---- a/libc/sysdeps/linux/common/bits/syscalls-common.h
-+++ b/libc/sysdeps/linux/common/bits/syscalls-common.h
-@@ -59,8 +59,8 @@
- #ifndef INLINE_SYSCALL_NOERR_NCS
- # define INLINE_SYSCALL_NOERR_NCS(name, nr, args...)			\
- ({									\
--	/*INTERNAL_SYSCALL_DECL(__err);*/					\
--	long __res = INTERNAL_SYSCALL_NCS(name, /*__err*/, nr, args);	\
-+	INTERNAL_SYSCALL_DECL(__err);					\
-+	long __res = INTERNAL_SYSCALL_NCS(name, __err, nr, args);	\
- 	__res;								\
- })
- #endif
--- 
-1.7.8.3
-
diff --git a/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch b/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch
deleted file mode 100644
index a9d1c960c3..0000000000
--- a/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From b813377f6c746118a9d2625e6b29ffeec4233663 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 3 Feb 2012 20:06:55 -0800
-Subject: [PATCH 3/4] lstat/stat/fstat: Use 64bit version of syscall if
- available
-
-This is needed for stat'ing loop devices > 255
-since otherwise kernel returns EOVERFLOW becasue
-it needs st_rdev/st_dev to be larger than 16bits but
-in kernel it uses __old_kernel_stat for stat
-syscall which has st_rdev/st_dev as unsigned short
-
-Add a testcase
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/sysdeps/linux/common/fstat.c |   18 ++++++++++++++----
- libc/sysdeps/linux/common/lstat.c |   19 ++++++++++++++-----
- libc/sysdeps/linux/common/stat.c  |   18 ++++++++++++++----
- test/stat/stat-loop256.c          |   32 ++++++++++++++++++++++++++++++++
- 4 files changed, 74 insertions(+), 13 deletions(-)
- create mode 100644 test/stat/stat-loop256.c
-
-diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
-index acc639b..4726a68 100644
---- a/libc/sysdeps/linux/common/fstat.c
-+++ b/libc/sysdeps/linux/common/fstat.c
-@@ -12,18 +12,28 @@
- #include <sys/stat.h>
- #include "xstatconv.h"
- 
--#define __NR___syscall_fstat __NR_fstat
--static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf)
--
- int fstat(int fd, struct stat *buf)
- {
- 	int result;
-+#ifdef __NR_fstat64
-+	/* normal stat call has limited values for various stat elements
-+	 * e.g. uid device major/minor etc.
-+	 * so we use 64 variant if available
-+	 * in order to get newer versions of stat elements
-+	 */
-+	struct kernel_stat64 kbuf;
-+	result = INLINE_SYSCALL(fstat64, 2, fd, &kbuf);
-+	if (result == 0) {
-+		__xstat32_conv(&kbuf, buf);
-+	}
-+#else
- 	struct kernel_stat kbuf;
- 
--	result = __syscall_fstat(fd, &kbuf);
-+	result = INLINE_SYSCALL(fstat, 2, fd, &kbuf);
- 	if (result == 0) {
- 		__xstat_conv(&kbuf, buf);
- 	}
-+#endif
- 	return result;
- }
- libc_hidden_def(fstat)
-diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
-index aa77447..db72d1f 100644
---- a/libc/sysdeps/linux/common/lstat.c
-+++ b/libc/sysdeps/linux/common/lstat.c
-@@ -12,19 +12,28 @@
- #include <sys/stat.h>
- #include "xstatconv.h"
- 
--#define __NR___syscall_lstat __NR_lstat
--static __inline__ _syscall2(int, __syscall_lstat,
--		const char *, file_name, struct kernel_stat *, buf)
--
- int lstat(const char *file_name, struct stat *buf)
- {
- 	int result;
-+#ifdef __NR_lstat64
-+	/* normal stat call has limited values for various stat elements
-+	 * e.g. uid device major/minor etc.
-+	 * so we use 64 variant if available
-+	 * in order to get newer versions of stat elements
-+	 */
-+	struct kernel_stat64 kbuf;
-+	result = INLINE_SYSCALL(lstat64, 2, file_name, &kbuf);
-+	if (result == 0) {
-+		__xstat32_conv(&kbuf, buf);
-+	}
-+#else
- 	struct kernel_stat kbuf;
- 
--	result = __syscall_lstat(file_name, &kbuf);
-+	result = INLINE_SYSCALL(lstat, 2, file_name, &kbuf);
- 	if (result == 0) {
- 		__xstat_conv(&kbuf, buf);
- 	}
-+#endif
- 	return result;
- }
- libc_hidden_def(lstat)
-diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
-index a6ab291..829f35a 100644
---- a/libc/sysdeps/linux/common/stat.c
-+++ b/libc/sysdeps/linux/common/stat.c
-@@ -12,20 +12,30 @@
- #include <sys/stat.h>
- #include "xstatconv.h"
- 
--#define __NR___syscall_stat __NR_stat
- #undef stat
--static __inline__ _syscall2(int, __syscall_stat,
--		const char *, file_name, struct kernel_stat *, buf)
- 
- int stat(const char *file_name, struct stat *buf)
- {
- 	int result;
-+#ifdef __NR_stat64
-+	/* normal stat call has limited values for various stat elements
-+	 * e.g. uid device major/minor etc.
-+	 * so we use 64 variant if available
-+	 * in order to get newer versions of stat elements
-+	 */
-+	struct kernel_stat64 kbuf;
-+	result = INLINE_SYSCALL(stat64, 2, file_name, &kbuf);
-+	if (result == 0) {
-+		__xstat32_conv(&kbuf, buf);
-+	}
-+#else
- 	struct kernel_stat kbuf;
- 
--	result = __syscall_stat(file_name, &kbuf);
-+	result = INLINE_SYSCALL(stat, 2, file_name, &kbuf);
- 	if (result == 0) {
- 		__xstat_conv(&kbuf, buf);
- 	}
-+#endif
- 	return result;
- }
- libc_hidden_def(stat)
-diff --git a/test/stat/stat-loop256.c b/test/stat/stat-loop256.c
-new file mode 100644
-index 0000000..14284c1
---- /dev/null
-+++ b/test/stat/stat-loop256.c
-@@ -0,0 +1,32 @@
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <sys/stat.h>
-+int main()
-+{
-+    struct stat statbuf;
-+    int ret = 0;
-+    char* loop255 = "/dev/loop255";
-+    char* loop256 = "/dev/loop256";
-+    mode_t mode = 0660;
-+    mknod(loop255, mode, 0x7ff);
-+    mknod(loop256, mode, 0x100700);
-+    ret = stat(loop255, &statbuf);
-+    if(ret < 0) {
-+	printf("stat: Cant stat %s\n",loop255);
-+	unlink(loop255);
-+	exit(1);
-+    }
-+    ret = stat(loop256, &statbuf);
-+    if(ret < 0) {
-+        printf("stat: Cant stat %s\n",loop256);
-+	unlink(loop255);
-+	unlink(loop256);
-+        exit(1);
-+    }
-+
-+    unlink(loop255);
-+    unlink(loop256);
-+    exit(0);
-+}
-+
--- 
-1.7.8.3
-
diff --git a/toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch b/toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch
rename to toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33-dup3.patch
rename to toolchain/uClibc/uClibc-0.9.33.1-dup3.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch b/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch
new file mode 100644
index 0000000000..8b08a2cd8f
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch
@@ -0,0 +1,28 @@
+From 47009e1e1c6b721c38b5ffa2eeb9202fb8db298a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 11 Apr 2012 16:01:29 -0400
+Subject: [PATCH 1/2] mmap64: include stdint.h for uint64_t
+
+Some targets include this implicitly, but pull it in explicitly for those
+which don't to fix building for them.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libc/sysdeps/linux/common/mmap64.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
+index 3c97c84..cebf961 100644
+--- a/libc/sysdeps/linux/common/mmap64.c
++++ b/libc/sysdeps/linux/common/mmap64.c
+@@ -10,6 +10,7 @@
+ #ifdef __UCLIBC_HAS_LFS__
+ 
+ #include <errno.h>
++#include <stdint.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <sys/syscall.h>
+-- 
+1.7.3.4
+

From 0c004d28f9b597ab50b376ed19ee23f188b6e3c5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Apr 2012 11:36:21 -0300
Subject: [PATCH 1758/6849] libupnp: bump to version 1.6.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libupnp/libupnp-1.6.14-no-ipv6.patch | 23 ------------
 package/libupnp/libupnp-1.6.17-no-ipv6.patch | 37 ++++++++++++++++++++
 package/libupnp/libupnp.mk                   |  2 +-
 3 files changed, 38 insertions(+), 24 deletions(-)
 delete mode 100644 package/libupnp/libupnp-1.6.14-no-ipv6.patch
 create mode 100644 package/libupnp/libupnp-1.6.17-no-ipv6.patch

diff --git a/package/libupnp/libupnp-1.6.14-no-ipv6.patch b/package/libupnp/libupnp-1.6.14-no-ipv6.patch
deleted file mode 100644
index 929c309ba7..0000000000
--- a/package/libupnp/libupnp-1.6.14-no-ipv6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix missing knob to properly disable IPv6 support when headers lack it.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura libupnp-1.6.15/upnp/src/ssdp/ssdp_device.c libupnp-1.6.15-noipv6/upnp/src/ssdp/ssdp_device.c
---- libupnp-1.6.15/upnp/src/ssdp/ssdp_device.c	2011-11-04 19:33:59.000000000 -0300
-+++ libupnp-1.6.15-noipv6/upnp/src/ssdp/ssdp_device.c	2012-03-20 21:00:26.274098343 -0300
-@@ -199,6 +199,7 @@
- 		setsockopt(ReplySock, IPPROTO_IP, IP_MULTICAST_TTL,
- 			   (char *)&ttl, sizeof(int));
- 		socklen = sizeof(struct sockaddr_in);
-+#ifdef UPNP_ENABLE_IPV6
- 	} else if (DestAddr->sa_family == AF_INET6) {
- 		inet_ntop(AF_INET6,
- 			  &((struct sockaddr_in6 *)DestAddr)->sin6_addr,
-@@ -207,6 +208,7 @@
- 			   (char *)&gIF_INDEX, sizeof(gIF_INDEX));
- 		setsockopt(ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
- 			   (char *)&hops, sizeof(hops));
-+#endif
- 	} else {
- 		UpnpPrintf(UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
- 			   "Invalid destination address specified.");
diff --git a/package/libupnp/libupnp-1.6.17-no-ipv6.patch b/package/libupnp/libupnp-1.6.17-no-ipv6.patch
new file mode 100644
index 0000000000..67b3895e5f
--- /dev/null
+++ b/package/libupnp/libupnp-1.6.17-no-ipv6.patch
@@ -0,0 +1,37 @@
+From 812bdabc2c293173ea943059a577d480884a6cc1 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 11 Apr 2012 11:17:45 -0300
+Subject: [PATCH] ssdp_device: exclude IPv6 stuff when there's no IPv6
+
+Add an additional INET_IPV6 exclusion around IPV6_MULTICAST_HOPS since
+the definition isn't guaranteed to exist when the toolchain lacks IPv6
+support.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ upnp/src/ssdp/ssdp_device.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
+index d3517cc..a439005 100644
+--- a/upnp/src/ssdp/ssdp_device.c
++++ b/upnp/src/ssdp/ssdp_device.c
+@@ -210,6 +210,7 @@ static int NewRequestHandler(
+ 			   (char *)&ttl, sizeof(int));
+ 		socklen = sizeof(struct sockaddr_in);
+ 		break;
++#ifdef INET_IPV6
+ 	case AF_INET6:
+ 		inet_ntop(AF_INET6,
+ 			  &((struct sockaddr_in6 *)DestAddr)->sin6_addr,
+@@ -219,6 +220,7 @@ static int NewRequestHandler(
+ 		setsockopt(ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
+ 			   (char *)&hops, sizeof(hops));
+ 		break;
++#endif
+ 	default:
+ 		UpnpPrintf(UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+ 			   "Invalid destination address specified.");
+-- 
+1.7.3.4
+
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 5ac68c38a7..a6028e1ecb 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBUPNP_VERSION = 1.6.14
+LIBUPNP_VERSION = 1.6.17
 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
 LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no

From b6e0f2fdf2665f67e2bc6400c8479d6fca7e2fe4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Apr 2012 10:40:36 -0300
Subject: [PATCH 1759/6849] samba: security bump to version 3.5.14

Bump samba to version 3.5.14 to fix CVE-2012-1182

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index c15efca3b8..48810b94e6 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.5.12
+SAMBA_VERSION = 3.5.14
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From f30971329649add986dcb117668ea755266bba5b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Apr 2012 09:27:04 -0300
Subject: [PATCH 1760/6849] dosfstools: bump to version 3.0.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index e1b6a33c82..7a8a7e869a 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -3,8 +3,8 @@
 # dosfstools
 #
 #############################################################
-DOSFSTOOLS_VERSION = 3.0.11
-DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.gz
+
+DOSFSTOOLS_VERSION = 3.0.12
 DOSFSTOOLS_SITE = http://www.daniel-baumann.ch/software/dosfstools
 MKDOSFS_BINARY = mkdosfs
 DOSFSCK_BINARY = dosfsck

From b163ca39320e54192102218ee137b13b7828695e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 9 Apr 2012 12:19:56 -0300
Subject: [PATCH 1761/6849] mpd: bump to version 0.16.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index e3b5331235..095bad6fbc 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.7
-MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/musicpd
+MPD_VERSION = 0.16.8
+MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 MPD_DEPENDENCIES = host-pkg-config libglib2
 
 # Some options need an explicit --disable or --enable

From 31993b329ee676d9f0bece894eee39b1243cfd90 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 10 Apr 2012 18:05:28 +0200
Subject: [PATCH 1762/6849] polarssl: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/polarssl/Config.in                    | 28 ++++++++++
 package/polarssl/polarssl-no-programs.patch   | 26 ++++++++++
 package/polarssl/polarssl-no-test-suite.patch | 26 ++++++++++
 .../polarssl-shared-and-static-library.patch  | 52 +++++++++++++++++++
 package/polarssl/polarssl.mk                  | 13 +++++
 6 files changed, 146 insertions(+)
 create mode 100644 package/polarssl/Config.in
 create mode 100644 package/polarssl/polarssl-no-programs.patch
 create mode 100644 package/polarssl/polarssl-no-test-suite.patch
 create mode 100644 package/polarssl/polarssl-shared-and-static-library.patch
 create mode 100644 package/polarssl/polarssl.mk

diff --git a/package/Config.in b/package/Config.in
index 4c6d4d87f3..bcace09bb2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -276,6 +276,7 @@ source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libnss/Config.in"
 source "package/openssl/Config.in"
+source "package/polarssl/Config.in"
 endmenu
 
 menu "Database"
diff --git a/package/polarssl/Config.in b/package/polarssl/Config.in
new file mode 100644
index 0000000000..3414a7f7fd
--- /dev/null
+++ b/package/polarssl/Config.in
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_POLARSSL
+	bool "polarssl"
+	help
+	  PolarSSL is an SSL library written in ANSI C. PolarSSL makes
+	  it easy for developers to include cryptographic and SSL/TLS
+	  capabilities in their (embedded) products with as little
+	  hassle as possible. It is designed to be readable,
+	  documented, tested, loosely coupled and portable.
+
+	  Warning: PolarSSL is licensed under the GPL. If you want to
+	  use it in your own proprietary applications, you have to
+	  purchase a commercial license.
+
+	  http://polarssl.org/
+
+config BR2_PACKAGE_POLARSSL_PROGRAMS
+	bool "polarssl programs"
+	depends on BR2_PACKAGE_POLARSSL
+	help
+	  This option enables the installation and the build of
+	  PolarSSL companion programs: aescrypt2, benchmark, cert_app,
+	  crl_app, crypt_and_hash, dh_client, dh_genprime, dh_server,
+	  gen_entropy, generic_sum, gen_random_ctr_drbg,
+	  gen_random_havege, hello, key_app, md5sum, mpi_demo,
+	  rsa_decrypt, rsa_encrypt, rsa_genkey, rsa_sign, rsa_verify,
+	  selftest, sha1sum, sha2sum, ssi-cgi, ssl_cert_test,
+	  ssl_client1, ssl_client2, ssl_fork_server, ssl_mail_client,
+	  ssl_server, ssl_test
diff --git a/package/polarssl/polarssl-no-programs.patch b/package/polarssl/polarssl-no-programs.patch
new file mode 100644
index 0000000000..f1188716bc
--- /dev/null
+++ b/package/polarssl/polarssl-no-programs.patch
@@ -0,0 +1,26 @@
+Add the BUILD_PROGRAMS option to disable programs build
+
+By default, PolarSSL builds and installs a large set of companions
+programs, which in some cases are not useful. This patch adds the
+BUILD_PROGRAMS option which allows to disable the build and
+installation of such programs when not needed.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: polarssl-1.1.1/CMakeLists.txt
+===================================================================
+--- polarssl-1.1.1.orig/CMakeLists.txt
++++ polarssl-1.1.1/CMakeLists.txt
+@@ -33,7 +33,11 @@
+   add_subdirectory(tests)
+ endif(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS)
+ 
+-add_subdirectory(programs)
++option(BUILD_PROGRAMS "Build programs." ON)
++
++if(BUILD_PROGRAMS)
++  add_subdirectory(programs)
++endif(BUILD_PROGRAMS)
+ 
+ ADD_CUSTOM_TARGET(apidoc
+                   COMMAND doxygen doxygen/polarssl.doxyfile
diff --git a/package/polarssl/polarssl-no-test-suite.patch b/package/polarssl/polarssl-no-test-suite.patch
new file mode 100644
index 0000000000..7e0744132d
--- /dev/null
+++ b/package/polarssl/polarssl-no-test-suite.patch
@@ -0,0 +1,26 @@
+Add BUILD_TESTS option to disable test suite
+
+By default, PolarSSL builds a fairly extensive test suite to validate
+the library. In the context of Buildroot, building this test suite is
+not really useful, so we add a BUILD_TESTS to disable its build.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: polarssl-1.1.1/CMakeLists.txt
+===================================================================
+--- polarssl-1.1.1.orig/CMakeLists.txt
++++ polarssl-1.1.1/CMakeLists.txt
+@@ -27,9 +27,11 @@
+ add_subdirectory(library)
+ add_subdirectory(include)
+ 
+-if(CMAKE_COMPILER_IS_GNUCC)
++option(BUILD_TESTS "Build tests." ON)
++
++if(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS)
+   add_subdirectory(tests)
+-endif(CMAKE_COMPILER_IS_GNUCC)
++endif(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS)
+ 
+ add_subdirectory(programs)
+ 
diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
new file mode 100644
index 0000000000..3ad3334c4c
--- /dev/null
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -0,0 +1,52 @@
+Allow both shared and static PolarSSL library
+
+By default, PolarSSL is built as a static library. If the option
+USE_SHARED_POLARSSL_LIBRARY is set, then it is build as a shared
+library. But there is no way of building both the shared and static
+versions.
+
+This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
+in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
+defaults to OFF). Both options can be manipulated independently.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: polarssl-1.1.1/library/CMakeLists.txt
+===================================================================
+--- polarssl-1.1.1.orig/library/CMakeLists.txt
++++ polarssl-1.1.1/library/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
++option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
+ 
+ set(src
+      aes.c
+@@ -40,17 +41,21 @@
+      xtea.c
+ )
+ 
+-if(NOT USE_SHARED_POLARSSL_LIBRARY)
+-
+-add_library(polarssl STATIC ${src})
+-
+-else(NOT USE_SHARED_POLARSSL_LIBRARY)
++if(USE_SHARED_POLARSSL_LIBRARY)
+ 
+ add_library(polarssl SHARED ${src})
+ set_target_properties(polarssl PROPERTIES VERSION 1.1.1 SOVERSION 1)
++set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
++
++endif(USE_SHARED_POLARSSL_LIBRARY)
++
++if(USE_STATIC_POLARSSL_LIBRARY)
++
++add_library(polarssl-static STATIC ${src})
++set_target_properties(polarssl-static PROPERTIES OUTPUT_NAME polarssl)
+ 
+-endif(NOT USE_SHARED_POLARSSL_LIBRARY)
++endif(USE_STATIC_POLARSSL_LIBRARY)
+ 
+-install(TARGETS polarssl
++install(TARGETS polarssl polarssl-static
+         DESTINATION ${LIB_INSTALL_DIR}
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
new file mode 100644
index 0000000000..0d8574ccd4
--- /dev/null
+++ b/package/polarssl/polarssl.mk
@@ -0,0 +1,13 @@
+POLARSSL_SITE = http://polarssl.org/code/releases/
+POLARSSL_VERSION = 1.1.1
+POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
+POLARSSL_CONF_OPT = \
+	-DUSE_SHARED_POLARSSL_LIBRARY=ON \
+	-DUSE_STATIC_POLARSSL_LIBRARY=ON \
+	-DBUILD_TESTS=OFF \
+	-DBUILD_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
+
+POLARSSL_INSTALL_STAGING = YES
+
+$(eval $(call CMAKETARGETS))
+

From f4f4172a4191a3a4e47a49bbd86343c03237ac0e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 10 Apr 2012 18:05:29 +0200
Subject: [PATCH 1763/6849] hiawatha: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  3 +
 package/hiawatha/Config.in                    | 26 ++++++++
 ...awatha-support-for-external-polarssl.patch | 60 +++++++++++++++++++
 package/hiawatha/hiawatha.mk                  | 13 ++++
 4 files changed, 102 insertions(+)
 create mode 100644 package/hiawatha/Config.in
 create mode 100644 package/hiawatha/hiawatha-support-for-external-polarssl.patch
 create mode 100644 package/hiawatha/hiawatha.mk

diff --git a/package/Config.in b/package/Config.in
index bcace09bb2..d703b8c37f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -455,6 +455,9 @@ source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/hiawatha/Config.in"
+endif
 source "package/hostapd/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in
new file mode 100644
index 0000000000..431a9fa1b0
--- /dev/null
+++ b/package/hiawatha/Config.in
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_HIAWATHA
+	bool "hiawatha"
+	help
+	  Hiawatha is a webserver for Unix and has been built with
+	  security in mind. This resulted in a highly secure
+	  webserver, in both code and features.
+
+	  This webserver runs on Linux, BSD, MacOS X and
+	  Windows. Although it can run any kind of CGI / FastCGI
+	  application, it has been optimized for usage with PHP. Most
+	  well known PHP frameworks and CMS applications have been
+	  tested with Hiawatha and ran without a problem. Hiawatha
+	  supports many web and HTTP features such as CGI/FastCGI,
+	  HTTP authentication, virtual host support, request
+	  pipelining, keep alive connections, URL rewriting and many
+	  more.
+
+	  http://www.hiawatha-webserver.org/
+
+if BR2_PACKAGE_HIAWATHA
+
+config BR2_PACKAGE_HIAWATHA_SSL
+	bool "hiawatha SSL support"
+	select BR2_PACKAGE_POLARSSL
+
+endif
diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
new file mode 100644
index 0000000000..e6033b9dab
--- /dev/null
+++ b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
@@ -0,0 +1,60 @@
+Enable linking against an external PolarSSL
+
+Hiawatha contains its own copy of the PolarSSL source code, and its
+build system builds this private copy of PolarSSL and links to it. In
+the context of Buildroot, we prefer to link against the PolarSSL built
+externally by the polarssl package.
+
+This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in
+addition to ENABLE_SSL, tells Hiawatha's build system to link against
+the already existing PolarSSL library instead of building its own.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: hiawatha-8.1/CMakeLists.txt
+===================================================================
+--- hiawatha-8.1.orig/CMakeLists.txt
++++ hiawatha-8.1/CMakeLists.txt
+@@ -9,6 +9,7 @@
+ option(ENABLE_IPV6    "Enable IPv6 support in Hiawatha." ON)
+ option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." OFF)
+ option(ENABLE_SSL     "Enable SSL (PolarSSL) support in Hiawatha." ON)
++option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." OFF)
+ option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" ON)
+ option(ENABLE_XSLT    "Enable XSLT support in Hiawatha." ON)
+ 
+@@ -86,19 +87,23 @@
+ 
+ # PolarSSL
+ if(ENABLE_SSL)
++ if(NOT ENABLE_SSL_EXTERNAL)
+ 	option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." ON)
+ 	set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
+ 	set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/hiawatha)
++	include_directories(polarssl/include)
+ 	add_subdirectory(polarssl)
++ endif()
+ 	set(POLARSSL_LIBRARY "polarssl")
+ endif()
+ 
+ # Hiawatha
+-include_directories(${CMAKE_CURRENT_BINARY_DIR} polarssl/include)
+ if(ENABLE_XSLT)
+ 	include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR})
+ endif()
+ 
++include_directories(${CMAKE_CURRENT_BINARY_DIR})
++
+ # Configure files
+ configure_file(config.h.in config.h)
+ foreach (configfile ${config_files_in})
+@@ -119,7 +124,9 @@
+ target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
+ if(ENABLE_SSL)
+ 	target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
++ if(NOT ENABLE_SSL_EXTERNAL)
+ 	set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
++ endif()
+ endif()
+ if(ENABLE_XSLT)
+ 	target_link_libraries(hiawatha ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES})
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
new file mode 100644
index 0000000000..aa245f3802
--- /dev/null
+++ b/package/hiawatha/hiawatha.mk
@@ -0,0 +1,13 @@
+HIAWATHA_VERSION = 8.1
+HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
+
+ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
+HIAWATHA_CONF_OPT += -DENABLE_SSL_EXTERNAL=ON -DENABLE_SSL=ON
+HIAWATHA_DEPENDENCIES += polarssl
+endif
+
+HIAWATHA_CONF_OPT += \
+	-DENABLE_TOOLKIT=OFF \
+	-DENABLE_XSLT=OFF
+
+$(eval $(call CMAKETARGETS))

From b4a8ae3e8cc9f5a7b0b4b6f7004c51e661dcc456 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 13 Apr 2012 09:44:45 -0300
Subject: [PATCH 1764/6849] toolchain/gcc: add 4.7.x series

Add gcc 4.7.0 to the toolchain options.

[Peter: drop 0001-toolchain-gcc-add-4.7.x-series.txt]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch                         |   1 +
 toolchain/gcc/4.7.0/100-uclibc-conf.patch     |  33 +++++
 toolchain/gcc/4.7.0/200-gcc-pr52734.patch     | 115 ++++++++++++++++
 .../gcc/4.7.0/301-missing-execinfo_h.patch    |  11 ++
 toolchain/gcc/4.7.0/302-c99-snprintf.patch    |  13 ++
 .../4.7.0/305-libmudflap-susv3-legacy.patch   |  49 +++++++
 .../gcc/4.7.0/810-arm-softfloat-libgcc.patch  |  25 ++++
 .../gcc/4.7.0/830-arm_unbreak_armv4t.patch    |  13 ++
 ...werpc-link-with-math-lib.patch.conditional | 125 ++++++++++++++++++
 toolchain/gcc/Config.in                       |   5 +
 toolchain/gcc/Config.in.2                     |   2 +-
 toolchain/gcc/gcc-uclibc-4.x.mk               |  10 ++
 12 files changed, 401 insertions(+), 1 deletion(-)
 create mode 100644 toolchain/gcc/4.7.0/100-uclibc-conf.patch
 create mode 100644 toolchain/gcc/4.7.0/200-gcc-pr52734.patch
 create mode 100644 toolchain/gcc/4.7.0/301-missing-execinfo_h.patch
 create mode 100644 toolchain/gcc/4.7.0/302-c99-snprintf.patch
 create mode 100644 toolchain/gcc/4.7.0/305-libmudflap-susv3-legacy.patch
 create mode 100644 toolchain/gcc/4.7.0/810-arm-softfloat-libgcc.patch
 create mode 100644 toolchain/gcc/4.7.0/830-arm_unbreak_armv4t.patch
 create mode 100644 toolchain/gcc/4.7.0/powerpc-link-with-math-lib.patch.conditional

diff --git a/target/Config.in.arch b/target/Config.in.arch
index a2c0037b0a..f8ab84e661 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -221,6 +221,7 @@ config BR2_ARM_EABI
 	bool "EABI"
 config BR2_ARM_OABI
 	bool "OABI"
+	depends on !BR2_GCC_VERSION_4_7_X
 endchoice
 
 choice
diff --git a/toolchain/gcc/4.7.0/100-uclibc-conf.patch b/toolchain/gcc/4.7.0/100-uclibc-conf.patch
new file mode 100644
index 0000000000..cca8c82292
--- /dev/null
+++ b/toolchain/gcc/4.7.0/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
++++ gcc/contrib/regression/objs-gcc.sh
+@@ -105,6 +105,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- gcc/libjava/classpath/ltconfig
++++ gcc/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1251,7 +1251,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/toolchain/gcc/4.7.0/200-gcc-pr52734.patch b/toolchain/gcc/4.7.0/200-gcc-pr52734.patch
new file mode 100644
index 0000000000..a1ac6017de
--- /dev/null
+++ b/toolchain/gcc/4.7.0/200-gcc-pr52734.patch
@@ -0,0 +1,115 @@
+Index: gcc/tree-ssa-tail-merge.c
+===================================================================
+--- a/gcc/tree-ssa-tail-merge.c (revision 185028)
++++ b/gcc/tree-ssa-tail-merge.c (working copy)
+@@ -1123,18 +1123,31 @@ gimple_equal_p (same_succ same_succ, gim
+     }
+ }
+ 
+-/* Let GSI skip backwards over local defs.  */
++/* Let GSI skip backwards over local defs.  Return the earliest vuse in VUSE.
++   Return true in VUSE_ESCAPED if the vuse influenced a SSA_OP_DEF of one of the
++   processed statements.  */
+ 
+ static void
+-gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi)
++gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi, tree *vuse,
++				  bool *vuse_escaped)
+ {
+   gimple stmt;
++  tree lvuse;
+ 
+   while (true)
+     {
+       if (gsi_end_p (*gsi))
+ 	return;
+       stmt = gsi_stmt (*gsi);
++
++      lvuse = gimple_vuse (stmt);
++      if (lvuse != NULL_TREE)
++	{
++	  *vuse = lvuse;
++	  if (!ZERO_SSA_OPERANDS (stmt, SSA_OP_DEF))
++	    *vuse_escaped = true;
++	}
++
+       if (!(is_gimple_assign (stmt) && local_def (gimple_get_lhs (stmt))
+ 	    && !gimple_has_side_effects (stmt)))
+ 	return;
+@@ -1150,9 +1163,11 @@ find_duplicate (same_succ same_succ, bas
+ {
+   gimple_stmt_iterator gsi1 = gsi_last_nondebug_bb (bb1);
+   gimple_stmt_iterator gsi2 = gsi_last_nondebug_bb (bb2);
++  tree vuse1 = NULL_TREE, vuse2 = NULL_TREE;
++  bool vuse_escaped = false;
+ 
+-  gsi_advance_bw_nondebug_nonlocal (&gsi1);
+-  gsi_advance_bw_nondebug_nonlocal (&gsi2);
++  gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1, &vuse_escaped);
++  gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2, &vuse_escaped);
+ 
+   while (!gsi_end_p (gsi1) && !gsi_end_p (gsi2))
+     {
+@@ -1161,13 +1176,20 @@ find_duplicate (same_succ same_succ, bas
+ 
+       gsi_prev_nondebug (&gsi1);
+       gsi_prev_nondebug (&gsi2);
+-      gsi_advance_bw_nondebug_nonlocal (&gsi1);
+-      gsi_advance_bw_nondebug_nonlocal (&gsi2);
++      gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1, &vuse_escaped);
++      gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2, &vuse_escaped);
+     }
+ 
+   if (!(gsi_end_p (gsi1) && gsi_end_p (gsi2)))
+     return;
+ 
++  /* If the incoming vuses are not the same, and the vuse escaped into an
++     SSA_OP_DEF, then merging the 2 blocks will change the value of the def,
++     which potentially means the semantics of one of the blocks will be changed.
++     TODO: make this check more precise.  */
++  if (vuse_escaped && vuse1 != vuse2)
++    return;
++
+   if (dump_file)
+     fprintf (dump_file, "find_duplicates: <bb %d> duplicate of <bb %d>\n",
+ 	     bb1->index, bb2->index);
+Index: gcc/testsuite/gcc.dg/pr52734.c
+===================================================================
+--- a/dev/null (new file)
++++ b/gcc/testsuite/gcc.dg/pr52734.c (revision 0)
+@@ -0,0 +1,35 @@
++/* { dg-do run } */
++/* { dg-options "-O2" } */
++
++int bbb = 0;
++
++int __attribute__((noinline,noclone)) aaa(void)
++{
++    ++bbb;
++    return 0;
++}
++
++int __attribute__((noinline,noclone)) ccc(void)
++{
++  int ddd;
++  /* bbb == 0 */
++  if (aaa())
++    return bbb;
++
++  /* bbb == 1 */
++  ddd = bbb;
++  /* bbb == ddd == 1 */
++  if (aaa ())
++    return 0;
++  /* bbb == 2, ddd == 1 */
++
++  return ddd;
++}
++
++int main(void)
++{
++    if (ccc() != 1)
++	__builtin_abort();
++    return 0;
++}
++
diff --git a/toolchain/gcc/4.7.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.7.0/301-missing-execinfo_h.patch
new file mode 100644
index 0000000000..0e2092f3fb
--- /dev/null
+++ b/toolchain/gcc/4.7.0/301-missing-execinfo_h.patch
@@ -0,0 +1,11 @@
+--- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
++++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
+@@ -500,7 +500,7 @@
+ #ifdef __linux__
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/toolchain/gcc/4.7.0/302-c99-snprintf.patch b/toolchain/gcc/4.7.0/302-c99-snprintf.patch
new file mode 100644
index 0000000000..ba51a0e1d4
--- /dev/null
+++ b/toolchain/gcc/4.7.0/302-c99-snprintf.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.3.0/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- gcc-4.3.0/libstdc++-v3/include/c_global/cstdio	(revision 129202)
++++ gcc-4.3.0/libstdc++-v3/include/c_global/cstdio	(working copy)
+@@ -144,7 +144,7 @@
+ 
+ _GLIBCXX_END_NAMESPACE
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/toolchain/gcc/4.7.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.7.0/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 0000000000..374b1f8659
--- /dev/null
+++ b/toolchain/gcc/4.7.0/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,49 @@
+Index: gcc-4.2/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)
++++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)
+@@ -427,7 +427,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -437,7 +437,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -447,7 +447,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -456,7 +456,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -465,7 +465,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/toolchain/gcc/4.7.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.7.0/810-arm-softfloat-libgcc.patch
new file mode 100644
index 0000000000..a3d7db014d
--- /dev/null
+++ b/toolchain/gcc/4.7.0/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,25 @@
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -57,7 +57,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,10 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/toolchain/gcc/4.7.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.7.0/830-arm_unbreak_armv4t.patch
new file mode 100644
index 0000000000..37f8f2a54d
--- /dev/null
+++ b/toolchain/gcc/4.7.0/830-arm_unbreak_armv4t.patch
@@ -0,0 +1,13 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/toolchain/gcc/4.7.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.7.0/powerpc-link-with-math-lib.patch.conditional
new file mode 100644
index 0000000000..7e75e87f23
--- /dev/null
+++ b/toolchain/gcc/4.7.0/powerpc-link-with-math-lib.patch.conditional
@@ -0,0 +1,125 @@
+http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
+
+On glibc the libc.so carries a copy of the math function copysignl() but
+on uClibc math functions like copysignl() live in libm. Since libgcc_s
+contains unresolved symbols, any attempt to link against libgcc_s
+without explicitely specifying -lm fails, resulting in a broken
+bootstrap of the compiler.
+
+Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.5.1/gcc/config/t-slibgcc-elf-ver
+--- gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:08.644904042 -0300
++++ gcc-4.5.1/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:56.332904024 -0300
+@@ -27,7 +27,7 @@
+ SHLIB_OBJS = @shlib_objs@
+ SHLIB_DIR = @multilib_dir@
+ SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
+-SHLIB_LC = -lc
++SHLIB_LC = @libgcc_libm@ -lc
+ SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
+ 	$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+diff -Nura gcc-4.5.1.orig/libgcc/Makefile.in gcc-4.5.1/libgcc/Makefile.in
+--- gcc-4.5.1.orig/libgcc/Makefile.in	2010-11-03 14:32:44.272904042 -0300
++++ gcc-4.5.1/libgcc/Makefile.in	2010-11-03 14:37:03.893904042 -0300
+@@ -39,6 +39,7 @@
+ decimal_float = @decimal_float@
+ enable_decimal_float = @enable_decimal_float@
+ fixed_point = @fixed_point@
++LIBGCC_LIBM = @LIBGCC_LIBM@
+ 
+ host_noncanonical = @host_noncanonical@
+ 
+@@ -798,9 +799,10 @@
+ 		@multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_objs@,$(objects),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
++		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
+ 		@shlib_map_file@,$(mapfile),$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
+-		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
++		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
+ 
+ libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
+ 	# @multilib_flags@ is still needed because this may use
+diff -Nura gcc-4.5.1.orig/libgcc/configure gcc-4.5.1/libgcc/configure
+--- gcc-4.5.1.orig/libgcc/configure	2010-11-03 14:32:44.283904042 -0300
++++ gcc-4.5.1/libgcc/configure	2010-11-03 14:39:48.685904042 -0300
+@@ -557,6 +557,7 @@
+ extra_parts
+ tmake_file
+ set_use_emutls
++LIBGCC_LIBM
+ set_have_cc_tls
+ vis_hide
+ fixed_point
+@@ -3847,6 +3848,37 @@
+   set_use_emutls="-DUSE_EMUTLS"
+ fi
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++echo "$as_me:$LINENO: checking for library containing copysignl" >&5
++echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
++if test "${libgcc_cv_copysignl_lib+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++
++fi
++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
+ 
+ # Conditionalize the makefile for this target machine.
+ tmake_file_=
+diff -Nura gcc-4.5.1.orig/libgcc/configure.ac gcc-4.5.1/libgcc/configure.ac
+--- gcc-4.5.1.orig/libgcc/configure.ac	2010-11-03 14:32:44.735904042 -0300
++++ gcc-4.5.1/libgcc/configure.ac	2010-11-03 14:42:11.278904045 -0300
+@@ -238,6 +238,27 @@
+ fi
+ AC_SUBST(set_have_cc_tls)
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++AC_CACHE_CHECK
++  libgcc_cv_copysignl_lib,
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++  ])
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
++AC_SUBST(LIBGCC_LIBM)
++
+ # See if we have emulated thread-local storage.
+ GCC_CHECK_EMUTLS
+ set_use_emutls=
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index a4ca0546f9..4bff8855b1 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -30,6 +30,10 @@ choice
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.6.x"
 
+	config BR2_GCC_VERSION_4_7_X
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		bool "gcc 4.7.x"
+
 	config BR2_GCC_VERSION_SNAP
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc snapshot"
@@ -60,6 +64,7 @@ config BR2_GCC_VERSION
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
+	default "4.7.0"     if BR2_GCC_VERSION_4_7_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index c76d125832..d060a80e08 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GCC_TARGET
 	depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
 	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_BINUTILS_TARGET
-	select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X || BR2_GCC_VERSION_SNAP)
+	select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X || BR2_GCC_VERSION_4_7_X || BR2_GCC_VERSION_SNAP)
 	select BR2_PACKAGE_MPFR
 	select BR2_PACKAGE_GMP
 	help
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index d9547fbfbe..ae734e88ba 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -120,6 +120,16 @@ endif
 GCC_HOST_PREREQ += host-mpc
 endif
 
+# GCC 4.7.x prerequisites
+ifeq ($(findstring x4.7.,x$(GCC_VERSION)),x4.7.)
+GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
+GCC_TARGET_PREREQ += mpc
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+HOST_SOURCE += host-mpc-source
+endif
+GCC_HOST_PREREQ += host-mpc
+endif
+
 # GCC snapshot prerequisites
 # Since we don't know and it can be quite new just ask for everything known
 ifneq ($(GCC_SNAP_DATE),)

From 9eee902c010f8bd464e66b32ff073b5e8c66fb09 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Wed, 11 Apr 2012 15:06:50 +0200
Subject: [PATCH 1765/6849] Add sam-ba to at91sam926*_defconfig

[Peter: also add to 9g0dfc]
Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9260dfc_defconfig | 4 ++++
 configs/at91sam9261ek_defconfig  | 4 ++++
 configs/at91sam9263ek_defconfig  | 4 ++++
 configs/at91sam9g20dfc_defconfig | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 3cd58ac7eb..921afa8b3a 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -2,6 +2,10 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# Host utilities
+#
+BR2_PACKAGE_HOST_SAM_BA=y
+
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 73edd8976d..aafb166a48 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -2,6 +2,10 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# Host utilities
+#
+BR2_PACKAGE_HOST_SAM_BA=y
+
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9261ek"
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index e4a44f11ea..2cd82c03ee 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -2,6 +2,10 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# Host utilities
+#
+BR2_PACKAGE_HOST_SAM_BA=y
+
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9263ek"
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 4a4b09c398..723b9e197f 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -2,6 +2,10 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# Host utilities
+#
+BR2_PACKAGE_HOST_SAM_BA=y
+
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9g20ek"

From 5fadbb58abb54f816f13367c9af4323136f4cf49 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 15 Apr 2012 14:02:10 +0200
Subject: [PATCH 1766/6849] screen: fix build when libelf is enabled

screen's configure script thinks it is running on a SVR4 system when it
detects libelf, breaking the build.

At the same time cleanup the package somewhat, and ensure the correct
CFLAGS are used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/screen/screen.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index 2dfb8f2a35..4b3d427b35 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -7,8 +7,8 @@
 SCREEN_VERSION = 4.0.3
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 SCREEN_DEPENDENCIES = ncurses
-SCREEN_CONF_ENV = CFLAGS=-DSYSV=1
-SCREEN_MAKE_OPT = -j1
+SCREEN_CONF_ENV = ac_cv_header_elf_h=no ac_cv_header_dwarf_h=no
+SCREEN_MAKE = $(MAKE1)
 SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
 $(eval $(call AUTOTARGETS))

From 74097fd659154499612f21fabeda4e3e7c8fdbfc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Apr 2012 11:36:22 -0300
Subject: [PATCH 1767/6849] ushare: new package

UPnP media streamer.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                         |   1 +
 package/ushare/Config.in                  |  13 ++
 package/ushare/ushare-compile-fixes.patch | 206 ++++++++++++++++++++++
 package/ushare/ushare.mk                  |  31 ++++
 4 files changed, 251 insertions(+)
 create mode 100644 package/ushare/Config.in
 create mode 100644 package/ushare/ushare-compile-fixes.patch
 create mode 100644 package/ushare/ushare.mk

diff --git a/package/Config.in b/package/Config.in
index d703b8c37f..3e5f708d1b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -526,6 +526,7 @@ source "package/tn5250/Config.in"
 source "package/transmission/Config.in"
 source "package/ttcp/Config.in"
 source "package/udpcast/Config.in"
+source "package/ushare/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
diff --git a/package/ushare/Config.in b/package/ushare/Config.in
new file mode 100644
index 0000000000..a714fa06a6
--- /dev/null
+++ b/package/ushare/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_USHARE
+	bool "ushare"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBUPNP
+	help
+	  uShare is a UPnP (TM) A/V & DLNA Media Server.
+	  It implements the server component that provides UPnP media devices
+	  with information on available multimedia files.
+
+	  http://ushare.geexbox.org/
+
+comment "ushare requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/ushare/ushare-compile-fixes.patch b/package/ushare/ushare-compile-fixes.patch
new file mode 100644
index 0000000000..cfdf5e3404
--- /dev/null
+++ b/package/ushare/ushare-compile-fixes.patch
@@ -0,0 +1,206 @@
+Patch nixed from OpenWRT svn to fix build breakage.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/src/cds.c
++++ b/src/cds.c
+@@ -20,6 +20,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+--- a/src/http.c
++++ b/src/http.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
+@@ -77,8 +78,7 @@ set_info_file (struct File_Info *info, c
+   info->content_type = ixmlCloneDOMString (content_type);
+ }
+ 
+-static int
+-http_get_info (const char *filename, struct File_Info *info)
++int http_get_info (const char *filename, struct File_Info *info)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -197,8 +197,7 @@ get_file_memory (const char *fullpath, c
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static UpnpWebFileHandle
+-http_open (const char *filename, enum UpnpOpenFileMode mode)
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -251,8 +250,7 @@ http_open (const char *filename, enum Up
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static int
+-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   ssize_t len = -1;
+@@ -286,8 +284,7 @@ http_read (UpnpWebFileHandle fh, char *b
+   return len;
+ }
+ 
+-static int
+-http_write (UpnpWebFileHandle fh __attribute__((unused)),
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
+             char *buf __attribute__((unused)),
+             size_t buflen __attribute__((unused)))
+ {
+@@ -296,8 +293,7 @@ http_write (UpnpWebFileHandle fh __attri
+   return 0;
+ }
+ 
+-static int
+-http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   off_t newpos = -1;
+@@ -371,8 +367,7 @@ http_seek (UpnpWebFileHandle fh, off_t o
+   return 0;
+ }
+ 
+-static int
+-http_close (UpnpWebFileHandle fh)
++int http_close (UpnpWebFileHandle fh)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+ 
+@@ -402,13 +397,3 @@ http_close (UpnpWebFileHandle fh)
+ 
+   return 0;
+ }
+-
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks =
+-  {
+-    http_get_info,
+-    http_open,
+-    http_read,
+-    http_write,
+-    http_seek,
+-    http_close
+-  };
+--- a/src/http.h
++++ b/src/http.h
+@@ -25,6 +25,18 @@
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks;
++int http_get_info (const char *filename, struct File_Info *info);
++
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode);
++
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen);
++
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin);
++
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
++	char *buf __attribute__((unused)),
++	size_t buflen __attribute__((unused)));
++
++int http_close (UpnpWebFileHandle fh);
+ 
+ #endif /* _HTTP_H_ */
+--- a/src/ushare.c
++++ b/src/ushare.c
+@@ -188,7 +188,7 @@ handle_action_request (struct Upnp_Actio
+   if (strcmp (request->DevUDN + 5, ut->udn))
+     return;
+ 
+-  ip = request->CtrlPtIPAddr.s_addr;
++  ip = (*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr.s_addr;
+   ip = ntohl (ip);
+   sprintf (val, "%d.%d.%d.%d",
+            (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
+@@ -348,13 +348,23 @@ init_upnp (struct ushare_t *ut)
+ 
+   UpnpEnableWebserver (TRUE);
+ 
+-  res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
+-  if (res != UPNP_E_SUCCESS)
+-  {
+-    log_error (_("Cannot set virtual directory callbacks\n"));
+-    free (description);
+-    return -1;
+-  }
++#define upnp_set_callback(cb, func) \
++  do {                                                            \
++    res = UpnpVirtualDir_set_##cb##Callback(func);                \
++    if (res != UPNP_E_SUCCESS)                                    \
++    {                                                             \
++      log_error (_("Cannot set virtual directory callbacks\n"));  \
++      free (description);                                         \
++      return -1;                                                  \
++    }                                                             \
++  } while(0)
++
++  upnp_set_callback(GetInfo, http_get_info);
++  upnp_set_callback(Open,    http_open);
++  upnp_set_callback(Read,    http_read);
++  upnp_set_callback(Seek,    http_seek);
++  upnp_set_callback(Write,   http_write);
++  upnp_set_callback(Close,   http_close);
+ 
+   res = UpnpAddVirtualDir (VIRTUAL_DIR);
+   if (res != UPNP_E_SUCCESS)
+--- a/src/cms.c
++++ b/src/cms.c
+@@ -20,6 +20,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+--- a/src/mime.c
++++ b/src/mime.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <string.h>
+ 
+ #include "mime.h"
+--- a/src/presentation.c
++++ b/src/presentation.c
+@@ -19,6 +19,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ 
+ #if HAVE_LANGINFO_CODESET
+ # include <langinfo.h>
+--- a/src/services.c
++++ b/src/services.c
+@@ -20,6 +20,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
new file mode 100644
index 0000000000..ac8cbc356a
--- /dev/null
+++ b/package/ushare/ushare.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# ushare
+#
+#############################################################
+
+USHARE_VERSION = 1.1a
+USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
+USHARE_SITE = http://ushare.geexbox.org/releases
+USHARE_DEPENDENCIES = host-pkg-config libupnp
+
+define USHARE_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure --prefix=/usr $(DISABLE_NLS) --cross-compile \
+		--cross-prefix="$(TARGET_CROSS)" --sysconfdir=/etc \
+		--disable-strip \
+	)
+endef
+
+define USHARE_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define USHARE_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	rm -f $(TARGET_DIR)/etc/init.d/ushare
+endef
+
+# Even though configure is called it's not autoconf
+$(eval $(call GENTARGETS))

From f5b6e19eff604bf92ab84c30eebd600f88d39db3 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 4 Apr 2012 14:37:01 +0200
Subject: [PATCH 1768/6849] linux-firmware: add new wl12xx firmware

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/linux-firmware.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index e09f67d91c..ba33d37c3d 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -3,7 +3,7 @@
 # linux-firmware
 #
 #############################################################
-LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
+LINUX_FIRMWARE_VERSION = 8ccddee5ee23a0e192da38d98bcbbbb41bf385dd
 LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
@@ -38,6 +38,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
 	ti-connectivity/wl127x-fw-3.bin				\
 	ti-connectivity/wl127x-fw-plt-3.bin			\
 	ti-connectivity/wl127x-nvs.bin				\
+	ti-connectivity/wl127x-fw-4-mr.bin			\
+	ti-connectivity/wl127x-fw-4-plt.bin			\
+	ti-connectivity/wl127x-fw-4-sr.bin			\
 	ti-connectivity/TIInit_7.2.31.bts 			\
 	LICENCE.ti-connectivity
 
@@ -50,6 +53,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
 	ti-connectivity/wl1271-nvs.bin				\
 	ti-connectivity/wl128x-nvs.bin				\
 	ti-connectivity/wl12xx-nvs.bin				\
+	ti-connectivity/wl128x-fw-4-mr.bin			\
+	ti-connectivity/wl128x-fw-4-plt.bin			\
+	ti-connectivity/wl128x-fw-4-sr.bin			\
 	ti-connectivity/TIInit_7.2.31.bts 			\
 	LICENCE.ti-connectivity
 

From feba8b1382bfda10bc479f744e4697c868a23dc3 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 4 Apr 2012 14:50:19 +0200
Subject: [PATCH 1769/6849] package: set PKG_CONFIG_SYSROOT_DIR in
 HOST_MAKE_ENV

A host package that uses AUTORECONF (such as host-libglib2)
may end up running './config.status --recheck'. This will
call the configure script with the environment variables
set in HOST_MAKE_ENV. If PKG_CONFIG_SYSROOT_DIR is missing
this will cause the hardcoded sysroot dir take effect leading
to wrong paths.

See commit 22acade2ec311 which works around this problem by
fiddling with the generated .pc file. This commit becomes
obsolete with this fix.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Cc: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index dc8d0383c1..c344c6b3f2 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -222,6 +222,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 HOST_MAKE_ENV=PATH=$(HOST_PATH) \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		PKG_CONFIG_SYSROOT_DIR="/" \
 		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 

From 8b354dac5a414a7e335276a53a32b9dcfd61b379 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Apr 2012 21:46:46 +0200
Subject: [PATCH 1770/6849] boost: fix build with uClibc, add locale/timer
 modules options

Boost 1.49 added two new modules, locale and timer - So add sub options
to control compilation of those. The locale module by default compiles
the posix backend under Linux, but this needs monetary.h which isn't
provided by uClibc, so work around that.

While we're at it, hide the icu option as that is just an internal
configuration option used by E.G. the locale module.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 14 ++++++++++----
 package/boost/boost.mk  | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 578fced374..87983676ea 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -37,13 +37,16 @@ config BR2_PACKAGE_BOOST_GRAPH
 config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
 	bool "boost-graph_parallel"
 
-config BR2_PACKAGE_BOOST_ICU
-        select BR2_PACKAGE_ICU
-	bool "boost-icu"
-
 config BR2_PACKAGE_BOOST_IOSTREAMS
 	bool "boost-iostreams"
 
+config BR2_PACKAGE_BOOST_LOCALE
+	depends on BR2_USE_WCHAR
+	bool "boost-locale"
+
+comment "boost-locale requires a toolchain with wchar support"
+	depends on !BR2_USE_WCHAR
+
 config BR2_PACKAGE_BOOST_MATH
 	bool "boost-math"
 
@@ -75,6 +78,9 @@ config BR2_PACKAGE_BOOST_THREAD
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	bool "boost-thread"
 
+config BR2_PACKAGE_BOOST_TIMER
+	bool "boost-timer"
+
 config BR2_PACKAGE_BOOST_WAVE
 	bool "boost-wave"
 
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index e25e24d84a..8864bf9c4b 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -24,6 +24,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options)
@@ -34,15 +35,25 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave)
 
-ifeq ($(BR2_PACKAGE_BOOST_ICU),y)
+ifeq ($(BR2_PACKAGE_ICU),y)
 BOOST_FLAGS += --with-icu
 BOOST_DEPENDENCIES += icu
 else
 BOOST_FLAGS += --without-icu
 endif
 
+ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+# posix backend needs monetary.h which isn't available on uClibc
+BOOST_OPT += boost.locale.posix=off
+endif
+
+BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv)
+endif
+
 BOOST_LINK = $(if $(BR2_PREFER_STATIC_LIB),static,shared)
 BOOST_MULTI = $(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single)
 BOOST_VARIANT = $(if $(BR2_ENABLE_DEBUG),debug,release)
@@ -64,6 +75,7 @@ define BOOST_INSTALL_TARGET_CMDS
 	link=$(BOOST_LINK) \
 	threading=$(BOOST_MULTI) \
 	runtime-link=$(BOOST_LINK) \
+	$(BOOST_OPT) \
 	--prefix=$(TARGET_DIR)/usr \
 	--layout=system install )
 endef
@@ -75,6 +87,7 @@ define BOOST_INSTALL_STAGING_CMDS
 	variant=$(BOOST_VARIANT) \
 	link=$(BOOST_LINK) \
 	threading=$(BOOST_MULTI) \
+	$(BOOST_OPT) \
 	runtime-link=$(BOOST_LINK) \
 	--prefix=$(STAGING_DIR)/usr \
 	--layout=system install)

From 581af082c517f77bb998da318a216ecef60480e4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Apr 2012 22:01:17 +0200
Subject: [PATCH 1771/6849] boost: cleanup

Move common staging/target bjam arguments into BOOST_OPT.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 8864bf9c4b..8b8a3cfe52 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -45,6 +45,12 @@ else
 BOOST_FLAGS += --without-icu
 endif
 
+BOOST_OPT += toolset=gcc \
+	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
+	     link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
+	     runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
+	     threading=$(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single)
+
 ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
 # posix backend needs monetary.h which isn't available on uClibc
@@ -54,10 +60,6 @@ endif
 BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv)
 endif
 
-BOOST_LINK = $(if $(BR2_PREFER_STATIC_LIB),static,shared)
-BOOST_MULTI = $(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single)
-BOOST_VARIANT = $(if $(BR2_ENABLE_DEBUG),debug,release)
-
 BOOST_WITHOUT_FLAGS_COMMASEPERATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS)))
 BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPERATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPERATED))
 
@@ -70,11 +72,6 @@ endef
 define BOOST_INSTALL_TARGET_CMDS
 	(cd $(@D) && ./b2 -q -d+2 \
 	--user-config=$(@D)/user-config.jam \
-	toolset=gcc \
-	variant=$(BOOST_VARIANT) \
-	link=$(BOOST_LINK) \
-	threading=$(BOOST_MULTI) \
-	runtime-link=$(BOOST_LINK) \
 	$(BOOST_OPT) \
 	--prefix=$(TARGET_DIR)/usr \
 	--layout=system install )
@@ -83,12 +80,7 @@ endef
 define BOOST_INSTALL_STAGING_CMDS
 	(cd $(@D) && ./bjam -d+2 \
 	--user-config=$(@D)/user-config.jam \
-	toolset=gcc \
-	variant=$(BOOST_VARIANT) \
-	link=$(BOOST_LINK) \
-	threading=$(BOOST_MULTI) \
 	$(BOOST_OPT) \
-	runtime-link=$(BOOST_LINK) \
 	--prefix=$(STAGING_DIR)/usr \
 	--layout=system install)
 endef

From cf9e38ff8247e9d3fcff618d482c680c3f7aae99 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Apr 2012 11:34:56 -0300
Subject: [PATCH 1772/6849] sshfs: bump to version 2.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sshfs/sshfs.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 738b4d0675..e60cdeb236 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-SSHFS_VERSION = 2.3
-SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)
+SSHFS_VERSION = 2.4
+SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION)
 SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = \
 	libglib2 libfuse openssh \

From 5fac9e034b418102f8816b5c6813d82ae6073d4e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Apr 2012 11:34:57 -0300
Subject: [PATCH 1773/6849] unionfs: bump to version 0.25

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/unionfs/unionfs-make-mandir.patch | 15 ---------------
 package/unionfs/unionfs.mk                |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 package/unionfs/unionfs-make-mandir.patch

diff --git a/package/unionfs/unionfs-make-mandir.patch b/package/unionfs/unionfs-make-mandir.patch
deleted file mode 100644
index bf3c241c64..0000000000
--- a/package/unionfs/unionfs-make-mandir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make the man directory if it's missing before installing the man page.
-Already upstream see http://hg.podgorny.cz/unionfs-fuse/rev/6ca07ad1b855
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura unionfs-fuse-0.24.orig/Makefile unionfs-fuse-0.24/Makefile
---- unionfs-fuse-0.24.orig/Makefile	2010-05-20 08:04:08.000000000 -0300
-+++ unionfs-fuse-0.24/Makefile	2012-01-11 08:08:02.382667776 -0300
-@@ -9,5 +9,6 @@
- 
- install: build
- 	install -d $(DESTDIR)$(PREFIX)$(BINDIR)
-+	install -d $(DESTDIR)$(PREFIX)/share/man/man8
- 	install -m 0755 src/unionfs $(DESTDIR)$(PREFIX)$(BINDIR)
- 	install -m 0644 man/unionfs-fuse.8 $(DESTDIR)$(PREFIX)/share/man/man8/
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index b0bc93b56d..ce6d582f5d 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-UNIONFS_VERSION = 0.24
+UNIONFS_VERSION = 0.25
 UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
 UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.bz2
 UNIONFS_DEPENDENCIES = libfuse

From 39c8e4d80cc31c1d7391dfeaa6926531fab9e01f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Apr 2012 11:53:42 -0300
Subject: [PATCH 1774/6849] ffmpeg: security bump to version 0.8.11

Fixes for CVE-2012-0853, CVE-2012-0858, CVE-2011-3929, CVE-2011-3936,
CVE-2011-3937, CVE-2011-3940, CVE-2011-3945 and CVE-2011-3947.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 92eb14f775..4cc29ee6db 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FFMPEG_VERSION = 0.8.10
+FFMPEG_VERSION = 0.8.11
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From 5d8af3747afb10094886e282f416fb0221cb1350 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 16 Apr 2012 15:06:55 +0200
Subject: [PATCH 1775/6849] boost: pass -dumpversion to user-config.jam

Short version avoids compiling problems with toolchains
containing long version string like Linaro toolchain.

[Peter: drop head/sed as -dumpversion returns version directly]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 8b8a3cfe52..9da427af5e 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -10,7 +10,7 @@ BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
 BOOST_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/boost
 BOOST_INSTALL_STAGING = YES
 
-TARGET_CC_VERSION = $(shell $(TARGET_CC) --version | head -n 1 | sed -e "s/.*[[:space:]]\([[:digit:].]\+$$\)/\1/g" )
+TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 
 BOOST_DEPENDENCIES = bzip2 zlib
 

From e530970c28ac1341613cc7a3605960e0373731b6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Apr 2012 23:12:38 +0200
Subject: [PATCH 1776/6849] libhid: don't build with -Werror

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libhid/libhid.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 7730af8392..8ad9ac1fa7 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -12,6 +12,10 @@ LIBHID_INSTALL_STAGING = YES
 # configure runs libusb-config for cflags/ldflags. Ensure it picks up
 # the target version
 LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(TARGET_PATH)
-LIBHID_CONF_OPT = --disable-swig --without-doxygen --disable-package-config
+LIBHID_CONF_OPT = \
+	--disable-swig \
+	--disable-werror \
+	--without-doxygen \
+	--disable-package-config
 
 $(eval $(call AUTOTARGETS))

From 7c717bbfffea0c55d348435e9b98e492b11b9177 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Mon, 16 Apr 2012 18:02:53 +0200
Subject: [PATCH 1777/6849] apply-patches.sh: patch pattern was expanded
 prematurely

The patch pattern was expanded before being into the patch directory so the
expansion can add incorrect files.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index e4b98bc057..f82be8643d 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -87,7 +87,7 @@ function scan_patchdir {
     fi
 }
 
-scan_patchdir $patchdir $patchpattern
+scan_patchdir "$patchdir" "$patchpattern"
 
 # Check for rejects...
 if [ "`find $builddir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then

From 2f41adabc5a12fcca1de5b6c296c2206b518abff Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 26 Mar 2012 10:51:52 -0400
Subject: [PATCH 1778/6849] New package: libdmtx

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libdmtx/Config.in  |  7 +++++++
 package/libdmtx/libdmtx.mk | 12 ++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/libdmtx/Config.in
 create mode 100644 package/libdmtx/libdmtx.mk

diff --git a/package/Config.in b/package/Config.in
index 3e5f708d1b..567fbedf44 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -307,6 +307,7 @@ source "package/gtk2-themes/Config.in"
 source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
 source "package/libart/Config.in"
+source "package/libdmtx/Config.in"
 source "package/libdrm/Config.in"
 source "package/libexif/Config.in"
 source "package/libgail/Config.in"
diff --git a/package/libdmtx/Config.in b/package/libdmtx/Config.in
new file mode 100644
index 0000000000..db4187fdae
--- /dev/null
+++ b/package/libdmtx/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBDMTX
+	bool "libdmtx"
+	help
+	  libdmtx is a software library that enables programs to read and write
+	  Data Matrix barcodes of the modern ECC200 variety.
+
+	  http://www.libdmtx.org/
diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk
new file mode 100644
index 0000000000..495e59a4a4
--- /dev/null
+++ b/package/libdmtx/libdmtx.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libdmtx
+#
+#############################################################
+
+LIBDMTX_VERSION = 0.7.4
+LIBDMTX_SOURCE = libdmtx-$(LIBDMTX_VERSION).tar.gz
+LIBDMTX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdmtx
+LIBDMTX_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From e5ece0d8eebf2f908b952141130664d3a6430f67 Mon Sep 17 00:00:00 2001
From: Rico Bachmann <bachmann@tofwerk.com>
Date: Tue, 17 Apr 2012 16:35:16 +0200
Subject: [PATCH 1779/6849] Add apr-package

Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |  1 +
 package/apr/Config.in |  8 ++++++++
 package/apr/apr.mk    | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/apr/Config.in
 create mode 100644 package/apr/apr.mk

diff --git a/package/Config.in b/package/Config.in
index 567fbedf44..5ae1c810dc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -374,6 +374,7 @@ source "package/zeromq/Config.in"
 endmenu
 
 menu "Other"
+source "package/apr/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
diff --git a/package/apr/Config.in b/package/apr/Config.in
new file mode 100644
index 0000000000..292cadb67c
--- /dev/null
+++ b/package/apr/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_APR
+	bool "apr"
+	help
+	  The mission of the Apache Portable Runtime (APR) project is to create
+	  and maintain software libraries that provide a predictable and
+	  consistent interface to underlying platform-specific implementations
+
+	  http://apr.apache.org/
diff --git a/package/apr/apr.mk b/package/apr/apr.mk
new file mode 100644
index 0000000000..31589133a3
--- /dev/null
+++ b/package/apr/apr.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# apr
+#
+#############################################################
+APR_VERSION = 1.4.6
+APR_SITE = http://archive.apache.org/dist/apr
+APR_INSTALL_STAGING = YES
+APR_CONF_ENV = \
+	ac_cv_file__dev_zero=yes \
+	ac_cv_func_setpgrp_void=yes \
+	apr_cv_process_shared_works=yes \
+	apr_cv_mutex_robust_shared=no \
+	apr_cv_tcp_nodelay_with_cork=yes \
+	ac_cv_sizeof_struct_iovec=8 \
+	apr_cv_mutex_recursive=yes
+
+$(eval $(call AUTOTARGETS))

From 4b02a282089e37bfe134856da5c2e9fd21360ba8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 18 Apr 2012 23:38:19 +0200
Subject: [PATCH 1780/6849] libedbus: add options for bluez/connman/notify
 support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libedbus/Config.in   | 23 ++++++++++++++++++++++-
 package/efl/libedbus/libedbus.mk | 20 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 3844b52c14..0914b37a9d 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -2,10 +2,31 @@ config BR2_PACKAGE_LIBEDBUS
 	bool "libedbus"
 	select BR2_PACKAGE_LIBEINA
 	select BR2_PACKAGE_LIBECORE
-	depends on BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS
 	help
 	  E_Dbus is a set of wrappers around D-Bus APIs so they can be
 	  easily used by EFL applications, automatically providing
 	  Ecore/main loop integration, as well as Eina data types.
 
 	  http://trac.enlightenment.org/e/wiki/E_Dbus
+
+if BR2_PACKAGE_LIBEDBUS
+
+config BR2_PACKAGE_LIBEDBUS_BLUEZ
+	bool "bluez support"
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  Bluetooth support.
+
+config BR2_PACKAGE_LIBEDBUS_CONNMAN
+	bool "connman support"
+	depends on BR2_PACKAGE_CONNMAN
+	help
+	  Connection manager support.
+
+config BR2_PACKAGE_LIBEDBUS_NOTIFY
+	bool "notify support"
+	help
+	  Notify support.
+
+endif
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 34f34a7c04..c03474d9dc 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -11,4 +11,24 @@ LIBEDBUS_INSTALL_STAGING = YES
 
 LIBEDBUS_DEPENDENCIES = host-pkg-config dbus libeina libecore
 
+ifeq ($(BR2_PACKAGE_LIBEDBUS_BLUEZ),y)
+LIBEDBUS_CONF_OPT += --enable-ebluez
+LIBEDBUS_DEPENDENCIES += bluez_utils
+else
+LIBEDBUS_CONF_OPT += --disable-ebluez
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEDBUS_CONNMAN),y)
+LIBEDBUS_CONF_OPT += --enable-econnman0_7x
+LIBEDBUS_DEPENDENCIES += connman
+else
+LIBEDBUS_CONF_OPT += --disable-econnman0_7x
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEDBUS_NOTIFY),y)
+LIBEDBUS_CONF_OPT += --enable-enotify --disable-edbus-notify-test
+else
+LIBEDBUS_CONF_OPT += --disable-enotify
+endif
+
 $(eval $(call AUTOTARGETS))

From e22dd64b32ff08eb71615be5a5ec6430ea77dc41 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 19 Apr 2012 01:01:56 +0200
Subject: [PATCH 1781/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6ff4004945..207cfe21d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,27 +7,43 @@
 
 	CMake toolchain file moved to $HOST_DIR/usr/share/buildroot.
 
-	Defconfigs: mx53qsb, use 3.2.x for atngw100,
+	Apply-patches.sh: cleanups, archived patches handling fixes,
+	support series files.
 
-	Atom processor support.
+	Defconfigs: mx53qsb, use 3.2.x for atngw100, use 3.3.x for
+	qemu configs.
 
-	Toolchain: Add GCC 4.4.7, 4.6.3. 64bit fixes for external
+	Atom processor support. Microblaze architecture support (using
+	ext toolchain). Cleanup architecture names.
+
+	Toolchain: Add GCC 4.4.7, 4.6.3, 4.7.0. uClibc 0.9.33.1,
+	default to uClibc 0.9.33.x, 64bit fixes for external
 	toolchains, linaro ext toolchains, new sourcery codebench ext
 	toolchains.
 
-	Updated/fixed packages: alsa-lib, alsa-utils, atk, avahi,
-	barebox, bluez_utils, can-utils, ccache, dhcp, dnsmasq,
-	e2fsprogs, expat, feh, file, freetype, gamin, gmp, gpsd, grep,
-	gstreamer, gst-plugins-{bad,base,good,ugly}, hdparm,
-	imagemagick, kmod, libarchive, libcurl, libethumb, libffi,
-	libfuse, libglib2, libnl, libsoup, libxml2, libxslt,
-	linux-firmware, lite, lua, microperl, mpd, mpfr, mtd, nbd,
-	network-manager, ntfs-3g, openssl, pixman, qt, radvd, sdl_net,
-	smartmontools, squashfs3, squid, sysstat, tiff, usbutils,
-	util-linux, vala, wipe, xdriver_xf86-video-fbdev, zlib,
-
-	New packages: glib-networking, lcdprog, minicom, parted,
-	protobuf, zeromq
+	Updated/fixed packages: alsa-lib, alsa-utils, at, atk, avahi,
+	barebox, bind, bluez_utils, boost, can-utils, ccache,
+	coreutils, dhcp, directfb, dnsmasq, doom-wad, dosfstools,
+	e2fsprogs, expat, fakeroot, feh, ffmpeg, file, fis, freetype,
+	gamin, gawk, gdk-pixbuf, giblib, glib-networking, gmp, gnutls,
+	gpsd, grep, gstreamer, gst-plugins-{bad,base,good,ugly},
+	haserl, hdparm, imagemagick, iptable, iw, kmod, libarchive,
+	libatomic_ops, libconfig, libcurl, libedbus, libethumb,
+	libffi, libfuse, libglib2, libgtk2, libhid, libnl, libpng,
+	libsigc, libsoup, libupnp, liburcu, libxml2,
+	libxml-parser-perl, libxslt, linux-firmware, linux-fusion,
+	lite, ltrace, lttng-libust, lua, makedevs, microperl, mpd,
+	mpfr, mtd, mysql_client, nbd, neon, netsnmp, network-manager,
+	ntfs-3g, openssl, parted, pango, pcre, pixman, poco, psmisc,
+	pulseaudio, qt, radvd, rpm, samba, sam-ba, sawman, screen,
+	sdl_net, smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
+	syslinux, sysstat, tftp-hpa, transmission, tiff, tinyhttpd,
+	udev, unionfs, usbutils, util-linux, vala, valgrind, vim,
+	vsftpd, wipe, xdriver_xf86-video-fbdev, xfsprogs, zlib,
+
+	New packages: apr, fmtools, glib-networking, hiawatha,
+	lcdprog, libcap-ng, libdmtx, libtpl, minicom, parted,
+	polarssl, protobuf, socketcand, systemd, ushare, zeromq
 
 	Deprecated packages: ttcp
 

From 40bbf5334aeea60ad06090dc5718657dfc464cf8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 19 Apr 2012 09:21:30 +0200
Subject: [PATCH 1782/6849] barebox: add 2012.04, remove 2011.12

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 4048d97dcd..09a82ebc81 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,15 +8,12 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_03
+	default BR2_TARGET_BAREBOX_2012_04
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2011_12
-	depends on BR2_DEPRECATED
-	bool "2011.12"
-
 config BR2_TARGET_BAREBOX_2012_01
+	depends on BR2_DEPRECATED
 	bool "2012.01"
 
 config BR2_TARGET_BAREBOX_2012_02
@@ -25,6 +22,9 @@ config BR2_TARGET_BAREBOX_2012_02
 config BR2_TARGET_BAREBOX_2012_03
 	bool "2012.03"
 
+config BR2_TARGET_BAREBOX_2012_04
+	bool "2012.04"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -42,10 +42,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2011.12.0"	if BR2_TARGET_BAREBOX_2011_12
 	default "2012.01.0"	if BR2_TARGET_BAREBOX_2012_01
 	default "2012.02.0"	if BR2_TARGET_BAREBOX_2012_02
 	default "2012.03.0"	if BR2_TARGET_BAREBOX_2012_03
+	default "2012.04.0"	if BR2_TARGET_BAREBOX_2012_04
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 552b4f9400d1710796371fb29c23087a78e5c440 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 18 Apr 2012 13:29:21 +0200
Subject: [PATCH 1783/6849] Fix systemd failure with lock files

Systemd introduced a new policy described here:
http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html

Add the "lock" group to buildroot to allow systemd to set this in place
at boot time

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/group | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/skeleton/etc/group b/fs/skeleton/etc/group
index 311a455167..cd4ca79423 100644
--- a/fs/skeleton/etc/group
+++ b/fs/skeleton/etc/group
@@ -9,6 +9,7 @@ wheel:x:10:root
 audio:x:29:
 utmp:x:43:
 staff:x:50:
+lock:x:54:
 haldaemon:x:68:
 dbus:x:81:
 netdev:x:82:

From a33f6dfd50227d2224b987ba99eae57c6c92fc2f Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 18 Apr 2012 13:29:23 +0200
Subject: [PATCH 1784/6849] Fix qt samples dependency on QtGUI

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 1ce63489ae..88855d2d60 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -19,6 +19,7 @@ config BR2_PACKAGE_QT_DEBUG
 
 config BR2_PACKAGE_QT_DEMOS
 	bool "Compile and install demos and examples (with code)"
+	select BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  If unsure, say N.
 

From 5ffe4283f7147a97a403351aab2f5c16fb2f3d68 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 17 Apr 2012 23:29:30 +0200
Subject: [PATCH 1785/6849] neon: fix help text for BR2_PACKAGE_NEON_NOXML

Commit 4fbff28b removed the 'depends on' statements for the XML choice.
Therefore, the expat and libxml2 options are always available.  Remove
the cryptic part of help text that tells you to select something if it
is not available.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/neon/Config.in b/package/neon/Config.in
index 92af8da912..f972dbbd01 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -31,9 +31,7 @@ choice
 config BR2_PACKAGE_NEON_NOXML
 	bool "none"
 	help
-	  none       don't use XML, if this is the only option
-	             and you want XML support, you must choose
-		     XML handling below.
+	  none       do not build with XML support
 
 config BR2_PACKAGE_NEON_EXPAT
 	bool "expat"

From 338c6d7cf278a3f694ab939f0e4254f0e81e98bb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:14 +0200
Subject: [PATCH 1786/6849] Remove cc-option: not used anywhere

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3a09417ad4..55d552b7bf 100644
--- a/Makefile
+++ b/Makefile
@@ -178,13 +178,6 @@ BUILD_DIR:=$(BASE_DIR)/build
 
 ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
-# cc-option
-# Usage: cflags-y+=$(call cc-option, -march=winchip-c6, -march=i586)
-# sets -march=winchip-c6 if supported else falls back to -march=i586
-# without checking the latter.
-cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
-	> /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
-
 #############################################################
 #
 # Hide troublesome environment variables from sub processes

From aba915fe2b189ca3efcb512f3d8cc0abd12fc1a3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:15 +0200
Subject: [PATCH 1787/6849] Remove filename extension crap for OS compatibility

The only variable that is used is HOST_LOADLIBES, defined for the
cygwin case in the kconfig build. Since we don't support cygwin,
simply get rid of this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/Makefile b/Makefile
index 55d552b7bf..bb3a49bf9e 100644
--- a/Makefile
+++ b/Makefile
@@ -195,34 +195,6 @@ unexport CONFIG_SITE
 
 GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 
-#############################################################
-#
-# Setup the proper filename extensions for the host
-#
-##############################################################
-ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=
-HOST_LIBEXT:=.a
-HOST_SHREXT:=.so
-endif
-ifneq ($(findstring apple,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=
-HOST_LIBEXT:=.a
-HOST_SHREXT:=.dylib
-endif
-ifneq ($(findstring cygwin,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=.exe
-HOST_LIBEXT:=.lib
-HOST_SHREXT:=.dll
-HOST_LOADLIBES=-lcurses -lintl
-export HOST_LOADLIBES
-endif
-ifneq ($(findstring mingw,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=.exe
-HOST_LIBEXT:=.lib
-HOST_SHREXT:=.dll
-endif
-
 ##############################################################
 #
 # The list of stuff to build for the target toolchain

From 5f42b778a03b548566b3a6b12693d198f85f31b8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:16 +0200
Subject: [PATCH 1788/6849] kconfig: do not use HOST_LOADLIBES anymore

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/kconfig/Makefile.br                      |  4 ++--
 support/kconfig/patches/10-br-build-system.patch | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/support/kconfig/Makefile.br b/support/kconfig/Makefile.br
index c24b6b50f5..2f8b6ba927 100644
--- a/support/kconfig/Makefile.br
+++ b/support/kconfig/Makefile.br
@@ -22,10 +22,10 @@ host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxx
 HOST_EXTRACFLAGS += -I$(obj)
 
 $(host-csingle): %: %.c
-	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@
+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
 
 $(host-cmulti): %: $(host-cobjs) $(host-cshlib)
-	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
 
 $(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)
 	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
diff --git a/support/kconfig/patches/10-br-build-system.patch b/support/kconfig/patches/10-br-build-system.patch
index 85125e519f..c5d9a7573b 100644
--- a/support/kconfig/patches/10-br-build-system.patch
+++ b/support/kconfig/patches/10-br-build-system.patch
@@ -3,10 +3,10 @@
  foo.h       |   12 ++++++++++++
  2 files changed, 65 insertions(+)
 
-Index: config/Makefile.br
+Index: kconfig/Makefile.br
 ===================================================================
 --- /dev/null
-+++ config/Makefile.br
++++ kconfig/Makefile.br
 @@ -0,0 +1,53 @@
 +src := .
 +top_srcdir=../../
@@ -32,10 +32,10 @@ Index: config/Makefile.br
 +HOST_EXTRACFLAGS += -I$(obj)
 +
 +$(host-csingle): %: %.c
-+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@
++	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
 +
 +$(host-cmulti): %: $(host-cobjs) $(host-cshlib)
-+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
++	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
 +
 +$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)
 +	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
@@ -61,10 +61,10 @@ Index: config/Makefile.br
 +
 +FORCE:
 +.PHONY: FORCE clean distclean
-Index: config/foo.h
+Index: kconfig/foo.h
 ===================================================================
 --- /dev/null
-+++ config/foo.h
++++ kconfig/foo.h
 @@ -0,0 +1,12 @@
 +#ifndef __KCONFIG_FOO_H
 +#define __KCONFIG_FOO_H

From 6ff4c584c80b0fe3d7ebb866e388b53859fb2c4e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:17 +0200
Subject: [PATCH 1789/6849] Rename Makefile.autotools.in to pkg-autotargets.mk

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in                                   | 2 +-
 package/{Makefile.autotools.in => pkg-autotargets.mk} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/{Makefile.autotools.in => pkg-autotargets.mk} (100%)

diff --git a/package/Makefile.in b/package/Makefile.in
index c344c6b3f2..20fac9af70 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -299,6 +299,6 @@ else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
-include package/Makefile.autotools.in
+include package/pkg-autotargets.mk
 include package/Makefile.cmake.in
 include package/Makefile.package.in
diff --git a/package/Makefile.autotools.in b/package/pkg-autotargets.mk
similarity index 100%
rename from package/Makefile.autotools.in
rename to package/pkg-autotargets.mk

From e834da05b0deb0bbd6804afe2aa0ae28a136204f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:18 +0200
Subject: [PATCH 1790/6849] Rename Makefile.cmake.in to pkg-cmaketargets.mk

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in                                | 2 +-
 package/{Makefile.cmake.in => pkg-cmaketargets.mk} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/{Makefile.cmake.in => pkg-cmaketargets.mk} (100%)

diff --git a/package/Makefile.in b/package/Makefile.in
index 20fac9af70..ab5ea48422 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -300,5 +300,5 @@ SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
 include package/pkg-autotargets.mk
-include package/Makefile.cmake.in
+include package/pkg-cmaketargets.mk
 include package/Makefile.package.in
diff --git a/package/Makefile.cmake.in b/package/pkg-cmaketargets.mk
similarity index 100%
rename from package/Makefile.cmake.in
rename to package/pkg-cmaketargets.mk

From 6e6b99a5714834c9330c30dd3af04009f5713204 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:19 +0200
Subject: [PATCH 1791/6849] Split Makefile.package.in in pkg-download.mk,
 pkg-utils.mk and pkg-gentargets.mk

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in                           |   4 +-
 package/pkg-download.mk                       | 219 +++++++++++++
 ...{Makefile.package.in => pkg-gentargets.mk} | 292 ------------------
 package/pkg-utils.mk                          |  72 +++++
 4 files changed, 294 insertions(+), 293 deletions(-)
 create mode 100644 package/pkg-download.mk
 rename package/{Makefile.package.in => pkg-gentargets.mk} (61%)
 create mode 100644 package/pkg-utils.mk

diff --git a/package/Makefile.in b/package/Makefile.in
index ab5ea48422..943017b5dc 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -299,6 +299,8 @@ else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
+include package/pkg-utils.mk
+include package/pkg-download.mk
 include package/pkg-autotargets.mk
 include package/pkg-cmaketargets.mk
-include package/Makefile.package.in
+include package/pkg-gentargets.mk
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
new file mode 100644
index 0000000000..a565ae6960
--- /dev/null
+++ b/package/pkg-download.mk
@@ -0,0 +1,219 @@
+# Download method commands
+WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
+SVN:=$(call qstrip,$(BR2_SVN))
+BZR:=$(call qstrip,$(BR2_BZR))
+GIT:=$(call qstrip,$(BR2_GIT))
+HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
+SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
+SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
+LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
+
+# Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
+# used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
+# external-deps target.
+DL_MODE=DOWNLOAD
+
+DL_DIR=$(call qstrip,$(BR2_DL_DIR))
+ifeq ($(DL_DIR),)
+DL_DIR:=$(TOPDIR)/dl
+endif
+
+#
+# URI scheme helper functions
+# Example URIs:
+# * http://www.example.com/dir/file
+# * scp://www.example.com:dir/file (with domainseparator :)
+#
+# geturischeme: http
+geturischeme=$(firstword $(subst ://, ,$(call qstrip,$(1))))
+# stripurischeme: www.example.com/dir/file
+stripurischeme=$(lastword $(subst ://, ,$(call qstrip,$(1))))
+# domain: www.example.com
+domain=$(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1))))
+# notdomain: dir/file
+notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1)))
+#
+# default domainseparator is /, specify alternative value as first argument
+domainseparator=$(if $(1),$(1),/)
+
+################################################################################
+# The DOWNLOAD_{GIT,SVN,BZR,HG,LOCALFILES} helpers are in charge of getting a
+# working copy of the source repository for their corresponding SCM,
+# checking out the requested version / commit / tag, and create an
+# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with
+# ssh authentication. DOWNLOAD_WGET is the normal wget-based download
+# mechanism.
+#
+# The SOURCE_CHECK_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers are in charge of
+# simply checking that the source is available for download. This can be used
+# to make sure one will be able to get all the sources needed for
+# one's build configuration.
+#
+# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers simply
+# output to the console the names of the files that will be downloaded, or path
+# and revision of the source repositories, producing a list of all the
+# "external dependencies" of a given build configuration.
+################################################################################
+
+define DOWNLOAD_GIT
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+	(pushd $(DL_DIR) > /dev/null && \
+	$(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
+	pushd $($(PKG)_BASE_NAME) > /dev/null && \
+	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
+		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \
+	popd > /dev/null && \
+	rm -rf $($(PKG)_DL_DIR) && \
+	popd > /dev/null)
+endef
+
+# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
+# repository
+define SOURCE_CHECK_GIT
+  $(GIT) ls-remote --heads $($(PKG)_SITE) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_GIT
+	echo $($(PKG)_SOURCE)
+endef
+
+
+define DOWNLOAD_BZR
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+	$(BZR) export $(DL_DIR)/$($(PKG)_SOURCE) $($(PKG)_SITE) -r $($(PKG)_DL_VERSION)
+endef
+
+define SOURCE_CHECK_BZR
+	$(BZR) ls --quiet $($(PKG)_SITE) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_BZR
+	echo $($(PKG)_SOURCE)
+endef
+
+
+define DOWNLOAD_SVN
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+	(pushd $(DL_DIR) > /dev/null && \
+	$(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \
+	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
+	rm -rf $($(PKG)_DL_DIR) && \
+	popd > /dev/null)
+endef
+
+define SOURCE_CHECK_SVN
+  $(SVN) ls $($(PKG)_SITE) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_SVN
+  echo $($(PKG)_SOURCE)
+endef
+
+# SCP URIs should be of the form scp://[user@]host:filepath
+# Note that filepath is relative to the user's home directory, so you may want
+# to prepend the path with a slash: scp://[user@]host:/absolutepath
+define DOWNLOAD_SCP
+	test -e $(DL_DIR)/$(2) || \
+	$(SCP) '$(call stripurischeme,$(call qstrip,$(1)))' $(DL_DIR)/$(2)
+endef
+
+define SOURCE_CHECK_SCP
+	$(SSH) $(call domain,$(1),:) ls '$(call notdomain,$(1),:)' > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_SCP
+	echo $(2)
+endef
+
+
+define DOWNLOAD_HG
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+	(pushd $(DL_DIR) > /dev/null && \
+	$(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
+	$(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \
+	              --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \
+	rm -rf $($(PKG)_DL_DIR) && \
+	popd > /dev/null)
+endef
+
+# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
+# repository
+define SOURCE_CHECK_HG
+  $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_HG
+  echo $($(PKG)_SOURCE)
+endef
+
+# Download a file using wget. Only download the file if it doesn't
+# already exist in the download directory. If the download fails,
+# remove the file (because wget -O creates a 0-byte file even if the
+# download fails).
+define DOWNLOAD_WGET
+	test -e $(DL_DIR)/$(2) || \
+	$(WGET) -O $(DL_DIR)/$(2) '$(call qstrip,$(1))' || \
+	(rm -f $(DL_DIR)/$(2) ; exit 1)
+endef
+
+define SOURCE_CHECK_WGET
+  $(WGET) --spider '$(call qstrip,$(1))'
+endef
+
+define SHOW_EXTERNAL_DEPS_WGET
+  echo $(2)
+endef
+
+define DOWNLOAD_LOCALFILES
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+		$(LOCALFILES) $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE) $(DL_DIR)
+endef
+
+define SOURCE_CHECK_LOCALFILES
+  test -e $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE)
+endef
+
+define SHOW_EXTERNAL_DEPS_LOCALFILES
+  echo $($(PKG)_SITE)/$($(PKG)_SOURCE)
+endef
+
+################################################################################
+# DOWNLOAD -- Download helper. Will try to download source from:
+# 1) BR2_PRIMARY_SITE if enabled
+# 2) Download site
+# 3) BR2_BACKUP_SITE if enabled
+#
+# Argument 1 is the source location
+# Argument 2 is the source filename
+#
+# E.G. use like this:
+# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
+################################################################################
+
+define DOWNLOAD
+	$(call DOWNLOAD_INNER,$(1),$(if $(2),$(2),$(notdir $(1))))
+endef
+
+define DOWNLOAD_INNER
+	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
+		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
+			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+		esac ; \
+	fi ; \
+	if test -n "$(1)" ; then \
+		case "$($(PKG)_SITE_METHOD)" in \
+			git) $($(DL_MODE)_GIT) && exit ;; \
+			svn) $($(DL_MODE)_SVN) && exit ;; \
+			bzr) $($(DL_MODE)_BZR) && exit ;; \
+			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
+			scp) $($(DL_MODE)_SCP) && exit ;; \
+			hg) $($(DL_MODE)_HG) && exit ;; \
+			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
+		esac ; \
+	fi ; \
+	if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \
+		$(call $(DL_MODE)_WGET,$(BR2_BACKUP_SITE)/$(2),$(2)) && exit ; \
+	fi ; \
+	exit 1
+endef
diff --git a/package/Makefile.package.in b/package/pkg-gentargets.mk
similarity index 61%
rename from package/Makefile.package.in
rename to package/pkg-gentargets.mk
index f7b65666fa..a5356814a6 100644
--- a/package/Makefile.package.in
+++ b/package/pkg-gentargets.mk
@@ -22,298 +22,6 @@
 # by already implementing the configure, build and install steps.
 ################################################################################
 
-# UPPERCASE Macro -- transform its argument to uppercase and replace dots and
-# hyphens to underscores
-
-# Heavily inspired by the up macro from gmsl (http://gmsl.sf.net)
-# This is approx 5 times faster than forking a shell and tr, and
-# as this macro is used a lot it matters
-# This works by creating translation character pairs (E.G. a:A b:B)
-# and then looping though all of them running $(subst from,to,text)
-[FROM] := a b c d e f g h i j k l m n o p q r s t u v w x y z . -
-[TO]   := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _
-
-UPPERCASE = $(strip $(eval __tmp := $1) \
-     $(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
-	$(eval __tmp :=	\
-		$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\
-			$(__tmp)))) \
-     $(__tmp))
-
-define KCONFIG_ENABLE_OPT
-       $(SED) "/\\<$(1)\\>/d" $(2)
-       echo "$(1)=y" >> $(2)
-endef
-
-define KCONFIG_SET_OPT
-       $(SED) "/\\<$(1)\\>/d" $(3)
-       echo "$(1)=$(2)" >> $(3)
-endef
-
-define KCONFIG_DISABLE_OPT
-       $(SED) "/\\<$(1)\\>/d" $(2)
-       echo "# $(1) is not set" >> $(2)
-endef
-
-# Helper functions to determine the name of a package and its
-# directory from its makefile directory, using the $(MAKEFILE_LIST)
-# variable provided by make. This is used by the *TARGETS macros to
-# automagically find where the package is located. Note that the
-# pkgdir macro is carefully written to handle the case of the Linux
-# package, for which the package directory is an empty string.
-define pkgdir
-$(dir $(lastword $(MAKEFILE_LIST)))
-endef
-
-define pkgname
-$(lastword $(subst /, ,$(call pkgdir)))
-endef
-
-define pkgparentdir
-$(patsubst %$(call pkgname)/,%,$(call pkgdir))
-endef
-
-# Define extractors for different archive suffixes
-INFLATE.bz2  = $(BZCAT)
-INFLATE.gz   = $(ZCAT)
-INFLATE.tbz  = $(BZCAT)
-INFLATE.tbz2 = $(BZCAT)
-INFLATE.tgz  = $(ZCAT)
-INFLATE.xz   = $(XZCAT)
-INFLATE.tar  = cat
-
-# MESSAGE Macro -- display a message in bold type
-MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
-TERM_BOLD := $(shell tput smso)
-TERM_RESET := $(shell tput rmso)
-
-# Download method commands
-WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
-SVN:=$(call qstrip,$(BR2_SVN))
-BZR:=$(call qstrip,$(BR2_BZR))
-GIT:=$(call qstrip,$(BR2_GIT))
-HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
-SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
-SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
-LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
-
-# Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
-# used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
-# external-deps target.
-DL_MODE=DOWNLOAD
-
-DL_DIR=$(call qstrip,$(BR2_DL_DIR))
-ifeq ($(DL_DIR),)
-DL_DIR:=$(TOPDIR)/dl
-endif
-
-#
-# URI scheme helper functions
-# Example URIs:
-# * http://www.example.com/dir/file
-# * scp://www.example.com:dir/file (with domainseparator :)
-#
-# geturischeme: http
-geturischeme=$(firstword $(subst ://, ,$(call qstrip,$(1))))
-# stripurischeme: www.example.com/dir/file
-stripurischeme=$(lastword $(subst ://, ,$(call qstrip,$(1))))
-# domain: www.example.com
-domain=$(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1))))
-# notdomain: dir/file
-notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1)))
-#
-# default domainseparator is /, specify alternative value as first argument
-domainseparator=$(if $(1),$(1),/)
-
-################################################################################
-# The DOWNLOAD_{GIT,SVN,BZR,HG,LOCALFILES} helpers are in charge of getting a
-# working copy of the source repository for their corresponding SCM,
-# checking out the requested version / commit / tag, and create an
-# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with
-# ssh authentication. DOWNLOAD_WGET is the normal wget-based download
-# mechanism.
-#
-# The SOURCE_CHECK_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers are in charge of
-# simply checking that the source is available for download. This can be used
-# to make sure one will be able to get all the sources needed for
-# one's build configuration.
-#
-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers simply
-# output to the console the names of the files that will be downloaded, or path
-# and revision of the source repositories, producing a list of all the
-# "external dependencies" of a given build configuration.
-################################################################################
-
-define DOWNLOAD_GIT
-	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
-	(pushd $(DL_DIR) > /dev/null && \
-	$(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
-	pushd $($(PKG)_BASE_NAME) > /dev/null && \
-	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
-		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \
-	popd > /dev/null && \
-	rm -rf $($(PKG)_DL_DIR) && \
-	popd > /dev/null)
-endef
-
-# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
-# repository
-define SOURCE_CHECK_GIT
-  $(GIT) ls-remote --heads $($(PKG)_SITE) > /dev/null
-endef
-
-define SHOW_EXTERNAL_DEPS_GIT
-	echo $($(PKG)_SOURCE)
-endef
-
-
-define DOWNLOAD_BZR
-	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
-	$(BZR) export $(DL_DIR)/$($(PKG)_SOURCE) $($(PKG)_SITE) -r $($(PKG)_DL_VERSION)
-endef
-
-define SOURCE_CHECK_BZR
-	$(BZR) ls --quiet $($(PKG)_SITE) > /dev/null
-endef
-
-define SHOW_EXTERNAL_DEPS_BZR
-	echo $($(PKG)_SOURCE)
-endef
-
-
-define DOWNLOAD_SVN
-	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
-	(pushd $(DL_DIR) > /dev/null && \
-	$(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \
-	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
-	rm -rf $($(PKG)_DL_DIR) && \
-	popd > /dev/null)
-endef
-
-define SOURCE_CHECK_SVN
-  $(SVN) ls $($(PKG)_SITE) > /dev/null
-endef
-
-define SHOW_EXTERNAL_DEPS_SVN
-  echo $($(PKG)_SOURCE)
-endef
-
-# SCP URIs should be of the form scp://[user@]host:filepath
-# Note that filepath is relative to the user's home directory, so you may want
-# to prepend the path with a slash: scp://[user@]host:/absolutepath
-define DOWNLOAD_SCP
-	test -e $(DL_DIR)/$(2) || \
-	$(SCP) '$(call stripurischeme,$(call qstrip,$(1)))' $(DL_DIR)/$(2)
-endef
-
-define SOURCE_CHECK_SCP
-	$(SSH) $(call domain,$(1),:) ls '$(call notdomain,$(1),:)' > /dev/null
-endef
-
-define SHOW_EXTERNAL_DEPS_SCP
-	echo $(2)
-endef
-
-
-define DOWNLOAD_HG
-	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
-	(pushd $(DL_DIR) > /dev/null && \
-	$(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
-	$(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \
-	              --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \
-	rm -rf $($(PKG)_DL_DIR) && \
-	popd > /dev/null)
-endef
-
-# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
-# repository
-define SOURCE_CHECK_HG
-  $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
-endef
-
-define SHOW_EXTERNAL_DEPS_HG
-  echo $($(PKG)_SOURCE)
-endef
-
-# Download a file using wget. Only download the file if it doesn't
-# already exist in the download directory. If the download fails,
-# remove the file (because wget -O creates a 0-byte file even if the
-# download fails).
-define DOWNLOAD_WGET
-	test -e $(DL_DIR)/$(2) || \
-	$(WGET) -O $(DL_DIR)/$(2) '$(call qstrip,$(1))' || \
-	(rm -f $(DL_DIR)/$(2) ; exit 1)
-endef
-
-define SOURCE_CHECK_WGET
-  $(WGET) --spider '$(call qstrip,$(1))'
-endef
-
-define SHOW_EXTERNAL_DEPS_WGET
-  echo $(2)
-endef
-
-define DOWNLOAD_LOCALFILES
-	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
-		$(LOCALFILES) $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE) $(DL_DIR)
-endef
-
-define SOURCE_CHECK_LOCALFILES
-  test -e $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE)
-endef
-
-define SHOW_EXTERNAL_DEPS_LOCALFILES
-  echo $($(PKG)_SITE)/$($(PKG)_SOURCE)
-endef
-
-################################################################################
-# DOWNLOAD -- Download helper. Will try to download source from:
-# 1) BR2_PRIMARY_SITE if enabled
-# 2) Download site
-# 3) BR2_BACKUP_SITE if enabled
-#
-# Argument 1 is the source location
-# Argument 2 is the source filename
-#
-# E.G. use like this:
-# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
-################################################################################
-
-define DOWNLOAD
-	$(call DOWNLOAD_INNER,$(1),$(if $(2),$(2),$(notdir $(1))))
-endef
-
-define DOWNLOAD_INNER
-	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
-		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
-			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
-			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
-		esac ; \
-	fi ; \
-	if test -n "$(1)" ; then \
-		case "$($(PKG)_SITE_METHOD)" in \
-			git) $($(DL_MODE)_GIT) && exit ;; \
-			svn) $($(DL_MODE)_SVN) && exit ;; \
-			bzr) $($(DL_MODE)_BZR) && exit ;; \
-			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
-			scp) $($(DL_MODE)_SCP) && exit ;; \
-			hg) $($(DL_MODE)_HG) && exit ;; \
-			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
-		esac ; \
-	fi ; \
-	if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \
-		$(call $(DL_MODE)_WGET,$(BR2_BACKUP_SITE)/$(2),$(2)) && exit ; \
-	fi ; \
-	exit 1
-endef
-
-# Needed for the foreach loops to loop over the list of hooks, so that
-# each hook call is properly separated by a newline.
-define sep
-
-
-endef
-
 ################################################################################
 # Implicit targets -- produce a stamp file for each step of a package build
 ################################################################################
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
new file mode 100644
index 0000000000..729f8bbe4b
--- /dev/null
+++ b/package/pkg-utils.mk
@@ -0,0 +1,72 @@
+# UPPERCASE Macro -- transform its argument to uppercase and replace dots and
+# hyphens to underscores
+
+# Heavily inspired by the up macro from gmsl (http://gmsl.sf.net)
+# This is approx 5 times faster than forking a shell and tr, and
+# as this macro is used a lot it matters
+# This works by creating translation character pairs (E.G. a:A b:B)
+# and then looping though all of them running $(subst from,to,text)
+[FROM] := a b c d e f g h i j k l m n o p q r s t u v w x y z . -
+[TO]   := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _
+
+UPPERCASE = $(strip $(eval __tmp := $1) \
+     $(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
+	$(eval __tmp :=	\
+		$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\
+			$(__tmp)))) \
+     $(__tmp))
+
+define KCONFIG_ENABLE_OPT
+       $(SED) "/\\<$(1)\\>/d" $(2)
+       echo "$(1)=y" >> $(2)
+endef
+
+define KCONFIG_SET_OPT
+       $(SED) "/\\<$(1)\\>/d" $(3)
+       echo "$(1)=$(2)" >> $(3)
+endef
+
+define KCONFIG_DISABLE_OPT
+       $(SED) "/\\<$(1)\\>/d" $(2)
+       echo "# $(1) is not set" >> $(2)
+endef
+
+# Helper functions to determine the name of a package and its
+# directory from its makefile directory, using the $(MAKEFILE_LIST)
+# variable provided by make. This is used by the *TARGETS macros to
+# automagically find where the package is located. Note that the
+# pkgdir macro is carefully written to handle the case of the Linux
+# package, for which the package directory is an empty string.
+define pkgdir
+$(dir $(lastword $(MAKEFILE_LIST)))
+endef
+
+define pkgname
+$(lastword $(subst /, ,$(call pkgdir)))
+endef
+
+define pkgparentdir
+$(patsubst %$(call pkgname)/,%,$(call pkgdir))
+endef
+
+# Define extractors for different archive suffixes
+INFLATE.bz2  = $(BZCAT)
+INFLATE.gz   = $(ZCAT)
+INFLATE.tbz  = $(BZCAT)
+INFLATE.tbz2 = $(BZCAT)
+INFLATE.tgz  = $(ZCAT)
+INFLATE.xz   = $(XZCAT)
+INFLATE.tar  = cat
+
+# MESSAGE Macro -- display a message in bold type
+MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+TERM_BOLD := $(shell tput smso)
+TERM_RESET := $(shell tput rmso)
+
+
+# Needed for the foreach loops to loop over the list of hooks, so that
+# each hook call is properly separated by a newline.
+define sep
+
+
+endef

From c0e6b52482f244e5da6e8011d1737b0a21cef207 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:20 +0200
Subject: [PATCH 1792/6849] pkg-*.mk: add some comments, update some existing
 comments

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-autotargets.mk |  4 +---
 package/pkg-download.mk    |  9 +++++++++
 package/pkg-gentargets.mk  | 10 ++++------
 package/pkg-utils.mk       | 13 +++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/package/pkg-autotargets.mk b/package/pkg-autotargets.mk
index fd118dc47a..c9887c2e1f 100644
--- a/package/pkg-autotargets.mk
+++ b/package/pkg-autotargets.mk
@@ -3,9 +3,7 @@
 #
 # This file implements an infrastructure that eases development of
 # package .mk files for autotools packages. It should be used for all
-# packages that use the autotools as their build system. Non-autotools
-# packages should use the generic infrastructure in
-# package/Makefile.package.in.
+# packages that use the autotools as their build system.
 #
 # See the Buildroot documentation for details on the usage of this
 # infrastructure
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a565ae6960..ccf819e3dd 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -1,3 +1,12 @@
+############################################################################
+#
+# This file contains the download helpers for the various package
+# infrastructures. It is used to handle downloads from HTTP servers,
+# FTP servers, Git repositories, Subversion repositories, Mercurial
+# repositories, Bazaar repositories, and SCP servers.
+#
+############################################################################
+
 # Download method commands
 WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN:=$(call qstrip,$(BR2_SVN))
diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk
index a5356814a6..1c9b458074 100644
--- a/package/pkg-gentargets.mk
+++ b/package/pkg-gentargets.mk
@@ -2,9 +2,10 @@
 # Generic package infrastructure
 #
 # This file implements an infrastructure that eases development of
-# package .mk files. It should be used for all non-autotools based
-# packages. Autotools-based packages should use the specialized
-# autotools infrastructure in package/Makefile.autotools.in.
+# package .mk files. It should be used for packages that do not rely
+# on a well-known build system for which Buildroot has a dedicated
+# infrastructure (so far, Buildroot has special support for
+# autotools-based and CMake-based packages).
 #
 # See the Buildroot documentation for details on the usage of this
 # infrastructure
@@ -17,9 +18,6 @@
 #
 #   2. Description of the commands to be executed to configure, build
 #      and install the package
-#
-# The autotools infrastructure specializes this generic infrastructure
-# by already implementing the configure, build and install steps.
 ################################################################################
 
 ################################################################################
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 729f8bbe4b..953dbc94c1 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -1,3 +1,10 @@
+############################################################################
+#
+# This file contains various utility functions used by the package
+# infrastructure, or by the packages themselves.
+#
+############################################################################
+
 # UPPERCASE Macro -- transform its argument to uppercase and replace dots and
 # hyphens to underscores
 
@@ -16,6 +23,12 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
 			$(__tmp)))) \
      $(__tmp))
 
+#
+# Manipulation of .config files based on the Kconfig
+# infrastructure. Used by the Busybox package, the Linux kernel
+# package, and more.
+#
+
 define KCONFIG_ENABLE_OPT
        $(SED) "/\\<$(1)\\>/d" $(2)
        echo "$(1)=y" >> $(2)

From 4ef7ec585c904f3c68af391e220534981ded2bab Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:21 +0200
Subject: [PATCH 1793/6849] Remove unused .fakeroot.* mechanism

There used to be a mechanism using which packages could leave a
.fakeroot.<something> file which could contain commands to be executed
within the fakeroot environment. Since this mechanism is no longer
used by any package, remove it from the common infrastructure.

The latest user was nfs-utils, which used this mechanism to do the
"make install" as root, since doing otherwise was not supported. But
since 16e7b8255c82815126a2c502c3787d442d254a86, nfs-utils has been
upgraded and converted to the package infrastructure, and this hack is
no longer necessary. Another past user was the ltp-testsuite package,
for the same reason, and since
a72a670489547a3ca645ff7c3a0d9c3fb66eab51, the fakeroot hack is no
longer needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile              | 6 ------
 fs/common.mk          | 2 --
 fs/iso9660/iso9660.mk | 2 --
 3 files changed, 10 deletions(-)

diff --git a/Makefile b/Makefile
index bb3a49bf9e..845858044d 100644
--- a/Makefile
+++ b/Makefile
@@ -302,8 +302,6 @@ endif
 
 include fs/common.mk
 
-TARGETS+=erase-fakeroots
-
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
@@ -392,7 +390,6 @@ $(BUILD_DIR)/.root:
 		if [ -d "$(TARGET_SKELETON)" ]; then \
 			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
 		fi; \
-		touch $(STAGING_DIR)/.fakeroot.00000; \
 	fi
 	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
 	-find $(TARGET_DIR) -type f \( -name .empty -o -name '*~' \) -print0 | xargs -0 rm -rf
@@ -400,9 +397,6 @@ $(BUILD_DIR)/.root:
 
 $(TARGET_DIR): $(BUILD_DIR)/.root
 
-erase-fakeroots:
-	rm -f $(BUILD_DIR)/.fakeroot*
-
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
 	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
diff --git a/fs/common.mk b/fs/common.mk
index d426f37966..debf7db65f 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -45,8 +45,6 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
 	rm -f $(FAKEROOT_SCRIPT)
-	touch $(BUILD_DIR)/.fakeroot.00000
-	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
 	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index afebafcd8a..f51b6ee868 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -25,8 +25,6 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-ext2 grub
 	cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)
-	touch $(BUILD_DIR)/.fakeroot.00000
-	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 	# Use fakeroot so mkisofs believes the previous fakery
 	echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \

From 776f0b441d775490dad90350ff0005504968e130 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 19 Apr 2012 12:32:17 -0300
Subject: [PATCH 1794/6849] openssl: security bump to version 1.0.0i

Fix for CVE-2012-2110

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index a304747f00..185522c957 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0h
+OPENSSL_VERSION = 1.0.0i
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From b7285d0058978fb88a94985dba150e849e4d9a69 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:22 +0200
Subject: [PATCH 1795/6849] Move the manual build infrastructure to
 docs/manual/manual.mk

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile              | 49 +------------------------------------------
 docs/manual/manual.mk | 48 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 48 deletions(-)
 create mode 100644 docs/manual/manual.mk

diff --git a/Makefile b/Makefile
index 845858044d..bc6670bc3f 100644
--- a/Makefile
+++ b/Makefile
@@ -685,54 +685,7 @@ release:
 print-version:
 	@echo $(BR2_VERSION_FULL)
 
-################################################################################
-# GENDOC -- generates the make targets needed to build a specific type of
-#           asciidoc documentation.
-#
-#  argument 1 is the name of the document and must be a subdirectory of docs/;
-#             the top-level asciidoc file must have the same name
-#  argument 2 is the type of document to generate (-f argument of a2x)
-#  argument 3 is the document type as used in the make target
-#  argument 4 is the output file extension for the document type
-#  argument 5 is the human text for the document type
-#  argument 6 (optional) are extra arguments for a2x
-#
-# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
-################################################################################
-define GENDOC_INNER
-$(1): $(1)-$(3)
-.PHONY: $(1)-$(3)
-$(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
-
-$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
-	@echo "Generating $(5) $(1)..."
-	$(Q)mkdir -p $$(@D)
-	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
-	  -D $$(@D) $$<
-endef
-
-################################################################################
-# GENDOC -- generates the make targets needed to build asciidoc documentation.
-#
-#  argument 1 is the name of the document and must be a subdirectory of docs/;
-#             the top-level asciidoc file must have the same name
-#
-# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
-################################################################################
-define GENDOC
-$(call GENDOC_INNER,$(1),xhtml,html,html,HTML)
-$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML)
-$(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
-$(call GENDOC_INNER,$(1),text,txt,text,Text)
-$(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
-clean: clean-$(1)
-clean-$(1):
-	$(Q)$(RM) -rf $(O)/docs/$(1)
-.PHONY: $(1) clean-$(1)
-endef
-
-MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)
-$(eval $(call GENDOC,manual))
+include docs/manual/manual.mk
 
 .PHONY: $(noconfig_targets)
 
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
new file mode 100644
index 0000000000..1eaf73a5bd
--- /dev/null
+++ b/docs/manual/manual.mk
@@ -0,0 +1,48 @@
+################################################################################
+# GENDOC -- generates the make targets needed to build a specific type of
+#           asciidoc documentation.
+#
+#  argument 1 is the name of the document and must be a subdirectory of docs/;
+#             the top-level asciidoc file must have the same name
+#  argument 2 is the type of document to generate (-f argument of a2x)
+#  argument 3 is the document type as used in the make target
+#  argument 4 is the output file extension for the document type
+#  argument 5 is the human text for the document type
+#  argument 6 (optional) are extra arguments for a2x
+#
+# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
+################################################################################
+define GENDOC_INNER
+$(1): $(1)-$(3)
+.PHONY: $(1)-$(3)
+$(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
+
+$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
+	@echo "Generating $(5) $(1)..."
+	$(Q)mkdir -p $$(@D)
+	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
+	  -D $$(@D) $$<
+endef
+
+################################################################################
+# GENDOC -- generates the make targets needed to build asciidoc documentation.
+#
+#  argument 1 is the name of the document and must be a subdirectory of docs/;
+#             the top-level asciidoc file must have the same name
+#
+# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
+################################################################################
+define GENDOC
+$(call GENDOC_INNER,$(1),xhtml,html,html,HTML)
+$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML)
+$(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
+$(call GENDOC_INNER,$(1),text,txt,text,Text)
+$(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
+clean: clean-$(1)
+clean-$(1):
+	$(Q)$(RM) -rf $(O)/docs/$(1)
+.PHONY: $(1) clean-$(1)
+endef
+
+MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)
+$(eval $(call GENDOC,manual))

From 486253db302d4b277db1d2bff0e175e5950e0d1c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 16:45:23 +0200
Subject: [PATCH 1796/6849] cmake: move creation of toolchain file to
 package/pkg-cmaketargets.mk

This also requires moving a few include directives below the "all:"
target in the main Makefile, otherwise the new target to create the
toolchain file in pkg-cmaketargets.mk gets used as the default make
target instead of "all:".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                    | 22 ++--------------------
 package/pkg-cmaketargets.mk | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index bc6670bc3f..eafb654c4d 100644
--- a/Makefile
+++ b/Makefile
@@ -256,9 +256,6 @@ HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif
 
-include toolchain/Makefile.in
-include package/Makefile.in
-
 #############################################################
 #
 # You should probably leave this stuff alone unless you know
@@ -268,6 +265,8 @@ include package/Makefile.in
 
 all: world
 
+include toolchain/Makefile.in
+include package/Makefile.in
 include support/dependencies/dependencies.mk
 
 # We also need the various per-package makefiles, which also add
@@ -340,23 +339,6 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
 world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 
-$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
-	mkdir -p $(@D)
-	@echo -en "\
-	set(CMAKE_SYSTEM_NAME Linux)\n\
-	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
-	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
-	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
-	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
-	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
-	set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\
-	set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
-	set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\
-	" > $@
-
 .PHONY: all world dirs clean distclean source outputmakefile \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmaketargets.mk
index 1cd65e46f8..371ab11c76 100644
--- a/package/pkg-cmaketargets.mk
+++ b/package/pkg-cmaketargets.mk
@@ -197,3 +197,25 @@ else
 $(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
 endif
 endef
+
+################################################################################
+# Generation of the CMake toolchain file
+################################################################################
+
+$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
+	@mkdir -p $(@D)
+	@echo -en "\
+	set(CMAKE_SYSTEM_NAME Linux)\n\
+	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
+	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
+	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
+	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
+	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
+	set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\
+	set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\
+	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\
+	set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\
+	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
+	set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\
+	" > $@
+

From 58e472374f79a240c38077dd2426ecae259013a5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 20 Apr 2012 11:20:30 +0200
Subject: [PATCH 1797/6849] libusb: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libusb/libusb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index fce0c28011..9abfcfccd5 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -3,7 +3,7 @@
 # libusb
 #
 #############################################################
-LIBUSB_VERSION = 1.0.8
+LIBUSB_VERSION = 1.0.9
 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
 LIBUSB_DEPENDENCIES = host-pkg-config

From 4dc432071f927df1a7477fc76c9a372c92c66c62 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 20 Apr 2012 09:17:11 +0200
Subject: [PATCH 1798/6849] mpg123: bump to 1.13.8

Fixes build errors for ARM arch using Linaro toolchain.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 8ea05a88f5..65523f32b9 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.13.4
+MPG123_VERSION = 1.13.8
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From b2154ab2b8e8a2b6fe77e2b700b5371770def9a4 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 20 Apr 2012 09:25:36 +0200
Subject: [PATCH 1799/6849] kmod: bump to 8

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 55cbdbbfd0..1382901b40 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 7
+KMOD_VERSION = 8
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From 6a8e6e03b24ed7a03a985f7131f614ac35f98314 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 20 Apr 2012 07:24:43 -0300
Subject: [PATCH 1800/6849] taglib: bump to version 1.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/taglib/taglib.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk
index ce6adeb90f..da2db0cf2e 100644
--- a/package/multimedia/taglib/taglib.mk
+++ b/package/multimedia/taglib/taglib.mk
@@ -3,7 +3,8 @@
 # taglib
 #
 #############################################################
-TAGLIB_VERSION = 1.7
+
+TAGLIB_VERSION = 1.7.1
 TAGLIB_SOURCE = taglib-$(TAGLIB_VERSION).tar.gz
 TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src
 TAGLIB_INSTALL_STAGING = YES

From c5854d2e6f947761302f91de6bcded54fe4f185e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 20 Apr 2012 16:36:18 +0200
Subject: [PATCH 1801/6849] website: announce autobuild.buildroot.org

And add a link to it in the menu.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html |  1 +
 docs/news.html   | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/docs/header.html b/docs/header.html
index c9dcf31289..a20f235fc5 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -54,6 +54,7 @@
     <br><a href="https://bugs.uclibc.org/">Bug Tracking</a>
     <br><a href="/docs.html">Documentation</a>
     <br><a href="/lists.html">Mailing Lists</a>
+    <br><a href="http://autobuild.buildroot.org">Autobuilder</a>
 
     <p><b>Related Sites</b>
     <br><a href="http://busybox.net/">BusyBox</a>
diff --git a/docs/news.html b/docs/news.html
index 26a8ccb267..151ad9b379 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,21 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>20 April 2012 -- Autobuilder Results Online</b>
+
+    <p>The status of the autobuilders, which do repeated
+    <code>randpackageconfig</code> builds for continuous integration
+    testing, is now online at <a
+    href='http://autobuild.buildroot.org'>autobuild.buildroot.org</a>. The
+    code behind it can be found in <a
+    href='http://git.buildroot.net/buildroot-test/'>git</a>.</p>
+
+    <p>Thanks to Thomas Pettazoni for running the web interface, and
+    to <a href='http://gcc.gnu.org/wiki/CompileFarm'>The GCC Compile
+    Farm</a> and <a href='http://free-electrons.com/'>Free
+    Electrons</a> for hosting builders. Thomas also sends out a daily
+    summary of the build status to the mailing list.</p>
+
   <li><b>29 February 2012 -- 2012.02 released</b>
 
     <p>The stable 2012.02 release is out - Thanks to everyone

From ba4917f593e17adde3e32e3395439e38c365e034 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 20 Apr 2012 16:00:35 +0200
Subject: [PATCH 1802/6849] Fix systemd failure with media devices

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/media/.empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 fs/skeleton/media/.empty

diff --git a/fs/skeleton/media/.empty b/fs/skeleton/media/.empty
new file mode 100644
index 0000000000..e69de29bb2

From 937c9773f86099472562d397bfa679362db89fb0 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 20 Apr 2012 16:34:46 +0200
Subject: [PATCH 1803/6849] kexec: update to kexec-tools 2.0.3

Drop kexec-fix-linker-options.patch as this has been fixed upstream.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/kexec-fix-linker-options.patch | 15 ---------------
 package/kexec/kexec.mk                       |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 package/kexec/kexec-fix-linker-options.patch

diff --git a/package/kexec/kexec-fix-linker-options.patch b/package/kexec/kexec-fix-linker-options.patch
deleted file mode 100644
index 7bd5f1d459..0000000000
--- a/package/kexec/kexec-fix-linker-options.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix compilation with gcc 4.6 by correcting the way that linker options
-are passed to gcc.
-
-Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---- kexec-2.0.2/purgatory/Makefile.orig	2011-09-26 14:16:44.256595912 +0200
-+++ kexec-2.0.2/purgatory/Makefile	2011-09-26 14:17:01.606621357 +0200
-@@ -56,7 +56,7 @@
- 			-I$(srcdir)/include \
- 			-I$(shell $(CC) -print-file-name=include)
- $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
--			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
-+			-Wl,-no-undefined -nostartfiles -nostdlib -nodefaultlibs \
- 			-e purgatory_start -r
- 
- $(PURGATORY): $(PURGATORY_OBJS)
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index ed01494bc7..ef99dfb4bd 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -3,7 +3,7 @@
 # kexec
 #
 #############################################################
-KEXEC_VERSION = 2.0.2
+KEXEC_VERSION = 2.0.3
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.bz2
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
 

From 9bf301212b7b08d65308404ae144bc7af403ec73 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 21 Apr 2012 13:17:31 +0200
Subject: [PATCH 1804/6849] docs/news.html: Fix typo in Thomas' name

Sorry about that.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 151ad9b379..e6d1b47b93 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -14,7 +14,7 @@ <h3>News</h3>
     code behind it can be found in <a
     href='http://git.buildroot.net/buildroot-test/'>git</a>.</p>
 
-    <p>Thanks to Thomas Pettazoni for running the web interface, and
+    <p>Thanks to Thomas Petazzoni for running the web interface, and
     to <a href='http://gcc.gnu.org/wiki/CompileFarm'>The GCC Compile
     Farm</a> and <a href='http://free-electrons.com/'>Free
     Electrons</a> for hosting builders. Thomas also sends out a daily

From 3d629c405f601bdb9aa7f939f274a52a012e6561 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 21 Apr 2012 13:18:44 +0200
Subject: [PATCH 1805/6849] docs/header.html: Add link to patchwork

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/header.html b/docs/header.html
index a20f235fc5..ce5d5558ff 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -55,6 +55,7 @@
     <br><a href="/docs.html">Documentation</a>
     <br><a href="/lists.html">Mailing Lists</a>
     <br><a href="http://autobuild.buildroot.org">Autobuilder</a>
+    <br><a href="http://patchwork.buildroot.org">Patchwork</a>
 
     <p><b>Related Sites</b>
     <br><a href="http://busybox.net/">BusyBox</a>

From 19a19a39971d8c0a436693bf056a84957da3d449 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Apr 2012 20:36:28 +0200
Subject: [PATCH 1806/6849] libmpeg2: fix ppc altivec.h detection

Patch from Gentoo.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libmpeg2/libmpeg2-0.5.1-altivec.patch     | 23 +++++++++++++++++++
 package/multimedia/libmpeg2/libmpeg2.mk       |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch

diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch b/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch
new file mode 100644
index 0000000000..4928a62e6d
--- /dev/null
+++ b/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch
@@ -0,0 +1,23 @@
+[PATCH] fix altivec.h detection
+
+Patch from Gentoo:
+
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch?revision=1.1&view=markup
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+--- a/configure.ac.bak	2010-05-25 17:12:14.756245990 +0000
++++ b/configure.ac	2010-05-25 17:11:51.629581723 +0000
+@@ -79,11 +79,10 @@
+ 		 CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
+ 		 AC_MSG_CHECKING([if <altivec.h> is needed])
+ 		 AC_TRY_COMPILE([],
+-		    [typedef vector int t;
+-		     vec_ld(0, (unsigned char *)0);],
++		    [vector int t; t = vec_add(t,t);],
+ 		    [have_altivec=yes; AC_MSG_RESULT(no)],
+ 		    [AC_TRY_COMPILE([#include <altivec.h>],
+-			[typedef vector int t; vec_ld(0, (unsigned char *)0);],
++			[vector int t; t = vec_add(t,t);],
+ 			[AC_DEFINE([HAVE_ALTIVEC_H],,
+ 			    [Define to 1 if you have the <altivec.h> header.])
+ 			 have_altivec=yes; AC_MSG_RESULT(yes)],
diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/multimedia/libmpeg2/libmpeg2.mk
index 8713c8797a..5290af15eb 100644
--- a/package/multimedia/libmpeg2/libmpeg2.mk
+++ b/package/multimedia/libmpeg2/libmpeg2.mk
@@ -7,6 +7,7 @@ LIBMPEG2_VERSION = 0.5.1
 LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files/
 LIBMPEG2_INSTALL_STAGING = YES
+LIBMPEG2_AUTORECONF = YES
 LIBMPEG2_CONF_OPT = --without-x --disable-directx
 
 ifeq ($(BR2_PACKAGE_SDL),y)

From 56bf500c8b0163510e156fbe2ce5e954176481bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 22 Apr 2012 20:54:19 +0200
Subject: [PATCH 1807/6849] kexec: fix build without largefile support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/kexec-largefile.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/kexec/kexec-largefile.patch

diff --git a/package/kexec/kexec-largefile.patch b/package/kexec/kexec-largefile.patch
new file mode 100644
index 0000000000..74dd8e2cdc
--- /dev/null
+++ b/package/kexec/kexec-largefile.patch
@@ -0,0 +1,22 @@
+[PATCH] vmcore-dmesg: don't enforce largefile handling
+
+Breaks build on !largefile toolchains.
+
+Instead simply use whatever mode is selected by toolchain / CFLAGS.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ vmcore-dmesg/vmcore-dmesg.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: kexec-tools-2.0.3/vmcore-dmesg/vmcore-dmesg.c
+===================================================================
+--- kexec-tools-2.0.3.orig/vmcore-dmesg/vmcore-dmesg.c
++++ kexec-tools-2.0.3/vmcore-dmesg/vmcore-dmesg.c
+@@ -1,6 +1,4 @@
+ #define _XOPEN_SOURCE 600
+-#define _LARGEFILE_SOURCE 1
+-#define _FILE_OFFSET_BITS 64
+ #include <endian.h>
+ #include <byteswap.h>
+ #include <stdio.h>

From a556a81d278354a40fa2c6f2e4bf3b53ff24bba6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 23 Apr 2012 00:11:37 +0200
Subject: [PATCH 1808/6849] ltrace: fix build on powerpc/uClibc

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/ltrace-0.6.0-events.patch | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/ltrace/ltrace-0.6.0-events.patch

diff --git a/package/ltrace/ltrace-0.6.0-events.patch b/package/ltrace/ltrace-0.6.0-events.patch
new file mode 100644
index 0000000000..f3699a1b28
--- /dev/null
+++ b/package/ltrace/ltrace-0.6.0-events.patch
@@ -0,0 +1,47 @@
+[PATCH] events.c: add similar system headers workaround as trace.c
+
+Needed for E.G. powerpc on uClibc.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ sysdeps/linux-gnu/events.c |   27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+Index: ltrace-0.6.0/sysdeps/linux-gnu/events.c
+===================================================================
+--- ltrace-0.6.0.orig/sysdeps/linux-gnu/events.c
++++ ltrace-0.6.0/sysdeps/linux-gnu/events.c
+@@ -11,6 +11,33 @@
+ 
+ #include "common.h"
+ 
++/* If the system headers did not provide the constants, hard-code the normal
++   values.  */
++#ifndef PTRACE_EVENT_FORK
++
++#define PTRACE_OLDSETOPTIONS    21
++#define PTRACE_SETOPTIONS       0x4200
++#define PTRACE_GETEVENTMSG      0x4201
++
++/* options set using PTRACE_SETOPTIONS */
++#define PTRACE_O_TRACESYSGOOD   0x00000001
++#define PTRACE_O_TRACEFORK      0x00000002
++#define PTRACE_O_TRACEVFORK     0x00000004
++#define PTRACE_O_TRACECLONE     0x00000008
++#define PTRACE_O_TRACEEXEC      0x00000010
++#define PTRACE_O_TRACEVFORKDONE 0x00000020
++#define PTRACE_O_TRACEEXIT      0x00000040
++
++/* Wait extended result codes for the above trace options.  */
++#define PTRACE_EVENT_FORK       1
++#define PTRACE_EVENT_VFORK      2
++#define PTRACE_EVENT_CLONE      3
++#define PTRACE_EVENT_EXEC       4
++#define PTRACE_EVENT_VFORK_DONE 5
++#define PTRACE_EVENT_EXIT       6
++
++#endif /* PTRACE_EVENT_FORK */
++
+ static Event event;
+ 
+ Event *

From d425ddd8b3d538c971ecefe85c89014c4d77a3d2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 23 Apr 2012 09:22:32 +0200
Subject: [PATCH 1809/6849] kernel-headers: bump 3.{0,2,3}.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ....3.2-fix-umode_t.patch => linux-3.3.3-fix-umode_t.patch} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.28-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3.2-fix-umode_t.patch => linux-3.3.3-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 343096662b..05227cfe28 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.28"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.29"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.15"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.2"		if BR2_KERNEL_HEADERS_3_3
+	default "3.2.16"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3.3"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.28-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.28-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.2-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.2-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch

From f00424cff00bdabd54350eb82deb908676e86a1d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 23 Apr 2012 09:26:13 +0200
Subject: [PATCH 1810/6849] uClibc: 0.9.33.1: fix version (soname) number

For some reason, the version number in the 0.9.33.1 tarball is wrong.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uClibc/uClibc-0.9.33.1-version.patch      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.1-version.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.1-version.patch b/toolchain/uClibc/uClibc-0.9.33.1-version.patch
new file mode 100644
index 0000000000..37f8565ff4
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.1-version.patch
@@ -0,0 +1,23 @@
+[PATCH] fix version number
+
+Somehow the 0.9.33.1 tarball thinks it is 0.9.33.2-git, as pointed out
+by Mike Frysinger.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Rules.mak |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: uClibc-0.9.33.1/Rules.mak
+===================================================================
+--- uClibc-0.9.33.1.orig/Rules.mak
++++ uClibc-0.9.33.1/Rules.mak
+@@ -105,7 +105,7 @@
+ MAJOR_VERSION := 0
+ MINOR_VERSION := 9
+ SUBLEVEL      := 33
+-EXTRAVERSION  :=.2-git
++EXTRAVERSION  :=.1
+ VERSION       := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
+ ABI_VERSION   := $(MAJOR_VERSION)
+ ifneq ($(EXTRAVERSION),)

From e08e35326cd4767f7f49f8a1d13f9389dc6a43f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Apr 2012 10:07:23 +0200
Subject: [PATCH 1811/6849] sane-backends: fix build on !x86

qcam backend uses x86 specific inb/outb/ioperm interface, so replace
with noops on !x86.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sane-backends-1.0.22-qcam-x86.patch       | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 package/sane-backends/sane-backends-1.0.22-qcam-x86.patch

diff --git a/package/sane-backends/sane-backends-1.0.22-qcam-x86.patch b/package/sane-backends/sane-backends-1.0.22-qcam-x86.patch
new file mode 100644
index 0000000000..f14dd0e980
--- /dev/null
+++ b/package/sane-backends/sane-backends-1.0.22-qcam-x86.patch
@@ -0,0 +1,61 @@
+[PATCH] backend/qcam.c: fix build on !x86
+
+inb/outb/ioperm are x86 specific interfaces, so replace with noops on
+!x86.
+
+Inspired by similar patch in openwrt:
+https://dev.openwrt.org/ticket/5689
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ backend/qcam.c |   14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+Index: sane-backends-1.0.22/backend/qcam.c
+===================================================================
+--- sane-backends-1.0.22.orig/backend/qcam.c
++++ sane-backends-1.0.22/backend/qcam.c
+@@ -205,12 +205,20 @@
+ 
+ #endif /* <sys/io.h> || <asm/io.h> || <sys/hw.h> */
+ 
++/* inb / outb only exist on x86 */
++#if defined(__i386__) || defined(__x86_64__)
+ #define read_lpdata(d)		inb ((d)->port)
+ #define read_lpstatus(d)	inb ((d)->port + 1)
+ #define read_lpcontrol(d)	inb ((d)->port + 2)
+ #define write_lpdata(d,v)	outb ((v), (d)->port)
+ #define write_lpcontrol(d,v)	outb ((v), (d)->port + 2)
+-
++#else
++#define read_lpdata(d)		0
++#define read_lpstatus(d)	0
++#define read_lpcontrol(d)	0
++#define write_lpdata(d,v)
++#define write_lpcontrol(d,v)
++#endif
+ 
+ static SANE_Status
+ enable_ports (QC_Device * q)
+@@ -219,8 +227,10 @@
+   if (q->port < 0x278 || q->port > 0x3bc)
+     return SANE_STATUS_INVAL;
+ 
++#if defined(__i386__) || defined(__x86_64__)
+   if (ioperm (q->port, 3, 1) < 0)
+     return SANE_STATUS_INVAL;
++#endif
+ 
+   return SANE_STATUS_GOOD;
+ }
+@@ -228,8 +238,10 @@
+ static SANE_Status
+ disable_ports (QC_Device * q)
+ {
++#if defined(__i386__) || defined(__x86_64__)
+   if (ioperm (q->port, 3, 0) < 0)
+     return SANE_STATUS_INVAL;
++#endif
+ 
+   return SANE_STATUS_GOOD;
+ }

From b3610f87a6b5ae17b08a8be6fe6e61810c07a5e0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 22 Apr 2012 01:39:18 +0000
Subject: [PATCH 1812/6849] u-boot: add 2012.04 release

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 boot/uboot/Config.in                          |   6 +-
 ...4-change-kernel-address-in-dataflash.patch | 181 ++++++++++++++++++
 2 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index c8db9fb013..7c5f2c6b1b 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2011_12
+	default BR2_TARGET_UBOOT_2012_04
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2012_04
+	bool "2012.04"
+
 config BR2_TARGET_UBOOT_2011_12
 	bool "2011.12"
 
@@ -47,6 +50,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2012.04"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
diff --git a/boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch
new file mode 100644
index 0000000000..4cdbb98ff4
--- /dev/null
+++ b/boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch
@@ -0,0 +1,181 @@
+From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@piout.net>
+Date: Mon, 2 Jan 2012 03:51:11 +0100
+Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
+
+On at91sam platforms, u-boot grew larger than the allocated size in
+dataflash, the layout was:
+bootstrap  0x00000000
+ubootenv   0x00004200
+uboot      0x00008400
+kernel     0x00042000
+
+u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
+0x39C00 bytes anymore.
+
+Now, the layout is:
+bootstrap  0x00000000
+uboot      0x00004000
+ubootenv   0x00084000
+ubootenv2  0x00088000
+kernel     0x0008C000
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+---
+ include/configs/at91sam9260ek.h |   18 ++++++++++++------
+ include/configs/at91sam9261ek.h |   18 ++++++++++++------
+ include/configs/at91sam9263ek.h |   10 +++++++---
+ include/configs/at91sam9rlek.h  |   10 +++++++---
+ 4 files changed, 38 insertions(+), 18 deletions(-)
+
+diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
+index db52ee6..b537760 100644
+--- a/include/configs/at91sam9260ek.h
++++ b/include/configs/at91sam9260ek.h
+@@ -185,10 +185,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -199,10 +201,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS1 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -231,6 +235,8 @@
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ #define CONFIG_SYS_LONGHELP		1
+ #define CONFIG_CMDLINE_EDITING	1
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
+index 5140b26..fa461da 100644
+--- a/include/configs/at91sam9261ek.h
++++ b/include/configs/at91sam9261ek.h
+@@ -187,10 +187,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET	0x4200
++#define CONFIG_ENV_OFFSET	0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -201,10 +203,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS3 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
+-#define CONFIG_ENV_OFFSET	0x4200
++#define CONFIG_ENV_OFFSET	0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+ 				"root=/dev/mtdblock0 "			\
+ 				"mtdparts=atmel_nand:-(root) "		\
+@@ -233,6 +237,8 @@
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ #define CONFIG_SYS_LONGHELP
+ #define CONFIG_CMDLINE_EDITING
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
+index 8399246..253bee4 100644
+--- a/include/configs/at91sam9263ek.h
++++ b/include/configs/at91sam9263ek.h
+@@ -314,10 +314,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
+ 				"root=/dev/mtdblock0 " \
+ 				"mtdparts=atmel_nand:-(root) "\
+@@ -347,6 +349,8 @@
+ #define CONFIG_AUTO_COMPLETE
+ #define CONFIG_SYS_HUSH_PARSER
+ #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
+index 79ea1f2..423f523 100644
+--- a/include/configs/at91sam9rlek.h
++++ b/include/configs/at91sam9rlek.h
+@@ -153,10 +153,12 @@
+ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
+ #define CONFIG_ENV_IS_IN_DATAFLASH	1
+ #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+-#define CONFIG_ENV_OFFSET		0x4200
++#define CONFIG_ENV_OFFSET		0x84000
+ #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+-#define CONFIG_ENV_SIZE		0x4200
+-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
++#define CONFIG_ENV_SIZE		0x4000
++#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
++#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
+ #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
+ 				"root=/dev/mtdblock0 " \
+ 				"mtdparts=atmel_nand:-(root) "\
+@@ -183,6 +185,8 @@
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+ #define CONFIG_SYS_LONGHELP		1
+ #define CONFIG_CMDLINE_EDITING		1
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+ 
+ /*
+  * Size of malloc() pool
+-- 
+1.7.5.4
+

From da5948fe720d5a074186f973a9effc53cae00de0 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 23 Apr 2012 21:01:46 +0000
Subject: [PATCH 1813/6849] libusb-compat: bump to 0.1.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/libusb-compat/libusb-compat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 42a9aae899..d44eb27d3f 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -3,7 +3,7 @@
 # libusb-compat
 #
 #############################################################
-LIBUSB_COMPAT_VERSION = 0.1.3
+LIBUSB_COMPAT_VERSION = 0.1.4
 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
 LIBUSB_COMPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
 LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb

From e3729de402c72e6332139f96e9c4e37a6a612d08 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 21 Apr 2012 03:31:35 +0000
Subject: [PATCH 1814/6849] lame: bump to version 3.99.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/multimedia/lame/lame.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index fbf0ddae53..7b4b0aea94 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-LAME_VERSION = 3.99
-LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lame
+LAME_VERSION_MAJOR = 3.99
+LAME_VERSION_MINOR = 5
+LAME_VERSION = $(LAME_VERSION_MAJOR).$(LAME_VERSION_MINOR)
+LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR)
 LAME_DEPENDENCIES = host-pkg-config
 LAME_INSTALL_STAGING = YES
 LAME_CONF_ENV = GTK_CONFIG=/bin/false

From 3515019934d1d5d36b2b2189d38b27fb727c25a7 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 22 Apr 2012 20:55:55 +0000
Subject: [PATCH 1815/6849] dbus: bump to 1.4.20

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/dbus/dbus.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 0942b33910..7e72e3dbf8 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,8 +3,7 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.4.16
-DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
+DBUS_VERSION = 1.4.20
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES
 

From 2a10c9d0a2aaec7597b53b90fff784dfc691f337 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Apr 2012 22:32:55 +0200
Subject: [PATCH 1816/6849] package/Makefile.in: pass --enable-ipv6 to
 autotargets configure when enabled

Some packages don't automatically enable IPv6 support if not configured
with --disable-ipv6, or use AC_TRY_RUN which doesn't work when cross
compiling (like curl), so explicitly configure with --enable-ipv6.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 943017b5dc..655951e388 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -279,7 +279,9 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 DISABLE_DOCUMENTATION=--disable-gtk-doc
 endif
 
-ifneq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_INET_IPV6),y)
+DISABLE_IPV6= --enable-ipv6
+else
 DISABLE_IPV6= --disable-ipv6
 endif
 

From 94c297c4488ced4f580dd036a42f6718f072e57a Mon Sep 17 00:00:00 2001
From: vsergeev <vsergeev@gmail.com>
Date: Sun, 22 Apr 2012 01:03:16 +0000
Subject: [PATCH 1817/6849] python: enable IPv6 socket support

Added patch to disable buggy_getaddrinfo test during configure when
cross-compiling.

[Peter: Remove --enable-ipv6 which is now handled globally]
Signed-off-by: Vanya Sergeev <vsergeev at gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...python-2.7-016-cross-compile-getaddrinfo.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/python/python-2.7-016-cross-compile-getaddrinfo.patch

diff --git a/package/python/python-2.7-016-cross-compile-getaddrinfo.patch b/package/python/python-2.7-016-cross-compile-getaddrinfo.patch
new file mode 100644
index 0000000000..dae300577d
--- /dev/null
+++ b/package/python/python-2.7-016-cross-compile-getaddrinfo.patch
@@ -0,0 +1,15 @@
+Disable buggy_getaddrinfo configure test when cross-compiling with IPv6 support
+
+Signed-off-by: Vanya Sergeev <vsergeev at gmail.com>
+
+--- python-2.7.2.orig/configure.in	2012-04-22 06:52:09.361809545 -0400
++++ python-2.7.2/configure.in	2012-04-22 06:56:37.900634194 -0400
+@@ -3128,7 +3128,7 @@
+ 
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+ 
+-if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
++if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
+ then
+ 	if test $ipv6 = yes
+ 	then

From cd2f78b1c5af76cfc14ad2227d6627b24367fb50 Mon Sep 17 00:00:00 2001
From: Qais Yousef <Qais.Yousef@imgtec.com>
Date: Wed, 18 Apr 2012 01:06:00 +0000
Subject: [PATCH 1818/6849] New Package: latencytop

[Peter: fix Config.in location]
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/latencytop/Config.in                 | 23 ++++++++++++++++
 package/latencytop/latencytop-makefile.patch | 28 ++++++++++++++++++++
 package/latencytop/latencytop.mk             | 21 +++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 package/latencytop/Config.in
 create mode 100644 package/latencytop/latencytop-makefile.patch
 create mode 100644 package/latencytop/latencytop.mk

diff --git a/package/Config.in b/package/Config.in
index 5ae1c810dc..28a08d234b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -22,6 +22,7 @@ source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
 source "package/kexec/Config.in"
+source "package/latencytop/Config.in"
 source "package/lmbench/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in
new file mode 100644
index 0000000000..12176c0cb5
--- /dev/null
+++ b/package/latencytop/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_LATENCYTOP
+	bool "latencytop"
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  There are many types and causes of latency. LatencyTOP
+	  focuses on the type of latency that causes skips in audio,
+	  stutters in your desktop experience or that overloads your
+	  server (while you have plenty of CPU power left).
+
+	  LatencyTOP focuses on the cases where the applications want
+	  to run and execute useful code, but there's some resource
+	  that's not currently available (and the kernel then blocks
+	  the process). This is done both on a system level and on a
+	  per process level, so that you can see what's happening to
+	  the system, and which process is suffering and/or causing
+	  the delays.
+
+	  http://www.latencytop.org
+
+comment "latencytop requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/latencytop/latencytop-makefile.patch b/package/latencytop/latencytop-makefile.patch
new file mode 100644
index 0000000000..fa8c51cfd0
--- /dev/null
+++ b/package/latencytop/latencytop-makefile.patch
@@ -0,0 +1,28 @@
+Usee $(CC) to enable cross compiling and link to the right ncurses library.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- latencytop-0.5/Makefile.old	2012-04-18 11:59:39.748084334 +0100
++++ latencytop-0.5/Makefile	2012-04-18 12:00:08.659112340 +0100
+@@ -4,7 +4,7 @@
+ DESTDIR =
+ SBINDIR = /usr/sbin
+ XCFLAGS = -W  -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare
+-LDF = -Wl,--as-needed `pkg-config --libs glib-2.0`   -lncursesw 
++LDF = -Wl,--as-needed `pkg-config --libs glib-2.0`   -lncurses 
+ 
+ OBJS= latencytop.o text_display.o translate.o fsync.o
+ 
+@@ -26,10 +26,10 @@
+ 
+ # We write explicity this "implicit rule"
+ %.o : %.c
+-	gcc -c $(CFLAGS) $(XCFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $(XCFLAGS) $< -o $@
+ 
+ latencytop:  $(OBJS) latencytop.h Makefile
+-	gcc $(CFLAGS) $(OBJS) $(LDF) -o latencytop 
++	$(CC) $(CFLAGS) $(OBJS) $(LDF) -o latencytop 
+ 
+ clean:
+ 	rm -f *~ latencytop DEADJOE *.o
diff --git a/package/latencytop/latencytop.mk b/package/latencytop/latencytop.mk
new file mode 100644
index 0000000000..73d5ba2192
--- /dev/null
+++ b/package/latencytop/latencytop.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# latencytop
+#
+#############################################################
+
+LATENCYTOP_VERSION = 0.5
+LATENCYTOP_SITE = http://www.latencytop.org/download/
+LATENCYTOP_DEPENDENCIES = libglib2 ncurses
+
+# NOTE: GTK is heavy weight, we intentionally build the text (ncurses)
+# version only
+define LATENCYTOP_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) HAS_GTK_GUI=
+endef
+
+define LATENCYTOP_INSTALL_TARGET_CMDS
+	$(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) HAS_GTK_GUI=
+endef
+
+$(eval $(call GENTARGETS))

From 4fd085315620ea128379187b4af7ce417d16a18d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:24 +0000
Subject: [PATCH 1819/6849] package: remove unused STRIP_DISCARD_ALL variable

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 655951e388..14a554a3b7 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -126,7 +126,6 @@ TARGET_CXX := $(CCACHE) $(TARGET_CXX)
 endif
 
 ifeq ($(BR2_STRIP_strip),y)
-STRIP_DISCARD_ALL:=--discard-all
 STRIP_STRIP_UNNEEDED:=--strip-unneeded
 STRIP_STRIP_ALL:=--strip-all
 TARGET_STRIP=$(TARGET_CROSS)strip
@@ -134,7 +133,6 @@ STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
 endif
 ifeq ($(BR2_STRIP_sstrip),y)
-STRIP_DISCARD_ALL:=
 STRIP_STRIP_UNNEEDED:=
 STRIP_STRIP_ALL:=
 TARGET_STRIP=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip

From ad5af7573291e48835d52223642505a2f8d18af2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:25 +0000
Subject: [PATCH 1820/6849] Remove unused GNU_TARGET_SUFFIX

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index eafb654c4d..44c70ccd25 100644
--- a/Makefile
+++ b/Makefile
@@ -236,8 +236,6 @@ BZCAT:=$(call qstrip,$(BR2_BZCAT))
 XZCAT:=$(call qstrip,$(BR2_XZCAT))
 TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 
-GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
-
 # packages compiled for the host go here
 HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 

From acde0d8c526214502f43cb8b0e4c3f955a1297f3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:26 +0000
Subject: [PATCH 1821/6849] toolchain: remove useless indirect variables

The BR2_CONFIGURE_DEVEL_SYSROOT, BR2_CONFIGURE_STAGING_SYSROOT and
BR2_CONFIGURE_BUILD_TOOLS were used only in a few places, and it is in
fact clearer to just use their value in the various places they are
used.

The ultimate goal is to get rid of the toolchain/Makefile.in file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk    | 2 +-
 toolchain/Makefile.in           | 4 ----
 toolchain/gcc/gcc-uclibc-4.x.mk | 8 ++++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 8632d67556..0a5a948a9c 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -37,7 +37,7 @@ endif
 HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			--target=$(REAL_GNU_TARGET_NAME) \
 			--disable-shared --enable-static \
-			$(BR2_CONFIGURE_STAGING_SYSROOT) \
+			--with-sysroot=$(STAGING_DIR) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 HOST_BINUTILS_DEPENDENCIES =
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index a7ca5589e4..5f32f822b6 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -1,6 +1,2 @@
-BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/
-BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR)
-BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin
-
 # gcc has a bunch of needed stuff....
 include toolchain/gcc/Makefile.in
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index ae734e88ba..7cdba0e70f 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -223,7 +223,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=c \
-		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
+		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
@@ -291,7 +291,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=c \
-		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
+		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
@@ -369,8 +369,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=$(GCC_CROSS_LANGUAGES) \
-		$(BR2_CONFIGURE_STAGING_SYSROOT) \
-		$(BR2_CONFIGURE_BUILD_TOOLS) \
+		--with-sysroot=$(STAGING_DIR) \
+		--with-build-time-tools=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \

From eee81a286edc2f5714fecf4f89db48cd4c16a674 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:27 +0000
Subject: [PATCH 1822/6849] gcc: remove unused EXTRA_GCC2_CONFIG_OPTIONS

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 7cdba0e70f..305270fcca 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -311,7 +311,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC2_CONFIG_OPTIONS) \
 		$(QUIET) \
 	)
 	touch $@
@@ -390,7 +389,6 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC2_CONFIG_OPTIONS) \
 	)
 	touch $@
 

From 3cf29186f81e74bea9eaa2e76b7331635ec5dba8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:28 +0000
Subject: [PATCH 1823/6849] gcc: remove unused EXTRA_GCC4_CONFIG_OPTIONS

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 305270fcca..212660c7de 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -525,7 +525,6 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC4_CONFIG_OPTIONS) \
 	)
 	touch $@
 

From 01df5af1db098cf399b3056dec2b7ab37bd03968 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:29 +0000
Subject: [PATCH 1824/6849] gcc: remove unused ARCH_FPU_SUFFIX

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Makefile.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index d9efcf0634..c3f4576271 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -20,11 +20,9 @@ TARGET_SOFT_FLOAT:=-mfloat-abi=soft
 else
 TARGET_SOFT_FLOAT:=-msoft-float
 endif
-ARCH_FPU_SUFFIX:=_nofpu
 else # no softfloat support
 SOFT_FLOAT_CONFIG_OPTION:=
 TARGET_SOFT_FLOAT:=
-ARCH_FPU_SUFFIX:=
 endif
 
 # some additional defaults

From 2b563d481fbeeabc1c904e2398ec99a453faf6f2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:30 +0000
Subject: [PATCH 1825/6849] gcc: move version/snap variables to
 gcc-uclibc-4.x.mk

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Makefile.in       | 6 ------
 toolchain/gcc/gcc-uclibc-4.x.mk | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index c3f4576271..3e82a324b2 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -3,15 +3,9 @@
 # So include them in this file and arrange to include it
 # soon after invoking make from the top level.
 
-GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
 TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
 EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
-ifeq ($(call qstrip,$(BR2_GCC_VERSION_SNAP)),y)
-GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
-else
-GCC_SNAP_DATE:=
-endif
 
 ifeq ($(BR2_SOFT_FLOAT),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 212660c7de..3d0228d11e 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -17,6 +17,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
+
+ifeq ($(BR2_GCC_VERSION_SNAP),y)
+GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
+else
+GCC_SNAP_DATE:=
+endif
+
 ifneq ($(GCC_SNAP_DATE),)
  GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)

From ce1acfb5eae64e8042016ec36cf4973fbec707ca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:31 +0000
Subject: [PATCH 1826/6849] toolchain: remove toolchain/Makefile.in and
 toolchain/gcc/Makefile.in

Re-integrate in gcc-uclibc-4.x.mk things from
toolchain/gcc/Makefile.in that were completely gcc-specific. There was
no reason to pull that when building with other backends than the
internal one.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                        |  1 -
 package/Makefile.in             |  2 ++
 toolchain/Makefile.in           |  2 --
 toolchain/gcc/Makefile.in       | 62 ---------------------------------
 toolchain/gcc/gcc-uclibc-4.x.mk | 62 +++++++++++++++++++++++++++++++++
 5 files changed, 64 insertions(+), 65 deletions(-)
 delete mode 100644 toolchain/Makefile.in
 delete mode 100644 toolchain/gcc/Makefile.in

diff --git a/Makefile b/Makefile
index 44c70ccd25..cc8124abb7 100644
--- a/Makefile
+++ b/Makefile
@@ -263,7 +263,6 @@ endif
 
 all: world
 
-include toolchain/Makefile.in
 include package/Makefile.in
 include support/dependencies/dependencies.mk
 
diff --git a/package/Makefile.in b/package/Makefile.in
index 14a554a3b7..df7042c6a4 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -50,6 +50,8 @@ REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
 
 STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sysroot
 
+TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
+
 ifeq ($(BR2_OPTIMIZE_0),y)
 TARGET_OPTIMIZATION+=-O0
 endif
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
deleted file mode 100644
index 5f32f822b6..0000000000
--- a/toolchain/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# gcc has a bunch of needed stuff....
-include toolchain/gcc/Makefile.in
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
deleted file mode 100644
index 3e82a324b2..0000000000
--- a/toolchain/gcc/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-# gcc has a bunch of options that need to be shared with
-# both gcc-uclibc-4.x.mk, and are use by other packages...
-# So include them in this file and arrange to include it
-# soon after invoking make from the top level.
-
-TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
-EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
-
-
-ifeq ($(BR2_SOFT_FLOAT),y)
-SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
-ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm
-TARGET_SOFT_FLOAT:=-mfloat-abi=soft
-else
-TARGET_SOFT_FLOAT:=-msoft-float
-endif
-else # no softfloat support
-SOFT_FLOAT_CONFIG_OPTION:=
-TARGET_SOFT_FLOAT:=
-endif
-
-# some additional defaults
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
-GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH)
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
-GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE)
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
-GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
-GCC_WITH_CPU:=--with-cpu=$(BR2_GCC_TARGET_CPU)
-endif
-
-# AVR32 GCC configuration
-ifeq ($(BR2_avr32),y)
-EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap
-SOFT_FLOAT_CONFIG_OPTION:=
-endif
-
-# Disable mudflap and enable proper double/long double for SPE ABI
-ifeq ($(BR2_powerpc_SPE),y)
-EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap --enable-e500_double --with-long-double-128
-endif
-
-ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
-EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
-
-# AVR32 target GCC configuration
-ifeq ($(BR2_avr32),y)
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libmudflap
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
-endif
-
-
-# and finally pull in config opts from the user
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
-
-TARGETS+=gcc_target
-endif
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 3d0228d11e..3f97a47ab6 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -66,6 +66,64 @@ ifneq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
 GCC_QUADMATH=--disable-libquadmath
 endif
 
+# Determine soft-float options
+ifeq ($(BR2_SOFT_FLOAT),y)
+SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
+ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm
+TARGET_SOFT_FLOAT:=-mfloat-abi=soft
+else
+TARGET_SOFT_FLOAT:=-msoft-float
+endif
+else # no softfloat support
+SOFT_FLOAT_CONFIG_OPTION:=
+TARGET_SOFT_FLOAT:=
+endif
+
+# Determine arch/tune/abi/cpu options
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
+GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH)
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
+GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE)
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
+GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
+GCC_WITH_CPU:=--with-cpu=$(BR2_GCC_TARGET_CPU)
+endif
+
+# AVR32 GCC special configuration
+ifeq ($(BR2_avr32),y)
+# For the cross-compiler
+EXTRA_GCC_CONFIG_OPTIONS += \
+	--disable-libmudflap
+SOFT_FLOAT_CONFIG_OPTION:=
+
+# For the target compiler
+EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
+	--disable-libmudflap
+EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
+	--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin
+EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
+	--with-as=$(TARGET_CROSS)as
+endif
+
+# Disable mudflap and enable proper double/long double for SPE ABI
+ifeq ($(BR2_powerpc_SPE),y)
+EXTRA_GCC_CONFIG_OPTIONS +=  \
+	--disable-libmudflap \
+	--enable-e500_double \
+	--with-long-double-128
+endif
+
+# End with user-provided options, so that they can override previously
+# defined options.
+EXTRA_GCC_CONFIG_OPTIONS += \
+	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
+EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
+	$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
+
 #############################################################
 #
 # Setup some initial stuff
@@ -586,3 +644,7 @@ gcc_target-clean:
 
 gcc_target-dirclean:
 	rm -rf $(GCC_BUILD_DIR4)
+
+ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
+TARGETS+=gcc_target
+endif

From 792976053fcd13eb45bd1ee3ede7fe8bddcc2baa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:32 +0000
Subject: [PATCH 1827/6849] gcc: remove unused EXTRA_GCC1_CONFIG_OPTIONS

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 3f97a47ab6..a4faf4fe69 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -310,7 +310,6 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC1_CONFIG_OPTIONS) \
 		$(QUIET) \
 	)
 	touch $@

From 290bbdb4aa1cb731390fabb35ad962cf15e7e7c2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 04:45:33 +0000
Subject: [PATCH 1828/6849] mklibs: remove support

The support for mklibs has been marked broken since more than a year
and nobody cared to bring it up to a working state.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/mklibs/Config.in                |   6 -
 toolchain/mklibs/mklibs.mk                |  49 --
 toolchain/mklibs/mklibs.py                | 597 ----------------------
 toolchain/toolchain-buildroot.mk          |   1 -
 toolchain/toolchain-buildroot/Config.in.2 |   1 -
 toolchain/toolchain-crosstool-ng.mk       |   1 -
 toolchain/toolchain-external.mk           |   1 -
 7 files changed, 656 deletions(-)
 delete mode 100644 toolchain/mklibs/Config.in
 delete mode 100644 toolchain/mklibs/mklibs.mk
 delete mode 100644 toolchain/mklibs/mklibs.py

diff --git a/toolchain/mklibs/Config.in b/toolchain/mklibs/Config.in
deleted file mode 100644
index c0658661b9..0000000000
--- a/toolchain/mklibs/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_MKLIBS
-	bool "Run mklibs on the built root filesystem"
-	depends on BROKEN
-	help
-	  Recompiles all the shared libraries to only include the
-	  symbols actually needed to run the binaries on the target
diff --git a/toolchain/mklibs/mklibs.mk b/toolchain/mklibs/mklibs.mk
deleted file mode 100644
index 2dac984605..0000000000
--- a/toolchain/mklibs/mklibs.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-######################################################################
-#
-# mklibs
-#
-######################################################################
-MKLIBS_PROGRAM:=$(STAGING_DIR)/bin/mklibs.py
-
-$(MKLIBS_PROGRAM): toolchain/mklibs/mklibs.py
-	cp -dpf toolchain/mklibs/mklibs.py $@
-
-mklibs-clean:
-	rm -f $(MKLIBS_PROGRAM)
-
-mklibs-dirclean:
-	true
-
-#############################################################
-#
-# Run mklibs
-#
-#############################################################
-MKLIBS_PYTHON:=$(shell which python)
-ifeq ($(MKLIBS_PYTHON),)
-    MKLIBS_PYTHON=/usr/bin/python
-endif
-
-$(STAGING_DIR)/mklibs-stamp: $(MKLIBS_PROGRAM) $(MKLIBS_PYTHON) $(STAGING_DIR)/lib/*
-	find $(TARGET_DIR) -type f -perm +100 -exec \
-	    file -r -N -F '' {} + | \
-	    awk ' /executable.*dynamically/ { print $$1 }' > $(STAGING_DIR)/mklibs-progs
-	cd $(TARGET_DIR); PATH=$(PATH):$(STAGING_DIR)/bin $(MKLIBS_PYTHON) $(MKLIBS_PROGRAM) \
-	    --target $(REAL_GNU_TARGET_NAME) --root $(STAGING_DIR) -d ./ \
-	    `cat $(STAGING_DIR)/mklibs-progs`
-	touch $@
-
-# this empty target allows a mklibs dependeny to be included in the
-# target targets, but it will be only invoked if BR2_MKLIBS is conf'ed
-.PHONY: mklibs
-mklibs:
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-
-ifeq ($(BR2_MKLIBS),y)
-mklibs: $(STAGING_DIR)/mklibs-stamp
-endif
diff --git a/toolchain/mklibs/mklibs.py b/toolchain/mklibs/mklibs.py
deleted file mode 100644
index a84fd42fa2..0000000000
--- a/toolchain/mklibs/mklibs.py
+++ /dev/null
@@ -1,597 +0,0 @@
-#! /usr/bin/python
-
-# mklibs.py: An automated way to create a minimal /lib/ directory.
-#
-# Copyright 2001 by Falk Hueffner <falk@debian.org>
-#                 & Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>
-#
-# mklibs.sh by Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>
-# used as template
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# HOW IT WORKS
-#
-# - Gather all unresolved symbols and libraries needed by the programs
-#   and reduced libraries
-# - Gather all symbols provided by the already reduced libraries
-#   (none on the first pass)
-# - If all symbols are provided we are done
-# - go through all libraries and remember what symbols they provide
-# - go through all unresolved/needed symbols and mark them as used
-# - for each library:
-#   - find pic file (if not present copy and strip the so)
-#   - compile in only used symbols
-#   - strip
-# - back to the top
-
-# TODO
-# * complete argument parsing as given as comment in main
-
-import commands
-import string
-import re
-import sys
-import os
-import glob
-import getopt
-from stat import *
-
-DEBUG_NORMAL  = 1
-DEBUG_VERBOSE = 2
-DEBUG_SPAM    = 3
-
-debuglevel = DEBUG_NORMAL
-
-def debug(level, *msg):
-    if debuglevel >= level:
-        print string.join(msg)
-
-# A simple set class. It should be replaced with the standard sets.Set
-# type as soon as Python 2.3 is out.
-class Set:
-    def __init__(self):
-        self.__dict = {}
-
-    def add(self, obj):
-        self.__dict[obj] = 1
-
-    def contains(self, obj):
-        return self.__dict.has_key(obj)
-
-    def merge(self, s):
-        for e in s.elems():
-            self.add(e)
-
-    def elems(self):
-        return self.__dict.keys()
-
-    def size(self):
-        return len(self.__dict)
-
-    def __eq__(self, other):
-        return self.__dict == other.__dict
-
-    def __str__(self):
-        return `self.__dict.keys()`
-
-    def __repr__(self):
-        return `self.__dict.keys()`
-
-# return a list of lines of output of the command
-def command(command, *args):
-    debug(DEBUG_SPAM, "calling", command, string.join(args))
-    (status, output) = commands.getstatusoutput(command + ' ' + string.join(args))
-    if os.WEXITSTATUS(status) != 0:
-        print "Command failed with status", os.WEXITSTATUS(status),  ":", \
-               command, string.join(args)
-	print "With output:", output
-        sys.exit(1)
-    return string.split(output, '\n')
-
-# Filter a list according to a regexp containing a () group. Return
-# a Set.
-def regexpfilter(list, regexp, groupnr = 1):
-    pattern = re.compile(regexp)
-    result = Set()
-    for x in list:
-        match = pattern.match(x)
-        if match:
-            result.add(match.group(groupnr))
-
-    return result
-
-# Return a Set of rpath strings for the passed object
-def rpath(obj):
-    if not os.access(obj, os.F_OK):
-        raise "Cannot find lib: " + obj
-    output = command(target + "objdump", "--private-headers", obj)
-    return map(lambda x: root + "/" + x, regexpfilter(output, ".*RPATH\s*(\S+)$").elems())
-
-# Return a Set of libraries the passed objects depend on.
-def library_depends(obj):
-    if not os.access(obj, os.F_OK):
-        raise "Cannot find lib: " + obj
-    output = command(target + "objdump", "--private-headers", obj)
-    return regexpfilter(output, ".*NEEDED\s*(\S+)$")
-
-# Return a list of libraries the passed objects depend on. The
-# libraries are in "-lfoo" format suitable for passing to gcc.
-def library_depends_gcc_libnames(obj):
-    if not os.access(obj, os.F_OK):
-        raise "Cannot find lib: " + obj
-    output = command(target + "objdump", "--private-headers", obj)
-    output = regexpfilter(output, ".*NEEDED\s*lib(\S+)\.so.*$")
-    if not output.elems():
-        return ""
-    else:
-        return "-l" + string.join(output.elems(), " -l")
-
-# Scan readelf output. Example:
-# Num:    Value          Size Type    Bind   Vis      Ndx Name
-#   1: 000000012002ab48   168 FUNC    GLOBAL DEFAULT  UND strchr@GLIBC_2.0 (2)
-symline_regexp = \
-    re.compile("\s*\d+: .+\s+\d+\s+\w+\s+(\w+)+\s+\w+\s+(\w+)\s+([^\s@]+)")
-
-# Return undefined symbols in an object as a Set of tuples (name, weakness)
-def undefined_symbols(obj):
-    if not os.access(obj, os.F_OK):
-        raise "Cannot find lib" + obj
-
-    result = Set()
-    output = command(target + "readelf", "-s", "-W", obj)
-    for line in output:
-        match = symline_regexp.match(line)
-        if match:
-            bind, ndx, name = match.groups()
-            if ndx == "UND":
-                result.add((name, bind == "WEAK"))
-    return result
-
-# Return a Set of symbols provided by a library
-def provided_symbols(obj):
-    if not os.access(obj, os.F_OK):
-        raise "Cannot find lib" + obj
-
-    result = Set()
-    debug(DEBUG_SPAM, "provided_symbols result = ", `result`)
-    output = command(target + "readelf", "-s", "-W", obj)
-    for line in output:
-        match = symline_regexp.match(line)
-        if match:
-            bind, ndx, name = match.groups()
-            if bind != "LOCAL" and not ndx in ("UND", "ABS"):
-                debug(DEBUG_SPAM, "provided_symbols adding ", `name`)
-                result.add(name)
-    return result
-
-# Return real target of a symlink
-def resolve_link(file):
-    debug(DEBUG_SPAM, "resolving", file)
-    while S_ISLNK(os.lstat(file)[ST_MODE]):
-        new_file = os.readlink(file)
-        if new_file[0] != "/":
-            file = os.path.join(os.path.dirname(file), new_file)
-        else:
-            file = new_file
-    debug(DEBUG_SPAM, "resolved to", file)
-    return file
-
-# Find complete path of a library, by searching in lib_path
-def find_lib(lib):
-    for path in lib_path:
-        if os.access(path + "/" + lib, os.F_OK):
-            return path + "/" + lib
-
-    return ""
-
-# Find a PIC archive for the library
-def find_pic(lib):
-    base_name = so_pattern.match(lib).group(1)
-    for path in lib_path:
-        for file in glob.glob(path + "/" + base_name + "_pic.a"):
-            if os.access(file, os.F_OK):
-                return resolve_link(file)
-    return ""
-
-# Find a PIC .map file for the library
-def find_pic_map(lib):
-    base_name = so_pattern.match(lib).group(1)
-    for path in lib_path:
-        for file in glob.glob(path + "/" + base_name + "_pic.map"):
-            if os.access(file, os.F_OK):
-                return resolve_link(file)
-    return ""
-
-def extract_soname(so_file):
-    soname_data = regexpfilter(command(target + "readelf", "--all", "-W", so_file),
-                               ".*SONAME.*\[(.*)\].*")
-    if soname_data.elems():
-        return soname_data.elems()[0]
-
-    return ""
-def usage(was_err):
-    if was_err:
-        outfd = sys.stderr
-    else:
-        outfd = sys.stdout
-    print >> outfd, "Usage: mklibs [OPTION]... -d DEST FILE ..."
-    print >> outfd, "Make a set of minimal libraries for FILE(s) in DEST."
-    print >> outfd, ""
-    print >> outfd, "  -d, --dest-dir DIRECTORY     create libraries in DIRECTORY"
-    print >> outfd, "  -D, --no-default-lib         omit default libpath (", string.join(default_lib_path, " : "), ")"
-    print >> outfd, "  -L DIRECTORY[:DIRECTORY]...  add DIRECTORY(s) to the library search path"
-    print >> outfd, "      --ldlib LDLIB            use LDLIB for the dynamic linker"
-    print >> outfd, "      --libc-extras-dir DIRECTORY  look for libc extra files in DIRECTORY"
-    # Ugh... Adding the trailing '-' breaks common practice.
-    #print >> outfd, "      --target TARGET          prepend TARGET- to the gcc and binutils calls"
-    print >> outfd, "      --target TARGET          prepend TARGET to the gcc and binutils calls"
-    print >> outfd, "      --root ROOT              search in ROOT for library rpaths"
-    print >> outfd, "  -v, --verbose                explain what is being done"
-    print >> outfd, "  -h, --help                   display this help and exit"
-    sys.exit(was_err)
-
-def version(vers):
-    print "mklibs: version ",vers
-    print ""
-
-#################### main ####################
-## Usage: ./mklibs.py [OPTION]... -d DEST FILE ...
-## Make a set of minimal libraries for FILE ... in directory DEST.
-##
-## Options:
-##   -L DIRECTORY               Add DIRECTORY to library search path.
-##   -D, --no-default-lib       Do not use default lib directories of /lib:/usr/lib
-##   -n, --dry-run              Don't actually run any commands; just print them.
-##   -v, --verbose              Print additional progress information.
-##   -V, --version              Print the version number and exit.
-##   -h, --help                 Print this help and exit.
-##   --ldlib                    Name of dynamic linker (overwrites environment variable ldlib)
-##   --libc-extras-dir          Directory for libc extra files
-##   --target                   Use as prefix for gcc or binutils calls
-##
-##   -d, --dest-dir DIRECTORY   Create libraries in DIRECTORY.
-##
-## Required arguments for long options are also mandatory for the short options.
-
-# Clean the environment
-vers="0.12 with uClibc fixes"
-os.environ['LC_ALL'] = "C"
-
-# Argument parsing
-opts = "L:DnvVhd:r:"
-longopts = ["no-default-lib", "dry-run", "verbose", "version", "help",
-            "dest-dir=", "ldlib=", "libc-extras-dir=", "target=", "root="]
-
-# some global variables
-lib_rpath = []
-lib_path = []
-dest_path = "DEST"
-ldlib = "LDLIB"
-include_default_lib_path = "yes"
-default_lib_path = ["/lib/", "/usr/lib/", "/usr/X11R6/lib/"]
-libc_extras_dir = "/usr/lib/libc_pic"
-target = ""
-root = ""
-so_pattern = re.compile("((lib|ld).*)\.so(\..+)*")
-script_pattern = re.compile("^#!\s*/")
-
-try:
-    optlist, proglist = getopt.getopt(sys.argv[1:], opts, longopts)
-except getopt.GetoptError, msg:
-    print >> sys.stderr, msg
-    usage(1)
-
-for opt, arg in optlist:
-    if opt in ("-v", "--verbose"):
-        if debuglevel < DEBUG_SPAM:
-            debuglevel = debuglevel + 1
-    elif opt == "-L":
-        lib_path.extend(string.split(arg, ":"))
-    elif opt in ("-d", "--dest-dir"):
-        dest_path = arg
-    elif opt in ("-D", "--no-default-lib"):
-        include_default_lib_path = "no"
-    elif opt == "--ldlib":
-        ldlib = arg
-    elif opt == "--libc-extras-dir":
-        libc_extras_dir = arg
-    elif opt == "--target":
-        #target = arg + "-"
-        target = arg
-    elif opt in ("-r", "--root"):
-        root = arg
-    elif opt in ("--help", "-h"):
-	usage(0)
-        sys.exit(0)
-    elif opt in ("--version", "-V"):
-        version(vers)
-        sys.exit(0)
-    else:
-        print "WARNING: unknown option: " + opt + "\targ: " + arg
-
-if include_default_lib_path == "yes":
-    lib_path.extend(default_lib_path)
-
-if ldlib == "LDLIB":
-    ldlib = os.getenv("ldlib")
-
-objects = {}  # map from inode to filename
-for prog in proglist:
-    inode = os.stat(prog)[ST_INO]
-    if objects.has_key(inode):
-        debug(DEBUG_SPAM, prog, "is a hardlink to", objects[inode])
-    elif so_pattern.match(prog):
-        debug(DEBUG_SPAM, prog, "is a library")
-    elif script_pattern.match(open(prog).read(256)):
-        debug(DEBUG_SPAM, prog, "is a script")
-    else:
-        objects[inode] = prog
-
-if not ldlib:
-    pattern = re.compile(".*Requesting program interpreter:.*/([^\]/]+).*")
-    for obj in objects.values():
-        output = command(target + "readelf", "--program-headers", obj)
-	for x in output:
-	    match = pattern.match(x)
-	    if match:
-	        ldlib = match.group(1)
-	        break
-	if ldlib:
-	    break
-
-if not ldlib:
-    sys.exit("E: Dynamic linker not found, aborting.")
-
-debug(DEBUG_NORMAL, "I: Using", ldlib, "as dynamic linker.")
-
-pattern = re.compile(".*ld-uClibc.*");
-if pattern.match(ldlib):
-    uclibc = 1
-else:
-    uclibc = 0
-
-# Check for rpaths
-for obj in objects.values():
-    rpath_val = rpath(obj)
-    if rpath_val:
-        if root:
-            if debuglevel >= DEBUG_VERBOSE:
-                print "Adding rpath " + string.join(rpath_val, ":") + " for " + obj
-            lib_rpath.extend(rpath_val)
-        else:
-            print "warning: " + obj + " may need rpath, but --root not specified"
-
-lib_path.extend(lib_rpath)
-
-passnr = 1
-previous_pass_unresolved = Set()
-while 1:
-    debug(DEBUG_NORMAL, "I: library reduction pass", `passnr`)
-    if debuglevel >= DEBUG_VERBOSE:
-        print "Objects:",
-        for obj in objects.values():
-            print obj[string.rfind(obj, '/') + 1:],
-        print
-
-    passnr = passnr + 1
-    # Gather all already reduced libraries and treat them as objects as well
-    small_libs = []
-    for lib in regexpfilter(os.listdir(dest_path), "(.*-so-stripped)$").elems():
-        obj = dest_path + "/" + lib
-        small_libs.append(obj)
-        inode = os.stat(obj)[ST_INO]
-        if objects.has_key(inode):
-            debug(DEBUG_SPAM, obj, "is hardlink to", objects[inode])
-        else:
-            objects[inode] = obj
-
-    # DEBUG
-    for obj in objects.values():
-        small_libs.append(obj)
-        debug(DEBUG_VERBOSE, "Object:", obj)
-
-    # calculate what symbols and libraries are needed
-    needed_symbols = Set()              # Set of (name, weakness-flag)
-    libraries = Set()
-    for obj in objects.values():
-        needed_symbols.merge(undefined_symbols(obj))
-        libraries.merge(library_depends(obj))
-
-    # FIXME: on i386 this is undefined but not marked UND
-    # I don't know how to detect those symbols but this seems
-    # to be the only one and including it on alpha as well
-    # doesn't hurt. I guess all archs can live with this.
-    needed_symbols.add(("sys_siglist", 1))
-
-    # calculate what symbols are present in small_libs
-    present_symbols = Set()
-    for lib in small_libs:
-        present_symbols.merge(provided_symbols(lib))
-
-    # are we finished?
-    using_ctor_dtor = 0
-    num_unresolved = 0
-    present_symbols_elems = present_symbols.elems()
-    unresolved = Set()
-    for (symbol, is_weak) in needed_symbols.elems():
-        if not symbol in present_symbols_elems:
-            debug(DEBUG_SPAM, "Still need:", symbol, `is_weak`)
-            unresolved.add((symbol, is_weak))
-            num_unresolved = num_unresolved + 1
-
-    debug (DEBUG_NORMAL, `needed_symbols.size()`, "symbols,",
-           `num_unresolved`, "unresolved")
-
-    if num_unresolved == 0:
-        break
-
-    if unresolved == previous_pass_unresolved:
-        # No progress in last pass. Verify all remaining symbols are weak.
-        for (symbol, is_weak) in unresolved.elems():
-            if not is_weak:
-                raise "Unresolvable symbol " + symbol
-        break
-
-    previous_pass_unresolved = unresolved
-
-    library_symbols = {}
-    library_symbols_used = {}
-    symbol_provider = {}
-
-    # Calculate all symbols each library provides
-    for library in libraries.elems():
-        path = find_lib(library)
-        if not path:
-            sys.exit("Library not found: " + library + " in path: "
-                     + string.join(lib_path, " : "))
-        symbols = provided_symbols(path)
-        library_symbols[library] = Set()
-        library_symbols_used[library] = Set()
-        for symbol in symbols.elems():
-            if symbol_provider.has_key(symbol):
-                # in doubt, prefer symbols from libc
-                if re.match("^libc[\.-]", library):
-                    library_symbols[library].add(symbol)
-                    symbol_provider[symbol] = library
-                else:
-                    debug(DEBUG_SPAM, "duplicate symbol", symbol, "in",
-                          symbol_provider[symbol], "and", library)
-            else:
-                library_symbols[library].add(symbol)
-                symbol_provider[symbol] = library
-
-	# Fixup support for constructors and destructors
-	if symbol_provider.has_key("_init"):
-	    debug(DEBUG_VERBOSE, library, ": Library has a constructor!");
-	    using_ctor_dtor = 1
-	    library_symbols[library].add("_init")
-	    symbol_provider["_init"] = library
-            library_symbols_used[library].add("_init")
-
-	if symbol_provider.has_key("_fini"):
-	    debug(DEBUG_VERBOSE, library, ": Library has a destructor!");
-	    using_ctor_dtor = 1
-	    library_symbols[library].add("_fini")
-	    symbol_provider["_fini"] = library
-            library_symbols_used[library].add("_fini")
-
-    # which symbols are actually used from each lib
-    for (symbol, is_weak) in needed_symbols.elems():
-        if not symbol_provider.has_key(symbol):
-            if not is_weak:
-                if not uclibc or (symbol != "main"):
-                    raise "No library provides non-weak " + symbol
-        else:
-            lib = symbol_provider[symbol]
-            library_symbols_used[lib].add(symbol)
-
-    # reduce libraries
-    for library in libraries.elems():
-        debug(DEBUG_VERBOSE, "reducing", library)
-        debug(DEBUG_SPAM, "using: " + string.join(library_symbols_used[library].elems()))
-        so_file = find_lib(library)
-        if root and (re.compile("^" + root).search(so_file)):
-            debug(DEBUG_VERBOSE, "no action required for " + so_file)
-            continue
-        so_file_name = os.path.basename(so_file)
-        if not so_file:
-            sys.exit("File not found:" + library)
-        pic_file = find_pic(library)
-        if not pic_file:
-            # No pic file, so we have to use the .so file, no reduction
-            debug(DEBUG_VERBOSE, "No pic file found for", so_file, "; copying")
-            command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
-                    so_file, dest_path + "/" + so_file_name + "-so-stripped")
-        else:
-            # we have a pic file, recompile
-            debug(DEBUG_SPAM, "extracting from:", pic_file, "so_file:", so_file)
-            soname = extract_soname(so_file)
-            if soname == "":
-                debug(DEBUG_VERBOSE, so_file, " has no soname, copying")
-                continue
-            debug(DEBUG_SPAM, "soname:", soname)
-            base_name = so_pattern.match(library).group(1)
-            # libc needs its soinit.o and sofini.o as well as the pic
-            if (base_name == "libc") and not uclibc:
-                # force dso_handle.os to be included, otherwise reduced libc
-                # may segfault in ptmalloc_init due to undefined weak reference
-                extra_flags = find_lib(ldlib) + " -u __dso_handle"
-                extra_pre_obj = libc_extras_dir + "/soinit.o"
-                extra_post_obj = libc_extras_dir + "/sofini.o"
-            else:
-                extra_flags = ""
-                extra_pre_obj = ""
-                extra_post_obj = ""
-            map_file = find_pic_map(library)
-            if map_file:
-                extra_flags = extra_flags + " -Wl,--version-script=" + map_file
-            if library_symbols_used[library].elems():
-                joined_symbols = "-u" + string.join(library_symbols_used[library].elems(), " -u")
-            else:
-                joined_symbols = ""
-	    if using_ctor_dtor == 1:
-                extra_flags = extra_flags + " -shared"
-            # compile in only used symbols
-            command(target + "gcc",
-                "-nostdlib -nostartfiles -shared -Wl,-soname=" + soname,\
-                joined_symbols, \
-                "-o", dest_path + "/" + so_file_name + "-so", \
-                extra_pre_obj, \
-                pic_file, \
-                extra_post_obj, \
-                extra_flags, \
-                "-lgcc -L", dest_path, \
-                "-L" + string.join(lib_path, " -L"), \
-                library_depends_gcc_libnames(so_file))
-            # strip result
-            command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
-                      dest_path + "/" + so_file_name + "-so",
-                      dest_path + "/" + so_file_name + "-so-stripped")
-            ## DEBUG
-            debug(DEBUG_VERBOSE, so_file, "\t", `os.stat(so_file)[ST_SIZE]`)
-            debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so", "\t",
-                  `os.stat(dest_path + "/" + so_file_name + "-so")[ST_SIZE]`)
-            debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so-stripped",
-                  "\t", `os.stat(dest_path + "/" + so_file_name + "-so-stripped")[ST_SIZE]`)
-
-# Finalising libs and cleaning up
-for lib in regexpfilter(os.listdir(dest_path), "(.*)-so-stripped$").elems():
-    os.rename(dest_path + "/" + lib + "-so-stripped", dest_path + "/" + lib)
-for lib in regexpfilter(os.listdir(dest_path), "(.*-so)$").elems():
-    os.remove(dest_path + "/" + lib)
-
-# Canonicalize library names.
-for lib in regexpfilter(os.listdir(dest_path), "(.*so[.\d]*)$").elems():
-    this_lib_path = dest_path + "/" + lib
-    if os.path.islink(this_lib_path):
-        debug(DEBUG_VERBOSE, "Unlinking %s." % lib)
-        os.remove(this_lib_path)
-        continue
-    soname = extract_soname(this_lib_path)
-    if soname:
-        debug(DEBUG_VERBOSE, "Moving %s to %s." % (lib, soname))
-        os.rename(dest_path + "/" + lib, dest_path + "/" + soname)
-
-# Make sure the dynamic linker is present and is executable
-ld_file = find_lib(ldlib)
-ld_file_name = os.path.basename(ld_file)
-
-if not os.access(dest_path + "/" + ld_file_name, os.F_OK):
-    debug(DEBUG_NORMAL, "I: stripping and copying dynamic linker.")
-    command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
-            ld_file, dest_path + "/" + ld_file_name)
-
-os.chmod(dest_path + "/" + ld_file_name, 0755)
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index f21cefdb19..adab0f7128 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -4,5 +4,4 @@ include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
 include toolchain/kernel-headers/kernel-headers.mk
-include toolchain/mklibs/mklibs.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 7f2f68f70f..7580946c62 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -97,7 +97,6 @@ choice
 endchoice
 
 source "toolchain/elf2flt/Config.in"
-source "toolchain/mklibs/Config.in"
 
 config BR2_VFP_FLOAT
 	bool "Use ARM Vector Floating Point unit"
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index f6cc2b917e..d67725651a 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -6,5 +6,4 @@ include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
 include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
-include toolchain/mklibs/mklibs.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index d5b2aacbd0..4292d85514 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -5,6 +5,5 @@ include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
 include toolchain/kernel-headers/kernel-headers.mk
-include toolchain/mklibs/mklibs.mk
 include toolchain/toolchain-external/ext-tool.mk
 include toolchain/uClibc/uclibc.mk

From 555c2585bf28c3ef71f6d2dcdd983d17a19892af Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 10:45:30 +0200
Subject: [PATCH 1829/6849] target/: mark Xtensa architecture support as
 deprecated

Hasn't been updated since it was added in 2009, and requires quite
some special handling in BR.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index f8ab84e661..e7a18f71eb 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -124,6 +124,7 @@ config BR2_x86_64
 
 config BR2_xtensa
 	bool "Xtensa"
+	depends on BR2_DEPRECATED
 	help
 	  Xtensa is a Tensilica processor IP architecture.
 	  http://en.wikipedia.org/wiki/Xtensa

From a1c9bdd64393078f38f054a6aa6f7c7a84dbc483 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 23 Apr 2012 03:31:36 +0000
Subject: [PATCH 1830/6849] audiofile: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in              |  1 +
 package/multimedia/audiofile/Config.in    | 11 +++++++++++
 package/multimedia/audiofile/audiofile.mk | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/multimedia/audiofile/Config.in
 create mode 100644 package/multimedia/audiofile/audiofile.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index a05d1d983a..effec38f53 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -1,6 +1,7 @@
 menu "Audio and video libraries and applications"
 source "package/multimedia/alsa-lib/Config.in"
 source "package/multimedia/alsa-utils/Config.in"
+source "package/multimedia/audiofile/Config.in"
 source "package/multimedia/aumix/Config.in"
 source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
diff --git a/package/multimedia/audiofile/Config.in b/package/multimedia/audiofile/Config.in
new file mode 100644
index 0000000000..4f9952c315
--- /dev/null
+++ b/package/multimedia/audiofile/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_AUDIOFILE
+	bool "audiofile"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  The Audio File Library handles reading and writing audio files
+	  in many common formats.
+
+	  http://www.68k.org/~michael/audiofile/
+
+comment "audiofile requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/audiofile/audiofile.mk b/package/multimedia/audiofile/audiofile.mk
new file mode 100644
index 0000000000..a49cc3e649
--- /dev/null
+++ b/package/multimedia/audiofile/audiofile.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# audiofile
+#
+#############################################################
+
+AUDIOFILE_VERSION = 0.3.3
+AUDIOFILE_SITE = http://audiofile.68k.org
+AUDIOFILE_INSTALL_STAGING = YES
+AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
+
+# Useless and needs alsa-lib
+define AUDIOFILE_DISABLE_EXAMPLES
+	$(SED) 's/examples//' $(@D)/Makefile.in
+endef
+
+AUDIOFILE_POST_PATCH_HOOKS += AUDIOFILE_DISABLE_EXAMPLES
+
+$(eval $(call AUTOTARGETS))

From d9d4d960aab258f8a9df703cda262a6678414ecc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 23 Apr 2012 03:31:37 +0000
Subject: [PATCH 1831/6849] mpd: add audiofile support

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/Config.in | 7 +++++++
 package/multimedia/mpd/mpd.mk    | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 27bd309b43..c7c0cd71a2 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -30,6 +30,13 @@ config BR2_PACKAGE_MPD_AO
 	help
 	  Enable libao output support.
 
+config BR2_PACKAGE_MPD_AUDIOFILE
+	bool "audiofile"
+	select BR2_PACKAGE_AUDIOFILE
+	help
+	  Enable audiofile input/streaming support.
+	  Select this if you want to play back WAV files.
+
 config BR2_PACKAGE_MPD_PULSEAUDIO
 	bool "pulseaudio"
 	select BR2_PACKAGE_PULSEAUDIO
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 095bad6fbc..43d429bc5f 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -21,6 +21,11 @@ MPD_DEPENDENCIES += libao
 MPD_CONF_OPT += --enable-ao
 endif
 
+ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y)
+MPD_DEPENDENCIES += audiofile
+MPD_CONF_OPT += --enable-audiofile
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y)
 MPD_DEPENDENCIES += pulseaudio
 MPD_CONF_OPT += --enable-pulse

From bf636a9463d6620ecfaed882c2938aa77a7b6542 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 12:21:53 +0200
Subject: [PATCH 1832/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/CHANGES b/CHANGES
index 207cfe21d6..02217275ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,36 +14,44 @@
 	qemu configs.
 
 	Atom processor support. Microblaze architecture support (using
-	ext toolchain). Cleanup architecture names.
+	ext toolchain). Cleanup architecture names, deprecate Xtensa
+	support.
 
 	Toolchain: Add GCC 4.4.7, 4.6.3, 4.7.0. uClibc 0.9.33.1,
 	default to uClibc 0.9.33.x, 64bit fixes for external
 	toolchains, linaro ext toolchains, new sourcery codebench ext
 	toolchains.
 
+	Bootloaders: U-Boot: add 2012.04. Barebox: add 2012.04, remove
+	2011.12.
+
 	Updated/fixed packages: alsa-lib, alsa-utils, at, atk, avahi,
 	barebox, bind, bluez_utils, boost, can-utils, ccache,
-	coreutils, dhcp, directfb, dnsmasq, doom-wad, dosfstools,
-	e2fsprogs, expat, fakeroot, feh, ffmpeg, file, fis, freetype,
-	gamin, gawk, gdk-pixbuf, giblib, glib-networking, gmp, gnutls,
-	gpsd, grep, gstreamer, gst-plugins-{bad,base,good,ugly},
-	haserl, hdparm, imagemagick, iptable, iw, kmod, libarchive,
-	libatomic_ops, libconfig, libcurl, libedbus, libethumb,
-	libffi, libfuse, libglib2, libgtk2, libhid, libnl, libpng,
-	libsigc, libsoup, libupnp, liburcu, libxml2,
+	coreutils, dbus, dhcp, directfb, dnsmasq, doom-wad,
+	dosfstools, e2fsprogs, expat, fakeroot, feh, ffmpeg, file,
+	fis, freetype, gamin, gawk, gdk-pixbuf, giblib,
+	glib-networking, gmp, gnutls, gpsd, grep, gstreamer,
+	gst-plugins-{bad,base,good,ugly}, haserl, hdparm, imagemagick,
+	iptable, iw, kexec, kmod, lame, libarchive, libatomic_ops,
+	libconfig, libcurl, libedbus, libethumb, libffi, libfuse,
+	libglib2, libgtk2, libhid, libmpeg2, libnl, libpng, libsigc,
+	libsoup, libupnp, liburcu, libusb, libusb-compat, libxml2,
 	libxml-parser-perl, libxslt, linux-firmware, linux-fusion,
 	lite, ltrace, lttng-libust, lua, makedevs, microperl, mpd,
-	mpfr, mtd, mysql_client, nbd, neon, netsnmp, network-manager,
-	ntfs-3g, openssl, parted, pango, pcre, pixman, poco, psmisc,
-	pulseaudio, qt, radvd, rpm, samba, sam-ba, sawman, screen,
-	sdl_net, smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
-	syslinux, sysstat, tftp-hpa, transmission, tiff, tinyhttpd,
-	udev, unionfs, usbutils, util-linux, vala, valgrind, vim,
-	vsftpd, wipe, xdriver_xf86-video-fbdev, xfsprogs, zlib,
-
-	New packages: apr, fmtools, glib-networking, hiawatha,
-	lcdprog, libcap-ng, libdmtx, libtpl, minicom, parted,
-	polarssl, protobuf, socketcand, systemd, ushare, zeromq
+	mpfr, mpg123, mtd, mysql_client, nbd, neon, netsnmp,
+	network-manager, ntfs-3g, openssl, parted, pango, pcre,
+	pixman, poco, psmisc, pulseaudio, python, qt, radvd, rpm,
+	samba, sam-ba, sane-backends, sawman, screen, sdl_net,
+	smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
+	syslinux, sysstat, taglib, tftp-hpa, transmission, tiff,
+	tinyhttpd, udev, unionfs, usbutils, util-linux, vala,
+	valgrind, vim, vsftpd, wipe, xdriver_xf86-video-fbdev,
+	xfsprogs, zlib,
+
+	New packages: apr, audiofile, fmtools, glib-networking,
+	hiawatha, latencytop, lcdproc, libcap-ng, libdmtx, libtpl,
+	minicom, parted, polarssl, protobuf, socketcand, systemd,
+	ushare, zeromq
 
 	Deprecated packages: ttcp
 
@@ -51,6 +59,7 @@
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#2353: [lua] fix build with 2010.08-rc1
 	#4880: New package lcdproc
 	#4886: New package protobuf
 

From fcafc9575693a77e169202b66f41db2c67ef7363 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 25 Apr 2012 06:47:38 -0300
Subject: [PATCH 1833/6849] toolchain/gcc: remove duplicate QUIET entries

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index a4faf4fe69..a2975dc56c 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -310,7 +310,6 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(QUIET) \
 	)
 	touch $@
 
@@ -376,7 +375,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(QUIET) \
 	)
 	touch $@
 

From 83b064e3afeed94b1a7930795bff08147a5626a9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 13:57:15 +0200
Subject: [PATCH 1834/6849] tcpdump: fix build with ipv6 after 2a10c9 (pass
 --enable-ipv6 to autotargets configure)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpdump/tcpdump.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index cf23df3913..ab9d4f165f 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -9,7 +9,7 @@
 TCPDUMP_VERSION = 4.2.1
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
-TCPDUMP_CONF_ENV = ac_cv_linux_vers=2
+TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
 TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES = zlib libpcap

From 264e75dd6e0b39516043528eda4bfac4104542b2 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Wed, 25 Apr 2012 02:01:23 +0000
Subject: [PATCH 1835/6849] Bump berkeleydb version

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index ed70486ccb..3d578529ad 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -3,7 +3,7 @@
 # berkeley db
 #
 #############################################################
-BERKELEYDB_VERSION:=4.4.20
+BERKELEYDB_VERSION:=5.3.15
 BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR=build_unix
@@ -33,7 +33,6 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--with-gnu-ld \
 		--disable-cxx \
 		--disable-java \
-		--disable-rpc \
 		--disable-tcl \
 		--disable-compat185 \
 		$(SHARED_STATIC_LIBS_OPTS) \

From 25e08d501c338714e16d6a06c5c6278e86df1dc8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 15:37:25 +0200
Subject: [PATCH 1836/6849] berkeleydb: cleanup

Use the preferred 'VAR = value' form, and remove redundant configure
options.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 3d578529ad..396ba16913 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -3,13 +3,13 @@
 # berkeley db
 #
 #############################################################
-BERKELEYDB_VERSION:=5.3.15
-BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
-BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
-BERKELEYDB_SUBDIR=build_unix
+BERKELEYDB_VERSION = 5.3.15
+BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
+BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
+BERKELEYDB_SUBDIR = build_unix
 BERKELEYDB_INSTALL_STAGING = YES
 
-#build directory can't be the directory where configure are there, so..
+# build directory can't be the directory where configure are there, so..
 define BERKELEYDB_CONFIGURE_CMDS
 	(cd $(@D)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -20,16 +20,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
 		--with-gnu-ld \
 		--disable-cxx \
 		--disable-java \

From 9a68921a0925bdee5f721fe97350db2bfc9bab8f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 15:59:07 +0200
Subject: [PATCH 1837/6849] berkeleydb: build with C++ support if enabled

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 396ba16913..bb3fd5dfd9 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -22,7 +22,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
 		--with-gnu-ld \
-		--disable-cxx \
+		$(if $(BR2_INSTALL_LIBSTDCPP),--enable-cxx,--disable-cxx) \
 		--disable-java \
 		--disable-tcl \
 		--disable-compat185 \

From 9f160affcc78e8e503d1e0d082b10f8c6209fed1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 25 Apr 2012 04:30:32 +0000
Subject: [PATCH 1838/6849] berkeleydb: use O_DIRECT

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index bb3fd5dfd9..b2b0a45c20 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -28,6 +28,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--disable-compat185 \
 		$(SHARED_STATIC_LIBS_OPTS) \
 		--with-pic \
+		--enable-o_direct \
 	)
 	$(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile
 endef

From 4608c4c1a4191c8d8e0a23cc9161bc7cccbedefc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 25 Apr 2012 04:30:33 +0000
Subject: [PATCH 1839/6849] berkeleydb: add option for tools install

Add an option to install (or not) the berkeleydb binary tools.
The default is no since most of the time/application just need the
library and it helps save some space in the target.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/Config.in     |  6 ++++++
 package/berkeleydb/berkeleydb.mk | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/package/berkeleydb/Config.in b/package/berkeleydb/Config.in
index 9568d4425f..a597abbe8a 100644
--- a/package/berkeleydb/Config.in
+++ b/package/berkeleydb/Config.in
@@ -5,3 +5,9 @@ config BR2_PACKAGE_BERKELEYDB
 	  applications.
 
 	  http://www.sleepycat.com/products/db.shtml
+
+config BR2_PACKAGE_BERKELEYDB_TOOLS
+	bool "install tools"
+	depends on BR2_PACKAGE_BERKELEYDB
+	help
+	  Install berkeleydb tools, mostly useful for debugging purposes.
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index b2b0a45c20..d737896546 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -8,6 +8,9 @@ BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR = build_unix
 BERKELEYDB_INSTALL_STAGING = YES
+BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \
+	db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \
+	db_stat db_tuner db_upgrade db_verify
 
 # build directory can't be the directory where configure are there, so..
 define BERKELEYDB_CONFIGURE_CMDS
@@ -33,6 +36,16 @@ define BERKELEYDB_CONFIGURE_CMDS
 	$(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile
 endef
 
+ifneq ($(BR2_PACKAGE_BERKELEYDB_TOOLS),y)
+
+define BERKELEYDB_REMOVE_TOOLS
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(BERKELEYDB_BINARIES))
+endef
+
+BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_TOOLS
+
+endif
+
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 
 define BERKELEYDB_REMOVE_DOCS

From e23be36ab3a110787917db59618d9f5280457938 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 22:29:34 +0200
Subject: [PATCH 1840/6849] nfs-utils: fix build with ipv6 after 2a10c9 (pass
 --enable-ipv6 to autotargets configure)

IPv6 support needs the TIRPC library, which we don't have in Buildroot, so
forcibly disable IPv6 support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nfs-utils/nfs-utils.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index bbe25fee06..557e7e8cc3 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -14,6 +14,7 @@ NFS_UTILS_CONF_OPT = \
 		--disable-gss \
 		--disable-tirpc \
 		--disable-uuid \
+		--disable-ipv6 \
 		--without-tcp-wrappers \
 		--with-rpcgen=internal
 

From eb19e8286115e33a2d2974d1fc55ad2eec4ae109 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 25 Apr 2012 23:07:27 +0200
Subject: [PATCH 1841/6849] docs/git.html: slightly reword for git

Some of the wording didn't make much sense after we moved from svn to git.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/git.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/git.html b/docs/git.html
index bf894b9fc4..0c99251a9d 100644
--- a/docs/git.html
+++ b/docs/git.html
@@ -36,8 +36,8 @@ <h3>Git Access</h3>
 </pre>
 
 Because you've only been granted anonymous access to the tree, you won't be
-able to commit any changes. Changes can be submitted for inclusion by posting
-them to the buildroot mailing list or to the <a
+able to push your changes to the repo. Changes can instead be submitted for
+inclusion by posting them to the buildroot mailing list or to the <a
 href="https://bugs.uclibc.org/">Bug and Patch Tracking System</a>.
 
 <!--#include file="footer.html" -->

From 04bd5067a2689e86a1928afac0aa3703114cd782 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Apr 2012 11:04:56 +0200
Subject: [PATCH 1842/6849] lttng-libust: fix build with modern uClibc versions

uClibc got sched_getcpu in 0.9.33, so the compat workaround should only
be used for older uClibc versions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../lttng-libust-uclibc-sched_getcpu.patch    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch

diff --git a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
new file mode 100644
index 0000000000..65361858f2
--- /dev/null
+++ b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
@@ -0,0 +1,32 @@
+[PATCH] fix build with modern uClibc
+
+uClibc has sched_getcpu since 0.9.33, so the compat workaround should only
+be used for older uClibc versions.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ liblttng-ust/compat.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: lttng-ust-1.9.2/liblttng-ust/compat.h
+===================================================================
+--- lttng-ust-1.9.2.orig/liblttng-ust/compat.h
++++ lttng-ust-1.9.2/liblttng-ust/compat.h
+@@ -17,6 +17,10 @@
+ #include <sys/syscall.h>
+ 
+ #ifdef __UCLIBC__
++/* old uClibc versions didn't have sched_getcpu */
++#if __UCLIBC_MAJOR__ == 0 && \
++	(__UCLIBC_MINOR__ < 9 || \
++	 (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
+ #define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
+ static inline
+ int sched_getcpu(void)
+@@ -26,5 +30,6 @@
+ 	s = __getcpu(&c, NULL, NULL);
+ 	return (s == -1) ? s : c;
+ }
++#endif /* <= 0.9.32 */
+ #endif	/* __UCLIBC__ */
+ #endif /* _UST_COMPAT_H */

From fe63b5925af2ce14fa20c4d5d92ce5d0789d909a Mon Sep 17 00:00:00 2001
From: "spdawson@gmail.com" <spdawson@gmail.com>
Date: Fri, 20 Apr 2012 00:08:55 +0000
Subject: [PATCH 1843/6849] Add the www-data user group to the skeleton target
 filesystem

The www-data user is defined in fs/skeleton/etc/passwd, with gid 33. But
gid 33 is not present in the group file.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/group | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/skeleton/etc/group b/fs/skeleton/etc/group
index cd4ca79423..8fc486d1a6 100644
--- a/fs/skeleton/etc/group
+++ b/fs/skeleton/etc/group
@@ -7,6 +7,7 @@ tty:x:5:
 disk:x:6:
 wheel:x:10:root
 audio:x:29:
+www-data:x:33:
 utmp:x:43:
 staff:x:50:
 lock:x:54:

From 524a8ab35cb955060f83649989ef769e8988d02f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 27 Apr 2012 00:42:40 +0200
Subject: [PATCH 1844/6849] package: add ndisc6 (IPv6 network tools)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/ndisc6/Config.in                      | 49 ++++++++++++++
 .../ndisc6-trace-tcp-upd-uClibc-fix.patch     | 64 +++++++++++++++++++
 package/ndisc6/ndisc6.mk                      | 37 +++++++++++
 4 files changed, 151 insertions(+)
 create mode 100644 package/ndisc6/Config.in
 create mode 100644 package/ndisc6/ndisc6-trace-tcp-upd-uClibc-fix.patch
 create mode 100644 package/ndisc6/ndisc6.mk

diff --git a/package/Config.in b/package/Config.in
index 28a08d234b..a3101467f6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -483,6 +483,7 @@ source "package/mrouted/Config.in"
 source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
+source "package/ndisc6/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/netcat/Config.in"
 source "package/netkitbase/Config.in"
diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
new file mode 100644
index 0000000000..126bfa2bb8
--- /dev/null
+++ b/package/ndisc6/Config.in
@@ -0,0 +1,49 @@
+comment "ndisc6 requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6
+
+config BR2_PACKAGE_NDISC6
+	bool "ndisc6 tools"
+	depends on BR2_INET_IPV6
+	help
+	  NDisc6 is a small collection of useful tools for IPv6 networking
+
+	  http://www.remlab.net/ndisc6/
+
+if BR2_PACKAGE_NDISC6
+
+config BR2_PACKAGE_NDISC6_NAME2ADDR
+	bool "name2addr"
+	help
+	  name2addr perform DNS lookups from scripts.
+
+config BR2_PACKAGE_NDISC6_NDISC6
+	bool "ndisc6"
+	help
+	  ndisc6 performs ICMPv6 Neighbor Discovery in userland.
+
+config BR2_PACKAGE_NDISC6_RDISC6
+	bool "rdisc6"
+	help
+	  rdisc6 performs ICMPv6 Router Discovery in userland.
+
+config BR2_PACKAGE_NDISC6_RDNSSD
+	bool "rdnssd"
+	help
+	  IPv6 Recursive DNS Server discovery Daemon.
+
+config BR2_PACKAGE_NDISC6_RLTRACEROUTE6
+	bool "rltraceroute6"
+	help
+	  rltraceroute6 is an IPv6 traceroute implementation.
+
+config BR2_PACKAGE_NDISC6_TCPTRACEROUTE6
+	bool "tcptraceroute6"
+	help
+	  tcptraceroute6 is an TCP/IPv6 traceroute implementation.
+
+config BR2_PACKAGE_NDISC6_TCPSPRAY
+	bool "tcpspray"
+	help
+	  TCP/IP bandwidth measurement tool (Discard and Echo client).
+
+endif
diff --git a/package/ndisc6/ndisc6-trace-tcp-upd-uClibc-fix.patch b/package/ndisc6/ndisc6-trace-tcp-upd-uClibc-fix.patch
new file mode 100644
index 0000000000..f84719cf36
--- /dev/null
+++ b/package/ndisc6/ndisc6-trace-tcp-upd-uClibc-fix.patch
@@ -0,0 +1,64 @@
+From 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Thu, 26 Apr 2012 23:45:25 +0200
+Subject: [PATCH] trace-{tcp,udp}.c: fix build on uClibc
+
+Selection of the BSD variant of struct tcphdr/udphdr on uClibc fails
+because of config.h. This is caused by config.h setting _GNU_SOURCE
+and the compat handling (uClibc doesn't have inet6_rth_*) including
+sys/types.h which in term includes features.h, which figures out
+what bsd/gnu/posix variant to use because of:
+
+ /* If _BSD_SOURCE was defined by the user, favor BSD over POSIX.  */
+ #if defined _BSD_SOURCE && \
+    !(defined _POSIX_SOURCE || defined _POSIX_C_SOURCE || \
+      defined _XOPEN_SOURCE || defined _XOPEN_SOURCE_EXTENDED || \
+      defined _GNU_SOURCE || defined _SVID_SOURCE)
+ # define __FAVOR_BSD    1
+ #endif
+
+The current workaround of undefining _GNU_SOURCE after config.h doesn't
+work as features.h has already been evaluated by then. Instead, simply
+don't include config.h as it isn't needed in these two files.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/trace-tcp.c |    5 -----
+ src/trace-udp.c |    5 -----
+ 2 files changed, 10 deletions(-)
+
+diff --git a/src/trace-tcp.c b/src/trace-tcp.c
+index 6a7732d..91b64c2 100644
+--- a/src/trace-tcp.c
++++ b/src/trace-tcp.c
+@@ -17,11 +17,6 @@
+  *  along with this program. If not, see <http://www.gnu.org/licenses/>. *
+  *************************************************************************/
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#undef _GNU_SOURCE
+ #define _BSD_SOURCE 1
+ 
+ #include <string.h>
+diff --git a/src/trace-udp.c b/src/trace-udp.c
+index 821c24c..1754338 100644
+--- a/src/trace-udp.c
++++ b/src/trace-udp.c
+@@ -17,11 +17,6 @@
+  *  along with this program. If not, see <http://www.gnu.org/licenses/>. *
+  *************************************************************************/
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#undef _GNU_SOURCE
+ #define _BSD_SOURCE 1
+ 
+ #include <string.h>
+-- 
+1.7.10
+
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
new file mode 100644
index 0000000000..8451e06a4f
--- /dev/null
+++ b/package/ndisc6/ndisc6.mk
@@ -0,0 +1,37 @@
+#############################################################
+#
+# ndisc6
+#
+#############################################################
+
+NDISC6_VERSION = 1.0.2
+NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
+NDISC6_SITE = http://www.remlab.net/files/ndisc6/
+NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
+NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
+
+NDISC6_BIN_ += dnssort # perl script
+NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name
+NDISC6_BIN_$(BR2_PACKAGE_NDISC6_TCPSPRAY) += tcpspray tcpspray6
+
+NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_NDISC6) += ndisc6
+NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RDISC6) += rdisc6
+NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RDNSSD) += rdnssd
+NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RLTRACEROUTE6) += rltraceroute6 tracert6
+NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_TCPTRACEROUTE6) += tcptraceroute6
+
+NDISC6_MAN1_ = $(addsuffix .1,$(NDISC6_BIN_))
+NDISC6_MAN8_ = $(addsuffix .8,$(NDISC6_SBIN_))
+
+define NDISC6_REMOVE_UNNEEDED
+	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/,$(NDISC6_BIN_)) \
+	       $(addprefix $(TARGET_DIR)/usr/sbin/,$(NDISC6_SBIN_)) \
+	       $(addprefix $(TARGET_DIR)/usr/share/man/man1/,$(NDISC6_MAN1_)) \
+	       $(addprefix $(TARGET_DIR)/usr/share/man/man8/,$(NDISC6_MAN8_))
+	$(if $(BR2_PACKAGE_NDISC6_RDNSSD),,\
+		rm -rf $(TARGET_DIR)/etc/rdnssd $(TARGET_DIR)/var/run/rdnssd)
+endef
+
+NDISC6_POST_INSTALL_TARGET_HOOKS += NDISC6_REMOVE_UNNEEDED
+
+$(eval $(call AUTOTARGETS))

From b59f9e1562395411d10b8137ffd69e0ab573c6e2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Apr 2012 00:15:23 +0000
Subject: [PATCH 1845/6849] busybox: add new 1.20.0, remove deprecated, mark
 1.18.x deprecated

Add version 1.20.0, remove deprecated 1.16.x & 1.17.x versions and mark
1.18.x as deprecated.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |  22 +-
 .../busybox-1.16.2/busybox-devmem.patch       |  76 --
 package/busybox/busybox-1.16.x.config         | 920 ------------------
 .../busybox-1.20.0/busybox-1.20.0-getty.patch |  17 +
 .../busybox-1.20.0-lineedit.patch             |  22 +
 .../busybox-1.20.0/busybox-1.20.0-sed.patch   |  29 +
 ...ox-1.17.x.config => busybox-1.20.x.config} | 206 ++--
 7 files changed, 208 insertions(+), 1084 deletions(-)
 delete mode 100644 package/busybox/busybox-1.16.2/busybox-devmem.patch
 delete mode 100644 package/busybox/busybox-1.16.x.config
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch
 rename package/busybox/{busybox-1.17.x.config => busybox-1.20.x.config} (92%)

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index c206509649..b5770eb2a8 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -13,24 +13,20 @@ if BR2_PACKAGE_BUSYBOX
 
 choice
 	prompt "BusyBox Version"
-	default BR2_BUSYBOX_VERSION_1_19_X
+	default BR2_BUSYBOX_VERSION_1_20_X
 	help
 	  Select the version of BusyBox you wish to use.
 
-	config BR2_BUSYBOX_VERSION_1_16_X
-		bool "BusyBox 1.16.x"
-		depends on BR2_DEPRECATED
-
-	config BR2_BUSYBOX_VERSION_1_17_X
-		bool "BusyBox 1.17.x"
-		depends on BR2_DEPRECATED
-
 	config BR2_BUSYBOX_VERSION_1_18_X
 		bool "BusyBox 1.18.x"
+		depends on BR2_DEPRECATED
 
 	config BR2_BUSYBOX_VERSION_1_19_X
 		bool "BusyBox 1.19.x"
 
+	config BR2_BUSYBOX_VERSION_1_20_X
+		bool "BusyBox 1.20.x"
+
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
 
@@ -38,18 +34,16 @@ endchoice
 
 config BR2_BUSYBOX_VERSION
 	string
-	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
-	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
 	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
+	default "1.20.0"	if BR2_BUSYBOX_VERSION_1_20_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
-	default "package/busybox/busybox-1.19.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X
-	default "package/busybox/busybox-1.17.x.config" if BR2_BUSYBOX_VERSION_1_17_X
+	default "package/busybox/busybox-1.20.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
 	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
+	default "package/busybox/busybox-1.20.x.config" if BR2_BUSYBOX_VERSION_1_20_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.
diff --git a/package/busybox/busybox-1.16.2/busybox-devmem.patch b/package/busybox/busybox-1.16.2/busybox-devmem.patch
deleted file mode 100644
index f7d1d1df70..0000000000
--- a/package/busybox/busybox-1.16.2/busybox-devmem.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 351ef7188a1a2e2f154bbda6f703c2d3f4af6d79 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Wed, 14 Apr 2010 13:37:25 -0700
-Subject: [PATCH] devmem: map two pages only if it is necessary
-
-function                                             old     new   delta
-devmem_main                                          463     469      +6
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- miscutils/devmem.c |   21 ++++++++++++++-------
- 1 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/miscutils/devmem.c b/miscutils/devmem.c
-index e13dedc..39b5808 100644
---- a/miscutils/devmem.c
-+++ b/miscutils/devmem.c
-@@ -13,9 +13,9 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
- 	uint64_t read_result;
- 	uint64_t writeval = writeval; /* for compiler */
- 	off_t target;
--	unsigned page_size = getpagesize();
-+	unsigned page_size, mapped_size, offset_in_page;
- 	int fd;
--	int width = 8 * sizeof(int);
-+	unsigned width = 8 * sizeof(int);
- 
- 	/* devmem ADDRESS [WIDTH [VALUE]] */
- // TODO: options?
-@@ -50,15 +50,22 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
- 		if (argv[3])
- 			writeval = bb_strtoull(argv[3], NULL, 0);
- 	} else { /* argv[2] == NULL */
--		/* make argv[3] to be a valid thing to use */
-+		/* make argv[3] to be a valid thing to fetch */
- 		argv--;
- 	}
- 	if (errno)
--		bb_show_usage(); /* bb_strtouXX failed */
-+		bb_show_usage(); /* one of bb_strtouXX failed */
- 
- 	fd = xopen("/dev/mem", argv[3] ? (O_RDWR | O_SYNC) : (O_RDONLY | O_SYNC));
-+	mapped_size = page_size = getpagesize();
-+	offset_in_page = (unsigned)target & (page_size - 1);
-+	if (offset_in_page + width > page_size) {
-+		/* This access spans pages.
-+		 * Must map two pages to make it possible: */
-+		mapped_size *= 2;
-+	}
- 	map_base = mmap(NULL,
--			page_size * 2 /* in case value spans page */,
-+			mapped_size,
- 			argv[3] ? (PROT_READ | PROT_WRITE) : PROT_READ,
- 			MAP_SHARED,
- 			fd,
-@@ -68,7 +75,7 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
- 
- //	printf("Memory mapped at address %p.\n", map_base);
- 
--	virt_addr = (char*)map_base + (target & (page_size - 1));
-+	virt_addr = (char*)map_base + offset_in_page;
- 
- 	if (!argv[3]) {
- 		switch (width) {
-@@ -119,7 +126,7 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
- 	}
- 
- 	if (ENABLE_FEATURE_CLEAN_UP) {
--		if (munmap(map_base, page_size * 2) == -1)
-+		if (munmap(map_base, mapped_size) == -1)
- 			bb_perror_msg_and_die("munmap");
- 		close(fd);
- 	}
--- 
-1.7.1
-
diff --git a/package/busybox/busybox-1.16.x.config b/package/busybox/busybox-1.16.x.config
deleted file mode 100644
index 24a27bfb99..0000000000
--- a/package/busybox/busybox-1.16.x.config
+++ /dev/null
@@ -1,920 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.16.0
-# Sun Jan 31 20:49:46 2010
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_DESKTOP=y
-# CONFIG_EXTRA_COMPAT is not set
-CONFIG_INCLUDE_SUSv2=y
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-CONFIG_FEATURE_CLEAN_UP=y
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-# CONFIG_LFS is not set
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_VI=y
-CONFIG_FEATURE_EDITING_HISTORY=999
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_BZIP2 is not set
-CONFIG_CPIO=y
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-CONFIG_FEATURE_TAR_FROM=y
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNLZMA=y
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_FEATURE_DATE_COMPAT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-CONFIG_FOLD=y
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LENGTH=y
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-# CONFIG_FEATURE_FLOAT_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-# CONFIG_STAT is not set
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-# CONFIG_TAC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-# CONFIG_KBD_MODE is not set
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
-CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-CONFIG_SETKEYCODES=y
-CONFIG_SETLOGCONS=y
-# CONFIG_SHOWKEY is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_PIPE_PROGRESS=y
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_ED is not set
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-# CONFIG_FEATURE_FIND_DELETE is not set
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_KILL_REMOVED=y
-CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_MESG=y
-
-#
-# Login/Password Management Utilities
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
-CONFIG_ADDGROUP=y
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-CONFIG_DELGROUP=y
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_ADDUSER=y
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-CONFIG_FDFLUSH=y
-CONFIG_FDFORMAT=y
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-CONFIG_LSPCI=y
-CONFIG_LSUSB=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_RENAME=y
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-CONFIG_FEATURE_MDEV_EXEC=y
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-CONFIG_READPROFILE=y
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-CONFIG_SETARCH=y
-CONFIG_SWAPONOFF=y
-# CONFIG_FEATURE_SWAPON_PRI is not set
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-CONFIG_CHRT=y
-CONFIG_CROND=y
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-CONFIG_DEVMEM=y
-CONFIG_EJECT=y
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-CONFIG_LAST=y
-CONFIG_FEATURE_LAST_SMALL=y
-# CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-CONFIG_FEATURE_LESS_REGEXP=y
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-CONFIG_RUNLEVEL=y
-# CONFIG_RX is not set
-CONFIG_SETSID=y
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-CONFIG_ARPING=y
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-CONFIG_DNSD=y
-CONFIG_ETHER_WAKE=y
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-CONFIG_FEATURE_IFUPDOWN_IP=y
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-CONFIG_INETD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NAMEIF=y
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
-CONFIG_NETSTAT=y
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
-# CONFIG_FEATURE_NETSTAT_PRG is not set
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_PING=y
-# CONFIG_PING6 is not set
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-CONFIG_DHCPD_LEASES_FILE=""
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-# CONFIG_ZCIP is not set
-# CONFIG_TCPSVD is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDPSVD is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=y
-# CONFIG_NMETER is not set
-# CONFIG_PGREP is not set
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_UPTIME=y
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-# CONFIG_ASH_GETOPTS is not set
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_CTTYHACK is not set
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch
new file mode 100644
index 0000000000..ed52159ffe
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch
@@ -0,0 +1,17 @@
+--- busybox-1.20.0/loginutils/getty.c
++++ busybox-1.20.0-getty/loginutils/getty.c
+@@ -561,8 +561,14 @@ int getty_main(int argc UNUSED_PARAM, ch
+ 		 */
+ 		fd = open("/dev/tty", O_RDWR | O_NONBLOCK);
+ 		if (fd >= 0) {
++			/* TIOCNOTTY sends SIGHUP to the foreground
++			 * process group - which may include us!
++			 * Make sure to not die on it:
++			 */
++			sighandler_t old = signal(SIGHUP, SIG_IGN);
+ 			ioctl(fd, TIOCNOTTY);
+ 			close(fd);
++			signal(SIGHUP, old);
+ 		}
+ 	}
+ 
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch
new file mode 100644
index 0000000000..ee236ffc89
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch
@@ -0,0 +1,22 @@
+--- busybox-1.20.0/libbb/lineedit.c
++++ busybox-1.20.0-lineedit/libbb/lineedit.c
+@@ -1352,8 +1352,7 @@ static void load_history(line_input_t *s
+ 		/* fill temp_h[], retaining only last MAX_HISTORY lines */
+ 		memset(temp_h, 0, sizeof(temp_h));
+ 		idx = 0;
+-		if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
+-			st_parm->cnt_history_in_file = 0;
++		st_parm->cnt_history_in_file = 0;
+ 		while ((line = xmalloc_fgetline(fp)) != NULL) {
+ 			if (line[0] == '\0') {
+ 				free(line);
+@@ -1361,8 +1360,7 @@ static void load_history(line_input_t *s
+ 			}
+ 			free(temp_h[idx]);
+ 			temp_h[idx] = line;
+-			if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
+-				st_parm->cnt_history_in_file++;
++			st_parm->cnt_history_in_file++;
+ 			idx++;
+ 			if (idx == st_parm->max_history)
+ 				idx = 0;
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch
new file mode 100644
index 0000000000..70dc63f467
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch
@@ -0,0 +1,29 @@
+--- busybox-1.20.0/editors/sed.c
++++ busybox-1.20.0-sed/editors/sed.c
+@@ -743,7 +743,7 @@ static int do_subst_command(sed_cmd_t *s
+ 		 */
+ 		if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) {
+ 			pipe_putc(*line++);
+-			continue;
++			goto next;
+ 		}
+ 
+ 		match_count++;
+@@ -755,7 +755,7 @@ static int do_subst_command(sed_cmd_t *s
+ 		) {
+ 			for (i = 0; i < G.regmatch[0].rm_eo; i++)
+ 				pipe_putc(*line++);
+-			continue;
++			goto next;
+ 		}
+ 
+ 		/* print everything before the match */
+@@ -773,7 +773,7 @@ static int do_subst_command(sed_cmd_t *s
+ 		/* if we're not doing this globally, get out now */
+ 		if (sed_cmd->which_match != 0)
+ 			break;
+-
++ next:
+ 		if (*line == '\0')
+ 			break;
+ 
diff --git a/package/busybox/busybox-1.17.x.config b/package/busybox/busybox-1.20.x.config
similarity index 92%
rename from package/busybox/busybox-1.17.x.config
rename to package/busybox/busybox-1.20.x.config
index edf9c6dbde..55254343f0 100644
--- a/package/busybox/busybox-1.17.x.config
+++ b/package/busybox/busybox-1.20.x.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.17.0
-# Tue Jul  6 10:53:37 2010
+# Busybox version: 1.20.0
+# Sun Apr 22 10:09:56 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -16,6 +16,7 @@ CONFIG_DESKTOP=y
 # CONFIG_EXTRA_COMPAT is not set
 CONFIG_INCLUDE_SUSv2=y
 # CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -23,6 +24,7 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
 CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
 # CONFIG_LOCALE_SUPPORT is not set
 # CONFIG_UNICODE_SUPPORT is not set
 # CONFIG_UNICODE_USING_LOCALE is not set
@@ -60,7 +62,10 @@ CONFIG_FEATURE_SYSLOG=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 # CONFIG_LFS is not set
 CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
@@ -73,9 +78,8 @@ CONFIG_NO_DEBUG_LIB=y
 # CONFIG_EFENCE is not set
 
 #
-# Installation Options
+# Installation Options ("make install" behavior)
 #
-# CONFIG_INSTALL_NO_USR is not set
 CONFIG_INSTALL_APPLET_SYMLINKS=y
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
 # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
@@ -88,15 +92,20 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
+# CONFIG_FEATURE_SYSTEMD is not set
+CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
 CONFIG_FEATURE_EDITING_HISTORY=999
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
+CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -104,6 +113,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
 CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_FEATURE_HWIB=y
@@ -134,6 +144,7 @@ CONFIG_CPIO=y
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
 # CONFIG_LZOP is not set
 # CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM2CPIO is not set
@@ -167,11 +178,19 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+# CONFIG_GROUPS is not set
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
+# CONFIG_BASE64 is not set
+CONFIG_WHO=y
+# CONFIG_USERS is not set
 # CONFIG_CAL is not set
 CONFIG_CATV=y
 CONFIG_CHGRP=y
@@ -208,11 +227,8 @@ CONFIG_FOLD=y
 # CONFIG_FSYNC is not set
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
 CONFIG_INSTALL=y
 CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LENGTH=y
 CONFIG_LN=y
 CONFIG_LOGNAME=y
 CONFIG_LS=y
@@ -264,7 +280,6 @@ CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
 CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TOUCH=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
@@ -276,7 +291,6 @@ CONFIG_UUDECODE=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 # CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHO=y
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
@@ -346,21 +360,14 @@ CONFIG_WHICH=y
 #
 # Editors
 #
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_ED is not set
 CONFIG_PATCH=y
-CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -369,6 +376,14 @@ CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_SED=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -413,6 +428,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 # CONFIG_BOOTCHARTD is not set
 # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_KILL_REMOVED=y
@@ -422,32 +440,34 @@ CONFIG_FEATURE_INIT_SYSLOG=y
 CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 
 #
 # Login/Password Management Utilities
 #
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
 CONFIG_FEATURE_SHADOWPASSWDS=y
 # CONFIG_USE_BB_PWD_GRP is not set
 # CONFIG_USE_BB_SHADOW is not set
 CONFIG_USE_BB_CRYPT=y
 # CONFIG_USE_BB_CRYPT_SHA is not set
-CONFIG_ADDGROUP=y
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-CONFIG_DELGROUP=y
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
 CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
 CONFIG_GETTY=y
 CONFIG_LOGIN=y
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 CONFIG_FEATURE_NOLOGIN=y
@@ -456,6 +476,7 @@ CONFIG_PASSWD=y
 CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
 # CONFIG_CRYPTPW is not set
 # CONFIG_CHPASSWD is not set
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
 CONFIG_SU=y
 CONFIG_FEATURE_SU_SYSLOG=y
 CONFIG_FEATURE_SU_CHECKS_SHELLS=y
@@ -504,10 +525,18 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 #
 # Linux System Utilities
 #
+# CONFIG_BLOCKDEV is not set
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 # CONFIG_REV is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
+CONFIG_BLKID=y
+# CONFIG_FEATURE_BLKID_TYPE is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FBSET is not set
@@ -522,6 +551,7 @@ CONFIG_FDFORMAT=y
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
 # CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FINDFS is not set
 # CONFIG_FLOCK is not set
@@ -545,34 +575,9 @@ CONFIG_IPCS=y
 CONFIG_LOSETUP=y
 CONFIG_LSPCI=y
 CONFIG_LSUSB=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_RENAME=y
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-CONFIG_FEATURE_MDEV_EXEC=y
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_FAKE is not set
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set
@@ -602,15 +607,55 @@ CONFIG_FEATURE_UMOUNT_ALL=y
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 
 #
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BEEP is not set
 CONFIG_FEATURE_BEEP_FREQ=0
 CONFIG_FEATURE_BEEP_LENGTH_MS=0
@@ -648,15 +693,6 @@ CONFIG_EJECT=y
 CONFIG_LAST=y
 CONFIG_FEATURE_LAST_SMALL=y
 # CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-CONFIG_FEATURE_LESS_REGEXP=y
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -690,10 +726,17 @@ CONFIG_WATCHDOG=y
 #
 # Networking Utilities
 #
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
 # CONFIG_NC is not set
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
 # CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
@@ -725,6 +768,7 @@ CONFIG_HOSTNAME=y
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -765,17 +809,12 @@ CONFIG_IPRULE=y
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NAMEIF=y
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NETSTAT=y
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_FEATURE_NETSTAT_PRG is not set
 CONFIG_NSLOOKUP=y
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_PING=y
-# CONFIG_PING6 is not set
-CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
@@ -804,16 +843,19 @@ CONFIG_TRACEROUTE=y
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
 # CONFIG_TUNCTL is not set
 # CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPC6 is not set
 # CONFIG_UDHCPD is not set
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 CONFIG_DHCPD_LEASES_FILE=""
 CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
@@ -823,6 +865,7 @@ CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
 
 #
@@ -846,20 +889,30 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # Process Utilities
 #
+# CONFIG_IOSTAT is not set
+CONFIG_LSOF=y
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 CONFIG_KILLALL5=y
-# CONFIG_NMETER is not set
 # CONFIG_PGREP is not set
 CONFIG_PIDOF=y
 CONFIG_FEATURE_PIDOF_SINGLE=y
 CONFIG_FEATURE_PIDOF_OMIT=y
 # CONFIG_PKILL is not set
 CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_LONG is not set
 # CONFIG_FEATURE_PS_TIME is not set
 # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
@@ -873,7 +926,6 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
 # CONFIG_FEATURE_TOP_SMP_PROCESS is not set
 # CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_UPTIME=y
 CONFIG_WATCH=y
 
 #
@@ -911,6 +963,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 CONFIG_ASH=y
 CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ALIAS=y
 # CONFIG_ASH_GETOPTS is not set
@@ -922,10 +975,13 @@ CONFIG_ASH_CMDCMD=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
@@ -933,22 +989,22 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_CASE is not set
 # CONFIG_HUSH_FUNCTIONS is not set
 # CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
 # CONFIG_FEATURE_BASH_IS_ASH is not set
 # CONFIG_FEATURE_BASH_IS_HUSH is not set
 CONFIG_FEATURE_BASH_IS_NONE=y
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
 CONFIG_SH_MATH_SUPPORT=y
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_CTTYHACK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
 
 #
 # System Logging Utilities
@@ -957,10 +1013,12 @@ CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
 CONFIG_LOGGER=y

From d7616cc9be8b1c7d91df9133dac24a59bb2e19c8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Apr 2012 00:15:24 +0000
Subject: [PATCH 1846/6849] lsof: add busybox tweaks

Since busybox 1.20+ includes a lsof applet make sure lsof gets built
after busybox so that we get the full-blown version if both are enabled.
Also hide the lsof package unless BUSYBOX_SHOW_OTHERS is true.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in    | 2 ++
 package/lsof/lsof.mk | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/package/Config.in b/package/Config.in
index a3101467f6..34570beb1c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -24,7 +24,9 @@ source "package/dmalloc/Config.in"
 source "package/kexec/Config.in"
 source "package/latencytop/Config.in"
 source "package/lmbench/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lsof/Config.in"
+endif
 source "package/ltp-testsuite/Config.in"
 source "package/lttng-babeltrace/Config.in"
 source "package/lttng-modules/Config.in"
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index c07fb2da36..7bc22c01d9 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -8,6 +8,9 @@ LSOF_VERSION = 4.85
 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
 LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
+# Make certain full-blown lsof gets built after the busybox version (1.20+)
+LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+
 BR2_LSOF_CFLAGS =
 ifeq ($(BR2_LARGEFILE),)
 BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS

From 7a1e6efafef5db2ab1cfc151c4f38b37be7c540c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Apr 2012 00:25:35 +0000
Subject: [PATCH 1847/6849] linux: bump default to kernel version 3.3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 5a2d28724c..945059de39 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3.1"
+	bool "3.3.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.1" if BR2_LINUX_KERNEL_3_3
+	default "3.3.3" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From d459e0d216546dc043a9b876938bacdcdc75fdcc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Apr 2012 14:25:03 +0000
Subject: [PATCH 1848/6849] gdb: bump 7.4.x series to 7.4.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 980666b0d5..c9c54b88fd 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -103,4 +103,4 @@ config BR2_GDB_VERSION
 	default "7.1a"     if BR2_GDB_VERSION_7_1
 	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
-	default "7.4"      if BR2_GDB_VERSION_7_4
+	default "7.4.1"    if BR2_GDB_VERSION_7_4

From 70a7a6b76d3dee585db13435d5d3e0b2d2cc5d37 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Apr 2012 14:26:33 +0000
Subject: [PATCH 1849/6849] quagga: security bump to version 0.9.20.1

Bump to version 0.9.20.1 to fix CVE-2012-0249, CVE-2012-0250 and
CVE-2012-0255.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/quagga.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index bcc3f46120..1073852837 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-QUAGGA_VERSION = 0.99.20
+QUAGGA_VERSION = 0.99.20.1
 QUAGGA_SITE = http://www.quagga.net/download
-
 QUAGGA_DEPENDENCIES = host-gawk
 QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink
 

From 895bb588318962b1a3124110ac9fffab9b4348cb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Apr 2012 00:30:31 +0000
Subject: [PATCH 1850/6849] openssh: bump to version 6.0p1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 08bb499bb7..2b93def472 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSH_VERSION = 5.9p1
+OPENSSH_VERSION = 6.0p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \

From 0b385d88689e8089df528a621b92851fb6dead27 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Apr 2012 00:30:32 +0000
Subject: [PATCH 1851/6849] libnl: bump to version 3.2.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 661d7f2e86..40aaf388ef 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.7
+LIBNL_VERSION = 3.2.8
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison

From 8952fad3ee43dc16f00fc3b5b3584139cbd30385 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Apr 2012 05:05:08 +0000
Subject: [PATCH 1852/6849] uboot-tools: bump to version 2012.04.01

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uboot-tools-2011.03-drop-configh.patch    | 27 -------------------
 ...-2012.04.01-hostcflags-override-fix.patch} |  0
 package/uboot-tools/uboot-tools.mk            |  2 +-
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
 rename package/uboot-tools/{uboot-tools-2011.03-hostcflags-override-fix.patch => uboot-tools-2012.04.01-hostcflags-override-fix.patch} (100%)

diff --git a/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
deleted file mode 100644
index bf524c9a38..0000000000
--- a/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-"make tools-all" should allow building tools such as mkimage and the new
-imximage without any config, but imximage.c currently fails to build
-with:
-imximage.h:27:20: error: config.h: No such file or directory
-
-config.h is not needed in imximage.h nor in imximage.c, and imximage.h
-is only included from imximage.c, so drop this include to fix the build.
-
-Signed-off-by: Lo?c Minier <loic.minier@linaro.org>
----
- tools/imximage.h |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/tools/imximage.h b/tools/imximage.h
-index 38ca6be..d126a46 100644
---- a/tools/imximage.h
-+++ b/tools/imximage.h
-@@ -24,8 +24,6 @@
- #ifndef _IMXIMAGE_H_
- #define _IMXIMAGE_H_
- 
--#include <config.h>
--
- #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
- #define MAX_HW_CFG_SIZE_V1 60  /* Max number of registers imx can set for v1 */
- #define APP_CODE_BARKER	0xB1
--- 1.7.2.3
diff --git a/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-2012.04.01-hostcflags-override-fix.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch
rename to package/uboot-tools/uboot-tools-2012.04.01-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 00592d6eb2..d757ade728 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -1,4 +1,4 @@
-UBOOT_TOOLS_VERSION = 2011.03
+UBOOT_TOOLS_VERSION = 2012.04.01
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 

From d8ff5d2990751d584d4e836b60527f97944d5ac3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Apr 2012 05:05:09 +0000
Subject: [PATCH 1853/6849] u-boot: bump to 2012.04.01 release

Bump from 2012.04 to 2012.04.01
Fixes a nasty bug in the command line processing.

[Peter: keep kconfig name]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in                                          | 4 ++--
 .../uboot-2012.04-change-kernel-address-in-dataflash.patch    | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename boot/uboot/{uboot-2012.04 => uboot-2012.04.01}/uboot-2012.04-change-kernel-address-in-dataflash.patch (100%)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 7c5f2c6b1b..99d5623a99 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -17,7 +17,7 @@ choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_2012_04
-	bool "2012.04"
+	bool "2012.04.01"
 
 config BR2_TARGET_UBOOT_2011_12
 	bool "2011.12"
@@ -50,7 +50,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2012.04"	if BR2_TARGET_UBOOT_2012_04
+	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
diff --git a/boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
similarity index 100%
rename from boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch
rename to boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch

From 11f6d7f82ef40f674386b1fcb2ae8d22f8a29956 Mon Sep 17 00:00:00 2001
From: Vanya Sergeev <vsergeev@gmail.com>
Date: Fri, 27 Apr 2012 10:13:45 +0000
Subject: [PATCH 1854/6849] ngrep: removed redundant --enable-ipv6

Option --enable-ipv6 now handled globally in autotargets configure.

Signed-off-by: Vanya Sergeev <vsergeev at gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ngrep/ngrep.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index e9c640a042..daf7c6fcf0 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -15,10 +15,6 @@ NGREP_CONF_OPT =  \
 	--with-pcre=$(STAGING_DIR)/usr \
 	--disable-dropprivs
 
-ifeq ($(BR2_INET_IPV6),y)
-NGREP_CONF_OPT += --enable-ipv6
-endif
-
 NGREP_DEPENDENCIES = libpcap pcre
 
 $(eval $(call AUTOTARGETS))

From 7d012ac9699cf8707a17d5b3576212ab17a2bf72 Mon Sep 17 00:00:00 2001
From: Qais Yousef <Qais.Yousef@imgtec.com>
Date: Tue, 24 Apr 2012 06:51:21 +0000
Subject: [PATCH 1855/6849] new package: bellagio

[Peter: needs C++, shouldn't force -Werror]
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |  1 +
 package/multimedia/bellagio/Config.in         | 18 +++++++++
 .../bellagio/bellagio-0.9.3-drop-werror.patch | 22 +++++++++++
 ...bellagio-0.9.3-dynamicloader-linking.patch | 16 ++++++++
 .../bellagio-0.9.3-parallel-build.patch       | 16 ++++++++
 ...3-segfault-on-removeFromWaitResource.patch | 37 +++++++++++++++++++
 package/multimedia/bellagio/bellagio.mk       | 12 ++++++
 7 files changed, 122 insertions(+)
 create mode 100644 package/multimedia/bellagio/Config.in
 create mode 100644 package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
 create mode 100644 package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
 create mode 100644 package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
 create mode 100644 package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
 create mode 100644 package/multimedia/bellagio/bellagio.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index effec38f53..ca6b791c72 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -3,6 +3,7 @@ source "package/multimedia/alsa-lib/Config.in"
 source "package/multimedia/alsa-utils/Config.in"
 source "package/multimedia/audiofile/Config.in"
 source "package/multimedia/aumix/Config.in"
+source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
 source "package/multimedia/ffmpeg/Config.in"
diff --git a/package/multimedia/bellagio/Config.in b/package/multimedia/bellagio/Config.in
new file mode 100644
index 0000000000..1458f63702
--- /dev/null
+++ b/package/multimedia/bellagio/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_BELLAGIO
+	bool "bellagio"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Bellagio is an opensource implementation of the
+	  OpenMAX IL API.
+
+	  OpenMAX Integration Layer (IL) is a standard API
+	  to access Multimedia Components on mobile platforms.
+	  It has been defined by the Khronos group.
+	  By means of the OpenMAX IL API, multimedia frameworks
+	  can access hardware accelerators on platforms that
+	  provide it.
+
+	  http://omxil.sourceforge.net/
+
+comment "bellagio requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch b/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
new file mode 100644
index 0000000000..39baf421bb
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
@@ -0,0 +1,22 @@
+[PATCH] don't force -Werror in CFLAGS
+
+Released software shouldn't get built with -Werror.
+
+Signed-of-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libomxil-bellagio-0.9.3/configure.ac
+===================================================================
+--- libomxil-bellagio-0.9.3.orig/configure.ac
++++ libomxil-bellagio-0.9.3/configure.ac
+@@ -5,7 +5,7 @@
+ AC_PREREQ([2.59])
+ 
+ AC_CONFIG_HEADERS([config.h])
+-CFLAGS="${CFLAGS} -Wall -Werror"
++CFLAGS="${CFLAGS} -Wall"
+ 
+ ################################################################################
+ # Set the shared versioning info, according to section 6.3 of the libtool info #
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch b/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
new file mode 100644
index 0000000000..5e4243d5e1
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
@@ -0,0 +1,16 @@
+When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved.
+Link explicitly against omxil-bellagio so that ld.so can find the reference.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old	2012-03-23 15:07:47.379021034 +0000
++++ bellagio-0.9.3/src/dynamic_loader/Makefile.am	2012-03-23 15:08:47.563034818 +0000
+@@ -3,7 +3,7 @@
+ omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
+ libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
+ 
+-libomxdynamicloader_la_LDFLAGS =
++libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(abs_top_srcdir)/src/.libs
+ libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
+ 			-I$(top_srcdir)/src \
+ 			-I$(top_srcdir)/src/base \
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch b/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
new file mode 100644
index 0000000000..767bbeb2aa
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
@@ -0,0 +1,16 @@
+Fix dependency issue to allow parallel build
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+Index: bellagio-0.9.3/src/Makefile.am
+===================================================================
+--- bellagio-0.9.3.orig/src/Makefile.am
++++ bellagio-0.9.3/src/Makefile.am
+@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist
+ omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
+ 			      -I$(top_srcdir)/include
+ omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
++omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la
+ 
+ lib_LTLIBRARIES = libomxil-bellagio.la
+ libomxil_bellagio_la_SOURCES = component_loader.h \
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch b/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
new file mode 100644
index 0000000000..f52a2c33f4
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
@@ -0,0 +1,37 @@
+We always access globalComponentList[] at indexComponent=-1 which causes a
+segfault. Use i as the index instead.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old	2012-03-13 10:15:25.743940980 +0000
++++ bellagio-0.9.3/src/omx_reference_resource_manager.c	2012-03-13 10:18:02.201971009 +0000
+@@ -485,7 +485,6 @@
+ OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) {
+ 	omx_base_component_PrivateType* omx_base_component_Private;
+ 	int i = 0;
+-	int indexComponent = -1;
+ 
+ 	DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__);
+ 	omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate;
+@@ -493,16 +492,13 @@
+ 	while(listOfcomponentRegistered[i].component_name != NULL ) {
+ 		if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) {
+ 			// found component in the list of the resource manager
+-			removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp);
+-			break;
++			removeElemFromList(&globalComponentList[i], openmaxStandComp);
++			DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
++			return OMX_ErrorNone;
+ 		}
+ 		i++;
+ 	}
+-	if (indexComponent <0) {
+-		// No resource to be handled
+-		DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
+-		return OMX_ErrorNone;
+-	}
+-	DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
++	// No resource to be handled
++	DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
+ 	return OMX_ErrorNone;
+ }
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
new file mode 100644
index 0000000000..d013953264
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# bellagio
+#
+#############################################################
+BELLAGIO_VERSION = 0.9.3
+BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
+BELLAGIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/omxil
+BELLAGIO_AUTORECONF = YES
+BELLAGIO_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From 308e476a73771daee0dfb38ae1c918341a0d8955 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 29 Apr 2012 17:06:10 +0200
Subject: [PATCH 1856/6849] busybox: 1.20.0 buildsys fix

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.20.0/busybox-1.20.0-buildsys.patch      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch

diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
new file mode 100644
index 0000000000..b9d2a5e835
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
@@ -0,0 +1,11 @@
+--- busybox-1.20.0/archival/libarchive/Kbuild.src
++++ busybox-1.20.0-buildsys/archival/libarchive/Kbuild.src
+@@ -60,7 +60,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_GZ)
+ lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
+ lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
+ lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
+-lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += decompress_bunzip2.o
++lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
+ lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
+ lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
+ 

From 2e7ffd6c849f0aab66fc886a84576aaa31b5a9bc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 29 Apr 2012 02:34:00 +0000
Subject: [PATCH 1857/6849] kernel-headers: bump 3.{0, 3}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ...-3.3.3-fix-umode_t.patch => linux-3.3.4-fix-umode_t.patch} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3.3-fix-umode_t.patch => linux-3.3.4-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 05227cfe28..aeeebeff52 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.29"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.30"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.16"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.3"		if BR2_KERNEL_HEADERS_3_3
+	default "3.3.4"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.29-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.3-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch

From 35ee09611d91bc2a73d1de059e9af55d90ba2ffa Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 29 Apr 2012 02:34:01 +0000
Subject: [PATCH 1858/6849] linux: bump default to kernel version 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 945059de39..59ba6d3ff2 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3.3"
+	bool "3.3.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.3" if BR2_LINUX_KERNEL_3_3
+	default "3.3.4" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 40c20cd40e74c97c8995dbf2ca0d6570b46d9261 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 29 Apr 2012 03:03:51 +0000
Subject: [PATCH 1859/6849] busybox 1.20.x: add if-post-up.d and if-pre-down.d
 to device table

Busybox 1.20.0 add functionality to execute scripts from if-post-up.d
and if-pre-down.d, so add the missing directories to the device table to
get them created and avoid unnecessary warnings if not.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/generic/device_table.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt
index d3e394ba99..fc397a90c9 100644
--- a/target/generic/device_table.txt
+++ b/target/generic/device_table.txt
@@ -14,7 +14,9 @@
 /etc/passwd				f	644	0	0	-	-	-	-	-
 /etc/network/if-up.d			d	755	0	0	-	-	-	-	-
 /etc/network/if-pre-up.d		d	755	0	0	-	-	-	-	-
+/etc/network/if-post-up.d		d	755	0	0	-	-	-	-	-
 /etc/network/if-down.d			d	755	0	0	-	-	-	-	-
+/etc/network/if-pre-down.d		d	755	0	0	-	-	-	-	-
 /etc/network/if-post-down.d		d	755	0	0	-	-	-	-	-
 # uncomment this to allow starting x as non-root
 #/usr/X11R6/bin/Xfbdev		     	f	4755	0	0	-	-	-	-	-

From 7ee5f4483952ccf1625af56a97c38f5b856d5a8c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 05:46:56 +0000
Subject: [PATCH 1860/6849] heirloom-mailx: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/heirloom-mailx/Config.in         | 13 +++++++++++
 package/heirloom-mailx/heirloom-mailx.mk | 28 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 package/heirloom-mailx/Config.in
 create mode 100644 package/heirloom-mailx/heirloom-mailx.mk

diff --git a/package/Config.in b/package/Config.in
index 34570beb1c..7d145c3103 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -460,6 +460,7 @@ source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
+source "package/heirloom-mailx/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hiawatha/Config.in"
 endif
diff --git a/package/heirloom-mailx/Config.in b/package/heirloom-mailx/Config.in
new file mode 100644
index 0000000000..9a871d4f6a
--- /dev/null
+++ b/package/heirloom-mailx/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_HEIRLOOM_MAILX
+	bool "heirloom-mailx"
+	help
+	  Heirloom mailx (previously known as nail) is a mail user
+	  agent for Unix systems.
+
+	  It can be used as a command-line mail reader, but also more
+	  importantly on embedded systems, as a mail composition
+	  program and SMTP client, in order to send e-mail from shell
+	  scripts. It supports SMTP authentication (login, plain,
+	  cram-md5), SMTPS, MIME encoding of attachements, and more.
+
+	  http://heirloom.sourceforge.net/mailx.html
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
new file mode 100644
index 0000000000..2b28a3fc40
--- /dev/null
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# heirloom-mailx
+#
+#############################################################
+
+HEIRLOOM_MAILX_VERSION = 12.5
+HEIRLOOM_MAILX_SOURCE  = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
+HEIRLOOM_MAILX_SITE    = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx/
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+HEIRLOOM_MAILX_DEPENDENCIES += openssl
+endif
+
+define HEIRLOOM_MAILX_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define HEIRLOOM_MAILX_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		PREFIX=/usr \
+		UCBINSTALL=$(INSTALL) \
+		STRIP=/bin/true \
+		DESTDIR=$(TARGET_DIR) \
+		install
+endef
+
+$(eval $(call GENTARGETS))

From 72713672cca968c37617512af0cc50f2b4114292 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Apr 2012 05:46:57 +0000
Subject: [PATCH 1861/6849] msmtp: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/msmtp/Config.in | 10 ++++++++++
 package/msmtp/msmtp.mk  | 28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/msmtp/Config.in
 create mode 100644 package/msmtp/msmtp.mk

diff --git a/package/Config.in b/package/Config.in
index 7d145c3103..4dcae531ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -483,6 +483,7 @@ source "package/links/Config.in"
 source "package/lrzsz/Config.in"
 source "package/mii-diag/Config.in"
 source "package/mrouted/Config.in"
+source "package/msmtp/Config.in"
 source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
diff --git a/package/msmtp/Config.in b/package/msmtp/Config.in
new file mode 100644
index 0000000000..385ad90d20
--- /dev/null
+++ b/package/msmtp/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_MSMTP
+	bool "msmtp"
+	help
+	  msmtp is an SMTP client. In the default mode, it transmits a
+	  mail to an SMTP server (for example at a free mail provider)
+	  which takes care of further delivery.
+
+	  Note that msmtp is licensed under GPLv3.
+
+	  http://msmtp.sourceforge.net/
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
new file mode 100644
index 0000000000..2c712293d3
--- /dev/null
+++ b/package/msmtp/msmtp.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# msmtp
+#
+#############################################################
+
+MSMTP_VERSION = 1.4.27
+MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
+MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
+
+MSMTP_DEPENDENCIES += host-pkg-config
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MSMTP_CONF_OPT += --with-ssl=openssl
+MSMTP_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+MSMTP_CONF_OPT += --with-ssl=gnutls
+MSMTP_DEPENDENCIES += gnutls
+else
+MSMTP_CONF_OPT += --with-ssl=no
+endif
+
+MSMTP_CONF_OPT += \
+	--without-libidn \
+	--without-libgsasl \
+	--without-gnome-keyring
+
+$(eval $(call AUTOTARGETS))

From 9e3dac50454f17f8d1890dc7f2c7fcefbd929416 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 23 Apr 2012 11:45:08 +0000
Subject: [PATCH 1862/6849] external-toolchain: do not copy shared libraries
 when BR2_PREFER_STATIC_LIB=y

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 0a997a5931..a45603a43f 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -372,13 +372,15 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
-	echo "Copy external toolchain libraries to target..." ; \
-	for libs in $(LIB_EXTERNAL_LIBS); do \
-		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
-	done ; \
-	for libs in $(USR_LIB_EXTERNAL_LIBS); do \
-		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
-	done ; \
+	if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
+		echo "Copy external toolchain libraries to target..." ; \
+		for libs in $(LIB_EXTERNAL_LIBS); do \
+			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
+		done ; \
+		for libs in $(USR_LIB_EXTERNAL_LIBS); do \
+			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
+		done ; \
+	fi ; \
 	echo "Copy external toolchain sysroot to staging..." ; \
 	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR}) ; \
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \

From c34d753008aa174e700413eeaf070ff382efe02b Mon Sep 17 00:00:00 2001
From: Rico Bachmann <bachmann@tofwerk.com>
Date: Fri, 14 Oct 2011 11:16:34 +0200
Subject: [PATCH 1863/6849] package: add libfcgi fast cgi library.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libfcgi/Config.in  |  6 ++++++
 package/libfcgi/libfcgi.mk | 12 ++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/libfcgi/Config.in
 create mode 100644 package/libfcgi/libfcgi.mk

diff --git a/package/Config.in b/package/Config.in
index 4dcae531ea..2ea334a94e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -359,6 +359,7 @@ source "package/libcurl/Config.in"
 source "package/libdnet/Config.in"
 source "package/libesmtp/Config.in"
 source "package/libeXosip2/Config.in"
+source "package/libfcgi/Config.in"
 source "package/libidn/Config.in"
 source "package/liboauth/Config.in"
 source "package/libmicrohttpd/Config.in"
diff --git a/package/libfcgi/Config.in b/package/libfcgi/Config.in
new file mode 100644
index 0000000000..a622ec365f
--- /dev/null
+++ b/package/libfcgi/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBFCGI
+	bool "libfcgi"
+	help
+	  FCGI, a fastcgi developer library for C/C++
+
+	  http://www.fastcgi.com/
diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk
new file mode 100644
index 0000000000..46251655da
--- /dev/null
+++ b/package/libfcgi/libfcgi.mk
@@ -0,0 +1,12 @@
+##############################################################################
+#
+# libfcgi
+#
+##############################################################################
+LIBFCGI_VERSION = 2.4.0
+LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
+LIBFCGI_SITE = http://www.fastcgi.com/dist
+LIBFCGI_INSTALL_STAGING = YES
+LIBFCGI_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -lm"
+
+$(eval $(call AUTOTARGETS))

From 0242ae4c6b7d1daf85a5f0c191394b0a15f95c54 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Apr 2012 01:35:11 +0000
Subject: [PATCH 1864/6849] qemu/ppc-g3beige: target 750 rather than 440fp

Target a powerpc 750 rather than the incorrect 440fp to avoid issues and
for correctness.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_ppc_g3beige_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index a20d3e433f..8f36446a94 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -1,6 +1,6 @@
 # Architecture
 BR2_powerpc=y
-BR2_powerpc_440fp=y
+BR2_powerpc_750=y
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y

From bd9eba9ce307d0a634737dede8d9b18d981f2f69 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Thu, 26 Apr 2012 09:41:47 +0200
Subject: [PATCH 1865/6849] Add Netatalk

This patch add the Netatalk package to Buildroot.

[Peter: fix download URL, force c99 mode, tweak help text]
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/netatalk/Config.in   | 11 +++++++++
 package/netatalk/S50netatalk | 43 ++++++++++++++++++++++++++++++++++++
 package/netatalk/netatalk.mk | 36 ++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 package/netatalk/Config.in
 create mode 100755 package/netatalk/S50netatalk
 create mode 100644 package/netatalk/netatalk.mk

diff --git a/package/Config.in b/package/Config.in
index 2ea334a94e..ed66c0586a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -494,6 +494,7 @@ source "package/netcat/Config.in"
 source "package/netkitbase/Config.in"
 source "package/netkittelnet/Config.in"
 endif
+source "package/netatalk/Config.in"
 source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
new file mode 100644
index 0000000000..26f14c3d48
--- /dev/null
+++ b/package/netatalk/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_NETATALK
+	bool "netatalk"
+	select BR2_PACKAGE_BERKELEYDB
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBGPG_ERROR
+	help
+	  Netatalk can be used to turn a *NIX machine into an extremely
+	  high-performance and reliable file server for Macintosh computers.
+
+	  http://netatalk.sourceforge.net/
diff --git a/package/netatalk/S50netatalk b/package/netatalk/S50netatalk
new file mode 100755
index 0000000000..94bb161aea
--- /dev/null
+++ b/package/netatalk/S50netatalk
@@ -0,0 +1,43 @@
+#!/bin/sh 
+# 
+# Start netatalk daemon  (aftpd && cnid_metad)
+#
+
+AFPD_UAMLIST="-U uams_dhx2.so,uams_clrtxt.so"
+
+start() {
+    echo -n "Starting Netatalk services (this will take a while): "
+    echo "Starting afpd"
+    echo -n " afpd"
+    start-stop-daemon -S -q -p /var/run/afpd.pid --exec /usr/sbin/afpd -- $AFPD_UAMLIST -g nobody -c 50
+    echo -n " cnid_metad"
+    start-stop-daemon -S -q -p /var/run/cnid_metad.pid --exec /usr/sbin/cnid_metad -- -l log_note
+    echo "."
+}
+
+stop(){
+    echo -n "Stopping Netatalk Daemons:"
+    echo -n " afpd"
+    start-stop-daemon -K -q -p /var/run/afpd.pid
+    echo -n " cnid_metad"
+    start-stop-daemon -K -q -p /var/run/cnid_metad.pid
+}
+
+case "$1" in
+    start)
+        start
+    ;; 
+    stop)
+        stop
+    ;; 
+    restart)
+        start
+        stop
+    ;; 
+    *) 
+        echo $"Usage: $0 {start|stop|restart}"
+        exit 1
+esac
+
+exit $?
+
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
new file mode 100644
index 0000000000..8544026574
--- /dev/null
+++ b/package/netatalk/netatalk.mk
@@ -0,0 +1,36 @@
+#############################################################
+#
+# netatalk
+#
+#############################################################
+NETATALK_VERSION = 2.2.2
+NETATALK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/
+NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
+
+NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
+NETATALK_CONF_OPT += --with-cnid-cdb-backend \
+	--with-bdb=$(STAGING_DIR)/usr \
+	--disable-zeroconf \
+	--with-ssl-dir=$(STAGING_DIR)/usr \
+	--with-libgcrypt-dir=$(STAGING_DIR)/usr \
+	--with-shadow \
+	--disable-shell-check \
+	--without-pam
+
+ifeq ($(BR2_PACKAGE_CUPS),y)
+	NETATALK_DEPENDENCIES += cups
+	NETATALK_CONF_OPT += --enable-cups
+else
+	NETATALK_CONF_OPT += --disable-cups
+endif
+
+define NETATALK_INSTALL_EXTRA_FILES
+	[ -f $(TARGET_DIR)/etc/init.d/S50netatalk ] || \
+		$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
+			$(TARGET_DIR)/etc/init.d/S50netatalk
+endef
+
+NETATALK_POST_INSTALL_TARGET_HOOKS += NETATALK_INSTALL_EXTRA_FILES
+
+$(eval $(call AUTOTARGETS))

From a389ebb12c256f210c0a82bf594fcd5c0efa096a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 30 Apr 2012 02:11:58 +0000
Subject: [PATCH 1866/6849] uboot-tools: fix build breakage

Fix uboot-tools build breakage as reported by Peter Korsgaard.
Previously config.h was included in imximage.h but not the fw_env tool.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...s-2012.04.01-drop-configh-from-tools.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/uboot-tools/uboot-tools-2012.04.01-drop-configh-from-tools.patch

diff --git a/package/uboot-tools/uboot-tools-2012.04.01-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-2012.04.01-drop-configh-from-tools.patch
new file mode 100644
index 0000000000..2b3a0e5d1c
--- /dev/null
+++ b/package/uboot-tools/uboot-tools-2012.04.01-drop-configh-from-tools.patch
@@ -0,0 +1,31 @@
+From 39857718f4df9b40a7acf38b73140fd86c628ef0 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 30 Apr 2012 09:07:38 -0300
+Subject: [PATCH] fw_env: allow it to build without a config
+
+We need to build u-boot tools without a board configuration for the
+target packages.
+fw_env just uses config.h to define the default environment of the
+created image, so it really isn't mandatory.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ tools/env/fw_env.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index e292d2b..2bb061a 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -45,8 +45,6 @@
+ 
+ #include "fw_env.h"
+ 
+-#include <config.h>
+-
+ #define WHITESPACE(c) ((c == '\t') || (c == ' '))
+ 
+ #define min(x, y) ({				\
+-- 
+1.7.3.4
+

From ae63ca8f4782b91fd9e41316bfb79a43f54f5cd2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Apr 2012 21:38:14 +0200
Subject: [PATCH 1867/6849] libfcgi: fix build with C++ support and gcc >= 4.4

As reported on the ml by Rico Bachmann.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfcgi/libfcgi-eof.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/libfcgi/libfcgi-eof.patch

diff --git a/package/libfcgi/libfcgi-eof.patch b/package/libfcgi/libfcgi-eof.patch
new file mode 100644
index 0000000000..e7314265a2
--- /dev/null
+++ b/package/libfcgi/libfcgi-eof.patch
@@ -0,0 +1,24 @@
+[PATCH] fix build with C++ support and gcc >= 4.4
+
+EOF is defined in stdio, so ensure it is included.
+
+Based on similar patch by Markus Rothe:
+http://comments.gmane.org/gmane.comp.web.fastcgi.devel/3205
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ libfcgi/fcgio.cpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: fcgi-2.4.0/libfcgi/fcgio.cpp
+===================================================================
+--- fcgi-2.4.0.orig/libfcgi/fcgio.cpp
++++ fcgi-2.4.0/libfcgi/fcgio.cpp
+@@ -22,6 +22,7 @@
+ #define DLLAPI  __declspec(dllexport)
+ #endif
+ 
++#include <cstdio>
+ #include <limits.h>
+ #include "fcgio.h"
+ 

From 906735414784471c8e32775f4d7fec43b103517e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Apr 2012 21:42:14 +0200
Subject: [PATCH 1868/6849] libecore: xcb backend needs pixman

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index c76b3ffa2a..d5d2896446 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -73,7 +73,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)
 LIBECORE_CONF_OPT += --enable-ecore-x-xcb
-LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util
+LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util pixman
 
 # src/util/makekeys is executed at build time to generate
 # ecore_xcb_keysym_table.h, so it should get compiled for the host.

From 2816df90307429bc7a6d5b6bba1961ad395bcd2d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Apr 2012 21:59:05 +0200
Subject: [PATCH 1869/6849] netatalk: fix build with cups support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/netatalk.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 8544026574..4f0ec09401 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -20,6 +20,7 @@ NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 
 ifeq ($(BR2_PACKAGE_CUPS),y)
 	NETATALK_DEPENDENCIES += cups
+	NETATALK_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config
 	NETATALK_CONF_OPT += --enable-cups
 else
 	NETATALK_CONF_OPT += --disable-cups

From 29f656e081e4848835ee913f49aece959551c188 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Mar 2012 17:52:05 -0300
Subject: [PATCH 1870/6849] iproute2: bump to version 3.3.0

Bump to version 3.3.0
We now need to keep builtin headers since it's using very modern defines
which aren't yet mainstream in glibc or uClibc.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 100f20aa24..ee5c04aa8c 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 3.1.0
+IPROUTE2_VERSION = 3.3.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 
@@ -25,8 +25,6 @@ endef
 endif
 
 define IPROUTE2_CONFIGURE_CMDS
-	# Use kernel headers
-	rm -r $(IPROUTE2_DIR)/include/netinet
 	# arpd needs berkeleydb
 	$(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
 	echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config

From f64a1b850fc897357040bb4c58b6e5e50e71e094 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 08:20:24 +0200
Subject: [PATCH 1871/6849] cups: convert to autotargets

There's still custom autoreconf handling because of autoheader errors.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 121 +++++++++++++------------------------------
 1 file changed, 36 insertions(+), 85 deletions(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 9efd6e98d5..2357306d38 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -3,13 +3,18 @@
 # cups
 #
 ################################################################################
+
 CUPS_VERSION = 1.3.9
-CUPS_NAME = cups-$(CUPS_VERSION)
-CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
+CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
 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)
+CUPS_INSTALL_STAGING = YES
+CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
+CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+CUPS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(CUPS_CFLAGS)"
+CUPS_CONF_OPT = --without-perl \
+		--without-java \
+		--disable-gnutls \
+		--disable-gssapi
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	CUPS_CONF_OPT += --enable-dbus
@@ -22,19 +27,6 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 	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
@@ -46,7 +38,7 @@ ifeq ($(BR2_PACKAGE_PHP),y)
 	CUPS_CONF_OPT +=	--with-php
 	CUPS_DEPENDENCIES +=	php
 else
-	CUPS_CONF_OPT +=	--disable-php
+	CUPS_CONF_OPT +=	--without-php
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
@@ -55,7 +47,7 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
 	CUPS_CONF_OPT +=	--with-python
 	CUPS_DEPENDENCIES +=	python
 else
-	CUPS_CONF_OPT +=	--disable-python
+	CUPS_CONF_OPT +=	--without-python
 endif
 
 ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
@@ -64,68 +56,27 @@ else
 	CUPS_CONF_OPT += --disable-pdftops
 endif
 
-$(DL_DIR)/$(CUPS_SOURCE):
-	 $(call DOWNLOAD,$(CUPS_SITE)/$(CUPS_SOURCE))
-
-$(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
-	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(CUPS_DIR) package/cups/ \*.patch
-	$(call CONFIG_UPDATE,$(CUPS_DIR))
-	touch $@
-
-$(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
-	cd $(CUPS_DIR) && $(AUTOCONF)
-	(cd $(CUPS_DIR) && \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(CUPS_CONF_ENV) \
-		CFLAGS="$(CUPS_CFLAGS)" \
-		./configure $(QUIET) \
-		--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) 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 $@
-
-$(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
-	$(MAKE) -C $(CUPS_DIR) DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
-	$(MAKE) -C $(CUPS_DIR) DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/cups-config
-	$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/cups-config
-	$(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/cups-config
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
-	touch $@
-
-cups: host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
-
-cups-source: $(DL_DIR)/$(CUPS_SOURCE)
-
-cups-clean:
-	-$(MAKE) -C $(CUPS_DIR) clean
-
-cups-dirclean:
-	rm -fr $(CUPS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CUPS),y)
-TARGETS+=cups
-endif
-
+# standard autoreconf fails with autoheader failures
+define CUPS_FIXUP_AUTOCONF
+	cd $(@D) && $(AUTOCONF)
+endef
+CUPS_DEPENDENCIES += host-autoconf
+
+CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
+
+# Fixup prefix= and exec_prefix= in cups-config, and remove the
+# -Wl,-rpath option.
+define CUPS_FIXUP_CUPS_CONFIG
+	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
+		$(STAGING_DIR)/usr/bin/cups-config
+	$(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
+		$(STAGING_DIR)/usr/bin/cups-config
+	$(SED) "s%includedir=.*%includedir=$(STAGING_DIR)/usr/include%" \
+		 $(STAGING_DIR)/usr/bin/cups-config
+	$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
+		$(STAGING_DIR)/usr/bin/cups-config
+endef
+
+CUPS_POST_INSTALL_STAGING_HOOKS += CUPS_FIXUP_CUPS_CONFIG
+
+$(eval $(call AUTOTARGETS))

From 9374f6c1255b368b9ff3bd596408dbb35640d5d7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 10:51:57 +0200
Subject: [PATCH 1872/6849] php: fixup paths in php-config for cross
 compilation

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/php/php.mk b/package/php/php.mk
index 7f848b178c..6de6a9e83d 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -171,6 +171,15 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
 endif
 endif
 
+# Fixup prefix= and exec_prefix= in php-config
+define PHP_FIXUP_PHP_CONFIG
+	$(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \
+		-e 's%^exec_prefix="/usr"%exec_prefix="$(STAGING_DIR)/usr"%' \
+		$(STAGING_DIR)/usr/bin/php-config
+endef
+
+PHP_POST_INSTALL_STAGING_HOOKS += PHP_FIXUP_PHP_CONFIG
+
 define PHP_INSTALL_FIXUP
 	rm -rf $(TARGET_DIR)/usr/lib/php
 	rm -f $(TARGET_DIR)/usr/bin/phpize

From 1069f8276585131cef852603e93b883e16f11058 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 10:56:45 +0200
Subject: [PATCH 1873/6849] cups: fixup php extension build

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 2357306d38..c19ae0cbca 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -28,17 +28,11 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 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
+	CUPS_CONF_ENV += ac_cv_path_PHPCONFIG=$(STAGING_DIR)/usr/bin/php-config
+	CUPS_CONF_OPT += --with-php
+	CUPS_DEPENDENCIES += php
 else
-	CUPS_CONF_OPT +=	--without-php
+	CUPS_CONF_OPT += --without-php
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)

From 650e8e2f5cba420f546e59103286496ac62b34eb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 13:56:55 +0200
Subject: [PATCH 1874/6849] cups: cleanup python support

The CFLAGS handling isn't needed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index c19ae0cbca..7f1f52eaab 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -10,7 +10,6 @@ CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
-CUPS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(CUPS_CFLAGS)"
 CUPS_CONF_OPT = --without-perl \
 		--without-java \
 		--disable-gnutls \
@@ -36,12 +35,10 @@ else
 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
+	CUPS_CONF_OPT += --with-python
+	CUPS_DEPENDENCIES += python
 else
-	CUPS_CONF_OPT +=	--without-python
+	CUPS_CONF_OPT += --without-python
 endif
 
 ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)

From bac353dbe6c4384c022f898201992ef5f5353edb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 14:00:04 +0200
Subject: [PATCH 1875/6849] cups: cleanup cups-config handling

Includedir and rpath fixes are not needed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 7f1f52eaab..b953a4b18d 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -55,16 +55,10 @@ CUPS_DEPENDENCIES += host-autoconf
 
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
 
-# Fixup prefix= and exec_prefix= in cups-config, and remove the
-# -Wl,-rpath option.
+# Fixup prefix= and exec_prefix= in cups-config
 define CUPS_FIXUP_CUPS_CONFIG
-	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/cups-config
-	$(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/cups-config
-	$(SED) "s%includedir=.*%includedir=$(STAGING_DIR)/usr/include%" \
-		 $(STAGING_DIR)/usr/bin/cups-config
-	$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
+	$(SED) 's%^prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
+		-e 's%^exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
 		$(STAGING_DIR)/usr/bin/cups-config
 endef
 

From fac43bd78498fb92561a6f11bc999a044f06c749 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 14:05:27 +0200
Subject: [PATCH 1876/6849] cups: bump version

For newer versions than 1.3.x, the patches will need to be reworked.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups-no-tests-man.patch | 13 -------------
 package/cups/cups.mk                 |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 package/cups/cups-no-tests-man.patch

diff --git a/package/cups/cups-no-tests-man.patch b/package/cups/cups-no-tests-man.patch
deleted file mode 100644
index 567c801c64..0000000000
--- a/package/cups/cups-no-tests-man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cups-1.3.5/Makefile	2007-12-06 15:09:39.000000000 -0500
-+++ cups-1.3.5/Makefile	2008-02-09 21:53:03.000000000 -0500
-@@ -19,8 +19,8 @@ include Makedefs
- # Directories to make...
- #
- 
--DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
--		notifier $(PDFTOPS) scheduler systemv test \
-+DIRS	=	cups backend berkeley cgi-bin filter locale monitor \
-+		notifier $(PDFTOPS) scheduler systemv \
- 		$(PHPDIR) \
- 		conf data doc $(FONTS) ppd templates
- 
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index b953a4b18d..1508b6ee0a 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUPS_VERSION = 1.3.9
+CUPS_VERSION = 1.3.11
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
 CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
 CUPS_INSTALL_STAGING = YES

From 67e4edfb96bd99cec33fae6fc142b3de848f4538 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 14:13:01 +0200
Subject: [PATCH 1877/6849] cups: add optional image dependencies

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 1508b6ee0a..f06502ab27 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -15,6 +15,11 @@ CUPS_CONF_OPT = --without-perl \
 		--disable-gnutls \
 		--disable-gssapi
 
+CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
+		    $(if $(BR2_PACKAGE_LIBPNG),libpng) \
+		    $(if $(BR2_PACKAGE_JPEG),jpeg) \
+		    $(if $(BR2_PACKAGE_TIFF),tiff)
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	CUPS_CONF_OPT += --enable-dbus
 	CUPS_DEPENDENCIES += dbus

From 01c227553c1e77e29bbc185824bae9b614b52ad8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 May 2012 03:30:19 +0000
Subject: [PATCH 1878/6849] libdvdread: change SITE

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libdvdread/libdvdread.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libdvdread/libdvdread.mk b/package/multimedia/libdvdread/libdvdread.mk
index 52264140da..3a9d5be2f4 100644
--- a/package/multimedia/libdvdread/libdvdread.mk
+++ b/package/multimedia/libdvdread/libdvdread.mk
@@ -6,7 +6,7 @@
 
 LIBDVDREAD_VERSION = 4.1.3
 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
-LIBDVDREAD_SITE = http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
+LIBDVDREAD_SITE = http://dvdnav.mplayerhq.hu/releases
 LIBDVDREAD_AUTORECONF = YES
 LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES

From f01dbfdec4b880d658db4054a7e4527a61116548 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 May 2012 03:30:20 +0000
Subject: [PATCH 1879/6849] libdvdnav: change SITE

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/libdvdnav/libdvdnav.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/libdvdnav/libdvdnav.mk b/package/multimedia/libdvdnav/libdvdnav.mk
index 7f68533fe2..f69f23877e 100644
--- a/package/multimedia/libdvdnav/libdvdnav.mk
+++ b/package/multimedia/libdvdnav/libdvdnav.mk
@@ -6,7 +6,7 @@
 
 LIBDVDNAV_VERSION = 4.1.3
 LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-LIBDVDNAV_SITE = http://www.mplayerhq.hu/MPlayer/releases/dvdnav
+LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases
 LIBDVDNAV_AUTORECONF = YES
 LIBDVDNAV_INSTALL_STAGING = YES
 

From 58f7784feebdd8ea21ec33374c560ae2d08eb1ab Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 30 Apr 2012 12:43:50 +0000
Subject: [PATCH 1880/6849] mysql_client: security bump to version 5.1.62

Fixes CVE-2012-0583, CVE-2012-1688, CVE-2012-1690, CVE-2012-1696,
CVE-2012-1697, CVE-2012-1703.

Switched to skysql mirror since Oracle no longer maintains the 5.1
branch.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._check.patch => mysql_client-5.1.62-ac_cache_check.patch} | 0
 ...ch => mysql_client-5.1.62-configure-ps-cache-check.patch} | 0
 ...atch => mysql_client-5.1.62-use-new-readline-iface.patch} | 0
 package/mysql_client/mysql_client.mk                         | 5 +++--
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename package/mysql_client/{mysql_client-5.1.61-ac_cache_check.patch => mysql_client-5.1.62-ac_cache_check.patch} (100%)
 rename package/mysql_client/{mysql_client-5.1.61-configure-ps-cache-check.patch => mysql_client-5.1.62-configure-ps-cache-check.patch} (100%)
 rename package/mysql_client/{mysql_client-5.1.61-use-new-readline-iface.patch => mysql_client-5.1.62-use-new-readline-iface.patch} (100%)

diff --git a/package/mysql_client/mysql_client-5.1.61-ac_cache_check.patch b/package/mysql_client/mysql_client-5.1.62-ac_cache_check.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.61-ac_cache_check.patch
rename to package/mysql_client/mysql_client-5.1.62-ac_cache_check.patch
diff --git a/package/mysql_client/mysql_client-5.1.61-configure-ps-cache-check.patch b/package/mysql_client/mysql_client-5.1.62-configure-ps-cache-check.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.61-configure-ps-cache-check.patch
rename to package/mysql_client/mysql_client-5.1.62-configure-ps-cache-check.patch
diff --git a/package/mysql_client/mysql_client-5.1.61-use-new-readline-iface.patch b/package/mysql_client/mysql_client-5.1.62-use-new-readline-iface.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.61-use-new-readline-iface.patch
rename to package/mysql_client/mysql_client-5.1.62-use-new-readline-iface.patch
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 0803d10e76..a1640c376e 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -3,9 +3,10 @@
 # MySQL 5.1 Client
 #
 #############################################################
-MYSQL_CLIENT_VERSION = 5.1.61
+
+MYSQL_CLIENT_VERSION = 5.1.62
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
-MYSQL_CLIENT_SITE = http://downloads.mysql.com/archives/mysql-5.1/
+MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-5.1
 MYSQL_CLIENT_INSTALL_STAGING = YES
 MYSQL_CLIENT_DEPENDENCIES = readline ncurses
 MYSQL_CLIENT_AUTORECONF=YES

From 9d51770a0c53f1ddd46fb3c10315734c72ecd070 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 1 May 2012 05:31:52 +0000
Subject: [PATCH 1881/6849] samba: security bump to version 3.5.15

Fix for CVE-2012-2111

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 48810b94e6..1203693763 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.5.14
+SAMBA_VERSION = 3.5.15
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From bb0efa0ed4055e95fdf9791a71c7267e90099455 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 17 Apr 2012 22:19:46 +0000
Subject: [PATCH 1882/6849] boost: add an option to run cmds in parallel

Add the same -jN parameter as used for make.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 9da427af5e..366796440a 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -70,7 +70,7 @@ define BOOST_CONFIGURE_CMDS
 endef
 
 define BOOST_INSTALL_TARGET_CMDS
-	(cd $(@D) && ./b2 -q -d+2 \
+	(cd $(@D) && ./b2 -j$(BR2_JLEVEL) -q -d+2 \
 	--user-config=$(@D)/user-config.jam \
 	$(BOOST_OPT) \
 	--prefix=$(TARGET_DIR)/usr \
@@ -78,7 +78,7 @@ define BOOST_INSTALL_TARGET_CMDS
 endef
 
 define BOOST_INSTALL_STAGING_CMDS
-	(cd $(@D) && ./bjam -d+2 \
+	(cd $(@D) && ./bjam -j$(BR2_JLEVEL) -d+2 \
 	--user-config=$(@D)/user-config.jam \
 	$(BOOST_OPT) \
 	--prefix=$(STAGING_DIR)/usr \

From 07f41187cc8667c92ea5b27d51ddfc0311fcd0f7 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 25 Apr 2012 05:49:02 +0000
Subject: [PATCH 1883/6849] xf86-input-vmmouse: Make xf86-input-vmmouse
 available only to x86/x86_64 architectures

The xf86-input-vmmouse source code fails to compile intentionally on any
architecture but x86/x86_64. The following error is printed when compiling for a
different architecture:

vmmouse_proto.h:62:2: error: #error The vmmouse protocol is only supported on
x86 architectures.
vmmouse_proto.c:117:2: error: #error "VMMouse is only supported on x86 and
x86-64.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-input-vmmouse/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
index 377e7e456e..b2284cda33 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_VMMOUSE
 	bool "xf86-input-vmmouse"
+	depends on BR2_i386 || BR2_x86_64
 	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO

From df39ffe7f437f62d7c0eb6d73bdb86b2d09a8c8a Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 28 Apr 2012 06:50:44 +0000
Subject: [PATCH 1884/6849] directfb: add support for davinci gfx driver

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in   | 4 ++++
 package/directfb/directfb.mk | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 47f9feaaf4..26f5091a23 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -53,6 +53,10 @@ config BR2_PACKAGE_DIRECTFB_EP9X
 	bool "compile ep9x graphics driver"
 	depends on BR2_arm
 
+config BR2_PACKAGE_DIRECTFB_DAVINCI
+	bool "compile TI DaVinci graphics driver"
+	depends on BR2_arm
+
 config BR2_PACKAGE_DIRECTFB_UNICHROME
 	bool "compile unichrome graphics driver"
 	default y
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 071cdf4fcf..7aa03987a2 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -58,7 +58,8 @@ DIRECTFB_GFX := \
 	$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
 	$(if $(BR2_PACKAGE_DIRECTFB_UNICHROME),unichrome) \
 	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830)	\
-	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
+	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x) \
+	$(if $(BR2_PACKAGE_DIRECTFB_DAVINCI),davinci)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
 DIRECTFB_GFX:=none

From acf2af2d91838b15a645bf17cb4a50688603b2af Mon Sep 17 00:00:00 2001
From: "spdawson@gmail.com" <spdawson@gmail.com>
Date: Wed, 11 Apr 2012 13:12:30 +0100
Subject: [PATCH 1885/6849] Add lcdproc config options, for driver selection

Add a configuration menu item to specify a list of lcdproc drivers to
be built. The list defaults to 'all'.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdproc/Config.in  | 7 +++++++
 package/lcdproc/lcdproc.mk | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in
index 6c8614d6d7..72611056a1 100644
--- a/package/lcdproc/Config.in
+++ b/package/lcdproc/Config.in
@@ -5,3 +5,10 @@ config BR2_PACKAGE_LCDPROC
          LCD display driver daemon and clients
 
          http://lcdproc.org/
+
+config BR2_PACKAGE_LCDPROC_DRIVERS
+	string "List of drivers to build"
+	default "all"
+	depends on BR2_PACKAGE_LCDPROC
+	help
+	  Specify a comma-separated list of lcdproc drivers to be built
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index e8919e9c86..745b386161 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -7,7 +7,7 @@ LCDPROC_VERSION = 0.5.5
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
 
-LCDPROC_CONF_OPT = --enable-drivers=all
+LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
 
 LCDPROC_DEPENDENCIES = ncurses
 

From ba030e960f011a4840f6b1a499cadbefdb8e50b2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 May 2012 22:39:35 +0200
Subject: [PATCH 1886/6849] uemacs: convert to GENTARGETS

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uemacs/uemacs.mk | 54 ++++++++++++----------------------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 62b0911af0..b7b942c658 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -3,46 +3,24 @@
 # uemacs
 #
 #############################################################
-UEMACS_VERSION:=4.0.15-lt
-UEMACS_SOURCE:=em-$(UEMACS_VERSION).tar.bz2
-UEMACS_CAT:=$(BZCAT)
-UEMACS_SITE:=$(BR2_KERNEL_MIRROR)/software/editors/uemacs/
-UEMACS_DIR:=$(BUILD_DIR)/em-$(UEMACS_VERSION)
-UEMACS_BINARY:=em
-UEMACS_TARGET_BINARY:=usr/bin/emacs
 
-$(DL_DIR)/$(UEMACS_SOURCE):
-	 $(call DOWNLOAD,$(UEMACS_SITE)/$(UEMACS_SOURCE))
+UEMACS_VERSION = 4.0.15-lt
+UEMACS_SOURCE = em-$(UEMACS_VERSION).tar.bz2
+UEMACS_SITE = $(BR2_KERNEL_MIRROR)/software/editors/uemacs/
+UEMACS_DEPENDENCIES = ncurses
 
-uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
+define UEMACS_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)" DEFINES="-DAUTOCONF -DPOSIX -DUSG" \
+		CFLAGS+="$(TARGET_CFLAGS) " LIBS="$(TARGET_CFLAGS) -lncurses"
+endef
 
-$(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
-	$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
-	touch $(UEMACS_DIR)/.unpacked
+define UEMACS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/em $(TARGET_DIR)/usr/bin/em
+endef
 
-$(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked
-	$(MAKE) -C $(UEMACS_DIR) \
-	CC="$(TARGET_CC)" DEFINES="-DAUTOCONF -DPOSIX -DUSG" CFLAGS+="$(TARGET_CFLAGS) " LIBS="$(TARGET_CFLAGS) -lncurses"
-	$(STRIPCMD) $(UEMACS_DIR)/$(UEMACS_BINARY)
+define UEMACS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/em
+endef
 
-$(TARGET_DIR)/$(UEMACS_TARGET_BINARY): $(UEMACS_DIR)/$(UEMACS_BINARY)
-	$(INSTALL) -m 0755 -D $(UEMACS_DIR)/$(UEMACS_BINARY) $(TARGET_DIR)/$(UEMACS_TARGET_BINARY)
-
-uemacs: ncurses $(TARGET_DIR)/$(UEMACS_TARGET_BINARY)
-
-uemacs-clean:
-	rm -f $(TARGET_DIR)/$(UEMACS_TARGET_BINARY)
-	-$(MAKE) -C $(UEMACS_DIR) clean
-
-uemacs-dirclean:
-	rm -rf $(UEMACS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_UEMACS),y)
-TARGETS+=uemacs
-endif
+$(eval $(call GENTARGETS))

From 905c301de3faec72e2dea0d16606879eb2fea59c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 May 2012 03:33:37 +0000
Subject: [PATCH 1887/6849] ruby: security bump to 1.9.2-p320

Security Fix for RubyGems: SSL server verification failure for remote
repository.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index c984d67ed9..d89c25bf48 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RUBY_VERSION = 1.9.2-p290
+RUBY_VERSION = 1.9.2-p320
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_AUTORECONF = YES
 HOST_RUBY_AUTORECONF = YES

From c2e12ef2788c8323957bc5777ed3721f1ebf60ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 May 2012 08:28:56 +0000
Subject: [PATCH 1888/6849] polarssl: security bump to version 1.1.3

Fix for CVE-2012-2130

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 2 +-
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 3ad3334c4c..562b9005af 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -33,7 +33,7 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.1.1 SOVERSION 1)
+ set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 0d8574ccd4..d07cdc6e92 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = http://polarssl.org/code/releases/
-POLARSSL_VERSION = 1.1.1
+POLARSSL_VERSION = 1.1.3
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From d3e061fc770275c018c809baa1d449142fc9d10e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 May 2012 03:33:27 +0000
Subject: [PATCH 1889/6849] toolchain/uClibc: enable
 UCLIBC_SUPPORT_AI_ADDRCONFIG

Enable AI_ADDRCONFIG support in uClibc otherwise we don't get the
ifaddrs.h header installed and thus lack getifaddrs support.
Quite useful for samba for example so we can use interfaces=eth0 statements in
the configuration file rather than klunkier
interfaces=192.168.1.1/255.255.255.0 ones.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-0.9.31.config   | 2 +-
 toolchain/uClibc/uClibc-0.9.32.config   | 2 +-
 toolchain/uClibc/uClibc-0.9.33.config   | 2 +-
 toolchain/uClibc/uClibc-snapshot.config | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
index fd1ab987ab..2f363db08f 100644
--- a/toolchain/uClibc/uClibc-0.9.31.config
+++ b/toolchain/uClibc/uClibc-0.9.31.config
@@ -135,7 +135,7 @@ UCLIBC_HAS_IPV4=y
 # UCLIBC_HAS_FULL_RPC is not set
 # UCLIBC_HAS_REENTRANT_RPC is not set
 UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config
index 0782b6f34a..68efac9079 100644
--- a/toolchain/uClibc/uClibc-0.9.32.config
+++ b/toolchain/uClibc/uClibc-0.9.32.config
@@ -160,7 +160,7 @@ UCLIBC_HAS_IPV4=y
 # UCLIBC_HAS_FULL_RPC is not set
 # UCLIBC_HAS_REENTRANT_RPC is not set
 UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
diff --git a/toolchain/uClibc/uClibc-0.9.33.config b/toolchain/uClibc/uClibc-0.9.33.config
index 4ce643a825..eb39df6eda 100644
--- a/toolchain/uClibc/uClibc-0.9.33.config
+++ b/toolchain/uClibc/uClibc-0.9.33.config
@@ -168,7 +168,7 @@ UCLIBC_HAS_IPV4=y
 # UCLIBC_HAS_FULL_RPC is not set
 # UCLIBC_HAS_REENTRANT_RPC is not set
 UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index 4ce643a825..eb39df6eda 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -168,7 +168,7 @@ UCLIBC_HAS_IPV4=y
 # UCLIBC_HAS_FULL_RPC is not set
 # UCLIBC_HAS_REENTRANT_RPC is not set
 UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set

From ffe526d1063be89f68a78170a05665f577758318 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 May 2012 15:24:16 +0000
Subject: [PATCH 1890/6849] toolchain/uClibc: enable 0.9.33.1 for sh

Enable uClibc 0.9.33.1 for the SH architecture.
Builds and works fine with the qemu sample config.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 55e2f8bc1e..160ead417b 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,7 +5,7 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_0_9_31 if (BR2_avr32 || BR2_sh) # 0.9.32 broken
+	default BR2_UCLIBC_VERSION_0_9_31 if BR2_avr32 # 0.9.32 broken
 	default BR2_UCLIBC_VERSION_0_9_33
 	help
 	  Select the version of uClibc you wish to use.
@@ -19,7 +19,7 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.x"
-		depends on !(BR2_avr32 || BR2_sh)
+		depends on !BR2_avr32
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"

From 15744b7e15523506f52d36cac556626df9eaa204 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 3 May 2012 17:40:28 +0200
Subject: [PATCH 1891/6849] uemacs: clear ixon termios flag at initialization

Closes #5144

Patch by Grant Edwards <grant.b.edwards@gmail.com>

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                       |  3 +-
 package/uemacs/uemacs-4.0.15-lt.03.ixon.patch | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 package/uemacs/uemacs-4.0.15-lt.03.ixon.patch

diff --git a/CHANGES b/CHANGES
index 02217275ab..94f584f4b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,7 +44,7 @@
 	samba, sam-ba, sane-backends, sawman, screen, sdl_net,
 	smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
 	syslinux, sysstat, taglib, tftp-hpa, transmission, tiff,
-	tinyhttpd, udev, unionfs, usbutils, util-linux, vala,
+	tinyhttpd, udev, uemacs, unionfs, usbutils, util-linux, vala,
 	valgrind, vim, vsftpd, wipe, xdriver_xf86-video-fbdev,
 	xfsprogs, zlib,
 
@@ -62,6 +62,7 @@
 	#2353: [lua] fix build with 2010.08-rc1
 	#4880: New package lcdproc
 	#4886: New package protobuf
+	#5144: Patch to fix ixon bug in uemacs
 
 2012.02, Released February 29th, 2012:
 
diff --git a/package/uemacs/uemacs-4.0.15-lt.03.ixon.patch b/package/uemacs/uemacs-4.0.15-lt.03.ixon.patch
new file mode 100644
index 0000000000..d0aaa79793
--- /dev/null
+++ b/package/uemacs/uemacs-4.0.15-lt.03.ixon.patch
@@ -0,0 +1,28 @@
+[PATCH] clear ixon termios flag on initialization
+
+Otherwise ctrl-S/Q gets intercepted by the tty layer instead of
+handled by uemacs.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+diff -U8 em-4.0.15-lt-orig/posix.c em-4.0.15-lt/posix.c
+--- em-4.0.15-lt-orig/posix.c	1999-05-16 02:06:19.000000000 -0500
++++ em-4.0.15-lt/posix.c	2012-04-25 16:14:25.000000000 -0500
+@@ -45,17 +45,17 @@
+ 	/*
+ 	 * base new settings on old ones - don't change things
+ 	 * we don't know about
+ 	 */
+ 	ntermios = otermios;
+ 
+ 	/* raw CR/NL etc input handling, but keep ISTRIP if we're on a 7-bit line */
+ 	ntermios.c_iflag &= ~(IGNBRK | BRKINT | IGNPAR | PARMRK
+-			      | INPCK | INLCR | IGNCR | ICRNL);
++			      | INPCK | INLCR | IGNCR | ICRNL | IXON);
+ 
+ 	/* raw CR/NR etc output handling */
+ 	ntermios.c_oflag &= ~(OPOST | ONLCR | OLCUC | OCRNL | ONOCR | ONLRET);
+ 
+ 	/* No signal handling, no echo etc */
+ 	ntermios.c_lflag &= ~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK
+ 			     | ECHONL | NOFLSH | TOSTOP | ECHOCTL | ECHOPRT
+ 			     | ECHOKE | FLUSHO | PENDIN | IEXTEN);

From 2b66816c71a68b579a0138ef6418cb8a99a4e62d Mon Sep 17 00:00:00 2001
From: Kevin Cernekee <cernekee@gmail.com>
Date: Tue, 17 May 2011 14:29:26 -0700
Subject: [PATCH 1892/6849] buildroot: fix BR2_GCC_TARGET_ABI for MIPS n64

gcc 4.3/4.4/4.5 accept the following arguments for --with-abi=

"" | 32 | o64 | n32 | 64 | eabi)

So, the "n64" argument coming from buildroot should be changed to "64"
so that gcc's ./configure step does not error out.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES               | 1 +
 target/Config.in.arch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 94f584f4b9..d7138b6801 100644
--- a/CHANGES
+++ b/CHANGES
@@ -60,6 +60,7 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#2353: [lua] fix build with 2010.08-rc1
+	#3751: MIPS: fix BR2_GCC_TARGET_ABI for MIPS n64
 	#4880: New package lcdproc
 	#4886: New package protobuf
 	#5144: Patch to fix ixon bug in uemacs
diff --git a/target/Config.in.arch b/target/Config.in.arch
index e7a18f71eb..941cd1bed4 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -831,7 +831,7 @@ config BR2_GCC_TARGET_ABI
 	default n32		if BR2_MIPS_ABI32
 	default eabi		if BR2_MIPS_EABI
 	default o64		if BR2_MIPS_OABI64
-	default n64		if BR2_MIPS_ABI64
+	default 64		if BR2_MIPS_ABI64
 	default mmixware	if BR2_mmix && BR2_MMIX_ABI_native
 	default gnu		if BR2_mmix && !BR2_MMIX_ABI_native
 	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec

From b3b66fb8deb3f2fce02e268212fa53924c39e487 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 01:46:49 +0000
Subject: [PATCH 1893/6849] mrouted: fix bcopy patch oops

The bcopy patch just changes bcopy for memmove which is incorrect since
bcopy and memmove use reversed src and dest parameters between them.
Oops!

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mrouted/mrouted-3.9.4-bcopy.patch | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/package/mrouted/mrouted-3.9.4-bcopy.patch b/package/mrouted/mrouted-3.9.4-bcopy.patch
index 73f8acccbb..ea8f6dbf63 100644
--- a/package/mrouted/mrouted-3.9.4-bcopy.patch
+++ b/package/mrouted/mrouted-3.9.4-bcopy.patch
@@ -1,17 +1,12 @@
----
- mtrace.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: mrouted-3.9.4/mtrace.c
-===================================================================
---- mrouted-3.9.4.orig/mtrace.c
-+++ mrouted-3.9.4/mtrace.c
+diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c
+--- mrouted-3.9.4/mtrace.c	2010-11-19 20:53:19.000000000 -0300
++++ mrouted-3.9.4-memmove/mtrace.c	2012-05-03 08:27:33.895422455 -0300
 @@ -556,7 +556,7 @@
  		save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
  		    (tr.tv_usec << 10) / 15625;
  		save->len = len;
 -		bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
-+		memmove((char *)igmp, (char *)&save->igmp, ipdatalen);
++		memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
  	    }
  	    return recvlen;
  	}
@@ -20,7 +15,7 @@ Index: mrouted-3.9.4/mtrace.c
  	    (tr.tv_usec << 10) / 15625;
  	base.len = len;
 -	bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
-+	memmove((char *)igmp, (char *)&base.igmp, ipdatalen);
++	memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
  	/*
  	 * If the user specified which traces to monitor,
  	 * only accept traces that correspond to the

From 7df3db6c90e4d82dada0daf27ac91262e6702dc3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 03:25:37 +0000
Subject: [PATCH 1894/6849] ushare: needs libintl if NLS is enabled

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ushare/Config.in | 2 ++
 package/ushare/ushare.mk | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/ushare/Config.in b/package/ushare/Config.in
index a714fa06a6..acf025fa5b 100644
--- a/package/ushare/Config.in
+++ b/package/ushare/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_USHARE
 	bool "ushare"
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_LIBUPNP
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  uShare is a UPnP (TM) A/V & DLNA Media Server.
 	  It implements the server component that provides UPnP media devices
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index ac8cbc356a..5421d8acde 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -9,6 +9,11 @@ USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
 USHARE_SITE = http://ushare.geexbox.org/releases
 USHARE_DEPENDENCIES = host-pkg-config libupnp
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+USHARE_DEPENDENCIES += gettext libintl
+USHARE_LDFLAGS += -lintl
+endif
+
 define USHARE_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -19,7 +24,7 @@ define USHARE_CONFIGURE_CMDS
 endef
 
 define USHARE_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D)
 endef
 
 define USHARE_INSTALL_TARGET_CMDS

From c95522860fec2fa66b1b9c69cbf703999ea4233b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 01:59:03 +0000
Subject: [PATCH 1895/6849] libmbus: patch out bcopy to fix build breakage

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmbus/libmbus-0.6.1-bcopy.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/libmbus/libmbus-0.6.1-bcopy.patch

diff --git a/package/libmbus/libmbus-0.6.1-bcopy.patch b/package/libmbus/libmbus-0.6.1-bcopy.patch
new file mode 100644
index 0000000000..8b8310c858
--- /dev/null
+++ b/package/libmbus/libmbus-0.6.1-bcopy.patch
@@ -0,0 +1,15 @@
+Drop bcopy since it's deprecated.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+diff -Nura libmbus-0.6.1/mbus/mbus-tcp.c libmbus-0.6.1-bcopy/mbus/mbus-tcp.c
+--- libmbus-0.6.1/mbus/mbus-tcp.c	2011-11-06 02:34:28.000000000 -0300
++++ libmbus-0.6.1-bcopy/mbus/mbus-tcp.c	2012-05-03 08:11:39.680346347 -0300
+@@ -78,7 +78,7 @@
+         return NULL;
+     }
+ 
+-    bcopy((void *)(host_addr->h_addr), (void *)(&s_addr.sin_addr), host_addr->h_length);
++    memmove((void *)(&s_addr.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
+ 
+     if (connect(handle->sock, (struct sockaddr *)&s_addr, sizeof(s_addr)) < 0)
+     {

From a53a3b59165ea88f5c395cc79c7b74ab06f94c5a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 3 May 2012 22:52:27 +0200
Subject: [PATCH 1896/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 72 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/CHANGES b/CHANGES
index d7138b6801..0a20bbbeff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,40 +18,44 @@
 	support.
 
 	Toolchain: Add GCC 4.4.7, 4.6.3, 4.7.0. uClibc 0.9.33.1,
-	default to uClibc 0.9.33.x, 64bit fixes for external
-	toolchains, linaro ext toolchains, new sourcery codebench ext
-	toolchains.
+	default to uClibc 0.9.33.x, enable
+	UCLIBC_SUPPORT_AI_ADDRCONFIG by default, static and 64bit
+	fixes for external toolchains, linaro ext toolchains, new
+	sourcery codebench ext toolchains, GCC 7.4.1.
 
-	Bootloaders: U-Boot: add 2012.04. Barebox: add 2012.04, remove
-	2011.12.
+	Bootloaders: U-Boot: add 2012.04.01. Barebox: add 2012.04,
+	remove 2011.12.
 
 	Updated/fixed packages: alsa-lib, alsa-utils, at, atk, avahi,
-	barebox, bind, bluez_utils, boost, can-utils, ccache,
-	coreutils, dbus, dhcp, directfb, dnsmasq, doom-wad,
-	dosfstools, e2fsprogs, expat, fakeroot, feh, ffmpeg, file,
-	fis, freetype, gamin, gawk, gdk-pixbuf, giblib,
-	glib-networking, gmp, gnutls, gpsd, grep, gstreamer,
+	barebox, berkeleydb, bind, bluez_utils, boost, busybox,
+	can-utils, ccache, coreutils, cups, dbus, dhcp, directfb,
+	dnsmasq, doom-wad, dosfstools, e2fsprogs, expat, fakeroot,
+	feh, ffmpeg, file, fis, freetype, gamin, gawk, gdk-pixbuf,
+	giblib, glib-networking, gmp, gnutls, gpsd, grep, gstreamer,
 	gst-plugins-{bad,base,good,ugly}, haserl, hdparm, imagemagick,
-	iptable, iw, kexec, kmod, lame, libarchive, libatomic_ops,
-	libconfig, libcurl, libedbus, libethumb, libffi, libfuse,
-	libglib2, libgtk2, libhid, libmpeg2, libnl, libpng, libsigc,
-	libsoup, libupnp, liburcu, libusb, libusb-compat, libxml2,
+	iproute2, iptable, iw, kexec, kmod, lame, libarchive,
+	libatomic_ops, libconfig, libcurl, libdvdnav, libdvdread,
+	libedbus, libethumb, libffi, libfuse, libglib2, libgtk2,
+	libhid, libmbus, libmpeg2, libnl, libpng, libsigc, libsoup,
+	libupnp, liburcu, libusb, libusb-compat, libxml2,
 	libxml-parser-perl, libxslt, linux-firmware, linux-fusion,
-	lite, ltrace, lttng-libust, lua, makedevs, microperl, mpd,
-	mpfr, mpg123, mtd, mysql_client, nbd, neon, netsnmp,
-	network-manager, ntfs-3g, openssl, parted, pango, pcre,
-	pixman, poco, psmisc, pulseaudio, python, qt, radvd, rpm,
-	samba, sam-ba, sane-backends, sawman, screen, sdl_net,
-	smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
-	syslinux, sysstat, taglib, tftp-hpa, transmission, tiff,
-	tinyhttpd, udev, uemacs, unionfs, usbutils, util-linux, vala,
-	valgrind, vim, vsftpd, wipe, xdriver_xf86-video-fbdev,
-	xfsprogs, zlib,
-
-	New packages: apr, audiofile, fmtools, glib-networking,
-	hiawatha, latencytop, lcdproc, libcap-ng, libdmtx, libtpl,
-	minicom, parted, polarssl, protobuf, socketcand, systemd,
-	ushare, zeromq
+	lite, lsof, ltrace, lttng-libust, lua, makedevs, microperl,
+	mpd, mpfr, mpg123, mrouted, mtd, mysql_client, nbd, neon,
+	netsnmp, network-manager, nfs-utils, ngrep, ntfs-3g, openssh,
+	openssl, parted, pango, pcre, php, pixman, poco, psmisc,
+	pulseaudio, python, qt, quagga, radvd, rpm, ruby, samba,
+	sam-ba, sane-backends, sawman, screen, sdl_net, smartmontools,
+	sqlite, squashfs3, squid, sshfs, sudo, syslinux, sysstat,
+	taglib, tcpdump, tftp-hpa, transmission, tiff, tinyhttpd,
+	uboot-tools, udev, uemacs, unionfs, usbutils, util-linux,
+	vala, valgrind, vim, vsftpd, wipe,
+	xdriver_xf86-{input-vmmouse,video-fbdev}, xfsprogs, zlib
+
+	New packages: apr, audiofile, bellagio, fmtools,
+	glib-networking, heirloom-mailx, hiawatha, latencytop,
+	lcdproc, libcap-ng, libdmtx, libfcgi, libtpl, minicom, msmtp,
+	ndisc6, netatalk, parted, polarssl, protobuf, socketcand,
+	systemd, ushare, zeromq
 
 	Deprecated packages: ttcp
 
@@ -60,9 +64,19 @@
 	Issues resolved (http://bugs.uclibc.org):
 
 	#2353: [lua] fix build with 2010.08-rc1
+	#2503: Microperl fails build on MIPSel or with Fedora13.x86_64
+	#2557: [PATCH] mkfs.xfs complains about missing libxfs.so.0
+	#2881: Can't build project statically with external toolchain
 	#3751: MIPS: fix BR2_GCC_TARGET_ABI for MIPS n64
+	#4808: ccache may build against wrong zlib
 	#4880: New package lcdproc
 	#4886: New package protobuf
+	#4892: build fails on ltp-testsuite-20101031/testcases/kernel/fs/...
+	#4898: * make: [target-finalize] Error 1 (ignored)*
+	#4985: Qt 4.7.4 build crashes with Linux 2.6.29
+	#4970: udev 181 fails to build if kernel version 3.3 is selected
+	#5018: dialog broken: exits with assert in uClibc
+	#5102: qt package moc, uic, rcc read from wrong place
 	#5144: Patch to fix ixon bug in uemacs
 
 2012.02, Released February 29th, 2012:

From aa96b4ea99b362decc524a8632c7a2c1a7586e83 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 3 May 2012 23:29:08 +0200
Subject: [PATCH 1897/6849] CHANGES: GDB 4.7.1, not GCC

Thanks to Gustavoz noticing on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0a20bbbeff..7fd8864587 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,7 +21,7 @@
 	default to uClibc 0.9.33.x, enable
 	UCLIBC_SUPPORT_AI_ADDRCONFIG by default, static and 64bit
 	fixes for external toolchains, linaro ext toolchains, new
-	sourcery codebench ext toolchains, GCC 7.4.1.
+	sourcery codebench ext toolchains, GDB 7.4.1.
 
 	Bootloaders: U-Boot: add 2012.04.01. Barebox: add 2012.04,
 	remove 2011.12.

From 4205dbd9f665556cc56a36c0e11a5f845c73a57a Mon Sep 17 00:00:00 2001
From: Rico Bachmann <bachmann@tofwerk.com>
Date: Thu, 3 May 2012 14:22:36 +0200
Subject: [PATCH 1898/6849] Add new package apr-util

[Peter: BR2_PACKAGE_NEON not LIBNEON]
Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/apr-util/Config.in                    | 11 ++++++++++
 .../apr-util-1.4.1-remove-checkapr.patch      | 21 +++++++++++++++++++
 package/apr-util/apr-util.mk                  | 13 ++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 package/apr-util/Config.in
 create mode 100644 package/apr-util/apr-util-1.4.1-remove-checkapr.patch
 create mode 100644 package/apr-util/apr-util.mk

diff --git a/package/Config.in b/package/Config.in
index ed66c0586a..caa618b6ac 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -379,6 +379,7 @@ endmenu
 
 menu "Other"
 source "package/apr/Config.in"
+source "package/apr-util/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
new file mode 100644
index 0000000000..99b32f2b06
--- /dev/null
+++ b/package/apr-util/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_APR_UTIL
+	bool "apr-util"
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_NEON
+	select BR2_PACKAGE_NEON_ZLIB
+	select BR2_PACKAGE_ZLIB
+	help
+	  The utility library for the apache runtime project
+
+	  http://apr.apache.org/
diff --git a/package/apr-util/apr-util-1.4.1-remove-checkapr.patch b/package/apr-util/apr-util-1.4.1-remove-checkapr.patch
new file mode 100644
index 0000000000..42ad12fcbe
--- /dev/null
+++ b/package/apr-util/apr-util-1.4.1-remove-checkapr.patch
@@ -0,0 +1,21 @@
+remove check apr
+
+this patch removes the check of apr which fails the build
+
+Signed-off-by: Rico Bachmann <bachmann-ahF9wiJNQgNBDgjK7y7TUQ@public.gmane.org>
+---
+v1: disable the check for APU_FIND_APR because the check only looks into folders
+named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
+
+diff -rupN apr-util-1.4.1/configure.in apr-util-1.4.1-fix/configure.in
+--- apr-util-1.4.1/configure.in	2009-12-17 20:15:19.000000000 +0100
++++ apr-util-1.4.1-fix/configure.in	2012-04-24 10:10:32.000000000 +0200
+@@ -99,7 +99,7 @@ fi
+ dnl
+ dnl Find the APR includes directory and (possibly) the source (base) dir.
+ dnl
+-APU_FIND_APR
++dnl APU_FIND_APR
+ 
+ dnl
+ dnl even though we use apr_rules.mk for building apr-util, we need
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
new file mode 100644
index 0000000000..564b1bb2d8
--- /dev/null
+++ b/package/apr-util/apr-util.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# apr-util
+#
+#############################################################
+APR_UTIL_VERSION = 1.4.1
+APR_UTIL_SITE = http://archive.apache.org/dist/apr
+APR_UTIL_INSTALL_STAGING = YES
+APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
+APR_UTIL_CONF_OPT = \
+	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
+
+$(eval $(call AUTOTARGETS))

From a90617b6271c86769a03ea8f7cfc5a58451e02c5 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Fri, 4 May 2012 11:32:56 +0000
Subject: [PATCH 1899/6849] stress: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/stress/Config.in                      |  8 +++++++
 .../stress/stress-0001-Remove-largefile.patch | 22 +++++++++++++++++++
 package/stress/stress.mk                      | 13 +++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 package/stress/Config.in
 create mode 100644 package/stress/stress-0001-Remove-largefile.patch
 create mode 100644 package/stress/stress.mk

diff --git a/package/Config.in b/package/Config.in
index caa618b6ac..b25f31a6e2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -37,6 +37,7 @@ source "package/netperf/Config.in"
 source "package/oprofile/Config.in"
 source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
+source "package/stress/Config.in"
 source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
 source "package/pv/Config.in"
diff --git a/package/stress/Config.in b/package/stress/Config.in
new file mode 100644
index 0000000000..b092b03a85
--- /dev/null
+++ b/package/stress/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_STRESS
+	bool "stress"
+	help
+	  A deliberately simple workload generator for POSIX systems.
+	  It imposes a configurable amount of CPU, memory, I/O, and
+	  disk stress on the system.
+
+	  http://weather.ou.edu/~apw/projects/stress/
diff --git a/package/stress/stress-0001-Remove-largefile.patch b/package/stress/stress-0001-Remove-largefile.patch
new file mode 100644
index 0000000000..bf894bc05e
--- /dev/null
+++ b/package/stress/stress-0001-Remove-largefile.patch
@@ -0,0 +1,22 @@
+Remove largefile
+
+Otherwise it doesn't compile in uClibc without largefile.
+
+If the toolchain does support largefile, it will still work on large files
+anyway.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+Upstream status: mail sent to apw@rossby.metr.ou.edu
+---
+diff -rup stress-1.0.4.orig/src/Makefile.am stress-1.0.4/src/Makefile.am
+--- stress-1.0.4.orig/src/Makefile.am	2009-12-03 02:04:05.000000000 +0100
++++ stress-1.0.4/src/Makefile.am	2012-05-04 23:09:48.229842463 +0200
+@@ -1,7 +1,5 @@
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-
+ bin_PROGRAMS = stress
+ stress_SOURCES = stress.c
+ stress_MANS = stress.1
diff --git a/package/stress/stress.mk b/package/stress/stress.mk
new file mode 100644
index 0000000000..8b4f40bd39
--- /dev/null
+++ b/package/stress/stress.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# stress - a workload generator
+#
+# http://weather.ou.edu/~apw/projects/stress/
+#
+#############################################################
+
+STRESS_VERSION = 1.0.4
+STRESS_SITE    = http://weather.ou.edu/~apw/projects/stress
+STRESS_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS))

From f18c51657f4ab038654297ccc8fb8e00314c8b60 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 4 May 2012 05:40:53 +0000
Subject: [PATCH 1900/6849] linux: improve the 'make linux-*' special commands

This patch improves two things:

 * It makes sure that the linux-menuconfig and al. commands can be
   executed even if the user hasn't executed 'make' before. Until now,
   the commands were depending on the .configured stamp, which is not
   sufficient since the linux package has been converted to the
   GENTARGETS infrastructure. Instead, depend on the linux-configure
   phony target.

 * It makes sure that those commands are not available when the Linux
   package is not selected, just like we do for Barebox.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 16f99163d8..34f86236c5 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -203,17 +203,18 @@ include linux/linux-ext-*.mk
 
 $(eval $(call GENTARGETS))
 
-linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs $(LINUX_DIR)/.stamp_configured
+ifeq ($(BR2_LINUX_KERNEL),y)
+linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs linux-configure
 	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
 	rm -f $(LINUX_DIR)/.stamp_{built,target_installed,images_installed}
 
-linux-savedefconfig linux26-savedefconfig: dirs $(LINUX_DIR)/.stamp_configured
+linux-savedefconfig linux26-savedefconfig: dirs linux-configure
 	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
 
 ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
-linux-update-config linux26-update-config: $(LINUX_DIR)/.config
+linux-update-config linux26-update-config: linux-configure $(LINUX_DIR)/.config
 	cp -f $(LINUX_DIR)/.config $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
 
 linux-update-defconfig linux26-update-defconfig: linux-savedefconfig
@@ -222,6 +223,7 @@ else
 linux-update-config linux26-update-config: ;
 linux-update-defconfig linux26-update-defconfig: ;
 endif
+endif
 
 # Support for rebuilding the kernel after the cpio archive has
 # been generated in $(BINARIES_DIR)/rootfs.cpio.

From 5308d111b72bdce228252ebe2e44e28484117c5f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 May 2012 03:30:23 +0000
Subject: [PATCH 1901/6849] ocf-linux: new package

Add the ocf-linux package and linux kernel extension.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in            | 12 ++++++++++++
 linux/linux-ext-ocf-linux.mk   | 23 +++++++++++++++++++++++
 package/Config.in              |  1 +
 package/ocf-linux/Config.in    | 12 ++++++++++++
 package/ocf-linux/ocf-linux.mk | 21 +++++++++++++++++++++
 5 files changed, 69 insertions(+)
 create mode 100644 linux/linux-ext-ocf-linux.mk
 create mode 100644 package/ocf-linux/Config.in
 create mode 100644 package/ocf-linux/ocf-linux.mk

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 172fa76c75..a68cbe9214 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -23,6 +23,18 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 	  Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
 	  and verify that your kernel version in buildroot matches.
 
+# ocf-linux
+config BR2_LINUX_KERNEL_EXT_OCF_LINUX
+	bool "Open Cryptographic Framework (OCF)"
+	select BR2_PACKAGE_OCF_LINUX
+	help
+	  OCF-Linux Kernel part.
+
+	  Select this option to patch your kernel with OCF for
+	  hardware-accelerated crypto support for available drivers.
+	  Some libraries need to also have OCF enabled for them,
+	  for example OpenSSL.
+
 # RTAI
 config BR2_LINUX_KERNEL_EXT_RTAI
        bool "RTAI Real-time patch"
diff --git a/linux/linux-ext-ocf-linux.mk b/linux/linux-ext-ocf-linux.mk
new file mode 100644
index 0000000000..faf7360e49
--- /dev/null
+++ b/linux/linux-ext-ocf-linux.mk
@@ -0,0 +1,23 @@
+##################################################
+# Linux OCF extension
+#
+# Patch the linux kernel with OCF
+##################################################
+
+ifeq ($(BR2_LINUX_KERNEL_EXT_OCF_LINUX),y)
+LINUX_DEPENDENCIES += ocf-linux
+
+# Prepare kernel patch
+# The linux-3.2.1.patch is just the main inclusion, most of the code
+# resides in the ocf/ subdir.
+# It works for older kernel versions.
+# Run tested from 2.6.38+ and build tested from 2.6.35+
+define OCF_LINUX_PREPARE_KERNEL
+	support/scripts/apply-patches.sh $(LINUX_DIR) \
+		$(OCF_LINUX_DIR)/patches/ linux-3.2.1-ocf.patch ; \
+	cp -rf $(OCF_LINUX_DIR)/ocf $(LINUX_DIR)/crypto/ocf ;
+endef
+
+LINUX_PRE_PATCH_HOOKS += OCF_LINUX_PREPARE_KERNEL
+
+endif #BR2_LINUX_EXT_OCF_LINUX
diff --git a/package/Config.in b/package/Config.in
index b25f31a6e2..dd02e32f6d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -279,6 +279,7 @@ source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libnss/Config.in"
+source "package/ocf-linux/Config.in"
 source "package/openssl/Config.in"
 source "package/polarssl/Config.in"
 endmenu
diff --git a/package/ocf-linux/Config.in b/package/ocf-linux/Config.in
new file mode 100644
index 0000000000..9dc5766074
--- /dev/null
+++ b/package/ocf-linux/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_OCF_LINUX
+	bool "ocf-linux"
+	help
+	  OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
+	  Framework (OCF). This port aims to bring full asynchronous HW/SW
+	  crypto acceleration to the Linux kernel and applications
+	  running under Linux.
+
+	  You need to enable the OCF linux kernel extension or provide
+	  a prepatched kernel to make this option useful.
+
+	  http://ocf-linux.sourceforge.net/
diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk
new file mode 100644
index 0000000000..e615225256
--- /dev/null
+++ b/package/ocf-linux/ocf-linux.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# ocf-linux
+#
+#############################################################
+
+OCF_LINUX_VERSION = 20120127
+OCF_LINUX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION)
+OCF_LINUX_INSTALL_STAGING = YES
+
+define OCF_LINUX_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \
+		$(STAGING_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+define OCF_LINUX_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \
+		$(TARGET_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+$(eval $(call GENTARGETS))

From 30a246be8bf1617e3be54f063ad79ee8d2aacb07 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 May 2012 03:30:24 +0000
Subject: [PATCH 1902/6849] openssl: switch to the ocf-linux package

Remove builtin OCF support from the openssl package into a new package.
Even though ocf support is just a header file we'd rather have it in a
separate package because of unrelated version bumps and to fetch it from
source.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/Config.in                |   9 +-
 package/openssl/ocf-cryptodev-20101223.h | 480 -----------------------
 package/openssl/openssl.mk               |  10 +-
 3 files changed, 9 insertions(+), 490 deletions(-)
 delete mode 100644 package/openssl/ocf-cryptodev-20101223.h

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 3e09d88b82..6ba644a985 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -25,9 +25,14 @@ config BR2_PACKAGE_OPENSSL_ENGINES
 config BR2_PACKAGE_OPENSSL_OCF
 	bool "openssl ocf support"
 	depends on BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OCF_LINUX
 	help
 	  Enable openssl cryptodev (OCF) hardware acceleration support.
-	  This requires kernel patches from the ocf-linux project otherwise
-	  you'll just have a bigger openssl library that works as usual.
+	  This requires the ocf linux kernel extension or you to provide a
+	  pre-patched kernel that includes it.
+	  If kernel support isn't available it'll just make the libraries
+	  a tiny bit larger with a small CPU overhead when starting up and
+	  checking for the required kernel-side support, and then falling
+	  back to regular builtin support.
 
 	  http://ocf-linux.sourceforge.net/
diff --git a/package/openssl/ocf-cryptodev-20101223.h b/package/openssl/ocf-cryptodev-20101223.h
deleted file mode 100644
index cca0ec822d..0000000000
--- a/package/openssl/ocf-cryptodev-20101223.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $	*/
-/*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
-
-/*-
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- *
- * Copyright (c) 2001 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#ifndef _CRYPTO_CRYPTO_H_
-#define _CRYPTO_CRYPTO_H_
-
-/* Some initial values */
-#define CRYPTO_DRIVERS_INITIAL	4
-#define CRYPTO_SW_SESSIONS	32
-
-/* Hash values */
-#define NULL_HASH_LEN		0
-#define MD5_HASH_LEN		16
-#define SHA1_HASH_LEN		20
-#define RIPEMD160_HASH_LEN	20
-#define SHA2_256_HASH_LEN	32
-#define SHA2_384_HASH_LEN	48
-#define SHA2_512_HASH_LEN	64
-#define MD5_KPDK_HASH_LEN	16
-#define SHA1_KPDK_HASH_LEN	20
-/* Maximum hash algorithm result length */
-#define HASH_MAX_LEN		SHA2_512_HASH_LEN /* Keep this updated */
-
-/* HMAC values */
-#define NULL_HMAC_BLOCK_LEN			1
-#define MD5_HMAC_BLOCK_LEN			64
-#define SHA1_HMAC_BLOCK_LEN			64
-#define RIPEMD160_HMAC_BLOCK_LEN	64
-#define SHA2_256_HMAC_BLOCK_LEN		64
-#define SHA2_384_HMAC_BLOCK_LEN		128
-#define SHA2_512_HMAC_BLOCK_LEN		128
-/* Maximum HMAC block length */
-#define HMAC_MAX_BLOCK_LEN		SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
-#define HMAC_IPAD_VAL			0x36
-#define HMAC_OPAD_VAL			0x5C
-
-/* Encryption algorithm block sizes */
-#define NULL_BLOCK_LEN			1
-#define DES_BLOCK_LEN			8
-#define DES3_BLOCK_LEN			8
-#define BLOWFISH_BLOCK_LEN		8
-#define SKIPJACK_BLOCK_LEN		8
-#define CAST128_BLOCK_LEN		8
-#define RIJNDAEL128_BLOCK_LEN	16
-#define AES_BLOCK_LEN			RIJNDAEL128_BLOCK_LEN
-#define CAMELLIA_BLOCK_LEN		16
-#define ARC4_BLOCK_LEN			1
-#define EALG_MAX_BLOCK_LEN		AES_BLOCK_LEN /* Keep this updated */
-
-/* Encryption algorithm min and max key sizes */
-#define NULL_MIN_KEY_LEN		0
-#define NULL_MAX_KEY_LEN		0
-#define DES_MIN_KEY_LEN			8
-#define DES_MAX_KEY_LEN			8
-#define DES3_MIN_KEY_LEN		24
-#define DES3_MAX_KEY_LEN		24
-#define BLOWFISH_MIN_KEY_LEN	4
-#define BLOWFISH_MAX_KEY_LEN	56
-#define SKIPJACK_MIN_KEY_LEN	10
-#define SKIPJACK_MAX_KEY_LEN	10
-#define CAST128_MIN_KEY_LEN		5
-#define CAST128_MAX_KEY_LEN		16
-#define RIJNDAEL128_MIN_KEY_LEN	16
-#define RIJNDAEL128_MAX_KEY_LEN	32
-#define AES_MIN_KEY_LEN			RIJNDAEL128_MIN_KEY_LEN
-#define AES_MAX_KEY_LEN			RIJNDAEL128_MAX_KEY_LEN
-#define CAMELLIA_MIN_KEY_LEN	16
-#define CAMELLIA_MAX_KEY_LEN	32
-#define ARC4_MIN_KEY_LEN		1
-#define ARC4_MAX_KEY_LEN		256
-
-/* Max size of data that can be processed */
-#define CRYPTO_MAX_DATA_LEN		64*1024 - 1
-
-#define CRYPTO_ALGORITHM_MIN	1
-#define CRYPTO_DES_CBC			1
-#define CRYPTO_3DES_CBC			2
-#define CRYPTO_BLF_CBC			3
-#define CRYPTO_CAST_CBC			4
-#define CRYPTO_SKIPJACK_CBC		5
-#define CRYPTO_MD5_HMAC			6
-#define CRYPTO_SHA1_HMAC		7
-#define CRYPTO_RIPEMD160_HMAC	8
-#define CRYPTO_MD5_KPDK			9
-#define CRYPTO_SHA1_KPDK		10
-#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
-#define CRYPTO_AES_CBC			11 /* 128 bit blocksize -- the same as above */
-#define CRYPTO_ARC4				12
-#define CRYPTO_MD5				13
-#define CRYPTO_SHA1				14
-#define CRYPTO_NULL_HMAC		15
-#define CRYPTO_NULL_CBC			16
-#define CRYPTO_DEFLATE_COMP		17 /* Deflate compression algorithm */
-#define CRYPTO_SHA2_256_HMAC	18
-#define CRYPTO_SHA2_384_HMAC	19
-#define CRYPTO_SHA2_512_HMAC	20
-#define CRYPTO_CAMELLIA_CBC		21
-#define CRYPTO_SHA2_256			22
-#define CRYPTO_SHA2_384			23
-#define CRYPTO_SHA2_512			24
-#define CRYPTO_RIPEMD160		25
-#define	CRYPTO_LZS_COMP			26
-#define CRYPTO_ALGORITHM_MAX	26 /* Keep updated - see above */
-
-/* Algorithm flags */
-#define CRYPTO_ALG_FLAG_SUPPORTED	0x01 /* Algorithm is supported */
-#define CRYPTO_ALG_FLAG_RNG_ENABLE	0x02 /* Has HW RNG for DH/DSA */
-#define CRYPTO_ALG_FLAG_DSA_SHA		0x04 /* Can do SHA on msg */
-
-/*
- * Crypto driver/device flags.  They can set in the crid
- * parameter when creating a session or submitting a key
- * op to affect the device/driver assigned.  If neither
- * of these are specified then the crid is assumed to hold
- * the driver id of an existing (and suitable) device that
- * must be used to satisfy the request.
- */
-#define CRYPTO_FLAG_HARDWARE	0x01000000	/* hardware accelerated */
-#define CRYPTO_FLAG_SOFTWARE	0x02000000	/* software implementation */
-
-/* NB: deprecated */
-struct session_op {
-	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-
-	u_int32_t	keylen;		/* cipher key */
-	caddr_t		key;
-	int		mackeylen;	/* mac key */
-	caddr_t		mackey;
-
-  	u_int32_t	ses;		/* returns: session # */ 
-};
-
-struct session2_op {
-	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-
-	u_int32_t	keylen;		/* cipher key */
-	caddr_t		key;
-	int		mackeylen;	/* mac key */
-	caddr_t		mackey;
-
-  	u_int32_t	ses;		/* returns: session # */ 
-	int		crid;		/* driver id + flags (rw) */
-	int		pad[4];		/* for future expansion */
-};
-
-struct crypt_op {
-	u_int32_t	ses;
-	u_int16_t	op;		/* i.e. COP_ENCRYPT */
-#define COP_NONE	0
-#define COP_ENCRYPT	1
-#define COP_DECRYPT	2
-	u_int16_t	flags;
-#define	COP_F_BATCH	0x0008		/* Batch op if possible */
-	u_int		len;
-	caddr_t		src, dst;	/* become iov[] inside kernel */
-	caddr_t		mac;		/* must be big enough for chosen MAC */
-	caddr_t		iv;
-};
-
-/*
- * Parameters for looking up a crypto driver/device by
- * device name or by id.  The latter are returned for
- * created sessions (crid) and completed key operations.
- */
-struct crypt_find_op {
-	int		crid;		/* driver id + flags */
-	char		name[32];	/* device/driver name */
-};
-
-/* bignum parameter, in packed bytes, ... */
-struct crparam {
-	caddr_t		crp_p;
-	u_int		crp_nbits;
-};
-
-#define CRK_MAXPARAM	8
-
-struct crypt_kop {
-	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		crk_status;	/* return status */
-	u_short		crk_iparams;	/* # of input parameters */
-	u_short		crk_oparams;	/* # of output parameters */
-	u_int		crk_crid;	/* NB: only used by CIOCKEY2 (rw) */
-	struct crparam	crk_param[CRK_MAXPARAM];
-};
-#define CRK_ALGORITM_MIN	0
-#define CRK_MOD_EXP		0
-#define CRK_MOD_EXP_CRT		1
-#define CRK_DSA_SIGN		2
-#define CRK_DSA_VERIFY		3
-#define CRK_DH_COMPUTE_KEY	4
-#define CRK_ALGORITHM_MAX	4 /* Keep updated - see below */
-
-#define CRF_MOD_EXP		(1 << CRK_MOD_EXP)
-#define CRF_MOD_EXP_CRT		(1 << CRK_MOD_EXP_CRT)
-#define CRF_DSA_SIGN		(1 << CRK_DSA_SIGN)
-#define CRF_DSA_VERIFY		(1 << CRK_DSA_VERIFY)
-#define CRF_DH_COMPUTE_KEY	(1 << CRK_DH_COMPUTE_KEY)
-
-/*
- * done against open of /dev/crypto, to get a cloned descriptor.
- * Please use F_SETFD against the cloned descriptor.
- */
-#define CRIOGET		_IOWR('c', 100, u_int32_t)
-#define CRIOASYMFEAT	CIOCASYMFEAT
-#define CRIOFINDDEV	CIOCFINDDEV
-
-/* the following are done against the cloned descriptor */
-#define CIOCGSESSION	_IOWR('c', 101, struct session_op)
-#define CIOCFSESSION	_IOW('c', 102, u_int32_t)
-#define CIOCCRYPT	_IOWR('c', 103, struct crypt_op)
-#define CIOCKEY		_IOWR('c', 104, struct crypt_kop)
-#define CIOCASYMFEAT	_IOR('c', 105, u_int32_t)
-#define CIOCGSESSION2	_IOWR('c', 106, struct session2_op)
-#define CIOCKEY2	_IOWR('c', 107, struct crypt_kop)
-#define CIOCFINDDEV	_IOWR('c', 108, struct crypt_find_op)
-
-struct cryptotstat {
-	struct timespec	acc;		/* total accumulated time */
-	struct timespec	min;		/* min time */
-	struct timespec	max;		/* max time */
-	u_int32_t	count;		/* number of observations */
-};
-
-struct cryptostats {
-	u_int32_t	cs_ops;		/* symmetric crypto ops submitted */
-	u_int32_t	cs_errs;	/* symmetric crypto ops that failed */
-	u_int32_t	cs_kops;	/* asymetric/key ops submitted */
-	u_int32_t	cs_kerrs;	/* asymetric/key ops that failed */
-	u_int32_t	cs_intrs;	/* crypto swi thread activations */
-	u_int32_t	cs_rets;	/* crypto return thread activations */
-	u_int32_t	cs_blocks;	/* symmetric op driver block */
-	u_int32_t	cs_kblocks;	/* symmetric op driver block */
-	/*
-	 * When CRYPTO_TIMING is defined at compile time and the
-	 * sysctl debug.crypto is set to 1, the crypto system will
-	 * accumulate statistics about how long it takes to process
-	 * crypto requests at various points during processing.
-	 */
-	struct cryptotstat cs_invoke;	/* crypto_dipsatch -> crypto_invoke */
-	struct cryptotstat cs_done;	/* crypto_invoke -> crypto_done */
-	struct cryptotstat cs_cb;	/* crypto_done -> callback */
-	struct cryptotstat cs_finis;	/* callback -> callback return */
-
-	u_int32_t	cs_drops;		/* crypto ops dropped due to congestion */
-};
-
-#ifdef __KERNEL__
-
-/* Standard initialization structure beginning */
-struct cryptoini {
-	int		cri_alg;	/* Algorithm to use */
-	int		cri_klen;	/* Key length, in bits */
-	int		cri_mlen;	/* Number of bytes we want from the
-					   entire hash. 0 means all. */
-	caddr_t		cri_key;	/* key to use */
-	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
-	struct cryptoini *cri_next;
-};
-
-/* Describe boundaries of a single crypto operation */
-struct cryptodesc {
-	int		crd_skip;	/* How many bytes to ignore from start */
-	int		crd_len;	/* How many bytes to process */
-	int		crd_inject;	/* Where to inject results, if applicable */
-	int		crd_flags;
-
-#define CRD_F_ENCRYPT		0x01	/* Set when doing encryption */
-#define CRD_F_IV_PRESENT	0x02	/* When encrypting, IV is already in
-					   place, so don't copy. */
-#define CRD_F_IV_EXPLICIT	0x04	/* IV explicitly provided */
-#define CRD_F_DSA_SHA_NEEDED	0x08	/* Compute SHA-1 of buffer for DSA */
-#define CRD_F_KEY_EXPLICIT	0x10	/* Key explicitly provided */
-#define CRD_F_COMP		0x0f    /* Set when doing compression */
-
-	struct cryptoini	CRD_INI; /* Initialization/context data */
-#define crd_iv		CRD_INI.cri_iv
-#define crd_key		CRD_INI.cri_key
-#define crd_alg		CRD_INI.cri_alg
-#define crd_klen	CRD_INI.cri_klen
-#define crd_mlen	CRD_INI.cri_mlen
-
-	struct cryptodesc *crd_next;
-};
-
-/* Structure describing complete operation */
-struct cryptop {
-	struct list_head crp_next;
-	wait_queue_head_t crp_waitq;
-
-	u_int64_t	crp_sid;	/* Session ID */
-	int		crp_ilen;	/* Input data total length */
-	int		crp_olen;	/* Result total length */
-
-	int		crp_etype;	/*
-					 * Error type (zero means no error).
-					 * All error codes except EAGAIN
-					 * indicate possible data corruption (as in,
-					 * the data have been touched). On all
-					 * errors, the crp_sid may have changed
-					 * (reset to a new one), so the caller
-					 * should always check and use the new
-					 * value on future requests.
-					 */
-	int		crp_flags;
-
-#define CRYPTO_F_SKBUF		0x0001	/* Input/output are skbuf chains */
-#define CRYPTO_F_IOV		0x0002	/* Input/output are uio */
-#define CRYPTO_F_REL		0x0004	/* Must return data in same place */
-#define CRYPTO_F_BATCH		0x0008	/* Batch op if possible */
-#define CRYPTO_F_CBIMM		0x0010	/* Do callback immediately */
-#define CRYPTO_F_DONE		0x0020	/* Operation completed */
-#define CRYPTO_F_CBIFSYNC	0x0040	/* Do CBIMM if op is synchronous */
-
-	caddr_t		crp_buf;	/* Data to be processed */
-	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
-	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
-
-	int (*crp_callback)(struct cryptop *); /* Callback function */
-};
-
-#define CRYPTO_BUF_CONTIG	0x0
-#define CRYPTO_BUF_IOV		0x1
-#define CRYPTO_BUF_SKBUF		0x2
-
-#define CRYPTO_OP_DECRYPT	0x0
-#define CRYPTO_OP_ENCRYPT	0x1
-
-/*
- * Hints passed to process methods.
- */
-#define CRYPTO_HINT_MORE	0x1	/* more ops coming shortly */
-
-struct cryptkop {
-	struct list_head krp_next;
-	wait_queue_head_t krp_waitq;
-
-	int		krp_flags;
-#define CRYPTO_KF_DONE		0x0001	/* Operation completed */
-#define CRYPTO_KF_CBIMM		0x0002	/* Do callback immediately */
-
-	u_int		krp_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		krp_status;	/* return status */
-	u_short		krp_iparams;	/* # of input parameters */
-	u_short		krp_oparams;	/* # of output parameters */
-	u_int		krp_crid;	/* desired device, etc. */
-	u_int32_t	krp_hid;
-	struct crparam	krp_param[CRK_MAXPARAM];	/* kvm */
-	int		(*krp_callback)(struct cryptkop *);
-};
-
-#include <ocf-compat.h>
-
-/*
- * Session ids are 64 bits.  The lower 32 bits contain a "local id" which
- * is a driver-private session identifier.  The upper 32 bits contain a
- * "hardware id" used by the core crypto code to identify the driver and
- * a copy of the driver's capabilities that can be used by client code to
- * optimize operation.
- */
-#define CRYPTO_SESID2HID(_sid)	(((_sid) >> 32) & 0x00ffffff)
-#define CRYPTO_SESID2CAPS(_sid)	(((_sid) >> 32) & 0xff000000)
-#define CRYPTO_SESID2LID(_sid)	(((u_int32_t) (_sid)) & 0xffffffff)
-
-extern	int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard);
-extern	int crypto_freesession(u_int64_t sid);
-#define CRYPTOCAP_F_HARDWARE	CRYPTO_FLAG_HARDWARE
-#define CRYPTOCAP_F_SOFTWARE	CRYPTO_FLAG_SOFTWARE
-#define CRYPTOCAP_F_SYNC	0x04000000	/* operates synchronously */
-extern	int32_t crypto_get_driverid(device_t dev, int flags);
-extern	int crypto_find_driver(const char *);
-extern	device_t crypto_find_device_byhid(int hid);
-extern	int crypto_getcaps(int hid);
-extern	int crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
-	    u_int32_t flags);
-extern	int crypto_kregister(u_int32_t, int, u_int32_t);
-extern	int crypto_unregister(u_int32_t driverid, int alg);
-extern	int crypto_unregister_all(u_int32_t driverid);
-extern	int crypto_dispatch(struct cryptop *crp);
-extern	int crypto_kdispatch(struct cryptkop *);
-#define CRYPTO_SYMQ	0x1
-#define CRYPTO_ASYMQ	0x2
-extern	int crypto_unblock(u_int32_t, int);
-extern	void crypto_done(struct cryptop *crp);
-extern	void crypto_kdone(struct cryptkop *);
-extern	int crypto_getfeat(int *);
-
-extern	void crypto_freereq(struct cryptop *crp);
-extern	struct cryptop *crypto_getreq(int num);
-
-extern  int crypto_usercrypto;      /* userland may do crypto requests */
-extern  int crypto_userasymcrypto;  /* userland may do asym crypto reqs */
-extern  int crypto_devallowsoft;    /* only use hardware crypto */
-
-/*
- * random number support,  crypto_unregister_all will unregister
- */
-extern int crypto_rregister(u_int32_t driverid,
-		int (*read_random)(void *arg, u_int32_t *buf, int len), void *arg);
-extern int crypto_runregister_all(u_int32_t driverid);
-
-/*
- * Crypto-related utility routines used mainly by drivers.
- *
- * XXX these don't really belong here; but for now they're
- *     kept apart from the rest of the system.
- */
-struct uio;
-extern	void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp);
-extern	void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp);
-extern	struct iovec *cuio_getptr(struct uio *uio, int loc, int *off);
-
-extern	void crypto_copyback(int flags, caddr_t buf, int off, int size,
-	    caddr_t in);
-extern	void crypto_copydata(int flags, caddr_t buf, int off, int size,
-	    caddr_t out);
-extern	int crypto_apply(int flags, caddr_t buf, int off, int len,
-	    int (*f)(void *, void *, u_int), void *arg);
-
-#endif /* __KERNEL__ */
-#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 185522c957..748252ce2b 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -12,14 +12,8 @@ OPENSSL_TARGET_ARCH = generic32
 OPENSSL_CFLAGS = $(TARGET_CFLAGS)
 
 ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
-OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
-
-define OPENSSL_INSTALL_CRYPTODEV_H
-$(INSTALL) -D package/openssl/ocf-cryptodev-20101223.h \
-	$(STAGING_DIR)/usr/include/crypto/cryptodev.h
-endef
-
-OPENSSL_POST_EXTRACT_HOOKS += OPENSSL_INSTALL_CRYPTODEV_H
+	OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
+	OPENSSL_DEPENDENCIES += ocf-linux
 endif
 
 # Some architectures are optimized in OpenSSL

From 2643db0b79de33a6490efb8adc62525a0987ea0c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 May 2012 00:31:38 +0000
Subject: [PATCH 1903/6849] libmpeg2: fix build breakage on lower ARM cores

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libmpeg2/libmpeg2-0.5.1-armv4l.patch      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch

diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch b/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch
new file mode 100644
index 0000000000..70d45ef916
--- /dev/null
+++ b/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch
@@ -0,0 +1,24 @@
+Patch taken from gentoo.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S
+--- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
++++ libmpeg2/libmpeg2/motion_comp_arm_s.S	2009-11-20 19:55:22.000000000 +0100
+@@ -19,6 +19,16 @@
+ @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ 
++@ Data preload is supported only by ARM V5TE and above
++
++#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
++     || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
++     || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \
++     || defined (__ARM_ARCH_5T__))
++.macro pld reg
++.endm
++#endif
++
+ 	.text
+ 
+ @ ----------------------------------------------------------------

From 6c5a33e41ba55f5c156204701d775879ff4fd98f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 5 May 2012 06:26:05 +0000
Subject: [PATCH 1904/6849] libaio: make available only on supported
 architectures

libaio has some architecture-specific code, and isn't available for
all architectures that Buildroot support.

Fixes
http://autobuild.buildroot.org/results/b171a6d6243ea021dc52830bc4b9d36fc083a60d/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libaio/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libaio/Config.in b/package/libaio/Config.in
index ff6cc13c80..833009a42a 100644
--- a/package/libaio/Config.in
+++ b/package/libaio/Config.in
@@ -1,4 +1,8 @@
 config BR2_PACKAGE_LIBAIO
 	bool "libaio"
+	depends on \
+		BR2_arm   || BR2_armeb || BR2_avr32  || BR2_i386    || \
+		BR2_m68k  || BR2_mips  || BR2_mipsel || BR2_powerpc || \
+		BR2_sparc || BR2_x86_64
 	help
 	  Library for doing asynchronous I/O

From 73aa143b66437f6796a94dfaa1240044513e337e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 5 May 2012 06:26:06 +0000
Subject: [PATCH 1905/6849] libaio: use alternative upstream URL

Since the kernel.org security problem and reinstallation, libaio is no
longer available from this site. Use snapshot.debian.net as an
alternative source.

[Peter: Add spaces around '=' while we're at it]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libaio/libaio.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 3ffc49cd30..05a4d5c231 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -3,10 +3,10 @@
 # libaio
 #
 #############################################################
-LIBAIO_VERSION=0.3.109
-LIBAIO_SOURCE=libaio-$(LIBAIO_VERSION).tar.bz2
-LIBAIO_SITE=$(BR2_KERNEL_MIRROR)/linux/libs/aio/
-LIBAIO_INSTALL_STAGING=YES
+LIBAIO_VERSION = 0.3.109
+LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz
+LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20110227T085214Z/pool/main/liba/libaio/
+LIBAIO_INSTALL_STAGING = YES
 
 define LIBAIO_BUILD_CMDS
   $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)

From 70d57b874f2d322c148f0196cb53c443b910c228 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:32 +0000
Subject: [PATCH 1906/6849] qemu/sh4-r2d: update to use kernel 3.2.16

Bump to use kernel version 3.2.16
Still keep sh4-r2d qemu sample config on 3.2 series since the sh-sci
driver from 3.3 uses unimplemented functionality (as of qemu 1.0.1)

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index e344e716ba..58ace03dfe 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -15,13 +15,12 @@ BR2_KERNEL_HEADERS_3_2=y
 
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
-BR2_GCC_VERSION_4_5_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.16"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 602fe21792ad6d7f700b5a2fffd90a2886ca5d12 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:33 +0000
Subject: [PATCH 1907/6849] qemu/arm-versatile: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index f2c30b10a0..b54b5b62f0 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,10 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From b3a3066869b16baeb03e739bba2527eaa2cc4a3f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:34 +0000
Subject: [PATCH 1908/6849] qemu/mipsel-malta: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mipsel_malta_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 99d9cbad4e..200b045fb6 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,10 +6,13 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 4f54b3e04a1cfb7bfead4598ab007eea0f114385 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:35 +0000
Subject: [PATCH 1909/6849] qemu/mips-malta: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_mips_malta_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 2dc3f70278..16ffe8f242 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,10 +6,13 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 0ecb386aba5b7bc5816c7b987a7bb3d0f3becbde Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:36 +0000
Subject: [PATCH 1910/6849] qemu/ppc-g3beige: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_ppc_g3beige_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 8f36446a94..e69a6dfcc4 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,10 +6,13 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y

From 0160e9d8af83d9e0a03b5f36d49be9a45e8aaf4c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:37 +0000
Subject: [PATCH 1911/6849] qemu/sparc-ss10: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 77250f8aa7..62aee753ae 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,9 +6,12 @@ BR2_sparc_supersparc=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 1ca70ca26478dd999a463bdb99d7dee1c3532e79 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:38 +0000
Subject: [PATCH 1912/6849] qemu/x86-64: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_64_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 3c72b367aa..c20aaca9d7 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,9 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"

From 2f764a26334fb07292545265e2ae9e5858794677 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 3 May 2012 15:08:39 +0000
Subject: [PATCH 1913/6849] qemu/x86: update to use kernel 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_x86_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 5d0e23b996..f22fdea268 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,9 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"

From 33f454bbef77638a29ec24807e30740323e15b3e Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 28 Apr 2012 07:14:50 +0000
Subject: [PATCH 1914/6849] config: make it possible to specify which config
 file to use for 'make defconfig'

So that this works:

 % make defconfig BR2_DEFCONFIG=~/buildroot-defconfig

Right now we have to do:

 % cp ~/buildroot-defconfig configs/buildroot_defconfig
 % make buildroot_defconfig

That would dirty the buildroot tree and requires it to be writable.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cc8124abb7..a7625ba0ee 100644
--- a/Makefile
+++ b/Makefile
@@ -540,7 +540,7 @@ silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --defconfig $(CONFIG_CONFIG_IN)
+	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(BR2_DEFCONFIG),=$(BR2_DEFCONFIG)) $(CONFIG_CONFIG_IN)
 
 %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -603,6 +603,7 @@ help:
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
 	@echo '  randconfig             - New config with random answer to all options'
 	@echo '  defconfig              - New config with default answer to all options'
+	@echo '                             BR2_DEFCONFIG, if set, is used as input'
 	@echo '  savedefconfig          - Save current config as ./defconfig (minimal config)'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'

From 84d589a963d902849b7022091e97ec71c38ed82e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 30 Apr 2012 03:48:15 +0000
Subject: [PATCH 1915/6849] package/multimedia: move multimedia libraries out

Move multimedia libraries ouf of the Audio and Video category into the
Libraries/Multimedia one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                     | 11 +++++++++++
 package/{multimedia => }/libdvdnav/Config.in          |  0
 package/{multimedia => }/libdvdnav/libdvdnav.mk       |  0
 package/{multimedia => }/libdvdread/Config.in         |  0
 package/{multimedia => }/libdvdread/libdvdread.mk     |  0
 package/{multimedia => }/libmms/Config.in             |  0
 package/{multimedia => }/libmms/libmms.mk             |  0
 package/{multimedia => }/libmpeg2/Config.in           |  0
 .../libmpeg2/libmpeg2-0.5.1-altivec.patch             |  0
 package/{multimedia => }/libmpeg2/libmpeg2.mk         |  0
 package/{multimedia => }/libogg/Config.in             |  0
 package/{multimedia => }/libogg/libogg.mk             |  0
 package/{multimedia => }/libplayer/Config.in          |  0
 package/{multimedia => }/libplayer/libplayer.mk       |  0
 package/{multimedia => }/libtheora/Config.in          |  0
 package/{multimedia => }/libtheora/libtheora.mk       |  0
 package/{multimedia => }/live555/Config.in            |  0
 package/{multimedia => }/live555/live555.mk           |  0
 package/multimedia/Config.in                          |  8 --------
 19 files changed, 11 insertions(+), 8 deletions(-)
 rename package/{multimedia => }/libdvdnav/Config.in (100%)
 rename package/{multimedia => }/libdvdnav/libdvdnav.mk (100%)
 rename package/{multimedia => }/libdvdread/Config.in (100%)
 rename package/{multimedia => }/libdvdread/libdvdread.mk (100%)
 rename package/{multimedia => }/libmms/Config.in (100%)
 rename package/{multimedia => }/libmms/libmms.mk (100%)
 rename package/{multimedia => }/libmpeg2/Config.in (100%)
 rename package/{multimedia => }/libmpeg2/libmpeg2-0.5.1-altivec.patch (100%)
 rename package/{multimedia => }/libmpeg2/libmpeg2.mk (100%)
 rename package/{multimedia => }/libogg/Config.in (100%)
 rename package/{multimedia => }/libogg/libogg.mk (100%)
 rename package/{multimedia => }/libplayer/Config.in (100%)
 rename package/{multimedia => }/libplayer/libplayer.mk (100%)
 rename package/{multimedia => }/libtheora/Config.in (100%)
 rename package/{multimedia => }/libtheora/libtheora.mk (100%)
 rename package/{multimedia => }/live555/Config.in (100%)
 rename package/{multimedia => }/live555/live555.mk (100%)

diff --git a/package/Config.in b/package/Config.in
index dd02e32f6d..0bc4dd43c2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -353,6 +353,17 @@ source "package/jquery-validation/Config.in"
 source "package/jsmin/Config.in"
 endmenu
 
+menu "Multimedia"
+source "package/libdvdread/Config.in"
+source "package/libdvdnav/Config.in"
+source "package/libmms/Config.in"
+source "package/libmpeg2/Config.in"
+source "package/libogg/Config.in"
+source "package/libplayer/Config.in"
+source "package/libtheora/Config.in"
+source "package/live555/Config.in"
+endmenu
+
 menu "Networking"
 source "package/glib-networking/Config.in"
 source "package/libcgi/Config.in"
diff --git a/package/multimedia/libdvdnav/Config.in b/package/libdvdnav/Config.in
similarity index 100%
rename from package/multimedia/libdvdnav/Config.in
rename to package/libdvdnav/Config.in
diff --git a/package/multimedia/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
similarity index 100%
rename from package/multimedia/libdvdnav/libdvdnav.mk
rename to package/libdvdnav/libdvdnav.mk
diff --git a/package/multimedia/libdvdread/Config.in b/package/libdvdread/Config.in
similarity index 100%
rename from package/multimedia/libdvdread/Config.in
rename to package/libdvdread/Config.in
diff --git a/package/multimedia/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
similarity index 100%
rename from package/multimedia/libdvdread/libdvdread.mk
rename to package/libdvdread/libdvdread.mk
diff --git a/package/multimedia/libmms/Config.in b/package/libmms/Config.in
similarity index 100%
rename from package/multimedia/libmms/Config.in
rename to package/libmms/Config.in
diff --git a/package/multimedia/libmms/libmms.mk b/package/libmms/libmms.mk
similarity index 100%
rename from package/multimedia/libmms/libmms.mk
rename to package/libmms/libmms.mk
diff --git a/package/multimedia/libmpeg2/Config.in b/package/libmpeg2/Config.in
similarity index 100%
rename from package/multimedia/libmpeg2/Config.in
rename to package/libmpeg2/Config.in
diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch b/package/libmpeg2/libmpeg2-0.5.1-altivec.patch
similarity index 100%
rename from package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch
rename to package/libmpeg2/libmpeg2-0.5.1-altivec.patch
diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
similarity index 100%
rename from package/multimedia/libmpeg2/libmpeg2.mk
rename to package/libmpeg2/libmpeg2.mk
diff --git a/package/multimedia/libogg/Config.in b/package/libogg/Config.in
similarity index 100%
rename from package/multimedia/libogg/Config.in
rename to package/libogg/Config.in
diff --git a/package/multimedia/libogg/libogg.mk b/package/libogg/libogg.mk
similarity index 100%
rename from package/multimedia/libogg/libogg.mk
rename to package/libogg/libogg.mk
diff --git a/package/multimedia/libplayer/Config.in b/package/libplayer/Config.in
similarity index 100%
rename from package/multimedia/libplayer/Config.in
rename to package/libplayer/Config.in
diff --git a/package/multimedia/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
similarity index 100%
rename from package/multimedia/libplayer/libplayer.mk
rename to package/libplayer/libplayer.mk
diff --git a/package/multimedia/libtheora/Config.in b/package/libtheora/Config.in
similarity index 100%
rename from package/multimedia/libtheora/Config.in
rename to package/libtheora/Config.in
diff --git a/package/multimedia/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
similarity index 100%
rename from package/multimedia/libtheora/libtheora.mk
rename to package/libtheora/libtheora.mk
diff --git a/package/multimedia/live555/Config.in b/package/live555/Config.in
similarity index 100%
rename from package/multimedia/live555/Config.in
rename to package/live555/Config.in
diff --git a/package/multimedia/live555/live555.mk b/package/live555/live555.mk
similarity index 100%
rename from package/multimedia/live555/live555.mk
rename to package/live555/live555.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index ca6b791c72..89c5041ee1 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -20,21 +20,13 @@ source "package/multimedia/libao/Config.in"
 source "package/multimedia/libcdaudio/Config.in"
 source "package/multimedia/libcue/Config.in"
 source "package/multimedia/libcuefile/Config.in"
-source "package/multimedia/libdvdread/Config.in"
-source "package/multimedia/libdvdnav/Config.in"
 source "package/multimedia/libid3tag/Config.in"
 source "package/multimedia/libmad/Config.in"
-source "package/multimedia/libmms/Config.in"
 source "package/multimedia/libmpd/Config.in"
-source "package/multimedia/libmpeg2/Config.in"
-source "package/multimedia/libogg/Config.in"
-source "package/multimedia/libplayer/Config.in"
 source "package/multimedia/libreplaygain/Config.in"
 source "package/multimedia/libsamplerate/Config.in"
 source "package/multimedia/libsndfile/Config.in"
-source "package/multimedia/libtheora/Config.in"
 source "package/multimedia/libvorbis/Config.in"
-source "package/multimedia/live555/Config.in"
 source "package/multimedia/madplay/Config.in"
 source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"

From 5d6f32878f707f4c28fe09d02e960d851c76e3c3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 30 Apr 2012 03:48:16 +0000
Subject: [PATCH 1916/6849] package/multimedia: move audio libraries out

Move audio libraries out of the Audio and Video category into the
Libraries/Audio one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             | 20 +++++++++++++++++++
 package/{multimedia => }/alsa-lib/Config.in   |  0
 .../alsa-lib/alsa-lib-avr32-bad-inline.patch  |  0
 package/{multimedia => }/alsa-lib/alsa-lib.mk |  0
 package/{multimedia => }/audiofile/Config.in  |  0
 .../{multimedia => }/audiofile/audiofile.mk   |  0
 package/{multimedia => }/libao/Config.in      |  0
 package/{multimedia => }/libao/libao.mk       |  0
 package/{multimedia => }/libcdaudio/Config.in |  0
 .../{multimedia => }/libcdaudio/libcdaudio.mk |  0
 package/{multimedia => }/libcue/Config.in     |  0
 .../libcue/libcue-1.4.0-__unused-fix.patch    |  0
 package/{multimedia => }/libcue/libcue.mk     |  0
 package/{multimedia => }/libcuefile/Config.in |  0
 .../{multimedia => }/libcuefile/libcuefile.mk |  0
 package/{multimedia => }/libid3tag/Config.in  |  0
 .../{multimedia => }/libid3tag/libid3tag.mk   |  0
 package/{multimedia => }/libmad/Config.in     |  0
 ...ad-0.15.1b-mips-h-constraint-removal.patch |  0
 .../libmad-0.15.1b-optimization.patch.avr32   |  0
 ...mad-0.15.1b-remove-deprecated-cflags.patch |  0
 package/{multimedia => }/libmad/libmad.mk     |  0
 package/{multimedia => }/libmad/mad.pc        |  0
 package/{multimedia => }/libmpd/Config.in     |  0
 package/{multimedia => }/libmpd/libmpd.mk     |  0
 .../{multimedia => }/libreplaygain/Config.in  |  0
 .../libreplaygain/libreplaygain.mk            |  0
 .../{multimedia => }/libsamplerate/Config.in  |  0
 .../libsamplerate/libsamplerate.mk            |  0
 package/{multimedia => }/libsndfile/Config.in |  0
 .../libsndfile/libsndfile-srconly.patch       |  0
 .../{multimedia => }/libsndfile/libsndfile.mk |  0
 package/{multimedia => }/libvorbis/Config.in  |  0
 .../{multimedia => }/libvorbis/libvorbis.mk   |  0
 package/multimedia/Config.in                  | 17 ----------------
 package/{multimedia => }/portaudio/Config.in  |  0
 .../{multimedia => }/portaudio/portaudio.mk   |  0
 package/{multimedia => }/speex/Config.in      |  0
 package/{multimedia => }/speex/speex.mk       |  0
 package/{multimedia => }/taglib/Config.in     |  0
 package/{multimedia => }/taglib/taglib.mk     |  0
 package/{multimedia => }/tremor/Config.in     |  0
 package/{multimedia => }/tremor/tremor.mk     |  0
 43 files changed, 20 insertions(+), 17 deletions(-)
 rename package/{multimedia => }/alsa-lib/Config.in (100%)
 rename package/{multimedia => }/alsa-lib/alsa-lib-avr32-bad-inline.patch (100%)
 rename package/{multimedia => }/alsa-lib/alsa-lib.mk (100%)
 rename package/{multimedia => }/audiofile/Config.in (100%)
 rename package/{multimedia => }/audiofile/audiofile.mk (100%)
 rename package/{multimedia => }/libao/Config.in (100%)
 rename package/{multimedia => }/libao/libao.mk (100%)
 rename package/{multimedia => }/libcdaudio/Config.in (100%)
 rename package/{multimedia => }/libcdaudio/libcdaudio.mk (100%)
 rename package/{multimedia => }/libcue/Config.in (100%)
 rename package/{multimedia => }/libcue/libcue-1.4.0-__unused-fix.patch (100%)
 rename package/{multimedia => }/libcue/libcue.mk (100%)
 rename package/{multimedia => }/libcuefile/Config.in (100%)
 rename package/{multimedia => }/libcuefile/libcuefile.mk (100%)
 rename package/{multimedia => }/libid3tag/Config.in (100%)
 rename package/{multimedia => }/libid3tag/libid3tag.mk (100%)
 rename package/{multimedia => }/libmad/Config.in (100%)
 rename package/{multimedia => }/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch (100%)
 rename package/{multimedia => }/libmad/libmad-0.15.1b-optimization.patch.avr32 (100%)
 rename package/{multimedia => }/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch (100%)
 rename package/{multimedia => }/libmad/libmad.mk (100%)
 rename package/{multimedia => }/libmad/mad.pc (100%)
 rename package/{multimedia => }/libmpd/Config.in (100%)
 rename package/{multimedia => }/libmpd/libmpd.mk (100%)
 rename package/{multimedia => }/libreplaygain/Config.in (100%)
 rename package/{multimedia => }/libreplaygain/libreplaygain.mk (100%)
 rename package/{multimedia => }/libsamplerate/Config.in (100%)
 rename package/{multimedia => }/libsamplerate/libsamplerate.mk (100%)
 rename package/{multimedia => }/libsndfile/Config.in (100%)
 rename package/{multimedia => }/libsndfile/libsndfile-srconly.patch (100%)
 rename package/{multimedia => }/libsndfile/libsndfile.mk (100%)
 rename package/{multimedia => }/libvorbis/Config.in (100%)
 rename package/{multimedia => }/libvorbis/libvorbis.mk (100%)
 rename package/{multimedia => }/portaudio/Config.in (100%)
 rename package/{multimedia => }/portaudio/portaudio.mk (100%)
 rename package/{multimedia => }/speex/Config.in (100%)
 rename package/{multimedia => }/speex/speex.mk (100%)
 rename package/{multimedia => }/taglib/Config.in (100%)
 rename package/{multimedia => }/taglib/taglib.mk (100%)
 rename package/{multimedia => }/tremor/Config.in (100%)
 rename package/{multimedia => }/tremor/tremor.mk (100%)

diff --git a/package/Config.in b/package/Config.in
index 0bc4dd43c2..6caca9da4f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -267,6 +267,26 @@ endmenu
 
 menu "Libraries"
 
+menu "Audio/Sound"
+source "package/alsa-lib/Config.in"
+source "package/audiofile/Config.in"
+source "package/libao/Config.in"
+source "package/libcdaudio/Config.in"
+source "package/libcue/Config.in"
+source "package/libcuefile/Config.in"
+source "package/libid3tag/Config.in"
+source "package/libmad/Config.in"
+source "package/libmpd/Config.in"
+source "package/libreplaygain/Config.in"
+source "package/libsamplerate/Config.in"
+source "package/libsndfile/Config.in"
+source "package/libvorbis/Config.in"
+source "package/portaudio/Config.in"
+source "package/speex/Config.in"
+source "package/taglib/Config.in"
+source "package/tremor/Config.in"
+endmenu
+
 menu "Compression and decompression"
 source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
diff --git a/package/multimedia/alsa-lib/Config.in b/package/alsa-lib/Config.in
similarity index 100%
rename from package/multimedia/alsa-lib/Config.in
rename to package/alsa-lib/Config.in
diff --git a/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch b/package/alsa-lib/alsa-lib-avr32-bad-inline.patch
similarity index 100%
rename from package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch
rename to package/alsa-lib/alsa-lib-avr32-bad-inline.patch
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
similarity index 100%
rename from package/multimedia/alsa-lib/alsa-lib.mk
rename to package/alsa-lib/alsa-lib.mk
diff --git a/package/multimedia/audiofile/Config.in b/package/audiofile/Config.in
similarity index 100%
rename from package/multimedia/audiofile/Config.in
rename to package/audiofile/Config.in
diff --git a/package/multimedia/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
similarity index 100%
rename from package/multimedia/audiofile/audiofile.mk
rename to package/audiofile/audiofile.mk
diff --git a/package/multimedia/libao/Config.in b/package/libao/Config.in
similarity index 100%
rename from package/multimedia/libao/Config.in
rename to package/libao/Config.in
diff --git a/package/multimedia/libao/libao.mk b/package/libao/libao.mk
similarity index 100%
rename from package/multimedia/libao/libao.mk
rename to package/libao/libao.mk
diff --git a/package/multimedia/libcdaudio/Config.in b/package/libcdaudio/Config.in
similarity index 100%
rename from package/multimedia/libcdaudio/Config.in
rename to package/libcdaudio/Config.in
diff --git a/package/multimedia/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
similarity index 100%
rename from package/multimedia/libcdaudio/libcdaudio.mk
rename to package/libcdaudio/libcdaudio.mk
diff --git a/package/multimedia/libcue/Config.in b/package/libcue/Config.in
similarity index 100%
rename from package/multimedia/libcue/Config.in
rename to package/libcue/Config.in
diff --git a/package/multimedia/libcue/libcue-1.4.0-__unused-fix.patch b/package/libcue/libcue-1.4.0-__unused-fix.patch
similarity index 100%
rename from package/multimedia/libcue/libcue-1.4.0-__unused-fix.patch
rename to package/libcue/libcue-1.4.0-__unused-fix.patch
diff --git a/package/multimedia/libcue/libcue.mk b/package/libcue/libcue.mk
similarity index 100%
rename from package/multimedia/libcue/libcue.mk
rename to package/libcue/libcue.mk
diff --git a/package/multimedia/libcuefile/Config.in b/package/libcuefile/Config.in
similarity index 100%
rename from package/multimedia/libcuefile/Config.in
rename to package/libcuefile/Config.in
diff --git a/package/multimedia/libcuefile/libcuefile.mk b/package/libcuefile/libcuefile.mk
similarity index 100%
rename from package/multimedia/libcuefile/libcuefile.mk
rename to package/libcuefile/libcuefile.mk
diff --git a/package/multimedia/libid3tag/Config.in b/package/libid3tag/Config.in
similarity index 100%
rename from package/multimedia/libid3tag/Config.in
rename to package/libid3tag/Config.in
diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
similarity index 100%
rename from package/multimedia/libid3tag/libid3tag.mk
rename to package/libid3tag/libid3tag.mk
diff --git a/package/multimedia/libmad/Config.in b/package/libmad/Config.in
similarity index 100%
rename from package/multimedia/libmad/Config.in
rename to package/libmad/Config.in
diff --git a/package/multimedia/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch b/package/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch
similarity index 100%
rename from package/multimedia/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch
rename to package/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch
diff --git a/package/multimedia/libmad/libmad-0.15.1b-optimization.patch.avr32 b/package/libmad/libmad-0.15.1b-optimization.patch.avr32
similarity index 100%
rename from package/multimedia/libmad/libmad-0.15.1b-optimization.patch.avr32
rename to package/libmad/libmad-0.15.1b-optimization.patch.avr32
diff --git a/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch b/package/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
similarity index 100%
rename from package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
rename to package/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
diff --git a/package/multimedia/libmad/libmad.mk b/package/libmad/libmad.mk
similarity index 100%
rename from package/multimedia/libmad/libmad.mk
rename to package/libmad/libmad.mk
diff --git a/package/multimedia/libmad/mad.pc b/package/libmad/mad.pc
similarity index 100%
rename from package/multimedia/libmad/mad.pc
rename to package/libmad/mad.pc
diff --git a/package/multimedia/libmpd/Config.in b/package/libmpd/Config.in
similarity index 100%
rename from package/multimedia/libmpd/Config.in
rename to package/libmpd/Config.in
diff --git a/package/multimedia/libmpd/libmpd.mk b/package/libmpd/libmpd.mk
similarity index 100%
rename from package/multimedia/libmpd/libmpd.mk
rename to package/libmpd/libmpd.mk
diff --git a/package/multimedia/libreplaygain/Config.in b/package/libreplaygain/Config.in
similarity index 100%
rename from package/multimedia/libreplaygain/Config.in
rename to package/libreplaygain/Config.in
diff --git a/package/multimedia/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk
similarity index 100%
rename from package/multimedia/libreplaygain/libreplaygain.mk
rename to package/libreplaygain/libreplaygain.mk
diff --git a/package/multimedia/libsamplerate/Config.in b/package/libsamplerate/Config.in
similarity index 100%
rename from package/multimedia/libsamplerate/Config.in
rename to package/libsamplerate/Config.in
diff --git a/package/multimedia/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
similarity index 100%
rename from package/multimedia/libsamplerate/libsamplerate.mk
rename to package/libsamplerate/libsamplerate.mk
diff --git a/package/multimedia/libsndfile/Config.in b/package/libsndfile/Config.in
similarity index 100%
rename from package/multimedia/libsndfile/Config.in
rename to package/libsndfile/Config.in
diff --git a/package/multimedia/libsndfile/libsndfile-srconly.patch b/package/libsndfile/libsndfile-srconly.patch
similarity index 100%
rename from package/multimedia/libsndfile/libsndfile-srconly.patch
rename to package/libsndfile/libsndfile-srconly.patch
diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk
similarity index 100%
rename from package/multimedia/libsndfile/libsndfile.mk
rename to package/libsndfile/libsndfile.mk
diff --git a/package/multimedia/libvorbis/Config.in b/package/libvorbis/Config.in
similarity index 100%
rename from package/multimedia/libvorbis/Config.in
rename to package/libvorbis/Config.in
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
similarity index 100%
rename from package/multimedia/libvorbis/libvorbis.mk
rename to package/libvorbis/libvorbis.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 89c5041ee1..895dde6b3a 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -1,7 +1,5 @@
 menu "Audio and video libraries and applications"
-source "package/multimedia/alsa-lib/Config.in"
 source "package/multimedia/alsa-utils/Config.in"
-source "package/multimedia/audiofile/Config.in"
 source "package/multimedia/aumix/Config.in"
 source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
@@ -16,28 +14,13 @@ source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/lame/Config.in"
-source "package/multimedia/libao/Config.in"
-source "package/multimedia/libcdaudio/Config.in"
-source "package/multimedia/libcue/Config.in"
-source "package/multimedia/libcuefile/Config.in"
-source "package/multimedia/libid3tag/Config.in"
-source "package/multimedia/libmad/Config.in"
-source "package/multimedia/libmpd/Config.in"
-source "package/multimedia/libreplaygain/Config.in"
-source "package/multimedia/libsamplerate/Config.in"
-source "package/multimedia/libsndfile/Config.in"
-source "package/multimedia/libvorbis/Config.in"
 source "package/multimedia/madplay/Config.in"
 source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
-source "package/multimedia/portaudio/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
-source "package/multimedia/speex/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
-source "package/multimedia/taglib/Config.in"
-source "package/multimedia/tremor/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
 source "package/multimedia/wavpack/Config.in"
 endmenu
diff --git a/package/multimedia/portaudio/Config.in b/package/portaudio/Config.in
similarity index 100%
rename from package/multimedia/portaudio/Config.in
rename to package/portaudio/Config.in
diff --git a/package/multimedia/portaudio/portaudio.mk b/package/portaudio/portaudio.mk
similarity index 100%
rename from package/multimedia/portaudio/portaudio.mk
rename to package/portaudio/portaudio.mk
diff --git a/package/multimedia/speex/Config.in b/package/speex/Config.in
similarity index 100%
rename from package/multimedia/speex/Config.in
rename to package/speex/Config.in
diff --git a/package/multimedia/speex/speex.mk b/package/speex/speex.mk
similarity index 100%
rename from package/multimedia/speex/speex.mk
rename to package/speex/speex.mk
diff --git a/package/multimedia/taglib/Config.in b/package/taglib/Config.in
similarity index 100%
rename from package/multimedia/taglib/Config.in
rename to package/taglib/Config.in
diff --git a/package/multimedia/taglib/taglib.mk b/package/taglib/taglib.mk
similarity index 100%
rename from package/multimedia/taglib/taglib.mk
rename to package/taglib/taglib.mk
diff --git a/package/multimedia/tremor/Config.in b/package/tremor/Config.in
similarity index 100%
rename from package/multimedia/tremor/Config.in
rename to package/tremor/Config.in
diff --git a/package/multimedia/tremor/tremor.mk b/package/tremor/tremor.mk
similarity index 100%
rename from package/multimedia/tremor/tremor.mk
rename to package/tremor/tremor.mk

From 7446d9471ceef1a1bf81cf5882cdab3d12237c71 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 30 Apr 2012 03:48:17 +0000
Subject: [PATCH 1917/6849] package/multimedia: drop libraries, it's just
 applications now

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 895dde6b3a..afe4a23b0c 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -1,4 +1,4 @@
-menu "Audio and video libraries and applications"
+menu "Audio and video applications"
 source "package/multimedia/alsa-utils/Config.in"
 source "package/multimedia/aumix/Config.in"
 source "package/multimedia/bellagio/Config.in"

From 7c79537cffbf52ceecd3a46ed5d52211eeefcd1e Mon Sep 17 00:00:00 2001
From: Nicolas Dechesne <n-dechesne@ti.com>
Date: Sun, 18 Mar 2012 23:04:50 +0100
Subject: [PATCH 1918/6849] uboot: Add support for U-Boot SPL

SPL is a first stage bootloader. On pandaboard it supercedes x-loader,
and should now be used.

This patch ensures that either SPL or xloader can be selected.

A config variable has been added for the name of the SPL binary generated
during u-boot build. For most platform it is u-boot-spl.bin but not always.
It is MLO on OMAP for example.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Frank Hunleth <fhunleth@troodon-software.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 18 ++++++++++++++++++
 boot/uboot/uboot.mk  |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 99d5623a99..cb40648048 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -141,4 +141,22 @@ config BR2_TARGET_UBOOT_ETH1ADDR
 
 endif # BR2_TARGET_UBOOT_NETWORK
 
+config BR2_TARGET_UBOOT_SPL
+	bool "U-Boot SPL support"
+	depends on !BR2_TARGET_XLOADER
+	help
+	  Enable the U-Boot SPL support. SPL is a first stage
+	  bootloader loaded into internal memory in charge of
+	  enabling and configuring the external memory (DDR),
+	  and load the u-boot program into DDR.
+
+config BR2_TARGET_UBOOT_SPL_NAME
+	string "U-Boot SPL target name"
+	default "u-boot-spl.bin"
+	depends on BR2_TARGET_UBOOT_SPL
+	help
+	  This is the name of the SPL binary, generated during
+	  u-boot build. For most platform it is u-boot-spl.bin
+	  but not always. It is MLO on OMAP for example.
+
 endif # BR2_TARGET_UBOOT
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index db9de8d3cd..f64964c006 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -88,6 +88,8 @@ endef
 
 define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
+	$(if $(BR2_TARGET_UBOOT_SPL),
+		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
 endef
 
 $(eval $(call GENTARGETS))

From 81302ba68569ff62566fe463a4a8ac1a1d12baca Mon Sep 17 00:00:00 2001
From: Nicolas Dechesne <n-dechesne@ti.com>
Date: Sun, 18 Mar 2012 23:04:51 +0100
Subject: [PATCH 1919/6849] uboot: add a new binary format for u-boot.img

For some platforms like OMAP, a new binary format is now being used
for u-boot: u-boot.img. It is basically u-boot.bin which has been
processed with mkimage.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 3 +++
 boot/uboot/uboot.mk  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index cb40648048..f83cf4b510 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -83,6 +83,9 @@ choice
 config BR2_TARGET_UBOOT_FORMAT_BIN
 	bool "u-boot.bin"
 
+config BR2_TARGET_UBOOT_FORMAT_IMG
+	bool "u-boot.img"
+
 config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
 	bool "u-boot-nand.bin"
 
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index f64964c006..31190922f8 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -29,6 +29,8 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BIN          = u-boot-nand.bin
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
+UBOOT_BIN          = u-boot.img
 else
 UBOOT_BIN          = u-boot.bin
 endif

From a23351e7be18650b54fe33ac1fef014a364a938a Mon Sep 17 00:00:00 2001
From: Nicolas Dechesne <n-dechesne@ti.com>
Date: Sun, 18 Mar 2012 23:04:52 +0100
Subject: [PATCH 1920/6849] configs: add support for PandaBoard and PandaBoard
 ES

This is a default configuration for Panda and PandaES, tested on both
platforms.

DEVTMPFS is enabled, to use static dev configuration one would need
to update the generic dev table for ttyO driver.

Panda is well supported in mainline kernel with omap2plus_defconfig,
so this should be safe.

U-boot SPL support is enabled by default as x-loader is now
deprecated.

With OMAP platforms u-boot,img format is prefered now, so it's enabled
by default as well. Also, on PandaBoard, the name of SPL target file
is MLO.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/pandaboard_defconfig | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 configs/pandaboard_defconfig

diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig
new file mode 100644
index 0000000000..9496b7f8ec
--- /dev/null
+++ b/configs/pandaboard_defconfig
@@ -0,0 +1,26 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a9=y
+
+# system
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyO2"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
+
+# GCC
+BR2_GCC_VERSION_4_6_X=y
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_BOARDNAME="omap4_panda"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="MLO"

From 0b93a8ceadf13a98cb4ac5dada52dcd92307edf6 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 25 Apr 2012 01:45:16 +0000
Subject: [PATCH 1921/6849] pkg-download.mk: Add missing argument when
 downloading from primary mirror

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-download.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index ccf819e3dd..b833de9e0e 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -207,7 +207,7 @@ define DOWNLOAD_INNER
 	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
 		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
 			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
-			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 		esac ; \
 	fi ; \
 	if test -n "$(1)" ; then \

From adebe9df0f42a929441d40e84f30e546f2852d68 Mon Sep 17 00:00:00 2001
From: Dimitry Golubovsky <golubovsky@gmail.com>
Date: Sat, 5 May 2012 16:05:18 +0000
Subject: [PATCH 1922/6849] package: add read-edid

[Peter: fixup whitespace]
Signed-off-by: Dmitry <golubovsky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/read-edid/Config.in    | 14 ++++++++++++++
 package/read-edid/read-edid.mk | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/read-edid/Config.in
 create mode 100644 package/read-edid/read-edid.mk

diff --git a/package/Config.in b/package/Config.in
index 6caca9da4f..94d0fb47f0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -211,6 +211,7 @@ source "package/openocd/Config.in"
 source "package/parted/Config.in"
 source "package/pciutils/Config.in"
 source "package/picocom/Config.in"
+source "package/read-edid/Config.in"
 source "package/rng-tools/Config.in"
 source "package/sane-backends/Config.in"
 source "package/sdparm/Config.in"
diff --git a/package/read-edid/Config.in b/package/read-edid/Config.in
new file mode 100644
index 0000000000..bdcb7a7d2e
--- /dev/null
+++ b/package/read-edid/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_READ_EDID
+	bool "read-edid"
+	depends on BR2_i386
+	help
+	  Read-edid is a pair of tools for reading the EDID from a
+	  monitor.  It should work with most monitors made since 1996
+	  (except for newer ones with 256-byte EDID's - WiP), assuming
+	  the video card supports the standard read commands (most
+	  do).  Read-edid is a set of two tools - get-edid, which gets
+	  the raw edid information from the monitor, and parse-edid,
+	  which turns the raw binary information into an
+	  XF86Config-compatible monitor section.
+
+	  http://polypux.org/projects/read-edid/
diff --git a/package/read-edid/read-edid.mk b/package/read-edid/read-edid.mk
new file mode 100644
index 0000000000..b568d5b8b9
--- /dev/null
+++ b/package/read-edid/read-edid.mk
@@ -0,0 +1,19 @@
+############################################
+#
+# read-edid
+#
+############################################
+
+READ_EDID_VERSION = 1.4.2
+READ_EDID_SITE = http://www.polypux.org/projects/read-edid/
+
+define READ_EDID_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define READ_EDID_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/get-edid $(TARGET_DIR)/sbin/get-edid
+	$(INSTALL) -D -m 0755 $(@D)/parse-edid $(TARGET_DIR)/sbin/parse-edid
+endef
+
+$(eval $(call AUTOTARGETS))

From a4ee7179e692bdded8b98c54dd484b17098c695d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 5 May 2012 20:59:00 +0000
Subject: [PATCH 1923/6849] Added the empty package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/empty/Config.in |  6 ++++++
 package/empty/empty.mk  | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/empty/Config.in
 create mode 100644 package/empty/empty.mk

diff --git a/package/Config.in b/package/Config.in
index 94d0fb47f0..90b8e19053 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -468,6 +468,7 @@ endmenu
 endmenu
 
 menu "Miscellaneous"
+source "package/empty/Config.in"
 source "package/shared-mime-info/Config.in"
 endmenu
 
diff --git a/package/empty/Config.in b/package/empty/Config.in
new file mode 100644
index 0000000000..67b09fcb3b
--- /dev/null
+++ b/package/empty/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_EMPTY
+	bool "empty"
+	help
+	  Run processes and applications under pseudo-terminal (PTY) sessions.
+
+	  http://empty.sourceforge.net/
diff --git a/package/empty/empty.mk b/package/empty/empty.mk
new file mode 100644
index 0000000000..137e196e74
--- /dev/null
+++ b/package/empty/empty.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# empty
+#
+#############################################################
+EMPTY_VERSION = 0.6.18b
+EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
+EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
+
+define EMPTY_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+endef
+
+define EMPTY_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/empty $(TARGET_DIR)/usr/bin/empty
+endef
+
+$(eval $(call GENTARGETS))

From b3ffb2aaaa3931f8e2039c3f95f1c2c65093bff9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 6 May 2012 11:39:05 +0200
Subject: [PATCH 1924/6849] libmad: unbreak after 5d6f32878f7 (move audio
 libraries out)

libmad is no longer in package/multimeda, so adjust .pc handling to match.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmad/libmad.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index a469fece12..6e53cf2574 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -15,12 +15,12 @@ define LIBMAD_PREVENT_AUTOMAKE
 endef
 
 define LIBMAD_INSTALL_STAGING_PC
-	$(INSTALL) -D package/multimedia/libmad/mad.pc \
+	$(INSTALL) -D package/libmad/mad.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
 endef
 
 define LIBMAD_INSTALL_TARGET_PC
-	$(INSTALL) -D package/multimedia/libmad/mad.pc \
+	$(INSTALL) -D package/libmad/mad.pc \
 		$(TARGET_DIR)/usr/lib/pkgconfig/mad.pc
 endef
 

From ed7b3362ad6dc33899766c803bba51240111aa43 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 5 May 2012 23:39:20 +0000
Subject: [PATCH 1925/6849] valgrind: fix build on PowerPC/uClibc

Fixes build failures like
http://autobuild.buildroot.org/results/112fa7c56e1e31c9a81d5f27394f58789e36bfec/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rind-3.7.0-dont-include-a-out-header.patch | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch

diff --git a/package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch b/package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
new file mode 100644
index 0000000000..ed1c939ed6
--- /dev/null
+++ b/package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
@@ -0,0 +1,45 @@
+Add replacement for <a.out.h>
+
+Valgrind includes <a.out.h> to get the definition of 'struct
+nlist'. However, while glibc directly defines 'struct nlist' in
+<a.out.h>, uClibc relies on it being defined by kernel headers (i.e
+<a.out.h> simply includes <linux/a.out.h>). This works for most
+architectures, but not for PowerPC, on which the a.out binary format
+has never been supported, and therefore the <linux/a.out.h> kernel
+header does not exist.
+
+One solution would have been to use the <nlist.h> header, but this one
+is only available in glibc, and it also has a slightly different
+definition than the one in <a.out.h>. So, for the time being, the
+easiest solution is to just replace the #include <a.out.h> in Valgrind
+code by a copy/paste of the 'struct nlist' definition.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/coregrind/m_debuginfo/readstabs.c
+===================================================================
+--- a/coregrind/m_debuginfo/readstabs.c
++++ b/coregrind/m_debuginfo/readstabs.c
+@@ -52,7 +52,21 @@
+ 
+ /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
+ #if defined(VGO_linux)
+-#  include <a.out.h> /* stabs defns */
++/* Copied from a.out.h, because it is otherwise not available on
++   PowerPC/uClibc */
++struct nlist
++{
++  union
++    {
++      char *n_name;
++      struct nlist *n_next;
++      long n_strx;
++    } n_un;
++  unsigned char n_type;
++  char n_other;
++  short n_desc;
++  unsigned long n_value;
++};
+ #elif defined(VGO_darwin)
+ #  include <mach-o/nlist.h>
+ #  define n_other n_sect

From 4326f0020d31e17ccdc1ef991bbc50bdddc47abf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 May 2012 04:56:10 +0000
Subject: [PATCH 1926/6849] libfcgi: fix build problem of libfcgi++

Fix the way libfcgi++ is linked against libfcgi to solve the
http://autobuild.buildroot.org/results/f8e88e93f32e4e94ac9aef5a3f3f2826f1970453/build-end.log
build problem.

Since we're fixing Makefile.am, take that opportunity to add -lm where
needed, to avoid the need of using custom LDFLAGS in libfcgi.mk.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libfcgi-link-against-libfcgi-la.patch     | 20 ++++++
 .../libfcgi/libfcgi-link-against-math.patch   | 28 ++++++++
 .../libfcgi/libfcgi-make-autoreconfable.patch | 67 +++++++++++++++++++
 package/libfcgi/libfcgi.mk                    |  2 +-
 4 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 package/libfcgi/libfcgi-link-against-libfcgi-la.patch
 create mode 100644 package/libfcgi/libfcgi-link-against-math.patch
 create mode 100644 package/libfcgi/libfcgi-make-autoreconfable.patch

diff --git a/package/libfcgi/libfcgi-link-against-libfcgi-la.patch b/package/libfcgi/libfcgi-link-against-libfcgi-la.patch
new file mode 100644
index 0000000000..8a5973ac5b
--- /dev/null
+++ b/package/libfcgi/libfcgi-link-against-libfcgi-la.patch
@@ -0,0 +1,20 @@
+Properly link libfcgi++ against libfcgi
+
+We cannot directly use -lfcgi to link libfcgi++ against libfcgi,
+because libfcgi is not installed at this time. Instead, we should rely
+on libtool doing the right thing, by specifying libfcgi.la in
+libfcgi++ LIBADD variable.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/libfcgi/Makefile.am
+===================================================================
+--- a/libfcgi/Makefile.am
++++ b/libfcgi/Makefile.am
+@@ -23,5 +23,6 @@
+                        $(INCLUDEDIR)/fcgio.h  \
+                        fcgio.cpp
+ libfcgi___la_CFLAGS  = @PTHREAD_CFLAGS@
+-libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@
++libfcgi___la_LIBADD  = libfcgi.la
++libfcgi___la_LDFLAGS = -rpath @libdir@
diff --git a/package/libfcgi/libfcgi-link-against-math.patch b/package/libfcgi/libfcgi-link-against-math.patch
new file mode 100644
index 0000000000..4c87ea6786
--- /dev/null
+++ b/package/libfcgi/libfcgi-link-against-math.patch
@@ -0,0 +1,28 @@
+Link against math libraries when needed
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/cgi-fcgi/Makefile.am
+===================================================================
+--- a/cgi-fcgi/Makefile.am
++++ b/cgi-fcgi/Makefile.am
+@@ -11,5 +11,5 @@
+ LIBDIR      = ../libfcgi
+ LIBFCGI     = $(LIBDIR)/libfcgi.la
+ 
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c
+Index: b/examples/Makefile.am
+===================================================================
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -21,7 +21,7 @@
+ LIBDIR      = ../libfcgi
+ LIBFCGI     = $(LIBDIR)/libfcgi.la
+ 
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ 
+ echo_SOURCES       = $(INCLUDE_FILES) echo.c
+ echo_x_SOURCES     = $(INCLUDE_FILES) echo-x.c
diff --git a/package/libfcgi/libfcgi-make-autoreconfable.patch b/package/libfcgi/libfcgi-make-autoreconfable.patch
new file mode 100644
index 0000000000..e255fc6d3b
--- /dev/null
+++ b/package/libfcgi/libfcgi-make-autoreconfable.patch
@@ -0,0 +1,67 @@
+Make the package autoreconfigurable
+
+Adjust minor details in Makefile.am and configure.in in order to make
+the package compatible with the autoconf/automake versions we are
+using in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/cgi-fcgi/Makefile.am
+===================================================================
+--- a/cgi-fcgi/Makefile.am
++++ b/cgi-fcgi/Makefile.am
+@@ -2,7 +2,7 @@
+ bin_PROGRAMS     = cgi-fcgi
+ 
+ INCLUDEDIR  = ../include
+-CPPFLAGS    = @CPPFLAGS@ -I$(top_srcdir)/include
++AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
+ 
+ INCLUDE_FILES   = $(INCLUDEDIR)/fastcgi.h  \
+ 		  $(INCLUDEDIR)/fcgiapp.h  \
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -4,12 +4,13 @@
+ dnl     generate the file "configure", which is run during the build
+ dnl     to configure the system for the local environment.
+ 
+-AC_INIT
+-AM_INIT_AUTOMAKE(fcgi, 2.4.0)
++AC_INIT([fcgi], [2.4.0])
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AM_CONFIG_HEADER(fcgi_config.h)
+ 
+ AC_PROG_CC
++AC_PROG_CC_C_O
+ AC_PROG_CPP 
+ AC_PROG_INSTALL 
+ AC_PROG_LIBTOOL
+Index: b/examples/Makefile.am
+===================================================================
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -11,7 +11,7 @@
+ EXTRA_PROGRAMS = threaded echo-cpp
+ 
+ INCLUDEDIR  = ../include
+-CPPFLAGS    = @CPPFLAGS@ -I$(top_srcdir)/include
++AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
+ 
+ INCLUDE_FILES   = $(INCLUDEDIR)/fastcgi.h    \
+                   $(INCLUDEDIR)/fcgiapp.h    \
+Index: b/libfcgi/Makefile.am
+===================================================================
+--- a/libfcgi/Makefile.am
++++ b/libfcgi/Makefile.am
+@@ -1,7 +1,7 @@
+ # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $
+ 
+ INCLUDEDIR  = ../include
+-CPPFLAGS    = @CPPFLAGS@ -I$(top_srcdir)/include
++AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
+ 
+ INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h     \
+                 $(INCLUDEDIR)/fcgiapp.h     \
diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk
index 46251655da..22ac2f166b 100644
--- a/package/libfcgi/libfcgi.mk
+++ b/package/libfcgi/libfcgi.mk
@@ -7,6 +7,6 @@ LIBFCGI_VERSION = 2.4.0
 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
 LIBFCGI_SITE = http://www.fastcgi.com/dist
 LIBFCGI_INSTALL_STAGING = YES
-LIBFCGI_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -lm"
+LIBFCGI_AUTORECONF = YES
 
 $(eval $(call AUTOTARGETS))

From a62bb794ddd955b23edead7e0f86cacd07d8f231 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 May 2012 05:33:56 +0000
Subject: [PATCH 1927/6849] gettext: fix build on !thread toolchains

Fixes the build visible at
http://autobuild.buildroot.org/results/0a14bf7c4ae145a9731118d9565e52d0bf70732d/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext-disable-tests.patch | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/gettext/gettext-disable-tests.patch

diff --git a/package/gettext/gettext-disable-tests.patch b/package/gettext/gettext-disable-tests.patch
new file mode 100644
index 0000000000..eded26134a
--- /dev/null
+++ b/package/gettext/gettext-disable-tests.patch
@@ -0,0 +1,37 @@
+Disable gettext tests that require threads
+
+gettext fails to build with a toolchain with no threads support just
+because some gettext tests (that aren't used in Buildroot) require
+threads. We therefore disable the build of such tests.
+
+Since the change in Makefile.in is simple, we also make it in this
+patch, which avoids the need to autoreconf the gettext package.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/gettext-tools/Makefile.am
+===================================================================
+--- a/gettext-tools/Makefile.am
++++ b/gettext-tools/Makefile.am
+@@ -20,7 +20,7 @@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+ 
+-SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
++SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 examples
+ 
+ EXTRA_DIST = misc/DISCLAIM
+ MOSTLYCLEANFILES = core *.stackdump
+Index: b/gettext-tools/Makefile.in
+===================================================================
+--- a/gettext-tools/Makefile.in
++++ b/gettext-tools/Makefile.in
+@@ -484,7 +484,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
++SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 examples
+ 
+ # Allow users to use "gnulib-tool --update".
+ 

From 87657aaabc9d67f642ac668dcd08a20ee3e826f4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 04:17:02 +0000
Subject: [PATCH 1928/6849] dhcp: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 2245839727..38cf00796b 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_DHCP
 	bool "isc dhcp"
+	# fork()
+	depends on BR2_USE_MMU
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 

From ddc3aade64bd5f9fc8cf0a02c5f429b805b40954 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 04:17:03 +0000
Subject: [PATCH 1929/6849] openntpd: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openntpd/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in
index 32d0d8b06f..4dd9a297d5 100644
--- a/package/openntpd/Config.in
+++ b/package/openntpd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_OPENNTPD
 	bool "openntpd"
+	# fork()
+	depends on BR2_USE_MMU
 	help
 	  OpenNTPD is an easy to use implementation of the Network Time
 	  Protocol. It provides the ability to sync the local clock

From 702c251d3c8268611da7a48746853d64b2a5a1d6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 04:17:04 +0000
Subject: [PATCH 1930/6849] wget: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wget/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/wget/Config.in b/package/wget/Config.in
index 3877a3af5b..3f79a64da8 100644
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_WGET
 	bool "wget"
+	# fork()
+	depends on BR2_USE_MMU
 	help
 	  Network utility to retrieve files from http, https and ftp.
 

From a3aabcc997d13664da8e0fd4fd41636a82422e8b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 04:17:05 +0000
Subject: [PATCH 1931/6849] ncftp: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncftp/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index 7b6ae644fb..4aaa62d240 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_NCFTP
 	bool "ncftp"
+	# fork()
+	depends on BR2_USE_MMU
 	help
 	  NcFTP Client (also known as just NcFTP) is a set of FREE application
 	  programs implementing the File Transfer Protocol (FTP).

From 2daf2de6e1a0a8807cd09b2f85dd1c998d022947 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 5 Apr 2012 04:17:06 +0000
Subject: [PATCH 1932/6849] rsync: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rsync/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/rsync/Config.in b/package/rsync/Config.in
index 0f33774499..be95a7cacd 100644
--- a/package/rsync/Config.in
+++ b/package/rsync/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_RSYNC
 	bool "rsync"
+	# fork()
+	depends on BR2_USE_MMU
 	help
 	  File transfer program to keep remote files in sync.
 

From 07639ff186b7b07d843f901bd2413f0b0918b687 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 4 May 2012 02:02:13 +0000
Subject: [PATCH 1933/6849] busybox: add watchdog daemon startup script

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in   | 17 +++++++++++++++++
 package/busybox/S15watchdog | 20 ++++++++++++++++++++
 package/busybox/busybox.mk  | 15 +++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/busybox/S15watchdog

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index b5770eb2a8..946134def2 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -56,6 +56,23 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	  Show packages in menuconfig that are potentially also provided
 	  by busybox.
 
+config BR2_PACKAGE_BUSYBOX_WATCHDOG
+	bool "Install the watchdog daemon startup script"
+	help
+	  Install the watchdog daemon startup script,
+	  that just start at the boot the busybox watchdog daemon.
+
+if BR2_PACKAGE_BUSYBOX_WATCHDOG
+
+config BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD
+	int "Delay between reset"
+	default "5"
+	help
+	  Select the number of seconds between each
+	  reset of the watchdog (default 5)
+
+endif
+
 endif
 
 if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else
diff --git a/package/busybox/S15watchdog b/package/busybox/S15watchdog
new file mode 100644
index 0000000000..7f1110c46e
--- /dev/null
+++ b/package/busybox/S15watchdog
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Start watchdog
+#
+
+case "$1" in
+ start)
+	echo "Starting watchdog..."
+	watchdog -t PERIOD /dev/watchdog
+	;;
+  stop)
+	;;
+  restart|reload)
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 59448d5a2f..1d988f838e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -142,6 +142,19 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT
 	else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
 endef
 
+ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y)
+define BUSYBOX_SET_WATCHDOG
+        $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG))
+endef
+define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
+	[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \
+		install -D -m 0755 package/busybox/S15watchdog \
+			$(TARGET_DIR)/etc/init.d/S15watchdog && \
+		sed -i s/PERIOD/$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD)/ \
+			$(TARGET_DIR)/etc/init.d/S15watchdog
+endef
+endif
+
 # We do this here to avoid busting a modified .config in configure
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
@@ -155,6 +168,7 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_NETKITTELNET)
 	$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
 	$(BUSYBOX_DISABLE_MMU_APPLETS)
+	$(BUSYBOX_SET_WATCHDOG)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
 		-C $(@D) oldconfig
 endef
@@ -172,6 +186,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
 	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
 	$(BUSYBOX_INSTALL_MDEV_CONF)
 	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
+	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 endef
 
 define BUSYBOX_UNINSTALL_TARGET_CMDS

From a5686b8acdfc81f3ab73f013f04be0a1462d3408 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 May 2012 03:16:44 +0000
Subject: [PATCH 1934/6849] libnfnetlink: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/libnfnetlink/Config.in       | 11 +++++++++++
 package/libnfnetlink/libnfnetlink.mk | 12 ++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libnfnetlink/Config.in
 create mode 100644 package/libnfnetlink/libnfnetlink.mk

diff --git a/package/Config.in b/package/Config.in
index 90b8e19053..b495c49818 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -401,6 +401,7 @@ source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
+source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
diff --git a/package/libnfnetlink/Config.in b/package/libnfnetlink/Config.in
new file mode 100644
index 0000000000..fa247c5957
--- /dev/null
+++ b/package/libnfnetlink/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBNFNETLINK
+	bool "libnfnetlink"
+	help
+	  libnfnetlink is the low-level library for netfilter related
+	  kernel/userspace communication.
+	  It provides a generic messaging infrastructure for in-kernel
+	  netfilter subsystems (such as nfnetlink_log, nfnetlink_queue,
+	  nfnetlink_conntrack) and their respective users
+	  and/or management tools in userspace.
+
+	  http://www.netfilter.org/projects/libnfnetlink/
diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
new file mode 100644
index 0000000000..67ea266e55
--- /dev/null
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# libnfnetlink
+#
+#############################################################
+
+LIBNFNETLINK_VERSION = 1.0.0
+LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
+LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
+LIBNFNETLINK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From 30e5d09a40b4955aa01867a7c6a64d75a8b63f2d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 May 2012 03:16:45 +0000
Subject: [PATCH 1935/6849] libnetfilter_conntrack: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                   |  1 +
 package/libnetfilter_conntrack/Config.in            |  9 +++++++++
 .../libnetfilter-conntrack.mk                       | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/libnetfilter_conntrack/Config.in
 create mode 100644 package/libnetfilter_conntrack/libnetfilter-conntrack.mk

diff --git a/package/Config.in b/package/Config.in
index b495c49818..aecb056c95 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -401,6 +401,7 @@ source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
+source "package/libnetfilter_conntrack/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
diff --git a/package/libnetfilter_conntrack/Config.in b/package/libnetfilter_conntrack/Config.in
new file mode 100644
index 0000000000..caf8a8a5b6
--- /dev/null
+++ b/package/libnetfilter_conntrack/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	bool "libnetfilter_conntrack"
+	select BR2_PACKAGE_LIBNFNETLINK
+	help
+	  libnetfilter_conntrack is a userspace library providing
+	  a programming interface (API) to the in-kernel
+	  connection tracking state table.
+
+	  http://www.netfilter.org/projects/libnetfilter_conntrack/
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
new file mode 100644
index 0000000000..66f0f69a44
--- /dev/null
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# libnetfilter-conntrack
+#
+#############################################################
+
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.0
+LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
+LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
+LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
+LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkg-config libnfnetlink
+
+$(eval $(call AUTOTARGETS))

From b76f7fb749190d7ec90654aa604e7792a1d967ad Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 May 2012 03:16:46 +0000
Subject: [PATCH 1936/6849] conntrack-tools: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/conntrack-tools/Config.in          | 14 ++++++++++++++
 package/conntrack-tools/conntrack-tools.mk | 12 ++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/conntrack-tools/Config.in
 create mode 100644 package/conntrack-tools/conntrack-tools.mk

diff --git a/package/Config.in b/package/Config.in
index aecb056c95..34c0280d8b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -490,6 +490,7 @@ source "package/can-utils/Config.in"
 source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cifs-utils/Config.in"
+source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
new file mode 100644
index 0000000000..12eb98852f
--- /dev/null
+++ b/package/conntrack-tools/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_CONNTRACK_TOOLS
+	bool "conntrack-tools"
+	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	help
+	  The conntrack-tools are a set of tools targeted at
+	  system administrators.
+	  They are conntrack, the userspace command line interface,
+	  and conntrackd, the userspace daemon.
+
+	  http://www.netfilter.org/projects/conntrack-tools/
+
+comment "conntrack-tools requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
new file mode 100644
index 0000000000..8b411279bc
--- /dev/null
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# conntrack-tools
+#
+#############################################################
+
+CONNTRACK_TOOLS_VERSION = 1.0.1
+CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
+CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
+CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config libnetfilter_conntrack
+
+$(eval $(call AUTOTARGETS))

From 025eb2fb908cb3c500e69225832b59b5ffb08cf5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 May 2012 03:16:47 +0000
Subject: [PATCH 1937/6849] dnsmasq: bump to version 2.61 and enhance

Bump to dnsmasq version 2.61.
Add new conntrack functionality: makes for more sturdy firewall setups.
Make IDN build without libintl, it's no longer needed and problematic
for other packages when there's no NLS support enabled.
Locale support does require IDN so just build it when IDN=y.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/Config.in  | 13 ++++++++++---
 package/dnsmasq/dnsmasq.mk | 26 ++++++++++++++++++++------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index f434b8ba5d..e67aa46170 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -21,13 +21,14 @@ config BR2_PACKAGE_DNSMASQ_DHCP
 	  Enable DHCP server support in dnsmasq.
 
 config BR2_PACKAGE_DNSMASQ_IDN
-	bool "IDN support (BIG!)"
+	bool "IDN support"
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_LIBINTL
 	select BR2_PACKAGE_LIBIDN
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Enable IDN support in dnsmasq.
-	  This option is a big space taker since is pulls in many libraries.
+	  This option is a big space taker since it pulls in many libraries.
 
 config BR2_PACKAGE_DNSMASQ_LUA
 	bool "Lua scripting support"
@@ -35,4 +36,10 @@ config BR2_PACKAGE_DNSMASQ_LUA
 	help
 	  Enable lua scripting for dnsmasq
 
+config BR2_PACKAGE_DNSMASQ_CONNTRACK
+	bool "conntrack marking support"
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	help
+	  Enable DNS query connection marking in netfilter.
+
 endif
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index c1995a0a61..2e3575ccb6 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.60
+DNSMASQ_VERSION = 2.61
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
@@ -22,10 +22,23 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y)
 	DNSMASQ_COPTS += -DNO_TFTP
 endif
 
+# NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
-	DNSMASQ_MAKE_OPT += all-i18n
-	DNSMASQ_DEPENDENCIES += libidn libintl
-	DNSMASQ_MAKE_OPT += LDFLAGS+="-lintl -lidn"
+	DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+	DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+	DNSMASQ_COPTS += -DHAVE_IDN
+	DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
+endif
+
+ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
+	DNSMASQ_DEPENDENCIES += host-pkg-config libnetfilter_conntrack
+endif
+
+ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
+define DNSMASQ_ENABLE_CONNTRACK
+	$(SED) 's^.*#define HAVE_CONNTRACK.*^#define HAVE_CONNTRACK^' \
+		$(DNSMASQ_DIR)/src/config.h
+endef
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
@@ -70,11 +83,12 @@ define DNSMASQ_BUILD_CMDS
 	$(DNSMASQ_FIX_PKGCONFIG)
 	$(DNSMASQ_ENABLE_DBUS)
 	$(DNSMASQ_ENABLE_LUA)
-	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT)
+	$(DNSMASQ_ENABLE_CONNTRACK)
+	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
 endef
 
 define DNSMASQ_INSTALL_TARGET_CMDS
-	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install
+	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install$(DNSMASQ_I18N)
 	mkdir -p $(TARGET_DIR)/var/lib/misc/
 endef
 

From e1f0804cc11706648f33a96d68e613b8d6593db3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 15:02:19 +0200
Subject: [PATCH 1938/6849] external-toolchain: add support for recent Linaro
 toolchains

Starting from 2012.03, the Linaro toolchains have separated the GCC
support libraries (libstdc++, libgcc_s) from the sysroot itself. So we
no longer have the case where all libraries are inside the sysroot, as
we had for all the previously supported toolchains.

Therefore, we add some logic to detect if such a separate directory is
used for GCC support libraries, and if it's the case, we make sure
that we take into account this directory when creating our own
sysroot, and when copying libraries to the target filesystem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk                     | 73 ++++++++++++++++--------
 toolchain/toolchain-external/ext-tool.mk | 23 +++++++-
 2 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index bb1ea90404..649b91b03a 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -20,11 +20,16 @@
 #
 #  usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR}
 #
-# Finally, Linaro toolchains have the libraries in lib/<target-name>/,
-# so we need to search libraries in:
+# Linaro toolchains have most libraries in lib/<target-name>/, so we
+# need to search libraries in:
 #
 #  $${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX)
 #
+# And recent Linaro toolchains have the GCC support libraries
+# (libstdc++, libgcc_s, etc.) into a separate directory, outside of
+# the sysroot, that we called the "SUPPORT_LIB_DIR", into which we
+# need to search as well.
+#
 # Thanks to ARCH_LIB_DIR we also take into account toolchains that
 # have the libraries in lib64 and usr/lib64.
 #
@@ -33,35 +38,44 @@
 # modification on the below logic.
 #
 # $1: arch specific sysroot directory
-# $2: library directory ('lib' or 'lib64') from which libraries must be copied
-# $3: library name
-# $4: destination directory of the libary, relative to $(TARGET_DIR)
+# $2: support libraries directory (can be empty)
+# $3: library directory ('lib' or 'lib64') from which libraries must be copied
+# $4: library name
+# $5: destination directory of the libary, relative to $(TARGET_DIR)
 #
 copy_toolchain_lib_root = \
 	ARCH_SYSROOT_DIR="$(strip $1)"; \
-	ARCH_LIB_DIR="$(strip $2)" ; \
-	LIB="$(strip $3)"; \
-	DESTDIR="$(strip $4)" ; \
+	SUPPORT_LIB_DIR="$(strip $2)" ; \
+	ARCH_LIB_DIR="$(strip $3)" ; \
+	LIB="$(strip $4)"; \
+	DESTDIR="$(strip $5)" ; \
  \
-	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
-		find -L $${ARCH_LIB_DIR} usr/$${ARCH_LIB_DIR} usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} $${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \
-			-maxdepth 1 -name "$${LIB}.*" 2>/dev/null \
-		)` ; \
-	for FILE in $${LIBS} ; do \
-		LIB=`basename $${FILE}`; \
-		LIBDIR=`dirname $${FILE}` ; \
-		while test \! -z "$${LIB}"; do \
-			FULLPATH="$${ARCH_SYSROOT_DIR}/$${LIBDIR}/$${LIB}" ; \
-			rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIB}; \
+	for dir in \
+		$${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \
+		$${ARCH_SYSROOT_DIR}/usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \
+		$${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR} \
+		$${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \
+		$${SUPPORT_LIB_DIR} ; do \
+		LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}.*" 2>/dev/null` ; \
+		if test -n "$${LIBSPATH}" ; then \
+			break ; \
+		fi \
+	done ; \
+	for LIBPATH in $${LIBSPATH} ; do \
+		LIBNAME=`basename $${LIBPATH}`; \
+		LIBDIR=`dirname $${LIBPATH}` ; \
+		while test \! -z "$${LIBNAME}" ; do \
+			LIBPATH=$${LIBDIR}/$${LIBNAME} ; \
+			rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
 			mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
-			if test -h $${FULLPATH} ; then \
-				cp -d $${FULLPATH} $(TARGET_DIR)/$${DESTDIR}/; \
-			elif test -f $${FULLPATH}; then \
-				$(INSTALL) -D -m0755 $${FULLPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIB}; \
+			if test -h $${LIBPATH} ; then \
+				cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/; \
+			elif test -f $${LIBPATH}; then \
+				$(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
 			else \
 				exit -1; \
 			fi; \
-			LIB="`readlink $${FULLPATH}`"; \
+			LIBNAME="`readlink $${LIBPATH}`"; \
 		done; \
 	done; \
  \
@@ -100,6 +114,11 @@ copy_toolchain_lib_root = \
 #    non-default architecture variant is used. Without this, the
 #    compiler fails to find libraries and headers.
 #
+# Some toolchains (i.e Linaro binary toolchains) store support
+# libraries (libstdc++, libgcc_s) outside of the sysroot, so we simply
+# copy all the libraries from the "support lib directory" into our
+# sysroot.
+#
 # Note that the 'locale' directories are not copied. They are huge
 # (400+MB) in CodeSourcery toolchains, and they are not really useful.
 #
@@ -107,12 +126,15 @@ copy_toolchain_lib_root = \
 # $2: arch specific sysroot directory of the toolchain
 # $3: arch specific subdirectory in the sysroot
 # $4: directory of libraries ('lib' or 'lib64')
-#
+# $5: support lib directories (for toolchains storing libgcc_s,
+#     libstdc++ and other gcc support libraries outside of the
+#     sysroot)
 copy_toolchain_sysroot = \
 	SYSROOT_DIR="$(strip $1)"; \
 	ARCH_SYSROOT_DIR="$(strip $2)"; \
 	ARCH_SUBDIR="$(strip $3)"; \
 	ARCH_LIB_DIR="$(strip $4)" ; \
+	SUPPORT_LIB_DIR="$(strip $5)" ; \
 	for i in etc $${ARCH_LIB_DIR} sbin usr ; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
 			rsync -au --chmod=Du+w --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
@@ -131,6 +153,9 @@ copy_toolchain_sysroot = \
 		ln -s $${relpath} $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
 		echo "Symlinking $(STAGING_DIR)/$${ARCH_SUBDIR} -> $${relpath}" ; \
 	fi ; \
+	if test -n "$${SUPPORT_LIB_DIR}" ; then \
+		cp -a $${SUPPORT_LIB_DIR}/* $(STAGING_DIR)/lib/ ; \
+	fi ; \
 	find $(STAGING_DIR) -type d | xargs chmod 755
 
 #
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a45603a43f..2a01d6852c 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -359,6 +359,17 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 # ARCH_SUBDIR:          the relative location of the sysroot of the selected
 #                       multilib variant compared to the main sysroot.
 #			Ex: mips16/soft-float/el
+#
+# SUPPORT_LIB_DIR:      some toolchains, such as recent Linaro toolchains,
+#                       store GCC support libraries (libstdc++,
+#                       libgcc_s, etc.) outside of the sysroot. In
+#                       this case, SUPPORT_LIB_DIR is set to a
+#                       non-empty value, and points to the directory
+#                       where these support libraries are
+#                       available. Those libraries will be copied to
+#                       our sysroot, and the directory will also be
+#                       considered when searching libraries for copy
+#                       to the target filesystem.
 
 $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
@@ -370,19 +381,25 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
 	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
 	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
+		LIBSTDCPP_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a)` ; \
+		SUPPORT_LIB_DIR=`echo $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
+	else \
+		SUPPORT_LIB_DIR="" ; \
+	fi ; \
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
 	if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
 		echo "Copy external toolchain libraries to target..." ; \
 		for libs in $(LIB_EXTERNAL_LIBS); do \
-			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
+			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
 		done ; \
 		for libs in $(USR_LIB_EXTERNAL_LIBS); do \
-			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
+			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
 		done ; \
 	fi ; \
 	echo "Copy external toolchain sysroot to staging..." ; \
-	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR}) ; \
+	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
 	fi ; \

From 057c729c2438107b426576121bcf83f792734a6f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 15:06:24 +0200
Subject: [PATCH 1939/6849] external-toolchain: add support for Linaro 2012.04

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 49ea7fa21b..f58523f780 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,20 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
+	bool "Linaro 2012.04"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.04 (based on gcc 4.7), Linaro GDB 2012.04 (based on
+	  GDB 7.4), eglibc 2.13. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the softfp calling
+	  convention, and uses the VFPv3-D16 FPU instructions.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
 	bool "Linaro 2012.03"
 	depends on BR2_arm
@@ -504,6 +518,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
+	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2a01d6852c..b163aeed7a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -200,6 +200,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.02-20120222_linux.ta
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03),y)
 TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.03/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.03-20120326_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.04/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.04-20120426_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 311d542b2e992c328ddacd1b91dd0aab09c38f5b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 02:08:12 +0000
Subject: [PATCH 1940/6849] libdvdnav: requires pkg-config

Fixes
http://autobuild.buildroot.org/results/ababd836c7e7c3e63b3c7825244a56e30462c56d/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdvdnav/libdvdnav.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index f69f23877e..1c389046a1 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -10,7 +10,7 @@ LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases
 LIBDVDNAV_AUTORECONF = YES
 LIBDVDNAV_INSTALL_STAGING = YES
 
-LIBDVDNAV_DEPENDENCIES = libdvdread
+LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config
 
 # By default libdvdnav tries to find dvdread-config in $PATH. Because
 # of cross compilation, we prefer using pkg-config.

From efe0daab8cfef743c282b437c44c35cba7905d44 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 03:28:28 +0000
Subject: [PATCH 1941/6849] gdb: fix target gdb build when host-gawk is built
 before

When the crosstool-ng backend is used, host-gawk is built as a
dependency of the crosstool-ng package, and therefore an host 'gawk'
binary is installed in $(HOST_DIR).

When the target gdb package is also selected, this unfortunately leads
to a build failure, as reported on
http://buildroot.humanoidz.org/results/f19c0499d08212d8b5100fa9434e1197092957db/build-end.log.

The problem is that the ./configure of gdb detects gawk in the PATH,
but at compile time, it fails to find gawk. This is due to the fact
that the gdb compilation process is started without the correct path.
This patch fixes this by passing $(TARGET_MAKE_ENV) in the environment
of the gdb compilation process.

A better fix would be to switch gdb to the AUTOTARGETS infrastructure
in the future.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/gdb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index b5c085bca8..0b85180f0a 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -90,6 +90,7 @@ endif
 $(GDB_TARGET_DIR)/gdb/gdb: $(GDB_TARGET_DIR)/.configured
 	# force ELF support since it fails due to BFD linking problems
 	gdb_cv_var_elf=yes \
+	$(TARGET_MAKE_ENV) \
 	$(MAKE) CC="$(TARGET_CC)" MT_CFLAGS="$(TARGET_CFLAGS)" \
 		-C $(GDB_TARGET_DIR)
 

From 7f4f99ee78ad559512d8f9c11b4e0ead11ac035d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 05:15:59 +0000
Subject: [PATCH 1942/6849] libplayer: add patch to fix build issue

Fixes
http://autobuild.buildroot.org/results/af5e72c2385896f2bdb5c1b98efd487afb46a502/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libplayer/libplayer-add-fpic.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/libplayer/libplayer-add-fpic.patch

diff --git a/package/libplayer/libplayer-add-fpic.patch b/package/libplayer/libplayer-add-fpic.patch
new file mode 100644
index 0000000000..e4b227f911
--- /dev/null
+++ b/package/libplayer/libplayer-add-fpic.patch
@@ -0,0 +1,18 @@
+Add -fPIC to CFLAGS
+
+-fPIC is needed to build shared library code.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/Makefile
+===================================================================
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -9,6 +9,7 @@
+ SHARED_LIBNAME_VERSION = $(SHARED_LIBNAME).$(VERSION)
+ SHARED_LIBNAME_MAJOR = $(SHARED_LIBNAME).$(shell echo $(VERSION) | cut -f1 -d.)
+ SHARED_LIBNAME_FLAGS = -shared -Wl,-soname,$(SHARED_LIBNAME_MAJOR)
++CFLAGS = -fPIC
+ 
+ ifeq ($(BUILD_STATIC),yes)
+   BUILD_RULES += lib_static

From 2ab997142bf97d0050ee9151a6f08135909270d5 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 7 May 2012 05:00:01 +0000
Subject: [PATCH 1943/6849] BeagleBone: new board

This configuration provides a basic setup for using Buildroot
to create all of the images needed for a BeagleBone.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/beaglebone/linux-3.2.9.config           | 252 ++++++++++++++++++
 ...ecify-ext2-and-ro-for-booting-rootfs.patch |  31 +++
 configs/beaglebone_defconfig                  |  25 ++
 3 files changed, 308 insertions(+)
 create mode 100644 board/beaglebone/linux-3.2.9.config
 create mode 100644 board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch
 create mode 100644 configs/beaglebone_defconfig

diff --git a/board/beaglebone/linux-3.2.9.config b/board/beaglebone/linux-3.2.9.config
new file mode 100644
index 0000000000..4052f6e3a9
--- /dev/null
+++ b/board/beaglebone/linux-3.2.9.config
@@ -0,0 +1,252 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="beaglebone"
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_FHANDLE=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_NAMESPACES=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_ARCH_OMAP=y
+CONFIG_OMAP_MUX_DEBUG=y
+CONFIG_OMAP_MBOX_FWK=y
+# CONFIG_OMAP_32K_TIMER is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_SOC_OMAP3430 is not set
+# CONFIG_MACH_OMAP3_BEAGLE is not set
+# CONFIG_MACH_DEVKIT8000 is not set
+# CONFIG_MACH_OMAP_LDP is not set
+# CONFIG_MACH_OMAP3530_LV_SOM is not set
+# CONFIG_MACH_OMAP3_TORPEDO is not set
+# CONFIG_MACH_ENCORE is not set
+# CONFIG_MACH_OVERO is not set
+# CONFIG_MACH_OMAP3EVM is not set
+# CONFIG_MACH_OMAP3517EVM is not set
+# CONFIG_MACH_OMAP3_PANDORA is not set
+# CONFIG_MACH_OMAP3_TOUCHBOOK is not set
+# CONFIG_MACH_OMAP_3430SDP is not set
+# CONFIG_MACH_NOKIA_RM680 is not set
+# CONFIG_MACH_NOKIA_RX51 is not set
+# CONFIG_MACH_OMAP_ZOOM2 is not set
+# CONFIG_MACH_OMAP_ZOOM3 is not set
+# CONFIG_MACH_CM_T35 is not set
+# CONFIG_MACH_CM_T3517 is not set
+# CONFIG_MACH_IGEP0020 is not set
+# CONFIG_MACH_IGEP0030 is not set
+# CONFIG_MACH_SBC3530 is not set
+# CONFIG_MACH_OMAP_3630SDP is not set
+# CONFIG_MACH_TI8168EVM is not set
+# CONFIG_MACH_TI8148EVM is not set
+# CONFIG_MACH_AM335XIAEVM is not set
+CONFIG_OMAP3_EDMA=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_THUMB2_KERNEL=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=" debug "
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_BINFMT_MISC=y
+# CONFIG_SUSPEND is not set
+CONFIG_PM_DEBUG=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_CONNECTOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_MISC_DEVICES=y
+CONFIG_BMP085=m
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_93CX6=m
+CONFIG_SENSORS_LIS3_I2C=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_TI_CPSW=y
+CONFIG_SMSC_PHY=y
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_MOUSE_PS2 is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=y
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+# CONFIG_SERIO is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_HW_RANDOM=y
+CONFIG_RAW_DRIVER=m
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_OMAP24XX=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_DEBUG_GPIO=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_TWL4030=y
+CONFIG_GENERIC_PWM=y
+CONFIG_DAVINCI_EHRPWM=y
+CONFIG_ECAP_PWM=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_OMAP_WATCHDOG=y
+CONFIG_TWL4030_WATCHDOG=y
+CONFIG_MFD_TPS65217=y
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_TWL4030=y
+CONFIG_REGULATOR_TPS65023=y
+CONFIG_REGULATOR_TPS6507X=y
+CONFIG_REGULATOR_TPS65217=y
+CONFIG_DISPLAY_SUPPORT=y
+CONFIG_HIDRAW=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_TI81XX_GLUE=y
+CONFIG_USB_TI_CPPI41_DMA_HW=y
+CONFIG_USB_ACM=y
+CONFIG_USB_LIBUSUAL=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_ETH=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_HID=m
+CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_UIO=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_PRUSS=m
+CONFIG_STAGING=y
+CONFIG_IIO=y
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_SW_RING=y
+CONFIG_IIO_KFIFO_BUF=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_PM_DEVFREQ=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_FANOTIFY=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_JTAG_ENABLE=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
diff --git a/board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch b/board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch
new file mode 100644
index 0000000000..dfbccf52a5
--- /dev/null
+++ b/board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch
@@ -0,0 +1,31 @@
+From c8aae8c96494132759319b0eab6cd2a51d1d4889 Mon Sep 17 00:00:00 2001
+From: Frank Hunleth <fhunleth@troodon-software.com>
+Date: Tue, 6 Mar 2012 07:20:26 -0800
+Subject: [PATCH] am335x_evm.h: Specify ext2 and ro for booting rootfs
+
+Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
+---
+ include/configs/am335x_evm.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index e0ac494..b45c306 100755
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -53,11 +53,11 @@
+ 	"script_addr=0x81900000\0" \
+ 	"console=ttyO0,115200n8\0" \
+ 	"mmc_dev=0\0" \
+-	"mmc_root=/dev/mmcblk0p2 rw\0" \
++	"mmc_root=/dev/mmcblk0p2 ro\0" \
+ 	"nand_root=ubi0:rootfs rw ubi.mtd=7,2048\0" \
+ 	"spi_root=/dev/mtdblock4 rw\0" \
+ 	"nor_root=/dev/mtdblock3 rw\0" \
+-	"mmc_root_fs_type=ext3 rootwait\0" \
++	"mmc_root_fs_type=ext2 rootwait\0" \
+ 	"nand_root_fs_type=ubifs rootwait=1\0" \
+ 	"spi_root_fs_type=jffs2\0" \
+ 	"nor_root_fs_type=jffs2\0" \
+-- 
+1.7.4.1
+
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
new file mode 100644
index 0000000000..4670bd4fab
--- /dev/null
+++ b/configs/beaglebone_defconfig
@@ -0,0 +1,25 @@
+BR2_arm=y
+BR2_cortex_a8=y
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-fpu=vfpv3 --with-float=hard"
+# BR2_SOFT_FLOAT is not set
+BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
+# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="board/beaglebone"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://arago-project.org/git/projects/u-boot-am33x.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="v2011.09_AM335xPSP_04.06.00.06"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="MLO"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/koenkooi/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="linux-ti33x-psp-3.2-r5a+gitr09e9651bcf2ee8d86685f2a8075bc6557b1d3b91"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.2.9.config"

From d4137cbe6643d49b7a4d79009e9310cbd5296056 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 08:39:02 +0000
Subject: [PATCH 1944/6849] kernel-headers: bump 3.{0, 3}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ...-3.3.4-fix-umode_t.patch => linux-3.3.5-fix-umode_t.patch} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3.4-fix-umode_t.patch => linux-3.3.5-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index aeeebeff52..36370b42a1 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.30"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.31"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.16"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.4"		if BR2_KERNEL_HEADERS_3_3
+	default "3.3.5"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.30-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.4-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch

From 6dbdf34629d0b0b139bf8962ce982fb9dba842c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 08:39:03 +0000
Subject: [PATCH 1945/6849] linux: bump default to kernel version 3.3.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 59ba6d3ff2..148b858120 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3.4"
+	bool "3.3.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -73,7 +73,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.4" if BR2_LINUX_KERNEL_3_3
+	default "3.3.5" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 5324b41283e1a1c1bff98b013cf463c64151aec9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 08:27:23 +0000
Subject: [PATCH 1946/6849] qemu/ppc-mpc8544ds: add new sample config

Add new powerpc-mpc8544ds sample qemu config.
Useful for SPE ABI testing.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/powerpc-mpc8544ds/readme.txt |  6 ++++++
 configs/qemu_ppc_mpc8544ds_defconfig    | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 board/qemu/powerpc-mpc8544ds/readme.txt
 create mode 100644 configs/qemu_ppc_mpc8544ds_defconfig

diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
new file mode 100644
index 0000000000..6ecdc4b2b5
--- /dev/null
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -0,0 +1,6 @@
+Run the emulation with:
+
+ qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio
+
+The login prompt will appear in the terminal that started Qemu.
+
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
new file mode 100644
index 0000000000..996d6b21b6
--- /dev/null
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -0,0 +1,21 @@
+# Architecture
+BR2_powerpc=y
+BR2_powerpc_8548=y
+
+# filesystem
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_INITRAMFS=y
+
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
+BR2_LINUX_KERNEL_VMLINUX=y
+
+# Serial port config
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"

From e9412e3abb5332e1b55b50400ca7b5db60a7dffd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 04:06:03 +0000
Subject: [PATCH 1947/6849] qemu/arm-vexpress: add new sample config

By popular demand!

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-vexpress/readme.txt  |  6 ++++++
 configs/qemu_arm_vexpress_defconfig | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 board/qemu/arm-vexpress/readme.txt
 create mode 100644 configs/qemu_arm_vexpress_defconfig

diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
new file mode 100644
index 0000000000..0d3631c725
--- /dev/null
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -0,0 +1,6 @@
+Run the emulation with:
+
+  qemu-system-arm -M vexpress-a9 -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=sd -append "console=ttyAMA0,115200 root=/dev/mmcblk0" -serial stdio -net nic,model=lan9118 -net user
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer.
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
new file mode 100644
index 0000000000..7388279abf
--- /dev/null
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -0,0 +1,22 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a9=y
+
+# system
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Lock to 3.3 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_3=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+BR2_LINUX_KERNEL_ZIMAGE=y

From e940b30385b75e3d5a42708a3de6d3fa43bd9226 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 00:33:36 +0000
Subject: [PATCH 1948/6849] ncurses: install screen terminfo file

Closes #5204

Install the terminfo file for screen.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                    | 19 ++++++++++---------
 package/ncurses/ncurses.mk |  2 ++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7fd8864587..09dd6b1dad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,15 +40,15 @@
 	libupnp, liburcu, libusb, libusb-compat, libxml2,
 	libxml-parser-perl, libxslt, linux-firmware, linux-fusion,
 	lite, lsof, ltrace, lttng-libust, lua, makedevs, microperl,
-	mpd, mpfr, mpg123, mrouted, mtd, mysql_client, nbd, neon,
-	netsnmp, network-manager, nfs-utils, ngrep, ntfs-3g, openssh,
-	openssl, parted, pango, pcre, php, pixman, poco, psmisc,
-	pulseaudio, python, qt, quagga, radvd, rpm, ruby, samba,
-	sam-ba, sane-backends, sawman, screen, sdl_net, smartmontools,
-	sqlite, squashfs3, squid, sshfs, sudo, syslinux, sysstat,
-	taglib, tcpdump, tftp-hpa, transmission, tiff, tinyhttpd,
-	uboot-tools, udev, uemacs, unionfs, usbutils, util-linux,
-	vala, valgrind, vim, vsftpd, wipe,
+	mpd, mpfr, mpg123, mrouted, mtd, mysql_client, nbd, ncurses,
+	neon, netsnmp, network-manager, nfs-utils, ngrep, ntfs-3g,
+	openssh, openssl, parted, pango, pcre, php, pixman, poco,
+	psmisc, pulseaudio, python, qt, quagga, radvd, rpm, ruby,
+	samba, sam-ba, sane-backends, sawman, screen, sdl_net,
+	smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
+	syslinux, sysstat, taglib, tcpdump, tftp-hpa, transmission,
+	tiff, tinyhttpd, uboot-tools, udev, uemacs, unionfs, usbutils,
+	util-linux, vala, valgrind, vim, vsftpd, wipe,
 	xdriver_xf86-{input-vmmouse,video-fbdev}, xfsprogs, zlib
 
 	New packages: apr, audiofile, bellagio, fmtools,
@@ -78,6 +78,7 @@
 	#5018: dialog broken: exits with assert in uClibc
 	#5102: qt package moc, uic, rcc read from wrong place
 	#5144: Patch to fix ixon bug in uemacs
+	#5204: Missing terminfo file(s) for GNU screen terminal type
 
 2012.02, Released February 29th, 2012:
 
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index eb8a043fd8..10a55ddc5e 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -117,6 +117,8 @@ define NCURSES_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a
 	mkdir -p $(TARGET_DIR)/usr/share/terminfo/l
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
+	mkdir -p $(TARGET_DIR)/usr/share/terminfo/s
+	cp -dpf $(STAGING_DIR)/usr/share/terminfo/s/screen $(TARGET_DIR)/usr/share/terminfo/s
 	$(NCURSES_INSTALL_TARGET_DEVFILES)
 endef # NCURSES_INSTALL_TARGET_CMDS
 

From 98873717c2654e27ce069c44e9b5dbe3383c0f97 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 00:33:37 +0000
Subject: [PATCH 1949/6849] screen: enable terminfo and install screenrc

Closes #5198

Enable terminfo support as reported on bug #5198
Also install screenrc if it's not already present in the target.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                  |  1 +
 package/screen/screen.mk | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 09dd6b1dad..c17e1419e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -78,6 +78,7 @@
 	#5018: dialog broken: exits with assert in uClibc
 	#5102: qt package moc, uic, rcc read from wrong place
 	#5144: Patch to fix ixon bug in uemacs
+	#5198: Line graphics output is broken in GNU Screen
 	#5204: Missing terminfo file(s) for GNU screen terminal type
 
 2012.02, Released February 29th, 2012:
diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index 4b3d427b35..d117bde80c 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -7,8 +7,17 @@
 SCREEN_VERSION = 4.0.3
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 SCREEN_DEPENDENCIES = ncurses
-SCREEN_CONF_ENV = ac_cv_header_elf_h=no ac_cv_header_dwarf_h=no
+SCREEN_CONF_ENV = ac_cv_header_elf_h=no ac_cv_header_dwarf_h=no \
+	CFLAGS="$(TARGET_CFLAGS) -DTERMINFO"
 SCREEN_MAKE = $(MAKE1)
 SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
+define SCREEN_INSTALL_SCREENRC
+	if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
+		$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc; \
+	fi
+endef
+
+SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC
+
 $(eval $(call AUTOTARGETS))

From 18bd541dd02b153427fb4f010a6426c8e91bef1b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 8 May 2012 01:51:18 +0000
Subject: [PATCH 1950/6849] cifs-utils: security bump to version 5.4

Fixes CVE-2012-1586.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index 52ad5ceeed..0fdb689b2e 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,5 +1,11 @@
-CIFS_UTILS_VERSION = 5.1
+CIFS_UTILS_VERSION = 5.4
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
 
+define CIFS_UTILS_NO_WERROR
+	$(SED) 's/-Werror//' $(@D)/Makefile.in
+endef
+
+CIFS_UTILS_POST_PATCH_HOOKS += CIFS_UTILS_NO_WERROR
+
 $(eval $(call AUTOTARGETS))

From 1db490aae99295c7b74d630b1b2edbf0b5a5516c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 May 2012 04:39:21 +0000
Subject: [PATCH 1951/6849] localedef: new package

This host only package allows to build the localedef program, which is
needed to generate locale data for (e)glibc-based systems. The source
code has been extracted from the eglibc sources and put inside a small
and nice tarball by the PTXdist developers, which makes it easy and
convenient to build for the host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/localedef/localedef.mk | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/localedef/localedef.mk

diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
new file mode 100644
index 0000000000..1a044e3c0e
--- /dev/null
+++ b/package/localedef/localedef.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# localedef
+#
+#############################################################
+
+LOCALEDEF_VERSION = 2.14.1-r17443-ptx1
+LOCALEDEF_SOURCE  = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
+LOCALEDEF_SITE    = http://www.pengutronix.de/software/ptxdist/temporary-src/
+
+HOST_LOCALEDEF_CONF_OPT += \
+	--prefix=/usr \
+	--with-glibc=./eglibc
+
+# The makefile does not implement an install target
+define HOST_LOCALEDEF_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/usr/bin/localedef
+endef
+
+$(eval $(call AUTOTARGETS,host))

From aebf199ff034460c817782c1b14ec4e8c75a8959 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 May 2012 04:39:22 +0000
Subject: [PATCH 1952/6849] Add support to generate locale data

In order to use locale support on a Linux system, you need locale data
to be present:

 * on a (e)glibc based system, this data is typically in the
   /usr/lib/locale/locale-archive file, which can be created and
   extended using the localedef program

 * on an uClibc based system, the set of supported locales is defined
   at build time by an uClibc configuration option.

This patch implements generating locale data for the following cases:

 * Internal toolchain

 * External toolchain based on (e)glibc. uClibc external toolchains
   are not supported, because with uClibc, the set of supported
   locales is defined at build time. CodeSourcery and Linaro
   toolchains have been tested, Crosstool-NG toolchains are believed
   to work properly as well.

 * Toolchains built using the Crosstool-NG backend, but only (e)glibc
   toolchains.

This feature was runtime tested with internal uClibc toolchain,
CodeSourcery ARM toolchain and Linaro ARM toolchain, thanks to a
simple C program that shows the data and a gettext translated message.

Note that this option differs from the "purge locales" option, which
is responsible for removing translation files and other locale stuff
installed by packages. At some point in the future, we may want to
clarify the respective roles of those options.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                      | 33 +++++++++++++++++++++++++++++++++
 toolchain/toolchain-common.in | 18 ++++++++++++++++++
 toolchain/uClibc/uclibc.mk    | 11 ++++++++++-
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a7625ba0ee..1d7973e96e 100644
--- a/Makefile
+++ b/Makefile
@@ -239,6 +239,9 @@ TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 # packages compiled for the host go here
 HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 
+# locales to generate
+GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
+
 # stamp (dependency) files go here
 STAMP_DIR:=$(BASE_DIR)/stamps
 
@@ -296,6 +299,12 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 TARGETS+=target-purgelocales
 endif
 
+ifneq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_CTNG_eglibc)$(BR2_TOOLCHAIN_CTNG_glibc),)
+ifneq ($(GENERATE_LOCALE),)
+TARGETS+=target-generatelocales
+endif
+endif
+
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
@@ -446,6 +455,30 @@ target-purgelocales:
 	done
 endif
 
+ifneq ($(GENERATE_LOCALE),)
+# Generate locale data. Basically, we call the localedef program
+# (built by the host-localedef package) for each locale. The input
+# data comes preferably from the toolchain, or if the toolchain does
+# not have them (Linaro toolchains), we use the ones available on the
+# host machine.
+target-generatelocales: host-localedef
+	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
+	$(Q)for locale in $(GENERATE_LOCALE) ; do \
+		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
+		charmap=`echo $${locale} | cut -f2 -d'.'` ; \
+		if test -z "$${charmap}" ; then \
+			charmap="UTF-8" ; \
+		fi ; \
+		echo "Generating locale $${inputfile}.$${charmap}" ; \
+		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
+		$(HOST_DIR)/usr/bin/localedef \
+			--prefix=$(TARGET_DIR) \
+			--`echo $(BR2_ENDIAN) | tr [A-Z] [a-z]`-endian \
+			-i $${inputfile} -f $${charmap} \
+			$${locale} ; \
+	done
+endif
+
 source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)
 
 external-deps:
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index fb87a888e6..cc7b4de56e 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -58,6 +58,24 @@ config BR2_ENABLE_LOCALE_WHITELIST
 	  will be available on the target - That purely depends on the
 	  support for that locale in the selected packages.
 
+config BR2_GENERATE_LOCALE
+	string "Generate locale data"
+	default ""
+	# Pre-built uClibc external toolchains and uClibc toolchains
+	# built by the Crosstool-NG backend cannot be supported,
+	# because the list of locales to support must be defined at
+	# build time.
+	depends on \
+		BR2_TOOLCHAIN_BUILDROOT      || \
+		BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc    || \
+		BR2_TOOLCHAIN_CTNG_glibc
+	help
+	  Generate support for a list of locales. Locales can be
+	  specified with or without encoding, when no encoding is
+	  specified, UTF-8 is assumed. Examples of locales: en_US,
+	  fr_FR.UTF-8.
+
 # glibc and eglibc directly include gettext, so a separatly compiled
 # gettext isn't needed and shouldn't be built to avoid conflicts. Some
 # packages always need gettext, other packages only need gettext when
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 32cbe46052..07281351bd 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -66,6 +66,15 @@ endif
 UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_ARM_TYPE))
 UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
 
+ifeq ($(GENERATE_LOCALE),)
+# We need at least one locale
+UCLIBC_LOCALES = en_US
+else
+# Strip out the encoding part of locale names, if any
+UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\
+		   $(firstword $(subst .,$(space),$(locale))))
+endif
+
 $(DL_DIR)/$(UCLIBC_SOURCE):
 	$(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE))
 
@@ -309,7 +318,7 @@ else
 	echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(BR2_ENABLE_LOCALE),y)
-	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\n# UCLIBC_BUILD_ALL_LOCALE is not set\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="en_US"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
+	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\n# UCLIBC_BUILD_ALL_LOCALE is not set\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="$(UCLIBC_LOCALES)"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
 else
 	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
 endif

From 43e77cf53ff96cc18eeaa1e3599a815172380080 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 23:27:19 +0000
Subject: [PATCH 1953/6849] blackfin: adjust available ABIs

The FLAT (Separate Data) and FLAT Shared ABIs are rarely used, and the
FLAT Shared ABI requires the user to manually assign an unique ID to
each shared library, which we will never support in
Buildroot. Therefore, restrict ourselves to FLAT and FDPIC.

In addition to this, ensure that when FLAT is selected, only static
libraries are produced, because this is what FLAT supports. It will
fix problems such as
http://autobuild.buildroot.org/results/2d756d75162e8737e99df8189bde93ed1a09feef/build-end.log.

Moreover, we make FDPIC the default ABI, since if someone is using
Buildroot, it's most likely to generate a fairly elaborate embedded
Linux system, on which shared libraries are probably useful.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 941cd1bed4..a42bfd6b08 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -228,15 +228,12 @@ endchoice
 choice
 	prompt "Target ABI"
 	depends on BR2_bfin
-	default BR2_BFIN_FLAT
+	default BR2_BFIN_FDPIC
 config BR2_BFIN_FDPIC
 	bool "FDPIC"
 config BR2_BFIN_FLAT
 	bool "FLAT"
-config BR2_BFIN_FLAT_SEP_DATA
-	bool "FLAT (Separate data)"
-config BR2_BFIN_SHARED_FLAT
-	bool "Shared FLAT"
+	select BR2_PREFER_STATIC_LIB
 endchoice
 
 choice

From 3d970956016476df2f85e452c918c3a0f8e2246b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 23:27:20 +0000
Subject: [PATCH 1954/6849] libffi: bump to 3.0.11 and add blackfin support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi-blackfin-support.patch | 1021 ++++++++++++++++++
 package/libffi/libffi.mk                     |    2 +-
 2 files changed, 1022 insertions(+), 1 deletion(-)
 create mode 100644 package/libffi/libffi-blackfin-support.patch

diff --git a/package/libffi/libffi-blackfin-support.patch b/package/libffi/libffi-blackfin-support.patch
new file mode 100644
index 0000000000..1af0fce15c
--- /dev/null
+++ b/package/libffi/libffi-blackfin-support.patch
@@ -0,0 +1,1021 @@
+Add support for Blackfin
+
+Taken upstream from
+https://github.com/atgreen/libffi/commit/213ed15c70e72d666154c08e2b41dae3f61f20d3. Will
+be part of the upcoming 3.0.12 release.
+
+We have kept the part of the patches changing configure and
+Makefile.in in order to avoid having to autoreconf the package, which
+requires autoconf 2.68.
+
+Code written by Alexandre Keunecke.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: libffi/ChangeLog
+===================================================================
+--- libffi.orig/ChangeLog
++++ libffi/ChangeLog
+@@ -1,3 +1,11 @@
++2012-04-23  Alexandre Keunecke I. de Mendonca <alexandre.keunecke@gmail.com>
++
++	* configure.ac: Add Blackfin/sysv support
++	* Makefile.am: Add Blackfin/sysv support
++	* src/bfin/ffi.c:  Add Blackfin/sysv support
++	* src/bfin/ffitarget.h: Add Blackfin/sysv support
++	* src/bfin/sysv.S: Add Blackfin/sysv support
++
+ 2012-04-11  Anthony Green  <green@moxielogic.com>
+ 
+ 	* Makefile.am (EXTRA_DIST): Add new script.
+Index: libffi/Makefile.am
+===================================================================
+--- libffi.orig/Makefile.am
++++ libffi/Makefile.am
+@@ -27,6 +27,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+ 	src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
+ 	src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h	\
+ 	src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
++	src/bfin/ffi.c src/bfin/ffitarget.h src/bfin/sysv.S \
+ 	src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
+ 	src/moxie/ffi.c src/moxie/eabi.S libtool-version \
+ 	ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
+@@ -105,6 +106,9 @@ endif
+ if MIPS
+ nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
+ endif
++if BFIN
++nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
++endif
+ if X86
+ nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
+ endif
+Index: libffi/Makefile.in
+===================================================================
+--- libffi.orig/Makefile.in
++++ libffi/Makefile.in
+@@ -38,35 +38,36 @@ host_triplet = @host@
+ target_triplet = @target@
+ @FFI_DEBUG_TRUE@am__append_1 = src/debug.c
+ @MIPS_TRUE@am__append_2 = src/mips/ffi.c src/mips/o32.S src/mips/n32.S
+-@X86_TRUE@am__append_3 = src/x86/ffi.c src/x86/sysv.S
+-@X86_FREEBSD_TRUE@am__append_4 = src/x86/ffi.c src/x86/freebsd.S
+-@X86_WIN32_TRUE@am__append_5 = src/x86/ffi.c src/x86/win32.S
+-@X86_WIN64_TRUE@am__append_6 = src/x86/ffi.c src/x86/win64.S
+-@X86_DARWIN_TRUE@am__append_7 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
+-@SPARC_TRUE@am__append_8 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
+-@ALPHA_TRUE@am__append_9 = src/alpha/ffi.c src/alpha/osf.S
+-@IA64_TRUE@am__append_10 = src/ia64/ffi.c src/ia64/unix.S
+-@M32R_TRUE@am__append_11 = src/m32r/sysv.S src/m32r/ffi.c
+-@M68K_TRUE@am__append_12 = src/m68k/ffi.c src/m68k/sysv.S
+-@POWERPC_TRUE@am__append_13 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
+-@POWERPC_AIX_TRUE@am__append_14 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
+-@POWERPC_DARWIN_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
+-@POWERPC_FREEBSD_TRUE@am__append_16 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
+-@ARM_TRUE@am__append_17 = src/arm/sysv.S src/arm/ffi.c
+-@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_18 = src/arm/trampoline.S
+-@AVR32_TRUE@am__append_19 = src/avr32/sysv.S src/avr32/ffi.c
+-@LIBFFI_CRIS_TRUE@am__append_20 = src/cris/sysv.S src/cris/ffi.c
+-@FRV_TRUE@am__append_21 = src/frv/eabi.S src/frv/ffi.c
+-@MOXIE_TRUE@am__append_22 = src/moxie/eabi.S src/moxie/ffi.c
+-@S390_TRUE@am__append_23 = src/s390/sysv.S src/s390/ffi.c
+-@X86_64_TRUE@am__append_24 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
+-@SH_TRUE@am__append_25 = src/sh/sysv.S src/sh/ffi.c
+-@SH64_TRUE@am__append_26 = src/sh64/sysv.S src/sh64/ffi.c
+-@PA_LINUX_TRUE@am__append_27 = src/pa/linux.S src/pa/ffi.c
+-@PA_HPUX_TRUE@am__append_28 = src/pa/hpux32.S src/pa/ffi.c
++@BFIN_TRUE@am__append_3 = src/bfin/ffi.c src/bfin/sysv.S
++@X86_TRUE@am__append_4 = src/x86/ffi.c src/x86/sysv.S
++@X86_FREEBSD_TRUE@am__append_5 = src/x86/ffi.c src/x86/freebsd.S
++@X86_WIN32_TRUE@am__append_6 = src/x86/ffi.c src/x86/win32.S
++@X86_WIN64_TRUE@am__append_7 = src/x86/ffi.c src/x86/win64.S
++@X86_DARWIN_TRUE@am__append_8 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
++@SPARC_TRUE@am__append_9 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
++@ALPHA_TRUE@am__append_10 = src/alpha/ffi.c src/alpha/osf.S
++@IA64_TRUE@am__append_11 = src/ia64/ffi.c src/ia64/unix.S
++@M32R_TRUE@am__append_12 = src/m32r/sysv.S src/m32r/ffi.c
++@M68K_TRUE@am__append_13 = src/m68k/ffi.c src/m68k/sysv.S
++@POWERPC_TRUE@am__append_14 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
++@POWERPC_AIX_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
++@POWERPC_DARWIN_TRUE@am__append_16 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
++@POWERPC_FREEBSD_TRUE@am__append_17 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
++@ARM_TRUE@am__append_18 = src/arm/sysv.S src/arm/ffi.c
++@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_19 = src/arm/trampoline.S
++@AVR32_TRUE@am__append_20 = src/avr32/sysv.S src/avr32/ffi.c
++@LIBFFI_CRIS_TRUE@am__append_21 = src/cris/sysv.S src/cris/ffi.c
++@FRV_TRUE@am__append_22 = src/frv/eabi.S src/frv/ffi.c
++@MOXIE_TRUE@am__append_23 = src/moxie/eabi.S src/moxie/ffi.c
++@S390_TRUE@am__append_24 = src/s390/sysv.S src/s390/ffi.c
++@X86_64_TRUE@am__append_25 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
++@SH_TRUE@am__append_26 = src/sh/sysv.S src/sh/ffi.c
++@SH64_TRUE@am__append_27 = src/sh64/sysv.S src/sh64/ffi.c
++@PA_LINUX_TRUE@am__append_28 = src/pa/linux.S src/pa/ffi.c
++@PA_HPUX_TRUE@am__append_29 = src/pa/hpux32.S src/pa/ffi.c
+ # Build debug. Define FFI_DEBUG on the commandline so that, when building with
+ # MSVC, it can link against the debug CRT.
+-@FFI_DEBUG_TRUE@am__append_29 = -DFFI_DEBUG
++@FFI_DEBUG_TRUE@am__append_30 = -DFFI_DEBUG
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
+@@ -75,17 +76,7 @@ DIST_COMMON = README $(am__configure_dep
+ 	compile config.guess config.sub depcomp install-sh ltmain.sh \
+ 	mdate-sh missing texinfo.tex
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \
+-	$(top_srcdir)/m4/ax_cc_maxopt.m4 \
+-	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
+-	$(top_srcdir)/m4/ax_compiler_vendor.m4 \
+-	$(top_srcdir)/m4/ax_configure_args.m4 \
+-	$(top_srcdir)/m4/ax_enable_builddir.m4 \
+-	$(top_srcdir)/m4/ax_gcc_archflag.m4 \
+-	$(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \
+-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ 	$(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+@@ -126,44 +117,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
+ @FFI_DEBUG_TRUE@am__objects_1 = src/debug.lo
+ @MIPS_TRUE@am__objects_2 = src/mips/ffi.lo src/mips/o32.lo \
+ @MIPS_TRUE@	src/mips/n32.lo
+-@X86_TRUE@am__objects_3 = src/x86/ffi.lo src/x86/sysv.lo
+-@X86_FREEBSD_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/freebsd.lo
+-@X86_WIN32_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/win32.lo
+-@X86_WIN64_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win64.lo
+-@X86_DARWIN_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/darwin.lo \
++@BFIN_TRUE@am__objects_3 = src/bfin/ffi.lo src/bfin/sysv.lo
++@X86_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/sysv.lo
++@X86_FREEBSD_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/freebsd.lo
++@X86_WIN32_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win32.lo
++@X86_WIN64_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/win64.lo
++@X86_DARWIN_TRUE@am__objects_8 = src/x86/ffi.lo src/x86/darwin.lo \
+ @X86_DARWIN_TRUE@	src/x86/ffi64.lo src/x86/darwin64.lo
+-@SPARC_TRUE@am__objects_8 = src/sparc/ffi.lo src/sparc/v8.lo \
++@SPARC_TRUE@am__objects_9 = src/sparc/ffi.lo src/sparc/v8.lo \
+ @SPARC_TRUE@	src/sparc/v9.lo
+-@ALPHA_TRUE@am__objects_9 = src/alpha/ffi.lo src/alpha/osf.lo
+-@IA64_TRUE@am__objects_10 = src/ia64/ffi.lo src/ia64/unix.lo
+-@M32R_TRUE@am__objects_11 = src/m32r/sysv.lo src/m32r/ffi.lo
+-@M68K_TRUE@am__objects_12 = src/m68k/ffi.lo src/m68k/sysv.lo
+-@POWERPC_TRUE@am__objects_13 = src/powerpc/ffi.lo src/powerpc/sysv.lo \
++@ALPHA_TRUE@am__objects_10 = src/alpha/ffi.lo src/alpha/osf.lo
++@IA64_TRUE@am__objects_11 = src/ia64/ffi.lo src/ia64/unix.lo
++@M32R_TRUE@am__objects_12 = src/m32r/sysv.lo src/m32r/ffi.lo
++@M68K_TRUE@am__objects_13 = src/m68k/ffi.lo src/m68k/sysv.lo
++@POWERPC_TRUE@am__objects_14 = src/powerpc/ffi.lo src/powerpc/sysv.lo \
+ @POWERPC_TRUE@	src/powerpc/ppc_closure.lo \
+ @POWERPC_TRUE@	src/powerpc/linux64.lo \
+ @POWERPC_TRUE@	src/powerpc/linux64_closure.lo
+-@POWERPC_AIX_TRUE@am__objects_14 = src/powerpc/ffi_darwin.lo \
++@POWERPC_AIX_TRUE@am__objects_15 = src/powerpc/ffi_darwin.lo \
+ @POWERPC_AIX_TRUE@	src/powerpc/aix.lo \
+ @POWERPC_AIX_TRUE@	src/powerpc/aix_closure.lo
+-@POWERPC_DARWIN_TRUE@am__objects_15 = src/powerpc/ffi_darwin.lo \
++@POWERPC_DARWIN_TRUE@am__objects_16 = src/powerpc/ffi_darwin.lo \
+ @POWERPC_DARWIN_TRUE@	src/powerpc/darwin.lo \
+ @POWERPC_DARWIN_TRUE@	src/powerpc/darwin_closure.lo
+-@POWERPC_FREEBSD_TRUE@am__objects_16 = src/powerpc/ffi.lo \
++@POWERPC_FREEBSD_TRUE@am__objects_17 = src/powerpc/ffi.lo \
+ @POWERPC_FREEBSD_TRUE@	src/powerpc/sysv.lo \
+ @POWERPC_FREEBSD_TRUE@	src/powerpc/ppc_closure.lo
+-@ARM_TRUE@am__objects_17 = src/arm/sysv.lo src/arm/ffi.lo
+-@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_18 = src/arm/trampoline.lo
+-@AVR32_TRUE@am__objects_19 = src/avr32/sysv.lo src/avr32/ffi.lo
+-@LIBFFI_CRIS_TRUE@am__objects_20 = src/cris/sysv.lo src/cris/ffi.lo
+-@FRV_TRUE@am__objects_21 = src/frv/eabi.lo src/frv/ffi.lo
+-@MOXIE_TRUE@am__objects_22 = src/moxie/eabi.lo src/moxie/ffi.lo
+-@S390_TRUE@am__objects_23 = src/s390/sysv.lo src/s390/ffi.lo
+-@X86_64_TRUE@am__objects_24 = src/x86/ffi64.lo src/x86/unix64.lo \
++@ARM_TRUE@am__objects_18 = src/arm/sysv.lo src/arm/ffi.lo
++@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_19 = src/arm/trampoline.lo
++@AVR32_TRUE@am__objects_20 = src/avr32/sysv.lo src/avr32/ffi.lo
++@LIBFFI_CRIS_TRUE@am__objects_21 = src/cris/sysv.lo src/cris/ffi.lo
++@FRV_TRUE@am__objects_22 = src/frv/eabi.lo src/frv/ffi.lo
++@MOXIE_TRUE@am__objects_23 = src/moxie/eabi.lo src/moxie/ffi.lo
++@S390_TRUE@am__objects_24 = src/s390/sysv.lo src/s390/ffi.lo
++@X86_64_TRUE@am__objects_25 = src/x86/ffi64.lo src/x86/unix64.lo \
+ @X86_64_TRUE@	src/x86/ffi.lo src/x86/sysv.lo
+-@SH_TRUE@am__objects_25 = src/sh/sysv.lo src/sh/ffi.lo
+-@SH64_TRUE@am__objects_26 = src/sh64/sysv.lo src/sh64/ffi.lo
+-@PA_LINUX_TRUE@am__objects_27 = src/pa/linux.lo src/pa/ffi.lo
+-@PA_HPUX_TRUE@am__objects_28 = src/pa/hpux32.lo src/pa/ffi.lo
++@SH_TRUE@am__objects_26 = src/sh/sysv.lo src/sh/ffi.lo
++@SH64_TRUE@am__objects_27 = src/sh64/sysv.lo src/sh64/ffi.lo
++@PA_LINUX_TRUE@am__objects_28 = src/pa/linux.lo src/pa/ffi.lo
++@PA_HPUX_TRUE@am__objects_29 = src/pa/hpux32.lo src/pa/ffi.lo
+ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+ 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+@@ -173,17 +165,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
+ 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+ 	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
+ 	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
+-	$(am__objects_27) $(am__objects_28)
++	$(am__objects_27) $(am__objects_28) $(am__objects_29)
+ libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \
+ 	$(nodist_libffi_la_OBJECTS)
+ libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libffi_la_LDFLAGS) $(LDFLAGS) -o $@
+ libffi_convenience_la_LIBADD =
+-am__objects_29 = src/prep_cif.lo src/types.lo src/raw_api.lo \
++am__objects_30 = src/prep_cif.lo src/types.lo src/raw_api.lo \
+ 	src/java_raw_api.lo src/closures.lo
+-am_libffi_convenience_la_OBJECTS = $(am__objects_29)
+-am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
++am_libffi_convenience_la_OBJECTS = $(am__objects_30)
++am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
+ 	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
+ 	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
+ 	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+@@ -192,8 +184,8 @@ am__objects_30 = $(am__objects_1) $(am__
+ 	$(am__objects_19) $(am__objects_20) $(am__objects_21) \
+ 	$(am__objects_22) $(am__objects_23) $(am__objects_24) \
+ 	$(am__objects_25) $(am__objects_26) $(am__objects_27) \
+-	$(am__objects_28)
+-nodist_libffi_convenience_la_OBJECTS = $(am__objects_30)
++	$(am__objects_28) $(am__objects_29)
++nodist_libffi_convenience_la_OBJECTS = $(am__objects_31)
+ libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
+ 	$(nodist_libffi_convenience_la_OBJECTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@
+@@ -440,6 +432,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+ 	src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
+ 	src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h	\
+ 	src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
++	src/bfin/ffi.c src/bfin/ffitarget.h src/bfin/sysv.S \
+ 	src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
+ 	src/moxie/ffi.c src/moxie/eabi.S libtool-version \
+ 	ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
+@@ -508,10 +501,10 @@ nodist_libffi_la_SOURCES = $(am__append_
+ 	$(am__append_18) $(am__append_19) $(am__append_20) \
+ 	$(am__append_21) $(am__append_22) $(am__append_23) \
+ 	$(am__append_24) $(am__append_25) $(am__append_26) \
+-	$(am__append_27) $(am__append_28)
++	$(am__append_27) $(am__append_28) $(am__append_29)
+ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
+ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
+-AM_CFLAGS = -g $(am__append_29)
++AM_CFLAGS = -g $(am__append_30)
+ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
+ AM_CCASFLAGS = $(AM_CPPFLAGS) -g
+@@ -637,6 +630,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp
+ 	src/mips/$(DEPDIR)/$(am__dirstamp)
+ src/mips/n32.lo: src/mips/$(am__dirstamp) \
+ 	src/mips/$(DEPDIR)/$(am__dirstamp)
++src/bfin/$(am__dirstamp):
++	@$(MKDIR_P) src/bfin
++	@: > src/bfin/$(am__dirstamp)
++src/bfin/$(DEPDIR)/$(am__dirstamp):
++	@$(MKDIR_P) src/bfin/$(DEPDIR)
++	@: > src/bfin/$(DEPDIR)/$(am__dirstamp)
++src/bfin/ffi.lo: src/bfin/$(am__dirstamp) \
++	src/bfin/$(DEPDIR)/$(am__dirstamp)
++src/bfin/sysv.lo: src/bfin/$(am__dirstamp) \
++	src/bfin/$(DEPDIR)/$(am__dirstamp)
+ src/x86/$(am__dirstamp):
+ 	@$(MKDIR_P) src/x86
+ 	@: > src/x86/$(am__dirstamp)
+@@ -852,6 +855,10 @@ mostlyclean-compile:
+ 	-rm -f src/avr32/ffi.lo
+ 	-rm -f src/avr32/sysv.$(OBJEXT)
+ 	-rm -f src/avr32/sysv.lo
++	-rm -f src/bfin/ffi.$(OBJEXT)
++	-rm -f src/bfin/ffi.lo
++	-rm -f src/bfin/sysv.$(OBJEXT)
++	-rm -f src/bfin/sysv.lo
+ 	-rm -f src/closures.$(OBJEXT)
+ 	-rm -f src/closures.lo
+ 	-rm -f src/cris/ffi.$(OBJEXT)
+@@ -973,6 +980,8 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/trampoline.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@src/bfin/$(DEPDIR)/ffi.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@src/bfin/$(DEPDIR)/sysv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/sysv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/frv/$(DEPDIR)/eabi.Plo@am__quote@
+@@ -1077,6 +1086,7 @@ clean-libtool:
+ 	-rm -rf src/alpha/.libs src/alpha/_libs
+ 	-rm -rf src/arm/.libs src/arm/_libs
+ 	-rm -rf src/avr32/.libs src/avr32/_libs
++	-rm -rf src/bfin/.libs src/bfin/_libs
+ 	-rm -rf src/cris/.libs src/cris/_libs
+ 	-rm -rf src/frv/.libs src/frv/_libs
+ 	-rm -rf src/ia64/.libs src/ia64/_libs
+@@ -1631,6 +1641,8 @@ distclean-generic:
+ 	-rm -f src/arm/$(am__dirstamp)
+ 	-rm -f src/avr32/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f src/avr32/$(am__dirstamp)
++	-rm -f src/bfin/$(DEPDIR)/$(am__dirstamp)
++	-rm -f src/bfin/$(am__dirstamp)
+ 	-rm -f src/cris/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f src/cris/$(am__dirstamp)
+ 	-rm -f src/frv/$(DEPDIR)/$(am__dirstamp)
+@@ -1670,7 +1682,7 @@ clean-am: clean-aminfo clean-generic cle
+ 
+ distclean: distclean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
++	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-hdr distclean-libtool distclean-tags
+@@ -1790,7 +1802,7 @@ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -rf $(top_srcdir)/autom4te.cache
+-	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
++	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+ 	maintainer-clean-generic maintainer-clean-vti
+Index: libffi/configure
+===================================================================
+--- libffi.orig/configure
++++ libffi/configure
+@@ -679,6 +679,8 @@ X86_FALSE
+ X86_TRUE
+ SPARC_FALSE
+ SPARC_TRUE
++BFIN_FALSE
++BFIN_TRUE
+ MIPS_FALSE
+ MIPS_TRUE
+ AM_LTLDFLAGS
+@@ -6840,14 +6842,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	    LD="${LD-ld} -m elf_i386_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
+-	    case `/usr/bin/file conftest.o` in
+-	      *x86-64*)
+-	         LD="${LD-ld} -m elf32_x86_64"
+-	         ;;
+-	      *)
+-	         LD="${LD-ld} -m elf_i386"
+-	         ;;
+-	    esac
++	    LD="${LD-ld} -m elf_i386"
+ 	    ;;
+ 	  ppc64-*linux*|powerpc64-*linux*)
+ 	    LD="${LD-ld} -m elf32ppclinux"
+@@ -8418,10 +8413,6 @@ _lt_linker_boilerplate=`cat conftest.err
+ $RM -r conftest*
+ 
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+ if test -n "$compiler"; then
+ 
+ lt_prog_compiler_no_builtin_flag=
+@@ -10972,10 +10963,14 @@ fi
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Add ABI-specific directories to the system library path.
++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -12419,7 +12414,7 @@ if test "x$ax_gcc_arch" = xyes; then
+ ax_gcc_arch=""
+ if test "$cross_compiling" = no; then
+ case $host_cpu in
+-  i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
++  i[3456]86*|x86_64*) # use cpuid codes
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -12535,18 +12530,24 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+           case $ax_cv_gcc_x86_cpuid_1 in
+ 	    *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
+ 	    *5??:*:*:*) ax_gcc_arch=pentium ;;
+-	    *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
+-	    *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
+-	    *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
+-	    *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
+-	    *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
+-	    *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
+-            *f3[347]:*:*:*|*f41347:*:*:*)
++	    *0?6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
++	    *0?6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
++	    *0?6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
++	    *0?6[9de]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
++	    *0?6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
++	    *0?6f?:*:*:*|*1?66?:*:*:*) ax_gcc_arch="core2 pentium-m pentium3 pentiumpro" ;;
++	    *1?6[7d]?:*:*:*) ax_gcc_arch="penryn core2 pentium-m pentium3 pentiumpro" ;;
++	    *1?6[aef]?:*:*:*|*2?6[5cef]?:*:*:*) ax_gcc_arch="corei7 core2 pentium-m pentium3 pentiumpro" ;;
++	    *1?6c?:*:*:*|*[23]?66?:*:*:*) ax_gcc_arch="atom core2 pentium-m pentium3 pentiumpro" ;;
++	    *2?6[ad]?:*:*:*) ax_gcc_arch="corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;;
++	    *0?6??:*:*:*) ax_gcc_arch=pentiumpro ;;
++	    *6??:*:*:*) ax_gcc_arch="core2 pentiumpro" ;;
++	    ?000?f3[347]:*:*:*|?000?f41347:*:*:*|?000?f6?:*:*:*)
+ 		case $host_cpu in
+-                  x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
+-                  *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
+-                esac ;;
+-            *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
++	          x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
++	          *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
++	        esac ;;
++	    ?000?f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
+           esac ;;
+        *:68747541:*:*) # AMD
+           case $ax_cv_gcc_x86_cpuid_1 in
+@@ -12618,10 +12619,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 			ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
+                  *) ax_gcc_arch="athlon-4 athlon k7" ;;
+ 	       esac ;;
+-	    *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
+-	    *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
+-	    *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
+-	    *f??:*:*:*) ax_gcc_arch="k8" ;;
++	    ?00??f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
++	    ?00??f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
++	    ?00??f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
++	    ?00??f??:*:*:*) ax_gcc_arch="k8" ;;
++	    ?05??f??:*:*:*) ax_gcc_arch="btver1 amdfam10 k8" ;;
++	    ?06??f??:*:*:*) ax_gcc_arch="bdver1 amdfam10 k8" ;;
++	    *f??:*:*:*) ax_gcc_arch="amdfam10 k8" ;;
+           esac ;;
+ 	*:746e6543:*:*) # IDT
+ 	   case $ax_cv_gcc_x86_cpuid_1 in
+@@ -13150,6 +13154,10 @@ case "$host" in
+ 	TARGET=AVR32; TARGETDIR=avr32
+ 	;;
+ 
++  bfin*)
++  	TARGET=BFIN; TARGETDIR=bfin
++  	;;
++
+   cris-*-*)
+ 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
+ 	;;
+@@ -13295,6 +13303,14 @@ else
+   MIPS_FALSE=
+ fi
+ 
++ if test x$TARGET = xBFIN; then
++  BFIN_TRUE=
++  BFIN_FALSE='#'
++else
++  BFIN_TRUE='#'
++  BFIN_FALSE=
++fi
++
+  if test x$TARGET = xSPARC; then
+   SPARC_TRUE=
+   SPARC_FALSE='#'
+@@ -14134,40 +14150,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
+  esac
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .cfi pseudo-op support" >&5
+-$as_echo_n "checking assembler .cfi pseudo-op support... " >&6; }
+-if ${gcc_cv_as_cfi_pseudo_op+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-    gcc_cv_as_cfi_pseudo_op=unknown
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-asm (".cfi_startproc\n\t.cfi_endproc");
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  gcc_cv_as_cfi_pseudo_op=yes
+-else
+-  gcc_cv_as_cfi_pseudo_op=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_cfi_pseudo_op" >&5
+-$as_echo "$gcc_cv_as_cfi_pseudo_op" >&6; }
+- if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then
+-
+-$as_echo "#define HAVE_AS_CFI_PSEUDO_OP 1" >>confdefs.h
+-
+- fi
+-
++GCC_AS_CFI_PSEUDO_OP
+ 
+ if test x$TARGET = xSPARC; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5
+@@ -14739,6 +14722,10 @@ if test -z "${MIPS_TRUE}" && test -z "${
+   as_fn_error $? "conditional \"MIPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${BFIN_TRUE}" && test -z "${BFIN_FALSE}"; then
++  as_fn_error $? "conditional \"BFIN\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then
+   as_fn_error $? "conditional \"SPARC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+Index: libffi/configure.ac
+===================================================================
+--- libffi.orig/configure.ac
++++ libffi/configure.ac
+@@ -75,6 +75,10 @@ case "$host" in
+ 	TARGET=AVR32; TARGETDIR=avr32
+ 	;;
+ 
++  bfin*)
++  	TARGET=BFIN; TARGETDIR=bfin
++  	;;
++
+   cris-*-*)
+ 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
+ 	;;
+@@ -213,6 +217,7 @@ if test $TARGETDIR = unknown; then
+ fi
+ 
+ AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
++AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
+ AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+ AM_CONDITIONAL(X86, test x$TARGET = xX86)
+ AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
+Index: libffi/src/bfin/ffi.c
+===================================================================
+--- /dev/null
++++ libffi/src/bfin/ffi.c
+@@ -0,0 +1,195 @@
++/* -----------------------------------------------------------------------
++   ffi.c - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
++
++   Blackfin Foreign Function Interface
++
++   Permission is hereby granted, free of charge, to any person obtaining
++   a copy of this software and associated documentation files (the
++   ``Software''), to deal in the Software without restriction, including
++   without limitation the rights to use, copy, modify, merge, publish,
++   distribute, sublicense, and/or sell copies of the Software, and to
++   permit persons to whom the Software is furnished to do so, subject to
++   the following conditions:
++
++   The above copyright notice and this permission notice shall be included
++   in all copies or substantial portions of the Software.
++
++   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
++   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++   DEALINGS IN THE SOFTWARE.
++   ----------------------------------------------------------------------- */
++#include <ffi.h>
++#include <ffi_common.h>
++
++#include <stdlib.h>
++#include <stdio.h>
++
++/* Maximum number of GPRs available for argument passing.  */
++#define MAX_GPRARGS 3
++
++/*
++ * Return types
++ */
++#define FFIBFIN_RET_VOID 0
++#define FFIBFIN_RET_BYTE 1
++#define FFIBFIN_RET_HALFWORD 2
++#define FFIBFIN_RET_INT64 3
++#define FFIBFIN_RET_INT32 4
++
++/*====================================================================*/
++/*                          PROTOTYPE          *
++ /*====================================================================*/
++void ffi_prep_args(unsigned char *, extended_cif *);
++
++/*====================================================================*/
++/*                          Externals                                 */
++/*                          (Assembly)                                */
++/*====================================================================*/
++
++extern void ffi_call_SYSV(unsigned, extended_cif *, void(*)(unsigned char *, extended_cif *), unsigned, void *, void(*fn)(void));
++
++/*====================================================================*/
++/*                          Implementation                            */
++/*                                                            */
++/*====================================================================*/
++
++
++/*
++ * This function calculates the return type (size) based on type.
++ */
++
++ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
++{
++   /* --------------------------------------*
++    *   Return handling                *
++    * --------------------------------------*/
++   switch (cif->rtype->type) {
++      case FFI_TYPE_VOID:
++         cif->flags = FFIBFIN_RET_VOID;
++         break;
++      case FFI_TYPE_UINT16:
++      case FFI_TYPE_SINT16:
++         cif->flags = FFIBFIN_RET_HALFWORD;
++         break;
++      case FFI_TYPE_UINT8:
++         cif->flags = FFIBFIN_RET_BYTE;
++         break;
++      case FFI_TYPE_INT:
++      case FFI_TYPE_UINT32:
++      case FFI_TYPE_SINT32:
++      case FFI_TYPE_FLOAT:
++      case FFI_TYPE_POINTER:
++      case FFI_TYPE_SINT8:
++         cif->flags = FFIBFIN_RET_INT32;
++         break;
++      case FFI_TYPE_SINT64:
++      case FFI_TYPE_UINT64:
++      case FFI_TYPE_DOUBLE:
++          cif->flags = FFIBFIN_RET_INT64;
++          break;
++      case FFI_TYPE_STRUCT:
++         if (cif->rtype->size <= 4){
++        	 cif->flags = FFIBFIN_RET_INT32;
++         }else if (cif->rtype->size == 8){
++        	 cif->flags = FFIBFIN_RET_INT64;
++         }else{
++        	 //it will return via a hidden pointer in P0
++        	 cif->flags = FFIBFIN_RET_VOID;
++         }
++         break;
++      default:
++         FFI_ASSERT(0);
++         break;
++   }
++   return FFI_OK;
++}
++
++/*
++ * This will prepare the arguments and will call the assembly routine
++ * cif = the call interface
++ * fn = the function to be called
++ * rvalue = the return value
++ * avalue = the arguments
++ */
++void ffi_call(ffi_cif *cif, void(*fn)(void), void *rvalue, void **avalue)
++{
++   int ret_type = cif->flags;
++   extended_cif ecif;
++   ecif.cif = cif;
++   ecif.avalue = avalue;
++   ecif.rvalue = rvalue;
++
++   switch (cif->abi) {
++      case FFI_SYSV:
++         ffi_call_SYSV(cif->bytes, &ecif, ffi_prep_args, ret_type, ecif.rvalue, fn);
++         break;
++      default:
++         FFI_ASSERT(0);
++         break;
++   }
++}
++
++
++/*
++* This function prepares the parameters (copies them from the ecif to the stack)
++*  to call the function (ffi_prep_args is called by the assembly routine in file
++*  sysv.S, which also calls the actual function)
++*/
++void ffi_prep_args(unsigned char *stack, extended_cif *ecif)
++{
++   register unsigned int i = 0;
++   void **p_argv;
++   unsigned char *argp;
++   ffi_type **p_arg;
++   argp = stack;
++   p_argv = ecif->avalue;
++   for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
++        (i != 0);
++        i--, p_arg++) {
++      size_t z;
++      z = (*p_arg)->size;
++      if (z < sizeof(int)) {
++         z = sizeof(int);
++         switch ((*p_arg)->type) {
++            case FFI_TYPE_SINT8: {
++                  signed char v = *(SINT8 *)(* p_argv);
++                  signed int t = v;
++                  *(signed int *) argp = t;
++               }
++               break;
++            case FFI_TYPE_UINT8: {
++                  unsigned char v = *(UINT8 *)(* p_argv);
++                  unsigned int t = v;
++                  *(unsigned int *) argp = t;
++               }
++               break;
++            case FFI_TYPE_SINT16:
++               *(signed int *) argp = (signed int) * (SINT16 *)(* p_argv);
++               break;
++            case FFI_TYPE_UINT16:
++               *(unsigned int *) argp = (unsigned int) * (UINT16 *)(* p_argv);
++               break;
++            case FFI_TYPE_STRUCT:
++               memcpy(argp, *p_argv, (*p_arg)->size);
++               break;
++            default:
++               FFI_ASSERT(0);
++               break;
++         }
++      } else if (z == sizeof(int)) {
++         *(unsigned int *) argp = (unsigned int) * (UINT32 *)(* p_argv);
++      } else {
++         memcpy(argp, *p_argv, z);
++      }
++      p_argv++;
++      argp += z;
++   }
++}
++
++
++
+Index: libffi/src/bfin/ffitarget.h
+===================================================================
+--- /dev/null
++++ libffi/src/bfin/ffitarget.h
+@@ -0,0 +1,43 @@
++/* -----------------------------------------------------------------------
++   ffitarget.h - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
++
++   Blackfin Foreign Function Interface
++
++   Permission is hereby granted, free of charge, to any person obtaining
++   a copy of this software and associated documentation files (the
++   ``Software''), to deal in the Software without restriction, including
++   without limitation the rights to use, copy, modify, merge, publish,
++   distribute, sublicense, and/or sell copies of the Software, and to
++   permit persons to whom the Software is furnished to do so, subject to
++   the following conditions:
++
++   The above copyright notice and this permission notice shall be included
++   in all copies or substantial portions of the Software.
++
++   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
++   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++   DEALINGS IN THE SOFTWARE.
++   ----------------------------------------------------------------------- */
++
++#ifndef LIBFFI_TARGET_H
++#define LIBFFI_TARGET_H
++
++#ifndef LIBFFI_ASM
++typedef unsigned long          ffi_arg;
++typedef signed 	 long          ffi_sarg;
++
++typedef enum ffi_abi {
++  FFI_FIRST_ABI = 0,
++  FFI_SYSV,
++  FFI_LAST_ABI,
++  FFI_DEFAULT_ABI = FFI_SYSV
++} ffi_abi;
++#endif
++
++#endif
++
+Index: libffi/src/bfin/sysv.S
+===================================================================
+--- /dev/null
++++ libffi/src/bfin/sysv.S
+@@ -0,0 +1,177 @@
++/* -----------------------------------------------------------------------
++   sysv.S - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
++
++   Blackfin Foreign Function Interface
++
++   Permission is hereby granted, free of charge, to any person obtaining
++   a copy of this software and associated documentation files (the
++   ``Software''), to deal in the Software without restriction, including
++   without limitation the rights to use, copy, modify, merge, publish,
++   distribute, sublicense, and/or sell copies of the Software, and to
++   permit persons to whom the Software is furnished to do so, subject to
++   the following conditions:
++
++   The above copyright notice and this permission notice shall be included
++   in all copies or substantial portions of the Software.
++
++   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
++   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++   DEALINGS IN THE SOFTWARE.
++   ----------------------------------------------------------------------- */
++
++#define LIBFFI_ASM
++#include <fficonfig.h>
++#include <ffi.h>
++
++.text
++.align 4
++
++	/*
++	 There is a "feature" in the bfin toolchain that it puts a _ before funcion names
++	 that's why the function here it's called _ffi_call_SYSV and not ffi_call_SYSV
++	 */
++	.global _ffi_call_SYSV;
++	.type _ffi_call_SYSV, STT_FUNC;
++	.func ffi_call_SYSV
++
++	/*
++	cif->bytes  	= R0	(fp+8)
++	&ecif			= R1	(fp+12)
++	ffi_prep_args	= R2	(fp+16)
++	ret_type		= stack (fp+20)
++	ecif.rvalue		= stack (fp+24)
++	fn				= stack	(fp+28)
++					  got	(fp+32)
++    There is room for improvement here (we can use temporary registers
++        instead of saving the values in the memory)
++	REGS:
++		P5 => Stack pointer (function arguments)
++		R5 => cif->bytes
++		R4 => ret->type
++
++		FP-20 = P3
++		FP-16 = SP (parameters area)
++		FP-12 = SP (temp)
++		FP-08 = function return part 1 [R0]
++		FP-04 = function return part 2 [R1]
++	*/
++
++_ffi_call_SYSV:
++.prologue:
++	LINK 20;
++	[FP-20] = P3;
++	[FP+8] = R0;
++	[FP+12] = R1;
++	[FP+16] = R2;
++
++.allocate_stack:
++	//alocate cif->bytes into the stack
++	R1 = [FP+8];
++	R0 = SP;
++	R0 = R0 - R1;
++	R1 = 4;
++	R0 = R0 - R1;
++	[FP-12] = SP;
++	SP = R0;
++	[FP-16] = SP;
++
++.call_prep_args:
++	//get the addr of prep_args
++	P0 = [P3 + _ffi_prep_args@FUNCDESC_GOT17M4];
++	P1 = [P0];
++	P3 = [P0+4];
++	R0 = [FP-16];//SP (parameter area)
++	R1 = [FP+12];//ecif
++	call (P1);
++
++.call_user_function:
++	//ajust SP so as to allow the user function access the parameters on the stack
++	SP = [FP-16]; //point to function parameters
++	R0 = [SP];
++	R1 = [SP+4];
++	R2 = [SP+8];
++	//load user function address
++	P0 = FP;
++	P0 +=28;
++	P1 = [P0];
++	P1 = [P1];
++	P3 = [P0+4];
++	/*
++		For functions returning aggregate values (struct) occupying more than 8 bytes,
++		the caller allocates the return value object on the stack and the address
++		of this object is passed to the callee as a hidden argument in register P0.
++	*/
++	P0 = [FP+24];
++
++	call (P1);
++	SP = [FP-12];
++.compute_return:
++	P2 = [FP-20];
++	[FP-8] = R0;
++	[FP-4] = R1;
++
++	R0 = [FP+20];
++	R1 = R0 << 2;
++
++	R0 = [P2+.rettable@GOT17M4];
++	R0 = R1 + R0;
++	P2 = R0;
++	R1 = [P2];
++
++	P2 = [FP+-20];
++	R0 = [P2+.rettable@GOT17M4];
++	R0 = R1 + R0;
++	P2 = R0;
++	R0 = [FP-8];
++	R1 = [FP-4];
++	jump (P2);
++
++/*
++#define FFIBFIN_RET_VOID 0
++#define FFIBFIN_RET_BYTE 1
++#define FFIBFIN_RET_HALFWORD 2
++#define FFIBFIN_RET_INT64 3
++#define FFIBFIN_RET_INT32 4
++*/
++.align 4
++.align 4
++.rettable:
++	.dd .epilogue - .rettable
++	.dd	.rbyte - .rettable;
++	.dd	.rhalfword - .rettable;
++	.dd	.rint64 - .rettable;
++	.dd	.rint32 - .rettable;
++
++.rbyte:
++	P0 = [FP+24];
++	R0 = R0.B (Z);
++	[P0] = R0;
++	JUMP .epilogue
++.rhalfword:
++	P0 = [FP+24];
++	R0 = R0.L;
++	[P0] = R0;
++	JUMP .epilogue
++.rint64:
++	P0 = [FP+24];// &rvalue
++	[P0] = R0;
++	[P0+4] = R1;
++	JUMP .epilogue
++.rint32:
++	P0 = [FP+24];
++	[P0] = R0;
++.epilogue:
++	R0 = [FP+8];
++	R1 = [FP+12];
++	R2 = [FP+16];
++	P3 = [FP-20];
++	UNLINK;
++	RTS;
++
++.size _ffi_call_SYSV,.-_ffi_call_SYSV;
++.endfunc
+Index: libffi/README
+===================================================================
+--- libffi.orig/README
++++ libffi/README
+@@ -1,8 +1,8 @@
+ Status
+ ======
+ 
+-libffi-3.0.11 was released on April 11, 2012.  Check the libffi web
+-page for updates: <URL:http://sourceware.org/libffi/>.
++libffi-3.0.XX was released on XXXXXXX.  Check the libffi web page for
++updates: <URL:http://sourceware.org/libffi/>.
+ 
+ 
+ What is libffi?
+@@ -56,6 +56,7 @@ tested:
+ | ARM          | Linux            |
+ | ARM          | iOS              |
+ | AVR32        | Linux            |
++| Blackfin     | uClinux          |
+ | HPPA         | HPUX             |
+ | IA-64        | Linux            |
+ | M68K         | FreeMiNT         |
+@@ -148,6 +149,9 @@ History
+ 
+ See the ChangeLog files for details.
+ 
++3.0.12 XXX-XX-XX
++        Add Blackfin support.
++
+ 3.0.11 Apr-11-12
+         Add support for variadic functions (ffi_prep_cif_var).
+ 	Add Linux/x32 support.
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 2181ea1be5..adcd6f81e0 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFFI_VERSION = 3.0.10
+LIBFFI_VERSION = 3.0.11
 LIBFFI_SITE    = ftp://sources.redhat.com/pub/libffi/
 
 LIBFFI_INSTALL_STAGING = YES

From 7cff73a29459755a61567f8952005ca3a7cae73f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 23:27:21 +0000
Subject: [PATCH 1955/6849] speex: make it compilable in Thumb-2 mode

This fixes build failures such as
http://autobuild.buildroot.org/results/901e8fe6df0e568624f1ceffc1979c5010e19328/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/speex/speex-thumb2-support.patch | 220 +++++++++++++++++++++++
 1 file changed, 220 insertions(+)
 create mode 100644 package/speex/speex-thumb2-support.patch

diff --git a/package/speex/speex-thumb2-support.patch b/package/speex/speex-thumb2-support.patch
new file mode 100644
index 0000000000..b6f7369299
--- /dev/null
+++ b/package/speex/speex-thumb2-support.patch
@@ -0,0 +1,220 @@
+Make speex Thumb2 compatible
+
+Patch written by Michael Hope from Linaro, available at
+http://lists.xiph.org/pipermail/speex-dev/2010-November/008041.html.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+diff --git a/libspeex/filters_arm4.h b/libspeex/filters_arm4.h
+index 7a74042..6ec1f75 100644
+--- a/libspeex/filters_arm4.h
++++ b/libspeex/filters_arm4.h
+@@ -47,8 +47,10 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
+ 
+          "\tldr %4, [%0], #4 \n"
+          "\tcmps %4, %1 \n"
++         "\tit gt \n"
+          "\tmovgt %1, %4 \n"
+          "\tcmps %4, %3 \n"
++         "\tit lt \n"
+          "\tmovlt %3, %4 \n"
+ 
+          "\tsubs %2, %2, #1 \n"
+@@ -56,6 +58,7 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
+ 
+          "\trsb %3, %3, #0 \n"
+          "\tcmp %1, %3 \n"
++         "\tit lt \n"
+          "\tmovlt %1, %3 \n"
+    : "=r" (dead1), "=r" (max_val), "=r" (dead3), "=r" (dead4),
+    "=r" (dead5), "=r" (dead6)
+diff --git a/libspeex/fixed_arm4.h b/libspeex/fixed_arm4.h
+index b6981ca..b6218ca 100644
+--- a/libspeex/fixed_arm4.h
++++ b/libspeex/fixed_arm4.h
+@@ -69,72 +69,90 @@ static inline short DIV32_16(int a, int b)
+    __asm__ __volatile__ (
+          "\teor %5, %0, %1\n"
+          "\tmovs %4, %0\n"
++         "\tit mi \n"
+          "\trsbmi %0, %0, #0 \n"
+          "\tmovs %4, %1\n"
++         "\tit mi \n"
+          "\trsbmi %1, %1, #0 \n"
+          "\tmov %4, #1\n"
+ 
+          "\tsubs %3, %0, %1, asl #14 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #14 \n"
+ 
+          "\tsubs %3, %0, %1, asl #13 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #13 \n"
+ 
+          "\tsubs %3, %0, %1, asl #12 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #12 \n"
+ 
+          "\tsubs %3, %0, %1, asl #11 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #11 \n"
+ 
+          "\tsubs %3, %0, %1, asl #10 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #10 \n"
+ 
+          "\tsubs %3, %0, %1, asl #9 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #9 \n"
+ 
+          "\tsubs %3, %0, %1, asl #8 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #8 \n"
+ 
+          "\tsubs %3, %0, %1, asl #7 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #7 \n"
+ 
+          "\tsubs %3, %0, %1, asl #6 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #6 \n"
+          
+          "\tsubs %3, %0, %1, asl #5 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #5 \n"
+ 
+          "\tsubs %3, %0, %1, asl #4 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #4 \n"
+ 
+          "\tsubs %3, %0, %1, asl #3 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #2 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #2 \n"
+ 
+          "\tsubs %3, %0, %1, asl #1 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4, asl #1 \n"
+ 
+          "\tsubs %3, %0, %1 \n"
++         "\titt pl \n"
+          "\tmovpl %0, %3 \n"
+          "\torrpl %2, %2, %4 \n"
+ 
+          "\tmovs %5, %5, lsr #31 \n"
++         "\tit ne \n"
+          "\trsbne %2, %2, #0 \n"
+    : "=r" (dead1), "=r" (dead2), "=r" (res),
+    "=r" (dead3), "=r" (dead4), "=r" (dead5)
+diff --git a/libspeex/fixed_arm5e.h b/libspeex/fixed_arm5e.h
+index 9b4861c..bdadd02 100644
+--- a/libspeex/fixed_arm5e.h
++++ b/libspeex/fixed_arm5e.h
+@@ -97,72 +97,90 @@ static inline short DIV32_16(int a, int b)
+    __asm__ __volatile__ (
+          "\teor %5, %0, %1\n"
+          "\tmovs %4, %0\n"
++         "\tit mi \n"
+          "\trsbmi %0, %0, #0 \n"
+          "\tmovs %4, %1\n"
++         "\tit mi \n"
+          "\trsbmi %1, %1, #0 \n"
+          "\tmov %4, #1\n"
+ 
+          "\tsubs %3, %0, %1, asl #14 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #14 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #13 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #13 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #12 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #12 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #11 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #11 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #10 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #10 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #9 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #9 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #8 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #8 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #7 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #7 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #6 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #6 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #5 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #5 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #4 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #4 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #3 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #3 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #2 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #2 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1, asl #1 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4, asl #1 \n"
+          "\tmovpl %0, %3 \n"
+ 
+          "\tsubs %3, %0, %1 \n"
++         "\titt pl \n"
+          "\torrpl %2, %2, %4 \n"
+          "\tmovpl %0, %3 \n"
+          
+          "\tmovs %5, %5, lsr #31 \n"
++         "\tit ne \n"
+          "\trsbne %2, %2, #0 \n"
+    : "=r" (dead1), "=r" (dead2), "=r" (res),
+    "=r" (dead3), "=r" (dead4), "=r" (dead5)

From ad732e63fcb4969a1f7977f342188807f16371c8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 7 May 2012 23:27:22 +0000
Subject: [PATCH 1956/6849] m4: not available on noMMU platforms

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/m4/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/m4/Config.in b/package/m4/Config.in
index 56b2859fc6..dee2d833fa 100644
--- a/package/m4/Config.in
+++ b/package/m4/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_M4
 	bool "m4"
 	depends on BR2_USE_WCHAR
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  An implementation of the traditional Unix macro processor.
 

From 03578ce8b64e6e052d7839063c32e51b96c13112 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 May 2012 11:13:18 +0200
Subject: [PATCH 1957/6849] crosstool-ng: fixup after copy_toolchain_lib_root
 api changes

Commit 0729b544b3 (Improve external toolchain logic to support IA32
Sourcery CodeBench toolchain) and e1f0804cc (external-toolchain: add
support for recent Linaro toolchains) changed the interface of
copy_toolchain_lib_root, but ctng wasn't updated so libraries weren't
copied to the target.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index a316cddcbb..eb9e9639f6 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -68,10 +68,10 @@ $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 	    echo "CTNG_SYSROOT='$${CTNG_SYSROOT}'";                         \
 	    echo "Copy external toolchain libraries to target...";          \
 	    for libs in $(CTNG_LIBS_LIB); do                                \
-	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},$$libs,/lib); \
+	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},,lib,$$libs,/lib); \
 	    done;                                                           \
 	    for libs in $(CTNG_LIBS_USR_LIB); do                            \
-	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},$$libs,/usr/lib); \
+	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},,lib,$$libs,/usr/lib); \
 	    done;
 	$(Q)touch $@
 

From d06238d9b92a24a41185888ab4d700eaca5a137b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 8 May 2012 13:01:21 +0000
Subject: [PATCH 1958/6849] package/crosstool-ng: bump version to 1.15.2,
 update config files

Update the version of crosstool-Ng used, bump to 1.15.2.
Also, update the bundled config files to match the new version.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rosstool-ng-001-wget-instead-of-curl.patch | 52 -------------
 package/crosstool-ng/crosstool-ng.mk          |  2 +-
 .../crosstool-ng.config-eglibc                | 70 +++++++++++------
 .../crosstool-ng.config-glibc                 | 75 ++++++++++++------
 .../crosstool-ng.config-uClibc                | 78 +++++++++++++------
 5 files changed, 153 insertions(+), 124 deletions(-)
 delete mode 100644 package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch

diff --git a/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch b/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch
deleted file mode 100644
index d40f178b8b..0000000000
--- a/package/crosstool-ng/crosstool-ng-001-wget-instead-of-curl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Use wget instead of curl
-
-While crosstool-NG did support either curl or wget in the past, it now
-only supports curl. Unfortunately, Buildroot uses wget for all its
-downloads, so wget is a hard dependency of Buildroot, while curl
-isn't.
-
-Instead of adding curl as a new Buildroot dependency, or building curl
-for the host, we simply tweak crosstool-NG to use wget instead of
-curl.
-
-The script/functions change has been provided by Yann E. Morin.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: crosstool-ng-1.13.0/configure
-===================================================================
---- crosstool-ng-1.13.0.orig/configure
-+++ crosstool-ng-1.13.0/configure
-@@ -496,7 +496,7 @@
-              ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)'   \
-              err="'libtoolize' 1.5.26 or above was not found"
- has_or_abort prog=stat
--has_or_abort prog="curl"
-+has_or_abort prog="wget"
- has_or_abort prog=patch
- has_or_abort prog=tar
- has_or_abort prog=gzip
-Index: crosstool-ng-1.13.0/scripts/functions
-===================================================================
---- crosstool-ng-1.13.0.orig/scripts/functions
-+++ crosstool-ng-1.13.0/scripts/functions
-@@ -456,13 +456,12 @@
-     # Some company networks have firewalls to connect to the internet, but it's
-     # not easy to detect them, so force a global ${CT_CONNECT_TIMEOUT}-second
-     # timeout.
--    # For curl, no good progress indicator is available. So, be silent.
--    if CT_DoExecLog ALL curl --ftp-pasv                                 \
--                             --retry 3                                  \
--                             --connect-timeout ${CT_CONNECT_TIMEOUT}    \
--                             --location --fail --silent                 \
--                             --output "${tmp}"                          \
--                             "${url}"
-+    if CT_DoExecLog ALL wget --passive-ftp --tries=3 -nc    \
-+                             -T ${CT_CONNECT_TIMEOUT}       \
-+                             -O "${tmp}"                    \
-+                              "${url}"
-+
-+
-     then
-         # Success, we got it, good!
-         mv "${tmp}" "${dest}"
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 217b2f51ea..3540f70a15 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.13.4
+CROSSTOOL_NG_VERSION           = 1.15.2
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index c1ab6793fa..cbad52a654 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.13.0 Configuration
-# Sat Oct 29 16:35:00 2011
+# crosstool-NG 1.15.0 Configuration
+# Mon May  7 18:54:54 2012
 #
-CT_CONFIGURE_has_xzutils=y
+CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
 CT_BACKEND=y
@@ -25,7 +25,7 @@ CT_MODULES=y
 CT_LOCAL_TARBALLS_DIR=""
 CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
+CT_PREFIX_DIR=""
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
 CT_REMOVE_DOCS=y
 # CT_INSTALL_DIR_RO is not set
@@ -90,10 +90,12 @@ CT_ARCH="arm"
 CT_ARCH_SUPPORTS_BOTH_MMU=y
 CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORT_ARCH=y
-CT_ARCH_SUPPORT_CPU=y
-CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_SUPPORTS_WITH_FLOAT=y
+CT_ARCH_SUPPORTS_WITH_FPU=y
+CT_ARCH_SUPPORTS_SOFTFP=y
 CT_ARCH_DEFAULT_HAS_MMU=y
 CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
@@ -101,8 +103,8 @@ CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
 CT_ARCH_FPU=""
-CT_ARCH_BE=y
-# CT_ARCH_LE is not set
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
 CT_ARCH_32=y
 CT_ARCH_BITNESS=32
 # CT_ARCH_FLOAT_HW is not set
@@ -116,10 +118,13 @@ CT_ARCH_arm_AVAILABLE=y
 # Generic target options
 #
 CT_ARCH_USE_MMU=y
+CT_ARCH_ENDIAN="little"
 
 #
 # Target optimisations
 #
+# CT_ARCH_FLOAT_SOFTFP is not set
+CT_ARCH_FLOAT="soft"
 
 #
 # arm other options
@@ -148,7 +153,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS="armeb-linux"
+CT_TARGET_ALIAS=""
 
 #
 # Toolchain type
@@ -163,29 +168,35 @@ CT_BUILD=""
 CT_BUILD_PREFIX=""
 CT_BUILD_SUFFIX=""
 
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+
 #
 # Operating System
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.0.4"
+CT_KERNEL_VERSION="3.3.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_0_4=y
-# CT_KERNEL_V_3_0_3 is not set
-# CT_KERNEL_V_3_0_2 is not set
-# CT_KERNEL_V_3_0_1 is not set
-# CT_KERNEL_V_3_0 is not set
+CT_KERNEL_V_3_3_4=y
+# CT_KERNEL_V_3_3_3 is not set
+# CT_KERNEL_V_3_3_2 is not set
+# CT_KERNEL_V_3_3_1 is not set
+# CT_KERNEL_V_3_3 is not set
+# CT_KERNEL_V_3_2_16 is not set
+# CT_KERNEL_V_3_1_10 is not set
+# CT_KERNEL_V_3_0_30 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_14 is not set
-# CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_19 is not set
-# CT_KERNEL_V_2_6_32_46 is not set
+# CT_KERNEL_V_2_6_33_20 is not set
+# CT_KERNEL_V_2_6_32_59 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_V_2_6_27_62 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
 
 #
@@ -218,6 +229,7 @@ CT_BINUTILS_VERSION="2.20.1a"
 CT_BINUTILS_2_20_or_later=y
 CT_BINUTILS_2_19_or_later=y
 CT_BINUTILS_2_18_or_later=y
+CT_BINUTILS_HAS_HASH_STYLE=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
 CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_FORCE_LD_BFD=y
@@ -232,6 +244,15 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
+# CT_CC_V_4_6_3 is not set
+# CT_CC_V_4_6_2 is not set
+# CT_CC_V_4_6_1 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_4_5_3 is not set
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+# CT_CC_V_4_4_7 is not set
 CT_CC_V_4_4_6=y
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -305,6 +326,9 @@ CT_LIBC="eglibc"
 CT_LIBC_VERSION="2_12"
 CT_LIBC_eglibc=y
 CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_EGLIBC_V_2_15 is not set
+# CT_LIBC_EGLIBC_V_2_14 is not set
+# CT_LIBC_EGLIBC_V_2_13 is not set
 CT_LIBC_EGLIBC_V_2_12=y
 # CT_LIBC_EGLIBC_V_2_11 is not set
 # CT_LIBC_EGLIBC_V_2_10 is not set
@@ -370,7 +394,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.39.4"
+CT_LIBC_GLIBC_MIN_KERNEL="3.3.4"
 
 #
 # Debug facilities
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 4a555c7acc..e57a91dfc6 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.13.0 Configuration
-# Sat Oct 29 16:14:07 2011
+# crosstool-NG 1.15.0 Configuration
+# Mon May  7 18:58:51 2012
 #
-CT_CONFIGURE_has_xzutils=y
+CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
 CT_BACKEND=y
@@ -25,7 +25,7 @@ CT_MODULES=y
 CT_LOCAL_TARBALLS_DIR=""
 CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
+CT_PREFIX_DIR=""
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
 CT_REMOVE_DOCS=y
 # CT_INSTALL_DIR_RO is not set
@@ -90,10 +90,12 @@ CT_ARCH="arm"
 CT_ARCH_SUPPORTS_BOTH_MMU=y
 CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORT_ARCH=y
-CT_ARCH_SUPPORT_CPU=y
-CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_SUPPORTS_WITH_FLOAT=y
+CT_ARCH_SUPPORTS_WITH_FPU=y
+CT_ARCH_SUPPORTS_SOFTFP=y
 CT_ARCH_DEFAULT_HAS_MMU=y
 CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
@@ -101,8 +103,8 @@ CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
 CT_ARCH_FPU=""
-CT_ARCH_BE=y
-# CT_ARCH_LE is not set
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
 CT_ARCH_32=y
 CT_ARCH_BITNESS=32
 # CT_ARCH_FLOAT_HW is not set
@@ -116,10 +118,13 @@ CT_ARCH_arm_AVAILABLE=y
 # Generic target options
 #
 CT_ARCH_USE_MMU=y
+CT_ARCH_ENDIAN="little"
 
 #
 # Target optimisations
 #
+# CT_ARCH_FLOAT_SOFTFP is not set
+CT_ARCH_FLOAT="soft"
 
 #
 # arm other options
@@ -148,7 +153,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS="armeb-linux"
+CT_TARGET_ALIAS=""
 
 #
 # Toolchain type
@@ -163,29 +168,35 @@ CT_BUILD=""
 CT_BUILD_PREFIX=""
 CT_BUILD_SUFFIX=""
 
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+
 #
 # Operating System
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.0.4"
+CT_KERNEL_VERSION="3.3.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_0_4=y
-# CT_KERNEL_V_3_0_3 is not set
-# CT_KERNEL_V_3_0_2 is not set
-# CT_KERNEL_V_3_0_1 is not set
-# CT_KERNEL_V_3_0 is not set
+CT_KERNEL_V_3_3_4=y
+# CT_KERNEL_V_3_3_3 is not set
+# CT_KERNEL_V_3_3_2 is not set
+# CT_KERNEL_V_3_3_1 is not set
+# CT_KERNEL_V_3_3 is not set
+# CT_KERNEL_V_3_2_16 is not set
+# CT_KERNEL_V_3_1_10 is not set
+# CT_KERNEL_V_3_0_30 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_14 is not set
-# CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_19 is not set
-# CT_KERNEL_V_2_6_32_46 is not set
+# CT_KERNEL_V_2_6_33_20 is not set
+# CT_KERNEL_V_2_6_32_59 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_V_2_6_27_62 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
 
 #
@@ -218,6 +229,7 @@ CT_BINUTILS_VERSION="2.20.1a"
 CT_BINUTILS_2_20_or_later=y
 CT_BINUTILS_2_19_or_later=y
 CT_BINUTILS_2_18_or_later=y
+CT_BINUTILS_HAS_HASH_STYLE=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
 CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_FORCE_LD_BFD=y
@@ -232,6 +244,15 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
+# CT_CC_V_4_6_3 is not set
+# CT_CC_V_4_6_2 is not set
+# CT_CC_V_4_6_1 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_4_5_3 is not set
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+# CT_CC_V_4_4_7 is not set
 CT_CC_V_4_4_6=y
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -306,6 +327,14 @@ CT_LIBC_VERSION="2.9"
 CT_LIBC_glibc=y
 CT_LIBC_glibc_AVAILABLE=y
 CT_LIBC_GLIBC_TARBALL=y
+# CT_LIBC_GLIBC_V_2_14_1 is not set
+# CT_LIBC_GLIBC_V_2_14 is not set
+# CT_LIBC_GLIBC_V_2_13 is not set
+# CT_LIBC_GLIBC_V_2_12_2 is not set
+# CT_LIBC_GLIBC_V_2_12_1 is not set
+# CT_LIBC_GLIBC_V_2_11_1 is not set
+# CT_LIBC_GLIBC_V_2_11 is not set
+# CT_LIBC_GLIBC_V_2_10_1 is not set
 CT_LIBC_GLIBC_V_2_9=y
 # CT_LIBC_GLIBC_V_2_8 is not set
 CT_LIBC_SUPPORT_THREADS_ANY=y
@@ -332,7 +361,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.39.4"
+CT_LIBC_GLIBC_MIN_KERNEL="3.3.4"
 
 #
 # glibc other options
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 0e442f0023..13b30d95fe 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.13.0 Configuration
-# Sat Oct 29 17:00:56 2011
+# crosstool-NG 1.15.0 Configuration
+# Mon May  7 18:49:59 2012
 #
-CT_CONFIGURE_has_xzutils=y
+CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
 CT_BACKEND=y
@@ -25,7 +25,7 @@ CT_MODULES=y
 CT_LOCAL_TARBALLS_DIR=""
 CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
+CT_PREFIX_DIR=""
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
 CT_REMOVE_DOCS=y
 # CT_INSTALL_DIR_RO is not set
@@ -90,10 +90,12 @@ CT_ARCH="arm"
 CT_ARCH_SUPPORTS_BOTH_MMU=y
 CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
 CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORT_ARCH=y
-CT_ARCH_SUPPORT_CPU=y
-CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_SUPPORTS_WITH_FLOAT=y
+CT_ARCH_SUPPORTS_WITH_FPU=y
+CT_ARCH_SUPPORTS_SOFTFP=y
 CT_ARCH_DEFAULT_HAS_MMU=y
 CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
@@ -101,8 +103,8 @@ CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
 CT_ARCH_FPU=""
-CT_ARCH_BE=y
-# CT_ARCH_LE is not set
+# CT_ARCH_BE is not set
+CT_ARCH_LE=y
 CT_ARCH_32=y
 CT_ARCH_BITNESS=32
 # CT_ARCH_FLOAT_HW is not set
@@ -116,10 +118,13 @@ CT_ARCH_arm_AVAILABLE=y
 # Generic target options
 #
 CT_ARCH_USE_MMU=y
+CT_ARCH_ENDIAN="little"
 
 #
 # Target optimisations
 #
+# CT_ARCH_FLOAT_SOFTFP is not set
+CT_ARCH_FLOAT="soft"
 
 #
 # arm other options
@@ -148,7 +153,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS="armeb-linux"
+CT_TARGET_ALIAS=""
 
 #
 # Toolchain type
@@ -163,29 +168,35 @@ CT_BUILD=""
 CT_BUILD_PREFIX=""
 CT_BUILD_SUFFIX=""
 
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+
 #
 # Operating System
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.0.4"
+CT_KERNEL_VERSION="3.3.4"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_0_4=y
-# CT_KERNEL_V_3_0_3 is not set
-# CT_KERNEL_V_3_0_2 is not set
-# CT_KERNEL_V_3_0_1 is not set
-# CT_KERNEL_V_3_0 is not set
+CT_KERNEL_V_3_3_4=y
+# CT_KERNEL_V_3_3_3 is not set
+# CT_KERNEL_V_3_3_2 is not set
+# CT_KERNEL_V_3_3_1 is not set
+# CT_KERNEL_V_3_3 is not set
+# CT_KERNEL_V_3_2_16 is not set
+# CT_KERNEL_V_3_1_10 is not set
+# CT_KERNEL_V_3_0_30 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_14 is not set
-# CT_KERNEL_V_2_6_34_10 is not set
-# CT_KERNEL_V_2_6_33_19 is not set
-# CT_KERNEL_V_2_6_32_46 is not set
+# CT_KERNEL_V_2_6_33_20 is not set
+# CT_KERNEL_V_2_6_32_59 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_V_2_6_27_62 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
 
 #
@@ -218,6 +229,7 @@ CT_BINUTILS_VERSION="2.20.1a"
 CT_BINUTILS_2_20_or_later=y
 CT_BINUTILS_2_19_or_later=y
 CT_BINUTILS_2_18_or_later=y
+CT_BINUTILS_HAS_HASH_STYLE=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
 CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_LINKER_LD=y
@@ -231,10 +243,19 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
+# CT_CC_V_4_6_3 is not set
+# CT_CC_V_4_6_2 is not set
+# CT_CC_V_4_6_1 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_4_5_3 is not set
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+# CT_CC_V_4_4_7 is not set
 CT_CC_V_4_4_6=y
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_4_3 is not set
+# CT_CC_V_4_4_3 is not set
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
@@ -304,11 +325,15 @@ CT_LIBC="uClibc"
 CT_LIBC_VERSION="0.9.32"
 CT_LIBC_uClibc=y
 CT_LIBC_uClibc_AVAILABLE=y
+# CT_LIBC_UCLIBC_V_0_9_33_1 is not set
+# CT_LIBC_UCLIBC_V_0_9_33 is not set
+# CT_LIBC_UCLIBC_V_0_9_32_1 is not set
 CT_LIBC_UCLIBC_V_0_9_32=y
-#CT_LIBC_UCLIBC_V_0_9_30_3 is not set
+# CT_LIBC_UCLIBC_V_0_9_30_3 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_2 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_1 is not set
 # CT_LIBC_UCLIBC_V_0_9_30 is not set
+CT_LIBC_UCLIBC_0_9_32_or_later=y
 CT_LIBC_UCLIBC_0_9_30_or_later=y
 CT_LIBC_UCLIBC_PARALLEL=y
 CT_LIBC_UCLIBC_VERBOSITY_0=y
@@ -318,9 +343,11 @@ CT_LIBC_UCLIBC_VERBOSITY=""
 CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
 # CT_LIBC_UCLIBC_DEBUG_LEVEL_1 is not set
 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
+# CT_LIBC_UCLIBC_DEBUG_LEVEL_3 is not set
 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
-CT_LIBC_UCLIBC_CONFIG_FILE="/home/ymorin/dev/buildroot/O/build/build-toolchain/libc.config"
+CT_LIBC_UCLIBC_CONFIG_FILE=""
 CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
 CT_LIBC_SUPPORT_LINUXTHREADS=y
 CT_LIBC_SUPPORT_THREADS_NONE=y
 CT_THREADS="linuxthreads"
@@ -328,6 +355,7 @@ CT_THREADS="linuxthreads"
 #
 # Common C library options
 #
+# CT_THREADS_NPTL is not set
 CT_THREADS_LINUXTHREADS=y
 # CT_THREADS_NONE is not set
 CT_LIBC_XLDD=y

From a79f0494a14e5a99edc3ff52ff04f796e5a56453 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 May 2012 11:17:07 +0200
Subject: [PATCH 1959/6849] crosstool-ng: use uClibc 0.9.33.1 / NPTL by default

So we're in sync with the internal toolchain.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/Config.in             |  8 +-------
 .../toolchain-crosstool-ng/crosstool-ng.config-uClibc  | 10 +++++-----
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk       |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 2d1e801c40..35ea2b1c81 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -99,11 +99,7 @@ config BR2_TOOLCHAIN_CTNG_CXX
 
 choice
 	prompt "Thread library implementation"
-	default BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD \
-		if BR2_TOOLCHAIN_CTNG_uClibc
-	default BR2_TOOLCHAIN_CTNG_THREADS_NPTL		\
-		if BR2_TOOLCHAIN_CTNG_eglibc ||		\
-		   BR2_TOOLCHAIN_CTNG_glibc
+	default BR2_TOOLCHAIN_CTNG_THREADS_NPTL
 	help
 	  Enable thread support and select thread implementation. With
 	  glibc, thread support is mandatory but several
@@ -129,8 +125,6 @@ choice
 	config BR2_TOOLCHAIN_CTNG_THREADS_NPTL
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on BR2_TOOLCHAIN_CTNG_eglibc || \
-			   BR2_TOOLCHAIN_CTNG_glibc
 endchoice
 
 endif # BR2_TOOLCHAIN_CTNG
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 13b30d95fe..c1150965a9 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -322,13 +322,13 @@ CT_CC_GCC_LDBL_128=m
 # C-library
 #
 CT_LIBC="uClibc"
-CT_LIBC_VERSION="0.9.32"
+CT_LIBC_VERSION="0.9.33.1"
 CT_LIBC_uClibc=y
 CT_LIBC_uClibc_AVAILABLE=y
-# CT_LIBC_UCLIBC_V_0_9_33_1 is not set
+# CT_LIBC_UCLIBC_V_0_9_33_1=y
 # CT_LIBC_UCLIBC_V_0_9_33 is not set
 # CT_LIBC_UCLIBC_V_0_9_32_1 is not set
-CT_LIBC_UCLIBC_V_0_9_32=y
+# CT_LIBC_UCLIBC_V_0_9_32 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_3 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_2 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_1 is not set
@@ -355,8 +355,8 @@ CT_THREADS="linuxthreads"
 #
 # Common C library options
 #
-# CT_THREADS_NPTL is not set
-CT_THREADS_LINUXTHREADS=y
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
 CT_LIBC_XLDD=y
 
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index eb9e9639f6..25d2a16968 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -10,7 +10,7 @@
 
 CTNG_DIR := $(BUILD_DIR)/build-toolchain
 
-CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/uClibc/uClibc-0.9.32.config
+CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/uClibc/uClibc-0.9.33.config
 CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 
 # Hack! ct-ng is in fact a Makefile script. As such, it accepts all

From 3bc3af3d9ccbd8c7031333038e377cafff9a8c5b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Mar 2012 10:32:02 +0000
Subject: [PATCH 1960/6849] openswan: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/openswan/Config.in   |  8 ++++++++
 package/openswan/openswan.mk | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 package/openswan/Config.in
 create mode 100644 package/openswan/openswan.mk

diff --git a/package/Config.in b/package/Config.in
index 34c0280d8b..fb1b08fc51 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -547,6 +547,7 @@ source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
 source "package/openntpd/Config.in"
 source "package/openssh/Config.in"
+source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
diff --git a/package/openswan/Config.in b/package/openswan/Config.in
new file mode 100644
index 0000000000..3336156207
--- /dev/null
+++ b/package/openswan/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_OPENSWAN
+	bool "openswan"
+	select BR2_PACKAGE_GMP
+	select BR2_PACKAGE_IPROUTE2
+	help
+	  Openswan is an implementation of IPsec for Linux
+
+	  http://www.openswan.org
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
new file mode 100644
index 0000000000..a25ca8f169
--- /dev/null
+++ b/package/openswan/openswan.mk
@@ -0,0 +1,35 @@
+#############################################################
+#
+# openswan
+#
+#############################################################
+
+OPENSWAN_VERSION = 2.6.38
+OPENSWAN_SITE = http://download.openswan.org/openswan
+OPENSWAN_DEPENDENCIES = host-bison gmp iproute2
+OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
+	USERCOMPILE="$(TARGET_CFLAGS)" INC_USRLOCAL=/usr \
+	USE_KLIPS=false USE_MAST=false USE_NM=false
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+	OPENSWAN_DEPENDENCIES += libcurl
+	OPENSWAN_MAKE_OPT += USE_LIBCURL=true
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	OPENSWAN_DEPENDENCIES += openssl
+	OPENSWAN_MAKE_OPT += HAVE_OPENSSL=true
+ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
+	OPENSWAN_MAKE_OPT += HAVE_OCF=true
+endif
+endif
+
+define OPENSWAN_BUILD_CMDS
+	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) programs
+endef
+
+define OPENSWAN_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS))

From 0afee253c9ac1774286a4ae3aed0ce81a9790d93 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 May 2012 01:36:33 +0000
Subject: [PATCH 1961/6849] qemu/microblazebe-mmu: update configuration

Beautify and lock down kernel version to avoid future issues.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_microblazebe_mmu_defconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 378e972903..156e264b00 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -1,14 +1,25 @@
+# Architecture
 BR2_microblaze=y
 BR2_microblazebe=y
+
+# Special toolchain
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
+
+# System
 BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
+
+# Filesystem
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
+
+# Kernel
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazebe-mmu/system.dts"

From b184e46dd3a302c4517c781d90da6405576edf6a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 May 2012 01:36:34 +0000
Subject: [PATCH 1962/6849] qemu/microblazeel-mmu: update configuration

Beautify and lock down kernel version to avoid future issues.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_microblazeel_mmu_defconfig | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 61420b4593..26897b7819 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -1,15 +1,25 @@
+# Architecture
 BR2_microblaze=y
 BR2_microblazeel=y
+
+# Toolchain
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="microblazeel-unknown-linux-gnu"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
+
+# System
 BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
+
+# Filesystem
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
+
+# Kernel
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazeel-mmu/system.dts"

From ec4342e825d90e660fc62df808a9186af43af88a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 May 2012 01:36:35 +0000
Subject: [PATCH 1963/6849] qemu/configs: update to use kernel 3.3.5

Update the qemu samples configs that used kernel 3.3.4 to 3.3.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig | 2 +-
 configs/qemu_arm_vexpress_defconfig  | 2 +-
 configs/qemu_mips_malta_defconfig    | 2 +-
 configs/qemu_mipsel_malta_defconfig  | 2 +-
 configs/qemu_ppc_g3beige_defconfig   | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig | 2 +-
 configs/qemu_sparc_ss10_defconfig    | 2 +-
 configs/qemu_x86_64_defconfig        | 2 +-
 configs/qemu_x86_defconfig           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index b54b5b62f0..dc5ca1132c 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 7388279abf..5f355b8420 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -17,6 +17,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 16ffe8f242..e36ac56bee 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 200b045fb6..8e21f1b8fa 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index e69a6dfcc4..6a673e99ff 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 996d6b21b6..a1aebf1d93 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 62aee753ae..cc7550646a 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index c20aaca9d7..93008eb159 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index f22fdea268..1aa44b38a9 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"

From 67202463b0720d679402c292cefba263da5d6df7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 May 2012 06:19:04 +0000
Subject: [PATCH 1964/6849] target/arch: x86/prescott doesn't define BR2_ARCH,
 fix it

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index a42bfd6b08..6eaa95195d 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -597,6 +597,7 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_pentium4
 	default "i686"		if BR2_x86_pentium_m
 	default "i686"		if BR2_x86_pentiumpro
+	default "i686"		if BR2_x86_prescott
 	default "i686"		if BR2_x86_nocona
 	default "i686"		if BR2_x86_core2
 	default "i686"		if BR2_x86_atom

From ed3fb173be263e52ef559212f2df465d08405a30 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 22 Apr 2012 20:55:54 +0000
Subject: [PATCH 1965/6849] wpa_supplicant: install basic configuration file

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.conf | 6 ++++++
 package/wpa_supplicant/wpa_supplicant.mk   | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100755 package/wpa_supplicant/wpa_supplicant.conf

diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf
new file mode 100755
index 0000000000..1994a6c739
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant.conf
@@ -0,0 +1,6 @@
+ctrl_interface=/var/run/wpa_supplicant
+ap_scan=1
+
+network={
+  key_mgmt=NONE
+}
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 0a672eee28..4a1baeaaaf 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -118,10 +118,18 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_DBUS
 endif
 
+define WPA_SUPPLICANT_INSTALL_CONFIG
+	$(INSTALL) -m 644 \
+	  package/wpa_supplicant/wpa_supplicant.conf  $(TARGET_DIR)/etc/wpa_supplicant.conf
+endef
+
+WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_CONFIG
+
 define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS))
 	rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
 	rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
+	rm -f $(TARGET_DIR)/usr/etc/wpa_supplicant.conf
 endef
 
 $(eval $(call AUTOTARGETS))

From b52a982c504f40e4cb5a21e0fb36a35ba06e3f67 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 20 Apr 2012 04:04:20 +0000
Subject: [PATCH 1966/6849] Fix installation for the lighttpd package

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...httpd-1.4.30-Fix-default-config-file.patch | 92 +++++++++++++++++++
 package/lighttpd/lighttpd.mk                  | 32 +++++++
 2 files changed, 124 insertions(+)
 create mode 100644 package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch

diff --git a/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch b/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch
new file mode 100644
index 0000000000..59ce907751
--- /dev/null
+++ b/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch
@@ -0,0 +1,92 @@
+Modify the default lighttpd configuration file to have one a starting conf
+
+  * Changed the log path to /var/log and logs filenames
+  * Disable IPv6
+  * Do not setuid to a user that doesn't exist on the system
+  * Disable pdf ranges fix for Adobe Reader since it uses regex and we
+    don't always have pcre support
+  * Change the network backend to writev since linux-sendfile fails on buildroot
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ doc/config/conf.d/access_log.conf |    2 +-
+ doc/config/lighttpd.conf          |   18 +++++++++---------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+Index: lighttpd-1.4.30/doc/config/lighttpd.conf
+===================================================================
+--- lighttpd-1.4.30.orig/doc/config/lighttpd.conf
++++ lighttpd-1.4.30/doc/config/lighttpd.conf
+@@ -13,7 +13,7 @@
+ ## if you add a variable here. Add the corresponding variable in the
+ ## chroot example aswell.
+ ##
+-var.log_root    = "/var/log/lighttpd"
++var.log_root    = "/var/log"
+ var.server_root = "/srv/www"
+ var.state_dir   = "/var/run"
+ var.home_dir    = "/var/lib/lighttpd"
+@@ -90,7 +90,7 @@
+ ##
+ ## Use IPv6?
+ ##
+-server.use-ipv6 = "enable"
++# server.use-ipv6 = "enable"
+ 
+ ##
+ ## bind to a specific IP
+@@ -101,8 +101,8 @@
+ ## Run as a different username/groupname.
+ ## This requires root permissions during startup. 
+ ##
+-server.username  = "lighttpd"
+-server.groupname = "lighttpd"
++# server.username  = "lighttpd"
++# server.groupname = "lighttpd"
+ 
+ ## 
+ ## enable core files.
+@@ -138,7 +138,7 @@
+ ##
+ ## Path to the error log file
+ ##
+-server.errorlog             = log_root + "/error.log"
++server.errorlog             = log_root + "/lighttpd-error.log"
+ 
+ ##
+ ## If you want to log to syslog you have to unset the 
+@@ -188,7 +188,7 @@
+ ## linux-sendfile - is recommended for small files.
+ ## writev         - is recommended for sending many large files
+ ##
+-server.network-backend = "linux-sendfile"
++server.network-backend = "writev"
+ 
+ ##
+ ## As lighttpd is a single-threaded server, its main resource limit is
+@@ -311,9 +311,9 @@
+ ## disable range requests for pdf files
+ ## workaround for a bug in the Acrobat Reader plugin.
+ ##
+-$HTTP["url"] =~ "\.pdf$" {
+-  server.range-requests = "disable"
+-}
++# $HTTP["url"] =~ "\.pdf$" {
++#  server.range-requests = "disable"
++# }
+ 
+ ##
+ ## url handling modules (rewrite, redirect)
+Index: lighttpd-1.4.30/doc/config/conf.d/access_log.conf
+===================================================================
+--- lighttpd-1.4.30.orig/doc/config/conf.d/access_log.conf
++++ lighttpd-1.4.30/doc/config/conf.d/access_log.conf
+@@ -9,7 +9,7 @@
+ ##
+ ## Default access log.
+ ##
+-accesslog.filename          = log_root + "/access.log"
++accesslog.filename          = log_root + "/lighttpd-access.log"
+ 
+ ##
+ ## The default format produces CLF compatible output.
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index b8aa310c96..8d1f212e17 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -56,6 +56,38 @@ else
 LIGHTTPD_CONF_OPT += --without-lua
 endif
 
+define LIGHTTPD_INSTALL_CONFIG
+	mkdir -p $(TARGET_DIR)/etc/lighttpd
+	mkdir -p $(TARGET_DIR)/etc/lighttpd/conf.d
+	mkdir -p $(TARGET_DIR)/srv/www/htdocs
+
+	[ -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] || \
+		$(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \
+			$(TARGET_DIR)/etc/lighttpd/lighttpd.conf
+
+	[ -f $(TARGET_DIR)/etc/lighttpd/modules.conf ] || \
+		$(INSTALL) -D -m 755 $(@D)/doc/config/modules.conf \
+			$(TARGET_DIR)/etc/lighttpd/modules.conf
+
+	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf ] || \
+		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/access_log.conf \
+			$(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf
+
+	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf ] || \
+		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/debug.conf \
+			$(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf
+
+	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf ] || \
+		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/dirlisting.conf \
+			$(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf
+
+	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf ] || \
+		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/mime.conf \
+			$(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf
+endef
+
+LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG
+
 define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/lighttpd
 	rm -f $(TARGET_DIR)/usr/sbin/lighttpd-angel

From 82822efe43711a4b0199837da81c73d7fcae2a46 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 May 2012 23:17:14 +0200
Subject: [PATCH 1967/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 74 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/CHANGES b/CHANGES
index c17e1419e6..1a2b6ed0f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,52 +10,60 @@
 	Apply-patches.sh: cleanups, archived patches handling fixes,
 	support series files.
 
-	Defconfigs: mx53qsb, use 3.2.x for atngw100, use 3.3.x for
-	qemu configs.
+	Defconfigs: beaglebone, mx53qsb, pandaboard, qemu configs for
+	arm-vexpress/microblaze/ppc-mpc88544ds, use 3.2.x for
+	atngw100, use 3.3.x for qemu configs.
 
-	Atom processor support. Microblaze architecture support (using
-	ext toolchain). Cleanup architecture names, deprecate Xtensa
-	support.
+	Menu structure: Libraries moved out of multimedia section
+
+	Atom processor support. Prescott fix, blackfin ABI fix,
+	Microblaze architecture support (using ext toolchain). Cleanup
+	architecture names, deprecate Xtensa support.
 
 	Toolchain: Add GCC 4.4.7, 4.6.3, 4.7.0. uClibc 0.9.33.1,
 	default to uClibc 0.9.33.x, enable
 	UCLIBC_SUPPORT_AI_ADDRCONFIG by default, static and 64bit
 	fixes for external toolchains, linaro ext toolchains, new
-	sourcery codebench ext toolchains, GDB 7.4.1.
+	sourcery codebench ext toolchains, GDB 7.4.1, crosstool-ng
+	1.15.2.
 
-	Bootloaders: U-Boot: add 2012.04.01. Barebox: add 2012.04,
-	remove 2011.12.
+	Bootloaders: U-Boot: add 2012.04.01, SPL and u-boot.img
+	support. Barebox: add 2012.04, remove 2011.12.
 
 	Updated/fixed packages: alsa-lib, alsa-utils, at, atk, avahi,
 	barebox, berkeleydb, bind, bluez_utils, boost, busybox,
-	can-utils, ccache, coreutils, cups, dbus, dhcp, directfb,
-	dnsmasq, doom-wad, dosfstools, e2fsprogs, expat, fakeroot,
-	feh, ffmpeg, file, fis, freetype, gamin, gawk, gdk-pixbuf,
-	giblib, glib-networking, gmp, gnutls, gpsd, grep, gstreamer,
-	gst-plugins-{bad,base,good,ugly}, haserl, hdparm, imagemagick,
-	iproute2, iptable, iw, kexec, kmod, lame, libarchive,
-	libatomic_ops, libconfig, libcurl, libdvdnav, libdvdread,
-	libedbus, libethumb, libffi, libfuse, libglib2, libgtk2,
-	libhid, libmbus, libmpeg2, libnl, libpng, libsigc, libsoup,
-	libupnp, liburcu, libusb, libusb-compat, libxml2,
-	libxml-parser-perl, libxslt, linux-firmware, linux-fusion,
-	lite, lsof, ltrace, lttng-libust, lua, makedevs, microperl,
-	mpd, mpfr, mpg123, mrouted, mtd, mysql_client, nbd, ncurses,
-	neon, netsnmp, network-manager, nfs-utils, ngrep, ntfs-3g,
+	can-utils, ccache, cifs-utils, coreutils, cups, dbus, dhcp,
+	directfb, dnsmasq, doom-wad, dosfstools, e2fsprogs, expat,
+	fakeroot, feh, ffmpeg, file, fis, freetype, gamin, gawk,
+	gdk-pixbuf, gettext, giblib, glib-networking, gmp, gnutls,
+	gpsd, grep, gstreamer, gst-plugins-{bad,base,good,ugly},
+	haserl, hdparm, imagemagick, iproute2, iptable, iw, kexec,
+	kmod, lame, libaio, libarchive, libatomic_ops, libconfig,
+	libcurl, libdvdnav, libdvdread, libedbus, libethumb, libffi,
+	libfuse, libglib2, libgtk2, libhid, libmad, libmbus, libmpeg2,
+	libnl, libplayer, libpng, libsigc, libsoup, libupnp, liburcu,
+	libusb, libusb-compat, libxml2, libxml-parser-perl, libxslt,
+	lighttpd, linux-firmware, linux-fusion, lite, lsof, ltrace,
+	lttng-libust, lua, m4, makedevs, microperl, mpd, mpfr, mpg123,
+	mrouted, mtd, mysql_client, nbd, ncftp, ncurses, neon,
+	netsnmp, network-manager, nfs-utils, ngrep, ntfs-3g, openntpd,
 	openssh, openssl, parted, pango, pcre, php, pixman, poco,
-	psmisc, pulseaudio, python, qt, quagga, radvd, rpm, ruby,
-	samba, sam-ba, sane-backends, sawman, screen, sdl_net,
-	smartmontools, sqlite, squashfs3, squid, sshfs, sudo,
+	psmisc, pulseaudio, python, qt, quagga, radvd, rpm, rsync,
+	ruby, samba, sam-ba, sane-backends, sawman, screen, sdl_net,
+	smartmontools, speex, sqlite, squashfs3, squid, sshfs, sudo,
 	syslinux, sysstat, taglib, tcpdump, tftp-hpa, transmission,
 	tiff, tinyhttpd, uboot-tools, udev, uemacs, unionfs, usbutils,
-	util-linux, vala, valgrind, vim, vsftpd, wipe,
-	xdriver_xf86-{input-vmmouse,video-fbdev}, xfsprogs, zlib
-
-	New packages: apr, audiofile, bellagio, fmtools,
-	glib-networking, heirloom-mailx, hiawatha, latencytop,
-	lcdproc, libcap-ng, libdmtx, libfcgi, libtpl, minicom, msmtp,
-	ndisc6, netatalk, parted, polarssl, protobuf, socketcand,
-	systemd, ushare, zeromq
+	util-linux, vala, valgrind, vim, vsftpd, wget, wipe,
+	wpa_supplicant, xdriver_xf86-{input-vmmouse,video-fbdev},
+	xfsprogs, zlib
+
+	New packages: apr, apr-util, audiofile, bellagio,
+	conntrack-tools, empty, fmtools, glib-networking,
+	heirloom-mailx, hiawatha, latencytop, lcdproc, libcap-ng,
+	libdmtx, libfcgi, libnetfilter_conntrack, libnfnetlink,
+	libtpl, localedef, minicom, msmtp, ndisc6, netatalk,
+	ocf-linux, openswan, parted, polarssl, protobuf, read-edid,
+	socketcand, stress, systemd, ushare, zeromq
 
 	Deprecated packages: ttcp
 

From babd953f5fdd682b6974904562758caf8c8848de Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 10 May 2012 15:59:46 +0200
Subject: [PATCH 1968/6849] linux: document and default to sensible value for
 BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 148b858120..7595a4a1bb 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -69,7 +69,11 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 	string "Custom Git version"
+	default "HEAD"
 	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+	help
+	  Git revision to use in the format used by git rev-parse,
+	  E.G. a sha id, a tag, branch, ..
 
 config BR2_LINUX_KERNEL_VERSION
 	string

From 9f7bf3b63d820616fe8ce2f3fa485c22542f2acb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 10 May 2012 19:07:20 +0200
Subject: [PATCH 1969/6849] Update for 2012.05-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1a2b6ed0f7..6b01c0439f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2012.05, Not released yet:
+2012.05-rc1, Released May 10th, 2012
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 1d7973e96e..96f94124a6 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.05-git
+export BR2_VERSION:=2012.05-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 2802609f1f..7b22569b8f 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,15 +13,15 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2012.02-rc3</b>, which can be
+
+The latest release candidate is <b>2012.05-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.02-rc3.tar.gz">buildroot-2012.02-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2012.05-rc1.tar.gz">buildroot-2012.05-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.02-rc3.tar.bz2">buildroot-2012.02-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05-rc1.tar.bz2">buildroot-2012.05-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index e6d1b47b93..8c4871fe31 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>10 May 2012 -- 2012.05-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc1">CHANGES</a>
+    file for details</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc1.tar.bz2">2012.05-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>20 April 2012 -- Autobuilder Results Online</b>
 
     <p>The status of the autobuilders, which do repeated

From 8bacfadf4438ee7dccfa42e71a7d9e18cf0efc6e Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 12 May 2012 05:52:44 +0000
Subject: [PATCH 1970/6849] crosstool-ng: depend on gperf

Fixes http://autobuild.buildroot.net/results/c9b87123709e1010bae19c6bdfd219661efdbdfb

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 3540f70a15..09c57ec2a6 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -3,6 +3,6 @@ CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
-HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake
+HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake host-gperf
 
 $(eval $(call AUTOTARGETS,host))

From b108e9b5dd8cfbf8d7f02e602993bdc174febc00 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 05:45:48 +0000
Subject: [PATCH 1971/6849] openssl: security bump to version 1.0.0j

Bump to version 1.0.0j to fix CVE-2012-2333

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 748252ce2b..62861c5ee5 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0i
+OPENSSL_VERSION = 1.0.0j
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From 89726baea94bc72fe624cd5ef85b07171db0a7ea Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 12 May 2012 23:44:18 +0000
Subject: [PATCH 1972/6849] heirloom-mailx: run makeconfig in configure step

The heirloom-mailx Makefile runs makeconfig if this has not been done
before.  In a parallel build, this means makeconfig may be run several
times in parallel because there are two targets that depend on makeconfig.
See for instance
http://autobuild.buildroot.net/results/d24854be69961f71db189f9d804d4bd2cfa078da

To avoid this, run makeconfig in the configure step, which is not parallel.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/heirloom-mailx/heirloom-mailx.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
index 2b28a3fc40..b1779c0bb1 100644
--- a/package/heirloom-mailx/heirloom-mailx.mk
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -12,6 +12,10 @@ ifeq ($(BR2_PACKAGE_OPENSSL),y)
 HEIRLOOM_MAILX_DEPENDENCIES += openssl
 endif
 
+define HEIRLOOM_MAILX_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SHELL) ./makeconfig)
+endef
+
 define HEIRLOOM_MAILX_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef

From b18b57f6349fa341ee2e4d82c9859bc646a05bf0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 May 2012 01:25:11 +0000
Subject: [PATCH 1973/6849] linux: bump default to kernel version 3.3.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 7595a4a1bb..dd3446543b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3.5"
+	bool "3.3.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.5" if BR2_LINUX_KERNEL_3_3
+	default "3.3.6" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f7f0d137c581ffed2c8d8424faf290812f7fac65 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 May 2012 01:25:12 +0000
Subject: [PATCH 1974/6849] kernel-headers: bump 3.{2, 3}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...-3.3.5-fix-umode_t.patch => linux-3.3.6-fix-umode_t.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.3.5-fix-umode_t.patch => linux-3.3.6-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 36370b42a1..d8602f1dd4 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -65,7 +65,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.31"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.16"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.5"		if BR2_KERNEL_HEADERS_3_3
+	default "3.2.17"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3.6"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch

From 73e844fe2944b1c0c2e9942a9b7771158e9b0dad Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 May 2012 01:25:13 +0000
Subject: [PATCH 1975/6849] qemu/sh4-r2d: update to use kernel 3.2.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 58ace03dfe..99db36a939 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.17"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 7053bb650b7c57de53dd288f31574c3c70410e8d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 May 2012 01:25:14 +0000
Subject: [PATCH 1976/6849] qemu/configs: update to use kernel 3.3.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig    | 2 +-
 configs/qemu_arm_vexpress_defconfig     | 2 +-
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips_malta_defconfig       | 2 +-
 configs/qemu_mipsel_malta_defconfig     | 2 +-
 configs/qemu_ppc_g3beige_defconfig      | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 2 +-
 configs/qemu_sparc_ss10_defconfig       | 2 +-
 configs/qemu_x86_64_defconfig           | 2 +-
 configs/qemu_x86_defconfig              | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index dc5ca1132c..f346974a59 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 5f355b8420..f103b59cc8 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -17,6 +17,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 156e264b00..8459633db5 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 26897b7819..c98d4e4ba5 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index e36ac56bee..9c2cfd3706 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 8e21f1b8fa..fb3161684c 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 6a673e99ff..87df9cae4b 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index a1aebf1d93..e506c53641 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index cc7550646a..1d99324e8b 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 93008eb159..66abacf115 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 1aa44b38a9..e2928e9f41 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"

From 4b55a9952014b37ce565b46ee6e93018555127fa Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 May 2012 02:29:58 +0000
Subject: [PATCH 1977/6849] libnl: bump to version 3.2.9 and enhance

Bump to version 3.2.9 and add an option to install the tools.
Since they're not usually required we default to N to reduce size.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/Config.in |  6 ++++++
 package/libnl/libnl.mk  | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/package/libnl/Config.in b/package/libnl/Config.in
index 24e481361c..c7d435983b 100644
--- a/package/libnl/Config.in
+++ b/package/libnl/Config.in
@@ -4,3 +4,9 @@ config BR2_PACKAGE_LIBNL
 	  A library for applications dealing with netlink socket.
 
 	  http://people.suug.ch/~tgr/libnl/
+
+config BR2_PACKAGE_LIBNL_TOOLS
+	bool "install tools"
+	depends on BR2_PACKAGE_LIBNL
+	help
+	  Install binary tools.
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 40aaf388ef..a723701665 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,15 +4,26 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.8
+LIBNL_VERSION = 3.2.9
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison
 LIBNL_MAKE = $(MAKE1)
+LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \
+	cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \
+	qdisc-list
 
 define LIBNL_UNINSTALL_TARGET_CMDS
 	rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.*
 	rm -rf $(TARGET_DIR)/usr/lib/libnl
 endef
 
+define LIBNL_REMOVE_TOOLS
+	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES))
+endef
+
+ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
+LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS
+endif
+
 $(eval $(call AUTOTARGETS))

From 3e8c13db2e139ed3e90ce719b689241bd25d54e8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 May 2012 02:29:59 +0000
Subject: [PATCH 1978/6849] hostapd: bump to version 1.0

Bump to version 1.0
Also convert to gentargets.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/Config.in                     |  6 ++-
 .../hostapd-0.7.3-ht40-secondary.patch        | 52 -------------------
 package/hostapd/hostapd-0.7.3-libnl3.patch    | 15 ------
 package/hostapd/hostapd.mk                    | 38 +++++++-------
 4 files changed, 23 insertions(+), 88 deletions(-)
 delete mode 100644 package/hostapd/hostapd-0.7.3-ht40-secondary.patch
 delete mode 100644 package/hostapd/hostapd-0.7.3-libnl3.patch

diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index 376a087b4f..4a474c37ed 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -10,14 +10,16 @@ config BR2_PACKAGE_HOSTAPD
 
 	  http://hostap.epitest.fi/
 
+if BR2_PACKAGE_HOSTAPD
+
 config BR2_PACKAGE_HOSTAPD_EAP
 	bool "Enable EAP"
-	depends on BR2_PACKAGE_HOSTAPD
 	help
 	  Enable support for EAP and RADIUS.
 
 config BR2_PACKAGE_HOSTAPD_WPS
 	bool "Enable WPS"
-	depends on BR2_PACKAGE_HOSTAPD
 	help
 	  Enable support for Wi-Fi Protected Setup.
+
+endif
diff --git a/package/hostapd/hostapd-0.7.3-ht40-secondary.patch b/package/hostapd/hostapd-0.7.3-ht40-secondary.patch
deleted file mode 100644
index 7664f03606..0000000000
--- a/package/hostapd/hostapd-0.7.3-ht40-secondary.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni.malinen@atheros.com>
-Date: Fri, 12 Nov 2010 18:31:56 +0200
-Subject: [PATCH] AP: Verify that HT40 secondary channel is supported
-
-Refuse to enable HT40 mode AP unless both the primary and secondary
-channels are enabled for AP use.
-(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304)
----
- src/ap/hw_features.c |   26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
-index 0159c72..7fc5b83 100644
---- a/src/ap/hw_features.c
-+++ b/src/ap/hw_features.c
-@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
- 			break;
- 		}
- 	}
-+	if (ok && iface->conf->secondary_channel) {
-+		int sec_ok = 0;
-+		int sec_chan = iface->conf->channel +
-+			iface->conf->secondary_channel * 4;
-+		for (j = 0; j < iface->current_mode->num_channels; j++) {
-+			struct hostapd_channel_data *chan =
-+				&iface->current_mode->channels[j];
-+			if (!(chan->flag & HOSTAPD_CHAN_DISABLED) &&
-+			    (chan->chan == sec_chan)) {
-+				sec_ok = 1;
-+				break;
-+			}
-+		}
-+		if (!sec_ok) {
-+			hostapd_logger(iface->bss[0], NULL,
-+				       HOSTAPD_MODULE_IEEE80211,
-+				       HOSTAPD_LEVEL_WARNING,
-+				       "Configured HT40 secondary channel "
-+				       "(%d) not found from the channel list "
-+				       "of current mode (%d) %s",
-+				       sec_chan, iface->current_mode->mode,
-+				       hostapd_hw_mode_txt(
-+					       iface->current_mode->mode));
-+			ok = 0;
-+		}
-+	}
- 	if (iface->conf->channel == 0) {
- 		/* TODO: could request a scan of neighboring BSSes and select
- 		 * the channel automatically */
--- 
-1.7.4-rc1
-
diff --git a/package/hostapd/hostapd-0.7.3-libnl3.patch b/package/hostapd/hostapd-0.7.3-libnl3.patch
deleted file mode 100644
index e47da73dd6..0000000000
--- a/package/hostapd/hostapd-0.7.3-libnl3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/drivers/drivers.mak	2011-11-29 19:09:23.889942913 +0100
-+++ b/src/drivers/drivers.mak	2011-11-29 19:09:40.637381428 +0100
-@@ -31,10 +31,10 @@
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
--DRV_LIBS += -lnl
-+DRV_LIBS += -lnl-3
- 
- ifdef CONFIG_LIBNL20
--DRV_LIBS += -lnl-genl
-+DRV_LIBS += -lnl-genl-3
- DRV_CFLAGS += -DCONFIG_LIBNL20
- endif
- endif
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 26ebf1de0b..d9ee4f0f51 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -4,11 +4,12 @@
 #
 #############################################################
 
-HOSTAPD_VERSION = 0.7.3
+HOSTAPD_VERSION = 1.0
 HOSTAPD_SITE = http://hostap.epitest.fi/releases
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
+HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
 HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
 
 # libnl needs -lm (for rint) if linking statically
@@ -17,8 +18,7 @@ HOSTAPD_LDFLAGS += -lm
 endif
 
 define HOSTAPD_LIBNL_CONFIG
-	echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG)
-	echo "CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG)
+	echo "CONFIG_LIBNL32=y" >>$(HOSTAPD_CONFIG)
 endef
 
 define HOSTAPD_CRYPTO_CONFIG
@@ -27,18 +27,24 @@ define HOSTAPD_CRYPTO_CONFIG
 	echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG)
 endef
 
-# Try to use openssl for TLS if it's already available
-# gnutls is also supported for TLS
+# Try to use openssl or gnutls if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	HOSTAPD_DEPENDENCIES += openssl
 define HOSTAPD_TLS_CONFIG
 	echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG)
 endef
 else
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+	HOSTAPD_DEPENDENCIES += gnutls
+define HOSTAPD_TLS_CONFIG
+	echo "CONFIG_TLS=gnutls" >>$(HOSTAPD_CONFIG)
+endef
+else
 define HOSTAPD_TLS_CONFIG
 	echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG)
 endef
 endif
+endif
 
 ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
 define HOSTAPD_EAP_CONFIG
@@ -76,14 +82,7 @@ endef
 endif
 
 define HOSTAPD_CONFIGURE_CMDS
-	cp $(@D)/$(HOSTAPD_SUBDIR)/defconfig $(HOSTAPD_CONFIG)
-	$(SED) "s/\/local//" $(@D)/$(HOSTAPD_SUBDIR)/Makefile
-	echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG)
-	echo "LDFLAGS += $(HOSTAPD_LDFLAGS)" >>$(HOSTAPD_CONFIG)
-	echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG)
-# Drivers
-	$(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG)
-	$(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG)
+	cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG)
 # Misc
 	$(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG)
 	$(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG)
@@ -96,6 +95,12 @@ define HOSTAPD_CONFIGURE_CMDS
 	$(HOSTAPD_LIBNL_CONFIG)
 endef
 
+define HOSTAPD_BUILD_CMDS
+	$(TARGET_MAKE_ENV) CFLAGS="$(HOSTAPD_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(HOSTAPD_SUBDIR)
+endef
+
 define HOSTAPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
 		$(TARGET_DIR)/usr/sbin/hostapd
@@ -103,9 +108,4 @@ define HOSTAPD_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/hostapd_cli
 endef
 
-define HOSTAPD_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/hostapd
-	rm -f $(TARGET_DIR)/usr/bin/hostapd
-endef
-
-$(eval $(call AUTOTARGETS))
+$(eval $(call GENTARGETS))

From 0340b45da0afdc3ac1de9ea7169ccee5941dfc3c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 May 2012 09:46:21 +0000
Subject: [PATCH 1979/6849] wpa_supplicant: bump to version 1.0

Bump to version 1.0
Also convert to gentargets.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/Config.in              |  9 +-
 ..._supplicant-0.7.3-dbus-emit-property.patch | 61 -------------
 .../wpa_supplicant-0.7.3-ht40-secondary.patch | 52 -----------
 .../wpa_supplicant-0.7.3-libnl-3.patch        | 15 ----
 ...pplicant-0.7.3-nl80211-cipher-suites.patch | 89 -------------------
 package/wpa_supplicant/wpa_supplicant.conf    |  0
 package/wpa_supplicant/wpa_supplicant.mk      | 68 +++++++-------
 7 files changed, 39 insertions(+), 255 deletions(-)
 delete mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch
 delete mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch
 delete mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
 delete mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch
 mode change 100755 => 100644 package/wpa_supplicant/wpa_supplicant.conf

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index 8ac2576f83..d7cefe3cb6 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -5,27 +5,25 @@ config BR2_PACKAGE_WPA_SUPPLICANT
 
 	  http://hostap.epitest.fi/wpa_supplicant/
 
+if BR2_PACKAGE_WPA_SUPPLICANT
+
 config BR2_PACKAGE_WPA_SUPPLICANT_EAP
 	bool "Enable EAP"
-	depends on BR2_PACKAGE_WPA_SUPPLICANT
 	help
 	  Enable support for EAP.
 
 config BR2_PACKAGE_WPA_SUPPLICANT_CLI
 	bool "Install wpa_cli binary"
-	depends on BR2_PACKAGE_WPA_SUPPLICANT
 	help
 	  Install wpa_cli command line utility
 
 config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE
 	bool "Install wpa_passphrase binary"
-	depends on BR2_PACKAGE_WPA_SUPPLICANT
 	help
 	  Install wpa_passphrase command line utility
 
 config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
 	bool "Enable support for soft AP"
-	depends on BR2_PACKAGE_WPA_SUPPLICANT
 	help
 	  With this option enabled, wpa_supplicant can act as
 	  access point. This can be used for open and WPA2-Personal networks
@@ -34,6 +32,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
 
 config BR2_PACKAGE_WPA_SUPPLICANT_WPS
 	bool "Enable support for WPS"
-	depends on BR2_PACKAGE_WPA_SUPPLICANT
 	help
 	  Enable support for Wi-Fi Protected Setup (WPS)
+
+endif
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch
deleted file mode 100644
index 4c50020036..0000000000
--- a/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 17 Dec 2010 15:56:01 +0200
-Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
-
-The supplicant was not emitting property changed events when the BSSs
-property changed.
-
-Signed-off-by: Dan Williams <dcbw@redhat.com>
-(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
----
- wpa_supplicant/dbus/dbus_new.c |    6 ++++++
- wpa_supplicant/dbus/dbus_new.h |    1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
-index bdfbbac..c66640a 100644
---- a/wpa_supplicant/dbus/dbus_new.c
-+++ b/wpa_supplicant/dbus/dbus_new.c
-@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- 			wpas_dbus_getter_current_network;
- 		prop = "CurrentNetwork";
- 		break;
-+	case WPAS_DBUS_PROP_BSSS:
-+		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
-+		prop = "BSSs";
-+		break;
- 	default:
- 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
- 			   __func__, property);
-@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- }
-@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- 
-diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
-index 80ea98c..9cdefcb 100644
---- a/wpa_supplicant/dbus/dbus_new.h
-+++ b/wpa_supplicant/dbus/dbus_new.h
-@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
- 	WPAS_DBUS_PROP_STATE,
- 	WPAS_DBUS_PROP_CURRENT_BSS,
- 	WPAS_DBUS_PROP_CURRENT_NETWORK,
-+	WPAS_DBUS_PROP_BSSS,
- };
- 
- enum wpas_dbus_bss_prop {
--- 
-1.7.4-rc1
-
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch
deleted file mode 100644
index 7664f03606..0000000000
--- a/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni.malinen@atheros.com>
-Date: Fri, 12 Nov 2010 18:31:56 +0200
-Subject: [PATCH] AP: Verify that HT40 secondary channel is supported
-
-Refuse to enable HT40 mode AP unless both the primary and secondary
-channels are enabled for AP use.
-(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304)
----
- src/ap/hw_features.c |   26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
-index 0159c72..7fc5b83 100644
---- a/src/ap/hw_features.c
-+++ b/src/ap/hw_features.c
-@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
- 			break;
- 		}
- 	}
-+	if (ok && iface->conf->secondary_channel) {
-+		int sec_ok = 0;
-+		int sec_chan = iface->conf->channel +
-+			iface->conf->secondary_channel * 4;
-+		for (j = 0; j < iface->current_mode->num_channels; j++) {
-+			struct hostapd_channel_data *chan =
-+				&iface->current_mode->channels[j];
-+			if (!(chan->flag & HOSTAPD_CHAN_DISABLED) &&
-+			    (chan->chan == sec_chan)) {
-+				sec_ok = 1;
-+				break;
-+			}
-+		}
-+		if (!sec_ok) {
-+			hostapd_logger(iface->bss[0], NULL,
-+				       HOSTAPD_MODULE_IEEE80211,
-+				       HOSTAPD_LEVEL_WARNING,
-+				       "Configured HT40 secondary channel "
-+				       "(%d) not found from the channel list "
-+				       "of current mode (%d) %s",
-+				       sec_chan, iface->current_mode->mode,
-+				       hostapd_hw_mode_txt(
-+					       iface->current_mode->mode));
-+			ok = 0;
-+		}
-+	}
- 	if (iface->conf->channel == 0) {
- 		/* TODO: could request a scan of neighboring BSSes and select
- 		 * the channel automatically */
--- 
-1.7.4-rc1
-
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
deleted file mode 100644
index a460c2aba0..0000000000
--- a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/drivers/drivers.mak	2011-11-29 19:19:56.684221050 +0100
-+++ b/src/drivers/drivers.mak	2011-11-29 19:20:12.199609246 +0100
-@@ -31,10 +31,10 @@
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
--DRV_LIBS += -lnl
-+DRV_LIBS += -lnl-3
- 
- ifdef CONFIG_LIBNL20
--DRV_LIBS += -lnl-genl
-+DRV_LIBS += -lnl-genl-3
- DRV_CFLAGS += -DCONFIG_LIBNL20
- endif
- endif
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch
deleted file mode 100644
index 231498e994..0000000000
--- a/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From d0f3f451f0002339ad75b43e79f1322f2e2e4ed1 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni.malinen@atheros.com>
-Date: Mon, 13 Dec 2010 21:08:53 +0200
-Subject: [PATCH] nl80211: Set cipher suites when using user space SME
-
-Previously, pairwise and group cipher suites were configured only
-when kernel SME (nl80211 connect API) was used. However, mac80211
-needs this information even in the user space SME case for one
-thing: to disable HT when TKIP/WEP is used. Add
-NL80211_ATTR_CIPHER_SUITES_PAIRWISE to fix this special case with
-user space SME. This allows mac80211 to disable HT properly when
-the AP is configured with configuration that is not allowed.
-(cherry picked from commit aca016054885c17d58c41888698761f2e1ce2b39)
----
- src/drivers/driver_nl80211.c |   44 ++++++++++++++++++++++++++++++++++++++++++
- wpa_supplicant/sme.c         |    2 +
- 2 files changed, 46 insertions(+), 0 deletions(-)
-
-diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
-index 364158c..fb75c2e 100644
---- a/src/drivers/driver_nl80211.c
-+++ b/src/drivers/driver_nl80211.c
-@@ -3940,6 +3940,50 @@ static int wpa_driver_nl80211_associate(
- 		NLA_PUT(msg, NL80211_ATTR_IE, params->wpa_ie_len,
- 			params->wpa_ie);
- 
-+	if (params->pairwise_suite != CIPHER_NONE) {
-+		int cipher;
-+
-+		switch (params->pairwise_suite) {
-+		case CIPHER_WEP40:
-+			cipher = WLAN_CIPHER_SUITE_WEP40;
-+			break;
-+		case CIPHER_WEP104:
-+			cipher = WLAN_CIPHER_SUITE_WEP104;
-+			break;
-+		case CIPHER_CCMP:
-+			cipher = WLAN_CIPHER_SUITE_CCMP;
-+			break;
-+		case CIPHER_TKIP:
-+		default:
-+			cipher = WLAN_CIPHER_SUITE_TKIP;
-+			break;
-+		}
-+		wpa_printf(MSG_DEBUG, "  * pairwise=0x%x\n", cipher);
-+		NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE, cipher);
-+	}
-+
-+	if (params->group_suite != CIPHER_NONE) {
-+		int cipher;
-+
-+		switch (params->group_suite) {
-+		case CIPHER_WEP40:
-+			cipher = WLAN_CIPHER_SUITE_WEP40;
-+			break;
-+		case CIPHER_WEP104:
-+			cipher = WLAN_CIPHER_SUITE_WEP104;
-+			break;
-+		case CIPHER_CCMP:
-+			cipher = WLAN_CIPHER_SUITE_CCMP;
-+			break;
-+		case CIPHER_TKIP:
-+		default:
-+			cipher = WLAN_CIPHER_SUITE_TKIP;
-+			break;
-+		}
-+		wpa_printf(MSG_DEBUG, "  * group=0x%x\n", cipher);
-+		NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, cipher);
-+	}
-+
- #ifdef CONFIG_IEEE80211W
- 	if (params->mgmt_frame_protection == MGMT_FRAME_PROTECTION_REQUIRED)
- 		NLA_PUT_U32(msg, NL80211_ATTR_USE_MFP, NL80211_MFP_REQUIRED);
-diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
-index 5604e97..878bbf0 100644
---- a/wpa_supplicant/sme.c
-+++ b/wpa_supplicant/sme.c
-@@ -333,6 +333,8 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
- 	params.wpa_ie = wpa_s->sme.assoc_req_ie_len ?
- 		wpa_s->sme.assoc_req_ie : NULL;
- 	params.wpa_ie_len = wpa_s->sme.assoc_req_ie_len;
-+	params.pairwise_suite = cipher_suite2driver(wpa_s->pairwise_cipher);
-+	params.group_suite = cipher_suite2driver(wpa_s->group_cipher);
- #ifdef CONFIG_IEEE80211R
- 	if (auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) {
- 		params.wpa_ie = wpa_s->sme.ft_ies;
--- 
-1.7.4-rc1
-
diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf
old mode 100755
new mode 100644
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 4a1baeaaaf..a4978e0059 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,18 +4,19 @@
 #
 #############################################################
 
-WPA_SUPPLICANT_VERSION = 0.7.3
+WPA_SUPPLICANT_VERSION = 1.0
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
 WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
 WPA_SUPPLICANT_SUBDIR = wpa_supplicant
-WPA_SUPPLICANT_TARGET_BINS = wpa_cli wpa_supplicant wpa_passphrase
 WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant
+WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
+WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS)
 
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += libnl
 define WPA_SUPPLICANT_LIBNL_CONFIG
 	$(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
-	echo "CONFIG_LIBNL20=y" >>$(WPA_SUPPLICANT_CONFIG)
+	echo "CONFIG_LIBNL32=y" >>$(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 
@@ -47,18 +48,24 @@ define WPA_SUPPLICANT_CRYPTO_CONFIG
 	echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(WPA_SUPPLICANT_CONFIG)
 endef
 
-# Try to use openssl for TLS if it's already available
-# gnutls is also supported for TLS
+# Try to use openssl or gnutls if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += openssl
 define WPA_SUPPLICANT_TLS_CONFIG
 	echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG)
 endef
 else
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+	WPA_SUPPLICANT_DEPENDENCIES += gnutls
+define WPA_SUPPLICANT_TLS_CONFIG
+	echo "CONFIG_TLS=gnutls" >>$(WPA_SUPPLICANT_CONFIG)
+endef
+else
 define WPA_SUPPLICANT_TLS_CONFIG
 	echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG)
 endef
 endif
+endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus
@@ -72,9 +79,6 @@ endif
 
 define WPA_SUPPLICANT_CONFIGURE_CMDS
 	cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
-	echo "CFLAGS += $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(WPA_SUPPLICANT_CONFIG)
-	echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
-	echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
 	$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)
 	$(SED) "s/^#CONFIG_DELAYED_MIC/CONFIG_DELAYED_MIC/" $(WPA_SUPPLICANT_CONFIG)
 	$(SED) "s/^CONFIG_DRIVER_ATMEL/#CONFIG_DRIVER_ATMEL/" $(WPA_SUPPLICANT_CONFIG)
@@ -89,22 +93,27 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS
 	$(WPA_SUPPLICANT_AP_CONFIG)
 endef
 
-define WPA_SUPPLICANT_REMOVE_CLI
-	rm -f $(TARGET_DIR)/usr/sbin/wpa_cli
+define WPA_SUPPLICANT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) CFLAGS="$(WPA_SUPPLICANT_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(WPA_SUPPLICANT_SUBDIR)
 endef
 
-ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y)
-WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_REMOVE_CLI
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y)
+define WPA_SUPPLICANT_INSTALL_CLI
+	$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_cli \
+		$(TARGET_DIR)/usr/sbin/wpa_cli
+endef
 endif
 
-define WPA_SUPPLICANT_REMOVE_PASSPHRASE
-	rm -f $(TARGET_DIR)/usr/sbin/wpa_passphrase
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y)
+define WPA_SUPPLICANT_INSTALL_PASSPHRASE
+	$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_passphrase \
+		$(TARGET_DIR)/usr/sbin/wpa_passphrase
 endef
-
-ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y)
-WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_REMOVE_PASSPHRASE
 endif
 
+ifeq ($(BR2_PACKAGE_DBUS),y)
 define WPA_SUPPLICANT_INSTALL_DBUS
 	$(INSTALL) -D \
 	  $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
@@ -113,23 +122,16 @@ define WPA_SUPPLICANT_INSTALL_DBUS
 	  $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \
 	  $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
 endef
-
-ifeq ($(BR2_PACKAGE_DBUS),y)
-WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_DBUS
 endif
 
-define WPA_SUPPLICANT_INSTALL_CONFIG
-	$(INSTALL) -m 644 \
-	  package/wpa_supplicant/wpa_supplicant.conf  $(TARGET_DIR)/etc/wpa_supplicant.conf
-endef
-
-WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_CONFIG
-
-define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS))
-	rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
-	rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
-	rm -f $(TARGET_DIR)/usr/etc/wpa_supplicant.conf
+define WPA_SUPPLICANT_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \
+		$(TARGET_DIR)/usr/sbin/wpa_supplicant
+	$(INSTALL) -m 644 -D package/wpa_supplicant/wpa_supplicant.conf \
+		$(TARGET_DIR)/etc/wpa_supplicant.conf
+	$(WPA_SUPPLICANT_INSTALL_CLI)
+	$(WPA_SUPPLICANT_INSTALL_PASSPHRASE)
+	$(WPA_SUPPLICANT_INSTALL_DBUS)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(call GENTARGETS))

From 7febf49c98b18f9057c48d7fa769181eff105ec2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 May 2012 22:13:43 +0200
Subject: [PATCH 1980/6849] docs/header.html: freshmeat got renamed to freecode

As pointed out by Gustavoz on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/header.html b/docs/header.html
index ce5d5558ff..aa16d540ef 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -67,7 +67,7 @@
     <br><a href="http://www.ucdot.org/">uCdot</a>
     <br><a href="http://www.linuxdevices.com/">LinuxDevices</a>
     <br><a href="http://slashdot.org/">Slashdot</a>
-    <br><a href="http://freshmeat.net/">Freshmeat</a>
+    <br><a href="http://freecode.com/">Freecode</a>
     <br><a href="http://linuxtoday.com/">Linux Today</a>
     <br><a href="http://lwn.net/">Linux Weekly News</a>
     <br><a href="http://www.tldp.org/HOWTO">Linux HOWTOs</a>

From 2b35574bc097ad8c364c9a09c3095d22b1392b7e Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 2 May 2012 01:40:02 +0000
Subject: [PATCH 1981/6849] libnfc: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libnfc/Config.in |  8 ++++++++
 package/libnfc/libnfc.mk | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/libnfc/Config.in
 create mode 100644 package/libnfc/libnfc.mk

diff --git a/package/Config.in b/package/Config.in
index fb1b08fc51..bbb2cd5bf1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -360,6 +360,7 @@ source "package/tslib/Config.in"
 source "package/libftdi/Config.in"
 source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
+source "package/libnfc/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in
new file mode 100644
index 0000000000..42418e0dab
--- /dev/null
+++ b/package/libnfc/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBNFC
+	bool "libnfc"
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	help
+	  Public platform independent Near Field Communication (NFC) library.
+
+	  http://www.libnfc.org/
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
new file mode 100644
index 0000000000..f1028b19e8
--- /dev/null
+++ b/package/libnfc/libnfc.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# libnfc
+#
+#############################################################
+LIBNFC_VERSION = 1.5.1
+LIBNFC_SITE = http://libnfc.googlecode.com/files/
+LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.gz
+LIBNFC_INSTALL_STAGING = YES
+
+LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat
+
+# N.B. The acr122 driver requires pcsc-lite.
+LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb
+
+$(eval $(call AUTOTARGETS))

From c81107265f48619cf91b3913188f81a01c82a9e8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 7 May 2012 00:05:53 +0000
Subject: [PATCH 1982/6849] mtd: bump to 1.5.0

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 8ccd4dd04c..3bcefa5c95 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
-MTD_VERSION = 1.4.9
+MTD_VERSION = 1.5.0
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

From f88b1e963ed843b04041ce6b2bb11d2da5666b9b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:29:30 +0000
Subject: [PATCH 1983/6849] liboping: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/liboping/Config.in   | 11 +++++++++++
 package/liboping/liboping.mk | 13 +++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/liboping/Config.in
 create mode 100644 package/liboping/liboping.mk

diff --git a/package/Config.in b/package/Config.in
index bbb2cd5bf1..c34e61a232 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -405,6 +405,7 @@ source "package/libmbus/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
+source "package/liboping/Config.in"
 source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
 source "package/librsync/Config.in"
diff --git a/package/liboping/Config.in b/package/liboping/Config.in
new file mode 100644
index 0000000000..04e0e0d9eb
--- /dev/null
+++ b/package/liboping/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBOPING
+	bool "liboping"
+	depends on BR2_INET_IPV6
+	help
+	  liboping is a C library to generate ICMP echo requests,
+	  better known as "ping packets".
+
+	  http://verplant.org/liboping/
+
+comment "liboping requires a toolchain with IPv6 support enabled"
+	depends on !BR2_INET_IPV6
diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
new file mode 100644
index 0000000000..e0d892b1cb
--- /dev/null
+++ b/package/liboping/liboping.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# liboping
+#
+#############################################################
+
+LIBOPING_VERSION = 1.6.2
+LIBOPING_SITE = http://verplant.org/liboping/files
+LIBOPING_INSTALL_STAGING = YES
+LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
+LIBOPING_CONF_OPT = --without-perl-bindings
+
+$(eval $(call AUTOTARGETS))

From ef9f0eae3287e5d6cdfc413ff8ffaa74e4ac76fc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:29:31 +0000
Subject: [PATCH 1984/6849] collectd: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |   1 +
 package/collectd/Config.in   | 382 +++++++++++++++++++++++++++++++++++
 package/collectd/collectd.mk | 127 ++++++++++++
 3 files changed, 510 insertions(+)
 create mode 100644 package/collectd/Config.in
 create mode 100644 package/collectd/collectd.mk

diff --git a/package/Config.in b/package/Config.in
index c34e61a232..f91a907c88 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -472,6 +472,7 @@ endmenu
 endmenu
 
 menu "Miscellaneous"
+source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/shared-mime-info/Config.in"
 endmenu
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
new file mode 100644
index 0000000000..cb96fbd845
--- /dev/null
+++ b/package/collectd/Config.in
@@ -0,0 +1,382 @@
+config BR2_PACKAGE_COLLECTD
+	bool "collectd"
+	help
+	  collectd is a daemon which collects system performance
+	  statistics periodically and provides mechanisms to store
+	  the values in a variety of ways, for example in RRD files.
+
+	  http://collectd.org/
+
+if BR2_PACKAGE_COLLECTD
+
+menu "match plugins"
+
+config BR2_PACKAGE_COLLECTD_EMPTY_COUNTER
+	bool "empty counter"
+	help
+	  Match counter values which are currently zero.
+
+config BR2_PACKAGE_COLLECTD_HASHED
+	bool "hashed"
+	help
+	  Match values using a hash function of the hostname.
+
+config BR2_PACKAGE_COLLECTD_REGEX
+	bool "regex"
+	help
+	  Match values by their identifier based on regular expressions.
+
+config BR2_PACKAGE_COLLECTD_TIMEDIFF
+	bool "timediff"
+	help
+	  Match values with an invalid timestamp.
+
+config BR2_PACKAGE_COLLECTD_VALUE
+	bool "value"
+	help
+	  Select values by their data sources' values.
+endmenu
+
+menu "misc plugins"
+
+config BR2_PACKAGE_COLLECTD_LOGFILE
+	bool "logfile"
+	default y
+	help
+	  Writes log messages to a file or STDOUT/STDERR.
+
+config BR2_PACKAGE_COLLECTD_SYSLOG
+	bool "syslog"
+	default y
+	help
+	  Logs to the standard UNIX logging mechanism.
+
+config BR2_PACKAGE_THRESHOLD
+	bool "threshold"
+	help
+	  Checks values against configured thresholds and creates notifications
+	  if values are out of bounds.
+
+endmenu
+
+menu "read plugins"
+
+comment "Select at least one for collectd to be useful"
+
+config BR2_PACKAGE_COLLECTD_APACHE
+	bool "apache"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Collects Apache's mod_status information.
+
+config BR2_PACKAGE_COLLECTD_APCUPS
+	bool "apcups"
+	help
+	  Collects UPS statistics from apcupsd.
+
+config BR2_PACKAGE_COLLECTD_BATTERY
+	bool "battery"
+	help
+	  Collects the battery's charge, the drawn current and voltage.
+
+config BR2_PACKAGE_COLLECTD_BIND
+	bool "bind"
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBXML2
+	help
+	  Collects BIND DNS statistics.
+
+config BR2_PACKAGE_COLLECTD_CONNTRACK
+	bool "conntrack"
+	help
+	  Collects the number of entries in Linux's connection tracking table.
+
+config BR2_PACKAGE_COLLECTD_CONTEXTSWITCH
+	bool "contextswitch"
+	help
+	  Collects the number of context switches done by the operating system.
+
+config BR2_PACKAGE_COLLECTD_CPU
+	bool "cpu"
+	help
+	  Collects the amount of time spent by the CPU in various states.
+
+config BR2_PACKAGE_COLLECTD_CPUFREQ
+	bool "cpufreq"
+	help
+	  Collects the current CPU's frequency.
+
+config BR2_PACKAGE_COLLECTD_CURL
+	bool "curl"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Uses libcurl to read files and then parses them according
+	  to the configuration.
+
+config BR2_PACKAGE_COLLECTD_CURL_JSON
+	bool "curl-json"
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_YAJL
+	help
+	  Queries JSON data using the cURL library and parses it
+	  according to the user's configuration using YAJL.
+
+config BR2_PACKAGE_COLLECTD_CURL_XML
+	bool "curl-xml"
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBXML2
+	help
+	  Reads files using libcurl and parses it as XML.
+
+config BR2_PACKAGE_COLLECTD_DF
+	bool "df"
+	help
+	  Collects file system usage information.
+
+config BR2_PACKAGE_COLLECTD_DISK
+	bool "disk"
+	help
+	  Collects performance statistics of hard-disks and partitions.
+
+config BR2_PACKAGE_COLLECTD_DNS
+	bool "dns"
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  Collects statistics of DNS traffic using libpcap.
+
+config BR2_PACKAGE_COLLECTD_ENTROPY
+	bool "entropy"
+	help
+	  Collects the available entropy on a system.
+
+config BR2_PACKAGE_COLLECTD_ETHSTAT
+	bool "ethstat"
+	help
+	  Collects network interface card statistics.
+
+config BR2_PACKAGE_COLLECTD_EXEC
+	bool "exec"
+	help
+	  Executes scripts and reads values back that are printed
+	  to STDOUT by that program.
+
+config BR2_PACKAGE_COLLECTD_FILECOUNT
+	bool "filecount"
+	help
+	  Counts the number of files in a directory and all its subdirectories.
+
+config BR2_PACKAGE_COLLECTD_FSCACHE
+	bool "fscache"
+	help
+	  Collects information about the file-system based caching
+	  infrastructure for network file-systems and other slow media.
+
+config BR2_PACKAGE_COLLECTD_INTERFACE
+	bool "interface"
+	help
+	  Collects information about the traffic of network interfaces.
+
+config BR2_PACKAGE_COLLECTD_IPTABLES
+	bool "iptables"
+	select BR2_PACKAGE_IPTABLES
+	help
+	  Gather statistics from iptables packet filter.
+
+config BR2_PACKAGE_COLLECTD_IRQ
+	bool "irq"
+	help
+	  Collects the number of interrupts.
+
+config BR2_PACKAGE_COLLECTD_LOAD
+	bool "load"
+	help
+	  Collects the system load.
+
+config BR2_PACKAGE_COLLECTD_MD
+	bool "md"
+	help
+	  Collects software-RAID device information.
+
+config BR2_PACKAGE_COLLECTD_MEMCACHED
+	bool "memcached"
+	help
+	  Collects statistics from a memcached daemon.
+
+config BR2_PACKAGE_COLLECTD_MEMORY
+	bool "memory"
+	help
+	  Collects physical memory utilization.
+
+config BR2_PACKAGE_COLLECTD_MYSQL
+	bool "mysql"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_MYSQL_CLIENT
+	help
+	  Connects to a MySQL database and issues a "show status" command.
+
+config BR2_PACKAGE_COLLECTD_NFS
+	bool "nfs"
+	help
+	  Collects information about the usage of the Network File System.
+
+config BR2_PACKAGE_COLLECTD_NTPD
+	bool "ntpd"
+	help
+	  Queries an NTP server and extracts parameters.
+
+config BR2_PACKAGE_COLLECTD_OLSRD
+	bool "olsrd"
+	help
+	  Reads information about meshed networks from olsrd.
+
+config BR2_PACKAGE_COLLECTD_OPENVPN
+	bool "openvpn"
+	help
+	  Reads the status file of OpenVPN to collect statistics.
+
+config BR2_PACKAGE_COLLECTD_PING
+	bool "ping"
+	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_LIBOPING
+	help
+	  Mesures network latency using ICMP "echo requests".
+
+config BR2_PACKAGE_COLLECTD_PROCESSES
+	bool "processes"
+	help
+	  Collects the number of processes gruped by state.
+
+config BR2_PACKAGE_COLLECTD_PROTOCOLS
+	bool "protocols"
+	help
+	  Collects information about the network protocols.
+
+config BR2_PACKAGE_COLLECTD_SERIAL
+	bool "serial"
+	help
+	  Collects the traffic on serial interfaces.
+
+config BR2_PACKAGE_COLLECTD_SNMP
+	bool "snmp"
+	select BR2_PACKAGE_NETSNMP
+	help
+	  Reads values from SNMP devices.
+
+config BR2_PACKAGE_COLLECTD_SWAP
+	bool "swap"
+	help
+	  Collects the amount of memory currently written to disk.
+
+config BR2_PACKAGE_COLLECTD_TABLE
+	bool "table"
+	help
+	  Parses table-like structured plain-text files.
+
+config BR2_PACKAGE_COLLECTD_TAIL
+	bool "tail"
+	help
+	  Tails log files and each line is given to one or more matches
+	  which test if the line is relevant for any statistics.
+
+config BR2_PACKAGE_COLLECTD_TCPCONNS
+	bool "tcpconns"
+	help
+	  Counts the number of TCP connections to/from a specified port.
+
+config BR2_PACKAGE_COLLECTD_THERMAL
+	bool "thermal"
+	help
+	  Reads ACPI thermal zone information.
+
+config BR2_PACKAGE_COLLECTD_UPTIME
+	bool "uptime"
+	help
+	  Keeps track of the system uptime.
+
+config BR2_PACKAGE_COLLECTD_USERS
+	bool "users"
+	help
+	  Counts the number of users currently logged in.
+
+config BR2_PACKAGE_COLLECTD_VMEM
+	bool "vmem"
+	help
+	  Collects information about the virtual memory subsystem.
+
+config BR2_PACKAGE_COLLECTD_WIRELESS
+	bool "wireless"
+	help
+	  Collects signal quality, power and noise ratio for WLAN cards.
+
+endmenu
+
+menu "target plugins"
+
+config BR2_PACKAGE_COLLECTD_NOTIFICATION
+	bool "notification"
+	help
+	  Create and dispatch a notification.
+
+config BR2_PACKAGE_COLLECTD_REPLACE
+	bool "replace"
+	help
+	  Replace parts of an identifier using regular expressions.
+
+config BR2_PACKAGE_COLLECTD_SCALE
+	bool "scale"
+	help
+	  Scale (multiply) values by an arbitrary number.
+
+config BR2_PACKAGE_COLLECTD_SET
+	bool "set"
+	help
+	  Set (overwrite) entire parts of an identifier.
+
+endmenu
+
+menu "write plugins"
+
+comment "Select at least one for collectd to be useful"
+
+config BR2_PACKAGE_COLLECTD_CSV
+	bool "csv"
+	help
+	  Writes values to a plain-text file in Comma Separated Values format.
+
+config BR2_PACKAGE_COLLECTD_GRAPHITE
+	bool "graphite"
+	help
+	  Writes data collected to Carbon (Graphite's) storage API.
+	  http://graphite.wikidot.com/start
+
+config BR2_PACKAGE_COLLECTD_NETWORK
+	bool "network"
+	depends on BR2_INET_IPV6
+	help
+	  Send/receive values from other instances of collectd.
+
+config BR2_PACKAGE_COLLECTD_RRDTOOL
+	bool "rrdtool"
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_LIBART
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_RRDTOOL
+	select BR2_PACKAGE_ZLIB
+	help
+	  Writes values to RRD-files.
+
+config BR2_PACKAGE_COLLECTD_UNIXSOCK
+	bool "unixsock"
+	help
+	  Opens a UNIX domain socket and accepts connections.
+	  One can send commands to the daemon and receive information.
+
+config BR2_PACKAGE_COLLECTD_WRITEHTTP
+	bool "writehttp"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Sends values collected to a web-server using HTTP POST and PUTVAL.
+
+endmenu
+
+endif
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
new file mode 100644
index 0000000000..0109f77b50
--- /dev/null
+++ b/package/collectd/collectd.mk
@@ -0,0 +1,127 @@
+#############################################################
+#
+# collectd
+#
+#############################################################
+
+COLLECTD_VERSION = 5.1.0
+COLLECTD_SITE = http://collectd.org/files
+COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
+COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
+
+# These require unmet dependencies, are fringe, pointless or deprecated
+COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
+		gmond hddtemp ipmi ipvs java libvirt lpar madwifi mbmon \
+		memcachec modbus multimeter netapp netlink nginx \
+		notify_desktop notify_email numa nut onewire oracle perl \
+		pinba postgresql powerdns python redis routeros rrdcached \
+		sensors tape target_v5upgrade teamspeak2 ted tokyotyrant \
+		uuid varnish vserver write_mongodb write_redis xmms zfs_arc
+
+COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
+	--localstatedir=/var --with-perl-bindings=no \
+	$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
+	$(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \
+	$(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \
+	$(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \
+	$(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \
+	$(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \
+	$(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \
+	$(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \
+	$(if $(BR2_PACKAGE_COLLECTD_CPUFREQ),--enable-cpufreq,--disable-cpufreq) \
+	$(if $(BR2_PACKAGE_COLLECTD_CSV),--enable-csv,--disable-csv) \
+	$(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \
+	$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \
+	$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),--enable-curl_xml,--disable-curl_xml) \
+	$(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \
+	$(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \
+	$(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \
+	$(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \
+	$(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \
+	$(if $(BR2_PACKAGE_COLLECTD_ETHSTAT),--enable-ethstat,--disable-ethstat) \
+	$(if $(BR2_PACKAGE_COLLECTD_EXEC),--enable-exec,--disable-exec) \
+	$(if $(BR2_PACKAGE_COLLECTD_FILECOUNT),--enable-filecount,--disable-filecount) \
+	$(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \
+	$(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \
+	$(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \
+	$(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \
+	$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \
+	$(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \
+	$(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \
+	$(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \
+	$(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \
+	$(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \
+	$(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \
+	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \
+	$(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \
+	$(if $(BR2_PACKAGE_COLLECTD_NFS),--enable-nfs,--disable-nfs) \
+	$(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \
+	$(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \
+	$(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \
+	$(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \
+	$(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \
+	$(if $(BR2_PACKAGE_COLLECTD_PROCESSES),--enable-processes,--disable-processes) \
+	$(if $(BR2_PACKAGE_COLLECTD_PROTOCOLS),--enable-protocols,--disable-protocols) \
+	$(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \
+	$(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \
+	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
+	$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
+	$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
+	$(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \
+	$(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \
+	$(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \
+	$(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \
+	$(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \
+	$(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \
+	$(if $(BR2_PACKAGE_COLLECTD_TCPCONNS),--enable-tcpconns,--disable-tcpconns) \
+	$(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \
+	$(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \
+	$(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \
+	$(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \
+	$(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \
+	$(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \
+	$(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \
+	$(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \
+	$(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \
+	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http)
+
+COLLECTD_DEPENDENCIES = host-pkg-config \
+	$(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \
+	$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
+	$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
+	$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
+	$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
+	$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
+	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql_client) \
+	$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
+	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
+	$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
+	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)
+
+# include/library fixups
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+	COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr
+endif
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
+	COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr
+endif
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+	COLLECTD_CONF_OPT += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
+endif
+ifeq ($(BR2_PACKAGE_YAJL),y)
+	COLLECTD_CONF_OPT += --with-yajl=$(STAGING_DIR)/usr
+endif
+
+# network can use libgcrypt
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+	COLLECTD_DEPENDENCIES += libgcrypt
+	COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr
+endif
+
+define COLLECTD_INSTALL_TARGET_CMDS
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	rm -f $(TARGET_DIR)/usr/bin/collectd-nagios
+	rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf
+endef
+
+$(eval $(call AUTOTARGETS))

From ef10335f6f678052e7751fd8e03903c9f713789a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 May 2012 21:50:57 +0000
Subject: [PATCH 1985/6849] gdb: not available on avr32

Fixes
http://autobuild.buildroot.org/results/1c6cfa7f069e2b7d8a7dacf76fbf95b7909fb37a/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index c9c54b88fd..fd6956b3a8 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_GDB
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_sh && !BR2_sh64
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32
 	help
 	    Build the full gdb debugger to run on the target.
 

From b3e10d197dbd643b0722c918ac5cd4adadfc3310 Mon Sep 17 00:00:00 2001
From: Dominik Faessler <faessler@was.ch>
Date: Mon, 14 May 2012 10:33:33 +0200
Subject: [PATCH 1986/6849] python-id3: new package

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/python-id3/Config.in     |  9 +++++++++
 package/python-id3/python-id3.mk | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/python-id3/Config.in
 create mode 100644 package/python-id3/python-id3.mk

diff --git a/package/Config.in b/package/Config.in
index f91a907c88..ff03178c92 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -255,6 +255,7 @@ source "package/python/Config.in"
 if BR2_PACKAGE_PYTHON
 menu "external python modules"
 source "package/python-dpkt/Config.in"
+source "package/python-id3/Config.in"
 source "package/python-mad/Config.in"
 source "package/python-netifaces/Config.in"
 source "package/python-pygame/Config.in"
diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in
new file mode 100644
index 0000000000..829a657321
--- /dev/null
+++ b/package/python-id3/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_ID3
+    bool "python-id3"
+    depends on BR2_PACKAGE_PYTHON
+    help
+      This module allows one to read and manipulate so-called ID3
+      informational tags on MP3 files through an object-oriented
+      Python interface.
+
+      http://id3-py.sourceforge.net/
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
new file mode 100644
index 0000000000..e1ed1b606e
--- /dev/null
+++ b/package/python-id3/python-id3.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# python-id3
+#
+#############################################################
+
+PYTHON_ID3_VERSION = 1.2
+PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
+PYTHON_ID3_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/id3-py
+
+PYTHON_ID3_DEPENDENCIES = python
+
+define PYTHON_ID3_BUILD_CMDS
+    (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_ID3_INSTALL_TARGET_CMDS
+    (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(call GENTARGETS))

From 29e62eeb1ed9fb2a9c1b771e01a3248acd56d69c Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:05 +0000
Subject: [PATCH 1987/6849] speex: remove redundant SPEEX_SOURCE definition

Also fix Makefile coding style

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/speex/speex.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index c9d9ed3ef0..2d8a255d24 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -3,9 +3,8 @@
 # speex
 #
 #############################################################
-SPEEX_VERSION=1.2rc1
-SPEEX_SOURCE=speex-$(SPEEX_VERSION).tar.gz
-SPEEX_SITE=http://downloads.us.xiph.org/releases/speex
+SPEEX_VERSION = 1.2rc1
+SPEEX_SITE = http://downloads.us.xiph.org/releases/speex
 SPEEX_INSTALL_STAGING = YES
 SPEEX_DEPENDENCIES = libogg
 SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \

From 4a3c6cfa01790e78edd229de67ee9161fc3aba5d Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:06 +0000
Subject: [PATCH 1988/6849] libogg: remove redundant LIBOGG_SOURCE definition

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libogg/libogg.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index c40f04eac4..c3d489746f 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -4,7 +4,6 @@
 #
 #############################################################
 LIBOGG_VERSION = 1.3.0
-LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 LIBOGG_INSTALL_STAGING = YES
 

From 3d407a01c9a31f3245ab9d79535d0ea83e6307a8 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:07 +0000
Subject: [PATCH 1989/6849] libogg: document project URL and update description
 in menuconfig

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libogg/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/libogg/Config.in b/package/libogg/Config.in
index effe74fb34..bf719ff4d7 100644
--- a/package/libogg/Config.in
+++ b/package/libogg/Config.in
@@ -1,5 +1,9 @@
 config BR2_PACKAGE_LIBOGG
 	bool "libogg"
 	help
-	  Ogg is the name of Xiph.org's container format for audio,
-	  video, and metadata
+	  Ogg is a multimedia container format, and the native file
+	  and stream format for the Xiph.org multimedia codecs. As
+	  with all Xiph.org technology is it an open format free for
+	  anyone to use.
+
+	  http://xiph.org/ogg/

From 4d1bbcb5b455d09fb08964c781788482187838c6 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:08 +0000
Subject: [PATCH 1990/6849] libosip2: document project URL in menuconfig

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libosip2/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libosip2/Config.in b/package/libosip2/Config.in
index 1b248a0c92..be5de2d36a 100644
--- a/package/libosip2/Config.in
+++ b/package/libosip2/Config.in
@@ -7,3 +7,5 @@ config BR2_PACKAGE_LIBOSIP2
 	  control SIP based sessions in their applications.
 	  SIP is a open standard replacement from IETF for H323.
 
+	  http://www.gnu.org/software/osip/
+

From 674d4db3e68578a567e2e0ddc99be371bc9ea5ba Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:09 +0000
Subject: [PATCH 1991/6849] libosip2: remove redundant LIBOSIP2_SOURCE
 definition

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libosip2/libosip2.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 1d53f76b4b..2cde27ff19 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -5,7 +5,6 @@
 #############################################################
 
 LIBOSIP2_VERSION = 3.6.0
-LIBOSIP2_SOURCE = libosip2-$(LIBOSIP2_VERSION).tar.gz
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
 LIBOSIP2_INSTALL_STAGING = YES
 

From eef36a8e865a2998e49d08e67883e5211c8d17cb Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:10 +0000
Subject: [PATCH 1992/6849] libeXosip2: fix comment and URL in menuconfig

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/Config.in | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/package/libeXosip2/Config.in b/package/libeXosip2/Config.in
index 8adca5a7d8..755d284618 100644
--- a/package/libeXosip2/Config.in
+++ b/package/libeXosip2/Config.in
@@ -2,10 +2,12 @@ config BR2_PACKAGE_LIBEXOSIP2
 	bool "libeXosip2"
 	select BR2_PACKAGE_LIBOSIP2
 	help
-	  GNU Higher level SIP (Session Initiation Protocol)
-	  This library aims to provide multimedia and telecom software
-	  developers an easy and powerful interface to initiate and
-	  control SIP based sessions in their applications.
-	  SIP is a open standard replacement from IETF for H323.
+	  eXosip is a library that hides the complexity of using the
+	  SIP protocol for mutlimedia session establishement.
+	  This protocol is mainly to be used by VoIP telephony
+	  applications (endpoints or conference server) but might be
+	  also usefull for any application that wish to establish
+	  sessions like multiplayer games. 
+	  eXosip is based in libosip.
 
-	  http://www.gnu.org/software/osip/
+	  http://savannah.nongnu.org/projects/exosip/

From d73f7784191984995314d7bb6c983089d31e1abe Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:11 +0000
Subject: [PATCH 1993/6849] libeXosip2: remove redundant LIBOSIP2_SOURCE
 definition

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/libeXosip2.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 4b778a98e6..24ca7cedee 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -5,7 +5,6 @@
 #############################################################
 
 LIBEXOSIP2_VERSION = 3.6.0
-LIBEXOSIP2_SOURCE = libeXosip2-$(LIBEXOSIP2_VERSION).tar.gz
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
 LIBEXOSIP2_INSTALL_STAGING = YES
 

From 5c884eb7bf6fd5ae1f1e5609b86897e7c2b70c92 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 7 May 2012 10:43:12 +0000
Subject: [PATCH 1994/6849] linphone: new package

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/linphone/Config.in   | 21 +++++++++++++++++++++
 package/linphone/linphone.mk | 12 ++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/linphone/Config.in
 create mode 100644 package/linphone/linphone.mk

diff --git a/package/Config.in b/package/Config.in
index ff03178c92..9a854f1c80 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -524,6 +524,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lighttpd/Config.in"
 endif
 source "package/links/Config.in"
+source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
 source "package/mii-diag/Config.in"
 source "package/mrouted/Config.in"
diff --git a/package/linphone/Config.in b/package/linphone/Config.in
new file mode 100644
index 0000000000..31c28d8b4b
--- /dev/null
+++ b/package/linphone/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_LINPHONE
+	bool "linphone"
+	select BR2_PACKAGE_LIBEXOSIP2
+	select BR2_PACKAGE_SPEEX
+	help
+	  Linphone is an internet phone or Voice Over IP phone (VoIP).
+
+	  With linphone you can communicate freely with people over
+	  the internet, with voice, video, and text instant messaging.
+	  Linphone makes use of the SIP protocol, an open standard
+	  for internet telephony. You can use Linphone with any SIP
+	  VoIP operator, including our free SIP audio/video service.
+	  linphone is free-software (or open-source), you can download
+	  and redistribute it freely.
+	  Linphone is available for desktop computers: Linux, Windows,
+	  MacOSX, and for mobile phones: Android, iPhone, Blackberry.
+
+	  Linphone support in Buildroot is limited to the commandline
+	  client, linphonec, and video support is not enabled.
+
+	  http://www.linphone.org/
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
new file mode 100644
index 0000000000..6ba6b53334
--- /dev/null
+++ b/package/linphone/linphone.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# linphone
+#
+#############################################################
+
+LINPHONE_VERSION = 3.5.2
+LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
+LINPHONE_CONF_OPT = --disable-video --disable-gtk_ui
+LINPHONE_DEPENDENCIES = libeXosip2 speex
+
+$(eval $(call AUTOTARGETS))

From be26c3e760d86dbcc45ce6edd9e266a623c0430d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 May 2012 10:55:28 +0000
Subject: [PATCH 1995/6849] libtorrent: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libtorrent/Config.in                  | 11 ++++++++
 .../libtorrent/libtorrent-cross_compile.patch | 27 +++++++++++++++++++
 package/libtorrent/libtorrent.mk              | 16 +++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 package/libtorrent/Config.in
 create mode 100644 package/libtorrent/libtorrent-cross_compile.patch
 create mode 100644 package/libtorrent/libtorrent.mk

diff --git a/package/Config.in b/package/Config.in
index 9a854f1c80..c3dc715f8d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -411,6 +411,7 @@ source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
 source "package/librsync/Config.in"
 source "package/libsoup/Config.in"
+source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
 source "package/zeromq/Config.in"
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in
new file mode 100644
index 0000000000..f0315a4f37
--- /dev/null
+++ b/package/libtorrent/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBTORRENT
+	bool "libtorrent"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBSIGC
+	help
+	  BitTorrent library written in C++ for *nix
+
+	  http://libtorrent.rakshasa.no/
+
+comment "libtorrent requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libtorrent/libtorrent-cross_compile.patch b/package/libtorrent/libtorrent-cross_compile.patch
new file mode 100644
index 0000000000..39fe700dc1
--- /dev/null
+++ b/package/libtorrent/libtorrent-cross_compile.patch
@@ -0,0 +1,27 @@
+Fix cross compilation, based on OpenWRT patch.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libtorrent-0.13.2/configure.ac libtorrent-0.13.2-cross/configure.ac
+--- libtorrent-0.13.2/configure.ac	2012-04-20 03:55:10.000000000 -0300
++++ libtorrent-0.13.2-cross/configure.ac	2012-05-09 10:57:49.671175421 -0300
+@@ -17,7 +17,6 @@
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ AC_DISABLE_STATIC
+ 
+ AM_DISABLE_STATIC
+diff -Nura libtorrent-0.13.2/scripts/checks.m4 libtorrent-0.13.2-cross/scripts/checks.m4
+--- libtorrent-0.13.2/scripts/checks.m4	2012-04-12 06:44:23.000000000 -0300
++++ libtorrent-0.13.2-cross/scripts/checks.m4	2012-05-09 10:42:32.642728917 -0300
+@@ -96,7 +96,7 @@
+ AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
+   AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
+ 
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++  AC_LINK_IFELSE([AC_LANG_SOURCE([
+       #include <fcntl.h>
+       #include <stdlib.h>
+       #include <unistd.h>
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
new file mode 100644
index 0000000000..100e684653
--- /dev/null
+++ b/package/libtorrent/libtorrent.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# libtorrent
+#
+#############################################################
+
+LIBTORRENT_VERSION = 0.13.2
+LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
+LIBTORRENT_DEPENDENCIES = host-pkg-config libsigc \
+	$(if $(BR2_PACKAGE_OPENSSL),openssl)
+LIBTORRENT_CONF_OPT = --enable-aligned \
+	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
+LIBTORRENT_INSTALL_STAGING = YES
+LIBTORRENT_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS))

From 54366d812d860aa7de776f14b00d52f89bb52371 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 May 2012 10:55:29 +0000
Subject: [PATCH 1996/6849] rtorrent: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/rtorrent/Config.in                    | 16 +++++++++++
 package/rtorrent/rtorrent-cross_compile.patch | 27 +++++++++++++++++++
 package/rtorrent/rtorrent.mk                  | 12 +++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 package/rtorrent/Config.in
 create mode 100644 package/rtorrent/rtorrent-cross_compile.patch
 create mode 100644 package/rtorrent/rtorrent.mk

diff --git a/package/Config.in b/package/Config.in
index c3dc715f8d..8cb3b22cb1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -564,6 +564,7 @@ source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
 source "package/rsh-redone/Config.in"
 source "package/rsync/Config.in"
+source "package/rtorrent/Config.in"
 source "package/samba/Config.in"
 source "package/ser2net/Config.in"
 source "package/socat/Config.in"
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
new file mode 100644
index 0000000000..142ff8b41a
--- /dev/null
+++ b/package/rtorrent/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_RTORRENT
+	bool "rtorrent"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBSIGC
+	select BR2_PACKAGE_LIBTORRENT
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_OPENSSL
+	help
+	  BitTorrent Client using libtorrent
+
+	  http://libtorrent.rakshasa.no/
+
+comment "rtorrent requires a toolchain with C++ and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/rtorrent/rtorrent-cross_compile.patch b/package/rtorrent/rtorrent-cross_compile.patch
new file mode 100644
index 0000000000..2be8d06076
--- /dev/null
+++ b/package/rtorrent/rtorrent-cross_compile.patch
@@ -0,0 +1,27 @@
+Fix cross compilation, based on OpenWRT patch.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura rtorrent-0.9.2/configure.ac rtorrent-0.9.2-cross/configure.ac
+--- rtorrent-0.9.2/configure.ac	2012-04-20 03:55:30.000000000 -0300
++++ rtorrent-0.9.2-cross/configure.ac	2012-05-09 11:06:49.436474039 -0300
+@@ -4,7 +4,6 @@
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+diff -Nura rtorrent-0.9.2/scripts/common.m4 rtorrent-0.9.2-cross/scripts/common.m4
+--- rtorrent-0.9.2/scripts/common.m4	2012-03-13 09:10:49.000000000 -0300
++++ rtorrent-0.9.2-cross/scripts/common.m4	2012-05-09 11:05:56.620102678 -0300
+@@ -223,7 +223,7 @@
+ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+   AC_MSG_CHECKING(for execinfo.h)
+ 
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++  AC_LINK_IFELSE([AC_LANG_SOURCE([
+       #include <execinfo.h>
+       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
+       ])],
diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
new file mode 100644
index 0000000000..f60bd40722
--- /dev/null
+++ b/package/rtorrent/rtorrent.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# rtorrent
+#
+#############################################################
+
+RTORRENT_VERSION = 0.9.2
+RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
+RTORRENT_DEPENDENCIES = host-pkg-config libcurl libsigc libtorrent ncurses
+RTORRENT_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS))

From 0b6f3f2645a50a115c974cdc6dd0e2d8b96837b2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 May 2012 09:42:44 +0200
Subject: [PATCH 1997/6849] ndisc6: fix build when libintl is enabled

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ndisc6/ndisc6.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index 8451e06a4f..7cf4b8aeb8 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -10,6 +10,11 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
 NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
 
+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+NDISC6_DEPENDENCIES += libintl
+NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+endif
+
 NDISC6_BIN_ += dnssort # perl script
 NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name
 NDISC6_BIN_$(BR2_PACKAGE_NDISC6_TCPSPRAY) += tcpspray tcpspray6

From 362256a31e72691cf46e8b83c549d7a3ab2329fb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 May 2012 11:46:39 +0200
Subject: [PATCH 1998/6849] uClibc: bump 0.9.33.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |  2 +-
 ...mmap64-include-stdint.h-for-uint64_t.patch | 28 -------------------
 .../uClibc/uClibc-0.9.33.1-version.patch      | 23 ---------------
 ...bc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch} |  0
 ...-dup3.patch => uClibc-0.9.33.2-dup3.patch} |  0
 5 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.33.1-version.patch
 rename toolchain/uClibc/{uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch => uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch} (100%)
 rename toolchain/uClibc/{uClibc-0.9.33.1-dup3.patch => uClibc-0.9.33.2-dup3.patch} (100%)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 160ead417b..d8b8a2a0cf 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING
 	string
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
-	default 0.9.33.1	if BR2_UCLIBC_VERSION_0_9_33
+	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
diff --git a/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch b/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch
deleted file mode 100644
index 8b08a2cd8f..0000000000
--- a/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 47009e1e1c6b721c38b5ffa2eeb9202fb8db298a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 11 Apr 2012 16:01:29 -0400
-Subject: [PATCH 1/2] mmap64: include stdint.h for uint64_t
-
-Some targets include this implicitly, but pull it in explicitly for those
-which don't to fix building for them.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libc/sysdeps/linux/common/mmap64.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
-index 3c97c84..cebf961 100644
---- a/libc/sysdeps/linux/common/mmap64.c
-+++ b/libc/sysdeps/linux/common/mmap64.c
-@@ -10,6 +10,7 @@
- #ifdef __UCLIBC_HAS_LFS__
- 
- #include <errno.h>
-+#include <stdint.h>
- #include <unistd.h>
- #include <sys/mman.h>
- #include <sys/syscall.h>
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.33.1-version.patch b/toolchain/uClibc/uClibc-0.9.33.1-version.patch
deleted file mode 100644
index 37f8565ff4..0000000000
--- a/toolchain/uClibc/uClibc-0.9.33.1-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-[PATCH] fix version number
-
-Somehow the 0.9.33.1 tarball thinks it is 0.9.33.2-git, as pointed out
-by Mike Frysinger.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Rules.mak |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: uClibc-0.9.33.1/Rules.mak
-===================================================================
---- uClibc-0.9.33.1.orig/Rules.mak
-+++ uClibc-0.9.33.1/Rules.mak
-@@ -105,7 +105,7 @@
- MAJOR_VERSION := 0
- MINOR_VERSION := 9
- SUBLEVEL      := 33
--EXTRAVERSION  :=.2-git
-+EXTRAVERSION  :=.1
- VERSION       := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
- ABI_VERSION   := $(MAJOR_VERSION)
- ifneq ($(EXTRAVERSION),)
diff --git a/toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch b/toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch
rename to toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.1-dup3.patch
rename to toolchain/uClibc/uClibc-0.9.33.2-dup3.patch

From 1abaa98d9242799605fc8d91e238fc1e929b6414 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 May 2012 21:56:14 +0200
Subject: [PATCH 1999/6849] Revert "directfb: add support for davinci gfx
 driver"

This reverts commit df39ffe7f437f62d7c0eb6d73bdb86b2d09a8c8a.

It's broken and Arnout no longer has the hardware to fix/test.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in   | 4 ----
 package/directfb/directfb.mk | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 26f5091a23..47f9feaaf4 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -53,10 +53,6 @@ config BR2_PACKAGE_DIRECTFB_EP9X
 	bool "compile ep9x graphics driver"
 	depends on BR2_arm
 
-config BR2_PACKAGE_DIRECTFB_DAVINCI
-	bool "compile TI DaVinci graphics driver"
-	depends on BR2_arm
-
 config BR2_PACKAGE_DIRECTFB_UNICHROME
 	bool "compile unichrome graphics driver"
 	default y
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 7aa03987a2..071cdf4fcf 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -58,8 +58,7 @@ DIRECTFB_GFX := \
 	$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
 	$(if $(BR2_PACKAGE_DIRECTFB_UNICHROME),unichrome) \
 	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830)	\
-	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x) \
-	$(if $(BR2_PACKAGE_DIRECTFB_DAVINCI),davinci)
+	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
 DIRECTFB_GFX:=none

From d8e1ecb8557eb223f12d7d0c989fd799723211aa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 May 2012 22:44:17 +0200
Subject: [PATCH 2000/6849] ext-tool.mk: fix SUPPORT_LIB_DIR calculation for
 toolchains without libstdc++

SUPPORT_LIB_DIR would get resolved to the main buildroot directory for
external toolchains without C++ support, as:

 - gcc -print-file-name=<nonexisting-file> returns <nonexisting-file>
 - readlink -f <nonexisting-file> returns $PWD/<nonexisting-file>

So fix it by ensuring output of gcc -print-file-name actually exists
before using it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b163aeed7a..3f58aad3e5 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -384,11 +384,12 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
 	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
 	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
-		LIBSTDCPP_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a)` ; \
-		SUPPORT_LIB_DIR=`echo $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
-	else \
-		SUPPORT_LIB_DIR="" ; \
+		LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
+		if [ -e "$${LIBSTDCPP_A_LOCATION}" ]; then \
+			SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
+		fi ; \
 	fi ; \
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \

From 9950d485cd8c16dc84d2e9eca5f4f586c1b717c5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 May 2012 22:57:32 +0200
Subject: [PATCH 2001/6849] dnsmasq: host-pkg-config is needed for lua support
 as well

Fixes http://autobuild.buildroot.org/results/94d67f02c81639e1586d1c21a7e3b183a6ab50a2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 2e3575ccb6..4aa7cfbd65 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -42,11 +42,9 @@ endef
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
-	DNSMASQ_DEPENDENCIES += lua
+	DNSMASQ_DEPENDENCIES += lua host-pkg-config
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl"
-endif
 
-ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
 define DNSMASQ_ENABLE_LUA
 	$(SED) 's/lua5.1/lua/g' $(DNSMASQ_DIR)/Makefile
 	$(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \

From 707d44d0a28906ebda49584dd5f55985406f0bde Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 15 May 2012 08:18:25 +0000
Subject: [PATCH 2002/6849] linux: install dtc (device tree compiler) as host
 tool if selected

Having dtc as a host tool can be useful for users that have a custom
boot scenario where the device tree is not embedded in the kernel.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index 34f86236c5..f165dda50c 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -183,6 +183,15 @@ define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
 endef
 endif
 
+
+define LINUX_INSTALL_HOST_TOOLS
+	# Installing dtc (device tree compiler) as host tool, if selected
+	if grep -q "CONFIG_DTC=y" $(@D)/.config; then 	\
+		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ;	\
+	fi
+endef
+
+
 define LINUX_INSTALL_IMAGES_CMDS
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 endef
@@ -197,6 +206,7 @@ define LINUX_INSTALL_TARGET_CMDS
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
 	fi
+	$(LINUX_INSTALL_HOST_TOOLS)
 endef
 
 include linux/linux-ext-*.mk

From ca32d33ff5c15fd71946bf5dd3c71044f9424377 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 15 May 2012 18:38:02 +0000
Subject: [PATCH 2003/6849] mxml: bump version to 2.7

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ... mxml-fix-cross-target-installation.patch} | 24 ++++++++++---------
 package/mxml/mxml.mk                          |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)
 rename package/mxml/{mxml-2.6-fix-cross-target-installation.patch => mxml-fix-cross-target-installation.patch} (68%)

diff --git a/package/mxml/mxml-2.6-fix-cross-target-installation.patch b/package/mxml/mxml-fix-cross-target-installation.patch
similarity index 68%
rename from package/mxml/mxml-2.6-fix-cross-target-installation.patch
rename to package/mxml/mxml-fix-cross-target-installation.patch
index 62b6bbc8d9..3a9fa0c0cf 100644
--- a/package/mxml/mxml-2.6-fix-cross-target-installation.patch
+++ b/package/mxml/mxml-fix-cross-target-installation.patch
@@ -10,10 +10,10 @@ The added patch is a workaround for cross build as follows:
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 ---
-diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
---- mxml-2.6-dist//Makefile.in	2008-12-06 06:20:38.000000000 +0200
-+++ mxml-2.6/Makefile.in	2011-07-13 07:25:36.615999491 +0300
-@@ -59,7 +59,7 @@
+diff -Nuar mxml-2.7-orig/Makefile.in mxml-2.7/Makefile.in
+--- mxml-2.7-orig/Makefile.in	2011-04-13 18:43:32.000000000 +0300
++++ mxml-2.7/Makefile.in	2012-05-16 07:21:42.677220980 +0300
+@@ -57,7 +57,7 @@
  # Install commands...
  #
  
@@ -23,7 +23,7 @@ diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
  INSTALL_DIR	=	$(INSTALL) -d
  INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
 @@ -88,7 +88,7 @@
- 			mxml-node.o mxml-search.o mxml-set.o
+ 			mxml-index.o mxml-node.o mxml-search.o mxml-set.o
  LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
  OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
 -TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
@@ -31,23 +31,25 @@ diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
  
  
  #
-@@ -134,8 +134,6 @@
+@@ -140,9 +140,6 @@
  #
  
  install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
+-	echo Installing mxmldoc in $(BUILDROOT)$(bindir)...
 -	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
--	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
+-	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
+ 	echo Installing documentation in $(BUILDROOT)$(docdir)...
  	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
  	for file in $(DOCFILES); do \
- 		$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
-@@ -144,10 +142,6 @@
- 	$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
+@@ -154,11 +151,6 @@
+ 	echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig...
  	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
  	$(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
+-	echo Installing man pages in $(BUILDROOT)$(mandir)...
 -	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
 -	$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
 -	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
 -	$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
  
  install-libmxml.a:
- 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
+ 	echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index c05c3a7060..ca54a54f7e 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -3,8 +3,8 @@
 # mxml
 #
 #############################################################
-MXML_VERSION = 2.6
-MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6
+MXML_VERSION = 2.7
+MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION)
 MXML_INSTALL_STAGING = YES
 
 MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install

From beeacca5f804841ffd1ed03532a9e5b0ca5937ca Mon Sep 17 00:00:00 2001
From: Dimitry Golubovsky <golubovsky@gmail.com>
Date: Tue, 15 May 2012 16:36:06 +0000
Subject: [PATCH 2004/6849] package: add fbterm, a framebuffer-based terminal
 emulator

[Peter: fix dependencies / white space]
Signed-off-by: Dmitry <golubovsky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/fbterm/Config.in | 13 +++++++++++++
 package/fbterm/fbterm.mk | 12 ++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/fbterm/Config.in
 create mode 100644 package/fbterm/fbterm.mk

diff --git a/package/Config.in b/package/Config.in
index 8cb3b22cb1..5d6250cbe1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -112,6 +112,7 @@ source "package/fbgrab/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/fbset/Config.in"
 endif
+source "package/fbterm/Config.in"
 source "package/fbv/Config.in"
 source "package/imagemagick/Config.in"
 source "package/linux-fusion/Config.in"
diff --git a/package/fbterm/Config.in b/package/fbterm/Config.in
new file mode 100644
index 0000000000..1e4ab4c0d4
--- /dev/null
+++ b/package/fbterm/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_FBTERM
+	bool "fbterm"
+	depends on (BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_LIBERATION
+	help
+	  fbterm is a fast terminal emulator for Linux with frame buffer
+	  device or VESA video card.
+
+	  http://code.google.com/p/fbterm/
+
+comment "fbterm requires a toolchain with C++, WCHAR and locale support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
new file mode 100644
index 0000000000..ddb5b2b31b
--- /dev/null
+++ b/package/fbterm/fbterm.mk
@@ -0,0 +1,12 @@
+############################################
+#
+# fbterm
+#
+############################################
+
+FBTERM_VERSION = 1.7.0
+FBTERM_SITE = http://fbterm.googlecode.com/files/
+
+FBTERM_DEPENDENCIES = fontconfig liberation
+
+$(eval $(call AUTOTARGETS))

From cb30e130519fcb50e1a2e0d7a02aa628e52ed24c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 15 May 2012 11:15:50 +0000
Subject: [PATCH 2005/6849] toolchain/crosstool-NG: disable decimal floats

Decimal floats were introduced circa gcc-4.2 or -4.3, and requires
the floating-point environement fenv.h in the C library.

The uClibc .config file used by crosstool-NG to build uClibc is the
same as used by the internal buildroot mechanism, and explcitly
disables fenv support.

The quick workaround is to simply disable decimal floats in all
crosstool-NG config files.

In the long run, it might be better to check this situation, and/or
add code and/or options in crosstool-NG to handle this (but it is
much more involved, and this workaround is sane).

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc | 4 ++--
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc  | 4 ++--
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index cbad52a654..58cdff2d34 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -294,8 +294,8 @@ CT_CC_LANG_CXX=y
 # gcc other options
 #
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
+CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index e57a91dfc6..db724ab40c 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -294,8 +294,8 @@ CT_CC_LANG_CXX=y
 # gcc other options
 #
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
+CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index c1150965a9..5f1ee7ea8b 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -293,8 +293,8 @@ CT_CC_LANG_CXX=y
 # gcc other options
 #
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
+CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
 CT_CC_STATIC_LIBSTDCXX=y
 
 #

From 56901908c63ed7b2aedffaa4b2143ce87a15d837 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 16 May 2012 00:07:58 +0000
Subject: [PATCH 2006/6849] wpa_supplicant: explicitly disable libnl by default

libnl support is enabled by default since version 1.0, so disable it
to avoid build breakage when there's no libnl.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index a4978e0059..97210ceee7 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -15,9 +15,12 @@ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS)
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += libnl
 define WPA_SUPPLICANT_LIBNL_CONFIG
-	$(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
 	echo "CONFIG_LIBNL32=y" >>$(WPA_SUPPLICANT_CONFIG)
 endef
+else
+define WPA_SUPPLICANT_LIBNL_CONFIG
+	$(SED) "s/^CONFIG_DRIVER_NL80211/#CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
+endef
 endif
 
 ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)

From 60cc0ba4b3a97804c9230cddbdeb1999f5023368 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 17 May 2012 05:11:22 +0000
Subject: [PATCH 2007/6849] opencv: add zlib dependency

The opencv package selects zlib, but it does not depend on it. This
leads to cases where opencv gets built before zlib, and in this case,
opencv uses its internal version of zlib, which doesn't build properly
(it has some conditional code for ARM that is probably broken), see:

  http://autobuild.buildroot.org/results/45f4e195fe0cc5acace10287f5ff33aa953d5430/build-end.log

We fix this by properly adding the opencv dependency on zlib.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opencv/opencv.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index d415e5192e..ec9471518f 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -35,6 +35,8 @@ OPENCV_CONF_OPT = \
 	-DWITH_UNICAP=OFF \
 	-DWITH_XINE=OFF
 
+OPENCV_DEPENDENCIES += zlib
+
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_PYTHON),y)
 OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=ON
 OPENCV_DEPENDENCIES += python

From 02b00dc9dfb7216145277a303c7c2f52004f85b2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 17 May 2012 09:26:45 +0000
Subject: [PATCH 2008/6849] apr: requires shared library support

The apr library requires shared library support unconditionally, so
make it depend on !BR2_PREFER_STATIC_LIB, so that architectures that
support static libraries only do not make this package available.

Solves
http://autobuild.buildroot.org/results/f4cd9751e85e9ee7fde2e9479e0f01ab2be93e84/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/apr-util/Config.in | 2 ++
 package/apr/Config.in      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
index 99b32f2b06..895dbb86d5 100644
--- a/package/apr-util/Config.in
+++ b/package/apr-util/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_APR_UTIL
 	select BR2_PACKAGE_NEON
 	select BR2_PACKAGE_NEON_ZLIB
 	select BR2_PACKAGE_ZLIB
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  The utility library for the apache runtime project
 
diff --git a/package/apr/Config.in b/package/apr/Config.in
index 292cadb67c..ed319ed058 100644
--- a/package/apr/Config.in
+++ b/package/apr/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_APR
 	bool "apr"
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  The mission of the Apache Portable Runtime (APR) project is to create
 	  and maintain software libraries that provide a predictable and

From 878401a9d06e260a0d3d86a92c21aab4a622d2c8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 17 May 2012 01:15:57 +0000
Subject: [PATCH 2009/6849] socat: fix build failure due to ext2_fs.h header,
 bump version

In kernel >= 3.3, the ext2_fs.h can no longer be imported from
userspace. This has been fixed for internal toolchains by adding a
patch to kernel headers, but this doesn't work with toolchains
generated by Crosstool-NG, or potentially upcoming external
toolchains.

socat in fact has a test in its configure.in, but the configure was
generated too long ago, and the generated test relies on the
preprocessor result and not the compiler result (but warns that in the
future, the compiler result will be used instead of the preprocessor
result).

So, by running autoconf on this package, we fix the problem: it
properly checks whether ext2_fs is usable or not, and acts
accordingly. Of course, it means that with recent versions of the
kernel, ext2-specific features of socat are unavailable, and we'll
have to wait for the socat developers to adapt their code so that they
use the e2fsprogs headers.

We also bump the version, since a new minor version fixing a security
problem has been released.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socat/socat.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 5f7feacc2b..bd435cf086 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SOCAT_VERSION = 2.0.0-b4
+SOCAT_VERSION = 2.0.0-b5
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
 SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
@@ -12,4 +12,17 @@ SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
 		 sc_cv_sys_tabdly_shift=11 \
 		 sc_cv_sys_csize_shift=4
 
+# We need to run autoconf to regenerate the configure script, in order
+# to ensure that the test checking linux/ext2_fs.h works
+# properly. However, the package only uses autoconf and not automake,
+# so we can't use the normal autoreconf logic.
+
+SOCAT_DEPENDENCIES = host-autoconf
+
+define SOCAT_RUN_AUTOCONF
+	(cd $(@D); $(HOST_DIR)/usr/bin/autoconf)
+endef
+
+SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
+
 $(eval $(call AUTOTARGETS))

From 556fd4f81588dff2e9ff288a87517d4ae18bf0ed Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 17 May 2012 01:15:58 +0000
Subject: [PATCH 2010/6849] socat: disable documentation build/installation

The documentation generation process requires a special yold2man
program, for which we don't have a package in Buildroot. Since we
generally don't care much about documentation of packages, just adjust
the package Makefile.in to not build/install its documentation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socat/socat-no-documentation.patch | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/socat/socat-no-documentation.patch

diff --git a/package/socat/socat-no-documentation.patch b/package/socat/socat-no-documentation.patch
new file mode 100644
index 0000000000..ce088dfafc
--- /dev/null
+++ b/package/socat/socat-no-documentation.patch
@@ -0,0 +1,37 @@
+socat: disable documentation build/installation
+
+The documentation generation process requires a special yold2man
+program, for which we don't have a package in Buildroot. Since we
+generally don't care much about documentation of packages, just adjust
+the package Makefile.in to not build/install its documentation.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -93,7 +93,7 @@
+ 	Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \
+ 	Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h
+ 
+-all: progs doc
++all: progs
+ 
+ scmclean: gitclean
+ 
+@@ -136,13 +136,11 @@
+ strip: progs
+ 	strip $(PROGS)
+ 
+-install: progs $(srcdir)/doc/socat.1
++install: progs
+ 	mkdir -p $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
+-	mkdir -p $(DESTDIR)$(MANDEST)/man1
+-	$(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(BINDEST)/socat

From 4d1c69dd1021b0e94930c97f6f8af7bdff2fd667 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 17 May 2012 23:59:21 +0200
Subject: [PATCH 2011/6849] docs/news.html: add 2012.05-rc1 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 8c4871fe31..0032dfad05 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc1">CHANGES</a>
-    file for details</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-May/053736.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.05-rc1.tar.bz2">2012.05-rc1

From 433290761fceb476b095548eec10adf72405e050 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 16 May 2012 21:39:28 +0200
Subject: [PATCH 2012/6849] ccache: allow dynamic selection of cache directory

The existing ccache infrastructure sets the cache directory hardcoded in the
ccache binary. As this directory was set to ~/.buildroot-ccache, the cache
is not necessarily local (e.g. in corporate environments the home directories
may be mounted over NFS.)
Previous versions of buildroot did allow to set the cache directory, but this
was also hardcoded (so you had to rebuild ccache to change it), plus that
support was removed.
See http://lists.busybox.net/pipermail/buildroot/2011-July/044511.html for
a discussion on this.

This patch modifies ccache to respect a new shell variable (exported from
the Makefile, based on a configuration option) instead of CCACHE_DIR.
The name CCACHE_DIR itself is already used by autotargets for the ccache
package.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                |  7 +++++++
 Makefile                 |  3 ++-
 package/ccache/ccache.mk | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Config.in b/Config.in
index 68abb9b3c4..95c2e8ca3b 100644
--- a/Config.in
+++ b/Config.in
@@ -198,6 +198,13 @@ config BR2_CCACHE
 	  ccache cache by removing the $HOME/.buildroot-ccache
 	  directory.
 
+config BR2_CCACHE_DIR
+	string "Compiler cache location"
+	depends on BR2_CCACHE
+	default "$(HOME)/.buildroot-ccache"
+	help
+	  Where ccache should store cached files.
+
 config BR2_DEPRECATED
 	bool "Show packages that are deprecated or obsolete"
 	help
diff --git a/Makefile b/Makefile
index 96f94124a6..4427c406f5 100644
--- a/Makefile
+++ b/Makefile
@@ -252,7 +252,8 @@ TARGET_SKELETON=$(TOPDIR)/fs/skeleton
 
 ifeq ($(BR2_CCACHE),y)
 CCACHE:=$(HOST_DIR)/usr/bin/ccache
-CCACHE_CACHE_DIR=$(HOME)/.buildroot-ccache
+BUILDROOT_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
+export BUILDROOT_CACHE_DIR
 HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index f71376ee85..d7106eed12 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -25,22 +25,22 @@ HOST_CCACHE_CONF_ENV = \
 # has zero dependency besides the C library.
 HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no
 
-# We directly hardcode configuration into the binary, as it is much
-# easier to handle than passing an environment variable. Our
-# configuration is:
-#  - the cache location
-#  - the fact that ccache shouldn't use the compiler binary mtime to
-#  - detect a change in the compiler, because in the context of
-#  - Buildroot, that completely defeats the purpose of ccache. Of
-#  - course, that leaves the user responsible for purging its cache
-#  - when the compiler changes.
-define HOST_CCACHE_FIX_CCACHE_DIR
-	sed -i 's,getenv("CCACHE_DIR"),"$(CCACHE_CACHE_DIR)",' $(@D)/ccache.c
+# Patch host-ccache as follows:
+#  - Use BUILDROOT_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR
+#    is already used by autotargets for the ccache package.
+#    BUILDROOT_CACHE_DIR is exported by Makefile based on config option
+#    BR2_CCACHE_DIR.
+#  - ccache shouldn't use the compiler binary mtime to detect a change in
+#    the compiler, because in the context of Buildroot, that completely
+#    defeats the purpose of ccache. Of course, that leaves the user
+#    responsible for purging its cache when the compiler changes.
+define HOST_CCACHE_PATCH_CONFIGURATION
+	sed -i 's,getenv("CCACHE_DIR"),getenv("BUILDROOT_CACHE_DIR"),' $(@D)/ccache.c
 	sed -i 's,getenv("CCACHE_COMPILERCHECK"),"none",' $(@D)/ccache.c
 endef
 
 HOST_CCACHE_POST_CONFIGURE_HOOKS += \
-	HOST_CCACHE_FIX_CCACHE_DIR
+	HOST_CCACHE_PATCH_CONFIGURATION
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From f87cbf0ed9e0efa12ee5e2ea5e81bdc217430c80 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 18 May 2012 06:15:05 +0000
Subject: [PATCH 2013/6849] vala: do not append a -dirty suffix to the valac
 version number

When vala is built inside a Git repository with uncommitted changes, the
valac version number has -dirty appended. This creates problems for
packages (e.g. Midori) which require a valac version number without
the -dirty suffix.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...15.2-dont-add-dirty-to-valac-version.patch | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch

diff --git a/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch b/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch
new file mode 100644
index 0000000000..a2a0623369
--- /dev/null
+++ b/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch
@@ -0,0 +1,25 @@
+valac: don't append -dirty to version
+
+Don't append -dirty to the valac version number if the Buildroot Git
+tree has uncommited changes.
+
+The patched script is meant for the valac developers, but it also
+activates if you build valac in a subdirectory of a Git tree (e.g.
+as is commonly done in Buildroot).
+
+The effect is that valac gets built as being version x.y.z-dirty, which
+breaks programs (such as Midori) that explicitly check for valac-x.y.z.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen
+--- a/build-aux/git-version-gen	2010-08-15 12:49:03.000000000 +0100
++++ b/build-aux/git-version-gen	2012-05-14 10:17:19.977204570 +0100
+@@ -135,7 +135,7 @@
+     *) # Append the suffix only if there isn't one already.
+ 	case $v in
+ 	  *-dirty) ;;
+-	  *) v="$v-dirty" ;;
++	  #*) v="$v-dirty" ;;
+ 	esac ;;
+ esac
+ 

From f39cac370ead43ae40fda1ffb2c283ceedbe3715 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:30 +0000
Subject: [PATCH 2014/6849] icu: bump to version 4.8.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/icu/icu-arm.patch           | 25 --------
 package/icu/icu-double-escape.patch | 17 ------
 package/icu/icu-overflow.patch      | 93 -----------------------------
 package/icu/icu.mk                  |  2 +-
 4 files changed, 1 insertion(+), 136 deletions(-)
 delete mode 100644 package/icu/icu-arm.patch
 delete mode 100644 package/icu/icu-double-escape.patch
 delete mode 100644 package/icu/icu-overflow.patch

diff --git a/package/icu/icu-arm.patch b/package/icu/icu-arm.patch
deleted file mode 100644
index 53070d9d0c..0000000000
--- a/package/icu/icu-arm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.icu-project.org/trac/ticket/7664
-https://bugs.icu-project.org/trac/changeset/28107
-
---- icu.orig/source/tools/toolutil/pkg_genc.c
-+++ icu/source/tools/toolutil/pkg_genc.c
-@@ -1,5 +1,5 @@
- /******************************************************************************
-- *   Copyright (C) 2009, International Business Machines
-+ *   Copyright (C) 2009-2010, International Business Machines
-  *   Corporation and others.  All Rights Reserved.
-  *******************************************************************************
-  */
-@@ -118,10 +118,10 @@
- } assemblyHeader[] = {
-     {"gcc",
-         ".globl %s\n"
--        "\t.section .note.GNU-stack,\"\",@progbits\n"
-+        "\t.section .note.GNU-stack,\"\",%%progbits\n"
-         "\t.section .rodata\n"
-         "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
--        "\t.type %s,@object\n"
-+        "\t.type %s,%%object\n"
-         "%s:\n\n",
- 
-         ".long ","",HEX_0X
diff --git a/package/icu/icu-double-escape.patch b/package/icu/icu-double-escape.patch
deleted file mode 100644
index 06c70cca98..0000000000
--- a/package/icu/icu-double-escape.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-We need to double-escape CC & CXX since we've got --sysroot and thus a space
-when cross-compiling.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura icu.orig/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Makefile.in
---- icu.orig/source/tools/icuinfo/Makefile.in	2010-09-29 15:37:26.000000000 -0300
-+++ icu/source/tools/icuinfo/Makefile.in	2010-12-21 13:36:45.393439756 -0300
-@@ -36,7 +36,7 @@
- 
- ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME)
- 
--CPPFLAGS+=  -DU_PLATFORM=\"@platform@\"  -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\"
-+CPPFLAGS+=  -DU_PLATFORM=\"@platform@\"  -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\""@CC@\"" -DU_CXX=\""@CXX@\""
- # -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ "
- 
- 
diff --git a/package/icu/icu-overflow.patch b/package/icu/icu-overflow.patch
deleted file mode 100644
index 45beaa7ea5..0000000000
--- a/package/icu/icu-overflow.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-
-A combination of issue & patches from...
-
-https://bugs.icu-project.org/trac/ticket/7680
-https://bugs.icu-project.org/trac/changeset/28002
-https://bugs.icu-project.org/trac/changeset/28124
-
-Enlarged buffers more since include files for pkgdata can grow
-significantly when cross-compiling.
-This ONLY affects building.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura icu.orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
---- icu.orig/source/tools/pkgdata/pkgdata.cpp	2010-09-29 15:37:28.000000000 -0300
-+++ icu/source/tools/pkgdata/pkgdata.cpp	2010-12-21 15:53:30.252554924 -0300
-@@ -97,8 +97,9 @@
- #define PKGDATA_FILE_SEP_STRING U_FILE_SEP_STRING
- #endif
- 
--#define LARGE_BUFFER_MAX_SIZE 2048
--#define SMALL_BUFFER_MAX_SIZE 512
-+#define LARGE_BUFFER_MAX_SIZE 8192
-+#define MEDIUM_BUFFER_MAX_SIZE 4096
-+#define SMALL_BUFFER_MAX_SIZE 2048
- 
- static void loadLists(UPKGOptions *o, UErrorCode *status);
- 
-@@ -472,29 +473,48 @@
- }
- 
- static int runCommand(const char* command, UBool specialHandling) {
--    char cmd[SMALL_BUFFER_MAX_SIZE];
-+    char *cmd = NULL;
-+    char cmdBuffer[SMALL_BUFFER_MAX_SIZE];
-+    int32_t len = strlen(command);
-+
-+    if (len == 0) {
-+        return 0;
-+    }
- 
-     if (!specialHandling) {
-+#if defined(USING_CYGWIN) || defined(OS400)
-+#define CMD_PADDING_SIZE 20
-+        if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
-+            cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE);
-+        } else {
-+            cmd = cmdBuffer;
-+        }
- #ifdef USING_CYGWIN
-         sprintf(cmd, "bash -c \"%s\"", command);
- 
- #elif defined(OS400)
-         sprintf(cmd, "QSH CMD('%s')", command);
-+#endif
- #else
-         goto normal_command_mode;
- #endif
-     } else {
- normal_command_mode:
--        sprintf(cmd, "%s", command);
-+        cmd = (char *)command;
-     }
--    
-+
-     printf("pkgdata: %s\n", cmd);
-     int result = system(cmd);
--    if (result != 0) { 
--        printf("-- return status = %d\n", result); 
-+    if (result != 0) {
-+        printf("-- return status = %d\n", result);
-+    }
-+
-+    if (cmd != cmdBuffer && cmd != command) {
-+        uprv_free(cmd);
-     }
--    return result; 
--} 
-+
-+    return result;
-+}
- 
- #define LN_CMD "ln -s"
- #define RM_CMD "rm -f"
-@@ -586,7 +606,7 @@
-             pkgDataFlags = (char**)uprv_malloc(sizeof(char*) * PKGDATA_FLAGS_SIZE);
-             if (pkgDataFlags != NULL) {
-                 for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) {
--                    pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * SMALL_BUFFER_MAX_SIZE);
-+                    pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * MEDIUM_BUFFER_MAX_SIZE);
-                     if (pkgDataFlags[i] != NULL) {
-                         pkgDataFlags[i][0] = 0;
-                     } else {
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index d4c220bad6..a2c24ca1e7 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ICU_VERSION = 4.4.2
+ICU_VERSION = 4.8.1.1
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_DEPENDENCIES = host-icu

From fa529d101b472ff926f8211b39d9f3280155e371 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:31 +0000
Subject: [PATCH 2015/6849] grep: bump to version 2.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/grep/grep.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index aa22910da7..389aa3b78c 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GREP_VERSION = 2.11
+GREP_VERSION = 2.12
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex

From 0c7f14af250a7333f792aaab28b88665df122ff7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:32 +0000
Subject: [PATCH 2016/6849] hiawatha: bump to version 8.2 and define saner
 default directories

Bump to version 8.2.
Define CONFIG_DIR=/etc/hiawatha, LOG_DIR=/var/log, PID_DIR=/var/run and
WEBROOT_DIR=/var/www/hiawatha which are the same as the defaults but
without the /usr prefix.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index aa245f3802..4600c1129d 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.1
+HIAWATHA_VERSION = 8.2
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
@@ -8,6 +8,10 @@ endif
 
 HIAWATHA_CONF_OPT += \
 	-DENABLE_TOOLKIT=OFF \
-	-DENABLE_XSLT=OFF
+	-DENABLE_XSLT=OFF \
+	-DCONFIG_DIR=/etc/hiawatha \
+	-DLOG_DIR=/var/log \
+	-DPID_DIR=/var/run \
+	-DWEBROOT_DIR=/var/www/hiawatha
 
 $(eval $(call CMAKETARGETS))

From 92c24094240f75b44023f6a2611f66c8d1db9656 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:33 +0000
Subject: [PATCH 2017/6849] libmbus: bump to version 0.7.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmbus/libmbus-0.6.1-bcopy.patch | 15 ---------------
 package/libmbus/libmbus-bcopy.patch       | 16 ++++++++++++++++
 package/libmbus/libmbus.mk                |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 package/libmbus/libmbus-0.6.1-bcopy.patch
 create mode 100644 package/libmbus/libmbus-bcopy.patch

diff --git a/package/libmbus/libmbus-0.6.1-bcopy.patch b/package/libmbus/libmbus-0.6.1-bcopy.patch
deleted file mode 100644
index 8b8310c858..0000000000
--- a/package/libmbus/libmbus-0.6.1-bcopy.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Drop bcopy since it's deprecated.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-diff -Nura libmbus-0.6.1/mbus/mbus-tcp.c libmbus-0.6.1-bcopy/mbus/mbus-tcp.c
---- libmbus-0.6.1/mbus/mbus-tcp.c	2011-11-06 02:34:28.000000000 -0300
-+++ libmbus-0.6.1-bcopy/mbus/mbus-tcp.c	2012-05-03 08:11:39.680346347 -0300
-@@ -78,7 +78,7 @@
-         return NULL;
-     }
- 
--    bcopy((void *)(host_addr->h_addr), (void *)(&s_addr.sin_addr), host_addr->h_length);
-+    memmove((void *)(&s_addr.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
- 
-     if (connect(handle->sock, (struct sockaddr *)&s_addr, sizeof(s_addr)) < 0)
-     {
diff --git a/package/libmbus/libmbus-bcopy.patch b/package/libmbus/libmbus-bcopy.patch
new file mode 100644
index 0000000000..660cc3775f
--- /dev/null
+++ b/package/libmbus/libmbus-bcopy.patch
@@ -0,0 +1,16 @@
+Drop bcopy since it's deprecated.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libmbus-0.7.0/mbus/mbus-tcp.c libmbus-0.7.0-bcopy/mbus/mbus-tcp.c
+--- libmbus-0.7.0/mbus/mbus-tcp.c	2011-12-08 13:21:19.000000000 -0300
++++ libmbus-0.7.0-bcopy/mbus/mbus-tcp.c	2012-05-03 09:08:36.987106612 -0300
+@@ -78,7 +78,7 @@
+         return NULL;
+     }
+ 
+-    bcopy((void *)(host_addr->h_addr), (void *)(&s.sin_addr), host_addr->h_length);
++    memmove((void *)(&s.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
+ 
+     if (connect(handle->sock, (struct sockaddr *)&s, sizeof(s)) < 0)
+     {
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
index 9abb2bf8d4..17954b9ef6 100644
--- a/package/libmbus/libmbus.mk
+++ b/package/libmbus/libmbus.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-LIBMBUS_VERSION = 0.6.1
-LIBMBUS_SITE = http://www.freescada.com/public-dist/
+LIBMBUS_VERSION = 0.7.0
+LIBMBUS_SITE = http://www.freescada.com/public-dist
 LIBMBUS_INSTALL_STAGING = YES
 
 # Without this the build yields an error:

From 357322934d91edb2cb2f3ec20dcaa8208608c226 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:34 +0000
Subject: [PATCH 2018/6849] libcurl: bump to version 7.25.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index e094e31cde..e8f13bb4c6 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBCURL_VERSION = 7.24.0
+LIBCURL_VERSION = 7.25.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_INSTALL_STAGING = YES

From b396983c5419a9a9f3dab7da0a1d7aa402b32cc3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:35 +0000
Subject: [PATCH 2019/6849] gmp: bump to version 5.0.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 7899b71d9c..7a17ebcc8b 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMP_VERSION = 5.0.4
+GMP_VERSION = 5.0.5
 GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES

From 21fd343a1096a74dde30d3eeca96b98a0308ab51 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:36 +0000
Subject: [PATCH 2020/6849] samba: bump to version 3.6.5 and enhancements

Bump samba to version 3.6.5 with SMB2 protocol support.

Use shared popt rather than the builtin - it saves some space if you've
already got it on your target.

mount.cifs & umount.cifs have been unbundled so remove the option -
users must use cifs-tools for that.

Add recommended enhancement from bug #807 (make iconv support optional).
Optional smbd was already commited some time ago.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/Config.in                       | 50 +++++--------------
 package/samba/samba-fix-mount.cifs.patch      | 21 --------
 package/samba/samba-getaddrinfo.patch         | 19 +++++++
 package/samba/samba-remove-legacy-index.patch | 20 --------
 package/samba/samba.mk                        | 34 +++++--------
 5 files changed, 45 insertions(+), 99 deletions(-)
 delete mode 100644 package/samba/samba-fix-mount.cifs.patch
 create mode 100644 package/samba/samba-getaddrinfo.patch
 delete mode 100644 package/samba/samba-remove-legacy-index.patch

diff --git a/package/samba/Config.in b/package/samba/Config.in
index a5a5c295f7..cebf7d939d 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SAMBA
 	bool "samba"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_POPT
 	help
 	  Provides print services to all manner of SMB/CIFS clients,
 	  including the numerous versions of Microsoft Windows
@@ -11,20 +11,23 @@ config BR2_PACKAGE_SAMBA
 	  NOTE: A complete Samba install takes over 50MB of space,
 		so choose only the components you need.
 
-menu "Samba tools selection"
-	depends on BR2_PACKAGE_SAMBA
+if BR2_PACKAGE_SAMBA
 
-config BR2_PACKAGE_SAMBA_CIFS
-	bool "cifs"
-	default y
-	depends on BR2_PACKAGE_SAMBA
+config BR2_PACKAGE_SAMBA_LIBICONV
+	bool "extended encodings (libiconv)"
+	depends on !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBICONV
 	help
-	  Support CIFS
+	  Include libiconv support for extended conversion of filename
+	  enconding. Samba has built-in support for UTF-8, ISO-8859-1
+	  and ASCII, so this is only required if you want to support
+	  other encodings.
+
+menu "Samba tools selection"
 
 config BR2_PACKAGE_SAMBA_EVENTLOGADM
 	bool "eventlogadm"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Write Eventlog records to a tdb or perform other eventlog functions
 
@@ -43,14 +46,12 @@ comment "findsmb       - disabled (requires nmblookup, smbclient and perl)"
 config BR2_PACKAGE_SAMBA_NET
 	bool "net"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Distributed SMB/CIFS Server Management Utility
 
 config BR2_PACKAGE_SAMBA_NMBD
 	bool "nmbd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  NetBIOS name server to provide NetBIOS over IP naming services
 	  to clients
@@ -58,7 +59,6 @@ config BR2_PACKAGE_SAMBA_NMBD
 config BR2_PACKAGE_SAMBA_NMBLOOKUP
 	bool "nmblookup"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Query NetBIOS names and map them to IP addresses in a network
 	  using NetBIOS over TCP/IP queries
@@ -66,21 +66,18 @@ config BR2_PACKAGE_SAMBA_NMBLOOKUP
 config BR2_PACKAGE_SAMBA_NTLM_AUTH
 	bool "ntlm_auth"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Helper utility that authenticates users using NT/LM authentication
 
 config BR2_PACKAGE_SAMBA_PDBEDIT
 	bool "pdbedit"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Manage the SAM database (Database of Samba Users)
 
 config BR2_PACKAGE_SAMBA_PROFILES
 	bool "profiles"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Utility that reports and changes SIDs in Windows NT registry files
 
@@ -88,7 +85,6 @@ config BR2_PACKAGE_SAMBA_RPCCLIENT
 	bool "rpcclient"
 	select BR2_PACKAGE_READLINE
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Tool for executing client side MS-RPC functions using RPC
 	  calls from a UNIX workstation.
@@ -96,7 +92,6 @@ config BR2_PACKAGE_SAMBA_RPCCLIENT
 config BR2_PACKAGE_SAMBA_SMBCACLS
 	bool "smbcacls"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Set or get ACLs on an NT file or directory names
 
@@ -104,84 +99,72 @@ config BR2_PACKAGE_SAMBA_SMBCLIENT
 	bool "smbclient"
 	select BR2_PACKAGE_READLINE
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  ftp-like client to access SMB/CIFS resources on servers
 
 config BR2_PACKAGE_SAMBA_SMBCONTROL
 	bool "smbcontrol"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Send messages to smbd, nmbd or winbindd processes
 
 config BR2_PACKAGE_SAMBA_SMBCQUOTAS
 	bool "smbcquotas"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Set or get QUOTAs of NTFS 5 shares
 
 config BR2_PACKAGE_SAMBA_SMBD
 	bool "smbd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  The server daemon that provides filesharing and printing services
 
 config BR2_PACKAGE_SAMBA_SMBGET
 	bool "smbget"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  wget-like utility for download files over SMB
 
 config BR2_PACKAGE_SAMBA_SMBLDBTOOLS
 	bool "smbldbtools"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch tools
 
 config BR2_PACKAGE_SAMBA_SMBPASSWD
 	bool "smbpasswd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Change a user's SMB passwd
 
 config BR2_PACKAGE_SAMBA_SMBSHARESEC
 	bool "smbsharesec"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Manipulate share permissions on SMB file shares
 
 config BR2_PACKAGE_SAMBA_SMBSPOOL
 	bool "smbspool"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Send a print file to an SMB printer
 
 config BR2_PACKAGE_SAMBA_SMBSTATUS
 	bool "smbstatus"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Report on current Samba connections
 
 config BR2_PACKAGE_SAMBA_SMBTREE
 	bool "smbtree"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  A text based smb network browser
 
 config BR2_PACKAGE_SAMBA_SWAT
 	bool "swat"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Samba Web Administration Tool
 
@@ -198,21 +181,18 @@ comment "smbtar        - disabled (requires smbclient)"
 config BR2_PACKAGE_SAMBA_TDB
 	bool "tdb"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Tools to operate on the .tdb database files
 
 config BR2_PACKAGE_SAMBA_TESTPARM
 	bool "testparm"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Check an smb.conf configuration file for internal correctness
 
 config BR2_PACKAGE_SAMBA_WINBINDD
 	bool "winbindd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Name Service Switch daemon for resolving names from NT servers
 
@@ -227,11 +207,9 @@ endmenu
 
 
 menu "Samba libraries selection"
-	depends on BR2_PACKAGE_SAMBA
 
 config BR2_PACKAGE_SAMBA_LIBSMBCLIENT
 	bool "libsmbclient"
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  libsmbclient is a library toolset that permits applications
 	  to manipulate CIFS/SMB network resources using many of the
@@ -242,12 +220,10 @@ endmenu
 
 
 menu "Samba support selection"
-	depends on BR2_PACKAGE_SAMBA
 
 config BR2_PACKAGE_SAMBA_AVAHI
 	bool "support avahi"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	depends on BR2_PACKAGE_AVAHI_DAEMON
 	select BR2_PACKAGE_DBUS
 	help
@@ -259,7 +235,6 @@ comment "support avahi - disabled (requires avahi-daemon)"
 config BR2_PACKAGE_SAMBA_GAMIN
 	bool "support gamin"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	depends on BR2_PACKAGE_GAMIN
 	help
 	  Include support for gamin
@@ -269,3 +244,4 @@ comment "support gamin - disabled (requires gamin)"
 
 endmenu
 
+endif
diff --git a/package/samba/samba-fix-mount.cifs.patch b/package/samba/samba-fix-mount.cifs.patch
deleted file mode 100644
index 9c235ea7be..0000000000
--- a/package/samba/samba-fix-mount.cifs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/client/mount.cifs.c	2011-09-13 10:26:21.000000000 +0200
-+++ b/client/mount.cifs.c	2011-09-13 10:27:16.000000000 +0200
-@@ -39,7 +39,6 @@
- #include <mntent.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <fstab.h>
- #include "mount.h"
- 
- #define MOUNT_CIFS_VERSION_MAJOR "1"
-@@ -255,6 +254,10 @@
- 	return 0;
- }
- #else /* CIFS_LEGACY_SETUID_CHECK */
-+
-+#ifndef _PATH_FSTAB
-+#define _PATH_FSTAB "/etc/fstab"
-+#endif
- static int
- check_fstab(const char *progname, char *mountpoint, char *devname,
- 	    char **options)
diff --git a/package/samba/samba-getaddrinfo.patch b/package/samba/samba-getaddrinfo.patch
new file mode 100644
index 0000000000..af01299003
--- /dev/null
+++ b/package/samba/samba-getaddrinfo.patch
@@ -0,0 +1,19 @@
+Patch from OpenWRT.
+Don't check for buggy getaddrinfo() assume it's safe if it's present.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/source3/configure
++++ b/source3/configure
+@@ -13285,10 +13285,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
+ 	# see bug 5910, use our replacements if we detect
+ 	# a broken system.
+ 	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++		$as_echo "assuming valid getaddrinfo without bug 5910" >&2
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/package/samba/samba-remove-legacy-index.patch b/package/samba/samba-remove-legacy-index.patch
deleted file mode 100644
index 855bca77c6..0000000000
--- a/package/samba/samba-remove-legacy-index.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/source3/registry/reg_perfcount.c
-+++ b/source3/registry/reg_perfcount.c
-@@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P
- 	obj = NULL;
- 	memset(buf, 0, PERFCOUNT_MAX_LEN);
- 	memcpy(buf, data.dptr, data.dsize);
--	begin = index(buf, '[');
--	end = index(buf, ']');
-+	begin = strchr(buf, '[');
-+	end = strchr(buf, ']');
- 	if(begin == NULL || end == NULL)
- 		return False;
- 	start = begin+1;
- 
- 	while(start < end) {
--		stop = index(start, ',');
-+		stop = strchr(start, ',');
- 		if(stop == NULL)
- 			stop = end;
- 		*stop = '\0';
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 1203693763..d7a15b3f2b 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,21 +4,19 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.5.15
+SAMBA_VERSION = 3.6.5
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES
 
-
-SAMBA_DEPENDENCIES = \
-	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
+SAMBA_DEPENDENCIES = popt \
 	$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \
 	$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),readline) \
 	$(if $(BR2_PACKAGE_SAMBA_AVAHI),avahi) \
 	$(if $(BR2_PACKAGE_SAMBA_GAMIN),gamin)
 
-
 SAMBA_CONF_ENV = \
+	ac_cv_file__proc_sys_kernel_core_pattern=yes \
 	samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
 	samba_cv_USE_SETREUID=yes \
 	samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
@@ -31,7 +29,6 @@ SAMBA_CONF_ENV = \
 	libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \
 	$(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread)
 
-
 SAMBA_CONF_OPT = \
 	--localstatedir=/var \
 	--with-piddir=/var/run \
@@ -51,49 +48,38 @@ SAMBA_CONF_OPT = \
 	$(if $(BR2_PACKAGE_SAMBA_SWAT),--enable-swat,--disable-swat) \
 	\
 	--without-cluster-support \
-	--without-cifsupcall \
+	--without-dnsupdate \
+	$(if $(BR2_INET_RPC),--with-sys-quotas,--without-sys-quotas) \
 	--without-ads \
 	--without-ldap \
-	--with-included-popt \
 	--with-included-iniparser \
-	--with-libiconv=$(STAGING_DIR) \
 	\
-	$(if $(BR2_PACKAGE_SAMBA_CIFS),--with-cifsmount,--without-cifsmount) \
 	$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),--with-readline=$(STAGING_DIR)) \
 	$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
 	$(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
 
-
 SAMBA_INSTALL_TARGET_OPT = \
 	DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \
 	installlibs installservers installbin installscripts \
-	$(if $(BR2_PACKAGE_SAMBA_CIFS),installcifsmount) \
 	$(if $(BR2_PACKAGE_SAMBA_SWAT),installswat)
 
-
 SAMBA_UNINSTALL_TARGET_OPT = \
 	DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \
 	uninstalllibs uninstallservers uninstallbin uninstallscripts \
-	$(if $(BR2_PACKAGE_SAMBA_CIFS),uninstallcifsmount) \
 	$(if $(BR2_PACKAGE_SAMBA_SWAT),uninstallswat)
 
-
 # binaries to keep
 SAMBA_BINTARGETS_y = \
 	usr/sbin/smbd \
 	usr/lib/libtalloc.so \
 	usr/lib/libtdb.so
 
-
 # binaries to remove
 SAMBA_BINTARGETS_ = \
 	usr/lib/libnetapi.so* \
 	usr/lib/libsmbsharemodes.so*
 
-
 # binaries to keep or remove
-SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs
-SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/umount.cifs
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd
@@ -131,7 +117,6 @@ SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/lib/libwbclient.so*
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_LIBSMBCLIENT) += usr/lib/libsmbclient.so*
 
-
 # non-binaries to remove
 SAMBA_TXTTARGETS_ = \
 	usr/include/libsmbclient.h \
@@ -141,7 +126,6 @@ SAMBA_TXTTARGETS_ = \
 	usr/include/tdb.h \
 	usr/include/wbclient.h
 
-
 # non-binaries to keep or remove
 SAMBA_TXTTARGETS_$(BR2_PACKAGE_SAMBA_FINDSMB) += usr/bin/findsmb
 SAMBA_TXTTARGETS_$(BR2_PACKAGE_SAMBA_SMBTAR) += usr/bin/smbtar
@@ -163,6 +147,14 @@ define SAMBA_REMOVE_SWAT_DOCUMENTATION
 	rm -rf $(TARGET_DIR)/usr/swat/help/welcome.html
 endef
 
+# --with-libiconv="" is to avoid detecting host libiconv and build failure
+ifeq ($(BR2_PACKAGE_SAMBA_LIBICONV),y)
+SAMBA_DEPENDENCIES += libiconv
+SAMBA_CONF_OPT += --with-libiconv=$(STAGING_DIR)
+else
+SAMBA_CONF_OPT += --with-libiconv=""
+endif
+
 ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION

From 28fa6f19517847c0d515d97f787cef85736957b0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:37 +0000
Subject: [PATCH 2021/6849] mrouted: bump to version 3.9.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mrouted/mrouted-3.9.4-bcopy.patch     | 21 ------
 .../mrouted-3.9.4-makefile-flags.patch        | 64 -------------------
 package/mrouted/mrouted-bcopy.patch           | 39 +++++++++++
 package/mrouted/mrouted.mk                    |  6 +-
 4 files changed, 42 insertions(+), 88 deletions(-)
 delete mode 100644 package/mrouted/mrouted-3.9.4-bcopy.patch
 delete mode 100644 package/mrouted/mrouted-3.9.4-makefile-flags.patch
 create mode 100644 package/mrouted/mrouted-bcopy.patch

diff --git a/package/mrouted/mrouted-3.9.4-bcopy.patch b/package/mrouted/mrouted-3.9.4-bcopy.patch
deleted file mode 100644
index ea8f6dbf63..0000000000
--- a/package/mrouted/mrouted-3.9.4-bcopy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c
---- mrouted-3.9.4/mtrace.c	2010-11-19 20:53:19.000000000 -0300
-+++ mrouted-3.9.4-memmove/mtrace.c	2012-05-03 08:27:33.895422455 -0300
-@@ -556,7 +556,7 @@
- 		save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
- 		    (tr.tv_usec << 10) / 15625;
- 		save->len = len;
--		bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
-+		memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
- 	    }
- 	    return recvlen;
- 	}
-@@ -646,7 +646,7 @@
- 	base.rtime = ((tr.tv_sec + JAN_1970) << 16) +
- 	    (tr.tv_usec << 10) / 15625;
- 	base.len = len;
--	bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
-+	memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
- 	/*
- 	 * If the user specified which traces to monitor,
- 	 * only accept traces that correspond to the
diff --git a/package/mrouted/mrouted-3.9.4-makefile-flags.patch b/package/mrouted/mrouted-3.9.4-makefile-flags.patch
deleted file mode 100644
index 932bec006c..0000000000
--- a/package/mrouted/mrouted-3.9.4-makefile-flags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
----
- Makefile |   20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-Index: mrouted-3.9.4/Makefile
-===================================================================
---- mrouted-3.9.4.orig/Makefile
-+++ mrouted-3.9.4/Makefile
-@@ -42,11 +42,9 @@
- #MSTAT_OBJS    = mstat.o $(EXTRA_OBJS)
- 
- ## Common
--CFLAGS        = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
--CFLAGS       += -O2 -W -Wall -Werror
--#CFLAGS       += -O -g
--LDLIBS        = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
--LDFLAGS      += -Wl,-Map,$@.map
-+MROUTED_CFLAGS   = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
-+LDLIBS           = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
-+MROUTED_LDFLAGS += -Wl,-Map,$@.map
- OBJS          = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \
- 		$(MTRACE_OBJS) $(MSTAT_OBJS)
- SRCS          = $(OBJS:.o=.c)
-@@ -65,7 +63,7 @@
- 
- .c.o:
- 	@printf "  CC      $@\n"
--	@$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+	@$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(CPPFLAGS) -c -o $@ $<
- 
- install: $(EXECS)
- 	@install -d $(DESTDIR)$(prefix)/sbin
-@@ -95,26 +93,26 @@
- 
- mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS)
- 	@printf "  LINK    $@\n"
--	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
-+	@$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
- 
- vers.c: Makefile
- 	@echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
- 
- map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS)
- 	@printf "  LINK    $@\n"
--	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
-+	@$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
- 
- mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS)
- 	@printf "  LINK    $@\n"
--	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
-+	@$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
- 
- mtrace: $(IGMP_OBJS) $(MTRACE_OBJS)
- 	@printf "  LINK    $@\n"
--	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
-+	@$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
- 
- mstat: $(MSTAT_OBJS) $(CMULIBS)
- 	@printf "  LINK    $@\n"
--	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
-+	@$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
- 
- clean: $(SNMPCLEAN)
- 	-@$(RM) $(OBJS) $(EXECS)
diff --git a/package/mrouted/mrouted-bcopy.patch b/package/mrouted/mrouted-bcopy.patch
new file mode 100644
index 0000000000..74af02df6c
--- /dev/null
+++ b/package/mrouted/mrouted-bcopy.patch
@@ -0,0 +1,39 @@
+From 2d33110ee18fb59a1d6917d598fc1f4eb3c4cf83 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 7 May 2012 16:32:10 -0300
+Subject: [PATCH] Switch from bcopy to memmove
+
+The bcopy() function is marked as legacy per POSIX.1-2001 and removed by
+POSIX-1.2008 thus shouldn't be used.
+So switch over to memmove()
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ mtrace.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mtrace.c b/mtrace.c
+index c982a67..64630bf 100644
+--- a/mtrace.c
++++ b/mtrace.c
+@@ -556,7 +556,7 @@ int send_recv(u_int32_t dst, int type, int code, int tries, struct resp_buf *sav
+ 		save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
+ 		    (tr.tv_usec << 10) / 15625;
+ 		save->len = len;
+-		bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
++		memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
+ 	    }
+ 	    return recvlen;
+ 	}
+@@ -646,7 +646,7 @@ void passive_mode(void)
+ 	base.rtime = ((tr.tv_sec + JAN_1970) << 16) +
+ 	    (tr.tv_usec << 10) / 15625;
+ 	base.len = len;
+-	bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
++	memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
+ 	/*
+ 	 * If the user specified which traces to monitor,
+ 	 * only accept traces that correspond to the
+-- 
+1.7.3.4
+
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 99b54bcbd6..7a3203aace 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -2,11 +2,11 @@
 #
 # mrouted
 #
-#
 #############################################################
-MROUTED_VERSION = 3.9.4
+
+MROUTED_VERSION = 3.9.6
 MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
-MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted
+MROUTED_SITE = http://cloud.github.com/downloads/troglobit/mrouted
 
 define MROUTED_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From 24387627297c5ce1fbe5789f7c660d8d29861a98 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:38 +0000
Subject: [PATCH 2022/6849] gnutls: bump to version 2.12.19

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index ce570d5f1d..f7238aaae2 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 2.12.18
+GNUTLS_VERSION = 2.12.19
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt

From e9b6a0c7d5700c38ba6a63f9dc5f467d26325776 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 09:37:39 +0000
Subject: [PATCH 2023/6849] mpg123: bump to version 1.14.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 65523f32b9..4635740bad 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.13.8
+MPG123_VERSION = 1.14.1
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
-MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
+MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
 MPG123_INSTALL_STAGING = YES
 

From b07ad40c1dc78e61dd71d264b1b30aabfa1033dc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 May 2012 22:50:37 +0200
Subject: [PATCH 2024/6849] Update for 2012.05-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 14 +++++++++++++-
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6b01c0439f..7d17c26b1c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,16 @@
-2012.05-rc1, Released May 10th, 2012
+2012.05-rc2, Released May 18th, 2012:
+
+	Fixes all over the tree.
+
+	Toolchain: uClibc: Use 0.9.33.2, Crosstool-ng: fix gperf
+	dependency, disable decimal floats support, Linux 3.2.17 /
+	3.3.6 kernel headers. Fix sysroot copy handling for toolchains
+	without C++ support.
+
+	Updated/fixed packages: apr, apr-util, ccache, dnsmasq,
+	heirloom-mailx, gdb, ndisc6, opencv, openssl, socat, vala
+
+2012.05-rc1, Released May 10th, 2012:
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 4427c406f5..c0fc8c2401 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.05-rc1
+export BR2_VERSION:=2012.05-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 7b22569b8f..52d3c1814f 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2012.05-rc1</b>, which can be
+The latest release candidate is <b>2012.05-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.05-rc1.tar.gz">buildroot-2012.05-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2012.05-rc2.tar.gz">buildroot-2012.05-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.05-rc1.tar.bz2">buildroot-2012.05-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05-rc2.tar.bz2">buildroot-2012.05-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 0032dfad05..c7d276ef55 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>18 May 2012 -- 2012.05-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc2.tar.bz2">2012.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>10 May 2012 -- 2012.05-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 20d4b4148f3bd2697093ab8adef4f642c358581d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 15 May 2012 08:34:23 +0000
Subject: [PATCH 2025/6849] Add package 'opkg'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |   1 +
 package/opkg/Config.in  |  13 ++++
 package/opkg/opkg-build | 127 ++++++++++++++++++++++++++++++++++++++++
 package/opkg/opkg.mk    |  20 +++++++
 4 files changed, 161 insertions(+)
 create mode 100644 package/opkg/Config.in
 create mode 100755 package/opkg/opkg-build
 create mode 100644 package/opkg/opkg.mk

diff --git a/package/Config.in b/package/Config.in
index 5d6250cbe1..75d5c46bea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -599,6 +599,7 @@ endmenu
 
 menu "Package managers"
 source "package/ipkg/Config.in"
+source "package/opkg/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rpm/Config.in"
 endif
diff --git a/package/opkg/Config.in b/package/opkg/Config.in
new file mode 100644
index 0000000000..eb997a7d4b
--- /dev/null
+++ b/package/opkg/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_OPKG
+	bool "opkg"
+	help
+	  Opkg is a lightweight package management system, based on ipkg. It is
+	  written in C and resembles apt/dpkg in operation. It is intended for
+	  use on embedded Linux devices.
+	  Opkg is maintained, stable, robust and conservative in its memory
+	  usage, despite its buggy ipkg ancestry. As best it can, opkg
+	  maintains backwards compatibility with ipkg and conforms to a subset
+	  of debian's policy manual regarding control files.
+
+	  http://code.google.com/p/opkg/
+
diff --git a/package/opkg/opkg-build b/package/opkg/opkg-build
new file mode 100755
index 0000000000..7fd0d3fd28
--- /dev/null
+++ b/package/opkg/opkg-build
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+# opkg-build -- construct a .opk from a directory
+# Carl Worth <cworth@east.isi.edu>
+# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001
+set -e
+
+opkg_extract_value() {
+	sed -e "s/^[^:]*:[[:space:]]*//"
+}
+
+required_field() {
+	field=$1
+
+	value=`grep "^$field:" < $CONTROL/control | opkg_extract_value`
+	if [ -z "$value" ]; then
+		echo "opkg-build: Error: $CONTROL/control is missing field $field" ;
+		PKG_ERROR=1
+	fi
+	echo $value
+}
+
+pkg_appears_sane() {
+	local pkg_dir=$1
+
+	local owd=`pwd`
+	cd $pkg_dir
+
+	PKG_ERROR=0
+	if [ ! -f "$CONTROL/control" ]; then
+		echo "opkg-build: Error: Control file $pkg_dir/$CONTROL/control not found."
+		cd $owd
+		return 1
+	fi
+
+	pkg=`required_field Package`
+	version=`required_field Version`
+	arch=`required_field Architecture`
+	required_field Maintainer >/dev/null
+	required_field Description >/dev/null
+
+	if echo $pkg | grep '[^a-z0-9.+-]'; then
+		echo "opkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])"
+		PKG_ERROR=1;
+	fi
+
+	local bad_fields=`sed -ne 's/^\([^[:space:]][^:[:space:]]\+[[:space:]]\+\)[^:].*/\1/p' < $CONTROL/control | sed -e 's/\\n//'`
+	if [ -n "$bad_fields" ]; then
+		bad_fields=`echo $bad_fields`
+		echo "opkg-build: Error: The following fields in $CONTROL/control are missing a ':'"
+		echo "	$bad_fields"
+		echo "opkg-build: This may be due to a missing initial space for a multi-line field value"
+		PKG_ERROR=1
+	fi
+
+	for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
+		if [ -f $script -a ! -x $script ]; then
+			echo "opkg-build: Error: package script $script is not executable"
+			PKG_ERROR=1
+		fi
+	done
+
+	if [ -f $CONTROL/conffiles ]; then
+		for cf in `cat $CONTROL/conffiles`; do
+			if [ ! -f ./$cf ]; then
+				echo "opkg-build: Error: $CONTROL/conffiles mentions conffile $cf which does not exist"
+				PKG_ERROR=1
+			fi
+		done
+	fi
+
+	cd $owd
+	return $PKG_ERROR
+}
+
+###
+# opkg-build "main"
+###
+
+case $# in
+1)
+	dest_dir=.
+	;;
+2)
+	dest_dir=$2
+	;;
+*)
+	echo "Usage: opkg-build <pkg_directory> [<destination_directory>]" ;
+	exit 1 
+	;;
+esac
+
+pkg_dir=$1
+
+if [ ! -d $pkg_dir ]; then
+	echo "opkg-build: Error: Directory $pkg_dir does not exist"
+	exit 1
+fi
+
+# CONTROL is second so that it takes precedence
+CONTROL=
+[ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN
+[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL
+if [ -z "$CONTROL" ]; then
+	echo "opkg-build: Error: Directory $pkg_dir has no CONTROL subdirectory."
+	exit 1
+fi
+
+if ! pkg_appears_sane $pkg_dir; then
+	echo "Please fix the above errors and try again."
+	exit 1
+fi
+
+tmp_dir=$dest_dir/OPKG_BUILD.$$
+mkdir $tmp_dir
+
+tar -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL
+tar -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz .
+
+echo "2.0" > $tmp_dir/debian-binary
+
+pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk
+tar -C $tmp_dir -czf $pkg_file debian-binary data.tar.gz control.tar.gz
+rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
+rmdir $tmp_dir
+
+echo "Packaged contents of $pkg_dir into $pkg_file"
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
new file mode 100644
index 0000000000..9cfaa26c10
--- /dev/null
+++ b/package/opkg/opkg.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# opkg
+#
+#############################################################
+
+OPKG_VERSION = 0.1.8
+OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
+OPKG_SITE = http://opkg.googlecode.com/files
+OPKG_INSTALL_STAGING = YES
+OPKG_CONF_OPT = --disable-curl --disable-gpg
+
+# Ensure directory for lockfile exists
+define OPKG_CREATE_LOCKDIR
+	mkdir -p $(TARGET_DIR)/usr/lib/opkg
+endef
+
+OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
+
+$(eval $(call AUTOTARGETS))

From e4fba5865b19163108fbd78ffe037e069ce8c802 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 May 2012 08:46:28 +0200
Subject: [PATCH 2026/6849] binutils: fix build with external toolchains on
 avr32

Fixes http://autobuild.buildroot.org/results/7f0545a7c824bf0523ab3506db83f7f5c930d63d/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 0a5a948a9c..1c8a79d07d 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -8,8 +8,13 @@
 # If not, we do like other packages
 BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
 ifeq ($(BINUTILS_VERSION),)
+ifeq ($(BR2_avr32),y)
+# avr32 uses a special version
+BINUTILS_VERSION = 2.18-avr32-1.0.1
+else
 BINUTILS_VERSION = 2.21
 endif
+endif
 
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_SITE = $(BR2_GNU_MIRROR)/binutils

From 920544e02b7e050d0160574803167c1c0a36f1cf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 19 May 2012 08:55:47 +0200
Subject: [PATCH 2027/6849] xserver-xorg: fix build when Xtst isn't available

The optional DMX support (Distributed Multihead X) needs Xtst, which
may or may not be available in the buildroot config. DMX is unlikely
to be needed for a BR system, so simply disable it rather than
forcibly requiring Xtst.

Fixes http://autobuild.buildroot.org/results/df990ded6472de62132e3a089634fafe0e029107/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index df7ba9a9f0..29f7c81671 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -58,6 +58,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--disable-xnest --disable-xephyr --disable-xvfb \
+		--disable-dmx \
 		--with-builder-addr=buildroot@uclibc.org \
 		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
 		--with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var

From 0b99b75fb66b453746179eee8e2a9131de87e331 Mon Sep 17 00:00:00 2001
From: Dominik Faessler <faessler@was.ch>
Date: Mon, 14 May 2012 21:36:22 +0000
Subject: [PATCH 2028/6849] logsurfer: new package

[Peter: fix target installation, install man pages, AUTOTARGETS args]
Signed-off-by: Dominik Faessler <faessler@was.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/logsurfer/Config.in    |  7 +++++++
 package/logsurfer/logsurfer.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/logsurfer/Config.in
 create mode 100644 package/logsurfer/logsurfer.mk

diff --git a/package/Config.in b/package/Config.in
index 75d5c46bea..359ba4759d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -621,6 +621,7 @@ source "package/file/Config.in"
 source "package/inotify-tools/Config.in"
 source "package/lockfile-progs/Config.in"
 source "package/logrotate/Config.in"
+source "package/logsurfer/Config.in"
 source "package/screen/Config.in"
 source "package/sudo/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/logsurfer/Config.in b/package/logsurfer/Config.in
new file mode 100644
index 0000000000..27d18815cf
--- /dev/null
+++ b/package/logsurfer/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LOGSURFER
+	bool "logsurfer"
+	help
+	  Logsurfer is a program for monitoring system logs in real-time,
+	  and reporting on the occurrence of events.
+
+	  http://www.crypt.gen.nz/logsurfer/
diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk
new file mode 100644
index 0000000000..89f6bbd63f
--- /dev/null
+++ b/package/logsurfer/logsurfer.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# logsurfer
+#
+#############################################################
+
+LOGSURFER_VERSION = 1.8
+LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz
+LOGSURFER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION)
+
+define LOGSURFER_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/logsurfer \
+		$(TARGET_DIR)/usr/bin/logsurfer
+endef
+
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+
+define LOGSURFER_INSTALL_TARGET_MAN
+	$(INSTALL) -D -m 0644 $(@D)/man/logsurfer.1 \
+		$(TARGET_DIR)/usr/man/man1/logsurfer.1
+	$(INSTALL) -D -m 0644 $(@D)/man/logsurfer.conf.4 \
+		$(TARGET_DIR)/usr/man/man4/logsurfer.conf.4
+endef
+
+LOGSURFER_POST_INSTALL_TARGET_HOOKS += LOGSURFER_INSTALL_TARGET_MAN
+
+endif
+
+$(eval $(call AUTOTARGETS))

From 55547775aafdca5fced4e0d4f530ae3093b7209c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 19 May 2012 06:57:36 +0000
Subject: [PATCH 2029/6849] busybox: add 1.20.0 patches for find and volume_id

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.20.0/busybox-1.20.0-ext4.patch  | 73 +++++++++++++++++++
 .../busybox-1.20.0/busybox-1.20.0-find.patch  | 33 +++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch

diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch
new file mode 100644
index 0000000000..d54ccf817e
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch
@@ -0,0 +1,73 @@
+--- busybox-1.20.0/util-linux/volume_id/ext.c
++++ busybox-1.20.0-ext4/util-linux/volume_id/ext.c
+@@ -39,10 +39,50 @@ struct ext2_super_block {
+ 	uint8_t	volume_name[16];
+ } PACKED;
+ 
+-#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x00000004
+-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x00000008
+ #define EXT_SUPERBLOCK_OFFSET			0x400
+ 
++/* for s_flags */
++#define EXT2_FLAGS_TEST_FILESYS			0x0004
++
++/* for s_feature_compat */
++#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
++
++/* for s_feature_ro_compat */
++#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
++#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
++#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004
++#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE	0x0008
++#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
++
++/* for s_feature_incompat */
++#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
++#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004
++#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008
++#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
++#define EXT4_FEATURE_INCOMPAT_EXTENTS		0x0040 /* extents support */
++#define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
++#define EXT4_FEATURE_INCOMPAT_MMP		0x0100
++#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
++
++#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
++					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
++					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
++#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
++					 EXT2_FEATURE_INCOMPAT_META_BG)
++#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED	~EXT2_FEATURE_INCOMPAT_SUPP
++#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT2_FEATURE_RO_COMPAT_SUPP
++
++#define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
++					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
++					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
++#define EXT3_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
++					 EXT3_FEATURE_INCOMPAT_RECOVER| \
++					 EXT2_FEATURE_INCOMPAT_META_BG)
++#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED	~EXT3_FEATURE_INCOMPAT_SUPP
++#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT3_FEATURE_RO_COMPAT_SUPP
++
+ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
+ {
+ #define off ((uint64_t)0)
+@@ -66,11 +106,15 @@ int FAST_FUNC volume_id_probe_ext(struct
+ 	dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
+ 
+ #if ENABLE_FEATURE_BLKID_TYPE
+-	if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
++	if ((es->feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | EXT4_FEATURE_RO_COMPAT_DIR_NLINK))
++	 || (es->feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT))
++	) {
++		id->type = "ext4";
++	}
++	else if (es->feature_compat & cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
+ 		id->type = "ext3";
+ 	else
+ 		id->type = "ext2";
+ #endif
+-
+ 	return 0;
+ }
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch
new file mode 100644
index 0000000000..f913cda1bb
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch
@@ -0,0 +1,33 @@
+--- busybox-1.20.0/findutils/find.c
++++ busybox-1.20.0-find/findutils/find.c
+@@ -831,6 +831,11 @@ static action*** parse_params(char **arg
+ 	                        PARM_name      ,
+ 	                        PARM_iname     ,
+ 	IF_FEATURE_FIND_PATH(   PARM_path      ,)
++#if ENABLE_DESKTOP
++	/* -wholename is a synonym for -path */
++	/* We support it because Linux kernel's "make tags" uses it */
++	IF_FEATURE_FIND_PATH(   PARM_wholename ,)
++#endif
+ 	IF_FEATURE_FIND_PATH(   PARM_ipath     ,)
+ 	IF_FEATURE_FIND_REGEX(  PARM_regex     ,)
+ 	IF_FEATURE_FIND_TYPE(   PARM_type      ,)
+@@ -869,6 +874,9 @@ static action*** parse_params(char **arg
+ 	                         "-name\0"
+ 	                         "-iname\0"
+ 	IF_FEATURE_FIND_PATH(   "-path\0"   )
++#if ENABLE_DESKTOP
++	IF_FEATURE_FIND_PATH(   "-wholename\0")
++#endif
+ 	IF_FEATURE_FIND_PATH(   "-ipath\0"  )
+ 	IF_FEATURE_FIND_REGEX(  "-regex\0"  )
+ 	IF_FEATURE_FIND_TYPE(   "-type\0"   )
+@@ -1076,7 +1084,7 @@ static action*** parse_params(char **arg
+ 			ap->iname = (parm == PARM_iname);
+ 		}
+ #if ENABLE_FEATURE_FIND_PATH
+-		else if (parm == PARM_path || parm == PARM_ipath) {
++		else if (parm == PARM_path IF_DESKTOP(|| parm == PARM_wholename) || parm == PARM_ipath) {
+ 			action_path *ap;
+ 			dbg("%d", __LINE__);
+ 			ap = ALLOC_ACTION(path);

From 38b1ba3681416692c97689b01c9302877949c693 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@gmail.com>
Date: Fri, 18 May 2012 10:47:01 +0000
Subject: [PATCH 2030/6849] apply-patches.sh: add documentation

Signed-off-by: Ludovic Desroches <ludovic.desroches@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index f82be8643d..7a6c1fa986 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -4,6 +4,29 @@
 # -Erik
 #
 # (c) 2002 Erik Andersen <andersen@codepoet.org>
+#
+# Parameters:
+# - the build directory, optional, default value is '.'. The place where are
+# the package sources.
+# - the patch directory, optional, default '../kernel-patches'. The place
+# where are the scripts you want to apply.
+# - other parameters are the patch name patterns, optional, default value is
+# '*'. Pattern(s) describing the patch names you want to apply.
+#
+# The script will look recursively for patches from the patch directory. If a
+# file is named 'series' then only patches mentionned into it will be applied.
+# If not, the script will look for file names matching pattern(s). If the name
+# ends with '.tar.*', '.tbz2' or '.tgz', the file is considered as an archive
+# and will be uncompressed into a directory named
+# '.patches-name_of_the_archive-unpacked'. It's the turn of this directory to
+# be scanned with '*' as pattern. Remember that scanning is recursive. Other
+# files than series file and archives are considered as a patch.
+#
+# Once a patch is found, the script will try to apply it. If its name doesn't
+# end with '.gz', '.bz', '.bz2', '.zip', '.Z', '.diff*' or '.patch*', it will
+# be skipped. If necessary, the patch will be uncompressed before being
+# applied. The list of the patches applied is stored in '.applied_patches_list'
+# file in the build directory.
 
 # Set directories from arguments, or use defaults.
 builddir=${1-.}

From 761dc51bdb39963c0b99bb78ce9733762b42c5d7 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 10:11:30 +0000
Subject: [PATCH 2031/6849] omap-u-boot-utils: add new host package

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host                        |  1 +
 package/omap-u-boot-utils/Config.in.host      |  8 +++++++
 .../omap-u-boot-utils/omap-u-boot-utils.mk    | 21 +++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/omap-u-boot-utils/Config.in.host
 create mode 100644 package/omap-u-boot-utils/omap-u-boot-utils.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index 861b7367db..9fcfede00c 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,6 +1,7 @@
 menu "Host utilities"
 
 source "package/lpc3250loader/Config.in.host"
+source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
 source "package/sam-ba/Config.in.host"
 source "package/uboot-tools/Config.in.host"
diff --git a/package/omap-u-boot-utils/Config.in.host b/package/omap-u-boot-utils/Config.in.host
new file mode 100644
index 0000000000..63fbdf521c
--- /dev/null
+++ b/package/omap-u-boot-utils/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+	bool "host omap-u-boot-utils"
+	help
+	  U-Boot Utilities for Texas Instrument's OMAP platforms.
+	  This is a set of tools to control U-Boot from scripts, generate
+	  OMAP-specific signed image files and more.
+
+	  https://github.com/nmenon/omap-u-boot-utils
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
new file mode 100644
index 0000000000..e2da9a1bf6
--- /dev/null
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# omap-u-boot-utils
+#
+#############################################################
+
+OMAP_U_BOOT_UTILS_VERSION = 8aff852322
+OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils.git
+OMAP_U_BOOT_UTILS_SITE_METHOD = git
+
+define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS
+	for f in gpsign pserial tagger ucmd ukermit ; do \
+		install -m 755 -D $(@D)/$$f $(HOST_DIR)/usr/bin/$$f ; \
+	done
+endef
+
+$(eval $(call GENTARGETS,host))

From 721247949235d5750fb482cc8bfa791f4957d7be Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 10:11:31 +0000
Subject: [PATCH 2032/6849] u-boot: build signed image for OMAP processors

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 32 ++++++++++++++++++++++++++++++++
 boot/uboot/uboot.mk  | 25 +++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index f83cf4b510..afc2f917a0 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -99,6 +99,38 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 
 endchoice
 
+config BR2_TARGET_UBOOT_OMAP_IFT
+	depends on BR2_TARGET_UBOOT_FORMAT_BIN
+	depends on BR2_arm || BR2_armeb
+	select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
+	bool "produce a .ift signed image (OMAP)"
+	help
+	  Use gpsign to produce an image of u-boot.bin signed with
+	  a Configuration Header for booting on OMAP processors.
+	  This allows U-Boot to boot without the need for an
+	  intermediate bootloader (e.g. x-loader) if it is written
+	  on the first sector of the boot medium.
+	  This only works for some media, such as NAND. Check your
+	  chip documentation for details. You might also want to
+	  read the documentation of gpsign, the tool that generates
+	  the .ift image, at:
+	  https://github.com/nmenon/omap-u-boot-utils/blob/master/README
+
+if BR2_TARGET_UBOOT_OMAP_IFT
+
+config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG
+	string "gpsign Configuration Header config file"
+	help
+	  The Configuration Header (CH) config file defines the
+	  desired content of the CH for the signed image.
+	  It usually contains external RAM settings and
+	  possibly other external devices initialization.
+	  The omap-u-boot-utils software contains example
+	  configuration files for some boards:
+	  https://github.com/nmenon/omap-u-boot-utils/tree/master/configs
+
+endif
+
 menuconfig BR2_TARGET_UBOOT_NETWORK
 	bool "Custom Network Settings"
 	help
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 31190922f8..486773aa72 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -33,6 +33,7 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
 UBOOT_BIN          = u-boot.img
 else
 UBOOT_BIN          = u-boot.bin
+UBOOT_BIN_IFT      = $(UBOOT_BIN).ift
 endif
 
 UBOOT_ARCH=$(KERNEL_ARCH)
@@ -88,12 +89,36 @@ define UBOOT_BUILD_CMDS
 		$(UBOOT_MAKE_TARGET)
 endef
 
+define UBOOT_BUILD_OMAP_IFT
+	$(HOST_DIR)/usr/bin/gpsign -f $(@D)/u-boot.bin \
+		-c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
+endef
+
 define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 	$(if $(BR2_TARGET_UBOOT_SPL),
 		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
 endef
 
+define UBOOT_INSTALL_OMAP_IFT_IMAGE
+	cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
+endef
+
+ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
+# we NEED a config file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)
+$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
+endif
+ifeq ($(wildcard $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))),)
+$(error gpsign config file $(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG) not found. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
+endif
+endif
+UBOOT_DEPENDENCIES += host-omap-u-boot-utils
+UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
+endif
+
 $(eval $(call GENTARGETS))
 
 ifeq ($(BR2_TARGET_UBOOT),y)

From 0049aa83b91299abbf97b5d06d6c2772e8e6a4b5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:36:05 +0000
Subject: [PATCH 2033/6849] toolchain/gcc: bump snapshot version

Bump default snapshot gcc version to 4.8-20120429 so that it is newer
than our latest supported version (4.7.0 release).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 4bff8855b1..0c1243f4b7 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -45,7 +45,7 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 
 config BR2_GCC_SNAP_DATE
 	string "GCC snapshot date"
-	default "4.7-20110430"
+	default "4.8-20120429"
 	depends on BR2_GCC_VERSION_SNAP
 	help
 	  Enter snapshot date to use for gcc.

From 3137928f7cd8106013d04c531e42bbeaab7f22bc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:36:06 +0000
Subject: [PATCH 2034/6849] toolchain/gcc: block unsupported CPUs according to
 version

Block unsupported processors according to gcc version.
Also remove the comments since we now hide them according to this.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch   | 7 -------
 toolchain/gcc/Config.in | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 6eaa95195d..25ff7509b5 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -172,7 +172,6 @@ config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
-comment "cortex-A8/A9 needs gcc >= 4.4.x"
 config BR2_cortex_a8
 	bool "cortex-A8"
 config BR2_cortex_a9
@@ -361,7 +360,6 @@ config BR2_x86_core2
 	bool "core2"
 config BR2_x86_atom
 	bool "atom"
-comment "atom needs gcc >= 4.5.x"
 config BR2_x86_k6
 	bool "k6"
 config BR2_x86_k6_2
@@ -409,7 +407,6 @@ config BR2_x86_64_core2
 	bool "core2"
 config BR2_x86_64_atom
 	bool "atom"
-comment "atom needs gcc >= 4.5.x"
 endchoice
 
 choice
@@ -425,7 +422,6 @@ config BR2_sparc_cypress
 	bool "cypress"
 config BR2_sparc_v8
 	bool "v8"
-comment "LEON SPARC needs gcc = 4.4.x"
 config BR2_sparc_sparchfleon
 	bool "hfleon"
 config BR2_sparc_sparchfleonv8
@@ -549,13 +545,10 @@ config BR2_powerpc_8540
 	bool "8540 / e500v1"
 config BR2_powerpc_8548
 	bool "8548 / e500v2"
-comment "e300c2 needs gcc >= 4.4.x"
 config BR2_powerpc_e300c2
 	bool "e300c2"
-comment "e300c3 needs gcc >= 4.4.x"
 config BR2_powerpc_e300c3
 	bool "e300c3"
-comment "e500mc needs gcc >= 4.4.x"
 config BR2_powerpc_e500mc
 	bool "e500mc"
 endchoice
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 0c1243f4b7..eb4d5ea20a 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,11 +15,11 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_x86_64_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32
+		depends on !BR2_avr32 && !BR2_x86_atom && !BR2_x86_64_atom
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X

From b779b6bd948f96d20d6f12cc5591b436256177d4 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 11 May 2012 00:24:14 +0000
Subject: [PATCH 2035/6849] gpsd: Remove package version from the navcom patch

If the buildroot infrastructure finds a patch file that contains the
$PKG-$VERSION tuple in the filename, it will only apply this kind of
patches, ignoring the rest of the patches in the package directory.
As a result of which, the gpsd-fix-libgpsmm.patch did not apply
because the gpsd-2.95-navcom.patch satisfies the $PKG-$VERSION convention.
The buildroot policy (as discussed during the Buildroot Developer meeting)
is to remove the package version from the patch filename.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/{gpsd-2.95-navcom.patch => gpsd-navcom.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/gpsd/{gpsd-2.95-navcom.patch => gpsd-navcom.patch} (100%)

diff --git a/package/gpsd/gpsd-2.95-navcom.patch b/package/gpsd/gpsd-navcom.patch
similarity index 100%
rename from package/gpsd/gpsd-2.95-navcom.patch
rename to package/gpsd/gpsd-navcom.patch

From 8bde151e5c147bf84ed98f54512d50c81e1f1587 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 00:28:07 +0200
Subject: [PATCH 2036/6849] package: add webrtc-audio-processing library

Optional dependency to pulseaudio >= 2.0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                     |  1 +
 package/webrtc-audio-processing/Config.in             | 11 +++++++++++
 .../webrtc-audio-processing.mk                        | 10 ++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/webrtc-audio-processing/Config.in
 create mode 100644 package/webrtc-audio-processing/webrtc-audio-processing.mk

diff --git a/package/Config.in b/package/Config.in
index 359ba4759d..360f04fe8e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -288,6 +288,7 @@ source "package/portaudio/Config.in"
 source "package/speex/Config.in"
 source "package/taglib/Config.in"
 source "package/tremor/Config.in"
+source "package/webrtc-audio-processing/Config.in"
 endmenu
 
 menu "Compression and decompression"
diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in
new file mode 100644
index 0000000000..e33fc57dbb
--- /dev/null
+++ b/package/webrtc-audio-processing/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
+	bool "webrtc-audio-processing"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  AudioProcessing library based on Google's implementation of
+	  WebRTC.
+
+	  http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
+
+comment "webrtc-audio-processing requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk
new file mode 100644
index 0000000000..22ade1a774
--- /dev/null
+++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk
@@ -0,0 +1,10 @@
+WEBRTC_AUDIO_PROCESSING_VERSION = 0.1
+WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz
+WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
+WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES
+
+ifeq ($(BR2_SOFT_FLOAT),y)
+WEBRTC_AUDIO_PROCESSING_CONF_OPT += --with-ns-mode=fixed
+endif
+
+$(eval $(call AUTOTARGETS))

From fd4ee788f8a0b55df50bd691cd3ffde65c1b9b05 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 02:03:55 +0200
Subject: [PATCH 2037/6849] pulseaudio: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index eefc497f72..bc5a0ae4ba 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PULSEAUDIO_VERSION = 1.1
+PULSEAUDIO_VERSION = 2.0
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_CONF_OPT = \
@@ -27,7 +27,8 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_UDEV),udev) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
-	$(if $(BR2_PACKAGE_ORC),orc)
+	$(if $(BR2_PACKAGE_ORC),orc) \
+	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing)
 
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)

From 7f2ce003bd7475939d86da07adf51a5aedbadf30 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 02:06:03 +0200
Subject: [PATCH 2038/6849] pulseaudio: don't build man pages if not needed

No sense in building them if they are thrown away by target-finalize anyway.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index bc5a0ae4ba..a5534da223 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -11,7 +11,8 @@ PULSEAUDIO_CONF_OPT = \
 	--localstatedir=/var \
 	--disable-default-build-tests \
 	--disable-legacy-runtime-dir \
-	--disable-legacy-database-entry-format
+	--disable-legacy-database-entry-format \
+	$(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages)
 
 PULSEAUDIO_DEPENDENCIES = \
 	host-pkg-config libtool json-c libsndfile speex host-intltool \

From df89af836c1b8c0975917e16e6b3bfcf2fa9a29f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 12:52:49 +0200
Subject: [PATCH 2039/6849] systemd: install into staging

systemd provides a number of libraries, so install into staging.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/systemd/systemd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 717bdccf4c..696a3a721d 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -6,6 +6,7 @@
 SYSTEMD_VERSION = 44
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
 SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
+SYSTEMD_INSTALL_STAGING = YES
 SYSTEMD_DEPENDENCIES = \
 	host-intltool \
 	libcap \

From c27a0b9d7fdefd9e183abf3a8d3e31cdb3b0ec37 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 12:53:15 +0200
Subject: [PATCH 2040/6849] pulseaudio: add optional systemd support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index a5534da223..175adfa4c1 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -29,7 +29,8 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_ORC),orc) \
-	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing)
+	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
+	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)

From a89e0e8721a19b907d39afe75bdf3e9222a40976 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 19:50:17 +0200
Subject: [PATCH 2041/6849] cifs-utils: needs MMU

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in
index 43319865f9..b433850a18 100644
--- a/package/cifs-utils/Config.in
+++ b/package/cifs-utils/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_CIFS_UTILS
 	bool "cifs-utils"
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  The in-kernel CIFS filesystem is generally the preferred
 	  method for mounting SMB/CIFS shares on Linux. The in-kernel

From 8b3f94f9b0a600a103aee739bb274e80298c6151 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 May 2012 19:52:35 +0200
Subject: [PATCH 2042/6849] iperf: needs MMU

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iperf/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c4c25b359d..c284bfd1be 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_IPERF
 	bool "iperf"
 	depends on BR2_INSTALL_LIBSTDCPP
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  Internet Protocol bandwidth measuring tool for measuring
 	  TCP/UDP performance.

From 7a41ddd3fb670f5c59a4e8db605874951c56d756 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 20 May 2012 03:34:25 +0000
Subject: [PATCH 2043/6849] busybox: add 1.20.0 patch for mdev and update
 buildsys patch

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.20.0-buildsys.patch             |  9 +++
 .../busybox-1.20.0/busybox-1.20.0-mdev.patch  | 72 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch

diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
index b9d2a5e835..ae9ea5c618 100644
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
@@ -1,5 +1,14 @@
 --- busybox-1.20.0/archival/libarchive/Kbuild.src
 +++ busybox-1.20.0-buildsys/archival/libarchive/Kbuild.src
+@@ -45,7 +45,7 @@ lib-$(CONFIG_UNXZ)
+ lib-$(CONFIG_CPIO)                      += get_header_cpio.o
+ lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
+ lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
+-lib-$(CONFIG_GUNZIP)                    += decompress_gunzip.o
++lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+ lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
+ lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+ lib-$(CONFIG_TAR)                       += get_header_tar.o
 @@ -60,7 +60,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_GZ)
  lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
  lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch
new file mode 100644
index 0000000000..8a36c53c46
--- /dev/null
+++ b/package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch
@@ -0,0 +1,72 @@
+--- busybox-1.20.0/util-linux/mdev.c
++++ busybox-1.20.0-mdev/util-linux/mdev.c
+@@ -661,37 +661,45 @@ static int FAST_FUNC dirAction(const cha
+ static void load_firmware(const char *firmware, const char *sysfs_path)
+ {
+ 	int cnt;
+-	int firmware_fd, loading_fd, data_fd;
++	int firmware_fd, loading_fd;
+ 
+ 	/* check for /lib/firmware/$FIRMWARE */
+ 	xchdir("/lib/firmware");
+-	firmware_fd = xopen(firmware, O_RDONLY);
+-
+-	/* in case we goto out ... */
+-	data_fd = -1;
++	firmware_fd = open(firmware, O_RDONLY); /* can fail */
+ 
+ 	/* check for /sys/$DEVPATH/loading ... give 30 seconds to appear */
+ 	xchdir(sysfs_path);
+ 	for (cnt = 0; cnt < 30; ++cnt) {
+ 		loading_fd = open("loading", O_WRONLY);
+-		if (loading_fd != -1)
++		if (loading_fd >= 0)
+ 			goto loading;
+ 		sleep(1);
+ 	}
+ 	goto out;
+ 
+  loading:
+-	/* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
+-	if (full_write(loading_fd, "1", 1) != 1)
+-		goto out;
+-
+-	/* load firmware into /sys/$DEVPATH/data */
+-	data_fd = open("data", O_WRONLY);
+-	if (data_fd == -1)
+-		goto out;
+-	cnt = bb_copyfd_eof(firmware_fd, data_fd);
++	cnt = 0;
++	if (firmware_fd >= 0) {
++		int data_fd;
++
++		/* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
++		if (full_write(loading_fd, "1", 1) != 1)
++			goto out;
++
++		/* load firmware into /sys/$DEVPATH/data */
++		data_fd = open("data", O_WRONLY);
++		if (data_fd < 0)
++			goto out;
++		cnt = bb_copyfd_eof(firmware_fd, data_fd);
++		if (ENABLE_FEATURE_CLEAN_UP)
++			close(data_fd);
++	}
+ 
+-	/* tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading" */
++	/* Tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading"
++	 * Note: we emit -1 if firmware file wasn't found.
++	 * There are cases when otherwise kernel would wait for minutes
++	 * before timing out.
++	 */
+ 	if (cnt > 0)
+ 		full_write(loading_fd, "0", 1);
+ 	else
+@@ -701,7 +709,6 @@ static void load_firmware(const char *fi
+ 	if (ENABLE_FEATURE_CLEAN_UP) {
+ 		close(firmware_fd);
+ 		close(loading_fd);
+-		close(data_fd);
+ 	}
+ }
+ 

From 347cfd60692e74fd89343383d15d1001c1a871e9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 20 May 2012 03:35:47 +0000
Subject: [PATCH 2044/6849] sudo: bump to version 1.8.5p1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo-1.8.4p4-utmpx.patch | 19 -------------------
 package/sudo/sudo.mk                  |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 package/sudo/sudo-1.8.4p4-utmpx.patch

diff --git a/package/sudo/sudo-1.8.4p4-utmpx.patch b/package/sudo/sudo-1.8.4p4-utmpx.patch
deleted file mode 100644
index 4e9740608b..0000000000
--- a/package/sudo/sudo-1.8.4p4-utmpx.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix incomplete setutxent/endutxent defines for when there's no utmpx
-Upstream bug #551
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura sudo-1.8.4p4.orig/src/utmp.c sudo-1.8.4p4/src/utmp.c
---- sudo-1.8.4p4.orig/src/utmp.c	2012-03-30 07:10:38.381706315 -0300
-+++ sudo-1.8.4p4/src/utmp.c	2012-03-30 07:10:52.605802501 -0300
-@@ -63,8 +63,8 @@
- #if !defined(HAVE_GETUTXID) && defined(HAVE_GETUTID)
- # define getutxline(u)	getutline(u)
- # define pututxline(u)	pututline(u)
--# define setutxent	setutent(u)
--# define endutxent	endutent(u)
-+# define setutxent(u)	setutent(u)
-+# define endutxent(u)	endutent(u)
- #endif /* !HAVE_GETUTXID && HAVE_GETUTID */
- 
- #ifdef HAVE_GETUTXID
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 71d7a20a71..3629ad1888 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.4p4
+SUDO_VERSION = 1.8.5p1
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 SUDO_CONF_OPT = \
 		--without-lecture \

From b20c77321fa87f880ead2f27ecf19fd7c4f436da Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 20 May 2012 03:35:48 +0000
Subject: [PATCH 2045/6849] quagga: bump to version 0.99.21

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/Config.in |  5 +++
 package/quagga/quagga.mk | 89 ++++++++--------------------------------
 2 files changed, 23 insertions(+), 71 deletions(-)

diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 9ca2f980ec..5a01863ab7 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -22,6 +22,11 @@ config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
 	  You'll want this enabled if zebra and the protocol daemon(s) run
 	  on different hosts.
 
+config BR2_PACKAGE_QUAGGA_BABELD
+	bool "BABEL protocol"
+	help
+	  Build babeld daemon.
+
 config BR2_PACKAGE_QUAGGA_BGPD
 	bool "BPGv4+ protocol"
 	help
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 1073852837..349e0032c3 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,86 +4,33 @@
 #
 #############################################################
 
-QUAGGA_VERSION = 0.99.20.1
-QUAGGA_SITE = http://www.quagga.net/download
+QUAGGA_VERSION = 0.99.21
+QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk
 QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink
 
-ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y)
-QUAGGA_CONF_OPT+=--enable-zebra
-else
-QUAGGA_CONF_OPT+=--disable-zebra
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_BGPD),y)
-QUAGGA_CONF_OPT+=--enable-bgpd
-else
-QUAGGA_CONF_OPT+=--disable-bgpd
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y)
-QUAGGA_CONF_OPT+=--enable-ripd
-else
-QUAGGA_CONF_OPT+=--disable-ripd
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_RIPNGD),y)
-QUAGGA_CONF_OPT+=--enable-ripngd
-else
-QUAGGA_CONF_OPT+=--disable-ripngd
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y)
-QUAGGA_CONF_OPT+=--enable-ospfd
-else
-QUAGGA_CONF_OPT+=--disable-ospfd
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_OSPF6D),y)
-QUAGGA_CONF_OPT+=--enable-ospf6d
-else
-QUAGGA_CONF_OPT+=--disable-ospf6d
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),y)
-QUAGGA_CONF_OPT+=--enable-watchquagga
-else
-QUAGGA_CONF_OPT+=--disable-watchquagga
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_ISISD),y)
-QUAGGA_CONF_OPT+=--enable-isisd
-else
-QUAGGA_CONF_OPT+=--disable-isisd
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),y)
-QUAGGA_CONF_OPT+=--enable-bgp-announce
-else
-QUAGGA_CONF_OPT+=--disable-bgp-announce
-endif
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BABELD),--enable-babeld,--disable-babeld)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra)
+QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa)
 
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
-QUAGGA_CONF_OPT+=--enable-snmp
-QUAGGA_DEPENDENCIES+=netsnmp
+QUAGGA_CONF_OPT += --enable-snmp
+QUAGGA_DEPENDENCIES += netsnmp
 # SNMP support tries -lcrypto by default, disable it if we ain't got openssl
 ifneq ($(BR2_PACKAGE_OPENSSL),y)
-QUAGGA_CONF_OPT+=--without-crypto
-endif
-else
-QUAGGA_CONF_OPT+=--disable-snmp
+QUAGGA_CONF_OPT +=--without-crypto
 endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),y)
-QUAGGA_CONF_OPT+=--enable-tcp-zebra
-else
-QUAGGA_CONF_OPT+=--disable-tcp-zebra
-endif
-
-ifeq ($(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),y)
-QUAGGA_CONF_OPT+=--enable-opaque-lsa
 else
-QUAGGA_CONF_OPT+=--disable-opaque-lsa
+QUAGGA_CONF_OPT +=--disable-snmp
 endif
 
 $(eval $(call AUTOTARGETS))

From 40de828d3cbf767b4e272eef4eafb0b320bba283 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 21 May 2012 00:04:16 +0200
Subject: [PATCH 2046/6849] connmann: fix build on uClibc without backtrace
 support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../connman/connman-uclibc-backtrace.patch    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/connman/connman-uclibc-backtrace.patch

diff --git a/package/connman/connman-uclibc-backtrace.patch b/package/connman/connman-uclibc-backtrace.patch
new file mode 100644
index 0000000000..4b806c6dd3
--- /dev/null
+++ b/package/connman/connman-uclibc-backtrace.patch
@@ -0,0 +1,44 @@
+[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE
+
+Backtrace support is only used for logging on signal errors, which
+isn't really critical, so simply remove backtrace info if not
+available in uClibc.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/log.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: connman-0.78/src/log.c
+===================================================================
+--- connman-0.78.orig/src/log.c
++++ connman-0.78/src/log.c
+@@ -30,7 +30,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
++#include <features.h>
++/* backtrace support is optional on uClibc */
++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
++#define HAVE_BACKTRACE
+ #include <execinfo.h>
++#endif
+ #include <dlfcn.h>
+ 
+ #include "connman.h"
+@@ -112,6 +117,7 @@
+ 
+ static void print_backtrace(unsigned int offset)
+ {
++#ifdef HAVE_BACKTRACE
+ 	void *frames[99];
+ 	size_t n_ptrs;
+ 	unsigned int i;
+@@ -210,6 +216,7 @@
+ 
+ 	close(outfd[1]);
+ 	close(infd[0]);
++#endif /* HAVE_BACKTRACE */
+ }
+ 
+ static void signal_handler(int signo)

From 96b109ad2a4ea0a4575526f0d0353d916b5122dd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 21 May 2012 00:07:42 +0200
Subject: [PATCH 2047/6849] connman: tweak compiler version dependencies

uClibc 0.9.33+ has resolver support, so we don't need to depend on a
snapshot uClibc version any more. We're also using 0.9.33 for ctng, so
we can just disallow the old internal uClibc versions instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 2801b87b05..118ad91ba5 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_IPTABLES
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc
+	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
 	  managing internet connections within embedded devices running
@@ -44,4 +44,4 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 endif # BR2_PACKAGE_CONNMAN
 
 comment "connman needs a toolchain with resolver support"
-	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc)
+	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32

From bfba6613a261ccd91961361b6c0f1962572226fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 21 May 2012 00:21:03 +0200
Subject: [PATCH 2048/6849] connman: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in  | 1 +
 package/connman/connman.mk | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 118ad91ba5..3373ec1aa8 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_IPTABLES
+	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 6b9bbe67e1..0aa7ec7b61 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,9 +4,9 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 0.78
-CONNMAN_SITE = git://git.kernel.org/pub/scm/network/connman/connman.git
-CONNMAN_DEPENDENCIES = libglib2 dbus iptables
+CONNMAN_VERSION = 1.0
+CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
+CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES
 CONNMAN_CONF_OPT += --localstatedir=/var \
 	$(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads)		\
@@ -17,9 +17,6 @@ CONNMAN_CONF_OPT += --localstatedir=/var \
 	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback)	\
 	$(if $(BR2_PACKAGE_CONNMAN_NTPD),--enable-ntpd,--disable-ntpd)
 
-# as long as sources are obtained from git, we need to generate the autofoo stuff
-CONNMAN_AUTORECONF = YES
-
 define CONNMAN_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
 endef

From 4544589e7c58ff9532e415871997c9b7549a021b Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 20 May 2012 22:29:05 +0000
Subject: [PATCH 2049/6849] e2fsprogs: bump to 1.42.3

remove e2fsprogs-add-missing-dep-of-tst_uuid-o.patch as
the changes are already upstream

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...fsprogs-add-missing-dep-of-tst_uuid-o.patch | 18 ------------------
 package/e2fsprogs/e2fsprogs.mk                 |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch

diff --git a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
deleted file mode 100644
index 3a60e89461..0000000000
--- a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add missing dependency of tst_uuid.o on uuid.h
-
-The missing dependency used to break parallel builds.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
-diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
---- e2fsprogs.orig//lib/uuid/Makefile.in	2010-06-14 05:07:36.000000000 +0200
-+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in	2011-07-18 13:44:58.000000000 +0200
-@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
- $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
- 	cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
- 
--tst_uuid.o: $(srcdir)/tst_uuid.c
-+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
- 	$(E) "	CC $@"
- 	$(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
- 
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5f87b40236..db666356a4 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42.2
+E2FSPROGS_VERSION = 1.42.3
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \

From 360f0e40f0725bb1b195737a3f7b0b56ba3087b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 May 2012 01:14:59 +0000
Subject: [PATCH 2050/6849] sqlite: bump to version 3.7.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 2065ce12b5..165b99167e 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071100
+SQLITE_VERSION = 3071200
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From aeb9350cfbd2f4675f0d095394660cc0c2cc0d7b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 May 2012 01:17:54 +0000
Subject: [PATCH 2051/6849] php: security bump to version 5.3.13 and enhance

Bump php to version 5.3.13 to solve multiple CVEs.
The 5.2 series is no longer maintained.

The PCRE and SPL extensions are no longer optional.
Reflection is no longer optional either.

Ncurses was spun out to PECL.

Add a ton of new extensions and give more granular options on others
(like the libxml2-based ones).

The FastCGI option no longer exists, it's always on as long as CGI is.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/Config.ext                        | 355 +++++++++++++-----
 package/php/Config.in                         |  32 +-
 ..._GMP_BITS_PER_MP_LIMB-is-not-defined.patch |  30 --
 package/php/php-no-iconv-search.patch         |  21 ++
 package/php/php.mk                            | 199 +++++-----
 5 files changed, 400 insertions(+), 237 deletions(-)
 delete mode 100644 package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch
 create mode 100644 package/php/php-no-iconv-search.patch

diff --git a/package/php/Config.ext b/package/php/Config.ext
index bd630eeb60..fa73bb4de0 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -1,28 +1,21 @@
-menu "PHP Extensions"
+menu "Extensions"
 
-config BR2_PACKAGE_PHP_CONFIG
-	string "PHP configuration file to use"
-	default "$(PHP_DIR)/php.ini-dist"
-	help
-	  If you want to use a different php.ini file define it here.
-	  Otherwise it'll just copy the default php.ini-dist from PHP.
-
-config BR2_PACKAGE_PHP_EXT_SOCKETS
-	bool "socket"
+config BR2_PACKAGE_PHP_EXT_CALENDAR
+	bool "Calendar"
 	help
-	  Sockets support
+	  Calendar and event support
 
-config BR2_PACKAGE_PHP_EXT_POSIX
-	bool "posix"
-	default y
+config BR2_PACKAGE_PHP_EXT_FILEINFO
+	bool "Fileinfo"
 	help
-	  POSIX support
+	  File Information support
 
-config BR2_PACKAGE_PHP_EXT_SPL
-	bool "SPL"
-	default y
+config BR2_PACKAGE_PHP_EXT_READLINE
+	bool "Readline"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
-	  Standard PHP library support
+	  Readline support
 
 config BR2_PACKAGE_PHP_EXT_SESSION
 	bool "Session"
@@ -30,156 +23,320 @@ config BR2_PACKAGE_PHP_EXT_SESSION
 	help
 	  Session support
 
+comment "Compression extensions"
+
+config BR2_PACKAGE_PHP_EXT_BZIP2
+	bool "bzip2"
+	select BR2_PACKAGE_BZIP2
+	help
+	  bzip2 read/write support
+
+config BR2_PACKAGE_PHP_EXT_ZIP
+	bool "zip"
+	select BR2_PACKAGE_ZLIB
+	help
+	  Zip read/write support
+
+config BR2_PACKAGE_PHP_EXT_ZLIB
+	bool "zlib"
+	select BR2_PACKAGE_ZLIB
+	default y
+	help
+	  zlib support
+
+comment "Cryptography extensions"
+
+config BR2_PACKAGE_PHP_EXT_HASH
+	bool "hash"
+	help
+	  HASH message digest framework
+
 config BR2_PACKAGE_PHP_EXT_OPENSSL
 	bool "openssl"
 	select BR2_PACKAGE_OPENSSL
 	help
 	  openssl support
 
-config BR2_PACKAGE_PHP_EXT_LIBXML2
-	bool "xml2"
-	select BR2_PACKAGE_LIBXML2
+comment "Database extensions"
+
+config BR2_PACKAGE_PHP_EXT_DBA
+	bool "DBA"
 	help
-	  libxml2 support
+	  Database Abstraction Layer
 
-config BR2_PACKAGE_PHP_EXT_SIMPLEXML
-	bool "simplexml"
-	select BR2_PACKAGE_PHP_EXT_LIBXML2
+if BR2_PACKAGE_PHP_EXT_DBA
+
+config BR2_PACKAGE_PHP_EXT_DBA_CDB
+	bool "cdb"
 	help
-	  SimpleXML support
+	  CDB handler
 
-config BR2_PACKAGE_PHP_EXT_ZLIB
-        bool "zlib"
-        select BR2_PACKAGE_ZLIB
-        default y
-        help
-          zlib support
+config BR2_PACKAGE_PHP_EXT_DBA_DB4
+	bool "db4/5"
+	select BR2_PACKAGE_BERKELEYDB
+	help
+	  BerkeleyDB version 4/5 handler
 
-config BR2_PACKAGE_PHP_EXT_EXIF
-	bool "EXIF"
+config BR2_PACKAGE_PHP_EXT_DBA_FLAT
+	bool "flat"
+	default y
 	help
-	  EXIF support
+	  Flat file handler
 
-config BR2_PACKAGE_PHP_EXT_FTP
-	bool "FTP"
+config BR2_PACKAGE_PHP_EXT_DBA_INI
+	bool "ini"
+	default y
+	help
+	  INI file handler
+
+endif
+
+config BR2_PACKAGE_PHP_EXT_SQLITE
+	bool "SQLite"
+	help
+	  Legacy SQLite2 support
+
+config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
+	bool "sqlite UTF8 support"
+	depends on BR2_PACKAGE_PHP_EXT_SQLITE
+	help
+	  UTF8 support for sqlite
+
+config BR2_PACKAGE_PHP_EXT_MYSQL
+	bool "Mysql"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_MYSQL_CLIENT
+	help
+	  MySQL support
+
+config BR2_PACKAGE_PHP_EXT_MYSQLI
+	bool "Mysqli"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_PHP_EXT_MYSQL
+	help
+	  MySQL Improved extension support
+
+config BR2_PACKAGE_PHP_EXT_PDO
+	bool "PDO"
+	help
+	  PHP Data Objects support
+
+if BR2_PACKAGE_PHP_EXT_PDO
+
+config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
+	bool "MySQL"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_MYSQL_CLIENT
+	help
+	  PDO driver for MySQL
+
+comment "MySQL drivers require a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
+	bool "SQLite3"
+	select BR2_PACKAGE_SQLITE
 	help
-	  FTP Support
+	  SQLite3 driver for PDO
+
+endif
+
+comment "Human language and character encoding support"
 
 config BR2_PACKAGE_PHP_EXT_GETTEXT
-	bool "gettext"
+	bool "Gettext"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_USE_WCHAR
 	help
-	  gettext support
+	  Gettext support
 
-comment "gettext support requires a toolchain with WCHAR support"
+comment "Gettext support requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
 
+config BR2_PACKAGE_PHP_EXT_ICONV
+	bool "iconv"
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  iconv character set conversion support
+
+config BR2_PACKAGE_PHP_EXT_INTL
+	bool "intl"
+	select BR2_PACKAGE_ICU
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	help
+	  Internationalization support
+
+comment "intl support requires a toolchain with C++ and WCHAR support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+
+comment "Image processing"
+
+config BR2_PACKAGE_PHP_EXT_EXIF
+	bool "EXIF"
+	help
+	  EXIF support
+
+comment "Mathematical extensions"
+
+config BR2_PACKAGE_PHP_EXT_BCMATH
+	bool "BC math"
+	help
+	  BCMath arbitrary precision mathematics support
+
 config BR2_PACKAGE_PHP_EXT_GMP
-	bool "gmp"
+	bool "GMP"
 	select BR2_PACKAGE_GMP
 	help
-	  GMP support
+	  GNU Multiple Precision support
+
+comment "Other basic extensions"
 
 config BR2_PACKAGE_PHP_EXT_JSON
 	bool "JSON"
 	help
 	  JavaScript Object Serialization support
 
-config BR2_PACKAGE_PHP_EXT_READLINE
-	bool "readline"
-	depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
+config BR2_PACKAGE_PHP_EXT_TOKENIZER
+	bool "Tokenizer"
+	help
+	  Tokenizer functions support
+
+comment "Other services"
+
+config BR2_PACKAGE_PHP_EXT_CURL
+	bool "cURL"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  cURL for URL streams
+
+config BR2_PACKAGE_PHP_EXT_FTP
+	bool "FTP"
 	help
-	  readline support
+	  FTP support
 
-config BR2_PACKAGE_PHP_EXT_NCURSES
-	bool "ncurses"
-	depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
+config BR2_PACKAGE_PHP_EXT_SNMP
+	bool "SNMP"
+	select BR2_PACKAGE_NETSNMP
 	help
-	  ncurses support
+	  SNMP support
 
-config BR2_PACKAGE_PHP_EXT_PCRE
-	bool "PCRE"
+config BR2_PACKAGE_PHP_EXT_SOCKETS
+	bool "sockets"
 	help
-	  Perl Compatible Regular Expressions support
+	  Sockets support
+
+comment "Process Control"
 
 config BR2_PACKAGE_PHP_EXT_PCNTL
 	bool "PCNTL"
 	help
-	  Process Control Support
+	  Process control support
+
+config BR2_PACKAGE_PHP_EXT_POSIX
+	bool "Posix"
+	default y
+	help
+	  POSIX.1 (IEEE 1003.1) function support
+
+config BR2_PACKAGE_PHP_EXT_SHMOP
+	bool "shmop"
+	help
+	  Shared memory support
 
 config BR2_PACKAGE_PHP_EXT_SYSVMSG
-	bool "sysvmsg - System V Message queue"
+	bool "sysvmsg"
 	help
-	  System V Message queue support
+	  System V message queue support
 
 config BR2_PACKAGE_PHP_EXT_SYSVSEM
-	bool "sysvsem - System V Semaphores"
+	bool "sysvsem"
 	help
-	  System V Sempahore support
+	  System V semaphore support
 
 config BR2_PACKAGE_PHP_EXT_SYSVSHM
-	bool "sysvshm - System V Shared memory"
+	bool "sysvshm"
 	help
-	  System V Shared memory support
+	  System V shared memory support
 
-config BR2_PACKAGE_PHP_EXT_ZIP
-	bool "zip"
-	select BR2_PACKAGE_ZLIB
+comment "Variable and Type related"
+
+config BR2_PACKAGE_PHP_EXT_CTYPE
+	bool "Ctype"
 	help
-	  Zip read/write support
+	  Character type checking support
 
 config BR2_PACKAGE_PHP_EXT_FILTER
-	bool "filter"
-	select BR2_PACKAGE_PHP_EXT_PCRE
+	bool "Filter"
 	help
 	  Input filter support
 
-config BR2_PACKAGE_PHP_EXT_CALENDAR
-	bool "calendar"
+comment "Web services"
+
+config BR2_PACKAGE_PHP_EXT_SOAP
+	bool "SOAP"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  Calendar and event support
+	  SOAP support
 
-comment "Database extensions"
+config BR2_PACKAGE_PHP_EXT_XMLRPC
+	bool "XML-RPC"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  XML-RPC support
 
-config BR2_PACKAGE_PHP_EXT_SQLITE
-	bool "SQLite"
+comment "XML manipulation"
+
+config BR2_PACKAGE_PHP_EXT_DOM
+	bool "DOM"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  Legacy SQLite2 support
+	  Document Object Model support
 
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
-	bool "sqlite UTF8 support"
-	depends on BR2_PACKAGE_PHP_EXT_SQLITE
+config BR2_PACKAGE_PHP_EXT_LIBXML2
+	bool "libxml"
+	select BR2_PACKAGE_LIBXML2
+	help
+	  libxml2 support
+
+config BR2_PACKAGE_PHP_EXT_SIMPLEXML
+	bool "SimpleXML"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  UTF8 Support for sqlite
+	  SimpleXML support
 
-config BR2_PACKAGE_PHP_EXT_PDO
-	bool "PDO"
+config BR2_PACKAGE_PHP_EXT_WDDX
+	bool "WDDX"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  PHP Data Objects support
+	  WDDX support
 
-config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
-	bool "PDO_SQLite"
-	depends on BR2_PACKAGE_PHP_EXT_PDO
+config BR2_PACKAGE_PHP_EXT_XML
+	bool "XML Parser"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  SQLite driver for PDO
+	  XML Parser support
 
-config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL
-	bool "PDO_SQLite external"
-	depends on BR2_PACKAGE_PHP_EXT_PDO_SQLITE
-	select BR2_PACKAGE_SQLITE
+config BR2_PACKAGE_PHP_EXT_XMLREADER
+	bool "XMLReader"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  Use external sqlite3 library
+	  XMLReader support
 
-config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
-	bool "PDO_MySQL"
-	depends on BR2_PACKAGE_PHP_EXT_PDO
-	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_MYSQL_CLIENT
+config BR2_PACKAGE_PHP_EXT_XMLWRITER
+	bool "XMLWriter"
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
-	  PDO driver for MySQL
+	  XMLWriter support
 
-comment "PDO_MySQL requires a toolchain with C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_PHP_EXT_PDO
+config BR2_PACKAGE_PHP_EXT_XSL
+	bool "XSL"
+	select BR2_PACKAGE_PHP_EXT_DOM
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
+	select BR2_PACKAGE_LIBXSLT
+	help
+	  XSL transformation support
 
 endmenu
diff --git a/package/php/Config.in b/package/php/Config.in
index 23d86e48e7..c8c100cbdf 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -9,6 +9,8 @@ config BR2_PACKAGE_PHP
 
 if BR2_PACKAGE_PHP
 
+source "package/php/Config.ext"
+
 config BR2_PACKAGE_PHP_CLI
        bool
 
@@ -16,38 +18,30 @@ config BR2_PACKAGE_PHP_CGI
        bool
 
 choice
-        prompt "PHP interface"
+        prompt "Interface"
         default BR2_PACKAGE_PHP_SAPI_CGI
         help
           Select the PHP interface(s).
 
+config BR2_PACKAGE_PHP_SAPI_CGI
+	bool "CGI"
+	select BR2_PACKAGE_PHP_CGI
+	help
+	  Common Gateway Interface
+
 config BR2_PACKAGE_PHP_SAPI_CLI
-        bool "cli interface"
+        bool "CLI"
 	select BR2_PACKAGE_PHP_CLI
         help
-          Command line interface for PHP.
-
-config BR2_PACKAGE_PHP_SAPI_CGI
-        bool "cgi interface"
-        select BR2_PACKAGE_PHP_CGI
-        help
-          CGI interface for PHP.
+          Command Line Interface
 
 config BR2_PACKAGE_PHP_SAPI_CLI_CGI
-        bool "cli and cgi interfaces"
+        bool "CGI and CLI"
 	select BR2_PACKAGE_PHP_CLI
 	select BR2_PACKAGE_PHP_CGI
 	help
-	  Command line and CGI interfaces for PHP.
+	  Command line and Common gateway interfaces
 
 endchoice
 
-config BR2_PACKAGE_PHP_FASTCGI
-        bool "fastcgi"
-        depends on BR2_PACKAGE_PHP_CGI
-        default y
-        help
-          fast cgi interface for php
-
-source "package/php/Config.ext"
 endif
diff --git a/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch b/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch
deleted file mode 100644
index 221b3c00e5..0000000000
--- a/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e814fcac0599dbaae50ede1f9f78e20941e27877 Mon Sep 17 00:00:00 2001
-From: pajoye <pajoye@c90b9560-bf6c-de11-be94-00142212c4b1>
-Date: Tue, 23 Feb 2010 11:07:39 +0000
-Subject: [PATCH] - fix build when __GMP_BITS_PER_MP_LIMB is not defined but GMP_LIMB_BITS (no trace of this change in gmp's changelog...)
-
-git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_3@295402 c90b9560-bf6c-de11-be94-00142212c4b1
----
- ext/gmp/gmp.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
-index a54ffe9..f53dcd6 100644
---- a/ext/gmp/gmp.c
-+++ b/ext/gmp/gmp.c
-@@ -1374,8 +1374,11 @@ ZEND_FUNCTION(gmp_random)
- 
- 		GMPG(rand_initialized) = 1;
- 	}
-+#ifdef GMP_LIMB_BITS
-+	mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
-+#else
- 	mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
--
-+#endif
- 	ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
- }
- /* }}} */
--- 
-1.7.1
-
diff --git a/package/php/php-no-iconv-search.patch b/package/php/php-no-iconv-search.patch
new file mode 100644
index 0000000000..d1e924b1ab
--- /dev/null
+++ b/package/php/php-no-iconv-search.patch
@@ -0,0 +1,21 @@
+Don't push LDFLAGS/CFLAGS for iconv.
+Just assume they're covered somewhere else.
+Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc
+internal iconv support, which breaks things.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure
+--- php-5.3.13/configure	2012-05-08 06:41:23.000000000 -0300
++++ php-5.3.13-iconv/configure	2012-05-18 22:18:21.313975849 -0300
+@@ -47885,8 +47885,8 @@
+       PHP_ICONV_PREFIX="$ICONV_DIR"
+     fi
+ 
+-    CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+-    LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
++    #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
++    #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+ 
+     if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
+       PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
diff --git a/package/php/php.mk b/package/php/php.mk
index 6de6a9e83d..e9bda447f6 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,53 +4,59 @@
 #
 #############################################################
 
-PHP_VERSION = 5.2.17
+PHP_VERSION = 5.3.13
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
 PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
-PHP_LIBTOOL_PATCH = NO
 PHP_CONF_OPT =  --mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-all \
 		--without-pear \
 		--with-config-file-path=/etc \
 		--localstatedir=/var \
+		--disable-rpath
 
 PHP_CFLAGS = $(TARGET_CFLAGS)
 
-ifneq ($(BR2_PACKAGE_PHP_CLI),y)
-	PHP_CONF_OPT += --disable-cli
-else
-	PHP_CONF_OPT += --enable-cli
-endif
-
-ifneq ($(BR2_PACKAGE_PHP_CGI),y)
-	PHP_CONF_OPT += --disable-cgi
-else
-	PHP_CONF_OPT += --enable-cgi
-	ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y)
-		PHP_CONF_OPT += --enable-fastcgi
-	endif
+# Workaround for non-IPv6 uClibc toolchain
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifneq ($(BR2_INET_IPV6),y)
+	PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS
 endif
-
-### Extensions
-ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y)
-	PHP_CONF_OPT += --enable-sockets
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y)
-	PHP_CONF_OPT += --enable-posix
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y)
-	PHP_CONF_OPT += --enable-spl
-endif
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y)
-	PHP_CONF_OPT += --enable-session
-endif
+### Extensions
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+		$(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
+		$(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
+		$(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
+		$(if $(BR2_PACKAGE_PHP_EXT_WDDX),--enable-wddx) \
+		$(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
+		$(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
+		$(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
+		$(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
+		$(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
+		$(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
+		$(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
+		$(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
+		$(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
+		$(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
+		$(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
+		$(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
+		$(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
+		$(if $(BR2_PACKAGE_PHP_EXT_FILENIFO),--enable-fileinfo) \
+		$(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath)
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
 	PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
@@ -58,16 +64,14 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
-	PHP_CONF_OPT += --enable-libxml \
-		--with-libxml-dir=${STAGING_DIR}/usr \
-		 --enable-xml \
-		 --enable-xmlreader \
-		 --enable-xmlwriter
+	PHP_CONF_OPT += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr
 	PHP_DEPENDENCIES += libxml2
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
-	PHP_CONF_OPT += --enable-simplexml
+ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
+	PHP_CONF_OPT += --with-xmlrpc \
+		$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)
+	PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 endif
 
 ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
@@ -75,17 +79,23 @@ ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
 	PHP_DEPENDENCIES += zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y)
-	PHP_CONF_OPT += --enable-exif
+ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
+	PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y)
-	PHP_CONF_OPT += --enable-ftp
+ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y)
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+	PHP_CONF_OPT += --with-iconv=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += libiconv
+else
+	PHP_CONF_OPT += --with-iconv
+endif
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
-	PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
-	PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
+ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
+	PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += icu
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
@@ -93,52 +103,11 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
 	PHP_DEPENDENCIES += gmp
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y)
-	PHP_CONF_OPT += --enable-json
-endif
-
 ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
 	PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += readline
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
-	PHP_CONF_OPT += --with-ncurses=$(STAGING_DIR)/usr
-	PHP_DEPENDENCIES += ncurses
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_PCNTL),y)
-	PHP_CONF_OPT += --enable-pcntl
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
-	PHP_CONF_OPT += --enable-sysvmsg
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y)
-	PHP_CONF_OPT += --enable-sysvsem
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y)
-	PHP_CONF_OPT += --enable-sysvshm
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
-	PHP_CONF_OPT += --enable-zip
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y)
-	PHP_CONF_OPT += --enable-filter
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_CALENDAR),y)
-	PHP_CONF_OPT += --enable-calendar
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_PCRE),y)
-	PHP_CONF_OPT += --with-pcre-regex
-endif
-
 ### Legacy sqlite2 support
 ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
 	PHP_CONF_OPT += --with-sqlite
@@ -150,16 +119,22 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
 endif
 endif
 
+### Native MySQL extensions
+ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
+	PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += mysql_client
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y)
+	PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
+	PHP_DEPENDENCIES += mysql_client
+endif
+
 ### PDO
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
 	PHP_CONF_OPT += --enable-pdo
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
-ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y)
 	PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += sqlite
-else
-	PHP_CONF_OPT += --with-pdo-sqlite
-endif
 	PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
 ifneq ($(BR2_LARGEFILE),y)
 	PHP_CFLAGS += -DSQLITE_DISABLE_LFS
@@ -171,6 +146,50 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
 endif
 endif
 
+### Use external PCRE if it's available
+ifeq ($(BR2_PACKAGE_PCRE),y)
+	PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += pcre
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
+	PHP_CONF_OPT += --with-curl=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_XSL),y)
+	PHP_CONF_OPT += --with-xsl=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += libxslt
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_BZIP2),y)
+	PHP_CONF_OPT += --with-bz2=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += bzip2
+endif
+
+### DBA
+ifeq ($(BR2_PACKAGE_PHP_EXT_DBA),y)
+	PHP_CONF_OPT += --enable-dba
+ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_CDB),y)
+	PHP_CONF_OPT += --without-cdb
+endif
+ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_FLAT),y)
+	PHP_CONF_OPT += --without-flatfile
+endif
+ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_INI),y)
+	PHP_CONF_OPT += --without-inifile
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_DBA_DB4),y)
+	PHP_CONF_OPT += --with-db4=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += berkeleydb
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y)
+	PHP_CONF_OPT += --with-snmp=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += netsnmp
+endif
+
 # Fixup prefix= and exec_prefix= in php-config
 define PHP_FIXUP_PHP_CONFIG
 	$(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \
@@ -185,7 +204,9 @@ define PHP_INSTALL_FIXUP
 	rm -f $(TARGET_DIR)/usr/bin/phpize
 	rm -f $(TARGET_DIR)/usr/bin/php-config
 	if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \
-		$(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini; fi
+		$(INSTALL) -m 0755  $(PHP_DIR)/php.ini-production \
+			$(TARGET_DIR)/etc/php.ini; \
+	fi
 endef
 
 PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP

From fce8d0765a1b84b838f1807213724805e13985c2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 May 2012 05:03:08 +0000
Subject: [PATCH 2052/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d8602f1dd4..cd832704ef 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -65,7 +65,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.31"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.17"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.18"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.6"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From e44d5c947d5690645debd0dac18acb29656404a5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 May 2012 05:03:09 +0000
Subject: [PATCH 2053/6849] qemu/sh4-r2d: update to use kernel 3.2.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 99db36a939..a5808709d8 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.18"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 73c8f3b934611174414f044e4a16bd36e4ea4d62 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 21 May 2012 19:39:14 +0200
Subject: [PATCH 2054/6849] kernel-headers: remove 2.6.35, add 3.4

And mark 2.6.36 / 2.6.37 as deprecated.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in            | 12 ++--
 ...s-for-headers-exported-to-user-space.patch | 59 -------------------
 2 files changed, 7 insertions(+), 64 deletions(-)
 delete mode 100644 toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 36370b42a1..b3fb362d01 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_3
+	default BR2_KERNEL_HEADERS_3_4
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -15,14 +15,13 @@ choice
 	  For the snapshot, you have to provide the
 	  linux-2.6.tar.bz2 tarball in your download dir.
 
-	config BR2_KERNEL_HEADERS_2_6_35
-		bool "Linux 2.6.35.x kernel headers"
-
 	config BR2_KERNEL_HEADERS_2_6_36
 		bool "Linux 2.6.36.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_2_6_37
 		bool "Linux 2.6.37.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_2_6_38
 		bool "Linux 2.6.38.x kernel headers"
@@ -42,6 +41,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_3
 		bool "Linux 3.3.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_4
+		bool "Linux 3.4.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -58,7 +60,6 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.35.14"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
@@ -67,5 +68,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.16"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.5"		if BR2_KERNEL_HEADERS_3_3
+	default "3.4"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
deleted file mode 100644
index 1089c71067..0000000000
--- a/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 27 Nov 2009 11:20:54 +0100
-Subject: [PATCH] scsi: use __uX types for headers exported to user space
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
-in include/scsi to user space, but didn't change the uX types to the
-userspace-compatible __uX types. Without that you'll get compile errors
-when including them - E.G.:
-
-/tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
-before ‘u8’
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/scsi/scsi.h         |    8 ++++----
- include/scsi/scsi_netlink.h |    4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
-index 8b4deca..ec3053e 100644
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
-diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
-index 536752c..58ce8fe 100644
---- a/include/scsi/scsi_netlink.h
-+++ b/include/scsi/scsi_netlink.h
-@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
-  *    PCI :  ID data is the 16 bit PCI Registered Vendor ID
-  */
- #define SCSI_NL_VID_TYPE_SHIFT		56
--#define SCSI_NL_VID_TYPE_MASK		((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
--#define SCSI_NL_VID_TYPE_PCI		((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
-+#define SCSI_NL_VID_TYPE_MASK		((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
-+#define SCSI_NL_VID_TYPE_PCI		((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
- #define SCSI_NL_VID_ID_MASK		(~ SCSI_NL_VID_TYPE_MASK)
- 
- 
--- 
-1.7.0
-

From 1c52c9e1fb630a7f44eb8244072eb1aa28c08dff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 May 2012 09:11:15 +0200
Subject: [PATCH 2055/6849] gnuchess: needs threads

Fixes http://autobuild.buildroot.org/results/63a7cf35ecef02f30641a37d602f7cc55d59f543/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/games/gnuchess/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/games/gnuchess/Config.in b/package/games/gnuchess/Config.in
index cae05cbbbe..c79c52dd46 100644
--- a/package/games/gnuchess/Config.in
+++ b/package/games/gnuchess/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_GNUCHESS
 	bool "gnuchess"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  GNU Chess lets most modern computers play a full game of chess.
 
 	  http://ftp.gnu.org/pub/gnu/chess
+
+comment "gnuchess requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 602de0675ef334de9f77a670561f2b1887550305 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 May 2012 09:39:34 +0200
Subject: [PATCH 2056/6849] ntfs-3g: fix build with encryption support

Fixes http://autobuild.buildroot.org/results/4baa45ca1f4804be1a76a69bb8158c6a91d96d6b/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/ntfs-3g.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 8e616cb795..748fe1de03 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -21,6 +21,7 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
 endif
 
 ifeq ($(BR2_PACKAGE_NTFS_3G_ENCRYPTED),y)
+	NTFS_3G_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 	NTFS_3G_CONF_OPT += --enable-crypto
 	NTFS_3G_DEPENDENCIES += gnutls
 endif

From c73df193c558dfcf8386082548d8bea396960f39 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 May 2012 10:11:47 +0200
Subject: [PATCH 2057/6849] oprofile: fix target-install for archs without
 performance counters support

These archs can still use the timer mode.

Fixes http://autobuild.buildroot.org/results/2627ee17e1f1a58520e01c52af365998f648bbc5/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/oprofile/oprofile.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 5da794badc..fc2192843f 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -30,7 +30,10 @@ OPROFILE_DEPENDENCIES = popt binutils
 define OPROFILE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile
-	cp -dpfr $(@D)/events/$(OPROFILE_ARCH) $(TARGET_DIR)/usr/share/oprofile
+	if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \
+		cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \
+			$(TARGET_DIR)/usr/share/oprofile; \
+	fi
 	$(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile
 	$(INSTALL) -m 755 $(@D)/utils/opcontrol $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin

From 9001722c79f25e6175e4404b7d0823ca1c6d6660 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 May 2012 13:36:17 +0200
Subject: [PATCH 2058/6849] iproute2: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index ee5c04aa8c..e766374933 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 3.3.0
+IPROUTE2_VERSION = 3.4.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 

From ae446b2ea386ddc06644ef15b26bd06f16f3cbc3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 May 2012 15:26:27 +0200
Subject: [PATCH 2059/6849] bison: m4 needs MMU

Fixes http://autobuild.buildroot.net/results/0bb659881ed6a01745f596f00da9acbef02a4c31/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bison/Config.in b/package/bison/Config.in
index da0ac3f1ef..1a485c4061 100644
--- a/package/bison/Config.in
+++ b/package/bison/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_BISON
 	bool "bison"
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_M4
+	# m4 uses fork()
+	depends on BR2_USE_MMU
 	help
 	  General-purpose parser generator that converts a
 	  grammar description for an LALR context-free grammar into a C

From 66c7e294515f016928abdde506e7563214242b15 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 May 2012 04:56:29 +0000
Subject: [PATCH 2060/6849] kernel-headers: bump 3.{0, 3}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ...-3.3.6-fix-umode_t.patch => linux-3.3.7-fix-umode_t.patch} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3.6-fix-umode_t.patch => linux-3.3.7-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index cd832704ef..12535313f5 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.31"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.32"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.18"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.6"		if BR2_KERNEL_HEADERS_3_3
+	default "3.3.7"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch

From 82609df4dd2f31fde175b2fab21cabd6124fcfae Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 May 2012 04:56:30 +0000
Subject: [PATCH 2061/6849] linux: bump default to kernel version 3.3.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index dd3446543b..4562b1b6ee 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3.6"
+	bool "3.3.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.6" if BR2_LINUX_KERNEL_3_3
+	default "3.3.7" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 4f0bc3b74faa6966e5014dc5950d85d0bd8369ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 May 2012 04:56:31 +0000
Subject: [PATCH 2062/6849] qemu/configs: update to use kernel 3.3.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_versatile_defconfig    | 2 +-
 configs/qemu_arm_vexpress_defconfig     | 2 +-
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips_malta_defconfig       | 2 +-
 configs/qemu_mipsel_malta_defconfig     | 2 +-
 configs/qemu_ppc_g3beige_defconfig      | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 2 +-
 configs/qemu_sparc_ss10_defconfig       | 2 +-
 configs/qemu_x86_64_defconfig           | 2 +-
 configs/qemu_x86_defconfig              | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index f346974a59..5385f28914 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index f103b59cc8..9596fe521c 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -17,6 +17,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 8459633db5..387466b1fa 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index c98d4e4ba5..7034447ec8 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 9c2cfd3706..57f3ae141a 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index fb3161684c..4a4879c038 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 87df9cae4b..1e297e5aa7 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index e506c53641..44c81de414 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 1d99324e8b..7ac66af1dc 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 66abacf115..7c6f31127f 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index e2928e9f41..118cd7fa7a 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"

From a3c46e4f17c4381ff526b00f805194fde72b8492 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 08:36:38 -0300
Subject: [PATCH 2063/6849] libmpeg2: move ARM patch to the correct directory

The patch was added after the multimedia category reorganization so it
became unreachable.
Move it to the final libmpeg2 package directory.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/{multimedia => }/libmpeg2/libmpeg2-0.5.1-armv4l.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/{multimedia => }/libmpeg2/libmpeg2-0.5.1-armv4l.patch (100%)

diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch b/package/libmpeg2/libmpeg2-0.5.1-armv4l.patch
similarity index 100%
rename from package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch
rename to package/libmpeg2/libmpeg2-0.5.1-armv4l.patch

From 37a63cd32e5cd6603f2b4d09324cb9793828b146 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 02:06:00 +0000
Subject: [PATCH 2064/6849] hostapd: enable interworking and enhance

Enable IEEE 802.11u (interworking).
Also enable new supported EAP methods.
Switch from echo to sed where possible for a cleaner .config output

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd.mk | 59 ++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index d9ee4f0f51..c7c59ecc34 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -18,76 +18,73 @@ HOSTAPD_LDFLAGS += -lm
 endif
 
 define HOSTAPD_LIBNL_CONFIG
-	echo "CONFIG_LIBNL32=y" >>$(HOSTAPD_CONFIG)
+	echo 'CONFIG_LIBNL32=y' >>$(HOSTAPD_CONFIG)
 endef
 
-define HOSTAPD_CRYPTO_CONFIG
-	echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG)
+define HOSTAPD_LIBTOMMATH_CONFIG
+	$(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 
 # Try to use openssl or gnutls if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	HOSTAPD_DEPENDENCIES += openssl
 define HOSTAPD_TLS_CONFIG
-	echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 else
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 	HOSTAPD_DEPENDENCIES += gnutls
 define HOSTAPD_TLS_CONFIG
-	echo "CONFIG_TLS=gnutls" >>$(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(HOSTAPD_CONFIG)
 endef
 else
 define HOSTAPD_TLS_CONFIG
-	echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(HOSTAPD_CONFIG)
 endef
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
 define HOSTAPD_EAP_CONFIG
-	$(SED) "s/CONFIG_EAP_MSCHAPV2=y//" $(HOSTAPD_CONFIG)
-	$(SED) "s/CONFIG_EAP_PEAP=y//" $(HOSTAPD_CONFIG)
-	$(SED) "s/CONFIG_EAP_TLS=y//" $(HOSTAPD_CONFIG)
-	$(SED) "s/CONFIG_EAP_TTLS=y//" $(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG)
-	echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_AKA.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_FAST.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_GPSK.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_IKEV2.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_PAX.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_PSK.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_RADIUS_SERVER.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
-ifeq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_INET_IPV6),y)
 define HOSTAPD_RADIUS_IPV6_CONFIG
-	$(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG)
+	$(SED) 's/\(CONFIG_IPV6.*\)/#\1/' $(HOSTAPD_CONFIG)
 endef
 endif
 else
 define HOSTAPD_EAP_CONFIG
-	$(SED) "s/^CONFIG_EAP/#CONFIG_EAP/g" $(HOSTAPD_CONFIG)
-	$(SED) "s/^#CONFIG_NO_ACCOUNTING/CONFIG_NO_ACCOUNTING/" $(HOSTAPD_CONFIG)
-	$(SED) "s/^#CONFIG_NO_RADIUS/CONFIG_NO_RADIUS/" $(HOSTAPD_CONFIG)
+	$(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_NO_ACCOUNTING.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_NO_RADIUS.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y)
 define HOSTAPD_WPS_CONFIG
-	$(SED) "s/^#CONFIG_WPS/CONFIG_WPS/g" $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_WPS.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 endif
 
 define HOSTAPD_CONFIGURE_CMDS
 	cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG)
 # Misc
-	$(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG)
-	$(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG)
-	$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG)
-	$(HOSTAPD_CRYPTO_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_FULL_DYNAMIC_VLAN.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(HOSTAPD_LIBTOMMATH_CONFIG)
 	$(HOSTAPD_TLS_CONFIG)
 	$(HOSTAPD_RADIUS_IPV6_CONFIG)
 	$(HOSTAPD_EAP_CONFIG)

From 1c64e065762af80ceaaed313b82eed9220ea4707 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 02:06:01 +0000
Subject: [PATCH 2065/6849] wpa_supplicant: enable interworking and enhance

Enable IEEE 802.11u (interworking).
Also enable new supported EAP methods.
Switch from echo to sed where possible for a cleaner .config output

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.mk | 56 ++++++++++++++----------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 97210ceee7..5ca6de500b 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -15,57 +15,64 @@ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS)
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += libnl
 define WPA_SUPPLICANT_LIBNL_CONFIG
-	echo "CONFIG_LIBNL32=y" >>$(WPA_SUPPLICANT_CONFIG)
+	echo 'CONFIG_LIBNL32=y' >>$(WPA_SUPPLICANT_CONFIG)
 endef
 else
 define WPA_SUPPLICANT_LIBNL_CONFIG
-	$(SED) "s/^CONFIG_DRIVER_NL80211/#CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/^\(CONFIG_DRIVER_NL80211.*\)/#\1/' $(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 
-ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)
 define WPA_SUPPLICANT_EAP_CONFIG
-	$(SED) "s/^CONFIG_EAP_*/#CONFIG_EAP_/g" $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_AKA.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_FAST.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_GPSK.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_IKEV2.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_PAX.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_PSK.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+endef
+else
+define WPA_SUPPLICANT_EAP_CONFIG
+	$(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y)
 define WPA_SUPPLICANT_AP_CONFIG
-	echo "CONFIG_AP=y" >>$(WPA_SUPPLICANT_CONFIG)
-endef
-else
-define WPA_SUPPLICANT_AP_CONFIG
-	$(SED) "s/^CONFIG_AP=y//" $(WPA_SUPPLICANT_CONFIG)
+	echo 'CONFIG_AP=y' >>$(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y)
 define WPA_SUPPLICANT_WPS_CONFIG
-	echo "CONFIG_WPS=y" >>$(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_WPS.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 
-define WPA_SUPPLICANT_CRYPTO_CONFIG
-	echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG)
-	echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
-	echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(WPA_SUPPLICANT_CONFIG)
+define WPA_SUPPLICANT_LIBTOMMATH_CONFIG
+	$(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 
 # Try to use openssl or gnutls if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += openssl
 define WPA_SUPPLICANT_TLS_CONFIG
-	echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 else
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 	WPA_SUPPLICANT_DEPENDENCIES += gnutls
 define WPA_SUPPLICANT_TLS_CONFIG
-	echo "CONFIG_TLS=gnutls" >>$(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(WPA_SUPPLICANT_CONFIG)
 endef
 else
 define WPA_SUPPLICANT_TLS_CONFIG
-	echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 endif
@@ -76,18 +83,19 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)"	\
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 define WPA_SUPPLICANT_DBUS_CONFIG
-	$(SED) "s/^#CONFIG_CTRL_IFACE_DBUS/CONFIG_CTRL_IFACE_DBUS/" $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_CTRL_IFACE_DBUS=\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 endif
 
 define WPA_SUPPLICANT_CONFIGURE_CMDS
 	cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
-	$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)
-	$(SED) "s/^#CONFIG_DELAYED_MIC/CONFIG_DELAYED_MIC/" $(WPA_SUPPLICANT_CONFIG)
-	$(SED) "s/^CONFIG_DRIVER_ATMEL/#CONFIG_DRIVER_ATMEL/" $(WPA_SUPPLICANT_CONFIG)
-	$(SED) "s/^CONFIG_SMARTCARD/#CONFIG_SMARTCARD/" $(WPA_SUPPLICANT_CONFIG)
-	$(SED) "s/\/local//" $(@D)/wpa_supplicant/Makefile
-	$(WPA_SUPPLICANT_CRYPTO_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_DELAYED_MIC.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(CONFIG_DRIVER_ATMEL\)/#\1/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(CONFIG_SMARTCARD\)/#\1/' $(WPA_SUPPLICANT_CONFIG)
+	$(WPA_SUPPLICANT_LIBTOMMATH_CONFIG)
 	$(WPA_SUPPLICANT_TLS_CONFIG)
 	$(WPA_SUPPLICANT_EAP_CONFIG)
 	$(WPA_SUPPLICANT_WPS_CONFIG)

From 3ae7d814075095b43e25c8ef11be6a14234241cc Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 23 May 2012 09:30:36 +0000
Subject: [PATCH 2066/6849] pkg-download.mk: Add missing argument when
 downloading from primary mirror (scp)

This problem was already fixed by Markos Chandras for wget, but not for scp.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-download.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index b833de9e0e..7d1e543758 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -206,7 +206,7 @@ endef
 define DOWNLOAD_INNER
 	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
 		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
-			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 		esac ; \
 	fi ; \

From cf54176bd1dd1c90a9be0ee18fac3accd4c6f186 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:33 +0000
Subject: [PATCH 2067/6849] libnetfilter-conntrack: bump to version 1.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index 66f0f69a44..3313e23eb7 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNETFILTER_CONNTRACK_VERSION = 1.0.0
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.1
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES

From a084b8b38641ecafe3db51acdfaa0b6ef48c9afb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:34 +0000
Subject: [PATCH 2068/6849] ipset: bump to version 6.12.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 06393f4e94..3cd1263e45 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,10 +4,9 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.11
+IPSET_VERSION = 6.12.1
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
-IPSET_AUTORECONF = YES
 IPSET_DEPENDENCIES = libmnl host-pkg-config
 IPSET_CONF_OPT = --with-kmod=no
 

From dfe000f00adb600d2777d1dd5f448d25b8897466 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:35 +0000
Subject: [PATCH 2069/6849] nbd: bump to version 3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 62ae9be40c..15997afd12 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NBD_VERSION = 3.0
+NBD_VERSION = 3.1
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
 NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)

From 8fcdb1d212b8e143b713a4e677631c66f2dbf026 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:36 +0000
Subject: [PATCH 2070/6849] libidn: bump to version 1.25

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libidn/libidn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 935240bd65..6d2bea6ca7 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBIDN_VERSION = 1.24
+LIBIDN_VERSION = 1.25
 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"

From 50ed5342a1a7e9d22b35a30d2a897cd4752930e7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:37 +0000
Subject: [PATCH 2071/6849] audiofile: bump to version 0.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/audiofile/audiofile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index a49cc3e649..5f09f95961 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-AUDIOFILE_VERSION = 0.3.3
+AUDIOFILE_VERSION = 0.3.4
 AUDIOFILE_SITE = http://audiofile.68k.org
 AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'

From 6595890120842d109833ee053874016c1a64eb26 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:38 +0000
Subject: [PATCH 2072/6849] mpg123: bump to version 1.14.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 4635740bad..793812f8fa 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.14.1
+MPG123_VERSION = 1.14.2
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From 24e4058594d7858977e8635f0ce47560131d5529 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 23 May 2012 03:29:39 +0000
Subject: [PATCH 2073/6849] bind: bump to version 9.6-ESV-R7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 987bd4e1ef..eb7b9c0d44 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R6
+BIND_VERSION = 9.6-ESV-R7
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From d287f129c8794a01da02da3e984a1555e00c440b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 May 2012 01:25:18 +0000
Subject: [PATCH 2074/6849] hiawatha: bump to version 8.3

Bump hiawatha to version 8.3 - adds reverse proxy functionality.
Also define WORK_DIR to /var/lib/hiawatha instead of the uncommon
/usr/var/lib/hiawatha - missed it in the last path fixes.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...awatha-support-for-external-polarssl.patch | 27 ++++++++++---------
 package/hiawatha/hiawatha.mk                  |  5 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
index e6033b9dab..edc774b7d2 100644
--- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch
+++ b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
@@ -9,21 +9,22 @@ This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in
 addition to ENABLE_SSL, tells Hiawatha's build system to link against
 the already existing PolarSSL library instead of building its own.
 
+[Gustavo]: Update for version 8.3
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-Index: hiawatha-8.1/CMakeLists.txt
-===================================================================
---- hiawatha-8.1.orig/CMakeLists.txt
-+++ hiawatha-8.1/CMakeLists.txt
-@@ -9,6 +9,7 @@
- option(ENABLE_IPV6    "Enable IPv6 support in Hiawatha." ON)
- option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." OFF)
- option(ENABLE_SSL     "Enable SSL (PolarSSL) support in Hiawatha." ON)
-+option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." OFF)
- option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" ON)
- option(ENABLE_XSLT    "Enable XSLT support in Hiawatha." ON)
+diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt
+--- hiawatha-8.3.orig//CMakeLists.txt	2012-05-23 14:22:26.000000000 -0300
++++ hiawatha-8.3/CMakeLists.txt	2012-05-24 08:13:00.007107500 -0300
+@@ -10,6 +10,7 @@
+ option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off)
+ option(ENABLE_RPROXY  "Enable reverse proxy support in Hiawatha." on)
+ option(ENABLE_SSL     "Enable SSL (PolarSSL) support in Hiawatha." on)
++option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off)
+ option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on)
+ option(ENABLE_XSLT    "Enable XSLT support in Hiawatha." on)
  
-@@ -86,19 +87,23 @@
+@@ -85,19 +86,23 @@
  
  # PolarSSL
  if(ENABLE_SSL)
@@ -48,7 +49,7 @@ Index: hiawatha-8.1/CMakeLists.txt
  # Configure files
  configure_file(config.h.in config.h)
  foreach (configfile ${config_files_in})
-@@ -119,7 +124,9 @@
+@@ -118,7 +123,9 @@
  target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
  if(ENABLE_SSL)
  	target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 4600c1129d..647c1e16c2 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.2
+HIAWATHA_VERSION = 8.3
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
@@ -12,6 +12,7 @@ HIAWATHA_CONF_OPT += \
 	-DCONFIG_DIR=/etc/hiawatha \
 	-DLOG_DIR=/var/log \
 	-DPID_DIR=/var/run \
-	-DWEBROOT_DIR=/var/www/hiawatha
+	-DWEBROOT_DIR=/var/www/hiawatha \
+	-DWORK_DIR=/var/lib/hiawatha
 
 $(eval $(call CMAKETARGETS))

From 573a740998f6345317dca1d62f3efcda4d067499 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 25 May 2012 21:02:55 +0200
Subject: [PATCH 2075/6849] mtd: fix build when no sub options are enabled

mtd-utils with no sub options enabled should be a noop, but we end up
calling make with the default target (E.G. to build everything), breaking
the build if zlib/lzo aren't available.

Fixes http://autobuild.buildroot.net/results/a0781db394792e6d3831c1884fc4bb3525fedb2e/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 8ccd4dd04c..b4d981d999 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -68,12 +68,17 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
 
 MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
 
+# only call make if atleast a single tool is enabled
+ifneq ($(MTD_TARGETS_y),)
+
 define MTD_BUILD_CMDS
 	$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
 		BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \
 		$(addprefix $(@D)/,$(MTD_TARGETS_y))
 endef
 
+endif
+
 define MTD_INSTALL_TARGET_CMDS
  for f in $(MTD_TARGETS_y) ; do \
   install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \

From 0b0d7badb0338f7c33c86e2ab60c413a973ca348 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 25 May 2012 21:09:50 +0200
Subject: [PATCH 2076/6849] Update for 2012.05-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 13 +++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7d17c26b1c..4a8bed02d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+2012.05-rc3, Released May 25th, 2012:
+
+	Minor fixes around the tree.
+
+	Infra: Fix for DOWNLOAD macro when using primary mirrors with
+	scp targets.
+
+	Toolchain: Kernel headers 3.2.18 / 3.3.7.
+
+	Updated/fixed packages: binutils, bison, busybox, cifs-utils,
+	gnuchess, gpsd, iperf, libmpeg2, mtd, ntfs-3g, oprofile,
+	xserver-xorg
+
 2012.05-rc2, Released May 18th, 2012:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index c0fc8c2401..4945c16ce3 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.05-rc2
+export BR2_VERSION:=2012.05-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 52d3c1814f..57c8be5ceb 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2012.05-rc2</b>, which can be
+The latest release candidate is <b>2012.05-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.05-rc2.tar.gz">buildroot-2012.05-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2012.05-rc3.tar.gz">buildroot-2012.05-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.05-rc2.tar.bz2">buildroot-2012.05-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05-rc3.tar.bz2">buildroot-2012.05-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index c7d276ef55..94d1d94287 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>25 May 2012 -- 2012.05-rc3 released</b>
+
+    <p>RC3 is out with more bugfixes - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc3">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc3.tar.bz2">2012.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>18 May 2012 -- 2012.05-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From ece64bf1882dbc34a1170ff19ad44b835a9b9ced Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 25 May 2012 02:47:31 +0000
Subject: [PATCH 2077/6849] midori: bump version to 0.4.6

[Peter: sort/indent dependencies]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/midori/Config.in |  3 +++
 package/midori/midori.mk | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 95a0afbd64..49867e4277 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_MIDORI
 	bool "midori"
 	select BR2_PACKAGE_WEBKIT
 	select BR2_PACKAGE_LIBSEXY
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_INSTALL_LIBSTDCPP # webkit
 	depends on BR2_USE_WCHAR	 # webkit
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 3e46b1aba1..0b3439c53c 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -4,10 +4,18 @@
 #
 #############################################################
 
-MIDORI_VERSION = 0.3.6
+MIDORI_VERSION = 0.4.6
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
-MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
-MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
+MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
+MIDORI_DEPENDENCIES = \
+	host-intltool \
+	host-pkg-config \
+	host-vala \
+	libgtk2 \
+	libsexy \
+	webkit \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 ifneq ($(BR2_PACKAGE_XORG7),y)
 define MIDORI_WITHOUT_X11
@@ -21,7 +29,7 @@ define MIDORI_CONFIGURE_CMDS
 		$(TARGET_CONFIGURE_OPTS)	\
 		./waf configure			\
 		--prefix=/usr			\
-		--disable-vala			\
+		--disable-libnotify		\
        )
 endef
 

From 7643670052a7adc1c2a5f275664774c6d50e6a3d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 27 May 2012 21:10:42 +0200
Subject: [PATCH 2078/6849] netsnmp: fix build with high BR2_JLEVEL settings

The netsnmp build system is not robust against parallel builds.

Fixes http://autobuild.buildroot.net/results/5bb827425ed07617a47a0c0d942a3c6c423fc02f

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 448e3fdb07..6d67dc5cd8 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -21,6 +21,7 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
 		--with-mib-modules="host ucd-snmp/dlmod" \
 		--with-out-mib-modules="disman/event disman/schedule utilities" \
 		--with-out-transports="Unix"
+NETSNMP_MAKE = $(MAKE1)
 NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
 
 ifeq ($(BR2_ENDIAN),"BIG")

From 8a1e83823de62f55ac06f4a67452ee7cc1ce3ace Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 28 May 2012 09:25:17 +0200
Subject: [PATCH 2079/6849] busybox: bump 1.20.x version

Bugfix release.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |  2 +-
 .../busybox-1.20.0-buildsys.patch             | 20 -----
 .../busybox-1.20.0/busybox-1.20.0-ext4.patch  | 73 -------------------
 .../busybox-1.20.0/busybox-1.20.0-find.patch  | 33 ---------
 .../busybox-1.20.0/busybox-1.20.0-getty.patch | 17 -----
 .../busybox-1.20.0-lineedit.patch             | 22 ------
 .../busybox-1.20.0/busybox-1.20.0-mdev.patch  | 72 ------------------
 .../busybox-1.20.0/busybox-1.20.0-sed.patch   | 29 --------
 8 files changed, 1 insertion(+), 267 deletions(-)
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch
 delete mode 100644 package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 946134def2..a07864474b 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -36,7 +36,7 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
 	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
-	default "1.20.0"	if BR2_BUSYBOX_VERSION_1_20_X
+	default "1.20.1"	if BR2_BUSYBOX_VERSION_1_20_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
deleted file mode 100644
index ae9ea5c618..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.20.0/archival/libarchive/Kbuild.src
-+++ busybox-1.20.0-buildsys/archival/libarchive/Kbuild.src
-@@ -45,7 +45,7 @@ lib-$(CONFIG_UNXZ)
- lib-$(CONFIG_CPIO)                      += get_header_cpio.o
- lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
- lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
--lib-$(CONFIG_GUNZIP)                    += decompress_gunzip.o
-+lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
- lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
- lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
- lib-$(CONFIG_TAR)                       += get_header_tar.o
-@@ -60,7 +60,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_GZ)
- lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
- lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
- lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
--lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += decompress_bunzip2.o
-+lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
- lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
- lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
- 
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch
deleted file mode 100644
index d54ccf817e..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- busybox-1.20.0/util-linux/volume_id/ext.c
-+++ busybox-1.20.0-ext4/util-linux/volume_id/ext.c
-@@ -39,10 +39,50 @@ struct ext2_super_block {
- 	uint8_t	volume_name[16];
- } PACKED;
- 
--#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x00000004
--#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x00000008
- #define EXT_SUPERBLOCK_OFFSET			0x400
- 
-+/* for s_flags */
-+#define EXT2_FLAGS_TEST_FILESYS			0x0004
-+
-+/* for s_feature_compat */
-+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
-+
-+/* for s_feature_ro_compat */
-+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
-+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
-+#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004
-+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE	0x0008
-+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
-+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
-+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
-+
-+/* for s_feature_incompat */
-+#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
-+#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004
-+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008
-+#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
-+#define EXT4_FEATURE_INCOMPAT_EXTENTS		0x0040 /* extents support */
-+#define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
-+#define EXT4_FEATURE_INCOMPAT_MMP		0x0100
-+#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
-+
-+#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
-+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
-+					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
-+#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
-+					 EXT2_FEATURE_INCOMPAT_META_BG)
-+#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED	~EXT2_FEATURE_INCOMPAT_SUPP
-+#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT2_FEATURE_RO_COMPAT_SUPP
-+
-+#define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
-+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
-+					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
-+#define EXT3_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
-+					 EXT3_FEATURE_INCOMPAT_RECOVER| \
-+					 EXT2_FEATURE_INCOMPAT_META_BG)
-+#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED	~EXT3_FEATURE_INCOMPAT_SUPP
-+#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT3_FEATURE_RO_COMPAT_SUPP
-+
- int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
- {
- #define off ((uint64_t)0)
-@@ -66,11 +106,15 @@ int FAST_FUNC volume_id_probe_ext(struct
- 	dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
- 
- #if ENABLE_FEATURE_BLKID_TYPE
--	if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
-+	if ((es->feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | EXT4_FEATURE_RO_COMPAT_DIR_NLINK))
-+	 || (es->feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT))
-+	) {
-+		id->type = "ext4";
-+	}
-+	else if (es->feature_compat & cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
- 		id->type = "ext3";
- 	else
- 		id->type = "ext2";
- #endif
--
- 	return 0;
- }
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch
deleted file mode 100644
index f913cda1bb..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- busybox-1.20.0/findutils/find.c
-+++ busybox-1.20.0-find/findutils/find.c
-@@ -831,6 +831,11 @@ static action*** parse_params(char **arg
- 	                        PARM_name      ,
- 	                        PARM_iname     ,
- 	IF_FEATURE_FIND_PATH(   PARM_path      ,)
-+#if ENABLE_DESKTOP
-+	/* -wholename is a synonym for -path */
-+	/* We support it because Linux kernel's "make tags" uses it */
-+	IF_FEATURE_FIND_PATH(   PARM_wholename ,)
-+#endif
- 	IF_FEATURE_FIND_PATH(   PARM_ipath     ,)
- 	IF_FEATURE_FIND_REGEX(  PARM_regex     ,)
- 	IF_FEATURE_FIND_TYPE(   PARM_type      ,)
-@@ -869,6 +874,9 @@ static action*** parse_params(char **arg
- 	                         "-name\0"
- 	                         "-iname\0"
- 	IF_FEATURE_FIND_PATH(   "-path\0"   )
-+#if ENABLE_DESKTOP
-+	IF_FEATURE_FIND_PATH(   "-wholename\0")
-+#endif
- 	IF_FEATURE_FIND_PATH(   "-ipath\0"  )
- 	IF_FEATURE_FIND_REGEX(  "-regex\0"  )
- 	IF_FEATURE_FIND_TYPE(   "-type\0"   )
-@@ -1076,7 +1084,7 @@ static action*** parse_params(char **arg
- 			ap->iname = (parm == PARM_iname);
- 		}
- #if ENABLE_FEATURE_FIND_PATH
--		else if (parm == PARM_path || parm == PARM_ipath) {
-+		else if (parm == PARM_path IF_DESKTOP(|| parm == PARM_wholename) || parm == PARM_ipath) {
- 			action_path *ap;
- 			dbg("%d", __LINE__);
- 			ap = ALLOC_ACTION(path);
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch
deleted file mode 100644
index ed52159ffe..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- busybox-1.20.0/loginutils/getty.c
-+++ busybox-1.20.0-getty/loginutils/getty.c
-@@ -561,8 +561,14 @@ int getty_main(int argc UNUSED_PARAM, ch
- 		 */
- 		fd = open("/dev/tty", O_RDWR | O_NONBLOCK);
- 		if (fd >= 0) {
-+			/* TIOCNOTTY sends SIGHUP to the foreground
-+			 * process group - which may include us!
-+			 * Make sure to not die on it:
-+			 */
-+			sighandler_t old = signal(SIGHUP, SIG_IGN);
- 			ioctl(fd, TIOCNOTTY);
- 			close(fd);
-+			signal(SIGHUP, old);
- 		}
- 	}
- 
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch
deleted file mode 100644
index ee236ffc89..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- busybox-1.20.0/libbb/lineedit.c
-+++ busybox-1.20.0-lineedit/libbb/lineedit.c
-@@ -1352,8 +1352,7 @@ static void load_history(line_input_t *s
- 		/* fill temp_h[], retaining only last MAX_HISTORY lines */
- 		memset(temp_h, 0, sizeof(temp_h));
- 		idx = 0;
--		if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
--			st_parm->cnt_history_in_file = 0;
-+		st_parm->cnt_history_in_file = 0;
- 		while ((line = xmalloc_fgetline(fp)) != NULL) {
- 			if (line[0] == '\0') {
- 				free(line);
-@@ -1361,8 +1360,7 @@ static void load_history(line_input_t *s
- 			}
- 			free(temp_h[idx]);
- 			temp_h[idx] = line;
--			if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
--				st_parm->cnt_history_in_file++;
-+			st_parm->cnt_history_in_file++;
- 			idx++;
- 			if (idx == st_parm->max_history)
- 				idx = 0;
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch
deleted file mode 100644
index 8a36c53c46..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- busybox-1.20.0/util-linux/mdev.c
-+++ busybox-1.20.0-mdev/util-linux/mdev.c
-@@ -661,37 +661,45 @@ static int FAST_FUNC dirAction(const cha
- static void load_firmware(const char *firmware, const char *sysfs_path)
- {
- 	int cnt;
--	int firmware_fd, loading_fd, data_fd;
-+	int firmware_fd, loading_fd;
- 
- 	/* check for /lib/firmware/$FIRMWARE */
- 	xchdir("/lib/firmware");
--	firmware_fd = xopen(firmware, O_RDONLY);
--
--	/* in case we goto out ... */
--	data_fd = -1;
-+	firmware_fd = open(firmware, O_RDONLY); /* can fail */
- 
- 	/* check for /sys/$DEVPATH/loading ... give 30 seconds to appear */
- 	xchdir(sysfs_path);
- 	for (cnt = 0; cnt < 30; ++cnt) {
- 		loading_fd = open("loading", O_WRONLY);
--		if (loading_fd != -1)
-+		if (loading_fd >= 0)
- 			goto loading;
- 		sleep(1);
- 	}
- 	goto out;
- 
-  loading:
--	/* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
--	if (full_write(loading_fd, "1", 1) != 1)
--		goto out;
--
--	/* load firmware into /sys/$DEVPATH/data */
--	data_fd = open("data", O_WRONLY);
--	if (data_fd == -1)
--		goto out;
--	cnt = bb_copyfd_eof(firmware_fd, data_fd);
-+	cnt = 0;
-+	if (firmware_fd >= 0) {
-+		int data_fd;
-+
-+		/* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
-+		if (full_write(loading_fd, "1", 1) != 1)
-+			goto out;
-+
-+		/* load firmware into /sys/$DEVPATH/data */
-+		data_fd = open("data", O_WRONLY);
-+		if (data_fd < 0)
-+			goto out;
-+		cnt = bb_copyfd_eof(firmware_fd, data_fd);
-+		if (ENABLE_FEATURE_CLEAN_UP)
-+			close(data_fd);
-+	}
- 
--	/* tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading" */
-+	/* Tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading"
-+	 * Note: we emit -1 if firmware file wasn't found.
-+	 * There are cases when otherwise kernel would wait for minutes
-+	 * before timing out.
-+	 */
- 	if (cnt > 0)
- 		full_write(loading_fd, "0", 1);
- 	else
-@@ -701,7 +709,6 @@ static void load_firmware(const char *fi
- 	if (ENABLE_FEATURE_CLEAN_UP) {
- 		close(firmware_fd);
- 		close(loading_fd);
--		close(data_fd);
- 	}
- }
- 
diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch
deleted file mode 100644
index 70dc63f467..0000000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- busybox-1.20.0/editors/sed.c
-+++ busybox-1.20.0-sed/editors/sed.c
-@@ -743,7 +743,7 @@ static int do_subst_command(sed_cmd_t *s
- 		 */
- 		if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) {
- 			pipe_putc(*line++);
--			continue;
-+			goto next;
- 		}
- 
- 		match_count++;
-@@ -755,7 +755,7 @@ static int do_subst_command(sed_cmd_t *s
- 		) {
- 			for (i = 0; i < G.regmatch[0].rm_eo; i++)
- 				pipe_putc(*line++);
--			continue;
-+			goto next;
- 		}
- 
- 		/* print everything before the match */
-@@ -773,7 +773,7 @@ static int do_subst_command(sed_cmd_t *s
- 		/* if we're not doing this globally, get out now */
- 		if (sed_cmd->which_match != 0)
- 			break;
--
-+ next:
- 		if (*line == '\0')
- 			break;
- 

From e6e6101bd552f96e32cf935cf6492864795b5364 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 May 2012 04:50:03 +0000
Subject: [PATCH 2080/6849] libmnl: bump to version 1.0.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmnl/libmnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 407ca52a59..52719cd037 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBMNL_VERSION = 1.0.2
+LIBMNL_VERSION = 1.0.3
 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES

From 3797d43017e831f7f8c13bba4eca23563d0df24f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 May 2012 04:50:04 +0000
Subject: [PATCH 2081/6849] libnetfilter_cttimeout: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                   |  1 +
 package/libnetfilter_cttimeout/Config.in            | 13 +++++++++++++
 .../libnetfilter-cttimeout.mk                       | 13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_cttimeout/Config.in
 create mode 100644 package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk

diff --git a/package/Config.in b/package/Config.in
index 360f04fe8e..85a26d5b13 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -406,6 +406,7 @@ source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
+source "package/libnetfilter_cttimeout/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/liboping/Config.in"
diff --git a/package/libnetfilter_cttimeout/Config.in b/package/libnetfilter_cttimeout/Config.in
new file mode 100644
index 0000000000..8e2f438af6
--- /dev/null
+++ b/package/libnetfilter_cttimeout/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
+	bool "libnetfilter_cttimeout"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBMNL
+	help
+	  libnetfilter_cttimeout is the userspace library that provides
+	  the programming interface to the fine-grain
+	  connection tracking timeout infrastructure.
+
+	  http://www.netfilter.org/projects/libnetfilter_cttimeout/
+
+comment "libnetfilter_cttimout requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
new file mode 100644
index 0000000000..b3e1149dcb
--- /dev/null
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# libnetfilter-cttimeout
+#
+#############################################################
+
+LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0
+LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2
+LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
+LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
+LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkg-config libmnl
+
+$(eval $(call AUTOTARGETS))

From 977e9baf10867ef1212a5c3f6bc88da8376576a6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 May 2012 04:50:05 +0000
Subject: [PATCH 2082/6849] conntrack-tools: bump to version 1.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/Config.in          | 6 ++++--
 package/conntrack-tools/conntrack-tools.mk | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index 12eb98852f..be491e6fbf 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_CONNTRACK_TOOLS
 	bool "conntrack-tools"
 	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
 	help
 	  The conntrack-tools are a set of tools targeted at
 	  system administrators.
@@ -10,5 +12,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
 	  http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6 support"
-	depends on !BR2_INET_IPV6
+comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 8b411279bc..6b9ba52b10 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-CONNTRACK_TOOLS_VERSION = 1.0.1
+CONNTRACK_TOOLS_VERSION = 1.2.1
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
-CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config libnetfilter_conntrack
+CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
+	libnetfilter_conntrack libnetfilter_cttimeout
 
 $(eval $(call AUTOTARGETS))

From fb0d20d943e715a11666222ab7b9cbcd945e0088 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 May 2012 04:50:06 +0000
Subject: [PATCH 2083/6849] iptables: bump to version 1.4.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 87578d54ea..5c6a8a6b5d 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.13
+IPTABLES_VERSION = 1.4.14
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 1fa5612194a8639247bd294fbaa1204c7defa932 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Sun, 1 Apr 2012 03:58:48 +0000
Subject: [PATCH 2084/6849] Add mobile-broadband-provider-info package.

[Peter: minor whitespace fixes]
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                   |  1 +
 package/mobile-broadband-provider-info/Config.in    |  6 ++++++
 .../mobile_broadband_provider_info.mk               | 13 +++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/mobile-broadband-provider-info/Config.in
 create mode 100644 package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk

diff --git a/package/Config.in b/package/Config.in
index 85a26d5b13..9087a41b91 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -479,6 +479,7 @@ endmenu
 menu "Miscellaneous"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
+source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
 endmenu
 
diff --git a/package/mobile-broadband-provider-info/Config.in b/package/mobile-broadband-provider-info/Config.in
new file mode 100644
index 0000000000..dda71056e1
--- /dev/null
+++ b/package/mobile-broadband-provider-info/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
+	bool "mobile-broadband-provider-info"
+	help
+	  Mobile broadband provider database.
+
+	  http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
new file mode 100644
index 0000000000..759d0b8da6
--- /dev/null
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# mobile broadband provider info
+#
+#############################################################
+MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511
+MOBILE_BROADBAND_PROVIDER_INFO_SITE = git://git.gnome.org/mobile-broadband-provider-info
+MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
+MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config
+
+MOBILE_BROADBAND_PROVIDER_INFO_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS))

From 60db41fb41f00d1f5faee403ace1bc06626f995c Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Sun, 1 Apr 2012 03:58:49 +0000
Subject: [PATCH 2085/6849] Add ofono package

[Peter: add upstream URL, fix dep, drop explicit bluetooth option, no AUTORECONF]
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/ofono/Config.in | 16 ++++++++++++++++
 package/ofono/ofono.mk  | 31 +++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 package/ofono/Config.in
 create mode 100644 package/ofono/ofono.mk

diff --git a/package/Config.in b/package/Config.in
index 9087a41b91..ca8fc962d4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -207,6 +207,7 @@ source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
+source "package/ofono/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
 source "package/parted/Config.in"
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
new file mode 100644
index 0000000000..fc6c9c6824
--- /dev/null
+++ b/package/ofono/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_OFONO
+	bool "ofono"
+	depends on BR2_USE_WCHAR # gettext/libglib2
+	select BR2_PACKAGE_LIBCAP_NG
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
+	help
+	  oFono is a free, open source project for mobile telephony
+	  (GSM/UMTS) applications. It uses high-level D-Bus API for
+	  use by telephony applications. It uses 3GPP standard.
+
+	  http://ofono.org/
+
+comment "ofono requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
new file mode 100644
index 0000000000..c49ee2947b
--- /dev/null
+++ b/package/ofono/ofono.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# ofono
+#
+#############################################################
+OFONO_VERSION = 1.5
+OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
+OFONO_DEPENDENCIES = \
+	host-pkg-config \
+	dbus \
+	libglib2 \
+	libcap-ng \
+	mobile-broadband-provider-info
+
+OFONO_CONF_OPT = --disable-test
+
+ifeq ($(BR2_PACKAGE_UDEV),y)
+	OFONO_CONF_OPT += --enable-udev
+	OFONO_DEPENDENCIES += udev
+else
+	OFONO_CONF_OPT += --disable-udev
+endif
+
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+	OFONO_CONF_OPT += --enable-bluetooth
+	OFONO_DEPENDENCIES += bluez_utils
+else
+	OFONO_CONF_OPT += --disable-bluetooth
+endif
+
+$(eval $(call AUTOTARGETS))

From 749c5b40cdcac1cd5a8d74985d0bf9fdec8447f3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 May 2012 09:48:00 +0200
Subject: [PATCH 2086/6849] ofono: fix build on uClibc without backtrace
 support

Identical to connman patch as this code seems to be cut'n'pasted.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ofono/ofono-uclibc-backtrace.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/ofono/ofono-uclibc-backtrace.patch

diff --git a/package/ofono/ofono-uclibc-backtrace.patch b/package/ofono/ofono-uclibc-backtrace.patch
new file mode 100644
index 0000000000..8499bcfb93
--- /dev/null
+++ b/package/ofono/ofono-uclibc-backtrace.patch
@@ -0,0 +1,44 @@
+[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE
+
+Backtrace support is only used for logging on signal errors, which
+isn't really critical, so simply remove backtrace info if not
+available in uClibc.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/log.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: ofono-1.5/src/log.c
+===================================================================
+--- ofono-1.5.orig/src/log.c
++++ ofono-1.5/src/log.c
+@@ -30,7 +30,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
++#include <features.h>
++/* backtrace support is optional on uClibc */
++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
++#define HAVE_BACKTRACE
+ #include <execinfo.h>
++#endif
+ #include <dlfcn.h>
+ 
+ #include "ofono.h"
+@@ -115,6 +120,7 @@
+ 
+ static void print_backtrace(unsigned int offset)
+ {
++#ifdef HAVE_BACKTRACE
+ 	void *frames[99];
+ 	size_t n_ptrs;
+ 	unsigned int i;
+@@ -213,6 +219,7 @@
+ 
+ 	close(outfd[1]);
+ 	close(infd[0]);
++#endif /* HAVE_BACKTRACE */
+ }
+ 
+ static void signal_handler(int signo)

From 41b2e7d9f9f1dc5c36567dec9aeaff6d0bf04003 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 May 2012 09:55:13 +0200
Subject: [PATCH 2087/6849] ofono: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ofono/ofono.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index c49ee2947b..c6ffb64cf6 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -3,7 +3,7 @@
 # ofono
 #
 #############################################################
-OFONO_VERSION = 1.5
+OFONO_VERSION = 1.6
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_DEPENDENCIES = \
 	host-pkg-config \

From ffc4afe084a76e7246bd373c73b706f512a86c2b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 29 May 2012 10:05:04 +0200
Subject: [PATCH 2088/6849] pptp-linux: fix build with high BR2_JLEVEL settings

The pptp-linux build system is not robust against parallel builds.

Fixes http://autobuild.buildroot.net/results/a75fab3f04d03cb39cd41a86b6f57307198ba5f1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pptp-linux/pptp-linux.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 77ae34d8de..d4c5bc4ee6 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -7,6 +7,7 @@
 PPTP_LINUX_VERSION = 1.7.2
 PPTP_LINUX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pptpclient
 PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
+PPTP_LINUX_MAKE = $(MAKE1)
 
 define PPTP_LINUX_BUILD_CMDS
 	$(MAKE) -C $(@D) OPTIMIZE= DEBUG= \

From 103b816fe19e2c007bdcf45b59a7a10cfadcc19f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 30 May 2012 11:04:36 +0200
Subject: [PATCH 2089/6849] mobile-broadband-provider-info: use release tarball
 instead of git

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mobile_broadband_provider_info.mk                         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index 759d0b8da6..83f71d34aa 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -4,10 +4,8 @@
 #
 #############################################################
 MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511
-MOBILE_BROADBAND_PROVIDER_INFO_SITE = git://git.gnome.org/mobile-broadband-provider-info
+MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
 MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
 MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config
 
-MOBILE_BROADBAND_PROVIDER_INFO_AUTORECONF = YES
-
 $(eval $(call AUTOTARGETS))

From 2105ecbd86d04e446effa11108f6bd755ed5f19a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 May 2012 15:13:21 -0300
Subject: [PATCH 2090/6849] nfs-utils: bump to version 1.2.6

Bump nfs-utils to version 1.2.6
Portmap or rpcbind (which we don't have) is required so select it.
Remove nfsiostat if there's no target python.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nfs-utils/Config.in                   |  1 +
 .../nfs-utils-1.2.3-susv3-legacy.patch        | 54 ---------------
 .../nfs-utils/nfs-utils-conditionals.patch    | 58 ++++++++++++++++
 package/nfs-utils/nfs-utils-cross-build.patch | 68 +++++++++++++++++++
 ...s.patch => nfs-utils-dont-mix-flags.patch} |  0
 .../nfs-utils/nfs-utils-susv3-legacy.patch    | 59 ++++++++++++++++
 ...h.patch => nfs-utils-uclibc-libio.h.patch} |  0
 package/nfs-utils/nfs-utils.mk                | 14 +++-
 8 files changed, 198 insertions(+), 56 deletions(-)
 delete mode 100644 package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch
 create mode 100644 package/nfs-utils/nfs-utils-conditionals.patch
 create mode 100644 package/nfs-utils/nfs-utils-cross-build.patch
 rename package/nfs-utils/{nfs-utils-1.2.3-dont-mix-flags.patch => nfs-utils-dont-mix-flags.patch} (100%)
 create mode 100644 package/nfs-utils/nfs-utils-susv3-legacy.patch
 rename package/nfs-utils/{nfs-utils-1.2.3-uclibc-libio.h.patch => nfs-utils-uclibc-libio.h.patch} (100%)

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 774395b574..67d25a73dd 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_NFS_UTILS
 	bool "nfs-utils"
 	depends on BR2_INET_RPC
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_PORTMAP
 	help
 	  The NFS Linux kernel server.
 	  Warning: We do not force largefile support on here on purpose.
diff --git a/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch b/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch
deleted file mode 100644
index 3504e2d72f..0000000000
--- a/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Use the strchr() function instead of the legacy index() function.
-
-Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
---- 1/utils/mountd/fsloc.c
-+++ 2/utils/mountd/fsloc.c
-@@ -126,7 +126,7 @@
- 	struct servers *rv=NULL;
- 
- 	xlog(L_NOTICE, "method_list(%s)\n", data);
--	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
-+	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
- 		ptr++;
- 	list = malloc(listsize * sizeof(char *));
- 	copy = strdup(data);
---- 1/support/nfs/nfs_mntent.c
-+++ 2/support/nfs/nfs_mntent.c
-@@ -9,7 +9,7 @@
-  */
- 
- #include <stdio.h>
--#include <string.h>		/* for index */
-+#include <string.h>		/* for strchr */
- #include <ctype.h>		/* for isdigit */
- #include <sys/stat.h>		/* for umask */
- 
-@@ -163,7 +163,7 @@
- 			return NULL;
- 
- 		mfp->mntent_lineno++;
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* Missing final newline?  Otherwise extremely */
- 			/* long line - assume file was corrupted */
-@@ -171,7 +171,7 @@
- 				fprintf(stderr, _("[mntent]: warning: no final "
- 					"newline at the end of %s\n"),
- 					mfp->mntent_file);
--				s = index (buf, 0);
-+				s = strchr (buf, 0);
- 			} else {
- 				mfp->mntent_errs = 1;
- 				goto err;
---- 1/utils/mount/error.c
-+++ 2/utils/mount/error.c
-@@ -62,7 +62,7 @@
- 	char *tmp;
- 
- 	if (estr) {
--		if ((ptr = index(estr, ':')))
-+		if ((ptr = strchr(estr, ':')))
- 			estr = ++ptr;
- 
- 		tmp = &errbuf[spos];
diff --git a/package/nfs-utils/nfs-utils-conditionals.patch b/package/nfs-utils/nfs-utils-conditionals.patch
new file mode 100644
index 0000000000..a2342b36b9
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-conditionals.patch
@@ -0,0 +1,58 @@
+From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Thu, 17 May 2012 16:26:44 -0700
+Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional
+ execution.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Automake does not support conditional AM_CONDITIONAL calls; what that
+means is that you always have to execute AM_CONDITIONAL one way or the
+other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
+executed only when NFSv4 is enabled, which breaks building with
+--disable-nfsv4.
+
+Remove the SQLite3 conditional altogether as it's never used, and move
+the nfsdcld conditional outside of the conditional code.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ aclocal/libsqlite3.m4 |    1 -
+ configure.ac          |    3 +--
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
+index 73d1e46..8c38993 100644
+--- a/aclocal/libsqlite3.m4
++++ b/aclocal/libsqlite3.m4
+@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
+     LIBS="$saved_LIBS"])
+ 
+   AC_MSG_RESULT($libsqlite3_cv_is_recent)
+-  AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
+ ])dnl
+diff --git a/configure.ac b/configure.ac
+index 9ba53e2..b408f1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
+ 	fi
+   fi
+ 
+-  AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+-
+   dnl librpcsecgss already has a dependency on libgssapi,
+   dnl but we need to make sure we get the right version
+   if test "$enable_gss" = yes; then
+@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
+ fi
+ 
+ dnl enable nfsidmap when its support by libnfsidmap
++AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+ AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+ 
+ 
+-- 
+1.7.8.6
+
diff --git a/package/nfs-utils/nfs-utils-cross-build.patch b/package/nfs-utils/nfs-utils-cross-build.patch
new file mode 100644
index 0000000000..43928bf503
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-cross-build.patch
@@ -0,0 +1,68 @@
+Patch taken from Gentoo.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/tools/locktest/Makefile.am
++++ b/tools/locktest/Makefile.am
+@@ -1,12 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ CC=$(CC_FOR_BUILD)
+-LIBTOOL = @LIBTOOL@ --tag=CC
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ noinst_PROGRAMS = testlk
+ testlk_SOURCES = testlk.c
+-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
+-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+--- a/tools/rpcdebug/Makefile.am
++++ b/tools/rpcdebug/Makefile.am
+@@ -1,15 +1,14 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ CC=$(CC_FOR_BUILD)
+-LIBTOOL = @LIBTOOL@ --tag=CC
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ man8_MANS = rpcdebug.man
+ EXTRA_DIST = $(man8_MANS)
+ 
+ sbin_PROGRAMS = rpcdebug
+ rpcdebug_SOURCES = rpcdebug.c
+-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
+-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
+-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+--- a/tools/rpcgen/Makefile.am
++++ b/tools/rpcgen/Makefile.am
+@@ -1,7 +1,9 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ CC=$(CC_FOR_BUILD)
+-LIBTOOL = @LIBTOOL@ --tag=CC
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
+ noinst_PROGRAMS = rpcgen
+ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
+@@ -9,10 +11,6 @@
+ 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
+ 		 rpc_scan.h rpc_util.h
+ 
+-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
+-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
+-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+-rpcgen_LDADD=$(LIBTIRPC)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+ EXTRA_DIST = rpcgen.new.1
diff --git a/package/nfs-utils/nfs-utils-1.2.3-dont-mix-flags.patch b/package/nfs-utils/nfs-utils-dont-mix-flags.patch
similarity index 100%
rename from package/nfs-utils/nfs-utils-1.2.3-dont-mix-flags.patch
rename to package/nfs-utils/nfs-utils-dont-mix-flags.patch
diff --git a/package/nfs-utils/nfs-utils-susv3-legacy.patch b/package/nfs-utils/nfs-utils-susv3-legacy.patch
new file mode 100644
index 0000000000..66dd181db5
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-susv3-legacy.patch
@@ -0,0 +1,59 @@
+Switch legacy index() in favour of strchr()
+Updated for 1.2.6 from the previous patch by Frederik Pasch.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support/nfs/nfs_mntent.c
+--- nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c	2012-05-29 10:06:37.901255998 -0300
++++ nfs-utils-1.2.6/support/nfs/nfs_mntent.c	2012-05-29 10:06:45.726312410 -0300
+@@ -9,7 +9,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <string.h>		/* for index */
++#include <string.h>		/* for strchr */
+ #include <ctype.h>		/* for isdigit */
+ #include <sys/stat.h>		/* for umask */
+ #include <unistd.h>		/* for ftruncate */
+@@ -172,7 +172,7 @@
+ 			return NULL;
+ 
+ 		mfp->mntent_lineno++;
+-		s = index (buf, '\n');
++		s = strchr (buf, '\n');
+ 		if (s == NULL) {
+ 			/* Missing final newline?  Otherwise extremely */
+ 			/* long line - assume file was corrupted */
+@@ -180,7 +180,7 @@
+ 				fprintf(stderr, _("[mntent]: warning: no final "
+ 					"newline at the end of %s\n"),
+ 					mfp->mntent_file);
+-				s = index (buf, 0);
++				s = strchr (buf, 0);
+ 			} else {
+ 				mfp->mntent_errs = 1;
+ 				goto err;
+diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/error.c
+--- nfs-utils-1.2.6.orig/utils/mount/error.c	2012-05-29 10:06:37.946256325 -0300
++++ nfs-utils-1.2.6/utils/mount/error.c	2012-05-29 10:06:45.727312416 -0300
+@@ -62,7 +62,7 @@
+ 	char *tmp;
+ 
+ 	if (estr) {
+-		if ((ptr = index(estr, ':')))
++		if ((ptr = strchr(estr, ':')))
+ 			estr = ++ptr;
+ 
+ 		tmp = &errbuf[spos];
+diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mountd/fsloc.c
+--- nfs-utils-1.2.6.orig/utils/mountd/fsloc.c	2012-05-29 10:06:37.911256072 -0300
++++ nfs-utils-1.2.6/utils/mountd/fsloc.c	2012-05-29 10:07:11.140322564 -0300
+@@ -127,7 +127,7 @@
+ 	bool v6esc = false;
+ 
+ 	xlog(L_NOTICE, "method_list(%s)", data);
+-	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
++	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
+ 		ptr++;
+ 	list = malloc(listsize * sizeof(char *));
+ 	copy = strdup(data);
diff --git a/package/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch b/package/nfs-utils/nfs-utils-uclibc-libio.h.patch
similarity index 100%
rename from package/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch
rename to package/nfs-utils/nfs-utils-uclibc-libio.h.patch
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 557e7e8cc3..87c136c3d6 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -3,14 +3,17 @@
 # nfs-utils
 #
 #############################################################
-NFS_UTILS_VERSION = 1.2.3
+
+NFS_UTILS_VERSION = 1.2.6
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
-NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nfs/
+NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
+NFS_UTILS_AUTORECONF = YES
 
 NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
 
 NFS_UTILS_CONF_OPT = \
 		--disable-nfsv4 \
+		--disable-nfsv41 \
 		--disable-gss \
 		--disable-tirpc \
 		--disable-uuid \
@@ -28,6 +31,13 @@ define NFS_UTILS_INSTALL_FIXUP
 	rm -f $(NFS_UTILS_TARGETS_)
 endef
 
+define NFS_UTILS_REMOVE_NFSIOSTAT
+	rm -f $(TARGET_DIR)/usr/sbin/nfsiostat
+endef
+
 NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
 
+# nfsiostat is interpreted python, so remove it unless it's in the target
+NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
+
 $(eval $(call AUTOTARGETS))

From 37297183507a4b43c3a15e9c078d2c760898a2c9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 30 May 2012 22:39:13 +0200
Subject: [PATCH 2091/6849] docs/docs.html: Point users to html asciidoc
 documentation

Rather than the outdated buildroot.html. The asciidoc documentation is
still not autogenerated from git, instead a static snapshot is made per
release (like we did for /downloads/buildroot.html).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/docs.html | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/docs/docs.html b/docs/docs.html
index 851d1d28cc..65eaff1c4f 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -2,15 +2,10 @@
 
 <h3>Documentation</h3>
 
-<p>Our document "Buildroot usage and documentation" is where you want
-to start reading if you wish to understand how Buildroot work, or wish
-to change/extend/fix things. If you find any errors (factual,
-grammatical, whatever) please report them. Choose between:</p>
-
-<ul>
-  <li><a href="/downloads/buildroot.html">Latest stable release</a></li>
-  <li><a href="buildroot.html">GIT head revision</a></li>
-</ul>
+<p>The <a href="/downloads/manual/manual.html">Buildroot user manual</a>
+is where you want to start reading if you wish to understand how
+Buildroot works, or wish to change/extend/fix things. If you find any
+errors (factual, grammatical, whatever) please report them to us.</p>
 
 <p>If you find that you need help with Buildroot, you can ask for
 help:</p>

From bce34ab199dea7e8430971ae31d743e246049785 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 30 May 2012 23:23:07 +0200
Subject: [PATCH 2092/6849] Update for 2012.05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  4 ++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  9 +++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4a8bed02d2..5043bc9f9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2012.05, Released May 30th, 2012:
+
+	Updated/fixed packages: busybox, netsnmp, pptp-linux
+
 2012.05-rc3, Released May 25th, 2012:
 
 	Minor fixes around the tree.
diff --git a/Makefile b/Makefile
index 4945c16ce3..98e1a51876 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.05-rc3
+export BR2_VERSION:=2012.05
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 57c8be5ceb..d23e7e9f54 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2012.02</b>, which can be downloaded
+The latest stable release is <b>2012.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2012.02.tar.gz">buildroot-2012.02.tar.gz</a>
+<a href="/downloads/buildroot-2012.05.tar.gz">buildroot-2012.05.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2012.05-rc3</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.05-rc3.tar.bz2">buildroot-2012.05-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 94d1d94287..8b52650183 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>30 May 2012 -- 2012.05 released</b>
+
+    <p>The stable 2012.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05">CHANGES</a>
+    file for more details
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05.tar.bz2">2012.05 release</a>.</p>
+
   <li><b>25 May 2012 -- 2012.05-rc3 released</b>
 
     <p>RC3 is out with more bugfixes - See the <a

From 5b11223fb6cd0469becf49b0986868832c076bfc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 31 May 2012 09:17:10 +0200
Subject: [PATCH 2093/6849] Kickoff 2012.08 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 5043bc9f9d..b526c58ce3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2012.08, Not released yet:
+
 2012.05, Released May 30th, 2012:
 
 	Updated/fixed packages: busybox, netsnmp, pptp-linux
diff --git a/Makefile b/Makefile
index 98e1a51876..9a9634d549 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.05
+export BR2_VERSION:=2012.08-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From 54f88ee8eed9d3ae7ab670d14ba77a97a44caaca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 31 May 2012 13:16:10 +0200
Subject: [PATCH 2094/6849] nfs-utils: needs pkg-config

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nfs-utils/nfs-utils.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 87c136c3d6..a7c42fbfe4 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -8,6 +8,7 @@ NFS_UTILS_VERSION = 1.2.6
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
 NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
 NFS_UTILS_AUTORECONF = YES
+NFS_UTILS_DEPENDENCIES = host-pkg-config
 
 NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
 

From f809eb20214d7c0c7f552d7009022180f3f690ff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 31 May 2012 23:27:09 +0200
Subject: [PATCH 2095/6849] news.html: add 2012.05 announcement mail link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 8b52650183..256d3b9826 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>The stable 2012.05 release is out - Thanks to everyone
     contributing and testing the release candidates. See the
     <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05">CHANGES</a>
-    file for more details
+    file for more details, read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-May/054342.html">announcement</a>
     and go to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.05.tar.bz2">2012.05 release</a>.</p>
 

From cc9b0ba064a00e965d2e8ee6aacbf17a89071e15 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Jun 2012 21:20:45 +0200
Subject: [PATCH 2096/6849] package: add ortp

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      | 1 +
 package/ortp/Config.in | 6 ++++++
 package/ortp/ortp.mk   | 5 +++++
 3 files changed, 12 insertions(+)
 create mode 100644 package/ortp/Config.in
 create mode 100644 package/ortp/ortp.mk

diff --git a/package/Config.in b/package/Config.in
index ca8fc962d4..3e97ae536d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -418,6 +418,7 @@ source "package/libsoup/Config.in"
 source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
+source "package/ortp/Config.in"
 source "package/zeromq/Config.in"
 endmenu
 
diff --git a/package/ortp/Config.in b/package/ortp/Config.in
new file mode 100644
index 0000000000..39d9c9a3a0
--- /dev/null
+++ b/package/ortp/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ORTP
+	bool "oRTP"
+	help
+	  oRTP, a Real-time Transport Protocol (RTP,RFC3550) library
+
+	  http://www.linphone.org/eng/documentation/dev/ortp.html
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
new file mode 100644
index 0000000000..f47af8a1ad
--- /dev/null
+++ b/package/ortp/ortp.mk
@@ -0,0 +1,5 @@
+ORTP_VERSION = 0.20.0
+ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
+ORTP_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))

From fdf093b7cef81cc9cbf8bdab3a7e2d88a02d611d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Jun 2012 21:21:28 +0200
Subject: [PATCH 2097/6849] package: add mediastreamer

It doesn't really need C++ support on Linux, but the configure script
checks for it (and fails if not available), and the package is not easy
to autoreconf as there's C++ source files for Android/Windows, causing
automake to fail if AC_PROG_CXX isn't set.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/mediastreamer/Config.in        | 16 ++++++
 package/mediastreamer/mediastreamer.mk | 77 ++++++++++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 package/mediastreamer/Config.in
 create mode 100644 package/mediastreamer/mediastreamer.mk

diff --git a/package/Config.in b/package/Config.in
index 3e97ae536d..dde5800867 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -388,6 +388,7 @@ source "package/libogg/Config.in"
 source "package/libplayer/Config.in"
 source "package/libtheora/Config.in"
 source "package/live555/Config.in"
+source "package/mediastreamer/Config.in"
 endmenu
 
 menu "Networking"
diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
new file mode 100644
index 0000000000..2e1af93790
--- /dev/null
+++ b/package/mediastreamer/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_MEDIASTREAMER
+	bool "mediastreamer"
+	select BR2_PACKAGE_ORTP
+	depends on BR2_INSTALL_LIBSTDCPP # until fixed
+	help
+	  Mediastreamer is a powerful and lightweighted streaming
+	  engine specialized for voice/video telephony applications.
+
+	  It is the library that is responsible for all the receiving
+	  and sending of multimedia streams in linphone, including
+	  voice/video capture, encoding and decoding, and rendering.
+
+	  http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
+
+comment "mediastreamer requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
new file mode 100644
index 0000000000..bea6fb3d28
--- /dev/null
+++ b/package/mediastreamer/mediastreamer.mk
@@ -0,0 +1,77 @@
+MEDIASTREAMER_VERSION = 2.8.2
+MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
+MEDIASTREAMER_INSTALL_STAGING = YES
+MEDIASTREAMER_DEPENDENCIES = host-pkg-config ortp
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+MEDIASTREAMER_CONF_OPT += --enable-alsa
+MEDIASTREAMER_DEPENDENCIES += alsa-lib
+else
+MEDIASTREAMER_CONF_OPT += --disable-alsa
+endif
+
+ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
+MEDIASTREAMER_CONF_OPT += --enable-portaudio
+MEDIASTREAMER_DEPENDENCIES += portaudio
+else
+MEDIASTREAMER_CONF_OPT += --disable-portaudio
+endif
+
+ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
+MEDIASTREAMER_CONF_OPT += --enable-pulseaudio
+MEDIASTREAMER_DEPENDENCIES += pulseaudio
+else
+MEDIASTREAMER_CONF_OPT += --disable-pulseaudio
+endif
+
+ifeq ($(BR2_PACKAGE_SPEEX),y)
+MEDIASTREAMER_CONF_OPT += --enable-speex
+MEDIASTREAMER_DEPENDENCIES += speex
+else
+MEDIASTREAMER_CONF_OPT += --disable-speex
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
+MEDIASTREAMER_CONF_OPT += --enable-ffmpeg
+MEDIASTREAMER_DEPENDENCIES += ffmpeg
+else
+MEDIASTREAMER_CONF_OPT += --disable-ffmpeg
+endif
+
+ifeq ($(BR2_PACKAGE_SDL),y)
+MEDIASTREAMER_CONF_OPT += --enable-sdl
+MEDIASTREAMER_DEPENDENCIES += sdl
+else
+MEDIASTREAMER_CONF_OPT += --disable-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+MEDIASTREAMER_CONF_OPT += --enable-x11
+MEDIASTREAMER_DEPENDENCIES += xlib_libX11
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
+MEDIASTREAMER_CONF_OPT += --enable-xv
+MEDIASTREAMER_DEPENDENCIES += xlib_libXv
+else
+MEDIASTREAMER_CONF_OPT += --disable-xv
+endif
+
+else
+MEDIASTREAMER_CONF_OPT += --disable-x11
+endif
+
+ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
+MEDIASTREAMER_CONF_OPT += --enable-theora
+MEDIASTREAMER_DEPENDENCIES += libtheora
+else
+MEDIASTREAMER_CONF_OPT += --disable-theora
+endif
+
+ifeq ($(BR2_PACKAGE_LIBV4L),y)
+MEDIASTREAMER_CONF_OPT += --enable-libv4l1 --enable-libv4l2
+MEDIASTREAMER_DEPENDENCIES += libv4l
+else
+MEDIASTREAMER_CONF_OPT += --disable-libv4l1 --disable-libv4l2
+endif
+
+$(eval $(call AUTOTARGETS))

From 96f41055068e54e734edc99c88ec46aa40d8ced5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Jun 2012 21:25:00 +0200
Subject: [PATCH 2098/6849] linphone: use external ortp/mediastreamer libraries

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linphone/Config.in   | 6 ++++++
 package/linphone/linphone.mk | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index 31c28d8b4b..1a6cfdb00b 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_LINPHONE
 	bool "linphone"
 	select BR2_PACKAGE_LIBEXOSIP2
 	select BR2_PACKAGE_SPEEX
+	select BR2_PACKAGE_ORTP
+	select BR2_PACKAGE_MEDIASTREAMER
+	depends on BR2_INSTALL_LIBSTDCPP # mediastreamer
 	help
 	  Linphone is an internet phone or Voice Over IP phone (VoIP).
 
@@ -19,3 +22,6 @@ config BR2_PACKAGE_LINPHONE
 	  client, linphonec, and video support is not enabled.
 
 	  http://www.linphone.org/
+
+comment "linphone requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index 6ba6b53334..b34fbf741b 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -6,7 +6,11 @@
 
 LINPHONE_VERSION = 3.5.2
 LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
-LINPHONE_CONF_OPT = --disable-video --disable-gtk_ui
-LINPHONE_DEPENDENCIES = libeXosip2 speex
+LINPHONE_CONF_OPT = \
+	--disable-gtk_ui \
+	--enable-external-ortp \
+	--enable-external-mediastreamer
+
+LINPHONE_DEPENDENCIES = host-pkg-config ortp mediastreamer libeXosip2 speex
 
 $(eval $(call AUTOTARGETS))

From 1a3045f209d651ebbe1e5e87ccb7686e8ea595a5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 00:04:16 +0200
Subject: [PATCH 2099/6849] linphone: add optional gtk support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linphone/linphone.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index b34fbf741b..c6d571d255 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -7,10 +7,16 @@
 LINPHONE_VERSION = 3.5.2
 LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
 LINPHONE_CONF_OPT = \
-	--disable-gtk_ui \
 	--enable-external-ortp \
 	--enable-external-mediastreamer
 
 LINPHONE_DEPENDENCIES = host-pkg-config ortp mediastreamer libeXosip2 speex
 
+ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
+LINPHONE_CONF_OPT += --enable-gtk_ui
+LINPHONE_DEPENDENCIES += libgtk2
+else
+LINPHONE_CONF_OPT += --disable-gtk_ui
+endif
+
 $(eval $(call AUTOTARGETS))

From f865a2105654f281de1bcc6041b350b131720ace Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 13:58:41 +0200
Subject: [PATCH 2100/6849] mediastreamer: fix intltool dependency

Fixes http://autobuild.buildroot.net/results/c93c1bc01feeea0ff37cb33c81d8712281a01c00

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mediastreamer/mediastreamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index bea6fb3d28..8327a55a17 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -1,7 +1,7 @@
 MEDIASTREAMER_VERSION = 2.8.2
 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
 MEDIASTREAMER_INSTALL_STAGING = YES
-MEDIASTREAMER_DEPENDENCIES = host-pkg-config ortp
+MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkg-config ortp
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 MEDIASTREAMER_CONF_OPT += --enable-alsa

From d6d52903bba357f3bc18d1736e97e4da2ad91c00 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 14:00:13 +0200
Subject: [PATCH 2101/6849] gnutls: fix libgcrypt handling with external
 toolchains

The explicit gnutls prefix in combination with the libc.so linker script
and non-default sysroot seems to confuse external toolchains, causing
configure to error out. Workaround it by not using an explicit libgcrypt
prefix as it is installed in the sysroot anyway.

Fixes http://autobuild.buildroot.net/results/3b3901bea904bf32bccbd3e9a4274d604776cb98

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index f7238aaae2..45323f2f2c 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -8,7 +8,7 @@ GNUTLS_VERSION = 2.12.19
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt
-GNUTLS_CONF_OPT = --with-libgcrypt --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
+GNUTLS_CONF_OPT = --with-libgcrypt \
 		--without-p11-kit
 GNUTLS_INSTALL_STAGING = YES
 

From fdba8d85e034d64abec25c791d34f91ac09f92ae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 14:02:54 +0200
Subject: [PATCH 2102/6849] connman: fixup libglib2 (gettext) dependencies

Connman was missing from commit b730010c90a (package: gettext needs
WCHAR support).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 3373ec1aa8..ebe0cee07d 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
+	depends on BR2_USE_WCHAR # libglib2
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
 	  managing internet connections within embedded devices running
@@ -44,5 +45,5 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain with resolver support"
-	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32
+comment "connman needs a toolchain with WCHAR and resolver support"
+	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || !BR2_USE_WCHAR

From 34ea3b3c6461423ba8ad43089a15498f8cc1eb32 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 14:10:47 +0200
Subject: [PATCH 2103/6849] connman: needs IPv6 support in toolchain

Fixes http://autobuild.buildroot.net/results/c405f9b3a59463fb7367daeb63e282c5d60f0685

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index ebe0cee07d..c9bc94f06e 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
 	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_INET_IPV6
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
 	  managing internet connections within embedded devices running
@@ -45,5 +46,5 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain with WCHAR and resolver support"
-	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || !BR2_USE_WCHAR
+comment "connman needs a toolchain with IPv6, WCHAR and resolver support"
+	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || !BR2_USE_WCHAR || !BR2_INET_IPV6

From 3bc0d5be844f41cf58120ffc3d306eeae8868cc9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 16:14:43 +0200
Subject: [PATCH 2104/6849] gnutls: add optional zlib support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 45323f2f2c..d8ca16b32c 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -7,7 +7,7 @@
 GNUTLS_VERSION = 2.12.19
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
-GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt
+GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
 GNUTLS_CONF_OPT = --with-libgcrypt \
 		--without-p11-kit
 GNUTLS_INSTALL_STAGING = YES

From 50995f43e18032a386bf2a4b0de47f2322a110a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Jun 2012 23:07:31 +0200
Subject: [PATCH 2105/6849] pulseaudio: fix build error on toolchains without
 C++ support

The optional webrtc echo canceller is written in C++, causing auto* to want
to link module-echo-cancel.so with CXX even if webrtc ISN'T used.
If we don't have C++ support enabled in BR, CXX will point to /bin/false,
which makes configure think we aren't able to create C++ .so files
(arguable true), breaking the build when it tries to install the .so
workaround it by patching up the libtool invocations to use C mode instead.

Fixes http://autobuild.buildroot.net/results/114e5bf0086f2394b36f17a70cb54b357a72413c

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 175adfa4c1..6d05822156 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -32,6 +32,21 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
+ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
+# The optional webrtc echo canceller is written in C++, causing auto* to want
+# to link module-echo-cancel.so with CXX even if webrtc ISN'T used.
+# If we don't have C++ support enabled in BR, CXX will point to /bin/false,
+# which makes configure think we aren't able to create C++ .so files
+# (arguable true), breaking the build when it tries to install the .so
+# workaround it by patching up the libtool invocations to use C mode instead
+define PULSEAUDIO_FORCE_CC
+	$(SED) 's/--tag=CXX/--tag=CC/g' -e 's/(CXXLD)/(CCLD)/g' \
+		$(@D)/src/Makefile.in
+endef
+
+PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC
+endif
+
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa

From e08c28f945fff0bdb1ff0342aa25e84a92eb2c83 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 4 Jun 2012 08:48:31 +0000
Subject: [PATCH 2106/6849] webrtc-audio-processing: disable unsupported target
 architectures

Currently, webrtc-audio-processing only provides support for the following
architectures (see src/typedefs.h from the source directory):
- x86_64
- i*86
- armel

Fixes http://autobuild.buildroot.org/results/ff777bb06eddafa71327015e1d39fe911c1439d8

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webrtc-audio-processing/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in
index e33fc57dbb..90341d69fe 100644
--- a/package/webrtc-audio-processing/Config.in
+++ b/package/webrtc-audio-processing/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
 	bool "webrtc-audio-processing"
+	depends on BR2_arm || BR2_i386 || BR2_x86_64
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  AudioProcessing library based on Google's implementation of

From bfd401200be586fc30ba6b141c5c65421d3deb66 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Jun 2012 09:40:34 +0000
Subject: [PATCH 2107/6849] kernel-headers: bump 3.{0, 2, 3, 4}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 ....7-fix-umode_t.patch => linux-3.3.8-fix-umode_t.patch} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.33-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)
 rename toolchain/kernel-headers/{linux-3.3.7-fix-umode_t.patch => linux-3.3.8-fix-umode_t.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 17fe7978c4..ea7c99cb33 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.32"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.33"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.18"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.7"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4"		if BR2_KERNEL_HEADERS_3_4
+	default "3.2.19"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
+	default "3.4.1"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.33-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.33-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.8-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch
rename to toolchain/kernel-headers/linux-3.3.8-fix-umode_t.patch

From 05d7b16f53dcfeeba28d4932958458dbb49c6683 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Jun 2012 09:40:35 +0000
Subject: [PATCH 2108/6849] linux: bump default to kernel version 3.4.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 4562b1b6ee..83dac3f159 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_3_3
+	default BR2_LINUX_KERNEL_3_4
 
-config BR2_LINUX_KERNEL_3_3
-	bool "3.3.7"
+config BR2_LINUX_KERNEL_3_4
+	bool "3.4.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.7" if BR2_LINUX_KERNEL_3_3
+	default "3.4.1" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 48189d95001c41969ffddad427aaf73a9b57bc15 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 2 Jun 2012 05:09:03 +0000
Subject: [PATCH 2109/6849] php: fix build error for snmp extension

PHP requires that net-snmp be built with the ability to load MIB code,
so force it on when the extension is enabled.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/Config.ext | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index fa73bb4de0..80bab70da3 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -219,6 +219,7 @@ config BR2_PACKAGE_PHP_EXT_FTP
 config BR2_PACKAGE_PHP_EXT_SNMP
 	bool "SNMP"
 	select BR2_PACKAGE_NETSNMP
+	select BR2_PACKAGE_NETSNMP_ENABLE_MIBS
 	help
 	  SNMP support
 

From 4991fbbdb4aef7f5a7bf22a62872b8b59163102a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 2 Jun 2012 06:27:45 +0000
Subject: [PATCH 2110/6849] quagga: fix non-IPv6 build failures

The Zebra daemon now requires IPv6 support so disable it for non-IPv6
toolchains and add a comment mentioning it.
The BABEL protocol/daemon also requires IPv6 so just enable it when it's
available.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 5a01863ab7..0834201d4d 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -10,11 +10,16 @@ if BR2_PACKAGE_QUAGGA
 
 config BR2_PACKAGE_QUAGGA_ZEBRA
 	bool "zebra daemon"
+	depends on BR2_INET_IPV6
 	help
 	  Build zebra daemon.
 
+comment "Zebra daemon requires a toolchain with IPV6 support"
+	depends on BR2_PACKAGE_QUAGGA && !BR2_INET_IPV6
+
 config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
 	bool "Use TCP sockets between zebra and protocol daemons"
+	depends on BR2_PACKAGE_QUAGGA_ZEBRA
 	help
 	  Use a TCP socket to communicate between zebra (supervisor) and
 	  the different protocol daemons.
@@ -24,6 +29,7 @@ config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
 
 config BR2_PACKAGE_QUAGGA_BABELD
 	bool "BABEL protocol"
+	depends on BR2_INET_IPV6
 	help
 	  Build babeld daemon.
 

From 74da2cca30852cc12c5f6e83be39e301aff74d62 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 07:41:51 +0000
Subject: [PATCH 2111/6849] beecrypt: fix build failure of C++ code with g++
 4.7

This fixes
http://autobuild.buildroot.org/results/5c1e904b201676275465c902ba3c09951973755c/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/beecrypt/beecrypt.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index a0187cee6c..7642c1b8e8 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -7,6 +7,13 @@ BEECRYPT_VERSION = 4.2.1
 BEECRYPT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/beecrypt
 BEECRYPT_AUTORECONF = YES
 BEECRYPT_INSTALL_STAGING = YES
+
+# beecrypt contains C++ code that g++ 4.7 doesn't really
+# like. Upstream does not seem to be really active, so workaround this
+# by passing -fpermissive.
+BEECRYPT_CONF_ENV = \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -fpermissive"
+
 BEECRYPT_CONF_OPT = \
 		--without-java \
 		--without-python

From 12d80fcf93bbde9e2d929fe04d9a6e7b739d54c4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 2 Jun 2012 05:32:40 +0000
Subject: [PATCH 2112/6849] php: fix WDDX extension build failure

Fix WDDX extension build failure.
The documentation and source are conflicting about this, in theory
libexpat support is deprecated and libxml2 can replace it, but it seems
not so for WDDX, so pull in expat for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/Config.ext | 1 +
 package/php/php.mk     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 80bab70da3..2cf71d3625 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -310,6 +310,7 @@ config BR2_PACKAGE_PHP_EXT_SIMPLEXML
 
 config BR2_PACKAGE_PHP_EXT_WDDX
 	bool "WDDX"
+	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_PHP_EXT_LIBXML2
 	help
 	  WDDX support
diff --git a/package/php/php.mk b/package/php/php.mk
index e9bda447f6..af041c963f 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -38,7 +38,6 @@ PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
 		$(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
 		$(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
 		$(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
-		$(if $(BR2_PACKAGE_PHP_EXT_WDDX),--enable-wddx) \
 		$(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
 		$(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
 		$(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
@@ -68,6 +67,11 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
 	PHP_DEPENDENCIES += libxml2
 endif
 
+ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y)
+	PHP_CONF_OPT += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += expat
+endif
+
 ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
 	PHP_CONF_OPT += --with-xmlrpc \
 		$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)

From 64d4866257db72f06284a0fcef9a816d4291462a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 2 Jun 2012 12:08:46 +0000
Subject: [PATCH 2113/6849] sdl_gfx: fix assignments

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_gfx/sdl_gfx.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index a25987dd36..5503bbd1d6 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -3,11 +3,11 @@
 # SDL_gfx addon for SDL
 #
 #############################################################
-SDL_GFX_VERSION:=2.0.19
-SDL_GFX_SOURCE:=SDL_gfx-$(SDL_GFX_VERSION).tar.gz
-SDL_GFX_SITE:=http://www.ferzkopp.net/Software/SDL_gfx-2.0/
-SDL_GFX_INSTALL_STAGING:=YES
-SDL_GFX_DEPENDENCIES:=sdl
+SDL_GFX_VERSION = 2.0.19
+SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz
+SDL_GFX_SITE = http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+SDL_GFX_INSTALL_STAGING = YES
+SDL_GFX_DEPENDENCIES = sdl
 SDL_GFX_CONF_OPT = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \

From 3bb9979ab052787c17cd5f1e507bfa54c7bbdead Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 2 Jun 2012 12:08:47 +0000
Subject: [PATCH 2114/6849] sdl_sound: fix assignments

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_sound/sdl_sound.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index f95d6bc728..a5d9a26d56 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -3,10 +3,10 @@
 # sdl_sound addon for SDL
 #
 #############################################################
-SDL_SOUND_VERSION:=1.0.3
-SDL_SOUND_SOURCE:=SDL_sound-$(SDL_SOUND_VERSION).tar.gz
-SDL_SOUND_SITE:=http://icculus.org/SDL_sound/downloads/
-SDL_SOUND_INSTALL_STAGING:=YES
+SDL_SOUND_VERSION = 1.0.3
+SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz
+SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads/
+SDL_SOUND_INSTALL_STAGING = YES
 SDL_SOUND_DEPENDENCIES = sdl
 
 ifneq ($(BR2_ENABLE_LOCALE),y)

From fefae21c3f5f03d9f57dcd61e151acbebbbfbe1b Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 5 Jun 2012 02:06:33 +0000
Subject: [PATCH 2115/6849] mediastreamer: disable test programs

Building tests produces an error during the "OBJCLD mediastream" phase with
some toolchains/architectures.

This is supposed to fix:
 - http://autobuild.buildroot.net/results/7fca436524e5f7ba300d27c615061b0838adb1e2
 - http://autobuild.buildroot.net/results/bd9027ce94348025f1ca02a77eb81b9200124d9a
 - http://autobuild.buildroot.net/results/4d9f554fc29901be1a577ca0c39369befee269b5

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mediastreamer/mediastreamer.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 8327a55a17..a503490adb 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -2,6 +2,8 @@ MEDIASTREAMER_VERSION = 2.8.2
 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
 MEDIASTREAMER_INSTALL_STAGING = YES
 MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkg-config ortp
+# tests fail linking on some architectures, so disable them
+MEDIASTREAMER_CONF_OPT = --disable-tests
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 MEDIASTREAMER_CONF_OPT += --enable-alsa

From 6457adf87b17c597761a503cfbee4923a3772ee8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 2 Jun 2012 04:37:13 +0000
Subject: [PATCH 2116/6849] collectd: fix dependencies for bind plugin

The bind plugin requires libcurl and libxml2.
These are properly selected but never added to COLLECTD_DEPENDENCIES.
Fix that.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 0109f77b50..440450998c 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -87,6 +87,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 
 COLLECTD_DEPENDENCIES = host-pkg-config \
 	$(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \
+	$(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \
 	$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
 	$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
 	$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \

From d9f72abf4bab4e01c5e5848c8b8f05ff6065668a Mon Sep 17 00:00:00 2001
From: Julian Lunz <git@jlunz.de>
Date: Tue, 5 Jun 2012 11:19:53 +0000
Subject: [PATCH 2117/6849] freerdp: new package

[Peter: fix help, required and optional dependencies]
Signed-off-by: Julian Lunz <git@jlunz.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/freerdp/Config.in  | 14 +++++++++
 package/freerdp/freerdp.mk | 62 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 package/freerdp/Config.in
 create mode 100644 package/freerdp/freerdp.mk

diff --git a/package/Config.in b/package/Config.in
index dde5800867..2b69c575c7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -145,6 +145,7 @@ comment "X applications"
 source "package/alsamixergui/Config.in"
 source "package/docker/Config.in"
 source "package/feh/Config.in"
+source "package/freerdp/Config.in"
 source "package/gqview/Config.in"
 source "package/gmpc/Config.in"
 source "package/gob2/Config.in"
diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in
new file mode 100644
index 0000000000..c5ff769025
--- /dev/null
+++ b/package/freerdp/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_FREERDP
+	bool "freerdp"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
+	select BR2_PACKAGE_ZLIB
+	depends on BR2_PACKAGE_XORG7
+	help
+	  FreeRDP is a free implementation of the Remote Desktop
+	  Protocol (RDP), released under the Apache license
+
+	  http://www.freerdp.com/
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
new file mode 100644
index 0000000000..aeef3fc073
--- /dev/null
+++ b/package/freerdp/freerdp.mk
@@ -0,0 +1,62 @@
+#############################################################
+#
+# FreeRDP
+#
+#############################################################
+
+FREERDP_VERSION = 1.0.1
+FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP
+
+FREERDP_DEPENDENCIES = openssl zlib \
+	xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor
+
+ifeq ($(BR2_PACKAGE_CUPS),y)
+FREERDP_CONF_OPT += -DWITH_CUPS=ON
+FREERDP_DEPENDENCIES += cups
+else
+FREERDP_CONF_OPT += -DWITH_CUPS=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
+FREERDP_CONF_OPT += -DWITH_FFMPEG=ON
+FREERDP_DEPENDENCIES += ffmpeg
+else
+FREERDP_CONF_OPT += -DWITH_FFMPEG=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+FREERDP_CONF_OPT += -DWITH_ALSA=ON
+FREERDP_DEPENDENCIES += alsa-lib
+else
+FREERDP_CONF_OPT += -DWITH_ALSA=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
+FREERDP_CONF_OPT += -DWITH_PULSEAUDIO=ON
+FREERDP_DEPENDENCIES += pulseaudio
+else
+FREERDP_CONF_OPT += -DWITH_PULSEAUDIO=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+FREERDP_CONF_OPT += -DWITH_XINERAMA=ON
+FREERDP_DEPENDENCIES += xlib_libXinerama
+else
+FREERDP_CONF_OPT += -DWITH_XINERAMA=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
+FREERDP_CONF_OPT += -DWITH_XKBFILE=ON
+FREERDP_DEPENDENCIES += xlib_libxkbfile
+else
+FREERDP_CONF_OPT += -DWITH_XKBFILE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
+FREERDP_CONF_OPT += -DWITH_XV=ON
+FREERDP_DEPENDENCIES += xlib_libXv
+else
+FREERDP_CONF_OPT += -DWITH_XV=OFF
+endif
+
+$(eval $(call CMAKETARGETS))

From 7ab39d39cbbf93dbd59e7a0fdb1a1f5ee7962034 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 3 Jun 2012 05:15:12 +0000
Subject: [PATCH 2118/6849] libcgi: fix cflags

Fixes http://autobuild.buildroot.org/results/4000a12a9b237bd12618eb22ea793a913fc73b4f

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcgi/libcgi.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcgi/libcgi.patch b/package/libcgi/libcgi.patch
index 716d83cfca..12a7b106c7 100644
--- a/package/libcgi/libcgi.patch
+++ b/package/libcgi/libcgi.patch
@@ -27,7 +27,7 @@
  exec_prefix = @exec_prefix@
  
 -SHAREDOPT = -shared
-+SHAREDOPT = -shared -fPIC,-Wl,-soname,libcgi.so.0
++SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.0
  LIBDIR = $(prefix)/lib
 -INCDIR = $(prefix)/include
 +INCDIR = $(prefix)/include/libcgi/

From 27930b0c219300ce5f32ac676245306481e776cf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Jun 2012 02:23:44 +0200
Subject: [PATCH 2119/6849] gnutls: disable libgcrypt prefix mangling

Fixes http://autobuild.buildroot.net/results/77a0ca1d28a68daf25c2588eede86f779c772f97

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index d8ca16b32c..eb1596653d 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -8,7 +8,7 @@ GNUTLS_VERSION = 2.12.19
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
-GNUTLS_CONF_OPT = --with-libgcrypt \
+GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
 		--without-p11-kit
 GNUTLS_INSTALL_STAGING = YES
 

From edd2716c4369801770c10fad5565ab0d3e117c3f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Jun 2012 15:03:58 +0200
Subject: [PATCH 2120/6849] cups: fix libdir handling

Cups uses /usr/lib64 if the HOST has it, no matter if it is cross compiling
for a 32bit arch, breaking the build for stuff looking in /usr/lib.

Fixes http://autobuild.buildroot.net/results/4ed4f5b43d05a40ab15f141442f15da56c87be3b

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index f06502ab27..6d906ec942 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -13,7 +13,8 @@ CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
 CUPS_CONF_OPT = --without-perl \
 		--without-java \
 		--disable-gnutls \
-		--disable-gssapi
+		--disable-gssapi \
+		--libdir=/usr/$(if $(BR2_ARCH_IS_64),lib64,lib)
 
 CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
 		    $(if $(BR2_PACKAGE_LIBPNG),libpng) \

From 86f649a00eadc090aa00fbc33c3b5dc41787b8ac Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Jun 2012 23:12:17 +0200
Subject: [PATCH 2121/6849] mediastreamer: fix configure error with ffmpeg and
 no libx11/libxv

Fixes http://autobuild.buildroot.net/results/319f525d50eebbb84b2d2cb77294cc6f61246792

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mediastreamer/mediastreamer.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index a503490adb..65e4ec7595 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -50,6 +50,9 @@ endif
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 MEDIASTREAMER_CONF_OPT += --enable-x11
 MEDIASTREAMER_DEPENDENCIES += xlib_libX11
+else
+MEDIASTREAMER_CONF_OPT += --disable-x11
+endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
 MEDIASTREAMER_CONF_OPT += --enable-xv
@@ -58,10 +61,6 @@ else
 MEDIASTREAMER_CONF_OPT += --disable-xv
 endif
 
-else
-MEDIASTREAMER_CONF_OPT += --disable-x11
-endif
-
 ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
 MEDIASTREAMER_CONF_OPT += --enable-theora
 MEDIASTREAMER_DEPENDENCIES += libtheora

From 1bc8d2a21ae99eb41e383f3bf3d8553813066093 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 8 Jun 2012 09:43:01 +0200
Subject: [PATCH 2122/6849] mediastreamer: alsa support needs mixer + pcm

Fixes http://autobuild.buildroot.net/results/ec6e32eb44e39c1f622da39a8c5d80eb95433a54

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mediastreamer/mediastreamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 65e4ec7595..be91c44e78 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -5,7 +5,7 @@ MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkg-config ortp
 # tests fail linking on some architectures, so disable them
 MEDIASTREAMER_CONF_OPT = --disable-tests
 
-ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy)
 MEDIASTREAMER_CONF_OPT += --enable-alsa
 MEDIASTREAMER_DEPENDENCIES += alsa-lib
 else

From 64835258f7687b69d1046d035bf32aef12b26c28 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 9 Jun 2012 08:38:46 +0000
Subject: [PATCH 2123/6849] busybox 1.20.1: add patches for ash, ifupdown, man
 and tar

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.20.1/busybox-1.20.1-ash.patch   | 12 +++
 .../busybox-1.20.1-ifupdown.patch             | 75 +++++++++++++++++++
 .../busybox-1.20.1/busybox-1.20.1-man.patch   | 34 +++++++++
 .../busybox-1.20.1/busybox-1.20.1-tar.patch   | 11 +++
 4 files changed, 132 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch
 create mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch
 create mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch
 create mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch

diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch
new file mode 100644
index 0000000000..a012a7063a
--- /dev/null
+++ b/package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch
@@ -0,0 +1,12 @@
+--- busybox-1.20.1/shell/ash.c
++++ busybox-1.20.1-ash/shell/ash.c
+@@ -6846,8 +6846,7 @@ evalvar(char *p, int flags, struct strli
+ 		patloc = expdest - (char *)stackblock();
+ 		if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype,
+ 				startloc, varflags,
+-//TODO: | EXP_REDIR too? All other such places do it too
+-				/* quotes: */ flags & (EXP_FULL | EXP_CASE),
++				/* quotes: */ flags & (EXP_FULL | EXP_CASE | EXP_REDIR),
+ 				var_str_list)
+ 		) {
+ 			int amount = expdest - (
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch
new file mode 100644
index 0000000000..b2a945614a
--- /dev/null
+++ b/package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch
@@ -0,0 +1,75 @@
+--- busybox-1.20.1/networking/ifupdown.c
++++ busybox-1.20.1-ifupdown/networking/ifupdown.c
+@@ -140,8 +140,6 @@ static const char keywords_up_down[] ALI
+ 	"up\0"
+ 	"down\0"
+ 	"pre-up\0"
+-	"pre-down\0"
+-	"post-up\0"
+ 	"post-down\0"
+ ;
+ 
+@@ -895,6 +893,11 @@ static struct interfaces_file_t *read_in
+ 				if (rest_of_line[0] == '\0')
+ 					bb_error_msg_and_die("option with empty value \"%s\"", buf);
+ 
++				if (strcmp(first_word, "post-up") == 0)
++					first_word += 5; /* "up" */
++				else if (strcmp(first_word, "pre-down") == 0)
++					first_word += 4; /* "down" */
++
+ 				/* If not one of "up", "down",... words... */
+ 				if (index_in_strings(keywords_up_down, first_word) < 0) {
+ 					int i;
+@@ -963,7 +966,7 @@ static char *setlocalenv(const char *for
+ 	return result;
+ }
+ 
+-static void set_environ(struct interface_defn_t *iface, const char *mode)
++static void set_environ(struct interface_defn_t *iface, const char *mode, const char *opt)
+ {
+ 	int i;
+ 	char **pp;
+@@ -976,7 +979,7 @@ static void set_environ(struct interface
+ 	}
+ 
+ 	/* note: last element will stay NULL: */
+-	G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6));
++	G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 7));
+ 	pp = G.my_environ;
+ 
+ 	for (i = 0; i < iface->n_options; i++) {
+@@ -990,6 +993,7 @@ static void set_environ(struct interface
+ 	*pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
+ 	*pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name);
+ 	*pp++ = setlocalenv("%s=%s", "MODE", mode);
++	*pp++ = setlocalenv("%s=%s", "PHASE", opt);
+ 	if (G.startup_PATH)
+ 		*pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH);
+ }
+@@ -1044,21 +1048,21 @@ static int check(char *str)
+ static int iface_up(struct interface_defn_t *iface)
+ {
+ 	if (!iface->method->up(iface, check)) return -1;
+-	set_environ(iface, "start");
++	set_environ(iface, "start", "pre-up");
+ 	if (!execute_all(iface, "pre-up")) return 0;
+ 	if (!iface->method->up(iface, doit)) return 0;
++	set_environ(iface, "start", "post-up");
+ 	if (!execute_all(iface, "up")) return 0;
+-	if (!execute_all(iface, "post-up")) return 0;
+ 	return 1;
+ }
+ 
+ static int iface_down(struct interface_defn_t *iface)
+ {
+ 	if (!iface->method->down(iface,check)) return -1;
+-	set_environ(iface, "stop");
+-	if (!execute_all(iface, "pre-down")) return 0;
++	set_environ(iface, "stop", "pre-down");
+ 	if (!execute_all(iface, "down")) return 0;
+ 	if (!iface->method->down(iface, doit)) return 0;
++	set_environ(iface, "stop", "post-down");
+ 	if (!execute_all(iface, "post-down")) return 0;
+ 	return 1;
+ }
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch
new file mode 100644
index 0000000000..f382e078f4
--- /dev/null
+++ b/package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch
@@ -0,0 +1,34 @@
+--- busybox-1.20.1/miscutils/man.c
++++ busybox-1.20.1-man/miscutils/man.c
+@@ -129,27 +129,21 @@ static int show_manpage(const char *page
+ #endif
+ #if ENABLE_FEATURE_SEAMLESS_XZ
+ 	strcpy(ext, "xz");
+-	if (run_pipe(pager, man_filename, man, level))
++	if (run_pipe(pager, filename_with_zext, man, level))
+ 		return 1;
+ #endif
+ #if ENABLE_FEATURE_SEAMLESS_BZ2
+ 	strcpy(ext, "bz2");
+-	if (run_pipe(pager, man_filename, man, level))
++	if (run_pipe(pager, filename_with_zext, man, level))
+ 		return 1;
+ #endif
+ #if ENABLE_FEATURE_SEAMLESS_GZ
+ 	strcpy(ext, "gz");
+-	if (run_pipe(pager, man_filename, man, level))
++	if (run_pipe(pager, filename_with_zext, man, level))
+ 		return 1;
+ #endif
+ 
+-#if SEAMLESS_COMPRESSION
+-	ext[-1] = '\0';
+-#endif
+-	if (run_pipe(pager, man_filename, man, level))
+-		return 1;
+-
+-	return 0;
++	return run_pipe(pager, man_filename, man, level);
+ }
+ 
+ int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch
new file mode 100644
index 0000000000..4129b6517f
--- /dev/null
+++ b/package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch
@@ -0,0 +1,11 @@
+--- busybox-1.20.1/archival/libarchive/get_header_tar.c
++++ busybox-1.20.1-tar/archival/libarchive/get_header_tar.c
+@@ -84,7 +84,7 @@ static unsigned long long getOctal(char 
+ 		first >>= 1; /* now 7th bit = 6th bit */
+ 		v = first;   /* sign-extend 8 bits to 64 */
+ 		while (--len != 0)
+-			v = (v << 8) + (unsigned char) *str++;
++			v = (v << 8) + (uint8_t) *++str;
+ 	}
+ 	return v;
+ }

From 0d0916796d2335e9ca973876f2ce2e842e0acf83 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 9 Jun 2012 10:21:02 +0000
Subject: [PATCH 2124/6849] linux: bump default to kernel version 3.4.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 83dac3f159..26e08723a0 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.1"
+	bool "3.4.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.1" if BR2_LINUX_KERNEL_3_4
+	default "3.4.2" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 6f63d6b41a188b169870492c9a7d3320e2be1f66 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 9 Jun 2012 10:21:03 +0000
Subject: [PATCH 2125/6849] kernel-headers: bump 3.{0, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.33-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.34-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index ea7c99cb33..012b436171 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.33"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.34"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.19"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.1"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.2"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.33-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.34-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.33-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.34-headers_install-fix-__packed-in-exported-kernel-head.patch

From 202a0ef1a76cd185b5a6382a769946d9cc01df5b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:40 +0000
Subject: [PATCH 2126/6849] libfuse: bump to version 2.9.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/libfuse.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 15c63ab907..c95ea3e154 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFUSE_VERSION = 2.8.7
+LIBFUSE_VERSION = 2.9.0
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 

From 90448022248356ba3d3380d68a890db722ced85e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:41 +0000
Subject: [PATCH 2127/6849] sqlite: bump to version 3.7.12.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 165b99167e..2c235829b2 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071200
+SQLITE_VERSION = 3071201
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From f00e2b26b28c9705b2a36beebb3efcd66cb86618 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:42 +0000
Subject: [PATCH 2128/6849] dnsmasq: bump to version 2.62

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 4aa7cfbd65..2b22c1027e 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.61
+DNSMASQ_VERSION = 2.62
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

From cb867f991fd7e7891a8abc2e930eea703a88c94c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:43 +0000
Subject: [PATCH 2129/6849] zlib: bump to version 1.2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zlib/zlib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index eca98b876a..8f7a18e30a 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ZLIB_VERSION = 1.2.6
+ZLIB_VERSION = 1.2.7
 ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
 ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
 ZLIB_INSTALL_STAGING = YES

From 4628f823ee0f7dcea55d7111bcfdafb664843351 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:44 +0000
Subject: [PATCH 2130/6849] bison: bump to version 2.5.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index a1de39aa79..51325bda22 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BISON_VERSION = 2.5
+BISON_VERSION = 2.5.1
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 
 BISON_CONF_ENV += ac_cv_path_M4=/usr/bin/m4

From 5e5dbbad7d1a4a2afc7e23630e3be0fe82c477bd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:45 +0000
Subject: [PATCH 2131/6849] lighttpd: bump to version 1.4.31

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...config-file.patch => lighttpd-Fix-default-config-file.patch} | 0
 package/lighttpd/lighttpd.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/lighttpd/{lighttpd-1.4.30-Fix-default-config-file.patch => lighttpd-Fix-default-config-file.patch} (100%)

diff --git a/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch b/package/lighttpd/lighttpd-Fix-default-config-file.patch
similarity index 100%
rename from package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch
rename to package/lighttpd/lighttpd-Fix-default-config-file.patch
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 8d1f212e17..c7fae32413 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIGHTTPD_VERSION = 1.4.30
+LIGHTTPD_VERSION = 1.4.31
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_DEPENDENCIES = host-pkg-config
 LIGHTTPD_CONF_OPT = \

From 54e03b24848bc79995c7de388f7d79b09f469e3e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Jun 2012 05:30:46 +0000
Subject: [PATCH 2132/6849] bzip2: security bump to version 1.0.6

Bump bzip2 to version 1.0.6 to fix CVE-2010-0405

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bzip2/bzip2.mk | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 1bc44497cc..59c993e61d 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -3,15 +3,14 @@
 # bzip2
 #
 #############################################################
-BZIP2_VERSION:=1.0.5
-BZIP2_SONAME=1.0.4
-BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz
-BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION)
-BZIP2_INSTALL_STAGING=YES
+
+BZIP2_VERSION = 1.0.6
+BZIP2_SITE = http://www.bzip.org/$(BZIP2_VERSION)
+BZIP2_INSTALL_STAGING = YES
 
 define BZIP2_FIX_MAKEFILE
 	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_SONAME) \
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION)) \
 	    libbz2.so,g" $(@D)/Makefile-libbz2_so
 	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile
 	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so
@@ -42,12 +41,12 @@ define BZIP2_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 	$(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install
 	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/lib
-	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(STAGING_DIR)/usr/lib/
+	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
 	cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/
 	(cd $(STAGING_DIR)/usr/lib/; \
-		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \
-		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \
-		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1; \
+		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
+		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
+		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
 	)
 endef
 
@@ -56,11 +55,11 @@ define BZIP2_INSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat)
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install
-	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/
+	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/
 	(cd $(TARGET_DIR)/usr/lib; \
-		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \
-		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1; \
-		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \
+		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
+		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
+		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
 	)
 	(cd $(TARGET_DIR)/usr/bin; \
 		ln -snf bzip2 bunzip2; \
@@ -84,7 +83,7 @@ endef
 
 define HOST_BZIP2_FIX_MAKEFILE
 	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_SONAME) \
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
 	    libbz2.so,g" $(@D)/Makefile-libbz2_so
 	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile
 	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so

From 6853d1992820df00bf905876be64d7f0e6948eaa Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 8 Jun 2012 03:56:24 +0000
Subject: [PATCH 2133/6849] berkeleydb: bump to 5.3.21

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/berkeleydb/berkeleydb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index d737896546..09f35ef265 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -3,7 +3,7 @@
 # berkeley db
 #
 #############################################################
-BERKELEYDB_VERSION = 5.3.15
+BERKELEYDB_VERSION = 5.3.21
 BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR = build_unix

From f83df20c863408de3eec03cff60cf4ef4b6be29a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 10 Jun 2012 01:46:45 +0000
Subject: [PATCH 2134/6849] omap-u-boot-utils: fix visibility in menuconfig

These tools only are useful for ARM (OMAP) targets.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/omap-u-boot-utils/Config.in.host | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/omap-u-boot-utils/Config.in.host b/package/omap-u-boot-utils/Config.in.host
index 63fbdf521c..87dcc06938 100644
--- a/package/omap-u-boot-utils/Config.in.host
+++ b/package/omap-u-boot-utils/Config.in.host
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
 	bool "host omap-u-boot-utils"
+	depends on BR2_arm || BR2_armeb
 	help
 	  U-Boot Utilities for Texas Instrument's OMAP platforms.
 	  This is a set of tools to control U-Boot from scripts, generate

From 6855bd347013f58f22395f60dfba037d69a693cb Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 10 Jun 2012 09:43:43 +0000
Subject: [PATCH 2135/6849] libnfc: make example build optional

[Peter: trip patch, add AUTORECONF]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnfc/Config.in                      |  5 +
 ...-systems-make-example-build-optional.patch | 98 +++++++++++++++++++
 package/libnfc/libnfc.mk                      |  8 ++
 3 files changed, 111 insertions(+)
 create mode 100644 package/libnfc/libnfc-build-systems-make-example-build-optional.patch

diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in
index 42418e0dab..3d67d58f32 100644
--- a/package/libnfc/Config.in
+++ b/package/libnfc/Config.in
@@ -6,3 +6,8 @@ config BR2_PACKAGE_LIBNFC
 	  Public platform independent Near Field Communication (NFC) library.
 
 	  http://www.libnfc.org/
+
+config BR2_PACKAGE_LIBNFC_EXAMPLES
+	bool "build libnfc examples"
+	depends on BR2_PACKAGE_LIBNFC
+	select BR2_PACKAGE_READLINE
diff --git a/package/libnfc/libnfc-build-systems-make-example-build-optional.patch b/package/libnfc/libnfc-build-systems-make-example-build-optional.patch
new file mode 100644
index 0000000000..b0ca2201af
--- /dev/null
+++ b/package/libnfc/libnfc-build-systems-make-example-build-optional.patch
@@ -0,0 +1,98 @@
+From 40a4871b171293d98acb40cf54be9ee9b78a3244 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Wed, 6 Jun 2012 00:49:25 +0200
+Subject: [PATCH 1/1] build systems: make example build optional
+
+This patch makes example build optional for both cmake and autotools build
+systems.
+
+In order to keep the former behavior, example build is enabled by default.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dd7904d..0e35229 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/incl
+ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
+ 
+ # Options
++SET(BUILD_EXAMPLES ON CACHE BOOL "Build examples")
+ SET(LIBNFC_DEBUG_OUTPUT OFF CACHE BOOL "Debug output of communication with the NFC chip")
+ IF(LIBNFC_DEBUG_OUTPUT)
+   ADD_DEFINITIONS(-DDEBUG -g3)
+@@ -84,7 +85,7 @@ IF(NOT WIN32)
+   ENDIF(LIBNFC_DRIVER_ACR122)
+   # CMake lists are separated by a semi colon, replace with colon
+   STRING(REPLACE ";" "," PKG_CONFIG_REQUIRES "${PKG_REQ}")
+-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libnfc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc @ONLY) 
++  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libnfc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc @ONLY)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ ENDIF(NOT WIN32)
+ 
+@@ -101,7 +102,10 @@ ENDIF(LIBUSB_INCLUDE_DIRS)
+ ADD_SUBDIRECTORY(libnfc)
+ ADD_SUBDIRECTORY(include)
+ ADD_SUBDIRECTORY(utils)
+-ADD_SUBDIRECTORY(examples)
++
++IF(BUILD_EXAMPLES)
++  ADD_SUBDIRECTORY(examples)
++ENDIF(BUILD_EXAMPLES)
+ 
+ # Binary Package
+ IF(WIN32)
+diff --git a/Makefile.am b/Makefile.am
+index 3671cb6..59fd75a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4
+ 
+ AM_CFLAGS = $(LIBNFC_CFLAGS)
+ 
+-SUBDIRS = libnfc utils examples include contrib cmake test
++SUBDIRS = libnfc utils
++
++if EXAMPLE_ENABLED
++SUBDIRS += examples
++endif
++
++SUBDIRS += include contrib cmake test
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnfc.pc
+diff --git a/configure.ac b/configure.ac
+index 0a222a8..6988164 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -111,6 +111,14 @@ then
+ fi
+ AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
+ 
++# Example build (default: yes)
++AC_ARG_ENABLE([example],AS_HELP_STRING([--enable-example],[Enable example build.]),[enable_example=$enableval],[enable_example="yes"])
++
++AC_MSG_CHECKING(for example build)
++AC_MSG_RESULT($enable_example)
++
++AM_CONDITIONAL(EXAMPLE_ENABLED, [test x"$enable_example" = xyes])
++
+ # Dependencies
+ PKG_CONFIG_REQUIRES=""
+ 
+@@ -129,7 +137,11 @@ if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then
+ fi
+ AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
+ 
++
++if test x"$enable_example" = "xyes"
++then
+ AC_CHECK_READLINE
++fi
+ 
+ # Help us to write great code ;-)
+ CFLAGS="$CFLAGS -Wall -pedantic -Wextra"
+-- 
+1.7.10.3
+
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index f1028b19e8..eef09b0eee 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -6,6 +6,7 @@
 LIBNFC_VERSION = 1.5.1
 LIBNFC_SITE = http://libnfc.googlecode.com/files/
 LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.gz
+LIBNFC_AUTORECONF = YES
 LIBNFC_INSTALL_STAGING = YES
 
 LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat
@@ -13,4 +14,11 @@ LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat
 # N.B. The acr122 driver requires pcsc-lite.
 LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb
 
+ifeq ($(BR2_PACKAGE_LIBNFC_EXAMPLES),y)
+LIBNFC_CONF_OPT += --enable-example
+LIBNFC_DEPENDENCIES += readline
+else
+LIBNFC_CONF_OPT += --disable-example
+endif
+
 $(eval $(call AUTOTARGETS))

From 036377c954e68eb76e31f787074c6ab8c4fd9817 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jun 2012 22:47:44 +0200
Subject: [PATCH 2136/6849] synergy: fix comment dependencies

Show comment if either C++ or wchar isn't available, not only if both
aren't.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/synergy/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 7d8c54eceb..04351b7e94 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -13,4 +13,4 @@ config BR2_PACKAGE_SYNERGY
 	  http://synergy2.sourceforge.net/
 
 comment "synergy requires a toolchain with C++ and WCHAR support enabled"
-	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR
+	depends on BR2_PACKAGE_XORG7 && !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)

From e12d78e2bc2d0e36dbdf1ced099ae924f7a82ca2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Jun 2012 23:46:36 +0200
Subject: [PATCH 2137/6849] synergy: fix dependencies

Synergy can be used without a local X server, and Xinerama is an optional
dependency.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/synergy/synergy.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index 5a09359f80..c86fb8b62f 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -10,6 +10,7 @@ SYNERGY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/s
 SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
                    --x-libraries=$(STAGING_DIR)/usr/lib
 
-SYNERGY_DEPENDENCIES = xserver_xorg-server xlib_libXtst
+SYNERGY_DEPENDENCIES = xlib_libXtst \
+		$(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
 
 $(eval $(call AUTOTARGETS))

From 6828e8e072c243ddc266a0946a4a8bc890fc0e1c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 11 Jun 2012 09:14:48 +0200
Subject: [PATCH 2138/6849] squashfs: needs pthreads support in toolchain

Fixes http://autobuild.buildroot.net/results/9afdb3f7141fa361ac2ff3fe24887b0c6eb9342d

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squashfs/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 7d0fc71c02..93d3594646 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SQUASHFS
 	bool "squashfs"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
 	help
 	  Tools to generate SquashFS filesystems.
@@ -36,5 +37,5 @@ config BR2_PACKAGE_SQUASHFS_XZ
 
 endif
 
-comment "squashfs requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "squashfs requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From f10913cf8e0790517a552a0a959f501e46b88cae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 11 Jun 2012 10:59:36 +0200
Subject: [PATCH 2139/6849] ethtool: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 101d0a180d..b6cbc64512 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.2
+ETHTOOL_VERSION = 3.4
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 
 $(eval $(call AUTOTARGETS))

From 0a65b7d93662c9c801af777528561e488389d592 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Sun, 10 Jun 2012 23:35:19 +0000
Subject: [PATCH 2140/6849] synergy: Remove -Werror from CXXFLAGS

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../synergy/synergy-1.3.1-remove-werror.patch    | 16 ++++++++++++++++
 package/synergy/synergy.mk                       |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 package/synergy/synergy-1.3.1-remove-werror.patch

diff --git a/package/synergy/synergy-1.3.1-remove-werror.patch b/package/synergy/synergy-1.3.1-remove-werror.patch
new file mode 100644
index 0000000000..31a8c2b510
--- /dev/null
+++ b/package/synergy/synergy-1.3.1-remove-werror.patch
@@ -0,0 +1,16 @@
+Remove -Werror from CXXFLAGS
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: synergy-1.3.1/configure.in
+===================================================================
+--- synergy-1.3.1.orig/configure.in
++++ synergy-1.3.1/configure.in
+@@ -239,7 +239,6 @@ dnl checks for system services
+ 
+ dnl enable maximum compiler warnings and warnings are errors.
+ ACX_CXX_WARNINGS
+-ACX_CXX_WARNINGS_ARE_ERRORS
+ 
+ dnl adjust compiler and linker variables
+ CXXFLAGS="$CXXFLAGS $SYNERGY_CXXFLAGS $ARCH_CFLAGS"
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index c86fb8b62f..890b82ad12 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -7,6 +7,8 @@
 SYNERGY_VERSION = 1.3.1
 SYNERGY_SOURCE = synergy-$(SYNERGY_VERSION).tar.gz
 SYNERGY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/synergy2/
+
+SYNERGY_AUTORECONF = YES
 SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
                    --x-libraries=$(STAGING_DIR)/usr/lib
 

From a17f53f64bd183705e50debe81b796bc6cb82e0f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 10 Jun 2012 23:56:33 +0000
Subject: [PATCH 2141/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 012b436171..99783157c8 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -66,7 +66,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.34"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.19"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.20"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.2"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP

From b9910f1906dc8dab6ba65fcb464ee4095c6c944a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 11 Jun 2012 07:20:39 +0000
Subject: [PATCH 2142/6849] pppd: fix plugin search path

Fix the plugin search path by passing a --prefix to configure.
DESTDIR is used in the source code for the search path of plugins
(DESTDIR/lib/pppd/VERSION).
Since DESTDIR defaults to /usr/local we get the search path wrong so the
'plugin' directive requires a full pathspec to the plugin rather than
the .so name, which isn't nice or portable.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pppd/pppd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 2137f6a4e1..a62f495c10 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -26,7 +26,7 @@ endif
 define PPPD_CONFIGURE_CMDS
 	$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
 	$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
-	( cd $(@D); ./configure )
+	( cd $(@D); ./configure --prefix=/usr )
 endef
 
 define PPPD_BUILD_CMDS

From aae26bb872384559df1b211ef0a96ea50c7a1fe8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 4 Jun 2012 21:02:52 +0000
Subject: [PATCH 2143/6849] libmodbus: bump to 3.0.3

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmodbus/libmodbus.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index 4dcfe23c36..d45bc927e4 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -3,9 +3,8 @@
 # libmodbus
 #
 #############################################################
-LIBMODBUS_VERSION = 3.0.2
+LIBMODBUS_VERSION = 3.0.3
 LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
-LIBMODBUS_SOURCE = libmodbus-$(LIBMODBUS_VERSION).tar.gz
 LIBMODBUS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From 922fdbcdda7a71447307f648e3c51f42232ddbbe Mon Sep 17 00:00:00 2001
From: Murat Demirten <mdemirten@yh.com.tr>
Date: Sun, 3 Jun 2012 06:17:10 +0000
Subject: [PATCH 2144/6849] portaudio: bump to version v19_20111121

Signed-off-by: Murat Demirten <mdemirten@yh.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/portaudio/portaudio.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk
index a82473593f..b0340f7cd6 100644
--- a/package/portaudio/portaudio.mk
+++ b/package/portaudio/portaudio.mk
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-PORTAUDIO_VERSION = V19
+PORTAUDIO_VERSION = v19_20111121
 PORTAUDIO_SITE = http://www.portaudio.com/archives
-PORTAUDIO_SOURCE = pa_stable_v19_20110326.tgz
+PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz
 PORTAUDIO_INSTALL_STAGING = YES
 PORTAUDIO_MAKE = $(MAKE1)
 
 PORTAUDIO_DEPENDENCIES = \
-       $(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)
+	$(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)
 
 PORTAUDIO_CONF_OPT = \
-       $(if $(BR2_PACKAGE_PORTAUDIO_ALSA),--with-alsa,--without-alsa) \
-       $(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \
-       $(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx)
+	$(if $(BR2_PACKAGE_PORTAUDIO_ALSA),--with-alsa,--without-alsa) \
+	$(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \
+	$(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx)
 
 $(eval $(call AUTOTARGETS))

From 06ad6b03ed6145db19afe3a741858f531efd71c5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:13:51 +0000
Subject: [PATCH 2145/6849] monit: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  3 +++
 package/monit/Config.in | 10 ++++++++++
 package/monit/monit.mk  | 30 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/monit/Config.in
 create mode 100644 package/monit/monit.mk

diff --git a/package/Config.in b/package/Config.in
index 2b69c575c7..2b2c98050d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -647,6 +647,9 @@ source "package/htop/Config.in"
 source "package/kmod/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
+endif
+source "package/monit/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"
 source "package/rsyslog/Config.in"
diff --git a/package/monit/Config.in b/package/monit/Config.in
new file mode 100644
index 0000000000..6933aafc86
--- /dev/null
+++ b/package/monit/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_MONIT
+	bool "monit"
+	help
+	  Monit is a free open source utility for managing and
+	  monitoring, processes, programs, files, directories and
+	  filesystems on a UNIX system. Monit conducts automatic
+	  maintenance and repair and can execute meaningful causal
+	  actions in error situations.
+
+	  http://mmonit.com/monit/
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
new file mode 100644
index 0000000000..958618dc36
--- /dev/null
+++ b/package/monit/monit.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# monit
+#
+#############################################################
+
+MONIT_VERSION = 5.4
+MONIT_SITE = http://mmonit.com/monit/dist/
+
+MONIT_CONF_ENV = \
+	libmonit_cv_setjmp_available=yes \
+	libmonit_cv_vsnprintf_c99_conformant=yes
+
+MONIT_CONF_OPT += \
+	--without-pam
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MONIT_CONF_OPT += --with-ssl
+MONIT_DEPENDENCIES += openssl
+else
+MONIT_CONF_OPT += --without-ssl
+endif
+
+ifeq ($(BR2_LARGEFILE),y)
+MONIT_CONF_OPT += --with-largefiles
+else
+MONIT_CONF_OPT += --without-largefiles
+endif
+
+$(eval $(call AUTOTARGETS))

From f83cd598907c5b8ac3a2b1bbb70c071d1ae929d8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:13:52 +0000
Subject: [PATCH 2146/6849] libcurl: fix up prefix in curl-config

While most packages that rely on libcurl use pkg-config, a few
packages (such as libxmlrpc) still use curl-config. So we need to fix
up the prefix locations in the curl-config script installed in
STAGING_DIR.

[Peter: only fixup if prefix=/usr]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index e8f13bb4c6..50a55b4de0 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -30,6 +30,12 @@ endef
 
 LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
 
+define LIBCURL_STAGING_FIXUP_CURL_CONFIG
+	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/curl-config
+endef
+
+LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
+
 $(eval $(call AUTOTARGETS))
 
 curl: libcurl

From db44453a4536b6497fad4db259d3af0fa7c69cdd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:13:56 +0000
Subject: [PATCH 2147/6849] pciutils: install headers and libraries in
 STAGING_DIR

There are some tools, like flashrom, that build against libraries of
pciutils.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 37a17c4750..7de5fd7b42 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -6,6 +6,7 @@
 
 PCIUTILS_VERSION = 3.1.9
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+PCIUTILS_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 	PCIUTILS_ZLIB=yes
 	PCIUTILS_DEPENDENCIES += zlib
@@ -50,4 +51,11 @@ define PCIUTILS_INSTALL_TARGET_CMDS
 		SHARED=$(PCIUTILS_SHARED) install-lib
 endef
 
+define PCIUTILS_INSTALL_STAGING_CMDS
+	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
+		SHARED=$(PCIUTILS_SHARED) install
+	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
+		SHARED=$(PCIUTILS_SHARED) install-lib
+endef
+
 $(eval $(call GENTARGETS))

From 83f43bab374535fe39d93547fb03c52fa45ab0a8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 11 Jun 2012 22:42:29 +0200
Subject: [PATCH 2148/6849] pciutils: simplify

No need for two seperate make invocations for installation.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 7de5fd7b42..d1c8db509c 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -46,16 +46,12 @@ endef
 # Ditch install-lib if SHARED is an option in the future
 define PCIUTILS_INSTALL_TARGET_CMDS
 	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(TARGET_DIR)/usr \
-		SHARED=$(PCIUTILS_SHARED) install
-	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(TARGET_DIR)/usr \
-		SHARED=$(PCIUTILS_SHARED) install-lib
+		SHARED=$(PCIUTILS_SHARED) install install-lib
 endef
 
 define PCIUTILS_INSTALL_STAGING_CMDS
 	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
-		SHARED=$(PCIUTILS_SHARED) install
-	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
-		SHARED=$(PCIUTILS_SHARED) install-lib
+		SHARED=$(PCIUTILS_SHARED) install install-lib
 endef
 
 $(eval $(call GENTARGETS))

From 9d3547529b87ce3bddfcdc962e0c9d6d2b2ed9d5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:13:57 +0000
Subject: [PATCH 2149/6849] dmidecode: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/dmidecode/Config.in                   |  9 +++++
 .../dmidecode-build-system-fixes.patch        | 35 +++++++++++++++++++
 package/dmidecode/dmidecode.mk                | 18 ++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 package/dmidecode/Config.in
 create mode 100644 package/dmidecode/dmidecode-build-system-fixes.patch
 create mode 100644 package/dmidecode/dmidecode.mk

diff --git a/package/Config.in b/package/Config.in
index 2b2c98050d..4915b67b22 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -174,6 +174,7 @@ source "package/dbus-python/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/devmem2/Config.in"
 endif
+source "package/dmidecode/Config.in"
 source "package/dmraid/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
diff --git a/package/dmidecode/Config.in b/package/dmidecode/Config.in
new file mode 100644
index 0000000000..22272ed294
--- /dev/null
+++ b/package/dmidecode/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_DMIDECODE
+	bool "dmidecode"
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  Dmidecode reports information about your system's hardware
+	  as described in your system BIOS according to the SMBIOS/DMI
+	  standard.
+
+	  http://www.nongnu.org/dmidecode/
diff --git a/package/dmidecode/dmidecode-build-system-fixes.patch b/package/dmidecode/dmidecode-build-system-fixes.patch
new file mode 100644
index 0000000000..275f9df7f1
--- /dev/null
+++ b/package/dmidecode/dmidecode-build-system-fixes.patch
@@ -0,0 +1,35 @@
+Minor build system fixes
+
+Usual build system fixes to allow CC/CFLAGS/LDFLAGS to be overriden
+from the command line, and completed by additional flags from the
+Makefile.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,10 @@
+ #   (at your option) any later version.
+ #
+ 
+-CC      = gcc
+-CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+-          -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
++CC      ?= gcc
++override CFLAGS  += \
++	-W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
++        -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
+ #CFLAGS += -DBIGENDIAN
+ #CFLAGS += -DALIGNMENT_WORKAROUND
+ 
+@@ -23,7 +24,7 @@
+ #CFLAGS += -g
+ 
+ # Pass linker flags here
+-LDFLAGS =
++override LDFLAGS +=
+ 
+ DESTDIR =
+ prefix  = /usr/local
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
new file mode 100644
index 0000000000..a036a7a374
--- /dev/null
+++ b/package/dmidecode/dmidecode.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# dmidecode
+#
+#############################################################
+
+DMIDECODE_VERSION = 2.11
+DMIDECODE_SITE    = http://download.savannah.gnu.org/releases/dmidecode/
+
+define DMIDECODE_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define DMIDECODE_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS))

From 7a4e44fc9042a578cc78d1fff213491d8fb1e32f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:13:58 +0000
Subject: [PATCH 2150/6849] flashrom: new package

[Peter: Install into /usr/sbin]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/flashrom/Config.in   | 11 +++++++++++
 package/flashrom/flashrom.mk | 20 ++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/flashrom/Config.in
 create mode 100644 package/flashrom/flashrom.mk

diff --git a/package/Config.in b/package/Config.in
index 4915b67b22..fecc336242 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -179,6 +179,7 @@ source "package/dmraid/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/eeprog/Config.in"
+source "package/flashrom/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
 source "package/fmtools/Config.in"
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
new file mode 100644
index 0000000000..956500f0a4
--- /dev/null
+++ b/package/flashrom/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FLASHROM
+	bool "flashrom"
+	select BR2_PACKAGE_PCIUTILS
+	# dmidecode is only a runtime dependency
+	select BR2_PACKAGE_DMIDECODE
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  BIOS-updating utility.
+	  Requires PCIUtils libraries.
+
+	  http://flashrom.org/
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
new file mode 100644
index 0000000000..c019f2d3b3
--- /dev/null
+++ b/package/flashrom/flashrom.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# flashrom
+#
+#############################################################
+FLASHROM_VERSION = 0.9.3
+FLASHROM_SOURCE  = flashrom-$(FLASHROM_VERSION).tar.bz2
+FLASHROM_SITE    = http://download.flashrom.org/releases
+
+FLASHROM_DEPENDENCIES = pciutils
+
+define FLASHROM_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define FLASHROM_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/sbin/flashrom
+endef
+
+$(eval $(call GENTARGETS))

From 755a51f327d7d18f31e6b352cdd7032d2d01e35f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:13:59 +0000
Subject: [PATCH 2151/6849] qt: make $(HOST_DIR)/usr/mkspecs a symlink to
 $(STAGING_DIR)/usr/mkspecs

In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs,
but also libraries that wish to integrate with qmake, such as
qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs,
so the easiest solution is to have a symbolic link between the two
directories, instead of copying things around.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 7e6c5dd25a..b751696360 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -583,8 +583,7 @@ define QT_INSTALL_STAGING_CMDS
 	$(MAKE) -C $(@D) install
 	mkdir -p $(HOST_DIR)/usr/bin
 	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
-	rm -rf $(HOST_DIR)/usr/mkspecs
-	mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
+	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
 	$(QT_INSTALL_QT_CONF)
 endef
 

From e4bcf12d104da408361410ad6cd187021dd8eda5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 12 Jun 2012 09:45:18 +0200
Subject: [PATCH 2152/6849] libpcap: don't fail on kernels without netfilter
 support

From upstream git.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...bpcap-dont-fail-on-missing-netfilter.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch

diff --git a/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch b/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch
new file mode 100644
index 0000000000..b0efbc721c
--- /dev/null
+++ b/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch
@@ -0,0 +1,30 @@
+From d55b6f4f1b2bfab96ad57e0239b0b2b57785df77 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jirislaby@gmail.com>
+Date: Wed, 29 Feb 2012 01:19:18 -0800
+Subject: [PATCH] Don't fail if netfilter isn't enabled in the kernel.
+
+Check for EPROTONOSUPPORT as well as EAFNOSUPPORT.
+
+Reviewed-By: Guy Harris <guy@alum.mit.edu>
+---
+ pcap-netfilter-linux.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
+index 225e49f..f9c6bef 100644
+--- a/pcap-netfilter-linux.c
++++ b/pcap-netfilter-linux.c
+@@ -452,8 +452,8 @@ netfilter_platform_finddevs(pcap_if_t **alldevsp, char *err_str)
+ 	
+ 	sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER);
+ 	if (sock < 0) {
+-		/* if netlink is not supported this this is not fatal */
+-		if (errno == EAFNOSUPPORT)
++		/* if netlink is not supported this is not fatal */
++		if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT)
+ 			return 0;
+ 		snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s",
+ 			errno, pcap_strerror(errno));
+-- 
+1.7.10
+

From 6b7a7a028c47b546390b5f591e560a1f0f586e1b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 11 Jun 2012 10:40:46 +0000
Subject: [PATCH 2153/6849] polarssl: bump to version 1.1.4

* Correctly handle empty SSL/TLS packets (Found by James Yonan)
* Fixed potential heap corruption in x509_name allocation
* Fixed single RSA test that failed on Big Endian systems

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index d07cdc6e92..e12f08db6a 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = http://polarssl.org/code/releases/
-POLARSSL_VERSION = 1.1.3
+POLARSSL_VERSION = 1.1.4
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From e2b296ad7f01bbc3dd073afd3e9fbb140244bed0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 8 Jun 2012 03:37:25 +0000
Subject: [PATCH 2154/6849] libfreefare: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/libfreefare/Config.in      |  7 +++++++
 package/libfreefare/libfreefare.mk | 10 ++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/libfreefare/Config.in
 create mode 100644 package/libfreefare/libfreefare.mk

diff --git a/package/Config.in b/package/Config.in
index fecc336242..13310b20c3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -364,6 +364,7 @@ menu "Hardware handling"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
+source "package/libfreefare/Config.in"
 source "package/libftdi/Config.in"
 source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
new file mode 100644
index 0000000000..2e11f7e351
--- /dev/null
+++ b/package/libfreefare/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBFREEFARE
+	bool "libfreefare"
+	select BR2_PACKAGE_LIBNFC
+	help
+	  Library for high level manipulation of MIFARE cards.
+
+	  http://code.google.com/p/nfc-tools/wiki/libfreefare
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
new file mode 100644
index 0000000000..0499999669
--- /dev/null
+++ b/package/libfreefare/libfreefare.mk
@@ -0,0 +1,10 @@
+#############################################################
+#
+# libfreefare
+#
+#############################################################
+LIBFREEFARE_VERSION = 0.3.2
+LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
+LIBFREEFARE_DEPENDENCIES = libnfc
+
+$(eval $(call AUTOTARGETS))

From 5c959c117d9079432e6e03c249a6534cca4eb6eb Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 4 Jun 2012 20:32:15 +0000
Subject: [PATCH 2155/6849] nanocom: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/nanocom/Config.in  | 11 +++++++++++
 package/nanocom/nanocom.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/nanocom/Config.in
 create mode 100644 package/nanocom/nanocom.mk

diff --git a/package/Config.in b/package/Config.in
index 13310b20c3..b3a2f80117 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -209,6 +209,7 @@ source "package/mdadm/Config.in"
 source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/mtd/Config.in"
+source "package/nanocom/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/ofono/Config.in"
 source "package/open2300/Config.in"
diff --git a/package/nanocom/Config.in b/package/nanocom/Config.in
new file mode 100644
index 0000000000..51d628aec5
--- /dev/null
+++ b/package/nanocom/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_NANOCOM
+	bool "nanocom"
+	help
+	  Nanocom is based upon microcom (http://microcom.port5.com/) but
+	  removes the scripting and logging features while introducing support
+	  for setting local/remote echo, parity and stop bits. It also follows
+	  a more standard command line style using the getopt function.
+	  Internally much of the code has been rewritten and reformatted, the
+	  menu system in particular is almost entirely different.
+
+	  http://nanocom.sourceforge.net/
diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
new file mode 100644
index 0000000000..4fb7aee796
--- /dev/null
+++ b/package/nanocom/nanocom.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# nanocom
+#
+#############################################################
+NANOCOM_VERSION = 2.6.1
+NANOCOM_SOURCE = nanocom.tar.gz
+NANOCOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nanocom/nanocom/v1.0
+
+# N.B. Don't strip any path components during extraction.
+define NANOCOM_EXTRACT_CMDS
+	gzip -d -c $(DL_DIR)/$(NANOCOM_SOURCE) | tar --strip-components=0 -C $(NANOCOM_DIR) -xf -
+endef
+
+define NANOCOM_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define NANOCOM_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/nanocom $(TARGET_DIR)/usr/bin/nanocom
+endef
+
+define NANOCOM_UNINSTALL_TARGET_CMDS
+	$(RM) $(TARGET_DIR)/usr/bin/nanocom
+endef
+
+$(eval $(call GENTARGETS))

From dc0e7cfc3e4050ce7c0404b11f747bf1500c50b7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 31 May 2012 01:00:32 +0000
Subject: [PATCH 2156/6849] libxml2: bump to version 2.8.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-0-allocation-error-copying-entities.patch |  21 --
 .../libxml2-1-reallocation-failures.patch     | 101 ------
 .../libxml2-2-hash-randomization.patch        | 297 ------------------
 package/libxml2/libxml2-3-xpath-memory.patch  |  29 --
 package/libxml2/libxml2-4-xpath-freeing.patch |  32 --
 .../libxml2/libxml2-5-xpath-freeing2.patch    |  28 --
 .../libxml2/libxml2-6-hardening-xpath.patch   | 224 -------------
 package/libxml2/libxml2-7-error-xpath.patch   |  62 ----
 package/libxml2/libxml2.mk                    |   2 +-
 9 files changed, 1 insertion(+), 795 deletions(-)
 delete mode 100644 package/libxml2/libxml2-0-allocation-error-copying-entities.patch
 delete mode 100644 package/libxml2/libxml2-1-reallocation-failures.patch
 delete mode 100644 package/libxml2/libxml2-2-hash-randomization.patch
 delete mode 100644 package/libxml2/libxml2-3-xpath-memory.patch
 delete mode 100644 package/libxml2/libxml2-4-xpath-freeing.patch
 delete mode 100644 package/libxml2/libxml2-5-xpath-freeing2.patch
 delete mode 100644 package/libxml2/libxml2-6-hardening-xpath.patch
 delete mode 100644 package/libxml2/libxml2-7-error-xpath.patch

diff --git a/package/libxml2/libxml2-0-allocation-error-copying-entities.patch b/package/libxml2/libxml2-0-allocation-error-copying-entities.patch
deleted file mode 100644
index c0d943311f..0000000000
--- a/package/libxml2/libxml2-0-allocation-error-copying-entities.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5bd3c061823a8499b27422aee04ea20aae24f03e Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 16 Dec 2011 10:53:35 +0000
-Subject: Fix an allocation error when copying entities
-
----
-diff --git a/parser.c b/parser.c
-index 4e5dcb9..c55e41d 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- 
- 		buffer[nbchars++] = '&';
- 		if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
--		    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+		    growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
- 		}
- 		for (;i > 0;i--)
- 		    buffer[nbchars++] = *cur++;
---
-cgit v0.9.0.2
diff --git a/package/libxml2/libxml2-1-reallocation-failures.patch b/package/libxml2/libxml2-1-reallocation-failures.patch
deleted file mode 100644
index a18756cb87..0000000000
--- a/package/libxml2/libxml2-1-reallocation-failures.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From d7958b21e7f8c447a26bb2436f08402b2c308be4 Mon Sep 17 00:00:00 2001
-From: Chris Evans <scarybeasts@gmail.com>
-Date: Wed, 23 Mar 2011 00:13:06 +0000
-Subject: Fix some potential problems on reallocation failures
-
-The count was incremented before the allocation
-and not fixed in case of failure
-* xpath.c: corrects a few instances where the available count of some
-           structure is updated before we know the allocation actually
-           succeeds
----
-diff --git a/xpath.c b/xpath.c
-index 8b56189..608fe00 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- 				      sizeof(xmlNodePtr));
- 	if (temp == NULL) {
- 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
- 	    return;
- 	}
-+        cur->nodeMax *= 2;
- 	cur->nodeTab = temp;
-     }
-     cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
-@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- 				      sizeof(xmlNodePtr));
- 	if (temp == NULL) {
- 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
- 	    return;
- 	}
- 	cur->nodeTab = temp;
-+        cur->nodeMax *= 2;
-     }
-     if (val->type == XML_NAMESPACE_DECL) {
- 	xmlNsPtr ns = (xmlNsPtr) val;
-@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {
- 	} else if (val1->nodeNr == val1->nodeMax) {
- 	    xmlNodePtr *temp;
- 
--	    val1->nodeMax *= 2;
--	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
-+	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 *
- 					     sizeof(xmlNodePtr));
- 	    if (temp == NULL) {
- 	        xmlXPathErrMemory(NULL, "merging nodeset\n");
- 		return(NULL);
- 	    }
- 	    val1->nodeTab = temp;
-+	    val1->nodeMax *= 2;
- 	}
- 	if (n2->type == XML_NAMESPACE_DECL) {
- 	    xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
- 	    } else if (set1->nodeNr >= set1->nodeMax) {
- 		xmlNodePtr *temp;
- 
--		set1->nodeMax *= 2;
- 		temp = (xmlNodePtr *) xmlRealloc(
--		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- 		if (temp == NULL) {
- 		    xmlXPathErrMemory(NULL, "merging nodeset\n");
- 		    return(NULL);
- 		}
- 		set1->nodeTab = temp;
-+		set1->nodeMax *= 2;
- 	    }
- 	    if (n2->type == XML_NAMESPACE_DECL) {
- 		xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
- 	    } else if (set1->nodeNr >= set1->nodeMax) {
- 		xmlNodePtr *temp;
- 
--		set1->nodeMax *= 2;
- 		temp = (xmlNodePtr *) xmlRealloc(
--		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- 		if (temp == NULL) {
- 		    xmlXPathErrMemory(NULL, "merging nodeset\n");
- 		    return(NULL);
- 		}
- 		set1->nodeTab = temp;
-+		set1->nodeMax *= 2;
- 	    }
- 	    set1->nodeTab[set1->nodeNr++] = n2;
- 	}
---
-cgit v0.9
diff --git a/package/libxml2/libxml2-2-hash-randomization.patch b/package/libxml2/libxml2-2-hash-randomization.patch
deleted file mode 100644
index 47db59d076..0000000000
--- a/package/libxml2/libxml2-2-hash-randomization.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-From 8973d58b7498fa5100a876815476b81fd1a2412a Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Sat, 4 Feb 2012 19:07:44 +0800
-Subject: [PATCH] Add hash randomization to hash and dict structures
-
-Following http://www.ocert.org/advisories/ocert-2011-003.html
-it seems that having hash randomization might be a good idea
-when using XML with untrusted data
-* configure.in: lookup for rand, srand and time
-* dict.c: add randomization to dictionaries hash tables
-* hash.c: add randomization to normal hash tables
----
- configure.in |    1 +
- dict.c       |   81 ++++++++++++++++++++++++++++++++++++++++-----------------
- hash.c       |   38 ++++++++++++++++++++++++++-
- 3 files changed, 95 insertions(+), 25 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index fa80375..828b66a 100644
---- a/configure.in
-+++ b/configure.in
-@@ -512,6 +512,7 @@ AC_CHECK_FUNCS(strdup strndup strerror)
- AC_CHECK_FUNCS(finite isnand fp_class class fpclass)
- AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)
- AC_CHECK_FUNCS(stat _stat signal)
-+AC_CHECK_FUNCS(rand srand time)
- 
- dnl Checking the standard string functions availability
- AC_CHECK_FUNCS(printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf,,
-diff --git a/dict.c b/dict.c
-index 3eff231..ae4966b 100644
---- a/dict.c
-+++ b/dict.c
-@@ -2,7 +2,7 @@
-  * dict.c: dictionary of reusable strings, just used to avoid allocation
-  *         and freeing operations.
-  *
-- * Copyright (C) 2003 Daniel Veillard.
-+ * Copyright (C) 2003-2012 Daniel Veillard.
-  *
-  * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -19,6 +19,28 @@
- #define IN_LIBXML
- #include "libxml.h"
- 
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
-+#ifdef HAVE_TIME_H
-+#include <time.h>
-+#endif
-+
-+/*
-+ * Following http://www.ocert.org/advisories/ocert-2011-003.html
-+ * it seems that having hash randomization might be a good idea
-+ * when using XML with untrusted data
-+ * Note1: that it works correctly only if compiled with WITH_BIG_KEY
-+ *  which is the default.
-+ * Note2: the fast function used for a small dict won't protect very
-+ *  well but since the attack is based on growing a very big hash
-+ *  list we will use the BigKey algo as soon as the hash size grows
-+ *  over MIN_DICT_SIZE so this actually works
-+ */
-+#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME)
-+#define DICT_RANDOMIZATION
-+#endif
-+
- #include <string.h>
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
-@@ -44,23 +66,23 @@ typedef unsigned __int32 uint32_t;
- #define WITH_BIG_KEY
- 
- #ifdef WITH_BIG_KEY
--#define xmlDictComputeKey(dict, name, len)			\
--    (((dict)->size == MIN_DICT_SIZE) ?				\
--     xmlDictComputeFastKey(name, len) :				\
--     xmlDictComputeBigKey(name, len))
--
--#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\
--    (((prefix) == NULL) ?					\
--      (xmlDictComputeKey(dict, name, len)) :			\
--      (((dict)->size == MIN_DICT_SIZE) ?			\
--       xmlDictComputeFastQKey(prefix, plen, name, len) :	\
--       xmlDictComputeBigQKey(prefix, plen, name, len)))
-+#define xmlDictComputeKey(dict, name, len)                              \
-+    (((dict)->size == MIN_DICT_SIZE) ?                                  \
-+     xmlDictComputeFastKey(name, len, (dict)->seed) :                   \
-+     xmlDictComputeBigKey(name, len, (dict)->seed))
-+
-+#define xmlDictComputeQKey(dict, prefix, plen, name, len)               \
-+    (((prefix) == NULL) ?                                               \
-+      (xmlDictComputeKey(dict, name, len)) :                             \
-+      (((dict)->size == MIN_DICT_SIZE) ?                                \
-+       xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) :	\
-+       xmlDictComputeBigQKey(prefix, plen, name, len, (dict)->seed)))
- 
- #else /* !WITH_BIG_KEY */
--#define xmlDictComputeKey(dict, name, len)			\
--        xmlDictComputeFastKey(name, len)
--#define xmlDictComputeQKey(dict, prefix, plen, name, len)	\
--        xmlDictComputeFastQKey(prefix, plen, name, len)
-+#define xmlDictComputeKey(dict, name, len)                              \
-+        xmlDictComputeFastKey(name, len, (dict)->seed)
-+#define xmlDictComputeQKey(dict, prefix, plen, name, len)               \
-+        xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed)
- #endif /* WITH_BIG_KEY */
- 
- /*
-@@ -98,6 +120,8 @@ struct _xmlDict {
-     xmlDictStringsPtr strings;
- 
-     struct _xmlDict *subdict;
-+    /* used for randomization */
-+    int seed;
- };
- 
- /*
-@@ -125,6 +149,9 @@ static int xmlInitializeDict(void) {
-     if ((xmlDictMutex = xmlNewRMutex()) == NULL)
-         return(0);
- 
-+#ifdef DICT_RANDOMIZATION
-+    srand(time(NULL));
-+#endif
-     xmlDictInitialized = 1;
-     return(1);
- }
-@@ -277,13 +304,13 @@ found_pool:
-  */
- 
- static uint32_t
--xmlDictComputeBigKey(const xmlChar* data, int namelen) {
-+xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) {
-     uint32_t hash;
-     int i;
- 
-     if (namelen <= 0 || data == NULL) return(0);
- 
--    hash = 0;
-+    hash = seed;
- 
-     for (i = 0;i < namelen; i++) {
-         hash += data[i];
-@@ -310,12 +337,12 @@ xmlDictComputeBigKey(const xmlChar* data, int namelen) {
-  */
- static unsigned long
- xmlDictComputeBigQKey(const xmlChar *prefix, int plen,
--                      const xmlChar *name, int len)
-+                      const xmlChar *name, int len, int seed)
- {
-     uint32_t hash;
-     int i;
- 
--    hash = 0;
-+    hash = seed;
- 
-     for (i = 0;i < plen; i++) {
-         hash += prefix[i];
-@@ -346,8 +373,8 @@ xmlDictComputeBigQKey(const xmlChar *prefix, int plen,
-  * for low hash table fill.
-  */
- static unsigned long
--xmlDictComputeFastKey(const xmlChar *name, int namelen) {
--    unsigned long value = 0L;
-+xmlDictComputeFastKey(const xmlChar *name, int namelen, int seed) {
-+    unsigned long value = seed;
- 
-     if (name == NULL) return(0);
-     value = *name;
-@@ -381,9 +408,9 @@ xmlDictComputeFastKey(const xmlChar *name, int namelen) {
-  */
- static unsigned long
- xmlDictComputeFastQKey(const xmlChar *prefix, int plen,
--                       const xmlChar *name, int len)
-+                       const xmlChar *name, int len, int seed)
- {
--    unsigned long value = 0L;
-+    unsigned long value = (unsigned long) seed;
- 
-     if (plen == 0)
- 	value += 30 * (unsigned long) ':';
-@@ -460,6 +487,11 @@ xmlDictCreate(void) {
- 	dict->subdict = NULL;
-         if (dict->dict) {
- 	    memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry));
-+#ifdef DICT_RANDOMIZATION
-+            dict->seed = rand();
-+#else
-+            dict->seed = 0;
-+#endif
- 	    return(dict);
-         }
-         xmlFree(dict);
-@@ -486,6 +518,7 @@ xmlDictCreateSub(xmlDictPtr sub) {
- #ifdef DICT_DEBUG_PATTERNS
-         fprintf(stderr, "R");
- #endif
-+        dict->seed = sub->seed;
-         dict->subdict = sub;
- 	xmlDictReference(dict->subdict);
-     }
-diff --git a/hash.c b/hash.c
-index b78bc2d..fe1424f 100644
---- a/hash.c
-+++ b/hash.c
-@@ -3,7 +3,7 @@
-  *
-  * Reference: Your favorite introductory book on algorithms
-  *
-- * Copyright (C) 2000 Bjorn Reese and Daniel Veillard.
-+ * Copyright (C) 2000,2012 Bjorn Reese and Daniel Veillard.
-  *
-  * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -21,6 +21,22 @@
- #include "libxml.h"
- 
- #include <string.h>
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
-+#ifdef HAVE_TIME_H
-+#include <time.h>
-+#endif
-+
-+/*
-+ * Following http://www.ocert.org/advisories/ocert-2011-003.html
-+ * it seems that having hash randomization might be a good idea
-+ * when using XML with untrusted data
-+ */
-+#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME)
-+#define HASH_RANDOMIZATION
-+#endif
-+
- #include <libxml/parser.h>
- #include <libxml/hash.h>
- #include <libxml/xmlmemory.h>
-@@ -31,6 +47,10 @@
- 
- /* #define DEBUG_GROW */
- 
-+#ifdef HASH_RANDOMIZATION
-+static int hash_initialized = 0;
-+#endif
-+
- /*
-  * A single entry in the hash table
-  */
-@@ -53,6 +73,9 @@ struct _xmlHashTable {
-     int size;
-     int nbElems;
-     xmlDictPtr dict;
-+#ifdef HASH_RANDOMIZATION
-+    int random_seed;
-+#endif
- };
- 
- /*
-@@ -65,6 +88,9 @@ xmlHashComputeKey(xmlHashTablePtr table, const xmlChar *name,
-     unsigned long value = 0L;
-     char ch;
-     
-+#ifdef HASH_RANDOMIZATION
-+    value = table->random_seed;
-+#endif
-     if (name != NULL) {
- 	value += 30 * (*name);
- 	while ((ch = *name++) != 0) {
-@@ -92,6 +118,9 @@ xmlHashComputeQKey(xmlHashTablePtr table,
-     unsigned long value = 0L;
-     char ch;
-     
-+#ifdef HASH_RANDOMIZATION
-+    value = table->random_seed;
-+#endif
-     if (prefix != NULL)
- 	value += 30 * (*prefix);
-     else
-@@ -156,6 +185,13 @@ xmlHashCreate(int size) {
-         table->table = xmlMalloc(size * sizeof(xmlHashEntry));
-         if (table->table) {
-   	    memset(table->table, 0, size * sizeof(xmlHashEntry));
-+#ifdef HASH_RANDOMIZATION
-+            if (!hash_initialized) {
-+                srand(time(NULL));
-+                hash_initialized = 1;
-+            }
-+            table->random_seed = rand();
-+#endif
-   	    return(table);
-         }
-         xmlFree(table);
--- 
-1.7.8.4
-
diff --git a/package/libxml2/libxml2-3-xpath-memory.patch b/package/libxml2/libxml2-3-xpath-memory.patch
deleted file mode 100644
index f94350d277..0000000000
--- a/package/libxml2/libxml2-3-xpath-memory.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 15 Nov 2010 11:06:29 +0000
-Subject: Fix a potential memory access error
-
-in case of a previus allocation error
----
-diff --git a/xpath.c b/xpath.c
-index 4d6826d..81e33f6 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3575,13 +3575,13 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- 				      sizeof(xmlNodePtr));
- 	if (temp == NULL) {
- 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
- 	    return;
- 	}
-+        cur->nodeMax *= 2;
- 	cur->nodeTab = temp;
-     }
-     if (val->type == XML_NAMESPACE_DECL) {
---
-cgit v0.8.3.1
diff --git a/package/libxml2/libxml2-4-xpath-freeing.patch b/package/libxml2/libxml2-4-xpath-freeing.patch
deleted file mode 100644
index 3509a48daf..0000000000
--- a/package/libxml2/libxml2-4-xpath-freeing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From df83c17e5a2646bd923f75e5e507bc80d73c9722 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 17 Nov 2010 13:12:14 +0000
-Subject: Fix a potential freeing error in XPath
-
----
-diff --git a/xpath.c b/xpath.c
-index 81e33f6..1447be5 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 
- 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
- 	        xmlXPathObjectPtr tmp;
--		/* pop the result */
-+		/* pop the result if any */
- 		tmp = valuePop(ctxt);
--		xmlXPathReleaseObject(xpctxt, tmp);
--		/* then pop off contextObj, which will be freed later */
--		valuePop(ctxt);
-+                if (tmp != contextObj)
-+                    /*
-+                     * Free up the result
-+                     * then pop off contextObj, which will be freed later
-+                     */
-+                    xmlXPathReleaseObject(xpctxt, tmp);
-+                    valuePop(ctxt);
- 		goto evaluation_error;
- 	    }
- 
---
-cgit v0.8.3.1
diff --git a/package/libxml2/libxml2-5-xpath-freeing2.patch b/package/libxml2/libxml2-5-xpath-freeing2.patch
deleted file mode 100644
index 17059418b2..0000000000
--- a/package/libxml2/libxml2-5-xpath-freeing2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fec31bcd452e77c10579467ca87a785b41115de6 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 18 Nov 2010 10:07:24 +0000
-Subject: Small fix for previous commit
-
----
-diff --git a/xpath.c b/xpath.c
-index 1447be5..8b56189 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 	        xmlXPathObjectPtr tmp;
- 		/* pop the result if any */
- 		tmp = valuePop(ctxt);
--                if (tmp != contextObj)
-+                if (tmp != contextObj) {
-                     /*
-                      * Free up the result
-                      * then pop off contextObj, which will be freed later
-                      */
-                     xmlXPathReleaseObject(xpctxt, tmp);
-                     valuePop(ctxt);
-+                }
- 		goto evaluation_error;
- 	    }
- 
---
-cgit v0.8.3.1
diff --git a/package/libxml2/libxml2-6-hardening-xpath.patch b/package/libxml2/libxml2-6-hardening-xpath.patch
deleted file mode 100644
index 8e699ec8c0..0000000000
--- a/package/libxml2/libxml2-6-hardening-xpath.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From f5048b3e71fc30ad096970b8df6e7af073bae4cb Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 18 Aug 2011 09:10:13 +0000
-Subject: Hardening of XPath evaluation
-
-Add a mechanism of frame for XPath evaluation when entering a function
-or a scoped evaluation, also fix a potential problem in predicate
-evaluation.
----
-diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
-index 1a9e30e..ddd9dd8 100644
---- a/include/libxml/xpath.h
-+++ b/include/libxml/xpath.h
-@@ -68,7 +68,8 @@ typedef enum {
-     XPATH_UNDEF_PREFIX_ERROR,
-     XPATH_ENCODING_ERROR,
-     XPATH_INVALID_CHAR_ERROR,
--    XPATH_INVALID_CTXT
-+    XPATH_INVALID_CTXT,
-+    XPATH_STACK_ERROR
- } xmlXPathError;
- 
- /*
-@@ -380,6 +381,8 @@ struct _xmlXPathParserContext {
-     xmlXPathCompExprPtr comp;		/* the precompiled expression */
-     int xptr;				/* it this an XPointer expression */
-     xmlNodePtr         ancestor;	/* used for walking preceding axis */
-+
-+    int              valueFrame;        /* used to limit Pop on the stack */
- };
- 
- /************************************************************************
-diff --git a/xpath.c b/xpath.c
-index b59ac5a..bcee2ea 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = {
-     "Encoding error\n",
-     "Char out of XML range\n",
-     "Invalid or incomplete context\n",
-+    "Stack usage errror\n",
-     "?? Unknown error ??\n"	/* Must be last in the list! */
- };
- #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) /	\
-@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) {
-  ************************************************************************/
- 
- /**
-+ * xmlXPathSetFrame:
-+ * @ctxt: an XPath parser context
-+ *
-+ * Set the callee evaluation frame
-+ *
-+ * Returns the previous frame value to be restored once done
-+ */
-+static int
-+xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) {
-+    int ret;
-+
-+    if (ctxt == NULL)
-+        return(0);
-+    ret = ctxt->valueFrame;
-+    ctxt->valueFrame = ctxt->valueNr;
-+    return(ret);
-+}
-+
-+/**
-+ * xmlXPathPopFrame:
-+ * @ctxt: an XPath parser context
-+ * @frame: the previous frame value
-+ *
-+ * Remove the callee evaluation frame
-+ */
-+static void
-+xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) {
-+    if (ctxt == NULL)
-+        return;
-+    if (ctxt->valueNr < ctxt->valueFrame) {
-+        xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+    }
-+    ctxt->valueFrame = frame;
-+}
-+
-+/**
-  * valuePop:
-  * @ctxt: an XPath evaluation context
-  *
-@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt)
- 
-     if ((ctxt == NULL) || (ctxt->valueNr <= 0))
-         return (NULL);
-+
-+    if (ctxt->valueNr <= ctxt->valueFrame) {
-+        xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+        return (NULL);
-+    }
-+
-     ctxt->valueNr--;
-     if (ctxt->valueNr > 0)
-         ctxt->value = ctxt->valueTab[ctxt->valueNr - 1];
-@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) {
-     ret->valueNr = 0;
-     ret->valueMax = 10;
-     ret->value = NULL;
-+    ret->valueFrame = 0;
- 
-     ret->context = ctxt;
-     ret->comp = comp;
-@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 	xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
- 	xmlNodePtr oldContextNode, contextNode = NULL;
- 	xmlXPathContextPtr xpctxt = ctxt->context;
-+        int frame;
- 
- #ifdef LIBXML_XPTR_ENABLED
- 	    /*
-@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 	*/
- 	exprOp = &ctxt->comp->steps[op->ch2];
- 	for (i = 0; i < set->nodeNr; i++) {
-+            xmlXPathObjectPtr tmp;
-+
- 	    if (set->nodeTab[i] == NULL)
- 		continue;
- 
-@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 		xmlXPathNodeSetAddUnique(contextObj->nodesetval,
- 		    contextNode);
- 
-+            frame = xmlXPathSetFrame(ctxt);
- 	    valuePush(ctxt, contextObj);
- 	    res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
-+            tmp = valuePop(ctxt);
-+            xmlXPathPopFrame(ctxt, frame);
- 
- 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
--	        xmlXPathObjectPtr tmp;
--		/* pop the result if any */
--		tmp = valuePop(ctxt);
--                if (tmp != contextObj) {
-+                while (tmp != contextObj) {
-                     /*
-                      * Free up the result
-                      * then pop off contextObj, which will be freed later
-                      */
-                     xmlXPathReleaseObject(xpctxt, tmp);
--                    valuePop(ctxt);
-+                    tmp = valuePop(ctxt);
-                 }
- 		goto evaluation_error;
- 	    }
-+            /* push the result back onto the stack */
-+            valuePush(ctxt, tmp);
- 
- 	    if (res)
- 		pos++;
-@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                 xmlXPathFunction func;
-                 const xmlChar *oldFunc, *oldFuncURI;
- 		int i;
-+                int frame;
- 
-+                frame = xmlXPathSetFrame(ctxt);
-                 if (op->ch1 != -1)
-                     total +=
-                         xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
-@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
- 		    xmlGenericError(xmlGenericErrorContext,
- 			    "xmlXPathCompOpEval: parameter error\n");
- 		    ctxt->error = XPATH_INVALID_OPERAND;
-+                    xmlXPathPopFrame(ctxt, frame);
- 		    return (total);
- 		}
--		for (i = 0; i < op->value; i++)
-+		for (i = 0; i < op->value; i++) {
- 		    if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
- 			xmlGenericError(xmlGenericErrorContext,
- 				"xmlXPathCompOpEval: parameter error\n");
- 			ctxt->error = XPATH_INVALID_OPERAND;
-+                        xmlXPathPopFrame(ctxt, frame);
- 			return (total);
- 		    }
-+                }
-                 if (op->cache != NULL)
-                     XML_CAST_FPTR(func) = op->cache;
-                 else {
-@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                             xmlGenericError(xmlGenericErrorContext,
-             "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
-                                     (char *)op->value4, (char *)op->value5);
-+                            xmlXPathPopFrame(ctxt, frame);
-                             return (total);
-                         }
-                         func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                 func(ctxt, op->value);
-                 ctxt->context->function = oldFunc;
-                 ctxt->context->functionURI = oldFuncURI;
-+                xmlXPathPopFrame(ctxt, frame);
-                 return (total);
-             }
-         case XPATH_OP_ARG:
-@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool)
- 	ctxt->valueNr = 0;
- 	ctxt->valueMax = 10;
- 	ctxt->value = NULL;
-+        ctxt->valueFrame = 0;
-     }
- #ifdef XPATH_STREAMING
-     if (ctxt->comp->stream) {
-diff --git a/xpointer.c b/xpointer.c
-index 7a42d02..37afa3a 100644
---- a/xpointer.c
-+++ b/xpointer.c
-@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) {
- 	ctxt->valueNr = 0;
- 	ctxt->valueMax = 10;
- 	ctxt->value = NULL;
-+	ctxt->valueFrame = 0;
-     }
-     SKIP_BLANKS;
-     if (CUR == '/') {
---
-cgit v0.9.0.2
diff --git a/package/libxml2/libxml2-7-error-xpath.patch b/package/libxml2/libxml2-7-error-xpath.patch
deleted file mode 100644
index a12a050741..0000000000
--- a/package/libxml2/libxml2-7-error-xpath.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 11 Oct 2011 08:34:34 +0000
-Subject: Fix missing error status in XPath evaluation
-
-Started by Chris Evans, I added a few more place where the
-error should have been set in the evaluation context.
----
-diff --git a/xpath.c b/xpath.c
-index bcee2ea..d9d902c 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value)
-                                              sizeof(ctxt->valueTab[0]));
-         if (tmp == NULL) {
-             xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
-+            ctxt->error = XPATH_MEMORY_ERROR;
-             return (0);
-         }
-         ctxt->valueMax *= 2;
-@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) {
- 		if ( (ch & 0xc0) != 0xc0 ) {
- 		    xmlGenericError(xmlGenericErrorContext,
- 			"xmlXPathTranslateFunction: Invalid UTF8 string\n");
-+                    /* not asserting an XPath error is probably better */
- 		    break;
- 		}
- 		/* then skip over remaining bytes for this char */
-@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) {
- 		    if ( (*cptr++ & 0xc0) != 0x80 ) {
- 			xmlGenericError(xmlGenericErrorContext,
- 			    "xmlXPathTranslateFunction: Invalid UTF8 string\n");
-+                        /* not asserting an XPath error is probably better */
- 			break;
- 		    }
- 		if (ch & 0x80) /* must have had error encountered */
-@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                         xmlGenericError(xmlGenericErrorContext,
-             "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n",
-                                     (char *) op->value4, (char *)op->value5);
-+                        ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
-                         return (total);
-                     }
- 		    val = xmlXPathVariableLookupNS(ctxt->context,
-@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-             "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
-                                     (char *)op->value4, (char *)op->value5);
-                             xmlXPathPopFrame(ctxt, frame);
-+                            ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
-                             return (total);
-                         }
-                         func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-     }
-     xmlGenericError(xmlGenericErrorContext,
-                     "XPath: unknown precompiled operation %d\n", op->op);
-+    ctxt->error = XPATH_INVALID_OPERAND;
-     return (total);
- }
- 
---
-cgit v0.9.0.2
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 54ad123d1e..bbdd5def13 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBXML2_VERSION = 2.7.8
+LIBXML2_VERSION = 2.8.0
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
 LIBXML2_AUTORECONF = YES

From d0bf0be438801bbd1f30031529493e6e01523d8b Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Tue, 12 Jun 2012 16:40:32 +0000
Subject: [PATCH 2157/6849] New package: cJSON

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/cjson/Config.in |  7 +++++++
 package/cjson/cjson.mk  | 43 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 package/cjson/Config.in
 create mode 100644 package/cjson/cjson.mk

diff --git a/package/Config.in b/package/Config.in
index b3a2f80117..ddb504a12c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -469,6 +469,7 @@ source "package/slang/Config.in"
 endmenu
 
 menu "JSON/XML"
+source "package/cjson/Config.in"
 source "package/expat/Config.in"
 source "package/ezxml/Config.in"
 source "package/json-c/Config.in"
diff --git a/package/cjson/Config.in b/package/cjson/Config.in
new file mode 100644
index 0000000000..ff9007477a
--- /dev/null
+++ b/package/cjson/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_CJSON
+	bool "cJSON"
+	help
+	  An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C
+	  compliant JSON parser, under MIT license.
+
+	  http://cjson.sourceforge.net/
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
new file mode 100644
index 0000000000..f0e1fc4a72
--- /dev/null
+++ b/package/cjson/cjson.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# cjson
+#
+#############################################################
+CJSON_VERSION         = undefined
+CJSON_SOURCE          = cJSONFiles.zip
+CJSON_SITE            = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/cjson/
+CJSON_INSTALL_STAGING = YES
+
+define CJSON_EXTRACT_CMDS
+	unzip -d $(@D) $(DL_DIR)/$(CJSON_SOURCE)
+endef
+
+define CJSON_BUILD_CMDS
+	cd $(@D)/cJSON && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fpic cJSON.c -o libcJSON.so
+endef
+
+define CJSON_INSTALL_STAGING_CMDS
+	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h
+	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(STAGING_DIR)/usr/lib/libcJSON.so
+endef
+
+define CJSON_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h
+	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so
+endef
+
+define CJSON_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/usr/include/cJSON.h
+	rm -f $(STAGING_DIR)/usr/lib/libcJSON.so
+endef
+
+define CJSON_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/include/cJSON.h
+	rm -f $(TARGET_DIR)/usr/lib/libcJSON.so
+endef
+
+define CJSON_CLEAN_CMDS
+	cd $(@D)/cJSON && rm -f libcJSON.so
+endef
+
+$(eval $(call GENTARGETS))

From e4eb73c5337203b9228c08a90f19510dafee2c20 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 13 Jun 2012 09:20:09 +0200
Subject: [PATCH 2158/6849] ethtool: bump version

Bugfix release:
* Fix: Work around failure of ETHTOOL_GSSET_INFO for unprivileged
  users (-k option)
* Fix: Report any unexpected error code from ETHTOOL_GSSET_INFO
  (-k and -K options)
* Doc: Fix the date of the man page to match the last update

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index b6cbc64512..bbbcf1e0f5 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.4
+ETHTOOL_VERSION = 3.4.1
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 
 $(eval $(call AUTOTARGETS))

From 9156bbc947f03ef149df527e768c920846aa7a33 Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Tue, 12 Jun 2012 23:06:05 +0000
Subject: [PATCH 2159/6849] libroxml: bump version to 2.2.0

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...{libroxml-2.1.2-werror.patch => libroxml-2.2.0-werror.patch} | 0
 package/libroxml/libroxml.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/libroxml/{libroxml-2.1.2-werror.patch => libroxml-2.2.0-werror.patch} (100%)

diff --git a/package/libroxml/libroxml-2.1.2-werror.patch b/package/libroxml/libroxml-2.2.0-werror.patch
similarity index 100%
rename from package/libroxml/libroxml-2.1.2-werror.patch
rename to package/libroxml/libroxml-2.2.0-werror.patch
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 5c0bf011d1..228a0dffa7 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
 # libroxml
 #
 
-LIBROXML_VERSION = 2.1.2
+LIBROXML_VERSION = 2.2.0
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 

From d9a790945437fe2a62d1871e2641a01077df428f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 May 2012 12:33:18 +0000
Subject: [PATCH 2160/6849] ramspeed: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/ramspeed/Config.in   |  7 +++++++
 package/ramspeed/Makefile    | 14 ++++++++++++++
 package/ramspeed/ramspeed.mk | 21 +++++++++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 package/ramspeed/Config.in
 create mode 100644 package/ramspeed/Makefile
 create mode 100644 package/ramspeed/ramspeed.mk

diff --git a/package/Config.in b/package/Config.in
index ddb504a12c..d047ce8339 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -35,6 +35,7 @@ source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
 source "package/oprofile/Config.in"
+source "package/ramspeed/Config.in"
 source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
 source "package/stress/Config.in"
diff --git a/package/ramspeed/Config.in b/package/ramspeed/Config.in
new file mode 100644
index 0000000000..b236329a84
--- /dev/null
+++ b/package/ramspeed/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_RAMSPEED
+	bool "ramspeed"
+	help
+	  RAMspeed is a free open source command line utility
+	  to measure cache and memory performance.
+
+	  http://alasir.com/software/ramspeed/
diff --git a/package/ramspeed/Makefile b/package/ramspeed/Makefile
new file mode 100644
index 0000000000..acb8cfd8d8
--- /dev/null
+++ b/package/ramspeed/Makefile
@@ -0,0 +1,14 @@
+
+all: generic
+
+generic: ramspeed.c fltmem.c fltmark.c intmem.c intmark.c
+	$(CC) $(CFLAGS) $^ -o ramspeed
+
+i386: ramspeed.c i386/*.s i386/cpuinfo/*.s
+	$(CC) $(CFLAGS) -DI386_ASM $^ -o ramspeed
+
+x86_64: ramspeed.c amd64/*.s
+	$(CC) $(CFLAGS) -DAMD64_ASM $^ -o ramspeed
+
+clean:
+	rm -f *.o ramspeed
diff --git a/package/ramspeed/ramspeed.mk b/package/ramspeed/ramspeed.mk
new file mode 100644
index 0000000000..9ac21ad1ec
--- /dev/null
+++ b/package/ramspeed/ramspeed.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# ramspeed
+#
+#############################################################
+
+RAMSPEED_VERSION = 2.6.0
+RAMSPEED_SITE = http://www.alasir.com/software/ramspeed
+RAMSPEED_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64)
+
+define RAMSPEED_BUILD_CMDS
+	cp -f package/ramspeed/Makefile $(@D)
+	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		make -C $(@D) $(RAMSPEED_ARCH)
+endef
+
+define RAMSPEED_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/ramspeed $(TARGET_DIR)/usr/bin/ramspeed
+endef
+
+$(eval $(call GENTARGETS))

From e85e2590e51e7492820776b7d14c2bbb26bbc335 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 15 Jun 2012 07:47:07 +0200
Subject: [PATCH 2161/6849] toolchain/gcc: bump 4.7.x

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.7.0/200-gcc-pr52734.patch     | 115 ------------------
 .../{4.7.0 => 4.7.1}/100-uclibc-conf.patch    |   0
 .../301-missing-execinfo_h.patch              |   0
 .../{4.7.0 => 4.7.1}/302-c99-snprintf.patch   |   0
 .../305-libmudflap-susv3-legacy.patch         |   0
 .../810-arm-softfloat-libgcc.patch            |   0
 .../830-arm_unbreak_armv4t.patch              |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 toolchain/gcc/Config.in                       |   2 +-
 9 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 toolchain/gcc/4.7.0/200-gcc-pr52734.patch
 rename toolchain/gcc/{4.7.0 => 4.7.1}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.7.0 => 4.7.1}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.7.0 => 4.7.1}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.7.0 => 4.7.1}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.7.0 => 4.7.1}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.7.0 => 4.7.1}/830-arm_unbreak_armv4t.patch (100%)
 rename toolchain/gcc/{4.7.0 => 4.7.1}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.7.0/200-gcc-pr52734.patch b/toolchain/gcc/4.7.0/200-gcc-pr52734.patch
deleted file mode 100644
index a1ac6017de..0000000000
--- a/toolchain/gcc/4.7.0/200-gcc-pr52734.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: gcc/tree-ssa-tail-merge.c
-===================================================================
---- a/gcc/tree-ssa-tail-merge.c (revision 185028)
-+++ b/gcc/tree-ssa-tail-merge.c (working copy)
-@@ -1123,18 +1123,31 @@ gimple_equal_p (same_succ same_succ, gim
-     }
- }
- 
--/* Let GSI skip backwards over local defs.  */
-+/* Let GSI skip backwards over local defs.  Return the earliest vuse in VUSE.
-+   Return true in VUSE_ESCAPED if the vuse influenced a SSA_OP_DEF of one of the
-+   processed statements.  */
- 
- static void
--gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi)
-+gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi, tree *vuse,
-+				  bool *vuse_escaped)
- {
-   gimple stmt;
-+  tree lvuse;
- 
-   while (true)
-     {
-       if (gsi_end_p (*gsi))
- 	return;
-       stmt = gsi_stmt (*gsi);
-+
-+      lvuse = gimple_vuse (stmt);
-+      if (lvuse != NULL_TREE)
-+	{
-+	  *vuse = lvuse;
-+	  if (!ZERO_SSA_OPERANDS (stmt, SSA_OP_DEF))
-+	    *vuse_escaped = true;
-+	}
-+
-       if (!(is_gimple_assign (stmt) && local_def (gimple_get_lhs (stmt))
- 	    && !gimple_has_side_effects (stmt)))
- 	return;
-@@ -1150,9 +1163,11 @@ find_duplicate (same_succ same_succ, bas
- {
-   gimple_stmt_iterator gsi1 = gsi_last_nondebug_bb (bb1);
-   gimple_stmt_iterator gsi2 = gsi_last_nondebug_bb (bb2);
-+  tree vuse1 = NULL_TREE, vuse2 = NULL_TREE;
-+  bool vuse_escaped = false;
- 
--  gsi_advance_bw_nondebug_nonlocal (&gsi1);
--  gsi_advance_bw_nondebug_nonlocal (&gsi2);
-+  gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1, &vuse_escaped);
-+  gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2, &vuse_escaped);
- 
-   while (!gsi_end_p (gsi1) && !gsi_end_p (gsi2))
-     {
-@@ -1161,13 +1176,20 @@ find_duplicate (same_succ same_succ, bas
- 
-       gsi_prev_nondebug (&gsi1);
-       gsi_prev_nondebug (&gsi2);
--      gsi_advance_bw_nondebug_nonlocal (&gsi1);
--      gsi_advance_bw_nondebug_nonlocal (&gsi2);
-+      gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1, &vuse_escaped);
-+      gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2, &vuse_escaped);
-     }
- 
-   if (!(gsi_end_p (gsi1) && gsi_end_p (gsi2)))
-     return;
- 
-+  /* If the incoming vuses are not the same, and the vuse escaped into an
-+     SSA_OP_DEF, then merging the 2 blocks will change the value of the def,
-+     which potentially means the semantics of one of the blocks will be changed.
-+     TODO: make this check more precise.  */
-+  if (vuse_escaped && vuse1 != vuse2)
-+    return;
-+
-   if (dump_file)
-     fprintf (dump_file, "find_duplicates: <bb %d> duplicate of <bb %d>\n",
- 	     bb1->index, bb2->index);
-Index: gcc/testsuite/gcc.dg/pr52734.c
-===================================================================
---- a/dev/null (new file)
-+++ b/gcc/testsuite/gcc.dg/pr52734.c (revision 0)
-@@ -0,0 +1,35 @@
-+/* { dg-do run } */
-+/* { dg-options "-O2" } */
-+
-+int bbb = 0;
-+
-+int __attribute__((noinline,noclone)) aaa(void)
-+{
-+    ++bbb;
-+    return 0;
-+}
-+
-+int __attribute__((noinline,noclone)) ccc(void)
-+{
-+  int ddd;
-+  /* bbb == 0 */
-+  if (aaa())
-+    return bbb;
-+
-+  /* bbb == 1 */
-+  ddd = bbb;
-+  /* bbb == ddd == 1 */
-+  if (aaa ())
-+    return 0;
-+  /* bbb == 2, ddd == 1 */
-+
-+  return ddd;
-+}
-+
-+int main(void)
-+{
-+    if (ccc() != 1)
-+	__builtin_abort();
-+    return 0;
-+}
-+
diff --git a/toolchain/gcc/4.7.0/100-uclibc-conf.patch b/toolchain/gcc/4.7.1/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.7.0/100-uclibc-conf.patch
rename to toolchain/gcc/4.7.1/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.7.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.7.1/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.7.0/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.7.1/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.7.0/302-c99-snprintf.patch b/toolchain/gcc/4.7.1/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.7.0/302-c99-snprintf.patch
rename to toolchain/gcc/4.7.1/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.7.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.7.1/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.7.0/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.7.1/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.7.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.7.1/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.7.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.7.1/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.7.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.7.1/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.7.0/830-arm_unbreak_armv4t.patch
rename to toolchain/gcc/4.7.1/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/4.7.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.7.1/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.7.0/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.7.1/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index eb4d5ea20a..4ce881673f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -64,7 +64,7 @@ config BR2_GCC_VERSION
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
-	default "4.7.0"     if BR2_GCC_VERSION_4_7_X
+	default "4.7.1"     if BR2_GCC_VERSION_4_7_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

From c5832382a18e285376e9a519e3fbfd6436e42a73 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 11 Jun 2012 22:27:15 +0000
Subject: [PATCH 2162/6849] monit: fix configuration error

Configuration fails for the monit package, with the following error.

  checking for SSL library directory... Not found

  Couldn't find your SSL library files.
  Use --with-ssl-lib-dir option to fix this problem or disable the
  SSL support with --without-ssl

Tweak the monit configuration command line so that openssl is found.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/monit/monit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index 958618dc36..11bc7e16db 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -15,7 +15,7 @@ MONIT_CONF_OPT += \
 	--without-pam
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MONIT_CONF_OPT += --with-ssl
+MONIT_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
 MONIT_DEPENDENCIES += openssl
 else
 MONIT_CONF_OPT += --without-ssl

From 0c1ad3099242bb4ddc5ade87e6a8e4239d68f5cc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 11 Jun 2012 10:40:47 +0000
Subject: [PATCH 2163/6849] hiawatha: fix bug #5276 and bump to version 8.4

Fix bug #5276 by disabling IPv6 when the toolchain lacks it.
It builds fine even if it's enabled but it probably doesn't work fine.

Also bump to version 8.4:
* MaxServerLoad option added.
* Bugfix: invalid reverse proxy request when URL parameters are present.
* PolarSSL updated to version 1.1.4.
* Small bugfixes and improvements.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 647c1e16c2..941ee8d56c 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.3
+HIAWATHA_VERSION = 8.4
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
@@ -7,6 +7,7 @@ HIAWATHA_DEPENDENCIES += polarssl
 endif
 
 HIAWATHA_CONF_OPT += \
+	$(if $(BR2_INET_IPV6),,-DENABLE_IPV6=OFF) \
 	-DENABLE_TOOLKIT=OFF \
 	-DENABLE_XSLT=OFF \
 	-DCONFIG_DIR=/etc/hiawatha \

From eb29c78a634bc50e320d0ad61d7753719bb208b6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Jun 2012 01:05:47 +0000
Subject: [PATCH 2164/6849] bind: security bump to version 9.6-ESV-R7-P1

Bump bind to version 9.6-ESV-R7-P1.
Fixes CVE-2012-667.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index eb7b9c0d44..88f79ded6f 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R7
+BIND_VERSION = 9.6-ESV-R7-P1
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From b5addce8187065c8293d4c8d3e673361e0d3c78e Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 14 Jun 2012 04:24:01 +0000
Subject: [PATCH 2165/6849] e2fsprogs: bump to 1.42.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index db666356a4..4c0474e0df 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42.3
+E2FSPROGS_VERSION = 1.42.4
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \

From 0e41f5628b98f9827236a8499e45aefd40282623 Mon Sep 17 00:00:00 2001
From: Arn R <arnerro@gmail.com>
Date: Thu, 14 Jun 2012 22:10:18 +0000
Subject: [PATCH 2166/6849] fbv: Allow selection of supported image formats.

This removes fbv's compulsory dependency on either libpng and/or libjpeg and/or libungif.
The user can choose which compressed image format's fbv should support.
By default PNG, JPEG and GIF are selected.
Note that BMP format support will still always be included.

[Peter: Drop (unneeded) png specific libs]
Signed-off-by: Arn R <arnerro@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbv/Config.in | 28 +++++++++++++++++++++++++---
 package/fbv/fbv.mk    | 21 +++++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/package/fbv/Config.in b/package/fbv/Config.in
index ea54401680..b8a9fe4e44 100644
--- a/package/fbv/Config.in
+++ b/package/fbv/Config.in
@@ -1,11 +1,33 @@
 config BR2_PACKAGE_FBV
 	bool "fbv"
-	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_JPEG
-	select BR2_PACKAGE_LIBUNGIF
 	help
 	  fbv is a very simple graphic file viewer for the framebuffer console,
 	  capable of displaying GIF, JPEG, PNG and BMP files using libungif,
 	  libjpeg and libpng.
 
 	  http://freshmeat.net/projects/fbv/
+
+if BR2_PACKAGE_FBV
+
+config BR2_PACKAGE_FBV_PNG
+	bool "PNG support"
+	default y
+	select BR2_PACKAGE_LIBPNG
+	help
+	  Enable support for PNG using libpng.
+
+config BR2_PACKAGE_FBV_JPEG
+	bool "JPEG support"
+	default y
+	select BR2_PACKAGE_JPEG
+	help
+	  Enable support for JPEG using IJG's libjpeg.
+
+config BR2_PACKAGE_FBV_GIF
+	bool "GIF support"
+	default y
+	select BR2_PACKAGE_LIBUNGIF
+	help
+	  Enable support for GIF using libungif.
+
+endif # BR2_PACKAGE_FBV
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 855a0d42cd..7db68022b1 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -7,7 +7,24 @@ FBV_VERSION:=1.0b
 FBV_SOURCE:=fbv-$(FBV_VERSION).tar.gz
 FBV_SITE:=http://s-tech.elsat.net.pl/fbv
 
-FBV_DEPENDENCIES = libpng jpeg libungif
+### image format dependencies and configure options
+FBV_DEPENDENCIES = # empty
+FBV_CONFIGURE_OPTS = # empty
+ifeq ($(BR2_PACKAGE_FBV_PNG),y)
+FBV_DEPENDENCIES += libpng
+else
+FBV_CONFIGURE_OPTS += --without-libpng
+endif
+ifeq ($(BR2_PACKAGE_FBV_JPEG),y)
+FBV_DEPENDENCIES += jpeg
+else
+FBV_CONFIGURE_OPTS += --without-libjpeg
+endif
+ifeq ($(BR2_PACKAGE_FBV_GIF),y)
+FBV_DEPENDENCIES += libungif
+else
+FBV_CONFIGURE_OPTS += --without-libungif
+endif
 
 #fbv donesn't support cross-compilation
 define FBV_CONFIGURE_CMDS
@@ -16,7 +33,7 @@ define FBV_CONFIGURE_CMDS
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
 		--prefix=/usr \
-		--libs="-lz -lm" \
+		$(FBV_CONFIGURE_OPTS) \
 	)
 endef
 

From c75e768d7945d0b760e176ee9d2cc93796078870 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 May 2012 15:11:23 +0000
Subject: [PATCH 2167/6849] lshw: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/lshw/Config.in           | 13 +++++++++++++
 package/lshw/lshw-add-LIBS.patch | 30 ++++++++++++++++++++++++++++++
 package/lshw/lshw.mk             | 23 +++++++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 package/lshw/Config.in
 create mode 100644 package/lshw/lshw-add-LIBS.patch
 create mode 100644 package/lshw/lshw.mk

diff --git a/package/Config.in b/package/Config.in
index d047ce8339..263df2cf02 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -203,6 +203,7 @@ source "package/kbd/Config.in"
 source "package/lcdproc/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/lm-sensors/Config.in"
+source "package/lshw/Config.in"
 source "package/lsuio/Config.in"
 source "package/lvm2/Config.in"
 source "package/makedevs/Config.in"
diff --git a/package/lshw/Config.in b/package/lshw/Config.in
new file mode 100644
index 0000000000..4960ac9785
--- /dev/null
+++ b/package/lshw/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LSHW
+	bool "lshw"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	help
+	  lshw (Hardware Lister) is a small tool to provide
+	  detailed information on the hardware configuration of the machine.
+
+	  http://ezix.org/project/wiki/HardwareLiSter
+
+comment "lshw requires a toolchain with C++, LARGEFILE & WCHAR support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/lshw/lshw-add-LIBS.patch b/package/lshw/lshw-add-LIBS.patch
new file mode 100644
index 0000000000..70b2a5b68f
--- /dev/null
+++ b/package/lshw/lshw-add-LIBS.patch
@@ -0,0 +1,30 @@
+We need to be able to pass extra LIBS when our toolchain lacks NLS support,
+this way we can build libintl and link to it.
+A good example is uClibc with locale support disabled.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura lshw-B.02.16.orig/src/gui/Makefile lshw-B.02.16/src/gui/Makefile
+--- lshw-B.02.16.orig/src/gui/Makefile	2012-05-28 12:32:49.303885759 -0300
++++ lshw-B.02.16/src/gui/Makefile	2012-05-28 12:33:33.850206001 -0300
+@@ -11,7 +11,7 @@
+ CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ CFLAGS=$(CXXFLAGS) $(DEFINES)
+ GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
+-LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
++LIBS+=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
+ LDFLAGS=
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+diff -Nura lshw-B.02.16.orig/src/Makefile lshw-B.02.16/src/Makefile
+--- lshw-B.02.16.orig/src/Makefile	2012-05-28 12:32:49.292885680 -0300
++++ lshw-B.02.16/src/Makefile	2012-05-28 12:33:24.530139060 -0300
+@@ -30,7 +30,7 @@
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+ LDSTATIC=-static
+-LIBS=-llshw -lresolv
++LIBS+=-llshw -lresolv
+ ifeq ($(SQLITE), 1)
+ 	LIBS+= $(shell pkg-config --libs sqlite3)
+ endif
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
new file mode 100644
index 0000000000..8b4fcc6296
--- /dev/null
+++ b/package/lshw/lshw.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# lshw
+#
+#############################################################
+
+LSHW_VERSION = B.02.16
+LSHW_SITE = http://ezix.org/software/files
+LSHW_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) AR=$(TARGET_AR) \
+	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
+LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)"
+LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),libintl)
+
+define LSHW_BUILD_CMDS
+	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
+endef
+
+define LSHW_INSTALL_TARGET_CMDS
+	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
+		$(LSHW_MAKE_OPT) install
+endef
+
+$(eval $(call GENTARGETS))

From db21bfcfd42c217bce28d08b3bc439408c0f2a82 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 28 May 2012 13:36:48 +0000
Subject: [PATCH 2168/6849] New package: xinetd

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/xinetd/Config.in                      |  8 ++
 package/xinetd/xinetd-2.3.15/001-ar.patch     | 74 +++++++++++++++++++
 .../xinetd/xinetd-2.3.15/002-destdir.patch    | 35 +++++++++
 .../xinetd/xinetd-2.3.15/003-rpc_fix.patch    | 26 +++++++
 package/xinetd/xinetd.mk                      | 10 +++
 6 files changed, 154 insertions(+)
 create mode 100644 package/xinetd/Config.in
 create mode 100644 package/xinetd/xinetd-2.3.15/001-ar.patch
 create mode 100644 package/xinetd/xinetd-2.3.15/002-destdir.patch
 create mode 100644 package/xinetd/xinetd-2.3.15/003-rpc_fix.patch
 create mode 100644 package/xinetd/xinetd.mk

diff --git a/package/Config.in b/package/Config.in
index 263df2cf02..1044e9fa25 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -607,6 +607,7 @@ source "package/wget/Config.in"
 endif
 source "package/wireless_tools/Config.in"
 source "package/wpa_supplicant/Config.in"
+source "package/xinetd/Config.in"
 source "package/xl2tp/Config.in"
 
 endmenu
diff --git a/package/xinetd/Config.in b/package/xinetd/Config.in
new file mode 100644
index 0000000000..6bfe24ca42
--- /dev/null
+++ b/package/xinetd/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XINETD
+	bool "xinetd"
+	depends on BR2_INET_RPC
+	help
+	  xinetd is a secure replacement for inetd. It was originally written by
+	  panos@cs.colorado.edu.
+
+	  http://www.xinetd.org
diff --git a/package/xinetd/xinetd-2.3.15/001-ar.patch b/package/xinetd/xinetd-2.3.15/001-ar.patch
new file mode 100644
index 0000000000..566f2f75ee
--- /dev/null
+++ b/package/xinetd/xinetd-2.3.15/001-ar.patch
@@ -0,0 +1,74 @@
+This patch changes all of the hard-coded invocations of "ar" to $(AR), to
+support a cross-compilation toolchain.
+
+The content of this patch was copied from the OpenWrt project:
+https://dev.openwrt.org/browser/packages/net/xinetd/patches/001-ar.patch
+
+Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
+
+--- a/libs/src/misc/Makefile.in
++++ b/libs/src/misc/Makefile.in
+@@ -62,7 +62,7 @@
+ 
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
+--- a/libs/src/portable/Makefile.in
++++ b/libs/src/portable/Makefile.in
+@@ -57,7 +57,7 @@
+ 
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
+--- a/libs/src/pset/Makefile.in
++++ b/libs/src/pset/Makefile.in
+@@ -53,7 +53,7 @@
+ 	mv $(LIBNAME) $(LIBDIR)/optimized
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
+--- a/libs/src/sio/Makefile.in
++++ b/libs/src/sio/Makefile.in
+@@ -52,7 +52,7 @@
+ 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
+--- a/libs/src/str/Makefile.in
++++ b/libs/src/str/Makefile.in
+@@ -63,7 +63,7 @@
+ 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ LINT_IGNORE=possible pointer alignment|RCSid unused
+--- a/libs/src/xlog/Makefile.in
++++ b/libs/src/xlog/Makefile.in
+@@ -58,7 +58,7 @@
+ 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
diff --git a/package/xinetd/xinetd-2.3.15/002-destdir.patch b/package/xinetd/xinetd-2.3.15/002-destdir.patch
new file mode 100644
index 0000000000..15ff4b8dc1
--- /dev/null
+++ b/package/xinetd/xinetd-2.3.15/002-destdir.patch
@@ -0,0 +1,35 @@
+This patch adds $(DESTDIR) to xinetd's installation paths, to support 
+installation to a cross-compiled RFS area.
+
+The content of this patch was copied from the OpenWrt project:
+https://dev.openwrt.org/browser/packages/net/xinetd/patches/002-destdir.patch
+
+Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
+ 
+ install: build
+ 	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
+-	   test -d $$i || mkdir -p $$i ; done
+-	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
+-	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
+-	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
++	   test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done
++	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR)
++	$(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR)
++	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR)
++	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
++	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
++	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8
++	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8
++	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8
+ 	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
+ 	@echo "There is a sample config file in xinetd/sample.conf and you can"
+ 	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
diff --git a/package/xinetd/xinetd-2.3.15/003-rpc_fix.patch b/package/xinetd/xinetd-2.3.15/003-rpc_fix.patch
new file mode 100644
index 0000000000..6c32b7291e
--- /dev/null
+++ b/package/xinetd/xinetd-2.3.15/003-rpc_fix.patch
@@ -0,0 +1,26 @@
+This patch fixes compiling xinetd without RPC support.
+
+The content of this patch was copied from the OpenWrt project:
+https://dev.openwrt.org/browser/packages/net/xinetd/patches/003-rpc_fix.patch
+
+Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
+
+--- a/xinetd/confparse.c
++++ b/xinetd/confparse.c
+@@ -745,7 +745,7 @@ static status_e check_entry( struct serv
+ 	   }
+    }
+ 
+-/* #ifndef NO_RPC */
++#ifndef NO_RPC
+ #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
+    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
+    {
+@@ -759,6 +759,7 @@ static status_e check_entry( struct serv
+       SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
+    }
+    else
++#endif
+ #endif   /* ! NO_RPC */
+    {
+        if ( !SC_IS_UNLISTED( scp ) ) 
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
new file mode 100644
index 0000000000..2ab2546270
--- /dev/null
+++ b/package/xinetd/xinetd.mk
@@ -0,0 +1,10 @@
+#############################################################
+#
+# xinetd
+#
+#############################################################
+XINETD_VERSION = 2.3.15
+XINETD_SOURCE  = xinetd-$(XINETD_VERSION).tar.gz
+XINETD_SITE    = http://www.xinetd.org
+
+$(eval $(call AUTOTARGETS))

From 1a4b482776db83e331ff787d01512f6d52610f2a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 16 Jun 2012 22:58:26 +0200
Subject: [PATCH 2169/6849] xinetd: fix build without RPC support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xinetd/Config.in | 1 -
 package/xinetd/xinetd.mk | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/xinetd/Config.in b/package/xinetd/Config.in
index 6bfe24ca42..76fe603547 100644
--- a/package/xinetd/Config.in
+++ b/package/xinetd/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XINETD
 	bool "xinetd"
-	depends on BR2_INET_RPC
 	help
 	  xinetd is a secure replacement for inetd. It was originally written by
 	  panos@cs.colorado.edu.
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index 2ab2546270..6a69a554eb 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -7,4 +7,8 @@ XINETD_VERSION = 2.3.15
 XINETD_SOURCE  = xinetd-$(XINETD_VERSION).tar.gz
 XINETD_SITE    = http://www.xinetd.org
 
+ifneq ($(BR2_INET_RPC),y)
+XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC"
+endif
+
 $(eval $(call AUTOTARGETS))

From 929c3e89a6715ecfdc8055ec82025cee5e8e23a1 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 16 Jun 2012 23:07:40 +0000
Subject: [PATCH 2170/6849] libfreefare: add missing openssl dependency

If openssl is not selected, configuration fails for the libfreefare package
as follows.

  configure: error: Cannot find libcrypto.

This patch adds the missing dependency on openssl.

[Peter: use select instead of depends on]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfreefare/Config.in      | 1 +
 package/libfreefare/libfreefare.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
index 2e11f7e351..13a8630d34 100644
--- a/package/libfreefare/Config.in
+++ b/package/libfreefare/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBFREEFARE
 	bool "libfreefare"
+	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBNFC
 	help
 	  Library for high level manipulation of MIFARE cards.
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 0499999669..16ef8fb326 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -5,6 +5,6 @@
 #############################################################
 LIBFREEFARE_VERSION = 0.3.2
 LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
-LIBFREEFARE_DEPENDENCIES = libnfc
+LIBFREEFARE_DEPENDENCIES = libnfc openssl
 
 $(eval $(call AUTOTARGETS))

From 74b442c8b41f466253b84fd4b529cd1a6bac2587 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 17 Jun 2012 04:06:03 +0000
Subject: [PATCH 2171/6849] php: security bump to version 5.3.14

Bump php to version 5.3.14 to fix CVE-2012-2143 and other assorted bugs.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index af041c963f..fee2c92112 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.13
+PHP_VERSION = 5.3.14
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From eb26e26269726434ced2850163ad8ba1e0253571 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 2 Jun 2012 12:09:15 +0000
Subject: [PATCH 2172/6849] liburcu: bump to version 0.7.3

Note that liburcu-0.6.7-missing-gnu-source.patch has been merged upstream.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

 delete mode 100644 package/liburcu/liburcu-0.6.7-missing-gnu-source.patch
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../liburcu/liburcu-0.6.7-missing-gnu-source.patch  | 13 -------------
 package/liburcu/liburcu.mk                          |  9 +++++++--
 2 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 package/liburcu/liburcu-0.6.7-missing-gnu-source.patch

diff --git a/package/liburcu/liburcu-0.6.7-missing-gnu-source.patch b/package/liburcu/liburcu-0.6.7-missing-gnu-source.patch
deleted file mode 100644
index f34120cdcd..0000000000
--- a/package/liburcu/liburcu-0.6.7-missing-gnu-source.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Define _GNU_SOURCE to access CPU_ZERO() macro in uClibc
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: userspace-rcu-0.6.7/tests/urcutorture.c
-===================================================================
---- userspace-rcu-0.6.7.orig/tests/urcutorture.c	2012-02-01 10:17:09.938804402 +0100
-+++ userspace-rcu-0.6.7/tests/urcutorture.c	2012-02-01 10:17:15.308713372 +0100
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <string.h>
- #include <sys/time.h>
- #include <poll.h>
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index a34079d24f..1272485971 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -1,5 +1,10 @@
-LIBURCU_VERSION = 0.6.7
-LIBURCU_SITE    = http://lttng.org/files/bundles/20111214/
+#############################################################
+#
+# liburc: userspace RCU (read-copy-update) library
+#
+#############################################################
+LIBURCU_VERSION = 0.7.3
+LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 
 LIBURCU_INSTALL_STAGING = YES

From a45c3f2d9abecbed4b7c0d14408dfa486f12888a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 3 Jun 2012 00:09:16 +0200
Subject: [PATCH 2173/6849] lttng-libust: bump to version 2.0.3

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...t-build-cxx-tests-when-not-available.patch | 45 ++++++++++++-------
 .../lttng-libust-fix-overflow-32-bits.patch   | 26 -----------
 package/lttng-libust/lttng-libust.mk          | 11 +++--
 3 files changed, 36 insertions(+), 46 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch

diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
index d7be22d2fe..bcc5636b5f 100644
--- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
+++ b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
@@ -1,19 +1,27 @@
-Do not build C++ example if a C++ compiler isn't available
+From 01dfa6e944d083db994f0a1165d3124bb6875437 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Tue, 8 May 2012 15:13:21 +0200
+Subject: [PATCH 1/1] don't build C++ example if a C++ compiler isn't
+ available
 
 By default lttng-ust builds a hello.cxx C++ example that demonstrates
-the usage of the userspace tracing library in a C++
-program. Unfortunately, when no C++ support is available, the build
-of lttng-ust fails just because of this example code. So we make the
-compilation of this code conditional on whether a working C++ compiler
-was found.
+the usage of the userspace tracing library in a C++ program.
+Unfortunately, when no C++ support is available, the build of lttng-ust
+fails just because of this example code. So we make the compilation of
+this code conditional on whether a working C++ compiler was found.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.ac      |   12 ++++++++++++
+ tests/Makefile.am |    6 +++++-
+ 2 files changed, 17 insertions(+), 1 deletion(-)
 
-Index: lttng-ust-1.9.2/configure.ac
-===================================================================
---- lttng-ust-1.9.2.orig/configure.ac	2012-02-04 14:49:45.387325814 +0100
-+++ lttng-ust-1.9.2/configure.ac	2012-02-04 14:50:08.156920117 +0100
-@@ -38,6 +38,18 @@
+diff --git a/configure.ac b/configure.ac
+index 26227cb..56d84db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,6 +45,18 @@ AC_PROG_CXX
  AC_PROG_MAKE_SET
  LT_INIT
  
@@ -32,13 +40,13 @@ Index: lttng-ust-1.9.2/configure.ac
  ## Checks for libraries.
  AC_CHECK_LIB([dl], [dlopen])
  AC_CHECK_LIB([pthread], [pthread_create])
-Index: lttng-ust-1.9.2/tests/Makefile.am
-===================================================================
---- lttng-ust-1.9.2.orig/tests/Makefile.am	2012-02-04 14:49:49.157258640 +0100
-+++ lttng-ust-1.9.2/tests/Makefile.am	2012-02-04 14:50:15.096796474 +0100
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index e79ab7c..1a8b795 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
 @@ -1,6 +1,10 @@
--SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo hello.cxx
-+SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo
+-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx
++SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo
  #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
  
 +if CXX_WORKS
@@ -48,3 +56,6 @@ Index: lttng-ust-1.9.2/tests/Makefile.am
  dist_noinst_SCRIPTS = test_loop runtests trace_matches
  
  noinst_LIBRARIES = libtap.a
+--
+1.7.10.1
+
diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
deleted file mode 100644
index c2a4dd295b..0000000000
--- a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001
-From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Date: Wed, 21 Dec 2011 16:24:48 -0500
-Subject: [PATCH] Fix clock source overflow on 32-bit archs
-
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- liblttng-ust/clock.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
-index b5d3e77..23294d2 100644
---- a/liblttng-ust/clock.h
-+++ b/liblttng-ust/clock.h
-@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void)
- 	struct timespec ts;
- 
- 	clock_gettime(CLOCK_MONOTONIC, &ts);
--	return (ts.tv_sec * 1000000000) + ts.tv_nsec;
-+	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
- }
- 
- static __inline__ uint32_t trace_clock_freq_scale(void)
--- 
-1.7.2.5
-
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index f54999ee4c..4f0414c841 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -1,6 +1,11 @@
-LTTNG_LIBUST_SITE    = http://lttng.org/files/bundles/20111214/
-LTTNG_LIBUST_VERSION = 1.9.2
-LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz
+#############################################################
+#
+# LTTng-UST: the userspace tracing library
+#
+#############################################################
+LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
+LTTNG_LIBUST_VERSION = 2.0.3
+LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux

From 6f9b64903005bf1f45a0e1a2d6d67696c7368c7c Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 2 Jun 2012 12:09:17 +0000
Subject: [PATCH 2174/6849] lttng-modules: bump to version 2.0.3

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-modules/lttng-modules.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index 1820c8fddf..b31caa1af2 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -1,5 +1,10 @@
-LTTNG_MODULES_VERSION = 2.0-pre11
-LTTNG_MODULES_SITE    = http://lttng.org/files/bundles/20111214/
+#############################################################
+#
+# LTTng-modules: the kernel modules (requires at least Linux 2.6.38)
+#
+#############################################################
+LTTNG_MODULES_VERSION = 2.0.3
+LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 
 LTTNG_MODULES_DEPENDENCIES = linux

From fb5d605638c359d008329dd9f8fb6c2c8a2c0537 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 3 Jun 2012 00:09:18 +0200
Subject: [PATCH 2175/6849] lttng-tools: bump to version 2.0.1

Also update the sync_file_range patch.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0-pre15-no-sync-file-range-in-uclibc.patch | 87 -------------------
 ...g-tools-no-sync-file-range-in-uclibc.patch | 50 +++++++++++
 package/lttng-tools/lttng-tools.mk            |  9 +-
 3 files changed, 57 insertions(+), 89 deletions(-)
 delete mode 100644 package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch
 create mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch

diff --git a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch
deleted file mode 100644
index 861686b012..0000000000
--- a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Make sync_file_range() usage optional
-
-Under uClibc, sync_file_range() is not available under all
-architectures, so we fall back to fdatasync() in this case.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: lttng-tools-2.0-pre15/configure.ac
-===================================================================
---- lttng-tools-2.0-pre15.orig/configure.ac	2012-02-01 16:31:31.140978817 +0100
-+++ lttng-tools-2.0-pre15/configure.ac	2012-02-01 16:31:42.110783708 +0100
-@@ -96,7 +96,7 @@
- 
- AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
- 
--AC_CHECK_FUNCS([sched_getcpu sysconf])
-+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
- 
- # Option to only build the consumer daemon and its libraries
- AC_ARG_WITH([consumerd-only],
-Index: lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c
-===================================================================
---- lttng-tools-2.0-pre15.orig/liblttng-consumer/lttng-consumer.c	2012-02-01 16:36:00.876292596 +0100
-+++ lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c	2012-02-01 16:36:23.435901163 +0100
-@@ -527,11 +527,15 @@
- 	if (orig_offset < stream->chan->max_sb_size) {
- 		return;
- 	}
-+#ifdef HAVE_SYNC_FILE_RANGE
- 	sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
- 			stream->chan->max_sb_size,
- 			SYNC_FILE_RANGE_WAIT_BEFORE
- 			| SYNC_FILE_RANGE_WRITE
- 			| SYNC_FILE_RANGE_WAIT_AFTER);
-+#else
-+	fdatasync(outfd);
-+#endif
- 	/*
- 	 * Give hints to the kernel about how we access the file:
- 	 * POSIX_FADV_DONTNEED : we won't re-access data in a near future after
-Index: lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c
-===================================================================
---- lttng-tools-2.0-pre15.orig/liblttng-kconsumer/lttng-kconsumer.c	2012-02-01 16:36:36.215679416 +0100
-+++ lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c	2012-02-01 16:59:08.622203348 +0100
-@@ -71,8 +71,12 @@
- 			goto end;
- 		}
- 		/* This won't block, but will start writeout asynchronously */
-+#ifdef HAVE_SYNC_FILE_RANGE
- 		sync_file_range(outfd, stream->out_fd_offset, ret,
- 				SYNC_FILE_RANGE_WRITE);
-+#else
-+		fdatasync(outfd);
-+#endif
- 		stream->out_fd_offset += ret;
- 	}
- 
-@@ -121,8 +125,12 @@
- 		}
- 		len -= ret;
- 		/* This won't block, but will start writeout asynchronously */
-+#ifdef HAVE_SYNC_FILE_RANGE
- 		sync_file_range(outfd, stream->out_fd_offset, ret,
- 				SYNC_FILE_RANGE_WRITE);
-+#else
-+		fdatasync(outfd);
-+#endif
- 		stream->out_fd_offset += ret;
- 	}
- 	lttng_consumer_sync_trace_file(stream, orig_offset);
-Index: lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c
-===================================================================
---- lttng-tools-2.0-pre15.orig/liblttng-ustconsumer/lttng-ustconsumer.c	2012-02-01 16:37:11.495067263 +0100
-+++ lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c	2012-02-01 16:37:31.224724916 +0100
-@@ -70,8 +70,12 @@
- 			goto end;
- 		}
- 		/* This won't block, but will start writeout asynchronously */
-+#ifdef HAVE_SYNC_FILE_RANGE
- 		sync_file_range(outfd, stream->out_fd_offset, ret,
- 				SYNC_FILE_RANGE_WRITE);
-+#else
-+		fdatasync(outfd);
-+#endif
- 		stream->out_fd_offset += ret;
- 	}
- 
diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
new file mode 100644
index 0000000000..3a1807ed50
--- /dev/null
+++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
@@ -0,0 +1,50 @@
+Make sync_file_range() usage optional
+
+Under uClibc, sync_file_range() is not available under all
+architectures, so we fall back to fdatasync() in this case.
+
+Inspired by the patch done by Thomas Petazzoni for the
+2.0-pre25 version.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.ac              |    2 +-
+ src/common/compat/fcntl.h |    5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5808c79..065b9cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
+
+ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
+
+-AC_CHECK_FUNCS([sched_getcpu sysconf])
++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
+
+ # check for dlopen
+ AC_CHECK_LIB([dl], [dlopen],
+diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h
+index 58c1579..dafb33e 100644
+--- a/src/common/compat/fcntl.h
++++ b/src/common/compat/fcntl.h
+@@ -23,10 +23,15 @@
+
+ #ifdef __linux__
+
++#if defined(HAVE_SYNC_FILE_RANGE)
+ extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+ 		unsigned int flags);
+ #define lttng_sync_file_range(fd, offset, nbytes, flags) \
+ 	compat_sync_file_range(fd, offset, nbytes, flags)
++#else
++#define lttng_sync_file_range(fd, offset, nbytes, flags) \
++	fdatasync(fd);
++#endif
+
+ #elif defined(__FreeBSD__)
+
+--
+1.7.10
+
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 8e6fc1abce..cd9a0be5bd 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -1,5 +1,10 @@
-LTTNG_TOOLS_VERSION = 2.0-pre15
-LTTNG_TOOLS_SITE    = http://lttng.org/files/bundles/20111214/
+#############################################################
+#
+# LTTng-Tools: the trace control client
+#
+#############################################################
+LTTNG_TOOLS_VERSION = 2.0.1
+LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 
 # The host-lttng-babeltrace technically isn't a required build

From 9cf295017d21233806528d6a3538c9724913db8b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 Jun 2012 22:20:17 +0000
Subject: [PATCH 2176/6849] collectd: needs thread support

Fixes
http://autobuild.buildroot.net/results/28f10dcc772809d53315f6dfb37bb41d77183abe/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index cb96fbd845..96438c0d44 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_COLLECTD
 	bool "collectd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  collectd is a daemon which collects system performance
 	  statistics periodically and provides mechanisms to store
@@ -380,3 +381,6 @@ config BR2_PACKAGE_COLLECTD_WRITEHTTP
 endmenu
 
 endif
+
+comment "collectd needs a toolchain with thread support"
+        depends on !BR2_TOOLCHAIN_HAS_THREADS

From 7c96b50aac61bcfbfbd7e2ef56396303a856d785 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 Jun 2012 22:23:12 +0000
Subject: [PATCH 2177/6849] pthread-stubs: fix incorrect indentation

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/pthread-stubs/Config.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/x11r7/pthread-stubs/Config.in b/package/x11r7/pthread-stubs/Config.in
index de13e87b90..c17f7da2aa 100644
--- a/package/x11r7/pthread-stubs/Config.in
+++ b/package/x11r7/pthread-stubs/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_PTHREAD_STUBS
 	bool "pthread-stubs"
 	help
-		This library provides weak aliases for pthread functions not
-		provided in libc or otherwise available by default.
-
-		http://xcb.freedesktop.org/
+	  This library provides weak aliases for pthread functions not
+	  provided in libc or otherwise available by default.
 
+	  http://xcb.freedesktop.org/

From a053e9494c03c84015b162c821a34a8cada40884 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Jun 2012 01:16:37 +0000
Subject: [PATCH 2178/6849] kernel-headers: bump 3.{0, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.34-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.35-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 99783157c8..b6bb53aa6e 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.34"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.35"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.20"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.2"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.3"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.34-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.35-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.34-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.35-headers_install-fix-__packed-in-exported-kernel-head.patch

From da38ab287ffde1f68a110af8050883d3237ae2cd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Jun 2012 01:16:38 +0000
Subject: [PATCH 2179/6849] linux: bump default to kernel version 3.4.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 26e08723a0..1cd05ae593 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.2"
+	bool "3.4.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.2" if BR2_LINUX_KERNEL_3_4
+	default "3.4.3" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e73f03d579aeb194ded0f9951571553a8422dd23 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Jun 2012 23:32:39 +0200
Subject: [PATCH 2180/6849] radvd: fix bashism in configure.ac

Fixes http://autobuild.buildroot.net/results/c3d0d04f8b3df63b3206cecf54dfdd67a4c7ccfb/build-end.log

Patch sent upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../radvd-configure.ac-fix-bashism.patch      | 31 +++++++++++++++++++
 package/radvd/radvd.mk                        |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 package/radvd/radvd-configure.ac-fix-bashism.patch

diff --git a/package/radvd/radvd-configure.ac-fix-bashism.patch b/package/radvd/radvd-configure.ac-fix-bashism.patch
new file mode 100644
index 0000000000..a635cf8d6b
--- /dev/null
+++ b/package/radvd/radvd-configure.ac-fix-bashism.patch
@@ -0,0 +1,31 @@
+From ce34738107678cb76e3da34cd16dc9a34d8dd242 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 18 Jun 2012 23:12:05 +0200
+Subject: [PATCH] configure.ac: fix bashism
+
+'==' is a bashism, breaking configure on systems where /bin/sh isn't bash
+(E.G. Ubuntu).  Fixes:
+
+http://autobuild.buildroot.net/results/c3d0d04f8b3df63b3206cecf54dfdd67a4c7ccfb/build-end.log
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3ab6667..c3b907b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,7 +176,7 @@ dnl Checks for library functions.
+ AC_CHECK_FUNCS(getopt_long)
+ 
+ CONDITIONAL_SOURCES="device-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}"
+-if test x${arch} == xlinux ; then
++if test x${arch} = xlinux ; then
+ 	CONDITIONAL_SOURCES="privsep-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}"
+ 	AC_DEFINE(USE_PRIVSEP, 1, [Use privsep])
+ fi
+-- 
+1.7.10
+
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index e63e8e030b..474a299256 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -7,6 +7,7 @@
 RADVD_VERSION = 1.8.5
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = flex host-flex
+RADVD_AUTORECONF = YES
 
 define RADVD_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d

From e9345f85822635291016f0b6e7cf855e07dbb028 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Jun 2012 08:57:35 +0200
Subject: [PATCH 2181/6849] mediastreamer: portaudio backend needs speex

Fixes http://autobuild.buildroot.net/results/27996b33a6e3080f8d96204f5c1c421b17a86d6e

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mediastreamer/mediastreamer.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index be91c44e78..716a7334e8 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -12,9 +12,10 @@ else
 MEDIASTREAMER_CONF_OPT += --disable-alsa
 endif
 
-ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
+# portaudio backend needs speex as well
+ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy)
 MEDIASTREAMER_CONF_OPT += --enable-portaudio
-MEDIASTREAMER_DEPENDENCIES += portaudio
+MEDIASTREAMER_DEPENDENCIES += portaudio speex
 else
 MEDIASTREAMER_CONF_OPT += --disable-portaudio
 endif

From f703569bead266c1a35f05191d9e4ae8992e8dbd Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 19 Jun 2012 06:59:02 +0000
Subject: [PATCH 2182/6849] qt: remove redundant and incorrect URL from
 Makefile

The upstream URL for Buildroot packages is usually visible in the Config.in
file, not in comments in the Makefile.

Moreover, this URL does not point to the correct upstream project.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index b751696360..ff9f4ca880 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -1,7 +1,6 @@
 ######################################################################
 #
 # Qt Embedded for Linux
-# http://www.qtsoftware.com/
 #
 # This makefile was originally composed by Thomas Lundquist <thomasez@zelow.no>
 # Later heavily modified by buildroot developers

From 81e0952d9ece82d992070cc8215553d396897e4f Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 19 Jun 2012 06:59:03 +0000
Subject: [PATCH 2183/6849] qt: bump to 4.8.2

Also switch to the new upstream URL.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ff9f4ca880..6b1be831a4 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -11,9 +11,9 @@
 #
 ######################################################################
 
-QT_VERSION = 4.8.1
+QT_VERSION = 4.8.2
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE    = http://get.qt.nokia.com/qt/source
+QT_SITE    = http://releases.qt-project.org/qt4/source
 QT_DEPENDENCIES = host-pkg-config
 QT_INSTALL_STAGING = YES
 

From 15be013f186b7133c1b6a0a4a8dcf976922f4864 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 19 Jun 2012 22:44:22 +0000
Subject: [PATCH 2184/6849] kmod: bump to 9

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 1382901b40..be640c7913 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 8
+KMOD_VERSION = 9
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From 792ddde39da3b200bc34ff0204db74bb3fe2bd57 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Jun 2012 23:48:27 +0000
Subject: [PATCH 2185/6849] libnspr: fix build issue on ARM with certain
 toolchains

Fixes issues like
http://autobuild.buildroot.org/results/aed444bf37b9e289866a9b6c754ed74a3cc0f3b2/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr-fix-flags.patch | 65 +++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 package/libnspr/libnspr-fix-flags.patch

diff --git a/package/libnspr/libnspr-fix-flags.patch b/package/libnspr/libnspr-fix-flags.patch
new file mode 100644
index 0000000000..d5ad4fa01b
--- /dev/null
+++ b/package/libnspr/libnspr-fix-flags.patch
@@ -0,0 +1,65 @@
+Fix build issues on ARM with certain toolchains
+
+Some gcc/binutils combinations do not like having a space between
+"-Wa," and the following assembler option, so we simply remove those
+spaces.
+
+However, fixing the configure.in is not sufficient, because libnspr
+absolutely requires the prehistoric autoconf 2.13 to re-generate the
+configure script. So, since the patch to the configure script is not
+horrible, we also patch this script directly.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/mozilla/nsprpub/configure.in
+===================================================================
+--- a/mozilla/nsprpub/configure.in
++++ b/mozilla/nsprpub/configure.in
+@@ -925,8 +925,8 @@
+   case "$target_cpu" in
+     arm*)
+       if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
++        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
++        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
+         ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+@@ -940,8 +940,8 @@
+   case "$target_cpu" in
+     arm*)
+       if test "$GNU_CC"; then
+-       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
++       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
++        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
+         ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
+       fi
+       ;;
+Index: b/mozilla/nsprpub/configure
+===================================================================
+--- a/mozilla/nsprpub/configure
++++ b/mozilla/nsprpub/configure
+@@ -3101,8 +3101,8 @@
+   case "$target_cpu" in
+     arm*)
+       if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
++        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
++        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
+         ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
+       else
+         { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; }
+@@ -3116,8 +3116,8 @@
+   case "$target_cpu" in
+     arm*)
+       if test "$GNU_CC"; then
+-       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
++       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
++        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
+         ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
+       fi
+       ;;

From 93216b641986ac2271430aab5ebbfa33e8d393a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 20 Jun 2012 22:45:10 +0200
Subject: [PATCH 2186/6849] kmod: _TOOLS option should only be visible if kmod
 is enabled

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/kmod/Config.in b/package/kmod/Config.in
index 26c2c6dd4a..49652375e6 100644
--- a/package/kmod/Config.in
+++ b/package/kmod/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_KMOD
 
 config BR2_PACKAGE_KMOD_TOOLS
 	bool "kmod utilities"
+	depends on BR2_PACKAGE_KMOD
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
 	  Install kmod module utilities (depmod, insmod, lsmod,

From 27c9d826ffca35ddec8355095d3b3682ed7d04c3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Jun 2012 16:56:33 +0200
Subject: [PATCH 2187/6849] collectd: uses fork(), so mark it as mmu only

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 96438c0d44..4fae6d5070 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_COLLECTD
 	bool "collectd"
+	# Uses fork()
+	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  collectd is a daemon which collects system performance

From 463ffd9ee401d4fcff0883735db38c873be1d9a0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 20 Jun 2012 22:45:04 +0000
Subject: [PATCH 2188/6849] sudo: fix install

Running sudo on the target fails with the following errors.

  sudo: /usr/libexec/sudoers.so: No such file or directory
  sudo: fatal error, unable to load plugins

The problem is that the installation of the sudo package is broken. This patch
replaces the hand-crafted install rule with the default AUTOTARGETS install.

Unfortunately, the default install fails because it includes a step that
invokes the cross-compiled visudo binary. A patch is provided here to disable
this visudo invocation, which is for sanity checking only. This local patch is
a backport of upstream commit 8209:0c4e3f68b2f5; the real fix will be in the
1.8.6 release of sudo.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...mmit-8209:0c4e3f68b2f5-from-upstream.patch | 263 ++++++++++++++++++
 package/sudo/sudo.mk                          |   8 -
 2 files changed, 263 insertions(+), 8 deletions(-)
 create mode 100644 package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch

diff --git a/package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch b/package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
new file mode 100644
index 0000000000..69512b037c
--- /dev/null
+++ b/package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
@@ -0,0 +1,263 @@
+The installation of the sudoers plugin fails when cross compiling, because it
+tries to run the cross-compiled visudo, rather than that of the host.
+
+The visudo invocation is only required in order to sanity check any existing
+sudoers file in the target directory; this can safely be dispensed with.
+
+This is a backport of commit 8209:0c4e3f68b2f5 from upstream.
+
+N.B. The upstream fix will appear in sudo 1.8.6; when the Buildroot package
+is bumped to version 1.8.6 (or higher), then this patch will no longer be
+required.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nurp a/common/Makefile.in b/common/Makefile.in
+--- a/common/Makefile.in	2012-05-15 17:22:01.000000000 +0100
++++ b/common/Makefile.in	2012-06-21 08:55:57.345169676 +0100
+@@ -24,6 +24,7 @@ devdir = @devdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Where to install things...
+ prefix = @prefix@
+diff -Nurp a/compat/Makefile.in b/compat/Makefile.in
+--- a/compat/Makefile.in	2012-05-15 17:22:01.000000000 +0100
++++ b/compat/Makefile.in	2012-06-21 08:57:09.097166477 +0100
+@@ -24,6 +24,7 @@ devdir = @devdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Where to install things...
+ prefix = @prefix@
+@@ -111,19 +112,21 @@ install-plugin:
+ uninstall:
+ 
+ check: $(TEST_PROGS)
+-	@if [ -f fnm_test ]; then \
+-	    ./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in; \
+-	fi
+-	@if [ -f globtest ]; then \
+-	    mkdir -p `sed 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \
+-	    touch `cat $(srcdir)/regress/glob/files`; \
+-	    chmod 0755 `grep '/r[^/]*$$' $(srcdir)/regress/glob/files`; \
+-	    chmod 0444 `grep '/s[^/]*$$' $(srcdir)/regress/glob/files`; \
+-	    chmod 0711 `grep '/t[^/]*$$' $(srcdir)/regress/glob/files`; \
+-	    ./globtest $(srcdir)/regress/glob/globtest.in; \
+-	    rval=$$?; \
+-	    rm -rf fake; \
+-	    exit $$rval; \
++	@if test X"$(cross_compiling)" != X"yes"; then \
++	    if test -f fnm_test; then \
++		./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in; \
++	    fi; \
++	    if test -f globtest; then \
++		mkdir -p `sed 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \
++		touch `cat $(srcdir)/regress/glob/files`; \
++		chmod 0755 `grep '/r[^/]*$$' $(srcdir)/regress/glob/files`; \
++		chmod 0444 `grep '/s[^/]*$$' $(srcdir)/regress/glob/files`; \
++		chmod 0711 `grep '/t[^/]*$$' $(srcdir)/regress/glob/files`; \
++		./globtest $(srcdir)/regress/glob/globtest.in; \
++		rval=$$?; \
++		rm -rf fake; \
++		exit $$rval; \
++	    fi; \
+ 	fi
+ 
+ clean:
+diff -Nurp a/configure b/configure
+--- a/configure	2012-05-17 20:53:53.000000000 +0100
++++ b/configure	2012-06-21 08:58:08.769163817 +0100
+@@ -691,6 +691,7 @@ password_timeout
+ timeout
+ timedir
+ iolog_dir
++CROSS_COMPILING
+ COMPAT_TEST_PROGS
+ SUDO_NLS
+ LIBINTL
+@@ -2874,6 +2875,7 @@ $as_echo "$as_me: Configuring Sudo versi
+ 
+ 
+ 
++
+ #
+ # Begin initial values for man page substitution
+ #
+@@ -20094,6 +20096,8 @@ if test -n "$GCC"; then
+     fi
+ fi
+ 
++CROSS_COMPILING="$cross_compiling"
++
+ test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
+ 
+ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
+diff -Nurp a/configure.in b/configure.in
+--- a/configure.in	2012-05-17 20:53:54.000000000 +0100
++++ b/configure.in	2012-06-21 08:58:51.017161934 +0100
+@@ -67,6 +67,7 @@ AC_SUBST([LT_STATIC])
+ AC_SUBST([LIBINTL])
+ AC_SUBST([SUDO_NLS])
+ AC_SUBST([COMPAT_TEST_PROGS])
++AC_SUBST([CROSS_COMPILING])
+ dnl
+ dnl Variables that get substituted in docs (not overridden by environment)
+ dnl
+@@ -3198,6 +3199,11 @@ if test -n "$GCC"; then
+ fi
+ 
+ dnl
++dnl Skip regress tests and sudoers sanity check if cross compiling.
++dnl
++CROSS_COMPILING="$cross_compiling"
++
++dnl
+ dnl Set exec_prefix
+ dnl
+ test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
+diff -Nurp a/doc/Makefile.in b/doc/Makefile.in
+--- a/doc/Makefile.in	2012-03-12 18:02:07.000000000 +0000
++++ b/doc/Makefile.in	2012-06-21 08:59:06.537161242 +0100
+@@ -23,6 +23,7 @@ srcdir = @srcdir@
+ docdir = @docdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Tools to use
+ NROFF = @NROFFPROG@
+diff -Nurp a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
+--- a/plugins/sample/Makefile.in	2012-03-12 18:02:09.000000000 +0000
++++ b/plugins/sample/Makefile.in	2012-06-21 08:59:24.397160445 +0100
+@@ -24,6 +24,7 @@ devdir = @devdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Compiler & tools to use
+ CC = @CC@
+diff -Nurp a/plugins/sample_group/Makefile.in b/plugins/sample_group/Makefile.in
+--- a/plugins/sample_group/Makefile.in	2012-05-15 17:22:02.000000000 +0100
++++ b/plugins/sample_group/Makefile.in	2012-06-21 08:59:38.641159810 +0100
+@@ -24,6 +24,7 @@ devdir = @devdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Compiler & tools to use
+ CC = @CC@
+diff -Nurp a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
+--- a/plugins/sudoers/Makefile.in	2012-05-15 17:22:02.000000000 +0100
++++ b/plugins/sudoers/Makefile.in	2012-06-21 09:32:26.165072089 +0100
+@@ -32,6 +32,7 @@ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
+ docdir = @docdir@
+ timedir = @timedir@
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Compiler & tools to use
+ CC = @CC@
+@@ -237,7 +238,7 @@ sudoers: $(srcdir)/sudoers.in
+ 	(cd $(top_builddir) && $(SHELL) config.status --file=plugins/sudoers/$@)
+ 
+ pre-install:
+-	@if test -r $(DESTDIR)$(sudoersdir)/sudoers; then \
++	@if test X"$(cross_compiling)" != X"yes" -a -r $(DESTDIR)$(sudoersdir)/sudoers; then \
+ 	    echo "Checking existing sudoers file for syntax errors."; \
+ 	    ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
+ 	fi
+@@ -280,17 +281,23 @@ uninstall:
+ 	    rm -f $(DESTDIR)$(sudoersdir)/sudoers
+ 
+ check: $(TEST_PROGS) visudo testsudoers
+-	@-rval=0; \
+-	./check_addr $(srcdir)/regress/parser/check_addr.in; \
++	@-if test X"$(cross_compiling)" != X"yes"; then \
++	    rval=0; \
++	    PWD=`pwd`; \
++	    ./check_addr $(srcdir)/regress/parser/check_addr.in; \
+ 	rval=`expr $$rval + $$?`; \
+-	./check_fill; \
+-	rval=`expr $$rval + $$?`; \
+-	./check_iolog_path $(srcdir)/regress/iolog_path/data; \
+-	rval=`expr $$rval + $$?`; \
+-	./check_wrap $(srcdir)/regress/logging/check_wrap.in > check_wrap.out; \
+-	diff check_wrap.out $(srcdir)/regress/logging/check_wrap.out.ok; \
+-	rval=`expr $$rval + $$?`; \
+-	passed=0; failed=0; total=0; \
++	    ./check_fill; \
++	    rval=`expr $$rval + $$?`; \
++	    ./check_iolog_path $(srcdir)/regress/iolog_path/data; \
++	    rval=`expr $$rval + $$?`; \
++	    if [ X"$(soext)" != X"" ]; then \
++		./check_symbols .libs/sudoers$(soext) $(shlib_exp); \
++		rval=`expr $$rval + $$?`; \
++	    fi; \
++	    ./check_wrap $(srcdir)/regress/logging/check_wrap.in > check_wrap.out; \
++	    diff check_wrap.out $(srcdir)/regress/logging/check_wrap.out.ok; \
++	    rval=`expr $$rval + $$?`; \
++	    passed=0; failed=0; total=0; \
+ 	    for t in $(srcdir)/regress/sudoers/*.in; do \
+ 		dir=`dirname $$t`; \
+ 		dirbase=`basename $$dir`; \
+@@ -318,8 +325,8 @@ check: $(TEST_PROGS) visudo testsudoers
+ 		total=`expr $$total + 1`; \
+ 	    done; \
+ 	    echo "$$dirbase: $$passed/$$total tests passed; $$failed/$$total tests failed"; \
+-	rval=`expr $$rval + $$failed`; \
+-	passed=0; failed=0; total=0; \
++	    rval=`expr $$rval + $$failed`; \
++	    passed=0; failed=0; total=0; \
+ 	    for t in $(srcdir)/regress/*/*.sh; do \
+ 		dir=`dirname $$t`; \
+ 		dirbase=`basename $$dir`; \
+@@ -351,7 +358,9 @@ check: $(TEST_PROGS) visudo testsudoers
+ 		fi; \
+ 	    done; \
+ 	    echo "$$dirbase: $$passed/$$total tests passed; $$failed/$$total tests failed"; \
+-	    rval=`expr $$rval + $$failed`; exit $$rval
++	    rval=`expr $$rval + $$failed`; \
++	    exit $$rval; \
++	fi
+ 
+ clean:
+ 	-$(LIBTOOL) --mode=clean rm -f $(PROGS) $(TEST_PROGS) *.lo *.o *.la *.a stamp-* core *.core core.* *.out *.toke *.err
+diff -Nurp a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in
+--- a/plugins/system_group/Makefile.in	2012-05-15 17:22:03.000000000 +0100
++++ b/plugins/system_group/Makefile.in	2012-06-21 09:32:38.361071545 +0100
+@@ -24,6 +24,7 @@ devdir = @devdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Compiler & tools to use
+ CC = @CC@
+diff -Nurp a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in	2012-05-08 21:56:43.000000000 +0100
++++ b/src/Makefile.in	2012-06-21 09:32:53.233070882 +0100
+@@ -24,6 +24,7 @@ devdir = @devdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ incdir = $(top_srcdir)/include
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Compiler & tools to use
+ CC = @CC@
+diff -Nurp a/zlib/Makefile.in b/zlib/Makefile.in
+--- a/zlib/Makefile.in	2012-03-12 18:02:17.000000000 +0000
++++ b/zlib/Makefile.in	2012-06-21 09:33:03.417070428 +0100
+@@ -22,6 +22,7 @@
+ srcdir = @srcdir@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++cross_compiling = @CROSS_COMPILING@
+ 
+ # Compiler & tools to use
+ CC = @CC@
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 3629ad1888..f1efc54763 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -14,12 +14,4 @@ SUDO_CONF_OPT = \
 		--without-interfaces \
 		--without-pam
 
-define SUDO_INSTALL_TARGET_CMDS
-	install -m 4555 -D $(@D)/src/sudo $(TARGET_DIR)/usr/bin/sudo
-	install -m 0555 -D $(@D)/plugins/sudoers/visudo  \
-		$(TARGET_DIR)/usr/sbin/visudo
-	install -m 0440 -D $(@D)/plugins/sudoers/sudoers \
-		$(TARGET_DIR)/etc/sudoers
-endef
-
 $(eval $(call AUTOTARGETS))

From da76330445f1aa044702f08afd8d57d164b6df07 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 23 Jun 2012 09:44:21 +0200
Subject: [PATCH 2189/6849] axel: needs thread support

Fixes http://autobuild.buildroot.net/results/28d84d05e1a52a9ddec5956c946d99e8cd8c8fd7/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/axel/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/axel/Config.in b/package/axel/Config.in
index cb9af322be..98f4941096 100644
--- a/package/axel/Config.in
+++ b/package/axel/Config.in
@@ -2,7 +2,11 @@ config BR2_PACKAGE_AXEL
 	bool "axel"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  HTTP/FTP download accelerator.
 
 	  http://axel.alioth.debian.org/
+
+comment "axel needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From c3d73c0788973ec3a37b8b32d137a470111fa340 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:20:40 +0000
Subject: [PATCH 2190/6849] kernel-headers: bump 3.{0, 2, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.35-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.36-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index b6bb53aa6e..5e66b67c3a 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.35"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.36"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.20"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.21"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.3"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.4"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.35-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.36-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.35-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.36-headers_install-fix-__packed-in-exported-kernel-head.patch

From 9e0addad6ceb8bc03cb888827b3571856663bf4e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:20:41 +0000
Subject: [PATCH 2191/6849] linux: bump default to kernel version 3.4.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 1cd05ae593..9c2643906f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.3"
+	bool "3.4.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.3" if BR2_LINUX_KERNEL_3_4
+	default "3.4.4" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From fdc2a34ca8e9cedc7f0be59ed6ac999538c9a9a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:29:57 +0000
Subject: [PATCH 2192/6849] squid: bump to version 3.1.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 9cdbeb5a3a..9db2197278 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.19
+SQUID_VERSION = 3.1.20
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
 SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \

From 5506fe9c3085ce2b094be5f366827b908c559919 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:29:58 +0000
Subject: [PATCH 2193/6849] libnl: bump to version 3.2.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index a723701665..82d9b76416 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.9
+LIBNL_VERSION = 3.2.11
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison

From e3cae83573ab9030da718b68de2d9d61a0728143 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:29:59 +0000
Subject: [PATCH 2194/6849] gzip: bump to version 1.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gzip/gzip.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index f712f987cf..5fad0010a7 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -3,8 +3,8 @@
 # gzip
 #
 #############################################################
-GZIP_VERSION:=1.4
-GZIP_SOURCE:=gzip-$(GZIP_VERSION).tar.gz
-GZIP_SITE:=$(BR2_GNU_MIRROR)/gzip
+
+GZIP_VERSION = 1.5
+GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 
 $(eval $(call AUTOTARGETS))

From 6dca8af97798138e487dbd652e95f5b5a4a74945 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:30:00 +0000
Subject: [PATCH 2195/6849] sqlite: bump to version 3.7.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 2c235829b2..62ea661de0 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071201
+SQLITE_VERSION = 3071300
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES

From d9c38d615af90782d62839a7b7836a24698b6416 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Jun 2012 01:30:01 +0000
Subject: [PATCH 2196/6849] mysql_client: security bump to version 5.1.63

Bump to version 5.1.63 to fix CVE-2012-2122

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...2-ac_cache_check.patch => mysql_client-ac_cache_check.patch} | 0
 ...-check.patch => mysql_client-configure-ps-cache-check.patch} | 0
 ...ne-iface.patch => mysql_client-use-new-readline-iface.patch} | 0
 package/mysql_client/mysql_client.mk                            | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename package/mysql_client/{mysql_client-5.1.62-ac_cache_check.patch => mysql_client-ac_cache_check.patch} (100%)
 rename package/mysql_client/{mysql_client-5.1.62-configure-ps-cache-check.patch => mysql_client-configure-ps-cache-check.patch} (100%)
 rename package/mysql_client/{mysql_client-5.1.62-use-new-readline-iface.patch => mysql_client-use-new-readline-iface.patch} (100%)

diff --git a/package/mysql_client/mysql_client-5.1.62-ac_cache_check.patch b/package/mysql_client/mysql_client-ac_cache_check.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.62-ac_cache_check.patch
rename to package/mysql_client/mysql_client-ac_cache_check.patch
diff --git a/package/mysql_client/mysql_client-5.1.62-configure-ps-cache-check.patch b/package/mysql_client/mysql_client-configure-ps-cache-check.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.62-configure-ps-cache-check.patch
rename to package/mysql_client/mysql_client-configure-ps-cache-check.patch
diff --git a/package/mysql_client/mysql_client-5.1.62-use-new-readline-iface.patch b/package/mysql_client/mysql_client-use-new-readline-iface.patch
similarity index 100%
rename from package/mysql_client/mysql_client-5.1.62-use-new-readline-iface.patch
rename to package/mysql_client/mysql_client-use-new-readline-iface.patch
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index a1640c376e..ad330ae23a 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MYSQL_CLIENT_VERSION = 5.1.62
+MYSQL_CLIENT_VERSION = 5.1.63
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-5.1
 MYSQL_CLIENT_INSTALL_STAGING = YES

From b7b640d8126659ca0803d8bad158917f50d43298 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Fri, 8 Jun 2012 01:52:16 +0000
Subject: [PATCH 2197/6849] Remove REAL_GNU_TARGET_NAME

Instead of providing two variables, make GNU_TARGET_NAME give the real
target name, and remove REAL_GNU_TARGET_NAME altogether.

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in                           | 12 ++--
 package/binutils/binutils.mk                  |  6 +-
 package/microperl/microperl.mk                |  4 +-
 package/sstrip/sstrip.mk                      |  2 +-
 toolchain/elf2flt/elf2flt.mk                  |  5 +-
 toolchain/gcc/gcc-uclibc-4.x.mk               | 71 ++++++++-----------
 toolchain/gdb/gdb.mk                          | 16 ++---
 .../toolchain-crosstool-ng/crosstool-ng.mk    |  4 +-
 toolchain/uClibc/uclibc.mk                    |  3 +-
 9 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index df7042c6a4..57599c5d47 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -9,8 +9,8 @@ HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)
 
-# Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME
-GNU_TARGET_NAME=$(ARCH)-linux
+# Compute GNU_TARGET_NAME
+GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
 LIBC=uclibc
@@ -46,9 +46,7 @@ TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc
 endif
 endif
 
-REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
-
-STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sysroot
+STAGING_DIR=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sysroot
 
 TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
 
@@ -97,7 +95,7 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 TARGET_LDFLAGS=$(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
-TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
+TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
 else
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
 endif
@@ -137,7 +135,7 @@ endif
 ifeq ($(BR2_STRIP_sstrip),y)
 STRIP_STRIP_UNNEEDED:=
 STRIP_STRIP_ALL:=
-TARGET_STRIP=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
+TARGET_STRIP=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
 STRIPCMD=$(TARGET_STRIP)
 KSTRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
 endif
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 1c8a79d07d..3293e185c1 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -27,8 +27,8 @@ BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 # We need to specify host & target to avoid breaking ARM EABI
 BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--enable-shared \
 		$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
@@ -40,7 +40,7 @@ endif
 # "host" binutils should actually be "cross"
 # We just keep the convention of "host utility" for now
 HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
-			--target=$(REAL_GNU_TARGET_NAME) \
+			--target=$(GNU_TARGET_NAME) \
 			--disable-shared --enable-static \
 			--with-sysroot=$(STAGING_DIR) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index 5bf4a2e4d5..61187ea9b8 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -9,7 +9,7 @@ MICROPERL_SITE = http://www.cpan.org/src/5.0
 MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2
 MICROPERL_DEPENDENCIES = host-microperl
 MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION)
-MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(REAL_GNU_TARGET_NAME)
+MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(GNU_TARGET_NAME)
 MICROPERL_MODS = $(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES))
 
 # Minimal set of modules required for 'perl -V' to work
@@ -72,7 +72,7 @@ define MICROPERL_CONFIGURE_CMDS
 	echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh
 	echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh
 	echo "d_archlib='define'" >>$(@D)/uconfig.sh
-	echo "archname='$(REAL_GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh
+	echo "archname='$(GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh
 	echo "osname='linux'" >>$(@D)/uconfig.sh
 	echo "cc='$(TARGET_CC)'" >>$(@D)/uconfig.sh
 	echo "ccflags='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh
diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
index 9a5aedecf8..a1447d81da 100644
--- a/package/sstrip/sstrip.mk
+++ b/package/sstrip/sstrip.mk
@@ -6,7 +6,7 @@
 
 SSTRIP_SITE = svn://dev.openwrt.org/openwrt/trunk/tools/sstrip
 SSTRIP_VERSION = 20154
-HOST_SSTRIP_BINARY = $(REAL_GNU_TARGET_NAME)-sstrip
+HOST_SSTRIP_BINARY = $(GNU_TARGET_NAME)-sstrip
 
 # This is a kludge to get host-ccache built before us or it fails
 ifeq ($(BR2_CCACHE),y)
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 84a2c0119e..134034bf96 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -23,7 +23,7 @@ $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
 		$(ELF2FLT_DIR)/configure $(QUIET) \
 		--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
 		--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
 		--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
 		--prefix=$(HOST_DIR)/usr)
@@ -32,9 +32,6 @@ $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
 $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured
 	$(MAKE) -C $(ELF2FLT_DIR) all
 	$(MAKE) -C $(ELF2FLT_DIR) install
-	ln -snf $(REAL_GNU_TARGET_NAME)-elf2flt $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-elf2flt
-	ln -snf $(REAL_GNU_TARGET_NAME)-flthdr  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-flthdr
-	ln -snf $(REAL_GNU_TARGET_NAME)-ld.real $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ld.real
 
 elf2flt: uclibc_target uclibc-configured binutils gcc $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
 
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index a2975dc56c..57f4f8a35b 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -104,7 +104,7 @@ SOFT_FLOAT_CONFIG_OPTION:=
 EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
 	--disable-libmudflap
 EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
-	--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin
+	--with-build-time-tools=$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin
 EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
 	--with-as=$(TARGET_CROSS)as
 endif
@@ -287,7 +287,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--prefix=$(HOST_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--enable-languages=c \
 		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
@@ -322,11 +322,11 @@ endif
 	touch $@
 
 gcc_initial=$(GCC_BUILD_DIR1)/.installed
-$(gcc_initial) $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
+$(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
 	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
 	touch $(gcc_initial)
 
-gcc_initial: $(GCC_HOST_PREREQ) host-binutils $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
+gcc_initial: $(GCC_HOST_PREREQ) host-binutils $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
 
 gcc_initial-clean:
 	rm -rf $(GCC_BUILD_DIR1)
@@ -353,7 +353,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		--prefix=$(HOST_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--enable-languages=c \
 		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
@@ -397,7 +397,7 @@ else
 endif
 	touch $(gcc_intermediate)
 
-gcc_intermediate: uclibc-configured $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
+gcc_intermediate: uclibc-configured $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
 
 gcc_intermediate-clean:
 	rm -rf $(GCC_BUILD_DIR2)
@@ -422,17 +422,17 @@ GCC_BUILD_DIR3:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final
 $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 	mkdir -p $(GCC_BUILD_DIR3)
 	# Important! Required for limits.h to be fixed.
-	ln -snf ../include/ $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
+	ln -snf ../include/ $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sys-include
 	(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
 		$(GCC_SRC_DIR)/configure $(QUIET) \
 		--prefix=$(HOST_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--enable-languages=$(GCC_CROSS_LANGUAGES) \
 		--with-sysroot=$(STAGING_DIR) \
-		--with-build-time-tools=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin \
+		--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
@@ -468,30 +468,20 @@ $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled
 		fi; \
 		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
 		rmdir "$(STAGING_DIR)/lib64"; \
-		rm "$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64";\
+		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
 	fi
 	# Strip the host binaries
 ifeq ($(GCC_STRIP_HOST_BINARIES),true)
-	strip --strip-all -R .note -R .comment $(filter-out %-gccbug %-embedspu,$(wildcard $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-*))
+	strip --strip-all -R .note -R .comment $(filter-out %-gccbug %-embedspu,$(wildcard $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-*))
 endif
 	# Make sure we have 'cc'.
-	if [ ! -e $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \
-		ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
-			$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
+	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
+		ln -snf $(GNU_TARGET_NAME)-gcc \
+			$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc; \
 	fi
-	if [ ! -e $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc ]; then \
-		ln -snf gcc $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc; \
+	if [ ! -e $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc ]; then \
+		ln -snf gcc $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc; \
 	fi
-	# Set up the symlinks to enable lying about target name.
-	set -e; \
-	(cd $(HOST_DIR)/usr; \
-		ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
-		cd bin; \
-		for app in $(REAL_GNU_TARGET_NAME)-*; do \
-			ln -snf $${app} \
-			$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
-		done; \
-	)
 
 	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
 	touch $@
@@ -500,31 +490,31 @@ $(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 	# These go in /lib, so...
 	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
-	-cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcc_s* \
+	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
 		$(STAGING_DIR)/lib/
-	-cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcc_s* \
+	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
 		$(TARGET_DIR)/lib/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s*
 endif
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 	mkdir -p $(TARGET_DIR)/usr/lib
-	-cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libstdc++.so* \
+	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libstdc++.so* \
 		$(STAGING_DIR)/usr/lib/
-	-cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libstdc++.so* \
+	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libstdc++.so* \
 		$(TARGET_DIR)/usr/lib/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so*
 endif
 endif
 ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
-	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(STAGING_DIR)/usr/lib/
-	cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(TARGET_DIR)/usr/lib/
+	cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgomp.so* $(STAGING_DIR)/usr/lib/
+	cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgomp.so* $(TARGET_DIR)/usr/lib/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgomp.so*
 endif
 	mkdir -p $(@D)
 	touch $@
 
-cross_compiler:=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
+cross_compiler:=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
 cross_compiler gcc: gcc_intermediate \
 	$(LIBFLOAT_TARGET) uclibc $(GCC_BUILD_DIR3)/.installed \
 	$(STAMP_DIR)/gcc_libs_target_installed \
@@ -535,7 +525,6 @@ gcc-source: $(DL_DIR)/$(GCC_SOURCE)
 gcc-clean:
 	rm -rf $(GCC_BUILD_DIR3)
 	for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \
-		rm -f $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog; \
 		rm -f $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \
 	done
 
@@ -567,8 +556,8 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		$(GCC_SRC_DIR)/configure $(QUIET) \
 		--prefix=/usr \
 		--build=$(GNU_HOST_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--enable-languages=$(GCC_TARGET_LANGUAGES) \
 		--with-gxx-include-dir=/usr/include/c++ \
 		--disable-__cxa_atexit \
@@ -596,7 +585,7 @@ $(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured
 	$(MAKE) -C $(GCC_BUILD_DIR4) all
 	touch $@
 
-GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
+GCC_LIB_SUBDIR=lib/gcc/$(GNU_TARGET_NAME)/$(GCC_VERSION)
 ifeq ($(findstring x4.2,x$(GCC_VERSION)),x4.2)
 GCC_INCLUDE_DIR:=include
 else
@@ -610,9 +599,9 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
 	rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs
 
 	# Remove useless copies of gcc, c++, g++
-	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc*
-	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++*
-	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++*
+	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc*
+	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-g++*
+	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-c++*
 
 	# Work around problem of missing syslimits.h
 	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \
@@ -637,7 +626,7 @@ gcc_target: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ) binutils
 
 gcc_target-clean:
 	rm -rf $(GCC_BUILD_DIR4)
-	rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)*
+	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)*
 
 gcc_target-dirclean:
 	rm -rf $(GCC_BUILD_DIR4)
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 0b85180f0a..5673cf1e9f 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -71,8 +71,8 @@ $(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked
 		$(GDB_DIR)/configure $(QUIET) \
 		--cache-file=/dev/null \
 		--build=$(GNU_HOST_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--prefix=/usr \
 		$(DISABLE_NLS) \
 		--without-uiout $(DISABLE_GDBMI) \
@@ -124,8 +124,8 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
 		$(GDB_DIR)/gdb/gdbserver/configure $(QUIET) \
 		--cache-file=/dev/null \
 		--build=$(GNU_HOST_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
@@ -150,9 +150,9 @@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
 
 $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-	mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
+	mkdir -p $(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/target_utils
 	install -c $(GDB_SERVER_DIR)/gdbserver \
-		$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
+		$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/target_utils/gdbserver
 endif
 	install -c -D $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver
 
@@ -185,7 +185,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
 		$(DISABLE_NLS) \
 		--without-uiout $(DISABLE_GDBMI) \
 		--disable-tui --disable-gdbtk --without-x \
@@ -203,8 +203,6 @@ $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured
 
 $(TARGET_CROSS)gdb: $(GDB_HOST_DIR)/gdb/gdb
 	install -c $(GDB_HOST_DIR)/gdb/gdb $(TARGET_CROSS)gdb
-	ln -snf $(REAL_GNU_TARGET_NAME)-gdb \
-		$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gdb
 
 gdbhost: host-expat $(TARGET_CROSS)gdb
 
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 25d2a16968..625796a4c2 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -187,7 +187,7 @@ endif
 # CT_LOCAL_TARBALLS_DIR     : share downloads with BR
 # CT_SYSROOT_DIR_PREFIX     : no prefix needed, really
 # CT_TARGET_VENDOR          : try to set a unique vendor string, to avoid clashing with BR's vendor string
-# CT_TARGET_ALIAS           : set the target tuple alias to REAL_GNU_TARGET_NAME so that packages' ./configure find the compiler
+# CT_TARGET_ALIAS           : set the target tuple alias to GNU_TARGET_NAME so that packages' ./configure find the compiler
 # CT_DEBUG_gdb              : deselect gdb+gdbserver if buildroot builds its own
 # CT_CC_LANG_CXX            : required if we copy libstdc++.so, and build C++
 # CT_LIBC_UCLIBC_CONFIG_FILE: uClibc config file, if needed
@@ -202,7 +202,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_ENDIAN)) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="unknown":;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(GNU_TARGET_NAME)":;
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(ARCH)-linux":;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
 ifneq ($(call qstrip,$(BR2_USE_MMU)),)
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 07281351bd..f40fe365b0 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -474,11 +474,10 @@ $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		hostutils
 	if [ -f $(UCLIBC_DIR)/utils/ldd.host ]; then \
 		install -D $(UCLIBC_DIR)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd; \
-		ln -sf ldd $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ldd; \
+		ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd; \
 	fi
 	if [ -f $(UCLIBC_DIR)/utils/ldconfig.host ]; then \
 		install -D $(UCLIBC_DIR)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig; \
-		ln -sf ldconfig $(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ldconfig; \
 		ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig; \
 	fi
 	touch -c $@

From 3f487ef72845965b578002b2f9c0a37eff47e97a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 23 Jun 2012 21:26:16 +0200
Subject: [PATCH 2198/6849] toolchain: reinstate host/usr/bin/$arch-linux-*
 symlinks for gcc/gdb binaries

As people might be using them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 4 ++++
 toolchain/gdb/gdb.mk            | 1 +
 2 files changed, 5 insertions(+)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 57f4f8a35b..e29d797ccc 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -482,6 +482,10 @@ endif
 	if [ ! -e $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc ]; then \
 		ln -snf gcc $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc; \
 	fi
+	# arch-linux-* symlinks
+	cd $(HOST_DIR)/usr/bin; for i in $(GNU_TARGET_NAME)-*; do \
+		ln -snf $$i $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \
+	done
 
 	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
 	touch $@
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 5673cf1e9f..f5af4541ac 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -203,6 +203,7 @@ $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured
 
 $(TARGET_CROSS)gdb: $(GDB_HOST_DIR)/gdb/gdb
 	install -c $(GDB_HOST_DIR)/gdb/gdb $(TARGET_CROSS)gdb
+	ln -snf $(@F) $(HOST_DIR)/usr/bin/$(ARCH)-linux-gdb
 
 gdbhost: host-expat $(TARGET_CROSS)gdb
 

From 2d177d4852ec5549f93671273f07ba60dbabdcc2 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 18 Jun 2012 15:01:44 +0000
Subject: [PATCH 2199/6849] xinetd: expand DESTDIR patch to fix uninstall
 target

Expand the openWRT patch to fix xinetd's "uninstall" target,
so that buildroot's "xinetd-clean" removes the correct files.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xinetd/xinetd-2.3.15/002-destdir.patch    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/package/xinetd/xinetd-2.3.15/002-destdir.patch b/package/xinetd/xinetd-2.3.15/002-destdir.patch
index 15ff4b8dc1..7a323eb68a 100644
--- a/package/xinetd/xinetd-2.3.15/002-destdir.patch
+++ b/package/xinetd/xinetd-2.3.15/002-destdir.patch
@@ -1,14 +1,15 @@
 This patch adds $(DESTDIR) to xinetd's installation paths, to support 
 installation to a cross-compiled RFS area.
 
-The content of this patch was copied from the OpenWrt project:
+The content of this patch was inspired by the OpenWrt project:
 https://dev.openwrt.org/browser/packages/net/xinetd/patches/002-destdir.patch
 
 Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
+diff -urN xinetd-2.3.15.ORIG/Makefile.in xinetd-2.3.15/Makefile.in
+--- xinetd-2.3.15.ORIG/Makefile.in	2007-09-20 13:01:52.000000000 -0400
++++ xinetd-2.3.15/Makefile.in	2012-06-18 10:20:00.540864388 -0400
+@@ -75,27 +75,27 @@
  
  install: build
  	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
@@ -33,3 +34,22 @@ Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
  	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
  	@echo "There is a sample config file in xinetd/sample.conf and you can"
  	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
+ 
+ uninstall:
+-	rm -f $(DAEMONDIR)/xinetd
+-	rm -f $(DAEMONDIR)/itox
+-	rm -f $(DAEMONDIR)/xconv.pl
+-	rm -f $(MANDIR)/man5/xinetd.conf.5
+-	rm -f $(MANDIR)/man8/xinetd.log.8
+-	rm -f $(MANDIR)/man8/xinetd.8
+-	rm -f $(MANDIR)/man8/itox.8
++	rm -f $(DESTDIR)$(DAEMONDIR)/xinetd
++	rm -f $(DESTDIR)$(DAEMONDIR)/itox
++	rm -f $(DESTDIR)$(DAEMONDIR)/xconv.pl
++	rm -f $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
++	rm -f $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
++	rm -f $(DESTDIR)$(MANDIR)/man8/xinetd.8
++	rm -f $(DESTDIR)$(MANDIR)/man8/itox.8
+  
+ distclean: clean
+ 	rm -f config.cache config.log Makefile config.status xinetd/itox

From ed42aab337507220b97d7b7f0fd8996ca547c9b4 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 18 Jun 2012 15:18:32 +0000
Subject: [PATCH 2200/6849] xinetd: explicitly specify AR in build step

xinetd's configure does not set up an AR variable, and there
are no libtool files to autoreconfigure.  So instead, lets
pass in AR during the build.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xinetd/xinetd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index 6a69a554eb..e8fc037ae6 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -11,4 +11,6 @@ ifneq ($(BR2_INET_RPC),y)
 XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC"
 endif
 
+XINETD_MAKE_OPT = AR="$(TARGET_AR)"
+
 $(eval $(call AUTOTARGETS))

From b317f63489b03a0f31d1a199f60b3c5d878e0c10 Mon Sep 17 00:00:00 2001
From: Phil Edworthy <PHIL.EDWORTHY@renesas.com>
Date: Mon, 18 Jun 2012 20:05:53 +0000
Subject: [PATCH 2201/6849] Add /dev/video static device nodes

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/generic/device_table_dev.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/generic/device_table_dev.txt b/target/generic/device_table_dev.txt
index d1d1e110c5..a93a2c8083 100644
--- a/target/generic/device_table_dev.txt
+++ b/target/generic/device_table_dev.txt
@@ -141,3 +141,6 @@
 
 # I2C device nodes
 /dev/i2c-	c	666	0	0	89	0	0	1	4
+
+# v4l device nodes
+/dev/video	c	666	0	0	81	0	0	1	4

From 7944f19740497e68287b612db6a63e94e3cc1fe5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 21 Jun 2012 12:22:24 +0000
Subject: [PATCH 2202/6849] php: force cross-compilation

This fixes build problems like
http://autobuild.buildroot.org/results/e3c5815766fdcf3f13b06fa0758ec418618ac4be/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php-force-cross-compile.patch | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/php/php-force-cross-compile.patch

diff --git a/package/php/php-force-cross-compile.patch b/package/php/php-force-cross-compile.patch
new file mode 100644
index 0000000000..f14b477381
--- /dev/null
+++ b/package/php/php-force-cross-compile.patch
@@ -0,0 +1,50 @@
+php: force cross-compilation
+
+In its configure script, PHP detects whether we're cross-compiling or
+not, by compiling and running a simple C program. Depending on whether
+cross-compiling has been detected or not, then PHP enables or disables
+the AC_TRY_RUN tests (which verify the availability of something by
+*executing* a program, which, by definition, cannot work in
+cross-compilation mode).
+
+This works just fine when the target architecture is ARM or PowerPC
+and the build machine is x86 or x86_64. Unfortunately, when the target
+architecture is x86_64 and the build machine is also x86_64, the
+cross-compilation mode detection concludes that we are not
+cross-compiling, because it succeeds in running this small program.
+
+However, while it succeeds in running this basic small program, some
+other programs executed later through AC_TRY_RUN tests do not work,
+because they have target library dependencies that are not available
+on the build machine. For example, the libxml2 test fails to *run*
+because libxml2 is not available on the build machine, only in the
+target/staging directories. So trying to run a program linked against
+libxml2, on the build machine, simply doesn't make sense.
+
+We fix this problem by just forcing PHP to think that we're
+cross-compiling (which is always the case with Buildroot, as we're at
+the moment never building PHP for the host). Unfortunately, the
+configure.in file dates back from the autoconf 2.13 era, so the
+configure script does not understand the ac_cv_prog_cc_cross cache
+variable, and we cannot easily regenerate the configure script using
+our package autoconf version. The easiest solution is therefore to
+simply patch the configure script to make the cross-compilation test
+fail: we replace the execution of the program by a call to false,
+which always fail, leading the configure script to understand that we
+*are* cross-compiling.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -2387,7 +2387,7 @@
+ if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
++  if (false; exit) 2>/dev/null; then
+     ac_cv_prog_cc_cross=no
+   else
+     ac_cv_prog_cc_cross=yes

From 8ac6a2f94c35353f8fbf0906e232dc568bae3212 Mon Sep 17 00:00:00 2001
From: David Purdy <david.c.purdy@gmail.com>
Date: Tue, 19 Jun 2012 06:37:34 +0000
Subject: [PATCH 2203/6849] inadyn: add package for inadyn DDNS client-updater

inadyn is a DynamicDNS client/updater which works with dyndns.com, noip.com
and many other DDNS providers.  It is minimal in footprint and requirements,
supports IP caching, multiple providers, multiple domain names, and
a variety of other situations.

[Peter: fixup whitespace / trailing spaces]
Signed-off-by: Dave Purdy <david.c.purdy@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/inadyn/Config.in   |  8 ++++++++
 package/inadyn/S70inadyn   | 35 +++++++++++++++++++++++++++++++++++
 package/inadyn/inadyn.conf | 12 ++++++++++++
 package/inadyn/inadyn.mk   | 23 +++++++++++++++++++++++
 5 files changed, 79 insertions(+)
 create mode 100644 package/inadyn/Config.in
 create mode 100644 package/inadyn/S70inadyn
 create mode 100644 package/inadyn/inadyn.conf
 create mode 100644 package/inadyn/inadyn.mk

diff --git a/package/Config.in b/package/Config.in
index 1044e9fa25..d489b6af5f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -529,6 +529,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
 endif
 source "package/igh-ethercat/Config.in"
+source "package/inadyn/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
diff --git a/package/inadyn/Config.in b/package/inadyn/Config.in
new file mode 100644
index 0000000000..623da419de
--- /dev/null
+++ b/package/inadyn/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_INADYN
+	bool "inadyn"
+	help
+	  INADYN is a free DynDNS client. It gives the possibility
+	  to have your own fixed hostname registered on the internet,
+	  although your IP might be changing.
+
+	  https://github.com/troglobit/inadyn
diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn
new file mode 100644
index 0000000000..24d0813791
--- /dev/null
+++ b/package/inadyn/S70inadyn
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Start & stop the inadyn client
+#
+
+CONFIG=/etc/inadyn.conf
+VR_INADYN=/var/run/inadyn
+
+# check if CONFIG exists, print message & exit if it doesn't
+[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 )
+
+# check if VR_INADYN exists, create it if not
+[ ! -d $VR_INADYN ] && mkdir -p $VR_INADYN
+
+case "$1" in
+        start)
+                echo "Starting inadyn."
+                start-stop-daemon -S -x /usr/sbin/inadyn
+                ;;
+        stop)
+                echo  "Stopping inadyn."
+                start-stop-daemon -q -K -x /usr/sbin/inadyn
+                rm -f /var/run/inadyn/inadyn.pid
+                ;;
+        restart)
+                "$0" stop
+                "$0" start
+                ;;
+        *)
+                echo $"Usage: $0 {start|stop|restart}"
+                exit 1
+esac
+
+exit $?
+
diff --git a/package/inadyn/inadyn.conf b/package/inadyn/inadyn.conf
new file mode 100644
index 0000000000..b5877f7a77
--- /dev/null
+++ b/package/inadyn/inadyn.conf
@@ -0,0 +1,12 @@
+# Basic configuration file for inadyn
+#
+# /etc/inadyn.conf
+background
+update_period_sec 600 # Check for a new IP every 600 seconds
+username test		# replace 'test' with your username
+password test		# replace 'test' with your password
+dyndns_system dyndns@dyndns.org   # replace w/ your provider
+
+#  uncomment the alias statement below to test it on your system
+alias test.homeip.net
+# replace 'test.homeip.net' with yourdomainname for actual (non-test) use
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
new file mode 100644
index 0000000000..5cba77baa1
--- /dev/null
+++ b/package/inadyn/inadyn.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# inadyn
+#
+#############################################################
+
+INADYN_VERSION = 1.98.1
+INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.bz2
+INADYN_SITE = https://github.com/downloads/troglobit/inadyn
+
+define INADYN_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define INADYN_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/inadyn $(TARGET_DIR)/usr/sbin/inadyn
+	$(INSTALL) -D -m 0644 package/inadyn/inadyn.conf \
+		$(TARGET_DIR)/etc/inadyn.conf
+	$(INSTALL) -D -m 0755 package/inadyn/S70inadyn \
+		$(TARGET_DIR)/etc/init.d/S70inadyn
+endef
+
+$(eval $(call GENTARGETS))

From 28943cf00545e9c923364bfca4af044faaf6fc53 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@gmail.com>
Date: Mon, 18 Jun 2012 11:32:51 +0000
Subject: [PATCH 2204/6849] Add package nss-mdns.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/nss-mdns/Config.in     | 13 +++++++++++++
 package/nss-mdns/nss-mdns.mk   | 15 +++++++++++++++
 package/nss-mdns/nsswitch.conf | 15 +++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 package/nss-mdns/Config.in
 create mode 100644 package/nss-mdns/nss-mdns.mk
 create mode 100644 package/nss-mdns/nsswitch.conf

diff --git a/package/Config.in b/package/Config.in
index d489b6af5f..c9b5e1a965 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -426,6 +426,7 @@ source "package/libsoup/Config.in"
 source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
+source "package/nss-mdns/Config.in"
 source "package/ortp/Config.in"
 source "package/zeromq/Config.in"
 endmenu
diff --git a/package/nss-mdns/Config.in b/package/nss-mdns/Config.in
new file mode 100644
index 0000000000..485cfcd084
--- /dev/null
+++ b/package/nss-mdns/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_NSS_MDNS
+	bool "nss-mdns"
+	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc
+	depends on BR2_PACKAGE_AVAHI_DAEMON
+	help
+	  nss-mdns is a plugin for the GNU Name Service Switch (NSS)
+	  functionality of the GNU C Library (glibc) providing host
+	  name resolution via Multicast DNS (aka Zeroconf, aka Apple
+	  Rendezvous, aka Apple Bonjour), effectively allowing name
+	  resolution by common Unix/Linux programs in the ad-hoc
+	  mDNS domain .local.
+
+	  http://0pointer.de/lennart/projects/nss-mdns/
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
new file mode 100644
index 0000000000..8f7d9a9a83
--- /dev/null
+++ b/package/nss-mdns/nss-mdns.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# nss_mdns
+#
+#############################################################
+NSS_MDNS_VERSION=0.10
+NSS_MDNS_SITE=http://0pointer.de/lennart/projects/nss-mdns
+
+define NSS_MDNS_INSTALL_CONFIG
+	$(INSTALL) -D -m 0664 package/nss-mdns/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf
+endef
+
+NSS_MDNS_POST_INSTALL_TARGET_HOOKS += NSS_MDNS_INSTALL_CONFIG
+
+$(eval $(call AUTOTARGETS))
diff --git a/package/nss-mdns/nsswitch.conf b/package/nss-mdns/nsswitch.conf
new file mode 100644
index 0000000000..94174e03e3
--- /dev/null
+++ b/package/nss-mdns/nsswitch.conf
@@ -0,0 +1,15 @@
+# /etc/nsswitch.conf
+
+passwd:         compat
+group:          compat
+shadow:         compat
+
+hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
+netgroup:       nis

From f86391fc07731c26d96acec5f1d082378f9e494d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 20 Jun 2012 01:50:04 +0000
Subject: [PATCH 2205/6849] sound-theme-freedesktop: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                    |  1 +
 package/sound-theme-freedesktop/Config.in            |  6 ++++++
 .../sound-theme-freedesktop.mk                       | 12 ++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/sound-theme-freedesktop/Config.in
 create mode 100644 package/sound-theme-freedesktop/sound-theme-freedesktop.mk

diff --git a/package/Config.in b/package/Config.in
index c9b5e1a965..b257c0fe6d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -493,6 +493,7 @@ source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
+source "package/sound-theme-freedesktop/Config.in"
 endmenu
 
 menu "Networking applications"
diff --git a/package/sound-theme-freedesktop/Config.in b/package/sound-theme-freedesktop/Config.in
new file mode 100644
index 0000000000..8b48015f59
--- /dev/null
+++ b/package/sound-theme-freedesktop/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_SOUND_THEME_FREEDESKTOP
+	bool "sound-theme-freedesktop"
+	help
+	  Default theme for the XDG Sound Theme Specification.
+
+	  http://freedesktop.org/wiki/Specifications/sound-theme-spec
diff --git a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
new file mode 100644
index 0000000000..d81c207276
--- /dev/null
+++ b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# sound-theme-freedesktop
+#
+#############################################################
+SOUND_THEME_FREEDESKTOP_VERSION = 0.7
+SOUND_THEME_FREEDESKTOP_SITE = \
+	http://people.freedesktop.org/~mccann/dist
+SOUND_THEME_FREEDESKTOP_SOURCE = \
+	sound-theme-freedesktop-$(SOUND_THEME_FREEDESKTOP_VERSION).tar.bz2
+
+$(eval $(call AUTOTARGETS))

From 75f18de67e7bc7f1feb360eb4201a3c6d6773698 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 21 Jun 2012 19:34:49 +0000
Subject: [PATCH 2206/6849] pkg-utils.mk: add utility functions find*clauses
 and notfirstword

This patch adds a few utility functions to pkg-utils.mk.

Functions finddirclauses and findfileclauses help in building a find command
that skips a set of directories and performs operations on a set of files.
This pattern can for example be used to keep certain files or directories from
being stripped, or to remove certain files from a package installation.

The notfirstword function is the inverse of the 'firstword' function in make:
it returns all but the first word.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-utils.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 953dbc94c1..0c55a9d710 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -76,6 +76,15 @@ MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESE
 TERM_BOLD := $(shell tput smso)
 TERM_RESET := $(shell tput rmso)
 
+# Utility functions for 'find'
+# findfileclauses(filelist) => -name 'X' -o -name 'Y'
+findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
+# finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY'
+finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
+
+# Miscellaneous utility functions
+# notfirstword(wordlist): returns all but the first word in wordlist
+notfirstword = $(wordlist 2,$(words $(1)),$(1))
 
 # Needed for the foreach loops to loop over the list of hooks, so that
 # each hook call is properly separated by a newline.

From 2a97045d5daeb7cb7222f1ffe0532930d5b3140d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 21 Jun 2012 19:34:50 +0000
Subject: [PATCH 2207/6849] build: add option to exclude executables/dirs from
 being stripped

Sometimes it may be desirable to keep debug symbols for some binaries and
libraries on the target. This commit introduces the config option
BR2_STRIP_EXCLUDE_FILES, which is interpreted as a list of such binaries
and libraries, and the option BR2_STRIP_EXCLUDE_DIRS, which indicates
directories excluded from stripping entirely.
These exclusions are passed to the find command in the target-finalize step.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in | 19 +++++++++++++++++++
 Makefile  | 10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Config.in b/Config.in
index 95c2e8ca3b..83f64bb678 100644
--- a/Config.in
+++ b/Config.in
@@ -283,6 +283,25 @@ config BR2_STRIP_none
 	  filesystem.
 endchoice
 
+config BR2_STRIP_EXCLUDE_FILES
+	string "executables that should not be stripped"
+	depends on !BR2_STRIP_none
+	default ""
+	help
+	  You may specify a space-separated list of binaries and libraries
+	  here that should not be stripped on the target.
+
+config BR2_STRIP_EXCLUDE_DIRS
+	string "directories that should be skipped when stripping"
+	depends on !BR2_STRIP_none
+	default ""
+	help
+	  You may specify a space-separated list of directories that should
+	  be skipped when stripping. Binaries and libraries in these
+	  directories will not be touched.
+	  The directories should be specified relative to the target directory,
+	  without leading slash.
+
 choice
 	prompt "gcc optimization level"
 	default BR2_OPTIMIZE_S
diff --git a/Makefile b/Makefile
index 9a9634d549..c691767315 100644
--- a/Makefile
+++ b/Makefile
@@ -386,6 +386,13 @@ $(BUILD_DIR)/.root:
 
 $(TARGET_DIR): $(BUILD_DIR)/.root
 
+STRIP_FIND_CMD = find $(TARGET_DIR)
+ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)))
+STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o
+endif
+STRIP_FIND_CMD += -type f -perm +111
+STRIP_FIND_CMD += -not \( $(call findfileclauses,libthread_db*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
+
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
 	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
@@ -410,8 +417,7 @@ endif
 ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
 	find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f
 endif
-	find $(TARGET_DIR) -type f -perm +111 '!' -name 'libthread_db*.so*' | \
-		xargs $(STRIPCMD) 2>/dev/null || true
+	$(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true
 	find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
 		xargs -r $(KSTRIPCMD) || true
 

From 07bae75635ebc0b2b3a2df8aca2f5022debacddb Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 21 Jun 2012 19:38:42 +0000
Subject: [PATCH 2208/6849] source-check: change behavior to check only
 selected packages / add source-check-all

The original 'source-check' target first selects all packages, and then checks
whether the package tarballs can be found. This is useful for Buildroot
maintainers, but less useful for developers working on a specific project. The
latter only care about the packages used in that project.

This patch removes the allyesconfig dependency to source-check so that only
selected packages are checked. The original behavior is moved to a new target
'source-check-all'.

[Peter: removed source-check-all, people can just make allyesconfig before]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c691767315..7a66897cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -591,7 +591,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@$(COMMON_CONFIG_ENV) $< --savedefconfig=$(CONFIG_DIR)/defconfig $(CONFIG_CONFIG_IN)
 
 # check if download URLs are outdated
-source-check: allyesconfig
+source-check:
 	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source
 
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
@@ -678,7 +678,7 @@ endif
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
-	@echo '  source-check           - check all packages for valid download URLs'
+	@echo '  source-check           - check selected packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
 	@echo
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'

From e607b0f9e3efaf96ffb2c3196f736c80232adc1b Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 4 Jun 2012 20:11:42 +0000
Subject: [PATCH 2209/6849] gstreamer: add xorg support

GStreamer requires xorg support in order for the ximagesink and xvimagesink
plugins to be available.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-base/Config.in    |  3 +++
 .../gst-plugins-base/gst-plugins-base.mk         | 16 +++++++++++++---
 .../gst-plugins-good/gst-plugins-good.mk         | 16 +++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 851337b05f..5d8253395a 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -1,6 +1,9 @@
 menuconfig BR2_PACKAGE_GST_PLUGINS_BASE
 	bool "gst-plugins-base"
 	depends on BR2_PACKAGE_GSTREAMER
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7
 	help
 	  A basic set of well-supported plug-ins for GStreamer.
 
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 848eaf2909..e35a606ddb 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -17,15 +17,25 @@ GST_PLUGINS_BASE_CONF_ENV =
 
 GST_PLUGINS_BASE_CONF_OPT = \
 		--disable-examples \
-		--disable-x \
-		--disable-xvideo \
-		--disable-xshm \
 		--disable-oggtest \
 		--disable-vorbistest \
 		--disable-freetypetest
 
 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
+GST_PLUGINS_BASE_CONF_OPT += \
+	--enable-x \
+	--enable-xshm \
+	--enable-xvideo
+else
+GST_PLUGINS_BASE_CONF_OPT += \
+	--disable-x \
+	--disable-xshm \
+	--disable-xvideo
+endif
+
 ifeq ($(BR2_PACKAGE_ORC),y)
 GST_PLUGINS_BASE_DEPENDENCIES += orc
 endif
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 4e6b73e5da..ebd463b0e7 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -14,9 +14,6 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 		--disable-sunaudio \
 		--disable-osx_audio \
 		--disable-osx_video \
-		--disable-x \
-		--disable-xshm \
-		--disable-xvideo \
 		--disable-aalib \
 		--disable-aalibtest \
 		--disable-esd \
@@ -25,6 +22,19 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 
 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
+GST_PLUGINS_GOOD_CONF_OPT += \
+	--enable-x \
+	--enable-xshm \
+	--enable-xvideo
+else
+GST_PLUGINS_GOOD_CONF_OPT += \
+	--disable-x \
+	--disable-xshm \
+	--disable-xvideo
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
 GST_PLUGINS_GOOD_DEPENDENCIES += jpeg

From e065b0ecd548c7c3ea6069b50f183dd2fc85a1b9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Jun 2012 00:55:27 +0200
Subject: [PATCH 2210/6849] libconfig: don't build examples

Fixes (works around)

http://autobuild.buildroot.net/results/2378161d70beade94547a68eeeaa69e34705baf2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfig/libconfig.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 8ef927b3db..f81f4195b7 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -6,9 +6,10 @@
 LIBCONFIG_VERSION = 1.4.8
 LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig/
 LIBCONFIG_INSTALL_STAGING = YES
+LIBCONFIG_CONF_OPT = --disable-examples
 
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
-LIBCONFIG_CONF_OPT = --disable-cxx
+LIBCONFIG_CONF_OPT += --disable-cxx
 endif
 
 $(eval $(call AUTOTARGETS))

From da1884f048f691467febc2d6d4d570d414c530d0 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Date: Sat, 2 Jun 2012 01:40:30 +0000
Subject: [PATCH 2211/6849] quota: new package (v8)

[Peter: fix help text whitespace]
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  3 +++
 package/quota/Config.in | 14 ++++++++++++++
 package/quota/quota.mk  | 18 ++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/quota/Config.in
 create mode 100644 package/quota/quota.mk

diff --git a/package/Config.in b/package/Config.in
index b257c0fe6d..374a5aa8ec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -663,6 +663,9 @@ source "package/monit/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"
+endif
+source "package/quota/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rsyslog/Config.in"
 source "package/sysklogd/Config.in"
 source "package/sysvinit/Config.in"
diff --git a/package/quota/Config.in b/package/quota/Config.in
new file mode 100644
index 0000000000..dfefb8a188
--- /dev/null
+++ b/package/quota/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_QUOTA
+	bool "quota"
+	depends on BR2_INET_RPC
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_MOUNT
+	help
+	  Implementation of the disk quota system.
+
+	  http://sourceforge.net/projects/linuxquota/
+
+comment "quota requires a toolchain with RPC + LARGEFILE + WCHAR support"
+	depends on !(BR2_INET_RPC && BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
new file mode 100644
index 0000000000..845eefbaa5
--- /dev/null
+++ b/package/quota/quota.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# QUOTA
+#
+#############################################################
+
+QUOTA_VERSION = 4.00
+QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
+QUOTA_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
+
+QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
+# Package uses autoconf but not automake.
+QUOTA_INSTALL_TARGET_OPT = \
+	ROOTDIR=$(TARGET_DIR) \
+	install
+
+$(eval $(call AUTOTARGETS))

From 3cd8183f875a56ccffd0adf951ae6caed4b8b0a5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Jun 2012 10:59:37 +0200
Subject: [PATCH 2212/6849] ltrace: unbreak build on uClibc after
 REAL_GNU_TARGET_NAME removal

Fixes http://autobuild.buildroot.net/results/b7456bb91a89f866f91e8c21a8ed5de98f25e6be

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/ltrace-0.6.0-uclibc.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/ltrace/ltrace-0.6.0-uclibc.patch

diff --git a/package/ltrace/ltrace-0.6.0-uclibc.patch b/package/ltrace/ltrace-0.6.0-uclibc.patch
new file mode 100644
index 0000000000..8bec2ae0a2
--- /dev/null
+++ b/package/ltrace/ltrace-0.6.0-uclibc.patch
@@ -0,0 +1,22 @@
+[PATCH] configure.ac: Recognize linux-uclibc as well
+
+Ltrace works on uClibc as well as on glibc, so accept it.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ltrace-0.6.0/configure.ac
+===================================================================
+--- ltrace-0.6.0.orig/configure.ac
++++ ltrace-0.6.0/configure.ac
+@@ -11,7 +11,7 @@
+ AC_CANONICAL_HOST
+ 
+ case "${host_os}" in
+-    linux-gnu*)	HOST_OS="linux-gnu" ;;
++    linux-gnu* | linux-uclibc*)	HOST_OS="linux-gnu" ;;
+     *)		AC_MSG_ERROR([unkown host-os ${host_osx}]) ;;
+ esac
+ AC_SUBST(HOST_OS)

From a72aed3a7434ed35599674a8405b1baee0f3df75 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 11 Jun 2012 16:09:37 +0000
Subject: [PATCH 2213/6849] introduce PARALLEL_JOBS build system variable

BR2_JLEVEL currently is expanded directly in $(MAKE), and used in
invocations of other build software (e.g. ct-ng).  However, we are
going to allow "0" to be a meaningful value for BR2_JLEVEL, which
won't work for these uses.  Given that it is not permissible to modify
BR2_-prefixed variables in Makefiles, we need an intermediate
variable.

Define PARALLEL_JOBS to $(BR2_JLEVEL), and use the former in MAKE's
definition.  Uses of BR2_JLEVEL throughout the rest of the tree to be
adjusted similarly in follow-up patches.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 57599c5d47..be83ada1c3 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -6,8 +6,10 @@ HOSTMAKE=$(MAKE)
 endif
 HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 
+PARALLEL_JOBS:=$(BR2_JLEVEL)
+
 MAKE1:=$(HOSTMAKE) -j1
-MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)
+MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS)
 
 # Compute GNU_TARGET_NAME
 GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)

From 7206f219d46c9007e9e14dffd60d4904b108671d Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 11 Jun 2012 16:09:38 +0000
Subject: [PATCH 2214/6849] boost: change uses of BR2_JLEVEL to PARALLEL_JOBS

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 366796440a..abdf3a2c26 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -70,7 +70,7 @@ define BOOST_CONFIGURE_CMDS
 endef
 
 define BOOST_INSTALL_TARGET_CMDS
-	(cd $(@D) && ./b2 -j$(BR2_JLEVEL) -q -d+2 \
+	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+2 \
 	--user-config=$(@D)/user-config.jam \
 	$(BOOST_OPT) \
 	--prefix=$(TARGET_DIR)/usr \
@@ -78,7 +78,7 @@ define BOOST_INSTALL_TARGET_CMDS
 endef
 
 define BOOST_INSTALL_STAGING_CMDS
-	(cd $(@D) && ./bjam -j$(BR2_JLEVEL) -d+2 \
+	(cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+2 \
 	--user-config=$(@D)/user-config.jam \
 	$(BOOST_OPT) \
 	--prefix=$(STAGING_DIR)/usr \

From 615645936cccfed19ee5d28121df6f2ecc294f9d Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 11 Jun 2012 16:09:39 +0000
Subject: [PATCH 2215/6849] cmake: change use of BR2_JLEVEL to PARALLEL_JOBS

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index af88eea824..af6c53cdfa 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -5,7 +5,7 @@ define HOST_CMAKE_CONFIGURE_CMDS
  (cd $(@D); \
 	LDFLAGS="$(HOST_LDFLAGS)" \
 	CFLAGS="$(HOST_CFLAGS)" \
-	./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(BR2_JLEVEL) \
+	./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
  )
 endef
 

From 3fa214aadf41ff35835d91f67a6502d3b9a79bfd Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 11 Jun 2012 16:09:40 +0000
Subject: [PATCH 2216/6849] midori: change use of BR2_JLEVEL to PARALLEL_JOBS

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/midori/midori.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 0b3439c53c..aa376a2805 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -34,7 +34,7 @@ define MIDORI_CONFIGURE_CMDS
 endef
 
 define MIDORI_BUILD_CMDS
-       (cd $(@D); ./waf build -j $(BR2_JLEVEL))
+       (cd $(@D); ./waf build -j $(PARALLEL_JOBS))
 endef
 
 define MIDORI_INSTALL_TARGET_CMDS

From de780f6471672468fd67d79177e707c6d4d160ac Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 11 Jun 2012 16:09:41 +0000
Subject: [PATCH 2217/6849] qt: change use of BR2_JLEVEL to PARALLEL_JOBS

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 6b1be831a4..e18b8738c0 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -487,7 +487,7 @@ define QT_CONFIGURE_CMDS
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-		MAKEFLAGS="$(MAKEFLAGS) -j$(BR2_JLEVEL)" ./configure \
+		MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
 		$(if $(VERBOSE),-verbose,-silent) \
 		-force-pkg-config \
 		$(QT_CONFIGURE_OPTS) \

From f6b26ea4251c7bcec36a26e7059832789a3f5938 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Mon, 11 Jun 2012 16:09:42 +0000
Subject: [PATCH 2218/6849] toolchain/crosstool-ng: change use of BR2_JLEVEL to
 PARALLEL_JOBS

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 625796a4c2..d18f5d53ca 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -81,7 +81,7 @@ $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 #       depending on the selected C library. Those deps are added later
 
 $(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/.config
-	$(Q)$(call ctng,build.$(BR2_JLEVEL))
+	$(Q)$(call ctng,build.$(PARALLEL_JOBS))
 	$(Q)printf "\n"
 	$(Q)touch $@
 

From 5016aa02fb51dbd73461f65ed8c7d9b52539a988 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Sat, 16 Jun 2012 09:37:17 +0000
Subject: [PATCH 2219/6849] automatically set PARALLEL_JOBS when BR2_JLEVEL is
 0

When BR2_JLEVEL is 0, set PARALLEL_JOBS to double the number of CPUs
detected.  This allows one to more or less fully utilize the host
system without manually tuning the configuration.

Also make 0 the default value for BR2_JLEVEL.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in           | 8 +++++---
 package/Makefile.in | 8 ++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Config.in b/Config.in
index 83f64bb678..925c2474cb 100644
--- a/Config.in
+++ b/Config.in
@@ -178,10 +178,12 @@ config BR2_DEBIAN_MIRROR
 endmenu
 
 config BR2_JLEVEL
-	int "Number of jobs to run simultaneously"
-	default "2"
+	int "Number of jobs to run simultaneously (0 for auto)"
+	default "0"
 	help
-	  Number of jobs to run simultaneously
+	  Number of jobs to run simultaneously.  If 0, determine
+	  automatically according to number of CPUs on the host
+	  system.
 
 config BR2_CCACHE
 	bool "Enable compiler cache"
diff --git a/package/Makefile.in b/package/Makefile.in
index be83ada1c3..1d43aef5c2 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -6,7 +6,15 @@ HOSTMAKE=$(MAKE)
 endif
 HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 
+# If BR2_LEVEL is 0, scale the maximum concurrency with the number of
+# CPUs.  A coefficient of 2 is used in order to keep processors busy
+# while waiting on I/O.
+ifeq ($(BR2_JLEVEL),0)
+PARALLEL_JOBS:=$(shell echo \
+	$$((2 * `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
+else
 PARALLEL_JOBS:=$(BR2_JLEVEL)
+endif
 
 MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS)

From 47aa58a4ddd3774fa78acffbf85384c558b7f2dd Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Sun, 25 Mar 2012 14:15:40 +0000
Subject: [PATCH 2220/6849] New package: zxing

[Peter: build using make instead of scons, fixup whitespace, target install]
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/zxing/Config.in            | 14 +++++++++++
 package/zxing/zxing-makefile.patch | 30 +++++++++++++++++++++++
 package/zxing/zxing.mk             | 39 ++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 package/zxing/Config.in
 create mode 100644 package/zxing/zxing-makefile.patch
 create mode 100644 package/zxing/zxing.mk

diff --git a/package/Config.in b/package/Config.in
index 374a5aa8ec..99257b426f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -361,6 +361,7 @@ source "package/pango/Config.in"
 source "package/pixman/Config.in"
 source "package/tiff/Config.in"
 source "package/webkit/Config.in"
+source "package/zxing/Config.in"
 endmenu
 
 menu "Hardware handling"
diff --git a/package/zxing/Config.in b/package/zxing/Config.in
new file mode 100644
index 0000000000..c1d342c71e
--- /dev/null
+++ b/package/zxing/Config.in
@@ -0,0 +1,14 @@
+comment "zxing requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_ZXING
+	bool "zxing"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  ZXing (pronounced "zebra crossing") is an open-source,
+	  multi-format 1D/2D barcode image processing library
+	  implemented in Java, with ports to other languages. This
+	  compiles the C++ port.
+
+	  http://code.google.com/p/zxing/
diff --git a/package/zxing/zxing-makefile.patch b/package/zxing/zxing-makefile.patch
new file mode 100644
index 0000000000..66896bf327
--- /dev/null
+++ b/package/zxing/zxing-makefile.patch
@@ -0,0 +1,30 @@
+[PATCH] add Makefile
+
+The scons based build system doesn't handle cross compilation, special
+compiler flags or (un)installation, so add a simple makefile instead
+which does.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ cpp/core/src/Makefile |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+Index: zxing-2.0/cpp/core/src/Makefile
+===================================================================
+--- /dev/null
++++ zxing-2.0/cpp/core/src/Makefile
+@@ -0,0 +1,14 @@
++override CXXFLAGS += -I.
++SRCS := $(shell find -name '*.cpp')
++
++libzxing.a: $(SRCS:.cpp=.o)
++	$(AR) $(ARFLAGS) $@ $^
++
++install: libzxing.a
++	install -D -m 0644 $^ $(DESTDIR)/usr/lib/$^
++	find -name '*.h' -exec install -m 0644 -D "{}" \
++		"$(DESTDIR)/usr/include/{}" ";"
++
++uninstall:
++	rm -f $(DESTDIR)/usr/lib/libzxing.a
++	rm -rf $(DESTDIR)/usr/include/zxing
diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
new file mode 100644
index 0000000000..9bde4b7535
--- /dev/null
+++ b/package/zxing/zxing.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# zxing
+#
+#############################################################
+ZXING_VERSION = 2.0
+ZXING_SITE = http://zxing.googlecode.com/files
+ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip
+ZXING_INSTALL_STAGING = YES
+
+ifneq ($(BR2_ENABLE_LOCALE),y)
+ZXING_DEPENDENCIES += libiconv
+endif
+
+define ZXING_EXTRACT_CMDS
+	unzip -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE)
+endef
+
+define ZXING_BUILD_CMDS
+	$(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS)
+endef
+
+define ZXING_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(STAGING_DIR) install
+endef
+
+define ZXING_UNINSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(STAGING_DIR) uninstall
+endef
+
+define ZXING_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) install
+endef
+
+define ZXING_UNINSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) uninstall
+endef
+
+$(eval $(call GENTARGETS))

From fd7081bae524390e4ec22e8d100d5a242b63d29d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:33:55 +0000
Subject: [PATCH 2221/6849] autoconf: bump to version 2.68

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...f-2.65-fix-m4-detection-test-on-dash.patch | 36 -------------------
 ... autoconf-dont-add-dirty-to-version.patch} |  0
 package/autoconf/autoconf.mk                  |  4 +--
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
 rename package/autoconf/{autoconf-2.65-dont-add-dirty-to-version.patch => autoconf-dont-add-dirty-to-version.patch} (100%)

diff --git a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
deleted file mode 100644
index 35f99b2fd7..0000000000
--- a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch taken upstream at
-http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
-with the following modifications:
-
- * Changes to NEWS file removed to avoid conflicts
-
- * Changes also made manually to the generated configure
-   script. Otherwise, host-autoconf is needed to compile
-   host-autoconf !
-
-Index: autoconf-2.65.old/configure
-===================================================================
---- autoconf-2.65.old.orig/configure	2009-12-15 16:11:05.175566911 +0100
-+++ autoconf-2.65.old/configure	2009-12-15 16:11:37.739562146 +0100
-@@ -2380,7 +2380,7 @@
-       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
-       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
-       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
--      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+      && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-       && test -f conftest.m4f \
-       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
-       rm -f conftest.m4f
-Index: autoconf-2.65.old/m4/m4.m4
-===================================================================
---- autoconf-2.65.old.orig/m4/m4.m4	2009-12-15 16:11:05.207566124 +0100
-+++ autoconf-2.65.old/m4/m4.m4	2009-12-15 16:11:18.595562030 +0100
-@@ -29,7 +29,7 @@
-       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
-       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
-       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
--      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+      && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
-       && test -f conftest.m4f \
-       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
-       rm -f conftest.m4f],
diff --git a/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch b/package/autoconf/autoconf-dont-add-dirty-to-version.patch
similarity index 100%
rename from package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch
rename to package/autoconf/autoconf-dont-add-dirty-to-version.patch
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 7c42bf951b..4e7f3fc62a 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -3,8 +3,8 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION = 2.65
-AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
+
+AUTOCONF_VERSION = 2.68
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
 AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \

From 8133b7d5d69f60e29bf2f421113f0e99cbafd332 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:33:56 +0000
Subject: [PATCH 2222/6849] automake: bump to version 1.11.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/automake/automake.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 7f35f3fcdb..522e22ce28 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -3,8 +3,8 @@
 # automake
 #
 #############################################################
-AUTOMAKE_VERSION = 1.11.1
-AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
+
+AUTOMAKE_VERSION = 1.11.5
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 
 AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl

From 18771deb3d21d44a766347d1485244dbeb8c7f22 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:33:57 +0000
Subject: [PATCH 2223/6849] rrdtool: fix breakage with newer autotools

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rrdtool/rrdtool-automake-compat.patch  | 18 ++++++++++++++++++
 ...configure-dont-hardcode-include-dirs.patch} |  0
 2 files changed, 18 insertions(+)
 create mode 100644 package/rrdtool/rrdtool-automake-compat.patch
 rename package/rrdtool/{rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch => rrdtool-configure-dont-hardcode-include-dirs.patch} (100%)

diff --git a/package/rrdtool/rrdtool-automake-compat.patch b/package/rrdtool/rrdtool-automake-compat.patch
new file mode 100644
index 0000000000..92b753db23
--- /dev/null
+++ b/package/rrdtool/rrdtool-automake-compat.patch
@@ -0,0 +1,18 @@
+Make it compatible with newer autoconf/automake.
+Patch from OpenWRT.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/bindings/tcl/Makefile.am
++++ b/bindings/tcl/Makefile.am
+@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@
+ tclpkg_DATA = pkgIndex.tcl
+ tclpkg_SCRIPTS = ifOctets.tcl
+ else
+-pkglib_DATA = pkgIndex.tcl
+-pkglib_SCRIPTS = ifOctets.tcl
++pkgdata_DATA = pkgIndex.tcl
++pkgdata_SCRIPTS = ifOctets.tcl
+ endif
+ 
+ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
diff --git a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch
similarity index 100%
rename from package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch
rename to package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch

From f701305b48f34758dfe757c45cbeb545a27d806b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:33:58 +0000
Subject: [PATCH 2224/6849] imagemagick: security bump to version 6.7.6-9

Fixes CVE-2012-1610, CVE-2012-17987, CVE-2012-0260, CVE-2012-0259,
CVE-2012-0247 and CVE-2012-0248.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../imagemagick/imagemagick-zlib-fix.patch    | 227 ------------------
 package/imagemagick/imagemagick.mk            |   6 +-
 2 files changed, 3 insertions(+), 230 deletions(-)
 delete mode 100644 package/imagemagick/imagemagick-zlib-fix.patch

diff --git a/package/imagemagick/imagemagick-zlib-fix.patch b/package/imagemagick/imagemagick-zlib-fix.patch
deleted file mode 100644
index 1a147af1d0..0000000000
--- a/package/imagemagick/imagemagick-zlib-fix.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-[PATCH] Fix build with recent versions of zlib
-
-From upstream:
-r6633 + r6636 @ https://www.imagemagick.org/subversion/ImageMagick
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- magick/blob.c |   68 ++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 40 insertions(+), 28 deletions(-)
-
-Index: ImageMagick-6.7.2-10/magick/blob.c
-===================================================================
---- ImageMagick-6.7.2-10.orig/magick/blob.c
-+++ ImageMagick-6.7.2-10/magick/blob.c
-@@ -120,8 +120,20 @@
-   StreamType
-     type;
- 
--  FILE
--    *file;
-+  union {
-+    FILE
-+      *file;
-+
-+#if defined(MAGICKCORE_ZLIB_DELEGATE)
-+    gzFile
-+      gzfile;
-+#endif
-+
-+#if defined(MAGICKCORE_BZLIB_DELEGATE)
-+    BZFILE
-+      *bzfile;
-+#endif
-+  };
- 
-   struct stat
-     properties;
-@@ -505,14 +517,14 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      (void) gzerror(image->blob->file,&status);
-+      (void) gzerror(image->blob->gzfile,&status);
- #endif
-       break;
-     }
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      (void) BZ2_bzerror((BZFILE *) image->blob->file,&status);
-+      (void) BZ2_bzerror(image->blob->bzfile,&status);
- #endif
-       break;
-     }
-@@ -546,14 +558,14 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      status=gzclose(image->blob->file);
-+      status=gzclose(image->blob->gzfile);
- #endif
-       break;
-     }
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      BZ2_bzclose((BZFILE *) image->blob->file);
-+      BZ2_bzclose(image->blob->bzfile);
- #endif
-       break;
-     }
-@@ -843,7 +855,7 @@
-         status;
- 
-       status=0;
--      (void) BZ2_bzerror((BZFILE *) image->blob->file,&status);
-+      (void) BZ2_bzerror(image->blob->bzfile,&status);
-       image->blob->eof=status == BZ_UNEXPECTED_EOF ? MagickTrue : MagickFalse;
- #endif
-       break;
-@@ -2486,8 +2498,8 @@
-                 ((int) magick[2] == 0x08))
-               {
-                 (void) fclose(image->blob->file);
--                image->blob->file=(FILE *) gzopen(filename,type);
--                if (image->blob->file != (FILE *) NULL)
-+                image->blob->gzfile=gzopen(filename,type);
-+                if (image->blob->gzfile != (gzFile) NULL)
-                   image->blob->type=ZipStream;
-                }
- #endif
-@@ -2495,8 +2507,8 @@
-             if (strncmp((char *) magick,"BZh",3) == 0)
-               {
-                 (void) fclose(image->blob->file);
--                image->blob->file=(FILE *) BZ2_bzopen(filename,type);
--                if (image->blob->file != (FILE *) NULL)
-+                image->blob->bzfile=BZ2_bzopen(filename,type);
-+                if (image->blob->bzfile != (BZFILE *) NULL)
-                   image->blob->type=BZipStream;
-               }
- #endif
-@@ -2555,8 +2567,8 @@
-           {
-             if (mode == WriteBinaryBlobMode)
-               type="wb";
--            image->blob->file=(FILE *) gzopen(filename,type);
--            if (image->blob->file != (FILE *) NULL)
-+            image->blob->gzfile=gzopen(filename,type);
-+            if (image->blob->gzfile != (gzFile) NULL)
-               image->blob->type=ZipStream;
-           }
-         else
-@@ -2564,8 +2576,8 @@
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
-           if (LocaleCompare(extension,".bz2") == 0)
-             {
--              image->blob->file=(FILE *) BZ2_bzopen(filename,type);
--              if (image->blob->file != (FILE *) NULL)
-+              image->blob->bzfile=BZ2_bzopen(filename,type);
-+              if (image->blob->bzfile != (BZFILE *) NULL)
-                 image->blob->type=BZipStream;
-             }
-           else
-@@ -2771,12 +2783,12 @@
-       {
-         default:
-         {
--          count=(ssize_t) gzread(image->blob->file,q,(unsigned int) length);
-+          count=(ssize_t) gzread(image->blob->gzfile,q,(unsigned int) length);
-           break;
-         }
-         case 2:
-         {
--          c=gzgetc(image->blob->file);
-+          c=gzgetc(image->blob->gzfile);
-           if (c == EOF)
-             break;
-           *q++=(unsigned char) c;
-@@ -2784,7 +2796,7 @@
-         }
-         case 1:
-         {
--          c=gzgetc(image->blob->file);
-+          c=gzgetc(image->blob->gzfile);
-           if (c == EOF)
-             break;
-           *q++=(unsigned char) c;
-@@ -2799,7 +2811,7 @@
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      count=(ssize_t) BZ2_bzread((BZFILE *) image->blob->file,q,(int) length);
-+      count=(ssize_t) BZ2_bzread(image->blob->bzfile,q,(int) length);
- #endif
-       break;
-     }
-@@ -3527,7 +3539,7 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      if (gzseek(image->blob->file,(off_t) offset,whence) < 0)
-+      if (gzseek(image->blob->gzfile,(off_t) offset,whence) < 0)
-         return(-1);
- #endif
-       image->blob->offset=TellBlob(image);
-@@ -3791,14 +3803,14 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      status=gzflush(image->blob->file,Z_SYNC_FLUSH);
-+      status=gzflush(image->blob->gzfile,Z_SYNC_FLUSH);
- #endif
-       break;
-     }
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      status=BZ2_bzflush((BZFILE *) image->blob->file);
-+      status=BZ2_bzflush(image->blob->bzfile);
- #endif
-       break;
-     }
-@@ -3865,7 +3877,7 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      offset=(MagickOffsetType) gztell(image->blob->file);
-+      offset=(MagickOffsetType) gztell(image->blob->gzfile);
- #endif
-       break;
-     }
-@@ -4014,20 +4026,20 @@
-       {
-         default:
-         {
--          count=(ssize_t) gzwrite(image->blob->file,(void *) data,
-+          count=(ssize_t) gzwrite(image->blob->gzfile,(void *) data,
-             (unsigned int) length);
-           break;
-         }
-         case 2:
-         {
--          c=gzputc(image->blob->file,(int) *p++);
-+          c=gzputc(image->blob->gzfile,(int) *p++);
-           if (c == EOF)
-             break;
-           count++;
-         }
-         case 1:
-         {
--          c=gzputc(image->blob->file,(int) *p++);
-+          c=gzputc(image->blob->gzfile,(int) *p++);
-           if (c == EOF)
-             break;
-           count++;
-@@ -4041,8 +4053,8 @@
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      count=(ssize_t) BZ2_bzwrite((BZFILE *) image->blob->file,(void *) data,
--        (int) length);
-+      count=(ssize_t) BZ2_bzwrite(image->blob->bzfile,(void *) data,(int)
-+        length);
- #endif
-       break;
-     }
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 602b7a5a40..32eb37177a 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-IMAGEMAGICK_MAJOR = 6.7.2
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-10
+IMAGEMAGICK_MAJOR = 6.7.6
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-9
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
-IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick/legacy
+IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 

From ff3cf356802b9b2447d510d361f6c1cf3e5308b2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 May 2012 03:33:59 +0000
Subject: [PATCH 2225/6849] openocd: fix breakage with newer autotools

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../openocd-0006-automake-compat.patch        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/openocd/openocd-0006-automake-compat.patch

diff --git a/package/openocd/openocd-0006-automake-compat.patch b/package/openocd/openocd-0006-automake-compat.patch
new file mode 100644
index 0000000000..cdc6c92ec1
--- /dev/null
+++ b/package/openocd/openocd-0006-automake-compat.patch
@@ -0,0 +1,40 @@
+Backport from openocd commit 737a52d7b22b1774acc5d20f9bd25000a70ac116
+Fix for automake 1.11.2+
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura openocd-0.5.0/src/jtag/drivers/Makefile.am openocd-0.5.0.automake/src/jtag/drivers/Makefile.am
+--- openocd-0.5.0/src/jtag/drivers/Makefile.am	2011-08-09 02:34:19.000000000 -0300
++++ openocd-0.5.0.automake/src/jtag/drivers/Makefile.am	2012-05-01 13:57:01.007561480 -0300
+@@ -5,7 +5,8 @@
+ libocdjtagdrivers_la_SOURCES = \
+ 	$(DRIVERFILES)
+ 
+-nobase_dist_pkglib_DATA =
++ocddatadir = $(pkglibdir)
++nobase_dist_ocddata_DATA =
+ 
+ ULINK_FIRMWARE = $(srcdir)/OpenULINK
+ 
+@@ -64,7 +65,7 @@
+ endif
+ if ULINK
+ DRIVERFILES += ulink.c
+-nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
++nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
+ endif
+ if VSLLINK
+ DRIVERFILES += vsllink.c
+diff -Nura openocd-0.5.0/src/target/Makefile.am openocd-0.5.0.automake/src/target/Makefile.am
+--- openocd-0.5.0/src/target/Makefile.am	2011-08-09 02:34:19.000000000 -0300
++++ openocd-0.5.0.automake/src/target/Makefile.am	2012-05-01 13:57:01.934567076 -0300
+@@ -165,7 +165,7 @@
+ 	avr32_mem.h \
+ 	avr32_regs.h
+ 
+-nobase_dist_pkglib_DATA =
+-nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
++ocddatadir = $(pkglibdir)
++nobase_dist_ocddata_DATA = ecos/at91eb40a.elf
+ 
+ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

From c460cc8161a0738873351d990a522cee90173231 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Jun 2012 20:03:30 +0200
Subject: [PATCH 2226/6849] module-init-tools: don't build static tools for
 host

As pointed out on IRC, the static tools causes problems on distributions
without glibc-static, and we don't need them - So just disable them like
we do for the target build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/module-init-tools/module-init-tools.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index ad92a1ac91..96c8378c6c 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -18,6 +18,7 @@ MODULE_INIT_TOOLS_CONF_OPT = \
 MODULE_INIT_TOOLS_AUTORECONF = YES
 HOST_MODULE_INIT_TOOLS_AUTORECONF = YES
 HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
+HOST_MODULE_INIT_TOOLS_CONF_OPT = --disable-static-utils
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From 1ea857452a45672f5a0dc7d3322db4de017e3ca6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 24 Jun 2012 22:45:30 +0200
Subject: [PATCH 2227/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGES b/CHANGES
index b526c58ce3..f8ab319a8c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,31 @@
 2012.08, Not released yet:
 
+	Fixes all over the tree and new features.
+
+	Updated/fixed packages: audiofile, autoconf, automake, axel,
+	beecrypt, berkeleydb, bind, bison, boost, busybox, bzip2,
+	cmake, connman, conntrack-tools, cups, dnsmasq, e2fsprogs,
+	ethtool, fbv, gmp, gnutls, grep, gst-plugins-base,
+	gst-plugins-good, gzip, hiawatha, hostapd, icu, imagemagick,
+	iproute2, ipset, iptables, kmod, libgci, libconfig, libcurl,
+	libeXosip2, libfuse, libidn, libmbus, libmnl,
+	libnetfilter-conntrack, libnl, libnspr, libogg, libosip2,
+	libpcap, libroxml, liburcu, libxml2, lighttpd, ltrace,
+	lttng-libust, lttng-modules, lttng-tools, module-init-tools,
+	mpg123, midori, mrouted, mtd, mxml, mysql_client, nbd,
+	nfs-utils, openocd, pciutils, php, polarssl, portaudio, pppd,
+	pthread-stubs, pulseaudio, qt, quagga, radvd, rrdtool, samba,
+	sdl_gfx, sdl_sound, speex, sqlite, squashfs, squid, sudo,
+	synergy, systemd, wpa_supplicant, zlib
+
+	New packages: cjson, collectd, dmidecode, fbterm, flashrom,
+	freerdp, inadyn, libfreefare, libnetfilter_cttimeout, libnfc,
+	liboping, libtorrent, linphone, logsurfer, lshw,
+	mediastreamer, mobile-broadband-provider-info, monit, nanocom,
+	nss-mdns, ofone, omap-u-boot-utils, opkg, ortp, python-id3,
+	quota, ramspeed, rtorrent, sound-theme-freedesktop,
+	webrtc-audio-processing, xinetd, zxing
+
 2012.05, Released May 30th, 2012:
 
 	Updated/fixed packages: busybox, netsnmp, pptp-linux

From ea6c1b9f12b932dc373b3b58459bc676e17f0e54 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Jun 2012 11:16:34 +0000
Subject: [PATCH 2228/6849] sound-theme-freedesktop: add host-intltool
 dependency

Fixes
http://autobuild.buildroot.org/results/c4e5cad3e4bf08440cea081789b8d58b238d9683/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sound-theme-freedesktop/sound-theme-freedesktop.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
index d81c207276..3a1a162ee9 100644
--- a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
+++ b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
@@ -8,5 +8,6 @@ SOUND_THEME_FREEDESKTOP_SITE = \
 	http://people.freedesktop.org/~mccann/dist
 SOUND_THEME_FREEDESKTOP_SOURCE = \
 	sound-theme-freedesktop-$(SOUND_THEME_FREEDESKTOP_VERSION).tar.bz2
+SOUND_THEME_FREEDESKTOP_DEPENDENCIES = host-intltool
 
 $(eval $(call AUTOTARGETS))

From d044199e74d6dae0285f4739adc76c1b10c0b9b8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Jun 2012 11:30:08 +0000
Subject: [PATCH 2229/6849] imagemagick: use alternate download location

The official ImageMagick site only keeps the latest versions. Even in
the legacy/ directory, they only keep the last version of each
'branch'. Therefore, to avoid problems, we use an alternate download
site.

Fixes
http://autobuild.buildroot.org/results/2269aa42a0a21730ff0ec28af89cd4973ec28751/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imagemagick/imagemagick.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 32eb37177a..a8b69c752c 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -7,7 +7,10 @@
 IMAGEMAGICK_MAJOR = 6.7.6
 IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-9
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
-IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
+# The official ImageMagick site only keeps the latest versions
+# available, which is annoying. Use an alternate site that keeps all
+# older versions.
+IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick/
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 

From 843d934165910488acb3ec360a8eab7a9581b02f Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 24 Jun 2012 21:07:35 +0000
Subject: [PATCH 2230/6849] libpcap: bump to version 1.3.0

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...bpcap-dont-fail-on-missing-netfilter.patch | 30 -------------------
 package/libpcap/libpcap.mk                    |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch

diff --git a/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch b/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch
deleted file mode 100644
index b0efbc721c..0000000000
--- a/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d55b6f4f1b2bfab96ad57e0239b0b2b57785df77 Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <jirislaby@gmail.com>
-Date: Wed, 29 Feb 2012 01:19:18 -0800
-Subject: [PATCH] Don't fail if netfilter isn't enabled in the kernel.
-
-Check for EPROTONOSUPPORT as well as EAFNOSUPPORT.
-
-Reviewed-By: Guy Harris <guy@alum.mit.edu>
----
- pcap-netfilter-linux.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
-index 225e49f..f9c6bef 100644
---- a/pcap-netfilter-linux.c
-+++ b/pcap-netfilter-linux.c
-@@ -452,8 +452,8 @@ netfilter_platform_finddevs(pcap_if_t **alldevsp, char *err_str)
- 	
- 	sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER);
- 	if (sock < 0) {
--		/* if netlink is not supported this this is not fatal */
--		if (errno == EAFNOSUPPORT)
-+		/* if netlink is not supported this is not fatal */
-+		if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT)
- 			return 0;
- 		snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s",
- 			errno, pcap_strerror(errno));
--- 
-1.7.10
-
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 0b88a42114..51e1106e73 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBPCAP_VERSION = 1.2.1
+LIBPCAP_VERSION = 1.3.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_INSTALL_STAGING = YES
 # doesn't have an install-strip

From ac2a58c5c3627d39e2e7f77119dea2da6fa0b355 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 24 Jun 2012 18:00:29 +0000
Subject: [PATCH 2231/6849] tcpdump: bump to version 4.3.0

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpdump/tcpdump.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index ab9d4f165f..0febf60784 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -6,9 +6,8 @@
 # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
 
-TCPDUMP_VERSION = 4.2.1
+TCPDUMP_VERSION = 4.3.0
 TCPDUMP_SITE = http://www.tcpdump.org/release
-TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
 TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
 TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)

From b731806dd1d7e6a5a18e6160817e097296a18660 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 24 Jun 2012 23:12:51 +0000
Subject: [PATCH 2232/6849] bluez_utils: bump to 4.101

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/bluez_utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index eb42e239b3..33d298768b 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BLUEZ_UTILS_VERSION = 4.99
+BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES

From c8490742fb4937f5550127d6482b006fd88bd746 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Jun 2012 23:25:44 +0200
Subject: [PATCH 2233/6849] imagemagick: ensure cross freetype-config is used

Fixes http://autobuild.buildroot.net/results/fd6fd5b55b1e2fc5a70537f548bbcafab9773e4c/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imagemagick/imagemagick.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index a8b69c752c..5cbb147053 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -44,6 +44,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 IMAGEMAGICK_CONF_OPT += --with-freetype
+IMAGEMAGICK_CONF_ENV += \
+	ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config
 IMAGEMAGICK_DEPENDENCIES += freetype
 else
 IMAGEMAGICK_CONF_OPT += --without-freetype

From c18532766f65ea19b29000ccbb56a5aa7777f698 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Jun 2012 09:58:38 +0200
Subject: [PATCH 2234/6849] gzip: 1.5+ needs wchar support

Fixes http://autobuild.buildroot.net/results/267404bccd9582d3b85b99b16b47b580bf239eb9/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gzip/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/gzip/Config.in b/package/gzip/Config.in
index dc9d50b9a0..f501d5ccc8 100644
--- a/package/gzip/Config.in
+++ b/package/gzip/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_GZIP
 	bool "gzip"
+	depends on BR2_USE_WCHAR
 	help
 	  Standard GNU compressor.  Provides things like gzip,
 	  gunzip, gzcat, etc...
 
 	  http://www.gnu.org/software/gzip/gzip.html
+
+comment "gzip requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From 8d8343a9ac81f3566ca3a093f3699d21bfce67cd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Jun 2012 10:23:26 +0200
Subject: [PATCH 2235/6849] wget: requires wchar support

Fixes http://autobuild.buildroot.net/results/431853a9fda593fba41c1176ecee0bdfe38ce441

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wget/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/wget/Config.in b/package/wget/Config.in
index 3f79a64da8..354b48f6b0 100644
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -2,7 +2,11 @@ config BR2_PACKAGE_WGET
 	bool "wget"
 	# fork()
 	depends on BR2_USE_MMU
+	depends on BR2_USE_WCHAR
 	help
 	  Network utility to retrieve files from http, https and ftp.
 
 	  http://www.gnu.org/software/wget/
+
+comment "wget requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From 01d7b429d9a0709ce96f7af892b14398b62d5b22 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Jun 2012 20:25:43 +0200
Subject: [PATCH 2236/6849] valgrind: unbreak arm support after
 REAL_GNU_TARGET_NAME removal

Fixes http://autobuild.buildroot.net/results/085aa258adc5eaaa6320f283868a185093480960

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/valgrind/valgrind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 004c1ac024..22e5c96095 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -16,7 +16,7 @@ VALGRIND_CONF_OPT = --disable-tls
 # only be selected on Cortex A8 and Cortex A9 platforms.
 ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
 VALGRIND_CONF_OPT += \
-	--host=$(patsubst arm-%,armv7-unknown-%,$(GNU_TARGET_NAME))
+	--host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME))
 endif
 
 define VALGRIND_INSTALL_UCLIBC_SUPP

From 335ffd1c64281b939314d5fe707408eacca02c02 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Jun 2012 04:19:48 +0000
Subject: [PATCH 2237/6849] samba: bump to version 3.6.6

Bump samba to version 3.6.6
Lots of bugfixes.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index d7a15b3f2b..c9684359a1 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.5
+SAMBA_VERSION = 3.6.6
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From afc7b62c87ba7c5286d3b9cff7ed77586f41eeff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Jun 2012 04:19:49 +0000
Subject: [PATCH 2238/6849] busybox 1.20.1: add patches for mke2fs and ps

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.20.1-mke2fs.patch               | 58 +++++++++++++
 .../busybox-1.20.1/busybox-1.20.1-ps.patch    | 84 +++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch
 create mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch

diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch
new file mode 100644
index 0000000000..659ae2d2a2
--- /dev/null
+++ b/package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch
@@ -0,0 +1,58 @@
+--- busybox-1.20.1/include/bb_e2fs_defs.h
++++ busybox-1.20.1-mke2fs/include/bb_e2fs_defs.h
+@@ -422,9 +422,27 @@ struct ext2_super_block {
+ 	uint16_t	s_reserved_word_pad;
+ 	uint32_t	s_default_mount_opts;
+ 	uint32_t	s_first_meta_bg;	/* First metablock group */
++	/* ext3 additions */
+ 	uint32_t	s_mkfs_time;		/* When the filesystem was created */
+ 	uint32_t	s_jnl_blocks[17];	/* Backup of the journal inode */
+-	uint32_t	s_reserved[172];	/* Padding to the end of the block */
++	/* 64bit support valid if EXT4_FEATURE_COMPAT_64BIT */
++/*150*/	uint32_t	s_blocks_count_hi;	/* Blocks count */
++	uint32_t	s_r_blocks_count_hi;	/* Reserved blocks count */
++	uint32_t	s_free_blocks_count_hi;	/* Free blocks count */
++	uint16_t	s_min_extra_isize;	/* All inodes have at least # bytes */
++	uint16_t	s_want_extra_isize; 	/* New inodes should reserve # bytes */
++	uint32_t	s_flags;		/* Miscellaneous flags */
++	uint16_t	s_raid_stride;		/* RAID stride */
++	uint16_t	s_mmp_interval;		/* # seconds to wait in MMP checking */
++	uint64_t	s_mmp_block;		/* Block for multi-mount protection */
++	uint32_t	s_raid_stripe_width;	/* blocks on all data disks (N*stride)*/
++	uint8_t		s_log_groups_per_flex;	/* FLEX_BG group size */
++	uint8_t		s_reserved_char_pad2;
++	uint16_t	s_reserved_pad;
++	uint32_t	s_reserved[162];	/* Padding to the end of the block */
++};
++struct BUG_ext2_super_block {
++        char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1];
+ };
+ 
+ /*
+--- busybox-1.20.1/util-linux/mkfs_ext2.c
++++ busybox-1.20.1-mke2fs/util-linux/mkfs_ext2.c
+@@ -53,11 +53,6 @@
+ #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
+ #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX    1
+ 
+-// from e2fsprogs
+-#define s_reserved_gdt_blocks s_padding1
+-#define s_mkfs_time           s_reserved[0]
+-#define s_flags               s_reserved[22]
+-
+ #define EXT2_HASH_HALF_MD4       1
+ #define EXT2_FLAGS_SIGNED_HASH   0x0001
+ #define EXT2_FLAGS_UNSIGNED_HASH 0x0002
+@@ -482,8 +477,10 @@ int mkfs_ext2_main(int argc UNUSED_PARAM
+ 	STORE_LE(sb->s_magic, EXT2_SUPER_MAGIC);
+ 	STORE_LE(sb->s_inode_size, inodesize);
+ 	// set "Required extra isize" and "Desired extra isize" fields to 28
+-	if (inodesize != sizeof(*inode))
+-		STORE_LE(sb->s_reserved[21], 0x001C001C);
++	if (inodesize != sizeof(*inode)) {
++		STORE_LE(sb->s_min_extra_isize, 0x001c);
++		STORE_LE(sb->s_want_extra_isize, 0x001c);
++	}
+ 	STORE_LE(sb->s_first_ino, EXT2_GOOD_OLD_FIRST_INO);
+ 	STORE_LE(sb->s_log_block_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE);
+ 	STORE_LE(sb->s_log_frag_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE);
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch
new file mode 100644
index 0000000000..c8e329ec3c
--- /dev/null
+++ b/package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch
@@ -0,0 +1,84 @@
+--- busybox-1.20.1/procps/ps.c
++++ busybox-1.20.1-ps/procps/ps.c
+@@ -69,6 +69,31 @@
+ /* Absolute maximum on output line length */
+ enum { MAX_WIDTH = 2*1024 };
+ 
++#if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
++static long get_uptime(void)
++{
++#ifdef __linux__
++	struct sysinfo info;
++	if (sysinfo(&info) < 0)
++		return 0;
++	return info.uptime;
++#elif 1
++	char buf[64];
++	long uptime;
++	if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
++		bb_perror_msg_and_die("can't read %s", "/proc/uptime");
++	buf[sizeof(buf)-1] = '\0';
++	sscanf(buf, "%l", &uptime);
++	return uptime;
++#else
++	struct timespec ts;
++	if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
++		return 0;
++	return ts.tv_sec;
++#endif
++}
++#endif
++
+ #if ENABLE_DESKTOP
+ 
+ #include <sys/times.h> /* for times() */
+@@ -197,8 +222,6 @@ static inline unsigned get_HZ_by_waiting
+ 
+ static unsigned get_kernel_HZ(void)
+ {
+-	//char buf[64];
+-	struct sysinfo info;
+ 
+ 	if (kernel_HZ)
+ 		return kernel_HZ;
+@@ -208,12 +231,7 @@ static unsigned get_kernel_HZ(void)
+ 	if (kernel_HZ == (unsigned)-1)
+ 		kernel_HZ = get_HZ_by_waiting();
+ 
+-	//if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
+-	//	bb_perror_msg_and_die("can't read %s", "/proc/uptime");
+-	//buf[sizeof(buf)-1] = '\0';
+-	///sscanf(buf, "%llu", &seconds_since_boot);
+-	sysinfo(&info);
+-	seconds_since_boot = info.uptime;
++	seconds_since_boot = get_uptime();
+ 
+ 	return kernel_HZ;
+ }
+@@ -635,7 +653,7 @@ int ps_main(int argc UNUSED_PARAM, char 
+ 	};
+ #if ENABLE_FEATURE_PS_LONG
+ 	time_t now = now;
+-	struct sysinfo info;
++	long uptime;
+ #endif
+ 	int opts = 0;
+ 	/* If we support any options, parse argv */
+@@ -695,7 +713,7 @@ int ps_main(int argc UNUSED_PARAM, char 
+ 		puts("S   UID   PID  PPID   VSZ   RSS TTY   STIME TIME     CMD");
+ #if ENABLE_FEATURE_PS_LONG
+ 		now = time(NULL);
+-		sysinfo(&info);
++		uptime = get_uptime();
+ #endif
+ 	}
+ 	else {
+@@ -727,7 +745,7 @@ int ps_main(int argc UNUSED_PARAM, char 
+ 				char tty[2 * sizeof(int)*3 + 2];
+ 				char *endp;
+ 				unsigned sut = (p->stime + p->utime) / 100;
+-				unsigned elapsed = info.uptime - (p->start_time / 100);
++				unsigned elapsed = uptime - (p->start_time / 100);
+ 				time_t start = now - elapsed;
+ 				struct tm *tm = localtime(&start);
+ 

From c69be6d2abe8f8e265f92494867e2c7e1519dd08 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Jun 2012 04:19:50 +0000
Subject: [PATCH 2239/6849] libpcap: canusb support needs pthreads

canusb support in libpcap uses pthreads but the configure script doesn't
account for -lpthread usage so it doesn't get added into LIBS which in
turn doesn't add the appropiate entry in pcap-config, causing build
failures for programs that link to libpcap that don't use pthreads
themselves (for example tcpdump).
Also add the conditional dependency on BR2_PACKAGE_LIBUSB for canusb.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libpcap-canusb-requires-pthread.patch     | 29 +++++++++++++++++++
 package/libpcap/libpcap.mk                    |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 package/libpcap/libpcap-canusb-requires-pthread.patch

diff --git a/package/libpcap/libpcap-canusb-requires-pthread.patch b/package/libpcap/libpcap-canusb-requires-pthread.patch
new file mode 100644
index 0000000000..ed3bc1a8d7
--- /dev/null
+++ b/package/libpcap/libpcap-canusb-requires-pthread.patch
@@ -0,0 +1,29 @@
+canusb uses pthreads, but -lpthread is never added to LIBS hence missing
+from pcap-config, causing build failures. Fix this.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libpcap-1.3.0.orig//configure libpcap-1.3.0/configure
+--- libpcap-1.3.0.orig//configure	2012-06-26 09:42:06.072155279 -0300
++++ libpcap-1.3.0/configure	2012-06-26 09:42:12.617196326 -0300
+@@ -7607,7 +7607,7 @@
+ $as_echo "#define PCAP_SUPPORT_CANUSB 1" >>confdefs.h
+ 
+ 		    CANUSB_SRC=pcap-canusb-linux.c
+-		    LIBS="-lusb-1.0 $LIBS"
++		    LIBS="-lusb-1.0 -lpthread $LIBS"
+ 		    { $as_echo "$as_me:${as_lineno-$LINENO}: canusb sniffing is supported" >&5
+ $as_echo "$as_me: canusb sniffing is supported" >&6;}
+ 
+diff -Nura libpcap-1.3.0.orig//configure.in libpcap-1.3.0/configure.in
+--- libpcap-1.3.0.orig//configure.in	2012-06-26 09:42:06.067155242 -0300
++++ libpcap-1.3.0/configure.in	2012-06-26 09:42:22.267256741 -0300
+@@ -1406,7 +1406,7 @@
+ 		[
+ 		    AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb])
+ 		    CANUSB_SRC=pcap-canusb-linux.c
+-		    LIBS="-lusb-1.0 $LIBS"
++		    LIBS="-lusb-1.0 -lpthread $LIBS"
+ 		    AC_MSG_NOTICE(canusb sniffing is supported)
+ 		],
+ 		AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it)
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 51e1106e73..324ec331d6 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -12,7 +12,8 @@ LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
 	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
 LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
 	$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
-LIBPCAP_DEPENDENCIES = zlib
+LIBPCAP_DEPENDENCIES = zlib \
+	$(if $(BR2_PACKAGE_LIBUSB),libusb)
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux

From a2ddfdb11a2c28c511a2a4d5bf0060217c93d140 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Jun 2012 23:25:29 +0200
Subject: [PATCH 2240/6849] tcpreplay: cleanup

Drop unneeded uclibc dependency and autoreconf as patch changes
configure.ac.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpreplay/tcpreplay.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 3a526a74ea..72abade5f6 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -8,8 +8,8 @@ TCPREPLAY_VERSION = 3.4.3
 TCPREPLAY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/tcpreplay
 TCPREPLAY_CONF_ENV = tr_cv_libpcap_version=">= 0.7.0"
 TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
-
-TCPREPLAY_DEPENDENCIES = uclibc libpcap
+TCPREPLAY_AUTORECONF = YES
+TCPREPLAY_DEPENDENCIES = libpcap
 
 $(eval $(call AUTOTARGETS))
 

From a795e2a491c7a99530c79fc3f23a39b6a85ebce5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jun 2012 09:42:33 +0200
Subject: [PATCH 2241/6849] tcpreplay: fix linking when libpcap is built with
 canusb support

Fixes http://autobuild.buildroot.net/results/f3cee3df639a8ecf0f7f81ca33efee4e040c76ff

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpreplay/tcpreplay.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 72abade5f6..4a72266046 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -11,5 +11,9 @@ TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
 TCPREPLAY_AUTORECONF = YES
 TCPREPLAY_DEPENDENCIES = libpcap
 
+# libpcap may depend on symbols in libusb as well
+TCPREPLAY_LIBS = -lpcap $(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
+TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close='$(TCPREPLAY_LIBS)'
+
 $(eval $(call AUTOTARGETS))
 

From 56168c215595e4b7bc6222fcee3d1021e327051d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jun 2012 09:55:04 +0200
Subject: [PATCH 2242/6849] faad2: fix frontend/faad linking

Fixes http://autobuild.buildroot.net/results/84db857a6fc8e73483493e484f2cc5f4bf64f3d0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/faad2/faad2.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk
index 366515cf71..567875a399 100644
--- a/package/multimedia/faad2/faad2.mk
+++ b/package/multimedia/faad2/faad2.mk
@@ -6,6 +6,8 @@
 
 FAAD2_VERSION = 2.7
 FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac
+# frontend/faad calls frexp()
+FAAD2_CONF_ENV = LIBS=-lm
 FAAD2_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From a0f965dda8365c538c2a868a48675265522c70c5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Jun 2012 22:03:59 +0200
Subject: [PATCH 2243/6849] mii-diag: link statically if configured to do so

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mii-diag/mii-diag.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 0731bf73bb..f74fa3def0 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -8,6 +8,12 @@ MII_DIAG_SOURCE  = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
 MII_DIAG_PATCH   = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
 MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
 
+MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+MII_DIAG_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -static"
+endif
+
 define MII_DIAG_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
 		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
@@ -17,7 +23,7 @@ endef
 MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES
 
 define MII_DIAG_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D)
 endef
 
 define MII_DIAG_INSTALL_TARGET_CMDS

From 5f7879e02479818fac17c0c281511b492da904ee Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Wed, 27 Jun 2012 02:46:31 +0000
Subject: [PATCH 2244/6849] igh-ethercat: use release tarball instead of
 mercurial branch

The Mercurial branch may change, which leads to non-reproducible builds.
So download a released version instead.

Also add configure option for e1000e.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/igh-ethercat/Config.in       |  3 +++
 package/igh-ethercat/igh-ethercat.mk | 20 ++++----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
index 764a021c50..890bb1242e 100644
--- a/package/igh-ethercat/Config.in
+++ b/package/igh-ethercat/Config.in
@@ -17,6 +17,9 @@ config BR2_PACKAGE_IGH_ETHERCAT_E100
 config BR2_PACKAGE_IGH_ETHERCAT_E1000
 	bool "e1000 driver"
 
+config BR2_PACKAGE_IGH_ETHERCAT_E1000E
+	bool "e1000e driver"
+
 config BR2_PACKAGE_IGH_ETHERCAT_R8169
 	bool "r8169 driver"
 
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index b6ac5b8241..f04eb57f3b 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -1,8 +1,7 @@
-IGH_ETHERCAT_VERSION = stable-1.5
-IGH_ETHERCAT_SITE    = http://etherlabmaster.hg.sourceforge.net/hgweb/etherlabmaster/etherlabmaster/archive/
-IGH_ETHERCAT_SOURCE  = $(IGH_ETHERCAT_VERSION).tar.bz2
+IGH_ETHERCAT_VERSION = 1.5.1
+IGH_ETHERCAT_SITE    = http://etherlab.org/download/ethercat/
+IGH_ETHERCAT_SOURCE  = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
 
-IGH_ETHERCAT_AUTORECONF      = YES
 IGH_ETHERCAT_DEPENDENCIES    = linux
 IGH_ETHERCAT_INSTALL_STAGING = YES
 
@@ -12,20 +11,9 @@ IGH_ETHERCAT_CONF_OPT = \
 IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too)
 IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100)
 IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000)
+IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e)
 IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169)
 
-# Since we download ethercat from source control, we have to emulate
-# the bootstrap script that creates the ChangeLog file before running
-# autoreconf.  We don't want to run that script directly, since we
-# leave to the autotargets infrastructure the responsability of
-# running 'autoreconf' so that the dependencies on host-automake,
-# host-autoconf and al. are correct.
-define IGH_ETHERCAT_CREATE_CHANGELOG
-	touch $(@D)/ChangeLog
-endef
-
-IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG
-
 define IGH_ETHERCAT_BUILD_MODULES
 	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) modules
 endef

From 62fe33317bd1001de61dfe4df4c8159ecd1f5be0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Jun 2012 16:56:45 +0200
Subject: [PATCH 2245/6849] quota: fix build on uClibc with locale support

Fixes http://autobuild.buildroot.net/results/508f2ee3f97dfdf782eb1c0b03c2fffb87c4953f

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quota/Config.in | 2 ++
 package/quota/quota.mk  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/package/quota/Config.in b/package/quota/Config.in
index dfefb8a188..6c2beff04c 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_QUOTA
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_MOUNT
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Implementation of the disk quota system.
 
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 845eefbaa5..971523076b 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -10,6 +10,11 @@ QUOTA_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linuxqu
 
 QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+QUOTA_DEPENDENCIES = gettext libintl
+QUOTA_MAKE_OPT += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+endif
+
 # Package uses autoconf but not automake.
 QUOTA_INSTALL_TARGET_OPT = \
 	ROOTDIR=$(TARGET_DIR) \

From 5e6ec6e319f87c3f3e97d314ea88a181096c451e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 15:09:10 +0200
Subject: [PATCH 2246/6849] ramspeed: use provided linker flags as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ramspeed/Makefile    | 6 +++---
 package/ramspeed/ramspeed.mk | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/ramspeed/Makefile b/package/ramspeed/Makefile
index acb8cfd8d8..f4a4de6a1e 100644
--- a/package/ramspeed/Makefile
+++ b/package/ramspeed/Makefile
@@ -2,13 +2,13 @@
 all: generic
 
 generic: ramspeed.c fltmem.c fltmark.c intmem.c intmark.c
-	$(CC) $(CFLAGS) $^ -o ramspeed
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o ramspeed
 
 i386: ramspeed.c i386/*.s i386/cpuinfo/*.s
-	$(CC) $(CFLAGS) -DI386_ASM $^ -o ramspeed
+	$(CC) $(CFLAGS) -DI386_ASM $(LDFLAGS) $^ -o ramspeed
 
 x86_64: ramspeed.c amd64/*.s
-	$(CC) $(CFLAGS) -DAMD64_ASM $^ -o ramspeed
+	$(CC) $(CFLAGS) -DAMD64_ASM $(LDFLAGS) $^ -o ramspeed
 
 clean:
 	rm -f *.o ramspeed
diff --git a/package/ramspeed/ramspeed.mk b/package/ramspeed/ramspeed.mk
index 9ac21ad1ec..478c2fbf00 100644
--- a/package/ramspeed/ramspeed.mk
+++ b/package/ramspeed/ramspeed.mk
@@ -10,8 +10,7 @@ RAMSPEED_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64)
 
 define RAMSPEED_BUILD_CMDS
 	cp -f package/ramspeed/Makefile $(@D)
-	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-		make -C $(@D) $(RAMSPEED_ARCH)
+	$(TARGET_CONFIGURE_OPTS) make -C $(@D) $(RAMSPEED_ARCH)
 endef
 
 define RAMSPEED_INSTALL_TARGET_CMDS

From 02c0e82dd682f70562afee2b6c9b504b199b5db1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:27:41 +0200
Subject: [PATCH 2247/6849] input-tools: use provided linker flags as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/input-tools/input-tools.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 38db2ea540..4236c7408c 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -24,10 +24,12 @@ INPUT_TOOLS_POST_PATCH_HOOKS = INPUT_TOOLS_DEBIAN_PATCHES
 # jscal needs -lm
 define INPUT_TOOLS_BUILD_CMDS
 	for i in $(filter-out jscal,$(INPUT_TOOLS_TARGETS_y)); do \
-		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c; \
+		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c \
+			$(TARGET_LDFLAGS); \
 	done
 	for i in $(filter jscal,$(INPUT_TOOLS_TARGETS_y)); do \
-		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c -lm; \
+		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c \
+			$(TARGET_LDFLAGS) -lm; \
 	done
 endef
 

From e6d1887d26994a4da5db947f9ecdde5c85b47fa9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:30:15 +0200
Subject: [PATCH 2248/6849] nanocom: use provided compiler/linker flags as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nanocom/nanocom.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index 4fb7aee796..8421397dad 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -13,7 +13,7 @@ define NANOCOM_EXTRACT_CMDS
 endef
 
 define NANOCOM_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(@D)
 endef
 
 define NANOCOM_INSTALL_TARGET_CMDS

From a2bcd32922a06b701befea97c964248d36e208b7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:33:12 +0200
Subject: [PATCH 2249/6849] iostat: use provided linker flags as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iostat/iostat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk
index 83eea07ae2..d3efa59db7 100644
--- a/package/iostat/iostat.mk
+++ b/package/iostat/iostat.mk
@@ -10,7 +10,7 @@ IOSTAT_SITE = http://www.linuxinsight.com/files
 iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE)
 
 define IOSTAT_BUILD_CMDS
-	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)"
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
 endef
 
 define IOSTAT_CLEAN_CMDS

From df2b9516eaa6fc59b8bd847fa0af7ada99e59ad6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:34:46 +0200
Subject: [PATCH 2250/6849] eeprog: use provided linker flags as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eeprog/eeprog.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk
index 40b059e7ba..752074470d 100644
--- a/package/eeprog/eeprog.mk
+++ b/package/eeprog/eeprog.mk
@@ -8,7 +8,7 @@ EEPROG_VERSION = 0.7.6
 EEPROG_SITE = http://codesink.org/download
 
 define EEPROG_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
 endef
 
 define EEPROG_INSTALL_TARGET_CMDS

From 311a58303f06bdb89aa8e2af3945b552235e319a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:11:50 +0200
Subject: [PATCH 2251/6849] ncurses: build statically when
 BR2_PREFER_STATIC_LIB

--disable-static is no more. Only try to install .so files if not
configured for static linking.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 10a55ddc5e..afeb41b838 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -29,7 +29,7 @@ NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
 
 NCURSES_CONF_OPT = \
-	--with-shared \
+	$(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \
 	--without-cxx \
 	--without-cxx-binding \
 	--without-ada \
@@ -41,8 +41,7 @@ NCURSES_CONF_OPT = \
 	--enable-echo \
 	--enable-const \
 	--enable-overwrite \
-	--enable-broken_linker \
-	--disable-static
+	--enable-broken_linker
 
 ifneq ($(BR2_ENABLE_DEBUG),y)
 NCURSES_CONF_OPT += --without-debug
@@ -79,6 +78,8 @@ define NCURSES_INSTALL_TARGET_DEVFILES
 endef
 endif
 
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
 define NCURSES_INSTALL_TARGET_PANEL
 	cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
@@ -97,9 +98,11 @@ define NCURSES_INSTALL_TARGET_MENU
 endef
 endif
 
+endif
+
 define NCURSES_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/lib
-	cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+	$(if $(BR2_PREFER_STATIC_LIB),,cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/)
 	$(NCURSES_INSTALL_TARGET_PANEL)
 	$(NCURSES_INSTALL_TARGET_FORM)
 	$(NCURSES_INSTALL_TARGET_MENU)

From eb421a8433a44504c79e06ccdd5a69a9792ee77f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:13:57 +0200
Subject: [PATCH 2252/6849] package/Makefile.in: link statically when
 BR2_PREFER_STATIC_LIB

Instead of explicitly adding it for each package.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index 1d43aef5c2..c5ad00aeec 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -305,6 +305,7 @@ endif
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared
+TARGET_LDFLAGS += -static
 else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif

From dc1d20acb78a979ed03f03143db3900d972c3714 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 29 Jun 2012 16:15:12 +0200
Subject: [PATCH 2253/6849] mii-diag: remove unneded explicit static linking
 handling

Now that it is done globally instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mii-diag/mii-diag.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index f74fa3def0..5adb270125 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -10,10 +10,6 @@ MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
 
 MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
-MII_DIAG_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -static"
-endif
-
 define MII_DIAG_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
 		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \

From edd37ca20583e3ae49f386b03ca213c9ae2cb065 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Jun 2012 00:43:00 +0000
Subject: [PATCH 2254/6849] pciutils: bump to version 3.1.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index d1c8db509c..a43fb95423 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCIUTILS_VERSION = 3.1.9
+PCIUTILS_VERSION = 3.1.10
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 PCIUTILS_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_ZLIB),y)

From c6ef9dd63d63c98d8c8f2cc0ada207944ee2dd69 Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Fri, 1 Jun 2012 06:00:36 +0000
Subject: [PATCH 2255/6849] cgilua: bump version to 5.1.4

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cgilua/Config.in | 2 +-
 package/cgilua/cgilua.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/cgilua/Config.in b/package/cgilua/Config.in
index b43ba97d15..2f9c4528ac 100644
--- a/package/cgilua/Config.in
+++ b/package/cgilua/Config.in
@@ -6,4 +6,4 @@ config BR2_PACKAGE_CGILUA
 	  CGILua is a tool for creating dynamic HTML pages
 	  and manipulating input data from Web forms.
 
-	  http://luaforge.net/projects/cgilua/
+	  http://keplerproject.github.com/cgilua
diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
index d46c2a6145..8e5770aace 100644
--- a/package/cgilua/cgilua.mk
+++ b/package/cgilua/cgilua.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-CGILUA_VERSION = 5.1.3
-CGILUA_SITE = http://luaforge.net/frs/download.php/3970
+CGILUA_VERSION = 5.1.4
+CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
 CGILUA_DEPENDENCIES = luafilesystem
 
 define CGILUA_INSTALL_TARGET_CMDS

From 66de45f907836f06c928f186dab6423d0c23f751 Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Fri, 1 Jun 2012 06:01:21 +0000
Subject: [PATCH 2256/6849] wsapi: bump version to 1.5

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wsapi/wsapi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
index f9ab334d56..cce7780dda 100644
--- a/package/wsapi/wsapi.mk
+++ b/package/wsapi/wsapi.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WSAPI_VERSION = 1.3.4
+WSAPI_VERSION = 1.5
 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
 WSAPI_DEPENDENCIES = coxpcall luafilesystem rings
 

From f4da6b8bd979a49c4ca14fb6003d2b05f6d8c5b7 Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Fri, 1 Jun 2012 06:02:07 +0000
Subject: [PATCH 2257/6849] xavante: bump version to 2.2.1

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xavante/xavante.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index e6dd312201..5eabd1e224 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-XAVANTE_VERSION = 2.2.0
+XAVANTE_VERSION = 2.2.1
 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
 XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
 

From 9910eba33adb2b783b0df5d90a857816e82fbd55 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 29 Jun 2012 00:14:56 +0000
Subject: [PATCH 2258/6849] dependencies: ensure that DESTDIR isn't set when
 running Buildroot

Having DESTDIR set in the environment before running Buildroot creates
some funky problems in the build process. Prevent users from running
into this kind of troubles.

Cc: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index c47ffcf43c..43ec3cc0f9 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -48,6 +48,12 @@ if test -n "$PERL_MM_OPT" ; then
     exit 1
 fi
 
+if test -n "$DESTDIR" ; then
+    /bin/echo -e "\nYou have the DESTDIR environment variable set. Please"
+    /bin/echo -e "unset it so that Buildroot can work properly."
+    exit 1
+fi
+
 # Verify that which is installed
 if ! which which > /dev/null ; then
 	/bin/echo -e "\nYou must install 'which' on your build machine\n";

From 96885ca7eb4a05e65986334d6138e1fe6afa46fc Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 30 Jun 2012 11:43:03 +0000
Subject: [PATCH 2259/6849] pkg-download: handle interrupted wget downloads

When a wget download is interrupted, the downloaded file is still created.
It will therefore not be re-downloaded in the next build, and the
extraction will fail.

To avoid this, download to a temporary file first and rename when the
download is successful.

The existing mechanism doesn't work for interrupted downloads because the
whole sub-shell is interrupted, so the rm-part never gets executed.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-download.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 7d1e543758..79837060b3 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -158,11 +158,14 @@ endef
 # Download a file using wget. Only download the file if it doesn't
 # already exist in the download directory. If the download fails,
 # remove the file (because wget -O creates a 0-byte file even if the
-# download fails).
+# download fails).  To handle an interrupted download as well, download
+# to a temporary file first.  The temporary file will be overwritten
+# the next time the download is tried.
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
-	$(WGET) -O $(DL_DIR)/$(2) '$(call qstrip,$(1))' || \
-	(rm -f $(DL_DIR)/$(2) ; exit 1)
+	($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' && \
+	 mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \
+	(rm -f $(DL_DIR)/$(2).tmp ; exit 1)
 endef
 
 define SOURCE_CHECK_WGET

From 670cb306704d76b4c3b717931cc7abef8c693099 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 30 Jun 2012 10:29:22 +0000
Subject: [PATCH 2260/6849] Globally disable PKG_CONFIG_PATH

If PKG_CONFIG_PATH is set in the environment, it allows pkg-config to
look for libraries outside of the buildroot tree.  This is a problem
both for host and target builds.  To avoid it, globally set an empty
PKG_CONFIG_PATH in the environment.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 7a66897cc2..bcbe9fc10c 100644
--- a/Makefile
+++ b/Makefile
@@ -165,6 +165,9 @@ HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
 export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD
 export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 
+# Make sure pkg-config doesn't look outside the buildroot tree
+unexport PKG_CONFIG_PATH
+
 # bash prints the name of the directory on 'cd <dir>' if CDPATH is
 # set, so unset it here to not cause problems. Notice that the export
 # line doesn't affect the environment of $(shell ..) calls, so

From d8c630d5390226bf4d46c1af43448630a7cd1a0c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 1 Jul 2012 23:59:29 +0200
Subject: [PATCH 2261/6849] openssl: fix static build

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 62861c5ee5..9ef79e1aaa 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -48,13 +48,14 @@ define OPENSSL_CONFIGURE_CMDS
 			--openssldir=/etc/ssl \
 			--libdir=/lib \
 			threads \
-			shared \
+			$(if $(BR2_PREFER_STATIC_LIB),no-shared,shared) \
 			no-idea \
 			no-rc5 \
 			enable-camellia \
 			enable-mdc2 \
 			enable-tlsext \
-			zlib-dynamic \
+			$(if $(BR2_PREFER_STATIC_LIB),zlib,zlib-dynamic) \
+			$(if $(BR2_PREFER_STATIC_LIB),no-dso) \
 	)
 	$(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile
 	$(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile
@@ -91,13 +92,22 @@ endif
 
 define OPENSSL_INSTALL_FIXUPS
 	rm -f $(TARGET_DIR)/usr/bin/c_rehash
-	# libraries gets installed read only, so strip fails
+endef
+
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS
+
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+
+# libraries gets installed read only, so strip fails
+define OPENSSL_INSTALL_FIXUPS_SHARED
 	chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
 	for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \
 	do chmod +w $$i; done
 endef
 
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS_SHARED
+
+endif
 
 define OPENSSL_REMOVE_OPENSSL_ENGINES
 	rm -rf $(TARGET_DIR)/usr/lib/engines

From 468bbc1538aaea87beaf455a2ad6ea5a255d5f58 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 1 Jul 2012 23:59:44 +0200
Subject: [PATCH 2262/6849] msmtp: fix static linking with openssl

Openssl depends on zlib, so we need to explicitly link with
zlib as well when statically linking.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/msmtp/msmtp.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index 2c712293d3..d5e6a31234 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -13,6 +13,10 @@ MSMTP_DEPENDENCIES += host-pkg-config
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MSMTP_CONF_OPT += --with-ssl=openssl
 MSMTP_DEPENDENCIES += openssl
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+# openssl uses zlib, so we need to explicitly link with it when static
+MSMTP_CONF_ENV += LIBS=-lz
+endif
 else ifeq ($(BR2_PACKAGE_GNUTLS),y)
 MSMTP_CONF_OPT += --with-ssl=gnutls
 MSMTP_DEPENDENCIES += gnutls

From c62b04ce9a029943185da187b8e6a17a52591cba Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Sun, 17 Jun 2012 11:53:59 +0000
Subject: [PATCH 2263/6849] docs: update LIBFOO_SITE to describe use of
 filesystem paths

Buildroot supports the use of local filesystem paths in LIBFOO_SITE
since the 2011.11 release, but this is not documented in the manual.
Fix this and slightly reword the surrounding doucmentation
accordingly.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gentargets.txt | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index cfcee8c8df..918580ef46 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -156,13 +156,18 @@ information is (assuming the package name is +libfoo+) :
   package directory inside Buildroot will be applied to the package
   after extraction.
 
-* +LIBFOO_SITE+ may contain the Internet location of the package. It
-  can either be the HTTP, FTP or SCP location of a tarball, or the URL
-  of a Git, Subversion, Mercurial or Bazaar repository (see
-  +LIBFOO_SITE_METHOD+ below). +
-  SCP URLs should be of the form +scp://[user@]host:filepath+. Note
-  that filepath is relative to the user's home directory, so you may want
-  to prepend the path with a slash for absolute paths:
+* +LIBFOO_SITE+ provides the location of the package, which can be a
+  URL or a local filesystem path. HTTP, FTP and SCP are supported URL
+  types for retrieving package tarballs. Git, Subversion, Mercurial,
+  and Bazaar are supported URL types for retrieving packages directly
+  from source code management systems. A filesystem path may be used
+  to specify either a tarball or a directory containing the package
+  source code. See +LIBFOO_SITE_METHOD+ below for more details on how
+  retrieval works. +
+  Note that SCP URLs should be of the form
+  +scp://[user@]host:filepath+, and that filepath is relative to the
+  user's home directory, so you may want to prepend the path with a
+  slash for absolute paths:
   +scp://[user@]host:/absolutepath+. +
   If +HOST_LIBFOO_SITE+ is not specified, it defaults to
   +LIBFOO_SITE+. If none are specified, then the location is assumed
@@ -172,6 +177,8 @@ information is (assuming the package name is +libfoo+) :
     +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ +
     +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+ +
     +LIBFOO_SITE=git://github.com/kergoth/tslib.git+
+    +LIBFOO_SITE=/opt/software/libfoo.tar.gz+
+    +LIBFOO_SITE=$(TOPDIR)/../src/libfoo/+
 
 * +LIBFOO_SITE_METHOD+ may contain the method to fetch the package
   source code. It can either be +wget+ (for normal FTP/HTTP downloads

From 9fd16a175b228888669a4e7b0b582c92893a9f7d Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Sun, 17 Jun 2012 11:54:00 +0000
Subject: [PATCH 2264/6849] docs: rework LIBFOO_SITE_METHOD documentation

The current structure of the LIBFOO_SITE_METHOD paragraph would make
it difficult to add documentation for the "file" and "local" methods.
There are enough possible values for LIBFOO_SITE_METHOD that
describing them in a sub-list seems to work well, which makes it
easier to add documentation for new methods.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gentargets.txt | 46 ++++++++++++++--------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 918580ef46..b296ac4d64 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -180,23 +180,35 @@ information is (assuming the package name is +libfoo+) :
     +LIBFOO_SITE=/opt/software/libfoo.tar.gz+
     +LIBFOO_SITE=$(TOPDIR)/../src/libfoo/+
 
-* +LIBFOO_SITE_METHOD+ may contain the method to fetch the package
-  source code. It can either be +wget+ (for normal FTP/HTTP downloads
-  of tarballs), +scp+ (for downloads over SSH with scp), +svn+, +git+,
-  +hg+ or +bzr+.  When not specified, it is guessed from the URL given
-  in +LIBFOO_SITE+: +scp://+, +svn://+, +git://+ and
-  +bzr://+ URLs will use the +scp+, +svn+, +git+ and +bzr+ methods
-  respectively. All other URL-types will use the +wget+ method. So for
-  example, in the case of a package whose source code is available
-  through a Subversion repository on HTTP, one 'must' specifiy
-  +LIBFOO_SITE_METHOD=svn+. Similarly, for Mercurial repositories, one
-  'must' specify +LIBFOO_SITE_METHOD=hg+. For +svn+, +git+, +hg+ and
-  +bzr+ methods, what Buildroot does is a checkout/clone of the repository
-  which is then tarballed and stored into the download cache. Next
-  builds will not checkout/clone again, but will use the tarball directly.
-  When +HOST_LIBFOO_SITE_METHOD+ is not specified, it defaults to the value
-  of +LIBFOO_SITE_METHOD+. See +package/multimedia/tremor/+ for an
-  example.
+* +LIBFOO_SITE_METHOD+ determines the method used to fetch or copy the
+  package source code. In many cases, Buildroot guesses the method
+  from the contents of +LIBFOO_SITE+ and setting +LIBFOO_SITE_METHOD+
+  is unnecessary. When +HOST_LIBFOO_SITE_METHOD+ is not specified, it
+  defaults to the value of +LIBFOO_SITE_METHOD+. +
+  The possible values of +LIBFOO_SITE_METHOD+ are:
+  ** +wget+ for normal FTP/HTTP downloads of tarballs.  Used by
+     default when +LIBFOO_SITE+ begins with +http://+, +https://+ or
+     +ftp://+.
+  ** +scp+ for downloads of tarballs over SSH with scp.  Used by
+     default when +LIBFOO_SITE+ begins with +scp://+.
+  ** +svn+ for retrieving source code from a Subversion repository.
+     Used by default when +LIBFOO_SITE+ begins with +svn://+.  When a
+     +http://+ Subversion repository URL is specified in
+     +LIBFOO_SITE+, one 'must' specify +LIBFOO_SITE_METHOD=svn+.
+     Buildroot performs a checkout which is preserved as a tarball in
+     the download cache; subsequent builds use the tarball instead of
+     performing another checkout.
+  ** +git+ for retrieving source code from a Git repository.  Used by
+     default when +LIBFOO_SITE+ begins with +git://+. The downloaded
+     source code is cached as with the +svn+
+     method.
+  ** +hg+ for retrieving source code from a Mercurial repository. One
+     'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+
+     contains a Mercurial repository URL. The downloaded source code
+     is cached as with the +svn+ method.
+  ** +bzr+ for retrieving source code from a Bazaar repository. Used
+     by default when +LIBFOO_SITE+ begins with +bzr://+. The
+     downloaded source code is cached as with the +svn+ method.
 
 * +LIBFOO_DEPENDENCIES+ lists the dependencies (in terms of package
   name) that are required for the current target package to

From fe8d4626f0225285eed4190958a5dc75cbefd972 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Sun, 17 Jun 2012 11:54:01 +0000
Subject: [PATCH 2265/6849] docs: describe "file" and "local" methods in
 LIBFOO_SITE_METHOD

Based on description by Thomas Petazzoni at:
http://free-electrons.com/blog/buildroot-2011-11/

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gentargets.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index b296ac4d64..84cf06bd2e 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -209,6 +209,14 @@ information is (assuming the package name is +libfoo+) :
   ** +bzr+ for retrieving source code from a Bazaar repository. Used
      by default when +LIBFOO_SITE+ begins with +bzr://+. The
      downloaded source code is cached as with the +svn+ method.
+  ** +file+ for a local tarball.  One should use this when
+     +LIBFOO_SITE+ specifies a package tarball as a local filename.
+     Useful for software that isn't available publicly or in version
+     control.
+  ** +local+ for a local source code directory.  One should use this
+     when +LIBFOO_SITE+ specifies a local directory path containing
+     the package source code.  Buildroot copies the contents of the
+     source directory into the package's build directory.
 
 * +LIBFOO_DEPENDENCIES+ lists the dependencies (in terms of package
   name) that are required for the current target package to

From 7ffd15029fbe4f1223e1604653672f0f313e6017 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jul 2012 10:37:02 +0200
Subject: [PATCH 2266/6849] iw: fix static linking

Libnl needs explicit -lpthread / -lm when statically linking.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 5cd40a3a21..2b322f69d4 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -13,6 +13,12 @@ IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+# libnl needs pthread/m, so we need to explicitly with them when static
+# these need to added AFTER libnl, so we have to override LIBS completely
+IW_MAKE_OPT = LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
+endif
+
 define IW_CONFIGURE_CMDS
 	echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
 	echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
@@ -20,7 +26,7 @@ define IW_CONFIGURE_CMDS
 endef
 
 define IW_BUILD_CMDS
-	$(IW_MAKE_ENV) $(MAKE) -C $(@D)
+	$(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
 endef
 
 define IW_INSTALL_TARGET_CMDS

From 68b2218cb5b3758e60b8cff399ca17c5153663cd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jul 2012 11:10:59 +0200
Subject: [PATCH 2267/6849] bsdiff: libraries should go after source files
 using them in linker invocation

Fixes http://autobuild.buildroot.net/results/2a6e213997c06136e18b25a1b0e91d8782acbfc4/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bsdiff/bsdiff.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 66a7722f07..e8d9ec0150 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -9,10 +9,10 @@ BSDIFF_SITE = http://www.daemonology.net/bsdiff
 BSDIFF_DEPENDENCIES = bzip2
 
 define BSDIFF_BUILD_CMDS
-	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -lbz2 \
-		$(@D)/bsdiff.c -o $(@D)/bsdiff
-	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -lbz2 \
-		$(@D)/bspatch.c -o $(@D)/bspatch
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		$(@D)/bsdiff.c -lbz2 -o $(@D)/bsdiff
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		$(@D)/bspatch.c -lbz2 -o $(@D)/bspatch
 endef
 
 define BSDIFF_INSTALL_TARGET_CMDS

From 69b236024113da1eadc0b7d2d297308cec48bf65 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Jul 2012 04:21:13 +0000
Subject: [PATCH 2268/6849] Revert "dependencies: ensure that DESTDIR isn't set
 when running Buildroot"

We should instead simply unset it at runtime, like we do for
PKG_CONFIG_PATH.

This reverts commit 9910eba33adb2b783b0df5d90a857816e82fbd55.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 43ec3cc0f9..c47ffcf43c 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -48,12 +48,6 @@ if test -n "$PERL_MM_OPT" ; then
     exit 1
 fi
 
-if test -n "$DESTDIR" ; then
-    /bin/echo -e "\nYou have the DESTDIR environment variable set. Please"
-    /bin/echo -e "unset it so that Buildroot can work properly."
-    exit 1
-fi
-
 # Verify that which is installed
 if ! which which > /dev/null ; then
 	/bin/echo -e "\nYou must install 'which' on your build machine\n";

From 91123a6fab2770ced312fc54a69f4d83f3a2e1e5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Jul 2012 04:21:14 +0000
Subject: [PATCH 2269/6849] Ensure DESTDIR will not confuse the build

Having DESTDIR defined will confuse the build of certain packages, so
we ensure that it is undefined from the environment when Buildroot
starts.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index bcbe9fc10c..b80477f7fc 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,10 @@ export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 # Make sure pkg-config doesn't look outside the buildroot tree
 unexport PKG_CONFIG_PATH
 
+# Having DESTDIR set in the environment confuses the installation
+# steps of some packages.
+unexport DESTDIR
+
 # bash prints the name of the directory on 'cd <dir>' if CDPATH is
 # set, so unset it here to not cause problems. Notice that the export
 # line doesn't affect the environment of $(shell ..) calls, so

From aaa8125a9376431cf9b231ea146f6614bd8f5c26 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 Jul 2012 07:04:44 +0000
Subject: [PATCH 2270/6849] busybox: bump 1.20.x series to 1.20.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in                     |  2 +-
 .../busybox-1.20.1/busybox-1.20.1-ash.patch   | 12 ---
 .../busybox-1.20.1-ifupdown.patch             | 75 -----------------
 .../busybox-1.20.1/busybox-1.20.1-man.patch   | 34 --------
 .../busybox-1.20.1-mke2fs.patch               | 58 -------------
 .../busybox-1.20.1/busybox-1.20.1-ps.patch    | 84 -------------------
 .../busybox-1.20.1/busybox-1.20.1-tar.patch   | 11 ---
 7 files changed, 1 insertion(+), 275 deletions(-)
 delete mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch
 delete mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch
 delete mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch
 delete mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch
 delete mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch
 delete mode 100644 package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index a07864474b..dedcf185f0 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -36,7 +36,7 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
 	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
-	default "1.20.1"	if BR2_BUSYBOX_VERSION_1_20_X
+	default "1.20.2"	if BR2_BUSYBOX_VERSION_1_20_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch
deleted file mode 100644
index a012a7063a..0000000000
--- a/package/busybox/busybox-1.20.1/busybox-1.20.1-ash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.20.1/shell/ash.c
-+++ busybox-1.20.1-ash/shell/ash.c
-@@ -6846,8 +6846,7 @@ evalvar(char *p, int flags, struct strli
- 		patloc = expdest - (char *)stackblock();
- 		if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype,
- 				startloc, varflags,
--//TODO: | EXP_REDIR too? All other such places do it too
--				/* quotes: */ flags & (EXP_FULL | EXP_CASE),
-+				/* quotes: */ flags & (EXP_FULL | EXP_CASE | EXP_REDIR),
- 				var_str_list)
- 		) {
- 			int amount = expdest - (
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch
deleted file mode 100644
index b2a945614a..0000000000
--- a/package/busybox/busybox-1.20.1/busybox-1.20.1-ifupdown.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- busybox-1.20.1/networking/ifupdown.c
-+++ busybox-1.20.1-ifupdown/networking/ifupdown.c
-@@ -140,8 +140,6 @@ static const char keywords_up_down[] ALI
- 	"up\0"
- 	"down\0"
- 	"pre-up\0"
--	"pre-down\0"
--	"post-up\0"
- 	"post-down\0"
- ;
- 
-@@ -895,6 +893,11 @@ static struct interfaces_file_t *read_in
- 				if (rest_of_line[0] == '\0')
- 					bb_error_msg_and_die("option with empty value \"%s\"", buf);
- 
-+				if (strcmp(first_word, "post-up") == 0)
-+					first_word += 5; /* "up" */
-+				else if (strcmp(first_word, "pre-down") == 0)
-+					first_word += 4; /* "down" */
-+
- 				/* If not one of "up", "down",... words... */
- 				if (index_in_strings(keywords_up_down, first_word) < 0) {
- 					int i;
-@@ -963,7 +966,7 @@ static char *setlocalenv(const char *for
- 	return result;
- }
- 
--static void set_environ(struct interface_defn_t *iface, const char *mode)
-+static void set_environ(struct interface_defn_t *iface, const char *mode, const char *opt)
- {
- 	int i;
- 	char **pp;
-@@ -976,7 +979,7 @@ static void set_environ(struct interface
- 	}
- 
- 	/* note: last element will stay NULL: */
--	G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 6));
-+	G.my_environ = xzalloc(sizeof(char *) * (iface->n_options + 7));
- 	pp = G.my_environ;
- 
- 	for (i = 0; i < iface->n_options; i++) {
-@@ -990,6 +993,7 @@ static void set_environ(struct interface
- 	*pp++ = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
- 	*pp++ = setlocalenv("%s=%s", "METHOD", iface->method->name);
- 	*pp++ = setlocalenv("%s=%s", "MODE", mode);
-+	*pp++ = setlocalenv("%s=%s", "PHASE", opt);
- 	if (G.startup_PATH)
- 		*pp++ = setlocalenv("%s=%s", "PATH", G.startup_PATH);
- }
-@@ -1044,21 +1048,21 @@ static int check(char *str)
- static int iface_up(struct interface_defn_t *iface)
- {
- 	if (!iface->method->up(iface, check)) return -1;
--	set_environ(iface, "start");
-+	set_environ(iface, "start", "pre-up");
- 	if (!execute_all(iface, "pre-up")) return 0;
- 	if (!iface->method->up(iface, doit)) return 0;
-+	set_environ(iface, "start", "post-up");
- 	if (!execute_all(iface, "up")) return 0;
--	if (!execute_all(iface, "post-up")) return 0;
- 	return 1;
- }
- 
- static int iface_down(struct interface_defn_t *iface)
- {
- 	if (!iface->method->down(iface,check)) return -1;
--	set_environ(iface, "stop");
--	if (!execute_all(iface, "pre-down")) return 0;
-+	set_environ(iface, "stop", "pre-down");
- 	if (!execute_all(iface, "down")) return 0;
- 	if (!iface->method->down(iface, doit)) return 0;
-+	set_environ(iface, "stop", "post-down");
- 	if (!execute_all(iface, "post-down")) return 0;
- 	return 1;
- }
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch
deleted file mode 100644
index f382e078f4..0000000000
--- a/package/busybox/busybox-1.20.1/busybox-1.20.1-man.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- busybox-1.20.1/miscutils/man.c
-+++ busybox-1.20.1-man/miscutils/man.c
-@@ -129,27 +129,21 @@ static int show_manpage(const char *page
- #endif
- #if ENABLE_FEATURE_SEAMLESS_XZ
- 	strcpy(ext, "xz");
--	if (run_pipe(pager, man_filename, man, level))
-+	if (run_pipe(pager, filename_with_zext, man, level))
- 		return 1;
- #endif
- #if ENABLE_FEATURE_SEAMLESS_BZ2
- 	strcpy(ext, "bz2");
--	if (run_pipe(pager, man_filename, man, level))
-+	if (run_pipe(pager, filename_with_zext, man, level))
- 		return 1;
- #endif
- #if ENABLE_FEATURE_SEAMLESS_GZ
- 	strcpy(ext, "gz");
--	if (run_pipe(pager, man_filename, man, level))
-+	if (run_pipe(pager, filename_with_zext, man, level))
- 		return 1;
- #endif
- 
--#if SEAMLESS_COMPRESSION
--	ext[-1] = '\0';
--#endif
--	if (run_pipe(pager, man_filename, man, level))
--		return 1;
--
--	return 0;
-+	return run_pipe(pager, man_filename, man, level);
- }
- 
- int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch
deleted file mode 100644
index 659ae2d2a2..0000000000
--- a/package/busybox/busybox-1.20.1/busybox-1.20.1-mke2fs.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- busybox-1.20.1/include/bb_e2fs_defs.h
-+++ busybox-1.20.1-mke2fs/include/bb_e2fs_defs.h
-@@ -422,9 +422,27 @@ struct ext2_super_block {
- 	uint16_t	s_reserved_word_pad;
- 	uint32_t	s_default_mount_opts;
- 	uint32_t	s_first_meta_bg;	/* First metablock group */
-+	/* ext3 additions */
- 	uint32_t	s_mkfs_time;		/* When the filesystem was created */
- 	uint32_t	s_jnl_blocks[17];	/* Backup of the journal inode */
--	uint32_t	s_reserved[172];	/* Padding to the end of the block */
-+	/* 64bit support valid if EXT4_FEATURE_COMPAT_64BIT */
-+/*150*/	uint32_t	s_blocks_count_hi;	/* Blocks count */
-+	uint32_t	s_r_blocks_count_hi;	/* Reserved blocks count */
-+	uint32_t	s_free_blocks_count_hi;	/* Free blocks count */
-+	uint16_t	s_min_extra_isize;	/* All inodes have at least # bytes */
-+	uint16_t	s_want_extra_isize; 	/* New inodes should reserve # bytes */
-+	uint32_t	s_flags;		/* Miscellaneous flags */
-+	uint16_t	s_raid_stride;		/* RAID stride */
-+	uint16_t	s_mmp_interval;		/* # seconds to wait in MMP checking */
-+	uint64_t	s_mmp_block;		/* Block for multi-mount protection */
-+	uint32_t	s_raid_stripe_width;	/* blocks on all data disks (N*stride)*/
-+	uint8_t		s_log_groups_per_flex;	/* FLEX_BG group size */
-+	uint8_t		s_reserved_char_pad2;
-+	uint16_t	s_reserved_pad;
-+	uint32_t	s_reserved[162];	/* Padding to the end of the block */
-+};
-+struct BUG_ext2_super_block {
-+        char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1];
- };
- 
- /*
---- busybox-1.20.1/util-linux/mkfs_ext2.c
-+++ busybox-1.20.1-mke2fs/util-linux/mkfs_ext2.c
-@@ -53,11 +53,6 @@
- #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
- #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX    1
- 
--// from e2fsprogs
--#define s_reserved_gdt_blocks s_padding1
--#define s_mkfs_time           s_reserved[0]
--#define s_flags               s_reserved[22]
--
- #define EXT2_HASH_HALF_MD4       1
- #define EXT2_FLAGS_SIGNED_HASH   0x0001
- #define EXT2_FLAGS_UNSIGNED_HASH 0x0002
-@@ -482,8 +477,10 @@ int mkfs_ext2_main(int argc UNUSED_PARAM
- 	STORE_LE(sb->s_magic, EXT2_SUPER_MAGIC);
- 	STORE_LE(sb->s_inode_size, inodesize);
- 	// set "Required extra isize" and "Desired extra isize" fields to 28
--	if (inodesize != sizeof(*inode))
--		STORE_LE(sb->s_reserved[21], 0x001C001C);
-+	if (inodesize != sizeof(*inode)) {
-+		STORE_LE(sb->s_min_extra_isize, 0x001c);
-+		STORE_LE(sb->s_want_extra_isize, 0x001c);
-+	}
- 	STORE_LE(sb->s_first_ino, EXT2_GOOD_OLD_FIRST_INO);
- 	STORE_LE(sb->s_log_block_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE);
- 	STORE_LE(sb->s_log_frag_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE);
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch
deleted file mode 100644
index c8e329ec3c..0000000000
--- a/package/busybox/busybox-1.20.1/busybox-1.20.1-ps.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- busybox-1.20.1/procps/ps.c
-+++ busybox-1.20.1-ps/procps/ps.c
-@@ -69,6 +69,31 @@
- /* Absolute maximum on output line length */
- enum { MAX_WIDTH = 2*1024 };
- 
-+#if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
-+static long get_uptime(void)
-+{
-+#ifdef __linux__
-+	struct sysinfo info;
-+	if (sysinfo(&info) < 0)
-+		return 0;
-+	return info.uptime;
-+#elif 1
-+	char buf[64];
-+	long uptime;
-+	if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
-+		bb_perror_msg_and_die("can't read %s", "/proc/uptime");
-+	buf[sizeof(buf)-1] = '\0';
-+	sscanf(buf, "%l", &uptime);
-+	return uptime;
-+#else
-+	struct timespec ts;
-+	if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
-+		return 0;
-+	return ts.tv_sec;
-+#endif
-+}
-+#endif
-+
- #if ENABLE_DESKTOP
- 
- #include <sys/times.h> /* for times() */
-@@ -197,8 +222,6 @@ static inline unsigned get_HZ_by_waiting
- 
- static unsigned get_kernel_HZ(void)
- {
--	//char buf[64];
--	struct sysinfo info;
- 
- 	if (kernel_HZ)
- 		return kernel_HZ;
-@@ -208,12 +231,7 @@ static unsigned get_kernel_HZ(void)
- 	if (kernel_HZ == (unsigned)-1)
- 		kernel_HZ = get_HZ_by_waiting();
- 
--	//if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
--	//	bb_perror_msg_and_die("can't read %s", "/proc/uptime");
--	//buf[sizeof(buf)-1] = '\0';
--	///sscanf(buf, "%llu", &seconds_since_boot);
--	sysinfo(&info);
--	seconds_since_boot = info.uptime;
-+	seconds_since_boot = get_uptime();
- 
- 	return kernel_HZ;
- }
-@@ -635,7 +653,7 @@ int ps_main(int argc UNUSED_PARAM, char 
- 	};
- #if ENABLE_FEATURE_PS_LONG
- 	time_t now = now;
--	struct sysinfo info;
-+	long uptime;
- #endif
- 	int opts = 0;
- 	/* If we support any options, parse argv */
-@@ -695,7 +713,7 @@ int ps_main(int argc UNUSED_PARAM, char 
- 		puts("S   UID   PID  PPID   VSZ   RSS TTY   STIME TIME     CMD");
- #if ENABLE_FEATURE_PS_LONG
- 		now = time(NULL);
--		sysinfo(&info);
-+		uptime = get_uptime();
- #endif
- 	}
- 	else {
-@@ -727,7 +745,7 @@ int ps_main(int argc UNUSED_PARAM, char 
- 				char tty[2 * sizeof(int)*3 + 2];
- 				char *endp;
- 				unsigned sut = (p->stime + p->utime) / 100;
--				unsigned elapsed = info.uptime - (p->start_time / 100);
-+				unsigned elapsed = uptime - (p->start_time / 100);
- 				time_t start = now - elapsed;
- 				struct tm *tm = localtime(&start);
- 
diff --git a/package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch b/package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch
deleted file mode 100644
index 4129b6517f..0000000000
--- a/package/busybox/busybox-1.20.1/busybox-1.20.1-tar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.20.1/archival/libarchive/get_header_tar.c
-+++ busybox-1.20.1-tar/archival/libarchive/get_header_tar.c
-@@ -84,7 +84,7 @@ static unsigned long long getOctal(char 
- 		first >>= 1; /* now 7th bit = 6th bit */
- 		v = first;   /* sign-extend 8 bits to 64 */
- 		while (--len != 0)
--			v = (v << 8) + (unsigned char) *str++;
-+			v = (v << 8) + (uint8_t) *++str;
- 	}
- 	return v;
- }

From 8f6fc941c729f069256296f82ed9f721a266cc8c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Jul 2012 21:53:54 +0200
Subject: [PATCH 2271/6849] toolchain/gcc : bump 4.5.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.5.3 => 4.5.4}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.5.3 => 4.5.4}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.5.3 => 4.5.4}/302-c99-snprintf.patch           | 0
 .../gcc/{4.5.3 => 4.5.4}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.5.3 => 4.5.4}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.5.3 => 4.5.4}/820-arm-unbreak-armv4t.patch     | 0
 toolchain/gcc/{4.5.3 => 4.5.4}/830-arm-pr43440.patch            | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/820-arm-unbreak-armv4t.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/830-arm-pr43440.patch (100%)
 rename toolchain/gcc/{4.5.3 => 4.5.4}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.5.3/100-uclibc-conf.patch b/toolchain/gcc/4.5.4/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/100-uclibc-conf.patch
rename to toolchain/gcc/4.5.4/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.5.3/301-missing-execinfo_h.patch b/toolchain/gcc/4.5.4/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.5.4/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.5.3/302-c99-snprintf.patch b/toolchain/gcc/4.5.4/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/302-c99-snprintf.patch
rename to toolchain/gcc/4.5.4/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.5.3/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.5.4/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.5.4/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.5.3/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.5.4/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.5.4/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.5.3/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.5.4/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/820-arm-unbreak-armv4t.patch
rename to toolchain/gcc/4.5.4/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.5.3/830-arm-pr43440.patch b/toolchain/gcc/4.5.4/830-arm-pr43440.patch
similarity index 100%
rename from toolchain/gcc/4.5.3/830-arm-pr43440.patch
rename to toolchain/gcc/4.5.4/830-arm-pr43440.patch
diff --git a/toolchain/gcc/4.5.3/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.5.3/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 4ce881673f..fa526bba3f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -62,7 +62,7 @@ config BR2_GCC_VERSION
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
-	default "4.5.3"     if BR2_GCC_VERSION_4_5_X
+	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.1"     if BR2_GCC_VERSION_4_7_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP

From c8c84132cdc2c496461f60d335e9610e87ac82e8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 25 Jun 2012 21:25:43 +0000
Subject: [PATCH 2272/6849] iw: bump to 3.5

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 2b322f69d4..bddf6270d7 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.4
+IW_VERSION = 3.5
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From 5e8d35e8e146bf8e4ceab17747c686a643698623 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Tue, 3 Jul 2012 02:38:01 +0000
Subject: [PATCH 2273/6849] barebox: bump to 2012.07

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 09a82ebc81..13009d202c 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,7 +8,7 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_04
+	default BR2_TARGET_BAREBOX_2012_07
 	help
 	  Select the specific Barebox version you want to use
 
@@ -25,6 +25,9 @@ config BR2_TARGET_BAREBOX_2012_03
 config BR2_TARGET_BAREBOX_2012_04
 	bool "2012.04"
 
+config BR2_TARGET_BAREBOX_2012_07
+	bool "2012.07"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -46,6 +49,7 @@ config BR2_TARGET_BAREBOX_VERSION
 	default "2012.02.0"	if BR2_TARGET_BAREBOX_2012_02
 	default "2012.03.0"	if BR2_TARGET_BAREBOX_2012_03
 	default "2012.04.0"	if BR2_TARGET_BAREBOX_2012_04
+	default "2012.07.0"	if BR2_TARGET_BAREBOX_2012_07
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From a1b7bec1760692e7db19062c76dc905e77054479 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Tue, 3 Jul 2012 02:38:02 +0000
Subject: [PATCH 2274/6849] barebox: remove old version and add last 4
 versions.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 13009d202c..574bfaebd8 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,19 +12,15 @@ choice
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_01
-	depends on BR2_DEPRECATED
-	bool "2012.01"
-
-config BR2_TARGET_BAREBOX_2012_02
-	bool "2012.02"
-
-config BR2_TARGET_BAREBOX_2012_03
-	bool "2012.03"
-
 config BR2_TARGET_BAREBOX_2012_04
 	bool "2012.04"
 
+config BR2_TARGET_BAREBOX_2012_05
+	bool "2012.05"
+
+config BR2_TARGET_BAREBOX_2012_06
+	bool "2012.06"
+
 config BR2_TARGET_BAREBOX_2012_07
 	bool "2012.07"
 
@@ -45,10 +41,9 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.01.0"	if BR2_TARGET_BAREBOX_2012_01
-	default "2012.02.0"	if BR2_TARGET_BAREBOX_2012_02
-	default "2012.03.0"	if BR2_TARGET_BAREBOX_2012_03
 	default "2012.04.0"	if BR2_TARGET_BAREBOX_2012_04
+	default "2012.05.0"	if BR2_TARGET_BAREBOX_2012_05
+	default "2012.06.0"	if BR2_TARGET_BAREBOX_2012_06
 	default "2012.07.0"	if BR2_TARGET_BAREBOX_2012_07
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From 185646838f99cf515b379f937232a8f73c2e9931 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Jul 2012 01:29:40 +0000
Subject: [PATCH 2275/6849] lshw: fix build failure

Fix space-unfriendly CC/CXX/AR argument passing.
Fixes build failure
http://autobuild.buildroot.net/results/d8c7b5ef4056a197bb8085b0fcdd09d931aec876/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lshw/lshw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 8b4fcc6296..d0d97dbc5f 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -6,7 +6,7 @@
 
 LSHW_VERSION = B.02.16
 LSHW_SITE = http://ezix.org/software/files
-LSHW_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) AR=$(TARGET_AR) \
+LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
 	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
 LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)"
 LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),libintl)

From 528607d04cb5ecbf367fa30a17481b0dded55ceb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Jul 2012 01:34:54 +0000
Subject: [PATCH 2276/6849] bonnie: needs MMU

Fixes
http://autobuild.buildroot.net/results/08cc7fdf21f8e51b793c0cf7a51b3f190ea7668c/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bonnie/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bonnie/Config.in b/package/bonnie/Config.in
index 9dda4b6cd1..91b1e96b5a 100644
--- a/package/bonnie/Config.in
+++ b/package/bonnie/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BONNIE
 	bool "bonnie++"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
 	help
 	  Filesystem tester
 

From f7ea7b227fc9c04fa85fd4a552ef9e5640abaf26 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Jul 2012 01:47:13 +0000
Subject: [PATCH 2277/6849] beecrypt: needs threads support

Fixes
http://autobuild.buildroot.net/results/e28e5dfe73d838b8bc4e9c586bc865d57d717f76/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/beecrypt/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index 2673877bae..19c7f2fe1d 100644
--- a/package/beecrypt/Config.in
+++ b/package/beecrypt/Config.in
@@ -1,10 +1,14 @@
 config BR2_PACKAGE_BEECRYPT
 	bool "beecrypt"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
 	help
 	  Beecrypt is a general-purpose cryptography library.
 
 	  http://beecrypt.sf.net
 
+comment "beecrypt needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 comment "beecrypt C++ support requires a toolchain with WCHAR enabled"
-	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR
+	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS

From 485b05a475a996652a6533b3f50c5440a025e5bf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Jul 2012 01:47:14 +0000
Subject: [PATCH 2278/6849] rpm: needs threads support

Because beecrypt needs threads rpm does too since it's a mandatory
dependency.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpm/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index a80a5a7975..14072c95f9 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,8 +1,12 @@
+comment "rpm requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 comment "rpm requires libneon with SSL, XML and ZLIB support"
-	depends on !BR2_PACKAGE_NEON || BR2_PACKAGE_NEON_NOXML
+	depends on !BR2_PACKAGE_NEON || BR2_PACKAGE_NEON_NOXML && BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_RPM
 	bool "rpm"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt
 	select BR2_PACKAGE_BEECRYPT
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_OPENSSL

From 37aa01f2cf3e05f6e52df056c22e5733fd1164ef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Jul 2012 02:35:51 +0000
Subject: [PATCH 2279/6849] toolchain/powerpc: SPE ABI is not available for
 e500mc

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 25ff7509b5..c9bbc12774 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -556,8 +556,8 @@ endchoice
 choice
 	prompt "Target ABI"
 	depends on BR2_powerpc
-	default BR2_powerpc_CLASSIC if BR2_powerpc_e500mc
 	default BR2_powerpc_SPE if BR2_powerpc_8540 || BR2_powerpc_8548
+	default BR2_powerpc_CLASSIC
 	help
 	  Application Binary Interface to use
 
@@ -566,7 +566,7 @@ config BR2_powerpc_CLASSIC
 	depends on !(BR2_powerpc_8540 || BR2_powerpc_8548)
 config BR2_powerpc_SPE
 	bool "SPE"
-	depends on BR2_powerpc_8540 || BR2_powerpc_8548 || BR2_powerpc_e500mc
+	depends on BR2_powerpc_8540 || BR2_powerpc_8548
 endchoice
 
 config BR2_ARCH

From 283ab42cbed787402be7fccb259267d7646970c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 6 Jul 2012 01:50:27 +0000
Subject: [PATCH 2280/6849] htop: bump to version 1.0.1 and fix build failure

Bump to version 1.0.1
Also fix build failure:
http://autobuild.buildroot.net/results/5f95c4fbb62b7b8cb451f6525731eae4ce6bcdbf/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/htop/htop.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 07b750c59b..3535697247 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -4,11 +4,11 @@
 #
 #############################################################
 
-HTOP_VERSION = 1.0
-HTOP_SOURCE = htop-$(HTOP_VERSION).tar.gz
-HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERSION)
+HTOP_VERSION = 1.0.1
+HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/htop/htop/$(HTOP_VERSION)
 HTOP_DEPENDENCIES = ncurses
 HTOP_AUTORECONF = YES
-HTOP_CONF_OPT += --disable-unicode
+HTOP_CONF_OPT = --disable-unicode
+HTOP_CONF_ENV = ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
 
 $(eval $(call AUTOTARGETS))

From 9741fd7031c648352b6acabfac4066f5482499fe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 6 Jul 2012 01:55:38 +0000
Subject: [PATCH 2281/6849] gob2: needs MMU

m4 needs MMU, so does bison, and so does gob2 which uses bison.
Fixes build failure:
http://autobuild.buildroot.net/results/f942b4ac770f3c7b27c42214af5bcec49f687da1/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gob2/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index 562ac3123c..cbe30d66d0 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_GOB2
 	bool "gob2"
 	depends on BR2_USE_WCHAR # glib2
+	# m4 uses fork(), so does bison then
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_FLEX
 	select BR2_PACKAGE_FLEX_LIBFL

From b8b57bb683283e68436de16cd1cc590b34d2d666 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 6 Jul 2012 02:57:33 +0000
Subject: [PATCH 2282/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 5e66b67c3a..c14717fc76 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -66,7 +66,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.36"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.21"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.22"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.4"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP

From 7ea1e92bdd9acf6cd5b021e61a18703e27885426 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 11 Jul 2012 14:57:18 +0200
Subject: [PATCH 2283/6849] Remove -fPIC on x86_64

The -fPIC breaks the purgatory of kexec (= the code that passes command-line
arguments to the kernel): kexec doesn't know how to handle the GOT and PLT
relocation entries.

There is also no reason at all to pass -fPIC.  Shared libraries that require
it will add it to their local Makefiles, and normal executables have no
business with -fPIC (plus it adds overhead...).

The -fPIC was added by Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
in commit 8027784c.  That commit adds sysroot parameters to CFLAGS.
There is no explanation why -fPIC is also added for x86_64.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Makefile.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index c5ad00aeec..1c3ce482b2 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -87,12 +87,6 @@ endif
 
 TARGET_CFLAGS=$(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
-ifeq ($(BR2_x86_64),y)
-TARGET_CFLAGS+=-fPIC -DPIC
-endif # PIC for dynamic objects on x86_64
-endif
-
 ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy)
 TARGET_CFLAGS+=-fno-pic -mno-abicalls
 endif

From e388ac59039a9f5892b1afc7333a827d18ad0f68 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 11 Jul 2012 11:50:10 +0200
Subject: [PATCH 2284/6849] libxslt: use libgcrypt-config from STAGING_DIR

Otherwise, if the host has a libgcrypt-config, that one will be used.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/libxslt/libxslt.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 15b6e6aa9b..a40a8a97f1 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -16,6 +16,7 @@ LIBXSLT_DEPENDENCIES = libxml2
 # If we have enabled libgcrypt then use it, else disable crypto support.
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 LIBXSLT_DEPENDENCIES += libgcrypt
+LIBXSLT_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 else
 LIBXSLT_CONF_OPT += --without-crypto
 endif

From 830c5868ed96a06007050f6b134e2a9954e88b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau@advansee.com>
Date: Fri, 13 Jul 2012 22:14:05 +0200
Subject: [PATCH 2285/6849] libmad: Add optimization config options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Configuring libmad with --enable-speed compromises accuracy and can cause audio
clipping in some cases (heard on ARM platform with some loud MP3s), so give
users the choice of MAD optimizations.

The default config corresponds to the default behavior of libmad's configure.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
---
 package/libmad/Config.in | 41 ++++++++++++++++++++++++++++++++++++++++
 package/libmad/libmad.mk |  6 +++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/package/libmad/Config.in b/package/libmad/Config.in
index 4d4f9301a6..d0edc497c4 100644
--- a/package/libmad/Config.in
+++ b/package/libmad/Config.in
@@ -6,3 +6,44 @@ config BR2_PACKAGE_LIBMAD
 	  without a floating-point unit.
 
 	  http://www.underbit.com/products/mad/
+
+if BR2_PACKAGE_LIBMAD
+
+choice
+	prompt "Speed vs. accuracy"
+	default BR2_PACKAGE_LIBMAD_OPTIMIZATION_DEFAULT
+
+config BR2_PACKAGE_LIBMAD_OPTIMIZATION_DEFAULT
+	bool "Default"
+	help
+	  Keep optimizations balanced between speed and accuracy.
+
+config BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED
+	bool "Optimize for speed over accuracy"
+	help
+	  Compromise accuracy for speed.
+
+config BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY
+	bool "Optimize for accuracy over speed"
+	help
+	  Compromise speed for accuracy.
+
+endchoice
+
+config BR2_PACKAGE_LIBMAD_SSO
+	bool "Subband synthesis optimization"
+	help
+	  Use the subband synthesis optimization, with reduced accuracy.
+
+config BR2_PACKAGE_LIBMAD_ASO
+	bool "Architecture-specific optimizations"
+	default y
+	help
+	  Use certain architecture-specific optimizations.
+
+config BR2_PACKAGE_LIBMAD_STRICT_ISO
+	bool "Strict ISO/IEC interpretations"
+	help
+	  Use strict ISO/IEC interpretations.
+
+endif
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 6e53cf2574..3c92d528d4 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -30,6 +30,10 @@ LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
 
 LIBMAD_CONF_OPT = \
 		--disable-debugging \
-		--enable-speed
+		$(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED),--enable-speed) \
+		$(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY),--enable-accuracy) \
+		--$(if $(BR2_PACKAGE_LIBMAD_SSO),enable,disable)-sso \
+		--$(if $(BR2_PACKAGE_LIBMAD_ASO),enable,disable)-aso \
+		--$(if $(BR2_PACKAGE_LIBMAD_STRICT_ISO),enable,disable)-strict-iso
 
 $(eval $(call AUTOTARGETS))

From 55bdb7d01a563bb64ec057b0cf2e759135efb2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= <francois.perrad@gadz.org>
Date: Sat, 14 Jul 2012 15:11:59 +0200
Subject: [PATCH 2286/6849] lua: bump version to 5.1.5

[thomas.petazzoni@free-electrons.com: rewrote the patch, which was
corrupted in the original submission. Used quilt to refresh the Lua
patches, so that the version numbers are no longer present in the file
names]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/lua-bug3-boolean_expression.patch | 48 --------------
 package/lua/lua-bug4-table.patch              | 22 -------
 package/lua/lua-bug5-debug_getfenv.patch      | 10 ---
 package/lua/lua-bug6-gc_performance.patch     | 14 ----
 package/lua/lua-bug7-string_format.patch      | 20 ------
 package/lua/lua-bug8-io_read.patch            | 14 ----
 package/lua/lua-root-path.patch               |  8 +--
 package/lua/lua-shared-libs.patch             | 65 ++++++++++---------
 package/lua/lua.mk                            |  2 +-
 9 files changed, 40 insertions(+), 163 deletions(-)
 delete mode 100644 package/lua/lua-bug3-boolean_expression.patch
 delete mode 100644 package/lua/lua-bug4-table.patch
 delete mode 100644 package/lua/lua-bug5-debug_getfenv.patch
 delete mode 100644 package/lua/lua-bug6-gc_performance.patch
 delete mode 100644 package/lua/lua-bug7-string_format.patch
 delete mode 100644 package/lua/lua-bug8-io_read.patch

diff --git a/package/lua/lua-bug3-boolean_expression.patch b/package/lua/lua-bug3-boolean_expression.patch
deleted file mode 100644
index f04eb85075..0000000000
--- a/package/lua/lua-bug3-boolean_expression.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- lua-5.1.4.orig/src/lcode.c	2007/12/28 15:32:23	2.25.1.3
-+++ lua-5.1.4/src/lcode.c	2009/06/15 14:07:34
-@@ -544,15 +544,18 @@
-       pc = NO_JUMP;  /* always true; do nothing */
-       break;
-     }
--    case VFALSE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       invertjump(fs, e);
-       pc = e->u.s.info;
-       break;
-     }
-+    case VFALSE: {
-+      if (!hasjumps(e)) {
-+        pc = luaK_jump(fs);  /* always jump */
-+        break;
-+      }
-+      /* else go through */
-+    }
-     default: {
-       pc = jumponcond(fs, e, 0);
-       break;
-@@ -572,14 +575,17 @@
-       pc = NO_JUMP;  /* always false; do nothing */
-       break;
-     }
--    case VTRUE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       pc = e->u.s.info;
-       break;
-     }
-+    case VTRUE: {
-+      if (!hasjumps(e)) {
-+        pc = luaK_jump(fs);  /* always jump */
-+        break;
-+      }
-+      /* else go through */
-+    }
-     default: {
-       pc = jumponcond(fs, e, 1);
-       break;
-
diff --git a/package/lua/lua-bug4-table.patch b/package/lua/lua-bug4-table.patch
deleted file mode 100644
index 9ffc1bb288..0000000000
--- a/package/lua/lua-bug4-table.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lua-5.1.4.orig/src/lvm.c	2007/12/28 15:32:23	2.63.1.3
-+++ lua-5.1.4/src/lvm.c	2009/07/01 20:36:59
-@@ -133,6 +133,7 @@
- 
- void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-   int loop;
-+  TValue temp;
-   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-     const TValue *tm;
-     if (ttistable(t)) {  /* `t' is a table? */
-@@ -152,7 +153,9 @@
-       callTM(L, tm, t, key, val);
-       return;
-     }
--    t = tm;  /* else repeat with `tm' */ 
-+    /* else repeat with `tm' */
-+    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
-+    t = &temp;
-   }
-   luaG_runerror(L, "loop in settable");
- }
-
diff --git a/package/lua/lua-bug5-debug_getfenv.patch b/package/lua/lua-bug5-debug_getfenv.patch
deleted file mode 100644
index fce4d47db8..0000000000
--- a/package/lua/lua-bug5-debug_getfenv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lua-5.1.4.orig/src/ldblib.c	2007/12/28 15:32:23	2.63.1.3
-+++ lua-5.1.4/src/ldblib.c	2010/02/23 12:36:59
-@@ -45,6 +45,7 @@
- 
- 
- static int db_getfenv (lua_State *L) {
-+  luaL_checkany(L, 1);
-   lua_getfenv(L, 1);
-   return 1;
- }
diff --git a/package/lua/lua-bug6-gc_performance.patch b/package/lua/lua-bug6-gc_performance.patch
deleted file mode 100644
index 3c78525b0b..0000000000
--- a/package/lua/lua-bug6-gc_performance.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lua-5.1.4.orig/src/llex.c	2007/12/28 15:32:23	2.63.1.3
-+++ lua-5.1.4/src/llex.c	2010/02/23 12:36:59
-@@ -118,8 +118,10 @@
-   lua_State *L = ls->L;
-   TString *ts = luaS_newlstr(L, str, l);
-   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
--  if (ttisnil(o))
-+  if (ttisnil(o)) {
-     setbvalue(o, 1);  /* make sure `str' will not be collected */
-+    luaC_checkGC(L);
-+  }
-   return ts;
- }
- 
diff --git a/package/lua/lua-bug7-string_format.patch b/package/lua/lua-bug7-string_format.patch
deleted file mode 100644
index 68f31977fb..0000000000
--- a/package/lua/lua-bug7-string_format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lua-5.1.4.orig/src/lstrlib.c	2008/07/11 17:27:21	1.132.1.4
-+++ lua-5.1.4/src/lstrlib.c	2010/05/14 15:12:53
-@@ -754,6 +754,7 @@
- 
- 
- static int str_format (lua_State *L) {
-+  int top = lua_gettop(L);
-   int arg = 1;
-   size_t sfl;
-   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-@@ -768,7 +769,8 @@
-     else { /* format item */
-       char form[MAX_FORMAT];  /* to store the format (`%...') */
-       char buff[MAX_ITEM];  /* to store the formatted item */
--      arg++;
-+      if (++arg > top)
-+        luaL_argerror(L, arg, "no value");
-       strfrmt = scanformat(L, strfrmt, form);
-       switch (*strfrmt++) {
-         case 'c': {
diff --git a/package/lua/lua-bug8-io_read.patch b/package/lua/lua-bug8-io_read.patch
deleted file mode 100644
index fb56bcf317..0000000000
--- a/package/lua/lua-bug8-io_read.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lua-5.1.4.orig/src/liolib.c	2008/01/18 17:47:43	2.73.1.3
-+++ lua-5.1.4.orig/src/liolib.c	2010/05/14 15:29:29
-@@ -276,7 +276,10 @@
-     lua_pushnumber(L, d);
-     return 1;
-   }
--  else return 0;  /* read fails */
-+  else {
-+    lua_pushnil(L);  /* "result" to be removed */
-+    return 0;  /* read fails */
-+  }
- }
- 
- 
diff --git a/package/lua/lua-root-path.patch b/package/lua/lua-root-path.patch
index a00b99e26e..c31cb2c28f 100644
--- a/package/lua/lua-root-path.patch
+++ b/package/lua/lua-root-path.patch
@@ -1,6 +1,7 @@
-diff -Naur lua-5.1.4.org/src/luaconf.h lua-5.1.4/src/luaconf.h
---- lua-5.1.4.org/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
-+++ lua-5.1.4/src/luaconf.h	2009-11-24 23:19:15.052817379 +0100
+Index: b/src/luaconf.h
+===================================================================
+--- a/src/luaconf.h
++++ b/src/luaconf.h
 @@ -94,9 +94,9 @@
  	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
  
@@ -14,4 +15,3 @@ diff -Naur lua-5.1.4.org/src/luaconf.h lua-5.1.4/src/luaconf.h
  #define LUA_PATH_DEFAULT  \
  		"./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
  		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
-
diff --git a/package/lua/lua-shared-libs.patch b/package/lua/lua-shared-libs.patch
index d24015c5de..6bca7f2790 100644
--- a/package/lua/lua-shared-libs.patch
+++ b/package/lua/lua-shared-libs.patch
@@ -1,6 +1,7 @@
-diff -Naur lua-5.1.4.org/Makefile lua-5.1.4/Makefile
---- lua-5.1.4.org/Makefile	2009-11-24 23:49:28.232820455 +0100
-+++ lua-5.1.4/Makefile	2009-11-24 23:50:35.452817115 +0100
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
 @@ -43,7 +43,7 @@
  # What to install.
  TO_BIN= lua luac
@@ -18,9 +19,10 @@ diff -Naur lua-5.1.4.org/Makefile lua-5.1.4/Makefile
  	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
  
  ranlib:
-diff -Naur lua-5.1.4.org/src/ldo.h lua-5.1.4/src/ldo.h
---- lua-5.1.4.org/src/ldo.h	2009-11-24 23:49:28.232820455 +0100
-+++ lua-5.1.4/src/ldo.h	2009-11-24 23:49:54.244818140 +0100
+Index: b/src/ldo.h
+===================================================================
+--- a/src/ldo.h
++++ b/src/ldo.h
 @@ -46,7 +46,7 @@
  LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
  LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
@@ -30,9 +32,10 @@ diff -Naur lua-5.1.4.org/src/ldo.h lua-5.1.4/src/ldo.h
  
  LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
  LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
-diff -Naur lua-5.1.4.org/src/lfunc.h lua-5.1.4/src/lfunc.h
---- lua-5.1.4.org/src/lfunc.h	2009-11-24 23:49:28.236815431 +0100
-+++ lua-5.1.4/src/lfunc.h	2009-11-24 23:49:54.244818140 +0100
+Index: b/src/lfunc.h
+===================================================================
+--- a/src/lfunc.h
++++ b/src/lfunc.h
 @@ -18,7 +18,7 @@
                           cast(int, sizeof(TValue *)*((n)-1)))
  
@@ -42,9 +45,10 @@ diff -Naur lua-5.1.4.org/src/lfunc.h lua-5.1.4/src/lfunc.h
  LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
  LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
  LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
-diff -Naur lua-5.1.4.org/src/lmem.h lua-5.1.4/src/lmem.h
---- lua-5.1.4.org/src/lmem.h	2009-11-24 23:49:28.236815431 +0100
-+++ lua-5.1.4/src/lmem.h	2009-11-24 23:49:54.244818140 +0100
+Index: b/src/lmem.h
+===================================================================
+--- a/src/lmem.h
++++ b/src/lmem.h
 @@ -38,9 +38,9 @@
     ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
  
@@ -57,9 +61,10 @@ diff -Naur lua-5.1.4.org/src/lmem.h lua-5.1.4/src/lmem.h
  LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
                                 size_t size_elem, int limit,
                                 const char *errormsg);
-diff -Naur lua-5.1.4.org/src/lstring.h lua-5.1.4/src/lstring.h
---- lua-5.1.4.org/src/lstring.h	2009-11-24 23:49:28.236815431 +0100
-+++ lua-5.1.4/src/lstring.h	2009-11-24 23:49:54.244818140 +0100
+Index: b/src/lstring.h
+===================================================================
+--- a/src/lstring.h
++++ b/src/lstring.h
 @@ -25,7 +25,7 @@
  
  LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
@@ -69,9 +74,10 @@ diff -Naur lua-5.1.4.org/src/lstring.h lua-5.1.4/src/lstring.h
  
  
  #endif
-diff -Naur lua-5.1.4.org/src/lundump.h lua-5.1.4/src/lundump.h
---- lua-5.1.4.org/src/lundump.h	2009-11-24 23:49:28.232820455 +0100
-+++ lua-5.1.4/src/lundump.h	2009-11-24 23:49:54.244818140 +0100
+Index: b/src/lundump.h
+===================================================================
+--- a/src/lundump.h
++++ b/src/lundump.h
 @@ -17,7 +17,7 @@
  LUAI_FUNC void luaU_header (char* h);
  
@@ -81,9 +87,10 @@ diff -Naur lua-5.1.4.org/src/lundump.h lua-5.1.4/src/lundump.h
  
  #ifdef luac_c
  /* print one chunk; from print.c */
-diff -Naur lua-5.1.4.org/src/Makefile lua-5.1.4/src/Makefile
---- lua-5.1.4.org/src/Makefile	2009-11-24 23:49:28.236815431 +0100
-+++ lua-5.1.4/src/Makefile	2009-11-24 23:49:54.244818140 +0100
+Index: b/src/Makefile
+===================================================================
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -23,6 +23,7 @@
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
@@ -114,22 +121,20 @@ diff -Naur lua-5.1.4.org/src/Makefile lua-5.1.4/src/Makefile
 +so:	$(ALL_SO)
 +
  $(LUA_A): $(CORE_O) $(LIB_O)
- 	$(AR) $@ $?
+ 	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
  	$(RANLIB) $@
  
--$(LUA_T): $(LUA_O) $(LUA_A)
--	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 +$(LUA_SO): $(CORE_O) $(LIB_O)
 +	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
 +	ln -fs $@.$(PKG_VERSION) $@
 +
-+$(LUA_T): $(LUA_O) $(LUA_SO)
-+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
-+
-+$(LUAC_T): $(LUAC_O) $(LUA_SO)
-+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
+ $(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
  
--$(LUAC_T): $(LUAC_O) $(LUA_A)
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
++	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++
 +$(LUAC_T)-host: $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
  
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index aa0b4bf3cc..baa459cd52 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUA_VERSION = 5.1.4
+LUA_VERSION = 5.1.5
 LUA_SITE = http://www.lua.org/ftp
 LUA_INSTALL_STAGING = YES
 

From 8dfbaf20f546024acb8a03a82e676c7547c64ae6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 21:40:04 +0200
Subject: [PATCH 2287/6849] linux: clarify the BR2_LINUX_KERNEL_DEFCONFIG help
 text

The help text of BR2_LINUX_KERNEL_DEFCONFIG is confusing: it seems to
point to the defconfigs in the buildroot tree.  So explicitly refer to
the kernel tree in the help text.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9c2643906f..c969be6286 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -115,8 +115,9 @@ config BR2_LINUX_KERNEL_DEFCONFIG
 	string "Defconfig name"
 	depends on BR2_LINUX_KERNEL_USE_DEFCONFIG
 	help
-	 Name of the defconfig file to use, without the trailing
-	 _defconfig
+	 Name of the kernel defconfig file to use, without the
+	 trailing _defconfig.  The defconfig is located in
+	 arch/<arch>/configs in the kernel tree.
 
 config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	string "Configuration file path"

From 9308ac18687c016f654598ac55b15a9957562956 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 14 Jul 2012 09:28:24 -0300
Subject: [PATCH 2288/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index c14717fc76..ac16c7fdda 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -66,7 +66,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.36"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.22"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.23"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.4"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP

From b6ebb7fd1bd778709c3acb10b96a43e6bd863dae Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 14 Jul 2012 09:28:37 -0300
Subject: [PATCH 2289/6849] toolchain/mips: kill EABI and fix N32

MIPS EABI is a bare-metal ABI so remove it.
Also fix uClibc to really work with N32 ABI, which used the EABI knob
previously.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch      | 3 ---
 toolchain/uClibc/uclibc.mk | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index c9bbc12774..bad0f4caf8 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -280,9 +280,6 @@ config BR2_MIPS_OABI32
 config BR2_MIPS_ABI32
 	bool "n32"
 	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
-config BR2_MIPS_EABI
-	bool "eabi"
-	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_ABI64
 	bool "n64"
 	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index f40fe365b0..9d0b6db94a 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -158,7 +158,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips)
 ifeq ($(BR2_MIPS_OABI),y)
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_MIPS_EABI),y)
+ifeq ($(BR2_MIPS_ABI32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(BR2_MIPS_ABI64),y)

From 99dd58418daee463074d7fd38d6ea98aca97d304 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 23:03:28 +0200
Subject: [PATCH 2290/6849] dependencies.sh: suppress output of locale

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/dependencies/dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index c47ffcf43c..9f0f6a9fb5 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -153,7 +153,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
        /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n"
        exit 1 ;
    fi
-   if ! locale -a | grep -i utf8$ ; then
+   if ! locale -a | grep -q -i utf8$ ; then
        /bin/echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n"
        exit 1 ;
    fi

From cbf1691ef48f8a87587713f981054c9fef22e2c4 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 22:31:19 +0200
Subject: [PATCH 2291/6849] pkg-infra: remove self-dependency from host
 packages

When HOST_XXX_DEPENDENCIES are derived automatically from
XXX_DEPENDENCIES, a self-dependency is created if host-xxx is a dependency
of xxx.  This was the case for miniperl.

Filter out the self-dependency.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-autotargets.mk  | 2 +-
 package/pkg-cmaketargets.mk | 2 +-
 package/pkg-gentargets.mk   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/pkg-autotargets.mk b/package/pkg-autotargets.mk
index c9887c2e1f..d31230dd7d 100644
--- a/package/pkg-autotargets.mk
+++ b/package/pkg-autotargets.mk
@@ -201,7 +201,7 @@ endef
 # This must be repeated from GENTARGETS_INNER, otherwise we get an empty
 # _DEPENDENCIES if _AUTORECONF is YES.  Also filter the result of _AUTORECONF
 # away from the non-host rule
-$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool,\
+$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool $(1),\
     $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
 
diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmaketargets.mk
index 371ab11c76..b405df5054 100644
--- a/package/pkg-cmaketargets.mk
+++ b/package/pkg-cmaketargets.mk
@@ -98,7 +98,7 @@ endif
 
 # This must be repeated from GENTARGETS_INNER, otherwise we only get
 # host-cmake in _DEPENDENCIES because of the following line
-$(2)_DEPENDENCIES ?= $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
+$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
 $(2)_DEPENDENCIES += host-cmake
 
diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk
index 1c9b458074..5da9cdc704 100644
--- a/package/pkg-gentargets.mk
+++ b/package/pkg-gentargets.mk
@@ -245,7 +245,7 @@ $(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
 endif
 endif
 
-$(2)_DEPENDENCIES ?= $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))
+$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO

From 6778e78001be1f134a0aa2aa8ab83f6c29dd66f6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 22:31:49 +0200
Subject: [PATCH 2292/6849] file: remove redundant HOST_FILE_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/file/file.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index c9846e437e..7f077528e6 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -7,7 +7,6 @@
 FILE_VERSION = 5.11
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
-HOST_FILE_DEPENDENCIES = host-zlib
 FILE_INSTALL_STAGING = YES
 
 define FILE_UNINSTALL_TARGET_CMDS

From feb96bb00d5cbda97900b525bba6cbd50b432f20 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 22:31:57 +0200
Subject: [PATCH 2293/6849] icu: remove redundant HOST_ICU_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/icu/icu.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index a2c24ca1e7..42416b7966 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -8,7 +8,6 @@ ICU_VERSION = 4.8.1.1
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_DEPENDENCIES = host-icu
-HOST_ICU_DEPENDENCIES =
 ICU_INSTALL_STAGING = YES
 ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
 		--disable-tests

From 8db1cb467eda44a9269d2a60ced90b064b5431ea Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 22:32:02 +0200
Subject: [PATCH 2294/6849] libcap: remove redundant HOST_LIBCAP_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libcap/libcap.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 4683121c51..9d6acf2e38 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -10,7 +10,6 @@ LIBCAP_VERSION = 2.22
 LIBCAP_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libc/libcap2
 LIBCAP_SOURCE = libcap2_$(LIBCAP_VERSION).orig.tar.gz
 LIBCAP_DEPENDENCIES = host-libcap
-HOST_LIBCAP_DEPENDENCIES =
 LIBCAP_INSTALL_STAGING = YES
 
 define LIBCAP_BUILD_CMDS

From 253a6880a3684696761c0233530626294c5a7dbf Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 22:32:06 +0200
Subject: [PATCH 2295/6849] ncurses: remove redundant HOST_NCURSES_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ncurses/ncurses.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index afeb41b838..adf18ffc5b 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -135,8 +135,6 @@ define HOST_NCURSES_BUILD_CMDS
 	$(MAKE) -C $(@D)/progs tic
 endef
 
-HOST_NCURSES_DEPENDENCIES =
-
 HOST_NCURSES_CONF_OPT = \
 	--without-shared --without-gpm
 

From 585a4b0aa6e964fd0dca39aef8feeb72b6bce39c Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 14 Jul 2012 22:32:11 +0200
Subject: [PATCH 2296/6849] orc: remove redundant HOST_ORC_DEPENDENCIES

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/orc/orc.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 6602e36cd5..97c80f29e9 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -7,7 +7,6 @@ ORC_VERSION = 0.4.14
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_INSTALL_STAGING = YES
 ORC_DEPENDENCIES = host-orc
-HOST_ORC_DEPENDENCIES =
 
 define ORC_REMOVE_BUGREPORT
 	rm -f $(TARGET_DIR)/usr/bin/orc-bugreport

From 23465b76b4325f1742a53b2e2fd3795c87aecbf0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Jul 2012 10:47:40 -0300
Subject: [PATCH 2297/6849] mpfr: bump to version 3.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/mpfr/mpfr-3.1.0-p6.patch | 673 -------------------------------
 package/mpfr/mpfr.mk             |   2 +-
 2 files changed, 1 insertion(+), 674 deletions(-)
 delete mode 100644 package/mpfr/mpfr-3.1.0-p6.patch

diff --git a/package/mpfr/mpfr-3.1.0-p6.patch b/package/mpfr/mpfr-3.1.0-p6.patch
deleted file mode 100644
index edb852f490..0000000000
--- a/package/mpfr/mpfr-3.1.0-p6.patch
+++ /dev/null
@@ -1,673 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
-@@ -0,0 +1 @@
-+gmp41compat
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p3
-+3.1.0-p4
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
---- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
-@@ -2994,11 +2994,12 @@
- 
-    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
-      behavior no longer depends on the platform (assuming this is also
--     true for GMP's random generator).  As a consequence, the returned
--     values can be different between MPFR 3.1 and previous MPFR
--     versions.  Note: as the reproducibility of these functions was not
--     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
--     as backward incompatible with previous versions.
-+     true for GMP's random generator, which is not the case between GMP
-+     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
-+     the returned values can be different between MPFR 3.1 and previous
-+     MPFR versions.  Note: as the reproducibility of these functions
-+     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
-+     regarded as backward incompatible with previous versions.
- 
- 
- 
-@@ -4239,13 +4240,13 @@
- Node: Type and Macro Changes129308
- Node: Added Functions132029
- Node: Changed Functions134972
--Node: Removed Functions139167
--Node: Other Changes139579
--Node: Contributors141108
--Node: References143574
--Node: GNU Free Documentation License145315
--Node: Concept Index167758
--Node: Function and Type Index173677
-+Node: Removed Functions139253
-+Node: Other Changes139665
-+Node: Contributors141194
-+Node: References143660
-+Node: GNU Free Documentation License145401
-+Node: Concept Index167844
-+Node: Function and Type Index173763
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
---- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
-@@ -3466,8 +3466,9 @@
- a lack of specification.
- 
- @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
--Their behavior no longer depends on the platform (assuming this is also
--true for GMP's random generator).  As a consequence, the returned values
-+Their behavior no longer depends on the platform (assuming this is also true
-+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
-+@code{gmp_randinit_default} is used).  As a consequence, the returned values
- can be different between MPFR 3.1 and previous MPFR versions.
- Note: as the reproducibility of these functions was not specified
- before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p3"
-+#define MPFR_VERSION_STRING "3.1.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p3";
-+  return "3.1.0-p4";
- }
-diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
---- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -114,21 +114,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.895943"
-+# define C2 "0.848824"
-+#else
-+# define C1 "0.479652"
-+# define C2 "0.648529"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.895943") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.895943, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.848824") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.848824, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
---- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -160,23 +160,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.8488312"
-+# define C2 "0.8156509"
-+#else
-+# define C1 "0.6485367"
-+# define C2 "0.9362717"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandom (x, s, MPFR_RNDN);
--  /* the following values are obtained on a 32-bit computer, we should get
--     the same values on a 64-bit computer */
--  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8488312, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandom (x, s, MPFR_RNDN);
--  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8156509, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
-@@ -0,0 +1 @@
-+logging-freeze
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p4
-+3.1.0-p5
-diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
---- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
---- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
-@@ -29,7 +29,7 @@
-   MPFR_LOG_FUNC
-     (("x[%Pu]=%.*Rg u=%d rnd=%d",
-       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
--     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
-+     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
- 
-   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
-     {
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p4"
-+#define MPFR_VERSION_STRING "3.1.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
---- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p4";
-+  return "3.1.0-p5";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
-@@ -0,0 +1 @@
-+logging-varfmt
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p5
-+3.1.0-p6
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-@@ -1592,7 +1592,7 @@
-   do                                                                    \
-     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
-         (mpfr_log_current <= mpfr_log_level))                           \
--      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
-+      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
-                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
-   while (0)
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p5"
-+#define MPFR_VERSION_STRING "3.1.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p5";
-+  return "3.1.0-p6";
- }
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index c3df7105d1..92195e7610 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPFR_VERSION = 3.1.0
+MPFR_VERSION = 3.1.1
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
 MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_INSTALL_STAGING = YES

From cfd9f83c1d8b0859e67b0064cf7bca919e9b22a0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Jul 2012 10:47:41 -0300
Subject: [PATCH 2298/6849] radvd: bump to version 1.9.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/radvd/Config.in                       |  1 +
 .../radvd-configure.ac-fix-bashism.patch      | 31 -------------------
 package/radvd/radvd.mk                        |  4 +--
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 package/radvd/radvd-configure.ac-fix-bashism.patch

diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index 20e7e55031..90c1fd4cfb 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_RADVD
 	bool "radvd"
 	select BR2_PACKAGE_FLEX
 	select BR2_PACKAGE_FLEX_LIBFL
+	select BR2_PACKAGE_LIBDAEMON
 	depends on BR2_INET_IPV6
 	help
 	  IPv6 Router Advertisement Daemon.
diff --git a/package/radvd/radvd-configure.ac-fix-bashism.patch b/package/radvd/radvd-configure.ac-fix-bashism.patch
deleted file mode 100644
index a635cf8d6b..0000000000
--- a/package/radvd/radvd-configure.ac-fix-bashism.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ce34738107678cb76e3da34cd16dc9a34d8dd242 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 18 Jun 2012 23:12:05 +0200
-Subject: [PATCH] configure.ac: fix bashism
-
-'==' is a bashism, breaking configure on systems where /bin/sh isn't bash
-(E.G. Ubuntu).  Fixes:
-
-http://autobuild.buildroot.net/results/c3d0d04f8b3df63b3206cecf54dfdd67a4c7ccfb/build-end.log
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3ab6667..c3b907b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -176,7 +176,7 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS(getopt_long)
- 
- CONDITIONAL_SOURCES="device-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}"
--if test x${arch} == xlinux ; then
-+if test x${arch} = xlinux ; then
- 	CONDITIONAL_SOURCES="privsep-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}"
- 	AC_DEFINE(USE_PRIVSEP, 1, [Use privsep])
- fi
--- 
-1.7.10
-
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 474a299256..3471f9d6ca 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-RADVD_VERSION = 1.8.5
+RADVD_VERSION = 1.9.1
 RADVD_SITE = http://www.litech.org/radvd/dist
-RADVD_DEPENDENCIES = flex host-flex
+RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkg-config
 RADVD_AUTORECONF = YES
 
 define RADVD_INSTALL_INITSCRIPT

From 82f83c6122837acd4daed5649ad4ccb8fec42e83 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Jul 2012 10:47:42 -0300
Subject: [PATCH 2299/6849] freetype: bump to version 2.4.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index ded10d2e9d..f351fd2674 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FREETYPE_VERSION = 2.4.9
+FREETYPE_VERSION = 2.4.10
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES

From ff20c2e0dcad467d9f07dca1203f8ba61652fb48 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Jul 2012 10:47:43 -0300
Subject: [PATCH 2300/6849] ipset: bump to version 6.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 3cd1263e45..37994f51b6 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.12.1
+IPSET_VERSION = 6.13
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkg-config

From b9c3890cdd22f168bdc3cb52926d51ba2a2b61b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Jul 2012 10:47:44 -0300
Subject: [PATCH 2301/6849] cifs-utils: bump to version 5.5

Bump cifs-utils to version 5.5
Also switch to http source instead of ftp.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cifs-utils/cifs-utils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index 0fdb689b2e..15ed17acfb 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,6 +1,6 @@
-CIFS_UTILS_VERSION = 5.4
+CIFS_UTILS_VERSION = 5.5
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
-CIFS_UTILS_SITE    = ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
+CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
 
 define CIFS_UTILS_NO_WERROR
 	$(SED) 's/-Werror//' $(@D)/Makefile.in

From 2e163bcb2aaa498b4afdc0ce5a91dac443692a69 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Jul 2012 10:47:45 -0300
Subject: [PATCH 2302/6849] grep: bump to version 2.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/grep/grep.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 389aa3b78c..31ccaa6e81 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GREP_VERSION = 2.12
+GREP_VERSION = 2.13
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex

From 7fed07d3a4a83dc64eaa0c31369ee0fbae2aa9d0 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 16 Jul 2012 23:37:26 +0200
Subject: [PATCH 2303/6849] target: add symbols for i386/x86_64 cpu features

Selecting the target subarchitecture variant automatically selects the
appropriated set of features.

[thomas.petazzoni@free-electrons.com:
  removed depends on inside hidden options, not needed.
  removed SSE41/SSE42 options, not used.]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch | 88 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index bad0f4caf8..64c6deabb4 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -322,6 +322,19 @@ endchoice
 # gcc builds libstdc++ differently depending on the
 # host tuplet given to it, so let people choose
 #
+
+# i386/x86_64 cpu features
+config BR2_X86_CPU_HAS_MMX
+	bool
+config BR2_X86_CPU_HAS_SSE
+	bool
+config BR2_X86_CPU_HAS_SSE2
+	bool
+config BR2_X86_CPU_HAS_SSE3
+	bool
+config BR2_X86_CPU_HAS_SSSE3
+	bool
+
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_i386
@@ -341,46 +354,95 @@ config BR2_x86_pentiumpro
 	bool "pentium pro"
 config BR2_x86_pentium_mmx
 	bool "pentium MMX"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium_m
 	bool "pentium mobile"
 config BR2_x86_pentium2
 	bool "pentium2"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium3
 	bool "pentium3"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
 config BR2_x86_pentium4
 	bool "pentium4"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
 config BR2_x86_prescott
 	bool "prescott"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_nocona
 	bool "nocona"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_core2
 	bool "core2"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
 config BR2_x86_atom
 	bool "atom"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
 config BR2_x86_k6
 	bool "k6"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_k6_2
 	bool "k6-2"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon
 	bool "athlon"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon_4
 	bool "athlon-4"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
 config BR2_x86_opteron
 	bool "opteron"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
 config BR2_x86_opteron_sse3
 	bool "opteron w/ SSE3"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_barcelona
 	bool "barcelona"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_geode
 	bool "geode"
+	# Don't include MMX support because there several variant of geode
+	# processor, some with MMX support, some without.
+	# See: http://en.wikipedia.org/wiki/Geode_%28processor%29
 config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_c32
 	bool "Via C3-2 (Nehemiah cores)"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
 config BR2_x86_winchip_c6
 	bool "IDT Winchip C6"
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_winchip2
 	bool "IDT Winchip 2"
+	select BR2_X86_CPU_HAS_MMX
 endchoice
 
 choice
@@ -394,16 +456,42 @@ config BR2_x86_64_generic
 	bool "generic"
 config BR2_x86_64_barcelona
 	bool "barcelona"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_3DNOW
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_64_opteron_sse3
 	bool "opteron w/ sse3"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_64_opteron
 	bool "opteron"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
 config BR2_x86_64_nocona
 	bool "nocona"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
 config BR2_x86_64_core2
 	bool "core2"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
 config BR2_x86_64_atom
 	bool "atom"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
 endchoice
 
 choice

From 8d74cc7b88761bbfdfe88becebc27be95bde41a2 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 16 Jul 2012 23:37:27 +0200
Subject: [PATCH 2304/6849] libevas: refactor *_CONF_OPT assignment with
 cpu-feature options

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libevas/libevas.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index e716cea566..c5569427e3 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -115,23 +115,23 @@ LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
 endif
 
 # code options
-ifeq ($(BR2_i386)$(BR2_x86_64),y)
-# defaults
-LIBEVAS_CONF_OPT += --disable-cpu-mmx --disable-cpu-sse --disable-cpu-sse3
-
-# enable if cpu variant has mmx support
-ifneq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
+ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 LIBEVAS_CONF_OPT += --enable-cpu-mmx
+else
+LIBEVAS_CONF_OPT += --disable-cpu-mmx
+endif
 
-ifneq ($(BR2_x86_pentium_mmx)$(BR2_x86_pentium2)$(BR2_x86_k6)$(BR2_x86_k6_2)$(BR2_x86_athlon)$(BR2_x86_c3)$(BR2_x86_winchip_c6)$(BR2_x86_winchip2),y)
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
 LIBEVAS_CONF_OPT += --enable-cpu-sse
+else
+LIBEVAS_CONF_OPT += --disable-cpu-sse
+endif
 
-ifneq ($(BR2_x86_pentium3)$(BR2_x86_pentium4)$(BR2_x86_prescott)$(BR2_x86_athlon_4)$(BR2_x86_opteron)$(BR2_x86_c32)$(BR2_x86_64_opteron),y)
+ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
 LIBEVAS_CONF_OPT += --enable-cpu-sse3
-endif # sse3
-endif # sse
-endif # mmx
-endif # x86
+else
+LIBEVAS_CONF_OPT += --disable-cpu-sse3
+endif
 
 ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)
 LIBEVAS_CONF_OPT += --enable-cpu-altivec

From 4c044a2d3830d20d26efcd53407a76a050a04d93 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 16 Jul 2012 23:37:28 +0200
Subject: [PATCH 2305/6849] sdl_gfx: refactor *_CONF_OPT assignment with
 cpu-feature options

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sdl_gfx/sdl_gfx.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index 5503bbd1d6..343c7a1e92 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -11,13 +11,7 @@ SDL_GFX_DEPENDENCIES = sdl
 SDL_GFX_CONF_OPT = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
-	--enable-static
-
-# enable mmx for newer x86's
-ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
-SDL_GFX_CONF_OPT += --enable-mmx
-else
-SDL_GFX_CONF_OPT += --disable-mmx
-endif
+	--enable-static \
+	$(if $(BR2_X86_CPU_HAS_MMX),--enable-mmx,--disable-mmx)
 
 $(eval $(call AUTOTARGETS))

From cae0947b053bec39508c3c2e922ddcbd1f512225 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 16 Jul 2012 23:37:29 +0200
Subject: [PATCH 2306/6849] sdl_sound: refactor *_CONF_OPT assignment with
 cpu-feature options

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sdl_sound/sdl_sound.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index a5d9a26d56..620b3b4692 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -32,8 +32,7 @@ SDL_SOUND_CONF_OPT = \
 	--disable-sdltest \
 	--enable-static
 
-# enable mmx for newer x86's
-ifeq ($(BR2_i386)$(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y)
+ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 SDL_SOUND_CONF_OPT += --enable-mmx
 else
 SDL_SOUND_CONF_OPT += --disable-mmx

From 0ff3d3d4710387fdf15ce8d129cda29eef16f8e3 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 16 Jul 2012 23:37:30 +0200
Subject: [PATCH 2307/6849] opencv: bump to version 2.4.2

Update Config.in and .mk according to the new features.

Remove the patch handling build with uclibc without long double support,
which seems not necessary anymore.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/opencv/Config.in                      | 155 +++++++++++++++---
 ...-uclibc-optional-long-double-support.patch |  40 -----
 package/opencv/opencv.mk                      | 144 +++++++++++-----
 3 files changed, 238 insertions(+), 101 deletions(-)
 delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 961282f5e7..3e9ead6256 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_OPENCV
+menuconfig BR2_PACKAGE_OPENCV
 	bool "opencv"
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -11,28 +11,124 @@ config BR2_PACKAGE_OPENCV
 
 if BR2_PACKAGE_OPENCV
 
-config BR2_PACKAGE_OPENCV_BUILD_TESTS
-	bool "build tests"
+comment "OpenCV modules"
 
-config BR2_PACKAGE_OPENCV_INSTALL_DATA
-	bool "install extra data"
+config BR2_PACKAGE_OPENCV_LIB_CALIB3D
+	bool "calib3d"
+	default y
 	help
-	  Install various data that is used by cv libraries and/or demo
-	  applications, specifically for haarcascades and lbpcascades
-	  features.
+	  Include opencv_calib3d module into the OpenCV build.
 
-	  For further information: see OpenCV documentation.
+config BR2_PACKAGE_OPENCV_LIB_CONTRIB
+	bool "contrib"
+	default y
+	help
+	  Include opencv_contrib module into the OpenCV build.
 
-comment "Build options"
+config BR2_PACKAGE_OPENCV_LIB_CORE
+	bool "core"
+	default y
+	help
+	  Include opencv_core module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_FEATURES2D
+	bool "features2d"
+	default y
+	help
+	  Include opencv_features2d module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_FLANN
+	bool "flann"
+	default y
+	help
+	  Include opencv_flann module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_GPU
+	bool "gpu"
+	help
+	  Include opencv_gpu module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_HIGHGUI
+	bool "highgui"
+	default y
+	help
+	  Include opencv_highgui module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_IMGPROC
+	bool "imgproc"
+	default y
+	help
+	  Include opencv_imgproc module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_LEGACY
+	bool "legacy"
+	default y
+	help
+	  Include opencv_legacy module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_ML
+	bool "ml (machine learning)"
+	default y
+	help
+	  Include opencv_ml module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_NONFREE
+	bool "nonfree"
+	help
+	  Include opencv_nonfree module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_OBJDETECT
+	bool "objdetect"
+	default y
+	help
+	  Include opencv_objdetect module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_PHOTO
+	bool "photo"
+	default y
+	help
+	  Include opencv_photo module into the OpenCV build.
 
-config BR2_PACKAGE_OPENCV_WITH_PYTHON
-	bool "python support"
-	depends on BR2_PACKAGE_PYTHON
+comment "opencv_python module requires numpy which is not yet available."
+
+config BR2_PACKAGE_OPENCV_LIB_STITCHING
+	bool "stitching"
+	default y
+	help
+	  Include opencv_stitching module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_TS
+	bool "ts (touchscreen)"
+	default y
+	help
+	  Include opencv_ts module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_VIDEO
+	bool "video"
+	default y
+	help
+	  Include opencv_video module into the OpenCV build.
+
+config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB
+	bool "videostab"
+	default y
+	help
+	  Include opencv_videostab module into the OpenCV build.
+
+comment "Test sets"
+config BR2_PACKAGE_OPENCV_BUILD_TESTS
+	bool "build tests"
+
+config BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS
+	bool "build performance tests"
+
+comment "3rd party support"
 
 config BR2_PACKAGE_OPENCV_WITH_FFMPEG
 	bool "ffmpeg support"
 	depends on BR2_LARGEFILE
 	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	help
@@ -43,18 +139,17 @@ comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
 
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
 	bool "gstreamer support"
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
 
 config BR2_PACKAGE_OPENCV_WITH_GTK
 	bool "gtk support"
-	depends on BR2_PACKAGE_LIBGTK2
-
-config BR2_PACKAGE_OPENCV_WITH_QT
-	bool "qt backend support"
-	depends on BR2_PACKAGE_QT
-	default y
+	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
+	depends on BR2_USE_WCHAR
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBGTK2
 
 config BR2_PACKAGE_OPENCV_WITH_JPEG
 	bool "jpeg support"
@@ -68,6 +163,15 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
 	help
 	  Use shared libpng from the target system.
 
+config BR2_PACKAGE_OPENCV_WITH_QT
+	bool "qt backend support"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT_STL
+	default y
+	help
+	  Use Qt with STL support
+
 config BR2_PACKAGE_OPENCV_WITH_TIFF
 	bool "tiff support"
 	select BR2_PACKAGE_TIFF
@@ -84,7 +188,18 @@ config BR2_PACKAGE_OPENCV_WITH_V4L
 comment "v4l support requires a toolchain with LARGEFILE support"
 	depends on !BR2_LARGEFILE
 
+comment "Install options"
+
+config BR2_PACKAGE_OPENCV_INSTALL_DATA
+	bool "install extra data"
+	help
+	  Install various data that is used by cv libraries and/or demo
+	  applications, specifically for haarcascades and lbpcascades
+	  features.
+
+	  For further information: see OpenCV documentation.
+
 endif # BR2_PACKAGE_OPENCV
 
 comment "opencv requires a toolchain with C++ and WCHAR support"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+	depends on !(BR2_INSTALL_LIBSTDCPP  && BR2_USE_WCHAR)
diff --git a/package/opencv/opencv-uclibc-optional-long-double-support.patch b/package/opencv/opencv-uclibc-optional-long-double-support.patch
deleted file mode 100644
index b319849fb1..0000000000
--- a/package/opencv/opencv-uclibc-optional-long-double-support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream: https://code.ros.org/trac/opencv/ticket/1515
-
-[PATCH] Fix compile issue in flann module on uClibc without long double support
-
-uClibc configured without UCLIBC_HAS_LONG_DOUBLE_MATH (because of user
-choice or simply that the arch doesn't provide long doubles) doesn't
-provide fabsl(), breaking the build in the flann module.
-
-Work around it by not providing the long double template specialization.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- modules/flann/include/opencv2/flann/dist.h |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h
-===================================================================
---- opencv-2.3.1a.orig/modules/flann/include/opencv2/flann/dist.h
-+++ opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h
-@@ -40,6 +40,7 @@
- #else
- #include <stdint.h>
- #endif
-+#include <features.h>
- 
- #include "defines.h"
- 
-@@ -59,9 +60,11 @@
- template<>
- inline double abs<double>(double x) { return fabs(x); }
- 
-+/* uClibc configured without long double math doesn't provide fabsl */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__))
- template<>
- inline long double abs<long double>(long double x) { return fabsl(x); }
--
-+#endif
- 
- template<typename T>
- struct Accumulator { typedef T Type; };
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index ec9471518f..10ed5bd199 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -3,50 +3,112 @@
 # OpenCV (Open Source Computer Vision)
 #
 #############################################################
-OPENCV_VERSION = 2.3.1a
-OPENCV_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1
+OPENCV_VERSION = 2.4.2
+OPENCV_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION)
 OPENCV_SOURCE  = OpenCV-$(OPENCV_VERSION).tar.bz2
 OPENCV_INSTALL_STAGING = YES
 
-OPENCV_CONF_OPT = \
-	-DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \
-	-DBUILD_DOCS=$(if $(BR2_HAVE_DOCUMENTATION),ON,OFF) \
-	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_PACKAGE=OFF \
+OPENCV_CONF_OPT += \
+	-DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release)   \
+	-DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON)    \
+	-DBUILD_WITH_STATIC_CRT=OFF                                  \
+	-DBUILD_DOCS=$(if $(BR2_HAVE_DOCUMENTATION),ON,OFF)          \
+	-DBUILD_EXAMPLES=OFF                                         \
+	-DBUILD_PACKAGE=OFF                                          \
 	-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \
-	-DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \
-	-DINSTALL_C_EXAMPLES=OFF \
-	-DINSTALL_PYTHON_EXAMPLES=OFF \
-	-DOPENCV_BUILD_3RDPARTY_LIBS=OFF \
-	-DENABLE_PROFILING=OFF \
-	-DCMAKE_SKIP_RPATH=OFF \
-	-DUSE_FAST_MATH=ON \
-	-DUSE_OMIT_FRAME_POINTER=ON \
-	-DUSE_PRECOMPILED_HEADERS=OFF \
-	-DWITH_1394=OFF \
-	-DWITH_CUDA=OFF \
-	-DWITH_EIGEN=OFF \
-	-DWITH_IPP=OFF \
-	-DWITH_JASPER=OFF \
-	-DWITH_OPENEXR=OFF \
-	-DWITH_OPENNI=OFF \
-	-DWITH_PVAPI=OFF \
-	-DWITH_TBB=OFF \
-	-DWITH_UNICAP=OFF \
+	-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \
+	-DBUILD_WITH_DEBUG_INFO=OFF             \
+	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
+	-DCMAKE_SKIP_RPATH=OFF                  \
+	-DCMAKE_USE_RELATIVE_PATHS=OFF          \
+	-DENABLE_FAST_MATH=ON                   \
+	-DENABLE_NOISY_WARNINGS=OFF             \
+	-DENABLE_OMIT_FRAME_POINTER=ON          \
+	-DENABLE_PRECOMPILED_HEADERS=OFF        \
+	-DENABLE_PROFILING=OFF                  \
+	-DENABLE_SOLUTION_FOLDERS=OFF           \
+	-DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
+
+# OpenCV module selection
+OPENCV_CONF_OPT += \
+	-DBUILD_opencv_androidcamera=OFF                                        \
+	-DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF)   \
+	-DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF)   \
+	-DBUILD_opencv_core=$(if $(BR2_PACKAGE_OPENCV_LIB_CORE),ON,OFF)         \
+	-DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \
+	-DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF)       \
+	-DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF)           \
+	-DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF)   \
+	-DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF)   \
+	-DBUILD_opencv_java=OFF                                                 \
+	-DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF)     \
+	-DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF)             \
+	-DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF)   \
+	-DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \
+	-DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF)       \
+	-DBUILD_opencv_python=OFF                                               \
+	-DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \
+	-DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF)             \
+	-DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF)       \
+	-DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \
+	-DBUILD_opencv_world=OFF
+
+# Hardware support options.
+#
+# * PowerPC support is turned off since its only effect is altering CFLAGS,
+#   adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
+OPENCV_CONF_OPT += \
+	-DENABLE_POWERPC=OFF \
+	-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF)     \
+	-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF)   \
+	-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF)   \
+	-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE41),ON,OFF) \
+	-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
+	-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
+
+# Software/3rd-party support options.
+OPENCV_CONF_OPT += \
+	-DBUILD_JASPER=OFF \
+	-DBUILD_JPEG=OFF   \
+	-DBUILD_PNG=OFF	   \
+	-DBUILD_TIFF=OFF   \
+	-DBUILD_ZLIB=OFF   \
+	-DBUILD_ANDROID_CAMERA_WRAPPER=OFF \
+	-DBUILD_ANDROID_EXAMPLES=OFF	   \
+	-DBUILD_FAT_JAVA_LIB=OFF           \
+	-DBUILD_JAVA_SUPPORT=OFF	   \
+	-DBUILD_NEW_PYTHON_SUPPORT=OFF \
+	-DINSTALL_ANDROID_EXAMPLES=OFF \
+	-DINSTALL_C_EXAMPLES=OFF       \
+	-DINSTALL_PYTHON_EXAMPLES=OFF  \
+	-DINSTALL_TO_MANGLED_PATHS=OFF \
+	-DWITH_1394=OFF           \
+	-DWITH_ANDROID_CAMERA=OFF \
+	-DWITH_AVFOUNDATION=OFF	  \
+	-DWITH_CARBON=OFF         \
+	-DWITH_CUBLAS=OFF         \
+	-DWITH_CUDA=OFF           \
+	-DWITH_CUFFT=OFF          \
+	-DWITH_EIGEN=OFF          \
+	-DWITH_IMAGEIO=OFF        \
+	-DWITH_IPP=OFF            \
+	-DWITH_JASPER=OFF         \
+	-DWITH_OPENEXR=OFF        \
+	-DWITH_OPENGL=OFF         \
+	-DWITH_OPENNI=OFF         \
+	-DWITH_PVAPI=OFF          \
+	-DWITH_QUICKTIME=OFF      \
+	-DWITH_TBB=OFF            \
+	-DWITH_UNICAP=OFF         \
+	-DWITH_VIDEOINPUT=OFF     \
+	-DWITH_XIMEA=OFF          \
 	-DWITH_XINE=OFF
 
 OPENCV_DEPENDENCIES += zlib
 
-ifeq ($(BR2_PACKAGE_OPENCV_WITH_PYTHON),y)
-OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=ON
-OPENCV_DEPENDENCIES += python
-else
-OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y)
 OPENCV_CONF_OPT += -DWITH_FFMPEG=ON
-OPENCV_DEPENDENCIES += ffmpeg
+OPENCV_DEPENDENCIES += ffmpeg bzip2
 else
 OPENCV_CONF_OPT += -DWITH_FFMPEG=OFF
 endif
@@ -80,7 +142,7 @@ OPENCV_CONF_OPT += -DWITH_PNG=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y)
-OPENCV_CONF_OPT += -DWITH_QT=ON -DWITH_QT_OPENGL=OFF
+OPENCV_CONF_OPT += -DWITH_QT=ON
 OPENCV_DEPENDENCIES += qt
 else
 OPENCV_CONF_OPT += -DWITH_QT=OFF
@@ -100,25 +162,25 @@ else
 OPENCV_CONF_OPT += -DWITH_V4L=OFF
 endif
 
+# Installation hooks:
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 define OPENCV_CLEAN_INSTALL_DOC
-	$(RM) -fr $(TARGET_DIR)/usr/share/opencv/doc
+	$(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc
 endef
-
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC
 endif
 
-ifneq ($(BR2_PACKAGE_CMAKE),y)
+ifneq ($(BR2_HAVE_DEVFILES),y)
 define OPENCV_CLEAN_INSTALL_CMAKE
-	$(RM) -f $(TARGET_DIR)/usr/share/opencv/OpenCVConfig.cmake
+	$(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake
 endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE
 endif
 
 ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y)
 define OPENCV_CLEAN_INSTALL_DATA
-	$(RM) -fr $(TARGET_DIR)/usr/share/opencv/haarcascades \
-		$(TARGET_DIR)/usr/share/opencv/lbpcascades
+	$(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \
+		$(TARGET_DIR)/usr/share/OpenCV/lbpcascades
 endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DATA
 endif

From 8d19377d24b2b1d6ded278559c16252ec320bef6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Jul 2012 11:53:55 +0200
Subject: [PATCH 2308/6849] opencv: get rid of unused SSE41 and SSE42 options

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
---
 package/opencv/opencv.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 10ed5bd199..8ae2fd5808 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -62,8 +62,6 @@ OPENCV_CONF_OPT += \
 	-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF)     \
 	-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF)   \
 	-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF)   \
-	-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE41),ON,OFF) \
-	-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
 	-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
 
 # Software/3rd-party support options.

From 7e76f904d208e4ef0bf722583897d4044264f546 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:00 +0200
Subject: [PATCH 2309/6849] legal-info: infrastructure to collect
 legally-relevant material

This allows to automatically collect material that may be needed to comply with
the license of packages that Buildroot prepares for the target device.

The core of the implementation is made by the following parts:
 - in package/pkg-utils.mk some helper functions are defined for common actions
   such as generating a warning, producing info about a package etc;
 - in package/pkg-gentargets.mk, within the GENTARGETS framework, a new
   <PKG>-legal-info target produces all the info for a given package;
 - Makefile implements the top-level targets:
   - legal-info-prepare creates the output directory and produces legal info
     about Buildroot itself and the toolchain, which mostly means just warning
     the user that this is not implemented;
   - legal-info, the only target that is supposed to be used directly, depends
     on all of the above and finishes things by producing the README files from
     the various pieces.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile                                  | 42 ++++++++++++++--
 package/pkg-gentargets.mk                 | 61 +++++++++++++++++++++++
 package/pkg-utils.mk                      | 25 ++++++++++
 support/legal-info/README.header          | 24 +++++++++
 support/legal-info/README.warnings-header |  4 ++
 5 files changed, 153 insertions(+), 3 deletions(-)
 create mode 100644 support/legal-info/README.header
 create mode 100644 support/legal-info/README.warnings-header

diff --git a/Makefile b/Makefile
index b80477f7fc..d55b136a86 100644
--- a/Makefile
+++ b/Makefile
@@ -257,6 +257,14 @@ TARGET_DIR:=$(BASE_DIR)/target
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_SKELETON=$(TOPDIR)/fs/skeleton
 
+LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
+REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
+LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses
+LEGAL_MANIFEST_CSV=$(LEGAL_INFO_DIR)/manifest.csv
+LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt
+LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
+LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
+
 ifeq ($(BR2_CCACHE),y)
 CCACHE:=$(HOST_DIR)/usr/bin/ccache
 BUILDROOT_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
@@ -338,6 +346,9 @@ HOST_DEPS = $(sort $(foreach dep,\
 		$($(dep))))
 HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
 
+TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\
+		$(TARGETS) $(BASE_TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS))))
+
 # all targets depend on the crosscompiler and it's prerequisites
 $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
@@ -354,8 +365,9 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 
 .PHONY: all world dirs clean distclean source outputmakefile \
+	legal-info legal-info-prepare legal-info-clean \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
-	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
+	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
 	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
@@ -365,7 +377,7 @@ world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):
+$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
 	@mkdir -p $@
 
 $(STAGING_DIR):
@@ -498,6 +510,28 @@ source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)
 external-deps:
 	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u
 
+legal-info-clean:
+	@rm -fr $(LEGAL_INFO_DIR)
+
+legal-info-prepare: $(LEGAL_INFO_DIR)
+	@$(call MESSAGE,"Collecting legal info")
+	@$(call legal-license-file,buildroot,COPYING,COPYING)
+	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE)
+	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved)
+	@$(call legal-warning,the Buildroot source code has not been saved)
+	@$(call legal-warning,the toolchain has not been saved)
+	@cp $(CONFIG_DIR)/.config $(LEGAL_INFO_DIR)/buildroot.config
+
+legal-info: dirs legal-info-clean legal-info-prepare $(REDIST_SOURCES_DIR) \
+		$(TARGETS_LEGAL_INFO)
+	@cat support/legal-info/README.header >>$(LEGAL_REPORT)
+	@if [ -r $(LEGAL_WARNINGS) ]; then \
+		cat support/legal-info/README.warnings-header \
+			$(LEGAL_WARNINGS) >>$(LEGAL_REPORT); \
+		cat $(LEGAL_WARNINGS); fi
+	@echo "Legal info produced in $(LEGAL_INFO_DIR)"
+	@rm -f $(LEGAL_WARNINGS)
+
 show-targets:
 	@echo $(TARGETS)
 
@@ -619,7 +653,8 @@ endif
 
 clean:
 	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
-		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR) $(BASE_DIR)/staging
+		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR) $(BASE_DIR)/staging \
+		$(LEGAL_INFO_DIR)
 
 distclean: clean
 ifeq ($(DL_DIR),$(TOPDIR)/dl)
@@ -687,6 +722,7 @@ endif
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  source-check           - check selected packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
+	@echo '  legal-info             - generate info about license compliance'
 	@echo
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'
 	@echo '  make O=dir             - Locate all output files in "dir", including .config'
diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk
index 5da9cdc704..51053359ae 100644
--- a/package/pkg-gentargets.mk
+++ b/package/pkg-gentargets.mk
@@ -180,6 +180,7 @@ define GENTARGETS_INNER
 
 $(2)_TYPE                       =  $(5)
 $(2)_NAME			=  $(1)
+$(2)_RAWNAME			=  $(patsubst host-%,%,$(1))
 
 # Keep the package version that may contain forward slashes in the _DL_VERSION
 # variable, then replace all forward slashes ('/') by underscores ('_') to
@@ -245,6 +246,20 @@ $(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
 endif
 endif
 
+ifndef $(2)_LICENSE
+ ifdef $(3)_LICENSE
+  $(2)_LICENSE = $($(3)_LICENSE)
+ endif
+endif
+
+ifndef $(2)_LICENSE_FILES
+ ifdef $(3)_LICENSE_FILES
+  $(2)_LICENSE_FILES = $($(3)_LICENSE_FILES)
+ endif
+endif
+
+$(2)_LICENSE			?= unknown
+
 $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
 $(2)_INSTALL_STAGING		?= NO
@@ -412,6 +427,52 @@ else
 $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2)
 endif
 
+# legal-info: declare dependencies and set values used later for the manifest
+ifneq ($$($(2)_LICENSE),PROPRIETARY)
+ifneq ($$($(2)_SITE_METHOD),local)
+ifneq ($$($(2)_SITE_METHOD),override)
+# Packages that have a tarball need it downloaded and extracted beforehand
+$(1)-legal-info: $(1)-extract $(REDIST_SOURCES_DIR)
+$(2)_MANIFEST_TARBALL = $$($(2)_SOURCE)
+ifneq ($$($(2)_LICENSE_FILES),)
+$(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES)
+endif
+endif
+endif
+endif
+# defaults for packages without tarball or license files
+$(2)_MANIFEST_TARBALL ?= not saved
+$(2)_MANIFEST_LICENSE_FILES ?= not saved
+
+# legal-info: produce legally relevant info.
+$(1)-legal-info:
+# Packages without a source are assumed to be part of Buildroot, skip them.
+ifneq ($(call qstrip,$$($(2)_SOURCE)),)
+ifeq ($$($(2)_LICENSE),PROPRIETARY)
+# Proprietary packages: nothing to save
+else ifeq ($$($(2)_SITE_METHOD),local)
+# Packages without a tarball: don't save and warn
+	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
+else ifeq ($$($(2)_SITE_METHOD),override)
+	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
+else
+# Other packages
+# Save license files if defined
+ifeq ($(call qstrip,$$($(2)_LICENSE_FILES)),)
+	@$(call legal-license-nofiles,$$($(2)_RAWNAME))
+	@$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined))
+else
+	@for F in $$($(2)_LICENSE_FILES); do \
+		$(call legal-license-file,$$($(2)_RAWNAME),$$$${F},$$($(2)_DIR)/$$$${F}); \
+		done
+endif
+# Copy the source tarball (just hardlink if possible)
+	@cp -l $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR) 2>/dev/null || \
+	   cp $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR)
+endif
+	@$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL))
+endif # ifneq ($(call qstrip,$$($(2)_SOURCE)),)
+
 # add package to the general list of targets if requested by the buildroot
 # configuration
 ifeq ($$($$($(2)_KCONFIG_VAR)),y)
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 0c55a9d710..35abb17ce5 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -92,3 +92,28 @@ define sep
 
 
 endef
+
+#
+# legal-info helper functions
+#
+LEGAL_INFO_SEPARATOR="::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::"
+legal-warning=echo "WARNING: $(1)" >>$(LEGAL_WARNINGS)
+legal-warning-pkg=echo "WARNING: $(1): $(2)" >>$(LEGAL_WARNINGS)
+define legal-warning-pkg-savednothing # pkg, {local|override}
+	$(call legal-warning-pkg,$(1),sources and license files not saved ($(2) packages not handled))
+endef
+legal-manifest=echo "$(1),$(2),$(3),$(4),$(5)" >>$(LEGAL_MANIFEST_CSV)
+define legal-license-header
+	echo -e "$(LEGAL_INFO_SEPARATOR)\n\t$(1):" \
+		"$(2)\n$(LEGAL_INFO_SEPARATOR)\n\n" >>$(LEGAL_LICENSES_TXT)
+endef
+define legal-license-nofiles
+	$(call legal-license-header,$(1),unknown license file(s))
+endef
+define legal-license-file # pkg, filename, file-fullpath
+	$(call legal-license-header,$(1),$(2) file) && \
+	cat $(3) >>$(LEGAL_LICENSES_TXT) && \
+	echo >>$(LEGAL_LICENSES_TXT) && \
+	mkdir -p $(LICENSE_FILES_DIR)/$(1)/ && \
+	cp $(3) $(LICENSE_FILES_DIR)/$(1)/
+endef
diff --git a/support/legal-info/README.header b/support/legal-info/README.header
new file mode 100644
index 0000000000..3321adb7ed
--- /dev/null
+++ b/support/legal-info/README.header
@@ -0,0 +1,24 @@
+Most of the packages that were used by Buildroot to produce the image files,
+including Buildroot itself, have open-source licenses. It is your
+responsibility to comply to the requirements of these licenses.
+To make this easier for you, Buildroot collected in this directory some
+material you may need to get it done.
+
+This material is composed of the following items.
+ * The scripts used to control compilation of the packages and the generation
+   of image files, i.e. the Buildroot sources.
+   Note: this has not been saved due to technical limitations, you must
+   collect it manually.
+ * The Buildroot configuration file; this has been saved in buildroot.config.
+ * The toolchain (cross-compiler and related tools) used to generate all the
+   compiled programs.
+   Note: this has not been saved due to technical limitations, you must
+   collect it manually.
+ * The source code for all packages; this has been saved in the sources/
+   subdirectory (except for the proprietary packages, which have not been
+   saved); patches applied to some packages by Buildroot are included in the
+   Buildroot sources and were not duplicated in the sources/ subdirectory.
+ * A manifest file listing the configured packages and related information.
+ * The license text of the packages; they have been saved in the licenses/
+   subdirectory.
+
diff --git a/support/legal-info/README.warnings-header b/support/legal-info/README.warnings-header
new file mode 100644
index 0000000000..cd0829069c
--- /dev/null
+++ b/support/legal-info/README.warnings-header
@@ -0,0 +1,4 @@
+Due to technical limitations or lack of license definition in the package
+makefile, some of the material listed above could not been saved, as the
+following list details.
+

From 16bc6efeab3ccc44d9cfaaab4cbbd37e323952ff Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:01 +0200
Subject: [PATCH 2310/6849] gettext: warn that legal-info is not implemented

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gettext/gettext.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index f3605da6f5..97780073fc 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -113,6 +113,9 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY)
 		autopoint envsubst gettext.sh gettextize msg* ?gettext)
 	touch -c $@
 
+gettext-legal-info:
+	@$(call legal-warning-pkg,gettext,legal-info not yet implemented)
+
 gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 
 gettext-unpacked: $(GETTEXT_DIR)/.unpacked

From 1a6180021c4f93366e48e1c798746a32b42b4d39 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:02 +0200
Subject: [PATCH 2311/6849] netkitbase: warn that legal-info is not implemented

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/netkitbase/netkitbase.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 83991f2088..56480fc263 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -47,6 +47,9 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY
 	fi
 	touch -c $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
 
+netkitbase-legal-info:
+	@$(call legal-warning-pkg,netkitbase,legal-info not yet implemented)
+
 netkitbase: $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
 
 netkitbase-clean:

From f8c6e4883442a88744d98fc6f5ddca39fc3adfa3 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:03 +0200
Subject: [PATCH 2312/6849] netkittelnet: warn that legal-info is not
 implemented

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/netkittelnet/netkittelnet.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index ff05318726..43ba32406e 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -48,6 +48,9 @@ $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_
 	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 	# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
+netkittelnet-legal-info:
+	@$(call legal-warning-pkg,netkittelnet,legal-info not yet implemented)
+
 netkittelnet: netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
 
 netkittelnet-clean:

From 75672c122c20a2c041bb50650227b43fefa4e2ce Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:04 +0200
Subject: [PATCH 2313/6849] newt: warn that legal-info is not implemented

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/newt/newt.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index ac450e0c80..b10e4f8e2f 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -58,6 +58,9 @@ $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so*
 	touch -c $@
 
+newt-legal-info:
+	@$(call legal-warning-pkg,newt,legal-info not yet implemented)
+
 newt: slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION)
 
 newt-source: $(DL_DIR)/$(NEWT_SOURCE)

From bbd4e1ae6c79ad4a1df1eb97ab9fd54be93072bd Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:05 +0200
Subject: [PATCH 2314/6849] ttcp: warn that legal-info is not implemented

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ttcp/ttcp.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index 1acf12048a..080286bc6c 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -27,6 +27,9 @@ $(TTCP_DIR)/ttcp: $(TTCP_DIR)/.configured
 $(TARGET_DIR)/usr/bin/ttcp: $(TTCP_DIR)/ttcp
 	cp -af $(TTCP_DIR)/ttcp $(TARGET_DIR)/usr/bin/
 
+ttcp-legal-info:
+	@$(call legal-warning-pkg,ttcp,legal-info not yet implemented)
+
 ttcp: $(TARGET_DIR)/usr/bin/ttcp
 
 ttcp-source: $(DL_DIR)/$(TTCP_SOURCE)

From 86f7382a6c8d216658ae400dee93a4c45a7f5406 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:06 +0200
Subject: [PATCH 2315/6849] vpnc: warn that legal-info is not implemented

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/vpnc/vpnc.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index d8d9654a47..f585dc42cd 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -42,6 +42,9 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
 		-C $(VPNC_DIR) install
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
 
+vpnc-legal-info:
+	@$(call legal-warning-pkg,vpnc,legal-info not yet implemented)
+
 vpnc: libgcrypt $(VPNC_TARGET_BINARY)
 
 vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)

From 00ba118fcaa9ae398c138d7823b3acdea3bfb0bf Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:07 +0200
Subject: [PATCH 2316/6849] manual: document usage of the legal-info feature

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-gentargets.txt |  21 +++++
 docs/manual/using.txt                      | 103 +++++++++++++++++++++
 2 files changed, 124 insertions(+)

diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 84cf06bd2e..6e9dc89906 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -245,6 +245,27 @@ information is (assuming the package name is +libfoo+) :
   You can find some documentation for this syntax in the xref:makedev-syntax[].
   This variable is optional.
 
+* +LIBFOO_LICENSE+ defines the license (or licenses) under which the package
+  is released.
+  This name will appear in the manifest file produced by +make legal-info+.
+  If the license is one of those listed in xref:legal-info[],
+  use the same string to make the manifest file uniform.
+  Otherwise, describe the license in a precise and concise way, avoiding
+  ambiguous names such as +BSD+ which actually name a family of licenses.
+  If the root filesystem you generate contains non-opensource packages, you
+  can define their license as +PROPRIETARY+: Buildroot will not save any
+  licensing info or source code for this package.
+  This variable is optional. If it is not defined, +unknown+ will appear in
+  the +license+ field of the manifest file for this package.
+
+* +LIBFOO_LICENSE_FILES+ is a space-separated list of files in the package
+  tarball that contain the license(s) under which the package is released.
+  +make legal-info+ copies all of these files in the +legal-info+ directory.
+  See xref:legal-info[] for more information.
+  This variable is optional. If it is not defined, a warning will be produced
+  to let you know, and +not saved+ will appear in the +license files+ field
+  of the manifest file for this package.
+
 The recommended way to define these variables is to use the following
 syntax:
 
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index a5dc9e1aee..42d406120c 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -181,3 +181,106 @@ or +g+++ for building helper-binaries on your host, then do
 --------------------
  $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
 --------------------
+
+Complying with opensource licenses
+----------------------------------
+[[legal-info]]
+
+All of the end products of Buildroot (toolchain, root filesystem, kernel,
+bootloaders) contain opensource software, released under various licenses.
+
+Using opensource software gives you the freedom to build rich embedded
+systems choosing from a wide range of packages, but also gives some
+obligations that you must know and honour.
+Some licenses require you to publish the license text in the documentation of
+your product. Other require you to redistribute the source code of the
+software to those that receive your product.
+
+The exact requirements of each license is documented in each package, and it is
+your (or your legal office's) responsibility to comply with these requirements.
+To make this easier for you, Buildroot can collect for you some material you
+will probably need. To produce this material, after you configured Buildroot
+with +make menuconfig+, +make xconfig+ or +make gconfig+, run:
+
+--------------------
+make legal-info
+--------------------
+
+Buildroot will collect legally-relevant material in your output directory,
+under the +legal-info/+ subdirectory.
+There you will find:
+
+* A +README+ file, that summarizes the produced material and contains warnings
+  about material that Buildroot could not produce.
+* +buildroot.config+: this is the Buildroot configuration file that is usually
+  produced with +make menuconfig+, and which is necessary to reproduce the
+  build.
+* The source code for all packages; this is saved in the +sources/+
+  subdirectory (except for proprietary packages, whose source code is not
+  saved);
+  patches applied to some packages by Buildroot are distributed with the
+  Buildroot sources and are not duplicated in the +sources/+ subdirectory.
+* A manifest file listing the configured packages, their version, license and
+  related information.
+  Some of these information might be not defined in Buildroot; in this case
+  they are clearly marked as "unknown" or similar.
+* A +licenses/+ subdirectory, which contains the license text of packages.
+  If the license file(s) are not defined in Buildroot, the file is not produced
+  and a warning in the +README+ indicates this.
+
+Please note that the aim of the +legal-info+ feature of Buildroot is to
+produce all the material that is somehow relevant for legal compliance with the
+package licenses. Buildroot does not try to produce the exact material that
+you must somehow make public. It does surely produce some more material than is
+needed for a strict legal compliance. For example, it produces the source code
+for packages released under BSD-like licenses, that you might not want to
+redistribute in source form.
+
+Moreover, due to technical limitations, Buildroot does not produce some
+material that you will or may need, such as the toolchain source code and the
+Buildroot source code itself.
+When you run +make legal-info+, Buildroot produces warnings in the +README+
+file to inform you of relevant material that could not be saved.
+
+Here is a list of the licenses that are most widely used by packages in
+Buildroot, with the name used in the manifest file:
+
+* +GPLv2+:
+  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
+  GNU General Public License, version 2];
+* +GPLv2++:
+  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
+  GNU General Public License, version 2]
+  or (at your option) any later version;
+* +GPLv3+:
+  http://www.gnu.org/licenses/gpl.html[
+  GNU General Public License, version 3];
+* +GPLv3++:
+  http://www.gnu.org/licenses/gpl.html[
+  GNU General Public License, version 3]
+  or (at your option) any later version;
+* +GPL+:
+  http://www.gnu.org/licenses/gpl.html[
+  GNU General Public License] (any version);
+* +LGPLv2.1+:
+  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
+  GNU Lesser General Public License, version 2.1];
+* +LGPLv2.1++:
+  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
+  GNU Lesser General Public License, version 2.1]
+  or (at your option) any later version;
+* +LGPLv3+:
+  http://www.gnu.org/licenses/lgpl.html[
+  GNU Lesser General Public License, version 3];
+* +LGPLv3++:
+  http://www.gnu.org/licenses/lgpl.html[
+  GNU Lesser General Public License, version 3]
+  or (at your option) any later version;
+* +LGPL+:
+  http://www.gnu.org/licenses/lgpl.html[
+  GNU Lesser General Public License] (any version);
+* +BSD-4c+: Original BSD 4-clause license;
+* +BSD-3c+: BSD 3-clause license;
+* +BSD-2c+: BSD 2-clause license;
+* +PROPRIETARY+: marks a non-opensource package;
+  Buildroot does not save any licensing info or source code for these packages.

From 1bb7a8ee4b0d4c4d746329825f322dad3678d0eb Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:08 +0200
Subject: [PATCH 2317/6849] manual: add advice about GPL compliance for
 Buildroot

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/using.txt | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 42d406120c..fcbd24b850 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -284,3 +284,30 @@ Buildroot, with the name used in the manifest file:
 * +BSD-2c+: BSD 2-clause license;
 * +PROPRIETARY+: marks a non-opensource package;
   Buildroot does not save any licensing info or source code for these packages.
+
+Complying with the Buildroot license
+------------------------------------
+
+Buildroot itself is an opensource software, released under the
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU General Public
+License, version 2] or (at your option) any later version.
+However, being a build system, it is not normally part of the end product:
+if you develop the root filesystem, kernel, bootloader or toolchain for a
+device, the code of Buildroot is only present on the development machine, not
+in the device storage.
+
+Nevertheless, the general view of the Buildroot developers is that you should
+release the Buildroot source code along with the source code of other packages
+when releasing a product that contains GPL-licensed software.
+This is because the
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU GPL]
+defines the "'complete source code'" for an executable work as "'all the
+source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable'".
+Buildroot is part of the 'scripts used to control compilation and
+installation of the executable', and as such it is considered part of the
+material that must be redistributed.
+
+Keep in mind this is only the Buildroot developers' opinion, and you should
+consult your legal department or lawyer in case of any doubt.

From 67f1836d27a144d3934706a34aa5b866d41096cd Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:09 +0200
Subject: [PATCH 2318/6849] linux: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index f165dda50c..bd3e23e5ee 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -4,6 +4,8 @@
 #
 ###############################################################################
 LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+LINUX_LICENSE = GPLv2
+LINUX_LICENSE_FILES = COPYING
 
 # Compute LINUX_SOURCE and LINUX_SITE from the configuration
 ifeq ($(LINUX_VERSION),custom)

From 6f6d7677fd51ae2d1b69a6d8feb1d4f3dab2b237 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:10 +0200
Subject: [PATCH 2319/6849] m4: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/m4/m4.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index 173bba85c5..1e891c50f7 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -7,6 +7,8 @@
 M4_VERSION = 1.4.16
 M4_SOURCE = m4-$(M4_VERSION).tar.bz2
 M4_SITE = $(BR2_GNU_MIRROR)/m4
+M4_LICENSE = GPLv3+
+M4_LICENSE_FILES = COPYING
 M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
 
 ifneq ($(BR2_USE_WCHAR),y)

From bd9135e72ad83b752fd3d93a96076d0879ed9e9b Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:11 +0200
Subject: [PATCH 2320/6849] mpc: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/mpc/mpc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index e5ee4896f5..5ad47a9cdd 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -6,6 +6,8 @@
 
 MPC_VERSION = 0.9
 MPC_SITE = http://www.multiprecision.org/mpc/download
+MPC_LICENSE = LGPLv2.1+
+MPC_LICENSE_FILES = COPYING.LIB
 MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
 MPC_AUTORECONF = YES

From 3a1ea37e856f4bffd6e76b95533b0e0cc571c70f Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:12 +0200
Subject: [PATCH 2321/6849] fakeroot: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/fakeroot/fakeroot.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 64203b8db5..a9074cba4d 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -6,5 +6,7 @@
 FAKEROOT_VERSION = 1.18.2
 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
 FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20111201T093630Z/pool/main/f/fakeroot/
+FAKEROOT_LICENSE = GPLv3+
+FAKEROOT_LICENSE_FILES = COPYING
 
 $(eval $(call AUTOTARGETS,host))

From dc184a11445fb0f1959a04ff5d3dcab345d3bed5 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:13 +0200
Subject: [PATCH 2322/6849] bzip2: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bzip2/bzip2.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 59c993e61d..07a26c054e 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -7,6 +7,8 @@
 BZIP2_VERSION = 1.0.6
 BZIP2_SITE = http://www.bzip.org/$(BZIP2_VERSION)
 BZIP2_INSTALL_STAGING = YES
+BZIP2_LICENSE = bzip2 license
+BZIP2_LICENSE_FILES = LICENSE
 
 define BZIP2_FIX_MAKEFILE
 	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile

From dc2b6e0f8a36a153f54950a1fb791885f41b4e98 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:14 +0200
Subject: [PATCH 2323/6849] directfb: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/directfb/directfb.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 071cdf4fcf..ecea7df9e7 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -7,6 +7,8 @@ DIRECTFB_VERSION_MAJOR = 1.4
 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).16
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
+DIRECTFB_LICENSE = LGPLv2.1+
+DIRECTFB_LICENSE_FILES = COPYING
 DIRECTFB_AUTORECONF = YES
 DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_CONF_OPT = \

From 4df385c269c353011081b7fb5cb57ad947fb8f6d Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:15 +0200
Subject: [PATCH 2324/6849] iostat: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/iostat/iostat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk
index d3efa59db7..dbd16330f1 100644
--- a/package/iostat/iostat.mk
+++ b/package/iostat/iostat.mk
@@ -6,6 +6,8 @@
 
 IOSTAT_VERSION = 2.2
 IOSTAT_SITE = http://www.linuxinsight.com/files
+IOSTAT_LICENSE = GPL
+IOSTAT_LICENSE_FILES = LICENSE
 
 iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE)
 

From 1c5597f17731d0816129080c5b51e0a6f117f73c Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:16 +0200
Subject: [PATCH 2325/6849] lzo: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lzo/lzo.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 84f31f0d00..da5d6b7474 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -5,6 +5,8 @@
 #############################################################
 LZO_VERSION = 2.06
 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
+LZO_LICENSE = GPLv2+
+LZO_LICENSE_FILES = COPYING
 LZO_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))

From 46f81aa05b226c0ab77bb31346ba0f83dfb3c006 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:17 +0200
Subject: [PATCH 2326/6849] lzop: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lzop/lzop.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 6d1d674edb..1e980303e9 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -6,6 +6,8 @@
 LZOP_VERSION = 1.03
 LZOP_SOURCE = lzop-$(LZOP_VERSION).tar.gz
 LZOP_SITE = http://www.lzop.org/download/
+LZOP_LICENSE = GPLv2+
+LZOP_LICENSE_FILES = COPYING
 LZOP_DEPENDENCIES = lzo
 
 $(eval $(call AUTOTARGETS))

From 847fd1cf1b934bfd90a6ffca11f55e912984d6db Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:18 +0200
Subject: [PATCH 2327/6849] libusb: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libusb/libusb.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 9abfcfccd5..ac0f0d2322 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -6,6 +6,8 @@
 LIBUSB_VERSION = 1.0.9
 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
+LIBUSB_LICENSE = LGPLv2.1+
+LIBUSB_LICENSE_FILES = COPYING
 LIBUSB_DEPENDENCIES = host-pkg-config
 LIBUSB_INSTALL_STAGING = YES
 

From 41633ecc24aee2e1938be80945015d4f9ae98803 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:19 +0200
Subject: [PATCH 2328/6849] pcre: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pcre/pcre.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index db896fd677..d01ca84d56 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -6,6 +6,8 @@
 
 PCRE_VERSION = 8.30
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
+PCRE_LICENSE = BSD-3c
+PCRE_LICENSE_FILES = LICENCE
 PCRE_INSTALL_STAGING = YES
 
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)

From ede30a915bd7d24a34648d2343322b5e59111a1d Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:20 +0200
Subject: [PATCH 2329/6849] netsnmp: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/netsnmp/netsnmp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 6d67dc5cd8..5bc7d9f3c1 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -7,6 +7,8 @@
 NETSNMP_VERSION = 5.7.1
 NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
+NETSNMP_LICENSE = Various BSD-like
+NETSNMP_LICENSE_FILES = COPYING
 NETSNMP_INSTALL_STAGING = YES
 NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
 NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \

From 2e03375d317c369c1f676b090f5bb10efa52ecec Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 17 May 2012 19:33:21 +0200
Subject: [PATCH 2330/6849] berkeleydb: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/berkeleydb/berkeleydb.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 09f35ef265..3aaae5f84f 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -7,6 +7,8 @@ BERKELEYDB_VERSION = 5.3.21
 BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR = build_unix
+BERKELEYDB_LICENSE = BerkeleyDB License
+BERKELEYDB_LICENSE_FILES = LICENSE
 BERKELEYDB_INSTALL_STAGING = YES
 BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \
 	db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \

From c6580011f12e6ca8f7eb87af11d4e9d6def4316f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Jul 2012 19:42:04 +0200
Subject: [PATCH 2331/6849] doc: Add FAQ entries from the old HTML-only
 documentation

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/faq.txt    | 38 ++++++++++++++++++++++++++++++++++++++
 docs/manual/manual.txt |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 docs/manual/faq.txt

diff --git a/docs/manual/faq.txt b/docs/manual/faq.txt
new file mode 100644
index 0000000000..575d019e91
--- /dev/null
+++ b/docs/manual/faq.txt
@@ -0,0 +1,38 @@
+Frequently Asked Questions
+==========================
+
+The boot hangs after 'Starting network...'
+------------------------------------------
+
+If the boot process seems to hand after the following messages
+(messages not necessarily exactly similar, depending on the list of
+packages selected):
+
+------------------------
+Freeing init memory: 3972K
+Initializing random number generator... done.
+Starting network...
+Starting dropbear sshd: generating rsa key... generating dsa key... OK
+------------------------
+
+then it means that your system is running, but didn't start a shell on
+the serial console. In order to have the system start a shell on your
+serial console, you have to go in the Buildroot configuration, +System
+configuration+, and modify +Port to run a getty (login prompt) on+ and
++Baudrate to use+ as appropriate. This will automatically tune the
++/etc/inittab+ file of the generated system so that a shell starts on
+the correct serial port.
+
+module-init-tools fails to build with 'cannot find -lc'
+-------------------------------------------------------
+
+If the build of +module-init-tools+ for the host fails with:
+
+------------------------
+/usr/bin/ld: cannot find -lc
+------------------------
+
+then probably you are running a Fedora (or similar) distribution, and
+you should install the +glibc-static+ package. This is because the
++module-init-tools+ build process wants to link statically against the
+C library.
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 732b50cbcd..de4b5949bc 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -31,4 +31,6 @@ include::download-location.txt[]
 
 include::adding-packages.txt[]
 
+include::faq.txt[]
+
 include::appendix.txt[]

From d56422a51af9e4c87aac365830f598fca6ca8a29 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Jul 2012 19:42:40 +0200
Subject: [PATCH 2332/6849] doc: get rid of the old HTML-only documentation

Users keep falling on this documentation, which is no longer kept
up-to-date with the developments. Get rid of it now.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/buildroot.html | 1834 -------------------------------------------
 1 file changed, 1834 deletions(-)
 delete mode 100644 docs/buildroot.html

diff --git a/docs/buildroot.html b/docs/buildroot.html
deleted file mode 100644
index d178df1f56..0000000000
--- a/docs/buildroot.html
+++ /dev/null
@@ -1,1834 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <title>Buildroot - Usage and documentation</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-  <link rel="stylesheet" href="stylesheet.css">
-</head>
-
-<body>
-  <div class="main">
-    <div class="titre">
-      <h1>Buildroot</h1>
-    </div>
-
-    <p><a href="http://buildroot.net/">Buildroot</a> usage and documentation
-    by Thomas Petazzoni. Contributions from Karsten Kruse, Ned Ludd, Martin
-    Herren and others.</p>
-
-    <ul>
-      <li><a href="#about">About Buildroot</a></li>
-      <li><a href="#download">Obtaining Buildroot</a></li>
-      <li><a href="#using">Using Buildroot</a></li>
-      <li><a href="#custom_targetfs">Customizing the generated target filesystem</a></li>
-      <li><a href="#custom_busybox">Customizing the Busybox configuration</a></li>
-      <li><a href="#custom_uclibc">Customizing the uClibc configuration</a></li>
-      <li><a href="#custom_linux26">Customizing the Linux kernel configuration</a></li>
-      <li><a href="#rebuilding_packages">Understanding how to rebuild packages</a></li>
-      <li><a href="#buildroot_innards">How Buildroot works</a></li>
-      <li><a href="#using_toolchain">Using the uClibc toolchain outside Buildroot</a></li>
-      <li><a href="#external_toolchain">Use an external toolchain</a></li>
-      <li><a href="#ccache-support">Using <code>ccache</code> in Buildroot</li>
-      <li><a href="#downloaded_packages">Location of downloaded packages</a></li>
-      <li><a href="#add_packages">Adding new packages to Buildroot</a></li>
-      <li><a href="#board_support">Creating your own board support</a></li>
-      <li><a href="#faq">Frequently asked questions</a></li>
-      <li><a href="#links">Resources</a></li>
-    </ul>
-
-    <p><b>WARNING:</b> Since the 2011.11 release, this page is on its way to be
-    deprecated. Information may be incomplete and out-dated.</p>
-
-    <p>To get an up-to-date documentation for
-    <a href="http://buildroot.net/">Buildroot</a>-2011.11 or a git view, just
-    run:</p>
-<pre>
-  $ make manual
-</pre>
-    <p><i>This requires <code>asciidoc</code> installed on the host system.</i></p>
-
-    <p>For releases since <a href="http://buildroot.net/">Buildroot</a>-2012.02,
-    manuals (html, pdf and text) are available in the  <code>docs/manual</code>
-    directory.</p>
-
-    <h2 id="about">About Buildroot</h2>
-
-    <p>Buildroot is a set of Makefiles and patches that allows you to easily
-    generate a cross-compilation toolchain, a root filesystem and a Linux
-    kernel image for your target. Buildroot can be used for one, two or all
-    of these options, independently.</p>
-
-    <p>Buildroot is useful mainly for people working with embedded systems.
-    Embedded systems often use processors that are not the regular x86
-    processors everyone is used to having in his PC. They can be PowerPC
-    processors, MIPS processors, ARM processors, etc.</p>
-
-    <p>A compilation toolchain is the set of tools that allows you to
-    compile code for your system. It consists of a compiler (in our case,
-    <code>gcc</code>), binary utils like assembler and linker (in our case,
-    <code>binutils</code>) and a C standard library (for example
-    <a href="http://www.gnu.org/software/libc/libc.html">GNU Libc</a>,
-    <a href="http://www.uclibc.org/">uClibc</a> or
-    <a href="http://www.fefe.de/dietlibc/">dietlibc</a>). The system installed
-    on your development station certainly already has a compilation
-    toolchain that you can use to compile an application that runs on your
-    system. If you're using a PC, your compilation toolchain runs on an x86
-    processor and generates code for an x86 processor. Under most Linux
-    systems, the compilation toolchain uses the GNU libc (glibc) as the C
-    standard library.  This compilation toolchain is called the &quot;host
-    compilation toolchain&quot;. The machine on which it is running, and on
-    which you're working, is called the &quot;host system&quot;. The
-    compilation toolchain is provided by your distribution, and Buildroot
-    has nothing to do with it (other than using it to build a
-    cross-compilation toolchain and other tools that are run on the
-    development host).</p>
-
-    <p>As said above, the compilation toolchain that comes with your system
-    runs on and generates code for the processor in your host system. As
-    your embedded system has a different processor, you need a
-    cross-compilation toolchain &mdash; a compilation toolchain that runs on
-    your host system but generates code for your target system (and target
-    processor). For example, if your host system uses x86 and your target
-    system uses ARM, the regular compilation toolchain on your host runs on
-    x86 and generates code for x86, while the cross-compilation toolchain
-    runs on x86 and generates code for ARM.</p>
-
-    <p>Even if your embedded system uses an x86 processor, you might be
-    interested in Buildroot for two reasons:</p>
-
-    <ul>
-      <li>The compilation toolchain on your host certainly uses the GNU Libc
-      which is a complete but huge C standard library. Instead of using GNU
-      Libc on your target system, you can use uClibc which is a tiny C
-      standard library. If you want to use this C library, then you need a
-      compilation toolchain to generate binaries linked with it. Buildroot
-      can do that for you.</li>
-
-      <li>Buildroot automates the building of a root filesystem with all needed
-      tools like busybox. That makes it much easier than doing it by hand.</li>
-    </ul>
-
-    <p>You might wonder why such a tool is needed when you can compile
-    <code>gcc</code>, <code>binutils</code>, <code>uClibc</code> and all
-    the other tools by hand. Of course doing so is possible but, dealing with
-    all of the configure options and problems of every <code>gcc</code> or
-    <code>binutils</code> version is very time-consuming and uninteresting.
-    Buildroot automates this process through the use of Makefiles and has a
-    collection of patches for each <code>gcc</code> and <code>binutils</code>
-    version to make them work on most architectures.</p>
-
-    <p>Moreover, Buildroot provides an infrastructure for reproducing
-    the build process of your kernel, cross-toolchain, and embedded root
-    filesystem. Being able to reproduce the build process will be useful when a
-    component needs to be patched or updated or when another person is supposed
-    to take over the project.</p>
-
-    <h2 id="download">Obtaining Buildroot</h2>
-
-    <p>Buildroot releases are made approximately every 3
-    months. Direct Git access and daily snapshots are also
-    available, if you want more bleeding edge.</p>
-
-    <p>Releases are available at
-    <a href="http://buildroot.net/downloads/">http://buildroot.net/downloads/</a>.</p>
-
-    <p>The latest snapshot is always available at
-    <a href="http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2">http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2</a>,
-    and previous snapshots are also available at
-    <a href="http://buildroot.net/downloads/snapshots/">http://buildroot.net/downloads/snapshots/</a>.</p>
-
-    <p>To download Buildroot using Git, you can simply follow
-    the rules described on the &quot;Accessing Git&quot; page
-    (<a href= "http://buildroot.net/git.html">http://buildroot.net/git.html</a>)
-    of the Buildroot website
-    (<a href="http://buildroot.net">http://buildroot.net</a>).
-    For the impatient, here's a quick recipe:</p>
-
-<pre>
- $ git clone git://git.buildroot.net/buildroot
-</pre>
-
-    <h2 id="using">Using Buildroot</h2>
-
-    <p>Buildroot has a nice configuration tool similar to the one you can find
-    in the Linux kernel
-    (<a href="http://www.kernel.org/">http://www.kernel.org/</a>) or in Busybox
-    (<a href="http://www.busybox.net/">http://www.busybox.net/</a>). Note that
-    you can (and should) build everything as a normal user. There is no need to
-    be root to configure and use Buildroot. The first step is to run the
-    configuration assistant:</p>
-
-<pre>
- $ make menuconfig
-</pre>
-
-    <p>to run the curses-based configurator, or</p>
-
-<pre>
- $ make xconfig
-</pre>
-
-    <p>or</p>
-
-<pre>
- $ make gconfig
-</pre>
-
-    <p>to run the Qt or GTK-based configurators.</p>
-
-    <p>All of these "make" commands will need to build a configuration
-    utility, so you may need to install "development" packages for relevant
-    libraries used by the configuration utilities. On Debian-like systems,
-    the <code>libncurses5-dev</code> package is required to use the <i>
-    menuconfig</i> interface, <code>libqt4-dev</code> is required to use
-    the <i>xconfig</i> interface, and <code>libglib2.0-dev, libgtk2.0-dev
-    and libglade2-dev</code> are needed to use the <i>gconfig</i> interface.</p>
-
-    <p>For each menu entry in the configuration tool, you can find associated
-    help that describes the purpose of the entry.</p>
-
-    <p>Once everything is configured, the configuration tool generates a
-    <code>.config</code> file that contains the description of your
-    configuration. It will be used by the Makefiles to do what's needed.</p>
-
-
-    <p>Let's go:</p>
-
-<pre>
- $ make
-</pre>
-
-    <p>You <b>should never</b> use <code>make -jN</code> with
-    Buildroot: it does not support <i>top-level parallel
-    make</i>. Instead, use the <code>BR2_JLEVEL</code> option to tell
-    Buildroot to run each package compilation with <code>make
-    -jN</code>.</p>
-
-    <p>This command will generally perform the following steps:</p>
-    <ul>
-      <li>Download source files (as required)</li>
-      <li>Configure, build and install the cross-compiling toolchain
-      if an internal toolchain is used, or import a toolchain if an
-      external toolchain is used</li>
-      <li>Build/install selected target packages</li>
-      <li>Build a kernel image, if selected</li>
-      <li>Build a bootloader image, if selected</li>
-      <li>Create a root filesystem in selected formats</li>
-    </ul>
-
-    <p>Buildroot output is stored in a single directory, <code>output/</code>.
-    This directory contains several subdirectories:</p>
-
-    <ul>
-      <li><code>images/</code> where all the images (kernel image,
-      bootloader and root filesystem images) are stored.</li>
-
-      <li><code>build/</code> where all the components except for the
-      cross-compilation toolchain are built (this includes tools needed to
-      run Buildroot on the host and packages compiled for the target). The
-      <code>build/</code> directory contains one subdirectory for each of
-      these components.</li>
-
-      <li><code>staging/</code> which contains a hierarchy similar to a root
-      filesystem hierarchy. This directory contains the installation of the
-      cross-compilation toolchain and all the userspace packages selected
-      for the target. However, this directory is <i>not</i> intended to be
-      the root filesystem for the target: it contains a lot of development
-      files, unstripped binaries and libraries that make it far too big for
-      an embedded system. These development files are used to compile
-      libraries and applications for the target that depend on other
-      libraries.</li>
-
-      <li><code>target/</code> which contains <i>almost</i> the complete
-      root filesystem for the target: everything needed is present except
-      the device files in <code>/dev/</code> (Buildroot can't create them
-      because Buildroot doesn't run as root and doesn't want to run as
-      root). Therefore, this directory <b>should not be used on your target</b>.
-      Instead, you should use one of the images built in the
-      <code>images/</code> directory. If you need an extracted image of the
-      root filesystem for booting over NFS, then use the tarball image
-      generated in <code>images/</code> and extract it as root.<br/>Compared
-      to <code>staging/</code>, <code>target/</code> contains only the
-      files and libraries needed to run the selected target applications:
-      the development files (headers, etc.) are not present, unless the
-      <code>development files in target filesystem</code> option is selected.
-      </li>
-
-      <li><code>host/</code> contains the installation of tools compiled for
-      the host that are needed for the proper execution of Buildroot,
-      including the cross-compilation toolchain.</li>
-
-      <li><code>toolchain/</code> contains the build directories for the
-      various components of the cross-compilation toolchain.</li>
-    </ul>
-
-    <h3 id="offline_builds">Offline builds</h3>
-
-    <p>If you intend to do an offline build and just want to download
-    all sources that you previously selected in the configurator
-    (<i>menuconfig</i>, <i>xconfig</i> or <i>gconfig</i>), then issue:</p>
-
-<pre>
- $ make source
-</pre>
-
-    <p>You can now disconnect or copy the content of your <code>dl</code>
-    directory to the build-host.</p>
-
-    <h3 id="building_out_of_tree">Building out-of-tree</h3>
-
-    <p>Buildroot supports building out of tree with a syntax similar to the
-    Linux kernel. To use it, add O=&lt;directory&gt; to the make command
-    line:</p>
-
-<pre>
- $ make O=/tmp/build
-</pre>
-
-    <p>Or:</p>
-
-<pre>
- $ cd /tmp/build; make O=$PWD -C path/to/buildroot
-</pre>
-
-    <p>All the output files will be located under <code>/tmp/build</code>.</p>
-
-    <p>When using out-of-tree builds, the Buildroot <code>.config</code> and
-    temporary files are also stored in the output directory. This means that
-    you can safely run multiple builds in parallel using the same source
-    tree as long as they use unique output directories.</p>
-
-    <p>For ease of use, Buildroot generates a Makefile wrapper in the output
-    directory - So after the first run, you no longer need to pass
-    <code>O=..</code> and <code>-C ..</code>, simply run (in the output
-    directory):</p>
-
-<pre>
- $ make &lt;target&gt;
-</pre>
-
-    <h3 id="environment_variables">Environment variables</h3>
-
-    <p>Buildroot also honors some environment variables, when they are passed
-    to <code>make</code> or set in the environment:</p>
-    <ul>
-      <li><code>HOSTCXX</code>, the host C++ compiler to use</li>
-      <li><code>HOSTCC</code>, the host C compiler to use</li>
-      <li><code>UCLIBC_CONFIG_FILE=&lt;path/to/.config&gt;</code>, path to
-      the uClibc configuration file, used to compile uClibc, if an
-      internal toolchain is being built</li>
-      <li><code>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</code>, path to
-      the Busybox configuration file</li>
-      <li><code>BUILDROOT_DL_DIR</code> to override the directory in which
-      Buildroot stores/retrieves downloaded files</li>
-    </ul>
-
-    <p>An example that uses config files located in the toplevel directory and
-    in your $HOME:</p>
-
-<pre>
- $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
-</pre>
-
-    <p>If you want to use a compiler other than the default <code>gcc</code>
-    or <code>g++</code> for building helper-binaries on your host, then do</p>
-
-<pre>
- $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
-</pre>
-
-	<h2 id="custom_targetfs">Customizing the generated target filesystem</h2>
-
-    <p>There are a few ways to customize the resulting target filesystem:</p>
-
-    <ul>
-      <li>Customize the target filesystem directly and rebuild the image.
-      The target filesystem is available under <code>output/target/</code>.
-      You can simply make your changes here and run make afterwards &mdash;
-      this will rebuild the target filesystem image. This method allows you
-      to do anything to the target filesystem, but if you decide to
-      completely rebuild your toolchain and tools, these changes will be
-      lost.</li>
-
-      <li>Create your own <i>target skeleton</i>. You can start with
-      the default skeleton available under <code>fs/skeleton</code>
-      and then customize it to suit your
-      needs. The <code>BR2_ROOTFS_SKELETON_CUSTOM</code>
-      and <code>BR2_ROOTFS_SKELETON_CUSTOM_PATH</code> will allow you
-      to specify the location of your custom skeleton. At build time,
-      the contents of the skeleton are copied to output/target before
-      any package installation.</li>
-
-      <li>In the Buildroot configuration, you can specify the path to a
-      post-build script, that gets called <i>after</i> Buildroot builds all
-      the selected software, but <i>before</i> the rootfs packages are
-      assembled. The destination root filesystem folder is given as the
-      first argument to this script, and this script can then be used to
-      copy programs, static data or any other needed file to your target
-      filesystem.<br/>You should, however, use this feature with care.
-      Whenever you find that a certain package generates wrong or unneeded
-      files, you should fix that package rather than work around it with a
-      post-build cleanup script.</li>
-
-      <li>A special package, <i>customize</i>, stored in
-      <code>package/customize</code> can be used. You can put all the
-      files that you want to see in the final target root filesystem
-      in <code>package/customize/source</code>, and then enable this
-      special package in the configuration system.</li>
-    </ul>
-
-    <h2 id="custom_busybox">Customizing the Busybox configuration</h2>
-
-    <p><a href="http://www.busybox.net/">Busybox</a> is very configurable,
-    and you may want to customize it. You can follow these simple steps to
-    do so. This method isn't optimal, but it's simple, and it works:</p>
-
-    <ol>
-      <li>Do an initial compilation of Buildroot, with busybox, without
-      trying to customize it.</li>
-
-      <li>Invoke <code>make busybox-menuconfig</code>.
-      The nice configuration tool appears, and you can
-      customize everything.</li>
-
-      <li>Run the compilation of Buildroot again.</li>
-    </ol>
-
-    <p>Otherwise, you can simply change the
-    <code>package/busybox/busybox-&lt;version&gt;.config</code> file, if you
-    know the options you want to change, without using the configuration tool.
-    </p>
-
-    <p>If you want to use an existing config file for busybox, then see
-    section <a href="#environment_variables">environment variables</a>.</p>
-
-    <h2 id="custom_uclibc">Customizing the uClibc configuration</h2>
-
-    <p>Just like <a href="#custom_busybox">BusyBox</a>,
-    <a href="http://www.uclibc.org/">uClibc</a> offers a lot of
-    configuration options. They allow you to select various
-    functionalities depending on your needs and limitations.</p>
-
-    <p>The easiest way to modify the configuration of uClibc is to
-    follow these steps:</p>
-
-    <ol>
-      <li>Do an initial compilation of Buildroot without trying to
-      customize uClibc.</li>
-
-      <li>Invoke <code>make uclibc-menuconfig</code>.
-      The nice configuration assistant, similar to
-      the one used in the Linux kernel or Buildroot, appears. Make
-      your configuration changes as appropriate.</li>
-
-      <li>Copy the <code>$(O)/toolchain/uclibc-VERSION/.config</code>
-      file to a different place
-      (like <code>toolchain/uClibc/uClibc-myconfig.config</code>,
-      or <code>board/mymanufacturer/myboard/uClibc.config</code>) and
-      adjust the uClibc configuration (configuration
-      option <code>BR2_UCLIBC_CONFIG</code>) to use this configuration
-      instead of the default one.</li>
-
-      <li>Run the compilation of Buildroot again.</li>
-    </ol>
-
-    <p>Otherwise, you can simply change
-    <code>toolchain/uClibc/uClibc.config</code>, without running the
-    configuration assistant.</p>
-
-    <p>If you want to use an existing config file for uclibc, then see
-    section <a href="#environment_variables">environment variables</a>.</p>
-
-    <h2 id="custom_linux26">Customizing the Linux kernel configuration</h2>
-
-    <p>The Linux kernel configuration can be customized just like
-    <a href="#custom_busybox">BusyBox</a> and
-    <a href="#custom_uclibc">uClibc</a> using <code>make linux-menuconfig
-    </code>. Make sure you have enabled the kernel build in <code>make
-    menuconfig</code> first. Once done, run <code>make</code> to (re)build
-    everything.</p>
-
-    <p>If you want to use an existing config file for Linux, then see
-    section <a href="#environment_variables">environment variables</a>.</p>
-
-    <h2 id="rebuilding_packages">Understanding how to rebuild packages</h2>
-
-    <p>One of the most common questions asked by Buildroot
-    users is how to rebuild a given package or how to
-    remove a package without rebuilding everything from scratch.</p>
-
-    <p>Removing a package is currently unsupported by Buildroot
-    without rebuilding from scratch. This is because Buildroot doesn't
-    keep track of which package installs what files in the
-    <code>output/staging</code> and <code>output/target</code>
-    directories. However, implementing clean package removal is on the
-    TODO-list of Buildroot developers.</p>
-
-    <p>The easiest way to rebuild a single package from scratch is to
-    remove its build directory in <code>output/build</code>. Buildroot
-    will then re-extract, re-configure, re-compile and re-install this
-    package from scratch.</p>
-
-    <p>However, if you don't want to rebuild the package completely
-    from scratch, a better understanding of the Buildroot internals is
-    needed. Internally, to keep track of which steps have been done
-    and which steps remain to be done, Buildroot maintains stamp
-    files (empty files that just tell whether this or that action
-    has been done). The problem is that these stamp files are not
-    uniformly named and handled by the different packages, so some
-    understanding of the particular package is needed.</p>
-
-    <p>For packages relying on Buildroot packages infrastructures (see
-    <a href="#add_packages">this section</a> for details), the
-    following stamp files are relevant:</p>
-
-    <ul>
-      <li><code>output/build/packagename-version/.stamp_configured</code>. If
-      removed, Buildroot will trigger the recompilation of the package
-      from the configuration step (execution of
-      <code>./configure</code>).</li>
-
-      <li><code>output/build/packagename-version/.stamp_built</code>. If
-      removed, Buildroot will trigger the recompilation of the package
-      from the compilation step (execution of <code>make</code>).</li>
-    </ul>
-
-    <p>For other packages, an analysis of the specific <i>package.mk</i>
-    file is needed. For example, the zlib Makefile used to look like this
-    (before it was converted to the generic package infrastructure):</p>
-
-<pre>
-$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
-	(cd $(ZLIB_DIR); rm -rf config.cache; \
-		[...]
-	)
-	touch $@
-
-$(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured
-	$(MAKE) -C $(ZLIB_DIR) all libz.a
-	touch -c $@
-</pre>
-
-    <p>If you want to trigger the reconfiguration, you need to
-    remove <code>output/build/zlib-version/.configured</code>. If
-    you want to trigger only the recompilation, you need to remove
-    <code>output/build/zlib-version/libz.a</code>.</p>
-
-    <p>Note that most packages, if not all, will progressively be
-    ported over to the generic or autotools infrastructure, making it
-    much easier to rebuild individual packages.</p>
-
-    <h2 id="buildroot_innards">How Buildroot works</h2>
-
-    <p>As mentioned above, Buildroot is basically a set of Makefiles that
-    download, configure, and compile software with the correct options. It
-    also includes patches for various software packages &mdash;  mainly the
-    ones involved in the cross-compilation tool chain (<code>gcc</code>,
-    <code>binutils</code> and <code>uClibc</code>).</p>
-
-    <p>There is basically one Makefile per software package, and they are
-    named with the <code>.mk</code> extension. Makefiles are split into
-    three main sections:</p>
-
-    <ul>
-      <li><b>toolchain</b> (in the <code>toolchain/</code> directory) contains
-      the Makefiles and associated files for all software related to the
-      cross-compilation toolchain: <code>binutils</code>, <code>gcc</code>,
-      <code>gdb</code>, <code>kernel-headers</code> and <code>uClibc</code>.</li>
-
-      <li><b>package</b> (in the <code>package/</code> directory) contains the
-      Makefiles and associated files for all user-space tools that Buildroot
-      can compile and add to the target root filesystem. There is one
-      sub-directory per tool.</li>
-
-      <li><b>target</b> (in the <code>target</code> directory) contains the
-      Makefiles and associated files for software related to the generation of
-      the target root filesystem image. Four types of filesystems are supported:
-      ext2, jffs2, cramfs and squashfs. For each of them there is a
-      sub-directory with the required files. There is also a
-      <code>default/</code> directory that contains the target filesystem
-      skeleton.</li>
-    </ul>
-
-    <p>Each directory contains at least 2 files:</p>
-
-    <ul>
-      <li><code>something.mk</code> is the Makefile that downloads, configures,
-      compiles and installs the package <code>something</code>.</li>
-
-      <li><code>Config.in</code> is a part of the configuration tool
-      description file. It describes the options related to the
-      package.</li>
-    </ul>
-
-    <p>The main Makefile performs the following steps (once the
-    configuration is done):</p>
-
-    <ol>
-      <li>Create all the output directories: <code>staging</code>,
-      <code>target</code>, <code>build</code>, <code>stamps</code>,
-      etc. in the output directory (<code>output/</code> by default,
-      another value can be specified using <code>O=</code>)</li>
-
-      <li>Generate all the targets listed in the
-      <code>BASE_TARGETS</code> variable. When an internal toolchain
-      is used, this means generating the cross-compilation
-      toolchain. When an external toolchain is used, this means checking
-      the features of the external toolchain and importing it into the
-      Buildroot environment.</li>
-
-      <li>Generate all the targets listed in the <code>TARGETS</code>
-      variable. This variable is filled by all the individual
-      components' Makefiles. Generating these targets will
-      trigger the compilation of the userspace packages (libraries,
-      programs), the kernel, the bootloader and the generation of the
-      root filesystem images, depending on the configuration.</li>
-    </ol>
-
-    <h2 id="board_support"> Creating your own board support</h2>
-
-    <p>Creating your own board support in Buildroot allows users of a
-    particular hardware platform to easily build a system that is
-    known to work.</p>
-
-    <p>To do so, you need to create a normal Buildroot configuration
-    that builds a basic system for the hardware: toolchain, kernel,
-    bootloader, filesystem and a simple Busybox-only userspace. No
-    specific package should be selected: the configuration should be
-    as minimal as possible, and should only build a working basic
-    Busybox system for the target platform. You can of course use more
-    complicated configurations for your internal projects, but the
-    Buildroot project will only integrate basic board
-    configurations. This is because package selections are highly
-    application-specific.</p>
-
-    <p>Once you have a known working configuration, run <code>make
-    savedefconfig</code>. This will generate a
-    minimal <code>defconfig</code> file at the root of the Buildroot
-    source tree. Move this file into the <code>configs/</code>
-    directory, and rename it <code>MYBOARD_defconfig</code>.</p>
-
-    <p>It is recommended to use as much as possible upstream versions
-    of the Linux kernel and bootloaders, and to use as much as
-    possible default kernel and bootloader configurations. If they are
-    incorrect for your platform, we encourage you to send fixes to the
-    corresponding upstream projects.</p>
-
-    <p>However, in the mean time, you may want to store kernel or
-    bootloader configuration or patches specific to your target
-    platform. To do so, create a
-    directory <code>board/MANUFACTURER</code> and a
-    subdirectory <code>board/MANUFACTURER/BOARDNAME</code> (after
-    replacing, of course, MANUFACTURER and BOARDNAME with the
-    appropriate values, in lower case letters). You can then store
-    your patches and configurations in these directories, and
-    reference them from the main Buildroot configuration.</p>
-
-    <h2 id="using_toolchain">Using the generated toolchain outside Buildroot</h2>
-
-    <p>You may want to compile, for your target, your own programs or other
-    software that are not packaged in Buildroot. In order to do this you can
-    use the toolchain that was generated by Buildroot.</p>
-
-    <p>The toolchain generated by Buildroot is located by default in
-    <code>output/host/</code>. The simplest way to use it is to add
-    <code>output/host/usr/bin/</code> to your PATH environment variable and
-    then to use <code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>,
-    <code>ARCH-linux-ld</code>, etc.</p>
-
-    <p>It is possible to relocate the toolchain &mdash; but
-    then <code>--sysroot</code> must be passed every time the compiler
-    is called to tell where the libraries and header files are.</p>
-
-    <p>It is also possible to generate the Buildroot toolchain in a
-    directory other than <code>output/host</code> by using the <code>
-    Build options -&gt; Host dir</code> option.
-    This could be useful if the toolchain must be shared with other users.</p>
-
-    <h2 id="ccache-support">Using <code>ccache</code> in Buildroot</h2>
-
-    <p><a href="http://ccache.samba.org">ccache</a> is a compiler
-    cache. It stores the object files resulting from each compilation
-    process, and is able to skip future compilation of the same source
-    file (with same compiler and same arguments) by using the
-    pre-existing object files. When doing almost identical builds from
-    scratch a number of times, it can nicely speed up the build
-    process.</p>
-
-    <p><code>ccache</code> support is integrated in Buildroot. You
-    just have to enable <code>Enable compiler cache</code>
-    in <code>Build options</code>. This will automatically build
-    <code>ccache</code> and use it for every host and target
-    compilation.</p>
-
-    <p>The cache is located
-    in <code>$HOME/.buildroot-ccache</code>. It is stored outside of
-    Buildroot output directory so that it can be shared by separate
-    Buildroot builds. If you want to get rid of the cache, simply
-    remove this directory.</p>
-
-    <p>You can get statistics on the cache (its size, number of hits,
-    misses, etc.) by running <code>make ccache-stats</code>.</p>
-
-    <h2 id="downloaded_packages">Location of downloaded packages</h2>
-
-    <p>It might be useful to know that the various tarballs that are
-    downloaded by the Makefiles are all stored in the <code>DL_DIR</code>
-    which by default is the <code>dl</code> directory. It's useful, for
-    example, if you want to keep a complete version of Buildroot which is
-    known to be working with the associated tarballs. This will allow you to
-    regenerate the toolchain and the target filesystem with exactly the same
-    versions.</p>
-
-    <p>If you maintain several Buildroot trees, it might be better to have a
-    shared download location. This can be accessed by creating a symbolic
-    link from the <code>dl</code> directory to the shared download location:</p>
-
-<pre>
- $ ln -s &lt;shared download location&gt; dl
-</pre>
-
-    <p>Another way of accessing a shared download location is to
-    create the <code>BUILDROOT_DL_DIR</code> environment variable.
-    If this is set, then the value of DL_DIR in the project is
-    overridden. The following line should be added to
-    <code>&quot;~/.bashrc&quot;</code>.</p>
-
-<pre>
- $ export BUILDROOT_DL_DIR &lt;shared download location&gt;
-</pre>
-
-    <h2 id="external_toolchain">Using an external toolchain</h2>
-
-    <p>Using an already existing toolchain is useful for different
-    reasons:</p>
-
-    <ul>
-      <li>you already have a toolchain that is known to work for your
-	specific CPU</li>
-      <li>you want to speed up the Buildroot build process by skipping
-      the long toolchain build part</li>
-      <li>the toolchain generation feature of Buildroot is not
-	sufficiently flexible for you (for example if you need to
-	generate a system with <i>glibc</i> instead of
-	<i>uClibc</i>)</li>
-    </ul>
-
-    <p>Buildroot supports using existing toolchains through a
-    mechanism called <i>external toolchain</i>. The external toolchain
-    mechanism is enabled in the <code>Toolchain</code> menu, by
-    selecting <code>External toolchain</code> in <code>Toolchain
-    type</code>.</p>
-
-    <p>Then, you have three solutions to use an external
-    toolchain:</p>
-
-    <ul>
-
-      <li>Use a predefined external toolchain profile, and let
-      Buildroot download, extract and install the toolchain. Buildroot
-      already knows about a few CodeSourcery toolchains for ARM,
-      PowerPC, MIPS and SuperH. Just select the toolchain profile
-      in <code>Toolchain</code> through the available ones. This is
-      definitely the easiest solution.</li>
-
-      <li>Use a predefined external toolchain profile, but instead of
-      having Buildroot download and extract the toolchain, you can
-      tell Buildroot where your toolchain is already installed on your
-      system. Just select the toolchain profile
-      in <code>Toolchain</code> through the available ones,
-      unselect <code>Download toolchain automatically</code>, and fill
-      the <code>Toolchain path</code> text entry with the path to your
-      cross-compiling toolchain.</li>
-
-      <li>Use a completely custom external toolchain. This is
-      particularly useful for toolchains generated using
-      Crosstool-NG. To do this, select the <code>Custom
-      toolchain</code> solution in the <code>Toolchain</code>
-      list. You need to fill the <code>Toolchain
-      path</code>, <code>Toolchain prefix</code> and <code>External
-      toolchain C library</code> options. Then, you have to tell
-      Buildroot what your external toolchain supports. If your
-      external toolchain uses the <i>glibc</i> library, you only have
-      to tell whether your toolchain supports C++ or not. If your
-      external toolchain uses the <i>uclibc</i> library, then you have
-      to tell Buildroot if it supports largefile, IPv6, RPC,
-      wide-char, locale, program invocation, threads and C++. At the
-      beginning of the execution, Buildroot will tell you if the
-      selected options do not match the toolchain configuration.</li>
-
-    </ul>
-
-    <p>Our external toolchain support has been tested with toolchains
-    from CodeSourcery, toolchains generated
-    by <a href="http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool">Crosstool-NG</a>,
-    and toolchains generated by Buildroot itself. In general, all
-    toolchains that support the <i>sysroot</i> feature should
-    work. If not, do not hesitate to contact the developers.</p>
-
-    <p>We do not support toolchains from
-    the <a href="http://www.denx.de/wiki/DULG/ELDK">ELDK of Denx</a>,
-    for two reasons:</p>
-
-    <ul>
-
-      <li>The ELDK does not contain a pure toolchain (i.e just the
-      compiler, binutils, the C and C++ libraries), but a toolchain
-      that comes with a very large set of pre-compiled libraries and
-      programs. Therefore, Buildroot cannot import the <i>sysroot</i>
-      of the toolchain, as it would contain hundreds of megabytes of
-      pre-compiled libraries that are normally built by
-      Buildroot.</li>
-
-      <li>The ELDK toolchains have a completely non-standard custom
-      mechanism to handle multiple library variants. Instead of using
-      the standard GCC <i>multilib</i> mechanism, the ARM ELDK uses
-      different symbolic links to the compiler to differentiate
-      between library variants (for ARM soft-float and ARM VFP), and
-      the PowerPC ELDK compiler uses a <code>CROSS_COMPILE</code>
-      environment variable. This non-standard behaviour makes it
-      difficult to support ELDK in Buildroot.</li>
-
-    </ul>
-
-    <p>We also do not support using the distribution toolchain (i.e
-    the gcc/binutils/C library installed by your distribution) as the
-    toolchain to build software for the target. This is because your
-    distribution toolchain is not a "pure" toolchain (i.e only with
-    the C/C++ library), so we cannot import it properly into the
-    Buildroot build environment. So even if you are building a system
-    for a x86 or x86_64 target, you have to generate a
-    cross-compilation toolchain with Buildroot or Crosstool-NG.</p>
-
-    <h2 id="add_packages">Adding new packages to Buildroot</h2>
-
-    <p>This section covers how new packages (userspace libraries or
-    applications) can be integrated into Buildroot. It also shows how existing
-    packages are integrated, which is needed for fixing issues or tuning their
-    configuration.</p>
-
-    <ul>
-      <li><a href="#package-directory">Package directory</a></li>
-      <li><a href="#config-in-file"><code>Config.in</code> file</a></li>
-      <li><a href="#mk-file">The <code>.mk</code> file</a>
-        <ul>
-          <li><a href="#generic-tutorial">Makefile for generic packages : tutorial</a></li>
-          <li><a href="#generic-reference">Makefile for generic packages : reference</a></li>
-          <li><a href="#autotools-tutorial">Makefile for autotools-based packages : tutorial</a></li>
-          <li><a href="#autotools-reference">Makefile for autotools-based packages : reference</a></li>
-          <li><a href="#cmake-tutorial">Makefile for CMake-based packages : tutorial</a></li>
-          <li><a href="#cmake-reference">Makefile for CMake-based packages : reference</a></li>
-          <li><a href="#manual-tutorial">Manual Makefile : tutorial</a></li>
-        </ul>
-      </li>
-      <li><a href="#gettext-integration">Gettext integration and interaction with packages</a></li>
-    </ul>
-
-    <h3 id="package-directory">Package directory</h3>
-
-    <p>First of all, create a directory under the <code>package</code>
-    directory for your software, for example <code>libfoo</code>.</p>
-
-    <p>Some packages have been grouped by topic in a sub-directory:
-    <code>multimedia</code>, <code>x11r7</code>, and
-    <code>games</code>. If your package fits in one of these
-    categories, then create your package directory in these.</p>
-
-    <h3 id="config-in-file"><code>Config.in</code> file</h3>
-
-    <p>Then, create a file named <code>Config.in</code>. This file
-    will contain the option descriptions related to our
-    <code>libfoo</code> software that will be used and displayed in the
-    configuration tool. It should basically contain :</p>
-
-<pre>
-config BR2_PACKAGE_LIBFOO
-	bool "libfoo"
-	help
-	  This is a comment that explains what libfoo is.
-
-	  http://foosoftware.org/libfoo/
-</pre>
-
-    <p>Of course, you can add other options to configure particular
-    things in your software. You can look at examples in other
-    packages. The syntax of the Config.in file is the same as the one
-    for the kernel Kconfig file. The documentation for this syntax is
-    available at
-    <a href="http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt">http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt</a>
-    </p>
-
-    <p>Finally you have to add your new <code>libfoo/Config.in</code> to
-    <code>package/Config.in</code> (or in a category subdirectory if
-    you decided to put your package in one of the existing
-    categories). The files included there are <em>sorted
-    alphabetically</em> per category and are <em>NOT</em> supposed to
-    contain anything but the <em>bare</em> name of the package.</p>
-
-<pre>
-source "package/libfoo/Config.in"
-</pre>
-
-    <h3 id="mk-file">The <code>.mk</code> file</h3>
-
-    <p>Finally, here's the hardest part. Create a file named
-    <code>libfoo.mk</code>. It describes how the package should be
-    downloaded, configured, built, installed, etc.</p>
-
-    <p>Depending on the package type, the <code>.mk</code> file must be
-    written in a different way, using different infrastructures:</p>
-
-    <ul>
-      <li><b>Makefiles for generic packages</b> (not using autotools): These
-      are based on an infrastructure similar to the one used for
-      autotools-based packages, but requires a little more work from the
-      developer. They specify what should be done for the configuration,
-      compilation, installation and cleanup of the package. This
-      infrastructure must be used for all packages that do not use the
-      autotools as their build system. In the future, other specialized
-      infrastructures might be written for other build systems.<br/>We cover
-      them through a <a href="#generic-tutorial">tutorial</a> and a
-      <a href="#generic-reference">reference</a>.</li>
-
-      <li><b>Makefiles for autotools-based software</b> (autoconf, automake,
-      etc.): We provide a dedicated infrastructure for such packages, since
-      autotools is a very common build system. This infrastructure <i>must
-      </i> be used for new packages that rely on the autotools as their
-      build system.<br/>We cover them through a
-      <a href="#autotools-tutorial">tutorial</a> and a
-      <a href="#autotools-reference">reference</a>.</li>
-
-      <li><b>Manual Makefiles:</b> These are currently obsolete, and no new
-      manual Makefiles should be added. However, since there are still many
-      of them in the tree, we keep them documented in a
-      <a href="#manual-tutorial">tutorial</a>.</li>
-    </ul>
-
-    <h4 id="generic-tutorial">Makefile for generic packages : tutorial</h4>
-
-<pre>
-<span style="color: #000000">01:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span>
-<span style="color: #000000">02:</span><span style="font-style: italic; color: #9A1900"> #</span>
-<span style="color: #000000">03:</span><span style="font-style: italic; color: #9A1900"> # libfoo</span>
-<span style="color: #000000">04:</span><span style="font-style: italic; color: #9A1900"> #</span>
-<span style="color: #000000">05:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span>
-<span style="color: #000000">06:</span><span style="color: #009900"> LIBFOO_VERSION</span> = 1.0
-<span style="color: #000000">07:</span><span style="color: #009900"> LIBFOO_SOURCE</span> = libfoo-<span style="color: #009900">$(LIBFOO_VERSION)</span>.tar.gz
-<span style="color: #000000">08:</span><span style="color: #009900"> LIBFOO_SITE</span> = http://www.foosoftware.org/download
-<span style="color: #000000">09:</span><span style="color: #009900"> LIBFOO_INSTALL_STAGING</span> = YES
-<span style="color: #000000">10:</span><span style="color: #009900"> LIBFOO_DEPENDENCIES</span> = host-libaaa libbbb
-<span style="color: #000000">11:</span>
-<span style="color: #000000">12:</span> define LIBFOO_BUILD_CMDS
-<span style="color: #000000">13:</span> 	<span style="color: #009900">$(MAKE)</span> CC=<span style="color: #009900">"$(TARGET_CC)"</span> LD=<span style="color: #009900">"$(TARGET_LD)"</span> -C <span style="color: #009900">$(@D)</span> all
-<span style="color: #000000">14:</span> endef
-<span style="color: #000000">15:</span>
-<span style="color: #000000">16:</span> define LIBFOO_INSTALL_STAGING_CMDS
-<span style="color: #000000">17:</span> 	<span style="color: #009900">$(INSTALL)</span> -D -m 0755 <span style="color: #009900">$(@D)</span>/libfoo.a <span style="color: #009900">$(STAGING_DIR)</span>/usr/lib/libfoo.a
-<span style="color: #000000">18:</span> 	<span style="color: #009900">$(INSTALL)</span> -D -m 0644 <span style="color: #009900">$(@D)</span>/foo.h <span style="color: #009900">$(STAGING_DIR)</span>/usr/include/foo.h
-<span style="color: #000000">19:</span> 	<span style="color: #009900">$(INSTALL)</span> -D -m 0755 <span style="color: #009900">$(@D)</span>/libfoo.so* <span style="color: #009900">$(STAGING_DIR)</span>/usr/lib
-<span style="color: #000000">20:</span> endef
-<span style="color: #000000">21:</span>
-<span style="color: #000000">22:</span> define LIBFOO_INSTALL_TARGET_CMDS
-<span style="color: #000000">23:</span> 	<span style="color: #009900">$(INSTALL)</span> -D -m 0755 <span style="color: #009900">$(@D)</span>/libfoo.so* <span style="color: #009900">$(TARGET_DIR)</span>/usr/lib
-<span style="color: #000000">24:</span> 	<span style="color: #009900">$(INSTALL)</span> -d -m 0755 <span style="color: #009900">$(TARGET_DIR)</span>/etc/foo.d
-<span style="color: #000000">25:</span> endef
-<span style="color: #000000">26:</span>
-<span style="color: #000000">27:</span><span style="color: #009900"> $(eval $(call GENTARGETS,package,libfoo))</span>
-</pre>
-
-    <p>The Makefile begins on line 6 to 8 with metadata information: the
-    version of the package (<code>LIBFOO_VERSION</code>), the name of the
-    tarball containing the package (<code>LIBFOO_SOURCE</code>) and the
-    Internet location at which the tarball can be downloaded
-    (<code>LIBFOO_SITE</code>). All variables must start with the same prefix,
-    <code>LIBFOO_</code> in this case. This prefix is always the uppercased
-    version of the package name (see below to understand where the package
-    name is defined).</p>
-
-    <p>On line 9, we specify that this package wants to install something to
-    the staging space. This is often needed for libraries, since they must
-    install header files and other development files in the staging space.
-    This will ensure that the commands listed in the
-    <code>LIBFOO_INSTALL_STAGING_CMDS</code> variable will be executed.</p>
-
-    <p>On line 10, we specify the list of dependencies this package relies
-    on. These dependencies are listed in terms of lower-case package names,
-    which can be packages for the target (without the <code>host-</code>
-    prefix) or packages for the host (with the <code>host-</code>) prefix).
-    Buildroot will ensure that all these packages are built and installed
-    <i>before</i> the current package starts its configuration.</p>
-
-    <p>The rest of the Makefile defines what should be done at the different
-    steps of the package configuration, compilation and installation.
-    <code>LIBFOO_BUILD_CMDS</code> tells what steps should be performed to
-    build the package. <code>LIBFOO_INSTALL_STAGING_CMDS</code> tells what
-    steps should be performed to install the package in the staging space.
-    <code>LIBFOO_INSTALL_TARGET_CMDS</code> tells what steps should be
-    performed to install the package in the target space.</p>
-
-    <p>All these steps rely on the <code>$(@D)</code> variable, which
-    contains the directory where the source code of the package has been
-    extracted.</p>
-
-    <p>Finally, on line 27, we call the <code>GENTARGETS</code> which
-    generates, according to the variables defined previously, all the
-    Makefile code necessary to make your package working.</p>
-
-    <h4 id="generic-reference">Makefile for generic packages : reference</h4>
-
-    <p>The <code>GENTARGETS</code> macro takes three arguments:</p>
-
-    <ul>
-      <li>The first argument is the package directory prefix. If your
-      package is in <code>package/libfoo</code>, then the directory prefix
-      is <code>package</code>. If your package is in
-      <code>package/editors/foo</code>, then the directory prefix must be
-      <code>package/editors</code>.</li>
-
-      <li>The second argument is the lower-cased package name. It must match
-      the prefix of the variables in the <code>.mk</code> file and must
-      match the configuration option name in the <code>Config.in</code>
-      file. For example, if the package name is <code>libfoo</code>, then the
-      variables in the <code>.mk</code> file must start with
-      <code>LIBFOO_</code> and the configuration option in the
-      <code>Config.in</code> file must be <code>BR2_PACKAGE_LIBFOO</code>.</li>
-
-      <li>The third argument is optional. It can be used to tell if the
-      package is a target package (cross-compiled for the target) or a host
-      package (natively compiled for the host). If unspecified, it is
-      assumed that it is a target package. See below for details.</li>
-    </ul>
-
-    <p>For a given package, in a single <code>.mk</code> file, it is
-    possible to call GENTARGETS twice, once to create the rules to generate
-    a target package and once to create the rules to generate a host package:
-    </p>
-
-<pre>
-$(eval $(call GENTARGETS,package,libfoo))
-$(eval $(call GENTARGETS,package,libfoo,host))
-</pre>
-
-    <p>This might be useful if the compilation of the target package
-    requires some tools to be installed on the host. If the package name is
-    <code>libfoo</code>, then the name of the package for the target is also
-    <code>libfoo</code>, while the name of the package for the host is
-    <code>host-libfoo</code>. These names should be used in the DEPENDENCIES
-    variables of other packages, if they depend on <code>libfoo</code> or
-    <code>host-libfoo</code>.</p>
-
-    <p>The call to the <code>GENTARGETS</code> macro <b>must</b> be at the
-    end of the <code>.mk</code> file, after all variable definitions.</p>
-
-    <p>For the target package, the <code>GENTARGETS</code> uses the
-    variables defined by the .mk file and prefixed by the uppercased package
-    name: <code>LIBFOO_*</code>. For the host package, it uses the
-    <code>HOST_LIBFOO_*</code>. For <i>some</i> variables, if the
-    <code>HOST_LIBFOO_</code> prefixed variable doesn't exist, the package
-    infrastructure uses the corresponding variable prefixed by
-    <code>LIBFOO_</code>. This is done for variables that are likely to have
-    the same value for both the target and host packages. See below for
-    details.</p>
-
-    <p>The list of variables that can be set in a <code>.mk</code> file to
-    give metadata information is (assuming the package name is
-    <code>libfoo</code>) :</p>
-
-    <ul>
-      <li><code>LIBFOO_VERSION</code>, mandatory, must contain the
-      version of the package. Note that
-      if <code>HOST_LIBFOO_VERSION</code> doesn't exist, it is assumed
-      to be the same as <code>LIBFOO_VERSION</code>. It can also be a
-      Subversion or Git branch or tag, for packages that are fetched
-      directly from their revision control system.<br/>
-      Example: <code>LIBFOO_VERSION = 0.1.2</code></li>
-
-      <li><code>LIBFOO_SOURCE</code> may contain the name of the tarball of
-      the package. If <code>HOST_LIBFOO_SOURCE</code> is not specified, it
-      defaults to <code>LIBFOO_SOURCE</code>. If none are specified, then
-      the value is assumed to be
-      <code>packagename-$(LIBFOO_VERSION).tar.gz</code>.<br/>Example:
-      <code>LIBFOO_SOURCE = foobar-$(LIBFOO_VERSION).tar.bz2</code></li>
-
-      <li><code>LIBFOO_PATCH</code> may contain the name of a patch, that
-      will be downloaded from the same location as the tarball indicated in
-      <code>LIBFOO_SOURCE</code>. If <code>HOST_LIBFOO_PATCH</code> is not
-      specified, it defaults to <code>LIBFOO_PATCH</code>. Also note that
-      another mechanism is available to patch a package: all files of the
-      form <code>packagename-packageversion-description.patch</code> present
-      in the package directory inside Buildroot will be applied to the
-      package after extraction.</li>
-
-      <li><code>LIBFOO_SITE</code> may contain the Internet location
-      of the package. It can either be the HTTP or FTP location of a
-      tarball, or the URL of a Git or Subversion repository
-      (see <code>LIBFOO_SITE_METHOD</code>
-      below). If <code>HOST_LIBFOO_SITE</code> is not specified, it
-      defaults to <code>LIBFOO_SITE</code>. If none are specified,
-      then the location is assumed to be
-      <code>http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename</code>.
-      <br/>Examples:<br/>
-      <code>LIBFOO_SITE=http://www.libfoosoftware.org/libfoo</code><br/>
-      <code>LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/</code></li>
-
-      <li><code>LIBFOO_SITE_METHOD</code> may contain the method to
-      fetch the package source code. It can either
-      be <code>wget</code> (for normal FTP/HTTP downloads of
-      tarballs), <code>svn</code>, <code>git</code> or <code>bzr</code>.
-      When not specified, it is guessed from the URL given
-      in <code>LIBFOO_SITE</code>: <code>svn://</code>, <code>git://</code>
-      and <code>bzr://</code> URLs will use the <code>svn</code>,
-      <code>git</code> and <code>bzr</code> methods respectively. All other
-      URL-types will use the <code>wget</code> method. So for example, in the
-      case of a package whose source code is available through
-      Subversion repository on HTTP, one <i>must</i>
-      specifiy <code>LIBFOO_SITE_METHOD=svn</code>. For <code>svn</code>
-      and <code>git</code> methods, what Buildroot does is a
-      checkout/clone of the repository which is then tarballed and
-      stored into the download cache. Next builds will not
-      checkout/clone again, but will use the tarball
-      directly. When <code>HOST_LIBFOO_SITE_METHOD</code> is not
-      specified, it defaults to the value
-      of <code>LIBFOO_SITE_METHOD</code>. See <code>package/multimedia/tremor/</code>
-      for an example.</li>
-
-      <li><code>LIBFOO_DEPENDENCIES</code> lists the dependencies (in terms
-      of package name) that are required for the current target package to
-      compile. These dependencies are guaranteed to be compiled and
-      installed before the configuration of the current package starts. In a
-      similar way, <code>HOST_LIBFOO_DEPENDENCIES</code> lists the
-      dependency for the current host package.</li>
-
-      <li><code>LIBFOO_INSTALL_STAGING</code> can be set to <code>YES</code>
-      or <code>NO</code> (default). If set to <code>YES</code>, then the
-      commands in the <code>LIBFOO_INSTALL_STAGING_CMDS</code> variables are
-      executed to install the package into the staging directory.</li>
-
-      <li><code>LIBFOO_INSTALL_TARGET</code> can be set to <code>YES</code>
-      (default) or <code>NO</code>. If set to <code>YES</code>, then the
-      commands in the <code>LIBFOO_INSTALL_TARGET_CMDS</code> variables are
-      executed to install the package into the target directory.</li> </ul>
-
-    <p>The recommended way to define these variables is to use the following
-    syntax:</p>
-
-<pre>
-LIBFOO_VERSION = 2.32
-</pre>
-
-    <p>Now, the variables that define what should be performed at the
-    different steps of the build process.</p>
-
-    <ul>
-      <li><code>LIBFOO_CONFIGURE_CMDS</code>, used to list the actions to be
-      performed to configure the package before its compilation</li>
-
-      <li><code>LIBFOO_BUILD_CMDS</code>, used to list the actions to be
-      performed to compile the package</li>
-
-      <li><code>HOST_LIBFOO_INSTALL_CMDS</code>, used to list the actions to
-      be performed to install the package, when the package is a host
-      package. The package must install its files to the directory given by
-      <code>$(HOST_DIR)</code>. All files, including development files such
-      as headers should be installed, since other packages might be compiled
-      on top of this package.</li>
-
-      <li><code>LIBFOO_INSTALL_TARGET_CMDS</code>, used to list the actions
-      to be performed to install the package to the target directory, when
-      the package is a target package. The package must install its files to
-      the directory given by <code>$(TARGET_DIR)</code>. Only the files
-      required for <i>documentation</i> and <i>execution</i> of the package
-      should be installed. Header files should not be installed, they will
-      be copied to the target, if the
-      <code>development files in target filesystem</code> option is selected.
-      </li>
-
-      <li><code>LIBFOO_INSTALL_STAGING_CMDS</code>, used to list the actions
-      to be performed to install the package to the staging directory, when
-      the package is a target package. The package must install its files to
-      the directory given by <code>$(STAGING_DIR)</code>. All development
-      files should be installed, since they might be needed to compile other
-      packages.</li>
-
-      <li><code>LIBFOO_CLEAN_CMDS</code>, used to list the actions to
-      perform to clean up the build directory of the package.</li>
-
-      <li><code>LIBFOO_UNINSTALL_TARGET_CMDS</code>, used to list the actions
-      to uninstall the package from the target directory
-      <code>$(TARGET_DIR)</code></li>
-
-      <li><code>LIBFOO_UNINSTALL_STAGING_CMDS</code>, used to list the
-      actions to uninstall the package from the staging directory
-      <code>$(STAGING_DIR)</code>.</li>
-    </ul>
-
-    <p>The preferred way to define these variables is:</p>
-
-<pre>
-define LIBFOO_CONFIGURE_CMDS
-	action 1
-	action 2
-	action 3
-endef
-</pre>
-
-    <p>In the action definitions, you can use the following variables:</p>
-
-    <ul>
-      <li><code>$(@D)</code>, which contains the directory in which the
-      package source code has been uncompressed.</li>
-
-      <li><code>$(TARGET_CC)</code>, <code>$(TARGET_LD)</code>, etc. to get
-      the target cross-compilation utilities</li>
-
-      <li><code>$(TARGET_CROSS)</code> to get the cross-compilation
-      toolchain prefix</li>
-
-      <li>Of course the <code>$(HOST_DIR)</code>, <code>$(STAGING_DIR)</code>
-      and <code>$(TARGET_DIR)</code> variables to install the packages
-      properly.</li>
-    </ul>
-
-    <p>The last feature of the generic infrastructure is the ability to add
-    hooks. These define further actions to perform after existing steps.
-    Most hooks aren't really useful for generic packages, since the
-    <code>.mk</code> file already has full control over the actions
-    performed in each step of the package construction. The hooks are more
-    useful for packages using the autotools infrastructure described below.
-    However, since they are provided by the generic infrastructure, they are
-    documented here. The exception is <code>LIBFOO_POST_PATCH_HOOKS</code>.
-    Patching the package is not user definable, so
-    <code>LIBFOO_POST_PATCH_HOOKS</code> will be userful for generic packages.
-    </p>
-
-    <p>The following hook points are available:</p>
-
-    <ul>
-      <li><code>LIBFOO_POST_PATCH_HOOKS</code></li>
-      <li><code>LIBFOO_PRE_CONFIGURE_HOOKS</code></li>
-      <li><code>LIBFOO_POST_CONFIGURE_HOOKS</code></li>
-      <li><code>LIBFOO_POST_BUILD_HOOKS</code></li>
-      <li><code>LIBFOO_POST_INSTALL_HOOKS</code> (for host packages only)</li>
-      <li><code>LIBFOO_POST_INSTALL_STAGING_HOOKS</code> (for target packages only)</li>
-      <li><code>LIBFOO_POST_INSTALL_TARGET_HOOKS</code> (for target packages only)</li>
-    </ul>
-
-    <p>These variables are <i>lists</i> of variable names containing actions
-    to be performed at this hook point. This allows several hooks to be
-    registered at a given hook point. Here is an example:</p>
-
-<pre>
-define LIBFOO_POST_PATCH_FIXUP
-	action1
-	action2
-endef
-
-LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
-</pre>
-
-   <h4 id="autotools-tutorial">Makefile for autotools-based packages : tutorial</h4>
-
-   <p>First, let's see how to write a <code>.mk</code> file for an
-   autotools-based package, with an example :</p>
-
-<pre>
-<span style="color: #000000">01:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span>
-<span style="color: #000000">02:</span><span style="font-style: italic; color: #9A1900"> #</span>
-<span style="color: #000000">03:</span><span style="font-style: italic; color: #9A1900"> # libfoo</span>
-<span style="color: #000000">04:</span><span style="font-style: italic; color: #9A1900"> #</span>
-<span style="color: #000000">05:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span>
-<span style="color: #000000">06:</span><span style="color: #009900"> LIBFOO_VERSION</span> = 1.0
-<span style="color: #000000">07:</span><span style="color: #009900"> LIBFOO_SOURCE</span> = libfoo-<span style="color: #009900">$(LIBFOO_VERSION)</span>.tar.gz
-<span style="color: #000000">08:</span><span style="color: #009900"> LIBFOO_SITE</span> = http://www.foosoftware.org/download
-<span style="color: #000000">09:</span><span style="color: #009900"> LIBFOO_INSTALL_STAGING</span> = YES
-<span style="color: #000000">10:</span><span style="color: #009900"> LIBFOO_INSTALL_TARGET</span> = YES
-<span style="color: #000000">11:</span><span style="color: #009900"> LIBFOO_CONF_OPT</span> = --enable-shared
-<span style="color: #000000">12:</span><span style="color: #009900"> LIBFOO_DEPENDENCIES</span> = libglib2 host-pkg-config
-<span style="color: #000000">13:</span>
-<span style="color: #000000">14:</span><span style="color: #009900"> $(eval $(call AUTOTARGETS,package,libfoo))</span>
-</pre>
-
-    <p>On line 6, we declare the version of the package.</p>
-
-    <p>On line 7 and 8, we declare the name of the tarball and the location
-    of the tarball on the Web. Buildroot will automatically download the
-    tarball from this location.</p>
-
-    <p>On line 9, we tell Buildroot to install the package to the staging
-    directory. The staging directory, located in <code>output/staging/</code>
-    is the directory where all the packages are installed, including their
-    development files, etc. By default, packages are not installed to the
-    staging directory, since usually, only libraries need to be installed in
-    the staging directory: their development files are needed to compile
-    other libraries or applications depending on them. Also by default, when
-    staging installation is enabled, packages are installed in this location
-    using the <code>make install</code> command.</p>
-
-    <p>On line 10, we tell Buildroot to also install the package to the
-    target directory. This directory contains what will become the root
-    filesystem running on the target. Usually, we try not to install header
-    files and to install stripped versions of the binary. By default, target
-    installation is enabled, so in fact, this line is not strictly
-    necessary. Also by default, packages are installed in this location
-    using the <code>make install</code> command.</p>
-
-    <p>On line 11, we tell Buildroot to pass a custom configure option, that
-    will be passed to the <code>./configure</code> script before configuring
-    and building the package.</p>
-
-    <p>On line 12, we declare our dependencies, so that they are built
-    before the build process of our package starts.</p>
-
-    <p>Finally, on line line 14, we invoke the <code>AUTOTARGETS</code>
-    macro that generates all the Makefile rules that actually allows the
-    package to be built.</p>
-
-    <h4 id="autotools-reference">Makefile for autotools packages : reference</h4>
-
-    <p>The main macro of the autotools package infrastructure is
-    <code>AUTOTARGETS</code>. It has the same number of arguments and the
-    same semantic as the <code>GENTARGETS</code> macro, which is the main
-    macro of the generic package infrastructure. For autotools packages, the
-    ability to have target and host packages is also available (and is
-    actually widely used).</p>
-
-    <p>Just like the generic infrastructure, the autotools infrastructure
-    works by defining a number of variables before calling the
-    <code>AUTOTARGETS</code> macro.</p>
-
-    <p>First, all the package metadata information variables that exist in the
-    generic infrastructure also exist in the autotools infrastructure:
-    <code>LIBFOO_VERSION</code>, <code>LIBFOO_SOURCE</code>,
-    <code>LIBFOO_PATCH</code>, <code>LIBFOO_SITE</code>,
-    <code>LIBFOO_SUBDIR</code>, <code>LIBFOO_DEPENDENCIES</code>,
-    <code>LIBFOO_INSTALL_STAGING</code>, <code>LIBFOO_INSTALL_TARGET</code>.</p>
-
-    <p>A few additional variables, specific to the autotools infrastructure,
-    can also be defined. Many of them are only useful in very specific
-    cases, typical packages will therefore only use a few of them.</p>
-
-    <ul>
-      <li><code>LIBFOO_SUBDIR</code> may contain the name of a subdirectory
-      inside the package that contains the configure script. This is useful,
-      if for example, the main configure script is not at the root of the
-      tree extracted by the tarball. If <code>HOST_LIBFOO_SUBDIR</code> is
-      not specified, it defaults to <code>LIBFOO_SUBDIR</code>.</li>
-
-      <li><code>LIBFOO_CONF_ENV</code>, to specify additional environment
-      variables to pass to the configure script. By default, empty.</li>
-
-      <li><code>LIBFOO_CONF_OPT</code>, to specify additional configure
-      options to pass to the configure script. By default, empty.</li>
-
-      <li><code>LIBFOO_MAKE</code>, to specify an alternate <code>make</code>
-      command. This is typically useful when parallel make is enabled in
-      the configuration (using <code>BR2_JLEVEL</code>) but that this
-      feature should be disabled for the given package, for one reason or
-      another. By default, set to <code>$(MAKE)</code>. If parallel building
-      is not supported by the package, then it should be set to
-      <code>LIBFOO_MAKE=$(MAKE1)</code>.</li>
-
-      <li><code>LIBFOO_MAKE_ENV</code>, to specify additional environment
-      variables to pass to make in the build step. These are passed before
-      the <code>make</code> command. By default, empty.</li>
-
-      <li><code>LIBFOO_MAKE_OPT</code>, to specify additional variables to
-      pass to make in the build step. These are passed after the
-      <code>make</code> command. By default, empty.</li>
-
-      <li><code>LIBFOO_AUTORECONF</code>, tells whether the package should
-      be autoreconfigured or not (i.e, if the configure script and
-      Makefile.in files should be re-generated by re-running autoconf,
-      automake, libtool, etc.). Valid values are <code>YES</code> and
-      <code>NO</code>. By default, the value is <code>NO</code></li>
-
-      <li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional options
-      passed to the <i>autoreconf</i> program if
-      <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
-
-      <li><code>LIBFOO_LIBTOOL_PATCH</code> tells whether the Buildroot
-      patch to fix libtool cross-compilation issues should be applied or
-      not. Valid values are <code>YES</code> and <code>NO</code>. By
-      default, the value is <code>YES</code></li>
-
-      <li><code>LIBFOO_INSTALL_STAGING_OPT</code> contains the make options
-      used to install the package to the staging directory. By default, the
-      value is <code>DESTDIR=$$(STAGING_DIR) install</code>, which is
-      correct for most autotools packages. It is still possible to override
-      it.</li>
-
-      <li><code>LIBFOO_INSTALL_TARGET_OPT</code> contains the make options
-      used to install the package to the target directory. By default, the
-      value is <code>DESTDIR=$$(TARGET_DIR) install</code>. The default
-      value is correct for most autotools packages, but it is still possible
-      to override it if needed.</li>
-
-      <li><code>LIBFOO_CLEAN_OPT</code> contains the make options used to
-      clean the package. By default, the value is <code>clean</code>.</li>
-
-      <li><code>LIBFOO_UNINSTALL_STAGING_OPT</code>, contains the make
-      options used to uninstall the package from the staging directory. By
-      default, the value is <code>DESTDIR=$$(STAGING_DIR) uninstall</code>.</li>
-
-      <li><code>LIBFOO_UNINSTALL_TARGET_OPT</code>, contains the make
-      options used to uninstall the package from the target directory. By
-      default, the value is <code>DESTDIR=$$(TARGET_DIR) uninstall</code>.</li>
-    </ul>
-
-    <p>With the autotools infrastructure, all the steps required to build
-    and install the packages are already defined, and they generally work
-    well for most autotools-based packages. However, when required, it is
-    still possible to customize what is done in any particular step:</p>
-
-    <ul>
-      <li>By adding a post-operation hook (after extract, patch, configure,
-      build or install). See the reference documentation of the generic
-      infrastructure for details.</li>
-
-      <li>By overriding one of the steps. For example, even if the autotools
-      infrastructure is used, if the package <code>.mk</code> file defines its
-      own <code>LIBFOO_CONFIGURE_CMDS</code> variable, it will be used
-      instead of the default autotools one. However, using this method
-      should be restricted to very specific cases. Do not use it in the
-      general case.</li>
-    </ul>
-
-    <h4 id="cmake-tutorial">Makefile for CMake-based packages : tutorial</h4>
-
-    <p>First, let's see how to write a <code>.mk</code> file for a CMake-based
-    package, with an example :</p>
-
-<pre>
-<span style="color: #000000">01:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span>
-<span style="color: #000000">02:</span><span style="font-style: italic; color: #9A1900"> #</span>
-<span style="color: #000000">03:</span><span style="font-style: italic; color: #9A1900"> # libfoo</span>
-<span style="color: #000000">04:</span><span style="font-style: italic; color: #9A1900"> #</span>
-<span style="color: #000000">05:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span>
-<span style="color: #000000">06:</span><span style="color: #009900"> LIBFOO_VERSION</span> = 1.0
-<span style="color: #000000">07:</span><span style="color: #009900"> LIBFOO_SOURCE</span> = libfoo-<span style="color: #009900">$(LIBFOO_VERSION)</span>.tar.gz
-<span style="color: #000000">08:</span><span style="color: #009900"> LIBFOO_SITE</span> = http://www.foosoftware.org/download
-<span style="color: #000000">09:</span><span style="color: #009900"> LIBFOO_INSTALL_STAGING</span> = YES
-<span style="color: #000000">10:</span><span style="color: #009900"> LIBFOO_INSTALL_TARGET</span> = YES
-<span style="color: #000000">11:</span><span style="color: #009900"> LIBFOO_CONF_OPT</span> = -DBUILD_DEMOS=ON
-<span style="color: #000000">12:</span><span style="color: #009900"> LIBFOO_DEPENDENCIES</span> = libglib2 host-pkg-config
-<span style="color: #000000">13:</span>
-<span style="color: #000000">14:</span><span style="color: #009900"> $(eval $(call CMAKETARGETS,package,libfoo))</span>
-</pre>
-
-    <p>On line 6, we declare the version of the package.</p>
-
-    <p>On line 7 and 8, we declare the name of the tarball and the location
-    of the tarball on the Web. Buildroot will automatically download the
-    tarball from this location.</p>
-
-    <p>On line 9, we tell Buildroot to install the package to the staging
-    directory. The staging directory, located in <code>output/staging/</code>
-    is the directory where all the packages are installed, including their
-    development files, etc. By default, packages are not installed to the
-    staging directory, since usually, only libraries need to be installed in
-    the staging directory: their development files are needed to compile
-    other libraries or applications depending on them. Also by default, when
-    staging installation is enabled, packages are installed in this location
-    using the <code>make install</code> command.</p>
-
-    <p>On line 10, we tell Buildroot to also install the package to the
-    target directory. This directory contains what will become the root
-    filesystem running on the target. Usually, we try not to install header
-    files and to install stripped versions of the binary. By default, target
-    installation is enabled, so in fact, this line is not strictly
-    necessary. Also by default, packages are installed in this location
-    using the <code>make install</code> command.</p>
-
-    <p>On line 11, we tell Buildroot to pass custom options to CMake when it is
-    configuring the package.</p>
-
-    <p>On line 12, we declare our dependencies, so that they are built
-    before the build process of our package starts.</p>
-
-    <p>Finally, on line line 14, we invoke the <code>CMAKETARGETS</code>
-    macro that generates all the Makefile rules that actually allows the
-    package to be built.</p>
-
-    <h4 id="cmake-reference">Makefile for CMake packages : reference</h4>
-
-    <p>The main macro of the CMake package infrastructure is
-    <code>CMAKETARGETS</code>. It has the same number of arguments and the
-    same semantic as the <code>GENTARGETS</code> macro, which is the main
-    macro of the generic package infrastructure. For CMake packages, the
-    ability to have target and host packages is also available.</p>
-
-    <p>Just like the generic infrastructure, the CMake infrastructure
-    works by defining a number of variables before calling the
-    <code>CMAKETARGETS</code> macro.</p>
-
-    <p>First, all the package metadata information variables that exist in the
-    generic infrastructure also exist in the CMake infrastructure:
-    <code>LIBFOO_VERSION</code>, <code>LIBFOO_SOURCE</code>,
-    <code>LIBFOO_PATCH</code>, <code>LIBFOO_SITE</code>,
-    <code>LIBFOO_SUBDIR</code>, <code>LIBFOO_DEPENDENCIES</code>,
-    <code>LIBFOO_INSTALL_STAGING</code>, <code>LIBFOO_INSTALL_TARGET</code>.</p>
-
-    <p>A few additional variables, specific to the CMake infrastructure,
-    can also be defined. Many of them are only useful in very specific
-    cases, typical packages will therefore only use a few of them.</p>
-
-    <ul>
-      <li><code>LIBFOO_SUBDIR</code> may contain the name of a subdirectory
-      inside the package that contains the main CMakeLists.txt file. This is
-      useful, if for example, the main CMakeLists.txt file is not at the root
-      of the tree extracted by the tarball. If <code>HOST_LIBFOO_SUBDIR</code>
-      is not specified, it defaults to <code>LIBFOO_SUBDIR</code>.</li>
-
-      <li><code>LIBFOO_CONF_ENV</code>, to specify additional environment
-      variables to pass to CMake. By default, empty.</li>
-
-      <li><code>LIBFOO_CONF_OPT</code>, to specify additional configure
-      options to pass to CMake. By default, empty.</li>
-
-      <li><code>LIBFOO_MAKE</code>, to specify an alternate <code>make</code>
-      command. This is typically useful when parallel make is enabled in
-      the configuration (using <code>BR2_JLEVEL</code>) but that this
-      feature should be disabled for the given package, for one reason or
-      another. By default, set to <code>$(MAKE)</code>. If parallel building
-      is not supported by the package, then it should be set to
-      <code>LIBFOO_MAKE=$(MAKE1)</code>.</li>
-
-      <li><code>LIBFOO_MAKE_ENV</code>, to specify additional environment
-      variables to pass to make in the build step. These are passed before
-      the <code>make</code> command. By default, empty.</li>
-
-      <li><code>LIBFOO_MAKE_OPT</code>, to specify additional variables to
-      pass to make in the build step. These are passed after the
-      <code>make</code> command. By default, empty.</li>
-
-      <li><code>LIBFOO_INSTALL_STAGING_OPT</code> contains the make options
-      used to install the package to the staging directory. By default, the
-      value is <code>DESTDIR=$$(STAGING_DIR) install</code>, which is
-      correct for most CMake packages. It is still possible to override
-      it.</li>
-
-      <li><code>LIBFOO_INSTALL_TARGET_OPT</code> contains the make options
-      used to install the package to the target directory. By default, the
-      value is <code>DESTDIR=$$(TARGET_DIR) install</code>. The default
-      value is correct for most CMake packages, but it is still possible
-      to override it if needed.</li>
-
-      <li><code>LIBFOO_CLEAN_OPT</code> contains the make options used to
-      clean the package. By default, the value is <code>clean</code>.</li>
-    </ul>
-
-    <p>With the CMake infrastructure, all the steps required to build
-    and install the packages are already defined, and they generally work
-    well for most CMake-based packages. However, when required, it is
-    still possible to customize what is done in any particular step:</p>
-
-    <ul>
-      <li>By adding a post-operation hook (after extract, patch, configure,
-      build or install). See the reference documentation of the generic
-      infrastructure for details.</li>
-
-      <li>By overriding one of the steps. For example, even if the CMake
-      infrastructure is used, if the package <code>.mk</code> file defines its
-      own <code>LIBFOO_CONFIGURE_CMDS</code> variable, it will be used
-      instead of the default CMake one. However, using this method
-      should be restricted to very specific cases. Do not use it in the
-      general case.</li>
-    </ul>
-
-    <h4 id ="manual-tutorial">Manual Makefile : tutorial</h4>
-
-    <p><b>NOTE: new manual makefiles should not be created, and existing
-    manual makefiles should be converted either to the generic, autotools
-    or cmake infrastructure. This section is only kept to document the existing
-    manual makefiles and to help understand how they work.</b></p>
-
-<pre>
-01: #############################################################
-02: #
-03: # libfoo
-04: #
-05: #############################################################
-<span id="ex2line6">06: LIBFOO_VERSION:=1.0</span>
-07: LIBFOO_SOURCE:=libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE:=http://www.foosoftware.org/downloads
-09: LIBFOO_DIR:=$(BUILD_DIR)/foo-$(FOO_VERSION)
-10: LIBFOO_BINARY:=foo
-11: LIBFOO_TARGET_BINARY:=usr/bin/foo
-12:
-<span id="ex2line13">13: $(DL_DIR)/$(LIBFOO_SOURCE):</span>
-14: 	$(call DOWNLOAD,$(LIBFOO_SITE),$(LIBFOO_SOURCE))
-15:
-<span id="ex2line16">16: $(LIBFOO_DIR)/.source: $(DL_DIR)/$(LIBFOO_SOURCE)</span>
-17: 	$(ZCAT) $(DL_DIR)/$(LIBFOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-18: 	touch $@
-19:
-<span id="ex2line20">20: $(LIBFOO_DIR)/.configured: $(LIBFOO_DIR)/.source</span>
-21: 	(cd $(LIBFOO_DIR); rm -rf config.cache; \
-22: 		$(TARGET_CONFIGURE_OPTS) \
-23: 		$(TARGET_CONFIGURE_ARGS) \
-24: 		./configure \
-25: 		--target=$(GNU_TARGET_NAME) \
-26: 		--host=$(GNU_TARGET_NAME) \
-27: 		--build=$(GNU_HOST_NAME) \
-28: 		--prefix=/usr \
-29: 		--sysconfdir=/etc \
-30: 	)
-31: 	touch $@
-32:
-<span id="ex2line33">33: $(LIBFOO_DIR)/$(LIBFOO_BINARY): $(LIBFOO_DIR)/.configured</span>
-34: 	$(MAKE) CC=$(TARGET_CC) -C $(LIBFOO_DIR)
-35:
-<span id="ex2line36">36: $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY): $(LIBFOO_DIR)/$(LIBFOO_BINARY)</span>
-37: 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIBFOO_DIR) install-strip
-38: 	rm -Rf $(TARGET_DIR)/usr/man
-39:
-<span id="ex2line40">40: libfoo: uclibc ncurses $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY)</span>
-41:
-<span id="ex2line42">42: libfoo-source: $(DL_DIR)/$(LIBFOO_SOURCE)</span>
-43:
-<span id="ex2line44">44: libfoo-clean:</span>
-45: 	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBFOO_DIR) uninstall
-46: 	-$(MAKE) -C $(LIBFOO_DIR) clean
-47:
-<span id="ex2line48">48: libfoo-dirclean:</span>
-49: 	rm -rf $(LIBFOO_DIR)
-50:
-<span id="ex2line51">51: #############################################################</span>
-52: #
-53: # Toplevel Makefile options
-54: #
-55: #############################################################
-56: ifeq ($(BR2_PACKAGE_LIBFOO),y)
-57: TARGETS+=libfoo
-58: endif
-</pre>
-
-    <p>First of all, this Makefile example works for a package which
-    comprises a single binary executable. For other software, such as
-    libraries or more complex stuff with multiple binaries, it must be
-    adapted. For examples look at the other <code>*.mk</code> files in the
-    <code>package</code> directory.</p>
-
-    <p>At lines <a href="#ex2line6">6-11</a>, a couple of useful variables are
-    defined:</p>
-
-    <ul>
-      <li><code>LIBFOO_VERSION</code>: The version of <i>libfoo</i> that
-      should be downloaded.</li>
-
-      <li><code>LIBFOO_SOURCE</code>: The name of the tarball of <i>libfoo</i>
-      on the download website or FTP site. As you can see
-      <code>LIBFOO_VERSION</code> is used.</li>
-
-      <li><code>LIBFOO_SITE</code>: The HTTP or FTP site from which
-      <i>libfoo</i> archive is downloaded. It must include the complete path to
-      the directory where <code>LIBFOO_SOURCE</code> can be found.</li>
-
-      <li><code>LIBFOO_DIR</code>: The directory into which the software will
-      be configured and compiled. Basically, it's a subdirectory of
-      <code>BUILD_DIR</code> which is created upon decompression of the tarball.
-      </li>
-
-      <li><code>LIBFOO_BINARY</code>: Software binary name. As said previously,
-      this is an example for a package with a single binary.</li>
-
-      <li><code>LIBFOO_TARGET_BINARY</code>: The full path of the binary inside
-      the target filesystem.</li> </ul>
-
-    <p>Lines <a href="#ex2line13">13-14</a> define a target that downloads
-    the tarball from the remote site to the download directory
-    (<code>DL_DIR</code>).</p>
-
-    <p>Lines <a href="#ex2line16">16-18</a> define a target and associated
-    rules that uncompress the downloaded tarball. As you can see, this
-    target depends on the tarball file so that the previous target (lines
-    <a href="#ex2line13">13-14</a>) is called before executing the rules of
-    the current target. Uncompressing is followed by <i>touching</i> a
-    hidden file to mark the software as having been uncompressed. This trick
-    is used everywhere in a Buildroot Makefile to split steps (download,
-    uncompress, configure, compile, install) while still having correct
-    dependencies.</p>
-
-    <p>Lines <a href="#ex2line20">20-31</a> define a target and associated
-    rules that configure the software. It depends on the previous target
-    (the hidden <code>.source</code> file) so that we are sure the software
-    has been uncompressed. In order to configure the package, it basically
-    runs the well-known <code>./configure</code> script. As we may be doing
-    cross-compilation, <code>target</code>, <code>host</code> and
-    <code>build</code> arguments are given. The prefix is also set to
-    <code>/usr</code>, not because the software will be installed in
-    <code>/usr</code> on your host system, but because the software will be
-    installed in <code> /usr</code> on the target filesystem. Finally it
-    creates a <code>.configured</code> file to mark the software as
-    configured.</p>
-
-    <p>Lines <a href="#ex2line33">33-34</a> define a target and a rule that
-    compile the software. This target will create the binary file in the
-    compilation directory and depends on the software being already
-    configured (hence the reference to the <code>.configured</code> file).
-    It basically runs <code>make</code> inside the source directory.</p>
-
-    <p>Lines <a href="#ex2line36">36-38</a> define a target and associated
-    rules that install the software inside the target filesystem. They
-    depend on the binary file in the source directory to make sure the
-    software has been compiled. They use the <code>install-strip</code>
-    target of the software <code>Makefile</code> by passing a
-    <code>DESTDIR</code> argument so that the <code>Makefile</code> doesn't
-    try to install the software in the host <code>/usr</code> but rather in
-    the target <code>/usr</code>. After the installation, the
-    <code>/usr/man </code> directory inside the target filesystem is removed
-    to save space. </p>
-
-    <p>Line <a href="#ex2line40">40</a> defines the main target of the
-    software &mdash; the one that will eventually be used by the top level
-    <code>Makefile</code> to download, compile, and then install this
-    package. This target should first of all depend on all needed
-    dependencies of the software (in our example, <i>uclibc</i> and
-    <i>ncurses</i>) and also depend on the final binary. This last dependency
-    will call all previous dependencies in the correct order.</p>
-
-    <p>Line <a href="#ex2line42">42</a> defines a simple target that only
-    downloads the code source. This is not used during normal operation of
-    Buildroot, but is needed if you intend to download all required sources
-    at once for later offline build. Note that if you add a new package,
-    providing a <code>libfoo-source</code> target is <i>mandatory</i> to
-    support users that wish to do offline-builds. Furthermore, it eases
-    checking if all package-sources are downloadable.</p>
-
-    <p>Lines <a href="#ex2line44">44-46</a> define a simple target to clean
-    the software build by calling the Makefile with the appropriate options.
-    The <code>-clean</code> target should run <code>make clean</code> on
-    $(BUILD_DIR)/package-version and MUST uninstall all files of the package
-    from $(STAGING_DIR) and from $(TARGET_DIR).</p>
-
-    <p>Lines <a href="#ex2line48">48-49</a> define a simple target to
-    completely remove the directory in which the software was uncompressed,
-    configured and compiled. The <code>-dirclean</code> target MUST
-    completely rm $(BUILD_DIR)/ package-version.</p>
-
-    <p>Lines <a href="#ex2line51">51-58</a> add the target <code>libfoo</code>
-    to the list of targets to be compiled by Buildroot, by first checking if
-    the configuration option for this package has been enabled using the
-    configuration tool. If so, it then &quot;subscribes&quot; this package
-    to be compiled by adding the package to the TARGETS global variable.
-    The name added to the TARGETS global variable is the name of this
-    package's target, as defined on line <a href="#ex2line40">40</a>, which
-    is used by Buildroot to download, compile, and then install this package.
-    </p>
-
-    <h3 id="gettext-integration">Gettext integration and interaction with packages</h3>
-
-    <p>Many packages that support internationalization use the gettext
-    library. Dependencies for this library are fairly complicated and therefore,
-    deserves some explanation.</p>
-
-    <p>The <i>uClibc</i> C library doesn't implement gettext functionality,
-    therefore with this C library, a separate gettext must be compiled. On
-    the other hand, the <i>glibc</i> C library does integrate its own
-    gettext, and in this case, the separate gettext library should not be
-    compiled, because it creates various kinds of build failures.</p>
-
-    <p>Additionally, some packages (such as libglib2) do require gettext
-    unconditionally, while other packages (those who support
-    <code>--disable-nls</code> in general) only require gettext when locale
-    support is enabled.</p>
-
-    <p>Therefore, Buildroot defines two configuration options:</p>
-
-    <ul>
-      <li><code>BR2_NEEDS_GETTEXT</code>, which is true as soon as the
-      toolchain doesn't provide its own gettext implementation</li>
-
-      <li><code>BR2_NEEDS_GETTEXT_IF_LOCALE</code>, which is true if the
-      toolchain doesn't provide its own gettext implementation and if locale
-      support is enabled</li> </ul>
-
-    <p>Therefore, packages that unconditionally need gettext should:</p>
-
-    <ol>
-      <li>Use <code>select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT</code>
-      and possibly <code>select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT</code>,
-      if libintl is also needed</li>
-
-      <li>Use <code>$(if $(BR2_NEEDS_GETTEXT),gettext)</code> in the package
-      <code>DEPENDENCIES</code> variable</li>
-    </ol>
-
-    <p>Packages that need gettext only when locale support is enabled should:
-    </p>
-
-    <ol>
-      <li>Use
-      <code>select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE</code>
-      and possibly
-      <code>select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE</code>,
-      if libintl is also needed</li>
-
-      <li>Use <code>$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)</code> in
-      the package <code>DEPENDENCIES</code> variable</li>
-    </ol>
-
-    <h3>Conclusion</h3>
-
-    <p>As you can see, adding a software package to Buildroot is simply a
-    matter of writing a Makefile using an  existing example and modifying it
-    according to the compilation process required by the package.</p>
-
-    <p>If you package software that might be useful for other people, don't
-    forget to send a patch to Buildroot developers!</p>
-
-    <h2 id="faq">Frequently asked questions</h2>
-
-    <ul>
-      <li><a href="#faq-boot-hangs">The boot hangs
-      after <code>Starting network...</code></a></li>
-      <li><a href="#module-init-tools-doesnt-build">module-init-tools
-      fails to build with <code>cannot find -lc</code></a></li>
-    </ul>
-
-    <h3 id="faq-boot-hangs">The boot hangs after <code>Starting
-    network...</code></h3>
-
-    <p>If the boot process seems to hang after the following messages
-    (messages not necessarly exactly similar, depending on the list of
-    packages selected):</p>
-
-    <pre>Freeing init memory: 3972K
-Initializing random number generator... done.
-Starting network...
-Starting dropbear sshd: generating rsa key... generating dsa key... OK</pre>
-
-    <p>then it means that your system is running, but didn't start a
-    shell on the serial console. In order to have the system start a
-    shell on your serial console, you have to go in the Buildroot
-    configuration, <code>System configuration</code>, and modify
-    <code>Port to run a getty (login prompt) on</code> and
-    <code>Baudrate to use</code> as appropriate. This will automatically tune
-    the <code>/etc/inittab</code> file of the generated system so that
-    a shell starts on the correct serial port.</p>
-
-    <h3 id="module-init-tools-doesnt-build">module-init-tools
-      fails to build with <code>cannot find -lc</code></h3>
-
-    <p>If the build of <i>module-init-tools</i> for the host fails
-    with:</p>
-
-    <pre>/usr/bin/ld: cannot find -lc </pre>
-
-    <p>then probably you are running a Fedora (or similar)
-    distribution, and you should install the <code>glibc-static</code>
-    package. This is because the <i>module-init-tools</i> build
-    process wants to link statically against the C library.</p>
-
-    <h2 id="links">Resources</h2>
-
-    <p>To learn more about Buildroot you can visit these websites:</p>
-
-    <ul>
-      <li><a href="http://www.uclibc.org/">http://www.uclibc.org/</a></li>
-      <li><a href="http://www.busybox.net/">http://www.busybox.net/</a></li>
-    </ul>
-  </div>
-</body>
-</html>

From 8278ed43ef159d8b9dfe1be2d41ad5bcd8241dcc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 7 Jul 2012 17:51:17 +0200
Subject: [PATCH 2333/6849] graph-depends: ignore a few more uninteresting
 targets

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/scripts/graph-depends | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 4d82282f50..da050da8ab 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -128,6 +128,8 @@ if mode == FULL_MODE:
     for tg in targets:
         # Skip uninteresting targets
         if tg == 'target-generic-issue' or \
+                tg == 'target-generic-getty-busybox' or \
+                tg == 'target-generic-do-remount-rw' or \
                 tg == 'target-finalize' or \
                 tg == 'erase-fakeroots' or \
                 tg == 'target-generic-hostname':

From d2ff1ac2b34ed23273e1284255ba5970f47126d1 Mon Sep 17 00:00:00 2001
From: Aras Vaichas <aras.vaichas@gmail.com>
Date: Thu, 5 Jul 2012 22:01:31 +0200
Subject: [PATCH 2334/6849] syslinux: bump to 4.05

* bump syslinux from 4.04 to 4.05
* add patch to fix build problem with 4.05, see
http://old.nabble.com/syslinux-fails-to-build-td34112447.html
* add util-linux dependency and make sure the build finds it

Signed-off-by: Aras Vaichas <aras.vaichas@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 +++++++++++++++
 boot/syslinux/syslinux.mk                       |  9 ++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 boot/syslinux/syslinux-build-fix-for-uuid.patch

diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch b/boot/syslinux/syslinux-build-fix-for-uuid.patch
new file mode 100644
index 0000000000..04ff562356
--- /dev/null
+++ b/boot/syslinux/syslinux-build-fix-for-uuid.patch
@@ -0,0 +1,15 @@
+Author: Micah Gersten <micahg@ubuntu.com>
+Description: Fix build failure with --as-needed (Closes: #654838).
+
+diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile
+--- syslinux.orig/utils/Makefile       2011-12-23 14:53:26.653571511 +0100
++++ syslinux/utils/Makefile    2012-01-22 18:55:03.849466924 +0100
+@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
+ 	$(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
+
+ isohybrid: isohybrid.o isohdpfx.o
+-	$(CC) $(LDFLAGS) -luuid -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ -luuid
+
+ gethostip: gethostip.o
+ 	$(CC) $(LDFLAGS) -o $@ $^
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 3e89bdfca5..185baab292 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,17 +4,20 @@
 #
 #############################################################
 
-SYSLINUX_VERSION = 4.04
+SYSLINUX_VERSION = 4.05
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
 
 SYSLINUX_INSTALL_TARGET = NO
 SYSLINUX_INSTALL_IMAGES = YES
 
-SYSLINUX_DEPENDENCIES = host-nasm
+SYSLINUX_DEPENDENCIES = host-nasm host-util-linux
 
+# syslinux build system has no convenient way to pass CFLAGS,
+# and the internal zlib should take precedence so -I shouldn't
+# be used.
 define SYSLINUX_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" AR="$(HOSTAR)" -C $(@D)
 endef
 
 SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin

From d09967e0716894b91d27348877467ecba5eccad0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Jul 2012 20:03:53 +0200
Subject: [PATCH 2335/6849] nasm: bump version to 2.10.01, remove dummy target
 package

The target package was only present because at the time 'nasm' was
packaged, there was a bug in the package infrastructure that prevented
a package from having a host only variant. This has been fixed since
then, so we can get rid of the useless dummy target package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/nasm/nasm.mk | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index b819df04b2..9d99209055 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -2,17 +2,10 @@
 #
 # nasm
 #
-# This is special case: nasm is used to build syslinux and
-# pxelinux. As these are for the target, we should cross-compile
-# nasm. However, as nasm is x86-only, there's no point in
-# cross-compiling it. So we just build it for the host. The target
-# variant is only provided because of a bug in the package
-# infrastructure that prevents having only a host variant.
 ############################################################
 
-NASM_VERSION=2.08.01
-NASM_SOURCE=nasm-$(NASM_VERSION).tar.bz2
-NASM_SITE=http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/
+NASM_VERSION = 2.10.01
+NASM_SOURCE  = nasm-$(NASM_VERSION).tar.bz2
+NASM_SITE    = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
 
-$(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

From c98337911cc2427f9cf78e9da44a1b1dead61d4b Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 3 Jul 2012 00:05:46 +0200
Subject: [PATCH 2336/6849] pkg-infra: add host-xxx-package macro

Create host-generic-package, host-autotools-package and
host-cmake-package macros.  Such a macro is more intuitive to use than
the $(call ...,host) construct.  Also it speeds things up by having
one less $(call ...) evaluation.

Also includes documentation update, but not for buildroot.html.

This brings the time for 'make -qp' (which is used by bash-completion)
down from 1.85s to 1.35s on my laptop.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-autotargets.txt  | 10 ++++----
 docs/manual/adding-packages-cmaketargets.txt |  9 ++++---
 docs/manual/adding-packages-gentargets.txt   | 25 +++++++++-----------
 package/pkg-autotargets.mk                   |  9 ++-----
 package/pkg-cmaketargets.mk                  |  9 ++-----
 package/pkg-gentargets.mk                    | 11 +++------
 support/scripts/pkg-stats                    | 12 +++++-----
 7 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/docs/manual/adding-packages-autotargets.txt b/docs/manual/adding-packages-autotargets.txt
index 428a1822be..09a2e7c091 100644
--- a/docs/manual/adding-packages-autotargets.txt
+++ b/docs/manual/adding-packages-autotargets.txt
@@ -23,7 +23,7 @@ package, with an example :
 11: LIBFOO_CONF_OPT = --enable-shared
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
 13:
-14: $(eval $(call AUTOTARGETS))
+14: $(eval $(AUTOTARGETS))
 ------------------------
 
 On line 6, we declare the version of the package.
@@ -67,11 +67,9 @@ package to be built.
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 The main macro of the autotools package infrastructure is
-+AUTOTARGETS+. It has the same number of arguments and the
-same semantic as the +GENTARGETS+ macro, which is the main
-macro of the generic package infrastructure. For autotools packages, the
-ability to have target and host packages is also available (and is
-actually widely used).
++AUTOTARGETS+. It is similar to the +GENTARGETS+ macro. The ability to
+have target and host packages is also available, with the
++host-autotools-package+ macro.
 
 Just like the generic infrastructure, the autotools infrastructure
 works by defining a number of variables before calling the
diff --git a/docs/manual/adding-packages-cmaketargets.txt b/docs/manual/adding-packages-cmaketargets.txt
index 3e400ec14e..a29404270c 100644
--- a/docs/manual/adding-packages-cmaketargets.txt
+++ b/docs/manual/adding-packages-cmaketargets.txt
@@ -23,7 +23,7 @@ with an example :
 11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
 13:
-14: $(eval $(call CMAKETARGETS))
+14: $(eval $(CMAKETARGETS))
 ------------------------
 
 On line 6, we declare the version of the package.
@@ -66,10 +66,9 @@ package to be built.
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 The main macro of the CMake package infrastructure is
-+CMAKETARGETS+. It has the same number of arguments and the same
-semantic as the +GENTARGETS+ macro, which is the main macro of the
-generic package infrastructure. For CMake packages, the ability to
-have target and host packages is also available.
++CMAKETARGETS+. It is similar to the +GENTARGETS+ macro. The ability to
+have target and host packages is also available, with the
++host-cmake-package+ macro.
 
 Just like the generic infrastructure, the CMake infrastructure works
 by defining a number of variables before calling the +CMAKETARGETS+
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 6e9dc89906..2e9ebef713 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -46,7 +46,7 @@ system is based on hand-written Makefiles or shell scripts.
 32: 	/bin/foo  f  4755  0  0  -  -  -  -  -
 33: endef
 34:
-35: $(eval $(call GENTARGETS))
+35: $(eval $(GENTARGETS))
 --------------------------------
 
 The Makefile begins on line 6 to 8 with metadata information: the
@@ -92,19 +92,16 @@ Makefile code necessary to make your package working.
 +GENTARGETS+ Reference
 ~~~~~~~~~~~~~~~~~~~~~~
 
-The +GENTARGETS+ macro takes one optional argument. This argument can
-be used to tell if the package is a target package (cross-compiled for
-the target) or a host package (natively compiled for the host). If
-unspecified, it is assumed that it is a target package. See below for
-details.
-
-For a given package, in a single +.mk+ file, it is possible to call
-GENTARGETS twice, once to create the rules to generate a target
+There are two variants of the generic target. The +GENTARGETS+ macro is
+used for packages to be cross-compiled for the target.  The
++host-generic-package+ macro is used for host packages, natively compiled
+for the host.  It is possible to call both of them in a single +.mk+
+file: once to create the rules to generate a target
 package and once to create the rules to generate a host package:
 
 ----------------------
-$(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(GENTARGETS))
+$(eval $(host-generic-package))
 ----------------------
 
 This might be useful if the compilation of the target package requires
@@ -115,12 +112,12 @@ some tools to be installed on the host. If the package name is
 variables of other packages, if they depend on +libfoo+ or
 +host-libfoo+.
 
-The call to the +GENTARGETS+ macro *must* be at the end of the +.mk+
-file, after all variable definitions.
+The call to the +GENTARGETS+ and/or +host-generic-package+ macro *must* be
+at the end of the +.mk+ file, after all variable definitions.
 
 For the target package, the +GENTARGETS+ uses the variables defined by
 the .mk file and prefixed by the uppercased package name:
-+LIBFOO_*+. For the host package, it uses the +HOST_LIBFOO_*+. For
++LIBFOO_*+. +host-generic-package+ uses the +HOST_LIBFOO_*+ variables. For
 'some' variables, if the +HOST_LIBFOO_+ prefixed variable doesn't
 exist, the package infrastructure uses the corresponding variable
 prefixed by +LIBFOO_+. This is done for variables that are likely to
diff --git a/package/pkg-autotargets.mk b/package/pkg-autotargets.mk
index d31230dd7d..d925cbb463 100644
--- a/package/pkg-autotargets.mk
+++ b/package/pkg-autotargets.mk
@@ -305,10 +305,5 @@ endef
 # Argument 1 is "target" or "host"           [optional, default: "target"]
 ################################################################################
 
-define AUTOTARGETS
-ifeq ($(1),host)
-$(call AUTOTARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
-else
-$(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
-endif
-endef
+AUTOTARGETS = $(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+host-autotools-package = $(call AUTOTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmaketargets.mk
index b405df5054..71cc61036d 100644
--- a/package/pkg-cmaketargets.mk
+++ b/package/pkg-cmaketargets.mk
@@ -190,13 +190,8 @@ endef
 # Argument 1 is "target" or "host"           [optional, default: "target"]
 ################################################################################
 
-define CMAKETARGETS
-ifeq ($(1),host)
-$(call CMAKETARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
-else
-$(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
-endif
-endef
+CMAKETARGETS = $(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+host-cmake-package = $(call CMAKETARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 
 ################################################################################
 # Generation of the CMake toolchain file
diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk
index 51053359ae..a9cee90997 100644
--- a/package/pkg-gentargets.mk
+++ b/package/pkg-gentargets.mk
@@ -504,14 +504,9 @@ endef # GENTARGETS_INNER
 # Argument 1 is "target" or "host"           [optional, default: "target"]
 ################################################################################
 
-define GENTARGETS
-ifeq ($(1),host)
-# In the case of host packages, turn the package name "pkg" into "host-pkg"
-$(call GENTARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
-else
 # In the case of target packages, keep the package name "pkg"
-$(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
-endif
-endef
+GENTARGETS = $(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+# In the case of host packages, turn the package name "pkg" into "host-pkg"
+host-generic-package = $(call GENTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 
 # :mode=makefile:
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 06d9d0de93..e7941bc185 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -100,27 +100,27 @@ for i in $(find package/ -name '*.mk') ; do
     is_manual_target=0
     is_manual_host=0
 
-    if grep -E "\(call AUTOTARGETS,host\)" $i > /dev/null ; then
+    if grep -E "\(host-autotools-package\)" $i > /dev/null ; then
 	is_auto_host=1
     fi
 
-    if grep -E "\(call AUTOTARGETS\)" $i > /dev/null ; then
+    if grep -E "\(AUTOTARGETS\)" $i > /dev/null ; then
 	is_auto_target=1
     fi
 
-    if grep -E "\(call GENTARGETS,host\)" $i > /dev/null ; then
+    if grep -E "\(host-generic-package\)" $i > /dev/null ; then
 	is_pkg_host=1
     fi
 
-    if grep -E "\(call GENTARGETS\)" $i > /dev/null ; then
+    if grep -E "\(GENTARGETS\)" $i > /dev/null ; then
 	is_pkg_target=1
     fi
 
-    if grep -E "\(call CMAKETARGETS,host\)" $i > /dev/null ; then
+    if grep -E "\(host-cmake-package\)" $i > /dev/null ; then
 	is_cmake_host=1
     fi
 
-    if grep -E "\(call CMAKETARGETS\)" $i > /dev/null ; then
+    if grep -E "\(CMAKETARGETS\)" $i > /dev/null ; then
 	is_cmake_target=1
     fi
 

From 69e64c42b7f325e6e21d063644eea51204321539 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 3 Jul 2012 00:06:54 +0200
Subject: [PATCH 2337/6849] all packages: use new host-xxx-package macros

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS,host))/$(eval $(host-generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS,host))/$(eval $(host-autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS,host))/$(eval $(host-cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/syslinux/syslinux.mk                                      | 2 +-
 package/atk/atk.mk                                             | 2 +-
 package/autoconf/autoconf.mk                                   | 2 +-
 package/automake/automake.mk                                   | 2 +-
 package/binutils/binutils.mk                                   | 2 +-
 package/bison/bison.mk                                         | 2 +-
 package/bzip2/bzip2.mk                                         | 2 +-
 package/ccache/ccache.mk                                       | 2 +-
 package/cdrkit/cdrkit.mk                                       | 2 +-
 package/cloop/cloop.mk                                         | 2 +-
 package/cmake/cmake.mk                                         | 2 +-
 package/cramfs/cramfs.mk                                       | 2 +-
 package/crosstool-ng/crosstool-ng.mk                           | 2 +-
 package/dbus-glib/dbus-glib.mk                                 | 2 +-
 package/dbus/dbus.mk                                           | 2 +-
 package/directfb/directfb.mk                                   | 2 +-
 package/e2fsprogs/e2fsprogs.mk                                 | 2 +-
 package/efl/libecore/libecore.mk                               | 2 +-
 package/efl/libedje/libedje.mk                                 | 2 +-
 package/efl/libeet/libeet.mk                                   | 2 +-
 package/efl/libeina/libeina.mk                                 | 2 +-
 package/efl/libembryo/libembryo.mk                             | 2 +-
 package/efl/libevas/libevas.mk                                 | 2 +-
 package/expat/expat.mk                                         | 2 +-
 package/fakeroot/fakeroot.mk                                   | 2 +-
 package/file/file.mk                                           | 2 +-
 package/flex/flex.mk                                           | 2 +-
 package/fontconfig/fontconfig.mk                               | 2 +-
 package/freetype/freetype.mk                                   | 2 +-
 package/gawk/gawk.mk                                           | 2 +-
 package/gdk-pixbuf/gdk-pixbuf.mk                               | 2 +-
 package/genext2fs/genext2fs.mk                                 | 2 +-
 package/genromfs/genromfs.mk                                   | 2 +-
 package/gmp/gmp.mk                                             | 2 +-
 package/gob2/gob2.mk                                           | 2 +-
 package/gperf/gperf.mk                                         | 2 +-
 package/icu/icu.mk                                             | 2 +-
 package/intltool/intltool.mk                                   | 2 +-
 package/jpeg/jpeg.mk                                           | 2 +-
 package/jsmin/jsmin.mk                                         | 2 +-
 package/libcap/libcap.mk                                       | 2 +-
 package/libffi/libffi.mk                                       | 2 +-
 package/libftdi/libftdi.mk                                     | 2 +-
 package/libglib2/libglib2.mk                                   | 2 +-
 package/libgtk2/libgtk2.mk                                     | 2 +-
 package/libpng/libpng.mk                                       | 2 +-
 package/libtool/libtool.mk                                     | 2 +-
 package/libusb-compat/libusb-compat.mk                         | 2 +-
 package/libusb/libusb.mk                                       | 2 +-
 package/libxml-parser-perl/libxml-parser-perl.mk               | 2 +-
 package/libxml2/libxml2.mk                                     | 2 +-
 package/libxslt/libxslt.mk                                     | 2 +-
 package/localedef/localedef.mk                                 | 2 +-
 package/lpc3250loader/lpc3250loader.mk                         | 2 +-
 package/lttng-babeltrace/lttng-babeltrace.mk                   | 2 +-
 package/lua/lua.mk                                             | 2 +-
 package/lzma/lzma.mk                                           | 2 +-
 package/lzo/lzo.mk                                             | 2 +-
 package/m4/m4.mk                                               | 2 +-
 package/makedevs/makedevs.mk                                   | 2 +-
 package/microperl/microperl.mk                                 | 2 +-
 package/module-init-tools/module-init-tools.mk                 | 2 +-
 package/mpc/mpc.mk                                             | 2 +-
 package/mpfr/mpfr.mk                                           | 2 +-
 package/mtd/mtd.mk                                             | 2 +-
 package/nasm/nasm.mk                                           | 3 ++-
 package/ncurses/ncurses.mk                                     | 2 +-
 package/omap-u-boot-utils/omap-u-boot-utils.mk                 | 2 +-
 package/openocd/openocd.mk                                     | 2 +-
 package/orc/orc.mk                                             | 2 +-
 package/pixman/pixman.mk                                       | 2 +-
 package/pkg-config/pkg-config.mk                               | 2 +-
 package/popt/popt.mk                                           | 2 +-
 package/protobuf/protobuf.mk                                   | 2 +-
 package/python-distutilscross/python-distutilscross.mk         | 2 +-
 package/python-setuptools/python-setuptools.mk                 | 2 +-
 package/python/python.mk                                       | 2 +-
 package/ruby/ruby.mk                                           | 2 +-
 package/sam-ba/sam-ba.mk                                       | 2 +-
 package/scons/scons.mk                                         | 2 +-
 package/shared-mime-info/shared-mime-info.mk                   | 2 +-
 package/squashfs/squashfs.mk                                   | 2 +-
 package/squashfs3/squashfs3.mk                                 | 2 +-
 package/sstrip/sstrip.mk                                       | 2 +-
 package/tar/tar.mk                                             | 2 +-
 package/tcl/tcl.mk                                             | 2 +-
 package/uboot-tools/uboot-tools.mk                             | 2 +-
 package/util-linux/util-linux.mk                               | 2 +-
 package/vala/vala.mk                                           | 2 +-
 package/x11r7/libxcb/libxcb.mk                                 | 2 +-
 package/x11r7/pthread-stubs/pthread-stubs.mk                   | 2 +-
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk                   | 2 +-
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk                 | 2 +-
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk             | 2 +-
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk               | 2 +-
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk                     | 2 +-
 package/x11r7/xcb-proto/xcb-proto.mk                           | 2 +-
 package/x11r7/xfont_encodings/xfont_encodings.mk               | 2 +-
 package/x11r7/xfont_font-util/xfont_font-util.mk               | 2 +-
 package/x11r7/xlib_libX11/xlib_libX11.mk                       | 2 +-
 package/x11r7/xlib_libXau/xlib_libXau.mk                       | 2 +-
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk               | 2 +-
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                   | 2 +-
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk                 | 2 +-
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                   | 2 +-
 package/x11r7/xlib_libXrender/xlib_libXrender.mk               | 2 +-
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk               | 2 +-
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk               | 2 +-
 package/x11r7/xlib_xtrans/xlib_xtrans.mk                       | 2 +-
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk           | 2 +-
 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk   | 2 +-
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk           | 2 +-
 package/x11r7/xproto_inputproto/xproto_inputproto.mk           | 2 +-
 package/x11r7/xproto_kbproto/xproto_kbproto.mk                 | 2 +-
 package/x11r7/xproto_renderproto/xproto_renderproto.mk         | 2 +-
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk         | 2 +-
 package/x11r7/xproto_xextproto/xproto_xextproto.mk             | 2 +-
 .../x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk   | 2 +-
 package/x11r7/xproto_xproto/xproto_xproto.mk                   | 2 +-
 package/x11r7/xutil_makedepend/xutil_makedepend.mk             | 2 +-
 package/x11r7/xutil_util-macros/xutil_util-macros.mk           | 2 +-
 package/xz/xz.mk                                               | 2 +-
 package/zlib/zlib.mk                                           | 2 +-
 123 files changed, 124 insertions(+), 123 deletions(-)

diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 185baab292..50dec2bbbd 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -43,4 +43,4 @@ define HOST_SYSLINUX_CLEAN_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 4ac96ffc4a..d90957641e 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -55,4 +55,4 @@ HOST_ATK_CONF_OPT = \
 		--disable-glibtest
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 4e7f3fc62a..8787a7756b 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -18,7 +18,7 @@ HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 522e22ce28..45210625c7 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -24,7 +24,7 @@ HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
 HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # variables used by other packages
 AUTOMAKE = $(HOST_DIR)/usr/bin/automake
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 3293e185c1..e061fde43e 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -62,4 +62,4 @@ endef
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 51325bda22..4ae5f2a14c 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -17,4 +17,4 @@ endef
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 07a26c054e..cb4f38e870 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -104,4 +104,4 @@ define HOST_BZIP2_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index d7106eed12..bee34b43ec 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -43,7 +43,7 @@ HOST_CCACHE_POST_CONFIGURE_HOOKS += \
 	HOST_CCACHE_PATCH_CONFIGURATION
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 ifeq ($(BR2_CCACHE),y)
 ccache-stats: host-ccache
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index a060b0334b..2a748265bf 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -24,4 +24,4 @@ HOST_CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(HOST_DIR)/usr/include"
 HOST_CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
 
 $(eval $(call CMAKETARGETS))
-$(eval $(call CMAKETARGETS,host))
+$(eval $(host-cmake-package))
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index 52567dd959..9996e6755a 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -15,4 +15,4 @@ define HOST_CLOOP_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index af6c53cdfa..9b0f954c1a 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -18,4 +18,4 @@ define HOST_CMAKE_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 57dbe40b5e..beace2319d 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -29,4 +29,4 @@ define HOST_CRAMFS_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 09c57ec2a6..4bf02583aa 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -5,4 +5,4 @@ CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
 HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake host-gperf
 
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 397996e309..2ee52c8b15 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -33,7 +33,7 @@ HOST_DBUS_GLIB_CONF_OPT = \
 		--enable-asserts=yes
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # dbus-glib for the host
 DBUS_GLIB_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-binding-tool
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 7e72e3dbf8..8cd39606f2 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -88,4 +88,4 @@ HOST_DBUS_GEN_INTROSPECT = \
 HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index ecea7df9e7..a7fb7f0799 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -143,7 +143,7 @@ endef
 DIRECTFB_POST_INSTALL_STAGING_HOOKS += DIRECTFB_STAGING_CONFIG_FIXUP
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # directfb-csource for the host
 DIRECTFB_HOST_BINARY:=$(HOST_DIR)/usr/bin/directfb-csource
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 4c0474e0df..6a790d2097 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -104,4 +104,4 @@ E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index d5d2896446..7d2884f9c6 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -99,4 +99,4 @@ LIBECORE_CONF_OPT += --disable-ecore-evas
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index 5252d6ec15..1d9434928e 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -21,4 +21,4 @@ endif
 HOST_LIBEDJE_CONF_OPT = --enable-edje-cc
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index f9af219b71..e508f5343a 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -12,4 +12,4 @@ LIBEET_INSTALL_STAGING = YES
 LIBEET_DEPENDENCIES = host-pkg-config zlib jpeg libeina
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index b457e3ff82..2e57b99b10 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -12,4 +12,4 @@ LIBEINA_INSTALL_STAGING = YES
 LIBEINA_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index 0054ff41c8..5456a06b56 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -12,4 +12,4 @@ LIBEMBRYO_INSTALL_STAGING = YES
 LIBEMBRYO_DEPENDENCIES = host-pkg-config libeina
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index c5569427e3..e21db82ace 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -213,4 +213,4 @@ LIBEVAS_CONF_OPT += --disable-doc
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index ea008db01c..9221268ec8 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -12,4 +12,4 @@ EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkg-config
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index a9074cba4d..734b065933 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -9,4 +9,4 @@ FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20111201T093630Z/pool/
 FAKEROOT_LICENSE = GPLv3+
 FAKEROOT_LICENSE_FILES = COPYING
 
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/file/file.mk b/package/file/file.mk
index 7f077528e6..f2d9172831 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -15,4 +15,4 @@ define FILE_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 041aba8abe..d1a9a2bb7b 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -44,4 +44,4 @@ FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 329f8198bb..a993c9cedb 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -26,4 +26,4 @@ HOST_FONTCONFIG_CONF_OPT = \
 		--disable-static
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index f351fd2674..b2428cb41d 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -34,4 +34,4 @@ FREETYPE_POST_INSTALL_TARGET_HOOKS += FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 8f374cb00b..bb911574d6 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -31,4 +31,4 @@ define GAWK_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 8dc1c47183..2192eb972f 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -54,4 +54,4 @@ HOST_GDK_PIXBUF_CONF_OPT = \
 
 HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng
 
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 1863cf119c..e5c4504245 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -9,4 +9,4 @@ GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index d6f48752a0..56d1de04f3 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -28,4 +28,4 @@ define HOST_GENROMFS_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
\ No newline at end of file
+$(eval $(host-generic-package))
\ No newline at end of file
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 7a17ebcc8b..a07f74b064 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -15,4 +15,4 @@ GMP_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -marm"
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index c5572884fd..8dac356071 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -10,7 +10,7 @@ GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
 HOST_GOB2_DEPENDENCIES = host-libglib2
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # gob2 for the host
 GOB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/gob2
diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index faea97823e..21e4cc796f 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -8,4 +8,4 @@ GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 42416b7966..71297e2f24 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -25,4 +25,4 @@ endef
 ICU_POST_INSTALL_TARGET_HOOKS += ICU_PREFIX_FIXUP
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 6d13cc10c9..8ce66f71a0 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -13,5 +13,5 @@ HOST_INTLTOOL_CONF_OPT = \
   PERLLIB=$(HOST_DIR)/usr/lib/perl
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index a6523817b9..d4e94830fc 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -15,4 +15,4 @@ endef
 JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index 491bb3e5b7..9ed9215ae4 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -22,4 +22,4 @@ define HOST_JSMIN_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 9d6acf2e38..50c62ab135 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -38,4 +38,4 @@ define HOST_LIBCAP_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index adcd6f81e0..5874218083 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -32,5 +32,5 @@ endef
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index d84fc32d3c..b50791e45a 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -21,4 +21,4 @@ LIBFDTI_CONF_OPT += --disable-libftdipp
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index d2445a148a..ce33b799f7 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -89,6 +89,6 @@ LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_GDB_FILES
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index b54743f53b..40934add5a 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -152,4 +152,4 @@ define HOST_LIBGTK2_INSTALL_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 56d037729b..5612b2b5b5 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -31,4 +31,4 @@ LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 6c69394423..e21e8f3e56 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -11,7 +11,7 @@ LIBTOOL_INSTALL_STAGING = YES
 HOST_LIBTOOL_LIBTOOL_PATCH = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # variables used by other packages
 LIBTOOL:=$(HOST_DIR)/usr/bin/libtool
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index d44eb27d3f..9920d5a3a8 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -18,4 +18,4 @@ endef
 LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index ac0f0d2322..85ff5c08d8 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -12,4 +12,4 @@ LIBUSB_DEPENDENCIES = host-pkg-config
 LIBUSB_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 0d02981c29..e5ec523be6 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -37,5 +37,5 @@ define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
 
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index bbdd5def13..d92e1850b1 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -35,7 +35,7 @@ LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # libxml2 for the host
 LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index a40a8a97f1..622bc3d18a 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -42,4 +42,4 @@ LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
index 1a044e3c0e..ad1bcad65a 100644
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -17,4 +17,4 @@ define HOST_LOCALEDEF_INSTALL_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/usr/bin/localedef
 endef
 
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/lpc3250loader/lpc3250loader.mk b/package/lpc3250loader/lpc3250loader.mk
index ed6485cef4..2b9af88da2 100644
--- a/package/lpc3250loader/lpc3250loader.mk
+++ b/package/lpc3250loader/lpc3250loader.mk
@@ -6,4 +6,4 @@ define HOST_LPC3250LOADER_INSTALL_CMDS
 		$(HOST_DIR)/usr/bin/LPC3250loader.py
 endef
 
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 51730286f1..44916bd89d 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -12,4 +12,4 @@ HOST_LTTNG_BABELTRACE_AUTORECONF = YES
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index baa459cd52..825887bcb8 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -161,4 +161,4 @@ define HOST_LUA_CLEAN_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index e195049329..b8df170151 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -10,6 +10,6 @@ LZMA_INSTALL_STAGING = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 LZMA=$(HOST_DIR)/usr/bin/lzma
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index da5d6b7474..31eeebabcf 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -10,4 +10,4 @@ LZO_LICENSE_FILES = COPYING
 LZO_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index 1e891c50f7..d2f3be5878 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -18,4 +18,4 @@ endif
 HOST_M4_CONF_OPT = --disable-static
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index 31dc95d48b..f7817059d0 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -32,4 +32,4 @@ define HOST_MAKEDEVS_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index 61187ea9b8..ff858851ad 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -151,4 +151,4 @@ define MICROPERL_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 96c8378c6c..3501bcc9a6 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -21,5 +21,5 @@ HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
 HOST_MODULE_INIT_TOOLS_CONF_OPT = --disable-static-utils
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 5ad47a9cdd..d42476698e 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -14,4 +14,4 @@ MPC_AUTORECONF = YES
 HOST_MPC_AUTORECONF = YES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 92195e7610..da6bc93732 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -12,4 +12,4 @@ MPFR_DEPENDENCIES = gmp
 MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index d7947b1cdc..ceb98c7340 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -86,4 +86,4 @@ define MTD_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index 9d99209055..72eeb121ea 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -8,4 +8,5 @@ NASM_VERSION = 2.10.01
 NASM_SOURCE  = nasm-$(NASM_VERSION).tar.bz2
 NASM_SITE    = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
 
-$(eval $(call AUTOTARGETS,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(host-autotools-package))
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index adf18ffc5b..0bd2946d67 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -139,4 +139,4 @@ HOST_NCURSES_CONF_OPT = \
 	--without-shared --without-gpm
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index e2da9a1bf6..8405f629a7 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -18,4 +18,4 @@ define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index a12ba6c8c3..75b0263ecf 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -40,4 +40,4 @@ HOST_OPENOCD_CONF_OPT = 	\
 	--enable-vsllink
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 97c80f29e9..f3267a8efd 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -23,4 +23,4 @@ ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 3e056d4194..1d474506a8 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -17,4 +17,4 @@ PIXMAN_CONF_OPT += --disable-arm-iwmmxt
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 137800cedb..a05bef1f22 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -20,6 +20,6 @@ HOST_PKG_CONFIG_AUTORECONF = YES
 HOST_PKG_CONFIG_DEPENDENCIES =
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index fd25caad96..f6af679abe 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -16,4 +16,4 @@ POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index f18261e1ed..9010626db6 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -18,4 +18,4 @@ PROTOBUF_DEPENDENCIES += zlib
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/python-distutilscross/python-distutilscross.mk b/package/python-distutilscross/python-distutilscross.mk
index 9003189d1f..ab6c0be72e 100644
--- a/package/python-distutilscross/python-distutilscross.mk
+++ b/package/python-distutilscross/python-distutilscross.mk
@@ -18,4 +18,4 @@ define HOST_PYTHON_DISTUTILSCROSS_INSTALL_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 70ebb85a74..3d4b8d6f25 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -28,5 +28,5 @@ define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
 
diff --git a/package/python/python.mk b/package/python/python.mk
index 28e215c585..360fafa5b1 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -168,4 +168,4 @@ PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES
 PYTHON_AUTORECONF = YES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index d89c25bf48..d64753164f 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -32,4 +32,4 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 endif
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index d5ab9f6093..9f3934725e 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -19,4 +19,4 @@ define HOST_SAM_BA_INSTALL_CMDS
 	ln -s ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba
 endef
 
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 73c68ed961..85dbfaff57 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -10,4 +10,4 @@ define HOST_SCONS_INSTALL_CMDS
 	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index dc53fcec73..15c6db4581 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -26,7 +26,7 @@ define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # shared-mime-info for the host
 SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 4d0ad518bf..8c0b33ba3e 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -73,4 +73,4 @@ define HOST_SQUASHFS_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 81cdf79f53..91e230161f 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -25,5 +25,5 @@ define HOST_SQUASHFS3_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
 
diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
index a1447d81da..c83a1623a7 100644
--- a/package/sstrip/sstrip.mk
+++ b/package/sstrip/sstrip.mk
@@ -42,4 +42,4 @@ define HOST_SSTRIP_UNINSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 9e856b53f5..e36c1cb0ff 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -25,4 +25,4 @@ define HOST_TAR_EXTRACT_CMDS
 	mv $(@D)/tar-$(TAR_VERSION)/* $(@D)
 	rmdir $(@D)/tar-$(TAR_VERSION)
 endef
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 8ed81ab37d..11aff17614 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -32,4 +32,4 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index d757ade728..4adae0fe05 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -52,4 +52,4 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index d8a3ac98fc..6a7eda16f0 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -82,7 +82,7 @@ HOST_UTIL_LINUX_CONF_OPT += \
 	--disable-schedutils --disable-wall --disable-partx
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
 # one, so it disappears
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index a3ad037766..d9d82b7515 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -14,4 +14,4 @@ VALA_DEPENDENCIES = host-flex libglib2 \
 HOST_VALA_DEPENDENCIES = host-flex host-libglib2
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 3e15951fe3..bbb1899186 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -20,5 +20,5 @@ LIBXCB_CONF_OPT = --disable-build-docs
 HOST_LIBXCB_CONF_OPT = --disable-build-docs
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index 25b4433316..730b8f6156 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -10,5 +10,5 @@ PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
 PTHREAD_STUBS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 00ce3392a7..1e9f73f518 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -10,4 +10,4 @@ XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 8047b21134..e48b188bd5 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -10,4 +10,4 @@ XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 02e782452f..2640803b21 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -10,4 +10,4 @@ XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index f191ecbd72..721454bb3f 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -10,4 +10,4 @@ XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index f92588cb5b..98d13d918f 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -10,4 +10,4 @@ XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 3479a23b47..10fb1c9e27 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -12,5 +12,5 @@ XCB_PROTO_INSTALL_STAGING = YES
 XCB_PROTO_DEPENDENCIES = host-python
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
 
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index ead8ace71b..6d84a2df4f 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -10,4 +10,4 @@ XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index c5243ad391..88249ca6cc 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -12,4 +12,4 @@ XFONT_FONT_UTIL_INSTALL_STAGING = YES
 XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 4d12a8449d..32b9f3f0de 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -38,4 +38,4 @@ endef
 XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 8d67501187..bd2f19bc1b 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -11,4 +11,4 @@ XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index d12520a1ed..9c996e0fbd 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -11,4 +11,4 @@ XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 530820645a..6fee5bcce6 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -11,4 +11,4 @@ XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 2db9b36128..9a5768ef87 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 2b47e4e58d..d1a7eef891 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -15,4 +15,4 @@ XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 7a0a45e4e1..efd74bc3ec 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index eef592a50e..369f9afa6a 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -11,4 +11,4 @@ XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index b964593576..ce68fc833f 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -11,4 +11,4 @@ XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index a153f4a951..b0adc8fef3 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -10,4 +10,4 @@ XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index 3ead64fd5a..a4503d530b 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -11,4 +11,4 @@ XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 5e5ff5e8a9..258349130c 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -11,4 +11,4 @@ XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
 XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 33c1a80b49..ba5539a6a4 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -11,4 +11,4 @@ XPROTO_FONTSPROTO_INSTALL_STAGING = YES
 XPROTO_FONTSPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 063a7f3724..38a696df0f 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -11,4 +11,4 @@ XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index b2478f2cf3..e552420837 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -11,4 +11,4 @@ XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index 49d2fbc1bc..487f913793 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -11,4 +11,4 @@ XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index f8e498d76a..ca354236d7 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -11,4 +11,4 @@ XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 881ab70391..cdcb8e5124 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -11,4 +11,4 @@ XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index 87b607e2cc..46f08fb9ab 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index 8f81d05650..ab9cdfb56f 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -11,4 +11,4 @@ XPROTO_XPROTO_INSTALL_STAGING = YES
 XPROTO_XPROTO_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index a69d21f59a..69c03211ab 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -11,4 +11,4 @@ XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
 XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index c06cf01d2b..c83a07e960 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -11,4 +11,4 @@ XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 8f2e0f1d83..a34434ea97 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -10,4 +10,4 @@ XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
 $(eval $(call AUTOTARGETS))
-$(eval $(call AUTOTARGETS,host))
+$(eval $(host-autotools-package))
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 8f7a18e30a..8d78dc5a11 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -75,4 +75,4 @@ define HOST_ZLIB_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(call GENTARGETS))
-$(eval $(call GENTARGETS,host))
+$(eval $(host-generic-package))

From 46fa5cbfb8f4a94680dc0880db051eb8acee6a17 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 3 Jul 2012 00:07:08 +0200
Subject: [PATCH 2338/6849] Rename XXXTARGETS to xxx-package

With the introduction of a specific macro for host targets, it was decided
to also make the names of the macros more intuitive: generic-package,
autotools-package and cmake-package.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 docs/manual/adding-packages-autotargets.txt  | 12 ++++++------
 docs/manual/adding-packages-cmaketargets.txt | 12 ++++++------
 docs/manual/adding-packages-gentargets.txt   | 16 ++++++++--------
 package/pkg-autotargets.mk                   | 16 +++++++---------
 package/pkg-cmaketargets.mk                  | 16 +++++++---------
 package/pkg-gentargets.mk                    | 14 ++++++--------
 support/gnuconfig/README.buildroot           |  6 +++---
 support/scripts/pkg-stats                    | 12 ++++++------
 8 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/docs/manual/adding-packages-autotargets.txt b/docs/manual/adding-packages-autotargets.txt
index 09a2e7c091..f67cd060aa 100644
--- a/docs/manual/adding-packages-autotargets.txt
+++ b/docs/manual/adding-packages-autotargets.txt
@@ -3,7 +3,7 @@ Infrastructure for autotools-based packages
 
 [[autotargets-tutorial]]
 
-+AUTOTARGETS+ tutorial
++autotools-package+ tutorial
 ~~~~~~~~~~~~~~~~~~~~~~
 
 First, let's see how to write a +.mk+ file for an autotools-based
@@ -23,7 +23,7 @@ package, with an example :
 11: LIBFOO_CONF_OPT = --enable-shared
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
 13:
-14: $(eval $(AUTOTARGETS))
+14: $(eval $(autotools-package))
 ------------------------
 
 On line 6, we declare the version of the package.
@@ -57,23 +57,23 @@ and building the package.
 On line 12, we declare our dependencies, so that they are built
 before the build process of our package starts.
 
-Finally, on line line 14, we invoke the +AUTOTARGETS+
+Finally, on line line 14, we invoke the +autotools-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
 [[autotargets-reference]]
 
-+AUTOTARGETS+ reference
++autotools-package+ reference
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 The main macro of the autotools package infrastructure is
-+AUTOTARGETS+. It is similar to the +GENTARGETS+ macro. The ability to
++autotools-package+. It is similar to the +generic-package+ macro. The ability to
 have target and host packages is also available, with the
 +host-autotools-package+ macro.
 
 Just like the generic infrastructure, the autotools infrastructure
 works by defining a number of variables before calling the
-+AUTOTARGETS+ macro.
++autotools-package+ macro.
 
 First, all the package metadata information variables that exist in the
 generic infrastructure also exist in the autotools infrastructure:
diff --git a/docs/manual/adding-packages-cmaketargets.txt b/docs/manual/adding-packages-cmaketargets.txt
index a29404270c..69acb00cc9 100644
--- a/docs/manual/adding-packages-cmaketargets.txt
+++ b/docs/manual/adding-packages-cmaketargets.txt
@@ -3,7 +3,7 @@ Infrastructure for CMake-based packages
 
 [[cmaketargets-tutorial]]
 
-+CMAKETARGETS+ tutorial
++cmake-package+ tutorial
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 First, let's see how to write a +.mk+ file for a CMake-based package,
@@ -23,7 +23,7 @@ with an example :
 11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
 13:
-14: $(eval $(CMAKETARGETS))
+14: $(eval $(cmake-package))
 ------------------------
 
 On line 6, we declare the version of the package.
@@ -56,22 +56,22 @@ configuring the package.
 On line 12, we declare our dependencies, so that they are built
 before the build process of our package starts.
 
-Finally, on line line 14, we invoke the +CMAKETARGETS+
+Finally, on line line 14, we invoke the +cmake-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
 [[cmaketargets-reference]]
 
-+CMAKETARGETS+ reference
++cmake-package+ reference
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 The main macro of the CMake package infrastructure is
-+CMAKETARGETS+. It is similar to the +GENTARGETS+ macro. The ability to
++cmake-package+. It is similar to the +generic-package+ macro. The ability to
 have target and host packages is also available, with the
 +host-cmake-package+ macro.
 
 Just like the generic infrastructure, the CMake infrastructure works
-by defining a number of variables before calling the +CMAKETARGETS+
+by defining a number of variables before calling the +cmake-package+
 macro.
 
 First, all the package metadata information variables that exist in
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt
index 2e9ebef713..cc412090b4 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-gentargets.txt
@@ -8,7 +8,7 @@ system is based on hand-written Makefiles or shell scripts.
 
 [[gentargets-tutorial]]
 
-+GENTARGETS+ Tutorial
++generic-package+ Tutorial
 ~~~~~~~~~~~~~~~~~~~~~
 
 ------------------------------
@@ -46,7 +46,7 @@ system is based on hand-written Makefiles or shell scripts.
 32: 	/bin/foo  f  4755  0  0  -  -  -  -  -
 33: endef
 34:
-35: $(eval $(GENTARGETS))
+35: $(eval $(generic-package))
 --------------------------------
 
 The Makefile begins on line 6 to 8 with metadata information: the
@@ -83,16 +83,16 @@ All these steps rely on the +$(@D)+ variable, which
 contains the directory where the source code of the package has been
 extracted.
 
-Finally, on line 35, we call the +GENTARGETS+ which
+Finally, on line 35, we call the +generic-package+ which
 generates, according to the variables defined previously, all the
 Makefile code necessary to make your package working.
 
 [[gentargets-reference]]
 
-+GENTARGETS+ Reference
++generic-package+ Reference
 ~~~~~~~~~~~~~~~~~~~~~~
 
-There are two variants of the generic target. The +GENTARGETS+ macro is
+There are two variants of the generic target. The +generic-package+ macro is
 used for packages to be cross-compiled for the target.  The
 +host-generic-package+ macro is used for host packages, natively compiled
 for the host.  It is possible to call both of them in a single +.mk+
@@ -100,7 +100,7 @@ file: once to create the rules to generate a target
 package and once to create the rules to generate a host package:
 
 ----------------------
-$(eval $(GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
 ----------------------
 
@@ -112,10 +112,10 @@ some tools to be installed on the host. If the package name is
 variables of other packages, if they depend on +libfoo+ or
 +host-libfoo+.
 
-The call to the +GENTARGETS+ and/or +host-generic-package+ macro *must* be
+The call to the +generic-package+ and/or +host-generic-package+ macro *must* be
 at the end of the +.mk+ file, after all variable definitions.
 
-For the target package, the +GENTARGETS+ uses the variables defined by
+For the target package, the +generic-package+ uses the variables defined by
 the .mk file and prefixed by the uppercased package name:
 +LIBFOO_*+. +host-generic-package+ uses the +HOST_LIBFOO_*+ variables. For
 'some' variables, if the +HOST_LIBFOO_+ prefixed variable doesn't
diff --git a/package/pkg-autotargets.mk b/package/pkg-autotargets.mk
index d925cbb463..e4540509d9 100644
--- a/package/pkg-autotargets.mk
+++ b/package/pkg-autotargets.mk
@@ -37,7 +37,7 @@ define CONFIG_UPDATE
 endef
 
 ################################################################################
-# AUTOTARGETS_INNER -- defines how the configuration, compilation and
+# inner-autotools-package -- defines how the configuration, compilation and
 # installation of an autotools package should be done, implements a
 # few hooks to tune the build process for autotools specifities and
 # calls the generic package infrastructure to generate the necessary
@@ -52,7 +52,7 @@ endef
 #  argument 5 is the type (target or host)
 ################################################################################
 
-define AUTOTARGETS_INNER
+define inner-autotools-package
 
 # define package-specific variables to default values
 ifndef $(2)_SUBDIR
@@ -198,7 +198,7 @@ define AUTORECONF_HOOK
 	fi
 endef
 
-# This must be repeated from GENTARGETS_INNER, otherwise we get an empty
+# This must be repeated from inner-generic-package, otherwise we get an empty
 # _DEPENDENCIES if _AUTORECONF is YES.  Also filter the result of _AUTORECONF
 # away from the non-host rule
 $(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool $(1),\
@@ -295,15 +295,13 @@ endif
 
 # Call the generic package infrastructure to generate the necessary
 # make targets
-$(call GENTARGETS_INNER,$(1),$(2),$(3),$(4),$(5))
+$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5))
 
 endef
 
 ################################################################################
-# AUTOTARGETS -- the target generator macro for autotools packages
-#
-# Argument 1 is "target" or "host"           [optional, default: "target"]
+# autotools-package -- the target generator macro for autotools packages
 ################################################################################
 
-AUTOTARGETS = $(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
-host-autotools-package = $(call AUTOTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
+autotools-package = $(call inner-autotools-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+host-autotools-package = $(call inner-autotools-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmaketargets.mk
index 71cc61036d..f9a59341ad 100644
--- a/package/pkg-cmaketargets.mk
+++ b/package/pkg-cmaketargets.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 ################################################################################
-# CMAKETARGETS_INNER -- defines how the configuration, compilation and
+# inner-cmake-package -- defines how the configuration, compilation and
 # installation of a CMake package should be done, implements a few hooks to
 # tune the build process and calls the generic package infrastructure to
 # generate the necessary make targets
@@ -35,7 +35,7 @@
 #  argument 5 is the type (target or host)
 ################################################################################
 
-define CMAKETARGETS_INNER
+define inner-cmake-package
 
 # define package-specific variables to default values
 ifndef $(2)_SUBDIR
@@ -96,7 +96,7 @@ endef
 endif
 endif
 
-# This must be repeated from GENTARGETS_INNER, otherwise we only get
+# This must be repeated from inner-generic-package, otherwise we only get
 # host-cmake in _DEPENDENCIES because of the following line
 $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
@@ -180,18 +180,16 @@ endif
 
 # Call the generic package infrastructure to generate the necessary
 # make targets
-$(call GENTARGETS_INNER,$(1),$(2),$(3),$(4),$(5))
+$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5))
 
 endef
 
 ################################################################################
-# CMAKETARGETS -- the target generator macro for CMake packages
-#
-# Argument 1 is "target" or "host"           [optional, default: "target"]
+# cmake-package -- the target generator macro for CMake packages
 ################################################################################
 
-CMAKETARGETS = $(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
-host-cmake-package = $(call CMAKETARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
+cmake-package = $(call inner-cmake-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+host-cmake-package = $(call inner-cmake-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 
 ################################################################################
 # Generation of the CMake toolchain file
diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk
index a9cee90997..c01440e64c 100644
--- a/package/pkg-gentargets.mk
+++ b/package/pkg-gentargets.mk
@@ -157,7 +157,7 @@ $(BUILD_DIR)/%/.stamp_dircleaned:
 	rm -Rf $(@D)
 
 ################################################################################
-# GENTARGETS_INNER -- generates the make targets needed to build a
+# inner-generic-package -- generates the make targets needed to build a
 # generic package
 #
 #  argument 1 is the lowercase package name
@@ -169,7 +169,7 @@ $(BUILD_DIR)/%/.stamp_dircleaned:
 #  argument 5 is the type (target or host)
 ################################################################################
 
-define GENTARGETS_INNER
+define inner-generic-package
 
 # Define default values for various package-related variables, if not
 # already defined. For some variables (version, source, site and
@@ -496,17 +496,15 @@ endif # SITE_METHOD
 DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE))))
 
 endif # $(2)_KCONFIG_VAR
-endef # GENTARGETS_INNER
+endef # inner-generic-package
 
 ################################################################################
-# GENTARGETS -- the target generator macro for generic packages
-#
-# Argument 1 is "target" or "host"           [optional, default: "target"]
+# generic-package -- the target generator macro for generic packages
 ################################################################################
 
 # In the case of target packages, keep the package name "pkg"
-GENTARGETS = $(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+generic-package = $(call inner-generic-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
 # In the case of host packages, turn the package name "pkg" into "host-pkg"
-host-generic-package = $(call GENTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
+host-generic-package = $(call inner-generic-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
 
 # :mode=makefile:
diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot
index d655d6211f..83a4e9cc96 100644
--- a/support/gnuconfig/README.buildroot
+++ b/support/gnuconfig/README.buildroot
@@ -1,12 +1,12 @@
 --- HOWTO ---
 If your package uses config.guess and/or config.sub, then it probably
 relies on the autotools as its build system. In this case, you should
-use the AUTOTARGETS infrastructure, which will take care of updating
+use the autotools-package infrastructure, which will take care of updating
 the config.guess and/or config.sub files appropriately. See the
-Buildroot documentation for details about the AUTOTARGETS
+Buildroot documentation for details about the autotools-package
 infrastructure.
 
-If for some reason your package does not use the AUTOTARGETS
+If for some reason your package does not use the autotools-package
 infrastructure, you can request the config.guess and/or config.sub
 files of your package to be updated by using:
 
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index e7941bc185..ac5d8ec844 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -52,9 +52,9 @@ tr.correct td {
 <td rowspan=\"2\">Id</td>
 <td rowspan=\"2\">Package</td>
 <td rowspan=\"2\">Patch count</td>
-<td colspan=\"2\" class=\"centered\">AUTOTARGETS</td>
-<td colspan=\"2\" class=\"centered\">GENTARGETS</td>
-<td colspan=\"2\" class=\"centered\">CMAKETARGETS</td>
+<td colspan=\"2\" class=\"centered\">autotools-package</td>
+<td colspan=\"2\" class=\"centered\">generic-package</td>
+<td colspan=\"2\" class=\"centered\">cmake-package</td>
 <td colspan=\"2\" class=\"centered\">manual</td>
 <td rowspan=\"2\" class=\"centered\">Actions</td>
 </tr>
@@ -104,7 +104,7 @@ for i in $(find package/ -name '*.mk') ; do
 	is_auto_host=1
     fi
 
-    if grep -E "\(AUTOTARGETS\)" $i > /dev/null ; then
+    if grep -E "\(autotools-package\)" $i > /dev/null ; then
 	is_auto_target=1
     fi
 
@@ -112,7 +112,7 @@ for i in $(find package/ -name '*.mk') ; do
 	is_pkg_host=1
     fi
 
-    if grep -E "\(GENTARGETS\)" $i > /dev/null ; then
+    if grep -E "\(generic-package\)" $i > /dev/null ; then
 	is_pkg_target=1
     fi
 
@@ -120,7 +120,7 @@ for i in $(find package/ -name '*.mk') ; do
 	is_cmake_host=1
     fi
 
-    if grep -E "\(CMAKETARGETS\)" $i > /dev/null ; then
+    if grep -E "\(cmake-package\)" $i > /dev/null ; then
 	is_cmake_target=1
     fi
 

From e1502ebc0c92763896c53d405ee9c7c7a1a33e24 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 3 Jul 2012 00:07:32 +0200
Subject: [PATCH 2339/6849] all packages: rename XXXTARGETS to xxx-package

Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk                             | 2 +-
 boot/at91dataflashboot/at91dataflashboot.mk                     | 2 +-
 boot/barebox/barebox.mk                                         | 2 +-
 boot/grub/grub.mk                                               | 2 +-
 boot/lpc32xxcdl/lpc32xxcdl.mk                                   | 2 +-
 boot/syslinux/syslinux.mk                                       | 2 +-
 boot/uboot/uboot.mk                                             | 2 +-
 boot/xloader/xloader.mk                                         | 2 +-
 linux/linux.mk                                                  | 2 +-
 package/acl/acl.mk                                              | 2 +-
 package/acpid/acpid.mk                                          | 2 +-
 package/alsa-lib/alsa-lib.mk                                    | 2 +-
 package/alsamixergui/alsamixergui.mk                            | 2 +-
 package/apr-util/apr-util.mk                                    | 2 +-
 package/apr/apr.mk                                              | 2 +-
 package/argp-standalone/argp-standalone.mk                      | 2 +-
 package/argus/argus.mk                                          | 2 +-
 package/at/at.mk                                                | 2 +-
 package/atk/atk.mk                                              | 2 +-
 package/attr/attr.mk                                            | 2 +-
 package/audiofile/audiofile.mk                                  | 2 +-
 package/autoconf/autoconf.mk                                    | 2 +-
 package/automake/automake.mk                                    | 2 +-
 package/avahi/avahi.mk                                          | 2 +-
 package/axel/axel.mk                                            | 2 +-
 package/bash/bash.mk                                            | 2 +-
 package/beecrypt/beecrypt.mk                                    | 2 +-
 package/berkeleydb/berkeleydb.mk                                | 2 +-
 package/bind/bind.mk                                            | 2 +-
 package/binutils/binutils.mk                                    | 2 +-
 package/bison/bison.mk                                          | 2 +-
 package/blackbox/blackbox.mk                                    | 2 +-
 package/bluez_utils/bluez_utils.mk                              | 2 +-
 package/bmon/bmon.mk                                            | 2 +-
 package/boa/boa.mk                                              | 2 +-
 package/bonnie/bonnie.mk                                        | 2 +-
 package/boost/boost.mk                                          | 2 +-
 package/bootutils/bootutils.mk                                  | 2 +-
 package/bridge-utils/bridge-utils.mk                            | 2 +-
 package/bsdiff/bsdiff.mk                                        | 2 +-
 package/busybox/busybox.mk                                      | 2 +-
 package/bwm-ng/bwm-ng.mk                                        | 2 +-
 package/bzip2/bzip2.mk                                          | 2 +-
 package/cairo/cairo.mk                                          | 2 +-
 package/can-utils/can-utils.mk                                  | 2 +-
 package/ccache/ccache.mk                                        | 2 +-
 package/cdrkit/cdrkit.mk                                        | 2 +-
 package/cgilua/cgilua.mk                                        | 2 +-
 package/cifs-utils/cifs-utils.mk                                | 2 +-
 package/cjson/cjson.mk                                          | 2 +-
 package/cloop/cloop.mk                                          | 2 +-
 package/cmake/cmake.mk                                          | 2 +-
 package/collectd/collectd.mk                                    | 2 +-
 package/connman/connman.mk                                      | 2 +-
 package/conntrack-tools/conntrack-tools.mk                      | 2 +-
 package/copas/copas.mk                                          | 2 +-
 package/coreutils/coreutils.mk                                  | 2 +-
 package/coxpcall/coxpcall.mk                                    | 2 +-
 package/cramfs/cramfs.mk                                        | 2 +-
 package/ctorrent/ctorrent.mk                                    | 2 +-
 package/cups/cups.mk                                            | 2 +-
 package/cvs/cvs.mk                                              | 2 +-
 package/dash/dash.mk                                            | 2 +-
 package/dbus-glib/dbus-glib.mk                                  | 2 +-
 package/dbus-python/dbus-python.mk                              | 2 +-
 package/dbus/dbus.mk                                            | 2 +-
 package/devmem2/devmem2.mk                                      | 2 +-
 package/dhcp/dhcp.mk                                            | 2 +-
 package/dhcpdump/dhcpdump.mk                                    | 2 +-
 package/dhrystone/dhrystone.mk                                  | 2 +-
 package/dialog/dialog.mk                                        | 2 +-
 package/diffutils/diffutils.mk                                  | 2 +-
 package/directfb-examples/directfb-examples.mk                  | 2 +-
 package/directfb/directfb.mk                                    | 2 +-
 package/distcc/distcc.mk                                        | 2 +-
 package/divine/divine.mk                                        | 2 +-
 package/dmalloc/dmalloc.mk                                      | 2 +-
 package/dmidecode/dmidecode.mk                                  | 2 +-
 package/dmraid/dmraid.mk                                        | 2 +-
 package/dnsmasq/dnsmasq.mk                                      | 2 +-
 package/docker/docker.mk                                        | 2 +-
 package/dosfstools/dosfstools.mk                                | 2 +-
 package/dropbear/dropbear.mk                                    | 2 +-
 package/dsp-tools/dsp-tools.mk                                  | 2 +-
 package/dstat/dstat.mk                                          | 2 +-
 package/e2fsprogs/e2fsprogs.mk                                  | 2 +-
 package/ebtables/ebtables.mk                                    | 2 +-
 package/ed/ed.mk                                                | 2 +-
 package/eeprog/eeprog.mk                                        | 2 +-
 package/efl/expedite/expedite.mk                                | 2 +-
 package/efl/libecore/libecore.mk                                | 2 +-
 package/efl/libedbus/libedbus.mk                                | 2 +-
 package/efl/libedje/libedje.mk                                  | 2 +-
 package/efl/libeet/libeet.mk                                    | 2 +-
 package/efl/libefreet/libefreet.mk                              | 2 +-
 package/efl/libeina/libeina.mk                                  | 2 +-
 package/efl/libelementary/libelementary.mk                      | 2 +-
 package/efl/libembryo/libembryo.mk                              | 2 +-
 package/efl/libethumb/libethumb.mk                              | 2 +-
 package/efl/libevas/libevas.mk                                  | 2 +-
 package/empty/empty.mk                                          | 2 +-
 package/enchant/enchant.mk                                      | 2 +-
 package/ethtool/ethtool.mk                                      | 2 +-
 package/expat/expat.mk                                          | 2 +-
 package/explorercanvas/explorercanvas.mk                        | 2 +-
 package/ezxml/ezxml.mk                                          | 2 +-
 package/fbdump/fbdump.mk                                        | 2 +-
 package/fbgrab/fbgrab.mk                                        | 2 +-
 package/fbset/fbset.mk                                          | 2 +-
 package/fbterm/fbterm.mk                                        | 2 +-
 package/fbv/fbv.mk                                              | 2 +-
 package/fconfig/fconfig.mk                                      | 2 +-
 package/feh/feh.mk                                              | 2 +-
 package/fftw/fftw.mk                                            | 2 +-
 package/file/file.mk                                            | 2 +-
 package/findutils/findutils.mk                                  | 2 +-
 package/fis/fis.mk                                              | 2 +-
 package/flashrom/flashrom.mk                                    | 2 +-
 package/flex/flex.mk                                            | 2 +-
 package/flot/flot.mk                                            | 2 +-
 package/fltk/fltk.mk                                            | 2 +-
 package/fluxbox/fluxbox.mk                                      | 2 +-
 package/fmtools/fmtools.mk                                      | 2 +-
 package/fontconfig/fontconfig.mk                                | 2 +-
 package/freerdp/freerdp.mk                                      | 2 +-
 package/freetype/freetype.mk                                    | 2 +-
 package/gadgetfs-test/gadgetfs-test.mk                          | 2 +-
 package/games/doom-wad/doom-wad.mk                              | 2 +-
 package/games/gnuchess/gnuchess.mk                              | 2 +-
 package/games/prboom/prboom.mk                                  | 2 +-
 package/games/rubix/rubix.mk                                    | 2 +-
 package/gamin/gamin.mk                                          | 2 +-
 package/gawk/gawk.mk                                            | 2 +-
 package/gdisk/gdisk.mk                                          | 2 +-
 package/gdk-pixbuf/gdk-pixbuf.mk                                | 2 +-
 package/genext2fs/genext2fs.mk                                  | 2 +-
 package/genromfs/genromfs.mk                                    | 2 +-
 package/giblib/giblib.mk                                        | 2 +-
 package/glib-networking/glib-networking.mk                      | 2 +-
 package/gmp/gmp.mk                                              | 2 +-
 package/gmpc/gmpc.mk                                            | 2 +-
 package/gnutls/gnutls.mk                                        | 2 +-
 package/gob2/gob2.mk                                            | 2 +-
 package/gperf/gperf.mk                                          | 2 +-
 package/gpsd/gpsd.mk                                            | 2 +-
 package/gqview/gqview.mk                                        | 2 +-
 package/grep/grep.mk                                            | 2 +-
 package/gtk2-engines/gtk2-engines.mk                            | 2 +-
 package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk    | 2 +-
 package/gtkperf/gtkperf.mk                                      | 2 +-
 package/gvfs/gvfs.mk                                            | 2 +-
 package/gzip/gzip.mk                                            | 2 +-
 package/haserl/haserl.mk                                        | 2 +-
 package/hdparm/hdparm.mk                                        | 2 +-
 package/heirloom-mailx/heirloom-mailx.mk                        | 2 +-
 package/hiawatha/hiawatha.mk                                    | 2 +-
 package/hostapd/hostapd.mk                                      | 2 +-
 package/htop/htop.mk                                            | 2 +-
 package/hwdata/hwdata.mk                                        | 2 +-
 package/i2c-tools/i2c-tools.mk                                  | 2 +-
 package/icu/icu.mk                                              | 2 +-
 package/ifplugd/ifplugd.mk                                      | 2 +-
 package/igh-ethercat/igh-ethercat.mk                            | 2 +-
 package/imagemagick/imagemagick.mk                              | 2 +-
 package/imlib2/imlib2.mk                                        | 2 +-
 package/inadyn/inadyn.mk                                        | 2 +-
 package/inotify-tools/inotify-tools.mk                          | 2 +-
 package/input-event-daemon/input-event-daemon.mk                | 2 +-
 package/input-tools/input-tools.mk                              | 2 +-
 package/intltool/intltool.mk                                    | 2 +-
 package/iostat/iostat.mk                                        | 2 +-
 package/iperf/iperf.mk                                          | 2 +-
 package/ipkg/ipkg.mk                                            | 2 +-
 package/iproute2/iproute2.mk                                    | 2 +-
 package/ipsec-tools/ipsec-tools.mk                              | 2 +-
 package/ipset/ipset.mk                                          | 2 +-
 package/iptables/iptables.mk                                    | 2 +-
 package/irda-utils/irda-utils.mk                                | 2 +-
 package/iw/iw.mk                                                | 2 +-
 package/jpeg/jpeg.mk                                            | 2 +-
 package/jquery-sparkline/jquery-sparkline.mk                    | 2 +-
 package/jquery-validation/jquery-validation.mk                  | 2 +-
 package/jquery/jquery.mk                                        | 2 +-
 package/jsmin/jsmin.mk                                          | 2 +-
 package/json-c/json-c.mk                                        | 2 +-
 package/kbd/kbd.mk                                              | 2 +-
 package/kexec/kexec.mk                                          | 2 +-
 package/kismet/kismet.mk                                        | 2 +-
 package/kmod/kmod.mk                                            | 2 +-
 package/latencytop/latencytop.mk                                | 2 +-
 package/lcdproc/lcdproc.mk                                      | 2 +-
 package/leafpad/leafpad.mk                                      | 2 +-
 package/less/less.mk                                            | 2 +-
 package/libaio/libaio.mk                                        | 2 +-
 package/libao/libao.mk                                          | 2 +-
 package/libarchive/libarchive.mk                                | 2 +-
 package/libargtable2/libargtable2.mk                            | 2 +-
 package/libart/libart.mk                                        | 2 +-
 package/libatomic_ops/libatomic_ops.mk                          | 2 +-
 package/libcap-ng/libcap-ng.mk                                  | 2 +-
 package/libcap/libcap.mk                                        | 2 +-
 package/libcdaudio/libcdaudio.mk                                | 2 +-
 package/libcgi/libcgi.mk                                        | 2 +-
 package/libcgicc/libcgicc.mk                                    | 2 +-
 package/libconfig/libconfig.mk                                  | 2 +-
 package/libconfuse/libconfuse.mk                                | 2 +-
 package/libcue/libcue.mk                                        | 2 +-
 package/libcuefile/libcuefile.mk                                | 2 +-
 package/libcurl/libcurl.mk                                      | 2 +-
 package/libdaemon/libdaemon.mk                                  | 2 +-
 package/libdmtx/libdmtx.mk                                      | 2 +-
 package/libdnet/libdnet.mk                                      | 2 +-
 package/libdrm/libdrm.mk                                        | 2 +-
 package/libdvdnav/libdvdnav.mk                                  | 2 +-
 package/libdvdread/libdvdread.mk                                | 2 +-
 package/libeXosip2/libeXosip2.mk                                | 2 +-
 package/libelf/libelf.mk                                        | 2 +-
 package/liberation/liberation.mk                                | 2 +-
 package/libesmtp/libesmtp.mk                                    | 2 +-
 package/libev/libev.mk                                          | 2 +-
 package/libevent/libevent.mk                                    | 2 +-
 package/libexif/libexif.mk                                      | 2 +-
 package/libfcgi/libfcgi.mk                                      | 2 +-
 package/libffi/libffi.mk                                        | 2 +-
 package/libfreefare/libfreefare.mk                              | 2 +-
 package/libftdi/libftdi.mk                                      | 2 +-
 package/libfuse/libfuse.mk                                      | 2 +-
 package/libgail/libgail.mk                                      | 2 +-
 package/libgcrypt/libgcrypt.mk                                  | 2 +-
 package/libgeotiff/libgeotiff.mk                                | 2 +-
 package/libglade/libglade.mk                                    | 2 +-
 package/libglib2/libglib2.mk                                    | 2 +-
 package/libgpg-error/libgpg-error.mk                            | 2 +-
 package/libgtk2/libgtk2.mk                                      | 2 +-
 package/libhid/libhid.mk                                        | 2 +-
 package/libical/libical.mk                                      | 2 +-
 package/libiconv/libiconv.mk                                    | 2 +-
 package/libid3tag/libid3tag.mk                                  | 2 +-
 package/libidn/libidn.mk                                        | 2 +-
 package/libiqrf/libiqrf.mk                                      | 2 +-
 package/liblockfile/liblockfile.mk                              | 2 +-
 package/libmad/libmad.mk                                        | 2 +-
 package/libmbus/libmbus.mk                                      | 2 +-
 package/libmicrohttpd/libmicrohttpd.mk                          | 2 +-
 package/libmms/libmms.mk                                        | 2 +-
 package/libmnl/libmnl.mk                                        | 2 +-
 package/libmodbus/libmodbus.mk                                  | 2 +-
 package/libmpd/libmpd.mk                                        | 2 +-
 package/libmpeg2/libmpeg2.mk                                    | 2 +-
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk        | 2 +-
 package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk        | 2 +-
 package/libnfc/libnfc.mk                                        | 2 +-
 package/libnfnetlink/libnfnetlink.mk                            | 2 +-
 package/libnl/libnl.mk                                          | 2 +-
 package/libnspr/libnspr.mk                                      | 2 +-
 package/libnss/libnss.mk                                        | 2 +-
 package/liboauth/liboauth.mk                                    | 2 +-
 package/libogg/libogg.mk                                        | 2 +-
 package/liboping/liboping.mk                                    | 2 +-
 package/libosip2/libosip2.mk                                    | 2 +-
 package/libpcap/libpcap.mk                                      | 2 +-
 package/libplayer/libplayer.mk                                  | 2 +-
 package/libpng/libpng.mk                                        | 2 +-
 package/libraw/libraw.mk                                        | 2 +-
 package/libraw1394/libraw1394.mk                                | 2 +-
 package/libreplaygain/libreplaygain.mk                          | 2 +-
 package/libroxml/libroxml.mk                                    | 2 +-
 package/librsvg/librsvg.mk                                      | 2 +-
 package/librsync/librsync.mk                                    | 2 +-
 package/libsamplerate/libsamplerate.mk                          | 2 +-
 package/libsexy/libsexy.mk                                      | 2 +-
 package/libsigc/libsigc.mk                                      | 2 +-
 package/libsndfile/libsndfile.mk                                | 2 +-
 package/libsoup/libsoup.mk                                      | 2 +-
 package/libsvgtiny/libsvgtiny.mk                                | 2 +-
 package/libsysfs/libsysfs.mk                                    | 2 +-
 package/libtheora/libtheora.mk                                  | 2 +-
 package/libtool/libtool.mk                                      | 2 +-
 package/libtorrent/libtorrent.mk                                | 2 +-
 package/libtpl/libtpl.mk                                        | 2 +-
 package/libungif/libungif.mk                                    | 2 +-
 package/libupnp/libupnp.mk                                      | 2 +-
 package/liburcu/liburcu.mk                                      | 2 +-
 package/libusb-compat/libusb-compat.mk                          | 2 +-
 package/libusb/libusb.mk                                        | 2 +-
 package/libv4l/libv4l.mk                                        | 2 +-
 package/libvncserver/libvncserver.mk                            | 2 +-
 package/libvorbis/libvorbis.mk                                  | 2 +-
 package/libxml-parser-perl/libxml-parser-perl.mk                | 2 +-
 package/libxml2/libxml2.mk                                      | 2 +-
 package/libxslt/libxslt.mk                                      | 2 +-
 package/libyaml/libyaml.mk                                      | 2 +-
 package/lighttpd/lighttpd.mk                                    | 2 +-
 package/links/links.mk                                          | 2 +-
 package/linphone/linphone.mk                                    | 2 +-
 package/linux-firmware/linux-firmware.mk                        | 2 +-
 package/linux-fusion/linux-fusion.mk                            | 2 +-
 package/lite/lite.mk                                            | 2 +-
 package/live555/live555.mk                                      | 2 +-
 package/lm-sensors/lm-sensors.mk                                | 2 +-
 package/lmbench/lmbench.mk                                      | 2 +-
 package/lockfile-progs/lockfile-progs.mk                        | 2 +-
 package/logrotate/logrotate.mk                                  | 2 +-
 package/logsurfer/logsurfer.mk                                  | 2 +-
 package/lrzsz/lrzsz.mk                                          | 2 +-
 package/lshw/lshw.mk                                            | 2 +-
 package/lsof/lsof.mk                                            | 2 +-
 package/lsuio/lsuio.mk                                          | 2 +-
 package/ltp-testsuite/ltp-testsuite.mk                          | 2 +-
 package/ltrace/ltrace.mk                                        | 2 +-
 package/lttng-babeltrace/lttng-babeltrace.mk                    | 2 +-
 package/lttng-libust/lttng-libust.mk                            | 2 +-
 package/lttng-modules/lttng-modules.mk                          | 2 +-
 package/lttng-tools/lttng-tools.mk                              | 2 +-
 package/lua/lua.mk                                              | 2 +-
 package/luafilesystem/luafilesystem.mk                          | 2 +-
 package/luasocket/luasocket.mk                                  | 2 +-
 package/lvm2/lvm2.mk                                            | 2 +-
 package/lzma/lzma.mk                                            | 2 +-
 package/lzo/lzo.mk                                              | 2 +-
 package/lzop/lzop.mk                                            | 2 +-
 package/m4/m4.mk                                                | 2 +-
 package/make/make.mk                                            | 2 +-
 package/makedevs/makedevs.mk                                    | 2 +-
 package/matchbox/matchbox-common/matchbox-common.mk             | 2 +-
 package/matchbox/matchbox-desktop/matchbox-desktop.mk           | 2 +-
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk           | 2 +-
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk         | 2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk                   | 2 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk               | 2 +-
 .../matchbox-startup-monitor/matchbox-startup-monitor.mk        | 2 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk                     | 2 +-
 package/mdadm/mdadm.mk                                          | 2 +-
 package/mediastreamer/mediastreamer.mk                          | 2 +-
 package/memstat/memstat.mk                                      | 2 +-
 package/memtester/memtester.mk                                  | 2 +-
 package/metacity/metacity.mk                                    | 2 +-
 package/microperl/microperl.mk                                  | 2 +-
 package/midori/midori.mk                                        | 2 +-
 package/mii-diag/mii-diag.mk                                    | 2 +-
 package/minicom/minicom.mk                                      | 2 +-
 .../mobile_broadband_provider_info.mk                           | 2 +-
 package/module-init-tools/module-init-tools.mk                  | 2 +-
 package/monit/monit.mk                                          | 2 +-
 package/mpc/mpc.mk                                              | 2 +-
 package/mpfr/mpfr.mk                                            | 2 +-
 package/mrouted/mrouted.mk                                      | 2 +-
 package/msmtp/msmtp.mk                                          | 2 +-
 package/mtd/mtd.mk                                              | 2 +-
 package/multimedia/alsa-utils/alsa-utils.mk                     | 2 +-
 package/multimedia/aumix/aumix.mk                               | 2 +-
 package/multimedia/bellagio/bellagio.mk                         | 2 +-
 package/multimedia/faad2/faad2.mk                               | 2 +-
 package/multimedia/ffmpeg/ffmpeg.mk                             | 2 +-
 package/multimedia/flac/flac.mk                                 | 2 +-
 package/multimedia/gst-dsp/gst-dsp.mk                           | 2 +-
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk                     | 2 +-
 package/multimedia/gst-omapfb/gst-omapfb.mk                     | 2 +-
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk           | 2 +-
 package/multimedia/gst-plugins-base/gst-plugins-base.mk         | 2 +-
 package/multimedia/gst-plugins-good/gst-plugins-good.mk         | 2 +-
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk         | 2 +-
 package/multimedia/gstreamer/gstreamer.mk                       | 2 +-
 package/multimedia/lame/lame.mk                                 | 2 +-
 package/multimedia/madplay/madplay.mk                           | 2 +-
 package/multimedia/mpd/mpd.mk                                   | 2 +-
 package/multimedia/mpg123/mpg123.mk                             | 2 +-
 package/multimedia/mplayer/mplayer.mk                           | 2 +-
 package/multimedia/musepack/musepack.mk                         | 2 +-
 package/multimedia/pulseaudio/pulseaudio.mk                     | 2 +-
 package/multimedia/tidsp-binaries/tidsp-binaries.mk             | 2 +-
 package/multimedia/vorbis-tools/vorbis-tools.mk                 | 2 +-
 package/multimedia/wavpack/wavpack.mk                           | 2 +-
 package/mutt/mutt.mk                                            | 2 +-
 package/mxml/mxml.mk                                            | 2 +-
 package/mysql_client/mysql_client.mk                            | 2 +-
 package/nano/nano.mk                                            | 2 +-
 package/nanocom/nanocom.mk                                      | 2 +-
 package/nasm/nasm.mk                                            | 2 +-
 package/nbd/nbd.mk                                              | 2 +-
 package/ncftp/ncftp.mk                                          | 2 +-
 package/ncurses/ncurses.mk                                      | 2 +-
 package/ndisc6/ndisc6.mk                                        | 2 +-
 package/neon/neon.mk                                            | 2 +-
 package/netatalk/netatalk.mk                                    | 2 +-
 package/netcat/netcat.mk                                        | 2 +-
 package/netperf/netperf.mk                                      | 2 +-
 package/netplug/netplug.mk                                      | 2 +-
 package/netsnmp/netsnmp.mk                                      | 2 +-
 package/netstat-nat/netstat-nat.mk                              | 2 +-
 package/network-manager/network-manager.mk                      | 2 +-
 package/nfs-utils/nfs-utils.mk                                  | 2 +-
 package/ngircd/ngircd.mk                                        | 2 +-
 package/ngrep/ngrep.mk                                          | 2 +-
 package/noip/noip.mk                                            | 2 +-
 package/nss-mdns/nss-mdns.mk                                    | 2 +-
 package/ntfs-3g/ntfs-3g.mk                                      | 2 +-
 package/ntp/ntp.mk                                              | 2 +-
 package/nuttcp/nuttcp.mk                                        | 2 +-
 package/ocf-linux/ocf-linux.mk                                  | 2 +-
 package/ofono/ofono.mk                                          | 2 +-
 package/olsr/olsr.mk                                            | 2 +-
 package/open2300/open2300.mk                                    | 2 +-
 package/opencv/opencv.mk                                        | 2 +-
 package/openntpd/openntpd.mk                                    | 2 +-
 package/openocd/openocd.mk                                      | 2 +-
 package/openssh/openssh.mk                                      | 2 +-
 package/openssl/openssl.mk                                      | 2 +-
 package/openswan/openswan.mk                                    | 2 +-
 package/openvpn/openvpn.mk                                      | 2 +-
 package/opkg/opkg.mk                                            | 2 +-
 package/oprofile/oprofile.mk                                    | 2 +-
 package/orc/orc.mk                                              | 2 +-
 package/ortp/ortp.mk                                            | 2 +-
 package/pango/pango.mk                                          | 2 +-
 package/parted/parted.mk                                        | 2 +-
 package/patch/patch.mk                                          | 2 +-
 package/pciutils/pciutils.mk                                    | 2 +-
 package/pcmanfm/pcmanfm.mk                                      | 2 +-
 package/pcre/pcre.mk                                            | 2 +-
 package/php/php.mk                                              | 2 +-
 package/picocom/picocom.mk                                      | 2 +-
 package/pixman/pixman.mk                                        | 2 +-
 package/pkg-config/pkg-config.mk                                | 2 +-
 package/poco/poco.mk                                            | 2 +-
 package/polarssl/polarssl.mk                                    | 2 +-
 package/popt/popt.mk                                            | 2 +-
 package/portaudio/portaudio.mk                                  | 2 +-
 package/portmap/portmap.mk                                      | 2 +-
 package/pppd/pppd.mk                                            | 2 +-
 package/pptp-linux/pptp-linux.mk                                | 2 +-
 package/procps/procps.mk                                        | 2 +-
 package/proftpd/proftpd.mk                                      | 2 +-
 package/protobuf/protobuf.mk                                    | 2 +-
 package/psmisc/psmisc.mk                                        | 2 +-
 package/pv/pv.mk                                                | 2 +-
 package/python-dpkt/python-dpkt.mk                              | 2 +-
 package/python-id3/python-id3.mk                                | 2 +-
 package/python-mad/python-mad.mk                                | 2 +-
 package/python-netifaces/python-netifaces.mk                    | 2 +-
 package/python-pygame/python-pygame.mk                          | 2 +-
 package/python-serial/python-serial.mk                          | 2 +-
 package/python-setuptools/python-setuptools.mk                  | 2 +-
 package/python/python.mk                                        | 2 +-
 package/qt/qt.mk                                                | 2 +-
 package/quagga/quagga.mk                                        | 2 +-
 package/quota/quota.mk                                          | 2 +-
 package/radvd/radvd.mk                                          | 2 +-
 package/ramspeed/ramspeed.mk                                    | 2 +-
 package/rdesktop/rdesktop.mk                                    | 2 +-
 package/read-edid/read-edid.mk                                  | 2 +-
 package/readline/readline.mk                                    | 2 +-
 package/rings/rings.mk                                          | 2 +-
 package/rng-tools/rng-tools.mk                                  | 2 +-
 package/rp-pppoe/rp-pppoe.mk                                    | 2 +-
 package/rpm/rpm.mk                                              | 2 +-
 package/rrdtool/rrdtool.mk                                      | 2 +-
 package/rsh-redone/rsh-redone.mk                                | 2 +-
 package/rsync/rsync.mk                                          | 2 +-
 package/rsyslog/rsyslog.mk                                      | 2 +-
 package/rt-tests/rt-tests.mk                                    | 2 +-
 package/rtai/rtai.mk                                            | 2 +-
 package/rtorrent/rtorrent.mk                                    | 2 +-
 package/ruby/ruby.mk                                            | 2 +-
 package/samba/samba.mk                                          | 2 +-
 package/sane-backends/sane-backends.mk                          | 2 +-
 package/sawman/sawman.mk                                        | 2 +-
 package/screen/screen.mk                                        | 2 +-
 package/sdl/sdl.mk                                              | 2 +-
 package/sdl_gfx/sdl_gfx.mk                                      | 2 +-
 package/sdl_image/sdl_image.mk                                  | 2 +-
 package/sdl_mixer/sdl_mixer.mk                                  | 2 +-
 package/sdl_net/sdl_net.mk                                      | 2 +-
 package/sdl_sound/sdl_sound.mk                                  | 2 +-
 package/sdl_ttf/sdl_ttf.mk                                      | 2 +-
 package/sdparm/sdparm.mk                                        | 2 +-
 package/sed/sed.mk                                              | 2 +-
 package/ser2net/ser2net.mk                                      | 2 +-
 package/setserial/setserial.mk                                  | 2 +-
 package/shared-mime-info/shared-mime-info.mk                    | 2 +-
 package/slang/slang.mk                                          | 2 +-
 package/smartmontools/smartmontools.mk                          | 2 +-
 package/socat/socat.mk                                          | 2 +-
 package/socketcand/socketcand.mk                                | 2 +-
 package/sound-theme-freedesktop/sound-theme-freedesktop.mk      | 2 +-
 package/spawn-fcgi/spawn-fcgi.mk                                | 2 +-
 package/speex/speex.mk                                          | 2 +-
 package/sqlcipher/sqlcipher.mk                                  | 2 +-
 package/sqlite/sqlite.mk                                        | 2 +-
 package/squashfs/squashfs.mk                                    | 2 +-
 package/squashfs3/squashfs3.mk                                  | 2 +-
 package/squid/squid.mk                                          | 2 +-
 package/sredird/sredird.mk                                      | 2 +-
 package/sshfs/sshfs.mk                                          | 2 +-
 package/sstrip/sstrip.mk                                        | 2 +-
 package/startup-notification/startup-notification.mk            | 2 +-
 package/statserial/statserial.mk                                | 2 +-
 package/strace/strace.mk                                        | 2 +-
 package/stress/stress.mk                                        | 2 +-
 package/stunnel/stunnel.mk                                      | 2 +-
 package/sudo/sudo.mk                                            | 2 +-
 package/sylpheed/sylpheed.mk                                    | 2 +-
 package/synergy/synergy.mk                                      | 2 +-
 package/sysklogd/sysklogd.mk                                    | 2 +-
 package/sysstat/sysstat.mk                                      | 2 +-
 package/systemd/systemd.mk                                      | 2 +-
 package/sysvinit/sysvinit.mk                                    | 2 +-
 package/taglib/taglib.mk                                        | 2 +-
 package/tar/tar.mk                                              | 2 +-
 package/tcl/tcl.mk                                              | 2 +-
 package/tcpdump/tcpdump.mk                                      | 2 +-
 package/tcpreplay/tcpreplay.mk                                  | 2 +-
 package/tftpd/tftpd.mk                                          | 2 +-
 package/thttpd/thttpd.mk                                        | 2 +-
 package/ti-utils/ti-utils.mk                                    | 2 +-
 package/tiff/tiff.mk                                            | 2 +-
 package/tinyhttpd/tinyhttpd.mk                                  | 2 +-
 package/tn5250/tn5250.mk                                        | 2 +-
 package/torsmo/torsmo.mk                                        | 2 +-
 package/transmission/transmission.mk                            | 2 +-
 package/tremor/tremor.mk                                        | 2 +-
 package/tslib/tslib.mk                                          | 2 +-
 package/uboot-tools/uboot-tools.mk                              | 2 +-
 package/udev/udev.mk                                            | 2 +-
 package/udpcast/udpcast.mk                                      | 2 +-
 package/uemacs/uemacs.mk                                        | 2 +-
 package/unionfs/unionfs.mk                                      | 2 +-
 package/usb_modeswitch/usb_modeswitch.mk                        | 2 +-
 package/usbmount/usbmount.mk                                    | 2 +-
 package/usbutils/usbutils.mk                                    | 2 +-
 package/ushare/ushare.mk                                        | 2 +-
 package/util-linux/util-linux.mk                                | 2 +-
 package/vala/vala.mk                                            | 2 +-
 package/valgrind/valgrind.mk                                    | 2 +-
 package/vim/vim.mk                                              | 2 +-
 package/vsftpd/vsftpd.mk                                        | 2 +-
 package/vtun/vtun.mk                                            | 2 +-
 package/webkit/webkit.mk                                        | 2 +-
 package/webrtc-audio-processing/webrtc-audio-processing.mk      | 2 +-
 package/wget/wget.mk                                            | 2 +-
 package/whetstone/whetstone.mk                                  | 2 +-
 package/which/which.mk                                          | 2 +-
 package/wipe/wipe.mk                                            | 2 +-
 package/wireless_tools/wireless_tools.mk                        | 2 +-
 package/wpa_supplicant/wpa_supplicant.mk                        | 2 +-
 package/wsapi/wsapi.mk                                          | 2 +-
 package/x11r7/libxcb/libxcb.mk                                  | 2 +-
 package/x11r7/mcookie/mcookie.mk                                | 2 +-
 package/x11r7/mesa3d/mesa3d.mk                                  | 2 +-
 package/x11r7/pthread-stubs/pthread-stubs.mk                    | 2 +-
 package/x11r7/xapp_appres/xapp_appres.mk                        | 2 +-
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk                    | 2 +-
 package/x11r7/xapp_beforelight/xapp_beforelight.mk              | 2 +-
 package/x11r7/xapp_bitmap/xapp_bitmap.mk                        | 2 +-
 package/x11r7/xapp_editres/xapp_editres.mk                      | 2 +-
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk                | 2 +-
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk                  | 2 +-
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk                      | 2 +-
 package/x11r7/xapp_iceauth/xapp_iceauth.mk                      | 2 +-
 package/x11r7/xapp_ico/xapp_ico.mk                              | 2 +-
 package/x11r7/xapp_listres/xapp_listres.mk                      | 2 +-
 package/x11r7/xapp_luit/xapp_luit.mk                            | 2 +-
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk                  | 2 +-
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk              | 2 +-
 package/x11r7/xapp_oclock/xapp_oclock.mk                        | 2 +-
 package/x11r7/xapp_rgb/xapp_rgb.mk                              | 2 +-
 package/x11r7/xapp_rstart/xapp_rstart.mk                        | 2 +-
 package/x11r7/xapp_scripts/xapp_scripts.mk                      | 2 +-
 package/x11r7/xapp_sessreg/xapp_sessreg.mk                      | 2 +-
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk                  | 2 +-
 package/x11r7/xapp_showfont/xapp_showfont.mk                    | 2 +-
 package/x11r7/xapp_smproxy/xapp_smproxy.mk                      | 2 +-
 package/x11r7/xapp_twm/xapp_twm.mk                              | 2 +-
 package/x11r7/xapp_viewres/xapp_viewres.mk                      | 2 +-
 package/x11r7/xapp_x11perf/xapp_x11perf.mk                      | 2 +-
 package/x11r7/xapp_xauth/xapp_xauth.mk                          | 2 +-
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk                | 2 +-
 package/x11r7/xapp_xbiff/xapp_xbiff.mk                          | 2 +-
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                          | 2 +-
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk                | 2 +-
 package/x11r7/xapp_xclock/xapp_xclock.mk                        | 2 +-
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk                        | 2 +-
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk                | 2 +-
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk                  | 2 +-
 package/x11r7/xapp_xditview/xapp_xditview.mk                    | 2 +-
 package/x11r7/xapp_xdm/xapp_xdm.mk                              | 2 +-
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk                    | 2 +-
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk                    | 2 +-
 package/x11r7/xapp_xedit/xapp_xedit.mk                          | 2 +-
 package/x11r7/xapp_xev/xapp_xev.mk                              | 2 +-
 package/x11r7/xapp_xeyes/xapp_xeyes.mk                          | 2 +-
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk                      | 2 +-
 package/x11r7/xapp_xfd/xapp_xfd.mk                              | 2 +-
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk                    | 2 +-
 package/x11r7/xapp_xfs/xapp_xfs.mk                              | 2 +-
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk                      | 2 +-
 package/x11r7/xapp_xgamma/xapp_xgamma.mk                        | 2 +-
 package/x11r7/xapp_xgc/xapp_xgc.mk                              | 2 +-
 package/x11r7/xapp_xhost/xapp_xhost.mk                          | 2 +-
 package/x11r7/xapp_xinit/xapp_xinit.mk                          | 2 +-
 package/x11r7/xapp_xinput/xapp_xinput.mk                        | 2 +-
 package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk  | 2 +-
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk                      | 2 +-
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk                        | 2 +-
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk                    | 2 +-
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk                    | 2 +-
 package/x11r7/xapp_xkill/xapp_xkill.mk                          | 2 +-
 package/x11r7/xapp_xload/xapp_xload.mk                          | 2 +-
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                          | 2 +-
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk                    | 2 +-
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk                | 2 +-
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk                    | 2 +-
 package/x11r7/xapp_xmag/xapp_xmag.mk                            | 2 +-
 package/x11r7/xapp_xman/xapp_xman.mk                            | 2 +-
 package/x11r7/xapp_xmessage/xapp_xmessage.mk                    | 2 +-
 package/x11r7/xapp_xmh/xapp_xmh.mk                              | 2 +-
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk                      | 2 +-
 package/x11r7/xapp_xmore/xapp_xmore.mk                          | 2 +-
 package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk            | 2 +-
 package/x11r7/xapp_xpr/xapp_xpr.mk                              | 2 +-
 .../x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk  | 2 +-
 package/x11r7/xapp_xprop/xapp_xprop.mk                          | 2 +-
 package/x11r7/xapp_xrandr/xapp_xrandr.mk                        | 2 +-
 package/x11r7/xapp_xrdb/xapp_xrdb.mk                            | 2 +-
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk                    | 2 +-
 package/x11r7/xapp_xset/xapp_xset.mk                            | 2 +-
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk                    | 2 +-
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk              | 2 +-
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk                    | 2 +-
 package/x11r7/xapp_xsm/xapp_xsm.mk                              | 2 +-
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk                    | 2 +-
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk                    | 2 +-
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk                        | 2 +-
 package/x11r7/xapp_xwd/xapp_xwd.mk                              | 2 +-
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk                    | 2 +-
 package/x11r7/xapp_xwud/xapp_xwud.mk                            | 2 +-
 package/x11r7/xcb-proto/xcb-proto.mk                            | 2 +-
 package/x11r7/xcb-util/xcb-util.mk                              | 2 +-
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk                  | 2 +-
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk      | 2 +-
 .../xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk      | 2 +-
 .../xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk      | 2 +-
 .../x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk  | 2 +-
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk  | 2 +-
 .../xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk  | 2 +-
 .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk  | 2 +-
 .../xdriver_xf86-input-synaptics.mk                             | 2 +-
 .../x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk  | 2 +-
 .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk    | 2 +-
 .../x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk    | 2 +-
 package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk  | 2 +-
 package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk  | 2 +-
 package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk  | 2 +-
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk  | 2 +-
 .../xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk      | 2 +-
 .../x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk  | 2 +-
 .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk      | 2 +-
 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk  | 2 +-
 .../xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk  | 2 +-
 .../xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk    | 2 +-
 package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk    | 2 +-
 .../xdriver_xf86-video-openchrome.mk                            | 2 +-
 .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk    | 2 +-
 .../xdriver_xf86-video-rendition.mk                             | 2 +-
 package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk    | 2 +-
 .../xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk    | 2 +-
 .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk      | 2 +-
 .../xdriver_xf86-video-siliconmotion.mk                         | 2 +-
 package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk  | 2 +-
 .../xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk      | 2 +-
 .../xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk    | 2 +-
 .../xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk      | 2 +-
 .../xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk      | 2 +-
 .../xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk      | 2 +-
 .../xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk      | 2 +-
 .../xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk      | 2 +-
 .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk    | 2 +-
 package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk  | 2 +-
 .../xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk  | 2 +-
 package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk    | 2 +-
 .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk      | 2 +-
 .../xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk      | 2 +-
 .../x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk    | 2 +-
 package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk  | 2 +-
 package/x11r7/xfont_encodings/xfont_encodings.mk                | 2 +-
 .../x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk    | 2 +-
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk  | 2 +-
 .../xfont_font-adobe-utopia-100dpi.mk                           | 2 +-
 .../xfont_font-adobe-utopia-75dpi.mk                            | 2 +-
 .../xfont_font-adobe-utopia-type1.mk                            | 2 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk              | 2 +-
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk  | 2 +-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk      | 2 +-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk        | 2 +-
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                    | 2 +-
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                     | 2 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk            | 2 +-
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk        | 2 +-
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk  | 2 +-
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk    | 2 +-
 .../xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk  | 2 +-
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk    | 2 +-
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk    | 2 +-
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk  | 2 +-
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk  | 2 +-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk        | 2 +-
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk      | 2 +-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk      | 2 +-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk        | 2 +-
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk    | 2 +-
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk  | 2 +-
 .../x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk  | 2 +-
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk  | 2 +-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk      | 2 +-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk      | 2 +-
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk    | 2 +-
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk    | 2 +-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk      | 2 +-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk        | 2 +-
 package/x11r7/xfont_font-util/xfont_font-util.mk                | 2 +-
 .../xfont_font-winitzki-cyrillic.mk                             | 2 +-
 .../x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk  | 2 +-
 package/x11r7/xkeyboard-config/xkeyboard-config.mk              | 2 +-
 package/x11r7/xlib_libFS/xlib_libFS.mk                          | 2 +-
 package/x11r7/xlib_libICE/xlib_libICE.mk                        | 2 +-
 package/x11r7/xlib_libSM/xlib_libSM.mk                          | 2 +-
 package/x11r7/xlib_libX11/xlib_libX11.mk                        | 2 +-
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk          | 2 +-
 package/x11r7/xlib_libXau/xlib_libXau.mk                        | 2 +-
 package/x11r7/xlib_libXaw/xlib_libXaw.mk                        | 2 +-
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk          | 2 +-
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk                | 2 +-
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk                | 2 +-
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                    | 2 +-
 package/x11r7/xlib_libXext/xlib_libXext.mk                      | 2 +-
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk                  | 2 +-
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                    | 2 +-
 package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk          | 2 +-
 package/x11r7/xlib_libXft/xlib_libXft.mk                        | 2 +-
 package/x11r7/xlib_libXi/xlib_libXi.mk                          | 2 +-
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk              | 2 +-
 package/x11r7/xlib_libXmu/xlib_libXmu.mk                        | 2 +-
 package/x11r7/xlib_libXp/xlib_libXp.mk                          | 2 +-
 package/x11r7/xlib_libXpm/xlib_libXpm.mk                        | 2 +-
 package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk    | 2 +-
 package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk          | 2 +-
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk                  | 2 +-
 package/x11r7/xlib_libXrender/xlib_libXrender.mk                | 2 +-
 package/x11r7/xlib_libXres/xlib_libXres.mk                      | 2 +-
 package/x11r7/xlib_libXt/xlib_libXt.mk                          | 2 +-
 package/x11r7/xlib_libXtst/xlib_libXtst.mk                      | 2 +-
 package/x11r7/xlib_libXv/xlib_libXv.mk                          | 2 +-
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                      | 2 +-
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk              | 2 +-
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk                | 2 +-
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                        | 2 +-
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk                | 2 +-
 package/x11r7/xlib_liboldX/xlib_liboldX.mk                      | 2 +-
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk            | 2 +-
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk                | 2 +-
 package/x11r7/xlib_libxkbui/xlib_libxkbui.mk                    | 2 +-
 package/x11r7/xlib_xtrans/xlib_xtrans.mk                        | 2 +-
 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk        | 2 +-
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk        | 2 +-
 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk    | 2 +-
 package/x11r7/xproto_damageproto/xproto_damageproto.mk          | 2 +-
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk                | 2 +-
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk              | 2 +-
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk            | 2 +-
 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk    | 2 +-
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk            | 2 +-
 package/x11r7/xproto_glproto/xproto_glproto.mk                  | 2 +-
 package/x11r7/xproto_inputproto/xproto_inputproto.mk            | 2 +-
 package/x11r7/xproto_kbproto/xproto_kbproto.mk                  | 2 +-
 package/x11r7/xproto_printproto/xproto_printproto.mk            | 2 +-
 package/x11r7/xproto_randrproto/xproto_randrproto.mk            | 2 +-
 package/x11r7/xproto_recordproto/xproto_recordproto.mk          | 2 +-
 package/x11r7/xproto_renderproto/xproto_renderproto.mk          | 2 +-
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk      | 2 +-
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk    | 2 +-
 package/x11r7/xproto_videoproto/xproto_videoproto.mk            | 2 +-
 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk    | 2 +-
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk          | 2 +-
 package/x11r7/xproto_xextproto/xproto_xextproto.mk              | 2 +-
 .../x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk    | 2 +-
 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk        | 2 +-
 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk        | 2 +-
 package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk      | 2 +-
 .../x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk    | 2 +-
 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk      | 2 +-
 package/x11r7/xproto_xproto/xproto_xproto.mk                    | 2 +-
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk        | 2 +-
 package/x11r7/xutil_makedepend/xutil_makedepend.mk              | 2 +-
 package/x11r7/xutil_util-macros/xutil_util-macros.mk            | 2 +-
 package/x11vnc/x11vnc.mk                                        | 2 +-
 package/xavante/xavante.mk                                      | 2 +-
 package/xenomai/xenomai.mk                                      | 2 +-
 package/xerces/xerces.mk                                        | 2 +-
 package/xfsprogs/xfsprogs.mk                                    | 2 +-
 package/xinetd/xinetd.mk                                        | 2 +-
 package/xl2tp/xl2tp.mk                                          | 2 +-
 package/xmlstarlet/xmlstarlet.mk                                | 2 +-
 package/xstroke/xstroke.mk                                      | 2 +-
 package/xterm/xterm.mk                                          | 2 +-
 package/xvkbd/xvkbd.mk                                          | 2 +-
 package/xz/xz.mk                                                | 2 +-
 package/yajl/yajl.mk                                            | 2 +-
 package/zeromq/zeromq.mk                                        | 2 +-
 package/zlib/zlib.mk                                            | 2 +-
 package/zxing/zxing.mk                                          | 2 +-
 821 files changed, 821 insertions(+), 821 deletions(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 5592d37375..d8caed71d0 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -38,7 +38,7 @@ define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS
 	cp $(@D)/$(AT91BOOTSTRAP_BINARY) $(BINARIES_DIR)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 # we NEED a board name unless we're at make source
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 6c0188a1e9..10f54a1e54 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -19,4 +19,4 @@ define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
 	cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 0cbe64118a..e5e2558cbc 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -72,7 +72,7 @@ define BAREBOX_INSTALL_TARGET_CMDS
 endef
 endif
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
 ifeq ($(BR2_TARGET_BAREBOX),y)
 # we NEED a board defconfig file unless we're at make source
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 1b5ca0dd21..e8d66f1752 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -82,4 +82,4 @@ define GRUB_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/boot/grub
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index d11be6cf2c..c4e8d2dc1b 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -67,4 +67,4 @@ define LPC32XXCDL_INSTALL_IMAGES_CMDS
 	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)/*gnu.bin $(BINARIES_DIR)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 50dec2bbbd..7df342fb12 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -42,5 +42,5 @@ define HOST_SYSLINUX_CLEAN_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 486773aa72..9e03d6a614 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -119,7 +119,7 @@ UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
 UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
 endif
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
 ifeq ($(BR2_TARGET_UBOOT),y)
 # we NEED a board name unless we're at make source
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index e8dd380979..fbdba02831 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -19,7 +19,7 @@ define XLOADER_INSTALL_IMAGES_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/MLO $(BINARIES_DIR)/
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
 #############################################################
 #
diff --git a/linux/linux.mk b/linux/linux.mk
index bd3e23e5ee..ca216a3e3d 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -213,7 +213,7 @@ endef
 
 include linux/linux-ext-*.mk
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
 ifeq ($(BR2_LINUX_KERNEL),y)
 linux-menuconfig linux-xconfig linux-gconfig linux-nconfig linux26-menuconfig linux26-xconfig linux26-gconfig linux26-nconfig: dirs linux-configure
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index 48db8ae6c4..e7a654c4df 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -25,4 +25,4 @@ ACL_INSTALL_TARGET_OPT = 			\
 	exec_prefix=$(TARGET_DIR)/usr 		\
 	install install-lib
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index 317cb16688..cacfb27e7e 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -30,4 +30,4 @@ define ACPID_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 2d27c960ca..c3f61ff919 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -83,4 +83,4 @@ define ALSA_LIB_UNINSTALL_STAGING_CMDS
 	-rm -rf $(STAGING_DIR)/usr/share/alsa
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index e8c8ddae7c..b59de59958 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -14,5 +14,5 @@ ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
 
 ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index 564b1bb2d8..b9ff904c75 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -10,4 +10,4 @@ APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
 APR_UTIL_CONF_OPT = \
 	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index 31589133a3..e502490ead 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -15,4 +15,4 @@ APR_CONF_ENV = \
 	ac_cv_sizeof_struct_iovec=8 \
 	apr_cv_mutex_recursive=yes
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk
index ac0890d391..47c09b29bd 100644
--- a/package/argp-standalone/argp-standalone.mk
+++ b/package/argp-standalone/argp-standalone.mk
@@ -18,4 +18,4 @@ define ARGP_STANDALONE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/argp.h $(TARGET_DIR)/usr/include/argp.h
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index ac07db2645..da7ecac214 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -17,4 +17,4 @@ endef
 
 ARGUS_POST_PATCH_HOOKS += ARGUS_DEBIAN_PATCH_APPLY
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/at/at.mk b/package/at/at.mk
index c9d503ae7d..1cea39bdcd 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -38,4 +38,4 @@ define AT_UNINSTALL_TARGET_CMDS
 		at.1 atq.1 atrm.1 batch.1 at_allow.5 at_deny.5 atd.8 atrun.8)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index d90957641e..0d4d6901cb 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -54,5 +54,5 @@ ATK_DEPENDENCIES = libglib2 host-pkg-config
 HOST_ATK_CONF_OPT = \
 		--disable-glibtest
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index beecb31837..288052d353 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -24,4 +24,4 @@ ATTR_INSTALL_TARGET_OPT = 			\
 	exec_prefix=$(TARGET_DIR)/usr 		\
 	install install-lib
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index 5f09f95961..1c6e6deaae 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -16,4 +16,4 @@ endef
 
 AUDIOFILE_POST_PATCH_HOOKS += AUDIOFILE_DISABLE_EXAMPLES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 8787a7756b..3f84e3e0d7 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -17,7 +17,7 @@ HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # variables used by other packages
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 45210625c7..3c190854ac 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -23,7 +23,7 @@ endef
 HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
 HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # variables used by other packages
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 32e3df7f9b..d9c0d1dbb0 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -163,4 +163,4 @@ ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 91f6d1e0da..893caf1248 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -44,4 +44,4 @@ define AXEL_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 44f9337750..1466d268fc 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -39,4 +39,4 @@ define BASH_UNINSTALL_TARGET_CMDS
 	fi
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index 7642c1b8e8..f3a8c03037 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -33,4 +33,4 @@ endef
 BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 3aaae5f84f..3037da6908 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -58,4 +58,4 @@ BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
 
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 88f79ded6f..5de451c73d 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -63,4 +63,4 @@ define BIND_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S81named
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index e061fde43e..a91879a701 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -61,5 +61,5 @@ define BINUTILS_INSTALL_TARGET_CMDS
 endef
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 4ae5f2a14c..d0c9077ed8 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -16,5 +16,5 @@ endef
 
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index 600ba6ca19..a6d4b45423 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -17,4 +17,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 BLACKBOX_DEPENDENCIES += libiconv
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 33d298768b..643b1fe5b2 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -45,4 +45,4 @@ BLUEZ_UTILS_CONF_OPT +=	\
 	--disable-usb
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index 98c0ab7bcb..4ff2f1a5db 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -29,4 +29,4 @@ define BMON_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/bmon
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index c09e87f2d8..10998087b7 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -25,4 +25,4 @@ define BOA_UNINSTALL_TARGET_CMDS
 		$(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
index 2251ebc7ca..6d82b8ac0c 100644
--- a/package/bonnie/bonnie.mk
+++ b/package/bonnie/bonnie.mk
@@ -15,4 +15,4 @@ define BONNIE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/bonnie++ $(TARGET_DIR)/usr/sbin/zcav
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index abdf3a2c26..3b08bb92f6 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -85,4 +85,4 @@ define BOOST_INSTALL_STAGING_CMDS
 	--layout=system install)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
index 35df95b014..a37654b43d 100644
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -8,4 +8,4 @@ BOOTUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge
 
 BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index 7e942ef37e..5f846ffe59 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -15,4 +15,4 @@ define BRIDGE_UTILS_UNINSTALL_TARGET_CMDS
 		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index e8d9ec0150..1e05c83ac8 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -28,4 +28,4 @@ define BSDIFF_CLEAN_CMDS
 	rm -f $(@D)/bsdiff $(@D)/bspatch
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1d988f838e..394a1aeddd 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -197,7 +197,7 @@ define BUSYBOX_CLEAN_CMDS
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
 busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
index 618a61f3e2..55ac2f13fc 100644
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -13,4 +13,4 @@ BWM_NG_CONF_OPT += --with-ncurses
 BWM_NG_DEPENDENCIES += ncurses
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index cb4f38e870..b3e4ad34a5 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -103,5 +103,5 @@ define HOST_BZIP2_INSTALL_CMDS
 	$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 55068dd092..6b456dd89d 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -77,4 +77,4 @@ else
 	CAIRO_CONF_OPT += --disable-svg
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
index 50390434b9..ea1dc06e7d 100644
--- a/package/can-utils/can-utils.mk
+++ b/package/can-utils/can-utils.mk
@@ -8,4 +8,4 @@ CAN_UTILS_VERSION = 50775159276d896d8b3102b6dbc658a91a2a1d53
 CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
 CAN_UTILS_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index bee34b43ec..b9c2039cf3 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -42,7 +42,7 @@ endef
 HOST_CCACHE_POST_CONFIGURE_HOOKS += \
 	HOST_CCACHE_PATCH_CONFIGURATION
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 ifeq ($(BR2_CCACHE),y)
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index 2a748265bf..ce89bc7b42 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -23,5 +23,5 @@ CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)"
 HOST_CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(HOST_DIR)/usr/include"
 HOST_CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
 $(eval $(host-cmake-package))
diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
index 8e5770aace..038fee15d5 100644
--- a/package/cgilua/cgilua.mk
+++ b/package/cgilua/cgilua.mk
@@ -17,4 +17,4 @@ define CGILUA_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/lua/cgilua.lua"
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index 15ed17acfb..e2530c0a0b 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -8,4 +8,4 @@ endef
 
 CIFS_UTILS_POST_PATCH_HOOKS += CIFS_UTILS_NO_WERROR
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index f0e1fc4a72..a9b0bcff89 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -40,4 +40,4 @@ define CJSON_CLEAN_CMDS
 	cd $(@D)/cJSON && rm -f libcJSON.so
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index 9996e6755a..809e531aea 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -14,5 +14,5 @@ define HOST_CLOOP_INSTALL_CMDS
 	$(INSTALL) -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 9b0f954c1a..2406e5cd47 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -17,5 +17,5 @@ define HOST_CMAKE_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 440450998c..71ca6605c2 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -125,4 +125,4 @@ define COLLECTD_INSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 0aa7ec7b61..1046cdf4e7 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -33,4 +33,4 @@ endef
 CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 6b9ba52b10..8f1159bdb0 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -10,4 +10,4 @@ CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
 	libnetfilter_conntrack libnetfilter_cttimeout
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/copas/copas.mk b/package/copas/copas.mk
index 28b822c2d7..cd9ab7a37e 100644
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -17,4 +17,4 @@ define COPAS_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/lua/copas.lua"
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index b2cca39280..e64dd5af1c 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -81,4 +81,4 @@ COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_POST_INSTALL
 # If both coreutils and busybox are selected, the corresponding applets
 # may need to be reinstated by the clean targets.
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
index 81125d7408..94fc16c3b0 100644
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -17,4 +17,4 @@ define COXPCALL_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/lua/coxpcall.lua"
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index beace2319d..71ed8cb35a 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -28,5 +28,5 @@ define HOST_CRAMFS_INSTALL_CMDS
  install -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index f086447ba4..d83011eaca 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -14,4 +14,4 @@ else
 CTORRENT_CONF_OPT+=--with-ssl=no
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 6d906ec942..226a832fe9 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -70,4 +70,4 @@ endef
 
 CUPS_POST_INSTALL_STAGING_HOOKS += CUPS_FIXUP_CUPS_CONFIG
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index b3074b0d24..2bc0af2331 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -48,6 +48,6 @@ define CVS_INSTALL_TARGET_CMDS
 	install -D $(@D)/src/cvs $(TARGET_DIR)/usr/bin/cvs
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
 
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 26c6431b65..64f72e0bfe 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -18,4 +18,4 @@ define DASH_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/bin/dash
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 2ee52c8b15..93aa5206e2 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -32,7 +32,7 @@ HOST_DBUS_GLIB_CONF_OPT = \
 		--disable-doxygen-docs \
 		--enable-asserts=yes
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # dbus-glib for the host
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index 83e3aeeb99..c011642810 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -20,4 +20,4 @@ DBUS_PYTHON_CONF_OPT = --disable-html-docs --disable-api-docs
 
 DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 8cd39606f2..1190d2fc3c 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -87,5 +87,5 @@ HOST_DBUS_GEN_INTROSPECT = \
 
 HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk
index f477589429..cc9b218b4c 100644
--- a/package/devmem2/devmem2.mk
+++ b/package/devmem2/devmem2.mk
@@ -28,4 +28,4 @@ define DEVMEM2_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/sbin/devmem2
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 9ec27d3497..22b068aefe 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -61,4 +61,4 @@ define DHCP_INSTALL_TARGET_CMDS
 	$(DHCP_INSTALL_CLIENT)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
index dd454bf9dc..06ecec4c2c 100644
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -18,4 +18,4 @@ define DHCPDUMP_INSTALL_TARGET_CMDS
 	install -m 0755 -D $(@D)/dhcpdump $(TARGET_DIR)/usr/bin/dhcpdump
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/dhrystone/dhrystone.mk b/package/dhrystone/dhrystone.mk
index 098b9f1593..6d3ddfa339 100644
--- a/package/dhrystone/dhrystone.mk
+++ b/package/dhrystone/dhrystone.mk
@@ -29,4 +29,4 @@ define DHRYSTONE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/dhrystone
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 175ed9351c..8d87b771af 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -24,4 +24,4 @@ define DIALOG_POST_CLEAN
 	rm -f $(TARGET_DIR)/usr/bin/dialog
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 6d1896afa2..d6029a4e60 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -14,4 +14,4 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index d8e61f7beb..8d038986f7 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -100,5 +100,5 @@ define DIRECTFB_EXAMPLES_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index a7fb7f0799..e5763d7724 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -142,7 +142,7 @@ endef
 
 DIRECTFB_POST_INSTALL_STAGING_HOOKS += DIRECTFB_STAGING_CONFIG_FIXUP
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # directfb-csource for the host
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index dc3b36b2ea..1e09f57f72 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -20,4 +20,4 @@ define DISTCC_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 3e8d093ff3..779322e559 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -10,4 +10,4 @@ DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 89d067ddff..e2fdda42be 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -55,4 +55,4 @@ define DMALLOC_CLEAN_CMDS
 endef
 
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
index a036a7a374..5d842945f0 100644
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -15,4 +15,4 @@ define DMIDECODE_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 7763aaae40..3fb237537c 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -26,4 +26,4 @@ define DMRAID_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S20dmraid
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 2b22c1027e..1f714bf577 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -95,4 +95,4 @@ define DNSMASQ_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/dnsmasq.8
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index fd12cce843..9839d889dd 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -18,4 +18,4 @@ DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
 
 DOCKER_DEPENDENCIES = host-pkg-config libglib2 xserver_xorg-server
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 7a8a7e869a..08201d3870 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -34,4 +34,4 @@ define DOSFSTOOLS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index fea96d6aa5..64d3a01ce7 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -69,4 +69,4 @@ define DROPBEAR_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S50dropbear
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/dsp-tools/dsp-tools.mk b/package/dsp-tools/dsp-tools.mk
index b9fed0bcbf..42aac05edf 100644
--- a/package/dsp-tools/dsp-tools.mk
+++ b/package/dsp-tools/dsp-tools.mk
@@ -15,4 +15,4 @@ define DSP_TOOLS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/dsp-, load probe test exec)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk
index a19d1d4e24..67db63aff5 100644
--- a/package/dstat/dstat.mk
+++ b/package/dstat/dstat.mk
@@ -12,4 +12,4 @@ define DSTAT_INSTALL_TARGET_CMDS
        $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 6a790d2097..16725ac21c 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -103,5 +103,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
 E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index ddda9850bb..b3068f43e5 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -28,4 +28,4 @@ define EBTABLES_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/sbin/ebtables
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index f5a4b225f2..a97e19b943 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -9,4 +9,4 @@ ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk
index 752074470d..e64fa068de 100644
--- a/package/eeprog/eeprog.mk
+++ b/package/eeprog/eeprog.mk
@@ -19,4 +19,4 @@ define EEPROG_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/eeprog
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
index 4c011900a2..a841ac9d5a 100644
--- a/package/efl/expedite/expedite.mk
+++ b/package/efl/expedite/expedite.mk
@@ -8,4 +8,4 @@ EXPEDITE_VERSION = 1.1.0
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
 EXPEDITE_DEPENDENCIES = libevas libeina libeet
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 7d2884f9c6..df8db0d4c2 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -98,5 +98,5 @@ else
 LIBECORE_CONF_OPT += --disable-ecore-evas
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index c03474d9dc..04c48a4216 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -31,4 +31,4 @@ else
 LIBEDBUS_CONF_OPT += --disable-enotify
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index 1d9434928e..e6d9ab33ed 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -20,5 +20,5 @@ endif
 
 HOST_LIBEDJE_CONF_OPT = --enable-edje-cc
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index e508f5343a..3ca12d37c7 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -11,5 +11,5 @@ LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkg-config zlib jpeg libeina
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
index 14fb8cb13d..2f00bcff04 100644
--- a/package/efl/libefreet/libefreet.mk
+++ b/package/efl/libefreet/libefreet.mk
@@ -11,4 +11,4 @@ LIBEFREET_INSTALL_STAGING = YES
 
 LIBEFREET_DEPENDENCIES = libeina libeet libecore
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index 2e57b99b10..2391379436 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -11,5 +11,5 @@ LIBEINA_INSTALL_STAGING = YES
 
 LIBEINA_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 475fd45775..83c90053df 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -15,4 +15,4 @@ LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
 LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index 5456a06b56..db1696daf7 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -11,5 +11,5 @@ LIBEMBRYO_INSTALL_STAGING = YES
 
 LIBEMBRYO_DEPENDENCIES = host-pkg-config libeina
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
index 617de0d790..92e4c8331f 100644
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -21,4 +21,4 @@ ifeq ($(BR2_PACKAGE_LIBEDBUS),y)
 LIBETHUMB_DEPENDENCIES += libedbus
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index e21db82ace..3baf23b896 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -212,5 +212,5 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 LIBEVAS_CONF_OPT += --disable-doc
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index 137e196e74..97b1e7eec6 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -15,4 +15,4 @@ define EMPTY_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/empty $(TARGET_DIR)/usr/bin/empty
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 9d7ae0e341..215425ada2 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -9,4 +9,4 @@ ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
 ENCHANT_INSTALL_STAGING = YES
 ENCHANT_DEPENDENCIES = libglib2 host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index bbbcf1e0f5..63a8d54810 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -7,4 +7,4 @@
 ETHTOOL_VERSION = 3.4.1
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 9221268ec8..663abcdfd8 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -11,5 +11,5 @@ EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/explorercanvas/explorercanvas.mk b/package/explorercanvas/explorercanvas.mk
index 93dcb1f836..968843c315 100644
--- a/package/explorercanvas/explorercanvas.mk
+++ b/package/explorercanvas/explorercanvas.mk
@@ -15,4 +15,4 @@ define EXPLORERCANVAS_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/var/www/excanvas.js
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 321e466fc9..57c3ffbc85 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -37,4 +37,4 @@ define EZXML_CLEAN_CMDS
 	-$(MAKE) -C $(@D) -f GNUmakefile clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index eca432e217..176d254265 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -7,5 +7,5 @@ FBDUMP_VERSION:=0.4.2
 FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index 892043ea2c..b0b46cbc60 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -15,4 +15,4 @@ define FBGRAB_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/fbgrab
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 95d8aa7b83..3423259e8a 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -29,4 +29,4 @@ define FBSET_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
index ddb5b2b31b..fcb2570dd3 100644
--- a/package/fbterm/fbterm.mk
+++ b/package/fbterm/fbterm.mk
@@ -9,4 +9,4 @@ FBTERM_SITE = http://fbterm.googlecode.com/files/
 
 FBTERM_DEPENDENCIES = fontconfig liberation
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 7db68022b1..7949e990e3 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -50,4 +50,4 @@ define FBV_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index 8144a16b43..4eb7c9e1cb 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -25,4 +25,4 @@ define FCONFIG_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 4f326ef1d1..9084b65660 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -18,4 +18,4 @@ define FEH_UNINSTALL_TARGET_CMDS
 		DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index f9d0fba22b..f846ffc8a7 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -8,4 +8,4 @@ FFTW_VERSION = 3.3
 FFTW_SITE = http://www.fftw.org
 FFTW_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/file/file.mk b/package/file/file.mk
index f2d9172831..3fa3fb382e 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -14,5 +14,5 @@ define FILE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/libmagic.*
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 7c9e596c8e..43aef75a24 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -9,4 +9,4 @@ FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
 FINDUTILS_CONF_ENV = gl_cv_func_stdin=yes \
 			gl_cv_func_wcwidth_works=yes
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index d2cd19685a..60c2ae895a 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -21,4 +21,4 @@ define FIS_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/sbin/fis
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index c019f2d3b3..4b310ef9d3 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -17,4 +17,4 @@ define FLASHROM_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/sbin/flashrom
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index d1a9a2bb7b..16f6801769 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -43,5 +43,5 @@ FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
 FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index 8b51b55213..f4ba60458f 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -20,4 +20,4 @@ define FLOT_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/var/www/jquery.flot*
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 1686a58e59..a5dac37b55 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -13,4 +13,4 @@ FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_CONF_OPT = --enable-threads --with-x
 FLTK_DEPENDENCIES = xserver_xorg-server xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 5848606bd9..6d7ff957e1 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -20,4 +20,4 @@ endef
 
 FLUXBOX_POST_INSTALL_TARGET_HOOKS += FLUXBOX_INSTALL_XSESSION_FILE
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/fmtools/fmtools.mk b/package/fmtools/fmtools.mk
index f705173ec4..c79ecfe6d3 100644
--- a/package/fmtools/fmtools.mk
+++ b/package/fmtools/fmtools.mk
@@ -16,4 +16,4 @@ define FMTOOLS_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/fmscan $(TARGET_DIR)/usr/sbin/fmscan
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index a993c9cedb..843b34f034 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -25,5 +25,5 @@ HOST_FONTCONFIG_CONF_OPT = \
 		--disable-docs \
 		--disable-static
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index aeef3fc073..79b2a23d5b 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -59,4 +59,4 @@ else
 FREERDP_CONF_OPT += -DWITH_XV=OFF
 endif
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index b2428cb41d..448efe0b3c 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -33,5 +33,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 FREETYPE_POST_INSTALL_TARGET_HOOKS += FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index 46bfd2424d..808618be81 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -29,4 +29,4 @@ define GADGETFS_TEST_CLEAN_CMDS
 	-$(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/games/doom-wad/doom-wad.mk b/package/games/doom-wad/doom-wad.mk
index 1143b3dd66..ae5dcef3de 100644
--- a/package/games/doom-wad/doom-wad.mk
+++ b/package/games/doom-wad/doom-wad.mk
@@ -21,4 +21,4 @@ define DOOM_WAD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/games/doom/doom1.wad
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/games/gnuchess/gnuchess.mk b/package/games/gnuchess/gnuchess.mk
index a6278446c5..3e0b724fa6 100644
--- a/package/games/gnuchess/gnuchess.mk
+++ b/package/games/gnuchess/gnuchess.mk
@@ -9,5 +9,5 @@ GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
 
 GNUCHESS_DEPENDENCIES = $(if $(BR2_PACKAGE_READLINE),readline)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk
index 9ffecee428..4dbfd1d2dc 100644
--- a/package/games/prboom/prboom.mk
+++ b/package/games/prboom/prboom.mk
@@ -41,4 +41,4 @@ define PRBOOM_UINSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/games/prboom
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/games/rubix/rubix.mk b/package/games/rubix/rubix.mk
index a66e6e1dde..2087b515cd 100644
--- a/package/games/rubix/rubix.mk
+++ b/package/games/rubix/rubix.mk
@@ -12,5 +12,5 @@ RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB=
 
 RUBIX_DEPENDENCIES = xserver_xorg-server
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index 5858138423..b13a9ac6d6 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -22,5 +22,5 @@ endif
 
 GAMIN_DEPENDENCIES = libglib2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index bb911574d6..58c96ced27 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -30,5 +30,5 @@ define GAWK_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/awk
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
index a53ee83c79..d7c8bec9b1 100644
--- a/package/gdisk/gdisk.mk
+++ b/package/gdisk/gdisk.mk
@@ -36,4 +36,4 @@ endef
 
 endif
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 2192eb972f..751f499fee 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -46,7 +46,7 @@ endef
 
 GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_POST_INSTALL_TWEAKS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
 HOST_GDK_PIXBUF_CONF_OPT = \
 	--without-libjpeg \
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index e5c4504245..9757d9fa0a 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -8,5 +8,5 @@ GENEXT2FS_VERSION=1.4.1
 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 56d1de04f3..c1cd6086a0 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -27,5 +27,5 @@ define HOST_GENROMFS_INSTALL_CMDS
   $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
\ No newline at end of file
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 75012ea6de..751534c809 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -13,4 +13,4 @@ GIBLIB_AUTORECONF_OPT = --install
 GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \
 		  --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 9165835c39..385ad47fc7 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -25,4 +25,4 @@ else
 GLIB_NETWORKING_CONF_OPT += --without-gnutls
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index a07f74b064..5bcc6c1be6 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -14,5 +14,5 @@ ifeq ($(ARCH),arm)
 GMP_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -marm"
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 1db5346558..51d0cd9536 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -13,4 +13,4 @@ GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkg-config host-vala \
 	xlib_libICE xlib_libSM xlib_libX11 \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index eb1596653d..1ec10b9a82 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -12,4 +12,4 @@ GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
 		--without-p11-kit
 GNUTLS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index 8dac356071..3757f85e2b 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -9,7 +9,7 @@ GOB2_SITE = http://ftp.5z.com/pub/gob
 GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
 HOST_GOB2_DEPENDENCIES = host-libglib2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # gob2 for the host
diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index 21e4cc796f..1254f0c915 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -7,5 +7,5 @@
 GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 94f39aaa6a..2ba5f713d0 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -182,4 +182,4 @@ define GPSD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S50gpsd
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index b87ad768aa..2f64cd0c36 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -8,5 +8,5 @@ GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
 GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 31ccaa6e81..4ed5feaa8e 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -21,4 +21,4 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GREP_DEPENDENCIES += busybox
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index b8694ad1fc..1551ad530d 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -83,4 +83,4 @@ GTK2_ENGINES_CONF_OPT = \
 		--disable-paranoia \
 		--disable-deprecated
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index 055205c4ae..3a26cfc8b5 100644
--- a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -9,4 +9,4 @@ GTK2_THEME_HICOLOR_SITE = http://icon-theme.freedesktop.org/releases/
 
 GTK2_THEME_HICOLOR_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index 5459e69cf7..7b63dcbcc7 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -8,5 +8,5 @@ GTKPERF_SOURCE:=gtkperf_$(GTKPERF_VERSION).tar.gz
 GTKPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gtkperf
 GTKPERF_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index f56c14a4bb..dcb94eed69 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -76,4 +76,4 @@ GVFS_POST_INSTALL_TARGET_HOOKS += \
 	GVFS_REMOVE_TARGET_SCHEMAS	\
 	GVFS_COMPILE_SCHEMAS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 5fad0010a7..0c5c124098 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -7,4 +7,4 @@
 GZIP_VERSION = 1.5
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index dfe4cf0bf8..14226c5a7a 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -21,4 +21,4 @@ endef
 
 HASERL_POST_INSTALL_TARGET_HOOKS += HASERL_REMOVE_EXAMPLES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index fb90ce2417..c524c62737 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -33,4 +33,4 @@ define HDPARM_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
index b1779c0bb1..f3779afdee 100644
--- a/package/heirloom-mailx/heirloom-mailx.mk
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -29,4 +29,4 @@ define HEIRLOOM_MAILX_INSTALL_TARGET_CMDS
 		install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 941ee8d56c..db5b27787b 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -16,4 +16,4 @@ HIAWATHA_CONF_OPT += \
 	-DWEBROOT_DIR=/var/www/hiawatha \
 	-DWORK_DIR=/var/lib/hiawatha
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index c7c59ecc34..82d6231d4f 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -105,4 +105,4 @@ define HOSTAPD_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/hostapd_cli
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 3535697247..9fa5bec542 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -11,4 +11,4 @@ HTOP_AUTORECONF = YES
 HTOP_CONF_OPT = --disable-unicode
 HTOP_CONF_ENV = ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk
index e4f72a51be..c56dea4829 100644
--- a/package/hwdata/hwdata.mk
+++ b/package/hwdata/hwdata.mk
@@ -18,4 +18,4 @@ define HWDATA_UNINSTALL_TARGET_CMDS
 	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index aeabf02bd0..3e1d9eed60 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -19,4 +19,4 @@ define I2C_TOOLS_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 71297e2f24..5a2d594046 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -24,5 +24,5 @@ endef
 
 ICU_POST_INSTALL_TARGET_HOOKS += ICU_PREFIX_FIXUP
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index cb06b63489..3c581a6b11 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -33,4 +33,4 @@ endef
 
 IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index f04eb57f3b..9182f767fc 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -26,4 +26,4 @@ endef
 
 IGH_ETHERCAT_POST_INSTALL_TARGET_HOOKS += IGH_ETHERCAT_INSTALL_MODULES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 5cbb147053..ede129a02b 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -120,4 +120,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 IMAGEMAGICK_POST_INSTALL_TARGET_HOOKS += IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index f32b86512b..c94d96d038 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -60,5 +60,5 @@ endef
 
 IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index 5cba77baa1..ea25e01bab 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -20,4 +20,4 @@ define INADYN_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/etc/init.d/S70inadyn
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index ad47909e05..52a1701403 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -5,4 +5,4 @@
 #############################################################
 INOTIFY_TOOLS_VERSION = 3.14
 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index a938ae715d..06830561e3 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -33,4 +33,4 @@ define INPUT_EVENT_DAEMON_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/input-event-daemon.conf
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 4236c7408c..c73a1933af 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -47,4 +47,4 @@ define INPUT_TOOLS_CLEAN_CMDS
 	rm -f $(addprefix $(@D)/,$(INPUT_TOOLS_TARGETS_y))
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 8ce66f71a0..19b523858a 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -12,6 +12,6 @@ HOST_INTLTOOL_DEPENDENCIES = host-libxml-parser-perl
 HOST_INTLTOOL_CONF_OPT = \
   PERLLIB=$(HOST_DIR)/usr/lib/perl
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk
index dbd16330f1..8d17af55b8 100644
--- a/package/iostat/iostat.mk
+++ b/package/iostat/iostat.mk
@@ -30,4 +30,4 @@ define IOSTAT_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/iostat.8
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 26cd3fb59e..fdf1d473a1 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -16,4 +16,4 @@ IPERF_CONF_OPT = \
 	--disable-dependency-tracking \
 	--disable-web100
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
index ecb97b6817..c63f03f544 100644
--- a/package/ipkg/ipkg.mk
+++ b/package/ipkg/ipkg.mk
@@ -9,4 +9,4 @@ IPKG_SOURCE = ipkg-$(IPKG_VERSION).tar.gz
 IPKG_SITE = http://www.handhelds.org/download/packages/ipkg
 IPKG_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index e766374933..27bc56f302 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -52,4 +52,4 @@ define IPROUTE2_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/sbin/, $(IPROUTE2_TARGET_SBINS))
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index f24e4a4abf..ba9241034c 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -66,4 +66,4 @@ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
 IPSEC_TOOLS_CONF_OPT+= --enable-security-context=kernel
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 37994f51b6..a9d05fd671 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -10,4 +10,4 @@ IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkg-config
 IPSET_CONF_OPT = --with-kmod=no
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 5c6a8a6b5d..a5ec6a7770 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -43,4 +43,4 @@ define IPTABLES_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/xtables
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index cbc68869b0..b2b84d5c21 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -43,4 +43,4 @@ define IRDA_UTILS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(IRDA_UTILS_SBINS-))
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index bddf6270d7..bf235205be 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -38,4 +38,4 @@ define IW_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/iw.8*
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index d4e94830fc..d7ef25a8ce 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -14,5 +14,5 @@ endef
 
 JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index d0b478a4cc..d79e7628a4 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -15,4 +15,4 @@ define JQUERY_SPARKLINE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/var/www/jquery.sparkline.js
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
index 5fee4c16f5..7d302707ea 100644
--- a/package/jquery-validation/jquery-validation.mk
+++ b/package/jquery-validation/jquery-validation.mk
@@ -15,4 +15,4 @@ define JQUERY_VALIDATION_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/var/www/jquery.validate.js
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index 08dd4a37fb..fb3a1b4080 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -15,4 +15,4 @@ define JQUERY_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/var/www/jquery.js
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index 9ed9215ae4..fb8c214e8a 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -21,5 +21,5 @@ define HOST_JSMIN_INSTALL_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/jsmin $(HOST_DIR)/usr/bin/jsmin
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
index 81a02b0457..ed4a6d0a70 100644
--- a/package/json-c/json-c.mk
+++ b/package/json-c/json-c.mk
@@ -8,4 +8,4 @@ JSON_C_VERSION = 0.9
 JSON_C_SITE = http://oss.metaparadigm.com/json-c/
 JSON_C_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index af30e8e59d..a52ad5ac7f 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -4,4 +4,4 @@ KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 
 KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index ef99dfb4bd..a8192f750e 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -20,4 +20,4 @@ endef
 
 KEXEC_POST_INSTALL_TARGET_HOOKS += KEXEC_REMOVE_LIB_TOOLS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 854c9dd22b..c8ae8e301e 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -64,4 +64,4 @@ define KISMET_UNINSTALL_TARGET_CMDS
 	$(KISMET_UNINSTALL_TARGET_CONFIGS)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index be640c7913..fb9706ce29 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -30,4 +30,4 @@ else
 KMOD_CONF_OPT += --disable-tools
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/latencytop/latencytop.mk b/package/latencytop/latencytop.mk
index 73d5ba2192..84e75db253 100644
--- a/package/latencytop/latencytop.mk
+++ b/package/latencytop/latencytop.mk
@@ -18,4 +18,4 @@ define LATENCYTOP_INSTALL_TARGET_CMDS
 	$(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) HAS_GTK_GUI=
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 745b386161..1275ddfb8d 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -11,4 +11,4 @@ LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
 
 LCDPROC_DEPENDENCIES = ncurses
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index 7e4d1792ea..ede8c582c1 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -8,5 +8,5 @@ LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
 LEAFPAD_DEPENDENCIES = libgtk2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/less/less.mk b/package/less/less.mk
index 5f74f5c048..b758e468ea 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -16,4 +16,4 @@ define LESS_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/less
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 05a4d5c231..7bcdfa2a27 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -20,5 +20,5 @@ define LIBAIO_INSTALL_TARGET_CMDS
   $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index 617b1ee8f6..74322b20e1 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -18,4 +18,4 @@ else
 LIBAO_CONF_OPT += --disable-alsa
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 087032d209..d25f7f899c 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -23,4 +23,4 @@ else
 LIBARCHIVE_CONF_OPT += --without-xml2
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index d1929230f7..d5172d2de0 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -14,4 +14,4 @@ LIBARGTABLE2_CONF_OPT= --disable-example \
 		--enable-lib \
 		--enable-util
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libart/libart.mk b/package/libart/libart.mk
index a37095da52..0505ff5a07 100644
--- a/package/libart/libart.mk
+++ b/package/libart/libart.mk
@@ -10,4 +10,4 @@ LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/
 LIBART_AUTORECONF = YES
 LIBART_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index e0b19f4ec2..6d50d0a59b 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -9,4 +9,4 @@ LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
 LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
 LIBATOMIC_OPS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index 4a5270270b..7a1650cf26 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -11,4 +11,4 @@ LIBCAP_NG_INSTALL_STAGING = YES
 LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
 LIBCAP_NG_CONF_OPT = --without-python
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 50c62ab135..b922e5a98c 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -37,5 +37,5 @@ define HOST_LIBCAP_INSTALL_CMDS
 		prefix=/usr lib=lib install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index 8ceb87a4d1..86b59a37d4 100644
--- a/package/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
@@ -11,4 +11,4 @@ LIBCDAUDIO_AUTORECONF = YES
 LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk
index 5a52fa613d..549d0f205c 100644
--- a/package/libcgi/libcgi.mk
+++ b/package/libcgi/libcgi.mk
@@ -10,4 +10,4 @@ LIBCGI_INSTALL_STAGING = YES
 # use cross CC/AR rather than host
 LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)"
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 0ea63b5012..98b8e5f51f 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -13,4 +13,4 @@ LIBCGICC_CONF_OPT = \
 	--disable-demos \
 	--disable-doc
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index f81f4195b7..3e7aa117f1 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -12,4 +12,4 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 LIBCONFIG_CONF_OPT += --disable-cxx
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index feababf825..2fa824150a 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -9,4 +9,4 @@ LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
 LIBCONFUSE_INSTALL_STAGING = YES
 LIBCONFUSE_CONF_OPT = --disable-rpath
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk
index b815c0fbb8..4ef1145948 100644
--- a/package/libcue/libcue.mk
+++ b/package/libcue/libcue.mk
@@ -10,4 +10,4 @@ LIBCUE_SOURCE = libcue-$(LIBCUE_VERSION).tar.bz2
 LIBCUE_DEPENDENCIES = flex
 LIBCUE_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libcuefile/libcuefile.mk b/package/libcuefile/libcuefile.mk
index 7e1c8430ed..ceb15095a2 100644
--- a/package/libcuefile/libcuefile.mk
+++ b/package/libcuefile/libcuefile.mk
@@ -20,4 +20,4 @@ endef
 LIBCUEFILE_POST_INSTALL_STAGING_HOOKS += LIBCUEFILE_INSTALL_STAGING_INCLUDES
 LIBCUEFILE_POST_INSTALL_TARGET_HOOKS += LIBCUEFILE_INSTALL_TARGET_INCLUDES
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 50a55b4de0..d6882fd45a 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -36,7 +36,7 @@ endef
 
 LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
 curl: libcurl
 curl-clean: libcurl-clean
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index c04537af97..1bdc1e27b1 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -11,4 +11,4 @@ LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
 LIBDAEMON_CONF_OPT = --disable-lynx
 LIBDAEMON_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk
index 495e59a4a4..800b4fffee 100644
--- a/package/libdmtx/libdmtx.mk
+++ b/package/libdmtx/libdmtx.mk
@@ -9,4 +9,4 @@ LIBDMTX_SOURCE = libdmtx-$(LIBDMTX_VERSION).tar.gz
 LIBDMTX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdmtx
 LIBDMTX_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index f351d6b3bf..e622dd4683 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -36,4 +36,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index e88a16308d..6bd65f9cbb 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -28,4 +28,4 @@ ifneq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI),y)
 LIBDRM_CONF_OPT += --disable-radeon
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index 1c389046a1..e2d42f3188 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -16,4 +16,4 @@ LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config
 # of cross compilation, we prefer using pkg-config.
 LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
index 3a9d5be2f4..6e17731a37 100644
--- a/package/libdvdread/libdvdread.mk
+++ b/package/libdvdread/libdvdread.mk
@@ -11,4 +11,4 @@ LIBDVDREAD_AUTORECONF = YES
 LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 24ca7cedee..6770276a28 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -17,4 +17,4 @@ else
 LIBEXOSIP2_CONF_OPT += --disable-openssl
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 13ad371a43..daee7fdff3 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -18,4 +18,4 @@ LIBELF_CONF_OPT = --disable-sanity-checks \
 		$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
 		$(if $(BR2_LARGEFILE),--enable-elf64)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index 3686d55879..7d556501b4 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -18,4 +18,4 @@ define LIBERATION_CLEAN_CMDS
 	rm -rf $(LIBERATION_TARGET_DIR)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index f9be7cc0d6..078a729a0d 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -10,4 +10,4 @@ LIBESMTP_INSTALL_STAGING = YES
 
 LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index 6656d15249..564db37493 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -8,4 +8,4 @@ LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
 LIBEV_SITE = http://dist.schmorp.de/libev/
 LIBEV_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 733e29d2ce..5ce511f912 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -18,4 +18,4 @@ ifneq ($(BR2_PACKAGE_PYTHON),y)
 LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index 1832a7ecac..7054b50ba8 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -11,4 +11,4 @@ LIBEXIF_INSTALL_STAGING = YES
 LIBEXIF_CONF_OPT = --disable-docs
 LIBEXIF_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk
index 22ac2f166b..1aa2c5a41c 100644
--- a/package/libfcgi/libfcgi.mk
+++ b/package/libfcgi/libfcgi.mk
@@ -9,4 +9,4 @@ LIBFCGI_SITE = http://www.fastcgi.com/dist
 LIBFCGI_INSTALL_STAGING = YES
 LIBFCGI_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 5874218083..81ac043f89 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -31,6 +31,6 @@ endef
 
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 16ef8fb326..3f0036a2cb 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -7,4 +7,4 @@ LIBFREEFARE_VERSION = 0.3.2
 LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
 LIBFREEFARE_DEPENDENCIES = libnfc openssl
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index b50791e45a..d0f5ef6aa9 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -20,5 +20,5 @@ else
 LIBFDTI_CONF_OPT += --disable-libftdipp
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index c95ea3e154..5f748b4d55 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -26,4 +26,4 @@ define LIBFUSE_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/lib/libfuse.so*
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index 3c42e6cd75..e8a8a6096e 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -17,4 +17,4 @@ endif
 
 LIBGAIL_DEPENDENCIES = host-pkg-config libgtk2 pango
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index 68c6c47404..db5781b18e 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -17,4 +17,4 @@ LIBGCRYPT_CONF_OPT = \
 
 LIBGCRYPT_DEPENDENCIES = libgpg-error
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
index a704754012..3bf420600d 100644
--- a/package/libgeotiff/libgeotiff.mk
+++ b/package/libgeotiff/libgeotiff.mk
@@ -9,4 +9,4 @@ LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
 LIBGEOTIFF_DEPENDENCIES = tiff
 LIBGEOTIFF_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 1bb9d143de..78a1fdbee3 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -16,4 +16,4 @@ endef
 
 LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index ce33b799f7..2b2bd32f5f 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -88,7 +88,7 @@ ifneq ($(BR2_PACKAGE_GDB),y)
 LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_GDB_FILES
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 1b78b17cee..96cbbd6aca 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -8,4 +8,4 @@ LIBGPG_ERROR_VERSION = 1.10
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 LIBGPG_ERROR_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 40934add5a..e80e137414 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -151,5 +151,5 @@ define HOST_LIBGTK2_INSTALL_CMDS
  cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 8ad9ac1fa7..bad014bca1 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -18,4 +18,4 @@ LIBHID_CONF_OPT = \
 	--without-doxygen \
 	--disable-package-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index ee251eb2e2..7c5c881f89 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -8,5 +8,5 @@ LIBICAL_VERSION = 0.48
 LIBICAL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)
 LIBICAL_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index 48a380f53d..ce1d7e23a9 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -20,7 +20,7 @@ endef
 LIBICONV_POST_INSTALL_TARGET_HOOKS += LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS
 LIBICONV_POST_INSTALL_STAGING_HOOKS += LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
 # Configurations where the toolchain supports locales and the libiconv
 # package is enabled are incorrect, because the toolchain already
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index def2dbc848..20579d608c 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -11,4 +11,4 @@ LIBID3TAG_INSTALL_STAGING=YES
 LIBID3TAG_DEPENDENCIES=zlib
 LIBID3TAG_LIBTOOL_PATCH=NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 6d2bea6ca7..c55f2c5dec 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -30,4 +30,4 @@ define LIBIDN_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/idn
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index 81e8421416..4cf1541ca2 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -10,5 +10,5 @@ LIBIQRF_INSTALL_STAGING = YES
 
 LIBIQRF_DEPENDENCIES = libusb
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 7c8cd8a66e..037983e32d 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -29,4 +29,4 @@ define LIBLOCKFILE_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 3c92d528d4..71e9c3483a 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -36,4 +36,4 @@ LIBMAD_CONF_OPT = \
 		--$(if $(BR2_PACKAGE_LIBMAD_ASO),enable,disable)-aso \
 		--$(if $(BR2_PACKAGE_LIBMAD_STRICT_ISO),enable,disable)-strict-iso
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
index 17954b9ef6..16e9e6a0bc 100644
--- a/package/libmbus/libmbus.mk
+++ b/package/libmbus/libmbus.mk
@@ -12,4 +12,4 @@ LIBMBUS_INSTALL_STAGING = YES
 #   cannot find input file: `test/Makefile.in'
 LIBMBUS_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index ff2b55d317..f8690eebf9 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -16,4 +16,4 @@ else
 LIBMICROHTTPD_CONF_OPT += --disable-https
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index 45d1844da2..10583033bc 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -11,4 +11,4 @@ LIBMMS_INSTALL_STAGING = YES
 
 LIBMMS_DEPENDENCIES = host-pkg-config libglib2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 52719cd037..75bb23887b 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -9,4 +9,4 @@ LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index d45bc927e4..a390655089 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -7,4 +7,4 @@ LIBMODBUS_VERSION = 3.0.3
 LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
 LIBMODBUS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmpd/libmpd.mk b/package/libmpd/libmpd.mk
index 9fd12f5a2b..a2b9d56849 100644
--- a/package/libmpd/libmpd.mk
+++ b/package/libmpd/libmpd.mk
@@ -9,4 +9,4 @@ LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/11.8.16
 LIBMPD_INSTALL_STAGING = YES
 LIBMPD_DEPENDENCIES = libglib2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
index 5290af15eb..dbb7114497 100644
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -27,4 +27,4 @@ endef
 LIBMPEG2_POST_INSTALL_TARGET_HOOKS += LIBMPEG2_REMOVE_BINS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index 3313e23eb7..c602903d92 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -10,4 +10,4 @@ LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_con
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
 LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkg-config libnfnetlink
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index b3e1149dcb..4792980d4e 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -10,4 +10,4 @@ LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_ctt
 LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
 LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkg-config libmnl
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index eef09b0eee..95cf61d244 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -21,4 +21,4 @@ else
 LIBNFC_CONF_OPT += --disable-example
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
index 67ea266e55..9af28d81d0 100644
--- a/package/libnfnetlink/libnfnetlink.mk
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -9,4 +9,4 @@ LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
 LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
 LIBNFNETLINK_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 82d9b76416..f757b1b250 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -26,4 +26,4 @@ ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
 LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 24b537070e..c2cc996851 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -14,4 +14,4 @@ LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
 # NSPR mixes up --build and --host
 LIBNSPR_CONF_OPT = --host=$(GNU_HOST_NAME)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index ea6a3296d2..2e28c753de 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -64,4 +64,4 @@ define LIBNSS_CLEAN_CMDS
 					BUILD_OPT=1
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
index 8646947914..6695fcbe81 100644
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -16,4 +16,4 @@ else
 LIBOAUTH_CONF_OPT += --disable-libcurl
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index c3d489746f..4020d62b9f 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -9,4 +9,4 @@ LIBOGG_INSTALL_STAGING = YES
 
 LIBOGG_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
index e0d892b1cb..e253fbd15b 100644
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -10,4 +10,4 @@ LIBOPING_INSTALL_STAGING = YES
 LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
 LIBOPING_CONF_OPT = --without-perl-bindings
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 2cde27ff19..713851b8e1 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -8,4 +8,4 @@ LIBOSIP2_VERSION = 3.6.0
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
 LIBOSIP2_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 324ec331d6..1d1fbc158a 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -18,4 +18,4 @@ LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
index 093821e403..8f655aedd5 100644
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -41,4 +41,4 @@ ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y)
 	LIBPLAYER_CONF_OPT += --enable-binding-python
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 5612b2b5b5..dd295c68bc 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -30,5 +30,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index 2430c9da3a..d0d1700855 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -13,4 +13,4 @@ LIBRAW_CONF_OPT += --disable-examples --disable-lcms \
 			--disable-openmp --disable-demosaic-pack-gpl2 \
 			--disable-demosaic-pack-gpl3
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index 2f77a48e87..fd255caeea 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -8,4 +8,4 @@ LIBRAW1394_VERSION = 2.0.7
 LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
 LIBRAW1394_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk
index 47bf586424..8818e16969 100644
--- a/package/libreplaygain/libreplaygain.mk
+++ b/package/libreplaygain/libreplaygain.mk
@@ -11,4 +11,4 @@ LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
 LIBREPLAYGAIN_AUTORECONF = YES
 LIBREPLAYGAIN_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 228a0dffa7..457a28a816 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -30,4 +30,4 @@ define LIBROXML_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index f5c223e809..e54c06c373 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -13,4 +13,4 @@ LIBRSVG_INSTALL_STAGING = YES
 LIBRSVG_CONF_OPT = --disable-tools
 LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 libgtk2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index 0d765ea5b0..864297b68f 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -9,4 +9,4 @@ LIBRSYNC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/l
 LIBRSYNC_INSTALL_STAGING = YES
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
index d03a5d9926..533d95fcbc 100644
--- a/package/libsamplerate/libsamplerate.mk
+++ b/package/libsamplerate/libsamplerate.mk
@@ -14,4 +14,4 @@ ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 LIBSAMPLERATE_DEPENDENCIES += libsndfile
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
index 905089bacf..aec03786a4 100644
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -10,4 +10,4 @@ LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy/
 LIBSEXY_DEPENDENCIES = libgtk2 libxml2
 LIBSEXY_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 8c20ba31d8..92d1d8b281 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -8,4 +8,4 @@ LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.bz2
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2
 LIBSIGC_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk
index 5480618877..e5fbb5e447 100644
--- a/package/libsndfile/libsndfile.mk
+++ b/package/libsndfile/libsndfile.mk
@@ -8,4 +8,4 @@ LIBSNDFILE_VERSION = 1.0.25
 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
 LIBSNDFILE_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 6572585061..fe1a41c6ec 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -27,4 +27,4 @@ else
 LIBSOUP_CONF_OPT += --disable-tls-check
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index f53f88f5df..9baa4b0199 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -37,4 +37,4 @@ define LIBSVGTINY_CLEAN_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index 39cf0304cf..996903d44e 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -26,4 +26,4 @@ LIBSYSFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/l
 LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz
 LIBSYSFS_INSTALL_STAGING=YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 89489b7876..5714e7040f 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -17,4 +17,4 @@ LIBTHEORA_CONF_OPT = \
 
 LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index e21e8f3e56..4b9657c0fc 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -10,7 +10,7 @@ LIBTOOL_INSTALL_STAGING = YES
 
 HOST_LIBTOOL_LIBTOOL_PATCH = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # variables used by other packages
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index 100e684653..0c29661c49 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -13,4 +13,4 @@ LIBTORRENT_CONF_OPT = --enable-aligned \
 LIBTORRENT_INSTALL_STAGING = YES
 LIBTORRENT_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
index e565bb9337..45089b576b 100644
--- a/package/libtpl/libtpl.mk
+++ b/package/libtpl/libtpl.mk
@@ -8,4 +8,4 @@ LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
 LIBTPL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tpl
 LIBTPL_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 3484ec479c..3b9583c8a7 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -21,4 +21,4 @@ endef
 
 LIBUNGIF_POST_INSTALL_TARGET_HOOKS += LIBUNGIF_BINS_CLEANUP
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index a6028e1ecb..18968d82cc 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -10,4 +10,4 @@ LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
 LIBUPNP_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 1272485971..bd69137683 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -9,4 +9,4 @@ LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 
 LIBURCU_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 9920d5a3a8..1659fd147b 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -17,5 +17,5 @@ endef
 
 LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 85ff5c08d8..5c485c603b 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -11,5 +11,5 @@ LIBUSB_LICENSE_FILES = COPYING
 LIBUSB_DEPENDENCIES = host-pkg-config
 LIBUSB_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index dbd8769fc3..a793285ad3 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -39,5 +39,5 @@ define LIBV4L_INSTALL_TARGET_CMDS
 			DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install; done
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index 90c021d9c6..ad5f59598b 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -48,4 +48,4 @@ else
 LIBVNCSERVER_CONF_OPT += --without-zlib
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 68444144a7..009143b4c5 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -13,4 +13,4 @@ LIBVORBIS_CONF_OPT = --disable-oggtest
 
 LIBVORBIS_DEPENDENCIES = host-pkg-config libogg
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index e5ec523be6..a6f8ae9de1 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -36,6 +36,6 @@ define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
 
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index d92e1850b1..44d15e79ba 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -34,7 +34,7 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # libxml2 for the host
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 622bc3d18a..6dd702c3aa 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -41,5 +41,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index 34580a248b..f52a68f58d 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -8,5 +8,5 @@ LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
 LIBYAML_SITE = http://pyyaml.org/download/libyaml/
 LIBYAML_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index c7fae32413..5ff4ce65b9 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -94,4 +94,4 @@ define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/lighttpd
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/links/links.mk b/package/links/links.mk
index 52a71f1df4..9dbf0adf60 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -33,4 +33,4 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 LINKS_DEPENDENCIES += zlib
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index c6d571d255..afd296630e 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -19,4 +19,4 @@ else
 LINPHONE_CONF_OPT += --disable-gtk_ui
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index ba33d37c3d..2a6bfc17a4 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -70,4 +70,4 @@ endef
 
 endif
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index a6d15e1ddf..feb1ab32eb 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -48,4 +48,4 @@ define LINUX_FUSION_UNINSTALL_TARGET_CMDS
 	rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index d331d9dfb8..cbdb02af2e 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -21,4 +21,4 @@ endef
 
 LITE_POST_INSTALL_TARGET_HOOKS += LITE_FINALIZE_INSTALL
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/live555/live555.mk b/package/live555/live555.mk
index c987fa27bb..b727d94593 100644
--- a/package/live555/live555.mk
+++ b/package/live555/live555.mk
@@ -74,4 +74,4 @@ define LIVE555_UNINSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index a351329952..b596d44ab5 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -44,4 +44,4 @@ define LM_SENSORS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index bb4abf9f68..bccb2de00e 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -27,4 +27,4 @@ define LMBENCH_CLEAN_CMDS
 	$(MAKE) -C $(@D)/src clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 4a7f25cf2e..333ddce41e 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -30,4 +30,4 @@ define LOCKFILE_PROGS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 20317f127f..ae622b0bb1 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -33,4 +33,4 @@ define LOGROTATE_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk
index 89f6bbd63f..17c3e9eeda 100644
--- a/package/logsurfer/logsurfer.mk
+++ b/package/logsurfer/logsurfer.mk
@@ -26,4 +26,4 @@ LOGSURFER_POST_INSTALL_TARGET_HOOKS += LOGSURFER_INSTALL_TARGET_MAN
 
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 314f46a4ad..475760540e 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -47,4 +47,4 @@ define LRZSZ_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index d0d97dbc5f..a53c1073ee 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -20,4 +20,4 @@ define LSHW_INSTALL_TARGET_CMDS
 		$(LSHW_MAKE_OPT) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 7bc22c01d9..fa55e6a617 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -66,4 +66,4 @@ define LSOF_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lsuio/lsuio.mk b/package/lsuio/lsuio.mk
index 3cdd84605b..4479bbc405 100644
--- a/package/lsuio/lsuio.mk
+++ b/package/lsuio/lsuio.mk
@@ -8,4 +8,4 @@ LSUIO_VERSION = 0.2.0
 LSUIO_SOURCE = lsuio-$(LSUIO_VERSION).tar.gz
 LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index f0a57aefa6..c0cb676b96 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -7,4 +7,4 @@ LTP_TESTSUITE_VERSION = 20101031
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
 LTP_TESTSUITE_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 8c0a145a96..0e684fbdad 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -9,4 +9,4 @@ LTRACE_DEPENDENCIES = libelf
 LTRACE_AUTORECONF   = YES
 LTRACE_CONF_OPT     += --disable-werror
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 44916bd89d..0f3200f34a 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -11,5 +11,5 @@ HOST_LTTNG_BABELTRACE_AUTORECONF = YES
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 4f0414c841..cd6c65d57a 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -12,4 +12,4 @@ LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux
 
 LTTNG_LIBUST_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index b31caa1af2..a245b190bc 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -17,4 +17,4 @@ define LTTNG_MODULES_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR) modules_install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index cd9a0be5bd..7a0a7b4969 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -22,4 +22,4 @@ else
 LTTNG_TOOLS_CONF_OPT += --disable-lttng-ust
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 825887bcb8..b61d6f1fa6 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -160,5 +160,5 @@ define HOST_LUA_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index 928e1545aa..17f2bd6f0a 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -28,4 +28,4 @@ define LUAFILESYSTEM_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
index daca2482bc..755b61a71c 100644
--- a/package/luasocket/luasocket.mk
+++ b/package/luasocket/luasocket.mk
@@ -33,4 +33,4 @@ define LUASOCKET_CLEAN_CMDS
 	$(MAKE) -C $(@D) -f makefile clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 40e015254d..52326eae64 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -51,4 +51,4 @@ define LVM2_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/lib/,libdevmapper.so*)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index b8df170151..c219dc8a70 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -9,7 +9,7 @@ LZMA_SITE:=http://tukaani.org/lzma/
 LZMA_INSTALL_STAGING = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 LZMA=$(HOST_DIR)/usr/bin/lzma
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 31eeebabcf..132140fcec 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -9,5 +9,5 @@ LZO_LICENSE = GPLv2+
 LZO_LICENSE_FILES = COPYING
 LZO_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 1e980303e9..4ab8a4a64c 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -10,4 +10,4 @@ LZOP_LICENSE = GPLv2+
 LZOP_LICENSE_FILES = COPYING
 LZOP_DEPENDENCIES = lzo
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index d2f3be5878..f0d5019875 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -17,5 +17,5 @@ endif
 
 HOST_M4_CONF_OPT = --disable-static
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/make/make.mk b/package/make/make.mk
index 288603233a..a0981c7181 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -13,4 +13,4 @@ MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
 		GLOBINC='-I$(@D)/glob' \
 		GLOBLIB=glob/libglob.a
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index f7817059d0..5e984c65ff 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -31,5 +31,5 @@ define HOST_MAKEDEVS_INSTALL_CMDS
 	install -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 0468d997ba..2e3cdfffda 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -15,4 +15,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 611323db20..5c518e5ca3 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -21,4 +21,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index 4246626590..255f3c1a92 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -20,4 +20,4 @@ MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 558a4f7a27..c6e9496e80 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -28,4 +28,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index b0be393d3c..6fd19873e2 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -55,4 +55,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index fe43cb9915..db9d1a8287 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -21,4 +21,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 2540e4b50f..6f37bf4dbb 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -12,4 +12,4 @@ MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 4b32073766..ece8866a58 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -39,4 +39,4 @@ endif
 
 #############################################################
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 39dbea0a27..460cae51e6 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -20,4 +20,4 @@ define MDADM_CONFIGURE_CMDS
 	# Do nothing
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 716a7334e8..9e67ed49d3 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -76,4 +76,4 @@ else
 MEDIASTREAMER_CONF_OPT += --disable-libv4l1 --disable-libv4l2
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk
index 7d3f5b2cec..4adacd131b 100644
--- a/package/memstat/memstat.mk
+++ b/package/memstat/memstat.mk
@@ -24,4 +24,4 @@ define MEMSTAT_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/memstat
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index 00e312475d..b9c5e1da87 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -26,4 +26,4 @@ define MEMTESTER_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 5f5fcfaa41..990ec9faec 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -25,4 +25,4 @@ endef
 
 METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index ff858851ad..fbf319c569 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -150,5 +150,5 @@ define MICROPERL_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/perl5
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index aa376a2805..87559bb05f 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -41,4 +41,4 @@ define MIDORI_INSTALL_TARGET_CMDS
        (cd $(@D); ./waf --destdir=$(TARGET_DIR) install)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 5adb270125..702e5a2d58 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -34,4 +34,4 @@ define MII_DIAG_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index ab65bb6c04..7293f6ae25 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -15,4 +15,4 @@ MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
 
 MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index 83f71d34aa..c74d5818b4 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -8,4 +8,4 @@ MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mob
 MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
 MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 3501bcc9a6..fe70775783 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -20,6 +20,6 @@ HOST_MODULE_INIT_TOOLS_AUTORECONF = YES
 HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
 HOST_MODULE_INIT_TOOLS_CONF_OPT = --disable-static-utils
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index 11bc7e16db..a8b64477a4 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -27,4 +27,4 @@ else
 MONIT_CONF_OPT += --without-largefiles
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index d42476698e..47bdbbb237 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -13,5 +13,5 @@ MPC_DEPENDENCIES = gmp mpfr
 MPC_AUTORECONF = YES
 HOST_MPC_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index da6bc93732..9caf3acd40 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -11,5 +11,5 @@ MPFR_INSTALL_STAGING = YES
 MPFR_DEPENDENCIES = gmp
 MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 7a3203aace..90f2f595af 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -24,4 +24,4 @@ define MROUTED_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index d5e6a31234..6b641f70d5 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -29,4 +29,4 @@ MSMTP_CONF_OPT += \
 	--without-libgsasl \
 	--without-gnome-keyring
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index ceb98c7340..9b60ac8718 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -85,5 +85,5 @@ define MTD_INSTALL_TARGET_CMDS
  done
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 744ec85dc2..90fba51eb0 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -58,4 +58,4 @@ define ALSA_UTILS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/,$(ALSA_UTILS_TARGETS_) $(ALSA_UTILS_TARGETS_y))
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index b6fbdd2cde..534f3cfcd5 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
@@ -18,4 +18,4 @@ AUMIX_CONF_OPT = \
 
 AUMIX_DEPENDENCIES = ncurses
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
index d013953264..8b7e79f143 100644
--- a/package/multimedia/bellagio/bellagio.mk
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -9,4 +9,4 @@ BELLAGIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/
 BELLAGIO_AUTORECONF = YES
 BELLAGIO_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk
index 567875a399..b0078f59bd 100644
--- a/package/multimedia/faad2/faad2.mk
+++ b/package/multimedia/faad2/faad2.mk
@@ -10,4 +10,4 @@ FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faa
 FAAD2_CONF_ENV = LIBS=-lm
 FAAD2_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 4cc29ee6db..840d079411 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -177,4 +177,4 @@ define FFMPEG_CONFIGURE_CMDS
 	)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk
index 79ecfd199e..e19a9fb238 100644
--- a/package/multimedia/flac/flac.mk
+++ b/package/multimedia/flac/flac.mk
@@ -20,4 +20,4 @@ else
 FLAC_CONF_OPT += --disable-ogg
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index 96829627dd..f921ec9891 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -15,4 +15,4 @@ endef
 
 GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkg-config
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index c95563238e..9413ff278b 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -15,4 +15,4 @@ ifeq ($(BR2_PACKAGE_BZIP2),y)
 GST_FFMPEG_DEPENDENCIES += bzip2
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/multimedia/gst-omapfb/gst-omapfb.mk
index f3956bc14a..f23bc868b1 100644
--- a/package/multimedia/gst-omapfb/gst-omapfb.mk
+++ b/package/multimedia/gst-omapfb/gst-omapfb.mk
@@ -16,4 +16,4 @@ endef
 
 GST_OMAPFB_DEPENDENCIES = gstreamer
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index a737befea9..ad8b509576 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -556,4 +556,4 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-vcd
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index e35a606ddb..b044516cc0 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -190,4 +190,4 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-zlib
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index ebd463b0e7..f64527dece 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -375,4 +375,4 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-speex
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index 37ed624541..e23d77448b 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -81,4 +81,4 @@ else
 GST_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index cc2993273b..1943d03f22 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -25,4 +25,4 @@ GSTREAMER_CONF_OPT = \
 
 GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index 7b4b0aea94..81a8f2adc6 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -30,4 +30,4 @@ endif
 
 LAME_POST_CONFIGURE_HOOKS += LAME_BIGENDIAN_ARCH
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index 9fad45f67d..56007ebbf4 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -16,4 +16,4 @@ MADPLAY_CONF_OPT+=--with-alsa
 MADPLAY_DEPENDENCIES+=alsa-lib
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 43d429bc5f..28bc4cbfd9 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -135,4 +135,4 @@ endef
 
 MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 793812f8fa..c3d2c9cce3 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -64,4 +64,4 @@ MPG123_DEPENDENCIES += libtool
 MPG123_CONF_OPT += --with-modules --with-module-suffix=.so
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 216bb4684c..f4fedf4c47 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -169,4 +169,4 @@ define MPLAYER_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/multimedia/musepack/musepack.mk b/package/multimedia/musepack/musepack.mk
index ac3660f6f4..ce2d17ea05 100644
--- a/package/multimedia/musepack/musepack.mk
+++ b/package/multimedia/musepack/musepack.mk
@@ -11,4 +11,4 @@ MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
 MUSEPACK_INSTALL_STAGING = YES
 MUSEPACK_MAKE = $(MAKE1)
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 6d05822156..13d87709e6 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -65,4 +65,4 @@ endef
 PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/tidsp-binaries/tidsp-binaries.mk b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
index 0b64fb8481..4019563d8f 100644
--- a/package/multimedia/tidsp-binaries/tidsp-binaries.mk
+++ b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
@@ -10,4 +10,4 @@ define TIDSP_BINARIES_UNINSTALL_TARGET_CMDS
 	$(RM) -r $(TARGET_DIR)/lib/dsp
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/multimedia/vorbis-tools/vorbis-tools.mk b/package/multimedia/vorbis-tools/vorbis-tools.mk
index fc79b3f70f..c23648c385 100644
--- a/package/multimedia/vorbis-tools/vorbis-tools.mk
+++ b/package/multimedia/vorbis-tools/vorbis-tools.mk
@@ -17,4 +17,4 @@ ifeq ($(BR2_PACKAGE_SPEEX),y)
 VORBIS_TOOLS_DEPENDENCIES += speex
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
index 8b0af0baa9..4b1c59e762 100644
--- a/package/multimedia/wavpack/wavpack.mk
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -13,4 +13,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 WAVPACK_DEPENDENCIES += libiconv
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 4c8e3991ee..afff72348d 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -10,4 +10,4 @@ MUTT_DEPENDENCIES = ncurses
 MUTT_CONF_OPT = --disable-iconv --disable-smtp
 MUTT_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index ca54a54f7e..af1cb2691f 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -12,4 +12,4 @@ MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
 MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) uninstall
 MXML_UNINSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) uninstall
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index ad330ae23a..c48d78f136 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -42,4 +42,4 @@ endef
 MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
 MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_ADD_MYSQL_LIB_PATH
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 439f58349b..164c7a6f51 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -22,4 +22,4 @@ define NANO_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/nano
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index 8421397dad..1e461002fe 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -24,4 +24,4 @@ define NANOCOM_UNINSTALL_TARGET_CMDS
 	$(RM) $(TARGET_DIR)/usr/bin/nanocom
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index 72eeb121ea..84663e565b 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -8,5 +8,5 @@ NASM_VERSION = 2.10.01
 NASM_SOURCE  = nasm-$(NASM_VERSION).tar.bz2
 NASM_SITE    = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 15997afd12..c2257f7177 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -29,4 +29,4 @@ endef
 
 NBD_POST_INSTALL_TARGET_HOOKS += NBD_CLEANUP_AFTER_INSTALL
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 3000e7a6c1..4056397cde 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -41,4 +41,4 @@ define NCFTP_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS) ncftpspooler)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 0bd2946d67..421d85522e 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -138,5 +138,5 @@ endef
 HOST_NCURSES_CONF_OPT = \
 	--without-shared --without-gpm
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index 7cf4b8aeb8..eb30e11aaa 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -39,4 +39,4 @@ endef
 
 NDISC6_POST_INSTALL_TARGET_HOOKS += NDISC6_REMOVE_UNNEEDED
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 6e365b3d26..52d5066006 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -52,4 +52,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 4f0ec09401..b7015e60f4 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -34,4 +34,4 @@ endef
 
 NETATALK_POST_INSTALL_TARGET_HOOKS += NETATALK_INSTALL_EXTRA_FILES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index bc58af287e..d2c69622e9 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -8,4 +8,4 @@ NETCAT_VERSION:=0.7.1
 NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz
 NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netcat
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index 6a8acedbfc..4af5e85a60 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -20,4 +20,4 @@ define NETPERF_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/netserver
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index db76021184..e42894f61e 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -25,4 +25,4 @@ define NETPLUG_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 5bc7d9f3c1..df5f003a43 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -90,4 +90,4 @@ endef
 
 NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk
index fbe1939e50..a67b786f49 100644
--- a/package/netstat-nat/netstat-nat.mk
+++ b/package/netstat-nat/netstat-nat.mk
@@ -7,4 +7,4 @@
 NETSTAT_NAT_VERSION = 1.4.10
 NETSTAT_NAT_SITE = http://tweegy.nl/download
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index cfcf32cc28..6c98d6416d 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -47,4 +47,4 @@ endef
 
 NETWORK_MANAGER_POST_INSTALL_TARGET_HOOKS += NETWORK_MANAGER_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index a7c42fbfe4..c8795fb04e 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -41,4 +41,4 @@ NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
 # nfsiostat is interpreted python, so remove it unless it's in the target
 NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index a55f7baf61..01217271c2 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -8,4 +8,4 @@ NGIRCD_VERSION = 17.1
 NGIRCD_SITE = ftp://ftp.berlios.de/pub/ngircd/
 NGIRCD_DEPENDENCIES = zlib
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index daf7c6fcf0..c296e34c3d 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -17,4 +17,4 @@ NGREP_CONF_OPT =  \
 
 NGREP_DEPENDENCIES = libpcap pcre
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/noip/noip.mk b/package/noip/noip.mk
index 0fe427a335..e90ff07be5 100644
--- a/package/noip/noip.mk
+++ b/package/noip/noip.mk
@@ -27,4 +27,4 @@ define NOIP_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 8f7d9a9a83..4cea4ec966 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -12,4 +12,4 @@ endef
 
 NSS_MDNS_POST_INSTALL_TARGET_HOOKS += NSS_MDNS_INSTALL_CONFIG
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 748fe1de03..f6db4ef355 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -30,4 +30,4 @@ ifneq ($(BR2_PACKAGE_NTFS_3G_NTFSPROGS),y)
 	NTFS_3G_CONF_OPT += --disable-ntfsprogs
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 8076ce7d15..504ede79ca 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -65,4 +65,4 @@ endef
 
 NTP_POST_PATCH_HOOKS += NTP_PATCH_FIXUPS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/nuttcp/nuttcp.mk b/package/nuttcp/nuttcp.mk
index 8c0203c9ad..df03dcaddc 100644
--- a/package/nuttcp/nuttcp.mk
+++ b/package/nuttcp/nuttcp.mk
@@ -22,4 +22,4 @@ define NUTTCP_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/nuttcp
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk
index e615225256..5d255977d8 100644
--- a/package/ocf-linux/ocf-linux.mk
+++ b/package/ocf-linux/ocf-linux.mk
@@ -18,4 +18,4 @@ define OCF_LINUX_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/include/crypto/cryptodev.h
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index c6ffb64cf6..6cd7cddd04 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -28,4 +28,4 @@ else
 	OFONO_CONF_OPT += --disable-bluetooth
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index 9ed4d5b46e..7a2b49e0b8 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -38,4 +38,4 @@ define OLSR_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index 59be66f581..85e24514d1 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -26,4 +26,4 @@ define OPEN2300_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 8ae2fd5808..1b06e5640a 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -183,4 +183,4 @@ endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DATA
 endif
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index 3358905d73..f63a9c6ec6 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -14,4 +14,4 @@ define OPENNTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man?/ntpd*
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 75b0263ecf..9c377c532d 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -39,5 +39,5 @@ HOST_OPENOCD_CONF_OPT = 	\
 	--enable-jlink 		\
 	--enable-vsllink
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 2b93def472..0878fce4b6 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -18,4 +18,4 @@ endef
 
 OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 9ef79e1aaa..f9816afafb 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -124,4 +124,4 @@ define OPENSSL_UNINSTALL_CMDS
 	rm -rf $(addprefix $(STAGING_DIR)/usr/lib/,ssl engines libcrypto* libssl* pkgconfig/libcrypto.pc)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index a25ca8f169..781dc00413 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -32,4 +32,4 @@ define OPENSWAN_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index bcb121d060..03eabcf022 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -34,4 +34,4 @@ define OPENVPN_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/openvpn
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index 9cfaa26c10..be67f8ebce 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -17,4 +17,4 @@ endef
 
 OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index fc2192843f..256ae9b135 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -45,4 +45,4 @@ define OPROFILE_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/oprofile
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index f3267a8efd..842ef2510b 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -22,5 +22,5 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index f47af8a1ad..65a03bf3f8 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -2,4 +2,4 @@ ORTP_VERSION = 0.20.0
 ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
 ORTP_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index f46bdc64c6..efb722dc93 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -59,4 +59,4 @@ endef
 
 PANGO_POST_INSTALL_TARGET_HOOKS += PANGO_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index c4107e7b49..2152ea6be8 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -10,4 +10,4 @@ PARTED_SITE = $(BR2_GNU_MIRROR)/parted
 PARTED_DEPENDENCIES = readline util-linux lvm2
 PARTED_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index 2062b9f727..b4206c5eb2 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -7,4 +7,4 @@
 PATCH_VERSION = 2.6
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index a43fb95423..cd318cbdf4 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -54,4 +54,4 @@ define PCIUTILS_INSTALL_STAGING_CMDS
 		SHARED=$(PCIUTILS_SHARED) install install-lib
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index f2112f0516..561de1f849 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -9,5 +9,5 @@ PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkg-config libgtk2 gamin startup-notification xserver_xorg-server
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index d01ca84d56..8fd6b2128b 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -31,4 +31,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 PCRE_POST_INSTALL_TARGET_HOOKS += PCRE_TARGET_REMOVE_PCRE_CONFIG
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/php/php.mk b/package/php/php.mk
index fee2c92112..31de2898b3 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -229,4 +229,4 @@ endef
 
 PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)"
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index fce50d9f22..4278ac097f 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -15,4 +15,4 @@ define PICOCOM_INSTALL_TARGET_CMDS
 	install -D -m 0755 $(@D)/picocom $(TARGET_DIR)/usr/bin/picocom
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 1d474506a8..8ce435d897 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -16,5 +16,5 @@ ifneq ($(BR2_iwmmxt),y)
 PIXMAN_CONF_OPT += --disable-arm-iwmmxt
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index a05bef1f22..7440ac4636 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -19,7 +19,7 @@ HOST_PKG_CONFIG_CONF_OPT = \
 HOST_PKG_CONFIG_AUTORECONF = YES
 HOST_PKG_CONFIG_DEPENDENCIES =
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index ddb5b258e8..779487f74e 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -55,4 +55,4 @@ define POCO_INSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index e12f08db6a..34fbe293b8 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -9,5 +9,5 @@ POLARSSL_CONF_OPT = \
 
 POLARSSL_INSTALL_STAGING = YES
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
 
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index f6af679abe..df49acb61c 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -15,5 +15,5 @@ POPT_CONF_ENV += am_cv_lib_iconv=yes
 POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk
index b0340f7cd6..34b0bd9e98 100644
--- a/package/portaudio/portaudio.mk
+++ b/package/portaudio/portaudio.mk
@@ -18,4 +18,4 @@ PORTAUDIO_CONF_OPT = \
 	$(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \
 	$(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk
index cb7c0e3a38..639a72e116 100644
--- a/package/portmap/portmap.mk
+++ b/package/portmap/portmap.mk
@@ -43,4 +43,4 @@ define PORTMAP_UNINSTALL_TARGET_CMDS
 		$(addsuffix .8,$(PORTMAP_SBINS)))
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index a62f495c10..259d1dc6d6 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -102,4 +102,4 @@ define PPPD_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index d4c5bc4ee6..1e2c460425 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -26,4 +26,4 @@ define PPTP_LINUX_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man8/pptp.8
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/procps/procps.mk b/package/procps/procps.mk
index 8228052a07..ced04a4715 100644
--- a/package/procps/procps.mk
+++ b/package/procps/procps.mk
@@ -20,4 +20,4 @@ define PROCPS_INSTALL_TARGET_CMDS
 		ldconfig=true install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 5352ea7170..1d02194b91 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -43,4 +43,4 @@ define PROFTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/proftpd.conf
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index 9010626db6..6e49dd3658 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -17,5 +17,5 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 PROTOBUF_DEPENDENCIES += zlib
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 0b0e0465cb..a70f0719a1 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -18,4 +18,4 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 PSMISC_DEPENDENCIES += busybox
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 5f15f5b54d..284b388286 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -8,4 +8,4 @@ PV_VERSION = 1.2.0
 PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://pipeviewer.googlecode.com/files
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk
index 7ac873c950..7312a78321 100644
--- a/package/python-dpkt/python-dpkt.mk
+++ b/package/python-dpkt/python-dpkt.mk
@@ -18,5 +18,5 @@ define PYTHON_DPKT_INSTALL_TARGET_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
index e1ed1b606e..82776c0aeb 100644
--- a/package/python-id3/python-id3.mk
+++ b/package/python-id3/python-id3.mk
@@ -18,4 +18,4 @@ define PYTHON_ID3_INSTALL_TARGET_CMDS
     (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk
index 7d898eddcc..6ce6cf82e7 100644
--- a/package/python-mad/python-mad.mk
+++ b/package/python-mad/python-mad.mk
@@ -38,4 +38,4 @@ define PYTHON_MAD_INSTALL_TARGET_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index b5185f0db1..906f83d427 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -22,4 +22,4 @@ define PYTHON_NETIFACES_INSTALL_TARGET_CMDS
 	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index f5603b6684..f3426a407f 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -108,4 +108,4 @@ define PYTHON_PYGAME_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame*
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index add96678bd..fb6b31c59a 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -18,4 +18,4 @@ define PYTHON_SERIAL_INSTALL_TARGET_CMDS
 	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 3d4b8d6f25..25fddb9fae 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -27,6 +27,6 @@ define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
 	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
 
diff --git a/package/python/python.mk b/package/python/python.mk
index 360fafa5b1..fae4e5c2be 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -167,5 +167,5 @@ PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES
 
 PYTHON_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e18b8738c0..feb0d6f3eb 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -635,4 +635,4 @@ define QT_UNINSTALL_TARGET_CMDS
 	-rm $(TARGET_DIR)/usr/lib/libphonon.so.*
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 349e0032c3..da022c33d7 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -33,4 +33,4 @@ else
 QUAGGA_CONF_OPT +=--disable-snmp
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 971523076b..44a5073294 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -20,4 +20,4 @@ QUOTA_INSTALL_TARGET_OPT = \
 	ROOTDIR=$(TARGET_DIR) \
 	install
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 3471f9d6ca..33267f0b16 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -15,4 +15,4 @@ endef
 
 RADVD_POST_INSTALL_TARGET_HOOKS += RADVD_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ramspeed/ramspeed.mk b/package/ramspeed/ramspeed.mk
index 478c2fbf00..d19571cab1 100644
--- a/package/ramspeed/ramspeed.mk
+++ b/package/ramspeed/ramspeed.mk
@@ -17,4 +17,4 @@ define RAMSPEED_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/ramspeed $(TARGET_DIR)/usr/bin/ramspeed
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index 732a08b047..aee8bc44f7 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -10,4 +10,4 @@ RDESKTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/
 RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
 RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/read-edid/read-edid.mk b/package/read-edid/read-edid.mk
index b568d5b8b9..371801eefa 100644
--- a/package/read-edid/read-edid.mk
+++ b/package/read-edid/read-edid.mk
@@ -16,4 +16,4 @@ define READ_EDID_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/parse-edid $(TARGET_DIR)/sbin/parse-edid
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index cd9946e6b6..12d3fbad7e 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -21,4 +21,4 @@ define READLINE_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index 4862fad17c..c196d859f6 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -26,4 +26,4 @@ define RINGS_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index 7642c82af0..b4b1bd507c 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -9,4 +9,4 @@ RNG_TOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge
 RNG_TOOLS_CONF_ENV = LIBS="-largp"
 RNG_TOOLS_DEPENDENCIES = argp-standalone
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index 30bc1a4674..cf12d643bf 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -33,4 +33,4 @@ define RP_PPPOE_UNINSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 4ce2ecb80d..1a417eb803 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -45,4 +45,4 @@ RPM_MAKE = $(MAKE1)
 
 RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 55bdd51046..112ddf9006 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -26,4 +26,4 @@ define RRDTOOL_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/librrd*
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rsh-redone/rsh-redone.mk b/package/rsh-redone/rsh-redone.mk
index 0c2b8389d8..55966f33ed 100644
--- a/package/rsh-redone/rsh-redone.mk
+++ b/package/rsh-redone/rsh-redone.mk
@@ -33,4 +33,4 @@ define RSH_REDONE_UNINSTALL_TARGET_CMDS
 		$(addprefix $(TARGET_DIR)/usr/sbin/,$(rsh-redone-sbin-y))
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 12a33c612d..f2df256004 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -10,4 +10,4 @@ RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
 RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 RSYNC_CONF_OPT = --with-included-popt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index b7576cd5c2..200175206a 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -24,4 +24,4 @@ endef
 
 RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF_SCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 222733f3d0..60f63b5bdd 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -21,5 +21,5 @@ define RT_TESTS_INSTALL_TARGET_CMDS
 		install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
index 2dc1468d91..be5abb1df4 100644
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -12,4 +12,4 @@ RTAI_CONF_OPT = \
 
 RTAI_MAKE = $(MAKE1)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
index f60bd40722..c44cd572a3 100644
--- a/package/rtorrent/rtorrent.mk
+++ b/package/rtorrent/rtorrent.mk
@@ -9,4 +9,4 @@ RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
 RTORRENT_DEPENDENCIES = host-pkg-config libcurl libsigc libtorrent ncurses
 RTORRENT_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index d64753164f..a5b8cde31a 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -31,5 +31,5 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 	RUBY_DEPENDENCIES += zlib
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index c9684359a1..6b9a08260a 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -174,4 +174,4 @@ endef
 
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_INITSCRIPTS_CONFIG
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 621cff577c..56ce82d866 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -37,4 +37,4 @@ else
 SANE_BACKENDS_CONF_OPT += --without-snmp
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index 03bec895eb..0faae9c110 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -9,4 +9,4 @@ SAWMAN_SITE = http://www.directfb.org/downloads/Extras
 SAWMAN_INSTALL_STAGING = YES
 SAWMAN_DEPENDENCIES = directfb
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index d117bde80c..8786322eb7 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -20,4 +20,4 @@ endef
 
 SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 5460f51e6b..139312f176 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -74,4 +74,4 @@ define SDL_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index 343c7a1e92..e3ff6306eb 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -14,4 +14,4 @@ SDL_GFX_CONF_OPT = \
 	--enable-static \
 	$(if $(BR2_X86_CPU_HAS_MMX),--enable-mmx,--disable-mmx)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index b93dc08d95..8ec6a334b2 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -33,4 +33,4 @@ SDL_IMAGE_DEPENDENCIES:=sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index eee3e14292..411b65d0d5 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -41,4 +41,4 @@ define SDL_MIXER_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index 4992b8c504..bd511c6c0b 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -15,4 +15,4 @@ SDL_NET_INSTALL_STAGING = YES
 
 SDL_NET_DEPENDENCIES = sdl
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 620b3b4692..2f163a272d 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -53,4 +53,4 @@ define SDL_SOUND_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/lib/libSDL_sound*so*
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index efba5fa047..b9747d8b02 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -14,4 +14,4 @@ SDL_TTF_CONF_OPT = --without-x \
 		--with-sdl-prefix=$(STAGING_DIR)/usr
 
 SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index 9d2b00b319..b251b3c8ab 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -2,4 +2,4 @@ SDPARM_VERSION = 1.07
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
 SDPARM_SITE = http://sg.danny.cz/sg/p/
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 79467ef62a..451ba54de2 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -23,4 +23,4 @@ endef
 
 SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 1fd589c380..26cd5fc113 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -8,4 +8,4 @@ SER2NET_VERSION = 2.7
 SER2NET_SOURCE = ser2net-$(SER2NET_VERSION).tar.gz
 SER2NET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ser2net
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index 80dbb12cec..fed52b254e 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -19,4 +19,4 @@ endef
 
 SETSERIAL_POST_PATCH_HOOKS += SETSERIAL_APPLY_DEBIAN_PATCHES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 15c6db4581..f941dd98f9 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -25,7 +25,7 @@ define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # shared-mime-info for the host
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 2f5787cc22..a2382ce804 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -51,4 +51,4 @@ define SLANG_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index 3a6fce7626..a6873f020f 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -7,4 +7,4 @@
 SMARTMONTOOLS_VERSION = 5.42
 SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index bd435cf086..9a5234ddda 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -25,4 +25,4 @@ endef
 
 SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index 97ab876dbe..a1e672fd68 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -8,4 +8,4 @@ SOCKETCAND_SITE = git://github.com/dschanoeh/socketcand.git
 SOCKETCAND_AUTORECONF = YES
 SOCKETCAND_DEPENDENCIES = libconfig
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
index 3a1a162ee9..b7cf4c281a 100644
--- a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
+++ b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
@@ -10,4 +10,4 @@ SOUND_THEME_FREEDESKTOP_SOURCE = \
 	sound-theme-freedesktop-$(SOUND_THEME_FREEDESKTOP_VERSION).tar.bz2
 SOUND_THEME_FREEDESKTOP_DEPENDENCIES = host-intltool
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index 2502b11f2a..9014d210b0 100644
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -12,4 +12,4 @@ ifneq ($(BR2_INET_IPV6),y)
 SPAWN_FCGI_CONF_OPT = --disable-ipv6
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index 2d8a255d24..917de34064 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -30,4 +30,4 @@ define SPEEX_BUILD_CMDS
 	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 3e69a962bd..ab78f45a7f 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -53,4 +53,4 @@ define SQLCIPHER_UNINSTALL_STAGING_CMDS
 	rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 62ea661de0..5b85ecc5fd 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -45,4 +45,4 @@ define SQLITE_UNINSTALL_STAGING_CMDS
 	rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 8c0b33ba3e..0ec61ee3e0 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -72,5 +72,5 @@ define HOST_SQUASHFS_INSTALL_CMDS
    -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 91e230161f..6f28e6ee81 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -24,6 +24,6 @@ define HOST_SQUASHFS3_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
 
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 9db2197278..52bfde009c 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -32,4 +32,4 @@ endef
 
 SQUID_POST_INSTALL_TARGET_HOOKS += SQUID_CLEANUP_TARGET
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sredird/sredird.mk b/package/sredird/sredird.mk
index 44fe16d3bd..4e2c48111a 100644
--- a/package/sredird/sredird.mk
+++ b/package/sredird/sredird.mk
@@ -24,4 +24,4 @@ define SREDIRD_CLEAN_CMDS
 	rm -f $(@D)/sredird
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index e60cdeb236..80d3a45f7b 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -12,4 +12,4 @@ SSHFS_DEPENDENCIES = \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
index c83a1623a7..e078b2cd71 100644
--- a/package/sstrip/sstrip.mk
+++ b/package/sstrip/sstrip.mk
@@ -41,5 +41,5 @@ define HOST_SSTRIP_UNINSTALL_CMDS
 	rm -f $(HOST_DIR)/usr/bin/$(HOST_SSTRIP_BINARY)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index 60778ca80c..54bfc2f173 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -13,5 +13,5 @@ STARTUP_NOTIFICATION_CONF_OPT = --with-x \
 	--x-includes="$(STAGING_DIR)/usr/include/X11" \
 	--x-libraries="$(STAGING_DIR)/usr/lib"
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
index 8c396931e6..159812da6d 100644
--- a/package/statserial/statserial.mk
+++ b/package/statserial/statserial.mk
@@ -16,4 +16,4 @@ define STATSERIAL_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/statserial $(TARGET_DIR)/usr/bin/statserial
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 8cda09ba56..3393e668e3 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -18,4 +18,4 @@ endef
 
 STRACE_POST_INSTALL_TARGET_HOOKS += STRACE_REMOVE_STRACE_GRAPH
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index 8b4f40bd39..3a047b5691 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -10,4 +10,4 @@ STRESS_VERSION = 1.0.4
 STRESS_SITE    = http://weather.ou.edu/~apw/projects/stress
 STRESS_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 6088e589e0..7c280cc4b4 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -21,4 +21,4 @@ endef
 
 STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF_SCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index f1efc54763..9b0ebed571 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -14,4 +14,4 @@ SUDO_CONF_OPT = \
 		--without-interfaces \
 		--without-pam
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 3ed0ff1d81..451c4de9ab 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -21,4 +21,4 @@ else
 SYLPHEED_CONF_OPT += --disable-ssl
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index 890b82ad12..b1afff7dad 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -15,4 +15,4 @@ SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 SYNERGY_DEPENDENCIES = xlib_libXtst \
 		$(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index a5dedf2c2e..a68adf228b 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -52,4 +52,4 @@ define SYSKLOGD_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 55991c4399..9d91a423fd 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -22,4 +22,4 @@ endif
 # among other things. So we don't install it.
 SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 696a3a721d..e85355ffba 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -69,4 +69,4 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 	SYSTEMD_INSTALL_INIT_HOOK \
 	SYSTEMD_INSTALL_TTY_HOOK \
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 0d65c43a4c..10feb96dea 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -46,4 +46,4 @@ define SYSVINIT_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index da2db0cf2e..268318e4ae 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -25,4 +25,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
 endif
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index e36c1cb0ff..c1e625fa40 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -13,7 +13,7 @@ TAR_DEPENDENCIES += busybox
 HOST_TAR_DEPENDENCIES =
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
 # host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem
 # of needing tar to build tar.
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 11aff17614..a48f69d3de 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -31,5 +31,5 @@ endef
 
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 0febf60784..c232dc9de2 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -20,4 +20,4 @@ endef
 
 TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 4a72266046..3c23c6a76d 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -15,5 +15,5 @@ TCPREPLAY_DEPENDENCIES = libpcap
 TCPREPLAY_LIBS = -lpcap $(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
 TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close='$(TCPREPLAY_LIBS)'
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 80f293596c..537dfb12e2 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -18,4 +18,4 @@ define TFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index 98d45ca028..dc7c285113 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -48,4 +48,4 @@ define THTTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/syslogtocern
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index 71a610d588..ac54370f64 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -28,4 +28,4 @@ define TI_UTILS_UNINSTALL_TARGET_CMDS
 	rm -fr $(TARGET_DIR)/usr/share/ti-utils
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 3ab0d4f8fb..227047bbac 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -81,4 +81,4 @@ define TIFF_INSTALL_TARGET_CMDS
 	done
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 9b06589d3c..238330ec27 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -23,4 +23,4 @@ define TINYHTTPD_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 7a4c0f2be3..9b5e60e6b4 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -29,4 +29,4 @@ define TN5250_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/tn5250
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index df97c5ed76..1e3bd2807e 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -13,5 +13,5 @@ TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries=
 
 TORSMO_DEPENDENCIES = xserver_xorg-server
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 9ffd432c25..3f0694b8e6 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -56,4 +56,4 @@ else
 	TRANSMISSION_CONF_OPT += --disable-gtk
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index b836010989..fceee1bdc8 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -12,4 +12,4 @@ TREMOR_AUTORECONF = YES
 TREMOR_INSTALL_STAGING = YES
 TREMOR_DEPENDENCIES = libogg
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 885bd884c8..8f30c25aa5 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -9,4 +9,4 @@ TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 4adae0fe05..53764f76f0 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -51,5 +51,5 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 726aed6eed..b9fc02f1a1 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -45,4 +45,4 @@ endef
 
 UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index 212609fe92..734609c12a 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -26,4 +26,4 @@ ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y)
 UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_RECEIVER
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index b7b942c658..0cbcc0b664 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -23,4 +23,4 @@ define UEMACS_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/em
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index ce6d582f5d..3b33824373 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -17,4 +17,4 @@ define UNIONFS_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) install
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 7b982d818e..5f20f30d85 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -25,5 +25,5 @@ define USB_MODESWITCH_CLEAN_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index a6b2d43db0..3596c9be2a 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -31,4 +31,4 @@ define USBMOUNT_UNINSTALL_TARGET_CMDS
 		$(TARGET_DIR)/media/usb?
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index a242f93d07..53a29c5399 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -53,4 +53,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_DEVFILES
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 5421d8acde..2d8bca57ce 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -33,4 +33,4 @@ define USHARE_INSTALL_TARGET_CMDS
 endef
 
 # Even though configure is called it's not autoconf
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 6a7eda16f0..ddc9c1254e 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -81,7 +81,7 @@ HOST_UTIL_LINUX_CONF_OPT += \
 	--disable-fallocate --disable-unshare --disable-rename \
 	--disable-schedutils --disable-wall --disable-partx
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index d9d82b7515..7c0ea9ffe8 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -13,5 +13,5 @@ VALA_DEPENDENCIES = host-flex libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 HOST_VALA_DEPENDENCIES = host-flex host-libglib2
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 22e5c96095..05f402f036 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -120,4 +120,4 @@ endef
 VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_NULGRIND
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index ef8d9259bd..7fed822f11 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -38,4 +38,4 @@ ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 3c9aa65553..ca711bbfe3 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -50,4 +50,4 @@ define VSFTPD_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 07334adafc..f2cef6cea4 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -16,4 +16,4 @@ VTUN_CONF_OPT = \
 		--with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \
 		--with-lzo-lib=$(STAGING_DIR)/usr/lib
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index b71103ac4b..580c5d254f 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -21,4 +21,4 @@ endif
 
 WEBKIT_CONF_OPT += --disable-video
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk
index 22ade1a774..4fbf8f6601 100644
--- a/package/webrtc-audio-processing/webrtc-audio-processing.mk
+++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk
@@ -7,4 +7,4 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 WEBRTC_AUDIO_PROCESSING_CONF_OPT += --with-ns-mode=fixed
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index b14cd92bb3..a15111c505 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -30,4 +30,4 @@ ifneq ($(BR2_PACKAGE_OPENSSL),y)
 endif
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/whetstone/whetstone.mk b/package/whetstone/whetstone.mk
index 048f4de6fc..4a234858df 100644
--- a/package/whetstone/whetstone.mk
+++ b/package/whetstone/whetstone.mk
@@ -28,4 +28,4 @@ define WHETSTONE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/bin/whetstone
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/which/which.mk b/package/which/which.mk
index a7bb577b2d..e7ebc7fbb9 100644
--- a/package/which/which.mk
+++ b/package/which/which.mk
@@ -7,4 +7,4 @@
 WHICH_VERSION = 2.20
 WHICH_SITE = http://carlo17.home.xs4all.nl/which
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index ec1b692a9a..289102f256 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -19,4 +19,4 @@ define WIPE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/man/man1/wipe.1
 endef
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
index b05983983c..d81aa7cf8c 100644
--- a/package/wireless_tools/wireless_tools.mk
+++ b/package/wireless_tools/wireless_tools.mk
@@ -42,4 +42,4 @@ define WIRELESS_TOOLS_UNINSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" uninstall
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 5ca6de500b..9d957ea724 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -145,4 +145,4 @@ define WPA_SUPPLICANT_INSTALL_TARGET_CMDS
 	$(WPA_SUPPLICANT_INSTALL_DBUS)
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
index cce7780dda..f5423f314f 100644
--- a/package/wsapi/wsapi.mk
+++ b/package/wsapi/wsapi.mk
@@ -18,4 +18,4 @@ define WSAPI_UNINSTALL_TARGET_CMDS
 	rm -rf "$(TARGET_DIR)/usr/share/lua/wsapi"
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index bbb1899186..9824fc45a1 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -19,6 +19,6 @@ LIBXCB_CONF_OPT = --disable-build-docs
 
 HOST_LIBXCB_CONF_OPT = --disable-build-docs
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk
index 030dd74b29..b7191a7730 100644
--- a/package/x11r7/mcookie/mcookie.mk
+++ b/package/x11r7/mcookie/mcookie.mk
@@ -19,4 +19,4 @@ define MCOOKIE_INSTALL_TARGET_CMDS
 	install -m 0755 -D $(@D)/mcookie $(TARGET_DIR)/usr/bin/mcookie
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 1e9ec77c30..c52baa3ebc 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -28,4 +28,4 @@ MESA3D_DEPENDENCIES = \
 	libdrm \
 	expat
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index 730b8f6156..e7032de842 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -9,6 +9,6 @@ PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
 
 PTHREAD_STUBS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index a91a4163ac..77b25463ee 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -9,4 +9,4 @@ XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2
 XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 1e9f73f518..301b1d31fb 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -9,5 +9,5 @@ XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index d806231536..835f7f3dab 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -9,4 +9,4 @@ XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2
 XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 5fdc260030..92428ac353 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -9,4 +9,4 @@ XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2
 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index 794985f465..e5371fa8be 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -9,4 +9,4 @@ XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2
 XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index b71819acfb..b41f20193f 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -9,4 +9,4 @@ XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2
 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index f18424e9a0..b92f9282ba 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -9,4 +9,4 @@ XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2
 XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index 190bab876e..8c37b99c38 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -9,4 +9,4 @@ XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2
 XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 93d55dc696..9ea0e8a267 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -9,4 +9,4 @@ XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 1dd4604144..80f4a8eff0 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -9,4 +9,4 @@ XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2
 XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICO_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index 49224bb221..c701f43c2b 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -9,4 +9,4 @@ XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2
 XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index bab80450c5..2ebada863f 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -9,4 +9,4 @@ XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
 XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index e48b188bd5..674d5837fb 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -9,5 +9,5 @@ XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 2640803b21..6bb00ad92c 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -9,5 +9,5 @@ XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 1300e6388f..9f09c7f2fe 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -9,4 +9,4 @@ XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2
 XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 0b0d541b58..c9a8ad7d84 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -9,4 +9,4 @@ XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
 XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RGB_DEPENDENCIES = xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index cd7189058c..cce5c03584 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -9,4 +9,4 @@ XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2
 XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RSTART_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index 3e844b45e5..a50509893e 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -9,4 +9,4 @@ XAPP_SCRIPTS_SOURCE = scripts-$(XAPP_SCRIPTS_VERSION).tar.bz2
 XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index a1f3f4b75c..07acae9eed 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -9,4 +9,4 @@ XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
 XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index f503a473b8..cab56a014f 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -9,4 +9,4 @@ XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
 XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index 4c8b6898dd..54d4466194 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -9,4 +9,4 @@ XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2
 XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 3082cb11e6..3089811f22 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -9,4 +9,4 @@ XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
 XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index 18de28f206..c8f15d33aa 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -9,4 +9,4 @@ XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
 XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 69d8598d3a..622dcd9f46 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -9,4 +9,4 @@ XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2
 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index 61127690b9..2a3254589b 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -9,4 +9,4 @@ XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index 93977f9579..0444c93307 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -9,4 +9,4 @@ XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 8be5d37270..4881184b1c 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -9,4 +9,4 @@ XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2
 XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index 78adad985f..f954a8df54 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -9,4 +9,4 @@ XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2
 XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index beb1313c6e..ec2e5ada37 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -10,4 +10,4 @@ XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 28a93b9837..a7bc4abd18 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -9,4 +9,4 @@ XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2
 XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 271b1b07f8..9fdc792488 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -9,4 +9,4 @@ XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2
 XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index deab354f80..bf6ab4fb7a 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -9,4 +9,4 @@ XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
 XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 721454bb3f..c473b7ec25 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -9,5 +9,5 @@ XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 8559a16e73..bab2151adb 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -9,4 +9,4 @@ XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
 XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 3b1152d80a..00d6038c40 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -9,4 +9,4 @@ XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2
 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 7268d5d381..16b6aa9669 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -19,4 +19,4 @@ endef
 
 XAPP_XDM_POST_INSTALL_TARGET_HOOKS += XAPP_XDM_INSTALL_STARTUP_SCRIPT
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 9cd6c9730f..2ec08ba9fc 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -9,4 +9,4 @@ XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index 3e7284b710..c1864e37ef 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -9,4 +9,4 @@ XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index fd4158ebfd..577bd5a54d 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -9,4 +9,4 @@ XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
 XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 4fa50fee9f..13b9507f10 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -9,4 +9,4 @@ XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEV_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 8019aa9ebc..94bd390f88 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -9,4 +9,4 @@ XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2
 XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index 726d5edbd7..c44573d660 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -15,4 +15,4 @@ XAPP_XF86DGA_DEPENDENCIES = \
 	xlib_libXaw \
 	xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 5717875866..50f15b19b8 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -9,4 +9,4 @@ XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index 9556fca3e0..8719bef53d 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -9,4 +9,4 @@ XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2
 XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index 611b642677..b49b8ba6ab 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -9,4 +9,4 @@ XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
 XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index bef0aedf0b..94e7bed8a1 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -9,4 +9,4 @@ XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2
 XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 0993482225..8d0ec24da1 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -9,4 +9,4 @@ XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
 XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index e39d268893..8d02a5379c 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -9,4 +9,4 @@ XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2
 XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGC_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 7859f2303c..24517df1f8 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -9,4 +9,4 @@ XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index dc1decf04c..fc9218d0c3 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -9,4 +9,4 @@ XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 4bc5879aa0..022deec865 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -9,4 +9,4 @@ XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
index f84d1c2193..659d62a318 100644
--- a/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
+++ b/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
@@ -9,4 +9,4 @@ XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSI
 XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator
 XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 98d13d918f..846ba71cce 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -9,5 +9,5 @@ XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index e8f7a36fc9..a451e49866 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -9,4 +9,4 @@ XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
 XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index 98c7560c92..6c1e272775 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -9,4 +9,4 @@ XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2
 XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 1ccbdb9cd6..d749d18210 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -9,4 +9,4 @@ XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2
 XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index 16c3760260..c99e050ede 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -9,4 +9,4 @@ XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2
 XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index f84c1588e1..ace06c6d86 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -9,4 +9,4 @@ XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index f79eafad1b..effa06026c 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -10,4 +10,4 @@ XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
 			  xlib_libXft host-pkg-config
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index 887f815771..96c7937490 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -9,4 +9,4 @@ XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index 5a8563a1ce..92c7d53b5f 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -9,4 +9,4 @@ XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 6f997d8d19..708a19bd61 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -9,4 +9,4 @@ XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2
 XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index caf7bf6693..235787a432 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -9,4 +9,4 @@ XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2
 XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index c14a5ba23c..0fa2582ac7 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -12,4 +12,4 @@ XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
 		ac_cv_file__etc_man_config=no \
 		ac_cv_file__etc_manpath_config=no
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 3f47b26d2e..3a11bb40e0 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -9,4 +9,4 @@ XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2
 XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 280b7e74c6..463c31d567 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -9,4 +9,4 @@ XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMH_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index 1a6c44a34e..72bfa5d7a5 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -9,4 +9,4 @@ XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index bd371eae91..c77c3dd2a3 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -9,4 +9,4 @@ XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
index 08a1b4a8f9..4d2c697463 100644
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -9,4 +9,4 @@ XAPP_XPLSPRINTERS_SOURCE = xplsprinters-$(XAPP_XPLSPRINTERS_VERSION).tar.bz2
 XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 4ac3da436e..e2c944fd88 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -9,4 +9,4 @@ XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
 XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
index 1bb7365cb8..5ae32d2a21 100644
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -9,4 +9,4 @@ XAPP_XPREHASHPRINTERLIST_SOURCE = xprehashprinterlist-$(XAPP_XPREHASHPRINTERLIST
 XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 1615ac2371..c382b8eacf 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -9,4 +9,4 @@ XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 74bf97bb04..5c6c756772 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -10,4 +10,4 @@ XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
 XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 3a0cfdc784..675b2877be 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -9,4 +9,4 @@ XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index ac7ed7c506..c6a92acee7 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -9,4 +9,4 @@ XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2
 XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 32d6722a4f..5eeb9376f5 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -9,4 +9,4 @@ XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 158318d329..d795e791d4 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -9,4 +9,4 @@ XAPP_XSETMODE_SOURCE = xsetmode-$(XAPP_XSETMODE_VERSION).tar.bz2
 XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 1a02542e83..7ef189e535 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -9,4 +9,4 @@ XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
 XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 937f3e5ae3..94fbdafdc3 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -9,4 +9,4 @@ XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index c7e261fb88..aff0cc8d99 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -9,4 +9,4 @@ XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2
 XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSM_DEPENDENCIES = xlib_libXaw
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index e33a51e078..5f32ea4de9 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -9,4 +9,4 @@ XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2
 XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 0fd91db829..8ac49f7b10 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -9,4 +9,4 @@ XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2
 XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index fe1062844a..ff4083ebfa 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -9,4 +9,4 @@ XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2
 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 95d60988ed..c42797f130 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -9,4 +9,4 @@ XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index 541efde89d..30837297a2 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -9,4 +9,4 @@ XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index 69bb22814f..d13024c61c 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -9,4 +9,4 @@ XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWUD_DEPENDENCIES = xlib_libX11
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 10fb1c9e27..18ca6f6bef 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -11,6 +11,6 @@ XCB_PROTO_INSTALL_STAGING = YES
 
 XCB_PROTO_DEPENDENCIES = host-python
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index c43e4cbba2..5681b725e1 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -9,5 +9,5 @@ XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
 XCB_UTIL_INSTALL_STAGING = YES
 XCB_UTIL_DEPENDENCIES = host-gperf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index 52b21eacee..b35087c205 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -9,4 +9,4 @@ XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
 XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XBITMAPS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 08a88553e5..605d6fa12e 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -9,4 +9,4 @@ XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
 XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
index e55f979eb2..dd020a8d64 100644
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD
 XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index c3299ac59c..bc274a77e4 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK
 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index d1964b2cf1..c6f10a884b 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VE
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index afbf2866d8..c50e80a0b3 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JO
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index e0b57deb97..e732f86c4f 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KE
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 55c6370122..2bd37d3af6 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VE
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 6f9d66d4e0..9b7c26e6d4 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
index eaf8f2a2fc..e79796a952 100644
--- a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
@@ -14,4 +14,4 @@ XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \
 	xproto_xproto \
 	tslib
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 386c4d170b..c0ee55d50f 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMO
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index 1beed2e729..bffd978af4 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSI
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index ab6e8fbc46..0d306352ab 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION)
 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 6cb689e524..e833214d56 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION)
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index f71b7071d6..545c152d03 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -8,4 +8,4 @@ XDRIVER_XF86_VIDEO_AST_VERSION = 0.89.9
 XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index a357cf21c5..253a9c67cf 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index 5e9d9ab16d..fd2d99b350 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VE
 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 774688d3ee..8071460ad1 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 91182fe0d6..f38affd919 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VE
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 7634d92904..73aa99cf01 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VE
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index faee8ca10f..eb1f8a3c4c 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VE
 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index cd611b6e3e..9d7460b3d8 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VE
 XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 2ff7669529..e96375132d 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 4188dc5e42..5bce33fec9 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSI
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
index 47ba28d9ec..06d808357f 100644
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSI
 XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index a24a24170a..acffd668c3 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -11,4 +11,4 @@ XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = --enable-dri
 XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 063608545a..ad83661763 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 64bae465ad..3adf5272d7 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 27e028bf2d..0bf3fca550 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NE
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index 113874415b..4924a91758 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWP
 XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index 4886fe8fa6..da920f7e11 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).ta
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index c16655932d..9abc02e28c 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -24,4 +24,4 @@ XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
 
 XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index 8430d73a30..8eeef5039f 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index 51efbd47b6..6d490c2047 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_
 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
index 6c619c9827..b2cf5cf495 100644
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).ta
 XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
index 68b0acc690..a3fd480da5 100644
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VI
 XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 32ef7f58bf..89eb55b349 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 9f5d7fd0d6..1d3fafcb46 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF8
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 69a5d52ead..390c61390c 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index e9e529da9e..a43ba60fb5 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB
 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
index f7c4f647b2..3808828efb 100644
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SUNCG14_SOURCE = xf86-video-suncg14-$(XDRIVER_XF86_VIDEO_SUNC
 XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
index adef006a0e..971cf90e4d 100644
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SUNCG3_SOURCE = xf86-video-suncg3-$(XDRIVER_XF86_VIDEO_SUNCG3
 XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
index 0d1f11ef73..1314fea46e 100644
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SUNCG6_SOURCE = xf86-video-suncg6-$(XDRIVER_XF86_VIDEO_SUNCG6
 XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
index be667a255f..a3e1d7ca08 100644
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB
 XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
index b0cc953a97..e56074e06f 100644
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SUNLEO_SOURCE = xf86-video-sunleo-$(XDRIVER_XF86_VIDEO_SUNLEO
 XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
index 135ddd7b9a..edca7fe377 100644
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_SUNTCX_SOURCE = xf86-video-suntcx-$(XDRIVER_XF86_VIDEO_SUNTCX
 XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index dd2643a9f3..5031319b4a 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index fb69d516ab..05a412134d 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION)
 XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index af44f694ef..46967c877d 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRID
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index dc3d8fa75f..ed21580004 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VE
 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index 214fc674e3..723cf6b707 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION)
 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index bc4c38edc6..112e28d266 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 4425112d96..6a6beb07fd 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 86caaae45f..4811d68ab0 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO
 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index 7dfbd8d671..355e42c702 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSI
 XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
index 837c9dd2dc..53510dfe9c 100644
--- a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
+++ b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_XGI_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_XGI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_XGI_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
index a3edd207d8..f1e518aea9 100644
--- a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
+++ b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_XGIXP_SITE = http://xorg.freedesktop.org/releases/individual/
 XDRIVER_XF86_VIDEO_XGIXP_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_XGIXP_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 6d84a2df4f..05613e5550 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -9,5 +9,5 @@ XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 45029e1ab3..d28f1ad145 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index e172323f97..e572fccd1e 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index cbb78adb43..a77e9e5bb0 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFO
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index f4e9c8b214..90aa8c70b3 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFON
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 5056e63e3a..b516c6089f 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFON
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 34b52e2d16..6001c2807e 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST
 XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index e26f998e08..7558254173 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 52e30b5ead..0bddb15793 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 58ebb96020..439c32ed2d 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index 7f3e82af6f..192c19cfd4 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DI
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 35b1ecc675..b94f8c5e8f 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index 2ded871cfd..89bbc3970c 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 524bbc611e..4c50b76d49 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index 46fe2f7478..8ba2afd17c 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index f489def9dd..67542f5ab5 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
index 72dd7ccc1e..79cb6ca930 100644
--- a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
+++ b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_SPEEDO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 5ee876e763..f97a988fc8 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -11,5 +11,5 @@ XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 7b8c25aec3..28fa83c7ea 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -11,5 +11,5 @@ XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 47c54332e6..1d366dfe78 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index 7b2d16d95b..41adb90512 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index d90733d8d7..a00bd437e4 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 561179dfa4..2a1e63416f 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -11,5 +11,5 @@ XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 837ed13e53..0405456b6a 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 742a995110..9ecf0dad1b 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 6f0bd589fc..3cf0af6a27 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index 716e04a871..fd5d8e065f 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -11,5 +11,5 @@ XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index 2af5345104..80e46e4813 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -11,5 +11,5 @@ XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index 3707c1fe64..d6db3d468a 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -11,5 +11,5 @@ XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index af4cc314b7..1cdf0e5871 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -11,4 +11,4 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 7c24ed9bd6..e151831fe9 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 2cf822e9f1..799b1d5a8b 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index 7db1b532d8..70772fbd27 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -11,5 +11,5 @@ XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 53036af833..43b63d204a 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 7001e5de9f..eb98af310f 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -11,5 +11,5 @@ XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 88249ca6cc..2445c94460 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -11,5 +11,5 @@ XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
 XFONT_FONT_UTIL_INSTALL_STAGING = YES
 XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 8a55a5040d..0879fd407c 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -11,5 +11,5 @@ XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONT
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 999b7894b9..e0a27ab01a 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -11,5 +11,5 @@ XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 453f86211b..c619da90e7 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -9,5 +9,5 @@ XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-conf
 XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index d6334aa316..af589b3b26 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -11,4 +11,4 @@ XLIB_LIBFS_INSTALL_STAGING = YES
 XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
 XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 566e1ded09..0b4a4430fd 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -10,4 +10,4 @@ XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBICE_INSTALL_STAGING = YES
 XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index 7ff5830017..c4c0f3a17e 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -11,4 +11,4 @@ XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 32b9f3f0de..54473d933f 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -37,5 +37,5 @@ endef
 
 XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 00cc45218a..216919ef29 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -11,4 +11,4 @@ XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
 XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
 XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index bd2f19bc1b..3f15c0c1af 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -10,5 +10,5 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 1142c76173..668fd4c59e 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -11,4 +11,4 @@ XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
 XLIB_LIBXAW_CONF_OPT = --disable-docs
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index 919d6fc831..14660c8a15 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -10,4 +10,4 @@ XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
 XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 9c996e0fbd..ac254e1257 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -10,5 +10,5 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 9f10e56266..1dd4be1793 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -10,4 +10,4 @@ XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
 XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 6fee5bcce6..4c4674c050 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -10,5 +10,5 @@ XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 2cdffa6819..14f8f5e9c0 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -11,4 +11,4 @@ XLIB_LIBXEXT_INSTALL_STAGING = YES
 XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 9a5768ef87..3bd94adf41 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -10,5 +10,5 @@ XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index d1a7eef891..463e56742b 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -14,5 +14,5 @@ XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 
 HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index 1b1d4dbaec..b2faf5c941 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
 XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
 XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 44ddcbe6d9..55be39638f 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index 8c14007d7f..e52ab7a7a3 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -11,4 +11,4 @@ XLIB_LIBXI_INSTALL_STAGING = YES
 XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
 XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index aadf129e88..cb961e7caa 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -11,4 +11,4 @@ XLIB_LIBXINERAMA_INSTALL_STAGING = YES
 XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
 XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index ad0d49d4e6..217c60d70e 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -10,4 +10,4 @@ XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXMU_INSTALL_STAGING = YES
 XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index 1df392f7f6..08891ad71c 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -11,4 +11,4 @@ XLIB_LIBXP_INSTALL_STAGING = YES
 XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
 XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 6819f57fc6..1760d1dd94 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -10,4 +10,4 @@ XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPM_INSTALL_STAGING = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index f942626c42..b01af405ca 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -10,4 +10,4 @@ XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index b693b28a55..8e76686d74 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -10,4 +10,4 @@ XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
 XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 038494b68b..6dfe2ed3b5 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -11,4 +11,4 @@ XLIB_LIBXRANDR_INSTALL_STAGING = YES
 XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
 XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index efd74bc3ec..ab094867ee 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -11,5 +11,5 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 79c3bcfae2..0ecb928a1d 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -11,4 +11,4 @@ XLIB_LIBXRES_INSTALL_STAGING = YES
 XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
 XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 765f0d55cd..740dc17e03 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -12,4 +12,4 @@ XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
 XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index feab32a528..d2b5ec5aff 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -15,4 +15,4 @@ XLIB_LIBXTST_DEPENDENCIES = \
 	xlib_libXi \
 	xproto_recordproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index c51e4d0fc9..af08937c69 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -11,4 +11,4 @@ XLIB_LIBXV_INSTALL_STAGING = YES
 XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
 XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 725fa1ecf6..2b0ad6bd6a 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -11,4 +11,4 @@ XLIB_LIBXVMC_INSTALL_STAGING = YES
 XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
 XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index 515bf51ad6..d0464268a3 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -11,4 +11,4 @@ XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
 XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
 XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index b7a3292da5..0aabef8be0 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -11,4 +11,4 @@ XLIB_LIBXXF86VM_INSTALL_STAGING = YES
 XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
 XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index bd21f229d9..8e507787cd 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -11,4 +11,4 @@ XLIB_LIBDMX_INSTALL_STAGING = YES
 XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
 XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 369f9afa6a..3e32d93f60 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -10,5 +10,5 @@ XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 56895ab422..f4db12b379 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -11,4 +11,4 @@ XLIB_LIBOLDX_INSTALL_STAGING = YES
 XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
 XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 6c78225123..cc22bedafa 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -9,4 +9,4 @@ XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index ce68fc833f..f05fce42cc 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -10,5 +10,5 @@ XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index d605989075..7e6ec258d9 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -10,4 +10,4 @@ XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBUI_INSTALL_STAGING = YES
 XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index b0adc8fef3..3f839de39e 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -9,5 +9,5 @@ XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_INSTALL_STAGING = YES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index 0ba58305a3..f7b763a1de 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -10,4 +10,4 @@ XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
 XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index c9ce4cc023..ca0a533a89 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -10,4 +10,4 @@ XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
 XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index becf87f702..dc6138b3f0 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -10,4 +10,4 @@ XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/pro
 XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
 XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index eb2d0a910d..918127b83c 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -10,4 +10,4 @@ XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
 XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index eb6a4b11ad..a13691bb76 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -10,4 +10,4 @@ XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DMXPROTO_INSTALL_STAGING = YES
 XPROTO_DMXPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index 5fe2252a05..99af25ce35 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -10,4 +10,4 @@ XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DRI2PROTO_INSTALL_STAGING = YES
 XPROTO_DRI2PROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index a4503d530b..1141337741 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -10,5 +10,5 @@ XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 258349130c..97af75af21 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -10,5 +10,5 @@ XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/pro
 XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
 XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index ba5539a6a4..407664a4ee 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -10,5 +10,5 @@ XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES
 XPROTO_FONTSPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index d5816cdaae..aed8af6487 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -10,4 +10,4 @@ XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_GLPROTO_INSTALL_STAGING = YES
 XPROTO_GLPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 38a696df0f..cf2518b254 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -10,5 +10,5 @@ XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index e552420837..bef002cd7c 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -10,5 +10,5 @@ XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
index b5000022ae..c67e4fa894 100644
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -10,4 +10,4 @@ XPROTO_PRINTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_PRINTPROTO_INSTALL_STAGING = YES
 XPROTO_PRINTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index dd60b7fe79..34ddb03595 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -10,4 +10,4 @@ XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RANDRPROTO_INSTALL_STAGING = YES
 XPROTO_RANDRPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index d37eec7331..73f8a3379c 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -10,4 +10,4 @@ XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RECORDPROTO_INSTALL_STAGING = YES
 XPROTO_RECORDPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index 487f913793..a1a0f59c36 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -10,5 +10,5 @@ XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index 134c76cbf8..df63e2ebd5 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -10,4 +10,4 @@ XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/prot
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
 XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 7eee0f8195..31a0ddfe8f 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -10,4 +10,4 @@ XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/pro
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
 XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 1fd61a8233..88ac3ef979 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -10,4 +10,4 @@ XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
 XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index 4e1ea806d7..1a554fa88e 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -10,4 +10,4 @@ XPROTO_WINDOWSWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/pro
 XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
 XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index ca354236d7..165521c17b 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -10,5 +10,5 @@ XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index cdcb8e5124..b47c6856b7 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -10,5 +10,5 @@ XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index 46f08fb9ab..c7df12840f 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -10,5 +10,5 @@ XPROTO_XF86BIGFONTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/p
 XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index e8aed3c76b..301894a51e 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -10,4 +10,4 @@ XPROTO_XF86DGAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 0eb57f6a1c..701b46494a 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -10,4 +10,4 @@ XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
index 577e325052..16094300f2 100644
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
@@ -10,4 +10,4 @@ XPROTO_XF86RUSHPROTO_SITE = http://xorg.freedesktop.org/releases/individual/prot
 XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
 XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index 01940700de..7a32398047 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -10,4 +10,4 @@ XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/p
 XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
 XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index ad2357cfd1..6220ae6575 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -10,4 +10,4 @@ XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/prot
 XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
 XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index ab9cdfb56f..b3ef30356c 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -10,5 +10,5 @@ XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XPROTO_INSTALL_STAGING = YES
 XPROTO_XPROTO_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 29f7c81671..f221632549 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -153,4 +153,4 @@ else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 69c03211ab..e6b6238672 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -10,5 +10,5 @@ XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
 
 XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index c83a07e960..1823937178 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -10,5 +10,5 @@ XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index f130e426cf..06d3f0da49 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -11,4 +11,4 @@ X11VNC_CONF_OPT = \
 
 X11VNC_DEPENDENCIES = xserver_xorg-server xlib_libXt
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index 5eabd1e224..f885fbd1c0 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -20,4 +20,4 @@ define XAVANTE_UNINSTALL_TARGET_CMDS
 	rm -f "$(TARGET_DIR)/usr/share/sajax.lua"
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 72100f0f90..6dbdcea65f 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -119,4 +119,4 @@ endef
 
 XENOMAI_POST_UNINSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UDEV_RULES
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 2a8817cf67..bf90fd54ad 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -23,4 +23,4 @@ else
 XERCES_CONF_OPT += --disable-network
 endif
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 784f9b6ca5..532e8c0a08 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -18,4 +18,4 @@ XFSPROGS_CONF_OPT = \
 XFSPROGS_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install
 XFSPROGS_UNINSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) uninstall
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index e8fc037ae6..a209d12ae0 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -13,4 +13,4 @@ endif
 
 XINETD_MAKE_OPT = AR="$(TARGET_AR)"
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk
index e44b75f5e2..768e6ec9a1 100644
--- a/package/xl2tp/xl2tp.mk
+++ b/package/xl2tp/xl2tp.mk
@@ -30,4 +30,4 @@ define XL2TP_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 24637ec554..90617147d3 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -15,4 +15,4 @@ XMLSTARLET_CONF_OPT += --disable-static-libs \
 	--with-libxslt-prefix=${STAGING_DIR}/usr \
 	--with-libiconv-prefix=${STAGING_DIR}/usr
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index 16b45d758a..d7d18db70d 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -9,5 +9,5 @@ XSTROKE_SITE = http://avr32linux.org/twiki/pub/Main/XStroke
 
 XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index f462c7fa89..08e3303260 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -10,4 +10,4 @@ XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw
 XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 8b03e65c6e..ec6302703b 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -12,5 +12,5 @@ XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
 
 XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw xlib_libXtst
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index a34434ea97..e700c0deb6 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -9,5 +9,5 @@ XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk
index 1c0df383b0..6c4278ef46 100644
--- a/package/yajl/yajl.mk
+++ b/package/yajl/yajl.mk
@@ -8,4 +8,4 @@ YAJL_VERSION = 2.0.4
 YAJL_SITE = git://github.com/lloyd/yajl.git
 YAJL_INSTALL_STAGING = YES
 
-$(eval $(call CMAKETARGETS))
+$(eval $(cmake-package))
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index b6c499d18c..f5e530dfdc 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -9,4 +9,4 @@ ZEROMQ_SITE = http://download.zeromq.org/
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux
 
-$(eval $(call AUTOTARGETS))
+$(eval $(autotools-package))
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 8d78dc5a11..a9d4a8ff92 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -74,5 +74,5 @@ define HOST_ZLIB_UNINSTALL_TARGET_CMDS
 	$(MAKE1) -C $(@D) uninstall
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index 9bde4b7535..54383e71ad 100644
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -36,4 +36,4 @@ define ZXING_UNINSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) uninstall
 endef
 
-$(eval $(call GENTARGETS))
+$(eval $(generic-package))

From 2359e1223f622c8984f235fd8ddfb40a8e1cdc7a Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 6 Jul 2012 00:06:46 +0200
Subject: [PATCH 2340/6849] Clean up naming of old GENTARGETS infrastructure

With the renaming of XXXTARGETS to xxx-package, the names of the
pkg-xxx.mk files is inconsistent, as well as some internal names in
the documentation.  These inconsistencies are cleaned up here.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 ...kages-autotargets.txt => adding-packages-autotools.txt} |    4 ++--
 ...packages-cmaketargets.txt => adding-packages-cmake.txt} |    4 ++--
 docs/manual/adding-packages-directory.txt                  |   12 ++++++------
 ...packages-gentargets.txt => adding-packages-generic.txt} |    4 ++--
 docs/manual/adding-packages.txt                            |    6 +++---
 package/Makefile.in                                        |    6 +++---
 package/{pkg-autotargets.mk => pkg-autotools.mk}           |    0
 package/{pkg-cmaketargets.mk => pkg-cmake.mk}              |    0
 package/{pkg-gentargets.mk => pkg-generic.mk}              |    0
 9 files changed, 18 insertions(+), 18 deletions(-)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...autotargets.txt => adding-packages-autotools.txt} |  4 ++--
 ...es-cmaketargets.txt => adding-packages-cmake.txt} |  4 ++--
 docs/manual/adding-packages-directory.txt            | 12 ++++++------
 ...es-gentargets.txt => adding-packages-generic.txt} |  4 ++--
 docs/manual/adding-packages.txt                      |  6 +++---
 package/Makefile.in                                  |  6 +++---
 package/{pkg-autotargets.mk => pkg-autotools.mk}     |  0
 package/{pkg-cmaketargets.mk => pkg-cmake.mk}        |  0
 package/{pkg-gentargets.mk => pkg-generic.mk}        |  0
 9 files changed, 18 insertions(+), 18 deletions(-)
 rename docs/manual/{adding-packages-autotargets.txt => adding-packages-autotools.txt} (99%)
 rename docs/manual/{adding-packages-cmaketargets.txt => adding-packages-cmake.txt} (99%)
 rename docs/manual/{adding-packages-gentargets.txt => adding-packages-generic.txt} (99%)
 rename package/{pkg-autotargets.mk => pkg-autotools.mk} (100%)
 rename package/{pkg-cmaketargets.mk => pkg-cmake.mk} (100%)
 rename package/{pkg-gentargets.mk => pkg-generic.mk} (100%)

diff --git a/docs/manual/adding-packages-autotargets.txt b/docs/manual/adding-packages-autotools.txt
similarity index 99%
rename from docs/manual/adding-packages-autotargets.txt
rename to docs/manual/adding-packages-autotools.txt
index f67cd060aa..a9653ce26d 100644
--- a/docs/manual/adding-packages-autotargets.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -1,7 +1,7 @@
 Infrastructure for autotools-based packages
 -------------------------------------------
 
-[[autotargets-tutorial]]
+[[autotools-package-tutorial]]
 
 +autotools-package+ tutorial
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -61,7 +61,7 @@ Finally, on line line 14, we invoke the +autotools-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
-[[autotargets-reference]]
+[[autotools-package-reference]]
 
 +autotools-package+ reference
 ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-cmaketargets.txt b/docs/manual/adding-packages-cmake.txt
similarity index 99%
rename from docs/manual/adding-packages-cmaketargets.txt
rename to docs/manual/adding-packages-cmake.txt
index 69acb00cc9..d1489bdf16 100644
--- a/docs/manual/adding-packages-cmaketargets.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -1,7 +1,7 @@
 Infrastructure for CMake-based packages
 ---------------------------------------
 
-[[cmaketargets-tutorial]]
+[[cmake-package-tutorial]]
 
 +cmake-package+ tutorial
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,7 +60,7 @@ Finally, on line line 14, we invoke the +cmake-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
-[[cmaketargets-reference]]
+[[cmake-package-reference]]
 
 +cmake-package+ reference
 ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 2670f2fe9a..4a96415adb 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -163,22 +163,22 @@ different way, using different infrastructures:
   infrastructure must be used for all packages that do not use the
   autotools as their build system. In the future, other specialized
   infrastructures might be written for other build systems.  We cover
-  them through in a xref:gentargets-tutorial[tutorial] and a
-  xref:gentargets-reference[reference].
+  them through in a xref:generic-package-tutorial[tutorial] and a
+  xref:generic-package-reference[reference].
 
 * *Makefiles for autotools-based software* (autoconf, automake, etc.):
   We provide a dedicated infrastructure for such packages, since
   autotools is a very common build system. This infrastructure 'must'
   be used for new packages that rely on the autotools as their build
-  system. We cover them through a xref:autotargets-tutorial[tutorial]
-  and xref:autotargets-reference[reference].
+  system. We cover them through a xref:autotools-package-tutorial[tutorial]
+  and xref:autotools-package-reference[reference].
 
 * *Makefiles for cmake-based software*: We provide a dedicated
    infrastructure for such packages, as CMake is a more and more
    commonly used build system and has a standardized behaviour. This
    infrastructure 'must' be used for new packages that rely on
-   CMake. We cover them through a xref:cmaketargets-tutorial[tutorial]
-   and xref:cmaketargets-reference[reference].
+   CMake. We cover them through a xref:cmake-package-tutorial[tutorial]
+   and xref:cmake-package-reference[reference].
 
 * *Hand-written Makefiles:* These are currently obsolete, and no new
   manual Makefiles should be added. However, since there are still
diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-generic.txt
similarity index 99%
rename from docs/manual/adding-packages-gentargets.txt
rename to docs/manual/adding-packages-generic.txt
index cc412090b4..a7cceb7a28 100644
--- a/docs/manual/adding-packages-gentargets.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -6,7 +6,7 @@ whose build system is not one of the standard ones, such as
 'autotools' or 'CMake'. This typically includes packages whose build
 system is based on hand-written Makefiles or shell scripts.
 
-[[gentargets-tutorial]]
+[[generic-package-tutorial]]
 
 +generic-package+ Tutorial
 ~~~~~~~~~~~~~~~~~~~~~
@@ -87,7 +87,7 @@ Finally, on line 35, we call the +generic-package+ which
 generates, according to the variables defined previously, all the
 Makefile code necessary to make your package working.
 
-[[gentargets-reference]]
+[[generic-package-reference]]
 
 +generic-package+ Reference
 ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index 0217e9f4b0..acbde0c802 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -8,11 +8,11 @@ tuning their configuration.
 
 include::adding-packages-directory.txt[]
 
-include::adding-packages-gentargets.txt[]
+include::adding-packages-generic.txt[]
 
-include::adding-packages-autotargets.txt[]
+include::adding-packages-autotools.txt[]
 
-include::adding-packages-cmaketargets.txt[]
+include::adding-packages-cmake.txt[]
 
 include::adding-packages-handwritten.txt[]
 
diff --git a/package/Makefile.in b/package/Makefile.in
index 1c3ce482b2..6fad224ba2 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -306,6 +306,6 @@ endif
 
 include package/pkg-utils.mk
 include package/pkg-download.mk
-include package/pkg-autotargets.mk
-include package/pkg-cmaketargets.mk
-include package/pkg-gentargets.mk
+include package/pkg-autotools.mk
+include package/pkg-cmake.mk
+include package/pkg-generic.mk
diff --git a/package/pkg-autotargets.mk b/package/pkg-autotools.mk
similarity index 100%
rename from package/pkg-autotargets.mk
rename to package/pkg-autotools.mk
diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmake.mk
similarity index 100%
rename from package/pkg-cmaketargets.mk
rename to package/pkg-cmake.mk
diff --git a/package/pkg-gentargets.mk b/package/pkg-generic.mk
similarity index 100%
rename from package/pkg-gentargets.mk
rename to package/pkg-generic.mk

From 8141ccf380377e48edf596135306c8daa76a68ca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Jul 2012 20:27:05 +0200
Subject: [PATCH 2341/6849] doc: minor documentation fixes after package
 infrastructure changes

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-autotools.txt | 4 ++--
 docs/manual/adding-packages-cmake.txt     | 4 ++--
 docs/manual/adding-packages-generic.txt   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index a9653ce26d..9fb0918220 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -4,7 +4,7 @@ Infrastructure for autotools-based packages
 [[autotools-package-tutorial]]
 
 +autotools-package+ tutorial
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 First, let's see how to write a +.mk+ file for an autotools-based
 package, with an example :
@@ -64,7 +64,7 @@ package to be built.
 [[autotools-package-reference]]
 
 +autotools-package+ reference
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The main macro of the autotools package infrastructure is
 +autotools-package+. It is similar to the +generic-package+ macro. The ability to
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index d1489bdf16..e29ca0fa1b 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -4,7 +4,7 @@ Infrastructure for CMake-based packages
 [[cmake-package-tutorial]]
 
 +cmake-package+ tutorial
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 First, let's see how to write a +.mk+ file for a CMake-based package,
 with an example :
@@ -63,7 +63,7 @@ package to be built.
 [[cmake-package-reference]]
 
 +cmake-package+ reference
-~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The main macro of the CMake package infrastructure is
 +cmake-package+. It is similar to the +generic-package+ macro. The ability to
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index a7cceb7a28..d264f40b00 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -9,7 +9,7 @@ system is based on hand-written Makefiles or shell scripts.
 [[generic-package-tutorial]]
 
 +generic-package+ Tutorial
-~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ------------------------------
 01: #############################################################
@@ -90,7 +90,7 @@ Makefile code necessary to make your package working.
 [[generic-package-reference]]
 
 +generic-package+ Reference
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 There are two variants of the generic target. The +generic-package+ macro is
 used for packages to be cross-compiled for the target.  The

From 88bd697e0eadf1c0da40d59329d03c11194f2fe3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Jul 2012 09:24:26 -0300
Subject: [PATCH 2342/6849] kernel-headers: bump 3.{0, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.36-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.37-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index ac16c7fdda..c24dd86c3b 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.36"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.37"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.23"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.4"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.5"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.36-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.37-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.36-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.37-headers_install-fix-__packed-in-exported-kernel-head.patch

From e4cbe2c33bd8442c7bd814add1a694e194c4d298 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Jul 2012 09:24:27 -0300
Subject: [PATCH 2343/6849] linux: bump default to kernel version 3.4.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index c969be6286..00f852e46d 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.4"
+	bool "3.4.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.4" if BR2_LINUX_KERNEL_3_4
+	default "3.4.5" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 2c7e9c50e9bef1c494ef90411a466ad320846b96 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 17 Jul 2012 10:18:27 +0200
Subject: [PATCH 2344/6849] lua: split and rename patches

Signed-off-by: Francois Perrad <fperrad@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...root-path.patch => lua-01-root-path.patch} |  2 +
 package/lua/lua-02-shared-libs-for-lua.patch  | 49 +++++++++++
 ...atch => lua-03-shared-libs-for-luac.patch} | 83 ++++---------------
 3 files changed, 66 insertions(+), 68 deletions(-)
 rename package/lua/{lua-root-path.patch => lua-01-root-path.patch} (93%)
 create mode 100644 package/lua/lua-02-shared-libs-for-lua.patch
 rename package/lua/{lua-shared-libs.patch => lua-03-shared-libs-for-luac.patch} (59%)

diff --git a/package/lua/lua-root-path.patch b/package/lua/lua-01-root-path.patch
similarity index 93%
rename from package/lua/lua-root-path.patch
rename to package/lua/lua-01-root-path.patch
index c31cb2c28f..c5dbf32703 100644
--- a/package/lua/lua-root-path.patch
+++ b/package/lua/lua-01-root-path.patch
@@ -1,3 +1,5 @@
+Adjust installation location to /usr.
+
 Index: b/src/luaconf.h
 ===================================================================
 --- a/src/luaconf.h
diff --git a/package/lua/lua-02-shared-libs-for-lua.patch b/package/lua/lua-02-shared-libs-for-lua.patch
new file mode 100644
index 0000000000..afe2ac8941
--- /dev/null
+++ b/package/lua/lua-02-shared-libs-for-lua.patch
@@ -0,0 +1,49 @@
+Add the compilation of a shared library.
+Compile the lua binary with the shared library.
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/src/Makefile
+===================================================================
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO=	liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
+@@ -36,8 +37,9 @@
+ LUAC_O=	luac.o print.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
++ALL_SO= $(LUA_SO)
+ 
+ default: $(PLAT)
+ 
+@@ -47,12 +49,18 @@
+ 
+ a:	$(ALL_A)
+ 
++so:	$(ALL_SO)
++
+ $(LUA_A): $(CORE_O) $(LIB_O)
+ 	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
++	ln -fs $@.$(PKG_VERSION) $@
++
++$(LUA_T): $(LUA_O) $(LUA_SO)
++	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
+ 
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/package/lua/lua-shared-libs.patch b/package/lua/lua-03-shared-libs-for-luac.patch
similarity index 59%
rename from package/lua/lua-shared-libs.patch
rename to package/lua/lua-03-shared-libs-for-luac.patch
index 6bca7f2790..ebe5337afb 100644
--- a/package/lua/lua-shared-libs.patch
+++ b/package/lua/lua-03-shared-libs-for-luac.patch
@@ -1,24 +1,8 @@
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,7 @@
- # What to install.
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
--TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so.$R
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-@@ -63,6 +63,7 @@
- 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
- 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
-+	ln -sf liblua.so.$R $(INSTALL_LIB)/liblua.so
- 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
- 
- ranlib:
+Compile the luac binary with the shared library.
+Many internal functions (LUAI_FUNC) must be exported (LUA_API).
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
 Index: b/src/ldo.h
 ===================================================================
 --- a/src/ldo.h
@@ -91,15 +75,7 @@ Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO= liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -33,11 +34,12 @@
+@@ -34,7 +34,7 @@
  LUA_O=	lua.o
  
  LUAC_T=	luac
@@ -107,44 +83,15 @@ Index: b/src/Makefile
 +LUAC_O=	luac.o print.o lopcodes.o
  
  ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
-+ALL_SO= $(LUA_SO)
- 
- default: $(PLAT)
- 
-@@ -47,14 +49,23 @@
+ ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+@@ -62,8 +62,8 @@
+ $(LUA_T): $(LUA_O) $(LUA_SO)
+ 	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
  
- a:	$(ALL_A)
- 
-+so:	$(ALL_SO)
-+
- $(LUA_A): $(CORE_O) $(LIB_O)
- 	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
-+	ln -fs $@.$(PKG_VERSION) $@
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
--	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
- $(LUAC_T): $(LUAC_O) $(LUA_A)
-+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+
-+$(LUAC_T)-host: $(LUAC_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++$(LUAC_T): $(LUAC_O) $(LUA_SO)
++	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
  
  clean:
-@@ -96,7 +107,7 @@
- 	$(MAKE) all MYCFLAGS=
- 
- linux:
--	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
-+	$(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
- 
- macosx:
- 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
+ 	$(RM) $(ALL_T) $(ALL_O)

From 641f5dcb764f63c086a23a2018aca952e83ef666 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 17 Jul 2012 10:18:28 +0200
Subject: [PATCH 2345/6849] lua: refactor root path tuning

Use a patch rather than sed'ing files in the build process.

Signed-off-by: Francois Perrad <fperrad@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/lua-01-root-path.patch | 24 ++++++++++++++++++++++++
 package/lua/lua.mk                 |  2 --
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/package/lua/lua-01-root-path.patch b/package/lua/lua-01-root-path.patch
index c5dbf32703..f82c9c5f0e 100644
--- a/package/lua/lua-01-root-path.patch
+++ b/package/lua/lua-01-root-path.patch
@@ -1,5 +1,29 @@
 Adjust installation location to /usr.
+Remove version in module paths.
 
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/etc/lua.pc
+===================================================================
+--- a/etc/lua.pc
++++ b/etc/lua.pc
+@@ -8,13 +8,13 @@
+ R= 5.1.5
+ 
+ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
++prefix= /usr
+ INSTALL_BIN= ${prefix}/bin
+ INSTALL_INC= ${prefix}/include
+ INSTALL_LIB= ${prefix}/lib
+ INSTALL_MAN= ${prefix}/man/man1
+-INSTALL_LMOD= ${prefix}/share/lua/${V}
+-INSTALL_CMOD= ${prefix}/lib/lua/${V}
++INSTALL_LMOD= ${prefix}/share/lua
++INSTALL_CMOD= ${prefix}/lib/lua
+ 
+ # canonical vars
+ exec_prefix=${prefix}
 Index: b/src/luaconf.h
 ===================================================================
 --- a/src/luaconf.h
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index b61d6f1fa6..1e52075599 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -28,7 +28,6 @@ HOST_LUA_MYLIBS = -ldl
 
 define LUA_BUILD_CMDS
 	sed -i -e 's/-O2//' $(@D)/src/Makefile
-	sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
 	$(MAKE) \
 	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
 	MYCFLAGS="$(TARGET_CFLAGS) $(LUA_MYCFLAGS)" \
@@ -38,7 +37,6 @@ endef
 
 define HOST_LUA_BUILD_CMDS
 	sed -i -e 's/-O2//' $(@D)/src/Makefile
-	sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
 	$(MAKE) \
 	MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
 	MYLIBS="$(HOST_LUA_MYLIBS)" \

From b16c6ac4740cc0534a6b6dc1a51338296c1def92 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 17 Jul 2012 21:28:32 +0200
Subject: [PATCH 2346/6849] lua: embed sub-options into a if...endif instead of
 depends on

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/Config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/lua/Config.in b/package/lua/Config.in
index 56eba35290..76359c0df5 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -5,16 +5,16 @@ config BR2_PACKAGE_LUA
 
 	  http://www.lua.org/
 
+if BR2_PACKAGE_LUA
+
 config BR2_PACKAGE_LUA_COMPILER
 	bool "lua compiler"
-	depends on BR2_PACKAGE_LUA
 	select BR2_PACKAGE_LUA_SHARED_LIBRARY
 	help
 	  Install luac binary
 
 config BR2_PACKAGE_LUA_INTERPRETER
 	bool "lua interpreter"
-	depends on BR2_PACKAGE_LUA
 	select BR2_PACKAGE_LUA_SHARED_LIBRARY
 	help
 	  Install lua binary
@@ -29,6 +29,7 @@ config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 
 config BR2_PACKAGE_LUA_SHARED_LIBRARY
 	bool "shared library"
-	depends on BR2_PACKAGE_LUA
 	help
 	  Install shared liblua.so
+
+endif

From 198bc9631aff65f5fe90db068cb1936850736910 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 15 Jul 2012 22:59:26 -0400
Subject: [PATCH 2347/6849] new package: LuaExpat

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in            |  1 +
 package/luaexpat/Config.in   |  7 +++++++
 package/luaexpat/luaexpat.mk | 38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/luaexpat/Config.in
 create mode 100644 package/luaexpat/luaexpat.mk

diff --git a/package/Config.in b/package/Config.in
index 99257b426f..5126f1a76c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -250,6 +250,7 @@ menu "LUA libraries/modules"
 source "package/cgilua/Config.in"
 source "package/copas/Config.in"
 source "package/coxpcall/Config.in"
+source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
 source "package/rings/Config.in"
diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in
new file mode 100644
index 0000000000..186c5c917b
--- /dev/null
+++ b/package/luaexpat/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUAEXPAT
+	bool "luaexpat"
+	select BR2_PACKAGE_EXPAT
+	help
+	  LuaExpat is a SAX XML parser based on the Expat library.
+
+	  http://matthewwild.co.uk/projects/luaexpat/
diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk
new file mode 100644
index 0000000000..400d7b4756
--- /dev/null
+++ b/package/luaexpat/luaexpat.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# luaexpat
+#
+#############################################################
+
+LUAEXPAT_VERSION      = 1.2.0
+LUAEXPAT_SITE         = http://matthewwild.co.uk/projects/luaexpat
+LUAEXPAT_DEPENDENCIES = lua expat
+
+
+LUAEXPAT_MFLAGS += LUA_VERSION_NUM=501
+LUAEXPAT_MFLAGS += LUA_INC=$(STAGING_DIR)/usr/include/lua
+LUAEXPAT_MFLAGS += EXPAT_INC=$(STAGING_DIR)/usr/include
+LUAEXPAT_MFLAGS += LIBNAME=lxp.so
+LUAEXPAT_MFLAGS += LIB_OPTION="-shared -fPIC $(TARGET_CFLAGS)"
+LUAEXPAT_MFLAGS += CC="$(TARGET_CC) -fPIC $(TARGET_CFLAGS)"
+
+
+define LUAEXPAT_BUILD_CMDS
+	$(MAKE) -C $(@D) $(LUAEXPAT_MFLAGS)
+endef
+
+define LUAEXPAT_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/src/lxp.so $(TARGET_DIR)/usr/lib/lua/lxp.so
+	$(INSTALL) -D -m 0644 $(@D)/src/lxp/lom.lua $(TARGET_DIR)/usr/share/lua/lxp/lom.lua
+endef
+
+define LUAEXPAT_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/lua/lxp.so
+	rm -f $(TARGET_DIR)/usr/share/lua/lxp/lom.lua
+endef
+
+define LUAEXPAT_CLEAN_CMDS
+	$(MAKE) -C $(@D) $(LUAEXPAT_MFLAGS) clean
+endef
+
+$(eval $(generic-package))

From 7d8434630b397dab7da3739c9f737fc2fbf0e97d Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 15 Jul 2012 23:00:27 -0400
Subject: [PATCH 2348/6849] new package: luacjson

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in            |  1 +
 package/luacjson/Config.in   | 13 +++++++++++++
 package/luacjson/luacjson.mk | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/luacjson/Config.in
 create mode 100644 package/luacjson/luacjson.mk

diff --git a/package/Config.in b/package/Config.in
index 5126f1a76c..8529777d93 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -250,6 +250,7 @@ menu "LUA libraries/modules"
 source "package/cgilua/Config.in"
 source "package/copas/Config.in"
 source "package/coxpcall/Config.in"
+source "package/luacjson/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
diff --git a/package/luacjson/Config.in b/package/luacjson/Config.in
new file mode 100644
index 0000000000..8a5624f759
--- /dev/null
+++ b/package/luacjson/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LUACJSON
+	bool "luacjson"
+	help
+	  The Lua CJSON module provides JSON support for Lua. It features:
+	  - Fast, standards compliant encoding/parsing routines
+	  - Full support for JSON with UTF-8, including decoding surrogate pairs
+	  - Optional run-time support for common exceptions to the JSON
+	    specification (infinity, NaN, ...)
+	  - No dependencies on other libraries
+
+	  (C-module)
+
+	  http://www.kyne.com.au/~mark/software/lua-cjson.php
diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk
new file mode 100644
index 0000000000..fe92f16034
--- /dev/null
+++ b/package/luacjson/luacjson.mk
@@ -0,0 +1,32 @@
+#############################################################
+#
+# luacjson
+#
+#############################################################
+LUACJSON_VERSION      = 2.1.0
+LUACJSON_SOURCE       = lua-cjson-$(LUACJSON_VERSION).tar.gz
+LUACJSON_SITE         = http://www.kyne.com.au/~mark/software/download
+LUACJSON_DEPENDENCIES = lua
+
+define LUACJSON_BUILD_CMDS
+	$(MAKE) -C $(@D) \
+		CFLAGS="$(TARGET_CFLAGS)"   \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		CC="$(TARGET_CC)"           \
+		LD="$(TARGET_LD)"           \
+		PREFIX=$(STAGING_DIR)/usr
+endef
+
+define LUACJSON_INSTALL_TARGET_CMDS
+	install -D -m 0644 $(@D)/cjson.so $(TARGET_DIR)/usr/lib/lua/cjson.so
+endef
+
+define LUACJSON_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+define LUACJSON_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/lua/cjson.so
+endef
+
+$(eval $(generic-package))

From 20b2199d30f9c00abd51ae199d0934f4eb70d870 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 11 Jul 2012 00:25:45 +0200
Subject: [PATCH 2349/6849] libnspr: fix 64-bit build

On some architectures (found on x86_64, but probably others too),
libnspr builds with -m32 unless it is configured for 64-bit build.  So
force 64-bit build on 64-bit architectures.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libnspr/libnspr.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index c2cc996851..689caa424c 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -12,6 +12,8 @@ LIBNSPR_INSTALL_STAGING = YES
 LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
 		   HOST_LDFLAGS="-lc"
 # NSPR mixes up --build and --host
-LIBNSPR_CONF_OPT = --host=$(GNU_HOST_NAME)
+LIBNSPR_CONF_OPT  = --host=$(GNU_HOST_NAME)
+LIBNSPR_CONF_OPT += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
+LIBNSPR_CONF_OPT += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
 $(eval $(autotools-package))

From adbe85c752651bc147bc4deb6419d162b2c6417e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 11 Jul 2012 00:30:36 +0200
Subject: [PATCH 2350/6849] libnss: fix 64-bit build

On some architectures (found on x86_64, but probably others too),
libnss builds with -m32 unless it is configured for 64-bit build.  So
force 64-bit build on 64-bit architectures.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libnss/libnss.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 2e28c753de..f7fd6820c4 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -28,6 +28,10 @@ LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
 		OS_RELEASE="2.6" \
 		OS_TEST="$(ARCH)"
 
+ifeq ($(BR2_ARCH_IS_64),y)
+LIBNSS_BUILD_VARS += USE_64=1
+endif
+
 
 define LIBNSS_BUILD_CMDS
 	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_coreconf build_dbm all \

From 856ba320975740542bc4525efabc3cb63f76869f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 Jul 2012 09:48:24 +0200
Subject: [PATCH 2351/6849] sqlite: do not assume thread support is available

The --enable-threadsafe option was unconditionally passed, without
taking into account whether the underlying toolchain had thread
support or not. Now, we properly pass --enable-threadsafe or
--disable-threadsafe depending on the availability of thread support.

Fixes
http://autobuild.buildroot.net/results/defdc098cff293baabf2f89587476eba71f1c0d0/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sqlite/sqlite.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 5b85ecc5fd..9e63b521dc 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -23,9 +23,14 @@ endif
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
 SQLITE_CONF_OPT = \
-	--enable-threadsafe \
 	--localstatedir=/var
 
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+SQLITE_CONF_OPT += --enable-threadsafe
+else
+SQLITE_CONF_OPT += --disable-threadsafe
+endif
+
 ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
 SQLITE_DEPENDENCIES += ncurses readline
 SQLITE_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"

From d3a91caccbfa6e2adcb134f8f2f457aef4a27786 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Wed, 18 Jul 2012 17:40:16 +0200
Subject: [PATCH 2352/6849] package/usbutils: bump to version 006

Also, as the kernel.org archives are back up, use them as official site
again.

[thomas.petazzoni@free-electrons.com: use BR2_KERNEL_MIRROR]

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/usbutils/usbutils.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 53a29c5399..6e2957173d 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-USBUTILS_VERSION = 005
-USBUTILS_SITE = http://snapshot.debian.org/archive/debian/20111211T214105Z/pool/main/u/usbutils/
-USBUTILS_SOURCE = usbutils_$(USBUTILS_VERSION).orig.tar.gz
+USBUTILS_VERSION = 006
+USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/
+USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.gz
 USBUTILS_DEPENDENCIES = host-pkg-config libusb
 USBUTILS_INSTALL_STAGING = YES
 # no configure in tarball

From fab8272eee773456bd14829144c38942575a9a9c Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 18 Jul 2012 09:00:10 +0100
Subject: [PATCH 2353/6849] libnfc: bump version to recent svn revision

The libnfc package is currently at version 1.5.1 in Buildroot. This patch
bumps the version to a recent svn revision, for the following reasons.

* Version 1.5.1 is marked as "unstable" on the libnfc download site.

* The nfc-tools project at

    http://code.google.com/p/nfc-tools/

  includes a library that extends libnfc with LLCP functionality.
  Unfortunately, to build this requires a libnfc version no lower than 1.6.
  The version 1.6.0-rc1 Release Candidate does not build; svn commits to fix
  the build problems have not yet been back-ported into a Release Candidate.

* The libfreefare package is currently at version 0.3.2 in Buildroot. To bump
  this to the most recent version (0.3.4) also requires a libnfc version no
  lower than 1.6.

I suggest that this patch be regarded as a temporary fix, pending the release
of libnfc 1.6, which will allow other dependent packages to be progressed in
the interim.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libnfc/libnfc.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index 95cf61d244..ab062bb54b 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -3,9 +3,9 @@
 # libnfc
 #
 #############################################################
-LIBNFC_VERSION = 1.5.1
-LIBNFC_SITE = http://libnfc.googlecode.com/files/
-LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.gz
+LIBNFC_VERSION = 1446
+LIBNFC_SITE = http://libnfc.googlecode.com/svn/trunk/
+LIBNFC_SITE_METHOD = svn
 LIBNFC_AUTORECONF = YES
 LIBNFC_INSTALL_STAGING = YES
 

From 9f16b69c595faf0eb48aa4fa581cbbb0bacde603 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Jul 2012 09:54:27 -0300
Subject: [PATCH 2354/6849] libexif: security bump to version 0.6.21

Fixes CVE-2012-2812, CVE-2012-2813, CVE-2012-2814, CVE-2012-2836,
CVE-2012-2837, CVE-2012-2840, CVE-2012-2841 and CVE-2012-2845.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libexif/libexif.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index 7054b50ba8..a54694c5d9 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEXIF_VERSION = 0.6.20
+LIBEXIF_VERSION = 0.6.21
 LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
 LIBEXIF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
 LIBEXIF_INSTALL_STAGING = YES

From 1d4104f0d0428297a8b447a0e08c81a9eaee7f62 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 18 Jul 2012 15:59:09 +0200
Subject: [PATCH 2355/6849] add host arch detection and Kconfig BR2_HOSTARCH

This will allow to install binary package only if they are supported by the
host. As example Atmel SAM-BA (x86 only).

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 Config.in |  4 ++++
 Makefile  | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Config.in b/Config.in
index 925c2474cb..c182f7044d 100644
--- a/Config.in
+++ b/Config.in
@@ -10,6 +10,10 @@ config BR2_VERSION
 	string
 	option env="BR2_VERSION_FULL"
 
+config BR2_HOSTARCH
+	string
+	option env="HOSTARCH"
+
 source "target/Config.in.arch"
 
 menu "Build options"
diff --git a/Makefile b/Makefile
index d55b136a86..639fdaa1f8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,16 @@ ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSI
 $(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
 endif
 
+export HOSTARCH := $(shell uname -m | \
+	sed -e s/i.86/x86/ \
+	    -e s/sun4u/sparc64/ \
+	    -e s/arm.*/arm/ \
+	    -e s/sa110/arm/ \
+	    -e s/ppc64/powerpc/ \
+	    -e s/ppc/powerpc/ \
+	    -e s/macppc/powerpc/\
+	    -e s/sh.*/sh/)
+
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
 

From f93e17f0b4d8d9af2867a04c3691f68fd3f4e443 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 18 Jul 2012 15:59:10 +0200
Subject: [PATCH 2356/6849] luajit: new package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  3 +-
 package/luajit/Config.in                      | 12 ++++
 package/luajit/luajit-01-root-path.patch      | 22 +++++++
 package/luajit/luajit-02-shared-lib.patch     | 17 +++++
 package/luajit/luajit-03-dont-strip.patch     | 23 +++++++
 package/luajit/luajit-04-no-bin-symlink.patch | 40 ++++++++++++
 package/luajit/luajit.mk                      | 63 +++++++++++++++++++
 7 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 package/luajit/Config.in
 create mode 100644 package/luajit/luajit-01-root-path.patch
 create mode 100644 package/luajit/luajit-02-shared-lib.patch
 create mode 100644 package/luajit/luajit-03-dont-strip.patch
 create mode 100644 package/luajit/luajit-04-no-bin-symlink.patch
 create mode 100644 package/luajit/luajit.mk

diff --git a/package/Config.in b/package/Config.in
index 8529777d93..6aabb8eada 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -245,7 +245,8 @@ endmenu
 menu "Interpreter languages and scripting"
 source "package/haserl/Config.in"
 source "package/lua/Config.in"
-if BR2_PACKAGE_LUA
+source "package/luajit/Config.in"
+if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT
 menu "LUA libraries/modules"
 source "package/cgilua/Config.in"
 source "package/copas/Config.in"
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
new file mode 100644
index 0000000000..23b2650493
--- /dev/null
+++ b/package/luajit/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LUAJIT
+	bool "luajit"
+	# Luajit is only available for some target architectures, and
+	# has some complexity wrt 32/64. See luajit.mk for details.
+	depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
+	help
+	  LuaJIT implements the full set of language features defined
+	  by Lua 5.1. The virtual machine (VM) is API- and
+	  ABI-compatible to the standard Lua interpreter and can be
+	  deployed as a drop-in replacement.
+
+	  http://luajit.org/
diff --git a/package/luajit/luajit-01-root-path.patch b/package/luajit/luajit-01-root-path.patch
new file mode 100644
index 0000000000..3b0a585fa0
--- /dev/null
+++ b/package/luajit/luajit-01-root-path.patch
@@ -0,0 +1,22 @@
+Adjust installation location to /usr
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/luaconf.h
+===================================================================
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -22,9 +22,9 @@
+ #define LUA_CPATH_DEFAULT \
+   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ #else
+-#define LUA_ROOT	"/usr/local/"
+-#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+-#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
++#define LUA_ROOT	"/usr/"
++#define LUA_LDIR	LUA_ROOT "share/lua/"
++#define LUA_CDIR	LUA_ROOT "lib/lua/"
+ #ifdef LUA_XROOT
+ #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta10/"
+ #define LUA_XPATH \
diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
new file mode 100644
index 0000000000..d5122ba0e5
--- /dev/null
+++ b/package/luajit/luajit-02-shared-lib.patch
@@ -0,0 +1,17 @@
+Compile the luajit binary dynamically against the luajit library
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/Makefile
+===================================================================
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -629,7 +629,7 @@
+ 
+ $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP)
+ 	$(E) "LINK      $@"
+-	$(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS)
++	$(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS)
+ 	$(Q)$(TARGET_STRIP) $@
+ 	$(E) "OK        Successfully built LuaJIT"
+ 
diff --git a/package/luajit/luajit-03-dont-strip.patch b/package/luajit/luajit-03-dont-strip.patch
new file mode 100644
index 0000000000..9651cdfd95
--- /dev/null
+++ b/package/luajit/luajit-03-dont-strip.patch
@@ -0,0 +1,23 @@
+Don't strip the library and binary
+
+This allows Buildroot to do it if needed, but only if needed.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/Makefile
+===================================================================
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -625,12 +625,10 @@
+ $(LUAJIT_SO): $(LJVMCORE_O)
+ 	$(E) "DYNLINK   $@"
+ 	$(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS)
+-	$(Q)$(TARGET_STRIP) $@
+ 
+ $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP)
+ 	$(E) "LINK      $@"
+ 	$(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS)
+-	$(Q)$(TARGET_STRIP) $@
+ 	$(E) "OK        Successfully built LuaJIT"
+ 
+ ##############################################################################
diff --git a/package/luajit/luajit-04-no-bin-symlink.patch b/package/luajit/luajit-04-no-bin-symlink.patch
new file mode 100644
index 0000000000..3eed7decb0
--- /dev/null
+++ b/package/luajit/luajit-04-no-bin-symlink.patch
@@ -0,0 +1,40 @@
+Do not use a symlink for the binary, simply name if luajit
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -41,8 +41,7 @@
+ INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
+ 
+-INSTALL_TNAME= luajit-$(VERSION)
+-INSTALL_TSYMNAME= luajit
++INSTALL_TNAME= luajit
+ INSTALL_ANAME= libluajit-$(ABIVER).a
+ INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
+ INSTALL_SOSHORT= libluajit-$(ABIVER).so
+@@ -56,7 +55,6 @@
+ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
+-INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
+ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
+ 
+ INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
+@@ -114,13 +112,6 @@
+ 	  $(RM) $(FILE_PC).tmp
+ 	cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
+ 	cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+-	@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
+-	@echo ""
+-	@echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
+-	@echo "You can do this now by running this command (with sudo):"
+-	@echo ""
+-	@echo "  $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
+-	@echo ""
+ 
+ ##############################################################################
+ 
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
new file mode 100644
index 0000000000..b35cdb4ecd
--- /dev/null
+++ b/package/luajit/luajit.mk
@@ -0,0 +1,63 @@
+#############################################################
+#
+# luajit
+#
+#############################################################
+
+LUAJIT_VERSION = 2.0.0-beta10
+LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
+LUAJIT_SITE    = http://luajit.org/download
+
+LUAJIT_INSTALL_STAGING = YES
+
+define LUAJIT_NOLARGEFILE_FIX_MAKEFILE
+	$(SED) 's/TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/TARGET_XCFLAGS=/' $(@D)/src/Makefile
+endef
+
+ifneq ($(BR2_LARGEFILE),y)
+LUAJIT_POST_PATCH_HOOKS += LUAJIT_NOLARGEFILE_FIX_MAKEFILE
+endif
+
+# The luajit build procedure requires the host compiler to have the
+# same bitness as the target compiler. Therefore, on a x86 build
+# machine, we can't build luajit for x86_64, which is checked in
+# Config.in. When the target is a 32 bits target, we pass -m32 to
+# ensure that even on 64 bits build machines, a compiler of the same
+# bitness is used. Of course, this assumes that the 32 bits multilib
+# libraries are installed.
+ifeq ($(BR2_ARCH_IS_64),y)
+LUAJIT_HOST_CC=$(HOSTCC)
+else
+LUAJIT_HOST_CC=$(HOSTCC) -m32
+endif
+
+# We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit
+# build system uses non conventional variable names.
+define LUAJIT_BUILD_CMDS
+	$(MAKE) PREFIX="/usr" \
+		STATIC_CC="$(TARGET_CC)" \
+		DYNAMIC_CC="$(TARGET_CC) -fPIC" \
+		TARGET_LD="$(TARGET_CC)" \
+		TARGET_AR="$(TARGET_AR) rcus" \
+		TARGET_STRIP="$(TARGET_STRIP)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		HOST_CC="$(LUAJIT_HOST_CC)" \
+		HOST_CFLAGS="$(HOST_CFLAGS)" \
+		HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+		-C $(@D) amalg
+endef
+
+define LUAJIT_INSTALL_STAGING_CMDS
+	$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) install
+endef
+
+define LUAJIT_INSTALL_TARGET_CMDS
+	$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install
+endef
+
+define LUAJIT_CLEAN_CMDS
+	-$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From fb0af9388713497ac7917174518e8703b7887751 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 18 Jul 2012 15:59:11 +0200
Subject: [PATCH 2357/6849] luajit: fix dependencies of Lua modules

BR2_PACKAGE_LUA_SHARED_LIBRARY is an internal of lua package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cgilua/Config.in        | 1 -
 package/copas/Config.in         | 1 -
 package/luafilesystem/Config.in | 1 -
 package/luasocket/Config.in     | 1 -
 package/rings/Config.in         | 1 -
 package/xavante/Config.in       | 1 -
 6 files changed, 6 deletions(-)

diff --git a/package/cgilua/Config.in b/package/cgilua/Config.in
index 2f9c4528ac..01928f005b 100644
--- a/package/cgilua/Config.in
+++ b/package/cgilua/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_CGILUA
 	bool "cgilua"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
 	select BR2_PACKAGE_LUAFILESYSTEM
 	help
 	  CGILua is a tool for creating dynamic HTML pages
diff --git a/package/copas/Config.in b/package/copas/Config.in
index 36abcc19ca..9969c8f9a4 100644
--- a/package/copas/Config.in
+++ b/package/copas/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_COPAS
 	bool "copas"
 	select BR2_PACKAGE_COXPCALL
 	select BR2_PACKAGE_LUASOCKET
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY # for luasocket
 	help
 	  Copas is a dispatcher based on coroutines that
 	  can be used by TCP/IP servers.
diff --git a/package/luafilesystem/Config.in b/package/luafilesystem/Config.in
index edcb414a9a..7c130f8d3b 100644
--- a/package/luafilesystem/Config.in
+++ b/package/luafilesystem/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUAFILESYSTEM
 	bool "luafilesystem"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
 	help
 	  LuaFileSystem offers a portable way to access
 	  the underlying directory structure and file attributes.
diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in
index 298db56b0b..45263030f3 100644
--- a/package/luasocket/Config.in
+++ b/package/luasocket/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUASOCKET
 	bool "luasocket"
-	depends on BR2_PACKAGE_LUA_SHARED_LIBRARY
 	help
 	  LuaSocket is the most comprehensive networking support library
 	  for the Lua language.
diff --git a/package/rings/Config.in b/package/rings/Config.in
index 2fe14aa0ff..d1f1efe553 100644
--- a/package/rings/Config.in
+++ b/package/rings/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_RINGS
 	bool "rings"
-	depends on BR2_PACKAGE_LUA_SHARED_LIBRARY
 	help
 	  Provides a way to create new Lua states from within Lua.
 
diff --git a/package/xavante/Config.in b/package/xavante/Config.in
index a7df530217..db34d66ec1 100644
--- a/package/xavante/Config.in
+++ b/package/xavante/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XAVANTE
 	bool "xavante"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
 	select BR2_PACKAGE_CGILUA
 	select BR2_PACKAGE_COPAS
 	select BR2_PACKAGE_COXPCALL

From ad6af5819f88bac9ca7f50e565c4fc68d3e408cc Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 18 Jul 2012 15:59:12 +0200
Subject: [PATCH 2358/6849] lua: refactor without sed

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/lua.mk | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 1e52075599..8f71fc229f 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -8,8 +8,9 @@ LUA_VERSION = 5.1.5
 LUA_SITE = http://www.lua.org/ftp
 LUA_INSTALL_STAGING = YES
 
+LUA_CFLAGS = -Wall
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
-	LUA_MYCFLAGS += -fPIC
+	LUA_CFLAGS += -fPIC
 endif
 
 LUA_MYLIBS += -ldl
@@ -17,28 +18,25 @@ LUA_MYLIBS += -ldl
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
 	LUA_DEPENDENCIES = readline ncurses
 	LUA_MYLIBS += -lreadline -lhistory -lncurses
-	LUA_MYCFLAGS += -DLUA_USE_LINUX
+	LUA_CFLAGS += -DLUA_USE_LINUX
 else
-	LUA_MYCFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 endif
 
-HOST_LUA_DEPENDENCIES =
-HOST_LUA_MYCFLAGS = -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
+HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
 HOST_LUA_MYLIBS = -ldl
 
 define LUA_BUILD_CMDS
-	sed -i -e 's/-O2//' $(@D)/src/Makefile
 	$(MAKE) \
 	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
-	MYCFLAGS="$(TARGET_CFLAGS) $(LUA_MYCFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \
 	MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef
 
 define HOST_LUA_BUILD_CMDS
-	sed -i -e 's/-O2//' $(@D)/src/Makefile
 	$(MAKE) \
-	MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
+	CFLAGS="$(HOST_LUA_CFLAGS)" \
 	MYLIBS="$(HOST_LUA_MYLIBS)" \
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef

From 498ea22be27863c8eff99033384f9d268167a2b3 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 17 Apr 2012 05:05:40 +0000
Subject: [PATCH 2359/6849] sam-ba: only propose it if the host is x86 or
 x86_64

As sam-ba is delivered as a binary for x86

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/sam-ba/Config.in.host | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host
index f2ea01f2fe..20b2b36daa 100644
--- a/package/sam-ba/Config.in.host
+++ b/package/sam-ba/Config.in.host
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOST_SAM_BA
 	bool "host sam-ba"
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	help
 	  Atmel SAM-BA software provides an open set of tools for
 	  programming the Atmel SAM3, SAM7 and SAM9 ARM-based

From 0b3e06f239b9c12074f88bdfd3c95b3cad0e9f1e Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Thu, 19 Jul 2012 16:54:08 +0800
Subject: [PATCH 2360/6849] bwm-ng: move bwm-ng from "Networking applications"
 to "System tools".

bwm-ng can monitor not only network bandwidth but also disk-io
bandwidth, so it is more appropriate to put bwm-ng into System tools.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 6aabb8eada..154b82c64a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -511,7 +511,6 @@ endif
 source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
-source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
@@ -658,6 +657,7 @@ source "package/attr/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
+source "package/bwm-ng/Config.in"
 source "package/htop/Config.in"
 source "package/kmod/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

From 393829dae063896d6288c06787101341b706a63f Mon Sep 17 00:00:00 2001
From: gregory hermant <gregory.hermant@calao-systems.com>
Date: Thu, 19 Jul 2012 10:19:17 +0200
Subject: [PATCH 2361/6849] Add support for the Calao-systems USB-A9263

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../at91bootstrap-1.16-usb-a9263.patch        | 851 ++++++++++++++++++
 board/calao/usb-a9263/linux-3.4.4.config      | 102 +++
 configs/calao_usb_a9263_defconfig             |  14 +
 3 files changed, 967 insertions(+)
 create mode 100644 board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch
 create mode 100644 board/calao/usb-a9263/linux-3.4.4.config
 create mode 100644 configs/calao_usb_a9263_defconfig

diff --git a/board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch b/board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch
new file mode 100644
index 0000000000..579893050f
--- /dev/null
+++ b/board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch
@@ -0,0 +1,851 @@
+From 74796655212d321f50ab89e8c5570245901f4cba Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Thu, 5 Jul 2012 18:44:07 +0200
+Subject: [PATCH] Add support for the Calao-systems USB-A9263
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ board/usb_a9263/dataflash/Makefile    |  115 +++++++++++++
+ board/usb_a9263/dataflash/usb-a9263.h |   97 +++++++++++
+ board/usb_a9263/nandflash/Makefile    |  117 ++++++++++++++
+ board/usb_a9263/nandflash/usb-a9263.h |  116 +++++++++++++
+ board/usb_a9263/usb_a9263.c           |  285 +++++++++++++++++++++++++++++++++
+ crt0_gnu.S                            |    7 +
+ driver/dataflash.c                    |    6 +-
+ include/part.h                        |    6 +-
+ 8 files changed, 745 insertions(+), 4 deletions(-)
+ create mode 100644 board/usb_a9263/dataflash/Makefile
+ create mode 100644 board/usb_a9263/dataflash/usb-a9263.h
+ create mode 100644 board/usb_a9263/nandflash/Makefile
+ create mode 100644 board/usb_a9263/nandflash/usb-a9263.h
+ create mode 100644 board/usb_a9263/usb_a9263.c
+
+diff --git a/board/usb_a9263/dataflash/Makefile b/board/usb_a9263/dataflash/Makefile
+new file mode 100644
+index 0000000..332685e
+--- /dev/null
++++ b/board/usb_a9263/dataflash/Makefile
+@@ -0,0 +1,115 @@
++# TODO: set this appropriately for your local toolchain
++#SHELL=C:\CYGWIN_REP\dwn_071004\bin\BASH.exe
++CROSS_COMPILE=arm-elf-
++#CROSS_COMPILE = arm-softfloat-linux-gnu-
++
++TOOLCHAIN=gcc
++
++BOOTSTRAP_PATH=../../..
++
++# DataFlashBoot Configuration for USB-A9263
++
++# Target name (case sensitive!!!)
++TARGET=AT91SAM9263
++# Board name (case sensitive!!!)
++BOARD=usb_a9263
++# Link Address and Top_of_Memory
++LINK_ADDR=0x300000
++TOP_OF_MEMORY=0x314000
++# Name of current directory
++PROJECT=dataflash
++
++ifndef BOOT_NAME
++BOOT_NAME=$(PROJECT)_$(BOARD)
++endif
++
++INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
++
++ifeq ($(TOOLCHAIN), gcc)
++
++AS=$(CROSS_COMPILE)gcc
++CC=$(CROSS_COMPILE)gcc
++LD=$(CROSS_COMPILE)gcc
++NM= $(CROSS_COMPILE)nm
++SIZE=$(CROSS_COMPILE)size
++OBJCOPY=$(CROSS_COMPILE)objcopy
++OBJDUMP=$(CROSS_COMPILE)objdump
++CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
++ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
++
++# Linker flags.
++#  -Wl,...:     tell GCC to pass this to linker.
++#    -Map:      create map file
++#    --cref:    add cross reference to map file
++LDFLAGS+=-nostartfiles -nostdlib  -Wl,-Map=$(BOOT_NAME).map,--cref
++LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
++OBJS=crt0_gnu.o
++
++endif
++
++OBJS+=\
++	$(BOARD).o \
++	main.o \
++	gpio.o \
++	pmc.o \
++	debug.o \
++	sdramc.o \
++	dataflash.o \
++	_udivsi3.o \
++	_umodsi3.o \
++	div0.o \
++	udiv.o \
++	string.o
++
++rebuild: clean all
++
++all: 	$(BOOT_NAME)
++
++ifeq ($(TOOLCHAIN), gcc)
++$(BOOT_NAME): $(OBJS)
++	$(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
++	$(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
++endif
++	
++	
++$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
++
++main.o: $(BOOTSTRAP_PATH)/main.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
++
++gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
++
++pmc.o:  $(BOOTSTRAP_PATH)/driver/pmc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
++
++debug.o: $(BOOTSTRAP_PATH)/driver/debug.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
++
++sdramc.o:  $(BOOTSTRAP_PATH)/driver/sdramc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
++
++dataflash.o:  $(BOOTSTRAP_PATH)/driver/dataflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
++
++crt0_gnu.o:  $(BOOTSTRAP_PATH)/crt0_gnu.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
++
++div0.o:  $(BOOTSTRAP_PATH)/lib/div0.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
++
++string.o:  $(BOOTSTRAP_PATH)/lib/string.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
++
++udiv.o:  $(BOOTSTRAP_PATH)/lib/udiv.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
++
++_udivsi3.o:  $(BOOTSTRAP_PATH)/lib/_udivsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
++
++_umodsi3.o:  $(BOOTSTRAP_PATH)/lib/_umodsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
++
++clean:
++	rm -f *.o *.bin *.elf *.map
+diff --git a/board/usb_a9263/dataflash/usb-a9263.h b/board/usb_a9263/dataflash/usb-a9263.h
+new file mode 100644
+index 0000000..40a3af8
+--- /dev/null
++++ b/board/usb_a9263/dataflash/usb-a9263.h
+@@ -0,0 +1,97 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb-a9263.h
++ * Object              :
++ * Creation            : GH Jun 28th 2012
++ *-----------------------------------------------------------------------------
++ */
++#ifndef _USB_A9263_H
++#define _USB_A9263_H
++
++/* ******************************************************************* */
++/* PMC Settings                                                        */
++/*                                                                     */
++/* The main oscillator is enabled as soon as possible in the c_startup */
++/* and MCK is switched on the main oscillator.                         */
++/* PLL initialization is done later in the hw_init() function          */
++/* ******************************************************************* */
++#define MASTER_CLOCK		(180000000/2)
++#define PLL_LOCK_TIMEOUT	1000000
++
++#define PLLA_SETTINGS	0x20593F06
++#define PLLB_SETTINGS	0x10483F0E
++
++/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */
++#define MCKR_SETTINGS		(AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2)
++#define MCKR_CSS_SETTINGS	(AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
++
++/* ******************************************************************* */
++/* DataFlash Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_BASE_SPI	AT91C_BASE_SPI0
++#define AT91C_ID_SPI	AT91C_ID_SPI0
++
++/* SPI CLOCK */
++#define AT91C_SPI_CLK 		 8000000
++/* AC characteristics */
++/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */
++#define DATAFLASH_TCSS		(0x1a << 16)	/* 250ns min (tCSS) <=> 12/48000000 = 250ns */
++#define DATAFLASH_TCHS		(0x1 << 24)	/* 250ns min (tCSH) <=> (64*1+SCBR)/(2*48000000) */
++
++#define DF_CS_SETTINGS 		(AT91C_SPI_NCPHA | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) | ((MASTER_CLOCK / AT91C_SPI_CLK) << 8))
++
++/* ******************************************************************* */
++/* SDRAMC Settings                                                     */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_BASE_SDRAMC 	AT91C_BASE_SDRAMC0
++#define AT91C_EBI_SDRAM		AT91C_EBI0_SDRAM
++
++/* ******************************************************************* */
++/* BootStrap Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
++
++#define IMG_ADDRESS 			0x4000			/* Image Address in DataFlash */
++#define	IMG_SIZE			0x40000			/* Image Size in DataFlash    */
++
++#define MACH_TYPE       		0x6AE       		/* USB-A9263 */
++#define JUMP_ADDR			0x23F00000		/* Final Jump Address 	      */
++
++/* ******************************************************************* */
++/* Application Settings                                                */
++/* ******************************************************************* */
++#define CFG_HW_INIT
++#define CFG_SDRAM
++#undef	CFG_DEBUG
++
++#define CFG_DATAFLASH
++
++#endif	/* _USB_A9263_H */
+diff --git a/board/usb_a9263/nandflash/Makefile b/board/usb_a9263/nandflash/Makefile
+new file mode 100644
+index 0000000..c453098
+--- /dev/null
++++ b/board/usb_a9263/nandflash/Makefile
+@@ -0,0 +1,117 @@
++# TODO: set this appropriately for your local toolchain
++#SHELL=C:\CYGWIN_REP\dwn_071004\bin\BASH.exe
++CROSS_COMPILE=arm-elf-
++
++TOOLCHAIN=gcc
++
++BOOTSTRAP_PATH=../../..
++
++# NandFlashBoot Configuration for USB-A9263
++
++# Target name (case sensitive!!!)
++TARGET=AT91SAM9263
++# Board name (case sensitive!!!)
++BOARD=usb_a9263
++# Link Address and Top_of_Memory
++LINK_ADDR=0x300000
++TOP_OF_MEMORY=0x314000
++# Name of current directory
++PROJECT=nandflash
++
++ifndef BOOT_NAME
++BOOT_NAME=$(PROJECT)_$(BOARD)
++endif
++
++INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
++
++ifeq ($(TOOLCHAIN), gcc)
++
++AS=$(CROSS_COMPILE)gcc
++CC=$(CROSS_COMPILE)gcc
++LD=$(CROSS_COMPILE)gcc
++NM= $(CROSS_COMPILE)nm
++SIZE=$(CROSS_COMPILE)size
++OBJCOPY=$(CROSS_COMPILE)objcopy
++OBJDUMP=$(CROSS_COMPILE)objdump
++CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
++ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
++
++# Linker flags.
++#  -Wl,...:     tell GCC to pass this to linker.
++#    -Map:      create map file
++#    --cref:    add cross reference to map file
++LDFLAGS+=-nostartfiles -nostdlib  -Wl,-Map=$(BOOT_NAME).map,--cref
++LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
++OBJS=crt0_gnu.o
++
++endif
++
++OBJS+=\
++	$(BOARD).o \
++	main.o \
++	gpio.o \
++	pmc.o \
++	debug.o \
++	sdramc.o \
++	nandflash.o \
++	_udivsi3.o \
++	_umodsi3.o \
++	div0.o \
++	udiv.o \
++	string.o
++
++rebuild: clean all
++
++all: 	$(BOOT_NAME)
++
++ifeq ($(TOOLCHAIN), gcc)
++$(BOOT_NAME): $(OBJS)
++	$(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
++	$(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
++endif
++	
++	
++$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
++
++main.o: $(BOOTSTRAP_PATH)/main.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
++
++gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
++
++pmc.o:  $(BOOTSTRAP_PATH)/driver/pmc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
++
++debug.o: $(BOOTSTRAP_PATH)/driver/debug.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
++
++sdramc.o:  $(BOOTSTRAP_PATH)/driver/sdramc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
++
++dataflash.o:  $(BOOTSTRAP_PATH)/driver/dataflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
++
++nandflash.o:  $(BOOTSTRAP_PATH)/driver/nandflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o
++
++crt0_gnu.o:  $(BOOTSTRAP_PATH)/crt0_gnu.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
++
++div0.o:  $(BOOTSTRAP_PATH)/lib/div0.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
++
++string.o:  $(BOOTSTRAP_PATH)/lib/string.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
++
++udiv.o:  $(BOOTSTRAP_PATH)/lib/udiv.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
++
++_udivsi3.o:  $(BOOTSTRAP_PATH)/lib/_udivsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
++
++_umodsi3.o:  $(BOOTSTRAP_PATH)/lib/_umodsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
++
++clean:
++	rm -f *.o *.bin *.elf *.map
+diff --git a/board/usb_a9263/nandflash/usb-a9263.h b/board/usb_a9263/nandflash/usb-a9263.h
+new file mode 100644
+index 0000000..24e2cf1
+--- /dev/null
++++ b/board/usb_a9263/nandflash/usb-a9263.h
+@@ -0,0 +1,116 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb-a9263.h
++ * Object              :
++ * Creation            : GH Jun 28th 2012
++ *-----------------------------------------------------------------------------
++ */
++#ifndef _USB_A9263_H
++#define _USB_A9263_H
++
++/* ******************************************************************* */
++/* PMC Settings                                                        */
++/*                                                                     */
++/* The main oscillator is enabled as soon as possible in the c_startup */
++/* and MCK is switched on the main oscillator.                         */
++/* PLL initialization is done later in the hw_init() function          */
++/* ******************************************************************* */
++#define MASTER_CLOCK		(180000000/2)
++#define PLL_LOCK_TIMEOUT	1000000
++
++#define PLLA_SETTINGS	0x20593F06
++#define PLLB_SETTINGS	0x10483F0E
++
++/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */
++#define MCKR_SETTINGS		(AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2)
++#define MCKR_CSS_SETTINGS	(AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
++
++/* ******************************************************************* */
++/* NandFlash Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_SMARTMEDIA_BASE	0x40000000
++
++#define AT91_SMART_MEDIA_ALE    (1 << 21)	/* our ALE is AD21 */
++#define AT91_SMART_MEDIA_CLE    (1 << 22)	/* our CLE is AD22 */
++
++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOD_SODR = AT91C_PIO_PD15;} while(0)
++#define NAND_ENABLE_CE()  do { *(volatile unsigned int *)AT91C_PIOD_CODR = AT91C_PIO_PD15;} while(0)
++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOA_PDSR & AT91C_PIO_PA22))
++
++/* ******************************************************************* */
++/* SDRAMC Settings                                                     */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_BASE_SDRAMC 	AT91C_BASE_SDRAMC0
++#define AT91C_EBI_SDRAM		AT91C_EBI0_SDRAM
++
++/* ******************************************************************** */
++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000. */
++/* Please refer to SMC section in AT91SAM9x datasheet to learn how 	*/
++/* to generate these values. 						*/
++/* ******************************************************************** */
++#define AT91C_SM_NWE_SETUP	(1 << 0)
++#define AT91C_SM_NCS_WR_SETUP	(0 << 8)
++#define AT91C_SM_NRD_SETUP	(1 << 16)
++#define AT91C_SM_NCS_RD_SETUP	(0 << 24)
++  
++#define AT91C_SM_NWE_PULSE 	(3 << 0)
++#define AT91C_SM_NCS_WR_PULSE	(3 << 8)
++#define AT91C_SM_NRD_PULSE	(3 << 16)
++#define AT91C_SM_NCS_RD_PULSE	(3 << 24)
++  
++#define AT91C_SM_NWE_CYCLE 	(5 << 0)
++#define AT91C_SM_NRD_CYCLE	(5 << 16)
++
++#define AT91C_SM_TDF	        (2 << 16)
++
++/* ******************************************************************* */
++/* BootStrap Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define IMG_ADDRESS 	0x20000		/* Image Address in NandFlash */
++#define	IMG_SIZE	0x40000		/* Image Size in NandFlash    */
++
++#define MACH_TYPE       0x6AE  		/* USB-A9263 */
++#define JUMP_ADDR	0x23F00000	/* Final Jump Address 	      */
++
++/* ******************************************************************* */
++/* Application Settings                                                */
++/* ******************************************************************* */
++#undef CFG_DEBUG
++#undef CFG_DATAFLASH
++
++#define CFG_NANDFLASH
++#undef	NANDFLASH_SMALL_BLOCKS	/* NANDFLASH_LARGE_BLOCKS used instead */
++
++#define CFG_HW_INIT
++#define CFG_SDRAM
++
++
++#endif	/* _USB_A9263_H */
+diff --git a/board/usb_a9263/usb_a9263.c b/board/usb_a9263/usb_a9263.c
+new file mode 100644
+index 0000000..5630f99
+--- /dev/null
++++ b/board/usb_a9263/usb_a9263.c
+@@ -0,0 +1,285 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaiimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb_a9263.c
++ * Object              :
++ * Creation            : GH Jun 28th 2012
++ *-----------------------------------------------------------------------------
++ */
++#include "../../include/part.h"
++#include "../../include/gpio.h"
++#include "../../include/pmc.h"
++#include "../../include/debug.h"
++#include "../../include/sdramc.h"
++#include "../../include/main.h"
++#ifdef CFG_NANDFLASH
++#include "../../include/nandflash.h"
++#endif
++#ifdef CFG_DATAFLASH
++#include "../../include/dataflash.h"
++#endif
++
++static inline unsigned int get_cp15(void)
++{
++	unsigned int value;
++	__asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value));
++	return value;
++}
++
++static inline void set_cp15(unsigned int value)
++{
++	__asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value));
++}
++
++
++#ifdef CFG_HW_INIT
++/*---------------------------------------------------------------------------- */
++/* \fn    hw_init							       */
++/* \brief This function performs very low level HW initialization	       */
++/* This function is invoked as soon as possible during the c_startup	       */
++/* The bss segment must be initialized					       */
++/*---------------------------------------------------------------------------- */
++void hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc hw_pio[] = {
++#ifdef CFG_DEBUG
++		{"RXD", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"TXD", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Disable watchdog */
++	writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR);
++
++	/* At this stage the main oscillator is supposed to be enabled
++	 * PCK = MCK = MOSC */
++
++	/* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
++	pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* PCK = PLLA = 2 * MCK */
++	pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT);
++	/* Switch MCK on PLLA output */
++	pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT);
++
++
++	/* Configure PLLB */
++	pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure the PIO controller to output PCK0 */
++	pio_setup(hw_pio);
++
++	/* Configure the EBI0 Slave Slot Cycle to 64 */
++	writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG4)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG4));
++
++#ifdef CFG_DEBUG
++	/* Enable Debug messages on the DBGU */
++	dbg_init(BAUDRATE(MASTER_CLOCK, 115200));
++	dbg_print("Start AT91Bootstrap...\n\r");
++#endif /* CFG_DEBUG */
++
++#ifdef CFG_SDRAM
++	/* Initialize the matrix */
++	/* VDDIOMSEL = 1 -> Memories are 3.3V powered */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBI0CSA) | (1 << 16) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBI0CSA);
++
++	/* Configure SDRAM Controller */
++	sdram_init(	AT91C_SDRAMC_NC_9  |
++				AT91C_SDRAMC_NR_13 |
++				AT91C_SDRAMC_CAS_2 |
++				AT91C_SDRAMC_NB_4_BANKS |
++				AT91C_SDRAMC_DBW_32_BITS |
++				AT91C_SDRAMC_TWR_2 |
++				AT91C_SDRAMC_TRC_7 |
++				AT91C_SDRAMC_TRP_2 |
++				AT91C_SDRAMC_TRCD_2 |
++				AT91C_SDRAMC_TRAS_5 |
++				AT91C_SDRAMC_TXSR_8,		/* Control Register       */
++				(MASTER_CLOCK * 7)/1000000,	/* Refresh Timer Register */
++				AT91C_SDRAMC_MD_SDRAM);		/* SDRAM (no low power)   */ 
++#endif	/* CFG_SDRAM */
++}
++#endif /* CFG_HW_INIT */
++
++
++#ifdef CFG_SDRAM
++//*----------------------------------------------------------------------------
++//* \fn    sdramc_hw_init
++//* \brief This function performs SDRAMC HW initialization
++//*----------------------------------------------------------------------------*/
++void sdramc_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc sdramc_pio[] = {
++		{"D16", AT91C_PIN_PD(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D17", AT91C_PIN_PD(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D18", AT91C_PIN_PD(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D19", AT91C_PIN_PD(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D20", AT91C_PIN_PD(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D21", AT91C_PIN_PD(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D22", AT91C_PIN_PD(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D23", AT91C_PIN_PD(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D24", AT91C_PIN_PD(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D25", AT91C_PIN_PD(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D26", AT91C_PIN_PD(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D27", AT91C_PIN_PD(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D28", AT91C_PIN_PD(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D29", AT91C_PIN_PD(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D30", AT91C_PIN_PD(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D31", AT91C_PIN_PD(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the SDRAMC PIO controller */
++	pio_setup(sdramc_pio);
++}
++#endif
++
++#ifdef CFG_DATAFLASH
++/*------------------------------------------------------------------------------*/
++/* \fn    df_recovery								*/
++/* \brief This function erases DataFlash Page 0 if USER PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++void df_recovery(AT91PS_DF pDf)
++{
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
++	/* Configure PIOs */
++	const struct pio_desc usrpb_pio[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb_pio);
++	
++	/* If USER PB is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if ( !pio_get_value(AT91C_PIN_PB(10)) )
++		df_page_erase(pDf, 0);
++#endif
++}
++/*------------------------------------------------------------------------------*/
++/* \fn    df_hw_init								*/
++/* \brief This function performs DataFlash HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void df_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc df_pio[] = {
++		{"MISO",  AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_B},
++		{"MOSI",  AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_B},
++		{"SPCK",  AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_B},
++		{"NPCS0", AT91C_PIN_PA(5), 0, PIO_DEFAULT, PIO_PERIPH_B},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	pio_setup(df_pio);
++}
++#endif /* CFG_DATAFLASH */
++
++
++#ifdef CFG_NANDFLASH
++/*------------------------------------------------------------------------------*/
++/* \fn    nand_recovery								*/
++/* \brief This function erases NandFlash Block 0 if USER PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++static void nand_recovery(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc usrpb_pio[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb_pio);
++	
++	/* If USER PB is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if (!pio_get_value(AT91C_PIN_PB(10)) )
++		AT91F_NandEraseBlock0();
++}
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_hw_init							*/
++/* \brief NandFlash HW init							*/
++/*------------------------------------------------------------------------------*/
++void nandflash_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc nand_pio[] = {
++		{"RDY_BSY", AT91C_PIN_PA(22), 0, PIO_PULLUP, PIO_INPUT},
++		{"NANDCS",  AT91C_PIN_PD(15), 0, PIO_PULLUP, PIO_OUTPUT},
++		{(char *) 0, 0, 0,  PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBI0CSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBI0CSA);
++		    
++	/* Configure SMC CS3 */
++ 	writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC0 + SMC_SETUP3);
++  	writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC0 + SMC_PULSE3);
++	writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE)						, AT91C_BASE_SMC0 + SMC_CYCLE3);
++	writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | 
++  		AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF)						, AT91C_BASE_SMC0 + SMC_CTRL3);
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOA), PMC_PCER + AT91C_BASE_PMC);
++	writel((1 << AT91C_ID_PIOCDE), PMC_PCER + AT91C_BASE_PMC);
++
++	pio_setup(nand_pio);
++
++	nand_recovery();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_16bits_dbw_init						*/
++/* \brief Configure SMC in 16 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_16bits_dbw_init(void)
++{
++	writel(readl(AT91C_BASE_SMC0 + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC0 + SMC_CTRL3);
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_8bits_dbw_init						*/
++/* \brief Configure SMC in 8 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_8bits_dbw_init(void)
++{
++	writel((readl(AT91C_BASE_SMC0 + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC0 + SMC_CTRL3);
++}
++
++#endif /* #ifdef CFG_NANDFLASH */
++
++
+diff --git a/crt0_gnu.S b/crt0_gnu.S
+index 042b617..002feef 100644
+--- a/crt0_gnu.S
++++ b/crt0_gnu.S
+@@ -106,6 +106,13 @@ _relocate_to_sram:
+ #endif /* CFG_NORFLASH */
+ 
+ _setup_clocks:
++/* Test if main osc is bypassed */
++	ldr 	r0,=AT91C_PMC_MOR
++	ldr 	r1, [r0]
++	ldr 	r2,=AT91C_CKGR_OSCBYPASS 
++	ands 	r1, r1, r2
++	bne	_init_data	/* branch if OSCBYPASS=1 */
++
+ /* Test if main oscillator is enabled */
+ 	ldr 	r0,=AT91C_PMC_SR
+ 	ldr 	r1, [r0]
+diff --git a/driver/dataflash.c b/driver/dataflash.c
+index e28e49e..4de295a 100644
+--- a/driver/dataflash.c
++++ b/driver/dataflash.c
+@@ -293,14 +293,14 @@ static int df_init (AT91PS_DF pDf)
+ 			pDf->dfDescription.pages_size = 264;
+ 			pDf->dfDescription.page_offset = 9;
+ 			break;
+-
++*/
+ 		case AT45DB021B:
+ 			pDf->dfDescription.pages_number = 1024;
+ 			pDf->dfDescription.pages_size = 264;
+ 			pDf->dfDescription.page_offset = 9;
+ 			break;
+ 
+-		case AT45DB041B:
++/*		case AT45DB041B:
+ 			pDf->dfDescription.pages_number = 2048;
+ 			pDf->dfDescription.pages_size = 264;
+ 			pDf->dfDescription.page_offset = 9;
+@@ -373,7 +373,7 @@ int load_df(unsigned int pcs, unsigned int img_addr, unsigned int img_size, unsi
+     if (!df_init(pDf))
+         return -1;
+ 
+-#if defined(AT91SAM9260) || defined(AT91SAM9XE) || defined(AT91SAM9G20)
++#if defined(AT91SAM9260) || defined(AT91SAM9263) || defined(AT91SAM9XE) || defined(AT91SAM9G20)
+     /* Test if a button has been pressed or not */
+     /* Erase Page 0 to avoid infinite loop */
+     df_recovery(pDf);
+diff --git a/include/part.h b/include/part.h
+index ba5985a..a1863d0 100644
+--- a/include/part.h
++++ b/include/part.h
+@@ -61,7 +61,11 @@
+ 
+ #ifdef AT91SAM9263
+ #include "AT91SAM9263_inc.h"
+-#include "at91sam9263ek.h"
++	#ifdef at91sam9263ek
++	#include "at91sam9263ek.h"
++	#elif usb_a9263
++	#include "usb-a9263.h"
++	#endif
+ #endif
+ 
+ #ifdef AT91CAP9
+-- 
+1.5.6.3
+
diff --git a/board/calao/usb-a9263/linux-3.4.4.config b/board/calao/usb-a9263/linux-3.4.4.config
new file mode 100644
index 0000000000..8c71231f38
--- /dev/null
+++ b/board/calao/usb-a9263/linux-3.4.4.config
@@ -0,0 +1,102 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_ARCH_AT91SAM9263=y
+CONFIG_MACH_USB_A9263=y
+CONFIG_AT91_SLOW_CLOCK=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200"
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+# CONFIG_HWMON is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_EXT2_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
diff --git a/configs/calao_usb_a9263_defconfig b/configs/calao_usb_a9263_defconfig
new file mode 100644
index 0000000000..6612d2c959
--- /dev/null
+++ b/configs/calao_usb_a9263_defconfig
@@ -0,0 +1,14 @@
+BR2_arm=y
+BR2_arm926t=y
+BR2_JLEVEL=2
+BR2_PACKAGE_HOST_SAM_BA=y
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9263/"
+BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9263"
+BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9263"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9263/linux-3.4.4.config"

From 9dbea60df834372d4586ab9fa74d68ccf5ad57a3 Mon Sep 17 00:00:00 2001
From: gregory hermant <gregory.hermant@calao-systems.com>
Date: Thu, 19 Jul 2012 11:38:09 +0200
Subject: [PATCH 2362/6849] Add support for the Calao-systems USB-A9G20-LPW

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../at91bootstrap-1.16-usb-a9g20-lpw.patch    | 610 ++++++++++++++++++
 .../barebox-2012.07.0-usb-a9g20-lpw.patch     |  12 +
 board/calao/usb-a9g20-lpw/linux-3.4.4.config  | 105 +++
 configs/calao_usb_a9g20_lpw_defconfig         |  15 +
 4 files changed, 742 insertions(+)
 create mode 100644 board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch
 create mode 100644 board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch
 create mode 100644 board/calao/usb-a9g20-lpw/linux-3.4.4.config
 create mode 100644 configs/calao_usb_a9g20_lpw_defconfig

diff --git a/board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch
new file mode 100644
index 0000000000..06a89edd6b
--- /dev/null
+++ b/board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch
@@ -0,0 +1,610 @@
+From 8d84757d5170969e8bdfebc7951f43c5aa2b05fd Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Fri, 6 Jul 2012 16:32:47 +0200
+Subject: [PATCH] Add support for the Calao-systems USB-A9G20-LPW
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ board/usb_a9g20_lpw/nandflash/Makefile        |  121 ++++++++++
+ board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h |  112 +++++++++
+ board/usb_a9g20_lpw/usb_a9g20_lpw.c           |  303 +++++++++++++++++++++++++
+ crt0_gnu.S                                    |    7 +
+ include/part.h                                |    6 +-
+ 5 files changed, 548 insertions(+), 1 deletions(-)
+ create mode 100644 board/usb_a9g20_lpw/nandflash/Makefile
+ create mode 100644 board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h
+ create mode 100644 board/usb_a9g20_lpw/usb_a9g20_lpw.c
+
+diff --git a/board/usb_a9g20_lpw/nandflash/Makefile b/board/usb_a9g20_lpw/nandflash/Makefile
+new file mode 100644
+index 0000000..8c9d99a
+--- /dev/null
++++ b/board/usb_a9g20_lpw/nandflash/Makefile
+@@ -0,0 +1,121 @@
++# TODO: set this appropriately for your local toolchain
++ifndef ERASE_FCT
++ERASE_FCT=rm -f
++endif
++ifndef CROSS_COMPILE
++CROSS_COMPILE=arm-elf-
++endif
++
++TOOLCHAIN=gcc
++
++BOOTSTRAP_PATH=../../..
++
++# NandFlashBoot Configuration for USB-A9G20-LPW
++
++# Target name (case sensitive!!!)
++TARGET=AT91SAM9G20
++# Board name (case sensitive!!!)
++BOARD=usb_a9g20_lpw
++# Link Address and Top_of_Memory
++LINK_ADDR=0x200000
++TOP_OF_MEMORY=0x301000
++# Name of current directory
++PROJECT=nandflash
++
++ifndef BOOT_NAME
++BOOT_NAME=$(PROJECT)_$(BOARD)
++endif
++
++INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
++
++ifeq ($(TOOLCHAIN), gcc)
++
++AS=$(CROSS_COMPILE)gcc
++CC=$(CROSS_COMPILE)gcc
++LD=$(CROSS_COMPILE)gcc
++NM= $(CROSS_COMPILE)nm
++SIZE=$(CROSS_COMPILE)size
++OBJCOPY=$(CROSS_COMPILE)objcopy
++OBJDUMP=$(CROSS_COMPILE)objdump
++CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
++ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
++
++# Linker flags.
++#  -Wl,...:     tell GCC to pass this to linker.
++#    -Map:      create map file
++#    --cref:    add cross reference to map file
++LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref
++LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
++OBJS=crt0_gnu.o
++
++endif
++
++OBJS+=\
++	$(BOARD).o \
++	main.o \
++	gpio.o \
++	pmc.o \
++	debug.o \
++	sdramc.o \
++	nandflash.o \
++	_udivsi3.o \
++	_umodsi3.o \
++	div0.o \
++	udiv.o \
++	string.o
++
++rebuild: clean all
++
++all: 	$(BOOT_NAME)
++
++ifeq ($(TOOLCHAIN), gcc)
++$(BOOT_NAME): $(OBJS)
++	$(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
++	$(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
++endif
++
++
++$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
++
++main.o: $(BOOTSTRAP_PATH)/main.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
++
++gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
++
++pmc.o:  $(BOOTSTRAP_PATH)/driver/pmc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
++
++debug.o: $(BOOTSTRAP_PATH)/driver/debug.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
++
++sdramc.o:  $(BOOTSTRAP_PATH)/driver/sdramc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
++
++dataflash.o:  $(BOOTSTRAP_PATH)/driver/dataflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
++
++nandflash.o:  $(BOOTSTRAP_PATH)/driver/nandflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o
++
++crt0_gnu.o:  $(BOOTSTRAP_PATH)/crt0_gnu.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
++
++div0.o:  $(BOOTSTRAP_PATH)/lib/div0.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
++
++string.o:  $(BOOTSTRAP_PATH)/lib/string.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
++
++udiv.o:  $(BOOTSTRAP_PATH)/lib/udiv.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
++
++_udivsi3.o:  $(BOOTSTRAP_PATH)/lib/_udivsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
++
++_umodsi3.o:  $(BOOTSTRAP_PATH)/lib/_umodsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
++
++clean:
++	$(ERASE_FCT) *.o *.bin *.elf *.map
+diff --git a/board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h b/board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h
+new file mode 100644
+index 0000000..c0bdc6e
+--- /dev/null
++++ b/board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h
+@@ -0,0 +1,112 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2008, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb-a9g20-lpw.h
++ * Object              :
++ * Creation            : GH July 6th 2012
++ *-----------------------------------------------------------------------------
++ */
++#ifndef _USB_A9G20_LPW_H
++#define _USB_A9G20_LPW_H
++
++/* ******************************************************************* */
++/* PMC Settings                                                        */
++/*                                                                     */
++/* The main oscillator is enabled as soon as possible in the c_startup */
++/* and MCK is switched on the main oscillator.                         */
++/* PLL initialization is done later in the hw_init() function          */
++/* ******************************************************************* */
++#define MASTER_CLOCK		(133000000)
++#define PLL_LOCK_TIMEOUT	1000000
++
++/* Set PLLA to 798Mhz */
++#define PLLA_SETTINGS	0x20843F02
++#define PLLB_SETTINGS	0x100F3F02
++
++/* Switch MCK on PLLA output PCK = PLLA/2 = 3 * MCK */
++#define MCKR_SETTINGS		0x1300
++#define MCKR_CSS_SETTINGS	(AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
++
++/* ******************************************************************* */
++/* NandFlash Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_SMARTMEDIA_BASE	0x40000000
++
++#define AT91_SMART_MEDIA_ALE    (1 << 21)	/* our ALE is AD21 */
++#define AT91_SMART_MEDIA_CLE    (1 << 22)	/* our CLE is AD22 */
++
++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0)
++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0)
++
++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13))
++
++
++/* ******************************************************************** */
++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 133000000.*/
++/* Please refer to SMC section in AT91SAM9 datasheet to learn how 	*/
++/* to generate these values. 						*/
++/* ******************************************************************** */
++#define AT91C_SM_NWE_SETUP	(2 << 0)
++#define AT91C_SM_NCS_WR_SETUP	(0 << 8)
++#define AT91C_SM_NRD_SETUP	(2 << 16)
++#define AT91C_SM_NCS_RD_SETUP	(0 << 24)
++  
++#define AT91C_SM_NWE_PULSE 	(4 << 0)
++#define AT91C_SM_NCS_WR_PULSE	(4 << 8)
++#define AT91C_SM_NRD_PULSE	(4 << 16)
++#define AT91C_SM_NCS_RD_PULSE	(4 << 24)
++  
++#define AT91C_SM_NWE_CYCLE 	(7 << 0)
++#define AT91C_SM_NRD_CYCLE	(7 << 16)
++
++#define AT91C_SM_TDF	        (3 << 16)
++
++/* ******************************************************************* */
++/* BootStrap Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define IMG_ADDRESS 		0x20000			/* Image Address in NandFlash */
++#define	IMG_SIZE		0x40000			/* Image Size in NandFlash */
++
++#define MACH_TYPE		0x731			/* USB-A9G20 */
++#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
++
++/* ******************************************************************* */
++/* Application Settings                                                */
++/* ******************************************************************* */
++#undef CFG_DEBUG
++#undef CFG_DATAFLASH
++
++#define CFG_NANDFLASH
++#undef	NANDFLASH_SMALL_BLOCKS	/* NANDFLASH_LARGE_BLOCKS used instead */
++#undef  CFG_NANDFLASH_RECOVERY
++
++#define	CFG_SDRAM
++#define	CFG_HW_INIT
++
++#endif	/* _USB_A9G20_LPW_H */
+diff --git a/board/usb_a9g20_lpw/usb_a9g20_lpw.c b/board/usb_a9g20_lpw/usb_a9g20_lpw.c
+new file mode 100644
+index 0000000..c372307
+--- /dev/null
++++ b/board/usb_a9g20_lpw/usb_a9g20_lpw.c
+@@ -0,0 +1,303 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2008, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb_a9g20_lpw.c
++ * Object              :
++ * Creation            : GH July 6th 2012
++ *-----------------------------------------------------------------------------
++ */
++#include "../../include/part.h"
++#include "../../include/gpio.h"
++#include "../../include/pmc.h"
++#include "../../include/debug.h"
++#include "../../include/sdramc.h"
++#include "../../include/main.h"
++#ifdef CFG_NANDFLASH
++#include "../../include/nandflash.h"
++#endif
++#ifdef CFG_DATAFLASH
++#include "../../include/dataflash.h"
++#endif
++
++static inline unsigned int get_cp15(void)
++{
++	unsigned int value;
++	__asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value));
++	return value;
++}
++
++static inline void set_cp15(unsigned int value)
++{
++	__asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value));
++}
++
++#ifdef CFG_HW_INIT
++/*----------------------------------------------------------------------------*/
++/* \fn    hw_init							      */
++/* \brief This function performs very low level HW initialization	      */
++/* This function is invoked as soon as possible during the c_startup	      */
++/* The bss segment must be initialized					      */
++/*----------------------------------------------------------------------------*/
++void hw_init(void)
++{
++	unsigned int cp15;
++	
++	/* Configure PIOs */
++	const struct pio_desc hw_pio[] = {
++#ifdef CFG_DEBUG
++		{"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Disable watchdog */
++	writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR);
++
++	/* At this stage the main oscillator is supposed to be enabled
++	 * PCK = MCK = MOSC */
++	writel(0x00, AT91C_BASE_PMC + PMC_PLLICPR);
++
++	/* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
++	pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* PCK = PLLA/2 = 3 * MCK */
++	pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT);
++	/* Switch MCK on PLLA output */
++	pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure PLLB */
++	pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure CP15 */
++	cp15 = get_cp15();
++	cp15 |= I_CACHE;
++	set_cp15(cp15);
++
++	/* Configure the PIO controller */
++	pio_setup(hw_pio);
++
++	/* Configure the EBI Slave Slot Cycle to 64 */
++	writel((readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3));
++
++#ifdef CFG_DEBUG
++	/* Enable Debug messages on the DBGU */
++	dbg_init(BAUDRATE(MASTER_CLOCK, 115200));
++
++	dbg_print("Start AT91Bootstrap...\n\r");
++#endif /* CFG_DEBUG */
++
++#ifdef CFG_SDRAM
++	/* Initialize the matrix (VDDIOSEL=0: memory voltage = 1.8V ) */
++	writel((readl(AT91C_BASE_CCFG + CCFG_EBICSA) & ~0x00010000) | AT91C_EBI_CS1A_SDRAMC , AT91C_BASE_CCFG + CCFG_EBICSA);
++
++	/* Configure SDRAM Controller */
++	sdram_init(	AT91C_SDRAMC_NC_9  |
++				AT91C_SDRAMC_NR_13 |
++				AT91C_SDRAMC_CAS_3 |
++				AT91C_SDRAMC_NB_4_BANKS |
++				AT91C_SDRAMC_DBW_32_BITS |
++				AT91C_SDRAMC_TWR_3 |
++				AT91C_SDRAMC_TRC_9 |
++				AT91C_SDRAMC_TRP_3 |
++				AT91C_SDRAMC_TRCD_3 |
++				AT91C_SDRAMC_TRAS_6 |
++				AT91C_SDRAMC_TXSR_10,		/* Control Register */
++				(MASTER_CLOCK * 7)/1000000,	/* Refresh Timer Register */
++                                AT91C_SDRAMC_MD_SDRAM);         /* SDRAM (no low power)   */
++
++#endif /* CFG_SDRAM */
++}
++#endif /* CFG_HW_INIT */
++
++#ifdef CFG_SDRAM
++/*------------------------------------------------------------------------------*/
++/* \fn    sdramc_hw_init							*/
++/* \brief This function performs SDRAMC HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void sdramc_hw_init(void)
++{
++	/* Configure PIOs */
++/*	const struct pio_desc sdramc_pio[] = {
++		{"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++*/
++	/* Configure the SDRAMC PIO controller to output PCK0 */
++/*	pio_setup(sdramc_pio); */
++
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0));
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0));
++
++}
++#endif /* CFG_SDRAM */
++
++#ifdef CFG_DATAFLASH
++
++/*------------------------------------------------------------------------------*/
++/* \fn    df_recovery								*/
++/* \brief This function erases DataFlash Page 0 if USR PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++void df_recovery(AT91PS_DF pDf)
++{
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS1_DATAFLASH)
++	/* Configure PIOs */
++	const struct pio_desc usrpb[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb);
++	
++	/* If USR PB is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if ( !pio_get_value(AT91C_PIN_PB(10)) )
++		df_page_erase(pDf, 0);
++#endif
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    df_hw_init								*/
++/* \brief This function performs DataFlash HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void df_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc df_pio[] = {
++		{"MISO",  AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"MOSI",  AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"SPCK",  AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
++		{"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS1_DATAFLASH)
++		{"NPCS1", AT91C_PIN_PC(11), 0, PIO_DEFAULT, PIO_PERIPH_B},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	pio_setup(df_pio);
++}
++#endif /* CFG_DATAFLASH */
++
++
++
++#ifdef CFG_NANDFLASH
++/*------------------------------------------------------------------------------*/
++/* \fn    nand_recovery						*/
++/* \brief This function erases NandFlash Block 0 if USER PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++#ifdef CFG_NANDFLASH_RECOVERY
++static void nand_recovery(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc usrpb[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb);
++	
++	/* If USER PB is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if (!pio_get_value(AT91C_PIN_PB(10)) )
++		AT91F_NandEraseBlock0();
++}
++#else
++static void nand_recovery(void) {}
++#endif
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_hw_init							*/
++/* \brief NandFlash HW init							*/
++/*------------------------------------------------------------------------------*/
++void nandflash_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc nand_pio[] = {
++		{"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT},
++		{"NANDCS",  AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT},
++		{(char *) 0, 0, 0,  PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA);
++		    
++	/* Configure SMC CS3 */
++ 	writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3);
++  	writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3);
++	writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE)						, AT91C_BASE_SMC + SMC_CYCLE3);
++	writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | 
++  		AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF)						, AT91C_BASE_SMC + SMC_CTRL3);
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(nand_pio);
++	
++	nand_recovery();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_16bits_dbw_init						*/
++/* \brief Configure SMC in 16 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_16bits_dbw_init(void)
++{
++	writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_8bits_dbw_init						*/
++/* \brief Configure SMC in 8 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_8bits_dbw_init(void)
++{
++	writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++#endif /* #ifdef CFG_NANDFLASH */
+diff --git a/crt0_gnu.S b/crt0_gnu.S
+index 042b617..002feef 100644
+--- a/crt0_gnu.S
++++ b/crt0_gnu.S
+@@ -106,6 +106,13 @@ _relocate_to_sram:
+ #endif /* CFG_NORFLASH */
+ 
+ _setup_clocks:
++/* Test if main osc is bypassed */
++	ldr 	r0,=AT91C_PMC_MOR
++	ldr 	r1, [r0]
++	ldr 	r2,=AT91C_CKGR_OSCBYPASS 
++	ands 	r1, r1, r2
++	bne	_init_data	/* branch if OSCBYPASS=1 */
++
+ /* Test if main oscillator is enabled */
+ 	ldr 	r0,=AT91C_PMC_SR
+ 	ldr 	r1, [r0]
+diff --git a/include/part.h b/include/part.h
+index ba5985a..1d7392a 100644
+--- a/include/part.h
++++ b/include/part.h
+@@ -46,7 +46,11 @@
+ 
+ #ifdef AT91SAM9G20
+ #include "AT91SAM9260_inc.h"
+-#include "at91sam9g20ek.h"
++	#ifdef at91sam9g20ek
++	#include "at91sam9g20ek.h"
++	#elif usb_a9g20_lpw
++	#include "usb-a9g20-lpw.h"
++	#endif
+ #endif
+ 
+ #ifdef AT91SAM9261
+-- 
+1.5.6.3
+
diff --git a/board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch
new file mode 100644
index 0000000000..cea8bb8c0a
--- /dev/null
+++ b/board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/configs/usb_a9g20_defconfig b/arch/arm/configs/usb_a9g20_defconfig
+index 30bf380..7716e0e 100644
+--- a/arch/arm/configs/usb_a9g20_defconfig
++++ b/arch/arm/configs/usb_a9g20_defconfig
+@@ -15,6 +15,7 @@ CONFIG_HUSH_FANCY_PROMPT=y
+ CONFIG_CMDLINE_EDITING=y
+ CONFIG_AUTO_COMPLETE=y
+ CONFIG_MENU=y
++# CONFIG_ERRNO_MESSAGES is not set
+ # CONFIG_CONSOLE_ACTIVATE_FIRST is not set
+ CONFIG_CONSOLE_ACTIVATE_ALL=y
+ CONFIG_PARTITION=y
diff --git a/board/calao/usb-a9g20-lpw/linux-3.4.4.config b/board/calao/usb-a9g20-lpw/linux-3.4.4.config
new file mode 100644
index 0000000000..56eb04bd73
--- /dev/null
+++ b/board/calao/usb-a9g20-lpw/linux-3.4.4.config
@@ -0,0 +1,105 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_ARCH_AT91SAM9G20=y
+CONFIG_MACH_USB_A9G20=y
+CONFIG_AT91_SLOW_CLOCK=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200"
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_GPIO=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+# CONFIG_HWMON is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_RV3029C2=y
+CONFIG_EXT2_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
diff --git a/configs/calao_usb_a9g20_lpw_defconfig b/configs/calao_usb_a9g20_lpw_defconfig
new file mode 100644
index 0000000000..580972a31d
--- /dev/null
+++ b/configs/calao_usb_a9g20_lpw_defconfig
@@ -0,0 +1,15 @@
+BR2_arm=y
+BR2_arm926t=y
+BR2_JLEVEL=2
+BR2_PACKAGE_HOST_SAM_BA=y
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
+BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9g20_lpw"
+BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9g20-lpw/linux-3.4.4.config"

From 6d38cf852248764b633750d210f71cac983ec451 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 18 Jul 2012 18:10:25 +0100
Subject: [PATCH 2363/6849] libfreefare: bump version to 0.3.4

This patch bumps the libfreefare package from version 0.3.2 to version 0.3.4.

Version 0.3.4 requires a minium libnfc version of 1.6. A separate patch has
been submitted to bump the libnfc version; that patch should be regarded as
a prerequisite for the present patch.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libfreefare/libfreefare.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 3f0036a2cb..3c96839d31 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -3,7 +3,7 @@
 # libfreefare
 #
 #############################################################
-LIBFREEFARE_VERSION = 0.3.2
+LIBFREEFARE_VERSION = 0.3.4
 LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
 LIBFREEFARE_DEPENDENCIES = libnfc openssl
 

From 5276cb27c0e9a2a0326148ab6198c827b6a72c8a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 18 Jul 2012 18:11:51 +0100
Subject: [PATCH 2364/6849] libnfc-llcp: new package

This patch adds the libnfc-llcp package.

This package requires a minium libnfc version of 1.6. A separate patch has
been submitted to bump the libnfc version; that patch should be regarded as
a prerequisite for the present patch.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                  |  1 +
 package/libnfc-llcp/Config.in      |  8 ++++++++
 package/libnfc-llcp/libnfc-llcp.mk | 14 ++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/libnfc-llcp/Config.in
 create mode 100644 package/libnfc-llcp/libnfc-llcp.mk

diff --git a/package/Config.in b/package/Config.in
index 154b82c64a..d0daa186d7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -376,6 +376,7 @@ source "package/libftdi/Config.in"
 source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libnfc/Config.in"
+source "package/libnfc-llcp/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
diff --git a/package/libnfc-llcp/Config.in b/package/libnfc-llcp/Config.in
new file mode 100644
index 0000000000..d59976a696
--- /dev/null
+++ b/package/libnfc-llcp/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBNFC_LLCP
+	bool "libnfc-llcp"
+	select BR2_PACKAGE_LIBNFC
+	help
+	  Library extending libnfc with support for Logical Link Control
+	  Protocol.
+
+	  http://code.google.com/p/nfc-tools/source/browse/trunk/libnfc-llcp/
diff --git a/package/libnfc-llcp/libnfc-llcp.mk b/package/libnfc-llcp/libnfc-llcp.mk
new file mode 100644
index 0000000000..57821c1cb6
--- /dev/null
+++ b/package/libnfc-llcp/libnfc-llcp.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libnfc-llcp
+#
+#############################################################
+LIBNFC_LLCP_VERSION = 1090
+LIBNFC_LLCP_SITE = http://nfc-tools.googlecode.com/svn/trunk/libnfc-llcp/
+LIBNFC_LLCP_SITE_METHOD = svn
+LIBNFC_LLCP_DEPENDENCIES = libnfc
+LIBNFC_LLCP_AUTORECONF = YES
+LIBNFC_LLCP_AUTORECONF_OPT = --install --force --verbose
+LIBNFC_LLCP_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 2ebbec054545df978655eda88af78f531ff25f17 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 20 Jul 2012 14:40:18 +0200
Subject: [PATCH 2365/6849] lua: ensure that host-lua does not depend on
 host-readline and host-ncurses

Commit ad6af5819f88bac9ca7f50e565c4fc68d3e408cc removed the
HOST_LUA_DEPENDENCIES assignement to the empty variable, so from that
commit, the dependencies of host-lua are automatically computed from
the dependencies of lua. Since lua can depend on readline and ncurses,
it means that host-lua can depend on host-readline and host-ncurses,
and the host-readline package does not exist in Buildroot. Since there
is no reason to build host-lua with readline/ncurses support, just
re-add the HOST_LUA_DEPENDENCIES variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Francois Perrad <fperrad@gmail.com>
---
 package/lua/lua.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 8f71fc229f..074b9adb40 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -23,6 +23,9 @@ else
 	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 endif
 
+# We never want to have host-readline and host-ncurses as dependencies
+# of host-lua.
+HOST_LUA_DEPENDENCIES =
 HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
 HOST_LUA_MYLIBS = -ldl
 

From 02f5589d6fe85e73a965359f5dfa2a49930ae3e0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 20 Jul 2012 18:55:23 +0200
Subject: [PATCH 2366/6849] lua: fix build issue with gcc 4.6

gcc 4.6 has become more sensitive about option ordering, especially
libraries. It requires the -l flags to be placed after the object
files that need that library. See for example
http://nick.zoic.org/art/etc/gcc-linker-libs.html. We had -llua at the
beginning of the link command line, causing build issues (here on gcc
4.6 with host-lua).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/lua-02-shared-libs-for-lua.patch  | 2 +-
 package/lua/lua-03-shared-libs-for-luac.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lua/lua-02-shared-libs-for-lua.patch b/package/lua/lua-02-shared-libs-for-lua.patch
index afe2ac8941..454e660024 100644
--- a/package/lua/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/lua-02-shared-libs-for-lua.patch
@@ -43,7 +43,7 @@ Index: b/src/Makefile
 +	ln -fs $@.$(PKG_VERSION) $@
 +
 +$(LUA_T): $(LUA_O) $(LUA_SO)
-+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
++	$(CC) -o $@ -L. $(MYLDFLAGS) $(LUA_O) -llua $(LIBS)
  
  $(LUAC_T): $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/package/lua/lua-03-shared-libs-for-luac.patch b/package/lua/lua-03-shared-libs-for-luac.patch
index ebe5337afb..33f9183bb5 100644
--- a/package/lua/lua-03-shared-libs-for-luac.patch
+++ b/package/lua/lua-03-shared-libs-for-luac.patch
@@ -91,7 +91,7 @@ Index: b/src/Makefile
 -$(LUAC_T): $(LUAC_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 +$(LUAC_T): $(LUAC_O) $(LUA_SO)
-+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
++	$(CC) -o $@ -L. $(MYLDFLAGS) $(LUAC_O) -llua $(LIBS)
  
  clean:
  	$(RM) $(ALL_T) $(ALL_O)

From c8da6d1dd656caf5454c50ee5dddb4beead60326 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 20 Jul 2012 18:56:38 +0200
Subject: [PATCH 2367/6849] lua: use install -D everywhere

Installation of host-lua was failing because it was the first package
to be built, and $(HOST_DIR)/usr/lib didn't exist. Therefore, use
install -D everywhere so that intermediate directories are created as
needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/lua.mk | 50 +++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 074b9adb40..fa1e7b1120 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -46,7 +46,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_STAGING_SHARED_LIB
-	$(INSTALL) -D $(@D)/src/liblua.so.$(LUA_VERSION) \
+	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
 		$(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
 	ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
 endef
@@ -55,37 +55,37 @@ endif
 define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
-	$(INSTALL) $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib
-	$(INSTALL) $(@D)/src/lua $(STAGING_DIR)/usr/bin
-	$(INSTALL) $(@D)/src/luac $(STAGING_DIR)/usr/bin
-	$(INSTALL) $(@D)/src/lua.h $(STAGING_DIR)/usr/include
-	$(INSTALL) $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include
-	$(INSTALL) $(@D)/src/lualib.h $(STAGING_DIR)/usr/include
-	$(INSTALL) $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
+	$(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua
+	$(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac
+	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h
+	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h
+	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h
+	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
 endef
 
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER),y)
 define LUA_INSTALL_INTERPRETER
-	$(INSTALL) $(@D)/src/lua $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_LUA_COMPILER),y)
 define LUA_INSTALL_COMPILER
-	$(INSTALL) $(@D)/src/luac $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_LIBRARY
-	$(INSTALL) $(@D)/src/liblua.so.$(LUA_VERSION) \
+	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
 		$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
 	ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
-	$(INSTALL) $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
 endef
 else
 define LUA_INSTALL_LIBRARY
-	$(INSTALL) $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
+	$(INSTALL) -m 0644 -D$(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
 endef
 endif
 
@@ -93,10 +93,10 @@ ifeq ($(BR2_HAVE_DEVFILES),y)
 define LUA_INSTALL_DEVFILES
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
 		$(TARGET_DIR)/usr/lib/pkgconfig/lua.pc
-	$(INSTALL) $(@D)/src/lua.h $(TARGET_DIR)/usr/include
-	$(INSTALL) $(@D)/src/luaconf.h $(TARGET_DIR)/usr/include
-	$(INSTALL) $(@D)/src/lualib.h $(TARGET_DIR)/usr/include
-	$(INSTALL) $(@D)/src/lauxlib.h $(TARGET_DIR)/usr/include
+	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(TARGET_DIR)/usr/include/lua.h
+	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(TARGET_DIR)/usr/include/luaconf.h
+	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(TARGET_DIR)/usr/include/lualib.h
+	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(TARGET_DIR)/usr/include/lauxlib.h
 endef
 endif
 
@@ -108,18 +108,18 @@ define LUA_INSTALL_TARGET_CMDS
 endef
 
 define HOST_LUA_INSTALL_CMDS
-	$(INSTALL) $(@D)/src/lua $(HOST_DIR)/usr/bin
-	$(INSTALL) $(@D)/src/luac $(HOST_DIR)/usr/bin
-	$(INSTALL) $(@D)/src/liblua.so.$(LUA_VERSION) \
+	$(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua
+	$(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac
+	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
 		$(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
 	ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so
-	$(INSTALL) $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
 		$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
-	$(INSTALL) $(@D)/src/lua.h $(HOST_DIR)/usr/include
-	$(INSTALL) $(@D)/src/luaconf.h $(HOST_DIR)/usr/include
-	$(INSTALL) $(@D)/src/lualib.h $(HOST_DIR)/usr/include
-	$(INSTALL) $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include
+	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h
+	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h
+	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h
+	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h
 endef
 
 LUA_INSTALLED_FILES = \

From 3096b09abdbd9ff1ecf73b0c723df9113e1787fe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 20 Jul 2012 08:53:28 -0300
Subject: [PATCH 2368/6849] kernel-headers: bump 3.{0, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/kernel-headers/Config.in                            | 4 ++--
 ...eaders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.37-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index c24dd86c3b..63a1ae8006 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.37"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.38"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.23"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.5"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.6"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.37-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.37-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch

From a3a362169321f2c5c9e2c7815c414984e94c56bc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 20 Jul 2012 08:53:29 -0300
Subject: [PATCH 2369/6849] linux: bump default to kernel version 3.4.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 00f852e46d..e0c1c7ec02 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.5"
+	bool "3.4.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.5" if BR2_LINUX_KERNEL_3_4
+	default "3.4.6" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f3c1ee9a598d470956d029a16b64a33c10aee06d Mon Sep 17 00:00:00 2001
From: gregory hermant <gregory.hermant@calao-systems.com>
Date: Fri, 20 Jul 2012 18:06:12 +0200
Subject: [PATCH 2370/6849] dfu-util: new package

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in.host          |  1 +
 package/dfu-util/Config.in.host |  8 ++++++++
 package/dfu-util/dfu-util.mk    | 13 +++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/dfu-util/Config.in.host
 create mode 100644 package/dfu-util/dfu-util.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index 9fcfede00c..79050f25d9 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,5 +1,6 @@
 menu "Host utilities"
 
+source "package/dfu-util/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
diff --git a/package/dfu-util/Config.in.host b/package/dfu-util/Config.in.host
new file mode 100644
index 0000000000..cfeebdc21d
--- /dev/null
+++ b/package/dfu-util/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_DFU_UTIL
+	bool "host dfu-util"
+	help
+	  Dfu-util is the host side implementation of the DFU 1.0 
+	  specification of the USB forum. DFU is intended to download
+	  and upload firmware to devices connected over USB. 
+
+	  http://dfu-util.gnumonks.org/
diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
new file mode 100644
index 0000000000..4ba7014133
--- /dev/null
+++ b/package/dfu-util/dfu-util.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# dfu-util
+#
+#############################################################
+DFU_UTIL_VERSION:=0.6
+DFU_UTIL_SOURCE = dfu-util-$(DFU_UTIL_VERSION).tar.gz
+DFU_UTIL_SITE = http://dfu-util.gnumonks.org/releases/
+
+HOST_DFU_UTIL_DEPENDENCIES = host-libusb
+
+$(eval $(host-autotools-package))
+

From 1677d40822f032fc09ab271a3d14eb6f445cc91b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 20 Jul 2012 20:05:24 +0200
Subject: [PATCH 2371/6849] dfu-util: cosmetic fix

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/dfu-util/dfu-util.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
index 4ba7014133..77470fa3fc 100644
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@@ -3,7 +3,7 @@
 # dfu-util
 #
 #############################################################
-DFU_UTIL_VERSION:=0.6
+DFU_UTIL_VERSION = 0.6
 DFU_UTIL_SOURCE = dfu-util-$(DFU_UTIL_VERSION).tar.gz
 DFU_UTIL_SITE = http://dfu-util.gnumonks.org/releases/
 

From 45166f30dc40ce810831657c27724a3b5a57f2ad Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 20 Jul 2012 09:58:12 +0100
Subject: [PATCH 2372/6849] python-nfc: new package

[thomas.petazzoni@free-electrons.com:
   add patch that creates a standard setup.py file. This allows the
   .pyc files to be generated at build time, and installed into the
   target. This is important because by default, Buildroot removes all
   .py files from the target, to keep only the .pyc files. The
   python-nfc.mk file was changed to use this setup.py standard build
   process.]

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/python-nfc/Config.in                  |  9 +++++++
 .../python-nfc/python-nfc-add-setup-py.patch  | 26 +++++++++++++++++++
 package/python-nfc/python-nfc.mk              | 23 ++++++++++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 package/python-nfc/Config.in
 create mode 100644 package/python-nfc/python-nfc-add-setup-py.patch
 create mode 100644 package/python-nfc/python-nfc.mk

diff --git a/package/Config.in b/package/Config.in
index d0daa186d7..46747d96b3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -269,6 +269,7 @@ source "package/python-dpkt/Config.in"
 source "package/python-id3/Config.in"
 source "package/python-mad/Config.in"
 source "package/python-netifaces/Config.in"
+source "package/python-nfc/Config.in"
 source "package/python-pygame/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in
new file mode 100644
index 0000000000..c928ba1f3b
--- /dev/null
+++ b/package/python-nfc/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_NFC
+	bool "python-nfc"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	help
+	  Python module for near field communication.
+
+	  https://launchpad.net/nfcpy
diff --git a/package/python-nfc/python-nfc-add-setup-py.patch b/package/python-nfc/python-nfc-add-setup-py.patch
new file mode 100644
index 0000000000..307b749844
--- /dev/null
+++ b/package/python-nfc/python-nfc-add-setup-py.patch
@@ -0,0 +1,26 @@
+Add simple setup.py
+
+Having a setup.py allows to easily get the .py files compiled into
+.pyc, which is good because by default, Buildroot only keeps .pyc
+files on the target.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/setup.py
+===================================================================
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,13 @@
++#!/usr/bin/env python
++
++from distutils.core import setup
++
++setup(name='NFC',
++      version='1.0',
++      description='Python NFC',
++      author='Stephen Tiedemann',
++      author_email='stephen.tiedemann@googlemail.com',
++      url='https://launchpad.net/nfcpy',
++      packages=['nfc', 'nfc/dev', 'nfc/llcp', 'nfc/ndef',
++                'nfc/npp', 'nfc/snep'],
++      )
diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk
new file mode 100644
index 0000000000..90f7c4648e
--- /dev/null
+++ b/package/python-nfc/python-nfc.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# python-nfc
+#
+#############################################################
+PYTHON_NFC_VERSION = 112
+PYTHON_NFC_SITE = https://launchpad.net/nfcpy
+PYTHON_NFC_SITE_METHOD = bzr
+PYTHON_NFC_DEPENDENCIES = python libusb libusb-compat
+
+define PYTHON_NFC_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_NFC_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+define PYTHON_NFC_UNINSTALL_TARGET_CMDS
+	$(RM) -r $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/nfc/
+endef
+
+$(eval $(generic-package))

From 594610a39ed94fb6bf9c5b6b9b52580c82944635 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 20 Jul 2012 10:20:03 +0100
Subject: [PATCH 2373/6849] sound-theme-borealis: new package

[thomas.petazzoni@free-electrons.com:
  slightly adjust the installation process to just do a loop of calls
  to $(INSTALL).]

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/sound-theme-borealis/Config.in        |  6 ++++++
 .../sound-theme-borealis.mk                   | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/sound-theme-borealis/Config.in
 create mode 100644 package/sound-theme-borealis/sound-theme-borealis.mk

diff --git a/package/Config.in b/package/Config.in
index 46747d96b3..ab5781c3e9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -499,6 +499,7 @@ source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
+source "package/sound-theme-borealis/Config.in"
 source "package/sound-theme-freedesktop/Config.in"
 endmenu
 
diff --git a/package/sound-theme-borealis/Config.in b/package/sound-theme-borealis/Config.in
new file mode 100644
index 0000000000..fcc109fe94
--- /dev/null
+++ b/package/sound-theme-borealis/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_SOUND_THEME_BOREALIS
+	bool "sound-theme-borealis"
+	help
+	  Borealis sound theme.
+
+	  http://kde-look.org/content/show.php?content=12584
diff --git a/package/sound-theme-borealis/sound-theme-borealis.mk b/package/sound-theme-borealis/sound-theme-borealis.mk
new file mode 100644
index 0000000000..afca72a103
--- /dev/null
+++ b/package/sound-theme-borealis/sound-theme-borealis.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# sound-theme-borealis
+#
+#############################################################
+SOUND_THEME_BOREALIS_VERSION = 0.9a
+SOUND_THEME_BOREALIS_SITE = http://ico.bukvic.net/Linux/Borealis_soundtheme
+SOUND_THEME_BOREALIS_SOURCE = \
+	Borealis_sound_theme_ogg-$(SOUND_THEME_BOREALIS_VERSION).tar.bz2
+
+define SOUND_THEME_BOREALIS_INSTALL_TARGET_CMDS
+	for f in $(@D)/*.ogg ; do \
+		$(INSTALL) -D -m 0644 $$f $(TARGET_DIR)/usr/share/sounds/borealis/stereo/`basename $$f` ; \
+	done
+endef
+
+define SOUND_THEME_BOREALIS_UNINSTALL_TARGET_CMDS
+	$(RM) -r $(TARGET_DIR)/usr/share/sounds/borealis
+endef
+
+$(eval $(generic-package))

From 7c35ab96d57969b63498865778ea4609aa154af7 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 20 Jul 2012 13:20:16 +0100
Subject: [PATCH 2374/6849] owl-linux: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/owl-linux/Config.in                   | 17 +++++++++++++++
 ...-fix-CROSS_COMPILE-usage-in-Makefile.patch | 16 ++++++++++++++
 .../owl-linux-fix-for-linux-3.3.x.patch       | 21 +++++++++++++++++++
 package/owl-linux/owl-linux.mk                | 19 +++++++++++++++++
 5 files changed, 74 insertions(+)
 create mode 100644 package/owl-linux/Config.in
 create mode 100644 package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch
 create mode 100644 package/owl-linux/owl-linux-fix-for-linux-3.3.x.patch
 create mode 100644 package/owl-linux/owl-linux.mk

diff --git a/package/Config.in b/package/Config.in
index ab5781c3e9..f664b8e563 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -216,6 +216,7 @@ source "package/ntfs-3g/Config.in"
 source "package/ofono/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
+source "package/owl-linux/Config.in"
 source "package/parted/Config.in"
 source "package/pciutils/Config.in"
 source "package/picocom/Config.in"
diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
new file mode 100644
index 0000000000..f6e18d557d
--- /dev/null
+++ b/package/owl-linux/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_OWL_LINUX
+	bool "owl-linux"
+	depends on BR2_LINUX_KERNEL
+	depends on (BR2_arm920t || BR2_arm922t || BR2_arm926t)
+	depends on BR2_ARM_EABI
+	help
+	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
+
+	  http://linux.hd-wireless.se/bin/view/Linux/GettingStarted
+
+comment "owl-linux requires a Linux kernel"
+	depends on !BR2_LINUX_KERNEL
+	depends on BR2_arm || BR2_armeb
+
+comment "owl-linux is only supported on ARM9 architecture with EABI"
+	depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t) || !BR2_ARM_EABI
+	depends on BR2_arm || BR2_armeb
diff --git a/package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch b/package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch
new file mode 100644
index 0000000000..14b4631624
--- /dev/null
+++ b/package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch
@@ -0,0 +1,16 @@
+Fix the owl-linux Makefile so that it protects spaces in the CROSS_COMPILE
+variable. For example, this variable will contain spaces if ccache is used.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nurp a/Makefile b/Makefile
+--- a/Makefile	2012-06-14 10:51:45.000000000 +0100
++++ b/Makefile	2012-07-20 10:46:41.636752148 +0100
+@@ -35,7 +35,7 @@ else
+ 	PWD := $(shell pwd)
+ 
+ default:
+-	$(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) M=$(PWD) MODE=$(MODE) modules
++	$(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE="$(CROSS_COMPILE)" M=$(PWD) MODE=$(MODE) modules
+ 
+ clean: 
+ 	-rm -f *.o *.mod.c *.ko modules.order Module.symvers
diff --git a/package/owl-linux/owl-linux-fix-for-linux-3.3.x.patch b/package/owl-linux/owl-linux-fix-for-linux-3.3.x.patch
new file mode 100644
index 0000000000..831ac7fd11
--- /dev/null
+++ b/package/owl-linux/owl-linux-fix-for-linux-3.3.x.patch
@@ -0,0 +1,21 @@
+Kernel commit b81693d9149c598302e8eb9c20cb20330d922c8e changed the
+net_device_ops structure, removing the ndo_set_multicast_list callback. The
+ndo_set_rx_mode has also been added to this structure.
+
+The upshot of these changes is that owl-linux fails to compile with 3.3.x
+and later kernels.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nurp a/owl_net.c b/owl_net.c
+--- a/owl_net.c	2012-06-14 10:51:45.000000000 +0100
++++ b/owl_net.c	2012-07-20 13:16:28.772351464 +0100
+@@ -384,7 +384,9 @@ static const struct net_device_ops netde
+ #endif /* OWL_CONFIG_IFUPDOWN */
+         .ndo_start_xmit         = owl_net_tx,
+         .ndo_get_stats          = owl_net_get_stats,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+         .ndo_set_multicast_list = NULL,
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */
+         .ndo_tx_timeout         = owl_net_tx_timeout,
+         .ndo_set_mac_address    = NULL,
+ };
diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk
new file mode 100644
index 0000000000..0a111c8370
--- /dev/null
+++ b/package/owl-linux/owl-linux.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# owl-linux
+#
+#############################################################
+OWL_LINUX_VERSION = 1.0.7
+OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers
+
+OWL_LINUX_DEPENDENCIES = linux
+
+define OWL_LINUX_BUILD_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR)
+endef
+
+define OWL_LINUX_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M="$(@D)" modules_install
+endef
+
+$(eval $(generic-package))

From 3d3ec6cfe1d1c0abacce65ba2f494aae98af263e Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 27 Jun 2012 21:52:24 +0100
Subject: [PATCH 2375/6849] memtester: bump to version 4.3.0

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...er-4.2.1-makefile-fix.patch => memtester-makefile-fix.patch} | 0
 package/memtester/memtester.mk                                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/memtester/{memtester-4.2.1-makefile-fix.patch => memtester-makefile-fix.patch} (100%)

diff --git a/package/memtester/memtester-4.2.1-makefile-fix.patch b/package/memtester/memtester-makefile-fix.patch
similarity index 100%
rename from package/memtester/memtester-4.2.1-makefile-fix.patch
rename to package/memtester/memtester-makefile-fix.patch
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index b9c5e1da87..8cca471cf5 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -3,7 +3,7 @@
 # memtester
 #
 #############################################################
-MEMTESTER_VERSION = 4.2.1
+MEMTESTER_VERSION = 4.3.0
 MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions/
 

From cc160a941ee2de5aa9bd4624dd56fd6b38bb29c9 Mon Sep 17 00:00:00 2001
From: Eric Jarrige <eric.jarrige@armadeus.org>
Date: Wed, 18 Jul 2012 18:02:42 +0200
Subject: [PATCH 2376/6849] Add (Freescale) elftosb host package

Elftosb is a Freescale toolset to build binary image files (like U-Boot.sb)
to be used with CPUs imx23, imx28, stp37xx

thomas.petazzoni@free-electrons.com:
 * Add -m 0755 when installing binaries
 * the _CLEAN_CMDS is not supposed to uninstall things from the
   HOST_DIR.
 * Use 'host-generic-package' instead of 'GENTARGETS,host'

Signed-off-by: Eric Jarrige <eric.jarrige@armadeus.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/elftosb/elftosb.mk                    | 25 +++++++++++++++++++
 .../elftosb10.12.01-fixes_includes.patch      | 19 ++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 package/elftosb/elftosb.mk
 create mode 100644 package/elftosb/elftosb10.12.01-fixes_includes.patch

diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
new file mode 100644
index 0000000000..b2e50f72f2
--- /dev/null
+++ b/package/elftosb/elftosb.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# elftosb
+#
+#############################################################
+ELFTOSB_VERSION = 10.12.01
+ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
+ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
+
+define HOST_ELFTOSB_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) all
+endef
+
+define HOST_ELFTOSB_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/bld/linux/elftosb $(HOST_DIR)/usr/bin/elftosb
+	$(INSTALL) -D -m 0755 $(@D)/bld/linux/keygen $(HOST_DIR)/usr/bin/keygen
+	$(INSTALL) -D -m 0755 $(@D)/bld/linux/sbtool $(HOST_DIR)/usr/bin/sbtool
+endef
+
+define HOST_ELFTOSB_CLEAN_CMDS
+	rm -rf $(@D)/bld/linux
+endef
+
+$(eval $(host-generic-package))
+
diff --git a/package/elftosb/elftosb10.12.01-fixes_includes.patch b/package/elftosb/elftosb10.12.01-fixes_includes.patch
new file mode 100644
index 0000000000..eaf8ebad98
--- /dev/null
+++ b/package/elftosb/elftosb10.12.01-fixes_includes.patch
@@ -0,0 +1,19 @@
+This patch uses system include files instead of a hard coded system path to fixe
+potential compilation failure on systems that do not populate system header
+files in /usr/include/..
+
+Signed-off-by: Eric Jarrige <eric.jarrige@armadeus.org>
+---
+Index: host-elftosb-10.12.01/common/stdafx.h
+===================================================================
+--- host-elftosb-10.12.01.orig/common/stdafx.h	2012-01-30 12:43:35.000000000 +0100
++++ host-elftosb-10.12.01/common/stdafx.h	2012-01-30 12:43:54.000000000 +0100
+@@ -27,7 +27,7 @@
+ // For Linux systems only, types.h only defines the signed
+ // integer types.  This is not professional code.
+ // Update: They are defined in the header files in the more recent version of redhat enterprise gcc.
+-#include "/usr/include/sys/types.h"
++#include <sys/types.h>
+ #include <stdint.h>
+ //typedef unsigned long uint32_t;
+ //typedef unsigned short uint16_t;

From 2a636d15217cd326b4546e7017538c7a9e9d399c Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 18 Jul 2012 18:02:43 +0200
Subject: [PATCH 2377/6849] Add MXS bootlets package

MXS platforms (imx23 and imx28) are relying on bootlets as their first
stage bootloaders, that can then either start a regular second stage
bootloader or directly a Linux kernel. However, the Makefile allows
only to build u-boot and linux images at the same time, which is
not very convenient as we will more likely use only one of them,
so we need to duplicate a bit what is already done so that we are able
to choose what we want to generate.

thomas.petazzoni@free-electrons.com:

 * Remove incorrect dependency on BR2_PACKAGE_ELFTOSB

 * Each board configuration option is for one board, not multiple
   boards, so use singular.

 * The i.MX28 support is for i.MX28 EVK only, reflect that in the
   option prompt and the option name.

 * Use 'generic-package' instead of GENTARGETS

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/Config.in                    |   1 +
 boot/common.mk                    |   2 +-
 boot/mxs-bootlets/Config.in       |  90 ++++++++++++++++++++++++++
 boot/mxs-bootlets/barebox_ivt.bd  |  34 ++++++++++
 boot/mxs-bootlets/mxs-bootlets.mk | 103 ++++++++++++++++++++++++++++++
 5 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 boot/mxs-bootlets/Config.in
 create mode 100644 boot/mxs-bootlets/barebox_ivt.bd
 create mode 100644 boot/mxs-bootlets/mxs-bootlets.mk

diff --git a/boot/Config.in b/boot/Config.in
index f8ab1cff5f..5252a49a2a 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -5,6 +5,7 @@ source "boot/at91dataflashboot/Config.in"
 source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
 source "boot/lpc32xxcdl/Config.in"
+source "boot/mxs-bootlets/Config.in"
 source "boot/syslinux/Config.in"
 source "boot/uboot/Config.in"
 source "boot/xloader/Config.in"
diff --git a/boot/common.mk b/boot/common.mk
index dc0bfb4966..b315fe8393 100644
--- a/boot/common.mk
+++ b/boot/common.mk
@@ -1 +1 @@
-include boot/*/*.mk
\ No newline at end of file
+include boot/*/*.mk
diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in
new file mode 100644
index 0000000000..2222ff6076
--- /dev/null
+++ b/boot/mxs-bootlets/Config.in
@@ -0,0 +1,90 @@
+config BR2_TARGET_MXS_BOOTLETS
+	bool "mxs-bootlets"
+	depends on BR2_arm
+	help
+	  Stage1 bootloaders for Freescale iMX23/iMX28 SoCs
+
+if BR2_TARGET_MXS_BOOTLETS
+
+choice
+	prompt "Source"
+	default BR2_TARGET_MXS_BOOTLETS_FREESCALE
+	help
+	  Select the location of the bootlets you want to use
+
+config BR2_TARGET_MXS_BOOTLETS_FREESCALE
+	bool "Freescale 10.12.01 version"
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL
+	bool "Custom tarball"
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT
+	bool "Custom Git repository"
+
+endchoice
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL
+	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL
+	string "URL of custom bootlets tarball"
+
+if BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL
+	string "URL of custom Git repository"
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_VERSION
+	string "Custom Git version"
+
+endif
+
+choice
+	prompt "Bootstream"
+	help
+	  Select which bootstream to generate
+
+config BR2_TARGET_MXS_BOOTLETS_BAREBOX
+       depends on BR2_TARGET_BAREBOX
+       bool "Barebox Bootloader"
+
+config BR2_TARGET_MXS_BOOTLETS_LINUX
+       depends on BR2_LINUX_KERNEL
+       bool "Linux Kernel"
+
+config BR2_TARGET_MXS_BOOTLETS_UBOOT
+       depends on BR2_TARGET_UBOOT
+       bool "U-boot bootloader"
+
+endchoice
+
+config BR2_TARGET_MXS_BOOTLETS_HAS_IVT
+	bool "HAB Support"
+	help
+	  Enable this option if you are building bootlets
+	  for the iMX28 platform that needs to include instructions
+	  for the secure boot mechanism present on these SoCs
+
+choice
+	prompt "Board"
+	help
+	  Select the board to build the bootlets for
+
+config BR2_TARGET_MXS_BOOTLETS_STMP37xx
+	bool "Sigmatel ST-MP3-7xx Board"
+
+config BR2_TARGET_MXS_BOOTLETS_STMP378x
+	bool "Sigmatel ST-MP3-78x Board"
+
+config BR2_TARGET_MXS_BOOTLETS_IMX28EVK
+	bool "Freescale iMX28 EVK Board"
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
+	bool "Custom board"
+endchoice
+
+config BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME
+       string "Custom board name"
+       depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
+       help
+         Name of the board to build the bootlets for
+
+endif
diff --git a/boot/mxs-bootlets/barebox_ivt.bd b/boot/mxs-bootlets/barebox_ivt.bd
new file mode 100644
index 0000000000..e02ddd68f6
--- /dev/null
+++ b/boot/mxs-bootlets/barebox_ivt.bd
@@ -0,0 +1,34 @@
+// STMP378x ROM command script to load and run U-Boot
+
+sources {
+	power_prep="./power_prep/power_prep";
+	sdram_prep="./boot_prep/boot_prep";
+	barebox="./barebox";
+}
+
+section (0) {
+
+	//----------------------------------------------------------
+	// Power Supply initialization
+	//----------------------------------------------------------
+
+	load power_prep;
+	load ivt (entry = power_prep:_start) > 0x8000;
+	hab call 0x8000;
+
+	//----------------------------------------------------------
+	// SDRAM initialization
+	//----------------------------------------------------------
+
+	load sdram_prep;
+        load ivt (entry = sdram_prep:_start) > 0x8000;
+        hab call 0x8000;
+	//----------------------------------------------------------
+	//  Load and call u_boot - ELF ARM image
+	//----------------------------------------------------------
+
+        load barebox;
+        load ivt (entry = barebox:exception_vectors) > 0x8000;
+	hab call 0x8000;
+
+}
diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
new file mode 100644
index 0000000000..1975d472ca
--- /dev/null
+++ b/boot/mxs-bootlets/mxs-bootlets.mk
@@ -0,0 +1,103 @@
+#############################################################
+#
+# mxs-bootlets
+#
+#############################################################
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y)
+	MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL))
+	MXS_BOOTLETS_SITE = $(dir $(MXS_BOOTLETS_TARBALL))
+	MXS_BOOTLETS_SOURCE  = $(notdir $(MXS_BOOTLETS_TARBALL))
+else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y)
+	MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL)
+	MXS_BOOTLETS_SITE_METHOD = git
+	MXS_BOOTLETS_VERSION = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_VERSION))
+else
+	MXS_BOOTLETS_VERSION = 10.12.01
+	MXS_BOOTLETS_SITE = http://download.ossystems.com.br/bsp/freescale/source/
+	MXS_BOOTLETS_SOURCE = imx-bootlets-src-$(MXS_BOOTLETS_VERSION).tar.gz
+endif
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_STMP37xx),y)
+	MXS_BOOTLETS_BOARD = stmp37xx_dev
+else ifeq ($(BR2_TARGET_MXS_BOOTLETS_STMP378x),y)
+	MXS_BOOTLETS_BOARD = stmp378x_dev
+else ifeq ($(BR2_TARGET_MXS_BOOTLETS_IMX28EVK),y)
+	MXS_BOOTLETS_BOARD = iMX28_EVK
+else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD),y)
+	MXS_BOOTLETS_BOARD = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME))
+endif
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_HAS_IVT),y)
+	MXS_BOOTLETS_IVT_SUFFIX = _ivt
+	MXS_BOOTLETS_ELFTOSB_OPTIONS += -f imx28
+endif
+
+MXS_BOOTLETS_DEPENDENCIES = host-elftosb
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y)
+MXS_BOOTLETS_DEPENDENCIES += barebox
+MXS_BOOTLETS_BOOTDESC = barebox$(MXS_BOOTLETS_IVT_SUFFIX).bd
+MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_barebox$(MXS_BOOTLETS_IVT_SUFFIX).sb
+
+else ifeq ($(BR2_TARGET_MXS_BOOTLETS_LINUX),y)
+MXS_BOOTLETS_DEPENDENCIES += linux
+MXS_BOOTLETS_BOOTDESC = linux$(MXS_BOOTLETS_IVT_SUFFIX).bd
+MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_linux$(MXS_BOOTLETS_IVT_SUFFIX).sb
+
+else ifeq ($(BR2_TARGET_MXS_BOOTLETS_UBOOT),y)
+MXS_BOOTLETS_DEPENDENCIES += uboot
+MXS_BOOTLETS_BOOTDESC = uboot$(MXS_BOOTLETS_IVT_SUFFIX).bd
+MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_uboot$(MXS_BOOTLETS_IVT_SUFFIX).sb
+endif
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y)
+define MXS_BOOTLETS_SED_BAREBOX
+	sed -i 's,[^ *]barebox.*;,\tbarebox="$(BAREBOX_DIR)/barebox";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC)
+endef
+endif
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_LINUX),y)
+define MXS_BOOTLETS_BUILD_LINUX_PREP
+	BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \
+		$(MAKE1) -C $(@D) linux_prep
+endef
+define MXS_BOOTLETS_SED_LINUX
+	sed -i 's,[^ *]linux_prep.*;,\tlinux_prep="$(@D)/linux_prep/output-target/linux_prep";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC)
+	sed -i 's,[^ *]zImage.*;,\tzImage="$(LINUX_DIR)/arch/arm/boot/zImage";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC)
+endef
+endif
+
+ifeq ($(BR2_TARGET_MXS_BOOTLETS_UBOOT),y)
+define MXS_BOOTLETS_SED_UBOOT
+	sed -i 's,[^ *]u_boot.*;,\tu_boot="$(UBOOT_DIR)/u-boot";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC)
+endef
+endif
+
+define MXS_BOOTLETS_INSTALL_BAREBOX_BOOTDESC
+	cp boot/mxs-bootlets/barebox_ivt.bd $(@D)/
+endef
+
+MXS_BOOTLETS_POST_EXTRACT_HOOKS += MXS_BOOTLETS_INSTALL_BAREBOX_BOOTDESC
+
+define MXS_BOOTLETS_BUILD_CMDS
+	BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \
+		$(MAKE1) -C $(@D) power_prep
+	BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \
+		$(MAKE1) -C $(@D) boot_prep
+	$(MXS_BOOTLETS_BUILD_LINUX_PREP)
+	sed -i 's,[^ *]power_prep.*;,\tpower_prep="$(@D)/power_prep/power_prep";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC)
+	sed -i 's,[^ *]sdram_prep.*;,\tsdram_prep="$(@D)/boot_prep/boot_prep";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC)
+	$(MXS_BOOTLETS_SED_BAREBOX)
+	$(MXS_BOOTLETS_SED_LINUX)
+	$(MXS_BOOTLETS_SED_UBOOT)
+	$(HOST_DIR)/usr/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \
+		-z -c $(@D)/$(MXS_BOOTLETS_BOOTDESC) \
+		-o $(@D)/$(MXS_BOOTLETS_BOOTSTREAM)
+endef
+
+define MXS_BOOTLETS_INSTALL_TARGET_CMDS
+	cp $(@D)/$(MXS_BOOTLETS_BOOTSTREAM) $(BINARIES_DIR)/
+endef
+
+$(eval $(generic-package))

From 5022fa823cc3c124a97588a3191ba10a25b5f004 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:42:37 +0200
Subject: [PATCH 2378/6849] toolchain-external/Config.in: fix indentation

Fix the indentation of the external toolchain Config file, where tabs
and spaces are mixed as indentation even within the same block.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 342 ++++++++++++-------------
 1 file changed, 171 insertions(+), 171 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f58523f780..172e3e3165 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -69,16 +69,16 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	  Mentor Graphics. It uses gcc 4.6.1, binutils 2.21.53, glibc
 	  2.13 and gdb 7.2.50, kernel headers 3.0.1. It has support
 	  for the following variants:
-            - ARMv5TE, little endian, soft-float, glibc
-              Select ARM926T, ARM10T, XScale or another ARMv5 core
-              Select BR2_SOFT_FLOAT
-            - ARMv4T, little endian, soft-float, glibc
-              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-              Select BR2_SOFT_FLOAT
-            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mthumb
+	    - ARMv5TE, little endian, soft-float, glibc
+	      Select ARM926T, ARM10T, XScale or another ARMv5 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv4T, little endian, soft-float, glibc
+	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	bool "Sourcery CodeBench ARM 2011.03"
@@ -90,16 +90,16 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
 	  2.13 and gdb 7.2.50, kernel headers 2.6.38. It has support
 	  for the following variants:
-            - ARMv5TE, little endian, soft-float, glibc
-              Select ARM926T, ARM10T, XScale or another ARMv5 core
-              Select BR2_SOFT_FLOAT
-            - ARMv4T, little endian, soft-float, glibc
-              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-              Select BR2_SOFT_FLOAT
-            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mthumb
+	    - ARMv5TE, little endian, soft-float, glibc
+	      Select ARM926T, ARM10T, XScale or another ARMv5 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv4T, little endian, soft-float, glibc
+	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	bool "Sourcery CodeBench ARM 2010.09"
@@ -111,16 +111,16 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	  Mentor Graphics. It uses gcc 4.5.1, binutils 2.20, glibc
 	  2.11 and gdb 7.2.50, kernel headers 2.6.35.2. It has support
 	  for the following variants:
-            - ARMv5TE, little endian, soft-float, glibc
+	    - ARMv5TE, little endian, soft-float, glibc
 	      Select ARM926T, ARM10T, XScale or another ARMv5 core
-              Select BR2_SOFT_FLOAT
-            - ARMv4T, little endian, soft-float, glibc
-              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-              Select BR2_SOFT_FLOAT
-            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mthumb
+	      Select BR2_SOFT_FLOAT
+	    - ARMv4T, little endian, soft-float, glibc
+	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	bool "Sourcery CodeBench ARM 2010q1"
@@ -132,16 +132,16 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
 	  2.11, gdb 7.0.50 and kernel headers 2.6.32. It has support
 	  for the following variants:
-             - ARMv5T, little endian, soft-float, glibc
-               Select ARM926T, ARM10T, XScale or another ARMv5 core
-               Select BR2_SOFT_FLOAT
-             - ARMv4T, little endian, soft-float, glibc
-               Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-               Select BR2_SOFT_FLOAT
-             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-               Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-               Select BR2_SOFT_FLOAT
-               Set BR2_TARGET_OPTIMIZATION to -mthumb
+	     - ARMv5T, little endian, soft-float, glibc
+	       Select ARM926T, ARM10T, XScale or another ARMv5 core
+	       Select BR2_SOFT_FLOAT
+	     - ARMv4T, little endian, soft-float, glibc
+	       Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	       Select BR2_SOFT_FLOAT
+	     - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	       Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	       Select BR2_SOFT_FLOAT
+	       Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	bool "Sourcery CodeBench ARM 2009q3"
@@ -153,16 +153,16 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
 	  2.10 and gdb 6.8 and kernel headers 2.6.30. It has support
 	  for the following variants:
-            - ARMv5T, little endian, soft-float, glibc
-              Select ARM926T, ARM10T, XScale or another ARMv5 core
-              Select BR2_SOFT_FLOAT
-            - ARMv4T, little endian, soft-float, glibc
-              Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-              Select BR2_SOFT_FLOAT
-            - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-              Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mthumb
+	    - ARMv5T, little endian, soft-float, glibc
+	      Select ARM926T, ARM10T, XScale or another ARMv5 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv4T, little endian, soft-float, glibc
+	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	bool "Sourcery CodeBench MIPS 2011.03"
@@ -174,44 +174,44 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
 	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
 	  2.6.38. It has support for the following variants:
-            - MIPS32 O32 big endian glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-            - MIPS32 O32 little endian glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL
-            - MIPS32 big endian soft float glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-            - MIPS32 little endian soft float glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL
-            - MIPS32 big endian microMIPS glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mips16
-            - MIPS32 little endian microMIPS glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-            - MIPS32 big endian soft float microMIPS glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mips16
-            - MIPS32 little endian soft float microMIPS glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-            - MIPS32 big endian uclibc
-              Not usable in Buildroot yet.
-            - MIPS32 little endian uclibc
-              Not usable in Buildroot yet.
-            - MIPS32 big endian soft float uclibc
-              Not usable in Buildroot yet.
-            - MIPS32 little endian soft float uclibc
-              Not usable in Buildroot yet.
+	    - MIPS32 O32 big endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS32 O32 little endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	    - MIPS32 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 big endian soft float uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian soft float uclibc
+	      Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	bool "Sourcery CodeBench MIPS 4.4"
@@ -223,44 +223,44 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
 	  2.11, uClibc 0.9.30 and gdb 7.0, kernel headers 2.6.32. It
 	  has support for the following variants:
-            - MIPS32 O32 big endian glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-            - MIPS32 O32 little endian glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL
-            - MIPS32 big endian soft float glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-            - MIPS32 little endian soft float glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL
-            - MIPS32 big endian microMIPS glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mips16
-            - MIPS32 little endian microMIPS glibc
-              Select a MIPS generic core
-              Disable BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-            - MIPS32 big endian soft float microMIPS glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -mips16
-            - MIPS32 little endian soft float microMIPS glibc
-              Select a MIPS generic core
-              Select BR2_SOFT_FLOAT
-              Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-            - MIPS32 big endian uclibc
-              Not usable in Buildroot yet.
-            - MIPS32 little endian uclibc
-              Not usable in Buildroot yet.
-            - MIPS32 big endian soft float uclibc
-              Not usable in Buildroot yet.
-            - MIPS32 little endian soft float uclibc
-              Not usable in Buildroot yet.
+	    - MIPS32 O32 big endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS32 O32 little endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	    - MIPS32 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 big endian soft float uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian soft float uclibc
+	      Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
@@ -272,22 +272,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51,
 	  glibc 2.13, gdb 7.2.50 and kernel headers 2.6.38. It has
 	  support for the following variants:
-            - 603 glibc, 32 bits
+	    - 603 glibc, 32 bits
 	      Select a generic PowerPC core
 	      Disable BR2_SOFT_FLOAT
-            - 603 soft float glibc, 32 bits
+	    - 603 soft float glibc, 32 bits
 	      Select a generic PowerPC core
 	      Enable BR2_SOFT_FLOAT
-            - e600 altivec glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te600
-            - e500v1 glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te500v1
-            - e500v2 glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te500v2
-            - e500mc glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te500mc
-            - 970 glibc hard-float, 64 bits
-              Set BR2_TARGET_OPTIMIZATION to -m64
+	    - e600 altivec glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te600
+	    - e500v1 glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te500v1
+	    - e500v2 glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te500v2
+	    - e500mc glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te500mc
+	    - 970 glibc hard-float, 64 bits
+	      Set BR2_TARGET_OPTIMIZATION to -m64
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	bool "Sourcery CodeBench PowerPC 2010.09"
@@ -299,22 +299,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
 	  glibc 2.11, gdb 7.2.50 and kernel headers 2.6.35.2. It has
 	  support for the following variants:
-            - 603 glibc, 32 bits
+	    - 603 glibc, 32 bits
 	      Select a generic PowerPC core
 	      Disable BR2_SOFT_FLOAT
-            - 603 soft float glibc, 32 bits
+	    - 603 soft float glibc, 32 bits
 	      Select a generic PowerPC core
 	      Enable BR2_SOFT_FLOAT
-            - e600 altivec glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te600
-            - e500v1 glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te500v1
-            - e500v2 glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te500v2
-            - e500mc glibc, 32 bits
-              Set BR2_TARGET_OPTIMIZATION to -te500mc
-            - 970 glibc hard-float, 64 bits
-              Set BR2_TARGET_OPTIMIZATION to -m64
+	    - e600 altivec glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te600
+	    - e500v1 glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te500v1
+	    - e500v2 glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te500v2
+	    - e500mc glibc, 32 bits
+	      Set BR2_TARGET_OPTIMIZATION to -te500mc
+	    - 970 glibc hard-float, 64 bits
+	      Set BR2_TARGET_OPTIMIZATION to -m64
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
@@ -326,14 +326,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
 	  glibc 2.13, uClibc 0.9.30, gdb 7.2.50 and kernel headers
 	  2.6.38. It has support for the following variants:
-            - SH4A, glibc, little endian
-              Default.
-            - SH4A, glibc, big endian
-              Add -mb to BR2_TARGET_OPTIMIZATION
-            - SH4A, uClibc, little endian
-              Not usable in Buildroot yet.
-            - SH4A, uClibc, big endian
-              Not usable in Buildroot yet.
+	    - SH4A, glibc, little endian
+	      Default.
+	    - SH4A, glibc, big endian
+	      Add -mb to BR2_TARGET_OPTIMIZATION
+	    - SH4A, uClibc, little endian
+	      Not usable in Buildroot yet.
+	    - SH4A, uClibc, big endian
+	      Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "Sourcery CodeBench SH 2010.09"
@@ -345,14 +345,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
 	  glibc 2.11, uClibc 0.9.30, gdb 7.2.50 and kernel headers
 	  2.6.35.2. It has support for the following variants:
-            - SH4A, glibc, little endian
-              Default.
-            - SH4A, glibc, big endian
-              Add -mb to BR2_TARGET_OPTIMIZATION
-            - SH4A, uClibc, little endian
-              Not usable in Buildroot yet.
-            - SH4A, uClibc, big endian
-              Not usable in Buildroot yet.
+	    - SH4A, glibc, little endian
+	      Default.
+	    - SH4A, glibc, big endian
+	      Add -mb to BR2_TARGET_OPTIMIZATION
+	    - SH4A, uClibc, little endian
+	      Not usable in Buildroot yet.
+	    - SH4A, uClibc, big endian
+	      Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	bool "Sourcery CodeBench SH 2011.03"
@@ -369,7 +369,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
 	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has
 	  support for the following variants:
-            - SH2A, uClibc, big endian
+	    - SH2A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	bool "Sourcery CodeBench SH 2010.09"
@@ -386,7 +386,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
 	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It
 	  has support for the following variants:
-            - SH2A, uClibc, big endian
+	    - SH2A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	bool "Sourcery CodeBench x86/x86_64 2011.09"
@@ -485,10 +485,10 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  http://wiki.xilinx.com/mb-gnu-tools
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM
-       bool "Custom toolchain"
-       help
-         Use this option to use a custom toolchain pre-installed on
-         your system.
+	bool "Custom toolchain"
+	help
+	  Use this option to use a custom toolchain pre-installed on
+	  your system.
 
 endchoice
 

From 3afc90c7d7667d698fb7b470ea77d6a7010d7696 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 11:32:35 +0200
Subject: [PATCH 2379/6849] lua: fix typo

Commit c8da6d1dd656caf5454c50ee5dddb4beead60326 introduced a stupid
typo. Fix it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lua/lua.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index fa1e7b1120..26c1576549 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -85,7 +85,7 @@ define LUA_INSTALL_LIBRARY
 endef
 else
 define LUA_INSTALL_LIBRARY
-	$(INSTALL) -m 0644 -D$(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
 endef
 endif
 

From 060312567323024ec6fd90e4cec1485816cec811 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:42:34 +0200
Subject: [PATCH 2380/6849] pkg-download.mk: allow using localfiles outside of
 package infrastructure

The localfiles download method uses $($(PKG)_SITE))) and
$($(PKG)_SOURCE) instead of $(1) and $(2). This means that it can only
be used for package downloads (through gentargets, autotargets, ...)
and not for other downloads like external toolchains.

This patch changes localfiles to allow this, just as the wget and scp
download methods already did.
For the version control download methods, nothing changes.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-download.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 79837060b3..fb51540765 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -177,16 +177,16 @@ define SHOW_EXTERNAL_DEPS_WGET
 endef
 
 define DOWNLOAD_LOCALFILES
-	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
-		$(LOCALFILES) $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE) $(DL_DIR)
+	test -e $(DL_DIR)/$(2) || \
+		$(LOCALFILES) $(call qstrip,$(subst file://,,$(1))) $(DL_DIR)
 endef
 
 define SOURCE_CHECK_LOCALFILES
-  test -e $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE)
+  test -e $(call qstrip,$(subst file://,,$(1)))
 endef
 
 define SHOW_EXTERNAL_DEPS_LOCALFILES
-  echo $($(PKG)_SITE)/$($(PKG)_SOURCE)
+  echo $(2)
 endef
 
 ################################################################################

From d57669271d079b3bf09c5ae81f42871260d60c49 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:42:35 +0200
Subject: [PATCH 2381/6849] pkg-download.mk: use stripurischeme function in
 localfiles download method

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-download.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index fb51540765..ca5b40466a 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -178,11 +178,11 @@ endef
 
 define DOWNLOAD_LOCALFILES
 	test -e $(DL_DIR)/$(2) || \
-		$(LOCALFILES) $(call qstrip,$(subst file://,,$(1))) $(DL_DIR)
+		$(LOCALFILES) $(call stripurischeme,$(call qstrip,$(1))) $(DL_DIR)
 endef
 
 define SOURCE_CHECK_LOCALFILES
-  test -e $(call qstrip,$(subst file://,,$(1)))
+  test -e $(call stripurischeme,$(call qstrip,$(1)))
 endef
 
 define SHOW_EXTERNAL_DEPS_LOCALFILES

From 77e26972187b9cda1a8f22ca74da154687c9ab1a Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:42:36 +0200
Subject: [PATCH 2382/6849] pkg-download.mk: support detection of URI schemes
 in DOWNLOAD

When using one of the package infrastructures, the DOWNLOAD function
uses $(PKG)_SITE_METHOD to determine the appropriate download method,
which is autodetected based on the URI if none was explicitly set.

When the DOWNLOAD function is called directly, for example when
downloading a toolchain, or from a package that does not use one of
the package infrastructures, the SITE_METHOD is not autodetected,
and thus the download defaults to wget.

This patch adds URI scheme detection directly to the DOWNLOAD method,
in case no SITE_METHOD was detected yet.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-download.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index ca5b40466a..e93875988f 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -214,7 +214,12 @@ define DOWNLOAD_INNER
 		esac ; \
 	fi ; \
 	if test -n "$(1)" ; then \
-		case "$($(PKG)_SITE_METHOD)" in \
+		if test -z "$($(PKG)_SITE_METHOD)" ; then \
+			scheme="$(call geturischeme,$(1))" ; \
+		else \
+			scheme="$($(PKG)_SITE_METHOD)" ; \
+		fi ; \
+		case "$$scheme" in \
 			git) $($(DL_MODE)_GIT) && exit ;; \
 			svn) $($(DL_MODE)_SVN) && exit ;; \
 			bzr) $($(DL_MODE)_BZR) && exit ;; \

From df0c12599487e49a6fe390a89f2f9ee5ee93222e Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:42:38 +0200
Subject: [PATCH 2383/6849] toolchain-external: allow downloading a custom
 toolchain

This patch adds the possibility to download a custom external
toolchain, in addition to the existing support of preinstalled custom
external toolchains.

With the modified configuration, the user is presented with the
following options:
- Toolchain type: Buildroot toolchain | External toolchain | Ct-ng toolchain

In case of External toolchain:
- Toolchain: the CodeSourcery toolchains | Custom toolchain
- Toolchain origin: Toolchain to be downloaded and installed | Pre-installed toolchain

In case of Toolchain to be downloaded, the user is presented with:
- Toolchain URL
In case of Pre-installed toolchain, the users sees:
- Toolchain Path

For CodeSourcery toolchains, the toolchain URL field is not used (the
URLs are directly coded in ext-tool.mk).

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 29 ++++++++++++++++++------
 toolchain/toolchain-external/ext-tool.mk |  6 +++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 172e3e3165..dceeed2ce0 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -492,22 +492,37 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 endchoice
 
+choice
+	prompt "Toolchain origin"
+
 config BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
-	bool "Download toolchain automatically"
-	default y
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CUSTOM
+	bool "Toolchain to be downloaded and installed"
+	help
+	  Select this option if you want Buildroot to download and install the
+	  toolchain. If you have selected a custom toolchain, specify the URL
+	  in BR2_TOOLCHAIN_EXTERNAL_URL.
+
+config BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED
+	bool "Pre-installed toolchain"
 	help
-	  When enabled, Buildroot will automatically download and
-	  install the selected external toolchain. When disabled,
-	  Buildroot will use a pre-installed toolchain.
+	  Select this option if you want to use a pre-installed toolchain.
+	  Specify the path to this toolchain in BR2_TOOLCHAIN_EXTERNAL_PATH.
+
+endchoice
 
 config BR2_TOOLCHAIN_EXTERNAL_PATH
 	string "Toolchain path"
 	default "/path/to/toolchain/usr"
-	depends on !BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
+	depends on BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED
 	help
 	  Path to where the external toolchain is installed.
 
+config BR2_TOOLCHAIN_EXTERNAL_URL
+	string "Toolchain URL"
+	depends on BR2_TOOLCHAIN_EXTERNAL_CUSTOM && BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
+	help
+	  URL of the custom toolchain tarball to download and install.
+
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 	string "Toolchain prefix"
 	depends on BR2_TOOLCHAIN_EXTERNAL_CUSTOM
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 3f58aad3e5..49dd0e2b6e 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -252,11 +252,17 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
 else
+# Custom toolchain
+TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
+TOOLCHAIN_EXTERNAL_SOURCE=$(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
+
 # A value must be set (even if unused), otherwise the
 # $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main
 # $(DL_DIR) rule
+ifeq (,$(TOOLCHAIN_EXTERNAL_SOURCE))
 TOOLCHAIN_EXTERNAL_SOURCE=none
 endif
+endif
 
 # Special handling for Blackfin toolchain, because of the split in two
 # tarballs, and the organization of tarball contents. The tarballs

From 163aeb14e23213a67d7b99a1c0cd9a5b28b75f77 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:42:39 +0200
Subject: [PATCH 2384/6849] toolchain-external: line up comments with reality

Line-up with changes from commit 3367d5ce770ac409e7b3f5bba2c7ed1a819b3ef7
"external-toolchain: run checks even on extracted toolchains"

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 49dd0e2b6e..9c88776f61 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -14,11 +14,10 @@
 #
 # The basic principle is the following
 #
-#  1. a. For toolchains downloaded from the Web, Buildroot already
-#  knows their configuration, so it just downloads them and extract
-#  them in $(TOOLCHAIN_EXTERNAL_DIR).
+#  1. If the toolchain is not pre-installed, download and extract it
+#  in $(TOOLCHAIN_EXTERNAL_DIR).
 #
-#  1. b. For pre-installed toolchains, perform some checks on the
+#  2. For all external toolchains, perform some checks on the
 #  conformity between the toolchain configuration described in the
 #  Buildroot menuconfig system, and the real configuration of the
 #  external toolchain. This is for example important to make sure that
@@ -30,19 +29,19 @@
 #  options. And at configuration time, we are not able to retrieve the
 #  external toolchain configuration.
 #
-#  2. Copy the libraries needed at runtime to the target directory,
+#  3. Copy the libraries needed at runtime to the target directory,
 #  $(TARGET_DIR). Obviously, things such as the C library, the dynamic
 #  loader and a few other utility libraries are needed if dynamic
 #  applications are to be executed on the target system.
 #
-#  3. Copy the libraries and headers to the staging directory. This
+#  4. Copy the libraries and headers to the staging directory. This
 #  will allow all further calls to gcc to be made using --sysroot
 #  $(STAGING_DIR), which greatly simplifies the compilation of the
 #  packages when using external toolchains. So in the end, only the
 #  cross-compiler binaries remains external, all libraries and headers
 #  are imported into the Buildroot tree.
 #
-#  4. Build a toolchain wrapper which executes the external toolchain
+#  5. Build a toolchain wrapper which executes the external toolchain
 #  with a number of arguments (sysroot/march/mtune/..) hardcoded,
 #  so we're sure the correct configuration is always used and the
 #  toolchain behaves similar to an internal toolchain.

From e8d9fa9d601a5ec6c0e44c6c4803354482fdaed7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Jun 2012 16:04:35 +0200
Subject: [PATCH 2385/6849] toolchain-external: add Linaro 2012.05

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index dceeed2ce0..cdcbb51c03 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,22 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
+	bool "Linaro 2012.05"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.05 (based on gcc 4.7), Linaro GDB 2012.05 (based on
+	  GDB 7.4), eglibc 2.13. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
 	bool "Linaro 2012.04"
 	depends on BR2_arm
@@ -534,6 +550,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 9c88776f61..3a14c7412e 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -202,6 +202,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.03-20120326_linux.ta
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.04/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.04-20120426_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.05/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.05-20120523_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 68973cca23bbbaff1d763a434114021e5a695515 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Jun 2012 16:04:36 +0200
Subject: [PATCH 2386/6849] toolchain-external: adjust logic to support Linaro
 2012.05

The check_glibc function verifies that the C library of the external
toolchain is glibc. To do so, it verified that a file matching
ld-linux*.so.* or ld.so.* was found in the lib/ directory of the
toolchain's sysroot. However, with the Linaro 2012.05 toolchain, the
lib/ directory contains two links named ld-linux-armhf.so.3 and
ld-linux.so.3, which means that the first ld-linux*.so.* wildcard
expression expands to two files, which generates a syntax error for
the "test" program. We replace that with a more elaborate find+wc
combination to determine whether at least one matching file is
present.

The check_arm_abi function verifies the ABI of an ARM toolchain. For
EABI, it tested that the target name ends with eabi. However, with
Linaro 2012.05, the tuple is now arm-linux-gnueabihf (for hard float),
so we have to adjust the logic to accept this additional "hf"
specification in the tuple.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 649b91b03a..49a90441b0 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -196,7 +196,7 @@ check_glibc_feature = \
 #
 check_glibc = \
 	SYSROOT_DIR="$(strip $1)"; \
-	if ! test -f $${SYSROOT_DIR}/lib/ld-linux*.so.* -o -f $${SYSROOT_DIR}/lib/ld.so.* ; then \
+	if test `find $${SYSDROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \
@@ -263,7 +263,7 @@ check_uclibc = \
 check_arm_abi = \
 	__CROSS_CC=$(strip $1) ; \
 	EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \
-	if echo $${EXT_TOOLCHAIN_TARGET} | grep -q 'eabi$$' ; then \
+	if echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
 		EXT_TOOLCHAIN_ABI="eabi" ; \
 	else \
 		EXT_TOOLCHAIN_ABI="oabi" ; \

From b64233fc243c7668627d22c29b8bb1077b825d70 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 11:31:46 +0200
Subject: [PATCH 2387/6849] toolchain-external: add Linaro 2012.06

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index cdcbb51c03..2b2e763395 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,22 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
+	bool "Linaro 2012.06"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.06 (based on gcc 4.7), Linaro GDB 2012.06 (based on
+	  GDB 7.4), eglibc 2.15. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
 	bool "Linaro 2012.05"
 	depends on BR2_arm
@@ -551,6 +567,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 3a14c7412e..e0515f114a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -205,6 +205,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.04-20120426_linux.ta
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.05/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.05-20120523_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.06/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.06-20120625_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From ba92d6ef68eeb37ba435648fcfbd1dbe13212e6d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 16:08:28 +0200
Subject: [PATCH 2388/6849] Make hard-float the default on Cortex-A8 and
 Cortex-A9

Cortex-A8 and Cortex-A9 ARM cores are guaranteed to provide a hardware
floating point unit, so there's no reason to default to software
floating point for them.

More importantly, the newest Linaro toolchains are hard float
toolchains, so basically an user choosing those toolchains and leaving
the default option of software float would run in compilation issues.

So let's make hard float the default for Cortex-A8 and Cortex-A9.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-common.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index cc7b4de56e..710f2df9c5 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -101,7 +101,11 @@ config BR2_USE_MMU
 
 config BR2_PREFER_SOFT_FLOAT
 	bool
-	default y if BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel
+	default y if (BR2_arm && !BR2_cortex_a8 && !BR2_cortex_a9)
+	default y if BR2_armeb
+	default y if BR2_avr32
+	default y if BR2_mips
+	default y if BR2_mipsel
 
 config BR2_SOFT_FLOAT
 	bool "Use software floating point by default"

From 9d1fd3affbaec495ce4b046bb6e3826f2d3c25f1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 16:54:18 +0200
Subject: [PATCH 2389/6849] toolchain-external: remove Linaro 2012.01

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 15 ---------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 18 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2b2e763395..835763adb3 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -77,20 +77,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
 	  Thumb 2, with the softfp calling convention, and uses the
 	  VFPv3-D16 FPU instructions.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
-	bool "Linaro 2012.01"
-	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.01 (based on gcc 4.6), Linaro GDB 2011.12, eglibc
-	  2.13. It generates code that runs on all Cortex-A profile
-	  devices, but tuned for the Cortex-A9. The code generated is
-	  Thumb 2, with the softfp calling convention, and uses the
-	  VFPv3-D16 FPU instructions.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
 	depends on BR2_arm
@@ -562,7 +548,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index e0515f114a..35fcb7b978 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -190,9 +190,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_01),y)
-TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.01/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.01-20120125_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02),y)
 TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.02/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.02-20120222_linux.tar.bz2

From 67ef65600d59879c31901088be0ed8606ab6fa5c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 16:54:43 +0200
Subject: [PATCH 2390/6849] toolchain-external: remove ARM CodeSourcery 2009q3

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 22 ----------------------
 toolchain/toolchain-external/ext-tool.mk |  5 +----
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 835763adb3..3b1d792c4c 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -161,27 +161,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	       Select BR2_SOFT_FLOAT
 	       Set BR2_TARGET_OPTIMIZATION to -mthumb
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
-	bool "Sourcery CodeBench ARM 2009q3"
-	depends on BR2_arm
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the ARM architecture, from
-	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
-	  2.10 and gdb 6.8 and kernel headers 2.6.30. It has support
-	  for the following variants:
-	    - ARMv5T, little endian, soft-float, glibc
-	      Select ARM926T, ARM10T, XScale or another ARMv5 core
-	      Select BR2_SOFT_FLOAT
-	    - ARMv4T, little endian, soft-float, glibc
-	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-	      Select BR2_SOFT_FLOAT
-	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mthumb
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	bool "Sourcery CodeBench MIPS 2011.03"
 	depends on BR2_mips || BR2_mipsel
@@ -553,7 +532,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
-	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 35fcb7b978..14804d6088 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -175,10 +175,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package5383/public/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2009q3-67-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009),y)

From adf586ecb9f3e0cce0da19ddc736bf7ddc27f1d6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Jun 2012 16:04:39 +0200
Subject: [PATCH 2391/6849] toolchain-external: add Blackfin toolchain
 2012R1-BETA1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 3b1d792c4c..f53ec88749 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -427,6 +427,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	  Other architecture variants (beyond Pentium-4/Xeon) are
 	  supported as well, but glibc is not optimised for it.
 
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
+	bool "Blackfin.uclinux.org 2012R1-BETA1"
+	depends on BR2_bfin
+	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_INET_RPC
+	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	help
+	  Toolchain for the Blackfin architecture, from
+	  http://blackfin.uclinux.org.
+
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	bool "Blackfin.uclinux.org 2011R1-RC4"
 	depends on BR2_bfin
@@ -552,6 +567,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BFIN_FDPIC
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && !BR2_BFIN_FDPIC
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 14804d6088..388eccc33e 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -244,6 +244,12 @@ TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9517/
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
+TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/544/9749/
+TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-BETA1.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/544/9773/
+TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R1-BETA1.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0_le.git;a=blob;h=d7b493c5dbcc24ba9cc3be2e4c14d6d9701e6805;hb=00163583b771bb4e937632765dd0c5516b3e31c4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
@@ -268,7 +274,7 @@ endif
 # contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
 # which themselves contain the toolchain. This is why we strip more
 # components than usual.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 

From 5cc492482589a78f46b1945b176821775fca86c8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Jun 2012 16:04:40 +0200
Subject: [PATCH 2392/6849] toolchain-external: add Sourcery CodeBench MIPS
 2011.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in   | 68 ++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 ++
 2 files changed, 71 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f53ec88749..5c29ecd0b1 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -161,6 +161,73 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	       Select BR2_SOFT_FLOAT
 	       Set BR2_TARGET_OPTIMIZATION to -mthumb
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
+	bool "Sourcery CodeBench MIPS 2011.09"
+	depends on BR2_mips || BR2_mipsel
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.21.53, glibc
+	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
+	  3.0.1. It has support for the following variants:
+	    - MIPS32 O32 big endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS64 big endian glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS32 O32 little endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS64 little endian glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	    - MIPS64 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Select BR2_SOFT_FLOAT
+	    - MIPS32 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS64 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 big endian soft float uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian soft float uclibc
+	      Not usable in Buildroot yet.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	bool "Sourcery CodeBench MIPS 2011.03"
 	depends on BR2_mips || BR2_mipsel
@@ -555,6 +622,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
+	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 388eccc33e..53b898f3f3 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -208,6 +208,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9469/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-110-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package9761/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 5a83e0849964c5160b980bb57ce89e28684a7dbb Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 22 Jun 2012 07:37:03 +0200
Subject: [PATCH 2393/6849] Package downloads: allow restricting to primary
 site only

This patch adds a new config option BR2_PRIMARY_SITE_ONLY that, when set,
restricts package downloads to the specified BR2_PRIMARY_SITE. If the package
is not present on the primary site, the download fails.

This is useful for project developers who want to ensure that the project can
be built even if the upstream tarball locations disappear.

[thomas.petazzoni@free-electrons.com:
 Extend config option help message with more details coming from the
 commit log. Added a dependency on the fact that a primary site has
 been defined. Without any primary site (the default configuration),
 this new option does not make any sense.]

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Config.in               | 18 ++++++++++++++++++
 package/pkg-download.mk |  7 +++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Config.in b/Config.in
index c182f7044d..b18c92721c 100644
--- a/Config.in
+++ b/Config.in
@@ -123,6 +123,22 @@ config BR2_PRIMARY_SITE
 	  NOTE: This works for all packages using the central package
 	  infrastructure (generic, autotools, cmake, ...)
 
+config BR2_PRIMARY_SITE_ONLY
+	bool "Only allow downloads from primary download site"
+	depends on BR2_PRIMARY_SITE != ""
+	help
+	  If this option is enabled, downloads will only be attempted
+	  from the primary download site. Other locations, like the
+	  package's official download location or the backup download
+	  site, will not be considered. Therefore, if the package is
+	  not present on the primary site, the download fails.
+
+	  This is useful for project developers who want to ensure
+	  that the project can be built even if the upstream tarball
+	  locations disappear.
+
+if !BR2_PRIMARY_SITE_ONLY
+
 config BR2_BACKUP_SITE
 	string "Backup download site"
 	default "http://sources.buildroot.net/"
@@ -179,6 +195,8 @@ config BR2_DEBIAN_MIRROR
 	  Usually, just add your country code like XX here:
 	  http://ftp.XX.debian.org
 
+endif
+
 endmenu
 
 config BR2_JLEVEL
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index e93875988f..9e98581000 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -192,8 +192,8 @@ endef
 ################################################################################
 # DOWNLOAD -- Download helper. Will try to download source from:
 # 1) BR2_PRIMARY_SITE if enabled
-# 2) Download site
-# 3) BR2_BACKUP_SITE if enabled
+# 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set
+# 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set
 #
 # Argument 1 is the source location
 # Argument 2 is the source filename
@@ -213,6 +213,9 @@ define DOWNLOAD_INNER
 			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 		esac ; \
 	fi ; \
+	if test "$(BR2_PRIMARY_SITE_ONLY)" = "y" ; then \
+		exit 1 ; \
+	fi ; \
 	if test -n "$(1)" ; then \
 		if test -z "$($(PKG)_SITE_METHOD)" ; then \
 			scheme="$(call geturischeme,$(1))" ; \

From 6b36d541184f47e7c8d5a0d56766462169878bf4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 18:41:13 +0200
Subject: [PATCH 2394/6849] docs: announce the upcoming Buildroot developer
 meeting

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/news.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index 256d3b9826..80606384b8 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,22 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>22 July 2012 -- Buildroot Developer Day</b>
+
+    <p>The next <i>Buildroot Developer Day</i> meeting will take place
+    on Saturday November 3th and Sunday November 4th 2012 in
+    Barcelona, Spain, just before
+    the <a href="https://events.linuxfoundation.org/events/embedded-linux-conference-europe">Embedded
+    Linux Conference Europe</a> (November 5th-7th). This two days
+    meeting is mainly opened to Buildroot developers and contributors,
+    or Buildroot users having a prior experience with the tool. This
+    meeting will allow developers to work and Buildroot, and discuss
+    current issues, the future directions, and more.</p>
+
+    <p>For more details, see
+    the <a href="http://elinux.org/Buildroot#Buildroot_Developers_Meeting.2C_3-4_November_2012.2C_Barcelona_Spain">wiki
+    page</a> dedicated to the meeting.</p>
+
   <li><b>30 May 2012 -- 2012.05 released</b>
 
     <p>The stable 2012.05 release is out - Thanks to everyone

From 853545c835e819c689862e8941f7d7c1a8bb4be0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 21 Jul 2012 19:47:51 +0100
Subject: [PATCH 2395/6849] lighttpd: use standard web root directory

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-By: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../lighttpd-Fix-default-config-file.patch    | 62 ++++++++++---------
 package/lighttpd/lighttpd.mk                  | 11 ++--
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/package/lighttpd/lighttpd-Fix-default-config-file.patch b/package/lighttpd/lighttpd-Fix-default-config-file.patch
index 59ce907751..88d2c6f333 100644
--- a/package/lighttpd/lighttpd-Fix-default-config-file.patch
+++ b/package/lighttpd/lighttpd-Fix-default-config-file.patch
@@ -8,25 +8,35 @@ Modify the default lighttpd configuration file to have one a starting conf
   * Change the network backend to writev since linux-sendfile fails on buildroot
 
 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
----
- doc/config/conf.d/access_log.conf |    2 +-
- doc/config/lighttpd.conf          |   18 +++++++++---------
- 2 files changed, 10 insertions(+), 10 deletions(-)
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
 
-Index: lighttpd-1.4.30/doc/config/lighttpd.conf
-===================================================================
---- lighttpd-1.4.30.orig/doc/config/lighttpd.conf
-+++ lighttpd-1.4.30/doc/config/lighttpd.conf
-@@ -13,7 +13,7 @@
+diff -Nurp a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf
+--- a/doc/config/conf.d/access_log.conf	2010-07-11 18:01:32.000000000 +0100
++++ b/doc/config/conf.d/access_log.conf	2012-07-21 19:37:58.453207990 +0100
+@@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" )
+ ##
+ ## Default access log.
+ ##
+-accesslog.filename          = log_root + "/access.log"
++accesslog.filename          = log_root + "/lighttpd-access.log"
+ 
+ ##
+ ## The default format produces CLF compatible output.
+diff -Nurp a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
+--- a/doc/config/lighttpd.conf	2011-12-18 12:57:25.000000000 +0000
++++ b/doc/config/lighttpd.conf	2012-07-21 19:40:45.281200552 +0100
+@@ -13,8 +13,8 @@
  ## if you add a variable here. Add the corresponding variable in the
  ## chroot example aswell.
  ##
 -var.log_root    = "/var/log/lighttpd"
+-var.server_root = "/srv/www"
 +var.log_root    = "/var/log"
- var.server_root = "/srv/www"
++var.server_root = "/var/www"
  var.state_dir   = "/var/run"
  var.home_dir    = "/var/lib/lighttpd"
-@@ -90,7 +90,7 @@
+ var.conf_dir    = "/etc/lighttpd"
+@@ -90,7 +90,7 @@ server.port = 80
  ##
  ## Use IPv6?
  ##
@@ -35,7 +45,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf
  
  ##
  ## bind to a specific IP
-@@ -101,8 +101,8 @@
+@@ -101,8 +101,8 @@ server.use-ipv6 = "enable"
  ## Run as a different username/groupname.
  ## This requires root permissions during startup. 
  ##
@@ -46,7 +56,16 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf
  
  ## 
  ## enable core files.
-@@ -138,7 +138,7 @@
+@@ -112,7 +112,7 @@ server.groupname = "lighttpd"
+ ##
+ ## Document root
+ ##
+-server.document-root = server_root + "/htdocs"
++server.document-root = server_root
+ 
+ ##
+ ## The value for the "Server:" response field.
+@@ -138,7 +138,7 @@ server.pid-file = state_dir + "/lighttpd
  ##
  ## Path to the error log file
  ##
@@ -55,7 +74,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf
  
  ##
  ## If you want to log to syslog you have to unset the 
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll"
  ## linux-sendfile - is recommended for small files.
  ## writev         - is recommended for sending many large files
  ##
@@ -64,7 +83,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf
  
  ##
  ## As lighttpd is a single-threaded server, its main resource limit is
-@@ -311,9 +311,9 @@
+@@ -311,9 +311,9 @@ url.access-deny             = ( "~", ".i
  ## disable range requests for pdf files
  ## workaround for a bug in the Acrobat Reader plugin.
  ##
@@ -77,16 +96,3 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf
  
  ##
  ## url handling modules (rewrite, redirect)
-Index: lighttpd-1.4.30/doc/config/conf.d/access_log.conf
-===================================================================
---- lighttpd-1.4.30.orig/doc/config/conf.d/access_log.conf
-+++ lighttpd-1.4.30/doc/config/conf.d/access_log.conf
-@@ -9,7 +9,7 @@
- ##
- ## Default access log.
- ##
--accesslog.filename          = log_root + "/access.log"
-+accesslog.filename          = log_root + "/lighttpd-access.log"
- 
- ##
- ## The default format produces CLF compatible output.
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 5ff4ce65b9..48f733a3de 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -57,9 +57,8 @@ LIGHTTPD_CONF_OPT += --without-lua
 endif
 
 define LIGHTTPD_INSTALL_CONFIG
-	mkdir -p $(TARGET_DIR)/etc/lighttpd
-	mkdir -p $(TARGET_DIR)/etc/lighttpd/conf.d
-	mkdir -p $(TARGET_DIR)/srv/www/htdocs
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www
 
 	[ -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] || \
 		$(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \
@@ -89,9 +88,9 @@ endef
 LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG
 
 define LIGHTTPD_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/lighttpd
-	rm -f $(TARGET_DIR)/usr/sbin/lighttpd-angel
-	rm -rf $(TARGET_DIR)/usr/lib/lighttpd
+	$(RM) $(TARGET_DIR)/usr/sbin/lighttpd
+	$(RM) $(TARGET_DIR)/usr/sbin/lighttpd-angel
+	$(RM) -r $(TARGET_DIR)/usr/lib/lighttpd
 endef
 
 $(eval $(autotools-package))

From ccda74f3c72d1c8809ee171e39a7712b23a03dc2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 19:17:48 +0200
Subject: [PATCH 2396/6849] lighttpd: add simple startup script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lighttpd/S50lighttpd | 37 ++++++++++++++++++++++++++++++++++++
 package/lighttpd/lighttpd.mk |  8 ++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 package/lighttpd/S50lighttpd

diff --git a/package/lighttpd/S50lighttpd b/package/lighttpd/S50lighttpd
new file mode 100644
index 0000000000..752402ce42
--- /dev/null
+++ b/package/lighttpd/S50lighttpd
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Starts lighttpd.
+#
+
+start() {
+	echo -n "Starting lighttpd: "
+	start-stop-daemon -S -q -p /var/run/lighttpd.pid --exec /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf
+	echo "OK"
+}
+stop() {
+	echo -n "Stopping lighttpd: "
+	start-stop-daemon -K -q -p /var/run/lighttpd.pid
+	echo "OK"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
+
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 48f733a3de..9f554cbc35 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -87,6 +87,14 @@ endef
 
 LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG
 
+define LIGHTTPD_INSTALL_INIT_SCRIPT
+	[ -f $(TARGET_DIR)/etc/init.d/S50lighttpd ] || \
+		$(INSTALL) -D -m 755 package/lighttpd/S50lighttpd \
+			$(TARGET_DIR)/etc/init.d/S50lighttpd
+endef
+
+LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_INIT_SCRIPT
+
 define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	$(RM) $(TARGET_DIR)/usr/sbin/lighttpd
 	$(RM) $(TARGET_DIR)/usr/sbin/lighttpd-angel

From ff2ee34086a24bd23eff054d7a51eaee5e721e11 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 22 Jul 2012 15:28:31 +0200
Subject: [PATCH 2397/6849] cleanup trailing white space

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 64c6deabb4..e7aec56af8 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -242,7 +242,7 @@ choice
 	default BR2_mips_1 if BR2_mipsel
 	help
 	  Specific CPU variant to use
-	
+
 	  64bit cabable: 3, 4, 64, 64r2
 	  non-64bit capable: 1, 2, 32, 32r2
 

From 736ce2f3da29558544a38b0404e0c4ff4d41c9ac Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 22 Jul 2012 15:28:33 +0200
Subject: [PATCH 2398/6849] pkg-utils.mk: fix/clean indentation

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-utils.mk | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 35abb17ce5..293bf4f129 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -17,11 +17,11 @@
 [TO]   := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _
 
 UPPERCASE = $(strip $(eval __tmp := $1) \
-     $(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
-	$(eval __tmp :=	\
+	$(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
+		$(eval __tmp :=	\
 		$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\
-			$(__tmp)))) \
-     $(__tmp))
+	$(__tmp)))) \
+	$(__tmp))
 
 #
 # Manipulation of .config files based on the Kconfig
@@ -30,18 +30,18 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
 #
 
 define KCONFIG_ENABLE_OPT
-       $(SED) "/\\<$(1)\\>/d" $(2)
-       echo "$(1)=y" >> $(2)
+	$(SED) "/\\<$(1)\\>/d" $(2)
+	echo "$(1)=y" >> $(2)
 endef
 
 define KCONFIG_SET_OPT
-       $(SED) "/\\<$(1)\\>/d" $(3)
-       echo "$(1)=$(2)" >> $(3)
+	$(SED) "/\\<$(1)\\>/d" $(3)
+	echo "$(1)=$(2)" >> $(3)
 endef
 
 define KCONFIG_DISABLE_OPT
-       $(SED) "/\\<$(1)\\>/d" $(2)
-       echo "# $(1) is not set" >> $(2)
+	$(SED) "/\\<$(1)\\>/d" $(2)
+	echo "# $(1) is not set" >> $(2)
 endef
 
 # Helper functions to determine the name of a package and its
@@ -50,17 +50,9 @@ endef
 # automagically find where the package is located. Note that the
 # pkgdir macro is carefully written to handle the case of the Linux
 # package, for which the package directory is an empty string.
-define pkgdir
-$(dir $(lastword $(MAKEFILE_LIST)))
-endef
-
-define pkgname
-$(lastword $(subst /, ,$(call pkgdir)))
-endef
-
-define pkgparentdir
-$(patsubst %$(call pkgname)/,%,$(call pkgdir))
-endef
+pkgdir       = $(dir $(lastword $(MAKEFILE_LIST)))
+pkgname      = $(lastword $(subst /, ,$(call pkgdir)))
+pkgparentdir = $(patsubst %$(call pkgname)/,%,$(call pkgdir))
 
 # Define extractors for different archive suffixes
 INFLATE.bz2  = $(BZCAT)
@@ -72,15 +64,15 @@ INFLATE.xz   = $(XZCAT)
 INFLATE.tar  = cat
 
 # MESSAGE Macro -- display a message in bold type
-MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
-TERM_BOLD := $(shell tput smso)
+MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+TERM_BOLD  := $(shell tput smso)
 TERM_RESET := $(shell tput rmso)
 
 # Utility functions for 'find'
 # findfileclauses(filelist) => -name 'X' -o -name 'Y'
 findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
 # finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY'
-finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
+finddirclauses  = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
 
 # Miscellaneous utility functions
 # notfirstword(wordlist): returns all but the first word in wordlist

From 9ba9bfb9a02706fa414bcf4c6dcceac1b68a5c9a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 22 Jul 2012 15:28:34 +0200
Subject: [PATCH 2399/6849] pkg-*targets.mk: factorize and fix $(PKG)_SRCDIR
 and $(PKG)_BUILDDIR declaration

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-autotools.mk | 10 ----------
 package/pkg-cmake.mk     |  9 ---------
 package/pkg-generic.mk   | 11 +++++++++++
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index e4540509d9..785daab0e1 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -54,15 +54,6 @@ endef
 
 define inner-autotools-package
 
-# define package-specific variables to default values
-ifndef $(2)_SUBDIR
- ifdef $(3)_SUBDIR
-  $(2)_SUBDIR = $($(3)_SUBDIR)
- else
-  $(2)_SUBDIR ?=
- endif
-endif
-
 ifndef $(2)_LIBTOOL_PATCH
  ifdef $(3)_LIBTOOL_PATCH
   $(2)_LIBTOOL_PATCH = $($(3)_LIBTOOL_PATCH)
@@ -91,7 +82,6 @@ $(2)_CLEAN_OPT			?= clean
 $(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall
 $(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall
 
-$(2)_SRCDIR                     = $$($(2)_DIR)/$$($(2)_SUBDIR)
 
 #
 # Configure step. Only define it if not already defined by the package
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index f9a59341ad..626a0b00c2 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -37,15 +37,6 @@
 
 define inner-cmake-package
 
-# define package-specific variables to default values
-ifndef $(2)_SUBDIR
- ifdef $(3)_SUBDIR
-  $(2)_SUBDIR = $($(3)_SUBDIR)
- else
-  $(2)_SUBDIR ?=
- endif
-endif
-
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
 $(2)_MAKE			?= $(MAKE)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index c01440e64c..8a730c0a01 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -204,6 +204,17 @@ $(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)
 $(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
 $(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
 
+ifndef $(3)_SUBDIR
+ ifdef $(2)_SUBDIR
+  $(3)_SUBDIR = $$($(2)_SUBDIR)
+ else
+  $(3)_SUBDIR ?=
+ endif
+endif
+
+$(2)_SRCDIR		       = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR		       ?= $$($(2)_SRCDIR)
+
 ifneq ($$($(2)_OVERRIDE_SRCDIR),)
 $(2)_VERSION = custom
 endif

From 844f19133975fe9aa517e4be7702b9b2dd76d54c Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 22 Jul 2012 15:28:32 +0200
Subject: [PATCH 2400/6849] elftosb: fix build forcing g++ compiler

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../elftosb10.12.01-force_cxx_compiler.patch  | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 package/elftosb/elftosb10.12.01-force_cxx_compiler.patch

diff --git a/package/elftosb/elftosb10.12.01-force_cxx_compiler.patch b/package/elftosb/elftosb10.12.01-force_cxx_compiler.patch
new file mode 100644
index 0000000000..14df0dbe46
--- /dev/null
+++ b/package/elftosb/elftosb10.12.01-force_cxx_compiler.patch
@@ -0,0 +1,98 @@
+Subject: [PATCH 1/1] elftosb: force host C++ compiler
+
+Because Freescale provides *.cpp sources and elftosb links again libstdc++,
+force to use the host c++ compiler.
+
+This patch avoids the following error occurs:
+
+gcc AESKey.o Blob.o crc.o DataSource.o DataTarget.o ELFSourceFile.o EncoreBootImage.o EvalContext.o GHSSecInfo.o GlobMatcher.o HexValues.o Logging.o Operation.o OptionDictionary.o options.o OutputSection.o Random.o RijndaelCBCMAC.o rijndael.o SHA1.o SourceFile.o SRecordSourceFile.o stdafx.o StELFFile.o StExecutableImage.o StSRecordFile.o Value.o Version.o format_string.o ExcludesListMatcher.o SearchPath.o DataSourceImager.o IVTDataSource.o BootImageGenerator.o ConversionController.o ElftosbAST.o elftosb.o elftosb_lexer.o ElftosbLexer.o elftosb_parser.tab.o EncoreBootImageGenerator.o -lstdc++ -o elftosb
+/usr/bin/ld: ElftosbAST.o: undefined reference to symbol 'powf@@GLIBC_2.2.5'
+/usr/bin/ld: note: 'powf@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
+/lib64/libm.so.6: could not read symbols: Invalid operation
+collect2: error: ld returned 1 exit status
+
+When compiling with gcc and linking against libstdc++, ld uses libc instead of
+libstdc++.
+However, libc does not provide all functions libstdc++ does.
+Indeed, maths functions are provided by libm, not libc.
+Thus, elftosb should either:
+- use gcc and link against libc and libm;
+- or use g++ and link against libstdc++.
+
+Because elftosb is written in C++, this patch implement the sencond option, using
+g++ and linking against libstdc++.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+Index: host-elftosb-10.12.01/makefile.rules
+===================================================================
+--- host-elftosb-10.12.01.orig/makefile.rules	2012-06-09 21:12:23.557526100 +0200
++++ host-elftosb-10.12.01/makefile.rules	2012-06-09 21:15:21.659894571 +0200
+@@ -15,6 +15,8 @@
+ # UNAMES is going to be set to either "Linux" or "CYGWIN_NT-5.1"
+ UNAMES = $(shell uname -s)
+
++CXX ?= g++
++
+ #*******************************************************************************
+ #                               Directories
+
+@@ -37,9 +39,9 @@
+ #*******************************************************************************
+ #                               Build flags
+-# gcc Compiler flags
++# Compiler flags
+ #    -g						: Produce debugging information.
+
+-CFLAGS	    = -g $(INC_PATH) -D${UNAMES}
++CXXFLAGS	= -g $(INC_PATH) -D${UNAMES}
+
+ #*******************************************************************************
+ #                               File lists
+@@ -137,13 +139,13 @@ clean:
+ 		${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN}
+
+ elftosb: ${OBJ_FILES_ELFTOSB2}
+-	gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
++	$(CXX) ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
+
+ sbtool: ${OBJ_FILES_SBTOOL}
+-	gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
++	$(CXX) ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
+
+ keygen: ${OBJ_FILES_KEYGEN}
+-	gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
++	$(CXX) ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
+
+
+ #ifeq ("${UNAMES}", "Linux")
+@@ -153,10 +155,10 @@ keygen: ${OBJ_FILES_KEYGEN}
+ .SUFFIXES : .c .cpp
+
+ .c.o :
+-	gcc ${CFLAGS} -c $<
++	$(CC) ${CXXFLAGS} -c $<
+
+ .cpp.o :
+-	gcc ${CFLAGS} -c $<
++	$(CXX) ${CXXFLAGS} -c $<
+
+ #endif
+
+@@ -165,13 +167,13 @@ keygen: ${OBJ_FILES_KEYGEN}
+
+ %.d: %.c
+ 	@set -e; \
+-	$(CC) -MM $(CFLAGS) $< | \
++	$(CC) -MM $(CXXFLAGS) $< | \
+ 	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
+ 	[ -s $@ ]  || rm -f $@
+
+ %.d: %.cpp
+ 	@set -e; \
+-	$(CC) -MM $(CFLAGS) $< | \
++	$(CXX) -MM $(CXXFLAGS) $< | \
+ 	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
+ 	[ -s $@ ]  || rm -f $@
+

From be07ff19cbeae0c18a8a1604f07a682e1cfbfc26 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 20:24:18 +0200
Subject: [PATCH 2401/6849] elftosb: remove version number of patch filenames

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...10.12.01-fixes_includes.patch => elftosb-fixes-includes.patch} | 0
 ...-force_cxx_compiler.patch => elftosb-force-cxx-compiler.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/elftosb/{elftosb10.12.01-fixes_includes.patch => elftosb-fixes-includes.patch} (100%)
 rename package/elftosb/{elftosb10.12.01-force_cxx_compiler.patch => elftosb-force-cxx-compiler.patch} (100%)

diff --git a/package/elftosb/elftosb10.12.01-fixes_includes.patch b/package/elftosb/elftosb-fixes-includes.patch
similarity index 100%
rename from package/elftosb/elftosb10.12.01-fixes_includes.patch
rename to package/elftosb/elftosb-fixes-includes.patch
diff --git a/package/elftosb/elftosb10.12.01-force_cxx_compiler.patch b/package/elftosb/elftosb-force-cxx-compiler.patch
similarity index 100%
rename from package/elftosb/elftosb10.12.01-force_cxx_compiler.patch
rename to package/elftosb/elftosb-force-cxx-compiler.patch

From 1e75a2d229b42aa8f0e6e0f0f04dc1a34988d996 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 20:29:50 +0200
Subject: [PATCH 2402/6849] elftosb: use HOST_CONFIGURE_OPTS instead of
 HOST_MAKE_ENV

HOST_CONFIGURE_OPTS allows to pass the correct CC, CXX, CFLAGS,
CXXFLAGS, etc. For example, it allows the elftosb build process to
properly use ccache when available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/elftosb/elftosb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
index b2e50f72f2..5803b75928 100644
--- a/package/elftosb/elftosb.mk
+++ b/package/elftosb/elftosb.mk
@@ -8,7 +8,7 @@ ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
 ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
 
 define HOST_ELFTOSB_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) all
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
 endef
 
 define HOST_ELFTOSB_INSTALL_CMDS

From 600375d18e6ccd08505153863666f2e8b10251be Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 22 Jul 2012 15:28:37 +0200
Subject: [PATCH 2403/6849] m4: fix build with glibc >=2.16

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

 create mode 100644 package/m4/m4-1.4.16-no-gets.patch
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/m4/m4-1.4.16-no-gets.patch | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/m4/m4-1.4.16-no-gets.patch

diff --git a/package/m4/m4-1.4.16-no-gets.patch b/package/m4/m4-1.4.16-no-gets.patch
new file mode 100644
index 0000000000..a0573776b6
--- /dev/null
+++ b/package/m4/m4-1.4.16-no-gets.patch
@@ -0,0 +1,38 @@
+Since the 2.16 release of the glibc, 'gets' is not any more defined in the gnulib.
+No m4 version synchronized with gnulib since [1] has been released yet.
+
+This patch avoids the following error occurs when building m4 <=1.4.16 on host using
+a glibc >=2.16:
+
+make[4]: Entering directory `/opt/buildroot/output/build/host-m4-1.4.16/lib'
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT gl_avltree_oset.o -MD -MP -MF .deps/gl_avltree_oset.Tpo -c -o gl_avltree_oset.o gl_avltree_oset.c
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT c-ctype.o -MD -MP -MF .deps/c-ctype.Tpo -c -o c-ctype.o c-ctype.c
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT c-stack.o -MD -MP -MF .deps/c-stack.Tpo -c -o c-stack.o c-stack.c
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT clean-temp.o -MD -MP -MF .deps/clean-temp.Tpo -c -o clean-temp.o clean-temp.c
+mv -f .deps/c-ctype.Tpo .deps/c-ctype.Po
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT close-hook.o -MD -MP -MF .deps/close-hook.Tpo -c -o close-hook.o close-hook.c
+In file included from clean-temp.h:22:0,
+                 from clean-temp.c:23:
+./stdio.h:477:20: error 'gets' undeclared here (not in a function)
+make[4]: *** [clean-temp.o] Error 1
+
+References:
+[1] http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=66712c23388e93e5c518ebc8515140fa0c807348
+[2] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?diff_format=h&revision=1.1&view=markup
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+diff -purN host-m4-1.4.16.orig/lib/stdio.in.h host-m4-1.4.16/lib/stdio.in.h
+--- host-m4-1.4.16.orig/lib/stdio.in.h	2012-07-21 19:11:40.196541826 +0200
++++ host-m4-1.4.16/lib/stdio.in.h	2012-07-21 20:46:05.405850751 +0200
+@@ -162,7 +162,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

From 9664e610716d24bdfb784c0e0414b88a2879a4e1 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 22 Jul 2012 15:28:38 +0200
Subject: [PATCH 2404/6849] tar: fix build with glibc >=2.16

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

 create mode 100644 package/tar/tar-1.26-no-gets.patch
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tar/tar-1.26-no-gets.patch | 47 ++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/tar/tar-1.26-no-gets.patch

diff --git a/package/tar/tar-1.26-no-gets.patch b/package/tar/tar-1.26-no-gets.patch
new file mode 100644
index 0000000000..fb9d1881fb
--- /dev/null
+++ b/package/tar/tar-1.26-no-gets.patch
@@ -0,0 +1,47 @@
+Since the 2.16 release of the glibc, 'gets' is not any more defined in the gnulib.
+No tar version synchronized with gnulib since [1] has been released yet.
+
+This patch avoids the following error occurs when building tar <=1.4.16 on host using
+a glibc >=2.16:
+
+make[5]: Entering directory `/home/samuel/data/workspace/src/buildroot/master/output/build/host-tar-1.26/gnu'
+  CC     areadlink.o
+  CC     areadlinkat.o
+  CC     argp-ba.o
+  CC     argp-eexst.o
+  CC     argp-fmtstream.o
+  CC     argp-fs-xinl.o
+In file included from argp.h:24:0,
+                 from argp-eexst.c:27:
+./stdio.h:479:1: error ‘gets’ undeclared here (not in a function)
+make[5]: *** [argp-eexst.o] Error 1
+make[5]: *** Waiting for unfinished jobs....
+In file included from argp-fmtstream.h:29:0,
+                 from argp-fs-xinl.c:28:
+./stdio.h:479:1: error ‘gets’ undeclared here (not in a function)
+make[5]: *** [argp-fs-xinl.o] Error 1
+In file included from argp-fmtstream.h:29:0,
+                 from argp-fmtstream.c:35:
+./stdio.h:479:1: error ‘gets’ undeclared here (not in a function)
+make[5]: *** [argp-fmtstream.o] Error 1
+
+References:
+[1] http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=66712c23388e93e5c518ebc8515140fa0c807348
+[2] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?diff_format=h&revision=1.1&view=markup
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+diff -purN host-tar-1.26.orig/gnu/stdio.in.h host-tar-1.26/gnu/stdio.in.h
+--- host-tar-1.26.orig/gnu/stdio.in.h	2012-07-21 21:17:12.392403084 +0200
++++ host-tar-1.26/gnu/stdio.in.h	2012-07-21 21:18:27.991993525 +0200
+@@ -164,7 +164,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

From 701940770b658e25cfe7219e35e808ba62052843 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 22 Jul 2012 20:57:26 +0200
Subject: [PATCH 2405/6849] toolchain-external: make preinstall the default for
 custom toolchains

All the defconfig files used by the autobuilders that use
pre-installed external toolchains are making the assumption that the
default for a custom external toolchain is "pre-installed". We keep
this default for now, since changing it breaks the autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5c29ecd0b1..e34802dc2a 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -573,6 +573,10 @@ endchoice
 
 choice
 	prompt "Toolchain origin"
+	# Keep compatibility with old defconfig files that are using
+	# custom toolchains, and which are therefore assuming that
+	# "preinstalled" in the default choice.
+	default BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 config BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
 	bool "Toolchain to be downloaded and installed"

From 060622d6d1696f3d946557e116505f859d9b6d3f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 23 Jul 2012 09:42:38 -0300
Subject: [PATCH 2406/6849] radvd: fix high jobcount build failure

Fix build failure:
http://autobuild.buildroot.org/results/48aabbc41dff2e4196dfd6e1e942cf6dbe050deb/build-end.log
because of a typo/missed update in the Makefile

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/radvd/radvd-highjob.patch | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/radvd/radvd-highjob.patch

diff --git a/package/radvd/radvd-highjob.patch b/package/radvd/radvd-highjob.patch
new file mode 100644
index 0000000000..594543548c
--- /dev/null
+++ b/package/radvd/radvd-highjob.patch
@@ -0,0 +1,27 @@
+From ce4911c13a3ab6877c0288c8a1874decb5d0e90a Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 23 Jul 2012 09:14:24 -0300
+Subject: [PATCH] Makefile: fix high jobcount build failures
+
+gram.h is a dependency for scanner.c rather than scanner.o which is
+unused.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 04b834b..8a90ca7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -131,5 +131,5 @@ dist-hook:
+ 	rm -f $(distdir)/gram.h
+ 	rm -f $(distdir)/scanner.c
+ 
+-scanner.o: gram.h
++scanner.c: gram.h
+ 
+-- 
+1.7.8.6
+

From 60279fb153319504093e0d04cf9fb19689c23e6f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 23 Jul 2012 14:21:56 -0300
Subject: [PATCH 2407/6849] php: security bump to version 5.3.15

Fix for CVE-2012-2688 (potential overflow in _php_stream_scandir),
CVE-2012-3365 (SQLite open_basedir bypass) and other misc bugfixes.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 31de2898b3..05446597d6 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.14
+PHP_VERSION = 5.3.15
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From 3083ea8922949613efb6ac9443422eccff3ee551 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 23 Jul 2012 23:22:26 +0200
Subject: [PATCH 2408/6849] scons: expose SCONS variable, pointing to host
 scons

Just like we have AUTOMAKE, AUTOCONF or QT_QMAKE, let the scons
package provide a SCONS variable that points to the scons host binary.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/scons/scons.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 85dbfaff57..b81c4f4bec 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -11,3 +11,6 @@ define HOST_SCONS_INSTALL_CMDS
 endef
 
 $(eval $(host-generic-package))
+
+# variables used by other packages
+SCONS = $(HOST_DIR)/usr/bin/scons

From b3afe4657615a0d5454668927041842ed33bbc97 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 23 Jul 2012 20:29:36 +0100
Subject: [PATCH 2409/6849] Bump gpsd from version 2.95 to version 3.7

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gpsd/Config.in                        |  22 +-
 .../gpsd-fix-acs_map-compile-errors.patch     |  29 +++
 package/gpsd/gpsd-fix-libgpsmm.patch          |  23 ---
 package/gpsd/gpsd-navcom.patch                |  47 -----
 package/gpsd/gpsd.mk                          | 189 +++++++++++-------
 5 files changed, 162 insertions(+), 148 deletions(-)
 create mode 100644 package/gpsd/gpsd-fix-acs_map-compile-errors.patch
 delete mode 100644 package/gpsd/gpsd-fix-libgpsmm.patch
 delete mode 100644 package/gpsd/gpsd-navcom.patch

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 16635dc0db..18e21e5af6 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -38,10 +38,6 @@ config BR2_PACKAGE_GPSD_NTP_SHM
 config BR2_PACKAGE_GPSD_PPS
 	bool "PPS time syncing support"
 
-config BR2_PACKAGE_GPSD_PPS_ON_CTS
-	bool "PPS pulse on CTS rather than DCD"
-	depends on BR2_PACKAGE_GPSD_PPS
-
 config BR2_PACKAGE_GPSD_USER
 	bool "GPSD privilege revocation user"
 config BR2_PACKAGE_GPSD_USER_VALUE
@@ -85,9 +81,6 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
 	bool "allow gpsctl/gpsmon to change device settings"
 	default y
 
-config BR2_PACKAGE_GPSD_RAW
-	bool "enable raw measurement processing"
-
 config BR2_PACKAGE_GPSD_SQUELCH
 	bool "squelch gpsd_report and gpsd_hexdump to save cpu"
 
@@ -116,6 +109,11 @@ config BR2_PACKAGE_GPSD_EVERMORE
 	help
 	  EverMore binary support
 
+config BR2_PACKAGE_GPSD_FURY
+	bool "Fury"
+	help
+	  Jackson Labs Fury and Firefly support
+
 config BR2_PACKAGE_GPSD_FV18
 	bool "FV-18"
 	help
@@ -131,6 +129,11 @@ config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT
 	help
 	  Garmin Simple Text support
 
+config BR2_PACKAGE_GPSD_GEOSTAR
+	bool "Geostar"
+	help
+	  Geostar Protocol support
+
 config BR2_PACKAGE_GPSD_GPSCLOCK
 	bool "GPSClock"
 	help
@@ -162,6 +165,11 @@ config BR2_PACKAGE_GPSD_NAVCOM
 	help
 	  Navcom binary support
 
+config BR2_PACKAGE_GPSD_NMEA2000
+	bool "nmea2000"
+	help
+	  NMEA2000/CAN support
+
 config BR2_PACKAGE_GPSD_OCEANSERVER
 	bool "OceanServer"
 	help
diff --git a/package/gpsd/gpsd-fix-acs_map-compile-errors.patch b/package/gpsd/gpsd-fix-acs_map-compile-errors.patch
new file mode 100644
index 0000000000..14d9287ee0
--- /dev/null
+++ b/package/gpsd/gpsd-fix-acs_map-compile-errors.patch
@@ -0,0 +1,29 @@
+Hack gpsd to prevent undefined references to acs_map from ncurses.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nurp a/gpsmon.c b/gpsmon.c
+--- a/gpsmon.c	2012-05-18 09:45:37.000000000 +0100
++++ b/gpsmon.c	2012-06-07 12:41:31.257807969 +0100
+@@ -24,6 +24,9 @@
+ #include <unistd.h>
+ #endif /* S_SPLINT_S */
+ 
++/* Ugly hack to prevent undefined reference to acs_map */
++unsigned long acs_map[128];
++
+ #include "gpsd_config.h"
+ #ifdef HAVE_BLUEZ
+ #include <bluetooth/bluetooth.h>
+diff -Nurp a/monitor_nmea.c b/monitor_nmea.c
+--- a/monitor_nmea.c	2011-11-22 08:49:33.000000000 +0000
++++ b/monitor_nmea.c	2012-06-07 12:41:37.081807709 +0100
+@@ -15,6 +15,9 @@
+ #include <unistd.h>
+ #endif /* S_SPLINT_S */
+ 
++/* Ugly hack to prevent undefined reference to acs_map */
++unsigned long acs_map[128];
++
+ #include "gpsd.h"
+ #include "gpsmon.h"
+ #include "gpsdclient.h"
diff --git a/package/gpsd/gpsd-fix-libgpsmm.patch b/package/gpsd/gpsd-fix-libgpsmm.patch
deleted file mode 100644
index 893965e383..0000000000
--- a/package/gpsd/gpsd-fix-libgpsmm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nura gpsd-2.95.orig/Makefile.in gpsd-2.95.x/Makefile.in
---- gpsd-2.95.orig/Makefile.in	2010-07-13 19:48:24.000000000 -0300
-+++ gpsd-2.95.x/Makefile.in	2010-07-27 17:40:28.902568874 -0300
-@@ -546,7 +546,7 @@
- libgps_VERSION__REVISION = 0
- libgps_VERSION_AGE = 0
- libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
--libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
-+libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) $(LDFLAGS)
- lib_LTLIBRARIES = libgps.la libgpsd.la
- libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
- libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION)
-@@ -612,8 +612,8 @@
- libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
- 				driver_rtcm2.h packet_states.h
- 
--@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
--@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
-+@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@
-+@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(libgps_la_LDFLAGS) -o $@
- nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
- libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
- libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la
diff --git a/package/gpsd/gpsd-navcom.patch b/package/gpsd/gpsd-navcom.patch
deleted file mode 100644
index 659cea1d81..0000000000
--- a/package/gpsd/gpsd-navcom.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-[PATCH] Navcom needs binary support
-
-Enable binary support when navcom driver is enabled, otherwise the build
-errors out with:
-
-./libgpsd.so: undefined reference to `navcom_binary'
-
-If no other drivers needing binary support are enabled.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- driver_navcom.c |    4 ++--
- gpsd.h-tail     |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: gpsd-2.95/driver_navcom.c
-===================================================================
---- gpsd-2.95.orig/driver_navcom.c
-+++ gpsd-2.95/driver_navcom.c
-@@ -44,7 +44,7 @@
- #include <stdio.h>
- #include "gpsd.h"
- 
--#if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE)
-+#if defined(NAVCOM_ENABLE)
- #include "bits.h"
- 
- /* Have data which is 24 bits long */
-@@ -1339,4 +1339,4 @@
- };
- /* *INDENT-ON* */
- 
--#endif /* defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) */
-+#endif /* defined(NAVCOM_ENABLE) */
-Index: gpsd-2.95/gpsd.h-tail
-===================================================================
---- gpsd-2.95.orig/gpsd.h-tail
-+++ gpsd-2.95/gpsd.h-tail
-@@ -30,7 +30,7 @@
- #ifdef EARTHMATE_ENABLE
- #define ZODIAC_ENABLE	
- #endif
--#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE)
-+#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(NAVCOM_ENABLE)
- #define BINARY_ENABLE	
- #endif
- #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE)
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 2ba5f713d0..dd1538646a 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -3,183 +3,230 @@
 # gpsd
 #
 #############################################################
-
-GPSD_VERSION = 2.95
-GPSD_SITE = http://download.berlios.de/gpsd
+GPSD_VERSION = 3.7
+GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd/
+GPSD_LICENSE = BSD-3c
+GPSD_LICENSE_FILES = COPYING
 GPSD_INSTALL_STAGING = YES
-GPSD_TARGET_BINS = cgps gpsctl gpsdecode gpsmon gpspipe gpxlogger lcdgps
+
+GPSD_DEPENDENCIES = host-scons
+
+GPSD_LDFLAGS = $(TARGET_LDFLAGS)
+
+GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS)
+
+GPSD_SCONS_OPTS = \
+	arch=$(ARCH)\
+	prefix=$(TARGET_DIR)/usr\
+	chrpath=no\
+	strip=no
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+	GPSD_DEPENDENCIES += ncurses
+else
+	GPSD_SCONS_OPTS += ncurses=no
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+	GPSD_DEPENDENCIES += python
+else
+	GPSD_SCONS_OPTS += python=no
+endif
+
+# Disable IPv6, if we don't support it
+ifneq ($(BR2_INET_IPV6),y)
+	GPSD_SCONS_OPTS += ipv6=no
+endif
 
 # Build libgpsmm if we've got C++
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-	GPSD_CONF_OPT += --enable-libgpsmm LDFLAGS="$(TARGET_LDFLAGS) -lstdc++"
+	GPSD_LDFLAGS += -lstdc++
+	GPSD_SCONS_OPTS += libgpsmm=yes
 else
-	GPSD_CONF_OPT += --disable-libgpsmm
+	GPSD_SCONS_OPTS += libgpsmm=no
 endif
 
 # Enable or disable Qt binding
 ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-	GPSD_CONF_ENV += QMAKE="$(QT_QMAKE)"
-	GPSD_CONF_OPT += --enable-libQgpsmm
+	GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
 	GPSD_DEPENDENCIES += qt host-pkg-config
 else
-	GPSD_CONF_OPT += --disable-libQgpsmm
+	GPSD_SCONS_OPTS += libQgpsmm=no
 endif
 
 # If libusb is available build it before so the package can use it
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 	GPSD_DEPENDENCIES += libusb
+else
+	GPSD_SCONS_OPTS += usb=no
 endif
 
-ifeq ($(BR2_PACKAGE_DBUS_GLIB),y)
-	GPSD_CONF_OPT += --enable-dbus
-	GPSD_DEPENDENCIES += dbus-glib
+# If bluetooth is available build it before so the package can use it
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+	GPSD_DEPENDENCIES += bluez_utils
+else
+	GPSD_SCONS_OPTS += bluez=no
 endif
 
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-	GPSD_DEPENDENCIES += ncurses
+ifeq ($(BR2_PACKAGE_DBUS_GLIB),y)
+	GPSD_SCONS_OPTS += dbus_export=yes
+	GPSD_DEPENDENCIES += dbus-glib
 endif
 
 # Protocol support
 ifneq ($(BR2_PACKAGE_GPSD_ASHTECH),y)
-	GPSD_CONF_OPT += --disable-ashtech
+	GPSD_SCONS_OPTS += ashtech=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_AIVDM),y)
-	GPSD_CONF_OPT += --disable-aivdm
+	GPSD_SCONS_OPTS += aivdm=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_EARTHMATE),y)
-	GPSD_CONF_OPT += --disable-earthmate
+	GPSD_SCONS_OPTS += earthmate=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_EVERMORE),y)
-	GPSD_CONF_OPT += --disable-evermore
+	GPSD_SCONS_OPTS += evermore=no
+endif
+ifneq ($(BR2_PACKAGE_GPSD_FURY),y)
+	GPSD_SCONS_OPTS += fury=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_FV18),y)
-	GPSD_CONF_OPT += --disable-fv18
+	GPSD_SCONS_OPTS += fv18=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_GARMIN),y)
-	GPSD_CONF_OPT += --disable-garmin
+	GPSD_SCONS_OPTS += garmin=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT),y)
-	GPSD_CONF_OPT += --disable-garmintxt
+	GPSD_SCONS_OPTS += garmintxt=no
+endif
+ifneq ($(BR2_PACKAGE_GPSD_GEOSTAR),y)
+	GPSD_SCONS_OPTS += geostar=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
-	GPSD_CONF_OPT += --disable-gpsclock
+	GPSD_SCONS_OPTS += gpsclock=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y)
-	GPSD_CONF_OPT += --disable-itrax
+	GPSD_SCONS_OPTS += itrax=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_MTK3301),y)
-	GPSD_CONF_OPT += --disable-mtk3301
+	GPSD_SCONS_OPTS += mtk3301=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_NMEA),y)
-	GPSD_CONF_OPT += --disable-nmea
+	GPSD_SCONS_OPTS += nmea=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_NTRIP),y)
-	GPSD_CONF_OPT += --disable-ntrip
+	GPSD_SCONS_OPTS += ntrip=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_NAVCOM),y)
-	GPSD_CONF_OPT += --disable-navcom
+	GPSD_SCONS_OPTS += navcom=no
+endif
+ifneq ($(BR2_PACKAGE_GPSD_NMEA2000),y)
+	GPSD_SCONS_OPTS += nmea2000=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_OCEANSERVER),y)
-	GPSD_CONF_OPT += --disable-oceanserver
+	GPSD_SCONS_OPTS += oceanserver=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_ONCORE),y)
-	GPSD_CONF_OPT += --disable-oncore
+	GPSD_SCONS_OPTS += oncore=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_RTCM104V2),y)
-	GPSD_CONF_OPT += --disable-rtcm104v2
+	GPSD_SCONS_OPTS += rtcm104v2=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_RTCM104V3),y)
-	GPSD_CONF_OPT += --disable-rtcm104v3
+	GPSD_SCONS_OPTS += rtcm104v3=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_SIRF),y)
-	GPSD_CONF_OPT += --disable-sirf
+	GPSD_SCONS_OPTS += sirf=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y)
-	GPSD_CONF_OPT += --disable-superstar2
+	GPSD_SCONS_OPTS += superstar2=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_TRIMBLE_TSIP),y)
-	GPSD_CONF_OPT += --disable-tsip
+	GPSD_SCONS_OPTS += tsip=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_TRIPMATE),y)
-	GPSD_CONF_OPT += --disable-tripmate
+	GPSD_SCONS_OPTS += tripmate=no
 endif
-ifeq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y)
-	GPSD_CONF_OPT += --enable-tnt
+ifneq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y)
+	GPSD_SCONS_OPTS += tnt=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_UBX),y)
-	GPSD_CONF_OPT += --disable-ubx
+	GPSD_SCONS_OPTS += ubx=no
 endif
 
 # Features
 ifneq ($(BR2_PACKAGE_GPSD_NTP_SHM),y)
-	GPSD_CONF_OPT += --disable-ntpshm
+	GPSD_SCONS_OPTS += ntpshm=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_PPS),y)
-	GPSD_CONF_OPT += --disable-pps
-endif
-ifeq ($(BR2_PACKAGE_GPSD_PPS_ON_CTS),y)
-	GPSD_CONF_OPT += --enable-pps-on-cts
+	GPSD_SCONS_OPTS += pps=no
 endif
 ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y)
-	GPSD_CONF_OPT += --enable-squelch
+	GPSD_SCONS_OPTS += squelch=yes
 endif
 ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y)
-	GPSD_CONF_OPT += --disable-reconfigure
+	GPSD_SCONS_OPTS += reconfigure=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y)
-	GPSD_CONF_OPT += --disable-controlsend
-endif
-ifeq ($(BR2_PACKAGE_GPSD_RAW),y)
-	GPSD_CONF_OPT += --enable-raw
+	GPSD_SCONS_OPTS += controlsend=no
 endif
 ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y)
-	GPSD_CONF_OPT += --disable-oldstyle
+	GPSD_SCONS_OPTS += oldstyle=no
 endif
 ifeq ($(BR2_PACKAGE_GPSD_PROFILING),y)
-	GPSD_CONF_OPT += --enable-profiling
+	GPSD_SCONS_OPTS += profiling=yes
 endif
-ifneq ($(BR2_PACKAGE_GPSD_TIMING),y)
-	GPSD_CONF_OPT += --disable-timing
+ifeq ($(BR2_PACKAGE_GPSD_TIMING),y)
+	GPSD_SCONS_OPTS += timing=yes
 endif
 ifneq ($(BR2_PACKAGE_GPSD_CLIENT_DEBUG),y)
-	GPSD_CONF_OPT += --disable-clientdebug
+	GPSD_SCONS_OPTS += clientdebug=no
 endif
 ifeq ($(BR2_PACKAGE_GPSD_USER),y)
-	GPSD_CONF_OPT += --enable-gpsd-user=$(BR2_PACKAGE_GPSD_USER_VALUE)
+	GPSD_SCONS_OPTS += gpsd_user=$(BR2_PACKAGE_GPSD_USER_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_GROUP),y)
-	GPSD_CONF_OPT += --enable-gpsd-group=$(BR2_PACKAGE_GPSD_GROUP_VALUE)
+	GPSD_SCONS_OPTS += gpsd_group=$(BR2_PACKAGE_GPSD_GROUP_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y)
-	GPSD_CONF_OPT += --enable-fixed-port-speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
+	GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y)
-	GPSD_CONF_OPT += --enable-max-clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
+	GPSD_SCONS_OPTS += limited_max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y)
-	GPSD_CONF_OPT += --enable-max-devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
+	GPSD_SCONS_OPTS += limited_max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
 endif
 
-define GPSD_BUILDS_CMDS
-	$(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(GPSD_DIR)/libtool
-	$(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(GPSD_DIR)/libtool
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all libgpsmm
+GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)"
+
+define GPSD_BUILD_CMDS
+	(cd $(@D); \
+		$(GPSD_SCONS_ENV) \
+		$(SCONS) \
+		$(GPSD_SCONS_OPTS))
 endef
 
 define GPSD_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	(cd $(@D); \
+		$(GPSD_SCONS_ENV) \
+		$(SCONS) \
+		$(GPSD_SCONS_OPTS) \
+		destdir=$(TARGET_DIR) \
+		install)
 	if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
 		$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
 		$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
 	fi
 endef
 
-define GPSD_UNINSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(GPSD_TARGET_BINS))
-	rm -f $(TARGET_DIR)/usr/lib/libgps.*
-	rm -f $(TARGET_DIR)/usr/lib/libgpsd.*
-	rm -f $(TARGET_DIR)/usr/sbin/gpsd
-	rm -f $(TARGET_DIR)/etc/init.d/S50gpsd
+define GPSD_INSTALL_STAGING_CMDS
+	(cd $(@D); \
+		$(GPSD_SCONS_ENV) \
+		$(SCONS) \
+		$(GPSD_SCONS_OPTS) \
+		destdir=$(STAGING_DIR) \
+		includedir="$(STAGING_DIR)/usr/include" \
+		install)
 endef
 
-$(eval $(autotools-package))
+$(eval $(generic-package))

From 8e26abecd00f4899fb122c3eeb03fbdf20cda32e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 24 Jul 2012 09:17:56 +0200
Subject: [PATCH 2410/6849] pkg-generic: fix SUBDIR handling

Commit 9ba9bfb9a02706fa414bcf4c6dcceac1b68a5c9a inverted the logic to
define $(2)_SUBDIR, breaking the build of things using the _SUBDIR
feature, like the tcl package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-generic.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 8a730c0a01..d1f4f2a2ce 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -204,11 +204,11 @@ $(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)
 $(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
 $(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
 
-ifndef $(3)_SUBDIR
- ifdef $(2)_SUBDIR
-  $(3)_SUBDIR = $$($(2)_SUBDIR)
+ifndef $(2)_SUBDIR
+ ifdef $(3)_SUBDIR
+  $(2)_SUBDIR = $$($(3)_SUBDIR)
  else
-  $(3)_SUBDIR ?=
+  $(2)_SUBDIR ?=
  endif
 endif
 

From f66236e0a9e18045cb1566bc368368de5a5cc499 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 23 Jul 2012 11:49:19 +0200
Subject: [PATCH 2411/6849] mediastreamer: fix build with libX11 and sdl
 without x11 support

Fixes http://autobuild.buildroot.net/results/a8f2db4a40c0f53c0d25b2632fe87c2ce136f770

Mediastreamer assumes SDL has X11 support if SDL and libX11 are found,
which is not necessarily true in BR.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/mediastreamer/mediastreamer.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 9e67ed49d3..1f4e1d4eeb 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -48,9 +48,10 @@ else
 MEDIASTREAMER_CONF_OPT += --disable-sdl
 endif
 
-ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support
+# is only used for SDL output)
+ifeq ($(BR2_PACKAGE_SDL_X11),y)
 MEDIASTREAMER_CONF_OPT += --enable-x11
-MEDIASTREAMER_DEPENDENCIES += xlib_libX11
 else
 MEDIASTREAMER_CONF_OPT += --disable-x11
 endif

From 23c9aeccde52d30c26d92866be0b094793aba712 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 24 Jul 2012 13:34:32 +0100
Subject: [PATCH 2412/6849] gpsd: disallow profiling support with uClibc
 toolchain

The following problem was reported by Thomas Petazzoni.

If BR2_PACKAGE_GPSD_PROFILING is enabled with a uClibc-based toolchain, then
gpsd fails to build. See the following for details.

  http://autobuild.buildroot.org/results/be707893f4bf0e7e964d183e4a655c5bb72d1889/build-end.log
  http://autobuild.buildroot.org/results/be707893f4bf0e7e964d183e4a655c5bb72d1889/defconfig.

The issue is that uClibc lacks the necessary infrastructure to support
profiling. This patch disallows selection of the gpsd profiling feature when
a uClibc-based toolchain is selected.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gpsd/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 18e21e5af6..db6bec2d75 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -31,6 +31,10 @@ config BR2_PACKAGE_GPSD_OLDSTYLE
 
 config BR2_PACKAGE_GPSD_PROFILING
 	bool "profiling support"
+	depends on !BR2_TOOLCHAIN_BUILDROOT && !BR2_TOOLCHAIN_CTNG_uClibc && !BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+
+comment "profiling support not available with uClibc-based toolchain"
+	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_CTNG_uClibc || BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 
 config BR2_PACKAGE_GPSD_NTP_SHM
 	bool "NTP time hinting support"

From f52727e22d2b7e20cb5771ef8961d37ff2a25937 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 24 Jul 2012 21:43:59 +0200
Subject: [PATCH 2413/6849] gpsd: fix build issues

The first patch gpsd-01-sconstruct-python-2.5-compat.patch is aimed at
fixing Python 2.5 compatibility issues such as:

 http://autobuild.buildroot.org/results/844a7f8698567688eba094f64dd2bf5157efd994/build-end.log

The second patch gpsd-02-sconstruct-ncurses-config-path.patch
implements a proper mechanism to specify the path to
ncurse5-config. It obsoletes the previous
gpsd-fix-acs_map-compile-errors patch, and solves build problems such
as:

 http://autobuild.buildroot.org/results/92ae3d53e8aa68d8b1a2eccad68c98f577cb6437/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Simon Dawson <spdawson@gmail.com>
---
 ...gpsd-01-sconstruct-python-2.5-compat.patch | 79 +++++++++++++++++++
 ...sd-02-sconstruct-ncurses-config-path.patch | 44 +++++++++++
 .../gpsd-fix-acs_map-compile-errors.patch     | 29 -------
 package/gpsd/gpsd.mk                          |  1 +
 4 files changed, 124 insertions(+), 29 deletions(-)
 create mode 100644 package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
 create mode 100644 package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch
 delete mode 100644 package/gpsd/gpsd-fix-acs_map-compile-errors.patch

diff --git a/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch b/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
new file mode 100644
index 0000000000..4306af2fbb
--- /dev/null
+++ b/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
@@ -0,0 +1,79 @@
+Remove all the with ... as foo constructs
+
+Those constructs have been introduced in Python 2.6, and some of our
+autobuilders still use Python 2.5, so replace them with constructs
+that are compatible with Python 2.5.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -366,8 +366,8 @@
+ 
+ def CheckXsltproc(context):
+     context.Message('Checking that xsltproc can make man pages... ')
+-    with open("xmltest.xml", "w") as ofp:
+-        ofp.write('''
++    ofp = open("xmltest.xml", "w")
++    ofp.write('''
+        <refentry id="foo.1">
+       <refmeta>
+         <refentrytitle>foo</refentrytitle>
+@@ -380,6 +380,7 @@
+       </refnamediv>
+     </refentry>
+ ''')
++    ofp.close()
+     probe = "xsltproc --nonet --noout '%s' xmltest.xml" % (docbook_man_uri,)
+     ret = context.TryAction(probe)[0]
+     os.remove("xmltest.xml")
+@@ -1042,8 +1043,9 @@
+ # build timebase.h
+ def timebase_h(target, source, env):
+     from leapsecond import make_leapsecond_include
+-    with open(target[0].abspath, 'w') as f:
+-        f.write(make_leapsecond_include(source[0].abspath))
++    f = open(target[0].abspath, 'w')
++    f.write(make_leapsecond_include(source[0].abspath))
++    f.close()
+ env.Command(target="timebase.h", source="leapseconds.cache",
+             action=timebase_h)
+ 
+@@ -1116,15 +1118,17 @@
+         ('@DEVMAIL@',    devmail),
+         ('@LIBGPSVERSION@', libgps_version),
+         )
+-    with open(str(source[0])) as sfp:
+-        content = sfp.read()
++    sfp = open(str(source[0]))
++    content = sfp.read()
++    sfp.close()
+     for (s, t) in substmap:
+         content = content.replace(s, t)
+     m = re.search("@[A-Z]+@", content)
+     if m and m.group(0) not in map(lambda x: x[0], substmap):
+         print >>sys.stderr, "Unknown subst token %s in %s." % (m.group(0), sfp.name)
+-    with open(str(target[0]), "w") as tfp:
+-        tfp.write(content)
++    tfp = open(str(target[0]), "w")
++    tfp.write(content)
++    tfp.close()
+ 
+ templated = glob.glob("*.in") + glob.glob("*/*.in") + glob.glob("*/*/*.in")
+ 
+@@ -1560,9 +1564,10 @@
+ def validation_list(target, source, env):
+     for page in glob.glob("www/*.html"):
+         if not '-head' in page:
+-            with open(page) as fp:
+-                if "Valid HTML" in fp.read():
+-                    print os.path.join(website, os.path.basename(page))
++            fp = open(page)
++            if "Valid HTML" in fp.read():
++                print os.path.join(website, os.path.basename(page))
++            fp.close()
+ Utility("validation-list", [www], validation_list)
+ 
+ # How to update the website
diff --git a/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch b/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch
new file mode 100644
index 0000000000..5c440bf40e
--- /dev/null
+++ b/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch
@@ -0,0 +1,44 @@
+Add option to specify the path to ncurses5-config
+
+By default, gpsd's SConstruct looks in the PATH to find
+ncurses5-config, which means that it finds our HOST_DIR
+ncurses5-config. We add an option that allows to specify a custom path
+to the ncurses5-config script.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -172,6 +172,7 @@
+     ("fixed_stop_bits",     0,             "fixed serial port stop bits"),
+     ("target",              "",            "cross-development target"),
+     ("sysroot",             "",            "cross-development system root"),
++    ("ncurses_config",      "",            "ncurses5-config path"),
+     )
+ for (name, default, help) in nonboolopts:
+     opts.Add(name, help, default)
+@@ -447,6 +448,11 @@
+ else:
+     pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )]
+ 
++if env['ncurses_config']:
++    ncurses_config = env['ncurses_config']
++else:
++    ncurses_config = "ncurses5-config"
++
+ # The actual distinction here is whether the platform has ncurses in the
+ # base system or not. If it does, pkg-config is not likely to tell us
+ # anything useful. FreeBSD does, Linux doesn't. Most likely other BSDs
+@@ -455,8 +461,8 @@
+ if env['ncurses']:
+     if config.CheckPKG('ncurses'):
+         ncurseslibs = pkg_config('ncurses')
+-    elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):
+-        ncurseslibs = ['!ncurses5-config --libs --cflags']
++    elif config.CheckExecutable('%s --version' % ncurses_config, 'ncurses5-config'):
++        ncurseslibs = ['!%s --libs --cflags' % ncurses_config]
+     elif sys.platform.startswith('freebsd'):
+         ncurseslibs= [ '-lncurses' ]
+     elif sys.platform.startswith('openbsd'):
diff --git a/package/gpsd/gpsd-fix-acs_map-compile-errors.patch b/package/gpsd/gpsd-fix-acs_map-compile-errors.patch
deleted file mode 100644
index 14d9287ee0..0000000000
--- a/package/gpsd/gpsd-fix-acs_map-compile-errors.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Hack gpsd to prevent undefined references to acs_map from ncurses.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-diff -Nurp a/gpsmon.c b/gpsmon.c
---- a/gpsmon.c	2012-05-18 09:45:37.000000000 +0100
-+++ b/gpsmon.c	2012-06-07 12:41:31.257807969 +0100
-@@ -24,6 +24,9 @@
- #include <unistd.h>
- #endif /* S_SPLINT_S */
- 
-+/* Ugly hack to prevent undefined reference to acs_map */
-+unsigned long acs_map[128];
-+
- #include "gpsd_config.h"
- #ifdef HAVE_BLUEZ
- #include <bluetooth/bluetooth.h>
-diff -Nurp a/monitor_nmea.c b/monitor_nmea.c
---- a/monitor_nmea.c	2011-11-22 08:49:33.000000000 +0000
-+++ b/monitor_nmea.c	2012-06-07 12:41:37.081807709 +0100
-@@ -15,6 +15,9 @@
- #include <unistd.h>
- #endif /* S_SPLINT_S */
- 
-+/* Ugly hack to prevent undefined reference to acs_map */
-+unsigned long acs_map[128];
-+
- #include "gpsd.h"
- #include "gpsmon.h"
- #include "gpsdclient.h"
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index dd1538646a..7d1dbcdac4 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -23,6 +23,7 @@ GPSD_SCONS_OPTS = \
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 	GPSD_DEPENDENCIES += ncurses
+	GPSD_SCONS_OPTS += ncurses_config=$(STAGING_DIR)/usr/bin/ncurses5-config
 else
 	GPSD_SCONS_OPTS += ncurses=no
 endif

From c4cb627010545343e425396c90dd62639516274d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 24 Jul 2012 22:18:18 +0200
Subject: [PATCH 2414/6849] gpsd: remove option to enable latency measurement
 capabilities

It currently fails to build with:

libgpsd_core.c: In function 'gpsd_poll':
libgpsd_core.c:881: error: 'const struct gps_type_t' has no member named 'min_cycle'
libgpsd_core.c:884: error: 'const struct gps_type_t' has no member named 'min_cycle'

and is probably not a very important feature for normal users of gpsd.

The build problem has been reported to the gpsd-users mailing list.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gpsd/Config.in | 3 ---
 package/gpsd/gpsd.mk   | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index db6bec2d75..8643492fb8 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -20,9 +20,6 @@ config BR2_PACKAGE_GPSD_DEVICES
 menu "Features"
 	depends on BR2_PACKAGE_GPSD
 
-config BR2_PACKAGE_GPSD_TIMING
-	bool "latency timing support"
-
 config BR2_PACKAGE_GPSD_CLIENT_DEBUG
 	bool "client debugging support"
 
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 7d1dbcdac4..c5270bd2ba 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -176,9 +176,6 @@ endif
 ifeq ($(BR2_PACKAGE_GPSD_PROFILING),y)
 	GPSD_SCONS_OPTS += profiling=yes
 endif
-ifeq ($(BR2_PACKAGE_GPSD_TIMING),y)
-	GPSD_SCONS_OPTS += timing=yes
-endif
 ifneq ($(BR2_PACKAGE_GPSD_CLIENT_DEBUG),y)
 	GPSD_SCONS_OPTS += clientdebug=no
 endif

From 30d2b422e53da8dcb4c13b6fdd47a959607807c5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 23 Jul 2012 23:41:15 +0200
Subject: [PATCH 2415/6849] xserver_xorg-server: add upstream patches to fix
 build issue

Fixes the following build issue with gcc 4.6:

  LINK  Xfbdev
.../host/opt/ext-toolchain/bin/../lib/gcc/arm-none-linux-gnueabi/4.6.1/../../../../arm-none-linux-gnueabi/bin/ld: ../../../os/.libs/libos.a(backtrace.o): undefined reference to symbol 'dladdr@@GLIBC_2.4'
.../host/opt/ext-toolchain/bin/../lib/gcc/arm-none-linux-gnueabi/4.6.1/../../../../arm-none-linux-gnueabi/bin/ld: note: 'dladdr@@GLIBC_2.4' is defined in DSO .../host/usr/arm-unknown-linux-gnueabi/sysroot/lib/libdl.so.2 so try adding it to the linker command line
.../host/usr/arm-unknown-linux-gnueabi/sysroot/lib/libdl.so.2: could not read symbols: Invalid operation

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...r-01-add-dlopen-libs-flags-to-kdrive.patch | 25 ++++++
 ...r-02-supply-dl-code-with-dlopen-libs.patch | 87 +++++++++++++++++++
 .../xserver_xorg-server.mk                    |  1 +
 3 files changed, 113 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
new file mode 100644
index 0000000000..53304be4e6
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
@@ -0,0 +1,25 @@
+From 8613e4b0eb04150b1e377871f02b164be5d001e9 Mon Sep 17 00:00:00 2001
+From: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed, 28 Oct 2009 18:44:27 +0000
+Subject: Add missing DLOPEN_LIBS to kdrive compilation flags
+
+Xfbdev failed to build due to dladdr being used by xorg_backtrace.
+Explicitly add DLOPEN_LIBS to KDRIVE_LIBS as there does not
+seem to be a better place for it.
+
+Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1982,7 +1982,7 @@
+     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+-    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
++    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
+ 
+     AC_SUBST([XEPHYR_LIBS])
+     AC_SUBST([XEPHYR_INCS])
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch
new file mode 100644
index 0000000000..63d723bf32
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch
@@ -0,0 +1,87 @@
+From d30637339963950910e5f5fb755b8465ac7dddb4 Mon Sep 17 00:00:00 2001
+From: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu, 29 Oct 2009 18:46:22 +0000
+Subject: Supply all code using dl*() with DLOPEN_LIBS
+
+Previously DLOPEN_LIBS was managed in top-level configure.ac.
+Instead bundle it with the code using dl*() functions to
+avoid breakages in uncommon configurations.
+
+Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -196,6 +196,7 @@
+ dnl has it in libc), or if libdl is needed to get it.
+ AC_CHECK_FUNC([dlopen], [],
+ 	AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
++AC_SUBST(DLOPEN_LIBS)
+ 
+ dnl Checks for library functions.
+ AC_FUNC_VPRINTF
+@@ -927,7 +928,7 @@
+ 	AC_SUBST(XLIB_CFLAGS)
+ 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
+ 	GLX_LIBS='$(top_builddir)/glx/libglx.la'
+-	GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
++	GLX_SYS_LIBS="$GLX_SYS_LIBS"
+ else
+         GLX=no
+ fi
+@@ -1483,7 +1484,7 @@
+ 	AC_CHECK_FUNCS([pci_device_vgaarb_init])
+ 	LIBS=$SAVE_LIBS
+ 	CFLAGS=$SAVE_CFLAGS
+-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
++	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
+ 	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+ 
+ 	case $host_os in
+Index: b/glx/Makefile.am
+===================================================================
+--- a/glx/Makefile.am
++++ b/glx/Makefile.am
+@@ -58,6 +58,8 @@
+ libglxdri_la_SOURCES += glxdri2.c
+ endif
+ 
++libglxdri_la_LIBADD = $(DLOPEN_LIBS)
++
+ libglx_la_SOURCES = \
+ 	$(indirect_sources) \
+ 	$(glapi_sources) \
+@@ -95,3 +97,5 @@
+         swap_interval.c \
+         unpack.h \
+         xfont.c
++
++libglx_la_LIBADD = $(DLOPEN_LIBS)
+Index: b/hw/xfree86/loader/Makefile.am
+===================================================================
+--- a/hw/xfree86/loader/Makefile.am
++++ b/hw/xfree86/loader/Makefile.am
+@@ -21,6 +21,7 @@
+         dlloader.c \
+ 	os.c \
+ 	sdksyms.c
++libloader_la_LIBADD = $(DLOPEN_LIBS)
+ 
+ CLEANFILES = sdksyms.c sdksyms.dep
+ 
+Index: b/os/Makefile.am
+===================================================================
+--- a/os/Makefile.am
++++ b/os/Makefile.am
+@@ -26,6 +26,8 @@
+ 	xprintf.c	\
+ 	$(XORG_SRCS)
+ 
++libos_la_LIBADD = $(DLOPEN_LIBS)
++
+ if SECURE_RPC
+ libos_la_SOURCES += $(SECURERPC_SRCS)
+ endif
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index f221632549..5913f7987b 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -10,6 +10,7 @@ XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserv
 XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
+XSERVER_XORG_SERVER_AUTORECONF = YES
 
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xutil_util-macros 		\

From 4c0f75e444846f6436a3c49b40dab9d56032acfb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 00:01:55 +0200
Subject: [PATCH 2416/6849] gpsd: proper usage of prefix and DESTDIR

prefix should always be /usr, and destdir must be passed as DESTDIR,
and in the environment, not as a scons argument. Finally, we pass the
sysroot= argument to scons so that it doesn't add -L/usr/lib
parameters when compiling.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gpsd/gpsd.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index c5270bd2ba..e96d979790 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -17,8 +17,9 @@ GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS)
 
 GPSD_SCONS_OPTS = \
 	arch=$(ARCH)\
-	prefix=$(TARGET_DIR)/usr\
+	prefix=/usr\
 	chrpath=no\
+	sysroot=$(STAGING_DIR)\
 	strip=no
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
@@ -207,9 +208,9 @@ endef
 define GPSD_INSTALL_TARGET_CMDS
 	(cd $(@D); \
 		$(GPSD_SCONS_ENV) \
+		DESTDIR=$(TARGET_DIR) \
 		$(SCONS) \
 		$(GPSD_SCONS_OPTS) \
-		destdir=$(TARGET_DIR) \
 		install)
 	if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
 		$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
@@ -220,10 +221,9 @@ endef
 define GPSD_INSTALL_STAGING_CMDS
 	(cd $(@D); \
 		$(GPSD_SCONS_ENV) \
+		DESTDIR=$(STAGING_DIR) \
 		$(SCONS) \
 		$(GPSD_SCONS_OPTS) \
-		destdir=$(STAGING_DIR) \
-		includedir="$(STAGING_DIR)/usr/include" \
 		install)
 endef
 

From 73c6abae04aceb9f2556996d1783fde6d35e713c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 00:04:21 +0200
Subject: [PATCH 2417/6849] gpsd: add patch to disable rpath

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../gpsd/gpsd-03-sconstruct-disable-rpath.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/gpsd/gpsd-03-sconstruct-disable-rpath.patch

diff --git a/package/gpsd/gpsd-03-sconstruct-disable-rpath.patch b/package/gpsd/gpsd-03-sconstruct-disable-rpath.patch
new file mode 100644
index 0000000000..5476450e49
--- /dev/null
+++ b/package/gpsd/gpsd-03-sconstruct-disable-rpath.patch
@@ -0,0 +1,17 @@
+Disable addition of RPATH to the generated libraries
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -273,8 +273,6 @@
+     env.Prepend(LIBPATH=[installdir('libdir')])
+ else:
+     env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+-if env["shared"]:
+-    env.Prepend(RPATH=[installdir('libdir')])
+ 
+ # Give deheader a way to set compiler flags
+ if 'MORECFLAGS' in os.environ:

From b04d89b02291021472f2f3f13b3e6f42a09d7998 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 18:24:05 +0200
Subject: [PATCH 2418/6849] gpsd: disable Python support

The Python support is not cross-compile friendly (uses host compiler,
installs in wrong location, etc.) and nobody needs it at the moment,
so leave that to the first person who will need Python support for
gpsd.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gpsd/gpsd.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index e96d979790..190732f092 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -20,7 +20,8 @@ GPSD_SCONS_OPTS = \
 	prefix=/usr\
 	chrpath=no\
 	sysroot=$(STAGING_DIR)\
-	strip=no
+	strip=no\
+	python=no
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 	GPSD_DEPENDENCIES += ncurses
@@ -29,12 +30,6 @@ else
 	GPSD_SCONS_OPTS += ncurses=no
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-	GPSD_DEPENDENCIES += python
-else
-	GPSD_SCONS_OPTS += python=no
-endif
-
 # Disable IPv6, if we don't support it
 ifneq ($(BR2_INET_IPV6),y)
 	GPSD_SCONS_OPTS += ipv6=no

From aa457d3b240bd4f6049191988eee8a5b160f0439 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 00:05:44 +0200
Subject: [PATCH 2419/6849] qt: tune .pc files after installation in staging
 directory

The Qt configuration and installation process is a bit strange, and it
leads the .pc files to contain absolute paths to the staging
directory, while it should only contains paths relative to the staging
directory, because pkg-config already adds the path of the sysroot
automatically to the headers and libraries locations.

This allows the 'pkg-config --cflags' results for Qt libraries to be
correct.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt/qt.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index feb0d6f3eb..3b40ea460f 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -577,13 +577,20 @@ endef
 # everything in the STAGING_DIR), we move host programs such as qmake,
 # rcc or uic to the HOST_DIR so that they are available at the usual
 # location. A qt.conf file is generated to make sure that all host
-# programs still find all files they need.
+# programs still find all files they need. The .pc files are tuned to
+# remove the sysroot path from them, since pkg-config already adds it
+# automatically.
 define QT_INSTALL_STAGING_CMDS
 	$(MAKE) -C $(@D) install
 	mkdir -p $(HOST_DIR)/usr/bin
 	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
 	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
 	$(QT_INSTALL_QT_CONF)
+	for i in moc uic rcc lupdate lrelease ; do \
+		$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/usr/bin/$${i}," \
+			$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \
+	done
+	$(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
 endef
 
 # Library installation

From 6845c4f7103bc3d0105f25b4c02ccb5ceeb9fe80 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 09:46:34 +0200
Subject: [PATCH 2420/6849] gnutls: requires WCHAR support

gnutls uses wctomb(), which is available only on C libraries with
wide-char support. This fixes the following build failure:

 http://autobuild.buildroot.org/results/cd4e73be80fbb64858f4cf911d2b893b0fc06465/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/connman/Config.in         | 2 +-
 package/gnutls/Config.in          | 4 ++++
 package/libsoup/Config.in         | 2 +-
 package/network-manager/Config.in | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index c9bc94f06e..2fcb6c19c3 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
-	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index cedf120ee7..556caea2d2 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
 	select BR2_PACKAGE_LIBGCRYPT
+	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
 
 	  http://www.gnu.org/software/gnutls/gnutls.html
+
+comment "gnutls requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index eee6adecc3..f40625d487 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
-	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_USE_WCHAR # glib2 and gnutls
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index fb0c0e9eed..a120d01ef3 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	select BR2_PACKAGE_DBUS
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS

From e6ce0f5bfbd94f0c4d6301cc121efed3b55926c7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 11:29:58 +0200
Subject: [PATCH 2421/6849] dbus: requires thread support

As can be seen on the build result at
http://autobuild.buildroot.org/results/20f1078ef7dc5f187b04c63ef70e8b43acf9bb3a/build-end.log,
D-Bus requires thread support in the toolchain.

This commit adjusts the Kconfig dependencies of D-Bus and all its
reverse dependencies to depend on thread support in the toolchain.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bluez_utils/Config.in     | 5 +++--
 package/connman/Config.in         | 6 ++++--
 package/dbus/Config.in            | 4 ++++
 package/efl/libedbus/Config.in    | 4 ++++
 package/network-manager/Config.in | 7 ++++---
 package/ofono/Config.in           | 6 ++++--
 package/qt/Config.in              | 4 ++++
 package/samba/Config.in           | 5 +++--
 package/systemd/Config.in         | 6 ++++--
 9 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 3517407d8f..f5a02d6a4b 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BLUEZ_UTILS
 	bool "bluez-utils"
 	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	help
@@ -30,5 +31,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
 
 endif
 
-comment "bluez-utils require a toolchain with WCHAR support"
-	depends on !(BR2_USE_WCHAR)
+comment "bluez-utils require a toolchain with WCHAR and thread support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 2fcb6c19c3..082b0ca686 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_CONNMAN
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
 	  managing internet connections within embedded devices running
@@ -46,5 +47,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain with IPv6, WCHAR and resolver support"
-	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || !BR2_USE_WCHAR || !BR2_INET_IPV6
+comment "connman needs a toolchain with IPv6, WCHAR, thread and resolver support"
+	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || \
+		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 54a8540cf9..2b04e945b8 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DBUS
 	bool "dbus"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  The D-Bus message bus system.
 
@@ -23,3 +24,6 @@ choice
 		select BR2_PACKAGE_LIBXML2
 
 endchoice
+
+comment "dbus requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 0914b37a9d..985939edc7 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBEDBUS
 	select BR2_PACKAGE_LIBEINA
 	select BR2_PACKAGE_LIBECORE
 	select BR2_PACKAGE_DBUS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	help
 	  E_Dbus is a set of wrappers around D-Bus APIs so they can be
 	  easily used by EFL applications, automatically providing
@@ -30,3 +31,6 @@ config BR2_PACKAGE_LIBEDBUS_NOTIFY
 	  Notify support.
 
 endif
+
+comment "libedbus requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index a120d01ef3..3f01fefb33 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # acl
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS
@@ -24,6 +25,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
 
 	  http://projects.gnome.org/NetworkManager/
 
-comment "NetworkManager requires a toolchain with IPV6, LARGEFILE and WCHAR support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR
-
+comment "NetworkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index fc6c9c6824..74c8b534a4 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_OFONO
 	bool "ofono"
 	depends on BR2_USE_WCHAR # gettext/libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	select BR2_PACKAGE_LIBCAP_NG
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
@@ -12,5 +13,6 @@ config BR2_PACKAGE_OFONO
 
 	  http://ofono.org/
 
-comment "ofono requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "ofono requires a toolchain with WCHAR and thread support"
+	depends on !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 88855d2d60..b75f2243ff 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -285,9 +285,13 @@ endif
 config BR2_PACKAGE_QT_DBUS
 	bool "DBus Module"
 	select BR2_PACKAGE_DBUS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	help
 	  Build the Qt DBus module.
 
+comment "DBus Module requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_QT_XML
 	bool "XML Module"
 	default y
diff --git a/package/samba/Config.in b/package/samba/Config.in
index cebf7d939d..e88b3609f9 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -225,12 +225,13 @@ config BR2_PACKAGE_SAMBA_AVAHI
 	bool "support avahi"
 	default y
 	depends on BR2_PACKAGE_AVAHI_DAEMON
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	select BR2_PACKAGE_DBUS
 	help
 	  Include support for avahi
 
-comment "support avahi - disabled (requires avahi-daemon)"
-	depends on !BR2_PACKAGE_AVAHI_DAEMON
+comment "support avahi - disabled (requires avahi-daemon and thread support in toolchain)"
+	depends on !BR2_PACKAGE_AVAHI_DAEMON || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_SAMBA_GAMIN
 	bool "support gamin"
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 8df3318f1e..0e7fc397df 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_SYSTEMD
 	bool "systemd"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBCAP
 	help
@@ -16,5 +17,6 @@ config BR2_PACKAGE_SYSTEMD
 
 	  http://freedesktop.org/wiki/Software/systemd
 
-comment "systemd not available (depends on /dev management with udev and ipv6 support)"
-	depends on !(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV && BR2_INET_IPV6)
+comment "systemd not available (depends on /dev management with udev and ipv6 support, and thread support in toolchain)"
+	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || !BR2_INET_IPV6 || \\
+		!BR2_TOOLCHAIN_HAS_THREADS

From fd08153b9d677d654add6c580b9ccc5c27d672e2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 20:27:58 +0200
Subject: [PATCH 2422/6849] Remove unused TARGET_ABI values

The BR2_mmix and BR2_arm_dunno configuration options do not exist, so
there is no chance for these values to be useful in any way.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index e7aec56af8..75c5499ff9 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -900,16 +900,12 @@ config BR2_GCC_TARGET_ARCH
 config BR2_GCC_TARGET_ABI
 	string
 	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_EABI
 	default 32		if BR2_MIPS_OABI32
 	default n32		if BR2_MIPS_ABI32
 	default eabi		if BR2_MIPS_EABI
 	default o64		if BR2_MIPS_OABI64
 	default 64		if BR2_MIPS_ABI64
-	default mmixware	if BR2_mmix && BR2_MMIX_ABI_native
-	default gnu		if BR2_mmix && !BR2_MMIX_ABI_native
 	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec
 	default no-altivec	if BR2_powerpc && BR2_PPC_ABI_no-altivec
 	default spe		if BR2_powerpc && BR2_PPC_ABI_spe

From 0018ec74bda9987f4f8ee56dd8e888d4009eb585 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 26 Jul 2012 09:20:24 +0200
Subject: [PATCH 2423/6849] ncurses: get the post staging installation hook
 called properly

There was a typo in the name of the variable to register the hook,
which prevent the hook from actually being called.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ncurses/ncurses.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 421d85522e..72a8030436 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -57,7 +57,7 @@ define NCURSES_PATCH_NCURSES_CONFIG
 		$(STAGING_DIR)/usr/bin/ncurses5-config
 endef
 
-NCURSES_POST_STAGING_INSTALL_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
+NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
 
 ifeq ($(BR2_HAVE_DEVFILES),y)
 define NCURSES_INSTALL_TARGET_DEVFILES

From ea479450da0017827760f895758d2ccd1fc8d684 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 26 Jul 2012 09:21:12 +0200
Subject: [PATCH 2424/6849] ncurses: bump to 5.9

Bumping to 5.9 has two nice side-effects:

 * It builds fine on noMMU architectures such as Blackfin, which will
   fix build failures like
   http://autobuild.buildroot.org/results/cf3e6a95c82b60d63da041293db576a8f21f9136/build-end.log.

 * It installs a pkg-config file, which will allow gpsd to find
   ncurses properly, without the need to use ncurses5-config, which
   means we can get rid of one of our gpsd patches. Thanks to Mike
   Frysinger for pointing the new --enable-pc-files option.

After this bump, I build tested a large number of the ncurses reverse
dependencies we have in Buildroot, and they all built fine.

Thanks to Gustavo Zacarias for the investigation on why ncurses 5.9
why segfaulting: it turned out to be caused by the
--enable-broken-linker configure option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...ncurses-01-fixup-pkg-config-handling.patch | 89 +++++++++++++++++++
 package/ncurses/ncurses.mk                    |  5 +-
 2 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 package/ncurses/ncurses-01-fixup-pkg-config-handling.patch

diff --git a/package/ncurses/ncurses-01-fixup-pkg-config-handling.patch b/package/ncurses/ncurses-01-fixup-pkg-config-handling.patch
new file mode 100644
index 0000000000..e1cfc75164
--- /dev/null
+++ b/package/ncurses/ncurses-01-fixup-pkg-config-handling.patch
@@ -0,0 +1,89 @@
+Change handling of PKG_CONFIG_LIBDIR
+
+When PKG_CONFIG_LIBDIR was unset in the environment, the configure
+script was deducing the PKG_CONFIG_LIBDIR from the location of the
+pkg-config binary, which doesn't make a lot of sense, and isn't done
+by other autotools based packages.
+
+Also, the configure script was checking that the directory really
+exists. This forced to create the directory *and* provide an absolute
+path in PKG_CONFIG_LIBDIR, which didn't play well with the fact that
+at installation time, PKG_CONFIG_LIBDIR is suffixed to DESTDIR, which
+means that we got two times the staging directory location.
+
+This patch fixes both of those issues. Also, since ncurses uses a fork
+of autoconf 2.13, we can't simply use _AUTORECONF=YES, so we also fix
+the configure script in this patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -3623,27 +3623,20 @@
+ 
+ 	# Leave this as something that can be overridden in the environment.
+ 	if test -z "$PKG_CONFIG_LIBDIR" ; then
+-		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
++		PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
+ 	fi
++
+ 	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-	if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
+ 
+-# Check whether --enable-pc-files or --disable-pc-files was given.
+-if test "${enable_pc_files+set}" = set; then
+-  enableval="$enable_pc_files"
+-  enable_pc_files=$enableval
+-else
+-  enable_pc_files=no
+-fi;
+-		echo "$as_me:3638: result: $enable_pc_files" >&5
+-echo "${ECHO_T}$enable_pc_files" >&6
++        # Check whether --enable-pc-files or --disable-pc-files was given.
++	if test "${enable_pc_files+set}" = set; then
++	    enableval="$enable_pc_files"
++	    enable_pc_files=$enableval
+ 	else
+-		echo "$as_me:3641: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-		{ echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
+-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
+-		enable_pc_files=no
+-	fi
++	    enable_pc_files=no
++	fi;
++	echo "$as_me:3638: result: $enable_pc_files" >&5
++	echo "${ECHO_T}$enable_pc_files" >&6
+ fi
+ 
+ echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -174,20 +174,14 @@
+ 
+ 	# Leave this as something that can be overridden in the environment.
+ 	if test -z "$PKG_CONFIG_LIBDIR" ; then
+-		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
++		PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
+ 	fi
+ 	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-	if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
+-		AC_ARG_ENABLE(pc-files,
++	AC_ARG_ENABLE(pc-files,
+ 			[  --enable-pc-files       generate and install .pc files for pkg-config],
+ 			[enable_pc_files=$enableval],
+ 			[enable_pc_files=no])
+-		AC_MSG_RESULT($enable_pc_files)
+-	else
+-		AC_MSG_RESULT(no)
+-		AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
+-		enable_pc_files=no
+-	fi
++	AC_MSG_RESULT($enable_pc_files)
+ fi
+ AC_SUBST(PKG_CONFIG_LIBDIR)
+ 
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 72a8030436..d82399621b 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -23,7 +23,7 @@
 # USA
 
 # TARGETS
-NCURSES_VERSION = 5.7
+NCURSES_VERSION = 5.9
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
@@ -38,10 +38,11 @@ NCURSES_CONF_OPT = \
 	--disable-big-core \
 	--without-profile \
 	--disable-rpath \
+	--disable-rpath-hack \
 	--enable-echo \
 	--enable-const \
 	--enable-overwrite \
-	--enable-broken_linker
+	--enable-pc-files
 
 ifneq ($(BR2_ENABLE_DEBUG),y)
 NCURSES_CONF_OPT += --without-debug

From c8a222f2adf7f7933124ebd17064acf54e6e3ff3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 26 Jul 2012 09:25:37 +0200
Subject: [PATCH 2425/6849] gpsd: remove patch to handle ncurses5-config custom
 location

Now that ncurses has been bumped to 5.9, it installs .pc files for
pkg-config, which allows gpsd to find it properly without the need to
specify a custom location for ncurses5-config.

Since gpsd now uses pkg-config to find the ncurses library, we also
add host-pkg-config in the dependencies.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...=> gpsd-02-sconstruct-disable-rpath.patch} |  0
 ...sd-02-sconstruct-ncurses-config-path.patch | 44 -------------------
 package/gpsd/gpsd.mk                          |  3 +-
 3 files changed, 1 insertion(+), 46 deletions(-)
 rename package/gpsd/{gpsd-03-sconstruct-disable-rpath.patch => gpsd-02-sconstruct-disable-rpath.patch} (100%)
 delete mode 100644 package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch

diff --git a/package/gpsd/gpsd-03-sconstruct-disable-rpath.patch b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch
similarity index 100%
rename from package/gpsd/gpsd-03-sconstruct-disable-rpath.patch
rename to package/gpsd/gpsd-02-sconstruct-disable-rpath.patch
diff --git a/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch b/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch
deleted file mode 100644
index 5c440bf40e..0000000000
--- a/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Add option to specify the path to ncurses5-config
-
-By default, gpsd's SConstruct looks in the PATH to find
-ncurses5-config, which means that it finds our HOST_DIR
-ncurses5-config. We add an option that allows to specify a custom path
-to the ncurses5-config script.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/SConstruct
-===================================================================
---- a/SConstruct
-+++ b/SConstruct
-@@ -172,6 +172,7 @@
-     ("fixed_stop_bits",     0,             "fixed serial port stop bits"),
-     ("target",              "",            "cross-development target"),
-     ("sysroot",             "",            "cross-development system root"),
-+    ("ncurses_config",      "",            "ncurses5-config path"),
-     )
- for (name, default, help) in nonboolopts:
-     opts.Add(name, help, default)
-@@ -447,6 +448,11 @@
- else:
-     pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )]
- 
-+if env['ncurses_config']:
-+    ncurses_config = env['ncurses_config']
-+else:
-+    ncurses_config = "ncurses5-config"
-+
- # The actual distinction here is whether the platform has ncurses in the
- # base system or not. If it does, pkg-config is not likely to tell us
- # anything useful. FreeBSD does, Linux doesn't. Most likely other BSDs
-@@ -455,8 +461,8 @@
- if env['ncurses']:
-     if config.CheckPKG('ncurses'):
-         ncurseslibs = pkg_config('ncurses')
--    elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):
--        ncurseslibs = ['!ncurses5-config --libs --cflags']
-+    elif config.CheckExecutable('%s --version' % ncurses_config, 'ncurses5-config'):
-+        ncurseslibs = ['!%s --libs --cflags' % ncurses_config]
-     elif sys.platform.startswith('freebsd'):
-         ncurseslibs= [ '-lncurses' ]
-     elif sys.platform.startswith('openbsd'):
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 190732f092..4482a115a5 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -9,7 +9,7 @@ GPSD_LICENSE = BSD-3c
 GPSD_LICENSE_FILES = COPYING
 GPSD_INSTALL_STAGING = YES
 
-GPSD_DEPENDENCIES = host-scons
+GPSD_DEPENDENCIES = host-scons host-pkg-config
 
 GPSD_LDFLAGS = $(TARGET_LDFLAGS)
 
@@ -25,7 +25,6 @@ GPSD_SCONS_OPTS = \
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 	GPSD_DEPENDENCIES += ncurses
-	GPSD_SCONS_OPTS += ncurses_config=$(STAGING_DIR)/usr/bin/ncurses5-config
 else
 	GPSD_SCONS_OPTS += ncurses=no
 endif

From 1b28718006cadcd840fa7ab29027c541f2ded1eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 Jul 2012 19:10:31 +0200
Subject: [PATCH 2426/6849] libelf: fix typo

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libelf/libelf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index daee7fdff3..b77b7b2ea5 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -10,7 +10,7 @@ LIBELF_INSTALL_STAGING = YES
 LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install
 LIBELF_INSTALL_TARGET_OPT = instroot=$(TARGET_DIR) install
 
-LIBELD_CONF_ENV = libelf_cv_working_memmove=yes \
+LIBELF_CONF_ENV = libelf_cv_working_memmove=yes \
 		mr_cv_target_elf=yes \
 		libelf_64bit=yes
 

From 4233993b0669ceace5f6e4670c563577035d791f Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 30 Jul 2012 08:08:21 +0100
Subject: [PATCH 2427/6849] gpsd: fix Python 2.5 build failure

The platform.linux_distribution method was introduced in Python 2.6. Some
of the Buildroot autobuilders still use Python 2.5, which is causing build
failures such as the following.

  http://autobuild.buildroot.net/results/045f1f69bac170d8e75cb4952a2e5b4e85a677b8/build-end.log

This patch removes the linux distribution check from the gpsd SConstruct file.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...truct-python-2.5-compat-distro-check.patch | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch

diff --git a/package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch b/package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch
new file mode 100644
index 0000000000..767a450b7b
--- /dev/null
+++ b/package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch
@@ -0,0 +1,27 @@
+The platform.linux_distribution method was introduced in Python 2.6. Some
+of the Buildroot autobuilders still use Python 2.5, which is causing build
+failures such as the following.
+
+  http://autobuild.buildroot.net/results/045f1f69bac170d8e75cb4952a2e5b4e85a677b8/build-end.log
+
+This patch removes the linux distribution check from the gpsd SConstruct file.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nurp a/SConstruct b/SConstruct
+--- a/SConstruct	2012-07-30 07:57:16.515688546 +0100
++++ b/SConstruct	2012-07-30 08:00:30.135679914 +0100
+@@ -80,14 +80,6 @@ systemd = os.path.exists("/usr/share/sys
+ 
+ # Set distribution-specific defaults here
+ imloads = True
+-if sys.platform.startswith('linux'):
+-    (distro, version, cutename) = platform.linux_distribution()
+-    if distro == 'Fedora':
+-        if int(version) >= 13:
+-            # See https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
+-            imloads = False
+-    elif os.path.exists("/etc/arch-release"):
+-        imloads = False
+ 
+ # Does our platform has a working memory-barrier instruction?
+ # The shared-memory export won't be reliable without it.

From 522772bd337ecadd00427c3738c4ebb100d91866 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 30 Jul 2012 08:22:20 +0100
Subject: [PATCH 2428/6849] gpsd: PPS feature depends on NTPSHM feature

The PPS feature of gpsd depends on the NTP shared memory time hinting feature.

This patch caused the NTPSHM feature to be enabled whenever the PPS feature
is enabled. This should fix build failures such as the following.

  http://autobuild.buildroot.net/results/e58a9a9f884acb6834a8afe4a8a3d056dc509359/build-end.log

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gpsd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 8643492fb8..a11c553a40 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -38,6 +38,7 @@ config BR2_PACKAGE_GPSD_NTP_SHM
 
 config BR2_PACKAGE_GPSD_PPS
 	bool "PPS time syncing support"
+	select BR2_PACKAGE_GPSD_NTP_SHM
 
 config BR2_PACKAGE_GPSD_USER
 	bool "GPSD privilege revocation user"

From 94d462331c4a21fa874184aa074dd019a9a4e144 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 30 Jul 2012 08:32:08 +0100
Subject: [PATCH 2429/6849] libnfc: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libnfc/libnfc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index ab062bb54b..08892b359d 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -6,6 +6,8 @@
 LIBNFC_VERSION = 1446
 LIBNFC_SITE = http://libnfc.googlecode.com/svn/trunk/
 LIBNFC_SITE_METHOD = svn
+LIBNFC_LICENSE = LGPLv3+
+LIBNFC_LICENSE_FILES = COPYING
 LIBNFC_AUTORECONF = YES
 LIBNFC_INSTALL_STAGING = YES
 

From c53e14e30c3df40c579032f3c50e5b3db34efd98 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Jul 2012 20:31:28 -0300
Subject: [PATCH 2430/6849] bind: security bump to version 9.6-ESV-R7-P2

Fixes CVE-2012-3817

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 5de451c73d..736001c8a3 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R7-P1
+BIND_VERSION = 9.6-ESV-R7-P2
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From f5dc8bebb8b937a11f788f1b84868d058ede70c3 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Thu, 26 Jul 2012 11:38:05 +1000
Subject: [PATCH 2431/6849] connman: bump to version 1.4

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 1046cdf4e7..726cb7352e 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.0
+CONNMAN_VERSION = 1.4
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES

From c6b077ccd0ef658134cb580343b274227c10c8b0 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Fri, 27 Jul 2012 00:19:35 +1000
Subject: [PATCH 2432/6849] crosstool-ng: bump to version 1.15.3

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 4bf02583aa..379d400e66 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.15.2
+CROSSTOOL_NG_VERSION           = 1.15.3
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO

From 0d27d8cb46b9f0805e90dd09d579cb1dbb7aff7b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jul 2012 14:19:41 -0300
Subject: [PATCH 2433/6849] libpng: security bump to version 1.4.12

Fixes CVE-2012-3386

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libpng/libpng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index dd295c68bc..6edabc4e5c 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBPNG_VERSION = 1.4.11
+LIBPNG_VERSION = 1.4.12
 LIBPNG_SERIES = 14
 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2

From 065bf8a4d606c60fe745147ede76a93471faf85b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jul 2012 14:46:42 -0300
Subject: [PATCH 2434/6849] libnl: requires thread support

Fixes
http://autobuild.buildroot.net/results/813602e91ad4022957b3bc8d285ddb2b05d3b875/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/hostapd/Config.in  | 4 ++++
 package/iw/Config.in       | 4 ++++
 package/libnl/Config.in    | 4 ++++
 package/ti-utils/Config.in | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index 4a474c37ed..49e8400fa3 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOSTAPD
 	bool "hostapd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_LIBNL
 	help
 	  User space daemon for wireless access points.
@@ -23,3 +24,6 @@ config BR2_PACKAGE_HOSTAPD_WPS
 	  Enable support for Wi-Fi Protected Setup.
 
 endif
+
+comment "hostapd requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/iw/Config.in b/package/iw/Config.in
index 81584e7814..69ef675b5b 100644
--- a/package/iw/Config.in
+++ b/package/iw/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_IW
 	bool "iw"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_LIBNL
 	help
 	  Utility for wireless devices using the mac80211 kernel stack
 
 	  http://wireless.kernel.org/en/users/Documentation/iw
+
+comment "iw requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnl/Config.in b/package/libnl/Config.in
index c7d435983b..f4a1dc2504 100644
--- a/package/libnl/Config.in
+++ b/package/libnl/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNL
 	bool "libnl"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A library for applications dealing with netlink socket.
 
@@ -10,3 +11,6 @@ config BR2_PACKAGE_LIBNL_TOOLS
 	depends on BR2_PACKAGE_LIBNL
 	help
 	  Install binary tools.
+
+comment "libnl requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ti-utils/Config.in b/package/ti-utils/Config.in
index 02ae336dcc..94d620458d 100644
--- a/package/ti-utils/Config.in
+++ b/package/ti-utils/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_TI_UTILS
 	bool "ti-utils"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_LIBNL
 	help
 	  The calibrator and other useful utilities for TI wireless solution,
 	  based on wl12xx driver.
 
 	  http://linuxwireless.org/en/users/Drivers/wl12xx/calibrator
+
+comment "ti-utils requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 42934cac767177562488a9083decd5df312e8216 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jul 2012 14:48:03 -0300
Subject: [PATCH 2435/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 63a1ae8006..514d29987d 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -66,7 +66,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.38"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.23"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.24"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.6"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP

From a2a4bf429b9bdaf00675b10d6a8a808ae688471a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jul 2012 17:10:00 -0300
Subject: [PATCH 2436/6849] dhcp: security bump to version 4.1-ESV-R6

Fixes CVE-2012-3571 and CVE-2012-3954.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/dhcp/dhcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 22b068aefe..e5c9968b10 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DHCP_VERSION  = 4.1-ESV-R4
+DHCP_VERSION  = 4.1-ESV-R6
 DHCP_SITE     = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes
 DHCP_CONF_OPT = \

From fe355d22785479a646b7875c8b0404ca5d6292e8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 26 Jul 2012 16:18:37 -0300
Subject: [PATCH 2437/6849] less: build after busybox

Build less after busybox if it's enabled, since we prefer the full-blown
version over the light one if it's enabled (and busybox would overwrite
the link when built afterwards).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/less/less.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/less/less.mk b/package/less/less.mk
index b758e468ea..c0ecf207d4 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -6,7 +6,8 @@
 
 LESS_VERSION = 444
 LESS_SITE = http://www.greenwoodsoftware.com/less
-LESS_DEPENDENCIES = ncurses
+# Build after busybox, full-blown is better
+LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 
 define LESS_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less

From f870c626dc128955be6a27b800465ab38059eb97 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Fri, 27 Jul 2012 23:51:56 +1000
Subject: [PATCH 2438/6849] udev: fix stopping execution of udev events in
 init.d script

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/udev/S10udev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/udev/S10udev b/package/udev/S10udev
index 70a7c3422f..13dfdf56e3 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -34,7 +34,7 @@ case "$1" in
         ;;
     stop)
         # Stop execution of events
-        udevadm control --stop_exec_queue
+        udevadm control --stop-exec-queue
         killall udevd
         ;;
     *)

From b08fd56ae82ad2d003512e6128ae60016d0186df Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Fri, 27 Jul 2012 23:51:57 +1000
Subject: [PATCH 2439/6849] udev: use /dev if udev_root not defined in init.d
 script

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/udev/S10udev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/udev/S10udev b/package/udev/S10udev
index 13dfdf56e3..7bb430923d 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -27,7 +27,7 @@ test -r $UDEV_CONFIG || exit 6
 
 case "$1" in
     start)
-        echo -n "Populating $udev_root using udev: "
+        echo -n "Populating ${udev_root:-/dev} using udev: "
         echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
         $UDEV_BIN -d || (echo "FAIL" && exit 1)
         echo "done"

From 29afecace95d0687477bf42f7ce4e918bcd0f271 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 28 Jul 2012 00:03:58 +1000
Subject: [PATCH 2440/6849] udev: process udev events on startup in init.d
 script

udev rules are not processed for kernel events that occur before
the udev daemon is started. Call udevadm trigger to replay these
missed events.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/udev/S10udev | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/udev/S10udev b/package/udev/S10udev
index 7bb430923d..2c7b7e917f 100755
--- a/package/udev/S10udev
+++ b/package/udev/S10udev
@@ -30,6 +30,7 @@ case "$1" in
         echo -n "Populating ${udev_root:-/dev} using udev: "
         echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
         $UDEV_BIN -d || (echo "FAIL" && exit 1)
+        udevadm trigger
         echo "done"
         ;;
     stop)

From b8b98bd1b055395922860ad3f4e69ac48ece97d9 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 28 Jul 2012 00:17:32 +1000
Subject: [PATCH 2441/6849] xorg-xserver: always enable forced outputs

If the user has gone to the effort of manually enabling an output in
the configuration file assume that they know what they're doing.

X.org Bug 14611 <http://bugs.freedesktop.org/show_bug.cgi?id=14611>

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...rver-03-always-enable-forced-outputs.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch
new file mode 100644
index 0000000000..bf279775fe
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch
@@ -0,0 +1,30 @@
+From 93ff1bc5884cdfca1132af7fbc06c48e06f218c8 Mon Sep 17 00:00:00 2001
+From: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
+Date: Mon, 15 Feb 2010 12:18:00 +0000
+Subject: Always enable outputs that have been forced on in the configuration file
+
+If the user has gone to the effort of manually enabling an output in
+the configuration file assume that they know what they're doing.
+
+X.org Bug 14611 <http://bugs.freedesktop.org/show_bug.cgi?id=14611>
+
+Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
+Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 573fe96..9b1ff28 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -1573,7 +1573,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ 	 */
+ 	output->status = (*output->funcs->detect)(output);
+ 
+-	if (output->status == XF86OutputStatusDisconnected)
++	if (output->status == XF86OutputStatusDisconnected &&
++		!xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))
+ 	{
+ 	    xf86OutputSetEDID (output, NULL);
+ 	    continue;
+--
+cgit v0.9.0.2-2-gbebe

From 99492e0dfacc53d1fbfa50ac10dac35630e120a1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 Jul 2012 21:20:02 +0200
Subject: [PATCH 2442/6849] bash: add depends on MMU

Fixes the build failure at

  http://autobuild.buildroot.org/results/0434d99b51f535ac73bfcf1968b1c2b81b44ba61/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bash/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bash/Config.in b/package/bash/Config.in
index 9ee46e87a3..228d5a4f79 100644
--- a/package/bash/Config.in
+++ b/package/bash/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_BASH
 	bool "bash"
 	select BR2_PACKAGE_NCURSES
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  The standard GNU Bourne again shell.
 

From 09a29b6a897158070e87493935aba817a58c33fd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Jun 2012 22:35:25 -0300
Subject: [PATCH 2443/6849] libusb: needs thread support

libusb needs thread support, and so do other packages that depend on it.

[thomas.petazzoni@free-electrons.com: adds threads dependency to
libnfc-llp, which selects libnfc.]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bluez_utils/Config.in    | 1 +
 package/libfreefare/Config.in    | 4 ++++
 package/libftdi/Config.in        | 4 ++++
 package/libhid/Config.in         | 4 ++++
 package/libiqrf/Config.in        | 4 ++++
 package/libnfc-llcp/Config.in    | 1 +
 package/libnfc/Config.in         | 4 ++++
 package/libusb/Config.in         | 4 ++++
 package/openocd/Config.in        | 4 ++++
 package/usb_modeswitch/Config.in | 4 ++++
 package/usbutils/Config.in       | 4 ++++
 11 files changed, 38 insertions(+)

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index f5a02d6a4b..d63284d26b 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -25,6 +25,7 @@ config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
 
 config BR2_PACKAGE_BLUEZ_UTILS_USB
 	bool "USB support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	help
 	  USB support
diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
index 13a8630d34..68770002ee 100644
--- a/package/libfreefare/Config.in
+++ b/package/libfreefare/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_LIBFREEFARE
 	bool "libfreefare"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBNFC
 	help
 	  Library for high level manipulation of MIFARE cards.
 
 	  http://code.google.com/p/nfc-tools/wiki/libfreefare
+
+comment "libfreefare needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in
index e334d14279..48e9ceb235 100644
--- a/package/libftdi/Config.in
+++ b/package/libftdi/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBFTDI
 	bool "libftdi"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
@@ -16,3 +17,6 @@ config BR2_PACKAGE_LIBTFDI_CPP
 	  C++ bindings for libftdi
 
 endif # BR2_PACKAGE_LIBFTDI
+
+comment "libftdi needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libhid/Config.in b/package/libhid/Config.in
index 73ff4b7498..093b98fcb9 100644
--- a/package/libhid/Config.in
+++ b/package/libhid/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_LIBHID
 	bool "libhid"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
 	  Userspace library for accessing USB HID devices
 
 	  http://libhid.alioth.debian.org
+
+comment "libhid needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libiqrf/Config.in b/package/libiqrf/Config.in
index aa25010979..7222536607 100644
--- a/package/libiqrf/Config.in
+++ b/package/libiqrf/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBIQRF
 	bool "libiqrf"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	help
 	  This library implement specific protocol
@@ -8,3 +9,6 @@ config BR2_PACKAGE_LIBIQRF
 	  libusb library.
 
 	  https://github.com/nandra/libiqrf
+
+comment "libiqrf needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnfc-llcp/Config.in b/package/libnfc-llcp/Config.in
index d59976a696..f557926715 100644
--- a/package/libnfc-llcp/Config.in
+++ b/package/libnfc-llcp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNFC_LLCP
 	bool "libnfc-llcp"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBNFC
 	help
 	  Library extending libnfc with support for Logical Link Control
diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in
index 3d67d58f32..159578f6a1 100644
--- a/package/libnfc/Config.in
+++ b/package/libnfc/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNFC
 	bool "libnfc"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
@@ -11,3 +12,6 @@ config BR2_PACKAGE_LIBNFC_EXAMPLES
 	bool "build libnfc examples"
 	depends on BR2_PACKAGE_LIBNFC
 	select BR2_PACKAGE_READLINE
+
+comment "libnfc needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libusb/Config.in b/package/libusb/Config.in
index 7f7276fed8..2eed3fa963 100644
--- a/package/libusb/Config.in
+++ b/package/libusb/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_LIBUSB
 	bool "libusb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Userspace library for accessing USB devices
 
 	  http://libusb.sourceforge.net/
+
+comment "libusb needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/openocd/Config.in b/package/openocd/Config.in
index f67c0a8412..4ea66a5b9a 100644
--- a/package/openocd/Config.in
+++ b/package/openocd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENOCD
 	bool "openocd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
@@ -27,3 +28,6 @@ config BR2_PACKAGE_OPENOCD_VSLLINK
 	bool "Versaloon-Link JTAG Programmr"
 
 endif # BR2_PACKAGE_OPENOCD
+
+comment "openocd needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in
index ae10a55501..a27b3ee43e 100644
--- a/package/usb_modeswitch/Config.in
+++ b/package/usb_modeswitch/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_USB_MODESWITCH
 	bool "usb_modeswitch"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
@@ -7,3 +8,6 @@ config BR2_PACKAGE_USB_MODESWITCH
 	  Used to switch mode on multiple-function devices
 
 	  http://www.draisberghof.de/usb_modeswitch/
+
+comment "usb_modeswitch needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index 23004d9528..fd9926c4bd 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_USBUTILS
 	bool "usbutils"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	help
 	  USB enumeration utilities
@@ -15,3 +16,6 @@ config BR2_PACKAGE_USBUTILS_ZLIB
 	  This makes the data file smaller if you're not using a compressed
 	  filesystem, but it also makes lsusb slower since it has
 	  to decompress the file every time it's run.
+
+comment "usbutils needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From c92aacd330366da803b1cf37ecb3af816bedd7f2 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sat, 28 Jul 2012 09:21:20 +0200
Subject: [PATCH 2444/6849] Rework of the init system

Since we have now two uncompatible init systems, and we want only one of
them at the same time in use in the rootfs, we need to select a
particular init system. This patch also adds $(PKG)_INSTALL_INIT_SYSTEMD
and $(PKG)_INSTALL_INIT_SYSV hooks that are called when the matching
init systems are selected to install properly the init scripts of the
package.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/busybox/busybox.mk |  7 +++++++
 package/pkg-generic.mk     |  8 ++++++++
 target/generic/Config.in   | 29 +++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 394a1aeddd..17ee50a8fd 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -134,6 +134,12 @@ define BUSYBOX_DISABLE_MMU_APPLETS
 endef
 endif
 
+ifeq ($(BR2_INIT_BUSYBOX),y)
+define BUSYBOX_SET_INIT
+	$(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
 	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
 		[ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \
@@ -168,6 +174,7 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_NETKITTELNET)
 	$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
 	$(BUSYBOX_DISABLE_MMU_APPLETS)
+	$(BUSYBOX_SET_INIT)
 	$(BUSYBOX_SET_WATCHDOG)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
 		-C $(@D) oldconfig
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index d1f4f2a2ce..68d23bae43 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -133,6 +133,10 @@ $(BUILD_DIR)/%/.stamp_images_installed:
 # Install to target dir
 $(BUILD_DIR)/%/.stamp_target_installed:
 	@$(call MESSAGE,"Installing to target")
+	$(if $(BR2_INIT_SYSTEMD),\
+		$($(PKG)_INSTALL_INIT_SYSTEMD))
+	$(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
+		$($(PKG)_INSTALL_INIT_SYSV))
 	$($(PKG)_INSTALL_TARGET_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
@@ -151,6 +155,10 @@ $(BUILD_DIR)/%/.stamp_uninstalled:
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET)
 	$($(PKG)_UNINSTALL_STAGING_CMDS)
 	$($(PKG)_UNINSTALL_TARGET_CMDS)
+	$(if $(BR2_INIT_SYSTEMD),\
+		$($(PKG)_UNINSTALL_INIT_SYSTEMD))
+	$(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
+		$($(PKG)_UNINSTALL_INIT_SYSV))
 
 # Remove package sources
 $(BUILD_DIR)/%/.stamp_dircleaned:
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 88f0718e2c..a83ba442ce 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -37,6 +37,35 @@ comment "udev requires a toolchain with LARGEFILE + WCHAR support"
 
 endchoice
 
+choice
+	prompt "Init system"
+	default BR2_INIT_BUSYBOX
+
+config BR2_INIT_BUSYBOX
+	bool "Busybox"
+	select BR2_PACKAGE_BUSYBOX
+
+config BR2_INIT_SYSV
+	bool "systemV"
+	select BR2_PACKAGE_SYSVINIT
+
+config BR2_INIT_SYSTEMD
+	bool "systemd"
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	depends on BR2_INET_IPV6
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_SYSTEMD
+
+comment 'systemd requires largefile, wchar, IPv6, threads and udev support'
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && \
+		     BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \
+		     BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV)
+
+endchoice
+
 config BR2_ROOTFS_DEVICE_TABLE
 	string "Path to the permission tables"
 	default "target/generic/device_table.txt"

From b7eb4104b32a6cfca15c081649065659da75d9c1 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sat, 28 Jul 2012 09:21:21 +0200
Subject: [PATCH 2445/6849] Add systemd unit for lighttpd

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lighttpd/lighttpd.mk      | 13 +++++++++++--
 package/lighttpd/lighttpd.service | 10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 package/lighttpd/lighttpd.service

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 9f554cbc35..c9decb1855 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -87,13 +87,22 @@ endef
 
 LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG
 
-define LIGHTTPD_INSTALL_INIT_SCRIPT
+define LIGHTTPD_INSTALL_INIT_SYSV
 	[ -f $(TARGET_DIR)/etc/init.d/S50lighttpd ] || \
 		$(INSTALL) -D -m 755 package/lighttpd/S50lighttpd \
 			$(TARGET_DIR)/etc/init.d/S50lighttpd
 endef
 
-LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_INIT_SCRIPT
+define LIGHTTPD_INSTALL_INIT_SYSTEMD
+	[ -f $(TARGET_DIR)/etc/systemd/system/lighttpd.service ] || \
+		$(INSTALL) -D -m 755 package/lighttpd/lighttpd.service \
+			$(TARGET_DIR)/etc/systemd/system/lighttpd.service
+
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+
+	ln -fs ../lighttpd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service
+endef
 
 define LIGHTTPD_UNINSTALL_TARGET_CMDS
 	$(RM) $(TARGET_DIR)/usr/sbin/lighttpd
diff --git a/package/lighttpd/lighttpd.service b/package/lighttpd/lighttpd.service
new file mode 100644
index 0000000000..0ca5357f56
--- /dev/null
+++ b/package/lighttpd/lighttpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Lighttpd Web Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/lighttpd-angel -f /etc/lighttpd/lighttpd.conf -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

From e61153cf972e1f060bc0905df61381a9548cb16e Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sat, 28 Jul 2012 09:21:22 +0200
Subject: [PATCH 2446/6849] doc: Update the documentation to mention the new
 PKG_INSTALL_INIT_ variables

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-generic.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index d264f40b00..d3a4abb098 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -311,6 +311,13 @@ different steps of the build process.
 * +LIBFOO_UNINSTALL_STAGING_CMDS+, used to list the actions to
   uninstall the package from the staging directory +$(STAGING_DIR)+.
 
+* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+, used
+  to install init scripts either for the systemV-like init systems
+  (busybox, sysvinit, etc.) or for the systemd units. These commands
+  will be run only when the relevant init system is installed (i.e. if
+  systemd is selected as the init system in the configuration, only
+  +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
+
 The preferred way to define these variables is:
 
 ----------------------

From 58a62766a1869c913845a649890855515aebb016 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 27 Jul 2012 16:26:23 +0100
Subject: [PATCH 2447/6849] sysprof: New package.

[thomas.petazzoni@free-electrons.com:
 - add dependencies on the supported architectures to avoid build
   failures on ARM and other unsupported arches
 - add a patch that removes an useless warning about the kernel
   version. This patch is present upstream. However since it modifies
   configure.ac, we need to autoreconf the package.]

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/sysprof/Config.in                     | 24 +++++++++++++++++
 ...ysprof-01-fix-kernel-version-warning.patch | 26 +++++++++++++++++++
 package/sysprof/sysprof.mk                    | 22 ++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 package/sysprof/Config.in
 create mode 100644 package/sysprof/sysprof-01-fix-kernel-version-warning.patch
 create mode 100644 package/sysprof/sysprof.mk

diff --git a/package/Config.in b/package/Config.in
index f664b8e563..f308de7937 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -39,6 +39,7 @@ source "package/ramspeed/Config.in"
 source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
 source "package/stress/Config.in"
+source "package/sysprof/Config.in"
 source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
 source "package/pv/Config.in"
diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in
new file mode 100644
index 0000000000..513a32cd59
--- /dev/null
+++ b/package/sysprof/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_SYSPROF
+	bool "sysprof"
+	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # glib2
+	# In its util.h file, sysprof contains architecture-specific
+	# code
+	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
+	help
+	  Sysprof is a statistical, system-wide profiler that can
+	  profile user and kernel code using the perf API.
+
+	  http://sysprof.com
+
+config BR2_PACKAGE_SYSPROF_GUI
+	bool "sysprof GUI"
+	depends on BR2_PACKAGE_SYSPROF
+	depends on BR2_PACKAGE_LIBGTK2
+	select BR2_PACKAGE_LIBGLADE
+	select BR2_PACKAGE_GDK_PIXBUF
+	help
+	  GUI for the sysprof system-wide statistical profiler.
+
+comment "sysprof requires a toolchain with WCHAR support"
+        depends on !BR2_USE_WCHAR
diff --git a/package/sysprof/sysprof-01-fix-kernel-version-warning.patch b/package/sysprof/sysprof-01-fix-kernel-version-warning.patch
new file mode 100644
index 0000000000..7b45b3088d
--- /dev/null
+++ b/package/sysprof/sysprof-01-fix-kernel-version-warning.patch
@@ -0,0 +1,26 @@
+From 6a5dfd385ca86b9e40b1a73237408f76b671b490 Mon Sep 17 00:00:00 2001
+From: Pauli Nieminen <suokkos@gmail.com>
+Date: Mon, 09 Apr 2012 18:12:59 +0000
+Subject: Don't complain about old kernel for 3.0+ kernels
+
+Linux kernel version received bump to 3.0 that causes configure to
+complain about older kernel. To avoid the warning configure needs to
+check major and minor versions before micro.
+
+Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 34fdc43..e4f6d5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,7 +83,7 @@ Makefile
+ 
+ AC_OUTPUT
+ 
+-if [[ $KMICRO -lt 31 ]] ; then
++if [[ $KMAJOR -eq 2 -a $KMINOR -eq 6 -a $KMICRO -lt 31 ]] ; then
+    echo
+    echo "%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%@%"
+    echo "@"  
+--
+cgit v0.9.0.2
diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk
new file mode 100644
index 0000000000..03355d83e8
--- /dev/null
+++ b/package/sysprof/sysprof.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# sysprof
+#
+#############################################################
+
+SYSPROF_VERSION = 1.1.8
+SYSPROF_SITE = http://sysprof.com
+SYSPROF_DEPENDENCIES = libglib2
+SYSPROF_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y)
+SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf
+endif
+
+define SYSPROF_CREATE_M4_DIR
+	mkdir -p $(@D)/m4
+endef
+
+SYSPROF_POST_PATCH_HOOKS += SYSPROF_CREATE_M4_DIR
+
+$(eval $(autotools-package))

From 2ff012b3c70ea41cc6f241426320d1b168985f79 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 Jul 2012 21:12:59 +0200
Subject: [PATCH 2448/6849] Simplify x86 target architecture variant handling

Instead of having two separate list of choices for select the target
architecture variant for i386 and x86_64, with many CPU choices
duplicated (because all modern x86 CPUs can be both used as i386 or
x86_64), merge them into a single list. In the x86_64 case, all the
x86 CPUs that do not support the 64 bits instruction set are hidden.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch   | 113 +++++++++++++---------------------------
 toolchain/gcc/Config.in |   4 +-
 2 files changed, 37 insertions(+), 80 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 75c5499ff9..342066e22c 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -337,44 +337,60 @@ config BR2_X86_CPU_HAS_SSSE3
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_i386
-	default BR2_x86_i586
+	depends on BR2_i386 || BR2_x86_64
+	default BR2_x86_i586 if BR2_i386
+	default BR2_x86_generic if BR2_x86_64
 	help
 	  Specific CPU variant to use
 
+config BR2_x86_generic
+	bool "generic"
 config BR2_x86_i386
 	bool "i386"
+	depends on !BR2_x86_64
 config BR2_x86_i486
 	bool "i486"
+	depends on !BR2_x86_64
 config BR2_x86_i586
 	bool "i586"
+	depends on !BR2_x86_64
 config BR2_x86_i686
 	bool "i686"
+	depends on !BR2_x86_64
 config BR2_x86_pentiumpro
 	bool "pentium pro"
+	depends on !BR2_x86_64
 config BR2_x86_pentium_mmx
 	bool "pentium MMX"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_pentium_m
 	bool "pentium mobile"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
 config BR2_x86_pentium2
 	bool "pentium2"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_pentium3
 	bool "pentium3"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
 config BR2_x86_pentium4
 	bool "pentium4"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
+	depends on !BR2_x86_64
 config BR2_x86_prescott
 	bool "prescott"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
+	depends on !BR2_x86_64
 config BR2_x86_nocona
 	bool "nocona"
 	select BR2_X86_CPU_HAS_MMX
@@ -398,16 +414,20 @@ config BR2_x86_atom
 config BR2_x86_k6
 	bool "k6"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_k6_2
 	bool "k6-2"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_athlon
 	bool "athlon"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_athlon_4
 	bool "athlon-4"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
 config BR2_x86_opteron
 	bool "opteron"
 	select BR2_X86_CPU_HAS_MMX
@@ -430,68 +450,24 @@ config BR2_x86_geode
 	# Don't include MMX support because there several variant of geode
 	# processor, some with MMX support, some without.
 	# See: http://en.wikipedia.org/wiki/Geode_%28processor%29
+	depends on !BR2_x86_64
 config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_c32
 	bool "Via C3-2 (Nehemiah cores)"
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
 config BR2_x86_winchip_c6
 	bool "IDT Winchip C6"
 	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
 config BR2_x86_winchip2
 	bool "IDT Winchip 2"
 	select BR2_X86_CPU_HAS_MMX
-endchoice
-
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_x86_64
-	default BR2_x86_64_generic
-	help
-	  Specific CPU variant to use
-
-config BR2_x86_64_generic
-	bool "generic"
-config BR2_x86_64_barcelona
-	bool "barcelona"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_3DNOW
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_64_opteron_sse3
-	bool "opteron w/ sse3"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_64_opteron
-	bool "opteron"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-config BR2_x86_64_nocona
-	bool "nocona"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_64_core2
-	bool "core2"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-config BR2_x86_64_atom
-	bool "atom"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
+	depends on !BR2_x86_64
 endchoice
 
 choice
@@ -676,16 +652,17 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_pentium_m
 	default "i686"		if BR2_x86_pentiumpro
 	default "i686"		if BR2_x86_prescott
-	default "i686"		if BR2_x86_nocona
-	default "i686"		if BR2_x86_core2
-	default "i686"		if BR2_x86_atom
-	default "i686"		if BR2_x86_opteron
-	default "i686"		if BR2_x86_opteron_sse3
-	default "i686"		if BR2_x86_barcelona
+	default "i686"		if BR2_x86_nocona && BR2_i386
+	default "i686"		if BR2_x86_core2 && BR2_i386
+	default "i686"		if BR2_x86_atom && BR2_i386
+	default "i686"		if BR2_x86_opteron && BR2_i386
+	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
+	default "i686"		if BR2_x86_barcelona && BR2_i386
 	default "i686"		if BR2_x86_k6
 	default "i686"		if BR2_x86_k6_2
 	default "i686"		if BR2_x86_athlon
 	default "i686"		if BR2_x86_athlon_4
+	default "x86_64"	if BR2_x86_64
 	default "m68k"		if BR2_m68k
 	default "microblaze"	if BR2_microblaze
 	default "mips"		if BR2_mips
@@ -701,14 +678,6 @@ config BR2_ARCH
 	default "sh4aeb"	if BR2_sh4aeb
 	default "sh64"		if BR2_sh64
 	default "sparc"		if BR2_sparc
-	default "x86_64"	if BR2_x86_64
-	default "x86_64"	if BR2_x86_64_generic
-	default "x86_64"	if BR2_x86_64_nocona
-	default "x86_64"	if BR2_x86_64_core2
-	default "x86_64"	if BR2_x86_64_atom
-	default "x86_64"	if BR2_x86_64_opteron
-	default "x86_64"	if BR2_x86_64_opteron_sse3
-	default "x86_64"	if BR2_x86_64_barcelona
 	default "xtensa"	if BR2_xtensa
 
 
@@ -750,13 +719,7 @@ config BR2_GCC_TARGET_TUNE
 	default c3		if BR2_x86_c3
 	default c3-2		if BR2_x86_c32
 	default geode		if BR2_x86_geode
-	default generic		if BR2_x86_64_generic
-	default nocona		if BR2_x86_64_nocona
-	default core2		if BR2_x86_64_core2
-	default atom		if BR2_x86_64_atom
-	default k8		if BR2_x86_64_opteron
-	default k8-sse3		if BR2_x86_64_opteron_sse3
-	default barcelona	if BR2_x86_64_barcelona
+	default generic		if BR2_x86_generic
 	default arm600		if BR2_arm600
 	default arm610		if BR2_arm610
 	default arm620		if BR2_arm620
@@ -864,12 +827,6 @@ config BR2_GCC_TARGET_ARCH
 	default athlon-4	if BR2_x86_athlon_4
 	default winchip-c6	if BR2_x86_winchip_c6
 	default winchip2	if BR2_x86_winchip2
-	default nocona		if BR2_x86_64_nocona
-	default core2		if BR2_x86_64_core2
-	default atom		if BR2_x86_64_atom
-	default k8		if BR2_x86_64_opteron
-	default k8-sse3		if BR2_x86_64_opteron_sse3
-	default barcelona	if BR2_x86_64_barcelona
 	default c3		if BR2_x86_c3
 	default c3-2		if BR2_x86_c32
 	default geode		if BR2_x86_geode
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index fa526bba3f..d08efbcfec 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,11 +15,11 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_x86_64_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_x86_atom && !BR2_x86_64_atom
+		depends on !BR2_avr32 && !BR2_x86_atom
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X

From ed7e0927f8e4c480b3efde9928fb886f47d36b85 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jul 2012 20:30:04 +0200
Subject: [PATCH 2449/6849] sysprof: add patch to fix build failures related to
 NT_GNU_BUILD_ID

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../sysprof-02-define-NT_GNU_BUILD_ID.patch   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch

diff --git a/package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch b/package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch
new file mode 100644
index 0000000000..dcc2cbe67c
--- /dev/null
+++ b/package/sysprof/sysprof-02-define-NT_GNU_BUILD_ID.patch
@@ -0,0 +1,22 @@
+On uclibc elf.h does not have GNU extentions but we need this define
+so we define it locally if its not getting it from elf.h
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: git/elfparser.h
+===================================================================
+--- git.orig/elfparser.h	2011-07-16 18:57:41.000000000 -0700
++++ git/elfparser.h	2011-07-16 20:28:54.733829895 -0700
+@@ -17,6 +17,10 @@
+  */
+ #include <glib.h>
+ 
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ typedef struct ElfSym ElfSym;
+ typedef struct ElfParser ElfParser;
+ 

From 1ed1a83f1c415a77ab23f74c7a909f331319facd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jul 2012 21:32:25 +0200
Subject: [PATCH 2450/6849] pkg-stats: add license information, rework
 information displayed

Now that most packages have been converted over to package
infrastructures, keep only one column to show the package
infrastructures.

A new column, showing of the package has license information, has been
added. This will help in increasing the number of packages having
license metadata.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/scripts/pkg-stats | 261 +++++++++++++++++---------------------
 1 file changed, 113 insertions(+), 148 deletions(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index ac5d8ec844..ca2d0ec5d4 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -36,53 +36,65 @@ td {
 td.centered {
   text-align: center;
 }
-tr.wrong td {
+td.wrong {
   background: #ff9a69;
 }
-tr.correct td {
+td.correct {
   background: #d2ffc4;
 }
+td.nopatches {
+  background: #d2ffc4;
+}
+
+td.somepatches {
+  background: #ffd870;
+}
+
+td.lotsofpatches {
+  background: #ff9a69;
+}
 </style>
+<title>Statistics of Buildroot packages</title>
 </head>
 
 <a href=\"#results\">Results</a><br/>
 
 <table>
 <tr>
-<td rowspan=\"2\">Id</td>
-<td rowspan=\"2\">Package</td>
-<td rowspan=\"2\">Patch count</td>
-<td colspan=\"2\" class=\"centered\">autotools-package</td>
-<td colspan=\"2\" class=\"centered\">generic-package</td>
-<td colspan=\"2\" class=\"centered\">cmake-package</td>
-<td colspan=\"2\" class=\"centered\">manual</td>
-<td rowspan=\"2\" class=\"centered\">Actions</td>
+<td>Id</td>
+<td>Package</td>
+<td class=\"centered\">Patch count</td>
+<td class=\"centered\">Infrastructure</td>
+<td class=\"centered\">License</td>
 </tr>
-<tr>
-<td class=\"centered\">host</td>
-<td class=\"centered\">target</td>
-<td class=\"centered\">host</td>
-<td class=\"centered\">target</td>
-<td class=\"centered\">host</td>
-<td class=\"centered\">target</td>
-<td class=\"centered\">host</td>
-<td class=\"centered\">target</td>
-</tr>"
-
-convert_to_generic_target=0
-convert_to_generic_host=0
-convert_to_target_autotools=0
-convert_to_host_autotools=0
+"
+
+autotools_packages=0
+cmake_packages=0
+generic_packages=0
+manual_packages=0
+packages_with_licence=0
+packages_without_licence=0
 total_patch_count=0
 cnt=0
-for i in $(find package/ -name '*.mk') ; do
+
+for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 
     if test \
+	$i = "boot/common.mk" -o \
+	$i = "linux/linux-ext-xenomai.mk" -o \
+	$i = "linux/linux-ext-rtai.mk" -o \
+	$i = "linux/linux-ext-ocf-linux.mk" -o \
 	$i = "package/efl/efl.mk" -o \
 	$i = "package/games/games.mk" -o \
 	$i = "package/gtk2-themes/gtk2-themes.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \
-	$i = "package/customize/customize.mk" -o \
+ 	$i = "package/customize/customize.mk" -o \
+ 	$i = "package/pkg-autotools.mk" -o \
+ 	$i = "package/pkg-cmake.mk" -o \
+ 	$i = "package/pkg-generic.mk" -o \
+ 	$i = "package/pkg-utils.mk" -o \
+ 	$i = "package/pkg-download.mk" -o \
 	$i = "package/matchbox/matchbox.mk" -o \
 	$i = "package/x11r7/x11r7.mk" ; then
 	echo "skipping $i" 1>&2
@@ -91,78 +103,67 @@ for i in $(find package/ -name '*.mk') ; do
 
     cnt=$((cnt+1))
 
-    is_auto_host=0
-    is_auto_target=0
-    is_cmake_host=0
-    is_cmake_target=0
-    is_pkg_target=0
-    is_pkg_host=0
-    is_manual_target=0
-    is_manual_host=0
+    hashost=0
+    hastarget=0
 
+    # Determine package infrastructure
     if grep -E "\(host-autotools-package\)" $i > /dev/null ; then
-	is_auto_host=1
+	infratype="autotools"
+	hashost=1
     fi
 
     if grep -E "\(autotools-package\)" $i > /dev/null ; then
-	is_auto_target=1
+	infratype="autotools"
+	hastarget=1
     fi
 
     if grep -E "\(host-generic-package\)" $i > /dev/null ; then
-	is_pkg_host=1
+	infratype="generic"
+	hashost=1
     fi
 
     if grep -E "\(generic-package\)" $i > /dev/null ; then
-	is_pkg_target=1
+	infratype="generic"
+	hastarget=1
     fi
 
     if grep -E "\(host-cmake-package\)" $i > /dev/null ; then
-	is_cmake_host=1
+	infratype="cmake"
+	hashost=1
     fi
 
     if grep -E "\(cmake-package\)" $i > /dev/null ; then
-	is_cmake_target=1
+	infratype="cmake"
+	hastarget=1
     fi
 
     pkg=$(basename $i)
     pkg=${pkg%.mk}
+    pkgvariable=$(echo ${pkg} | tr "a-z-" "A-Z_")
 
-    if grep "^host-$pkg:" $i > /dev/null ; then
-	is_manual_host=1
-    fi
-
-    if test $is_pkg_target -eq 0 -a $is_auto_target -eq 0 -a $is_cmake_target -eq 0; then
-	is_manual_target=1
-    fi
-
-    tasks=""
-
-    if [ $is_manual_target -eq 1 ] ; then
-	if grep "/configure" $i > /dev/null ; then
-	    tasks=$tasks"<li>convert package to autotools ?</li>"
-	    convert_to_target_autotools=$((convert_to_target_autotools+1))
-	else
-	    tasks=$tasks"<li>convert to generic target</li>"
-	    convert_to_generic_target=$((convert_to_generic_target+1))
-	fi
-    fi
 
-    if [ $is_manual_host -eq 1 ]; then
-	if grep "/configure" $i > /dev/null ; then
-	    tasks=$tasks"<li>convert package to autotools ?</li>"
-	    convert_to_host_autotools=$((convert_to_host_autotools+1))
-	else
-	    tasks=$tasks"<li>convert to generic host</li>"
-	    convert_to_generic_host=$((convert_to_generic_host+1))
-	fi
+    # Count packages per infrastructure
+    if [ -z ${infratype} ] ; then
+	infratype="manual"
+	manual_packages=$(($manual_packages+1))
+    elif [ ${infratype} = "autotools" ]; then
+	autotools_packages=$(($autotools_packages+1))
+    elif [ ${infratype} = "cmake" ]; then
+	cmake_packages=$(($cmake_packages+1))
+    elif [ ${infratype} = "generic" ]; then
+	generic_packages=$(($generic_packages+1))
     fi
 
-    if test -n "$tasks" ; then
-	echo "<tr class=\"wrong\">"
+    if grep -qE "^${pkgvariable}_LICENSE =" $i ; then
+	packages_with_license=$(($packages_with_license+1))
+	license=1
     else
-	echo "<tr class=\"correct\">"
+	packages_without_license=$(($packages_without_license+1))
+	license=0
     fi
 
+    echo "<tr>"
+
     echo "<td>$cnt</td>"
     echo "<td>$i</td>"
 
@@ -171,86 +172,37 @@ for i in $(find package/ -name '*.mk') ; do
     total_patch_count=$(($total_patch_count+$patch_count))
 
     if test $patch_count -lt 1 ; then
-	patch_count_color="#00ff00"
+	patch_count_class="nopatches"
     elif test $patch_count -lt 5 ; then
-	patch_count_color="#ffc600"
-    else
-	patch_count_color="#ff0000"
-    fi
-
-    echo "<td class=\"centered\" style=\"color: $patch_count_color; font-weight: bold;\">"
-    echo $patch_count
-    echo "</td>"
-
-    echo "<td class=\"centered\">"
-    if [ $is_auto_host -eq 1 ] ; then
-	echo "<b>YES</b>"
+	patch_count_class="somepatches"
     else
-	echo "NO"
+	patch_count_class="lotsofpatches"
     fi
-    echo "</td>"
 
-    echo "<td class=\"centered\">"
-    if [ $is_auto_target -eq 1 ] ; then
-	echo "<b>YES</b>"
-    else
-	echo "NO"
-    fi
+    echo "<td class=\"centered ${patch_count_class}\">"
+    echo "<b>$patch_count</b>"
     echo "</td>"
 
-    echo "<td class=\"centered\">"
-    if [ $is_pkg_host -eq 1 ] ; then
-	echo "<b>YES</b>"
+    if [ ${infratype} = "manual" ] ; then
+	echo "<td class=\"centered wrong\"><b>manual</b></td>"
     else
-	echo "NO"
-    fi
-    echo "</td>"
-
-    echo "<td class=\"centered\">"
-    if [ $is_pkg_target -eq 1 ] ; then
-	echo "<b>YES</b>"
-    else
-	echo "NO"
-    fi
-    echo "</td>"
-
-    echo "<td class=\"centered\">"
-    if [ $is_cmake_host -eq 1 ] ; then
-	echo "<b>YES</b>"
-    else
-	echo "NO"
-    fi
-    echo "</td>"
-
-    echo "<td class=\"centered\">"
-    if [ $is_cmake_target -eq 1 ] ; then
-	echo "<b>YES</b>"
-    else
-	echo "NO"
-    fi
-    echo "</td>"
-
-    echo "<td class=\"centered\">"
-    if [ $is_manual_host -eq 1 ] ; then
-	echo "<b>YES</b>"
-    else
-	echo "NO"
+	echo "<td class=\"centered correct\">"
+	echo "<b>${infratype}</b><br/>"
+	if [ ${hashost} -eq 1 -a ${hastarget} -eq 1 ]; then
+	    echo "target + host"
+	elif [ ${hashost} -eq 1 ]; then
+	    echo "host"
+	else
+	    echo "target"
+	fi
+	echo "</td>"
     fi
-    echo "</td>"
 
-    echo "<td class=\"centered\">"
-    if [ $is_manual_target -eq 1 ] ; then
-	echo "<b>YES</b>"
+    if [ ${license} -eq 0 ] ; then
+	echo "<td class=\"centered wrong\">No</td>"
     else
-	echo "NO"
+	echo "<td class=\"centered correct\">Yes</td>"
     fi
-    echo "</td>"
-
-    echo "<td>"
-    echo "<ul>"
-    echo $tasks
-    echo "</ul>"
-    echo "</td>"
 
     echo "</tr>"
 
@@ -259,20 +211,28 @@ echo "</table>"
 
 echo "<table>"
 echo "<tr>"
-echo "<td>Packages to convert to generic target</td>"
-echo "<td>$convert_to_generic_target</td>"
+echo "<td>Packages using the <i>generic</i> infrastructure</td>"
+echo "<td>$generic_packages</td>"
+echo "</tr>"
+echo "<tr>"
+echo "<td>Packages using the <i>cmake</i> infrastructure</td>"
+echo "<td>$cmake_packages</td>"
 echo "</tr>"
 echo "<tr>"
-echo "<td>Packages to convert to generic host</td>"
-echo "<td>$convert_to_generic_host</td>"
+echo "<td>Packages using the <i>autotools</i> infrastructure</td>"
+echo "<td>$autotools_packages</td>"
 echo "</tr>"
 echo "<tr>"
-echo "<td>Packages to convert to target autotools</td>"
-echo "<td>$convert_to_target_autotools</td>"
+echo "<td>Packages not using any infrastructure</td>"
+echo "<td>$manual_packages</td>"
 echo "</tr>"
 echo "<tr>"
-echo "<td>Packages to convert to host autotools</td>"
-echo "<td>$convert_to_host_autotools</td>"
+echo "<td>Packages having license information</td>"
+echo "<td>$packages_with_license</td>"
+echo "</tr>"
+echo "<tr>"
+echo "<td>Packages not having licence information</td>"
+echo "<td>$packages_without_license</td>"
 echo "</tr>"
 echo "<tr>"
 echo "<td>Number of patches in all packages</td>"
@@ -283,3 +243,8 @@ echo "<td>TOTAL</td>"
 echo "<td>$cnt</td>"
 echo "</tr>"
 echo "</table>"
+
+echo "<hr/>"
+echo "<i>Updated on $(LANG=C date), Git commit $(git log master -n 1 --pretty=format:%H)</i>"
+echo "</body>"
+echo "</html>"
\ No newline at end of file

From 697f034f589e0cacaf01f57baa2b9015f7f3227d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jul 2012 21:38:16 +0200
Subject: [PATCH 2451/6849] pkg-stats: ensure infratype is reset for every
 package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/scripts/pkg-stats | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index ca2d0ec5d4..de73eeb270 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -105,6 +105,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 
     hashost=0
     hastarget=0
+    infratype=""
 
     # Determine package infrastructure
     if grep -E "\(host-autotools-package\)" $i > /dev/null ; then

From 0c457a3321c6fc7de8068903cc7e93f0443d7447 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 31 Jul 2012 09:37:01 +0100
Subject: [PATCH 2452/6849] protobuf: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/protobuf/protobuf.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index 6e49dd3658..5032d709d3 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -6,6 +6,8 @@
 PROTOBUF_VERSION = 2.4.1
 PROTOBUF_SOURCE = protobuf-$(PROTOBUF_VERSION).tar.gz
 PROTOBUF_SITE = http://protobuf.googlecode.com/files/
+PROTOBUF_LICENSE = BSD-3c
+PROTOBUF_LICENSE_FILES = COPYING.txt
 
 # N.B. Need to use host protoc during cross compilation.
 PROTOBUF_DEPENDENCIES = host-protobuf

From db81841692165ee47774b8ad3c2d79193035b17c Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 31 Jul 2012 10:51:30 +0200
Subject: [PATCH 2453/6849] ffmpeg: bump to 0.8.12

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 840d079411..994c7cd309 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FFMPEG_VERSION = 0.8.11
+FFMPEG_VERSION = 0.8.12
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From 942fc4c554f4850810118dba3f9036fc9e39a830 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 14:32:44 +0200
Subject: [PATCH 2454/6849] Revert "Microblaze: build kernel with device tree"

This is way too specific to microblaze-only. Remove this support to
introduce a more generic way to do support device tree kernels.

This reverts commit aaed42d15643e0cb64c96fa400a6097a19d19ef4.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in |  8 --------
 linux/linux.mk  | 14 --------------
 2 files changed, 22 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index e0c1c7ec02..915b1b6192 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -125,14 +125,6 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	help
 	  Path to the kernel configuration file
 
-config BR2_LINUX_KERNEL_DTS_FILE
-    string "Device Tree dts file location"
-    depends on BR2_microblaze
-    help
-      Path from where the dts file has to be copied
-      The final "custom target" name depends on the
-      dts file name:
-          <name>.dts --> simpleImage.<name>
 #
 # Binary format
 #
diff --git a/linux/linux.mk b/linux/linux.mk
index ca216a3e3d..1b7e0b755d 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -119,18 +119,6 @@ endef
 
 LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
 
-ifeq ($(KERNEL_ARCH),microblaze)
-# on microblaze, we always want mkimage
-LINUX_DEPENDENCIES+=host-uboot-tools
-
-define LINUX_COPY_DTS
-    if test -f "$(BR2_LINUX_KERNEL_DTS_FILE)" ; then \
-        cp $(BR2_LINUX_KERNEL_DTS_FILE) $(@D)/arch/microblaze/boot/dts ; \
-    else \
-        echo "Cannot copy dts file!" ; \
-    fi
-endef
-endif
 
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
 KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
@@ -145,8 +133,6 @@ define LINUX_CONFIGURE_CMDS
 	$(if $(BR2_ARM_EABI),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
 		$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
-    $(if $(BR2_microblaze),
-        $(call LINUX_COPY_DTS))
 	# As the kernel gets compiled before root filesystems are
 	# built, we create a fake cpio file. It'll be
 	# replaced later by the real cpio archive, and the kernel will be

From 69fc497df0ae51bcc8a067c849447abdeb3cb2be Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 14:32:45 +0200
Subject: [PATCH 2455/6849] Rework support for the device tree

This patch introduces some support for device tree-enabled kernels.

It replaces the former BR2_LINUX_KERNEL_DTS_FILE option that was
microblaze-only, that was quite limited. This option was quite
limited, first obviously because it was restricted to microblaze,
but also because it targetted only external device tree source files,
and allowed only to build simpleImages using the custom image name
mechanism.

This patch adds a much more generic one, that can work on basically
every architecture that supports device tree. It allows to build
both device tree source file that comes with the kernel source or to
set the path to the device tree file to use so that one can use a
custom device tree.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++
 linux/linux.mk  | 19 +++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 915b1b6192..16c7ea72fa 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -175,6 +175,48 @@ config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
 	  Specify the kernel make target to build the kernel that you
 	  need.
 
+config BR2_LINUX_KERNEL_DTS_SUPPORT
+	bool "Device tree support"
+	help
+	  Compile a device tree source into a device tree blob.
+	  Select the dts file to compile in the options below.
+
+if BR2_LINUX_KERNEL_DTS_SUPPORT
+
+choice
+	prompt "Device tree source"
+	default BR2_LINUX_KERNEL_USE_INTREE_DTS
+
+config BR2_LINUX_KERNEL_USE_INTREE_DTS
+	bool "Use a device tree present in the kernel."
+	help
+	   Use a device tree source distributed with
+	   the kernel sources. The dts files are located
+           in the arch/<arch>/boot/dts folder.
+
+config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
+	bool "Use a custom device tree file"
+	help
+	  Use a custom device tree file, i.e, a device
+	  tree file that does not belong to the kernel
+	  source tree.
+endchoice
+
+config BR2_LINUX_KERNEL_INTREE_DTS_NAME
+	string "Device Tree Source file name"
+	depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
+	help
+	 Name of the device tree source file, without
+	 the trailing .dts
+
+config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
+	string "Device Tree Source file path"
+	depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS
+	help
+	  Path to the device tree source file
+
+endif
+
 config BR2_LINUX_KERNEL_INSTALL_TARGET
 	bool "Install kernel image to /boot in target"
 	depends on !BR2_TARGET_ROOTFS_INITRAMFS
diff --git a/linux/linux.mk b/linux/linux.mk
index 1b7e0b755d..099f8ba042 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -48,6 +48,12 @@ LINUX_MAKE_FLAGS = \
 # going to be installed in the target filesystem.
 LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
 
+ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
+KERNEL_DTS_NAME = $(BR2_LINUX_KERNEL_INTREE_DTS_NAME)
+else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
+KERNEL_DTS_NAME = $(basename $(notdir $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))
+endif
+
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
@@ -155,13 +161,25 @@ define LINUX_CONFIGURE_CMDS
 	yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
 endef
 
+ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
+define LINUX_BUILD_DTB
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTS_NAME).dtb
+endef
+define LINUX_INSTALL_DTB
+	cp $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb $(BINARIES_DIR)/
+endef
+endif
+
 # Compilation. We make sure the kernel gets rebuilt when the
 # configuration has changed.
 define LINUX_BUILD_CMDS
+	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
+		cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/)
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi
+	$(LINUX_BUILD_DTB)
 endef
 
 
@@ -186,6 +204,7 @@ endef
 
 define LINUX_INSTALL_TARGET_CMDS
 	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
+	$(LINUX_INSTALL_DTB)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\

From 902609fbb31506dfe04f100c9c8099fbfa8095a1 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 14:32:46 +0200
Subject: [PATCH 2456/6849] Factorize the u-boot images code

This patch introduces the BR2_LINUX_KERNEL_UBOOT_IMAGE boolean to
factorize more code that will be shared in the next patches that
introduces other uImage-like targets.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++++
 linux/linux.mk  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 16c7ea72fa..84fae910e2 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -129,12 +129,16 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 # Binary format
 #
 
+config BR2_LINUX_KERNEL_UBOOT_IMAGE
+       bool
+
 choice
 	prompt "Kernel binary format"
 
 config BR2_LINUX_KERNEL_UIMAGE
 	bool "uImage"
 	depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64
+	select BR2_LINUX_KERNEL_UBOOT_IMAGE
 
 config BR2_LINUX_KERNEL_BZIMAGE
 	bool "bzImage"
diff --git a/linux/linux.mk b/linux/linux.mk
index 099f8ba042..844ce55294 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -36,6 +36,10 @@ LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 LINUX_INSTALL_IMAGES = YES
 LINUX_DEPENDENCIES  += host-module-init-tools
 
+ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
+	LINUX_DEPENDENCIES += host-uboot-tools
+endif
+
 LINUX_MAKE_FLAGS = \
 	HOSTCC="$(HOSTCC)" \
 	HOSTCFLAGS="$(HOSTCFLAGS)" \
@@ -64,7 +68,6 @@ LINUX_IMAGE_NAME=vmImage
 else
 LINUX_IMAGE_NAME=uImage
 endif
-LINUX_DEPENDENCIES+=host-uboot-tools
 else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)
 LINUX_IMAGE_NAME=bzImage
 else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)

From 978928e4acb0ee4e335eaf4bf8feca895f372418 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 14:32:47 +0200
Subject: [PATCH 2457/6849] Add support for appended device tree blobs for arm

This patch adds support for the ARM-only appended device tree
mechanism present in the kernel.

This option allows to add at the end of the kernel image the
device tree blob so that we can still boot device tree enabled
kernels with old bootloaders.

This patch also adds the needed logic to genereate such an image
when building zImages or uImages, also adding the necessary parts
to rebuild the uImage.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 33 +++++++++++++++++++++++++++++++++
 linux/linux.mk  | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 84fae910e2..553aa39735 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -140,6 +140,13 @@ config BR2_LINUX_KERNEL_UIMAGE
 	depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64
 	select BR2_LINUX_KERNEL_UBOOT_IMAGE
 
+config BR2_LINUX_KERNEL_APPENDED_UIMAGE
+	bool "uImage with appended DT"
+	depends on BR2_arm || BR2_armeb
+	select BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_APPENDED_DTB
+	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+
 config BR2_LINUX_KERNEL_BZIMAGE
 	bool "bzImage"
 	depends on BR2_i386 || BR2_x86_64
@@ -148,6 +155,12 @@ config BR2_LINUX_KERNEL_ZIMAGE
 	bool "zImage"
 	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64 || BR2_xtensa
 
+config BR2_LINUX_KERNEL_APPENDED_ZIMAGE
+	bool "zImage with appended DT"
+	depends on BR2_arm || BR2_armeb
+	select BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_APPENDED_DTB
+
 config BR2_LINUX_KERNEL_VMLINUX_BIN
 	bool "vmlinux.bin"
 	depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64
@@ -187,6 +200,26 @@ config BR2_LINUX_KERNEL_DTS_SUPPORT
 
 if BR2_LINUX_KERNEL_DTS_SUPPORT
 
+# We have mainly three cases when it comes to device tree support:
+#   1) We don't want any support at all. Then the ..DTS_SUPPORT
+#      variable won't be set
+#   2) We want device tree support, so we need the user to enter
+#      the device tree name or the the path to the custom device
+#      he uses, but the kernel abstracts this from us and only
+#      build an image that looks like a regular kernel image. In
+#      this case, we only need to derive the kernel image name from
+#      the given device tree name, and all the rest is as usual
+#   3) We want device tree support, but the kernel requires us to
+#      build the device tree blob separately. In this case, some
+#      more logic will be needed.
+# The variable below address the second case, were you only want
+# limited actions from buildroot.
+config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
+	bool
+
+config BR2_LINUX_KERNEL_APPENDED_DTB
+	bool
+
 choice
 	prompt "Device tree source"
 	default BR2_LINUX_KERNEL_USE_INTREE_DTS
diff --git a/linux/linux.mk b/linux/linux.mk
index 844ce55294..d466228f2e 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -58,6 +58,13 @@ else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
 KERNEL_DTS_NAME = $(basename $(notdir $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))
 endif
 
+ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
+ifneq ($(words $(KERNEL_DTS_NAME)),1)
+$(error Kernel with appended device tree needs exactly one DTS source.\
+  Check BR2_LINUX_KERNEL_INTREE_DTS_NAME or BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.)
+endif
+endif
+
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
@@ -68,10 +75,14 @@ LINUX_IMAGE_NAME=vmImage
 else
 LINUX_IMAGE_NAME=uImage
 endif
+else ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
+LINUX_IMAGE_NAME=uImage
 else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)
 LINUX_IMAGE_NAME=bzImage
 else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)
 LINUX_IMAGE_NAME=zImage
+else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
+LINUX_IMAGE_NAME=zImage
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
 LINUX_IMAGE_NAME=vmlinux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
@@ -81,6 +92,12 @@ LINUX_IMAGE_NAME=vmlinuz
 endif
 endif
 
+ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
+LINUX_IMAGE_TARGET=zImage
+else
+LINUX_IMAGE_TARGET=$(LINUX_IMAGE_NAME)
+endif
+
 # Compute the arch path, since i386 and x86_64 are in arch/x86 and not
 # in arch/$(KERNEL_ARCH). Even if the kernel creates symbolic links
 # for bzImage, arch/i386 and arch/x86_64 do not exist when copying the
@@ -161,10 +178,13 @@ define LINUX_CONFIGURE_CMDS
 		$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
 	$(if $(BR2_PACKAGE_SYSTEMD),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config))
+	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB,$(@D)/.config))
 	yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
 endef
 
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
+ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),)
 define LINUX_BUILD_DTB
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTS_NAME).dtb
 endef
@@ -172,17 +192,32 @@ define LINUX_INSTALL_DTB
 	cp $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb $(BINARIES_DIR)/
 endef
 endif
+endif
+
+ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
+define LINUX_APPEND_DTB
+	cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb >> $(KERNEL_ARCH_PATH)/boot/zImage
+	# We need to generate the uImage here after that so that the uImage is
+	# generated with the right image size.
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage
+endef
+else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
+define LINUX_APPEND_DTB
+	cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb >> $(KERNEL_ARCH_PATH)/boot/zImage
+endef
+endif
 
 # Compilation. We make sure the kernel gets rebuilt when the
 # configuration has changed.
 define LINUX_BUILD_CMDS
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
 		cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/)
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_TARGET)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi
 	$(LINUX_BUILD_DTB)
+	$(LINUX_APPEND_DTB)
 endef
 
 

From 18e752de8712df676b31b32003acea57ace95cb3 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 14:32:48 +0200
Subject: [PATCH 2458/6849] linux: Add new image formats for PowerPC and
 Microblaze

Add the following Linux kernel image formats:

 * cuImage(powerpc)
 * simpleImage(microblaze)
 * linux.bin(microblaze)

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 21 +++++++++++++++++++++
 linux/linux.mk  |  6 ++++++
 2 files changed, 27 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 553aa39735..9bd88e1195 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -161,6 +161,27 @@ config BR2_LINUX_KERNEL_APPENDED_ZIMAGE
 	select BR2_LINUX_KERNEL_DTS_SUPPORT
 	select BR2_LINUX_KERNEL_APPENDED_DTB
 
+config BR2_LINUX_KERNEL_CUIMAGE
+	bool "cuImage"
+	depends on BR2_powerpc
+	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
+
+config BR2_LINUX_KERNEL_SIMPLEIMAGE
+	bool "simpleImage"
+	depends on BR2_microblaze
+	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
+
+config BR2_LINUX_KERNEL_LINUX_BIN
+	bool "linux.bin"
+	depends on BR2_microblaze
+	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_LINUX_KERNEL_DTS_SUPPORT
+	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
+
 config BR2_LINUX_KERNEL_VMLINUX_BIN
 	bool "vmlinux.bin"
 	depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64
diff --git a/linux/linux.mk b/linux/linux.mk
index d466228f2e..5365d5fd1b 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -83,6 +83,12 @@ else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)
 LINUX_IMAGE_NAME=zImage
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 LINUX_IMAGE_NAME=zImage
+else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y)
+LINUX_IMAGE_NAME=cuImage.$(KERNEL_DTS_NAME)
+else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y)
+LINUX_IMAGE_NAME=simpleImage.$(KERNEL_DTS_NAME)
+else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)
+LINUX_IMAGE_NAME=linux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
 LINUX_IMAGE_NAME=vmlinux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)

From fd1180b7cf5140d291741416e13bdb444712892d Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 14:32:49 +0200
Subject: [PATCH 2459/6849] Update s6lx9 microblaze default configuration

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 configs/s6lx9_microboard_defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig
index 5011766c48..05b4443521 100644
--- a/configs/s6lx9_microboard_defconfig
+++ b/configs/s6lx9_microboard_defconfig
@@ -12,6 +12,5 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig"
-BR2_LINUX_KERNEL_DTS_FILE="board/avnet/s6lx9_microboard/lx9_mmu.dts"
-BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
-BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="simpleImage.lx9_mmu"
+BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts"

From 2ab74b2e25693ec135e1cacb151fe834a4b93f59 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 15:55:55 +0200
Subject: [PATCH 2460/6849] Update qemu microblazeel default configuration

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 configs/qemu_microblazeel_mmu_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 7034447ec8..ad5f045640 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -22,6 +22,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
-BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazeel-mmu/system.dts"
-BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
-BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="linux.bin"
+BR2_LINUX_KERNEL_LINUX_BIN=y
+BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"

From 27f7eca576ef6a8f1bb333cf982c1173bc05c480 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 30 Jul 2012 15:55:56 +0200
Subject: [PATCH 2461/6849] Update qemu microblazebe default configuration

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 configs/qemu_microblazebe_mmu_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 387466b1fa..619ecbf978 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -22,6 +22,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
-BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazebe-mmu/system.dts"
-BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
-BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="linux.bin"
+BR2_LINUX_KERNEL_LINUX_BIN=y
+BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"

From c665fc006f80dc1e0f507b982e4ac81b2591b77b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jul 2012 23:36:51 +0200
Subject: [PATCH 2462/6849] Reflect recent changes in CHANGES file

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES | 92 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 23 deletions(-)

diff --git a/CHANGES b/CHANGES
index f8ab319a8c..4a11719333 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,30 +1,76 @@
-2012.08, Not released yet:
+2012.08-rc1, Not released yet:
 
 	Fixes all over the tree and new features.
 
+	Integration of a legal information reporting infrastructure,
+	which allows to generate detailed informations about the
+	licenses and source code of all components of a system
+	generated by Buildroot. License information will progressively
+	be added on packages.
+
+	Default configuration files added for Calao-systems USB-A9263
+	and Calao-systems USB-A9G20-LPW.
+
+	External toolchains update: allow download of a custom
+	toolchain, add Linaro 2012.05 and 2012.06 for ARM, add
+	Blackfin toolchain 2012R1-BETA1, add Sourcery CodeBench MIPS
+	2011.09.
+
+	Allow the restriction of downloads to the primary site only.
+        This is useful for project developers who want to ensure that
+        the project can be built even if the upstream tarball
+        locations disappear.
+
+	Add a 'System configuration' choice to select between 3
+	different init systems: Busybox init, SysV init and Systemd
+	init.
+
+	Cleanups to the package infrastructure. The visible change to
+	developers is that $(eval $(call AUTOTARGETS)) is now $(eval
+	$(autotools-package)), and similarly for other package
+	infrastructures and host packages. Refer to the documentation
+	for details.
+
+	By default, automatic detection of the number of compilation
+	jobs to use, depending on the number of CPUs available.
+
+	Improvements to support systems with static libraries only
+	(infrastructure and package fixes).
+
 	Updated/fixed packages: audiofile, autoconf, automake, axel,
-	beecrypt, berkeleydb, bind, bison, boost, busybox, bzip2,
-	cmake, connman, conntrack-tools, cups, dnsmasq, e2fsprogs,
-	ethtool, fbv, gmp, gnutls, grep, gst-plugins-base,
-	gst-plugins-good, gzip, hiawatha, hostapd, icu, imagemagick,
-	iproute2, ipset, iptables, kmod, libgci, libconfig, libcurl,
-	libeXosip2, libfuse, libidn, libmbus, libmnl,
-	libnetfilter-conntrack, libnl, libnspr, libogg, libosip2,
-	libpcap, libroxml, liburcu, libxml2, lighttpd, ltrace,
-	lttng-libust, lttng-modules, lttng-tools, module-init-tools,
-	mpg123, midori, mrouted, mtd, mxml, mysql_client, nbd,
-	nfs-utils, openocd, pciutils, php, polarssl, portaudio, pppd,
-	pthread-stubs, pulseaudio, qt, quagga, radvd, rrdtool, samba,
-	sdl_gfx, sdl_sound, speex, sqlite, squashfs, squid, sudo,
-	synergy, systemd, wpa_supplicant, zlib
-
-	New packages: cjson, collectd, dmidecode, fbterm, flashrom,
-	freerdp, inadyn, libfreefare, libnetfilter_cttimeout, libnfc,
-	liboping, libtorrent, linphone, logsurfer, lshw,
-	mediastreamer, mobile-broadband-provider-info, monit, nanocom,
-	nss-mdns, ofone, omap-u-boot-utils, opkg, ortp, python-id3,
-	quota, ramspeed, rtorrent, sound-theme-freedesktop,
-	webrtc-audio-processing, xinetd, zxing
+	barebox, bash, beecrypt, berkeleydb, bind, bison, bluez_utils,
+	bonnie, boost, busybox, bsdiff, bwm-ng, bzip2, cifs-utils,
+	cgilua, cmake, connman, conntrack-tools, crosstool-ng, cups,
+	dbus, dhcp, dnsmasq, e2fsprogs, eeprog, ethtool, faad2, fbv,
+	ffmpeg, freetype, gmp, gnutls, gob2, gpsd, grep,
+	gst-plugins-base, gst-plugins-good, gzip, hiawatha, hostapd,
+	htop, icu, igh-ethercat, imagemagick, input-tools, iostat,
+	iproute2, ipset, iptables, iw, kmod, less, libcap, libgci,
+	libconfig, libcurl, libelf, libevas, libeXosip2, libexif,
+	libfuse, libidn, libmad, libmbus, libmnl,
+	libnetfilter-conntrack, libnl, libnspr, libnss, libogg,
+	libosip2, libpcap, libpng, libroxml, liburcu, libusb, libxml2,
+	libxslt, lighttpd, linux, ltrace, lttng-libust, lttng-modules,
+	lttng-tools, lua, m4, memtester, midori, mii-diag,
+	module-init-tools, mpfr, mpg123, mrouted, msmtp, mtd, mxml,
+	mysql_client, nasm, nbd, ncurses, nfs-utils, opencv, openocd,
+	openssl, pciutils, php, polarssl, portaudio, pppd,
+	pthread-stubs, pulseaudio, qt, quagga, quota, radvd, rpm,
+	rrdtool, samba, sam-ba, scons, sdl_gfx, sdl_sound, speex,
+	sqlite, squashfs, squid, sudo, synergy, syslinux, systemd,
+	tar, tcpdump, tcpreplay, udev, usbutils, valgrind, wget,
+	wpa_supplicant, wsapi, xavante, xserver_xorg-server, zlib
+
+	New packages: cjson, collectd, dfu-util, dmidecode, elftosb,
+	fbterm, flashrom, freerdp, inadyn, libfreefare,
+	libnetfilter_cttimeout, libnfc, libnfc-llcp, liboping,
+	libtorrent, linphone, logsurfer, lshw, luacjson, luaexpat,
+	luajit, mediastreamer, mobile-broadband-provider-info, monit,
+	mxs-bootlets, nanocom, nss-mdns, ofone, omap-u-boot-utils,
+	opkg, ortp, owl-linux, python-id3, python-nfc, quota,
+	ramspeed, rtorrent, sound-theme-borealis,
+	sound-theme-freedesktop, sysprof, webrtc-audio-processing,
+	xinetd, zxing
 
 2012.05, Released May 30th, 2012:
 

From 588cc81c0ab645ffa3a12d03ae0c6a056c9ab74f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:05 -0300
Subject: [PATCH 2463/6849] kernel-headers: bump 3.4.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 514d29987d..96dd129c70 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -68,6 +68,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.24"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.6"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.7"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 8d99481199aafbf3244589310260974e08e76917 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:06 -0300
Subject: [PATCH 2464/6849] linux: bump default to kernel version 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9bd88e1195..9c63215c19 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.6"
+	bool "3.4.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.6" if BR2_LINUX_KERNEL_3_4
+	default "3.4.7" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 3e7051da75ea62b783a5418bf68fac825d9b12af Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:07 -0300
Subject: [PATCH 2465/6849] qemu/ppc-mpc8544ds: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/powerpc-mpc8544ds/readme.txt | 1 +
 configs/qemu_ppc_mpc8544ds_defconfig    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index 6ecdc4b2b5..646f459df5 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,3 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 44c81de414..8855961418 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,13 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 

From e3e25466b25bce6bb53ac2f757916bbbdac78f1f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:08 -0300
Subject: [PATCH 2466/6849] qemu/sparc-ss10: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/sparc-ss10/readme.txt  | 1 +
 configs/qemu_sparc_ss10_defconfig | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 5f01efa074..4c20702f38 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,3 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 7ac66af1dc..9c5545858d 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,12 +6,12 @@ BR2_sparc_supersparc=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 14bd1e4c501ba24826fb9110dce563d06f1ce898 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:09 -0300
Subject: [PATCH 2467/6849] qemu/sh4-r2d: update to use kernel 3.2.24

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/sh4-r2d/readme.txt  | 1 +
 configs/qemu_sh4_r2d_defconfig | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 875e3d02f8..c9b4a1035f 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,3 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index a5808709d8..0edd58318a 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.24"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 71bcaa69d09d8cad9274a8b7ec6c7055f6102a55 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:10 -0300
Subject: [PATCH 2468/6849] qemu/arm-vexpress: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/arm-vexpress/readme.txt  | 2 ++
 configs/qemu_arm_vexpress_defconfig | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index 0d3631c725..aeea842b8a 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -4,3 +4,5 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
+
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 9596fe521c..03ea6e0afc 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -11,12 +11,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 584a773626fbe2291c83f67cab69e07672ae882c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:11 -0300
Subject: [PATCH 2469/6849] qemu/mipsel-malta: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../mipsel-malta/{linux-3.3.config => linux-3.4.config}   | 0
 board/qemu/mipsel-malta/readme.txt                        | 2 ++
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/mipsel-malta/{linux-3.3.config => linux-3.4.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-3.3.config b/board/qemu/mipsel-malta/linux-3.4.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.3.config
rename to board/qemu/mipsel-malta/linux-3.4.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 94e959df93..09ad500e61 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -5,3 +5,5 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
+
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 4a4879c038..055c1b11b4 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.4.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 7accc51ebf44ed1f3c0d2c3afcafc1a0641dcca7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:12 -0300
Subject: [PATCH 2470/6849] qemu/mips-malta: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../mips-malta/{linux-3.3.config => linux-3.4.config}     | 0
 board/qemu/mips-malta/readme.txt                          | 2 ++
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/mips-malta/{linux-3.3.config => linux-3.4.config} (100%)

diff --git a/board/qemu/mips-malta/linux-3.3.config b/board/qemu/mips-malta/linux-3.4.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.3.config
rename to board/qemu/mips-malta/linux-3.4.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index 0e21a3c9b8..0288df5086 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -5,3 +5,5 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
+
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 57f3ae141a..f9ec326fb8 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.4.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From ece2f746d2f262e8da77ec486c36aaa2a84b6419 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:13 -0300
Subject: [PATCH 2471/6849] qemu/microblaze: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../microblazebe-mmu/{kernel-3.3.config => kernel-3.4.config} | 0
 board/qemu/microblazebe-mmu/readme.txt                        | 1 +
 .../microblazeel-mmu/{kernel-3.3.config => kernel-3.4.config} | 0
 board/qemu/microblazeel-mmu/readme.txt                        | 1 +
 configs/qemu_microblazebe_mmu_defconfig                       | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                       | 4 ++--
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/microblazebe-mmu/{kernel-3.3.config => kernel-3.4.config} (100%)
 rename board/qemu/microblazeel-mmu/{kernel-3.3.config => kernel-3.4.config} (100%)

diff --git a/board/qemu/microblazebe-mmu/kernel-3.3.config b/board/qemu/microblazebe-mmu/kernel-3.4.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/kernel-3.3.config
rename to board/qemu/microblazebe-mmu/kernel-3.4.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index c59c0bde18..5281a0f184 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,3 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
+Tested with QEMU 1.1.1
diff --git a/board/qemu/microblazeel-mmu/kernel-3.3.config b/board/qemu/microblazeel-mmu/kernel-3.4.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/kernel-3.3.config
rename to board/qemu/microblazeel-mmu/kernel-3.4.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 43a40e8920..003d2a88de 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,3 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 619ecbf978..11c6f95515 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.4.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index ad5f045640..1ce9ac81e1 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.4.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"

From 190806ed721d7c1c0d16e48b2c37252ad0fa1588 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:14 -0300
Subject: [PATCH 2472/6849] qemu/x86_64: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/x86_64/{linux-3.3.config => linux-3.4.config} | 0
 board/qemu/x86_64/readme.txt                             | 2 ++
 configs/qemu_x86_64_defconfig                            | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/x86_64/{linux-3.3.config => linux-3.4.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.3.config b/board/qemu/x86_64/linux-3.4.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.3.config
rename to board/qemu/x86_64/linux-3.4.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index c06d24faae..de50f3c4a4 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -3,3 +3,5 @@ Run the emulation with:
   qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
 
 The login prompt will appear in the graphical window.
+
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 7c6f31127f..91f5fc9e72 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.4.config"

From 13eb14808a62077265bfbb16ba82952674b969f9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 31 Jul 2012 18:13:15 -0300
Subject: [PATCH 2473/6849] qemu/x86: update to use kernel 3.4.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/x86/{linux-3.3.config => linux-3.4.config} | 0
 board/qemu/x86/readme.txt                             | 2 ++
 configs/qemu_x86_defconfig                            | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/x86/{linux-3.3.config => linux-3.4.config} (100%)

diff --git a/board/qemu/x86/linux-3.3.config b/board/qemu/x86/linux-3.4.config
similarity index 100%
rename from board/qemu/x86/linux-3.3.config
rename to board/qemu/x86/linux-3.4.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 4ba6607f31..f6f5437a71 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -3,3 +3,5 @@ Run the emulation with:
   qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
 
 The login prompt will appear in the graphical window.
+
+Tested with QEMU 1.1.1
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 118cd7fa7a..1851cecdbd 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.4.config"

From fdbc2f4059e96eb642c5f973e08acd33a2659f2e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 31 Jul 2012 23:47:31 +0200
Subject: [PATCH 2474/6849] Mention Device Tree feature in CHANGES

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 4a11719333..e314c84359 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,9 +34,15 @@
 	By default, automatic detection of the number of compilation
 	jobs to use, depending on the number of CPUs available.
 
-	Improvements to support systems with static libraries only
+	Improvements to generate systems with static libraries only
 	(infrastructure and package fixes).
 
+	Add proper support in the Linux kernel package to generate
+	Device Tree Blobs or combined Device Tree / Kernel
+	images. This will be useful on Microblaze, PowerPC and ARM,
+	which are architectures making extensive use of the Device
+	Tree.
+
 	Updated/fixed packages: audiofile, autoconf, automake, axel,
 	barebox, bash, beecrypt, berkeleydb, bind, bison, bluez_utils,
 	bonnie, boost, busybox, bsdiff, bwm-ng, bzip2, cifs-utils,

From f648ad2817b32ea6c89965b82c282cb812bd6646 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Aug 2012 20:04:50 +0200
Subject: [PATCH 2475/6849] toolchain-external: do not allow the user to select
 hard/soft float

Commit ba92d6ef68eeb37ba435648fcfbd1dbe13212e6d made hard float the
default when Cortex-A8 and Cortex-A9. The problem it was trying to fix
is that the newer Linaro toolchains (2012.05 and 2012.06) are
hard-float, so the default selection of soft-float enabled on ARM
doesn't work for those toolchains.

Unfortunately, not selecting soft-float causes problems with
the Crosstool-NG backend at the moment.

As an intermediate solution, make the soft float option disappear when
using external toolchain: the toolchain will decide by itself whether
to generate hard float or soft float code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-common.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 710f2df9c5..6e0d1598fc 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -101,7 +101,7 @@ config BR2_USE_MMU
 
 config BR2_PREFER_SOFT_FLOAT
 	bool
-	default y if (BR2_arm && !BR2_cortex_a8 && !BR2_cortex_a9)
+	default y if BR2_arm
 	default y if BR2_armeb
 	default y if BR2_avr32
 	default y if BR2_mips
@@ -110,6 +110,9 @@ config BR2_PREFER_SOFT_FLOAT
 config BR2_SOFT_FLOAT
 	bool "Use software floating point by default"
 	depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_powerpc
+	# External toolchains will automatically do soft float or hard
+	# float depending on their configuration
+	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_CTNG
 	default $(BR2_PREFER_SOFT_FLOAT)
 	help
 	  If your target CPU does not have a Floating Point Unit (FPU) or a

From e320e94106e852d114c562ad644a0b5956e64e0b Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 1 Aug 2012 07:48:57 +0300
Subject: [PATCH 2476/6849] poco: add license information

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/poco/poco.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 779487f74e..f74c2b1c28 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -6,6 +6,8 @@
 POCO_VERSION = 1.4.3p1
 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
 POCO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poco
+POCO_LICENSE = Boost-v1.0
+POCO_LICENSE_FILES = LICENSE
 POCO_INSTALL_STAGING = YES
 
 POCO_DEPENDENCIES = zlib pcre					\

From e2ec096eeda8d46b1cbb8f6adac16004c442f27e Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 1 Aug 2012 07:48:59 +0300
Subject: [PATCH 2477/6849] ebtables: add license information

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ebtables/ebtables.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index b3068f43e5..7676e9abd8 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -7,6 +7,8 @@
 EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
+EBTABLES_LICENSE = GPLv2
+EBTABLES_LICENSE_FILES = COPYING
 
 define EBTABLES_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables -C $(@D)

From 01b0d34fcec8575315c5927d4b4a3fce7fc9f00d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 1 Aug 2012 08:06:38 +0100
Subject: [PATCH 2478/6849] lcdproc: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lcdproc/lcdproc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 1275ddfb8d..94848e660c 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -6,6 +6,8 @@
 LCDPROC_VERSION = 0.5.5
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
+LCDPROC_LICENSE = GPLv2+
+LCDPROC_LICENSE_FILES = COPYING
 
 LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
 

From df6ef452e7fafc604d8b11c1ccb68279d41bb7cd Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 1 Aug 2012 08:06:58 +0100
Subject: [PATCH 2479/6849] minicom: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/minicom/minicom.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 7293f6ae25..6d0607f4d3 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -6,6 +6,8 @@
 MINICOM_VERSION = 2.6.1
 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
 MINICOM_SITE = http://alioth.debian.org/frs/download.php/3700/
+MINICOM_LICENSE = GPLv2+
+MINICOM_LICENSE_FILES = COPYING
 
 # pkg-config is only used to check for liblockdev, which we don't have
 # in BR, so instead of adding host-pkg-config as a dependency, simply

From 5e671c8e79bf0ebbb19bbb40872d17777f8f9fdd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Aug 2012 20:37:49 +0200
Subject: [PATCH 2480/6849] sysprof: add patch to fix PowerPC build problem

Fixes
http://autobuild.buildroot.org/results/5841486b8ecc9f13e46f03413a2805d2966cd2d5/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../sysprof-03-fix-powerpc-checks.patch       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/sysprof/sysprof-03-fix-powerpc-checks.patch

diff --git a/package/sysprof/sysprof-03-fix-powerpc-checks.patch b/package/sysprof/sysprof-03-fix-powerpc-checks.patch
new file mode 100644
index 0000000000..8d69f74984
--- /dev/null
+++ b/package/sysprof/sysprof-03-fix-powerpc-checks.patch
@@ -0,0 +1,26 @@
+From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel@daenzer.net>
+Date: Sat, 27 Aug 2011 18:04:44 +0000
+Subject: Fix PowerPC checks for __NR_perf_counter_open.
+
+__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
+installed in /usr/include, there are a few references to __ppc__ and
+__ppc64__, but I suspect they're for other OSs.
+
+Signed-off-by: Michel Dänzer <michel@daenzer.net>
+---
+diff --git a/collector.c b/collector.c
+index b28964f..fe16967 100644
+--- a/collector.c
++++ b/collector.c
+@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
+ #define __NR_perf_counter_open 337
+ #elif defined(__hppa__)
+ #define __NR_perf_counter_open 318
+-#elif defined(__ppc__) || defined(__ppc64__)
++#elif defined(__powerpc__) || defined(__powerpc64__)
+ #define __NR_perf_counter_open 319
+ #elif defined(__s390__)
+ #define __NR_perf_counter_open 331
+--
+cgit v0.9.0.2

From 4009cbbbf9832abfb4e3047d536ce2bd775d2587 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Aug 2012 20:46:31 +0200
Subject: [PATCH 2481/6849] Update for 2012.08-rc1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html |  7 +++----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index e314c84359..fb5160de3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2012.08-rc1, Not released yet:
+2012.08-rc1, Released August 1st, 2012
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 639fdaa1f8..079af65e89 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.08-git
+export BR2_VERSION:=2012.08-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index d23e7e9f54..c00a35663e 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,13 +13,12 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2012.05-rc3</b>, which can be
+The latest release candidate is <b>2012.08-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.05-rc3.tar.gz">buildroot-2012.05-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2012.08-rc1.tar.gz">buildroot-2012.08-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.05-rc3.tar.bz2">buildroot-2012.05-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.08-rc1.tar.bz2">buildroot-2012.08-rc1.tar.bz2</a>.
 <p>
 -->
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 80606384b8..4114b03b5d 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+   <li><b>1 August 2012 -- 2012.08-rc1 released</b>
+
+     <p>We have a new release candidate! Lots of changes all over the
+     tree, see the <a
+     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08_rc1">CHANGES</a>
+     file for details</p>
+
+     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+     <a href="/downloads/buildroot-2012.08-rc1.tar.bz2">2012.08-rc1
+     release candidate</a>, and report any problems found to the <a
+     href="lists.html">mailing list</a> or <a
+     href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>22 July 2012 -- Buildroot Developer Day</b>
 
     <p>The next <i>Buildroot Developer Day</i> meeting will take place

From d40d77ff708344a075c0c70a73e1b35efc4e3d62 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 2 Aug 2012 10:25:23 +0200
Subject: [PATCH 2482/6849] docs: update links to the manual

In addition to the HTML version, also publish the PDF and Text
versions of our manual.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/docs.html | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/docs.html b/docs/docs.html
index 65eaff1c4f..1393498922 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -2,10 +2,18 @@
 
 <h3>Documentation</h3>
 
-<p>The <a href="/downloads/manual/manual.html">Buildroot user manual</a>
-is where you want to start reading if you wish to understand how
-Buildroot works, or wish to change/extend/fix things. If you find any
-errors (factual, grammatical, whatever) please report them to us.</p>
+<p>The Buildroot user manual is where you want to start reading if you
+wish to understand how Buildroot works, or wish to change/extend/fix
+things. It is available as:</p>
+
+<ul>
+  <li><a href="/downloads/manual/manual.html">Online HTML</a></li>
+  <li><a href="/downloads/manual/manual.pdf">PDF document</a></li>
+  <li><a href="/downloads/manual/manual.text">ASCII text</a></li>
+</ul>
+
+<p>If you find any errors (factual, grammatical, whatever) please
+report them to us.</p>
 
 <p>If you find that you need help with Buildroot, you can ask for
 help:</p>

From 1f6e2b4a9518b9608f3cc8cc7281bac382da41eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Aug 2012 23:47:04 +0200
Subject: [PATCH 2483/6849] toolchain-external: microblaze toolchains are
 glibc-based

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index e34802dc2a..f86ed74822 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -542,11 +542,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	bool "Xilinx Little Endian Microblaze GNU Tools"
 	depends on BR2_microblazeel
-	select BR2_LARGEFILE
-	select BR2_INET_IPV6
-	select BR2_INET_RPC
-	select BR2_ENABLE_LOCALE
-	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	help
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
@@ -554,11 +550,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
-	select BR2_LARGEFILE
-	select BR2_INET_IPV6
-	select BR2_INET_RPC
-	select BR2_ENABLE_LOCALE
-	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	help
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools

From ba24df488e5783a6ccb715cff60f3c1f2b32acc4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Aug 2012 23:50:44 +0200
Subject: [PATCH 2484/6849] sudo: needs MMU support

Fixes
http://autobuild.buildroot.org/results/46bcd9601233ca14d6747d9219669e4f52f147e6/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sudo/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sudo/Config.in b/package/sudo/Config.in
index fc0a175ec9..cd7ab81210 100644
--- a/package/sudo/Config.in
+++ b/package/sudo/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_SUDO
 	bool "sudo"
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  Sudo is a program designed to allow a sysadmin to give
 	  limited root privileges to users and log root activity.  The

From 1bcc51fd1a8a83d1cfb350b7d83e47b8687ef39f Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 2 Aug 2012 06:59:37 +0300
Subject: [PATCH 2485/6849] mxml: add license information

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/mxml/mxml.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index af1cb2691f..03850d0f5d 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -5,6 +5,8 @@
 #############################################################
 MXML_VERSION = 2.7
 MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION)
+MXML_LICENSE = LGPLv2+ with exceptions
+MXML_LICENSE_FILES = COPYING
 MXML_INSTALL_STAGING = YES
 
 MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install

From 71fd5f5b28ea889ccd9b371627c0c37aef214e92 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 2 Aug 2012 08:09:12 +0100
Subject: [PATCH 2486/6849] nanocom: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/nanocom/nanocom.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index 1e461002fe..a88daeb267 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -6,6 +6,8 @@
 NANOCOM_VERSION = 2.6.1
 NANOCOM_SOURCE = nanocom.tar.gz
 NANOCOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nanocom/nanocom/v1.0
+NANOCOM_LICENSE = GPLv2+
+NANOCOM_LICENSE_FILES = COPYING
 
 # N.B. Don't strip any path components during extraction.
 define NANOCOM_EXTRACT_CMDS

From efe6941f1ba641f7bb1d0ee8b1db43d8518a2894 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 2 Aug 2012 08:18:21 +0100
Subject: [PATCH 2487/6849] empty: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/empty/empty.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index 97b1e7eec6..005f880779 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -6,6 +6,8 @@
 EMPTY_VERSION = 0.6.18b
 EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
 EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
+EMPTY_LICENSE = BSD-3c
+EMPTY_LICENSE_FILES = COPYRIGHT
 
 define EMPTY_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all

From 9240163ef7e1f10cdbecfc5a6936d5624f823565 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 2 Aug 2012 09:09:53 +0100
Subject: [PATCH 2488/6849] sam-ba: bump version to 2.12

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sam-ba/sam-ba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index 9f3934725e..067bdf1836 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -1,5 +1,5 @@
 SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents/
-SAM_BA_VERSION = 2.11
+SAM_BA_VERSION = 2.12
 SAM_BA_SOURCE  = sam-ba_$(SAM_BA_VERSION).zip
 
 define HOST_SAM_BA_EXTRACT_CMDS

From 180c091a83e569d23d1ab2525ac5ef7ea9b5ee90 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 2 Aug 2012 22:53:48 -0400
Subject: [PATCH 2489/6849] expat: Add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/expat/expat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 663abcdfd8..7fa31262cf 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -10,6 +10,8 @@ EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkg-config
+EXPAT_LICENSE = MIT
+EXPAT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 80e184610b16417b079c44c7fa5f855fbdcac09c Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 2 Aug 2012 22:53:49 -0400
Subject: [PATCH 2490/6849] lua: Add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/lua/lua.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 26c1576549..de60c57e88 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -7,6 +7,8 @@
 LUA_VERSION = 5.1.5
 LUA_SITE = http://www.lua.org/ftp
 LUA_INSTALL_STAGING = YES
+LUA_LICENSE = MIT
+LUA_LICENSE_FILES = COPYRIGHT
 
 LUA_CFLAGS = -Wall
 ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)

From 82c3a3322857c36601f795f5f8be54d9af33641b Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 2 Aug 2012 22:53:50 -0400
Subject: [PATCH 2491/6849] luacjson: Add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/luacjson/luacjson.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk
index fe92f16034..1f79d5d219 100644
--- a/package/luacjson/luacjson.mk
+++ b/package/luacjson/luacjson.mk
@@ -3,10 +3,12 @@
 # luacjson
 #
 #############################################################
-LUACJSON_VERSION      = 2.1.0
-LUACJSON_SOURCE       = lua-cjson-$(LUACJSON_VERSION).tar.gz
-LUACJSON_SITE         = http://www.kyne.com.au/~mark/software/download
-LUACJSON_DEPENDENCIES = lua
+LUACJSON_VERSION       = 2.1.0
+LUACJSON_SOURCE        = lua-cjson-$(LUACJSON_VERSION).tar.gz
+LUACJSON_SITE          = http://www.kyne.com.au/~mark/software/download
+LUACJSON_DEPENDENCIES  = lua
+LUACJSON_LICENSE       = MIT
+LUACJSON_LICENSE_FILES = LICENSE
 
 define LUACJSON_BUILD_CMDS
 	$(MAKE) -C $(@D) \

From 8c529aa7e4d7bd0b9a8e76c902de3e81480255ac Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Fri, 3 Aug 2012 22:57:46 -0400
Subject: [PATCH 2492/6849] xinetd: Add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/xinetd/xinetd.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index a209d12ae0..4fc2de9b2e 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -3,9 +3,11 @@
 # xinetd
 #
 #############################################################
-XINETD_VERSION = 2.3.15
-XINETD_SOURCE  = xinetd-$(XINETD_VERSION).tar.gz
-XINETD_SITE    = http://www.xinetd.org
+XINETD_VERSION       = 2.3.15
+XINETD_SOURCE        = xinetd-$(XINETD_VERSION).tar.gz
+XINETD_SITE          = http://www.xinetd.org
+XINETD_LICENSE       = xinetd license
+XINETD_LICENSE_FILES = COPYRIGHT
 
 ifneq ($(BR2_INET_RPC),y)
 XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC"

From 6495c25cb0e8174a8a83483aff98e38943c98479 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Fri, 3 Aug 2012 23:19:05 -0400
Subject: [PATCH 2493/6849] cjson: Add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cjson/cjson.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index a9b0bcff89..6f26bb8539 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -7,6 +7,7 @@ CJSON_VERSION         = undefined
 CJSON_SOURCE          = cJSONFiles.zip
 CJSON_SITE            = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/cjson/
 CJSON_INSTALL_STAGING = YES
+CJSON_LICENSE         = MIT
 
 define CJSON_EXTRACT_CMDS
 	unzip -d $(@D) $(DL_DIR)/$(CJSON_SOURCE)

From d30aaf3e0c5f90306a1c931794d9096d549405cf Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 3 Aug 2012 12:48:28 +0100
Subject: [PATCH 2494/6849] sudo: bump version to 1.8.5p2

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch} | 0
 package/sudo/sudo.mk                                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/sudo/{sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch => sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch} (100%)

diff --git a/package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch b/package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
similarity index 100%
rename from package/sudo/sudo-1.8.5p1-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
rename to package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 9b0ebed571..00d08f0f4e 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.5p1
+SUDO_VERSION = 1.8.5p2
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 SUDO_CONF_OPT = \
 		--without-lecture \

From b6d7ce7e021e16f7ab5964c5b5e6e0d0c7657c37 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 4 Aug 2012 12:27:24 -0400
Subject: [PATCH 2495/6849] luaexpat: Add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/luaexpat/luaexpat.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk
index 400d7b4756..2d4c517c07 100644
--- a/package/luaexpat/luaexpat.mk
+++ b/package/luaexpat/luaexpat.mk
@@ -7,6 +7,7 @@
 LUAEXPAT_VERSION      = 1.2.0
 LUAEXPAT_SITE         = http://matthewwild.co.uk/projects/luaexpat
 LUAEXPAT_DEPENDENCIES = lua expat
+LUAEXPAT_LICENSE      = MIT
 
 
 LUAEXPAT_MFLAGS += LUA_VERSION_NUM=501

From 0e8dafcb3e1ddb7935c1c8c305e7e5598be30315 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 4 Aug 2012 21:11:01 +0100
Subject: [PATCH 2496/6849] sudo: fix main executable permissions

The sudo executable is installed without the setuid bit set, which prevents
sudo from working.

This patch adds a post-install hook to fix the permissions of the sudo
executable.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sudo/sudo.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 9b0ebed571..15e06fa3dc 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -14,4 +14,8 @@ SUDO_CONF_OPT = \
 		--without-interfaces \
 		--without-pam
 
+define SUDO_PERMISSIONS
+/usr/bin/sudo			 f 4755	0 0 - - - - -
+endef
+
 $(eval $(autotools-package))

From f1f580731b7872684a4bef8930cd2f468e2dc69a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 5 Aug 2012 11:44:52 +0200
Subject: [PATCH 2497/6849] pkg-stats: support <pkg>_LICENSE = lines with
 spaces

For alignement reasons, we sometimes add spaces between <pkg>_LICENSE
and the equal sign. Take this into account in pkg-stats.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/scripts/pkg-stats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index de73eeb270..a07af555e9 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -155,7 +155,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	generic_packages=$(($generic_packages+1))
     fi
 
-    if grep -qE "^${pkgvariable}_LICENSE =" $i ; then
+    if grep -qE "^${pkgvariable}_LICENSE[ ]*=" $i ; then
 	packages_with_license=$(($packages_with_license+1))
 	license=1
     else

From 58dbdce29eaacd8a7d5bbc2eb6eebcd29efa7052 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 5 Aug 2012 11:50:10 +0200
Subject: [PATCH 2498/6849] pkg-stats: statistics about license files
 information

Since on some packages we are adding <pkg>_LICENSE but not necessarily
<pkg>_LICENSE_FILES, let's add a separate statistic to track these
informations. This will allow us to improve both the number of
packages covered by <pkg>_LICENSE and <pkg>_LICENSE_FILES.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/scripts/pkg-stats | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index a07af555e9..9c8ec492c1 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -66,6 +66,7 @@ td.lotsofpatches {
 <td class=\"centered\">Patch count</td>
 <td class=\"centered\">Infrastructure</td>
 <td class=\"centered\">License</td>
+<td class=\"centered\">License files</td>
 </tr>
 "
 
@@ -75,6 +76,8 @@ generic_packages=0
 manual_packages=0
 packages_with_licence=0
 packages_without_licence=0
+packages_with_license_files=0
+packages_without_license_files=0
 total_patch_count=0
 cnt=0
 
@@ -163,6 +166,14 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	license=0
     fi
 
+    if grep -qE "^${pkgvariable}_LICENSE_FILES[ ]*=" $i ; then
+	packages_with_license_files=$(($packages_with_license_files+1))
+	license_files=1
+    else
+	packages_without_license_files=$(($packages_without_license_files+1))
+	license_files=0
+    fi
+
     echo "<tr>"
 
     echo "<td>$cnt</td>"
@@ -205,6 +216,12 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	echo "<td class=\"centered correct\">Yes</td>"
     fi
 
+    if [ ${license_files} -eq 0 ] ; then
+	echo "<td class=\"centered wrong\">No</td>"
+    else
+	echo "<td class=\"centered correct\">Yes</td>"
+    fi
+
     echo "</tr>"
 
 done
@@ -236,6 +253,14 @@ echo "<td>Packages not having licence information</td>"
 echo "<td>$packages_without_license</td>"
 echo "</tr>"
 echo "<tr>"
+echo "<td>Packages having license files information</td>"
+echo "<td>$packages_with_license_files</td>"
+echo "</tr>"
+echo "<tr>"
+echo "<td>Packages not having licence files information</td>"
+echo "<td>$packages_without_license_files</td>"
+echo "</tr>"
+echo "<tr>"
 echo "<td>Number of patches in all packages</td>"
 echo "<td>$total_patch_count</td>"
 echo "</tr>"

From 89aafcb35ec33532bd81a005f49196896d0adbd3 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Mon, 6 Aug 2012 10:21:20 +0800
Subject: [PATCH 2499/6849] lmbench: Add license info

Add license info for lmbench.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lmbench/lmbench.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index bccb2de00e..10f6d14043 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -6,6 +6,8 @@
 LMBENCH_VERSION:=3.0-a9
 LMBENCH_SOURCE:=lmbench-$(LMBENCH_VERSION).tgz
 LMBENCH_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lmbench/development/lmbench-3.0-a9/
+LMBENCH_LICENSE =  lmbench license (based on GPLv2)
+LMBENCH_LICENSE_FILES = COPYING COPYING-2
 
 define LMBENCH_CONFIGURE_CMDS
 	$(call CONFIG_UPDATE,$(@D))

From ee508010f41c0037614e90c08420208a7afe93a3 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Mon, 6 Aug 2012 10:21:21 +0800
Subject: [PATCH 2500/6849] bwm-ng: Add license info

Add license info for bwm-ng.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bwm-ng/bwm-ng.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
index 55ac2f13fc..ddc6f5b8d1 100644
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -7,6 +7,8 @@
 BWM_NG_VERSION = 0.6
 BWM_NG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/
 BWM_NG_CONF_OPT = --with-procnetdev --with-diskstats
+BWM_NG_LICENSE = GPLv2
+BWM_NG_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 BWM_NG_CONF_OPT += --with-ncurses

From 1b7102b60d18233ecc9e752daec0710f311ce2dd Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Mon, 6 Aug 2012 10:21:22 +0800
Subject: [PATCH 2501/6849] input-event-daemon: Add license info

Add license info for input-event-daemon.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/input-event-daemon/input-event-daemon.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index 06830561e3..f99bfbe8c9 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -6,6 +6,8 @@
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
 INPUT_EVENT_DAEMON_SITE = git://github.com/gandro/input-event-daemon.git
+INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license
+INPUT_EVENT_DAEMON_LICENSE_FILES = README
 
 define INPUT_EVENT_DAEMON_BUILD_CMDS
 	touch  $(@D)/input-event-table.h

From b48be06d85726c5aeebb6b23c73b7184bd58fd72 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:39 +0200
Subject: [PATCH 2502/6849] luajit: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/luajit/luajit.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index b35cdb4ecd..e4c46d8934 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -7,6 +7,8 @@
 LUAJIT_VERSION = 2.0.0-beta10
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE    = http://luajit.org/download
+LUAJIT_LICENSE = MIT
+LUAJIT_LICENSE_FILES = COPYRIGHT
 
 LUAJIT_INSTALL_STAGING = YES
 

From 8c5707020c64d7cd0184f01f71c231eeec7da2e4 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:40 +0200
Subject: [PATCH 2503/6849] cgilua: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cgilua/cgilua.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
index 038fee15d5..48ee005510 100644
--- a/package/cgilua/cgilua.mk
+++ b/package/cgilua/cgilua.mk
@@ -7,6 +7,7 @@
 CGILUA_VERSION = 5.1.4
 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
 CGILUA_DEPENDENCIES = luafilesystem
+CGILUA_LICENSE = MIT
 
 define CGILUA_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) install LUA_DIR="$(TARGET_DIR)/usr/share/lua"

From 911b2452037844ed840dc84e874903d976214ae8 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:41 +0200
Subject: [PATCH 2504/6849] copas: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/copas/copas.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/copas/copas.mk b/package/copas/copas.mk
index cd9ab7a37e..c84a6cc0b5 100644
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -7,6 +7,7 @@
 COPAS_VERSION = 1.1.6
 COPAS_SITE = http://github.com/downloads/keplerproject/copas
 COPAS_DEPENDENCIES = lua coxpcall luasocket
+COPAS_LICENSE = MIT
 
 define COPAS_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/src/copas/copas.lua \

From c31511cd98e7935882cfdb790c0297b516299e61 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:42 +0200
Subject: [PATCH 2505/6849] coxpcall: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/coxpcall/coxpcall.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
index 94fc16c3b0..e7fb76dc5f 100644
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -7,6 +7,7 @@
 COXPCALL_VERSION = 1.13.0
 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406
 COXPCALL_DEPENDENCIES = lua
+COXPCALL_LICENSE = MIT
 
 define COXPCALL_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/src/coxpcall.lua \

From 833994702abb26c9a58b1c4e0e73d752e051fe8a Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:43 +0200
Subject: [PATCH 2506/6849] luafilesystem: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/luafilesystem/luafilesystem.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index 17f2bd6f0a..8553212984 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -7,6 +7,7 @@
 LUAFILESYSTEM_VERSION = 1.5.0
 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem
 LUAFILESYSTEM_DEPENDENCIES = lua
+LUAFILESYSTEM_LICENSE = MIT
 
 ifeq ($(BR2_LARGEFILE),y)
 LFS_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE

From e61976104404251381fd9111f719b9141c5a4a0d Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:44 +0200
Subject: [PATCH 2507/6849] luasocket: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/luasocket/luasocket.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
index 755b61a71c..45fb9a3afe 100644
--- a/package/luasocket/luasocket.mk
+++ b/package/luasocket/luasocket.mk
@@ -7,6 +7,8 @@
 LUASOCKET_VERSION = 2.0.2
 LUASOCKET_SITE = http://luaforge.net/frs/download.php/2664
 LUASOCKET_DEPENDENCIES = lua
+LUASOCKET_LICENSE = MIT
+LUASOCKET_LICENSE_FILES = LICENSE
 
 define LUASOCKET_BUILD_CMDS
 	$(MAKE) -C $(@D) -f makefile \

From 8d1730585bcae184272099c1f25a4d98dc5a51f6 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:45 +0200
Subject: [PATCH 2508/6849] rings: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/rings/rings.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index c196d859f6..e2a2bd7415 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -7,6 +7,7 @@
 RINGS_VERSION = 1.2.3
 RINGS_SITE = http://github.com/downloads/keplerproject/rings
 RINGS_DEPENDENCIES = lua
+RINGS_LICENSE = MIT
 
 define RINGS_BUILD_CMDS
 	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -fPIC"

From 96638cf8414529b0400d7b388b976e15866124e9 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:46 +0200
Subject: [PATCH 2509/6849] wsapi: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/wsapi/wsapi.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
index f5423f314f..eb2b51c3de 100644
--- a/package/wsapi/wsapi.mk
+++ b/package/wsapi/wsapi.mk
@@ -7,6 +7,7 @@
 WSAPI_VERSION = 1.5
 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
 WSAPI_DEPENDENCIES = coxpcall luafilesystem rings
+WSAPI_LICENSE = MIT
 
 define WSAPI_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/share/lua/wsapi

From c7c048c624371707da278cf47546e8ca31875f60 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 6 Aug 2012 07:46:47 +0200
Subject: [PATCH 2510/6849] xavante: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/xavante/xavante.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index f885fbd1c0..0c1c6f1ac3 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -7,6 +7,7 @@
 XAVANTE_VERSION = 2.2.1
 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
 XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
+XAVANTE_LICENSE = MIT
 
 define XAVANTE_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) PREFIX=/usr \

From 663a1b6241b2dcae87427eff72fba9ae3fbf8d80 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Mon, 6 Aug 2012 10:26:26 +0800
Subject: [PATCH 2511/6849] Add new package: cpuload

cpuload is a simple tool to obtain intuitive vision of CPU load
(including total, user, system, irq and softirq) within a certain
time, which is especially useful for embedded system without GUI.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in          |  1 +
 package/cpuload/Config.in  |  8 ++++++++
 package/cpuload/cpuload.mk | 13 +++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/cpuload/Config.in
 create mode 100644 package/cpuload/cpuload.mk

diff --git a/package/Config.in b/package/Config.in
index f308de7937..c9ad06a7c0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -663,6 +663,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
 source "package/bwm-ng/Config.in"
+source "package/cpuload/Config.in"
 source "package/htop/Config.in"
 source "package/kmod/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/cpuload/Config.in b/package/cpuload/Config.in
new file mode 100644
index 0000000000..82bc450afa
--- /dev/null
+++ b/package/cpuload/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CPULOAD
+	bool "cpuload"
+	help
+	  cpuload is a simple tool to obtain intuitive vision of CPU load
+	  (including total, user, system, irq and softirq) within a certain
+	  time, which is especially useful for embedded system without GUI.
+
+	  https://github.com/kelvincheung/cpuload
diff --git a/package/cpuload/cpuload.mk b/package/cpuload/cpuload.mk
new file mode 100644
index 0000000000..d25c504631
--- /dev/null
+++ b/package/cpuload/cpuload.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# cpuload
+#
+#############################################################
+
+CPULOAD_VERSION = v0.3
+CPULOAD_SITE = git://github.com/kelvincheung/cpuload.git
+CPULOAD_LICENSE = GPLv2
+CPULOAD_LICENSE_FILES = COPYING
+
+
+$(eval $(autotools-package))

From 69bd4566611f2fa2b3cde86b121a3b846a5ab1a5 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 5 Aug 2012 22:05:56 +0200
Subject: [PATCH 2512/6849] package/crosstool-ng: update to 1.16.0

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/crosstool-ng/crosstool-ng.mk          |  2 +-
 .../crosstool-ng.config-eglibc                | 29 ++++++++------
 .../crosstool-ng.config-glibc                 | 28 +++++++------
 .../crosstool-ng.config-uClibc                | 39 +++++++++++--------
 4 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 379d400e66..5bc65e1d67 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.15.3
+CROSSTOOL_NG_VERSION           = 1.16.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 58cdff2d34..6c559219ef 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.15.0 Configuration
-# Mon May  7 18:54:54 2012
+# crosstool-NG 1.16.0 Configuration
+# Sun Aug  5 20:02:42 2012
 #
 CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_cvs=y
@@ -178,17 +178,15 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.3.4"
+CT_KERNEL_VERSION="3.5"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_3_4=y
-# CT_KERNEL_V_3_3_3 is not set
-# CT_KERNEL_V_3_3_2 is not set
-# CT_KERNEL_V_3_3_1 is not set
-# CT_KERNEL_V_3_3 is not set
-# CT_KERNEL_V_3_2_16 is not set
+CT_KERNEL_V_3_5=y
+# CT_KERNEL_V_3_4_7 is not set
+# CT_KERNEL_V_3_3_8 is not set
+# CT_KERNEL_V_3_2_25 is not set
 # CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_30 is not set
+# CT_KERNEL_V_3_0_39 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
@@ -326,6 +324,7 @@ CT_LIBC="eglibc"
 CT_LIBC_VERSION="2_12"
 CT_LIBC_eglibc=y
 CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_EGLIBC_V_2_16 is not set
 # CT_LIBC_EGLIBC_V_2_15 is not set
 # CT_LIBC_EGLIBC_V_2_14 is not set
 # CT_LIBC_EGLIBC_V_2_13 is not set
@@ -394,7 +393,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.3.4"
+CT_LIBC_GLIBC_MIN_KERNEL="3.5"
 
 #
 # Debug facilities
@@ -414,17 +413,25 @@ CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
+# CT_GMP_V_5_0_2 is not set
+# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
 CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_1_0 is not set
+# CT_MPFR_V_3_0_1 is not set
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
 CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
+# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
+# CT_CLOOG_V_0_15_11 is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index db724ab40c..3910bdbedd 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.15.0 Configuration
-# Mon May  7 18:58:51 2012
+# crosstool-NG 1.16.0 Configuration
+# Sun Aug  5 21:39:12 2012
 #
 CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_cvs=y
@@ -178,17 +178,15 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.3.4"
+CT_KERNEL_VERSION="3.5"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_3_4=y
-# CT_KERNEL_V_3_3_3 is not set
-# CT_KERNEL_V_3_3_2 is not set
-# CT_KERNEL_V_3_3_1 is not set
-# CT_KERNEL_V_3_3 is not set
-# CT_KERNEL_V_3_2_16 is not set
+CT_KERNEL_V_3_5=y
+# CT_KERNEL_V_3_4_7 is not set
+# CT_KERNEL_V_3_3_8 is not set
+# CT_KERNEL_V_3_2_25 is not set
 # CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_30 is not set
+# CT_KERNEL_V_3_0_39 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
@@ -361,7 +359,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.3.4"
+CT_LIBC_GLIBC_MIN_KERNEL="3.5"
 
 #
 # glibc other options
@@ -405,17 +403,25 @@ CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
+# CT_GMP_V_5_0_2 is not set
+# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
 CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_1_0 is not set
+# CT_MPFR_V_3_0_1 is not set
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
 CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
+# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
+# CT_CLOOG_V_0_15_11 is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 5f1ee7ea8b..5155e6c673 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.15.0 Configuration
-# Mon May  7 18:49:59 2012
+# crosstool-NG 1.16.0 Configuration
+# Sun Aug  5 17:33:46 2012
 #
 CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_cvs=y
@@ -178,17 +178,15 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.3.4"
+CT_KERNEL_VERSION="3.5"
 CT_KERNEL_linux=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_3_4=y
-# CT_KERNEL_V_3_3_3 is not set
-# CT_KERNEL_V_3_3_2 is not set
-# CT_KERNEL_V_3_3_1 is not set
-# CT_KERNEL_V_3_3 is not set
-# CT_KERNEL_V_3_2_16 is not set
+CT_KERNEL_V_3_5=y
+# CT_KERNEL_V_3_4_7 is not set
+# CT_KERNEL_V_3_3_8 is not set
+# CT_KERNEL_V_3_2_25 is not set
 # CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_30 is not set
+# CT_KERNEL_V_3_0_39 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
@@ -322,10 +320,11 @@ CT_CC_GCC_LDBL_128=m
 # C-library
 #
 CT_LIBC="uClibc"
-CT_LIBC_VERSION="0.9.33.1"
+CT_LIBC_VERSION="0.9.33.2"
 CT_LIBC_uClibc=y
 CT_LIBC_uClibc_AVAILABLE=y
-# CT_LIBC_UCLIBC_V_0_9_33_1=y
+CT_LIBC_UCLIBC_V_0_9_33_2=y
+# CT_LIBC_UCLIBC_V_0_9_33_1 is not set
 # CT_LIBC_UCLIBC_V_0_9_33 is not set
 # CT_LIBC_UCLIBC_V_0_9_32_1 is not set
 # CT_LIBC_UCLIBC_V_0_9_32 is not set
@@ -350,7 +349,7 @@ CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_NPTL=y
 CT_LIBC_SUPPORT_LINUXTHREADS=y
 CT_LIBC_SUPPORT_THREADS_NONE=y
-CT_THREADS="linuxthreads"
+CT_THREADS="nptl"
 
 #
 # Common C library options
@@ -363,11 +362,9 @@ CT_LIBC_XLDD=y
 #
 # uClibc other options
 #
-CT_LIBC_UCLIBC_LNXTHRD_OLD=y
-# CT_LIBC_UCLIBC_LNXTHRD_NEW is not set
-CT_LIBC_UCLIBC_LNXTHRD="old"
+CT_LIBC_UCLIBC_LNXTHRD=""
 # CT_LIBC_UCLIBC_LOCALES is not set
-# CT_LIBC_UCLIBC_WCHAR is not set
+CT_LIBC_UCLIBC_WCHAR=y
 
 #
 # Debug facilities
@@ -387,17 +384,25 @@ CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
+# CT_GMP_V_5_0_2 is not set
+# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
 CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_1_0 is not set
+# CT_MPFR_V_3_0_1 is not set
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
 CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
+# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
+# CT_CLOOG_V_0_15_11 is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set

From 1f299105e7a82f7b1f76bdff15fd0413e6fac4fc Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Tue, 7 Aug 2012 17:09:33 +0800
Subject: [PATCH 2513/6849] linux: Rename blackfin kernel Image file from
 vmImage back to uImage

Consist with other architectures.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 5365d5fd1b..c4bdf90905 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -69,12 +69,7 @@ ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
 ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
-ifeq ($(KERNEL_ARCH),blackfin)
-# a uImage, but with a different file name
-LINUX_IMAGE_NAME=vmImage
-else
 LINUX_IMAGE_NAME=uImage
-endif
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
 LINUX_IMAGE_NAME=uImage
 else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y)

From f0e1710c916a081d6e02daf804a585d2a9a0fd39 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 9 Aug 2012 10:59:32 +0100
Subject: [PATCH 2514/6849] libtpl: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libtpl/libtpl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
index 45089b576b..7af0b0625a 100644
--- a/package/libtpl/libtpl.mk
+++ b/package/libtpl/libtpl.mk
@@ -7,5 +7,7 @@ LIBTPL_VERSION = 1.5
 LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
 LIBTPL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tpl
 LIBTPL_INSTALL_STAGING = YES
+LIBTPL_LICENSE = BSD-like
+LIBTPL_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))

From d27d40b0de526b4d395210067ae36a0513a29a77 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 9 Aug 2012 12:00:09 +0100
Subject: [PATCH 2515/6849] gdk-pixbuf: build x11 support, if appropriate

If libX11 is available, then gdk-pixbuf can be built with X11 support.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gdk-pixbuf/gdk-pixbuf.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 751f499fee..0d9e20600a 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -34,6 +34,11 @@ else
 GDK_PIXBUF_DEPENDENCIES += tiff
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+GDK_PIXBUF_CONF_OPT += --with-x11
+GDK_PIXBUF_DEPENDENCIES += xlib_libX11
+endif
+
 GDK_PIXBUF_DEPENDENCIES += \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv) \

From 80b43964d01d5c84f66497d6295d786ff925c7de Mon Sep 17 00:00:00 2001
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Date: Thu, 9 Aug 2012 14:11:09 -0400
Subject: [PATCH 2516/6849] u-boot: add AIS target format

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/uboot/Config.in | 8 ++++++++
 boot/uboot/uboot.mk  | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index afc2f917a0..900fac7fc0 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -79,6 +79,14 @@ endif
 
 choice
 	prompt "U-Boot binary format"
+	default BR2_TARGET_UBOOT_FORMAT_BIN
+
+config BR2_TARGET_UBOOT_FORMAT_AIS
+	bool "u-boot.ais"
+	help
+	  AIS (Application Image Script) is a format defined by TI.
+	  It is required to load code/data on OMAP-L1 processors.
+	  u-boot.ais contains U-Boot with the SPL support.
 
 config BR2_TARGET_UBOOT_FORMAT_BIN
 	bool "u-boot.bin"
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 9e03d6a614..b61400e053 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -25,6 +25,9 @@ endif
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
 UBOOT_BIN          = u-boot.kwb
 UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
+UBOOT_BIN          = u-boot.ais
+UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)

From 8b9523938e0671e20739ad5f1951267499ff2d95 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 9 Aug 2012 16:32:07 -0300
Subject: [PATCH 2517/6849] kernel-headers: bump 3.{0, 2, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 96dd129c70..dc5c2adc68 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.38"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.40"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.24"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.26"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.7"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.8"		if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch

From 04be7f0f8ca100afaf06b264332bc2cd61fbb3d0 Mon Sep 17 00:00:00 2001
From: Dmitry <golubovsky@gmail.com>
Date: Fri, 10 Aug 2012 22:50:26 -0400
Subject: [PATCH 2518/6849] Add package linux-pam

Signed-off-by: Dmitry <golubovsky@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/linux-pam/Config.in                   | 15 +++++++++
 package/linux-pam/linux-pam-configure.patch   | 20 +++++++++++
 .../linux-pam/linux-pam-doc-makefile-am.patch | 33 +++++++++++++++++++
 package/linux-pam/linux-pam-group.patch       | 26 +++++++++++++++
 package/linux-pam/linux-pam-rhosts.patch      | 24 ++++++++++++++
 package/linux-pam/linux-pam-succeed.patch     | 31 +++++++++++++++++
 package/linux-pam/linux-pam-time.patch        | 26 +++++++++++++++
 package/linux-pam/linux-pam.mk                | 27 +++++++++++++++
 9 files changed, 203 insertions(+)
 create mode 100644 package/linux-pam/Config.in
 create mode 100644 package/linux-pam/linux-pam-configure.patch
 create mode 100644 package/linux-pam/linux-pam-doc-makefile-am.patch
 create mode 100644 package/linux-pam/linux-pam-group.patch
 create mode 100644 package/linux-pam/linux-pam-rhosts.patch
 create mode 100644 package/linux-pam/linux-pam-succeed.patch
 create mode 100644 package/linux-pam/linux-pam-time.patch
 create mode 100644 package/linux-pam/linux-pam.mk

diff --git a/package/Config.in b/package/Config.in
index c9ad06a7c0..89cb40f5e9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -460,6 +460,7 @@ source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
 source "package/libtpl/Config.in"
 source "package/liburcu/Config.in"
+source "package/linux-pam/Config.in"
 source "package/lttng-libust/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
new file mode 100644
index 0000000000..722b87576d
--- /dev/null
+++ b/package/linux-pam/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LINUX_PAM
+	bool "linux-pam"
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_FLEX
+	select BR2_PACKAGE_FLEX_LIBFL
+	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+	help
+	  A Security Framework that Provides Authentication for Applications
+
+	  http://linux-pam.org
+
+comment "linux-pam requires a toolchain with WCHAR and locale support"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+
diff --git a/package/linux-pam/linux-pam-configure.patch b/package/linux-pam/linux-pam-configure.patch
new file mode 100644
index 0000000000..0b2326b1d6
--- /dev/null
+++ b/package/linux-pam/linux-pam-configure.patch
@@ -0,0 +1,20 @@
+Add check for ruserok
+
+ruserok is not available/functional in uclibc, provide conditions for compilation
+where needed.
+
+Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
+
+Index: linux-pam-1.1.4/configure.in
+============================================================================
+--- linux-pam-1.1.4/configure.in	2011-06-24 06:46:33.000000000 -0400
++++ linux-pam-1.1.4/configure.in	2012-08-09 21:14:11.000000000 -0400
+@@ -522,7 +522,7 @@
+ AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
+ AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
+ AC_CHECK_FUNCS(getgrouplist getline getdelim)
+-AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af)
++AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af ruserok)
+ 
+ AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
+ AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
diff --git a/package/linux-pam/linux-pam-doc-makefile-am.patch b/package/linux-pam/linux-pam-doc-makefile-am.patch
new file mode 100644
index 0000000000..f08d34916b
--- /dev/null
+++ b/package/linux-pam/linux-pam-doc-makefile-am.patch
@@ -0,0 +1,33 @@
+Disable generation of documentation
+
+Generation of documentation is not necessary in Buildroot, disable it completely.
+
+Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
+
+Index: linux-pam-1.1.4/doc/Makefile.am
+============================================================================
+--- linux-pam-1.1.4/doc/Makefile.am	2011-06-21 05:04:56.000000000 -0400
++++ linux-pam-1.1.4/doc/Makefile.am	2012-08-09 05:59:23.000000000 -0400
+@@ -2,8 +2,6 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+ 
+-SUBDIRS = man specs sag adg mwg
+-
+ CLEANFILES = *~
+ 
+ dist_html_DATA = index.html
+@@ -11,12 +9,4 @@
+ #######################################################
+ 
+ releasedocs: all
+-	$(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs
+-	cp -av specs/draft-morgan-pam-current.txt \
+-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/
+-	cp -av $(srcdir)/specs/rfc86.0.txt \
+-		$(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/
+-	make -C sag releasedocs
+-	make -C adg releasedocs
+-	make -C mwg releasedocs
+-	
++	/bin/true
diff --git a/package/linux-pam/linux-pam-group.patch b/package/linux-pam/linux-pam-group.patch
new file mode 100644
index 0000000000..a94cf9e3db
--- /dev/null
+++ b/package/linux-pam/linux-pam-group.patch
@@ -0,0 +1,26 @@
+Conditionally compile per innetgr availability
+
+innetgr is not available/functional in uclibc, provide conditions for compilation.
+
+Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
+
+Index: linux-pam-1.1.4/modules/pam_group/pam_group.c
+============================================================================
+--- linux-pam-1.1.4/modules/pam_group/pam_group.c	2011-06-21 05:04:56.000000000 -0400
++++ linux-pam-1.1.4/modules/pam_group/pam_group.c	2012-08-09 21:35:06.000000000 -0400
+@@ -655,8 +655,14 @@
+ 	    continue;
+ 	}
+ 	/* If buffer starts with @, we are using netgroups */
+-	if (buffer[0] == '@')
++	if (buffer[0] == '@') {
++#ifdef HAVE_INNETGR
+ 	  good &= innetgr (&buffer[1], NULL, user, NULL);
++#else
++	  good = 0;
++	  pam_syslog (pamh, LOG_ERR, "pam_group does not have netgroup support");
++#endif  /* HAVE_INNETGR */
++	}
+ 	/* otherwise, if the buffer starts with %, it's a UNIX group */
+ 	else if (buffer[0] == '%')
+           good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
diff --git a/package/linux-pam/linux-pam-rhosts.patch b/package/linux-pam/linux-pam-rhosts.patch
new file mode 100644
index 0000000000..58f9adbb1a
--- /dev/null
+++ b/package/linux-pam/linux-pam-rhosts.patch
@@ -0,0 +1,24 @@
+Conditionally compile per ruserok availability
+
+ruserok is not available/functional in uclibc, provide conditions for compilation.
+
+Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
+
+Index: linux-pam-1.1.4/modules/pam_rhosts/pam_rhosts.c
+============================================================================
+--- linux-pam-1.1.4/modules/pam_rhosts/pam_rhosts.c	2011-06-21 05:04:56.000000000 -0400
++++ linux-pam-1.1.4/modules/pam_rhosts/pam_rhosts.c	2012-08-09 21:19:34.000000000 -0400
+@@ -114,8 +114,12 @@
+ #ifdef HAVE_RUSEROK_AF
+     retval = ruserok_af (rhost, as_root, ruser, luser, PF_UNSPEC);
+ #else
++  #ifdef HAVE_RUSEROK
+     retval = ruserok (rhost, as_root, ruser, luser);
+-#endif
++  #else
++    retval = -1;
++  #endif  /* HAVE_RUSEROK */
++#endif  /*HAVE_RUSEROK_AF */
+     if (retval != 0) {
+       if (!opt_silent || opt_debug)
+ 	pam_syslog(pamh, LOG_WARNING, "denied access to %s@%s as %s",
diff --git a/package/linux-pam/linux-pam-succeed.patch b/package/linux-pam/linux-pam-succeed.patch
new file mode 100644
index 0000000000..8a675efa20
--- /dev/null
+++ b/package/linux-pam/linux-pam-succeed.patch
@@ -0,0 +1,31 @@
+Conditionally compile per innetgr availability
+
+innetgr is not available/functional in uclibc, provide conditions for compilation.
+
+Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
+
+Index: linux-pam-1.1.4/modules/pam_succeed_if/pam_succeed_if.c
+============================================================================
+--- linux-pam-1.1.4/modules/pam_succeed_if/pam_succeed_if.c	2011-06-21 05:04:56.000000000 -0400
++++ linux-pam-1.1.4/modules/pam_succeed_if/pam_succeed_if.c	2012-08-09 21:05:02.000000000 -0400
+@@ -233,16 +233,20 @@
+ static int
+ evaluate_innetgr(const char *host, const char *user, const char *group)
+ {
++#ifdef HAVE_INNETGR
+ 	if (innetgr(group, host, user, NULL) == 1)
+ 		return PAM_SUCCESS;
++#endif /* HAVE_INNETGR */
+ 	return PAM_AUTH_ERR;
+ }
+ /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
+ static int
+ evaluate_notinnetgr(const char *host, const char *user, const char *group)
+ {
++#ifdef HAVE_INNETGR
+ 	if (innetgr(group, host, user, NULL) == 0)
+ 		return PAM_SUCCESS;
++#endif /* HAVE_INNETGR */
+ 	return PAM_AUTH_ERR;
+ }
+ 
diff --git a/package/linux-pam/linux-pam-time.patch b/package/linux-pam/linux-pam-time.patch
new file mode 100644
index 0000000000..58d7c9f024
--- /dev/null
+++ b/package/linux-pam/linux-pam-time.patch
@@ -0,0 +1,26 @@
+Conditionally compile per innetgr availability
+
+innetgr is not available/functional in uclibc, provide conditions for compilation.
+
+Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
+
+Index: linux-pam-1.1.4/modules/pam_time/pam_time.c
+============================================================================
+--- linux-pam-1.1.4/modules/pam_time/pam_time.c	2011-06-21 05:04:56.000000000 -0400
++++ linux-pam-1.1.4/modules/pam_time/pam_time.c	2012-08-09 21:02:29.000000000 -0400
+@@ -554,8 +554,14 @@
+ 	       continue;
+ 	  }
+ 	  /* If buffer starts with @, we are using netgroups */
+-	  if (buffer[0] == '@')
++	  if (buffer[0] == '@') {
++#ifdef HAVE_INNETGR
+ 	    good &= innetgr (&buffer[1], NULL, user, NULL);
++#else
++	    good = 0;
++	    pam_syslog (pamh, LOG_ERR, "pam_time does not have netgroup support");
++#endif /* HAVE_INNETGR */
++	  }
+ 	  else
+ 	    good &= logic_field(pamh, user, buffer, count, is_same);
+ 	  D(("with user: %s", good ? "passes":"fails" ));
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
new file mode 100644
index 0000000000..48cb073943
--- /dev/null
+++ b/package/linux-pam/linux-pam.mk
@@ -0,0 +1,27 @@
+############################################
+#
+# linux-pam
+# 
+############################################
+
+LINUX_PAM_VERSION = 1.1.4
+LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
+LINUX_PAM_SITE = http://linux-pam.org/library/
+LINUX_PAM_INSTALL_STAGING = YES
+LINUX_PAM_CONF_OPT = \
+	--disable-prelude \
+	--disable-isadir \
+	--disable-nis \
+	--disable-regenerate-docu \
+	--enable-securedir=/lib/security \
+	--libdir=/lib
+LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) flex
+LINUX_PAM_AUTORECONF = YES
+LINUX_PAM_LICENSE = BSD-3c
+LINUX_PAM_LICENSE_FILES = Copyright
+
+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+	LINUX_PAM_MAKE_OPT += LIBS=-lintl
+endif
+
+$(eval $(autotools-package))

From 6a81db89eb036216c87b3036251adbeea2013b0e Mon Sep 17 00:00:00 2001
From: Stefan Froberg <stefan.froberg@petroprogram.com>
Date: Fri, 10 Aug 2012 22:30:11 +0300
Subject: [PATCH 2519/6849] yasm: New package

[thomas.petazzoni@free-electrons.com:

 drop the --disable-static from configuration options, the default
 behavior should work without problem.

 make sure the pre configure hook is also executed for the host
 variant of the package.

 add the project upstream URL in the package help text
]

Signed-off-by: Stefan Froberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in      |  1 +
 package/yasm/Config.in |  9 +++++++++
 package/yasm/yasm.mk   | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/yasm/Config.in
 create mode 100644 package/yasm/yasm.mk

diff --git a/package/Config.in b/package/Config.in
index 89cb40f5e9..45f0799535 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -91,6 +91,7 @@ source "package/sstrip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
 endif
+source "package/yasm/Config.in"
 endmenu
 
 menu "Games"
diff --git a/package/yasm/Config.in b/package/yasm/Config.in
new file mode 100644
index 0000000000..bb1d417229
--- /dev/null
+++ b/package/yasm/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_YASM
+	bool "yasm"
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  Yasm is a complete rewrite of the NASM-2.10.01 assembler.
+	  It supports the x86 and AMD64 instruction sets, accepts NASM
+	  and GAS assembler syntaxes and outputs binary, ELF32 and ELF64
+	  object formats.
+
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
new file mode 100644
index 0000000000..ac75d2b6ab
--- /dev/null
+++ b/package/yasm/yasm.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# yasm
+#
+#############################################################
+YASM_VERSION = 1.2.0
+YASM_SOURCE = yasm-$(YASM_VERSION).tar.gz
+YASM_SITE = http://www.tortall.net/projects/yasm/releases/
+YASM_CONF_OPT = --disable-static
+
+define YASM_PRE_CONFIGURE_FIXUP
+# This sed prevents it compiling 2 programs (vsyasm and ytasm) 
+# that are only of use on Microsoft Windows. 
+	sed -i 's#) ytasm.*#)#' $(@D)/Makefile.in
+endef
+
+YASM_PRE_CONFIGURE_HOOKS += YASM_PRE_CONFIGURE_FIXUP
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From 956caf62480f2cb0adada6a5a9f1e5ca3dd2b262 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 11 Aug 2012 17:18:32 +1000
Subject: [PATCH 2520/6849] acpid: add init.d script

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/acpid/S02acpid | 22 ++++++++++++++++++++++
 package/acpid/acpid.mk |  1 +
 2 files changed, 23 insertions(+)
 create mode 100755 package/acpid/S02acpid

diff --git a/package/acpid/S02acpid b/package/acpid/S02acpid
new file mode 100755
index 0000000000..ec686d8f55
--- /dev/null
+++ b/package/acpid/S02acpid
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		echo -n "Starting acpid: "
+		start-stop-daemon -S -q -m -b -p /var/run/acpid.pid --exec /usr/sbin/acpid -- -n
+		echo "done"
+		;;
+	stop)
+		echo -n "Stopping acpid: "
+		start-stop-daemon -K -q -p /var/run/acpid.pid
+		echo "done"
+		;;
+	restart)
+		"$0" stop
+		sleep 1
+		"$0" start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		;;
+esac
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index cacfb27e7e..56f671d99b 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -18,6 +18,7 @@ define ACPID_INSTALL_TARGET_CMDS
 	install -D -m 644 $(@D)/acpi_listen.8 $(TARGET_DIR)/usr/share/man/man8/acpi_listen.8
 	mkdir -p $(TARGET_DIR)/etc/acpi/events
 	/bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
+	$(INSTALL) -D -m 0755 package/acpid/S02acpid $(TARGET_DIR)/etc/init.d/S02acpid
 endef
 
 define ACPID_UNINSTALL_TARGET_CMDS

From 54fe81fbb49d29a15945bdcf8e2c281bcb1969fd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 11 Aug 2012 22:33:40 +0200
Subject: [PATCH 2521/6849] yasm: minor fixes that should have been part the
 commit adding the package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/yasm/Config.in | 1 +
 package/yasm/yasm.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/yasm/Config.in b/package/yasm/Config.in
index bb1d417229..2dc25aadb2 100644
--- a/package/yasm/Config.in
+++ b/package/yasm/Config.in
@@ -7,3 +7,4 @@ config BR2_PACKAGE_YASM
 	  and GAS assembler syntaxes and outputs binary, ELF32 and ELF64
 	  object formats.
 
+	  http://www.tortall.net/projects/yasm/
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index ac75d2b6ab..fafd1ec6dc 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -6,7 +6,6 @@
 YASM_VERSION = 1.2.0
 YASM_SOURCE = yasm-$(YASM_VERSION).tar.gz
 YASM_SITE = http://www.tortall.net/projects/yasm/releases/
-YASM_CONF_OPT = --disable-static
 
 define YASM_PRE_CONFIGURE_FIXUP
 # This sed prevents it compiling 2 programs (vsyasm and ytasm) 
@@ -15,6 +14,7 @@ define YASM_PRE_CONFIGURE_FIXUP
 endef
 
 YASM_PRE_CONFIGURE_HOOKS += YASM_PRE_CONFIGURE_FIXUP
+HOST_YASM_PRE_CONFIGURE_HOOKS += YASM_PRE_CONFIGURE_FIXUP
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 1ff74a535d9c5e7e7f996eb9b8d8f83f8af44f1e Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 11 Aug 2012 17:12:05 +1000
Subject: [PATCH 2522/6849] python-meld3: new package

[thomas.petazzoni@free-electrons.com:
 Fixup indentation in the Config.in file.
 Add 'select BR2_PACKAGE_PYTHON_PYEXPAT' which is needed to get XML
 support in Python.
 Add license information.]

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                    |  1 +
 package/python-meld3/Config.in       |  8 ++++++++
 package/python-meld3/python-meld3.mk | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/python-meld3/Config.in
 create mode 100644 package/python-meld3/python-meld3.mk

diff --git a/package/Config.in b/package/Config.in
index 45f0799535..a9101b2056 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -271,6 +271,7 @@ menu "external python modules"
 source "package/python-dpkt/Config.in"
 source "package/python-id3/Config.in"
 source "package/python-mad/Config.in"
+source "package/python-meld3/Config.in"
 source "package/python-netifaces/Config.in"
 source "package/python-nfc/Config.in"
 source "package/python-pygame/Config.in"
diff --git a/package/python-meld3/Config.in b/package/python-meld3/Config.in
new file mode 100644
index 0000000000..8dee723e02
--- /dev/null
+++ b/package/python-meld3/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_MELD3
+	bool "python-meld3"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_PYEXPAT
+	help
+	  A HTML/XML templating system.
+
+	  https://github.com/supervisor/meld3
diff --git a/package/python-meld3/python-meld3.mk b/package/python-meld3/python-meld3.mk
new file mode 100644
index 0000000000..de83b28504
--- /dev/null
+++ b/package/python-meld3/python-meld3.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# python-meld3
+#
+#############################################################
+
+PYTHON_MELD3_VERSION = 0.6.8
+PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz
+PYTHON_MELD3_SITE = http://pypi.python.org/packages/source/m/meld3/
+PYTHON_MELD3_DEPENDENCIES = python
+PYTHON_MELD3_LICENSE = ZPLv2.1
+PYTHON_MELD3_LICENSE_FILES = COPYRIGHT.txt LICENSE.txt
+
+define PYTHON_MELD3_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_MELD3_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From 380ff787d95f9fa36a73503fd3ac6d5c40a5e6bc Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 11 Aug 2012 17:12:06 +1000
Subject: [PATCH 2523/6849] supervisor: new package

[thomas.petazzoni@free-electrons.com:
 Fixup indentation of Config.in file.
 Add 'depends on BR2_PACKAGE_PYTHON' so that the package does not
 appear when the Python interpreter is not enabled.
 Add license files information, but not the license tag: the package
 includes software under multiple licenses.]

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                   |  1 +
 package/supervisor/Config.in        | 13 +++++++++++++
 package/supervisor/S99supervisord   | 29 +++++++++++++++++++++++++++++
 package/supervisor/supervisor.mk    | 26 ++++++++++++++++++++++++++
 package/supervisor/supervisord.conf | 18 ++++++++++++++++++
 5 files changed, 87 insertions(+)
 create mode 100644 package/supervisor/Config.in
 create mode 100755 package/supervisor/S99supervisord
 create mode 100644 package/supervisor/supervisor.mk
 create mode 100644 package/supervisor/supervisord.conf

diff --git a/package/Config.in b/package/Config.in
index a9101b2056..3a059173f4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -683,6 +683,7 @@ source "package/rsyslog/Config.in"
 source "package/sysklogd/Config.in"
 source "package/sysvinit/Config.in"
 endif
+source "package/supervisor/Config.in"
 source "package/systemd/Config.in"
 source "package/util-linux/Config.in"
 source "package/dsp-tools/Config.in"
diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in
new file mode 100644
index 0000000000..53401810f3
--- /dev/null
+++ b/package/supervisor/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_SUPERVISOR
+	bool "supervisor"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS
+	select BR2_PACKAGE_PYTHON_MELD3
+	help
+	  A client/server system that allows its users to control a
+	  number of processes on UNIX-like operating systems.
+
+	  http://supervisord.org/
+
+comment "supervisor needs the python interpreter"
+	depends on !BR2_PACKAGE_PYTHON
diff --git a/package/supervisor/S99supervisord b/package/supervisor/S99supervisord
new file mode 100755
index 0000000000..0856d65a5d
--- /dev/null
+++ b/package/supervisor/S99supervisord
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+mkdir -p /var/log/supervisor
+
+case "$1" in
+	start)
+		echo -n "Starting supervisord: "
+		start-stop-daemon -S -q -p /var/run/supervisord.pid --exec /usr/bin/supervisord
+		echo "done"
+		;;
+	stop)
+		echo -n "Stopping supervisord: "
+		start-stop-daemon -K -q -p /var/run/supervisord.pid
+		echo "done"
+		;;
+	restart)
+		"$0" stop
+		sleep 5
+		"$0" start
+		;;
+	reload)
+		start-stop-daemon -K -q -p /var/run/supervisord.pid -s HUP
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
+
+exit $?
diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk
new file mode 100644
index 0000000000..26afff35f0
--- /dev/null
+++ b/package/supervisor/supervisor.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# python-supervisor
+#
+#############################################################
+
+SUPERVISOR_VERSION = 3.0a12
+SUPERVISOR_SOURCE = supervisor-$(SUPERVISOR_VERSION).tar.gz
+SUPERVISOR_SITE = http://pypi.python.org/packages/source/s/supervisor/
+SUPERVISOR_LICENSE_FILES = LICENSES.txt
+
+SUPERVISOR_DEPENDENCIES = python host-python-setuptools
+
+define SUPERVISOR_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define SUPERVISOR_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=/usr --root=$(TARGET_DIR))
+	sed -i '1s|#!.*python.*|#!/usr/bin/env python|' $(TARGET_DIR)/usr/bin/{echo_supervisord_conf,pidproxy,supervisorctl,supervisord}
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/etc/supervisor.d
+	$(INSTALL) -D -m 644 package/supervisor/supervisord.conf $(TARGET_DIR)/etc/supervisord.conf
+	$(INSTALL) -m 755 package/supervisor/S99supervisord $(TARGET_DIR)/etc/init.d/S99supervisord
+endef
+
+$(eval $(generic-package))
diff --git a/package/supervisor/supervisord.conf b/package/supervisor/supervisord.conf
new file mode 100644
index 0000000000..1372a688ab
--- /dev/null
+++ b/package/supervisor/supervisord.conf
@@ -0,0 +1,18 @@
+[unix_http_server]
+file = /var/run/supervisor.sock
+
+[supervisord]
+logfile = /var/log/supervisor/supervisord.log
+logfile_maxbytes = 200KB
+logfile_backups = 1
+pidfile = /var/run/supervisord.pid
+childlogdir = /var/log/supervisor
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///var/run/supervisor.sock
+
+[include]
+files = /etc/supervisor.d/*.conf

From 77d3c5d457784d5035d7fece1c3ee0ef5cd46d92 Mon Sep 17 00:00:00 2001
From: gregory hermant <gregory.hermant@calao-systems.com>
Date: Fri, 3 Aug 2012 18:40:24 +0200
Subject: [PATCH 2524/6849] Add support for the Calao-systems QIL-A9260

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../at91bootstrap-1.16-qil-a9260.patch        | 603 ++++++++++++++++++
 .../barebox-2012.07.0-qil-a9260.patch         |  36 ++
 board/calao/qil-a9260/linux-3.4.7.config      | 111 ++++
 board/calao/qil-a9260/linux-3.4.7.patch       |  27 +
 configs/calao_qil_a9260_defconfig             |  17 +
 5 files changed, 794 insertions(+)
 create mode 100644 board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch
 create mode 100644 board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch
 create mode 100644 board/calao/qil-a9260/linux-3.4.7.config
 create mode 100644 board/calao/qil-a9260/linux-3.4.7.patch
 create mode 100644 configs/calao_qil_a9260_defconfig

diff --git a/board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch b/board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch
new file mode 100644
index 0000000000..eb9de2a15e
--- /dev/null
+++ b/board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch
@@ -0,0 +1,603 @@
+From a3e08beea8bf5e96e1237eef4a82f4a2fdd5286b Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Thu, 19 Jul 2012 14:19:59 +0200
+Subject: [PATCH] Add support for the Calao-systems QIL-A9260
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ board/qil_a9260/nandflash/Makefile    |  122 ++++++++++++++
+ board/qil_a9260/nandflash/qil-a9260.h |  109 ++++++++++++
+ board/qil_a9260/qil_a9260.c           |  298 +++++++++++++++++++++++++++++++++
+ crt0_gnu.S                            |    7 +
+ include/part.h                        |    6 +-
+ 5 files changed, 541 insertions(+), 1 deletions(-)
+ create mode 100644 board/qil_a9260/nandflash/Makefile
+ create mode 100644 board/qil_a9260/nandflash/qil-a9260.h
+ create mode 100644 board/qil_a9260/qil_a9260.c
+
+diff --git a/board/qil_a9260/nandflash/Makefile b/board/qil_a9260/nandflash/Makefile
+new file mode 100644
+index 0000000..209a25f
+--- /dev/null
++++ b/board/qil_a9260/nandflash/Makefile
+@@ -0,0 +1,122 @@
++# TODO: set this appropriately for your local toolchain
++ifndef ERASE_FCT
++ERASE_FCT=rm -f
++endif
++ifndef CROSS_COMPILE
++CROSS_COMPILE=arm-elf-
++endif
++
++TOOLCHAIN=gcc
++
++BOOTSTRAP_PATH=../../..
++
++# NandFlashBoot Configuration for QIL-A9260
++
++# Target name (case sensitive!!!)
++TARGET=AT91SAM9260
++# Board name (case sensitive!!!)
++BOARD=qil_a9260
++# Link Address and Top_of_Memory
++LINK_ADDR=0x200000
++TOP_OF_MEMORY=0x301000
++# Name of current directory
++PROJECT=nandflash
++
++ifndef BOOT_NAME
++BOOT_NAME=$(PROJECT)_$(BOARD)
++endif
++
++INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
++
++ifeq ($(TOOLCHAIN), gcc)
++
++AS=$(CROSS_COMPILE)gcc
++CC=$(CROSS_COMPILE)gcc
++LD=$(CROSS_COMPILE)gcc
++NM= $(CROSS_COMPILE)nm
++SIZE=$(CROSS_COMPILE)size
++OBJCOPY=$(CROSS_COMPILE)objcopy
++OBJDUMP=$(CROSS_COMPILE)objdump
++CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
++ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
++
++# Linker flags.
++#  -Wl,...:     tell GCC to pass this to linker.
++#    -Map:      create map file
++#    --cref:    add cross reference to map file
++LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref
++LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
++OBJS=crt0_gnu.o
++
++endif
++
++OBJS+=\
++	$(BOARD).o \
++	main.o \
++	gpio.o \
++	pmc.o \
++	debug.o \
++	sdramc.o \
++	nandflash.o \
++	_udivsi3.o \
++	_umodsi3.o \
++	div0.o \
++	udiv.o \
++	string.o
++
++
++rebuild: clean all
++
++all: 	$(BOOT_NAME)
++
++ifeq ($(TOOLCHAIN), gcc)
++$(BOOT_NAME): $(OBJS)
++	$(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
++	$(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
++endif
++
++
++$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
++
++main.o: $(BOOTSTRAP_PATH)/main.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
++
++gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
++
++pmc.o:  $(BOOTSTRAP_PATH)/driver/pmc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
++
++debug.o: $(BOOTSTRAP_PATH)/driver/debug.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
++
++sdramc.o:  $(BOOTSTRAP_PATH)/driver/sdramc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
++
++dataflash.o:  $(BOOTSTRAP_PATH)/driver/dataflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
++
++nandflash.o:  $(BOOTSTRAP_PATH)/driver/nandflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o
++
++crt0_gnu.o:  $(BOOTSTRAP_PATH)/crt0_gnu.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
++
++div0.o:  $(BOOTSTRAP_PATH)/lib/div0.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
++
++string.o:  $(BOOTSTRAP_PATH)/lib/string.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
++
++udiv.o:  $(BOOTSTRAP_PATH)/lib/udiv.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
++
++_udivsi3.o:  $(BOOTSTRAP_PATH)/lib/_udivsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
++
++_umodsi3.o:  $(BOOTSTRAP_PATH)/lib/_umodsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
++
++clean:
++	$(ERASE_FCT) *.o *.bin *.elf *.map
+diff --git a/board/qil_a9260/nandflash/qil-a9260.h b/board/qil_a9260/nandflash/qil-a9260.h
+new file mode 100644
+index 0000000..c87002e
+--- /dev/null
++++ b/board/qil_a9260/nandflash/qil-a9260.h
+@@ -0,0 +1,109 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : qil-a9260.h
++ * Object              :
++ * Creation            : GH July 19th 2012
++ *-----------------------------------------------------------------------------
++ */
++#ifndef _QIL_A9260_H
++#define _QIL_A9260_H
++
++/* ******************************************************************* */
++/* PMC Settings                                                        */
++/*                                                                     */
++/* The main oscillator is enabled as soon as possible in the c_startup */
++/* and MCK is switched on the main oscillator.                         */
++/* PLL initialization is done later in the hw_init() function          */
++/* ******************************************************************* */
++#define MASTER_CLOCK		(180000000/2)
++#define PLL_LOCK_TIMEOUT	1000000
++
++#define PLLA_SETTINGS	0x20593F06
++#define PLLB_SETTINGS	0x10483F0E
++
++/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */
++#define MCKR_SETTINGS		(AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2)
++#define MCKR_CSS_SETTINGS	(AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
++
++/* ******************************************************************* */
++/* NandFlash Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_SMARTMEDIA_BASE	0x40000000
++
++#define AT91_SMART_MEDIA_ALE    (1 << 21)	/* our ALE is AD21 */
++#define AT91_SMART_MEDIA_CLE    (1 << 22)	/* our CLE is AD22 */
++
++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0)
++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0)
++
++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13))
++
++
++/* ******************************************************************** */
++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000.*/
++/* Please refer to SMC section in AT91SAM datasheet to learn how 	*/
++/* to generate these values. 						*/
++/* ******************************************************************** */
++#define AT91C_SM_NWE_SETUP	(1 << 0)
++#define AT91C_SM_NCS_WR_SETUP	(0 << 8)
++#define AT91C_SM_NRD_SETUP	(1 << 16)
++#define AT91C_SM_NCS_RD_SETUP	(0 << 24)
++  
++#define AT91C_SM_NWE_PULSE 	(3 << 0)
++#define AT91C_SM_NCS_WR_PULSE	(3 << 8)
++#define AT91C_SM_NRD_PULSE	(3 << 16)
++#define AT91C_SM_NCS_RD_PULSE	(3 << 24)
++  
++#define AT91C_SM_NWE_CYCLE 	(5 << 0)
++#define AT91C_SM_NRD_CYCLE	(5 << 16)
++#define AT91C_SM_TDF	        (2 << 16)
++
++/* ******************************************************************* */
++/* BootStrap Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define IMG_ADDRESS 		0x20000		/* Image Address in NandFlash */
++#define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
++
++#define MACH_TYPE       	0x6AF		/* QIL-A9260 */
++#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
++
++/* ******************************************************************* */
++/* Application Settings                                                */
++/* ******************************************************************* */
++#undef CFG_DEBUG
++#undef CFG_DATAFLASH
++
++#define CFG_NANDFLASH
++#undef	NANDFLASH_SMALL_BLOCKS	/* NANDFLASH_LARGE_BLOCKS used instead */
++
++#define CFG_HW_INIT
++#define CFG_SDRAM
++
++#endif	/* _QIL_A9260_H */
+diff --git a/board/qil_a9260/qil_a9260.c b/board/qil_a9260/qil_a9260.c
+new file mode 100644
+index 0000000..ae122e7
+--- /dev/null
++++ b/board/qil_a9260/qil_a9260.c
+@@ -0,0 +1,298 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaiimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : qil_a9260.c
++ * Object              :
++ * Creation            : GH July 19th 2012
++ *-----------------------------------------------------------------------------
++ */
++#include "../../include/part.h"
++#include "../../include/gpio.h"
++#include "../../include/pmc.h"
++#include "../../include/debug.h"
++#include "../../include/sdramc.h"
++#include "../../include/main.h"
++#ifdef CFG_NANDFLASH
++#include "../../include/nandflash.h"
++#endif
++#ifdef CFG_DATAFLASH
++#include "../../include/dataflash.h"
++#endif
++
++static inline unsigned int get_cp15(void)
++{
++	unsigned int value;
++	__asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value));
++	return value;
++}
++
++static inline void set_cp15(unsigned int value)
++{
++	__asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value));
++}
++
++#ifdef CFG_HW_INIT
++/*----------------------------------------------------------------------------*/
++/* \fn    hw_init							      */
++/* \brief This function performs very low level HW initialization	      */
++/* This function is invoked as soon as possible during the c_startup	      */
++/* The bss segment must be initialized					      */
++/*----------------------------------------------------------------------------*/
++void hw_init(void)
++{
++	unsigned int cp15;
++	
++	/* Configure PIOs */
++	const struct pio_desc hw_pio[] = {
++#ifdef CFG_DEBUG
++		{"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Disable watchdog */
++	writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR);
++
++	/* At this stage the main oscillator is supposed to be enabled
++	 * PCK = MCK = MOSC */
++
++	/* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
++	pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* PCK = PLLA = 2 * MCK */
++	pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT);
++	/* Switch MCK on PLLA output */
++	pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure PLLB */
++	pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure CP15 */
++	cp15 = get_cp15();
++	cp15 |= I_CACHE;
++	set_cp15(cp15);
++
++	/* Configure the PIO controller */
++	pio_setup(hw_pio);
++
++	/* Configure the EBI Slave Slot Cycle to 64 */
++	writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3));
++
++#ifdef CFG_DEBUG
++	/* Enable Debug messages on the DBGU */
++	dbg_init(BAUDRATE(MASTER_CLOCK, 115200));
++
++	dbg_print("Start AT91Bootstrap...\n\r");
++#endif /* CFG_DEBUG */
++
++#ifdef CFG_SDRAM
++	/* Initialize the matrix */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA);
++
++	/* Configure SDRAM Controller */
++	sdram_init(	AT91C_SDRAMC_NC_9  |
++				AT91C_SDRAMC_NR_13 |
++				AT91C_SDRAMC_CAS_2 |
++				AT91C_SDRAMC_NB_4_BANKS |
++				AT91C_SDRAMC_DBW_32_BITS |
++				AT91C_SDRAMC_TWR_2 |
++				AT91C_SDRAMC_TRC_7 |
++				AT91C_SDRAMC_TRP_2 |
++				AT91C_SDRAMC_TRCD_2 |
++				AT91C_SDRAMC_TRAS_5 |
++				AT91C_SDRAMC_TXSR_8,		/* Control Register */
++				(MASTER_CLOCK * 7)/1000000,	/* Refresh Timer Register */
++				AT91C_SDRAMC_MD_SDRAM);		/* SDRAM (no low power)   */ 
++
++
++#endif /* CFG_SDRAM */
++}
++#endif /* CFG_HW_INIT */
++
++#ifdef CFG_SDRAM
++/*------------------------------------------------------------------------------*/
++/* \fn    sdramc_hw_init							*/
++/* \brief This function performs SDRAMC HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void sdramc_hw_init(void)
++{
++	/* Configure PIOs */
++/*	const struct pio_desc sdramc_pio[] = {
++		{"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++*/
++	/* Configure the SDRAMC PIO controller to output PCK0 */
++/*	pio_setup(sdramc_pio); */
++
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0));
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0));
++
++}
++#endif /* CFG_SDRAM */
++
++#ifdef CFG_DATAFLASH
++
++/*------------------------------------------------------------------------------*/
++/* \fn    df_recovery								*/
++/* \brief This function erases DataFlash Page 0 if USR PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++void df_recovery(AT91PS_DF pDf)
++{
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
++	/* Configure PIOs */
++	const struct pio_desc usrpb_pio[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb_pio);
++	
++	/* If USR PB is pressed during Boot sequence */
++	/* Erase DataFlash Page 0*/
++	if ( !pio_get_value(AT91C_PIN_PB(10)) )
++		df_page_erase(pDf, 0);
++#endif
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    df_hw_init								*/
++/* \brief This function performs DataFlash HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void df_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc df_pio[] = {
++		{"MISO",  AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"MOSI",  AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"SPCK",  AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
++		{"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	pio_setup(df_pio);
++}
++#endif /* CFG_DATAFLASH */
++
++
++
++#ifdef CFG_NANDFLASH
++/*------------------------------------------------------------------------------*/
++/* \fn    nand_recovery						*/
++/* \brief This function erases NandFlash Block 0 if USR PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++static void nand_recovery(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc usrpb_pio[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb_pio);
++	
++	/* If USR PB is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if (!pio_get_value(AT91C_PIN_PB(10)) )
++		AT91F_NandEraseBlock0();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_hw_init							*/
++/* \brief NandFlash HW init							*/
++/*------------------------------------------------------------------------------*/
++void nandflash_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc nand_pio[] = {
++		{"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT},
++		{"NANDCS",  AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT},
++		{(char *) 0, 0, 0,  PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA);
++		    
++	/* Configure SMC CS3 */
++ 	writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3);
++  	writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3);
++	writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE)						, AT91C_BASE_SMC + SMC_CYCLE3);
++	writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | 
++  		AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF)						, AT91C_BASE_SMC + SMC_CTRL3);
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(nand_pio);
++	
++	nand_recovery();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_16bits_dbw_init						*/
++/* \brief Configure SMC in 16 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_16bits_dbw_init(void)
++{
++	writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_8bits_dbw_init						*/
++/* \brief Configure SMC in 8 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_8bits_dbw_init(void)
++{
++	writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++
++#endif /* #ifdef CFG_NANDFLASH */
+diff --git a/crt0_gnu.S b/crt0_gnu.S
+index 042b617..002feef 100644
+--- a/crt0_gnu.S
++++ b/crt0_gnu.S
+@@ -106,6 +106,13 @@ _relocate_to_sram:
+ #endif /* CFG_NORFLASH */
+ 
+ _setup_clocks:
++/* Test if main osc is bypassed */
++	ldr 	r0,=AT91C_PMC_MOR
++	ldr 	r1, [r0]
++	ldr 	r2,=AT91C_CKGR_OSCBYPASS 
++	ands 	r1, r1, r2
++	bne	_init_data	/* branch if OSCBYPASS=1 */
++
+ /* Test if main oscillator is enabled */
+ 	ldr 	r0,=AT91C_PMC_SR
+ 	ldr 	r1, [r0]
+diff --git a/include/part.h b/include/part.h
+index ba5985a..bbd33fe 100644
+--- a/include/part.h
++++ b/include/part.h
+@@ -35,7 +35,11 @@
+ 
+ #ifdef AT91SAM9260
+ #include "AT91SAM9260_inc.h"
+-#include "at91sam9260ek.h"
++	#ifdef at91sam9260ek
++	#include "at91sam9260ek.h"
++	#elif qil_a9260
++	#include "qil-a9260.h"
++	#endif
+ #endif
+ 
+ #ifdef AT91SAM9XE
+-- 
+1.5.6.3
+
diff --git a/board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch b/board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch
new file mode 100644
index 0000000000..a74e657066
--- /dev/null
+++ b/board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch
@@ -0,0 +1,36 @@
+From d076aa6182dc6df6bb311e60bbddb03573b9483b Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Fri, 3 Aug 2012 11:25:49 +0200
+Subject: [PATCH] Enable pull-up on Rx serial ports for the CALAO MB-QIL-A9260
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ arch/arm/boards/qil-a9260/init.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boards/qil-a9260/init.c b/arch/arm/boards/qil-a9260/init.c
+index 305d733..b43cace 100644
+--- a/arch/arm/boards/qil-a9260/init.c
++++ b/arch/arm/boards/qil-a9260/init.c
+@@ -196,11 +196,17 @@ device_initcall(qil_a9260_devices_init);
+ static int qil_a9260_console_init(void)
+ {
+ 	at91_register_uart(0, 0);
++	at91_set_A_periph(AT91_PIN_PB14, 1);    /* Enable pull-up on DRXD */
++
+ 	at91_register_uart(1, ATMEL_UART_CTS | ATMEL_UART_RTS
+ 			   | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
+ 			   | ATMEL_UART_RI);
++
+ 	at91_register_uart(2, ATMEL_UART_CTS | ATMEL_UART_RTS);
++	at91_set_A_periph(AT91_PIN_PB7, 1);	/* Enable pull-up on RXD1 */
++
+ 	at91_register_uart(3, ATMEL_UART_CTS | ATMEL_UART_RTS);
++	at91_set_A_periph(AT91_PIN_PB9, 1);	/* Enable pull-up on RXD2 */
+ 
+ 	return 0;
+ }
+-- 
+1.5.6.3
+
diff --git a/board/calao/qil-a9260/linux-3.4.7.config b/board/calao/qil-a9260/linux-3.4.7.config
new file mode 100644
index 0000000000..105d76006a
--- /dev/null
+++ b/board/calao/qil-a9260/linux-3.4.7.config
@@ -0,0 +1,111 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_ARCH_AT91SAM9260=y
+CONFIG_MACH_QIL_A9260=y
+CONFIG_AT91_SLOW_CLOCK=y
+CONFIG_AT91_EARLY_USART0=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS1,115200"
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_MMC=y
+CONFIG_MMC_AT91=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_M41T94=y
+CONFIG_EXT2_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
diff --git a/board/calao/qil-a9260/linux-3.4.7.patch b/board/calao/qil-a9260/linux-3.4.7.patch
new file mode 100644
index 0000000000..5d355d23cc
--- /dev/null
+++ b/board/calao/qil-a9260/linux-3.4.7.patch
@@ -0,0 +1,27 @@
+From fe6432a9728b62bce3db73c5a4efe026018fd495 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Fri, 3 Aug 2012 16:45:37 +0200
+Subject: [PATCH] QIL-A9260: rtc modalias m41t48 renamed to rtc-m41t48
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ arch/arm/mach-at91/board-qil-a9260.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
+index bf351e2..c0df05c 100644
+--- a/arch/arm/mach-at91/board-qil-a9260.c
++++ b/arch/arm/mach-at91/board-qil-a9260.c
+@@ -78,7 +78,7 @@ static struct at91_udc_data __initdata ek_udc_data = {
+ static struct spi_board_info ek_spi_devices[] = {
+ #if defined(CONFIG_RTC_DRV_M41T94)
+ 	{	/* M41T94 RTC */
+-		.modalias	= "m41t94",
++		.modalias	= "rtc-m41t94",
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 1 * 1000 * 1000,
+ 		.bus_num	= 0,
+-- 
+1.5.6.3
+
diff --git a/configs/calao_qil_a9260_defconfig b/configs/calao_qil_a9260_defconfig
new file mode 100644
index 0000000000..f05e95c56e
--- /dev/null
+++ b/configs/calao_qil_a9260_defconfig
@@ -0,0 +1,17 @@
+BR2_arm=y
+BR2_arm926t=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
+BR2_PACKAGE_HOST_SAM_BA=y
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/qil-a9260/"
+BR2_TARGET_AT91BOOTSTRAP_BOARD="qil_a9260"
+BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/qil-a9260/"
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="qil_a9260"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="board/calao/qil-a9260/linux-3.4.7.patch"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/qil-a9260/linux-3.4.7.config"
+BR2_LINUX_KERNEL_ZIMAGE=y

From 42136fea75b123377df99189fc8c8871cd568584 Mon Sep 17 00:00:00 2001
From: Stefan Froberg <stefan.froberg@petroprogram.com>
Date: Sun, 12 Aug 2012 00:57:11 +0300
Subject: [PATCH 2525/6849] cairo: Add tee surface backend option (required by
 firefox)

Signed-off-by: Stefan Froberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cairo/Config.in | 3 +++
 package/cairo/cairo.mk  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 19c47231dd..398e47fb6c 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -32,4 +32,7 @@ config BR2_PACKAGE_CAIRO_SVG
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_CAIRO_PDF
 
+config BR2_PACKAGE_CAIRO_TEE
+	bool "tee support"
 endif
+
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 6b456dd89d..eedb28d0e4 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -77,4 +77,10 @@ else
 	CAIRO_CONF_OPT += --disable-svg
 endif
 
+ifeq ($(BR2_PACKAGE_CAIRO_TEE),y)
+	CAIRO_CONF_OPT += --enable-tee
+else
+	CAIRO_CONF_OPT += --disable-tee
+endif
+
 $(eval $(autotools-package))

From b96e11f0a1cd91256c6fede83030aa1369b4794a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:26 -0300
Subject: [PATCH 2526/6849] iptables: bump to version 1.4.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/iptables/iptables.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index a5ec6a7770..bdef575880 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,11 +4,13 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.14
+IPTABLES_VERSION = 1.4.15
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES
 IPTABLES_DEPENDENCIES = host-pkg-config
+IPTABLES_LICENSE = GPLv2
+IPTABLES_LICENSE_FILES = COPYING
 
 IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR)
 

From 5de5a65807de9ce230c6516eef00cf26876a1ee6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:27 -0300
Subject: [PATCH 2527/6849] conntrack-tools: bump to version 1.2.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/conntrack-tools/conntrack-tools.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 8f1159bdb0..6f438fc941 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-CONNTRACK_TOOLS_VERSION = 1.2.1
+CONNTRACK_TOOLS_VERSION = 1.2.2
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
 	libnetfilter_conntrack libnetfilter_cttimeout
+CONNTRACK_TOOLS_LICENSE = GPLv2
+CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 1bf148d6c7ac6c45e954a3b3c941903a5683df56 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:28 -0300
Subject: [PATCH 2528/6849] mpg123: bump to version 1.14.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/mpg123/mpg123.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index c3d2c9cce3..3576cb725a 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,11 +4,13 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.14.2
+MPG123_VERSION = 1.14.4
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
 MPG123_INSTALL_STAGING = YES
+MPG123_LICENSE = LGPLv2.1
+MPG123_LICENSE_FILES = COPYING
 
 MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)
 

From 9de6de21c2ea7b9ac4a135771ec6f85ee254ddb1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:29 -0300
Subject: [PATCH 2529/6849] mpd: bump to version 0.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/mpd/mpd.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 28bc4cbfd9..54a5ba7a76 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-MPD_VERSION = 0.16.8
+MPD_VERSION = 0.17
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 MPD_DEPENDENCIES = host-pkg-config libglib2
+MPD_LICENSE = GPLv2
+MPD_LICENSE_FILES = COPYING
 
 # Some options need an explicit --disable or --enable
 

From 03e3cd9572665c8332c2ace0cbc8b251983108ac Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:31 -0300
Subject: [PATCH 2530/6849] samba: bump to version 3.6.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 6b9a08260a..301a39fc0c 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.6
+SAMBA_VERSION = 3.6.7
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From a3a698de727b9747f4fd4b1495426b7fe4918af3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:32 -0300
Subject: [PATCH 2531/6849] ethtool: bump to version 3.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ethtool/ethtool.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 63a8d54810..30d0a47649 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,9 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.4.1
+ETHTOOL_VERSION = 3.5
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
+ETHTOOL_LICENSE = GPLv2
+ETHTOOL_LICENSE_FILE = COPYING
 
 $(eval $(autotools-package))

From 53824c97d3c4345912a99aa5a1227fce102868b7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 Aug 2012 19:27:33 -0300
Subject: [PATCH 2532/6849] e2fsprogs: bump to version 1.42.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 16725ac21c..16085210d6 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42.4
+E2FSPROGS_VERSION = 1.42.5
 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 
 E2FSPROGS_CONF_OPT = \

From 80cde682b1f3a794e173efd82a347d5bab658730 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sun, 12 Aug 2012 11:36:31 +1000
Subject: [PATCH 2533/6849] opkg: bump version to svn r635

It is recommended to use the most recent revision from subversion as it
contains various fixes.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/opkg/opkg.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index be67f8ebce..3ba61aea47 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -4,11 +4,13 @@
 #
 #############################################################
 
-OPKG_VERSION = 0.1.8
+OPKG_VERSION = 635
 OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
-OPKG_SITE = http://opkg.googlecode.com/files
+OPKG_SITE = http://opkg.googlecode.com/svn/trunk/
+OPKG_SITE_METHOD = svn
 OPKG_INSTALL_STAGING = YES
 OPKG_CONF_OPT = --disable-curl --disable-gpg
+OPKG_AUTORECONF = YES
 
 # Ensure directory for lockfile exists
 define OPKG_CREATE_LOCKDIR

From 1fc66acff88caf18e0649e5482a5a55eae633eee Mon Sep 17 00:00:00 2001
From: "J.C. Woltz" <jwoltz@gmail.com>
Date: Sat, 17 Mar 2012 21:30:34 -0400
Subject: [PATCH 2534/6849] usb_modeswitch: update to 1.2.4

This patch updates usb_modeswitch to version 1.2.4. The
usb_modeswitch.mk needed to be modified for usb_modeswitch to compile.
Also added extra remove section for the added help scripts and files.

[thomas.petazzoni@free-electrons.com:
  bumped further to 1.2.4 instead of 1.2.3, adjusted the patch accordingly
  use TARGET_CONFIGURE_OPTS instead of passing CC, LD manually
  add license information.]

Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../usb_modeswitch-makefile.patch             | 50 +++++++++++--------
 package/usb_modeswitch/usb_modeswitch.mk      | 23 ++++++---
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/package/usb_modeswitch/usb_modeswitch-makefile.patch b/package/usb_modeswitch/usb_modeswitch-makefile.patch
index 918200b61d..b79274179e 100644
--- a/package/usb_modeswitch/usb_modeswitch-makefile.patch
+++ b/package/usb_modeswitch/usb_modeswitch-makefile.patch
@@ -1,23 +1,31 @@
-diff -Nura usb-modeswitch-1.1.2.orig/Makefile usb-modeswitch-1.1.2/Makefile
---- usb-modeswitch-1.1.2.orig/Makefile	2010-04-17 15:27:11.000000000 -0300
-+++ usb-modeswitch-1.1.2/Makefile	2010-04-22 15:05:32.363471807 -0300
-@@ -1,6 +1,6 @@
- PROG        = usb_modeswitch
- VERS        = 1.1.2
--CC          = gcc
-+CC          ?= gcc
- CFLAGS      += -Wall -l usb
- RM          = /bin/rm -f
- OBJS        = usb_modeswitch.c
-@@ -23,8 +23,9 @@
- install: all
- 	install -d $(SBINDIR)
- 	install --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
--	install --mode=755 usb_modeswitch.tcl $(UDEVDIR)/usb_modeswitch
--	install --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
-+	#install --mode=755 usb_modeswitch.tcl $(UDEVDIR)/usb_modeswitch
-+	#install --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
-+	install -d $(MANDIR)
- 	install --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
+Removed the -s from the install command. Without this, usb_modeswitch would
+fail to install.
+
+Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -46,7 +46,7 @@
+ 	cd jim && $(MAKE) distclean
  
+ install-common: all
+-	install -D -s --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
++	install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
+ 	install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
+ 	install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
+ 	install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
+@@ -67,10 +67,10 @@
+ install: install-common install-script
  
+ install-shared: dispatcher-dynamic install-common
+-	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
++	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
+ 
+ install-static: dispatcher-static install-common
+-	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
++	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
+ 
+ uninstall:
+ 	$(RM) $(SBINDIR)/usb_modeswitch
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 5f20f30d85..c517991c3c 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -4,26 +4,33 @@
 #
 #############################################################
 
-USB_MODESWITCH_VERSION = 1.1.2
+USB_MODESWITCH_VERSION = 1.2.4
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb-compat
+USB_MODESWITCH_LICENSE = GPLv2+
+USB_MODESWITCH_LICENSE_FILES = COPYING
 
 define USB_MODESWITCH_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
 endef
 
 define USB_MODESWITCH_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
-	$(INSTALL) -D $(@D)/usb_modeswitch.setup -m 0644 \
-		$(TARGET_DIR)/etc/usb_modeswitch.setup
 endef
 
+
 define USB_MODESWITCH_CLEAN_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/usb_modeswitch
-	rm -f $(TARGET_DIR)/etc/usb_modeswitch.setup
-	rm -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) clean
 endef
 
-$(eval $(generic-package))
+define USB_MODESWITCH_UNINSTALL_CMDS
+	$(RM) -f $(TARGET_DIR)/usr/sbin/usb_modeswitch
+	$(RM) -f $(TARGET_DIR)/lib/udev/usb_modeswitch
+	$(RM) -f $(TARGET_DIR)/etc/usb_modeswitch.setup
+	$(RM) -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1
+	$(RM) -rf $(TARGET_DIR)/var/lib/usb_modeswitch
+	$(RM) -f $(TARGET_DIR)/usr/sbin/usb_modeswitch_dispatcher
+endef
 
+$(eval $(generic-package))

From 572ba0692c7a41b4e4b86009b9964e5045939fef Mon Sep 17 00:00:00 2001
From: "J.C. Woltz" <jwoltz@gmail.com>
Date: Sat, 17 Mar 2012 21:30:35 -0400
Subject: [PATCH 2535/6849] new package: usb_modeswitch_data

usb_modeswitch_data provides udev rules for usb VID/PID combinations to
switch usb deices from their default mode into a more useable mode. The
default mode usually is a cdrom with installation software that is of
little use in an embedded linux situation

Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/usb_modeswitch_data/Config.in         | 12 +++++++++
 .../usb_modeswitch_data-makefile.patch        | 27 +++++++++++++++++++
 .../usb_modeswitch_data.mk                    | 24 +++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 package/usb_modeswitch_data/Config.in
 create mode 100644 package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch
 create mode 100644 package/usb_modeswitch_data/usb_modeswitch_data.mk

diff --git a/package/Config.in b/package/Config.in
index 3a059173f4..3f46d3af0b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -239,6 +239,7 @@ source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
 source "package/unionfs/Config.in"
 source "package/usb_modeswitch/Config.in"
+source "package/usb_modeswitch_data/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
 source "package/wipe/Config.in"
diff --git a/package/usb_modeswitch_data/Config.in b/package/usb_modeswitch_data/Config.in
new file mode 100644
index 0000000000..8698bb606c
--- /dev/null
+++ b/package/usb_modeswitch_data/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_USB_MODESWITCH_DATA
+	bool "usb_modeswitch_data"
+	select BR2_PACKAGE_USB_MODESWITCH
+	# tcl is a runtime dependency
+	select BR2_PACKAGE_TCL
+	select BR2_PACKAGE_TCL_TCLSH
+	help
+	  USB mode switch data
+	  Contains udev rules and events to allow usb_modeswitch to
+	  function automatically
+
+	  http://www.draisberghof.de/usb_modeswitch/
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch b/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch
new file mode 100644
index 0000000000..769e514533
--- /dev/null
+++ b/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch
@@ -0,0 +1,27 @@
+Fixed Makefile install sections to not reload udev rules. In a 
+cross-compiler environment, it is not wanted to reload the host udev rules.
+
+Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
+--- usb_modeswitch_data-20120120.orig/Makefile	2012-01-20 17:25:32.000000000 -0500
++++ usb_modeswitch_data-20120120/Makefile	2012-02-06 14:20:47.000000000 -0500
+@@ -12,9 +12,9 @@
+ 
+ clean:
+ 
+-install: files-install db-install rules-reload
++install: files-install db-install
+ 
+-install-packed: files-install db-install-packed rules-reload
++install-packed: files-install db-install-packed
+ 
+ files-install:
+ 	install -d $(PREFIX)/share/usb_modeswitch
+@@ -50,7 +50,7 @@
+ 		fi \
+ 	fi
+ 
+-uninstall: files-uninstall rules-reload
++uninstall: files-uninstall
+ 
+ files-uninstall:
+ 	$(RM) $(RULESDIR)/40-usb_modeswitch.rules
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
new file mode 100644
index 0000000000..d493144aed
--- /dev/null
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# usb_modeswitch_data
+#
+#############################################################
+
+USB_MODESWITCH_DATA_VERSION = 20120812
+USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
+USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
+USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch
+USB_MODESWITCH_DATA_LICENSE = GPLv2+
+USB_MODESWITCH_DATA_LICENSE_FILES = COPYING
+
+# Nothing to build, it is a pure data package
+
+define USB_MODESWITCH_DATA_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define USB_MODESWITCH_DATA_CLEAN_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) clean
+endef
+
+$(eval $(generic-package))

From cbe5b5b7cbb9e6acb6c4984bb5d9a5fe14b73032 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 12 Aug 2012 19:25:08 +0200
Subject: [PATCH 2536/6849] usb_modeswitch_data: add patch to fix parallel
 installation

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...b_modeswitch_data-fix-parallel-install.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch

diff --git a/package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch b/package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch
new file mode 100644
index 0000000000..ba30499569
--- /dev/null
+++ b/package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch
@@ -0,0 +1,17 @@
+Properly create the directory before creating it so that parallel
+install work fine.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -22,6 +22,7 @@
+ 	install -D --mode=644 40-usb_modeswitch.rules $(RULESDIR)/40-usb_modeswitch.rules
+ 
+ db-install:
++	install -d $(PREFIX)/share/usb_modeswitch
+ 	install --mode=644 -t $(PREFIX)/share/usb_modeswitch ./usb_modeswitch.d/*
+ 
+ db-install-packed:

From 9d9f7feba4ffbfeb54479f1ad90d47acca1a6f0b Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Wed, 21 Mar 2012 00:16:57 +0100
Subject: [PATCH 2537/6849] new package: gsl the GNU Scientific Library.

[thomas.petazzoni@free-electrons.com:
 renamed package to 'gsl' to match upstream name.
 added license information.]

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in     |  1 +
 package/gsl/Config.in | 10 ++++++++++
 package/gsl/gsl.mk    | 13 +++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/gsl/Config.in
 create mode 100644 package/gsl/gsl.mk

diff --git a/package/Config.in b/package/Config.in
index 3f46d3af0b..d6a66fd311 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -457,6 +457,7 @@ source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/libev/Config.in"
 source "package/libffi/Config.in"
+source "package/gsl/Config.in"
 source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
diff --git a/package/gsl/Config.in b/package/gsl/Config.in
new file mode 100644
index 0000000000..92541da713
--- /dev/null
+++ b/package/gsl/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_GSL
+	bool "gsl"
+	help
+	  The GNU Scientific Library (GSL) is a numerical library for
+	  C and C++ programmers.  The library provides a wide range of
+	  mathematical routines such as random number generators,
+	  special functions and least-squares fitting. There are over
+	  1000 functions in total with an extensive test suite.
+
+ 	  http://www.gnu.org/software/gsl
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
new file mode 100644
index 0000000000..71968590a6
--- /dev/null
+++ b/package/gsl/gsl.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# gnu gsl
+#
+#############################################################
+GSL_VERSION = 1.15
+GSL_SOURCE = gsl-$(GSL_VERSION).tar.gz
+GSL_SITE = $(BR2_GNU_MIRROR)/gsl
+GSL_INSTALL_STAGING = YES
+GSL_LICENSE = GPLv3
+GSL_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From a293d4ab338c84f450261371085cef1cf69bcf96 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 12 Aug 2012 22:27:07 +0200
Subject: [PATCH 2538/6849] support/graph-depends: fix out-of-tree usage

graph-depends calls make to get the list of packages, and the
dependencies of each package.

When called out-of-tree, the Makefile is a wrapper that calls
the real Makefile, so make will spit out a line like:
  make -C /path/to/buildroot O=/path/to/build-dir show-targets

which graph-depends wrongly believes is part of the target list.

Be silent when calling make, as we really only want the target
and dependency lists.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/scripts/graph-depends | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index da050da8ab..409c123017 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -53,7 +53,7 @@ unknownpkgs = []
 # list is used as the starting point for full dependency graphs
 def get_targets():
     sys.stderr.write("Getting targets\n")
-    cmd = ["make", "show-targets"]
+    cmd = ["make", "-s", "show-targets"]
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     output = p.communicate()[0].strip()
     if p.returncode != 0:
@@ -67,7 +67,7 @@ def get_targets():
 # formatted as a Python list.
 def get_depends(pkg):
     sys.stderr.write("Getting dependencies for %s\n" % pkg)
-    cmd = ["make", "%s-show-depends" % pkg]
+    cmd = ["make", "-s", "%s-show-depends" % pkg]
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     output = p.communicate()[0].strip()
     if p.returncode != 0:

From 6ba785ca6cb49750ebef3c3673395da39e435167 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:11 -0400
Subject: [PATCH 2539/6849] avahi: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/avahi/avahi.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index d9c0d1dbb0..a26481d4eb 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -13,6 +13,8 @@
 AVAHI_VERSION = 0.6.31
 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
+AVAHI_LICENSE = LGPLv2.1+
+AVAHI_LICENSE_FILES = LICENSE
 AVAHI_INSTALL_STAGING = YES
 
 AVAHI_CONF_ENV = ac_cv_func_strtod=yes \

From 3a887b7eb85d32b651d2c028c75a06e41a0df8e9 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:12 -0400
Subject: [PATCH 2540/6849] busybox: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/busybox/busybox.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 17ee50a8fd..33f8633648 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -12,6 +12,9 @@ BUSYBOX_VERSION = $(call qstrip,$(BR2_BUSYBOX_VERSION))
 BUSYBOX_SITE = http://www.busybox.net/downloads
 endif
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
+BUSYBOX_LICENSE = GPLv2
+BUSYBOX_LICENSE_FILES = LICENSE
+
 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
 # Allows the build system to tweak CFLAGS
 BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include"

From 52a46f8330a18213e113423e9e4fc726e01a86a4 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:13 -0400
Subject: [PATCH 2541/6849] libfcgi: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libfcgi/libfcgi.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk
index 1aa2c5a41c..a4d18a4092 100644
--- a/package/libfcgi/libfcgi.mk
+++ b/package/libfcgi/libfcgi.mk
@@ -6,6 +6,8 @@
 LIBFCGI_VERSION = 2.4.0
 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
 LIBFCGI_SITE = http://www.fastcgi.com/dist
+LIBFCGI_LICENSE = fcgi license
+LIBFCGI_LICENSE_FILES = LICENSE.TERMS
 LIBFCGI_INSTALL_STAGING = YES
 LIBFCGI_AUTORECONF = YES
 

From dc2a7bc8193f26368d2f2357fd8d57d952f0931b Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:14 -0400
Subject: [PATCH 2542/6849] ifplugd: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ifplugd/ifplugd.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 3c581a6b11..1e11c1455d 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -6,7 +6,10 @@
 
 IFPLUGD_VERSION = 0.28
 IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
+IFPLUGD_LICENSE = GPLv2
+IFPLUGD_LICENSE_FILES = LICENSE
 IFPLUGD_AUTORECONF = YES
+
 # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
 IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
 IFPLUGD_CONF_OPT = --disable-lynx

From 813c785853a64b767c0b9351b91c64e97d328779 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:15 -0400
Subject: [PATCH 2543/6849] libcgicc: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libcgicc/libcgicc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 98b8e5f51f..80e921368a 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -6,6 +6,7 @@
 LIBCGICC_VERSION=3.2.9
 LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc
 LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
+LIBCGICC_LICENSE=LGPLv3+
 LIBCGICC_INSTALL_STAGING=YES
 LIBCGICC_AUTORECONF=YES
 

From a3934772891113c9584827f92ad7684bd52732d4 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:16 -0400
Subject: [PATCH 2544/6849] libcurl: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libcurl/libcurl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index d6882fd45a..090bb4c409 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -7,6 +7,8 @@
 LIBCURL_VERSION = 7.25.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
+LIBCURL_LICENSE = ICS
+LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
 LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
 

From 972c8d134782458d67efedd2479eb4301f1544fb Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:17 -0400
Subject: [PATCH 2545/6849] libdaemon: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libdaemon/libdaemon.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 1bdc1e27b1..214402aed9 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -6,6 +6,8 @@
 
 LIBDAEMON_VERSION = 0.14
 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon
+LIBDAEMON_LICENSE = LGPLv2.1+
+LIBDAEMON_LICENSE_FILES = LICENSE
 LIBDAEMON_INSTALL_STAGING = YES
 LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
 LIBDAEMON_CONF_OPT = --disable-lynx

From 194f47baa76983c9fe3f4d0fc9a7cc6ad0598429 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:18 -0400
Subject: [PATCH 2546/6849] libdnet: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libdnet/libdnet.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index e622dd4683..f6daffdb1b 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -7,6 +7,8 @@
 LIBDNET_VERSION = 1.11
 LIBDNET_SOURCE = libdnet-$(LIBDNET_VERSION).tar.gz
 LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdnet/
+LIBDNET_LICENSE = BSD-3c
+LIBDNET_LICENSE_FILES = LICENSE
 LIBDNET_INSTALL_STAGING = YES
 LIBDNET_AUTORECONF = YES
 LIBDNET_CONF_OPT = \

From ad9bab7ae3e84e5216ac753eefe93c1d34c7c979 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:19 -0400
Subject: [PATCH 2547/6849] libgpg-error: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgpg-error/libgpg-error.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 96cbbd6aca..288165bad2 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -6,6 +6,8 @@
 
 LIBGPG_ERROR_VERSION = 1.10
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
+LIBGPG_ERROR_LICENSE = LGPLv2.1+
+LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB
 LIBGPG_ERROR_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 71438633767e30b5126867aab8170776bc31119e Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:20 -0400
Subject: [PATCH 2548/6849] libpcap: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libpcap/libpcap.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 1d1fbc158a..04766eacdb 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -6,7 +6,10 @@
 
 LIBPCAP_VERSION = 1.3.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
+LIBPCAP_LICENSE = BSD-3c
+LIBPCAP_LICENSE_FILES = LICENSE
 LIBPCAP_INSTALL_STAGING = YES
+
 # doesn't have an install-strip
 LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
 	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)

From 7228355905d953ff550a4d9964f2cb8a0e1b400e Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:10:21 -0400
Subject: [PATCH 2549/6849] libpng: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libpng/libpng.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 6edabc4e5c..1c1a087bfc 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -8,6 +8,8 @@ LIBPNG_VERSION = 1.4.12
 LIBPNG_SERIES = 14
 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_LICENSE = libpng license
+LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkg-config zlib
 

From a9d5c6df9add50c235fb85aefc823c374f40f3d8 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:12:41 -0400
Subject: [PATCH 2550/6849] lighttpd: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lighttpd/lighttpd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index c9decb1855..4bad5bae80 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -6,6 +6,8 @@
 
 LIGHTTPD_VERSION = 1.4.31
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
+LIGHTTPD_LICENSE = BSD-3c
+LIGHTTPD_LICENSE_FILES = COPYING
 LIGHTTPD_DEPENDENCIES = host-pkg-config
 LIGHTTPD_CONF_OPT = \
 	--libdir=/usr/lib/lighttpd \

From 2760bec7ae5288495ee4ea28bd4ce5a17ffe30e4 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:12:52 -0400
Subject: [PATCH 2551/6849] mtd: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/mtd/mtd.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 9b60ac8718..7e3a9b8866 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -6,6 +6,9 @@
 MTD_VERSION = 1.5.0
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
+MTD_LICENSE = GPLv2
+MTD_LICENSE_FILES = COPYING
+
 ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 MTD_DEPENDENCIES = zlib lzo
 endif

From 9e6ab3600f009cd6d1d7ab79cf39f5dbbefbea13 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:13:02 -0400
Subject: [PATCH 2552/6849] openssl: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/openssl/openssl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index f9816afafb..4ae65b1230 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -6,6 +6,8 @@
 
 OPENSSL_VERSION = 1.0.0j
 OPENSSL_SITE = http://www.openssl.org/source
+OPENSSL_LICENSE = OpenSSL or SSLeay
+OPENSSL_LICENSE_FILES = LICENSE
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
 OPENSSL_TARGET_ARCH = generic32

From 7561116a77d654b56b4dbac815e6eb86c771f032 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:13:12 -0400
Subject: [PATCH 2553/6849] psmisc: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/psmisc/psmisc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index a70f0719a1..cd381e508b 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -6,6 +6,8 @@
 
 PSMISC_VERSION = 22.16
 PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/psmisc/psmisc
+PSMISC_LICENSE = GPLv2
+PSMISC_LICENSE_FILES = COPYING
 PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)

From b27921a809a395ee21ba88c7e87de2133ffc0ac6 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:13:24 -0400
Subject: [PATCH 2554/6849] socat: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/socat/socat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 9a5234ddda..f10a83688e 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -7,6 +7,8 @@
 SOCAT_VERSION = 2.0.0-b5
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
+SOCAT_LICENSE = GPLv2
+SOCAT_LICENSE_FILES = COPYING
 SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
 		 sc_cv_sys_crdly_shift=9 \
 		 sc_cv_sys_tabdly_shift=11 \

From f40f70d148f0897ae9d05558d91c6d10bf61f95d Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 11 Aug 2012 16:13:35 -0400
Subject: [PATCH 2555/6849] spawn-fcgi: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/spawn-fcgi/spawn-fcgi.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index 9014d210b0..7c234217f0 100644
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -7,6 +7,8 @@
 SPAWN_FCGI_VERSION = 1.6.3
 SPAWN_FCGI_SITE = http://www.lighttpd.net/download
 SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2
+SPAWN_FCGI_LICENSE = BSD-3c
+SPAWN_FCGI_LICENSE_FILES = COPYING
 
 ifneq ($(BR2_INET_IPV6),y)
 SPAWN_FCGI_CONF_OPT = --disable-ipv6

From e21517689de5e1f56dc2aa788a4aa84f89c54c8b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 Aug 2012 16:15:18 -0300
Subject: [PATCH 2556/6849] imagemagick: security bump to version 6.7.8-8

Fixes CVE-2012-3437, CVE-2012-3437 and CVE-2012-3438.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/imagemagick/imagemagick.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index ede129a02b..6d34ad388d 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-IMAGEMAGICK_MAJOR = 6.7.6
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-9
+IMAGEMAGICK_MAJOR = 6.7.8
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
 # The official ImageMagick site only keeps the latest versions
 # available, which is annoying. Use an alternate site that keeps all

From b58c83ae999966975c278c860cb97aee0d2e8e08 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 15 Aug 2012 12:11:48 +0200
Subject: [PATCH 2557/6849] Update for 2012.08-rc2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES            | 18 ++++++++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index fb5160de3f..5bc79be138 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,21 @@
+2012.08-rc2, Released August 15th, 2012
+
+	Updated/fixed packages: imagemagick, sudo, crosstool-ng.
+
+	Added license informations for: mxml, nanocom, empty, expat,
+	lua, lucjson, xinetd, cjson, luaexpat, lmbench, bwm-ng,
+	input-event-daemon, luajit, cgilua, copas, coxpcall,
+	luafilesystem, luasocket, rings, wsapi, xavante, libtpl,
+	avahi, busybox, libfcgi, ifplugd, libcgicc, libcurl,
+	libdaemon, libdnet, libgpg-error, libpcap, libpng, lighttpd,
+	mtd, openssl, psmisc, socat, spawn-fcgi.
+
+	Fixes to Microblaze external toolchains
+	configuration. Improvements of the pkg-stats
+	script. Out-of-tree fix for the graph-depends script.
+
+	Kernel headers version bump.
+
 2012.08-rc1, Released August 1st, 2012
 
 	Fixes all over the tree and new features.
diff --git a/Makefile b/Makefile
index 079af65e89..9ab7d99d7d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.08-rc1
+export BR2_VERSION:=2012.08-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index c00a35663e..73798637eb 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,12 +13,12 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>.
 <p>
-The latest release candidate is <b>2012.08-rc1</b>, which can be
+The latest release candidate is <b>2012.08-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.08-rc1.tar.gz">buildroot-2012.08-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2012.08-rc2.tar.gz">buildroot-2012.08-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.08-rc1.tar.bz2">buildroot-2012.08-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.08-rc2.tar.bz2">buildroot-2012.08-rc2.tar.bz2</a>.
 <p>
 -->
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 4114b03b5d..e519c312ae 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+   <li><b>15 August 2012 -- 2012.08-rc2 released</b>
+
+     <p>We have a new release candidate! Various fixes, and addition
+     of licensing informations on many
+     packages. See <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08_rc2">CHANGES</a>
+     file for details</p>
+
+     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+     <a href="/downloads/buildroot-2012.08-rc2.tar.bz2">2012.08-rc2
+     release candidate</a>, and report any problems found to the <a
+     href="lists.html">mailing list</a> or <a
+     href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
    <li><b>1 August 2012 -- 2012.08-rc1 released</b>
 
      <p>We have a new release candidate! Lots of changes all over the

From 0c801c99dcf2f84f642a27a11b9d2458106d4afc Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 15 Aug 2012 16:38:23 +0200
Subject: [PATCH 2558/6849] microperl: add license info

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/microperl/microperl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index fbf319c569..b2a912a094 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -7,6 +7,8 @@
 MICROPERL_VERSION = 5.12.4
 MICROPERL_SITE = http://www.cpan.org/src/5.0
 MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2
+MICROPERL_LICENSE = Artistic
+MICROPERL_LICENSE_FILES = Artistic
 MICROPERL_DEPENDENCIES = host-microperl
 MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION)
 MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(GNU_TARGET_NAME)

From fa9d3d758353f558dbc4f983f62ebbfb9728656e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:35 -0300
Subject: [PATCH 2559/6849] samba: add license info and smbta-util option

Add license info and the smbta-util config knob.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/samba/Config.in | 7 +++++++
 package/samba/samba.mk  | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index e88b3609f9..928b40bd39 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -168,6 +168,13 @@ config BR2_PACKAGE_SAMBA_SWAT
 	help
 	  Samba Web Administration Tool
 
+config BR2_PACKAGE_SAMBA_SMBTA_UTIL
+	bool "smbta-util"
+	default y
+	help
+	  Tool to ease the configuration of the vfs_smb_traffic_analyzer
+	  module regarding data encryption.
+
 config BR2_PACKAGE_SAMBA_SMBTAR
 	bool "smbtar"
 	default y
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 301a39fc0c..75e31735bc 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -8,6 +8,8 @@ SAMBA_VERSION = 3.6.7
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES
+SAMBA_LICENSE = GPLv3+
+SAMBA_LICENSE_FILES = COPYING
 
 SAMBA_DEPENDENCIES = popt \
 	$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \
@@ -104,6 +106,7 @@ SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBSHARESEC) += usr/bin/sharesec
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus
+SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBTA_UTIL) += usr/bin/smbta-util
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup

From 839546dd3aaff56f26536ea7373978e32563c473 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:36 -0300
Subject: [PATCH 2560/6849] cifs-utils: bump to version 5.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cifs-utils/cifs-utils.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index e2530c0a0b..cfa2b910bb 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,6 +1,8 @@
-CIFS_UTILS_VERSION = 5.5
+CIFS_UTILS_VERSION = 5.6
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
+CIFS_UTILS_LICENSE = GPLv3
+CIFS_UTILS_LICENSE_FILES = COPYING
 
 define CIFS_UTILS_NO_WERROR
 	$(SED) 's/-Werror//' $(@D)/Makefile.in

From 4d74cff9b88509bb11c5ad44bd2b3f870c821273 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 17 Aug 2012 17:47:40 +0200
Subject: [PATCH 2561/6849] gsl: fix space instead of tab in Config.in

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gsl/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gsl/Config.in b/package/gsl/Config.in
index 92541da713..aa431d1f2d 100644
--- a/package/gsl/Config.in
+++ b/package/gsl/Config.in
@@ -7,4 +7,4 @@ config BR2_PACKAGE_GSL
 	  special functions and least-squares fitting. There are over
 	  1000 functions in total with an extensive test suite.
 
- 	  http://www.gnu.org/software/gsl
+	  http://www.gnu.org/software/gsl

From 4848a32e374496e6404b82420b0db232c208b2e3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:37 -0300
Subject: [PATCH 2562/6849] iw: bump to version 3.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index bf235205be..9c680936c1 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.5
+IW_VERSION = 3.6
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From 47a3fa7b593adb77c2f9f1a4b1608ac2ce2af6d8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:38 -0300
Subject: [PATCH 2563/6849] smartmontools: bump to version 5.43

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/smartmontools/smartmontools.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index a6873f020f..3c573f84e9 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,7 +4,9 @@
 #
 #############################################################
 
-SMARTMONTOOLS_VERSION = 5.42
+SMARTMONTOOLS_VERSION = 5.43
 SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
+SMARTMONTOOLS_LICENSE = GPLv2+
+SMARTMONTOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 7a3d7601fb96997ffe507f0f81ec0581a2f010ef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:39 -0300
Subject: [PATCH 2564/6849] iproute2: bump to version 3.5.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/iproute2/iproute2.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 27bc56f302..c671e44c94 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 3.4.0
+IPROUTE2_VERSION = 3.5.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
+IPROUTE2_LICENSE = GPLv2
+IPROUTE2_LICENSE_FILES = COPYING
 
 # If both iproute2 and busybox are selected, make certain we win
 # the fight over who gets to have their utils actually installed.

From 4365fb7f31d6d7901a908667f1ea64ee1d0e67d1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:40 -0300
Subject: [PATCH 2565/6849] libfuse: bump to version 2.9.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libfuse/libfuse.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 5f748b4d55..8be3456771 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-LIBFUSE_VERSION = 2.9.0
+LIBFUSE_VERSION = 2.9.1
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
+LIBFUSE_LICENSE = GPLv2 LGPLv2.1
+LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
 
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_CONF_OPT= --disable-nls \

From e2701041d69608629631231da6f88e0e662a4272 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 17:02:41 -0300
Subject: [PATCH 2566/6849] mpd: bump to version 0.17.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 54a5ba7a76..bf4610e1c0 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.17
+MPD_VERSION = 0.17.1
 MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 MPD_DEPENDENCIES = host-pkg-config libglib2
 MPD_LICENSE = GPLv2

From b18ed921d6d203ea22d64015c46ea2c857459ad6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 15:55:49 -0300
Subject: [PATCH 2567/6849] linux: bump default to kernel version 3.4.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9c63215c19..030634853a 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_4
 
 config BR2_LINUX_KERNEL_3_4
-	bool "3.4.7"
+	bool "3.4.8"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.7" if BR2_LINUX_KERNEL_3_4
+	default "3.4.8" if BR2_LINUX_KERNEL_3_4
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From ca0d69c61cce256e0a6abd144cea4a2e26c46df8 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 17 Aug 2012 09:36:23 +0100
Subject: [PATCH 2568/6849] at91bootstrap3: new package

Note that this new package, at91bootstrap3, is being added alongside the
existing at91bootstrap. This was suggested by Thomas Petazzoni, whose
comments on the mailing list are quoted below.

  For this package, I am not sure we can do a simple version bump. Since
  there is (was?) no upstream for AT91Bootstrap 1.x, many
  vendors/companies had to maintain their patches on top of AT91Bootstrap
  1.x. See for example
  board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch. Therefore,
  removing AT91Bootstrap 1.x from the tree will prevent those platforms
  to work. I know people should upgrade, but AT91Bootstrap 3.x is quite
  significantly different, so the porting effort is not that simple.

  Therefore, I'm wondering whether we should kee at91bootstrap as it is,
  and create a separate package at91bootstrap3 for the 3.x generation.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/Config.in                                |   1 +
 boot/at91bootstrap3/Config.in                 |  53 ++
 ...at91bootstrap3-u-boot-relocation-fix.patch | 747 ++++++++++++++++++
 boot/at91bootstrap3/at91bootstrap3.mk         |  67 ++
 4 files changed, 868 insertions(+)
 create mode 100644 boot/at91bootstrap3/Config.in
 create mode 100644 boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch
 create mode 100644 boot/at91bootstrap3/at91bootstrap3.mk

diff --git a/boot/Config.in b/boot/Config.in
index 5252a49a2a..a55139be13 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -1,6 +1,7 @@
 menu "Bootloaders"
 
 source "boot/at91bootstrap/Config.in"
+source "boot/at91bootstrap3/Config.in"
 source "boot/at91dataflashboot/Config.in"
 source "boot/barebox/Config.in"
 source "boot/grub/Config.in"
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
new file mode 100644
index 0000000000..110f808d6c
--- /dev/null
+++ b/boot/at91bootstrap3/Config.in
@@ -0,0 +1,53 @@
+config BR2_TARGET_AT91BOOTSTRAP3
+	depends on BR2_arm926t
+	bool "AT91 Bootstrap 3"
+	help
+	  AT91Bootstrap is a first level bootloader for the Atmel AT91
+	  devices. It integrates algorithms for:
+	  - Device initialization such as clock configuration, PIO settings...
+	  - Peripheral drivers such as PIO, PMC or SDRAMC...
+	  - Physical media algorithm such as DataFlash, NandFlash, NOR Flash...
+
+if BR2_TARGET_AT91BOOTSTRAP3
+
+config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR
+	string "custom patch dir"
+	help
+	  If your board requires custom patches, add the path to the
+	  directory containing the patches here. The patches must be
+	  named at91bootstrap3-<something>.patch.
+
+	  Most users may leave this empty
+
+#
+# Configuration selection
+#
+
+choice
+	prompt "AT91 Bootstrap 3 configuration"
+	default BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG
+
+config BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG
+	bool "Using a defconfig"
+
+config BR2_TARGET_AT91BOOTSTRAP3_USE_CUSTOM_CONFIG
+	bool "Using a custom config file"
+
+endchoice
+
+config BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG
+	string "Defconfig name"
+	depends on BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG
+	help
+	  Name of the at91bootstrap3 defconfig file to use, without the
+	  trailing _defconfig.  The defconfig is located at
+	  board/<processor>/<board>_defconfig in the at91bootstrap3
+	  tree.
+
+config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE
+	string "Configuration file path"
+	depends on BR2_TARGET_AT91BOOTSTRAP3_USE_CUSTOM_CONFIG
+	help
+	  Path to the at91bootstrap3 configuration file
+
+endif # BR2_TARGET_AT91BOOTSTRAP3
diff --git a/boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch b/boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch
new file mode 100644
index 0000000000..62bbd2ab25
--- /dev/null
+++ b/boot/at91bootstrap3/at91bootstrap3-u-boot-relocation-fix.patch
@@ -0,0 +1,747 @@
+Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because
+of the relocation changes.
+
+We have to get JUMP_ADDR consistent with what is used by u-boot
+(CONFIG_SYS_TEXT_BASE).
+
+I also chose to "repartition" the dataflash. u-boot is now living at
+0x4000, letting 16kB for the bootstrap. We also have to increase the
+IMG_SIZE as u-boot as grown larger than the default value.
+As requested on the u-boot ML, we assume that it could be up to 512kB
+big.
+
+It means that now, you have to flash your kernel at 0x0008C000 instead
+of 0x00042000. And so you also have to load it from that address from
+u-boot.
+
+Then, remember that you could decrease IMG_SIZE to boot faster.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/board/afeb9260/afeb9260_defconfig b/board/afeb9260/afeb9260_defconfig
+--- a/board/afeb9260/afeb9260_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/afeb9260/afeb9260_defconfig	2012-07-25 20:52:17.967694276 +0100
+@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+ # CONFIG_DEBUG is not set
+diff -Nurp a/board/at91cap9adk/at91cap9adk_defconfig b/board/at91cap9adk/at91cap9adk_defconfig
+--- a/board/at91cap9adk/at91cap9adk_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91cap9adk/at91cap9adk_defconfig	2012-07-25 20:52:30.603693814 +0100
+@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91cap9adk/at91cap9df_defconfig b/board/at91cap9adk/at91cap9df_defconfig
+--- a/board/at91cap9adk/at91cap9df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91cap9adk/at91cap9df_defconfig	2012-07-25 20:52:23.807694041 +0100
+@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91cap9adk/at91cap9f_defconfig b/board/at91cap9adk/at91cap9f_defconfig
+--- a/board/at91cap9adk/at91cap9f_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91cap9adk/at91cap9f_defconfig	2012-07-25 21:25:20.839605245 +0100
+@@ -72,7 +72,7 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+ CONFIG_IMG_ADDRESS="0x00008000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91cap9stk/at91cap9stk_defconfig b/board/at91cap9stk/at91cap9stk_defconfig
+--- a/board/at91cap9stk/at91cap9stk_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91cap9stk/at91cap9stk_defconfig	2012-07-25 20:52:59.663692456 +0100
+@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91cap9stk/at91cap9stkdf_defconfig b/board/at91cap9stk/at91cap9stkdf_defconfig
+--- a/board/at91cap9stk/at91cap9stkdf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91cap9stk/at91cap9stkdf_defconfig	2012-07-25 20:52:52.255692671 +0100
+@@ -96,8 +96,8 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91cap9stk/at91cap9stkf_defconfig b/board/at91cap9stk/at91cap9stkf_defconfig
+--- a/board/at91cap9stk/at91cap9stkf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91cap9stk/at91cap9stkf_defconfig	2012-07-25 21:25:35.235605140 +0100
+@@ -72,7 +72,7 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+ CONFIG_IMG_ADDRESS="0x00008000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9260ek/at91sam9260dfc_defconfig b/board/at91sam9260ek/at91sam9260dfc_defconfig
+--- a/board/at91sam9260ek/at91sam9260dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9260ek/at91sam9260dfc_defconfig	2012-07-25 20:35:23.259739521 +0100
+@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+ # CONFIG_DEBUG is not set
+diff -Nurp a/board/at91sam9260ek/at91sam9260df_defconfig b/board/at91sam9260ek/at91sam9260df_defconfig
+--- a/board/at91sam9260ek/at91sam9260df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9260ek/at91sam9260df_defconfig	2012-07-25 20:34:19.231742964 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ # CONFIG_DEBUG is not set
+diff -Nurp a/board/at91sam9260ek/at91sam9260ek_defconfig b/board/at91sam9260ek/at91sam9260ek_defconfig
+--- a/board/at91sam9260ek/at91sam9260ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9260ek/at91sam9260ek_defconfig	2012-07-25 20:32:17.711747794 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ # CONFIG_DEBUG is not set
+diff -Nurp a/board/at91sam9260ek/at91sam9260nf_defconfig b/board/at91sam9260ek/at91sam9260nf_defconfig
+--- a/board/at91sam9260ek/at91sam9260nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9260ek/at91sam9260nf_defconfig	2012-07-25 21:25:57.079604719 +0100
+@@ -87,8 +87,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ # CONFIG_DEBUG is not set
+diff -Nurp a/board/at91sam9261ek/at91sam9261dfc_defconfig b/board/at91sam9261ek/at91sam9261dfc_defconfig
+--- a/board/at91sam9261ek/at91sam9261dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9261ek/at91sam9261dfc_defconfig	2012-07-25 20:37:07.515735228 +0100
+@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9261ek/at91sam9261df_defconfig b/board/at91sam9261ek/at91sam9261df_defconfig
+--- a/board/at91sam9261ek/at91sam9261df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9261ek/at91sam9261df_defconfig	2012-07-25 20:36:44.351735615 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9261ek/at91sam9261ek_defconfig b/board/at91sam9261ek/at91sam9261ek_defconfig
+--- a/board/at91sam9261ek/at91sam9261ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9261ek/at91sam9261ek_defconfig	2012-07-25 20:36:09.111737459 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9261ek/at91sam9261nf_defconfig b/board/at91sam9261ek/at91sam9261nf_defconfig
+--- a/board/at91sam9261ek/at91sam9261nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9261ek/at91sam9261nf_defconfig	2012-07-25 21:24:45.843607437 +0100
+@@ -86,8 +86,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9263ek/at91sam9263dfc_defconfig b/board/at91sam9263ek/at91sam9263dfc_defconfig
+--- a/board/at91sam9263ek/at91sam9263dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9263ek/at91sam9263dfc_defconfig	2012-07-25 20:38:55.555730059 +0100
+@@ -100,9 +100,9 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9263ek/at91sam9263df_defconfig b/board/at91sam9263ek/at91sam9263df_defconfig
+--- a/board/at91sam9263ek/at91sam9263df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9263ek/at91sam9263df_defconfig	2012-07-25 20:38:37.395730195 +0100
+@@ -105,11 +105,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x2006b000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9263ek/at91sam9263ek_defconfig b/board/at91sam9263ek/at91sam9263ek_defconfig
+--- a/board/at91sam9263ek/at91sam9263ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9263ek/at91sam9263ek_defconfig	2012-07-25 20:38:08.379732395 +0100
+@@ -105,11 +105,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x2006b000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9263ek/at91sam9263nf_defconfig b/board/at91sam9263ek/at91sam9263nf_defconfig
+--- a/board/at91sam9263ek/at91sam9263nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9263ek/at91sam9263nf_defconfig	2012-07-25 21:25:39.195605069 +0100
+@@ -89,8 +89,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x2006b000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g10ek/at91sam9g10df_defconfig b/board/at91sam9g10ek/at91sam9g10df_defconfig
+--- a/board/at91sam9g10ek/at91sam9g10df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g10ek/at91sam9g10df_defconfig	2012-07-25 20:40:18.087726292 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20068000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g10ek/at91sam9g10ek_defconfig b/board/at91sam9g10ek/at91sam9g10ek_defconfig
+--- a/board/at91sam9g10ek/at91sam9g10ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g10ek/at91sam9g10ek_defconfig	2012-07-25 20:39:53.543727636 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20068000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g10ek/at91sam9g10nf_defconfig b/board/at91sam9g10ek/at91sam9g10nf_defconfig
+--- a/board/at91sam9g10ek/at91sam9g10nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g10ek/at91sam9g10nf_defconfig	2012-07-25 21:25:28.975605503 +0100
+@@ -86,8 +86,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20068000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g20ek/at91sam9g20dfc_defconfig b/board/at91sam9g20ek/at91sam9g20dfc_defconfig
+--- a/board/at91sam9g20ek/at91sam9g20dfc_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g20ek/at91sam9g20dfc_defconfig	2012-07-25 20:41:48.275722343 +0100
+@@ -97,9 +97,9 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g20ek/at91sam9g20df_defconfig b/board/at91sam9g20ek/at91sam9g20df_defconfig
+--- a/board/at91sam9g20ek/at91sam9g20df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g20ek/at91sam9g20df_defconfig	2012-07-25 20:42:07.091721310 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g20ek/at91sam9g20ek_defconfig b/board/at91sam9g20ek/at91sam9g20ek_defconfig
+--- a/board/at91sam9g20ek/at91sam9g20ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g20ek/at91sam9g20ek_defconfig	2012-07-25 20:41:23.179723541 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g20ek/at91sam9g20nf_defconfig b/board/at91sam9g20ek/at91sam9g20nf_defconfig
+--- a/board/at91sam9g20ek/at91sam9g20nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g20ek/at91sam9g20nf_defconfig	2012-07-25 21:25:49.291603975 +0100
+@@ -87,8 +87,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x20058000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9g45ek/at91sam9g45df_defconfig b/board/at91sam9g45ek/at91sam9g45df_defconfig
+--- a/board/at91sam9g45ek/at91sam9g45df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g45ek/at91sam9g45df_defconfig	2012-07-25 20:47:46.055707221 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9g45ek/at91sam9g45ek_defconfig b/board/at91sam9g45ek/at91sam9g45ek_defconfig
+--- a/board/at91sam9g45ek/at91sam9g45ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g45ek/at91sam9g45ek_defconfig	2012-07-25 20:47:02.303708341 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9g45ek/at91sam9g45nf_defconfig b/board/at91sam9g45ek/at91sam9g45nf_defconfig
+--- a/board/at91sam9g45ek/at91sam9g45nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g45ek/at91sam9g45nf_defconfig	2012-07-25 21:25:24.547605601 +0100
+@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9g45ekes/at91sam9g45dfes_defconfig b/board/at91sam9g45ekes/at91sam9g45dfes_defconfig
+--- a/board/at91sam9g45ekes/at91sam9g45dfes_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g45ekes/at91sam9g45dfes_defconfig	2012-07-25 20:47:33.895706968 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9g45ekes/at91sam9g45ekes_defconfig b/board/at91sam9g45ekes/at91sam9g45ekes_defconfig
+--- a/board/at91sam9g45ekes/at91sam9g45ekes_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g45ekes/at91sam9g45ekes_defconfig	2012-07-25 20:46:49.043708951 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9g45ekes/at91sam9g45nfes_defconfig b/board/at91sam9g45ekes/at91sam9g45nfes_defconfig
+--- a/board/at91sam9g45ekes/at91sam9g45nfes_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9g45ekes/at91sam9g45nfes_defconfig	2012-07-25 21:25:44.823604805 +0100
+@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9m10ek/at91sam9m10df_defconfig b/board/at91sam9m10ek/at91sam9m10df_defconfig
+--- a/board/at91sam9m10ek/at91sam9m10df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9m10ek/at91sam9m10df_defconfig	2012-07-25 20:44:34.975714928 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9m10ek/at91sam9m10ek_defconfig b/board/at91sam9m10ek/at91sam9m10ek_defconfig
+--- a/board/at91sam9m10ek/at91sam9m10ek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9m10ek/at91sam9m10ek_defconfig	2012-07-25 20:43:34.543717453 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9m10ek/at91sam9m10nf_defconfig b/board/at91sam9m10ek/at91sam9m10nf_defconfig
+--- a/board/at91sam9m10ek/at91sam9m10nf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9m10ek/at91sam9m10nf_defconfig	2012-07-25 21:21:40.419615800 +0100
+@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9m10ekes/at91sam9m10dfes_defconfig b/board/at91sam9m10ekes/at91sam9m10dfes_defconfig
+--- a/board/at91sam9m10ekes/at91sam9m10dfes_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9m10ekes/at91sam9m10dfes_defconfig	2012-07-25 20:44:18.687715650 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9m10ekes/at91sam9m10ekes_defconfig b/board/at91sam9m10ekes/at91sam9m10ekes_defconfig
+--- a/board/at91sam9m10ekes/at91sam9m10ekes_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9m10ekes/at91sam9m10ekes_defconfig	2012-07-25 20:43:57.255716814 +0100
+@@ -102,10 +102,10 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9m10ekes/at91sam9m10nfes_defconfig b/board/at91sam9m10ekes/at91sam9m10nfes_defconfig
+--- a/board/at91sam9m10ekes/at91sam9m10nfes_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9m10ekes/at91sam9m10nfes_defconfig	2012-07-25 21:26:10.179603831 +0100
+@@ -86,7 +86,7 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
++CONFIG_IMG_SIZE="0x00080000"
+ CONFIG_JUMP_ADDR="0x73F00000"
+ CONFIG_GLBDRV_ADDR="0x7006b000"
+ # CONFIG_LONG_TEST is not set
+diff -Nurp a/board/at91sam9n12ek/at91sam9n12df_defconfig b/board/at91sam9n12ek/at91sam9n12df_defconfig
+--- a/board/at91sam9n12ek/at91sam9n12df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9n12ek/at91sam9n12df_defconfig	2012-07-25 20:52:40.675693207 +0100
+@@ -107,7 +107,7 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+ CONFIG_IMG_SIZE="0x00050000"
+diff -Nurp a/board/at91sam9rlek/at91sam9rldf_defconfig b/board/at91sam9rlek/at91sam9rldf_defconfig
+--- a/board/at91sam9rlek/at91sam9rldf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9rlek/at91sam9rldf_defconfig	2012-07-25 20:48:53.183703493 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x2006b000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9rlek/at91sam9rlek_defconfig b/board/at91sam9rlek/at91sam9rlek_defconfig
+--- a/board/at91sam9rlek/at91sam9rlek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9rlek/at91sam9rlek_defconfig	2012-07-25 20:48:29.659704460 +0100
+@@ -102,11 +102,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x2006b000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9rlek/at91sam9rlnf_defconfig b/board/at91sam9rlek/at91sam9rlnf_defconfig
+--- a/board/at91sam9rlek/at91sam9rlnf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9rlek/at91sam9rlnf_defconfig	2012-07-25 21:24:49.335607485 +0100
+@@ -85,8 +85,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x2006b000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9x5ek/at91sam9x5df_defconfig b/board/at91sam9x5ek/at91sam9x5df_defconfig
+--- a/board/at91sam9x5ek/at91sam9x5df_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9x5ek/at91sam9x5df_defconfig	2012-07-25 20:52:45.375693059 +0100
+@@ -106,7 +106,7 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+ CONFIG_IMG_SIZE="0x00050000"
+diff -Nurp a/board/at91sam9xeek/at91sam9xedfc_defconfig b/board/at91sam9xeek/at91sam9xedfc_defconfig
+--- a/board/at91sam9xeek/at91sam9xedfc_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9xeek/at91sam9xedfc_defconfig	2012-07-25 20:50:10.643699991 +0100
+@@ -96,9 +96,9 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_ADDRESS="0x00004000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_APP_CHECK=y
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9xeek/at91sam9xedf_defconfig b/board/at91sam9xeek/at91sam9xedf_defconfig
+--- a/board/at91sam9xeek/at91sam9xedf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9xeek/at91sam9xedf_defconfig	2012-07-25 20:50:26.967699568 +0100
+@@ -103,11 +103,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x23F00000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9xeek/at91sam9xeek_defconfig b/board/at91sam9xeek/at91sam9xeek_defconfig
+--- a/board/at91sam9xeek/at91sam9xeek_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9xeek/at91sam9xeek_defconfig	2012-07-25 20:49:46.131699600 +0100
+@@ -103,11 +103,11 @@ CONFIG_LOAD_UBOOT=y
+ # CONFIG_LOAD_64KB is not set
+ # CONFIG_LOAD_1MB is not set
+ # CONFIG_LOAD_4MB is not set
+-CONFIG_IMG_ADDRESS="0x00008400"
++CONFIG_IMG_ADDRESS="0x00004000"
+ CONFIG_SETTING_ADDRESS="0x00408400"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x23F00000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
+diff -Nurp a/board/at91sam9xeek/at91sam9xenf_defconfig b/board/at91sam9xeek/at91sam9xenf_defconfig
+--- a/board/at91sam9xeek/at91sam9xenf_defconfig	2011-11-18 08:13:09.000000000 +0000
++++ b/board/at91sam9xeek/at91sam9xenf_defconfig	2012-07-25 21:26:05.627603826 +0100
+@@ -88,8 +88,8 @@ CONFIG_LOAD_UBOOT=y
+ CONFIG_IMG_ADDRESS="0x00020000"
+ CONFIG_SETTING_ADDRESS="0x01FE0000"
+ CONFIG_SETTING_SIZE="0x00001000"
+-CONFIG_IMG_SIZE="0x00040000"
+-CONFIG_JUMP_ADDR="0x23F00000"
++CONFIG_IMG_SIZE="0x00080000"
++CONFIG_JUMP_ADDR="0x21F00000"
+ CONFIG_GLBDRV_ADDR="0x23F00000"
+ # CONFIG_LONG_TEST is not set
+ CONFIG_DEBUG=y
diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
new file mode 100644
index 0000000000..74f08e8529
--- /dev/null
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -0,0 +1,67 @@
+#############################################################
+#
+# at91bootstrap3
+#
+#############################################################
+AT91BOOTSTRAP3_VERSION = 3.2
+AT91BOOTSTRAP3_SITE = \
+	ftp://www.at91.com/pub/at91bootstrap/AT91Bootstrap$(AT91BOOTSTRAP3_VERSION)
+AT91BOOTSTRAP3_SOURCE = at91bootstrap_9n12.tar.gz
+
+AT91BOOTSTRAP3_INSTALL_IMAGES = YES
+AT91BOOTSTRAP3_INSTALL_TARGET = NO
+
+AT91BOOTSTRAP3_DEFCONFIG = \
+	$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG))
+AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE = \
+	$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE))
+AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \
+	$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))
+
+AT91BOOTSTRAP3_MAKE_OPT = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
+
+ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)
+define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES
+	support/scripts/apply-patches.sh $(@D) $(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR) \
+		at91bootstrap3-\*.patch
+endef
+
+AT91BOOTSTRAP3_POST_PATCH_HOOKS += AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES
+endif
+
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y)
+AT91BOOTSTRAP3_SOURCE_CONFIG = \
+	$(@D)/board/*/$(AT91BOOTSTRAP3_DEFCONFIG)_defconfig
+else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_CUSTOM_CONFIG),y)
+AT91BOOTSTRAP3_SOURCE_CONFIG = $(AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE)
+endif
+
+define AT91BOOTSTRAP3_CONFIGURE_CMDS
+	cp $(AT91BOOTSTRAP3_SOURCE_CONFIG) $(@D)/.config
+	$(SED) 's/image.bin/uImage/' $(@D)/.config
+endef
+
+define AT91BOOTSTRAP3_BUILD_CMDS
+	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) boot
+endef
+
+define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
+	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) bootstrap
+endef
+
+$(eval $(generic-package))
+
+# Checks to give errors that the user can understand
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y)
+ifeq ($(AT91BOOTSTRAP3_DEFCONFIG),)
+$(error No at91bootstrap3 defconfig name specified, check your BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG setting)
+endif
+endif
+
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_CUSTOM_CONFIG),y)
+ifeq ($(AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE),)
+$(error No at91bootstrap3 configuration file specified, check your BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE setting)
+endif
+endif
+endif

From 9e5ab3317578ebc8feb95ecffc94253d7de2e204 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri, 17 Aug 2012 12:10:07 +0200
Subject: [PATCH 2569/6849] flashrom: bump to version 0.9.6.1

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/flashrom/flashrom.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 4b310ef9d3..675cc6ed0f 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -3,7 +3,7 @@
 # flashrom
 #
 #############################################################
-FLASHROM_VERSION = 0.9.3
+FLASHROM_VERSION = 0.9.6.1
 FLASHROM_SOURCE  = flashrom-$(FLASHROM_VERSION).tar.bz2
 FLASHROM_SITE    = http://download.flashrom.org/releases
 

From 32314b44717d655d86b7ff3f557313da8fea4183 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Fri, 17 Aug 2012 13:54:16 +0200
Subject: [PATCH 2570/6849] Added QMAKESPEC to the list of unexported symbols

Building QT might fail if QMAKESPEC is defined.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 9ab7d99d7d..77ca4a00da 100644
--- a/Makefile
+++ b/Makefile
@@ -209,6 +209,7 @@ unexport CFLAGS
 unexport CXXFLAGS
 unexport GREP_OPTIONS
 unexport CONFIG_SITE
+unexport QMAKESPEC
 
 GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 

From 576aafbd280cf78096a50892638ddf343f2e4e54 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 18 Aug 2012 23:58:55 +0200
Subject: [PATCH 2571/6849] docs/manual: fix cross-reference

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages.txt     | 1 +
 docs/manual/rebuilding-packages.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index acbde0c802..cb75f2daae 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -1,5 +1,6 @@
 Adding new packages to Buildroot
 ================================
+[[adding-packages]]
 
 This section covers how new packages (userspace libraries or
 applications) can be integrated into Buildroot. It also shows how
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index f247dd04f8..fb6d69646f 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -29,7 +29,7 @@ by the different packages, so some understanding of the particular
 package is needed.
 
 For packages relying on Buildroot packages infrastructures (see
-xref:add-packages[this section] for details), the following stamp
+xref:adding-packages[this section] for details), the following stamp
 files are relevant:
 
 * +output/build/packagename-version/.stamp_configured+. If removed,

From de2ac17e461ba233167985499846a4ae1e9961b7 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 18 Aug 2012 10:25:37 +0100
Subject: [PATCH 2572/6849] barebox: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/barebox/barebox.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index e5e2558cbc..3641c1d70b 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -20,6 +20,9 @@ BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 endif
 
+BAREBOX_LICENSE = GPLv2+
+BAREBOX_LICENSE_FILES = COPYING
+
 ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
 define BAREBOX_APPLY_CUSTOM_PATCHES
 	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \

From 6643351d0b0feac205341ab9b121c0c74c70c125 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 18 Aug 2012 10:25:38 +0100
Subject: [PATCH 2573/6849] grub: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub/grub.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index e8d66f1752..4a094bc47d 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -9,6 +9,9 @@ GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
 GRUB_PATCH  = grub_$(GRUB_VERSION)-35.diff.gz
 GRUB_SITE   = http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/
 
+GRUB_LICENSE = GPLv2+
+GRUB_LICENSE_FILES = COPYING
+
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV
 ifeq ($(BR2_LARGEFILE),)
 GRUB_CFLAGS+=-U_FILE_OFFSET_BITS

From f13cb75fb7cbc5ac3ad69252bd10e1709aa4c450 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 18 Aug 2012 10:25:39 +0100
Subject: [PATCH 2574/6849] syslinux: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/syslinux/syslinux.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 7df342fb12..f63f2e06c3 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -8,6 +8,9 @@ SYSLINUX_VERSION = 4.05
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
 
+SYSLINUX_LICENSE = GPLv2+
+SYSLINUX_LICENSE_FILES = COPYING
+
 SYSLINUX_INSTALL_TARGET = NO
 SYSLINUX_INSTALL_IMAGES = YES
 

From 69d9ff2fb6f0f7de62446dd43022166aae38be82 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 18 Aug 2012 10:25:40 +0100
Subject: [PATCH 2575/6849] uboot: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/uboot/uboot.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 9e03d6a614..f3810c2476 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -6,6 +6,9 @@
 UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 
+UBOOT_LICENSE = GPLv2+
+UBOOT_LICENSE_FILES = COPYING
+
 UBOOT_INSTALL_IMAGES = YES
 
 ifeq ($(UBOOT_VERSION),custom)

From 2bec669184a46de96ddc4d6c9184b56e2762b12c Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 18 Aug 2012 10:25:41 +0100
Subject: [PATCH 2576/6849] xloader: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/xloader/xloader.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index fbdba02831..b15d9b9ad3 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -7,6 +7,9 @@ XLOADER_VERSION    = 6f3a26101303051e0f91b6213735b68ce804e94e
 XLOADER_SITE       = git://gitorious.org/x-loader/x-loader.git
 XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
 
+XLOADER_LICENSE = GPLv2+
+XLOADER_LICENSE_FILES = README
+
 XLOADER_INSTALL_IMAGES = YES
 
 define XLOADER_BUILD_CMDS

From 6f1bca575bef9a8a58cd7cd90175f38cbce3c940 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 18 Aug 2012 14:05:40 +0200
Subject: [PATCH 2577/6849] libglib2: make codegen python2/python3 compliant

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

 create mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...ke-codegen-python2-python3-compliant.patch | 192 ++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch

diff --git a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
new file mode 100644
index 0000000000..b4838270ba
--- /dev/null
+++ b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
@@ -0,0 +1,192 @@
+Fetch from http://git.gnome.org/browse/glib/patch/?id=03611f7c0670ea14eedbc121972aed7ce60bb9ee
+
+This patch is already included upstream, from the glib-2.32.4 release. 
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001
+From: Simon Feltman <s.feltman@gmail.com>
+Date: Thu, 14 Jun 2012 06:20:17 +0000
+Subject: Updated codegen to work with python3.
+
+Most changes were just replacing usage of "has_key" with "in".
+Also updated the sorting function which was simplified and
+changed to a "key" function instead of "cmp" (which is no longer
+supported in python3. Verified everything builds with
+python 2.7 and 3.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=678066
+---
+diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
+index 41ea8fa..bca3490 100644
+--- a/gio/gdbus-2.0/codegen/codegen.py
++++ b/gio/gdbus-2.0/codegen/codegen.py
+@@ -304,11 +304,8 @@ class CodeGenerator:
+             #
+             # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5
+             # for discussion
+-            keys = function_pointers.keys()
+-            if len(keys) > 0:
+-                keys.sort(cmp=utils.my_version_cmp)
+-                for key in keys:
+-                    self.h.write('%s'%function_pointers[key])
++            for key in sorted(function_pointers.keys(), key=utils.version_cmp_key):
++                self.h.write('%s'%function_pointers[key])
+ 
+             self.h.write('};\n')
+             self.h.write('\n')
+@@ -1022,11 +1019,9 @@ class CodeGenerator:
+                 value  = '@get_%s: '%(p.name_lower)
+                 value += 'Getter for the #%s:%s property.'%(i.camel_name, p.name_hyphen)
+                 doc_bits[key] = value
+-        keys = doc_bits.keys()
+-        if len(keys) > 0:
+-            keys.sort(cmp=utils.my_version_cmp)
+-            for key in keys:
+-                self.c.write(' * %s\n'%doc_bits[key])
++        for key in sorted(doc_bits.keys(), key=utils.version_cmp_key):
++            self.c.write(' * %s\n'%doc_bits[key])
++
+         self.c.write(self.docbook_gen.expand(
+                 ' *\n'
+                 ' * Virtual table for the D-Bus interface #%s.\n'
+diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py
+index 4ceef57..00581f1 100644
+--- a/gio/gdbus-2.0/codegen/codegen_docbook.py
++++ b/gio/gdbus-2.0/codegen/codegen_docbook.py
+@@ -259,14 +259,12 @@ class DocbookCodeGenerator:
+                 self.expand_member_dict[key] = value
+         # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
+         # is evaluated before #org.foo.Iface:Media ...
+-        self.expand_member_dict_keys = self.expand_member_dict.keys()
+-        self.expand_member_dict_keys.sort(reverse=True)
+-        self.expand_iface_dict_keys = self.expand_iface_dict.keys()
+-        self.expand_iface_dict_keys.sort(reverse=True)
++        self.expand_member_dict_keys = sorted(self.expand_member_dict.keys(), reverse=True)
++        self.expand_iface_dict_keys = sorted(self.expand_iface_dict.keys(), reverse=True)
+ 
+     def generate(self):
+         for i in self.ifaces:
+-            self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w')
++            self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w')
+             self.out.write(''%())
+             self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%())
+             self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%())
+diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
+index 76c838c..735cc1f 100755
+--- a/gio/gdbus-2.0/codegen/codegen_main.py
++++ b/gio/gdbus-2.0/codegen/codegen_main.py
+@@ -184,8 +184,8 @@ def codegen_main():
+ 
+     c_code = opts.generate_c_code
+     if c_code:
+-        h = file(c_code + '.h', 'w')
+-        c = file(c_code + '.c', 'w')
++        h = open(c_code + '.h', 'w')
++        c = open(c_code + '.c', 'w')
+         gen = codegen.CodeGenerator(all_ifaces,
+                                     opts.c_namespace,
+                                     opts.interface_prefix,
+diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py
+index 5fabd44..7b9d216 100644
+--- a/gio/gdbus-2.0/codegen/parser.py
++++ b/gio/gdbus-2.0/codegen/parser.py
+@@ -152,12 +152,12 @@ class DBusXMLParser:
+                 self.state = DBusXMLParser.STATE_IGNORED
+ 
+             # assign docs, if any
+-            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
++            if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
+                 self._cur_object.doc_string = self.doc_comment_body
+-                if self.doc_comment_params.has_key('short_description'):
++                if 'short_description' in self.doc_comment_params:
+                     short_description = self.doc_comment_params['short_description']
+                     self._cur_object.doc_string_brief = short_description
+-                if self.doc_comment_params.has_key('since'):
++                if 'since' in self.doc_comment_params:
+                     self._cur_object.since = self.doc_comment_params['since']
+ 
+         elif self.state == DBusXMLParser.STATE_INTERFACE:
+@@ -185,16 +185,16 @@ class DBusXMLParser:
+                 self.state = DBusXMLParser.STATE_IGNORED
+ 
+             # assign docs, if any
+-            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
++            if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
+                 self._cur_object.doc_string = self.doc_comment_body
+-                if self.doc_comment_params.has_key('since'):
++                if 'since' in self.doc_comment_params:
+                     self._cur_object.since = self.doc_comment_params['since']
+ 
+         elif self.state == DBusXMLParser.STATE_METHOD:
+             if name == DBusXMLParser.STATE_ARG:
+                 self.state = DBusXMLParser.STATE_ARG
+                 arg_name = None
+-                if attrs.has_key('name'):
++                if 'name' in attrs:
+                     arg_name = attrs['name']
+                 arg = dbustypes.Arg(arg_name, attrs['type'])
+                 direction = attrs['direction']
+@@ -215,18 +215,18 @@ class DBusXMLParser:
+ 
+             # assign docs, if any
+             if self.doc_comment_last_symbol == old_cur_object.name:
+-                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
++                if 'name' in attrs and attrs['name'] in self.doc_comment_params:
+                     doc_string = self.doc_comment_params[attrs['name']]
+                     if doc_string != None:
+                         self._cur_object.doc_string = doc_string
+-                    if self.doc_comment_params.has_key('since'):
++                    if 'since' in self.doc_comment_params:
+                         self._cur_object.since = self.doc_comment_params['since']
+ 
+         elif self.state == DBusXMLParser.STATE_SIGNAL:
+             if name == DBusXMLParser.STATE_ARG:
+                 self.state = DBusXMLParser.STATE_ARG
+                 arg_name = None
+-                if attrs.has_key('name'):
++                if 'name' in attrs:
+                     arg_name = attrs['name']
+                 arg = dbustypes.Arg(arg_name, attrs['type'])
+                 self._cur_object.args.append(arg)
+@@ -241,11 +241,11 @@ class DBusXMLParser:
+ 
+             # assign docs, if any
+             if self.doc_comment_last_symbol == old_cur_object.name:
+-                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
++                if 'name' in attrs and attrs['name'] in self.doc_comment_params:
+                     doc_string = self.doc_comment_params[attrs['name']]
+                     if doc_string != None:
+                         self._cur_object.doc_string = doc_string
+-                    if self.doc_comment_params.has_key('since'):
++                    if 'since' in self.doc_comment_params:
+                         self._cur_object.since = self.doc_comment_params['since']
+ 
+         elif self.state == DBusXMLParser.STATE_PROPERTY:
+diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
+index 94bd05c..239b64e 100644
+--- a/gio/gdbus-2.0/codegen/utils.py
++++ b/gio/gdbus-2.0/codegen/utils.py
+@@ -97,15 +97,8 @@ def lookup_brief_docs(annotations):
+     else:
+         return s
+ 
+-# I'm sure this could be a lot more elegant if I was
+-# more fluent in python...
+-def my_version_cmp(a, b):
+-    if len(a[0]) > 0 and len(b[0]) > 0:
+-        va = distutils.version.LooseVersion(a[0])
+-        vb = distutils.version.LooseVersion(b[0])
+-        ret = va.__cmp__(vb)
+-    else:
+-        ret = cmp(a[0], b[0])
+-    if ret != 0:
+-        return ret
+-    return cmp(a[1], b[1])
++def version_cmp_key(key):
++    # If the 'since' version is empty put a 0 in its place as this will
++    # allow LooseVersion to work and will always compare lower.
++    v = key[0] if key[0] else '0'
++    return (distutils.version.LooseVersion(v), key[1])
+--
+cgit v0.9.0.2

From d753161efb85e6c8f2f179656a24959e22a6a16a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 19 Aug 2012 21:08:41 +0100
Subject: [PATCH 2578/6849] yajl: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/yajl/yajl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk
index 6c4278ef46..9cebeb77e9 100644
--- a/package/yajl/yajl.mk
+++ b/package/yajl/yajl.mk
@@ -7,5 +7,7 @@
 YAJL_VERSION = 2.0.4
 YAJL_SITE = git://github.com/lloyd/yajl.git
 YAJL_INSTALL_STAGING = YES
+YAJL_LICENSE = ISC
+YAJL_LICENSE_FILES = COPYING
 
 $(eval $(cmake-package))

From dd71973d8464ec0860b43ec00048895585c05b88 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 19 Aug 2012 21:08:43 +0100
Subject: [PATCH 2579/6849] zlib: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/zlib/zlib.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index a9d4a8ff92..2ddab6204f 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -7,6 +7,8 @@
 ZLIB_VERSION = 1.2.7
 ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
 ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+ZLIB_LICENSE = zlib license
+ZLIB_LICENSE_FILES = README
 ZLIB_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

From a3dc53ca247a156b20c2a4e8d2dc5222bae183a5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 19 Aug 2012 21:08:44 +0100
Subject: [PATCH 2580/6849] zxing: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/zxing/zxing.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index 54383e71ad..543d038609 100644
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -6,6 +6,8 @@
 ZXING_VERSION = 2.0
 ZXING_SITE = http://zxing.googlecode.com/files
 ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip
+ZXING_LICENSE = Apache
+ZXING_LICENSE_FILES = COPYING
 ZXING_INSTALL_STAGING = YES
 
 ifneq ($(BR2_ENABLE_LOCALE),y)

From 4cbe5ff11a49c7cbe0296d6d6ef5abf81b973d7b Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:23 -0400
Subject: [PATCH 2581/6849] alsa-lib: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/alsa-lib/alsa-lib.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index c3f61ff919..8ed133947b 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -7,6 +7,8 @@
 ALSA_LIB_VERSION = 1.0.25
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
+ALSA_LIB_LICENSE = LGPLv2.1+
+ALSA_LIB_LICENSE_FILES = COPYING
 ALSA_LIB_INSTALL_STAGING = YES
 ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
 ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \

From f7384125e1b2d70899c52ebd4baa200eccf96230 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:24 -0400
Subject: [PATCH 2582/6849] alsa-utils: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/alsa-utils/alsa-utils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 90fba51eb0..7043837e44 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -7,6 +7,8 @@
 ALSA_UTILS_VERSION = 1.0.25
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
+ALSA_UTILS_LICENSE = GPLv2
+ALSA_UTILS_LICENSE_FILES = COPYING
 ALSA_UTILS_INSTALL_STAGING = YES
 ALSA_UTILS_DEPENDENCIES = alsa-lib \
 	$(if $(BR2_PACKAGE_NCURSES),ncurses)

From 2ecfaac73d26a3b73b64d0d0e33f7c11186f4d54 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:25 -0400
Subject: [PATCH 2583/6849] faad2: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/faad2/faad2.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk
index b0078f59bd..f3c47122a1 100644
--- a/package/multimedia/faad2/faad2.mk
+++ b/package/multimedia/faad2/faad2.mk
@@ -6,6 +6,8 @@
 
 FAAD2_VERSION = 2.7
 FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac
+FAAD2_LICENSE = GPLv2
+FAAD2_LICENSE_FILES = COPYING
 # frontend/faad calls frexp()
 FAAD2_CONF_ENV = LIBS=-lm
 FAAD2_INSTALL_STAGING = YES

From 87e7661b53b83df870918432481995f8bd9fcd78 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:26 -0400
Subject: [PATCH 2584/6849] nano: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/nano/nano.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 164c7a6f51..61bf218b67 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -6,6 +6,8 @@
 
 NANO_VERSION = 2.3.1
 NANO_SITE = http://www.nano-editor.org/dist/v2.3
+NANO_LICENSE = GPLv3+
+NANO_LICENSE_FILES = COPYING
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
 NANO_CONF_OPT = --without-slang
 NANO_DEPENDENCIES = ncurses

From 0b258da9074b22ce11de34750c29d910ca391afd Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:27 -0400
Subject: [PATCH 2585/6849] fbdump: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/fbdump/fbdump.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index 176d254265..3ca10bf1e5 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -6,6 +6,7 @@
 FBDUMP_VERSION:=0.4.2
 FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
+FBDUMP_LICENSE = GPLv2
+FBDUMP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
-

From 9ca544dec71a1e1f80e370c08deaf8937d250fa5 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:29 -0400
Subject: [PATCH 2586/6849] rsync: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/rsync/rsync.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index f2df256004..3963547db2 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -7,6 +7,8 @@
 RSYNC_VERSION = 3.0.9
 RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
+RSYNC_LICENSE = GPLv3+
+RSYNC_LICENSE_FILES = COPYING
 RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 RSYNC_CONF_OPT = --with-included-popt
 

From 4e791336584a0c751604c77480dcb83c9c367745 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 19 Aug 2012 16:18:30 -0400
Subject: [PATCH 2587/6849] librsync: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/librsync/librsync.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index 864297b68f..f0f543f7f8 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -6,6 +6,8 @@
 LIBRSYNC_VERSION:=0.9.7
 LIBRSYNC_SOURCE:=librsync-$(LIBRSYNC_VERSION).tar.gz
 LIBRSYNC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/librsync/
+LIBRSYNC_LICENSE = LGPLv2.1+
+LIBRSYNC_LICENSE_FILES = COPYING
 LIBRSYNC_INSTALL_STAGING = YES
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 

From 96f64475b1e9b70eae6e57d3dd1fcf43c097e548 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Tue, 21 Aug 2012 18:13:48 +0800
Subject: [PATCH 2588/6849] mplayer: Update to version 1.1.

Update to version 1.1 (r34994).

remove --enable-largefiles configure option which was
deleted in r33321.

Discard mplayer-theora-fix.patch which is a backport
of r34498 and r34503.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...> mplayer-1.1-disable-install-strip.patch} |   0
 ...patch => mplayer-1.1-fix-cc-parsing.patch} |   0
 .../mplayer/mplayer-theora-fix.patch          | 374 ------------------
 package/multimedia/mplayer/mplayer.mk         |  19 +-
 4 files changed, 3 insertions(+), 390 deletions(-)
 rename package/multimedia/mplayer/{mplayer-1.0rc3-disable-install-strip.patch => mplayer-1.1-disable-install-strip.patch} (100%)
 rename package/multimedia/mplayer/{mplayer-1.0rc3-fix-cc-parsing.patch => mplayer-1.1-fix-cc-parsing.patch} (100%)
 delete mode 100644 package/multimedia/mplayer/mplayer-theora-fix.patch

diff --git a/package/multimedia/mplayer/mplayer-1.0rc3-disable-install-strip.patch b/package/multimedia/mplayer/mplayer-1.1-disable-install-strip.patch
similarity index 100%
rename from package/multimedia/mplayer/mplayer-1.0rc3-disable-install-strip.patch
rename to package/multimedia/mplayer/mplayer-1.1-disable-install-strip.patch
diff --git a/package/multimedia/mplayer/mplayer-1.0rc3-fix-cc-parsing.patch b/package/multimedia/mplayer/mplayer-1.1-fix-cc-parsing.patch
similarity index 100%
rename from package/multimedia/mplayer/mplayer-1.0rc3-fix-cc-parsing.patch
rename to package/multimedia/mplayer/mplayer-1.1-fix-cc-parsing.patch
diff --git a/package/multimedia/mplayer/mplayer-theora-fix.patch b/package/multimedia/mplayer/mplayer-theora-fix.patch
deleted file mode 100644
index 08bb29b44a..0000000000
--- a/package/multimedia/mplayer/mplayer-theora-fix.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-[PATCH] fix libtheora linking issue with modern theora versions
-
-This is a squash/backport of upstream r34498 (configure: Simplify
-Theora check) and r34503 (Port libtheora glue code to Theora 1.0 API).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure               |   56 ++++--------------------------------
- libmpcodecs/vd_theora.c |   74 +++++++++++++++++++++++++-----------------------
- libmpdemux/demux_ogg.c  |   54 ++++++++++++++++++-----------------
- 3 files changed, 74 insertions(+), 110 deletions(-)
-
-Index: mplayer-32726/configure
-===================================================================
---- mplayer-32726.orig/configure
-+++ mplayer-32726/configure
-@@ -6404,57 +6404,15 @@
- echocheck "OggTheora support"
- if test "$_theora" = auto ; then
-   _theora=no
--    cat > $TMPC << EOF
--#include <theora/theora.h>
--#include <string.h>
--int main(void) {
--  /* Theora is in flux, make sure that all interface routines and datatypes
--   * exist and work the way we expect it, so we don't break MPlayer. */
--  ogg_packet op;
--  theora_comment tc;
--  theora_info inf;
--  theora_state st;
--  yuv_buffer yuv;
--  int r;
--  double t;
--
--  theora_info_init(&inf);
--  theora_comment_init(&tc);
--
--  return 0;
--
--  /* we don't want to execute this kind of nonsense; just for making sure
--   * that compilation works... */
--  memset(&op, 0, sizeof(op));
--  r = theora_decode_header(&inf, &tc, &op);
--  r = theora_decode_init(&st, &inf);
--  t = theora_granule_time(&st, op.granulepos);
--  r = theora_decode_packetin(&st, &op);
--  r = theora_decode_YUVout(&st, &yuv);
--  theora_clear(&st);
--
--  return 0;
--}
--EOF
--  _ld_theora=$($_pkg_config --silence-errors --libs theora)
--  _inc_theora=$($_pkg_config --silence-errors --cflags theora)
--  cc_check $_inc_theora $_ld_theora && extra_ldflags="$extra_ldflags $_ld_theora" &&
--    extra_cflags="$extra_cflags $_inc_theora" && _theora=yes
-+  ld_theora="-ltheoradec -logg"
-+  statement_check theora/theoradec.h 'theora_info_init(NULL)' $ld_theora &&
-+    extra_ldflags="$extra_ldflags $ld_theora" && _theora=yes
-   if test _theora = no; then
--    _ld_theora="-ltheora -logg"
--    cc_check $_ld_theora && extra_ldflags="$extra_ldflags $_ld_theora" && _theora=yes
--  fi
--  if test "$_theora" = no && test "$_tremor_internal" = yes; then
--    _ld_theora=$($_pkg_config --silence-errors --libs theora)
--    _inc_theora=$($_pkg_config --silence-errors --cflags theora)
--    cc_check tremor/bitwise.c $_inc_theora $_ld_theora &&
-+    _ld_theora=$($_pkg_config --silence-errors --libs theoradec)
-+    _inc_theora=$($_pkg_config --silence-errors --cflags theoradec)
-+    statement_check theora/theoradec.h 'theora_info_init(NULL)' $inc_theora $ld_theora &&
-       extra_ldflags="$extra_ldflags $_ld_theora" &&
-       extra_cflags="$extra_cflags $_inc_theora" && _theora=yes
--    if test _theora = no; then
--      _ld_theora="-ltheora -logg"
--      cc_check tremor/bitwise.c $_ld_theora &&
--        extra_ldflags="$extra_ldflags $_ld_theora" && _theora=yes
--    fi
-   fi
- fi
- if test "$_theora" = yes ; then
-@@ -6462,7 +6420,7 @@
-   codecmodules="libtheora $codecmodules"
-   # when --enable-theora is forced, we'd better provide a probably sane
-   # $_ld_theora than nothing
--  test -z "$_ld_theora" && extra_ldflags="$extra_ldflags -ltheora -logg"
-+  test -z "$_ld_theora" && extra_ldflags="$extra_ldflags -ltheoradec -logg"
- else
-   def_theora='#undef CONFIG_OGGTHEORA'
-   nocodecmodules="libtheora $nocodecmodules"
-Index: mplayer-32726/libmpcodecs/vd_theora.c
-===================================================================
---- mplayer-32726.orig/libmpcodecs/vd_theora.c
-+++ mplayer-32726/libmpcodecs/vd_theora.c
-@@ -39,22 +39,23 @@
- 
- LIBVD_EXTERN(theora)
- 
--#include <theora/theora.h>
-+#include <theora/theoradec.h>
- 
- #define THEORA_NUM_HEADER_PACKETS 3
- 
- typedef struct theora_struct_st {
--    theora_state st;
--    theora_comment cc;
--    theora_info inf;
-+    th_setup_info *tsi;
-+    th_dec_ctx    *tctx;
-+    th_comment     tc;
-+    th_info        ti;
- } theora_struct_t;
- 
- /** Convert Theora pixelformat to the corresponding IMGFMT_ */
--static uint32_t theora_pixelformat2imgfmt(theora_pixelformat fmt){
-+static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt){
-     switch(fmt) {
--       case OC_PF_420: return IMGFMT_YV12;
--       case OC_PF_422: return IMGFMT_422P;
--       case OC_PF_444: return IMGFMT_444P;
-+       case TH_PF_420: return IMGFMT_YV12;
-+       case TH_PF_422: return IMGFMT_422P;
-+       case TH_PF_444: return IMGFMT_444P;
-     }
-     return 0;
- }
-@@ -64,7 +65,7 @@
-     theora_struct_t *context = sh->context;
-     switch(cmd) {
-     case VDCTRL_QUERY_FORMAT:
--        if (*(int*)arg == theora_pixelformat2imgfmt(context->inf.pixelformat))
-+        if (*(int*)arg == theora_pixelformat2imgfmt(context->ti.pixel_fmt))
- 	    return CONTROL_TRUE;
- 	return CONTROL_FALSE;
-     }
-@@ -88,8 +89,9 @@
-     if (!context)
-         goto err_out;
- 
--    theora_info_init(&context->inf);
--    theora_comment_init(&context->cc);
-+    th_info_init(&context->ti);
-+    th_comment_init(&context->tc);
-+    context->tsi = NULL;
- 
-     /* Read all header packets, pass them to theora_decode_header. */
-     for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)
-@@ -109,7 +111,7 @@
-             op.b_o_s = 1;
-         }
- 
--        if ( (errorCode = theora_decode_header (&context->inf, &context->cc, &op)) )
-+        if ( (errorCode = th_decode_headerin (&context->ti, &context->tc, &context->tsi, &op)) < 0)
-         {
-             mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode);
-             goto err_out;
-@@ -117,23 +119,25 @@
-     }
- 
-     /* now init codec */
--    errorCode = theora_decode_init (&context->st, &context->inf);
--    if (errorCode)
-+    context->tctx = th_decode_alloc (&context->ti, context->tsi);
-+    if (!context->tctx)
-     {
--        mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode init failed: %i \n", errorCode);
-+        mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode init failed\n");
-         goto err_out;
-     }
-+    /* free memory used for decoder setup information */
-+    th_setup_free(context->tsi);
- 
--    if(sh->aspect==0.0 && context->inf.aspect_denominator!=0)
-+    if(sh->aspect==0.0 && context->ti.aspect_denominator!=0)
-     {
--       sh->aspect = ((double)context->inf.aspect_numerator * context->inf.width)/
--          ((double)context->inf.aspect_denominator * context->inf.height);
-+       sh->aspect = ((double)context->ti.aspect_numerator * context->ti.frame_width)/
-+          ((double)context->ti.aspect_denominator * context->ti.frame_height);
-     }
- 
-     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
--    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Frame: %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->inf.width, context->inf.height, context->inf.frame_width, context->inf.frame_height, context->inf.offset_x, context->inf.offset_y);
-+    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Frame: %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->ti.frame_width, context->ti.frame_height, context->ti.pic_width, context->ti.pic_height, context->ti.pic_x, context->ti.pic_y);
- 
--    return mpcodecs_config_vo (sh,context->inf.width,context->inf.height,theora_pixelformat2imgfmt(context->inf.pixelformat));
-+    return mpcodecs_config_vo (sh,context->ti.frame_width,context->ti.frame_height,theora_pixelformat2imgfmt(context->ti.pixel_fmt));
- 
- err_out:
-     free(context);
-@@ -150,9 +154,9 @@
- 
-    if (context)
-    {
--      theora_info_clear(&context->inf);
--      theora_comment_clear(&context->cc);
--      theora_clear (&context->st);
-+      th_info_clear(&context->ti);
-+      th_comment_clear(&context->tc);
-+      th_decode_free (context->tctx);
-       free (context);
-    }
- }
-@@ -165,7 +169,7 @@
-    theora_struct_t *context = sh->context;
-    int errorCode = 0;
-    ogg_packet op;
--   yuv_buffer yuv;
-+   th_ycbcr_buffer ycbcrbuf;
-    mp_image_t* mpi;
- 
-    // no delayed frames
-@@ -177,31 +181,31 @@
-    op.packet = data;
-    op.granulepos = -1;
- 
--   errorCode = theora_decode_packetin (&context->st, &op);
--   if (errorCode)
-+   errorCode = th_decode_packetin (context->tctx, &op, NULL);
-+   if (errorCode < 0)
-    {
-       mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode packetin failed: %i \n",
- 	     errorCode);
-       return NULL;
-    }
- 
--   errorCode = theora_decode_YUVout (&context->st, &yuv);
--   if (errorCode)
-+   errorCode = th_decode_ycbcr_out (context->tctx, ycbcrbuf);
-+   if (errorCode < 0)
-    {
-       mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode YUVout failed: %i \n",
- 	     errorCode);
-       return NULL;
-    }
- 
--    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, yuv.y_width, yuv.y_height);
-+    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, ycbcrbuf[0].width, ycbcrbuf[0].height);
-     if(!mpi) return NULL;
- 
--    mpi->planes[0]=yuv.y;
--    mpi->stride[0]=yuv.y_stride;
--    mpi->planes[1]=yuv.u;
--    mpi->stride[1]=yuv.uv_stride;
--    mpi->planes[2]=yuv.v;
--    mpi->stride[2]=yuv.uv_stride;
-+    mpi->planes[0]=ycbcrbuf[0].data;
-+    mpi->stride[0]=ycbcrbuf[0].stride;
-+    mpi->planes[1]=ycbcrbuf[1].data;
-+    mpi->stride[1]=ycbcrbuf[1].stride;
-+    mpi->planes[2]=ycbcrbuf[2].data;
-+    mpi->stride[2]=ycbcrbuf[2].stride;
- 
-     return mpi;
- }
-Index: mplayer-32726/libmpdemux/demux_ogg.c
-===================================================================
---- mplayer-32726.orig/libmpdemux/demux_ogg.c
-+++ mplayer-32726/libmpdemux/demux_ogg.c
-@@ -49,21 +49,21 @@
- #endif
- 
- #ifdef CONFIG_OGGTHEORA
--#include <theora/theora.h>
--int _ilog (unsigned int); /* defined in many places in theora/lib/ */
-+#include <theora/theoradec.h>
- #endif
- 
- #define BLOCK_SIZE 4096
- 
- /* Theora decoder context : we won't be able to interpret granule positions
-- * without using theora_granule_time with the theora_state of the stream.
-+ * without using th_granule_time with the th_dec_ctx of the stream.
-  * This is duplicated in `vd_theora.c'; put this in a common header?
-  */
- #ifdef CONFIG_OGGTHEORA
- typedef struct theora_struct_st {
--    theora_state   st;
--    theora_comment cc;
--    theora_info    inf;
-+    th_setup_info *tsi;
-+    th_dec_ctx    *tctx;
-+    th_comment     tc;
-+    th_info        ti;
- } theora_struct_t;
- #endif
- 
-@@ -116,7 +116,7 @@
-     float   samplerate; /// granulpos 2 time
-     int64_t lastpos;
-     int32_t lastsize;
--    int     keyframe_frequency_force;
-+    int     keyframe_granule_shift;
- 
-     // Logical stream state
-     ogg_stream_state stream;
-@@ -299,11 +299,10 @@
-            have theora_state st, until all header packets were passed to the
-            decoder. */
-         if (!pack->bytes || !(*data&0x80)) {
--            int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1);
--            int64_t iframemask = (1 << keyframe_granule_shift) - 1;
-+            int64_t iframemask = (1 << os->keyframe_granule_shift) - 1;
- 
-             if (pack->granulepos >= 0) {
--                os->lastpos  = pack->granulepos >> keyframe_granule_shift;
-+                os->lastpos  = pack->granulepos >> os->keyframe_granule_shift;
-                 os->lastpos += pack->granulepos & iframemask;
-                 *flags = (pack->granulepos & iframemask) == 0;
-             } else {
-@@ -892,14 +891,15 @@
- #ifdef CONFIG_OGGTHEORA
-         } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
-             int errorCode = 0;
--            theora_info inf;
--            theora_comment cc;
-+            th_info ti;
-+            th_comment tc;
-+            th_setup_info *tsi = NULL;
- 
--            theora_info_init (&inf);
--            theora_comment_init (&cc);
-+            th_info_init (&ti);
-+            th_comment_init (&tc);
- 
--            errorCode = theora_decode_header (&inf, &cc, &pack);
--            if (errorCode) {
-+            errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack);
-+            if (errorCode < 0) {
-                 mp_msg(MSGT_DEMUX, MSGL_ERR,
-                        "Theora header parsing failed: %i \n", errorCode);
-             } else {
-@@ -908,30 +908,32 @@
-                 sh_v->bih = calloc(1, sizeof(*sh_v->bih));
-                 sh_v->bih->biSize        = sizeof(*sh_v->bih);
-                 sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA;
--                sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator;
--                sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator;
--                sh_v->disp_w = sh_v->bih->biWidth  = inf.frame_width;
--                sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height;
-+                sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator;
-+                sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator;
-+                sh_v->i_bps  = ti.target_bitrate / 8;
-+                sh_v->disp_w = sh_v->bih->biWidth  = ti.frame_width;
-+                sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height;
-                 sh_v->bih->biBitCount  = 24;
-                 sh_v->bih->biPlanes    = 3;
-                 sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight);
-                 ogg_d->subs[ogg_d->num_sub].samplerate               = sh_v->fps;
-                 ogg_d->subs[ogg_d->num_sub].theora                   = 1;
--                ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force;
-+                ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift   = ti.keyframe_granule_shift;
-                 ogg_d->subs[ogg_d->num_sub].id                       = n_video;
-                 n_video++;
-                 mp_msg(MSGT_DEMUX, MSGL_INFO,
-                        "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n",
-                        ogg_d->num_sub,
--                       (int)inf.version_major,
--                       (int)inf.version_minor,
--                       (int)inf.version_subminor,
-+                       (int)ti.version_major,
-+                       (int)ti.version_minor,
-+                       (int)ti.version_subminor,
-                        n_video - 1);
-                 if (mp_msg_test(MSGT_HEADER, MSGL_V))
-                     print_video_header(sh_v->bih, MSGL_V);
-             }
--            theora_comment_clear(&cc);
--            theora_info_clear(&inf);
-+            th_comment_clear(&tc);
-+            th_info_clear(&ti);
-+            th_setup_free(tsi);
- #endif /* CONFIG_OGGTHEORA */
-         } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
-             sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio, NULL);
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index f4fedf4c47..05120bf780 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -3,10 +3,9 @@
 # mplayer
 #
 #############################################################
-MPLAYER_VERSION = 32726
-# MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.bz2
-# MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
-MPLAYER_SITE = svn://svn.mplayerhq.hu/mplayer/trunk
+MPLAYER_VERSION = 1.1
+MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
+MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
 
 MPLAYER_CFLAGS = $(TARGET_CFLAGS)
 MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
@@ -25,18 +24,6 @@ else
 MPLAYER_CONF_OPTS += --disable-big-endian
 endif
 
-# mplayer unfortunately uses --disable-largefiles, so we cannot use
-# DISABLE_LARGEFILE
-ifeq ($(BR2_LARGEFILE),y)
-MPLAYER_CONF_OPTS += --enable-largefiles
-else
-# dvdread/dvdcss requires largefile support
-MPLAYER_CONF_OPTS += 			\
-	--disable-largefiles 		\
-	--disable-dvdread-internal 	\
-	--disable-libdvdcss-internal
-endif
-
 ifeq ($(BR2_PACKAGE_SDL),y)
 MPLAYER_CONF_OPTS += \
 	--enable-sdl \

From 53136e92bc8d0141e753d507667cd3848e6cac51 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Tue, 21 Aug 2012 20:54:20 -0400
Subject: [PATCH 2589/6849] fontconfig: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/fontconfig/fontconfig.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 843b34f034..98456561fe 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -6,6 +6,8 @@
 FONTCONFIG_VERSION = 2.6.0
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SITE = http://fontconfig.org/release
+FONTCONFIG_LICENSE = fontconfig license
+FONTCONFIG_LICENSE_FILES = COPYING
 FONTCONFIG_AUTORECONF = YES
 FONTCONFIG_INSTALL_STAGING = YES
 # This package does not like using the target cflags for some reason.

From a05a1cc16b9b306fe21a8117e00f80a54151a267 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 22 Aug 2012 08:08:40 +0100
Subject: [PATCH 2590/6849] inotify-tools: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/inotify-tools/inotify-tools.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index 52a1701403..b53efaddcb 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -5,4 +5,7 @@
 #############################################################
 INOTIFY_TOOLS_VERSION = 3.14
 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
+INOTIFY_TOOLS_LICENSE = GPLv2+
+INOTIFY_TOOLS_LICENSE_FILES = COPYING
+
 $(eval $(autotools-package))

From 73b18d99701800e694604aa2cd9d384dcbee3513 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 22 Aug 2012 13:47:33 +0100
Subject: [PATCH 2591/6849] barebox: fix license information

The barebox license is GPLv2, and not GPLv2+.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 3641c1d70b..9550cdcfc6 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -20,7 +20,7 @@ BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 endif
 
-BAREBOX_LICENSE = GPLv2+
+BAREBOX_LICENSE = GPLv2
 BAREBOX_LICENSE_FILES = COPYING
 
 ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)

From 26506d3bea9aabd0d849b6e3c01eadd16bb47595 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 21 Aug 2012 09:19:42 -0300
Subject: [PATCH 2592/6849] netsnmp: add fix for CVE-2012-2141

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/netsnmp/netsnmp-CVE-2012-2141.patch | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/netsnmp/netsnmp-CVE-2012-2141.patch

diff --git a/package/netsnmp/netsnmp-CVE-2012-2141.patch b/package/netsnmp/netsnmp-CVE-2012-2141.patch
new file mode 100644
index 0000000000..1b34b9c4c9
--- /dev/null
+++ b/package/netsnmp/netsnmp-CVE-2012-2141.patch
@@ -0,0 +1,36 @@
+From 4c5633f1603e4bd03ed05c37d782ec8911759c47 Mon Sep 17 00:00:00 2001
+From: Robert Story <rstory@freesnmp.com>
+Date: Mon, 14 May 2012 11:40:06 -0400
+Subject: [PATCH] NEWS: snmp: BUG: 3526549: CVE-2012-2141 Array index error leading to crash
+
+---
+ agent/mibgroup/agent/extend.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/agent/mibgroup/agent/extend.c b/agent/mibgroup/agent/extend.c
+index d00475f..1f8586a 100644
+--- a/agent/mibgroup/agent/extend.c
++++ b/agent/mibgroup/agent/extend.c
+@@ -1126,7 +1126,7 @@ _extend_find_entry( netsnmp_request_info       *request,
+              * ...and check the line requested is valid
+              */
+             line_idx = *table_info->indexes->next_variable->val.integer;
+-            if (eptr->numlines < line_idx)
++            if (line_idx < 1 || line_idx > eptr->numlines)
+                 return NULL;
+         }
+         return eptr;
+@@ -1299,6 +1299,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_handler          *handler,
+                  * Determine which line we've been asked for....
+                  */
+                 line_idx = *table_info->indexes->next_variable->val.integer;
++                if (line_idx < 1 || line_idx > extension->numlines) {
++                    netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE);
++                    continue;
++                }
+                 cp  = extension->lines[line_idx-1];
+ 
+                 /* 
+-- 
+1.7.4.1
+

From d10c263b7fe6c389561ead92ce0c8453c3a77fa9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 22 Aug 2012 23:21:04 +0200
Subject: [PATCH 2593/6849] zxing: add version of the Apache license

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/zxing/zxing.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index 543d038609..851aef6d4b 100644
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -6,7 +6,7 @@
 ZXING_VERSION = 2.0
 ZXING_SITE = http://zxing.googlecode.com/files
 ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip
-ZXING_LICENSE = Apache
+ZXING_LICENSE = Apache v2.0
 ZXING_LICENSE_FILES = COPYING
 ZXING_INSTALL_STAGING = YES
 

From b502930374bb6b179d4cfb42bf1db06e051bc8fd Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 22 Aug 2012 22:03:38 +0200
Subject: [PATCH 2594/6849] inotify-tools: fix license

No specific GPL version is declared, so it defaults to "any version
ever published", as clause 9 of the GPLv2 states.

Fixes a05a1cc16b9b3.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/inotify-tools/inotify-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index b53efaddcb..deb8a8c0be 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -5,7 +5,7 @@
 #############################################################
 INOTIFY_TOOLS_VERSION = 3.14
 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
-INOTIFY_TOOLS_LICENSE = GPLv2+
+INOTIFY_TOOLS_LICENSE = GPL
 INOTIFY_TOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From f3c33a354b74697dd792c4f5c03f348e974782b2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 22 Aug 2012 19:50:49 -0300
Subject: [PATCH 2595/6849] openssl: bump to version 1.0.1c

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index f9816afafb..16d13946b7 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0j
+OPENSSL_VERSION = 1.0.1c
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

From 721f339053217e04c6455cbbefec20dab47ec949 Mon Sep 17 00:00:00 2001
From: Stefan Froberg <stefan.froberg@petroprogram.com>
Date: Thu, 23 Aug 2012 01:11:55 +0300
Subject: [PATCH 2596/6849] freetype, libfuse, libpng, x11vnc, zlib: get rid of
 BR2_SOURCEFORGE_MIRROR

Signed-off-by: Stefan Froberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/freetype/freetype.mk | 2 +-
 package/libfuse/libfuse.mk   | 2 +-
 package/libpng/libpng.mk     | 2 +-
 package/x11vnc/x11vnc.mk     | 2 +-
 package/zlib/zlib.mk         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 448efe0b3c..796c37c3f1 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -5,8 +5,8 @@
 #############################################################
 
 FREETYPE_VERSION = 2.4.10
-FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
+FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_DEPENDENCIES = host-pkg-config \
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 5f748b4d55..246697fdd4 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -6,7 +6,7 @@
 
 LIBFUSE_VERSION = 2.9.0
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
-LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
+LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_CONF_OPT= --disable-nls \
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 1c1a087bfc..3bcd1b8470 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -6,8 +6,8 @@
 
 LIBPNG_VERSION = 1.4.12
 LIBPNG_SERIES = 14
-LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
 LIBPNG_LICENSE = libpng license
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 06d3f0da49..e96b665881 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -5,7 +5,7 @@
 #############################################################
 X11VNC_VERSION = 0.9.3
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
-X11VNC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver
+X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
 X11VNC_CONF_OPT = \
 	--without-avahi
 
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 2ddab6204f..f127138db1 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -6,7 +6,7 @@
 
 ZLIB_VERSION = 1.2.7
 ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+ZLIB_SITE = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION)
 ZLIB_LICENSE = zlib license
 ZLIB_LICENSE_FILES = README
 ZLIB_INSTALL_STAGING = YES

From d660fa32ad67b861ccb30d50a58c511b7999a6cc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 24 Aug 2012 23:35:15 +0200
Subject: [PATCH 2597/6849] Mention that BR2_SOURCEFORGE_MIRROR is deprecated

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Config.in b/Config.in
index b18c92721c..4a7e6b5b1b 100644
--- a/Config.in
+++ b/Config.in
@@ -151,6 +151,10 @@ config BR2_SOURCEFORGE_MIRROR
 	string "Sourceforge mirror site"
 	default "kent"
 	help
+	  Note: the usage of this variable is deprecated. Packages
+	  should instead use the http://downloads.sourceforge.net/ URL
+	  which automatically chooses a working mirror
+
 	  Sourceforge has a system of mirror sites.  Some sites may be
 	  closer to your location, and sometimes mirror sites go down
 	  and are no longer available.  This option allows you to select

From 5886b6f15cefa308c78b575069c560df78bf1050 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 24 Aug 2012 23:39:26 +0200
Subject: [PATCH 2598/6849] erlang: new package

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                     |  1 +
 package/erlang/Config.in              | 17 ++++++++
 package/erlang/erlang-build-fix.patch | 13 ++++++
 package/erlang/erlang.mk              | 57 +++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 package/erlang/Config.in
 create mode 100644 package/erlang/erlang-build-fix.patch
 create mode 100644 package/erlang/erlang.mk

diff --git a/package/Config.in b/package/Config.in
index d6a66fd311..d1b214cf50 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -247,6 +247,7 @@ source "package/xfsprogs/Config.in"
 endmenu
 
 menu "Interpreter languages and scripting"
+source "package/erlang/Config.in"
 source "package/haserl/Config.in"
 source "package/lua/Config.in"
 source "package/luajit/Config.in"
diff --git a/package/erlang/Config.in b/package/erlang/Config.in
new file mode 100644
index 0000000000..6dd5a39c3d
--- /dev/null
+++ b/package/erlang/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_ERLANG
+	bool "erlang"
+	help
+	  Erlang is a programming language used to build massively scalable
+	  soft real-time systems with requirements on high availability.
+	  Some of its uses are in telecoms, banking, e-commerce, computer
+	  telephony and instant messaging. Erlang's runtime system has
+	  built-in support for concurrency, distribution and fault tolerance.
+
+config BR2_PACKAGE_ERLANG_MEGACO
+	bool "install megaco application"
+	depends on BR2_PACKAGE_ERLANG
+	help
+	  The Megaco application is a framework for building applications
+	  on top of the Megaco/H.248 protocol. It is approximately 14MB in
+	  size so if you do not need it then it is recommended not to
+	  enable it.
diff --git a/package/erlang/erlang-build-fix.patch b/package/erlang/erlang-build-fix.patch
new file mode 100644
index 0000000000..ff821c9fc0
--- /dev/null
+++ b/package/erlang/erlang-build-fix.patch
@@ -0,0 +1,13 @@
+apply-patches.sh deletes this file from the source directory.
+
+--- erlang-R15B01.old/lib/tools/emacs/Makefile	2012-04-04
++++ erlang-R15B01/lib/tools/emacs/Makefile	2012-04-04 15:55:16.978957307 +0100
+@@ -51,7 +51,7 @@
+
+ ELC_FILES = $(EMACS_FILES:%=%.elc)
+
+-TEST_FILES = test.erl.indented test.erl.orig
++TEST_FILES = test.erl.indented
+
+ # ----------------------------------------------------
+ # Targets
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
new file mode 100644
index 0000000000..6b906270de
--- /dev/null
+++ b/package/erlang/erlang.mk
@@ -0,0 +1,57 @@
+#############################################################
+#
+# erlang
+#
+#############################################################
+
+ERLANG_VERSION = R15B01
+ERLANG_SITE = http://www.erlang.org/download
+ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
+ERLANG_DEPENDENCIES = host-erlang
+
+ERLANG_LICENSE = EPL
+ERLANG_LICENSE_FILES = EPLICENCE
+
+# The configure checks for these functions fail incorrectly
+ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
+
+ERLANG_CONF_OPT = --without-javac
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+ERLANG_CONF_OPT += --with-termcap
+ERLANG_DEPENDENCIES += ncurses
+else
+ERLANG_CONF_OPT += --without-termcap
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ERLANG_CONF_OPT += --with-ssl
+ERLANG_DEPENDENCIES += openssl
+else
+ERLANG_CONF_OPT += --without-ssl
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+ERLANG_CONF_OPT += --enable-shared-zlib
+ERLANG_DEPENDENCIES += zlib
+endif
+
+# Remove source, example, gs and wx files from the target
+ERLANG_REMOVE_PACKAGES = gs wx
+
+ifneq ($(BR2_PACKAGE_ERLANG_MEGACO),y)
+ERLANG_REMOVE_PACKAGES += megaco
+endif
+
+define ERLANG_REMOVE_UNUSED
+	find $(TARGET_DIR)/usr/lib/erlang -type d -name src -prune -exec rm -rf {} \;
+	find $(TARGET_DIR)/usr/lib/erlang -type d -name examples -prune -exec rm -rf {} \;
+	for package in $(ERLANG_REMOVE_PACKAGES); do \
+		rm -rf $(TARGET_DIR)/usr/lib/erlang/lib/$${package}-*; \
+	done
+endef
+
+ERLANG_POST_INSTALL_TARGET_HOOKS += ERLANG_REMOVE_UNUSED
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From 22afea3002e5357382704c8e15d8a03d54a6b869 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 21 Aug 2012 19:07:03 +0200
Subject: [PATCH 2599/6849] package/libnspr: add pkg-config file

Some packages use pkg-config to check for libnspr.

Add our own .pc file (vampirised from Debian).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libnspr/libnspr.mk | 16 ++++++++++++++++
 package/libnspr/nspr.pc.in | 10 ++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 package/libnspr/nspr.pc.in

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 689caa424c..736984d096 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -16,4 +16,20 @@ LIBNSPR_CONF_OPT  = --host=$(GNU_HOST_NAME)
 LIBNSPR_CONF_OPT += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
 LIBNSPR_CONF_OPT += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
+define LIBNSPR_INSTALL_STAGING_PC
+	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnspr/nspr.pc.in \
+		$(STAGING_DIR)/usr/lib/pkgconfig/nspr.pc
+	$(SED) 's/@VERSION@/$(LIBNSPR_VERSION)/g;' \
+		$(STAGING_DIR)/usr/lib/pkgconfig/nspr.pc
+endef
+LIBNSPR_POST_INSTALL_STAGING_HOOKS += LIBNSPR_INSTALL_STAGING_PC
+
+define LIBNSPR_INSTALL_TARGET_PC
+	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnspr/nspr.pc.in \
+		$(TARGET_DIR)/usr/lib/pkgconfig/nspr.pc
+	$(SED) 's/@VERSION@/$(LIBNSPR_VERSION)/g;' \
+		$(TARGET_DIR)/usr/lib/pkgconfig/nspr.pc
+endef
+LIBNSPR_POST_INSTALL_TARGET_HOOKS += LIBNSPR_INSTALL_TARGET_PC
+
 $(eval $(autotools-package))
diff --git a/package/libnspr/nspr.pc.in b/package/libnspr/nspr.pc.in
new file mode 100644
index 0000000000..44873d248e
--- /dev/null
+++ b/package/libnspr/nspr.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/nspr
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: @VERSION@
+Libs: -L${exec_prefix}/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+Cflags: -I${prefix}/include/nspr

From d59cd114d6e33cc6dd358c3708d70a1a5483dc56 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 21 Aug 2012 19:07:04 +0200
Subject: [PATCH 2600/6849] package/libnss: also install a pkg-config file

Some packages use pkg-config to check for libnss.

Add our own .pc file (vampirised from Debian).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libnss/libnss.mk |  8 ++++++++
 package/libnss/nss.pc.in | 11 +++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 package/libnss/nss.pc.in

diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index f7fd6820c4..84fc14996d 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -49,6 +49,10 @@ define LIBNSS_INSTALL_STAGING_CMDS
 		$(@D)/$(LIBNSS_DISTDIR)/public/nss/*
 	$(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib/ \
 		$(@D)/$(LIBNSS_DISTDIR)/lib/*.a
+	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \
+		$(STAGING_DIR)/usr/lib/pkgconfig/nss.pc
+	$(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \
+		$(STAGING_DIR)/usr/lib/pkgconfig/nss.pc
 endef
 
 define LIBNSS_INSTALL_TARGET_CMDS
@@ -59,6 +63,10 @@ define LIBNSS_INSTALL_TARGET_CMDS
 		$(@D)/$(LIBNSS_DISTDIR)/public/nss/*
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/lib/ \
 		$(@D)/$(LIBNSS_DISTDIR)/lib/*.a
+	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \
+		$(TARGET_DIR)/usr/lib/pkgconfig/nss.pc
+	$(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \
+		$(TARGET_DIR)/usr/lib/pkgconfig/nss.pc
 endef
 
 define LIBNSS_CLEAN_CMDS
diff --git a/package/libnss/nss.pc.in b/package/libnss/nss.pc.in
new file mode 100644
index 0000000000..e27783f64d
--- /dev/null
+++ b/package/libnss/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/nss
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @VERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Cflags: -I${includedir}

From c557c28e6948435de2af73c7814403c3c88a382b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 24 Aug 2012 09:59:29 +0200
Subject: [PATCH 2601/6849] gpsd: Fix lacking simplejson module error at build

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...d-05-fix-leapsecond-script-python2.5.patch | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch

diff --git a/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch b/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch
new file mode 100644
index 0000000000..8866b81d31
--- /dev/null
+++ b/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch
@@ -0,0 +1,71 @@
+the json module was added with python2.6, so a regular python 2.5
+machine will lack this module and won't probably have the simplejson
+module imported by the leapsecond.py script.
+
+Since the only function used is the isotime function, which is
+self-contained and quite trivial, only copy this function into the
+leapsecond script to avoid the import of the gps.misc module, which
+needs simplejson.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ leapsecond.py |   27 ++++++++++++++++++++++++---
+ 1 file changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/leapsecond.py b/leapsecond.py
+index 2059f6c..cdacdb4 100755
+--- a/leapsecond.py
++++ b/leapsecond.py
+@@ -24,7 +24,6 @@
+ # BSD terms apply: see the file COPYING in the distribution root for details.
+ #
+ import os, urllib, re, random, time, calendar, math, sys
+-import gps.misc
+ 
+ __locations = [
+     (
+@@ -48,6 +47,28 @@ __locations = [
+ # between times it might change, in seconds since Unix epoch GMT.
+ __cachepath = "/var/run/leapsecond"
+ 
++def isotime(s):
++    "Convert timestamps in ISO8661 format to and from Unix time."
++    if type(s) == type(1):
++        return time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(s))
++    elif type(s) == type(1.0):
++        date = int(s)
++        msec = s - date
++        date = time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(s))
++        return date + "." + repr(msec)[3:]
++    elif type(s) == type("") or type(s) == type(u""):
++        if s[-1] == "Z":
++            s = s[:-1]
++        if "." in s:
++            (date, msec) = s.split(".")
++        else:
++            date = s
++            msec = "0"
++        # Note: no leap-second correction!
++        return calendar.timegm(time.strptime(date, "%Y-%m-%dT%H:%M:%S")) + float("0." + msec)
++    else:
++        raise TypeError
++
+ def retrieve():
+     "Retrieve current leap-second from Web sources."
+     random.shuffle(__locations)	# To spread the load
+@@ -261,10 +282,10 @@ if __name__ == '__main__':
+             print unix_to_rfc822(float(val))
+             raise SystemExit, 0
+         elif (switch == '-I'):  # Compute Unix time from ISO8601 date
+-            print gps.misc.isotime(val)
++            print isotime(val)
+             raise SystemExit, 0
+         elif (switch == '-O'):  # Compute ISO8601 date from Unix time
+-            print gps.misc.isotime(float(val))
++            print isotime(float(val))
+             raise SystemExit, 0
+ 
+         print "Current leap second:", retrieve()
+-- 
+1.7.9.5
+

From a45b10baa71273eba6f9100e0e66eca5660a4062 Mon Sep 17 00:00:00 2001
From: "Shawn J. Goff" <shawnjgoff@gmail.com>
Date: Sat, 18 Aug 2012 10:04:16 -0400
Subject: [PATCH 2602/6849] ifplugd: add --with-initdir= to config command

ifplugd refuses to configure without this set.

Signed-off-by: Shawn J. Goff <shawnjgoff@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ifplugd/ifplugd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 1e11c1455d..d031a97512 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -12,7 +12,7 @@ IFPLUGD_AUTORECONF = YES
 
 # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
 IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
-IFPLUGD_CONF_OPT = --disable-lynx
+IFPLUGD_CONF_OPT = --disable-lynx --with-initdir=/etc/init.d/
 IFPLUGD_DEPENDENCIES = libdaemon
 
 # Prefer big ifplugd

From 8add5064c35f64fdf32d4f9b121b8f4c888ba1a2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 10:09:18 -0300
Subject: [PATCH 2603/6849] bash: security bump to version 4.2 pl37

Bump bash to version 4.2 patchlevel 37.
Fixes CVE-2012-3410.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bash/bash-4.2-021.patch |  61 ++++
 package/bash/bash-4.2-022.patch |  61 ++++
 package/bash/bash-4.2-023.patch |  62 ++++
 package/bash/bash-4.2-024.patch |  45 +++
 package/bash/bash-4.2-025.patch | 143 +++++++++
 package/bash/bash-4.2-026.patch |  58 ++++
 package/bash/bash-4.2-027.patch |  47 +++
 package/bash/bash-4.2-028.patch |  52 ++++
 package/bash/bash-4.2-029.patch | 524 ++++++++++++++++++++++++++++++++
 package/bash/bash-4.2-030.patch | 178 +++++++++++
 package/bash/bash-4.2-031.patch |  80 +++++
 package/bash/bash-4.2-032.patch |  75 +++++
 package/bash/bash-4.2-033.patch |  57 ++++
 package/bash/bash-4.2-034.patch |  46 +++
 package/bash/bash-4.2-035.patch |  66 ++++
 package/bash/bash-4.2-036.patch |  92 ++++++
 package/bash/bash-4.2-037.patch | 112 +++++++
 17 files changed, 1759 insertions(+)
 create mode 100644 package/bash/bash-4.2-021.patch
 create mode 100644 package/bash/bash-4.2-022.patch
 create mode 100644 package/bash/bash-4.2-023.patch
 create mode 100644 package/bash/bash-4.2-024.patch
 create mode 100644 package/bash/bash-4.2-025.patch
 create mode 100644 package/bash/bash-4.2-026.patch
 create mode 100644 package/bash/bash-4.2-027.patch
 create mode 100644 package/bash/bash-4.2-028.patch
 create mode 100644 package/bash/bash-4.2-029.patch
 create mode 100644 package/bash/bash-4.2-030.patch
 create mode 100644 package/bash/bash-4.2-031.patch
 create mode 100644 package/bash/bash-4.2-032.patch
 create mode 100644 package/bash/bash-4.2-033.patch
 create mode 100644 package/bash/bash-4.2-034.patch
 create mode 100644 package/bash/bash-4.2-035.patch
 create mode 100644 package/bash/bash-4.2-036.patch
 create mode 100644 package/bash/bash-4.2-037.patch

diff --git a/package/bash/bash-4.2-021.patch b/package/bash/bash-4.2-021.patch
new file mode 100644
index 0000000000..82e00fd3be
--- /dev/null
+++ b/package/bash/bash-4.2-021.patch
@@ -0,0 +1,61 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-021
+
+Bug-Reported-by:	Dan Douglas <ormaaj@gmail.com>
+Bug-Reference-ID:	<4585554.nZWb4q7YoZ@smorgbox>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html
+
+Bug-Description:
+
+Using `read -N' to assign values to an array can result in NUL values being
+assigned to some array elements.  These values cause seg faults when referenced
+later.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/read.def	2011-11-21 18:03:38.000000000 -0500
+--- ./builtins/read.def	2011-12-19 19:52:12.000000000 -0500
+***************
+*** 738,742 ****
+  	    }
+  	  else
+! 	    var = bind_read_variable (varname, t);
+  	}
+        else
+--- 775,779 ----
+  	    }
+  	  else
+! 	    var = bind_read_variable (varname, t ? t : "");
+  	}
+        else
+***************
+*** 799,803 ****
+      }
+    else
+!     var = bind_read_variable (list->word->word, input_string);
+  
+    if (var)
+--- 836,840 ----
+      }
+    else
+!     var = bind_read_variable (list->word->word, input_string ? input_string : "");
+  
+    if (var)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-022.patch b/package/bash/bash-4.2-022.patch
new file mode 100644
index 0000000000..cb0ac3f1c1
--- /dev/null
+++ b/package/bash/bash-4.2-022.patch
@@ -0,0 +1,61 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-022
+
+Bug-Reported-by:	Gregory Margo <gmargo@pacbell.net>
+Bug-Reference-ID:	<20110727174529.GA3333@pacbell.net>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html
+
+Bug-Description:
+
+The return value from lseek is `off_t'.  This can cause corrupted return
+values when the file offset is greater than 2**31 - 1.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/sh/zread.c	Mon Mar  2 08:54:45 2009
+--- ./lib/sh/zread.c	Thu Jul 28 18:16:53 2011
+***************
+*** 161,166 ****
+       int fd;
+  {
+!   off_t off;
+!   int r;
+  
+    off = lused - lind;
+--- 161,165 ----
+       int fd;
+  {
+!   off_t off, r;
+  
+    off = lused - lind;
+***************
+*** 169,173 ****
+      r = lseek (fd, -off, SEEK_CUR);
+  
+!   if (r >= 0)
+      lused = lind = 0;
+  }
+--- 168,172 ----
+      r = lseek (fd, -off, SEEK_CUR);
+  
+!   if (r != -1)
+      lused = lind = 0;
+  }
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-023.patch b/package/bash/bash-4.2-023.patch
new file mode 100644
index 0000000000..8c5addeb01
--- /dev/null
+++ b/package/bash/bash-4.2-023.patch
@@ -0,0 +1,62 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-023
+
+Bug-Reported-by:	Ewan Mellor <Ewan.Mellor@eu.citrix.com>
+Bug-Reference-ID:	<6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net>
+Bug-Reference-URL:	
+
+Bug-Description:
+
+Under some circumstances, an exit trap triggered by a bad substitution
+error when errexit is enabled will cause the shell to exit with an
+incorrect exit status (0).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2011-11-21 12:04:38.000000000 -0500
+--- ./subst.c	2012-02-08 13:36:28.000000000 -0500
+***************
+*** 7275,7278 ****
+--- 7281,7285 ----
+      case '\0':
+      bad_substitution:
++       last_command_exit_value = EXECUTION_FAILURE;
+        report_error (_("%s: bad substitution"), string ? string : "??");
+        FREE (value);
+*** ../bash-4.2-patched/error.c	2009-08-21 22:31:31.000000000 -0400
+--- ./error.c	2012-02-25 15:54:40.000000000 -0500
+***************
+*** 201,205 ****
+    va_end (args);
+    if (exit_immediately_on_error)
+!     exit_shell (1);
+  }
+  
+--- 201,209 ----
+    va_end (args);
+    if (exit_immediately_on_error)
+!     {
+!       if (last_command_exit_value == 0)
+! 	last_command_exit_value = 1;
+!       exit_shell (last_command_exit_value);
+!     }
+  }
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-024.patch b/package/bash/bash-4.2-024.patch
new file mode 100644
index 0000000000..6ee6d8fbeb
--- /dev/null
+++ b/package/bash/bash-4.2-024.patch
@@ -0,0 +1,45 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-024
+
+Bug-Reported-by:	Jim Avera <james_avera@yahoo.com>
+Bug-Reference-ID:	<4F29E07A.80405@yahoo.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html
+
+Bug-Description:
+
+When `printf -v' is used to set an array element, the format string contains
+`%b', and the corresponding argument is the empty string, the buffer used
+to store the value to be assigned can be NULL, which results in NUL being
+assigned to the array element.  This causes a seg fault when it's used later.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/printf.def	2011-02-25 12:07:41.000000000 -0500
+--- ./builtins/printf.def	2012-02-02 08:37:12.000000000 -0500
+***************
+*** 256,259 ****
+--- 257,262 ----
+  	    {
+  	      vflag = 1;
++ 	      if (vbsize == 0)
++ 		vbuf = xmalloc (vbsize = 16);
+  	      vblen = 0;
+  	      if (vbuf)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 24
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-025.patch b/package/bash/bash-4.2-025.patch
new file mode 100644
index 0000000000..b57ee7d55c
--- /dev/null
+++ b/package/bash/bash-4.2-025.patch
@@ -0,0 +1,143 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-025
+
+Bug-Reported-by:	Bill Gradwohl <bill@ycc.com>
+Bug-Reference-ID:	<CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html
+
+Bug-Description:
+
+When used in a shell function, `declare -g -a array=(compound assignment)'
+creates a local variable instead of a global one.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/command.h	2010-08-02 19:36:51.000000000 -0400
+--- ./command.h	2012-04-01 12:38:35.000000000 -0400
+***************
+*** 98,101 ****
+--- 98,102 ----
+  #define W_ASSIGNASSOC	0x400000	/* word looks like associative array assignment */
+  #define W_ARRAYIND	0x800000	/* word is an array index being expanded */
++ #define W_ASSNGLOBAL	0x1000000	/* word is a global assignment to declare (declare/typeset -g) */
+  
+  /* Possible values for subshell_environment */
+*** ../bash-4.2-patched/execute_cmd.c	2011-11-21 18:03:41.000000000 -0500
+--- ./execute_cmd.c	2012-04-01 12:42:03.000000000 -0400
+***************
+*** 3581,3585 ****
+    WORD_LIST *w;
+    struct builtin *b;
+!   int assoc;
+  
+    if (words == 0)
+--- 3581,3585 ----
+    WORD_LIST *w;
+    struct builtin *b;
+!   int assoc, global;
+  
+    if (words == 0)
+***************
+*** 3587,3591 ****
+  
+    b = 0;
+!   assoc = 0;
+  
+    for (w = words; w; w = w->next)
+--- 3587,3591 ----
+  
+    b = 0;
+!   assoc = global = 0;
+  
+    for (w = words; w; w = w->next)
+***************
+*** 3604,3607 ****
+--- 3604,3609 ----
+  	if (assoc)
+  	  w->word->flags |= W_ASSIGNASSOC;
++ 	if (global)
++ 	  w->word->flags |= W_ASSNGLOBAL;
+  #endif
+        }
+***************
+*** 3609,3613 ****
+      /* Note that we saw an associative array option to a builtin that takes
+         assignment statements.  This is a bit of a kludge. */
+!     else if (w->word->word[0] == '-' && strchr (w->word->word, 'A'))
+        {
+  	if (b == 0)
+--- 3611,3618 ----
+      /* Note that we saw an associative array option to a builtin that takes
+         assignment statements.  This is a bit of a kludge. */
+!     else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g')))
+! #else
+!     else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g'))
+! #endif
+        {
+  	if (b == 0)
+***************
+*** 3619,3626 ****
+  	      words->word->flags |= W_ASSNBLTIN;
+  	  }
+! 	if (words->word->flags & W_ASSNBLTIN)
+  	  assoc = 1;
+        }
+- #endif
+  }
+  
+--- 3624,3632 ----
+  	      words->word->flags |= W_ASSNBLTIN;
+  	  }
+! 	if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A'))
+  	  assoc = 1;
++ 	if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g'))
++ 	  global = 1;
+        }
+  }
+  
+*** ../bash-4.2-patched/subst.c	2012-03-11 17:35:13.000000000 -0400
+--- ./subst.c	2012-04-01 12:38:35.000000000 -0400
+***************
+*** 367,370 ****
+--- 367,375 ----
+        fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : "");
+      }
++   if (f & W_ASSNGLOBAL)
++     {
++       f &= ~W_ASSNGLOBAL;
++       fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : "");
++     }
+    if (f & W_COMPASSIGN)
+      {
+***************
+*** 2804,2808 ****
+    else if (assign_list)
+      {
+!       if (word->flags & W_ASSIGNARG)
+  	aflags |= ASS_MKLOCAL;
+        if (word->flags & W_ASSIGNASSOC)
+--- 2809,2813 ----
+    else if (assign_list)
+      {
+!       if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0)
+  	aflags |= ASS_MKLOCAL;
+        if (word->flags & W_ASSIGNASSOC)
+
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 24
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 25
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-026.patch b/package/bash/bash-4.2-026.patch
new file mode 100644
index 0000000000..06f8bb7aa2
--- /dev/null
+++ b/package/bash/bash-4.2-026.patch
@@ -0,0 +1,58 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-026
+
+Bug-Reported-by:	Greg Wooledge <wooledg@eeg.ccf.org>
+Bug-Reference-ID:	<20120425180443.GO22241@eeg.ccf.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html
+
+Bug-Description:
+
+The `lastpipe' option does not behave correctly on machines where the
+open file limit is less than 256.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/execute_cmd.c	2011-11-21 12:04:47.000000000 -0500
+--- ./execute_cmd.c	2012-04-26 11:09:30.000000000 -0400
+***************
+*** 2206,2210 ****
+    if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
+      {
+!       lstdin = move_to_high_fd (0, 0, 255);
+        if (lstdin > 0)
+  	{
+--- 2325,2329 ----
+    if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
+      {
+!       lstdin = move_to_high_fd (0, 1, -1);
+        if (lstdin > 0)
+  	{
+***************
+*** 2252,2256 ****
+--- 2371,2377 ----
+      }
+  
++ #if defined (JOB_CONTROL)
+    discard_unwind_frame ("lastpipe-exec");
++ #endif
+  
+    return (exec_result);
+
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 25
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 26
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-027.patch b/package/bash/bash-4.2-027.patch
new file mode 100644
index 0000000000..381ffe124f
--- /dev/null
+++ b/package/bash/bash-4.2-027.patch
@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-027
+
+Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID:	<201204211243.30163.vapier@gentoo.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html
+
+Bug-Description:
+
+When the `extglob' shell option is enabled, pattern substitution does not
+work correctly in the presence of multibyte characters.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2012-03-11 17:52:57.000000000 -0400
+--- ./subst.c	2012-04-22 16:19:10.000000000 -0400
+***************
+*** 4167,4171 ****
+  #if defined (EXTENDED_GLOB)
+    if (extended_glob)
+!     simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
+  #endif
+  
+--- 4167,4171 ----
+  #if defined (EXTENDED_GLOB)
+    if (extended_glob)
+!     simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
+  #endif
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 26
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 27
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-028.patch b/package/bash/bash-4.2-028.patch
new file mode 100644
index 0000000000..28dfc71d59
--- /dev/null
+++ b/package/bash/bash-4.2-028.patch
@@ -0,0 +1,52 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-028
+
+Bug-Reported-by:	Mark Edgar <medgar123@gmail.com>
+Bug-Reference-ID:	<CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html
+
+Bug-Description:
+
+When using a word expansion for which the right hand side is evaluated,
+certain expansions of quoted null strings include spurious ^? characters.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2012-03-11 17:35:13.000000000 -0400
+--- ./subst.c	2012-03-20 19:30:13.000000000 -0400
+***************
+*** 5810,5813 ****
+--- 5810,5823 ----
+        if (qdollaratp && ((hasdol && quoted) || l->next))
+  	*qdollaratp = 1;
++       /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is
++ 	 a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the
++ 	 flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the
++ 	 expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
++ 	 (which is more paranoia than anything else), we need to return the
++ 	 quoted null string and set the flags to indicate it. */
++       if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL))
++ 	{
++ 	  w->flags |= W_HASQUOTEDNULL;
++ 	}
+        dispose_words (l);
+      }
+
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 27
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 28
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-029.patch b/package/bash/bash-4.2-029.patch
new file mode 100644
index 0000000000..31322f2577
--- /dev/null
+++ b/package/bash/bash-4.2-029.patch
@@ -0,0 +1,524 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-029
+
+Bug-Reported-by:	"Michael Kalisz" <michael@kalisz.homelinux.net>
+Bug-Reference-ID:	<50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html
+
+Bug-Description:
+
+Bash-4.2 tries to leave completed directory names as the user typed them,
+without expanding them to a full pathname.  One effect of this is that
+shell variables used in pathnames being completed (e.g., $HOME) are left
+unchanged, but the `$' is quoted by readline because it is a special
+character to the shell.
+
+This patch introduces two things:
+
+1.  A new shell option, `direxpand', which, if set, attempts to emulate the
+    bash-4.1 behavior of expanding words to full pathnames during
+    completion;
+2.  A set of heuristics that reduce the number of times special characters
+    such as `$' are quoted when the directory name is not expanded.
+
+Patch (apply with `patch -p0'):
+
+diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c
+*** ../bash-4.2-patched/bashline.c	2011-01-16 15:32:47.000000000 -0500
+--- ./bashline.c	2012-05-07 16:27:18.000000000 -0400
+***************
+*** 122,125 ****
+--- 122,128 ----
+  static int bash_push_line __P((void));
+  
++ static rl_icppfunc_t *save_directory_hook __P((void));
++ static void reset_directory_hook __P((rl_icppfunc_t *));
++ 
+  static void cleanup_expansion_error __P((void));
+  static void maybe_make_readline_line __P((char *));
+***************
+*** 244,251 ****
+--- 247,261 ----
+  int dircomplete_spelling = 0;
+  
++ /* Expand directory names during word/filename completion. */
++ int dircomplete_expand = 0;
++ int dircomplete_expand_relpath = 0;
++ 
+  static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
+  static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
+  /* )) */
+  
++ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
++ static char *custom_filename_quote_characters = 0;
++ 
+  static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
+  
+***************
+*** 502,506 ****
+    /* Tell the completer that we might want to follow symbolic links or
+       do other expansion on directory names. */
+!   rl_directory_rewrite_hook = bash_directory_completion_hook;
+  
+    rl_filename_rewrite_hook = bash_filename_rewrite_hook;
+--- 512,516 ----
+    /* Tell the completer that we might want to follow symbolic links or
+       do other expansion on directory names. */
+!   set_directory_hook ();
+  
+    rl_filename_rewrite_hook = bash_filename_rewrite_hook;
+***************
+*** 530,534 ****
+  
+    /* characters that need to be quoted when appearing in filenames. */
+!   rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
+  
+    rl_filename_quoting_function = bash_quote_filename;
+--- 540,544 ----
+  
+    /* characters that need to be quoted when appearing in filenames. */
+!   rl_filename_quote_characters = default_filename_quote_characters;
+  
+    rl_filename_quoting_function = bash_quote_filename;
+***************
+*** 565,570 ****
+    rl_attempted_completion_function = attempt_shell_completion;
+    rl_completion_entry_function = NULL;
+-   rl_directory_rewrite_hook = bash_directory_completion_hook;
+    rl_ignore_some_completions_function = filename_completion_ignore;
+  }
+  
+--- 575,582 ----
+    rl_attempted_completion_function = attempt_shell_completion;
+    rl_completion_entry_function = NULL;
+    rl_ignore_some_completions_function = filename_completion_ignore;
++   rl_filename_quote_characters = default_filename_quote_characters;
++ 
++   set_directory_hook ();
+  }
+  
+***************
+*** 1280,1283 ****
+--- 1292,1298 ----
+    rl_ignore_some_completions_function = filename_completion_ignore;
+  
++   rl_filename_quote_characters = default_filename_quote_characters;
++   set_directory_hook ();
++ 
+    /* Determine if this could be a command word.  It is if it appears at
+       the start of the line (ignoring preceding whitespace), or if it
+***************
+*** 1592,1595 ****
+--- 1607,1616 ----
+  	  else
+  	    {
++ 	     if (dircomplete_expand && dot_or_dotdot (filename_hint))
++ 		{
++ 		  dircomplete_expand = 0;
++ 		  set_directory_hook ();
++ 		  dircomplete_expand = 1;
++ 		}
+  	      mapping_over = 4;
+  	      goto inner;
+***************
+*** 1792,1795 ****
+--- 1813,1819 ----
+   inner:
+    val = rl_filename_completion_function (filename_hint, istate);
++   if (mapping_over == 4 && dircomplete_expand)
++     set_directory_hook ();
++ 
+    istate = 1;
+  
+***************
+*** 2694,2697 ****
+--- 2718,2767 ----
+  }
+  
++ /* Functions to save and restore the appropriate directory hook */
++ /* This is not static so the shopt code can call it */
++ void
++ set_directory_hook ()
++ {
++   if (dircomplete_expand)
++     {
++       rl_directory_completion_hook = bash_directory_completion_hook;
++       rl_directory_rewrite_hook = (rl_icppfunc_t *)0;
++     }
++   else
++     {
++       rl_directory_rewrite_hook = bash_directory_completion_hook;
++       rl_directory_completion_hook = (rl_icppfunc_t *)0;
++     }
++ }
++ 
++ static rl_icppfunc_t *
++ save_directory_hook ()
++ {
++   rl_icppfunc_t *ret;
++ 
++   if (dircomplete_expand)
++     {
++       ret = rl_directory_completion_hook;
++       rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
++     }
++   else
++     {
++       ret = rl_directory_rewrite_hook;
++       rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
++     }
++ 
++   return ret;
++ }
++ 
++ static void
++ restore_directory_hook (hookf)
++      rl_icppfunc_t *hookf;
++ {
++   if (dircomplete_expand)
++     rl_directory_completion_hook = hookf;
++   else
++     rl_directory_rewrite_hook = hookf;
++ }
++ 
+  /* Handle symbolic link references and other directory name
+     expansions while hacking completion.  This should return 1 if it modifies
+***************
+*** 2703,2720 ****
+  {
+    char *local_dirname, *new_dirname, *t;
+!   int return_value, should_expand_dirname;
+    WORD_LIST *wl;
+    struct stat sb;
+  
+!   return_value = should_expand_dirname = 0;
+    local_dirname = *dirname;
+  
+!   if (mbschr (local_dirname, '$'))
+!     should_expand_dirname = 1;
+    else
+      {
+        t = mbschr (local_dirname, '`');
+        if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
+! 	should_expand_dirname = 1;
+      }
+  
+--- 2773,2801 ----
+  {
+    char *local_dirname, *new_dirname, *t;
+!   int return_value, should_expand_dirname, nextch, closer;
+    WORD_LIST *wl;
+    struct stat sb;
+  
+!   return_value = should_expand_dirname = nextch = closer = 0;
+    local_dirname = *dirname;
+  
+!   if (t = mbschr (local_dirname, '$'))
+!     {
+!       should_expand_dirname = '$';
+!       nextch = t[1];
+!       /* Deliberately does not handle the deprecated $[...] arithmetic
+! 	 expansion syntax */
+!       if (nextch == '(')
+! 	closer = ')';
+!       else if (nextch == '{')
+! 	closer = '}';
+!       else
+! 	nextch = 0;
+!     }
+    else
+      {
+        t = mbschr (local_dirname, '`');
+        if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
+! 	should_expand_dirname = '`';
+      }
+  
+***************
+*** 2740,2743 ****
+--- 2821,2841 ----
+  	  dispose_words (wl);
+  	  local_dirname = *dirname;
++ 	  /* XXX - change rl_filename_quote_characters here based on
++ 	     should_expand_dirname/nextch/closer.  This is the only place
++ 	     custom_filename_quote_characters is modified. */
++ 	  if (rl_filename_quote_characters && *rl_filename_quote_characters)
++ 	    {
++ 	      int i, j, c;
++ 	      i = strlen (default_filename_quote_characters);
++ 	      custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1);
++ 	      for (i = j = 0; c = default_filename_quote_characters[i]; i++)
++ 		{
++ 		  if (c == should_expand_dirname || c == nextch || c == closer)
++ 		    continue;
++ 		  custom_filename_quote_characters[j++] = c;
++ 		}
++ 	      custom_filename_quote_characters[j] = '\0';
++ 	      rl_filename_quote_characters = custom_filename_quote_characters;
++ 	    }
+  	}
+        else
+***************
+*** 2759,2762 ****
+--- 2857,2871 ----
+      }
+  
++   /* no_symbolic_links == 0 -> use (default) logical view of the file system.
++      local_dirname[0] == '.' && local_dirname[1] == '/' means files in the
++      current directory (./).
++      local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames
++      in the current directory (e.g., lib/sh).
++      XXX - should we do spelling correction on these? */
++ 
++   /* This is test as it was in bash-4.2: skip relative pathnames in current
++      directory.  Change test to
++       (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/'))
++      if we want to skip paths beginning with ./ also. */
+    if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1]))
+      {
+***************
+*** 2764,2767 ****
+--- 2873,2885 ----
+        int len1, len2;
+  
++       /* If we have a relative path
++       		(local_dirname[0] != '/' && local_dirname[0] != '.')
++ 	 that is canonical after appending it to the current directory, then
++ 	 	temp1 = temp2+'/'
++ 	 That is,
++ 	 	strcmp (temp1, temp2) == 0
++ 	 after adding a slash to temp2 below.  It should be safe to not
++ 	 change those.
++       */
+        t = get_working_directory ("symlink-hook");
+        temp1 = make_absolute (local_dirname, t);
+***************
+*** 2798,2802 ****
+  	    }
+  	}
+!       return_value |= STREQ (local_dirname, temp2) == 0;
+        free (local_dirname);
+        *dirname = temp2;
+--- 2916,2928 ----
+  	    }
+  	}
+! 
+!       /* dircomplete_expand_relpath == 0 means we want to leave relative
+! 	 pathnames that are unchanged by canonicalization alone.
+! 	 *local_dirname != '/' && *local_dirname != '.' == relative pathname
+! 	 (consistent with general.c:absolute_pathname())
+! 	 temp1 == temp2 (after appending a slash to temp2) means the pathname
+! 	 is not changed by canonicalization as described above. */
+!       if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0))
+! 	return_value |= STREQ (local_dirname, temp2) == 0;
+        free (local_dirname);
+        *dirname = temp2;
+***************
+*** 3003,3012 ****
+    orig_func = rl_completion_entry_function;
+    orig_attempt_func = rl_attempted_completion_function;
+-   orig_dir_func = rl_directory_rewrite_hook;
+    orig_ignore_func = rl_ignore_some_completions_function;
+    orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
+    rl_completion_entry_function = rl_filename_completion_function;
+    rl_attempted_completion_function = (rl_completion_func_t *)NULL;
+-   rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
+    rl_ignore_some_completions_function = filename_completion_ignore;
+    rl_completer_word_break_characters = " \t\n\"\'";
+--- 3129,3139 ----
+    orig_func = rl_completion_entry_function;
+    orig_attempt_func = rl_attempted_completion_function;
+    orig_ignore_func = rl_ignore_some_completions_function;
+    orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
++ 
++   orig_dir_func = save_directory_hook ();
++ 
+    rl_completion_entry_function = rl_filename_completion_function;
+    rl_attempted_completion_function = (rl_completion_func_t *)NULL;
+    rl_ignore_some_completions_function = filename_completion_ignore;
+    rl_completer_word_break_characters = " \t\n\"\'";
+***************
+*** 3016,3023 ****
+    rl_completion_entry_function = orig_func;
+    rl_attempted_completion_function = orig_attempt_func;
+-   rl_directory_rewrite_hook = orig_dir_func;
+    rl_ignore_some_completions_function = orig_ignore_func;
+    rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
+  
+    return r;
+  }
+--- 3143,3151 ----
+    rl_completion_entry_function = orig_func;
+    rl_attempted_completion_function = orig_attempt_func;
+    rl_ignore_some_completions_function = orig_ignore_func;
+    rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
+  
++   restore_directory_hook (orig_dir_func);
++ 
+    return r;
+  }
+diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h
+*** ../bash-4.2-patched/bashline.h	2009-01-04 14:32:22.000000000 -0500
+--- ./bashline.h	2012-05-07 16:27:18.000000000 -0400
+***************
+*** 34,41 ****
+--- 34,46 ----
+  extern int bash_re_edit __P((char *));
+  
++ extern void bashline_set_event_hook __P((void));
++ extern void bashline_reset_event_hook __P((void));
++ 
+  extern int bind_keyseq_to_unix_command __P((char *));
+  
+  extern char **bash_default_completion __P((const char *, int, int, int, int));
+  
++ void set_directory_hook __P((void));
++ 
+  /* Used by programmable completion code. */
+  extern char *command_word_completion_function __P((const char *, int));
+diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def
+*** ../bash-4.2-patched/builtins/shopt.def	2010-07-02 22:42:44.000000000 -0400
+--- ./builtins/shopt.def	2012-05-07 16:27:18.000000000 -0400
+***************
+*** 62,65 ****
+--- 62,69 ----
+  #include "bashgetopt.h"
+  
++ #if defined (READLINE)
++ #  include "../bashline.h"
++ #endif
++ 
+  #if defined (HISTORY)
+  #  include "../bashhist.h"
+***************
+*** 95,99 ****
+  extern int no_empty_command_completion;
+  extern int force_fignore;
+! extern int dircomplete_spelling;
+  
+  extern int enable_hostname_completion __P((int));
+--- 99,103 ----
+  extern int no_empty_command_completion;
+  extern int force_fignore;
+! extern int dircomplete_spelling, dircomplete_expand;
+  
+  extern int enable_hostname_completion __P((int));
+***************
+*** 122,125 ****
+--- 126,133 ----
+  #endif
+  
++ #if defined (READLINE)
++ static int shopt_set_complete_direxpand __P((char *, int));
++ #endif
++ 
+  static int shopt_login_shell;
+  static int shopt_compat31;
+***************
+*** 151,154 ****
+--- 159,163 ----
+    { "compat41", &shopt_compat41, set_compatibility_level },
+  #if defined (READLINE)
++   { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
+    { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
+  #endif
+***************
+*** 536,539 ****
+--- 545,559 ----
+  }
+  
++ #if defined (READLINE)
++ static int
++ shopt_set_complete_direxpand (option_name, mode)
++      char *option_name;
++      int mode;
++ {
++   set_directory_hook ();
++   return 0;
++ }
++ #endif
++ 
+  #if defined (RESTRICTED_SHELL)
+  /* Don't allow the value of restricted_shell to be modified. */
+Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ
+diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1
+*** ../bash-4.2-patched/doc/bash.1	2011-01-16 15:31:39.000000000 -0500
+--- ./doc/bash.1	2012-05-07 16:27:18.000000000 -0400
+***************
+*** 8949,8952 ****
+--- 8949,8962 ----
+  The default bash behavior remains as in previous versions.
+  .TP 8
++ .B direxpand
++ If set,
++ .B bash
++ replaces directory names with the results of word expansion when performing
++ filename completion.  This changes the contents of the readline editing
++ buffer.
++ If not set,
++ .B bash
++ attempts to preserve what the user typed.
++ .TP 8
+  .B dirspell
+  If set,
+diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi
+*** ../bash-4.2-patched/doc/bashref.texi	2011-01-16 15:31:57.000000000 -0500
+--- ./doc/bashref.texi	2012-05-07 16:27:18.000000000 -0400
+***************
+*** 4536,4539 ****
+--- 4536,4546 ----
+  The default Bash behavior remains as in previous versions.
+  
++ @item direxpand
++ If set, Bash
++ replaces directory names with the results of word expansion when performing
++ filename completion.  This changes the contents of the readline editing
++ buffer.
++ If not set, Bash attempts to preserve what the user typed.
++ 
+  @item dirspell
+  If set, Bash
+diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right
+*** ../bash-4.2-patched/tests/shopt.right	2010-07-02 23:36:30.000000000 -0400
+--- ./tests/shopt.right	2012-05-07 16:27:18.000000000 -0400
+***************
+*** 13,16 ****
+--- 13,17 ----
+  shopt -u compat40
+  shopt -u compat41
++ shopt -u direxpand
+  shopt -u dirspell
+  shopt -u dotglob
+***************
+*** 69,72 ****
+--- 70,74 ----
+  shopt -u compat40
+  shopt -u compat41
++ shopt -u direxpand
+  shopt -u dirspell
+  shopt -u dotglob
+***************
+*** 102,105 ****
+--- 104,108 ----
+  compat40       	off
+  compat41       	off
++ direxpand      	off
+  dirspell       	off
+  dotglob        	off
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 28
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 29
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-030.patch b/package/bash/bash-4.2-030.patch
new file mode 100644
index 0000000000..7c6fef02bf
--- /dev/null
+++ b/package/bash/bash-4.2-030.patch
@@ -0,0 +1,178 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-030
+
+Bug-Reported-by:	Roman Rakus <rrakus@redhat.com>
+Bug-Reference-ID:	<4D7DD91E.7040808@redhat.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html
+
+Bug-Description:
+
+When attempting to glob strings in a multibyte locale, and those strings
+contain invalid multibyte characters that cause mbsnrtowcs to return 0,
+the globbing code loops infinitely.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c	2010-05-30 18:36:27.000000000 -0400
+--- ./lib/glob/xmbsrtowcs.c	2011-03-22 16:06:47.000000000 -0400
+***************
+*** 36,39 ****
+--- 36,41 ----
+  #if HANDLE_MULTIBYTE
+  
++ #define WSBUF_INC 32
++ 
+  #ifndef FREE
+  #  define FREE(x)	do { if (x) free (x); } while (0)
+***************
+*** 149,153 ****
+    size_t wcnum;		/* Number of wide characters in WSBUF */
+    mbstate_t state;	/* Conversion State */
+!   size_t wcslength;	/* Number of wide characters produced by the conversion. */
+    const char *end_or_backslash;
+    size_t nms;	/* Number of multibyte characters to convert at one time. */
+--- 151,155 ----
+    size_t wcnum;		/* Number of wide characters in WSBUF */
+    mbstate_t state;	/* Conversion State */
+!   size_t n, wcslength;	/* Number of wide characters produced by the conversion. */
+    const char *end_or_backslash;
+    size_t nms;	/* Number of multibyte characters to convert at one time. */
+***************
+*** 172,176 ****
+        tmp_p = p;
+        tmp_state = state;
+!       wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state);
+  
+        /* Conversion failed. */
+--- 174,189 ----
+        tmp_p = p;
+        tmp_state = state;
+! 
+!       if (nms == 0 && *p == '\\')	/* special initial case */
+! 	nms = wcslength = 1;
+!       else
+! 	wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state);
+! 
+!       if (wcslength == 0)
+! 	{
+! 	  tmp_p = p;		/* will need below */
+! 	  tmp_state = state;
+! 	  wcslength = 1;	/* take a single byte */
+! 	}
+  
+        /* Conversion failed. */
+***************
+*** 187,191 ****
+  	  wchar_t *wstmp;
+  
+! 	  wsbuf_size = wcnum+wcslength+1;	/* 1 for the L'\0' or the potential L'\\' */
+  
+  	  wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
+--- 200,205 ----
+  	  wchar_t *wstmp;
+  
+! 	  while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */
+! 	    wsbuf_size += WSBUF_INC;
+  
+  	  wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
+***************
+*** 200,207 ****
+  
+        /* Perform the conversion. This is assumed to return 'wcslength'.
+!        * It may set 'p' to NULL. */
+!       mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
+  
+!       wcnum += wcslength;
+  
+        if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
+--- 214,229 ----
+  
+        /* Perform the conversion. This is assumed to return 'wcslength'.
+! 	 It may set 'p' to NULL. */
+!       n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
+  
+!       /* Compensate for taking single byte on wcs conversion failure above. */
+!       if (wcslength == 1 && (n == 0 || n == (size_t)-1))
+! 	{
+! 	  state = tmp_state;
+! 	  p = tmp_p;
+! 	  wsbuf[wcnum++] = *p++;
+! 	}
+!       else
+!         wcnum += wcslength;
+  
+        if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
+***************
+*** 231,236 ****
+     of DESTP and INDICESP are NULL. */
+  
+- #define WSBUF_INC 32
+- 
+  size_t
+  xdupmbstowcs (destp, indicesp, src)
+--- 253,256 ----
+*** ../bash-4.2-patched/lib/glob/glob.c	2009-11-14 18:39:30.000000000 -0500
+--- ./lib/glob/glob.c	2012-07-07 12:09:56.000000000 -0400
+***************
+*** 201,206 ****
+    size_t pat_n, dn_n;
+  
+    pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
+!   dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
+  
+    ret = 0;
+--- 201,209 ----
+    size_t pat_n, dn_n;
+  
++   pat_wc = dn_wc = (wchar_t *)NULL;
++ 
+    pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
+!   if (pat_n != (size_t)-1)
+!     dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
+  
+    ret = 0;
+***************
+*** 222,225 ****
+--- 225,230 ----
+  	ret = 1;
+      }
++   else
++     ret = skipname (pat, dname, flags);
+  
+    FREE (pat_wc);
+***************
+*** 267,272 ****
+    n = xdupmbstowcs (&wpathname, NULL, pathname);
+    if (n == (size_t) -1)
+!     /* Something wrong. */
+!     return;
+    orig_wpathname = wpathname;
+  
+--- 272,280 ----
+    n = xdupmbstowcs (&wpathname, NULL, pathname);
+    if (n == (size_t) -1)
+!     {
+!       /* Something wrong.  Fall back to single-byte */
+!       udequote_pathname (pathname);
+!       return;
+!     }
+    orig_wpathname = wpathname;
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 29
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 30
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-031.patch b/package/bash/bash-4.2-031.patch
new file mode 100644
index 0000000000..d0077f3ef7
--- /dev/null
+++ b/package/bash/bash-4.2-031.patch
@@ -0,0 +1,80 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-031
+
+Bug-Reported-by:	Max Horn <max@quendi.de>
+Bug-Reference-ID:	<20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html
+
+Bug-Description:
+
+A change between bash-4.1 and bash-4.2 to prevent the readline input hook
+from being called too frequently had the side effect of causing delays
+when reading pasted input on systems such as Mac OS X.  This patch fixes
+those delays while retaining the bash-4.2 behavior.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/readline/input.c	2010-05-30 18:33:01.000000000 -0400
+--- ./lib/readline/input.c	2012-06-25 21:08:42.000000000 -0400
+***************
+*** 410,414 ****
+  rl_read_key ()
+  {
+!   int c;
+  
+    rl_key_sequence_length++;
+--- 412,416 ----
+  rl_read_key ()
+  {
+!   int c, r;
+  
+    rl_key_sequence_length++;
+***************
+*** 430,441 ****
+  	  while (rl_event_hook)
+  	    {
+! 	      if (rl_gather_tyi () < 0)	/* XXX - EIO */
+  		{
+  		  rl_done = 1;
+  		  return ('\n');
+  		}
+  	      RL_CHECK_SIGNALS ();
+- 	      if (rl_get_char (&c) != 0)
+- 		break;
+  	      if (rl_done)		/* XXX - experimental */
+  		return ('\n');
+--- 432,447 ----
+  	  while (rl_event_hook)
+  	    {
+! 	      if (rl_get_char (&c) != 0)
+! 		break;
+! 		
+! 	      if ((r = rl_gather_tyi ()) < 0)	/* XXX - EIO */
+  		{
+  		  rl_done = 1;
+  		  return ('\n');
+  		}
++ 	      else if (r == 1)			/* read something */
++ 		continue;
++ 
+  	      RL_CHECK_SIGNALS ();
+  	      if (rl_done)		/* XXX - experimental */
+  		return ('\n');
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 30
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 31
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-032.patch b/package/bash/bash-4.2-032.patch
new file mode 100644
index 0000000000..c3f38a6c86
--- /dev/null
+++ b/package/bash/bash-4.2-032.patch
@@ -0,0 +1,75 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-032
+
+Bug-Reported-by:	Ruediger Kuhlmann <RKuhlmann@orga-systems.com>
+Bug-Reference-ID:	<OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39@orga-systems.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html
+
+Bug-Description:
+
+Bash-4.2 has problems with DEL characters in the expanded value of variables
+used in the same quoted string as variables that expand to nothing.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20120427/subst.c	2012-04-22 16:19:10.000000000 -0400
+--- ./subst.c	2012-05-07 16:06:35.000000000 -0400
+***************
+*** 8152,8155 ****
+--- 8152,8163 ----
+  	  dispose_word_desc (tword);
+  
++ 	  /* Kill quoted nulls; we will add them back at the end of
++ 	     expand_word_internal if nothing else in the string */
++ 	  if (had_quoted_null && temp && QUOTED_NULL (temp))
++ 	    {
++ 	      FREE (temp);
++ 	      temp = (char *)NULL;
++ 	    }
++ 
+  	  goto add_string;
+  	  break;
+***************
+*** 8556,8560 ****
+        if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+  	tword->flags |= W_QUOTED;
+!       if (had_quoted_null)
+  	tword->flags |= W_HASQUOTEDNULL;
+        list = make_word_list (tword, (WORD_LIST *)NULL);
+--- 8564,8568 ----
+        if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+  	tword->flags |= W_QUOTED;
+!       if (had_quoted_null && QUOTED_NULL (istring))
+  	tword->flags |= W_HASQUOTEDNULL;
+        list = make_word_list (tword, (WORD_LIST *)NULL);
+***************
+*** 8587,8591 ****
+  	  if (word->flags & W_NOEXPAND)
+  	    tword->flags |= W_NOEXPAND;
+! 	  if (had_quoted_null)
+  	    tword->flags |= W_HASQUOTEDNULL;	/* XXX */
+  	  list = make_word_list (tword, (WORD_LIST *)NULL);
+--- 8595,8599 ----
+  	  if (word->flags & W_NOEXPAND)
+  	    tword->flags |= W_NOEXPAND;
+! 	  if (had_quoted_null && QUOTED_NULL (istring))
+  	    tword->flags |= W_HASQUOTEDNULL;	/* XXX */
+  	  list = make_word_list (tword, (WORD_LIST *)NULL);
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 31
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 32
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-033.patch b/package/bash/bash-4.2-033.patch
new file mode 100644
index 0000000000..9eb19540ff
--- /dev/null
+++ b/package/bash/bash-4.2-033.patch
@@ -0,0 +1,57 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-033
+
+Bug-Reported-by:	David Leverton <levertond@googlemail.com>
+Bug-Reference-ID:	<4FCCE737.1060603@googlemail.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+Bash uses a static buffer when expanding the /dev/fd prefix for the test
+and conditional commands, among other uses, when it should use a dynamic
+buffer to avoid buffer overflow.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/sh/eaccess.c	2011-01-08 20:50:10.000000000 -0500
+--- ./lib/sh/eaccess.c	2012-06-04 21:06:43.000000000 -0400
+***************
+*** 83,86 ****
+--- 83,88 ----
+       struct stat *finfo;
+  {
++   static char *pbuf = 0;
++ 
+    if (*path == '\0')
+      {
+***************
+*** 107,111 ****
+       On most systems, with the notable exception of linux, this is
+       effectively a no-op. */
+!       char pbuf[32];
+        strcpy (pbuf, DEV_FD_PREFIX);
+        strcat (pbuf, path + 8);
+--- 109,113 ----
+       On most systems, with the notable exception of linux, this is
+       effectively a no-op. */
+!       pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
+        strcpy (pbuf, DEV_FD_PREFIX);
+        strcat (pbuf, path + 8);
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 32
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 33
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-034.patch b/package/bash/bash-4.2-034.patch
new file mode 100644
index 0000000000..7eb2ebaf13
--- /dev/null
+++ b/package/bash/bash-4.2-034.patch
@@ -0,0 +1,46 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-034
+
+Bug-Reported-by:	"Davide Brini" <dave_br@gmx.com>
+Bug-Reference-ID:	<20120604164154.69781EC04B@imaps.oficinas.atrapalo.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html
+
+Bug-Description:
+
+In bash-4.2, the history code would inappropriately add a semicolon to
+multi-line compound array assignments when adding them to the history.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/parse.y	2011-11-21 18:03:36.000000000 -0500
+--- ./parse.y	2012-06-07 12:48:47.000000000 -0400
+***************
+*** 4900,4905 ****
+--- 4916,4924 ----
+        return (current_command_line_count == 2 ? "\n" : "");
+      }
+  
++   if (parser_state & PST_COMPASSIGN)
++     return (" ");
++ 
+    /* First, handle some special cases. */
+    /*(*/
+    /* If we just read `()', assume it's a function definition, and don't
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 33
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 34
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-035.patch b/package/bash/bash-4.2-035.patch
new file mode 100644
index 0000000000..b04364e207
--- /dev/null
+++ b/package/bash/bash-4.2-035.patch
@@ -0,0 +1,66 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-035
+
+Bug-Reported-by:	Dan Douglas <ormaaj@gmail.com>
+Bug-Reference-ID:	<2766482.Ksm3GrSoYi@smorgbox>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html
+
+Bug-Description:
+
+When given a number of lines to read, `mapfile -n lines' reads one too many.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/mapfile.def	2010-05-29 22:09:47.000000000 -0400
+--- ./builtins/mapfile.def	2012-06-20 09:48:33.000000000 -0400
+***************
+*** 196,206 ****
+    interrupt_immediately++;
+    for (array_index = origin, line_count = 1; 
+!        zgetline (fd, &line, &line_length, unbuffered_read) != -1;
+!        array_index++, line_count++) 
+      {
+-       /* Have we exceeded # of lines to store? */
+-       if (line_count_goal != 0 && line_count > line_count_goal) 
+- 	break;
+- 
+        /* Remove trailing newlines? */
+        if (flags & MAPF_CHOP)
+--- 196,202 ----
+    interrupt_immediately++;
+    for (array_index = origin, line_count = 1; 
+!  	zgetline (fd, &line, &line_length, unbuffered_read) != -1;
+! 	array_index++) 
+      {
+        /* Remove trailing newlines? */
+        if (flags & MAPF_CHOP)
+***************
+*** 218,221 ****
+--- 214,222 ----
+  
+        bind_array_element (entry, array_index, line, 0);
++ 
++       /* Have we exceeded # of lines to store? */
++       line_count++;
++       if (line_count_goal != 0 && line_count > line_count_goal) 
++ 	break;
+      }
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 34
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 35
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-036.patch b/package/bash/bash-4.2-036.patch
new file mode 100644
index 0000000000..1f62dc03c5
--- /dev/null
+++ b/package/bash/bash-4.2-036.patch
@@ -0,0 +1,92 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-036
+
+Bug-Reported-by:	gregrwm <backuppc-users@whitleymott.net>
+Bug-Reference-ID:	<CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html
+
+Bug-Description:
+
+Bash-4.2 produces incorrect word splitting results when expanding
+double-quoted $@ in the same string as and adjacent to other variable
+expansions.  The $@ should be split, the other expansions should not.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2012-05-02 12:02:33.000000000 -0400
+--- ./subst.c	2012-07-08 21:19:32.000000000 -0400
+***************
+*** 7923,7927 ****
+    /* State flags */
+    int had_quoted_null;
+!   int has_dollar_at;
+    int tflag;
+    int pflags;			/* flags passed to param_expand */
+--- 7923,7927 ----
+    /* State flags */
+    int had_quoted_null;
+!   int has_dollar_at, temp_has_dollar_at;
+    int tflag;
+    int pflags;			/* flags passed to param_expand */
+***************
+*** 8128,8138 ****
+  	    *expanded_something = 1;
+  
+! 	  has_dollar_at = 0;
+  	  pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
+  	  if (word->flags & W_NOSPLIT2)
+  	    pflags |= PF_NOSPLIT2;
+  	  tword = param_expand (string, &sindex, quoted, expanded_something,
+! 			       &has_dollar_at, &quoted_dollar_at,
+  			       &had_quoted_null, pflags);
+  
+  	  if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
+--- 8128,8139 ----
+  	    *expanded_something = 1;
+  
+! 	  temp_has_dollar_at = 0;
+  	  pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
+  	  if (word->flags & W_NOSPLIT2)
+  	    pflags |= PF_NOSPLIT2;
+  	  tword = param_expand (string, &sindex, quoted, expanded_something,
+! 			       &temp_has_dollar_at, &quoted_dollar_at,
+  			       &had_quoted_null, pflags);
++ 	  has_dollar_at += temp_has_dollar_at;
+  
+  	  if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
+***************
+*** 8275,8281 ****
+  	      temp = (char *)NULL;
+  
+! 	      has_dollar_at = 0;
+  	      /* Need to get W_HASQUOTEDNULL flag through this function. */
+! 	      list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL);
+  
+  	      if (list == &expand_word_error || list == &expand_word_fatal)
+--- 8276,8283 ----
+  	      temp = (char *)NULL;
+  
+! 	      temp_has_dollar_at = 0;	/* XXX */
+  	      /* Need to get W_HASQUOTEDNULL flag through this function. */
+! 	      list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL);
+! 	      has_dollar_at += temp_has_dollar_at;
+  
+  	      if (list == &expand_word_error || list == &expand_word_fatal)
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 35
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 36
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/package/bash/bash-4.2-037.patch b/package/bash/bash-4.2-037.patch
new file mode 100644
index 0000000000..f5f1dc45ac
--- /dev/null
+++ b/package/bash/bash-4.2-037.patch
@@ -0,0 +1,112 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-037
+
+Bug-Reported-by:	Jakub Filak
+Bug-Reference-ID:
+Bug-Reference-URL:	https://bugzilla.redhat.com/show_bug.cgi?id=813289
+
+Bug-Description:
+
+Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy'
+commands leads to an infinite loop.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/readline/vi_mode.c	2011-02-25 11:17:02.000000000 -0500
+--- ./lib/readline/vi_mode.c	2012-06-02 12:24:47.000000000 -0400
+***************
+*** 1235,1243 ****
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
+!   else if (vi_redoing)
+      {
+        _rl_vimvcxt->motion = _rl_vi_last_motion;
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
+  #if defined (READLINE_CALLBACKS)
+    else if (RL_ISSTATE (RL_STATE_CALLBACK))
+--- 1297,1313 ----
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
+!   else if (vi_redoing && _rl_vi_last_motion != 'd')	/* `dd' is special */
+      {
+        _rl_vimvcxt->motion = _rl_vi_last_motion;
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
++   else if (vi_redoing)		/* handle redoing `dd' here */
++     {
++       _rl_vimvcxt->motion = _rl_vi_last_motion;
++       rl_mark = rl_end;
++       rl_beg_of_line (1, key);
++       RL_UNSETSTATE (RL_STATE_VIMOTION);
++       r = vidomove_dispatch (_rl_vimvcxt);
++     }
+  #if defined (READLINE_CALLBACKS)
+    else if (RL_ISSTATE (RL_STATE_CALLBACK))
+***************
+*** 1317,1325 ****
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
+!   else if (vi_redoing)
+      {
+        _rl_vimvcxt->motion = _rl_vi_last_motion;
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
+  #if defined (READLINE_CALLBACKS)
+    else if (RL_ISSTATE (RL_STATE_CALLBACK))
+--- 1387,1403 ----
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
+!   else if (vi_redoing && _rl_vi_last_motion != 'c')	/* `cc' is special */
+      {
+        _rl_vimvcxt->motion = _rl_vi_last_motion;
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
++   else if (vi_redoing)		/* handle redoing `cc' here */
++     {
++       _rl_vimvcxt->motion = _rl_vi_last_motion;
++       rl_mark = rl_end;
++       rl_beg_of_line (1, key);
++       RL_UNSETSTATE (RL_STATE_VIMOTION);
++       r = vidomove_dispatch (_rl_vimvcxt);
++     }
+  #if defined (READLINE_CALLBACKS)
+    else if (RL_ISSTATE (RL_STATE_CALLBACK))
+***************
+*** 1378,1381 ****
+--- 1456,1472 ----
+        r = rl_domove_motion_callback (_rl_vimvcxt);
+      }
++   else if (vi_redoing && _rl_vi_last_motion != 'y')	/* `yy' is special */
++     {
++       _rl_vimvcxt->motion = _rl_vi_last_motion;
++       r = rl_domove_motion_callback (_rl_vimvcxt);
++     }
++   else if (vi_redoing)			/* handle redoing `yy' here */
++     {
++       _rl_vimvcxt->motion = _rl_vi_last_motion;
++       rl_mark = rl_end;
++       rl_beg_of_line (1, key);
++       RL_UNSETSTATE (RL_STATE_VIMOTION);
++       r = vidomove_dispatch (_rl_vimvcxt);
++     }
+  #if defined (READLINE_CALLBACKS)
+    else if (RL_ISSTATE (RL_STATE_CALLBACK))
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- ./patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 36
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 37
+  
+  #endif /* _PATCHLEVEL_H_ */

From 61d1f013d9217633a0f992a5a12d3c6092fefdee Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 10:14:29 -0300
Subject: [PATCH 2604/6849] wget: bump to version 1.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/wget/wget.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index a15111c505..01ebcb625c 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-WGET_VERSION = 1.13.4
+WGET_VERSION = 1.14
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
+WGET_LICENSE = GPLv3+
+WGET_LICENSE_FILES = COPYING
 
 # Prefer full-blown wget over busybox
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From 2dfe72045192e7ffee36dc4561b981c178d43d4c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 Aug 2012 10:14:30 -0300
Subject: [PATCH 2605/6849] coreutils: bump to version 8.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/coreutils/coreutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index e64dd5af1c..d7d077998a 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-COREUTILS_VERSION = 8.16
+COREUTILS_VERSION = 8.18
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
 

From 0c00636e8bbc4e4c3049e2e4a2e2e9da25ef5589 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 13 Aug 2012 01:53:49 +0200
Subject: [PATCH 2606/6849] system/init: add option for no init system

Can be usefull if a local package provides an init procedure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/generic/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/generic/Config.in b/target/generic/Config.in
index a83ba442ce..b8472f4e8d 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -64,6 +64,9 @@ comment 'systemd requires largefile, wchar, IPv6, threads and udev support'
 		     BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \
 		     BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV)
 
+config BR2_INIT_NONE
+	bool "None"
+
 endchoice
 
 config BR2_ROOTFS_DEVICE_TABLE

From 1e7bbc6b33bf67c64887e896cbfce0b887870e23 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 25 Aug 2012 15:44:12 +0200
Subject: [PATCH 2607/6849] distcc: only available on MMU platforms

Fixes
http://autobuild.buildroot.org/results/3c1fa37c5b687767b53868f083910ca3f7dbcac0/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/distcc/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/distcc/Config.in b/package/distcc/Config.in
index 0b518c6ac3..2c30a21420 100644
--- a/package/distcc/Config.in
+++ b/package/distcc/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_DISTCC
 	bool "distcc"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  Distributed compiler client and server.  Allows you to
 	  distribute compilation of C code across several machines

From a5cefe8a7edd38c06aedf2fe403e087d4061a180 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 25 Aug 2012 20:26:11 +1000
Subject: [PATCH 2608/6849] connman: bump to version 1.6

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 726cb7352e..ed83ebc712 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.4
+CONNMAN_VERSION = 1.6
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES

From 8437b56258b7ae2e6ab763160a56d8e2a10f824a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 25 Aug 2012 22:47:23 +0200
Subject: [PATCH 2609/6849] Prepare for 2012.08-rc3

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES            | 10 ++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5bc79be138..7049c38e3a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+2012.08-rc3, Released August 25th, 2012
+
+	Updated/fixed packages: libglib2, netsnmp, freetype, libfuse,
+	libpng, x11vnc, zlib, gpsd, ifplugd, bash, distcc.
+
+	Added license informations for: barebox, grub, syslinux,
+	uboot, xloader, yajl, zlib, zxing, alsa-lib, alsa-utils,
+	faad2, nano, fbdump, rsync, librsync, fontconfig,
+	inotify-tools,
+
 2012.08-rc2, Released August 15th, 2012
 
 	Updated/fixed packages: imagemagick, sudo, crosstool-ng.
diff --git a/Makefile b/Makefile
index 77ca4a00da..d59a548952 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.08-rc2
+export BR2_VERSION:=2012.08-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 73798637eb..e53bfb6132 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,12 +13,12 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>.
 <p>
-The latest release candidate is <b>2012.08-rc2</b>, which can be
+The latest release candidate is <b>2012.08-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.08-rc2.tar.gz">buildroot-2012.08-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2012.08-rc3.tar.gz">buildroot-2012.08-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.08-rc2.tar.bz2">buildroot-2012.08-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.08-rc3.tar.bz2">buildroot-2012.08-rc3.tar.bz2</a>.
 <p>
 -->
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index e519c312ae..abe408578b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+   <li><b>25 August 2012 -- 2012.08-rc3 released</b>
+
+     <p>We have a new release candidate! Various fixes, and addition
+     of licensing informations on many
+     packages. See <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08_rc3">CHANGES</a>
+     file for details</p>
+
+     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+     <a href="/downloads/buildroot-2012.08-rc3.tar.bz2">2012.08-rc3
+     release candidate</a>, and report any problems found to the <a
+     href="lists.html">mailing list</a> or <a
+     href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
    <li><b>15 August 2012 -- 2012.08-rc2 released</b>
 
      <p>We have a new release candidate! Various fixes, and addition

From 1a9563b828170faa7d409363af44614051889d81 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 Aug 2012 10:55:24 +0200
Subject: [PATCH 2610/6849] microperl: uses fork(), only available on MMU
 platforms

Fixes
http://autobuild.buildroot.net/results/0d5e272b594bc6cc84df291134e2b23d33b97d17/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/microperl/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/microperl/Config.in b/package/microperl/Config.in
index 256e271a67..66bbedd776 100644
--- a/package/microperl/Config.in
+++ b/package/microperl/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_MICROPERL
 	bool "microperl"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  Perl without operating-specific functions such as readdir.
 

From 9241fb6794cae1cad66d83ac3dfcfe243bc5566b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 Aug 2012 10:56:12 +0200
Subject: [PATCH 2611/6849] cups: uses fork(), only available on MMU platforms

Fixes
http://autobuild.buildroot.net/results/6db1eb27387696bfa6b4d8ffb30eff00a2f842d0/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cups/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/cups/Config.in b/package/cups/Config.in
index 0176423a16..dc1c2ed700 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_CUPS
 	bool "cups"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  The Common Unix Printing System
 

From bc753d3ca243bcda35d567465ee649ecee3ef236 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Tue, 14 Aug 2012 21:25:30 -0400
Subject: [PATCH 2612/6849] luajit: bug fix - prevent target CFLAGS from being
 used in host tool compile.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The luajit amalgamation compile starts with building a host tool, and then
uses it to build itself.  However, when CFLAGS is specified, as opposed to
TARGET_CFLAGS, then it is used for both HOST and TARGET builds.  So if you
add something target specific into 'Target Optimizations' (for example,
'-mfpu=neon -mfloat-abi=softfp' for ARM Cortex-A8), then it gets into the
host tool compile, which then fails (because my build machine is not an
ARM Cortext-A8).  This can be fixed by using TARGET_CFLAGS and
TARGET_LDFLAGS, instead of CFLAGS and LDFLAGS, respectively.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/luajit/luajit.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index e4c46d8934..913bc0c9e8 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -42,8 +42,8 @@ define LUAJIT_BUILD_CMDS
 		TARGET_LD="$(TARGET_CC)" \
 		TARGET_AR="$(TARGET_AR) rcus" \
 		TARGET_STRIP="$(TARGET_STRIP)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+		TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
 		HOST_CC="$(LUAJIT_HOST_CC)" \
 		HOST_CFLAGS="$(HOST_CFLAGS)" \
 		HOST_LDFLAGS="$(HOST_LDFLAGS)" \

From 57f4106c228d997af6e1266f33764eeccefe6977 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 26 Aug 2012 18:31:49 -0400
Subject: [PATCH 2613/6849] sqlite: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sqlite/sqlite.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 9e63b521dc..7b5b4aa268 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -7,6 +7,7 @@
 SQLITE_VERSION = 3071300
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
+SQLITE_LICENSE = Public domain
 SQLITE_INSTALL_STAGING = YES
 
 ifneq ($(BR2_LARGEFILE),y)

From 23ef45ca1ee8e9d6535fe4484b387c831a450c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Sun, 26 Aug 2012 02:52:48 +0300
Subject: [PATCH 2614/6849] remove rest of the BR2_SOURCEFORGE_MIRROR
 references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/beecrypt/beecrypt.mk            | 2 +-
 package/blackbox/blackbox.mk            | 2 +-
 package/boost/boost.mk                  | 2 +-
 package/bootutils/bootutils.mk          | 2 +-
 package/bridge-utils/bridge-utils.mk    | 2 +-
 package/bwm-ng/bwm-ng.mk                | 2 +-
 package/cjson/cjson.mk                  | 2 +-
 package/cramfs/cramfs.mk                | 2 +-
 package/e2fsprogs/e2fsprogs.mk          | 2 +-
 package/ebtables/ebtables.mk            | 2 +-
 package/expat/expat.mk                  | 2 +-
 package/ezxml/ezxml.mk                  | 2 +-
 package/fluxbox/fluxbox.mk              | 2 +-
 package/gdisk/gdisk.mk                  | 2 +-
 package/genext2fs/genext2fs.mk          | 2 +-
 package/genromfs/genromfs.mk            | 4 ++--
 package/gtkperf/gtkperf.mk              | 2 +-
 package/haserl/haserl.mk                | 2 +-
 package/hdparm/hdparm.mk                | 2 +-
 package/htop/htop.mk                    | 2 +-
 package/imlib2/imlib2.mk                | 2 +-
 package/iperf/iperf.mk                  | 2 +-
 package/irda-utils/irda-utils.mk        | 2 +-
 package/lcdproc/lcdproc.mk              | 2 +-
 package/libargtable2/libargtable2.mk    | 2 +-
 package/libcdaudio/libcdaudio.mk        | 2 +-
 package/libcgi/libcgi.mk                | 2 +-
 package/libcue/libcue.mk                | 2 +-
 package/libdmtx/libdmtx.mk              | 2 +-
 package/libdnet/libdnet.mk              | 2 +-
 package/libexif/libexif.mk              | 2 +-
 package/libical/libical.mk              | 2 +-
 package/libid3tag/libid3tag.mk          | 2 +-
 package/libmad/libmad.mk                | 2 +-
 package/libmms/libmms.mk                | 2 +-
 package/librsync/librsync.mk            | 2 +-
 package/libsysfs/libsysfs.mk            | 2 +-
 package/libtpl/libtpl.mk                | 2 +-
 package/libungif/libungif.mk            | 2 +-
 package/libupnp/libupnp.mk              | 2 +-
 package/libusb-compat/libusb-compat.mk  | 2 +-
 package/libusb/libusb.mk                | 2 +-
 package/libvncserver/libvncserver.mk    | 2 +-
 package/lmbench/lmbench.mk              | 2 +-
 package/logsurfer/logsurfer.mk          | 2 +-
 package/ltp-testsuite/ltp-testsuite.mk  | 2 +-
 package/multimedia/bellagio/bellagio.mk | 2 +-
 package/multimedia/faad2/faad2.mk       | 2 +-
 package/multimedia/flac/flac.mk         | 2 +-
 package/multimedia/lame/lame.mk         | 2 +-
 package/multimedia/madplay/madplay.mk   | 2 +-
 package/multimedia/mpd/mpd.mk           | 2 +-
 package/multimedia/mpg123/mpg123.mk     | 2 +-
 package/mutt/mutt.mk                    | 2 +-
 package/nanocom/nanocom.mk              | 2 +-
 package/nbd/nbd.mk                      | 2 +-
 package/netatalk/netatalk.mk            | 2 +-
 package/netcat/netcat.mk                | 2 +-
 package/netsnmp/netsnmp.mk              | 2 +-
 package/nfs-utils/nfs-utils.mk          | 2 +-
 package/ngrep/ngrep.mk                  | 2 +-
 package/ocf-linux/ocf-linux.mk          | 2 +-
 package/opencv/opencv.mk                | 2 +-
 package/openocd/openocd.mk              | 2 +-
 package/poco/poco.mk                    | 5 +++--
 package/pptp-linux/pptp-linux.mk        | 2 +-
 package/psmisc/psmisc.mk                | 2 +-
 package/python-id3/python-id3.mk        | 2 +-
 package/quota/quota.mk                  | 2 +-
 package/rdesktop/rdesktop.mk            | 2 +-
 package/rng-tools/rng-tools.mk          | 2 +-
 package/scons/scons.mk                  | 2 +-
 package/ser2net/ser2net.mk              | 2 +-
 package/smartmontools/smartmontools.mk  | 2 +-
 package/squashfs/squashfs.mk            | 2 +-
 package/squashfs3/squashfs3.mk          | 2 +-
 package/sshfs/sshfs.mk                  | 2 +-
 package/strace/strace.mk                | 2 +-
 package/synergy/synergy.mk              | 2 +-
 package/tcl/tcl.mk                      | 2 +-
 package/tcpreplay/tcpreplay.mk          | 2 +-
 package/tinyhttpd/tinyhttpd.mk          | 2 +-
 package/tn5250/tn5250.mk                | 2 +-
 package/vtun/vtun.mk                    | 2 +-
 package/wipe/wipe.mk                    | 2 +-
 package/xmlstarlet/xmlstarlet.mk        | 2 +-
 86 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index f3a8c03037..d165aee99e 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 BEECRYPT_VERSION = 4.2.1
-BEECRYPT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/beecrypt
+BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
 BEECRYPT_AUTORECONF = YES
 BEECRYPT_INSTALL_STAGING = YES
 
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index a6d4b45423..43cd747de0 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -6,7 +6,7 @@
 
 BLACKBOX_VERSION:=0.70.1
 BLACKBOX_SOURCE:=blackbox-$(BLACKBOX_VERSION).tar.bz2
-BLACKBOX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/blackboxwm/
+BLACKBOX_SITE:=http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
 
 BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 3b08bb92f6..64856bc6dc 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -7,7 +7,7 @@
 BOOST_VERSION = 1.49.0
 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
 BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
-BOOST_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/boost
+BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES
 
 TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
index a37654b43d..3f943a7b3c 100644
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 BOOTUTILS_VERSION = 1.0.0
-BOOTUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bootutils
+BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
 
 BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
 
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index 5f846ffe59..685b65794e 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -6,7 +6,7 @@
 
 BRIDGE_UTILS_VERSION = 1.5
 BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz
-BRIDGE_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge
+BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge
 BRIDGE_UTILS_AUTORECONF = YES
 BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
 
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
index ddc6f5b8d1..7ec7d7f473 100644
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 BWM_NG_VERSION = 0.6
-BWM_NG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/
+BWM_NG_SITE = http://downloads.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/
 BWM_NG_CONF_OPT = --with-procnetdev --with-diskstats
 BWM_NG_LICENSE = GPLv2
 BWM_NG_LICENSE_FILES = COPYING
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 6f26bb8539..79b4c31185 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -5,7 +5,7 @@
 #############################################################
 CJSON_VERSION         = undefined
 CJSON_SOURCE          = cJSONFiles.zip
-CJSON_SITE            = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/cjson/
+CJSON_SITE            = http://downloads.sourceforge.net/project/cjson/
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE         = MIT
 
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 71ed8cb35a..519a179030 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -6,7 +6,7 @@
 
 CRAMFS_VERSION=1.1
 CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz
-CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs
+CRAMFS_SITE=http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION)
 
 CRAMFS_DEPENDENCIES = zlib
 
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 16725ac21c..9f2a5f742a 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 E2FSPROGS_VERSION = 1.42.4
-E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
+E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/$(E2FSPROGS_VERSION)
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 7676e9abd8..3f667baf52 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -6,7 +6,7 @@
 
 EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
-EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
+EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(EBTABLES_VERSION)
 EBTABLES_LICENSE = GPLv2
 EBTABLES_LICENSE_FILES = COPYING
 
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 7fa31262cf..5b19b4c765 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 EXPAT_VERSION = 2.1.0
-EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
 EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 57c3ffbc85..89e19574d4 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -5,7 +5,7 @@
 #############################################################
 EZXML_VERSION = 0.8.6
 EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz
-EZXML_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxml/
+EZXML_SITE = http://downloads.sourceforge.net/project/ezxml/ezXML/ezXML%20$(EZXML_VERSION)
 EZXML_INSTALL_STAGING=YES
 
 define EZXML_BUILD_CMDS
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 6d7ff957e1..15136c9336 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -6,7 +6,7 @@
 
 FLUXBOX_VERSION = 1.3.2
 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
-FLUXBOX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fluxbox/
+FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
 
 FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		   --x-libraries=$(STAGING_DIR)/usr/lib
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
index d7c8bec9b1..f93343647c 100644
--- a/package/gdisk/gdisk.mk
+++ b/package/gdisk/gdisk.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 GDISK_VERSION = 0.6.14
-GDISK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gptfdisk
+GDISK_SITE = http://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$(GDISK_VERSION)
 GDISK_SOURCE = gdisk-$(GDISK_VERSION).tgz
 
 GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 9757d9fa0a..647281115a 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -6,7 +6,7 @@
 
 GENEXT2FS_VERSION=1.4.1
 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
-GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
+GENEXT2FS_SITE:=http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index c1cd6086a0..3f5d44e2f9 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -6,7 +6,7 @@
 
 GENROMFS_VERSION=0.5.2
 GENROMFS_SOURCE=genromfs-$(GENROMFS_VERSION).tar.gz
-GENROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs
+GENROMFS_SITE=http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION)
 
 define GENROMFS_BUILD_CMDS
  $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
@@ -28,4 +28,4 @@ define HOST_GENROMFS_INSTALL_CMDS
 endef
 
 $(eval $(generic-package))
-$(eval $(host-generic-package))
\ No newline at end of file
+$(eval $(host-generic-package))
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index 7b63dcbcc7..b2ad94391d 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -5,7 +5,7 @@
 #############################################################
 GTKPERF_VERSION:=0.40
 GTKPERF_SOURCE:=gtkperf_$(GTKPERF_VERSION).tar.gz
-GTKPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gtkperf
+GTKPERF_SITE:=http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION)
 GTKPERF_DEPENDENCIES = libgtk2
 
 $(eval $(autotools-package))
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index 14226c5a7a..589b3e7a70 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
+HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel/$(HASERL_VERSION)
 
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index c524c62737..5c00e79d7b 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 HDPARM_VERSION = 9.39
-HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
+HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm
 
 define HDPARM_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index 9fa5bec542..e7061bbf79 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 HTOP_VERSION = 1.0.1
-HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/htop/htop/$(HTOP_VERSION)
+HTOP_SITE = http://downloads.sourceforge.net/project/htop/htop/$(HTOP_VERSION)
 HTOP_DEPENDENCIES = ncurses
 HTOP_AUTORECONF = YES
 HTOP_CONF_OPT = --disable-unicode
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index c94d96d038..3adcd99003 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -5,7 +5,7 @@
 ##############################################################
 IMLIB2_VERSION = 1.4.5
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
-IMLIB2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
+IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
 IMLIB2_INSTALL_STAGING = YES
 IMLIB2_DEPENDENCIES = host-pkg-config freetype
 IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index fdf1d473a1..b20080fce4 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -5,7 +5,7 @@
 #############################################################
 IPERF_VERSION = 2.0.5
 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
-IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
+IPERF_SITE = http://downloads.sourceforge.net/project/iperf
 
 IPERF_CONF_ENV = \
 	ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index b2b84d5c21..34612c2c27 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -6,7 +6,7 @@
 
 IRDA_UTILS_VERSION = 0.9.18
 IRDA_UTILS_SOURCE = irda-utils-$(IRDA_UTILS_VERSION).tar.gz
-IRDA_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/irda
+IRDA_UTILS_SITE = http://downloads.sourceforge.net/project/irda/irda-utils/$(IRDA_UTILS_VERSION)
 
 IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I.
 ifeq ($(BR2_USE_MMU),)
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 94848e660c..e4944daeb1 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -5,7 +5,7 @@
 #############################################################
 LCDPROC_VERSION = 0.5.5
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
-LCDPROC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
+LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
 LCDPROC_LICENSE = GPLv2+
 LCDPROC_LICENSE_FILES = COPYING
 
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index d5172d2de0..900a8b506e 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -6,7 +6,7 @@
 
 LIBARGTABLE2_VERSION = 13
 LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
-LIBARGTABLE2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/argtable/
+LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13
 
 LIBARGTABLE2_INSTALL_STAGING = YES
 LIBARGTABLE2_CONF_OPT= --disable-example \
diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index 86b59a37d4..203a8aa574 100644
--- a/package/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
@@ -6,7 +6,7 @@
 
 LIBCDAUDIO_VERSION = 0.99.12p2
 LIBCDAUDIO_SOURCE = libcdaudio-$(LIBCDAUDIO_VERSION).tar.gz
-LIBCDAUDIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)/
+LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)/
 LIBCDAUDIO_AUTORECONF = YES
 LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk
index 549d0f205c..286a8cd3bd 100644
--- a/package/libcgi/libcgi.mk
+++ b/package/libcgi/libcgi.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 LIBCGI_VERSION = 1.0
-LIBCGI_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcgi
+LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION)
 LIBCGI_INSTALL_STAGING = YES
 # use cross CC/AR rather than host
 LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)"
diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk
index 4ef1145948..cd19f4a391 100644
--- a/package/libcue/libcue.mk
+++ b/package/libcue/libcue.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCUE_VERSION = 1.4.0
-LIBCUE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcue
+LIBCUE_SITE = http://downloads.sourceforge.net/project/libcue/libcue/$(LIBCUE_VERSION)
 LIBCUE_SOURCE = libcue-$(LIBCUE_VERSION).tar.bz2
 LIBCUE_DEPENDENCIES = flex
 LIBCUE_INSTALL_STAGING = YES
diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk
index 800b4fffee..7cea168ddb 100644
--- a/package/libdmtx/libdmtx.mk
+++ b/package/libdmtx/libdmtx.mk
@@ -6,7 +6,7 @@
 
 LIBDMTX_VERSION = 0.7.4
 LIBDMTX_SOURCE = libdmtx-$(LIBDMTX_VERSION).tar.gz
-LIBDMTX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdmtx
+LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION)
 LIBDMTX_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index f6daffdb1b..03955a7842 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -6,7 +6,7 @@
 
 LIBDNET_VERSION = 1.11
 LIBDNET_SOURCE = libdnet-$(LIBDNET_VERSION).tar.gz
-LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdnet/
+LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION)
 LIBDNET_LICENSE = BSD-3c
 LIBDNET_LICENSE_FILES = LICENSE
 LIBDNET_INSTALL_STAGING = YES
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index a54694c5d9..f7af18a8f0 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -6,7 +6,7 @@
 
 LIBEXIF_VERSION = 0.6.21
 LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
-LIBEXIF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
+LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
 LIBEXIF_INSTALL_STAGING = YES
 LIBEXIF_CONF_OPT = --disable-docs
 LIBEXIF_DEPENDENCIES = host-pkg-config
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index 7c5c881f89..e95a702047 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 LIBICAL_VERSION = 0.48
-LIBICAL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)
+LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)
 LIBICAL_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index 20579d608c..1e78fcadd9 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -6,7 +6,7 @@
 
 LIBID3TAG_VERSION:=0.15.1b
 LIBID3TAG_SOURCE:=libid3tag-$(LIBID3TAG_VERSION).tar.gz
-LIBID3TAG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad
+LIBID3TAG_SITE:=http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
 LIBID3TAG_INSTALL_STAGING=YES
 LIBID3TAG_DEPENDENCIES=zlib
 LIBID3TAG_LIBTOOL_PATCH=NO
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 71e9c3483a..d9ce0aed88 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 LIBMAD_VERSION = 0.15.1b
-LIBMAD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/
+LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
 LIBMAD_INSTALL_STAGING = YES
 LIBMAD_LIBTOOL_PATCH = NO
 
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index 10583033bc..bc66f53631 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBMMS_VERSION = 0.6.2
 LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz
-LIBMMS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libmms
+LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION)
 
 LIBMMS_INSTALL_STAGING = YES
 
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index f0f543f7f8..45b715be1a 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBRSYNC_VERSION:=0.9.7
 LIBRSYNC_SOURCE:=librsync-$(LIBRSYNC_VERSION).tar.gz
-LIBRSYNC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/librsync/
+LIBRSYNC_SITE:=http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
 LIBRSYNC_LICENSE = LGPLv2.1+
 LIBRSYNC_LICENSE_FILES = COPYING
 LIBRSYNC_INSTALL_STAGING = YES
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index 996903d44e..4fbb195dca 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -22,7 +22,7 @@
 # USA
 
 LIBSYSFS_VERSION:=2.1.0
-LIBSYSFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-diag
+LIBSYSFS_SITE:=http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
 LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz
 LIBSYSFS_INSTALL_STAGING=YES
 
diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
index 7af0b0625a..3ef9cc3b82 100644
--- a/package/libtpl/libtpl.mk
+++ b/package/libtpl/libtpl.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBTPL_VERSION = 1.5
 LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
-LIBTPL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tpl
+LIBTPL_SITE = http://downloads.sourceforge.net/project/tpl/tpl/libtpl-$(LIBTPL_VERSION)
 LIBTPL_INSTALL_STAGING = YES
 LIBTPL_LICENSE = BSD-like
 LIBTPL_LICENSE_FILES = LICENSE
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 3b9583c8a7..de9dc12344 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBUNGIF_VERSION:=4.1.4
 LIBUNGIF_SOURCE:=libungif-$(LIBUNGIF_VERSION).tar.bz2
-LIBUNGIF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/giflib
+LIBUNGIF_SITE:=http://downloads.sourceforge.net/project/giflib/libungif-4.x/libungif-$(LIBUNGIF_VERSION)
 LIBUNGIF_INSTALL_STAGING = YES
 LIBUNGIF_CONF_OPT = --without-x
 
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 18968d82cc..3d4606b727 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -6,7 +6,7 @@
 
 LIBUPNP_VERSION = 1.6.17
 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
-LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
+LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
 LIBUPNP_INSTALL_STAGING = YES
 
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 1659fd147b..d42abf5d9b 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBUSB_COMPAT_VERSION = 0.1.4
 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
-LIBUSB_COMPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
+LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
 LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb
 LIBUSB_COMPAT_INSTALL_STAGING = YES
 
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 5c485c603b..d4ca31eca4 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBUSB_VERSION = 1.0.9
 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
-LIBUSB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
+LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
 LIBUSB_LICENSE = LGPLv2.1+
 LIBUSB_LICENSE_FILES = COPYING
 LIBUSB_DEPENDENCIES = host-pkg-config
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index ad5f59598b..f94670e5d2 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -6,7 +6,7 @@
 
 LIBVNCSERVER_VERSION = 0.9.8.2
 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
-LIBVNCSERVER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver/$(LIBVNCSERVER_VERSION)
+LIBVNCSERVER_SITE = http://downloads.sourceforge.net/project/libvncserver/libvncserver/$(LIBVNCSERVER_VERSION)
 
 LIBVNCSERVER_INSTALL_STAGING = YES
 
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index 10f6d14043..d3d0f8f779 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -5,7 +5,7 @@
 #############################################################
 LMBENCH_VERSION:=3.0-a9
 LMBENCH_SOURCE:=lmbench-$(LMBENCH_VERSION).tgz
-LMBENCH_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lmbench/development/lmbench-3.0-a9/
+LMBENCH_SITE:=http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)/
 LMBENCH_LICENSE =  lmbench license (based on GPLv2)
 LMBENCH_LICENSE_FILES = COPYING COPYING-2
 
diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk
index 17c3e9eeda..4d9a8d4226 100644
--- a/package/logsurfer/logsurfer.mk
+++ b/package/logsurfer/logsurfer.mk
@@ -6,7 +6,7 @@
 
 LOGSURFER_VERSION = 1.8
 LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz
-LOGSURFER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION)
+LOGSURFER_SITE = http://downloads.sourceforge.net/project/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION)
 
 define LOGSURFER_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/src/logsurfer \
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index c0cb676b96..c6b34f0a2b 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -5,6 +5,6 @@
 #############################################################
 LTP_TESTSUITE_VERSION = 20101031
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
-LTP_TESTSUITE_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
+LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
index 8b7e79f143..6aadbbf647 100644
--- a/package/multimedia/bellagio/bellagio.mk
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -5,7 +5,7 @@
 #############################################################
 BELLAGIO_VERSION = 0.9.3
 BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
-BELLAGIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/omxil
+BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION)
 BELLAGIO_AUTORECONF = YES
 BELLAGIO_INSTALL_STAGING = YES
 
diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk
index f3c47122a1..8c4fc1aae2 100644
--- a/package/multimedia/faad2/faad2.mk
+++ b/package/multimedia/faad2/faad2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 FAAD2_VERSION = 2.7
-FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac
+FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION)
 FAAD2_LICENSE = GPLv2
 FAAD2_LICENSE_FILES = COPYING
 # frontend/faad calls frexp()
diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk
index e19a9fb238..cace0d9c74 100644
--- a/package/multimedia/flac/flac.mk
+++ b/package/multimedia/flac/flac.mk
@@ -6,7 +6,7 @@
 
 FLAC_VERSION = 1.2.1
 FLAC_SOURCE = flac-$(FLAC_VERSION).tar.gz
-FLAC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/flac/
+FLAC_SITE = http://downloads.sourceforge.net/project/flac/flac-src/flac-$(FLAC_VERSION)-src
 FLAC_INSTALL_STAGING = YES
 
 FLAC_CONF_OPT = \
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index 81a8f2adc6..a022312e8b 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -7,7 +7,7 @@
 LAME_VERSION_MAJOR = 3.99
 LAME_VERSION_MINOR = 5
 LAME_VERSION = $(LAME_VERSION_MAJOR).$(LAME_VERSION_MINOR)
-LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR)
+LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR)
 LAME_DEPENDENCIES = host-pkg-config
 LAME_INSTALL_STAGING = YES
 LAME_CONF_ENV = GTK_CONFIG=/bin/false
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index 56007ebbf4..9055951cb4 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -5,7 +5,7 @@
 #############################################################
 MADPLAY_VERSION:=0.15.2b
 MADPLAY_SOURCE:=madplay-$(MADPLAY_VERSION).tar.gz
-MADPLAY_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad
+MADPLAY_SITE:=http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
 MADPLAY_LIBTOOL_PATCH=NO
 MADPLAY_DEPENDENCIES=libmad libid3tag
 
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 28bc4cbfd9..7c88b9c2a3 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 MPD_VERSION = 0.16.8
-MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
+MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 MPD_DEPENDENCIES = host-pkg-config libglib2
 
 # Some options need an explicit --disable or --enable
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index c3d2c9cce3..5ed43a13c7 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -6,7 +6,7 @@
 
 MPG123_VERSION = 1.14.2
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
-MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
+MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
 MPG123_INSTALL_STAGING = YES
 
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index afff72348d..ed5e86e026 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 MUTT_VERSION = 1.5.21
-MUTT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mutt
+MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt-dev
 MUTT_DEPENDENCIES = ncurses
 MUTT_CONF_OPT = --disable-iconv --disable-smtp
 MUTT_AUTORECONF = YES
diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index a88daeb267..de4cc5fd2e 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -5,7 +5,7 @@
 #############################################################
 NANOCOM_VERSION = 2.6.1
 NANOCOM_SOURCE = nanocom.tar.gz
-NANOCOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nanocom/nanocom/v1.0
+NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v1.0
 NANOCOM_LICENSE = GPLv2+
 NANOCOM_LICENSE_FILES = COPYING
 
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index c2257f7177..bd63caa14e 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -6,7 +6,7 @@
 
 NBD_VERSION = 3.1
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
-NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
+NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
 NBD_DEPENDENCIES = libglib2
 
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index b7015e60f4..4b8d66f0d0 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 NETATALK_VERSION = 2.2.2
-NETATALK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/
+NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index d2c69622e9..7513686320 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -6,6 +6,6 @@
 
 NETCAT_VERSION:=0.7.1
 NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz
-NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netcat
+NETCAT_SITE=http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index df5f003a43..bbe0dbb213 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 NETSNMP_VERSION = 5.7.1
-NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
+NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_LICENSE = Various BSD-like
 NETSNMP_LICENSE_FILES = COPYING
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index c8795fb04e..61e0d6764b 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -6,7 +6,7 @@
 
 NFS_UTILS_VERSION = 1.2.6
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
-NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
+NFS_UTILS_SITE = http://downloads.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
 NFS_UTILS_AUTORECONF = YES
 NFS_UTILS_DEPENDENCIES = host-pkg-config
 
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index c296e34c3d..274bbbd0d7 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -6,7 +6,7 @@
 
 NGREP_VERSION = 1.45
 NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
-NGREP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep/ngrep/$(NGREP_VERSION)
+NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION)
 NGREP_INSTALL_STAGING = YES
 NGREP_CONF_ENV = LDFLAGS="-lpcre"
 NGREP_CONF_OPT =  \
diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk
index 5d255977d8..fb5f7e8ff0 100644
--- a/package/ocf-linux/ocf-linux.mk
+++ b/package/ocf-linux/ocf-linux.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 OCF_LINUX_VERSION = 20120127
-OCF_LINUX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION)
+OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION)
 OCF_LINUX_INSTALL_STAGING = YES
 
 define OCF_LINUX_INSTALL_STAGING_CMDS
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 1b06e5640a..bc71ead259 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 OPENCV_VERSION = 2.4.2
-OPENCV_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION)
+OPENCV_SITE    = http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION)
 OPENCV_SOURCE  = OpenCV-$(OPENCV_VERSION).tar.bz2
 OPENCV_INSTALL_STAGING = YES
 
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 9c377c532d..6354ab7c5e 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -5,7 +5,7 @@
 #############################################################
 OPENOCD_VERSION:=0.5.0
 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
-OPENOCD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
+OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
 
 OPENOCD_AUTORECONF = YES
 OPENOCD_CONF_OPT = \
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index f74c2b1c28..69ef314ced 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -3,9 +3,10 @@
 # poco
 #
 #############################################################
-POCO_VERSION = 1.4.3p1
+POCO_VERSION_MAJOR = 1.4.3
+POCO_VERSION = $(POCO_VERSION_MAJOR)p1
 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
-POCO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poco
+POCO_SITE = http://downloads.sourceforge.net/project/poco/sources/poco-$(POCO_VERSION_MAJOR)
 POCO_LICENSE = Boost-v1.0
 POCO_LICENSE_FILES = LICENSE
 POCO_INSTALL_STAGING = YES
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 1e2c460425..ded2a19635 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 PPTP_LINUX_VERSION = 1.7.2
-PPTP_LINUX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pptpclient
+PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
 PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
 PPTP_LINUX_MAKE = $(MAKE1)
 
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index cd381e508b..3132b708ac 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 PSMISC_VERSION = 22.16
-PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/psmisc/psmisc
+PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
 PSMISC_LICENSE = GPLv2
 PSMISC_LICENSE_FILES = COPYING
 PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
index 82776c0aeb..c6420722fd 100644
--- a/package/python-id3/python-id3.mk
+++ b/package/python-id3/python-id3.mk
@@ -6,7 +6,7 @@
 
 PYTHON_ID3_VERSION = 1.2
 PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
-PYTHON_ID3_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/id3-py
+PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION)
 
 PYTHON_ID3_DEPENDENCIES = python
 
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 44a5073294..7602e93053 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -6,7 +6,7 @@
 
 QUOTA_VERSION = 4.00
 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
-QUOTA_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
+QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
 
 QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index aee8bc44f7..b39b29beac 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -6,7 +6,7 @@
 
 RDESKTOP_VERSION = 1.5.0
 RDESKTOP_SOURCE = rdesktop-$(RDESKTOP_VERSION).tar.gz
-RDESKTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/rdesktop/
+RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION)
 RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
 RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
 
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index b4b1bd507c..347d89d7f3 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 RNG_TOOLS_VERSION = 3
-RNG_TOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gkernel
+RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION)
 RNG_TOOLS_CONF_ENV = LIBS="-largp"
 RNG_TOOLS_DEPENDENCIES = argp-standalone
 
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index b81c4f4bec..2aed62c5cb 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,6 +1,6 @@
 SCONS_VERSION = 2.0.1
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
-SCONS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/scons
+SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
 
 define HOST_SCONS_BUILD_CMDS
 	(cd $(@D); python setup.py build)
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 26cd5fc113..d2c3270acd 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -6,6 +6,6 @@
 
 SER2NET_VERSION = 2.7
 SER2NET_SOURCE = ser2net-$(SER2NET_VERSION).tar.gz
-SER2NET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ser2net
+SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net/$(SER2NET_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index a6873f020f..ad3bc18d79 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -5,6 +5,6 @@
 #############################################################
 
 SMARTMONTOOLS_VERSION = 5.42
-SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
+SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 0ec61ee3e0..c0485a3022 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -1,6 +1,6 @@
 SQUASHFS_VERSION=4.2
 SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
-SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
+SQUASHFS_SITE=http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
 
 # no libattr in BR
 SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 6f28e6ee81..e121c51b07 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -1,6 +1,6 @@
 SQUASHFS3_VERSION=3.4
 SQUASHFS3_SOURCE=squashfs$(SQUASHFS3_VERSION).tar.gz
-SQUASHFS3_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
+SQUASHFS3_SITE=http://downloads.sourceforge.net/project/squashfs/squashfs/$(SQUASHFS3_VERSION)
 
 SQUASHFS3_DEPENDENCIES = zlib
 
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 80d3a45f7b..67b9c7f53f 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 SSHFS_VERSION = 2.4
-SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION)
+SSHFS_SITE = http://downloads.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION)
 SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = \
 	libglib2 libfuse openssh \
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 3393e668e3..2d95137913 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -6,7 +6,7 @@
 
 STRACE_VERSION = 4.5.20
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.bz2
-STRACE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace
+STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 
 STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
 		  ac_cv_header_linux_netlink_h=yes \
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index b1afff7dad..240f83cdbf 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -6,7 +6,7 @@
 
 SYNERGY_VERSION = 1.3.1
 SYNERGY_SOURCE = synergy-$(SYNERGY_VERSION).tar.gz
-SYNERGY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/synergy2/
+SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION)
 
 SYNERGY_AUTORECONF = YES
 SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index a48f69d3de..606042e4e7 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -7,7 +7,7 @@ TCL_VERSION_MAJOR = 8.4
 TCL_VERSION_MINOR = 19
 TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
-TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
+TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SUBDIR = unix
 TCL_CONF_OPT = \
 		--disable-symbols \
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 3c23c6a76d..2662a7d89b 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 TCPREPLAY_VERSION = 3.4.3
-TCPREPLAY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/tcpreplay
+TCPREPLAY_SITE = http://downloads.sourceforge.net/project/tcpreplay/tcpreplay/$(TCPREPLAY_VERSION)
 TCPREPLAY_CONF_ENV = tr_cv_libpcap_version=">= 0.7.0"
 TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
 TCPREPLAY_AUTORECONF = YES
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 238330ec27..3d1845dd42 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 TINYHTTPD_VERSION = 0.1.0
-TINYHTTPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/
+TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION)
 
 define TINYHTTPD_BUILD_CMDS
 	$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 9b5e60e6b4..f43f847590 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 TN5250_VERSION = 0.17.4
-TN5250_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tn5250
+TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
 TN5250_MAKE_OPT = CPPFLAGS=""
 TN5250_DEPENDENCIES = ncurses
 
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index f2cef6cea4..2b24c681f8 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -8,7 +8,7 @@
 #############################################################
 VTUN_VERSION:=3.0.2
 VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz
-VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/
+VTUN_SITE:=http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
 VTUN_DEPENDENCIES = zlib lzo openssl
 
 VTUN_CONF_OPT = \
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index 289102f256..e523a311c9 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 WIPE_VERSION = 2.3.1
-WIPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/wipe
+WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION)
 WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2
 WIPE_AUTORECONF = YES
 
diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 90617147d3..5919619ba1 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 XMLSTARLET_VERSION = 1.3.0
-XMLSTARLET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
+XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
 
 XMLSTARLET_DEPENDENCIES += libxml2 libxslt \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)

From cd355e1125b5f3cbc0884c975f9972431639bfdb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 29 Aug 2012 01:02:26 +0200
Subject: [PATCH 2615/6849] prboom, oprofile: Add explicit <foo>_SITE
 statements

The default <foo>_SITE value that pkg-generic sets when the .mk file
doesn't declare it is using BR2_SOURCEFORGE_MIRROR and therefore isn't
consistent with the usage of downloads.sourceforge.net we have
generalized for all drivers.

Since the downloads.sourceforge.net URLs are inherently specific to
each package, we can no longer provide a default in pkg-generic.mk,
and therefore each package *must* declare its own <foo>_SITE value.

This patch fixes the only two packages that were lacking a <foo>_SITE
value.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/games/prboom/prboom.mk | 1 +
 package/oprofile/oprofile.mk   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk
index 4dbfd1d2dc..1f5c3ddc6d 100644
--- a/package/games/prboom/prboom.mk
+++ b/package/games/prboom/prboom.mk
@@ -4,6 +4,7 @@
 #
 #############################################################
 PRBOOM_VERSION = 2.5.0
+PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION)
 PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
 PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer
 
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 256ae9b135..54c46dd3a7 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -5,6 +5,7 @@
 #############################################################
 
 OPROFILE_VERSION = 0.9.7
+OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
 OPROFILE_CONF_OPT = --localstatedir=/var --with-kernel-support
 OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof
 OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled

From cdfebcfca6051eadc8326107615fcbdcf56d83b5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 29 Aug 2012 01:04:58 +0200
Subject: [PATCH 2616/6849] Remove BR2_SOURCEFORGE_MIRROR variable

Now that all packages have been converted to use the
downloads.sourceforge.net URLs that automatically selects an available
Sourceforge mirror, we can get rid of the BR2_SOURCEFORGE_MIRROR
configuration variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Config.in              | 16 ----------------
 package/pkg-generic.mk |  3 ---
 2 files changed, 19 deletions(-)

diff --git a/Config.in b/Config.in
index 4a7e6b5b1b..dab7787df8 100644
--- a/Config.in
+++ b/Config.in
@@ -147,22 +147,6 @@ config BR2_BACKUP_SITE
 	  will fall back to download package sources from here if the
 	  normal location fails.
 
-config BR2_SOURCEFORGE_MIRROR
-	string "Sourceforge mirror site"
-	default "kent"
-	help
-	  Note: the usage of this variable is deprecated. Packages
-	  should instead use the http://downloads.sourceforge.net/ URL
-	  which automatically chooses a working mirror
-
-	  Sourceforge has a system of mirror sites.  Some sites may be
-	  closer to your location, and sometimes mirror sites go down
-	  and are no longer available.  This option allows you to select
-	  your preferred Sourceforge mirror site.
-
-	  The list of mirrors is available here:
-	  http://sourceforge.net/apps/trac/sourceforge/wiki/Mirrors
-
 config BR2_KERNEL_MIRROR
 	string "Kernel.org mirror"
 	default "http://www.kernel.org/pub/"
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 68d23bae43..ffe7dfbc5f 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -244,9 +244,6 @@ endif
 ifndef $(2)_SITE
  ifdef $(3)_SITE
   $(2)_SITE = $($(3)_SITE)
- else
-  $(2)_SITE			?= \
-	http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1)
  endif
 endif
 

From c72e4bc01ca5855c475896c2cd73a15ee25e0363 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Wed, 29 Aug 2012 11:01:06 +0200
Subject: [PATCH 2617/6849] mtdev: new package

The mtdev is a stand-alone library which transforms all variants
of kernel multitouch events to the slotted type B protocol.

http://bitmath.org/code/mtdev/

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in       |  1 +
 package/mtdev/Config.in |  8 ++++++++
 package/mtdev/mtdev.mk  | 14 ++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/mtdev/Config.in
 create mode 100644 package/mtdev/mtdev.mk

diff --git a/package/Config.in b/package/Config.in
index d1b214cf50..f0fe0a6814 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -387,6 +387,7 @@ source "package/libnfc-llcp/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
+source "package/mtdev/Config.in"
 endmenu
 
 menu "Javascript"
diff --git a/package/mtdev/Config.in b/package/mtdev/Config.in
new file mode 100644
index 0000000000..34199038b2
--- /dev/null
+++ b/package/mtdev/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_MTDEV
+	bool "mtdev"
+	help
+	  The mtdev is a stand-alone library which transforms all
+	  variants of kernel MT events to the slotted type B protocol.
+
+	  http://bitmath.org/code/mtdev/
+
diff --git a/package/mtdev/mtdev.mk b/package/mtdev/mtdev.mk
new file mode 100644
index 0000000000..09f76f24ee
--- /dev/null
+++ b/package/mtdev/mtdev.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# mtdev
+#
+#############################################################
+MTDEV_VERSION = 1.1.3
+MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2
+MTDEV_SITE = http://bitmath.org/code/mtdev/
+
+MTDEV_LICENSE = MIT
+MTDEV_LICENSE_FILES = COPYING
+MTDEV_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From fa6e224e589be3386b9b6b7a9bf25fc26325efa5 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Wed, 29 Aug 2012 11:01:07 +0200
Subject: [PATCH 2618/6849] liblo: new pachage

liblo is an implementation of the Open Sound Control protocol
for POSIX systems.

http://liblo.sourceforge.net/

[thomas.petazzoni@free-electrons.com: add dependency on thread support
in toolchain]

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in       |  1 +
 package/liblo/Config.in | 11 +++++++++++
 package/liblo/liblo.mk  | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/liblo/Config.in
 create mode 100644 package/liblo/liblo.mk

diff --git a/package/Config.in b/package/Config.in
index f0fe0a6814..5b4788fbf8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -295,6 +295,7 @@ source "package/libcdaudio/Config.in"
 source "package/libcue/Config.in"
 source "package/libcuefile/Config.in"
 source "package/libid3tag/Config.in"
+source "package/liblo/Config.in"
 source "package/libmad/Config.in"
 source "package/libmpd/Config.in"
 source "package/libreplaygain/Config.in"
diff --git a/package/liblo/Config.in b/package/liblo/Config.in
new file mode 100644
index 0000000000..4c2d71944f
--- /dev/null
+++ b/package/liblo/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBLO
+	bool "liblo"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  liblo is an implementation of the Open Sound Control
+	  protocol for POSIX systems
+
+	  http://liblo.sourceforge.net/
+
+comment "liblo requires thread support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk
new file mode 100644
index 0000000000..924c3a7e6a
--- /dev/null
+++ b/package/liblo/liblo.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# liblo
+#
+#############################################################
+LIBLO_VERSION = 0.26
+LIBLO_SOURCE = liblo-$(LIBLO_VERSION).tar.gz
+LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION)
+
+LIBLO_LICENSE = LGPLv2.1+
+LIBLO_LICENSE_FILES = COPYING
+LIBLO_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Thu, 30 Aug 2012 04:56:38 +0200
Subject: [PATCH 2619/6849] mtdev2tuio: new package

mtdev2tuio is a simple application for converting touch events
to the standart TUIO 1.1 protocol.

https://github.com/olivopaolo/mtdev2tuio

[thomas.petazzoni@free-electrons.com: use TARGET_CONFIGURE_OPTS, fix
indentation, add dependency on thread support in toolchain]

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                |  1 +
 package/mtdev2tuio/Config.in     | 13 +++++++++++++
 package/mtdev2tuio/mtdev2tuio.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/mtdev2tuio/Config.in
 create mode 100644 package/mtdev2tuio/mtdev2tuio.mk

diff --git a/package/Config.in b/package/Config.in
index 5b4788fbf8..e129522084 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -469,6 +469,7 @@ source "package/libtpl/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
 source "package/lttng-libust/Config.in"
+source "package/mtdev2tuio/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
 source "package/protobuf/Config.in"
diff --git a/package/mtdev2tuio/Config.in b/package/mtdev2tuio/Config.in
new file mode 100644
index 0000000000..74453c486c
--- /dev/null
+++ b/package/mtdev2tuio/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_MTDEV2TUIO
+	bool "mtdev2tuio"
+	select BR2_PACKAGE_LIBLO
+	select BR2_PACKAGE_MTDEV
+	depends on BR2_TOOLCHAIN_HAS_THREADS # liblo
+	help
+	  mtdev2tuio is a simple application for converting touch
+	  events captured from libmtdev to TUIO 1.1
+
+	  https://github.com/olivopaolo/mtdev2tuio
+
+comment "mtdev2tuio requires thread support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
new file mode 100644
index 0000000000..a86c0bf709
--- /dev/null
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# mtdev2tuio
+#
+#############################################################
+MTDEV2TUIO_VERSION = e1e7378d86
+MTDEV2TUIO_SITE = git://github.com/olivopaolo/mtdev2tuio.git
+MTDEV2TUIO_DEPENDENCIES = mtdev liblo
+MTDEV2TUIO_LICENSE = GPLv3+
+MTDEV2TUIO_LICENSE_FILES = COPYING
+
+# mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD
+# here.
+define MTDEV2TUIO_BUILD_CMDS
+	$(MAKE) \
+		$(TARGET_CONFIGURE_OPTS) \
+		LD="$(TARGET_CC)" \
+		-C $(@D)
+endef
+
+define MTDEV2TUIO_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/mtdev2tuio $(TARGET_DIR)/usr/bin/mtdev2tuio
+endef
+
+define MTDEV2TUIO_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 8627654df717080a078d6022345226c255a3c418 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 31 Aug 2012 10:21:35 +0200
Subject: [PATCH 2620/6849] rrdtool: fix build with high BR2_JLEVEL settings

Fixes http://autobuild.buildroot.net/results/3dc64c2d74c54c665f16649992052a39b1665d4d

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rrdtool/rrdtool.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 112ddf9006..1057d5d6e5 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -13,6 +13,7 @@ RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
 			ac_cv_func_mmap_fixed_mapped=yes
 RRDTOOL_CONF_OPT = --disable-perl --disable-python --disable-ruby \
 			--disable-tcl --program-transform-name=''
+RRDTOOL_MAKE = $(MAKE1)
 
 define RRDTOOL_REMOVE_EXAMPLES
 	rm -rf $(TARGET_DIR)/usr/share/rrdtool/examples

From 3b38ade5c2fd4bb8fc3583de7e6221b9dc89c013 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 31 Aug 2012 10:45:06 +0200
Subject: [PATCH 2621/6849] Update CHANGES with resolved bugs in the 2012.08
 cycle

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES b/CHANGES
index 7049c38e3a..024ee753b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -106,6 +106,16 @@
 	sound-theme-freedesktop, sysprof, webrtc-audio-processing,
 	xinetd, zxing
 
+	Issues resolved (http://bugs.uclibc.org):
+
+	#1315: Allow use of older external toolchains without sysroot
+               support [won't fix]
+	#5276: Hiawatha needs to manage IPV6 if so [fixed]
+	#5360: buildroot fails when building "host-libglib2 2.30.2
+               Building" [won't fix, upstream problem]
+	#5384: Can't build packages relying on gets on newer glibc
+               [fixed]
+
 2012.05, Released May 30th, 2012:
 
 	Updated/fixed packages: busybox, netsnmp, pptp-linux

From 288b73995a0e31233f83184a406a68fe78ba5462 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 31 Aug 2012 10:49:41 +0200
Subject: [PATCH 2622/6849] Prepare for 2012.08

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES            | 12 ++++++++++++
 Makefile           |  2 +-
 docs/download.html |  8 +++++---
 docs/news.html     |  8 ++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 024ee753b6..fd94346df3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2012.08, Release August 31th, 2012
+
+	Updated/fixed packages: microperl, cups, luajit, rrdtool,
+	prboom, oprofile.
+
+	Added license information for: sqlite.
+
+	Changed the source URLs of all packages located on Sourceforge
+	in order to use the automatic mirror selection URL
+	downloads.sourceforge.net, and get rid of the
+	BR2_SOURCEFORGE_MIRROR option.
+
 2012.08-rc3, Released August 25th, 2012
 
 	Updated/fixed packages: libglib2, netsnmp, freetype, libfuse,
diff --git a/Makefile b/Makefile
index d59a548952..f4f75144a4 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.08-rc3
+export BR2_VERSION:=2012.08
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index e53bfb6132..51b7a82a08 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,12 +6,14 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2012.05</b>, which can be downloaded
+The latest stable release is <b>2012.08</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2012.05.tar.gz">buildroot-2012.05.tar.gz</a>
+<a href="/downloads/buildroot-2012.08.tar.gz">buildroot-2012.08.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.08.tar.bz2">buildroot-2012.08.tar.bz2</a>.
+
+<!--
 <p>
 The latest release candidate is <b>2012.08-rc3</b>, which can be
 downloaded here:<p>
diff --git a/docs/news.html b/docs/news.html
index abe408578b..2f545679c9 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,14 @@ <h3>News</h3>
 <p>
 
 <ul>
+   <li><b>31 August 2012 -- 2012.08 released</b>
+
+    <p>The stable 2012.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08">CHANGES</a>
+    file for more details and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.08.tar.bz2">2012.08 release</a>.</p>
+
    <li><b>25 August 2012 -- 2012.08-rc3 released</b>
 
      <p>We have a new release candidate! Various fixes, and addition

From 666eb02be3cd4115a1ef8b78a63d64d12b24469e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 31 Aug 2012 21:44:17 +0200
Subject: [PATCH 2623/6849] toolchain/helpers.mk: fix check_glibc sysroot typo

Introduced by 68973cca2 (adjust logic to support Linaro 2012.05)

Reported-by: R Zhong <rzhong@hotmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 49a90441b0..d5ab91b3d5 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -196,7 +196,7 @@ check_glibc_feature = \
 #
 check_glibc = \
 	SYSROOT_DIR="$(strip $1)"; \
-	if test `find $${SYSDROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
+	if test `find $${SYSROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \

From f9686563b4fd3eed22e26105f7c440f0b74fcac1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Sep 2012 21:27:41 +0200
Subject: [PATCH 2624/6849] Kickoff 2012.11 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES  | 2 ++
 Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index fd94346df3..ae5f75d33c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2012.11, Not released yet:
+
 2012.08, Release August 31th, 2012
 
 	Updated/fixed packages: microperl, cups, luajit, rrdtool,
diff --git a/Makefile b/Makefile
index f4f75144a4..b81170fadb 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.08
+export BR2_VERSION:=2012.11-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From 539437041c4c9bccce741ae209d28301a838657f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Sep 2012 22:32:27 +0200
Subject: [PATCH 2625/6849] usb_modeswitch_data: bump version

Previous version is no longer available upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usb_modeswitch_data/usb_modeswitch_data.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
index d493144aed..a7b7072993 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USB_MODESWITCH_DATA_VERSION = 20120812
+USB_MODESWITCH_DATA_VERSION = 20120815
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch

From 7a7e03400c1b79cb9178bb93b9c5076ee37f8206 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Sep 2012 22:36:38 +0200
Subject: [PATCH 2626/6849] e2fsprogs: fix download URL

It is /v$VERSION, not just /$VERSION.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index e0746406cf..9002d46251 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 E2FSPROGS_VERSION = 1.42.5
-E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/$(E2FSPROGS_VERSION)
+E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \

From 11f338bcbc48816b0e4d637ea6f798f7df328d2e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Sep 2012 22:44:10 +0200
Subject: [PATCH 2627/6849] collectd: fix rrdtool suboption dependency

Fixes warning: (BR2_PACKAGE_COLLECTD_RRDTOOL) selects BR2_PACKAGE_RRDTOOL
which has unmet direct dependencies (BR2_USE_WCHAR).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 4fae6d5070..fe520f8ce9 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -360,6 +360,7 @@ config BR2_PACKAGE_COLLECTD_NETWORK
 
 config BR2_PACKAGE_COLLECTD_RRDTOOL
 	bool "rrdtool"
+	depends on BR2_USE_WCHAR # rrdtool
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LIBART
 	select BR2_PACKAGE_LIBPNG
@@ -368,6 +369,9 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL
 	help
 	  Writes values to RRD-files.
 
+comment "rrdtool support requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
 config BR2_PACKAGE_COLLECTD_UNIXSOCK
 	bool "unixsock"
 	help

From 9ec1c5d9d31b4f377c91a0451efd3ba67416d6f8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Sep 2012 13:07:38 +0200
Subject: [PATCH 2628/6849] busybox: add 1.19.4 / 1.20.2 fixes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.19.4/busybox-1.19.4-udhcp.patch | 164 ++++++++++++++++++
 .../busybox-1.20.2-kernel_ver.patch           |  25 +++
 2 files changed, 189 insertions(+)
 create mode 100644 package/busybox/busybox-1.19.4/busybox-1.19.4-udhcp.patch
 create mode 100644 package/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch

diff --git a/package/busybox/busybox-1.19.4/busybox-1.19.4-udhcp.patch b/package/busybox/busybox-1.19.4/busybox-1.19.4-udhcp.patch
new file mode 100644
index 0000000000..94d5f34a16
--- /dev/null
+++ b/package/busybox/busybox-1.19.4/busybox-1.19.4-udhcp.patch
@@ -0,0 +1,164 @@
+--- busybox-1.19.4/networking/udhcp/common.c
++++ busybox-1.19.4-udhcp/networking/udhcp/common.c
+@@ -29,16 +29,16 @@ const struct dhcp_optflag dhcp_optflags[
+ //	{ OPTION_IP | OPTION_LIST                 , 0x07 }, /* DHCP_LOG_SERVER    */
+ //	{ OPTION_IP | OPTION_LIST                 , 0x08 }, /* DHCP_COOKIE_SERVER */
+ 	{ OPTION_IP | OPTION_LIST                 , 0x09 }, /* DHCP_LPR_SERVER    */
+-	{ OPTION_STRING               | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
++	{ OPTION_STRING_HOST          | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
+ 	{ OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */
+-	{ OPTION_STRING               | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
++	{ OPTION_STRING_HOST          | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
+ 	{ OPTION_IP                               , 0x10 }, /* DHCP_SWAP_SERVER   */
+ 	{ OPTION_STRING                           , 0x11 }, /* DHCP_ROOT_PATH     */
+ 	{ OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */
+ 	{ OPTION_U16                              , 0x1a }, /* DHCP_MTU           */
+ 	{ OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */
+ 	{ OPTION_IP_PAIR | OPTION_LIST            , 0x21 }, /* DHCP_ROUTES        */
+-	{ OPTION_STRING                           , 0x28 }, /* DHCP_NIS_DOMAIN    */
++	{ OPTION_STRING_HOST                      , 0x28 }, /* DHCP_NIS_DOMAIN    */
+ 	{ OPTION_IP | OPTION_LIST                 , 0x29 }, /* DHCP_NIS_SERVER    */
+ 	{ OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x2a }, /* DHCP_NTP_SERVER    */
+ 	{ OPTION_IP | OPTION_LIST                 , 0x2c }, /* DHCP_WINS_SERVER   */
+@@ -46,7 +46,7 @@ const struct dhcp_optflag dhcp_optflags[
+ 	{ OPTION_IP                               , 0x36 }, /* DHCP_SERVER_ID     */
+ 	{ OPTION_STRING                           , 0x38 }, /* DHCP_ERR_MESSAGE   */
+ //TODO: must be combined with 'sname' and 'file' handling:
+-	{ OPTION_STRING                           , 0x42 }, /* DHCP_TFTP_SERVER_NAME */
++	{ OPTION_STRING_HOST                      , 0x42 }, /* DHCP_TFTP_SERVER_NAME */
+ 	{ OPTION_STRING                           , 0x43 }, /* DHCP_BOOT_FILE     */
+ //TODO: not a string, but a set of LASCII strings:
+ //	{ OPTION_STRING                           , 0x4D }, /* DHCP_USER_CLASS    */
+@@ -143,6 +143,7 @@ const uint8_t dhcp_option_lengths[] ALIG
+ 	[OPTION_IP_PAIR] = 8,
+ //	[OPTION_BOOLEAN] = 1,
+ 	[OPTION_STRING] =  1,  /* ignored by udhcp_str2optset */
++	[OPTION_STRING_HOST] = 1,  /* ignored by udhcp_str2optset */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ 	[OPTION_DNS_STRING] = 1,  /* ignored by both udhcp_str2optset and xmalloc_optname_optval */
+ 	[OPTION_SIP_SERVERS] = 1,
+@@ -411,7 +412,9 @@ static NOINLINE void attach_option(
+ 			/* actually 255 is ok too, but adding a space can overlow it */
+ 
+ 			existing->data = xrealloc(existing->data, OPT_DATA + 1 + old_len + length);
+-			if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING) {
++			if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING
++			 || (optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING_HOST
++			) {
+ 				/* add space separator between STRING options in a list */
+ 				existing->data[OPT_DATA + old_len] = ' ';
+ 				old_len++;
+@@ -475,6 +478,7 @@ int FAST_FUNC udhcp_str2optset(const cha
+ 				retval = udhcp_str2nip(val, buffer + 4);
+ 			break;
+ 		case OPTION_STRING:
++		case OPTION_STRING_HOST:
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ 		case OPTION_DNS_STRING:
+ #endif
+--- busybox-1.19.4/networking/udhcp/common.h
++++ busybox-1.19.4-udhcp/networking/udhcp/common.h
+@@ -80,6 +80,9 @@ enum {
+ 	OPTION_IP = 1,
+ 	OPTION_IP_PAIR,
+ 	OPTION_STRING,
++	/* Opts of STRING_HOST type will be sanitized before they are passed
++	 * to udhcpc script's environment: */
++	OPTION_STRING_HOST,
+ //	OPTION_BOOLEAN,
+ 	OPTION_U8,
+ 	OPTION_U16,
+--- busybox-1.19.4/networking/udhcp/dhcpc.c
++++ busybox-1.19.4-udhcp/networking/udhcp/dhcpc.c
+@@ -101,6 +101,7 @@ static const uint8_t len_of_option_as_st
+ 	[OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
+ 	[OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
+ 	[OPTION_STRING          ] = 1,
++	[OPTION_STRING_HOST     ] = 1,
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ 	[OPTION_DNS_STRING      ] = 1, /* unused */
+ 	/* Hmmm, this severely overestimates size if SIP_SERVERS option
+@@ -135,6 +136,63 @@ static int mton(uint32_t mask)
+ 	return i;
+ }
+ 
++/* Check if a given label represents a valid DNS label
++ * Return pointer to the first character after the label upon success,
++ * NULL otherwise.
++ * See RFC1035, 2.3.1
++ */
++/* We don't need to be particularly anal. For example, allowing _, hyphen
++ * at the end, or leading and trailing dots would be ok, since it
++ * can't be used for attacks. (Leading hyphen can be, if someone uses
++ * cmd "$hostname"
++ * in the script: then hostname may be treated as an option)
++ */
++static const char *valid_domain_label(const char *label)
++{
++	unsigned char ch;
++	unsigned pos = 0;
++
++	for (;;) {
++		ch = *label;
++		if ((ch|0x20) < 'a' || (ch|0x20) > 'z') {
++			if (pos == 0) {
++				/* label must begin with letter */
++				return NULL;
++			}
++			if (ch < '0' || ch > '9') {
++				if (ch == '\0' || ch == '.')
++					return label;
++				/* DNS allows only '-', but we are more permissive */
++				if (ch != '-' && ch != '_')
++					return NULL;
++			}
++		}
++		label++;
++		pos++;
++		//Do we want this?
++		//if (pos > 63) /* NS_MAXLABEL; labels must be 63 chars or less */
++		//	return NULL;
++	}
++}
++
++/* Check if a given name represents a valid DNS name */
++/* See RFC1035, 2.3.1 */
++static int good_hostname(const char *name)
++{
++	//const char *start = name;
++
++	for (;;) {
++		name = valid_domain_label(name);
++		if (!name)
++			return 0;
++		if (!name[0])
++			return 1;
++			//Do we want this?
++			//return ((name - start) < 1025); /* NS_MAXDNAME */
++		name++;
++	}
++}
++
+ /* Create "opt_name=opt_value" string */
+ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_optflag *optflag, const char *opt_name)
+ {
+@@ -185,8 +243,11 @@ static NOINLINE char *xmalloc_optname_op
+ 			break;
+ 		}
+ 		case OPTION_STRING:
++		case OPTION_STRING_HOST:
+ 			memcpy(dest, option, len);
+ 			dest[len] = '\0';
++			if (type == OPTION_STRING_HOST && !good_hostname(dest))
++				safe_strncpy(dest, "bad", len);
+ 			return ret;	 /* Short circuit this case */
+ 		case OPTION_STATIC_ROUTES: {
+ 			/* Option binary format:
+@@ -314,6 +375,7 @@ static char **fill_envp(struct dhcp_pack
+ 	/* +1 element for each option, +2 for subnet option: */
+ 	if (packet) {
+ 		/* note: do not search for "pad" (0) and "end" (255) options */
++//TODO: change logic to scan packet _once_
+ 		for (i = 1; i < 255; i++) {
+ 			temp = udhcp_get_option(packet, i);
+ 			if (temp) {
diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/package/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
new file mode 100644
index 0000000000..456fb08e11
--- /dev/null
+++ b/package/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
@@ -0,0 +1,25 @@
+--- busybox-1.20.2/libbb/kernel_version.c
++++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c
+@@ -20,18 +20,15 @@
+ int FAST_FUNC get_linux_version_code(void)
+ {
+ 	struct utsname name;
+-	char *s;
++	char *s, *t;
+ 	int i, r;
+ 
+-	if (uname(&name) == -1) {
+-		bb_perror_msg("can't get system information");
+-		return 0;
+-	}
+-
++	uname(&name); /* never fails */
+ 	s = name.release;
+ 	r = 0;
+ 	for (i = 0; i < 3; i++) {
+-		r = r * 256 + atoi(strtok(s, "."));
++		t = strtok(s, ".");
++		r = r * 256 + (t ? atoi(t) : 0);
+ 		s = NULL;
+ 	}
+ 	return r;

From f921317a8c36c2e4eb1812a94e4581bfd2df9403 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Sep 2012 13:11:09 +0200
Subject: [PATCH 2629/6849] kernel-headers: bump 3.{0,2,4}.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.42-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index dc5c2adc68..d23e5e682c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.40"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.42"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.26"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.28"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.8"		if BR2_KERNEL_HEADERS_3_4
+	default "3.4.10"	if BR2_KERNEL_HEADERS_3_4
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.42-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.42-headers_install-fix-__packed-in-exported-kernel-head.patch

From 1da12bd37274ce75fe869c656dd74240ba72d798 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Sep 2012 13:13:10 +0200
Subject: [PATCH 2630/6849] kernel-headers: add 3.5.x, remove 2.6.36.x

And deprecate 2.6.38.x.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d23e5e682c..403ab3eacc 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_4
+	default BR2_KERNEL_HEADERS_3_5
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -15,16 +15,13 @@ choice
 	  For the snapshot, you have to provide the
 	  linux-2.6.tar.bz2 tarball in your download dir.
 
-	config BR2_KERNEL_HEADERS_2_6_36
-		bool "Linux 2.6.36.x kernel headers"
-		depends on BR2_DEPRECATED
-
 	config BR2_KERNEL_HEADERS_2_6_37
 		bool "Linux 2.6.37.x kernel headers"
 		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_2_6_38
 		bool "Linux 2.6.38.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_2_6_39
 		bool "Linux 2.6.39.x kernel headers"
@@ -44,6 +41,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_4
 		bool "Linux 3.4.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_5
+		bool "Linux 3.5.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -60,7 +60,6 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.36.4"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
@@ -69,5 +68,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.2.28"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.10"	if BR2_KERNEL_HEADERS_3_4
+	default "3.5.3"		if BR2_KERNEL_HEADERS_3_5
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 27045cde7d18f6132ab804ed30673e3fb3961879 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Sep 2012 13:28:03 +0200
Subject: [PATCH 2631/6849] gcc: default to 4.6.x

4.5.x is no longer maintained upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d08efbcfec..a67e7b0d94 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -4,7 +4,7 @@ comment "GCC Options"
 
 choice
 	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_4_5_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+	default BR2_GCC_VERSION_4_6_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
 	help

From 69a507e3577fe45a6ab3e004e0b588be5394217b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 02:00:18 +0000
Subject: [PATCH 2632/6849] linux: bump default to kernel version 3.5.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 030634853a..30cb5ed147 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_3_4
+	default BR2_LINUX_KERNEL_3_5
 
-config BR2_LINUX_KERNEL_3_4
-	bool "3.4.8"
+config BR2_LINUX_KERNEL_3_5
+	bool "3.5.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.4.8" if BR2_LINUX_KERNEL_3_4
+	default "3.5.3" if BR2_LINUX_KERNEL_3_5
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From ca56df4e442027e51465fd23435d6a165f9ef720 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 04:07:38 +0000
Subject: [PATCH 2633/6849] php: bump to version 5.3.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 05446597d6..2f8e99e648 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,12 +4,14 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.15
+PHP_VERSION = 5.3.16
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
 PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
+PHP_LICENSE = PHP
+PHP_LICENSE_FILES = LICENSE
 PHP_CONF_OPT =  --mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-all \

From a9df50486c0e5a7a36531aacf49c2a57ac21c7fe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 4 Sep 2012 04:09:53 +0000
Subject: [PATCH 2634/6849] uClibc: use BR2_ENDIAN to simplify endianess
 selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 9d0b6db94a..583d199ffc 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -41,22 +41,9 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
 		-e 's/cris.*/cris/' \
 		-e 's/xtensa.*/xtensa/' \
 ")
-# just handle the ones that can be big or little
-UCLIBC_TARGET_ENDIAN:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
-		-e 's/armeb/BIG/' \
-		-e 's/arm/LITTLE/' \
-		-e 's/mipsel/LITTLE/' \
-		-e 's/mips/BIG/' \
-		-e 's/sh.*eb/BIG/' \
-		-e 's/sh.*/LITTLE/' \
-		-e 's/sparc.*/BIG/' \
-")
 
-ifneq ($(UCLIBC_TARGET_ENDIAN),LITTLE)
-ifneq ($(UCLIBC_TARGET_ENDIAN),BIG)
-UCLIBC_TARGET_ENDIAN:=
-endif
-endif
+UCLIBC_TARGET_ENDIAN:=$(call qstrip,$(BR2_ENDIAN))
+
 ifeq ($(UCLIBC_TARGET_ENDIAN),LITTLE)
 UCLIBC_NOT_TARGET_ENDIAN:=BIG
 else

From 8e55f03a545e12ef3c149541b8aa25b31c3e927a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 4 Sep 2012 04:09:54 +0000
Subject: [PATCH 2635/6849] Clarify MIPS ABIs support

Practically speaking, MIPS has three useful ABIs:

 * o32 is for 32-bits CPUs, or 64-bit CPUs running only a 32-bit subset
   of the instruction set.
 * n32 is for 64-bits CPUs only. It has 32-bits pointers and long
   integers.
 * n64 is for 64-bits CPUs only. It has 64-bits pointers and long
   integers.

See http://www.linux-mips.org/wiki/MIPS_ABI_History and
http://www.linux-mips.org/wiki/WhatsWrongWithO32N32N64 for more
details.

So, this commit reworks the Buildroot MIPS support by:

 * Add separate mips64/mips64el top-level architectures.

 * Renaming the n32 ABI option to BR2_MIPS_NABI32, for consistency
   with BR2_MIPS_OABI32.

 * Renaming the n64 ABI option to BR2_MIPS_NABI64, for consistency
   with BR2_MIPS_OABI32.

 * Make the n32 and n64 ABI selections select the BR2_ARCH_IS_64,
   since those ABIs are valid on 64-bits CPUs only.

 * Removing the o64 ABI, which is practicaly never used.

 * Removing the "none" ABI, which really doesn't make sense.

 * Introduce the mips64 and mips64el architecture names when a 64-bits
   MIPS ABI is choosen. This will fix build issue like
   http://autobuild.buildroot.org/results/9b8c5ea86c953a89e85e7b67e9221de41773f652/build-end.log
   where gmp was confused by the fact of having a 32 bits architecture
   (detected by the mips- architecture part of the tuple) but 64 bits
   integer size when compiling.

 * Adjust the uclibc.mk logic to support the new mips64/mips64el
   architecture names, and take into account the renaming of the ABI
   options.

This has been build tested by generating Buildroot toolchains and
compiling a few packages for MIPS o32, MIPS n32 and MIPS n64.

This work is originally based on prior work done by Gustavo Zacarias.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in        |  2 +-
 target/Config.in.arch      | 60 ++++++++++++++++++++++----------------
 toolchain/uClibc/uclibc.mk |  7 ++---
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 6fad224ba2..21b8634d7b 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -87,7 +87,7 @@ endif
 
 TARGET_CFLAGS=$(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
-ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy)
+ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_NABI64)),yy)
 TARGET_CFLAGS+=-fno-pic -mno-abicalls
 endif
 
diff --git a/target/Config.in.arch b/target/Config.in.arch
index 342066e22c..860bf439a2 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -83,6 +83,22 @@ config BR2_mipsel
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
+config BR2_mips64
+	bool "MIPS64 (big endian)"
+	select BR2_ARCH_IS_64
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
+config BR2_mips64el
+	bool "MIPS64 (little endian)"
+	select BR2_ARCH_IS_64
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
 config BR2_powerpc
 	bool "PowerPC"
 	help
@@ -237,9 +253,10 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_mips || BR2_mipsel
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default BR2_mips_3 if BR2_mips
 	default BR2_mips_1 if BR2_mipsel
+	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
 	help
 	  Specific CPU variant to use
 
@@ -248,49 +265,43 @@ choice
 
 config BR2_mips_1
 	bool "mips I (generic)"
+	depends on !BR2_ARCH_IS_64
 config BR2_mips_2
 	bool "mips II"
+	depends on !BR2_ARCH_IS_64
 config BR2_mips_3
 	bool "mips III"
 config BR2_mips_4
 	bool "mips IV"
 config BR2_mips_32
 	bool "mips 32"
+	depends on !BR2_ARCH_IS_64
 config BR2_mips_32r2
 	bool "mips 32r2"
+	depends on !BR2_ARCH_IS_64
 config BR2_mips_64
 	bool "mips 64"
 config BR2_mips_64r2
 	bool "mips 64r2"
-config BR2_mips_16
-	bool "mips 16"
 endchoice
 
 
 choice
 	prompt "Target ABI"
-	depends on BR2_mips || BR2_mipsel
-	default BR2_MIPS_OABI32 if BR_mips_32 || BR_mips_32r2
-	default BR2_MIPS_ABI32 if BR_mips_64 || BR_mips_64r2
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default BR2_MIPS_OABI32 if !BR2_ARCH_IS_64
+	default BR2_MIPS_NABI32 if BR2_ARCH_IS_64
 	help
 	  Application Binary Interface to use
 
 config BR2_MIPS_OABI32
 	bool "o32"
-config BR2_MIPS_ABI32
+config BR2_MIPS_NABI32
 	bool "n32"
-	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
-config BR2_MIPS_ABI64
+	depends on BR2_ARCH_IS_64
+config BR2_MIPS_NABI64
 	bool "n64"
-	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
-config BR2_MIPS_OABI64
-	bool "o64"
-	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
-config BR2_MIPS_ABI_none
-	bool "unspecified"
-	depends on BR2_mips_16
-	help
-	  Unspecified ABI leaves ABI selection blank.
+	depends on BR2_ARCH_IS_64
 endchoice
 
 choice
@@ -667,6 +678,8 @@ config BR2_ARCH
 	default "microblaze"	if BR2_microblaze
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
+	default "mips64"	if BR2_mips64
+	default "mips64el"	if BR2_mips64el
 	default "powerpc"	if BR2_powerpc
 	default "sh2"		if BR2_sh2
 	default "sh2a"		if BR2_sh2a
@@ -683,10 +696,10 @@ config BR2_ARCH
 
 config BR2_ENDIAN
 	string
-	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \
+	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || BR2_mips64el || \
 			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64 || \
 			    BR2_microblazeel
-	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \
+	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || BR2_mips64 || \
 			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \
 			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc || \
 			    BR2_microblazebe
@@ -754,7 +767,6 @@ config BR2_GCC_TARGET_TUNE
 	default mips32r2	if BR2_mips_32r2
 	default mips64		if BR2_mips_64
 	default mips64r2	if BR2_mips_64r2
-	default mips16		if BR2_mips_16
 	default 401		if BR2_powerpc_401
 	default 403		if BR2_powerpc_403
 	default 405		if BR2_powerpc_405
@@ -859,10 +871,8 @@ config BR2_GCC_TARGET_ABI
 	default apcs-gnu	if BR2_ARM_OABI
 	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
-	default o64		if BR2_MIPS_OABI64
-	default 64		if BR2_MIPS_ABI64
+	default n32		if BR2_MIPS_NABI32
+	default 64		if BR2_MIPS_NABI64
 	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec
 	default no-altivec	if BR2_powerpc && BR2_PPC_ABI_no-altivec
 	default spe		if BR2_powerpc && BR2_PPC_ABI_spe
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 583d199ffc..534550a07a 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -37,7 +37,6 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
 		-e 's/v850.*/v850/g' \
 		-e 's/sh[234].*/sh/' \
 		-e 's/mips.*/mips/' \
-		-e 's/mipsel.*/mips/' \
 		-e 's/cris.*/cris/' \
 		-e 's/xtensa.*/xtensa/' \
 ")
@@ -142,13 +141,13 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips)
 	 /bin/echo "# CONFIG_MIPS_ISA_MIPS32R2 is not set"; \
 	 /bin/echo "# CONFIG_MIPS_ISA_MIPS64 is not set"; \
 	) >> $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_MIPS_OABI),y)
+ifeq ($(BR2_MIPS_OABI32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_MIPS_ABI32),y)
+ifeq ($(BR2_MIPS_NABI32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_MIPS_ABI64),y)
+ifeq ($(BR2_MIPS_NABI64),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(BR2_mips_1),y)

From 2bb39acb6adc90a9d9264e19d3ac3c5affcbb528 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 04:09:55 +0000
Subject: [PATCH 2636/6849] mips64: remove toolchain kludge

-mno-abicalls is an old kludge for some (probably) old issue.
Remove it since it's actually harmful, static busybox doesn't build with
it for a modern-ish toolchain (defaults as of this commit, uClibc
0.9.33.2 + gcc 4.5.4).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 21b8634d7b..340e387994 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -87,10 +87,6 @@ endif
 
 TARGET_CFLAGS=$(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
-ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_NABI64)),yy)
-TARGET_CFLAGS+=-fno-pic -mno-abicalls
-endif
-
 ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif

From 6b1e52d83224031ec907f1e134e12fe3df0e87d2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 04:09:56 +0000
Subject: [PATCH 2637/6849] qemu/mips64-malta: add new sample config

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/mips64-malta/linux-3.3.config | 78 ++++++++++++++++++++++++
 board/qemu/mips64-malta/readme.txt       |  7 +++
 configs/qemu_mips64_malta_defconfig      | 24 ++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 board/qemu/mips64-malta/linux-3.3.config
 create mode 100644 board/qemu/mips64-malta/readme.txt
 create mode 100644 configs/qemu_mips64_malta_defconfig

diff --git a/board/qemu/mips64-malta/linux-3.3.config b/board/qemu/mips64-malta/linux-3.3.config
new file mode 100644
index 0000000000..6e7f7eebd5
--- /dev/null
+++ b/board/qemu/mips64-malta/linux-3.3.config
@@ -0,0 +1,78 @@
+CONFIG_MIPS_MALTA=y
+CONFIG_CPU_MIPS64_R1=y
+CONFIG_64BIT=y
+CONFIG_64BIT_PHYS_ADDR=y
+CONFIG_MIPS_MT_SMP=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HZ_100=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PCI=y
+CONFIG_PM=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_MISC_DEVICES is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_I8042 is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+CONFIG_FB=y
+CONFIG_FB_CIRRUS=y
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_QUOTA=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_ROOT_NFS=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
new file mode 100644
index 0000000000..5087b01985
--- /dev/null
+++ b/board/qemu/mips64-malta/readme.txt
@@ -0,0 +1,7 @@
+Run the emulation with:
+
+ qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer. No keyboard support has been
+enabled.
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
new file mode 100644
index 0000000000..5653c8832a
--- /dev/null
+++ b/configs/qemu_mips64_malta_defconfig
@@ -0,0 +1,24 @@
+# Architecture
+BR2_mips=y
+BR2_mips_64=y
+BR2_MIPS_NABI64=y
+
+# Toolchain
+# uClibc dynamic loader seems broken for mips64
+BR2_PREFER_STATIC_LIB=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.8"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.3.config"
+BR2_LINUX_KERNEL_VMLINUX=y
+
+# Serial port config
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"

From 9006d3a3a357c16a426886b59b1688a9ee7f1599 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 2 Sep 2012 22:37:45 +0000
Subject: [PATCH 2638/6849] linux-firmware: add ti-connectivity fw v5

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/linux-firmware.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 2a6bfc17a4..c71dc15a8a 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -3,7 +3,7 @@
 # linux-firmware
 #
 #############################################################
-LINUX_FIRMWARE_VERSION = 8ccddee5ee23a0e192da38d98bcbbbb41bf385dd
+LINUX_FIRMWARE_VERSION = 7560108a2c94a62056fa82d912282b901aa0904f
 LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
@@ -41,6 +41,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
 	ti-connectivity/wl127x-fw-4-mr.bin			\
 	ti-connectivity/wl127x-fw-4-plt.bin			\
 	ti-connectivity/wl127x-fw-4-sr.bin			\
+	ti-connectivity/wl127x-fw-5-mr.bin			\
+	ti-connectivity/wl127x-fw-5-plt.bin			\
+	ti-connectivity/wl127x-fw-5-sr.bin			\
 	ti-connectivity/TIInit_7.2.31.bts 			\
 	LICENCE.ti-connectivity
 
@@ -56,6 +59,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
 	ti-connectivity/wl128x-fw-4-mr.bin			\
 	ti-connectivity/wl128x-fw-4-plt.bin			\
 	ti-connectivity/wl128x-fw-4-sr.bin			\
+	ti-connectivity/wl128x-fw-5-mr.bin			\
+	ti-connectivity/wl128x-fw-5-plt.bin			\
+	ti-connectivity/wl128x-fw-5-sr.bin			\
 	ti-connectivity/TIInit_7.2.31.bts 			\
 	LICENCE.ti-connectivity
 

From 5f566e5d917bcf6bb3b70a29856aa6013cb01b0c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 2 Sep 2012 22:37:46 +0000
Subject: [PATCH 2639/6849] linux-firmware: add Realtek firmware

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 14 ++++++++++++++
 package/linux-firmware/linux-firmware.mk | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 5166800741..c494f0f2b3 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -41,6 +41,20 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX
 
 endmenu
 
+menu "Realtek"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192
+	bool "Realtek 8192"
+	help
+	  Realtek 8192
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
+	bool "Realtek 8712"
+	help
+	  Realtek 8712
+
+endmenu
+
 menu "Texas Instruments"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index c71dc15a8a..28c551f7a5 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -21,6 +21,17 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \
 	rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin 	\
 	LICENCE.ralink-firmware.txt
 
+# rtl8192
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192) += \
+	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin 		\
+	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin	\
+	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin		\
+	LICENCE.rtlwifi_firmware.txt
+
+# rtl8712
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712) += \
+	rtlwifi/rtl8712u.bin LICENCE.rtlwifi_firmware.txt
+
 # ar7010
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010) += \
 	LICENCE.atheros_firmware ar7010.fw ar7010_1_1.fw htc_7010.fw

From ebb2e058b0c1bdb988fd8340efa46e4cf067d5ac Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Sep 2012 07:19:08 +0200
Subject: [PATCH 2640/6849] erlang: fix host version dependencies

Fixes http://autobuild.buildroot.net/results/8816fe16534062cdf0d3a682a7408f9adbea2985

The host version of erlang does not need to enable support for & depend on
host versions of ncurses/openssl/zlib, even if the target version does.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/erlang.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 6b906270de..63c655ba22 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -8,6 +8,7 @@ ERLANG_VERSION = R15B01
 ERLANG_SITE = http://www.erlang.org/download
 ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
 ERLANG_DEPENDENCIES = host-erlang
+HOST_ERLANG_DEPENDENCIES =
 
 ERLANG_LICENSE = EPL
 ERLANG_LICENSE_FILES = EPLICENCE

From dd00c5fcd072b4a1e3862c5af29f8c580acadd38 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Sep 2012 16:04:52 +0200
Subject: [PATCH 2641/6849] libpcap: fix build on microblaze

On microblaze, libpcap needs to be built with -fPIC rather than -fpic as
reported by mrueg on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpcap/libpcap.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 04766eacdb..7a1d32f40e 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -21,4 +21,9 @@ LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
+# microblaze needs -fPIC instead of -fpic
+ifeq ($(BR2_microblaze),y)
+LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
+endif
+
 $(eval $(autotools-package))

From 5e0d702b7cfa09c9b4b4b0047b10be9f8bbf95a9 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 28 Aug 2012 14:37:00 +0000
Subject: [PATCH 2642/6849] pkg-infra: warn about use of deprecated GENTARGETS

With the replacement of GENTARGETS by package-generic, there is a risk
that local packages don't work anymore without any indication of what
is wrong.  Therefore, generate an error message if the GENTARGETS,
AUTOTARGETS or CMAKETARGETS macro is still used.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index 340e387994..64508b2838 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -300,6 +300,12 @@ else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
+# Warn if a package uses the deprecated GENTARGETS macros.  This can be
+# removed again for BR-2012.11.
+GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
+AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
+CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
+
 include package/pkg-utils.mk
 include package/pkg-download.mk
 include package/pkg-autotools.mk

From c04355b9223b2d74a091b2722229bc0f337d2820 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 3 Sep 2012 02:10:32 +0000
Subject: [PATCH 2643/6849] linux-firmware: add firmware for SDIO based Marvell
 Libertas modules

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 19 +++++++++++++++++++
 package/linux-firmware/linux-firmware.mk | 12 ++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index c494f0f2b3..0c24d986b1 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -22,6 +22,25 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
 
 endmenu
 
+menu "Marvell Libertas"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8
+       bool "Libertas SD 8686 v8"
+       help
+         Firmware files (version 8) for the Marvell SD8686 module
+
+config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9
+       bool "Libertas SD 8686 v9"
+       help
+         Firmware files (version 9) for the Marvell SD8686 module
+
+config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688
+       bool "Libertas SD 8688"
+       help
+         Firmware files for the Marvell SD8688 module
+
+endmenu
+
 menu "Ralink"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 28c551f7a5..23afafad1a 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -40,6 +40,18 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010) += \
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271) += \
 	LICENCE.atheros_firmware ar9271.fw htc_9271.fw
 
+# sd8686 v8
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8) += \
+	libertas/sd8686_v8.bin libertas/sd8686_v8_helper.bin LICENCE.Marvell
+
+# sd8686 v9
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9) += \
+	libertas/sd8686_v9.bin libertas/sd8686_v9_helper.bin LICENCE.Marvell
+
+# sd8688
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688) += \
+	libertas/sd8688.bin libertas/sd8688_helper.bin LICENCE.Marvell
+
 # wl127x
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
 	ti-connectivity/wl1271-fw-2.bin				\

From 602b051634bada61ac67c4e8d39765f4549ef9e9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 04:06:36 +0000
Subject: [PATCH 2644/6849] rp-pppoe: bump to version 3.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rp-pppoe-3.10-001-configure-bitfield.patch | 34 -------------------
 .../rp-pppoe-3.10-002-krn-plugin.patch        | 20 ++++++-----
 package/rp-pppoe/rp-pppoe.mk                  |  4 ++-
 3 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch

diff --git a/package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch b/package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch
deleted file mode 100644
index 8cc472f312..0000000000
--- a/package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- rp-pppoe-3.10.orig/src/configure.in	2006-04-02 16:29:42.000000000 +0200
-+++ rp-pppoe-3.10/src/configure.in	2007-08-24 11:51:04.000000000 +0200
-@@ -231,6 +231,7 @@ esac
- 
- dnl Figure out packing order of structures
- AC_MSG_CHECKING([packing order of bit fields])
-+if test "x$rpppoe_cv_pack_bitfields" = "x" ; then
- AC_TRY_RUN([
- union foo {
-     struct bar {
-@@ -254,8 +255,8 @@ main(void)
- 	return 2;
-     }
- }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
--$ECHO "no defaults for cross-compiling"; exit 0)
--
-+$ECHO "no defaults for cross-compiling")
-+fi
- if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
- 	AC_MSG_RESULT(reversed)
- 	AC_DEFINE(PACK_BITFIELDS_REVERSED)
---- rp-pppoe-3.10.orig/src/configure	2010-08-20 10:46:39.000000000 -0700
-+++ rp-pppoe-3.10/src/configure	2010-08-20 11:02:16.000000000 -0700
-@@ -6272,7 +6272,9 @@ esac
- { echo "$as_me:$LINENO: checking packing order of bit fields" >&5
- echo $ECHO_N "checking packing order of bit fields... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
--  $ECHO "no defaults for cross-compiling"; exit 0
-+if test "x$rpppoe_cv_pack_bitfields" = "x" ; then
-+  $ECHO "no defaults for cross-compiling"
-+fi
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
diff --git a/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch b/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch
index 27c835763d..d364e8684c 100644
--- a/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch
+++ b/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch
@@ -1,17 +1,19 @@
---- rp-pppoe-3.10/src/configure.theorig  2008-02-05 13:57:15.000000000 -0800
-+++ rp-pppoe-3.10/src/configure  2008-02-05 13:24:36.000000000 -0800
-@@ -6151,7 +6151,7 @@ modprobe ppp_synctty > /dev/null 2>&1
+diff -Nura rp-pppoe-3.11.orig/src/configure rp-pppoe-3.11/src/configure
+--- rp-pppoe-3.11.orig/src/configure	2012-08-21 10:01:10.536440032 -0300
++++ rp-pppoe-3.11/src/configure	2012-08-21 10:01:45.353442397 -0300
+@@ -4517,7 +4517,7 @@
  modprobe pppoe > /dev/null 2>&1
  fi
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
 -  ac_cv_linux_kernel_pppoe=no; $ECHO "cross-compiling, default: "
 +  ac_cv_linux_kernel_pppoe=yes; $ECHO "cross-compiling, default: "
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
---- rp-pppoe-3.10/src/pppoe-server.c.theorig     2006-04-02 07:29:42.000000000 -0700
-+++ rp-pppoe-3.10/src/pppoe-server.c     2008-02-05 13:52:15.000000000 -0800
-@@ -20,6 +20,9 @@ static char const RCSID[] =
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+diff -Nura rp-pppoe-3.11.orig/src/pppoe-server.c rp-pppoe-3.11/src/pppoe-server.c
+--- rp-pppoe-3.11.orig/src/pppoe-server.c	2012-08-21 10:01:10.535440032 -0300
++++ rp-pppoe-3.11/src/pppoe-server.c	2012-08-21 10:02:02.597443569 -0300
+@@ -20,6 +20,9 @@
  
  #include "config.h"
  
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index cf12d643bf..106d3106a3 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-RP_PPPOE_VERSION = 3.10
+RP_PPPOE_VERSION = 3.11
 RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download
+RP_PPPOE_LICENSE = GPLv2
+RP_PPPOE_LICENSE_FILES = doc/LICENSE
 RP_PPPOE_DEPENDENCIES = pppd
 RP_PPPOE_SUBDIR = src
 RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff

From 2b595d6c923c197b8410470b663720e339682b70 Mon Sep 17 00:00:00 2001
From: Simon Dawson <simond@trainfx.com>
Date: Tue, 28 Aug 2012 02:07:43 +0000
Subject: [PATCH 2645/6849] zeromq: add license information

Note that the COPYING.LESSER file states that "Parts of the
software are licensed under the MIT (X11) license".
On the 0MQ mailing list, Pieter Hintjens has confirmed that
the code no longer contains any parts that are under the
MIT/X11 license. (The COPYING.LESSER file will be fixed in
a future release.)

Signed-off-by: Simon Dawson <simond@trainfx.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/zeromq.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index f5e530dfdc..99ee4cad34 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -8,5 +8,7 @@ ZEROMQ_VERSION = 2.1.11
 ZEROMQ_SITE = http://download.zeromq.org/
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux
+ZEROMQ_LICENSE = LGPLv3+ with exceptions
+ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
 
 $(eval $(autotools-package))

From bf5f225dca807b70f80168a23dadc9e29e71cf20 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Sep 2012 15:48:19 +0200
Subject: [PATCH 2646/6849] vala: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rsion.patch => vala-dont-add-dirty-to-valac-version.patch} | 0
 package/vala/vala.mk                                          | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename package/vala/{vala-0.15.2-dont-add-dirty-to-valac-version.patch => vala-dont-add-dirty-to-valac-version.patch} (100%)

diff --git a/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch b/package/vala/vala-dont-add-dirty-to-valac-version.patch
similarity index 100%
rename from package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch
rename to package/vala/vala-dont-add-dirty-to-valac-version.patch
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 7c0ea9ffe8..984043cf13 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-VALA_VERSION_MAJOR = 0.15
-VALA_VERSION_MINOR = 2
+VALA_VERSION_MAJOR = 0.17
+VALA_VERSION_MINOR = 6
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz

From 8e4d40751ed22f9a36ec541686456075b0808d59 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Sep 2012 15:59:13 +0200
Subject: [PATCH 2647/6849] vala: move to 'Development tools' submenu

vala isn't an X application.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index e129522084..7fd26a51b7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -91,6 +91,7 @@ source "package/sstrip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
 endif
+source "package/vala/Config.in"
 source "package/yasm/Config.in"
 endmenu
 
@@ -160,7 +161,6 @@ source "package/rdesktop/Config.in"
 source "package/sylpheed/Config.in"
 source "package/synergy/Config.in"
 source "package/torsmo/Config.in"
-source "package/vala/Config.in"
 source "package/x11vnc/Config.in"
 source "package/xstroke/Config.in"
 source "package/xterm/Config.in"

From d6743630d25e3e8f483ead766224444ff24965b5 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 27 Aug 2012 15:58:06 +0000
Subject: [PATCH 2648/6849] cjson: bug fix - use -fPIC instead of -fpic

This change is to fix the autobuild failure at:
http://autobuild.buildroot.net/results/45e2c08d5e3c868b2d7fdf26a7c5f88de5ff8f61/build-end.log
I can't actually reproduce this bug, because my machine cannot
run the 64-bit microblaze toolchain.  However, the log makes
it clear that -fPIC is needed, and grepping for fPIC and fpic
under packages makes it clear that cjson should have used -fPIC
anyway.  So even if the bug isn't fixed, it must surely be improved.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cjson/cjson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 79b4c31185..dd64010748 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -14,7 +14,7 @@ define CJSON_EXTRACT_CMDS
 endef
 
 define CJSON_BUILD_CMDS
-	cd $(@D)/cJSON && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fpic cJSON.c -o libcJSON.so
+	cd $(@D)/cJSON && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so
 endef
 
 define CJSON_INSTALL_STAGING_CMDS

From 58149528d09b3342477beb3f5abce83775acdaff Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 25 Aug 2012 16:13:12 +0200
Subject: [PATCH 2649/6849] json-c: fix build when no thread support is
 available

Fixes
http://autobuild.buildroot.org/results/1d9a2e44da3aa627265b03763ca324c609c0c61c/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/json-c/json-c-no-reentrant.patch | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/json-c/json-c-no-reentrant.patch

diff --git a/package/json-c/json-c-no-reentrant.patch b/package/json-c/json-c-no-reentrant.patch
new file mode 100644
index 0000000000..a01181cfbb
--- /dev/null
+++ b/package/json-c/json-c-no-reentrant.patch
@@ -0,0 +1,33 @@
+Do not pass -D_REENTRANT
+
+This flag is not needed to build this library, and prevents to build
+it with toolchains that don't have thread support.
+
+Since the Makefile.in change is a one-liner, we also do it in the
+patch to avoid having to autoreconfigure the package.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
+ 
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
+ 
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -219,7 +219,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
+ lib_LTLIBRARIES = libjson.la
+ pkgconfigdir = $(libdir)/pkgconfig

From a9e4e1b676758f1004bebdd1fd409b8976ebc6ca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 01:59:18 +0000
Subject: [PATCH 2650/6849] libfuse: fix build failures with iconv

Fix build failures when iconv is present for libfuse users that use
pkgconfig.
For example:
http://autobuild.buildroot.net/results/4d455831a7b467b9ea1ad54bea6b57607f5560a8/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/libfuse-iconv.patch | 18 ++++++++++++++++++
 package/libfuse/libfuse.mk          |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 package/libfuse/libfuse-iconv.patch

diff --git a/package/libfuse/libfuse-iconv.patch b/package/libfuse/libfuse-iconv.patch
new file mode 100644
index 0000000000..9f500321a0
--- /dev/null
+++ b/package/libfuse/libfuse-iconv.patch
@@ -0,0 +1,18 @@
+Upstream commit efeac22bfa65c845c04adb5e70e6de33b0104fa3 but without
+the need to autoreconf :)
+Fixes libiconv missing in fuse.pc
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura fuse-2.9.1/configure fuse-2.9.1.iconv/configure
+--- fuse-2.9.1/configure	2012-07-19 09:53:29.000000000 -0300
++++ fuse-2.9.1.iconv/configure	2012-09-07 08:47:57.834912620 -0300
+@@ -13237,7 +13237,7 @@
+ 
+   fi
+ 
+-libfuse_libs=$libfuse_libs $LTLIBICONV
++libfuse_libs="$libfuse_libs $LTLIBICONV"
+  if test "$am_cv_func_iconv" = yes; then
+   ICONV_TRUE=
+   ICONV_FALSE='#'
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index c8c01303d3..779115bfee 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -9,8 +9,8 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 LIBFUSE_LICENSE = GPLv2 LGPLv2.1
 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
-
 LIBFUSE_INSTALL_STAGING = YES
+LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 LIBFUSE_CONF_OPT= --disable-nls \
 		--disable-example \
 		--disable-kernel-module \

From 44393cddc944aa2d0a9c095a478d689907aba0fd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:48 +0000
Subject: [PATCH 2651/6849] libnl: bump to version 3.2.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index f757b1b250..58f8d17027 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.11
+LIBNL_VERSION = 3.2.13
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
+LIBNL_LICENSE = LGPLv2.1+
+LIBNL_LICENSE_FILES = COPYING
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison
 LIBNL_MAKE = $(MAKE1)

From 8ef851e86be727da06a55ab0b66dcef0c9fdf16e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:49 +0000
Subject: [PATCH 2652/6849] less: bump to version 451

[Peter: License is GPLv3+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/less/less.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/less/less.mk b/package/less/less.mk
index c0ecf207d4..72449c3c11 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-LESS_VERSION = 444
+LESS_VERSION = 451
 LESS_SITE = http://www.greenwoodsoftware.com/less
+LESS_LICENSE = GPLv3+
+LESS_LICENSE_FILES = COPYING
 # Build after busybox, full-blown is better
 LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 

From fb07eb9eee6c6084e694711c0a924dcfd3661c52 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:50 +0000
Subject: [PATCH 2653/6849] automake: bump to version 1.11.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/automake/automake.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 3c190854ac..477b10b3f6 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-AUTOMAKE_VERSION = 1.11.5
+AUTOMAKE_VERSION = 1.11.6
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
+AUTOMAKE_LICENSE = GPLv2+
+AUTOMAKE_LICENSE_FILES = COPYING
 
 AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl
 

From 0be0899bfda5ca39b32b688ddf367e01e47c4099 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:51 +0000
Subject: [PATCH 2654/6849] mpc: bump to version 1.0.1 and license change

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpc/mpc-0.9-configure.patch | 69 -----------------------------
 package/mpc/mpc.mk                  |  8 ++--
 2 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 package/mpc/mpc-0.9-configure.patch

diff --git a/package/mpc/mpc-0.9-configure.patch b/package/mpc/mpc-0.9-configure.patch
deleted file mode 100644
index 21dd242eae..0000000000
--- a/package/mpc/mpc-0.9-configure.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-
-Issue http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html
-Upstream patch https://gforge.inria.fr/scm/viewvc.php/trunk/configure.ac?root=mpc&r1=932&r2=936
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- trunk/configure.ac	2011/02/21 12:18:31	932
-+++ trunk/configure.ac	2011/02/21 16:41:09	936
-@@ -33,7 +33,7 @@
- AC_CANONICAL_HOST
- AC_CONFIG_MACRO_DIR([m4])
- 
--dnl Extra arguments to configure
-+# Extra arguments to configure
- AC_ARG_WITH([mpfr_include],
-             [AC_HELP_STRING([--with-mpfr-include=DIR],
-                             [MPFR include directory])],
-@@ -85,18 +85,19 @@
-              )
- 
- 
--dnl Setup CC and CFLAGS
-+# Setup CC and CFLAGS
-+AC_PROG_CC
-+AC_LANG(C)
- 
--dnl Check for user specification of CC or CFLAGS
-+# Set up LibTool
-+AC_PROG_LIBTOOL
-+
-+# Check for user specification of CC or CFLAGS
- if test -n "$CFLAGS" || test -n "$CC" ; then
-    user_redefine_cc=yes
- fi
- 
--# Check for programs
--AC_PROG_CC
--AC_LANG(C)
--
--dnl Check GMP Header
-+# Check GMP Header
- AC_MSG_CHECKING(for gmp.h)
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include "gmp.h"
-@@ -105,22 +106,19 @@
-  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
- ])
- 
--dnl Check for GMP CFLAGS in gmp.h
-+# Check for GMP CFLAGS in gmp.h
- if test -z "$user_redefine_cc" ; then
-    MPC_GMP_CC_CFLAGS
- fi
- 
- 
--dnl Configs for Windows DLLs
-+# Configs for Windows DLLs
- case $host in
-   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      MPC_WINDOWS
- esac
- 
- 
--dnl Finally set up LibTool
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 47bdbbb237..a366db76fd 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-MPC_VERSION = 0.9
-MPC_SITE = http://www.multiprecision.org/mpc/download
-MPC_LICENSE = LGPLv2.1+
-MPC_LICENSE_FILES = COPYING.LIB
+MPC_VERSION = 1.0.1
+MPC_SITE = $(BR2_GNU_MIRROR)/mpc
+MPC_LICENSE = LGPLv3+
+MPC_LICENSE_FILES = COPYING.LESSER
 MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
 MPC_AUTORECONF = YES

From b3578cb0e4b0b2bbad781a88bcb41c2ad0fb82a1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:52 +0000
Subject: [PATCH 2655/6849] gnutls: bump to 2.12.20

[Peter: License is GPLv3+ LGPLv2.1+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 1ec10b9a82..e88982121a 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 2.12.19
+GNUTLS_VERSION = 2.12.20
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
+GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
+GNUTLS_LICENSE_FILES = COPYING lib/COPYING
 GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
 GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
 		--without-p11-kit

From 676cec3591dd059ebb03bf7f8d92840930fd9329 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:53 +0000
Subject: [PATCH 2656/6849] grep: bump to version 2.14

[Peter: License is GPLv3+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/grep/grep.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 4ed5feaa8e..a02fe2c92b 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-GREP_VERSION = 2.13
+GREP_VERSION = 2.14
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
+GREP_LICENSE = GPLv3+
+GREP_LICENSE_FILES = COPYING
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 

From 826407fa55546057612ed9709eee735a1be37924 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:54 +0000
Subject: [PATCH 2657/6849] bison: bump to version 2.6.2

[Peter: License is GPLv3+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index d0c9077ed8..8c33a7a24e 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,11 +4,12 @@
 #
 #############################################################
 
-BISON_VERSION = 2.5.1
+BISON_VERSION = 2.6.2
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
-
-BISON_CONF_ENV += ac_cv_path_M4=/usr/bin/m4
-BISON_DEPENDENCIES += m4
+BISON_LICENSE = GPLv3+
+BISON_LICENSE_FILES = COPYING
+BISON_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
+BISON_DEPENDENCIES = m4
 
 define BISON_DISABLE_EXAMPLES
 	echo 'all install:' > $(@D)/examples/Makefile

From 513108126d16bf7d78db692ecc1b4fb3b8aefba8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Sep 2012 04:48:57 +0000
Subject: [PATCH 2658/6849] iproute2: bump to version 3.5.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index c671e44c94..90588a3b14 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 3.5.0
+IPROUTE2_VERSION = 3.5.1
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 IPROUTE2_LICENSE = GPLv2

From 652333d7ed5fc8639ccc79dd7d495bd5b1026096 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 03:52:52 +0000
Subject: [PATCH 2659/6849] openssh: bump to version 6.1p1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../openssh/openssh-drop-SUSv3-legacy.patch   | 236 ++++++++++++++----
 package/openssh/openssh.mk                    |   2 +-
 2 files changed, 185 insertions(+), 53 deletions(-)

diff --git a/package/openssh/openssh-drop-SUSv3-legacy.patch b/package/openssh/openssh-drop-SUSv3-legacy.patch
index 8299da19fd..3e798134e9 100644
--- a/package/openssh/openssh-drop-SUSv3-legacy.patch
+++ b/package/openssh/openssh-drop-SUSv3-legacy.patch
@@ -1,26 +1,36 @@
-Drop SUSv3 legacy fuctions
+From a66a3edccc336fe5942a50fd4347b452d3bdea1f Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 4 Sep 2012 09:42:03 -0300
+Subject: [PATCH] Drop SUSv3 legacy functions
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 ---
  auth2-jpake.c             |   24 ++++++++++++------------
+ authfd.c                  |    2 +-
+ authfile.c                |    6 +++---
+ bufaux.c                  |    2 +-
+ bufec.c                   |    4 ++--
+ canohost.c                |    2 +-
  channels.c                |    6 +++---
  clientloop.c              |    4 ++--
+ hostfile.c                |    2 +-
  jpake.c                   |    6 +++---
- monitor.c                 |   18 +++++++++---------
+ monitor.c                 |   20 ++++++++++----------
  openbsd-compat/port-tun.c |    4 ++--
+ sandbox-systrace.c        |    2 +-
  schnorr.c                 |    6 +++---
  session.c                 |    2 +-
  sftp-client.c             |    2 +-
  ssh-keygen.c              |    2 +-
  ssh.c                     |    8 ++++----
  sshconnect2.c             |   22 +++++++++++-----------
- 12 files changed, 52 insertions(+), 52 deletions(-)
+ 19 files changed, 63 insertions(+), 63 deletions(-)
 
 diff --git a/auth2-jpake.c b/auth2-jpake.c
-index 5de5506..b34d696 100644
+index a460e82..caa8c6f 100644
 --- a/auth2-jpake.c
 +++ b/auth2-jpake.c
-@@ -173,7 +173,7 @@ derive_rawsalt(const char *username, u_char *rawsalt, u_int len)
+@@ -178,7 +178,7 @@ derive_rawsalt(const char *username, u_char *rawsalt, u_int len)
  		fatal("%s: not enough bytes for rawsalt (want %u have %u)",
  		    __func__, len, digest_len);
  	memcpy(rawsalt, digest, len);
@@ -29,7 +39,7 @@ index 5de5506..b34d696 100644
  	xfree(digest);
  }
  
-@@ -198,10 +198,10 @@ makesalt(u_int want, const char *user)
+@@ -203,10 +203,10 @@ makesalt(u_int want, const char *user)
  		fatal("%s: want %u", __func__, want);
  
  	derive_rawsalt(user, rawsalt, sizeof(rawsalt));
@@ -42,7 +52,7 @@ index 5de5506..b34d696 100644
  
  	return ret;
  }
-@@ -355,7 +355,7 @@ auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s,
+@@ -360,7 +360,7 @@ auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s,
  	debug3("%s: scheme = %s", __func__, *hash_scheme);
  	JPAKE_DEBUG_BN((*s, "%s: s = ", __func__));
  #endif
@@ -51,7 +61,7 @@ index 5de5506..b34d696 100644
  	xfree(secret);
  }
  
-@@ -396,12 +396,12 @@ auth2_jpake_start(Authctxt *authctxt)
+@@ -401,12 +401,12 @@ auth2_jpake_start(Authctxt *authctxt)
  	packet_send();
  	packet_write_wait();
  
@@ -68,7 +78,7 @@ index 5de5506..b34d696 100644
  	xfree(x3_proof);
  	xfree(x4_proof);
  
-@@ -448,8 +448,8 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
+@@ -453,8 +453,8 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
  	    &pctx->b,
  	    &x4_s_proof, &x4_s_proof_len));
  
@@ -79,7 +89,7 @@ index 5de5506..b34d696 100644
  	xfree(x1_proof);
  	xfree(x2_proof);
  
-@@ -463,7 +463,7 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
+@@ -468,7 +468,7 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
  	packet_send();
  	packet_write_wait();
  
@@ -88,7 +98,7 @@ index 5de5506..b34d696 100644
  	xfree(x4_s_proof);
  
  	/* Expect step 2 packet from peer */
-@@ -504,7 +504,7 @@ input_userauth_jpake_client_step2(int type, u_int32_t seq, void *ctxt)
+@@ -509,7 +509,7 @@ input_userauth_jpake_client_step2(int type, u_int32_t seq, void *ctxt)
  	    &pctx->k,
  	    &pctx->h_k_sid_sessid, &pctx->h_k_sid_sessid_len));
  
@@ -97,11 +107,97 @@ index 5de5506..b34d696 100644
  	xfree(x2_s_proof);
  
  	if (!use_privsep)
+diff --git a/authfd.c b/authfd.c
+index f037e83..0e51468 100644
+--- a/authfd.c
++++ b/authfd.c
+@@ -102,7 +102,7 @@ ssh_get_authentication_socket(void)
+ 	if (!authsocket)
+ 		return -1;
+ 
+-	bzero(&sunaddr, sizeof(sunaddr));
++	memset(&sunaddr, 0, sizeof(sunaddr));
+ 	sunaddr.sun_family = AF_UNIX;
+ 	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
+ 
+diff --git a/authfile.c b/authfile.c
+index 7dd4496..068f75e 100644
+--- a/authfile.c
++++ b/authfile.c
+@@ -349,17 +349,17 @@ key_load_file(int fd, const char *filename, Buffer *blob)
+ 			    __func__, filename == NULL ? "" : filename,
+ 			    filename == NULL ? "" : " ", strerror(errno));
+ 			buffer_clear(blob);
+-			bzero(buf, sizeof(buf));
++			memset(buf, 0, sizeof(buf));
+ 			return 0;
+ 		}
+ 		buffer_append(blob, buf, len);
+ 		if (buffer_len(blob) > MAX_KEY_FILE_SIZE) {
+ 			buffer_clear(blob);
+-			bzero(buf, sizeof(buf));
++			memset(buf, 0, sizeof(buf));
+ 			goto toobig;
+ 		}
+ 	}
+-	bzero(buf, sizeof(buf));
++	memset(buf, 0, sizeof(buf));
+ 	if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
+ 	    st.st_size != buffer_len(blob)) {
+ 		debug("%s: key file %.200s%schanged size while reading",
+diff --git a/bufaux.c b/bufaux.c
+index 00208ca..d82351d 100644
+--- a/bufaux.c
++++ b/bufaux.c
+@@ -215,7 +215,7 @@ buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr)
+ 		if (cp == ret + length - 1)
+ 			error("buffer_get_cstring_ret: string contains \\0");
+ 		else {
+-			bzero(ret, length);
++			memset(ret, 0, length);
+ 			xfree(ret);
+ 			return NULL;
+ 		}
+diff --git a/bufec.c b/bufec.c
+index 3dcb494..36c14e9 100644
+--- a/bufec.c
++++ b/bufec.c
+@@ -77,7 +77,7 @@ buffer_put_ecpoint_ret(Buffer *buffer, const EC_GROUP *curve,
+ 	ret = 0;
+  out:
+ 	if (buf != NULL) {
+-		bzero(buf, len);
++		memset(buf, 0, len);
+ 		xfree(buf);
+ 	}
+ 	BN_CTX_free(bnctx);
+@@ -130,7 +130,7 @@ buffer_get_ecpoint_ret(Buffer *buffer, const EC_GROUP *curve,
+ 	ret = 0;
+  out:
+ 	BN_CTX_free(bnctx);
+-	bzero(buf, len);
++	memset(buf, 0, len);
+ 	xfree(buf);
+ 	return ret;
+ }
+diff --git a/canohost.c b/canohost.c
+index dabd8a3..a302727 100644
+--- a/canohost.c
++++ b/canohost.c
+@@ -199,7 +199,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
+ 	memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr));
+ 	port = a6->sin6_port;
+ 
+-	bzero(a4, sizeof(*a4));
++	memset(a4, 0, sizeof(*a4));
+ 
+ 	a4->sin_family = AF_INET;
+ 	*len = sizeof(*a4);
 diff --git a/channels.c b/channels.c
-index 1cd5004..89dcfc6 100644
+index 7791feb..2e6dddf 100644
 --- a/channels.c
 +++ b/channels.c
-@@ -418,7 +418,7 @@ channel_free(Channel *c)
+@@ -425,7 +425,7 @@ channel_free(Channel *c)
  		if (cc->abandon_cb != NULL)
  			cc->abandon_cb(c, cc->ctx);
  		TAILQ_REMOVE(&c->status_confirms, cc, entry);
@@ -110,7 +206,7 @@ index 1cd5004..89dcfc6 100644
  		xfree(cc);
  	}
  	if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
-@@ -2625,7 +2625,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
+@@ -2667,7 +2667,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
  		return;
  	cc->cb(type, c, cc->ctx);
  	TAILQ_REMOVE(&c->status_confirms, cc, entry);
@@ -119,7 +215,7 @@ index 1cd5004..89dcfc6 100644
  	xfree(cc);
  }
  
-@@ -3128,7 +3128,7 @@ channel_connect_ctx_free(struct channel_connect *cctx)
+@@ -3296,7 +3296,7 @@ channel_connect_ctx_free(struct channel_connect *cctx)
  	xfree(cctx->host);
  	if (cctx->aitop)
  		freeaddrinfo(cctx->aitop);
@@ -129,10 +225,10 @@ index 1cd5004..89dcfc6 100644
  	cctx->ai = cctx->aitop = NULL;
  }
 diff --git a/clientloop.c b/clientloop.c
-index de79793..2d08690 100644
+index 1c1a770..fd226e6 100644
 --- a/clientloop.c
 +++ b/clientloop.c
-@@ -533,7 +533,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
+@@ -551,7 +551,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
  		gc->cb(type, seq, gc->ctx);
  	if (--gc->ref_count <= 0) {
  		TAILQ_REMOVE(&global_confirms, gc, entry);
@@ -141,20 +237,33 @@ index de79793..2d08690 100644
  		xfree(gc);
  	}
  
-@@ -823,7 +823,7 @@ process_cmdline(void)
- 	int cancel_port;
+@@ -867,7 +867,7 @@ process_cmdline(void)
+ 	int cancel_port, ok;
  	Forward fwd;
  
 -	bzero(&fwd, sizeof(fwd));
 +	memset(&fwd, 0, sizeof(fwd));
  	fwd.listen_host = fwd.connect_host = NULL;
  
- 	leave_raw_mode(force_tty_flag);
+ 	leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
+diff --git a/hostfile.c b/hostfile.c
+index b6f924b..e25820d 100644
+--- a/hostfile.c
++++ b/hostfile.c
+@@ -330,7 +330,7 @@ free_hostkeys(struct hostkeys *hostkeys)
+ 		xfree(hostkeys->entries[i].host);
+ 		xfree(hostkeys->entries[i].file);
+ 		key_free(hostkeys->entries[i].key);
+-		bzero(hostkeys->entries + i, sizeof(*hostkeys->entries));
++		memset(hostkeys->entries + i, 0, sizeof(*hostkeys->entries));
+ 	}
+ 	if (hostkeys->entries != NULL)
+ 		xfree(hostkeys->entries);
 diff --git a/jpake.c b/jpake.c
-index cdf65f5..73ba954 100644
+index b010daf..147ffe7 100644
 --- a/jpake.c
 +++ b/jpake.c
-@@ -104,7 +104,7 @@ jpake_free(struct jpake_ctx *pctx)
+@@ -105,7 +105,7 @@ jpake_free(struct jpake_ctx *pctx)
  #define JPAKE_BUF_CLEAR_FREE(v, l)		\
  	do {					\
  		if ((v) != NULL) {		\
@@ -163,16 +272,16 @@ index cdf65f5..73ba954 100644
  			xfree(v);		\
  			(v) = NULL;		\
  			(l) = 0;		\
-@@ -132,7 +132,7 @@ jpake_free(struct jpake_ctx *pctx)
+@@ -133,7 +133,7 @@ jpake_free(struct jpake_ctx *pctx)
  #undef JPAKE_BN_CLEAR_FREE
  #undef JPAKE_BUF_CLEAR_FREE
  
--	bzero(pctx, sizeof(pctx));
+-	bzero(pctx, sizeof(*pctx));
 +	memset(pctx, 0, sizeof(pctx));
  	xfree(pctx);
  }
  
-@@ -437,7 +437,7 @@ jpake_check_confirm(const BIGNUM *k,
+@@ -444,7 +444,7 @@ jpake_check_confirm(const BIGNUM *k,
  	else if (timingsafe_bcmp(peer_confirm_hash, expected_confirm_hash,
  	    expected_confirm_hash_len) == 0)
  		success = 1;
@@ -182,10 +291,19 @@ index cdf65f5..73ba954 100644
  	debug3("%s: success = %d", __func__, success);
  	return success;
 diff --git a/monitor.c b/monitor.c
-index 9eb4e35..0e85b7a 100644
+index e9802a3..97a50f6 100644
 --- a/monitor.c
 +++ b/monitor.c
-@@ -2028,8 +2028,8 @@ mm_answer_jpake_step1(int sock, Buffer *m)
+@@ -547,7 +547,7 @@ monitor_read(struct monitor *pmonitor, struct mon_table *ent,
+ 	struct pollfd pfd[2];
+ 
+ 	for (;;) {
+-		bzero(&pfd, sizeof(pfd));
++		memset(&pfd, 0, sizeof(pfd));
+ 		pfd[0].fd = pmonitor->m_sendfd;
+ 		pfd[0].events = POLLIN;
+ 		pfd[1].fd = pmonitor->m_log_recvfd;
+@@ -2137,8 +2137,8 @@ mm_answer_jpake_step1(int sock, Buffer *m)
  	debug3("%s: sending step1", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m);
  
@@ -196,7 +314,7 @@ index 9eb4e35..0e85b7a 100644
  	xfree(x3_proof);
  	xfree(x4_proof);
  
-@@ -2058,8 +2058,8 @@ mm_answer_jpake_get_pwdata(int sock, Buffer *m)
+@@ -2167,8 +2167,8 @@ mm_answer_jpake_get_pwdata(int sock, Buffer *m)
  	debug3("%s: sending pwdata", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m);
  
@@ -207,7 +325,7 @@ index 9eb4e35..0e85b7a 100644
  	xfree(hash_scheme);
  	xfree(salt);
  
-@@ -2098,8 +2098,8 @@ mm_answer_jpake_step2(int sock, Buffer *m)
+@@ -2207,8 +2207,8 @@ mm_answer_jpake_step2(int sock, Buffer *m)
  
  	JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__));
  
@@ -218,7 +336,7 @@ index 9eb4e35..0e85b7a 100644
  	xfree(x1_proof);
  	xfree(x2_proof);
  
-@@ -2111,7 +2111,7 @@ mm_answer_jpake_step2(int sock, Buffer *m)
+@@ -2220,7 +2220,7 @@ mm_answer_jpake_step2(int sock, Buffer *m)
  	debug3("%s: sending step2", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m);
  
@@ -227,7 +345,7 @@ index 9eb4e35..0e85b7a 100644
  	xfree(x4_s_proof);
  
  	monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);
-@@ -2145,7 +2145,7 @@ mm_answer_jpake_key_confirm(int sock, Buffer *m)
+@@ -2254,7 +2254,7 @@ mm_answer_jpake_key_confirm(int sock, Buffer *m)
  
  	JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__));
  
@@ -236,7 +354,7 @@ index 9eb4e35..0e85b7a 100644
  	buffer_clear(m);
  
  	/* pctx->k is sensitive, not sent */
-@@ -2179,7 +2179,7 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
+@@ -2288,7 +2288,7 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
  
  	JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__));
  
@@ -267,8 +385,21 @@ index 0d756f7..98332ae 100644
  	len += sizeof(u_int32_t);
  	af = (u_int32_t *)ptr;
  
+diff --git a/sandbox-systrace.c b/sandbox-systrace.c
+index 2d16a62..fcd657a 100644
+--- a/sandbox-systrace.c
++++ b/sandbox-systrace.c
+@@ -140,7 +140,7 @@ ssh_sandbox_parent(struct ssh_sandbox *box, pid_t child_pid,
+ 		    box->systrace_fd, child_pid, strerror(errno));
+ 
+ 	/* Allocate and assign policy */
+-	bzero(&policy, sizeof(policy));
++	memset(&policy, 0, sizeof(policy));
+ 	policy.strp_op = SYSTR_POLICY_NEW;
+ 	policy.strp_maxents = SYS_MAXSYSCALL;
+ 	if (ioctl(box->systrace_fd, STRIOCPOLICY, &policy) == -1)
 diff --git a/schnorr.c b/schnorr.c
-index c17ff32..ec4e41b 100644
+index 4d54d68..e626400 100644
 --- a/schnorr.c
 +++ b/schnorr.c
 @@ -101,7 +101,7 @@ schnorr_hash(const BIGNUM *p, const BIGNUM *q, const BIGNUM *g,
@@ -280,7 +411,7 @@ index c17ff32..ec4e41b 100644
  	xfree(digest);
  	digest_len = 0;
  	if (success == 0)
-@@ -451,7 +451,7 @@ hash_buffer(const u_char *buf, u_int len, const EVP_MD *md,
+@@ -477,7 +477,7 @@ hash_buffer(const u_char *buf, u_int len, const EVP_MD *md,
  	success = 0;
   out:
  	EVP_MD_CTX_cleanup(&evp_md_ctx);
@@ -289,7 +420,7 @@ index c17ff32..ec4e41b 100644
  	digest_len = 0;
  	return success;
  }
-@@ -544,7 +544,7 @@ modp_group_free(struct modp_group *grp)
+@@ -570,7 +570,7 @@ modp_group_free(struct modp_group *grp)
  		BN_clear_free(grp->p);
  	if (grp->q != NULL)
  		BN_clear_free(grp->q);
@@ -299,10 +430,10 @@ index c17ff32..ec4e41b 100644
  }
  
 diff --git a/session.c b/session.c
-index 71e4fbe..70c51f2 100644
+index 65bf287..440c68e 100644
 --- a/session.c
 +++ b/session.c
-@@ -1895,7 +1895,7 @@ session_unused(int id)
+@@ -1840,7 +1840,7 @@ session_unused(int id)
  		fatal("%s: insane session id %d (max %d nalloc %d)",
  		    __func__, id, options.max_sessions, sessions_nalloc);
  	}
@@ -312,10 +443,10 @@ index 71e4fbe..70c51f2 100644
  	sessions[id].used = 0;
  	sessions[id].chanid = -1;
 diff --git a/sftp-client.c b/sftp-client.c
-index 9dab477..0815b41 100644
+index 85f2bd4..09ec360 100644
 --- a/sftp-client.c
 +++ b/sftp-client.c
-@@ -289,7 +289,7 @@ get_decode_statvfs(int fd, struct sftp_statvfs *st, u_int expected_id,
+@@ -308,7 +308,7 @@ get_decode_statvfs(struct sftp_conn *conn, struct sftp_statvfs *st,
  		    SSH2_FXP_EXTENDED_REPLY, type);
  	}
  
@@ -325,10 +456,10 @@ index 9dab477..0815b41 100644
  	st->f_frsize = buffer_get_int64(&msg);
  	st->f_blocks = buffer_get_int64(&msg);
 diff --git a/ssh-keygen.c b/ssh-keygen.c
-index d90b1df..d78837a 100644
+index a223ddc..dd7f430 100644
 --- a/ssh-keygen.c
 +++ b/ssh-keygen.c
-@@ -1503,7 +1503,7 @@ parse_absolute_time(const char *s)
+@@ -1660,7 +1660,7 @@ parse_absolute_time(const char *s)
  		fatal("Invalid certificate time format %s", s);
  	}
  
@@ -338,10 +469,10 @@ index d90b1df..d78837a 100644
  		fatal("Invalid certificate time %s", s);
  	if ((tt = mktime(&tm)) < 0)
 diff --git a/ssh.c b/ssh.c
-index 4419f76..52a8b5e 100644
+index 3f61eb0..4a3d2fc 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -1436,8 +1436,8 @@ load_public_identity_files(void)
+@@ -1509,8 +1509,8 @@ load_public_identity_files(void)
  #endif /* PKCS11 */
  
  	n_ids = 0;
@@ -352,7 +483,7 @@ index 4419f76..52a8b5e 100644
  
  #ifdef ENABLE_PKCS11
  	if (options.pkcs11_provider != NULL &&
-@@ -1511,8 +1511,8 @@ load_public_identity_files(void)
+@@ -1584,9 +1584,9 @@ load_public_identity_files(void)
  	memcpy(options.identity_files, identity_files, sizeof(identity_files));
  	memcpy(options.identity_keys, identity_keys, sizeof(identity_keys));
  
@@ -363,11 +494,12 @@ index 4419f76..52a8b5e 100644
 +	memset(pwdir, 0, strlen(pwdir));
  	xfree(pwdir);
  }
+ 
 diff --git a/sshconnect2.c b/sshconnect2.c
-index 4c379ae..b5502c2 100644
+index 7c369d7..bc362e6 100644
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
-@@ -948,14 +948,14 @@ jpake_password_to_secret(Authctxt *authctxt, const char *crypt_scheme,
+@@ -1010,14 +1010,14 @@ jpake_password_to_secret(Authctxt *authctxt, const char *crypt_scheme,
  	    &secret, &secret_len) != 0)
  		fatal("%s: hash_buffer", __func__);
  
@@ -385,7 +517,7 @@ index 4c379ae..b5502c2 100644
  	xfree(secret);
  
  	return ret;
-@@ -992,8 +992,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+@@ -1054,8 +1054,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
  
  	/* Obtain password and derive secret */
  	pctx->s = jpake_password_to_secret(authctxt, crypt_scheme, salt);
@@ -396,7 +528,7 @@ index 4c379ae..b5502c2 100644
  	xfree(crypt_scheme);
  	xfree(salt);
  	JPAKE_DEBUG_BN((pctx->s, "%s: s = ", __func__));
-@@ -1008,8 +1008,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+@@ -1070,8 +1070,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
  	    &pctx->a,
  	    &x2_s_proof, &x2_s_proof_len);
  
@@ -407,7 +539,7 @@ index 4c379ae..b5502c2 100644
  	xfree(x3_proof);
  	xfree(x4_proof);
  
-@@ -1021,7 +1021,7 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+@@ -1083,7 +1083,7 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
  	packet_put_string(x2_s_proof, x2_s_proof_len);
  	packet_send();
  
@@ -416,7 +548,7 @@ index 4c379ae..b5502c2 100644
  	xfree(x2_s_proof);
  
  	/* Expect step 2 packet from peer */
-@@ -1061,7 +1061,7 @@ input_userauth_jpake_server_step2(int type, u_int32_t seq, void *ctxt)
+@@ -1123,7 +1123,7 @@ input_userauth_jpake_server_step2(int type, u_int32_t seq, void *ctxt)
  	    &pctx->k,
  	    &pctx->h_k_cid_sessid, &pctx->h_k_cid_sessid_len);
  
@@ -425,7 +557,7 @@ index 4c379ae..b5502c2 100644
  	xfree(x4_s_proof);
  
  	JPAKE_DEBUG_CTX((pctx, "confirm sending in %s", __func__));
-@@ -1725,8 +1725,8 @@ userauth_jpake(Authctxt *authctxt)
+@@ -1787,8 +1787,8 @@ userauth_jpake(Authctxt *authctxt)
  	packet_put_string(x2_proof, x2_proof_len);
  	packet_send();
  
@@ -437,5 +569,5 @@ index 4c379ae..b5502c2 100644
  	xfree(x2_proof);
  
 -- 
-1.7.2.2
+1.7.8.6
 
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 0878fce4b6..81a28a1993 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSH_VERSION = 6.0p1
+OPENSSH_VERSION = 6.1p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \

From b9e89b340e27daff98faa430082cbe1a871dfb6f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 9 Sep 2012 23:46:23 +0200
Subject: [PATCH 2660/6849] sudo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...mmit-8209:0c4e3f68b2f5-from-upstream.patch | 263 ------------------
 package/sudo/sudo.mk                          |  11 +-
 2 files changed, 10 insertions(+), 264 deletions(-)
 delete mode 100644 package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch

diff --git a/package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch b/package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
deleted file mode 100644
index 69512b037c..0000000000
--- a/package/sudo/sudo-1.8.5p2-backport-commit-8209:0c4e3f68b2f5-from-upstream.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-The installation of the sudoers plugin fails when cross compiling, because it
-tries to run the cross-compiled visudo, rather than that of the host.
-
-The visudo invocation is only required in order to sanity check any existing
-sudoers file in the target directory; this can safely be dispensed with.
-
-This is a backport of commit 8209:0c4e3f68b2f5 from upstream.
-
-N.B. The upstream fix will appear in sudo 1.8.6; when the Buildroot package
-is bumped to version 1.8.6 (or higher), then this patch will no longer be
-required.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-diff -Nurp a/common/Makefile.in b/common/Makefile.in
---- a/common/Makefile.in	2012-05-15 17:22:01.000000000 +0100
-+++ b/common/Makefile.in	2012-06-21 08:55:57.345169676 +0100
-@@ -24,6 +24,7 @@ devdir = @devdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
-+cross_compiling = @CROSS_COMPILING@
- 
- # Where to install things...
- prefix = @prefix@
-diff -Nurp a/compat/Makefile.in b/compat/Makefile.in
---- a/compat/Makefile.in	2012-05-15 17:22:01.000000000 +0100
-+++ b/compat/Makefile.in	2012-06-21 08:57:09.097166477 +0100
-@@ -24,6 +24,7 @@ devdir = @devdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
-+cross_compiling = @CROSS_COMPILING@
- 
- # Where to install things...
- prefix = @prefix@
-@@ -111,19 +112,21 @@ install-plugin:
- uninstall:
- 
- check: $(TEST_PROGS)
--	@if [ -f fnm_test ]; then \
--	    ./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in; \
--	fi
--	@if [ -f globtest ]; then \
--	    mkdir -p `sed 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \
--	    touch `cat $(srcdir)/regress/glob/files`; \
--	    chmod 0755 `grep '/r[^/]*$$' $(srcdir)/regress/glob/files`; \
--	    chmod 0444 `grep '/s[^/]*$$' $(srcdir)/regress/glob/files`; \
--	    chmod 0711 `grep '/t[^/]*$$' $(srcdir)/regress/glob/files`; \
--	    ./globtest $(srcdir)/regress/glob/globtest.in; \
--	    rval=$$?; \
--	    rm -rf fake; \
--	    exit $$rval; \
-+	@if test X"$(cross_compiling)" != X"yes"; then \
-+	    if test -f fnm_test; then \
-+		./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in; \
-+	    fi; \
-+	    if test -f globtest; then \
-+		mkdir -p `sed 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \
-+		touch `cat $(srcdir)/regress/glob/files`; \
-+		chmod 0755 `grep '/r[^/]*$$' $(srcdir)/regress/glob/files`; \
-+		chmod 0444 `grep '/s[^/]*$$' $(srcdir)/regress/glob/files`; \
-+		chmod 0711 `grep '/t[^/]*$$' $(srcdir)/regress/glob/files`; \
-+		./globtest $(srcdir)/regress/glob/globtest.in; \
-+		rval=$$?; \
-+		rm -rf fake; \
-+		exit $$rval; \
-+	    fi; \
- 	fi
- 
- clean:
-diff -Nurp a/configure b/configure
---- a/configure	2012-05-17 20:53:53.000000000 +0100
-+++ b/configure	2012-06-21 08:58:08.769163817 +0100
-@@ -691,6 +691,7 @@ password_timeout
- timeout
- timedir
- iolog_dir
-+CROSS_COMPILING
- COMPAT_TEST_PROGS
- SUDO_NLS
- LIBINTL
-@@ -2874,6 +2875,7 @@ $as_echo "$as_me: Configuring Sudo versi
- 
- 
- 
-+
- #
- # Begin initial values for man page substitution
- #
-@@ -20094,6 +20096,8 @@ if test -n "$GCC"; then
-     fi
- fi
- 
-+CROSS_COMPILING="$cross_compiling"
-+
- test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
- 
- if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
-diff -Nurp a/configure.in b/configure.in
---- a/configure.in	2012-05-17 20:53:54.000000000 +0100
-+++ b/configure.in	2012-06-21 08:58:51.017161934 +0100
-@@ -67,6 +67,7 @@ AC_SUBST([LT_STATIC])
- AC_SUBST([LIBINTL])
- AC_SUBST([SUDO_NLS])
- AC_SUBST([COMPAT_TEST_PROGS])
-+AC_SUBST([CROSS_COMPILING])
- dnl
- dnl Variables that get substituted in docs (not overridden by environment)
- dnl
-@@ -3198,6 +3199,11 @@ if test -n "$GCC"; then
- fi
- 
- dnl
-+dnl Skip regress tests and sudoers sanity check if cross compiling.
-+dnl
-+CROSS_COMPILING="$cross_compiling"
-+
-+dnl
- dnl Set exec_prefix
- dnl
- test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
-diff -Nurp a/doc/Makefile.in b/doc/Makefile.in
---- a/doc/Makefile.in	2012-03-12 18:02:07.000000000 +0000
-+++ b/doc/Makefile.in	2012-06-21 08:59:06.537161242 +0100
-@@ -23,6 +23,7 @@ srcdir = @srcdir@
- docdir = @docdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-+cross_compiling = @CROSS_COMPILING@
- 
- # Tools to use
- NROFF = @NROFFPROG@
-diff -Nurp a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
---- a/plugins/sample/Makefile.in	2012-03-12 18:02:09.000000000 +0000
-+++ b/plugins/sample/Makefile.in	2012-06-21 08:59:24.397160445 +0100
-@@ -24,6 +24,7 @@ devdir = @devdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
-+cross_compiling = @CROSS_COMPILING@
- 
- # Compiler & tools to use
- CC = @CC@
-diff -Nurp a/plugins/sample_group/Makefile.in b/plugins/sample_group/Makefile.in
---- a/plugins/sample_group/Makefile.in	2012-05-15 17:22:02.000000000 +0100
-+++ b/plugins/sample_group/Makefile.in	2012-06-21 08:59:38.641159810 +0100
-@@ -24,6 +24,7 @@ devdir = @devdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
-+cross_compiling = @CROSS_COMPILING@
- 
- # Compiler & tools to use
- CC = @CC@
-diff -Nurp a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
---- a/plugins/sudoers/Makefile.in	2012-05-15 17:22:02.000000000 +0100
-+++ b/plugins/sudoers/Makefile.in	2012-06-21 09:32:26.165072089 +0100
-@@ -32,6 +32,7 @@ top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
- docdir = @docdir@
- timedir = @timedir@
-+cross_compiling = @CROSS_COMPILING@
- 
- # Compiler & tools to use
- CC = @CC@
-@@ -237,7 +238,7 @@ sudoers: $(srcdir)/sudoers.in
- 	(cd $(top_builddir) && $(SHELL) config.status --file=plugins/sudoers/$@)
- 
- pre-install:
--	@if test -r $(DESTDIR)$(sudoersdir)/sudoers; then \
-+	@if test X"$(cross_compiling)" != X"yes" -a -r $(DESTDIR)$(sudoersdir)/sudoers; then \
- 	    echo "Checking existing sudoers file for syntax errors."; \
- 	    ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
- 	fi
-@@ -280,17 +281,23 @@ uninstall:
- 	    rm -f $(DESTDIR)$(sudoersdir)/sudoers
- 
- check: $(TEST_PROGS) visudo testsudoers
--	@-rval=0; \
--	./check_addr $(srcdir)/regress/parser/check_addr.in; \
-+	@-if test X"$(cross_compiling)" != X"yes"; then \
-+	    rval=0; \
-+	    PWD=`pwd`; \
-+	    ./check_addr $(srcdir)/regress/parser/check_addr.in; \
- 	rval=`expr $$rval + $$?`; \
--	./check_fill; \
--	rval=`expr $$rval + $$?`; \
--	./check_iolog_path $(srcdir)/regress/iolog_path/data; \
--	rval=`expr $$rval + $$?`; \
--	./check_wrap $(srcdir)/regress/logging/check_wrap.in > check_wrap.out; \
--	diff check_wrap.out $(srcdir)/regress/logging/check_wrap.out.ok; \
--	rval=`expr $$rval + $$?`; \
--	passed=0; failed=0; total=0; \
-+	    ./check_fill; \
-+	    rval=`expr $$rval + $$?`; \
-+	    ./check_iolog_path $(srcdir)/regress/iolog_path/data; \
-+	    rval=`expr $$rval + $$?`; \
-+	    if [ X"$(soext)" != X"" ]; then \
-+		./check_symbols .libs/sudoers$(soext) $(shlib_exp); \
-+		rval=`expr $$rval + $$?`; \
-+	    fi; \
-+	    ./check_wrap $(srcdir)/regress/logging/check_wrap.in > check_wrap.out; \
-+	    diff check_wrap.out $(srcdir)/regress/logging/check_wrap.out.ok; \
-+	    rval=`expr $$rval + $$?`; \
-+	    passed=0; failed=0; total=0; \
- 	    for t in $(srcdir)/regress/sudoers/*.in; do \
- 		dir=`dirname $$t`; \
- 		dirbase=`basename $$dir`; \
-@@ -318,8 +325,8 @@ check: $(TEST_PROGS) visudo testsudoers
- 		total=`expr $$total + 1`; \
- 	    done; \
- 	    echo "$$dirbase: $$passed/$$total tests passed; $$failed/$$total tests failed"; \
--	rval=`expr $$rval + $$failed`; \
--	passed=0; failed=0; total=0; \
-+	    rval=`expr $$rval + $$failed`; \
-+	    passed=0; failed=0; total=0; \
- 	    for t in $(srcdir)/regress/*/*.sh; do \
- 		dir=`dirname $$t`; \
- 		dirbase=`basename $$dir`; \
-@@ -351,7 +358,9 @@ check: $(TEST_PROGS) visudo testsudoers
- 		fi; \
- 	    done; \
- 	    echo "$$dirbase: $$passed/$$total tests passed; $$failed/$$total tests failed"; \
--	    rval=`expr $$rval + $$failed`; exit $$rval
-+	    rval=`expr $$rval + $$failed`; \
-+	    exit $$rval; \
-+	fi
- 
- clean:
- 	-$(LIBTOOL) --mode=clean rm -f $(PROGS) $(TEST_PROGS) *.lo *.o *.la *.a stamp-* core *.core core.* *.out *.toke *.err
-diff -Nurp a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in
---- a/plugins/system_group/Makefile.in	2012-05-15 17:22:03.000000000 +0100
-+++ b/plugins/system_group/Makefile.in	2012-06-21 09:32:38.361071545 +0100
-@@ -24,6 +24,7 @@ devdir = @devdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
-+cross_compiling = @CROSS_COMPILING@
- 
- # Compiler & tools to use
- CC = @CC@
-diff -Nurp a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in	2012-05-08 21:56:43.000000000 +0100
-+++ b/src/Makefile.in	2012-06-21 09:32:53.233070882 +0100
-@@ -24,6 +24,7 @@ devdir = @devdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- incdir = $(top_srcdir)/include
-+cross_compiling = @CROSS_COMPILING@
- 
- # Compiler & tools to use
- CC = @CC@
-diff -Nurp a/zlib/Makefile.in b/zlib/Makefile.in
---- a/zlib/Makefile.in	2012-03-12 18:02:17.000000000 +0000
-+++ b/zlib/Makefile.in	2012-06-21 09:33:03.417070428 +0100
-@@ -22,6 +22,7 @@
- srcdir = @srcdir@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-+cross_compiling = @CROSS_COMPILING@
- 
- # Compiler & tools to use
- CC = @CC@
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 3e548ef41a..71dacecb7b 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.5p2
+SUDO_VERSION = 1.8.6
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
+SUDO_LICENSE = ICS BSD-3c
+SUDO_LICENSE_FILES = doc/LICENSE
 SUDO_CONF_OPT = \
 		--without-lecture \
 		--without-sendmail \
@@ -14,6 +16,13 @@ SUDO_CONF_OPT = \
 		--without-interfaces \
 		--without-pam
 
+# mksigname/mksiglist needs to run on build host to generate source files
+define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/compat mksigname mksiglist
+endef
+
+SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
+
 define SUDO_PERMISSIONS
 /usr/bin/sudo			 f 4755	0 0 - - - - -
 endef

From 48a68499d17a730fdf83934f5e9032eb373c596d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 23 Aug 2012 23:39:54 +0000
Subject: [PATCH 2661/6849] schifra: new package

[Peter: minor fixes/cleanups]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/schifra/Config.in  | 18 +++++++++++++
 package/schifra/schifra.mk | 55 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 package/schifra/Config.in
 create mode 100644 package/schifra/schifra.mk

diff --git a/package/Config.in b/package/Config.in
index 7fd26a51b7..441159d385 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -473,6 +473,7 @@ source "package/mtdev2tuio/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
 source "package/protobuf/Config.in"
+source "package/schifra/Config.in"
 source "package/startup-notification/Config.in"
 endmenu
 
diff --git a/package/schifra/Config.in b/package/schifra/Config.in
new file mode 100644
index 0000000000..466ac0e9ec
--- /dev/null
+++ b/package/schifra/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_SCHIFRA
+	bool "schifra"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Schifra is a very robust, highly optimized and extremely configurable
+	  Reed-Solomon error correcting code library for both software and IP
+	  core based applications with implementations in C++ and VHDL.
+
+	  http://www.schifra.com/
+
+config BR2_PACKAGE_SCHIFRA_EXAMPLES
+	bool "schifra examples"
+	depends on BR2_PACKAGE_SCHIFRA
+	help
+	  Build and install the schifra example applications.
+
+comment "schifra requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
new file mode 100644
index 0000000000..0285b628a7
--- /dev/null
+++ b/package/schifra/schifra.mk
@@ -0,0 +1,55 @@
+#############################################################
+#
+# schifra
+#
+#############################################################
+SCHIFRA_VERSION = 0.0.1
+SCHIFRA_SITE = http://www.schifra.com/downloads
+SCHIFRA_SOURCE = schifra.tgz
+SCHIFRA_INSTALL_STAGING = YES
+SCHIFRA_LICENSE = schifra license
+SCHIFRA_LICENSE_FILES = schifra_license.txt
+
+SCHIFRA_MAKE_OPT = COMPILER="$(TARGET_CXX)" \
+		   OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o"
+
+# The examples are the only buildable artefacts.
+ifeq ($(BR2_PACKAGE_SCHIFRA_EXAMPLES),y)
+define SCHIFRA_BUILD_CMDS
+	$(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPT) all
+endef
+
+define SCHIFRA_INSTALL_EXAMPLES
+	cd $(@D) && for i in `find -type f -name 'schifra_*' -executable` ; \
+	do \
+		$(INSTALL) -m 0755 -D $$i (TARGET_DIR)/usr/bin/$$i; \
+	done
+endef
+
+SCHIFRA_POST_TARGET_INSTALL_HOOKS += SCHIFRA_INSTALL_EXAMPLES
+endif
+
+define SCHIFRA_INSTALL_TARGET_CMDS
+	cd $(@D) && for i in schifra_*.hpp; do \
+		$(INSTALL) -m 0644 -D $$i $(TARGET_DIR)/usr/include/$$i; done
+endef
+
+define SCHIFRA_INSTALL_STAGING_CMDS
+	cd $(@D) && for i in schifra_*.hpp; do \
+		$(INSTALL) -m 0644 -D $$i $(STAGING_DIR)/usr/include/$$i; done
+endef
+
+define SCHIFRA_UNINSTALL_TARGET_CMDS
+	$(RM) $(TARGET_DIR)/usr/include/schifra_*.hpp
+	$(RM) $(TARGET_DIR)/usr/bin/schifra_*
+endef
+
+define SCHIFRA_UNINSTALL_STAGING_CMDS
+	$(RM) $(STAGING_DIR)/usr/include/schifra_*.hpp
+endef
+
+define SCHIFRA_CLEAN_CMDS
+	$(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPT) clean
+endef
+
+$(eval $(generic-package))

From a77ee7fd40a78d6fe05657b4f4be63926c04e523 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 10 Sep 2012 12:38:29 +0200
Subject: [PATCH 2662/6849] pkg-download: allow relative BR2_DL_DIR

And move the BUILDROOT_DL_DIR override here as well for consistency.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                | 11 +++--------
 package/pkg-download.mk | 11 ++++++++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index b81170fadb..ba5da990d3 100644
--- a/Makefile
+++ b/Makefile
@@ -96,11 +96,6 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 -include $(CONFIG_DIR)/.config
 endif
 
-# Override BR2_DL_DIR if shell variable defined
-ifneq ($(BUILDROOT_DL_DIR),)
-BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
-endif
-
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
 ifdef V
@@ -363,7 +358,7 @@ TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\
 # all targets depend on the crosscompiler and it's prerequisites
 $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
-dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+dirs: $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 $(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
@@ -379,7 +374,7 @@ world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 	legal-info legal-info-prepare legal-info-clean \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
-	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 #############################################################
@@ -388,7 +383,7 @@ world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
+$(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
 	@mkdir -p $@
 
 $(STAGING_DIR):
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 9e98581000..fa9a3e8835 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -22,11 +22,20 @@ LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
 # external-deps target.
 DL_MODE=DOWNLOAD
 
-DL_DIR=$(call qstrip,$(BR2_DL_DIR))
+# Override BR2_DL_DIR if shell variable defined
+ifneq ($(BUILDROOT_DL_DIR),)
+DL_DIR:=$(BUILDROOT_DL_DIR)
+else
+DL_DIR:=$(call qstrip,$(BR2_DL_DIR))
+endif
+
 ifeq ($(DL_DIR),)
 DL_DIR:=$(TOPDIR)/dl
 endif
 
+# ensure it exists and a absolute path
+DL_DIR:=$(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd)
+
 #
 # URI scheme helper functions
 # Example URIs:

From 0cf33385468889c7ec1ddbdae2c81ecabc4f9584 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Sun, 9 Sep 2012 22:48:57 +0000
Subject: [PATCH 2663/6849] linux-firmware: update to a more recent git
 snapshot

This update pulls in new ath6k and realtek drivers and updates for
libertas and iwlwifi:

a707c25 Merge branch 'master' of git://dev.laptop.org/users/dsd/linux-firmware
adb6547 rtlwifi/rtl8723e: Add firmware for new driver
4e17394 linux-firmware: ath6k: add firmware for AR6004 hw1.3
bac3567 Marvell SD8787: update to v14.66.9.p96
6a08d14 Marvell SD8686: update to v9.70.20.p0
bbede96 iwlwifi: update firmware for 6205

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/linux-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 23afafad1a..09836a476e 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -3,7 +3,7 @@
 # linux-firmware
 #
 #############################################################
-LINUX_FIRMWARE_VERSION = 7560108a2c94a62056fa82d912282b901aa0904f
+LINUX_FIRMWARE_VERSION = a707c25a6e992b8ee6127a6ebab63dd063043047
 LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 

From 94ce13a56f238bbba01bdfc893cfbc4e62169287 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Sep 2012 08:59:56 +0200
Subject: [PATCH 2664/6849] pppd: fix build with 3.5+ kernel headers

Fixes http://autobuild.buildroot.net/results/8a9369fece696e012249b865708ffee533c5318a

Pppd bundles some, but not all needed kernel headers. In Linux 3.5 (and
before that 2.6.35) if_pppol2tp.h was changed, so the embedded copy was no
longer compatible.

if_pppol2tp.h has been part of the exported kernel headers since 2.6.23, so
simply drop the bundled copy and use the kernel headers instead, similar
to how it is done in Gentoo:

https://bugs.gentoo.org/show_bug.cgi?id=427684

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch | 24 --------------------
 package/pppd/pppd.mk                         |  9 ++++++++
 2 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch

diff --git a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch
deleted file mode 100644
index 0e71e24093..0000000000
--- a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ppp-2.4.5/include/linux/if_pppol2tp.h       2009-11-16 22:26:07.000000000 +0000
-+++ ppp-2.4.5/include/linux/if_pppol2tp.h       2010-07-16 22:35:22.000000000 +0100
-@@ -32,6 +32,20 @@
-  	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
- };
-
-+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
-+ * bits. So we need a different sockaddr structure.
-+ */
-+struct pppol2tpv3_addr {
-+       pid_t   pid;                    /* pid that owns the fd.
-+                                        * 0 => current */
-+       int     fd;                     /* FD of UDP or IP socket to use */
-+
-+       struct sockaddr_in addr;        /* IP address and port to send to */
-+
-+       __u32 s_tunnel, s_session;      /* For matching incoming packets */
-+       __u32 d_tunnel, d_session;      /* For sending outgoing packets */
-+};
-+
- /* Socket options:
-  * DEBUG	- bitmask of debug message categories
-  * SENDSEQ	- 0 => don't send packets with sequence numbers
-
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 259d1dc6d6..b13dbabab2 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -23,6 +23,15 @@ ifeq ($(BR2_INET_IPV6),y)
 	PPPD_MAKE_OPT += HAVE_INET6=y
 endif
 
+# pppd bundles some but not all of the needed kernel headers. The embedded
+# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34,
+# and has been part of the kernel headers since 2.6.23, so drop it
+define PPPD_DROP_INTERNAL_IF_PPOL2TP_H
+	$(RM) $(@D)/include/linux/if_pppol2tp.h
+endef
+
+PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H
+
 define PPPD_CONFIGURE_CMDS
 	$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
 	$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux

From 3b9e61f9234165db1f70021396c8d59c2d52d3ec Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Sep 2012 09:13:11 +0200
Subject: [PATCH 2665/6849] lcdproc: fix build with high BR2_JLEVEL setting

Fixes http://autobuild.buildroot.net/results/646db4b6b284beb4392759a57efffc8d10ee9f49

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdproc/lcdproc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index e4944daeb1..7fd8a44d0d 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -8,6 +8,7 @@ LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
 LCDPROC_LICENSE = GPLv2+
 LCDPROC_LICENSE_FILES = COPYING
+LCDPROC_MAKE = $(MAKE1)
 
 LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
 

From c226de26ec1379a88f7fe0e278ceb5888b92a054 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Sep 2012 22:45:08 +0200
Subject: [PATCH 2666/6849] package: add opus audio codec library

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/opus/Config.in | 15 +++++++++++++++
 package/opus/opus.mk   | 16 ++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/opus/Config.in
 create mode 100644 package/opus/opus.mk

diff --git a/package/Config.in b/package/Config.in
index 441159d385..2e3f6763a0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -302,6 +302,7 @@ source "package/libreplaygain/Config.in"
 source "package/libsamplerate/Config.in"
 source "package/libsndfile/Config.in"
 source "package/libvorbis/Config.in"
+source "package/opus/Config.in"
 source "package/portaudio/Config.in"
 source "package/speex/Config.in"
 source "package/taglib/Config.in"
diff --git a/package/opus/Config.in b/package/opus/Config.in
new file mode 100644
index 0000000000..12bdfbbdb3
--- /dev/null
+++ b/package/opus/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_OPUS
+	bool "opus"
+	help
+	  The Opus codec is designed for interactive speech and audio
+	  transmission over the Internet. It is designed by the IETF
+	  Codec Working Group and incorporates technology from Skype's
+	  SILK codec and Xiph.Org's CELT codec.
+
+	  It is intended to suit a wide range of interactive audio
+	  applications, including Voice over IP, videoconferencing,
+	  in-game chat, and even remote live music performances. It
+	  can scale from low bit-rate narrowband speech to very high
+	  quality stereo music.
+
+	  http://opus-codec.org
diff --git a/package/opus/opus.mk b/package/opus/opus.mk
new file mode 100644
index 0000000000..177adfb098
--- /dev/null
+++ b/package/opus/opus.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# opus
+#
+#############################################################
+
+OPUS_VERSION = 1.0.1
+OPUS_SITE = http://downloads.xiph.org/releases/opus
+OPUS_INSTALL_STAGING = YES
+OPUS_CONF_OPT = --disable-doc
+
+ifeq ($(BR2_SOFT_FLOAT),y)
+OPUS_CONF_OPT += --enable-fixed-point
+endif
+
+$(eval $(autotools-package))

From 0bbb2eda9a810ac3e07a99c0042e246c24e74b2b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Sep 2012 23:06:50 +0200
Subject: [PATCH 2667/6849] package: add opus-tools

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in     |  1 +
 package/opus-tools/Config.in     | 10 ++++++++++
 package/opus-tools/opus-tools.mk | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 package/opus-tools/Config.in
 create mode 100644 package/opus-tools/opus-tools.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index afe4a23b0c..273d9bc1bc 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -19,6 +19,7 @@ source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
+source "package/opus-tools/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
diff --git a/package/opus-tools/Config.in b/package/opus-tools/Config.in
new file mode 100644
index 0000000000..2552d19515
--- /dev/null
+++ b/package/opus-tools/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_OPUS_TOOLS
+	bool "opus-tools"
+	select BR2_PACKAGE_OPUS
+	select BR2_PACKAGE_LIBOGG
+	help
+	  Opus codec command line tools. This package provides the
+	  reference implementations of encoder and decoder utilities
+	  for libopus.
+
+	  http://opus-codec.org
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
new file mode 100644
index 0000000000..233ad9a6e8
--- /dev/null
+++ b/package/opus-tools/opus-tools.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# opus-tools
+#
+#############################################################
+
+OPUS_TOOLS_VERSION = 0.1.5
+OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
+OPUS_TOOLS_CONF_OPT = --disable-oggtest --disable-opustest
+OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkg-config
+
+ifeq ($(BR2_PACKAGE_LIBPCAP),y)
+OPUS_TOOLS_DEPENDENCIES += libpcap
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+OPUS_TOOLS_CONF_OPT += --enable-sse
+else
+OPUS_TOOLS_CONF_OPT += --disable-sse
+endif
+
+$(eval $(autotools-package))

From 5df8e364d00840ab8ea2d8ee0cfe574034b54c3c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 11 Sep 2012 23:21:56 +0200
Subject: [PATCH 2668/6849] gst-plugin-bad: add opus option

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in          | 4 ++++
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index cb50fbd84c..cde3ab81a2 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -277,6 +277,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON
 	bool "neon"
 	select BR2_PACKAGE_NEON
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS
+	bool "opus"
+	select BR2_PACKAGE_OPUS
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
 	bool "rsvg"
 	depends on BR2_PACKAGE_LIBGTK2
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index ad8b509576..6bdcf10289 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -528,6 +528,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-neon
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-opus
+GST_PLUGINS_BAD_DEPENDENCIES += opus
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-opus
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-rsvg
 GST_PLUGINS_BAD_DEPENDENCIES += librsvg

From 259f0ed4fa8129c5c4c0061b787b85b766efa011 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 12 Sep 2012 09:31:19 +0200
Subject: [PATCH 2669/6849] gst-plugins-bad: opus + jpegformat: unbreak
 non-debug build

opus + jpegformat plugin builds fail when gstreamer is configured with
--disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol
instead of GST_DISABLE_GST_DEBUG.

Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...s-jpegformat-unbreak-non-debug-build.patch | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch

diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch b/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
new file mode 100644
index 0000000000..2c98c3e102
--- /dev/null
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
@@ -0,0 +1,78 @@
+From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Wed, 12 Sep 2012 09:10:35 +0200
+Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build
+
+opus + jpegformat plugin builds fail when gstreamer is configured with
+--disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol
+instead of GST_DISABLE_GST_DEBUG.
+
+Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ ext/opus/gstopusdec.c         |    2 +-
+ ext/opus/gstopusenc.c         |    4 ++--
+ gst/jpegformat/gstjpegparse.c |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
+index 0e2805c..ab7221d 100644
+--- a/ext/opus/gstopusdec.c
++++ b/ext/opus/gstopusdec.c
+@@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer)
+ 
+     GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz",
+         dec->n_channels, dec->sample_rate);
+-#ifndef GST_DISABLE_DEBUG
++#ifndef GST_DISABLE_GST_DEBUG
+     gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug,
+         "Mapping table", dec->n_channels, dec->channel_mapping);
+ #endif
+diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
+index 240a2cb..d991795 100644
+--- a/ext/opus/gstopusenc.c
++++ b/ext/opus/gstopusenc.c
+@@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc,
+       }
+     }
+ 
+-#ifndef GST_DISABLE_DEBUG
++#ifndef GST_DISABLE_GST_DEBUG
+     GST_INFO_OBJECT (enc,
+         "Mapping tables built: %d channels, %d stereo streams", enc->n_channels,
+         enc->n_stereo_streams);
+@@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc)
+ {
+   int error = OPUS_OK;
+ 
+-#ifndef GST_DISABLE_DEBUG
++#ifndef GST_DISABLE_GST_DEBUG
+   GST_DEBUG_OBJECT (enc,
+       "setup: %d Hz, %d channels, %d stereo streams, family %d",
+       enc->sample_rate, enc->n_channels, enc->n_stereo_streams,
+diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
+index f984a52..b4af9ed 100644
+--- a/gst/jpegformat/gstjpegparse.c
++++ b/gst/jpegformat/gstjpegparse.c
+@@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
+   if (!gst_byte_reader_get_uint16_be (reader, &size))
+     return FALSE;
+ 
+-#ifndef GST_DISABLE_DEBUG
++#ifndef GST_DISABLE_GST_DEBUG
+   /* We'd pry the id of the skipped application segment */
+   if (marker >= APP0 && marker <= APP15) {
+     const gchar *id_str = NULL;
+@@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
+ #else
+   GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker,
+       size);
+-#endif // GST_DISABLE_DEBUG
++#endif // GST_DISABLE_GST_DEBUG
+ 
+   if (!gst_byte_reader_skip (reader, size - 2))
+     return FALSE;
+-- 
+1.7.10
+

From 1fc8d6986e38d4b8f7847b72a707c693a24dcb5c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 12 Sep 2012 11:49:01 +0200
Subject: [PATCH 2670/6849] gst-plugin-bad: add musepack option

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in          | 4 ++++
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index cde3ab81a2..7784ad70f6 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -273,6 +273,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "libmms"
 	select BR2_PACKAGE_LIBMMS
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
+	bool "musepack"
+	select BR2_PACKAGE_MUSEPACK
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON
 	bool "neon"
 	select BR2_PACKAGE_NEON
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 6bdcf10289..714c987c1b 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -521,6 +521,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-libmms
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-musepack
+GST_PLUGINS_BAD_DEPENDENCIES += musepack
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-musepack
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-neon
 GST_PLUGINS_BAD_DEPENDENCIES += neon

From b98ccc4ea277031851826540d5b6a5a8874e19a2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 12 Sep 2012 23:13:41 +0200
Subject: [PATCH 2671/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 403ab3eacc..19e23e6ac3 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -65,7 +65,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.42"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.28"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.29"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.10"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.3"		if BR2_KERNEL_HEADERS_3_5

From fcc1b0cca0e19a8f32d519be3d38cdcdf1de63e8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Sep 2012 03:51:54 +0000
Subject: [PATCH 2672/6849] hiawatha: bump to version 8.5

[Peter: license is explictly GPLv2, not GPLv2+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...awatha-support-for-external-polarssl.patch | 26 +++++++++----------
 package/hiawatha/hiawatha.mk                  |  4 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
index edc774b7d2..5441a524a9 100644
--- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch
+++ b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
@@ -9,22 +9,22 @@ This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in
 addition to ENABLE_SSL, tells Hiawatha's build system to link against
 the already existing PolarSSL library instead of building its own.
 
-[Gustavo]: Update for version 8.3
+[Gustavo]: Update for version 8.5
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt
---- hiawatha-8.3.orig//CMakeLists.txt	2012-05-23 14:22:26.000000000 -0300
-+++ hiawatha-8.3/CMakeLists.txt	2012-05-24 08:13:00.007107500 -0300
-@@ -10,6 +10,7 @@
- option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off)
- option(ENABLE_RPROXY  "Enable reverse proxy support in Hiawatha." on)
- option(ENABLE_SSL     "Enable SSL (PolarSSL) support in Hiawatha." on)
+diff -Nura hiawatha-8.5.orig/CMakeLists.txt hiawatha-8.5/CMakeLists.txt
+--- hiawatha-8.5.orig/CMakeLists.txt	2012-09-12 09:29:34.347994799 -0300
++++ hiawatha-8.5/CMakeLists.txt	2012-09-12 09:33:15.983118183 -0300
+@@ -9,6 +9,7 @@
+ option(ENABLE_MONITOR  "Enable support for the Hiawatha Monitor." off)
+ option(ENABLE_RPROXY   "Enable reverse proxy support in Hiawatha." on)
+ option(ENABLE_SSL      "Enable SSL (PolarSSL) support in Hiawatha." on)
 +option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off)
- option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on)
- option(ENABLE_XSLT    "Enable XSLT support in Hiawatha." on)
- 
-@@ -85,19 +86,23 @@
+ option(ENABLE_TOMAHAWK "Enable Tomahawk in Hiawatha" off)
+ option(ENABLE_TOOLKIT  "Enable the URL toolkit in Hiawatha" on)
+ option(ENABLE_XSLT     "Enable XSLT support in Hiawatha." on)
+@@ -88,19 +89,23 @@
  
  # PolarSSL
  if(ENABLE_SSL)
@@ -49,7 +49,7 @@ diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt
  # Configure files
  configure_file(config.h.in config.h)
  foreach (configfile ${config_files_in})
-@@ -118,7 +123,9 @@
+@@ -121,7 +126,9 @@
  target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
  if(ENABLE_SSL)
  	target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index db5b27787b..79546e3978 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,5 +1,7 @@
-HIAWATHA_VERSION = 8.4
+HIAWATHA_VERSION = 8.5
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
+HIAWATHA_LICENSE = GPLv2
+HIAWATHA_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
 HIAWATHA_CONF_OPT += -DENABLE_SSL_EXTERNAL=ON -DENABLE_SSL=ON

From bca9a642c9e9f272798135170a4eba49fb3d9a6e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Sep 2012 03:51:55 +0000
Subject: [PATCH 2673/6849] unionfs: bump to version 0.26

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/unionfs/unionfs.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index 3b33824373..e2ffd72f53 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-UNIONFS_VERSION = 0.25
+UNIONFS_VERSION = 0.26
 UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
-UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.bz2
+UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.xz
 UNIONFS_DEPENDENCIES = libfuse
+UNIONFS_LICENSE = BSD-3c
+UNIONFS_LICENSE_FILES = LICENSE
 
 define UNIONFS_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From 47ac46f5bd6ed2175b63bd92531a45ddc08dfc44 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Sep 2012 03:51:56 +0000
Subject: [PATCH 2674/6849] patch: bump to version 2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/patch/patch.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index b4206c5eb2..346aabd60d 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -4,7 +4,9 @@
 #
 #############################################################
 
-PATCH_VERSION = 2.6
+PATCH_VERSION = 2.7
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
+PATCH_LICENSE = GPLv3+
+PATCH_LICENSE_FILE = COPYING
 
 $(eval $(autotools-package))

From c8573284cd9ee0f93cd9740fd6472d09357ffb91 Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@mimc.co.uk>
Date: Wed, 12 Sep 2012 00:32:30 +0000
Subject: [PATCH 2675/6849] wpa_supplicant: add license information

v2 - license type is GPLv2/BSD-3c as pointed out by Baruch Siach

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 9d957ea724..d8c916b23a 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -6,6 +6,8 @@
 
 WPA_SUPPLICANT_VERSION = 1.0
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
+WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
+WPA_SUPPLICANT_LICENSE_FILES = README
 WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
 WPA_SUPPLICANT_SUBDIR = wpa_supplicant
 WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant

From d7f8dda7c07dd5eaddc1f0e2fa4d7426e673f8ac Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 12 Aug 2012 07:01:16 +0000
Subject: [PATCH 2676/6849] vsftpd: add linux-pam support

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/vsftpd.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index ca711bbfe3..ce042c5ba9 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -23,6 +23,11 @@ VSFTPD_DEPENDENCIES += libcap
 VSFTPD_LIBS += -lcap
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+VSFTPD_DEPENDENCIES += linux-pam
+VSFTPD_LIBS += -lpam
+endif
+
 define VSFTPD_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D)

From 4dadcf292c280f8e7aa1dc16e784d5a11274fc1b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 13 Sep 2012 19:23:38 +0200
Subject: [PATCH 2677/6849] qt: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 3b40ea460f..e000ecbaca 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -11,7 +11,7 @@
 #
 ######################################################################
 
-QT_VERSION = 4.8.2
+QT_VERSION = 4.8.3
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://releases.qt-project.org/qt4/source
 QT_DEPENDENCIES = host-pkg-config

From ef500345220e72d8dda96a380ca083351529255f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 13 Sep 2012 19:42:47 +0200
Subject: [PATCH 2678/6849] kmod: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index fb9706ce29..fb07ae6a83 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 9
+KMOD_VERSION = 10
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From 32f4957b153bdabe7af60d529942aca7d1a4783d Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 28 Aug 2012 22:04:05 +0000
Subject: [PATCH 2679/6849] poco: fix parallel build failure

This added patch should fix
http://autobuild.buildroot.net/results/1bf7e51ef30af9bbf5e423e80ef07212b83bdaf8/.

CROSSENV is now required also in the install stages to prevent a rebuild using
the host native toolchain.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/poco-fix-parallel-build.patch | 71 ++++++++++++++++++++++
 package/poco/poco.mk                       |  6 +-
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 package/poco/poco-fix-parallel-build.patch

diff --git a/package/poco/poco-fix-parallel-build.patch b/package/poco/poco-fix-parallel-build.patch
new file mode 100644
index 0000000000..39a1e3ec08
--- /dev/null
+++ b/package/poco/poco-fix-parallel-build.patch
@@ -0,0 +1,71 @@
+poco: fix parallel build
+
+The makefile rule for generating objects implicitly depends on the existence
+of the containing directory. The makefile dependecies do not reflect this,
+however. Instead, the final compilation producs depend on one of libdirs,
+bindirs, or static_bindirs, which in turn depend on objdirs. This breaks
+parallel build since the objdirs target may not complete before the object
+files build starts as follows (abbreviated):
+
+make[2]: Entering directory `/home/test/test/output/build/poco-1.4.3p1/Zip'
+mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/release_static
+mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/debug_static
+mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/release_shared
+mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/debug_shared
+** Compiling src/AutoDetectStream.cpp (release, shared)
+...
+Assembler messages:
+Fatal error: can't create /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/release_shared/AutoDetectStream.o: No such file or directory
+
+Add direct dependency on the objects directories to fix this.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+diff -Nur poco-1.4.3p1-all.orig/build/rules/compile poco-1.4.3p1-all/build/rules/compile
+--- poco-1.4.3p1-all.orig/build/rules/compile	2012-01-23 16:12:26.000000000 +0200
++++ poco-1.4.3p1-all/build/rules/compile	2012-08-28 13:10:17.000000000 +0300
+@@ -33,35 +32,35 @@
+ #
+ # Rules for compiling
+ #	
+-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(debug, static)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(release, static)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(debug, static)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(release, static)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
+ 
+-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(debug, shared)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(release, shared)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(debug, shared)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
+ 	@echo "** Compiling" $< "(release, shared)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+ 
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 69ef314ced..5b8bdbf0db 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -51,11 +51,13 @@ define POCO_BUILD_CMDS
 endef
 
 define POCO_INSTALL_STAGING_CMDS
-	$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
+	$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \
+		CROSSENV=$(TARGET_CROSS) install -C $(@D)
 endef
 
 define POCO_INSTALL_TARGET_CMDS
-	$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
+	$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \
+		CROSSENV=$(TARGET_CROSS) install -C $(@D)
 endef
 
 $(eval $(generic-package))

From f1e79957f857c12bba3d930d6c4b0278ab737132 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Sep 2012 12:54:19 +0000
Subject: [PATCH 2680/6849] package: add new filesystem utilities category

Add the new filesystem utilities category and move a bunch of packages
into it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 2e3f6763a0..58dd5e80dc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -167,10 +167,27 @@ source "package/xterm/Config.in"
 source "package/xvkbd/Config.in"
 endmenu
 
+menu "Filesystem utilities"
+source "package/cifs-utils/Config.in"
+source "package/cramfs/Config.in"
+source "package/dosfstools/Config.in"
+source "package/e2fsprogs/Config.in"
+source "package/genext2fs/Config.in"
+source "package/genromfs/Config.in"
+source "package/makedevs/Config.in"
+source "package/mtd/Config.in"
+source "package/nfs-utils/Config.in"
+source "package/ntfs-3g/Config.in"
+source "package/squashfs/Config.in"
+source "package/squashfs3/Config.in"
+source "package/sshfs/Config.in"
+source "package/unionfs/Config.in"
+source "package/xfsprogs/Config.in"
+endmenu
+
 menu "Hardware handling"
 source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
-source "package/cramfs/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/dbus-python/Config.in"
@@ -179,8 +196,6 @@ source "package/devmem2/Config.in"
 endif
 source "package/dmidecode/Config.in"
 source "package/dmraid/Config.in"
-source "package/dosfstools/Config.in"
-source "package/e2fsprogs/Config.in"
 source "package/eeprog/Config.in"
 source "package/flashrom/Config.in"
 source "package/fconfig/Config.in"
@@ -188,8 +203,6 @@ source "package/fis/Config.in"
 source "package/fmtools/Config.in"
 source "package/gadgetfs-test/Config.in"
 source "package/gdisk/Config.in"
-source "package/genext2fs/Config.in"
-source "package/genromfs/Config.in"
 source "package/gpsd/Config.in"
 source "package/gvfs/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -208,13 +221,10 @@ source "package/lm-sensors/Config.in"
 source "package/lshw/Config.in"
 source "package/lsuio/Config.in"
 source "package/lvm2/Config.in"
-source "package/makedevs/Config.in"
 source "package/mdadm/Config.in"
 source "package/memtester/Config.in"
 source "package/minicom/Config.in"
-source "package/mtd/Config.in"
 source "package/nanocom/Config.in"
-source "package/ntfs-3g/Config.in"
 source "package/ofono/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
@@ -228,22 +238,17 @@ source "package/sane-backends/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
 source "package/smartmontools/Config.in"
-source "package/squashfs/Config.in"
-source "package/squashfs3/Config.in"
 source "package/sredird/Config.in"
-source "package/sshfs/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
 source "package/ti-utils/Config.in"
 source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
-source "package/unionfs/Config.in"
 source "package/usb_modeswitch/Config.in"
 source "package/usb_modeswitch_data/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
 source "package/wipe/Config.in"
-source "package/xfsprogs/Config.in"
 endmenu
 
 menu "Interpreter languages and scripting"
@@ -530,7 +535,6 @@ source "package/bridge-utils/Config.in"
 source "package/can-utils/Config.in"
 source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
-source "package/cifs-utils/Config.in"
 source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -582,7 +586,6 @@ source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/network-manager/Config.in"
 source "package/noip/Config.in"
-source "package/nfs-utils/Config.in"
 source "package/ngircd/Config.in"
 source "package/ngrep/Config.in"
 source "package/ntp/Config.in"

From 3165ae39ba6e7768bdc36cd3e5dc545c12b39bf4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Sep 2012 09:39:33 +0000
Subject: [PATCH 2681/6849] kernel-headers: bump 3.{0, 4, 5}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.42-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.43-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 19e23e6ac3..1f06e2b012 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,11 +63,11 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.42"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.43"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.29"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.10"	if BR2_KERNEL_HEADERS_3_4
-	default "3.5.3"		if BR2_KERNEL_HEADERS_3_5
+	default "3.4.11"	if BR2_KERNEL_HEADERS_3_4
+	default "3.5.4"		if BR2_KERNEL_HEADERS_3_5
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.42-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.43-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.42-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.43-headers_install-fix-__packed-in-exported-kernel-head.patch

From cb63f3145de9a0a660e5d9cab5a61816d9659f17 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Sep 2012 09:41:03 +0000
Subject: [PATCH 2682/6849] linux: bump default to kernel version 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 30cb5ed147..ff2700a597 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_5
 
 config BR2_LINUX_KERNEL_3_5
-	bool "3.5.3"
+	bool "3.5.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.5.3" if BR2_LINUX_KERNEL_3_5
+	default "3.5.4" if BR2_LINUX_KERNEL_3_5
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 5f299dee78316d3c91f930d8bfce6a781d6e39ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 10:28:36 +0000
Subject: [PATCH 2683/6849] libmad: add Thumb2 patches from Debian

This fixes recurrent libmad build failures reported by the
autobuilder. See:

  http://autobuild.buildroot.net/results/a10c943e74b6e67e69183a35b5762482e357a75f/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libmad-0.15.1b-thumb2-fixed-arm.patch     | 40 +++++++++++++++++++
 .../libmad-0.15.1b-thumb2-imdct-arm.patch     | 20 ++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 package/libmad/libmad-0.15.1b-thumb2-fixed-arm.patch
 create mode 100644 package/libmad/libmad-0.15.1b-thumb2-imdct-arm.patch

diff --git a/package/libmad/libmad-0.15.1b-thumb2-fixed-arm.patch b/package/libmad/libmad-0.15.1b-thumb2-fixed-arm.patch
new file mode 100644
index 0000000000..befda48d7e
--- /dev/null
+++ b/package/libmad/libmad-0.15.1b-thumb2-fixed-arm.patch
@@ -0,0 +1,40 @@
+Fixes Thumb2-related build failure
+
+Patch below comes from the Debian libmad package.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+From: Dave Martin
+Subject: "rsc" doesnt exist anymore in thumb2
+
+diff --git a/fixed.h b/fixed.h
+index 4b58abf..ba4bc26 100644
+--- a/fixed.h
++++ b/fixed.h
+@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
+ 	 : "+r" (lo), "+r" (hi)  \
+ 	 : "%r" (x), "r" (y))
+ 
++#ifdef __thumb__
++/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
++	operand.  If needed this code can also support Thumb-1 
++	(simply append "s" to the end of the second two instructions). */
++#  define MAD_F_MLN(hi, lo)  \
++    asm ("rsbs        %0, %0, #0\n\t"  \
++	 "sbc   %1, %1, %1\n\t"  \
++	 "sub   %1, %1, %2"  \
++	 : "+&r" (lo), "=&r" (hi)  \
++	 : "r" (hi)  \
++	 : "cc")
++#else /* ! __thumb__ */
+ #  define MAD_F_MLN(hi, lo)  \
+     asm ("rsbs	%0, %2, #0\n\t"  \
+ 	 "rsc	%1, %3, #0"  \
+-	 : "=r" (lo), "=r" (hi)  \
++	 : "=&r" (lo), "=r" (hi)  \
+ 	 : "0" (lo), "1" (hi)  \
+ 	 : "cc")
++#endif /* __thumb__ */
+ 
+ #  define mad_f_scale64(hi, lo)  \
+     ({ mad_fixed_t __result;  \
diff --git a/package/libmad/libmad-0.15.1b-thumb2-imdct-arm.patch b/package/libmad/libmad-0.15.1b-thumb2-imdct-arm.patch
new file mode 100644
index 0000000000..414b9c8fcf
--- /dev/null
+++ b/package/libmad/libmad-0.15.1b-thumb2-imdct-arm.patch
@@ -0,0 +1,20 @@
+Fixes Thumb2 related build failure
+
+Patch below comes from the Debian libmad package.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+From: Konstantinos Margaritis <markos@debian.org>
+Subject: use "adr" instead of "add" to make code ready for thumb2
+
+--- ./imdct_l_arm.S.orig	2010-02-25 13:25:23.000000000 +0100
++++ ./imdct_l_arm.S	2010-02-25 13:27:26.000000000 +0100
+@@ -468,7 +468,7 @@
+ 
+     @----
+ 
+-    add     r2, pc, #(imdct36_long_karray-.-8)  @ r2 = base address of Knn array (PIC safe ?)
++    adr     r2, imdct36_long_karray
+ 
+ 
+ loop:

From 9bf020f54415345a22f11754d8280e4ae8fa8ef4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 10:41:02 +0000
Subject: [PATCH 2684/6849] erlang: don't build the Java stuff on the host

We don't need the Java stuff, and it causes build failures on certain
machines:

 http://autobuild.buildroot.org/results/99035e89e101c41d5e8b5ef6a025856f4af88ae2/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/erlang.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 63c655ba22..6d51376c1d 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -17,6 +17,7 @@ ERLANG_LICENSE_FILES = EPLICENCE
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
 
 ERLANG_CONF_OPT = --without-javac
+HOST_ERLANG_CONF_OPT = --without-javac
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 ERLANG_CONF_OPT += --with-termcap

From 52975d89daa00d8e7ccc5aad5c0b02fd745bb1d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 17 Sep 2012 21:18:06 +0200
Subject: [PATCH 2685/6849] Revert "poco: fix parallel build failure"

This reverts commit 32f4957b153bdabe7af60d529942aca7d1a4783d.

Adding the phony objdir target as a prerequisite of all the .o targets
doesn't work, as they are then always considered out of date, leading
to poco getting rebuilt (without the proper MYSQL_{INC,LIB}DIR settings)
at staging-install / target-install time.

Instead simply use MAKE1 for the build step.

Fixes http://autobuild.buildroot.net/results/1cca8b4115674f12884bcbc0c680efed0fb939ae

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/poco-fix-parallel-build.patch | 71 ----------------------
 package/poco/poco.mk                       |  8 +--
 2 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 package/poco/poco-fix-parallel-build.patch

diff --git a/package/poco/poco-fix-parallel-build.patch b/package/poco/poco-fix-parallel-build.patch
deleted file mode 100644
index 39a1e3ec08..0000000000
--- a/package/poco/poco-fix-parallel-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-poco: fix parallel build
-
-The makefile rule for generating objects implicitly depends on the existence
-of the containing directory. The makefile dependecies do not reflect this,
-however. Instead, the final compilation producs depend on one of libdirs,
-bindirs, or static_bindirs, which in turn depend on objdirs. This breaks
-parallel build since the objdirs target may not complete before the object
-files build starts as follows (abbreviated):
-
-make[2]: Entering directory `/home/test/test/output/build/poco-1.4.3p1/Zip'
-mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/release_static
-mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/debug_static
-mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/release_shared
-mkdir -p /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/debug_shared
-** Compiling src/AutoDetectStream.cpp (release, shared)
-...
-Assembler messages:
-Fatal error: can't create /home/test/test/output/build/poco-1.4.3p1/Zip/obj/Linux/powerpc/release_shared/AutoDetectStream.o: No such file or directory
-
-Add direct dependency on the objects directories to fix this.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-
-diff -Nur poco-1.4.3p1-all.orig/build/rules/compile poco-1.4.3p1-all/build/rules/compile
---- poco-1.4.3p1-all.orig/build/rules/compile	2012-01-23 16:12:26.000000000 +0200
-+++ poco-1.4.3p1-all/build/rules/compile	2012-08-28 13:10:17.000000000 +0300
-@@ -33,35 +32,35 @@
- #
- # Rules for compiling
- #	
--$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(debug, static)"
- 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
- 
--$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(release, static)"
- 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
- 
--$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(debug, static)"
- 	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
- 
--$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(release, static)"
- 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
- 
--$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(debug, shared)"
- 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
- 
--$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(release, shared)"
- 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
- 
--$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(debug, shared)"
- 	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
- 
--$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- 	@echo "** Compiling" $< "(release, shared)"
- 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
- 
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 5b8bdbf0db..eaa93e66c8 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -45,19 +45,17 @@ define POCO_CONFIGURE_CMDS
 endef
 
 define POCO_BUILD_CMDS
-	$(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \
+	$(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \
 		MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \
 		MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql -C $(@D)
 endef
 
 define POCO_INSTALL_STAGING_CMDS
-	$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \
-		CROSSENV=$(TARGET_CROSS) install -C $(@D)
+	$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
 endef
 
 define POCO_INSTALL_TARGET_CMDS
-	$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \
-		CROSSENV=$(TARGET_CROSS) install -C $(@D)
+	$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
 endef
 
 $(eval $(generic-package))

From f9b0c1d293fa412919507771446b8efbcbc0efc2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 17 Sep 2012 23:52:37 +0000
Subject: [PATCH 2686/6849] vala: fix documentation build problem

On gcc10, the build of the host-vala documentation causes a
segmentation fault of xsltproc, for some unknown reason. See:

  http://autobuild.buildroot.org/results/42fea25ac4fe33a56c02d90c361da1c494f79ba3/build-end.log

Therefore, this patch fixes the problem by:

 * Ensuring that host-libxslt is amongst the dependency of vala when
   documentation is enabled so that we build a well-known version of
   libxslt/xsltproc to build the documentation. If documentation is
   not enabled, then we force vala to *not* find xsltproc so that it
   doesn't try to use the xsltproc of the build machine distribution
   if available.

 * Disabling the build of the documentation for host-vala. Note that
   we need to pass ':' as the xsltproc binary name to teach the
   configure script that xsltproc is not available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 984043cf13..1cbbbc459e 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -9,9 +9,24 @@ VALA_VERSION_MINOR = 6
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
+
 VALA_DEPENDENCIES = host-flex libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+
+# If we want the documentation, then xsltproc is needed. If we don't
+# want the documentation, force Vala to not use the host xsltproc even
+# if available, because it may or may not work with Vala documentation
+# (some versions of xsltproc segfault)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+VALA_DEPENDENCIES += host-libxslt
+else
+VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
+endif
+
 HOST_VALA_DEPENDENCIES = host-flex host-libglib2
+# Yes, the autoconf script understands ':' as "xsltproc is not
+# available".
+HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From a0767d84b06e1856191f6483b3e163796e99257e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 17 Sep 2012 06:44:34 +0000
Subject: [PATCH 2687/6849] libnspr: requires thread support in toolchain

Fixes

 http://autobuild.buildroot.org/results/58e0784e2289a60fa51589d2ce0a7a8ffe40f07e/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/Config.in | 5 +++--
 package/libnss/Config.in  | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index 53086f0730..f4f24d46f7 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBNSPR
 	bool "libnspr"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  NSPR is the Netscape Portable Runtime library which provides
 	  a platform-neutral API for system level and libc like
@@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBNSPR
 
 	  http://www.mozilla.org/projects/nspr/
 
-comment "libnspr requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libnspr requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE && !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index 55928a427b..a070ffbdfe 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBNSS
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
 	help
 	  Network Security Services (NSS) is a set of libraries designed
 	  to support development of security-enabled client and server
@@ -13,5 +14,6 @@ config BR2_PACKAGE_LIBNSS
 
 	  http://www.mozilla.org/projects/security/pki/nss/
 
-comment "libnss requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libnss requires a toolchain with LARGEFILE and thread support"
+	depends on !BR2_LARGEFILE && !BR2_TOOLCHAIN_HAS_THREADS
+

From 238f3f860a660b0aafdc6a4ae4abcf0e31b21d93 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 20 Sep 2012 12:23:53 +0200
Subject: [PATCH 2688/6849] vala: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 1cbbbc459e..73ac8ee2ab 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 VALA_VERSION_MAJOR = 0.17
-VALA_VERSION_MINOR = 6
+VALA_VERSION_MINOR = 7
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz

From 14af091234840bf22f240b66bcb78da00950f8f8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 19 Sep 2012 10:42:52 +0000
Subject: [PATCH 2689/6849] mplayer: not supported on sh4a/sh4aeb

The mplayer configure script says that sh4a is not supported,
according to:

 http://autobuild.buildroot.org/results/c6457c2dea7c1df4d8e0f23995ebfb3285a85aed/build-end.log

Apparently, sh4 is supported, but not sh4a, even though it seems that
sh4a is a super-set of sh4. So it would probably not be too difficult
to get mplayer to build/work for sh4a, but we don't have hardware to
test this easily, and we can leave this work to the first developer
who will need mplayer on sh4a: let's only support what the upstream
package supports.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/multimedia/mplayer/Config.in b/package/multimedia/mplayer/Config.in
index a9a4bb6114..77bf9dc995 100644
--- a/package/multimedia/mplayer/Config.in
+++ b/package/multimedia/mplayer/Config.in
@@ -1,5 +1,8 @@
 config BR2_PACKAGE_MPLAYER
 	bool "mplayer"
+	# "Error: unsupported architecture sh4a" says mplayer
+	# configure script.
+	depends on !BR2_sh4a && !BR2_sh4aeb
 	help
 	  MPlayer is a movie player which runs on many systems and supports
 	  many different file formats.

From d070d1f7ba6449d87444512a5cca5f8582ea1f4e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 19 Sep 2012 06:23:57 +0000
Subject: [PATCH 2690/6849] dhcp: security bump to version 4.1-ESV-R7

Bump dhcp to version 4.1-ESV-R7 to fix CVE-2012-3955

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index e5c9968b10..c9d0b41284 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DHCP_VERSION  = 4.1-ESV-R6
+DHCP_VERSION  = 4.1-ESV-R7
 DHCP_SITE     = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes
 DHCP_CONF_OPT = \

From fee31757683e39dba28527215e9e7fa6150c52cd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 19 Sep 2012 10:28:10 +0000
Subject: [PATCH 2691/6849] leafpad: needs host-intltool

Fixes:

  http://autobuild.buildroot.org/results/d313a67b3deca262844d1043eafa5f6c5b6b7cad/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/leafpad/leafpad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index ede8c582c1..b06e655d60 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -6,7 +6,7 @@
 LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
-LEAFPAD_DEPENDENCIES = libgtk2
+LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
 
 $(eval $(autotools-package))
 

From 9f996396d5ec8e6de6882695de970f24cfcfe59d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Sep 2012 10:03:33 +0000
Subject: [PATCH 2692/6849] fbdump: only build VGA16 support on x86/x86-64

The VGA16 dumping feature probably doesn't make much sense on anything
else than x86 and x86-64, as it is accessing I/O ports that seem
PC-specific.

Moreover, some architectures such as SH4, do not have an
implementation of outw() in uClibc, but we quite certainly don't care
about VGA16 support for such architectures.

Fixes:

  http://autobuild.buildroot.org/results/e1c860830dd585830cf5ca5f935b81856e992334/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbdump/fbdump.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index 3ca10bf1e5..820ae9682c 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -9,4 +9,13 @@ FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
 FBDUMP_LICENSE = GPLv2
 FBDUMP_LICENSE_FILES = COPYING
 
+# The VGA16 specific feature of fbdump doesn't make much sense outside
+# of the x86/x86-64 architectures, and causes build problems on some
+# architectures as outw() is not always available.
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+FBDUMP_CONF_OPT += --enable-vga16fb
+else
+FBDUMP_CONF_OPT += --disable-vga16fb
+endif
+
 $(eval $(autotools-package))

From 300cd640ecc6aa54c43ffeb1fc6aa4750c70885b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 12:57:46 +0000
Subject: [PATCH 2693/6849] gettext: remove option to build statically

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/Config.in  | 12 ------------
 package/gettext/gettext.mk |  9 ---------
 2 files changed, 21 deletions(-)

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index fabfe1ef71..0ee4065c4d 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -12,18 +12,6 @@ config BR2_PACKAGE_GETTEXT
 comment "gettext requires a toolchain with WCHAR support"
 	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
 
-config BR2_PACKAGE_GETTEXT_STATIC
-	bool "Use libgettext.a instead of libgettext.so.*"
-	depends on BR2_PACKAGE_GETTEXT
-	depends on BR2_arm
-	help
-	  The GNU `gettext' utilities are a set of tools that provide a
-	  framework to help other GNU packages produce multi-lingual
-	  messages.
-
-	  http://www.gnu.org/software/gettext/
-
-
 config BR2_PACKAGE_LIBINTL
 	bool "libintl"
 	depends on BR2_NEEDS_GETTEXT
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 97780073fc..20bd672737 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -11,11 +11,7 @@ GETTEXT_CAT:=$(ZCAT)
 GETTEXT_BINARY:=gettext-runtime/src/gettext
 GETTEXT_TARGET_BINARY:=usr/bin/gettext
 
-ifeq ($(BR2_PACKAGE_GETTEXT_STATIC),y)
-LIBINTL_TARGET_BINARY:=usr/lib/libintl.a
-else
 LIBINTL_TARGET_BINARY:=usr/lib/libintl.so
-endif
 
 $(DL_DIR)/$(GETTEXT_SOURCE):
 	 $(call DOWNLOAD,$(GETTEXT_SITE)/$(GETTEXT_SOURCE))
@@ -147,11 +143,6 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 		libgettext*.so*.la libintl*.so*.la)
 	touch -c $@
 
-$(TARGET_DIR)/usr/lib/libintl.a: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
-	cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.a $(TARGET_DIR)/usr/lib/
-	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.a $(TARGET_DIR)/usr/lib/
-	touch -c $@
-
 libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)
 
 #############################################################

From cd54bec3adbc41151151acbcdd069de99a181985 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 12:57:47 +0000
Subject: [PATCH 2694/6849] gettext: remove the gettext-target make target,
 unused

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 20bd672737..6b2c336d0b 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -130,10 +130,6 @@ gettext-dirclean:
 #
 #############################################################
 
-gettext-target: $(GETTEXT_DIR)/$(GETTEXT_BINARY)
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(GETTEXT_DIR) install
-	chmod +x $(TARGET_DIR)/usr/lib/libintl.so* # identify as needing to be stripped
-
 $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 	cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.so* \
 		$(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/

From 9a07346054e6e5e8e8bee0d16eabaaee9ba97bd3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 12:57:48 +0000
Subject: [PATCH 2695/6849] gettext: remove libintl handling

Now, the gettext package always:

 * install everything to the staging directory
 * install the libraries to the target directory

Note that this commit removes BR2_PACKAGE_LIBINTL without updating the
packages, it is done in a separate commit to ease the review process.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: keep BR2_PACKAGE_LIBINTL as blind option]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/Config.in  | 14 ++++++--------
 package/gettext/gettext.mk |  7 +------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 0ee4065c4d..04f7de673c 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -7,17 +7,15 @@ config BR2_PACKAGE_GETTEXT
 	  framework to help other GNU packages produce multi-lingual
 	  messages.
 
+	  Only the gettext libraries will be installed in the
+	  target. The full gettext suite, including tools, will be
+	  installed in the staging directory.
+
 	  http://www.gnu.org/software/gettext/
 
 comment "gettext requires a toolchain with WCHAR support"
 	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
 
 config BR2_PACKAGE_LIBINTL
-	bool "libintl"
-	depends on BR2_NEEDS_GETTEXT
-	depends on BR2_USE_WCHAR
-	help
-	  Selecting this package installs all of gettext in the staging
-	  directory and the shared library for it's use in the target.
-
-	  http://www.gnu.org/software/gettext/
+	bool
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 6b2c336d0b..4dff941625 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -112,7 +112,7 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY)
 gettext-legal-info:
 	@$(call legal-warning-pkg,gettext,legal-info not yet implemented)
 
-gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
+gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)
 
 gettext-unpacked: $(GETTEXT_DIR)/.unpacked
 
@@ -139,16 +139,11 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 		libgettext*.so*.la libintl*.so*.la)
 	touch -c $@
 
-libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)
-
 #############################################################
 #
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-TARGETS+=libintl
-endif
 ifeq ($(BR2_PACKAGE_GETTEXT),y)
 TARGETS+=gettext
 endif

From bbcbed1829057121f9f9459f62f913626206e823 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 12:57:49 +0000
Subject: [PATCH 2696/6849] Remove all references to libintl

From now on, packages only need to select the BR2_PACKAGE_GETTEXT
option and depend on the 'gettext' package to get the necessary i18n
libraries installed on the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: remove BR2_PACKAGE_LIBINTL]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/Config.in                     | 1 -
 package/avahi/avahi.mk                      | 6 +++---
 package/axel/Config.in                      | 1 -
 package/axel/axel.mk                        | 2 +-
 package/binutils/Config.in                  | 1 -
 package/binutils/binutils.mk                | 2 +-
 package/diffutils/diffutils.mk              | 3 +--
 package/dnsmasq/Config.in                   | 1 -
 package/dnsmasq/dnsmasq.mk                  | 2 +-
 package/flex/flex.mk                        | 3 +--
 package/gdk-pixbuf/Config.in                | 1 -
 package/gdk-pixbuf/gdk-pixbuf.mk            | 2 +-
 package/gettext/Config.in                   | 4 ----
 package/glib-networking/Config.in           | 1 -
 package/glib-networking/glib-networking.mk  | 2 +-
 package/gmpc/Config.in                      | 1 -
 package/gmpc/gmpc.mk                        | 2 +-
 package/grep/Config.in                      | 1 -
 package/grep/grep.mk                        | 2 +-
 package/kbd/Config.in                       | 1 -
 package/kbd/kbd.mk                          | 2 +-
 package/libglib2/Config.in                  | 1 -
 package/libglib2/libglib2.mk                | 2 +-
 package/libsoup/Config.in                   | 1 -
 package/libsoup/libsoup.mk                  | 2 +-
 package/linux-pam/Config.in                 | 1 -
 package/linux-pam/linux-pam.mk              | 4 ++--
 package/lshw/lshw.mk                        | 2 +-
 package/make/Config.in                      | 1 -
 package/make/make.mk                        | 2 +-
 package/midori/Config.in                    | 1 -
 package/midori/midori.mk                    | 2 +-
 package/multimedia/pulseaudio/Config.in     | 2 +-
 package/multimedia/pulseaudio/pulseaudio.mk | 2 +-
 package/ndisc6/ndisc6.mk                    | 4 ++--
 package/pango/Config.in                     | 1 -
 package/pango/pango.mk                      | 2 +-
 package/psmisc/Config.in                    | 1 -
 package/psmisc/psmisc.mk                    | 2 +-
 package/quota/Config.in                     | 1 -
 package/quota/quota.mk                      | 2 +-
 package/sshfs/Config.in                     | 1 -
 package/sshfs/sshfs.mk                      | 2 +-
 package/sysstat/Config.in                   | 1 -
 package/sysstat/sysstat.mk                  | 2 +-
 package/ushare/Config.in                    | 1 -
 package/ushare/ushare.mk                    | 2 +-
 package/util-linux/util-linux.mk            | 4 ++--
 package/vala/Config.in                      | 1 -
 package/vala/vala.mk                        | 2 +-
 50 files changed, 33 insertions(+), 60 deletions(-)

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index eb3ccb67b0..8ba33d5e70 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_AVAHI
 	bool "avahi"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Avahi is a system which facilitates service
 	  discovery on a local network.
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index a26481d4eb..03dc36859f 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -85,7 +85,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--with-autoipd-user=default \
 		--with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool host-pkg-config
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkg-config
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon
@@ -133,8 +133,8 @@ else
 AVAHI_CONF_OPT += --disable-python
 endif
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-AVAHI_DEPENDENCIES += libintl
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+AVAHI_DEPENDENCIES += gettext
 AVAHI_MAKE_OPT = LIBS=-lintl
 endif
 
diff --git a/package/axel/Config.in b/package/axel/Config.in
index 98f4941096..d8232725c2 100644
--- a/package/axel/Config.in
+++ b/package/axel/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_AXEL
 	bool "axel"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  HTTP/FTP download accelerator.
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 893caf1248..0ed8ad2e1c 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -10,7 +10,7 @@ AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
 AXEL_LDFLAGS = -lpthread
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-AXEL_DEPENDENCIES += gettext libintl
+AXEL_DEPENDENCIES += gettext
 AXEL_LDFLAGS += -lintl
 endif
 
diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index e068b20d40..64803706e3 100644
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_BINUTILS
 	bool "binutils"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Install binutils on the target
 
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index a91879a701..d41cac4e9c 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -23,7 +23,7 @@ BINUTILS_SITE = ftp://www.at91.com/pub/buildroot
 endif
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
 BINUTILS_INSTALL_STAGING = YES
-BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # We need to specify host & target to avoid breaking ARM EABI
 BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index d6029a4e60..168d040248 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -7,8 +7,7 @@
 DIFFUTILS_VERSION = 3.2
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
-	$(if $(BR2_PACKAGE_LIBINTL),libintl)
+	$(if $(BR2_PACKAGE_GETTEXT),gettext)
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index e67aa46170..b76ddb2cc3 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -25,7 +25,6 @@ config BR2_PACKAGE_DNSMASQ_IDN
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBIDN
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Enable IDN support in dnsmasq.
 	  This option is a big space taker since it pulls in many libraries.
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 1f714bf577..e92a554ace 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -24,7 +24,7 @@ endif
 
 # NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
-	DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+	DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
 	DNSMASQ_COPTS += -DHAVE_IDN
 	DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 16f6801769..2599cdc75f 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -12,8 +12,7 @@ FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
 FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
 FLEX_INSTALL_STAGING = YES
 FLEX_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
-	$(if $(BR2_PACKAGE_LIBINTL),libintl)
+	$(if $(BR2_PACKAGE_GETTEXT),gettext)
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES =
 
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 28a0f12c1a..33b5f7c862 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Gdk-Pixbuf is an image loader and scaler. It uses GObject
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 0d9e20600a..92a34bfcf2 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -40,7 +40,7 @@ GDK_PIXBUF_DEPENDENCIES += xlib_libX11
 endif
 
 GDK_PIXBUF_DEPENDENCIES += \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
 	host-pkg-config libglib2
 
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 04f7de673c..de19410003 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -15,7 +15,3 @@ config BR2_PACKAGE_GETTEXT
 
 comment "gettext requires a toolchain with WCHAR support"
 	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
-
-config BR2_PACKAGE_LIBINTL
-	bool
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index 16f0d4a22f..dab35eaba2 100644
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_GLIB_NETWORKING
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	help
 	  Network-related GIO modules for glib.
 
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 385ad47fc7..823ba39486 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -13,7 +13,7 @@ GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 GLIB_NETWORKING_INSTALL_STAGING = YES
 
 GLIB_NETWORKING_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	host-pkg-config \
 	host-intltool \
 	libglib2
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index f86945c9e8..9b38d1a4f0 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_GMPC
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBMPD
 	select BR2_PACKAGE_LIBSOUP
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 51d0cd9536..a136cf4fe1 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -11,6 +11,6 @@ GMPC_CONF_OPT = --disable-mmkeys --disable-unique
 GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkg-config host-vala \
 	libglib2 libgtk2 libmpd libsoup sqlite \
 	xlib_libICE xlib_libSM xlib_libX11 \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 $(eval $(autotools-package))
diff --git a/package/grep/Config.in b/package/grep/Config.in
index 1b39922fca..5906e698af 100644
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GREP
 	bool "grep"
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  The GNU regular expression matcher.
 
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index a02fe2c92b..2636c83b78 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -10,7 +10,7 @@ GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_LICENSE = GPLv3+
 GREP_LICENSE_FILES = COPYING
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
-GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # link with iconv if enabled
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
diff --git a/package/kbd/Config.in b/package/kbd/Config.in
index a23b70a81f..44c3163388 100644
--- a/package/kbd/Config.in
+++ b/package/kbd/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_KBD
 	bool "kbd"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	# Uses fork()
 	depends on BR2_USE_MMU
 	help
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index a52ad5ac7f..325978e6cc 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -2,6 +2,6 @@ KBD_VERSION = 1.15.2
 KBD_SOURCE = kbd-$(KBD_VERSION).tar.gz
 KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 
-KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 $(eval $(autotools-package))
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index d1d7231b00..5282885b8b 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBGLIB2
 	bool "libglib2"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBFFI
 	select BR2_PACKAGE_ZLIB
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 2b2bd32f5f..030cecbc23 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -55,7 +55,7 @@ HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
 
-LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
 
 HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
 
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index f40625d487..57b425f283 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
 	  and the GLib main loop, to integrate well with GNOME
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index fe1a41c6ec..30655ba303 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,7 +19,7 @@ endif
 
 LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config host-libglib2 libglib2 libxml2
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking
diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 722b87576d..7cfd8147a5 100644
--- a/package/linux-pam/Config.in
+++ b/package/linux-pam/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LINUX_PAM
 	bool "linux-pam"
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_FLEX
 	select BR2_PACKAGE_FLEX_LIBFL
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 48cb073943..1a2e7f6bf7 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -15,12 +15,12 @@ LINUX_PAM_CONF_OPT = \
 	--disable-regenerate-docu \
 	--enable-securedir=/lib/security \
 	--libdir=/lib
-LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) flex
+LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) flex
 LINUX_PAM_AUTORECONF = YES
 LINUX_PAM_LICENSE = BSD-3c
 LINUX_PAM_LICENSE_FILES = Copyright
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 	LINUX_PAM_MAKE_OPT += LIBS=-lintl
 endif
 
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index a53c1073ee..68daa0d5f3 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -9,7 +9,7 @@ LSHW_SITE = http://ezix.org/software/files
 LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
 	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
 LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)"
-LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),libintl)
+LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext)
 
 define LSHW_BUILD_CMDS
 	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
diff --git a/package/make/Config.in b/package/make/Config.in
index 364bb1e18a..ea2ae1b58b 100644
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MAKE
 	bool "make"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A tool which controls the generation of executables and other
 	  non-source files of a program from the program's source files.
diff --git a/package/make/make.mk b/package/make/make.mk
index a0981c7181..02b2741fd8 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -7,7 +7,7 @@ MAKE_VERSION:=3.81
 MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE:=$(BR2_GNU_MIRROR)/make
 
-MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
 		GLOBINC='-I$(@D)/glob' \
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 49867e4277..41f451588d 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_MIDORI
 	select BR2_PACKAGE_WEBKIT
 	select BR2_PACKAGE_LIBSEXY
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_INSTALL_LIBSTDCPP # webkit
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 87559bb05f..33f94cf5d3 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -14,7 +14,7 @@ MIDORI_DEPENDENCIES = \
 	libgtk2 \
 	libsexy \
 	webkit \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 ifneq ($(BR2_PACKAGE_XORG7),y)
diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index 6e6d64c66e..6c767bb6b9 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_PULSEAUDIO
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_LIBSNDFILE
 	select BR2_PACKAGE_SPEEX
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  PulseAudio is a sound system for POSIX OSes, meaning that it
 	  is a proxy for your sound applications. It allows you to do
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 13d87709e6..6f7d7d2e37 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -16,7 +16,7 @@ PULSEAUDIO_CONF_OPT = \
 
 PULSEAUDIO_DEPENDENCIES = \
 	host-pkg-config libtool json-c libsndfile speex host-intltool \
-	$(if $(BR2_PACKAGE_LIBINTL),libintl) \
+	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
 	$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index eb30e11aaa..f58cc13bea 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -10,8 +10,8 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
 NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-NDISC6_DEPENDENCIES += libintl
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+NDISC6_DEPENDENCIES += gettext
 NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
 endif
 
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 923c3d4ac2..60e9931a43 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Pango is a library for laying out and rendering of text, with an
 	  emphasis on internationalization. Pango can be used anywhere that
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index efb722dc93..86ab474aba 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -41,7 +41,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
 
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config libglib2 cairo
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
         PANGO_CONF_OPT += --with-x \
diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in
index a13820426c..cc8420b7bb 100644
--- a/package/psmisc/Config.in
+++ b/package/psmisc/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_PSMISC
 	bool "psmisc"
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Helpful /proc related utilities such as pstree, fuser, and killall
 
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 3132b708ac..5d2333fd28 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -8,7 +8,7 @@ PSMISC_VERSION = 22.16
 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
 PSMISC_LICENSE = GPLv2
 PSMISC_LICENSE_FILES = COPYING
-PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
 # Don't force -fstack-protector
diff --git a/package/quota/Config.in b/package/quota/Config.in
index 6c2beff04c..3ad0b8cee3 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_QUOTA
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_MOUNT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Implementation of the disk quota system.
 
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 7602e93053..abe3675207 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -11,7 +11,7 @@ QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(Q
 QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-QUOTA_DEPENDENCIES = gettext libintl
+QUOTA_DEPENDENCIES = gettext
 QUOTA_MAKE_OPT += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
 endif
 
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 73d552fa0a..37188ba82e 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_SSHFS
 	select BR2_PACKAGE_LIBFUSE
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_OPENSSH
 	depends on BR2_LARGEFILE
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 67b9c7f53f..e72db0aad9 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -9,7 +9,7 @@ SSHFS_SITE = http://downloads.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VE
 SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = \
 	libglib2 libfuse openssh \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv)
 
 $(eval $(autotools-package))
diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in
index 6e62ff1584..ceba5030b4 100644
--- a/package/sysstat/Config.in
+++ b/package/sysstat/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_SYSSTAT
 	bool "sysstat"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	# Uses fork()
 	depends on BR2_USE_MMU
 	help
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 9d91a423fd..83609a02e5 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -14,7 +14,7 @@ SYSSTAT_CONF_OPT += --disable-documentation
 endif
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-SYSSTAT_DEPENDENCIES += gettext libintl
+SYSSTAT_DEPENDENCIES += gettext
 SYSSTAT_MAKE_OPT += CFLAGS+=-lintl
 endif
 
diff --git a/package/ushare/Config.in b/package/ushare/Config.in
index acf025fa5b..f7b2124de7 100644
--- a/package/ushare/Config.in
+++ b/package/ushare/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_USHARE
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_LIBUPNP
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  uShare is a UPnP (TM) A/V & DLNA Media Server.
 	  It implements the server component that provides UPnP media devices
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 2d8bca57ce..78cbcdaac1 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -10,7 +10,7 @@ USHARE_SITE = http://ushare.geexbox.org/releases
 USHARE_DEPENDENCIES = host-pkg-config libupnp
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-USHARE_DEPENDENCIES += gettext libintl
+USHARE_DEPENDENCIES += gettext
 USHARE_LDFLAGS += -lintl
 endif
 
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index ddc9c1254e..71a6c533a4 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -29,8 +29,8 @@ else
 UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-UTIL_LINUX_DEPENDENCIES += libintl
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+UTIL_LINUX_DEPENDENCIES += gettext
 UTIL_LINUX_MAKE_OPT += LIBS=-lintl
 endif
 
diff --git a/package/vala/Config.in b/package/vala/Config.in
index 89b4459332..e0d665c892 100644
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_VALA
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Compiler for the GObject type system.
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 73ac8ee2ab..e4b8b54da5 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -11,7 +11,7 @@ VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
 
 VALA_DEPENDENCIES = host-flex libglib2 \
-		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # If we want the documentation, then xsltproc is needed. If we don't
 # want the documentation, force Vala to not use the host xsltproc even

From bce64eed99f18840435a94fa0b9f83ebf95de944 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sun, 16 Sep 2012 12:57:50 +0000
Subject: [PATCH 2697/6849] gettext: convert to autotools-package

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: add license info, build libintl if locales disabled]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/Config.in  |  10 ++-
 package/gettext/gettext.mk | 172 +++++++------------------------------
 2 files changed, 40 insertions(+), 142 deletions(-)

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index de19410003..ee7d8cb209 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -7,11 +7,19 @@ config BR2_PACKAGE_GETTEXT
 	  framework to help other GNU packages produce multi-lingual
 	  messages.
 
-	  Only the gettext libraries will be installed in the
+	  Only the libintl library will be installed in the
 	  target. The full gettext suite, including tools, will be
 	  installed in the staging directory.
 
 	  http://www.gnu.org/software/gettext/
 
+config BR2_PACKAGE_GETTEXT_TOOLS
+	bool "Install gettext tools"
+	depends on BR2_PACKAGE_GETTEXT
+	help
+	  This option allows to install the complete gettext suite in
+	  the target filesystem. This is typically not useful for
+	  correct operation of programs.
+
 comment "gettext requires a toolchain with WCHAR support"
 	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 4dff941625..74f5218099 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -3,147 +3,37 @@
 # gettext
 #
 #############################################################
-GETTEXT_VERSION:=0.16.1
-GETTEXT_SOURCE:=gettext-$(GETTEXT_VERSION).tar.gz
-GETTEXT_SITE:=$(BR2_GNU_MIRROR)/gettext
-GETTEXT_DIR:=$(BUILD_DIR)/gettext-$(GETTEXT_VERSION)
-GETTEXT_CAT:=$(ZCAT)
-GETTEXT_BINARY:=gettext-runtime/src/gettext
-GETTEXT_TARGET_BINARY:=usr/bin/gettext
-
-LIBINTL_TARGET_BINARY:=usr/lib/libintl.so
-
-$(DL_DIR)/$(GETTEXT_SOURCE):
-	 $(call DOWNLOAD,$(GETTEXT_SITE)/$(GETTEXT_SOURCE))
-
-gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
-
-$(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
-	$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
-	$(call CONFIG_UPDATE,$(@D))
-	touch $@
-
-ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-IGNORE_EXTERNAL_GETTEXT:=--with-included-gettext
+GETTEXT_VERSION = 0.16.1
+GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
+GETTEXT_INSTALL_STAGING = YES
+GETTEXT_LICENSE = GPLv2+
+GETTEXT_LICENSE_FILES = COPYING
+
+GETTEXT_CONF_OPT += \
+	--disable-libasprintf \
+	--disable-openmp \
+	--disable-rpath \
+	--disable-java \
+	--disable-native-java \
+	--disable-csharp \
+	--disable-relocatable \
+	--without-emacs
+
+# Force build with NLS support, otherwise libintl is not built
+# This is needed because some packages (eg. libglib2) requires
+# locales, but do not properly depend on BR2_ENABLE_LOCALE, and
+# instead select BR2_PACKAGE_GETTEXT. Those packages need to be
+# fixed before we can remove the following 3 lines... :-(
+ifeq ($(BR2_ENABLE_LOCALE),)
+GETTEXT_CONF_OPT += --enable-nls
 endif
 
-$(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked
-	(cd $(GETTEXT_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		ac_cv_func_strtod=yes \
-		ac_fsusage_space=yes \
-		fu_cv_sys_stat_statfs2_bsize=yes \
-		ac_cv_func_closedir_void=no \
-		ac_cv_func_getloadavg=no \
-		ac_cv_lib_util_getloadavg=no \
-		ac_cv_lib_getloadavg_getloadavg=no \
-		ac_cv_func_getgroups=yes \
-		ac_cv_func_getgroups_works=yes \
-		ac_cv_func_chown_works=yes \
-		ac_cv_have_decl_euidaccess=no \
-		ac_cv_func_euidaccess=no \
-		ac_cv_have_decl_strnlen=yes \
-		ac_cv_func_strnlen_working=yes \
-		ac_cv_func_lstat_dereferences_slashed_symlink=yes \
-		ac_cv_func_lstat_empty_string_bug=no \
-		ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no \
-		ac_cv_have_decl_nanosleep=yes \
-		jm_cv_func_nanosleep_works=yes \
-		gl_cv_func_working_utimes=yes \
-		ac_cv_func_utime_null=yes \
-		ac_cv_have_decl_strerror_r=yes \
-		ac_cv_func_strerror_r_char_p=no \
-		jm_cv_func_svid_putenv=yes \
-		ac_cv_func_getcwd_null=yes \
-		ac_cv_func_getdelim=yes \
-		ac_cv_func_mkstemp=yes \
-		utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no \
-		jm_cv_func_gettimeofday_clobber=no \
-		gl_cv_func_working_readdir=yes \
-		jm_ac_cv_func_link_follows_symlink=no \
-		utils_cv_localtime_cache=no \
-		ac_cv_struct_st_mtim_nsec=no \
-		gl_cv_func_tzset_clobber=no \
-		gl_cv_func_getcwd_null=yes \
-		gl_cv_func_getcwd_path_max=yes \
-		ac_cv_func_fnmatch_gnu=yes \
-		am_getline_needs_run_time_check=no \
-		am_cv_func_working_getline=yes \
-		gl_cv_func_mkdir_trailing_slash_bug=no \
-		gl_cv_func_mkstemp_limitations=no \
-		ac_cv_func_working_mktime=yes \
-		jm_cv_func_working_re_compile_pattern=yes \
-		ac_use_included_regex=no \
-		gl_cv_c_restrict=no \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--disable-libasprintf \
-		--enable-shared \
-		$(IGNORE_EXTERNAL_GETTEXT) \
-		--disable-openmp \
-	)
-	touch $@
-
-$(GETTEXT_DIR)/$(GETTEXT_BINARY): $(GETTEXT_DIR)/.configured
-	$(MAKE) -C $(GETTEXT_DIR)
-	touch -c $(GETTEXT_DIR)/$(GETTEXT_BINARY)
-
-$(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY)
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(GETTEXT_DIR) install
-	$(SED) 's,/lib/,$(STAGING_DIR)/usr/lib/,g' $(STAGING_DIR)/usr/lib/libgettextlib.la
-	$(SED) 's,/lib/,$(STAGING_DIR)/usr/lib/,g' $(STAGING_DIR)/usr/lib/libgettextpo.la
-	$(SED) 's,/lib/,$(STAGING_DIR)/usr/lib/,g' $(STAGING_DIR)/usr/lib/libgettextsrc.la
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libgettextlib.la
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libgettextpo.la
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libgettextsrc.la
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libintl.la
-	rm -f $(addprefix $(STAGING_DIR)/usr/bin/, \
-		autopoint envsubst gettext.sh gettextize msg* ?gettext)
-	touch -c $@
-
-gettext-legal-info:
-	@$(call legal-warning-pkg,gettext,legal-info not yet implemented)
-
-gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)
-
-gettext-unpacked: $(GETTEXT_DIR)/.unpacked
-
-gettext-clean:
-	-$(MAKE) DESTDIR=$(STAGING_DIR) CC="$(TARGET_CC)" -C $(GETTEXT_DIR) uninstall
-	-$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(GETTEXT_DIR) uninstall
-	-$(MAKE) -C $(GETTEXT_DIR) clean
-
-gettext-dirclean:
-	rm -rf $(GETTEXT_DIR)
+# When the gettext tools are not enabled in the configuration, we only
+# install libintl to the target.
+ifeq ($(BR2_PACKAGE_GETTEXT_TOOLS),)
+define GETTEXT_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
+endef
+endif # GETTEXT_TOOLS = n
 
-#############################################################
-#
-# gettext on the target
-#
-#############################################################
-
-$(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
-	cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.so* \
-		$(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgettext*.so*
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libintl*.so*
-	rm -f $(addprefix $(TARGET_DIR)/usr/lib/, \
-		libgettext*.so*.la libintl*.so*.la)
-	touch -c $@
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-TARGETS+=gettext
-endif
+$(eval $(autotools-package))

From aa8ba9608db7ffc2e05fb06ed678cbe6ea813e89 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Sep 2012 12:57:51 +0000
Subject: [PATCH 2698/6849] doc: update after gettext changes

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-gettext.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt
index 1ed834e152..e0df1a412e 100644
--- a/docs/manual/adding-packages-gettext.txt
+++ b/docs/manual/adding-packages-gettext.txt
@@ -27,18 +27,14 @@ Therefore, Buildroot defines two configuration options:
 
 Therefore, packages that unconditionally need gettext should:
 
-* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT+ and possibly
-  +select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT+, if libintl is
-  also needed
+* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT+
 
 * Use +$(if $(BR2_NEEDS_GETTEXT),gettext)+ in the package
   +DEPENDENCIES+ variable
 
 Packages that need gettext only when locale support is enabled should:
 
-* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE+ and
-  possibly +select BR2_PACKAGE_LIBINTL if
-  BR2_NEEDS_GETTEXT_IF_LOCALE+, if libintl is also needed
+* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE+
 
 * Use +$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)+ in the package
   +DEPENDENCIES+ variable

From 0d5dbb936060d1912953c9f0423ecbc08c6a75f9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Sep 2012 12:57:52 +0000
Subject: [PATCH 2699/6849] package/lshw: add missing dependency on gettext

lshw.mk defines a build-dependency on gettext,
but not in its Config.in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lshw/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lshw/Config.in b/package/lshw/Config.in
index 4960ac9785..98beacd797 100644
--- a/package/lshw/Config.in
+++ b/package/lshw/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LSHW
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  lshw (Hardware Lister) is a small tool to provide
 	  detailed information on the hardware configuration of the machine.

From 34f3d66529496946dc1088a54e22b0ea583adc84 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Sep 2012 12:57:53 +0000
Subject: [PATCH 2700/6849] package/pulseaudio: fix build-dependency on gettext

In its Config.in, pulseaudio declares a dependency on gettext
using the documented construct:
    select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

but in its .mk file, declares a dependency on the package:
    PULSEAUDIO_DEPENDENCIES = [...] $(if $(BR2_PACKAGE_GETTEXT),gettext) [...]

instead of the documented:
    $(if $(BR2_NEEDS_GETTEXT),gettext)

Fix that.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 6f7d7d2e37..406dd8f408 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -16,7 +16,7 @@ PULSEAUDIO_CONF_OPT = \
 
 PULSEAUDIO_DEPENDENCIES = \
 	host-pkg-config libtool json-c libsndfile speex host-intltool \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
+	$(if $(BR2_NEEDS_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
 	$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \

From e04b4dc7b67fd27860bcd7049816921d8b865e7a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Sep 2012 07:21:36 +0000
Subject: [PATCH 2701/6849] alsa-lib: put BR2_PACKAGE_ALSA_LIB_PYTHON under the
 existing if condition

Instead of duplicating the "depends on BR2_PACKAGE_ALSA_LIB", just put
BR2_PACKAGE_ALSA_LIB_PYTHON under the existing condition "if
BR2_PACKAGE_ALSA_LIB".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsa-lib/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 98b83139d7..8123b5f3e5 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -10,9 +10,10 @@ config BR2_PACKAGE_ALSA_LIB
 
 	  http://www.alsa-project.org/
 
+if BR2_PACKAGE_ALSA_LIB
+
 config BR2_PACKAGE_ALSA_LIB_PYTHON
 	bool "Python support for alsa-lib"
-	depends on BR2_PACKAGE_ALSA_LIB
 	depends on BR2_PACKAGE_PYTHON
 	help
 	  Add python support for alsa-lib.
@@ -20,7 +21,6 @@ config BR2_PACKAGE_ALSA_LIB_PYTHON
 	  in the target directory
 	  http://www.alsa-project.org/
 
-if BR2_PACKAGE_ALSA_LIB
 menu "ALSA lib selection"
 
 config BR2_PACKAGE_ALSA_LIB_DEVDIR

From beb45605dba13fbe54e26a26e78fc6d51651d3eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Sep 2012 07:21:37 +0000
Subject: [PATCH 2702/6849] alsa-lib: require thread support

Some parts of alsa-lib correctly use threads only when available, but
some other parts, especially certain PCM plugins, unconditionally
require threads. While it would certainly be possible to fix alsa-lib
to only use threads when available, it probably doesn't make much
sense, since on an embedded system that has audio, we are probably
powerful enough to enable thread support in the C library.

Fixes:

  http://autobuild.buildroot.org/results/e14469be7f6171f4c8c0c09c8e32943819f7938b/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsa-lib/Config.in              | 8 ++++++++
 package/bluez_utils/Config.in           | 2 +-
 package/multimedia/alsa-utils/Config.in | 5 +++--
 package/multimedia/mpd/Config.in        | 1 +
 package/portaudio/Config.in             | 1 +
 package/qt/Config.in                    | 1 +
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 8123b5f3e5..ca063d8560 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -4,12 +4,20 @@ config BR2_PACKAGE_ALSA_LIB
 	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
 	# is fixed
 	select BR2_PACKAGE_ALSA_LIB_PCM
+	# Even though some parts of alsa-lib use threads only when
+	# available, some PCM plugins use them unconditionally. Since
+	# the usage of alsa-lib on no-thread systems is pretty
+	# unlikely, just require thread support globally for alsa-lib.
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 	  functionality to the Linux operating system.
 
 	  http://www.alsa-project.org/
 
+comment "alsa-lib needs threads support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 if BR2_PACKAGE_ALSA_LIB
 
 config BR2_PACKAGE_ALSA_LIB_PYTHON
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index d63284d26b..9836b211ec 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_BLUEZ_UTILS
 	bool "bluez-utils"
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	help
diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
index c65e33f83d..4bc12049e8 100644
--- a/package/multimedia/alsa-utils/Config.in
+++ b/package/multimedia/alsa-utils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ALSA_UTILS
 	bool "alsa-utils"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	select BR2_PACKAGE_ALSA_LIB
 	help
 	  This package contains the command line utilities for the ALSA
@@ -8,8 +9,8 @@ config BR2_PACKAGE_ALSA_UTILS
 
 	  http://www.alsa-project.org/
 
-comment "alsa-utils requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "alsa-utils requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 if BR2_PACKAGE_ALSA_UTILS
 menu "ALSA utils selection"
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index c7c0cd71a2..5d0818299f 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -21,6 +21,7 @@ config BR2_PACKAGE_MPD_ALSA
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_PCM
 	select BR2_PACKAGE_ALSA_LIB_MIXER
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	help
 	  Enable alsa output support.
 
diff --git a/package/portaudio/Config.in b/package/portaudio/Config.in
index f91acc0a28..df884a7f70 100644
--- a/package/portaudio/Config.in
+++ b/package/portaudio/Config.in
@@ -11,6 +11,7 @@ if BR2_PACKAGE_PORTAUDIO
 config BR2_PACKAGE_PORTAUDIO_ALSA
 	bool "alsa support"
 	select BR2_PACKAGE_ALSA_LIB
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	default y
 	help
 	  Compile with ALSA support.
diff --git a/package/qt/Config.in b/package/qt/Config.in
index b75f2243ff..b99bf4c195 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -315,6 +315,7 @@ config BR2_PACKAGE_QT_AUDIO_BACKEND
 	bool "QtMultimedia Audio backend"
 	depends on BR2_PACKAGE_QT_MULTIMEDIA
 	select BR2_PACKAGE_ALSA_LIB
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	help
 	  Build the ALSA audio backend into QtMultimedia
 

From 3dfc8573f6698a34e34af11f8d9ba0286938b8b9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Sep 2012 07:21:38 +0000
Subject: [PATCH 2703/6849] alsamixergui: use a normal 'select' statement for
 the alsa-lib dependency

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsamixergui/Config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
index 3afc31416c..39809d9193 100644
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -1,15 +1,16 @@
 config BR2_PACKAGE_ALSAMIXERGUI
 	depends on BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_ALSA_LIB
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_FLTK
+	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_PCM
 	select BR2_PACKAGE_ALSA_LIB_MIXER
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	bool "alsamixergui"
 	help
 	  A nice GUI mixer for Alsa using fltk
 
 	  http://www.iua.upf.es/~mdeboer/projects/alsamixergui/
 
-comment "alsamixergui requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7 && BR2_PACKAGE_ALSA_LIB
+comment "alsamixergui requires a toolchain with C++ and threads support enabled"
+	depends on (!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS) && BR2_PACKAGE_XORG7

From 7a3ceeed719d54fc664f3d4909e0f693d43a34b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 6 Sep 2012 02:34:42 +0000
Subject: [PATCH 2704/6849] dnsmasq: bump to version 2.63

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index e92a554ace..203a2e252a 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,11 +4,13 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.62
+DNSMASQ_VERSION = 2.63
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_LICENSE = Dual GPLv2/GPLv3
+DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
 ifneq ($(BR2_INET_IPV6),y)
 	DNSMASQ_COPTS += -DNO_IPV6

From ff67685ed9f11c885a4fa5ded08e44d5fcfb32a6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 4 Sep 2012 03:49:43 +0000
Subject: [PATCH 2705/6849] Move BR2_ARM_TYPE to an uClibc specific place

BR2_ARM_TYPE is a hidden configuration option that is only used for
the configuration of uClibc, therefore, we move it from
target/Config.arch.in to toolchain/uClibc/Config.in.

We also add a comment that explains that this stuff is only useful for
uClibc <= 0.9.32. Starting from 0.9.33, uClibc build process simply
uses the compiler flags to find the ARM processor that should be
used. So, someday, we'll be able to remove this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch      | 21 ---------------------
 toolchain/uClibc/Config.in | 24 ++++++++++++++++++++++++
 toolchain/uClibc/uclibc.mk |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 860bf439a2..548691d435 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -202,27 +202,6 @@ config BR2_iwmmxt
 	bool "iwmmxt"
 endchoice
 
-config BR2_ARM_TYPE
-	string
-	default GENERIC_ARM	if BR2_generic_arm
-	default ARM610		if BR2_arm610
-	default ARM710		if BR2_arm710
-	default ARM7TDMI	if BR2_arm7tdmi
-	default ARM720T		if BR2_arm720t
-	default ARM920T		if BR2_arm920t
-	default ARM922T		if BR2_arm922t
-	default ARM926T		if BR2_arm926t
-	default ARM10T		if BR2_arm10t
-	default ARM1136JF_S	if BR2_arm1136jf_s
-	default ARM1176JZ_S	if BR2_arm1176jz_s
-	default ARM1176JZF_S	if BR2_arm1176jzf_s
-	default ARM_SA110	if BR2_sa110
-	default ARM_SA1100	if BR2_sa1100
-	default ARM_XSCALE	if BR2_xscale
-	default ARM_IWMMXT	if BR2_iwmmxt
-	default ARM_CORTEXA8	if BR2_cortex_a8
-	default ARM_CORTEXA9	if BR2_cortex_a9
-
 choice
 	prompt "Target ABI"
 	depends on BR2_arm || BR2_armeb
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index d8b8a2a0cf..fbe617afd5 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -74,3 +74,27 @@ config BR2_UCLIBC_INSTALL_TEST_SUITE
 
 	  This is not needed at all for normal builds, so you can safely say no
 	  if you do not plan to dig into your C library.
+
+# This is only useful for uClibc <= 0.9.32. It can be removed once
+# Buildroot will support only uClibc >= 0.9.33 on ARM.
+config BR2_UCLIBC_ARM_TYPE
+	string
+	depends on BR2_arm || BR2_armeb
+	default GENERIC_ARM	if BR2_generic_arm
+	default ARM610		if BR2_arm610
+	default ARM710		if BR2_arm710
+	default ARM7TDMI	if BR2_arm7tdmi
+	default ARM720T		if BR2_arm720t
+	default ARM920T		if BR2_arm920t
+	default ARM922T		if BR2_arm922t
+	default ARM926T		if BR2_arm926t
+	default ARM10T		if BR2_arm10t
+	default ARM1136JF_S	if BR2_arm1136jf_s
+	default ARM1176JZ_S	if BR2_arm1176jz_s
+	default ARM1176JZF_S	if BR2_arm1176jzf_s
+	default ARM_SA110	if BR2_sa110
+	default ARM_SA1100	if BR2_sa1100
+	default ARM_XSCALE	if BR2_xscale
+	default ARM_IWMMXT	if BR2_iwmmxt
+	default ARM_CORTEXA8	if BR2_cortex_a8
+	default ARM_CORTEXA9	if BR2_cortex_a9
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 534550a07a..7b312d3240 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -49,7 +49,7 @@ else
 UCLIBC_NOT_TARGET_ENDIAN:=LITTLE
 endif
 
-UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_ARM_TYPE))
+UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_UCLIBC_ARM_TYPE))
 UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
 
 ifeq ($(GENERATE_LOCALE),)

From 218497de42c8f3205ea631ad7250d2b61d30b2f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 4 Sep 2012 03:49:44 +0000
Subject: [PATCH 2706/6849] Move BR2_SPARC_TYPE to an uClibc specific place

BR2_SPARC_TYPE is a hidden configuration option that is only used for
the configuration of uClibc, therefore, we move it from
target/Config.arch.in to toolchain/uClibc/Config.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch      | 5 -----
 toolchain/uClibc/Config.in | 6 ++++++
 toolchain/uClibc/uclibc.mk | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 548691d435..2233dd4956 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -499,11 +499,6 @@ config BR2_sparc_tsc701
 	bool "tsc701"
 endchoice
 
-config BR2_SPARC_TYPE
-	string
-	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
-	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
-
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_xtensa
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index fbe617afd5..f46a415ac9 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -98,3 +98,9 @@ config BR2_UCLIBC_ARM_TYPE
 	default ARM_IWMMXT	if BR2_iwmmxt
 	default ARM_CORTEXA8	if BR2_cortex_a8
 	default ARM_CORTEXA9	if BR2_cortex_a9
+
+config BR2_UCLIBC_SPARC_TYPE
+	string
+	depends on BR2_sparc
+	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
+	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 7b312d3240..20cc820ae5 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -50,7 +50,7 @@ UCLIBC_NOT_TARGET_ENDIAN:=LITTLE
 endif
 
 UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_UCLIBC_ARM_TYPE))
-UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
+UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
 
 ifeq ($(GENERATE_LOCALE),)
 # We need at least one locale

From 47a7a2771a728a1e89b8ea70d610c3670e783bf3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Sep 2012 03:55:23 +0000
Subject: [PATCH 2707/6849] u-boot: add version 2012.07

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in                                        | 6 +++++-
 ...ch => uboot-tools-2012.07-drop-configh-from-tools.patch} | 0
 ...ch => uboot-tools-2012.07-hostcflags-override-fix.patch} | 0
 package/uboot-tools/uboot-tools.mk                          | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 rename package/uboot-tools/{uboot-tools-2012.04.01-drop-configh-from-tools.patch => uboot-tools-2012.07-drop-configh-from-tools.patch} (100%)
 rename package/uboot-tools/{uboot-tools-2012.04.01-hostcflags-override-fix.patch => uboot-tools-2012.07-hostcflags-override-fix.patch} (100%)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 900fac7fc0..7f3cae00e0 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2012_04
+	default BR2_TARGET_UBOOT_2012_07
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2012_07
+	bool "2012.07"
+
 config BR2_TARGET_UBOOT_2012_04
 	bool "2012.04.01"
 
@@ -50,6 +53,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
diff --git a/package/uboot-tools/uboot-tools-2012.04.01-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-2012.04.01-drop-configh-from-tools.patch
rename to package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch
diff --git a/package/uboot-tools/uboot-tools-2012.04.01-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-2012.04.01-hostcflags-override-fix.patch
rename to package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 53764f76f0..7628b77b8b 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -1,4 +1,4 @@
-UBOOT_TOOLS_VERSION = 2012.04.01
+UBOOT_TOOLS_VERSION = 2012.07
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 

From b189c516d4fd810a95feaff34da97579783f5e5b Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sun, 26 Aug 2012 11:57:04 +0000
Subject: [PATCH 2708/6849] uboot: improve help text of
 BR2_TARGET_UBOOT_BOARDNAME

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 7f3cae00e0..87f65619eb 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -9,6 +9,8 @@ config BR2_TARGET_UBOOT_BOARDNAME
 	help
 	  One of U-Boot supported boards to be built.
 	  This will be suffixed with _config to meet U-Boot standard naming.
+	  See boards.cfg in U-Boot source code for the list of available
+	  configurations.
 
 choice
 	prompt "U-Boot Version"

From 669d07bdd47ac6789886729fa635db55dd352ae2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 4 Sep 2012 04:04:06 +0000
Subject: [PATCH 2709/6849] Remove the Xtensa architecture

As stated in commit 555c2585bf28c3ef71f6d2dcdd983d17a19892af, the
Xtensa architecture has been introduced in 2009 and never changed
since its initial introduction. It requires some special handling that
is a bit annoying, and despite our call to the initial developers, and
the announcement of the deprecation of the architecture during the
2012.05, nothing has happened. Therefore, drop support for this
architecture.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: me
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                   |   3 -
 linux/Config.in                            |   2 +-
 package/ltrace/Config.in                   |   2 +-
 target/Config.in.arch                      |  40 --
 target/device/xtensa/device_table.txt      | 189 --------
 target/xtensa/.gitignore                   |   1 -
 target/xtensa/Makefile.in                  |   1 -
 target/xtensa/defconfig                    | 129 ------
 target/xtensa/patch.in                     |  33 --
 target/xtensa/setup-config                 |  57 ---
 target/xtensa/uClibc-0.9.30.config         | 245 -----------
 target/xtensa/uClibc.config                | 190 --------
 target/xtensa/xt-buildroot-overlay-install | 488 ---------------------
 toolchain/gcc/gcc-uclibc-4.x.mk            |   7 +-
 toolchain/gdb/gdb.mk                       |   7 +-
 toolchain/toolchain-common.in              |   2 +-
 toolchain/uClibc/uclibc.mk                 |   1 -
 17 files changed, 5 insertions(+), 1392 deletions(-)
 delete mode 100644 target/device/xtensa/device_table.txt
 delete mode 100644 target/xtensa/.gitignore
 delete mode 100644 target/xtensa/Makefile.in
 delete mode 100644 target/xtensa/defconfig
 delete mode 100644 target/xtensa/patch.in
 delete mode 100644 target/xtensa/setup-config
 delete mode 100644 target/xtensa/uClibc-0.9.30.config
 delete mode 100644 target/xtensa/uClibc.config
 delete mode 100644 target/xtensa/xt-buildroot-overlay-install

diff --git a/Makefile b/Makefile
index ba5da990d3..6536bca9bf 100644
--- a/Makefile
+++ b/Makefile
@@ -231,9 +231,6 @@ QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
 
 # Strip off the annoying quoting
 ARCH:=$(call qstrip,$(BR2_ARCH))
-ifeq ($(ARCH),xtensa)
-ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
-endif
 
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
diff --git a/linux/Config.in b/linux/Config.in
index ff2700a597..6e174ba9dd 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -153,7 +153,7 @@ config BR2_LINUX_KERNEL_BZIMAGE
 
 config BR2_LINUX_KERNEL_ZIMAGE
 	bool "zImage"
-	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64 || BR2_xtensa
+	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64
 
 config BR2_LINUX_KERNEL_APPENDED_ZIMAGE
 	bool "zImage with appended DT"
diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 9e71d827a5..a65ca481e7 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
+	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
diff --git a/target/Config.in.arch b/target/Config.in.arch
index 2233dd4956..639327a31c 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -138,13 +138,6 @@ config BR2_x86_64
 	  architecture compatible microprocessor).
 	  http://en.wikipedia.org/wiki/X86_64
 
-config BR2_xtensa
-	bool "Xtensa"
-	depends on BR2_DEPRECATED
-	help
-	  Xtensa is a Tensilica processor IP architecture.
-	  http://en.wikipedia.org/wiki/Xtensa
-	  http://www.tensilica.com/
 endchoice
 
 config BR2_microblaze
@@ -499,38 +492,6 @@ config BR2_sparc_tsc701
 	bool "tsc701"
 endchoice
 
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_xtensa
-	default BR2_xtensa_dc232b
-	help
-	  Specific CPU variant to use
-
-config BR2_xtensa_custom
-	bool "Custom Xtensa processor configuration"
-config BR2_xtensa_dc232a
-	bool "dc232a - Diamond 232L Standard Core Rev.A (LE)"
-config BR2_xtensa_dc232b
-	bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
-#config BR2_xtensa_s5000
-#	bool "s5000 - Stretch S5000"
-endchoice
-
-config BR2_xtensa_custom_name
-	string "Custom Xtensa processor configuration name"
-	depends on BR2_xtensa_custom
-	default ""
-	help
-	  Name given to a custom Xtensa processor configuration.
-	  This is used to select the correct overlay.
-
-config BR2_xtensa_core_name
-	string
-	default BR2_xtensa_custom_name	if BR2_xtensa_custom
-	default "dc232a"		if BR2_xtensa_dc232a
-	default "dc232b"		if BR2_xtensa_dc232b
-#	default "s5000"			if BR2_xtensa_s5000
-
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_powerpc
@@ -665,7 +626,6 @@ config BR2_ARCH
 	default "sh4aeb"	if BR2_sh4aeb
 	default "sh64"		if BR2_sh64
 	default "sparc"		if BR2_sparc
-	default "xtensa"	if BR2_xtensa
 
 
 config BR2_ENDIAN
diff --git a/target/device/xtensa/device_table.txt b/target/device/xtensa/device_table.txt
deleted file mode 100644
index d0c7467973..0000000000
--- a/target/device/xtensa/device_table.txt
+++ /dev/null
@@ -1,189 +0,0 @@
-# When building a target filesystem, it is desirable to not have to
-# become root and then run 'mknod' a thousand times.  Using a device 
-# table you can create device nodes and directories "on the fly".
-#
-# This is a sample device table file for use with genext2fs.  You can
-# do all sorts of interesting things with a device table file.  For
-# example, if you want to adjust the permissions on a particular file
-# you can just add an entry like:
-#   /sbin/foobar        f       2755    0       0       -       -       -       -       -
-# and (assuming the file /sbin/foobar exists) it will be made setuid
-# root (regardless of what its permissions are on the host filesystem.
-# Furthermore, you can use a single table entry to create a many device
-# minors.  For example, if I wanted to create /dev/hda and /dev/hda[0-15]
-# I could just use the following two table entries:
-#   /dev/hda    b       640     0       0       3       0       0       0       -
-#   /dev/hda    b       640     0       0       3       1       1       1       15
-# 
-# Device table entries take the form of:
-# <name>    <type>      <mode>  <uid>   <gid>   <major> <minor> <start> <inc>   <count>
-# where name is the file name,  type can be one of: 
-#       f       A regular file
-#       d       Directory
-#       c       Character special device file
-#       b       Block special device file
-#       p       Fifo (named pipe)
-# uid is the user id for the target file, gid is the group id for the
-# target file.  The rest of the entries (major, minor, etc) apply only 
-# to device special files.
-
-# Have fun
-# -Erik Andersen <andersen@codepoet.org>
-#
-
-#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-/dev		d	755	0	0	-	-	-	-	-
-/dev/pts	d	755	0	0	-	-	-	-	-
-/dev/shm	d	755	0	0	-	-	-	-	-
-/tmp		d	1777	0	0	-	-	-	-	-
-/etc		d	755	0	0	-	-	-	-	-
-/home/default	d	2755	1000	1000	-	-	-	-	-
-#<name>					<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-/bin/busybox				f	4755	0	0	-	-	-	-	-
-/etc/shadow				f	600	0	0	-	-	-	-	-
-/etc/passwd				f	644	0	0	-	-	-	-	-
-/etc/network/if-up.d			d	755	0	0	-	-	-	-	-
-/etc/network/if-pre-up.d		d	755	0	0	-	-	-	-	-
-/etc/network/if-down.d			d	755	0	0	-	-	-	-	-
-/etc/network/if-post-down.d		d	755	0	0	-	-	-	-	-
-/usr/share/udhcpc/default.script	f	755	0	0	-	-	-	-	-
-# uncomment this to allow starting x as non-root
-#/usr/X11R6/bin/Xfbdev		f	4755	0	0	-	-	-	-	-
-# Normal system devices
-/dev/mem	c	640	0	0	1	1	0	0	-
-/dev/kmem	c	640	0	0	1	2	0	0	-
-/dev/null	c	666	0	0	1	3	0	0	-
-/dev/zero	c	666	0	0	1	5	0	0	-
-/dev/random	c	666	0	0	1	8	0	0	-
-/dev/urandom	c	666	0	0	1	9	0	0	-
-/dev/ram	b	640	0	0	1	1	0	0	-
-/dev/ram	b	640	0	0	1	0	0	1	4
-/dev/loop	b	640	0	0	7	0	0	1	2
-/dev/rtc	c	640	0	0	10	135	-	-	-
-/dev/console	c	666	0	0	5	1	-	-	-
-/dev/tty	c	666	0	0	5	0	-	-	-
-/dev/tty	c	666	0	0	4	0	0	1	8
-/dev/ttyp	c	666	0	0	3	0	0	1	10
-/dev/ptyp	c       666     0       0       2       0       0       1       10
-/dev/ptmx	c	666	0	0	5	2	-	-	-
-/dev/ttyP	c	666	0	0	57	0	0	1	4
-/dev/ttyS	c	666	0	0	4	64	0	1	4
-/dev/fb		c	640	0	5	29	0	0	1	4
-#/dev/ttySA	c	666	0	0	204	5	0	1	3
-/dev/psaux	c	666	0	0	10	1	0	0	-
-#/dev/ppp	c	666	0	0	108	0	-	-	-
-/dev/ttyCPM	c	666	0	0	204	46	0	1	4
-/dev/ttyAMA	c	666	0	0	204	64	0	1	4
-/dev/ttySAC	c	666	0	0	204	64	0	1	4
-/dev/ttyPSC	c	666	0	0	204	148	0	1	4
-/dev/ttyUL	c	666	0	0	204	187	0	1	4
-/dev/ttymxc	c	666	0	0	207	16	0	1	3
-
-# Input stuff
-/dev/input		d	755	0	0	-	-	-	-	-
-/dev/input/mice		c	640	0	0	13	63	0	0	-
-/dev/input/mouse	c	660	0	0	13	32	0	1	4
-/dev/input/event	c	660	0	0	13	64	0	1	4
-#/dev/input/js		c	660	0	0	13	0	0	1	4
-
-
-# MTD stuff
-/dev/mtd	c	640	0	0	90	0	0	2	4
-/dev/mtdblock	b	640	0	0	31	0	0	1	4
-
-#Tun/tap driver
-/dev/net	d	755	0	0	-	-	-	-	-
-/dev/net/tun	c	660	0	0	10	200	-	-	-
-
-# Audio stuff
-#/dev/audio	c	666	0	29	14	4	-	-	-
-#/dev/audio1	c	666	0	29	14	20	-	-	-
-#/dev/dsp	c	666	0	29	14	3	-	-	-
-#/dev/dsp1	c	666	0	29	14	19	-	-	-
-#/dev/sndstat	c	666	0	29	14	6	-	-	-
-
-# User-mode Linux stuff
-#/dev/ubda	b	640	0	0	98	0	0	0	-
-#/dev/ubda	b	640	0	0	98	1	1	1	15
-
-# IDE Devices
-/dev/hda	b	640	0	0	3	0	0	0	-
-/dev/hda	b	640	0	0	3	1	1	1	15
-/dev/hdb	b	640	0	0	3	64	0	0	-
-/dev/hdb	b	640	0	0	3	65	1	1	15
-#/dev/hdc	b	640	0	0	22	0	0	0	-
-#/dev/hdc	b	640	0	0	22	1	1	1	15
-#/dev/hdd	b	640	0	0	22	64	0	0	-
-#/dev/hdd	b	640	0	0	22	65	1	1	15
-#/dev/hde	b	640	0	0	33	0	0	0	-
-#/dev/hde	b	640	0	0	33	1	1	1	15
-#/dev/hdf	b	640	0	0	33	64	0	0	-
-#/dev/hdf	b	640	0	0	33	65	1	1	15
-#/dev/hdg	b	640	0	0	34	0	0	0	-
-#/dev/hdg	b	640	0	0	34	1	1	1	15
-#/dev/hdh	b	640	0	0	34	64	0	0	-
-#/dev/hdh	b	640	0	0	34	65	1	1	15
-
-# SCSI Devices
-/dev/sda	b	640	0	0	8	0	0	0	-
-/dev/sda	b	640	0	0	8	1	1	1	15
-/dev/sdb	b	640	0	0	8	16	0	0	-
-/dev/sdb	b	640	0	0	8	17	1	1	15
-#/dev/sdc	b	640	0	0	8	32	0	0	-
-#/dev/sdc	b	640	0	0	8	33	1	1	15
-#/dev/sdd	b	640	0	0	8	48	0	0	-
-#/dev/sdd	b	640	0	0	8	49	1	1	15
-#/dev/sde	b	640	0	0	8	64	0	0	-
-#/dev/sde	b	640	0	0	8	65	1	1	15
-#/dev/sdf	b	640	0	0	8	80	0	0	-
-#/dev/sdf	b	640	0	0	8	81	1	1	15
-#/dev/sdg	b	640	0	0	8	96	0	0	-
-#/dev/sdg	b	640	0	0	8	97	1	1	15
-#/dev/sdh	b	640	0	0	8	112	0	0	-
-#/dev/sdh	b	640	0	0	8	113	1	1	15
-#/dev/sg	c	640	0	0	21	0	0	1	15
-#/dev/scd	b	640	0	0	11	0	0	1	15
-#/dev/st	c	640	0	0	9	0	0	1	8
-#/dev/nst	c	640	0	0	9	128	0	1	8
-#/dev/st	c	640	0	0	9	32	1	1	4
-#/dev/st	c	640	0	0	9	64	1	1	4
-#/dev/st	c	640	0	0	9	96	1	1	4
-
-# USB block devices (ub driver)
-/dev/uba	b	640	0	0	180	0	0	0	-
-/dev/uba	b	640	0	0	180	1	1	1	6
-/dev/ubb	b	640	0	0	180	8	0	0	-
-/dev/ubb	b	640	0	0	180	65	1	1	6
-
-# Floppy disk devices
-#/dev/fd	b	640	0	0	2	0	0	1	2
-#/dev/fd0d360	b	640	0	0	2	4	0	0	-
-#/dev/fd1d360	b	640	0	0	2	5	0	0	-
-#/dev/fd0h1200	b	640	0	0	2	8	0	0	-
-#/dev/fd1h1200	b	640	0	0	2	9	0	0	-
-#/dev/fd0u1440	b	640	0	0	2	28	0	0	-
-#/dev/fd1u1440	b	640	0	0	2	29	0	0	-
-#/dev/fd0u2880	b	640	0	0	2	32	0	0	-
-#/dev/fd1u2880	b	640	0	0	2	33	0	0	-
-
-# All the proprietary cdrom devices in the world
-#/dev/aztcd	b	640	0	0	29	0	0	0	-
-#/dev/bpcd	b	640	0	0	41	0	0	0	-
-#/dev/capi20	c	640	0	0	68	0	0	1	2
-#/dev/cdu31a	b	640	0	0	15	0	0	0	-
-#/dev/cdu535	b	640	0	0	24	0	0	0	-
-#/dev/cm206cd	b	640	0	0	32	0	0	0	-
-#/dev/sjcd	b	640	0	0	18	0	0	0	-
-#/dev/sonycd	b	640	0	0	15	0	0	0	-
-#/dev/gscd	b	640	0	0	16	0	0	0	-
-#/dev/sbpcd	b	640	0	0	25	0	0	0	-
-#/dev/sbpcd	b	640	0	0	25	0	0	1	4
-#/dev/mcd	b	640	0	0	23	0	0	0	-
-#/dev/optcd	b	640	0	0	17	0	0	0	-
-
-# I2C device nodes
-/dev/i2c-	c	666	0	0	89	0	0	1	4
-
-# Xtensa special devices
-/dev/simdisk0        b      640      0       0       240     0       0       0
-/dev/simdisk1        b      640      0       0       240     1       0       0
diff --git a/target/xtensa/.gitignore b/target/xtensa/.gitignore
deleted file mode 100644
index cff61bf9ec..0000000000
--- a/target/xtensa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/busybox-config
diff --git a/target/xtensa/Makefile.in b/target/xtensa/Makefile.in
deleted file mode 100644
index 8a654b9980..0000000000
--- a/target/xtensa/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
--include target/xtensa/*/*.mk
diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
deleted file mode 100644
index 0eee5c0f57..0000000000
--- a/target/xtensa/defconfig
+++ /dev/null
@@ -1,129 +0,0 @@
-# Default buildroot configuration for running Linux on an Xtensa processor
-# on an LX60 board.
-
-#
-# Project Options
-#
-BR2_BANNER="Welcome to your custom Xtensa processor based uClibc environment."
-BR2_HAVE_DOT_CONFIG=y
-BR2_xtensa=y
-BR2_xtensa_dc232b=y
-BR2_xtensa_core_name="dc232b"
-BR2_ARCH="xtensa"
-
-#
-# Build options
-#
-BR2_WGET="wget --passive-ftp"
-# BR2_STRIP_strip is not set
-# BR2_STRIP_none=y
-
-## Added by Maxim
-
-#
-# Kernel Header Options
-#
-BR2_KERNEL_none=y
-BR2_KERNEL_HEADERS_2_6_22_1=y
-BR2_DEFAULT_KERNEL_HEADERS="2.6.22.1"
-
-#
-# uClibc Options
-#
-BR2_UCLIBC_VERSION_0_9_30=y
-# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_CONFIG="target/xtensa/uClibc-0.9.30.config"
-BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
-BR2_PTHREAD_DEBUG=y
-
-#
-# Binutils Options
-#
-BR2_BINUTILS_VERSION_2_19=y
-BR2_BINUTILS_VERSION="2.19"
-BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
-
-#
-# Gcc Options
-#
-BR2_GCC_VERSION_4_3_2=y
-# BR2_GCC_IS_SNAP is not set
-BR2_GCC_VERSION="4.3.2"
-BR2_TOOLCHAIN_SYSROOT=y
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_GCC_CROSS_CXX=y
-BR2_INSTALL_LIBSTDCPP=y
-BR2_GCC_SHARED_LIBGCC=y
-
-#
-# Gdb Options
-#
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
-# BR2_GDB_VERSION_6_2_1 is not set
-# BR2_GDB_VERSION_6_3 is not set
-# BR2_GDB_VERSION_6_4 is not set
-# BR2_GDB_VERSION_6_5 is not set
-# BR2_GDB_VERSION_6_6 is not set
-# BR2_GDB_VERSION_6_7_1 is not set
-BR2_GDB_VERSION_6_8=y
-# BR2_GDB_VERSION_SNAPSHOT is not set
-BR2_GDB_VERSION="6.8"
-
-#
-# Common Toolchain Options
-#
-# BR2_PACKAGE_SSTRIP_TARGET is not set
-# BR2_PACKAGE_SSTRIP_HOST is not set
-BR2_LARGEFILE=y
-BR2_INET_RPC=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-
-
-## Added by Maxim
-BR2_TOOLCHAIN_BUILDROOT=y
-
-
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-
-#
-# Other development stuff
-#
-# BR2_PACKAGE_LIBINTL is not set
-#  For NFS mount:
-BR2_PACKAGE_PORTMAP=y
-
-#
-# Other stuff
-#
-
-#
-# filesystem for target device
-#
-BR2_ROOTFS_DEVICE_TABLE="target/device/xtensa/device_table.txt"
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_CPIO_GZIP=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
-
-#
-# Linux Options
-#
-# BR2_PACKAGE_LINUX is not set
-
-#
-# Board Support Options
-#
-BR2_TARGET_XTENSA=y
-
-#
-# Tensilica Xtensa/Diamond based Device Support
-#
-BR2_TARGET_XTENSA_XTAV60=y
-
-#
-# Compressors / decompressors
-#
-
-BR2_PACKAGE_ZLIB=y
diff --git a/target/xtensa/patch.in b/target/xtensa/patch.in
deleted file mode 100644
index 3fe5cc80dc..0000000000
--- a/target/xtensa/patch.in
+++ /dev/null
@@ -1,33 +0,0 @@
-ifneq ($(filter xtensa%,$(ARCH)),)
-#############################################################
-#
-#  Xtensa processor architecture (including Diamond Standard cores)
-#
-#############################################################
-
-#  The following defines a function to be used like this:
-#	$(call XTENSA_PATCH, <module>, <patchdir>, <relative dir list...>)
-#  which returns the first overlay patch file for <module> found
-#  in the list of directories <relative dir list...> which are
-#  relative to <patchdir> (itself either absolute or relative to the
-#  current directory).  The returned filename is relative to <patchdir>.
-#  For example:
-#	$(call XTENSA_PATCH, binutils, some/dir/path, . ..)
-#  (no commas between directory paths in the list).
-#
-#  A selected overlay patch must exist ("fsf" means no specific
-#  overlay is selected).  So the function emits a Makefile error
-#  if a selected patch file is not found.
-
-XTENSA_CORENAME:=$(call qstrip,$(BR2_xtensa_core_name))
-ifeq ($(XTENSA_CORENAME),fsf)
-XTENSA_PATCH =
-else
-XTENSA_PATCH_SUFFIX = $(1)-xtensa_$(XTENSA_CORENAME).tgz
-XTENSA_PATCH_FILE = $(firstword $(wildcard $(patsubst %,$(2)/%/*$(XTENSA_PATCH_SUFFIX),$(3))))
-# FULLPATH = $(if $(filter /%,$(1)),$(1),$(PWD)/$(1))
-XTENSA_PATCH = $(if $(XTENSA_PATCH_FILE),$(patsubst $(2)/%,%,$(XTENSA_PATCH_FILE)),\
-	$(error Missing $(1) patch for Xtensa $(XTENSA_CORENAME) processor (*$(XTENSA_PATCH_SUFFIX) in $(addprefix $(2)/,$(3)))))
-endif
-
-endif
diff --git a/target/xtensa/setup-config b/target/xtensa/setup-config
deleted file mode 100644
index 7ef8fe86ee..0000000000
--- a/target/xtensa/setup-config
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-#  Convenience script for setting up a default buildroot config
-#  for Xtensa processor targets..
-
-usage() {
-    echo "Usage (invoke from top of buildroot tree):"
-    echo "    ./target/xtensa/setup-config <corename>"
-   #echo "    ./target/xtensa/setup-config <corename> [<overlaypath>]"
-    echo "where:"
-    echo "    <corename> is the Xtensa core overlay name, as specified in the -c option"
-    echo "    of the ./target/xtensa/xt-buildroot-overlay-install script."
-    echo ""
-    echo "For example:"
-    echo "   ./target/xtensa/setup-config dc232b"
-    echo ""
-    echo "Currently installed (available) core overlay names are:"
-    echo "   " `ls toolchain/binutils/binutils-xtensa_*.tgz | sed -e 's,toolchain\/binutils\/binutils-xtensa_\(.*\)\.tgz,\1,g'`
-    exit 1
-}
-
-if [ $# -ne 1 ]; then
-    usage
-fi
-
-core=$1 ; shift
-
-if [ ! -f toolchain/binutils/binutils-xtensa_${core}.tgz \
-  -o ! -f toolchain/gcc/gcc-xtensa_${core}.tgz \
-  -o ! -f toolchain/gdb/gdb-xtensa_${core}.tgz ]; then
-    echo "ERROR: Did not find an installed Xtensa core overlay named '${core}'."
-    echo "ERROR: Please install it first with ./target/xtensa/xt-buildroot-overlay-install"
-    echo ""
-    usage
-fi
-
-#  Use preset buildroot config:
-cp target/xtensa/defconfig .defconfig-xtensa
-#  Set core name:
-sed -i -e 's,^BR2_xtensa_\(.*\)=y,BR2_xtensa_custom=y\nBR2_xtensa_custom_name="'${core}'",' .defconfig-xtensa
-##  sed -i -e 's,^.*BR2_xtensa_core_name.*,BR_xtensa_core_name="'${core}'",'  .defconfig-xtensa
-#  Create full .config with defaults:
-make clean defconfig CONFIG_DEFCONFIG=.defconfig-xtensa || exit 1
-
-#  Busybox adjustments:  turn off 'ar' (can't create archives yet overrides real one)
-#  and turn on NFS mounting (Xtensa defconfig turns on RPC so this can work):
-#
-bborig=`grep '^BR2_PACKAGE_BUSYBOX_CONFIG=' .config | sed -e 's,.*"\(.*\)".*,\1,'`
-bbconf=target/xtensa/busybox-config
-cp $bborig $bbconf
-sed -i -e 's,^CONFIG_AR=y,# CONFIG_AR is not set,' $bbconf
-sed -i -e 's,^.*CONFIG_FEATURE_MOUNT_NFS.*,CONFIG_FEATURE_MOUNT_NFS=y,' $bbconf
-#  Make use of above busybox adjustments:
-sed -i -e 's,.*\(BR2_PACKAGE_BUSYBOX_CONFIG\).*,\1="'$bbconf'",' .config
-
-echo "Done."
-
diff --git a/target/xtensa/uClibc-0.9.30.config b/target/xtensa/uClibc-0.9.30.config
deleted file mode 100644
index 5701fe474e..0000000000
--- a/target/xtensa/uClibc-0.9.30.config
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Thu Jan 23 14:50:00 2009
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-TARGET_xtensa=y
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="xtensa"
-FORCE_OPTIONS_FOR_ARCH=y
-# ARCH_LITTLE_ENDIAN is not set
-# ARCH_BIG_ENDIAN is not set
-# ARCH_WANTS_LITTLE_ENDIAN is not set
-# ARCH_WANTS_BIG_ENDIAN is not set
-
-#
-# Using ELF file format
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/src/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-# LDSO_RUNPATH is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-UCLIBC_HAS_NONREENTRANT=y
-
-#
-# Networking Support
-#
-
-UCLIBC_LINUX_MODULE_24=y
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
-UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-
-#
-# String and Stdio Support
-#
-# UCLIBC_HAS_STRING_GENERIC_OPT is not set
-# UCLIBC_HAS_STRING_ARCH_OPT is not set
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-# UCLIBC_HAS_CTYPE_CHECKED is not set
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-# UCLIBC_HAS_STDIO_GETC_MACRO is not set
-# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-# UCLIBC_HAS_GNU_GETSUBOPT is not set
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-# UCLIBC_HAS_WORDEXP is not set
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-UCLIBC_HAS_ARC4RANDOM=y
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-# UCLIBC_BUILD_NOEXECSTACK is not set
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
-
-# USE_BX is not set
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_CORTEX_M3 is not set
-# CONFIG_ARM_CORTEX_M1 is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set
diff --git a/target/xtensa/uClibc.config b/target/xtensa/uClibc.config
deleted file mode 100644
index cd82fabe62..0000000000
--- a/target/xtensa/uClibc.config
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Thu Jan 10 00:46:51 2008
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-TARGET_xtensa=y
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="xtensa"
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_HEADERS="/usr/src/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-# LDSO_RUNPATH is not set
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-# UCLIBC_SUSV3_LEGACY is not set
-UCLIBC_SUSV3_LEGACY_MACROS=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-# UNIX98PTY_ONLY is not set
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-# UCLIBC_USE_NETLINK is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-# UCLIBC_HAS_WORDEXP is not set
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-
-#
-# Security options
-#
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-# UCLIBC_BUILD_NOEXECSTACK is not set
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DOSTRIP is not set
-# DODEBUG_PT is not set
-# DOASSERTS is not set
-SUPPORT_LD_DEBUG=y
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-EXTRA_WARNINGS=y
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/target/xtensa/xt-buildroot-overlay-install b/target/xtensa/xt-buildroot-overlay-install
deleted file mode 100644
index d2afce124a..0000000000
--- a/target/xtensa/xt-buildroot-overlay-install
+++ /dev/null
@@ -1,488 +0,0 @@
-#!/bin/sh
-#  Not every host installs perl at the same location, handle many locations:
-PATH=/usr/bin:/usr/local/bin:$PATH
-exec perl -x -S $0 ${1+"$@"}
-exit $?
-#!perl -w
-#line 8
-
-#  xt-buildroot-overlay-install [-t overlay_tarball] [-b buildroot_dir] \
-#				[-k kernel_dir] \
-#				[-c config_name] [-l long_name] [-f] [--help]
-#
-#  Creates individual overlay tarballs for gcc, binutils, gdb, and
-#  the Linux kernel, out of the Xtensa Configuration Overlay tarball from
-#  a Tensilica Core Package.  And installs these individual tarballs
-#  at the appropriate locations within a buildroot source tree.
-#
-#  The Xtensa configuration overlay tarball is located in:
-#	<xtensa_root>/src/xtensa-config-overlay.tar.gz
-#  where <xtensa_root> is the path to the Tensilica Core Package.
-#
-# Copyright (c) 2003-2009 by Tensilica Inc.
-#  History:
-#  2007-NOV-08	1.0	meg	Initial version
-#  2007-NOV-21	1.1	meg	Add -k parameter
-#  2007-DEC-06	1.2	meg	Make -k and -b optional, check overlay sw vers.
-#  2008-FEB-27	1.3	meg	Accept Xtensa Tools RB-2008.3 overlays
-
-$progvers = "1.3";
-$progname = $0;
-$progname =~ s|.*[/\\:]||;
-
-
-######################################################################
-#
-#  Parse cmdline
-#
-
-my $overlay_tarball = undef;
-my $buildroot_dir = undef;
-my $kernel_dir = undef;
-my $config_name = undef;
-my $config_long_name = undef;
-my $force_clobber = 0;
-my $prompt = 1;		# undocumented option
-
-sub usage {
-    print "$progname version $progvers\n"
-    	 ."Usage:  $progname <parameters> [<options>]\n"
-	 ."Where <parameters> are:\n"
-	 ."  -t file.tgz     Specify path to the Xtensa Linux overlay tarball, typically\n"
-	 ."                  <xtensa_root>/src/xtensa-config-overlay.tar.gz\n"
-	 ."  -b dir          Path to the base of the buildroot source tree, in which\n"
-	 ."                  package specific overlay tarballs get installed.\n"
-	 ."  -k dir          Path to the base of the Linux kernel source tree, in which\n"
-	 ."                  the Linux kernel specific overlay gets installed.\n"
-	 ."  -c config_name  Name for the Xtensa processor configuration as it will be\n"
-	 ."                  known to the open source community.  Must be a lowercase\n"
-	 ."                  identifier, starting with a letter, consisting of letters\n"
-	 ."                  and numbers and underscores, not ending with underscore\n"
-	 ."                  and not containing consecutive underscores.  For examples:\n"
-	 ."                     dc232b , dc232b_be , mmubasele , fsf , s5000 .\n"
-	 ."  -l long_name    Long name for the Xtensa processor configuration, human-\n"
-	 ."                  readable with spaces etc allowed (must be quoted).\n"
-	 ."                  For example:  'Diamond 232L Standard Core Rev.B (LE)'\n"
-	 ."                  Try to keep it within approximately 40 characters.\n"
-	 ."And <options> are:\n"
-	 ."  -f              If package specific overlay tarballs already exist in\n"
-	 ."                  the destination source tree, overwrite them without asking.\n"
-	 ."  --help          Show this usage message.\n";
-}
-
-#  Get arguments:
-if (!@ARGV) {
-    usage();
-    exit 0;
-}
-while( defined($_ = shift) ) {
-    if( /^-[tbclk]$/ ) {		# option taking an argument
-	my $arg = shift;
-	if( !defined($arg) ) {
-	    print STDERR "$progname: ERROR: missing parameter after '$_' option\n\n";
-	    usage();
-	    exit 1;
-	}
-	$overlay_tarball = $arg if $_ eq "-t";
-	$buildroot_dir = $arg if $_ eq "-b";
-	$kernel_dir = $arg if $_ eq "-k";
-	$config_name = $arg if $_ eq "-c";
-	$config_long_name = $arg if $_ eq "-l";
-	next;
-    }
-    if( /^-f$/ ) {
-	$force_clobber = 1;
-	next;
-    }
-    if( /^--[m-t]{8}$/ && /[new]([wow])([pup])[fur]\1[maze]\2[tuff]/ ) {
-	$prompt = 0;
-	next;
-    }
-    if( /^-(h|help|\-h|\-help|\?)$/i ) {
-	usage();
-	exit 0;
-    }
-    print STDERR "$progname: ERROR: unrecognized option or argument '$_'\n\n";
-    usage();
-    exit 1;
-}
-
-
-######################################################################
-#
-#  Validate cmdline arguments
-#
-
-ErrorU("missing -c argument (core name)")
-	unless defined($config_name);
-#  Try to enforce reasonable names:
-ErrorU("-c: malformed core name '$config_name' (must be lowercase, letter followed by letters/digits, may contain underscore separators)")
-	unless $config_name =~ /^[a-z][a-z0-9]*(_[a-z0-9]+)*$/;
-ErrorU("-c: core name too short '$config_name'")
-	unless length($config_name) >= 2;
-ErrorU("-c: core name too long '$config_name'")
-	unless length($config_name) <= 16;
-
-
-ErrorU("missing -l argument (core long name)")
-	unless defined($config_long_name);
-$config_long_name =~ s/^\s+//;	# trim extra whitespace...
-$config_long_name =~ s/\s+$//;
-$config_long_name =~ s/\s+/ /g;
-#  Try to enforce reasonable names:
-ErrorU("-l: invalid (non-ASCII-printable) characters in core long name '$config_long_name'")
-	unless $config_long_name =~ /^[\x20-\x7E]+$/;
-ErrorU("-l: disallowed characters (\"\'\\) in core long name '$config_long_name'")
-	if $config_long_name =~ /[\'\"\\]/;
-ErrorU("-l: core long name too short '$config_long_name'")
-	unless length($config_long_name) >= 5;
-ErrorU("-l: core long name too long '$config_long_name'")
-	unless length($config_long_name) <= 60;
-
-
-#ErrorU("missing -b argument (buildroot source tree directory)")
-#	unless defined($buildroot_dir);
-if (defined($buildroot_dir)) {
-    ErrorU("-b: not a directory: $buildroot_dir")
-	    unless -d $buildroot_dir;
-    foreach my $p ("toolchain/gcc", "toolchain/binutils", "toolchain/gdb", "target/xtensa") {
-	ErrorU("-b: not a buildroot directory: missing $buildroot_dir/$p")
-	    unless -d $buildroot_dir . "/" . $p;
-    }
-}
-
-
-#ErrorU("missing -k argument (Linux kernel source tree directory)")
-#	unless defined($kernel_dir);
-if (defined($kernel_dir)) {
-    ErrorU("-k: not a directory: $kernel_dir")
-	    unless -d $kernel_dir;
-    foreach my $p ("kernel", "arch/xtensa/kernel", "include/asm-xtensa") {
-	ErrorU("-k: not a Linux kernel directory: missing $kernel_dir/$p")
-	    unless -d $kernel_dir . "/" . $p;
-    }
-}
-
-
-if (!defined($buildroot_dir) and !defined($kernel_dir)) {
-    print STDERR "$progname: WARNING:\n";
-    print STDERR "$progname: WARNING: Test run only, NOTHING WILL BE INSTALLED\n";
-    print STDERR "$progname: WARNING: (use -b and -k to specify install destination)\n";
-    print STDERR "$progname: WARNING:\n";
-}
-
-
-my @ovpaths = ( "/src/xtensa-config-overlay.tar.gz",
-		"/xtensa-elf/src/linux/misc/linux-overlay.tar.gz" );
-if (!defined($overlay_tarball)) {
-    #  Try to locate the overlay tarball based on XTENSA_SYSTEM and XTENSA_CORE
-    #  settings:
-    my $xtensa_root = `xt-xcc --show-config=config 2>/dev/null`;
-    $xtensa_root = "" unless defined($xtensa_root);
-    chomp($xtensa_root);
-    if ($xtensa_root ne "") {
-	($overlay_tarball) = grep(-f $xtensa_root.$_, @ovpaths);
-	if (!defined($overlay_tarball)) {
-	    ErrorU("Xtensa configuration overlay tarball not found: ".$xtensa_root.$ovpaths[0])
-	}
-    } else {
-	ErrorU("missing -t argument (Xtensa configuration overlay tarball filename)\n"
-	     ."and no default Xtensa Core Package defined in the environment");
-    }
-} else {
-    foreach my $p ("", @ovpaths) {
-	if (-f $overlay_tarball.$p) {
-	    $overlay_tarball .= $p;
-	    last;
-	}
-    }
-    ErrorU("-t: file not found: $overlay_tarball") unless -f $overlay_tarball;
-}
-
-
-######################################################################
-#
-#  Misc
-#
-
-my $overlay_unpacked = 0;
-my $ovdir;
-
-sub cleanup {
-    if ($overlay_unpacked) {
-	system("rm -rf '$ovdir' 2>/dev/null");
-    }
-}
-
-sub ErrorEmit {
-    my ($msg,$usage) = @_;
-    $msg =~ s|\n|"\n${progname}: ERROR: "|ge;
-    print STDERR "$progname: ERROR: $msg\n";
-    if ($usage) {
-	print "\n";
-	usage();
-    }
-    cleanup();
-    exit 1;
-}
-sub ErrorU { ErrorEmit(shift,1); }
-sub Error  { ErrorEmit(shift); }
-
-
-#  Read specified file (as binary), returning contents.
-#
-sub readfile {
-    my ($filename) = @_;
-    #  Read the file:
-    open(INFILE,"<$filename") or Error("error reading from '$filename': $!");
-    my $savesep = $/;
-    undef $/;
-    my $file = <INFILE>;
-    $/ = $savesep;
-    close(INFILE);
-    $file;
-}                                                                                                       
-
-#  Write specified file (as binary) with first argument (string).
-#
-sub writefile {
-    my ($filename, $file) = @_;
-    #  Read the file:
-    open(INFILE,">$filename") or Error("error writing to '$filename': $!");
-    print INFILE $file;
-    close(INFILE) or Error("error closing file '$filename': $!");
-}                                                                                                       
-
-
-######################################################################
-#
-#  Determine a temporary directory.
-#
-
-my $tmpdir = "/tmp";
-if (defined($ENV{"TMP"}) and -d $ENV{"TMP"}) {
-    $tmpdir = $ENV{"TMP"};
-} elsif (defined($ENV{"TEMP"}) and -d $ENV{"TEMP"}) {
-    $tmpdir = $ENV{"TEMP"};
-}
-
-
-######################################################################
-#
-#  Unpack the general overlay tarball
-#
-
-my $user = defined($ENV{"USER"}) ? $ENV{"USER"} : "xtensa";
-$ovdir = $tmpdir."/tmp-overlay-${user}-$$";
-mkdir $ovdir or Error("cannot create directory $ovdir");
-$overlay_unpacked = 1;
-system("tar xfz '$overlay_tarball' -C '$ovdir'")
-	and Error("tar failed...");
-
-
-######################################################################
-#
-#  Define and sanity check contents of overlay
-#
-
-my $oldpack = -f $ovdir."/xtensa-elf/src/linux/misc/core.h";
-my $pf1 = ($oldpack ? "src/" : "");
-my $pf2 = ($oldpack ? "xtensa-elf/src/linux/misc/" : "config/");
-
-my @packages = (
-	["binutils", "toolchain/binutils",
-		["${pf1}/binutils/xtensa-modules.c",	"bfd/"],
-		["${pf1}/binutils/xtensa-config.h",	"include/"],
-		#["${pf1}/binutils/xtensa-config.sh",	"ld/emulparams/"],
-		],
-	["gcc", "toolchain/gcc",
-		["${pf1}/gcc/xtensa-config.h",	"include/"],
-		],
-	["gdb", "toolchain/gdb",
-		["${pf1}/gdb/xtensa-modules.c",	"bfd/"],
-		["${pf1}/gdb/xtensa-config.h",	"include/"],
-		["${pf1}/gdb/xtensa-config.c",	"gdb/"],
-		["${pf1}/gdb/xtensa-regmap.c",	"gdb/gdbserver/"],
-		["${pf1}/gdb/xtensa-regmap.c",	"gdb/gdbserver/xtensa-xtregs.c"],	# for GDB 6.8
-		["${pf1}/gdb/xtensa-regmap.c",	"gdb/xtensa-xtregs.c"],			# for GDB 6.8
-		["${pf1}/gdb/reg-xtensa.dat",	"gdb/regformats/"],
-		],
-	["kernel", "target/xtensa",		# ???
-		["${pf2}core.h",	"include/asm-xtensa/variant-${config_name}/"],
-		["${pf2}tie.h",		"include/asm-xtensa/variant-${config_name}/"],
-		["${pf2}tie-asm.h",	"include/asm-xtensa/variant-${config_name}/"],
-		],
-);
-
-#  Check that all files are present ...
-foreach my $pack (@packages) {
-    my ($pname, $buildroot_subdir, @files) = @$pack;
-    print "Checking files for $pname ...\n";
-    foreach my $f (@files) {
-	my ($src, $dst) = @$f;
-	-f $ovdir."/".$src or Error("missing '$src' in overlay tarball");
-    }
-}
-
-
-######################################################################
-#
-#  Extract some useful information
-#
-
-#  Extract core name as specified in the build.
-my $coreh = readfile($ovdir."/".$pf2."core.h");
-
-$coreh =~ /^\s*\#\s*define\s+XCHAL_SW_VERSION\s+(\w+)/m;
-my $swversion = $1;
-defined($swversion) or Error("missing XCHAL_SW_VERSION in overlay core.h file;\n"
-	."overlay is too old, need RB-2008.3 (SW version 7.1.1) or later");
-
-$coreh =~ /^\s*\#\s*define\s+XCHAL_CORE_ID\s+"([^"]+)"/m;
-my $coreid = $1;
-defined($coreid) or Error("missing XCHAL_CORE_ID in overlay core.h file");
-
-$coreh =~ /^\s*\#\s*define\s+XCHAL_HW_VERSION_NAME\s+"([^"]+)"/m;
-my $hwversion = $1;
-defined($hwversion) or Error("missing XCHAL_HW_VERSION_NAME in overlay core.h file");
-
-
-$swvers_human = sprintf("%u.%u.%u",
-	$swversion/100000, (($swversion/1000) % 100), ($swversion % 1000));
-my $release = "software version $swvers_human";
-if (-f $ovdir."/release") {
-    $release = readfile($ovdir."/release");
-    chomp($release);
-}
-
-
-######################################################################
-#
-#  Prompt user to be sure this is what he wants to do
-#
-
-#  Catch Ctrl-C so we can do a proper cleanup:
-sub catch_term {
-    my $signame = shift;
-    #print STDERR "whoa!\n";
-    cleanup();
-    print STDERR "\n$progname: Cleaned up.\n";
-    exit 3;
-}
-$SIG{TERM} = \&catch_term;
-$SIG{HUP} = \&catch_term;
-$SIG{INT} = \&catch_term;
-
-$| = 1;
-print	"\n",
-	"About to generate package-specific overlay tarballs for the following:\n",
-	"\n",
-	"   Xtensa processor short name:   $config_name\n";
-print	"      This short name overrides the name specified in the XPG:  $coreid\n" if $coreid ne $config_name;
-#print	"      Please ensure that's the name you want.  If submitted to the open source\n",
-#	"      community, it can be a hassle to change later on.\n";
-print	"   Xtensa processor description:  $config_long_name\n",
-	"   Targeting Xtensa HW version:   $hwversion\n",
-	"   Xtensa configuration overlay:  $overlay_tarball\n",
-	"           (release of overlay):  $release\n",
-	"   Destination buildroot dir:     ".(defined($buildroot_dir)?$buildroot_dir:"(none, not installed)")."\n",
-	"   Destination Linux kernel dir:  ".(defined($kernel_dir)?$kernel_dir:"(none, not installed)")."\n",
-	"\n",
-	"Are you sure? (y/n) ";
-if ($prompt) {
-    my $line = <STDIN>;
-    chomp($line);
-    if ($line !~ /^y(es)?$/i) {
-	print "\nInstallation aborted.\n";
-	cleanup();
-	exit 2;
-    }
-} else {
-    print "YES [no prompt]\n";
-}
-print "\n";
-
-
-######################################################################
-#
-#  Now generate the tarballs
-#
-
-#  Now generate each tarball ...
-foreach my $pack (@packages) {
-    my ($pname, $buildroot_subdir, @files) = @$pack;
-    my $tarname = "${pname}-xtensa_${config_name}.tgz";
-    my $fulltarname;
-    if (defined($buildroot_dir)) {
-	my $tarsubname = $buildroot_subdir . "/" . $tarname;
-	print "Generating and installing $tarsubname ...\n";
-	$fulltarname = $buildroot_dir . "/" . $tarsubname;
-    } else {
-	print "Generating $tarname ...\n";
-	$fulltarname = $ovdir . "/" . $tarname;
-    }
-    if (-e $fulltarname) {
-	if ($force_clobber or !defined($buildroot_dir)) {
-	    unlink($fulltarname) or Error("could not delete '$fulltarname': $!");
-	} else {
-	    Error("destination tarball already exists: '$fulltarname'");
-	}
-    }
-    my $pdir = $ovdir."/tmp-".$pname;
-    system("rm -fr '${pdir}' 2>/dev/null");
-    mkdir $pdir or Error("cannot create directory $pdir");
-    foreach my $f (@files) {
-	my ($src, $dst) = @$f;
-	#  If $dst ends in / , take filename from $src :
-	if ($dst =~ m|/$|) {
-	    my $fname = $src;
-	    $fname =~ s|^.*/||;
-	    $dst .= $fname;
-	}
-	#  Ensure destination directory exists:
-	my $dstdir = $pdir;
-	while ($dst =~ s|^([^/]+)/+||) {
-	    $dstdir .= "/" . $1;
-	    mkdir($dstdir);
-	}
-	#  Read file:
-	my $content = readfile($ovdir."/".$src);
-
-	#  Adjust contents of file.
-	#  Fix-up typo:
-	$content =~ s/XCHAL_SA_(NCP|CP\d+)_/XCHAL_$1_SA_/g;
-	#  Update core name info:
-	my $iscore = ($content =~ s/^(\s*\#\s*define\s+XCHAL_CORE_ID\s+)"[^"]+"/$1"$config_name"/mg);
-	$iscore or $content =~ s{^(\s*\#\s*define\s+XCHAL_INST_FETCH_WIDTH\s+\S+\s*(/\*[^\*]*\*/)?\s*$)}
-				{$1\n\#undef XCHAL_CORE_ID\n\#define XCHAL_CORE_ID\t\t\t"$config_name"\n}smg;
-	#  Update core description info:
-	$content =~ s/^(\s*\#\s*define\s+XCHAL_CORE_DESCRIPTION\s+)"[^"]+"/$1"$config_long_name"/mg
-	  or $content =~ s{^(\s*\#\s*define\s+XCHAL_CORE_ID\s+\S+\s*(/\*[^\*]*\*/)?\s*$)}
-			  {"$1\n" . ($iscore ? "" : "\n\#undef XCHAL_CORE_DESCRIPTION\n")
-			   . "\#define XCHAL_CORE_DESCRIPTION\t\t\"${config_long_name}\""}smge;
-
-	#  Write (possibly modified) file:
-	writefile($dstdir."/".$dst, $content);
-    }
-    my $tarcmd = "tar cfz '${fulltarname}' -C '${pdir}' .";
-    system($tarcmd) and Error("failed executing: $tarcmd");
-
-    #  Install Linux kernel overlay:
-    if ($pname eq "kernel" and defined($kernel_dir)) {
-	print "Installing Linux kernel overlay from $tarname ...\n";
-	my $untarcmd = "tar xfz '${fulltarname}' -C '${kernel_dir}' .";
-	system($untarcmd) and Error("failed executing: $tarcmd");
-    }
-    #  Possible TODO:  update arch/xtensa/{Kconfig,Makefile} to add this config?
-}
-
-
-######################################################################
-#
-# The End
-#
-
-cleanup();
-print "Done.\n";
-exit 0;
-
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index e29d797ccc..1a075cc004 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -33,11 +33,6 @@ else
  GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
 endif
 
-ifneq ($(filter xtensa%,$(ARCH)),)
-include target/xtensa/patch.in
-GCC_PATCH_EXTRA:=$(call XTENSA_PATCH,gcc,$(GCC_PATCH_DIR),. ..)
-endif
-
 GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
 GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
@@ -262,7 +257,7 @@ gcc-patched: $(GCC_DIR)/.patched
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
 ifneq ($(wildcard $(GCC_PATCH_DIR)),)
-	support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
+	support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch
 endif
 
 ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index f5af4541ac..6b029a8c6d 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -16,11 +16,6 @@ else
  GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
 endif
 
-ifneq ($(filter xtensa%,$(ARCH)),)
-include target/xtensa/patch.in
-GDB_PATCH_EXTRA:=$(call XTENSA_PATCH,gdb,$(GDB_PATCH_DIR),. ..)
-endif
-
 GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_VERSION)
 
 $(DL_DIR)/$(GDB_SOURCE):
@@ -31,7 +26,7 @@ $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
 	mkdir -p $(GDB_DIR)
 	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
-	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
+	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch
 endif
 	$(call CONFIG_UPDATE,$(@D))
 	touch $@
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 6e0d1598fc..10950ba295 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -93,7 +93,7 @@ config BR2_NEEDS_GETTEXT_IF_LOCALE
 	default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE)
 
 config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh || BR2_xtensa
+	bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh
 	default y if !BR2_bfin
 	help
 	  If your target has a MMU, you should say Y here.  If you
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 20cc820ae5..d1cd71812e 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -38,7 +38,6 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
 		-e 's/sh[234].*/sh/' \
 		-e 's/mips.*/mips/' \
 		-e 's/cris.*/cris/' \
-		-e 's/xtensa.*/xtensa/' \
 ")
 
 UCLIBC_TARGET_ENDIAN:=$(call qstrip,$(BR2_ENDIAN))

From 6fdc695128581a8d2e177997145e2aa075d5fb9f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 21 Sep 2012 07:29:54 +0200
Subject: [PATCH 2710/6849] gcc: bump 4.7.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.7.1 => 4.7.2}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.7.1 => 4.7.2}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.7.1 => 4.7.2}/302-c99-snprintf.patch           | 0
 .../gcc/{4.7.1 => 4.7.2}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.7.1 => 4.7.2}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.7.1 => 4.7.2}/830-arm_unbreak_armv4t.patch     | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/830-arm_unbreak_armv4t.patch (100%)
 rename toolchain/gcc/{4.7.1 => 4.7.2}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.7.1/100-uclibc-conf.patch b/toolchain/gcc/4.7.2/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.7.1/100-uclibc-conf.patch
rename to toolchain/gcc/4.7.2/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.7.1/301-missing-execinfo_h.patch b/toolchain/gcc/4.7.2/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.7.1/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.7.2/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.7.1/302-c99-snprintf.patch b/toolchain/gcc/4.7.2/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.7.1/302-c99-snprintf.patch
rename to toolchain/gcc/4.7.2/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.7.1/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.7.2/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.7.1/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.7.2/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.7.1/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.7.2/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.7.1/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.7.2/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.7.1/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.7.2/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.7.1/830-arm_unbreak_armv4t.patch
rename to toolchain/gcc/4.7.2/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/4.7.1/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.7.2/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.7.1/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.7.2/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index a67e7b0d94..645650270e 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -64,7 +64,7 @@ config BR2_GCC_VERSION
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
-	default "4.7.1"     if BR2_GCC_VERSION_4_7_X
+	default "4.7.2"     if BR2_GCC_VERSION_4_7_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

From a5f0fdc66b9a7606f6b789d43496fe9351586ac2 Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@mimc.co.uk>
Date: Tue, 11 Sep 2012 23:26:57 +0000
Subject: [PATCH 2711/6849] wireless_tools: add license information

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireless_tools/wireless_tools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
index d81aa7cf8c..f3556897ef 100644
--- a/package/wireless_tools/wireless_tools.mk
+++ b/package/wireless_tools/wireless_tools.mk
@@ -7,6 +7,8 @@
 WIRELESS_TOOLS_VERSION = 29
 WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz
+WIRELESS_TOOLS_LICENSE = GPLv2
+WIRELESS_TOOLS_LICENSE_FILES = COPYING
 WIRELESS_TOOLS_INSTALL_STAGING = YES
 
 WIRELESS_TOOLS_BUILD_TARGETS = iwmulticall

From ae5dfe556a8dd4eccd7e7785230036ef7ddbd253 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 21 Sep 2012 09:59:36 +0200
Subject: [PATCH 2712/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 1f06e2b012..40590741d8 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -65,7 +65,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.43"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.29"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.30"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.11"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.4"		if BR2_KERNEL_HEADERS_3_5

From e1aee0638f5a3657f27f5de18a33b2c0a15d839c Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Fri, 21 Sep 2012 00:45:56 +0000
Subject: [PATCH 2713/6849] unionfs: add missing dependency on host-pkg-config

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/unionfs/unionfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index e2ffd72f53..eb8109ecbb 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -7,7 +7,7 @@
 UNIONFS_VERSION = 0.26
 UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
 UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.xz
-UNIONFS_DEPENDENCIES = libfuse
+UNIONFS_DEPENDENCIES = libfuse host-pkg-config
 UNIONFS_LICENSE = BSD-3c
 UNIONFS_LICENSE_FILES = LICENSE
 

From f47d199ff89b8757be0ab41c837848d48e114779 Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael.luceno@gmail.com>
Date: Tue, 10 Apr 2012 08:24:07 +0000
Subject: [PATCH 2714/6849] xserver_xorg-server: Xvfb support

Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in         | 13 +++++++++++--
 .../xserver_xorg-server/xserver_xorg-server.mk      |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index ddc03c6aeb..4e284a0cb9 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -56,14 +56,23 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 comment "xorg-xserver is BROKEN on AVR32"
 	depends on BR2_avr32
 
+if BR2_PACKAGE_XSERVER_XORG_SERVER
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
     bool "Null root cursor"
-    depends on BR2_PACKAGE_XSERVER_XORG_SERVER
     help
         Don't display root cursor.
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
     bool "Enable AIGLX Extension"
-    depends on BR2_PACKAGE_XSERVER_XORG_SERVER
     help
         Enable/Use AIGLX extension.
+
+comment "Optional Servers"
+
+config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB
+    bool "Xvfb server"
+    help
+        Virtual frame buffer X server.
+
+endif
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 5913f7987b..9b2d9aeef4 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -58,11 +58,11 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	host-pkg-config
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
-		--disable-xnest --disable-xephyr --disable-xvfb \
-		--disable-dmx \
+		--disable-xnest --disable-xephyr --disable-dmx \
 		--with-builder-addr=buildroot@uclibc.org \
 		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
-		--with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var
+		--with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var \
+		--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
 
 ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg

From 25c030d63432392083cd32606071a338e3de24db Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:15 +0200
Subject: [PATCH 2715/6849] xlib_xtrans: bump version to 1.2.6

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_xtrans/xlib_xtrans.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 3f839de39e..85829854bf 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_XTRANS_VERSION = 1.2.5
+XLIB_XTRANS_VERSION = 1.2.6
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_INSTALL_STAGING = YES

From 30e9274ec579ef153d355e2787d3293ea28dff6d Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:16 +0200
Subject: [PATCH 2716/6849] xlib_libXxf86vm: bump version to 1.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index 0aabef8be0..b445f0246d 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXXF86VM_VERSION = 1.1.0
+XLIB_LIBXXF86VM_VERSION = 1.1.1
 XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86VM_INSTALL_STAGING = YES

From 3bb41fc8c409f8bc37c5bd7663b7541a259cb944 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:17 +0200
Subject: [PATCH 2717/6849] xlib_libXxf86dga: bump version to 1.1.2

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index d0464268a3..2bd9ce70c3 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXXF86DGA_VERSION = 1.1.1
+XLIB_LIBXXF86DGA_VERSION = 1.1.2
 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86DGA_INSTALL_STAGING = YES

From f6d2f05fd81ccdca938651feece3a1b63cfc8db9 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:18 +0200
Subject: [PATCH 2718/6849] xlib_libXvMC: bump version to 1.0.6

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 2b0ad6bd6a..f6d291266e 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXVMC_VERSION = 1.0.5
+XLIB_LIBXVMC_VERSION = 1.0.6
 XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXVMC_INSTALL_STAGING = YES

From 178c388c2d7ae188c572dc347b84c27489154a1d Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:19 +0200
Subject: [PATCH 2719/6849] xlib_libXv: bump version to 1.0.6

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index af08937c69..8d69217dba 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXV_VERSION = 1.0.5
+XLIB_LIBXV_VERSION = 1.0.6
 XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXV_INSTALL_STAGING = YES

From 54078481d2c87ecbd3d04db4c49b4002bb4100c3 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:20 +0200
Subject: [PATCH 2720/6849] xlib_libXtst: bump version to 1.2.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXtst/xlib_libXtst.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index d2b5ec5aff..ea12389fb6 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXTST_VERSION = 1.1.0
+XLIB_LIBXTST_VERSION = 1.2.0
 XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2
 XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXTST_INSTALL_STAGING = YES

From bfc29d721a890c4ee05eac73b4b2737bddfd260f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 14:06:16 +0200
Subject: [PATCH 2721/6849] xlib_libXt: bump version

Based on patch by Allan W. Nielsen.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xlib_libXt-1.0.7-fix-cross-compile.patch  | 96 -------------------
 package/x11r7/xlib_libXt/xlib_libXt.mk        |  3 +-
 2 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.7-fix-cross-compile.patch

diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.7-fix-cross-compile.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.7-fix-cross-compile.patch
deleted file mode 100644
index fc5ea7d757..0000000000
--- a/package/x11r7/xlib_libXt/xlib_libXt-1.0.7-fix-cross-compile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From da5ba611fbff6f939a7cec9ca41fa7df0f76a197 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Thu, 5 Nov 2009 11:55:22 +0100
-Subject: [PATCH] fix cross-compile again
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-makestrs should always be built for the target arch. When cross-compiling,
-create a native version "xmakestrs" which will always be noinst, and use it
-to generate the other sources.
-
-This avoids installing a makestrs built for the wrong arch.
-
-Based on this patch :
-http://overlays.gentoo.org/proj/embedded/browser/openmoko/trunk/openmoko-target/x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- configure.ac     |    2 ++
- src/Makefile.am  |    8 +++++++-
- util/Makefile.am |   15 ++++++++++-----
- 3 files changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a66d45..73bfbc0 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,8 @@ AC_PROG_LIBTOOL
- AM_PROG_CC_C_O
- XORG_DEFAULT_OPTIONS
- 
-+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
-+
- if test x"$CC_FOR_BUILD" = x; then
- 	if test x"$cross_compiling" = xyes; then
- 		AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a43fb22..6b767a7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -92,12 +92,18 @@ BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
- 
- STRING_LIST = $(top_srcdir)/util/string.list
- 
-+if CROSS_COMPILING
-+MAKESTRS=$(top_builddir)/util/xmakestrs
-+else
-+MAKESTRS=$(top_builddir)/util/makestrs
-+endif
-+
- all-local: $(BUILT_FILES)
- 
- $(BUILT_HEADER): $(BUILT_SOURCE)
- 
- $(BUILT_SOURCE):
--	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
-+	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
- 	mkdir -p $(top_builddir)/src
- 	mkdir -p $(top_builddir)/include/X11
- 	cp StringDefs.h $(top_builddir)/include/X11
-diff --git a/util/Makefile.am b/util/Makefile.am
-index d51365e..6853d89 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -1,13 +1,10 @@
- if INSTALL_MAKESTRS
- bin_PROGRAMS = makestrs
-+noinst_PROGRAMS = $(MAKESTRS_PROG)
- else
--noinst_PROGRAMS = makestrs
-+noinst_PROGRAMS = makestrs $(MAKESTRS_PROG)
- endif
- 
--CC = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_FOR_BUILD@
--
- EXTRA_DIST = \
- 	Shell.ht \
- 	StrDefs.ct \
-@@ -45,3 +42,11 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
- 
- .man.$(APP_MAN_SUFFIX):
- 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-+
-+if CROSS_COMPILING
-+MAKESTRS_PROG=xmakestrs$(EXEEXT)
-+
-+xmakestrs$(EXEEXT): makestrs.c
-+	$(AM_V_GEN)$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
-+endif
--- 
-1.6.5.2
-
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 740dc17e03..b2667d3db1 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-XLIB_LIBXT_VERSION = 1.0.7
+XLIB_LIBXT_VERSION = 1.0.9
 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXT_AUTORECONF = YES
 XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
 XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs

From 638f1f7b1e5769935dafc59bd8a2fdc90342e8f3 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:22 +0200
Subject: [PATCH 2722/6849] xlib_libXScrnSaver: version bump

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 216919ef29..11cfa99f7b 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXSCRNSAVER_VERSION = 1.2.0
+XLIB_LIBXSCRNSAVER_VERSION = 1.2.1
 XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
 XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES

From f4610bf7c1055e2dc2865a602d77bd49c177593c Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:23 +0200
Subject: [PATCH 2723/6849] xlib_libXres: version bump to 1.0.5

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 0ecb928a1d..8b6e31bc38 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRES_VERSION = 1.0.4
+XLIB_LIBXRES_VERSION = 1.0.5
 XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRES_INSTALL_STAGING = YES

From c55bd62d133049bd115b1abf17537ad616d66262 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:24 +0200
Subject: [PATCH 2724/6849] xlib_libXrender: version bump to 0.9.6

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index ab094867ee..466b4339b4 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRENDER_VERSION = 0.9.5
+XLIB_LIBXRENDER_VERSION = 0.9.6
 XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRENDER_INSTALL_STAGING = YES

From bc23c70a57e09024af0c97c539afa97a54323e23 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:25 +0200
Subject: [PATCH 2725/6849] xlib_libXrandr: version bump to 1.3.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 6dfe2ed3b5..1ff166c253 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRANDR_VERSION = 1.3.0
+XLIB_LIBXRANDR_VERSION = 1.3.1
 XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRANDR_INSTALL_STAGING = YES

From 0f35703706af3afea56822c30111208367cefac4 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:26 +0200
Subject: [PATCH 2726/6849] xlib_libXpm: version bump to 3.5.9

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 1760d1dd94..8e1001b174 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXPM_VERSION = 3.5.8
+XLIB_LIBXPM_VERSION = 3.5.9
 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPM_INSTALL_STAGING = YES

From c38d7f302e45b4a5228de11c9b410bebb0a705ab Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:27 +0200
Subject: [PATCH 2727/6849] xlib_libXp: version bump to 1.0.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXp/xlib_libXp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index 08891ad71c..9b2e4de0d2 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXP_VERSION = 1.0.0
+XLIB_LIBXP_VERSION = 1.0.1
 XLIB_LIBXP_SOURCE = libXp-$(XLIB_LIBXP_VERSION).tar.bz2
 XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXP_INSTALL_STAGING = YES

From cdb5a6bdd4adbccff818b1956ca4075fd6ec0141 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:28 +0200
Subject: [PATCH 2728/6849] xlib_libXmu: version bump to 1.1.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXmu/xlib_libXmu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index 217c60d70e..ce20897922 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXMU_VERSION = 1.0.5
+XLIB_LIBXMU_VERSION = 1.1.0
 XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
 XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXMU_INSTALL_STAGING = YES

From 1c758e9f71d1083ef98eedb2c98d294dc389fa63 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:29 +0200
Subject: [PATCH 2729/6849] xlib_libxkbfile: version bump to 1.0.7

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index f05fce42cc..6db20db509 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXKBFILE_VERSION = 1.0.6
+XLIB_LIBXKBFILE_VERSION = 1.0.7
 XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
 XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES

From 62aff529b8d11cb701f92e7199b8b9de525043fd Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:30 +0200
Subject: [PATCH 2730/6849] xlib_libXinerama: version bump to 1.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index cb961e7caa..a716e95392 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXINERAMA_VERSION = 1.1
+XLIB_LIBXINERAMA_VERSION = 1.1.1
 XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXINERAMA_INSTALL_STAGING = YES

From 74eb04a0b2c39cacb0cd6e6cb47389ceaabcbaf9 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:31 +0200
Subject: [PATCH 2731/6849] xlib_libXi: version bump to 1.4.2

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index e52ab7a7a3..b658df61f2 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXI_VERSION = 1.3
+XLIB_LIBXI_VERSION = 1.4.2
 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXI_INSTALL_STAGING = YES

From 22010b4c58e12aae884ef727547a5856cfc13416 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:32 +0200
Subject: [PATCH 2732/6849] xlib_libXft: version bump to 2.2.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 55be39638f..eab75efa43 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXFT_VERSION = 2.1.14
+XLIB_LIBXFT_VERSION = 2.2.0
 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFT_AUTORECONF = YES

From 2ac62e21028d1dacbf417412cb3cbbba97dbcffe Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:33 +0200
Subject: [PATCH 2733/6849] xlib_libXfont: version bump to 1.4.3

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXfont/xlib_libXfont.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 463e56742b..c08a69b812 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXFONT_VERSION = 1.4.1
+XLIB_LIBXFONT_VERSION = 1.4.3
 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONT_AUTORECONF = YES

From 7d0a502e1da9ba242562c54f86303f415aa52ce0 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:34 +0200
Subject: [PATCH 2734/6849] xlib_libXfixes: version bump to 4.0.5

[Peter: stick to X11R7.6 version]
Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 3bd94adf41..35bb125173 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXFIXES_VERSION = 4.0.4
+XLIB_LIBXFIXES_VERSION = 4.0.5
 XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFIXES_INSTALL_STAGING = YES

From 6f26cc6660111607d35e84c7da4772f78b78feb7 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:35 +0200
Subject: [PATCH 2735/6849] xlib_libXext: version bump to 1.2.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 14f8f5e9c0..2ce38ef4cc 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXEXT_VERSION = 1.1.1
+XLIB_LIBXEXT_VERSION = 1.2.0
 XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXEXT_INSTALL_STAGING = YES

From 9263b1986a5329f231130b2e65a898c3173acaab Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:36 +0200
Subject: [PATCH 2736/6849] xlib_libXdmcp: version bump to 1.1.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 4c4674c050..5a702e5ac4 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXDMCP_VERSION = 1.0.3
+XLIB_LIBXDMCP_VERSION = 1.1.0
 XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_INSTALL_STAGING = YES

From f06ae046398ae1fed4c2602bb207a0563b95dbcd Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:37 +0200
Subject: [PATCH 2737/6849] xlib_libXdamage: version bump to 1.1.3

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 1dd4be1793..f4d266e39a 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXDAMAGE_VERSION = 1.1.2
+XLIB_LIBXDAMAGE_VERSION = 1.1.3
 XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2
 XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES

From 9c026d5ec30ecd51840de7070aebdaad2db23bb2 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:38 +0200
Subject: [PATCH 2738/6849] xlib_libXcursor: version bump to 1.1.11

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index ac254e1257..5adffb2a05 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXCURSOR_VERSION = 1.1.10
+XLIB_LIBXCURSOR_VERSION = 1.1.11
 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES

From 3788569fad8c768cd2361d928541836f755127db Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:39 +0200
Subject: [PATCH 2739/6849] xlib_libXcomposite: version bump to 0.4.3

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index 14660c8a15..a6e7c2232f 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXCOMPOSITE_VERSION = 0.4.1
+XLIB_LIBXCOMPOSITE_VERSION = 0.4.3
 XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2
 XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES

From 4647bc9f98d97305181cb83f2c2b98d050faddf6 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:40 +0200
Subject: [PATCH 2740/6849] xlib_libXaw: version bump to 1.0.9

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 668fd4c59e..6c8a681bf1 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXAW_VERSION = 1.0.7
+XLIB_LIBXAW_VERSION = 1.0.9
 XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAW_INSTALL_STAGING = YES

From 625e29587da2e49c74119ec07ef546c54191ef2e Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:41 +0200
Subject: [PATCH 2741/6849] xlib_libXau: version bump to 1.0.6

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXau/xlib_libXau.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 3f15c0c1af..6a228a2f5a 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXAU_VERSION = 1.0.5
+XLIB_LIBXAU_VERSION = 1.0.6
 XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_INSTALL_STAGING = YES

From 7f46b19544686aee418432a24f140634d6039dff Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:42 +0200
Subject: [PATCH 2742/6849] xlib_libX11: verison bump to 1.4.2 and removed
 patch file xlib_libX11-1.3.2-keysymdef

[Peter: AUTORECONF and --with-keysymdef no longer needed]
Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xlib_libX11-1.3.2-keysymdef.patch         | 35 -------------------
 package/x11r7/xlib_libX11/xlib_libX11.mk      |  4 +--
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch

diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch
deleted file mode 100644
index 9c4eae2b30..0000000000
--- a/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-[patch]: configure: add --with-keysymdef argument for cross compilation
-
-Based on a similar patch from Openembedded.
-
-The libX11 configure script hardcodes the location to keysymdef.h as
-<prefix>/include/X11/keysymdef.h, which is fine for native compilation,
-but breaks with cross compilation as that directory is a location on
-the target, not the build host.
-
-Fix it by providing an explicit --with-keysymdef=<full-path-to-file>.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>Index: libX11-1.1.5/configure.ac
-===================================================================
-Index: xlib_libX11-1.3.2/configure.ac
-===================================================================
---- xlib_libX11-1.3.2.orig/configure.ac	2009-10-23 22:55:03.000000000 +0200
-+++ xlib_libX11-1.3.2/configure.ac	2010-05-04 16:26:39.000000000 +0200
-@@ -280,8 +280,15 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+      AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+      KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+      dir=`pkg-config --variable=includedir xproto`
-+      KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
-+
- if test -f "$KEYSYMDEF"; then
-         AC_MSG_RESULT([$KEYSYMDEF])
- else
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 54473d933f..79b2d54a89 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -4,16 +4,14 @@
 #
 ################################################################################
 
-XLIB_LIBX11_VERSION = 1.3.2
+XLIB_LIBX11_VERSION = 1.4.2
 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBX11_AUTORECONF = YES
 XLIB_LIBX11_INSTALL_STAGING = YES
 XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_xcmiscproto host-xproto_xproto
 XLIB_LIBX11_CONF_OPT = \
 	--disable-malloc0returnsnull \
 	--with-xcb \
-	--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
 	--disable-specs
 
 HOST_XLIB_LIBX11_CONF_OPT = \

From d9b8d7440ac83cd65e0bca6579937218d3b5e66b Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:43 +0200
Subject: [PATCH 2743/6849] xlib_libSM: version bump to 1.2.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index c4c0f3a17e..a8d1eff1b5 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBSM_VERSION = 1.1.1
+XLIB_LIBSM_VERSION = 1.2.0
 XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
 XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBSM_INSTALL_STAGING = YES

From 185999048cbdcf7a99062a8fb0d012a713418e0c Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:44 +0200
Subject: [PATCH 2744/6849] xlib_libpciaccess: version bump to 0.12.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index cc22bedafa..53e035653f 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBPCIACCESS_VERSION = 0.11.0
+XLIB_LIBPCIACCESS_VERSION = 0.12.1
 XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES

From 0488c5d6c3938814f1a09f50d88d9410208fe83d Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:45 +0200
Subject: [PATCH 2745/6849] xlib_libICE: version bump to 1.0.7

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libICE/xlib_libICE.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 0b4a4430fd..c9eda7e57f 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBICE_VERSION = 1.0.6
+XLIB_LIBICE_VERSION = 1.0.7
 XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
 XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBICE_INSTALL_STAGING = YES

From 1fa2deef8f9293c87341b5bd87f2b6cdf0ae875d Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:46 +0200
Subject: [PATCH 2746/6849] xlib_libFS: version bump to 1.0.3

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index af589b3b26..47fb03a834 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBFS_VERSION = 1.0.2
+XLIB_LIBFS_VERSION = 1.0.3
 XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFS_INSTALL_STAGING = YES

From 57adb190f69cf60febcdbc58406c17eb9ca7c295 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:47 +0200
Subject: [PATCH 2747/6849] xlib_libfontenc: version bump to 1.1.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 3e32d93f60..219cf7a9fb 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBFONTENC_VERSION = 1.0.5
+XLIB_LIBFONTENC_VERSION = 1.1.0
 XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFONTENC_INSTALL_STAGING = YES

From 043dd7fd72181c76aeafeb39e6ca8d14ed05d81f Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:48 +0200
Subject: [PATCH 2748/6849] xlib_libdmx: version bump to 1.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 8e507787cd..6429bb33dd 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBDMX_VERSION = 1.1.0
+XLIB_LIBDMX_VERSION = 1.1.1
 XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBDMX_INSTALL_STAGING = YES

From 35b6a79bc3fec0a78ac94948c788692e30450081 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:49 +0200
Subject: [PATCH 2749/6849] xproto_xproto: version bump to 7.0.21

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xproto/xproto_xproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index b3ef30356c..1f480b5b24 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XPROTO_VERSION = 7.0.16
+XPROTO_XPROTO_VERSION = 7.0.21
 XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
 XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XPROTO_INSTALL_STAGING = YES

From 58335d4de12f188f3f15799c68f7b7245bb4cfb5 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:50 +0200
Subject: [PATCH 2750/6849] xproto_xineramaproto: version bump to 1.2.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index 6220ae6575..b9d65a4bd4 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XINERAMAPROTO_VERSION = 1.2
+XPROTO_XINERAMAPROTO_VERSION = 1.2.1
 XPROTO_XINERAMAPROTO_SOURCE = xineramaproto-$(XPROTO_XINERAMAPROTO_VERSION).tar.bz2
 XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES

From 4e97046c56baa4e7231a486e49f4d9a2bd1a7a18 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:51 +0200
Subject: [PATCH 2751/6849] xproto_xf86vidmodeproto: version bump to 2.3.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index 7a32398047..ccdc5c2173 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XF86VIDMODEPROTO_VERSION = 2.3
+XPROTO_XF86VIDMODEPROTO_VERSION = 2.3.1
 XPROTO_XF86VIDMODEPROTO_SOURCE = xf86vidmodeproto-$(XPROTO_XF86VIDMODEPROTO_VERSION).tar.bz2
 XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES

From 7889705f0b745c15e73331e543e979e015c33d7a Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:52 +0200
Subject: [PATCH 2752/6849] xproto_xf86driproto: version bump to 2.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 701b46494a..21eb6de0a7 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XF86DRIPROTO_VERSION = 2.1.0
+XPROTO_XF86DRIPROTO_VERSION = 2.1.1
 XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2
 XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES

From 1f88a5cbe80c9d571c45bd8058e49df179161328 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:53 +0200
Subject: [PATCH 2753/6849] xproto_xextproto: version bump to 7.2.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xextproto/xproto_xextproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index b47c6856b7..19c79684ac 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XEXTPROTO_VERSION = 7.1.1
+XPROTO_XEXTPROTO_VERSION = 7.2.0
 XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
 XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES

From ac9d04510b960b7f64b7ae571095be25dd777e6e Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:54 +0200
Subject: [PATCH 2754/6849] xproto_xcmiscproto: version bump to 1.2.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 165521c17b..8168b5c96f 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XCMISCPROTO_VERSION = 1.2.0
+XPROTO_XCMISCPROTO_VERSION = 1.2.1
 XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
 XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES

From 2fdfb8694b8ee508497cd58a5e806dd3d1336a36 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:55 +0200
Subject: [PATCH 2755/6849] xproto_videoproto: version bump to 2.3.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_videoproto/xproto_videoproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 88ac3ef979..595997782a 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_VIDEOPROTO_VERSION = 2.3.0
+XPROTO_VIDEOPROTO_VERSION = 2.3.1
 XPROTO_VIDEOPROTO_SOURCE = videoproto-$(XPROTO_VIDEOPROTO_VERSION).tar.bz2
 XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_VIDEOPROTO_INSTALL_STAGING = YES

From b6d2ff2c0e2445f9802800a53ea4d7d1b7ba77a7 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:56 +0200
Subject: [PATCH 2756/6849] xproto_scrnsaverproto: version bump to 1.2.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 31a0ddfe8f..360db11896 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_SCRNSAVERPROTO_VERSION = 1.2.0
+XPROTO_SCRNSAVERPROTO_VERSION = 1.2.1
 XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
 XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES

From b90c774c071ff7c9dc4ca6c195a4c66df444a1a8 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:57 +0200
Subject: [PATCH 2757/6849] xproto_resourceproto: version bump to 1.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index df63e2ebd5..7f8121d661 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_RESOURCEPROTO_VERSION = 1.1.0
+XPROTO_RESOURCEPROTO_VERSION = 1.1.1
 XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
 XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES

From cae99aa41caa9eecc1f6d0a9d1e0c8ac10ae6638 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:58 +0200
Subject: [PATCH 2758/6849] xproto_renderproto: version bump to 0.11.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_renderproto/xproto_renderproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index a1a0f59c36..4ef04a2920 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_RENDERPROTO_VERSION = 0.11
+XPROTO_RENDERPROTO_VERSION = 0.11.1
 XPROTO_RENDERPROTO_SOURCE = renderproto-$(XPROTO_RENDERPROTO_VERSION).tar.bz2
 XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RENDERPROTO_INSTALL_STAGING = YES

From cb44cba0880d8e57fc130fd136bf0d4ed79f623b Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:03:59 +0200
Subject: [PATCH 2759/6849] xproto_randrproto: version bump to 1.3.2

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_randrproto/xproto_randrproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index 34ddb03595..ecee64d90d 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_RANDRPROTO_VERSION = 1.3.1
+XPROTO_RANDRPROTO_VERSION = 1.3.2
 XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2
 XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RANDRPROTO_INSTALL_STAGING = YES

From 5f97e6ffb99beaa176559cb09472212ec74369e0 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:00 +0200
Subject: [PATCH 2760/6849] xproto_printproto: version bump to 1.0.5

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_printproto/xproto_printproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
index c67e4fa894..641553f343 100644
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_PRINTPROTO_VERSION = 1.0.3
+XPROTO_PRINTPROTO_VERSION = 1.0.5
 XPROTO_PRINTPROTO_SOURCE = printproto-$(XPROTO_PRINTPROTO_VERSION).tar.bz2
 XPROTO_PRINTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_PRINTPROTO_INSTALL_STAGING = YES

From 388d1931d91ca0f0107dadf658dded372a939eb4 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:01 +0200
Subject: [PATCH 2761/6849] xproto_kbproto: version bump to 1.0.5

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_kbproto/xproto_kbproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index bef002cd7c..8fcc8df546 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_KBPROTO_VERSION = 1.0.4
+XPROTO_KBPROTO_VERSION = 1.0.5
 XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
 XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_KBPROTO_INSTALL_STAGING = YES

From f469aea1a0abc54624224c700ef34da91cdcd012 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:02 +0200
Subject: [PATCH 2762/6849] xproto_inputproto: version bump to 2.0.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_inputproto/xproto_inputproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index cf2518b254..9e9b0ab5f1 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_INPUTPROTO_VERSION = 2.0
+XPROTO_INPUTPROTO_VERSION = 2.0.1
 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES

From 9d5a7bf6bc4dc80161411e511862c17a34009d1f Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:03 +0200
Subject: [PATCH 2763/6849] xproto_glproto: version bump to 1.4.12

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_glproto/xproto_glproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index aed8af6487..f576d0dfaa 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_GLPROTO_VERSION = 1.4.10
+XPROTO_GLPROTO_VERSION = 1.4.12
 XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
 XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_GLPROTO_INSTALL_STAGING = YES

From 15ae60b34c4268dec24b5bfa9e5952824c18fb0a Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:04 +0200
Subject: [PATCH 2764/6849] xproto_fontsproto: verison bump to 2.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 407664a4ee..5252fd9082 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_FONTSPROTO_VERSION = 2.1.0
+XPROTO_FONTSPROTO_VERSION = 2.1.1
 XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
 XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES

From 10d2c654ac048d8fbff20e44cab27a6240d5ec48 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:05 +0200
Subject: [PATCH 2765/6849] xproto_fixesproto: version bump to 5.0

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index 1141337741..ae4d687da9 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_FIXESPROTO_VERSION = 4.1.1
+XPROTO_FIXESPROTO_VERSION = 5.0
 XPROTO_FIXESPROTO_SOURCE = fixesproto-$(XPROTO_FIXESPROTO_VERSION).tar.bz2
 XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_FIXESPROTO_INSTALL_STAGING = YES

From 0eb66c7d08c2abe3a6724eec1d8902ad96f02077 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:06 +0200
Subject: [PATCH 2766/6849] xproto_dmxproto: version bump to 2.3.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index a13691bb76..3277992d89 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_DMXPROTO_VERSION = 2.3
+XPROTO_DMXPROTO_VERSION = 2.3.1
 XPROTO_DMXPROTO_SOURCE = dmxproto-$(XPROTO_DMXPROTO_VERSION).tar.bz2
 XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DMXPROTO_INSTALL_STAGING = YES

From 18c372a4c956513da69dd28c40c09d5ad212dabc Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:07 +0200
Subject: [PATCH 2767/6849] xproto_damageproto: version bump to 1.2.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_damageproto/xproto_damageproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index 918127b83c..09fe866778 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_DAMAGEPROTO_VERSION = 1.2.0
+XPROTO_DAMAGEPROTO_VERSION = 1.2.1
 XPROTO_DAMAGEPROTO_SOURCE = damageproto-$(XPROTO_DAMAGEPROTO_VERSION).tar.bz2
 XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES

From b65769ce21a37660f27983aa5e559ad945fcdc9d Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:08 +0200
Subject: [PATCH 2768/6849] xproto_compositeproto: version bump to 0.4.2

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index dc6138b3f0..2d5f6ccdc3 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_COMPOSITEPROTO_VERSION = 0.4.1
+XPROTO_COMPOSITEPROTO_VERSION = 0.4.2
 XPROTO_COMPOSITEPROTO_SOURCE = compositeproto-$(XPROTO_COMPOSITEPROTO_VERSION).tar.bz2
 XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES

From beee5a000b5abe70825b5acadcdf3d0b5e88dbc1 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:09 +0200
Subject: [PATCH 2769/6849] xproto_bigreqsproto: version bump to 1.1.1

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index ca0a533a89..dc236fa1cb 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_BIGREQSPROTO_VERSION = 1.1.0
+XPROTO_BIGREQSPROTO_VERSION = 1.1.1
 XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
 XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES

From dc405fb9b810a8f03dd3605da7138cafa19eb574 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:10 +0200
Subject: [PATCH 2770/6849] xutil_util-macros: version bump to 1.11.0 and
 xutil_util-macros-1.3.0.patch deleted

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xutil_util-macros/xutil_util-macros-1.3.0.patch      | 9 ---------
 package/x11r7/xutil_util-macros/xutil_util-macros.mk     | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.3.0.patch

diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.3.0.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.3.0.patch
deleted file mode 100644
index de3ff01b41..0000000000
--- a/package/x11r7/xutil_util-macros/xutil_util-macros-1.3.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- xutil_util-macros-1.3.0/xorg-macros.m4.in.orig	2010-01-23 19:23:30.306334212 +0200
-+++ xutil_util-macros-1.3.0/xorg-macros.m4.in	2010-01-23 19:25:03.462333685 +0200
-@@ -499,3 +499,6 @@ XORG_RELEASE_VERSION
- XORG_CHANGELOG
- XORG_MANPAGE_SECTIONS
- ]) # XORG_DEFAULT_OPTIONS
-+
-+# Buildroot stuff
-+AC_SUBST(STAGING_DIR)
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 1823937178..7a13a6186e 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XUTIL_UTIL_MACROS_VERSION = 1.3.0
+XUTIL_UTIL_MACROS_VERSION = 1.11.0
 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES

From 5ec86b56daf9f4dc157c5b2c383b0eefb45eccd2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 14:50:15 +0200
Subject: [PATCH 2771/6849] mesa3d: bump version

Based on patch by Allan W. Nielsen. uClibc patch based on patch in OE.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/mesa3d/mesa3d-uclibc-locale.patch   | 56 +++++++++++++++++++
 package/x11r7/mesa3d/mesa3d.mk                |  3 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 package/x11r7/mesa3d/mesa3d-uclibc-locale.patch

diff --git a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch b/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
new file mode 100644
index 0000000000..99afe8dc95
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
@@ -0,0 +1,56 @@
+[PATCH] Fix compilation on uClibc without locale support
+
+Based on similar patch from OE:
+
+http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch?id=e4039eb74b20e96d4b8837cd58cf2d13d091e1ad
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac            |    3 +++
+ src/glsl/strtod.c       |    2 +-
+ src/mesa/main/imports.c |    2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fbaa376..454dad2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -450,6 +450,9 @@ AC_SUBST([DLOPEN_LIBS])
+ dnl See if posix_memalign is available
+ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+ 
++dnl See if newlocale is available
++AC_CHECK_FUNCS_ONCE(newlocale)
++
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+     [AS_HELP_STRING([--enable-selinux],
+diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
+index a876e13..9fce7e9 100644
+--- a/src/glsl/strtod.c
++++ b/src/glsl/strtod.c
+@@ -44,7 +44,7 @@ double
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
+index d3727ef..363bf32 100644
+--- a/src/mesa/main/imports.c
++++ b/src/mesa/main/imports.c
+@@ -757,7 +757,7 @@ float
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-- 
+1.7.10.4
+
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index c52baa3ebc..3c2635e6cd 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-MESA3D_VERSION = 7.6.1
+MESA3D_VERSION = 7.10.1
 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
+MESA3D_AUTORECONF = YES
 MESA3D_INSTALL_STAGING = YES
 
 MESA3D_CONF_OPT = \

From 6a7e867a94dfafd4ddd9367c58ce0f695d9f07f7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 14:58:24 +0200
Subject: [PATCH 2772/6849] xfont_encodings: bump version

Based on patch by Allan W. Nielsen.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_encodings/xfont_encodings.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 05613e5550..22447a453e 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-XFONT_ENCODINGS_VERSION = 1.0.3
+XFONT_ENCODINGS_VERSION = 1.0.4
 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
+XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkg-config xutil_util-macros
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From d9dc7cf0adece9d553a45d50ad174e5b342819f5 Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:13 +0200
Subject: [PATCH 2773/6849] libxcb: version bump to 1.7

Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 9824fc45a1..a053379bf8 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -3,7 +3,7 @@
 # libxcb
 #
 #############################################################
-LIBXCB_VERSION = 1.5
+LIBXCB_VERSION = 1.7
 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
 LIBXCB_SITE = http://xcb.freedesktop.org/dist/
 

From 8cc20e69850482faa8fc6be74b1a90c2b044c1ef Mon Sep 17 00:00:00 2001
From: "Allan W. Nielsen" <a@awn.dk>
Date: Wed, 6 Apr 2011 12:04:14 +0200
Subject: [PATCH 2774/6849] xdriver_xf86-video-ati: version bump to 6.14.1 and
 removed cross-compile patch

[Peter: drop AUTORECONF]
Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...xdriver_xf86-video-ati-cross-compile.patch | 27 -------------------
 .../xdriver_xf86-video-ati.mk                 |  3 +--
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch

diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch
deleted file mode 100644
index d27617606e..0000000000
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.ac	2008-06-23 10:39:28.000000000 -0400
-+++ b/configure.ac	2008-06-23 10:40:46.000000000 -0400
-@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo
- AC_HEADER_STDC
- 
- if test "$DRI" != no; then
--	AC_CHECK_FILE([${sdkdir}/dri.h],
-+ 	if test "$cross_compiling" = "no" ; then
-+		AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
--	AC_CHECK_FILE([${sdkdir}/sarea.h],
-+		AC_CHECK_FILE([${sdkdir}/sarea.h],
-                       [have_sarea_h="yes"], [have_sarea_h="no"])
--	AC_CHECK_FILE([${sdkdir}/dristruct.h],
-+		AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
--	AC_CHECK_FILE([${sdkdir}/damage.h],
-+		AC_CHECK_FILE([${sdkdir}/damage.h],
-                       [have_damage_h="yes"], [have_damage_h="no"])
-+ 	else
-+ 		have_dri_h="yes"
-+ 		have_sarea_h="yes"
-+ 		have_dristruct_h="yes"
-+ 	fi
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 253a9c67cf..ea2d3c3134 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ATI_VERSION = 6.12.4
+XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.1
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
 $(eval $(autotools-package))

From 42a8064763379c3fd172e3f75e4e4a9182867424 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:10:17 +0200
Subject: [PATCH 2775/6849] libdrm: bump version

Based on patch by Allan W. Nielsen.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdrm/libdrm.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 6bd65f9cbb..76ee763d42 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -3,7 +3,7 @@
 # libdrm
 #
 #############################################################
-LIBDRM_VERSION = 2.4.19
+LIBDRM_VERSION = 2.4.23
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
 LIBDRM_INSTALL_STAGING = YES
@@ -28,4 +28,11 @@ ifneq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI),y)
 LIBDRM_CONF_OPT += --disable-radeon
 endif
 
+ifeq ($(BR2_PACKAGE_UDEV),y)
+LIBDRM_CONF_OPT += --enable-udev
+LIBDRM_DEPENDENCIES += udev
+else
+LIBDRM_CONF_OPT += --disable-udev
+endif
+
 $(eval $(autotools-package))

From 759d548e3e591f9bb8450b2874032d1824a5e251 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:18:27 +0200
Subject: [PATCH 2776/6849] xserver_xorg-server: bump version

Based on patch by Allan W. Nielsen.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in   |  5 +-
 ...r-01-add-dlopen-libs-flags-to-kdrive.patch | 25 ------
 ...r-02-supply-dl-code-with-dlopen-libs.patch | 87 -------------------
 ...rver-03-always-enable-forced-outputs.patch | 30 -------
 .../xserver_xorg-server.mk                    | 11 ++-
 5 files changed, 11 insertions(+), 147 deletions(-)
 delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
 delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch
 delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 4e284a0cb9..02c28282d4 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -50,8 +50,9 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
 	depends on !BR2_avr32
 	help
-	  xorg-server 1.7.5
-	  No description available
+	  X.Org X server
+
+	  http://xorg.freedesktop.org
 
 comment "xorg-xserver is BROKEN on AVR32"
 	depends on BR2_avr32
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
deleted file mode 100644
index 53304be4e6..0000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8613e4b0eb04150b1e377871f02b164be5d001e9 Mon Sep 17 00:00:00 2001
-From: Mikhail Gusarov <dottedmag@dottedmag.net>
-Date: Wed, 28 Oct 2009 18:44:27 +0000
-Subject: Add missing DLOPEN_LIBS to kdrive compilation flags
-
-Xfbdev failed to build due to dladdr being used by xorg_backtrace.
-Explicitly add DLOPEN_LIBS to KDRIVE_LIBS as there does not
-seem to be a better place for it.
-
-Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1982,7 +1982,7 @@
-     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
--    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
-+    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
- 
-     AC_SUBST([XEPHYR_LIBS])
-     AC_SUBST([XEPHYR_INCS])
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch
deleted file mode 100644
index 63d723bf32..0000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d30637339963950910e5f5fb755b8465ac7dddb4 Mon Sep 17 00:00:00 2001
-From: Mikhail Gusarov <dottedmag@dottedmag.net>
-Date: Thu, 29 Oct 2009 18:46:22 +0000
-Subject: Supply all code using dl*() with DLOPEN_LIBS
-
-Previously DLOPEN_LIBS was managed in top-level configure.ac.
-Instead bundle it with the code using dl*() functions to
-avoid breakages in uncommon configurations.
-
-Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
-Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,6 +196,7 @@
- dnl has it in libc), or if libdl is needed to get it.
- AC_CHECK_FUNC([dlopen], [],
- 	AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
-+AC_SUBST(DLOPEN_LIBS)
- 
- dnl Checks for library functions.
- AC_FUNC_VPRINTF
-@@ -927,7 +928,7 @@
- 	AC_SUBST(XLIB_CFLAGS)
- 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
- 	GLX_LIBS='$(top_builddir)/glx/libglx.la'
--	GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
-+	GLX_SYS_LIBS="$GLX_SYS_LIBS"
- else
-         GLX=no
- fi
-@@ -1483,7 +1484,7 @@
- 	AC_CHECK_FUNCS([pci_device_vgaarb_init])
- 	LIBS=$SAVE_LIBS
- 	CFLAGS=$SAVE_CFLAGS
--	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
-+	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
- 	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- 
- 	case $host_os in
-Index: b/glx/Makefile.am
-===================================================================
---- a/glx/Makefile.am
-+++ b/glx/Makefile.am
-@@ -58,6 +58,8 @@
- libglxdri_la_SOURCES += glxdri2.c
- endif
- 
-+libglxdri_la_LIBADD = $(DLOPEN_LIBS)
-+
- libglx_la_SOURCES = \
- 	$(indirect_sources) \
- 	$(glapi_sources) \
-@@ -95,3 +97,5 @@
-         swap_interval.c \
-         unpack.h \
-         xfont.c
-+
-+libglx_la_LIBADD = $(DLOPEN_LIBS)
-Index: b/hw/xfree86/loader/Makefile.am
-===================================================================
---- a/hw/xfree86/loader/Makefile.am
-+++ b/hw/xfree86/loader/Makefile.am
-@@ -21,6 +21,7 @@
-         dlloader.c \
- 	os.c \
- 	sdksyms.c
-+libloader_la_LIBADD = $(DLOPEN_LIBS)
- 
- CLEANFILES = sdksyms.c sdksyms.dep
- 
-Index: b/os/Makefile.am
-===================================================================
---- a/os/Makefile.am
-+++ b/os/Makefile.am
-@@ -26,6 +26,8 @@
- 	xprintf.c	\
- 	$(XORG_SRCS)
- 
-+libos_la_LIBADD = $(DLOPEN_LIBS)
-+
- if SECURE_RPC
- libos_la_SOURCES += $(SECURERPC_SRCS)
- endif
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch
deleted file mode 100644
index bf279775fe..0000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 93ff1bc5884cdfca1132af7fbc06c48e06f218c8 Mon Sep 17 00:00:00 2001
-From: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
-Date: Mon, 15 Feb 2010 12:18:00 +0000
-Subject: Always enable outputs that have been forced on in the configuration file
-
-If the user has gone to the effort of manually enabling an output in
-the configuration file assume that they know what they're doing.
-
-X.org Bug 14611 <http://bugs.freedesktop.org/show_bug.cgi?id=14611>
-
-Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
-Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 573fe96..9b1ff28 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1573,7 +1573,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
- 	 */
- 	output->status = (*output->funcs->detect)(output);
- 
--	if (output->status == XF86OutputStatusDisconnected)
-+	if (output->status == XF86OutputStatusDisconnected &&
-+		!xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))
- 	{
- 	    xf86OutputSetEDID (output, NULL);
- 	    continue;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 9b2d9aeef4..a19122d4a5 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-XSERVER_XORG_SERVER_VERSION = 1.7.5
+XSERVER_XORG_SERVER_VERSION = 1.9.4
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
-XSERVER_XORG_SERVER_AUTORECONF = YES
-
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xutil_util-macros 		\
 	xlib_libXfont 			\
@@ -111,6 +109,13 @@ XSERVER_XORG_SERVER_DEPENDENCIES += dbus
 XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus
 endif
 
+ifeq ($(BR2_PACKAGE_UDEV),y)
+XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev
+XSERVER_XORG_SERVER_DEPENDENCIES += udev
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-config-udev
+endif
+
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += freetype
 endif

From 95b1f13ad0bdf9c40e13218621c5f38f3855e90d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:39:46 +0200
Subject: [PATCH 2777/6849] xdriver_x86-input-aiptek: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index bc274a77e4..5e48a74e4d 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.3.0
+XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.3.1
 XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From e7d9221b00db6a458f527d03778a3f14db6397ca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:40:33 +0200
Subject: [PATCH 2778/6849] xdriver_x86-input-evdev: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index c6f10a884b..1f69388f70 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.3.0
+XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.5.0
 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto

From 7e83d0d5ed8465e9fa71ce03cd7473af3600a871 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:41:06 +0200
Subject: [PATCH 2779/6849] xdriver_x86-input-joystick: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index c50e80a0b3..e4b23241eb 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.4.99.2
+XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.5.0
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From 652620c54da89406b70abdb09b543e1a896d7f5f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:41:32 +0200
Subject: [PATCH 2780/6849] xdriver_x86-input-keyboard: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index e732f86c4f..2035e1f2c3 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.4.0
+XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.5.0
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto

From e840c9cc55b7be30fbddc96108aedc297f0cb32b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:41:56 +0200
Subject: [PATCH 2781/6849] xdriver_x86-input-mouse: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 2bd37d3af6..39f5396970 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.5.0
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.6.0
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From 8a22394fb49c05637503dda7eb684a4e73060677 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:42:23 +0200
Subject: [PATCH 2782/6849] xdriver_x86-input-synaptics: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-input-synaptics.mk                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 9b7c26e6d4..e66acb5bd5 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.2.0
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.3.0
 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From 229a4de32eb5e5af21581055ef8c0f9cd7d24b97 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:42:47 +0200
Subject: [PATCH 2783/6849] xdriver_x86-input-vmmouse: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index c0ee55d50f..c54b2aac17 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.6.5
+XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.6.10
 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From 5a1ad0df4f69f517353bcaaf08dde2d27045b418 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:43:14 +0200
Subject: [PATCH 2784/6849] xdriver_x86-input-void: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index bffd978af4..191467d06a 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_VOID_VERSION = 1.3.0
+XDRIVER_XF86_INPUT_VOID_VERSION = 1.3.1
 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From a40fdb2978be1512d8a641d1247ab07b5863345e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:43:41 +0200
Subject: [PATCH 2785/6849] xdriver_x86-driver-apm: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index 0d306352ab..d0317f5366 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.2
+XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.3
 XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto

From 5be84c8deb1c61cb002fb6241995683078070e00 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:44:24 +0200
Subject: [PATCH 2786/6849] xdriver_x86-driver-ark: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index e833214d56..d3b3bd7ef1 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.2
+XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.3
 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto

From 0206d16cda71ac8d1a3651031c78514a2c718ecf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:45:05 +0200
Subject: [PATCH 2787/6849] xdriver_x86-driver-ast: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index 545c152d03..b1067355a3 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_AST_VERSION = 0.89.9
+XDRIVER_XF86_VIDEO_AST_VERSION = 0.91.10
 XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
 

From 3a678c4f30c513a83cf803e45a1ad5a05f7608e2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:46:09 +0200
Subject: [PATCH 2788/6849] xdriver_x86-driver-chips: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index fd2d99b350..9856ecb5fe 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.2
+XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.3
 XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From b32b512e32791b86b0eaf5c6b9d8ed6e106f2e50 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:46:39 +0200
Subject: [PATCH 2789/6849] xdriver_x86-driver-dummy: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index f38affd919..b1c98ec20e 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.2
+XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.4
 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto

From cceba51fb5e6a94c04121fa6d3d5e6cfcb3d7923 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:47:14 +0200
Subject: [PATCH 2790/6849] xdriver_x86-driver-geode: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index eb1f8a3c4c..785f2dbab3 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.6
+XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.10
 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From bfa9185a1c28c21b758f834285b28878fe752623 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:47:41 +0200
Subject: [PATCH 2791/6849] xdriver_x86-driver-glide: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 9d7460b3d8..64d50ed757 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.0.3
+XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From 86aacff0a13316c879d25b5abf9f99099275172e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:48:16 +0200
Subject: [PATCH 2792/6849] xdriver_x86-driver-glint: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index e96375132d..cd294a554b 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.4
+XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.5
 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES

From 2288d846fe9638c1da1fe85ae029fa34547f2801 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:48:41 +0200
Subject: [PATCH 2793/6849] xdriver_x86-driver-i128: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 5bce33fec9..4852a75c12 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.3
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.4
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From ddf6677fe76a46b05d3cb89fa6b4b9152fc52502 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:49:30 +0200
Subject: [PATCH 2794/6849] xdriver_x86-driver-intel: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...xf86-video-intel-2.9.1-cross-compile.patch | 25 -------------------
 ...iver_xf86-video-intel-cross-compile.patch} |  0
 .../xdriver_xf86-video-intel.mk               |  2 +-
 .../xdriver_xf86-video-vesa-2.0.0.patch       | 13 ----------
 4 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch
 rename package/x11r7/xdriver_xf86-video-intel/{xdriver_xf86-video-intel-2.10.0-cross-compile.patch => xdriver_xf86-video-intel-cross-compile.patch} (100%)
 delete mode 100644 package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch

diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch
deleted file mode 100644
index 76a33eb1dd..0000000000
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- xdriver_xf86-video-intel-2.9.1/configure.ac.orig	2010-01-28 11:18:27.526329157 +0200
-+++ xdriver_xf86-video-intel-2.9.1/configure.ac	2010-01-28 11:21:38.065198735 +0200
-@@ -114,6 +114,7 @@ save_CFLAGS="$CFLAGS"
- CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
- CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
- AC_MSG_CHECKING([whether to include DRI support])
-+if test "$cross_compiling" = "no" ; then
- if test x$DRI != xno; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -132,6 +133,14 @@ if test x$DRI = xauto; then
-                 DRI="no"
-         fi
- fi
-+else
-+if test x$DRI != xno; then
-+	have_dri_h="yes"
-+	have_sarea_h="yes"
-+	have_dristruct_h="yes"
-+	DRI="yes"
-+fi
-+fi
- AC_MSG_RESULT([$DRI])
- CFLAGS="$save_CFLAGS $DEBUGFLAGS"
- 
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch
similarity index 100%
rename from package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch
rename to package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index acffd668c3..b5bdf1a3c5 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.10.0
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.13.0
 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch
deleted file mode 100644
index bf9ffe79ef..0000000000
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xf86-video-vesa-2.0.0/configure.ac.orig	2007-06-11 13:10:35.000000000 +0200
-+++ xf86-video-vesa-2.0.0/configure.ac	2007-06-11 14:16:45.000000000 +0200
-@@ -56,8 +56,8 @@
- PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
--CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
-+CFLAGS="$CFLAGS $XORG_CFLAGS "'-I$(top_srcdir)/src'
-+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])
- 

From c31ecd5345acab2e22d309b7014e77757552c49b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:49:57 +0200
Subject: [PATCH 2795/6849] xdriver_x86-driver-mga: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 3adf5272d7..391ca20195 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.11
+XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.13
 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES

From 98d5d6ed142f497ad25a2d91fe0745c081e10b5b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:50:21 +0200
Subject: [PATCH 2796/6849] xdriver_x86-driver-neomagic: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 0bf3fca550..c92a49d308 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.4
+XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.5
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto

From a93c41fd675555b88cb837e4ee6ea93252aeeb14 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:50:53 +0200
Subject: [PATCH 2797/6849] xdriver_x86-driver-nv: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index da920f7e11..d99e85c608 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.15
+XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.18
 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From 77c7dffef279356d2096cba869cb38ed595b0333 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:51:15 +0200
Subject: [PATCH 2798/6849] xdriver_x86-driver-rendition: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-rendition.mk                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index 6d490c2047..d83a1ef4bf 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.3
+XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.4
 XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto

From c044426217958e197f94e5c7e1c5870e4503b251 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:51:46 +0200
Subject: [PATCH 2799/6849] xdriver_x86-driver-siliconmotion: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-siliconmotion.mk                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 1d3fafcb46..88e8f077ea 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.3
+XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.4
 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From 5be6125b5d2b8b482301b08d4364f90db43cfd91 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:52:40 +0200
Subject: [PATCH 2800/6849] xdriver_x86-driver-sisusb: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index a43ba60fb5..c59b8760b4 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.3
+XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.4
 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto

From 43bbcd1737c0983b57504879d7e9c2fd61270b3b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:53:29 +0200
Subject: [PATCH 2801/6849] xdriver_x86-driver-trident: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 46967c877d..a6002e8144 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.3
+XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.4
 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto

From 26923ad2957282f5ca373872d1622a257bc5a8db Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 15:53:53 +0200
Subject: [PATCH 2802/6849] xdriver_x86-driver-tseng: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index ed21580004..8127c7d71e 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.3
+XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.4
 XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From 2de9772d036c406a39cf9bfc931b9a2f749beceb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:35:30 +0200
Subject: [PATCH 2803/6849] xdriver_x86-video-vesa: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index 112e28d266..b8831a04db 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_VESA_VERSION = 2.2.1
+XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.0
 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))

From 5e256a21891d9d53c56c95ac8b4bedf72d8f189a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 16:49:29 +0200
Subject: [PATCH 2804/6849] xdriver_x86-driver-vmware: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 6a6beb07fd..6e87ce185d 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.8
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 11.0.3
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto

From ae63946346747dbe8d6ccbd45225578e23d38c7a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 16:50:19 +0200
Subject: [PATCH 2805/6849] xdriver_x86-driver-voodoo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 4811d68ab0..49065c6c08 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.3
+XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.4
 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto

From 8c647d14fd71fb526fce0382f9af69c150626851 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 16:55:50 +0200
Subject: [PATCH 2806/6849] xdriver_x86-driver-xgi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...xdriver_xf86-video-xgi-cross-compile.patch | 24 -------------------
 .../xdriver_xf86-video-xgi.mk                 |  4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi-cross-compile.patch

diff --git a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi-cross-compile.patch b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi-cross-compile.patch
deleted file mode 100644
index fc7903c46b..0000000000
--- a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi-cross-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- xdriver_xf86-video-xgi-1.5.1/configure.ac.orig	2009-09-07 08:03:18.000000000 +0300
-+++ xdriver_xf86-video-xgi-1.5.1/configure.ac	2010-02-03 23:58:40.507035914 +0200
-@@ -78,12 +78,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo
- AC_HEADER_STDC
- 
- if test "x$DRI" = xauto; then
--        AC_CHECK_FILE([${sdkdir}/dri.h],
-+        if test "$cross_compiling" = "no" ; then
-+                AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
--        AC_CHECK_FILE([${sdkdir}/sarea.h],
-+                AC_CHECK_FILE([${sdkdir}/sarea.h],
-                       [have_sarea_h="yes"], [have_sarea_h="no"])
--        AC_CHECK_FILE([${sdkdir}/dristruct.h],
-+                AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+        else
-+                have_dri_h="yes"
-+                have_sarea_h="yes"
-+                have_dristruct_h="yes"
-+        fi
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
index 53510dfe9c..491f4e8caa 100644
--- a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
+++ b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_XGI_VERSION = 1.5.1
+XDRIVER_XF86_VIDEO_XGI_VERSION = 1.6.0
 XDRIVER_XF86_VIDEO_XGI_SOURCE = xf86-video-xgi-$(XDRIVER_XF86_VIDEO_XGI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_XGI_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_XGI_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_XGI_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_XGI_CONF_OPT = --enable-dri
 
 $(eval $(autotools-package))

From 6ca752dce9494874149bb83106192d5ed4dab0cf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 16:56:56 +0200
Subject: [PATCH 2807/6849] xdriver_x86-driver-xgixp: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
index f1e518aea9..4a9a2a2423 100644
--- a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
+++ b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_XGIXP_VERSION = 1.7.99.4
+XDRIVER_XF86_VIDEO_XGIXP_VERSION = 1.8.0
 XDRIVER_XF86_VIDEO_XGIXP_SOURCE = xf86-video-xgixp-$(XDRIVER_XF86_VIDEO_XGIXP_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_XGIXP_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_XGIXP_AUTORECONF = YES

From 58986810e01663d9eee1fd7f1cbf7639f1c4b330 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:47:22 +0200
Subject: [PATCH 2808/6849] xapp_bdftopcf: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 301b1d31fb..739b4a9ca1 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_BDFTOPCF_VERSION = 1.0.2
+XAPP_BDFTOPCF_VERSION = 1.0.3
 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont

From c02bbe2a52d8faabf624fd60b8c838efdd6e0b62 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:48:19 +0200
Subject: [PATCH 2809/6849] xapp_iceauth: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_iceauth/xapp_iceauth.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 9ea0e8a267..569f05373d 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_ICEAUTH_VERSION = 1.0.3
+XAPP_ICEAUTH_VERSION = 1.0.4
 XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11

From 60e21b7cd7f23daefcec3deb113121c2d9a79b52 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:48:56 +0200
Subject: [PATCH 2810/6849] xapp_luit: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_luit/xapp_luit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index 2ebada863f..7a0ab35df0 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_LUIT_VERSION = 1.0.4
+XAPP_LUIT_VERSION = 1.1.0
 XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
 XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc

From 5f0fd7c0133bd5f39dcfb6e0c15d67b8c535cc64 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:49:56 +0200
Subject: [PATCH 2811/6849] xapp_mkfontdir: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 674d5837fb..fa4e990d11 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_MKFONTDIR_VERSION = 1.0.5
+XAPP_MKFONTDIR_VERSION = 1.0.6
 XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale

From bfaa2000fa20dd3d4cd84cb1f0fabe994ec44d63 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:50:30 +0200
Subject: [PATCH 2812/6849] xapp_mkfontscale: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 6bb00ad92c..99155495b2 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_MKFONTSCALE_VERSION = 1.0.7
+XAPP_MKFONTSCALE_VERSION = 1.0.8
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto

From bd2f759dd7c12f5f2b9fafe806bd9b9c3d2153b2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:50:58 +0200
Subject: [PATCH 2813/6849] xapp_sessreg: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_sessreg/xapp_sessreg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 07acae9eed..6b0fbdee95 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_SESSREG_VERSION = 1.0.5
+XAPP_SESSREG_VERSION = 1.0.6
 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
 XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto

From 4650a2deee2fb143426f3bd3729a0739448c87bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:51:39 +0200
Subject: [PATCH 2814/6849] xapp_setxkbmap: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index cab56a014f..ef28f1ca0b 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_SETXKBMAP_VERSION = 1.1.0
+XAPP_SETXKBMAP_VERSION = 1.2.0
 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
 XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile

From a2d4766a0adff944de282fa65d59e13edaf68e0c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:52:19 +0200
Subject: [PATCH 2815/6849] xapp_smproxy: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_smproxy/xapp_smproxy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 3089811f22..2653cf49f9 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_SMPROXY_VERSION = 1.0.3
+XAPP_SMPROXY_VERSION = 1.0.4
 XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
 XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt

From a9ed20b5382fc5db5f77aea123278662898848bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:52:44 +0200
Subject: [PATCH 2816/6849] xapp_x11perf: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_x11perf/xapp_x11perf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index 2a3254589b..d58a45c645 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_X11PERF_VERSION = 1.5.1
+XAPP_X11PERF_VERSION = 1.5.2
 XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft

From d97fe429f22b27200b8e16f5de85b785d1f4678e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:54:33 +0200
Subject: [PATCH 2817/6849] xapp_xauth: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch | 11 -----------
 package/x11r7/xapp_xauth/xapp_xauth.mk              |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch

diff --git a/package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch b/package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch
deleted file mode 100644
index 61c6b14f99..0000000000
--- a/package/x11r7/xapp_xauth/xapp_xauth-1.0.3-xcb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xauth-1.0.3/configure.ac.orig	2007-06-06 22:33:44.000000000 +0200
-+++ xauth-1.0.3/configure.ac	2007-06-06 22:33:57.000000000 +0200
-@@ -40,7 +40,7 @@
- AC_CHECK_HEADERS([net/errno.h])
- 
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
-+PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu xcb)
- AC_SUBST(XAUTH_CFLAGS)
- AC_SUBST(XAUTH_LIBS)
- 
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index 0444c93307..d075c05513 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XAUTH_VERSION = 1.0.4
+XAPP_XAUTH_VERSION = 1.0.5
 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu

From 41e729115a3a94d712bd0826031d55b45e1b4efb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:54:52 +0200
Subject: [PATCH 2818/6849] xapp_xbacklight: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 4881184b1c..52b0decaaf 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XBACKLIGHT_VERSION = 1.1.1
+XAPP_XBACKLIGHT_VERSION = 1.1.2
 XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2
 XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender

From e3aa4685b3783ab962d2e14dcd6aba2676fd3012 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:55:32 +0200
Subject: [PATCH 2819/6849] xapp_xcmsdb: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index bf6ab4fb7a..64fe99f682 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XCMSDB_VERSION = 1.0.2
+XAPP_XCMSDB_VERSION = 1.0.3
 XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
 XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11

From 62a3a026cb19c17cd1c6214e0945fc1cfe71c7cb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:56:21 +0200
Subject: [PATCH 2820/6849] xapp_xdpyinfo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk | 2 +-
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index c473b7ec25..c0dc8d147e 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XCURSORGEN_VERSION = 1.0.4
+XAPP_XCURSORGEN_VERSION = 1.0.5
 XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 2ec08ba9fc..fea4fb03f7 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XDPYINFO_VERSION = 1.1.0
+XAPP_XDPYINFO_VERSION = 1.2.0
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx

From 1ece496a4eb537392d63a308aeb61a00eb5c5234 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:56:47 +0200
Subject: [PATCH 2821/6849] xapp_xdriinfo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index c1864e37ef..67b006979c 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XDRIINFO_VERSION = 1.0.3
+XAPP_XDRIINFO_VERSION = 1.0.4
 XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d

From d4fa80e04e9c6f435333cd5706c3b4e88d07ae75 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:57:32 +0200
Subject: [PATCH 2822/6849] xapp_xev: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xev/xapp_xev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 13b9507f10..c246be5331 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XEV_VERSION = 1.0.4
+XAPP_XEV_VERSION = 1.1.0
 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEV_DEPENDENCIES = xlib_libX11

From ca4f4e3200ac8788648e84497feab9dc38e8774a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:57:56 +0200
Subject: [PATCH 2823/6849] xapp_xgamma: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xgamma/xapp_xgamma.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 8d0ec24da1..b755c858e9 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XGAMMA_VERSION = 1.0.3
+XAPP_XGAMMA_VERSION = 1.0.4
 XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
 XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm

From 4fecf12ab0388cfd3a5370871b3ac5ce169b2792 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 20:58:23 +0200
Subject: [PATCH 2824/6849] xapp_xhost: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xhost/xapp_xhost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 24517df1f8..874bf5e955 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XHOST_VERSION = 1.0.3
+XAPP_XHOST_VERSION = 1.0.4
 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 0922447616dfba236a056bdecc4cd57f22e5b258 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:02:57 +0200
Subject: [PATCH 2825/6849] xapp_xkbcomp: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 846ba71cce..5208f1dd71 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBCOMP_VERSION = 1.1.1
+XAPP_XKBCOMP_VERSION = 1.2.0
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile

From 5b58ef18998203b93bf50f3ad3100c207780d718 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:03:23 +0200
Subject: [PATCH 2826/6849] xapp_xkbevd: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index a451e49866..0e93b484e5 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBEVD_VERSION = 1.1.0
+XAPP_XKBEVD_VERSION = 1.1.2
 XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
 XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile

From 9b974d587438e81d8d5c236dbad9a3f957b239c0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:03:48 +0200
Subject: [PATCH 2827/6849] xapp_xkbutils: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index d749d18210..632fcf30ed 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBUTILS_VERSION = 1.0.2
+XAPP_XKBUTILS_VERSION = 1.0.3
 XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2
 XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile

From f78da79741086b8e815ef3d9b093e1a2a08731aa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:04:31 +0200
Subject: [PATCH 2828/6849] xapp_xkill: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xkill/xapp_xkill.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index c99e050ede..0611b3f0e9 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKILL_VERSION = 1.0.2
+XAPP_XKILL_VERSION = 1.0.3
 XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2
 XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 98fda5ba568d03380eba5a52374b2166f201a60f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:04:55 +0200
Subject: [PATCH 2829/6849] xapp_xlsatoms: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index 96c7937490..1863ca6b0f 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XLSATOMS_VERSION = 1.0.2
+XAPP_XLSATOMS_VERSION = 1.1.0
 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 43abf908fa9328e5d173e8b4cb8c4d75c6256638 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:05:24 +0200
Subject: [PATCH 2830/6849] xapp_xlsclients: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index 92c7d53b5f..28ca4ee0a3 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XLSCLIENTS_VERSION = 1.0.2
+XAPP_XLSCLIENTS_VERSION = 1.1.0
 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu

From f3661aa5af31e6b311e7239f1d04d8e8002aaf98 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:05:53 +0200
Subject: [PATCH 2831/6849] xapp_xmodmap: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index 72bfa5d7a5..4fa06cd09c 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XMODMAP_VERSION = 1.0.4
+XAPP_XMODMAP_VERSION = 1.0.5
 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11

From 84893444bb7d20fc09c53f6ed53b296135ea043d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:06:18 +0200
Subject: [PATCH 2832/6849] xapp_xprop: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xprop/xapp_xprop.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index c382b8eacf..65e55d759c 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XPROP_VERSION = 1.1.0
+XAPP_XPROP_VERSION = 1.2.0
 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu

From f578eca838e460bdfa845da57ea9f815990c60a2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:08:50 +0200
Subject: [PATCH 2833/6849] xapp_xrandr: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xapp_xrandr-1.2.3-clone-redef.patch       | 29 -------------------
 package/x11r7/xapp_xrandr/xapp_xrandr.mk      |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch

diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch b/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch
deleted file mode 100644
index 6dc353466c..0000000000
--- a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/xrandr.c.orig	2008-02-02 17:09:45.000000000 -0500
-+++ b/xrandr.c	2008-02-02 17:04:51.000000000 -0500
-@@ -189,7 +189,7 @@ reflection_name (Rotation rotation)
- 
- #if HAS_RANDR_1_2
- typedef enum _policy {
--    clone, extend
-+    clone1, extend
- } policy_t;
- 
- typedef enum _relation {
-@@ -1602,7 +1602,7 @@ main (int argc, char **argv)
-     int		ret = 0;
- #if HAS_RANDR_1_2
-     output_t	*output = NULL;
--    policy_t	policy = clone;
-+    policy_t	policy = clone1;
-     Bool    	setit_1_2 = False;
-     Bool    	query_1_2 = False;
-     Bool	modeit = False;
-@@ -1863,7 +1863,7 @@ main (int argc, char **argv)
- 	    continue;
- 	}
- 	if (!strcmp ("--clone", argv[i])) {
--	    policy = clone;
-+	    policy = clone1;
- 	    setit_1_2 = True;
- 	    continue;
- 	}
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 5c6c756772..5a1b363bb5 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XRANDR_VERSION = 1.3.2
+XAPP_XRANDR_VERSION = 1.3.4
 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
 XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11

From 3833c8e968b8a51b53d0623ba540ef03e7e7247f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:09:30 +0200
Subject: [PATCH 2834/6849] xapp_xrdb: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xrdb/xapp_xrdb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 675b2877be..f6e5e51da5 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XRDB_VERSION = 1.0.6
+XAPP_XRDB_VERSION = 1.0.7
 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 7425b19a5be1a46d85636364b6449d6b5cf4f44c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:09:55 +0200
Subject: [PATCH 2835/6849] xapp_xrefresh: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index c6a92acee7..6146856d97 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XREFRESH_VERSION = 1.0.3
+XAPP_XREFRESH_VERSION = 1.0.4
 XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2
 XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XREFRESH_DEPENDENCIES = xlib_libX11

From 7ed1bb4d59c88d3bb497a7c4998dbaca75919459 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:10:22 +0200
Subject: [PATCH 2836/6849] xapp_xset: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xset/xapp_xset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 5eeb9376f5..088cebcb21 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XSET_VERSION = 1.1.0
+XAPP_XSET_VERSION = 1.2.1
 XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu

From 4db3d59b264dde31c81009d85316da9bbc34fcf1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:10:45 +0200
Subject: [PATCH 2837/6849] xapp_xsetroot: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 94fbdafdc3..881e408dcb 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XSETROOT_VERSION = 1.0.3
+XAPP_XSETROOT_VERSION = 1.1.0
 XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps

From dd02eb936604f28612c3844fc598dc554ade1f96 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:11:09 +0200
Subject: [PATCH 2838/6849] xapp_xvinfo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index ff4083ebfa..ed1127a6cc 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XVINFO_VERSION = 1.1.0
+XAPP_XVINFO_VERSION = 1.1.1
 XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2
 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv

From 41320f9d2ca99320b7cec115044b78fea935cddd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:11:32 +0200
Subject: [PATCH 2839/6849] xapp_xwd: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xwd/xapp_xwd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index c42797f130..94ae800a62 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XWD_VERSION = 1.0.3
+XAPP_XWD_VERSION = 1.0.4
 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 7f38ab2fdf75625830e265c39fdd5c1965fa809a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:11:52 +0200
Subject: [PATCH 2840/6849] xapp_xwininfo: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index 30837297a2..e7f0e038d3 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XWININFO_VERSION = 1.0.5
+XAPP_XWININFO_VERSION = 1.1.1
 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 4fe35f82571d8a72b5afa7cfef88c3f2dfe8a7dd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:12:12 +0200
Subject: [PATCH 2841/6849] xapp_xwud: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xwud/xapp_xwud.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index d13024c61c..cbe229f775 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XWUD_VERSION = 1.0.2
+XAPP_XWUD_VERSION = 1.0.3
 XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWUD_DEPENDENCIES = xlib_libX11

From 5e4dc1a08fbda69d1b8335d7843df74e80016b61 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:12:40 +0200
Subject: [PATCH 2842/6849] xdata_xbitmaps: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index b35087c205..1f267433d7 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDATA_XBITMAPS_VERSION = 1.1.0
+XDATA_XBITMAPS_VERSION = 1.1.1
 XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
 XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XBITMAPS_INSTALL_STAGING = YES

From d52664bc93c54e3586a287057f3654cf99c6215b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:13:14 +0200
Subject: [PATCH 2843/6849] xdata_xcursor-themes: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 605d6fa12e..e46fbbc7c7 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -3,7 +3,8 @@
 # xdata_xcursor-themes - No description available
 #
 #############################################################
-XDATA_XCURSOR_THEMES_VERSION = 1.0.2
+
+XDATA_XCURSOR_THEMES_VERSION = 1.0.3
 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2
 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES

From 7fcf26e1c527d38b316bd9c9becc2ccf32685b76 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:14:02 +0200
Subject: [PATCH 2844/6849] xfont_font-adobe-100dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index d28f1ad145..70487dc5a9 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.1
+XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.3
 XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From f9aea47e0b7c9f2d33e88153bb942c929f87e72c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:14:53 +0200
Subject: [PATCH 2845/6849] xfont_font-adobe-75dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index e572fccd1e..fa1212ff53 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.1
+XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.3
 XFONT_FONT_ADOBE_75DPI_SOURCE = font-adobe-75dpi-$(XFONT_FONT_ADOBE_75DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From efd168f8cedb1f2419465c60785c18519717df74 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:15:30 +0200
Subject: [PATCH 2846/6849] xfont_font-adobe-utopia-100dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-adobe-utopia-100dpi.mk                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index a77e9e5bb0..a8421686a3 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.2
+XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.4
 XFONT_FONT_ADOBE_UTOPIA_100DPI_SOURCE = font-adobe-utopia-100dpi-$(XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 8b1e12b0d06a02f8b76d2c4e7e8564235b9eaf28 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:17:24 +0200
Subject: [PATCH 2847/6849] xfont_font-adobe-utopia-75dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-adobe-utopia-75dpi.mk                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index 90aa8c70b3..54b7607c2c 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION = 1.0.2
+XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION = 1.0.4
 XFONT_FONT_ADOBE_UTOPIA_75DPI_SOURCE = font-adobe-utopia-75dpi-$(XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 4184f055273e58024836577e55d524afe7882db1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:17:59 +0200
Subject: [PATCH 2848/6849] xfont_font-adobe-utopia-type1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-adobe-utopia-type1.mk                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index b516c6089f..e991aea326 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.2
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.4
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From cb611cfc19d028cc9c8e3366abd0558ff285ccce Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:18:25 +0200
Subject: [PATCH 2849/6849] xfont_font-alias: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-alias/xfont_font-alias.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 6001c2807e..05df9612c8 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ALIAS_VERSION = 1.0.2
+XFONT_FONT_ALIAS_VERSION = 1.0.3
 XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2
 XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From b9bd4446e07c0348973f4738a4963e5b78877d07 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:18:46 +0200
Subject: [PATCH 2850/6849] xfont_font-arabic-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index 7558254173..8802c5d3d7 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ARABIC_MISC_VERSION = 1.0.1
+XFONT_FONT_ARABIC_MISC_VERSION = 1.0.3
 XFONT_FONT_ARABIC_MISC_SOURCE = font-arabic-misc-$(XFONT_FONT_ARABIC_MISC_VERSION).tar.bz2
 XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 8a96c30b5e6fd91983849346d006b42d146f8398 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:19:22 +0200
Subject: [PATCH 2851/6849] xfont_font-bh-100dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 0bddb15793..2f435248df 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BH_100DPI_VERSION = 1.0.1
+XFONT_FONT_BH_100DPI_VERSION = 1.0.3
 XFONT_FONT_BH_100DPI_SOURCE = font-bh-100dpi-$(XFONT_FONT_BH_100DPI_VERSION).tar.bz2
 XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From ddbf1762efafdacb1d5c79a898273926d44f07e0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:19:43 +0200
Subject: [PATCH 2852/6849] xfont_font-bh-75dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 439c32ed2d..37235c850c 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BH_75DPI_VERSION = 1.0.1
+XFONT_FONT_BH_75DPI_VERSION = 1.0.3
 XFONT_FONT_BH_75DPI_SOURCE = font-bh-75dpi-$(XFONT_FONT_BH_75DPI_VERSION).tar.bz2
 XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 908ecee11b2770df7a6d19128bd26a8c0cce74a8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:20:17 +0200
Subject: [PATCH 2853/6849] xfont_font-bh-lucidatypewriter-100dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index 192c19cfd4..8eac391475 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.1
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.3
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE = font-bh-lucidatypewriter-100dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION).tar.bz2
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From e08a1eb98175f12c997c752c034c3312ed993ac8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:20:40 +0200
Subject: [PATCH 2854/6849] xfont_font-bh-lucidatypewriter-75dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index b94f8c5e8f..22bd15139b 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.1
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.3
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE = font-bh-lucidatypewriter-75dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION).tar.bz2
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 612af34153012f13e374b9e363c92e8117f3e93d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:21:10 +0200
Subject: [PATCH 2855/6849] xfont_font-bh-ttf: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index 89bbc3970c..874e495fc9 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BH_TTF_VERSION = 1.0.1
+XFONT_FONT_BH_TTF_VERSION = 1.0.3
 XFONT_FONT_BH_TTF_SOURCE = font-bh-ttf-$(XFONT_FONT_BH_TTF_VERSION).tar.bz2
 XFONT_FONT_BH_TTF_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From e51582281e1ca85138cd3ed2d4375998acb6daae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:21:32 +0200
Subject: [PATCH 2856/6849] xfont_font-bh-type1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 4c50b76d49..842f73f4e2 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BH_TYPE1_VERSION = 1.0.1
+XFONT_FONT_BH_TYPE1_VERSION = 1.0.3
 XFONT_FONT_BH_TYPE1_SOURCE = font-bh-type1-$(XFONT_FONT_BH_TYPE1_VERSION).tar.bz2
 XFONT_FONT_BH_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 32572fd6534f6f5071697e5d02f9b557c530a42c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:22:02 +0200
Subject: [PATCH 2857/6849] xfont_font-bitstream-100dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index 8ba2afd17c..702903683d 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.1
+XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.3
 XFONT_FONT_BITSTREAM_100DPI_SOURCE = font-bitstream-100dpi-$(XFONT_FONT_BITSTREAM_100DPI_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From eadc7d87c191a9e7b5769ea7aa4f5e8edbd49fb3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:22:20 +0200
Subject: [PATCH 2858/6849] xfont_font-bitstream-75dpi: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index 67542f5ab5..e8d4211117 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.1
+XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.3
 XFONT_FONT_BITSTREAM_75DPI_SOURCE = font-bitstream-75dpi-$(XFONT_FONT_BITSTREAM_75DPI_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 948044c4f6f40aa759686823f7f7f0e18ba9414c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:22:40 +0200
Subject: [PATCH 2859/6849] xfont_font-bitstream-type1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index f97a988fc8..25611415b4 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.1
+XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.3
 XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From a7e2e56bfd7aeeabe65f000bf46aeeeff151039d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:23:05 +0200
Subject: [PATCH 2860/6849] xfont_font-cronyx-cyrillic: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 28fa83c7ea..16468bebf1 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.1
+XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.3
 XFONT_FONT_CRONYX_CYRILLIC_SOURCE = font-cronyx-cyrillic-$(XFONT_FONT_CRONYX_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 579f7b124726cf386c66cb2a5e630a8c651e2f60 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:23:29 +0200
Subject: [PATCH 2861/6849] xfont_font-cursor-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 1d366dfe78..c193a4aab1 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_CURSOR_MISC_VERSION = 1.0.1
+XFONT_FONT_CURSOR_MISC_VERSION = 1.0.3
 XFONT_FONT_CURSOR_MISC_SOURCE = font-cursor-misc-$(XFONT_FONT_CURSOR_MISC_VERSION).tar.bz2
 XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From d4f7d1eb7ed47462c0f041ac08083dfb82de2009 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:23:54 +0200
Subject: [PATCH 2862/6849] xfont_font-daewoo-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index 41adb90512..f0207c64c4 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.1
+XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.3
 XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSION).tar.bz2
 XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From e9de3208de543adb3b7493845973ddf6164c874d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:24:16 +0200
Subject: [PATCH 2863/6849] xfont_font-dec-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index a00bd437e4..830e5cb3b2 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_DEC_MISC_VERSION = 1.0.1
+XFONT_FONT_DEC_MISC_VERSION = 1.0.3
 XFONT_FONT_DEC_MISC_SOURCE = font-dec-misc-$(XFONT_FONT_DEC_MISC_VERSION).tar.bz2
 XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From d1f9f0a795ba6ea0bfb2c8c36cf849a172970cf0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:24:43 +0200
Subject: [PATCH 2864/6849] xfont_font-ibm-type1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 2a1e63416f..749d3557fa 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_IBM_TYPE1_VERSION = 1.0.1
+XFONT_FONT_IBM_TYPE1_VERSION = 1.0.3
 XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.bz2
 XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 8cdf27fa1c7b4957c5ac3b3d30f37b132387822c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:25:31 +0200
Subject: [PATCH 2865/6849] xfont_font-isas-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 0405456b6a..2e8e193b50 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_ISAS_MISC_VERSION = 1.0.1
+XFONT_FONT_ISAS_MISC_VERSION = 1.0.3
 XFONT_FONT_ISAS_MISC_SOURCE = font-isas-misc-$(XFONT_FONT_ISAS_MISC_VERSION).tar.bz2
 XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From a2af502461ec68e8bd912aac1b5cf23a8275f3d4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:26:03 +0200
Subject: [PATCH 2866/6849] xfont_font-jis-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 9ecf0dad1b..3dda77c186 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_JIS_MISC_VERSION = 1.0.1
+XFONT_FONT_JIS_MISC_VERSION = 1.0.3
 XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz2
 XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 41a65075f3e9374a92d05b1dd9f1e5f131b6d5a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:26:29 +0200
Subject: [PATCH 2867/6849] xfont_font-micro-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 3cf0af6a27..cdbaaebce6 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_MICRO_MISC_VERSION = 1.0.1
+XFONT_FONT_MICRO_MISC_VERSION = 1.0.3
 XFONT_FONT_MICRO_MISC_SOURCE = font-micro-misc-$(XFONT_FONT_MICRO_MISC_VERSION).tar.bz2
 XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From b906c47a5ef74230b5c1519fb9314b9f70bbe9f6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:27:02 +0200
Subject: [PATCH 2868/6849] xfont_font-misc-cyrillic: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index fd5d8e065f..d45f223d43 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.1
+XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.3
 XFONT_FONT_MISC_CYRILLIC_SOURCE = font-misc-cyrillic-$(XFONT_FONT_MISC_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From f508b5150b28618d23dd0a96f4a953bb1406aaa0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:27:39 +0200
Subject: [PATCH 2869/6849] xfont_font-misc-ethiopic: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index 80e46e4813..09bafd91db 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.1
+XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.3
 XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2
 XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From aba6c3809b9440e7cc75d0ce33a6e4fa6fc03b58 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:28:05 +0200
Subject: [PATCH 2870/6849] xfont_font-misc-meltho: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index d6db3d468a..310ba6400b 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_MISC_MELTHO_VERSION = 1.0.1
+XFONT_FONT_MISC_MELTHO_VERSION = 1.0.3
 XFONT_FONT_MISC_MELTHO_SOURCE = font-misc-meltho-$(XFONT_FONT_MISC_MELTHO_VERSION).tar.bz2
 XFONT_FONT_MISC_MELTHO_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 90b7d874f47f807be762f67e2c903ca33ce953b7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:28:24 +0200
Subject: [PATCH 2871/6849] xfont_font-misc-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index 1cdf0e5871..e4714b04ab 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_MISC_MISC_VERSION = 1.1.0
+XFONT_FONT_MISC_MISC_VERSION = 1.1.2
 XFONT_FONT_MISC_MISC_SOURCE = font-misc-misc-$(XFONT_FONT_MISC_MISC_VERSION).tar.bz2
 XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 23e5710305139d1eb8f217bf960b9c1ba125ea3d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:28:50 +0200
Subject: [PATCH 2872/6849] xfont_font-mutt-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index e151831fe9..9a10b76201 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_MUTT_MISC_VERSION = 1.0.1
+XFONT_FONT_MUTT_MISC_VERSION = 1.0.3
 XFONT_FONT_MUTT_MISC_SOURCE = font-mutt-misc-$(XFONT_FONT_MUTT_MISC_VERSION).tar.bz2
 XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From aef84b5523e7b4385d2ed2cd363a21c57dea7198 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:29:14 +0200
Subject: [PATCH 2873/6849] xfont_font-schumacher-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 799b1d5a8b..aec3073aed 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.0
+XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.2
 XFONT_FONT_SCHUMACHER_MISC_SOURCE = font-schumacher-misc-$(XFONT_FONT_SCHUMACHER_MISC_VERSION).tar.bz2
 XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 1247308419f4ca0f9c94c43711356b12ff65f41f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:29:37 +0200
Subject: [PATCH 2874/6849] xfont_font-screen-cyrillic: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index 70772fbd27..db22b9b854 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.2
+XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.4
 XFONT_FONT_SCREEN_CYRILLIC_SOURCE = font-screen-cyrillic-$(XFONT_FONT_SCREEN_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From f019492c3de616ffa0903e15f79484ddbc3f41e1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:29:59 +0200
Subject: [PATCH 2875/6849] xfont_font-sony-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 43b63d204a..b3ad6da490 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_SONY_MISC_VERSION = 1.0.1
+XFONT_FONT_SONY_MISC_VERSION = 1.0.3
 XFONT_FONT_SONY_MISC_SOURCE = font-sony-misc-$(XFONT_FONT_SONY_MISC_VERSION).tar.bz2
 XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From f2559014c25523a11f89c5f045288c50b7f075ae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:30:37 +0200
Subject: [PATCH 2876/6849] xfont_font-sun-misc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index eb98af310f..39a24373d4 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_SUN_MISC_VERSION = 1.0.1
+XFONT_FONT_SUN_MISC_VERSION = 1.0.3
 XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.bz2
 XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From e9b4564a768874465db821b8b2d8d28786fa3039 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:31:31 +0200
Subject: [PATCH 2877/6849] xfont_font-util: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_font-util/xfont_font-util.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 2445c94460..832b441b57 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_UTIL_VERSION = 1.1.1
+XFONT_FONT_UTIL_VERSION = 1.2.0
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config

From ee4e55b95acf9b3f21d22e5389de6b3a8a5b53c0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:31:54 +0200
Subject: [PATCH 2878/6849] xfont_font-winitzki-cyrillic: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xfont_font-winitzki-cyrillic.mk                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 0879fd407c..1153659ccd 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.1
+XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.3
 XFONT_FONT_WINITZKI_CYRILLIC_SOURCE = font-winitzki-cyrillic-$(XFONT_FONT_WINITZKI_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 370522fb71028f2e098f5ac061d4a3d7faf637dc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:32:18 +0200
Subject: [PATCH 2879/6849] xfont_font-xfree86-type1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index e0a27ab01a..bb23be9fbd 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.2
+XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.4
 XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2
 XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

From 69e6cd4a2fa80d9299d9e763923f6adae46919a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 22 Sep 2012 21:35:48 +0200
Subject: [PATCH 2880/6849] x11r7: update Config.in

Don't mention the revision in the option text (we're now at 7.6)
and add the upstream URL.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 664226f85e..bb538e1e0f 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -1,5 +1,5 @@
 menuconfig BR2_PACKAGE_XORG7
-	bool "X.org X Window System, X11R7, release 7.5"
+	bool "X.org X Window System"
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_EXPAT
@@ -9,6 +9,8 @@ menuconfig BR2_PACKAGE_XORG7
 	  Support for X11R7 libraries, servers, drivers, and/or
 	  applications in the target.
 
+	  http://xorg.freedesktop.org
+
 if BR2_PACKAGE_XORG7
 
 choice

From 24f659f51ceec0c21861437fbbcfd9453e0805b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:21 +0000
Subject: [PATCH 2881/6849] qemu/arm-versatile: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../arm-versatile/{linux-3.3.config => linux-3.5.config}  | 0
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.3.config => linux-3.5.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.3.config b/board/qemu/arm-versatile/linux-3.5.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.3.config
rename to board/qemu/arm-versatile/linux-3.5.config
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 5385f28914..2037565690 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.5.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From b1be73e3e33c7559abc5fa12e234b6f010f631aa Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:22 +0000
Subject: [PATCH 2882/6849] qemu/arm-vexpress: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_vexpress_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 03ea6e0afc..8ac7a07f5c 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -11,12 +11,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 345d290c64e22c33be50d2b78ca0fc5205656002 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:23 +0000
Subject: [PATCH 2883/6849] qemu/x86: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-3.4.config => linux-3.5.config} | 0
 configs/qemu_x86_defconfig                            | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/x86/{linux-3.4.config => linux-3.5.config} (100%)

diff --git a/board/qemu/x86/linux-3.4.config b/board/qemu/x86/linux-3.5.config
similarity index 100%
rename from board/qemu/x86/linux-3.4.config
rename to board/qemu/x86/linux-3.5.config
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 1851cecdbd..73c16a3160 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.4.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.5.config"

From 433073e6530fe111dc20356288b756860028d234 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:24 +0000
Subject: [PATCH 2884/6849] qemu/x86_64: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86_64/{linux-3.4.config => linux-3.5.config} | 0
 configs/qemu_x86_64_defconfig                            | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/x86_64/{linux-3.4.config => linux-3.5.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.4.config b/board/qemu/x86_64/linux-3.5.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.4.config
rename to board/qemu/x86_64/linux-3.5.config
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 91f5fc9e72..b7dac33ffb 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.4.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.5.config"

From 058e22e9c9917844e3409ebd702a269d63286640 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:25 +0000
Subject: [PATCH 2885/6849] qemu/sparc: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 9c5545858d..8818ad1e42 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,12 +6,12 @@ BR2_sparc_supersparc=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 651a95a77f5d9aeea52539b9af7195b0ec8f171b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:26 +0000
Subject: [PATCH 2886/6849] qemu/mips-malta: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mips-malta/{linux-3.4.config => linux-3.5.config}     | 0
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/mips-malta/{linux-3.4.config => linux-3.5.config} (100%)

diff --git a/board/qemu/mips-malta/linux-3.4.config b/board/qemu/mips-malta/linux-3.5.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.4.config
rename to board/qemu/mips-malta/linux-3.5.config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index f9ec326fb8..3bb2a72b4d 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.4.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.5.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 7a45aaf4e21c8af16da93ddf13ea006653df9ea4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:27 +0000
Subject: [PATCH 2887/6849] qemu/mipsel-malta: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mipsel-malta/{linux-3.4.config => linux-3.5.config}   | 0
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/mipsel-malta/{linux-3.4.config => linux-3.5.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-3.4.config b/board/qemu/mipsel-malta/linux-3.5.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.4.config
rename to board/qemu/mipsel-malta/linux-3.5.config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 055c1b11b4..8208379c7a 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.4.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.5.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 47de7c62fdb8a38e33c2b2f203ab8550ccca016b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:28 +0000
Subject: [PATCH 2888/6849] qemu/sh4-r2d: update to use kernel 3.2.30

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 0edd58318a..2168853a5f 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.30"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 33e20fbad2d5307b035819a7dde25049c04d621f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:29 +0000
Subject: [PATCH 2889/6849] qemu/ppc-mpc8544ds: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_ppc_mpc8544ds_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 8855961418..cc8b81a2a9 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,13 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.5 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_5=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 

From 12adb85f799d09a12402439e28887f133de413d4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:30 +0000
Subject: [PATCH 2890/6849] qemu/microblaze: update to use kernel 3.5.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../microblazebe-mmu/{kernel-3.4.config => kernel-3.5.config} | 0
 .../microblazeel-mmu/{kernel-3.4.config => kernel-3.5.config} | 0
 configs/qemu_microblazebe_mmu_defconfig                       | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                       | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/microblazebe-mmu/{kernel-3.4.config => kernel-3.5.config} (100%)
 rename board/qemu/microblazeel-mmu/{kernel-3.4.config => kernel-3.5.config} (100%)

diff --git a/board/qemu/microblazebe-mmu/kernel-3.4.config b/board/qemu/microblazebe-mmu/kernel-3.5.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/kernel-3.4.config
rename to board/qemu/microblazebe-mmu/kernel-3.5.config
diff --git a/board/qemu/microblazeel-mmu/kernel-3.4.config b/board/qemu/microblazeel-mmu/kernel-3.5.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/kernel-3.4.config
rename to board/qemu/microblazeel-mmu/kernel-3.5.config
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 11c6f95515..1d7be07afc 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.4.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.5.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 1ce9ac81e1..941bc3049e 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.4.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.5.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"

From d358e457237edbcdbef77fe29c40ef8f03fa769f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Sep 2012 04:54:31 +0000
Subject: [PATCH 2891/6849] qemu/mips64-malta: update to use kernel 3.5.4

Update to use the latest kernel 3.5.4.
And also update to the latest .config knobs, otherwise we were just
building a mips(32) target which failed miserably.
This config is still flaky, you get a login prompt but usually fail to
login, passing along an init=/bin/sh helps some but crashes are quite
usual.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mips64-malta/{linux-3.3.config => linux-3.5.config}    | 0
 configs/qemu_mips64_malta_defconfig                        | 7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename board/qemu/mips64-malta/{linux-3.3.config => linux-3.5.config} (100%)

diff --git a/board/qemu/mips64-malta/linux-3.3.config b/board/qemu/mips64-malta/linux-3.5.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.3.config
rename to board/qemu/mips64-malta/linux-3.5.config
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 5653c8832a..c7e977ae8c 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -1,6 +1,5 @@
 # Architecture
-BR2_mips=y
-BR2_mips_64=y
+BR2_mips64=y
 BR2_MIPS_NABI64=y
 
 # Toolchain
@@ -14,9 +13,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.5.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From a018c076fb2b73784469ed484437087f6fd08ca5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 21 Sep 2012 11:42:34 +0000
Subject: [PATCH 2892/6849] zeromq: bump version to 2.2.0

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/zeromq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index 99ee4cad34..284a168fe4 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ZEROMQ_VERSION = 2.1.11
+ZEROMQ_VERSION = 2.2.0
 ZEROMQ_SITE = http://download.zeromq.org/
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux

From f0b4b5a06867fd1ac71fd8f32ac837245fbbcd03 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 23 Sep 2012 13:13:32 +0200
Subject: [PATCH 2893/6849] xapp_xkbcomp: preseed xkbparse.c check

Fixes http://autobuild.buildroot.net/results/3fd3f1c7dfd17178c33d8c7f6f4b184019709967

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 5208f1dd71..5bfb01b1fc 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -8,6 +8,7 @@ XAPP_XKBCOMP_VERSION = 1.2.0
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
+XAPP_XKBCOMP_CONF_ENV = ac_cv_file___xkbparse_c=yes
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 52679e66a52461bc48188dc4c30490aba2a87595 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 23 Sep 2012 20:37:42 +0200
Subject: [PATCH 2894/6849] blackbox: fix build issue with gcc 4.6+

Fixes http://autobuild.buildroot.net/results/e99b292047b780d379f1123e61177c234d5d3351

Patch from Debian.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ox-0.70.1-gcc46-textpropertytostring.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch

diff --git a/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch b/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch
new file mode 100644
index 0000000000..af03be4b9c
--- /dev/null
+++ b/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch
@@ -0,0 +1,34 @@
+[PATCH] fix build issue with gcc 4.6+
+
+Debian patch from http://patch-tracker.debian.org/patch/series/dl/blackbox/0.70.1-13/textpropertytostring-unconditional.diff
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+
+Description: Declare bt::textPropertyToString unconditionally.
+Author: Jakub Wilk <jwilk@debian.org>
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/614468
+Last-Update: 2011-03-12
+
+--- a/lib/Util.hh
++++ b/lib/Util.hh
+@@ -25,6 +25,8 @@
+ #ifndef __Util_hh
+ #define __Util_hh
+ 
++#include <X11/Xutil.h>
++
+ #include <limits.h>
+ #include <string>
+ 
+@@ -94,10 +96,8 @@
+ 
+   std::string tolower(const std::string &string);
+ 
+-#ifdef _XUTIL_H_
+   std::string textPropertyToString(::Display *display,
+                                    ::XTextProperty& text_prop);
+-#endif
+ 
+ } // namespace bt
+ 

From 31b45a8c72b365c09100a7cb99c82c8e63d1b479 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 23 Sep 2012 02:51:00 +0000
Subject: [PATCH 2895/6849] xl2tp: bump to version 1.3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xl2tp/xl2tp-1.2.7-makefile-flags.patch    | 33 -------------------
 ...-1.2.7-legacy.patch => xl2tp-legacy.patch} |  0
 package/xl2tp/xl2tp.mk                        | 21 +++---------
 3 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 package/xl2tp/xl2tp-1.2.7-makefile-flags.patch
 rename package/xl2tp/{xl2tp-1.2.7-legacy.patch => xl2tp-legacy.patch} (100%)

diff --git a/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch b/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch
deleted file mode 100644
index 68a56a60b3..0000000000
--- a/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Make sure that the CFLAGS passed on the command line are taken into
-account.
-
---- xl2tp-1.2.7/Makefile-orig	2010-08-05 15:33:46.000000000 -0700
-+++ xl2tp-1.2.7/Makefile	2010-09-30 22:34:54.000000000 -0700
-@@ -90,7 +90,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include
- 
- IPFLAGS?= -DIP_ALLOCATION
- 
--CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
-+COMPILE_FLAGS+= $(DFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
- HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
- OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
- SRCS=${OBJS:.o=.c} ${HDRS}
-@@ -105,6 +105,9 @@ MANDIR?=$(DESTDIR)${PREFIX}/share/man
- 
- all: $(EXEC) pfc
- 
-+%.o: %.c
-+	$(CC) $(COMPILE_FLAGS) $(CFLAGS) -c -o $@ -shared $<
-+
- clean:
- 	rm -f $(OBJS) $(EXEC) pfc.o pfc
- 
-@@ -112,7 +115,7 @@ $(EXEC): $(OBJS) $(HDRS)
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
- 
- pfc:
--	$(CC) $(CFLAGS) -c contrib/pfc.c
-+	$(CC) $(COMPILE_FLAGS) $(CFLAGS) -c contrib/pfc.c
- 	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
- 
- romfs:
diff --git a/package/xl2tp/xl2tp-1.2.7-legacy.patch b/package/xl2tp/xl2tp-legacy.patch
similarity index 100%
rename from package/xl2tp/xl2tp-1.2.7-legacy.patch
rename to package/xl2tp/xl2tp-legacy.patch
diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk
index 768e6ec9a1..cf0576de64 100644
--- a/package/xl2tp/xl2tp.mk
+++ b/package/xl2tp/xl2tp.mk
@@ -3,31 +3,18 @@
 # xl2tp
 #
 #############################################################
-XL2TP_VERSION = 1.2.7
-XL2TP_SOURCE = xl2tpd-$(XL2TP_VERSION).tar.gz
-XL2TP_SITE = ftp://ftp.xelerance.com/xl2tpd/
 
+XL2TP_VERSION = v1.3.1
+XL2TP_SITE = http://github.com/xelerance/xl2tpd/tarball/$(XL2TP_VERSION)
 XL2TP_DEPENDENCIES = libpcap
 
 define XL2TP_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(SED) 's/ -O2 //' $(@D)/Makefile
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
 
 define XL2TP_INSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install
 endef
 
-define XL2TP_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/bin/pfc
-	rm -f $(TARGET_DIR)/usr/sbin/xl2tpd
-	rm -f $(TARGET_DIR)/usr/share/man/man1/pfc.1
-	rm -f $(TARGET_DIR)/usr/share/man/man8/xl2tpd.8
-	rm -f $(TARGET_DIR)/usr/share/man/man5/xl2tpd.conf.5
-	rm -f $(TARGET_DIR)/usr/share/man/man5/l2tp-secrets.5
-endef
-
-define XL2TP_CLEAN_CMDS
-	-$(MAKE) -C $(@D) clean
-endef
-
 $(eval $(generic-package))

From 21a5f16edb8d28da0df19d82f0655e2b49e2abaa Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 23 Sep 2012 02:18:20 +0000
Subject: [PATCH 2896/6849] xserver_xorg-server: fix dbus/udev configure
 problem

If both the dbus and udev packages are selected, then the configure step
for the xserver_xorg-server package fails as follows.

  configure: error: Hotplugging through both libudev and dbus/hal not allowed

The configure script no longer allows both the --enable-config-dbus
and --enable-config-udev options to be specified.

This patch changes the xserver_xorg-server makefile to use udev in preference
to dbus, when both are available.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xserver_xorg-server/xserver_xorg-server.mk   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index a19122d4a5..8018a89073 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -104,16 +104,14 @@ XSERVER_XORG_SERVER_DEPENDENCIES += tslib
 XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"
 endif
 
+ifeq ($(BR2_PACKAGE_UDEV),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += udev
+XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev
+else
 ifeq ($(BR2_PACKAGE_DBUS),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += dbus
 XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus
 endif
-
-ifeq ($(BR2_PACKAGE_UDEV),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev
-XSERVER_XORG_SERVER_DEPENDENCIES += udev
-else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-config-udev
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)

From 90f908f21e4f7b1b7dd0c4c44515db67f441dcc3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 23 Sep 2012 21:27:13 +0200
Subject: [PATCH 2897/6849] xlsclient: unbreak build

Fixes http://autobuild.buildroot.net/results/4cb357a99de9e2c2940fbdfccb314aaef5891b6b

xlsclient nowadays needs libxcb and xcb-util, and update to 1.1.1, as
1.1.0 tarball was missing strnlen.h.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xlsclients/Config.in          | 2 ++
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xapp_xlsclients/Config.in b/package/x11r7/xapp_xlsclients/Config.in
index f8f6132858..a934af45e9 100644
--- a/package/x11r7/xapp_xlsclients/Config.in
+++ b/package/x11r7/xapp_xlsclients/Config.in
@@ -2,5 +2,7 @@ config BR2_PACKAGE_XAPP_XLSCLIENTS
 	bool "xlsclients"
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XCB_UTIL
 	help
 	  X.Org xlsclients application
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index 28ca4ee0a3..259fab58db 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XAPP_XLSCLIENTS_VERSION = 1.1.0
+XAPP_XLSCLIENTS_VERSION = 1.1.1
 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
+XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util
 
 $(eval $(autotools-package))

From fa2ab8ac340a6f8e7b625cf55505253500481b96 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 24 Sep 2012 21:55:30 +0200
Subject: [PATCH 2898/6849] genext2fs: update to CVS rev 1.118

See http://genext2fs.cvs.sourceforge.net/viewvc/genext2fs/genext2fs/genext2fs.c?view=log
for details.

Numerous bugfixes, large file and filesystem support, rev 1 filesystems,
volume id support, block size, ..

And drop unneeded patches while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../genext2fs/genext2fs-1.4.1-nosquash.patch  |   14 -
 ...genext2fs-1.4.1-remove_ugly_warnings.patch |   21 -
 ...t2fs-update-genext2fs.c-to-rev-1.118.patch | 2971 +++++++++++++++++
 3 files changed, 2971 insertions(+), 35 deletions(-)
 delete mode 100644 package/genext2fs/genext2fs-1.4.1-nosquash.patch
 delete mode 100644 package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
 create mode 100644 package/genext2fs/genext2fs-update-genext2fs.c-to-rev-1.118.patch

diff --git a/package/genext2fs/genext2fs-1.4.1-nosquash.patch b/package/genext2fs/genext2fs-1.4.1-nosquash.patch
deleted file mode 100644
index 236dfccdfd..0000000000
--- a/package/genext2fs/genext2fs-1.4.1-nosquash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c
---- genext2fs-1.4/genext2fs.c	2006-12-19 17:45:31.000000000 +0100
-+++ genext2fs-1.4-nosquash/genext2fs.c	2007-02-09 10:47:05.000000000 +0100
-@@ -1629,10 +1629,6 @@
- 		mtime = st.st_mtime;
- 		name = dent->d_name;
- 		mode = get_mode(&st);
--		if(squash_uids)
--			uid = gid = 0;
--		if(squash_perms)
--			mode &= ~(FM_IRWXG | FM_IRWXO);
- 		if(stats)
- 			switch(st.st_mode & S_IFMT)
- 			{
diff --git a/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
deleted file mode 100644
index ef23dfbe80..0000000000
--- a/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c
---- genext2fs-1.4/genext2fs.c	2007-02-09 10:54:56.000000000 +0100
-+++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c	2007-02-09 10:54:30.000000000 +0100
-@@ -1606,7 +1606,7 @@
- static void
- add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats)
- {
--	uint32 nod;
-+	uint32 nod = 0;
- 	uint32 uid, gid, mode, ctime, mtime;
- 	const char *name;
- 	FILE *fh;
-@@ -2056,7 +2056,7 @@
- static filesystem *
- load_fs(FILE * fh, int swapit)
- {
--	size_t fssize;
-+	size_t fssize = 0;
- 	filesystem *fs;
- 	if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))
- 		perror_msg_and_die("input filesystem image");
diff --git a/package/genext2fs/genext2fs-update-genext2fs.c-to-rev-1.118.patch b/package/genext2fs/genext2fs-update-genext2fs.c-to-rev-1.118.patch
new file mode 100644
index 0000000000..755ee9dee2
--- /dev/null
+++ b/package/genext2fs/genext2fs-update-genext2fs.c-to-rev-1.118.patch
@@ -0,0 +1,2971 @@
+[PATCH] update genext2fs.c to CVS rev 1.118
+
+See http://genext2fs.cvs.sourceforge.net/viewvc/genext2fs/genext2fs/genext2fs.c?view=log
+for details.
+
+Numerous bugfixes, large file and filesystem support, rev 1 filesystems,
+volume id support, block size, ..
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ cache.h     |  128 ++++
+ genext2fs.c | 1870 ++++++++++++++++++++++++++++++++++++++++++------------------
+ list.h      |   78 ++
+ 3 files changed, 1527 insertions(+), 549 deletions(-)
+
+Index: genext2fs-1.4.1/genext2fs.c
+===================================================================
+--- genext2fs-1.4.1.orig/genext2fs.c
++++ genext2fs-1.4.1/genext2fs.c
+@@ -53,6 +53,12 @@
+ // 			along with -q, -P, -U
+ 
+ 
++/*
++ * Allow fseeko/off_t to be 64-bit offsets to allow filesystems and
++ * individual files >2GB.
++ */
++#define _FILE_OFFSET_BITS 64
++
+ #include <config.h>
+ #include <stdio.h>
+ 
+@@ -107,10 +113,8 @@
+ 
+ #if HAVE_DIRENT_H
+ # include <dirent.h>
+-# define NAMLEN(dirent) strlen((dirent)->d_name)
+ #else
+ # define dirent direct
+-# define NAMLEN(dirent) (dirent)->d_namlen
+ # if HAVE_SYS_NDIR_H
+ #  include <sys/ndir.h>
+ # endif
+@@ -144,6 +148,8 @@
+ # include <limits.h>
+ #endif
+ 
++#include "cache.h"
++
+ struct stats {
+ 	unsigned long nblocks;
+ 	unsigned long ninodes;
+@@ -151,13 +157,42 @@
+ 
+ // block size
+ 
+-#define BLOCKSIZE         1024
++static int blocksize = 1024;
++
++#define SUPERBLOCK_OFFSET	1024
++#define SUPERBLOCK_SIZE		1024
++
++#define BLOCKSIZE         blocksize
+ #define BLOCKS_PER_GROUP  8192
+ #define INODES_PER_GROUP  8192
+ /* Percentage of blocks that are reserved.*/
+ #define RESERVED_BLOCKS       5/100
+ #define MAX_RESERVED_BLOCKS  25/100
+ 
++/* The default value for s_creator_os. */
++#if defined(__linux__)    &&    defined(EXT2_OS_LINUX)
++#define CREATOR_OS EXT2_OS_LINUX
++#define CREATOR_OS_NAME "linux"
++#else
++#if defined(__GNU__)     &&     defined(EXT2_OS_HURD)
++#define CREATOR_OS EXT2_OS_HURD
++#define CREATOR_OS_NAME "hurd"
++#else
++#if defined(__FreeBSD__) &&     defined(EXT2_OS_FREEBSD)
++#define CREATOR_OS EXT2_OS_FREEBSD
++#define CREATOR_OS_NAME "freebsd"
++#else
++#if defined(LITES)         &&   defined(EXT2_OS_LITES)
++#define CREATOR_OS EXT2_OS_LITES
++#define CREATOR_OS_NAME "lites"
++#else
++#define CREATOR_OS EXT2_OS_LINUX /* by default */
++#define CREATOR_OS_NAME "linux"
++#endif /* defined(LITES) && defined(EXT2_OS_LITES) */
++#endif /* defined(__FreeBSD__) && defined(EXT2_OS_FREEBSD) */
++#endif /* defined(__GNU__)     && defined(EXT2_OS_HURD) */
++#endif /* defined(__linux__)   && defined(EXT2_OS_LINUX) */
++
+ 
+ // inode block size (why is it != BLOCKSIZE ?!?)
+ /* The field i_blocks in the ext2 inode stores the number of data blocks
+@@ -190,6 +225,14 @@
+ #define EXT2_TIND_BLOCK    14                    // triple indirect block
+ #define EXT2_INIT_BLOCK    0xFFFFFFFF            // just initialized (not really a block address)
+ 
++// codes for operating systems
++
++#define EXT2_OS_LINUX           0
++#define EXT2_OS_HURD            1
++#define EXT2_OS_MASIX           2
++#define EXT2_OS_FREEBSD         3
++#define EXT2_OS_LITES           4
++
+ // end of a block walk
+ 
+ #define WALK_END           0xFFFFFFFE
+@@ -227,44 +270,46 @@
+ #define FM_IWOTH   0000002	// write
+ #define FM_IXOTH   0000001	// execute
+ 
+-// options
+-
+-#define OP_HOLES     0x01       // make files with holes
+-
+ /* Defines for accessing group details */
+ 
+ // Number of groups in the filesystem
+ #define GRP_NBGROUPS(fs) \
+-	(((fs)->sb.s_blocks_count - fs->sb.s_first_data_block + \
+-	  (fs)->sb.s_blocks_per_group - 1) / (fs)->sb.s_blocks_per_group)
++	(((fs)->sb->s_blocks_count - fs->sb->s_first_data_block + \
++	  (fs)->sb->s_blocks_per_group - 1) / (fs)->sb->s_blocks_per_group)
+ 
+ // Get group block bitmap (bbm) given the group number
+-#define GRP_GET_GROUP_BBM(fs,grp) ( get_blk((fs),(fs)->gd[(grp)].bg_block_bitmap) )
++#define GRP_GET_GROUP_BBM(fs,grp,bi) (get_blk((fs),(grp)->bg_block_bitmap,(bi)))
++#define GRP_PUT_GROUP_BBM(bi) ( put_blk((bi)) )
+ 
+ // Get group inode bitmap (ibm) given the group number
+-#define GRP_GET_GROUP_IBM(fs,grp) ( get_blk((fs),(fs)->gd[(grp)].bg_inode_bitmap) )
+-		
++#define GRP_GET_GROUP_IBM(fs,grp,bi) (get_blk((fs), (grp)->bg_inode_bitmap,(bi)))
++#define GRP_PUT_GROUP_IBM(bi) ( put_blk((bi)) )
++
+ // Given an inode number find the group it belongs to
+-#define GRP_GROUP_OF_INODE(fs,nod) ( ((nod)-1) / (fs)->sb.s_inodes_per_group)
++#define GRP_GROUP_OF_INODE(fs,nod) ( ((nod)-1) / (fs)->sb->s_inodes_per_group)
+ 
+ //Given an inode number get the inode bitmap that covers it
+-#define GRP_GET_INODE_BITMAP(fs,nod) \
+-	( GRP_GET_GROUP_IBM((fs),GRP_GROUP_OF_INODE((fs),(nod))) )
++#define GRP_GET_INODE_BITMAP(fs,nod,bi,gi)				\
++	( GRP_GET_GROUP_IBM((fs),get_gd(fs,GRP_GROUP_OF_INODE((fs),(nod)),gi),bi) )
++#define GRP_PUT_INODE_BITMAP(bi,gi)		\
++	( GRP_PUT_GROUP_IBM((bi)),put_gd((gi)) )
+ 
+ //Given an inode number find its offset within the inode bitmap that covers it
+ #define GRP_IBM_OFFSET(fs,nod) \
+-	( (nod) - GRP_GROUP_OF_INODE((fs),(nod))*(fs)->sb.s_inodes_per_group )
++	( (nod) - GRP_GROUP_OF_INODE((fs),(nod))*(fs)->sb->s_inodes_per_group )
+ 
+ // Given a block number find the group it belongs to
+-#define GRP_GROUP_OF_BLOCK(fs,blk) ( ((blk)-1) / (fs)->sb.s_blocks_per_group)
++#define GRP_GROUP_OF_BLOCK(fs,blk) ( ((blk)-1) / (fs)->sb->s_blocks_per_group)
+ 	
+-//Given a block number get the block bitmap that covers it
+-#define GRP_GET_BLOCK_BITMAP(fs,blk) \
+-	( GRP_GET_GROUP_BBM((fs),GRP_GROUP_OF_BLOCK((fs),(blk))) )
++//Given a block number get/put the block bitmap that covers it
++#define GRP_GET_BLOCK_BITMAP(fs,blk,bi,gi)				\
++	( GRP_GET_GROUP_BBM((fs),get_gd(fs,GRP_GROUP_OF_BLOCK((fs),(blk)),(gi)),(bi)) )
++#define GRP_PUT_BLOCK_BITMAP(bi,gi)		\
++	( GRP_PUT_GROUP_BBM((bi)),put_gd((gi)) )
+ 
+ //Given a block number find its offset within the block bitmap that covers it
+ #define GRP_BBM_OFFSET(fs,blk) \
+-	( (blk) - GRP_GROUP_OF_BLOCK((fs),(blk))*(fs)->sb.s_blocks_per_group )
++	( (blk) - GRP_GROUP_OF_BLOCK((fs),(blk))*(fs)->sb->s_blocks_per_group )
+ 
+ 
+ // used types
+@@ -286,7 +331,9 @@
+ // older solaris. Note that this is still not very portable, in that
+ // the return value cannot be trusted.
+ 
+-#if SCANF_CAN_MALLOC
++#if 0 // SCANF_CAN_MALLOC
++// C99 define "a" for floating point, so you can have runtime surprise
++// according the library versions
+ # define SCANF_PREFIX "a"
+ # define SCANF_STRING(s) (&s)
+ #else
+@@ -430,6 +477,17 @@
+ 			((val<<8)&0xFF0000) | (val<<24));
+ }
+ 
++static inline int
++is_blk_empty(uint8 *b)
++{
++	uint32 i;
++	uint32 *v = (uint32 *) b;
++
++	for(i = 0; i < BLOCKSIZE / 4; i++)
++		if (*v++)
++			return 0;
++	return 1;
++}
+ 
+ // on-disk structures
+ // this trick makes me declare things only once
+@@ -460,7 +518,22 @@
+ 	udecl32(s_creator_os)          /* Indicator of which OS created the filesystem */ \
+ 	udecl32(s_rev_level)           /* The revision level of the filesystem */ \
+ 	udecl16(s_def_resuid)          /* The default uid for reserved blocks */ \
+-	udecl16(s_def_resgid)          /* The default gid for reserved blocks */
++	udecl16(s_def_resgid)          /* The default gid for reserved blocks */ \
++	/* rev 1 version fields start here */ \
++	udecl32(s_first_ino) 		/* First non-reserved inode */	\
++	udecl16(s_inode_size) 		/* size of inode structure */	\
++	udecl16(s_block_group_nr) 	/* block group # of this superblock */ \
++	udecl32(s_feature_compat) 	/* compatible feature set */	\
++	udecl32(s_feature_incompat) 	/* incompatible feature set */	\
++	udecl32(s_feature_ro_compat) 	/* readonly-compatible feature set */ \
++	utdecl8(s_uuid,16)		/* 128-bit uuid for volume */	\
++	utdecl8(s_volume_name,16) 	/* volume name */		\
++	utdecl8(s_last_mounted,64) 	/* directory where last mounted */ \
++	udecl32(s_algorithm_usage_bitmap) /* For compression */
++
++#define EXT2_GOOD_OLD_FIRST_INO	11
++#define EXT2_GOOD_OLD_INODE_SIZE 128
++#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
+ 
+ #define groupdescriptor_decl \
+ 	udecl32(bg_block_bitmap)       /* Block number of the block bitmap */ \
+@@ -500,6 +573,7 @@
+ 
+ #define decl8(x) int8 x;
+ #define udecl8(x) uint8 x;
++#define utdecl8(x,n) uint8 x[n];
+ #define decl16(x) int16 x;
+ #define udecl16(x) uint16 x;
+ #define decl32(x) int32 x;
+@@ -509,7 +583,7 @@
+ typedef struct
+ {
+ 	superblock_decl
+-	uint32 s_reserved[235];       // Reserved
++	uint32 s_reserved[205];       // Reserved
+ } superblock;
+ 
+ typedef struct
+@@ -527,10 +601,9 @@
+ typedef struct
+ {
+ 	directory_decl
+-	char d_name[0];
+ } directory;
+ 
+-typedef uint8 block[BLOCKSIZE];
++typedef uint8 *block;
+ 
+ /* blockwalker fields:
+    The blockwalker is used to access all the blocks of a file (including
+@@ -567,23 +640,41 @@
+ 	uint32 bptind;
+ } blockwalker;
+ 
++#define HDLINK_CNT   16
++struct hdlink_s
++{
++	uint32	src_inode;
++	uint32	dst_nod;
++};
++
++struct hdlinks_s
++{
++	int32 count;
++	struct hdlink_s *hdl;
++};
+ 
+ /* Filesystem structure that support groups */
+-#if BLOCKSIZE == 1024
+ typedef struct
+ {
+-	block zero;            // The famous block 0
+-	superblock sb;         // The superblock
+-	groupdescriptor gd[0]; // The group descriptors
++	FILE *f;
++	superblock *sb;
++	int swapit;
++	int32 hdlink_cnt;
++	struct hdlinks_s hdlinks;
++
++	int holes;
++
++	listcache blks;
++	listcache gds;
++	listcache inodes;
++	listcache blkmaps;
+ } filesystem;
+-#else
+-#error UNHANDLED BLOCKSIZE
+-#endif
+ 
+ // now the endianness swap
+ 
+ #undef decl8
+ #undef udecl8
++#undef utdecl8
+ #undef decl16
+ #undef udecl16
+ #undef decl32
+@@ -592,28 +683,13 @@
+ 
+ #define decl8(x)
+ #define udecl8(x)
++#define utdecl8(x,n)
+ #define decl16(x) this->x = swab16(this->x);
+ #define udecl16(x) this->x = swab16(this->x);
+ #define decl32(x) this->x = swab32(this->x);
+ #define udecl32(x) this->x = swab32(this->x);
+ #define utdecl32(x,n) { int i; for(i=0; i<n; i++) this->x[i] = swab32(this->x[i]); }
+ 
+-#define HDLINK_CNT   16
+-static int32 hdlink_cnt = HDLINK_CNT;
+-struct hdlink_s
+-{
+-	uint32	src_inode;
+-	uint32	dst_nod;
+-};
+-
+-struct hdlinks_s 
+-{
+-	int32 count;
+-	struct hdlink_s *hdl;
+-};
+-
+-static struct hdlinks_s hdlinks;
+-
+ static void
+ swap_sb(superblock *sb)
+ {
+@@ -633,9 +709,24 @@
+ static void
+ swap_nod(inode *nod)
+ {
++	uint32 nblk;
++
+ #define this nod
+ 	inode_decl
+ #undef this
++
++	// block and character inodes store the major and minor in the
++	// i_block, so we need to unswap to get those.  Also, if it's
++	// zero iblocks, put the data back like it belongs.
++	nblk = nod->i_blocks / INOBLK;
++	if ((nod->i_size && !nblk)
++	    || ((nod->i_mode & FM_IFBLK) == FM_IFBLK)
++	    || ((nod->i_mode & FM_IFCHR) == FM_IFCHR))
++	{
++		int i;
++		for(i = 0; i <= EXT2_TIND_BLOCK; i++)
++			nod->i_block[i] = swab32(nod->i_block[i]);
++	}
+ }
+ 
+ static void
+@@ -657,6 +748,7 @@
+ 
+ #undef decl8
+ #undef udecl8
++#undef utdecl8
+ #undef decl16
+ #undef udecl16
+ #undef decl32
+@@ -770,15 +862,15 @@
+ }
+ 
+ int
+-is_hardlink(ino_t inode)
++is_hardlink(filesystem *fs, ino_t inode)
+ {
+ 	int i;
+ 
+-	for(i = 0; i < hdlinks.count; i++) {
+-		if(hdlinks.hdl[i].src_inode == inode)
++	for(i = 0; i < fs->hdlinks.count; i++) {
++		if(fs->hdlinks.hdl[i].src_inode == inode)
+ 			return i;
+ 	}
+-	return -1;		
++	return -1;
+ }
+ 
+ // printf helper macro
+@@ -789,6 +881,8 @@
+ get_workblk(void)
+ {
+ 	unsigned char* b=calloc(1,BLOCKSIZE);
++	if (!b)
++		error_msg_and_die("get_workblk() failed, out of memory");
+ 	return b;
+ }
+ static inline void
+@@ -811,24 +905,464 @@
+ 	return b[(item-1) / 8] & (1 << ((item-1) % 8));
+ }
+ 
+-// return a given block from a filesystem
++// Used by get_blk/put_blk to hold information about a block owned
++// by the user.
++typedef struct
++{
++	cache_link link;
++
++	filesystem *fs;
++	uint32 blk;
++	uint8 *b;
++	uint32 usecount;
++} blk_info;
++
++#define MAX_FREE_CACHE_BLOCKS 100
++
++static uint32
++blk_elem_val(cache_link *elem)
++{
++	blk_info *bi = container_of(elem, blk_info, link);
++	return bi->blk;
++}
++
++static void
++blk_freed(cache_link *elem)
++{
++	blk_info *bi = container_of(elem, blk_info, link);
++
++	if (fseeko(bi->fs->f, ((off_t) bi->blk) * BLOCKSIZE, SEEK_SET))
++		perror_msg_and_die("fseek");
++	if (fwrite(bi->b, BLOCKSIZE, 1, bi->fs->f) != 1)
++		perror_msg_and_die("get_blk: write");
++	free(bi->b);
++	free(bi);
++}
++
++// Return a given block from a filesystem.  Make sure to call
++// put_blk when you are done with it.
+ static inline uint8 *
+-get_blk(filesystem *fs, uint32 blk)
++get_blk(filesystem *fs, uint32 blk, blk_info **rbi)
+ {
+-	return (uint8*)fs + blk*BLOCKSIZE;
++	cache_link *curr;
++	blk_info *bi;
++
++	if (blk >= fs->sb->s_blocks_count)
++		error_msg_and_die("Internal error, block out of range");
++
++	curr = cache_find(&fs->blks, blk);
++	if (curr) {
++		bi = container_of(curr, blk_info, link);
++		bi->usecount++;
++		goto out;
++	}
++
++	bi = malloc(sizeof(*bi));
++	if (!bi)
++		error_msg_and_die("get_blk: out of memory");
++	bi->fs = fs;
++	bi->blk = blk;
++	bi->usecount = 1;
++	bi->b = malloc(BLOCKSIZE);
++	if (!bi->b)
++		error_msg_and_die("get_blk: out of memory");
++	cache_add(&fs->blks, &bi->link);
++	if (fseeko(fs->f, ((off_t) blk) * BLOCKSIZE, SEEK_SET))
++		perror_msg_and_die("fseek");
++	if (fread(bi->b, BLOCKSIZE, 1, fs->f) != 1) {
++		if (ferror(fs->f))
++			perror_msg_and_die("fread");
++		memset(bi->b, 0, BLOCKSIZE);
++	}
++
++out:
++	*rbi = bi;
++	return bi->b;
+ }
+ 
+ // return a given inode from a filesystem
+-static inline inode *
+-get_nod(filesystem *fs, uint32 nod)
++static inline void
++put_blk(blk_info *bi)
++{
++	if (bi->usecount == 0)
++		error_msg_and_die("Internal error: put_blk usecount zero");
++	bi->usecount--;
++	if (bi->usecount == 0)
++		/* Free happens in the cache code */
++		cache_item_set_unused(&bi->fs->blks, &bi->link);
++}
++
++typedef struct
+ {
+-	int grp,offset;
++	cache_link link;
++
++	filesystem *fs;
++	int gds;
++	blk_info *bi;
++	groupdescriptor *gd;
++	uint32 usecount;
++} gd_info;
++
++#define MAX_FREE_CACHE_GDS 100
++
++static uint32
++gd_elem_val(cache_link *elem)
++{
++	gd_info *gi = container_of(elem, gd_info, link);
++	return gi->gds;
++}
++
++static void
++gd_freed(cache_link *elem)
++{
++	gd_info *gi = container_of(elem, gd_info, link);
++
++	if (gi->fs->swapit)
++		swap_gd(gi->gd);
++	put_blk(gi->bi);
++	free(gi);
++}
++
++#define GDS_START ((SUPERBLOCK_OFFSET + SUPERBLOCK_SIZE + BLOCKSIZE - 1) / BLOCKSIZE)
++#define GDS_PER_BLOCK (BLOCKSIZE / sizeof(groupdescriptor))
++// the group descriptors are aligned on the block size
++static inline groupdescriptor *
++get_gd(filesystem *fs, uint32 no, gd_info **rgi)
++{
++	uint32 gdblk;
++	uint32 offset;
++	gd_info *gi;
++	cache_link *curr;
++
++	curr = cache_find(&fs->gds, no);
++	if (curr) {
++		gi = container_of(curr, gd_info, link);
++		gi->usecount++;
++		goto out;
++	}
++
++	gi = malloc(sizeof(*gi));
++	if (!gi)
++		error_msg_and_die("get_gd: out of memory");
++	gi->fs = fs;
++	gi->gds = no;
++	gi->usecount = 1;
++	gdblk = GDS_START + (no / GDS_PER_BLOCK);
++	offset = no % GDS_PER_BLOCK;
++	gi->gd = ((groupdescriptor *) get_blk(fs, gdblk, &gi->bi)) + offset;
++	cache_add(&fs->gds, &gi->link);
++	if (fs->swapit)
++		swap_gd(gi->gd);
++ out:
++	*rgi = gi;
++
++	return gi->gd;
++}
++
++static inline void
++put_gd(gd_info *gi)
++{
++	if (gi->usecount == 0)
++		error_msg_and_die("Internal error: put_gd usecount zero");
++
++	gi->usecount--;
++	if (gi->usecount == 0)
++		/* Free happens in the cache code */
++		cache_item_set_unused(&gi->fs->gds, &gi->link);
++}
++
++// Used by get_blkmap/put_blkmap to hold information about an block map
++// owned by the user.
++typedef struct
++{
++	cache_link link;
++
++	filesystem *fs;
++	uint32 blk;
++	uint8 *b;
++	blk_info *bi;
++	uint32 usecount;
++} blkmap_info;
++
++#define MAX_FREE_CACHE_BLOCKMAPS 100
++
++static uint32
++blkmap_elem_val(cache_link *elem)
++{
++	blkmap_info *bmi = container_of(elem, blkmap_info, link);
++	return bmi->blk;
++}
++
++static void
++blkmap_freed(cache_link *elem)
++{
++	blkmap_info *bmi = container_of(elem, blkmap_info, link);
++
++	if (bmi->fs->swapit)
++		swap_block(bmi->b);
++	put_blk(bmi->bi);
++	free(bmi);
++}
++
++// Return a given block map from a filesystem.  Make sure to call
++// put_blkmap when you are done with it.
++static inline uint32 *
++get_blkmap(filesystem *fs, uint32 blk, blkmap_info **rbmi)
++{
++	blkmap_info *bmi;
++	cache_link *curr;
++
++	curr = cache_find(&fs->blkmaps, blk);
++	if (curr) {
++		bmi = container_of(curr, blkmap_info, link);
++		bmi->usecount++;
++		goto out;
++	}
++
++	bmi = malloc(sizeof(*bmi));
++	if (!bmi)
++		error_msg_and_die("get_blkmap: out of memory");
++	bmi->fs = fs;
++	bmi->blk = blk;
++	bmi->b = get_blk(fs, blk, &bmi->bi);
++	bmi->usecount = 1;
++	cache_add(&fs->blkmaps, &bmi->link);
++
++	if (fs->swapit)
++		swap_block(bmi->b);
++ out:
++	*rbmi = bmi;
++	return (uint32 *) bmi->b;
++}
++
++static inline void
++put_blkmap(blkmap_info *bmi)
++{
++	if (bmi->usecount == 0)
++		error_msg_and_die("Internal error: put_blkmap usecount zero");
++
++	bmi->usecount--;
++	if (bmi->usecount == 0)
++		/* Free happens in the cache code */
++		cache_item_set_unused(&bmi->fs->blkmaps, &bmi->link);
++}
++
++// Used by get_nod/put_nod to hold information about an inode owned
++// by the user.
++typedef struct
++{
++	cache_link link;
++
++	filesystem *fs;
++	uint32 nod;
++	uint8 *b;
++	blk_info *bi;
+ 	inode *itab;
++	uint32 usecount;
++} nod_info;
++
++#define MAX_FREE_CACHE_INODES 100
++
++static uint32
++inode_elem_val(cache_link *elem)
++{
++	nod_info *ni = container_of(elem, nod_info, link);
++	return ni->nod;
++}
++
++static void
++inode_freed(cache_link *elem)
++{
++	nod_info *ni = container_of(elem, nod_info, link);
++
++	if (ni->fs->swapit)
++		swap_nod(ni->itab);
++	put_blk(ni->bi);
++	free(ni);
++}
++
++#define INODES_PER_BLOCK (BLOCKSIZE / sizeof(inode))
+ 
+-	offset = GRP_IBM_OFFSET(fs,nod);
++// return a given inode from a filesystem
++static inline inode *
++get_nod(filesystem *fs, uint32 nod, nod_info **rni)
++{
++	uint32 grp, boffset, offset;
++	cache_link *curr;
++	groupdescriptor *gd;
++	gd_info *gi;
++	nod_info *ni;
++
++	curr = cache_find(&fs->inodes, nod);
++	if (curr) {
++		ni = container_of(curr, nod_info, link);
++		ni->usecount++;
++		goto out;
++	}
++
++	ni = malloc(sizeof(*ni));
++	if (!ni)
++		error_msg_and_die("get_nod: out of memory");
++	ni->fs = fs;
++	ni->nod = nod;
++	ni->usecount = 1;
++	cache_add(&fs->inodes, &ni->link);
++
++	offset = GRP_IBM_OFFSET(fs,nod) - 1;
++	boffset = offset / INODES_PER_BLOCK;
++	offset %= INODES_PER_BLOCK;
+ 	grp = GRP_GROUP_OF_INODE(fs,nod);
+-	itab = (inode *)get_blk(fs, fs->gd[grp].bg_inode_table);
+-	return itab+offset-1;
++	gd = get_gd(fs, grp, &gi);
++	ni->b = get_blk(fs, gd->bg_inode_table + boffset, &ni->bi);
++	ni->itab = ((inode *) ni->b) + offset;
++	if (fs->swapit)
++		swap_nod(ni->itab);
++	put_gd(gi);
++ out:
++	*rni = ni;
++	return ni->itab;
++}
++
++static inline void
++put_nod(nod_info *ni)
++{
++	if (ni->usecount == 0)
++		error_msg_and_die("Internal error: put_nod usecount zero");
++
++	ni->usecount--;
++	if (ni->usecount == 0)
++		/* Free happens in the cache code */
++		cache_item_set_unused(&ni->fs->inodes, &ni->link);
++}
++
++// Used to hold state information while walking a directory inode.
++typedef struct
++{
++	directory d;
++	filesystem *fs;
++	uint32 nod;
++	directory *last_d;
++	uint8 *b;
++	blk_info *bi;
++} dirwalker;
++
++// Start a directory walk on the given inode.  You must pass in a
++// dirwalker structure, then use that dirwalker for future operations.
++// Call put_dir when you are done walking the directory.
++static inline directory *
++get_dir(filesystem *fs, uint32 nod, dirwalker *dw)
++{
++	dw->fs = fs;
++	dw->b = get_blk(fs, nod, &dw->bi);
++	dw->nod = nod;
++	dw->last_d = (directory *) dw->b;
++
++	memcpy(&dw->d, dw->last_d, sizeof(directory));
++	if (fs->swapit)
++		swap_dir(&dw->d);
++	return &dw->d;
++}
++
++// Move to the next directory.
++static inline directory *
++next_dir(dirwalker *dw)
++{
++	directory *next_d = (directory *)((int8*)dw->last_d + dw->d.d_rec_len);
++
++	if (dw->fs->swapit)
++		swap_dir(&dw->d);
++	memcpy(dw->last_d, &dw->d, sizeof(directory));
++
++	if (((int8 *) next_d) >= ((int8 *) dw->b + BLOCKSIZE))
++		return NULL;
++
++	dw->last_d = next_d;
++	memcpy(&dw->d, next_d, sizeof(directory));
++	if (dw->fs->swapit)
++		swap_dir(&dw->d);
++	return &dw->d;
++}
++
++// Call then when you are done with the directory walk.
++static inline void
++put_dir(dirwalker *dw)
++{
++	if (dw->fs->swapit)
++		swap_dir(&dw->d);
++	memcpy(dw->last_d, &dw->d, sizeof(directory));
++
++	if (dw->nod == 0)
++		free_workblk(dw->b);
++	else
++		put_blk(dw->bi);
++}
++
++// Create a new directory block with the given inode as it's destination
++// and append it to the current dirwalker.
++static directory *
++new_dir(filesystem *fs, uint32 dnod, const char *name, int nlen, dirwalker *dw)
++{
++	directory *d;
++
++	dw->fs = fs;
++	dw->b = get_workblk();
++	dw->nod = 0;
++	dw->last_d = (directory *) dw->b;
++	d = &dw->d;
++	d->d_inode = dnod;
++	d->d_rec_len = BLOCKSIZE;
++	d->d_name_len = nlen;
++	strncpy(((char *) dw->last_d) + sizeof(directory), name, nlen);
++	return d;
++}
++
++// Shrink the current directory entry, make a new one with the free
++// space, and return the new directory entry (making it current).
++static inline directory *
++shrink_dir(dirwalker *dw, uint32 nod, const char *name, int nlen)
++{
++	int reclen, preclen;
++	directory *d = &dw->d;
++
++	reclen = d->d_rec_len;
++	d->d_rec_len = sizeof(directory) + rndup(d->d_name_len, 4);
++	preclen = d->d_rec_len;
++	reclen -= preclen;
++	if (dw->fs->swapit)
++		swap_dir(&dw->d);
++	memcpy(dw->last_d, &dw->d, sizeof(directory));
++
++	dw->last_d = (directory *) (((int8 *) dw->last_d) + preclen);
++	d->d_rec_len = reclen;
++	d->d_inode = nod;
++	d->d_name_len = nlen;
++	strncpy(((char *) dw->last_d) + sizeof(directory), name, nlen);
++
++	return d;
++}
++
++// Return the current block the directory is walking
++static inline uint8 *
++dir_data(dirwalker *dw)
++{
++	return dw->b;
++}
++
++// Return the pointer to the name for the current directory
++static inline char *
++dir_name(dirwalker *dw)
++{
++	return ((char *) dw->last_d) + sizeof(directory);
++}
++
++// Set the name for the current directory.  Note that this doesn't
++// verify that there is space for the directory name, you must do
++// that yourself.
++static void
++dir_set_name(dirwalker *dw, const char *name, int nlen)
++{
++	dw->d.d_name_len = nlen;
++	strncpy(((char *) dw->last_d) + sizeof(directory), name, nlen);
+ }
+ 
+ // allocate a given block/inode in the bitmap
+@@ -870,21 +1404,34 @@
+ {
+ 	uint32 bk=0;
+ 	uint32 grp,nbgroups;
++	blk_info *bi;
++	groupdescriptor *gd;
++	gd_info *gi;
+ 
+ 	grp = GRP_GROUP_OF_INODE(fs,nod);
+ 	nbgroups = GRP_NBGROUPS(fs);
+-	if(!(bk = allocate(get_blk(fs,fs->gd[grp].bg_block_bitmap), 0))) {
+-		for(grp=0;grp<nbgroups && !bk;grp++)
+-			bk=allocate(get_blk(fs,fs->gd[grp].bg_block_bitmap),0);
++	gd = get_gd(fs, grp, &gi);
++	bk = allocate(GRP_GET_GROUP_BBM(fs, gd, &bi), 0);
++	GRP_PUT_GROUP_BBM(bi);
++	put_gd(gi);
++	if (!bk) {
++		for (grp=0; grp<nbgroups && !bk; grp++) {
++			gd = get_gd(fs, grp, &gi);
++			bk = allocate(GRP_GET_GROUP_BBM(fs, gd, &bi), 0);
++			GRP_PUT_GROUP_BBM(bi);
++			put_gd(gi);
++		}
+ 		grp--;
+ 	}
+ 	if (!bk)
+ 		error_msg_and_die("couldn't allocate a block (no free space)");
+-	if(!(fs->gd[grp].bg_free_blocks_count--))
++	gd = get_gd(fs, grp, &gi);
++	if(!(gd->bg_free_blocks_count--))
+ 		error_msg_and_die("group descr %d. free blocks count == 0 (corrupted fs?)",grp);
+-	if(!(fs->sb.s_free_blocks_count--))
++	put_gd(gi);
++	if(!(fs->sb->s_free_blocks_count--))
+ 		error_msg_and_die("superblock free blocks count == 0 (corrupted fs?)");
+-	return fs->sb.s_blocks_per_group*grp + bk;
++	return fs->sb->s_first_data_block + fs->sb->s_blocks_per_group*grp + (bk-1);
+ }
+ 
+ // free a block
+@@ -892,12 +1439,18 @@
+ free_blk(filesystem *fs, uint32 bk)
+ {
+ 	uint32 grp;
+-
+-	grp = bk / fs->sb.s_blocks_per_group;
+-	bk %= fs->sb.s_blocks_per_group;
+-	deallocate(get_blk(fs,fs->gd[grp].bg_block_bitmap), bk);
+-	fs->gd[grp].bg_free_blocks_count++;
+-	fs->sb.s_free_blocks_count++;
++	blk_info *bi;
++	gd_info *gi;
++	groupdescriptor *gd;
++
++	grp = bk / fs->sb->s_blocks_per_group;
++	bk %= fs->sb->s_blocks_per_group;
++	gd = get_gd(fs, grp, &gi);
++	deallocate(GRP_GET_GROUP_BBM(fs, gd, &bi), bk);
++	GRP_PUT_GROUP_BBM(bi);
++	gd->bg_free_blocks_count++;
++	put_gd(gi);
++	fs->sb->s_free_blocks_count++;
+ }
+ 
+ // allocate an inode
+@@ -906,6 +1459,9 @@
+ {
+ 	uint32 nod,best_group=0;
+ 	uint32 grp,nbgroups,avefreei;
++	blk_info *bi;
++	gd_info *gi, *bestgi;
++	groupdescriptor *gd, *bestgd;
+ 
+ 	nbgroups = GRP_NBGROUPS(fs);
+ 
+@@ -914,22 +1470,32 @@
+ 	/* find the one with the most free blocks and allocate node there     */
+ 	/* Idea from find_group_dir in fs/ext2/ialloc.c in 2.4.19 kernel      */
+ 	/* We do it for all inodes.                                           */
+-	avefreei  =  fs->sb.s_free_inodes_count / nbgroups;
++	avefreei  =  fs->sb->s_free_inodes_count / nbgroups;
++	bestgd = get_gd(fs, best_group, &bestgi);
+ 	for(grp=0; grp<nbgroups; grp++) {
+-		if (fs->gd[grp].bg_free_inodes_count < avefreei ||
+-		    fs->gd[grp].bg_free_inodes_count == 0)
++		gd = get_gd(fs, grp, &gi);
++		if (gd->bg_free_inodes_count < avefreei ||
++		    gd->bg_free_inodes_count == 0) {
++			put_gd(gi);
+ 			continue;
+-		if (!best_group || 
+-			fs->gd[grp].bg_free_blocks_count > fs->gd[best_group].bg_free_blocks_count)
++		}
++		if (!best_group || gd->bg_free_blocks_count > bestgd->bg_free_blocks_count) {
++			put_gd(bestgi);
+ 			best_group = grp;
++			bestgd = gd;
++			bestgi = gi;
++		} else
++			put_gd(gi);
+ 	}
+-	if (!(nod = allocate(get_blk(fs,fs->gd[best_group].bg_inode_bitmap),0)))
++	if (!(nod = allocate(GRP_GET_GROUP_IBM(fs, bestgd, &bi), 0)))
+ 		error_msg_and_die("couldn't allocate an inode (no free inode)");
+-	if(!(fs->gd[best_group].bg_free_inodes_count--))
++	GRP_PUT_GROUP_IBM(bi);
++	if(!(bestgd->bg_free_inodes_count--))
+ 		error_msg_and_die("group descr. free blocks count == 0 (corrupted fs?)");
+-	if(!(fs->sb.s_free_inodes_count--))
++	put_gd(bestgi);
++	if(!(fs->sb->s_free_inodes_count--))
+ 		error_msg_and_die("superblock free blocks count == 0 (corrupted fs?)");
+-	return fs->sb.s_inodes_per_group*best_group+nod;
++	return fs->sb->s_inodes_per_group*best_group+nod;
+ }
+ 
+ // print a bitmap allocation
+@@ -962,30 +1528,40 @@
+ //				  used after being freed, so once you start
+ //				  freeing blocks don't stop until the end of
+ //				  the file. moreover, i_blocks isn't updated.
+-//				  in fact, don't do that, just use extend_blk
+ // if hole!=0, create a hole in the file
+ static uint32
+ walk_bw(filesystem *fs, uint32 nod, blockwalker *bw, int32 *create, uint32 hole)
+ {
+ 	uint32 *bkref = 0;
++	uint32 bk = 0;
++	blkmap_info *bmi1 = NULL, *bmi2 = NULL, *bmi3 = NULL;
+ 	uint32 *b;
+ 	int extend = 0, reduce = 0;
++	inode *inod;
++	nod_info *ni;
++	uint32 *iblk;
++
+ 	if(create && (*create) < 0)
+ 		reduce = 1;
+-	if(bw->bnum >= get_nod(fs, nod)->i_blocks / INOBLK)
++	inod = get_nod(fs, nod, &ni);
++	if(bw->bnum >= inod->i_blocks / INOBLK)
+ 	{
+ 		if(create && (*create) > 0)
+ 		{
+ 			(*create)--;
+ 			extend = 1;
+ 		}
+-		else	
++		else
++		{
++			put_nod(ni);
+ 			return WALK_END;
++		}
+ 	}
++	iblk = inod->i_block;
+ 	// first direct block
+ 	if(bw->bpdir == EXT2_INIT_BLOCK)
+ 	{
+-		bkref = &get_nod(fs, nod)->i_block[bw->bpdir = 0];
++		bkref = &iblk[bw->bpdir = 0];
+ 		if(extend) // allocate first block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+ 		if(reduce) // free first block
+@@ -994,7 +1570,7 @@
+ 	// direct block
+ 	else if(bw->bpdir < EXT2_NDIR_BLOCKS)
+ 	{
+-		bkref = &get_nod(fs, nod)->i_block[++bw->bpdir];
++		bkref = &iblk[++bw->bpdir];
+ 		if(extend) // allocate block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+ 		if(reduce) // free block
+@@ -1007,10 +1583,10 @@
+ 		bw->bpdir = EXT2_IND_BLOCK;
+ 		bw->bpind = 0;
+ 		if(extend) // allocate indirect block
+-			get_nod(fs, nod)->i_block[bw->bpdir] = alloc_blk(fs,nod);
++			iblk[bw->bpdir] = alloc_blk(fs,nod);
+ 		if(reduce) // free indirect block
+-			free_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
++			free_blk(fs, iblk[bw->bpdir]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
+ 		bkref = &b[bw->bpind];
+ 		if(extend) // allocate first block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1021,7 +1597,7 @@
+ 	else if((bw->bpdir == EXT2_IND_BLOCK) && (bw->bpind < BLOCKSIZE/4 - 1))
+ 	{
+ 		bw->bpind++;
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
+ 		bkref = &b[bw->bpind];
+ 		if(extend) // allocate block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1036,15 +1612,15 @@
+ 		bw->bpind = 0;
+ 		bw->bpdind = 0;
+ 		if(extend) // allocate double indirect block
+-			get_nod(fs, nod)->i_block[bw->bpdir] = alloc_blk(fs,nod);
++			iblk[bw->bpdir] = alloc_blk(fs,nod);
+ 		if(reduce) // free double indirect block
+-			free_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
++			free_blk(fs, iblk[bw->bpdir]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
+ 		if(extend) // allocate first indirect block
+ 			b[bw->bpind] = alloc_blk(fs,nod);
+ 		if(reduce) // free  firstindirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
+ 		bkref = &b[bw->bpdind];
+ 		if(extend) // allocate first block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1055,8 +1631,8 @@
+ 	else if((bw->bpdir == EXT2_DIND_BLOCK) && (bw->bpdind < BLOCKSIZE/4 - 1))
+ 	{
+ 		bw->bpdind++;
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
+ 		bkref = &b[bw->bpdind];
+ 		if(extend) // allocate block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1069,12 +1645,12 @@
+ 		bw->bnum++;
+ 		bw->bpdind = 0;
+ 		bw->bpind++;
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
+ 		if(extend) // allocate indirect block
+ 			b[bw->bpind] = alloc_blk(fs,nod);
+ 		if(reduce) // free indirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
+ 		bkref = &b[bw->bpdind];
+ 		if(extend) // allocate first block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1094,20 +1670,20 @@
+ 		bw->bpdind = 0;
+ 		bw->bptind = 0;
+ 		if(extend) // allocate triple indirect block
+-			get_nod(fs, nod)->i_block[bw->bpdir] = alloc_blk(fs,nod);
++			iblk[bw->bpdir] = alloc_blk(fs,nod);
+ 		if(reduce) // free triple indirect block
+-			free_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
++			free_blk(fs, iblk[bw->bpdir]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
+ 		if(extend) // allocate first double indirect block
+ 			b[bw->bpind] = alloc_blk(fs,nod);
+ 		if(reduce) // free first double indirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
+ 		if(extend) // allocate first indirect block
+ 			b[bw->bpdind] = alloc_blk(fs,nod);
+ 		if(reduce) // free first indirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpdind]);
++		b = get_blkmap(fs, b[bw->bpdind], &bmi3);
+ 		bkref = &b[bw->bptind];
+ 		if(extend) // allocate first data block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1121,9 +1697,9 @@
+ 		  (bw->bptind < BLOCKSIZE/4 -1) )
+ 	{
+ 		bw->bptind++;
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpdind]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
++		b = get_blkmap(fs, b[bw->bpdind], &bmi3);
+ 		bkref = &b[bw->bptind];
+ 		if(extend) // allocate data block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1140,13 +1716,13 @@
+ 		bw->bnum++;
+ 		bw->bptind = 0;
+ 		bw->bpdind++;
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
+ 		if(extend) // allocate single indirect block
+ 			b[bw->bpdind] = alloc_blk(fs,nod);
+ 		if(reduce) // free indirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpdind]);
++		b = get_blkmap(fs, b[bw->bpdind], &bmi3);
+ 		bkref = &b[bw->bptind];
+ 		if(extend) // allocate first data block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1163,17 +1739,17 @@
+ 		bw->bpdind = 0;
+ 		bw->bptind = 0;
+ 		bw->bpind++;
+-		b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]);
++		b = get_blkmap(fs, iblk[bw->bpdir], &bmi1);
+ 		if(extend) // allocate double indirect block
+ 			b[bw->bpind] = alloc_blk(fs,nod);
+ 		if(reduce) // free double indirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpind]);
++		b = get_blkmap(fs, b[bw->bpind], &bmi2);
+ 		if(extend) // allocate single indirect block
+ 			b[bw->bpdind] = alloc_blk(fs,nod);
+ 		if(reduce) // free indirect block
+ 			free_blk(fs, b[bw->bpind]);
+-		b = (uint32*)get_blk(fs, b[bw->bpdind]);
++		b = get_blkmap(fs, b[bw->bpdind], &bmi3);
+ 		bkref = &b[bw->bptind];
+ 		if(extend) // allocate first block
+ 			*bkref = hole ? 0 : alloc_blk(fs,nod);
+@@ -1184,56 +1760,105 @@
+ 		error_msg_and_die("file too big !"); 
+ 	/* End change for walking triple indirection */
+ 
+-	if(*bkref)
+-	{
++	bk = *bkref;
++	if (bmi3)
++		put_blkmap(bmi3);
++	if (bmi2)
++		put_blkmap(bmi2);
++	if (bmi1)
++		put_blkmap(bmi1);
++
++	if(bk)
++	{
++		blk_info *bi;
++		gd_info *gi;
++		uint8 *block;
+ 		bw->bnum++;
+-		if(!reduce && !allocated(GRP_GET_BLOCK_BITMAP(fs,*bkref), GRP_BBM_OFFSET(fs,*bkref)))
+-			error_msg_and_die("[block %d of inode %d is unallocated !]", *bkref, nod);
++		block = GRP_GET_BLOCK_BITMAP(fs,bk,&bi,&gi);
++		if(!reduce && !allocated(block, GRP_BBM_OFFSET(fs,bk)))
++			error_msg_and_die("[block %d of inode %d is unallocated !]", bk, nod);
++		GRP_PUT_BLOCK_BITMAP(bi, gi);
+ 	}
+ 	if(extend)
+-		get_nod(fs, nod)->i_blocks = bw->bnum * INOBLK;
+-	return *bkref;
++		inod->i_blocks = bw->bnum * INOBLK;
++	put_nod(ni);
++	return bk;
+ }
+ 
+-// add blocks to an inode (file/dir/etc...)
+-static void
+-extend_blk(filesystem *fs, uint32 nod, block b, int amount)
++typedef struct
+ {
+-	int create = amount;
+-	blockwalker bw, lbw;
+-	uint32 bk;
+-	init_bw(&bw);
+-	if(amount < 0)
+-	{
+-		uint32 i;
+-		for(i = 0; i < get_nod(fs, nod)->i_blocks / INOBLK + amount; i++)
+-			walk_bw(fs, nod, &bw, 0, 0);
+-		while(walk_bw(fs, nod, &bw, &create, 0) != WALK_END)
++	blockwalker bw;
++	uint32 nod;
++	nod_info *ni;
++	inode *inod;
++} inode_pos;
++#define INODE_POS_TRUNCATE 0
++#define INODE_POS_EXTEND 1
++
++// Call this to set up an ipos structure for future use with
++// extend_inode_blk to append blocks to the given inode.  If
++// op is INODE_POS_TRUNCATE, the inode is truncated to zero size.
++// If op is INODE_POS_EXTEND, the position is moved to the end
++// of the inode's data blocks.
++// Call inode_pos_finish when done with the inode_pos structure.
++static void
++inode_pos_init(filesystem *fs, inode_pos *ipos, uint32 nod, int op,
++	       blockwalker *endbw)
++{
++	blockwalker lbw;
++
++	init_bw(&ipos->bw);
++	ipos->nod = nod;
++	ipos->inod = get_nod(fs, nod, &ipos->ni);
++	if (op == INODE_POS_TRUNCATE) {
++		int32 create = -1;
++		while(walk_bw(fs, nod, &ipos->bw, &create, 0) != WALK_END)
+ 			/*nop*/;
+-		get_nod(fs, nod)->i_blocks += amount * INOBLK;
++		ipos->inod->i_blocks = 0;
+ 	}
+-	else
++
++	if (endbw)
++		ipos->bw = *endbw;
++	else {
++		/* Seek to the end */
++		init_bw(&ipos->bw);
++		lbw = ipos->bw;
++		while(walk_bw(fs, nod, &ipos->bw, 0, 0) != WALK_END)
++			lbw = ipos->bw;
++		ipos->bw = lbw;
++	}
++}
++
++// Clean up the inode_pos structure.
++static void
++inode_pos_finish(filesystem *fs, inode_pos *ipos)
++{
++	put_nod(ipos->ni);
++}
++
++// add blocks to an inode (file/dir/etc...) at the given position.
++// This will only work when appending to the end of an inode.
++static void
++extend_inode_blk(filesystem *fs, inode_pos *ipos, block b, int amount)
++{
++	uint32 bk;
++	uint32 pos;
++
++	if (amount < 0)
++		error_msg_and_die("extend_inode_blk: Got negative amount");
++
++	for (pos = 0; amount; pos += BLOCKSIZE)
+ 	{
+-		lbw = bw;
+-		while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END)
+-			lbw = bw;
+-		bw = lbw;
+-		while(create)
+-		{
+-			int i, copyb = 0;
+-			if(!(fs->sb.s_reserved[200] & OP_HOLES))
+-				copyb = 1;
+-			else
+-				for(i = 0; i < BLOCKSIZE / 4; i++)
+-					if(((int32*)(b + BLOCKSIZE * (amount - create)))[i])
+-					{
+-						copyb = 1;
+-						break;
+-					}
+-			if((bk = walk_bw(fs, nod, &bw, &create, !copyb)) == WALK_END)
+-				break;
+-			if(copyb)
+-				memcpy(get_blk(fs, bk), b + BLOCKSIZE * (amount - create - 1), BLOCKSIZE);
++		int hole = (fs->holes && is_blk_empty(b + pos));
++
++		bk = walk_bw(fs, ipos->nod, &ipos->bw, &amount, hole);
++		if (bk == WALK_END)
++			error_msg_and_die("extend_inode_blk: extend failed");
++		if (!hole) {
++			blk_info *bi;
++			uint8 *block = get_blk(fs, bk, &bi);
++			memcpy(block, b + pos, BLOCKSIZE);
++			put_blk(bi);
+ 		}
+ 	}
+ }
+@@ -1242,15 +1867,17 @@
+ static void
+ add2dir(filesystem *fs, uint32 dnod, uint32 nod, const char* name)
+ {
+-	blockwalker bw;
++	blockwalker bw, lbw;
+ 	uint32 bk;
+-	uint8 *b;
+ 	directory *d;
++	dirwalker dw;
+ 	int reclen, nlen;
+ 	inode *node;
+ 	inode *pnode;
++	nod_info *dni, *ni;
++	inode_pos ipos;
+ 
+-	pnode = get_nod(fs, dnod);
++	pnode = get_nod(fs, dnod, &dni);
+ 	if((pnode->i_mode & FM_IFMT) != FM_IFDIR)
+ 		error_msg_and_die("can't add '%s' to a non-directory", name);
+ 	if(!*name)
+@@ -1262,52 +1889,52 @@
+ 	if(reclen > BLOCKSIZE)
+ 		error_msg_and_die("bad name '%s' (too long)", name);
+ 	init_bw(&bw);
++	lbw = bw;
+ 	while((bk = walk_bw(fs, dnod, &bw, 0, 0)) != WALK_END) // for all blocks in dir
+ 	{
+-		b = get_blk(fs, bk);
+ 		// for all dir entries in block
+-		for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len))
++		for(d = get_dir(fs, bk, &dw); d; d = next_dir(&dw))
+ 		{
+ 			// if empty dir entry, large enough, use it
+ 			if((!d->d_inode) && (d->d_rec_len >= reclen))
+ 			{
+ 				d->d_inode = nod;
+-				node = get_nod(fs, nod);
++				node = get_nod(fs, nod, &ni);
++				dir_set_name(&dw, name, nlen);
++				put_dir(&dw);
+ 				node->i_links_count++;
+-				d->d_name_len = nlen;
+-				strncpy(d->d_name, name, nlen);
+-				return;
++				put_nod(ni);
++				goto out;
+ 			}
+ 			// if entry with enough room (last one?), shrink it & use it
+ 			if(d->d_rec_len >= (sizeof(directory) + rndup(d->d_name_len, 4) + reclen))
+ 			{
+-				reclen = d->d_rec_len;
+-				d->d_rec_len = sizeof(directory) + rndup(d->d_name_len, 4);
+-				reclen -= d->d_rec_len;
+-				d = (directory*) (((int8*)d) + d->d_rec_len);
+-				d->d_rec_len = reclen;
+-				d->d_inode = nod;
+-				node = get_nod(fs, nod);
++				d = shrink_dir(&dw, nod, name, nlen);
++				put_dir(&dw);
++				node = get_nod(fs, nod, &ni);
+ 				node->i_links_count++;
+-				d->d_name_len = nlen;
+-				strncpy(d->d_name, name, nlen);
+-				return;
++				put_nod(ni);
++				goto out;
+ 			}
+ 		}
++		put_dir(&dw);
++		lbw = bw;
+ 	}
+ 	// we found no free entry in the directory, so we add a block
+-	if(!(b = get_workblk()))
+-		error_msg_and_die("get_workblk() failed.");
+-	d = (directory*)b;
+-	d->d_inode = nod;
+-	node = get_nod(fs, nod);
++	node = get_nod(fs, nod, &ni);
++	d = new_dir(fs, nod, name, nlen, &dw);
+ 	node->i_links_count++;
+-	d->d_rec_len = BLOCKSIZE;
+-	d->d_name_len = nlen;
+-	strncpy(d->d_name, name, nlen);
+-	extend_blk(fs, dnod, b, 1);
+-	get_nod(fs, dnod)->i_size += BLOCKSIZE;
+-	free_workblk(b);
++	put_nod(ni);
++	next_dir(&dw); // Force the data into the buffer
++
++	inode_pos_init(fs, &ipos, dnod, INODE_POS_EXTEND, &lbw);
++	extend_inode_blk(fs, &ipos, dir_data(&dw), 1);
++	inode_pos_finish(fs, &ipos);
++
++	put_dir(&dw);
++	pnode->i_size += BLOCKSIZE;
++out:
++	put_nod(dni);
+ }
+ 
+ // find an entry in a directory
+@@ -1321,11 +1948,13 @@
+ 	while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END)
+ 	{
+ 		directory *d;
+-		uint8 *b;
+-		b = get_blk(fs, bk);
+-		for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len))
+-			if(d->d_inode && (nlen == d->d_name_len) && !strncmp(d->d_name, name, nlen))
++		dirwalker dw;
++		for (d = get_dir(fs, bk, &dw); d; d=next_dir(&dw))
++			if(d->d_inode && (nlen == d->d_name_len) && !strncmp(dir_name(&dw), name, nlen)) {
++				put_dir(&dw);
+ 				return d->d_inode;
++			}
++		put_dir(&dw);
+ 	}
+ 	return 0;
+ }
+@@ -1356,47 +1985,55 @@
+ 	return nod;
+ }
+ 
++// chmod an inode
++void
++chmod_fs(filesystem *fs, uint32 nod, uint16 mode, uint16 uid, uint16 gid)
++{
++	inode *node;
++	nod_info *ni;
++	node = get_nod(fs, nod, &ni);
++	node->i_mode = (node->i_mode & ~FM_IMASK) | (mode & FM_IMASK);
++	node->i_uid = uid;
++	node->i_gid = gid;
++	put_nod(ni);
++}
++
+ // create a simple inode
+ static uint32
+ mknod_fs(filesystem *fs, uint32 parent_nod, const char *name, uint16 mode, uint16 uid, uint16 gid, uint8 major, uint8 minor, uint32 ctime, uint32 mtime)
+ {
+ 	uint32 nod;
+ 	inode *node;
+-	if((nod = find_dir(fs, parent_nod, name)))
+-	{
+-		node = get_nod(fs, nod);
+-		if((node->i_mode & FM_IFMT) != (mode & FM_IFMT))
+-			error_msg_and_die("node '%s' already exists and isn't of the same type", name);
+-		node->i_mode = mode;
+-	}
+-	else
++	nod_info *ni;
++	gd_info *gi;
++
++	nod = alloc_nod(fs);
++	node = get_nod(fs, nod, &ni);
++	node->i_mode = mode;
++	add2dir(fs, parent_nod, nod, name);
++	switch(mode & FM_IFMT)
+ 	{
+-		nod = alloc_nod(fs);
+-		node = get_nod(fs, nod);
+-		node->i_mode = mode;
+-		add2dir(fs, parent_nod, nod, name);
+-		switch(mode & FM_IFMT)
+-		{
+-			case FM_IFLNK:
+-				mode = FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO;
+-				break;
+-			case FM_IFBLK:
+-			case FM_IFCHR:
+-				((uint8*)get_nod(fs, nod)->i_block)[0] = minor;
+-				((uint8*)get_nod(fs, nod)->i_block)[1] = major;
+-				break;
+-			case FM_IFDIR:
+-				add2dir(fs, nod, nod, ".");
+-				add2dir(fs, nod, parent_nod, "..");
+-				fs->gd[GRP_GROUP_OF_INODE(fs,nod)].bg_used_dirs_count++;
+-				break;
+-		}
++	case FM_IFLNK:
++		mode = FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO;
++		break;
++	case FM_IFBLK:
++	case FM_IFCHR:
++		((uint8*)node->i_block)[0] = minor;
++		((uint8*)node->i_block)[1] = major;
++		break;
++	case FM_IFDIR:
++		add2dir(fs, nod, nod, ".");
++		add2dir(fs, nod, parent_nod, "..");
++		get_gd(fs,GRP_GROUP_OF_INODE(fs,nod),&gi)->bg_used_dirs_count++;
++		put_gd(gi);
++		break;
+ 	}
+ 	node->i_uid = uid;
+ 	node->i_gid = gid;
+ 	node->i_atime = mtime;
+ 	node->i_ctime = ctime;
+ 	node->i_mtime = mtime;
++	put_nod(ni);
+ 	return nod;
+ }
+ 
+@@ -1413,33 +2050,73 @@
+ mklink_fs(filesystem *fs, uint32 parent_nod, const char *name, size_t size, uint8 *b, uid_t uid, gid_t gid, uint32 ctime, uint32 mtime)
+ {
+ 	uint32 nod = mknod_fs(fs, parent_nod, name, FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO, uid, gid, 0, 0, ctime, mtime);
+-	extend_blk(fs, nod, 0, - (int)get_nod(fs, nod)->i_blocks / INOBLK);
+-	get_nod(fs, nod)->i_size = size;
+-	if(size <= 4 * (EXT2_TIND_BLOCK+1))
+-	{
+-		strncpy((char*)get_nod(fs, nod)->i_block, (char*)b, size);
++	nod_info *ni;
++	inode *node = get_nod(fs, nod, &ni);
++	inode_pos ipos;
++
++	inode_pos_init(fs, &ipos, nod, INODE_POS_TRUNCATE, NULL);
++	node->i_size = size;
++	if(size < 4 * (EXT2_TIND_BLOCK+1))
++	{
++		strncpy((char*)node->i_block, (char*)b, size);
++		((char*)node->i_block)[size+1] = '\0';
++		inode_pos_finish(fs, &ipos);
++		put_nod(ni);
+ 		return nod;
+ 	}
+-	extend_blk(fs, nod, b, rndup(size, BLOCKSIZE) / BLOCKSIZE);
++	extend_inode_blk(fs, &ipos, b, rndup(size, BLOCKSIZE) / BLOCKSIZE);
++	inode_pos_finish(fs, &ipos);
++	put_nod(ni);
+ 	return nod;
+ }
+ 
++static void
++fs_upgrade_rev1_largefile(filesystem *fs)
++{
++	fs->sb->s_rev_level = 1;
++	fs->sb->s_first_ino = EXT2_GOOD_OLD_FIRST_INO;
++	fs->sb->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE;
++}
++
++#define COPY_BLOCKS 16
++#define CB_SIZE (COPY_BLOCKS * BLOCKSIZE)
++
+ // make a file from a FILE*
+ static uint32
+-mkfile_fs(filesystem *fs, uint32 parent_nod, const char *name, uint32 mode, size_t size, FILE *f, uid_t uid, gid_t gid, uint32 ctime, uint32 mtime)
++mkfile_fs(filesystem *fs, uint32 parent_nod, const char *name, uint32 mode, FILE *f, uid_t uid, gid_t gid, uint32 ctime, uint32 mtime)
+ {
+ 	uint8 * b;
+ 	uint32 nod = mknod_fs(fs, parent_nod, name, mode|FM_IFREG, uid, gid, 0, 0, ctime, mtime);
+-	extend_blk(fs, nod, 0, - (int)get_nod(fs, nod)->i_blocks / INOBLK);
+-	get_nod(fs, nod)->i_size = size;
+-	if (size) {
+-		if(!(b = (uint8*)calloc(rndup(size, BLOCKSIZE), 1)))
+-			error_msg_and_die("not enough mem to read file '%s'", name);
+-		if(f)
+-			fread(b, size, 1, f); // FIXME: ugly. use mmap() ...
+-		extend_blk(fs, nod, b, rndup(size, BLOCKSIZE) / BLOCKSIZE);
+-		free(b);
+-	}
++	nod_info *ni;
++	inode *node = get_nod(fs, nod, &ni);
++	off_t size = 0;
++	size_t readbytes;
++	inode_pos ipos;
++	int fullsize;
++
++	b = malloc(CB_SIZE);
++	if (!b)
++		error_msg_and_die("mkfile_fs: out of memory");
++	inode_pos_init(fs, &ipos, nod, INODE_POS_TRUNCATE, NULL);
++	readbytes = fread(b, 1, CB_SIZE, f);
++	while (readbytes) {
++		fullsize = rndup(readbytes, BLOCKSIZE);
++		// Fill to end of block with zeros.
++		memset(b + readbytes, 0, fullsize - readbytes);
++		extend_inode_blk(fs, &ipos, b, fullsize / BLOCKSIZE);
++		size += readbytes;
++		readbytes = fread(b, 1, CB_SIZE, f);
++	}
++	if (size > 0x7fffffff) {
++		if (fs->sb->s_rev_level < 1)
++			fs_upgrade_rev1_largefile(fs);
++		fs->sb->s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_LARGE_FILE;
++	}
++	node->i_dir_acl = size >> 32;
++	node->i_size = size;
++	inode_pos_finish(fs, &ipos);
++	put_nod(ni);
++	free(b);
+ 	return nod;
+ }
+ 
+@@ -1591,13 +2268,24 @@
+ 				dname = malloc(len + 1);
+ 				for(i = start; i < count; i++)
+ 				{
++					uint32 oldnod;
+ 					SNPRINTF(dname, len, "%s%lu", name, i);
+-					mknod_fs(fs, nod, dname, mode, uid, gid, major, minor + (i * increment - start), ctime, mtime);
++					oldnod = find_dir(fs, nod, dname);
++					if(oldnod)
++						chmod_fs(fs, oldnod, mode, uid, gid);
++					else
++						mknod_fs(fs, nod, dname, mode, uid, gid, major, minor + (i * increment - start), ctime, mtime);
+ 				}
+ 				free(dname);
+ 			}
+ 			else
+-				mknod_fs(fs, nod, name, mode, uid, gid, major, minor, ctime, mtime);
++			{
++				uint32 oldnod = find_dir(fs, nod, name);
++				if(oldnod)
++					chmod_fs(fs, oldnod, mode, uid, gid);
++				else
++					mknod_fs(fs, nod, name, mode, uid, gid, major, minor, ctime, mtime);
++			}
+ 		}
+ 	}
+ 	if (line)
+@@ -1643,6 +2331,10 @@
+ 			switch(st.st_mode & S_IFMT)
+ 			{
+ 				case S_IFLNK:
++					if((st.st_mode & S_IFMT) == S_IFREG || st.st_size >= 4 * (EXT2_TIND_BLOCK+1))
++						stats->nblocks += (st.st_size + BLOCKSIZE - 1) / BLOCKSIZE;
++					stats->ninodes++;
++					break;
+ 				case S_IFREG:
+ 					if((st.st_mode & S_IFMT) == S_IFREG || st.st_size > 4 * (EXT2_TIND_BLOCK+1))
+ 						stats->nblocks += (st.st_size + BLOCKSIZE - 1) / BLOCKSIZE;
+@@ -1657,19 +2349,33 @@
+ 					if(chdir(dent->d_name) < 0)
+ 						perror_msg_and_die(dent->d_name);
+ 					add2fs_from_dir(fs, this_nod, squash_uids, squash_perms, fs_timestamp, stats);
+-					chdir("..");
++					if (chdir("..") == -1)
++						perror_msg_and_die("..");
++
+ 					break;
+ 				default:
+ 					break;
+ 			}
+ 		else
+ 		{
++			if((nod = find_dir(fs, this_nod, name)))
++			{
++				error_msg("ignoring duplicate entry %s", name);
++				if(S_ISDIR(st.st_mode)) {
++					if(chdir(dent->d_name) < 0)
++						perror_msg_and_die(name);
++					add2fs_from_dir(fs, nod, squash_uids, squash_perms, fs_timestamp, stats);
++					if (chdir("..") == -1)
++						perror_msg_and_die("..");
++				}
++				continue;
++			}
+ 			save_nod = 0;
+ 			/* Check for hardlinks */
+ 			if (!S_ISDIR(st.st_mode) && !S_ISLNK(st.st_mode) && st.st_nlink > 1) {
+-				int32 hdlink = is_hardlink(st.st_ino);
++				int32 hdlink = is_hardlink(fs, st.st_ino);
+ 				if (hdlink >= 0) {
+-					add2dir(fs, this_nod, hdlinks.hdl[hdlink].dst_nod, name);
++					add2dir(fs, this_nod, fs->hdlinks.hdl[hdlink].dst_nod, name);
+ 					continue;
+ 				} else {
+ 					save_nod = 1;
+@@ -1697,8 +2403,12 @@
+ 					free(lnk);
+ 					break;
+ 				case S_IFREG:
+-					fh = xfopen(dent->d_name, "rb");
+-					nod = mkfile_fs(fs, this_nod, name, mode, st.st_size, fh, uid, gid, ctime, mtime);
++					fh = fopen(dent->d_name, "rb");
++					if (!fh) {
++						error_msg("Unable to open file %s", dent->d_name);
++						break;
++					}
++					nod = mkfile_fs(fs, this_nod, name, mode, fh, uid, gid, ctime, mtime);
+ 					fclose(fh);
+ 					break;
+ 				case S_IFDIR:
+@@ -1706,199 +2416,128 @@
+ 					if(chdir(dent->d_name) < 0)
+ 						perror_msg_and_die(name);
+ 					add2fs_from_dir(fs, nod, squash_uids, squash_perms, fs_timestamp, stats);
+-					chdir("..");
++					if (chdir("..") == -1)
++						perror_msg_and_die("..");
+ 					break;
+ 				default:
+ 					error_msg("ignoring entry %s", name);
+ 			}
+ 			if (save_nod) {
+-				if (hdlinks.count == hdlink_cnt) {
+-					if ((hdlinks.hdl = 
+-						 realloc (hdlinks.hdl, (hdlink_cnt + HDLINK_CNT) *
++				if (fs->hdlinks.count == fs->hdlink_cnt) {
++					if ((fs->hdlinks.hdl =
++						 realloc (fs->hdlinks.hdl, (fs->hdlink_cnt + HDLINK_CNT) *
+ 								  sizeof (struct hdlink_s))) == NULL) {
+ 						error_msg_and_die("Not enough memory");
+ 					}
+-					hdlink_cnt += HDLINK_CNT;
++					fs->hdlink_cnt += HDLINK_CNT;
+ 				}
+-				hdlinks.hdl[hdlinks.count].src_inode = st.st_ino;
+-				hdlinks.hdl[hdlinks.count].dst_nod = nod;
+-				hdlinks.count++;
++				fs->hdlinks.hdl[fs->hdlinks.count].src_inode = st.st_ino;
++				fs->hdlinks.hdl[fs->hdlinks.count].dst_nod = nod;
++				fs->hdlinks.count++;
+ 			}
+ 		}
+ 	}
+ 	closedir(dh);
+ }
+ 
+-// endianness swap of x-indirect blocks
++// Copy size blocks from src to dst, putting holes in the output
++// file (if possible) if the input block is all zeros.
++// Copy size blocks from src to dst, putting holes in the output
++// file (if possible) if the input block is all zeros.
+ static void
+-swap_goodblocks(filesystem *fs, inode *nod)
++copy_file(filesystem *fs, FILE *dst, FILE *src, size_t size)
+ {
+-	uint32 i,j;
+-	int done=0;
+-	uint32 *b,*b2;
++	uint8 *b;
+ 
+-	uint32 nblk = nod->i_blocks / INOBLK;
+-	if((nod->i_size && !nblk) || ((nod->i_mode & FM_IFBLK) == FM_IFBLK) || ((nod->i_mode & FM_IFCHR) == FM_IFCHR))
+-		for(i = 0; i <= EXT2_TIND_BLOCK; i++)
+-			nod->i_block[i] = swab32(nod->i_block[i]);
+-	if(nblk <= EXT2_IND_BLOCK)
+-		return;
+-	swap_block(get_blk(fs, nod->i_block[EXT2_IND_BLOCK]));
+-	if(nblk <= EXT2_DIND_BLOCK + BLOCKSIZE/4)
+-		return;
+-	/* Currently this will fail b'cos the number of blocks as stored
+-	   in i_blocks also includes the indirection blocks (see
+-	   walk_bw). But this function assumes that i_blocks only
+-	   stores the count of data blocks ( Actually according to
+-	   "Understanding the Linux Kernel" (Table 17-3 p502 1st Ed)
+-	   i_blocks IS supposed to store the count of data blocks). so
+-	   with a file of size 268K nblk would be 269.The above check
+-	   will be false even though double indirection hasn't been
+-	   started.This is benign as 0 means block 0 which has been
+-	   zeroed out and therefore points back to itself from any offset
+-	 */
+-	// FIXME: I have fixed that, but I have the feeling the rest of
+-	// ths function needs to be fixed for the same reasons - Xav
+-	assert(nod->i_block[EXT2_DIND_BLOCK] != 0);
+-	for(i = 0; i < BLOCKSIZE/4; i++)
+-		if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i )
+-			swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
+-	swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]));
+-	if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4)
+-		return;
+-	/* Adding support for triple indirection */
+-	b = (uint32*)get_blk(fs,nod->i_block[EXT2_TIND_BLOCK]);
+-	for(i=0;i < BLOCKSIZE/4 && !done ; i++) {
+-		b2 = (uint32*)get_blk(fs,b[i]); 
+-		for(j=0; j<BLOCKSIZE/4;j++) {
+-			if (nblk > ( EXT2_IND_BLOCK + BLOCKSIZE/4 + 
+-				     (BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+-				     i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+-				     j*(BLOCKSIZE/4)) ) 
+-			  swap_block(get_blk(fs,b2[j]));
+-			else {
+-			  done = 1;
+-			  break;
+-			}
++	b = malloc(BLOCKSIZE);
++	if (!b)
++		error_msg_and_die("copy_file: out of memory");
++	if (fseek(src, 0, SEEK_SET))
++		perror_msg_and_die("fseek");
++	if (ftruncate(fileno(dst), 0))
++		perror_msg_and_die("copy_file: ftruncate");
++	while (size > 0) {
++		if (fread(b, BLOCKSIZE, 1, src) != 1)
++			perror_msg_and_die("copy failed on read");
++		if ((dst != stdout) && fs->holes && is_blk_empty(b)) {
++			/* Empty block, just skip it */
++			if (fseek(dst, BLOCKSIZE, SEEK_CUR))
++				perror_msg_and_die("fseek");
++		} else {
++			if (fwrite(b, BLOCKSIZE, 1, dst) != 1)
++				perror_msg_and_die("copy failed on write");
+ 		}
+-		swap_block((uint8 *)b2);
++		size--;
+ 	}
+-	swap_block((uint8 *)b);
+-	return;
++	free(b);
+ }
+ 
+-static void
+-swap_badblocks(filesystem *fs, inode *nod)
++// Allocate a new filesystem structure, allocate internal memory,
++// and initialize the contents.
++static filesystem *
++alloc_fs(int swapit, char *fname, uint32 nbblocks, FILE *srcfile)
+ {
+-	uint32 i,j;
+-	int done=0;
+-	uint32 *b,*b2;
++	filesystem *fs;
++	struct stat srcstat, dststat;
+ 
+-	uint32 nblk = nod->i_blocks / INOBLK;
+-	if((nod->i_size && !nblk) || ((nod->i_mode & FM_IFBLK) == FM_IFBLK) || ((nod->i_mode & FM_IFCHR) == FM_IFCHR))
+-		for(i = 0; i <= EXT2_TIND_BLOCK; i++)
+-			nod->i_block[i] = swab32(nod->i_block[i]);
+-	if(nblk <= EXT2_IND_BLOCK)
+-		return;
+-	swap_block(get_blk(fs, nod->i_block[EXT2_IND_BLOCK]));
+-	if(nblk <= EXT2_DIND_BLOCK + BLOCKSIZE/4)
+-		return;
+-	/* See comment in swap_goodblocks */
+-	assert(nod->i_block[EXT2_DIND_BLOCK] != 0);
+-	swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]));
+-	for(i = 0; i < BLOCKSIZE/4; i++)
+-		if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i )
+-			swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
+-	if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4)
+-		return;
+-	/* Adding support for triple indirection */
+-	b = (uint32*)get_blk(fs,nod->i_block[EXT2_TIND_BLOCK]);
+-	swap_block((uint8 *)b);
+-	for(i=0;i < BLOCKSIZE/4 && !done ; i++) {
+-		b2 = (uint32*)get_blk(fs,b[i]); 
+-		swap_block((uint8 *)b2);
+-		for(j=0; j<BLOCKSIZE/4;j++) {
+-			if (nblk > ( EXT2_IND_BLOCK + BLOCKSIZE/4 + 
+-				     (BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+-				     i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+-				     j*(BLOCKSIZE/4)) ) 
+-			  swap_block(get_blk(fs,b2[j]));
+-			else {
+-			  done = 1;
+-			  break;
+-			}
+-		}
+-	}
+-	return;
+-}
++	fs = malloc(sizeof(*fs));
++	if (!fs)
++		error_msg_and_die("not enough memory for filesystem");
++	memset(fs, 0, sizeof(*fs));
++	fs->swapit = swapit;
++	cache_init(&fs->blks, MAX_FREE_CACHE_BLOCKS, blk_elem_val, blk_freed);
++	cache_init(&fs->gds, MAX_FREE_CACHE_GDS, gd_elem_val, gd_freed);
++	cache_init(&fs->blkmaps, MAX_FREE_CACHE_BLOCKMAPS,
++		   blkmap_elem_val, blkmap_freed);
++	cache_init(&fs->inodes, MAX_FREE_CACHE_INODES,
++		   inode_elem_val, inode_freed);
++	fs->hdlink_cnt = HDLINK_CNT;
++	fs->hdlinks.hdl = calloc(sizeof(struct hdlink_s), fs->hdlink_cnt);
++	if (!fs->hdlinks.hdl)
++		error_msg_and_die("Not enough memory");
++	fs->hdlinks.count = 0 ;
+ 
+-// endianness swap of the whole filesystem
+-static void
+-swap_goodfs(filesystem *fs)
+-{
+-	uint32 i;
+-	for(i = 1; i < fs->sb.s_inodes_count; i++)
+-	{
+-		inode *nod = get_nod(fs, i);
+-		if(nod->i_mode & FM_IFDIR)
+-		{
+-			blockwalker bw;
+-			uint32 bk;
+-			init_bw(&bw);
+-			while((bk = walk_bw(fs, i, &bw, 0, 0)) != WALK_END)
+-			{
+-				directory *d;
+-				uint8 *b;
+-				b = get_blk(fs, bk);
+-				for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + swab16(d->d_rec_len)))
+-					swap_dir(d);
+-			}
+-		}
+-		swap_goodblocks(fs, nod);
+-		swap_nod(nod);
+-	}
+-	for(i=0;i<GRP_NBGROUPS(fs);i++)
+-		swap_gd(&(fs->gd[i]));
+-	swap_sb(&fs->sb);
++	if (strcmp(fname, "-") == 0)
++		fs->f = tmpfile();
++	else if (srcfile) {
++		if (fstat(fileno(srcfile), &srcstat))
++			perror_msg_and_die("fstat srcfile");
++		if (stat(fname, &dststat) == 0
++		    && srcstat.st_ino == dststat.st_ino
++		    && srcstat.st_dev == dststat.st_dev)
++		  {
++			// source and destination are the same file, don't
++			// truncate or copy, just use the file.
++			fs->f = fopen(fname, "r+b");
++		} else {
++			fs->f = fopen(fname, "w+b");
++			if (fs->f)
++				copy_file(fs, fs->f, srcfile, nbblocks);
++		}
++	} else
++		fs->f = fopen(fname, "w+b");
++	if (!fs->f)
++		perror_msg_and_die("opening %s", fname);
++	return fs;
+ }
+ 
++/* Make sure the output file is the right size */
+ static void
+-swap_badfs(filesystem *fs)
++set_file_size(filesystem *fs)
+ {
+-	uint32 i;
+-	swap_sb(&fs->sb);
+-	for(i=0;i<GRP_NBGROUPS(fs);i++)
+-		swap_gd(&(fs->gd[i]));
+-	for(i = 1; i < fs->sb.s_inodes_count; i++)
+-	{
+-		inode *nod = get_nod(fs, i);
+-		swap_nod(nod);
+-		swap_badblocks(fs, nod);
+-		if(nod->i_mode & FM_IFDIR)
+-		{
+-			blockwalker bw;
+-			uint32 bk;
+-			init_bw(&bw);
+-			while((bk = walk_bw(fs, i, &bw, 0, 0)) != WALK_END)
+-			{
+-				directory *d;
+-				uint8 *b;
+-				b = get_blk(fs, bk);
+-				for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len))
+-					swap_dir(d);
+-			}
+-		}
+-	}
++	if (ftruncate(fileno(fs->f),
++		      ((off_t) fs->sb->s_blocks_count) * BLOCKSIZE))
++		perror_msg_and_die("set_file_size: ftruncate");
+ }
+ 
+ // initialize an empty filesystem
+ static filesystem *
+-init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, uint32 fs_timestamp)
++init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes,
++	uint32 fs_timestamp, uint32 creator_os, int swapit, char *fname)
+ {
+ 	uint32 i;
+ 	filesystem *fs;
+-	directory *d;
+-	uint8 * b;
++	dirwalker dw;
+ 	uint32 nod, first_block;
+ 	uint32 nbgroups,nbinodes_per_group,overhead_per_group,free_blocks,
+ 		free_blocks_per_group,nbblocks_per_group,min_nbgroups;
+@@ -1906,6 +2545,11 @@
+ 	uint32 j;
+ 	uint8 *bbm,*ibm;
+ 	inode *itab0;
++	blk_info *bi;
++	nod_info *ni;
++	groupdescriptor *gd;
++	gd_info *gi;
++	inode_pos ipos;
+ 	
+ 	if(nbresrvd < 0)
+ 		error_msg_and_die("reserved blocks value is invalid. Note: options have changed, see --help or the man page.");
+@@ -1919,10 +2563,14 @@
+ 	 */
+ 	min_nbgroups = (nbinodes + INODES_PER_GROUP - 1) / INODES_PER_GROUP;
+ 
++	/* On filesystems with 1k block size, the bootloader area uses a full
++	 * block. For 2048 and up, the superblock can be fitted into block 0.
++	 */
++	first_block = (BLOCKSIZE == 1024);
++
+ 	/* nbblocks is the total number of blocks in the filesystem.
+ 	 * a block group can have no more than 8192 blocks.
+ 	 */
+-	first_block = (BLOCKSIZE == 1024);
+ 	nbgroups = (nbblocks - first_block + BLOCKS_PER_GROUP - 1) / BLOCKS_PER_GROUP;
+ 	if(nbgroups < min_nbgroups) nbgroups = min_nbgroups;
+ 	nbblocks_per_group = rndup((nbblocks - first_block + nbgroups - 1)/nbgroups, 8);
+@@ -1934,51 +2582,59 @@
+ 	gdsz = rndup(nbgroups*sizeof(groupdescriptor),BLOCKSIZE)/BLOCKSIZE;
+ 	itblsz = nbinodes_per_group * sizeof(inode)/BLOCKSIZE;
+ 	overhead_per_group = 3 /*sb,bbm,ibm*/ + gdsz + itblsz;
+-	if((uint32)nbblocks - 1 < overhead_per_group * nbgroups)
+-		error_msg_and_die("too much overhead, try fewer inodes or more blocks. Note: options have changed, see --help or the man page.");
+-	free_blocks = nbblocks - overhead_per_group*nbgroups - 1 /*boot block*/;
++	free_blocks = nbblocks - overhead_per_group*nbgroups - first_block;
+ 	free_blocks_per_group = nbblocks_per_group - overhead_per_group;
++	if(free_blocks < 0)
++		error_msg_and_die("too much overhead, try fewer inodes or more blocks. Note: options have changed, see --help or the man page.");
+ 
+-	if(!(fs = (filesystem*)calloc(nbblocks, BLOCKSIZE)))
+-		error_msg_and_die("not enough memory for filesystem");
++	fs = alloc_fs(swapit, fname, nbblocks, NULL);
++	fs->sb = calloc(1, SUPERBLOCK_SIZE);
++	if (!fs->sb)
++		error_msg_and_die("error allocating header memory");
+ 
+ 	// create the superblock for an empty filesystem
+-	fs->sb.s_inodes_count = nbinodes_per_group * nbgroups;
+-	fs->sb.s_blocks_count = nbblocks;
+-	fs->sb.s_r_blocks_count = nbresrvd;
+-	fs->sb.s_free_blocks_count = free_blocks;
+-	fs->sb.s_free_inodes_count = fs->sb.s_inodes_count - EXT2_FIRST_INO + 1;
+-	fs->sb.s_first_data_block = first_block;
+-	fs->sb.s_log_block_size = BLOCKSIZE >> 11;
+-	fs->sb.s_log_frag_size = BLOCKSIZE >> 11;
+-	fs->sb.s_blocks_per_group = nbblocks_per_group;
+-	fs->sb.s_frags_per_group = nbblocks_per_group;
+-	fs->sb.s_inodes_per_group = nbinodes_per_group;
+-	fs->sb.s_wtime = fs_timestamp;
+-	fs->sb.s_magic = EXT2_MAGIC_NUMBER;
+-	fs->sb.s_lastcheck = fs_timestamp;
++	fs->sb->s_inodes_count = nbinodes_per_group * nbgroups;
++	fs->sb->s_blocks_count = nbblocks;
++	fs->sb->s_r_blocks_count = nbresrvd;
++	fs->sb->s_free_blocks_count = free_blocks;
++	fs->sb->s_free_inodes_count = fs->sb->s_inodes_count - EXT2_FIRST_INO + 1;
++	fs->sb->s_first_data_block = first_block;
++	fs->sb->s_log_block_size = BLOCKSIZE >> 11;
++	fs->sb->s_log_frag_size = BLOCKSIZE >> 11;
++	fs->sb->s_blocks_per_group = nbblocks_per_group;
++	fs->sb->s_frags_per_group = nbblocks_per_group;
++	fs->sb->s_inodes_per_group = nbinodes_per_group;
++	fs->sb->s_wtime = fs_timestamp;
++	fs->sb->s_magic = EXT2_MAGIC_NUMBER;
++	fs->sb->s_lastcheck = fs_timestamp;
++	fs->sb->s_creator_os = creator_os;
++
++	set_file_size(fs);
+ 
+ 	// set up groupdescriptors
+-	for(i=0, bbmpos=gdsz+2, ibmpos=bbmpos+1, itblpos=ibmpos+1;
++	for(i=0, bbmpos=first_block+1+gdsz, ibmpos=bbmpos+1, itblpos=ibmpos+1;
+ 		i<nbgroups;
+ 		i++, bbmpos+=nbblocks_per_group, ibmpos+=nbblocks_per_group, itblpos+=nbblocks_per_group)
+ 	{
++		gd = get_gd(fs, i, &gi);
++
+ 		if(free_blocks > free_blocks_per_group) {
+-			fs->gd[i].bg_free_blocks_count = free_blocks_per_group;
++			gd->bg_free_blocks_count = free_blocks_per_group;
+ 			free_blocks -= free_blocks_per_group;
+ 		} else {
+-			fs->gd[i].bg_free_blocks_count = free_blocks;
++			gd->bg_free_blocks_count = free_blocks;
+ 			free_blocks = 0; // this is the last block group
+ 		}
+ 		if(i)
+-			fs->gd[i].bg_free_inodes_count = nbinodes_per_group;
++			gd->bg_free_inodes_count = nbinodes_per_group;
+ 		else
+-			fs->gd[i].bg_free_inodes_count = nbinodes_per_group -
++			gd->bg_free_inodes_count = nbinodes_per_group -
+ 							EXT2_FIRST_INO + 2;
+-		fs->gd[i].bg_used_dirs_count = 0;
+-		fs->gd[i].bg_block_bitmap = bbmpos;
+-		fs->gd[i].bg_inode_bitmap = ibmpos;
+-		fs->gd[i].bg_inode_table = itblpos;
++		gd->bg_used_dirs_count = 0;
++		gd->bg_block_bitmap = bbmpos;
++		gd->bg_inode_bitmap = ibmpos;
++		gd->bg_inode_table = itblpos;
++		put_gd(gi);
+ 	}
+ 
+ 	/* Mark non-filesystem blocks and inodes as allocated */
+@@ -1984,110 +2640,143 @@
+ 	/* Mark non-filesystem blocks and inodes as allocated */
+ 	/* Mark system blocks and inodes as allocated         */
+ 	for(i = 0; i<nbgroups;i++) {
+-
+ 		/* Block bitmap */
+-		bbm = get_blk(fs,fs->gd[i].bg_block_bitmap);	
++		gd = get_gd(fs, i, &gi);
++		bbm = GRP_GET_GROUP_BBM(fs, gd, &bi);
+ 		//non-filesystem blocks
+-		for(j = fs->gd[i].bg_free_blocks_count
++		for(j = gd->bg_free_blocks_count
+ 		        + overhead_per_group + 1; j <= BLOCKSIZE * 8; j++)
+ 			allocate(bbm, j); 
+ 		//system blocks
+ 		for(j = 1; j <= overhead_per_group; j++)
+ 			allocate(bbm, j); 
+-		
++		GRP_PUT_GROUP_BBM(bi);
++
+ 		/* Inode bitmap */
+-		ibm = get_blk(fs,fs->gd[i].bg_inode_bitmap);	
++		ibm = GRP_GET_GROUP_IBM(fs, gd, &bi);
+ 		//non-filesystem inodes
+-		for(j = fs->sb.s_inodes_per_group+1; j <= BLOCKSIZE * 8; j++)
++		for(j = fs->sb->s_inodes_per_group+1; j <= BLOCKSIZE * 8; j++)
+ 			allocate(ibm, j);
+ 
+ 		//system inodes
+ 		if(i == 0)
+ 			for(j = 1; j < EXT2_FIRST_INO; j++)
+ 				allocate(ibm, j);
++		GRP_PUT_GROUP_IBM(bi);
++		put_gd(gi);
+ 	}
+ 
+ 	// make root inode and directory
+ 	/* We have groups now. Add the root filesystem in group 0 */
+ 	/* Also increment the directory count for group 0 */
+-	fs->gd[0].bg_free_inodes_count--;
+-	fs->gd[0].bg_used_dirs_count = 1;
+-	itab0 = (inode *)get_blk(fs,fs->gd[0].bg_inode_table);
+-	itab0[EXT2_ROOT_INO-1].i_mode = FM_IFDIR | FM_IRWXU | FM_IRGRP | FM_IROTH | FM_IXGRP | FM_IXOTH; 
+-	itab0[EXT2_ROOT_INO-1].i_ctime = fs_timestamp;
+-	itab0[EXT2_ROOT_INO-1].i_mtime = fs_timestamp;
+-	itab0[EXT2_ROOT_INO-1].i_atime = fs_timestamp;
+-	itab0[EXT2_ROOT_INO-1].i_size = BLOCKSIZE;
+-	itab0[EXT2_ROOT_INO-1].i_links_count = 2;
+-
+-	if(!(b = get_workblk()))
+-		error_msg_and_die("get_workblk() failed.");
+-	d = (directory*)b;
+-	d->d_inode = EXT2_ROOT_INO;
+-	d->d_rec_len = sizeof(directory)+4;
+-	d->d_name_len = 1;
+-	strcpy(d->d_name, ".");
+-	d = (directory*)(b + d->d_rec_len);
+-	d->d_inode = EXT2_ROOT_INO;
+-	d->d_rec_len = BLOCKSIZE - (sizeof(directory)+4);
+-	d->d_name_len = 2;
+-	strcpy(d->d_name, "..");
+-	extend_blk(fs, EXT2_ROOT_INO, b, 1);
++	gd = get_gd(fs, 0, &gi);
++	gd->bg_free_inodes_count--;
++	gd->bg_used_dirs_count = 1;
++	put_gd(gi);
++	itab0 = get_nod(fs, EXT2_ROOT_INO, &ni);
++	itab0->i_mode = FM_IFDIR | FM_IRWXU | FM_IRGRP | FM_IROTH | FM_IXGRP | FM_IXOTH;
++	itab0->i_ctime = fs_timestamp;
++	itab0->i_mtime = fs_timestamp;
++	itab0->i_atime = fs_timestamp;
++	itab0->i_size = BLOCKSIZE;
++	itab0->i_links_count = 2;
++	put_nod(ni);
++
++	new_dir(fs, EXT2_ROOT_INO, ".", 1, &dw);
++	shrink_dir(&dw, EXT2_ROOT_INO, "..", 2);
++	next_dir(&dw); // Force the data into the buffer
++	inode_pos_init(fs, &ipos, EXT2_ROOT_INO, INODE_POS_EXTEND, NULL);
++	extend_inode_blk(fs, &ipos, dir_data(&dw), 1);
++	inode_pos_finish(fs, &ipos);
++	put_dir(&dw);
+ 
+-	// make lost+found directory and reserve blocks
+-	if(fs->sb.s_r_blocks_count)
++	// make lost+found directory
++	if(fs->sb->s_r_blocks_count)
+ 	{
+-		nod = mkdir_fs(fs, EXT2_ROOT_INO, "lost+found", FM_IRWXU, 0, 0, fs_timestamp, fs_timestamp);
++		inode *node;
++		uint8 *b;
++
++		nod = mkdir_fs(fs, EXT2_ROOT_INO, "lost+found", FM_IRWXU,
++			       0, 0, fs_timestamp, fs_timestamp);
++		b = get_workblk();
+ 		memset(b, 0, BLOCKSIZE);
+ 		((directory*)b)->d_rec_len = BLOCKSIZE;
+-		/* We run into problems with e2fsck if directory lost+found grows
+-		 * bigger than this. Need to find out why this happens - sundar
+-		 */
+-		if (fs->sb.s_r_blocks_count > fs->sb.s_blocks_count * MAX_RESERVED_BLOCKS ) 
+-			fs->sb.s_r_blocks_count = fs->sb.s_blocks_count * MAX_RESERVED_BLOCKS;
+-		for(i = 1; i < fs->sb.s_r_blocks_count; i++)
+-			extend_blk(fs, nod, b, 1);
+-		get_nod(fs, nod)->i_size = fs->sb.s_r_blocks_count * BLOCKSIZE;
++		inode_pos_init(fs, &ipos, nod, INODE_POS_EXTEND, NULL);
++		// It is always 16 blocks to start out with
++		for(i = 1; i < 16; i++)
++			extend_inode_blk(fs, &ipos, b, 1);
++		inode_pos_finish(fs, &ipos);
++		free_workblk(b);
++		node = get_nod(fs, nod, &ni);
++		node->i_size = 16 * BLOCKSIZE;
++		put_nod(ni);
+ 	}
+-	free_workblk(b);
+ 
+ 	// administrative info
+-	fs->sb.s_state = 1;
+-	fs->sb.s_max_mnt_count = 20;
++	fs->sb->s_state = 1;
++	fs->sb->s_max_mnt_count = 20;
+ 
+ 	// options for me
+-	if(holes)
+-		fs->sb.s_reserved[200] |= OP_HOLES;
++	fs->holes = holes;
+ 	
+ 	return fs;
+ }
+ 
+ // loads a filesystem from disk
+ static filesystem *
+-load_fs(FILE * fh, int swapit)
++load_fs(FILE *fh, int swapit, char *fname)
+ {
+-	size_t fssize;
++	off_t fssize;
+ 	filesystem *fs;
+-	if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))
++
++	if((fseek(fh, 0, SEEK_END) < 0) || ((fssize = ftello(fh)) == -1))
+ 		perror_msg_and_die("input filesystem image");
+ 	rewind(fh);
+-	fssize = (fssize + BLOCKSIZE - 1) / BLOCKSIZE;
++	if ((fssize % BLOCKSIZE) != 0)
++		error_msg_and_die("Input file not a multiple of block size");
++	fssize /= BLOCKSIZE;
+ 	if(fssize < 16) // totally arbitrary
+ 		error_msg_and_die("too small filesystem");
+-	if(!(fs = (filesystem*)calloc(fssize, BLOCKSIZE)))
+-		error_msg_and_die("not enough memory for filesystem");
+-	if(fread(fs, BLOCKSIZE, fssize, fh) != fssize)
+-		perror_msg_and_die("input filesystem image");
++	fs = alloc_fs(swapit, fname, fssize, fh);
++
++	/* Read and check the superblock, then read the superblock
++	 * and all the group descriptors */
++	fs->sb = malloc(SUPERBLOCK_SIZE);
++	if (!fs->sb)
++		error_msg_and_die("error allocating header memory");
++	if (fseek(fs->f, SUPERBLOCK_OFFSET, SEEK_SET))
++		perror_msg_and_die("fseek");
++	if (fread(fs->sb, SUPERBLOCK_SIZE, 1, fs->f) != 1)
++		perror_msg_and_die("fread filesystem image superblock");
+ 	if(swapit)
+-		swap_badfs(fs);
+-	if(fs->sb.s_rev_level || (fs->sb.s_magic != EXT2_MAGIC_NUMBER))
++		swap_sb(fs->sb);
++
++	if((fs->sb->s_rev_level > 1) || (fs->sb->s_magic != EXT2_MAGIC_NUMBER))
+ 		error_msg_and_die("not a suitable ext2 filesystem");
++	if (fs->sb->s_rev_level > 0) {
++		if (fs->sb->s_first_ino != EXT2_GOOD_OLD_FIRST_INO)
++			error_msg_and_die("First inode incompatible");
++		if (fs->sb->s_inode_size != EXT2_GOOD_OLD_INODE_SIZE)
++			error_msg_and_die("inode size incompatible");
++		if (fs->sb->s_feature_compat)
++			error_msg_and_die("Unsupported compat features");
++		if (fs->sb->s_feature_incompat)
++			error_msg_and_die("Unsupported incompat features");
++		if (fs->sb->s_feature_ro_compat
++		    & ~EXT2_FEATURE_RO_COMPAT_LARGE_FILE)
++			error_msg_and_die("Unsupported ro compat features");
++	}
++
++	set_file_size(fs);
+ 	return fs;
+ }
+ 
+ static void
+ free_fs(filesystem *fs)
+ {
++	free(fs->hdlinks.hdl);
++	fclose(fs->f);
++	free(fs->sb);
+ 	free(fs);
+ }
+ 
+@@ -2123,16 +2812,23 @@
+ {
+ 	blockwalker bw;
+ 	uint32 bk;
+-	int32 fsize = get_nod(fs, nod)->i_size;
++	nod_info *ni;
++	inode *node = get_nod(fs, nod, &ni);
++	int32 fsize = node->i_size;
++	blk_info *bi;
++
+ 	init_bw(&bw);
+ 	while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END)
+ 	{
+ 		if(fsize <= 0)
+ 			error_msg_and_die("wrong size while saving inode %d", nod);
+-		if(fwrite(get_blk(fs, bk), (fsize > BLOCKSIZE) ? BLOCKSIZE : fsize, 1, f) != 1)
++		if(fwrite(get_blk(fs, bk, &bi),
++			  (fsize > BLOCKSIZE) ? BLOCKSIZE : fsize, 1, f) != 1)
+ 			error_msg_and_die("error while saving inode %d", nod);
++		put_blk(bi);
+ 		fsize -= BLOCKSIZE;
+ 	}
++	put_nod(ni);
+ }
+ 
+ 
+@@ -2141,8 +2837,11 @@
+ print_dev(filesystem *fs, uint32 nod)
+ {
+ 	int minor, major;
+-	minor = ((uint8*)get_nod(fs, nod)->i_block)[0];
+-	major = ((uint8*)get_nod(fs, nod)->i_block)[1];
++	nod_info *ni;
++	inode *node = get_nod(fs, nod, &ni);
++	minor = ((uint8*)node->i_block)[0];
++	major = ((uint8*)node->i_block)[1];
++	put_nod(ni);
+ 	printf("major: %d, minor: %d\n", major, minor);
+ }
+ 
+@@ -2157,17 +2856,15 @@
+ 	while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END)
+ 	{
+ 		directory *d;
+-		uint8 *b;
+-		b = get_blk(fs, bk);
+-		for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len))
++		dirwalker dw;
++		for (d = get_dir(fs, bk, &dw); d; d = next_dir(&dw))
+ 			if(d->d_inode)
+ 			{
+-				int i;
+ 				printf("entry '");
+-				for(i = 0; i < d->d_name_len; i++)
+-					putchar(d->d_name[i]);
++				fwrite(dir_name(&dw), 1, d->d_name_len, stdout);
+ 				printf("' (inode %d): rec_len: %d (name_len: %d)\n", d->d_inode, d->d_rec_len, d->d_name_len);
+ 			}
++		put_dir(&dw);
+ 	}
+ }
+ 
+@@ -2175,14 +2872,18 @@
+ static void
+ print_link(filesystem *fs, uint32 nod)
+ {
+-	if(!get_nod(fs, nod)->i_blocks)
+-		printf("links to '%s'\n", (char*)get_nod(fs, nod)->i_block);
++	nod_info *ni;
++	inode *node = get_nod(fs, nod, &ni);
++
++	if(!node->i_blocks)
++		printf("links to '%s'\n", (char*)node->i_block);
+ 	else
+ 	{
+ 		printf("links to '");
+ 		write_blocks(fs, nod, stdout);
+ 		printf("'\n");
+ 	}
++	put_nod(ni);
+ }
+ 
+ // make a ls-like printout of permissions
+@@ -2251,8 +2952,13 @@
+ {
+ 	char *s;
+ 	char perms[11];
+-	if(!get_nod(fs, nod)->i_mode)
+-		return;
++	nod_info *ni;
++	inode *node = get_nod(fs, nod, &ni);
++	blk_info *bi;
++	gd_info *gi;
++
++	if(!node->i_mode)
++		goto out;
+ 	switch(nod)
+ 	{
+ 		case EXT2_BAD_INO:
+@@ -2274,15 +2980,18 @@
+ 		default:
+ 			s = (nod >= EXT2_FIRST_INO) ? "normal" : "unknown reserved"; 
+ 	}
+-	printf("inode %d (%s, %d links): ", nod, s, get_nod(fs, nod)->i_links_count);
+-	if(!allocated(GRP_GET_INODE_BITMAP(fs,nod), GRP_IBM_OFFSET(fs,nod)))
++	printf("inode %d (%s, %d links): ", nod, s, node->i_links_count);
++	if(!allocated(GRP_GET_INODE_BITMAP(fs,nod,&bi,&gi), GRP_IBM_OFFSET(fs,nod)))
+ 	{
++		GRP_PUT_INODE_BITMAP(bi,gi);
+ 		printf("unallocated\n");
+-		return;
++		goto out;
+ 	}
+-	make_perms(get_nod(fs, nod)->i_mode, perms);
+-	printf("%s,  size: %d byte%s (%d block%s)\n", perms, plural(get_nod(fs, nod)->i_size), plural(get_nod(fs, nod)->i_blocks / INOBLK));
+-	switch(get_nod(fs, nod)->i_mode & FM_IFMT)
++	GRP_PUT_INODE_BITMAP(bi,gi);
++	make_perms(node->i_mode, perms);
++	printf("%s,  size: %d byte%s (%d block%s)\n", perms,
++	       plural(node->i_size), plural(node->i_blocks / INOBLK));
++	switch(node->i_mode & FM_IFMT)
+ 	{
+ 		case FM_IFSOCK:
+ 			list_blocks(fs, nod);
+@@ -2310,6 +3019,8 @@
+ 			list_blocks(fs, nod);
+ 	}
+ 	printf("Done with inode %d\n",nod);
++out:
++	put_nod(ni);
+ }
+ 
+ // describes various fields in a filesystem
+@@ -2317,49 +3028,65 @@
+ print_fs(filesystem *fs)
+ {
+ 	uint32 i;
++	blk_info *bi;
++	groupdescriptor *gd;
++	gd_info *gi;
+ 	uint8 *ibm;
+ 
+ 	printf("%d blocks (%d free, %d reserved), first data block: %d\n",
+-	       fs->sb.s_blocks_count, fs->sb.s_free_blocks_count,
+-	       fs->sb.s_r_blocks_count, fs->sb.s_first_data_block);
+-	printf("%d inodes (%d free)\n", fs->sb.s_inodes_count,
+-	       fs->sb.s_free_inodes_count);
++	       fs->sb->s_blocks_count, fs->sb->s_free_blocks_count,
++	       fs->sb->s_r_blocks_count, fs->sb->s_first_data_block);
++	printf("%d inodes (%d free)\n", fs->sb->s_inodes_count,
++	       fs->sb->s_free_inodes_count);
+ 	printf("block size = %d, frag size = %d\n",
+-	       fs->sb.s_log_block_size ? (fs->sb.s_log_block_size << 11) : 1024,
+-	       fs->sb.s_log_frag_size ? (fs->sb.s_log_frag_size << 11) : 1024);
++	       fs->sb->s_log_block_size ? (fs->sb->s_log_block_size << 11) : 1024,
++	       fs->sb->s_log_frag_size ? (fs->sb->s_log_frag_size << 11) : 1024);
+ 	printf("number of groups: %d\n",GRP_NBGROUPS(fs));
+ 	printf("%d blocks per group,%d frags per group,%d inodes per group\n",
+-	     fs->sb.s_blocks_per_group, fs->sb.s_frags_per_group,
+-	     fs->sb.s_inodes_per_group);
++	     fs->sb->s_blocks_per_group, fs->sb->s_frags_per_group,
++	     fs->sb->s_inodes_per_group);
+ 	printf("Size of inode table: %d blocks\n",
+-		(int)(fs->sb.s_inodes_per_group * sizeof(inode) / BLOCKSIZE));
++		(int)(fs->sb->s_inodes_per_group * sizeof(inode) / BLOCKSIZE));
+ 	for (i = 0; i < GRP_NBGROUPS(fs); i++) {
+ 		printf("Group No: %d\n", i+1);
++		gd = get_gd(fs, i, &gi);
+ 		printf("block bitmap: block %d,inode bitmap: block %d, inode table: block %d\n",
+-		     fs->gd[i].bg_block_bitmap, fs->gd[i].bg_inode_bitmap,
+-		     fs->gd[i].bg_inode_table);
++		     gd->bg_block_bitmap,
++		     gd->bg_inode_bitmap,
++		     gd->bg_inode_table);
+ 		printf("block bitmap allocation:\n");
+-		print_bm(GRP_GET_GROUP_BBM(fs, i),fs->sb.s_blocks_per_group);
++		print_bm(GRP_GET_GROUP_BBM(fs, gd, &bi),fs->sb->s_blocks_per_group);
++		GRP_PUT_GROUP_BBM(bi);
+ 		printf("inode bitmap allocation:\n");
+-		ibm = GRP_GET_GROUP_IBM(fs, i);
+-		print_bm(ibm, fs->sb.s_inodes_per_group);
+-		for (i = 1; i <= fs->sb.s_inodes_per_group; i++)
++		ibm = GRP_GET_GROUP_IBM(fs, gd, &bi);
++		print_bm(ibm, fs->sb->s_inodes_per_group);
++		for (i = 1; i <= fs->sb->s_inodes_per_group; i++)
+ 			if (allocated(ibm, i))
+ 				print_inode(fs, i);
++		GRP_PUT_GROUP_IBM(bi);
++		put_gd(gi);
+ 	}
+ }
+ 
+ static void
+-dump_fs(filesystem *fs, FILE * fh, int swapit)
++finish_fs(filesystem *fs)
+ {
+-	uint32 nbblocks = fs->sb.s_blocks_count;
+-	fs->sb.s_reserved[200] = 0;
+-	if(swapit)
+-		swap_goodfs(fs);
+-	if(fwrite(fs, BLOCKSIZE, nbblocks, fh) < nbblocks)
+-		perror_msg_and_die("output filesystem image");
+-	if(swapit)
+-		swap_badfs(fs);
++	if (cache_flush(&fs->inodes))
++		error_msg_and_die("entry mismatch on inode cache flush");
++	if (cache_flush(&fs->blkmaps))
++		error_msg_and_die("entry mismatch on blockmap cache flush");
++	if (cache_flush(&fs->gds))
++		error_msg_and_die("entry mismatch on gd cache flush");
++	if (cache_flush(&fs->blks))
++		error_msg_and_die("entry mismatch on block cache flush");
++	if(fs->swapit)
++		swap_sb(fs->sb);
++	if (fseek(fs->f, SUPERBLOCK_OFFSET, SEEK_SET))
++		perror_msg_and_die("fseek");
++	if(fwrite(fs->sb, SUPERBLOCK_SIZE, 1, fs->f) != 1)
++		perror_msg_and_die("output filesystem superblock");
++	if(fs->swapit)
++		swap_sb(fs->sb);
+ }
+ 
+ static void
+@@ -2419,10 +3146,12 @@
+ 	"  -x, --starting-image <image>\n"
+ 	"  -d, --root <directory>\n"
+ 	"  -D, --devtable <file>\n"
++	"  -B, --block-size <bytes>\n"
+ 	"  -b, --size-in-blocks <blocks>\n"
+ 	"  -i, --bytes-per-inode <bytes per inode>\n"
+ 	"  -N, --number-of-inodes <number of inodes>\n"
+ 	"  -m, --reserved-percentage <percentage of blocks to reserve>\n"
++	"  -o, --creator-os <os>      'linux' (default), 'hurd', 'freebsd' or number.\n"
+ 	"  -g, --block-map <path>     Generate a block map file for this path.\n"
+ 	"  -e, --fill-value <value>   Fill unallocated blocks with value.\n"
+ 	"  -z, --allow-holes          Allow files with holes.\n"
+@@ -2444,15 +3173,34 @@
+ extern char* optarg;
+ extern int optind, opterr, optopt;
+ 
++// parse the value for -o <os>
++int
++lookup_creator_os(const char *name)
++{
++        if (isdigit (*name))
++                return atoi(name);
++        else if (strcasecmp(name, "linux") == 0)
++                return EXT2_OS_LINUX;
++        else if (strcasecmp(name, "GNU") == 0 || strcasecmp(name, "hurd") == 0)
++                return EXT2_OS_HURD;
++        else if (strcasecmp(name, "freebsd") == 0)
++                return EXT2_OS_FREEBSD;
++        else if (strcasecmp(name, "lites") == 0)
++                return EXT2_OS_LITES;
++        else
++                return EXT2_OS_LINUX;
++}
++
+ int
+ main(int argc, char **argv)
+ {
+-	int nbblocks = -1;
++	long long nbblocks = -1;
+ 	int nbinodes = -1;
+ 	int nbresrvd = -1;
+ 	float bytes_per_inode = -1;
+ 	float reserved_frac = -1;
+ 	int fs_timestamp = -1;
++	int creator_os = CREATOR_OS;
+ 	char * fsout = "-";
+ 	char * fsin = 0;
+ 	char * dopt[MAX_DOPT];
+@@ -2466,6 +3214,7 @@
+ 	int squash_perms = 0;
+ 	uint16 endian = 1;
+ 	int bigendian = !*(char*)&endian;
++	char *volumelabel = NULL;
+ 	filesystem *fs;
+ 	int i;
+ 	int c;
+@@ -2476,13 +3225,16 @@
+ 	  { "starting-image",	required_argument,	NULL, 'x' },
+ 	  { "root",		required_argument,	NULL, 'd' },
+ 	  { "devtable",		required_argument,	NULL, 'D' },
++	  { "block-size",	required_argument,	NULL, 'B' },
+ 	  { "size-in-blocks",	required_argument,	NULL, 'b' },
+ 	  { "bytes-per-inode",	required_argument,	NULL, 'i' },
+ 	  { "number-of-inodes",	required_argument,	NULL, 'N' },
++	  { "volume-label",     required_argument,      NULL, 'L' },
+ 	  { "reserved-percentage", required_argument,	NULL, 'm' },
++	  { "creator-os",	required_argument,	NULL, 'o' },
+ 	  { "block-map",	required_argument,	NULL, 'g' },
+ 	  { "fill-value",	required_argument,	NULL, 'e' },
+-	  { "allow-holes",	no_argument, 		NULL, 'z' },
++	  { "allow-holes",	no_argument,		NULL, 'z' },
+ 	  { "faketime",		no_argument,		NULL, 'f' },
+ 	  { "squash",		no_argument,		NULL, 'q' },
+ 	  { "squash-uids",	no_argument,		NULL, 'U' },
+@@ -2495,11 +3247,11 @@
+ 
+ 	app_name = argv[0];
+ 
+-	while((c = getopt_long(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) {
++	while((c = getopt_long(argc, argv, "x:d:D:B:b:i:N:L:m:o:g:e:zfqUPhVv", longopts, NULL)) != EOF) {
+ #else
+ 	app_name = argv[0];
+ 
+-	while((c = getopt(argc, argv,      "x:d:D:b:i:N:m:g:e:zfqUPhVv")) != EOF) {
++	while((c = getopt(argc, argv,      "x:d:D:B:b:i:N:L:m:o:g:e:zfqUPhVv")) != EOF) {
+ #endif /* HAVE_GETOPT_LONG */
+ 		switch(c)
+ 		{
+@@ -2510,6 +3262,9 @@
+ 			case 'D':
+ 				dopt[didx++] = optarg;
+ 				break;
++			case 'B':
++				blocksize = SI_atof(optarg);
++				break;
+ 			case 'b':
+ 				nbblocks = SI_atof(optarg);
+ 				break;
+@@ -2519,9 +3274,15 @@
+ 			case 'N':
+ 				nbinodes = SI_atof(optarg);
+ 				break;
++			case 'L':
++				volumelabel = optarg;
++				break;
+ 			case 'm':
+ 				reserved_frac = SI_atof(optarg) / 100;
+ 				break;
++			case 'o':
++				creator_os = lookup_creator_os(optarg);
++				break;
+ 			case 'g':
+ 				gopt[gidx++] = optarg;
+ 				break;
+@@ -2565,21 +3326,21 @@
+ 		error_msg_and_die("Not enough arguments. Try --help or else see the man page.");
+ 	fsout = argv[optind];
+ 
+-	hdlinks.hdl = (struct hdlink_s *)malloc(hdlink_cnt * sizeof(struct hdlink_s));
+-	if (!hdlinks.hdl)
+-		error_msg_and_die("Not enough memory");
+-	hdlinks.count = 0 ;
++	if(blocksize != 1024 && blocksize != 2048 && blocksize != 4096)
++		error_msg_and_die("Valid block sizes: 1024, 2048 or 4096.");
++	if(creator_os < 0)
++		error_msg_and_die("Creator OS unknown.");
+ 
+ 	if(fsin)
+ 	{
+ 		if(strcmp(fsin, "-"))
+ 		{
+ 			FILE * fh = xfopen(fsin, "rb");
+-			fs = load_fs(fh, bigendian);
++			fs = load_fs(fh, bigendian, fsout);
+ 			fclose(fh);
+ 		}
+ 		else
+-			fs = load_fs(stdin, bigendian);
++			fs = load_fs(stdin, bigendian, fsout);
+ 	}
+ 	else
+ 	{
+@@ -2609,16 +3370,29 @@
+ 		}
+ 		if(fs_timestamp == -1)
+ 			fs_timestamp = time(NULL);
+-		fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp);
++		fs = init_fs(nbblocks, nbinodes, nbresrvd, holes,
++			     fs_timestamp, creator_os, bigendian, fsout);
+ 	}
++	if (volumelabel != NULL)
++		strncpy((char *)fs->sb->s_volume_name, volumelabel,
++			sizeof(fs->sb->s_volume_name));
+ 	
+ 	populate_fs(fs, dopt, didx, squash_uids, squash_perms, fs_timestamp, NULL);
+ 
+ 	if(emptyval) {
+ 		uint32 b;
+-		for(b = 1; b < fs->sb.s_blocks_count; b++)
+-			if(!allocated(GRP_GET_BLOCK_BITMAP(fs,b),GRP_BBM_OFFSET(fs,b)))
+-				memset(get_blk(fs, b), emptyval, BLOCKSIZE);
++		for(b = 1; b < fs->sb->s_blocks_count; b++) {
++			blk_info *bi;
++			gd_info *gi;
++			if(!allocated(GRP_GET_BLOCK_BITMAP(fs,b,&bi,&gi),
++				      GRP_BBM_OFFSET(fs,b))) {
++				blk_info *bi2;
++				memset(get_blk(fs, b, &bi2), emptyval,
++				       BLOCKSIZE);
++				put_blk(bi2);
++			}
++			GRP_PUT_BLOCK_BITMAP(bi,gi);
++		}
+ 	}
+ 	if(verbose)
+ 		print_fs(fs);
+@@ -2628,24 +3402,22 @@
+ 		char fname[MAX_FILENAME];
+ 		char *p;
+ 		FILE *fh;
++		nod_info *ni;
+ 		if(!(nod = find_path(fs, EXT2_ROOT_INO, gopt[i])))
+ 			error_msg_and_die("path %s not found in filesystem", gopt[i]);
+ 		while((p = strchr(gopt[i], '/')))
+ 			*p = '_';
+ 		SNPRINTF(fname, MAX_FILENAME-1, "%s.blk", gopt[i]);
+ 		fh = xfopen(fname, "wb");
+-		fprintf(fh, "%d:", get_nod(fs, nod)->i_size);
++		fprintf(fh, "%d:", get_nod(fs, nod, &ni)->i_size);
++		put_nod(ni);
+ 		flist_blocks(fs, nod, fh);
+ 		fclose(fh);
+ 	}
+-	if(strcmp(fsout, "-"))
+-	{
+-		FILE * fh = xfopen(fsout, "wb");
+-		dump_fs(fs, fh, bigendian);
+-		fclose(fh);
+-	}
+-	else
+-		dump_fs(fs, stdout, bigendian);
++	finish_fs(fs);
++	if(strcmp(fsout, "-") == 0)
++		copy_file(fs, stdout, fs->f, fs->sb->s_blocks_count);
++
+ 	free_fs(fs);
+ 	return 0;
+ }
+Index: genext2fs-1.4.1/cache.h
+===================================================================
+--- /dev/null
++++ genext2fs-1.4.1/cache.h
+@@ -0,0 +1,128 @@
++#ifndef __CACHE_H__
++#define __CACHE_H__
++
++#include "list.h"
++
++#define CACHE_LISTS 256
++
++typedef struct
++{
++    list_elem link;
++    list_elem lru_link;
++} cache_link;
++
++typedef struct
++{
++    /* LRU list holds unused items */
++    unsigned int lru_entries;
++    list_elem lru_list;
++    unsigned int max_free_entries;
++
++    unsigned int entries;
++    list_elem lists[CACHE_LISTS];
++    unsigned int (*elem_val)(cache_link *elem);
++    void (*freed)(cache_link *elem);
++} listcache;
++
++static inline void
++cache_add(listcache *c, cache_link *elem)
++{
++    unsigned int hash = c->elem_val(elem) % CACHE_LISTS;
++    int delcount = c->lru_entries - c->max_free_entries;
++
++    if (delcount > 0) {
++        /* Delete some unused items. */
++        list_elem *lru, *next;
++        cache_link *l;
++        list_for_each_elem_safe(&c->lru_list, lru, next) {
++            l = container_of(lru, cache_link, lru_link);
++            list_del(lru);
++            list_del(&l->link);
++            c->entries--;
++            c->lru_entries--;
++            c->freed(l);
++            delcount--;
++            if (delcount <= 0)
++                break;
++        }
++    }
++
++    c->entries++;
++    list_item_init(&elem->lru_link); /* Mark it not in the LRU list */
++    list_add_after(&c->lists[hash], &elem->link);
++}
++
++static inline void
++cache_item_set_unused(listcache *c, cache_link *elem)
++{
++    list_add_before(&c->lru_list, &elem->lru_link);
++    c->lru_entries++;
++}
++
++static inline cache_link *
++cache_find(listcache *c, unsigned int val)
++{
++    unsigned int hash = val % CACHE_LISTS;
++    list_elem *elem;
++
++    list_for_each_elem(&c->lists[hash], elem) {
++        cache_link *l = container_of(elem, cache_link, link);
++        if (c->elem_val(l) == val) {
++            if (!list_empty(&l->lru_link)) {
++                /* It's in the unused list, remove it. */
++                list_del(&l->lru_link);
++                list_item_init(&l->lru_link);
++                c->lru_entries--;
++            }
++            return l;
++        }
++    }
++    return NULL;
++}
++
++static inline int
++cache_flush(listcache *c)
++{
++    list_elem *elem, *next;
++    cache_link *l;
++    int i;
++
++    list_for_each_elem_safe(&c->lru_list, elem, next) {
++        l = container_of(elem, cache_link, lru_link);
++        list_del(elem);
++        list_del(&l->link);
++        c->entries--;
++        c->lru_entries--;
++        c->freed(l);
++    }
++
++    for (i = 0; i < CACHE_LISTS; i++) {
++        list_for_each_elem_safe(&c->lists[i], elem, next) {
++            l = container_of(elem, cache_link, link);
++            list_del(&l->link);
++            c->entries--;
++            c->freed(l);
++        }
++    }
++
++    return c->entries || c->lru_entries;
++}
++
++static inline void
++cache_init(listcache *c, unsigned int max_free_entries,
++       unsigned int (*elem_val)(cache_link *elem),
++       void (*freed)(cache_link *elem))
++{
++    int i;
++
++    c->entries = 0;
++    c->lru_entries = 0;
++    c->max_free_entries = max_free_entries;
++    list_init(&c->lru_list);
++    for (i = 0; i < CACHE_LISTS; i++)
++        list_init(&c->lists[i]);
++    c->elem_val = elem_val;
++    c->freed = freed;
++}
++
++#endif /* __CACHE_H__ */
+Index: genext2fs-1.4.1/list.h
+===================================================================
+--- /dev/null
++++ genext2fs-1.4.1/list.h
+@@ -0,0 +1,78 @@
++#ifndef __LIST_H__
++#define __LIST_H__
++
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++# if HAVE_STDDEF_H
++#  include <stddef.h>
++# endif
++#endif
++
++#ifndef offsetof
++#define offsetof(st, m) \
++     ((size_t) ( (char *)&((st *)(0))->m - (char *)0 ))
++#endif
++
++#define container_of(ptr, type, member) ({ \
++                const typeof( ((type *)0)->member ) *__mptr = (ptr); \
++                (type *)( (char *)__mptr - offsetof(type,member) );})
++
++typedef struct list_elem
++{
++    struct list_elem *next;
++    struct list_elem *prev;
++} list_elem;
++
++static inline void list_init(list_elem *list)
++{
++    list->next = list;
++    list->prev = list;
++}
++
++static inline void list_add_after(list_elem *pos, list_elem *elem)
++{
++    elem->next = pos->next;
++    elem->prev = pos;
++    pos->next->prev = elem;
++    pos->next = elem;
++}
++
++static inline void list_add_before(list_elem *pos, list_elem *elem)
++{
++    elem->prev = pos->prev;
++    elem->next = pos;
++    pos->prev->next = elem;
++    pos->prev = elem;
++}
++
++static inline void list_del(list_elem *elem)
++{
++    elem->next->prev = elem->prev;
++    elem->prev->next = elem->next;
++}
++
++static inline void list_item_init(list_elem *elem)
++{
++    elem->next = elem;
++    elem->prev = elem;
++}
++
++static inline int list_empty(list_elem *elem)
++{
++    return elem->next == elem;
++}
++
++#define list_for_each_elem(list, curr)            \
++    for ((curr) = (list)->next; (curr) != (list); (curr) = (curr)->next)
++
++#define list_for_each_elem_safe(list, curr, next)    \
++    for ((curr) = (list)->next, (next) = (curr)->next;    \
++         (curr) != (list);                    \
++         (curr) = (next), (next) = (curr)->next)
++
++#endif /* __LIST_H__ */

From 913b916567231aedb34c4a616519f607eb90e616 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 24 Sep 2012 22:42:58 +0200
Subject: [PATCH 2899/6849] configs: add defconfig for boundarydevices
 nitrogen6x board

http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/

And post-build hook for u-boot scripts.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../boundarydevices/nitrogen6x/6q_bootscript  | Bin 0 -> 455 bytes
 board/boundarydevices/nitrogen6x/6q_upgrade   | Bin 0 -> 1587 bytes
 .../boundarydevices/nitrogen6x/post-build.sh  |  18 ++++++++++++
 board/boundarydevices/nitrogen6x/readme.txt   |  16 +++++++++++
 configs/nitrogen6x_defconfig                  |  26 ++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 board/boundarydevices/nitrogen6x/6q_bootscript
 create mode 100644 board/boundarydevices/nitrogen6x/6q_upgrade
 create mode 100755 board/boundarydevices/nitrogen6x/post-build.sh
 create mode 100644 board/boundarydevices/nitrogen6x/readme.txt
 create mode 100644 configs/nitrogen6x_defconfig

diff --git a/board/boundarydevices/nitrogen6x/6q_bootscript b/board/boundarydevices/nitrogen6x/6q_bootscript
new file mode 100644
index 0000000000000000000000000000000000000000..e10cfeb0b742f401e36f0f242ca72e45fab26944
GIT binary patch
literal 455
zcma)&!AiqG5QbB+9`Xj>h7#%}CA*=<(z;+3DS`p<P`xI*n|8@=wrpaol;Y8Y58>5^
z(RVTlQ9(qU%MAa_d_OY>-TgVceOq1)j$bXS^JKO0{J#6r-PyBZtqaJh5v$^}^&@v4
zYa!<a)U%OU<luZ&RA;%CoD{`_T2t&|eCQ(trHZ7~lnfCH!BlI+W4!c~qOnZT3OCw)
zBnoH&v5c~mAeh*d5zorsyh_2iCY4PRqj7~JOQwX2{SjIp`6xUIkSh{$Jv;S>|D)iB
zA}MpvE~nGM&3ra(2|*D2fk<M-74b)*i&1Dhn<U>#9WkiR182iTo^Hn&FdCscz^lLI
n-Cd|?!J*%8PE+6Q32?g9&^tFq8>m4dTR_T9#wCb)sb||C*>#HV

literal 0
HcmV?d00001

diff --git a/board/boundarydevices/nitrogen6x/6q_upgrade b/board/boundarydevices/nitrogen6x/6q_upgrade
new file mode 100644
index 0000000000000000000000000000000000000000..2f20efa2e85c761b09da7ae5a935589280dae5eb
GIT binary patch
literal 1587
zcmb_c!H&}~5Ur33YQ=>kx6x9GQ>!#AEU-634;)ykT><CBo-|gIII`V#w`dRi1s}ti
zpW(<4Ft(F6?IwFb_>jiwy!XcQ#`C=Y^vlo3Pqy>^k4L>;|4*-4-`Bss_8&a##Zns3
zOo`Iee;xhyf7=hpQVAz4MYe>`<9CEQf%BnAVDv4~x0#GM<T;}q7kYX7b_&xla0^yr
zt1*d10q0;+EQa8gXH-bYQ6e(bVv7*p7}Ss`nZwn4V3Fch#sf%9Cr~OGBTOMYtN1I@
z0R?$V7s26b{sAsOeca<6izjia!Syse^*IKO6b_Q~%Jd{0%gad&7F8)X2=*svhg%+>
z-Po_Hh_FVbg)B7WkzwgkvJRDLtO{VayXDy~5P40tDi<o^*ur5!K7Otw1?50yOasu!
zWWjX@B9RIT8~Fxa!x_ASmv9O%Af)04WF?nvX}SEI*2wzZ8KN`9l9+09cjvM%ToyPS
z>>WiFX;CaX@}#D)0Z3T|*UnI4b?9ecHWIYKQiGAyI=IHdK&%8?5?@n-n#L9;zgK3X
zgdv$m2Q>SpNk_Jd<ffbKU)!)Q(|>5knrf5M<!dzOQ9JPoDAZ`LyS02ktMV=k?5?uQ
zzjfJ-9Zg*4;G6T(&H`6C!6HMqf_zm{b=YpPiD*;2SItY!EHNEyY$pNP1hd)v?y#uS
zyDM|}rA_cq$BVdOYiA`YKjT_ecihLcO-fM+Bce=f+mcTN-GDvX<1S?FtjMDULLyfM
N2P$%7(313U_!p)>ak>Bi

literal 0
HcmV?d00001

diff --git a/board/boundarydevices/nitrogen6x/post-build.sh b/board/boundarydevices/nitrogen6x/post-build.sh
new file mode 100755
index 0000000000..2f3c464db7
--- /dev/null
+++ b/board/boundarydevices/nitrogen6x/post-build.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# post-build fixups
+# for furthe details, see
+# http://boundarydevices.com/u-boot-conventions-for-i-mx6-nitrogen6x-and-sabrelite/
+
+TARGET_DIR=$1
+IMAGES_DIR=$1/../images
+BOARD_DIR="$(dirname $0)"
+
+# bd u-boot looks for bootscript here
+cp $BOARD_DIR/6q_bootscript $TARGET_DIR
+
+# u-boot / update script for bd upgradeu command
+if [ -e $IMAGES_DIR/u-boot.bin ];
+then
+    cp $IMAGES_DIR/u-boot.bin $TARGET_DIR
+    cp $BOARD_DIR/6q_upgrade $TARGET_DIR
+fi
diff --git a/board/boundarydevices/nitrogen6x/readme.txt b/board/boundarydevices/nitrogen6x/readme.txt
new file mode 100644
index 0000000000..6e9b95c0ea
--- /dev/null
+++ b/board/boundarydevices/nitrogen6x/readme.txt
@@ -0,0 +1,16 @@
+Buildroot for Boundary Devices Nitrogen6X:
+
+http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
+
+Notice: U-Boot as shipped on the board has a bug reading rev 0 ext2
+file systems (which is what genext2fs generates). To convert it to rev
+1, do:
+
+tune2fs -O filetype output/images/rootfs.ext2
+e2fsck -a output/images/rootfs.ext2
+
+To install, simply extract rootfs.ext2 to first partition of a uSD card:
+
+sudo dd if=output/images/rootfs.ext2 of=/dev/sdX1
+
+Where 'sdX1' is the device node of the uSD partition.
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
new file mode 100644
index 0000000000..2b7daec870
--- /dev/null
+++ b/configs/nitrogen6x_defconfig
@@ -0,0 +1,26 @@
+# architecture
+BR2_arm=y
+BR2_cortex_a9=y
+
+# system
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/nitrogen6x/post-build.sh"
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6q_sabrelite"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://github.com/boundarydevices/u-boot-2009-08.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="1f7edab0ac5ebf564e9ad9797fedc2a668149b96"
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/boundarydevices/linux-imx6.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="cb1a536f4583af7e1572d39cabd4ac597a8916a5"
+BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 51b990b09fdac03188dd20a3f699b92a6eb2476b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Sep 2012 11:30:56 +0200
Subject: [PATCH 2900/6849] xserver_xorg-server: needs record proto

Fixes http://autobuild.buildroot.net/results/0ab69c80b3e5e95a8947c32231d32da895deca60

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in              | 1 +
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 02c28282d4..7d2f2deaad 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -35,6 +35,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_KBPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RECORDPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_RESOURCEPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 8018a89073..80431b4316 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -39,6 +39,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xproto_inputproto 		\
 	xproto_kbproto 			\
 	xproto_randrproto 		\
+	xproto_recordproto 		\
 	xproto_renderproto 		\
 	xproto_resourceproto 		\
 	xproto_videoproto 		\

From 198f0c911105dab7e06a5ded574e09f1b4c02c71 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Sep 2012 20:25:17 +0200
Subject: [PATCH 2901/6849] x11vnc: bump version to fix build issue with newer
 libX11

Fixes http://autobuild.buildroot.net/results/2733c2c9fa7aacb355e0e0b184a5afe41cf35a3d

Old x11vnc defined a 'pointer' function, which collides with the libX11
pointer type. Fix it by bumping the version (upstream renamed it to
pointer_event()).

Fix the dependencies and help text while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11vnc/Config.in | 3 +++
 package/x11vnc/x11vnc.mk | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/x11vnc/Config.in b/package/x11vnc/Config.in
index fdb3badac6..53895b087e 100644
--- a/package/x11vnc/Config.in
+++ b/package/x11vnc/Config.in
@@ -2,5 +2,8 @@ config BR2_PACKAGE_X11VNC
 	bool "x11vnc"
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  VNC server for X11 display
+
+	  http://www.karlrunge.com/x11vnc/
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index e96b665881..444a839622 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -3,12 +3,12 @@
 # X11VNC
 #
 #############################################################
-X11VNC_VERSION = 0.9.3
+X11VNC_VERSION = 0.9.13
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
 X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
 X11VNC_CONF_OPT = \
 	--without-avahi
 
-X11VNC_DEPENDENCIES = xserver_xorg-server xlib_libXt
+X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext
 
 $(eval $(autotools-package))

From 4cf7d4d79aa4ceb2b26540b90b4d21b46e713cee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Sep 2012 06:13:40 +0000
Subject: [PATCH 2902/6849] cvs: needs MMU support

Fixes

  http://autobuild.buildroot.org/results/33ac8387a7b27d7b90c23a5f772292921534f8da/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cvs/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/cvs/Config.in b/package/cvs/Config.in
index f9d5955f47..2308144046 100644
--- a/package/cvs/Config.in
+++ b/package/cvs/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_CVS
 	bool "cvs"
 	depends on BR2_USE_WCHAR
+	# needs fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_NCURSES
 	help
 	  Concurrent Versions System - source code revision control tools.

From 36833f0c37c4939ace27af89e4c7bb71c99fbcfd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Sep 2012 02:49:02 +0000
Subject: [PATCH 2903/6849] tiff: security bump to version 4.0.3

Fixes CVE-2012-3401 and CVE-2012-3386.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tiff/tiff.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 227047bbac..145d9299c4 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -3,9 +3,9 @@
 # tiff
 #
 #############################################################
-TIFF_VERSION = 4.0.1
-TIFF_SITE = ftp://ftp.remotesensing.org/pub/libtiff
-TIFF_SOURCE = tiff-$(TIFF_VERSION).tar.gz
+
+TIFF_VERSION = 4.0.3
+TIFF_SITE = http://download.osgeo.org/libtiff
 TIFF_INSTALL_STAGING = YES
 TIFF_CONF_OPT = \
 	--disable-cxx \

From 50c0a71d3a792a91b0c49933e27a14cf762f52d5 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Tue, 25 Sep 2012 16:44:03 +0400
Subject: [PATCH 2904/6849] x11r7: xserver_xorg-server: Amend record proto
 selection

Record proto is not really required. It can be disabled.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in              | 1 -
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 7d2f2deaad..02c28282d4 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -35,7 +35,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_KBPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RECORDPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_RESOURCEPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 80431b4316..631dee8608 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -39,7 +39,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xproto_inputproto 		\
 	xproto_kbproto 			\
 	xproto_randrproto 		\
-	xproto_recordproto 		\
 	xproto_renderproto 		\
 	xproto_resourceproto 		\
 	xproto_videoproto 		\
@@ -122,6 +121,8 @@ endif
 ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
 XSERVER_XORG_SERVER_CONF_OPT += --enable-record
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-record
 endif
 
 ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)

From 919dca5e9296f1c109f2dbd513b49365c012851e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 25 Sep 2012 20:34:08 +0200
Subject: [PATCH 2905/6849] libglib2: bump version

For details, see:

http://ftp.gnome.org/pub/gnome/sources/glib/2.30/glib-2.30.3.news

Notice: 2.30.3 is only available in .xz format.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 030cecbc23..dcd7996d8c 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,13 +4,12 @@
 #
 #############################################################
 LIBGLIB2_VERSION_MAJOR = 2.30
-LIBGLIB2_VERSION_MINOR = 2
+LIBGLIB2_VERSION_MINOR = 3
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
-LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
+LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 
 LIBGLIB2_INSTALL_STAGING = YES
-LIBGLIB2_INSTALL_TARGET = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 LIBGLIB2_CONF_ENV = \

From 0b255b06498e1646a392cc58f7589b043104955c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Sep 2012 09:13:32 +0200
Subject: [PATCH 2906/6849] mplayer: 1.1 version needs largefile support

Fixes http://autobuild.buildroot.net/results/7d084a1a8fd484f2c6df82ccd7b9d8aeebe68c2d

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/multimedia/mplayer/Config.in b/package/multimedia/mplayer/Config.in
index 77bf9dc995..c64dab719e 100644
--- a/package/multimedia/mplayer/Config.in
+++ b/package/multimedia/mplayer/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MPLAYER
 	# "Error: unsupported architecture sh4a" says mplayer
 	# configure script.
 	depends on !BR2_sh4a && !BR2_sh4aeb
+	depends on BR2_LARGEFILE
 	help
 	  MPlayer is a movie player which runs on many systems and supports
 	  many different file formats.
@@ -23,3 +24,6 @@ config BR2_PACKAGE_MPLAYER_MENCODER
 	  This will install the video encoder.
 
 endif
+
+comment "mplayer requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

From c39cf6108ba5a8e8f4f3e6c6fb09b043db7cfd79 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Sep 2012 09:18:13 +0200
Subject: [PATCH 2907/6849] genext2fs: needs largefile after version bump

Fixes http://autobuild.buildroot.net/results/8c7c10c0175a7ddf8e2d37a4718469d4ead3835a

And fixup space/tab mixup in Config.in while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/genext2fs/Config.in | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/package/genext2fs/Config.in b/package/genext2fs/Config.in
index 82992f8777..d869d7ea70 100644
--- a/package/genext2fs/Config.in
+++ b/package/genext2fs/Config.in
@@ -1,9 +1,13 @@
 config BR2_PACKAGE_GENEXT2FS
-       bool "genext2fs"
-       help
-         genext2fs generates an ext2 filesystem as a normal (non-root)
-	 user.  It does not require you to mount the image file to
-	 copy files on it, nor does it require that you become the
-	 superuser to make device nodes.
+	bool "genext2fs"
+	depends on BR2_LARGEFILE
+	help
+	  genext2fs generates an ext2 filesystem as a normal (non-root)
+	  user.  It does not require you to mount the image file to
+	  copy files on it, nor does it require that you become the
+	  superuser to make device nodes.
 
-	 http://genext2fs.sourceforge.net/
+	  http://genext2fs.sourceforge.net/
+
+comment "genext2fs requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

From 812eae5ccf281f89efba6092cb432224c0f7e89c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Sep 2012 22:51:01 +0200
Subject: [PATCH 2908/6849] xlib_libSM: only build documentation if needed

Documentation generation is slow, so only create it if requested.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libSM/xlib_libSM.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index a8d1eff1b5..bdbda3fe56 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -11,4 +11,9 @@ XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
 
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+# documentation generation is slow
+XLIB_LIBSM_CONF_OPT += --disable-docs
+endif
+
 $(eval $(autotools-package))

From 9c53079fd2351b56becd1ad5eb8dcc997ac3c6f3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Sep 2012 23:15:48 +0200
Subject: [PATCH 2909/6849] x11vnc: fix build without ipv6 support

Fixes http://autobuild.buildroot.net/results/1119dbf055edf281451a9e4216fdebc0b07fffae/

configure script uses --without-ipv6 instead of --disable-ipv6, and configure
option is only used for libraries, not the x11vnc application.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11vnc/x11vnc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 444a839622..51ae0a0fb2 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -11,4 +11,10 @@ X11VNC_CONF_OPT = \
 
 X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext
 
+ifneq ($(BR2_INET_IPV6),y)
+# configure option only used for libvncserver
+X11VNC_CONF_OPT += --without-ipv6
+X11VNC_CONF_ENV += CFLAGS='$(TARGET_CFLAGS) -DX11VNC_IPV6=0'
+endif
+
 $(eval $(autotools-package))

From 7626c20f92c44c26e0f8c0dfbf2db07cf5bf60a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Sep 2012 11:07:07 +0200
Subject: [PATCH 2910/6849] barebox: add 2012.08 / .09, drop .04 / .05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 574bfaebd8..172b540f77 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,22 +8,22 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_07
+	default BR2_TARGET_BAREBOX_2012_09
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_04
-	bool "2012.04"
-
-config BR2_TARGET_BAREBOX_2012_05
-	bool "2012.05"
-
 config BR2_TARGET_BAREBOX_2012_06
 	bool "2012.06"
 
 config BR2_TARGET_BAREBOX_2012_07
 	bool "2012.07"
 
+config BR2_TARGET_BAREBOX_2012_08
+	bool "2012.08"
+
+config BR2_TARGET_BAREBOX_2012_09
+	bool "2012.09"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.04.0"	if BR2_TARGET_BAREBOX_2012_04
-	default "2012.05.0"	if BR2_TARGET_BAREBOX_2012_05
 	default "2012.06.0"	if BR2_TARGET_BAREBOX_2012_06
 	default "2012.07.0"	if BR2_TARGET_BAREBOX_2012_07
+	default "2012.08.0"	if BR2_TARGET_BAREBOX_2012_08
+	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 3d0c79aa9fa7635fdc91f889c6fa160aecd3d576 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Sep 2012 12:03:27 +0200
Subject: [PATCH 2911/6849] input-tools: drop evtest from input-tools package

Evtest is nowadays maintained as a seperate package by Peter Hutterer.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/input-tools/Config.in      | 7 -------
 package/input-tools/input-tools.mk | 1 -
 2 files changed, 8 deletions(-)

diff --git a/package/input-tools/Config.in b/package/input-tools/Config.in
index 489b130584..08b3cbea70 100644
--- a/package/input-tools/Config.in
+++ b/package/input-tools/Config.in
@@ -4,13 +4,6 @@ config BR2_PACKAGE_INPUT_TOOLS
 	  Tools for the Linux kernel input layer.
 	  http://linuxconsole.sourceforge.net/
 
-config BR2_PACKAGE_INPUT_TOOLS_EVTEST
-        bool "evtest"
-        depends on BR2_PACKAGE_INPUT_TOOLS
-        default y
-        help
-	  Input event interface test program.
-
 config BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH
         bool "inputattach"
         depends on BR2_PACKAGE_INPUT_TOOLS
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index c73a1933af..b1cb093354 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -8,7 +8,6 @@ INPUT_TOOLS_SOURCE  = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
 INPUT_TOOLS_PATCH   = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz
 INPUT_TOOLS_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/j/joystick/
 
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_EVTEST)      += evtest
 INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
 INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL)       += jscal
 INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST)      += jstest

From 7d1473859dab0be549eadb605cfe492f72494fbb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Sep 2012 12:04:49 +0200
Subject: [PATCH 2912/6849] evtest: add as a seperate package

Evtest is nowadays maintained as a seperate package by Peter Hutterer.

The project doesn't release any tarballs, so use the one of Fedora instead
so we don't need to autoreconf:

http://comments.gmane.org/gmane.comp.freedesktop.xorg.announce/1671

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/evtest/Config.in | 18 ++++++++++++++++++
 package/evtest/evtest.mk | 28 ++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 package/evtest/Config.in
 create mode 100644 package/evtest/evtest.mk

diff --git a/package/Config.in b/package/Config.in
index 58dd5e80dc..d777454cdf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -197,6 +197,7 @@ endif
 source "package/dmidecode/Config.in"
 source "package/dmraid/Config.in"
 source "package/eeprog/Config.in"
+source "package/evtest/Config.in"
 source "package/flashrom/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
diff --git a/package/evtest/Config.in b/package/evtest/Config.in
new file mode 100644
index 0000000000..e8f9e37367
--- /dev/null
+++ b/package/evtest/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_EVTEST
+	bool "evtest"
+	help
+	  evtest displays information on the input device specified on
+	  the command line, including all the events supported by the
+	  device. It then monitors the device and displays all the
+	  events layer events generated.
+
+	  http://www.freedesktop.org/wiki/Evtest
+
+config BR2_PACKAGE_EVTEST_CAPTURE
+	bool "evtest-capture"
+	depends on BR2_PACKAGE_EVTEST
+	select BR2_PACKAGE_LIBXML2
+	help
+	  evtest-capture captures the information and events from the
+	  input device specified on the command line and writes it to
+	  the xml file given.
diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk
new file mode 100644
index 0000000000..582d1a71eb
--- /dev/null
+++ b/package/evtest/evtest.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# evtest
+#
+#############################################################
+
+EVTEST_VERSION = 1.30
+EVTEST_SOURCE = evtest-$(EVTEST_VERSION).tar.bz2
+# no official upstream tarball
+EVTEST_SITE = http://pkgs.fedoraproject.org/repo/pkgs/evtest/evtest-1.30.tar.bz2/27c0902839babfd07136f232c63c895c/
+EVTEST_LICENSE = GPLv2
+EVTEST_LICENSE_FILES = COPYING
+EVTEST_DEPENDENCIES = host-pkg-config
+
+ifeq ($(BR2_PACKAGE_EVTEST_CAPTURE),y)
+EVTEST_DEPENDENCIES += libxml2
+else
+# evtest-capture will unconditionally be built/installed if libxml2 is present
+define EVTEST_REMOVE_EVTEST_CAPTURE
+	rm -rf $(TARGET_DIR)/usr/bin/evtest-capture \
+	       $(TARGET_DIR)/usr/share/evtest \
+	       $(TARGET_DIR)/usr/share/man/man1/evtest-capture.1
+endef
+
+EVTEST_POST_INSTALL_TARGET_HOOKS += EVTEST_REMOVE_EVTEST_CAPTURE
+endif
+
+$(eval $(autotools-package))

From 81b3d1f4f1799523cecb0fb94f707a0754180f25 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Sep 2012 20:53:05 +0200
Subject: [PATCH 2913/6849] configs/calao_*: defconfigs should not hardcode
 BR2_JLEVEL

BR2_JLEVEL is specific to the build machine, not the specific board you
are targetting.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_usb_a9263_defconfig     | 1 -
 configs/calao_usb_a9g20_lpw_defconfig | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configs/calao_usb_a9263_defconfig b/configs/calao_usb_a9263_defconfig
index 6612d2c959..65263cfe06 100644
--- a/configs/calao_usb_a9263_defconfig
+++ b/configs/calao_usb_a9263_defconfig
@@ -1,6 +1,5 @@
 BR2_arm=y
 BR2_arm926t=y
-BR2_JLEVEL=2
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_AT91BOOTSTRAP=y
diff --git a/configs/calao_usb_a9g20_lpw_defconfig b/configs/calao_usb_a9g20_lpw_defconfig
index 580972a31d..e3d9cf5b90 100644
--- a/configs/calao_usb_a9g20_lpw_defconfig
+++ b/configs/calao_usb_a9g20_lpw_defconfig
@@ -1,6 +1,5 @@
 BR2_arm=y
 BR2_arm926t=y
-BR2_JLEVEL=2
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_AT91BOOTSTRAP=y

From 820cf3715248f26de533ccd6b6bc178142f69814 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Sep 2012 23:52:25 +0200
Subject: [PATCH 2914/6849] toolchain-external: add linaro 2012.0{7,8,9}

And remove the 2012.0{2,3,4} versions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 70 +++++++++++++-----------
 toolchain/toolchain-external/ext-tool.mk | 18 +++---
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f86ed74822..85b8843e28 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,79 +3,85 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
-	bool "Linaro 2012.06"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
+	bool "Linaro 2012.09"
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.06 (based on gcc 4.7), Linaro GDB 2012.06 (based on
-	  GDB 7.4), eglibc 2.15. It generates code that runs on all
+	  GCC 2012.09 (based on gcc 4.7), Linaro GDB 2012.09 (based on
+	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
 	  calling convention, and uses the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
-	bool "Linaro 2012.05"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
+	bool "Linaro 2012.08"
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.05 (based on gcc 4.7), Linaro GDB 2012.05 (based on
-	  GDB 7.4), eglibc 2.13. It generates code that runs on all
+	  GCC 2012.08 (based on gcc 4.7), Linaro GDB 2012.06 (based on
+	  GDB 7.4), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
 	  calling convention, and uses the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
-	bool "Linaro 2012.04"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
+	bool "Linaro 2012.07"
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.04 (based on gcc 4.7), Linaro GDB 2012.04 (based on
-	  GDB 7.4), eglibc 2.13. It generates code that runs on all
+	  GCC 2012.07 (based on gcc 4.7), Linaro GDB 2012.06 (based on
+	  GDB 7.4), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the softfp calling
-	  convention, and uses the VFPv3-D16 FPU instructions.
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
-	bool "Linaro 2012.03"
+	  To use this toolchain, you must disable soft float usage.
+
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
+	bool "Linaro 2012.06"
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.03 (based on gcc 4.6), Linaro GDB 2012.03, eglibc
-	  2.13. It generates code that runs on all Cortex-A profile
-	  devices, but tuned for the Cortex-A9. The code generated is
-	  Thumb 2, with the softfp calling convention, and uses the
-	  VFPv3-D16 FPU instructions.
-
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
-	bool "Linaro 2012.02"
+	  GCC 2012.06 (based on gcc 4.7), Linaro GDB 2012.06 (based on
+	  GDB 7.4), eglibc 2.15. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
+
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
+	bool "Linaro 2012.05"
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.02 (based on gcc 4.6), Linaro GDB 2012.02, eglibc
-	  2.13. It generates code that runs on all Cortex-A profile
-	  devices, but tuned for the Cortex-A9. The code generated is
-	  Thumb 2, with the softfp calling convention, and uses the
-	  VFPv3-D16 FPU instructions.
+	  GCC 2012.05 (based on gcc 4.7), Linaro GDB 2012.05 (based on
+	  GDB 7.4), eglibc 2.13. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
@@ -605,11 +611,11 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02
-	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03
-	default "arm-linux-gnueabi"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 53b898f3f3..5a7c03e767 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -187,21 +187,21 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_02),y)
-TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.02/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.02-20120222_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_03),y)
-TOOLCHAIN_EXTERNAL_SITE=http://launchpad.net/linaro-toolchain-binaries/trunk/2012.03/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.03-20120326_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_04),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.04/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabi-2012.04-20120426_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.05/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.05-20120523_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.06/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.06-20120625_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.07/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.07-20120720_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.08/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.08-20120827_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.09/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.09-20120921_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 7bcb494dcc21f9f8a2bd32d0f6425bbe2b63f5ae Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 10 Sep 2012 00:02:57 +0000
Subject: [PATCH 2915/6849] external-toolchain: add Sourcery CodeBench ARM
 2012.03

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 22 ++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 85b8843e28..94ae735219 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -83,6 +83,27 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
 
 	  To use this toolchain, you must disable soft float usage.
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
+	bool "Sourcery CodeBench ARM 2012.03"
+	depends on BR2_arm
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
+	  2.15 and gdb 7.2.50, kernel headers 3.2.10. It has support
+	  for the following variants:
+	    - ARMv5TE, little endian, soft-float, glibc
+	      Select ARM926T, ARM10T, XScale or another ARMv5 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv4T, little endian, soft-float, glibc
+	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mthumb
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
 	depends on BR2_arm
@@ -620,6 +641,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
+	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 5a7c03e767..43d747cad6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -187,6 +187,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.05/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.05-20120523_linux.tar.bz2

From b86a86cfbbf72499b62e3b498001d97366bdb6d9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 29 Sep 2012 20:40:39 +0200
Subject: [PATCH 2916/6849] x11vnc: add libXtst as a dependency

x11vnc CAN be built without XTEST support, but it isn't very useful as
noted by the warning printed by configure when it isn't found:

*** A working build environment for the XTEST extension was not found ***
(libXtst).  An x11vnc built this way will be *ONLY BARELY USABLE*.
You will be able to move the mouse but not click or type.  There can
also be deadlocks if an application grabs the X server.

It is recommended that you install the necessary development packages
for XTEST (perhaps it is named something like libxtst-dev) and run
configure again.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11vnc/Config.in | 1 +
 package/x11vnc/x11vnc.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11vnc/Config.in b/package/x11vnc/Config.in
index 53895b087e..5693754bf2 100644
--- a/package/x11vnc/Config.in
+++ b/package/x11vnc/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_X11VNC
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXTST
 	help
 	  VNC server for X11 display
 
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 51ae0a0fb2..06afcac8d6 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -9,7 +9,7 @@ X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11
 X11VNC_CONF_OPT = \
 	--without-avahi
 
-X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext
+X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
 
 ifneq ($(BR2_INET_IPV6),y)
 # configure option only used for libvncserver

From 2410e3d243114f3509b8189ee4de7fe3c66c49db Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 29 Sep 2012 21:58:19 +0200
Subject: [PATCH 2917/6849] x11vnc: add optional dependencies

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11vnc/x11vnc-ipv6.patch | 25 +++++++++++++++
 package/x11vnc/x11vnc.mk         | 54 ++++++++++++++++++++++++++++++--
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 package/x11vnc/x11vnc-ipv6.patch

diff --git a/package/x11vnc/x11vnc-ipv6.patch b/package/x11vnc/x11vnc-ipv6.patch
new file mode 100644
index 0000000000..89c28357a1
--- /dev/null
+++ b/package/x11vnc/x11vnc-ipv6.patch
@@ -0,0 +1,25 @@
+[PATCH] fix build on uClibc without IPv6 support
+
+Some systems (like uClibc) defines AF_INET6 even when configured without
+IPv6 support, so don't use that to decide if IPv6 support should be enabled.
+
+Instead use the X11VNC_IPV6 define like elsewhere in the code.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ x11vnc/enc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: x11vnc-0.9.13/x11vnc/enc.h
+===================================================================
+--- x11vnc-0.9.13.orig/x11vnc/enc.h
++++ x11vnc-0.9.13/x11vnc/enc.h
+@@ -1733,7 +1733,7 @@
+ 	}
+ 
+ 	try6:
+-#ifdef AF_INET6
++#if X11VNC_IPV6
+ 	if (!getenv("ULTRAVNC_DSM_HELPER_NOIPV6")) {
+ 		struct sockaddr_in6 sin;
+ 		int one = 1, sock = -1;
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 06afcac8d6..73da50e03a 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -6,8 +6,9 @@
 X11VNC_VERSION = 0.9.13
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
 X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
-X11VNC_CONF_OPT = \
-	--without-avahi
+# sdl support is not used in x11vnc, but host include / library search paths
+# leak in if host has sdl-config
+X11VNC_CONF_OPT = --without-sdl
 
 X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
 
@@ -17,4 +18,53 @@ X11VNC_CONF_OPT += --without-ipv6
 X11VNC_CONF_ENV += CFLAGS='$(TARGET_CFLAGS) -DX11VNC_IPV6=0'
 endif
 
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+X11VNC_DEPENDENCIES += avahi dbus
+else
+X11VNC_CONF_OPT += --without-avahi
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+X11VNC_DEPENDENCIES += jpeg
+else
+X11VNC_CONF_OPT += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+X11VNC_DEPENDENCIES += openssl
+else
+X11VNC_CONF_OPT += --without-ssl --without-crypto
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+X11VNC_DEPENDENCIES += xlib_libXinerama
+else
+X11VNC_CONF_OPT += --without-xinerama
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+X11VNC_DEPENDENCIES += xlib_libXrandr
+else
+X11VNC_CONF_OPT += --without-xrandr
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+X11VNC_DEPENDENCIES += xlib_libXfixes
+else
+X11VNC_CONF_OPT += --without-xfixes
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
+X11VNC_DEPENDENCIES += xlib_libXdamage
+else
+X11VNC_CONF_OPT += --without-xdamage
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+X11VNC_DEPENDENCIES += zlib
+else
+X11VNC_CONF_OPT += --without-zlib
+endif
+
+
 $(eval $(autotools-package))

From 811ef867f314c9661c68a71394183177a1614f5f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Sep 2012 10:09:36 +0200
Subject: [PATCH 2918/6849] xapp_xsetroot: needs libXcursor

Fixes http://autobuild.buildroot.net/results/1fe8d3496ca1b591cbc470f55067b4acc3ed4d63

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xsetroot/Config.in        | 1 +
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xsetroot/Config.in b/package/x11r7/xapp_xsetroot/Config.in
index 82c0dbaeae..a70df80d91 100644
--- a/package/x11r7/xapp_xsetroot/Config.in
+++ b/package/x11r7/xapp_xsetroot/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XAPP_XSETROOT
 	bool "xsetroot"
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
 	select BR2_PACKAGE_XDATA_XBITMAPS
 	help
 	  X.Org xsetroot application
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 881e408dcb..82fdc4e256 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -7,6 +7,6 @@
 XAPP_XSETROOT_VERSION = 1.1.0
 XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
+XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps
 
 $(eval $(autotools-package))

From a2f8e626d2bd48c9c6b6aa90f6e0822d5fbd78b2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Sep 2012 20:16:28 +0200
Subject: [PATCH 2919/6849] pulseaudio: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 406dd8f408..b9638ac18a 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PULSEAUDIO_VERSION = 2.0
+PULSEAUDIO_VERSION = 2.1
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_CONF_OPT = \

From 220ce9f4002284d1cd983156a3a5439cf9e1877d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Sep 2012 22:00:33 +0200
Subject: [PATCH 2920/6849] sheevaplug_defconfig: use 3.5.4 kernel

Notice that you need u-boot >= 2012.04 to be able to boot kernel >= 3.2,
because older u-boots keep the l2 cache enabled, see u-boot commit
679530278 (arm, arm-kirkwood: disable l2c before linux boot) for details.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/sheevaplug_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 86389dd7b9..ead1831f0a 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -19,6 +19,6 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
 BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
 BR2_LINUX_KERNEL_UIMAGE=y

From 6d0277001f368ecf77ebb47a0a9344de94c43298 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Fri, 21 Sep 2012 02:54:19 +0000
Subject: [PATCH 2921/6849] connman: bump to version 1.7

[Peter: command line client needs readline]
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in  | 1 +
 package/connman/connman.mk | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 082b0ca686..b67b54059c 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -44,6 +44,7 @@ config BR2_PACKAGE_CONNMAN_DEBUG
 
 config BR2_PACKAGE_CONNMAN_CLIENT
 	bool "enable command line client"
+	select BR2_PACKAGE_READLINE
 
 endif # BR2_PACKAGE_CONNMAN
 
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index ed83ebc712..7a5207103c 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.6
+CONNMAN_VERSION = 1.7
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES
@@ -25,9 +25,10 @@ CONNMAN_POST_INSTALL_TARGET_HOOKS = CONNMAN_INSTALL_INITSCRIPT
 
 ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
 CONNMAN_CONF_OPT += --enable-client
+CONNMAN_DEPENDENCIES += readline
 
 define CONNMAN_INSTALL_CM
-	$(INSTALL) -m 0755 -D $(@D)/client/cm $(TARGET_DIR)/usr/bin/cm
+	$(INSTALL) -m 0755 -D $(@D)/client/connmanctl $(TARGET_DIR)/usr/bin/connmanctl
 endef
 
 CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM

From d1344dbbd43587847c61ceb32dd17d282199104d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 1 Oct 2012 22:14:35 +0200
Subject: [PATCH 2922/6849] kernel-headers: add 3.6 kernel

And deprecate 2.6.39.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 40590741d8..7e6cc43ee1 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_5
+	default BR2_KERNEL_HEADERS_3_6
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -25,6 +25,7 @@ choice
 
 	config BR2_KERNEL_HEADERS_2_6_39
 		bool "Linux 2.6.39.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_0
 		bool "Linux 3.0.x kernel headers"
@@ -44,6 +45,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_5
 		bool "Linux 3.5.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_6
+		bool "Linux 3.6.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -69,5 +73,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.11"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.4"		if BR2_KERNEL_HEADERS_3_5
+	default "3.6"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 51009b3b422b9679daafbce5c22d6bd140e43f2c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 1 Oct 2012 22:16:23 +0200
Subject: [PATCH 2923/6849] linux: add 3.6 kernel, remove 3.5 option

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 6e174ba9dd..257f934588 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -19,10 +19,9 @@ if BR2_LINUX_KERNEL
 #
 choice
 	prompt "Kernel version"
-	default BR2_LINUX_KERNEL_3_5
 
-config BR2_LINUX_KERNEL_3_5
-	bool "3.5.4"
+config BR2_LINUX_KERNEL_3_6
+	bool "3.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.5.4" if BR2_LINUX_KERNEL_3_5
+	default "3.6" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From b2e0d96bc0749381600e85432d36c3699db481b1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 1 Oct 2012 23:00:49 +0200
Subject: [PATCH 2924/6849] fftw: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fftw/fftw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index f846ffc8a7..74a5e11fec 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FFTW_VERSION = 3.3
+FFTW_VERSION = 3.3.2
 FFTW_SITE = http://www.fftw.org
 FFTW_INSTALL_STAGING = YES
 

From 06ddc35bd772021a398dfc64c5e9a1c7fda6580a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Oct 2012 00:24:56 +0000
Subject: [PATCH 2925/6849] kernel-headers: bump 3.{0, 4, 5}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.43-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.44-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 7e6cc43ee1..bfec5f1881 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.43"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.44"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.30"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.11"	if BR2_KERNEL_HEADERS_3_4
-	default "3.5.4"		if BR2_KERNEL_HEADERS_3_5
+	default "3.4.12"	if BR2_KERNEL_HEADERS_3_4
+	default "3.5.5"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.43-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.44-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.43-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.44-headers_install-fix-__packed-in-exported-kernel-head.patch

From f78b189a024f62eb4865a04094dc44e9cf3bac3b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Oct 2012 07:40:48 +0000
Subject: [PATCH 2926/6849] hdparm: bump to version 9.42

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hdparm/hdparm.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index 5c00e79d7b..76223f407a 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-HDPARM_VERSION = 9.39
+HDPARM_VERSION = 9.42
 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm
+HDPARM_LICENSE = BSD-Style
+HDPARM_LICENSE_FILES = LICENSE.TXT
 
 define HDPARM_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \

From 2af923069ed36868e0f100b63692ef0b999b58ea Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Oct 2012 14:40:49 -0300
Subject: [PATCH 2927/6849] ipset: bump to version 6.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index a9d05fd671..b8d0a24d52 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.13
+IPSET_VERSION = 6.14
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkg-config
 IPSET_CONF_OPT = --with-kmod=no
+IPSET_LICENSE = GPLv2
+IPSET_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 2bd4ee3e39c4d84280622e8082468efbf687da07 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Oct 2012 07:40:50 +0000
Subject: [PATCH 2928/6849] iproute2: bump to version 3.6.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 90588a3b14..62328abd75 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 3.5.1
+IPROUTE2_VERSION = 3.6.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 IPROUTE2_LICENSE = GPLv2

From 9a5df36c24a669eb3f0af425cd343d594a79475d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Oct 2012 07:40:51 +0000
Subject: [PATCH 2929/6849] hostapd: add openssl 1.0.1 patch

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd-openssl-1.0.1.patch | 54 +++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 package/hostapd/hostapd-openssl-1.0.1.patch

diff --git a/package/hostapd/hostapd-openssl-1.0.1.patch b/package/hostapd/hostapd-openssl-1.0.1.patch
new file mode 100644
index 0000000000..2e110f43ce
--- /dev/null
+++ b/package/hostapd/hostapd-openssl-1.0.1.patch
@@ -0,0 +1,54 @@
+From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Fri, 17 Aug 2012 23:55:14 +0300
+Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1
+
+The mechanism to figure out key block size based on ssl->read_hash
+does not seem to work with OpenSSL 1.0.1, so add an alternative
+mechanism to figure out the NAC key size that seems to work at
+least with the current OpenSSL 1.0.1 releases.
+
+Signed-hostap: Jouni Malinen <j@w1.fi>
+intended-for: hostap-1
+(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0)
+---
+ src/crypto/tls_openssl.c |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 6380ce0..c4a76be 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
+ {
+ 	const EVP_CIPHER *c;
+ 	const EVP_MD *h;
++	int md_size;
+ 
+ 	if (conn == NULL || conn->ssl == NULL ||
+ 	    conn->ssl->enc_read_ctx == NULL ||
+@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
+ #else
+ 	h = conn->ssl->read_hash;
+ #endif
++	if (h)
++		md_size = EVP_MD_size(h);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	else if (conn->ssl->s3)
++		md_size = conn->ssl->s3->tmp.new_mac_secret_size;
++#endif
++	else
++		return -1;
+ 
++	wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d "
++		   "IV_len=%d", EVP_CIPHER_key_length(c), md_size,
++		   EVP_CIPHER_iv_length(c));
+ 	return 2 * (EVP_CIPHER_key_length(c) +
+-		    EVP_MD_size(h) +
++		    md_size +
+ 		    EVP_CIPHER_iv_length(c));
+ }
+ 
+-- 
+1.7.4-rc1
+

From af882c15cca45c1b27766d0efda2be16a137a765 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Oct 2012 07:40:52 +0000
Subject: [PATCH 2930/6849] wpa_supplicant: add openssl 1.0.1 patch

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../wpa_supplicant-openssl-1.0.1.patch        | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch

diff --git a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch b/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
new file mode 100644
index 0000000000..2e110f43ce
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
@@ -0,0 +1,54 @@
+From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Fri, 17 Aug 2012 23:55:14 +0300
+Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1
+
+The mechanism to figure out key block size based on ssl->read_hash
+does not seem to work with OpenSSL 1.0.1, so add an alternative
+mechanism to figure out the NAC key size that seems to work at
+least with the current OpenSSL 1.0.1 releases.
+
+Signed-hostap: Jouni Malinen <j@w1.fi>
+intended-for: hostap-1
+(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0)
+---
+ src/crypto/tls_openssl.c |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 6380ce0..c4a76be 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
+ {
+ 	const EVP_CIPHER *c;
+ 	const EVP_MD *h;
++	int md_size;
+ 
+ 	if (conn == NULL || conn->ssl == NULL ||
+ 	    conn->ssl->enc_read_ctx == NULL ||
+@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
+ #else
+ 	h = conn->ssl->read_hash;
+ #endif
++	if (h)
++		md_size = EVP_MD_size(h);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	else if (conn->ssl->s3)
++		md_size = conn->ssl->s3->tmp.new_mac_secret_size;
++#endif
++	else
++		return -1;
+ 
++	wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d "
++		   "IV_len=%d", EVP_CIPHER_key_length(c), md_size,
++		   EVP_CIPHER_iv_length(c));
+ 	return 2 * (EVP_CIPHER_key_length(c) +
+-		    EVP_MD_size(h) +
++		    md_size +
+ 		    EVP_CIPHER_iv_length(c));
+ }
+ 
+-- 
+1.7.4-rc1
+

From 96d677bc3a2a6561c3e7efe062e5f6dab360d78a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 4 Oct 2012 08:49:38 +0200
Subject: [PATCH 2931/6849] connman: ensure connmanctl is only built if
 explicitly enabled

Fixes http://autobuild.buildroot.net/results/3d3a2eec6a2520f048e00eeb967e3a770ffbcdd3

connmanctl is now built by default unless explicitly disabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/connman.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 7a5207103c..2ce3dbdb60 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -32,6 +32,8 @@ define CONNMAN_INSTALL_CM
 endef
 
 CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM
+else
+CONNMAN_CONF_OPT += --disable-client
 endif
 
 $(eval $(autotools-package))

From 96688934c471d81197ebf0e19c72bba8fa5feb2e Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 27 Sep 2012 09:27:42 +0000
Subject: [PATCH 2932/6849] external-toolchain: BR2_TOOLCHAIN_EXTERNAL_GLIBC
 includes eglibc

Yann E. MORIN says:

    "Although eglibc can be configured to include/exclude parts of the
    features, it seems to not be in wide use, if at all."

Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 94ae735219..105fb2a26e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -692,8 +692,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
-	bool "glibc"
+	bool "glibc/eglibc"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	help
+	  Note: eglibc is a variant of glibc that (among other things) can be
+	  configured to exclude some of its features. Using a toolchain with
+	  eglibc configured to exclude key features may cause build failures to
+	  some packages.
 
 endchoice
 

From 3657595900e0110d8677e22726c19d9f7dd3e91f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Sep 2012 11:14:28 +0000
Subject: [PATCH 2933/6849] libxslt: bump to version 1.1.27

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libxslt-1.1.26-id-generation.patch        | 56 -------------------
 ...lt-1.1.26-pattern-out-of-bounds-read.patch | 27 ---------
 ...onfigure.patch => libxslt-configure.patch} |  0
 package/libxslt/libxslt.mk                    |  4 +-
 4 files changed, 3 insertions(+), 84 deletions(-)
 delete mode 100644 package/libxslt/libxslt-1.1.26-id-generation.patch
 delete mode 100644 package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch
 rename package/libxslt/{libxslt-1.1.26-configure.patch => libxslt-configure.patch} (100%)

diff --git a/package/libxslt/libxslt-1.1.26-id-generation.patch b/package/libxslt/libxslt-1.1.26-id-generation.patch
deleted file mode 100644
index f8f4c2a955..0000000000
--- a/package/libxslt/libxslt-1.1.26-id-generation.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 22 Feb 2011 02:14:23 +0000
-Subject: Fix generate-id() to not expose object addresses
-
-As pointed out by Chris Evans <scarybeasts@gmail.com> it's better
-security wise to not expose object addresses directly, use a diff
-w.r.t. the document root own address to avoid this
-* libxslt/functions.c: fix IDs generation code
----
-diff --git a/libxslt/functions.c b/libxslt/functions.c
-index 4720c7a..de962f4 100644
---- a/libxslt/functions.c
-+++ b/libxslt/functions.c
-@@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
- void
- xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
-     xmlNodePtr cur = NULL;
--    unsigned long val;
--    xmlChar str[20];
-+    long val;
-+    xmlChar str[30];
-+    xmlDocPtr doc;
- 
-     if (nargs == 0) {
- 	cur = ctxt->context->node;
-@@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
-      * Okay this is ugly but should work, use the NodePtr address
-      * to forge the ID
-      */
--    val = (unsigned long)((char *)cur - (char *)0);
--    val /= sizeof(xmlNode);
--    sprintf((char *)str, "id%ld", val);
-+    if (cur->type != XML_NAMESPACE_DECL)
-+        doc = cur->doc;
-+    else {
-+        xmlNsPtr ns = (xmlNsPtr) cur;
-+
-+        if (ns->context != NULL)
-+            doc = ns->context;
-+        else
-+            doc = ctxt->context->doc;
-+
-+    }
-+
-+    val = (long)((char *)cur - (char *)doc);
-+    if (val >= 0) {
-+      sprintf((char *)str, "idp%ld", val);
-+    } else {
-+      sprintf((char *)str, "idm%ld", -val);
-+    }
-     valuePush(ctxt, xmlXPathNewString(str));
- }
- 
---
-cgit v0.8.3.4
diff --git a/package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch b/package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch
deleted file mode 100644
index cd2e292f47..0000000000
--- a/package/libxslt/libxslt-1.1.26-pattern-out-of-bounds-read.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b Mon Sep 17 00:00:00 2001
-From: Abhishek Arya <inferno@chromium.org>
-Date: Sun, 22 Jan 2012 17:47:50 +0800
-Subject: [PATCH] Fix some case of pattern parsing errors
-
-We could accidentally hit an off by one string array access
-due to improper loop exit when parsing patterns
----
- libxslt/pattern.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libxslt/pattern.c b/libxslt/pattern.c
-index 6161376..1155b54 100644
---- a/libxslt/pattern.c
-+++ b/libxslt/pattern.c
-@@ -1867,6 +1867,8 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
- 		while ((pattern[end] != 0) && (pattern[end] != '"'))
- 		    end++;
- 	    }
-+	    if (pattern[end] == 0)
-+	        break;
- 	    end++;
- 	}
- 	if (current == end) {
--- 
-1.7.8.4
-
diff --git a/package/libxslt/libxslt-1.1.26-configure.patch b/package/libxslt/libxslt-configure.patch
similarity index 100%
rename from package/libxslt/libxslt-1.1.26-configure.patch
rename to package/libxslt/libxslt-configure.patch
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 6dd702c3aa..aa594c28bd 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-LIBXSLT_VERSION = 1.1.26
+LIBXSLT_VERSION = 1.1.27
 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
 LIBXSLT_INSTALL_STAGING = YES
+LIBXSLT_LICENSE = MIT
+LIBXSLT_LICENSE_FILES = COPYING
 
 LIBXSLT_CONF_OPT = --with-gnu-ld --without-debug \
 		--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/

From b601212e98358b0796549b7cdf4d1b619acb628e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Sep 2012 11:14:29 +0000
Subject: [PATCH 2934/6849] libxml2: add license info

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/libxml2.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 44d15e79ba..b63200f9cd 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -8,6 +8,8 @@ LIBXML2_VERSION = 2.8.0
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
 LIBXML2_AUTORECONF = YES
+LIBXML2_LICENSE = MIT
+LIBXML2_LICENSE_FILES = COPYING
 
 ifneq ($(BR2_LARGEFILE),y)
 LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"

From 3732b05b1dcdf79392b86ba1922b0d0f2ee8cced Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 27 Sep 2012 22:43:16 +0000
Subject: [PATCH 2935/6849] strace: Version bump to 4.7

This also fixes a compilation problem with kernel headers 3.5
http://autobuild.buildroot.net/results/bb66a3a06d26f558e1c4c0593bb68e7af1d82398/build-end.log

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/strace.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 2d95137913..5c2d33c5c3 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-STRACE_VERSION = 4.5.20
-STRACE_SOURCE = strace-$(STRACE_VERSION).tar.bz2
+STRACE_VERSION = 4.7
+STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 
 STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \

From 11017f081fc5b034e680d89eaea729c19f450e01 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 2 Oct 2012 23:26:30 +0000
Subject: [PATCH 2936/6849] pkg-infra: make sure cross compiling is enabled
 when host == target

When compiling for the same architecture and libc as the host,
GNU_TARGET_NAME and GNU_HOST_NAME are equal.  configure scripts use
these to detect cross-compilation, and will decide that we're doing
native compilation.  This may trigger running of executables,
which fail because of missing libraries in the host environment.

To solve this, set the vendor part in GNU_TARGET_NAME to buildroot.

This problem exists for instance in xserver_xorg-server on x86_64.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 64508b2838..30a542a653 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -20,7 +20,7 @@ MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS)
 
 # Compute GNU_TARGET_NAME
-GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
+GNU_TARGET_NAME=$(ARCH)-buildroot-linux-$(LIBC)$(ABI)
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
 LIBC=uclibc

From 94d3aa171cfa72405c51686c82164d5af246f7bd Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Tue, 2 Oct 2012 08:52:15 +0000
Subject: [PATCH 2937/6849] Makefile: Remove more pkgconfig files

The pkgconfig files are located in  /usr/lib/pkgconfig
and /usr/share/pkgconfig directories.
However, only /usr/lib/pkgconfig is removed when no
development files are needed in the target filesystem.

Remove pkgconfig directory from $(TARGET_DIR)/usr/share
as well if BR2_HAVE_DEVFILES is not set.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6536bca9bf..0128839e29 100644
--- a/Makefile
+++ b/Makefile
@@ -419,7 +419,8 @@ target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
 	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
 else
-	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal
+	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
+		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig
 	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 endif

From fcc4f789235a77537736bd5dbe8c938de51c9e70 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 3 Oct 2012 22:44:38 +0000
Subject: [PATCH 2938/6849] gst-plugins-good: Add upstream patch to fix
 building with Linux 3.6

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gst-plugins-good-linux36.patch            | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch

diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch b/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
new file mode 100644
index 0000000000..5d7cd932ed
--- /dev/null
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
@@ -0,0 +1,37 @@
+Fix building with Linux headers 3.6
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 09 Aug 2012 07:35:23 +0000
+Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
+
+This was unused apparently and removed in the kernel in commit:
+
+ From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
+ From: Sakari Ailus <sakari.ailus@iki.fi>
+ Date: Wed, 2 May 2012 09:40:03 -0300
+ Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
+
+ Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
+ tells the former is valid. The flag is used by no driver currently.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681491
+---
+(limited to 'sys/v4l2/gstv4l2bufferpool.c')
+
+diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
+index 2e3a563..5aaed5a 100644
+--- a/sys/v4l2/gstv4l2bufferpool.c
++++ b/sys/v4l2/gstv4l2bufferpool.c
+@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
+     GST_LOG_OBJECT (pool->v4l2elem, "  MMAP offset:  %u",
+         ret->vbuffer.m.offset);
+   GST_LOG_OBJECT (pool->v4l2elem, "  length:    %u", ret->vbuffer.length);
+-  GST_LOG_OBJECT (pool->v4l2elem, "  input:     %u", ret->vbuffer.input);
+ 
+   ret->mmap_length = ret->vbuffer.length;
+   data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
+--
+cgit v0.9.0.2-2-gbebe

From 437a4446f25232cba6c385f26063ce61a1ffd08f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Sep 2012 13:35:45 +0000
Subject: [PATCH 2939/6849] samba: bump to version 3.6.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba-getaddrinfo.patch | 13 +++++++------
 package/samba/samba.mk                |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package/samba/samba-getaddrinfo.patch b/package/samba/samba-getaddrinfo.patch
index af01299003..df3570ca03 100644
--- a/package/samba/samba-getaddrinfo.patch
+++ b/package/samba/samba-getaddrinfo.patch
@@ -1,18 +1,19 @@
-Patch from OpenWRT.
+Patch forward-ported from OpenWRT.
 Don't check for buggy getaddrinfo() assume it's safe if it's present.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
---- a/source3/configure
-+++ b/source3/configure
-@@ -13285,10 +13285,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
+diff -Nura samba-3.6.8.orig/source3/configure samba-3.6.8/source3/configure
+--- samba-3.6.8.orig/source3/configure	2012-09-14 05:19:52.000000000 -0300
++++ samba-3.6.8/source3/configure	2012-09-25 20:31:57.861743235 -0300
+@@ -13269,10 +13269,7 @@
  	# see bug 5910, use our replacements if we detect
  	# a broken system.
  	if test "$cross_compiling" = yes; then :
 -  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
 +		$as_echo "assuming valid getaddrinfo without bug 5910" >&2
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 75e31735bc..7c06e14427 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.7
+SAMBA_VERSION = 3.6.8
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 152f2329e445110f1959c9af129e764f47b9e4d4 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Wed, 26 Sep 2012 09:33:08 +0000
Subject: [PATCH 2940/6849] libdvdread: Fix dvdread-config

This fixes path prefix in the staging dvdread-config
and removes dvdread-config from the target filesystem
if BR2_HAVE_DEVFILES is not set.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdvdread/libdvdread.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
index 6e17731a37..ee616f04cb 100644
--- a/package/libdvdread/libdvdread.mk
+++ b/package/libdvdread/libdvdread.mk
@@ -11,4 +11,18 @@ LIBDVDREAD_AUTORECONF = YES
 LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES
 
+define LIBDVDREAD_TARGET_CLEANUP
+	$(RM) -f $(TARGET_DIR)/usr/bin/dvdread-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBDVDREAD_POST_INSTALL_TARGET_HOOKS += LIBDVDREAD_TARGET_CLEANUP
+endif
+
+define LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG
+	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdread-config
+endef
+
+LIBDVDREAD_POST_INSTALL_STAGING_HOOKS += LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG
+
 $(eval $(autotools-package))

From fc2f47e9ae46fcd6385baa5eabae747696127e54 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Wed, 26 Sep 2012 09:33:51 +0000
Subject: [PATCH 2941/6849] libdvdnav: Fix dvdnav-config

This fixes path prefix in the staging dvdnav-config
and removes dvdnav-config from the target filesystem
if BR2_HAVE_DEVFILES is not set.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdvdnav/libdvdnav.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index e2d42f3188..2fefe43bb1 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -16,4 +16,18 @@ LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config
 # of cross compilation, we prefer using pkg-config.
 LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 
+define LIBDVDNAV_TARGET_CLEANUP
+	$(RM) -f $(TARGET_DIR)/usr/bin/dvdnav-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBDVDNAV_POST_INSTALL_TARGET_HOOKS += LIBDVDNAV_TARGET_CLEANUP
+endif
+
+define LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG
+	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdnav-config
+endef
+
+LIBDVDNAV_POST_INSTALL_STAGING_HOOKS += LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG
+
 $(eval $(autotools-package))

From 63fbc1834f98f37cc43514f13cb75c1034dcf454 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Wed, 26 Sep 2012 09:34:51 +0000
Subject: [PATCH 2942/6849] mplayer: Fix external libdvdread and libdvdnav
 support

This sets paths to dvdread-config and dvdnav-config,
and configuration options to enable external libdvdread
and libdvdnav support.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 05120bf780..9ff4b8a62b 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -42,6 +42,21 @@ else
 MPLAYER_CONF_OPTS += --disable-freetype
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
+MPLAYER_CONF_OPTS +=  \
+	--enable-dvdread \
+	--disable-dvdread-internal \
+	--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
+MPLAYER_DEPENDENCIES += libdvdread
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
+MPLAYER_CONF_OPTS +=  \
+	--enable-dvdnav \
+	--with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config
+MPLAYER_DEPENDENCIES += libdvdnav
+endif
+
 ifeq ($(BR2_PACKAGE_MPLAYER_MPLAYER),y)
 MPLAYER_CONF_OPTS += --enable-mplayer
 else

From 79f77bf92587878145049a0d6d771dd92ddc1fe4 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Fri, 28 Sep 2012 09:19:25 +0000
Subject: [PATCH 2943/6849] mplayer: Amend libmad selection

Do not set both --enable-mad and --disable-mad.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 9ff4b8a62b..9967dd92ec 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -81,6 +81,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBMAD),y)
 MPLAYER_DEPENDENCIES += libmad
+MPLAYER_CONF_OPTS += --enable-mad
 else
 MPLAYER_CONF_OPTS += --disable-mad
 endif
@@ -136,7 +137,6 @@ define MPLAYER_CONFIGURE_CMDS
 		--extra-cflags="$(MPLAYER_CFLAGS)" \
 		--extra-ldflags="$(MPLAYER_LDFLAGS)" \
 		--yasm='' \
-		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_CONF_OPTS) \
 		--enable-cross-compile \

From 2ba4eedeee5342799c15207a64fe1a147c2cb020 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Fri, 28 Sep 2012 09:19:48 +0000
Subject: [PATCH 2944/6849] mplayer: Only enable IPv6 if BR2_INET_IPV6 is set

This fixes false positive IPv6 detection.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/mplayer.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 9967dd92ec..17680b66a0 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -153,6 +153,9 @@ define MPLAYER_FIXUP_IPV6_MREQ_DETECTION
 endef
 
 MPLAYER_POST_CONFIGURE_HOOKS += MPLAYER_FIXUP_IPV6_MREQ_DETECTION
+MPLAYER_CONF_OPTS += --disable-inet6
+else
+MPLAYER_CONF_OPTS += --enable-inet6
 endif
 
 define MPLAYER_BUILD_CMDS

From ccd7f14cfebc8dc144411cbcb08c7651759c5298 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Wed, 19 Sep 2012 22:01:17 +0000
Subject: [PATCH 2945/6849] use portable printf instead of echo -e, needed for
 MacOS X buildhost

echo -e is not a portable way to do this, better use printf.
Works with MacOS X.

Signed-off-by: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/common.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index debf7db65f..0f0eae996c 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -49,9 +49,9 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
 	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
-	echo -e '$(subst $(sep),\n,$(PACKAGES_DEVICES_TABLE))' >> $(FULL_DEVICE_TABLE)
+	printf '$(subst $(sep),\n,$(PACKAGES_DEVICES_TABLE))' >> $(FULL_DEVICE_TABLE)
 endif
-	echo -e '$(subst $(sep),\n,$(PACKAGES_PERMISSIONS_TABLE))' >> $(FULL_DEVICE_TABLE)
+	printf '$(subst $(sep),\n,$(PACKAGES_PERMISSIONS_TABLE))' >> $(FULL_DEVICE_TABLE)
 	echo "$(HOST_DIR)/usr/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 endif
 	echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)

From a22e9342405de96e1f230f862bb840549cb111ea Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 6 Oct 2012 21:32:09 +0200
Subject: [PATCH 2946/6849] pulseaudio: fix X11 + !locale build issue

Fixes http://autobuild.buildroot.net/results/aa1072ee5115ce12f03d600b46ff980a9d20c45d/

Pulseaudio installs autostart .desktop files when X11 support is enabled,
but the files are not created from the corresponding .desktop.in files
when built with --disable-nls (which we add for !locale builds).

Reported upstream at: https://bugs.freedesktop.org/show_bug.cgi?id=54658

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index b9638ac18a..6396fef439 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -57,6 +57,25 @@ ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG),yy)
 PULSEAUDIO_CONF_OPT += --disable-gtk2
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_XLIB_LIBSM)$(BR2_PACKAGE_XLIB_LIBXTST),yyy)
+PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst
+
+# .desktop file generation needs nls support, so fake it for !locale builds
+# https://bugs.freedesktop.org/show_bug.cgi?id=54658
+ifneq ($(BR2_ENABLE_LOCALE),y)
+define PULSEAUDIO_FIXUP_DESKTOP_FILES
+	cp $(@D)/src/daemon/pulseaudio.desktop.in \
+	   $(@D)/src/daemon/pulseaudio.desktop
+	cp $(@D)/src/daemon/pulseaudio-kde.desktop.in \
+	   $(@D)/src/daemon/pulseaudio-kde.desktop
+endef
+PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FIXUP_DESKTOP_FILES
+endif
+
+else
+PULSEAUDIO_CONF_OPT += --disable-x11
+endif
+
 ifneq ($(BR2_PACKAGE_VALA),y)
 define PULSEAUDIO_REMOVE_VALA
 	rm -rf $(TARGET_DIR)/usr/share/vala

From cd4bce0ba65a37633145a07427de61a569a99399 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Mon, 1 Oct 2012 06:23:36 +0000
Subject: [PATCH 2947/6849] netatalk: bump version

Netatalk goes to version 3.0.
The startup script has changed too, there is now only one binary called
netatalk. No more afpd, cnid, ... at startup ! They are executed by netatalk.

All the config is done within /etc/afp.conf, look at :
http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html
for more info about the upgrade process.

[Peter: added --without-kerberos to disable kerberos detection]
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/S50netatalk | 32 +++++++++++---------------------
 package/netatalk/netatalk.mk |  5 +++--
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/package/netatalk/S50netatalk b/package/netatalk/S50netatalk
index 94bb161aea..f109174961 100755
--- a/package/netatalk/S50netatalk
+++ b/package/netatalk/S50netatalk
@@ -1,40 +1,30 @@
-#!/bin/sh 
-# 
-# Start netatalk daemon  (aftpd && cnid_metad)
+#!/bin/sh
+#
+# Start netatalk
 #
-
-AFPD_UAMLIST="-U uams_dhx2.so,uams_clrtxt.so"
 
 start() {
-    echo -n "Starting Netatalk services (this will take a while): "
-    echo "Starting afpd"
-    echo -n " afpd"
-    start-stop-daemon -S -q -p /var/run/afpd.pid --exec /usr/sbin/afpd -- $AFPD_UAMLIST -g nobody -c 50
-    echo -n " cnid_metad"
-    start-stop-daemon -S -q -p /var/run/cnid_metad.pid --exec /usr/sbin/cnid_metad -- -l log_note
-    echo "."
+    echo "Starting Netatalk"
+    start-stop-daemon -S -q -p /var/run/netatalk.pid --exec /usr/sbin/netatalk
 }
 
 stop(){
-    echo -n "Stopping Netatalk Daemons:"
-    echo -n " afpd"
-    start-stop-daemon -K -q -p /var/run/afpd.pid
-    echo -n " cnid_metad"
-    start-stop-daemon -K -q -p /var/run/cnid_metad.pid
+    echo "Stopping Netatalk"
+    start-stop-daemon -K -q -p /var/run/netatalk.pid
 }
 
 case "$1" in
     start)
         start
-    ;; 
+    ;;
     stop)
         stop
-    ;; 
+    ;;
     restart)
         start
         stop
-    ;; 
-    *) 
+    ;;
+    *)
         echo $"Usage: $0 {start|stop|restart}"
         exit 1
 esac
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 4b8d66f0d0..c01e360700 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -3,8 +3,8 @@
 # netatalk
 #
 #############################################################
-NETATALK_VERSION = 2.2.2
-NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/
+NETATALK_VERSION = 3.0
+NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
@@ -16,6 +16,7 @@ NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-libgcrypt-dir=$(STAGING_DIR)/usr \
 	--with-shadow \
 	--disable-shell-check \
+	--without-kerberos \
 	--without-pam
 
 ifeq ($(BR2_PACKAGE_CUPS),y)

From 21fe55eb809e429ba80617205c98d4346c5e1e53 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 8 Oct 2012 03:55:24 +0000
Subject: [PATCH 2948/6849] kernel-headers: bump 3.{0, 4, 5, 6}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.44-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.45-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index bfec5f1881..534317e62b 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.44"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.45"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.30"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.12"	if BR2_KERNEL_HEADERS_3_4
-	default "3.5.5"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6"		if BR2_KERNEL_HEADERS_3_6
+	default "3.4.13"	if BR2_KERNEL_HEADERS_3_4
+	default "3.5.6"		if BR2_KERNEL_HEADERS_3_5
+	default "3.6.1"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.44-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.45-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.44-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.45-headers_install-fix-__packed-in-exported-kernel-head.patch

From c2d525e82dacec3e6742312fca61dbded2539ed6 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 20 Sep 2012 10:48:20 +0000
Subject: [PATCH 2949/6849] Download packages from github in tar.gz format
 instead git format.

Verified way how to get packages from github by version or sha1
(it's enough to use first 7 characters from SHA1):
1. by sha1
FOO_VERSION = 1234567
FOO_SITE = http://github.com/user/package/tarball/branch

2. by version
FOO_VERSION = v1.0
FOO_SITE = http://github.com/user/package/tarball/$(FOO_VERSION)

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpuload/cpuload.mk                       | 2 +-
 package/input-event-daemon/input-event-daemon.mk | 2 +-
 package/jsmin/jsmin.mk                           | 4 ++--
 package/libiqrf/libiqrf.mk                       | 2 +-
 package/mtdev2tuio/mtdev2tuio.mk                 | 4 ++--
 package/omap-u-boot-utils/omap-u-boot-utils.mk   | 5 ++---
 package/socketcand/socketcand.mk                 | 4 ++--
 package/ti-utils/ti-utils.mk                     | 4 ++--
 package/tslib/tslib.mk                           | 4 ++--
 package/yajl/yajl.mk                             | 2 +-
 10 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/package/cpuload/cpuload.mk b/package/cpuload/cpuload.mk
index d25c504631..494cbb1179 100644
--- a/package/cpuload/cpuload.mk
+++ b/package/cpuload/cpuload.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 CPULOAD_VERSION = v0.3
-CPULOAD_SITE = git://github.com/kelvincheung/cpuload.git
+CPULOAD_SITE = http://github.com/kelvincheung/cpuload/tarball/$(CPULOAD_VERSION)
 CPULOAD_LICENSE = GPLv2
 CPULOAD_LICENSE_FILES = COPYING
 
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index f99bfbe8c9..fdff557cc3 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
-INPUT_EVENT_DAEMON_SITE = git://github.com/gandro/input-event-daemon.git
+INPUT_EVENT_DAEMON_SITE = http://github.com/gandro/input-event-daemon/tarball/$(INPUT_EVENT_DAEMON_VERSION)
 INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license
 INPUT_EVENT_DAEMON_LICENSE_FILES = README
 
diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index fb8c214e8a..0e82008b60 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -1,5 +1,5 @@
-JSMIN_VERSION = a9b47554d5684a55301a2eb7ca8480b7ee7630d4
-JSMIN_SITE = git://github.com/douglascrockford/JSMin.git
+JSMIN_VERSION = a9b4755
+JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/master
 
 define JSMIN_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index 4cf1541ca2..d7603aed5b 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 LIBIQRF_VERSION = v0.1.0
-LIBIQRF_SITE = git://github.com/nandra/libiqrf.git
+LIBIQRF_SITE = http://github.com/nandra/libiqrf/tarball/$(LIBIQRF_VERSION)
 LIBIQRF_INSTALL_STAGING = YES
 
 LIBIQRF_DEPENDENCIES = libusb
diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
index a86c0bf709..930694696f 100644
--- a/package/mtdev2tuio/mtdev2tuio.mk
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -3,8 +3,8 @@
 # mtdev2tuio
 #
 #############################################################
-MTDEV2TUIO_VERSION = e1e7378d86
-MTDEV2TUIO_SITE = git://github.com/olivopaolo/mtdev2tuio.git
+MTDEV2TUIO_VERSION = e1e7378
+MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/master
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
 MTDEV2TUIO_LICENSE = GPLv3+
 MTDEV2TUIO_LICENSE_FILES = COPYING
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index 8405f629a7..bb894a5f08 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-OMAP_U_BOOT_UTILS_VERSION = 8aff852322
-OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils.git
-OMAP_U_BOOT_UTILS_SITE_METHOD = git
+OMAP_U_BOOT_UTILS_VERSION = 8aff852
+OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/master
 
 define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index a1e672fd68..efade31940 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -3,8 +3,8 @@
 # socketcand
 #
 #############################################################
-SOCKETCAND_VERSION = 7d06986fa4b5fd2c210ec4e248dab41107be1ccd
-SOCKETCAND_SITE = git://github.com/dschanoeh/socketcand.git
+SOCKETCAND_VERSION = 7d06986
+SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/master
 SOCKETCAND_AUTORECONF = YES
 SOCKETCAND_DEPENDENCIES = libconfig
 
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index ac54370f64..956daf4577 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-TI_UTILS_VERSION = 06dbdb2727354b5f3ad7c723897f40051fddee49
-TI_UTILS_SITE = git://github.com/gxk/ti-utils.git
+TI_UTILS_VERSION = 06dbdb2
+TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/master
 TI_UTILS_DEPENDENCIES = libnl
 
 define TI_UTILS_BUILD_CMDS
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 8f30c25aa5..b10b5ec2c2 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -3,8 +3,8 @@
 # tslib
 #
 #############################################################
-TSLIB_VERSION = 412d99d8b92c
-TSLIB_SITE = git://github.com/kergoth/tslib.git
+TSLIB_VERSION = 412d99d
+TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
 TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk
index 9cebeb77e9..6f9c6401ac 100644
--- a/package/yajl/yajl.mk
+++ b/package/yajl/yajl.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 YAJL_VERSION = 2.0.4
-YAJL_SITE = git://github.com/lloyd/yajl.git
+YAJL_SITE = http://github.com/lloyd/yajl/tarball/$(YAJL_VERSION)
 YAJL_INSTALL_STAGING = YES
 YAJL_LICENSE = ISC
 YAJL_LICENSE_FILES = COPYING

From a84840bfe9c8e00be6dbbed1d8c55a2a54cb13e5 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 20 Sep 2012 10:48:21 +0000
Subject: [PATCH 2950/6849] Add FAQ entry how to properly add package from
 github.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/faq.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/manual/faq.txt b/docs/manual/faq.txt
index 575d019e91..97a754bbfe 100644
--- a/docs/manual/faq.txt
+++ b/docs/manual/faq.txt
@@ -36,3 +36,24 @@ then probably you are running a Fedora (or similar) distribution, and
 you should install the +glibc-static+ package. This is because the
 +module-init-tools+ build process wants to link statically against the
 C library.
+
+How to add package from github
+------------------------------
+
+If the package has no release version, or its version cannot be
+identified using tag, then the sha1 of the particular commit should be
+used to identify the version (the first 7 characters of the sha1 are
+enough):
+
+------------------------
+FOO_VERSION = 1234567
+FOO_SITE = http://github.com/<user>/<package>/tarball/<branch>
+------------------------
+
+If the package version matches a tag, then this tag should be used to
+identify the version:
+
+------------------------
+FOO_VERSION = v1.0
+FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
+------------------------

From f85b682a52a01c25b8cc3f4f1b13cc3e6a43cfa1 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Fri, 5 Oct 2012 13:02:59 +0000
Subject: [PATCH 2951/6849] nitrogen6x_defconfig: Use tarball from github
 instead of cloning git

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 2b7daec870..74b33c665f 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -13,14 +13,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6q_sabrelite"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://github.com/boundarydevices/u-boot-2009-08.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="1f7edab0ac5ebf564e9ad9797fedc2a668149b96"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-2009-08/tarball/1f7edab/u-boot-1f7edab.tar.gz"
 
 # kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/boundarydevices/linux-imx6.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="cb1a536f4583af7e1572d39cabd4ac597a8916a5"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/cb1a536/linux-imx6-cb1a536.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 65ba9c49190b533cdaa41ce09dfd68a924859324 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Oct 2012 21:37:19 +0200
Subject: [PATCH 2952/6849] sylpheed: fix upstream URL

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sylpheed/Config.in b/package/sylpheed/Config.in
index 16f03bef13..f03ae87706 100644
--- a/package/sylpheed/Config.in
+++ b/package/sylpheed/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_SYLPHEED
 	help
 	  lightweight and user-friendly e-mail client.
 
-	  http://sylpheed.sraoss.jp/sylpheed/v2.4
+	  http://sylpheed.sraoss.jp/en/

From 0e572092a920592bae08db58e5e701b53cabf46b Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Sun, 7 Oct 2012 12:39:59 +0000
Subject: [PATCH 2953/6849] sylpheed: Fix includedir

The sylpheed headers are installed to $(DESTDIR)$(includedir),
while DESTDIR is $(TARGET_DIR) and includedir is set to
$(STAGING_DIR)/usr/include in the SYLPHEED_CONF_OPT.
Thus, the full staging directory path is created in the
target root filesystem, which is wrong.

The includedir was set to staging include because sylpheed
incorrectly adds includedir to its include path, and does
not cross-compile with the default includedir set to
/usr/include.

This removes includedir setting and also removes it from
include paths in Makefiles to prevent using host headers
from /usr/include. The same approach is used in the OE.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/sylpheed.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 451c4de9ab..32c0a82c9d 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -9,11 +9,20 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
-SYLPHEED_CONF_OPT = --disable-gtkspell \
-                    --includedir=$(STAGING_DIR)/usr/include
+SYLPHEED_CONF_OPT = --disable-gtkspell
 
 SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2
 
+# Remove the -I$(includedir) from the Makefiles
+# because it refers to the host /usr/include.
+define SYLPHEED_PRECONFIGURE
+	for i in $$(find $(@D) -name "Makefile*"); do \
+		sed -i 's:-I$$(includedir)::g' $$i; \
+	done
+endef
+
+SYLPHEED_PRE_CONFIGURE_HOOKS += SYLPHEED_PRECONFIGURE
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SYLPHEED_DEPENDENCIES += openssl
 SYLPHEED_CONF_OPT += --enable-ssl

From e856daa89157bb31d2a88abb23542a65e4d0fbaa Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Sun, 7 Oct 2012 12:40:27 +0000
Subject: [PATCH 2954/6849] sylpheed: Bump version to 3.2

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/sylpheed.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 32c0a82c9d..491737e71c 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -3,7 +3,7 @@
 # sylpheed
 #
 #############################################################
-SYLPHEED_VERSION_MAJOR = 3.1
+SYLPHEED_VERSION_MAJOR = 3.2
 SYLPHEED_VERSION_MINOR = 0
 SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2

From f02d58ccffa9be5d27dea4f13d690af1df9a96b9 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Sun, 30 Sep 2012 10:43:58 +0000
Subject: [PATCH 2955/6849] openvpn: Fix paths to external utilities

This sets paths to ifconfig, route, netstat and ip
in the target root filesystem.

Otherwise the paths leak from the host and may not
match those on the target.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/openvpn.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 03eabcf022..1c6e6ecdfa 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -6,7 +6,16 @@
 
 OPENVPN_VERSION = 2.2.2
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
-OPENVPN_CONF_OPT = --enable-small --disable-plugins
+OPENVPN_CONF_OPT = --enable-small --disable-plugins \
+			--with-ifconfig-path=/sbin/ifconfig \
+			--with-route-path=/sbin/route \
+			--with-netstat-path=/bin/netstat
+
+ifeq ($(BR2_PACKAGE_IPROUTE2),y)
+OPENVPN_CONF_OPT += --with-iproute-path=/sbin/ip
+else
+OPENVPN_CONF_OPT += --with-iproute-path=/bin/ip
+endif
 
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
 	OPENVPN_DEPENDENCIES += lzo

From 23467d5e2c36866899bbe644c3adf7409cdba6d6 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 4 Oct 2012 02:11:39 +0000
Subject: [PATCH 2956/6849] lcdproc: add support for menus

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdproc/Config.in  | 6 ++++++
 package/lcdproc/lcdproc.mk | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in
index 72611056a1..820f4eae57 100644
--- a/package/lcdproc/Config.in
+++ b/package/lcdproc/Config.in
@@ -12,3 +12,9 @@ config BR2_PACKAGE_LCDPROC_DRIVERS
 	depends on BR2_PACKAGE_LCDPROC
 	help
 	  Specify a comma-separated list of lcdproc drivers to be built
+
+config BR2_PACKAGE_LCDPROC_MENUS
+	bool "Menu support"
+	depends on BR2_PACKAGE_LCDPROC
+	help
+	  Enable support for lcdproc menus
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 7fd8a44d0d..7914c852e4 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -12,6 +12,10 @@ LCDPROC_MAKE = $(MAKE1)
 
 LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
 
+ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
+LCDPROC_CONF_OPT += --enable-lcdproc-menus
+endif
+
 LCDPROC_DEPENDENCIES = ncurses
 
 $(eval $(autotools-package))

From 183b83e2083e778a2fdac07ab61ebd1f3ed4356a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 4 Oct 2012 21:30:21 +0000
Subject: [PATCH 2957/6849] lcdproc: backport upstream patches

Backport some lcdproc patches from upstream, to fix the following issues.

  * Incorrect parsing of minus key in handler for client_add_key command
  * Segfault in handler for menu_add_item command

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...c-0.5.5-fix-client_add_key-for-minus.patch | 38 +++++++++++++++++++
 .../lcdproc-0.5.5-fix-menu-segfault.patch     | 19 ++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
 create mode 100644 package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch

diff --git a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch b/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
new file mode 100644
index 0000000000..c17ee83af8
--- /dev/null
+++ b/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
@@ -0,0 +1,38 @@
+Calling client_add_key as follows
+
+  client_add_key -
+
+will fail. However using an explicit -shared option, like this:
+
+  client_add_key -shared -
+
+will succeed. This is caused by a failure to parse the - key token, which is
+mistaken for the first character of an option argument.
+
+The client_add_key command also returns a spurious "success" message when a
+malformed option is supplied.
+
+This patch fixes both issues.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/server/commands/client_commands.c b/server/commands/client_commands.c
+--- a/server/commands/client_commands.c	2011-08-14 13:29:16.000000000 +0100
++++ b/server/commands/client_commands.c	2012-10-05 07:50:40.357795535 +0100
+@@ -181,7 +181,7 @@ client_add_key_func(Client *c, int argc,
+ 	}
+ 
+ 	argnr = 1;
+-	if (argv[argnr][0] == '-') {
++	if (argv[argnr][0] == '-' && strcmp(argv[argnr], "-") != 0) {
+ 		if (strcmp( argv[argnr], "-shared") == 0) {
+ 			exclusively = 0;
+ 		}
+@@ -190,6 +190,7 @@ client_add_key_func(Client *c, int argc,
+ 		}
+ 		else {
+ 			sock_printf_error(c->sock, "Invalid option: %s\n", argv[argnr]);
++			return 0;
+ 		}
+ 		argnr++;
+ 	}
diff --git a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch b/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
new file mode 100644
index 0000000000..f0ebe2dec9
--- /dev/null
+++ b/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
@@ -0,0 +1,19 @@
+Trying to add a menu item using menu_add_item causes a segmentation fault
+in the LCDd server. This is caused by a read beyond the end of an array.
+
+This patch adds a safety check on the size of the argument array.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/server/commands/menu_commands.c b/server/commands/menu_commands.c
+--- a/server/commands/menu_commands.c	2011-08-14 13:29:16.000000000 +0100
++++ b/server/commands/menu_commands.c	2012-10-04 22:19:07.997409193 +0100
+@@ -198,7 +198,7 @@ menu_add_item_func(Client *c, int argc,
+ 
+ 	/* call menu_set_item() with a temporarily allocated argv
+ 	 * to process the remaining options */
+-	if ((argc > 5) || (argv[4][0] == '-')) {
++	if ((argc > 5) || ((argc == 5) && argv[4][0] == '-')) {
+ 		// menu_add_item <menuid> <newitemid> <type> [<text>]
+ 		// menu_set_item <menuid> <itemid> {<option>}+
+ 		int i, j;

From 8c345d91cf6b9664e9edae36c005f20cbff4853f Mon Sep 17 00:00:00 2001
From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Date: Sun, 7 Oct 2012 19:05:12 +0000
Subject: [PATCH 2958/6849] pcsc-lite: new package

Middleware to access a smart card using SCard API (PC/SC).

http://pcsclite.alioth.debian.org/

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/pcsc-lite/Config.in    | 31 +++++++++++++++++++++++++++++
 package/pcsc-lite/pcsc-lite.mk | 36 ++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 package/pcsc-lite/Config.in
 create mode 100644 package/pcsc-lite/pcsc-lite.mk

diff --git a/package/Config.in b/package/Config.in
index d777454cdf..c1b4041945 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -396,6 +396,7 @@ source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
 source "package/mtdev/Config.in"
+source "package/pcsc-lite/Config.in"
 endmenu
 
 menu "Javascript"
diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in
new file mode 100644
index 0000000000..621cc668fe
--- /dev/null
+++ b/package/pcsc-lite/Config.in
@@ -0,0 +1,31 @@
+config BR2_PACKAGE_PCSC_LITE
+	bool "pcsc-lite"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Middleware to access smart card using SCard API (PC/SC).
+
+	  http://pcsclite.alioth.debian.org/
+
+if BR2_PACKAGE_PCSC_LITE
+
+config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB
+	bool "use libusb"
+	depends on !BR2_PACKAGE_UDEV
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Select Y if you want to support usb smart card readers.
+
+config BR2_PACKAGE_PCSC_LITE_DEBUGATR
+	bool "enable ATR debug messages"
+	help
+	  Enable ATR debug messages from pcscd.
+
+config BR2_PACKAGE_PCSC_LITE_EMBEDDED
+	bool "enable embedded mode"
+	help
+	  Limit RAM and CPU resources by disabling logs.
+
+endif
+
+comment "pcsc-lite needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
new file mode 100644
index 0000000000..6c57dbbcee
--- /dev/null
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -0,0 +1,36 @@
+##########################################################
+#
+# PCSC-Lite
+#
+# ########################################################
+PCSC_LITE_VERSION = 1.8.6
+PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
+PCSC_LITE_SITE = https://alioth.debian.org/frs/download.php/3757
+PCSC_LITE_INSTALL_STAGING = YES
+PCSC_LITE_DEPENDENCIES = host-pkg-config
+
+# - libudev and libusb are optional
+# - libudev and libusb can't be used together
+# - libudev has a priority over libusb
+
+ifeq ($(BR2_PACKAGE_UDEV),y)
+PCSC_LITE_CONF_OPT += --enable-libudev --disable-libusb
+PCSC_LITE_DEPENDENCIES += udev
+else
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+PCSC_LITE_CONF_OPT += --enable-libusb --disable-libudev
+PCSC_LITE_DEPENDENCIES += libusb
+else
+PCSC_LITE_CONF_OPT += --disable-libusb --disable-libudev
+endif
+endif
+
+ifeq ($(PACKAGE_PCSC_LITE_DEBUGATR),y)
+PCSC_LITE_CONF_OPT += --enable-debugatr
+endif
+
+ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y)
+PCSC_LITE_CONF_OPT += --enable-embedded
+endif
+
+$(eval $(autotools-package))

From 42f0a84efd2cf511f331114db9167d00283c1425 Mon Sep 17 00:00:00 2001
From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Date: Sun, 7 Oct 2012 19:05:13 +0000
Subject: [PATCH 2959/6849] ccid: new package

PC/SC driver for USB CCID smart card readers.

http://pcsclite.alioth.debian.org/ccid.html

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/ccid/Config.in | 12 ++++++++++++
 package/ccid/ccid.mk   | 29 +++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 package/ccid/Config.in
 create mode 100644 package/ccid/ccid.mk

diff --git a/package/Config.in b/package/Config.in
index c1b4041945..c91985c058 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -383,6 +383,7 @@ source "package/zxing/Config.in"
 endmenu
 
 menu "Hardware handling"
+source "package/ccid/Config.in"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
diff --git a/package/ccid/Config.in b/package/ccid/Config.in
new file mode 100644
index 0000000000..c9b77d13c1
--- /dev/null
+++ b/package/ccid/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_CCID
+	bool "ccid"
+	select BR2_PACKAGE_PCSC_LITE
+	select BR2_PACKAGE_LIBUSB
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	help
+	  PC/SC driver for USB CCID smart card readers
+
+	  http://pcsclite.alioth.debian.org/ccid.html
+
+comment "ccid needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
new file mode 100644
index 0000000000..677ac023ec
--- /dev/null
+++ b/package/ccid/ccid.mk
@@ -0,0 +1,29 @@
+##########################################################
+#
+# CCID
+#
+# ########################################################
+CCID_VERSION = 1.4.7
+CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
+CCID_SITE = https://alioth.debian.org/frs/download.php/3730
+CCID_INSTALL_STAGING = YES
+CCID_DEPENDENCIES = pcsc-lite host-pkg-config libusb
+
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
+define CCID_INSTALL_UDEV_RULES
+	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
+		cp $(@D)/src/92_pcscd_ccid.rules $(TARGET_DIR)/etc/udev/rules.d/ ; \
+	fi;
+endef
+
+CCID_POST_INSTALL_TARGET_HOOKS += CCID_INSTALL_UDEV_RULES
+endif
+
+define CCID_REMOVE_UDEV_RULES
+	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
+		rm -f $(TARGET_DIR)/etc/udev/rules.d/92_pcscd_ccid.rules ; \
+	fi;
+endef
+CCID_POST_UNINSTALL_TARGET_HOOKS += CCID_REMOVE_UDEV_RULES
+
+$(eval $(autotools-package))

From 76b38f853d2683854bfedaccb3512fab110c5d49 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 20 Sep 2012 22:20:34 +0000
Subject: [PATCH 2960/6849] sconeserver: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |   1 +
 package/sconeserver/Config.in      |  88 ++++++++++++++++++++++
 package/sconeserver/sconeserver.mk | 116 +++++++++++++++++++++++++++++
 3 files changed, 205 insertions(+)
 create mode 100644 package/sconeserver/Config.in
 create mode 100644 package/sconeserver/sconeserver.mk

diff --git a/package/Config.in b/package/Config.in
index c91985c058..331d879384 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -609,6 +609,7 @@ source "package/rsh-redone/Config.in"
 source "package/rsync/Config.in"
 source "package/rtorrent/Config.in"
 source "package/samba/Config.in"
+source "package/sconeserver/Config.in"
 source "package/ser2net/Config.in"
 source "package/socat/Config.in"
 source "package/socketcand/Config.in"
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
new file mode 100644
index 0000000000..a7e5c75634
--- /dev/null
+++ b/package/sconeserver/Config.in
@@ -0,0 +1,88 @@
+menuconfig BR2_PACKAGE_SCONESERVER
+	bool "sconeserver"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_PCRE
+	help
+	  Sconeserver is a modular, object-orientated and extremely versatile
+	  network server framework for GNU/Linux and UNIX-like platforms.
+
+	  http://www.sconemad.com/sconeserver/
+
+if BR2_PACKAGE_SCONESERVER
+
+comment "Sconeserver modules"
+
+config BR2_PACKAGE_SCONESERVER_EXAMPLES
+	bool "examples"
+	help
+	  Example modules for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
+	bool "http::sconesite"
+	select BR2_PACKAGE_LIBXML2
+	help
+	  http::sconesite module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
+	bool "http::sconesite::image"
+	depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
+	select BR2_PACKAGE_IMAGEMAGICK
+	help
+	  http::sconesite::image module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_MYSQL
+	bool "mysql"
+	select BR2_PACKAGE_MYSQL_CLIENT
+	help
+	  MySQL module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_BLUETOOTH
+	bool "bluetooth"
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  Bluetooth module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_RSS
+	bool "rss"
+	select BR2_PACKAGE_LIBXML2
+	help
+	  RSS module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_LOCATION
+	bool "location"
+	select BR2_PACKAGE_GPSD
+	help
+	  Location module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_LETTUCE
+	bool "lettuce"
+	help
+	  Sconeserver module for Lettuce embedded automation platform
+
+	  http://www.sconemad.com/lettuce/
+
+config BR2_PACKAGE_SCONESERVER_MATHS
+	bool "maths"
+	select BR2_PACKAGE_MPFR
+	help
+	  Mathematics module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_TESTBUILDER
+	bool "testbuilder"
+	help
+	  Testbuilder module for Sconeserver
+
+config BR2_PACKAGE_SCONESERVER_UI
+	bool "ui"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  UI module for Sconeserver
+
+comment "ui module requires X.org"
+	depends on !BR2_PACKAGE_XORG7
+
+endif # BR2_PACKAGE_SCONESERVER
+
+comment "sconeserver requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
new file mode 100644
index 0000000000..2313cd2e69
--- /dev/null
+++ b/package/sconeserver/sconeserver.mk
@@ -0,0 +1,116 @@
+#############################################################
+#
+# sconeserver
+#
+#############################################################
+# Release 0.6.0 doesn't build cleanly, so use a recent
+# Subversion trunk snapshot.
+SCONESERVER_VERSION = 178
+SCONESERVER_SITE = \
+	https://sconeserver.svn.sourceforge.net/svnroot/sconeserver/trunk
+SCONESERVER_SITE_METHOD = svn
+
+SCONESERVER_LICENSE = GPLv2+
+SCONESERVER_LICENSE_FILES = COPYING
+
+SCONESERVER_DEPENDENCIES += pcre
+SCONESERVER_CONF_OPT += --with-ip --with-local
+
+SCONESERVER_CONF_OPT += CXXFLAGS="$(TARGET_CXXFLAGS) $(SCONESERVER_CXXFLAGS)"
+SCONESERVER_CONF_OPT += LDFLAGS="$(TARGET_LDFLAGS) $(SCONESERVER_LDFLAGS)"
+
+# Sconeserver configure script fails to find the libxml2 headers.
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+	SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/libxml2
+endif
+
+ifeq ($(BR2_INET_IPV6),y)
+	SCONESERVER_CONF_OPT += --with-ip6
+else
+	SCONESERVER_CONF_OPT += --without-ip6
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	SCONESERVER_DEPENDENCIES += openssl
+	SCONESERVER_CONF_OPT += --with-ssl
+else
+	SCONESERVER_CONF_OPT += --without-ssl
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y)
+	SCONESERVER_CONF_OPT += --with-examples
+else
+	SCONESERVER_CONF_OPT += --without-examples
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE),y)
+	SCONESERVER_DEPENDENCIES += libxml2
+	SCONESERVER_CONF_OPT += --with-sconesite
+else
+	SCONESERVER_CONF_OPT += --without-sconesite
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
+	SCONESERVER_DEPENDENCIES += imagemagick
+	SCONESERVER_CONF_OPT += --with-sconesite-image
+else
+	SCONESERVER_CONF_OPT += --without-sconesite-image
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
+	SCONESERVER_DEPENDENCIES += mysql_client
+	SCONESERVER_CONF_OPT += --with-mysql
+	SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/mysql
+	SCONESERVER_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql
+else
+	SCONESERVER_CONF_OPT += --without-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y)
+	SCONESERVER_DEPENDENCIES += bluez_utils
+	SCONESERVER_CONF_OPT += --with-bluetooth
+else
+	SCONESERVER_CONF_OPT += --without-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y)
+	SCONESERVER_DEPENDENCIES += libxml2
+	SCONESERVER_CONF_OPT += --with-rss
+else
+	SCONESERVER_CONF_OPT += --without-rss
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y)
+	SCONESERVER_DEPENDENCIES += gpsd
+	SCONESERVER_CONF_OPT += --with-location
+else
+	SCONESERVER_CONF_OPT += --without-location
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_LETTUCE),y)
+	SCONESERVER_CONF_OPT += --with-lettuce
+else
+	SCONESERVER_CONF_OPT += --without-lettuce
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y)
+	SCONESERVER_DEPENDENCIES += mpfr
+	SCONESERVER_CONF_OPT += --with-maths
+else
+	SCONESERVER_CONF_OPT += --without-maths
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y)
+	SCONESERVER_CONF_OPT += --with-testbuilder
+else
+	SCONESERVER_CONF_OPT += --without-testbuilder
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_UI),y)
+	SCONESERVER_DEPENDENCIES += xlib_libX11
+	SCONESERVER_CONF_OPT += --with-ui
+else
+	SCONESERVER_CONF_OPT += --without-ui
+endif
+
+$(eval $(autotools-package))

From 9cb9b7430fb99acfe11f4d23ac93dcb3a6dfed9f Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 21 Sep 2012 12:28:35 +0000
Subject: [PATCH 2961/6849] ttcp: convert to generic-package infrastructure

[Peter: minor fixes]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ttcp/ttcp.mk | 55 ++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 40 deletions(-)

diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index 080286bc6c..d8d03ec56d 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -4,47 +4,22 @@
 #
 #############################################################
 #
-TTCP_VERSION:=
-TTCP_SOURCE_URL=http://ftp.sunet.se/pub/network/monitoring/ttcp
-TTCP_SOURCE=ttcp$(TTCP_VERSION).c
-TTCP_DIR=$(BUILD_DIR)/ttcp$(TTCP_VERSION)
+TTCP_VERSION =
+TTCP_SITE    = http://ftp.sunet.se/pub/network/monitoring/ttcp
+TTCP_SOURCE  = ttcp.c
+TTCP_LICENSE = public domain
 
-$(DL_DIR)/$(TTCP_SOURCE):
-	 $(call DOWNLOAD,$(TTCP_SOURCE_URL)/$(TTCP_SOURCE))
+define TTCP_EXTRACT_CMDS
+	cp -f -t $(@D) $(DL_DIR)/$(TTCP_SOURCE)
+endef
 
-$(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE)
-	-mkdir $(TTCP_DIR)
-	cp -af $(DL_DIR)/$(TTCP_SOURCE) $(TTCP_DIR)
-	support/scripts/apply-patches.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch
-	touch $(TTCP_DIR)/.unpacked
+define TTCP_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) \
+		-o $(@D)/ttcp $(@D)/$(TTCP_SOURCE)
+endef
 
-$(TTCP_DIR)/.configured: $(TTCP_DIR)/.unpacked
-	touch $(TTCP_DIR)/.configured
+define TTCP_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/ttcp $(TARGET_DIR)/usr/bin/ttcp
+endef
 
-$(TTCP_DIR)/ttcp: $(TTCP_DIR)/.configured
-	$(TARGET_CC) -O2 -o $(TTCP_DIR)/ttcp $(TTCP_DIR)/$(TTCP_SOURCE)
-
-$(TARGET_DIR)/usr/bin/ttcp: $(TTCP_DIR)/ttcp
-	cp -af $(TTCP_DIR)/ttcp $(TARGET_DIR)/usr/bin/
-
-ttcp-legal-info:
-	@$(call legal-warning-pkg,ttcp,legal-info not yet implemented)
-
-ttcp: $(TARGET_DIR)/usr/bin/ttcp
-
-ttcp-source: $(DL_DIR)/$(TTCP_SOURCE)
-
-ttcp-clean:
-	rm -f $(TTCP_DIR)/*.o $(TTCP_DIR)/ttcp
-
-ttcp-dirclean:
-	rm -rf $(TTCP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_TTCP),y)
-TARGETS+=ttcp
-endif
+$(eval $(generic-package))

From 6a4b25408294c9c82d7c1e25cb16a7467e3d9088 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 21 Sep 2012 12:28:37 +0000
Subject: [PATCH 2962/6849] vpnc: convert to generic-package infrastructure

[Peter: minor fixes]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vpnc/vpnc-0.5.3-fix-build.patch | 71 +++++++++++++++++++++++++
 package/vpnc/vpnc.mk                    | 71 ++++++-------------------
 2 files changed, 88 insertions(+), 54 deletions(-)
 create mode 100644 package/vpnc/vpnc-0.5.3-fix-build.patch

diff --git a/package/vpnc/vpnc-0.5.3-fix-build.patch b/package/vpnc/vpnc-0.5.3-fix-build.patch
new file mode 100644
index 0000000000..e21348b4e3
--- /dev/null
+++ b/package/vpnc/vpnc-0.5.3-fix-build.patch
@@ -0,0 +1,71 @@
+Misc. Makefile cleanup and fix the VERSION definition.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+diff -purN vpnc-0.5.3.orig/Makefile vpnc-0.5.3/Makefile
+--- vpnc-0.5.3.orig/Makefile	2012-08-06 00:03:22.677914146 +0200
++++ vpnc-0.5.3/Makefile	2012-08-06 00:06:58.506744901 +0200
+@@ -19,21 +19,19 @@
+ #
+ # $Id: Makefile 312 2008-06-15 18:09:42Z Joerg Mayer $
+ 
+-DESTDIR=
+-PREFIX=/usr/local
+-ETCDIR=/etc/vpnc
+-BINDIR=$(PREFIX)/bin
+-SBINDIR=$(PREFIX)/sbin
+-MANDIR=$(PREFIX)/share/man
+-DOCDIR=$(PREFIX)/share/doc/vpnc
+-
+-SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
+-BINS = vpnc cisco-decrypt
+-OBJS = $(addsuffix .o,$(basename $(SRCS)))
++DESTDIR =
++PREFIX ?= /usr/local
++ETCDIR  = /etc/vpnc
++BINDIR  = $(PREFIX)/bin
++SBINDIR = $(PREFIX)/sbin
++MANDIR  = $(PREFIX)/share/man
++DOCDIR  = $(PREFIX)/share/doc/vpnc
++
++SRCS    = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
++BINS    = vpnc cisco-decrypt
++OBJS    = $(addsuffix .o,$(basename $(SRCS)))
+ BINOBJS = $(addsuffix .o,$(BINS))
+ BINSRCS = $(addsuffix .c,$(BINS))
+-VERSION := $(shell sh mk-version)
+-RELEASE_VERSION := $(shell cat VERSION)
+ 
+ # The license of vpnc (Gpl >= 2) is quite likely incompatible with the
+ # openssl license. Openssl is currently used to provide certificate
+@@ -50,13 +48,13 @@ RELEASE_VERSION := $(shell cat VERSION)
+ #OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION
+ #OPENSSLLIBS = -lcrypto
+ 
+-CC=gcc
+-CFLAGS ?= -O3 -g
+-CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
+-CFLAGS +=  $(shell libgcrypt-config --cflags)
+-CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
+-LDFLAGS ?= -g
+-LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
++CC       ?= gcc
++CFLAGS   ?= -O3 -g
++CFLAGS   += -W -Wall -Wmissing-declarations -Wwrite-strings
++CFLAGS   += $(shell libgcrypt-config --cflags)
++CPPFLAGS += $(OPENSSL_GPL_VIOLATION)
++LDFLAGS  ?= -g
++LDFLAGS  += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
+ 
+ ifeq ($(shell uname -s), SunOS)
+ LDFLAGS += -lnsl -lresolv -lsocket
+@@ -84,7 +82,7 @@ cisco-decrypt : cisco-decrypt.o decrypt-
+ 	$(CC) -o $@ $^ $(LDFLAGS)
+ 
+ .depend: $(SRCS) $(BINSRCS)
+-	$(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@
++	$(CC) -MM $(SRCS) $(BINSRCS) $(CPPFLAGS) $(CFLAGS) > $@
+ 
+ vpnc-debug.c vpnc-debug.h : isakmp.h enum2debug.pl
+ 	LC_ALL=C perl -w ./enum2debug.pl isakmp.h >vpnc-debug.c 2>vpnc-debug.h
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index f585dc42cd..8d03300485 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -4,62 +4,25 @@
 #
 #############################################################
 
-VPNC_VERSION=0.5.3
-VPNC_SOURCE=vpnc-$(VPNC_VERSION).tar.gz
-VPNC_SITE=http://www.unix-ag.uni-kl.de/~massar/vpnc
-VPNC_DIR=$(BUILD_DIR)/vpnc-$(VPNC_VERSION)
-VPNC_CAT:=$(ZCAT)
-VPNC_BINARY:=$(VPNC_DIR)/vpnc
-VPNC_DEST_DIR:=$(TARGET_DIR)/usr/local/sbin
-VPNC_TARGET_BINARY:=$(VPNC_DEST_DIR)/vpnc
-VPNC_TARGET_SCRIPT:=$(TARGET_DIR)/etc/vpnc/default.conf
+VPNC_VERSION       = 0.5.3
+VPNC_SITE          = http://www.unix-ag.uni-kl.de/~massar/vpnc
+VPNC_LICENSE       = GPLv2+
+VPNC_LICENSE_FILES = COPYING
 
-$(DL_DIR)/$(VPNC_SOURCE):
-	$(call DOWNLOAD,$(VPNC_SITE)/$(VPNC_SOURCE))
+VPNC_DEPENDENCIES  = libgcrypt libgpg-error
 
-$(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
-	$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	support/scripts/apply-patches.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
-	touch $@
+VPNC_LDFLAGS  = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
+VPNC_CPPFLAGS = -DVERSION=\\\"$(VPNC_VERSION)\\\"
 
-$(VPNC_BINARY): $(VPNC_DIR)/.unpacked
-	rm -f $@
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS+=-lgcrypt LDFLAGS+=-lgpg-error LDFLAGS+="$(TARGET_CFLAGS)" \
-		CC="$(TARGET_CC)" -C $(VPNC_DIR)
+define VPNC_BUILD_CMDS
+	$(MAKE)	-C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		CPPFLAGS="$(VPNC_CPPFLAGS)" LDFLAGS="$(VPNC_LDFLAGS)"
+endef
 
-$(VPNC_TARGET_BINARY): $(VPNC_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		DESTDIR=$(TARGET_DIR) \
-		BINDIR=/usr/local/bin \
-		SBINDIR=/usr/local/sbin \
-		ETCDIR=/etc/vpnc \
-		MANDIR=/usr/share/man \
-		VERSION=$(VPNC_VERSION) \
-		INCLUDE=$(STAGING_DIR)/usr/include \
-		LDFLAGS="-lgcrypt -lgpg-error $(TARGET_CFLAGS)" \
-		-C $(VPNC_DIR) install
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
+define VPNC_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) \
+		CPPFLAGS="$(VPNC_CPPFLAGS)" LDFLAGS="$(VPNC_LDFLAGS)" \
+		DESTDIR="$(TARGET_DIR)" PREFIX=/usr
+endef
 
-vpnc-legal-info:
-	@$(call legal-warning-pkg,vpnc,legal-info not yet implemented)
-
-vpnc: libgcrypt $(VPNC_TARGET_BINARY)
-
-vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
-
-vpnc-clean:
-	-$(MAKE) -C $(VPNC_DIR) clean
-	rm -f $(STAGING_DIR)/usr/bin/vpnc
-
-vpnc-dirclean:
-	rm -rf $(VPNC_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_VPNC),y)
-TARGETS+=vpnc
-endif
+$(eval $(generic-package))

From 9288d4ba71c5bb2033188c694fba55ada212866d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 21 Sep 2012 12:28:33 +0000
Subject: [PATCH 2963/6849] netkitbase: convert to the generic-package
 infrastructure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netkitbase/netkitbase.mk | 79 +++++++++-----------------------
 1 file changed, 21 insertions(+), 58 deletions(-)

diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 56480fc263..3899b78ab7 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -3,69 +3,32 @@
 # netkitbase
 #
 #############################################################
-NETKITBASE_VERSION:=0.17
-NETKITBASE_SOURCE:=netkit-base-$(NETKITBASE_VERSION).tar.gz
-NETKITBASE_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-NETKITBASE_DIR:=$(BUILD_DIR)/netkit-base-$(NETKITBASE_VERSION)
-NETKITBASE_CAT:=$(ZCAT)
-NETKITBASE_BINARY:=inetd/inetd
-NETKITBASE_TARGET_BINARY:=usr/sbin/inetd
+NETKITBASE_VERSION = 0.17
+NETKITBASE_SOURCE  = netkit-base-$(NETKITBASE_VERSION).tar.gz
+NETKITBASE_SITE    = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+NETKITBASE_LICENSE = BSD-4c
 
-$(DL_DIR)/$(NETKITBASE_SOURCE):
-	 $(call DOWNLOAD,$(NETKITBASE_SITE)/$(NETKITBASE_SOURCE))
-
-netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE)
-
-$(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
-	$(NETKITBASE_CAT) $(DL_DIR)/$(NETKITBASE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+define NETKITBASE_CONFIGURE_CMDS
 	# use ANSI syntax
 	$(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure
 	# don't try to run cross compiled binaries while configuring things
 	$(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
-	support/scripts/apply-patches.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch
-	touch $(NETKITBASE_DIR)/.unpacked
-
-$(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked
-	(cd $(NETKITBASE_DIR); rm -f config.cache; \
-	 PATH=$(TARGET_PATH) CC="$(TARGET_CC)" \
-	./configure --installroot=$(TARGET_DIR) --with-c-compiler="$(TARGET_CC)" \
-	)
-	touch $(NETKITBASE_DIR)/.configured
-
-$(NETKITBASE_DIR)/$(NETKITBASE_BINARY): $(NETKITBASE_DIR)/.configured
-	$(MAKE) CC="$(TARGET_CC)" -C $(NETKITBASE_DIR)
-	$(STRIPCMD) $(NETKITBASE_DIR)/$(NETKITBASE_BINARY)
-
-$(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY)
-	# Only install a few selected items...
-	mkdir -p $(TARGET_DIR)/usr/sbin
-	cp $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
-	@if [ ! -f $(TARGET_DIR)/etc/inetd.conf ]; then \
-		mkdir -p $(TARGET_DIR)/etc; \
-		cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/; \
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure \
+		--installroot=$(TARGET_DIR))
+endef
+
+define NETKITBASE_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define NETKITBASE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/inetd/inetd $(TARGET_DIR)/usr/sbin/inetd
+	if [ ! -f $(TARGET_DIR)/etc/inetd.conf ]; then \
+		$(INSTALL) -D -m 0644 $(@D)/etc.sample/inetd.conf $(TARGET_DIR)/etc/inetd.conf; \
 		$(SED) "s/^\([a-z]\)/#\1/;" $(TARGET_DIR)/etc/inetd.conf; \
 	fi
-	touch -c $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
-
-netkitbase-legal-info:
-	@$(call legal-warning-pkg,netkitbase,legal-info not yet implemented)
-
-netkitbase: $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
+endef
 
-netkitbase-clean:
-	#$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETKITBASE_DIR) uninstall
-	-rm -f $(TARGET_DIR)/usr/sbin/inetd $(TARGET_DIR)/etc/inetd.conf
-	-rm -f $(TARGET_DIR)/etc/inetd.conf
-	-$(MAKE) -C $(NETKITBASE_DIR) clean
-
-netkitbase-dirclean:
-	rm -rf $(NETKITBASE_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NETKITBASE),y)
-TARGETS+=netkitbase
-endif
+$(eval $(generic-package))

From d3501735f64414eea0e29d59aaa6f2f8ce5395eb Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 21 Sep 2012 12:28:34 +0000
Subject: [PATCH 2964/6849] netkittelnet: convert to generic-package
 infrastructure

[Peter: add netkitbase dependency]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netkittelnet/netkittelnet.mk    | 82 +++++++------------------
 package/netkittelnet/netkittelnet.patch |  2 +-
 2 files changed, 23 insertions(+), 61 deletions(-)

diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index 43ba32406e..7bcfaf8c3c 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -3,69 +3,31 @@
 # netkittelnet
 #
 #############################################################
-NETKITTELNET_VERSION:=0.17
-NETKITTELNET_SOURCE:=netkit-telnet-$(NETKITTELNET_VERSION).tar.gz
-NETKITTELNET_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-$(NETKITTELNET_VERSION)
-NETKITTELNET_CAT:=$(ZCAT)
-NETKITTELNET_BINARY:=telnetd/telnetd
-NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd
+NETKITTELNET_VERSION = 0.17
+NETKITTELNET_SOURCE  = netkit-telnet-$(NETKITTELNET_VERSION).tar.gz
+NETKITTELNET_SITE    = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+NETKITTELNET_LICENSE = BSD-4c
+NETKITTELNET_DEPENDENCIES = netkitbase
 
-$(DL_DIR)/$(NETKITTELNET_SOURCE):
-	 $(call DOWNLOAD,$(NETKITTELNET_SITE)/$(NETKITTELNET_SOURCE))
-
-netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE)
-
-$(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
-	$(NETKITTELNET_CAT) $(DL_DIR)/$(NETKITTELNET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+define NETKITTELNET_CONFIGURE_CMDS
 	# use ANSI syntax
-	$(SED) "s/main()/main(void)/;" $(NETKITTELNET_DIR)/configure
+	$(SED) "s/main()/main(void)/;" $(@D)/configure
 	# Disable termcap support
-	$(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
-	# don't try to run cross compiled binaries while configuring things
-	support/scripts/apply-patches.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch
-	touch $(NETKITTELNET_DIR)/.unpacked
-
-$(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked
-	(cd $(NETKITTELNET_DIR); rm -f config.cache; \
-	 PATH=$(TARGET_PATH) CC="$(TARGET_CC)" \
-	./configure --installroot=$(TARGET_DIR) --with-c-compiler="$(TARGET_CC)" \
-	)
-	touch $(NETKITTELNET_DIR)/.configured
-
-$(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured
-	$(MAKE) SUB=telnetd CC="$(TARGET_CC)" -C $(NETKITTELNET_DIR)
-	$(STRIPCMD) $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY)
-
-$(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY)
-	# Only install a few selected items...
-	mkdir -p $(TARGET_DIR)/usr/sbin
-	rm -f $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
-	cp $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
+	$(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(@D)/telnetd/telnetd.c
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure \
+		--installroot=$(TARGET_DIR))
+endef
+
+define NETKITTELNET_BUILD_CMDS
+	$(MAKE) SUB=telnetd -C $(@D)
+endef
+
+define NETKITTELNET_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/telnetd/telnetd $(TARGET_DIR)/usr/sbin/telnetd
 	# Enable telnet in inetd
 	$(SED) "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf
-	#$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETKITTELNET_DIR) install
-	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-	# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-
-netkittelnet-legal-info:
-	@$(call legal-warning-pkg,netkittelnet,legal-info not yet implemented)
-
-netkittelnet: netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
+endef
 
-netkittelnet-clean:
-	#$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETKITTELNET_DIR) uninstall
-	-rm -f $(TARGET_DIR)/usr/sbin/telnetd
-	-$(MAKE) -C $(NETKITTELNET_DIR) clean
-
-netkittelnet-dirclean:
-	rm -rf $(NETKITTELNET_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NETKITTELNET),y)
-TARGETS+=netkittelnet
-endif
+$(eval $(generic-package))
diff --git a/package/netkittelnet/netkittelnet.patch b/package/netkittelnet/netkittelnet.patch
index c894c2abd8..863bbcd919 100644
--- a/package/netkittelnet/netkittelnet.patch
+++ b/package/netkittelnet/netkittelnet.patch
@@ -66,7 +66,7 @@
 -cat <<EOF >__conftest.cc
 -#include <stdio.h>
 -#include <termcap.h>
--int main(void) {
+-int main() {
 -    tgetent(NULL, NULL); return 0;
 -}
 -

From eaef48367e24724da6533b3b78978cf9f0da19d7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 9 Oct 2012 09:36:35 +0200
Subject: [PATCH 2965/6849] netkittelnet: fix build on toolchains without C++
 support

The configure script checks for C++ support as telnet (but not telnetd)
contains C++ code. This used to work by accident if the host had g++,
as we didn't pass TARGET_CONFIGURE_OPTS to configure (which sets CXX to
/bin/false).

Fix it by removing the g++ check and rewriting the configure checks to
use the C compiler instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netkittelnet/netkittelnet.mk    |  2 ++
 package/netkittelnet/netkittelnet.patch | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index 7bcfaf8c3c..a0f2786016 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -14,6 +14,8 @@ define NETKITTELNET_CONFIGURE_CMDS
 	$(SED) "s/main()/main(void)/;" $(@D)/configure
 	# Disable termcap support
 	$(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(@D)/telnetd/telnetd.c
+	# C++ support not needed for telnetd
+	$(SED) 's/CXX/CC/g' -e 's/conftest.cc/conftest.c/g' $(@D)/configure
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS) \
 		./configure \
diff --git a/package/netkittelnet/netkittelnet.patch b/package/netkittelnet/netkittelnet.patch
index 863bbcd919..ee4f37ee49 100644
--- a/package/netkittelnet/netkittelnet.patch
+++ b/package/netkittelnet/netkittelnet.patch
@@ -24,14 +24,25 @@
         ) >/dev/null 2>&1 || continue;
         CXX=$TRY
         break;
-@@ -141,7 +138,6 @@
-     echo -n 'Checking if C++ compiler works... '
-     if (
-           $CXX __conftest.cc -o __conftest || exit 1
+@@ -138,18 +135,5 @@
+     fi
+     echo "$CXX"
+-else
+-    echo -n 'Checking if C++ compiler works... '
+-    if (
+-          $CXX __conftest.cc -o __conftest || exit 1
 -          ./__conftest || exit 1
-        ) >/dev/null 2>&1; then
-          echo 'yes'
-      else
+-       ) >/dev/null 2>&1; then
+-         echo 'yes'
+-     else
+-         echo 'no'
+-         echo 'Compiler '"$CXX"' does not exist or cannot compile C++; try another.'
+-         rm -f __conftest*
+-         exit
+-     fi
+ fi
+ 
+ echo -n "Checking if $CXX accepts gcc warnings... "
 @@ -278,13 +274,11 @@
  EOF
  if (

From 805ba041c02e2eccfdc86cc43ef30c3c3240fc72 Mon Sep 17 00:00:00 2001
From: Simon Dawson <simond@trainfx.com>
Date: Mon, 27 Aug 2012 21:19:47 +0000
Subject: [PATCH 2966/6849] barebox: fix license information

The barebox license should be "GPLv2 with exceptions", and not GPLv2.

Signed-off-by: Simon Dawson <simond@trainfx.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 9550cdcfc6..ee84831c6c 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -20,7 +20,7 @@ BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 endif
 
-BAREBOX_LICENSE = GPLv2
+BAREBOX_LICENSE = GPLv2 with exceptions
 BAREBOX_LICENSE_FILES = COPYING
 
 ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)

From 1e6fb81dd6a848f48e259fc6335a811b0801971f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 9 Oct 2012 11:44:43 +0200
Subject: [PATCH 2967/6849] barebox: add 2012.10, remove 2012.06

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 172b540f77..bd70e58b81 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_09
+	default BR2_TARGET_BAREBOX_2012_10
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_06
-	bool "2012.06"
-
 config BR2_TARGET_BAREBOX_2012_07
 	bool "2012.07"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2012_08
 config BR2_TARGET_BAREBOX_2012_09
 	bool "2012.09"
 
+config BR2_TARGET_BAREBOX_2012_10
+	bool "2012.10"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.06.0"	if BR2_TARGET_BAREBOX_2012_06
 	default "2012.07.0"	if BR2_TARGET_BAREBOX_2012_07
 	default "2012.08.0"	if BR2_TARGET_BAREBOX_2012_08
 	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
+	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 2737d9edf860fb429305859430d7a419366807e0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 8 Oct 2012 12:01:03 +0000
Subject: [PATCH 2968/6849] libcurl: bump to version 7.27.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 090bb4c409..8d8fdb408c 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBCURL_VERSION = 7.25.0
+LIBCURL_VERSION = 7.27.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_LICENSE = ICS

From 902b1ddd151aa64637c80f120f4db5af0ee3fc0c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 8 Oct 2012 12:01:04 +0000
Subject: [PATCH 2969/6849] ethtool: bump to version 3.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 30d0a47649..a336b523f3 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.5
+ETHTOOL_VERSION = 3.6
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
 ETHTOOL_LICENSE_FILE = COPYING

From 7d9dfd817012090bb2753c7a3dee94ff1d2e0027 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 8 Oct 2012 12:01:05 +0000
Subject: [PATCH 2970/6849] patch: bump to version 2.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/patch/patch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index 346aabd60d..badc4310bf 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PATCH_VERSION = 2.7
+PATCH_VERSION = 2.7.1
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
 PATCH_LICENSE = GPLv3+
 PATCH_LICENSE_FILE = COPYING

From bbfa50f3ead1f19e4d0bb9dcb7364d58225be139 Mon Sep 17 00:00:00 2001
From: Ludovic Desroches <ludovic.desroches@atmel.com>
Date: Tue, 9 Oct 2012 05:53:27 +0000
Subject: [PATCH 2971/6849] fb-test-app: new package

Test suite for Linux framebuffer.

[Peter: add patch to build with our TARGET_CFLAGS]
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/fb-test-app/Config.in                 |  6 ++++
 .../fb-test-app-override-cflags.patch         | 35 +++++++++++++++++++
 package/fb-test-app/fb-test-app.mk            | 34 ++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 package/fb-test-app/Config.in
 create mode 100644 package/fb-test-app/fb-test-app-override-cflags.patch
 create mode 100644 package/fb-test-app/fb-test-app.mk

diff --git a/package/Config.in b/package/Config.in
index 331d879384..fc6a26a41f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -118,6 +118,7 @@ source "package/fbset/Config.in"
 endif
 source "package/fbterm/Config.in"
 source "package/fbv/Config.in"
+source "package/fb-test-app/Config.in"
 source "package/imagemagick/Config.in"
 source "package/linux-fusion/Config.in"
 source "package/lite/Config.in"
diff --git a/package/fb-test-app/Config.in b/package/fb-test-app/Config.in
new file mode 100644
index 0000000000..23b5568d80
--- /dev/null
+++ b/package/fb-test-app/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_FB_TEST_APP
+	bool "fb-test-app"
+	help
+	  Test suite for Linux framebuffer.
+
+	  https://github.com/prpplague/fb-test-app
diff --git a/package/fb-test-app/fb-test-app-override-cflags.patch b/package/fb-test-app/fb-test-app-override-cflags.patch
new file mode 100644
index 0000000000..550ca6ed8a
--- /dev/null
+++ b/package/fb-test-app/fb-test-app-override-cflags.patch
@@ -0,0 +1,35 @@
+From deb5143e8e4580d7767de59a2e983dda262b0669 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Wed, 10 Oct 2012 14:38:13 +0200
+Subject: [PATCH] allow custom CFLAGS to passed on the make command line
+
+Ensure the required CFLAGS are appended to what is provided on the
+command line.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 057d539..c3102ea 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,10 +11,10 @@ else
+ 	CFLAGS=-O2 -Wall
+ endif
+ 
+-CFLAGS += -DVERSION=$(VERSION)
+-CFLAGS += -DPATCHLEVEL=$(PATCHLEVEL)
+-CFLAGS += -DSUBLEVEL=$(SUBLEVEL)
+-CFLAGS += -DVERSION_NAME=\"$(NAME)\"
++override CFLAGS += -DVERSION=$(VERSION)
++override CFLAGS += -DPATCHLEVEL=$(PATCHLEVEL)
++override CFLAGS += -DSUBLEVEL=$(SUBLEVEL)
++override CFLAGS += -DVERSION_NAME=\"$(NAME)\"
+ 
+ PROGS=perf rect fb-test offset
+ 
+-- 
+1.7.10.4
+
diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk
new file mode 100644
index 0000000000..35e210bd91
--- /dev/null
+++ b/package/fb-test-app/fb-test-app.mk
@@ -0,0 +1,34 @@
+#############################################################
+#
+# fb-test-app
+#
+#############################################################
+
+FB_TEST_APP_VERSION = v1.0.0
+FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
+FB_TEST_APP_LICENSE = GPLv2
+FB_TEST_APP_LICENSE_FILE = COPYING
+
+define FB_TEST_APP_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+endef
+
+define FB_TEST_APP_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/perf $(TARGET_DIR)/usr/bin/fb-test-perf
+	$(INSTALL) -D -m 0755 $(@D)/rect $(TARGET_DIR)/usr/bin/fb-test-rect
+	$(INSTALL) -D -m 0755 $(@D)/fb-test $(TARGET_DIR)/usr/bin/fb-test
+	$(INSTALL) -D -m 0755 $(@D)/offset $(TARGET_DIR)/usr/bin/fb-test-offset
+endef
+
+define FB_TEST_APP_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/fb-test-perf
+	rm -f $(TARGET_DIR)/usr/bin/fb-test-rect
+	rm -f $(TARGET_DIR)/usr/bin/fb-test
+	rm -f $(TARGET_DIR)/usr/bin/fb-test-offset
+endef
+
+define FB_TEST_APP_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 72eb8290d25b98dea2f084451589da69f319e012 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 10 Oct 2012 14:49:39 +0200
Subject: [PATCH 2972/6849] package: use http:// for alioth.debian.org URLs

Fixes http://autobuild.buildroot.net/results/183a1be6ab1137c90dca0201d4bc72c7c0e659a3

alioth.debian.org uses a SSL certificate signed by spi-inc.org, which isn't
a trusted CA on non-Debian systems, causing wget to refuse download.

Fix it by using http URLs instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccid/ccid.mk           | 2 +-
 package/pcsc-lite/pcsc-lite.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 677ac023ec..d1ebf8c3a0 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -5,7 +5,7 @@
 # ########################################################
 CCID_VERSION = 1.4.7
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
-CCID_SITE = https://alioth.debian.org/frs/download.php/3730
+CCID_SITE = http://alioth.debian.org/frs/download.php/3730
 CCID_INSTALL_STAGING = YES
 CCID_DEPENDENCIES = pcsc-lite host-pkg-config libusb
 
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 6c57dbbcee..49eeec78d3 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -5,7 +5,7 @@
 # ########################################################
 PCSC_LITE_VERSION = 1.8.6
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
-PCSC_LITE_SITE = https://alioth.debian.org/frs/download.php/3757
+PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/3757
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkg-config
 

From 62381c94c7db632a2043b9ebd8c943403af2297d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Oct 2012 04:25:06 +0000
Subject: [PATCH 2973/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 534317e62b..f111c11fbb 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -69,7 +69,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.45"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.30"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.31"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.13"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.6"		if BR2_KERNEL_HEADERS_3_5

From bdac1ad29ae4e384e2af88b7b485064337bf37f4 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 25 Jul 2012 17:40:46 +0000
Subject: [PATCH 2974/6849] Makefile.in: add CPPFLAGS support

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 30a542a653..c04298441c 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -85,14 +85,16 @@ ifeq ($(BR2_DEBUG_3),y)
 TARGET_DEBUGGING=-g3
 endif
 
-TARGET_CFLAGS=$(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
+TARGET_CPPFLAGS =
 
 ifeq ($(BR2_LARGEFILE),y)
-TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-TARGET_CXXFLAGS=$(TARGET_CFLAGS)
-TARGET_LDFLAGS=$(call qstrip,$(BR2_TARGET_LDFLAGS))
+TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
+
+TARGET_CXXFLAGS  = $(TARGET_CFLAGS)
+TARGET_LDFLAGS   = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
@@ -149,9 +151,10 @@ FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)
 SED:=$(shell which sed || type -p sed) -i -e
 
+HOST_CPPFLAGS  = -I$(HOST_DIR)/usr/include
 HOST_CFLAGS   ?= -O2
-HOST_CFLAGS   += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
-HOST_CXXFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
+HOST_CFLAGS   += $(HOST_CPPFLAGS)
+HOST_CXXFLAGS += $(HOST_CFLAGS)
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
 HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
 
@@ -180,12 +183,14 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		CXX_FOR_BUILD="$(HOSTCXX)" \
 		FC_FOR_BUILD="$(HOSTFC)" \
 		LD_FOR_BUILD="$(HOSTLD)" \
+		CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 		FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
 		DEFAULT_ASSEMBLER="$(TARGET_AS)" \
 		DEFAULT_LINKER="$(TARGET_LD)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CXXFLAGS="$(TARGET_CXXFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -206,6 +211,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		GCC="$(HOSTCC)" \
 		CXX="$(HOSTCXX)" \
 		CPP="$(HOSTCPP)" \
+		CPPFLAGS="$(HOST_CPPFLAGS)" \
 		CFLAGS="$(HOST_CFLAGS)" \
 		CXXFLAGS="$(HOST_CXXFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \

From 635722372249eef15763f4293bc9816e75724ca1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Oct 2012 09:01:10 +0200
Subject: [PATCH 2975/6849] package/Makefile.in: whitespace fixup after
 CPPFLAGS addition

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index c04298441c..45213c12c3 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -92,9 +92,8 @@ TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS
 endif
 
 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
-
-TARGET_CXXFLAGS  = $(TARGET_CFLAGS)
-TARGET_LDFLAGS   = $(call qstrip,$(BR2_TARGET_LDFLAGS))
+TARGET_CXXFLAGS = $(TARGET_CFLAGS)
+TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-

From 526badc945d797f38a647441e418e8a8ae9d43ea Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Oct 2012 09:01:39 +0200
Subject: [PATCH 2976/6849] sudo: ensure proper CPPFLAGS are used for
 host/compat build

Fixes http://autobuild.buildroot.net/results/ea326401a6711aaac10696629655e6d5ac4e0a90

sudo internally uses CPPFLAGS, so host/compat build now breaks after
CPPFLAGS got added to HOST_CONFIGURE_OPTS.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 71dacecb7b..e6b554c498 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -18,7 +18,9 @@ SUDO_CONF_OPT = \
 
 # mksigname/mksiglist needs to run on build host to generate source files
 define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
-	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/compat mksigname mksiglist
+	$(MAKE) $(HOST_CONFIGURE_OPTS) \
+		CPPFLAGS="$(HOST_CPPFLAGS) -I../include -I.." \
+		-C $(@D)/compat mksigname mksiglist
 endef
 
 SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST

From d059b1cc61dcafde47723c45b834409026a39dbe Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Oct 2012 10:29:06 +0200
Subject: [PATCH 2977/6849] libv4l: fixup after CPPFLAGS addition

Fixes http://autobuild.buildroot.net/results/4602f7cf4407a2969a04267bbc5d276b076a7c91

The preload libraries needs to wrap both the lfs and !lfs variants, so
ensure the lfs versions are not transparently used (as they are when
_LARGEFILE_SOURCE / _FILE_OFFSET_BITS=64 are defined).

This used to work by accident before, as our custom CFLAGS (containing those
defines) wasn't used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/libv4l-largefile.patch | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/libv4l/libv4l-largefile.patch

diff --git a/package/libv4l/libv4l-largefile.patch b/package/libv4l/libv4l-largefile.patch
new file mode 100644
index 0000000000..9df8652adc
--- /dev/null
+++ b/package/libv4l/libv4l-largefile.patch
@@ -0,0 +1,39 @@
+[PATCH] fixup lfs mismatch in preload libraries
+
+Ensure that the lfs variants are not transparently used instead of the !lfs
+ones so both can be wrapped, independently of any custom CFLAGS/CPPFLAGS.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ lib/libv4l1/v4l1compat.c  |    3 +++
+ lib/libv4l2/v4l2convert.c |    3 +++
+ 2 files changed, 6 insertions(+)
+
+Index: v4l-utils-0.8.5/lib/libv4l1/v4l1compat.c
+===================================================================
+--- v4l-utils-0.8.5.orig/lib/libv4l1/v4l1compat.c
++++ v4l-utils-0.8.5/lib/libv4l1/v4l1compat.c
+@@ -19,6 +19,9 @@
+ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
+  */
+ 
++/* ensure we see *64 variants and they aren't transparently used */
++#undef _LARGEFILE_SOURCE
++#undef _FILE_OFFSET_BITS
+ #define _LARGEFILE64_SOURCE 1
+ 
+ #include <stdlib.h>
+Index: v4l-utils-0.8.5/lib/libv4l2/v4l2convert.c
+===================================================================
+--- v4l-utils-0.8.5.orig/lib/libv4l2/v4l2convert.c
++++ v4l-utils-0.8.5/lib/libv4l2/v4l2convert.c
+@@ -20,6 +20,9 @@
+ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
+ */
+ 
++/* ensure we see *64 variants and they aren't transparently used */
++#undef _LARGEFILE_SOURCE
++#undef _FILE_OFFSET_BITS
+ #define _LARGEFILE64_SOURCE 1
+ 
+ #include <stdarg.h>

From c69b809fc12e071225430a7fb627c785cdaa3fc7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Oct 2012 10:37:29 +0200
Subject: [PATCH 2978/6849] libv4l: ensure TARGET_CFLAGS are used

Now that the lfs handling issues have been worked around, we can
pass TARGET_CONFIGURE_OPTS on the make command line to ensure
TARGET_CFLAGS are used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/libv4l.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index a793285ad3..21cdb6de2d 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -23,19 +23,19 @@ endif
 
 define LIBV4L_BUILD_CMDS
 	for i in $(LIBV4L_DIRS_y); do \
-		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$$i \
+		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
 			$(LIBV4L_MAKE_OPTS); done
 endef
 
 define LIBV4L_INSTALL_STAGING_CMDS
 	for i in $(LIBV4L_DIRS_y); do \
-		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$$i \
+		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
 			DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install; done
 endef
 
 define LIBV4L_INSTALL_TARGET_CMDS
 	for i in $(LIBV4L_DIRS_y); do \
-		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$$i \
+		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
 			DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install; done
 endef
 

From 387c5e2e6ba6aa7d626be868dfa3a29fd7f06ac9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Oct 2012 10:39:20 +0200
Subject: [PATCH 2979/6849] libv4l: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/libv4l.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 21cdb6de2d..6c782b08e9 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -3,7 +3,7 @@
 # libv4l
 #
 #############################################################
-LIBV4L_VERSION = 0.8.5
+LIBV4L_VERSION = 0.8.9
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils/
 LIBV4L_INSTALL_STAGING = YES

From 6e280b75341cd616970ce5559a7725201f6c0c53 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Oct 2012 15:35:27 +0200
Subject: [PATCH 2980/6849] mtd: fixup after CPPFLAGS addition

Fixes http://autobuild.buildroot.net/results/c55e4c9741109c66f8f66ab7e3f4f1664826056a

mtd appends to CFLAGS/CPPFLAGS, but doesn't use override - So we need
to pass flags in the environment and not on the make command line to
get the combination of our flags and mtd's.

At the same time cleanup the host build to use a similar form
(HOST_CONFIGURE_OPTS) as target build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/mtd.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 7e3a9b8866..aef478f8df 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -20,9 +20,8 @@ endif
 HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
 
 define HOST_MTD_BUILD_CMDS
-	CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
-		CROSS= $(MAKE1) BUILDDIR=$(@D) \
-		WITHOUT_XATTR=1 -C $(@D)
+	$(HOST_CONFIGURE_OPTS) $(MAKE1) \
+		CROSS= BUILDDIR=$(@D) WITHOUT_XATTR=1 -C $(@D)
 endef
 
 define HOST_MTD_INSTALL_CMDS
@@ -75,7 +74,7 @@ MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
 ifneq ($(MTD_TARGETS_y),)
 
 define MTD_BUILD_CMDS
-	$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \
 		BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \
 		$(addprefix $(@D)/,$(MTD_TARGETS_y))
 endef

From dfaf64fe5a1d6346708c3cc94171a4a500f0b236 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 10 Oct 2012 23:28:05 +0000
Subject: [PATCH 2981/6849] googlefontdirectory: new package

Note that the Google code project does not provide an archive containing
just the font files. This package uses the third party archive provided at

  http://joemaller.com/1856/download-google-fonts/

Further information is available at the following URL.

  http://code.google.com/p/googlefontdirectory/issues/detail?id=2

[Peter: drop version, fix install and simplify uninstall]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/googlefontdirectory/Config.in         | 13 +++++++++
 .../googlefontdirectory.mk                    | 27 +++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/googlefontdirectory/Config.in
 create mode 100644 package/googlefontdirectory/googlefontdirectory.mk

diff --git a/package/Config.in b/package/Config.in
index fc6a26a41f..c56f438bd6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -519,6 +519,7 @@ endmenu
 menu "Miscellaneous"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
+source "package/googlefontdirectory/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
 source "package/sound-theme-borealis/Config.in"
diff --git a/package/googlefontdirectory/Config.in b/package/googlefontdirectory/Config.in
new file mode 100644
index 0000000000..872fe2739d
--- /dev/null
+++ b/package/googlefontdirectory/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_GOOGLEFONTDIRECTORY
+	bool "Google font directory"
+	help
+	  Google font directory
+
+	  http://code.google.com/p/googlefontdirectory/
+
+config BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS
+	string "List of fonts to install"
+	default "droid"
+	depends on BR2_PACKAGE_GOOGLEFONTDIRECTORY
+	help
+	  Specify a space-separated list of fonts to install
diff --git a/package/googlefontdirectory/googlefontdirectory.mk b/package/googlefontdirectory/googlefontdirectory.mk
new file mode 100644
index 0000000000..ddc832afee
--- /dev/null
+++ b/package/googlefontdirectory/googlefontdirectory.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# googlefontdirectory
+#
+#############################################################
+
+GOOGLEFONTDIRECTORY_SITE = \
+	https://s3.amazonaws.com/joemaller_google_webfonts
+GOOGLEFONTDIRECTORY_SOURCE = googlewebfonts.tgz
+GOOGLEFONTDIRECTORY_LICENSE = OFLv1.1
+
+GOOGLEFONTDIRECTORY_FONTS = \
+	$(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS))
+
+define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS
+	for i in $(GOOGLEFONTDIRECTORY_FONTS); \
+	do \
+		$(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/$$i && \
+		$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$$i $(@D)/$$i/*.ttf; \
+	done
+endef
+
+define GOOGLEFONTDIRECTORY_UNINSTALL_TARGET_CMDS
+	rm -rf $(addprefix $(TARGET_DIR)/usr/share/fonts/,$(GOOGLEFONTDIRECTORY_FONTS))
+endef
+
+$(eval $(generic-package))

From f9d2bcd142e7162cabfa2153578eccc84e677d54 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Oct 2012 11:44:45 +0000
Subject: [PATCH 2982/6849] toolchain/kernel-headers: drop unused cris
 architecture kludge

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/kernel-headers.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index c464c373de..568c192058 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -70,11 +70,6 @@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_UNPACK_DIR)/.patched
 		HOSTCXX="$(HOSTCXX)" \
 		INSTALL_HDR_PATH=$(LINUX_HEADERS_DIR) headers_install; \
 	)
-ifeq ($(BR2_ARCH),"cris")
-	ln -s $(LINUX_HEADERS_DIR)/include/arch-v10/arch $(LINUX_HEADERS_DIR)/include/arch
-	cp -a $(LINUX_HEADERS_UNPACK_DIR)/include/linux/user.h $(LINUX_HEADERS_DIR)/include/linux
-	$(SED) "/^#include <asm\/page\.h>/d" $(LINUX_HEADERS_DIR)/include/asm/user.h
-endif
 	touch $@
 
 $(DL_DIR)/$(LINUX_HEADERS_SOURCE):

From b08979477d65203b9b90c88d2a00246342c0b56a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 9 Oct 2012 12:25:56 +0000
Subject: [PATCH 2983/6849] scons: fix library installation directory

On gentoo systems SCons setup.py tries to install into
$(HOST_DIR)/usr/lib64 but SCons looks up for its stuff in
$(HOST_DIR)/usr/lib instead hence breaking.
Make it install into $(HOST_DIR)/usr/lib by force to avoid the issue, it
shouldn't matter on other distributions.
Version bumping doesn't fix it.

[Peter: wrapped long line]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/scons/scons.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 2aed62c5cb..7cc234e8b8 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -7,7 +7,8 @@ define HOST_SCONS_BUILD_CMDS
 endef
 
 define HOST_SCONS_INSTALL_CMDS
-	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr)
+	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr \
+		--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION))
 endef
 
 $(eval $(host-generic-package))

From cbf09c29d081a7b4060d8d9b614170c9d75d7bbc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Oct 2012 12:02:29 +0000
Subject: [PATCH 2984/6849] bind: security bump to version 9.6-ESV-R8

Fixes CVE-2012-5166, CVE-2012-4244, CVE-2012-3817 and CVE-2012-1667.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 736001c8a3..bd7e5edfd0 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R7-P2
+BIND_VERSION = 9.6-ESV-R8
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From 0132e3638962b8c588d87ecbf1e285aed07cca0a Mon Sep 17 00:00:00 2001
From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Date: Thu, 11 Oct 2012 19:34:08 +0000
Subject: [PATCH 2985/6849] ccid: Version bump to 1.4.8

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccid/ccid.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index d1ebf8c3a0..73db67f582 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -3,9 +3,9 @@
 # CCID
 #
 # ########################################################
-CCID_VERSION = 1.4.7
+CCID_VERSION = 1.4.8
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
-CCID_SITE = http://alioth.debian.org/frs/download.php/3730
+CCID_SITE = http://alioth.debian.org/frs/download.php/3768
 CCID_INSTALL_STAGING = YES
 CCID_DEPENDENCIES = pcsc-lite host-pkg-config libusb
 

From 26e73ecb4540a4e78e92abaa9855e816b6dbf77f Mon Sep 17 00:00:00 2001
From: Dimitry Golubovsky <golubovsky@gmail.com>
Date: Tue, 11 Sep 2012 23:27:31 +0000
Subject: [PATCH 2986/6849] Disable database support in linux-pam

Due to the conflicts with default Berkeley DB configuration, disable
database support in linux-pam: pam_userdb is not built.

Signed-off-by: Dmitry <golubovsky@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-pam/linux-pam.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 1a2e7f6bf7..be510498b2 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -12,6 +12,7 @@ LINUX_PAM_CONF_OPT = \
 	--disable-prelude \
 	--disable-isadir \
 	--disable-nis \
+	--disable-db \
 	--disable-regenerate-docu \
 	--enable-securedir=/lib/security \
 	--libdir=/lib

From ee1dd812881cc7928e11addaa18e8185d2b02000 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 13 Oct 2012 01:46:09 +0000
Subject: [PATCH 2987/6849] unionfs: convert to cmake-package

Fixes e.g. http://autobuild.buildroot.net/results/c279007dd8b89a1c6fc9b58d3c2cda01ab84279e

The addition of CPPFLAGS overrides the defines added in unionfs's
Makefile.  Since unionfs now has CMake support, use that instead.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/unionfs/unionfs.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index eb8109ecbb..6c86c57c3b 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -11,12 +11,4 @@ UNIONFS_DEPENDENCIES = libfuse host-pkg-config
 UNIONFS_LICENSE = BSD-3c
 UNIONFS_LICENSE_FILES = LICENSE
 
-define UNIONFS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
-endef
-
-define UNIONFS_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) install
-endef
-
-$(eval $(generic-package))
+$(eval $(cmake-package))

From fbb872a0c1e228509efebf50b644a5993ad4841f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Oct 2012 01:33:38 +0000
Subject: [PATCH 2988/6849] package infra: remove empty TARGET_CPPFLAGS def

It's unneeded, just fills the next match (LARGEFILE) with a leading
space. Fixes
http://autobuild.buildroot.net/results/ad5772d19036a0c5564228ac7aba953d35a3cf85/build-end.log
since SCons can't handle leading whitespace in LDFLAGS gracefully.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 45213c12c3..a9398822d6 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -85,8 +85,6 @@ ifeq ($(BR2_DEBUG_3),y)
 TARGET_DEBUGGING=-g3
 endif
 
-TARGET_CPPFLAGS =
-
 ifeq ($(BR2_LARGEFILE),y)
 TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif

From 4006b76570faa25453198af25947a86bdbf3b02a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Oct 2012 15:26:00 +0000
Subject: [PATCH 2989/6849] kernel-headers: bump 3.{0, 4, 5, 6}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.45-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.46-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index f111c11fbb..00fb2f5ce2 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.45"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.46"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.31"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.13"	if BR2_KERNEL_HEADERS_3_4
-	default "3.5.6"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.1"		if BR2_KERNEL_HEADERS_3_6
+	default "3.4.14"	if BR2_KERNEL_HEADERS_3_4
+	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
+	default "3.6.2"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.45-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.46-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.45-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.46-headers_install-fix-__packed-in-exported-kernel-head.patch

From 7b0e4f21d30cf115baa8b57a7edd7683d58ced6f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 13 Oct 2012 23:21:43 +0000
Subject: [PATCH 2990/6849] unionfs: add patch to disable search for the C++
 compiler

Fixes

  http://autobuild.buildroot.org/results/9c4a9897dda1b99cc7a57af605301b53ed32b95d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../unionfs/unionfs-fuse-no-cxx-needed.patch  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/unionfs/unionfs-fuse-no-cxx-needed.patch

diff --git a/package/unionfs/unionfs-fuse-no-cxx-needed.patch b/package/unionfs/unionfs-fuse-no-cxx-needed.patch
new file mode 100644
index 0000000000..56f7e2455b
--- /dev/null
+++ b/package/unionfs/unionfs-fuse-no-cxx-needed.patch
@@ -0,0 +1,19 @@
+By default, CMake assumes a project uses the C and C++ languages, so
+it checks for both the C and the C++ compiler to exist.
+
+However, unionfs-fuse is written purely in C, so checking for a C++
+compiler is useless, and even prevents unionfs-fuse from building
+properly on targets for which no C++ compiler is available.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-project(unionfs-fuse)
++project(unionfs-fuse C)
+ 
+ cmake_minimum_required(VERSION 2.0)
+ INCLUDE (CheckIncludeFiles)

From 7f00b62917b0ecf825b385a616a452bb52a8590d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 12 Oct 2012 06:29:27 +0000
Subject: [PATCH 2991/6849] xenomai: bump to 2.6.1

The largefile patch is no longer necessary, it has been merged
upstream. However, in order to make the build work properly with
Thumb2 toolchains (such as Linaro toolchains), an additional fix is
needed. This fix is already upstream and will be part of upcoming
Xenomai releases.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/xenomai-fix-lfs-issue.patch |  72 ---------
 package/xenomai/xenomai-thumb-fix.patch     | 157 ++++++++++++++++++++
 package/xenomai/xenomai.mk                  |   2 +-
 3 files changed, 158 insertions(+), 73 deletions(-)
 delete mode 100644 package/xenomai/xenomai-fix-lfs-issue.patch
 create mode 100644 package/xenomai/xenomai-thumb-fix.patch

diff --git a/package/xenomai/xenomai-fix-lfs-issue.patch b/package/xenomai/xenomai-fix-lfs-issue.patch
deleted file mode 100644
index 157c8e25cf..0000000000
--- a/package/xenomai/xenomai-fix-lfs-issue.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
-Date: Sat, 5 Nov 2011 20:59:01 +0000 (+0100)
-Subject: posix: fix compilation for LFS
-X-Git-Url: http://git.xenomai.org/?p=xenomai-2.6.git;a=commitdiff_plain;h=06ae5c5e47fbfd9d8dbbe6fcf1a1db0c14bad9de;hp=8f6feff876029244dabc1257cdf13209fbd64fb5
-
-posix: fix compilation for LFS
----
-
-diff --git a/include/posix/sys/mman.h b/include/posix/sys/mman.h
-index 455e565..a304755 100644
---- a/include/posix/sys/mman.h
-+++ b/include/posix/sys/mman.h
-@@ -63,17 +63,16 @@ int __real_shm_open(const char *name, int oflag, mode_t mode);
- 
- int __real_shm_unlink(const char *name);
- 
--#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64
- void *__real_mmap(void *addr,
- 		  size_t len,
- 		  int prot,
- 		  int flags,
- 		  int fildes,
- 		  long off);
--#else
--#define __real_mmap __real_mmap64
--#endif
--#ifdef _LARGEFILE64_SOURCE
-+
-+#if __WORDSIZE == 32
-+#if defined(_LARGEFILE64_SOURCE) \
-+	|| defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
- void *__real_mmap64(void *addr,
- 		    size_t len,
- 		    int prot,
-@@ -82,6 +81,11 @@ void *__real_mmap64(void *addr,
- 		    long long off);
- #endif
- 
-+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#define __real_mmap __real_mmap64
-+#endif
-+#endif
-+
- int __real_munmap(void *addr, size_t len);
- 
- #ifdef __cplusplus
-diff --git a/include/posix/unistd.h b/include/posix/unistd.h
-index 49463a0..90cce86 100644
---- a/include/posix/unistd.h
-+++ b/include/posix/unistd.h
-@@ -54,13 +54,17 @@ int ftruncate(int fildes, off_t length);
- extern "C" {
- #endif
- 
--#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64
- int __real_ftruncate(int fildes, long length);
--#else
-+
-+#if __WORDSIZE == 32
-+#if defined(_LARGEFILE64_SOURCE) \
-+	|| defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+int __real_ftruncate64(int fildes, long long length);
-+#endif
-+
-+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
- #define __real_ftruncate __real_ftruncate64
- #endif
--#ifdef _LARGEFILE64_SOURCE
--int __real_ftruncate64(int fildes, long long length);
- #endif
- 
- ssize_t __real_read(int fd, void *buf, size_t nbyte);
diff --git a/package/xenomai/xenomai-thumb-fix.patch b/package/xenomai/xenomai-thumb-fix.patch
new file mode 100644
index 0000000000..7c98c2ebf6
--- /dev/null
+++ b/package/xenomai/xenomai-thumb-fix.patch
@@ -0,0 +1,157 @@
+From ad3714e925f5c6b4ae0e0d31c4bab7f8c5e659db Mon Sep 17 00:00:00 2001
+From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
+Date: Fri, 10 Aug 2012 21:55:41 +0200
+Subject: [PATCH] hal/arm: fix compilation for thumb
+
+---
+ include/asm-arm/atomic.h |    3 ++
+ ksrc/arch/arm/switch.S   |   84 +++++++++++++++++++++++++++------------------
+ 2 files changed, 53 insertions(+), 34 deletions(-)
+
+diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
+index 5d55ae8..ae96847 100644
+--- a/include/asm-arm/atomic.h
++++ b/include/asm-arm/atomic.h
+@@ -183,6 +183,9 @@ xnarch_atomic_cmpxchg(xnarch_atomic_t *ptr,
+ 		"ldrex	%1, [%3]\n"
+ 		"mov	%0, #0\n"
+ 		"teq	%1, %4\n"
++#ifdef __thumb__
++		"it	eq\n"
++#endif
+ 		"strexeq %0, %5, [%3]\n"
+ 		    : "=&r" (res), "=&r" (curval), "+Qo" (ptr->counter)
+ 		    : "r" (&ptr->counter), "Ir" (oldval), "r" (newval)
+diff --git a/ksrc/arch/arm/switch.S b/ksrc/arch/arm/switch.S
+index 83f4746..95c355f 100644
+--- a/ksrc/arch/arm/switch.S
++++ b/ksrc/arch/arm/switch.S
+@@ -37,6 +37,11 @@
+ 	.endm
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
++#define ARM(x...)	x
++#define THUMB(x...)
++#endif
++
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 37)
+ #ifdef CONFIG_MMU
+ #define USE_DOMAINS
+@@ -83,18 +88,19 @@
+  * r0 = pointer to union vfp_state, r1 = fpexc
+  */
+ ENTRY(rthal_vfp_save)
+-    VFPFSTMIA	r0, r2			@ save the working registers
+-    VFPFMRX	r2, FPSCR		@ current status
+-    tst		r1, #FPEXC_EX		@ is there additional state to save?
+-    beq 1f
+-    VFPFMRX	r3, FPINST		@ FPINST (only if FPEXC.EX is set)
+-    tst		r1, #FPEXC_FP2V		@ is there an FPINST2 to read?
+-    beq 1f
+-    VFPFMRX	r12, FPINST2	@ FPINST2 if needed (and present)
++	VFPFSTMIA	r0, r2		@ save the working registers
++	VFPFMRX		r2, FPSCR	@ current status
++	tst		r1, #FPEXC_EX	@ is there additional state to save?
++	beq		1f
++	VFPFMRX		r3, FPINST	@ FPINST (only if FPEXC.EX is set)
++	tst		r1, #FPEXC_FP2V	@ is there an FPINST2 to read?
++	beq		1f
++	VFPFMRX		r12, FPINST2	@ FPINST2 if needed (and present)
+ 1:
+-    stmia	r0, {r1, r2, r3, r12}	@ save FPEXC, FPSCR, FPINST, FPINST2
+-    mov		pc, lr
+-
++	stmia		r0, {r1, r2, r3, r12}	@ save FPEXC, FPSCR, FPINST, FPINST2
++	mov		pc, lr
++ENDPROC(rthal_vfp_save)
++	
+ /* Copied from no_old_VFP_process in arch/arm/vfp/vfphw.S
+  * r0 = pointer to union vfp_state
+  * r1 = current cpu
+@@ -102,20 +108,21 @@ ENTRY(rthal_vfp_save)
+ ENTRY(rthal_vfp_load)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) \
+ 	|| defined(CONFIG_VFP_3_2_BACKPORT)) && defined(CONFIG_SMP)
+-    str 	r1, [r0, #VFP_CPU]
++	str		r1, [r0, #VFP_CPU]
+ #endif
+-    VFPFLDMIA	r0, r2			@ reload the working registers while
++	VFPFLDMIA	r0, r2		@ reload the working registers while
+ 					@ FPEXC is in a safe state
+-    ldmia	r0, {r1, r2, r3, r12}	@ load FPEXC, FPSCR, FPINST, FPINST2
+-    tst		r1, #FPEXC_EX		@ is there additional state to restore?
+-    beq		1f
+-    VFPFMXR	FPINST, r3		@ restore FPINST (only if FPEXC.EX is set)
+-    tst		r1, #FPEXC_FP2V		@ is there an FPINST2 to write?
+-    beq		1f
+-    VFPFMXR	FPINST2, r12	@ FPINST2 if needed (and present)
++	ldmia		r0, {r1, r2, r3, r12}	@ load FPEXC, FPSCR, FPINST, FPINST2
++	tst		r1, #FPEXC_EX	@ is there additional state to restore?
++	beq		1f
++	VFPFMXR		FPINST, r3	@ restore FPINST (only if FPEXC.EX is set)
++	tst		r1, #FPEXC_FP2V	@ is there an FPINST2 to write?
++	beq		1f
++	VFPFMXR		FPINST2, r12	@ FPINST2 if needed (and present)
+ 1:
+-    VFPFMXR	FPSCR, r2		@ restore status
+-    mov		pc, lr
++	VFPFMXR		FPSCR, r2	@ restore status
++	mov		pc, lr
++ENDPROC(rthal_vfp_load)
+ #endif
+ 
+ /*
+@@ -144,28 +151,37 @@ ENTRY(rthal_vfp_load)
+  * r0 = previous task_struct, r1 = previous thread_info, r2 = next thread_info
+  */
+ ENTRY(rthal_thread_switch)
+-    add     ip, r1, #TI_CPU_SAVE
+-    ldr     r3, [r2, #TI_TP_VALUE]
+-    stmia   ip!, {r4 - sl, fp, sp, lr}      @ Store most regs on stack
++	add     ip, r1, #TI_CPU_SAVE
++	ldr     r3, [r2, #TI_TP_VALUE]
++ ARM(	stmia	ip!, {r4 - sl, fp, sp, lr} )	@ Store most regs on stack
++ THUMB(	stmia	ip!, {r4 - sl, fp}	   )	@ Store most regs on stack
++ THUMB(	str	sp, [ip], #4		   )
++ THUMB(	str	lr, [ip], #4		   )
+ #ifdef USE_DOMAINS
+-    ldr     r6, [r2, #TI_CPU_DOMAIN]
++	ldr     r6, [r2, #TI_CPU_DOMAIN]
+ #endif
+ 
+-    clear_exclusive_monitor
+-    set_tls r3, r4, r5
++	clear_exclusive_monitor
++	set_tls r3, r4, r5
+ #ifdef USE_DOMAINS
+-    mcr     p15, 0, r6, c3, c0, 0           @ Set domain register
++	mcr     p15, 0, r6, c3, c0, 0           @ Set domain register
+ #endif
+-    fpu_switch r4
+-    add	    r4, r2, #TI_CPU_SAVE
+-    ldmia   r4, {r4 - sl, fp, sp, pc}       @ Load all regs saved previously
++	fpu_switch r4
++ ARM(	add	r4, r2, #TI_CPU_SAVE	   )
++ ARM(	ldmia	r4, {r4 - sl, fp, sp, pc}  )	@ Load all regs saved previously
++ THUMB(	add	ip, r2, #TI_CPU_SAVE	   )
++ THUMB(	ldmia	ip!, {r4 - sl, fp}	   )	@ Load all regs saved previously
++ THUMB(	ldr	sp, [ip], #4		   )
++ THUMB(	ldr	pc, [ip]		   )
++ENDPROC(rthal_thread_switch)
+ 
+ /*
+  * r4 = xnarch_thread_trampoline
+  * r5 = xnarchtcb_t *
+  */
+ ENTRY(rthal_thread_trampoline)
+-    mov     r0, r5
+-    mov     pc, r4
++	mov	r0, r5
++	mov	pc, r4
++ENDPROC(rthal_thread_trampoline)
+ 
+ // vim: ts=4 et sw=4 sts=4
+-- 
+1.7.2.5
+
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 6dbdcea65f..e425b75679 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -7,7 +7,7 @@
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
 ifeq ($(XENOMAI_VERSION),)
-XENOMAI_VERSION = 2.6.0
+XENOMAI_VERSION = 2.6.1
 endif
 
 XENOMAI_SITE = http://download.gna.org/xenomai/stable/

From 4e5f63a569c00ec97869b1b21410047ffd837813 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 12 Oct 2012 06:30:35 +0000
Subject: [PATCH 2992/6849] gdb: target gdb not available on microblaze

Fixes

  http://autobuild.buildroot.org/results/5950c95ca12721dd910ad72fe52bfa9ac45a5120/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index fd6956b3a8..272e1961f5 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_GDB
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze
 	help
 	    Build the full gdb debugger to run on the target.
 

From 8bd0a20b14ef3347ec2de9696ec0edddf6956726 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 12 Oct 2012 06:58:24 +0000
Subject: [PATCH 2993/6849] mesa3d: add dependency on host-xutil_makedepend

The mesa3d now requires the makedepend host utility, otherwise, it
fails with:

configure: error: makedepend is required to build Mesa

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: Noel Vellemans <Noel.Vellemans@visionBMS.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mesa3d/mesa3d.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 3c2635e6cd..8d311e1e93 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -27,6 +27,7 @@ MESA3D_DEPENDENCIES = \
 	xlib_libXfixes \
 	xproto_dri2proto \
 	libdrm \
-	expat
+	expat \
+	host-xutil_makedepend
 
 $(eval $(autotools-package))

From 56994e16ac98e6a145bd26a68da134e64821846f Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sat, 13 Oct 2012 20:08:25 +0000
Subject: [PATCH 2994/6849] poco: bump to version 1.4.4

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...build-config.patch => poco-add-cross-build-config.patch} | 0
 ...search-path.patch => poco-add-staging-search-path.patch} | 6 +++---
 ...ld-debug-libs.patch => poco-dont-build-debug-libs.patch} | 0
 package/poco/poco.mk                                        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename package/poco/{poco-1.4.2p1-add-cross-build-config.patch => poco-add-cross-build-config.patch} (100%)
 rename package/poco/{poco-1.4.2p1-add-staging-search-path.patch => poco-add-staging-search-path.patch} (68%)
 rename package/poco/{poco-1.4.2p1-dont-build-debug-libs.patch => poco-dont-build-debug-libs.patch} (100%)

diff --git a/package/poco/poco-1.4.2p1-add-cross-build-config.patch b/package/poco/poco-add-cross-build-config.patch
similarity index 100%
rename from package/poco/poco-1.4.2p1-add-cross-build-config.patch
rename to package/poco/poco-add-cross-build-config.patch
diff --git a/package/poco/poco-1.4.2p1-add-staging-search-path.patch b/package/poco/poco-add-staging-search-path.patch
similarity index 68%
rename from package/poco/poco-1.4.2p1-add-staging-search-path.patch
rename to package/poco/poco-add-staging-search-path.patch
index 638ee2ad14..a9397b4f1c 100644
--- a/package/poco/poco-1.4.2p1-add-staging-search-path.patch
+++ b/package/poco/poco-add-staging-search-path.patch
@@ -8,13 +8,13 @@ must be set from the make command line.
 [Peter: Remove host dirs, add MYSQL_INCDIR]
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 --- 
---- poco-1.4.1p1-all-dist/Data/MySQL/Makefile	2011-02-09 11:13:00.000000000 +0200
-+++ poco-1.4.1p1-all/Data/MySQL/Makefile	2011-08-07 09:03:37.106161274 +0300
+--- poco-1.4.4-all-dist/Data/MySQL/Makefile	2012-09-20 01:30:42.000000000 +0300
++++ poco-1.4.4-all/Data/MySQL/Makefile	2012-10-11 14:36:10.343153420 +0200
 @@ -8,8 +8,8 @@
  
  include $(POCO_BASE)/build/rules/global
  
--SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
+-SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
 -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
 +SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient
 +INCLUDE += -I$(MYSQL_INCDIR)
diff --git a/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch b/package/poco/poco-dont-build-debug-libs.patch
similarity index 100%
rename from package/poco/poco-1.4.2p1-dont-build-debug-libs.patch
rename to package/poco/poco-dont-build-debug-libs.patch
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index eaa93e66c8..942b9b2e68 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -3,8 +3,8 @@
 # poco
 #
 #############################################################
-POCO_VERSION_MAJOR = 1.4.3
-POCO_VERSION = $(POCO_VERSION_MAJOR)p1
+POCO_VERSION_MAJOR = 1.4.4
+POCO_VERSION = $(POCO_VERSION_MAJOR)
 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
 POCO_SITE = http://downloads.sourceforge.net/project/poco/sources/poco-$(POCO_VERSION_MAJOR)
 POCO_LICENSE = Boost-v1.0

From 85280ef82936257456449f189d2ea4b484a8f269 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Oct 2012 00:28:37 +0000
Subject: [PATCH 2995/6849] cairo: disable trace and trace interpreter

The Cairo tracing and trace interpreter are most likely not that
useful, so disable them. They also require zlib, which isn't a
dependency of Cairo at the moment. This fixes the following build
failure:

  http://autobuild.buildroot.org/results/a91e4e337fd9deb0f9fad433350feb27b2aee556/build-end.log

In the future, if people are interested by the trace and trace
interpreter, we can add a new Config.in knob for them.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/cairo.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index eedb28d0e4..2a453bbc23 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -34,6 +34,10 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no
 
+CAIRO_CONF_OPT = \
+	--enable-trace=no \
+	--enable-interpreter=no
+
 CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)

From d3eced2687b68659716c7f4729e4bd31674934f7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Oct 2012 08:47:56 +0000
Subject: [PATCH 2996/6849] sdl_gfx: don't use --enable-mmx on x86_64

Even though the MMX instructions are available on x86_64 processors,
the MMX code in sdl_gfx is written in IA32-specific assembly code, and
therefore does not build on x86_64. It generates the following build
issues:

SDL_imageFilter.c: Assembler messages:
SDL_imageFilter.c:34: Error: `pusha' is not supported in 64-bit mode
SDL_imageFilter.c:38: Error: `popa' is not supported in 64-bit mode
SDL_imageFilter.c:77: Error: `pusha' is not supported in 64-bit mode
SDL_imageFilter.c:93: Error: `popa' is not supported in 64-bit mode
[...]

We fix this by only enabling MMX support in this package when the
processor supports MMX *and* it is a IA32 compatible processor.

Fixes

  http://autobuild.buildroot.org/results/b9efc611f5da487079b6be37bb7a41a3198d63b9/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_gfx/sdl_gfx.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index e3ff6306eb..c1c7f91012 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -11,7 +11,14 @@ SDL_GFX_DEPENDENCIES = sdl
 SDL_GFX_CONF_OPT = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
-	--enable-static \
-	$(if $(BR2_X86_CPU_HAS_MMX),--enable-mmx,--disable-mmx)
+	--enable-static
+
+# Even though x86_64 processors support MMX, the MMX-specific assembly
+# code in sdl_gfx is IA32 specific, and does not build for x86_64.
+ifeq ($(BR2_i386)$(BR2_X86_CPU_HAS_MMX),yy)
+SDL_GFX_CONF_OPT += --enable-mmx
+else
+SDL_GFX_CONF_OPT += --disable-mmx
+endif
 
 $(eval $(autotools-package))

From 5c28f5956f7da25071303411c8fef308065f2887 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Oct 2012 08:18:20 +0000
Subject: [PATCH 2997/6849] libv4l: properly error out when one of the make
 step fails

In libv4l.mk, if there are multiple elements in $(LIBV4L_DIRS_y), they
are built in order, one after the other. However, our loop construct
doesn't take into account the fact that we should error out if one of
the steps failed.

A good illustration is having BR2_PACKAGE_LIBV4L_DECODE_TM6000 and
BR2_PACKAGE_LIBV4L_V4L2_CTL enabled. The build of decode-tm6000 will
fail, but the build will happily continue without stopping in libv4l.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/libv4l.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 6c782b08e9..15e48ed4f3 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -24,19 +24,19 @@ endif
 define LIBV4L_BUILD_CMDS
 	for i in $(LIBV4L_DIRS_y); do \
 		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
-			$(LIBV4L_MAKE_OPTS); done
+			$(LIBV4L_MAKE_OPTS) || exit 1 ; done
 endef
 
 define LIBV4L_INSTALL_STAGING_CMDS
 	for i in $(LIBV4L_DIRS_y); do \
 		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
-			DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install; done
+			DESTDIR=$(STAGING_DIR) $(LIBV4L_MAKE_OPTS) install || exit 1; done
 endef
 
 define LIBV4L_INSTALL_TARGET_CMDS
 	for i in $(LIBV4L_DIRS_y); do \
 		$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/$$i \
-			DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install; done
+			DESTDIR=$(TARGET_DIR) $(LIBV4L_MAKE_OPTS) install || exit 1; done
 endef
 
 $(eval $(generic-package))

From 947b57da19e6308fed7f66ba827aa9a46c8c7d73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Oct 2012 08:18:21 +0000
Subject: [PATCH 2998/6849] libv4l: decode-tm6000 requires libv4l2util

The decode-tm6000 utility cannot build without the libv4l2util. If
this library is not available, the build breaks with:

decode_tm6000.o: In function `read_stream':
decode_tm6000.c:(.text+0x220): undefined reference to `v4l2_rcvbuf'
decode_tm6000.o: In function `main':
decode_tm6000.c:(.text+0x37c): undefined reference to `v4l2_open'
decode_tm6000.c:(.text+0x3cc): undefined reference to `v4l2_gettryset_fmt_cap'
decode_tm6000.c:(.text+0x424): undefined reference to `v4l2_getset_freq'
decode_tm6000.c:(.text+0x47c): undefined reference to `v4l2_mmap_bufs'
decode_tm6000.c:(.text+0x4a0): undefined reference to `v4l2_start_streaming'

See

 http://autobuild.buildroot.org/results/207ed74d5e816309ef0dc82ecc8112b51788fdf6/build-end.log

We fix this by adding util/libv4l2util to the list of directories to
build when decode-tm6000 is enabled. The only other user of
libv4l2util is another utility called qv4l2, for which Buildroot has
no Config.in option, so we only handle the case of decode-tm6000 at
the moment.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/libv4l.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 15e48ed4f3..0639505f4a 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -11,7 +11,7 @@ LIBV4L_MAKE_OPTS = PREFIX=/usr
 LIBV4L_DEPENDENCIES = jpeg
 
 LIBV4L_DIRS_y += lib
-LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_DECODE_TM6000)	+= utils/decode_tm6000
+LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_DECODE_TM6000)	+= utils/libv4l2util utils/decode_tm6000
 LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_IR_KEYTABLE)	+= utils/keytable
 LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE) += utils/v4l2-compliance
 LIBV4L_DIRS_$(BR2_PACKAGE_LIBV4L_V4L2_CTL)	+= utils/v4l2-ctl

From 260a5820180760d4b00e530041d98eab4bab60fc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Oct 2012 09:19:55 +0200
Subject: [PATCH 2999/6849] package: add gnupg

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/gnupg/Config.in | 35 ++++++++++++++++++++++++++++++
 package/gnupg/gnupg.mk  | 48 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 package/gnupg/Config.in
 create mode 100644 package/gnupg/gnupg.mk

diff --git a/package/Config.in b/package/Config.in
index c56f438bd6..d7b3db6ebc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -664,6 +664,7 @@ source "package/dash/Config.in"
 endif
 source "package/dialog/Config.in"
 source "package/file/Config.in"
+source "package/gnupg/Config.in"
 source "package/inotify-tools/Config.in"
 source "package/lockfile-progs/Config.in"
 source "package/logrotate/Config.in"
diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in
new file mode 100644
index 0000000000..8ddffaa19f
--- /dev/null
+++ b/package/gnupg/Config.in
@@ -0,0 +1,35 @@
+config BR2_PACKAGE_GNUPG
+	bool "gnupg"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_NCURSES
+	help
+	  GnuPG is the GNU project's complete and free implementation
+	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
+	  to encrypt and sign your data and communication, features a
+	  versatile key management system as well as access modules
+	  for all kinds of public key directories. GnuPG, also known
+	  as GPG, is a command line tool with features for easy
+	  integration with other applications.
+
+	  http://gnupg.org/
+
+if BR2_PACKAGE_GNUPG
+
+config BR2_PACKAGE_GNUPG_GPGV
+	bool "gpgv"
+	help
+	  gpgv is an OpenPGP signature verification tool.
+
+	  This program is actually a stripped-down version of gpg
+	  which is only able to check signatures. It is somewhat
+	  smaller than the fully-blown gpg and uses a different (and
+	  simpler) way to check that the public keys used to make the
+	  signature are valid. There are no configuration files and
+	  only a few options are implemented.
+
+config BR2_PACKAGE_GNUPG_GPGSPLIT
+	bool "gpgsplit"
+	help
+	  gpgsplit splits an OpenPGP message into packets.
+
+endif
diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
new file mode 100644
index 0000000000..4b5c0a1a45
--- /dev/null
+++ b/package/gnupg/gnupg.mk
@@ -0,0 +1,48 @@
+#############################################################
+#
+# gnupg
+#
+#############################################################
+
+GNUPG_VERSION = 1.4.12
+GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
+GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
+GNUPG_LICENSE = GPLv3+
+GNUPG_LICENSE_FILES = COPYING
+GNUPG_DEPENDENCIES = zlib ncurses
+GNUPG_CONF_OPT = --disable-rpath --enable-minimal --disable-regex
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+GNUPG_CONF_OPT += --enable-bzip2
+GNUPG_DEPENDENCIES += bzip2
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+GNUPG_CONF_ENV += ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
+GNUPG_DEPENDENCIES += libcurl
+else
+GNUPG_CONF_OPT += --without-libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+GNUPG_DEPENDENCIES += readline
+else
+GNUPG_CONF_OPT += --without-readline
+endif
+
+ifneq ($(BR2_PACKAGE_GNUPG_GPGV),y)
+define GNUPG_REMOVE_GPGV
+	rm -f $(TARGET_DIR)/usr/bin/gpgv \
+		$(TARGET_DIR)/usr/share/man/man1/gpgv.1
+endef
+GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGV
+endif
+
+ifneq ($(BR2_PACKAGE_GNUPG_GPGSPLIT),y)
+define GNUPG_REMOVE_GPGSPLIT
+	rm -f $(TARGET_DIR)/usr/bin/gpgsplit
+endef
+GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGSPLIT
+endif
+
+$(eval $(autotools-package))

From 79bfcd556027901b847cae063cbcfbedf75e394a Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sun, 14 Oct 2012 05:17:34 +0000
Subject: [PATCH 3000/6849] pkg-infra: correct the source name for host-only
 packages

Host-only package that don't define their <PKG>_SOURCE variable would
default to host-<pkg>-<version>.tar.gz.  It's more logical to remove
the host- prefix in this case.

This problem is most apparent with host-only packages downloaded from
version control, because they never define <PKG>_SOURCE.

Reported by Thomas Petazzoni and initial analysis by Luca Ceresoli.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index ffe7dfbc5f..270da60c62 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -231,7 +231,7 @@ ifndef $(2)_SOURCE
  ifdef $(3)_SOURCE
   $(2)_SOURCE = $($(3)_SOURCE)
  else
-  $(2)_SOURCE			?= $$($(2)_BASE_NAME).tar.gz
+  $(2)_SOURCE			?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
  endif
 endif
 

From 18bd242da0ddfe2e7873bb7943e6e6cd06cf584d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Oct 2012 01:28:35 +0000
Subject: [PATCH 3001/6849] e2fsprogs: bump to version 1.42.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 9002d46251..049bc29bb9 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42.5
+E2FSPROGS_VERSION = 1.42.6
 E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
 
 E2FSPROGS_CONF_OPT = \

From 015a4850bea570889636fa9e2d3172d082ff5d9c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 14 Oct 2012 23:46:16 +0000
Subject: [PATCH 3002/6849] feh: bump to 2.6.3

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 9084b65660..2dbe2962ec 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.5
+FEH_VERSION = 2.6.3
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From 53f4b0baceb886579c3fa7551abadd63666a60d4 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 14 Oct 2012 23:46:17 +0000
Subject: [PATCH 3003/6849] xapp_xclock: bump to 1.0.6

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xclock/xapp_xclock.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 9fdc792488..6d7bf652d7 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XCLOCK_VERSION = 1.0.3
+XAPP_XCLOCK_VERSION = 1.0.6
 XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2
 XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile

From 2ce5da6e3fd0d2950e84bcfcef80f1fb68139d6c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 14 Oct 2012 23:46:18 +0000
Subject: [PATCH 3004/6849] xlib_libXrender: bump to 0.9.7

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 466b4339b4..fbd5015367 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRENDER_VERSION = 0.9.6
+XLIB_LIBXRENDER_VERSION = 0.9.7
 XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRENDER_INSTALL_STAGING = YES

From 501ba89958a6202745fbb65f7d2f3ca4e257429a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Oct 2012 23:04:06 +0200
Subject: [PATCH 3005/6849] u-boot: add 2012.10, deprecate 2011.09, remove
 2011.03

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 87f65619eb..d8458d912a 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -14,10 +14,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2012_07
+	default BR2_TARGET_UBOOT_2012_10
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2012_10
+	bool "2012.10"
+
 config BR2_TARGET_UBOOT_2012_07
 	bool "2012.07"
 
@@ -29,15 +32,12 @@ config BR2_TARGET_UBOOT_2011_12
 
 config BR2_TARGET_UBOOT_2011_09
 	bool "2011.09"
+	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_2011_06
 	bool "2011.06"
 	depends on BR2_DEPRECATED
 
-config BR2_TARGET_UBOOT_2011_03
-	bool "2011.03"
-	depends on BR2_DEPRECATED
-
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -55,12 +55,12 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2012.10"	if BR2_TARGET_UBOOT_2012_10
 	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
-	default "2011.03"	if BR2_TARGET_UBOOT_2011_03
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 

From 3dfd5f40401a8037bfa86c7c1b10946ff83be26f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 16 Oct 2012 09:51:55 +0200
Subject: [PATCH 3006/6849] xenomai: disallow SMP option on !SMP ARM variants

Fixes http://autobuild.buildroot.net/results/51bf35ed7a6224db7cdb157af4d030a787ef9159

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index ecab23e6f0..b09472d206 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -41,6 +41,7 @@ config BR2_PACKAGE_XENOMAI_VERSION
 
 config BR2_PACKAGE_XENOMAI_SMP
 	bool "Enable SMP support"
+	depends on BR2_cortex_a9 || !BR2_arm # only A9 has SMP support
 	help
 	  This option allows to enable or disable SMP support. It has
 	  to match your kernel configuration.

From 525cd9eed18c55ffae18467bcdf69d44a3673310 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 16 Oct 2012 22:05:19 +0200
Subject: [PATCH 3007/6849] gnupg: don't prefix assembly level functions with
 underscore

Fixes http://autobuild.buildroot.net/results/45a0856bafa9f2f7e86e2c063528c2b5b04c08d6

gnupg's configure script defaults to prepending an underscore ('_') to
the assembly level functions, which isn't correct for Linux and causes
linker errors for the archs where it has asm optimizations.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnupg/gnupg.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index 4b5c0a1a45..e63c33c096 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -10,6 +10,7 @@ GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
 GNUPG_LICENSE = GPLv3+
 GNUPG_LICENSE_FILES = COPYING
 GNUPG_DEPENDENCIES = zlib ncurses
+GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no
 GNUPG_CONF_OPT = --disable-rpath --enable-minimal --disable-regex
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)

From 0d2b707f81a7cec96c6a275c273647304861511e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Oct 2012 12:15:17 +0000
Subject: [PATCH 3008/6849] nbd: bump to version 3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index bd63caa14e..7733d7b4b1 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NBD_VERSION = 3.1
+NBD_VERSION = 3.2
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
 NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)

From 75f6e1df60b29e8e9d11ce91d548ef5d149c6804 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Oct 2012 15:50:26 +0000
Subject: [PATCH 3009/6849] vsftpd: bump to version 3.0.2

Bump vsftpd to version 3.0.2, closes bug #5330

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...orce-largefile.patch => vsftpd-dont-force-largefile.patch} | 0
 package/vsftpd/vsftpd.mk                                      | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename package/vsftpd/{vsftpd-2.3.4-dont-force-largefile.patch => vsftpd-dont-force-largefile.patch} (100%)

diff --git a/package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch b/package/vsftpd/vsftpd-dont-force-largefile.patch
similarity index 100%
rename from package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch
rename to package/vsftpd/vsftpd-dont-force-largefile.patch
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index ce042c5ba9..8d261c8626 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-VSFTPD_VERSION = 2.3.5
+VSFTPD_VERSION = 3.0.2
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
+VSFTPD_LICENSE = GPLv2
+VSFTPD_LICENSE_FILES = COPYING
 
 define VSFTPD_ENABLE_SSL
 	$(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(@D)/builddefs.h

From 811bcf124a33419ba18d1e326973a1b839050966 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 16 Oct 2012 03:09:18 +0000
Subject: [PATCH 3010/6849] cifs-utils: bump to version 5.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index cfa2b910bb..d208c87ae7 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,4 +1,4 @@
-CIFS_UTILS_VERSION = 5.6
+CIFS_UTILS_VERSION = 5.7
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
 CIFS_UTILS_LICENSE = GPLv3

From acec9cda475c2901c20bc6616d3b5048608ff9f2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 16 Oct 2012 02:33:19 +0000
Subject: [PATCH 3011/6849] gpsd: fix nmea2000 build failure

NMEA2000 seems to require NAVCOM for some odd reason.
Fixes
http://autobuild.buildroot.net/results/91ddc286f6a92498f96aba7d312f82d5c77a689a/build-end.log
Also do a correct sort of protocol config options.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/Config.in | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index a11c553a40..69f63f9ea7 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -91,16 +91,16 @@ endmenu
 menu "Protocols"
 	depends on BR2_PACKAGE_GPSD
 
-config BR2_PACKAGE_GPSD_ASHTECH
-	bool "Ashtech"
-	help
-	  Ashtech support
-
 config BR2_PACKAGE_GPSD_AIVDM
 	bool "Aivdm"
 	help
 	  Aivdm support
 
+config BR2_PACKAGE_GPSD_ASHTECH
+	bool "Ashtech"
+	help
+	  Ashtech support
+
 config BR2_PACKAGE_GPSD_EARTHMATE
 	bool "Earthmate"
 	help
@@ -151,27 +151,28 @@ config BR2_PACKAGE_GPSD_MTK3301
 	help
 	  Mediatek MTK-3301 support
 
+config BR2_PACKAGE_GPSD_NAVCOM
+	bool "Navcom"
+	help
+	  Navcom binary support
+
 config BR2_PACKAGE_GPSD_NMEA
 	bool "NMEA"
 	default y
 	help
 	  Generic NMEA support
 
+config BR2_PACKAGE_GPSD_NMEA2000
+	bool "NMEA2000"
+	select BR2_PACKAGE_GPSD_NAVCOM
+	help
+	  NMEA2000/CAN support
+
 config BR2_PACKAGE_GPSD_NTRIP
 	bool "NTRIP"
 	help
 	  NTRIP support
 
-config BR2_PACKAGE_GPSD_NAVCOM
-	bool "Navcom"
-	help
-	  Navcom binary support
-
-config BR2_PACKAGE_GPSD_NMEA2000
-	bool "nmea2000"
-	help
-	  NMEA2000/CAN support
-
 config BR2_PACKAGE_GPSD_OCEANSERVER
 	bool "OceanServer"
 	help

From 965cab82af11943ed52ed70aafc9f72c79744664 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Oct 2012 11:46:09 +0000
Subject: [PATCH 3012/6849] toolchain/crosstool-ng: vendor part of tuple should
 be 'buildroot'

Since 11017f081fc5b034e680d89eaea729c19f450e01, the Crosstool-ng
backend generates toolchains that have a prefix inconsistent with what
Buildroot expects. Buildroot expects a "buildroot" vendor name, while
Crosstool-NG builds toolchain with the "unknown" vendor name.

This is causing build failure such as:

  http://autobuild.buildroot.org/results/15b2c0e50a81b86dd13af684c9254df2bc0df8de/build-end.log

Fix this by changing the vendor part of the tuple used by Crosstool-NG
to "buildroot".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index d18f5d53ca..e46bb2032d 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -201,7 +201,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_[BL]E).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_ENDIAN)) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="unknown":;
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="buildroot":;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(ARCH)-linux":;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
 ifneq ($(call qstrip,$(BR2_USE_MMU)),)

From 21a37b0a63e037279dec0b590e726eaab218f8de Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 17 Oct 2012 11:19:43 +0000
Subject: [PATCH 3013/6849] iw: bump to version 3.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 9c680936c1..654282a990 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.6
+IW_VERSION = 3.7
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkg-config libnl

From dd81b498378b60b380d75b63f58418b2465731d5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 18 Oct 2012 14:43:13 +0200
Subject: [PATCH 3014/6849] iptables: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index bdef575880..17c191eeff 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.15
+IPTABLES_VERSION = 1.4.16.3
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 177444c2e0ba4da70f00d7cd20194a6606b5d637 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 18 Oct 2012 23:20:26 +0200
Subject: [PATCH 3015/6849] beaglebone_defconfig: use mainline u-boot

Board is now supported in mainline.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ecify-ext2-and-ro-for-booting-rootfs.patch | 31 -------------------
 configs/beaglebone_defconfig                  |  5 +--
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch

diff --git a/board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch b/board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch
deleted file mode 100644
index dfbccf52a5..0000000000
--- a/board/beaglebone/uboot-v2011.09_AM335xPSP_04.06.00.06-0001-am335x_evm.h-Specify-ext2-and-ro-for-booting-rootfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c8aae8c96494132759319b0eab6cd2a51d1d4889 Mon Sep 17 00:00:00 2001
-From: Frank Hunleth <fhunleth@troodon-software.com>
-Date: Tue, 6 Mar 2012 07:20:26 -0800
-Subject: [PATCH] am335x_evm.h: Specify ext2 and ro for booting rootfs
-
-Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
----
- include/configs/am335x_evm.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index e0ac494..b45c306 100755
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -53,11 +53,11 @@
- 	"script_addr=0x81900000\0" \
- 	"console=ttyO0,115200n8\0" \
- 	"mmc_dev=0\0" \
--	"mmc_root=/dev/mmcblk0p2 rw\0" \
-+	"mmc_root=/dev/mmcblk0p2 ro\0" \
- 	"nand_root=ubi0:rootfs rw ubi.mtd=7,2048\0" \
- 	"spi_root=/dev/mtdblock4 rw\0" \
- 	"nor_root=/dev/mtdblock3 rw\0" \
--	"mmc_root_fs_type=ext3 rootwait\0" \
-+	"mmc_root_fs_type=ext2 rootwait\0" \
- 	"nand_root_fs_type=ubifs rootwait=1\0" \
- 	"spi_root_fs_type=jffs2\0" \
- 	"nor_root_fs_type=jffs2\0" \
--- 
-1.7.4.1
-
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index 4670bd4fab..f78a4008bc 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -10,10 +10,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="board/beaglebone"
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://arago-project.org/git/projects/u-boot-am33x.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="v2011.09_AM335xPSP_04.06.00.06"
+BR2_TARGET_UBOOT_2012_10=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"

From e5435f00d7a8c2e76f59c72e943391cefb2de796 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 19 Oct 2012 13:03:50 +0200
Subject: [PATCH 3016/6849] nitrogen6x_defconfig: bump kernel version

To boundary-L3.0.35_12.09.01_GA branch.

See http://boundarydevices.com/october-freescale-releases-for-i-mx6/
for details.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 74b33c665f..e3a78c73da 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -19,6 +19,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/cb1a536/linux-imx6-cb1a536.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/5f84e92/linux-imx6-5f84e92.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 24d3cd0b415a584b38352ecdbbabe4c04847c45a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 18 Oct 2012 05:54:42 +0000
Subject: [PATCH 3017/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 00fb2f5ce2..10d03877c5 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -69,7 +69,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
 	default "3.0.46"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.31"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.32"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.14"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5

From 1741ce4eb4c99ff737ae4d2d1704e8626db3805a Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 18 Oct 2012 10:31:39 +0000
Subject: [PATCH 3018/6849] connman: bump to version 1.8.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 2ce3dbdb60..2c04cdd6bb 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.7
+CONNMAN_VERSION = 1.8
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES

From 9546bc4576215df39183e583c6e6daa874e64f44 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Oct 2012 13:12:04 +0000
Subject: [PATCH 3019/6849] netsnmp: bump to version 5.7.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp-CVE-2012-2141.patch | 36 ---------------------
 package/netsnmp/netsnmp-swinst-crash.patch  | 17 ----------
 package/netsnmp/netsnmp.mk                  |  2 +-
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 package/netsnmp/netsnmp-CVE-2012-2141.patch
 delete mode 100644 package/netsnmp/netsnmp-swinst-crash.patch

diff --git a/package/netsnmp/netsnmp-CVE-2012-2141.patch b/package/netsnmp/netsnmp-CVE-2012-2141.patch
deleted file mode 100644
index 1b34b9c4c9..0000000000
--- a/package/netsnmp/netsnmp-CVE-2012-2141.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c5633f1603e4bd03ed05c37d782ec8911759c47 Mon Sep 17 00:00:00 2001
-From: Robert Story <rstory@freesnmp.com>
-Date: Mon, 14 May 2012 11:40:06 -0400
-Subject: [PATCH] NEWS: snmp: BUG: 3526549: CVE-2012-2141 Array index error leading to crash
-
----
- agent/mibgroup/agent/extend.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/agent/mibgroup/agent/extend.c b/agent/mibgroup/agent/extend.c
-index d00475f..1f8586a 100644
---- a/agent/mibgroup/agent/extend.c
-+++ b/agent/mibgroup/agent/extend.c
-@@ -1126,7 +1126,7 @@ _extend_find_entry( netsnmp_request_info       *request,
-              * ...and check the line requested is valid
-              */
-             line_idx = *table_info->indexes->next_variable->val.integer;
--            if (eptr->numlines < line_idx)
-+            if (line_idx < 1 || line_idx > eptr->numlines)
-                 return NULL;
-         }
-         return eptr;
-@@ -1299,6 +1299,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_handler          *handler,
-                  * Determine which line we've been asked for....
-                  */
-                 line_idx = *table_info->indexes->next_variable->val.integer;
-+                if (line_idx < 1 || line_idx > extension->numlines) {
-+                    netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE);
-+                    continue;
-+                }
-                 cp  = extension->lines[line_idx-1];
- 
-                 /* 
--- 
-1.7.4.1
-
diff --git a/package/netsnmp/netsnmp-swinst-crash.patch b/package/netsnmp/netsnmp-swinst-crash.patch
deleted file mode 100644
index f7298a6a52..0000000000
--- a/package/netsnmp/netsnmp-swinst-crash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes runtime error with uClibc (and possibly others).
-
-Original patch and bug description:
-http://sourceforge.net/tracker/?func=detail&aid=3436528&group_id=12694&atid=312694
-
---- net-snmp-5.7.1/agent/mibgroup/host/data_access/swinst_pkginfo.c
-+++ /home/fabled//net-snmp-5.7.1.patched/agent/mibgroup/host/data_access/swinst_pkginfo.c
-@@ -140,7 +140,8 @@
-         memcpy( entry->swDate, cp, date_len );
-         entry->swDate_len = date_len;
-     }
--    closedir( d );
-+    if (d != NULL)
-+        closedir( d );
- 
-     DEBUGMSGTL(("swinst:load:arch"," loaded %d entries\n",
-                 (int)CONTAINER_SIZE(container)));
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index bbe0dbb213..2670cf33b1 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.7.1
+NETSNMP_VERSION = 5.7.2
 NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_LICENSE = Various BSD-like

From b1570168d86db59a0c9101ca757fc77b909ce3da Mon Sep 17 00:00:00 2001
From: Alexander Khryukin <alexander@mezon.ru>
Date: Thu, 11 Oct 2012 23:43:52 +0000
Subject: [PATCH 3020/6849] pcre: bump version

Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/pcre.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 8fd6b2128b..9947c4b793 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCRE_VERSION = 8.30
+PCRE_VERSION = 8.31
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_LICENSE = BSD-3c
 PCRE_LICENSE_FILES = LICENCE

From 7aed4faa9b0e6b21dba82ad5d3be5db796517580 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Oct 2012 02:15:09 +0000
Subject: [PATCH 3021/6849] hostapd: add fix for CVE-2012-4445

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd-cve-2012-4445.patch | 49 +++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/hostapd/hostapd-cve-2012-4445.patch

diff --git a/package/hostapd/hostapd-cve-2012-4445.patch b/package/hostapd/hostapd-cve-2012-4445.patch
new file mode 100644
index 0000000000..034a458019
--- /dev/null
+++ b/package/hostapd/hostapd-cve-2012-4445.patch
@@ -0,0 +1,49 @@
+From 567bacefd73782508bfe72d3624df495f0df4cd1 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Sun, 7 Oct 2012 20:06:29 +0300
+Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
+
+EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
+Message Length value properly and could end up trying to store more
+information into the message buffer than the allocated size if the first
+fragment is longer than the indicated size. This could result in hostapd
+process terminating in wpabuf length validation. Fix this by rejecting
+messages that have invalid TLS Message Length value.
+
+This would affect cases that use the internal EAP authentication server
+in hostapd either directly with IEEE 802.1X or when using hostapd as a
+RADIUS authentication server and when receiving an incorrectly
+constructed EAP-TLS message. Cases where hostapd uses an external
+authentication are not affected.
+
+Thanks to Timo Warns for finding and reporting this issue.
+
+Signed-hostap: Jouni Malinen <j@w1.fi>
+intended-for: hostap-1
+(cherry picked from commit 586c446e0ff42ae00315b014924ec669023bd8de)
+---
+ src/eap_server/eap_server_tls_common.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
+index e149ee3..2cbe700 100644
+--- a/src/eap_server/eap_server_tls_common.c
++++ b/src/eap_server/eap_server_tls_common.c
+@@ -224,6 +224,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
+ 			return -1;
+ 		}
+ 
++		if (len > message_length) {
++			wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
++				   "first fragment of frame (TLS Message "
++				   "Length %d bytes)",
++				   (int) len, (int) message_length);
++			return -1;
++		}
++
+ 		data->tls_in = wpabuf_alloc(message_length);
+ 		if (data->tls_in == NULL) {
+ 			wpa_printf(MSG_DEBUG, "SSL: No memory for message");
+-- 
+1.7.4-rc1
+

From c8fd94218ee6284061552ca5de2256417a21bcb9 Mon Sep 17 00:00:00 2001
From: Jean-Mickael Guerin <jean-mickael.guerin@6wind.com>
Date: Fri, 12 Oct 2012 10:25:50 +0000
Subject: [PATCH 3022/6849] toolchain: have check_glibc to search deeper for
 ld-linux

ld-linux*.so may not be present in lib/ directory, it could be
in lib32 and/or lib64 only. But check_glibc reports
"Incorrect selection of the C library" in this case, which is
not true.
Fixed by extending the search to  SYSROOT/*/*.

Signed-off-by: Jean-Mickael Guerin <jean-mickael.guerin@6wind.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index d5ab91b3d5..497cfff224 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -196,7 +196,7 @@ check_glibc_feature = \
 #
 check_glibc = \
 	SYSROOT_DIR="$(strip $1)"; \
-	if test `find $${SYSROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
+	if test `find $${SYSROOT_DIR}/ -maxdepth 2 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \

From 2073c21ec041b6404b19e17e0f139ddbc639a35f Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 19 Oct 2012 03:05:17 +0000
Subject: [PATCH 3023/6849] package/time: New package for GNU time.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/time/Config.in |  6 ++++++
 package/time/time.mk   | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/time/Config.in
 create mode 100644 package/time/time.mk

diff --git a/package/Config.in b/package/Config.in
index d7b3db6ebc..dd4c97ec1f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -672,6 +672,7 @@ source "package/logsurfer/Config.in"
 source "package/screen/Config.in"
 source "package/sudo/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/time/Config.in"
 source "package/which/Config.in"
 endif
 source "package/xmlstarlet/Config.in"
diff --git a/package/time/Config.in b/package/time/Config.in
new file mode 100644
index 0000000000..634d41a498
--- /dev/null
+++ b/package/time/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_TIME
+	bool "time"
+	help
+	  The GNU time utility.
+
+	  http://savannah.gnu.org/projects/time/
diff --git a/package/time/time.mk b/package/time/time.mk
new file mode 100644
index 0000000000..7b53286def
--- /dev/null
+++ b/package/time/time.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# time
+#
+#############################################################
+
+TIME_VERSION = 1.7
+TIME_SITE = $(BR2_GNU_MIRROR)/time
+TIME_CONF_ENV = ac_cv_func_wait3=yes
+
+# time uses an old version of automake that does not support
+# installing in DESTDIR.
+define TIME_INSTALL_TARGET_CMDS
+	install -D -m 755  $(@D)/time $(TARGET_DIR)/usr/bin/time
+endef
+
+$(eval $(autotools-package))

From fdb79a1b57c0b33b517e5799befd9ca4840ead8a Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 19 Oct 2012 06:27:35 +0000
Subject: [PATCH 3024/6849] package/liburcu: Bump version to 0.7.5.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liburcu/liburcu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index bd69137683..0bfba37a39 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -3,7 +3,7 @@
 # liburc: userspace RCU (read-copy-update) library
 #
 #############################################################
-LIBURCU_VERSION = 0.7.3
+LIBURCU_VERSION = 0.7.5
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 

From aa866e877b98aabd54f25cfff14a31ee01716c3a Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 19 Oct 2012 06:27:38 +0000
Subject: [PATCH 3025/6849] package/lttng-tools: Bump to version 2.0.4.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-tools/lttng-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 7a0a7b4969..fe48ac6fae 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -3,7 +3,7 @@
 # LTTng-Tools: the trace control client
 #
 #############################################################
-LTTNG_TOOLS_VERSION = 2.0.1
+LTTNG_TOOLS_VERSION = 2.0.4
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 

From 3d48c41284d0daee0b70312022c7c6d31f730eb7 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Fri, 19 Oct 2012 06:27:47 +0000
Subject: [PATCH 3026/6849] package/lttng-babeltrace: Bump version to
 1.0.0-rc6.

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...tng-babeltrace-no-posix-fallocate-in-uclibc.patch} |  0
 package/lttng-babeltrace/lttng-babeltrace.mk          | 11 ++---------
 2 files changed, 2 insertions(+), 9 deletions(-)
 rename package/lttng-babeltrace/{lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch => lttng-babeltrace-no-posix-fallocate-in-uclibc.patch} (100%)

diff --git a/package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch
similarity index 100%
rename from package/lttng-babeltrace/lttng-babeltrace-0.8-no-posix-fallocate-in-uclibc.patch
rename to package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 0f3200f34a..dd701dfe5b 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -1,14 +1,7 @@
-LTTNG_BABELTRACE_SITE    = http://lttng.org/files/bundles/20111214/
-LTTNG_BABELTRACE_VERSION = 0.8
+LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
+LTTNG_BABELTRACE_VERSION = 1.0.0-rc6
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
-# Needed to fix libtool handling, otherwise the build fails when
-# building the ctf-parser-test program, which depends on libctf-ast.so
-# which itself depends on libbabeltrace_types.so.0 (and libtool gets
-# lost in the middle of this).
-LTTNG_BABELTRACE_AUTORECONF      = YES
-HOST_LTTNG_BABELTRACE_AUTORECONF = YES
-
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
 
 $(eval $(autotools-package))

From 7063985d6fa10ddf04c810b830b9dd9c4b7e6b34 Mon Sep 17 00:00:00 2001
From: Alexander Khryukin <alexander@mezon.ru>
Date: Thu, 11 Oct 2012 01:57:52 +0000
Subject: [PATCH 3027/6849] vala version update 0.18.0

Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index e4b8b54da5..5c333c5fad 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-VALA_VERSION_MAJOR = 0.17
-VALA_VERSION_MINOR = 7
+VALA_VERSION_MAJOR = 0.18
+VALA_VERSION_MINOR = 0
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz

From 464e88c8bd90e52fa128dae2ce20a0edd9a9f0e9 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 16 Oct 2012 09:30:14 +0000
Subject: [PATCH 3028/6849] macchanger: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  (build-test with a WCHAR-only internal powerpc toolchain)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/macchanger/Config.in     |  7 +++++++
 package/macchanger/macchanger.mk | 11 +++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/macchanger/Config.in
 create mode 100644 package/macchanger/macchanger.mk

diff --git a/package/Config.in b/package/Config.in
index dd4c97ec1f..b78d98071c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -573,6 +573,7 @@ endif
 source "package/links/Config.in"
 source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
+source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
 source "package/mrouted/Config.in"
 source "package/msmtp/Config.in"
diff --git a/package/macchanger/Config.in b/package/macchanger/Config.in
new file mode 100644
index 0000000000..e26faa7ffd
--- /dev/null
+++ b/package/macchanger/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MACCHANGER
+	bool "macchanger"
+	help
+	  A GNU/Linux utility for viewing/manipulating the MAC address of
+	  network interfaces
+
+	  http://www.alobbs.com/macchanger
diff --git a/package/macchanger/macchanger.mk b/package/macchanger/macchanger.mk
new file mode 100644
index 0000000000..66ebb80fcc
--- /dev/null
+++ b/package/macchanger/macchanger.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# macchanger
+#
+#############################################################
+MACCHANGER_VERSION = 1.5.0
+MACCHANGER_SITE = $(BR2_GNU_MIRROR)/macchanger
+MACCHANGER_LICENSE = GPLv2
+MACCHANGER_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 6d4cdb081020bafa7062c6a8cf052b3d5000635c Mon Sep 17 00:00:00 2001
From: Alexander Varnin <fenixk19@mail.ru>
Date: Wed, 10 Oct 2012 23:34:26 +0000
Subject: [PATCH 3029/6849] New package liblog4c-localtime

[Peter: minor fixes]
Signed-off-by: Alexander Varnin <fenixk19@mail.ru>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                              |  1 +
 package/liblog4c-localtime/Config.in           | 11 +++++++++++
 .../liblog4c-localtime/liblog4c-localtime.mk   | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/liblog4c-localtime/Config.in
 create mode 100644 package/liblog4c-localtime/liblog4c-localtime.mk

diff --git a/package/Config.in b/package/Config.in
index b78d98071c..2ba68cf3d7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -485,6 +485,7 @@ source "package/poco/Config.in"
 source "package/protobuf/Config.in"
 source "package/schifra/Config.in"
 source "package/startup-notification/Config.in"
+source "package/liblog4c-localtime/Config.in"
 endmenu
 
 menu "Text and terminal handling"
diff --git a/package/liblog4c-localtime/Config.in b/package/liblog4c-localtime/Config.in
new file mode 100644
index 0000000000..a2b7a843f1
--- /dev/null
+++ b/package/liblog4c-localtime/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBLOG4C_LOCALTIME
+	bool "liblog4c-localtime"
+	select BR2_PACKAGE_EXPAT
+	help
+	  Log4c is a library of C for flexible logging to files, syslog
+	  and other destinations.
+	  This version is with localtime patch, to make lib show times in
+	  local timezone.
+
+	  https://github.com/rcmadruga/log4c-localtime
+	  http://log4c.sourceforge.net/
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
new file mode 100644
index 0000000000..3b1642cf1d
--- /dev/null
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -0,0 +1,18 @@
+ #############################################################
+ #
+ # liblog4c
+ #
+ #############################################################
+ LIBLOG4C_LOCALTIME_VERSION = 1.0
+ LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
+ LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
+ LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
+ LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
+
+define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
+	chmod +x $(@D)/configure
+endef
+
+LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
+
+ $(eval $(autotools-package))

From 787278356d19771ed32c8addd45480beae78a303 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Mon, 15 Oct 2012 03:51:47 +0000
Subject: [PATCH 3030/6849] webkit: Fix build issue with gcc-4.6 and above

This fixes the "Unknown parameter for tags/attrs" build error.
Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe

[PATCH] 2011-04-17  Thierry Reding
<thierry.reding@avionic-design.de>

  Reviewed by Adam Barth.

  Fix build with GCC 4.6.

  * dom/make_names.pl: Execute preprocessor without the -P option. The
  preprocessor in GCC 4.6 eats empty lines, effectively breaking the
  parsing performed by this script. Dropping the -P option when invoking
  the preprocessor keeps the empty lines but as a side-effect also adds
  additional linemarkers.

  From the cpp manpage:

    -P  Inhibit generation of linemarkers in the output from the
        preprocessor. This might be useful when running the preprocessor
        on something that is not C code, and will be sent to a program
        which might be confused by the linemarkers.

  The linemarkers are not problematic, however, because the script
  properly handles them by ignoring all lines starting with a #.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../webkit-fix-build-with-gcc-4-6.patch       | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/webkit/webkit-fix-build-with-gcc-4-6.patch

diff --git a/package/webkit/webkit-fix-build-with-gcc-4-6.patch b/package/webkit/webkit-fix-build-with-gcc-4-6.patch
new file mode 100644
index 0000000000..181c7f52fc
--- /dev/null
+++ b/package/webkit/webkit-fix-build-with-gcc-4-6.patch
@@ -0,0 +1,45 @@
+Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe:
+Removed the ChangeLog part.
+
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Mon, 18 Apr 2011 06:53:23 +0000
+Subject: [PATCH] 2011-04-17  Thierry Reding 
+ <thierry.reding@avionic-design.de>
+
+        Reviewed by Adam Barth.
+
+        Fix build with GCC 4.6.
+
+        * dom/make_names.pl: Execute preprocessor without the -P option. The
+        preprocessor in GCC 4.6 eats empty lines, effectively breaking the
+        parsing performed by this script. Dropping the -P option when invoking
+        the preprocessor keeps the empty lines but as a side-effect also adds
+        additional linemarkers.
+
+        From the cpp manpage:
+
+          -P  Inhibit generation of linemarkers in the output from the
+              preprocessor. This might be useful when running the preprocessor
+              on something that is not C code, and will be sent to a program
+              which might be confused by the linemarkers.
+
+        The linemarkers are not problematic, however, because the script
+        properly handles them by ignoring all lines starting with a #.
+
+diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl
+index 836137e..50386e0 100755
+--- a/WebCore/dom/make_names.pl
++++ b/WebCore/dom/make_names.pl
+@@ -54,7 +54,7 @@ if ($ENV{CC}) {
+ } else {
+     $gccLocation = "/usr/bin/gcc";
+ }
+-my $preprocessor = $gccLocation . " -E -P -x c++";
++my $preprocessor = $gccLocation . " -E -x c++";
+ 
+ GetOptions(
+     'tags=s' => \$tagsFile, 
+-- 
+1.7.11.4
+

From 0a227142c9bdbd234031e107ce920c94aa85bb1b Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 18 Oct 2012 08:56:39 +0000
Subject: [PATCH 3031/6849] luajit: bump to version 2.0.0-beta11

this release includes my 2 requests, see http://www.freelists.org/post/luajit/LuaJIT-on-Buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luajit/luajit-01-root-path.patch      | 10 +++++-----
 package/luajit/luajit-02-shared-lib.patch     |  2 +-
 package/luajit/luajit-03-dont-strip.patch     |  2 +-
 package/luajit/luajit-04-no-bin-symlink.patch | 12 ++++++------
 package/luajit/luajit.mk                      | 17 +++++++++++------
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/package/luajit/luajit-01-root-path.patch b/package/luajit/luajit-01-root-path.patch
index 3b0a585fa0..80ad1e9da4 100644
--- a/package/luajit/luajit-01-root-path.patch
+++ b/package/luajit/luajit-01-root-path.patch
@@ -7,10 +7,10 @@ Index: b/src/luaconf.h
 ===================================================================
 --- a/src/luaconf.h
 +++ b/src/luaconf.h
-@@ -22,9 +22,9 @@
- #define LUA_CPATH_DEFAULT \
-   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
+@@ -26,9 +26,9 @@
+ ** Note to distribution maintainers: do NOT patch the following line!
+ ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
+ */
 -#define LUA_ROOT	"/usr/local/"
 -#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
 -#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
@@ -18,5 +18,5 @@ Index: b/src/luaconf.h
 +#define LUA_LDIR	LUA_ROOT "share/lua/"
 +#define LUA_CDIR	LUA_ROOT "lib/lua/"
  #ifdef LUA_XROOT
- #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta10/"
+ #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta11/"
  #define LUA_XPATH \
diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
index d5122ba0e5..361e5c2721 100644
--- a/package/luajit/luajit-02-shared-lib.patch
+++ b/package/luajit/luajit-02-shared-lib.patch
@@ -6,7 +6,7 @@ Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -629,7 +629,7 @@
+@@ -669,7 +669,7 @@
  
  $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP)
  	$(E) "LINK      $@"
diff --git a/package/luajit/luajit-03-dont-strip.patch b/package/luajit/luajit-03-dont-strip.patch
index 9651cdfd95..66bdadf139 100644
--- a/package/luajit/luajit-03-dont-strip.patch
+++ b/package/luajit/luajit-03-dont-strip.patch
@@ -8,7 +8,7 @@ Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -625,12 +625,10 @@
+@@ -665,12 +665,10 @@
  $(LUAJIT_SO): $(LJVMCORE_O)
  	$(E) "DYNLINK   $@"
  	$(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS)
diff --git a/package/luajit/luajit-04-no-bin-symlink.patch b/package/luajit/luajit-04-no-bin-symlink.patch
index 3eed7decb0..91a470a66e 100644
--- a/package/luajit/luajit-04-no-bin-symlink.patch
+++ b/package/luajit/luajit-04-no-bin-symlink.patch
@@ -6,7 +6,7 @@ Index: b/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -41,8 +41,7 @@
+@@ -43,8 +43,7 @@
  INSTALL_MAN= $(INSTALL_SHARE)/man/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
@@ -16,7 +16,7 @@ Index: b/Makefile
  INSTALL_ANAME= libluajit-$(ABIVER).a
  INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
  INSTALL_SOSHORT= libluajit-$(ABIVER).so
-@@ -56,7 +55,6 @@
+@@ -58,7 +57,6 @@
  INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
  INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
  INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
@@ -24,10 +24,10 @@ Index: b/Makefile
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
  
  INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-@@ -114,13 +112,6 @@
+@@ -120,13 +118,6 @@
  	  $(RM) $(FILE_PC).tmp
  	cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
- 	cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+ 	cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
 -	@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
 -	@echo ""
 -	@echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
@@ -36,5 +36,5 @@ Index: b/Makefile
 -	@echo "  $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
 -	@echo ""
  
- ##############################################################################
- 
+ uninstall:
+ 	@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 913bc0c9e8..2583f929bb 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUAJIT_VERSION = 2.0.0-beta10
+LUAJIT_VERSION = 2.0.0-beta11
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE    = http://luajit.org/download
 LUAJIT_LICENSE = MIT
@@ -12,12 +12,8 @@ LUAJIT_LICENSE_FILES = COPYRIGHT
 
 LUAJIT_INSTALL_STAGING = YES
 
-define LUAJIT_NOLARGEFILE_FIX_MAKEFILE
-	$(SED) 's/TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/TARGET_XCFLAGS=/' $(@D)/src/Makefile
-endef
-
 ifneq ($(BR2_LARGEFILE),y)
-LUAJIT_POST_PATCH_HOOKS += LUAJIT_NOLARGEFILE_FIX_MAKEFILE
+LUAJIT_NO_LARGEFILE = TARGET_LFSFLAGS=
 endif
 
 # The luajit build procedure requires the host compiler to have the
@@ -47,6 +43,7 @@ define LUAJIT_BUILD_CMDS
 		HOST_CC="$(LUAJIT_HOST_CC)" \
 		HOST_CFLAGS="$(HOST_CFLAGS)" \
 		HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+		$(LUAJIT_NO_LARGEFILE) \
 		-C $(@D) amalg
 endef
 
@@ -58,6 +55,14 @@ define LUAJIT_INSTALL_TARGET_CMDS
 	$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install
 endef
 
+define LUAJIT_UNINSTALL_STAGING_CMDS
+	$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) uninstall
+endef
+
+define LUAJIT_UNINSTALL_TARGET_CMDS
+	$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) uninstall
+endef
+
 define LUAJIT_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef

From a34896a8d7ee175d90b8cce244d4cfa11863292a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 11 Oct 2012 09:46:39 +0000
Subject: [PATCH 3032/6849] newt: convert to autotools-package infra

[Peter: drop uneeded configure args, full install to target]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/newt/newt-fix-makefile.patch |  42 +++++++++++
 package/newt/newt.mk                 | 106 ++++++++-------------------
 2 files changed, 71 insertions(+), 77 deletions(-)
 create mode 100644 package/newt/newt-fix-makefile.patch

diff --git a/package/newt/newt-fix-makefile.patch b/package/newt/newt-fix-makefile.patch
new file mode 100644
index 0000000000..227b0f3fc7
--- /dev/null
+++ b/package/newt/newt-fix-makefile.patch
@@ -0,0 +1,42 @@
+Fix Makefile.in
+
+* Remove -Os from the CFLAGS (already handled by Buildroot)
+* Use $(CC) instead of $(CPP) to generate .depend file because
+  '$(CPP) -M' call does not support multiple input files.
+  This avoid the following error:
+
+make[1]: Entering directory `/opt/br/output/build/newt-0.51.0'
+/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend
+arm-none-linux-gnueabi-cpp: too many input files
+make[1]: *** [depend] Error 1
+make[1]: Leaving directory 
+`/opt/br/output/build/newt-0.51.0'
+make: *** 
+[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+Index: newt-0.51.0/Makefile.in
+===================================================================
+--- newt-0.51.0.orig/Makefile.in	2012-10-10 22:43:42.042318041 +0200
++++ newt-0.51.0/Makefile.in	2012-10-11 21:25:44.063873277 +0200
+@@ -3,7 +3,7 @@ SHLIBS = -lslang -lm -lc
+ 
+ GPM_SUPPORT=@gpm_support@
+ 
+-CFLAGS = -Wall -Os -D_GNU_SOURCE
++CFLAGS += -D_GNU_SOURCE
+ 
+ VERSION = @VERSION@
+ CVSTAG = r$(subst .,-,$(VERSION))
+@@ -86,7 +86,7 @@ clean:
+ 		$(SHAREDOBJS) *.so*
+ 
+ depend:
+-	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
++	$(CC) $(CFLAGS) -M $(SOURCES) > .depend
+ 
+ $(SHAREDDIR):
+ 	mkdir -p $(SHAREDDIR)
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index b10e4f8e2f..8a0c647ada 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -3,80 +3,32 @@
 # newt
 #
 #############################################################
-NEWT_SOURCE=newt-0.51.0.tar.bz2
-NEWT_CAT:=$(BZCAT)
-NEWT_SITE=http://www.uclibc.org/
-NEWT_DIR=$(BUILD_DIR)/newt-0.51.0
-NEWT_VERSION=0.51.0
-NEWT_CFLAGS=-Os -g -fPIC
-
-$(DL_DIR)/$(NEWT_SOURCE):
-	$(call DOWNLOAD,$(NEWT_SITE)/$(NEWT_SOURCE))
-
-$(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE)
-	$(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(NEWT_DIR)/.source
-
-$(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
-	(cd $(NEWT_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_NLS) \
-	)
-	touch $(NEWT_DIR)/.configured
-
-$(NEWT_DIR)/libnewt.so.$(NEWT_VERSION): $(NEWT_DIR)/.configured
-	$(MAKE1) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR)
-	touch -c $@
-
-$(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION)
-	cp -a $(NEWT_DIR)/libnewt.a $(STAGING_DIR)/usr/lib/
-	cp -a $(NEWT_DIR)/newt.h $(STAGING_DIR)/usr/include/
-	cp -a $(NEWT_DIR)/libnewt.so* $(STAGING_DIR)/usr/lib/
-	(cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so)
-	(cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so.0.51)
-	touch -c $@
-
-$(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt.a
-	cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so*
-	touch -c $@
-
-newt-legal-info:
-	@$(call legal-warning-pkg,newt,legal-info not yet implemented)
-
-newt: slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION)
-
-newt-source: $(DL_DIR)/$(NEWT_SOURCE)
-
-newt-clean:
-	rm -f $(TARGET_DIR)/usr/lib/libnewt.so*
-	-$(MAKE) -C $(NEWT_DIR) clean
-
-newt-dirclean: slang-dirclean
-	rm -rf $(NEWT_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NEWT),y)
-TARGETS+=newt
-endif
+NEWT_VERSION         = 0.51.0
+NEWT_SITE            = http://www.uclibc.org/
+NEWT_SOURCE          = newt-$(NEWT_VERSION).tar.bz2
+NEWT_LICENSE         = GPLv2
+NEWT_LICENSE_FILES   = COPYING
+NEWT_INSTALL_STAGING = YES
+
+NEWT_DEPENDENCIES = slang
+
+NEWT_MAKE_ENV += $(TARGET_CONFIGURE_OPTS)
+NEWT_MAKE = $(MAKE1)
+
+define NEWT_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m644 $(@D)/newt.h    $(STAGING_DIR)/usr/include/newt.h
+	$(INSTALL) -D -m644 $(@D)/libnewt.a $(STAGING_DIR)/usr/lib/libnewt.a
+	$(INSTALL) -m755 $(@D)/libnewt.so*  $(STAGING_DIR)/usr/lib/
+	ln -fs libnewt.so.$(NEWT_VERSION)   $(STAGING_DIR)/usr/lib/libnewt.so
+	ln -fs libnewt.so.$(NEWT_VERSION)   $(STAGING_DIR)/usr/lib/libnewt.so.0.51
+endef
+
+define NEWT_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m644 $(@D)/newt.h    $(TARGET_DIR)/usr/include/newt.h
+	$(INSTALL) -D -m644 $(@D)/libnewt.a $(TARGET_DIR)/usr/lib/libnewt.a
+	$(INSTALL) -m755 $(@D)/libnewt.so*  $(TARGET_DIR)/usr/lib/
+	ln -fs libnewt.so.$(NEWT_VERSION)   $(TARGET_DIR)/usr/lib/libnewt.so
+	ln -fs libnewt.so.$(NEWT_VERSION)   $(TARGET_DIR)/usr/lib/libnewt.so.0.51
+endef
+
+$(eval $(autotools-package))

From 93e4785aa4057649fdeb18954a51c4a1bc833eea Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 21 Sep 2012 12:28:38 +0000
Subject: [PATCH 3033/6849] manual: remove Manual Makefile section

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-handwritten.txt | 167 --------------------
 docs/manual/adding-packages.txt             |   2 -
 2 files changed, 169 deletions(-)
 delete mode 100644 docs/manual/adding-packages-handwritten.txt

diff --git a/docs/manual/adding-packages-handwritten.txt b/docs/manual/adding-packages-handwritten.txt
deleted file mode 100644
index beb25f6877..0000000000
--- a/docs/manual/adding-packages-handwritten.txt
+++ /dev/null
@@ -1,167 +0,0 @@
-[[handwritten-tutorial]]
-
-Manual Makefile
----------------
-
-*NOTE: new manual makefiles should not be created, and existing manual
-makefiles should be converted either to the generic, autotools or
-cmake infrastructure. This section is only kept to document the
-existing manual makefiles and to help understand how they work.*
-
-------------------------
-01: #############################################################
-02: #
-03: # libfoo
-04: #
-05: #############################################################
-06: LIBFOO_VERSION = 1.0
-07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE = http://www.foosoftware.org/downloads
-09: LIBFOO_DIR = $(BUILD_DIR)/foo-$(FOO_VERSION)
-10: LIBFOO_BINARY = foo
-11: LIBFOO_TARGET_BINARY = usr/bin/foo
-12:
-13: $(DL_DIR)/$(LIBFOO_SOURCE):
-14: 	$(call DOWNLOAD,$(LIBFOO_SITE)/$(LIBFOO_SOURCE))
-15:
-16: $(LIBFOO_DIR)/.source: $(DL_DIR)/$(LIBFOO_SOURCE)
-17: 	$(ZCAT) $(DL_DIR)/$(LIBFOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-18: 	touch $@
-19:
-20: $(LIBFOO_DIR)/.configured: $(LIBFOO_DIR)/.source
-21: 	(cd $(LIBFOO_DIR); rm -rf config.cache; \
-22: 		$(TARGET_CONFIGURE_OPTS) \
-23: 		$(TARGET_CONFIGURE_ARGS) \
-24: 		./configure \
-25: 		--target=$(GNU_TARGET_NAME) \
-26: 		--host=$(GNU_TARGET_NAME) \
-27: 		--build=$(GNU_HOST_NAME) \
-28: 		--prefix=/usr \
-29: 		--sysconfdir=/etc \
-30: 	)
-31: 	touch $@
-32:
-33: $(LIBFOO_DIR)/$(LIBFOO_BINARY): $(LIBFOO_DIR)/.configured
-34: 	$(MAKE) CC=$(TARGET_CC) -C $(LIBFOO_DIR)
-35:
-36: $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY): $(LIBFOO_DIR)/$(LIBFOO_BINARY)
-37: 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIBFOO_DIR) install-strip
-38: 	rm -Rf $(TARGET_DIR)/usr/man
-39:
-40: libfoo: uclibc ncurses $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY)
-41:
-42: libfoo-source: $(DL_DIR)/$(LIBFOO_SOURCE)
-43:
-44: libfoo-clean:
-45: 	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBFOO_DIR) uninstall
-46: 	-$(MAKE) -C $(LIBFOO_DIR) clean
-47:
-48: libfoo-dirclean:
-49: 	rm -rf $(LIBFOO_DIR)
-50:
-51: #############################################################
-52: #
-53: # Toplevel Makefile options
-54: #
-55: #############################################################
-56: ifeq ($(BR2_PACKAGE_LIBFOO),y)
-57: TARGETS += libfoo
-58: endif
-------------------------
-
-First of all, this Makefile example works for a package which
-comprises a single binary executable. For other software, such as
-libraries or more complex stuff with multiple binaries, it must be
-qqadapted. For examples look at the other +*.mk+ files in the
-+package+ directory.
-
-At lines 6-11, a couple of useful variables are defined:
-
-* +LIBFOO_VERSION+: The version of 'libfoo' that should be downloaded.
-
-* +LIBFOO_SOURCE+: The name of the tarball of 'libfoo' on the download
-  website or FTP site. As you can see +LIBFOO_VERSION+ is used.
-
-* +LIBFOO_SITE+: The HTTP or FTP site from which 'libfoo' archive is
-  downloaded. It must include the complete path to the directory where
-  +LIBFOO_SOURCE+ can be found.
-
-* +LIBFOO_DIR+: The directory into which the software will be
-  configured and compiled. Basically, it's a subdirectory of
-  +BUILD_DIR+ which is created upon decompression of the tarball.
-
-* +LIBFOO_BINARY+: Software binary name. As said previously, this is
-  an example for a package with a single binary.
-
-* +LIBFOO_TARGET_BINARY+: The full path of the binary inside the
-  target filesystem.  Lines 13-14 define a target that downloads the
-  tarball from the remote site to the download directory (+DL_DIR+).
-
-Lines 16-18 define a target and associated rules that uncompress the
-downloaded tarball. As you can see, this target depends on the tarball
-file so that the previous target (lines 13-14) is called before
-executing the rules of the current target. Uncompressing is followed
-by 'touching' a hidden file to mark the software as having been
-uncompressed. This trick is used everywhere in a Buildroot Makefile to
-split steps (download, uncompress, configure, compile, install) while
-still having correct dependencies.
-
-Lines 20-31 define a target and associated rules that configure the
-software. It depends on the previous target (the hidden +.source+
-file) so that we are sure the software has been uncompressed. In order
-to configure the package, it basically runs the well-known
-+./configure+ script. As we may be doing cross-compilation, +target+,
-+host+ and +build+ arguments are given. The prefix is also set to
-+/usr+, not because the software will be installed in +/usr+ on your
-host system, but because the software will be installed in + /usr+ on
-the target filesystem. Finally it creates a +.configured+ file to mark
-the software as configured.
-
-Lines 33-34 define a target and a rule that compile the software. This
-target will create the binary file in the compilation directory and
-depends on the software being already configured (hence the reference
-to the +.configured+ file).  It basically runs +make+ inside the
-source directory.
-
-Lines 36-38 define a target and associated rules that install the
-software inside the target filesystem. They depend on the binary file
-in the source directory to make sure the software has been
-compiled. They use the +install-strip+ target of the software
-+Makefile+ by passing a +DESTDIR+ argument so that the +Makefile+
-doesn't try to install the software in the host +/usr+ but rather in
-the target +/usr+. After the installation, the +/usr/man + directory
-inside the target filesystem is removed to save space.
-
-Line 40 defines the main target of the software &mdash; the one that
-will eventually be used by the top level +Makefile+ to download,
-compile, and then install this package. This target should first of
-all depend on all needed dependencies of the software (in our example,
-'uclibc' and 'ncurses') and also depend on the final binary. This last
-dependency will call all previous dependencies in the correct order.
-
-Line 42 defines a simple target that only downloads the code
-source. This is not used during normal operation of Buildroot, but is
-needed if you intend to download all required sources at once for
-later offline build. Note that if you add a new package, providing a
-+libfoo-source+ target is 'mandatory' to support users that wish to do
-offline-builds. Furthermore, it eases checking if all package-sources
-are downloadable.
-
-Lines 44-46 define a simple target to clean the software build by
-calling the Makefile with the appropriate options.  The +-clean+
-target should run +make clean+ on $(BUILD_DIR)/package-version and
-MUST uninstall all files of the package from $(STAGING_DIR) and from
-$(TARGET_DIR).
-
-Lines 48-49 define a simple target to completely remove the directory
-in which the software was uncompressed, configured and compiled. The
-+-dirclean+ target MUST completely rm $(BUILD_DIR)/ package-version.
-
-Lines 51-58 add the target +libfoo+ to the list of targets to be
-compiled by Buildroot, by first checking if the configuration option
-for this package has been enabled using the configuration tool. If so,
-it then &quot;subscribes&quot; this package to be compiled by adding
-the package to the TARGETS global variable.  The name added to the
-TARGETS global variable is the name of this package's target, as
-defined on line 40, which is used by Buildroot to download, compile,
-and then install this package.
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index cb75f2daae..f672ec625b 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -15,8 +15,6 @@ include::adding-packages-autotools.txt[]
 
 include::adding-packages-cmake.txt[]
 
-include::adding-packages-handwritten.txt[]
-
 include::adding-packages-gettext.txt[]
 
 include::adding-packages-conclusion.txt[]

From eed671a9b141870000d074a229f350f776d48bbd Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Fri, 21 Sep 2012 20:59:49 +0000
Subject: [PATCH 3034/6849] qtuio: new package

Implementation of an interface connecting TUIO messages and QT events

https://github.com/x29a/qTUIO

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 build-tested with a minimal internal toolchain for ARM.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  6 ++++
 package/qtuio/Config.in | 18 +++++++++++
 package/qtuio/qtuio.mk  | 69 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 package/qtuio/Config.in
 create mode 100644 package/qtuio/qtuio.mk

diff --git a/package/Config.in b/package/Config.in
index 2ba68cf3d7..6842aab382 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -134,6 +134,12 @@ source "package/sdl_gfx/Config.in"
 comment "other GUIs"
 source "package/efl/Config.in"
 source "package/qt/Config.in"
+
+if BR2_PACKAGE_QT
+comment "QT libraries and helper libraries"
+source "package/qtuio/Config.in"
+endif
+
 source "package/x11r7/Config.in"
 
 comment "X libraries and helper libraries"
diff --git a/package/qtuio/Config.in b/package/qtuio/Config.in
new file mode 100644
index 0000000000..19499fd6e0
--- /dev/null
+++ b/package/qtuio/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_QTUIO
+	bool "qtuio"
+	depends on BR2_PACKAGE_QT_GUI_MODULE
+	help
+	  Implementation of an interface connecting TUIO messages
+	  and QT events
+
+	  https://github.com/x29a/qTUIO
+
+config BR2_QTUIO_EXAMPLES
+	bool "qtuio examples"
+	depends on BR2_PACKAGE_QTUIO
+	help
+	  Build and install qtuio examples
+
+comment "qtuio depends on QT gui module"
+	depends on !BR2_PACKAGE_QT_GUI_MODULE
+
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
new file mode 100644
index 0000000000..0ac88746f2
--- /dev/null
+++ b/package/qtuio/qtuio.mk
@@ -0,0 +1,69 @@
+#############################################################
+#
+# qTUIO
+#
+#############################################################
+QTUIO_VERSION = abe4973ff6
+QTUIO_SITE = git://github.com/x29a/qTUIO.git
+QTUIO_INSTALL_STAGING = YES
+QTUIO_DEPENDENCIES = qt
+
+QTUIO_LICENSE = GPLv3+
+QTUIO_LICENSE_FILES = COPYING
+
+# The pong example needs QtOpenGL support, which might become available
+# some time in the future. Then add pong to the list of examples.
+QTUIO_EXAMPLES = dials fingerpaint knobs pinchzoom
+
+ifeq ($(BR2_QTUIO_EXAMPLES),y)
+define QTUIO_CONFIGURE_EXAMPLES
+	for example in $(QTUIO_EXAMPLES) ; do \
+		(cd $(@D)/examples/$${example} && $(QT_QMAKE)) ; \
+	done
+endef
+endif
+
+define QTUIO_CONFIGURE_CMDS
+	cd $(@D)/src && $(QT_QMAKE)
+	$(QTUIO_CONFIGURE_EXAMPLES)
+endef
+
+ifeq ($(BR2_QTUIO_EXAMPLES),y)
+define QTUIO_BUILD_EXAMPLES
+	for example in $(QTUIO_EXAMPLES) ; do \
+		($(MAKE) -C $(@D)/examples/$${example}) ; \
+	done
+endef
+endif
+
+define QTUIO_BUILD_CMDS
+	$(MAKE) -C $(@D)/src
+	$(QTUIO_BUILD_EXAMPLES)
+endef
+
+# Unfortunately, there is no working "install" target available
+ifeq ($(BR2_QTUIO_EXAMPLES),y)
+define QTUIO_INSTALL_EXAMPLES
+	for example in $(QTUIO_EXAMPLES) ; do \
+		($(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example}) ; \
+	done
+endef
+endif
+
+define QTUIO_INSTALL_TARGET_CMDS
+	cp -dpf $(@D)/lib/libqTUIO.so* $(TARGET_DIR)/usr/lib
+	$(QTUIO_INSTALL_EXAMPLES)
+endef
+
+define QTUIO_INSTALL_STAGING_CMDS
+	cp -dpf $(@D)/lib/libqTUIO.so* $(STAGING_DIR)/usr/lib
+endef
+
+define QTUIO_CLEAN_CMDS
+	$(MAKE) -C $(@D)/src clean
+	for example in $(QTUIO_EXAMPLES) ; do \
+		($(MAKE) -C $(@D)/examples/$${example} clean) ; \
+	done
+endef
+
+$(eval $(generic-package))

From 0c5e24d48bdd63ce55cc8fb2b00f05b501876a60 Mon Sep 17 00:00:00 2001
From: Thiago Correa <thiago.correa@gmail.com>
Date: Fri, 5 Oct 2012 09:36:03 +0000
Subject: [PATCH 3035/6849] python-protobuf: Add support for Python
 implementation of Google's Protocol Buffers

Signed-off-by: Thiago A. Correa <thiago.correa@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/python-protobuf/Config.in          | 10 ++++++++
 package/python-protobuf/python-protobuf.mk | 28 ++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/python-protobuf/Config.in
 create mode 100644 package/python-protobuf/python-protobuf.mk

diff --git a/package/Config.in b/package/Config.in
index 6842aab382..1650c71488 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -289,6 +289,7 @@ source "package/python-mad/Config.in"
 source "package/python-meld3/Config.in"
 source "package/python-netifaces/Config.in"
 source "package/python-nfc/Config.in"
+source "package/python-protobuf/Config.in"
 source "package/python-pygame/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in
new file mode 100644
index 0000000000..ec2205757a
--- /dev/null
+++ b/package/python-protobuf/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_PROTOBUF
+	bool "python-protobuf"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  Python implementation of the Google Protocol Buffers.
+
+	  Protocol buffers are Google's language-neutral, platform-neutral,
+	  extensible mechanism for serializing structured data.
+
+	  http://code.google.com/p/protobuf/
diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
new file mode 100644
index 0000000000..d853deee47
--- /dev/null
+++ b/package/python-protobuf/python-protobuf.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# python-protobuf
+#
+#############################################################
+
+PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_SOURCE  = $(PROTOBUF_SOURCE)
+PYTHON_PROTOBUF_SITE    = $(PROTOBUF_SITE)
+PYTHON_PROTOBUF_LICENSE = BSD-3c
+PYTHON_PROTOBUF_LICENSE_FILES = COPYING.txt
+
+PYTHON_PROTOBUF_DEPENDENCIES = python host-python-setuptools \
+        host-python-distutilscross host-protobuf
+
+define PYTHON_PROTOBUF_BUILD_CMDS
+	(cd $(@D)/python; \
+		PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
+		PATH=$(HOST_PATH) \
+	$(HOST_DIR)/usr/bin/python setup.py build -x)
+endef
+
+define PYTHON_PROTOBUF_INSTALL_TARGET_CMDS
+	(cd $(@D)/python; PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From 6bcb68694f50cdc788114c77bdc7ed1ba39e0bef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 May 2012 01:22:48 +0000
Subject: [PATCH 3036/6849] binutils: add sysroot fix from bug #3049

Add binutils ld sysroot bug fix.
See http://sourceware.org/bugzilla/show_bug.cgi?id=10340

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../binutils-2.20.1/500-sysroot.patch         | 36 +++++++++++++++++++
 .../binutils/binutils-2.20/500-sysroot.patch  | 36 +++++++++++++++++++
 .../binutils-2.21.1/500-sysroot.patch         | 36 +++++++++++++++++++
 .../binutils/binutils-2.21/500-sysroot.patch  | 36 +++++++++++++++++++
 .../binutils/binutils-2.22/500-sysroot.patch  | 36 +++++++++++++++++++
 5 files changed, 180 insertions(+)
 create mode 100644 package/binutils/binutils-2.20.1/500-sysroot.patch
 create mode 100644 package/binutils/binutils-2.20/500-sysroot.patch
 create mode 100644 package/binutils/binutils-2.21.1/500-sysroot.patch
 create mode 100644 package/binutils/binutils-2.21/500-sysroot.patch
 create mode 100644 package/binutils/binutils-2.22/500-sysroot.patch

diff --git a/package/binutils/binutils-2.20.1/500-sysroot.patch b/package/binutils/binutils-2.20.1/500-sysroot.patch
new file mode 100644
index 0000000000..d21e4cb105
--- /dev/null
+++ b/package/binutils/binutils-2.20.1/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+      directory first.  */
+   if (! entry->is_archive)
+     {
+-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location. */
++      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	{
+ 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ 	    && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.20/500-sysroot.patch b/package/binutils/binutils-2.20/500-sysroot.patch
new file mode 100644
index 0000000000..d21e4cb105
--- /dev/null
+++ b/package/binutils/binutils-2.20/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+      directory first.  */
+   if (! entry->is_archive)
+     {
+-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location. */
++      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	{
+ 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ 	    && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.21.1/500-sysroot.patch b/package/binutils/binutils-2.21.1/500-sysroot.patch
new file mode 100644
index 0000000000..d21e4cb105
--- /dev/null
+++ b/package/binutils/binutils-2.21.1/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+      directory first.  */
+   if (! entry->is_archive)
+     {
+-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location. */
++      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	{
+ 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ 	    && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.21/500-sysroot.patch b/package/binutils/binutils-2.21/500-sysroot.patch
new file mode 100644
index 0000000000..d21e4cb105
--- /dev/null
+++ b/package/binutils/binutils-2.21/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+      directory first.  */
+   if (! entry->is_archive)
+     {
+-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location. */
++      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	{
+ 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ 	    && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.22/500-sysroot.patch b/package/binutils/binutils-2.22/500-sysroot.patch
new file mode 100644
index 0000000000..d21e4cb105
--- /dev/null
+++ b/package/binutils/binutils-2.22/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+      directory first.  */
+   if (! entry->is_archive)
+     {
+-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location. */
++      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	{
+ 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ 	    && is_sysrooted_pathname (entry->filename, TRUE);

From 05431ab52c5f7a4b3ff63b7a7a807eece6c051f9 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 14 Jul 2012 11:34:36 +0000
Subject: [PATCH 3037/6849] libplayer: fix handling of cflags in configure

Problem was found when compiling libplayer with GStreamer support
on x86_64 with a Sourcery toolchain.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libplayer-fix-configure-cflags.patch      | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/libplayer/libplayer-fix-configure-cflags.patch

diff --git a/package/libplayer/libplayer-fix-configure-cflags.patch b/package/libplayer/libplayer-fix-configure-cflags.patch
new file mode 100644
index 0000000000..186afd562e
--- /dev/null
+++ b/package/libplayer/libplayer-fix-configure-cflags.patch
@@ -0,0 +1,41 @@
+From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+Subject: [PATCH] libplayer: Fix handling of cflags in configure.
+
+The cflags returned by pkg-config or another config script may consist
+of several arguments for the compiler.  These should not be quoted together
+into a single argument.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+Sent upstream to devel@geexbox.org on July 11, 2012.
+---
+diff -rup libplayer-2.0.1.orig/configure libplayer-2.0.1/configure
+--- libplayer-2.0.1.orig/configure	2010-10-03 19:26:11.000000000 +0200
++++ libplayer-2.0.1/configure	2012-07-10 23:33:02.783701852 +0200
+@@ -342,7 +342,7 @@ check_libconfig(){
+   err=1
+   if `which "$config" 1>/dev/null 2>&1`; then
+     cflags=`$config $ccflags`
+-    [ -n "$cflags" ] && check_cflags "$cflags"
++    [ -n "$cflags" ] && check_cflags $cflags
+     libs=`$config $clibs`
+     if [ -n "$libs" ]; then
+       temp_extralibs "$libs"
+@@ -364,7 +364,7 @@ check_libconfig_exists(){
+   err=1
+   if `which "$config" 1>/dev/null 2>&1`; then
+     cflags=`$config $ccflags`
+-    [ -n "$cflags" ] && temp_cflags "$cflags"
++    [ -n "$cflags" ] && temp_cflags $cflags
+     libs=`$config $clibs`
+     if [ -n "$libs" ]; then
+       temp_extralibs "$libs"
+@@ -386,7 +386,7 @@ check_pkgconfig(){
+   err=1
+   if `which pkg-config 1>/dev/null 2>&1`; then
+     cflags=`pkg-config $pkg $ccflags`
+-    [ -n "$cflags" ] && check_cflags "$cflags"
++    [ -n "$cflags" ] && check_cflags $cflags
+     libs=`pkg-config $pkg $clibs`
+     if [ -n "$libs" ]; then
+       temp_extralibs "$libs"

From 6f6db416b845fcd446cdbcf79ba6ec0d42fef96b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 22 Oct 2012 11:54:01 +0200
Subject: [PATCH 3038/6849] kernel-headers: bump 3.{0,4,6}.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.46-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.47-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 10d03877c5..d4be60b381 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.46"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.47"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.32"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.14"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.15"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.2"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.3"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.46-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.47-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.46-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.47-headers_install-fix-__packed-in-exported-kernel-head.patch

From 97de600d1de0f82e6244a297267b56a5a6ca4f1d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 22 Oct 2012 11:54:44 +0200
Subject: [PATCH 3039/6849] linux: bump 3.6.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 257f934588..aa25f899f2 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6"
+	bool "3.6.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6" if BR2_LINUX_KERNEL_3_6
+	default "3.6.3" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 720893b62510438237b9923d744dd079ddb4f67d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 05:42:08 +0000
Subject: [PATCH 3040/6849] openssl: disable apps for NOMMU

The openssl binary uses fork() so disable the option and build for !MMU.
Fixes
http://autobuild.buildroot.net/results/45a9b84c16caadbf77b6fc43d7a0001c981a4c87/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/Config.in  |  2 ++
 package/openssl/openssl.mk | 17 +++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 6ba644a985..2187023e61 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -12,6 +12,8 @@ config BR2_PACKAGE_OPENSSL
 config BR2_PACKAGE_OPENSSL_BIN
 	bool "openssl binary"
 	depends on BR2_PACKAGE_OPENSSL
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  Install the openssl binary to the target file system. This is a
 	  command line tool for doing various crypthographic stuff.
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 0917344afa..265a4fbe8a 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -13,6 +13,15 @@ OPENSSL_DEPENDENCIES = zlib
 OPENSSL_TARGET_ARCH = generic32
 OPENSSL_CFLAGS = $(TARGET_CFLAGS)
 
+ifeq ($(BR2_PACKAGE_OPENSSL_BIN),)
+define OPENSSL_DISABLE_APPS
+	$(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org
+	$(SED) '/^DIRS=/ s/apps//' $(@D)/Makefile.org
+endef
+endif
+
+OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
+
 ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
 	OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
 	OPENSSL_DEPENDENCIES += ocf-linux
@@ -84,14 +93,6 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_DEV_FILES
 endif
 
-define OPENSSL_REMOVE_OPENSSL_BIN
-	rm -f $(TARGET_DIR)/usr/bin/openssl
-endef
-
-ifneq ($(BR2_PACKAGE_OPENSSL_BIN),y)
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_BIN
-endif
-
 define OPENSSL_INSTALL_FIXUPS
 	rm -f $(TARGET_DIR)/usr/bin/c_rehash
 endef

From 6a814437498a0d1bc7f841657cc8f13e2f738a7a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 02:40:28 +0000
Subject: [PATCH 3041/6849] mpd: bump to version 0.17.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 28cb4d21d3..fb4c5503ff 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.17.1
+MPD_VERSION = 0.17.2
 MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 MPD_DEPENDENCIES = host-pkg-config libglib2
 MPD_LICENSE = GPLv2

From f048127f0345e2a4475cca0e91769c0fa92f4d42 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 02:31:27 +0000
Subject: [PATCH 3042/6849] libfuse: bump to version 2.9.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/libfuse-iconv.patch | 18 ------------------
 package/libfuse/libfuse.mk          |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 package/libfuse/libfuse-iconv.patch

diff --git a/package/libfuse/libfuse-iconv.patch b/package/libfuse/libfuse-iconv.patch
deleted file mode 100644
index 9f500321a0..0000000000
--- a/package/libfuse/libfuse-iconv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream commit efeac22bfa65c845c04adb5e70e6de33b0104fa3 but without
-the need to autoreconf :)
-Fixes libiconv missing in fuse.pc
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura fuse-2.9.1/configure fuse-2.9.1.iconv/configure
---- fuse-2.9.1/configure	2012-07-19 09:53:29.000000000 -0300
-+++ fuse-2.9.1.iconv/configure	2012-09-07 08:47:57.834912620 -0300
-@@ -13237,7 +13237,7 @@
- 
-   fi
- 
--libfuse_libs=$libfuse_libs $LTLIBICONV
-+libfuse_libs="$libfuse_libs $LTLIBICONV"
-  if test "$am_cv_func_iconv" = yes; then
-   ICONV_TRUE=
-   ICONV_FALSE='#'
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 779115bfee..ccd49fedb9 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFUSE_VERSION = 2.9.1
+LIBFUSE_VERSION = 2.9.2
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 LIBFUSE_LICENSE = GPLv2 LGPLv2.1

From ff47e25d3a188a5cd27aa8e1520bc8cb49314db8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 09:36:35 +0000
Subject: [PATCH 3043/6849] toolchain/binutils: add version 2.23

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host               |  5 +++
 .../binutils/binutils-2.23/120-sh-conf.patch  | 29 +++++++++++++++
 .../300-001_ld_makefile_patch.patch           | 24 ++++++++++++
 .../300-012_check_ldrunpath_length.patch      | 21 +++++++++++
 .../binutils/binutils-2.23/500-sysroot.patch  | 37 +++++++++++++++++++
 5 files changed, 116 insertions(+)
 create mode 100644 package/binutils/binutils-2.23/120-sh-conf.patch
 create mode 100644 package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
 create mode 100644 package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
 create mode 100644 package/binutils/binutils-2.23/500-sysroot.patch

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index a13d61b4e5..26c5f73ad1 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -31,6 +31,10 @@ choice
 	config BR2_BINUTILS_VERSION_2_22
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.22"
+	
+	config BR2_BINUTILS_VERSION_2_23
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		bool "binutils 2.23"
 
 endchoice
 
@@ -42,6 +46,7 @@ config BR2_BINUTILS_VERSION
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
 	default "2.22"		if BR2_BINUTILS_VERSION_2_22
+	default "2.23"		if BR2_BINUTILS_VERSION_2_23
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
diff --git a/package/binutils/binutils-2.23/120-sh-conf.patch b/package/binutils/binutils-2.23/120-sh-conf.patch
new file mode 100644
index 0000000000..ea3d1b6068
--- /dev/null
+++ b/package/binutils/binutils-2.23/120-sh-conf.patch
@@ -0,0 +1,29 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+--- a/configure
++++ b/configure
+@@ -1495,7 +1495,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,7 +712,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..5cb0f614d8
--- /dev/null
+++ b/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
@@ -0,0 +1,24 @@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
+@@ -18,7 +18,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
+@@ -287,7 +287,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..df783109bb
--- /dev/null
+++ b/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1497,6 +1499,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/package/binutils/binutils-2.23/500-sysroot.patch b/package/binutils/binutils-2.23/500-sysroot.patch
new file mode 100644
index 0000000000..e49c795332
--- /dev/null
+++ b/package/binutils/binutils-2.23/500-sysroot.patch
@@ -0,0 +1,37 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,25 @@
+      directory first.  */
+   if (! entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++	  && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))

From 5a61fbd82394f9bc9317535b717a2e1dd51dea7d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Oct 2012 09:13:21 +0200
Subject: [PATCH 3044/6849] fs/skeleton: remove /etc/TZ

Defaulting to UTC (which is what uClibc will default to when /etc/TZ is
missing) seems more sensible than US Mountain Time Zone in the default
rootfs skeleton.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/skeleton/etc/TZ | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 fs/skeleton/etc/TZ

diff --git a/fs/skeleton/etc/TZ b/fs/skeleton/etc/TZ
deleted file mode 100644
index 9fcb2a3c56..0000000000
--- a/fs/skeleton/etc/TZ
+++ /dev/null
@@ -1 +0,0 @@
-MST7MDT

From 94ca09c4725c423cda5f9a97039158fa79329c02 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 25 Oct 2012 22:20:25 +0000
Subject: [PATCH 3045/6849] toolchain-external: add support for Linaro 2012.10
 toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 105fb2a26e..7a9ec1db87 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,22 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
+	bool "Linaro 2012.10"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.10 (based on gcc 4.7), Linaro GDB 2012.10 (based on
+	  GDB 7.5), eglibc 2.15. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	bool "Linaro 2012.09"
 	depends on BR2_arm
@@ -637,6 +653,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 43d747cad6..a7e4ab624f 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -205,6 +205,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.08-20120827_linux.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.09/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.09-20120921_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.10/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From c90897b7dba131fc492ef25f3fcf68129df64ef9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 25 Oct 2012 22:20:26 +0000
Subject: [PATCH 3046/6849] toolchain-external: remove support for Linaro
 2012.05 toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 17 -----------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 7a9ec1db87..98d0c0ee45 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -83,22 +83,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
-	bool "Linaro 2012.05"
-	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.05 (based on gcc 4.7), Linaro GDB 2012.05 (based on
-	  GDB 7.4), eglibc 2.13. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
-
-	  To use this toolchain, you must disable soft float usage.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
@@ -648,7 +632,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a7e4ab624f..2c85931d9b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -190,9 +190,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_05),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.05/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.05-20120523_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.06/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.06-20120625_linux.tar.bz2

From d3e7759f85ab07680c7ba412b0c84d0e300fc4bf Mon Sep 17 00:00:00 2001
From: Xinglong Liao <xinglong.liao@gmail.com>
Date: Wed, 24 Oct 2012 22:30:43 +0000
Subject: [PATCH 3047/6849] toolchain/uClibc: correct a slip of the pen

UCLIB_EXTRA_CFLAGS -> UCLIBC_EXTRA_CFLAGS

Signed-off-by: Xinglong Liao <xinglong.liao@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index d1cd71812e..397cdd409e 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -379,7 +379,7 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
 		oldconfig
 	touch $@
@@ -398,7 +398,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" headers \
 		lib/crt1.o lib/crti.o lib/crtn.o \
 		install_headers
@@ -420,7 +420,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate) $(LIBFLO
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
 		all
 	touch -c $@
@@ -432,7 +432,7 @@ uclibc-menuconfig: dirs $(UCLIBC_DIR)/.config
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
 		menuconfig && \
 	touch -c $(UCLIBC_DIR)/.config
@@ -445,7 +445,7 @@ $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		install_runtime install_dev
 	# Install the kernel headers to the staging dir if necessary
 	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
@@ -475,7 +475,7 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIB_EXTRA_CFLAGS="$(TARGET_ABI)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		install_runtime
 	touch -c $@
 

From 092457dd3bc598f0920bddf79a62a39b2f13c4cd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 24 Oct 2012 12:20:15 +0000
Subject: [PATCH 3048/6849] gnutls: fix link-time build failures

Fixes
http://autobuild.buildroot.net/results/23da17446266bdd49ea0da0c1892d66d3ac6607f/build-end.log
And may the <BEEP> rest in peace at last...

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index e88982121a..1ef6e3f9bb 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -10,8 +10,9 @@ GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING lib/COPYING
 GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_ENV = acl_cv_rpath=no
 GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
-		--without-p11-kit
+		--without-p11-kit --disable-rpath
 GNUTLS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 7195019be4d138bc457f23fb2ce472ba9817dd86 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sat, 27 Oct 2012 09:22:09 +0000
Subject: [PATCH 3049/6849] binutils version 2.23 is only available is .gz
 format

binutils version 2.23 is only available in .gz format, the older versions are in .bz2 format.
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index d41cac4e9c..e1aac9bb13 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -16,7 +16,12 @@ BINUTILS_VERSION = 2.21
 endif
 endif
 
+ifeq ($(BINUTILS_VERSION),2.23)
+BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
+else
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.bz2
+endif
+
 BINUTILS_SITE = $(BR2_GNU_MIRROR)/binutils
 ifeq ($(ARCH),avr32)
 BINUTILS_SITE = ftp://www.at91.com/pub/buildroot

From 6ae8b1262f209c3e1ede42bfdfd0c51d64be06b0 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sat, 27 Oct 2012 00:32:20 +0000
Subject: [PATCH 3050/6849] directfb bump version 1.4.17

Bump version to 1.4.17  (buxfix release)

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index e5763d7724..b1e35aeffb 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 DIRECTFB_VERSION_MAJOR = 1.4
-DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).16
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).17
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_LICENSE = LGPLv2.1+

From f96a6e2fb839d4d1cd9e04219563a2ad89f2a4a2 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 26 Oct 2012 06:32:48 +0000
Subject: [PATCH 3051/6849] lcdapi: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/lcdapi/Config.in | 11 +++++++++++
 package/lcdapi/lcdapi.mk | 41 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 package/lcdapi/Config.in
 create mode 100644 package/lcdapi/lcdapi.mk

diff --git a/package/Config.in b/package/Config.in
index 1650c71488..6ebf2cef80 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -392,6 +392,7 @@ endmenu
 
 menu "Hardware handling"
 source "package/ccid/Config.in"
+source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
diff --git a/package/lcdapi/Config.in b/package/lcdapi/Config.in
new file mode 100644
index 0000000000..5c997d1e48
--- /dev/null
+++ b/package/lcdapi/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LCDAPI
+	bool "lcdapi"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  C++ client API for lcdproc, containing a set of widget classes.
+
+	  https://github.com/spdawson/lcdapi
+
+comment "lcdapi requires a toolchain with C++ and thread support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk
new file mode 100644
index 0000000000..8125018a66
--- /dev/null
+++ b/package/lcdapi/lcdapi.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# lcdapi
+#
+#############################################################
+LCDAPI_VERSION = v0.3
+LCDAPI_SITE = http://github.com/spdawson/lcdapi/tarball/$(LCDAPI_VERSION)
+LCDAPI_LICENSE = LGPLv2.1+
+LCDAPI_LICENSE_FILES = COPYING
+
+LCDAPI_INSTALL_STAGING = YES
+
+define LCDAPI_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define LCDAPI_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		DESTDIR="$(STAGING_DIR)" install
+endef
+
+define LCDAPI_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" install
+endef
+
+define LCDAPI_UNINSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		DESTDIR="$(STAGING_DIR)" uninstall
+endef
+
+define LCDAPI_UNINSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" uninstall
+endef
+
+define LCDAPI_CLEAN_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 6fce747d08437fc35d67b69631254faf3982db69 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Oct 2012 13:51:40 +0100
Subject: [PATCH 3052/6849] busybox: add 1.20.2 upstream fixes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.20.2-pkg-config-selinux.patch   |  67 ++++++++++
 .../busybox-1.20.2-sys-resource.patch         | 123 ++++++++++++++++++
 2 files changed, 190 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
 create mode 100644 package/busybox/busybox-1.20.2/busybox-1.20.2-sys-resource.patch

diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-pkg-config-selinux.patch b/package/busybox/busybox-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
new file mode 100644
index 0000000000..f39250c859
--- /dev/null
+++ b/package/busybox/busybox-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
@@ -0,0 +1,67 @@
+From b1cec5003b73080a8aa7ea277621bf1c71c3e8d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 20 Oct 2012 15:01:26 -0400
+Subject: [PATCH] build system: use pkg-config to look up selinux libs
+
+Newer versions of libselinux has started linking against more libs.
+Rather than continuing hardcoding things, switch to using pkg-config
+to query for its dependencies.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile       |  1 +
+ Makefile.flags | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index fccde4a..3a0a5e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,6 +297,7 @@ NM		= $(CROSS_COMPILE)nm
+ STRIP		= $(CROSS_COMPILE)strip
+ OBJCOPY		= $(CROSS_COMPILE)objcopy
+ OBJDUMP		= $(CROSS_COMPILE)objdump
++PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config
+ AWK		= awk
+ GENKSYMS	= scripts/genksyms/genksyms
+ DEPMOD		= /sbin/depmod
+diff --git a/Makefile.flags b/Makefile.flags
+index c43c8dc..15dcc1f 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -74,6 +74,12 @@ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie
+ ARCH_PIE ?= -pie
+ 
++# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
++define pkg_check_modules
++$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
++$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
++endef
++
+ ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ # on i386: 14% smaller libbusybox.so
+ # (code itself is 9% bigger, we save on relocs/PLT/GOT)
+@@ -85,6 +91,7 @@ endif
+ 
+ ifeq ($(CONFIG_STATIC),y)
+ CFLAGS_busybox += -static
++PKG_CONFIG_FLAGS += --static
+ endif
+ 
+ ifeq ($(CONFIG_PIE),y)
+@@ -127,7 +134,10 @@ LDLIBS += pam pam_misc pthread
+ endif
+ 
+ ifeq ($(CONFIG_SELINUX),y)
+-LDLIBS += selinux sepol
++SELINUX_PC_MODULES = libselinux libsepol
++$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
++CPPFLAGS += $(SELINUX_CFLAGS)
++LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
+ 
+ ifeq ($(CONFIG_EFENCE),y)
+-- 
+1.7.12
+
diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-sys-resource.patch b/package/busybox/busybox-1.20.2/busybox-1.20.2-sys-resource.patch
new file mode 100644
index 0000000000..7b18500847
--- /dev/null
+++ b/package/busybox/busybox-1.20.2/busybox-1.20.2-sys-resource.patch
@@ -0,0 +1,123 @@
+From 5a5dfcad6ba96d12d68bd7b39279215a8fee70d3 Mon Sep 17 00:00:00 2001
+From: Tias Guns <tias@ulyssis.org>
+Date: Sun, 10 Jun 2012 14:19:01 +0200
+Subject: [PATCH] inetd: fix build failure in Android
+
+Signed-off-by: Tias Guns <tias@ulyssis.org>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+(cherry picked from commit 64f763b42a43cbf36e401690ff6767c25575e520)
+---
+ networking/inetd.c | 1 +
+ 1 file changed, 1 insertion(+)
+-- 
+1.7.12
+
+From 246ea72843d5b7e9d4cd902dc5e9d71359196303 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 5 Jul 2012 23:19:09 -0400
+Subject: [PATCH] include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header.  This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+(cherry picked from commit c5fe9f7b723f949457263ef8e22ab807d5b549ce)
+---
+ loginutils/passwd.c      | 1 +
+ miscutils/time.c         | 1 +
+ networking/inetd.c       | 1 +
+ networking/ntpd.c        | 1 +
+ networking/ntpd_simple.c | 1 +
+ runit/chpst.c            | 1 +
+ shell/shell_common.c     | 1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/loginutils/passwd.c b/loginutils/passwd.c
+index b83db00..a7006f0 100644
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -15,6 +15,7 @@
+ 
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ 
+ static void nuke_str(char *str)
+ {
+diff --git a/miscutils/time.c b/miscutils/time.c
+index 945f15f..ffed386 100644
+--- a/miscutils/time.c
++++ b/miscutils/time.c
+@@ -16,6 +16,7 @@
+ //usage:     "\n	-v	Verbose"
+ 
+ #include "libbb.h"
++#include <sys/resource.h> /* getrusage */
+ 
+ /* Information on the resources used by a child process.  */
+ typedef struct {
+diff --git a/networking/inetd.c b/networking/inetd.c
+index 1308d74..00baf69 100644
+--- a/networking/inetd.c
++++ b/networking/inetd.c
+@@ -165,6 +165,8 @@
+ //usage:     "\n		(default: 0 - disabled)"
+ 
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
++#include <sys/socket.h> /* un.h may need this */
+ #include <sys/un.h>
+ 
+ #include "libbb.h"
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 603801e..b885215 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include <math.h>
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #include <sys/timex.h>
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
+index 4ad44e4..1b7c66b 100644
+--- a/networking/ntpd_simple.c
++++ b/networking/ntpd_simple.c
+@@ -7,6 +7,7 @@
+  */
+ #include "libbb.h"
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+diff --git a/runit/chpst.c b/runit/chpst.c
+index ac296ba..ed72c8b 100644
+--- a/runit/chpst.c
++++ b/runit/chpst.c
+@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //usage:     "\n			a SIGXCPU after N seconds"
+ 
+ #include "libbb.h"
++#include <sys/resource.h> /* getrlimit */
+ 
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+diff --git a/shell/shell_common.c b/shell/shell_common.c
+index 51c92d6..780e27e 100644
+--- a/shell/shell_common.c
++++ b/shell/shell_common.c
+@@ -18,6 +18,7 @@
+  */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h> /* getrlimit */
+ 
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+ 
+-- 
+1.7.12
+

From 23f6455bff246195bf9e5106435fdece64a0dde2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Oct 2012 21:35:10 +0100
Subject: [PATCH 3053/6849] strace: fix build with BR2_LARGEFILE

http://autobuild.buildroot.net/results/4ce0ce4dcb917889ef70208bd4bac63851c1fb92

Strace gets confused when built with -D_FILE_OFFSET_BITS=64 (which
transparently uses the lfs versions of functions/types), so strip this
from compiler/preprocessor flags.

Inspired by Gentoo who does the same:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/strace/strace-4.7.ebuild

Tested using qemu_arm_versatile_defconfig and the following command line:
strace dd if=/dev/zero bs=1M skip=5000 count=1 of=/dev/null

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/strace.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 5c2d33c5c3..78768489b9 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -12,6 +12,13 @@ STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
 		  ac_cv_header_linux_netlink_h=yes \
 	          $(if $(BR2_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
 
+ifeq ($(BR2_LARGEFILE),y)
+# strace gets confused when lfs mode is forced, so don't
+STRACE_CONF_ENV += \
+	CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
+	CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
+endif
+
 define STRACE_REMOVE_STRACE_GRAPH
 	rm -f $(TARGET_DIR)/usr/bin/strace-graph
 endef

From 2f8eb5a10a5c028bb65becb88e62b49eae268009 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 29 Oct 2012 01:22:03 +0000
Subject: [PATCH 3054/6849] feh: bump to 2.7

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 2dbe2962ec..fab1c0a1b0 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.6.3
+FEH_VERSION = 2.7
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From 702e34697a0f8ec0d6cf9cec22723b505d2a18d7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 28 Oct 2012 13:57:48 +0000
Subject: [PATCH 3055/6849] kernel-headers: bump 3.{0, 4, 6}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.47-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.49-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d4be60b381..2270e0c88c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.47"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.49"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.32"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.15"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.16"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.3"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.4"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.47-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.49-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.47-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.49-headers_install-fix-__packed-in-exported-kernel-head.patch

From 503452d7c87daed5061a67c7d5a20655dfa0395b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 28 Oct 2012 13:57:49 +0000
Subject: [PATCH 3056/6849] linux: bump 3.6.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index aa25f899f2..a84984907f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6.3"
+	bool "3.6.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.3" if BR2_LINUX_KERNEL_3_6
+	default "3.6.4" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 3ee3e3d22e0166ce52e96a43977338feeab1fcc5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 24 Oct 2012 10:10:44 +0000
Subject: [PATCH 3057/6849] pkgconf: new package

pkgconf is a drop-in replacement for pkg-config that doesn't need
itself to build and just requires a C89 compiler.

Instead of using a patch for hardcoded sysroot support (as the patch to
pkg-config does) we rely instead on a wrapper script that takes the
appropiate action.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/pkgconf/Config.in                  |  9 +++++++
 package/pkgconf/pkg-config.in              |  2 ++
 package/pkgconf/pkgconf-fix-variable.patch | 27 +++++++++++++++++++
 package/pkgconf/pkgconf.mk                 | 31 ++++++++++++++++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 package/pkgconf/Config.in
 create mode 100644 package/pkgconf/pkg-config.in
 create mode 100644 package/pkgconf/pkgconf-fix-variable.patch
 create mode 100644 package/pkgconf/pkgconf.mk

diff --git a/package/Config.in b/package/Config.in
index 6ebf2cef80..ab966e06b6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -84,6 +84,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/patch/Config.in"
 endif
 source "package/pkg-config/Config.in"
+source "package/pkgconf/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sed/Config.in"
 endif
diff --git a/package/pkgconf/Config.in b/package/pkgconf/Config.in
new file mode 100644
index 0000000000..f95847fa3c
--- /dev/null
+++ b/package/pkgconf/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PKGCONF
+	bool "pkgconf"
+	help
+	  pkgconf is a program which helps to configure compiler and linker
+	  flags for development frameworks. It is similar to pkg-config,
+	  but was written from scratch in the summer of 2011 to replace
+	  pkg-config, which now needs itself to build itself
+
+	  https://github.com/nenolod/pkgconf
diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
new file mode 100644
index 0000000000..25a536b0e6
--- /dev/null
+++ b/package/pkgconf/pkg-config.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-@PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} $(dirname $0)/pkgconf $@
diff --git a/package/pkgconf/pkgconf-fix-variable.patch b/package/pkgconf/pkgconf-fix-variable.patch
new file mode 100644
index 0000000000..e19f76c90c
--- /dev/null
+++ b/package/pkgconf/pkgconf-fix-variable.patch
@@ -0,0 +1,27 @@
+[PATCH] prefix sysroot to include/libdir path variables
+
+Prefix includedir / libdir variable values with sysroot if a variable is
+requested (--variable=<name>), similar to how it's done for -I / -L flags.
+
+This is sometimes used to find header files (E.G. in gst-plugins configure),
+so ensure the sysroot'ed files are used.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura pkgconf-0.8.9.orig/main.c pkgconf-0.8.9/main.c
+--- pkgconf-0.8.9.orig/main.c	2012-10-24 14:32:08.236508699 -0300
++++ pkgconf-0.8.9/main.c	2012-10-24 14:54:36.771070217 -0300
+@@ -298,7 +298,12 @@
+ 	if (eflag != PKG_ERRF_OK)
+ 		return false;
+ 
+-	printf("%s\n", req.buf);
++	if ( !strcmp(req.variable, "includedir") ||
++	  !strcmp(req.variable, "mapdir") ||
++	  !strcmp(req.variable, "libdir"))
++		printf("%s%s\n", sysroot_dir, req.buf);
++	else
++		printf("%s\n", req.buf);
+ 	return true;
+ }
+ 
diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
new file mode 100644
index 0000000000..36a5bb82b7
--- /dev/null
+++ b/package/pkgconf/pkgconf.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# pkgconf
+#
+#############################################################
+
+PKGCONF_VERSION = 0.8.9
+PKGCONF_SITE = http://tortois.es/~nenolod/distfiles
+PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
+
+PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
+
+ifeq ($(BR2_PACKAGE_PKG_CONFIG),)
+define PKGCONF_LINK_PKGCONFIG
+	ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
+endef
+endif
+
+define HOST_PKGCONF_INSTALL_WRAPPER
+	$(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
+		$(HOST_DIR)/usr/bin/pkg-config
+	$(SED) 's,@PKG_CONFIG_LIBDIR@,$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig,' \
+		-e 's,@STAGING_DIR@,$(STAGING_DIR),' \
+		$(HOST_DIR)/usr/bin/pkg-config
+endef
+
+PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
+HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From 019a581f89056e34fa7583a16de48c37c2c39ea2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 15:47:52 +0000
Subject: [PATCH 3058/6849] packages: switch to host-pkgconf

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk                                          | 2 +-
 package/avahi/avahi.mk                                      | 2 +-
 package/cairo/cairo.mk                                      | 2 +-
 package/ccid/ccid.mk                                        | 2 +-
 package/collectd/collectd.mk                                | 2 +-
 package/conntrack-tools/conntrack-tools.mk                  | 2 +-
 package/dbus-glib/dbus-glib.mk                              | 2 +-
 package/dbus/dbus.mk                                        | 4 ++--
 package/directfb/directfb.mk                                | 2 +-
 package/dnsmasq/dnsmasq.mk                                  | 6 +++---
 package/docker/docker.mk                                    | 2 +-
 package/e2fsprogs/e2fsprogs.mk                              | 4 ++--
 package/efl/libecore/libecore.mk                            | 4 ++--
 package/efl/libedbus/libedbus.mk                            | 2 +-
 package/efl/libedje/libedje.mk                              | 2 +-
 package/efl/libeet/libeet.mk                                | 2 +-
 package/efl/libeina/libeina.mk                              | 2 +-
 package/efl/libembryo/libembryo.mk                          | 2 +-
 package/efl/libevas/libevas.mk                              | 4 ++--
 package/enchant/enchant.mk                                  | 2 +-
 package/evtest/evtest.mk                                    | 2 +-
 package/expat/expat.mk                                      | 2 +-
 package/freetype/freetype.mk                                | 4 ++--
 package/gdk-pixbuf/gdk-pixbuf.mk                            | 2 +-
 package/glib-networking/glib-networking.mk                  | 2 +-
 package/gmpc/gmpc.mk                                        | 2 +-
 package/gnutls/gnutls.mk                                    | 2 +-
 package/gob2/gob2.mk                                        | 2 +-
 package/gpsd/gpsd.mk                                        | 4 ++--
 package/gqview/gqview.mk                                    | 2 +-
 package/gvfs/gvfs.mk                                        | 2 +-
 package/imagemagick/imagemagick.mk                          | 2 +-
 package/imlib2/imlib2.mk                                    | 2 +-
 package/ipset/ipset.mk                                      | 2 +-
 package/iptables/iptables.mk                                | 2 +-
 package/iw/iw.mk                                            | 2 +-
 package/kmod/kmod.mk                                        | 2 +-
 package/libao/libao.mk                                      | 2 +-
 package/libdaemon/libdaemon.mk                              | 2 +-
 package/libdrm/libdrm.mk                                    | 2 +-
 package/libdvdnav/libdvdnav.mk                              | 2 +-
 package/libeXosip2/libeXosip2.mk                            | 2 +-
 package/libexif/libexif.mk                                  | 2 +-
 package/libgail/libgail.mk                                  | 2 +-
 package/libglade/libglade.mk                                | 2 +-
 package/libglib2/libglib2.mk                                | 4 ++--
 package/libgtk2/libgtk2.mk                                  | 2 +-
 package/libidn/libidn.mk                                    | 2 +-
 package/libmms/libmms.mk                                    | 2 +-
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk    | 2 +-
 package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk    | 2 +-
 package/libnfc/libnfc.mk                                    | 2 +-
 package/liboauth/liboauth.mk                                | 2 +-
 package/libogg/libogg.mk                                    | 2 +-
 package/libpng/libpng.mk                                    | 2 +-
 package/libsamplerate/libsamplerate.mk                      | 2 +-
 package/libsoup/libsoup.mk                                  | 2 +-
 package/libsvgtiny/libsvgtiny.mk                            | 2 +-
 package/libtheora/libtheora.mk                              | 2 +-
 package/libtorrent/libtorrent.mk                            | 2 +-
 package/libusb-compat/libusb-compat.mk                      | 2 +-
 package/libusb/libusb.mk                                    | 2 +-
 package/libvncserver/libvncserver.mk                        | 2 +-
 package/libvorbis/libvorbis.mk                              | 2 +-
 package/libxml2/libxml2.mk                                  | 2 +-
 package/lighttpd/lighttpd.mk                                | 2 +-
 package/links/links.mk                                      | 2 +-
 package/linphone/linphone.mk                                | 2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk               | 2 +-
 package/mediastreamer/mediastreamer.mk                      | 2 +-
 package/midori/midori.mk                                    | 2 +-
 package/minicom/minicom.mk                                  | 2 +-
 .../mobile_broadband_provider_info.mk                       | 2 +-
 package/msmtp/msmtp.mk                                      | 2 +-
 package/multimedia/gst-dsp/gst-dsp.mk                       | 2 +-
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk                 | 2 +-
 package/multimedia/gstreamer/gstreamer.mk                   | 2 +-
 package/multimedia/lame/lame.mk                             | 2 +-
 package/multimedia/mpd/mpd.mk                               | 2 +-
 package/multimedia/pulseaudio/pulseaudio.mk                 | 2 +-
 package/neon/neon.mk                                        | 2 +-
 package/network-manager/network-manager.mk                  | 2 +-
 package/nfs-utils/nfs-utils.mk                              | 2 +-
 package/ntfs-3g/ntfs-3g.mk                                  | 2 +-
 package/ofono/ofono.mk                                      | 2 +-
 package/opus-tools/opus-tools.mk                            | 2 +-
 package/pango/pango.mk                                      | 2 +-
 package/pcmanfm/pcmanfm.mk                                  | 2 +-
 package/pcsc-lite/pcsc-lite.mk                              | 2 +-
 package/pixman/pixman.mk                                    | 2 +-
 package/qt/qt.mk                                            | 2 +-
 package/radvd/radvd.mk                                      | 2 +-
 package/rrdtool/rrdtool.mk                                  | 2 +-
 package/rtorrent/rtorrent.mk                                | 2 +-
 package/shared-mime-info/shared-mime-info.mk                | 4 ++--
 package/sylpheed/sylpheed.mk                                | 2 +-
 package/tiff/tiff.mk                                        | 2 +-
 package/transmission/transmission.mk                        | 2 +-
 package/udev/udev.mk                                        | 2 +-
 package/unionfs/unionfs.mk                                  | 2 +-
 package/usbutils/usbutils.mk                                | 2 +-
 package/ushare/ushare.mk                                    | 2 +-
 package/util-linux/util-linux.mk                            | 4 ++--
 package/wpa_supplicant/wpa_supplicant.mk                    | 2 +-
 package/x11r7/libxcb/libxcb.mk                              | 2 +-
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk                  | 2 +-
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                      | 2 +-
 package/x11r7/xfont_encodings/xfont_encodings.mk            | 2 +-
 package/x11r7/xfont_font-util/xfont_font-util.mk            | 2 +-
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk    | 2 +-
 110 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 0d4d6901cb..987a1cbef7 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -49,7 +49,7 @@ else
 ATK_CONF_OPT += --without-x
 endif
 
-ATK_DEPENDENCIES = libglib2 host-pkg-config
+ATK_DEPENDENCIES = libglib2 host-pkgconf
 
 HOST_ATK_CONF_OPT = \
 		--disable-glibtest
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 03dc36859f..5f07a2f20f 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -85,7 +85,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--with-autoipd-user=default \
 		--with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkg-config
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkgconf
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 2a453bbc23..59a032a326 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -38,7 +38,7 @@ CAIRO_CONF_OPT = \
 	--enable-trace=no \
 	--enable-interpreter=no
 
-CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman
+CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT += --enable-directfb
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 73db67f582..a9e58d17e5 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -7,7 +7,7 @@ CCID_VERSION = 1.4.8
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
 CCID_SITE = http://alioth.debian.org/frs/download.php/3768
 CCID_INSTALL_STAGING = YES
-CCID_DEPENDENCIES = pcsc-lite host-pkg-config libusb
+CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
 
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
 define CCID_INSTALL_UDEV_RULES
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 71ca6605c2..6164df233b 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -85,7 +85,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http)
 
-COLLECTD_DEPENDENCIES = host-pkg-config \
+COLLECTD_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \
 	$(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \
 	$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 6f438fc941..b8c8f5a905 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -7,7 +7,7 @@
 CONNTRACK_TOOLS_VERSION = 1.2.2
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
-CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
+CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
 	libnetfilter_conntrack libnetfilter_cttimeout
 CONNTRACK_TOOLS_LICENSE = GPLv2
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 93aa5206e2..318e1b97f4 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -21,7 +21,7 @@ DBUS_GLIB_CONF_OPT = --localstatedir=/var \
 		--disable-doxygen-docs \
 		--enable-asserts=yes
 
-DBUS_GLIB_DEPENDENCIES = host-pkg-config dbus host-dbus host-dbus-glib libglib2 expat
+DBUS_GLIB_DEPENDENCIES = host-pkgconf dbus host-dbus host-dbus-glib libglib2 expat
 
 HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2
 
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 1190d2fc3c..f848bfd34f 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -7,7 +7,7 @@ DBUS_VERSION = 1.4.20
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES
 
-DBUS_DEPENDENCIES = host-pkg-config
+DBUS_DEPENDENCIES = host-pkgconf
 
 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
 DBUS_CONF_OPT = --with-dbus-user=dbus \
@@ -65,7 +65,7 @@ endef
 
 DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
 
-HOST_DBUS_DEPENDENCIES = host-pkg-config host-expat
+HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
 HOST_DBUS_CONF_OPT = \
 		--with-dbus-user=dbus \
 		--disable-tests \
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index b1e35aeffb..1ccffc5593 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -120,7 +120,7 @@ ifeq ($(BR2_PACKAGE_DIRECTB_TESTS),y)
 DIRECTFB_CONF_OPT += --with-tests
 endif
 
-HOST_DIRECTFB_DEPENDENCIES = host-pkg-config host-libpng
+HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng
 HOST_DIRECTFB_CONF_OPT = \
 		--disable-debug \
 		--disable-multi \
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 203a2e252a..dac30e593f 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
-	DNSMASQ_DEPENDENCIES += host-pkg-config libnetfilter_conntrack
+	DNSMASQ_DEPENDENCIES += host-pkgconf libnetfilter_conntrack
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
@@ -44,7 +44,7 @@ endef
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
-	DNSMASQ_DEPENDENCIES += lua host-pkg-config
+	DNSMASQ_DEPENDENCIES += lua host-pkgconf
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl"
 
 define DNSMASQ_ENABLE_LUA
@@ -59,7 +59,7 @@ ifneq ($(BR2_LARGEFILE),y)
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-	DNSMASQ_DEPENDENCIES += host-pkg-config dbus
+	DNSMASQ_DEPENDENCIES += host-pkgconf dbus
 endif
 
 define DNSMASQ_FIX_PKGCONFIG
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 9839d889dd..95799e803c 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -16,6 +16,6 @@ DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
 
 DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
 
-DOCKER_DEPENDENCIES = host-pkg-config libglib2 xserver_xorg-server
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xserver_xorg-server
 
 $(eval $(autotools-package))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 049bc29bb9..e958158edd 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -21,7 +21,7 @@ E2FSPROGS_CONF_OPT = \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
 
-E2FSPROGS_DEPENDENCIES = host-pkg-config util-linux
+E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 
 E2FSPROGS_MAKE_OPT = \
 	LDCONFIG=true
@@ -30,7 +30,7 @@ define HOST_E2FSPROGS_INSTALL_CMDS
  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
 endef
 # we don't have a host-util-linux
-HOST_E2FSPROGS_DEPENDENCIES = host-pkg-config
+HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
 
 # binaries to keep or remove
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index df8db0d4c2..b495bdb95c 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -9,9 +9,9 @@ LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
 LIBECORE_SITE = http://download.enlightenment.org/releases/
 LIBECORE_INSTALL_STAGING = YES
 
-LIBECORE_DEPENDENCIES = host-pkg-config libeina
+LIBECORE_DEPENDENCIES = host-pkgconf libeina
 
-HOST_LIBECORE_DEPENDENCIES = host-pkg-config host-libeina host-libevas
+HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
 HOST_LIBECORE_CONF_OPT += 		\
 	--enable-ecore-evas 		\
 	--disable-simple-x11 		\
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 04c48a4216..4ecb0f8e7e 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -9,7 +9,7 @@ LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
 LIBEDBUS_SITE = http://download.enlightenment.org/releases/
 LIBEDBUS_INSTALL_STAGING = YES
 
-LIBEDBUS_DEPENDENCIES = host-pkg-config dbus libeina libecore
+LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
 
 ifeq ($(BR2_PACKAGE_LIBEDBUS_BLUEZ),y)
 LIBEDBUS_CONF_OPT += --enable-ebluez
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index e6d9ab33ed..8b4814eddf 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -9,7 +9,7 @@ LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
 LIBEDJE_SITE =  http://download.enlightenment.org/releases/
 LIBEDJE_INSTALL_STAGING = YES
 
-LIBEDJE_DEPENDENCIES = host-pkg-config lua libeina libeet libecore libevas \
+LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
 			libembryo
 
 ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index 3ca12d37c7..cb6467582f 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -9,7 +9,7 @@ LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
 LIBEET_SITE = http://download.enlightenment.org/releases/
 LIBEET_INSTALL_STAGING = YES
 
-LIBEET_DEPENDENCIES = host-pkg-config zlib jpeg libeina
+LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index 2391379436..465fee1eeb 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -9,7 +9,7 @@ LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
 LIBEINA_SITE = http://download.enlightenment.org/releases/
 LIBEINA_INSTALL_STAGING = YES
 
-LIBEINA_DEPENDENCIES = host-pkg-config
+LIBEINA_DEPENDENCIES = host-pkgconf
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index db1696daf7..5484ccf57b 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -9,7 +9,7 @@ LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
 LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
 LIBEMBRYO_INSTALL_STAGING = YES
 
-LIBEMBRYO_DEPENDENCIES = host-pkg-config libeina
+LIBEMBRYO_DEPENDENCIES = host-pkgconf libeina
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 3baf23b896..594db60b51 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -9,9 +9,9 @@ LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
 LIBEVAS_SITE = http://download.enlightenment.org/releases/
 LIBEVAS_INSTALL_STAGING = YES
 
-LIBEVAS_DEPENDENCIES = host-pkg-config zlib libeina freetype
+LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
 
-HOST_LIBEVAS_DEPENDENCIES = host-pkg-config host-zlib host-libeina \
+HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \
 				host-freetype host-libpng host-jpeg
 HOST_LIBEVAS_CONF_OPT += \
 	--enable-image-loader-png \
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 215425ada2..896dfc6c8c 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -7,6 +7,6 @@ ENCHANT_VERSION = 1.5.0
 ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
 ENCHANT_INSTALL_STAGING = YES
-ENCHANT_DEPENDENCIES = libglib2 host-pkg-config
+ENCHANT_DEPENDENCIES = libglib2 host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk
index 582d1a71eb..ffda1bfeaf 100644
--- a/package/evtest/evtest.mk
+++ b/package/evtest/evtest.mk
@@ -10,7 +10,7 @@ EVTEST_SOURCE = evtest-$(EVTEST_VERSION).tar.bz2
 EVTEST_SITE = http://pkgs.fedoraproject.org/repo/pkgs/evtest/evtest-1.30.tar.bz2/27c0902839babfd07136f232c63c895c/
 EVTEST_LICENSE = GPLv2
 EVTEST_LICENSE_FILES = COPYING
-EVTEST_DEPENDENCIES = host-pkg-config
+EVTEST_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_EVTEST_CAPTURE),y)
 EVTEST_DEPENDENCIES += libxml2
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 5b19b4c765..e650723e7e 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -9,7 +9,7 @@ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSIO
 EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
-EXPAT_DEPENDENCIES = host-pkg-config
+EXPAT_DEPENDENCIES = host-pkgconf
 EXPAT_LICENSE = MIT
 EXPAT_LICENSE_FILES = COPYING
 
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 796c37c3f1..a34c9ad0ba 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -9,11 +9,11 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = host-pkg-config \
+FREETYPE_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_ZLIB),zlib) \
 	$(if $(BR2_PACKAGE_BZIP2),bzip2)
 
-HOST_FREETYPE_DEPENDENCIES = host-pkg-config
+HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 
 define FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 92a34bfcf2..4e00c4097f 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -42,7 +42,7 @@ endif
 GDK_PIXBUF_DEPENDENCIES += \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
-	host-pkg-config libglib2
+	host-pkgconf libglib2
 
 define GDK_PIXBUF_POST_INSTALL_TWEAKS
 	$(INSTALL) -m 755 -D package/gdk-pixbuf/S26gdk-pixbuf \
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 823ba39486..b1eec4d07c 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -14,7 +14,7 @@ GLIB_NETWORKING_INSTALL_STAGING = YES
 
 GLIB_NETWORKING_DEPENDENCIES = \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
-	host-pkg-config \
+	host-pkgconf \
 	host-intltool \
 	libglib2
 
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index a136cf4fe1..5f914ffa8b 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -8,7 +8,7 @@ GMPC_VERSION = 11.8.16
 GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
 GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
 GMPC_CONF_OPT = --disable-mmkeys --disable-unique
-GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkg-config host-vala \
+GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \
 	libglib2 libgtk2 libmpd libsoup sqlite \
 	xlib_libICE xlib_libSM xlib_libX11 \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 1ef6e3f9bb..2634642572 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -9,7 +9,7 @@ GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING lib/COPYING
-GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
 GNUTLS_CONF_ENV = acl_cv_rpath=no
 GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
 		--without-p11-kit --disable-rpath
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index 3757f85e2b..b64c0db28d 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -6,7 +6,7 @@
 
 GOB2_VERSION = 2.0.18
 GOB2_SITE = http://ftp.5z.com/pub/gob
-GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
+GOB2_DEPENDENCIES = libglib2 flex bison host-pkgconf host-flex
 HOST_GOB2_DEPENDENCIES = host-libglib2
 
 $(eval $(autotools-package))
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 4482a115a5..e4720446f5 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -9,7 +9,7 @@ GPSD_LICENSE = BSD-3c
 GPSD_LICENSE_FILES = COPYING
 GPSD_INSTALL_STAGING = YES
 
-GPSD_DEPENDENCIES = host-scons host-pkg-config
+GPSD_DEPENDENCIES = host-scons host-pkgconf
 
 GPSD_LDFLAGS = $(TARGET_LDFLAGS)
 
@@ -45,7 +45,7 @@ endif
 # Enable or disable Qt binding
 ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
 	GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
-	GPSD_DEPENDENCIES += qt host-pkg-config
+	GPSD_DEPENDENCIES += qt host-pkgconf
 else
 	GPSD_SCONS_OPTS += libQgpsmm=no
 endif
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 2f64cd0c36..e6d764d5bd 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -6,7 +6,7 @@
 GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
-GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
+GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
 
 $(eval $(autotools-package))
 
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index dcb94eed69..1ae094f2a0 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -9,7 +9,7 @@ GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
-GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
+GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
 
 GVFS_CONF_OPT = \
 	--disable-gconf			\
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 6d34ad388d..61a379de64 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -33,7 +33,7 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
 		--without-fpx \
 		--without-x
 
-IMAGEMAGICK_DEPENDENCIES = host-pkg-config
+IMAGEMAGICK_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 IMAGEMAGICK_CONF_OPT += --with-fontconfig
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index 3adcd99003..3c6c473722 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -7,7 +7,7 @@ IMLIB2_VERSION = 1.4.5
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
 IMLIB2_INSTALL_STAGING = YES
-IMLIB2_DEPENDENCIES = host-pkg-config freetype
+IMLIB2_DEPENDENCIES = host-pkgconf freetype
 IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
 
 ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index b8d0a24d52..999c5cb520 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -7,7 +7,7 @@
 IPSET_VERSION = 6.14
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
-IPSET_DEPENDENCIES = libmnl host-pkg-config
+IPSET_DEPENDENCIES = libmnl host-pkgconf
 IPSET_CONF_OPT = --with-kmod=no
 IPSET_LICENSE = GPLv2
 IPSET_LICENSE_FILES = COPYING
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 17c191eeff..3243b3fdde 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -8,7 +8,7 @@ IPTABLES_VERSION = 1.4.16.3
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES
-IPTABLES_DEPENDENCIES = host-pkg-config
+IPTABLES_DEPENDENCIES = host-pkgconf
 IPTABLES_LICENSE = GPLv2
 IPTABLES_LICENSE_FILES = COPYING
 
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 654282a990..7633124e74 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -7,7 +7,7 @@
 IW_VERSION = 3.7
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
-IW_DEPENDENCIES = host-pkg-config libnl
+IW_DEPENDENCIES = host-pkgconf libnl
 IW_CONFIG = $(IW_DIR)/.config
 IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index fb07ae6a83..10f70f5c3c 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -2,7 +2,7 @@ KMOD_VERSION = 10
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
-KMOD_DEPENDENCIES = host-pkg-config
+KMOD_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 KMOD_DEPENDENCIES += zlib
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index 74322b20e1..aee85a9e4b 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -6,7 +6,7 @@
 
 LIBAO_VERSION = 1.1.0
 LIBAO_SITE = http://downloads.xiph.org/releases/ao
-LIBAO_DEPENDENCIES = host-pkg-config
+LIBAO_DEPENDENCIES = host-pkgconf
 LIBAO_INSTALL_STAGING = YES
 LIBAO_CONF_OPT = --disable-esd --disable-wmm --disable-arts \
 			--disable-nas --disable-pulse
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 214402aed9..eab9c342c8 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -11,6 +11,6 @@ LIBDAEMON_LICENSE_FILES = LICENSE
 LIBDAEMON_INSTALL_STAGING = YES
 LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
 LIBDAEMON_CONF_OPT = --disable-lynx
-LIBDAEMON_DEPENDENCIES = host-pkg-config
+LIBDAEMON_DEPENDENCIES = host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 76ee763d42..fbfc95ece3 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -15,7 +15,7 @@ LIBDRM_DEPENDENCIES = \
 	xlib_libXmu \
 	xproto_dri2proto \
 	pthread-stubs \
-	host-pkg-config
+	host-pkgconf
 
 ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)
 LIBDRM_CONF_OPT += --enable-intel
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index 2fefe43bb1..520f58de4c 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -10,7 +10,7 @@ LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases
 LIBDVDNAV_AUTORECONF = YES
 LIBDVDNAV_INSTALL_STAGING = YES
 
-LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config
+LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf
 
 # By default libdvdnav tries to find dvdread-config in $PATH. Because
 # of cross compilation, we prefer using pkg-config.
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 6770276a28..d72ab6172c 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -8,7 +8,7 @@ LIBEXOSIP2_VERSION = 3.6.0
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
 LIBEXOSIP2_INSTALL_STAGING = YES
 
-LIBEXOSIP2_DEPENDENCIES = host-pkg-config libosip2
+LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBEXOSIP2_DEPENDENCIES += openssl
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index f7af18a8f0..1c515642dc 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -9,6 +9,6 @@ LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
 LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
 LIBEXIF_INSTALL_STAGING = YES
 LIBEXIF_CONF_OPT = --disable-docs
-LIBEXIF_DEPENDENCIES = host-pkg-config
+LIBEXIF_DEPENDENCIES = host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index e8a8a6096e..e3ea9b9732 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -15,6 +15,6 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 LIBGAIL_CONF_OPT += --disable-x
 endif
 
-LIBGAIL_DEPENDENCIES = host-pkg-config libgtk2 pango
+LIBGAIL_DEPENDENCIES = host-pkgconf libgtk2 pango
 
 $(eval $(autotools-package))
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 78a1fdbee3..6a6641cef6 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -7,7 +7,7 @@ LIBGLADE_VERSION = 2.6.4
 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
 LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/
 LIBGLADE_INSTALL_STAGING = YES
-LIBGLADE_DEPENDENCIES = host-pkg-config libglib2 libgtk2 atk libxml2
+LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2
 
 define LIBGLADE_INSTALL_FIX
 	rm -rf $(TARGET_DIR)/usr/share/xml/libglade \
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index dcd7996d8c..a32cab20a3 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -54,9 +54,9 @@ HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
 
-LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
+LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
 
-HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
+HOST_LIBGLIB2_DEPENDENCIES = host-pkgconf host-libffi host-zlib
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 LIBGLIB2_DEPENDENCIES += libiconv
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index e80e137414..9adb6b9f41 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -69,7 +69,7 @@ LIBGTK2_CONF_OPT = --disable-glibtest \
 		--enable-explicit-deps=no \
 		--disable-debug
 
-LIBGTK2_DEPENDENCIES = host-pkg-config host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
+LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	LIBGTK2_CONF_OPT += --with-gdktarget=directfb
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index c55f2c5dec..b06b1ec65c 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -9,7 +9,7 @@ LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"
 LIBIDN_CONF_OPT = --disable-java --enable-csharp=no
-LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 define LIBIDN_REMOVE_BINARY
 	rm -f $(TARGET_DIR)/usr/bin/idn
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index bc66f53631..5ab4f37bdf 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -9,6 +9,6 @@ LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VE
 
 LIBMMS_INSTALL_STAGING = YES
 
-LIBMMS_DEPENDENCIES = host-pkg-config libglib2
+LIBMMS_DEPENDENCIES = host-pkgconf libglib2
 
 $(eval $(autotools-package))
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index c602903d92..a5d832f675 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -8,6 +8,6 @@ LIBNETFILTER_CONNTRACK_VERSION = 1.0.1
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
-LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkg-config libnfnetlink
+LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink
 
 $(eval $(autotools-package))
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index 4792980d4e..4bdc0fc0db 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -8,6 +8,6 @@ LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0
 LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2
 LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
 LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
-LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkg-config libmnl
+LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
 
 $(eval $(autotools-package))
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index 08892b359d..c343551c1d 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -11,7 +11,7 @@ LIBNFC_LICENSE_FILES = COPYING
 LIBNFC_AUTORECONF = YES
 LIBNFC_INSTALL_STAGING = YES
 
-LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat
+LIBNFC_DEPENDENCIES = host-pkgconf libusb libusb-compat
 
 # N.B. The acr122 driver requires pcsc-lite.
 LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
index 6695fcbe81..9eb0e7db14 100644
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -8,7 +8,7 @@ LIBOAUTH_SOURCE = liboauth-$(LIBOAUTH_VERSION).tar.gz
 LIBOAUTH_SITE = http://liboauth.sourceforge.net/pool
 LIBOAUTH_INSTALL_STAGING = YES
 
-LIBOAUTH_DEPENDENCIES += host-pkg-config openssl
+LIBOAUTH_DEPENDENCIES += host-pkgconf openssl
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 LIBOAUTH_DEPENDENCIES += libcurl
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 4020d62b9f..519ba9d88d 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -7,6 +7,6 @@ LIBOGG_VERSION = 1.3.0
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 LIBOGG_INSTALL_STAGING = YES
 
-LIBOGG_DEPENDENCIES = host-pkg-config
+LIBOGG_DEPENDENCIES = host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 3bcd1b8470..d834876b3d 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -11,7 +11,7 @@ LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SER
 LIBPNG_LICENSE = libpng license
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
-LIBPNG_DEPENDENCIES = host-pkg-config zlib
+LIBPNG_DEPENDENCIES = host-pkgconf zlib
 
 define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
index 533d95fcbc..950e5b5ecd 100644
--- a/package/libsamplerate/libsamplerate.mk
+++ b/package/libsamplerate/libsamplerate.mk
@@ -7,7 +7,7 @@
 LIBSAMPLERATE_VERSION = 0.1.8
 LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
 LIBSAMPLERATE_INSTALL_STAGING = YES
-LIBSAMPLERATE_DEPENDENCIES = host-pkg-config
+LIBSAMPLERATE_DEPENDENCIES = host-pkgconf
 LIBSAMPLERATE_CONF_OPT = --disable-fftw --program-transform-name=''
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 30655ba303..2f173df0fc 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,7 +19,7 @@ endif
 
 LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking
diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index 9baa4b0199..076a783570 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -7,7 +7,7 @@
 LIBSVGTINY_SITE = svn://svn.netsurf-browser.org/trunk/libsvgtiny
 LIBSVGTINY_VERSION = 12121
 LIBSVGTINY_INSTALL_STAGING = YES
-LIBSVGTINY_DEPENDENCIES = libxml2 host-gperf host-pkg-config
+LIBSVGTINY_DEPENDENCIES = libxml2 host-gperf host-pkgconf
 
 define LIBSVGTINY_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 5714e7040f..1a19bcd5f4 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -15,6 +15,6 @@ LIBTHEORA_CONF_OPT = \
 		--disable-examples \
 		--disable-spec
 
-LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkg-config
+LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index 0c29661c49..892195bfc8 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -6,7 +6,7 @@
 
 LIBTORRENT_VERSION = 0.13.2
 LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
-LIBTORRENT_DEPENDENCIES = host-pkg-config libsigc \
+LIBTORRENT_DEPENDENCIES = host-pkgconf libsigc \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl)
 LIBTORRENT_CONF_OPT = --enable-aligned \
 	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index d42abf5d9b..848c70561a 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -6,7 +6,7 @@
 LIBUSB_COMPAT_VERSION = 0.1.4
 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
 LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
-LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb
+LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
 LIBUSB_COMPAT_INSTALL_STAGING = YES
 
 define LIBUSB_COMPAT_FIXUP_CONFIG
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index d4ca31eca4..06a148543b 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -8,7 +8,7 @@ LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
 LIBUSB_LICENSE = LGPLv2.1+
 LIBUSB_LICENSE_FILES = COPYING
-LIBUSB_DEPENDENCIES = host-pkg-config
+LIBUSB_DEPENDENCIES = host-pkgconf
 LIBUSB_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index f94670e5d2..ac55a959bb 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -31,7 +31,7 @@ LIBVNCSERVER_CONF_OPT += --without-gcrypt
 endif
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
-LIBVNCSERVER_DEPENDENCIES += gnutls host-pkg-config
+LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf
 else
 LIBVNCSERVER_CONF_OPT += --without-gnutls
 endif
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 009143b4c5..c8ff213a18 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -11,6 +11,6 @@ LIBVORBIS_INSTALL_STAGING = YES
 
 LIBVORBIS_CONF_OPT = --disable-oggtest
 
-LIBVORBIS_DEPENDENCIES = host-pkg-config libogg
+LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
 
 $(eval $(autotools-package))
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index b63200f9cd..71f2bd15be 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -24,7 +24,7 @@ endef
 
 LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
 
-HOST_LIBXML2_DEPENDENCIES = host-pkg-config
+HOST_LIBXML2_DEPENDENCIES = host-pkgconf
 
 HOST_LIBXML2_CONF_OPT = --without-debug --without-python
 
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 4bad5bae80..08ce372360 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -8,7 +8,7 @@ LIGHTTPD_VERSION = 1.4.31
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_LICENSE = BSD-3c
 LIGHTTPD_LICENSE_FILES = COPYING
-LIGHTTPD_DEPENDENCIES = host-pkg-config
+LIGHTTPD_DEPENDENCIES = host-pkgconf
 LIGHTTPD_CONF_OPT = \
 	--libdir=/usr/lib/lighttpd \
 	--libexecdir=/usr/lib \
diff --git a/package/links/links.mk b/package/links/links.mk
index 9dbf0adf60..4537b3a3e6 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -7,7 +7,7 @@
 LINKS_VERSION = 2.5
 LINKS_SITE = http://links.twibright.com/download
 LINKS_CONF_OPT = --without-x
-LINKS_DEPENDENCIES = host-pkg-config
+LINKS_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
 LINKS_CONF_OPT += --enable-graphics
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index afd296630e..efe70a9dae 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -10,7 +10,7 @@ LINPHONE_CONF_OPT = \
 	--enable-external-ortp \
 	--enable-external-mediastreamer
 
-LINPHONE_DEPENDENCIES = host-pkg-config ortp mediastreamer libeXosip2 speex
+LINPHONE_DEPENDENCIES = host-pkgconf ortp mediastreamer libeXosip2 speex
 
 ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
 LINPHONE_CONF_OPT += --enable-gtk_ui
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 6fd19873e2..de11dfc91a 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -8,7 +8,7 @@ MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
 MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
 MATCHBOX_LIB_INSTALL_STAGING = YES
-MATCHBOX_LIB_DEPENDENCIES = host-pkg-config expat xlib_libXext
+MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
 
 define MATCHBOX_LIB_POST_INSTALL_FIXES
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 1f4e1d4eeb..b32412677e 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -1,7 +1,7 @@
 MEDIASTREAMER_VERSION = 2.8.2
 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
 MEDIASTREAMER_INSTALL_STAGING = YES
-MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkg-config ortp
+MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp
 # tests fail linking on some architectures, so disable them
 MEDIASTREAMER_CONF_OPT = --disable-tests
 
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 33f94cf5d3..44cce400d3 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -9,7 +9,7 @@ MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
 MIDORI_DEPENDENCIES = \
 	host-intltool \
-	host-pkg-config \
+	host-pkgconf \
 	host-vala \
 	libgtk2 \
 	libsexy \
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 6d0607f4d3..06b023eaba 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -10,7 +10,7 @@ MINICOM_LICENSE = GPLv2+
 MINICOM_LICENSE_FILES = COPYING
 
 # pkg-config is only used to check for liblockdev, which we don't have
-# in BR, so instead of adding host-pkg-config as a dependency, simply
+# in BR, so instead of adding host-pkgconf as a dependency, simply
 # make sure the host version isn't used so we don't end up with problems
 # if people have liblockdev1-dev installed
 MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index c74d5818b4..8623297ef4 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -6,6 +6,6 @@
 MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511
 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
 MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
-MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config
+MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index 6b641f70d5..87a2fbbc22 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -8,7 +8,7 @@ MSMTP_VERSION = 1.4.27
 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
 MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
 
-MSMTP_DEPENDENCIES += host-pkg-config
+MSMTP_DEPENDENCIES += host-pkgconf
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MSMTP_CONF_OPT += --with-ssl=openssl
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index f921ec9891..74b4c98e9a 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -13,6 +13,6 @@ define GST_DSP_UNINSTALL_TARGET_CMDS
 	$(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstdsp.so
 endef
 
-GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkg-config
+GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkgconf
 
 $(eval $(generic-package))
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index 9413ff278b..ead490eb8e 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -8,7 +8,7 @@ GST_FFMPEG_VERSION = 0.10.13
 GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
 GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
 GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = host-pkg-config gstreamer gst-plugins-base ffmpeg
+GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base ffmpeg
 GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 1943d03f22..a9841b17c0 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -23,6 +23,6 @@ GSTREAMER_CONF_OPT = \
 		--disable-loadsave \
 		$(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug)
 
-GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config
+GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index a022312e8b..a251f020b6 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -8,7 +8,7 @@ LAME_VERSION_MAJOR = 3.99
 LAME_VERSION_MINOR = 5
 LAME_VERSION = $(LAME_VERSION_MAJOR).$(LAME_VERSION_MINOR)
 LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR)
-LAME_DEPENDENCIES = host-pkg-config
+LAME_DEPENDENCIES = host-pkgconf
 LAME_INSTALL_STAGING = YES
 LAME_CONF_ENV = GTK_CONFIG=/bin/false
 LAME_CONF_OPT = --enable-dynamic-frontends
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index fb4c5503ff..ab3a35786a 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -6,7 +6,7 @@
 
 MPD_VERSION = 0.17.2
 MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
-MPD_DEPENDENCIES = host-pkg-config libglib2
+MPD_DEPENDENCIES = host-pkgconf libglib2
 MPD_LICENSE = GPLv2
 MPD_LICENSE_FILES = COPYING
 
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 6396fef439..e78eb42ba6 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -15,7 +15,7 @@ PULSEAUDIO_CONF_OPT = \
 	$(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages)
 
 PULSEAUDIO_DEPENDENCIES = \
-	host-pkg-config libtool json-c libsndfile speex host-intltool \
+	host-pkgconf libtool json-c libsndfile speex host-intltool \
 	$(if $(BR2_NEEDS_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 52d5066006..c2e49497cb 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -8,7 +8,7 @@ NEON_SITE = http://www.webdav.org/neon/
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPT = --without-gssapi --disable-rpath
 
-NEON_DEPENDENCIES = host-pkg-config
+NEON_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
 NEON_CONF_OPT += --with-zlib=$(STAGING_DIR)
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 6c98d6416d..d14c98dc0b 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -7,7 +7,7 @@ NETWORK_MANAGER_VERSION = 0.9.2.0
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
 NETWORK_MANAGER_INSTALL_STAGING = YES
-NETWORK_MANAGER_DEPENDENCIES = host-pkg-config udev dbus-glib libnl wireless_tools gnutls util-linux
+NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl wireless_tools gnutls util-linux
 
 NETWORK_MANAGER_CONF_ENV = \
 	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 61e0d6764b..41a0e05c2c 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -8,7 +8,7 @@ NFS_UTILS_VERSION = 1.2.6
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
 NFS_UTILS_SITE = http://downloads.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
 NFS_UTILS_AUTORECONF = YES
-NFS_UTILS_DEPENDENCIES = host-pkg-config
+NFS_UTILS_DEPENDENCIES = host-pkgconf
 
 NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
 
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index f6db4ef355..d2e68611d2 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -9,7 +9,7 @@ NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
 NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
-NTFS_3G_DEPENDENCIES = host-pkg-config
+NTFS_3G_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBFUSE),y)
 	NTFS_3G_CONF_OPT += --with-fuse=external
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 6cd7cddd04..6e6849b40d 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -6,7 +6,7 @@
 OFONO_VERSION = 1.6
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_DEPENDENCIES = \
-	host-pkg-config \
+	host-pkgconf \
 	dbus \
 	libglib2 \
 	libcap-ng \
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index 233ad9a6e8..2b649dc9e9 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -7,7 +7,7 @@
 OPUS_TOOLS_VERSION = 0.1.5
 OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_TOOLS_CONF_OPT = --disable-oggtest --disable-opustest
-OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkg-config
+OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
 OPUS_TOOLS_DEPENDENCIES += libpcap
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 86ab474aba..7ba53ee6dc 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -41,7 +41,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
 
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf libglib2 cairo
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
         PANGO_CONF_OPT += --with-x \
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 561de1f849..1f1a330fc3 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,7 +7,7 @@ PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 PCMANFM_CONF_OPT = --disable-hal
-PCMANFM_DEPENDENCIES = host-pkg-config libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
 
 $(eval $(autotools-package))
 
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 49eeec78d3..d1d7691daf 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -7,7 +7,7 @@ PCSC_LITE_VERSION = 1.8.6
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
 PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/3757
 PCSC_LITE_INSTALL_STAGING = YES
-PCSC_LITE_DEPENDENCIES = host-pkg-config
+PCSC_LITE_DEPENDENCIES = host-pkgconf
 
 # - libudev and libusb are optional
 # - libudev and libusb can't be used together
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 8ce435d897..48795948b8 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -6,7 +6,7 @@
 PIXMAN_VERSION = 0.25.2
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_INSTALL_STAGING = YES
-PIXMAN_DEPENDENCIES = host-pkg-config
+PIXMAN_DEPENDENCIES = host-pkgconf
 # don't build gtk based demos
 PIXMAN_CONF_OPT = --disable-gtk
 
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e000ecbaca..be0808d518 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -14,7 +14,7 @@
 QT_VERSION = 4.8.3
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://releases.qt-project.org/qt4/source
-QT_DEPENDENCIES = host-pkg-config
+QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 33267f0b16..6151236eac 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -6,7 +6,7 @@
 
 RADVD_VERSION = 1.9.1
 RADVD_SITE = http://www.litech.org/radvd/dist
-RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkg-config
+RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkgconf
 RADVD_AUTORECONF = YES
 
 define RADVD_INSTALL_INITSCRIPT
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 1057d5d6e5..7521aba992 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -6,7 +6,7 @@
 
 RRDTOOL_VERSION = 1.2.30
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
-RRDTOOL_DEPENDENCIES = host-pkg-config freetype libart libpng zlib
+RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
 RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES
 RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
index c44cd572a3..ff1ae2f1a0 100644
--- a/package/rtorrent/rtorrent.mk
+++ b/package/rtorrent/rtorrent.mk
@@ -6,7 +6,7 @@
 
 RTORRENT_VERSION = 0.9.2
 RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
-RTORRENT_DEPENDENCIES = host-pkg-config libcurl libsigc libtorrent ncurses
+RTORRENT_DEPENDENCIES = host-pkgconf libcurl libsigc libtorrent ncurses
 RTORRENT_AUTORECONF = YES
 
 $(eval $(autotools-package))
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index f941dd98f9..a116840875 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -10,12 +10,12 @@ SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
 SHARED_MIME_INFO_INSTALL_STAGING = YES
 
 SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
-SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
+SHARED_MIME_INFO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
 
 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
 SHARED_MIME_INFO_MAKE = $(MAKE1)
 
-HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
+HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkgconf host-intltool
 
 HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
 HOST_SHARED_MIME_INFO_MAKE = $(MAKE1)
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 491737e71c..cf55c902ca 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -11,7 +11,7 @@ SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
 SYLPHEED_CONF_OPT = --disable-gtkspell
 
-SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2
+SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
 
 # Remove the -I$(includedir) from the Makefiles
 # because it refers to the host /usr/include.
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 145d9299c4..e881647b11 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -11,7 +11,7 @@ TIFF_CONF_OPT = \
 	--disable-cxx \
 	--without-x \
 
-TIFF_DEPENDENCIES = host-pkg-config
+TIFF_DEPENDENCIES = host-pkgconf
 
 TIFF_TOOLS_LIST =
 ifeq ($(BR2_PACKAGE_TIFF_TIFF2PDF),y)
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 3f0694b8e6..10315dc247 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -7,7 +7,7 @@ TRANSMISSION_VERSION = 2.33
 TRANSMISSION_SITE = http://download.transmissionbt.com/files/
 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2
 TRANSMISSION_DEPENDENCIES = \
-	host-pkg-config \
+	host-pkgconf \
 	host-intltool \
 	libcurl \
 	libevent \
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index b9fc02f1a1..c55db71274 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -20,7 +20,7 @@ UDEV_CONF_OPT =			\
 	--with-firmware-path=/lib/firmware		\
 	--disable-introspection
 
-UDEV_DEPENDENCIES = host-gperf host-pkg-config util-linux kmod
+UDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
 
 ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y)
 UDEV_CONF_OPT += --enable-rule_generator
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index 6c86c57c3b..89729fe9d1 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -7,7 +7,7 @@
 UNIONFS_VERSION = 0.26
 UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
 UNIONFS_SOURCE = unionfs-fuse-$(UNIONFS_VERSION).tar.xz
-UNIONFS_DEPENDENCIES = libfuse host-pkg-config
+UNIONFS_DEPENDENCIES = libfuse host-pkgconf
 UNIONFS_LICENSE = BSD-3c
 UNIONFS_LICENSE_FILES = LICENSE
 
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 6e2957173d..87ae4b36c5 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -7,7 +7,7 @@
 USBUTILS_VERSION = 006
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/
 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.gz
-USBUTILS_DEPENDENCIES = host-pkg-config libusb
+USBUTILS_DEPENDENCIES = host-pkgconf libusb
 USBUTILS_INSTALL_STAGING = YES
 # no configure in tarball
 USBUTILS_AUTORECONF = YES
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 78cbcdaac1..8f690fcefd 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -7,7 +7,7 @@
 USHARE_VERSION = 1.1a
 USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
 USHARE_SITE = http://ushare.geexbox.org/releases
-USHARE_DEPENDENCIES = host-pkg-config libupnp
+USHARE_DEPENDENCIES = host-pkgconf libupnp
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 USHARE_DEPENDENCIES += gettext
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 71a6c533a4..f6028f4345 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -9,13 +9,13 @@ UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
-UTIL_LINUX_DEPENDENCIES = host-pkg-config
+UTIL_LINUX_DEPENDENCIES = host-pkgconf
 UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
 
 UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
 
 # We don't want the host-busybox dependency to be added automatically
-HOST_UTIL_LINUX_DEPENDENCIES = host-pkg-config
+HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
 
 # If both util-linux and busybox are selected, make certain util-linux
 # wins the fight over who gets to have their utils actually installed
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index d8c916b23a..febb80cf00 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -80,7 +80,7 @@ endif
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-	WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus
+	WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
 	WPA_SUPPLICANT_MAKE_ENV = \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)"	\
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index a053379bf8..f7b194591a 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -11,7 +11,7 @@ LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_DEPENDENCIES = \
 	host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
-	host-xcb-proto host-python host-pkg-config
+	host-xcb-proto host-python host-pkgconf
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
 	XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index c44573d660..ea00d9ce8b 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -8,7 +8,7 @@ XAPP_XF86DGA_VERSION = 1.0.2
 XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
 XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XF86DGA_DEPENDENCIES = \
-	host-pkg-config \
+	host-pkgconf \
 	xlib_libX11 \
 	xlib_libXxf86dga \
 	xlib_libXt \
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index effa06026c..c3467bab24 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -8,6 +8,6 @@ XAPP_XLOGO_VERSION = 1.0.1
 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
-			  xlib_libXft host-pkg-config
+			  xlib_libXft host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 22447a453e..2113c07ec4 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -7,7 +7,7 @@
 XFONT_ENCODINGS_VERSION = 1.0.4
 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkg-config xutil_util-macros
+XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkgconf xutil_util-macros
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 832b441b57..f91b998277 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -7,7 +7,7 @@
 XFONT_FONT_UTIL_VERSION = 1.2.0
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
+XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
 XFONT_FONT_UTIL_INSTALL_STAGING = YES
 XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 631dee8608..ed5b904ff8 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -53,7 +53,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	pixman 				\
 	openssl 			\
 	mcookie 			\
-	host-pkg-config
+	host-pkgconf
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--disable-xnest --disable-xephyr --disable-dmx \

From 703d5943f403f779a8ad44afe83d794c2a392d34 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 15:47:53 +0000
Subject: [PATCH 3059/6849] pkg-config: remove host variant

Remove host-pkg-config in favour of host-pkgconf.
Also remove the sysroot support patch since it's only intended for the
host variant.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../pkg-config-0.25-add-with-sysroot.patch    | 78 -------------------
 package/pkg-config/pkg-config.mk              | 14 +---
 2 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 package/pkg-config/pkg-config-0.25-add-with-sysroot.patch

diff --git a/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch b/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch
deleted file mode 100644
index e8431ed9f4..0000000000
--- a/package/pkg-config/pkg-config-0.25-add-with-sysroot.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-[PATCH] Add compiled in default sysroot
-
-Similar to the --with-pc-path option. It works just like the existing
-PKG_CONFIG_SYSROOT_DIR environment variable, but compiled in.
-The environment variable overrides this default setting if set.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile.am  |    6 +++++-
- configure.in |    6 ++++++
- main.c       |    9 +++++++--
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-Index: pkg-config-0.25/Makefile.am
-===================================================================
---- pkg-config-0.25.orig/Makefile.am
-+++ pkg-config-0.25/Makefile.am
-@@ -28,8 +28,12 @@ EXTRA_DIST = $(m4_DATA) $(man_MANS) READ
- bin_PROGRAMS = pkg-config
- AM_CFLAGS=@WARN_CFLAGS@
- 
-+if USE_SYSROOT
-+sysroot_includes = -DPKG_CONFIG_SYSROOT="\"$(sysroot)\""
-+endif
-+
- INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes) \
--	$(popt_includes)
-+	$(popt_includes) $(sysroot_includes)
- 
- pkg_config_SOURCES= \
- 	pkg.h \
-Index: pkg-config-0.25/configure.in
-===================================================================
---- pkg-config-0.25.orig/configure.in
-+++ pkg-config-0.25/configure.in
-@@ -32,6 +32,12 @@ fi
- 
- PKG_CONFIG_FIND_PC_PATH
- 
-+AC_ARG_WITH(sysroot,
-+ [  --with-sysroot         Use sysroot <dir> by default ],
-+ [ sysroot="$withval" ])
-+
-+AC_SUBST([sysroot])
-+AM_CONDITIONAL(USE_SYSROOT, test "x$sysroot" != "x")
- #
- # Code taken from gtk+-2.0's configure.in.
- #
-Index: pkg-config-0.25/main.c
-===================================================================
---- pkg-config-0.25.orig/main.c
-+++ pkg-config-0.25/main.c
-@@ -36,10 +36,14 @@
- #undef STRICT
- #endif
- 
-+#ifndef PKG_CONFIG_SYSROOT
-+#define PKG_CONFIG_SYSROOT NULL
-+#endif
-+
- static int want_debug_spew = 0;
- static int want_verbose_errors = 0;
- static int want_stdout_errors = 0;
--char *pcsysrootdir = NULL;
-+char *pcsysrootdir = PKG_CONFIG_SYSROOT;
- 
- void
- debug_spew (const char *format, ...)
-@@ -311,7 +315,8 @@ main (int argc, char **argv)
-       add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
-     }
- 
--  pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
-+  if (getenv ("PKG_CONFIG_SYSROOT_DIR"))
-+	  pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
-   if (pcsysrootdir)
-     {
-       define_global_variable ("pc_sysrootdir", pcsysrootdir);
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 7440ac4636..6c5e135d61 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -3,23 +3,11 @@
 # pkgconfig
 #
 #############################################################
+
 PKG_CONFIG_VERSION = 0.25
 PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz
 PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
-
 PKG_CONFIG_DEPENDENCIES = libglib2
-
 PKG_CONFIG_CONF_OPT = --with-installed-glib
 
-HOST_PKG_CONFIG_CONF_OPT = \
-		--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig" \
-		--with-sysroot="$(STAGING_DIR)" \
-		--disable-static
-
-HOST_PKG_CONFIG_AUTORECONF = YES
-HOST_PKG_CONFIG_DEPENDENCIES =
-
 $(eval $(autotools-package))
-$(eval $(host-autotools-package))
-
-PKG_CONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config

From 61d17c829cb47c306d6a1e2fa507eb5e3ff08b99 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 15:47:54 +0000
Subject: [PATCH 3060/6849] pkg-config: mark as deprecated

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-config/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index eae0a21f24..7f96d9b675 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PKG_CONFIG
 	bool "pkg-config"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  pkg-config is a system for managing library compile/link
@@ -11,4 +12,4 @@ config BR2_PACKAGE_PKG_CONFIG
 	  http://www.freedesktop.org/software/pkgconfig/
 
 comment "pkg-config requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+	depends on BR2_DEPRECATED && !BR2_USE_WCHAR

From da48213e26e61f563e40ba5c02b5a935d5c39abe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Oct 2012 15:47:55 +0000
Subject: [PATCH 3061/6849] iw: pkg-config cleanup

We no longer need to specify PKG_CONFIG_PATH since it's handled by the
host-pkgconf wrapper.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 7633124e74..651a2ca1ca 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -9,8 +9,7 @@ IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkgconf libnl
 IW_CONFIG = $(IW_DIR)/.config
-IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
+IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

From 598aea4b6171dd0a61160bba6b7c021e64c2f22b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Oct 2012 22:06:19 +0100
Subject: [PATCH 3062/6849] docs/manual: update to host-pkgconf

Update the manual to match now that we have moved to pkgconf instead of
pkg-config.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt | 2 +-
 docs/manual/adding-packages-cmake.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 9fb0918220..b85b7af9f1 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -21,7 +21,7 @@ package, with an example :
 09: LIBFOO_INSTALL_STAGING = YES
 10: LIBFOO_INSTALL_TARGET = YES
 11: LIBFOO_CONF_OPT = --enable-shared
-12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
+12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
 13:
 14: $(eval $(autotools-package))
 ------------------------
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index e29ca0fa1b..da4984a525 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -21,7 +21,7 @@ with an example :
 09: LIBFOO_INSTALL_STAGING = YES
 10: LIBFOO_INSTALL_TARGET = YES
 11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
-12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config
+12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
 13:
 14: $(eval $(cmake-package))
 ------------------------

From 75b9e7f0997ed0229348a30429d0d5df8a82c8a3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Oct 2012 10:57:16 +0000
Subject: [PATCH 3063/6849] squid: bump to version 3.2.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/Config.in |  2 ++
 package/squid/squid.mk  | 24 +++++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/package/squid/Config.in b/package/squid/Config.in
index 4ec7fa4131..8a77da8899 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_SQUID
 	bool "squid"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INET_IPV6
+	# needs fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBCAP
 	help
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 52bfde009c..fc58fce9bd 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,20 +4,30 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.1.20
-SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
-SQUID_DEPENDENCIES = libcap host-libcap
+SQUID_VERSION = 3.2.3
+SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
+SQUID_LICENSE = GPLv2+
+SQUID_LICENSE_FILES = COPYING
+SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
 			ac_cv_func_strnstr=no ac_cv_have_squid=yes
-SQUID_CONF_OPT =	--enable-wccp --enable-wccpv2 --enable-async-io=8 \
-			--enable-htcp --enable-snmp --enable-linux-netfilter \
+SQUID_CONF_OPT =	--enable-async-io=8 --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \
 			--with-filedescriptors=1024 --disable-ident-lookups \
-			--enable-auth="digest" --disable-strict-error-checking \
-			--enable-digest-auth-helpers="password" \
+			--enable-auth-basic="fake getpwnam" \
+			--enable-auth-digest="file" \
+			--enable-auth-negotiate="wrapper" \
+			--enable-auth-ntlm="fake" \
+			--disable-strict-error-checking \
 			--enable-external-acl-helpers="ip_user"
 
+# On uClibc librt needs libpthread
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),yy)
+	SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	SQUID_CONF_OPT += --enable-ssl
 	SQUID_DEPENDENCIES += openssl

From 5718787cd8627cfb73ea7ad3ec7bf6e7e2efc510 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 07:21:21 +0000
Subject: [PATCH 3064/6849] squid: fix kerberos build failure

The configure script tries to autodetect kerberos 5 support and seems to
fail under some circumnstances.
Just disable it since we don't have kerberos support in buildroot.
Fixes:
http://autobuild.buildroot.net/results/c9e590a1034c3869cb7391984ce8281ec4c3ef9c/build-end.log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index fc58fce9bd..1ccb2da74e 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -16,6 +16,7 @@ SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 SQUID_CONF_OPT =	--enable-async-io=8 --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \
 			--with-filedescriptors=1024 --disable-ident-lookups \
+			--with-krb5-config=no \
 			--enable-auth-basic="fake getpwnam" \
 			--enable-auth-digest="file" \
 			--enable-auth-negotiate="wrapper" \

From 29266a3375e2711fc63f2b10bed46efb598f329c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 30 Oct 2012 21:04:28 +0100
Subject: [PATCH 3065/6849] qtuio: fix build/link issue when Qt is built with
 debug support

Fixes http://autobuild.buildroot.net/results/6dcbf4ca3fcc5ec911ac7a1680f7cb381fd18fcb

qtuio appends _d to the library name when Qt was built with debug support,
breaking linking step for examples and staging/target install.

There's no real advantage to the _d suffix, so simply fix it by removing
the logic appending _d.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qtuio-dont-append-_d-for-debug.patch      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/qtuio/qtuio-dont-append-_d-for-debug.patch

diff --git a/package/qtuio/qtuio-dont-append-_d-for-debug.patch b/package/qtuio/qtuio-dont-append-_d-for-debug.patch
new file mode 100644
index 0000000000..fbaaf19222
--- /dev/null
+++ b/package/qtuio/qtuio-dont-append-_d-for-debug.patch
@@ -0,0 +1,29 @@
+[PATCH] don't append _d to library name when Qt is built with debug support
+
+qtuio appends _d to the library name when Qt was built with debug support,
+breaking linking step for examples and staging/target install.
+
+There's no real advantage to the _d suffix, so simply fix it by removing
+the logic appending _d.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/qTUIO.pro |    5 -----
+ 1 file changed, 5 deletions(-)
+
+Index: qtuio-abe4973ff6/src/qTUIO.pro
+===================================================================
+--- qtuio-abe4973ff6.orig/src/qTUIO.pro
++++ qtuio-abe4973ff6/src/qTUIO.pro
+@@ -16,11 +16,6 @@
+ win32:LIBS += ws2_32.lib \
+     winmm.lib
+ 
+-# Changes the name of the target, when is debug mode
+-CONFIG( debug, debug|release ) { 
+-    TARGET = $${TARGET}_d
+-    BUILD_NAME = debug
+-}
+ CONFIG( release, debug|release ):BUILD_NAME = release
+ 
+ # Temporary folders for the auxiliar files

From 8ada3b45e6af1680f9aafb38cb7425f3bcfa8380 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 30 Oct 2012 10:59:57 +0000
Subject: [PATCH 3066/6849] strace: fix build for x86_64

strace fails to build on x86_64 because stat64 is not available.  This
is because the automatic detection of stat64 in configure is overridden
by buildroot, by setting ac_cv_type_stat64.  Just remove that override -
current strace seems to detect it correctly for non-largefile platforms.

Build-tested on x86_64 (with largefile), ARM (with and without largefile),
sh4, MIPS and ppc-32 (no largefile).

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/strace.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 78768489b9..ad1d0422f7 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -9,8 +9,7 @@ STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 
 STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
-		  ac_cv_header_linux_netlink_h=yes \
-	          $(if $(BR2_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
+		  ac_cv_header_linux_netlink_h=yes
 
 ifeq ($(BR2_LARGEFILE),y)
 # strace gets confused when lfs mode is forced, so don't

From 02eec22ed29427103444a521eeca7110e50a75d8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 30 Oct 2012 03:04:25 +0000
Subject: [PATCH 3067/6849] xz: bump to 5.0.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xz/xz.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index e700c0deb6..e00c91bcba 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -3,7 +3,7 @@
 # xz-utils
 #
 #############################################################
-XZ_VERSION = 5.0.3
+XZ_VERSION = 5.0.4
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES

From 77f3b71ef65ed3d54e4f4624f976de6627f7a6a4 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 30 Oct 2012 03:04:26 +0000
Subject: [PATCH 3068/6849] lm-sensors: bump to 3.3.2

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lm-sensors/lm-sensors.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index b596d44ab5..ba183ecfc1 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LM_SENSORS_VERSION = 3.3.1
+LM_SENSORS_VERSION = 3.3.2
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES

From 45072fc407e6d826f2bee56898e2139faf07b153 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:20:34 +0000
Subject: [PATCH 3069/6849] php: bump to version 5.3.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/Config.in                     |  4 ++
 package/php/php-force-cross-compile.patch | 50 -----------------------
 package/php/php.mk                        |  2 +-
 3 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 package/php/php-force-cross-compile.patch

diff --git a/package/php/Config.in b/package/php/Config.in
index c8c100cbdf..6d15da56e3 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -25,6 +25,8 @@ choice
 
 config BR2_PACKAGE_PHP_SAPI_CGI
 	bool "CGI"
+	# CGI uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PHP_CGI
 	help
 	  Common Gateway Interface
@@ -37,6 +39,8 @@ config BR2_PACKAGE_PHP_SAPI_CLI
 
 config BR2_PACKAGE_PHP_SAPI_CLI_CGI
         bool "CGI and CLI"
+	# CGI uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PHP_CLI
 	select BR2_PACKAGE_PHP_CGI
 	help
diff --git a/package/php/php-force-cross-compile.patch b/package/php/php-force-cross-compile.patch
deleted file mode 100644
index f14b477381..0000000000
--- a/package/php/php-force-cross-compile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-php: force cross-compilation
-
-In its configure script, PHP detects whether we're cross-compiling or
-not, by compiling and running a simple C program. Depending on whether
-cross-compiling has been detected or not, then PHP enables or disables
-the AC_TRY_RUN tests (which verify the availability of something by
-*executing* a program, which, by definition, cannot work in
-cross-compilation mode).
-
-This works just fine when the target architecture is ARM or PowerPC
-and the build machine is x86 or x86_64. Unfortunately, when the target
-architecture is x86_64 and the build machine is also x86_64, the
-cross-compilation mode detection concludes that we are not
-cross-compiling, because it succeeds in running this small program.
-
-However, while it succeeds in running this basic small program, some
-other programs executed later through AC_TRY_RUN tests do not work,
-because they have target library dependencies that are not available
-on the build machine. For example, the libxml2 test fails to *run*
-because libxml2 is not available on the build machine, only in the
-target/staging directories. So trying to run a program linked against
-libxml2, on the build machine, simply doesn't make sense.
-
-We fix this problem by just forcing PHP to think that we're
-cross-compiling (which is always the case with Buildroot, as we're at
-the moment never building PHP for the host). Unfortunately, the
-configure.in file dates back from the autoconf 2.13 era, so the
-configure script does not understand the ac_cv_prog_cc_cross cache
-variable, and we cannot easily regenerate the configure script using
-our package autoconf version. The easiest solution is therefore to
-simply patch the configure script to make the cross-compilation test
-fail: we replace the execution of the program by a call to false,
-which always fail, leading the configure script to understand that we
-*are* cross-compiling.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -2387,7 +2387,7 @@
- if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
--  if (./conftest; exit) 2>/dev/null; then
-+  if (false; exit) 2>/dev/null; then
-     ac_cv_prog_cc_cross=no
-   else
-     ac_cv_prog_cc_cross=yes
diff --git a/package/php/php.mk b/package/php/php.mk
index 2f8e99e648..6ac9f2992e 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.16
+PHP_VERSION = 5.3.18
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From e48bf899f6f11dbe19ce62c24c10639d0ad0ef5a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:20:35 +0000
Subject: [PATCH 3070/6849] samba: bump to version 3.6.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 7c06e14427..06f58d60f2 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.8
+SAMBA_VERSION = 3.6.9
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From d88d501f4e3aef56759bc379d87afd2a6918339b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Oct 2012 07:23:33 +0000
Subject: [PATCH 3071/6849] libtorrent: bump to version 0.13.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libtorrent/libtorrent-cross_compile.patch | 30 +++++++++++++------
 package/libtorrent/libtorrent.mk              |  4 ++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/package/libtorrent/libtorrent-cross_compile.patch b/package/libtorrent/libtorrent-cross_compile.patch
index 39fe700dc1..f86f289351 100644
--- a/package/libtorrent/libtorrent-cross_compile.patch
+++ b/package/libtorrent/libtorrent-cross_compile.patch
@@ -2,20 +2,20 @@ Fix cross compilation, based on OpenWRT patch.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura libtorrent-0.13.2/configure.ac libtorrent-0.13.2-cross/configure.ac
---- libtorrent-0.13.2/configure.ac	2012-04-20 03:55:10.000000000 -0300
-+++ libtorrent-0.13.2-cross/configure.ac	2012-05-09 10:57:49.671175421 -0300
-@@ -17,7 +17,6 @@
+diff -Nura libtorrent-0.13.3.orig/configure.ac libtorrent-0.13.3/configure.ac
+--- libtorrent-0.13.3.orig/configure.ac	2012-10-31 07:38:59.345752076 -0300
++++ libtorrent-0.13.3/configure.ac	2012-10-31 07:39:06.454799361 -0300
+@@ -19,7 +19,6 @@
  
  AM_INIT_AUTOMAKE
  AM_CONFIG_HEADER(config.h)
 -AM_PATH_CPPUNIT(1.9.6)
- AC_DISABLE_STATIC
  
- AM_DISABLE_STATIC
-diff -Nura libtorrent-0.13.2/scripts/checks.m4 libtorrent-0.13.2-cross/scripts/checks.m4
---- libtorrent-0.13.2/scripts/checks.m4	2012-04-12 06:44:23.000000000 -0300
-+++ libtorrent-0.13.2-cross/scripts/checks.m4	2012-05-09 10:42:32.642728917 -0300
+ AC_PROG_CXX
+ 
+diff -Nura libtorrent-0.13.3.orig/scripts/checks.m4 libtorrent-0.13.3/scripts/checks.m4
+--- libtorrent-0.13.3.orig/scripts/checks.m4	2012-10-31 07:38:59.342752057 -0300
++++ libtorrent-0.13.3/scripts/checks.m4	2012-10-31 07:39:06.454799361 -0300
 @@ -96,7 +96,7 @@
  AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
    AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
@@ -25,3 +25,15 @@ diff -Nura libtorrent-0.13.2/scripts/checks.m4 libtorrent-0.13.2-cross/scripts/c
        #include <fcntl.h>
        #include <stdlib.h>
        #include <unistd.h>
+diff -Nura libtorrent-0.13.3.orig/scripts/common.m4 libtorrent-0.13.3/scripts/common.m4
+--- libtorrent-0.13.3.orig/scripts/common.m4	2012-10-31 07:38:59.342752057 -0300
++++ libtorrent-0.13.3/scripts/common.m4	2012-10-31 07:39:32.550972826 -0300
+@@ -223,7 +223,7 @@
+ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+   AC_MSG_CHECKING(for execinfo.h)
+ 
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++  AC_LINK_IFELSE([AC_LANG_SOURCE([
+       #include <execinfo.h>
+       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
+       ])],
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index 892195bfc8..e58de5d034 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBTORRENT_VERSION = 0.13.2
+LIBTORRENT_VERSION = 0.13.3
 LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
 LIBTORRENT_DEPENDENCIES = host-pkgconf libsigc \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl)
@@ -12,5 +12,7 @@ LIBTORRENT_CONF_OPT = --enable-aligned \
 	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
 LIBTORRENT_INSTALL_STAGING = YES
 LIBTORRENT_AUTORECONF = YES
+LIBTORRENT_LICENSE = GPLv2
+LIBTORRENT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 3ff05f80ffb82e077a332b0c0625f4696a138528 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Oct 2012 07:23:34 +0000
Subject: [PATCH 3072/6849] rtorrent: bump to version 0.9.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rtorrent/rtorrent.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
index ff1ae2f1a0..c9cf8ff1c8 100644
--- a/package/rtorrent/rtorrent.mk
+++ b/package/rtorrent/rtorrent.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-RTORRENT_VERSION = 0.9.2
+RTORRENT_VERSION = 0.9.3
 RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
 RTORRENT_DEPENDENCIES = host-pkgconf libcurl libsigc libtorrent ncurses
 RTORRENT_AUTORECONF = YES
+RTORRENT_LICENSE = GPLv2
+RTORRENT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 0f12f2902372658a657f3df306b16a4a5be4888b Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 25 Oct 2012 12:40:52 +0200
Subject: [PATCH 3073/6849] fluxbox: select xmodmap

Fluxbox uses xmodmap in its startup script.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fluxbox/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/fluxbox/Config.in b/package/fluxbox/Config.in
index e4d6c3700e..588e83b06a 100644
--- a/package/fluxbox/Config.in
+++ b/package/fluxbox/Config.in
@@ -3,6 +3,8 @@ config BR2_PACKAGE_FLUXBOX
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_XLIB_LIBX11
+	# Runtime dependency, needed by startup script
+	select BR2_PACKAGE_XAPP_XMODMAP
 	help
 	  The Fluxbox lightweight window manager for X
 

From 90e8ebb2f0852d215d1c04dbaf56c702ea74dc40 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 27 Oct 2012 09:33:55 +0100
Subject: [PATCH 3074/6849] sconeserver: fix bluetooth module build problem

This fixes a build problem in the sconeserver bluetooth module, as reported
by the Buildroot autobuild system:

  http://autobuild.buildroot.net/results/d1133da3f8d74c58fd271e0cab197a1108000e90/build-end.log

The build problem, due to the use of BDADDR_ANY, has been fixed upstream;
consequently, this patch simply bumps the sconeserver svn revision.

Further details of the underlying problem at the following URL.

  http://stackoverflow.com/questions/9751710/c-c-warning-address-of-temporary-with-bdaddr-any-bluetooth-library

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/sconeserver.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 2313cd2e69..15a1edc775 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -5,7 +5,7 @@
 #############################################################
 # Release 0.6.0 doesn't build cleanly, so use a recent
 # Subversion trunk snapshot.
-SCONESERVER_VERSION = 178
+SCONESERVER_VERSION = 180
 SCONESERVER_SITE = \
 	https://sconeserver.svn.sourceforge.net/svnroot/sconeserver/trunk
 SCONESERVER_SITE_METHOD = svn

From 5671f9e6313842a1718c5e3d1de20c69ae544ecc Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 27 Oct 2012 18:39:02 -0400
Subject: [PATCH 3075/6849] liblog4c-localtime: fix underquoted path bug.

This patch fixes the autobuilder bug that shows up during the
libmbus build.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...liblog4c-localtime-fix-underquoted-path.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch

diff --git a/package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch b/package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch
new file mode 100644
index 0000000000..8a74a5efd9
--- /dev/null
+++ b/package/liblog4c-localtime/liblog4c-localtime-fix-underquoted-path.patch
@@ -0,0 +1,16 @@
+Fix "underquoted definition of AM_PATH_LOG4C" warning.
+
+Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> 
+
+diff -urN liblog4c-localtime-1.0/log4c.m4 liblog4c-localtime-1.0.orig/log4c.m4
+--- liblog4c-localtime-1.0/log4c.m4	2012-10-27 16:11:46.219894716 -0400
++++ liblog4c-localtime-1.0.orig/log4c.m4	2012-10-27 16:10:31.393336864 -0400
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_LOG4C,
++AC_DEFUN([AM_PATH_LOG4C],
+ [dnl 
+ dnl Get the cflags and libraries from the log4c-config script
+ dnl

From 66f268f5f3194266fb37bedc0339a2ce0c3e8bbe Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 28 Oct 2012 13:50:53 +0100
Subject: [PATCH 3076/6849] mysql_client: bump version to 5.1.65

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mysql_client/mysql_client.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index c48d78f136..46862a1de7 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MYSQL_CLIENT_VERSION = 5.1.63
+MYSQL_CLIENT_VERSION = 5.1.65
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-5.1
 MYSQL_CLIENT_INSTALL_STAGING = YES

From 1ea9a8e233032782b843e8a91a119891cf3197a9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 28 Oct 2012 17:40:31 +0100
Subject: [PATCH 3077/6849] Add AArch64 to the list of architectures

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 target/Config.in.arch | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 639327a31c..ac2c0b599a 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -23,6 +23,13 @@ config BR2_armeb
 	  http://www.arm.com/
 	  http://en.wikipedia.org/wiki/ARM
 
+config BR2_aarch64
+	bool "AArch64"
+	help
+	  Aarch64 is a 64-bit architecture developed by ARM Holdings.
+	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php
+	  http://en.wikipedia.org/wiki/ARM
+
 config BR2_avr32
 	bool "AVR32"
 	select BR2_SOFT_FLOAT
@@ -580,6 +587,7 @@ config BR2_ARCH
 	string
 	default "arm"		if BR2_arm
 	default "armeb"		if BR2_armeb
+	default "aarch64"       if BR2_aarch64
 	default "avr32"		if BR2_avr32
 	default "bfin"		if BR2_bfin
 	default "i386"		if BR2_x86_i386

From 7c7512de16739223a45ff6d8e9e1ec12609f9363 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 28 Oct 2012 17:40:32 +0100
Subject: [PATCH 3078/6849] toolchain-external: add aarch64 external toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 10 ++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 98d0c0ee45..e28b309cb8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -582,6 +582,15 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
+	bool "Linaro AArch64 12.10"
+	depends on BR2_aarch64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the AArch64 architecture, from
+	  http://www.linaro.org/engineering/armv8/
+
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 	bool "Custom toolchain"
 	help
@@ -642,6 +651,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2c85931d9b..c56f0a7df8 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -262,6 +262,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10),y)
+TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.10/components/toolchain/gcc-linaro/aarch64/rc3/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7+bzr115029-20121015+bzr2506_linux.tar.bz2
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From d27e09a71ae68d141ba6eb0fc64f9eb03a734727 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 28 Oct 2012 17:40:33 +0100
Subject: [PATCH 3079/6849] toolchain: make external toolchain the default for
 AArch64

Our internal toolchain backend does not yet have support for AArch64,
and Crosstool-NG also does not have support for AArch64 at the moment
(though it should be coming quickly since the Linaro AArch64 toolchain
is generated with a modified Crosstool-NG version).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 849b8e3f8c..29ed2f035b 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,7 +10,7 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
-	depends on !BR2_microblaze
+	depends on !BR2_microblaze && !BR2_aarch64
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 
@@ -23,7 +23,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
-	depends on !BR2_microblaze
+	depends on !BR2_microblaze && !BR2_aarch64
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 	help

From b90a10303e459dd288d434b27fc1e688ff94afba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 28 Oct 2012 17:40:35 +0100
Subject: [PATCH 3080/6849] Support KERNEL_ARCH for AArch64

The architecture tuple is 'aarch64', but the kernel people decided to
call it 'arm64', so we have to do some mungling to get the kernel
architecture name from the Buildroot architecture name.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 0128839e29..dff6aeb2f3 100644
--- a/Makefile
+++ b/Makefile
@@ -235,6 +235,7 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
+	-e s/aarch64/arm64/ \
 	-e s/bfin/blackfin/ \
 	-e s/parisc64/parisc/ \
 	-e s/powerpc64/powerpc/ \

From 7689b72e00fd4d8c017880004e83a1c79144ab7b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 28 Oct 2012 17:40:36 +0100
Subject: [PATCH 3081/6849] boot-wrapper-aarch64: new package

The boot wrapper contains both a minimal bootloader and a tool to
generate an image suitable for execution by the AArch64 software
simulator. The image generated embeds the minimal bootloader, the
kernel image, the Device Tree Blob and the kernel command line.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/Config.in                                |  1 +
 boot/boot-wrapper-aarch64/Config.in           | 31 +++++++++++++++++++
 .../boot-wrapper-aarch64.mk                   | 29 +++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 boot/boot-wrapper-aarch64/Config.in
 create mode 100644 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk

diff --git a/boot/Config.in b/boot/Config.in
index a55139be13..eb5f7cd67b 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -4,6 +4,7 @@ source "boot/at91bootstrap/Config.in"
 source "boot/at91bootstrap3/Config.in"
 source "boot/at91dataflashboot/Config.in"
 source "boot/barebox/Config.in"
+source "boot/boot-wrapper-aarch64/Config.in"
 source "boot/grub/Config.in"
 source "boot/lpc32xxcdl/Config.in"
 source "boot/mxs-bootlets/Config.in"
diff --git a/boot/boot-wrapper-aarch64/Config.in b/boot/boot-wrapper-aarch64/Config.in
new file mode 100644
index 0000000000..6546862964
--- /dev/null
+++ b/boot/boot-wrapper-aarch64/Config.in
@@ -0,0 +1,31 @@
+config BR2_TARGET_BOOT_WRAPPER_AARCH64
+	bool "boot-wrapper-aarch64"
+	depends on BR2_aarch64
+	depends on BR2_LINUX_KERNEL
+	help
+	  The boot-wrapper-aarch64 is a small bootloader that makes it
+	  possible to start an Aarch64 kernel inside the available
+	  software simulators for the Aarch64 architecture.
+
+	  git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
+
+if BR2_TARGET_BOOT_WRAPPER_AARCH64
+
+config BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS
+	string "Device Tree Source name"
+	default ""
+	help
+	  Name of the Device Tree Source file to use to generate the
+	  Device Tree Blob that will be embedded in the image
+	  generated by the boot wrapper. Valid names are the .dts
+	  files from arch/arm64/boot/dts/ in the kernel source
+	  tree. The name must be specified without the .dts suffix.
+
+config BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS
+	string "Kernel bootargs"
+	default ""
+	help
+	  Kernel bootargs to embed inside the image generated by the
+	  boot wrapper.
+
+endif
diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
new file mode 100644
index 0000000000..25c6bed76b
--- /dev/null
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# boot-wrapper-aarch64
+#
+#############################################################
+
+BOOT_WRAPPER_AARCH64_VERSION        = 26b62f586020fd998c6efd43db657eaafeec14da
+BOOT_WRAPPER_AARCH64_SITE           = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
+BOOT_WRAPPER_AARCH64_LICENSE        = BSD3c
+BOOT_WRAPPER_AARCH64_LICENSE_FILES  = LICENSE.txt
+BOOT_WRAPPER_AARCH64_DEPENDENCIES   = linux
+BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
+
+BOOT_WRAPPER_AARCH64_DTS = $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))
+
+define BOOT_WRAPPER_AARCH64_BUILD_CMDS
+	$(MAKE) \
+		KERNEL=$(BINARIES_DIR)/Image \
+		DTC=$(LINUX_DIR)/scripts/dtc/dtc \
+		FDT_SRC=$(LINUX_DIR)/arch/arm64/boot/dts/$(BOOT_WRAPPER_AARCH64_DTS).dts \
+		CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+		BOOTARGS='$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)' -C $(@D)
+endef
+
+define BOOT_WRAPPER_AARCH64_INSTALL_IMAGES_CMDS
+	cp $(@D)/linux-system.axf $(BINARIES_DIR)
+endef
+
+$(eval $(generic-package))

From 2f567cb70da6f2f135d57728dabdc5d590878338 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 28 Oct 2012 17:40:37 +0100
Subject: [PATCH 3082/6849] Add default configuration for the AArch64
 Foundation V8 simulator

Note that this configuration doesn't build entirely: the user must
manually run "make busybox-menuconfig" and disable the "Mount NFS
filesystems" option, because the toolchain does not have RPC support.

This issue will be fixed once the support for toolchain without RPC
will be integrated.

[Peter: fix readme typo]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/arm/foundation-v8/readme.txt | 26 ++++++++++++++++++++++++++
 configs/arm_foundationv8_defconfig | 15 +++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 board/arm/foundation-v8/readme.txt
 create mode 100644 configs/arm_foundationv8_defconfig

diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt
new file mode 100644
index 0000000000..3f8d4ef46d
--- /dev/null
+++ b/board/arm/foundation-v8/readme.txt
@@ -0,0 +1,26 @@
+This is the support for the ARM Foundation v8 machine emulated by the
+ARM software simulator of the AArch64 architecture.
+
+First, one has to download the AArch64 software simulator from:
+
+  https://silver.arm.com/download/download.tm?pv=1317469
+
+Then, use the arm_foundationv8_defconfig configuration to build your
+Buildroot system.
+
+Note that the Busybox build will fail due to the lack of rpc/rpc.h
+(the AArch64 toolchain does not have RPC support). Run 'make
+busybox-menuconfig', and in 'Linux System Utilities', disable the
+option 'Support mounting NFS file systems on Linux < 2.6.23' and
+restart the build. This problem will be fix in upcomins versions of
+Buildroot.
+
+Finally, boot your system with:
+
+ ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/Foundation_v8 \
+    --image output/images/linux-system.axf \
+    --block-device output/images/rootfs.ext2 \
+    --network=nat
+
+You can get network access from within the simulated environment
+by requesting an IP address using DHCP (run the command 'udhcpc').
diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig
new file mode 100644
index 0000000000..7a50b1ad5f
--- /dev/null
+++ b/configs/arm_foundationv8_defconfig
@@ -0,0 +1,15 @@
+BR2_aarch64=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_BOOT_WRAPPER_AARCH64=y
+BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="vexpress-foundation-v8"
+BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.linaro.org/kernel/linaro-aarch64.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="7181edd0539e195f78adedbb6c3878f9f1e0c4bb"
+BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"

From 2251b7502a1d09602ed203280427da403993497a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 1 Nov 2012 08:07:47 -0300
Subject: [PATCH 3083/6849] kernel-headers: bump 3.{0, 2, 4, 6}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.49-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.50-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 2270e0c88c..d596870138 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.49"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.50"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.32"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.33"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.16"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.17"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.4"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.5"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.49-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.50-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.49-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.50-headers_install-fix-__packed-in-exported-kernel-head.patch

From 593d13e35b573d50bc7b6cd5173d4893a198cb57 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 1 Nov 2012 08:07:48 -0300
Subject: [PATCH 3084/6849] linux: bump 3.6.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index a84984907f..60d77949c6 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6.4"
+	bool "3.6.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.4" if BR2_LINUX_KERNEL_3_6
+	default "3.6.5" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 654f869cab0617f7b37077ad27494520a9cc10f9 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Fri, 26 Oct 2012 00:15:31 +0200
Subject: [PATCH 3085/6849] at91bootstrap: update patch for latest u-boot

The u-boot patch got mainlined but not exactly as it was submitted to
buildroot. Update the at91bootstrap to match what is in the mainline.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...bootstrap-1.16-u-boot-relocation-fix.patch | 127 ++++++++----------
 1 file changed, 56 insertions(+), 71 deletions(-)

diff --git a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
index 884519c518..0c9b9114cb 100644
--- a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
+++ b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
@@ -1,3 +1,8 @@
+From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@piout.net>
+Date: Thu, 25 Oct 2012 22:57:14 +0200
+Subject: [PATCH] u-boot relocation fix
+
 Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because
 of the relocation changes.
 
@@ -8,13 +13,11 @@ I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be
 converted yet. But anyway, that means that it is either not working or
 doesn't care so changing it here shouldn't harm.
 
-I also chose to "repartition" the dataflash. u-boot is now living at
-0x4000, letting 16kB for the bootstrap. We also have to increase the
-IMG_SIZE as u-boot as grown larger than the default value.
-As requested on the u-boot ML, we assume that it could be up to 512kB
-big.
+We also have to increase the IMG_SIZE as u-boot as grown larger than the
+default value. As requested on the u-boot ML, we assume that it could
+be up to 495kB big.
 
-It means that now, you have to flash your kernel at 0x0008C000 instead
+It means that now, you have to flash your kernel at 0x00084000 instead
 of 0x00042000. And so you also have to load it from that adress from
 u-boot.
 
@@ -22,36 +25,34 @@ Then, remember that you could decrease IMG_SIZE to boot faster.
 
 Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
 ---
- board/at91sam9260ek/dataflash/at91sam9260ek.h      |    6 +++---
+ board/at91sam9260ek/dataflash/at91sam9260ek.h      |    4 ++--
  board/at91sam9260ek/nandflash/at91sam9260ek.h      |    2 +-
- board/at91sam9261ek/dataflash/at91sam9261ek.h      |    6 +++---
+ board/at91sam9261ek/dataflash/at91sam9261ek.h      |    4 ++--
  board/at91sam9261ek/nandflash/at91sam9261ek.h      |    2 +-
- board/at91sam9263ek/dataflash/at91sam9263ek.h      |    6 +++---
+ board/at91sam9263ek/dataflash/at91sam9263ek.h      |    4 ++--
  board/at91sam9263ek/nandflash/at91sam9263ek.h      |    2 +-
- board/at91sam9g10ek/dataflash/at91sam9g10ek.h      |    6 +++---
+ board/at91sam9g10ek/dataflash/at91sam9g10ek.h      |    4 ++--
  board/at91sam9g10ek/nandflash/at91sam9g10ek.h      |    2 +-
- board/at91sam9g20ek/dataflash/at91sam9g20ek.h      |    6 +++---
+ board/at91sam9g20ek/dataflash/at91sam9g20ek.h      |    4 ++--
  board/at91sam9g20ek/nandflash/at91sam9g20ek.h      |    2 +-
- board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h  |    4 ++--
- .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h  |    4 ++--
- board/at91sam9rlek/dataflash/at91sam9rlek.h        |    6 +++---
+ board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h  |    2 +-
+ .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h  |    2 +-
+ board/at91sam9rlek/dataflash/at91sam9rlek.h        |    4 ++--
  board/at91sam9rlek/nandflash/at91sam9rlek.h        |    2 +-
- board/at91sam9xeek/dataflash/at91sam9xeek.h        |    6 +++---
+ board/at91sam9xeek/dataflash/at91sam9xeek.h        |    4 ++--
  board/at91sam9xeek/nandflash/at91sam9xeek.h        |    2 +-
- 16 files changed, 32 insertions(+), 32 deletions(-)
+ 16 files changed, 23 insertions(+), 23 deletions(-)
 
 diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h
-index 1834246..5c52bc6 100644
+index 1834246..91081a1 100644
 --- a/board/at91sam9260ek/dataflash/at91sam9260ek.h
 +++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h
-@@ -73,11 +73,11 @@
- /* ******************************************************************* */
+@@ -74,10 +74,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS1_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash    */
  
  #define MACH_TYPE       0x44B       /* AT91SAM9260-EK */
 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
@@ -73,17 +74,15 @@ index 2cac601..f8fdff2 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h
-index 8ce30e9..675f80b 100644
+index 8ce30e9..276ba3d 100644
 --- a/board/at91sam9261ek/dataflash/at91sam9261ek.h
 +++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h
-@@ -96,11 +96,11 @@
- /* ******************************************************************* */
+@@ -97,10 +97,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash    */
  
  #define MACH_TYPE       0x350       /* AT91SAM9261-EK */
 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
@@ -105,17 +104,15 @@ index badc3ac..e628c97 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h
-index 5c9da4b..d07b5d1 100644
+index 5c9da4b..870f9e2 100644
 --- a/board/at91sam9263ek/dataflash/at91sam9263ek.h
 +++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h
-@@ -95,11 +95,11 @@
- /* ******************************************************************* */
+@@ -96,10 +96,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 			0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 			0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE			0x33900			/* Image Size in DataFlash    */
-+#define IMG_ADDRESS 			0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE			0x80000			/* Image Size in DataFlash    */
++#define	IMG_SIZE			0x7BC00			/* Image Size in DataFlash    */
  
  #define MACH_TYPE       		0x4B2       		/* AT91SAM9263-EK */
 -#define JUMP_ADDR			0x23F00000		/* Final Jump Address 	      */
@@ -137,17 +134,15 @@ index 505afc7..8ab4f46 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
-index b2faf44..0882644 100644
+index b2faf44..f4f556b 100644
 --- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
 +++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h
-@@ -97,11 +97,11 @@
- /* ******************************************************************* */
+@@ -98,10 +98,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash    */
  
  #define MACH_TYPE       0x350       /* AT91SAM9261-EK */
 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
@@ -169,17 +164,15 @@ index 66c40a3..6c3ecda 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
-index eea0439..44bd578 100644
+index eea0439..7fc70d6 100644
 --- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
 +++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h
-@@ -74,11 +74,11 @@
- /* ******************************************************************* */
+@@ -75,10 +75,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS1_DATAFLASH	/* Boot on SPI NCS1 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash */
  
  #define MACH_TYPE		0x658			/* AT91SAM9G20-EK */
 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
@@ -201,47 +194,41 @@ index 31bd499..e797e4d 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
-index a60fd41..144dd6d 100644
+index a60fd41..5587a00 100644
 --- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
 +++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h
-@@ -88,8 +88,8 @@
- /* ******************************************************************* */
+@@ -89,7 +89,7 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash */
  
  #define MACH_TYPE		0x9CD			/* AT91SAM9M10-EKES */
  #define JUMP_ADDR		0x73F00000		/* Final Jump Address */
 diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
-index 5c726b5..3152b79 100644
+index 5c726b5..9090097 100644
 --- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
 +++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h
-@@ -84,8 +84,8 @@
- /* ******************************************************************* */
+@@ -85,7 +85,7 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash */
  
  #define MACH_TYPE		0x726			/* AT91SAM9M10G45-EK */
  #define JUMP_ADDR		0x73F00000		/* Final Jump Address */
 diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h
-index 05c42dc..be277b6 100644
+index 05c42dc..150f17e 100644
 --- a/board/at91sam9rlek/dataflash/at91sam9rlek.h
 +++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h
-@@ -88,11 +88,11 @@
- /* ******************************************************************* */
+@@ -89,10 +89,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS0_DATAFLASH	/* Boot on SPI NCS0 */
  
--#define IMG_ADDRESS 	0x8400		/* Image Address in DataFlash */
+ #define IMG_ADDRESS 	0x8400		/* Image Address in DataFlash */
 -#define	IMG_SIZE	0x33900		/* Image Size in DataFlash    */
-+#define IMG_ADDRESS 	0x4000		/* Image Address in DataFlash */
-+#define	IMG_SIZE	0x80000		/* Image Size in DataFlash    */
++#define	IMG_SIZE	0x7BC00		/* Image Size in DataFlash    */
  
  #define MACH_TYPE       1326       	/* AT91SAM9RL-EK */
 -#define JUMP_ADDR	0x23F00000	/* Final Jump Address 	      */
@@ -263,17 +250,15 @@ index 656b4ba..594db8f 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h
-index 27d1822..e3172da 100644
+index 27d1822..08e515d 100644
 --- a/board/at91sam9xeek/dataflash/at91sam9xeek.h
 +++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h
-@@ -73,11 +73,11 @@
- /* ******************************************************************* */
+@@ -74,10 +74,10 @@
  #define AT91C_SPI_PCS_DATAFLASH		AT91C_SPI_PCS1_DATAFLASH	/* Boot on SPI NCS1 */
  
--#define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
+ #define IMG_ADDRESS 		0x8400			/* Image Address in DataFlash */
 -#define	IMG_SIZE		0x33900			/* Image Size in DataFlash    */
-+#define IMG_ADDRESS 		0x4000			/* Image Address in DataFlash */
-+#define	IMG_SIZE		0x80000			/* Image Size in DataFlash    */
++#define	IMG_SIZE		0x7BC00			/* Image Size in DataFlash    */
  
  #define MACH_TYPE		0x44B			/* AT91SAM9XE-EK same id as AT91SAM9260-EK*/
 -#define JUMP_ADDR		0x23F00000		/* Final Jump Address 	      */
@@ -295,5 +280,5 @@ index 5dbc63e..9fac7cb 100644
  /* ******************************************************************* */
  /* Application Settings                                                */
 -- 
-1.7.5.4
+1.7.9.5
 

From a1504a791ce8bc6222d7d604295550e2fcbef8a6 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Fri, 26 Oct 2012 00:15:32 +0200
Subject: [PATCH 3086/6849] u-boot: update at91 patches to match mainline

The patch that was included in buildroot was not the same as the final
one submitted in the mainline.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...2-change-kernel-address-in-dataflash.patch | 210 ++++++++++--------
 ...4-change-kernel-address-in-dataflash.patch | 210 ++++++++++--------
 2 files changed, 224 insertions(+), 196 deletions(-)

diff --git a/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
index 4cdbb98ff4..c7d9a7e916 100644
--- a/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
+++ b/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
@@ -1,7 +1,9 @@
-From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
+From e139cb31d32a4f39241bfd83bf622a97d08f6c9d Mon Sep 17 00:00:00 2001
 From: Alexandre Belloni <alexandre.belloni@piout.net>
-Date: Mon, 2 Jan 2012 03:51:11 +0100
-Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
+Date: Mon, 2 Jul 2012 04:26:58 +0000
+Subject: [PATCH] AT91SAM9*: Change kernel address in dataflash to
+ match u-boot's size
+
 
 On at91sam platforms, u-boot grew larger than the allocated size in
 dataflash, the layout was:
@@ -9,173 +11,185 @@ bootstrap  0x00000000
 ubootenv   0x00004200
 uboot      0x00008400
 kernel     0x00042000
+fs         0x00252000
 
 u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
 0x39C00 bytes anymore.
 
 Now, the layout is:
 bootstrap  0x00000000
-uboot      0x00004000
-ubootenv   0x00084000
-ubootenv2  0x00088000
-kernel     0x0008C000
+ubootenv   0x00004200
+uboot      0x00008400
+kernel     0x00084000
+fs         0x00294000
 
 Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
 ---
- include/configs/at91sam9260ek.h |   18 ++++++++++++------
- include/configs/at91sam9261ek.h |   18 ++++++++++++------
- include/configs/at91sam9263ek.h |   10 +++++++---
- include/configs/at91sam9rlek.h  |   10 +++++++---
- 4 files changed, 38 insertions(+), 18 deletions(-)
+ board/atmel/at91sam9260ek/partition.c |    6 +++---
+ board/atmel/at91sam9261ek/partition.c |    6 +++---
+ board/atmel/at91sam9263ek/partition.c |    6 +++---
+ board/atmel/at91sam9rlek/partition.c  |    6 +++---
+ include/configs/at91sam9260ek.h       |    5 +++--
+ include/configs/at91sam9261ek.h       |    5 +++--
+ include/configs/at91sam9263ek.h       |    2 +-
+ include/configs/at91sam9rlek.h        |    3 ++-
+ 8 files changed, 21 insertions(+), 18 deletions(-)
 
+diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c
+index 2629c67..9ec054f 100644
+--- a/board/atmel/at91sam9260ek/partition.c
++++ b/board/atmel/at91sam9260ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
+diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
+index c739b11..51cac77 100644
+--- a/board/atmel/at91sam9261ek/partition.c
++++ b/board/atmel/at91sam9261ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
+diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9263ek/partition.c
++++ b/board/atmel/at91sam9263ek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
+diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9rlek/partition.c
++++ b/board/atmel/at91sam9rlek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
-index db52ee6..b537760 100644
+index 07b1968..ef25fa5 100644
 --- a/include/configs/at91sam9260ek.h
 +++ b/include/configs/at91sam9260ek.h
-@@ -185,10 +185,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -187,7 +187,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -199,10 +201,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS1 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -201,7 +201,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -231,6 +235,8 @@
+@@ -230,6 +230,7 @@
  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_LONGHELP		1
  #define CONFIG_CMDLINE_EDITING	1
 +#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
  /*
   * Size of malloc() pool
 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
-index 5140b26..fa461da 100644
+index 6fd0b83..014437b 100644
 --- a/include/configs/at91sam9261ek.h
 +++ b/include/configs/at91sam9261ek.h
-@@ -187,10 +187,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET	0x4200
-+#define CONFIG_ENV_OFFSET	0x84000
+@@ -189,7 +189,7 @@
+ #define CONFIG_ENV_OFFSET	0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -201,10 +203,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS3 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
--#define CONFIG_ENV_OFFSET	0x4200
-+#define CONFIG_ENV_OFFSET	0x84000
+@@ -203,7 +203,7 @@
+ #define CONFIG_ENV_OFFSET	0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -233,6 +237,8 @@
+@@ -232,6 +232,7 @@
  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_LONGHELP
  #define CONFIG_CMDLINE_EDITING
 +#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
  /*
   * Size of malloc() pool
 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
-index 8399246..253bee4 100644
+index f2163f1..4309f71 100644
 --- a/include/configs/at91sam9263ek.h
 +++ b/include/configs/at91sam9263ek.h
-@@ -314,10 +314,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -318,7 +318,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
  				"root=/dev/mtdblock0 " \
  				"mtdparts=atmel_nand:-(root) "\
-@@ -347,6 +349,8 @@
- #define CONFIG_AUTO_COMPLETE
- #define CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
- 
- /*
-  * Size of malloc() pool
 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
-index 79ea1f2..423f523 100644
+index 45f8baf..c5952e9 100644
 --- a/include/configs/at91sam9rlek.h
 +++ b/include/configs/at91sam9rlek.h
-@@ -153,10 +153,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -155,7 +155,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
  				"root=/dev/mtdblock0 " \
  				"mtdparts=atmel_nand:-(root) "\
-@@ -183,6 +185,8 @@
+@@ -182,6 +182,7 @@
  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_LONGHELP		1
  #define CONFIG_CMDLINE_EDITING		1
 +#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
  /*
   * Size of malloc() pool
 -- 
-1.7.5.4
+1.7.9.5
 
diff --git a/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
index 4cdbb98ff4..c7d9a7e916 100644
--- a/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
+++ b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
@@ -1,7 +1,9 @@
-From 9fc4787c7a6c797db649831f86e49c4bf9780b4e Mon Sep 17 00:00:00 2001
+From e139cb31d32a4f39241bfd83bf622a97d08f6c9d Mon Sep 17 00:00:00 2001
 From: Alexandre Belloni <alexandre.belloni@piout.net>
-Date: Mon, 2 Jan 2012 03:51:11 +0100
-Subject: [PATCH] Change kernel address in dataflash to match u-boot's size
+Date: Mon, 2 Jul 2012 04:26:58 +0000
+Subject: [PATCH] AT91SAM9*: Change kernel address in dataflash to
+ match u-boot's size
+
 
 On at91sam platforms, u-boot grew larger than the allocated size in
 dataflash, the layout was:
@@ -9,173 +11,185 @@ bootstrap  0x00000000
 ubootenv   0x00004200
 uboot      0x00008400
 kernel     0x00042000
+fs         0x00252000
 
 u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
 0x39C00 bytes anymore.
 
 Now, the layout is:
 bootstrap  0x00000000
-uboot      0x00004000
-ubootenv   0x00084000
-ubootenv2  0x00088000
-kernel     0x0008C000
+ubootenv   0x00004200
+uboot      0x00008400
+kernel     0x00084000
+fs         0x00294000
 
 Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
+Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
 ---
- include/configs/at91sam9260ek.h |   18 ++++++++++++------
- include/configs/at91sam9261ek.h |   18 ++++++++++++------
- include/configs/at91sam9263ek.h |   10 +++++++---
- include/configs/at91sam9rlek.h  |   10 +++++++---
- 4 files changed, 38 insertions(+), 18 deletions(-)
+ board/atmel/at91sam9260ek/partition.c |    6 +++---
+ board/atmel/at91sam9261ek/partition.c |    6 +++---
+ board/atmel/at91sam9263ek/partition.c |    6 +++---
+ board/atmel/at91sam9rlek/partition.c  |    6 +++---
+ include/configs/at91sam9260ek.h       |    5 +++--
+ include/configs/at91sam9261ek.h       |    5 +++--
+ include/configs/at91sam9263ek.h       |    2 +-
+ include/configs/at91sam9rlek.h        |    3 ++-
+ 8 files changed, 21 insertions(+), 18 deletions(-)
 
+diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c
+index 2629c67..9ec054f 100644
+--- a/board/atmel/at91sam9260ek/partition.c
++++ b/board/atmel/at91sam9260ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
+diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
+index c739b11..51cac77 100644
+--- a/board/atmel/at91sam9261ek/partition.c
++++ b/board/atmel/at91sam9261ek/partition.c
+@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
+diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9263ek/partition.c
++++ b/board/atmel/at91sam9263ek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
+diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c
+index 7e1d46f..d48fab7 100644
+--- a/board/atmel/at91sam9rlek/partition.c
++++ b/board/atmel/at91sam9rlek/partition.c
+@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+ 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+ 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
++	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
++	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
++	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+ };
 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
-index db52ee6..b537760 100644
+index 07b1968..ef25fa5 100644
 --- a/include/configs/at91sam9260ek.h
 +++ b/include/configs/at91sam9260ek.h
-@@ -185,10 +185,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -187,7 +187,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -199,10 +201,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS1 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -201,7 +201,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -231,6 +235,8 @@
+@@ -230,6 +230,7 @@
  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_LONGHELP		1
  #define CONFIG_CMDLINE_EDITING	1
 +#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
  /*
   * Size of malloc() pool
 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
-index 5140b26..fa461da 100644
+index 6fd0b83..014437b 100644
 --- a/include/configs/at91sam9261ek.h
 +++ b/include/configs/at91sam9261ek.h
-@@ -187,10 +187,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET	0x4200
-+#define CONFIG_ENV_OFFSET	0x84000
+@@ -189,7 +189,7 @@
+ #define CONFIG_ENV_OFFSET	0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -201,10 +203,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS3 */
- #define CONFIG_ENV_IS_IN_DATAFLASH
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
--#define CONFIG_ENV_OFFSET	0x4200
-+#define CONFIG_ENV_OFFSET	0x84000
+@@ -203,7 +203,7 @@
+ #define CONFIG_ENV_OFFSET	0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
  				"root=/dev/mtdblock0 "			\
  				"mtdparts=atmel_nand:-(root) "		\
-@@ -233,6 +237,8 @@
+@@ -232,6 +232,7 @@
  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_LONGHELP
  #define CONFIG_CMDLINE_EDITING
 +#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
  /*
   * Size of malloc() pool
 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
-index 8399246..253bee4 100644
+index f2163f1..4309f71 100644
 --- a/include/configs/at91sam9263ek.h
 +++ b/include/configs/at91sam9263ek.h
-@@ -314,10 +314,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -318,7 +318,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
  				"root=/dev/mtdblock0 " \
  				"mtdparts=atmel_nand:-(root) "\
-@@ -347,6 +349,8 @@
- #define CONFIG_AUTO_COMPLETE
- #define CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
- 
- /*
-  * Size of malloc() pool
 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
-index 79ea1f2..423f523 100644
+index 45f8baf..c5952e9 100644
 --- a/include/configs/at91sam9rlek.h
 +++ b/include/configs/at91sam9rlek.h
-@@ -153,10 +153,12 @@
- /* bootstrap + u-boot + env + linux in dataflash on CS0 */
- #define CONFIG_ENV_IS_IN_DATAFLASH	1
- #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
--#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_OFFSET		0x84000
+@@ -155,7 +155,7 @@
+ #define CONFIG_ENV_OFFSET		0x4200
  #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
--#define CONFIG_ENV_SIZE		0x4200
+ #define CONFIG_ENV_SIZE		0x4200
 -#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_ENV_SIZE		0x4000
-+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
-+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC008C000 0x22000000 0x210000; bootm"
++#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
  #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
  				"root=/dev/mtdblock0 " \
  				"mtdparts=atmel_nand:-(root) "\
-@@ -183,6 +185,8 @@
+@@ -182,6 +182,7 @@
  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_LONGHELP		1
  #define CONFIG_CMDLINE_EDITING		1
 +#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  
  /*
   * Size of malloc() pool
 -- 
-1.7.5.4
+1.7.9.5
 

From 8f4ffd8c0b7fcc36309b0dbd73463745042496f9 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Fri, 26 Oct 2012 00:15:33 +0200
Subject: [PATCH 3087/6849] at91sam92*: update defconfigs to use latest u-boot

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9260dfc_defconfig | 6 ------
 configs/at91sam9261ek_defconfig  | 6 ------
 configs/at91sam9263ek_defconfig  | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 921afa8b3a..085997a0b0 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -9,17 +9,11 @@ BR2_PACKAGE_HOST_SAM_BA=y
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek_dataflash_cs0"
-BR2_TARGET_UBOOT_2011_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260"
-
-# Filesystem
-BR2_TARGET_ROOTFS_TAR=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index aafb166a48..c53e732d33 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -9,17 +9,11 @@ BR2_PACKAGE_HOST_SAM_BA=y
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9261ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek_dataflash_cs0"
-BR2_TARGET_UBOOT_2011_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261"
-
-# Filesystem
-BR2_TARGET_ROOTFS_TAR=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 2cd82c03ee..208e0574d7 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -9,17 +9,11 @@ BR2_PACKAGE_HOST_SAM_BA=y
 # First stage bootloader
 BR2_TARGET_AT91BOOTSTRAP=y
 BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9263ek"
-BR2_TARGET_AT91BOOTSTRAP_DATAFLASH=y
 
 # Second stage bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91sam9263ek_dataflash_cs0"
-BR2_TARGET_UBOOT_2011_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="at91sam9263"
-
-# Filesystem
-BR2_TARGET_ROOTFS_TAR=y

From b72f3f625c97bca59549b3fedfd51b3dc993fb27 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 2 Nov 2012 23:51:02 +0100
Subject: [PATCH 3088/6849] dbus: bump version

Fixes security issues:
- CVE-2012-3524: Don't access environment variables (fd.o #52202)
  Thanks to work and input from Colin Walters, Simon McVittie,
  Geoffrey Thomas, and others.

- Be more careful about monotonic time vs. real time, fixing
  DBUS_COOKIE_SHA1 spec-compliance (fd.o #48580, David Zeuthen)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index f848bfd34f..b7cc37820a 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,7 +3,7 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.4.20
+DBUS_VERSION = 1.4.24
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
 DBUS_INSTALL_STAGING = YES
 

From b7053563f5c4d55edac75eaf833f473b7818b6e8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 3 Nov 2012 08:59:21 +0100
Subject: [PATCH 3089/6849] gdisk: close(2) needs unistd.h

Fixes http://autobuild.buildroot.net/results/c557ee7cd1247e024b5edccf5f824eb4d5212e25

Fixed upstream as well in the (big) 0.8.3 commit:
http://gptfdisk.git.sourceforge.net/git/gitweb.cgi?p=gptfdisk/gptfdisk;a=commit;h=3488294d718a0e8b7f312c80c9e5729671173f6a

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdisk/gdisk-0.6.14-unistd.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/gdisk/gdisk-0.6.14-unistd.patch

diff --git a/package/gdisk/gdisk-0.6.14-unistd.patch b/package/gdisk/gdisk-0.6.14-unistd.patch
new file mode 100644
index 0000000000..97627da74f
--- /dev/null
+++ b/package/gdisk/gdisk-0.6.14-unistd.patch
@@ -0,0 +1,19 @@
+[PATCH] close(2) needs unistd.h
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ diskio-unix.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: gdisk-0.6.14/diskio-unix.cc
+===================================================================
+--- gdisk-0.6.14.orig/diskio-unix.cc
++++ gdisk-0.6.14/diskio-unix.cc
+@@ -22,6 +22,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ #include "diskio.h"

From 102f79865e21158c9153148bef189f810aad5814 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 3 Nov 2012 09:21:25 +0100
Subject: [PATCH 3090/6849] iproute2: fix build with toolchains providing
 setns(2)

Fixes http://autobuild.buildroot.net/results/b2f28621bc9d6048057c406048b3f7d665cef165

ipnetns.c contains a replacement setns implementation, which is used
if the toolchain doesn't provide any (HAVE_SETNS not set).

We don't have any knowledge of toolchain setns support on buildroot
level, but the (handwritten) configure script contains a test for it,
so run the configure script before building.

The configure script isn't written for cross compilation, so it needs
to be massaged slightly to use the cross compiler / flags.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 62328abd75..03767ccda8 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -27,6 +27,8 @@ endef
 endif
 
 define IPROUTE2_CONFIGURE_CMDS
+	$(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure
+	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
 	# arpd needs berkeleydb
 	$(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
 	echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config

From 29d084073b336157fc469ab6ddbfcc59084fe542 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 29 Oct 2012 22:47:07 +0000
Subject: [PATCH 3091/6849] lcdapi: fix autobuilder failures

Version 0.3 of the lcdapi package does not correctly handle CXXFLAGS passed
in from the environment/command line. In particular, the passing in of CXXFLAGS
clobbers the -fPIC flag which is set in the top-level lcdapi makefile.

The following autobuild logs highlight the problem.

  http://autobuild.buildroot.net/results/9a47b4a70d29308f668d65d983ba6146c0c56365/build-end.log

  http://autobuild.buildroot.net/results/4a4f6e2e7f80d5a23c9d26069094e9dafb1468e7/build-end.log

  http://autobuild.buildroot.net/results/0d96c207a9db44cf2791a66cad5162a739e7053a/build-end.log

This has been fixed upstream in version 0.4; this patch simply bumps the
version number in the Buildroot lcdapi package.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdapi/lcdapi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk
index 8125018a66..b024252293 100644
--- a/package/lcdapi/lcdapi.mk
+++ b/package/lcdapi/lcdapi.mk
@@ -3,7 +3,7 @@
 # lcdapi
 #
 #############################################################
-LCDAPI_VERSION = v0.3
+LCDAPI_VERSION = v0.4
 LCDAPI_SITE = http://github.com/spdawson/lcdapi/tarball/$(LCDAPI_VERSION)
 LCDAPI_LICENSE = LGPLv2.1+
 LCDAPI_LICENSE_FILES = COPYING

From 63c287bd27220be6db59033981988f296dccd2ef Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:46 +0000
Subject: [PATCH 3092/6849] host-qemu: new package

only user mode for the current target architecture

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 82 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 package/qemu/qemu.mk

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
new file mode 100644
index 0000000000..de72e045b6
--- /dev/null
+++ b/package/qemu/qemu.mk
@@ -0,0 +1,82 @@
+#############################################################
+#
+# qemu
+#
+#############################################################
+
+QEMU_VERSION = 1.2.0
+QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
+QEMU_SITE = http://wiki.qemu.org/download
+
+#       BR ARCH         qemu
+#       -------         ----
+#       arm             arm
+#       armeb           armeb
+#       avr32           not supported
+#       bfin            not supported
+#       i386            i386
+#       i486            i386
+#       i586            i386
+#       i686            i386
+#       x86_64          x86_64
+#       m68k            m68k
+#       microblaze      microblaze
+#       mips            mips
+#       mipsel          mipsel
+#       mips64          ?
+#       mips64el        ?
+#       powerpc         ppc
+#       sh2             not supported
+#       sh2a            not supported
+#       sh3             not supported
+#       sh3eb           not supported
+#       sh4             sh4
+#       sh4eb           sh4eb
+#       sh4a            ?
+#       sh4aeb          ?
+#       sh64            not supported
+#       sparc           sparc
+
+QEMU_ARCH = $(ARCH)
+ifeq ($(QEMU_ARCH),i486)
+    QEMU_ARCH = i386
+endif
+ifeq ($(QEMU_ARCH),i586)
+    QEMU_ARCH = i386
+endif
+ifeq ($(QEMU_ARCH),i686)
+    QEMU_ARCH = i386
+endif
+ifeq ($(QEMU_ARCH),powerpc)
+    QEMU_ARCH = ppc
+endif
+HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
+
+define HOST_QEMU_CONFIGURE_CMDS
+	(cd $(@D); ./configure                          \
+		--target-list="$(HOST_QEMU_TARGETS)"    \
+		--prefix="$(HOST_DIR)/usr"              \
+		--interp-prefix=$(STAGING_DIR)          \
+		--cc="$(HOSTCC)"                        \
+		--host-cc="$(HOSTCC)"                   \
+		--extra-cflags="$(HOST_CFLAGS)"         \
+		--extra-ldflags="$(HOST_LDFLAGS)"       \
+	)
+endef
+
+define HOST_QEMU_BUILD_CMDS
+	$(MAKE) -C $(@D) all
+endef
+
+define HOST_QEMU_INSTALL_CMDS
+	$(MAKE) -C $(@D) install
+endef
+
+define HOST_QEMU_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(host-generic-package))
+
+# variable used by other packages
+QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)

From 4bb3d3bd1c38ecae81a403e1b741ad3cf96db16e Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:47 +0000
Subject: [PATCH 3093/6849] perl: new package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/perl/Config.in                 | 18 +++++
 package/perl/perl-configure-qemu.patch | 53 ++++++++++++++
 package/perl/perl-make-ext.patch       | 24 +++++++
 package/perl/perl-mkppport.patch       | 37 ++++++++++
 package/perl/perl.mk                   | 99 ++++++++++++++++++++++++++
 6 files changed, 232 insertions(+)
 create mode 100644 package/perl/Config.in
 create mode 100644 package/perl/perl-configure-qemu.patch
 create mode 100644 package/perl/perl-make-ext.patch
 create mode 100644 package/perl/perl-mkppport.patch
 create mode 100644 package/perl/perl.mk

diff --git a/package/Config.in b/package/Config.in
index ab966e06b6..684ceec051 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -279,6 +279,7 @@ source "package/wsapi/Config.in"
 source "package/xavante/Config.in"
 endmenu
 endif
+source "package/perl/Config.in"
 source "package/microperl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
diff --git a/package/perl/Config.in b/package/perl/Config.in
new file mode 100644
index 0000000000..0a41a97c39
--- /dev/null
+++ b/package/perl/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_PERL
+	bool "perl"
+	depends on !BR2_avr32
+	depends on !BR2_bfin
+	depends on !BR2_sh2
+	depends on !BR2_sh2a
+	depends on !BR2_sh3
+	depends on !BR2_sh3eb
+	depends on !BR2_sh64
+	help
+	  Larry Wall's Practical Extraction and Report Language
+	  An interpreted scripting language, known among some as "Unix's Swiss
+	  Army Chainsaw".
+
+	  http://www.perl.org/
+
+comment "perl requires an architecture supported by qemu"
+	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/perl/perl-configure-qemu.patch b/package/perl/perl-configure-qemu.patch
new file mode 100644
index 0000000000..c2d6b92656
--- /dev/null
+++ b/package/perl/perl-configure-qemu.patch
@@ -0,0 +1,53 @@
+Add qemu support
+
+see https://rt.perl.org/rt3//Public/Bug/Display.html?id=114798
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/Configure
+===================================================================
+--- a/Configure
++++ b/Configure
+@@ -2837,6 +2837,9 @@
+             ;;
+         *)  echo "Using usrinc $usrinc." >&4 ;;
+ 	esac
++	case "$targetrun" in
++	*qemu*) targethost=dummy ;;
++	esac
+ 	case "$targethost" in
+ 	'') echo "Targethost not defined." >&4; croak=y ;;
+         *)  echo "Using targethost $targethost." >&4
+@@ -2868,7 +2871,7 @@
+ 	case "$targetfrom" in
+ 	'') targetfrom=scp ;;
+ 	esac
+-    	run=$run-$targetrun
++    	run=$run-`basename $targetrun`
+     	to=$to-$targetto
+     	from=$from-$targetfrom
+ 	case "$targetdir" in
+@@ -2908,6 +2911,14 @@
+ $targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
+ EOF
+ 	    ;;
++	*qemu*)
++	    to=:
++	    from=:
++	    cat >$run <<EOF
++#!/bin/sh
++$targetrun -L $qemulib "\$@"
++EOF
++	    ;;
+ 	*)  echo "Unknown targetrun '$targetrun'" >&4
+ 	    exit 1
+ 	    ;;
+@@ -5048,7 +5059,7 @@
+ echo " ";
+ echo "Checking if your compiler accepts $flag" 2>&1;
+ echo "int main(void) { return 0; }" > gcctest.c;
+-if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && ./gcctest; then
++if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then
+     echo "Yes, it does." 2>&1;
+     if $test -s gcctest.out ; then
+         echo "But your platform does not like it:";
diff --git a/package/perl/perl-make-ext.patch b/package/perl/perl-make-ext.patch
new file mode 100644
index 0000000000..e0195e7a25
--- /dev/null
+++ b/package/perl/perl-make-ext.patch
@@ -0,0 +1,24 @@
+Don't use RUN with make (only for perl)
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/make_ext.pl
+===================================================================
+--- a/make_ext.pl
++++ b/make_ext.pl
+@@ -458,11 +458,13 @@
+ 	# Give makefile an opportunity to rewrite itself.
+ 	# reassure users that life goes on...
+ 	my @args = ('config', @$pass_through);
+-	system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
++#	system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
++	system(@make, @args) and print "@make @args failed, continuing anyway...\n";
+     }
+     my @targ = ($target, @$pass_through);
+     print "Making $target in $ext_dir\n@run @make @targ\n";
+-    my $code = system(@run, @make, @targ);
++#    my $code = system(@run, @make, @targ);
++    my $code = system(@make, @targ);
+     die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
+ 
+     chdir $return_dir || die "Cannot cd to $return_dir: $!";
diff --git a/package/perl/perl-mkppport.patch b/package/perl/perl-mkppport.patch
new file mode 100644
index 0000000000..97f27a2027
--- /dev/null
+++ b/package/perl/perl-mkppport.patch
@@ -0,0 +1,37 @@
+Add RUN
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/mkppport
+===================================================================
+--- a/mkppport
++++ b/mkppport
+@@ -1,6 +1,7 @@
+ use strict;
+ use warnings;
+ 
++use Config;
+ use Getopt::Long;
+ use File::Spec;
+ use File::Compare qw( compare );
+@@ -136,14 +137,18 @@
+ #----------------------------------------------
+ sub run
+ {
++  my @run = $Config{run};
++  @run = () if not defined $run[0] or $run[0] eq '';
+   my @args = ("-I" . File::Spec->catdir((File::Spec->updir) x 2, 'lib'), @_);
+   my $run = $perl =~ m/\s/ ? qq("$perl") : $perl;
+   for (@args) {
+     $_ = qq("$_") if $^O eq 'VMS' && /^[^"]/;
+     $run .= " $_";
+   }
+-  print "running $run\n";
+-  system $run and die "$run failed: $?\n";
++#  print "running $run\n";
++#  system $run and die "$run failed: $?\n";
++  print "running ", join(' ', @run, $run), "\n";
++  system join(' ', @run, $run) and die "@run $run failed: $?\n";
+ }
+ 
+ __END__
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
new file mode 100644
index 0000000000..7ac1aed876
--- /dev/null
+++ b/package/perl/perl.mk
@@ -0,0 +1,99 @@
+#############################################################
+#
+# perl
+#
+#############################################################
+
+PERL_VERSION_MAJOR = 16
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
+PERL_SITE = http://www.cpan.org/src/5.0
+PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
+PERL_LICENSE = Artistic
+PERL_LICENSE_FILES = Artistic
+PERL_INSTALL_STAGING = YES
+PERL_DEPENDENCIES = host-qemu
+
+PERL_CONF_OPT = -des \
+		-Dusecrosscompile \
+		-Dtargetrun=$(QEMU_USER) \
+		-Dqemulib=$(STAGING_DIR) \
+		-Dar="$(TARGET_AR)" \
+		-Dcc="$(TARGET_CC)" \
+		-Dcpp="$(TARGET_CC)" \
+		-Dld="$(TARGET_LD)" \
+		-Dnm="$(TARGET_NM)" \
+		-Dranlib="$(TARGET_RANLIB)" \
+		-Dccflags="$(TARGET_CFLAGS)" \
+		-Dldflags="$(TARGET_LDFLAGS) -lgcc_s -lm" \
+		-Dlddlflags="-shared" \
+		-Dlibc=$(STAGING_DIR)/lib/libc.so \
+		-Duseshrplib \
+		-Dprefix=/usr \
+		-Uoptimize
+
+ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
+    PERL_CONF_OPT += -Dusedevel
+endif
+
+ifneq ($(BR2_LARGEFILE),y)
+    PERL_CONF_OPT += -Uuselargefiles
+endif
+
+define PERL_CONFIGURE_CMDS
+	rm -f $(@D)/config.sh
+	(cd $(@D); ./Configure $(PERL_CONF_OPT))
+	echo "# patched values"                                 >>$(@D)/config.sh
+	$(SED) '/^myarchname=/d' \
+		-e '/^mydomain=/d' \
+		-e '/^myhostname=/d' \
+		-e '/^myuname=/d' \
+		-e '/^osname=/d' \
+		-e '/^osvers=/d' \
+		-e '/^perladmin=/d' \
+		$(@D)/config.sh
+	echo "myarchname='$(GNU_TARGET_NAME)'"                  >>$(@D)/config.sh
+	echo "mydomain=''"                                      >>$(@D)/config.sh
+	echo "myhostname='$(BR2_TARGET_GENERIC_HOSTNAME)'"      >>$(@D)/config.sh
+	echo "myuname='Buildroot $(BR2_VERSION_FULL)'"          >>$(@D)/config.sh
+	echo "osname='linux'"                                   >>$(@D)/config.sh
+	echo "osvers='$(BR2_LINUX_KERNEL_VERSION)'"             >>$(@D)/config.sh
+	echo "perladmin='root'"                                 >>$(@D)/config.sh
+	(cd $(@D); ./Configure -S)
+	cp $(@D)/config.h $(@D)/xconfig.h
+	$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
+endef
+
+define PERL_BUILD_CMDS
+	echo "#!/bin/sh"                                > $(@D)/Cross/miniperl
+	echo "$(QEMU_USER) $(@D)/miniperl \"\$$@\""     >>$(@D)/Cross/miniperl
+	chmod +x $(@D)/Cross/miniperl
+	PERL_MM_OPT="PERL=$(@D)/Cross/miniperl" \
+		$(MAKE) -C $(@D) all
+endef
+
+define PERL_INSTALL_STAGING_CMDS
+	$(MAKE) INSTALL_DEPENDENCE= \
+		INSTALLFLAGS= \
+		DESTDIR="$(STAGING_DIR)" \
+		-C $(@D) install.perl
+endef
+
+PERL_RUN_PERL = $(QEMU_USER) $(@D)/perl -Ilib
+PERL_ARCHNAME = $(shell $(PERL_RUN_PERL) -MConfig -e "print Config->{archname}")
+PERL_LIB = $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)
+PERL_ARCHLIB = $(PERL_LIB)/$(PERL_ARCHNAME)
+
+define PERL_INSTALL_TARGET_CMDS
+	$(MAKE) INSTALL_DEPENDENCE= \
+		INSTALLFLAGS=-p \
+		DESTDIR="$(TARGET_DIR)" \
+		-C $(@D) install.perl
+	rm -f $(PERL_ARCHLIB)/CORE/*.h
+	find $(PERL_ARCHLIB) -type f -name *.bs -exec rm -f {} \;
+endef
+
+define PERL_CLEAN_CMDS
+	-$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From df9a5973e9ff5c659e0901ef4b1e07f820ff149a Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:48 +0000
Subject: [PATCH 3094/6849] perl: add DB_File

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/Config.in | 10 ++++++++++
 package/perl/perl.mk   |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/package/perl/Config.in b/package/perl/Config.in
index 0a41a97c39..6cb89f0293 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -14,5 +14,15 @@ config BR2_PACKAGE_PERL
 
 	  http://www.perl.org/
 
+if BR2_PACKAGE_PERL
+
+config BR2_PACKAGE_PERL_DB_FILE
+	bool "DB_File"
+	select BR2_PACKAGE_BERKELEYDB
+	help
+	  Build the DB_File module.
+
+endif
+
 comment "perl requires an architecture supported by qemu"
 	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 7ac1aed876..186158bf29 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -11,7 +11,11 @@ PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_LICENSE = Artistic
 PERL_LICENSE_FILES = Artistic
 PERL_INSTALL_STAGING = YES
+
 PERL_DEPENDENCIES = host-qemu
+ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
+    PERL_DEPENDENCIES += berkeleydb
+endif
 
 PERL_CONF_OPT = -des \
 		-Dusecrosscompile \

From e0cf9e86b92a831adfadb97baa3919039a3e5669 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:49 +0000
Subject: [PATCH 3095/6849] gdbm: new package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/gdbm/Config.in |  8 ++++++++
 package/gdbm/gdbm.mk   | 12 ++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 package/gdbm/Config.in
 create mode 100644 package/gdbm/gdbm.mk

diff --git a/package/Config.in b/package/Config.in
index 684ceec051..a4f75c96eb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -345,6 +345,7 @@ endmenu
 
 menu "Database"
 source "package/berkeleydb/Config.in"
+source "package/gdbm/Config.in"
 source "package/mysql_client/Config.in"
 source "package/sqlcipher/Config.in"
 source "package/sqlite/Config.in"
diff --git a/package/gdbm/Config.in b/package/gdbm/Config.in
new file mode 100644
index 0000000000..d5aae83c50
--- /dev/null
+++ b/package/gdbm/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GDBM
+	bool "gdbm"
+	help
+	  GNU dbm is a set of database routines that use extensible hashing.
+	  It works similar to the standard UNIX dbm routines.
+
+	  http://www.gnu.org/software/gdbm/gdbm.html
+
diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk
new file mode 100644
index 0000000000..4971b127d7
--- /dev/null
+++ b/package/gdbm/gdbm.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# gdbm
+#
+#############################################################
+GDBM_VERSION = 1.10
+GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
+GDBM_LICENSE = GPLv3
+GDBM_LICENSE_FILES = COPYING
+GDBM_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 1ff20d33e3f213ea1efc2e6939516b1ea43393c4 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:50 +0000
Subject: [PATCH 3096/6849] perl: add GDBM_File

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/Config.in | 6 ++++++
 package/perl/perl.mk   | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/package/perl/Config.in b/package/perl/Config.in
index 6cb89f0293..98b41da4fa 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -22,6 +22,12 @@ config BR2_PACKAGE_PERL_DB_FILE
 	help
 	  Build the DB_File module.
 
+config BR2_PACKAGE_PERL_GDBM_FILE
+	bool "GDBM_File"
+	select BR2_PACKAGE_GDBM
+	help
+	  Build the GDBM_File module.
+
 endif
 
 comment "perl requires an architecture supported by qemu"
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 186158bf29..56abbc1f19 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -16,6 +16,9 @@ PERL_DEPENDENCIES = host-qemu
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
     PERL_DEPENDENCIES += berkeleydb
 endif
+ifeq ($(BR2_PACKAGE_GDBM),y)
+    PERL_DEPENDENCIES += gdbm
+endif
 
 PERL_CONF_OPT = -des \
 		-Dusecrosscompile \

From fa3afe2d81874b315759c1fb3b705ed54b15ce2c Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:51 +0000
Subject: [PATCH 3097/6849] perl: add option "custom install"

allows same behaviour (and footprint) as microperl

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/Config.in | 16 ++++++++++++++++
 package/perl/perl.mk   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/package/perl/Config.in b/package/perl/Config.in
index 98b41da4fa..0642debf39 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -16,6 +16,22 @@ config BR2_PACKAGE_PERL
 
 if BR2_PACKAGE_PERL
 
+config BR2_PACKAGE_PERL_CUSTOM_INSTALL
+	bool "custom install"
+	help
+	  Don't use the full install target
+	  Install only a selection of modules (like microperl).
+
+config BR2_PACKAGE_PERL_MODULES
+	string "additional modules"
+	depends on BR2_PACKAGE_PERL_CUSTOM_INSTALL
+	help
+	  List of space-separated perl modules to copy to the rootfs.
+
+	  Examples: constant.pm Getopt/Std.pm Time/Local.pm
+
+	  Module dependencies are not automatic so check your needs.
+
 config BR2_PACKAGE_PERL_DB_FILE
 	bool "DB_File"
 	select BR2_PACKAGE_BERKELEYDB
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 56abbc1f19..81dff049ea 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -89,7 +89,38 @@ PERL_RUN_PERL = $(QEMU_USER) $(@D)/perl -Ilib
 PERL_ARCHNAME = $(shell $(PERL_RUN_PERL) -MConfig -e "print Config->{archname}")
 PERL_LIB = $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)
 PERL_ARCHLIB = $(PERL_LIB)/$(PERL_ARCHNAME)
+PERL_MODS = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES))
+# Minimal set of modules required for 'perl -V' to work
+PERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl
+PERL_BASE_MODS = strict.pm vars.pm warnings.pm warnings/register.pm
 
+define PERL_INSTALL_MODULES
+	for i in $(PERL_ARCH_MODS); do \
+		$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_ARCHLIB)/$$i; \
+	done
+	for i in $(PERL_BASE_MODS); do \
+		$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_LIB)/$$i; \
+	done
+	for i in $(PERL_MODS); do \
+		j=`echo $$i|cut -d : -f 1` ; \
+		if [ -d $(@D)/lib/$$j ] ; then \
+			cp -af $(@D)/lib/$$j $(PERL_LIB) ; \
+		fi ; \
+		if [ -f $(@D)/lib/$$i ] ; then \
+			$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_LIB)/$$i; \
+		fi ; \
+	done
+	# Remove test files
+	find $(PERL_LIB) -type f -name *.t -exec rm -f {} \;
+endef
+
+ifeq ($(BR2_PACKAGE_PERL_CUSTOM_INSTALL),y)
+define PERL_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/perl $(TARGET_DIR)/usr/bin/perl
+	$(INSTALL) -m 0755 -D $(@D)/libperl.so $(PERL_ARCHLIB)/CORE/libperl.so
+	$(PERL_INSTALL_MODULES)
+endef
+else
 define PERL_INSTALL_TARGET_CMDS
 	$(MAKE) INSTALL_DEPENDENCE= \
 		INSTALLFLAGS=-p \
@@ -98,6 +129,7 @@ define PERL_INSTALL_TARGET_CMDS
 	rm -f $(PERL_ARCHLIB)/CORE/*.h
 	find $(PERL_ARCHLIB) -type f -name *.bs -exec rm -f {} \;
 endef
+endif
 
 define PERL_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean

From 87422ed7e5a11bed94cd72ef80d1e5e1970c17fd Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:52 +0000
Subject: [PATCH 3098/6849] perl: prepare the removal of microperl

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/Config.in   | 2 +-
 package/autoconf/autoconf.mk | 2 +-
 package/automake/Config.in   | 2 +-
 package/automake/automake.mk | 2 +-
 package/microperl/Config.in  | 1 +
 package/ntp/Config.in        | 4 ++--
 package/samba/Config.in      | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
index 00b3e2c5dd..5f2f148928 100644
--- a/package/autoconf/Config.in
+++ b/package/autoconf/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf"
-	select BR2_PACKAGE_MICROPERL
+	select BR2_PACKAGE_PERL
 	help
 	  Extensible program for developing configure scripts.  These
 	  scripts handle all the mundane system/feature detection.
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 3f84e3e0d7..0cb50db505 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -10,7 +10,7 @@ AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 		    ac_cv_prog_gnu_m4_gnu=no
 
-AUTOCONF_DEPENDENCIES = microperl host-m4
+AUTOCONF_DEPENDENCIES = host-m4 perl
 
 HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 			ac_cv_prog_gnu_m4_gnu=no
diff --git a/package/automake/Config.in b/package/automake/Config.in
index 935f1f1454..9a9673a6e8 100644
--- a/package/automake/Config.in
+++ b/package/automake/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake"
 	select BR2_PACKAGE_AUTOCONF
-	select BR2_PACKAGE_MICROPERL
+	select BR2_PACKAGE_PERL
 	help
 	  Tool for automatically generating Makefile's for input to
 	  configure scripts (made by autoconf).
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 477b10b3f6..faa1b36c36 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -9,7 +9,7 @@ AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 AUTOMAKE_LICENSE = GPLv2+
 AUTOMAKE_LICENSE_FILES = COPYING
 
-AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl
+AUTOMAKE_DEPENDENCIES = host-autoconf autoconf perl
 
 HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
 
diff --git a/package/microperl/Config.in b/package/microperl/Config.in
index 66bbedd776..19d104a698 100644
--- a/package/microperl/Config.in
+++ b/package/microperl/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_MICROPERL
 	bool "microperl"
 	# needs fork()
 	depends on BR2_USE_MMU
+	depends on BR2_DEPRECATED
 	help
 	  Perl without operating-specific functions such as readdir.
 
diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index 5996596098..ec5dbbb40e 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -20,7 +20,7 @@ config BR2_PACKAGE_NTP_NTP_KEYGEN
 
 config BR2_PACKAGE_NTP_NTP_WAIT
 	bool "ntp-wait"
-	depends on BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_PERL
 	help
 	  ntp-wait waits until the locally running ntpd is in state 4
 	  (synchronized). This could be useful at boot time, to delay the
@@ -59,7 +59,7 @@ config BR2_PACKAGE_NTP_NTPSNMPD
 
 config BR2_PACKAGE_NTP_NTPTRACE
 	bool "ntptrace"
-	depends on BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_PERL
 	help
 	  ntptrace is a perl script that uses the ntpq utility program to
 	  follow the chain of NTP servers from a given host back to the
diff --git a/package/samba/Config.in b/package/samba/Config.in
index 928b40bd39..b4028b1671 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -36,12 +36,12 @@ config BR2_PACKAGE_SAMBA_FINDSMB
 	default y
 	depends on BR2_PACKAGE_SAMBA_SMBCLIENT
 	depends on BR2_PACKAGE_SAMBA_NMBLOOKUP
-	depends on BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_PERL
 	help
 	  Script to browse network
 
 comment "findsmb       - disabled (requires nmblookup, smbclient and perl)"
-	depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL
+	depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_PERL
 
 config BR2_PACKAGE_SAMBA_NET
 	bool "net"

From 22a6be4d43c9318cb21c8f351ef3c1132400008c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 3 Nov 2012 12:53:29 +0100
Subject: [PATCH 3099/6849] package: don't hide webservers when
 !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

The busybox web server isn't providing the same binary name / cmdline
arguments as the "big" webservers, so they aren't equivalent.

As discussed on the dev day, don't hide them when _SHOW_OTHERS isn't
enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index a4f75c96eb..c895e7ae4b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -543,9 +543,7 @@ source "package/argus/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
 source "package/bluez_utils/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/boa/Config.in"
-endif
 source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
@@ -563,9 +561,7 @@ source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
 source "package/heirloom-mailx/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hiawatha/Config.in"
-endif
 source "package/hostapd/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
@@ -579,9 +575,7 @@ source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lighttpd/Config.in"
-endif
 source "package/links/Config.in"
 source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
@@ -635,9 +629,9 @@ source "package/tcpdump/Config.in"
 source "package/tcpreplay/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tftpd/Config.in"
+endif
 source "package/thttpd/Config.in"
 source "package/tinyhttpd/Config.in"
-endif
 source "package/tn5250/Config.in"
 source "package/transmission/Config.in"
 source "package/ttcp/Config.in"

From 1b5ce0e9a2867851cdb81aaa68b4007d5517250f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 3 Nov 2012 16:50:51 +0100
Subject: [PATCH 3100/6849] iproute2: fix em_ipset build issue

Fixes http://autobuild.buildroot.net/results/be19e39c19b62946ea48dd6b3dfd55f5c3ccd7c9

em_ipset.c uses xtables.h from iptables, but the configure script fails
to to check for this, so forcibly disable it if not available.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 03767ccda8..6f5ee51607 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -24,6 +24,11 @@ define IPROUTE2_WITH_IPTABLES
 	$(SED) "s/-DIPT/-DXT/" $(IPROUTE2_DIR)/tc/Makefile
 	echo "TC_CONFIG_XT:=y" >>$(IPROUTE2_DIR)/Config
 endef
+else
+define IPROUTE2_WITH_IPTABLES
+	# em_ipset needs xtables, but configure misdetects it
+	echo "TC_CONFIG_IPSET:=n" >>$(IPROUTE2_DIR)/Config
+endef
 endif
 
 define IPROUTE2_CONFIGURE_CMDS

From 51b5cf20bbd07f7ac5855108b17bd08e6a9edf69 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 19 Oct 2012 03:13:53 +0000
Subject: [PATCH 3101/6849] cpanminus: new package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  5 +++
 package/cpanminus/Config.in              | 36 ++++++++++++++++++
 package/cpanminus/cpanminus.mk           | 47 ++++++++++++++++++++++++
 package/perl/perl-fix-Module-Build.patch | 16 ++++++++
 4 files changed, 104 insertions(+)
 create mode 100644 package/cpanminus/Config.in
 create mode 100644 package/cpanminus/cpanminus.mk
 create mode 100644 package/perl/perl-fix-Module-Build.patch

diff --git a/package/Config.in b/package/Config.in
index c895e7ae4b..2ac2568651 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -280,6 +280,11 @@ source "package/xavante/Config.in"
 endmenu
 endif
 source "package/perl/Config.in"
+if BR2_PACKAGE_PERL
+menu "Perl libraries/modules"
+source "package/cpanminus/Config.in"
+endmenu
+endif
 source "package/microperl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
diff --git a/package/cpanminus/Config.in b/package/cpanminus/Config.in
new file mode 100644
index 0000000000..b8b39dc016
--- /dev/null
+++ b/package/cpanminus/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_CPANMINUS
+	bool "cpanminus"
+	help
+	  cpanminus is a script to get, unpack, build and install Perl modules
+	  from CPAN.
+
+	  Why? It's dependency free, requires zero configuration, and stands
+	  alone. When running, it requires only 10MB of RAM.
+
+	  http://github.com/miyagawa/cpanminus
+
+if BR2_PACKAGE_CPANMINUS
+
+config BR2_PACKAGE_CPANMINUS_MIRROR
+	string "mirror"
+	help
+	  Specifies the base URL for the CPAN mirror to use,
+	  such as http://cpan.cpantesters.org/.
+
+config BR2_PACKAGE_CPANMINUS_MODULES
+	string "Perl modules from CPAN"
+	default "Curses::UI"
+	help
+	  List of space-separated Perl modules to install from CPAN.
+
+	  Examples: Try::Tiny Dancer YAML Moo
+
+	  Install the listed modules and their dependencies.
+
+config BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES
+	string "native dependencies"
+	default "ncurses"
+	help
+	  Some XS modules require native libraries.
+
+endif
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
new file mode 100644
index 0000000000..d3a338b0b7
--- /dev/null
+++ b/package/cpanminus/cpanminus.mk
@@ -0,0 +1,47 @@
+#############################################################
+#
+# cpanminus
+#
+#############################################################
+
+CPANMINUS_VERSION = 1.5018
+CPANMINUS_SOURCE = miyagawa-cpanminus-$(CPANMINUS_VERSION)-0-gee6cd30.tar.gz
+CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/tarball/$(CPANMINUS_VERSION)
+CPANMINUS_DEPENDENCIES = perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
+
+CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
+CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
+CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)
+CPANMINUS_PERL_SITELIB  = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
+CPANMINUS_PERL_ARCHLIB  = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
+CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
+CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
+ifneq ($(BR2_PACKAGE_CPANMINUS_MIRROR),"")
+    CPANMINUS_MIRROR = --mirror $(call qstrip,$(BR2_PACKAGE_CPANMINUS_MIRROR)) --mirror-only
+endif
+CPANMINUS_MODULES = $(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
+
+ifneq ($(CPANMINUS_MODULES),)
+define CPANMINUS_INSTALL_TARGET_CMDS
+	echo "#!/bin/sh"                                                        > $(@D)/run_perl
+	echo "PERL5LIB=$(CPANMINUS_PERL5LIB) $(CPANMINUS_RUN_PERL) \"\$$@\""    >>$(@D)/run_perl
+	chmod +x $(@D)/run_perl
+	PERL5LIB=$(CPANMINUS_PERL5LIB) \
+	PERL_MM_OPT="DESTDIR=$(TARGET_DIR) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
+	PERL_MB_OPT="--destdir $(TARGET_DIR)" \
+	RUN_PERL="$(@D)/run_perl" \
+	$(CPANMINUS_RUN_PERL) $(@D)/cpanm \
+		--perl=$(@D)/run_perl \
+		--notest \
+		--no-man-pages \
+		$(CPANMINUS_MIRROR) \
+		$(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
+	find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
+endef
+else
+define CPANMINUS_INSTALL_TARGET_CMDS
+	@echo "No modules to install"
+endef
+endif
+
+$(eval $(generic-package))
diff --git a/package/perl/perl-fix-Module-Build.patch b/package/perl/perl-fix-Module-Build.patch
new file mode 100644
index 0000000000..26b15e4011
--- /dev/null
+++ b/package/perl/perl-fix-Module-Build.patch
@@ -0,0 +1,16 @@
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/cpan/Module-Build/lib/Module/Build/Base.pm
+===================================================================
+--- a/cpan/Module-Build/lib/Module/Build/Base.pm
++++ b/cpan/Module-Build/lib/Module/Build/Base.pm
+@@ -456,7 +456,7 @@
+   my $proto = shift;
+   my $c     = ref($proto) ? $proto->{config} : 'Module::Build::Config';
+ 
+-  my $perl  = $^X;
++  my $perl  = $ENV{RUN_PERL} || $^X;
+   my $perl_basename = File::Basename::basename($perl);
+ 
+   my @potential_perls;

From 1e9b963255fd20c2532f71c62d5c80eb5643d4c9 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sat, 3 Nov 2012 06:05:10 +0000
Subject: [PATCH 3102/6849] barebox: Allow to pass a custom configuration file

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in  | 21 +++++++++++++++++++++
 boot/barebox/barebox.mk | 26 +++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index bd70e58b81..d6ce8dd680 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -67,12 +67,33 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION
 
 endif
 
+
+choice
+	prompt "Barebox configuration"
+	default BR2_TARGET_BAREBOX_USE_DEFCONFIG
+
+config BR2_TARGET_BAREBOX_USE_DEFCONFIG
+	bool "Using a defconfig"
+
+config BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG
+	bool "Using a custom config file"
+
+endchoice
+
 config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG
 	string "board defconfig"
+	depends on BR2_TARGET_BAREBOX_USE_DEFCONFIG
 	help
 	  Name of the board for which Barebox should be built, without
 	  the _defconfig suffix.
 
+
+config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
+	string "Configuration file path"
+	depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG
+	help
+	  Path to the barebox configuration file
+
 config BR2_TARGET_BAREBOX_BAREBOXENV
 	bool "bareboxenv tool in target"
 	help
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index ee84831c6c..a025d5f4a3 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -37,8 +37,6 @@ ifneq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
 BAREBOX_INSTALL_TARGET = NO
 endif
 
-BAREBOX_BOARD_DEFCONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))
-
 ifeq ($(KERNEL_ARCH),i386)
 BAREBOX_ARCH=x86
 else ifeq ($(KERNEL_ARCH),powerpc)
@@ -49,8 +47,16 @@ endif
 
 BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
 
+
+ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
+BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
+else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
+BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
+endif
+
 define BAREBOX_CONFIGURE_CMDS
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) $(BAREBOX_BOARD_DEFCONFIG)_defconfig
+	cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
+	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 endef
 
 ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
@@ -80,8 +86,8 @@ $(eval $(generic-package))
 ifeq ($(BR2_TARGET_BAREBOX),y)
 # we NEED a board defconfig file unless we're at make source
 ifeq ($(filter source,$(MAKECMDGOALS)),)
-ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
-$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
+ifeq ($(BAREBOX_SOURCE_CONFIG),)
+$(error No Barebox config file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings)
 endif
 endif
 
@@ -94,4 +100,14 @@ barebox-savedefconfig: barebox-configure
 	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
 		$(subst barebox-,,$@)
 
+ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
+barebox-update-config: barebox-configure $(BAREBOX_DIR)/.config
+	cp -f $(BAREBOX_DIR)/.config $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
+
+barebox-update-defconfig: barebox-savedefconfig
+	cp -f $(BAREBOX_DIR)/defconfig $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
+else
+barebox-update-config: ;
+barebox-update-defconfig: ;
+endif
 endif

From db09796532d1b7b09bae61d1b297261a4a51b7c1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 06:39:16 +0000
Subject: [PATCH 3103/6849] gdb: adjust behavior when thread debug is not
 available

When an external toolchain without thread debug is used, the gdb
package can be selected, but no version can be choosen, since none
match any of the requirements. This leads Buildroot to try to build
gdb for the target without a version being defined, as in the
following build log:

 http://autobuild.buildroot.org/results/84e8fd2df0cc22448052a572c2e9a6e03dd137eb/build-end.log

To fix this, we adjust the dependencies of the BR2_PACKAGE_GDB option
so that the package as a whole is not selectable when the required
conditions are not met. Basically, we have the choice of:

 * Having a toolchain that supports thread debugging, which is needed
   for gdb >= 7.x

 * Having BR2_DEPRECATED enabled, which allows gdb 6.8 to be selected,
   which doesn't require thread debugging

 * Using bfin, since this architectures has a special old gdb version

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 272e1961f5..8acce1e386 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -4,8 +4,14 @@ config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze
+	# The newest versions of gdb require thread debugging in the
+	# toolchain. The only cases for which this is not needed is if
+	# we use gdb 6.8 (marked deprecated)
+	depends on \
+		BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED || \
+		BR2_DEPRECATED || \
+		BR2_bfin
 	help
 	    Build the full gdb debugger to run on the target.
 
@@ -90,9 +96,8 @@ choice
 
 endchoice
 
-comment "gdb 7.x support needs pthread debug support in toolchain"
-	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+comment "gdb support needs pthread debug support in toolchain"
+	depends on !BR2_DEPRECATED && !BR2_bfin && !BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 
 config BR2_GDB_VERSION
 	string

From 51f3425e3d6c69758c071b9327eecaa14b5e053a Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 3 Nov 2012 06:38:54 +0000
Subject: [PATCH 3104/6849] use avr32linux.org mirror

The avr32linux.org mirror has vanished and is replaced by a spam site
that returns HTML pages for whatever URL you request from it.  So the
download helper thinks that download has succeeded, while actually it
failed.

Fortunately, there is still a mirror of the site alive, so we can use
that one.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gadgetfs-test/gadgetfs-test.mk | 2 +-
 package/games/rubix/Config.in          | 2 +-
 package/games/rubix/rubix.mk           | 2 +-
 package/torsmo/Config.in               | 2 +-
 package/torsmo/torsmo.mk               | 2 +-
 package/xstroke/Config.in              | 2 +-
 package/xstroke/xstroke.mk             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index 808618be81..0fc82210d0 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 GADGETFS_TEST_SOURCE=gadgetfs-test.tar.bz2
-GADGETFS_TEST_SITE=http://avr32linux.org/twiki/pub/Main/GadgetFsTest/
+GADGETFS_TEST_SITE=http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest/
 
 GADGETFS_TEST_MAKEOPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
 
diff --git a/package/games/rubix/Config.in b/package/games/rubix/Config.in
index 6da8c71dfc..9cf5b46ad4 100644
--- a/package/games/rubix/Config.in
+++ b/package/games/rubix/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_RUBIX
 	help
 	  A 3D rubiks cube game for X
 
-	  http://avr32linux.org/twiki/pub/Main/Rubix
+	  http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
diff --git a/package/games/rubix/rubix.mk b/package/games/rubix/rubix.mk
index 2087b515cd..d39d3533e2 100644
--- a/package/games/rubix/rubix.mk
+++ b/package/games/rubix/rubix.mk
@@ -5,7 +5,7 @@
 #############################################################
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
-RUBIX_SITE = http://avr32linux.org/twiki/pub/Main/Rubix
+RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
 RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 
 RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
diff --git a/package/torsmo/Config.in b/package/torsmo/Config.in
index ec9cb2220b..b3aba39469 100644
--- a/package/torsmo/Config.in
+++ b/package/torsmo/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_TORSMO
 	help
 	  Torsmo is a system monitor that sits in the corner of your desktop.
 
-	  http://avr32linux.org/twiki/pub/Main/Torsmo
+	  http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index 1e3bd2807e..c42ce112c9 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -5,7 +5,7 @@
 #############################################################
 TORSMO_VERSION = 0.18
 TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
-TORSMO_SITE = http://avr32linux.org/twiki/pub/Main/Torsmo
+TORSMO_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
 
 # help2man doesn't work when cross compiling
 TORSMO_CONF_ENV = ac_cv_path_HELP2MAN=''
diff --git a/package/xstroke/Config.in b/package/xstroke/Config.in
index 5589fe6a4f..54cb38e390 100644
--- a/package/xstroke/Config.in
+++ b/package/xstroke/Config.in
@@ -7,4 +7,4 @@ config BR2_PACKAGE_XSTROKE
 	help
 	  Handwriting recognition for X
 
-	  http://avr32linux.org/twiki/pub/Main/XStroke
+	  http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index d7d18db70d..34595454e3 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -5,7 +5,7 @@
 #############################################################
 XSTROKE_VERSION = 0.6
 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
-XSTROKE_SITE = http://avr32linux.org/twiki/pub/Main/XStroke
+XSTROKE_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
 
 XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm
 

From 7eca96e65f750e40d5cb558acf45b906bb6453e6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Jun 2012 18:13:55 +0200
Subject: [PATCH 3105/6849] qextserialport: new package

[Peter: adjust for BR changes]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/qextserialport/Config.in              |  9 +++++
 .../qextserialport-main-include.patch         | 15 ++++++++
 .../qextserialport-no-examples.patch          | 17 +++++++++
 .../qextserialport-pkgconfig.patch            | 19 ++++++++++
 package/qextserialport/qextserialport.mk      | 35 +++++++++++++++++++
 6 files changed, 96 insertions(+)
 create mode 100644 package/qextserialport/Config.in
 create mode 100644 package/qextserialport/qextserialport-main-include.patch
 create mode 100644 package/qextserialport/qextserialport-no-examples.patch
 create mode 100644 package/qextserialport/qextserialport-pkgconfig.patch
 create mode 100644 package/qextserialport/qextserialport.mk

diff --git a/package/Config.in b/package/Config.in
index 2ac2568651..fd2703e90e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -138,6 +138,7 @@ source "package/qt/Config.in"
 
 if BR2_PACKAGE_QT
 comment "QT libraries and helper libraries"
+source "package/qextserialport/Config.in"
 source "package/qtuio/Config.in"
 endif
 
diff --git a/package/qextserialport/Config.in b/package/qextserialport/Config.in
new file mode 100644
index 0000000000..4e92ecf3bb
--- /dev/null
+++ b/package/qextserialport/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QEXTSERIALPORT
+	bool "qextserialport"
+	# Qt is a big library, we don't want to select it
+	# automatically without the user knowing
+	depends on BR2_PACKAGE_QT
+	help
+	  A Qt library to manage serial ports
+
+	  http://code.google.com/p/qextserialport/
diff --git a/package/qextserialport/qextserialport-main-include.patch b/package/qextserialport/qextserialport-main-include.patch
new file mode 100644
index 0000000000..858f3354d5
--- /dev/null
+++ b/package/qextserialport/qextserialport-main-include.patch
@@ -0,0 +1,15 @@
+Create a main include file QExtSerialPort
+
+This main include file will be installed in
+<QExtSerialPort/QExtSerialPort> so that Qt applications can use this
+library by including header files in a Qt-like style.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qextserialport-ef4af2a2ee3f/src/QExtSerialPort
+===================================================================
+--- /dev/null
++++ qextserialport-ef4af2a2ee3f/src/QExtSerialPort
+@@ -0,0 +1,2 @@
++#include "qextserialport.h"
++#include "qextserialenumerator.h"
diff --git a/package/qextserialport/qextserialport-no-examples.patch b/package/qextserialport/qextserialport-no-examples.patch
new file mode 100644
index 0000000000..c7d2d41b9d
--- /dev/null
+++ b/package/qextserialport/qextserialport-no-examples.patch
@@ -0,0 +1,17 @@
+Disable compilation of examples
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qextserialport-ef4af2a2ee3f/qextserialport.pro
+===================================================================
+--- qextserialport-ef4af2a2ee3f.orig/qextserialport.pro
++++ qextserialport-ef4af2a2ee3f/qextserialport.pro
+@@ -1,7 +1,4 @@
+ #
+ TEMPLATE = subdirs
+ CONFIG   += ordered
+-SUBDIRS  = src \
+-           examples/enumerator \
+-           examples/event
+-
++SUBDIRS  = src
diff --git a/package/qextserialport/qextserialport-pkgconfig.patch b/package/qextserialport/qextserialport-pkgconfig.patch
new file mode 100644
index 0000000000..d67f3fcbb3
--- /dev/null
+++ b/package/qextserialport/qextserialport-pkgconfig.patch
@@ -0,0 +1,19 @@
+Add a pkgconfig file to ease usage with applications
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qextserialport-ef4af2a2ee3f/qextserialport.pc
+===================================================================
+--- /dev/null
++++ qextserialport-ef4af2a2ee3f/qextserialport.pc
+@@ -0,0 +1,10 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include/QExtSerialPort
++
++Name: QtExtSerialPort
++Description: QtExtSerialPort library
++Version: 1.2.0
++Libs: -L${libdir} -lqextserialport
++Cflags: -I${includedir}
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
new file mode 100644
index 0000000000..6ffb9ebb7a
--- /dev/null
+++ b/package/qextserialport/qextserialport.mk
@@ -0,0 +1,35 @@
+#############################################################
+#
+# qextserialport
+#
+#############################################################
+
+QEXTSERIALPORT_VERSION     = ef4af2a2ee3f
+QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/hg/
+QEXTSERIALPORT_SITE_METHOD = hg
+
+QEXTSERIALPORT_DEPENDENCIES = qt
+
+QEXTSERIALPORT_INSTALL_STAGING = YES
+
+define QEXTSERIALPORT_CONFIGURE_CMDS
+	(cd $(@D); $(QT_QMAKE))
+endef
+
+define QEXTSERIALPORT_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define QEXTSERIALPORT_INSTALL_STAGING_CMDS
+	mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
+	cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
+	cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
+	cp -a $(@D)/src/build/*.so* $(STAGING_DIR)/usr/lib/
+	cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+endef
+
+define QEXTSERIALPORT_INSTALL_TARGET_CMDS
+	cp -a $(@D)/src/build/*.so.* $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))

From cc77d6437d9a25de746596e127e230fac8f99286 Mon Sep 17 00:00:00 2001
From: Thiago Correa <thiago.correa@gmail.com>
Date: Mon, 29 Oct 2012 05:53:19 +0000
Subject: [PATCH 3106/6849] cmake: bump version to 2.8.9

Signed-off-by: Thiago A. Correa <thiago.correa@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 2406e5cd47..e2bc31f472 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -1,4 +1,4 @@
-CMAKE_VERSION = 2.8.5
+CMAKE_VERSION = 2.8.9
 CMAKE_SITE = http://www.cmake.org/files/v2.8/
 
 define HOST_CMAKE_CONFIGURE_CMDS

From 6ee86f603bd449f81c9e262e01750d3ba4c9767f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:42 +0000
Subject: [PATCH 3107/6849] libnetfilter_conntrack: bump to version 1.0.2

[Peter: adjust dnsmasq dependency]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/Config.in                                | 4 ++++
 package/libnetfilter_conntrack/Config.in                 | 5 +++++
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index b76ddb2cc3..a6f5d96f88 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -38,7 +38,11 @@ config BR2_PACKAGE_DNSMASQ_LUA
 config BR2_PACKAGE_DNSMASQ_CONNTRACK
 	bool "conntrack marking support"
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	depends on BR2_LARGEFILE
 	help
 	  Enable DNS query connection marking in netfilter.
 
+comment "conntrack marking support requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
+
 endif
diff --git a/package/libnetfilter_conntrack/Config.in b/package/libnetfilter_conntrack/Config.in
index caf8a8a5b6..9f7b42a22b 100644
--- a/package/libnetfilter_conntrack/Config.in
+++ b/package/libnetfilter_conntrack/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	bool "libnetfilter_conntrack"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBNFNETLINK
 	help
 	  libnetfilter_conntrack is a userspace library providing
@@ -7,3 +9,6 @@ config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	  connection tracking state table.
 
 	  http://www.netfilter.org/projects/libnetfilter_conntrack/
+
+comment "libnetfilter_conntrack requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index a5d832f675..725c39ee9c 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-LIBNETFILTER_CONNTRACK_VERSION = 1.0.1
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.2
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
-LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink
+LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
+LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+
+LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From f3ff941ace5a69e544f0ee22c5a0031ff1952a3c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:43 +0000
Subject: [PATCH 3108/6849] libnetfilter_cttimeout: add license info

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index 4bdc0fc0db..ff155eb812 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -9,5 +9,7 @@ LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_
 LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
 LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
 LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
+LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2
+LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 50fbbd3f6dcbb8c1ebd2d2e97310c2ff7cf39aa6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:44 +0000
Subject: [PATCH 3109/6849] libnfnetlink: bump to version 1.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnfnetlink/libnfnetlink.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
index 9af28d81d0..2d79cdb861 100644
--- a/package/libnfnetlink/libnfnetlink.mk
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNFNETLINK_VERSION = 1.0.0
+LIBNFNETLINK_VERSION = 1.0.1
 LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
 LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
 LIBNFNETLINK_INSTALL_STAGING = YES

From 6b454a23bd1320e81832731019a250748448e137 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:45 +0000
Subject: [PATCH 3110/6849] libnetfilter_cthelper: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                 |  1 +
 package/libnetfilter_cthelper/Config.in           | 13 +++++++++++++
 .../libnetfilter-cthelper.mk                      | 15 +++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/libnetfilter_cthelper/Config.in
 create mode 100644 package/libnetfilter_cthelper/libnetfilter-cthelper.mk

diff --git a/package/Config.in b/package/Config.in
index fd2703e90e..e938e53108 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -456,6 +456,7 @@ source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
+source "package/libnetfilter_cthelper/Config.in"
 source "package/libnetfilter_cttimeout/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
diff --git a/package/libnetfilter_cthelper/Config.in b/package/libnetfilter_cthelper/Config.in
new file mode 100644
index 0000000000..fd4f95cd45
--- /dev/null
+++ b/package/libnetfilter_cthelper/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBNETFILTER_CTHELPER
+	bool "libnetfilter_cthelper"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBMNL
+	help
+	  libnetfilter_cthelper is the userspace library that provides
+	  the programming interface to the user-space helper infrastructure
+	  available since Linux kernel 3.6.
+
+	  http://www.netfilter.org/projects/libnetfilter_cthelper/
+
+comment "libnetfilter_cthelper requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
new file mode 100644
index 0000000000..1414156662
--- /dev/null
+++ b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libnetfilter-cthelper
+#
+#############################################################
+
+LIBNETFILTER_CTHELPER_VERSION = 1.0.0
+LIBNETFILTER_CTHELPER_SOURCE = libnetfilter_cthelper-$(LIBNETFILTER_CTHELPER_VERSION).tar.bz2
+LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthelper/files
+LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES
+LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl
+LIBNETFILTER_CTHELPER_LICENSE = GPLv2
+LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 94eb5b1cf15f2e71a7bc21cf7c8cb6b552187aec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:46 +0000
Subject: [PATCH 3111/6849] libnetfilter_queue: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                |  1 +
 package/libnetfilter_queue/Config.in             | 14 ++++++++++++++
 package/libnetfilter_queue/libnetfilter-queue.mk | 15 +++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/libnetfilter_queue/Config.in
 create mode 100644 package/libnetfilter_queue/libnetfilter-queue.mk

diff --git a/package/Config.in b/package/Config.in
index e938e53108..eae415b7f7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -458,6 +458,7 @@ source "package/libmbus/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
 source "package/libnetfilter_cthelper/Config.in"
 source "package/libnetfilter_cttimeout/Config.in"
+source "package/libnetfilter_queue/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/liboping/Config.in"
diff --git a/package/libnetfilter_queue/Config.in b/package/libnetfilter_queue/Config.in
new file mode 100644
index 0000000000..d06aa77cda
--- /dev/null
+++ b/package/libnetfilter_queue/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LIBNETFILTER_QUEUE
+	bool "libnetfilter_queue"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBNFNETLINK
+	select BR2_PACKAGE_LIBMNL
+	help
+	  libnetfilter_queue is the userspace library that provides
+	  the programming interface to the fine-grain
+	  connection tracking timeout infrastructure.
+
+	  http://www.netfilter.org/projects/libnetfilter_queue/
+
+comment "libnetfilter_queue requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_queue/libnetfilter-queue.mk b/package/libnetfilter_queue/libnetfilter-queue.mk
new file mode 100644
index 0000000000..8f9ad5cb92
--- /dev/null
+++ b/package/libnetfilter_queue/libnetfilter-queue.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libnetfilter-queue
+#
+#############################################################
+
+LIBNETFILTER_QUEUE_VERSION = 1.0.2
+LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar.bz2
+LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/files
+LIBNETFILTER_QUEUE_INSTALL_STAGING = YES
+LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
+LIBNETFILTER_QUEUE_LICENSE = GPLv2
+LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From b48aa7eed99ca980548ade72949dfd4108e8d05d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:47 +0000
Subject: [PATCH 3112/6849] libnetfilter_acct: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                              |  1 +
 package/libnetfilter_acct/Config.in            | 12 ++++++++++++
 package/libnetfilter_acct/libnetfilter-acct.mk | 15 +++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/libnetfilter_acct/Config.in
 create mode 100644 package/libnetfilter_acct/libnetfilter-acct.mk

diff --git a/package/Config.in b/package/Config.in
index eae415b7f7..dde8475943 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -455,6 +455,7 @@ source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
 source "package/libmbus/Config.in"
+source "package/libnetfilter_acct/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
 source "package/libnetfilter_cthelper/Config.in"
 source "package/libnetfilter_cttimeout/Config.in"
diff --git a/package/libnetfilter_acct/Config.in b/package/libnetfilter_acct/Config.in
new file mode 100644
index 0000000000..76cdf7db4f
--- /dev/null
+++ b/package/libnetfilter_acct/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBNETFILTER_ACCT
+	bool "libnetfilter_acct"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBMNL
+	help
+	  libnetfilter_acct is the userspace library providing interface
+	  to extended accounting infrastructure.
+
+	  http://www.netfilter.org/projects/libnetfilter_acct/
+
+comment "libnetfilter_acct requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_acct/libnetfilter-acct.mk b/package/libnetfilter_acct/libnetfilter-acct.mk
new file mode 100644
index 0000000000..615c94c5ea
--- /dev/null
+++ b/package/libnetfilter_acct/libnetfilter-acct.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libnetfilter-acct
+#
+#############################################################
+
+LIBNETFILTER_ACCT_VERSION = 1.0.1
+LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2
+LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files
+LIBNETFILTER_ACCT_INSTALL_STAGING = YES
+LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl
+LIBNETFILTER_ACCT_LICENSE = LGPLv2.1+
+LIBNETFILTER_ACCT_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From f57cfba8c37dc2f9e06069eb8ca5d3710aa52ee1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:48 +0000
Subject: [PATCH 3113/6849] libmnl: add license info

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmnl/libmnl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 75bb23887b..1f71347c66 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -8,5 +8,7 @@ LIBMNL_VERSION = 1.0.3
 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES
+LIBMNL_LICENSE = LGPLv2.1+
+LIBMNL_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From f16acce6d3e0b50ae5f9d29cd4118afa212cd077 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:49 +0000
Subject: [PATCH 3114/6849] libnetfilter_log: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/libnetfilter_log/Config.in           |  8 ++++++++
 package/libnetfilter_log/libnetfilter-log.mk | 15 +++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libnetfilter_log/Config.in
 create mode 100644 package/libnetfilter_log/libnetfilter-log.mk

diff --git a/package/Config.in b/package/Config.in
index dde8475943..f5ccf0ac98 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -459,6 +459,7 @@ source "package/libnetfilter_acct/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
 source "package/libnetfilter_cthelper/Config.in"
 source "package/libnetfilter_cttimeout/Config.in"
+source "package/libnetfilter_log/Config.in"
 source "package/libnetfilter_queue/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
diff --git a/package/libnetfilter_log/Config.in b/package/libnetfilter_log/Config.in
new file mode 100644
index 0000000000..927cd0aae1
--- /dev/null
+++ b/package/libnetfilter_log/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBNETFILTER_LOG
+	bool "libnetfilter_log"
+	select BR2_PACKAGE_LIBNFNETLINK
+	help
+	  libnetfilter_log is a userspace library providing interface
+	  to packets that have been logged by the kernel packet filter.
+
+	  http://www.netfilter.org/projects/libnetfilter_log/
diff --git a/package/libnetfilter_log/libnetfilter-log.mk b/package/libnetfilter_log/libnetfilter-log.mk
new file mode 100644
index 0000000000..0d98e128a0
--- /dev/null
+++ b/package/libnetfilter_log/libnetfilter-log.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libnetfilter-log
+#
+#############################################################
+
+LIBNETFILTER_LOG_VERSION = 1.0.1
+LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2
+LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
+LIBNETFILTER_LOG_INSTALL_STAGING = YES
+LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink
+LIBNETFILTER_LOG_LICENSE = GPLv2
+LIBNETFILTER_LOG_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 05f081859eeeeaf8fa3843b1304a939eb7aa725a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:50 +0000
Subject: [PATCH 3115/6849] nfacct: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/nfacct/Config.in | 12 ++++++++++++
 package/nfacct/nfacct.mk | 15 +++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/nfacct/Config.in
 create mode 100644 package/nfacct/nfacct.mk

diff --git a/package/Config.in b/package/Config.in
index f5ccf0ac98..ab0c2058ce 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -607,6 +607,7 @@ source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/network-manager/Config.in"
+source "package/nfacct/Config.in"
 source "package/noip/Config.in"
 source "package/ngircd/Config.in"
 source "package/ngrep/Config.in"
diff --git a/package/nfacct/Config.in b/package/nfacct/Config.in
new file mode 100644
index 0000000000..ac437dac92
--- /dev/null
+++ b/package/nfacct/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_NFACCT
+	bool "nfacct"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBNETFILTER_ACCT
+	help
+	  nfacct is the command line tool to create/retrieve/delete
+	  netfilter accounting objects.
+
+	  http://www.netfilter.org/projects/nfacct/
+
+comment "nfacct requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk
new file mode 100644
index 0000000000..60c6e44f6e
--- /dev/null
+++ b/package/nfacct/nfacct.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# nfacct
+#
+#############################################################
+
+NFACCT_VERSION = 1.0.0
+NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
+NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files
+NFACCT_DEPENDENCIES = host-pkgconf \
+	libnetfilter_acct
+NFACCT_LICENSE = GPLv2
+NFACCT_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 6e24dfada40bd49847814e6f6e26b528aeec7f48 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:51 +0000
Subject: [PATCH 3116/6849] conntrack-tools: bump to version 1.4.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/Config.in          | 7 +++++--
 package/conntrack-tools/conntrack-tools.mk | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index be491e6fbf..f109adf1d8 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -1,9 +1,12 @@
 config BR2_PACKAGE_CONNTRACK_TOOLS
 	bool "conntrack-tools"
 	depends on BR2_INET_IPV6
+	depends on BR2_INET_RPC
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	select BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
+	select BR2_PACKAGE_LIBNETFILTER_QUEUE
 	help
 	  The conntrack-tools are a set of tools targeted at
 	  system administrators.
@@ -12,5 +15,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
 	  http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
+comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and RPC support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_INET_RPC
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index b8c8f5a905..ce64021425 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,11 +4,12 @@
 #
 #############################################################
 
-CONNTRACK_TOOLS_VERSION = 1.2.2
+CONNTRACK_TOOLS_VERSION = 1.4.0
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
-	libnetfilter_conntrack libnetfilter_cttimeout
+	libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
+	libnetfilter_queue
 CONNTRACK_TOOLS_LICENSE = GPLv2
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 

From b3770a8dc2c93c0a97786846e4c60037e52e7579 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:52 +0000
Subject: [PATCH 3117/6849] ulogd: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/ulogd/Config.in                       | 16 ++++++++++
 .../ulogd/ulogd-fix-libpcap-conditional.patch | 29 +++++++++++++++++++
 package/ulogd/ulogd.mk                        | 17 +++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 package/ulogd/Config.in
 create mode 100644 package/ulogd/ulogd-fix-libpcap-conditional.patch
 create mode 100644 package/ulogd/ulogd.mk

diff --git a/package/Config.in b/package/Config.in
index ab0c2058ce..3b7458f178 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -647,6 +647,7 @@ source "package/tn5250/Config.in"
 source "package/transmission/Config.in"
 source "package/ttcp/Config.in"
 source "package/udpcast/Config.in"
+source "package/ulogd/Config.in"
 source "package/ushare/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
new file mode 100644
index 0000000000..7dc4f11123
--- /dev/null
+++ b/package/ulogd/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_ULOGD
+	bool "ulogd"
+	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBMNL
+	select BR2_PACKAGE_LIBNETFILTER_ACCT
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	select BR2_PACKAGE_LIBNETFILTER_LOG
+	select BR2_PACKAGE_LIBNFNETLINK
+	help
+	  ulogd is a userspace logging daemon for netfilter/iptables related logging.
+
+	  http://www.netfilter.org/projects/ulogd/
+
+comment "ulogd requires a toolchain with IPV6 and LARGEFILE support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
diff --git a/package/ulogd/ulogd-fix-libpcap-conditional.patch b/package/ulogd/ulogd-fix-libpcap-conditional.patch
new file mode 100644
index 0000000000..3d73d37d4a
--- /dev/null
+++ b/package/ulogd/ulogd-fix-libpcap-conditional.patch
@@ -0,0 +1,29 @@
+From 08387386821f356834bac14c7c5ea7296fb0f428 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 9 Oct 2012 16:23:12 -0300
+Subject: [PATCH] autoconf/ulogd: fix broken libpcap AM_CONDITIONAL
+
+The AM_CONDITIONAL lacks the opening bracket, hence it always evaluates
+as true, even if there's no libpcap found thus causing build breakage.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 10b6e1f..57c596c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
+ AC_SUBST([libdl_LIBS])
+ AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+ AC_SUBST([libpcap_LIBS])
+-AM_CONDITIONAL([HAVE_PCAP], test -n "$libpcap_LIBS"])
++AM_CONDITIONAL([HAVE_PCAP],[test -n "$libpcap_LIBS"])
+ 
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+-- 
+1.7.8.6
+
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
new file mode 100644
index 0000000000..7d31b73ed7
--- /dev/null
+++ b/package/ulogd/ulogd.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# ulogd
+#
+#############################################################
+
+ULOGD_VERSION = 2.0.1
+ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
+ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
+ULOGD_AUTORECONF = YES
+ULOGD_DEPENDENCIES = host-pkgconf \
+	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
+	libnfnetlink
+ULOGD_LICENSE = GPLv2
+ULOGD_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From efc10eb6b87884f1f7917462d78af6953fcd99e3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Oct 2012 02:29:53 +0000
Subject: [PATCH 3118/6849] arptables: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/arptables/Config.in    |  6 ++++++
 package/arptables/arptables.mk | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/arptables/Config.in
 create mode 100644 package/arptables/arptables.mk

diff --git a/package/Config.in b/package/Config.in
index 3b7458f178..6125abcb82 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -550,6 +550,7 @@ endmenu
 
 menu "Networking applications"
 source "package/argus/Config.in"
+source "package/arptables/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
 source "package/bluez_utils/Config.in"
diff --git a/package/arptables/Config.in b/package/arptables/Config.in
new file mode 100644
index 0000000000..510eedf3b0
--- /dev/null
+++ b/package/arptables/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ARPTABLES
+	bool "arptables"
+	help
+	  Tool to set up, maintain, and inspect the tables of ARP rules.
+
+	  http://ebtables.sourceforge.net
diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
new file mode 100644
index 0000000000..dac5ca470e
--- /dev/null
+++ b/package/arptables/arptables.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# arptables
+#
+#############################################################
+
+ARPTABLES_VERSION = 0.0.3
+ARPTABLES_VERSION_MINOR = 4
+ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION)-$(ARPTABLES_VERSION_MINOR).tar.gz
+ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION)
+
+define ARPTABLES_BUILD_CMDS
+	$(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)"
+endef
+
+define ARPTABLES_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/arptables $(TARGET_DIR)/usr/sbin/arptables
+endef
+
+$(eval $(generic-package))

From 3dd4bcf1eb55f957dba2351f3626933f06adb107 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 02:21:05 +0100
Subject: [PATCH 3119/6849] pkg-download: Make a shallow clone for git
 downloads

When downloading from git, we clone the whole repository and then only
use the latest commit.  That's a lot of redundant stuff.  So instead,
make a shallow clone.  Unfortunately that's only possible when
downloading a branch or tag, so fall back to the old method if git gives
an error.

This speeds up the cloning of a linux git from more than 2 hours to
20 minutes on a 200KB/s link).

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-download.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index fa9a3e8835..6c57244ac6 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -73,10 +73,13 @@ domainseparator=$(if $(1),$(1),/)
 # "external dependencies" of a given build configuration.
 ################################################################################
 
+# Try a shallow clone - but that only works if the version is a ref (tag or
+# branch). Fall back on a full clone if it's a generic sha1.
 define DOWNLOAD_GIT
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	$(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
+	 ($(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME) || \
+	  $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) && \
 	pushd $($(PKG)_BASE_NAME) > /dev/null && \
 	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
 		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \

From 2424cc6783bbfb542f08cf1985b8c9ef18282161 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 3 Nov 2012 18:20:54 +0100
Subject: [PATCH 3120/6849] libhid: disable on avr32

libhid uses timerfd, which is not yet available in the uClibc-0.9.31
that we have to rely on for avr32.  Since this is pretty much a corner
case, just disable libhid for avr32.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libhid/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libhid/Config.in b/package/libhid/Config.in
index 093b98fcb9..bd1cfcb3df 100644
--- a/package/libhid/Config.in
+++ b/package/libhid/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBHID
 	bool "libhid"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	depends on !BR2_avr32 # timerfd not in uClibc-0.9.31
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
@@ -9,4 +10,4 @@ config BR2_PACKAGE_LIBHID
 	  http://libhid.alioth.debian.org
 
 comment "libhid needs a toolchain with thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32

From 6ee99c01d9195e886232bd8b0589495d2540640c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:47:46 +0100
Subject: [PATCH 3121/6849] uClibc: use the Buildroot toolchain options instead
 of the hidden common options

Since we are some day going to finally rename the badly named common
toolchain options (BR2_USE_WCHAR, BR2_ENABLE_LOCALE, BR2_INET_RPC,
etc.) into something more logical, let's start using the Buildroot
toolchain options in the uClibc code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 397cdd409e..8cf59bce71 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -230,19 +230,19 @@ ifneq ($(UCLIBC_TARGET_ENDIAN),)
 		-e 's/.*\(ARCH_WANTS_$(UCLIBC_TARGET_ENDIAN)_ENDIAN\).*/\1=y/g' \
 		$(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LARGEFILE),y)
 	$(SED) 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.oldconfig
 else
 	$(SED) 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.oldconfig
 	$(SED) '/.*UCLIBC_HAS_FOPEN_LARGEFILE_MODE.*/d' $(UCLIBC_DIR)/.oldconfig
 	echo "# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y)
 	$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,g' $(UCLIBC_DIR)/.oldconfig
 else
 	$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=n,g' $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_INET_RPC),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
 	$(SED) 's,^.*UCLIBC_HAS_RPC.*,UCLIBC_HAS_RPC=y,g' \
 		-e 's,^.*UCLIBC_HAS_FULL_RPC.*,UCLIBC_HAS_FULL_RPC=y,g' \
 		-e 's,^.*UCLIBC_HAS_REENTRANT_RPC.*,UCLIBC_HAS_REENTRANT_RPC=y,g' \
@@ -302,12 +302,12 @@ ifeq ($(BR2_PTHREAD_DEBUG),y)
 else
 	echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y)
 	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\n# UCLIBC_BUILD_ALL_LOCALE is not set\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="$(UCLIBC_LOCALES)"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
 else
 	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
 endif
-ifeq ($(BR2_USE_WCHAR),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
 	$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.oldconfig
 else
 	$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig

From 8f579792f1bb79e3a525029c9f58d360d2931cef Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:47:47 +0100
Subject: [PATCH 3122/6849] busybox: don't force FEATURE_NFS_MOUNT

Instead of making the Busybox configuration more complicated by trying
to adjust it depending on whether RPC is available or not (which gets
complicated when RPC support can be provided by libtirpc), simplify
things by letting the user enable FEATURE_NFS_MOUNT or not depending
on whether RPC support is available or not.

Our default configuration do not enable FEATURE_NFS_MOUNT, so users
will not face any build problems by default. Only if they explicitly
enable FEATURE_NFS_MOUNT will they have to make sure that the
toolchain has RPC support, or that libtirpc is enabled (support for
this added in a followup patch).

[Peter: remove from CONFIGURE_CMDS as well]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 33f8633648..2fa1aa53b3 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -81,17 +81,6 @@ define BUSYBOX_SET_IPV6
 endef
 endif
 
-# If RPC is enabled then enable nfs mounts
-ifeq ($(BR2_INET_RPC),y)
-define BUSYBOX_SET_RPC
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
-endef
-else
-define BUSYBOX_SET_RPC
-	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
-
 # If we're using static libs do the same for busybox
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 define BUSYBOX_PREFER_STATIC
@@ -170,7 +159,6 @@ BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_SET_LARGEFILE)
 	$(BUSYBOX_SET_IPV6)
-	$(BUSYBOX_SET_RPC)
 	$(BUSYBOX_PREFER_STATIC)
 	$(BUSYBOX_SET_MDEV)
 	$(BUSYBOX_NETKITBASE)

From 97a3f9e94c13b2c567ad4aecd62409b3ffae7bf5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:47:48 +0100
Subject: [PATCH 3123/6849] toolchain-crosstool-ng: use the Crosstool-ng config
 options instead of the common hidden ones

Since we are some day going to finally rename the badly named common
toolchain options (BR2_USE_WCHAR, BR2_ENABLE_LOCALE, BR2_INET_RPC,
etc.) into something more logical, let's start using the Crosstool-NG
toolchain options in the Crosstool-NG code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index e46bb2032d..5f9119d579 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -268,7 +268,7 @@ CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
 ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y)
 
 # Handle the locales option
-ifneq ($(call qstrip,$(BR2_ENABLE_LOCALE)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_LOCALE)),)
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_LOCALES) is not set:\1=y\n\# CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA)=.*:\# \1 is not set:;
 else
@@ -276,28 +276,28 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES)=.*:\# \1 is not set:;
 endif
 
 # Handle the wide-char option
-ifneq ($(call qstrip,$(BR2_USE_WCHAR)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_WCHAR)),)
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_WCHAR) is not set:\1=y:;
 else
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
 endif
 
 # Handle the LFS option
-ifneq ($(call qstrip,$(BR2_LARGEFILE)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_LARGEFILE)),)
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_LFS) is not set:\1=y:;
 else
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
 endif
 
 # Handle the IPv6 option
-ifneq ($(call qstrip,$(BR2_INET_IPV6)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6)),)
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_IPV6) is not set:\1=y:;
 else
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
 endif
 
 # Handle the RPC option
-ifneq ($(call qstrip,$(BR2_INET_RPC)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC)),)
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_RPC) is not set:\1=y\nUCLIBC_HAS_FULL_RPC=y\nUCLIBC_HAS_REENTRANT_RPC=y:;
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_FULL_RPC) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_REENTRANT_RPC) is not set:\1=y:;

From 0858e000fe6bc4c379e6cbb33ff3282871cccee1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:47:49 +0100
Subject: [PATCH 3124/6849] Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_NATIVE_RPC

The BR2_INET_RPC has for a long time been a not very descriptive
configuration option name, and with the advent of non-RPC glibc
toolchains and the apparition of libtirpc, we really need to rename it
to something more sensible, BR2_TOOLCHAIN_HAS_NATIVE_RPC.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lmbench/Config.in                  |  4 ++--
 package/netkitbase/Config.in               |  4 ++--
 package/netkittelnet/Config.in             |  4 ++--
 package/nfs-utils/Config.in                |  4 ++--
 package/portmap/Config.in                  |  4 ++--
 package/quota/Config.in                    |  4 ++--
 package/samba/samba.mk                     |  2 +-
 package/xinetd/xinetd.mk                   |  2 +-
 toolchain/helpers.mk                       |  4 ++--
 toolchain/toolchain-buildroot/Config.in.2  |  2 +-
 toolchain/toolchain-common.in              |  2 +-
 toolchain/toolchain-crosstool-ng/Config.in | 10 +++++++---
 toolchain/toolchain-external/Config.in     | 14 +++++++-------
 toolchain/toolchain-external/ext-tool.mk   |  8 ++++----
 14 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index c8423d1eff..70449b63b2 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LMBENCH
 	bool "lmbench"
 	# Uses pmap_set, pmap__unset, pmap_getport, etc.
-	depends on BR2_INET_RPC
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  LMbench is a suite of simple, portable,
 	  ANSI/C microbenchmarks for UNIX/POSIX.
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LMBENCH
 	  http://sourceforge.net/projects/lmbench/
 
 comment "lmbench requires a toolchain with RPC support"
-	depends on !BR2_INET_RPC
+	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index 725e500ace..75bd728366 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_NETKITBASE
 	bool "netkitbase"
-	depends on BR2_INET_RPC
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Old-style inetd.
 
 	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 
 comment "netkitbase requires a toolchain with RPC support"
-        depends on !BR2_INET_RPC
+        depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/netkittelnet/Config.in b/package/netkittelnet/Config.in
index 058d2107cf..10eb022dfb 100644
--- a/package/netkittelnet/Config.in
+++ b/package/netkittelnet/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_NETKITTELNET
 	bool "netkittelnet"
-	depends on BR2_INET_RPC
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_PACKAGE_NETKITBASE
 	help
 	  Standard Linux telnet client and server.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_NETKITTELNET
 	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 
 comment "netkittelnet requires a toolchain with RPC support"
-	depends on !BR2_INET_RPC
+	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 67d25a73dd..c87502f974 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_NFS_UTILS
 	bool "nfs-utils"
-	depends on BR2_INET_RPC
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_PORTMAP
 	help
@@ -11,7 +11,7 @@ config BR2_PACKAGE_NFS_UTILS
 	  http://sourceforge.net/projects/nfs
 
 comment "nfs-utils requires a toolchain with RPC and LARGEFILE support"
-	depends on !BR2_INET_RPC || !BR2_LARGEFILE
+	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_LARGEFILE
 
 menu "NFS utilities selection"
 	depends on BR2_PACKAGE_NFS_UTILS
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index 5914357f2b..f017cb6081 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_PORTMAP
 	bool "portmap"
-	depends on BR2_INET_RPC
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  The standard portmapper for RPC services.
 
 	  http://neil.brown.name/portmap/
 
 comment "portmap requires a toolchain with RPC support"
-	depends on !BR2_INET_RPC
+	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/quota/Config.in b/package/quota/Config.in
index 3ad0b8cee3..a26f91fc7d 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_QUOTA
 	bool "quota"
-	depends on BR2_INET_RPC
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_UTIL_LINUX
@@ -12,4 +12,4 @@ config BR2_PACKAGE_QUOTA
 	  http://sourceforge.net/projects/linuxquota/
 
 comment "quota requires a toolchain with RPC + LARGEFILE + WCHAR support"
-	depends on !(BR2_INET_RPC && BR2_LARGEFILE && BR2_USE_WCHAR)
+	depends on !(BR2_TOOLCHAIN_HAS_NATIVE_RPC && BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 06f58d60f2..dec60d0dc4 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -51,7 +51,7 @@ SAMBA_CONF_OPT = \
 	\
 	--without-cluster-support \
 	--without-dnsupdate \
-	$(if $(BR2_INET_RPC),--with-sys-quotas,--without-sys-quotas) \
+	$(if $(BR2_TOOLCHAIN_HAS_NATIVE_RPC),--with-sys-quotas,--without-sys-quotas) \
 	--without-ads \
 	--without-ldap \
 	--with-included-iniparser \
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index 4fc2de9b2e..a420425d46 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -9,7 +9,7 @@ XINETD_SITE          = http://www.xinetd.org
 XINETD_LICENSE       = xinetd license
 XINETD_LICENSE_FILES = COPYRIGHT
 
-ifneq ($(BR2_INET_RPC),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),y)
 XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC"
 endif
 
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 497cfff224..34e9c179d6 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -202,7 +202,7 @@ check_glibc = \
 	fi; \
 	$(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
 	$(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
-	$(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\
+	$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_NATIVE_RPC,RPC support) ;\
 	$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
 	$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
 	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support)
@@ -248,7 +248,7 @@ check_uclibc = \
 	$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
-	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
+	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 7580946c62..956ec2fe2d 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -20,7 +20,7 @@ config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
 
 config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
 	bool "Enable RPC support"
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Enable this option if you want your toolchain to support
 	  RPC (needed for NFS, for example).
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 10950ba295..4c2a28bf8f 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -11,7 +11,7 @@ config BR2_LARGEFILE
 config BR2_INET_IPV6
 	bool
 
-config BR2_INET_RPC
+config BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	bool
 
 config BR2_USE_WCHAR
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 35ea2b1c81..9cd5ca51df 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -14,7 +14,9 @@ config BR2_TOOLCHAIN_CTNG_eglibc
 	bool "eglibc"
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_INET_RPC
+	# Our default ct-ng configuration uses eglibc 2.12, which has
+	# native RPC support
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_ENABLE_LOCALE
 	select BR2_USE_WCHAR
 
@@ -22,7 +24,9 @@ config BR2_TOOLCHAIN_CTNG_glibc
 	bool "glibc"
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_INET_RPC
+	# Our default ct-ng configuration uses glibc 2.9, which has
+	# native RPC support
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_ENABLE_LOCALE
 	select BR2_USE_WCHAR
 
@@ -66,7 +70,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6
 
 config BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC
 	bool "Enable RPC support"
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Enable this option if you want your toolchain to support
 	  RPC (needed for NFS, for example).
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index e28b309cb8..595864bf45 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -450,7 +450,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -467,7 +467,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -528,7 +528,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -543,7 +543,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -558,7 +558,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -678,7 +678,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	bool
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
 	select BR2_TOOLCHAIN_HAS_THREADS
@@ -732,7 +732,7 @@ config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
-	select BR2_INET_RPC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Select this option if your external toolchain supports
 	  RPC. If you don't know, leave the default value, Buildroot
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index c56f0a7df8..f05d9eb245 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -24,10 +24,10 @@
 #  the Buildroot configuration system knows whether the toolchain
 #  supports RPC, IPv6, locales, large files, etc. Unfortunately, these
 #  things cannot be detected automatically, since the value of these
-#  options (such as BR2_INET_RPC) are needed at configuration time
-#  because these options are used as dependencies for other
-#  options. And at configuration time, we are not able to retrieve the
-#  external toolchain configuration.
+#  options (such as BR2_TOOLCHAIN_HAS_NATIVE_RPC) are needed at
+#  configuration time because these options are used as dependencies
+#  for other options. And at configuration time, we are not able to
+#  retrieve the external toolchain configuration.
 #
 #  3. Copy the libraries needed at runtime to the target directory,
 #  $(TARGET_DIR). Obviously, things such as the C library, the dynamic

From 442765fe3d8767956eb26d4bcbaa62ce1e1782ca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:48:02 +0100
Subject: [PATCH 3125/6849] netkitbase: mark as deprecated

It is no longer being developed, the FTP is dead, and Debian has
removed it from the distribution.

Also it allows to not worry about adding RPC support through libtirpc
to this package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netkitbase/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index 75bd728366..dd9166ce14 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NETKITBASE
 	bool "netkitbase"
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_DEPRECATED
 	help
 	  Old-style inetd.
 

From 5a457ff6cc3129af97f2fdcaa5f88bd5ff02b500 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:48:03 +0100
Subject: [PATCH 3126/6849] netkittelnet: mark as deprecated

It is no longer being developed, the FTP is dead, and Debian has
removed it from the distribution.

Also it allows to not worry about adding RPC support through libtirpc
to this package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netkittelnet/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netkittelnet/Config.in b/package/netkittelnet/Config.in
index 10eb022dfb..1f11d88c28 100644
--- a/package/netkittelnet/Config.in
+++ b/package/netkittelnet/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NETKITTELNET
 	bool "netkittelnet"
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_NETKITBASE
 	help
 	  Standard Linux telnet client and server.

From 9fbdf062b93c6c2ed7e35897bcb0ad4c60f29d41 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 18:47:50 +0100
Subject: [PATCH 3127/6849] toolchain-external: improve glibc support to test
 availability of RPC

Basically, the BR2_TOOLCHAIN_EXTERNAL_GLIBC option no longer
unconditionally selects BR2_TOOLCHAIN_HAS_NATIVE_RPC since there are
glibc toolchains that don't have RPC support. All the predefined
toolchain profiles are updated to take into account this change: for
the moment, all glibc toolchains that have pre-defined toolchains have
RPC support, but further patches in the series add pre-defined glibc
toolchains that don't have RPC support. In the case of custom glibc
toolchains, a question is asked to the user so that he can say whether
the external glibc toolchain has RPC support or not. The validity of
this configuration option is checked by the new
check_glibc_rpc_feature function in helpers.mk.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk                   | 27 +++++++++++++++----
 toolchain/toolchain-external/Config.in | 37 +++++++++++++++++++-------
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 34e9c179d6..1509ff8b79 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -172,9 +172,10 @@ create_lib64_symlinks = \
 	(cd $(STAGING_DIR)/usr ; ln -s lib lib64)
 
 #
-# Check the availability of a particular glibc feature. We assume that
-# all Buildroot toolchain options are supported by glibc, so we just
-# check that they are enabled.
+# Check the availability of a particular glibc feature. This function
+# is used to check toolchain options that are always supported by
+# glibc, so we simply check that the corresponding option is properly
+# enabled.
 #
 # $1: Buildroot option name
 # $2: feature description
@@ -185,6 +186,22 @@ check_glibc_feature = \
 		exit 1 ; \
 	fi
 
+#
+# Check the availability of RPC support in a glibc toolchain
+#
+# $1: sysroot directory
+#
+check_glibc_rpc_feature = \
+	IS_IN_LIBC=`test -f $(1)/usr/include/rpc/rpc.h && echo y` ; \
+	if [ "$(BR2_TOOLCHAIN_HAS_NATIVE_RPC)" != "y" -a "$${IS_IN_LIBC}" = "y" ] ; then \
+		echo "RPC support available in C library, please enable BR2_TOOLCHAIN_HAS_NATIVE_RPC" ; \
+		exit 1 ; \
+	fi ; \
+	if [ "$(BR2_TOOLCHAIN_HAS_NATIVE_RPC)" = "y" -a "$${IS_IN_LIBC}" != "y" ] ; then \
+		echo "RPC support not available in C library, please disable BR2_TOOLCHAIN_HAS_NATIVE_RPC" ; \
+		exit 1 ; \
+	fi
+
 #
 # Check the correctness of a glibc external toolchain configuration.
 #  1. Check that the C library selected in Buildroot matches the one
@@ -202,10 +219,10 @@ check_glibc = \
 	fi; \
 	$(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
 	$(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
-	$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_NATIVE_RPC,RPC support) ;\
 	$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
 	$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
-	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support)
+	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
+	$(call check_glibc_rpc_feature,$${SYSROOT_DIR})
 
 #
 # Check the conformity of Buildroot configuration with regard to the
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 595864bf45..4f6934e2a3 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -8,6 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
@@ -24,6 +25,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
@@ -40,6 +42,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
@@ -56,6 +59,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
@@ -72,6 +76,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
 	depends on BR2_arm
 	depends on BR2_cortex_a8 || BR2_cortex_a9
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
@@ -108,6 +113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
@@ -129,6 +135,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	bool "Sourcery CodeBench ARM 2011.03"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
@@ -150,6 +157,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	bool "Sourcery CodeBench ARM 2010.09"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
@@ -171,6 +179,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	bool "Sourcery CodeBench ARM 2010q1"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
@@ -192,6 +201,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	bool "Sourcery CodeBench MIPS 2011.09"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
@@ -259,6 +269,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	bool "Sourcery CodeBench MIPS 2011.03"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
@@ -308,6 +319,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	bool "Sourcery CodeBench MIPS 4.4"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
@@ -357,6 +369,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the PowerPC architecture,
@@ -384,6 +397,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	bool "Sourcery CodeBench PowerPC 2010.09"
 	depends on BR2_powerpc
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the PowerPC architecture,
@@ -411,6 +425,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
@@ -430,6 +445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "Sourcery CodeBench SH 2010.09"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
@@ -483,6 +499,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	bool "Sourcery CodeBench x86/x86_64 2011.09"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the x86/x86_64
@@ -504,6 +521,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	bool "Sourcery CodeBench x86/x86_64 2010.09"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the x86/x86_64
@@ -570,6 +588,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	bool "Xilinx Little Endian Microblaze GNU Tools"
 	depends on BR2_microblazeel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
@@ -578,6 +597,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
@@ -678,7 +698,6 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	bool
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
 	select BR2_TOOLCHAIN_HAS_THREADS
@@ -730,14 +749,6 @@ config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
 	  IPv6. If you don't know, leave the default value, Buildroot
 	  will tell you if it's correct or not.
 
-config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
-	bool "Toolchain has RPC support?"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	help
-	  Select this option if your external toolchain supports
-	  RPC. If you don't know, leave the default value, Buildroot
-	  will tell you if it's correct or not.
-
 config BR2_TOOLCHAIN_EXTERNAL_WCHAR
 	bool "Toolchain has WCHAR support?"
 	select BR2_USE_WCHAR
@@ -776,6 +787,14 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
 
 endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
+config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
+	bool "Toolchain has RPC support?"
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	help
+	  Select this option if your external toolchain supports
+	  RPC. If you don't know, leave the default value, Buildroot
+	  will tell you if it's correct or not.
+
 config BR2_TOOLCHAIN_EXTERNAL_CXX
 	bool "Toolchain has C++ support?"
 	select BR2_INSTALL_LIBSTDCPP

From 9de85f7d8c82316669350a50a0e024cc9ada518d Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 3 Nov 2012 13:13:15 +0000
Subject: [PATCH 3128/6849] opus-tools: fix build on i386

Upstream patch.  Fixes e.g.
http://autobuild.buildroot.net/results/03cf0ee3c092960c37a6a78f2531b047a317d516/

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...pus-tools-fix-compilation-on-non-win.patch | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 package/opus-tools/opus-tools-fix-compilation-on-non-win.patch

diff --git a/package/opus-tools/opus-tools-fix-compilation-on-non-win.patch b/package/opus-tools/opus-tools-fix-compilation-on-non-win.patch
new file mode 100644
index 0000000000..c8cb6a22e6
--- /dev/null
+++ b/package/opus-tools/opus-tools-fix-compilation-on-non-win.patch
@@ -0,0 +1,53 @@
+From 7734f55bc535c6d3d0fbb27c55e38f52ba6b7764 Mon Sep 17 00:00:00 2001
+From: Andreas Schlick <schlick@lavabit.com>
+Date: Thu, 13 Sep 2012 19:44:50 +0200
+Subject: [PATCH] Fix compilation on non-Windows x86-32 w/ -msse.
+
+cpusupport.h used __cpuid() from the Windows specific header file intrin.h
+which is not available under gcc. But we can use __get_cpuid() from cpuid.h
+instead.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+
+---
+ src/cpusupport.h |   18 +++++++++++++++++-
+ 1 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/src/cpusupport.h b/src/cpusupport.h
+index 1986d31..5e42337 100644
+--- a/src/cpusupport.h
++++ b/src/cpusupport.h
+@@ -32,7 +32,9 @@
+ # if !defined(__SSE__) || defined(_M_X64) || defined(__amd64__)
+ #  define query_cpu_support() 0
+ #else
+-# include <intrin.h>
++
++#if defined WIN32 || defined _WIN32
++#include <intrin.h>
+ static inline int query_cpu_support(void)
+ {
+    int buffer[4];
+@@ -43,5 +45,19 @@ static inline int query_cpu_support(void)
+ #  endif
+        ;
+ }
++#else
++#include <cpuid.h>
++static inline int query_cpu_support(void)
++{
++   unsigned int eax, ebx, ecx, edx=0;
++   __get_cpuid(1, &eax, &ebx, &ecx, &edx);
++   return ((edx & 1<<25) == 0) /*SSE*/
++#ifdef __SSE2__
++        + ((edx & 1<<26) == 0) /*SSE2*/
++#endif
++       ;
++}
++#endif
++
+ # endif
+ #endif
+-- 
+1.7.2.5
+

From 50a331ec956815843e21f20d4838051456056a6d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:51 +0000
Subject: [PATCH 3129/6849] xapp_listres: fix build against Xmu by bumping the
 version

Fixes

  http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_listres/xapp_listres.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index c701f43c2b..1a3247b031 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_LISTRES_VERSION = 1.0.1
+XAPP_LISTRES_VERSION = 1.0.3
 XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2
 XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt

From 2020a20c1b09fd17fffee8e26f137c1531dbc195 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:52 +0000
Subject: [PATCH 3130/6849] xapp_xbiff: fix build against Xmu by bumping
 version

Fix a build issue similar to the one encountered on xapp_listres at
http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xbiff/xapp_xbiff.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index f954a8df54..c6f2d70d6f 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XBIFF_VERSION = 1.0.1
+XAPP_XBIFF_VERSION = 1.0.3
 XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2
 XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps

From ac150b9f5b8a99198d19176a29db07409fdf094d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:53 +0000
Subject: [PATCH 3131/6849] xapp_xedit: fix build against Xmu by bumping
 version

Fix a build issue similar to the one encountered on xapp_listres at
http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xedit/xapp_xedit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index 577bd5a54d..f69d122ae9 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XEDIT_VERSION = 1.0.2
+XAPP_XEDIT_VERSION = 1.2.0
 XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
 XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil

From 8b4418c364ef39da7c800735806040f7853f6b65 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:54 +0000
Subject: [PATCH 3132/6849] xapp_xfontsel: fix build against Xmu by bumping
 version

Fix a build issue similar to the one encountered on xapp_listres at
http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index 8719bef53d..d4d9ca1854 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XFONTSEL_VERSION = 1.0.1
+XAPP_XFONTSEL_VERSION = 1.0.4
 XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2
 XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw

From b6d2046c1eec975944c2709c86d5d5259e7b2494 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:55 +0000
Subject: [PATCH 3133/6849] xapp_xgc: fix build against Xmu by bumping version

Fix a build issue similar to the one encountered on xapp_listres at
http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/.

Note that this new version requires a minor cross-compilation fix in
configure.ac, which has already been committed upstream but is not yet
part of a release tarball.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xapp_xgc-replace-ac-check-file.patch      | 29 +++++++++++++++++++
 package/x11r7/xapp_xgc/xapp_xgc.mk            |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch

diff --git a/package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch b/package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch
new file mode 100644
index 0000000000..97cbcdab9a
--- /dev/null
+++ b/package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch
@@ -0,0 +1,29 @@
+From ff668395fc408f540604bd534e323b483f52a4ea Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon, 01 Nov 2010 17:19:23 +0000
+Subject: config: replace AC_CHECK_FILE with test -f
+
+* AC_CHECK_FILE doesn't work for cross compilation
+
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/configure.ac b/configure.ac
+index 667a3e7..0644050 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,8 +36,11 @@ XORG_DEFAULT_OPTIONS
+ AC_PROG_LEX
+ AC_PROG_YACC
+ AC_PATH_PROG([YACC_INST], $YACC)
+-AC_CHECK_FILE([$srcdir/gram.c], [],
+-              [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])])
++if test ! -f "gram.c"; then
++   if test -z "$YACC_INST"; then
++      AC_MSG_ERROR([yacc not found - unable to compile gram.y])
++   fi
++fi
+ 
+ PKG_CHECK_MODULES(XGC, xaw7 xt)
+ xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index 8d02a5379c..cfb3164d6f 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-XAPP_XGC_VERSION = 1.0.1
+XAPP_XGC_VERSION = 1.0.3
 XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2
 XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGC_DEPENDENCIES = xlib_libXaw
+XAPP_XGC_AUTORECONF = YES
 
 $(eval $(autotools-package))

From 010217a23d25cba1530287f4a72bb8b192a6b90d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:56 +0000
Subject: [PATCH 3134/6849] xapp_xmag: fix build against Xmu by bumping version

Fix a build issue similar to the one encountered on xapp_listres at
http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xmag/xapp_xmag.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index 235787a432..0496c8a09e 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XMAG_VERSION = 1.0.2
+XAPP_XMAG_VERSION = 1.0.4
 XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2
 XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw

From f2fcfe9c8be99460a70467b3bd8d032ce7e1f32b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 22 Oct 2012 02:06:57 +0000
Subject: [PATCH 3135/6849] xapp_xsm: fix build against Xmu by bumping version

Fix a build issue similar to the one encountered on xapp_listres at
http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xsm/xapp_xsm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index aff0cc8d99..75640a2100 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XSM_VERSION = 1.0.1
+XAPP_XSM_VERSION = 1.0.2
 XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2
 XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSM_DEPENDENCIES = xlib_libXaw

From fa554ff5a851c018feb4d938d267f0c269c63fcc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 23 Oct 2012 03:18:10 +0000
Subject: [PATCH 3136/6849] bison: bump to version 2.6.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 8c33a7a24e..c93f71697e 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BISON_VERSION = 2.6.2
+BISON_VERSION = 2.6.3
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING

From 7f483c3699639e5f1d3086ad598fdd66295c150b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 23 Oct 2012 03:18:11 +0000
Subject: [PATCH 3137/6849] libnl: bump to version 3.2.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 58f8d17027..e039fd450f 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.13
+LIBNL_VERSION = 3.2.14
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING

From 3c592cb4dffc1a0f18d2106e15ebfb7c3d316fd5 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Mon, 15 Oct 2012 06:44:58 +0000
Subject: [PATCH 3138/6849] links: Enable graphics for X11

Graphics can be enabled for X11 as well.
Do not select DirectFB for graphics,
set DirectFB or X11 dependencies instead.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/links/Config.in |  8 ++++----
 package/links/links.mk  | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/package/links/Config.in b/package/links/Config.in
index fddf3d2602..474aa6a2f6 100644
--- a/package/links/Config.in
+++ b/package/links/Config.in
@@ -6,10 +6,10 @@ config BR2_PACKAGE_LINKS
 	  http://links.twibright.com/
 
 config BR2_PACKAGE_LINKS_GRAPHICS
-	bool "use graphics (directfb)"
-	depends on BR2_PACKAGE_LINKS
-	select BR2_PACKAGE_DIRECTFB
+	bool "use graphics"
+	depends on BR2_PACKAGE_LINKS && (BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7)
+	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBPNG
 	help
-	  Enable graphics output.
+	  Enable graphics output for DirectFB or X11.
 	  Otherwise links will be text-mode only.
diff --git a/package/links/links.mk b/package/links/links.mk
index 4537b3a3e6..5db2ff7e05 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -6,13 +6,24 @@
 
 LINKS_VERSION = 2.5
 LINKS_SITE = http://links.twibright.com/download
-LINKS_CONF_OPT = --without-x
 LINKS_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
 LINKS_CONF_OPT += --enable-graphics
+LINKS_DEPENDENCIES += libpng
+ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y)
+LINKS_CONF_OPT += --with-x
+LINKS_DEPENDENCIES += xlib_libXt
+else
+LINKS_CONF_OPT += --without-x
+endif
+ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config
-LINKS_DEPENDENCIES += directfb libpng
+LINKS_CONF_OPT += --with-directfb
+LINKS_DEPENDENCIES += directfb
+else
+LINKS_CONF_OPT += --without-directfb
+endif
 ifeq ($(BR2_PACKAGE_JPEG),y)
 LINKS_DEPENDENCIES += jpeg
 endif

From 7655b95e27c3eebf7456a726e48b7e5448692b31 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 10 Jul 2012 11:52:32 +0000
Subject: [PATCH 3139/6849] cups: fix libdir handling

Cups uses /usr/lib64 if the HOST has it, no matter if it is cross compiling
for a 32bit arch, breaking the build for stuff looking in /usr/lib.

The fix of commit edd2716c didn't work, it would just force /usr/lib64 if
the target is 64 bit.  Instead, force installation in /usr/lib regardless
of the host.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 226a832fe9..3eb83eac9c 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -14,7 +14,7 @@ CUPS_CONF_OPT = --without-perl \
 		--without-java \
 		--disable-gnutls \
 		--disable-gssapi \
-		--libdir=/usr/$(if $(BR2_ARCH_IS_64),lib64,lib)
+		--libdir=/usr/lib
 
 CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
 		    $(if $(BR2_PACKAGE_LIBPNG),libpng) \

From ef1e76ae433e744d2cebf23f1c6d3b6446790270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Sun, 12 Aug 2012 09:17:00 +0000
Subject: [PATCH 3140/6849] sqlite: Add new compile-time options

[Peter: whitespace/wording tweaks]
Signed-off-by: Stefan Froberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/Config.in | 34 ++++++++++++++++++++++++++++++++++
 package/sqlite/sqlite.mk | 12 ++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index 25aaa3ff85..8766786010 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -22,3 +22,37 @@ config BR2_PACKAGE_SQLITE_STAT3
 	  planner that can help SQLite to choose a better query plan under
 	  certain situations.
 
+config BR2_PACKAGE_SQLITE_ENABLE_FTS3
+	bool "Enable version 3 of the full-text search engine"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  When this option is defined in the amalgamation
+	  (see http://www.sqlite.org/amalgamation.html), version 3 of
+	  the full-text search engine is added to the build automatically.
+
+config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY
+	bool "Enable sqlite3_unlock_notify() interface"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  This option enables the sqlite3_unlock_notify() interface and its
+	  accosiated functionality. See the documentation
+	  http://www.sqlite.org/unlock_notify.html for additional information.
+
+config BR2_PACKAGE_SQLITE_SECURE_DELETE
+	bool "Set the secure_delete pragma on by default"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  This compile-time option changes the default settings of the
+	  secure_delete pragma. When this option is not used, secure_delete
+	  defaults to off. When this option is present, secure_delete defaults
+	  to on.
+
+	  The secure_delete setting causes deleted content to be overwritten
+	  with zeros. There is a small performance penalty for this since
+	  additional I/O must occur. On the other hand, secure_delete can
+	  prevent sensitive information from lingering in unused parts
+	  of the database file after it has allegedly been deleted.
+	  See the documentation on the
+	  http://www.sqlite.org/pragma.html#pragma_secure_delete
+	  for additional information.
+
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 7b5b4aa268..0320cc4d57 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -21,6 +21,18 @@ ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
+endif
+
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
+endif
+
+ifeq ($(BR2_PACKAGE_SQLITE_SECURE_DELETE),y)
+SQLITE_CFLAGS += -DSQLITE_SECURE_DELETE
+endif
+
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
 SQLITE_CONF_OPT = \

From 6c3e3ad4197714ea39fcd49d572a1713f803d835 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 08:27:58 +0000
Subject: [PATCH 3141/6849] New top-level directory: system

This directory groups the following elements:
 * the default root filesystem skeleton
 * the default device tables
 * the Config.in options for system configuration (UART port for
   getty, system hostname, etc.)
 * the make rules to apply the system configuration options

Even though the skeleton and device tables could have lived in fs/, it
would have been strange to have the UART, system hostname and other
related options into fs/. A new system/ directory makes more sense.

As a consequence, this patch also removes target/Makefile.in, which
has become useless in the process.

[Peter: fixup TARGET_SKELETON settings / documentation to match]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                                           |   2 +-
 Makefile                                            |   4 ++--
 docs/manual/customize-rootfs.txt                    |   4 ++--
 {target/generic => system}/Config.in                |   2 +-
 {target/generic => system}/device_table.txt         |   0
 {target/generic => system}/device_table_dev.txt     |   0
 {fs => system}/skeleton/bin/.empty                  |   0
 {fs => system}/skeleton/dev/log                     |   0
 {fs => system}/skeleton/dev/pts/.empty              |   0
 {fs => system}/skeleton/etc/fstab                   |   0
 {fs => system}/skeleton/etc/group                   |   0
 {fs => system}/skeleton/etc/hostname                |   0
 {fs => system}/skeleton/etc/hosts                   |   0
 {fs => system}/skeleton/etc/init.d/S20urandom       |   0
 {fs => system}/skeleton/etc/init.d/S40network       |   0
 {fs => system}/skeleton/etc/init.d/rcK              |   0
 {fs => system}/skeleton/etc/init.d/rcS              |   0
 {fs => system}/skeleton/etc/inittab                 |   0
 {fs => system}/skeleton/etc/inputrc                 |   0
 {fs => system}/skeleton/etc/issue                   |   0
 {fs => system}/skeleton/etc/ld.so.conf.d/.empty     |   0
 {fs => system}/skeleton/etc/mtab                    |   0
 .../skeleton/etc/network/if-down.d/.empty           |   0
 .../skeleton/etc/network/if-post-down.d/.empty      |   0
 .../skeleton/etc/network/if-pre-up.d/.empty         |   0
 {fs => system}/skeleton/etc/network/if-up.d/.empty  |   0
 {fs => system}/skeleton/etc/network/interfaces      |   0
 {fs => system}/skeleton/etc/passwd                  |   0
 {fs => system}/skeleton/etc/profile                 |   0
 {fs => system}/skeleton/etc/protocols               |   0
 {fs => system}/skeleton/etc/random-seed             | Bin
 {fs => system}/skeleton/etc/resolv.conf             |   0
 {fs => system}/skeleton/etc/securetty               |   0
 {fs => system}/skeleton/etc/services                |   0
 {fs => system}/skeleton/etc/shadow                  |   0
 {fs => system}/skeleton/home/ftp/.empty             |   0
 {fs => system}/skeleton/lib/.empty                  |   0
 {fs => system}/skeleton/media/.empty                |   0
 {fs => system}/skeleton/mnt/.empty                  |   0
 {fs => system}/skeleton/opt/.empty                  |   0
 {fs => system}/skeleton/proc/.empty                 |   0
 {fs => system}/skeleton/root/.bash_history          |   0
 {fs => system}/skeleton/root/.bash_logout           |   0
 {fs => system}/skeleton/root/.bash_profile          |   0
 {fs => system}/skeleton/root/.empty                 |   0
 {fs => system}/skeleton/run                         |   0
 {fs => system}/skeleton/sbin/.empty                 |   0
 {fs => system}/skeleton/sys/.empty                  |   0
 {fs => system}/skeleton/tmp/.empty                  |   0
 {fs => system}/skeleton/usr/bin/.empty              |   0
 {fs => system}/skeleton/usr/lib/.empty              |   0
 {fs => system}/skeleton/usr/sbin/.empty             |   0
 {fs => system}/skeleton/var/cache                   |   0
 {fs => system}/skeleton/var/lib/misc                |   0
 {fs => system}/skeleton/var/lib/pcmcia              |   0
 {fs => system}/skeleton/var/lock                    |   0
 {fs => system}/skeleton/var/log                     |   0
 {fs => system}/skeleton/var/pcmcia                  |   0
 {fs => system}/skeleton/var/run                     |   0
 {fs => system}/skeleton/var/spool                   |   0
 {fs => system}/skeleton/var/tmp                     |   0
 target/generic/Makefile.in => system/system.mk      |   0
 target/Makefile.in                                  |   3 ---
 63 files changed, 6 insertions(+), 9 deletions(-)
 rename {target/generic => system}/Config.in (99%)
 rename {target/generic => system}/device_table.txt (100%)
 rename {target/generic => system}/device_table_dev.txt (100%)
 rename {fs => system}/skeleton/bin/.empty (100%)
 rename {fs => system}/skeleton/dev/log (100%)
 rename {fs => system}/skeleton/dev/pts/.empty (100%)
 rename {fs => system}/skeleton/etc/fstab (100%)
 rename {fs => system}/skeleton/etc/group (100%)
 rename {fs => system}/skeleton/etc/hostname (100%)
 rename {fs => system}/skeleton/etc/hosts (100%)
 rename {fs => system}/skeleton/etc/init.d/S20urandom (100%)
 rename {fs => system}/skeleton/etc/init.d/S40network (100%)
 rename {fs => system}/skeleton/etc/init.d/rcK (100%)
 rename {fs => system}/skeleton/etc/init.d/rcS (100%)
 rename {fs => system}/skeleton/etc/inittab (100%)
 rename {fs => system}/skeleton/etc/inputrc (100%)
 rename {fs => system}/skeleton/etc/issue (100%)
 rename {fs => system}/skeleton/etc/ld.so.conf.d/.empty (100%)
 rename {fs => system}/skeleton/etc/mtab (100%)
 rename {fs => system}/skeleton/etc/network/if-down.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/if-post-down.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/if-pre-up.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/if-up.d/.empty (100%)
 rename {fs => system}/skeleton/etc/network/interfaces (100%)
 rename {fs => system}/skeleton/etc/passwd (100%)
 rename {fs => system}/skeleton/etc/profile (100%)
 rename {fs => system}/skeleton/etc/protocols (100%)
 rename {fs => system}/skeleton/etc/random-seed (100%)
 rename {fs => system}/skeleton/etc/resolv.conf (100%)
 rename {fs => system}/skeleton/etc/securetty (100%)
 rename {fs => system}/skeleton/etc/services (100%)
 rename {fs => system}/skeleton/etc/shadow (100%)
 rename {fs => system}/skeleton/home/ftp/.empty (100%)
 rename {fs => system}/skeleton/lib/.empty (100%)
 rename {fs => system}/skeleton/media/.empty (100%)
 rename {fs => system}/skeleton/mnt/.empty (100%)
 rename {fs => system}/skeleton/opt/.empty (100%)
 rename {fs => system}/skeleton/proc/.empty (100%)
 rename {fs => system}/skeleton/root/.bash_history (100%)
 rename {fs => system}/skeleton/root/.bash_logout (100%)
 rename {fs => system}/skeleton/root/.bash_profile (100%)
 rename {fs => system}/skeleton/root/.empty (100%)
 rename {fs => system}/skeleton/run (100%)
 rename {fs => system}/skeleton/sbin/.empty (100%)
 rename {fs => system}/skeleton/sys/.empty (100%)
 rename {fs => system}/skeleton/tmp/.empty (100%)
 rename {fs => system}/skeleton/usr/bin/.empty (100%)
 rename {fs => system}/skeleton/usr/lib/.empty (100%)
 rename {fs => system}/skeleton/usr/sbin/.empty (100%)
 rename {fs => system}/skeleton/var/cache (100%)
 rename {fs => system}/skeleton/var/lib/misc (100%)
 rename {fs => system}/skeleton/var/lib/pcmcia (100%)
 rename {fs => system}/skeleton/var/lock (100%)
 rename {fs => system}/skeleton/var/log (100%)
 rename {fs => system}/skeleton/var/pcmcia (100%)
 rename {fs => system}/skeleton/var/run (100%)
 rename {fs => system}/skeleton/var/spool (100%)
 rename {fs => system}/skeleton/var/tmp (100%)
 rename target/generic/Makefile.in => system/system.mk (100%)
 delete mode 100644 target/Makefile.in

diff --git a/Config.in b/Config.in
index dab7787df8..cce4619cdf 100644
--- a/Config.in
+++ b/Config.in
@@ -419,7 +419,7 @@ endmenu
 
 source "toolchain/Config.in"
 
-source "target/generic/Config.in"
+source "system/Config.in"
 
 source "package/Config.in"
 
diff --git a/Makefile b/Makefile
index dff6aeb2f3..c526fe1c10 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps
 BINARIES_DIR:=$(BASE_DIR)/images
 TARGET_DIR:=$(BASE_DIR)/target
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
-TARGET_SKELETON=$(TOPDIR)/fs/skeleton
+TARGET_SKELETON=$(TOPDIR)/system/skeleton
 
 LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
 REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
@@ -310,7 +310,6 @@ endif
 include package/*/*.mk
 
 include boot/common.mk
-include target/Makefile.in
 include linux/linux.mk
 
 TARGETS+=target-finalize
@@ -325,6 +324,7 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 8c3ea82ad5..44007c70ff 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -11,8 +11,8 @@ There are a few ways to customize the resulting target filesystem:
   rebuild your toolchain and tools, these changes will be lost.
 
 * Create your own 'target skeleton'. You can start with the default
-  skeleton available under +fs/skeleton+ and then customize it to suit
-  your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
+  skeleton available under +system/skeleton+ and then customize it to
+  suit your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
   +BR2_ROOTFS_SKELETON_CUSTOM_PATH+ will allow you to specify the
   location of your custom skeleton. At build time, the contents of the
   skeleton are copied to output/target before any package
diff --git a/target/generic/Config.in b/system/Config.in
similarity index 99%
rename from target/generic/Config.in
rename to system/Config.in
index b8472f4e8d..c30c6f7d3c 100644
--- a/target/generic/Config.in
+++ b/system/Config.in
@@ -111,7 +111,7 @@ endchoice
 if BR2_ROOTFS_SKELETON_CUSTOM
 config BR2_ROOTFS_SKELETON_CUSTOM_PATH
 	string "custom target skeleton path"
-	default "fs/skeleton"
+	default "system/skeleton"
 	help
 	  Path custom target skeleton.
 endif
diff --git a/target/generic/device_table.txt b/system/device_table.txt
similarity index 100%
rename from target/generic/device_table.txt
rename to system/device_table.txt
diff --git a/target/generic/device_table_dev.txt b/system/device_table_dev.txt
similarity index 100%
rename from target/generic/device_table_dev.txt
rename to system/device_table_dev.txt
diff --git a/fs/skeleton/bin/.empty b/system/skeleton/bin/.empty
similarity index 100%
rename from fs/skeleton/bin/.empty
rename to system/skeleton/bin/.empty
diff --git a/fs/skeleton/dev/log b/system/skeleton/dev/log
similarity index 100%
rename from fs/skeleton/dev/log
rename to system/skeleton/dev/log
diff --git a/fs/skeleton/dev/pts/.empty b/system/skeleton/dev/pts/.empty
similarity index 100%
rename from fs/skeleton/dev/pts/.empty
rename to system/skeleton/dev/pts/.empty
diff --git a/fs/skeleton/etc/fstab b/system/skeleton/etc/fstab
similarity index 100%
rename from fs/skeleton/etc/fstab
rename to system/skeleton/etc/fstab
diff --git a/fs/skeleton/etc/group b/system/skeleton/etc/group
similarity index 100%
rename from fs/skeleton/etc/group
rename to system/skeleton/etc/group
diff --git a/fs/skeleton/etc/hostname b/system/skeleton/etc/hostname
similarity index 100%
rename from fs/skeleton/etc/hostname
rename to system/skeleton/etc/hostname
diff --git a/fs/skeleton/etc/hosts b/system/skeleton/etc/hosts
similarity index 100%
rename from fs/skeleton/etc/hosts
rename to system/skeleton/etc/hosts
diff --git a/fs/skeleton/etc/init.d/S20urandom b/system/skeleton/etc/init.d/S20urandom
similarity index 100%
rename from fs/skeleton/etc/init.d/S20urandom
rename to system/skeleton/etc/init.d/S20urandom
diff --git a/fs/skeleton/etc/init.d/S40network b/system/skeleton/etc/init.d/S40network
similarity index 100%
rename from fs/skeleton/etc/init.d/S40network
rename to system/skeleton/etc/init.d/S40network
diff --git a/fs/skeleton/etc/init.d/rcK b/system/skeleton/etc/init.d/rcK
similarity index 100%
rename from fs/skeleton/etc/init.d/rcK
rename to system/skeleton/etc/init.d/rcK
diff --git a/fs/skeleton/etc/init.d/rcS b/system/skeleton/etc/init.d/rcS
similarity index 100%
rename from fs/skeleton/etc/init.d/rcS
rename to system/skeleton/etc/init.d/rcS
diff --git a/fs/skeleton/etc/inittab b/system/skeleton/etc/inittab
similarity index 100%
rename from fs/skeleton/etc/inittab
rename to system/skeleton/etc/inittab
diff --git a/fs/skeleton/etc/inputrc b/system/skeleton/etc/inputrc
similarity index 100%
rename from fs/skeleton/etc/inputrc
rename to system/skeleton/etc/inputrc
diff --git a/fs/skeleton/etc/issue b/system/skeleton/etc/issue
similarity index 100%
rename from fs/skeleton/etc/issue
rename to system/skeleton/etc/issue
diff --git a/fs/skeleton/etc/ld.so.conf.d/.empty b/system/skeleton/etc/ld.so.conf.d/.empty
similarity index 100%
rename from fs/skeleton/etc/ld.so.conf.d/.empty
rename to system/skeleton/etc/ld.so.conf.d/.empty
diff --git a/fs/skeleton/etc/mtab b/system/skeleton/etc/mtab
similarity index 100%
rename from fs/skeleton/etc/mtab
rename to system/skeleton/etc/mtab
diff --git a/fs/skeleton/etc/network/if-down.d/.empty b/system/skeleton/etc/network/if-down.d/.empty
similarity index 100%
rename from fs/skeleton/etc/network/if-down.d/.empty
rename to system/skeleton/etc/network/if-down.d/.empty
diff --git a/fs/skeleton/etc/network/if-post-down.d/.empty b/system/skeleton/etc/network/if-post-down.d/.empty
similarity index 100%
rename from fs/skeleton/etc/network/if-post-down.d/.empty
rename to system/skeleton/etc/network/if-post-down.d/.empty
diff --git a/fs/skeleton/etc/network/if-pre-up.d/.empty b/system/skeleton/etc/network/if-pre-up.d/.empty
similarity index 100%
rename from fs/skeleton/etc/network/if-pre-up.d/.empty
rename to system/skeleton/etc/network/if-pre-up.d/.empty
diff --git a/fs/skeleton/etc/network/if-up.d/.empty b/system/skeleton/etc/network/if-up.d/.empty
similarity index 100%
rename from fs/skeleton/etc/network/if-up.d/.empty
rename to system/skeleton/etc/network/if-up.d/.empty
diff --git a/fs/skeleton/etc/network/interfaces b/system/skeleton/etc/network/interfaces
similarity index 100%
rename from fs/skeleton/etc/network/interfaces
rename to system/skeleton/etc/network/interfaces
diff --git a/fs/skeleton/etc/passwd b/system/skeleton/etc/passwd
similarity index 100%
rename from fs/skeleton/etc/passwd
rename to system/skeleton/etc/passwd
diff --git a/fs/skeleton/etc/profile b/system/skeleton/etc/profile
similarity index 100%
rename from fs/skeleton/etc/profile
rename to system/skeleton/etc/profile
diff --git a/fs/skeleton/etc/protocols b/system/skeleton/etc/protocols
similarity index 100%
rename from fs/skeleton/etc/protocols
rename to system/skeleton/etc/protocols
diff --git a/fs/skeleton/etc/random-seed b/system/skeleton/etc/random-seed
similarity index 100%
rename from fs/skeleton/etc/random-seed
rename to system/skeleton/etc/random-seed
diff --git a/fs/skeleton/etc/resolv.conf b/system/skeleton/etc/resolv.conf
similarity index 100%
rename from fs/skeleton/etc/resolv.conf
rename to system/skeleton/etc/resolv.conf
diff --git a/fs/skeleton/etc/securetty b/system/skeleton/etc/securetty
similarity index 100%
rename from fs/skeleton/etc/securetty
rename to system/skeleton/etc/securetty
diff --git a/fs/skeleton/etc/services b/system/skeleton/etc/services
similarity index 100%
rename from fs/skeleton/etc/services
rename to system/skeleton/etc/services
diff --git a/fs/skeleton/etc/shadow b/system/skeleton/etc/shadow
similarity index 100%
rename from fs/skeleton/etc/shadow
rename to system/skeleton/etc/shadow
diff --git a/fs/skeleton/home/ftp/.empty b/system/skeleton/home/ftp/.empty
similarity index 100%
rename from fs/skeleton/home/ftp/.empty
rename to system/skeleton/home/ftp/.empty
diff --git a/fs/skeleton/lib/.empty b/system/skeleton/lib/.empty
similarity index 100%
rename from fs/skeleton/lib/.empty
rename to system/skeleton/lib/.empty
diff --git a/fs/skeleton/media/.empty b/system/skeleton/media/.empty
similarity index 100%
rename from fs/skeleton/media/.empty
rename to system/skeleton/media/.empty
diff --git a/fs/skeleton/mnt/.empty b/system/skeleton/mnt/.empty
similarity index 100%
rename from fs/skeleton/mnt/.empty
rename to system/skeleton/mnt/.empty
diff --git a/fs/skeleton/opt/.empty b/system/skeleton/opt/.empty
similarity index 100%
rename from fs/skeleton/opt/.empty
rename to system/skeleton/opt/.empty
diff --git a/fs/skeleton/proc/.empty b/system/skeleton/proc/.empty
similarity index 100%
rename from fs/skeleton/proc/.empty
rename to system/skeleton/proc/.empty
diff --git a/fs/skeleton/root/.bash_history b/system/skeleton/root/.bash_history
similarity index 100%
rename from fs/skeleton/root/.bash_history
rename to system/skeleton/root/.bash_history
diff --git a/fs/skeleton/root/.bash_logout b/system/skeleton/root/.bash_logout
similarity index 100%
rename from fs/skeleton/root/.bash_logout
rename to system/skeleton/root/.bash_logout
diff --git a/fs/skeleton/root/.bash_profile b/system/skeleton/root/.bash_profile
similarity index 100%
rename from fs/skeleton/root/.bash_profile
rename to system/skeleton/root/.bash_profile
diff --git a/fs/skeleton/root/.empty b/system/skeleton/root/.empty
similarity index 100%
rename from fs/skeleton/root/.empty
rename to system/skeleton/root/.empty
diff --git a/fs/skeleton/run b/system/skeleton/run
similarity index 100%
rename from fs/skeleton/run
rename to system/skeleton/run
diff --git a/fs/skeleton/sbin/.empty b/system/skeleton/sbin/.empty
similarity index 100%
rename from fs/skeleton/sbin/.empty
rename to system/skeleton/sbin/.empty
diff --git a/fs/skeleton/sys/.empty b/system/skeleton/sys/.empty
similarity index 100%
rename from fs/skeleton/sys/.empty
rename to system/skeleton/sys/.empty
diff --git a/fs/skeleton/tmp/.empty b/system/skeleton/tmp/.empty
similarity index 100%
rename from fs/skeleton/tmp/.empty
rename to system/skeleton/tmp/.empty
diff --git a/fs/skeleton/usr/bin/.empty b/system/skeleton/usr/bin/.empty
similarity index 100%
rename from fs/skeleton/usr/bin/.empty
rename to system/skeleton/usr/bin/.empty
diff --git a/fs/skeleton/usr/lib/.empty b/system/skeleton/usr/lib/.empty
similarity index 100%
rename from fs/skeleton/usr/lib/.empty
rename to system/skeleton/usr/lib/.empty
diff --git a/fs/skeleton/usr/sbin/.empty b/system/skeleton/usr/sbin/.empty
similarity index 100%
rename from fs/skeleton/usr/sbin/.empty
rename to system/skeleton/usr/sbin/.empty
diff --git a/fs/skeleton/var/cache b/system/skeleton/var/cache
similarity index 100%
rename from fs/skeleton/var/cache
rename to system/skeleton/var/cache
diff --git a/fs/skeleton/var/lib/misc b/system/skeleton/var/lib/misc
similarity index 100%
rename from fs/skeleton/var/lib/misc
rename to system/skeleton/var/lib/misc
diff --git a/fs/skeleton/var/lib/pcmcia b/system/skeleton/var/lib/pcmcia
similarity index 100%
rename from fs/skeleton/var/lib/pcmcia
rename to system/skeleton/var/lib/pcmcia
diff --git a/fs/skeleton/var/lock b/system/skeleton/var/lock
similarity index 100%
rename from fs/skeleton/var/lock
rename to system/skeleton/var/lock
diff --git a/fs/skeleton/var/log b/system/skeleton/var/log
similarity index 100%
rename from fs/skeleton/var/log
rename to system/skeleton/var/log
diff --git a/fs/skeleton/var/pcmcia b/system/skeleton/var/pcmcia
similarity index 100%
rename from fs/skeleton/var/pcmcia
rename to system/skeleton/var/pcmcia
diff --git a/fs/skeleton/var/run b/system/skeleton/var/run
similarity index 100%
rename from fs/skeleton/var/run
rename to system/skeleton/var/run
diff --git a/fs/skeleton/var/spool b/system/skeleton/var/spool
similarity index 100%
rename from fs/skeleton/var/spool
rename to system/skeleton/var/spool
diff --git a/fs/skeleton/var/tmp b/system/skeleton/var/tmp
similarity index 100%
rename from fs/skeleton/var/tmp
rename to system/skeleton/var/tmp
diff --git a/target/generic/Makefile.in b/system/system.mk
similarity index 100%
rename from target/generic/Makefile.in
rename to system/system.mk
diff --git a/target/Makefile.in b/target/Makefile.in
deleted file mode 100644
index 915d62538c..0000000000
--- a/target/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# make sure to put everything that is board-specific before the tarroot targets
-include target/generic/Makefile.in
-

From 79ee3c1f847ef472d93c761f0744e3102e707750 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 3 Nov 2012 08:27:59 +0000
Subject: [PATCH 3142/6849] Split target/Config.in.arch into multiple
 Config.in.* in arch/

target/Config.in.arch had become too long, and we want to remove the
target/ directory. So let's move it to arch/ and split it this way:

 * An initial Config.in that lists the top-level architecture, and
   sources the arch-specific Config.in.<arch> files, as well as
   Config.in.common (see below)

 * One Config.in.<arch> per architecture, listing the CPU families,
   ABI choices, etc.

 * One Config.in.common that defines the gcc mtune, march, mcpu values
   and other hidden options.

[Peter: space->tab fix, mipsel64 little endian, mips3 as noted by Arnout]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in              |   2 +-
 arch/Config.in         | 161 ++++++++
 arch/Config.in.arm     |  62 +++
 arch/Config.in.bfin    |  10 +
 arch/Config.in.common  | 245 ++++++++++++
 arch/Config.in.mips    |  53 +++
 arch/Config.in.powerpc |  83 +++++
 arch/Config.in.sh      |  24 ++
 arch/Config.in.sparc   |  38 ++
 arch/Config.in.x86     | 146 ++++++++
 target/Config.in.arch  | 830 -----------------------------------------
 11 files changed, 823 insertions(+), 831 deletions(-)
 create mode 100644 arch/Config.in
 create mode 100644 arch/Config.in.arm
 create mode 100644 arch/Config.in.bfin
 create mode 100644 arch/Config.in.common
 create mode 100644 arch/Config.in.mips
 create mode 100644 arch/Config.in.powerpc
 create mode 100644 arch/Config.in.sh
 create mode 100644 arch/Config.in.sparc
 create mode 100644 arch/Config.in.x86
 delete mode 100644 target/Config.in.arch

diff --git a/Config.in b/Config.in
index cce4619cdf..68190a530c 100644
--- a/Config.in
+++ b/Config.in
@@ -14,7 +14,7 @@ config BR2_HOSTARCH
 	string
 	option env="HOSTARCH"
 
-source "target/Config.in.arch"
+source "arch/Config.in"
 
 menu "Build options"
 
diff --git a/arch/Config.in b/arch/Config.in
new file mode 100644
index 0000000000..4d1f81f598
--- /dev/null
+++ b/arch/Config.in
@@ -0,0 +1,161 @@
+config BR2_ARCH_IS_64
+       bool
+
+choice
+	prompt "Target Architecture"
+	default BR2_i386
+	help
+	  Select the target architecture family to build for.
+
+config BR2_arm
+	bool "ARM (little endian)"
+	help
+	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
+	  set architecture (ISA) developed by ARM Holdings. Little endian.
+	  http://www.arm.com/
+	  http://en.wikipedia.org/wiki/ARM
+
+config BR2_armeb
+	bool "ARM (big endian)"
+	help
+	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
+	  set architecture (ISA) developed by ARM Holdings. Big endian.
+	  http://www.arm.com/
+	  http://en.wikipedia.org/wiki/ARM
+
+config BR2_aarch64
+	bool "AArch64"
+	help
+	  Aarch64 is a 64-bit architecture developed by ARM Holdings.
+	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php
+	  http://en.wikipedia.org/wiki/ARM
+
+config BR2_avr32
+	bool "AVR32"
+	select BR2_SOFT_FLOAT
+	help
+	  The AVR32 is a 32-bit RISC microprocessor architecture designed by
+	  Atmel.
+	  http://www.atmel.com/
+	  http://en.wikipedia.org/wiki/Avr32
+
+config BR2_bfin
+	bool "Blackfin"
+	help
+	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
+	  manufactured and marketed by Analog Devices.
+	  http://www.analog.com/
+	  http://en.wikipedia.org/wiki/Blackfin
+
+config BR2_i386
+	bool "i386"
+	help
+	  Intel i386 architecture compatible microprocessor
+	  http://en.wikipedia.org/wiki/I386
+
+config BR2_m68k
+	bool "m68k"
+	depends on BROKEN # ice in uclibc / inet_ntoa_r
+	help
+	  Motorola 68000 family microprocessor
+	  http://en.wikipedia.org/wiki/M68k
+
+config BR2_microblazeel
+	bool "Microblaze AXI (little endian)"
+	help
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus
+	  based architecture (little endian)
+	  http://www.xilinx.com
+	  http://en.wikipedia.org/wiki/Microblaze
+
+config BR2_microblazebe
+	bool "Microblaze non-AXI (big endian)"
+	help
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus
+	  based architecture (non-AXI, big endian)
+	  http://www.xilinx.com
+	  http://en.wikipedia.org/wiki/Microblaze
+
+config BR2_mips
+	bool "MIPS (big endian)"
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
+config BR2_mipsel
+	bool "MIPS (little endian)"
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
+config BR2_mips64
+	bool "MIPS64 (big endian)"
+	select BR2_ARCH_IS_64
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
+config BR2_mips64el
+	bool "MIPS64 (little endian)"
+	select BR2_ARCH_IS_64
+	help
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  http://www.mips.com/
+	  http://en.wikipedia.org/wiki/MIPS_Technologies
+
+config BR2_powerpc
+	bool "PowerPC"
+	help
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
+	  http://www.power.org/
+	  http://en.wikipedia.org/wiki/Powerpc
+
+config BR2_sh
+	bool "SuperH"
+	help
+	  SuperH (or SH) is a 32-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by Hitachi.
+	  http://www.hitachi.com/
+	  http://en.wikipedia.org/wiki/SuperH
+
+config BR2_sh64
+	bool "SuperH64"
+	help
+	  SuperH64 (or SH) is a 64-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by Hitachi.
+	  http://www.hitachi.com/
+	  http://en.wikipedia.org/wiki/SuperH
+
+config BR2_sparc
+	bool "SPARC"
+	help
+	  SPARC (from Scalable Processor Architecture) is a RISC instruction
+	  set architecture (ISA) developed by Sun Microsystems.
+	  http://www.oracle.com/sun
+	  http://en.wikipedia.org/wiki/Sparc
+
+config BR2_x86_64
+	bool "x86_64"
+	select BR2_ARCH_IS_64
+	help
+	  x86-64 is an extension of the x86 instruction set (Intel i386
+	  architecture compatible microprocessor).
+	  http://en.wikipedia.org/wiki/X86_64
+
+endchoice
+
+config BR2_microblaze
+	bool
+	default y if BR2_microblazeel || BR2_microblazebe
+
+source "arch/Config.in.arm"
+source "arch/Config.in.bfin"
+source "arch/Config.in.mips"
+source "arch/Config.in.powerpc"
+source "arch/Config.in.sh"
+source "arch/Config.in.sparc"
+source "arch/Config.in.x86"
+source "arch/Config.in.common"
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
new file mode 100644
index 0000000000..8d9db3cf07
--- /dev/null
+++ b/arch/Config.in.arm
@@ -0,0 +1,62 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_arm || BR2_armeb
+	default BR2_generic_arm
+	help
+	  Specific CPU variant to use
+
+config BR2_generic_arm
+	bool "generic_arm"
+config BR2_arm7tdmi
+	bool "arm7tdmi"
+config BR2_arm610
+	bool "arm610"
+config BR2_arm710
+	bool "arm710"
+config BR2_arm720t
+	bool "arm720t"
+config BR2_arm920t
+	bool "arm920t"
+config BR2_arm922t
+	bool "arm922t"
+config BR2_arm926t
+	bool "arm926t"
+config BR2_arm10t
+	bool "arm10t"
+config BR2_arm1136jf_s
+	bool "arm1136jf_s"
+config BR2_arm1176jz_s
+	bool "arm1176jz-s"
+config BR2_arm1176jzf_s
+	bool "arm1176jzf-s"
+config BR2_cortex_a8
+	bool "cortex-A8"
+config BR2_cortex_a9
+	bool "cortex-A9"
+config BR2_sa110
+	bool "sa110"
+config BR2_sa1100
+	bool "sa1100"
+config BR2_xscale
+	bool "xscale"
+config BR2_iwmmxt
+	bool "iwmmxt"
+endchoice
+
+choice
+	prompt "Target ABI"
+	depends on BR2_arm || BR2_armeb
+	default BR2_ARM_EABI
+	help
+	  Application Binary Interface to use
+
+	  Note:
+	    Using OABI is discouraged.
+
+config BR2_ARM_EABI
+	bool "EABI"
+config BR2_ARM_OABI
+	bool "OABI"
+	depends on !BR2_GCC_VERSION_4_7_X
+endchoice
+
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
new file mode 100644
index 0000000000..1823bde811
--- /dev/null
+++ b/arch/Config.in.bfin
@@ -0,0 +1,10 @@
+choice
+	prompt "Target ABI"
+	depends on BR2_bfin
+	default BR2_BFIN_FDPIC
+config BR2_BFIN_FDPIC
+	bool "FDPIC"
+config BR2_BFIN_FLAT
+	bool "FLAT"
+	select BR2_PREFER_STATIC_LIB
+endchoice
diff --git a/arch/Config.in.common b/arch/Config.in.common
new file mode 100644
index 0000000000..1ed9929f0e
--- /dev/null
+++ b/arch/Config.in.common
@@ -0,0 +1,245 @@
+config BR2_ARCH
+	string
+	default "arm"		if BR2_arm
+	default "armeb"		if BR2_armeb
+	default "aarch64"       if BR2_aarch64
+	default "avr32"		if BR2_avr32
+	default "bfin"		if BR2_bfin
+	default "i386"		if BR2_x86_i386
+	default "i486"		if BR2_x86_i486
+	default "i586"		if BR2_x86_i586
+	default "i586"		if BR2_x86_pentium_mmx
+	default "i586"		if BR2_x86_geode
+	default "i586"		if BR2_x86_c3
+	default "i686"		if BR2_x86_c32
+	default "i586"		if BR2_x86_winchip_c6
+	default "i586"		if BR2_x86_winchip2
+	default "i686"		if BR2_x86_i686
+	default "i686"		if BR2_x86_pentium2
+	default "i686"		if BR2_x86_pentium3
+	default "i686"		if BR2_x86_pentium4
+	default "i686"		if BR2_x86_pentium_m
+	default "i686"		if BR2_x86_pentiumpro
+	default "i686"		if BR2_x86_prescott
+	default "i686"		if BR2_x86_nocona && BR2_i386
+	default "i686"		if BR2_x86_core2 && BR2_i386
+	default "i686"		if BR2_x86_atom && BR2_i386
+	default "i686"		if BR2_x86_opteron && BR2_i386
+	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
+	default "i686"		if BR2_x86_barcelona && BR2_i386
+	default "i686"		if BR2_x86_k6
+	default "i686"		if BR2_x86_k6_2
+	default "i686"		if BR2_x86_athlon
+	default "i686"		if BR2_x86_athlon_4
+	default "x86_64"	if BR2_x86_64
+	default "m68k"		if BR2_m68k
+	default "microblaze"	if BR2_microblaze
+	default "mips"		if BR2_mips
+	default "mipsel"	if BR2_mipsel
+	default "mips64"	if BR2_mips64
+	default "mips64el"	if BR2_mips64el
+	default "powerpc"	if BR2_powerpc
+	default "sh2"		if BR2_sh2
+	default "sh2a"		if BR2_sh2a
+	default "sh3"		if BR2_sh3
+	default "sh3eb"		if BR2_sh3eb
+	default "sh4"		if BR2_sh4
+	default "sh4eb"		if BR2_sh4eb
+	default "sh4a"		if BR2_sh4a
+	default "sh4aeb"	if BR2_sh4aeb
+	default "sh64"		if BR2_sh64
+	default "sparc"		if BR2_sparc
+
+
+config BR2_ENDIAN
+	string
+	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || BR2_mips64el || \
+			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64 || \
+			    BR2_microblazeel
+	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || BR2_mips64 || \
+			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \
+			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc || \
+			    BR2_microblazebe
+
+config BR2_GCC_TARGET_TUNE
+	string
+	default i386		if BR2_x86_i386
+	default i486		if BR2_x86_i486
+	default i586		if BR2_x86_i586
+	default pentium-mmx	if BR2_x86_pentium_mmx
+	default i686		if BR2_x86_i686
+	default pentiumpro	if BR2_x86_pentiumpro
+	default pentium-m	if BR2_x86_pentium_m
+	default pentium2	if BR2_x86_pentium2
+	default pentium3	if BR2_x86_pentium3
+	default pentium4	if BR2_x86_pentium4
+	default prescott	if BR2_x86_prescott
+	default nocona		if BR2_x86_nocona
+	default core2		if BR2_x86_core2
+	default atom		if BR2_x86_atom
+	default k8		if BR2_x86_opteron
+	default k8-sse3		if BR2_x86_opteron_sse3
+	default barcelona	if BR2_x86_barcelona
+	default k6		if BR2_x86_k6
+	default k6-2		if BR2_x86_k6_2
+	default athlon		if BR2_x86_athlon
+	default athlon-4	if BR2_x86_athlon_4
+	default winchip-c6	if BR2_x86_winchip_c6
+	default winchip2	if BR2_x86_winchip2
+	default c3		if BR2_x86_c3
+	default c3-2		if BR2_x86_c32
+	default geode		if BR2_x86_geode
+	default generic		if BR2_x86_generic
+	default arm600		if BR2_arm600
+	default arm610		if BR2_arm610
+	default arm620		if BR2_arm620
+	default arm7tdmi	if BR2_arm7tdmi
+	default arm7tdmi	if BR2_arm720t
+	default arm7tdmi	if BR2_arm740t
+	default arm920		if BR2_arm920
+	default arm920t		if BR2_arm920t
+	default arm922t		if BR2_arm922t
+	default arm926ej-s	if BR2_arm926t
+	default arm1136j-s	if BR2_arm1136j_s
+	default arm1136jf-s	if BR2_arm1136jf_s
+	default arm1176jz-s	if BR2_arm1176jz_s
+	default arm1176jzf-s	if BR2_arm1176jzf_s
+	default cortex-a8	if BR2_cortex_a8
+	default cortex-a9	if BR2_cortex_a9
+	default strongarm110	if BR2_sa110
+	default strongarm1100	if BR2_sa1100
+	default xscale		if BR2_xscale
+	default iwmmxt		if BR2_iwmmxt
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
+	default mips1		if BR2_mips_1
+	default mips2		if BR2_mips_2
+	default mips3		if BR2_mips_3
+	default mips4		if BR2_mips_4
+	default mips32		if BR2_mips_32
+	default mips32r2	if BR2_mips_32r2
+	default mips64		if BR2_mips_64
+	default mips64r2	if BR2_mips_64r2
+	default 401		if BR2_powerpc_401
+	default 403		if BR2_powerpc_403
+	default 405		if BR2_powerpc_405
+	default 405fp		if BR2_powerpc_405fp
+	default 440		if BR2_powerpc_440
+	default 440fp		if BR2_powerpc_440fp
+	default 505		if BR2_powerpc_505
+	default 601		if BR2_powerpc_601
+	default 602		if BR2_powerpc_602
+	default 603		if BR2_powerpc_603
+	default 603e		if BR2_powerpc_603e
+	default 604		if BR2_powerpc_604
+	default 604e		if BR2_powerpc_604e
+	default 620		if BR2_powerpc_620
+	default 630		if BR2_powerpc_630
+	default 740		if BR2_powerpc_740
+	default 7400		if BR2_powerpc_7400
+	default 7450		if BR2_powerpc_7450
+	default 750		if BR2_powerpc_750
+	default 801		if BR2_powerpc_801
+	default 821		if BR2_powerpc_821
+	default 823		if BR2_powerpc_823
+	default 860		if BR2_powerpc_860
+	default 970		if BR2_powerpc_970
+	default 8540		if BR2_powerpc_8540
+	default	8548		if BR2_powerpc_8548
+	default e300c2		if BR2_powerpc_e300c2
+	default e300c3		if BR2_powerpc_e300c3
+	default e500mc		if BR2_powerpc_e500mc
+	default v7		if BR2_sparc_v7
+	default cypress		if BR2_sparc_cypress
+	default v8		if BR2_sparc_v8
+	default supersparc	if BR2_sparc_supersparc
+	default hypersparc	if BR2_sparc_hypersparc
+	default sparclite	if BR2_sparc_sparclite
+	default f930		if BR2_sparc_f930
+	default f934		if BR2_sparc_f934
+	default sparclite86x	if BR2_sparc_sparclite86x
+	default sparclet	if BR2_sparc_sparclet
+	default tsc701		if BR2_sparc_tsc701
+	default v9		if BR2_sparc_v9
+	default v9		if BR2_sparc_v9a
+	default v9		if BR2_sparc_v9b
+	default ultrasparc	if BR2_sparc_ultrasparc
+	default ultrasparc3	if BR2_sparc_ultrasparc3
+	default niagara		if BR2_sparc_niagara
+
+config BR2_GCC_TARGET_ARCH
+	string
+	default i386		if BR2_x86_i386
+	default i486		if BR2_x86_i486
+	default i586		if BR2_x86_i586
+	default pentium-mmx	if BR2_x86_pentium_mmx
+	default i686		if BR2_x86_i686
+	default pentiumpro	if BR2_x86_pentiumpro
+	default pentium-m	if BR2_x86_pentium_m
+	default pentium2	if BR2_x86_pentium2
+	default pentium3	if BR2_x86_pentium3
+	default pentium4	if BR2_x86_pentium4
+	default prescott	if BR2_x86_prescott
+	default nocona		if BR2_x86_nocona
+	default core2		if BR2_x86_core2
+	default atom		if BR2_x86_atom
+	default k8		if BR2_x86_opteron
+	default k8-sse3		if BR2_x86_opteron_sse3
+	default barcelona	if BR2_x86_barcelona
+	default k6		if BR2_x86_k6
+	default k6-2		if BR2_x86_k6_2
+	default athlon		if BR2_x86_athlon
+	default athlon-4	if BR2_x86_athlon_4
+	default winchip-c6	if BR2_x86_winchip_c6
+	default winchip2	if BR2_x86_winchip2
+	default c3		if BR2_x86_c3
+	default c3-2		if BR2_x86_c32
+	default geode		if BR2_x86_geode
+	default armv4t		if BR2_arm7tdmi
+	default armv3		if BR2_arm610
+	default armv3		if BR2_arm710
+	default armv4t		if BR2_arm720t
+	default armv4t		if BR2_arm920t
+	default armv4t		if BR2_arm922t
+	default armv5te		if BR2_arm926t
+	default armv5t		if BR2_arm10t
+	default armv6j		if BR2_arm1136jf_s
+	default armv6zk		if BR2_arm1176jz_s
+	default armv6zk		if BR2_arm1176jzf_s
+	default armv7-a		if BR2_cortex_a8
+	default armv7-a		if BR2_cortex_a9
+	default armv4		if BR2_sa110
+	default armv4		if BR2_sa1100
+	default armv5te		if BR2_xscale
+	default iwmmxt		if BR2_iwmmxt
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
+
+config BR2_GCC_TARGET_ABI
+	string
+	default apcs-gnu	if BR2_ARM_OABI
+	default aapcs-linux	if BR2_ARM_EABI
+	default 32		if BR2_MIPS_OABI32
+	default n32		if BR2_MIPS_NABI32
+	default 64		if BR2_MIPS_NABI64
+	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec
+	default no-altivec	if BR2_powerpc && BR2_PPC_ABI_no-altivec
+	default spe		if BR2_powerpc && BR2_PPC_ABI_spe
+	default no-spe		if BR2_powerpc && BR2_PPC_ABI_no-spe
+	default ibmlongdouble	if BR2_powerpc && BR2_PPC_ABI_ibmlongdouble
+	default ieeelongdouble	if BR2_powerpc && BR2_PPC_ABI_ieeelongdouble
+
+config BR2_GCC_TARGET_CPU
+	string
+	default sparchfleon	if BR2_sparc_sparchfleon
+	default sparchfleonv8	if BR2_sparc_sparchfleonv8
+	default sparcsfleon	if BR2_sparc_sparcsfleon
+	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
new file mode 100644
index 0000000000..93a21bfaeb
--- /dev/null
+++ b/arch/Config.in.mips
@@ -0,0 +1,53 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default BR2_mips_3 if BR2_mips
+	default BR2_mips_1 if BR2_mipsel
+	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
+	help
+	  Specific CPU variant to use
+
+	  64bit cabable: 3, 4, 64, 64r2
+	  non-64bit capable: 1, 2, 32, 32r2
+
+config BR2_mips_1
+	bool "mips I (generic)"
+	depends on !BR2_ARCH_IS_64
+config BR2_mips_2
+	bool "mips II"
+	depends on !BR2_ARCH_IS_64
+config BR2_mips_3
+	bool "mips III"
+config BR2_mips_4
+	bool "mips IV"
+config BR2_mips_32
+	bool "mips 32"
+	depends on !BR2_ARCH_IS_64
+config BR2_mips_32r2
+	bool "mips 32r2"
+	depends on !BR2_ARCH_IS_64
+config BR2_mips_64
+	bool "mips 64"
+config BR2_mips_64r2
+	bool "mips 64r2"
+endchoice
+
+
+choice
+	prompt "Target ABI"
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default BR2_MIPS_OABI32 if !BR2_ARCH_IS_64
+	default BR2_MIPS_NABI32 if BR2_ARCH_IS_64
+
+	help
+	  Application Binary Interface to use
+
+config BR2_MIPS_OABI32
+	bool "o32"
+config BR2_MIPS_NABI32
+	bool "n32"
+	depends on BR2_ARCH_IS_64
+config BR2_MIPS_NABI64
+	bool "n64"
+	depends on BR2_ARCH_IS_64
+endchoice
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
new file mode 100644
index 0000000000..20b0b064d2
--- /dev/null
+++ b/arch/Config.in.powerpc
@@ -0,0 +1,83 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_powerpc
+	default BR2_generic_powerpc
+	help
+	  Specific CPU variant to use
+config BR2_generic_powerpc
+	bool "generic"
+config BR2_powerpc_401
+	bool "401"
+config BR2_powerpc_403
+	bool "403"
+config BR2_powerpc_405
+	bool "405"
+config BR2_powerpc_405fp
+	bool "405 with FPU"
+config BR2_powerpc_440
+	bool "440"
+config BR2_powerpc_440fp
+	bool "440 with FPU"
+config BR2_powerpc_505
+	bool "505"
+config BR2_powerpc_601
+	bool "601"
+config BR2_powerpc_602
+	bool "602"
+config BR2_powerpc_603
+	bool "603"
+config BR2_powerpc_603e
+	bool "603e"
+config BR2_powerpc_604
+	bool "604"
+config BR2_powerpc_604e
+	bool "604e"
+config BR2_powerpc_620
+	bool "620"
+config BR2_powerpc_630
+	bool "630"
+config BR2_powerpc_740
+	bool "740"
+config BR2_powerpc_7400
+	bool "7400"
+config BR2_powerpc_7450
+	bool "7450"
+config BR2_powerpc_750
+	bool "750"
+config BR2_powerpc_801
+	bool "801"
+config BR2_powerpc_821
+	bool "821"
+config BR2_powerpc_823
+	bool "823"
+config BR2_powerpc_860
+	bool "860"
+config BR2_powerpc_970
+	bool "970"
+config BR2_powerpc_8540
+	bool "8540 / e500v1"
+config BR2_powerpc_8548
+	bool "8548 / e500v2"
+config BR2_powerpc_e300c2
+	bool "e300c2"
+config BR2_powerpc_e300c3
+	bool "e300c3"
+config BR2_powerpc_e500mc
+	bool "e500mc"
+endchoice
+
+choice
+	prompt "Target ABI"
+	depends on BR2_powerpc
+	default BR2_powerpc_SPE if BR2_powerpc_8540 || BR2_powerpc_8548
+	default BR2_powerpc_CLASSIC
+	help
+	  Application Binary Interface to use
+
+config BR2_powerpc_CLASSIC
+	bool "Classic"
+	depends on !(BR2_powerpc_8540 || BR2_powerpc_8548)
+config BR2_powerpc_SPE
+	bool "SPE"
+	depends on BR2_powerpc_8540 || BR2_powerpc_8548
+endchoice
diff --git a/arch/Config.in.sh b/arch/Config.in.sh
new file mode 100644
index 0000000000..314c55ae98
--- /dev/null
+++ b/arch/Config.in.sh
@@ -0,0 +1,24 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_sh
+	default BR2_sh4
+	help
+	  Specific CPU variant to use
+
+config BR2_sh2
+	bool "sh2 (SH2 big endian)"
+config BR2_sh2a
+	bool "sh2a (SH2A big endian)"
+config BR2_sh3
+	bool "sh3 (SH3 little endian)"
+config BR2_sh3eb
+	bool "sh3eb (SH3 big endian)"
+config BR2_sh4
+	bool "sh4 (SH4 little endian)"
+config BR2_sh4eb
+	bool "sh4eb (SH4 big endian)"
+config BR2_sh4a
+	bool "sh4a (SH4A little endian)"
+config BR2_sh4aeb
+	bool "sh4aeb (SH4A big endian)"
+endchoice
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
new file mode 100644
index 0000000000..85e0833a0d
--- /dev/null
+++ b/arch/Config.in.sparc
@@ -0,0 +1,38 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_sparc
+	default BR2_sparc_v7
+	help
+	  Specific CPU variant to use
+
+config BR2_sparc_v7
+	bool "v7"
+config BR2_sparc_cypress
+	bool "cypress"
+config BR2_sparc_v8
+	bool "v8"
+config BR2_sparc_sparchfleon
+	bool "hfleon"
+config BR2_sparc_sparchfleonv8
+	bool "hfleonv8"
+config BR2_sparc_sparcsfleon
+	bool "sfleon"
+config BR2_sparc_sparcsfleonv8
+	bool "sfleonv8"
+config BR2_sparc_supersparc
+	bool "supersparc"
+config BR2_sparc_sparclite
+	bool "sparclite"
+config BR2_sparc_f930
+	bool "f930"
+config BR2_sparc_f934
+	bool "f934"
+config BR2_sparc_hypersparc
+	bool "hypersparc"
+config BR2_sparc_sparclite86x
+	bool "sparclite86x"
+config BR2_sparc_sparclet
+	bool "sparclet"
+config BR2_sparc_tsc701
+	bool "tsc701"
+endchoice
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
new file mode 100644
index 0000000000..4f32d7458d
--- /dev/null
+++ b/arch/Config.in.x86
@@ -0,0 +1,146 @@
+# i386/x86_64 cpu features
+config BR2_X86_CPU_HAS_MMX
+	bool
+config BR2_X86_CPU_HAS_SSE
+	bool
+config BR2_X86_CPU_HAS_SSE2
+	bool
+config BR2_X86_CPU_HAS_SSE3
+	bool
+config BR2_X86_CPU_HAS_SSSE3
+	bool
+
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_i386 || BR2_x86_64
+	default BR2_x86_i586 if BR2_i386
+	default BR2_x86_generic if BR2_x86_64
+	help
+	  Specific CPU variant to use
+
+config BR2_x86_generic
+	bool "generic"
+config BR2_x86_i386
+	bool "i386"
+	depends on !BR2_x86_64
+config BR2_x86_i486
+	bool "i486"
+	depends on !BR2_x86_64
+config BR2_x86_i586
+	bool "i586"
+	depends on !BR2_x86_64
+config BR2_x86_i686
+	bool "i686"
+	depends on !BR2_x86_64
+config BR2_x86_pentiumpro
+	bool "pentium pro"
+	depends on !BR2_x86_64
+config BR2_x86_pentium_mmx
+	bool "pentium MMX"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_pentium_m
+	bool "pentium mobile"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
+config BR2_x86_pentium2
+	bool "pentium2"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_pentium3
+	bool "pentium3"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
+config BR2_x86_pentium4
+	bool "pentium4"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	depends on !BR2_x86_64
+config BR2_x86_prescott
+	bool "prescott"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	depends on !BR2_x86_64
+config BR2_x86_nocona
+	bool "nocona"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+config BR2_x86_core2
+	bool "core2"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
+config BR2_x86_atom
+	bool "atom"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
+config BR2_x86_k6
+	bool "k6"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_k6_2
+	bool "k6-2"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_athlon
+	bool "athlon"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_athlon_4
+	bool "athlon-4"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
+config BR2_x86_opteron
+	bool "opteron"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+config BR2_x86_opteron_sse3
+	bool "opteron w/ SSE3"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+config BR2_x86_barcelona
+	bool "barcelona"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+config BR2_x86_geode
+	bool "geode"
+	# Don't include MMX support because there several variant of geode
+	# processor, some with MMX support, some without.
+	# See: http://en.wikipedia.org/wiki/Geode_%28processor%29
+	depends on !BR2_x86_64
+config BR2_x86_c3
+	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_c32
+	bool "Via C3-2 (Nehemiah cores)"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	depends on !BR2_x86_64
+config BR2_x86_winchip_c6
+	bool "IDT Winchip C6"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+config BR2_x86_winchip2
+	bool "IDT Winchip 2"
+	select BR2_X86_CPU_HAS_MMX
+	depends on !BR2_x86_64
+endchoice
diff --git a/target/Config.in.arch b/target/Config.in.arch
deleted file mode 100644
index ac2c0b599a..0000000000
--- a/target/Config.in.arch
+++ /dev/null
@@ -1,830 +0,0 @@
-config BR2_ARCH_IS_64
-       bool
-
-choice
-	prompt "Target Architecture"
-	default BR2_i386
-	help
-	  Select the target architecture family to build for.
-
-config BR2_arm
-	bool "ARM (little endian)"
-	help
-	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
-	  set architecture (ISA) developed by ARM Holdings. Little endian.
-	  http://www.arm.com/
-	  http://en.wikipedia.org/wiki/ARM
-
-config BR2_armeb
-	bool "ARM (big endian)"
-	help
-	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
-	  set architecture (ISA) developed by ARM Holdings. Big endian.
-	  http://www.arm.com/
-	  http://en.wikipedia.org/wiki/ARM
-
-config BR2_aarch64
-	bool "AArch64"
-	help
-	  Aarch64 is a 64-bit architecture developed by ARM Holdings.
-	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php
-	  http://en.wikipedia.org/wiki/ARM
-
-config BR2_avr32
-	bool "AVR32"
-	select BR2_SOFT_FLOAT
-	help
-	  The AVR32 is a 32-bit RISC microprocessor architecture designed by
-	  Atmel.
-	  http://www.atmel.com/
-	  http://en.wikipedia.org/wiki/Avr32
-
-config BR2_bfin
-	bool "Blackfin"
-	help
-	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
-	  manufactured and marketed by Analog Devices.
-	  http://www.analog.com/
-	  http://en.wikipedia.org/wiki/Blackfin
-
-config BR2_i386
-	bool "i386"
-	help
-	  Intel i386 architecture compatible microprocessor
-	  http://en.wikipedia.org/wiki/I386
-
-config BR2_m68k
-	bool "m68k"
-	depends on BROKEN # ice in uclibc / inet_ntoa_r
-	help
-	  Motorola 68000 family microprocessor
-	  http://en.wikipedia.org/wiki/M68k
-
-config BR2_microblazeel
-	bool "Microblaze AXI (little endian)"
-	help
-	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus
-	  based architecture (little endian)
-	  http://www.xilinx.com
-	  http://en.wikipedia.org/wiki/Microblaze
-
-config BR2_microblazebe
-	bool "Microblaze non-AXI (big endian)"
-	help
-	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus
-	  based architecture (non-AXI, big endian)
-	  http://www.xilinx.com
-	  http://en.wikipedia.org/wiki/Microblaze
-
-config BR2_mips
-	bool "MIPS (big endian)"
-	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
-	  http://www.mips.com/
-	  http://en.wikipedia.org/wiki/MIPS_Technologies
-
-config BR2_mipsel
-	bool "MIPS (little endian)"
-	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
-	  http://www.mips.com/
-	  http://en.wikipedia.org/wiki/MIPS_Technologies
-
-config BR2_mips64
-	bool "MIPS64 (big endian)"
-	select BR2_ARCH_IS_64
-	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
-	  http://www.mips.com/
-	  http://en.wikipedia.org/wiki/MIPS_Technologies
-
-config BR2_mips64el
-	bool "MIPS64 (little endian)"
-	select BR2_ARCH_IS_64
-	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
-	  http://www.mips.com/
-	  http://en.wikipedia.org/wiki/MIPS_Technologies
-
-config BR2_powerpc
-	bool "PowerPC"
-	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  http://www.power.org/
-	  http://en.wikipedia.org/wiki/Powerpc
-
-config BR2_sh
-	bool "SuperH"
-	help
-	  SuperH (or SH) is a 32-bit reduced instruction set computer (RISC)
-	  instruction set architecture (ISA) developed by Hitachi.
-	  http://www.hitachi.com/
-	  http://en.wikipedia.org/wiki/SuperH
-
-config BR2_sh64
-	bool "SuperH64"
-	help
-	  SuperH64 (or SH) is a 64-bit reduced instruction set computer (RISC)
-	  instruction set architecture (ISA) developed by Hitachi.
-	  http://www.hitachi.com/
-	  http://en.wikipedia.org/wiki/SuperH
-
-config BR2_sparc
-	bool "SPARC"
-	help
-	  SPARC (from Scalable Processor Architecture) is a RISC instruction
-	  set architecture (ISA) developed by Sun Microsystems.
-	  http://www.oracle.com/sun
-	  http://en.wikipedia.org/wiki/Sparc
-
-config BR2_x86_64
-	bool "x86_64"
-	select BR2_ARCH_IS_64
-	help
-	  x86-64 is an extension of the x86 instruction set (Intel i386
-	  architecture compatible microprocessor).
-	  http://en.wikipedia.org/wiki/X86_64
-
-endchoice
-
-config BR2_microblaze
-	bool
-	default y if BR2_microblazeel || BR2_microblazebe
-
-#
-# Keep the variants separate, there's no need to clutter everything else.
-# sh is fairly "special" in this regard, as virtually everyone else has
-# things kept down to a _sensible_ number of target variants. No such
-# luck for sh..
-#
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_arm || BR2_armeb
-	default BR2_generic_arm
-	help
-	  Specific CPU variant to use
-
-config BR2_generic_arm
-	bool "generic_arm"
-config BR2_arm7tdmi
-	bool "arm7tdmi"
-config BR2_arm610
-	bool "arm610"
-config BR2_arm710
-	bool "arm710"
-config BR2_arm720t
-	bool "arm720t"
-config BR2_arm920t
-	bool "arm920t"
-config BR2_arm922t
-	bool "arm922t"
-config BR2_arm926t
-	bool "arm926t"
-config BR2_arm10t
-	bool "arm10t"
-config BR2_arm1136jf_s
-	bool "arm1136jf_s"
-config BR2_arm1176jz_s
-	bool "arm1176jz-s"
-config BR2_arm1176jzf_s
-	bool "arm1176jzf-s"
-config BR2_cortex_a8
-	bool "cortex-A8"
-config BR2_cortex_a9
-	bool "cortex-A9"
-config BR2_sa110
-	bool "sa110"
-config BR2_sa1100
-	bool "sa1100"
-config BR2_xscale
-	bool "xscale"
-config BR2_iwmmxt
-	bool "iwmmxt"
-endchoice
-
-choice
-	prompt "Target ABI"
-	depends on BR2_arm || BR2_armeb
-	default BR2_ARM_EABI
-	help
-	  Application Binary Interface to use
-
-	  Note:
-	    Using OABI is discouraged.
-
-config BR2_ARM_EABI
-	bool "EABI"
-config BR2_ARM_OABI
-	bool "OABI"
-	depends on !BR2_GCC_VERSION_4_7_X
-endchoice
-
-choice
-	prompt "Target ABI"
-	depends on BR2_bfin
-	default BR2_BFIN_FDPIC
-config BR2_BFIN_FDPIC
-	bool "FDPIC"
-config BR2_BFIN_FLAT
-	bool "FLAT"
-	select BR2_PREFER_STATIC_LIB
-endchoice
-
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
-	default BR2_mips_3 if BR2_mips
-	default BR2_mips_1 if BR2_mipsel
-	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
-	help
-	  Specific CPU variant to use
-
-	  64bit cabable: 3, 4, 64, 64r2
-	  non-64bit capable: 1, 2, 32, 32r2
-
-config BR2_mips_1
-	bool "mips I (generic)"
-	depends on !BR2_ARCH_IS_64
-config BR2_mips_2
-	bool "mips II"
-	depends on !BR2_ARCH_IS_64
-config BR2_mips_3
-	bool "mips III"
-config BR2_mips_4
-	bool "mips IV"
-config BR2_mips_32
-	bool "mips 32"
-	depends on !BR2_ARCH_IS_64
-config BR2_mips_32r2
-	bool "mips 32r2"
-	depends on !BR2_ARCH_IS_64
-config BR2_mips_64
-	bool "mips 64"
-config BR2_mips_64r2
-	bool "mips 64r2"
-endchoice
-
-
-choice
-	prompt "Target ABI"
-	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
-	default BR2_MIPS_OABI32 if !BR2_ARCH_IS_64
-	default BR2_MIPS_NABI32 if BR2_ARCH_IS_64
-	help
-	  Application Binary Interface to use
-
-config BR2_MIPS_OABI32
-	bool "o32"
-config BR2_MIPS_NABI32
-	bool "n32"
-	depends on BR2_ARCH_IS_64
-config BR2_MIPS_NABI64
-	bool "n64"
-	depends on BR2_ARCH_IS_64
-endchoice
-
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_sh
-	default BR2_sh4
-	help
-	  Specific CPU variant to use
-
-config BR2_sh2
-	bool "sh2 (SH2 big endian)"
-config BR2_sh2a
-	bool "sh2a (SH2A big endian)"
-config BR2_sh3
-	bool "sh3 (SH3 little endian)"
-config BR2_sh3eb
-	bool "sh3eb (SH3 big endian)"
-config BR2_sh4
-	bool "sh4 (SH4 little endian)"
-config BR2_sh4eb
-	bool "sh4eb (SH4 big endian)"
-config BR2_sh4a
-	bool "sh4a (SH4A little endian)"
-config BR2_sh4aeb
-	bool "sh4aeb (SH4A big endian)"
-endchoice
-
-#
-# gcc builds libstdc++ differently depending on the
-# host tuplet given to it, so let people choose
-#
-
-# i386/x86_64 cpu features
-config BR2_X86_CPU_HAS_MMX
-	bool
-config BR2_X86_CPU_HAS_SSE
-	bool
-config BR2_X86_CPU_HAS_SSE2
-	bool
-config BR2_X86_CPU_HAS_SSE3
-	bool
-config BR2_X86_CPU_HAS_SSSE3
-	bool
-
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_i386 || BR2_x86_64
-	default BR2_x86_i586 if BR2_i386
-	default BR2_x86_generic if BR2_x86_64
-	help
-	  Specific CPU variant to use
-
-config BR2_x86_generic
-	bool "generic"
-config BR2_x86_i386
-	bool "i386"
-	depends on !BR2_x86_64
-config BR2_x86_i486
-	bool "i486"
-	depends on !BR2_x86_64
-config BR2_x86_i586
-	bool "i586"
-	depends on !BR2_x86_64
-config BR2_x86_i686
-	bool "i686"
-	depends on !BR2_x86_64
-config BR2_x86_pentiumpro
-	bool "pentium pro"
-	depends on !BR2_x86_64
-config BR2_x86_pentium_mmx
-	bool "pentium MMX"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_pentium_m
-	bool "pentium mobile"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
-config BR2_x86_pentium2
-	bool "pentium2"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_pentium3
-	bool "pentium3"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
-config BR2_x86_pentium4
-	bool "pentium4"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	depends on !BR2_x86_64
-config BR2_x86_prescott
-	bool "prescott"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	depends on !BR2_x86_64
-config BR2_x86_nocona
-	bool "nocona"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_core2
-	bool "core2"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-config BR2_x86_atom
-	bool "atom"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-config BR2_x86_k6
-	bool "k6"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_k6_2
-	bool "k6-2"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_athlon
-	bool "athlon"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_athlon_4
-	bool "athlon-4"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
-config BR2_x86_opteron
-	bool "opteron"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-config BR2_x86_opteron_sse3
-	bool "opteron w/ SSE3"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_barcelona
-	bool "barcelona"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_geode
-	bool "geode"
-	# Don't include MMX support because there several variant of geode
-	# processor, some with MMX support, some without.
-	# See: http://en.wikipedia.org/wiki/Geode_%28processor%29
-	depends on !BR2_x86_64
-config BR2_x86_c3
-	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_c32
-	bool "Via C3-2 (Nehemiah cores)"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
-config BR2_x86_winchip_c6
-	bool "IDT Winchip C6"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-config BR2_x86_winchip2
-	bool "IDT Winchip 2"
-	select BR2_X86_CPU_HAS_MMX
-	depends on !BR2_x86_64
-endchoice
-
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_sparc
-	default BR2_sparc_v7
-	help
-	  Specific CPU variant to use
-
-config BR2_sparc_v7
-	bool "v7"
-config BR2_sparc_cypress
-	bool "cypress"
-config BR2_sparc_v8
-	bool "v8"
-config BR2_sparc_sparchfleon
-	bool "hfleon"
-config BR2_sparc_sparchfleonv8
-	bool "hfleonv8"
-config BR2_sparc_sparcsfleon
-	bool "sfleon"
-config BR2_sparc_sparcsfleonv8
-	bool "sfleonv8"
-config BR2_sparc_supersparc
-	bool "supersparc"
-config BR2_sparc_sparclite
-	bool "sparclite"
-config BR2_sparc_f930
-	bool "f930"
-config BR2_sparc_f934
-	bool "f934"
-config BR2_sparc_hypersparc
-	bool "hypersparc"
-config BR2_sparc_sparclite86x
-	bool "sparclite86x"
-config BR2_sparc_sparclet
-	bool "sparclet"
-config BR2_sparc_tsc701
-	bool "tsc701"
-endchoice
-
-choice
-	prompt "Target Architecture Variant"
-	depends on BR2_powerpc
-	default BR2_generic_powerpc
-	help
-	  Specific CPU variant to use
-config BR2_generic_powerpc
-	bool "generic"
-config BR2_powerpc_401
-	bool "401"
-config BR2_powerpc_403
-	bool "403"
-config BR2_powerpc_405
-	bool "405"
-config BR2_powerpc_405fp
-	bool "405 with FPU"
-config BR2_powerpc_440
-	bool "440"
-config BR2_powerpc_440fp
-	bool "440 with FPU"
-config BR2_powerpc_505
-	bool "505"
-config BR2_powerpc_601
-	bool "601"
-config BR2_powerpc_602
-	bool "602"
-config BR2_powerpc_603
-	bool "603"
-config BR2_powerpc_603e
-	bool "603e"
-config BR2_powerpc_604
-	bool "604"
-config BR2_powerpc_604e
-	bool "604e"
-config BR2_powerpc_620
-	bool "620"
-config BR2_powerpc_630
-	bool "630"
-config BR2_powerpc_740
-	bool "740"
-config BR2_powerpc_7400
-	bool "7400"
-config BR2_powerpc_7450
-	bool "7450"
-config BR2_powerpc_750
-	bool "750"
-config BR2_powerpc_801
-	bool "801"
-config BR2_powerpc_821
-	bool "821"
-config BR2_powerpc_823
-	bool "823"
-config BR2_powerpc_860
-	bool "860"
-config BR2_powerpc_970
-	bool "970"
-config BR2_powerpc_8540
-	bool "8540 / e500v1"
-config BR2_powerpc_8548
-	bool "8548 / e500v2"
-config BR2_powerpc_e300c2
-	bool "e300c2"
-config BR2_powerpc_e300c3
-	bool "e300c3"
-config BR2_powerpc_e500mc
-	bool "e500mc"
-endchoice
-
-choice
-	prompt "Target ABI"
-	depends on BR2_powerpc
-	default BR2_powerpc_SPE if BR2_powerpc_8540 || BR2_powerpc_8548
-	default BR2_powerpc_CLASSIC
-	help
-	  Application Binary Interface to use
-
-config BR2_powerpc_CLASSIC
-	bool "Classic"
-	depends on !(BR2_powerpc_8540 || BR2_powerpc_8548)
-config BR2_powerpc_SPE
-	bool "SPE"
-	depends on BR2_powerpc_8540 || BR2_powerpc_8548
-endchoice
-
-config BR2_ARCH
-	string
-	default "arm"		if BR2_arm
-	default "armeb"		if BR2_armeb
-	default "aarch64"       if BR2_aarch64
-	default "avr32"		if BR2_avr32
-	default "bfin"		if BR2_bfin
-	default "i386"		if BR2_x86_i386
-	default "i486"		if BR2_x86_i486
-	default "i586"		if BR2_x86_i586
-	default "i586"		if BR2_x86_pentium_mmx
-	default "i586"		if BR2_x86_geode
-	default "i586"		if BR2_x86_c3
-	default "i686"		if BR2_x86_c32
-	default "i586"		if BR2_x86_winchip_c6
-	default "i586"		if BR2_x86_winchip2
-	default "i686"		if BR2_x86_i686
-	default "i686"		if BR2_x86_pentium2
-	default "i686"		if BR2_x86_pentium3
-	default "i686"		if BR2_x86_pentium4
-	default "i686"		if BR2_x86_pentium_m
-	default "i686"		if BR2_x86_pentiumpro
-	default "i686"		if BR2_x86_prescott
-	default "i686"		if BR2_x86_nocona && BR2_i386
-	default "i686"		if BR2_x86_core2 && BR2_i386
-	default "i686"		if BR2_x86_atom && BR2_i386
-	default "i686"		if BR2_x86_opteron && BR2_i386
-	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
-	default "i686"		if BR2_x86_barcelona && BR2_i386
-	default "i686"		if BR2_x86_k6
-	default "i686"		if BR2_x86_k6_2
-	default "i686"		if BR2_x86_athlon
-	default "i686"		if BR2_x86_athlon_4
-	default "x86_64"	if BR2_x86_64
-	default "m68k"		if BR2_m68k
-	default "microblaze"	if BR2_microblaze
-	default "mips"		if BR2_mips
-	default "mipsel"	if BR2_mipsel
-	default "mips64"	if BR2_mips64
-	default "mips64el"	if BR2_mips64el
-	default "powerpc"	if BR2_powerpc
-	default "sh2"		if BR2_sh2
-	default "sh2a"		if BR2_sh2a
-	default "sh3"		if BR2_sh3
-	default "sh3eb"		if BR2_sh3eb
-	default "sh4"		if BR2_sh4
-	default "sh4eb"		if BR2_sh4eb
-	default "sh4a"		if BR2_sh4a
-	default "sh4aeb"	if BR2_sh4aeb
-	default "sh64"		if BR2_sh64
-	default "sparc"		if BR2_sparc
-
-
-config BR2_ENDIAN
-	string
-	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || BR2_mips64el || \
-			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64 || \
-			    BR2_microblazeel
-	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || BR2_mips64 || \
-			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \
-			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc || \
-			    BR2_microblazebe
-
-config BR2_GCC_TARGET_TUNE
-	string
-	default i386		if BR2_x86_i386
-	default i486		if BR2_x86_i486
-	default i586		if BR2_x86_i586
-	default pentium-mmx	if BR2_x86_pentium_mmx
-	default i686		if BR2_x86_i686
-	default pentiumpro	if BR2_x86_pentiumpro
-	default pentium-m	if BR2_x86_pentium_m
-	default pentium2	if BR2_x86_pentium2
-	default pentium3	if BR2_x86_pentium3
-	default pentium4	if BR2_x86_pentium4
-	default prescott	if BR2_x86_prescott
-	default nocona		if BR2_x86_nocona
-	default core2		if BR2_x86_core2
-	default atom		if BR2_x86_atom
-	default k8		if BR2_x86_opteron
-	default k8-sse3		if BR2_x86_opteron_sse3
-	default barcelona	if BR2_x86_barcelona
-	default k6		if BR2_x86_k6
-	default k6-2		if BR2_x86_k6_2
-	default athlon		if BR2_x86_athlon
-	default athlon-4	if BR2_x86_athlon_4
-	default winchip-c6	if BR2_x86_winchip_c6
-	default winchip2	if BR2_x86_winchip2
-	default c3		if BR2_x86_c3
-	default c3-2		if BR2_x86_c32
-	default geode		if BR2_x86_geode
-	default generic		if BR2_x86_generic
-	default arm600		if BR2_arm600
-	default arm610		if BR2_arm610
-	default arm620		if BR2_arm620
-	default arm7tdmi	if BR2_arm7tdmi
-	default arm7tdmi	if BR2_arm720t
-	default arm7tdmi	if BR2_arm740t
-	default arm920		if BR2_arm920
-	default arm920t		if BR2_arm920t
-	default arm922t		if BR2_arm922t
-	default arm926ej-s	if BR2_arm926t
-	default arm1136j-s	if BR2_arm1136j_s
-	default arm1136jf-s	if BR2_arm1136jf_s
-	default arm1176jz-s	if BR2_arm1176jz_s
-	default arm1176jzf-s	if BR2_arm1176jzf_s
-	default cortex-a8	if BR2_cortex_a8
-	default cortex-a9	if BR2_cortex_a9
-	default strongarm110	if BR2_sa110
-	default strongarm1100	if BR2_sa1100
-	default xscale		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
-	default mips1		if BR2_mips_1
-	default mips2		if BR2_mips_2
-	default mips3		if BR2_mips_3
-	default mips4		if BR2_mips_4
-	default mips32		if BR2_mips_32
-	default mips32r2	if BR2_mips_32r2
-	default mips64		if BR2_mips_64
-	default mips64r2	if BR2_mips_64r2
-	default 401		if BR2_powerpc_401
-	default 403		if BR2_powerpc_403
-	default 405		if BR2_powerpc_405
-	default 405fp		if BR2_powerpc_405fp
-	default 440		if BR2_powerpc_440
-	default 440fp		if BR2_powerpc_440fp
-	default 505		if BR2_powerpc_505
-	default 601		if BR2_powerpc_601
-	default 602		if BR2_powerpc_602
-	default 603		if BR2_powerpc_603
-	default 603e		if BR2_powerpc_603e
-	default 604		if BR2_powerpc_604
-	default 604e		if BR2_powerpc_604e
-	default 620		if BR2_powerpc_620
-	default 630		if BR2_powerpc_630
-	default 740		if BR2_powerpc_740
-	default 7400		if BR2_powerpc_7400
-	default 7450		if BR2_powerpc_7450
-	default 750		if BR2_powerpc_750
-	default 801		if BR2_powerpc_801
-	default 821		if BR2_powerpc_821
-	default 823		if BR2_powerpc_823
-	default 860		if BR2_powerpc_860
-	default 970		if BR2_powerpc_970
-	default 8540		if BR2_powerpc_8540
-	default	8548		if BR2_powerpc_8548
-	default e300c2		if BR2_powerpc_e300c2
-	default e300c3		if BR2_powerpc_e300c3
-	default e500mc		if BR2_powerpc_e500mc
-	default v7		if BR2_sparc_v7
-	default cypress		if BR2_sparc_cypress
-	default v8		if BR2_sparc_v8
-	default supersparc	if BR2_sparc_supersparc
-	default hypersparc	if BR2_sparc_hypersparc
-	default sparclite	if BR2_sparc_sparclite
-	default f930		if BR2_sparc_f930
-	default f934		if BR2_sparc_f934
-	default sparclite86x	if BR2_sparc_sparclite86x
-	default sparclet	if BR2_sparc_sparclet
-	default tsc701		if BR2_sparc_tsc701
-	default v9		if BR2_sparc_v9
-	default v9		if BR2_sparc_v9a
-	default v9		if BR2_sparc_v9b
-	default ultrasparc	if BR2_sparc_ultrasparc
-	default ultrasparc3	if BR2_sparc_ultrasparc3
-	default niagara		if BR2_sparc_niagara
-
-config BR2_GCC_TARGET_ARCH
-	string
-	default i386		if BR2_x86_i386
-	default i486		if BR2_x86_i486
-	default i586		if BR2_x86_i586
-	default pentium-mmx	if BR2_x86_pentium_mmx
-	default i686		if BR2_x86_i686
-	default pentiumpro	if BR2_x86_pentiumpro
-	default pentium-m	if BR2_x86_pentium_m
-	default pentium2	if BR2_x86_pentium2
-	default pentium3	if BR2_x86_pentium3
-	default pentium4	if BR2_x86_pentium4
-	default prescott	if BR2_x86_prescott
-	default nocona		if BR2_x86_nocona
-	default core2		if BR2_x86_core2
-	default atom		if BR2_x86_atom
-	default k8		if BR2_x86_opteron
-	default k8-sse3		if BR2_x86_opteron_sse3
-	default barcelona	if BR2_x86_barcelona
-	default k6		if BR2_x86_k6
-	default k6-2		if BR2_x86_k6_2
-	default athlon		if BR2_x86_athlon
-	default athlon-4	if BR2_x86_athlon_4
-	default winchip-c6	if BR2_x86_winchip_c6
-	default winchip2	if BR2_x86_winchip2
-	default c3		if BR2_x86_c3
-	default c3-2		if BR2_x86_c32
-	default geode		if BR2_x86_geode
-	default armv4t		if BR2_arm7tdmi
-	default armv3		if BR2_arm610
-	default armv3		if BR2_arm710
-	default armv4t		if BR2_arm720t
-	default armv4t		if BR2_arm920t
-	default armv4t		if BR2_arm922t
-	default armv5te		if BR2_arm926t
-	default armv5t		if BR2_arm10t
-	default armv6j		if BR2_arm1136jf_s
-	default armv6zk		if BR2_arm1176jz_s
-	default armv6zk		if BR2_arm1176jzf_s
-	default armv7-a		if BR2_cortex_a8
-	default armv7-a		if BR2_cortex_a9
-	default armv4		if BR2_sa110
-	default armv4		if BR2_sa1100
-	default armv5te		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
-
-config BR2_GCC_TARGET_ABI
-	string
-	default apcs-gnu	if BR2_ARM_OABI
-	default aapcs-linux	if BR2_ARM_EABI
-	default 32		if BR2_MIPS_OABI32
-	default n32		if BR2_MIPS_NABI32
-	default 64		if BR2_MIPS_NABI64
-	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec
-	default no-altivec	if BR2_powerpc && BR2_PPC_ABI_no-altivec
-	default spe		if BR2_powerpc && BR2_PPC_ABI_spe
-	default no-spe		if BR2_powerpc && BR2_PPC_ABI_no-spe
-	default ibmlongdouble	if BR2_powerpc && BR2_PPC_ABI_ibmlongdouble
-	default ieeelongdouble	if BR2_powerpc && BR2_PPC_ABI_ieeelongdouble
-
-config BR2_GCC_TARGET_CPU
-	string
-	default sparchfleon	if BR2_sparc_sparchfleon
-	default sparchfleonv8	if BR2_sparc_sparchfleonv8
-	default sparcsfleon	if BR2_sparc_sparcsfleon
-	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8

From 9d8dd5ee62ed1b6fb04cbc51c0073b2e4815c205 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 4 Nov 2012 13:00:25 +0100
Subject: [PATCH 3143/6849] system: fixup default device table locations after
 system/ got added

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index c30c6f7d3c..10c9d9db31 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -71,7 +71,7 @@ endchoice
 
 config BR2_ROOTFS_DEVICE_TABLE
 	string "Path to the permission tables"
-	default "target/generic/device_table.txt"
+	default "system/device_table.txt"
 	help
 	  Specify a space-separated list of permission table locations,
 	  that will be passed to the makedevs utility to assign
@@ -83,7 +83,7 @@ config BR2_ROOTFS_DEVICE_TABLE
 
 config BR2_ROOTFS_STATIC_DEVICE_TABLE
 	string "Path to the device tables"
-	default "target/generic/device_table_dev.txt"
+	default "system/device_table_dev.txt"
 	depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
 	help
 	  Specify a space-separated list of device table locations,

From 19b18527d763e7ef19dec1ca749fdc43729bbfc0 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Sun, 4 Nov 2012 01:16:14 +0000
Subject: [PATCH 3144/6849] QT: Fix build for architectures using generic
 atomics

The problem has to do with const-correctness. This has been resolved
for various architectures, but not for the generic case.

Signed-off-by: Mischa Jonker <mischa.jonker@synopsys.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-fix-const-atomics.patch | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/qt/qt-fix-const-atomics.patch

diff --git a/package/qt/qt-fix-const-atomics.patch b/package/qt/qt-fix-const-atomics.patch
new file mode 100644
index 0000000000..64853565e8
--- /dev/null
+++ b/package/qt/qt-fix-const-atomics.patch
@@ -0,0 +1,50 @@
+From d4d07dac01796b2aa0fb501c14865cab7e42b3a9 Mon Sep 17 00:00:00 2001
+From: Mischa Jonker <mischa.jonker@synopsys.com>
+Date: Sun, 4 Nov 2012 11:42:04 +0100
+Subject: [PATCH] Fix const-related build error in generic atomic ops
+
+It's still not entirely const-correct though. In all other architectures
+this is obfuscated through the use of inline asm (which the compiler
+doesn't check). This patch obfuscates through const_cast
+---
+ src/corelib/arch/generic/qatomic_generic_unix.cpp |    8 ++++----
+ src/corelib/arch/qatomic_generic.h                |    2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
+index 1c6cbf0..6fce81d 100644
+--- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
++++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
+@@ -85,13 +85,13 @@ int QBasicAtomicInt_fetchAndAddOrdered(volatile int *_q_value, int valueToAdd)
+ 
+ Q_CORE_EXPORT
+ bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *_q_value,
+-                                           void *expectedValue,
+-                                           void *newValue)
++                                           const void *expectedValue,
++                                           const void *newValue)
+ {
+     bool returnValue = false;
+     pthread_mutex_lock(&qAtomicMutex);
+     if (*_q_value == expectedValue) {
+-        *_q_value = newValue;
++        *_q_value = const_cast<void*>(newValue);
+         returnValue = true;
+     }
+     pthread_mutex_unlock(&qAtomicMutex);
+diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h
+index 621a767..4c14679 100644
+--- a/src/corelib/arch/qatomic_generic.h
++++ b/src/corelib/arch/qatomic_generic.h
+@@ -105,7 +105,7 @@ Q_CORE_EXPORT bool QBasicAtomicInt_testAndSetOrdered(volatile int *, int, int);
+ Q_CORE_EXPORT int QBasicAtomicInt_fetchAndStoreOrdered(volatile int *, int);
+ Q_CORE_EXPORT int QBasicAtomicInt_fetchAndAddOrdered(volatile int *, int);
+ 
+-Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, void *, void *);
++Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, const void *, const void *);
+ Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *, void *);
+ Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *, qptrdiff);
+ 
+-- 
+1.7.0.4
+

From db961da67fcb59f4bb636150256ad05a0c6fbf2f Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Sat, 3 Nov 2012 06:52:16 +0000
Subject: [PATCH 3145/6849] legal-info: support per-package hooks

Useful to produce extra warnings for packages that have special
licensing-related issues.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 4 +++-
 package/pkg-generic.mk                  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index d3a4abb098..e1b46b03c7 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -349,7 +349,8 @@ of the package construction. The hooks are more useful for packages
 using the autotools infrastructure described below.  However, since
 they are provided by the generic infrastructure, they are documented
 here. The exception is +LIBFOO_POST_PATCH_HOOKS+.  Patching the
-package is not user definable, so +LIBFOO_POST_PATCH_HOOKS+ will be
+package and producing legal info are not user definable, so
++LIBFOO_POST_PATCH_HOOKS+ and +LIBFOO_POST_LEGAL_INFO_HOOKS+ will be
 userful for generic packages.
 
 The following hook points are available:
@@ -361,6 +362,7 @@ The following hook points are available:
 * +LIBFOO_POST_INSTALL_HOOKS+ (for host packages only)
 * +LIBFOO_POST_INSTALL_STAGING_HOOKS+ (for target packages only)
 * +LIBFOO_POST_INSTALL_TARGET_HOOKS+ (for target packages only)
+* +LIBFOO_POST_LEGAL_INFO_HOOKS+
 
 These variables are 'lists' of variable names containing actions to be
 performed at this hook point. This allows several hooks to be
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 270da60c62..9c87aecba9 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -316,6 +316,7 @@ $(2)_POST_INSTALL_HOOKS         ?=
 $(2)_POST_INSTALL_STAGING_HOOKS ?=
 $(2)_POST_INSTALL_TARGET_HOOKS  ?=
 $(2)_POST_INSTALL_IMAGES_HOOKS  ?=
+$(2)_POST_LEGAL_INFO_HOOKS      ?=
 
 # human-friendly targets and target sequencing
 $(1):			$(1)-install
@@ -488,6 +489,7 @@ endif
 endif
 	@$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL))
 endif # ifneq ($(call qstrip,$$($(2)_SOURCE)),)
+	$(foreach hook,$($(2)_POST_LEGAL_INFO_HOOKS),$(call $(hook))$(sep))
 
 # add package to the general list of targets if requested by the buildroot
 # configuration

From 3da67a081e55431f7b0cfae850a3f6851ff39409 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 4 Nov 2012 01:35:12 +0000
Subject: [PATCH 3146/6849] ulogd: fix build failure

Fix Peter's reported build failure:
http://autobuild.buildroot.net/results/1dcf63799937f2216e3c712af8880ad431dbd47c/build-end.log
This is because the configure script uses absolute paths to detect dbi,
mysql and pgsql, so forcibly disable them.
Also add the optional sqlite dependency when it's selected.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ulogd/ulogd.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
index 7d31b73ed7..4620bbd5af 100644
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -7,10 +7,11 @@
 ULOGD_VERSION = 2.0.1
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
+ULOGD_CONF_OPT = --with-dbi=no --with-mysql=no --with-pgsql=no
 ULOGD_AUTORECONF = YES
 ULOGD_DEPENDENCIES = host-pkgconf \
 	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
-	libnfnetlink
+	libnfnetlink $(if $(BR2_PACKAGE_SQLITE),sqlite)
 ULOGD_LICENSE = GPLv2
 ULOGD_LICENSE_FILES = COPYING
 

From c6917357ed6e7ce537f8277049a55440d5b4bb95 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 1 Nov 2012 23:25:40 +0000
Subject: [PATCH 3147/6849] legal-info: move $(2)_LICENSE to a proper line

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 9c87aecba9..d3a6db6096 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -268,14 +268,14 @@ ifndef $(2)_LICENSE
  endif
 endif
 
+$(2)_LICENSE			?= unknown
+
 ifndef $(2)_LICENSE_FILES
  ifdef $(3)_LICENSE_FILES
   $(2)_LICENSE_FILES = $($(3)_LICENSE_FILES)
  endif
 endif
 
-$(2)_LICENSE			?= unknown
-
 $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
 $(2)_INSTALL_STAGING		?= NO

From 7c992ac3410e6694d8697b770eb3b0463b80a0a4 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 2 Nov 2012 10:25:41 +0100
Subject: [PATCH 3148/6849] legal-info: split _LICENSE and _REDISTRIBUTE
 constants

Currently packages can be described in two ways: proprietary (tarball not
saved, license not described in further detail), and others (tarball
saved, license described).

Split the logic to allow the license to be always described whether or not
the source code can be redistributed.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index d3a6db6096..6fcd359ee4 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -276,6 +276,15 @@ ifndef $(2)_LICENSE_FILES
  endif
 endif
 
+ifndef $(2)_REDISTRIBUTE
+ ifdef $(3)_REDISTRIBUTE
+  $(2)_REDISTRIBUTE = $($(3)_REDISTRIBUTE)
+ endif
+endif
+
+$(2)_REDISTRIBUTE		?= YES
+
+
 $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
 
 $(2)_INSTALL_STAGING		?= NO
@@ -445,29 +454,27 @@ $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2)
 endif
 
 # legal-info: declare dependencies and set values used later for the manifest
-ifneq ($$($(2)_LICENSE),PROPRIETARY)
+ifneq ($$($(2)_LICENSE_FILES),)
+$(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES)
+endif
+$(2)_MANIFEST_LICENSE_FILES ?= not saved
+
+ifeq ($$($(2)_REDISTRIBUTE),YES)
 ifneq ($$($(2)_SITE_METHOD),local)
 ifneq ($$($(2)_SITE_METHOD),override)
 # Packages that have a tarball need it downloaded and extracted beforehand
 $(1)-legal-info: $(1)-extract $(REDIST_SOURCES_DIR)
 $(2)_MANIFEST_TARBALL = $$($(2)_SOURCE)
-ifneq ($$($(2)_LICENSE_FILES),)
-$(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES)
 endif
 endif
 endif
-endif
-# defaults for packages without tarball or license files
 $(2)_MANIFEST_TARBALL ?= not saved
-$(2)_MANIFEST_LICENSE_FILES ?= not saved
 
 # legal-info: produce legally relevant info.
 $(1)-legal-info:
 # Packages without a source are assumed to be part of Buildroot, skip them.
 ifneq ($(call qstrip,$$($(2)_SOURCE)),)
-ifeq ($$($(2)_LICENSE),PROPRIETARY)
-# Proprietary packages: nothing to save
-else ifeq ($$($(2)_SITE_METHOD),local)
+ifeq ($$($(2)_SITE_METHOD),local)
 # Packages without a tarball: don't save and warn
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
 else ifeq ($$($(2)_SITE_METHOD),override)
@@ -483,9 +490,11 @@ else
 		$(call legal-license-file,$$($(2)_RAWNAME),$$$${F},$$($(2)_DIR)/$$$${F}); \
 		done
 endif
+ifeq ($$($(2)_REDISTRIBUTE),YES)
 # Copy the source tarball (just hardlink if possible)
 	@cp -l $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR) 2>/dev/null || \
 	   cp $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR)
+endif
 endif
 	@$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL))
 endif # ifneq ($(call qstrip,$$($(2)_SOURCE)),)

From 9b809e1a6ad2a82bfe0d2383f69f45ae8c6283bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Nov 2012 08:23:06 +0100
Subject: [PATCH 3149/6849] package: drop games/ subdir

As discussed during the dev day.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                         | 8 ++++----
 package/{games => }/doom-wad/Config.in                    | 0
 package/{games => }/doom-wad/doom-wad.mk                  | 0
 package/games/games.mk                                    | 1 -
 package/{games => }/gnuchess/Config.in                    | 0
 .../gnuchess/gnuchess-5.07-getline-conflicts.patch        | 0
 package/{games => }/gnuchess/gnuchess-5.07.patch          | 0
 package/{games => }/gnuchess/gnuchess.mk                  | 0
 package/{games => }/prboom/Config.in                      | 0
 package/{games => }/prboom/prboom-2.5.0-libpng-1.4.patch  | 0
 package/{games => }/prboom/prboom.mk                      | 0
 package/{games => }/rubix/Config.in                       | 0
 .../rubix/rubix-1.0.5-dont-use-legacy-functions.patch     | 0
 package/{games => }/rubix/rubix-1.0.5.patch               | 0
 package/{games => }/rubix/rubix.mk                        | 0
 15 files changed, 4 insertions(+), 5 deletions(-)
 rename package/{games => }/doom-wad/Config.in (100%)
 rename package/{games => }/doom-wad/doom-wad.mk (100%)
 delete mode 100644 package/games/games.mk
 rename package/{games => }/gnuchess/Config.in (100%)
 rename package/{games => }/gnuchess/gnuchess-5.07-getline-conflicts.patch (100%)
 rename package/{games => }/gnuchess/gnuchess-5.07.patch (100%)
 rename package/{games => }/gnuchess/gnuchess.mk (100%)
 rename package/{games => }/prboom/Config.in (100%)
 rename package/{games => }/prboom/prboom-2.5.0-libpng-1.4.patch (100%)
 rename package/{games => }/prboom/prboom.mk (100%)
 rename package/{games => }/rubix/Config.in (100%)
 rename package/{games => }/rubix/rubix-1.0.5-dont-use-legacy-functions.patch (100%)
 rename package/{games => }/rubix/rubix-1.0.5.patch (100%)
 rename package/{games => }/rubix/rubix.mk (100%)

diff --git a/package/Config.in b/package/Config.in
index 6125abcb82..1df099b182 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -97,10 +97,10 @@ source "package/yasm/Config.in"
 endmenu
 
 menu "Games"
-source "package/games/gnuchess/Config.in"
-source "package/games/prboom/Config.in"
-source "package/games/doom-wad/Config.in"
-source "package/games/rubix/Config.in"
+source "package/gnuchess/Config.in"
+source "package/prboom/Config.in"
+source "package/doom-wad/Config.in"
+source "package/rubix/Config.in"
 endmenu
 
 menu "Graphic libraries and applications (graphic/text)"
diff --git a/package/games/doom-wad/Config.in b/package/doom-wad/Config.in
similarity index 100%
rename from package/games/doom-wad/Config.in
rename to package/doom-wad/Config.in
diff --git a/package/games/doom-wad/doom-wad.mk b/package/doom-wad/doom-wad.mk
similarity index 100%
rename from package/games/doom-wad/doom-wad.mk
rename to package/doom-wad/doom-wad.mk
diff --git a/package/games/games.mk b/package/games/games.mk
deleted file mode 100644
index 5813b441a3..0000000000
--- a/package/games/games.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/games/*/*.mk
diff --git a/package/games/gnuchess/Config.in b/package/gnuchess/Config.in
similarity index 100%
rename from package/games/gnuchess/Config.in
rename to package/gnuchess/Config.in
diff --git a/package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch b/package/gnuchess/gnuchess-5.07-getline-conflicts.patch
similarity index 100%
rename from package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch
rename to package/gnuchess/gnuchess-5.07-getline-conflicts.patch
diff --git a/package/games/gnuchess/gnuchess-5.07.patch b/package/gnuchess/gnuchess-5.07.patch
similarity index 100%
rename from package/games/gnuchess/gnuchess-5.07.patch
rename to package/gnuchess/gnuchess-5.07.patch
diff --git a/package/games/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
similarity index 100%
rename from package/games/gnuchess/gnuchess.mk
rename to package/gnuchess/gnuchess.mk
diff --git a/package/games/prboom/Config.in b/package/prboom/Config.in
similarity index 100%
rename from package/games/prboom/Config.in
rename to package/prboom/Config.in
diff --git a/package/games/prboom/prboom-2.5.0-libpng-1.4.patch b/package/prboom/prboom-2.5.0-libpng-1.4.patch
similarity index 100%
rename from package/games/prboom/prboom-2.5.0-libpng-1.4.patch
rename to package/prboom/prboom-2.5.0-libpng-1.4.patch
diff --git a/package/games/prboom/prboom.mk b/package/prboom/prboom.mk
similarity index 100%
rename from package/games/prboom/prboom.mk
rename to package/prboom/prboom.mk
diff --git a/package/games/rubix/Config.in b/package/rubix/Config.in
similarity index 100%
rename from package/games/rubix/Config.in
rename to package/rubix/Config.in
diff --git a/package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch b/package/rubix/rubix-1.0.5-dont-use-legacy-functions.patch
similarity index 100%
rename from package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch
rename to package/rubix/rubix-1.0.5-dont-use-legacy-functions.patch
diff --git a/package/games/rubix/rubix-1.0.5.patch b/package/rubix/rubix-1.0.5.patch
similarity index 100%
rename from package/games/rubix/rubix-1.0.5.patch
rename to package/rubix/rubix-1.0.5.patch
diff --git a/package/games/rubix/rubix.mk b/package/rubix/rubix.mk
similarity index 100%
rename from package/games/rubix/rubix.mk
rename to package/rubix/rubix.mk

From 9874442ee2492944fd78305dd96cd25a63fa1fbe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 06:35:24 +0000
Subject: [PATCH 3150/6849] qemu: needs pkg-config

Fixes

  http://autobuild.buildroot.org/results/ccb7d6da503a81015275ff1e4ba9a564203932ec/build-end.log

Even though the build failure happens on host-qemu, adding
host-pkgconf to QEMU_DEPENDENCIES seems like the right thing to do
since that this dependency will also be needed for the target qemu
once it gets included.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index de72e045b6..c2c4103f62 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -8,6 +8,8 @@ QEMU_VERSION = 1.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 
+QEMU_DEPENDENCIES = host-pkgconf
+
 #       BR ARCH         qemu
 #       -------         ----
 #       arm             arm
@@ -53,7 +55,7 @@ endif
 HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
 
 define HOST_QEMU_CONFIGURE_CMDS
-	(cd $(@D); ./configure                          \
+	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
 		--target-list="$(HOST_QEMU_TARGETS)"    \
 		--prefix="$(HOST_DIR)/usr"              \
 		--interp-prefix=$(STAGING_DIR)          \

From 21df600169d19385d99233160326d5b40db7f0ce Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 06:35:25 +0000
Subject: [PATCH 3151/6849] qemu: needs zlib

Build error message is:
  Error: zlib check failed
  Make sure to have the zlib libs and headers installed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index c2c4103f62..67d5ab25e3 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -8,7 +8,7 @@ QEMU_VERSION = 1.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 
-QEMU_DEPENDENCIES = host-pkgconf
+QEMU_DEPENDENCIES = host-pkgconf zlib
 
 #       BR ARCH         qemu
 #       -------         ----

From f55cad368981f5dbeab98e225ed770b57417a709 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 06:35:26 +0000
Subject: [PATCH 3152/6849] qemu: needs libglib2

Build error message is:
  glib-2.12 required to compile QEMU

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 67d5ab25e3..d40d7c9f6d 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -8,7 +8,7 @@ QEMU_VERSION = 1.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 
-QEMU_DEPENDENCIES = host-pkgconf zlib
+QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
 
 #       BR ARCH         qemu
 #       -------         ----

From c65d92e8e2767b09aaee6b717cbd9b66f88ea39c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Nov 2012 09:07:26 +0100
Subject: [PATCH 3153/6849] auto{conf,make}: only make available on archs
 supported by qemu

Now that we're using full perl (which needs qemu), only make auto{conf,make}
available on the supported archs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/Config.in | 4 ++++
 package/automake/Config.in | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
index 5f2f148928..c304572ae0 100644
--- a/package/autoconf/Config.in
+++ b/package/autoconf/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf"
+	depends on !(BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64)
 	select BR2_PACKAGE_PERL
 	help
 	  Extensible program for developing configure scripts.  These
 	  scripts handle all the mundane system/feature detection.
 
 	  http://www.gnu.org/software/autoconf/
+
+comment "autoconf requires an architecture supported by qemu"
+	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/automake/Config.in b/package/automake/Config.in
index 9a9673a6e8..f8d74ef739 100644
--- a/package/automake/Config.in
+++ b/package/automake/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake"
+	depends on !(BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64)
 	select BR2_PACKAGE_AUTOCONF
 	select BR2_PACKAGE_PERL
 	help
@@ -7,3 +8,6 @@ config BR2_PACKAGE_AUTOMAKE
 	  configure scripts (made by autoconf).
 
 	  http://www.gnu.org/software/automake/
+
+comment "automake requires an architecture supported by qemu"
+	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64

From f54752b67306a0b2648379db2102b1ea297ba448 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Sun, 4 Nov 2012 07:37:37 +0000
Subject: [PATCH 3154/6849] pkg-stats: fix the broken "results" link

At the top of the output html page there is a dangling "results" link.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 9c8ec492c1..929b8d1eaa 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -227,6 +227,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 done
 echo "</table>"
 
+echo "<a id="results"></a>"
 echo "<table>"
 echo "<tr>"
 echo "<td>Packages using the <i>generic</i> infrastructure</td>"

From 78f136ad8b2af5a4c654b6900dc7b1dadbd6b3c5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:09 +0000
Subject: [PATCH 3155/6849] toolchain-external: ARM 2012.03 has RPC support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4f6934e2a3..ad72de030e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -92,6 +92,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from

From 6dc861f2a2b413a50630ee762a81830df670f227 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:10 +0000
Subject: [PATCH 3156/6849] libtirpc: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libtirpc/Config.in                    |  7 ++
 ...parts-of-TIRPC-requiring-NIS-support.patch | 70 +++++++++++++++++++
 ...PC-support-does-not-install-rpcent.h.patch | 26 +++++++
 ...c-0003-Add-missing-INET6-conditional.patch | 60 ++++++++++++++++
 ...irpc-0004-Make-IPv6-support-optional.patch | 43 ++++++++++++
 package/libtirpc/libtirpc.mk                  | 24 +++++++
 7 files changed, 231 insertions(+)
 create mode 100644 package/libtirpc/Config.in
 create mode 100644 package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
 create mode 100644 package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
 create mode 100644 package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch
 create mode 100644 package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch
 create mode 100644 package/libtirpc/libtirpc.mk

diff --git a/package/Config.in b/package/Config.in
index 1df099b182..e7e7353208 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -468,6 +468,7 @@ source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
 source "package/librsync/Config.in"
 source "package/libsoup/Config.in"
+source "package/libtirpc/Config.in"
 source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
new file mode 100644
index 0000000000..7e891b494f
--- /dev/null
+++ b/package/libtirpc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBTIRPC
+	bool "libtirpc"
+	help
+	  Libtirpc is a port of Sun's Transport-Independent RPC
+	  library to Linux.
+
+	  http://sourceforge.net/projects/libtirpc/
diff --git a/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
new file mode 100644
index 0000000000..bdbe0213e0
--- /dev/null
+++ b/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
@@ -0,0 +1,70 @@
+From f4c022c526ce061dfdd3c46f544a9495a3a3a97e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 23 Jun 2012 21:57:39 +0200
+Subject: [PATCH 1/4] Disable parts of TIRPC requiring NIS support
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/Makefile.am  |    3 +--
+ src/rpc_soc.c    |    2 ++
+ tirpc/rpc/auth.h |    3 +++
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7ee8cbc..6d36b93 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,8 +49,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
+         pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
+         rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
+         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
+-        svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+-        auth_time.c auth_des.c authdes_prot.c des_crypt.c
++        svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c
+ 
+ ## XDR
+ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
+diff --git a/src/rpc_soc.c b/src/rpc_soc.c
+index c678429..27f2136 100644
+--- a/src/rpc_soc.c
++++ b/src/rpc_soc.c
+@@ -515,6 +515,7 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
+ 	    (resultproc_t) rpc_wrap_bcast, "udp");
+ }
+ 
++#if 0
+ /*
+  * Create the client des authentication object. Obsoleted by
+  * authdes_seccreate().
+@@ -546,6 +547,7 @@ fallback:
+ 	dummy = authdes_seccreate(servername, window, NULL, ckey);
+ 	return (dummy);
+ }
++#endif
+ 
+ /*
+  * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
+diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
+index 734e6b9..6e7e54e 100644
+--- a/tirpc/rpc/auth.h
++++ b/tirpc/rpc/auth.h
+@@ -282,6 +282,8 @@ extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);
+ extern AUTH *authunix_create_default(void);	/* takes no parameters */
+ extern AUTH *authnone_create(void);		/* takes no parameters */
+ __END_DECLS
++
++#if 0
+ /*
+  * DES style authentication
+  * AUTH *authsecdes_create(servername, window, timehost, ckey)
+@@ -295,6 +297,7 @@ extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);
+ extern AUTH *authdes_seccreate (const char *, const u_int, const  char *,
+     const  des_block *);
+ __END_DECLS
++#endif
+ 
+ __BEGIN_DECLS
+ extern bool_t xdr_opaque_auth		(XDR *, struct opaque_auth *);
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
new file mode 100644
index 0000000000..0798c34967
--- /dev/null
+++ b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
@@ -0,0 +1,26 @@
+From c91721dc289397dfe38fdae175f4ee37e824667c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 23 Jun 2012 21:58:07 +0200
+Subject: [PATCH 2/4] uClibc without RPC support does not install rpcent.h
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ tirpc/rpc/rpcent.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 7fd93d9..df1f5ed 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -47,7 +47,7 @@
+ __BEGIN_DECLS
+ 
+ /* These are defined in /usr/include/rpc/netdb.h */
+-#if 0
++#if __UCLIBC__
+ struct rpcent {
+ 	char	*r_name;	/* name of server for this rpc program */
+ 	char	**r_aliases;	/* alias list */
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch b/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch
new file mode 100644
index 0000000000..64d3da8d9f
--- /dev/null
+++ b/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch
@@ -0,0 +1,60 @@
+From a4852bd653ac917165de1d41b60168cd88dc6672 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 23 Jun 2012 21:58:36 +0200
+Subject: [PATCH 3/4] Add missing INET6 conditional
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/rpc_generic.c |    2 ++
+ src/svc_dg.c      |    4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/rpc_generic.c b/src/rpc_generic.c
+index 509fb36..2eb91ad 100644
+--- a/src/rpc_generic.c
++++ b/src/rpc_generic.c
+@@ -535,7 +535,9 @@ __rpc_nconf2fd_flags(const struct netconfig *nconf, int flags)
+ 	    si.si_af == AF_INET6) {
+ 		int val = 1;
+ 
++#ifdef INET6
+ 		setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val, sizeof(val));
++#endif
+ 	}
+ 	return fd;
+ }
+diff --git a/src/svc_dg.c b/src/svc_dg.c
+index 66a56ee..e8faf33 100644
+--- a/src/svc_dg.c
++++ b/src/svc_dg.c
+@@ -627,9 +627,11 @@ svc_dg_enable_pktinfo(int fd, const struct __rpc_sockinfo *si)
+ 		(void) setsockopt(fd, SOL_IP, IP_PKTINFO, &val, sizeof(val));
+ 		break;
+ 
++#ifdef INET6
+ 	case AF_INET6:
+ 		(void) setsockopt(fd, SOL_IPV6, IPV6_PKTINFO, &val, sizeof(val));
+ 		break;
++#endif
+ 	}
+ }
+ 
+@@ -667,6 +669,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg)
+ 		}
+ 		break;
+ 
++#ifdef INET6
+ 	case AF_INET6:
+ 		if (cmsg->cmsg_level != SOL_IPV6
+ 		 || cmsg->cmsg_type != IPV6_PKTINFO
+@@ -679,6 +682,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg)
+ 			pkti->ipi6_ifindex = 0;
+ 		}
+ 		break;
++#endif
+ 
+ 	default:
+ 		return 0;
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch b/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch
new file mode 100644
index 0000000000..455ad7463e
--- /dev/null
+++ b/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch
@@ -0,0 +1,43 @@
+From 1f36736733eac5080f3a4f3abd1c3a04ac42f1dd Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 24 Jun 2012 21:40:21 +0200
+Subject: [PATCH 4/4] Make IPv6 support optional
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac    |    5 +++++
+ src/Makefile.am |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 97c6f2c..487ec83 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,6 +22,11 @@ AC_PROG_LIBTOOL
+ AC_HEADER_DIRENT
+ AC_PREFIX_DEFAULT(/usr)
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
++
++AC_CHECK_HEADER(netinet/ip6.h,
++	AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]),
++	[AC_MSG_WARN([no IPv6])])
++
+ AC_CHECK_LIB([pthread], [pthread_create])
+ 
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6d36b93..6dc259e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ ## anything like that.
+ 
+ 
+-INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
++INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DVERSION="\"$(VERSION)\"" \
+ 		-D_GNU_SOURCE -Wall -pipe  
+ 
+ lib_LTLIBRARIES = libtirpc.la
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
new file mode 100644
index 0000000000..02edbe25c6
--- /dev/null
+++ b/package/libtirpc/libtirpc.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# libtirpc
+#
+#############################################################
+
+LIBTIRPC_VERSION = 0.2.2
+LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
+LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION)
+LIBTIRPC_LICENSE = BSD-3c
+LIBTIRPC_LICENSE_FILES = COPYING
+
+LIBTIRPC_INSTALL_STAGING = YES
+LIBTIRPC_AUTORECONF = YES
+
+# We need host-pkgconf because the configure.ac contains a
+# PKG_CHECK_MODULES macro call, and since we're autoreconfiguring this
+# package, we need the source for this PKG_CHECK_MODULES macro, which
+# comes from host-pkgconf. Other than that, pkgconf is only used to
+# find if there is a gss implementation somewhere, which we don't
+# support in Buildroot yet.
+LIBTIRPC_DEPENDENCIES = host-pkgconf
+
+$(eval $(autotools-package))

From f1e4feed13e050de408dd78e32cf5772bd6343d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 6 Nov 2012 08:18:59 +0100
Subject: [PATCH 3157/6849] libtirpc: ensure getrpcby{number,name} are provided

Needed by E.G. xinetd.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtirpc/libtirpc.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
index 02edbe25c6..5b3c728bb9 100644
--- a/package/libtirpc/libtirpc.mk
+++ b/package/libtirpc/libtirpc.mk
@@ -13,6 +13,9 @@ LIBTIRPC_LICENSE_FILES = COPYING
 LIBTIRPC_INSTALL_STAGING = YES
 LIBTIRPC_AUTORECONF = YES
 
+# getrpcby{number,name} are only provided if 'GQ' is defined
+LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ"
+
 # We need host-pkgconf because the configure.ac contains a
 # PKG_CHECK_MODULES macro call, and since we're autoreconfiguring this
 # package, we need the source for this PKG_CHECK_MODULES macro, which

From 7266e7630d4785e6228fdc981e2ce560291d085d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:11 +0000
Subject: [PATCH 3158/6849] busybox: add support to link against libtirpc when
 available

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 2fa1aa53b3..549e150be0 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -15,14 +15,29 @@ BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_LICENSE = GPLv2
 BUSYBOX_LICENSE_FILES = LICENSE
 
+BUSYBOX_CFLAGS = \
+	$(TARGET_CFLAGS) \
+	-I$(LINUX_HEADERS_DIR)/include
+
+BUSYBOX_LDFLAGS = \
+	$(TARGET_LDFLAGS)
+
+# Link against libtirpc if available so that we can leverage its RPC
+# support for NFS mounting with Busybox
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+BUSYBOX_DEPENDENCIES += libtirpc
+BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+BUSYBOX_LDFLAGS += -ltirpc
+endif
+
 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
 # Allows the build system to tweak CFLAGS
-BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include"
+BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(BUSYBOX_CFLAGS)"
 BUSYBOX_MAKE_OPTS = \
 	CC="$(TARGET_CC)" \
 	ARCH=$(KERNEL_ARCH) \
 	PREFIX="$(TARGET_DIR)" \
-	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+	EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	CONFIG_PREFIX="$(TARGET_DIR)" \
 	SKIP_STRIP=y

From 80f7a4b6797d11fbf3808a8af8b5e5f58048f117 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:12 +0000
Subject: [PATCH 3159/6849] lmbench: add support to use libtirpc when available

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lmbench/Config.in  |  6 +-----
 package/lmbench/lmbench.mk | 11 ++++++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index 70449b63b2..d710e1ffff 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_LMBENCH
 	bool "lmbench"
-	# Uses pmap_set, pmap__unset, pmap_getport, etc.
-	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  LMbench is a suite of simple, portable,
 	  ANSI/C microbenchmarks for UNIX/POSIX.
 
 	  http://sourceforge.net/projects/lmbench/
-
-comment "lmbench requires a toolchain with RPC support"
-	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index d3d0f8f779..1932adbfb3 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -9,6 +9,15 @@ LMBENCH_SITE:=http://downloads.sourceforge.net/project/lmbench/development/lmben
 LMBENCH_LICENSE =  lmbench license (based on GPLv2)
 LMBENCH_LICENSE_FILES = COPYING COPYING-2
 
+LMBENCH_CFLAGS = $(TARGET_CFLAGS)
+LMBENCH_LDLIBS = $(TARGET_LDFLAGS)
+
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+LMBENCH_DEPENDENCIES += libtirpc
+LMBENCH_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+LMBENCH_LDFLAGS += -ltirpc
+endif
+
 define LMBENCH_CONFIGURE_CMDS
 	$(call CONFIG_UPDATE,$(@D))
 	sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile
@@ -18,7 +27,7 @@ define LMBENCH_CONFIGURE_CMDS
 endef
 
 define LMBENCH_BUILD_CMDS
-	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src
+	$(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDFLAGS="$(LMBENCH_LDFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src
 endef
 
 define LMBENCH_INSTALL_TARGET_CMDS

From 2fb1a48ad80a765a1f46e183d3ecf742adfbfca9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:13 +0000
Subject: [PATCH 3160/6849] nfs-utils: add support to use RPC support from
 libtirpc

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nfs-utils/Config.in    | 7 +++----
 package/nfs-utils/nfs-utils.mk | 8 +++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index c87502f974..fa35f35e65 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_NFS_UTILS
 	bool "nfs-utils"
-	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_LARGEFILE
-	select BR2_PACKAGE_PORTMAP
 	help
 	  The NFS Linux kernel server.
 	  Warning: We do not force largefile support on here on purpose.
@@ -10,8 +9,8 @@ config BR2_PACKAGE_NFS_UTILS
 
 	  http://sourceforge.net/projects/nfs
 
-comment "nfs-utils requires a toolchain with RPC and LARGEFILE support"
-	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_LARGEFILE
+comment "nfs-utils requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
 
 menu "NFS utilities selection"
 	depends on BR2_PACKAGE_NFS_UTILS
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 41a0e05c2c..e59619f7c9 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -16,7 +16,6 @@ NFS_UTILS_CONF_OPT = \
 		--disable-nfsv4 \
 		--disable-nfsv41 \
 		--disable-gss \
-		--disable-tirpc \
 		--disable-uuid \
 		--disable-ipv6 \
 		--without-tcp-wrappers \
@@ -26,6 +25,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
 
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+NFS_UTILS_CONF_OPT += --enable-tirpc --with-tirpcinclude=$(STAGING_DIR)/usr/include/tirpc/
+NFS_UTILS_DEPENDENCIES += libtirpc
+else
+NFS_UTILS_CONF_OPT += --disable-tirpc
+endif
+
 define NFS_UTILS_INSTALL_FIXUP
 	$(INSTALL) -m 0755 package/nfs-utils/S60nfs \
 		$(TARGET_DIR)/etc/init.d/S60nfs

From 8bc245da2107d4cbd51ae86f90a6e6d5a1f151d8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:14 +0000
Subject: [PATCH 3161/6849] rpcbind: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/rpcbind/Config.in                     |  8 ++++
 .../rpcbind/rpcbind-01-no-yp-support.patch    | 46 +++++++++++++++++++
 package/rpcbind/rpcbind.mk                    | 17 +++++++
 4 files changed, 72 insertions(+)
 create mode 100644 package/rpcbind/Config.in
 create mode 100644 package/rpcbind/rpcbind-01-no-yp-support.patch
 create mode 100644 package/rpcbind/rpcbind.mk

diff --git a/package/Config.in b/package/Config.in
index e7e7353208..e531c417d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -627,6 +627,7 @@ source "package/proftpd/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
+source "package/rpcbind/Config.in"
 source "package/rsh-redone/Config.in"
 source "package/rsync/Config.in"
 source "package/rtorrent/Config.in"
diff --git a/package/rpcbind/Config.in b/package/rpcbind/Config.in
new file mode 100644
index 0000000000..1bdcd9ed4f
--- /dev/null
+++ b/package/rpcbind/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_RPCBIND
+	bool "rpcbind"
+	# We really need libtirpc and can't work with the native RPC
+	# implementation of toolchains.
+	select BR2_PACKAGE_LIBTIRPC
+	help
+	  The rpcbind utility is a server that converts RPC program numbers
+	  into universal addresses.
diff --git a/package/rpcbind/rpcbind-01-no-yp-support.patch b/package/rpcbind/rpcbind-01-no-yp-support.patch
new file mode 100644
index 0000000000..e9e6c9d767
--- /dev/null
+++ b/package/rpcbind/rpcbind-01-no-yp-support.patch
@@ -0,0 +1,46 @@
+Remove yellow pages support
+
+This support requires yellow pages support in libtirpc, which isn't
+available. As most Buildroot users are most likely never going to need
+such feature, get rid of it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Index: b/src/security.c
+===================================================================
+--- a/src/security.c
++++ b/src/security.c
+@@ -23,9 +23,6 @@
+ #include <rpcsvc/mount.h>
+ #include <rpcsvc/rquota.h>
+ #include <rpcsvc/nfs_prot.h>
+-#include <rpcsvc/yp.h>
+-#include <rpcsvc/ypclnt.h>
+-#include <rpcsvc/yppasswd.h>
+ 
+ #include "rpcbind.h"
+ 
+@@ -322,24 +319,9 @@
+ 		    args->rmt_proc != MOUNTPROC_UMNT)
+ 			break;
+ 		goto deny;
+-	case YPBINDPROG:
+-		if (args->rmt_proc != YPBINDPROC_SETDOM)
+-			break;
+-		/* FALLTHROUGH */
+-	case YPPASSWDPROG:
+ 	case NFS_PROGRAM:
+ 	case RQUOTAPROG:
+ 		goto deny;
+-	case YPPROG:
+-		switch (args->rmt_proc) {
+-		case YPPROC_ALL:
+-		case YPPROC_MATCH:
+-		case YPPROC_FIRST:
+-		case YPPROC_NEXT:
+-			goto deny;
+-		default:
+-			break;
+-		}
+ 	default:
+ 		break;
+ 	}
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
new file mode 100644
index 0000000000..d9a80dea9b
--- /dev/null
+++ b/package/rpcbind/rpcbind.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# rpcbind
+#
+#############################################################
+
+RPCBIND_VERSION = 0.2.0
+RPCBIND_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
+RPCBIND_SOURCE  = rpcbind-$(RPCBIND_VERSION).tar.bz2
+RPCBIND_LICENSE = BSD-3c
+RPCBIND_LICENSE_FILES = COPYING
+
+RPCBIND_CONF_ENV += \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
+RPCBIND_DEPENDENCIES += libtirpc
+
+$(eval $(autotools-package))

From c78ccd3b96d6834ee9abc61a93d9ae5a529dafc7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:15 +0000
Subject: [PATCH 3162/6849] portmap: mention that rpcbind is the project that
 superseds portmap

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/portmap/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index f017cb6081..8d25e3a2a7 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_PORTMAP
 	help
 	  The standard portmapper for RPC services.
 
+	  Note that portmap is being deprecated in favour of rpcbind.
+
 	  http://neil.brown.name/portmap/
 
 comment "portmap requires a toolchain with RPC support"

From c5fc090f562af3a6afe8f83070abb74bb27a3d84 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:16 +0000
Subject: [PATCH 3163/6849] quota: add support to use RPC support from libtirpc

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quota/Config.in |  6 +++---
 package/quota/quota.mk  | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package/quota/Config.in b/package/quota/Config.in
index a26f91fc7d..f7d0fe921b 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_QUOTA
 	bool "quota"
-	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_MOUNT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Implementation of the disk quota system.
 
 	  http://sourceforge.net/projects/linuxquota/
 
-comment "quota requires a toolchain with RPC + LARGEFILE + WCHAR support"
-	depends on !(BR2_TOOLCHAIN_HAS_NATIVE_RPC && BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "quota requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index abe3675207..7019059643 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -8,13 +8,22 @@ QUOTA_VERSION = 4.00
 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
 
-QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+QUOTA_CFLAGS = $(TARGET_CFLAGS)
+QUOTA_LDFLAGS = $(TARGET_LDFLAGS)
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 QUOTA_DEPENDENCIES = gettext
-QUOTA_MAKE_OPT += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+QUOTA_LDFLAGS += -lintl
 endif
 
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+QUOTA_DEPENDENCIES += libtirpc
+QUOTA_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+QUOTA_LDFLAGS += -ltirpc
+endif
+
+QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+
 # Package uses autoconf but not automake.
 QUOTA_INSTALL_TARGET_OPT = \
 	ROOTDIR=$(TARGET_DIR) \

From f2b3a19896b83da34e5ee8a30572dc846141f0cb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:17 +0000
Subject: [PATCH 3164/6849] samba: unconditionally enable --with-sys-quotas

Contrary to what was written in samba.mk, the sys-quotas option
apparently does not depend on RPC support in the toolchain: Samba
builds perfectly fine on an uClibc toolchain without RPC support with
sys-quotas enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index dec60d0dc4..4f8791767b 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -51,7 +51,7 @@ SAMBA_CONF_OPT = \
 	\
 	--without-cluster-support \
 	--without-dnsupdate \
-	$(if $(BR2_TOOLCHAIN_HAS_NATIVE_RPC),--with-sys-quotas,--without-sys-quotas) \
+	--with-sys-quotas \
 	--without-ads \
 	--without-ldap \
 	--with-included-iniparser \

From e2b8a97603687add5dd7a39b0dac75400769af50 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:18 +0000
Subject: [PATCH 3165/6849] xinetd: add support to use RPC support from
 libtirpc

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xinetd/xinetd.mk | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index a420425d46..cb48145cf5 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -9,10 +9,25 @@ XINETD_SITE          = http://www.xinetd.org
 XINETD_LICENSE       = xinetd license
 XINETD_LICENSE_FILES = COPYRIGHT
 
-ifneq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),y)
-XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC"
+XINETD_CFLAGS = $(TARGET_CFLAGS)
+
+# Three cases here:
+#  1. We have libtirpc, use it by passing special flags
+#  2. We have native RPC support, use it, no need to pass special
+#     flags (so this case 2 is implicit and not visible below)
+#  3. We don't have RPC support, pass -DNO_RPC to disable it
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+XINETD_DEPENDENCIES += libtirpc
+XINETD_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+XINETD_LIBS += -ltirpc
+else ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),)
+XINETD_CFLAGS += -DNO_RPC
 endif
 
+XINETD_CONF_ENV += \
+	CFLAGS="$(XINETD_CFLAGS)" \
+	LIBS="$(XINETD_LIBS)"
+
 XINETD_MAKE_OPT = AR="$(TARGET_AR)"
 
 $(eval $(autotools-package))

From 41d85c0ba48a2d6e1ff024b3a1167a980cf7d08f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:19 +0000
Subject: [PATCH 3166/6849] toolchain-external: add Sourcery CodeBench SuperH
 2012.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 20 ++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ad72de030e..9ed3b3bb6b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -422,6 +422,25 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	    - 970 glibc hard-float, 64 bits
 	      Set BR2_TARGET_OPTIMIZATION to -m64
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
+	bool "Sourcery CodeBench SH 2012.03"
+	depends on BR2_sh4a || BR2_sh4aeb
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53,
+	  glibc 2.15, uClibc 0.9.30, gdb 7.2.50 and kernel headers
+	  3.2.10. It has support for the following variants:
+            - SH4A, glibc, little endian
+              Default.
+            - SH4A, glibc, big endian
+              Add -mb to BR2_TARGET_OPTIMIZATION
+            - SH4A, uClibc, little endian
+              Not usable in Buildroot yet.
+            - SH4A, uClibc, big endian
+              Not usable in Buildroot yet.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh4a || BR2_sh4aeb
@@ -682,6 +701,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
+	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index f05d9eb245..4f6ca4a12d 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -226,6 +226,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/superh/portal/package8759/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package10148/public/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.03-35-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2

From 363cb60e0d7951aabeb6ccf787f5a234c892276c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:20 +0000
Subject: [PATCH 3167/6849] toolchain-external: add Sourcery CodeBench x86
 2012.03

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 22 ++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9ed3b3bb6b..e7c9995ba1 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -515,6 +515,27 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  has support for the following variants:
 	    - SH2A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
+	bool "Sourcery CodeBench x86/x86_64 2012.03"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the x86/x86_64
+	  architectures, from Mentor Graphics. It uses gcc 4.6.3,
+	  binutils 2.21.53, glibc 2.15, gdb 7.2.50 and kernel headers
+	  3.2.10. It has support for the following variants:
+	    - Intel Pentium 4, glibc, 32 bits
+	      Default for x86, nothing special to do.
+	    - Intel Atom, glibc, 32 bits
+	      Select an Atom core
+	    - Intel Xeon, glibc, 64 bits
+	      Default for x86_64, nothing special to do.
+	    - Intel Core 2, glibc, 64 bits
+	      Select a Core 2 core
+	  Other architecture variants (beyond Pentium-4/Xeon) are
+	  supported as well, but glibc is not optimised for it.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	bool "Sourcery CodeBench x86/x86_64 2011.09"
 	depends on BR2_i386 || BR2_x86_64
@@ -706,6 +727,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
+	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 4f6ca4a12d..726f76fb6f 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -241,6 +241,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2010.09-44-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package10163/public/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2

From e067a449df5bfe5853b473b4b9b3967836094d2b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:21 +0000
Subject: [PATCH 3168/6849] toolchain-external: add support for Sourcery
 CodeBench SH 2012.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 21 +++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index e7c9995ba1..ae965faa15 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -422,6 +422,26 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	    - 970 glibc hard-float, 64 bits
 	      Set BR2_TARGET_OPTIMIZATION to -m64
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
+	bool "Sourcery CodeBench SH 2012.09"
+	depends on BR2_sh4a || BR2_sh4aeb
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51,
+	  glibc 2.16, uClibc 0.9.30, gdb 7.4.50 and kernel headers
+	  3.5.4. It has support for the following variants:
+            - SH4A, glibc, little endian
+              Default.
+            - SH4A, glibc, big endian
+              Add -mb to BR2_TARGET_OPTIMIZATION
+            - SH4A, uClibc, little endian
+              Not usable in Buildroot yet.
+            - SH4A, uClibc, big endian
+              Not usable in Buildroot yet.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	bool "Sourcery CodeBench SH 2012.03"
 	depends on BR2_sh4a || BR2_sh4aeb
@@ -723,6 +743,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
+	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 726f76fb6f..6fb0e70107 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -229,6 +229,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package10148/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.03-35-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2

From 1c81123cef95f4df6971b717e35297ec5cbc1954 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:22 +0000
Subject: [PATCH 3169/6849] toolchain-external: add Sourcery CodeBench
 x86/x86_64 2012.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 23 +++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ae965faa15..882c04af1a 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -535,6 +535,28 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  has support for the following variants:
 	    - SH2A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
+	bool "Sourcery CodeBench x86/x86_64 2012.09"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the x86/x86_64
+	  architectures, from Mentor Graphics. It uses gcc 4.7.2,
+	  binutils 2.23.51, glibc 2.16, gdb 7.4.50 and kernel headers
+	  3.5.4. It has support for the following variants:
+	    - Intel Pentium 4, glibc, 32 bits
+	      Default for x86, nothing special to do.
+	    - Intel Atom, glibc, 32 bits
+	      Select an Atom core
+	    - Intel Xeon, glibc, 64 bits
+	      Default for x86_64, nothing special to do.
+	    - Intel Core 2, glibc, 64 bits
+	      Select a Core 2 core
+	  Other architecture variants (beyond Pentium-4/Xeon) are
+	  supported as well, but glibc is not optimised for it.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	bool "Sourcery CodeBench x86/x86_64 2012.03"
 	depends on BR2_i386 || BR2_x86_64
@@ -749,6 +771,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
+	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6fb0e70107..429ff86ce7 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -247,6 +247,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package10163/public/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2

From 9b3fba22d752100445cb734b310f744b551c6a27 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:23 +0000
Subject: [PATCH 3170/6849] toolchain-external: remove Sourcery CodeBench ARM
 2010q1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 23 -----------------------
 toolchain/toolchain-external/ext-tool.mk |  5 +----
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 882c04af1a..68b68ffe3b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -176,28 +176,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
-	bool "Sourcery CodeBench ARM 2010q1"
-	depends on BR2_arm
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the ARM architecture, from
-	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
-	  2.11, gdb 7.0.50 and kernel headers 2.6.32. It has support
-	  for the following variants:
-	     - ARMv5T, little endian, soft-float, glibc
-	       Select ARM926T, ARM10T, XScale or another ARMv5 core
-	       Select BR2_SOFT_FLOAT
-	     - ARMv4T, little endian, soft-float, glibc
-	       Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-	       Select BR2_SOFT_FLOAT
-	     - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-	       Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-	       Select BR2_SOFT_FLOAT
-	       Set BR2_TARGET_OPTIMIZATION to -mthumb
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	bool "Sourcery CodeBench MIPS 2011.09"
 	depends on BR2_mips || BR2_mipsel
@@ -749,7 +727,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
-	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 429ff86ce7..292f6987cc 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -175,10 +175,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package7851/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)

From 436d27c4acf476a283bd9c2e6ca81eb1e7bd9466 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:24 +0000
Subject: [PATCH 3171/6849] toolchain-external: remove Sourcery CodeBench ARM
 2010.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 23 -----------------------
 toolchain/toolchain-external/ext-tool.mk |  5 +----
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 68b68ffe3b..cbee8c1c41 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -154,28 +154,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
-	bool "Sourcery CodeBench ARM 2010.09"
-	depends on BR2_arm
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the ARM architecture, from
-	  Mentor Graphics. It uses gcc 4.5.1, binutils 2.20, glibc
-	  2.11 and gdb 7.2.50, kernel headers 2.6.35.2. It has support
-	  for the following variants:
-	    - ARMv5TE, little endian, soft-float, glibc
-	      Select ARM926T, ARM10T, XScale or another ARMv5 core
-	      Select BR2_SOFT_FLOAT
-	    - ARMv4T, little endian, soft-float, glibc
-	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-	      Select BR2_SOFT_FLOAT
-	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mthumb
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	bool "Sourcery CodeBench MIPS 2011.09"
 	depends on BR2_mips || BR2_mipsel
@@ -727,7 +705,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
-	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 292f6987cc..9206cfaa35 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -175,10 +175,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package7851/public/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package8739/public/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)

From 4b7fc1a96d7e10aa089c3d5e8ba068cf4897661c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:25 +0000
Subject: [PATCH 3172/6849] toolchain-external: remove Sourcery CodeBench SH
 2010.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 21 ---------------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 24 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index cbee8c1c41..6fb2b7511a 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -437,26 +437,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	    - SH4A, uClibc, big endian
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
-	bool "Sourcery CodeBench SH 2010.09"
-	depends on BR2_sh4a || BR2_sh4aeb
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the SuperH architecture,
-	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
-	  glibc 2.11, uClibc 0.9.30, gdb 7.2.50 and kernel headers
-	  2.6.35.2. It has support for the following variants:
-	    - SH4A, glibc, little endian
-	      Default.
-	    - SH4A, glibc, big endian
-	      Add -mb to BR2_TARGET_OPTIMIZATION
-	    - SH4A, uClibc, little endian
-	      Not usable in Buildroot yet.
-	    - SH4A, uClibc, big endian
-	      Not usable in Buildroot yet.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh2a
@@ -716,7 +696,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
-	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 9206cfaa35..b82220ae53 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -214,9 +214,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-g
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2011.03-38-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/superh/portal/package8759/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 5680b69c3fe59658af72327ab2d0125a7044efe6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:26 +0000
Subject: [PATCH 3173/6849] toolchain-external: remove Sourcery CodeBench
 x86/x86_64 2010.09

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 23 -----------------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 26 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 6fb2b7511a..286fe29d30 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -536,28 +536,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	  Other architecture variants (beyond Pentium-4/Xeon) are
 	  supported as well, but glibc is not optimised for it.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
-	bool "Sourcery CodeBench x86/x86_64 2010.09"
-	depends on BR2_i386 || BR2_x86_64
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the x86/x86_64
-	  architectures, from Mentor Graphics. It uses gcc 4.5.1,
-	  binutils 2.20, glibc 2.11, gdb 7.2.50 and kernel headers
-	  2.6.35.2. It has support for the following variants:
-	    - Intel Pentium 4, glibc, 32 bits
-	      Default for x86, nothing special to do.
-	    - Intel Atom, glibc, 32 bits
-	      Select an Atom core
-	    - Intel Xeon, glibc, 64 bits
-	      Default for x86_64, nothing special to do.
-	    - Intel Core 2, glibc, 64 bits
-	      Select a Core 2 core
-	  Other architecture variants (beyond Pentium-4/Xeon) are
-	  supported as well, but glibc is not optimised for it.
-
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	bool "Blackfin.uclinux.org 2012R1-BETA1"
 	depends on BR2_bfin
@@ -701,7 +679,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
-	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b82220ae53..d81e0c6aa9 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -229,9 +229,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201009),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/ia32/portal/package7682/public/i686-pc-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=ia32-2010.09-44-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2

From 0da625e2ff695c2b0aacf2813b18ee3b4552dcf6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:27 +0000
Subject: [PATCH 3174/6849] toolchain-external: remove Linaro 2012.06

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ------------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 286fe29d30..03caf04cc5 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -71,23 +71,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
-	bool "Linaro 2012.06"
-	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.06 (based on gcc 4.7), Linaro GDB 2012.06 (based on
-	  GDB 7.4), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
-
-	  To use this toolchain, you must disable soft float usage.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
@@ -658,7 +641,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index d81e0c6aa9..77615340e7 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -184,9 +184,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_06),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.06/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.06-20120625_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.07/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.07-20120720_linux.tar.bz2

From 31ab4e7da3ae7f0dbfc46ff6344ebfe1d41ae686 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:28 +0000
Subject: [PATCH 3175/6849] toolchain-external: remove Linaro 2012.07

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ------------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 03caf04cc5..5811494c17 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -54,23 +54,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
-	bool "Linaro 2012.07"
-	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.07 (based on gcc 4.7), Linaro GDB 2012.06 (based on
-	  GDB 7.4), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
-
-	  To use this toolchain, you must disable soft float usage.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
@@ -641,7 +624,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 77615340e7..a6025dbdd9 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -184,9 +184,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_07),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.07/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.07-20120720_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.08/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.08-20120827_linux.tar.bz2

From 3a843a3a04c127186589a203bb33b8cb91f52ab5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 4 Nov 2012 07:34:29 +0000
Subject: [PATCH 3176/6849] toolchain-external: assume that by default, glibc
 toolchains have RPC support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5811494c17..f04ced6974 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -751,6 +751,7 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	help
 	  Select this option if your external toolchain supports
 	  RPC. If you don't know, leave the default value, Buildroot

From 448b7069b2bd1b57fe39f90bccc5271c06a36110 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 5 Nov 2012 09:30:36 +0100
Subject: [PATCH 3177/6849] foundation-v8/readme.txt: remove outdated rpc
 comment

Now that we don't automatically enable rpc stuff in busybox this comment
no longer applies.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/arm/foundation-v8/readme.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt
index 3f8d4ef46d..7f419a0e46 100644
--- a/board/arm/foundation-v8/readme.txt
+++ b/board/arm/foundation-v8/readme.txt
@@ -8,13 +8,6 @@ First, one has to download the AArch64 software simulator from:
 Then, use the arm_foundationv8_defconfig configuration to build your
 Buildroot system.
 
-Note that the Busybox build will fail due to the lack of rpc/rpc.h
-(the AArch64 toolchain does not have RPC support). Run 'make
-busybox-menuconfig', and in 'Linux System Utilities', disable the
-option 'Support mounting NFS file systems on Linux < 2.6.23' and
-restart the build. This problem will be fix in upcomins versions of
-Buildroot.
-
 Finally, boot your system with:
 
  ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/Foundation_v8 \

From d80d382620ac57926b13cbfce49ebda197c9be0a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Nov 2012 03:53:39 +0000
Subject: [PATCH 3178/6849] kernel-headers: bump 3.{0, 4, 6}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.50-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d596870138..e195def195 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.50"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.51"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.33"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.17"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.18"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.5"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.6"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.50-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.50-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch

From 5a6392228a4f9383c40005bbd0b41ebda977d3cd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Nov 2012 03:53:40 +0000
Subject: [PATCH 3179/6849] linux: bump 3.6.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 60d77949c6..277ef0eb1d 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6.5"
+	bool "3.6.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.5" if BR2_LINUX_KERNEL_3_6
+	default "3.6.6" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 456f9de2fd6feffa465aeef44fb3d0082e3b0e0f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 7 Nov 2012 00:07:51 +0100
Subject: [PATCH 3180/6849] rpcbind: correct download URL

BR2_SOURCEFORGE_MIRROR is gone.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpcbind/rpcbind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
index d9a80dea9b..de9a421aad 100644
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 RPCBIND_VERSION = 0.2.0
-RPCBIND_SITE    = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
+RPCBIND_SITE    = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
 RPCBIND_SOURCE  = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_LICENSE = BSD-3c
 RPCBIND_LICENSE_FILES = COPYING

From cf76170cc3418f36dd9e4daa2f3d0618ce3dc389 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 7 Nov 2012 00:10:43 +0100
Subject: [PATCH 3181/6849] adding-package-generic.txt: BR2_SOURCEFORGE_MIRROR
 is no more

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index e1b46b03c7..7ecdb91184 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -167,9 +167,7 @@ information is (assuming the package name is +libfoo+) :
   slash for absolute paths:
   +scp://[user@]host:/absolutepath+. +
   If +HOST_LIBFOO_SITE+ is not specified, it defaults to
-  +LIBFOO_SITE+. If none are specified, then the location is assumed
-  to be
-  +http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename+. +
+  +LIBFOO_SITE+.
   Examples: +
     +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ +
     +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+ +

From 7103905fdeb4a92e4572045e16396e53cd1bf749 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Tue, 6 Nov 2012 00:50:12 +0000
Subject: [PATCH 3182/6849] add new package fxload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/fxload/Config.in |  9 +++++++++
 package/fxload/fxload.mk | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/fxload/Config.in
 create mode 100644 package/fxload/fxload.mk

diff --git a/package/Config.in b/package/Config.in
index e531c417d3..bcd1b47b0c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -211,6 +211,7 @@ source "package/flashrom/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
 source "package/fmtools/Config.in"
+source "package/fxload/Config.in"
 source "package/gadgetfs-test/Config.in"
 source "package/gdisk/Config.in"
 source "package/gpsd/Config.in"
diff --git a/package/fxload/Config.in b/package/fxload/Config.in
new file mode 100644
index 0000000000..ac190f043e
--- /dev/null
+++ b/package/fxload/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_FXLOAD
+	bool "fxload"
+	help
+	  This program is conveniently able to download firmware into FX, FX2,
+	  and FX2LP EZ-USB devices, as well as the original AnchorChips EZ-USB.
+	  It is intended to be invoked by hotplug scripts when the unprogrammed
+	  device appears on the bus.
+
+	  http://sourceforge.net/projects/linux-hotplug/
diff --git a/package/fxload/fxload.mk b/package/fxload/fxload.mk
new file mode 100644
index 0000000000..1b5e8c7482
--- /dev/null
+++ b/package/fxload/fxload.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# fxload
+#
+#############################################################
+FXLOAD_VERSION = 2008_10_13
+FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION)
+FXLOAD_LICENSE = GPLv2+
+FXLOAD_LICENSE_FILE = COPYING
+
+define FXLOAD_BUILD_CMDS
+    $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+endef
+
+define FXLOAD_INSTALL_TARGET_CMDS
+    $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) prefix=$(TARGET_DIR) -C $(@D) install
+endef
+
+$(eval $(generic-package))

From 7e61918f9d5d3c5bc1fb435ae9e6c8013cf5ab07 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 6 Nov 2012 13:41:48 +0000
Subject: [PATCH 3183/6849] cpio/initramfs: clarify their use in the help text

Recent mails on the list show that it is not very clear how to create
an initial RAM fs with buildroot.  So make this more explicit in the
cpio and initramfs help texts.  Hopefully this will reduce the /init
debugging we have to do.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cpio/Config.in      | 11 ++++++++---
 fs/initramfs/Config.in |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in
index 374cfe0cd5..0669a44e17 100644
--- a/fs/cpio/Config.in
+++ b/fs/cpio/Config.in
@@ -1,14 +1,19 @@
 config BR2_TARGET_ROOTFS_CPIO
-	bool "cpio the root filesystem"
+	bool "cpio the root filesystem (for use as an initial RAM filesystem)"
 	help
-	  Build a cpio archive of the root filesystem
+	  Build a cpio archive of the root filesystem.  This is typically
+	  used for an initial RAM filesystem that is passed to the kernel
+	  by the bootloader.
 
 choice
         prompt "Compression method"
         default BR2_TARGET_ROOTFS_CPIO_NONE
         depends on BR2_TARGET_ROOTFS_CPIO
         help
-          Select compressor for cpio filesystem of the root filesystem
+          Select compressor for cpio filesystem of the root filesystem.
+          If you use the cpio archive as an initial RAM filesystem, make
+          sure the kernel contains the decompression algorithm selected
+          here.
 
 config BR2_TARGET_ROOTFS_CPIO_NONE
         bool "no compression"
diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index bbc2ab0b72..22066eef96 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -1,5 +1,5 @@
 config BR2_TARGET_ROOTFS_INITRAMFS
-	bool "initramfs for initial ramdisk of linux kernel"
+	bool "initial RAM filesystem linked into linux kernel"
 	depends on BR2_LINUX_KERNEL
 	select BR2_TARGET_ROOTFS_CPIO
 	help

From b3c9b89bd97f8ed414fa7b6a479c37a3d68b616b Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Fri, 3 Aug 2012 04:10:28 +0000
Subject: [PATCH 3184/6849] calao: use zImage on usb-a9263 and usb-a9g20 lpw

The board boot more fast with a zImage than a uImage
as the kernel will not have to be relocated during the decompression.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_usb_a9263_defconfig     | 1 +
 configs/calao_usb_a9g20_lpw_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/calao_usb_a9263_defconfig b/configs/calao_usb_a9263_defconfig
index 65263cfe06..422f35ec2a 100644
--- a/configs/calao_usb_a9263_defconfig
+++ b/configs/calao_usb_a9263_defconfig
@@ -11,3 +11,4 @@ BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9263"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9263/linux-3.4.4.config"
+BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/calao_usb_a9g20_lpw_defconfig b/configs/calao_usb_a9g20_lpw_defconfig
index e3d9cf5b90..4a644da599 100644
--- a/configs/calao_usb_a9g20_lpw_defconfig
+++ b/configs/calao_usb_a9g20_lpw_defconfig
@@ -12,3 +12,4 @@ BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9g20-lpw/linux-3.4.4.config"
+BR2_LINUX_KERNEL_ZIMAGE=y

From c957f604d53d75e851370b6e0503388c93501e87 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Sat, 6 Oct 2012 10:35:36 +0000
Subject: [PATCH 3185/6849] gqview: Fix build failure due to missing -lm with
 binutils 2.22

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gqview/gqview.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index e6d764d5bd..6f64175353 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -7,6 +7,7 @@ GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
 GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
+GQVIEW_CONF_ENV = LIBS="-lm"
 
 $(eval $(autotools-package))
 

From 9e15babb4980abeaa4a392145989af11a757ba7d Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@mimc.co.uk>
Date: Tue, 11 Sep 2012 23:24:05 +0000
Subject: [PATCH 3186/6849] iw: add license information

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 651a2ca1ca..19ede3afaa 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -7,6 +7,8 @@
 IW_VERSION = 3.7
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
+IW_LICENSE = iw license
+IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl
 IW_CONFIG = $(IW_DIR)/.config
 IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \

From 3432745d2a48ec80ad2d8b3b264ca4e8d607cd3a Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 5 Nov 2012 22:07:52 +0000
Subject: [PATCH 3187/6849] xapp_x11perf: bump to 1.5.4

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_x11perf/xapp_x11perf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index d58a45c645..33e8628d99 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_X11PERF_VERSION = 1.5.2
+XAPP_X11PERF_VERSION = 1.5.4
 XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft

From 41a625c4b48db66ff626d65c524eaca71afcfd40 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 5 Nov 2012 22:07:53 +0000
Subject: [PATCH 3188/6849] xapp_mkfontdir: bump to 1.0.7

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index fa4e990d11..e32ed8574a 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_MKFONTDIR_VERSION = 1.0.6
+XAPP_MKFONTDIR_VERSION = 1.0.7
 XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale

From 242541fac2c5cfc750b0dc18ff92b9b08ae1f5c9 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 5 Nov 2012 22:07:54 +0000
Subject: [PATCH 3189/6849] xapp_bitmap: bump to 1.0.6

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_bitmap/xapp_bitmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 92428ac353..1ce450a8b9 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_BITMAP_VERSION = 1.0.3
+XAPP_BITMAP_VERSION = 1.0.6
 XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2
 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps

From d727a4da444cb0001f8b5f73e73809780542be65 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Mon, 5 Nov 2012 15:20:03 +0000
Subject: [PATCH 3190/6849] libmbus : bump version to 0.8

This release contains many improvements bug fixes, and major new features and
support for float point numbers and support for multi-telegram communication...

[Peter: also drop autoreconf]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmbus/libmbus-bcopy.patch | 16 ----------------
 package/libmbus/libmbus.mk          |  6 +-----
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 package/libmbus/libmbus-bcopy.patch

diff --git a/package/libmbus/libmbus-bcopy.patch b/package/libmbus/libmbus-bcopy.patch
deleted file mode 100644
index 660cc3775f..0000000000
--- a/package/libmbus/libmbus-bcopy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Drop bcopy since it's deprecated.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura libmbus-0.7.0/mbus/mbus-tcp.c libmbus-0.7.0-bcopy/mbus/mbus-tcp.c
---- libmbus-0.7.0/mbus/mbus-tcp.c	2011-12-08 13:21:19.000000000 -0300
-+++ libmbus-0.7.0-bcopy/mbus/mbus-tcp.c	2012-05-03 09:08:36.987106612 -0300
-@@ -78,7 +78,7 @@
-         return NULL;
-     }
- 
--    bcopy((void *)(host_addr->h_addr), (void *)(&s.sin_addr), host_addr->h_length);
-+    memmove((void *)(&s.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
- 
-     if (connect(handle->sock, (struct sockaddr *)&s, sizeof(s)) < 0)
-     {
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
index 16e9e6a0bc..b3cae97e8e 100644
--- a/package/libmbus/libmbus.mk
+++ b/package/libmbus/libmbus.mk
@@ -4,12 +4,8 @@
 #
 #############################################################
 
-LIBMBUS_VERSION = 0.7.0
+LIBMBUS_VERSION = 0.8.0
 LIBMBUS_SITE = http://www.freescada.com/public-dist
 LIBMBUS_INSTALL_STAGING = YES
 
-# Without this the build yields an error:
-#   cannot find input file: `test/Makefile.in'
-LIBMBUS_AUTORECONF = YES
-
 $(eval $(autotools-package))

From a32fa707e5d79c92908bb81142b00afe81a3e3e2 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 7 Nov 2012 05:01:20 +0000
Subject: [PATCH 3191/6849] TARGET_CONFIGURE_OPTS: pass READELF

Give the path to the realdelf binary for the target, similar to how we
do for the other tools.

[Peter: reworded]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index a9398822d6..9fdc745990 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -113,6 +113,7 @@ TARGET_FC       = $(TARGET_CROSS)gfortran
 TARGET_LD       = $(TARGET_CROSS)ld
 TARGET_NM       = $(TARGET_CROSS)nm
 TARGET_RANLIB   = $(TARGET_CROSS)ranlib
+TARGET_READELF  = $(TARGET_CROSS)readelf
 TARGET_OBJCOPY  = $(TARGET_CROSS)objcopy
 TARGET_OBJDUMP  = $(TARGET_CROSS)objdump
 
@@ -170,6 +171,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		CXX="$(TARGET_CXX)" \
 		FC="$(TARGET_FC)" \
 		RANLIB="$(TARGET_RANLIB)" \
+		READELF="$(TARGET_READELF)" \
 		STRIP="$(TARGET_STRIP)" \
 		OBJCOPY="$(TARGET_OBJCOPY)" \
 		OBJDUMP="$(TARGET_OBJDUMP)" \

From 03c4d57f1d9e2b0f516afdd7e7b3f082694d3c0a Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 7 Nov 2012 05:01:21 +0000
Subject: [PATCH 3192/6849] Add python3 package

[Peter: s/python/python3/]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/python3/Config.in                     |  81 +++++++++
 ...3-000-generate-sysconfigdata-buildir.patch | 158 ++++++++++++++++++
 .../python3-3.3-001-support-for-build.patch   |  68 ++++++++
 ...python3-3.3-002-no-host-headers-libs.patch |  72 ++++++++
 .../python3-3.3-003-staging-header-libs.patch |  41 +++++
 ...3-004-no-import-when-cross-compiling.patch |  27 +++
 ...n3-3.3-005-do-not-generate-pyo-files.patch |  40 +++++
 .../python3-3.3-006-reread-environment.patch  |  63 +++++++
 ...3-3.3-007-change-pyconfig-h-location.patch |  76 +++++++++
 .../python3/python3-3.3-008-no-rpath.patch    |  51 ++++++
 ...python3-3.3-009-verbose-module-build.patch |  26 +++
 ...-distutils-cross-compilation-support.patch |  71 ++++++++
 ...n3-3.3-011-cross-compile-getaddrinfo.patch |  21 +++
 package/python3/python3.mk                    | 152 +++++++++++++++++
 15 files changed, 948 insertions(+)
 create mode 100644 package/python3/Config.in
 create mode 100644 package/python3/python3-3.3-000-generate-sysconfigdata-buildir.patch
 create mode 100644 package/python3/python3-3.3-001-support-for-build.patch
 create mode 100644 package/python3/python3-3.3-002-no-host-headers-libs.patch
 create mode 100644 package/python3/python3-3.3-003-staging-header-libs.patch
 create mode 100644 package/python3/python3-3.3-004-no-import-when-cross-compiling.patch
 create mode 100644 package/python3/python3-3.3-005-do-not-generate-pyo-files.patch
 create mode 100644 package/python3/python3-3.3-006-reread-environment.patch
 create mode 100644 package/python3/python3-3.3-007-change-pyconfig-h-location.patch
 create mode 100644 package/python3/python3-3.3-008-no-rpath.patch
 create mode 100644 package/python3/python3-3.3-009-verbose-module-build.patch
 create mode 100644 package/python3/python3-3.3-010-distutils-cross-compilation-support.patch
 create mode 100644 package/python3/python3-3.3-011-cross-compile-getaddrinfo.patch
 create mode 100644 package/python3/python3.mk

diff --git a/package/Config.in b/package/Config.in
index bcd1b47b0c..2ab6b6e681 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -290,6 +290,7 @@ endif
 source "package/microperl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
+source "package/python3/Config.in"
 if BR2_PACKAGE_PYTHON
 menu "external python modules"
 source "package/python-dpkt/Config.in"
diff --git a/package/python3/Config.in b/package/python3/Config.in
new file mode 100644
index 0000000000..2e1e98b9f7
--- /dev/null
+++ b/package/python3/Config.in
@@ -0,0 +1,81 @@
+config BR2_PACKAGE_PYTHON3
+	bool "python3"
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBFFI
+	help
+	  The python language interpreter.
+
+	  http://www.python.org/
+
+comment "python3 requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
+if BR2_PACKAGE_PYTHON3
+
+choice
+	prompt "python3 module format to install"
+	default BR2_PACKAGE_PYTHON3_PYC_ONLY
+	help
+	  Select Python module format to install on target (py, pyc or both)
+
+config BR2_PACKAGE_PYTHON3_PY_ONLY
+	bool ".py sources only"
+
+config BR2_PACKAGE_PYTHON3_PYC_ONLY
+	bool ".pyc compiled sources only"
+
+config BR2_PACKAGE_PYTHON3_PY_PYC
+	bool ".py sources and .pyc compiled"
+
+endchoice
+
+menu "core python3 modules"
+
+comment "The following modules are unusual or require extra libraries"
+
+config BR2_PACKAGE_PYTHON3_BZIP2
+	select BR2_PACKAGE_BZIP2
+	bool "bz2 module"
+	help
+	  bzip2 module for Python3
+
+config BR2_PACKAGE_PYTHON3_CURSES
+	select BR2_PACKAGE_NCURSES
+	bool "curses module"
+	help
+	  curses module for Python3.
+
+config BR2_PACKAGE_PYTHON3_PYEXPAT
+	select BR2_PACKAGE_EXPAT
+	bool "pyexpat"
+	help
+	  pyexpat module for Python3.
+
+config BR2_PACKAGE_PYTHON3_READLINE
+	select BR2_PACKAGE_READLINE
+	bool "readline"
+	help
+	  readline module for Python3 (required for command-line
+	  editing in the Python shell).
+
+config BR2_PACKAGE_PYTHON3_SSL
+	select BR2_PACKAGE_OPENSSL
+	bool "ssl"
+	help
+	  _ssl module for Python3 (required for https in urllib etc).
+
+config BR2_PACKAGE_PYTHON3_SQLITE
+	bool "sqlite module"
+	select BR2_PACKAGE_SQLITE
+	help
+	  SQLite database support
+
+config BR2_PACKAGE_PYTHON3_ZLIB
+	bool "zlib module"
+	select BR2_PACKAGE_ZLIB
+	help
+	  zlib support in Python3
+
+endmenu
+
+endif
diff --git a/package/python3/python3-3.3-000-generate-sysconfigdata-buildir.patch b/package/python3/python3-3.3-000-generate-sysconfigdata-buildir.patch
new file mode 100644
index 0000000000..a29aa0ffc8
--- /dev/null
+++ b/package/python3/python3-3.3-000-generate-sysconfigdata-buildir.patch
@@ -0,0 +1,158 @@
+changeset:   79745:f85c3f4d9b98
+parent:      79743:36b2ca7dc893
+parent:      79744:24d52d3060e8
+user:        Trent Nelson <trent@trent.me>
+date:        Tue Oct 16 08:17:11 2012 -0400
+summary:     Merge issue #15298: ensure _sysconfigdata is generated in build directory,
+
+Taken from upstream.
+
+---
+ Lib/sysconfig.py |   11 ++++++++++-
+ Makefile.pre.in  |   24 +++++++++++++-----------
+ setup.py         |   14 --------------
+ 3 files changed, 23 insertions(+), 26 deletions(-)
+
+Index: Python-3.3.0/Lib/sysconfig.py
+===================================================================
+--- Python-3.3.0.orig/Lib/sysconfig.py
++++ Python-3.3.0/Lib/sysconfig.py
+@@ -390,13 +390,22 @@
+     if _PYTHON_BUILD:
+         vars['LDSHARED'] = vars['BLDSHARED']
+ 
+-    destfile = os.path.join(os.path.dirname(__file__), '_sysconfigdata.py')
++    pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3])
++    if hasattr(sys, "gettotalrefcount"):
++        pybuilddir += '-pydebug'
++    os.makedirs(pybuilddir, exist_ok=True)
++    destfile = os.path.join(pybuilddir, '_sysconfigdata.py')
++
+     with open(destfile, 'w', encoding='utf8') as f:
+         f.write('# system configuration generated and used by'
+                 ' the sysconfig module\n')
+         f.write('build_time_vars = ')
+         pprint.pprint(vars, stream=f)
+ 
++    # Create file used for sys.path fixup -- see Modules/getpath.c
++    with open('pybuilddir.txt', 'w', encoding='ascii') as f:
++        f.write(pybuilddir)
++
+ def _init_posix(vars):
+     """Initialize the module as appropriate for POSIX systems."""
+     # _sysconfigdata is generated at build time, see _generate_posix_vars()
+Index: Python-3.3.0/Makefile.pre.in
+===================================================================
+--- Python-3.3.0.orig/Makefile.pre.in
++++ Python-3.3.0/Makefile.pre.in
+@@ -410,8 +410,6 @@
+ 		Objects/unicodectype.o \
+ 		Objects/weakrefobject.o
+ 
+-SYSCONFIGDATA=$(srcdir)/Lib/_sysconfigdata.py
+-
+ ##########################################################################
+ # objects that get linked into the Python library
+ LIBRARY_OBJS_OMIT_FROZEN=	\
+@@ -432,7 +430,7 @@
+ 
+ # Default target
+ all:		build_all
+-build_all:	$(BUILDPYTHON) $(SYSCONFIGDATA) oldsharedmods sharedmods gdbhooks Modules/_testembed
++build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks Modules/_testembed
+ 
+ # Compile a binary with gcc profile guided optimization.
+ profile-opt:
+@@ -466,15 +464,17 @@
+ $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
++platform: $(BUILDPYTHON)
+ 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
+ 
+-# Generate the sysconfig build-time data
+-$(SYSCONFIGDATA): $(BUILDPYTHON)
++# Create build directory and generate the sysconfig build-time data there.
++# pybuilddir.txt contains the name of the build dir and is used for
++# sys.path fixup -- see Modules/getpath.c.
++pybuilddir.txt: $(BUILDPYTHON)
+ 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
+ 
+ # Build the shared modules
+-sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
++sharedmods: $(BUILDPYTHON) pybuilddir.txt
+ 	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+@@ -1036,7 +1036,7 @@
+ 		else	true; \
+ 		fi; \
+ 	done
+-	@for i in $(srcdir)/Lib/*.py ; \
++	@for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py; \
+ 	do \
+ 		if test -x $$i; then \
+ 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
+@@ -1196,6 +1196,8 @@
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+ 		--root=$(DESTDIR)/
++	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py
++	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
+ 
+ # Here are a couple of targets for MacOSX again, to install a full
+ # framework-based Python. frameworkinstall installs everything, the
+@@ -1341,9 +1343,10 @@
+ 	find . -name '*.s[ol]' -exec rm -f {} ';'
+ 	find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
+ 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
+-	find build -name 'fficonfig.py' -exec rm -f {} ';' || true
++	find build -name '*.py' -exec rm -f {} ';' || true
++	find build -name '*.py[co]' -exec rm -f {} ';' || true
++	-rm -f pybuilddir.txt
+ 	-rm -f Lib/lib2to3/*Grammar*.pickle
+-	-rm -f $(SYSCONFIGDATA)
+ 	-rm -f Modules/_testembed Modules/_freeze_importlib
+ 
+ profile-removal:
+@@ -1367,7 +1370,6 @@
+ 		Modules/Setup Modules/Setup.local Modules/Setup.config \
+ 		Modules/ld_so_aix Modules/python.exp Misc/python.pc
+ 	-rm -f python*-gdb.py
+-	-rm -f pybuilddir.txt
+ 	find $(srcdir) '(' -name '*.fdc' -o -name '*~' \
+ 			   -o -name '[@,#]*' -o -name '*.old' \
+ 			   -o -name '*.orig' -o -name '*.rej' \
+Index: Python-3.3.0/setup.py
+===================================================================
+--- Python-3.3.0.orig/setup.py
++++ Python-3.3.0/setup.py
+@@ -33,10 +33,6 @@
+ # This global variable is used to hold the list of modules to be disabled.
+ disabled_module_list = []
+ 
+-# File which contains the directory for shared mods (for sys.path fixup
+-# when running from the build dir, see Modules/getpath.c)
+-_BUILDDIR_COOKIE = "pybuilddir.txt"
+-
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (after any relative
+     directories) if:
+@@ -252,16 +248,6 @@
+             args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
+         self.compiler.set_executables(**args)
+ 
+-        # Not only do we write the builddir cookie, but we manually install
+-        # the shared modules directory if it isn't already in sys.path.
+-        # Otherwise trying to import the extensions after building them
+-        # will fail.
+-        with open(_BUILDDIR_COOKIE, "wb") as f:
+-            f.write(self.build_lib.encode('utf-8', 'surrogateescape'))
+-        abs_build_lib = os.path.join(os.getcwd(), self.build_lib)
+-        if abs_build_lib not in sys.path:
+-            sys.path.append(abs_build_lib)
+-
+         build_ext.build_extensions(self)
+ 
+         longest = max([len(e.name) for e in self.extensions])
diff --git a/package/python3/python3-3.3-001-support-for-build.patch b/package/python3/python3-3.3-001-support-for-build.patch
new file mode 100644
index 0000000000..8c57cfb9cc
--- /dev/null
+++ b/package/python3/python3-3.3-001-support-for-build.patch
@@ -0,0 +1,68 @@
+Add support in Python build system to specify host pgen
+
+Python needs a "pgen" program to build itself. Unfortunately, the
+Python build system assumes that it can use the pgen program it has
+just built to build itself. Obviously, this cannot work in
+cross-compilation mode since the pgen program have been built for the
+target.
+
+Therefore, this patch adds support in the Python build system for the
+new PGEN_FOR_BUILD variable, so that we can point Python ./configure
+script to the pgen program that have been previously built for the
+host.
+
+Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>, and
+later significantly reworked by Thomas Petazzoni
+<thomas.petazzoni@free-electrons.com>, with some inspiration taken
+from the Python patches of the PTXdist project, and then ported to
+python3.3 by Maxime Ripard <maxime.ripard@free-electrons.com>
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ Makefile.pre.in |    5 +++--
+ configure.ac    |    5 +++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+Index: Python-3.3.0/Makefile.pre.in
+===================================================================
+--- Python-3.3.0.orig/Makefile.pre.in
++++ Python-3.3.0/Makefile.pre.in
+@@ -239,6 +239,7 @@
+ ##########################################################################
+ # Parser
+ PGEN=		Parser/pgen$(EXE)
++PGEN_FOR_BUILD=@PGEN_FOR_BUILD@
+ 
+ PSRCS=		\
+ 		Parser/acceler.c \
+@@ -639,8 +640,8 @@
+ 
+ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
+ 		@$(MKDIR_P) Include
+-		$(MAKE) $(PGEN)
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		$(MAKE) $(PGEN_FOR_BUILD)
++		$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
+ 		$(MAKE) $(GRAMMAR_H)
+ 		touch $(GRAMMAR_C)
+Index: Python-3.3.0/configure.ac
+===================================================================
+--- Python-3.3.0.orig/configure.ac
++++ Python-3.3.0/configure.ac
+@@ -51,10 +51,15 @@
+         AC_MSG_RESULT($interp)
+ 	PYTHON_FOR_BUILD="_PYTHON_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
+     fi
++    AC_MSG_CHECKING(pgen for build)
++    PGEN_FOR_BUILD="${PGEN_FOR_BUILD}"
++    AC_MSG_RESULT($PGEN_FOR_BUILD)
+ else
+     PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E'
++    PGEN_FOR_BUILD='./$(PGEN)'
+ fi
+ AC_SUBST(PYTHON_FOR_BUILD)
++AC_SUBST(PGEN_FOR_BUILD)
+ 
+ dnl Ensure that if prefix is specified, it does not end in a slash. If
+ dnl it does, we get path names containing '//' which is both ugly and
diff --git a/package/python3/python3-3.3-002-no-host-headers-libs.patch b/package/python3/python3-3.3-002-no-host-headers-libs.patch
new file mode 100644
index 0000000000..9783f28ade
--- /dev/null
+++ b/package/python3/python3-3.3-002-no-host-headers-libs.patch
@@ -0,0 +1,72 @@
+Do not look at host headers/libraries in cross-compile mode
+
+When we are cross-compiling, setup.py should never look in /usr or
+/usr/local to find headers or libraries. A later patch adds a
+mechanism to tell setup.py to look in a specific directory for headers
+and libraries.
+
+Patch first written by Thomas Petazzoni
+<thomas.petazzoni@free-electrons.com> for python2.7, and then ported
+to python3.3 by Maxime Ripard <maxime.ripard@free-electrons.com>
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ setup.py |   23 +++++------------------
+ 1 file changed, 5 insertions(+), 18 deletions(-)
+
+Index: Python-3.3.0/setup.py
+===================================================================
+--- Python-3.3.0.orig/setup.py
++++ Python-3.3.0/setup.py
+@@ -447,10 +447,8 @@
+         if not cross_compiling:
+             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+-        # only change this for cross builds for 3.3, issues on Mageia
+-        if cross_compiling:
+             self.add_gcc_paths()
+-        self.add_multiarch_paths()
++            self.add_multiarch_paths()
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
+@@ -458,10 +456,7 @@
+         # directly since an inconsistently reproducible issue comes up where
+         # the environment variable is not set even though the value were passed
+         # into configure and stored in the Makefile (issue found on OS X 10.3).
+-        for env_var, arg_name, dir_list in (
+-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
+-                ('LDFLAGS', '-L', self.compiler.library_dirs),
+-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
++        for env_var, arg_name, dir_list in ():
+             env_val = sysconfig.get_config_var(env_var)
+             if env_val:
+                 # To prevent optparse from raising an exception about any
+@@ -486,17 +481,6 @@
+                     for directory in reversed(options.dirs):
+                         add_dir_to_list(dir_list, directory)
+ 
+-        if os.path.normpath(sys.base_prefix) != '/usr' \
+-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+-            # building a framework with different architectures than
+-            # the one that is currently installed (issue #7473)
+-            add_dir_to_list(self.compiler.library_dirs,
+-                            sysconfig.get_config_var("LIBDIR"))
+-            add_dir_to_list(self.compiler.include_dirs,
+-                            sysconfig.get_config_var("INCLUDEDIR"))
+-
+         # lib_dirs and inc_dirs are used to search for files;
+         # if a file is found in one of those directories, it can
+         # be assumed that no additional -I,-L directives are needed.
+@@ -506,6 +490,9 @@
+                 '/lib', '/usr/lib',
+                 ]
+             inc_dirs = self.compiler.include_dirs + ['/usr/include']
++        else:
++            lib_dirs = self.compiler.library_dirs
++            inc_dirs = self.compiler.include_dirs
+         exts = []
+         missing = []
+ 
diff --git a/package/python3/python3-3.3-003-staging-header-libs.patch b/package/python3/python3-3.3-003-staging-header-libs.patch
new file mode 100644
index 0000000000..b0efe29614
--- /dev/null
+++ b/package/python3/python3-3.3-003-staging-header-libs.patch
@@ -0,0 +1,41 @@
+Tell setup.py the location of headers/libraries
+
+Allow the libraries detection routine to look for headers and libs in
+other directories than /usr/include or /usr/lib through the
+environment variables PYTHON_MODULES_INCLUDE and PYTHON_MODULES_LIB.
+
+We can then use it to look for libraries in the buildroot staging
+directory.
+
+Ported to python3.3 by Maxime Ripard <maxime.ripard@free-electrons.com> based
+on the work by Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ setup.py |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+Index: Python-3.3.0/setup.py
+===================================================================
+--- Python-3.3.0.orig/setup.py
++++ Python-3.3.0/setup.py
+@@ -441,6 +441,19 @@
+             os.unlink(tmpfile)
+ 
+     def detect_modules(self):
++        try:
++            modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split()
++        except KeyError:
++            modules_include_dirs = ['/usr/include']
++        try:
++            modules_lib_dirs = os.environ["PYTHON_MODULES_LIB"].split()
++        except KeyError:
++            modules_lib_dirs = ['/usr/lib']
++        for dir in modules_include_dirs:
++            add_dir_to_list(self.compiler.include_dirs, dir)
++        for dir in modules_lib_dirs:
++            add_dir_to_list(self.compiler.library_dirs, dir)
++
+         # Ensure that /usr/local is always used, but the local build
+         # directories (i.e. '.' and 'Include') must be first.  See issue
+         # 10520.
diff --git a/package/python3/python3-3.3-004-no-import-when-cross-compiling.patch b/package/python3/python3-3.3-004-no-import-when-cross-compiling.patch
new file mode 100644
index 0000000000..cd5a437472
--- /dev/null
+++ b/package/python3/python3-3.3-004-no-import-when-cross-compiling.patch
@@ -0,0 +1,27 @@
+Disable import check when cross-compiling
+
+Once Python has compiled an extension (i.e some C code, potentially
+linked to a library), it tries to import it. This cannot work in
+cross-compilation mode, so we just disable this check.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ setup.py |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: Python-3.3.0/setup.py
+===================================================================
+--- Python-3.3.0.orig/setup.py
++++ Python-3.3.0/setup.py
+@@ -318,6 +318,10 @@
+             self.announce('WARNING: skipping import check for Cygwin-based "%s"'
+                 % ext.name)
+             return
++        if os.environ.get('CROSS_COMPILING') == 'yes':
++            self.announce('WARNING: skipping import check for cross compiled "%s"'
++                          % ext.name)
++            return
+         ext_filename = os.path.join(
+             self.build_lib,
+             self.get_ext_filename(self.get_ext_fullname(ext.name)))
diff --git a/package/python3/python3-3.3-005-do-not-generate-pyo-files.patch b/package/python3/python3-3.3-005-do-not-generate-pyo-files.patch
new file mode 100644
index 0000000000..983d546473
--- /dev/null
+++ b/package/python3/python3-3.3-005-do-not-generate-pyo-files.patch
@@ -0,0 +1,40 @@
+Do not generate .pyo files
+
+By default, the Python installation byte-compiles all modules in two
+forms: the normal bytecode (.pyc) and an optimized bytecode (.pyo).
+
+According to
+http://www.network-theory.co.uk/docs/pytut/CompiledPythonfiles.html,
+the optimization do not do anything useful, and generating both the
+"non-optimized" and "optimized" bytecode variants takes time.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.pre.in |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+Index: Python-3.3.0/Makefile.pre.in
+===================================================================
+--- Python-3.3.0.orig/Makefile.pre.in
++++ Python-3.3.0/Makefile.pre.in
+@@ -1082,20 +1082,11 @@
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST) -f \
+-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+-		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST)/site-packages -f \
+-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
diff --git a/package/python3/python3-3.3-006-reread-environment.patch b/package/python3/python3-3.3-006-reread-environment.patch
new file mode 100644
index 0000000000..752b15a4e2
--- /dev/null
+++ b/package/python3/python3-3.3-006-reread-environment.patch
@@ -0,0 +1,63 @@
+Make sure setup.py reads the correct CONFIG_ARGS
+
+The setup.py script that builds and installs all the Python modules
+shipped with the interpreter looks at the CONFIG_ARGS variable stored
+in the "sysconfig" module to look at the ./configure options and
+adjust its behaviour accordingly.
+
+Unfortunately, when cross-compiling, the value of CONFIG_ARGS returned
+by the sysconfig are the one passed to the ./configure script of the
+*host* Python and not the one we're currently building for the target.
+
+In order to avoid that, we re-initialize the values in the sysconfig
+module by re-reading the environment at the beginning of the setup.py
+script, and we make sure that the CONFIG_ARGS variable is actually
+part of the environment of setup.py.
+
+See the beginning of
+http://article.gmane.org/gmane.comp.python.devel/99772 for the
+inspiration.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+---
+ Makefile.pre.in |    4 +++-
+ setup.py        |    3 +++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+Index: Python-3.3.0/setup.py
+===================================================================
+--- Python-3.3.0.orig/setup.py
++++ Python-3.3.0/setup.py
+@@ -30,6 +30,9 @@
+ # Were we compiled --with-pydebug or with #define Py_DEBUG?
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
++sysconfig.get_config_vars()
++sysconfig._CONFIG_VARS.update(os.environ)
++
+ # This global variable is used to hold the list of modules to be disabled.
+ disabled_module_list = []
+ 
+Index: Python-3.3.0/Makefile.pre.in
+===================================================================
+--- Python-3.3.0.orig/Makefile.pre.in
++++ Python-3.3.0/Makefile.pre.in
+@@ -478,6 +478,7 @@
+ sharedmods: $(BUILDPYTHON) pybuilddir.txt
+ 	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
++		CONFIG_ARGS="$(CONFIG_ARGS)" \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ 
+ # Build static library
+@@ -1183,7 +1184,8 @@
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+-	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
++	$(RUNSHARED) CONFIG_ARGS="$(CONFIG_ARGS)" \
++		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
diff --git a/package/python3/python3-3.3-007-change-pyconfig-h-location.patch b/package/python3/python3-3.3-007-change-pyconfig-h-location.patch
new file mode 100644
index 0000000000..8d45daef4d
--- /dev/null
+++ b/package/python3/python3-3.3-007-change-pyconfig-h-location.patch
@@ -0,0 +1,76 @@
+Change the location of pyconfig.h
+
+The Python interpreter has a really strange behaviour: at *runtime*,
+it reads a Makefile and a header file named pyconfig.h to get some
+information about the configuration.
+
+The Makefile is located in usr/lib/python3.3/config-3.3m, which is fine
+since this location is kept on the target.
+
+However, by default, the pyconfig.h is installed in
+usr/include/python3.3m, but we completely remove the usr/include
+directory for the target. Since making an exception just for
+pyconfig.h is annoying, this patch also installs pyconfig.h to
+usr/lib/python3.3/config-3.3m, and modifies the sysconfig module so that it
+looks in this location instead of usr/include.
+
+The pyconfig.h is still kept in usr/include/python3.3m, because it is
+needed in the $(STAGING_DIR) when building third-party Python
+extensions that contain C code.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+---
+ Lib/distutils/sysconfig.py |    3 ++-
+ Lib/sysconfig.py           |    2 +-
+ Makefile.pre.in            |    3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+Index: Python-3.3.0/Lib/distutils/sysconfig.py
+===================================================================
+--- Python-3.3.0.orig/Lib/distutils/sysconfig.py
++++ Python-3.3.0/Lib/distutils/sysconfig.py
+@@ -239,7 +239,8 @@
+         else:
+             inc_dir = _sys_home or project_base
+     else:
+-        inc_dir = get_python_inc(plat_specific=1)
++        lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
++        inc_dir = os.path.join(lib_dir, "config")
+     if get_python_version() < '2.2':
+         config_h = 'config.h'
+     else:
+Index: Python-3.3.0/Lib/sysconfig.py
+===================================================================
+--- Python-3.3.0.orig/Lib/sysconfig.py
++++ Python-3.3.0/Lib/sysconfig.py
+@@ -467,7 +467,7 @@
+         else:
+             inc_dir = _sys_home or _PROJECT_BASE
+     else:
+-        inc_dir = get_path('platinclude')
++        inc_dir = os.path.join(get_path('stdlib'), "config")
+     return os.path.join(inc_dir, 'pyconfig.h')
+ 
+ 
+Index: Python-3.3.0/Makefile.pre.in
+===================================================================
+--- Python-3.3.0.orig/Makefile.pre.in
++++ Python-3.3.0/Makefile.pre.in
+@@ -1123,7 +1123,6 @@
+ 		echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
+ 	done
+-	$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
+ 
+ # Install the library and miscellaneous stuff needed for extending/embedding
+ # This goes into $(exec_prefix)
+@@ -1157,6 +1156,8 @@
+ 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+ 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
+ 	$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
++	$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(LIBPL)/pyconfig.h
++	$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
+ 	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
+ 	$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
+ 	$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
diff --git a/package/python3/python3-3.3-008-no-rpath.patch b/package/python3/python3-3.3-008-no-rpath.patch
new file mode 100644
index 0000000000..cdeec22ce9
--- /dev/null
+++ b/package/python3/python3-3.3-008-no-rpath.patch
@@ -0,0 +1,51 @@
+Remove runtime library paths
+
+For some extensions (sqlite and dbm), Python setup.py script
+hardcode a runtime path (rpath) into the extension. However, this
+runtime path is incorrect (because it points to the location of the
+library directory on the development machine) and useless (because on
+the target, all useful libraries are in a standard directory searched
+by the dynamic loader). For those reasons, we just get rid of the
+runtime paths in cross-compilation mode.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+Index: Python-3.3.0/setup.py
+===================================================================
+--- Python-3.3.0.orig/setup.py
++++ Python-3.3.0/setup.py
+@@ -1134,11 +1134,15 @@
+             # can end up with a bad search path order.
+             if sqlite_incdir not in self.compiler.include_dirs:
+                 include_dirs.append(sqlite_incdir)
++            if cross_compiling:
++                sqlite_runtime_libdir = None
++            else:
++                sqlite_runtime_libdir = sqlite_libdir
+             exts.append(Extension('_sqlite3', sqlite_srcs,
+                                   define_macros=sqlite_defines,
+                                   include_dirs=include_dirs,
+                                   library_dirs=sqlite_libdir,
+-                                  runtime_library_dirs=sqlite_libdir,
++                                  runtime_library_dirs=sqlite_runtime_libdir,
+                                   extra_link_args=sqlite_extra_link_args,
+                                   libraries=["sqlite3",]))
+         else:
+@@ -1205,9 +1209,13 @@
+                 elif cand == "bdb":
+                     if db_incs is not None:
+                         if dbm_setup_debug: print("building dbm using bdb")
++                        if cross_compiling:
++                            dblib_runtime_libdir = None
++                        else:
++                            dblib_runtime_libdir = dblib_dir
+                         dbmext = Extension('_dbm', ['_dbmmodule.c'],
+                                            library_dirs=dblib_dir,
+-                                           runtime_library_dirs=dblib_dir,
++                                           runtime_library_dirs=dblib_runtime_libdir,
+                                            include_dirs=db_incs,
+                                            define_macros=[
+                                                ('HAVE_BERKDB_H', None),
diff --git a/package/python3/python3-3.3-009-verbose-module-build.patch b/package/python3/python3-3.3-009-verbose-module-build.patch
new file mode 100644
index 0000000000..60b6d797d3
--- /dev/null
+++ b/package/python3/python3-3.3-009-verbose-module-build.patch
@@ -0,0 +1,26 @@
+Enables verbose output when building modules
+
+Patch borrowed from OpenBricks.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+---
+ Makefile.pre.in |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Index: Python-3.3.0/Makefile.pre.in
+===================================================================
+--- Python-3.3.0.orig/Makefile.pre.in
++++ Python-3.3.0/Makefile.pre.in
+@@ -476,10 +476,9 @@
+ 
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON) pybuilddir.txt
+-	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		CONFIG_ARGS="$(CONFIG_ARGS)" \
+-		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
++		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
+ 
+ # Build static library
+ # avoid long command lines, same as LIBRARY_OBJS
diff --git a/package/python3/python3-3.3-010-distutils-cross-compilation-support.patch b/package/python3/python3-3.3-010-distutils-cross-compilation-support.patch
new file mode 100644
index 0000000000..0a51400bf5
--- /dev/null
+++ b/package/python3/python3-3.3-010-distutils-cross-compilation-support.patch
@@ -0,0 +1,71 @@
+Add some cross-compilation fixes to distutils
+
+Inspired by work done by Marc Kleine-Budde <mkl@pengutronix.de> in
+PTXdist.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Lib/distutils/sysconfig.py |   17 +++++++++++++----
+ configure.ac               |    8 +++++++-
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+Index: Python-3.3.0/Lib/distutils/sysconfig.py
+===================================================================
+--- Python-3.3.0.orig/Lib/distutils/sysconfig.py
++++ Python-3.3.0/Lib/distutils/sysconfig.py
+@@ -16,15 +16,24 @@
+ from .errors import DistutilsPlatformError
+ 
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++EXECUTABLE_DIRNAME = os.path.dirname(os.path.realpath(sys.executable))
++if os.environ.get('CROSS_COMPILING') == 'yes':
++    _sysroot=os.environ.get('_python_sysroot')
++    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
++    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
++    if '_python_srcdir' in os.environ:
++        EXECUTABLE_DIRNAME = os.path.normpath(os.environ['_python_srcdir'])
++else:
++    PREFIX = os.path.normpath(sys.prefix)
++    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++
+ BASE_PREFIX = os.path.normpath(sys.base_prefix)
+ BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
+ 
+ # Path to the base directory of the project. On Windows the binary may
+ # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+ # it'll live in project/PCbuild/amd64.
+-project_base = os.path.dirname(os.path.abspath(sys.executable))
++project_base = EXECUTABLE_DIRNAME
+ if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
+     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+ # PC/VS7.1
+@@ -98,7 +107,7 @@
+             # the build directory may not be the source directory, we
+             # must use "srcdir" from the makefile to find the "Include"
+             # directory.
+-            base = _sys_home or os.path.dirname(os.path.abspath(sys.executable))
++            base = _sys_home or EXECUTABLE_DIRNAME
+             if plat_specific:
+                 return base
+             if _sys_home:
+Index: Python-3.3.0/configure.ac
+===================================================================
+--- Python-3.3.0.orig/configure.ac
++++ Python-3.3.0/configure.ac
+@@ -963,7 +963,13 @@
+ fi
+ 
+ if test "$cross_compiling" = yes; then
+-	RUNSHARED=
++	RUNSHARED=" \
++		CROSS_COMPILING=yes \
++		_python_cross_host=${ac_cv_host} \
++		_python_sysroot=\"\$(sysroot)\" \
++		_python_srcdir=\"\$(srcdir)\" \
++		_python_prefix=\"\$(prefix)\" \
++		_python_exec_prefix=\"\$(exec_prefix)\""
+ fi
+ 
+ AC_MSG_RESULT($LDLIBRARY)
diff --git a/package/python3/python3-3.3-011-cross-compile-getaddrinfo.patch b/package/python3/python3-3.3-011-cross-compile-getaddrinfo.patch
new file mode 100644
index 0000000000..33286ce391
--- /dev/null
+++ b/package/python3/python3-3.3-011-cross-compile-getaddrinfo.patch
@@ -0,0 +1,21 @@
+Disable buggy_getaddrinfo configure test when cross-compiling with IPv6 support
+
+Signed-off-by: Vanya Sergeev <vsergeev at gmail.com>
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: Python-3.3.0/configure.ac
+===================================================================
+--- Python-3.3.0.orig/configure.ac
++++ Python-3.3.0/configure.ac
+@@ -3204,7 +3204,7 @@
+ 
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+ 
+-if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes
++if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
+ then
+ 	if test $ipv6 = yes
+ 	then
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
new file mode 100644
index 0000000000..bcd83eaf69
--- /dev/null
+++ b/package/python3/python3.mk
@@ -0,0 +1,152 @@
+#############################################################
+#
+# python3
+#
+#############################################################
+PYTHON3_VERSION_MAJOR = 3.3
+PYTHON3_VERSION       = $(PYTHON3_VERSION_MAJOR).0
+PYTHON3_SOURCE        = Python-$(PYTHON3_VERSION).tar.bz2
+PYTHON3_SITE          = http://python.org/ftp/python/$(PYTHON3_VERSION)
+
+# Python needs itself and a "pgen" program to build itself, both being
+# provided in the Python sources. So in order to cross-compile Python,
+# we need to build a host Python first. This host Python is also
+# installed in $(HOST_DIR), as it is needed when cross-compiling
+# third-party Python modules.
+
+HOST_PYTHON3_CONF_OPT += 	\
+	--without-cxx-main 	\
+	--disable-sqlite3	\
+	--disable-tk		\
+	--with-expat=system	\
+	--disable-curses	\
+	--disable-codecs-cjk	\
+	--disable-nis		\
+	--disable-unicodedata	\
+	--disable-dbm		\
+	--disable-gdbm		\
+	--disable-bsddb		\
+	--disable-test-modules	\
+	--disable-bz2		\
+	--disable-ssl
+
+HOST_PYTHON3_MAKE_ENV = \
+	PYTHON_MODULES_INCLUDE=$(HOST_DIR)/usr/include \
+	PYTHON_MODULES_LIB="$(HOST_DIR)/lib $(HOST_DIR)/usr/lib"
+
+HOST_PYTHON3_AUTORECONF = YES
+
+define HOST_PYTHON3_CONFIGURE_CMDS
+	(cd $(@D) && rm -rf config.cache; \
+	        $(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
+                $(HOST_PYTHON3_CONF_ENV) \
+		./configure \
+		--prefix="$(HOST_DIR)/usr" \
+		--sysconfdir="$(HOST_DIR)/etc" \
+		$(HOST_PYTHON3_CONF_OPT) \
+	)
+endef
+
+PYTHON3_DEPENDENCIES  = host-python3 libffi
+
+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib
+
+PYTHON3_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y)
+PYTHON3_DEPENDENCIES += readline
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y)
+PYTHON3_DEPENDENCIES += ncurses
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y)
+PYTHON3_DEPENDENCIES += expat
+PYTHON3_CONF_OPT += --with-expat=system
+else
+PYTHON3_CONF_OPT += --with-expat=none
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y)
+PYTHON3_DEPENDENCIES += sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y)
+PYTHON_DEPENDENCIES += openssl
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y)
+PYTHON_DEPENDENCIES += bzip2
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y)
+PYTHON3_DEPENDENCIES += zlib
+endif
+
+PYTHON3_CONF_ENV += \
+	_PROJECT_BASE=$(PYTHON3_DIR) \
+	_PYTHON_HOST_PLATFORM=$(BR2_HOSTARCH) \
+	PYTHON_FOR_BUILD=$(HOST_PYTHON3_DIR)/python \
+	PGEN_FOR_BUILD=$(HOST_PYTHON3_DIR)/Parser/pgen \
+	ac_cv_have_long_long_format=yes \
+	ac_cv_file__dev_ptmx=yes \
+	ac_cv_file__dev_ptc=yes \
+
+PYTHON3_CONF_OPT += \
+	--without-cxx-main 	\
+	--with-system-ffi	\
+	--disable-pydoc		\
+	--disable-test-modules	\
+	--disable-lib2to3	\
+	--disable-gdbm		\
+	--disable-tk		\
+	--disable-nis		\
+	--disable-dbm
+
+PYTHON3_MAKE_ENV = \
+	_PROJECT_BASE=$(PYTHON3_DIR) \
+	_PYTHON_HOST_PLATFORM=$(BR2_HOSTARCH) \
+	PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
+	PYTHON_MODULES_LIB="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib"
+
+# python distutils adds -L$LIBDIR when linking binary extensions, causing
+# trouble for cross compilation
+define PYTHON3_FIXUP_LIBDIR
+	$(SED) 's|^LIBDIR=.*|LIBDIR= $(STAGING_DIR)/usr/lib|' \
+	   $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-3.3m/Makefile
+endef
+
+PYTHON3_POST_INSTALL_STAGING_HOOKS += PYTHON3_FIXUP_LIBDIR
+
+#
+# Development files removal
+#
+define PYTHON3_REMOVE_DEVFILES
+	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python3-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_DEVFILES
+endif
+
+#
+# Remove useless files. In the config/ directory, only the Makefile
+# and the pyconfig.h files are needed at runtime.
+#
+define PYTHON3_REMOVE_USELESS_FILES
+	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-3.3m/ \
+		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
+		rm -f $$i ; \
+	done
+endef
+
+PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_USELESS_FILES
+
+PYTHON3_AUTORECONF = YES
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From f4c0618b51c6b9a17d57364c621d6f279718a974 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 7 Nov 2012 23:09:58 +0000
Subject: [PATCH 3193/6849] kmod: bump to 11

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 10f70f5c3c..c6ef6a152d 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 10
+KMOD_VERSION = 11
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From 8ab9660933b76e53e316e973cacdc1ae3655f3b5 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 7 Nov 2012 23:09:59 +0000
Subject: [PATCH 3194/6849] lm-sensors: bump to 3.3.3

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lm-sensors/lm-sensors.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index ba183ecfc1..34aa742fa6 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LM_SENSORS_VERSION = 3.3.2
+LM_SENSORS_VERSION = 3.3.3
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES

From 2fc64312d4840eb777df7e10b8405a364e813b9e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 8 Nov 2012 16:25:31 +0100
Subject: [PATCH 3195/6849] kmod: don't build documentation if not needed

No sense in building it if we throw it away in target-finalize anyway.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index c6ef6a152d..28336295df 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -4,6 +4,10 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
 
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+KMOD_CONF_OPT += --disable-manpages
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 KMOD_DEPENDENCIES += zlib
 KMOD_CONF_OPT += --with-zlib

From b8a304a9f9089bf03e3649582cee7ea96718e92f Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 6 Nov 2012 03:14:58 +0000
Subject: [PATCH 3196/6849] lcdproc: bump version to 0.5.6

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../lcdproc-0.5.5-fix-menu-segfault.patch     | 19 -------------------
 package/lcdproc/lcdproc.mk                    |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch

diff --git a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch b/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
deleted file mode 100644
index f0ebe2dec9..0000000000
--- a/package/lcdproc/lcdproc-0.5.5-fix-menu-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Trying to add a menu item using menu_add_item causes a segmentation fault
-in the LCDd server. This is caused by a read beyond the end of an array.
-
-This patch adds a safety check on the size of the argument array.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/server/commands/menu_commands.c b/server/commands/menu_commands.c
---- a/server/commands/menu_commands.c	2011-08-14 13:29:16.000000000 +0100
-+++ b/server/commands/menu_commands.c	2012-10-04 22:19:07.997409193 +0100
-@@ -198,7 +198,7 @@ menu_add_item_func(Client *c, int argc,
- 
- 	/* call menu_set_item() with a temporarily allocated argv
- 	 * to process the remaining options */
--	if ((argc > 5) || (argv[4][0] == '-')) {
-+	if ((argc > 5) || ((argc == 5) && argv[4][0] == '-')) {
- 		// menu_add_item <menuid> <newitemid> <type> [<text>]
- 		// menu_set_item <menuid> <itemid> {<option>}+
- 		int i, j;
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 7914c852e4..aa204f15c6 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -3,7 +3,7 @@
 # lcdproc
 #
 #############################################################
-LCDPROC_VERSION = 0.5.5
+LCDPROC_VERSION = 0.5.6
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
 LCDPROC_LICENSE = GPLv2+

From 3d3047f28d3016b351213dc99b73e299d2310f25 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Tue, 6 Nov 2012 11:48:23 +0100
Subject: [PATCH 3197/6849] at91bootstrap: fix overlap linker issue

The linker script of the at91bootstrap package has to be modified when
built from gcc-4.6.x version. Indeed a section named text.startup is
created and has to be added into the text section.

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ootstrap-1.16-gcc-4.6.x-ldscript-fix.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch

diff --git a/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch
new file mode 100644
index 0000000000..e4ed04e865
--- /dev/null
+++ b/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch
@@ -0,0 +1,29 @@
+From b783d1f9bf985c0981e755bd2c13e091e9d6837f Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Tue, 6 Nov 2012 09:38:50 +0100
+Subject: [PATCH] at91bootstrap: fix overlap linker issue
+
+The linker script of the at91bootstrap package has to be modified when
+built from gcc-4.6.x version. Indeed a section named text.startup is
+created and has to be added into the text section.
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ elf32-littlearm.lds |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds
+index a33952f..4f3ba25 100644
+--- a/elf32-littlearm.lds
++++ b/elf32-littlearm.lds
+@@ -7,6 +7,7 @@ SECTIONS
+ 	.text : { 
+ 		_stext = .;
+ 		*(.text)
++		*(.text*)
+ 		*(.rodata)                 /* read-only data (constants) */
+ 		*(.rodata*)
+ 		. = ALIGN(4);
+-- 
+1.7.9.5
+

From 1c03b907bb770b16e19b2b366a95c3cdedc09d57 Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@mimc.co.uk>
Date: Tue, 11 Sep 2012 22:11:30 +0000
Subject: [PATCH 3198/6849] ntp: add license information

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntp/ntp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 504ede79ca..a9a7f10032 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -6,6 +6,8 @@
 
 NTP_VERSION = 4.2.6p5
 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_LICENSE = ntp license
+NTP_LICENSE_FILES = COPYRIGHT
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
 
 ifneq ($(BR2_INET_IPV6),y)

From ce70d058f55096a16352d4428f6833c953cd9b7c Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@mimc.co.uk>
Date: Tue, 11 Sep 2012 21:58:14 +0000
Subject: [PATCH 3199/6849] libgcrypt: add license information

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgcrypt/libgcrypt.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index db5781b18e..a320e4848b 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -6,6 +6,8 @@
 
 LIBGCRYPT_VERSION = 1.5.0
 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
+LIBGCRYPT_LICENSE = LGPLv2.1+
+LIBGCRYPT_LICENSE_FILES = COPYING.LIB
 LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 LIBGCRYPT_INSTALL_STAGING = YES
 

From 35b7560a1bf9bc3a46ff9d3942fb38bc51c6e378 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Wed, 7 Nov 2012 09:39:46 +0000
Subject: [PATCH 3200/6849] qextserialport : fix download and bump version

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qextserialport-no-examples.patch            | 17 -----------------
 package/qextserialport/qextserialport.mk        | 12 +++++++-----
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 package/qextserialport/qextserialport-no-examples.patch

diff --git a/package/qextserialport/qextserialport-no-examples.patch b/package/qextserialport/qextserialport-no-examples.patch
deleted file mode 100644
index c7d2d41b9d..0000000000
--- a/package/qextserialport/qextserialport-no-examples.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Disable compilation of examples
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: qextserialport-ef4af2a2ee3f/qextserialport.pro
-===================================================================
---- qextserialport-ef4af2a2ee3f.orig/qextserialport.pro
-+++ qextserialport-ef4af2a2ee3f/qextserialport.pro
-@@ -1,7 +1,4 @@
- #
- TEMPLATE = subdirs
- CONFIG   += ordered
--SUBDIRS  = src \
--           examples/enumerator \
--           examples/event
--
-+SUBDIRS  = src
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index 6ffb9ebb7a..f240cda3d7 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-QEXTSERIALPORT_VERSION     = ef4af2a2ee3f
-QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/hg/
-QEXTSERIALPORT_SITE_METHOD = hg
+QEXTSERIALPORT_VERSION     = f83b4e7ca922e53
+QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git/
+QEXTSERIALPORT_SITE_METHOD = git
+
+QEXTSERIALPORT_LICENSE = MIT
 
 QEXTSERIALPORT_DEPENDENCIES = qt
 
@@ -24,12 +26,12 @@ define QEXTSERIALPORT_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
 	cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
 	cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
-	cp -a $(@D)/src/build/*.so* $(STAGING_DIR)/usr/lib/
+	cp -a $(@D)/*.so* $(STAGING_DIR)/usr/lib/
 	cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 endef
 
 define QEXTSERIALPORT_INSTALL_TARGET_CMDS
-	cp -a $(@D)/src/build/*.so.* $(TARGET_DIR)/usr/lib
+	cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib
 endef
 
 $(eval $(generic-package))

From fc73d4d262bd9c1ba6f6874f93513d9ca56a1ddb Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sun, 4 Nov 2012 01:30:06 +0000
Subject: [PATCH 3201/6849] xlib_libX11: fix compilation of makekeys

xlib_libX11 builds a makekeys executable for the host, but uses the
targets X11_CFLAGS. This leads to build failures like
http://autobuild.buildroot.net/results/411eb3aefea859a7e31986a44acd50b475f174cb/

This problem was introduced by the version bump, because then also
the AUTORECONF was removed so the existing fix didn't work anymore.

As a slightly cleaner solution, just remove X11_CFLAGS from the
Makefile.  We know we don't need it, because the X11 stuff is in
$(HOST_DIR)/usr/include which is already in HOST_CFLAGS.

[Peter: reword comments]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 79b2d54a89..f7dc4eb3c6 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -19,21 +19,14 @@ HOST_XLIB_LIBX11_CONF_OPT = \
 
 # src/util/makekeys is executed at build time to generate ks_tables.h, so
 # it should get compiled for the host. The libX11 makefile unfortunately
-# doesn't know about cross compilation so this doesn't work.
-# Long term, we should probably teach it about HOSTCC / HOST_CFLAGS, but for
-# now simply disable the src/util Makefile and build makekeys by hand in
-# advance
-define XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD
-	echo '' > $(@D)/src/util/Makefile.am
+# doesn't have X11_CFLAGS_FOR_BUILD so this doesn't work.  For buildroot,
+# we know the X11 includes are in $(HOST_DIR)/usr/include, which are already
+# in the CFLAGS_FOR_BUILD, so we can just remove the X11_CFLAGS
+define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
+	$(SED) '/X11_CFLAGS/d' $(@D)/src/util/Makefile*
 endef
 
-XLIB_LIBX11_POST_EXTRACT_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD
-
-define XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
-	cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) -o makekeys makekeys.c
-endef
-
-XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
+XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 062129c16eeea69c72d7d65b109bc7667449cb71 Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Date: Wed, 31 Oct 2012 10:38:03 +0000
Subject: [PATCH 3202/6849] add new package grantlee

[Peter: sort alphabetically in Config.in]
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/grantlee/Config.in   |  9 +++++++++
 package/grantlee/grantlee.mk | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/grantlee/Config.in
 create mode 100644 package/grantlee/grantlee.mk

diff --git a/package/Config.in b/package/Config.in
index 2ab6b6e681..074e9dfdeb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -138,6 +138,7 @@ source "package/qt/Config.in"
 
 if BR2_PACKAGE_QT
 comment "QT libraries and helper libraries"
+source "package/grantlee/Config.in"
 source "package/qextserialport/Config.in"
 source "package/qtuio/Config.in"
 endif
diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in
new file mode 100644
index 0000000000..84afad207a
--- /dev/null
+++ b/package/grantlee/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GRANTLEE
+	bool "grantlee"
+	select BR2_PACKAGE_QT_STL
+	select BR2_PACKAGE_QT_SCRIPT
+	select BR2_PACKAGE_QT_GUI_MODULE
+	help
+	  Qt implemantation of the Django template framework
+
+	  http://www.grantlee.org
diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk
new file mode 100644
index 0000000000..10adfd9298
--- /dev/null
+++ b/package/grantlee/grantlee.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# grantlee
+#
+#############################################################
+
+GRANTLEE_VERSION = 0.2.0
+GRANTLEE_SITE = http://downloads.grantlee.org
+GRANTLEE_INSTALL_STAGING = YES
+GRANTLEE_DEPENDENCIES =  qt
+
+$(eval $(cmake-package))
+

From 234fe4433489bca81b79311239569525cc008d9d Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 8 Nov 2012 15:47:05 +0000
Subject: [PATCH 3203/6849] perl: build with perlcross instead of qemu

The perlcross project makes it possible to properly cross-compile
perl.  It creates a host-miniperl that is configured for the target
and uses that to cross-compile the perl modules.

Unfortunately there are still a few hacks needed to make it work.
Proper fixes can be developed and upstreamed later.

Since there is no longer a dependency on qemu, it works on all
architectures again.

Also removed some config options:
- BR2_PACKAGE_PERL_CUSTOM_INSTALL just allows a selection of modules;
this can also be encoded by an empty BR2_PACKAGE_PERL_MODULES.
- BR2_PACKAGE_PERL_DB_FILE and BR2_PACKAGE_PERL_GDBM_FILE can be
derived automatically from the package configs.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/Config.in |  40 +++--------
 package/perl/perl.mk   | 153 +++++++++++++++++------------------------
 2 files changed, 71 insertions(+), 122 deletions(-)

diff --git a/package/perl/Config.in b/package/perl/Config.in
index 0642debf39..b2991b0c66 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -1,12 +1,5 @@
 config BR2_PACKAGE_PERL
 	bool "perl"
-	depends on !BR2_avr32
-	depends on !BR2_bfin
-	depends on !BR2_sh2
-	depends on !BR2_sh2a
-	depends on !BR2_sh3
-	depends on !BR2_sh3eb
-	depends on !BR2_sh64
 	help
 	  Larry Wall's Practical Extraction and Report Language
 	  An interpreted scripting language, known among some as "Unix's Swiss
@@ -16,35 +9,18 @@ config BR2_PACKAGE_PERL
 
 if BR2_PACKAGE_PERL
 
-config BR2_PACKAGE_PERL_CUSTOM_INSTALL
-	bool "custom install"
-	help
-	  Don't use the full install target
-	  Install only a selection of modules (like microperl).
-
 config BR2_PACKAGE_PERL_MODULES
-	string "additional modules"
-	depends on BR2_PACKAGE_PERL_CUSTOM_INSTALL
+	string "custom module selection"
 	help
-	  List of space-separated perl modules to copy to the rootfs.
-
-	  Examples: constant.pm Getopt/Std.pm Time/Local.pm
+	  List of space-separated perl modules (without .pm) to copy to the
+	  rootfs.
 
-	  Module dependencies are not automatic so check your needs.
+	  Examples: constant Getopt/Std Time/Local
 
-config BR2_PACKAGE_PERL_DB_FILE
-	bool "DB_File"
-	select BR2_PACKAGE_BERKELEYDB
-	help
-	  Build the DB_File module.
+	  Module dependencies on external libraries are not automatic so
+	  check your needs.
 
-config BR2_PACKAGE_PERL_GDBM_FILE
-	bool "GDBM_File"
-	select BR2_PACKAGE_GDBM
-	help
-	  Build the GDBM_File module.
+	  Leave empty for all modules (as far as the external libraries
+	  are available).
 
 endif
-
-comment "perl requires an architecture supported by qemu"
-	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 81dff049ea..f3c73dd79d 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -12,7 +12,26 @@ PERL_LICENSE = Artistic
 PERL_LICENSE_FILES = Artistic
 PERL_INSTALL_STAGING = YES
 
-PERL_DEPENDENCIES = host-qemu
+PERL_CROSS_VERSION = 0.7
+PERL_CROSS_SITE    = http://download.berlios.de/perlcross
+PERL_CROSS_SOURCE  = perl-5.$(PERL_VERSION_MAJOR).0-cross-$(PERL_CROSS_VERSION).tar.gz
+
+# We use the perlcross hack to cross-compile perl. It should
+# be extracted over the perl sources, so we don't define that
+# as a separate package. Instead, it is downloaded and extracted
+# together with perl
+
+define PERL_CROSS_DOWNLOAD
+	$(call DOWNLOAD,$(PERL_CROSS_SITE)/$(PERL_CROSS_SOURCE))
+endef
+PERL_POST_DOWNLOAD_HOOKS += PERL_CROSS_DOWNLOAD
+
+define PERL_CROSS_EXTRACT
+	$(INFLATE$(suffix $(PERL_CROSS_SOURCE))) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \
+	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+endef
+PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
+
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
     PERL_DEPENDENCIES += berkeleydb
 endif
@@ -20,23 +39,31 @@ ifeq ($(BR2_PACKAGE_GDBM),y)
     PERL_DEPENDENCIES += gdbm
 endif
 
-PERL_CONF_OPT = -des \
-		-Dusecrosscompile \
-		-Dtargetrun=$(QEMU_USER) \
-		-Dqemulib=$(STAGING_DIR) \
-		-Dar="$(TARGET_AR)" \
-		-Dcc="$(TARGET_CC)" \
-		-Dcpp="$(TARGET_CC)" \
-		-Dld="$(TARGET_LD)" \
-		-Dnm="$(TARGET_NM)" \
-		-Dranlib="$(TARGET_RANLIB)" \
-		-Dccflags="$(TARGET_CFLAGS)" \
-		-Dldflags="$(TARGET_LDFLAGS) -lgcc_s -lm" \
-		-Dlddlflags="-shared" \
-		-Dlibc=$(STAGING_DIR)/lib/libc.so \
-		-Duseshrplib \
-		-Dprefix=/usr \
-		-Uoptimize
+# Normally, --mode=cross should automatically do the two steps
+# below, but it doesn't work for some reason.
+PERL_HOST_CONF_OPT = \
+	--mode=buildmini \
+	--target=$(GNU_TARGET_NAME) \
+	--target-arch=$(GNU_TARGET_NAME) \
+	--set-target-name=$(GNU_TARGET_NAME)
+
+# We have to override LD, because an external multilib toolchain ld is not
+# wrapped to provide the required sysroot options.  We also can't use ccache
+# because the configure script doesn't support it.
+PERL_CONF_OPT = \
+	--mode=target \
+	--target=$(GNU_TARGET_NAME) \
+	--target-tools-prefix=$(TARGET_CROSS) \
+	--prefix=/usr \
+	-Dld="$(TARGET_CC_NOCCACHE)" \
+	-A ccflags="$(TARGET_CFLAGS)" \
+	-A ldflags="$(TARGET_LDFLAGS) -lm" \
+	-A mydomain="" \
+	-A myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
+	-A myuname="Buildroot $(BR2_VERSION_FULL)" \
+	-A osname=linux \
+	-A osvers=$(LINUX_VERSION) \
+	-A perlamdin=root
 
 ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
     PERL_CONF_OPT += -Dusedevel
@@ -46,93 +73,39 @@ ifneq ($(BR2_LARGEFILE),y)
     PERL_CONF_OPT += -Uuselargefiles
 endif
 
+PERL_MODULES = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES))
+ifneq ($(PERL_MODULES),)
+PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
+endif
+
 define PERL_CONFIGURE_CMDS
-	rm -f $(@D)/config.sh
-	(cd $(@D); ./Configure $(PERL_CONF_OPT))
-	echo "# patched values"                                 >>$(@D)/config.sh
-	$(SED) '/^myarchname=/d' \
-		-e '/^mydomain=/d' \
-		-e '/^myhostname=/d' \
-		-e '/^myuname=/d' \
-		-e '/^osname=/d' \
-		-e '/^osvers=/d' \
-		-e '/^perladmin=/d' \
-		$(@D)/config.sh
-	echo "myarchname='$(GNU_TARGET_NAME)'"                  >>$(@D)/config.sh
-	echo "mydomain=''"                                      >>$(@D)/config.sh
-	echo "myhostname='$(BR2_TARGET_GENERIC_HOSTNAME)'"      >>$(@D)/config.sh
-	echo "myuname='Buildroot $(BR2_VERSION_FULL)'"          >>$(@D)/config.sh
-	echo "osname='linux'"                                   >>$(@D)/config.sh
-	echo "osvers='$(BR2_LINUX_KERNEL_VERSION)'"             >>$(@D)/config.sh
-	echo "perladmin='root'"                                 >>$(@D)/config.sh
-	(cd $(@D); ./Configure -S)
-	cp $(@D)/config.h $(@D)/xconfig.h
+	(cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_HOST_CONF_OPT))
+	(cd $(@D); ./configure $(PERL_CONF_OPT))
 	$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
 endef
 
+# perlcross's miniperl_top forgets base, which is required by mktables.
+# Instead of patching, it's easier to just set PERL5LIB
 define PERL_BUILD_CMDS
-	echo "#!/bin/sh"                                > $(@D)/Cross/miniperl
-	echo "$(QEMU_USER) $(@D)/miniperl \"\$$@\""     >>$(@D)/Cross/miniperl
-	chmod +x $(@D)/Cross/miniperl
-	PERL_MM_OPT="PERL=$(@D)/Cross/miniperl" \
-		$(MAKE) -C $(@D) all
+	PERL5LIB=$(@D)/dist/base/lib $(MAKE1) -C $(@D) perl modules
 endef
 
 define PERL_INSTALL_STAGING_CMDS
-	$(MAKE) INSTALL_DEPENDENCE= \
-		INSTALLFLAGS= \
-		DESTDIR="$(STAGING_DIR)" \
-		-C $(@D) install.perl
+	PERL5LIB=$(@D)/dist/base/lib $(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl
 endef
 
-PERL_RUN_PERL = $(QEMU_USER) $(@D)/perl -Ilib
-PERL_ARCHNAME = $(shell $(PERL_RUN_PERL) -MConfig -e "print Config->{archname}")
-PERL_LIB = $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)
-PERL_ARCHLIB = $(PERL_LIB)/$(PERL_ARCHNAME)
-PERL_MODS = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES))
-# Minimal set of modules required for 'perl -V' to work
-PERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl
-PERL_BASE_MODS = strict.pm vars.pm warnings.pm warnings/register.pm
-
-define PERL_INSTALL_MODULES
-	for i in $(PERL_ARCH_MODS); do \
-		$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_ARCHLIB)/$$i; \
-	done
-	for i in $(PERL_BASE_MODS); do \
-		$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_LIB)/$$i; \
-	done
-	for i in $(PERL_MODS); do \
-		j=`echo $$i|cut -d : -f 1` ; \
-		if [ -d $(@D)/lib/$$j ] ; then \
-			cp -af $(@D)/lib/$$j $(PERL_LIB) ; \
-		fi ; \
-		if [ -f $(@D)/lib/$$i ] ; then \
-			$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(PERL_LIB)/$$i; \
-		fi ; \
-	done
-	# Remove test files
-	find $(PERL_LIB) -type f -name *.t -exec rm -f {} \;
-endef
+PERL_INSTALL_TARGET_GOALS = install.perl
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+PERL_INSTALL_TARGET_GOALS += install.man
+endif
+
 
-ifeq ($(BR2_PACKAGE_PERL_CUSTOM_INSTALL),y)
-define PERL_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/perl $(TARGET_DIR)/usr/bin/perl
-	$(INSTALL) -m 0755 -D $(@D)/libperl.so $(PERL_ARCHLIB)/CORE/libperl.so
-	$(PERL_INSTALL_MODULES)
-endef
-else
 define PERL_INSTALL_TARGET_CMDS
-	$(MAKE) INSTALL_DEPENDENCE= \
-		INSTALLFLAGS=-p \
-		DESTDIR="$(TARGET_DIR)" \
-		-C $(@D) install.perl
-	rm -f $(PERL_ARCHLIB)/CORE/*.h
-	find $(PERL_ARCHLIB) -type f -name *.bs -exec rm -f {} \;
+	PERL5LIB=$(@D)/dist/base/lib $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" $(PERL_INSTALL_TARGET_GOALS)
 endef
-endif
 
 define PERL_CLEAN_CMDS
-	-$(MAKE) -C $(@D) clean
+	-$(MAKE1) -C $(@D) clean
 endef
 
 $(eval $(generic-package))

From d36fcceb07635fb46425122ad691cca0be252564 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 14 Nov 2012 22:28:05 +0100
Subject: [PATCH 3204/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/CHANGES b/CHANGES
index ae5f75d33c..f5d4cdff2a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,70 @@
 2012.11, Not released yet:
 
+	Fixes all over the tree and new features.
+
+	Defconfigs: use u-boot 2012.10 on at91 and beaglebone,
+	sheevaplug + qemu: bump kernel version, add qemu-mips64-malta
+	+ nitrogen6x defconfigs.
+
+	Bootloaders: add u-boot 2012.07/10, ais target format, add
+	barebox 2012.08/09/10, linker overlap issue fix for
+	at91bootstrap.
+
+	Toolchains: binutils 2.23, gcc 4.72, default to gcc 4.6.x,
+	Codebench arm/sh/x86 2012.03/09, Linaro 2012.08/09/10.
+	Libtirpc support for modern glibc variants.
+
+	Initial Aarch64 support.
+
+	Infrastructure: Use shallow git clone when possible, use
+	tarballs rather than git URLs for github. Moved to pkgconf
+	rather than pkg-config. System directory added, default
+	skeleton/device tables moved.
+
+	Updated/fixed packages: acpid, alsa-lib, alsamixergui,
+	automake, bind, binutils, bison, blackbox, busybox, cairo,
+	cifs-utils, cjson, cmake, collectd, connman, conntrack-tools,
+	coreutils, cups, cvs, dbus, dhcp, directfb, dnsmasq,
+	e2fsprogs, ethtool, fbdump, feh, fftw, flashrom, fluxbox, gdb,
+	gdisk, gdk-pixbuf, genext2fs, gettext, gnutls, gpsd, gqview,
+	grep, gst-plugins-{bad,good}, hdparm, hiawatha, hostapd,
+	input-tools, iproute2, ipset, iptables, iw, json-c, kmod,
+	lcdproc, leafpad, less, libcurl, libdrm, libdvdnav,
+	libdvdread, libfuse, libglib2, libhid, libmad, libmbus,
+	libmnl, libnetfilter_{acct,conntrack,cthelper,cttimeout,queue},
+	libnfnetlink, libnl, libnspr, libnss, libpcap, libplayer,
+	libtorrent, liburcu, libv4l, libxcb, libxml2, libxslt, links,
+	linux-firmware, lm-sensors, lmbench, lshw, lttng-babeltrace,
+	lttng-tools, luajit, mesa3d, microperl, mpc, mpd, mpg123,
+	mplayer, mtd-utils, mysql_client, nbd, netatalk, netkitbase,
+	netkittelnet, netsnmp, newt, nfs-utils, openssh, openssl,
+	opkg, patch, pcre, php, poco, portmap, pppd, pulseaudio,
+	python-protobuf, qt, quota, rp-pppoe, rtorrent, sam-ba, samba,
+	scons, sdl_gfx, smartmontools, sqlite, squid, strace, sudo,
+	sylpheed, ttcp, tiff, unionfs, usb_modeswitch, vala, vpnc,
+	vsftpd, webkit, wget, wpa_supplicant, x11vnc, xapp_*,
+	xdriver_*, xenomai, xfont_*, xinetd, xl2tp, xlib_*, xlsclient,
+	xproto_*, xserver_xorg-server, xutil_util-macros, xz, zeromq
+
+	New packages: arptables, at91bootstrap3, boot-wrapper-aarch64,
+	ccid, cpanminus, cpuload, erlang, evtest, fb-test-apps,
+	fxload, gdbm, gnupg, googlefontdirectory, grantlee, gsl,
+	lcdapi, liblo, liblog4c-localtime, libtirpc, linux-pam,
+	macchanger, mtdev, mtdev2tuio, nfacct, opus, opus-tools,
+	pcsc-lite, perl, pkgconf, python-meld3, python3, qemu,
+	qextserialport, qtuio, rpcbind, schifra, sconeserver,
+	supervisor, time, ulogd, usb_modeswitch_data, yasm
+
+	Deprecated packages: netkitbase, netkittelnet
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#807:  [PATCH] samba - make iconv and smbd optional
+	#3049: binutils have a sysroot bug in ld
+	#5330: update vsftpd to 3.0.0
+	#5486: libglib2 build fails on: libs/libglib-2.0.so: undefined...
+	#5666: Fails to build python 2.7.2 for 2440 arm
+
 2012.08, Release August 31th, 2012
 
 	Updated/fixed packages: microperl, cups, luajit, rrdtool,

From d7520d3564bdade478d2778a0d3a2cdcc8c1ac81 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 12 Nov 2012 22:51:47 +0000
Subject: [PATCH 3205/6849] kexec: disable on avr32

kexec does not support the avr32 architecture; this results in autobuilder
failures such as the following.

  http://autobuild.buildroot.net/results/5f5e91c3eb622bce88402a9afc8a3e7bd5007136/build-end.log

This patch disables support for the kexec package on the avr32 architecture.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/kexec/Config.in b/package/kexec/Config.in
index 6f10b89d53..e59a07b9d5 100644
--- a/package/kexec/Config.in
+++ b/package/kexec/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KEXEC
 	bool "kexec"
+	depends on !BR2_avr32
 	help
 	  Kexec is a user space utiltity for loading another kernel
 	  and asking the currently running kernel to do something with it.

From 5bebca0c550a795350d90c33a09be5820dff616f Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 12 Nov 2012 22:56:47 +0000
Subject: [PATCH 3206/6849] bluez-utils: disable on avr32

The bluez-utils package does not build for the avr32 architecture; this
results in autobuilder failures such as the following.

  http://autobuild.buildroot.net/results/d737d1220d7566289eee802fd580a49d8c456c97/build-end.log

The underlying problem is with the <sys/epoll.h> header provided by the
antiquated avr32 toolchain; this header lacks definitions for
epoll_create1() and EPOLL_CLOEXEC.

This patch disables support for the bluez-utils package on the avr32
architecture.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 9836b211ec..c06f8cd263 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BLUEZ_UTILS
 	bool "bluez-utils"
+	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
 	select BR2_PACKAGE_DBUS

From 29cf4090705781f764653c5ed36e585d78fc27d2 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:35 +0000
Subject: [PATCH 3207/6849] autoconf: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/autoconf.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 0cb50db505..8807c10bc9 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -7,6 +7,9 @@
 AUTOCONF_VERSION = 2.68
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
+AUTOCONF_LICENSE = GPLv3+ with exceptions
+AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
+
 AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 		    ac_cv_prog_gnu_m4_gnu=no
 

From 037aaa00f3d16d9749d9b84149ed910155a6e2fa Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:36 +0000
Subject: [PATCH 3208/6849] ncurses: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index d82399621b..4c48e8d144 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -27,6 +27,8 @@ NCURSES_VERSION = 5.9
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
+NCURSES_LICENSE = MIT with advertising clause
+NCURSES_LICENSE_FILES = README
 
 NCURSES_CONF_OPT = \
 	$(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \

From ef2d26003fbee27b7e53e49110ed3badd65c7200 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:37 +0000
Subject: [PATCH 3209/6849] bash: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bash/bash.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 1466d268fc..d28c6159e1 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -7,6 +7,9 @@
 BASH_VERSION = 4.2
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
 BASH_DEPENDENCIES = ncurses
+BASH_LICENSE = GPLv3+
+BASH_LICENSE_FILES = COPYING
+
 BASH_CONF_ENV +=                       \
    bash_cv_job_control_missing=present \
    bash_cv_sys_named_pipes=present     \

From 1629ea3ff9215c18036abd95ac16cf05cd3118d8 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:38 +0000
Subject: [PATCH 3210/6849] binutils: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index e1aac9bb13..6c51fc7868 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -29,6 +29,8 @@ endif
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
 BINUTILS_INSTALL_STAGING = YES
 BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+
+BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
 
 # We need to specify host & target to avoid breaking ARM EABI
 BINUTILS_CONF_OPT = --disable-multilib --disable-werror \

From 6737b052b2d75dffb3f4098e85588ea406ccbcb2 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:39 +0000
Subject: [PATCH 3211/6849] dmalloc: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dmalloc/dmalloc.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index e2fdda42be..42e2e644c4 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -7,6 +7,10 @@ DMALLOC_VERSION:=5.4.3
 DMALLOC_SOURCE:=dmalloc-$(DMALLOC_VERSION).tgz
 DMALLOC_SITE:=http://dmalloc.com/releases
 
+DMALLOC_LICENSE = MIT-like
+# license is in each file, dmalloc.h.1 is the smallest one
+DMALLOC_LICENSE_FILES = dmalloc.h.1
+
 DMALLOC_INSTALL_STAGING = YES
 DMALLOC_CONF_OPT:= --enable-shlib
 

From c7634120801c56e5f84ea7260ee75d1aa344b237 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:40 +0000
Subject: [PATCH 3212/6849] dropbear: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 64d3a01ce7..bd4522189a 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -10,6 +10,9 @@ DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \
 		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
 
+DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
+DROPBEAR_LICENSE_FILES = LICENSE
+
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 DROPBEAR_MAKE += STATIC=1
 endif

From 342d54e9a595d013030dbd4a24c458ecfcf93fe5 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:41 +0000
Subject: [PATCH 3213/6849] e2fsprogs: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index e958158edd..5b3b7d0293 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -6,6 +6,8 @@
 
 E2FSPROGS_VERSION = 1.42.6
 E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
+E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
+E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \

From 4869f2ecabf050a916912a1fe4d63bbe9f1e403f Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:42 +0000
Subject: [PATCH 3214/6849] ethtool: fix license info variable

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index a336b523f3..8c5961c74a 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -7,6 +7,6 @@
 ETHTOOL_VERSION = 3.6
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
-ETHTOOL_LICENSE_FILE = COPYING
+ETHTOOL_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From ba1c9131537573169f7bc1cfbb39a261118107ab Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:43 +0000
Subject: [PATCH 3215/6849] file: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/file/file.mk b/package/file/file.mk
index 3fa3fb382e..db68f6674c 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -8,6 +8,8 @@ FILE_VERSION = 5.11
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 FILE_INSTALL_STAGING = YES
+FILE_LICENSE = BSD-2c, one file BSD-4c, one file BSD-3c
+FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
 
 define FILE_UNINSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) uninstall -C $(FILE_DIR)

From 0189bc2744501913114f69c7e87585da017d0d42 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:44 +0000
Subject: [PATCH 3216/6849] libffi: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 81ac043f89..75705835ef 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -6,6 +6,8 @@
 
 LIBFFI_VERSION = 3.0.11
 LIBFFI_SITE    = ftp://sources.redhat.com/pub/libffi/
+LIBFFI_LICENSE = MIT
+LIBFFI_LICENSE_FILES = LICENSE
 
 LIBFFI_INSTALL_STAGING = YES
 

From 6e94083920c01ae1849703a0aa026ed369a85d42 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:45 +0000
Subject: [PATCH 3217/6849] liblockfile: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liblockfile/liblockfile.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 037983e32d..84b0212f8e 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -8,6 +8,9 @@ LIBLOCKFILE_SOURCE:=liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
 LIBLOCKFILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libl/liblockfile/
 LIBLOCKFILE_PATCH:=liblockfile_$(LIBLOCKFILE_VERSION)-4.debian.tar.bz2
 
+LIBLOCKFILE_LICENSE = LGPLv2+, dotlockfile GPLv2+
+# No license file included, it refers to the gnu.org website
+
 LIBLOCKFILE_INSTALL_STAGING = YES
 LIBLOCKFILE_CONF_OPT = --mandir=/usr/share/man
 

From 019144c859385505a5351871839fea00a7339bf6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:46 +0000
Subject: [PATCH 3218/6849] libtool: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtool/libtool.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 4b9657c0fc..0934ffead0 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -7,6 +7,8 @@ LIBTOOL_VERSION = 2.2.10
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
 LIBTOOL_INSTALL_STAGING = YES
+LIBTOOL_LICENSE = GPLv2+
+LIBTOOL_LICENSE_FILES = COPYING
 
 HOST_LIBTOOL_LIBTOOL_PATCH = NO
 

From 56f14aac04e1705c00313f9ef177c9cf820265de Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:47 +0000
Subject: [PATCH 3219/6849] lm-sensors: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lm-sensors/lm-sensors.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 34aa742fa6..3f956767e6 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -8,6 +8,8 @@ LM_SENSORS_VERSION = 3.3.3
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES
+LM_SENSORS_LICENSE = libsensors LGPLv2.1+, programs GPLv2+
+LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING
 
 LM_SENSORS_BINS_ = bin/sensors-conf-convert
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors

From 7b49179a53f47a3e78a05b243e887dd8f108d391 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:48 +0000
Subject: [PATCH 3220/6849] lockfile-progs: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lockfile-progs/lockfile-progs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 333ddce41e..1c3cb51453 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -7,6 +7,8 @@ LOCKFILE_PROGS_VERSION = 0.1.15
 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
 LOCKFILE_PROGS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
 LOCKFILE_PROGS_DEPENDENCIES = liblockfile
+LOCKFILE_PROGS_LICENSE = GPLv2
+LOCKFILE_PROGS_LICENSE_FILES = COPYING
 
 LOCKFILE_BINS = \
 	$(addprefix lockfile-,check create remove touch) \

From 0c294a3de61f448a067349ff55d61b2c3adbf27d Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:49 +0000
Subject: [PATCH 3221/6849] logrotate: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/logrotate/logrotate.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index ae622b0bb1..da8e4b3621 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -6,6 +6,8 @@
 LOGROTATE_VERSION = 3.7.9
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
 LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/
+LOGROTATE_LICENSE = GPLv2+
+LOGROTATE_LICENSE_FILES = COPYING
 
 LOGROTATE_DEPENDENCIES = popt
 

From e3322e2c7ebe739aa67abfb0775f9b5e5e43a3b0 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:50 +0000
Subject: [PATCH 3222/6849] lsof: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lsof/lsof.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index fa55e6a617..f74eca4941 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -7,6 +7,10 @@
 LSOF_VERSION = 4.85
 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
 LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+LSOF_LICENSE = lsof license
+# License is repeated in each file, this is a relatively small one.
+# It is also defined in 00README, but that contains a lot of other cruft.
+LSOF_LICENSE_FILES = dialects/linux/dproto.h
 
 # Make certain full-blown lsof gets built after the busybox version (1.20+)
 LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)

From 8bbe6cc414b954dc29ef0a351cd4ea72ba636da3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:51 +0000
Subject: [PATCH 3223/6849] mii-diag: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mii-diag/mii-diag.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 702e5a2d58..a4ad4744c9 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -7,6 +7,8 @@ MII_DIAG_VERSION = 2.11
 MII_DIAG_SOURCE  = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
 MII_DIAG_PATCH   = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
 MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
+MII_DIAG_LICENSE = GPL # No version specified
+MII_DIAG_LICENSE_FILES = mii-diag.c
 
 MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
 

From c1f10d0afcbd769a46e85847868a57bab2a429ad Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:52 +0000
Subject: [PATCH 3224/6849] module-init-tools: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/module-init-tools/module-init-tools.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index fe70775783..9d136b955d 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -7,6 +7,9 @@
 MODULE_INIT_TOOLS_VERSION = 3.15
 MODULE_INIT_TOOLS_SOURCE = module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
 MODULE_INIT_TOOLS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
+MODULE_INIT_TOOLS_LICENSE = GPLv2+
+MODULE_INIT_TOOLS_LICENSE_FILES = COPYING
+
 MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
 MODULE_INIT_TOOLS_CONF_OPT = \
 	--disable-static-utils \

From c4030d3acf64c338eb7c4f8b77508fc7762bfcab Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:53 +0000
Subject: [PATCH 3225/6849] openntpd: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openntpd/openntpd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index f63a9c6ec6..fab68b62ef 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -7,6 +7,8 @@
 OPENNTPD_VERSION = 3.9p1
 OPENNTPD_SITE = ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
 OPENNTPD_CONF_OPT = --with-builtin-arc4random --disable-strip
+OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3c
+OPENNTPD_LICENSE_FILES = LICENCE
 
 define OPENNTPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/ntpd

From 331d6ee10cf96639cca31d1cfa7bbaa0f7e1c3c5 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:54 +0000
Subject: [PATCH 3226/6849] pciutils: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index cd318cbdf4..ba866a00a9 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -7,6 +7,9 @@
 PCIUTILS_VERSION = 3.1.10
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 PCIUTILS_INSTALL_STAGING = YES
+PCIUTILS_LICENSE = GPLv2+
+PCIUTILS_LICENSE_FILES = COPYING
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 	PCIUTILS_ZLIB=yes
 	PCIUTILS_DEPENDENCIES += zlib

From 3f4ccf9d708c35c4343d7578b632b6ffc69c5b31 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:55 +0000
Subject: [PATCH 3227/6849] popt: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/popt/popt.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index df49acb61c..fb3a766720 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -7,6 +7,8 @@ POPT_VERSION = 1.16
 # rpm5.org down
 POPT_SITE = http://anduin.linuxfromscratch.org/sources/BLFS/svn/p/
 POPT_INSTALL_STAGING = YES
+POPT_LICENSE = MIT
+POPT_LICENSE_FILES = COPYING
 
 POPT_CONF_ENV = ac_cv_va_copy=yes
 

From 4f837674385f0bfa516c08195b2f28da3c4b1cce Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:56 +0000
Subject: [PATCH 3228/6849] procps: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/procps/procps.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/procps/procps.mk b/package/procps/procps.mk
index ced04a4715..189da1fc82 100644
--- a/package/procps/procps.mk
+++ b/package/procps/procps.mk
@@ -6,6 +6,8 @@
 
 PROCPS_VERSION = 3.2.8
 PROCPS_SITE = http://procps.sourceforge.net/
+PROCPS_LICENSE = GPLv2+, libproc and libps LGPLv2+
+PROCPS_LICENSE_FILES = COPYING COPYING.LIB
 
 PROCPS_DEPENDENCIES = ncurses
 

From f38c572204014bd67c3ffe165397bea2f678370e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:57 +0000
Subject: [PATCH 3229/6849] python: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/python/python.mk b/package/python/python.mk
index fae4e5c2be..87237bba0e 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -7,6 +7,8 @@ PYTHON_VERSION_MAJOR = 2.7
 PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).2
 PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
 PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
+PYTHON_LICENSE       = Python software foundation license v2, others
+PYTHON_LICENSE_FILES = LICENSE
 
 # Python needs itself and a "pgen" program to build itself, both being
 # provided in the Python sources. So in order to cross-compile Python,

From edaf2eaade5970eefe64903779debfa445ae0606 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:58 +0000
Subject: [PATCH 3230/6849] strace: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/strace.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index ad1d0422f7..349dc2c418 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -7,6 +7,8 @@
 STRACE_VERSION = 4.7
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
+STRACE_LICENSE = BSD-3c
+STRACE_LICENSE_FILES = COPYRIGHT
 
 STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
 		  ac_cv_header_linux_netlink_h=yes

From 3b0afe6a9ce9b02b2e54509021388b7baee21e61 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:05:59 +0000
Subject: [PATCH 3231/6849] tcpdump: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpdump/tcpdump.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index c232dc9de2..96414ef242 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -8,6 +8,9 @@
 
 TCPDUMP_VERSION = 4.3.0
 TCPDUMP_SITE = http://www.tcpdump.org/release
+TCPDUMP_LICENSE = BSD-3c
+TCPDUMP_LICENSE_FILES = LICENSE
+
 TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
 TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)

From 96948ce17577329e78b421b955cdc3decc12cbf6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:06:00 +0000
Subject: [PATCH 3232/6849] usbutils: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 87ae4b36c5..05573ed727 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -11,6 +11,8 @@ USBUTILS_DEPENDENCIES = host-pkgconf libusb
 USBUTILS_INSTALL_STAGING = YES
 # no configure in tarball
 USBUTILS_AUTORECONF = YES
+USBUTILS_LICENSE = GPLv2+
+USBUTILS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
 	USBUTILS_DEPENDENCIES += zlib

From d4e9b558a63305d43eb66706008b815a6fe908c6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:06:01 +0000
Subject: [PATCH 3233/6849] util-linux: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index f6028f4345..73ae174390 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -7,6 +7,12 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
 UTIL_LINUX_VERSION_MAJOR = 2.20
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
+
+# README.licensing claims that some files are GPLv2-only, but this is not true.
+# Some files are GPLv3+ but only in tests.
+UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid and libmount LGPLv2+, libuuid BSD-3c
+UTIL_LINUX_LICENSE_FILES = README.licensing COPYING licenses/COPYING.UCB libblkid/COPYING.libblkid libuuid/COPYING.libuuid
+
 UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf

From 8768bef793c1ad0e9ffd9f82e0ca0a9cfda27fc6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:06:02 +0000
Subject: [PATCH 3234/6849] valgrind: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/valgrind/valgrind.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 05f402f036..cdebbec1cb 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -7,6 +7,9 @@
 VALGRIND_VERSION = 3.7.0
 VALGRIND_SITE    = http://valgrind.org/downloads/
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
+VALGRIND_LICENSE = GPLv2 GFDLv1.2
+VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
+
 VALGRIND_CONF_OPT = --disable-tls
 
 # On ARM, Valgrind only supports ARMv7, and uses the arch part of the

From 36581a48557a62b209e68a5eec30b25c3eb9ce25 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:06:03 +0000
Subject: [PATCH 3235/6849] which: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/which/which.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/which/which.mk b/package/which/which.mk
index e7ebc7fbb9..6e2dce6e8e 100644
--- a/package/which/which.mk
+++ b/package/which/which.mk
@@ -6,5 +6,7 @@
 
 WHICH_VERSION = 2.20
 WHICH_SITE = http://carlo17.home.xs4all.nl/which
+WHICH_LICENSE = GPLv3+
+WHICH_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 7a5f9293a1195020def8516bfafe8e69bab51a00 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 13 Nov 2012 01:06:04 +0000
Subject: [PATCH 3236/6849] xenomai: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/xenomai.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index e425b75679..f40cbdc48c 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -12,6 +12,9 @@ endif
 
 XENOMAI_SITE = http://download.gna.org/xenomai/stable/
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_LICENSE = headers: GPLv2+ with exception, libraries: LGPLv2.1+, kernel: GPLv2+, docs: GFDLv1.2+, ipipe patch and can driver: GPLv2
+# GFDL is not included but refers to gnu.org
+XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
 
 XENOMAI_INSTALL_STAGING = YES
 

From f876cb598b78d31ca480e0f0ad0eb61d4e6c146f Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 13 Nov 2012 02:00:46 +0000
Subject: [PATCH 3237/6849] legal-info: quote csv file contents, so commas can
 be used

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 293bf4f129..835c588af0 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -94,7 +94,7 @@ legal-warning-pkg=echo "WARNING: $(1): $(2)" >>$(LEGAL_WARNINGS)
 define legal-warning-pkg-savednothing # pkg, {local|override}
 	$(call legal-warning-pkg,$(1),sources and license files not saved ($(2) packages not handled))
 endef
-legal-manifest=echo "$(1),$(2),$(3),$(4),$(5)" >>$(LEGAL_MANIFEST_CSV)
+legal-manifest=echo '"$(1)","$(2)","$(3)","$(4)","$(5)"' >>$(LEGAL_MANIFEST_CSV)
 define legal-license-header
 	echo -e "$(LEGAL_INFO_SEPARATOR)\n\t$(1):" \
 		"$(2)\n$(LEGAL_INFO_SEPARATOR)\n\n" >>$(LEGAL_LICENSES_TXT)

From bac970e99d751dd58561313a38311962ea0a79f1 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 13 Nov 2012 12:51:02 +0000
Subject: [PATCH 3238/6849] qextserialport: don't require Qt GUI module

Fixes e.g.
http://autobuild.buildroot.net/results/e80ae76fa21f87bef10e08c7452b796dc0986ff2/

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qextserialport/qextserialport-gui.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/qextserialport/qextserialport-gui.patch

diff --git a/package/qextserialport/qextserialport-gui.patch b/package/qextserialport/qextserialport-gui.patch
new file mode 100644
index 0000000000..d3dedae824
--- /dev/null
+++ b/package/qextserialport/qextserialport-gui.patch
@@ -0,0 +1,16 @@
+Don't require Qt GUI module
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+diff -Nrup qextserialport-f83b4e7ca922e53.orig/qextserialport.pro qextserialport-f83b4e7ca922e53/qextserialport.pro
+--- qextserialport-f83b4e7ca922e53.orig/qextserialport.pro	2012-10-17 09:13:53.000000000 +0200
++++ qextserialport-f83b4e7ca922e53/qextserialport.pro	2012-11-13 22:48:29.249431510 +0100
+@@ -41,6 +41,8 @@ macx:qesp_mac_framework {
+ 
+ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
+ 
++!win32*:!wince*:QT -= gui
++
+ #generate proper library name
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QESP_LIB_BASENAME = QtExtSerialPort

From ff3391323a2baa8c1238d795ec82701dacb77c6f Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Fri, 9 Nov 2012 13:54:09 +0000
Subject: [PATCH 3239/6849] iso9660 fs: use cpio initrd instead of ext2

The ext2 initrd is pretty broken, because it requires an additional
root=/dev/ram0 command line parameter, and a /init to mount
devtmps that isn't there in out ext2 rootfs.  So just use a cpio
instead.

Note that there is no check if the kernel supports initramfs or the
selected compression method.

Also removed a bit of dead code in iso9660.mk.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/iso9660/Config.in  |  2 +-
 fs/iso9660/iso9660.mk | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 4c00583dc4..98ff78b0ba 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -2,7 +2,7 @@ config BR2_TARGET_ROOTFS_ISO9660
 	bool "iso image"
 	depends on (BR2_i386 || BR2_x86_64)
 	depends on BR2_LINUX_KERNEL
-	select BR2_TARGET_ROOTFS_EXT2
+	select BR2_TARGET_ROOTFS_CPIO
 	select BR2_TARGET_GRUB
 	help
 	  Build a bootable iso9660 image
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index f51b6ee868..029c0dd94a 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -9,20 +9,19 @@
 
 ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660
 ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
-ISO9660_OPTS:=
 
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
-ISO9660_OPTS+=-U
-endif
+ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_GZIP)  = .gz
+ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_BZIP2) = .bz2
+ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_LZMA)  = .lzma
 
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-ext2 grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
 	mkdir -p $(ISO9660_TARGET_DIR)
 	mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
 	cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
 	cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
 	cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
-	cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
+	cp $(BINARIES_DIR)/rootfs.cpio$(ISO9660_CPIO_EXT-y) $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)

From 637f852f1a4904206a23442eff06d78514ba7265 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:38 +0000
Subject: [PATCH 3240/6849] conntrack-tools: do not depend on BR2_INET_RPC and
 use libtirpc when available

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/Config.in          | 6 +++---
 package/conntrack-tools/conntrack-tools.mk | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index f109adf1d8..ddede0eeab 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_CONNTRACK_TOOLS
 	bool "conntrack-tools"
 	depends on BR2_INET_IPV6
-	depends on BR2_INET_RPC
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	select BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
 	select BR2_PACKAGE_LIBNETFILTER_QUEUE
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  The conntrack-tools are a set of tools targeted at
 	  system administrators.
@@ -15,5 +15,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
 	  http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and RPC support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_INET_RPC
+comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index ce64021425..ece30903d8 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -13,4 +13,10 @@ CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
 CONNTRACK_TOOLS_LICENSE = GPLv2
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+CONNTRACK_TOOLS_CONF_ENV += \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
+CONNTRACK_TOOLS_DEPENDENCIES += libtirpc
+endif
+
 $(eval $(autotools-package))

From 9346b1b979edc6444ca8539aec9e1bac585e001f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:39 +0000
Subject: [PATCH 3241/6849] libtirpc: remove patch numbers from patch titles

The patch numbers in [PATCH x/y] are quite useless within the context
of Buildroot, and generate noise when patches are re-ordered.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...pc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch | 4 ++--
 ...uClibc-without-RPC-support-does-not-install-rpcent.h.patch | 4 ++--
 .../libtirpc-0003-Add-missing-INET6-conditional.patch         | 4 ++--
 .../libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
index bdbe0213e0..7caccc25bd 100644
--- a/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
+++ b/package/libtirpc/libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
@@ -1,7 +1,7 @@
-From f4c022c526ce061dfdd3c46f544a9495a3a3a97e Mon Sep 17 00:00:00 2001
+From cc4ec3294cb06724c83d4c4e1ea9fc2e38923c98 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Sat, 23 Jun 2012 21:57:39 +0200
-Subject: [PATCH 1/4] Disable parts of TIRPC requiring NIS support
+Subject: [PATCH] Disable parts of TIRPC requiring NIS support
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
diff --git a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
index 0798c34967..b950cb31a0 100644
--- a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
+++ b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
@@ -1,7 +1,7 @@
-From c91721dc289397dfe38fdae175f4ee37e824667c Mon Sep 17 00:00:00 2001
+From c2e96bdc453334f10faf8db0eb06e41ab3ca4fe9 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Sat, 23 Jun 2012 21:58:07 +0200
-Subject: [PATCH 2/4] uClibc without RPC support does not install rpcent.h
+Subject: [PATCH] uClibc without RPC support does not install rpcent.h
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
diff --git a/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch b/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch
index 64d3da8d9f..a05d7ad9af 100644
--- a/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch
+++ b/package/libtirpc/libtirpc-0003-Add-missing-INET6-conditional.patch
@@ -1,7 +1,7 @@
-From a4852bd653ac917165de1d41b60168cd88dc6672 Mon Sep 17 00:00:00 2001
+From a40e00a16cf43245953ad6d43a4f260a47e6d198 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Sat, 23 Jun 2012 21:58:36 +0200
-Subject: [PATCH 3/4] Add missing INET6 conditional
+Subject: [PATCH] Add missing INET6 conditional
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
diff --git a/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch b/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch
index 455ad7463e..c93fea2c5c 100644
--- a/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch
+++ b/package/libtirpc/libtirpc-0004-Make-IPv6-support-optional.patch
@@ -1,7 +1,7 @@
-From 1f36736733eac5080f3a4f3abd1c3a04ac42f1dd Mon Sep 17 00:00:00 2001
+From 5ce585bed328fafc99800effb5e9d1b07dbac2b7 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Sun, 24 Jun 2012 21:40:21 +0200
-Subject: [PATCH 4/4] Make IPv6 support optional
+Subject: [PATCH] Make IPv6 support optional
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---

From 18828103cdc8b929b29f5cbc27cd771ab1a26326 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:40 +0000
Subject: [PATCH 3242/6849] libtirpc: add patches to fix a number of issues

libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch
fixes build failures like
http://autobuild.buildroot.org/results/7a3a751fe02c639ca75c575ca7fe20a72372b8d6/build-end.log.

libtirpc-0006-rpcent-remove-prototypes-of-reentrant-variants.patch
ensures that functions not implemented by libtirpc are not described
in a header file. It also allows to remove those prototypes that were
not matching the functions available in glibc or uClibc, causing
mismatch in prototypes.

libtirpc-0007-doc-Makefile.am-fix-out-of-tree-installation.patch is a
minor fix.

The following patches (8 to 9) allow libtirpc to provide sufficient
things to be able to build rpcbind on top of it.

All these patches have been submitted upstream on the libtirpc-devel@
mailing list.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...pcbyname-name-argument-as-const-char.patch |   43 +
 ...ove-prototypes-of-reentrant-variants.patch |   33 +
 ...file.am-fix-out-of-tree-installation.patch |   24 +
 ...pcgen-program-from-nfs-utils-sources.patch | 6504 +++++++++++++++++
 ...nerate-XDR-header-files-from-.x-sour.patch |  999 +++
 ...es-needed-to-build-rpcbind-on-top-of.patch | 1649 +++++
 6 files changed, 9252 insertions(+)
 create mode 100644 package/libtirpc/libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch
 create mode 100644 package/libtirpc/libtirpc-0006-rpcent-remove-prototypes-of-reentrant-variants.patch
 create mode 100644 package/libtirpc/libtirpc-0007-doc-Makefile.am-fix-out-of-tree-installation.patch
 create mode 100644 package/libtirpc/libtirpc-0008-Add-rpcgen-program-from-nfs-utils-sources.patch
 create mode 100644 package/libtirpc/libtirpc-0009-Automatically-generate-XDR-header-files-from-.x-sour.patch
 create mode 100644 package/libtirpc/libtirpc-0010-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch

diff --git a/package/libtirpc/libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch b/package/libtirpc/libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch
new file mode 100644
index 0000000000..b1865aee70
--- /dev/null
+++ b/package/libtirpc/libtirpc-0005-rpcent-mark-getrpcbyname-name-argument-as-const-char.patch
@@ -0,0 +1,43 @@
+From 88147b753b86df7e7505ef8150f1329f7c6951cc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 9 Nov 2012 19:37:24 +0100
+Subject: [PATCH] rpcent: mark getrpcbyname name argument as const char *
+
+This allows to match the glibc prototype and avoid compiling error
+when building libtirpc against a C library that has RPC support.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/getrpcent.c    |    2 +-
+ tirpc/rpc/rpcent.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/getrpcent.c b/src/getrpcent.c
+index 645f18f..1b54b6d 100644
+--- a/src/getrpcent.c
++++ b/src/getrpcent.c
+@@ -138,7 +138,7 @@ no_yp:
+ 
+ struct rpcent *
+ getrpcbyname(name)
+-	char *name;
++	const char *name;
+ {
+ 	struct rpcent *rpc = NULL;
+ 	char **rp;
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 8ce05ed..120801d 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -61,7 +61,7 @@ extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+ extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
+ 
+ /* Old interfaces that return a pointer to a static area;  MT-unsafe */
+-extern struct rpcent *getrpcbyname(char *);
++extern struct rpcent *getrpcbyname(const char *);
+ extern struct rpcent *getrpcbynumber(int);
+ extern struct rpcent *getrpcent(void);
+ #endif
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0006-rpcent-remove-prototypes-of-reentrant-variants.patch b/package/libtirpc/libtirpc-0006-rpcent-remove-prototypes-of-reentrant-variants.patch
new file mode 100644
index 0000000000..1fdc310efb
--- /dev/null
+++ b/package/libtirpc/libtirpc-0006-rpcent-remove-prototypes-of-reentrant-variants.patch
@@ -0,0 +1,33 @@
+From 8e02780905a3e13405a5a1b9f5b2e77655d5c7fb Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 00:05:23 +0100
+Subject: [PATCH] rpcent: remove prototypes of reentrant variants
+
+The reentrant variants of getrpcbynumber() and al. are not implemented
+by libtirpc, so there is no point in advertising them in this header
+file.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ tirpc/rpc/rpcent.h |    5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
+index 120801d..45775ed 100644
+--- a/tirpc/rpc/rpcent.h
++++ b/tirpc/rpc/rpcent.h
+@@ -55,11 +55,6 @@ struct rpcent {
+ 	int	r_number;	/* rpc program number */
+ };
+ 
+-extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
+-					char *, int);
+-extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+-extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
+-
+ /* Old interfaces that return a pointer to a static area;  MT-unsafe */
+ extern struct rpcent *getrpcbyname(const char *);
+ extern struct rpcent *getrpcbynumber(int);
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0007-doc-Makefile.am-fix-out-of-tree-installation.patch b/package/libtirpc/libtirpc-0007-doc-Makefile.am-fix-out-of-tree-installation.patch
new file mode 100644
index 0000000000..c31992c121
--- /dev/null
+++ b/package/libtirpc/libtirpc-0007-doc-Makefile.am-fix-out-of-tree-installation.patch
@@ -0,0 +1,24 @@
+From 4cf0371c96abf83483835daf50d3fc3bf793bdc4 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 17:29:12 +0100
+Subject: [PATCH] doc/Makefile.am: fix out-of-tree installation
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ doc/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index cc4fa76..bac7c0f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+ install: install-am
+ 	$(mkinstalldirs) $(DESTDIR)/etc
+-	cp -p ./etc_netconfig $(DESTDIR)/etc/netconfig
++	cp -p $(srcdir)/etc_netconfig $(DESTDIR)/etc/netconfig
+ 	chmod 0644 $(DESTDIR)/etc/netconfig
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0008-Add-rpcgen-program-from-nfs-utils-sources.patch b/package/libtirpc/libtirpc-0008-Add-rpcgen-program-from-nfs-utils-sources.patch
new file mode 100644
index 0000000000..27c60649da
--- /dev/null
+++ b/package/libtirpc/libtirpc-0008-Add-rpcgen-program-from-nfs-utils-sources.patch
@@ -0,0 +1,6504 @@
+From 8a1ee148ea860c20fa4e076839e5681412a11f7e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 16:21:01 +0100
+Subject: [PATCH] Add rpcgen program from nfs-utils sources
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am          |    2 +-
+ configure.ac         |   12 +-
+ rpcgen/Makefile.am   |   22 ++
+ rpcgen/rpc_clntout.c |  217 ++++++++++
+ rpcgen/rpc_cout.c    |  706 +++++++++++++++++++++++++++++++++
+ rpcgen/rpc_hout.c    |  490 +++++++++++++++++++++++
+ rpcgen/rpc_main.c    | 1067 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ rpcgen/rpc_output.h  |   16 +
+ rpcgen/rpc_parse.c   |  609 ++++++++++++++++++++++++++++
+ rpcgen/rpc_parse.h   |  166 ++++++++
+ rpcgen/rpc_sample.c  |  247 ++++++++++++
+ rpcgen/rpc_scan.c    |  474 ++++++++++++++++++++++
+ rpcgen/rpc_scan.h    |  103 +++++
+ rpcgen/rpc_svcout.c  |  882 +++++++++++++++++++++++++++++++++++++++++
+ rpcgen/rpc_tblout.c  |  165 ++++++++
+ rpcgen/rpc_util.c    |  479 ++++++++++++++++++++++
+ rpcgen/rpc_util.h    |  166 ++++++++
+ rpcgen/rpcgen.1      |  521 ++++++++++++++++++++++++
+ 18 files changed, 6342 insertions(+), 2 deletions(-)
+ create mode 100644 rpcgen/Makefile.am
+ create mode 100644 rpcgen/rpc_clntout.c
+ create mode 100644 rpcgen/rpc_cout.c
+ create mode 100644 rpcgen/rpc_hout.c
+ create mode 100644 rpcgen/rpc_main.c
+ create mode 100644 rpcgen/rpc_output.h
+ create mode 100644 rpcgen/rpc_parse.c
+ create mode 100644 rpcgen/rpc_parse.h
+ create mode 100644 rpcgen/rpc_sample.c
+ create mode 100644 rpcgen/rpc_scan.c
+ create mode 100644 rpcgen/rpc_scan.h
+ create mode 100644 rpcgen/rpc_svcout.c
+ create mode 100644 rpcgen/rpc_tblout.c
+ create mode 100644 rpcgen/rpc_util.c
+ create mode 100644 rpcgen/rpc_util.h
+ create mode 100644 rpcgen/rpcgen.1
+
+diff --git a/Makefile.am b/Makefile.am
+index 1a7596b..afb4e38 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src man doc
++SUBDIRS = src man doc rpcgen
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ nobase_include_HEADERS = tirpc/netconfig.h \
+diff --git a/configure.ac b/configure.ac
+index 487ec83..7f35b48 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,16 @@ AC_CHECK_HEADER(netinet/ip6.h,
+ 
+ AC_CHECK_LIB([pthread], [pthread_create])
+ 
++AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
++AC_MSG_CHECKING([for a C compiler for build tools])
++if test $cross_compiling = yes; then
++  AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
++else
++  CC_FOR_BUILD=$CC
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
++AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile])
+ AC_OUTPUT(libtirpc.pc)
+diff --git a/rpcgen/Makefile.am b/rpcgen/Makefile.am
+new file mode 100644
+index 0000000..2277b6f
+--- /dev/null
++++ b/rpcgen/Makefile.am
+@@ -0,0 +1,22 @@
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++bin_PROGRAMS = rpcgen
++
++rpcgen_SOURCES = \
++	rpc_clntout.c \
++	rpc_cout.c \
++	rpc_hout.c \
++	rpc_main.c \
++	rpc_parse.c \
++	rpc_sample.c \
++	rpc_scan.c \
++	rpc_svcout.c \
++	rpc_tblout.c \
++	rpc_util.c \
++	rpc_parse.h \
++	rpc_scan.h \
++	rpc_util.h
++
++dist_man1_MANS = rpcgen.1
+diff --git a/rpcgen/rpc_clntout.c b/rpcgen/rpc_clntout.c
+new file mode 100644
+index 0000000..e2f4382
+--- /dev/null
++++ b/rpcgen/rpc_clntout.c
+@@ -0,0 +1,217 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
++ * Copyright (C) 1987, Sun Microsytsems, Inc.
++ */
++#include <stdio.h>
++#include <string.h>
++#include <rpc/types.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++#include "rpc_output.h"
++
++/* extern pdeclaration(); */
++/* void printarglist(); */
++
++#define DEFAULT_TIMEOUT 25	/* in seconds */
++static char RESULT[] = "clnt_res";
++
++static void	write_program(definition *def);
++static void	printbody(proc_list *proc);
++
++
++void
++write_stubs(void)
++{
++	list *l;
++	definition *def;
++
++	f_print(fout, 
++		"\n/* Default timeout can be changed using clnt_control() */\n");
++	f_print(fout, "static struct timeval TIMEOUT = { %d, 0 };\n",
++		DEFAULT_TIMEOUT);
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind == DEF_PROGRAM) {
++			write_program(def);
++		}
++	}
++}
++
++static void
++write_program(definition *def)
++{
++	version_list   *vp;
++	proc_list      *proc;
++
++	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		for (proc = vp->procs; proc != NULL; proc = proc->next) {
++			f_print(fout, "\n");
++			ptype(proc->res_prefix, proc->res_type, 1);
++			f_print(fout, "*\n");
++			pvname(proc->proc_name, vp->vers_num);
++			printarglist(proc, "clnt", "CLIENT *");
++			f_print(fout, "{\n");
++			printbody(proc);
++			f_print(fout, "}\n");
++		}
++	}
++}
++
++/*
++ * Writes out declarations of procedure's argument list.
++ * In either ANSI C style, in one of old rpcgen style (pass by reference),
++ * or new rpcgen style (multiple arguments, pass by value);
++ */
++
++/* sample addargname = "clnt"; sample addargtype = "CLIENT * " */
++
++void
++printarglist(proc_list *proc, char *addargname, char *addargtype)
++{
++
++	decl_list      *l;
++
++	if (!newstyle) {	/* old style: always pass arg by reference */
++		if (Cflag) {	/* C++ style heading */
++			f_print(fout, "(");
++			ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
++			f_print(fout, "*argp, %s%s)\n", addargtype, addargname);
++		} else {
++			f_print(fout, "(argp, %s)\n", addargname);
++			f_print(fout, "\t");
++			ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
++			f_print(fout, "*argp;\n");
++		}
++	} else if (streq(proc->args.decls->decl.type, "void")) {
++		/* newstyle, 0 argument */
++		if (Cflag)
++			f_print(fout, "(%s%s)\n", addargtype, addargname);
++		else
++			f_print(fout, "(%s)\n", addargname);
++	} else {
++		/* new style, 1 or multiple arguments */
++		if (!Cflag) {
++			f_print(fout, "(");
++			for (l = proc->args.decls; l != NULL; l = l->next)
++				f_print(fout, "%s, ", l->decl.name);
++			f_print(fout, "%s)\n", addargname);
++			for (l = proc->args.decls; l != NULL; l = l->next) {
++				pdeclaration(proc->args.argname, &l->decl, 1, ";\n");
++			}
++		} else {	/* C++ style header */
++			f_print(fout, "(");
++			for (l = proc->args.decls; l != NULL; l = l->next) {
++				pdeclaration(proc->args.argname, &l->decl, 0, ", ");
++			}
++			f_print(fout, " %s%s)\n", addargtype, addargname);
++		}
++	}
++
++	if (!Cflag)
++		f_print(fout, "\t%s%s;\n", addargtype, addargname);
++}
++
++
++
++static char *
++ampr(char *type)
++{
++	if (isvectordef(type, REL_ALIAS)) {
++		return ("");
++	} else {
++		return ("&");
++	}
++}
++
++static void
++printbody(proc_list *proc)
++{
++	decl_list      *l;
++	bool_t          args2 = (proc->arg_num > 1);
++
++	/* For new style with multiple arguments, need a structure in which
++         * to stuff the arguments. */
++	if (newstyle && args2) {
++		f_print(fout, "\t%s", proc->args.argname);
++		f_print(fout, " arg;\n");
++	}
++	f_print(fout, "\tstatic ");
++	if (streq(proc->res_type, "void")) {
++		f_print(fout, "char ");
++	} else {
++		ptype(proc->res_prefix, proc->res_type, 0);
++	}
++	f_print(fout, "%s;\n", RESULT);
++	f_print(fout, "\n");
++	f_print(fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n",
++		ampr(proc->res_type), RESULT, RESULT);
++	if (newstyle && !args2 && (streq(proc->args.decls->decl.type, "void"))) {
++		/* newstyle, 0 arguments */
++		f_print(fout,
++			"\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_void, (caddr_t) NULL, "
++			"(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
++			proc->proc_name,
++			stringfix(proc->res_type), ampr(proc->res_type), RESULT);
++
++	} else if (newstyle && args2) {
++		/* newstyle, multiple arguments:  stuff arguments into structure */
++		for (l = proc->args.decls; l != NULL; l = l->next) {
++			f_print(fout, "\targ.%s = %s;\n",
++				l->decl.name, l->decl.name);
++		}
++		f_print(fout,
++			"\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, (caddr_t) &arg, "
++			"(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
++			proc->proc_name, proc->args.argname,
++			stringfix(proc->res_type), ampr(proc->res_type), RESULT);
++	} else {		/* single argument, new or old style */
++		f_print(fout,
++			"\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, "
++			"(caddr_t) %s%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
++			proc->proc_name,
++			stringfix(proc->args.decls->decl.type),
++			(newstyle ? "&" : ""),
++			(newstyle ? proc->args.decls->decl.name : "argp"),
++			stringfix(proc->res_type), ampr(proc->res_type), RESULT);
++	}
++	f_print(fout, "\t\treturn (NULL);\n");
++	f_print(fout, "\t}\n");
++	if (streq(proc->res_type, "void")) {
++		f_print(fout, "\treturn ((void *)%s%s);\n",
++			ampr(proc->res_type), RESULT);
++	} else {
++		f_print(fout, "\treturn (%s%s);\n", ampr(proc->res_type), RESULT);
++	}
++}
+diff --git a/rpcgen/rpc_cout.c b/rpcgen/rpc_cout.c
+new file mode 100644
+index 0000000..a61214f
+--- /dev/null
++++ b/rpcgen/rpc_cout.c
+@@ -0,0 +1,706 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_cout.c, XDR routine outputter for the RPC protocol compiler 
++ */
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <malloc.h>
++#include <ctype.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++
++static int	findtype(definition *def, char *type);
++static int	undefined(char *type);
++static void	print_generic_header(char *procname, int pointerp);
++static void	print_header(definition *def);
++static void	print_prog_header(proc_list *plist);
++static void	print_trailer(void);
++static void	print_ifopen(int indent, char *name);
++static void	print_ifarg(char *arg);
++static void	print_ifsizeof(char *prefix, char *type);
++static void	print_ifclose(int indent);
++static void	print_ifstat(int indent, char *prefix, char *type, relation rel,
++			char *amax, char *objname, char *name);
++static void	emit_enum(definition *def);
++static void	emit_program(definition *def);
++static void	emit_union(definition *def);
++static void	emit_struct(definition *def);
++static void	emit_typedef(definition *def);
++static void	print_stat(int indent, declaration *dec);
++static void	emit_inline(declaration *decl, int flag);
++static void	emit_single_in_line(declaration *decl, int flag, relation rel);
++static char *	upcase(char *str);
++
++/*
++ * Emit the C-routine for the given definition 
++ */
++void
++emit(definition *def)
++{
++	if (def->def_kind == DEF_CONST) {
++		return;
++	}
++	if (def->def_kind == DEF_PROGRAM) {
++		emit_program(def);
++		return;
++	}
++	if (def->def_kind == DEF_TYPEDEF) {
++		/* now we need to handle declarations like
++		 * struct typedef foo foo;
++		 * since we dont want this to be expanded into 2 calls
++		 * to xdr_foo */
++
++		if (strcmp(def->def.ty.old_type, def->def_name) == 0)
++			return;
++	};
++
++	print_header(def);
++	switch (def->def_kind) {
++	case DEF_UNION:
++		emit_union(def);
++		break;
++	case DEF_ENUM:
++		emit_enum(def);
++		break;
++	case DEF_STRUCT:
++		emit_struct(def);
++		break;
++	case DEF_TYPEDEF:
++		emit_typedef(def);
++		break;
++	default:
++		break;
++	}
++	print_trailer();
++}
++
++static int
++findtype(definition *def, char *type)
++{
++
++	if (def->def_kind == DEF_PROGRAM || def->def_kind == DEF_CONST) {
++		return (0);
++	} else {
++		return (streq(def->def_name, type));
++	}
++}
++
++static int
++undefined(char *type)
++{
++	definition     *def;
++
++	def = (definition *) FINDVAL(defined, type, findtype);
++
++	return (def == NULL);
++}
++
++
++static void
++print_generic_header(char *procname, int pointerp)
++{
++	f_print(fout, "\n");
++	f_print(fout, "bool_t\n");
++	if (Cflag) {
++		f_print(fout, "xdr_%s(", procname);
++		f_print(fout, "XDR *xdrs, ");
++		f_print(fout, "%s ", procname);
++		if (pointerp)
++			f_print(fout, "*");
++		f_print(fout, "objp)\n{\n\n");
++	} else {
++		f_print(fout, "xdr_%s(xdrs, objp)\n", procname);
++		f_print(fout, "\tXDR *xdrs;\n");
++		f_print(fout, "\t%s ", procname);
++		if (pointerp)
++			f_print(fout, "*");
++		f_print(fout, "objp;\n{\n\n");
++	}
++}
++
++static void
++print_header(definition *def)
++{
++	print_generic_header(def->def_name,
++		def->def_kind != DEF_TYPEDEF ||
++		!isvectordef(def->def.ty.old_type, def->def.ty.rel));
++
++	/* Now add Inline support */
++
++
++	if (Inline == 0)
++		return;
++}
++
++static void
++print_prog_header(proc_list *plist)
++{
++	print_generic_header(plist->args.argname, 1);
++}
++
++static void
++print_trailer(void)
++{
++	f_print(fout, "\treturn (TRUE);\n");
++	f_print(fout, "}\n");
++}
++
++
++static void
++print_ifopen(int indent, char *name)
++{
++	tabify(fout, indent);
++	f_print(fout, " if (!xdr_%s(xdrs", name);
++}
++
++static void
++print_ifarg(char *arg)
++{
++	f_print(fout, ", %s", arg);
++}
++
++static void
++print_ifsizeof(char *prefix, char *type)
++{
++	if (streq(type, "bool")) {
++		f_print(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool");
++	} else {
++		f_print(fout, ", sizeof(");
++		if (undefined(type) && prefix) {
++			f_print(fout, "%s ", prefix);
++		}
++		f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type);
++	}
++}
++
++static void
++print_ifclose(int indent)
++{
++	f_print(fout, ")) {\n");
++	tabify(fout, indent);
++	f_print(fout, "\t return (FALSE);\n");
++	tabify(fout, indent);
++	f_print(fout, " }\n");
++}
++
++static void
++print_ifstat(int indent, char *prefix, char *type, relation rel,
++			char *amax, char *objname, char *name)
++{
++	char *alt = NULL;
++
++	switch (rel) {
++	case REL_POINTER:
++		print_ifopen(indent, "pointer");
++		print_ifarg("(char **)");
++		f_print(fout, "%s", objname);
++		print_ifsizeof(prefix, type);
++		break;
++	case REL_VECTOR:
++		if (streq(type, "string")) {
++			alt = "string";
++		} else if (streq(type, "opaque")) {
++			alt = "opaque";
++		}
++		if (alt) {
++			print_ifopen(indent, alt);
++			print_ifarg(objname);
++		} else {
++			print_ifopen(indent, "vector");
++			print_ifarg("(char *)");
++			f_print(fout, "%s", objname);
++		}
++		print_ifarg(amax);
++		if (!alt) {
++			print_ifsizeof(prefix, type);
++		}
++		break;
++	case REL_ARRAY:
++		if (streq(type, "string")) {
++			alt = "string";
++		} else if (streq(type, "opaque")) {
++			alt = "bytes";
++		}
++		if (streq(type, "string")) {
++			print_ifopen(indent, alt);
++			print_ifarg(objname);
++		} else {
++			if (alt) {
++				print_ifopen(indent, alt);
++			} else {
++				print_ifopen(indent, "array");
++			}
++			/* The (void*) avoids a gcc-4.1 warning */
++			print_ifarg("(char **)(void*)");
++			if (*objname == '&') {
++				f_print(fout, "%s.%s_val, (u_int *)%s.%s_len",
++					objname, name, objname, name);
++			} else {
++				f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len",
++					objname, name, objname, name);
++			}
++		}
++		print_ifarg(amax);
++		if (!alt) {
++			print_ifsizeof(prefix, type);
++		}
++		break;
++	case REL_ALIAS:
++		print_ifopen(indent, type);
++		print_ifarg(objname);
++		break;
++	}
++	print_ifclose(indent);
++}
++
++static void
++emit_enum(definition *def)
++{
++	print_ifopen(1, "enum");
++	print_ifarg("(enum_t *)objp");
++	print_ifclose(1);
++}
++
++static void
++emit_program(definition *def)
++{
++	decl_list      *dl;
++	version_list   *vlist;
++	proc_list      *plist;
++
++	for (vlist = def->def.pr.versions; vlist != NULL; vlist = vlist->next)
++		for (plist = vlist->procs; plist != NULL; plist = plist->next) {
++			if (!newstyle || plist->arg_num < 2)
++				continue;/* old style, or single argument */
++			print_prog_header(plist);
++			for (dl = plist->args.decls; dl != NULL; dl = dl->next)
++				print_stat(1, &dl->decl);
++			print_trailer();
++		}
++}
++
++
++static void
++emit_union(definition *def)
++{
++  declaration *dflt;
++  case_list *cl;
++  declaration *cs;
++  char *object;
++  char *vecformat = "objp->%s_u.%s";
++  char *format = "&objp->%s_u.%s";
++
++  print_stat(1,&def->def.un.enum_decl);
++  f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name);
++  for (cl = def->def.un.cases; cl != NULL; cl = cl->next) {
++
++    f_print(fout, "\tcase %s:\n", cl->case_name);
++    if(cl->contflag == 1)	/* a continued case statement */
++      continue;
++    cs = &cl->case_decl;
++    if (!streq(cs->type, "void")) {
++      object = alloc(strlen(def->def_name) + strlen(format) +
++		     strlen(cs->name) + 1);
++      if (isvectordef (cs->type, cs->rel)) {
++	s_print(object, vecformat, def->def_name, 
++		cs->name);
++      } else {
++	s_print(object, format, def->def_name, 
++		cs->name);
++      }
++      print_ifstat(2, cs->prefix, cs->type, cs->rel, cs->array_max,
++		   object, cs->name);
++      free(object);
++    }
++    f_print(fout, "\t\tbreak;\n");
++  }
++  dflt = def->def.un.default_decl;
++  if (dflt != NULL) {
++    if (!streq(dflt->type, "void")) {
++      f_print(fout, "\tdefault:\n");
++      object = alloc(strlen(def->def_name) + strlen(format) +
++		     strlen(dflt->name) + 1);
++      if (isvectordef (dflt->type, dflt->rel)) {
++	s_print(object, vecformat, def->def_name, 
++		dflt->name);
++      } else {
++	s_print(object, format, def->def_name, 
++		dflt->name);
++      }
++
++      print_ifstat(2, dflt->prefix, dflt->type, dflt->rel,
++		   dflt->array_max, object, dflt->name);
++      free(object);
++      f_print(fout, "\t\tbreak;\n");
++    } else {
++      /* Avoid gcc warnings about `value not handled in switch' */
++      f_print(fout, "\tdefault:\n");
++      f_print(fout, "\t\tbreak;\n");
++    }
++  } else {
++    f_print(fout, "\tdefault:\n");
++    f_print(fout, "\t\treturn (FALSE);\n");
++  }
++
++  f_print(fout, "\t}\n");
++}
++
++static void
++emit_struct(definition *def)
++{
++	decl_list      *dl;
++	int             i, j, size, flag;
++	decl_list      *cur = NULL, *psav;
++	bas_type       *ptr;
++	char           *sizestr, *plus;
++	char            ptemp[256];
++	int             can_inline;
++	const char	*buf_declaration;
++
++
++	if (Inline == 0) {
++		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
++			print_stat(1, &dl->decl);
++	} else {
++		size = 0;
++		can_inline = 0;
++		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
++			if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) {
++
++				if (dl->decl.rel == REL_ALIAS)
++					size += ptr->length;
++				else {
++					can_inline = 1;
++					break;	/* can be inlined */
++				};
++			} else {
++				if (size >= Inline) {
++					can_inline = 1;
++					break;	/* can be inlined */
++				}
++				size = 0;
++			}
++		if (size > Inline)
++			can_inline = 1;
++
++		if (can_inline == 0) {	/* can not inline, drop back to old mode */
++			for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
++				print_stat(1, &dl->decl);
++			return;
++		};
++
++
++
++
++		flag = PUT;
++		for (j = 0; j < 2; j++) {
++
++			if (flag == PUT)
++				f_print(fout, "\n\t if (xdrs->x_op == XDR_ENCODE) {\n");
++			else
++				f_print(fout, "\n \t return (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n");
++
++
++			i = 0;
++			size = 0;
++			sizestr = NULL;
++			buf_declaration = "int32_t *";
++			for (dl = def->def.st.decls; dl != NULL; dl = dl->next) {	/* xxx */
++
++				/* now walk down the list and check for basic types */
++				if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) {
++					if (i == 0)
++						cur = dl;
++					i++;
++
++					if (dl->decl.rel == REL_ALIAS)
++						size += ptr->length;
++					else {
++						/* this is required to handle arrays */
++
++						if (sizestr == NULL)
++							plus = " ";
++						else
++							plus = "+";
++
++						if (ptr->length != 1)
++							s_print(ptemp, " %s %s * %d", plus, dl->decl.array_max, ptr->length);
++						else
++							s_print(ptemp, " %s %s ", plus, dl->decl.array_max);
++
++						/*now concatenate to sizestr !!!! */
++						if (sizestr == NULL)
++							sizestr = strdup(ptemp);
++						else {
++							sizestr = realloc(sizestr, strlen(sizestr) + strlen(ptemp) + 1);
++							if (sizestr == NULL) {
++
++								f_print(stderr, "Fatal error : no memory \n");
++								crash();
++							};
++							sizestr = strcat(sizestr, ptemp);	/*build up length of array */
++
++						}
++					}
++
++				} else {
++					if (i > 0)
++					    {
++						if (sizestr == NULL && size < Inline) {
++							/* don't expand into inline code if size < inline */
++							while (cur != dl) {
++								print_stat(1, &cur->decl);
++								cur = cur->next;
++							}
++						} else {
++
++
++
++							/* were already looking at a xdr_inlineable structure */
++							if (sizestr == NULL)
++								f_print(fout, "\t %sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);",
++									buf_declaration, size);
++							else if (size == 0)
++								f_print(fout,
++									"\t %sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);",
++									buf_declaration, sizestr);
++							else
++								f_print(fout,
++									"\t %sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);",
++									buf_declaration, size, sizestr);
++							buf_declaration = "";
++
++							f_print(fout, "\n\t   if (buf == NULL) {\n");
++
++							psav = cur;
++							while (cur != dl) {
++								print_stat(2, &cur->decl);
++								cur = cur->next;
++							}
++
++							f_print(fout, "\n\t  }\n\t  else {\n");
++
++							cur = psav;
++							while (cur != dl) {
++								emit_inline(&cur->decl, flag);
++								cur = cur->next;
++							}
++
++							f_print(fout, "\t  }\n");
++						}
++					    }
++					size = 0;
++					i = 0;
++					sizestr = NULL;
++					print_stat(1, &dl->decl);
++				}
++
++			}
++			if (i > 0)
++			    {
++				if (sizestr == NULL && size < Inline) {
++					/* don't expand into inline code if size < inline */
++					while (cur != dl) {
++						print_stat(1, &cur->decl);
++						cur = cur->next;
++					}
++				} else {
++
++					/* were already looking at a xdr_inlineable structure */
++					if (sizestr == NULL)
++						f_print(fout, "\t\t%sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);",
++							buf_declaration, size);
++					else if (size == 0)
++						f_print(fout,
++							"\t\t%sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);",
++							buf_declaration, sizestr);
++					else
++						f_print(fout,
++							"\t\t%sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);",
++							buf_declaration, size, sizestr);
++					buf_declaration = "";
++
++					f_print(fout, "\n\t\tif (buf == NULL) {\n");
++
++					psav = cur;
++					while (cur != NULL) {
++						print_stat(2, &cur->decl);
++						cur = cur->next;
++					}
++					f_print(fout, "\n\t  }\n\t  else {\n");
++
++					cur = psav;
++					while (cur != dl) {
++						emit_inline(&cur->decl, flag);
++						cur = cur->next;
++					}
++
++					f_print(fout, "\t  }\n");
++
++				}
++			    }
++			flag = GET;
++		}
++		f_print(fout, "\t return(TRUE);\n\t}\n\n");
++
++		/* now take care of XDR_FREE case */
++
++		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
++			print_stat(1, &dl->decl);
++	}
++}
++ 
++
++
++
++static void
++emit_typedef(definition *def)
++{
++	char *prefix = def->def.ty.old_prefix;
++	char *type = def->def.ty.old_type;
++	char *amax = def->def.ty.array_max;
++	relation rel = def->def.ty.rel;
++
++
++	  print_ifstat(1, prefix, type, rel, amax, "objp", def->def_name);
++}
++
++static void
++print_stat(int indent, declaration *dec)
++{
++	char *prefix = dec->prefix;
++	char *type = dec->type;
++	char *amax = dec->array_max;
++	relation rel = dec->rel;
++	char name[256];
++
++	if (isvectordef(type, rel)) {
++		s_print(name, "objp->%s", dec->name);
++	} else {
++		s_print(name, "&objp->%s", dec->name);
++	}
++	print_ifstat(indent, prefix, type, rel, amax, name, dec->name);
++}
++
++
++static void
++emit_inline(declaration *decl, int flag)
++{
++
++	/*check whether an array or not */
++
++	switch (decl->rel) {
++	case REL_ALIAS:
++		emit_single_in_line(decl, flag, REL_ALIAS);
++		break;
++	case REL_VECTOR:
++		f_print(fout, "\t\t{ register %s *genp; \n", decl->type);
++		f_print(fout, "\t\t  int i;\n");
++		f_print(fout, "\t\t  for ( i = 0,genp=objp->%s;\n \t\t\ti < %s; i++){\n\t\t",
++			decl->name, decl->array_max);
++		emit_single_in_line(decl, flag, REL_VECTOR);
++		f_print(fout, "\t\t   }\n\t\t };\n");
++		break;
++	default:
++		break;
++	}
++}
++
++static void
++emit_single_in_line(declaration *decl, int flag, relation rel)
++{
++	char *upp_case;
++	int freed=0;
++
++	if(flag == PUT)
++		f_print(fout,"\t\t (void) IXDR_PUT_");
++	else    
++		if(rel== REL_ALIAS)
++			f_print(fout,"\t\t objp->%s = IXDR_GET_",decl->name);
++		else
++			f_print(fout,"\t\t *genp++ = IXDR_GET_");
++
++	upp_case=upcase(decl->type);
++
++	/* hack  - XX */
++	if(strcmp(upp_case,"INT") == 0)
++	{
++		free(upp_case);
++		freed=1;
++		upp_case="INT32";
++	}
++
++	if(strcmp(upp_case,"U_INT") == 0)
++	{
++		free(upp_case);
++		freed=1;
++		upp_case="U_INT32";
++	}
++
++
++	if(flag == PUT) 
++		if(rel== REL_ALIAS)
++			f_print(fout,"%s(buf,objp->%s);\n",upp_case,decl->name);
++		else
++			f_print(fout,"%s(buf,*genp++);\n",upp_case);
++
++	else
++		f_print(fout,"%s(buf);\n",upp_case);
++	if(!freed)
++		free(upp_case);
++
++}
++
++
++static char *
++upcase(char *str)
++{
++	char           *ptr, *hptr;
++
++
++	ptr = (char *) malloc(strlen(str)+1);
++	if (ptr == (char *) NULL) {
++		f_print(stderr, "malloc failed \n");
++		exit(1);
++	};
++
++	hptr = ptr;
++	while (*str != '\0')
++		*ptr++ = toupper(*str++);
++
++	*ptr = '\0';
++	return (hptr);
++
++}
+diff --git a/rpcgen/rpc_hout.c b/rpcgen/rpc_hout.c
+new file mode 100644
+index 0000000..ea1cb24
+--- /dev/null
++++ b/rpcgen/rpc_hout.c
+@@ -0,0 +1,490 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_hout.c, Header file outputter for the RPC protocol compiler 
++ */
++#include <stdio.h>
++#include <ctype.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++#include "rpc_output.h"
++
++
++static int	undefined2(char *type, char *stop);
++static void	pxdrfuncdecl(char *name, int pointerp);
++static void	pconstdef(definition *def);
++static void	pargdef(definition *def);
++static void	pstructdef(definition *def);
++static void	puniondef(definition *def);
++static void	pdefine(char *name, char *num);
++static void	puldefine(char *name, char *num);
++static int	define_printed(proc_list *stop, version_list *start);
++static void	pprogramdef(definition *def);
++static void	pprocdef(proc_list *proc, version_list *vp,
++				char *addargtype, int server_p, int mode);
++static void	parglist(proc_list *proc, char *addargtype);
++static void	penumdef(definition *def);
++static void	ptypedef(definition *def);
++
++/*
++ * Print the C-version of an xdr definition 
++ */
++void
++print_datadef(definition *def)
++{
++
++	if (def->def_kind == DEF_PROGRAM )  /* handle data only */
++	        return;
++
++	if (def->def_kind != DEF_CONST) {
++		f_print(fout, "\n");
++	}
++	switch (def->def_kind) {
++	case DEF_STRUCT:
++		pstructdef(def);
++		break;
++	case DEF_UNION:
++		puniondef(def);
++		break;
++	case DEF_ENUM:
++		penumdef(def);
++		break;
++	case DEF_TYPEDEF:
++		ptypedef(def);
++		break;
++	case DEF_PROGRAM:
++		pprogramdef(def);
++		break;
++	case DEF_CONST:
++		pconstdef(def);
++		break;
++	}
++	if (def->def_kind != DEF_PROGRAM && def->def_kind != DEF_CONST) {
++	  pxdrfuncdecl( def->def_name,
++		       def->def_kind != DEF_TYPEDEF ||
++		       !isvectordef(def->def.ty.old_type, def->def.ty.rel));
++
++	}
++}
++
++
++void
++print_funcdef(definition *def)
++{
++	switch (def->def_kind) {
++	case DEF_PROGRAM:
++		f_print(fout, "\n");
++		pprogramdef(def);
++		break;
++	default:
++		break;
++	}
++}
++
++static void
++pxdrfuncdecl(char *name, int pointerp)
++{
++	f_print(fout,
++	"#ifdef __cplusplus \n"
++	"extern \"C\" bool_t xdr_%s(XDR *, %s%s);\n"
++	"#elif __STDC__ \n"
++	"extern  bool_t xdr_%s(XDR *, %s%s);\n"
++	"#else /* Old Style C */ \n"
++	"bool_t xdr_%s();\n"
++	"#endif /* Old Style C */ \n\n",
++	name, name, pointerp ? "*" : "",
++	name, name, pointerp ? "*" : "",
++	name);
++}
++
++
++static void
++pconstdef(definition *def)
++{
++	pdefine(def->def_name, def->def.co);
++}
++
++/* print out the definitions for the arguments of functions in the 
++   header file 
++*/
++static  void
++pargdef(definition *def)
++{
++	decl_list *l;
++	version_list *vers;
++	char *name;
++	proc_list *plist;
++
++	
++	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
++			for(plist = vers->procs; plist != NULL; 
++			    plist = plist->next) {
++				
++				if (!newstyle || plist->arg_num < 2) {
++					continue; /* old style or single args */
++				}
++				name = plist->args.argname;
++				f_print(fout, "struct %s {\n", name);
++				for (l = plist->args.decls; 
++				     l != NULL; l = l->next) {
++					pdeclaration(name, &l->decl, 1, ";\n" );
++				}
++				f_print(fout, "};\n");
++				f_print(fout, "typedef struct %s %s;\n", name, name);
++				pxdrfuncdecl(name, 0);
++				f_print( fout, "\n" );
++			}
++		}
++
++}
++
++
++static void
++pstructdef(definition *def)
++{
++	decl_list *l;
++	char *name = def->def_name;
++
++	f_print(fout, "struct %s {\n", name);
++	for (l = def->def.st.decls; l != NULL; l = l->next) {
++		pdeclaration(name, &l->decl, 1, ";\n");
++	}
++	f_print(fout, "};\n");
++	f_print(fout, "typedef struct %s %s;\n", name, name);
++}
++
++static void
++puniondef(definition *def)
++{
++	case_list      *l;
++	char           *name = def->def_name;
++	declaration    *decl;
++
++	f_print(fout, "struct %s {\n", name);
++	decl = &def->def.un.enum_decl;
++	if (streq(decl->type, "bool")) {
++		f_print(fout, "\tbool_t %s;\n", decl->name);
++	} else {
++		f_print(fout, "\t%s %s;\n", decl->type, decl->name);
++	}
++	f_print(fout, "\tunion {\n");
++	for (l = def->def.un.cases; l != NULL; l = l->next) {
++		if (l->contflag == 0)
++			pdeclaration(name, &l->case_decl, 2, ";\n");
++	}
++	decl = def->def.un.default_decl;
++	if (decl && !streq(decl->type, "void")) {
++		pdeclaration(name, decl, 2, ";\n");
++	}
++	f_print(fout, "\t} %s_u;\n", name);
++	f_print(fout, "};\n");
++	f_print(fout, "typedef struct %s %s;\n", name, name);
++}
++
++static void
++pdefine(char *name, char *num)
++{
++	f_print(fout, "#define %s %s\n", name, num);
++}
++
++static void
++puldefine(char *name, char *num)
++{
++	f_print(fout, "#define %s ((u_int32_t)%s)\n", name, num);
++}
++
++static int
++define_printed(proc_list *stop, version_list *start)
++{
++	version_list *vers;
++	proc_list *proc;
++
++	for (vers = start; vers != NULL; vers = vers->next) {
++		for (proc = vers->procs; proc != NULL; proc = proc->next) {
++			if (proc == stop) {
++				return (0);
++			} else if (streq(proc->proc_name, stop->proc_name)) {
++				return (1);
++			}
++		}
++	}
++	abort();
++	/* NOTREACHED */
++}
++
++static void
++pprogramdef(definition *def)
++{
++	version_list   *vers;
++	proc_list      *proc;
++	int             i;
++	char           *ext;
++
++	pargdef(def);
++
++	puldefine(def->def_name, def->def.pr.prog_num);
++	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
++		if (tblflag) {
++			f_print(fout, "extern struct rpcgen_table %s_%s_table[];\n",
++				locase(def->def_name), vers->vers_num);
++			f_print(fout, "extern %s_%s_nproc;\n",
++				locase(def->def_name), vers->vers_num);
++		}
++		puldefine(vers->vers_name, vers->vers_num);
++
++		/*
++		 * Print out 3 definitions, one for ANSI-C, another for C++,
++		 * a third for old style C
++		 */
++
++		for (i = 0; i < 3; i++) {
++			if (i == 0) {
++				f_print(fout, "\n#ifdef __cplusplus\n");
++				ext = "extern \"C\" ";
++			} else if (i == 1) {
++				f_print(fout, "\n#elif __STDC__\n");
++				ext = "extern  ";
++			} else {
++				f_print(fout, "\n#else /* Old Style C */ \n");
++				ext = "extern  ";
++			}
++
++
++			for (proc = vers->procs; proc != NULL; proc = proc->next) {
++				if (!define_printed(proc, def->def.pr.versions)) {
++					puldefine(proc->proc_name, proc->proc_num);
++				}
++				f_print(fout, "%s", ext);
++				pprocdef(proc, vers, "CLIENT *", 0, i);
++				f_print(fout, "%s", ext);
++				pprocdef(proc, vers, "struct svc_req *", 1, i);
++
++			}
++
++		}
++		f_print(fout, "#endif /* Old Style C */ \n");
++	}
++}
++
++static void
++pprocdef(proc_list *proc, version_list *vp, char *addargtype,
++				int server_p, int mode)
++{
++	ptype(proc->res_prefix, proc->res_type, 1);
++	f_print(fout, "* ");
++	if (server_p)
++		pvname_svc(proc->proc_name, vp->vers_num);
++	else
++		pvname(proc->proc_name, vp->vers_num);
++
++	/*
++	 * mode  0 == cplusplus, mode  1 = ANSI-C, mode 2 = old style C
++	 */
++	if (mode == 0 || mode == 1)
++		parglist(proc, addargtype);
++	else
++		f_print(fout, "();\n");
++}
++
++
++
++/* print out argument list of procedure */
++static void
++parglist(proc_list *proc, char *addargtype)
++{
++	decl_list      *dl;
++
++	f_print(fout, "(");
++
++	if (proc->arg_num < 2 && newstyle &&
++		streq(proc->args.decls->decl.type, "void")) {
++		/* 0 argument in new style:  do nothing */
++	} else {
++		for (dl = proc->args.decls; dl != NULL; dl = dl->next) {
++			ptype(dl->decl.prefix, dl->decl.type, 1);
++			if (!newstyle)
++				f_print(fout, "*");	/* old style passes by reference */
++
++			f_print(fout, ", ");
++		}
++	}
++
++	f_print(fout, "%s);\n", addargtype);
++}
++
++static void
++penumdef(definition *def)
++{
++	char *name = def->def_name;
++	enumval_list *l;
++	char *last = NULL;
++	int count = 0;
++
++	f_print(fout, "enum %s {\n", name);
++	for (l = def->def.en.vals; l != NULL; l = l->next) {
++		f_print(fout, "\t%s", l->name);
++		if (l->assignment) {
++			f_print(fout, " = %s", l->assignment);
++			last = l->assignment;
++			count = 1;
++		} else {
++			if (last == NULL) {
++				f_print(fout, " = %d", count++);
++			} else {
++				f_print(fout, " = %s + %d", last, count++);
++			}
++		}
++		f_print(fout, ",\n");
++	}
++	f_print(fout, "};\n");
++	f_print(fout, "typedef enum %s %s;\n", name, name);
++}
++
++static void
++ptypedef(definition *def)
++{
++	char *name = def->def_name;
++	char *old = def->def.ty.old_type;
++	char prefix[8];	/* enough to contain "struct ", including NUL */
++	relation rel = def->def.ty.rel;
++
++
++	if (!streq(name, old)) {
++		if (streq(old, "string")) {
++			old = "char";
++			rel = REL_POINTER;
++		} else if (streq(old, "opaque")) {
++			old = "char";
++		} else if (streq(old, "bool")) {
++			old = "bool_t";
++		}
++		if (undefined2(old, name) && def->def.ty.old_prefix) {
++			s_print(prefix, "%s ", def->def.ty.old_prefix);
++		} else {
++			prefix[0] = 0;
++		}
++		f_print(fout, "typedef ");
++		switch (rel) {
++		case REL_ARRAY:
++			f_print(fout, "struct {\n");
++			f_print(fout, "\tu_int %s_len;\n", name);
++			f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name);
++			f_print(fout, "} %s", name);
++			break;
++		case REL_POINTER:
++			f_print(fout, "%s%s *%s", prefix, old, name);
++			break;
++		case REL_VECTOR:
++			f_print(fout, "%s%s %s[%s]", prefix, old, name,
++				def->def.ty.array_max);
++			break;
++		case REL_ALIAS:
++			f_print(fout, "%s%s %s", prefix, old, name);
++			break;
++		}
++		f_print(fout, ";\n");
++	}
++}
++
++void
++pdeclaration(char *name, declaration *dec, int tab, char *separator)
++{
++	char buf[8];	/* enough to hold "struct ", include NUL */
++	char *prefix;
++	char *type;
++
++	if (streq(dec->type, "void")) {
++		return;
++	}
++	tabify(fout, tab);
++	if (streq(dec->type, name) && !dec->prefix) {
++		f_print(fout, "struct ");
++	}
++	if (streq(dec->type, "string")) {
++		f_print(fout, "char *%s", dec->name);
++	} else {
++		prefix = "";
++		if (streq(dec->type, "bool")) {
++			type = "bool_t";
++		} else if (streq(dec->type, "opaque")) {
++			type = "char";
++		} else {
++			if (dec->prefix) {
++				s_print(buf, "%s ", dec->prefix);
++				prefix = buf;
++			}
++			type = dec->type;
++		}
++		switch (dec->rel) {
++		case REL_ALIAS:
++			f_print(fout, "%s%s %s", prefix, type, dec->name);
++			break;
++		case REL_VECTOR:
++			f_print(fout, "%s%s %s[%s]", prefix, type, dec->name,
++				dec->array_max);
++			break;
++		case REL_POINTER:
++			f_print(fout, "%s%s *%s", prefix, type, dec->name);
++			break;
++		case REL_ARRAY:
++			f_print(fout, "struct {\n");
++			tabify(fout, tab);
++			f_print(fout, "\tu_int %s_len;\n", dec->name);
++			tabify(fout, tab);
++			f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name);
++			tabify(fout, tab);
++			f_print(fout, "} %s", dec->name);
++			break;
++		}
++	}
++	f_print(fout, separator );
++}
++
++static int
++undefined2(char *type, char *stop)
++{
++	list *l;
++	definition *def;
++
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind != DEF_PROGRAM) {
++			if (streq(def->def_name, stop)) {
++				return (1);
++			} else if (streq(def->def_name, type)) {
++				return (0);
++			}
++		}
++	}
++	return (1);
++}
+diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c
+new file mode 100644
+index 0000000..28aa60c
+--- /dev/null
++++ b/rpcgen/rpc_main.c
+@@ -0,0 +1,1067 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_main.c, Top level of the RPC protocol compiler. 
++ */
++
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/file.h>
++#include <sys/stat.h>
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <ctype.h>
++#include <errno.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++#include "rpc_scan.h"
++
++struct commandline {
++	int cflag;		/* xdr C routines */
++	int hflag;		/* header file */
++	int lflag;		/* client side stubs */
++	int mflag;		/* server side stubs */
++	int nflag;		/* netid flag */
++	int sflag;		/* server stubs for the given transport */
++	int tflag;		/* dispatch Table file */
++	int Ssflag;		/* produce server sample code */
++	int Scflag;		/* produce client sample code */
++	char *infile;		/* input module name */
++	char *outfile;		/* output module name */
++};
++
++static char *	extendfile(char *file, char *ext);
++static void	open_output(char *infile, char *outfile);
++static void	add_warning(void);
++static void	clear_args(void);
++static void	open_input(char *infile, char *define);
++static int	check_nettype(char *name, char **list_to_check);
++static void	c_output(char *infile, char *define, int extend, char *outfile);
++static void	c_initialize(void);
++static char *	generate_guard(char *pathname);
++static void	h_output(char *infile, char *define, int extend, char *outfile);
++static void	s_output(int argc, char **argv, char *infile,
++			char *define, int extend, char *outfile,
++			int nomain, int netflag);
++static void	l_output(char *infile, char *define, int extend, char *outfile);
++static void	t_output(char *infile, char *define, int extend, char *outfile);
++static void	svc_output(char *, char *, int, char *);
++static void	clnt_output(char *, char *, int, char *);
++static int	do_registers(int argc, char **argv);
++static void	addarg(char *cp);
++static void	putarg(int where, char *cp);
++static void	checkfiles(char *infile, char *outfile);
++static int	parseargs(int argc, char **argv, struct commandline *cmd);
++static void	usage(void);
++static void	options_usage(void);
++
++/*
++extern void  write_sample_svc();
++int write_sample_clnt();
++void write_sample_clnt_main();
++
++static svc_output();
++ */
++
++#define EXTEND	1		/* alias for TRUE */
++#define DONT_EXTEND	0		/* alias for FALSE */
++
++#define SVR4_CPP "/usr/ccs/lib/cpp"
++#define SUNOS_CPP "/lib/cpp"
++static int cppDefined = 0;          /* explicit path for C preprocessor */
++
++
++static char *cmdname;
++
++static char *svcclosetime = "120";
++static char *CPP = SVR4_CPP;
++static char CPPFLAGS[] = "-C";
++static char pathbuf[MAXPATHLEN + 1];
++static char *allv[] = {
++	"rpcgen", "-s", "udp", "-s", "tcp",
++};
++static int allc = sizeof(allv)/sizeof(allv[0]);
++static char *allnv[] = {
++	"rpcgen", "-s", "netpath",
++};
++static int allnc = sizeof(allnv)/sizeof(allnv[0]);
++
++/*
++ * machinations for handling expanding argument list
++ */
++#if 0
++static void addarg();		/* add another argument to the list */
++static void putarg();		/* put argument at specified location  */
++static void clear_args();	/* clear argument list */
++static void checkfiles();	/* check if out file already exists */
++#endif
++
++
++
++#define ARGLISTLEN	20
++#define FIXEDARGS         2
++
++static char *arglist[ARGLISTLEN];
++static int argcount = FIXEDARGS;
++
++
++int nonfatalerrors;	/* errors */
++int inetdflag/* = 1*/;	/* Support for inetd */ /* is now the default */
++int pmflag;		/* Support for port monitors */
++int logflag;		/* Use syslog instead of fprintf for errors */
++int tblflag;		/* Support for dispatch table file */
++
++/* length at which to start doing an inline */
++#define INLINE 3
++
++int Inline = INLINE;	/* length at which to start doing an inline. 3 = default
++			 * if 0, no xdr_inline code */
++
++int indefinitewait;	/* If started by port monitors, hang till it wants */
++int exitnow;		/* If started by port monitors, exit after the call */
++int timerflag;		/* TRUE if !indefinite && !exitnow */
++int newstyle;           /* newstyle of passing arguments (by value) */
++int Cflag = 0 ;         /* ANSI C syntax */
++static int allfiles;    /* generate all files */
++#ifdef linux
++int tirpcflag = 0;	/* no tirpc by default */
++#else
++int tirpcflag = 1;      /* generating code for tirpc, by default */
++#endif
++
++int
++main(int argc, char **argv)
++{
++	struct commandline cmd;
++
++	(void) memset((char *) &cmd, 0, sizeof(struct commandline));
++	clear_args();
++	if (!parseargs(argc, argv, &cmd))
++		usage();
++
++	if (cmd.cflag || cmd.hflag || cmd.lflag || cmd.tflag || cmd.sflag ||
++		cmd.mflag || cmd.nflag || cmd.Ssflag || cmd.Scflag) {
++		checkfiles(cmd.infile, cmd.outfile);
++	} else
++		checkfiles(cmd.infile, NULL);
++
++	if (cmd.cflag) {
++		c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile);
++	} else if (cmd.hflag) {
++		h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile);
++	} else if (cmd.lflag) {
++		l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile);
++	} else if (cmd.sflag || cmd.mflag || (cmd.nflag)) {
++		s_output(argc, argv, cmd.infile, "-DRPC_SVC", DONT_EXTEND,
++			cmd.outfile, cmd.mflag, cmd.nflag);
++	} else if (cmd.tflag) {
++		t_output(cmd.infile, "-DRPC_TBL", DONT_EXTEND, cmd.outfile);
++	} else if (cmd.Ssflag) {
++		svc_output(cmd.infile, "-DRPC_SERVER", DONT_EXTEND, cmd.outfile);
++	} else if (cmd.Scflag) {
++		clnt_output(cmd.infile, "-DRPC_CLIENT", DONT_EXTEND, cmd.outfile);
++	} else {
++		/* the rescans are required, since cpp may effect input */
++		c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c");
++		reinitialize();
++		h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h");
++		reinitialize();
++		l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c");
++		reinitialize();
++		if (inetdflag || !tirpcflag)
++			s_output(allc, allv, cmd.infile, "-DRPC_SVC", EXTEND,
++				"_svc.c", cmd.mflag, cmd.nflag);
++		else
++			s_output(allnc, allnv, cmd.infile, "-DRPC_SVC",
++				EXTEND, "_svc.c", cmd.mflag, cmd.nflag);
++		if (tblflag) {
++			reinitialize();
++			t_output(cmd.infile, "-DRPC_TBL", EXTEND, "_tbl.i");
++		}
++		if (allfiles) {
++			reinitialize();
++			svc_output(cmd.infile, "-DRPC_SERVER", EXTEND, "_server.c");
++		}
++		if (allfiles) {
++			reinitialize();
++			clnt_output(cmd.infile, "-DRPC_CLIENT", EXTEND, "_client.c");
++		}
++	}
++	exit(nonfatalerrors);
++	/* NOTREACHED */
++}
++
++/*
++ * add extension to filename 
++ */
++static char *
++extendfile(char *file, char *ext)
++{
++	char *res;
++	char *p;
++
++	res = alloc(strlen(file) + strlen(ext) + 1);
++	if (res == NULL) {
++		abort();
++	}
++	p = strrchr(file, '.');
++	if (p == NULL) {
++		p = file + strlen(file);
++	}
++	(void) strcpy(res, file);
++	(void) strcpy(res + (p - file), ext);
++	return (res);
++}
++
++/*
++ * Open output file with given extension 
++ */
++static void
++open_output(char *infile, char *outfile)
++{
++
++	if (outfile == NULL) {
++		fout = stdout;
++		return;
++	}
++
++	if (infile != NULL && streq(outfile, infile)) {
++		f_print(stderr, "%s: output would overwrite %s\n", cmdname,
++			infile);
++		crash();
++	}
++	fout = fopen(outfile, "w");
++	if (fout == NULL) {
++		f_print(stderr, "%s: unable to open ", cmdname);
++		perror(outfile);
++		crash();
++	}
++	record_open(outfile);
++
++}
++
++static void
++add_warning(void)
++{
++	f_print(fout, "/*\n");
++	f_print(fout, " * Please do not edit this file.\n");
++	f_print(fout, " * It was generated using rpcgen.\n");
++	f_print(fout, " */\n\n");
++}
++
++/* clear list of arguments */
++static void
++clear_args(void)
++{
++  int i;
++  for( i=FIXEDARGS; i<ARGLISTLEN; i++ )
++    arglist[i] = NULL;
++  argcount = FIXEDARGS;
++}
++
++/*
++ * Open input file with given define for C-preprocessor 
++ */
++static void
++open_input(char *infile, char *define)
++{
++	int pd[2];
++
++	infilename = (infile == NULL) ? "<stdin>" : infile;
++	(void) pipe(pd);
++	switch (fork()) {
++	case 0:
++		putarg(0, "cpp");
++		putarg(1, CPPFLAGS);
++		addarg(define);
++		addarg(infile);
++		addarg((char *)NULL);
++		(void) close(1);
++		(void) dup2(pd[1], 1);
++		(void) close(pd[0]);
++		if (cppDefined)
++			execv(CPP, arglist);
++		else {
++			execvp("cpp", arglist);
++			if (errno == ENOENT)
++				execvp(SVR4_CPP, arglist);
++			if (errno == ENOENT)
++				execvp(SUNOS_CPP, arglist);
++		}
++		perror("execv");
++		exit(1);
++	case -1:
++		perror("fork");
++		exit(1);
++	}
++	(void) close(pd[1]);
++	fin = fdopen(pd[0], "r");
++	if (fin == NULL) {
++		f_print(stderr, "%s: ", cmdname);
++		perror(infilename);
++		crash();
++	}
++}
++
++/* valid tirpc nettypes */
++static char*	valid_ti_nettypes[] =
++{
++	"netpath",
++	"visible",
++	"circuit_v",
++	"datagram_v",
++	"circuit_n",
++	"datagram_n",
++	"udp",
++	"tcp",
++	"raw",
++	NULL
++};
++
++/* valid inetd nettypes */
++static char* valid_i_nettypes[] =
++{
++	"udp",
++	"tcp",
++	NULL
++};
++
++static int
++check_nettype(char *name, char **list_to_check)
++{
++  int i;
++  for( i = 0; list_to_check[i] != NULL; i++ ) {
++	  if( strcmp( name, list_to_check[i] ) == 0 ) {
++	    return 1;
++	  }
++  }
++  f_print( stderr, "illegal nettype :\'%s\'\n", name );
++  return 0;
++}
++
++/*
++ * Compile into an XDR routine output file
++ */
++
++static void
++c_output(char *infile, char *define, int extend, char *outfile)
++{
++	definition *def;
++	char *include;
++	char *outfilename;
++	long tell;
++
++	c_initialize();
++	open_input(infile, define);	
++	outfilename = extend ? extendfile(infile, outfile) : outfile;
++	open_output(infile, outfilename);
++	add_warning();
++	if (infile && (include = extendfile(infile, ".h"))) {
++		f_print(fout, "#include \"%s\"\n", include);
++		free(include);
++		/* .h file already contains rpc/rpc.h */
++	} else
++	  f_print(fout, "#include <rpc/rpc.h>\n");
++	tell = ftell(fout);
++	while ((def = get_definition()) != NULL) {
++		emit(def);
++	}
++	if (extend && tell == ftell(fout)) {
++		(void) unlink(outfilename);
++	}
++}
++
++
++static void
++c_initialize(void)
++{
++
++  /* add all the starting basic types */
++
++  add_type(1,"int");
++  add_type(1,"int32_t");
++  add_type(1,"short");
++  add_type(1,"bool");
++
++  add_type(1,"u_int");
++  add_type(1,"u_int32_t");
++  add_type(1,"u_short");
++
++}
++
++char rpcgen_table_dcl[] = "struct rpcgen_table {\n\
++	char	*(*proc)();\n\
++	xdrproc_t	xdr_arg;\n\
++	unsigned	len_arg;\n\
++	xdrproc_t	xdr_res;\n\
++	unsigned	len_res;\n\
++};\n";
++
++
++static char *
++generate_guard(char *pathname)
++{
++        char* filename, *guard, *tmp;
++
++	filename = strrchr(pathname, '/' );  /* find last component */
++	filename = ((filename == 0) ? pathname : filename+1);
++	guard = strdup(filename);
++	/* convert to upper case */
++	tmp = guard;
++	while (*tmp) {
++		if (islower(*tmp))
++			*tmp = toupper(*tmp);
++		tmp++;
++	}
++		
++	guard = extendfile(guard, "_H_RPCGEN");
++	return( guard );
++}
++
++/*
++ * Compile into an XDR header file
++ */
++static void
++h_output(char *infile, char *define, int extend, char *outfile)
++{
++	definition *def;
++	char *outfilename;
++	long tell;
++	char *guard;
++	list *l;
++
++	open_input(infile, define);
++	outfilename =  extend ? extendfile(infile, outfile) : outfile;
++	open_output(infile, outfilename);
++	add_warning();
++	guard = generate_guard(  outfilename ? outfilename: infile );
++
++	f_print(fout,"#ifndef _%s\n#define _%s\n\n", guard,
++		guard);
++
++	f_print(fout, "#include <rpc/rpc.h>\n\n");
++
++	f_print(fout, "#ifndef IXDR_GET_INT32\n");
++	f_print(fout, "#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))\n");
++	f_print(fout, "#endif\n");
++	f_print(fout, "#ifndef IXDR_PUT_INT32\n");
++	f_print(fout, "#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))\n");
++	f_print(fout, "#endif\n");
++	f_print(fout, "#ifndef IXDR_GET_U_INT32\n");
++	f_print(fout, "#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))\n");
++	f_print(fout, "#endif\n");
++	f_print(fout, "#ifndef IXDR_PUT_U_INT32\n");
++	f_print(fout, "#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))\n");
++	f_print(fout, "#endif\n");
++
++	tell = ftell(fout);
++	/* print data definitions */
++	while ((def = get_definition()) != NULL) {
++		print_datadef(def);
++	}
++
++	/* print function declarations.  
++	   Do this after data definitions because they might be used as
++	   arguments for functions */
++	for (l = defined; l != NULL; l = l->next) {
++		print_funcdef(l->val);
++	}
++	if (extend && tell == ftell(fout)) {
++		(void) unlink(outfilename);
++	} else if (tblflag) {
++		f_print(fout, rpcgen_table_dcl);
++	}
++	f_print(fout, "\n#endif /* !_%s */\n", guard);
++}
++
++/*
++ * Compile into an RPC service
++ */
++static void
++s_output(int argc, char **argv, char *infile, char *define, int extend,
++			char *outfile, int nomain, int netflag)
++{
++	char *include;
++	definition *def;
++	int foundprogram = 0;
++	char *outfilename;
++
++	open_input(infile, define);
++	outfilename = extend ? extendfile(infile, outfile) : outfile;
++	open_output(infile, outfilename);
++	add_warning();
++	if (infile && (include = extendfile(infile, ".h"))) {
++		f_print(fout, "#include \"%s\"\n", include);
++		free(include);
++	} else
++	  f_print(fout, "#include <rpc/rpc.h>\n");
++
++	f_print(fout, "#include <stdio.h>\n");
++	f_print(fout, "#include <stdlib.h>/* getenv, exit */\n"); 
++	if (Cflag) {
++		f_print (fout, "#include <rpc/pmap_clnt.h> /* for pmap_unset */\n");
++		f_print (fout, "#include <string.h> /* strcmp */ \n"); 
++	}
++	if (strcmp(svcclosetime, "-1") == 0)
++		indefinitewait = 1;
++	else if (strcmp(svcclosetime, "0") == 0)
++		exitnow = 1;
++	else if (inetdflag || pmflag) {
++		f_print(fout, "#include <signal.h>\n");
++	  timerflag = 1;
++	}
++
++#ifndef linux
++	if( !tirpcflag && inetdflag )
++	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
++#else
++	if( !tirpcflag )
++	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
++#endif
++	if( Cflag && (inetdflag || pmflag ) ) {
++	  f_print(fout, "#ifdef __cplusplus\n");
++	  f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n"); 
++	  f_print(fout, "#endif /* __cplusplus */\n");
++	  
++	  if( tirpcflag )
++	    f_print(fout, "#include <unistd.h> /* setsid */\n");
++	}
++	if( tirpcflag )
++	  f_print(fout, "#include <sys/types.h>\n");
++
++	f_print(fout, "#include <memory.h>\n");
++#ifndef linux
++	f_print(fout, "#include <stropts.h>\n");
++#endif
++	if (inetdflag || !tirpcflag ) {
++		f_print(fout, "#include <sys/socket.h>\n");
++		f_print(fout, "#include <netinet/in.h>\n");
++	} 
++
++	if ( (netflag || pmflag) && tirpcflag ) {
++		f_print(fout, "#include <netconfig.h>\n");
++	}
++	if (/*timerflag &&*/ tirpcflag)
++		f_print(fout, "#include <sys/resource.h> /* rlimit */\n");
++	if (logflag || inetdflag || pmflag) {
++#ifdef linux
++		f_print(fout, "#include <syslog.h>\n");
++#else
++		f_print(fout, "#ifdef SYSLOG\n");
++		f_print(fout, "#include <syslog.h>\n");
++		f_print(fout, "#else\n");
++		f_print(fout, "#define LOG_ERR 1\n");
++		f_print(fout, "#define openlog(a, b, c)\n");
++		f_print(fout, "#endif\n");
++#endif
++	}
++
++	/* for ANSI-C */
++	f_print(fout, "\n#ifdef __STDC__\n#define SIG_PF void(*)(int)\n#endif\n");
++
++	f_print(fout, "\n#ifdef DEBUG\n#define RPC_SVC_FG\n#endif\n");
++	if (timerflag)
++		f_print(fout, "\n#define _RPCSVC_CLOSEDOWN %s\n", svcclosetime);
++	while ((def = get_definition()) != NULL) {
++		foundprogram |= (def->def_kind == DEF_PROGRAM);
++	}
++	if (extend && !foundprogram) {
++		(void) unlink(outfilename);
++		return;
++	}
++	write_most(infile, netflag, nomain);
++	if (!nomain) {
++		if( !do_registers(argc, argv) ) {
++		  if (outfilename)
++		    (void) unlink(outfilename);
++		  usage();
++		}
++		write_rest();
++	}
++}
++
++/*
++ * generate client side stubs
++ */
++static void
++l_output(char *infile, char *define, int extend, char *outfile)
++{
++	char *include;
++	definition *def;
++	int foundprogram = 0;
++	char *outfilename;
++
++	open_input(infile, define);
++	outfilename = extend ? extendfile(infile, outfile) : outfile;
++	open_output(infile, outfilename);
++	add_warning();
++	if (Cflag)
++	  f_print (fout, "#include <memory.h> /* for memset */\n");
++	if (infile && (include = extendfile(infile, ".h"))) {
++		f_print(fout, "#include \"%s\"\n", include);
++		free(include);
++	} else
++	  f_print(fout, "#include <rpc/rpc.h>\n");
++	while ((def = get_definition()) != NULL) {
++		foundprogram |= (def->def_kind == DEF_PROGRAM);
++	}
++	if (extend && !foundprogram) {
++		(void) unlink(outfilename);
++		return;
++	}
++	write_stubs();
++}
++
++/*
++ * generate the dispatch table
++ */
++static void
++t_output(char *infile, char *define, int extend, char *outfile)
++{
++	definition *def;
++	int foundprogram = 0;
++	char *outfilename;
++
++	open_input(infile, define);
++	outfilename = extend ? extendfile(infile, outfile) : outfile;
++	open_output(infile, outfilename);
++	add_warning();
++	while ((def = get_definition()) != NULL) {
++		foundprogram |= (def->def_kind == DEF_PROGRAM);
++	}
++	if (extend && !foundprogram) {
++		(void) unlink(outfilename);
++		return;
++	}
++	write_tables();
++}
++
++/* sample routine for the server template */
++static  void
++svc_output(char *infile, char *define, int extend, char *outfile)
++{
++  definition *def;
++  char *include;
++  char *outfilename;
++  long tell;
++  
++  open_input(infile, define);	
++  outfilename = extend ? extendfile(infile, outfile) : outfile;
++  checkfiles(infile,outfilename); /*check if outfile already exists.
++				  if so, print an error message and exit*/
++  open_output(infile, outfilename);
++  add_sample_msg();
++
++  if (infile && (include = extendfile(infile, ".h"))) {
++    f_print(fout, "#include \"%s\"\n", include);
++    free(include);
++  } else
++    f_print(fout, "#include <rpc/rpc.h>\n");
++
++  tell = ftell(fout);
++  while ((def = get_definition()) != NULL) {
++	  write_sample_svc(def);
++  }
++  if (extend && tell == ftell(fout)) {
++	  (void) unlink(outfilename);
++  }
++}
++
++
++/* sample main routine for client */
++static  void
++clnt_output(char *infile, char *define, int extend, char *outfile)
++{
++	definition     *def;
++	char           *include;
++	char           *outfilename;
++	long            tell;
++	int             has_program = 0;
++
++	open_input(infile, define);
++	outfilename = extend ? extendfile(infile, outfile) : outfile;
++	checkfiles(infile, outfilename);	/*check if outfile already exists.
++				  if so, print an error message and exit*/
++
++	open_output(infile, outfilename);
++	add_sample_msg();
++	if (infile && (include = extendfile(infile, ".h"))) {
++		f_print(fout, "#include \"%s\"\n", include);
++		free(include);
++	} else
++		f_print(fout, "#include <rpc/rpc.h>\n");
++	tell = ftell(fout);
++	while ((def = get_definition()) != NULL) {
++		has_program += write_sample_clnt(def);
++	}
++
++	if (has_program)
++		write_sample_clnt_main();
++
++	if (extend && tell == ftell(fout)) {
++		(void) unlink(outfilename);
++	}
++}
++
++/*
++ * Perform registrations for service output 
++ * Return 0 if failed; 1 otherwise.
++ */
++static int
++do_registers(int argc, char **argv)
++{
++	int             i;
++
++	if (inetdflag || !tirpcflag) {
++		for (i = 1; i < argc; i++) {
++			if (streq(argv[i], "-s")) {
++				if (!check_nettype(argv[i + 1], valid_i_nettypes))
++					return 0;
++				write_inetd_register(argv[i + 1]);
++				i++;
++			}
++		}
++	} else {
++		for (i = 1; i < argc; i++)
++			if (streq(argv[i], "-s")) {
++				if (!check_nettype(argv[i + 1], valid_ti_nettypes))
++					return 0;
++				write_nettype_register(argv[i + 1]);
++				i++;
++			} else if (streq(argv[i], "-n")) {
++				write_netid_register(argv[i + 1]);
++				i++;
++			}
++	}
++	return 1;
++}
++
++/*
++ * Add another argument to the arg list
++ */
++static void
++addarg(char *cp)
++{
++	if (argcount >= ARGLISTLEN) {
++		f_print(stderr, "rpcgen: too many defines\n");
++		crash();
++		/*NOTREACHED*/
++	}
++	arglist[argcount++] = cp;
++
++}
++
++static void
++putarg(int where, char *cp)
++{
++	if (where >= ARGLISTLEN) {
++		f_print(stderr, "rpcgen: arglist coding error\n");
++		crash();
++		/*NOTREACHED*/
++	}
++	arglist[where] = cp;
++	
++}
++
++/*
++ * if input file is stdin and an output file is specified then complain
++ * if the file already exists. Otherwise the file may get overwritten
++ * If input file does not exist, exit with an error 
++ */
++
++static void
++checkfiles(char *infile, char *outfile) 
++{
++
++  struct stat buf;
++
++  if(infile)			/* infile ! = NULL */
++    if(stat(infile,&buf) < 0)
++      {
++	perror(infile);
++	crash();
++      };
++  if (outfile) {
++    if (stat(outfile, &buf) < 0) 
++      return;			/* file does not exist */
++    else {
++      f_print(stderr, 
++	      "file '%s' already exists and may be overwritten\n", outfile);
++      crash();
++    }
++  }
++}
++
++/*
++ * Parse command line arguments 
++ */
++static int
++parseargs(int argc, char **argv, struct commandline *cmd)
++{
++	int i;
++	int j;
++	char c;
++	char flag[(1 << 8 * sizeof(char))];
++	int nflags;
++
++	cmdname = argv[0];
++	cmd->infile = cmd->outfile = NULL;
++	if (argc < 2) {
++		return (0);
++	}
++	allfiles = 0;
++	flag['c'] = 0;
++	flag['h'] = 0;
++	flag['l'] = 0;
++	flag['m'] = 0;
++	flag['o'] = 0;
++	flag['s'] = 0;
++	flag['n'] = 0;
++	flag['t'] = 0;
++	flag['S'] = 0;
++	flag['C'] = 0;
++	for (i = 1; i < argc; i++) {
++		if (argv[i][0] != '-') {
++			if (cmd->infile) {
++			        f_print( stderr, "Cannot specify more than one input file!\n");
++
++				return (0);
++			}
++			cmd->infile = argv[i];
++		} else {
++			for (j = 1; argv[i][j] != 0; j++) {
++				c = argv[i][j];
++				switch (c) {
++				case 'a':
++					allfiles = 1;
++					break;
++				case 'c':
++				case 'h':
++				case 'l':
++				case 'm':
++				case 't':
++					if (flag[(int) c]) {
++						return (0);
++					}
++					flag[(int) c] = 1;
++					break;
++				case 'S':  
++					/* sample flag: Ss or Sc.
++					   Ss means set flag['S'];
++					   Sc means set flag['C']; */
++					c = argv[i][++j];  /* get next char */
++					if( c == 's' )
++					  c = 'S';
++					else if( c == 'c' )
++					  c = 'C';
++					else
++					  return( 0 );
++
++					if (flag[(int) c]) {
++						return (0);
++					}
++					flag[(int) c] = 1;
++					break;
++				case 'C':  /* ANSI C syntax */
++					Cflag = 1;
++					break;
++
++				case 'b':  /* turn TIRPC flag off for
++					    generating backward compatible
++					    */
++					tirpcflag = 0;
++					break;
++
++				case 'I':
++					inetdflag = 1;
++					break;
++				case 'N':
++					newstyle = 1;
++					break;
++				case 'L':
++					logflag = 1;
++					break;
++				case 'K':
++					if (++i == argc) {
++						return (0);
++					}
++					svcclosetime = argv[i];
++					goto nextarg;
++				case 'T':
++					tblflag = 1;
++					break;
++				case 'i' :
++				  	if (++i == argc) {
++						return (0);
++					}
++					Inline = atoi(argv[i]);
++					goto nextarg;
++				case 'n':
++				case 'o':
++				case 's':
++					if (argv[i][j - 1] != '-' || 
++					    argv[i][j + 1] != 0) {
++						return (0);
++					}
++					flag[(int) c] = 1;
++					if (++i == argc) {
++						return (0);
++					}
++					if (c == 's') {
++						if (!streq(argv[i], "udp") &&
++						    !streq(argv[i], "tcp")) {
++							return (0);
++						}
++					} else if (c == 'o') {
++						if (cmd->outfile) {
++							return (0);
++						}
++						cmd->outfile = argv[i];
++					}
++					goto nextarg;
++				case 'D':
++					if (argv[i][j - 1] != '-') {
++						return (0);
++					}
++					(void) addarg(argv[i]);
++					goto nextarg;
++				case 'Y':
++					if (++i == argc) {
++						return (0);
++					}
++					(void) strcpy(pathbuf, argv[i]);
++					(void) strcat(pathbuf, "/cpp");
++					CPP = pathbuf;
++					cppDefined = 1;
++					goto nextarg;
++
++
++
++				default:
++					return (0);
++				}
++			}
++	nextarg:
++			;
++		}
++	}
++
++	cmd->cflag = flag['c'];
++	cmd->hflag = flag['h'];
++	cmd->lflag = flag['l'];
++	cmd->mflag = flag['m'];
++	cmd->nflag = flag['n'];
++	cmd->sflag = flag['s'];
++	cmd->tflag = flag['t'];
++	cmd->Ssflag = flag['S'];
++	cmd->Scflag = flag['C'];
++
++	if( tirpcflag ) {
++	  pmflag = inetdflag ? 0 : 1;	  /* pmflag or inetdflag is always TRUE */
++	  if( (inetdflag && cmd->nflag)) { /* netid not allowed with inetdflag */
++	    f_print(stderr, "Cannot use netid flag with inetd flag!\n");
++	    return (0);
++	  }
++	} else {  /* 4.1 mode */
++	  pmflag = 0;               /* set pmflag only in tirpcmode */
++	  inetdflag = 1;            /* inetdflag is TRUE by default */
++	  if( cmd->nflag ) {          /* netid needs TIRPC */
++	    f_print( stderr, "Cannot use netid flag without TIRPC!\n");
++	    return( 0 );
++	  }
++	}
++
++	if( newstyle && ( tblflag || cmd->tflag) ) {
++	  f_print( stderr, "Cannot use table flags with newstyle!\n");
++	  return( 0 );
++	}
++
++	/* check no conflicts with file generation flags */
++	nflags = cmd->cflag + cmd->hflag + cmd->lflag + cmd->mflag +
++		cmd->sflag + cmd->nflag + cmd->tflag + cmd->Ssflag + cmd->Scflag;
++
++	if (nflags == 0) {
++		if (cmd->outfile != NULL || cmd->infile == NULL) {
++			return (0);
++		}
++	} else if (nflags > 1) {
++	        f_print( stderr, "Cannot have more than one file generation flag!\n");
++		return (0);
++	}
++	return (1);
++}
++
++static void
++usage(void)
++{
++	f_print(stderr, "usage:  %s infile\n", cmdname);
++	f_print(stderr, "\t%s [-a][-b][-C][-Dname[=value]] -i size  [-I [-K seconds]] [-L][-N][-T] infile\n",
++			cmdname);
++	f_print(stderr, "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss] [-o outfile] [infile]\n",
++			cmdname);
++	f_print(stderr, "\t%s [-s nettype]* [-o outfile] [infile]\n", cmdname);
++	f_print(stderr, "\t%s [-n netid]* [-o outfile] [infile]\n", cmdname);
++	options_usage();
++	exit(1);
++}
++
++static void
++options_usage(void)
++{
++	f_print(stderr, "options:\n");
++	f_print(stderr, "-a\t\tgenerate all files, including samples\n");
++	f_print(stderr, "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n");
++	f_print(stderr, "-c\t\tgenerate XDR routines\n");
++	f_print(stderr, "-C\t\tANSI C mode\n");
++	f_print(stderr, "-Dname[=value]\tdefine a symbol (same as #define)\n");
++	f_print(stderr, "-h\t\tgenerate header file\n");
++	f_print(stderr, "-i size\t\tsize at which to start generating inline code\n");
++	f_print(stderr, "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n");
++	f_print(stderr, "-K seconds\tserver exits after K seconds of inactivity\n");
++	f_print(stderr, "-l\t\tgenerate client side stubs\n");
++	f_print(stderr, "-L\t\tserver errors will be printed to syslog\n");
++	f_print(stderr, "-m\t\tgenerate server side stubs\n");
++	f_print(stderr, "-n netid\tgenerate server code that supports named netid\n");
++	f_print(stderr, "-N\t\tsupports multiple arguments and call-by-value\n");
++	f_print(stderr, "-o outfile\tname of the output file\n");
++	f_print(stderr, "-s nettype\tgenerate server code that supports named nettype\n");
++	f_print(stderr, "-Sc\t\tgenerate sample client code that uses remote procedures\n");
++	f_print(stderr, "-Ss\t\tgenerate sample server code that defines remote procedures\n");
++	f_print(stderr, "-t\t\tgenerate RPC dispatch table\n");
++	f_print(stderr, "-T\t\tgenerate code to support RPC dispatch tables\n");
++	f_print(stderr, "-Y path\t\tdirectory name to find C preprocessor (cpp)\n");
++
++	exit(1);
++}
+diff --git a/rpcgen/rpc_output.h b/rpcgen/rpc_output.h
+new file mode 100644
+index 0000000..eb25a60
+--- /dev/null
++++ b/rpcgen/rpc_output.h
+@@ -0,0 +1,16 @@
++/*
++ * rpc_output.h
++ *
++ * Declarations for output functions
++ *
++ */
++
++#ifndef RPCGEN_NEW_OUTPUT_H
++#define RPCGEN_NEW_OUTPUT_H
++
++void	write_msg_out(void);
++int	nullproc(proc_list *);
++void	printarglist(proc_list *, char *, char *);
++void	pdeclaration(char *, declaration *, int, char *);
++
++#endif /* RPCGEN_NEW_OUTPUT_H */
+diff --git a/rpcgen/rpc_parse.c b/rpcgen/rpc_parse.c
+new file mode 100644
+index 0000000..b53a553
+--- /dev/null
++++ b/rpcgen/rpc_parse.c
+@@ -0,0 +1,609 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_parse.c, Parser for the RPC protocol compiler 
++ * Copyright (C) 1987 Sun Microsystems, Inc.
++ */
++#include <stdio.h>
++#include <string.h>
++#include "rpc/types.h"
++#include "rpc_scan.h"
++#include "rpc_parse.h"
++#include "rpc_util.h"
++
++#define ARGNAME "arg"
++
++/*
++extern char *make_argname();
++extern char *strdup();
++ */
++
++static void	isdefined(definition *defp);
++static void	def_struct(definition *defp);
++static void	def_program(definition *defp);
++static void	def_enum(definition *defp);
++static void	def_const(definition *defp);
++static void	def_union(definition *defp);
++static void	check_type_name(char *name, int new_type);
++static void	def_typedef(definition *defp);
++static void	get_declaration(declaration *dec, defkind dkind);
++static void	get_prog_declaration(declaration *dec, defkind dkind, int num);
++static void	get_type(char **prefixp, char **typep, defkind dkind);
++static void	unsigned_dec(char **typep);
++
++/*
++ * return the next definition you see
++ */
++definition *
++get_definition(void)
++{
++	definition *defp;
++	token tok;
++
++	defp = ALLOC(definition);
++	get_token(&tok);
++	switch (tok.kind) {
++	case TOK_STRUCT:
++		def_struct(defp);
++		break;
++	case TOK_UNION:
++		def_union(defp);
++		break;
++	case TOK_TYPEDEF:
++		def_typedef(defp);
++		break;
++	case TOK_ENUM:
++		def_enum(defp);
++		break;
++	case TOK_PROGRAM:
++		def_program(defp);
++		break;
++	case TOK_CONST:
++		def_const(defp);
++		break;
++	case TOK_EOF:
++		free(defp);
++		return (NULL);
++	default:
++		error("definition keyword expected");
++	}
++	scan(TOK_SEMICOLON, &tok);
++	isdefined(defp);
++	return (defp);
++}
++
++static void
++isdefined(definition *defp)
++{
++	STOREVAL(&defined, defp);
++}
++
++static void
++def_struct(definition *defp)
++{
++	token tok;
++	declaration dec;
++	decl_list *decls;
++	decl_list **tailp;
++
++	defp->def_kind = DEF_STRUCT;
++
++	scan(TOK_IDENT, &tok);
++	defp->def_name = tok.str;
++	scan(TOK_LBRACE, &tok);
++	tailp = &defp->def.st.decls;
++	do {
++		get_declaration(&dec, DEF_STRUCT);
++		decls = ALLOC(decl_list);
++		decls->decl = dec;
++		*tailp = decls;
++		tailp = &decls->next;
++		scan(TOK_SEMICOLON, &tok);
++		peek(&tok);
++	} while (tok.kind != TOK_RBRACE);
++	get_token(&tok);
++	*tailp = NULL;
++}
++
++static void
++def_program(definition *defp)
++{
++	token tok;
++	declaration dec;
++	decl_list *decls;
++	decl_list **tailp;
++	version_list *vlist;
++	version_list **vtailp;
++	proc_list *plist;
++	proc_list **ptailp;
++	int num_args;
++	bool_t isvoid = FALSE; /* whether first argument is void */
++	defp->def_kind = DEF_PROGRAM;
++	scan(TOK_IDENT, &tok);
++	defp->def_name = tok.str;
++	scan(TOK_LBRACE, &tok);
++	vtailp = &defp->def.pr.versions;
++	tailp = &defp->def.st.decls;
++	scan(TOK_VERSION, &tok);
++	do {
++		scan(TOK_IDENT, &tok);
++		vlist = ALLOC(version_list);
++		vlist->vers_name = tok.str;
++		scan(TOK_LBRACE, &tok);
++		ptailp = &vlist->procs;
++		do {
++			/* get result type */
++			plist = ALLOC(proc_list);
++			get_type(&plist->res_prefix, &plist->res_type, 
++				 DEF_PROGRAM);
++			if (streq(plist->res_type, "opaque")) {
++				error("illegal result type");
++			}
++			scan(TOK_IDENT, &tok);
++			plist->proc_name = tok.str;
++			scan(TOK_LPAREN, &tok);
++			/* get args - first one*/
++			num_args = 1;
++			isvoid = FALSE;
++			/* type of DEF_PROGRAM in the first 
++			 * get_prog_declaration and DEF_STURCT in the next
++			 * allows void as argument if it is the only argument
++			 */
++			get_prog_declaration(&dec, DEF_PROGRAM, num_args);
++			if (streq(dec.type, "void"))
++			  isvoid = TRUE;
++			decls = ALLOC(decl_list);
++			plist->args.decls = decls;
++			decls->decl = dec;
++			tailp = &decls->next;
++			/* get args */
++			while(peekscan(TOK_COMMA, &tok)) {
++			  num_args++;
++			  get_prog_declaration(&dec, DEF_STRUCT, 
++					       num_args);
++			  decls = ALLOC(decl_list);
++			  decls->decl = dec;
++			  *tailp = decls;
++			  if (streq(dec.type, "void"))
++			    isvoid = TRUE;
++			  tailp = &decls->next;
++			}
++			/* multiple arguments are only allowed in newstyle */
++			if( !newstyle && num_args > 1 ) {
++			  error("only one argument is allowed" );
++			}
++			if (isvoid && num_args > 1) { 
++			  error("illegal use of void in program definition");
++			}
++			*tailp = NULL;
++			scan(TOK_RPAREN, &tok);
++			scan(TOK_EQUAL, &tok);
++			scan_num(&tok);
++			scan(TOK_SEMICOLON, &tok);
++			plist->proc_num = tok.str;
++			plist->arg_num = num_args;
++			*ptailp = plist;
++			ptailp = &plist->next;
++			peek(&tok);
++		} while (tok.kind != TOK_RBRACE);
++		*ptailp = NULL;
++		*vtailp = vlist;
++		vtailp = &vlist->next;
++		scan(TOK_RBRACE, &tok);
++		scan(TOK_EQUAL, &tok);
++		scan_num(&tok);
++		vlist->vers_num = tok.str;
++		/* make the argument structure name for each arg*/
++		for(plist = vlist->procs; plist != NULL; 
++		    plist = plist->next) {
++			plist->args.argname = make_argname(plist->proc_name,
++							   vlist->vers_num); 
++			/* free the memory ??*/
++		}
++		scan(TOK_SEMICOLON, &tok);
++		scan2(TOK_VERSION, TOK_RBRACE, &tok);
++	} while (tok.kind == TOK_VERSION);
++	scan(TOK_EQUAL, &tok);
++	scan_num(&tok);
++	defp->def.pr.prog_num = tok.str;
++	*vtailp = NULL;
++}
++
++
++static void
++def_enum(definition *defp)
++{
++	token tok;
++	enumval_list *elist;
++	enumval_list **tailp;
++
++	defp->def_kind = DEF_ENUM;
++	scan(TOK_IDENT, &tok);
++	defp->def_name = tok.str;
++	scan(TOK_LBRACE, &tok);
++	tailp = &defp->def.en.vals;
++	do {
++		scan(TOK_IDENT, &tok);
++		elist = ALLOC(enumval_list);
++		elist->name = tok.str;
++		elist->assignment = NULL;
++		scan3(TOK_COMMA, TOK_RBRACE, TOK_EQUAL, &tok);
++		if (tok.kind == TOK_EQUAL) {
++			scan_num(&tok);
++			elist->assignment = tok.str;
++			scan2(TOK_COMMA, TOK_RBRACE, &tok);
++		}
++		*tailp = elist;
++		tailp = &elist->next;
++	} while (tok.kind != TOK_RBRACE);
++	*tailp = NULL;
++}
++
++static void
++def_const(definition *defp)
++{
++	token tok;
++
++	defp->def_kind = DEF_CONST;
++	scan(TOK_IDENT, &tok);
++	defp->def_name = tok.str;
++	scan(TOK_EQUAL, &tok);
++	scan2(TOK_IDENT, TOK_STRCONST, &tok);
++	defp->def.co = tok.str;
++}
++
++static void
++def_union(definition *defp)
++{
++  token tok;
++  declaration dec;
++  case_list *cases;
++  case_list **tailp;
++
++  defp->def_kind = DEF_UNION;
++  scan(TOK_IDENT, &tok);
++  defp->def_name = tok.str;
++  scan(TOK_SWITCH, &tok);
++  scan(TOK_LPAREN, &tok);
++  get_declaration(&dec, DEF_UNION);
++  defp->def.un.enum_decl = dec;
++  tailp = &defp->def.un.cases;
++  scan(TOK_RPAREN, &tok);
++  scan(TOK_LBRACE, &tok);
++  scan(TOK_CASE, &tok);
++  while (tok.kind == TOK_CASE) {
++    scan2(TOK_IDENT, TOK_CHARCONST, &tok);
++    cases = ALLOC(case_list);
++    cases->case_name = tok.str;
++    scan(TOK_COLON, &tok);
++    /* now peek at next token */
++    if(peekscan(TOK_CASE,&tok))
++      {
++
++	do 
++	  {
++	    scan2(TOK_IDENT, TOK_CHARCONST, &tok);
++	    cases->contflag=1;	/* continued case statement */
++	    *tailp = cases;
++	    tailp = &cases->next;
++	    cases = ALLOC(case_list);
++	    cases->case_name = tok.str;
++	    scan(TOK_COLON, &tok);
++      
++	  }while(peekscan(TOK_CASE,&tok));
++      }
++
++    get_declaration(&dec, DEF_UNION);
++    cases->case_decl = dec;
++    cases->contflag=0;		/* no continued case statement */
++    *tailp = cases;
++    tailp = &cases->next;
++    scan(TOK_SEMICOLON, &tok);
++
++    scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok);
++  }
++  *tailp = NULL;
++  if (tok.kind == TOK_DEFAULT) {
++    scan(TOK_COLON, &tok);
++    get_declaration(&dec, DEF_UNION);
++    defp->def.un.default_decl = ALLOC(declaration);
++    *defp->def.un.default_decl = dec;
++    scan(TOK_SEMICOLON, &tok);
++    scan(TOK_RBRACE, &tok);
++  } else {
++    defp->def.un.default_decl = NULL;
++  }
++}
++
++static char* reserved_words[] =
++{
++  "array",
++  "bytes",
++  "destroy",
++  "free",
++  "getpos",
++  "inline",
++  "pointer",
++  "reference",
++  "setpos",
++  "sizeof",
++  "union",
++  "vector",
++  NULL
++  };
++
++static char* reserved_types[] =
++{
++  "opaque",
++  "string",
++  NULL
++  };
++
++/* check that the given name is not one that would eventually result in
++   xdr routines that would conflict with internal XDR routines. */
++static void
++check_type_name(char *name, int new_type)
++{
++  int i;
++  char tmp[100];
++
++  for( i = 0; reserved_words[i] != NULL; i++ ) {
++    if( strcmp( name, reserved_words[i] ) == 0 ) {
++      sprintf(tmp, 
++	      "illegal (reserved) name :\'%s\' in type definition", name );
++      error(tmp);
++    }
++  }
++  if( new_type ) {
++    for( i = 0; reserved_types[i] != NULL; i++ ) {
++      if( strcmp( name, reserved_types[i] ) == 0 ) {
++	sprintf(tmp, 
++		"illegal (reserved) name :\'%s\' in type definition", name );
++	error(tmp);
++      }
++    }
++  }
++}
++
++static void
++def_typedef(definition *defp)
++{
++	declaration dec;
++
++	defp->def_kind = DEF_TYPEDEF;
++	get_declaration(&dec, DEF_TYPEDEF);
++	defp->def_name = dec.name;
++	check_type_name( dec.name, 1 );
++	defp->def.ty.old_prefix = dec.prefix;
++	defp->def.ty.old_type = dec.type;
++	defp->def.ty.rel = dec.rel;
++	defp->def.ty.array_max = dec.array_max;
++}
++
++static void
++get_declaration(declaration *dec, defkind dkind)
++{
++	token tok;
++
++	get_type(&dec->prefix, &dec->type, dkind);
++	dec->rel = REL_ALIAS;
++	if (streq(dec->type, "void")) {
++		return;
++	}
++
++	check_type_name( dec->type, 0 );
++
++	scan2(TOK_STAR, TOK_IDENT, &tok);
++	if (tok.kind == TOK_STAR) {
++		dec->rel = REL_POINTER;
++		scan(TOK_IDENT, &tok);
++	}
++	dec->name = tok.str;
++	if (peekscan(TOK_LBRACKET, &tok)) {
++		if (dec->rel == REL_POINTER) {
++			error("no array-of-pointer declarations -- use typedef");
++		}
++		dec->rel = REL_VECTOR;
++		scan_num(&tok);
++		dec->array_max = tok.str;
++		scan(TOK_RBRACKET, &tok);
++	} else if (peekscan(TOK_LANGLE, &tok)) {
++		if (dec->rel == REL_POINTER) {
++			error("no array-of-pointer declarations -- use typedef");
++		}
++		dec->rel = REL_ARRAY;
++		if (peekscan(TOK_RANGLE, &tok)) {
++			dec->array_max = "~0";	/* unspecified size, use max */
++		} else {
++			scan_num(&tok);
++			dec->array_max = tok.str;
++			scan(TOK_RANGLE, &tok);
++		}
++	}
++	if (streq(dec->type, "opaque")) {
++		if (dec->rel != REL_ARRAY && dec->rel != REL_VECTOR) {
++			error("array declaration expected");
++		}
++	} else if (streq(dec->type, "string")) {
++		if (dec->rel != REL_ARRAY) {
++			error("variable-length array declaration expected");
++		}
++	}
++}
++
++
++static void
++get_prog_declaration(declaration *dec, defkind dkind, int num)
++{
++	token tok;
++	char name[10]; /* argument name */
++
++	if (dkind == DEF_PROGRAM) { 
++	  peek(&tok);
++	  if (tok.kind == TOK_RPAREN) { /* no arguments */
++	    	dec->rel = REL_ALIAS;
++		dec->type = "void";
++		dec->prefix = NULL;
++		dec->name = NULL;
++		return;
++	      }
++	}
++	get_type(&dec->prefix, &dec->type, dkind);
++	dec->rel = REL_ALIAS;
++	if (peekscan(TOK_IDENT, &tok))  /* optional name of argument */
++		strcpy(name, tok.str);
++	else 
++		sprintf(name, "%s%d", ARGNAME, num); /* default name of argument */
++
++	dec->name = (char *) strdup(name); 
++	
++	if (streq(dec->type, "void")) {
++		return;
++	}
++
++	if (streq(dec->type, "opaque")) {
++		error("opaque -- illegal argument type");
++	}
++	if (peekscan(TOK_STAR, &tok)) { 
++	  if (streq(dec->type, "string")) {
++	    error("pointer to string not allowed in program arguments\n");
++	  }
++		dec->rel = REL_POINTER;
++		if (peekscan(TOK_IDENT, &tok))  /* optional name of argument */
++		  dec->name = strdup(tok.str);
++      }
++	  if (peekscan(TOK_LANGLE, &tok)) {
++	    if (!streq(dec->type, "string")) {
++	      error("arrays cannot be declared as arguments to procedures -- use typedef");
++	    }
++		dec->rel = REL_ARRAY;
++		if (peekscan(TOK_RANGLE, &tok)) {
++			dec->array_max = "~0";/* unspecified size, use max */
++		} else {
++			scan_num(&tok);
++			dec->array_max = tok.str;
++			scan(TOK_RANGLE, &tok);
++		}
++	}
++	if (streq(dec->type, "string")) {
++		if (dec->rel != REL_ARRAY) {  /* .x specifies just string as
++					       * type of argument 
++					       * - make it string<>
++					       */
++			dec->rel = REL_ARRAY;
++			dec->array_max = "~0";/* unspecified size, use max */
++		}
++	}
++}
++
++
++
++static void
++get_type(char **prefixp, char **typep, defkind dkind)
++{
++	token tok;
++
++	*prefixp = NULL;
++	get_token(&tok);
++	switch (tok.kind) {
++	case TOK_IDENT:
++		*typep = tok.str;
++		break;
++	case TOK_STRUCT:
++	case TOK_ENUM:
++	case TOK_UNION:
++		*prefixp = tok.str;
++		scan(TOK_IDENT, &tok);
++		*typep = tok.str;
++		break;
++	case TOK_UNSIGNED:
++		unsigned_dec(typep);
++		break;
++	case TOK_SHORT:
++		*typep = "short";
++		(void) peekscan(TOK_INT, &tok);
++		break;
++	case TOK_INT32:
++		*typep = "int32_t";
++		(void) peekscan(TOK_INT, &tok);
++		break;
++	case TOK_VOID:
++		if (dkind != DEF_UNION && dkind != DEF_PROGRAM) {
++			error("voids allowed only inside union and program definitions with one argument");
++		}
++		*typep = tok.str;
++		break;
++	case TOK_STRING:
++	case TOK_OPAQUE:
++	case TOK_CHAR:
++	case TOK_INT:
++	case TOK_FLOAT:
++	case TOK_DOUBLE:
++	case TOK_BOOL:
++		*typep = tok.str;
++		break;
++	default:
++		error("expected type specifier");
++	}
++}
++
++static void
++unsigned_dec(char **typep)
++{
++	token tok;
++
++	peek(&tok);
++	switch (tok.kind) {
++	case TOK_CHAR:
++		get_token(&tok);
++		*typep = "u_char";
++		break;
++	case TOK_SHORT:
++		get_token(&tok);
++		*typep = "u_short";
++		(void) peekscan(TOK_INT, &tok);
++		break;
++	case TOK_INT32:
++		get_token(&tok);
++		*typep = "u_int32_";
++		(void) peekscan(TOK_INT, &tok);
++		break;
++	case TOK_INT:
++		get_token(&tok);
++		*typep = "u_int";
++		break;
++	default:
++		*typep = "u_int";
++		break;
++	}
++}
+diff --git a/rpcgen/rpc_parse.h b/rpcgen/rpc_parse.h
+new file mode 100644
+index 0000000..2afae10
+--- /dev/null
++++ b/rpcgen/rpc_parse.h
+@@ -0,0 +1,166 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*      @(#)rpc_parse.h  1.3  90/08/29  (C) 1987 SMI   */
++
++/*
++ * rpc_parse.h, Definitions for the RPCL parser 
++ */
++
++enum defkind {
++	DEF_CONST,
++	DEF_STRUCT,
++	DEF_UNION,
++	DEF_ENUM,
++	DEF_TYPEDEF,
++	DEF_PROGRAM
++};
++typedef enum defkind defkind;
++
++typedef char *const_def;
++
++enum relation {
++	REL_VECTOR,	/* fixed length array */
++	REL_ARRAY,	/* variable length array */
++	REL_POINTER,	/* pointer */
++	REL_ALIAS,	/* simple */
++};
++typedef enum relation relation;
++
++struct typedef_def {
++	char *old_prefix;
++	char *old_type;
++	relation rel;
++	char *array_max;
++};
++typedef struct typedef_def typedef_def;
++
++struct enumval_list {
++	char *name;
++	char *assignment;
++	struct enumval_list *next;
++};
++typedef struct enumval_list enumval_list;
++
++struct enum_def {
++	enumval_list *vals;
++};
++typedef struct enum_def enum_def;
++
++struct declaration {
++	char *prefix;
++	char *type;
++	char *name;
++	relation rel;
++	char *array_max;
++};
++typedef struct declaration declaration;
++
++struct decl_list {
++	declaration decl;
++	struct decl_list *next;
++};
++typedef struct decl_list decl_list;
++
++struct struct_def {
++	decl_list *decls;
++};
++typedef struct struct_def struct_def;
++
++struct case_list {
++	char *case_name;
++	int contflag;
++	declaration case_decl;
++	struct case_list *next;
++};
++typedef struct case_list case_list;
++
++struct union_def {
++	declaration enum_decl;
++	case_list *cases;
++	declaration *default_decl;
++};
++typedef struct union_def union_def;
++
++struct arg_list {
++	char *argname; /* name of struct for arg*/
++	decl_list *decls;
++};
++	
++typedef struct arg_list arg_list;
++
++struct proc_list {
++	char *proc_name;
++	char *proc_num;
++	arg_list args;
++	int arg_num;
++	char *res_type;
++	char *res_prefix;
++	struct proc_list *next;
++};
++typedef struct proc_list proc_list;
++
++struct version_list {
++	char *vers_name;
++	char *vers_num;
++	proc_list *procs;
++	struct version_list *next;
++};
++typedef struct version_list version_list;
++
++struct program_def {
++	char *prog_num;
++	version_list *versions;
++};
++typedef struct program_def program_def;
++
++struct definition {
++	char *def_name;
++	defkind def_kind;
++	union {
++		const_def co;
++		struct_def st;
++		union_def un;
++		enum_def en;
++		typedef_def ty;
++		program_def pr;
++	} def;
++};
++typedef struct definition definition;
++
++definition *get_definition();
++
++
++struct bas_type
++{
++  char *name;
++  int length;
++  struct bas_type *next;
++};
++
++typedef struct bas_type bas_type;
+diff --git a/rpcgen/rpc_sample.c b/rpcgen/rpc_sample.c
+new file mode 100644
+index 0000000..2b5c81b
+--- /dev/null
++++ b/rpcgen/rpc_sample.c
+@@ -0,0 +1,247 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI";
++
++#endif
++
++/*
++ * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
++ */
++
++#include <stdio.h>
++#include <string.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++
++
++static char RQSTP[] = "rqstp";
++
++static void	write_sample_client(char *program_name, version_list *vp);
++static void	write_sample_server(definition * def);
++static void	return_type(proc_list *plist);
++
++void
++write_sample_svc(definition *def)
++{
++	if (def->def_kind != DEF_PROGRAM)
++		return;
++	write_sample_server(def);
++}
++
++
++int
++write_sample_clnt(definition *def)
++{
++	version_list   *vp;
++	int             count = 0;
++
++	if (def->def_kind != DEF_PROGRAM)
++		return (0);
++	/* generate sample code for each version */
++	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		write_sample_client(def->def_name, vp);
++		++count;
++	}
++	return (count);
++}
++
++
++static void
++write_sample_client(char *program_name, version_list *vp)
++{
++	proc_list      *proc;
++	int             i;
++	decl_list      *l;
++
++	f_print(fout, "\n\nvoid\n");
++	pvname(program_name, vp->vers_num);
++	if (Cflag)
++		f_print(fout, "( char* host )\n{\n");
++	else
++		f_print(fout, "(host)\nchar *host;\n{\n");
++	f_print(fout, "\tCLIENT *clnt;\n");
++
++	i = 0;
++	for (proc = vp->procs; proc != NULL; proc = proc->next) {
++		f_print(fout, "\t");
++		ptype(proc->res_prefix, proc->res_type, 1);
++		f_print(fout, " *result_%d;\n", ++i);
++		/* print out declarations for arguments */
++		if (proc->arg_num < 2 && !newstyle) {
++			f_print(fout, "\t");
++			if (!streq(proc->args.decls->decl.type, "void"))
++				ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
++			else
++				f_print(fout, "char* ");	/* cannot have "void" type */
++			f_print(fout, " ");
++			pvname(proc->proc_name, vp->vers_num);
++			f_print(fout, "_arg;\n");
++		} else if (!streq(proc->args.decls->decl.type, "void")) {
++			for (l = proc->args.decls; l != NULL; l = l->next) {
++				f_print(fout, "\t");
++				ptype(l->decl.prefix, l->decl.type, 1);
++				f_print(fout, " ");
++				pvname(proc->proc_name, vp->vers_num);
++				f_print(fout, "_%s;\n", l->decl.name);
++				/*	  pdeclaration(proc->args.argname, &l->decl, 1, ";\n" );*/
++			}
++		}
++	}
++
++	/* generate creation of client handle */
++	f_print(fout, "\tclnt = clnt_create(host, %s, %s, \"%s\");\n",
++		program_name, vp->vers_name, tirpcflag ? "netpath" : "udp");
++	f_print(fout, "\tif (clnt == NULL) {\n");
++	f_print(fout, "\t\tclnt_pcreateerror(host);\n");
++	f_print(fout, "\t\texit(1);\n\t}\n");
++
++	/* generate calls to procedures */
++	i = 0;
++	for (proc = vp->procs; proc != NULL; proc = proc->next) {
++		f_print(fout, "\tresult_%d = ", ++i);
++		pvname(proc->proc_name, vp->vers_num);
++		if (proc->arg_num < 2 && !newstyle) {
++			f_print(fout, "(");
++			if (streq(proc->args.decls->decl.type, "void"))	/* cast to void* */
++				f_print(fout, "(void*)");
++			f_print(fout, "&");
++			pvname(proc->proc_name, vp->vers_num);
++			f_print(fout, "_arg, clnt);\n");
++		} else if (streq(proc->args.decls->decl.type, "void")) {
++			f_print(fout, "(clnt);\n");
++		} else {
++			f_print(fout, "(");
++			for (l = proc->args.decls; l != NULL; l = l->next) {
++				pvname(proc->proc_name, vp->vers_num);
++				f_print(fout, "_%s, ", l->decl.name);
++			}
++			f_print(fout, "clnt);\n");
++		}
++		f_print(fout, "\tif (result_%d == NULL) {\n", i);
++		f_print(fout, "\t\tclnt_perror(clnt, \"call failed:\");\n");
++		f_print(fout, "\t}\n");
++	}
++
++	f_print(fout, "\tclnt_destroy( clnt );\n");
++	f_print(fout, "}\n");
++}
++
++static void
++write_sample_server(definition * def)
++{
++	version_list   *vp;
++	proc_list      *proc;
++
++	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		for (proc = vp->procs; proc != NULL; proc = proc->next) {
++			f_print(fout, "\n");
++			/*			if( Cflag )
++			  f_print( fout, "extern \"C\"{\n");
++*/
++			return_type(proc);
++			f_print(fout, "* \n");
++			if (Cflag)
++				pvname_svc(proc->proc_name, vp->vers_num);
++			else
++				pvname(proc->proc_name, vp->vers_num);
++			printarglist(proc, RQSTP, "struct svc_req *");
++
++			f_print(fout, "{\n");
++			f_print(fout, "\n\tstatic ");
++			if (!streq(proc->res_type, "void"))
++				return_type(proc);
++			else
++				f_print(fout, "char*");	/* cannot have void type */
++			/* f_print(fout, " result;\n", proc->res_type); */
++			f_print(fout, " result;\n");
++			f_print(fout,
++				"\n\t/*\n\t * insert server code here\n\t */\n\n");
++			if (!streq(proc->res_type, "void"))
++				f_print(fout, "\treturn(&result);\n}\n");
++			else	/* cast back to void * */
++				f_print(fout, "\treturn((void*) &result);\n}\n");
++			/*			if( Cflag)
++			  f_print( fout, "};\n");
++*/
++
++		}
++	}
++}
++
++
++
++static void
++return_type(proc_list *plist)
++{
++	ptype( plist->res_prefix, plist->res_type, 1 );
++}
++
++void
++add_sample_msg(void)
++{
++	f_print(fout, "/*\n");
++	f_print(fout, " * This is sample code generated by rpcgen.\n");
++	f_print(fout, " * These are only templates and you can use them\n");
++	f_print(fout, " * as a guideline for developing your own functions.\n");
++	f_print(fout, " */\n\n");
++}
++
++void
++write_sample_clnt_main(void)
++{
++  list *l;
++  definition *def;
++  version_list *vp;
++
++  f_print(fout, "\n\n" );
++  if( Cflag )
++    f_print(fout,"main( int argc, char* argv[] )\n{\n" );
++  else
++    f_print(fout, "main(argc, argv)\nint argc;\nchar *argv[];\n{\n" );
++
++  f_print(fout, "\tchar *host;");
++  f_print(fout, "\n\n\tif(argc < 2) {");
++  f_print(fout, "\n\t\tprintf(\"usage: %%s server_host\\n\", argv[0]);\n" );
++  f_print(fout, "\t\texit(1);\n\t}");
++  f_print(fout, "\n\thost = argv[1];\n");
++
++  for (l = defined; l != NULL; l = l->next) {
++		def = l->val;
++		if (def->def_kind != DEF_PROGRAM) {
++			continue;
++		}
++		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		        f_print( fout, "\t" );
++			pvname(def->def_name, vp->vers_num);
++			f_print( fout, "( host );\n" );
++		      }
++		}
++  f_print(fout, "}\n");
++}
+diff --git a/rpcgen/rpc_scan.c b/rpcgen/rpc_scan.c
+new file mode 100644
+index 0000000..f58fa9f
+--- /dev/null
++++ b/rpcgen/rpc_scan.c
+@@ -0,0 +1,474 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_scan.c, Scanner for the RPC protocol compiler 
++ * Copyright (C) 1987, Sun Microsystems, Inc. 
++ */
++#include <stdio.h>
++#include <ctype.h>
++#include <string.h>
++#include "rpc_scan.h"
++#include "rpc_parse.h"
++#include "rpc_util.h"
++
++static void	unget_token(token *tokp);
++static void	findstrconst(char **str, char **val);
++static void	findchrconst(char **str, char **val);
++static void	findconst(char **str, char **val);
++static void	findkind(char **mark, token *tokp);
++static int	cppline(char *line);
++static int	directive(char *line);
++static void	printdirective(char *line);
++static void	docppline(char *line, int *lineno, char **fname);
++
++#define startcomment(where) (where[0] == '/' && where[1] == '*')
++#define endcomment(where) (where[-1] == '*' && where[0] == '/')
++
++static int pushed = 0;	/* is a token pushed */
++static token lasttok;	/* last token, if pushed */
++
++/*
++ * scan expecting 1 given token 
++ */
++void
++scan(tok_kind expect, token *tokp)
++{
++	get_token(tokp);
++	if (tokp->kind != expect) {
++		expected1(expect);
++	}
++}
++
++/*
++ * scan expecting any of the 2 given tokens 
++ */
++void
++scan2(tok_kind expect1, tok_kind expect2, token *tokp)
++{
++	get_token(tokp);
++	if (tokp->kind != expect1 && tokp->kind != expect2) {
++		expected2(expect1, expect2);
++	}
++}
++
++/*
++ * scan expecting any of the 3 given token 
++ */
++void
++scan3(tok_kind expect1, tok_kind expect2, tok_kind expect3, token *tokp)
++{
++	get_token(tokp);
++	if (tokp->kind != expect1 && tokp->kind != expect2
++	    && tokp->kind != expect3) {
++		expected3(expect1, expect2, expect3);
++	}
++}
++
++/*
++ * scan expecting a constant, possibly symbolic 
++ */
++void
++scan_num(token *tokp)
++{
++	get_token(tokp);
++	switch (tokp->kind) {
++	case TOK_IDENT:
++		break;
++	default:
++		error("constant or identifier expected");
++	}
++}
++
++/*
++ * Peek at the next token 
++ */
++void
++peek(token *tokp)
++{
++	get_token(tokp);
++	unget_token(tokp);
++}
++
++/*
++ * Peek at the next token and scan it if it matches what you expect 
++ */
++int
++peekscan(tok_kind expect, token *tokp)
++{
++	peek(tokp);
++	if (tokp->kind == expect) {
++		get_token(tokp);
++		return (1);
++	}
++	return (0);
++}
++
++/*
++ * Get the next token, printing out any directive that are encountered. 
++ */
++void
++get_token(token *tokp)
++{
++	int commenting;
++
++	if (pushed) {
++		pushed = 0;
++		*tokp = lasttok;
++		return;
++	}
++	commenting = 0;
++	for (;;) {
++		if (*where == 0) {
++			for (;;) {
++				if (!fgets(curline, MAXLINESIZE, fin)) {
++					tokp->kind = TOK_EOF;
++					*where = 0;
++					return;
++				}
++				linenum++;
++				if (commenting) {
++					break;
++				} else if (cppline(curline)) {
++					docppline(curline, &linenum, 
++						  &infilename);
++				} else if (directive(curline)) {
++					printdirective(curline);
++				} else {
++					break;
++				}
++			}
++			where = curline;
++		} else if (isspace(*where)) {
++			while (isspace(*where)) {
++				where++;	/* eat */
++			}
++		} else if (commenting) {
++			for (where++; *where; where++) {
++				if (endcomment(where)) {
++					where++;
++					commenting--;
++					break;
++				}
++			}
++		} else if (startcomment(where)) {
++			where += 2;
++			commenting++;
++		} else {
++			break;
++		}
++	}
++
++	/*
++	 * 'where' is not whitespace, comment or directive Must be a token! 
++	 */
++	switch (*where) {
++	case ':':
++		tokp->kind = TOK_COLON;
++		where++;
++		break;
++	case ';':
++		tokp->kind = TOK_SEMICOLON;
++		where++;
++		break;
++	case ',':
++		tokp->kind = TOK_COMMA;
++		where++;
++		break;
++	case '=':
++		tokp->kind = TOK_EQUAL;
++		where++;
++		break;
++	case '*':
++		tokp->kind = TOK_STAR;
++		where++;
++		break;
++	case '[':
++		tokp->kind = TOK_LBRACKET;
++		where++;
++		break;
++	case ']':
++		tokp->kind = TOK_RBRACKET;
++		where++;
++		break;
++	case '{':
++		tokp->kind = TOK_LBRACE;
++		where++;
++		break;
++	case '}':
++		tokp->kind = TOK_RBRACE;
++		where++;
++		break;
++	case '(':
++		tokp->kind = TOK_LPAREN;
++		where++;
++		break;
++	case ')':
++		tokp->kind = TOK_RPAREN;
++		where++;
++		break;
++	case '<':
++		tokp->kind = TOK_LANGLE;
++		where++;
++		break;
++	case '>':
++		tokp->kind = TOK_RANGLE;
++		where++;
++		break;
++
++	case '"':
++		tokp->kind = TOK_STRCONST;
++		findstrconst(&where, &tokp->str);
++		break;
++	case '\'':
++		tokp->kind = TOK_CHARCONST;
++		findchrconst(&where, &tokp->str);
++		break;
++
++	case '-':
++	case '0':
++	case '1':
++	case '2':
++	case '3':
++	case '4':
++	case '5':
++	case '6':
++	case '7':
++	case '8':
++	case '9':
++		tokp->kind = TOK_IDENT;
++		findconst(&where, &tokp->str);
++		break;
++
++	default:
++		if (!(isalpha(*where) || *where == '_')) {
++			char buf[100];
++			char *p;
++
++			s_print(buf, "illegal character in file: ");
++			p = buf + strlen(buf);
++			if (isprint(*where)) {
++				s_print(p, "%c", *where);
++			} else {
++				s_print(p, "%d", *where);
++			}
++			error(buf);
++		}
++		findkind(&where, tokp);
++		break;
++	}
++}
++
++static void
++unget_token(token *tokp)
++{
++	lasttok = *tokp;
++	pushed = 1;
++}
++
++static void
++findstrconst(char **str, char **val)
++{
++	char *p;
++	int size;
++
++	p = *str;
++	do {
++		*p++;
++	} while (*p && *p != '"');
++	if (*p == 0) {
++		error("unterminated string constant");
++	}
++	p++;
++	size = p - *str;
++	*val = alloc(size + 1);
++	(void) strncpy(*val, *str, size);
++	(*val)[size] = 0;
++	*str = p;
++}
++
++static void
++findchrconst(char **str, char **val)
++{
++	char *p;
++	int size;
++
++	p = *str;
++	do {
++		*p++;
++	} while (*p && *p != '\'');
++	if (*p == 0) {
++		error("unterminated string constant");
++	}
++	p++;
++	size = p - *str;
++	if (size != 3) {
++		error("empty char string");
++	}
++	*val = alloc(size + 1);
++	(void) strncpy(*val, *str, size);
++	(*val)[size] = 0;
++	*str = p;
++}
++
++static void
++findconst(char **str, char **val)
++{
++	char *p;
++	int size;
++
++	p = *str;
++	if (*p == '0' && *(p + 1) == 'x') {
++		p++;
++		do {
++			p++;
++		} while (isxdigit(*p));
++	} else {
++		do {
++			p++;
++		} while (isdigit(*p));
++	}
++	size = p - *str;
++	*val = alloc(size + 1);
++	(void) strncpy(*val, *str, size);
++	(*val)[size] = 0;
++	*str = p;
++}
++
++static token symbols[] = {
++			  {TOK_CONST, "const"},
++			  {TOK_UNION, "union"},
++			  {TOK_SWITCH, "switch"},
++			  {TOK_CASE, "case"},
++			  {TOK_DEFAULT, "default"},
++			  {TOK_STRUCT, "struct"},
++			  {TOK_TYPEDEF, "typedef"},
++			  {TOK_ENUM, "enum"},
++			  {TOK_OPAQUE, "opaque"},
++			  {TOK_BOOL, "bool"},
++			  {TOK_VOID, "void"},
++			  {TOK_CHAR, "char"},
++			  {TOK_INT, "int"},
++			  {TOK_UNSIGNED, "unsigned"},
++			  {TOK_SHORT, "short"},
++			  {TOK_INT32, "int32"},
++			  {TOK_FLOAT, "float"},
++			  {TOK_DOUBLE, "double"},
++			  {TOK_STRING, "string"},
++			  {TOK_PROGRAM, "program"},
++			  {TOK_VERSION, "version"},
++			  {TOK_EOF, "??????"},
++};
++
++static void
++findkind(char **mark, token *tokp)
++{
++	int len;
++	token *s;
++	char *str;
++
++	str = *mark;
++	for (s = symbols; s->kind != TOK_EOF; s++) {
++		len = strlen(s->str);
++		if (strncmp(str, s->str, len) == 0) {
++			if (!isalnum(str[len]) && str[len] != '_') {
++				tokp->kind = s->kind;
++				tokp->str = s->str;
++				*mark = str + len;
++				return;
++			}
++		}
++	}
++	tokp->kind = TOK_IDENT;
++	for (len = 0; isalnum(str[len]) || str[len] == '_'; len++);
++	tokp->str = alloc(len + 1);
++	(void) strncpy(tokp->str, str, len);
++	tokp->str[len] = 0;
++	*mark = str + len;
++}
++
++static int
++cppline(char *line)
++{
++	return (line == curline && *line == '#');
++}
++
++static int
++directive(char *line)
++{
++	return (line == curline && *line == '%');
++}
++
++static void
++printdirective(char *line)
++{
++	f_print(fout, "%s", line + 1);
++}
++
++static void
++docppline(char *line, int *lineno, char **fname)
++{
++	char *file;
++	int num;
++	char *p;
++
++	line++;
++	while (isspace(*line)) {
++		line++;
++	}
++	num = atoi(line);
++	while (isdigit(*line)) {
++		line++;
++	}
++	while (isspace(*line)) {
++		line++;
++	}
++	if (*line != '"') {
++		error("preprocessor error");
++	}
++	line++;
++	p = file = alloc(strlen(line) + 1);
++	while (*line && *line != '"') {
++		*p++ = *line++;
++	}
++	if (*line == 0) {
++		error("preprocessor error");
++	}
++	*p = 0;
++	if (*file == 0) {
++		*fname = NULL;
++		free(file);
++	} else {
++		*fname = file;
++	}
++	*lineno = num - 1;
++}
+diff --git a/rpcgen/rpc_scan.h b/rpcgen/rpc_scan.h
+new file mode 100644
+index 0000000..16f688c
+--- /dev/null
++++ b/rpcgen/rpc_scan.h
+@@ -0,0 +1,103 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*      @(#)rpc_scan.h  1.3  90/08/29  (C) 1987 SMI   */
++
++/*
++ * rpc_scan.h, Definitions for the RPCL scanner 
++ */
++
++/*
++ * kinds of tokens 
++ */
++enum tok_kind {
++	TOK_IDENT,
++	TOK_CHARCONST,
++	TOK_STRCONST,
++	TOK_LPAREN,
++	TOK_RPAREN,
++	TOK_LBRACE,
++	TOK_RBRACE,
++	TOK_LBRACKET,
++	TOK_RBRACKET,
++	TOK_LANGLE,
++	TOK_RANGLE,
++	TOK_STAR,
++	TOK_COMMA,
++	TOK_EQUAL,
++	TOK_COLON,
++	TOK_SEMICOLON,
++	TOK_CONST,
++	TOK_STRUCT,
++	TOK_UNION,
++	TOK_SWITCH,
++	TOK_CASE,
++	TOK_DEFAULT,
++	TOK_ENUM,
++	TOK_TYPEDEF,
++	TOK_INT,
++	TOK_SHORT,
++	TOK_INT32,
++	TOK_UNSIGNED,
++	TOK_FLOAT,
++	TOK_DOUBLE,
++	TOK_OPAQUE,
++	TOK_CHAR,
++	TOK_STRING,
++	TOK_BOOL,
++	TOK_VOID,
++	TOK_PROGRAM,
++	TOK_VERSION,
++	TOK_EOF
++};
++typedef enum tok_kind tok_kind;
++
++/*
++ * a token 
++ */
++struct token {
++	tok_kind kind;
++	char *str;
++};
++typedef struct token token;
++
++
++/*
++ * routine interface 
++ */
++void            scan();
++void            scan2();
++void            scan3();
++void            scan_num();
++void            peek();
++int             peekscan();
++void            get_token();
++void            expected1(tok_kind);
++void            expected2(tok_kind, tok_kind);
++void            expected3(tok_kind, tok_kind, tok_kind);
++
+diff --git a/rpcgen/rpc_svcout.c b/rpcgen/rpc_svcout.c
+new file mode 100644
+index 0000000..284a529
+--- /dev/null
++++ b/rpcgen/rpc_svcout.c
+@@ -0,0 +1,882 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
++ */
++#include <stdio.h>
++#include <string.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++#include "rpc_output.h"
++
++static void	write_real_program(definition *def);
++static void	write_program(definition *def, char *storage);
++static void	printerr(char *err, char *transp);
++static void	printif(char *proc, char *transp, char *prefix, char *arg);
++static void	write_inetmost(char *infile);
++static void	print_return(char *space);
++static void	print_pmapunset(char *space);
++static void	print_err_message(char *space);
++static void	write_timeout_func(void);
++static void	write_pm_most(char *infile, int netflag);
++static void	write_rpc_svc_fg(char *infile, char *sp);
++static void	open_log_file(char *infile, char *sp);
++
++static char RQSTP[] = "rqstp";
++static char TRANSP[] = "transp";
++static char ARG[] = "argument";
++static char RESULT[] = "result";
++static char ROUTINE[] = "local";
++
++char _errbuf[256];	/* For all messages */
++
++static void
++p_xdrfunc(char *rname, char *typename)
++{
++	if (Cflag)
++		f_print(fout, "\t\txdr_%s = (xdrproc_t) xdr_%s;\n", rname,
++			stringfix(typename));
++	else
++		f_print(fout, "\t\txdr_%s = xdr_%s;\n", rname, stringfix(typename));
++}
++
++void
++internal_proctype(proc_list *plist)
++{
++	f_print(fout, "static ");
++	ptype( plist->res_prefix, plist->res_type, 1 );
++	f_print( fout, "*" );
++}
++
++
++/*
++ * write most of the service, that is, everything but the registrations. 
++ */
++void
++write_most(char *infile, int netflag, int nomain)
++{
++	if (inetdflag || pmflag) {
++	        char* var_type;
++		var_type = (nomain? "extern" : "static");
++		f_print(fout, "%s int _rpcpmstart;", var_type );
++		f_print(fout, "\t\t/* Started by a port monitor ? */\n"); 
++		f_print(fout, "%s int _rpcfdtype;", var_type );
++		f_print(fout, "\t\t/* Whether Stream or Datagram ? */\n");
++		if (timerflag) {
++			f_print(fout, "%s int _rpcsvcdirty;", var_type );
++			f_print(fout, "\t/* Still serving ? */\n");
++		}
++		write_svc_aux( nomain );
++	}
++	/* write out dispatcher and stubs */
++	write_programs( nomain? (char *)NULL : "static" );
++
++        if( nomain ) 
++	  return;
++
++	f_print(fout, "\nmain()\n");
++	f_print(fout, "{\n");
++	if (inetdflag) {
++		write_inetmost(infile); /* Includes call to write_rpc_svc_fg() */
++	} else {
++	  if( tirpcflag ) {
++		if (netflag) {
++			f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP);
++			f_print(fout, "\tstruct netconfig *nconf = NULL;\n");
++		}
++		f_print(fout, "\tpid_t pid;\n");
++		f_print(fout, "\tint i;\n");
++		f_print(fout, "\tchar mname[FMNAMESZ + 1];\n\n");
++		write_pm_most(infile, netflag);
++		f_print(fout, "\telse {\n");
++		write_rpc_svc_fg(infile, "\t\t");
++		f_print(fout, "\t}\n");
++	      } else {
++		f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP);
++		f_print(fout, "\n");
++		print_pmapunset("\t");
++	      }
++	}
++
++	if (logflag && !inetdflag) {
++		open_log_file(infile, "\t");
++	}
++}
++
++/*
++ * write a registration for the given transport 
++ */
++void
++write_netid_register(char *transp)
++{
++	list *l;
++	definition *def;
++	version_list *vp;
++	char *sp;
++	char tmpbuf[32];
++
++	sp = "";
++	f_print(fout, "\n");
++	f_print(fout, "%s\tnconf = getnetconfigent(\"%s\");\n", sp, transp);
++	f_print(fout, "%s\tif (nconf == NULL) {\n", sp);
++	(void) sprintf(_errbuf, "cannot find %s netid.", transp);
++	sprintf(tmpbuf, "%s\t\t", sp);
++	print_err_message(tmpbuf);
++	f_print(fout, "%s\t\texit(1);\n", sp);
++	f_print(fout, "%s\t}\n", sp);
++	f_print(fout, "%s\t%s = svc_tli_create(RPC_ANYFD, nconf, 0, 0, 0);\n",
++			sp, TRANSP);
++	f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP);
++	(void) sprintf(_errbuf, "cannot create %s service.", transp);
++	print_err_message(tmpbuf);
++	f_print(fout, "%s\t\texit(1);\n", sp);
++	f_print(fout, "%s\t}\n", sp);
++
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind != DEF_PROGRAM) {
++			continue;
++		}
++		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++			f_print(fout,
++				"%s\t(void) rpcb_unset(%s, %s, nconf);\n",
++				sp, def->def_name, vp->vers_name);
++			f_print(fout,
++				"%s\tif (!svc_reg(%s, %s, %s, ",
++				sp, TRANSP, def->def_name, vp->vers_name);
++			pvname(def->def_name, vp->vers_num);
++			f_print(fout, ", nconf)) {\n");
++			(void) sprintf(_errbuf, "unable to register (%s, %s, %s).",
++					def->def_name, vp->vers_name, transp);
++			print_err_message(tmpbuf);
++			f_print(fout, "%s\t\texit(1);\n", sp);
++			f_print(fout, "%s\t}\n", sp);
++		}
++	}
++	f_print(fout, "%s\tfreenetconfigent(nconf);\n", sp);
++}
++
++/*
++ * write a registration for the given transport for TLI
++ */
++void
++write_nettype_register(char *transp)
++{
++	list *l;
++	definition *def;
++	version_list *vp;
++
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind != DEF_PROGRAM) {
++			continue;
++		}
++		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++			f_print(fout, "\tif (!svc_create(");
++			pvname(def->def_name, vp->vers_num);
++			f_print(fout, ", %s, %s, \"%s\")) {\n ",
++				def->def_name, vp->vers_name, transp);
++			(void) sprintf(_errbuf,
++				"unable to create (%s, %s) for %s.",
++					def->def_name, vp->vers_name, transp);
++			print_err_message("\t\t");
++			f_print(fout, "\t\texit(1);\n");
++			f_print(fout, "\t}\n");
++		}
++	}
++}
++
++/*
++ * write the rest of the service 
++ */
++void
++write_rest(void)
++{
++	f_print(fout, "\n");
++	if (inetdflag) {
++		f_print(fout, "\tif (%s == (SVCXPRT *)NULL) {\n", TRANSP);
++		(void) sprintf(_errbuf, "could not create a handle");
++		print_err_message("\t\t");
++		f_print(fout, "\t\texit(1);\n");
++		f_print(fout, "\t}\n");
++		if (timerflag) {
++			f_print(fout, "\tif (_rpcpmstart) {\n");
++			f_print(fout, 
++				"\t\t(void) signal(SIGALRM, %s closedown);\n",
++				Cflag? "(SIG_PF)" : "(void(*)())" );
++			f_print(fout, "\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n");
++			f_print(fout, "\t}\n");
++		}
++	}
++	f_print(fout, "\tsvc_run();\n");
++	(void) sprintf(_errbuf, "svc_run returned");
++	print_err_message("\t");
++	f_print(fout, "\texit(1);\n");
++	f_print(fout, "\t/* NOTREACHED */\n");
++	f_print(fout, "}\n");
++}
++
++void
++write_programs(char *storage)
++{
++	list *l;
++	definition *def;
++
++	/* write out stubs for procedure  definitions */
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind == DEF_PROGRAM) {
++			write_real_program(def);
++		}
++	}
++
++	/* write out dispatcher for each program */
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind == DEF_PROGRAM) {
++			write_program(def, storage);
++		}
++	}
++
++
++}
++
++/* write out definition of internal function (e.g. _printmsg_1(...))
++   which calls server's defintion of actual function (e.g. printmsg_1(...)).
++   Unpacks single user argument of printmsg_1 to call-by-value format
++   expected by printmsg_1. */
++static void
++write_real_program(definition *def)
++{
++	version_list *vp;
++	proc_list *proc;
++	decl_list *l;
++
++	if( !newstyle ) return;  /* not needed for old style */
++	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		for (proc = vp->procs; proc != NULL; proc = proc->next) {
++			f_print(fout, "\n");
++			internal_proctype(proc);
++			f_print(fout, "\n_");
++			pvname(proc->proc_name, vp->vers_num);
++			if( Cflag ) {
++			  f_print(fout, "(" );
++			  /* arg name */
++			  if (proc->arg_num > 1)
++			    f_print(fout, proc->args.argname);
++			  else
++			    ptype(proc->args.decls->decl.prefix, 
++				  proc->args.decls->decl.type, 0);
++			  f_print(fout, " *argp, struct svc_req *%s)\n", 
++				  RQSTP);
++			} else {
++			  f_print(fout, "(argp, %s)\n", RQSTP );
++			  /* arg name */
++			  if (proc->arg_num > 1)
++			    f_print(fout, "\t%s *argp;\n", proc->args.argname);
++			  else {
++			    f_print(fout, "\t");
++			    ptype(proc->args.decls->decl.prefix, 
++				  proc->args.decls->decl.type, 0);
++			    f_print(fout, " *argp;\n");
++			  }
++			  f_print(fout, "	struct svc_req *%s;\n", RQSTP);
++			}
++
++			f_print(fout, "{\n");
++			f_print(fout, "\treturn(");
++			if( Cflag )
++			  pvname_svc(proc->proc_name, vp->vers_num);
++			else
++			  pvname(proc->proc_name, vp->vers_num);
++			f_print(fout, "(");
++			if (proc->arg_num < 2) { /* single argument */
++			  if (!streq( proc->args.decls->decl.type, "void"))
++			    f_print(fout, "*argp, ");  /* non-void */
++			} else {
++			  for (l = proc->args.decls;  l != NULL; l = l->next) 
++			    f_print(fout, "argp->%s, ", l->decl.name);
++			}
++			f_print(fout, "%s));\n}\n", RQSTP);
++		} 		
++	}
++}
++
++static void
++write_program(definition *def, char *storage)
++{
++	version_list *vp;
++	proc_list *proc;
++	int filled;
++
++	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		f_print(fout, "\n");
++		if (storage != NULL) {
++			f_print(fout, "%s ", storage);
++		}
++		f_print(fout, "void\n");
++		pvname(def->def_name, vp->vers_num);
++
++		if (Cflag) {
++		   f_print(fout, "(struct svc_req *%s, ", RQSTP);
++		   f_print(fout, "register SVCXPRT *%s)\n", TRANSP);
++		} else {
++		   f_print(fout, "(%s, %s)\n", RQSTP, TRANSP);
++		   f_print(fout, "	struct svc_req *%s;\n", RQSTP);
++		   f_print(fout, "	register SVCXPRT *%s;\n", TRANSP);
++		}
++
++		f_print(fout, "{\n");
++
++		filled = 0;
++		f_print(fout, "\tunion {\n");
++		for (proc = vp->procs; proc != NULL; proc = proc->next) {
++			if (proc->arg_num < 2) { /* single argument */
++				if (streq(proc->args.decls->decl.type, 
++					  "void")) {
++					continue;
++				}
++				filled = 1;
++				f_print(fout, "\t\t");
++				ptype(proc->args.decls->decl.prefix, 
++				      proc->args.decls->decl.type, 0);
++				pvname(proc->proc_name, vp->vers_num);
++				f_print(fout, "_arg;\n");
++
++			}
++			else {
++				filled = 1;
++				f_print(fout, "\t\t%s", proc->args.argname);
++				f_print(fout, " ");
++				pvname(proc->proc_name, vp->vers_num);
++				f_print(fout, "_arg;\n");
++			}
++		}
++		if (!filled) {
++			f_print(fout, "\t\tint fill;\n");
++		}
++		f_print(fout, "\t} %s;\n", ARG);
++		f_print(fout, "\tchar *%s;\n", RESULT);
++
++		if (Cflag) {
++		    f_print(fout, "\txdrproc_t xdr_%s, xdr_%s;\n", ARG, RESULT);
++		    f_print(fout,
++			    "\tchar *(*%s)(char *, struct svc_req *);\n",
++			    ROUTINE);
++		} else {
++		    f_print(fout, "\tbool_t (*xdr_%s)(), (*xdr_%s)();\n", ARG, RESULT);
++		    f_print(fout, "\tchar *(*%s)();\n", ROUTINE);
++		}
++
++		f_print(fout, "\n");
++
++		if (timerflag)
++			f_print(fout, "\t_rpcsvcdirty = 1;\n");
++		f_print(fout, "\tswitch (%s->rq_proc) {\n", RQSTP);
++		if (!nullproc(vp->procs)) {
++			f_print(fout, "\tcase NULLPROC:\n");
++			f_print(fout,
++			"\t\t(void) svc_sendreply(%s, (xdrproc_t) xdr_void, (char *)NULL);\n",
++					TRANSP);
++			print_return("\t\t");
++			f_print(fout, "\n");
++		}
++		for (proc = vp->procs; proc != NULL; proc = proc->next) {
++			f_print(fout, "\tcase %s:\n", proc->proc_name);
++			if (proc->arg_num < 2) { /* single argument */
++			  p_xdrfunc( ARG, proc->args.decls->decl.type);
++			} else {
++			  p_xdrfunc( ARG, proc->args.argname);
++			}
++			p_xdrfunc( RESULT, proc->res_type);
++			if( Cflag )
++			    f_print(fout,
++				    "\t\t%s = (char *(*)(char *, struct svc_req *)) ",
++				    ROUTINE);
++			else
++			    f_print(fout, "\t\t%s = (char *(*)()) ", ROUTINE);
++
++			if (newstyle) { /* new style: calls internal routine */
++				f_print(fout,"_");
++			}
++			/* Not sure about the following...
++			 * rpc_hout always generates foobar_1_svc for
++			 * the service procedure, so why should we use
++			 * foobar_1 here?! --okir */
++#if 0
++			if( Cflag && !newstyle )
++			  pvname_svc(proc->proc_name, vp->vers_num);
++			else
++			  pvname(proc->proc_name, vp->vers_num);
++#else
++			pvname_svc(proc->proc_name, vp->vers_num);
++#endif
++			f_print(fout, ";\n");
++			f_print(fout, "\t\tbreak;\n\n");
++		}
++		f_print(fout, "\tdefault:\n");
++		printerr("noproc", TRANSP);
++		print_return("\t\t");
++		f_print(fout, "\t}\n");
++
++		f_print(fout, "\t(void) memset((char *)&%s, 0, sizeof (%s));\n", ARG, ARG);
++		if (Cflag)
++		    printif("getargs", TRANSP, "(caddr_t) &", ARG);
++		else
++		    printif("getargs", TRANSP, "&", ARG);
++		printerr("decode", TRANSP);
++		print_return("\t\t");
++		f_print(fout, "\t}\n");
++
++		if (Cflag)
++		    f_print(fout, "\t%s = (*%s)((char *)&%s, %s);\n",
++			    RESULT, ROUTINE, ARG, RQSTP);
++		else
++		    f_print(fout, "\t%s = (*%s)(&%s, %s);\n",
++			    RESULT, ROUTINE, ARG, RQSTP);
++		f_print(fout, 
++			"\tif (%s != NULL && !svc_sendreply(%s, "
++			"(xdrproc_t) xdr_%s, %s)) {\n",
++			RESULT, TRANSP, RESULT, RESULT);
++		printerr("systemerr", TRANSP);
++		f_print(fout, "\t}\n");
++
++		if (Cflag)
++		    printif("freeargs", TRANSP, "(caddr_t) &", ARG);
++		else
++		    printif("freeargs", TRANSP, "&", ARG);
++		(void) sprintf(_errbuf, "unable to free arguments");
++		print_err_message("\t\t");
++		f_print(fout, "\t\texit(1);\n");
++		f_print(fout, "\t}\n");
++		print_return("\t");
++		f_print(fout, "}\n");
++	}
++}
++
++static void
++printerr(char *err, char *transp)
++{
++	f_print(fout, "\t\tsvcerr_%s(%s);\n", err, transp);
++}
++
++static void
++printif(char *proc, char *transp, char *prefix, char *arg)
++{
++	f_print(fout, "\tif (!svc_%s(%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s)) {\n",
++		proc, transp, arg, prefix, arg);
++}
++
++int
++nullproc(proc_list *proc)
++{
++	for (; proc != NULL; proc = proc->next) {
++		if (streq(proc->proc_num, "0")) {
++			return (1);
++		}
++	}
++	return (0);
++}
++
++static void
++write_inetmost(char *infile)
++{
++	f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP);
++	f_print(fout, "\tint sock;\n");
++	f_print(fout, "\tint proto;\n");
++	f_print(fout, "\tstruct sockaddr_in saddr;\n");
++	f_print(fout, "\tint asize = sizeof (saddr);\n");
++	f_print(fout, "\n");
++	f_print(fout, 
++	"\tif (getsockname(0, (struct sockaddr *)&saddr, &asize) == 0) {\n");
++	f_print(fout, "\t\tint ssize = sizeof (int);\n\n");
++	f_print(fout, "\t\tif (saddr.sin_family != AF_INET)\n");
++	f_print(fout, "\t\t\texit(1);\n");
++	f_print(fout, "\t\tif (getsockopt(0, SOL_SOCKET, SO_TYPE,\n");
++	f_print(fout, "\t\t\t\t(char *)&_rpcfdtype, &ssize) == -1)\n");
++	f_print(fout, "\t\t\texit(1);\n");
++	f_print(fout, "\t\tsock = 0;\n");
++	f_print(fout, "\t\t_rpcpmstart = 1;\n");
++	f_print(fout, "\t\tproto = 0;\n");
++	open_log_file(infile, "\t\t");
++	f_print(fout, "\t} else {\n");
++	write_rpc_svc_fg(infile, "\t\t");
++	f_print(fout, "\t\tsock = RPC_ANYSOCK;\n");
++	print_pmapunset("\t\t");
++	f_print(fout, "\t}\n");
++}
++
++static void
++print_return(char *space)
++{
++	if (exitnow)
++		f_print(fout, "%sexit(0);\n", space);
++	else {
++		if (timerflag)
++			f_print(fout, "%s_rpcsvcdirty = 0;\n", space);
++		f_print(fout, "%sreturn;\n", space);
++	}
++}
++
++static void
++print_pmapunset(char *space)
++{
++	list *l;
++	definition *def;
++	version_list *vp;
++
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind == DEF_PROGRAM) {
++			for (vp = def->def.pr.versions; vp != NULL;
++					vp = vp->next) {
++				f_print(fout, "%s(void) pmap_unset(%s, %s);\n",
++					space, def->def_name, vp->vers_name);
++			}
++		}
++	}
++}
++
++static void
++print_err_message(char *space)
++{
++	if (logflag)
++		f_print(fout, "%ssyslog(LOG_ERR, \"%s\");\n", space, _errbuf);
++	else if (inetdflag || pmflag)
++		f_print(fout, "%s_msgout(\"%s\");\n", space, _errbuf);
++	else
++		f_print(fout, "%sfprintf(stderr, \"%s\");\n", space, _errbuf);
++}
++
++/*
++ * Write the server auxiliary function ( _msgout, timeout)
++ */
++void
++write_svc_aux(int nomain)
++{
++	if (!logflag)
++		write_msg_out();
++	if( !nomain )
++	  write_timeout_func();
++}
++
++/*
++ * Write the _msgout function
++ */
++void
++write_msg_out(void)
++{
++	f_print(fout, "\n");
++	f_print(fout, "static\n");
++	if( !Cflag ) {
++	  f_print(fout, "void _msgout(msg)\n");
++	  f_print(fout, "\tchar *msg;\n");
++	} else {
++	  f_print(fout, "void _msgout(char* msg)\n");
++	}
++	f_print(fout, "{\n");
++	f_print(fout, "#ifdef RPC_SVC_FG\n");
++	if (inetdflag || pmflag)
++		f_print(fout, "\tif (_rpcpmstart)\n");
++	f_print(fout, "\t\tsyslog(LOG_ERR, \"%%s\", msg);\n");
++	f_print(fout, "\telse\n");
++	f_print(fout, "\t\t(void) fprintf(stderr, \"%%s\\n\", msg);\n");
++	f_print(fout, "#else\n");
++	f_print(fout, "\tsyslog(LOG_ERR, \"%%s\", msg);\n");
++	f_print(fout, "#endif\n");
++	f_print(fout, "}\n");
++}
++
++/*
++ * Write the timeout function
++ */
++static void
++write_timeout_func(void)
++{
++	if (!timerflag)
++		return;
++	f_print(fout, "\n");
++	f_print(fout, "static void\n");
++	f_print(fout, "closedown()\n");
++	f_print(fout, "{\n");
++	f_print(fout, "\tif (_rpcsvcdirty == 0) {\n");
++	f_print(fout, "\t\tstatic int size;\n");
++	f_print(fout, "\t\tint i, openfd;\n");
++	if (tirpcflag && pmflag) {
++		f_print(fout, "\t\tstruct t_info tinfo;\n\n");
++		f_print(fout, "\t\tif (!t_getinfo(0, &tinfo) && (tinfo.servtype == T_CLTS))\n");
++	} else {
++		f_print(fout, "\n\t\tif (_rpcfdtype == SOCK_DGRAM)\n");
++	}
++	f_print(fout, "\t\t\texit(0);\n");
++	f_print(fout, "\t\tif (size == 0) {\n");
++	if( tirpcflag ) {
++	  f_print(fout, "\t\t\tstruct rlimit rl;\n\n");
++	  f_print(fout, "\t\t\trl.rlim_max = 0;\n");
++	  f_print(fout, "\t\t\tgetrlimit(RLIMIT_NOFILE, &rl);\n");
++	  f_print(fout, "\t\t\tif ((size = rl.rlim_max) == 0)\n");
++	  f_print(fout, "\t\t\t\treturn;\n");
++	} else {
++	  f_print(fout, "\t\t\tsize = getdtablesize();\n");
++	}
++	f_print(fout, "\t\t}\n");
++	f_print(fout, "\t\tfor (i = 0, openfd = 0; i < size && openfd < 2; i++)\n");
++	f_print(fout, "\t\t\tif (FD_ISSET(i, &svc_fdset))\n");
++	f_print(fout, "\t\t\t\topenfd++;\n");
++	f_print(fout, "\t\tif (openfd <= 1)\n");
++	f_print(fout, "\t\t\texit(0);\n");
++	f_print(fout, "\t}\n");
++	f_print(fout, "\t(void) alarm(_RPCSVC_CLOSEDOWN);\n");
++	f_print(fout, "}\n");
++}
++
++/*
++ * Write the most of port monitor support
++ */
++static void
++write_pm_most(char *infile, int netflag)
++{
++	list *l;
++	definition *def;
++	version_list *vp;
++
++	f_print(fout, "\tif (!ioctl(0, I_LOOK, mname) &&\n");
++	f_print(fout, "\t\t(!strcmp(mname, \"sockmod\") ||");
++	f_print(fout, " !strcmp(mname, \"timod\"))) {\n");
++	f_print(fout, "\t\tchar *netid;\n");
++	if (!netflag) {	/* Not included by -n option */
++		f_print(fout, "\t\tstruct netconfig *nconf = NULL;\n");
++		f_print(fout, "\t\tSVCXPRT *%s;\n", TRANSP);
++	}
++	if( timerflag )
++	  f_print(fout, "\t\tint pmclose;\n");
++/* not necessary, defined in /usr/include/stdlib */
++/*	f_print(fout, "\t\textern char *getenv();\n");*/
++	f_print(fout, "\n");
++	f_print(fout, "\t\t_rpcpmstart = 1;\n");
++	if (logflag)
++		open_log_file(infile, "\t\t");
++	f_print(fout, "\t\tif ((netid = getenv(\"NLSPROVIDER\")) == NULL) {\n");
++	sprintf(_errbuf, "cannot get transport name");
++	print_err_message("\t\t\t");
++	f_print(fout, "\t\t} else if ((nconf = getnetconfigent(netid)) == NULL) {\n");
++	sprintf(_errbuf, "cannot get transport info");
++	print_err_message("\t\t\t");
++	f_print(fout, "\t\t}\n");
++	/*
++	 * A kludgy support for inetd services. Inetd only works with
++	 * sockmod, and RPC works only with timod, hence all this jugglery
++	 */
++	f_print(fout, "\t\tif (strcmp(mname, \"sockmod\") == 0) {\n");
++	f_print(fout, "\t\t\tif (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, \"timod\")) {\n");
++	sprintf(_errbuf, "could not get the right module");
++	print_err_message("\t\t\t\t");
++	f_print(fout, "\t\t\t\texit(1);\n");
++	f_print(fout, "\t\t\t}\n");
++	f_print(fout, "\t\t}\n");
++	if( timerflag )
++	  f_print(fout, "\t\tpmclose = (t_getstate(0) != T_DATAXFER);\n");
++	f_print(fout, "\t\tif ((%s = svc_tli_create(0, nconf, NULL, 0, 0)) == NULL) {\n",
++			TRANSP);
++	sprintf(_errbuf, "cannot create server handle");
++	print_err_message("\t\t\t");
++	f_print(fout, "\t\t\texit(1);\n");
++	f_print(fout, "\t\t}\n");
++	f_print(fout, "\t\tif (nconf)\n");
++	f_print(fout, "\t\t\tfreenetconfigent(nconf);\n");
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind != DEF_PROGRAM) {
++			continue;
++		}
++		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++			f_print(fout,
++				"\t\tif (!svc_reg(%s, %s, %s, ",
++				TRANSP, def->def_name, vp->vers_name);
++			pvname(def->def_name, vp->vers_num);
++			f_print(fout, ", 0)) {\n");
++			(void) sprintf(_errbuf, "unable to register (%s, %s).",
++					def->def_name, vp->vers_name);
++			print_err_message("\t\t\t");
++			f_print(fout, "\t\t\texit(1);\n");
++			f_print(fout, "\t\t}\n");
++		}
++	}
++	if (timerflag) {
++		f_print(fout, "\t\tif (pmclose) {\n");
++		f_print(fout, "\t\t\t(void) signal(SIGALRM, %s closedown);\n",
++				Cflag? "(SIG_PF)" : "(void(*)())" );
++		f_print(fout, "\t\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n");
++		f_print(fout, "\t\t}\n");
++	}
++	f_print(fout, "\t\tsvc_run();\n");
++	f_print(fout, "\t\texit(1);\n");
++	f_print(fout, "\t\t/* NOTREACHED */\n");
++	f_print(fout, "\t}\n");
++}
++
++/*
++ * Support for backgrounding the server if self started.
++ */
++static void
++write_rpc_svc_fg(char *infile, char *sp)
++{
++	f_print(fout, "#ifndef RPC_SVC_FG\n");
++	f_print(fout, "%sint size;\n", sp);
++	if( tirpcflag )
++	        f_print(fout, "%sstruct rlimit rl;\n", sp);
++	if (inetdflag)
++		f_print(fout, "%sint pid, i;\n\n", sp);
++	f_print(fout, "%spid = fork();\n", sp);
++	f_print(fout, "%sif (pid < 0) {\n", sp);
++	f_print(fout, "%s\tperror(\"cannot fork\");\n", sp);
++	f_print(fout, "%s\texit(1);\n", sp);
++	f_print(fout, "%s}\n", sp);
++	f_print(fout, "%sif (pid)\n", sp);
++	f_print(fout, "%s\texit(0);\n", sp);
++	/* get number of file descriptors */
++	if( tirpcflag ) {
++	  f_print(fout, "%srl.rlim_max = 0;\n", sp);
++	  f_print(fout, "%sgetrlimit(RLIMIT_NOFILE, &rl);\n", sp);
++	  f_print(fout, "%sif ((size = rl.rlim_max) == 0)\n", sp);
++	  f_print(fout, "%s\texit(1);\n", sp);
++	} else {
++	  f_print(fout, "%ssize = getdtablesize();\n", sp);
++	}
++
++	f_print(fout, "%sfor (i = 0; i < size; i++)\n", sp);
++	f_print(fout, "%s\t(void) close(i);\n", sp);
++	/* Redirect stderr and stdout to console */
++	f_print(fout, "%si = open(\"/dev/console\", 2);\n", sp);
++	f_print(fout, "%s(void) dup2(i, 1);\n", sp);
++	f_print(fout, "%s(void) dup2(i, 2);\n", sp);
++	/* This removes control of the controlling terminal */
++	if( tirpcflag )
++	  f_print(fout, "%ssetsid();\n", sp);
++	else {
++	  f_print(fout, "%si = open(\"/dev/tty\", 2);\n", sp);
++	  f_print(fout, "%sif (i >= 0) {\n", sp);
++	  f_print(fout, "%s\t(void) ioctl(i, TIOCNOTTY, (char *)NULL);\n", sp);;
++	  f_print(fout, "%s\t(void) close(i);\n", sp);
++	  f_print(fout, "%s}\n", sp);
++	}
++	if (!logflag)
++		open_log_file(infile, sp);
++	f_print(fout, "#endif\n");
++	if (logflag)
++		open_log_file(infile, sp);
++}
++
++static void
++open_log_file(char *infile, char *sp)
++{
++	char *s;
++
++	s = strrchr(infile, '.');
++	if (s) 
++		*s = '\0';
++	f_print(fout,"%sopenlog(\"%s\", LOG_PID, LOG_DAEMON);\n", sp, infile);
++	if (s)
++		*s = '.';
++}
++
++
++
++
++/*
++ * write a registration for the given transport for Inetd
++ */
++void
++write_inetd_register(char *transp)
++{
++	list *l;
++	definition *def;
++	version_list *vp;
++	char *sp;
++	int isudp;
++	char tmpbuf[32];
++
++	if (inetdflag)
++		sp = "\t";
++	else
++		sp = "";
++	if (streq(transp, "udp"))
++		isudp = 1;
++	else
++		isudp = 0;
++	f_print(fout, "\n");
++	if (inetdflag) {
++		f_print(fout, "\tif ((_rpcfdtype == 0) || (_rpcfdtype == %s)) {\n",
++				isudp ? "SOCK_DGRAM" : "SOCK_STREAM");
++	}
++	f_print(fout, "%s\t%s = svc%s_create(%s",
++		sp, TRANSP, transp, inetdflag? "sock": "RPC_ANYSOCK");
++	if (!isudp)
++		f_print(fout, ", 0, 0");
++	f_print(fout, ");\n");
++	f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP);
++	(void) sprintf(_errbuf, "cannot create %s service.", transp);
++	(void) sprintf(tmpbuf, "%s\t\t", sp);
++	print_err_message(tmpbuf);
++	f_print(fout, "%s\t\texit(1);\n", sp);
++	f_print(fout, "%s\t}\n", sp);
++
++	if (inetdflag) {
++		f_print(fout, "%s\tif (!_rpcpmstart)\n\t", sp);
++		f_print(fout, "%s\tproto = IPPROTO_%s;\n",
++				sp, isudp ? "UDP": "TCP");
++	}
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind != DEF_PROGRAM) {
++			continue;
++		}
++		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++			f_print(fout, "%s\tif (!svc_register(%s, %s, %s, ",
++				sp, TRANSP, def->def_name, vp->vers_name);
++			pvname(def->def_name, vp->vers_num);
++			if (inetdflag)
++				f_print(fout, ", proto)) {\n");
++			else 
++				f_print(fout, ", IPPROTO_%s)) {\n",
++					isudp ? "UDP": "TCP");
++			(void) sprintf(_errbuf, "unable to register (%s, %s, %s).",
++					def->def_name, vp->vers_name, transp);
++			print_err_message(tmpbuf);
++			f_print(fout, "%s\t\texit(1);\n", sp);
++			f_print(fout, "%s\t}\n", sp);
++		}
++	}
++	if (inetdflag)
++		f_print(fout, "\t}\n");
++}
+diff --git a/rpcgen/rpc_tblout.c b/rpcgen/rpc_tblout.c
+new file mode 100644
+index 0000000..ae002f7
+--- /dev/null
++++ b/rpcgen/rpc_tblout.c
+@@ -0,0 +1,165 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
++#endif
++
++/*
++ * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
++ */
++#include <stdio.h>
++#include <string.h>
++#include "rpc_parse.h"
++#include "rpc_util.h"
++#include "rpc_output.h"
++
++static void	write_table(definition *def);
++static void	printit(char *prefix, char *type);
++
++#define TABSIZE		8
++#define TABCOUNT	5
++#define TABSTOP		(TABSIZE*TABCOUNT)
++
++static char tabstr[TABCOUNT+1] = "\t\t\t\t\t";
++
++static char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n";
++static char tbl_end[] = "};\n";
++
++static char null_entry[] = "\n\t(char *(*)())0,\n\
++ \t(xdrproc_t) xdr_void,\t\t\t0,\n\
++ \t(xdrproc_t) xdr_void,\t\t\t0,\n";
++
++
++static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n";
++
++void
++write_tables(void)
++{
++	list *l;
++	definition *def;
++
++	f_print(fout, "\n");
++	for (l = defined; l != NULL; l = l->next) {
++		def = (definition *) l->val;
++		if (def->def_kind == DEF_PROGRAM) {
++			write_table(def);
++		}
++	}
++}
++
++static void
++write_table(definition *def)
++{
++	version_list *vp;
++	proc_list *proc;
++	int current;
++	int expected;
++	char progvers[100];
++	int warning;
++
++	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
++		warning = 0;
++		s_print(progvers, "%s_%s",
++		    locase(def->def_name), vp->vers_num);
++		/* print the table header */
++		f_print(fout, tbl_hdr, progvers);
++
++		if (nullproc(vp->procs)) {
++			expected = 0;
++		} else {
++			expected = 1;
++			f_print(fout, null_entry);
++		}
++		for (proc = vp->procs; proc != NULL; proc = proc->next) {
++			current = atoi(proc->proc_num);
++			if (current != expected++) {
++				f_print(fout,
++			"\n/*\n * WARNING: table out of order\n */\n");
++				if (warning == 0) {
++					f_print(stderr,
++				    "WARNING %s table is out of order\n",
++					    progvers);
++					warning = 1;
++					nonfatalerrors = 1;
++				}
++				expected = current + 1;
++			}
++			f_print(fout, "\n\t(char *(*)())RPCGEN_ACTION(");
++
++			/* routine to invoke */
++			if( Cflag && !newstyle )
++			  pvname_svc(proc->proc_name, vp->vers_num);
++			else {
++			  if( newstyle )
++			    f_print( fout, "_");   /* calls internal func */
++			  pvname(proc->proc_name, vp->vers_num);
++			}
++			f_print(fout, "),\n");
++
++			/* argument info */
++			if( proc->arg_num > 1 )
++			  printit((char*) NULL, proc->args.argname );
++			else  
++			  /* do we have to do something special for newstyle */
++			  printit( proc->args.decls->decl.prefix,
++				  proc->args.decls->decl.type );
++			/* result info */
++			printit(proc->res_prefix, proc->res_type);
++		}
++
++		/* print the table trailer */
++		f_print(fout, tbl_end);
++		f_print(fout, tbl_nproc, progvers, progvers, progvers);
++	}
++}
++
++static void
++printit(char *prefix, char *type)
++{
++	int len;
++	int tabs;
++
++
++ 	len = fprintf(fout, "\txdr_%s,", stringfix(type));
++	/* account for leading tab expansion */
++	len += TABSIZE - 1;
++	/* round up to tabs required */
++	tabs = (TABSTOP - len + TABSIZE - 1)/TABSIZE;
++	f_print(fout, "%s", &tabstr[TABCOUNT-tabs]);
++
++	if (streq(type, "void")) {
++		f_print(fout, "0");
++	} else {
++		f_print(fout, "sizeof ( ");
++		/* XXX: should "follow" be 1 ??? */
++		ptype(prefix, type, 0);
++		f_print(fout, ")");
++	}
++	f_print(fout, ",\n");
++}
+diff --git a/rpcgen/rpc_util.c b/rpcgen/rpc_util.c
+new file mode 100644
+index 0000000..b67be57
+--- /dev/null
++++ b/rpcgen/rpc_util.c
+@@ -0,0 +1,479 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#if 0
++static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
++#endif
++
++/*
++ * rpc_util.c, Utility routines for the RPC protocol compiler 
++ */
++#include <stdio.h>
++#include <memory.h>
++#include <ctype.h>
++#include <unistd.h>
++#include "rpc_scan.h"
++#include "rpc_parse.h"
++#include "rpc_util.h"
++
++static void	printwhere(void);
++
++
++#define ARGEXT "argument"
++
++char curline[MAXLINESIZE];	/* current read line */
++char *where = curline;		/* current point in line */
++int linenum = 0;		/* current line number */
++
++char *infilename;		/* input filename */
++
++#define NFILES 7
++char *outfiles[NFILES];		/* output file names */
++int nfiles;
++
++FILE *fout;			/* file pointer of current output */
++FILE *fin;			/* file pointer of current input */
++
++list *defined;			/* list of defined things */
++
++/*
++ * Reinitialize the world 
++ */
++void
++reinitialize(void)
++{
++	memset(curline, 0, MAXLINESIZE);
++	where = curline;
++	linenum = 0;
++	defined = NULL;
++}
++
++/*
++ * string equality 
++ */
++int
++streq(char *a, char *b)
++{
++	return (strcmp(a, b) == 0);
++}
++
++/*
++ * find a value in a list 
++ */
++definition *
++findval(list *lst, char *val, int (*cmp)(definition *, char *))
++{
++         
++	for (; lst != NULL; lst = lst->next) {
++		if ((*cmp) (lst->val, val)) {
++			return (lst->val);
++		}
++	}
++	return (NULL);
++}
++
++/*
++ * store a value in a list 
++ */
++void
++storeval(lstp, val)
++	list **lstp;
++	definition *val;
++{
++	list **l;
++	list *lst;
++
++	
++	for (l = lstp; *l != NULL; l = (list **) & (*l)->next);
++	lst = ALLOC(list);
++	lst->val = val;
++	lst->next = NULL;
++	*l = lst;
++}
++
++static int
++findit(definition *def, char *type)
++{
++	return (streq(def->def_name, type));
++}
++
++static char *
++fixit(char *type, char *orig)
++{
++	definition *def;
++
++	def = (definition *) FINDVAL(defined, type, findit);
++	if (def == NULL || def->def_kind != DEF_TYPEDEF) {
++		return (orig);
++	}
++	switch (def->def.ty.rel) {
++	case REL_VECTOR:
++		return (def->def.ty.old_type);
++	case REL_ALIAS:
++		return (fixit(def->def.ty.old_type, orig));
++	default:
++		return (orig);
++	}
++}
++
++char *
++fixtype(char *type)
++{
++	return (fixit(type, type));
++}
++
++char *
++stringfix(char *type)
++{
++	if (streq(type, "string")) {
++		return ("wrapstring");
++	} else {
++		return (type);
++	}
++}
++
++void
++ptype(char *prefix, char *type, int follow)
++{
++	if (prefix != NULL) {
++		if (streq(prefix, "enum")) {
++			f_print(fout, "enum ");
++		} else {
++			f_print(fout, "struct ");
++		}
++	}
++	if (streq(type, "bool")) {
++		f_print(fout, "bool_t ");
++	} else if (streq(type, "string")) {
++		f_print(fout, "char *");
++	} else {
++		f_print(fout, "%s ", follow ? fixtype(type) : type);
++	}
++}
++
++static int
++typedefed(definition *def, char *type)
++{
++	if (def->def_kind != DEF_TYPEDEF || def->def.ty.old_prefix != NULL) {
++		return (0);
++	} else {
++		return (streq(def->def_name, type));
++	}
++}
++
++int
++isvectordef(char *type, relation rel)
++{
++	definition *def;
++
++	for (;;) {
++		switch (rel) {
++		case REL_VECTOR:
++			return (!streq(type, "string"));
++		case REL_ARRAY:
++			return (0);
++		case REL_POINTER:
++			return (0);
++		case REL_ALIAS:
++			def = (definition *) FINDVAL(defined, type, typedefed);
++			if (def == NULL) {
++				return (0);
++			}
++			type = def->def.ty.old_type;
++			rel = def->def.ty.rel;
++		}
++	}
++}
++
++char *
++locase(char *str)
++{
++	char c;
++	static char buf[100];
++	char *p = buf;
++
++	while ((c = *str++) != '\0') {
++		*p++ = (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c;
++	}
++	*p = 0;
++	return (buf);
++}
++
++void
++pvname_svc(char *pname, char *vnum)
++{
++	f_print(fout, "%s_%s_svc", locase(pname), vnum);
++}
++
++void
++pvname(char *pname, char *vnum)
++{
++	f_print(fout, "%s_%s", locase(pname), vnum);
++}
++
++/*
++ * print a useful (?) error message, and then die 
++ */
++void
++error(char *msg)
++{
++	printwhere();
++	f_print(stderr, "%s, line %d: ", infilename, linenum);
++	f_print(stderr, "%s\n", msg);
++	crash();
++}
++
++/*
++ * Something went wrong, unlink any files that we may have created and then
++ * die. 
++ */
++void
++crash(void)
++{
++	int i;
++
++	for (i = 0; i < nfiles; i++) {
++		(void) unlink(outfiles[i]);
++	}
++	exit(1);
++}
++
++void
++record_open(char *file)
++{
++	if (nfiles < NFILES) {
++		outfiles[nfiles++] = file;
++	} else {
++		f_print(stderr, "too many files!\n");
++		crash();
++	}
++}
++
++static char expectbuf[100];
++static char *toktostr();
++
++/*
++ * error, token encountered was not the expected one 
++ */
++void
++expected1(exp1)
++	tok_kind exp1;
++{
++	s_print(expectbuf, "expected '%s'",
++		toktostr(exp1));
++	error(expectbuf);
++}
++
++/*
++ * error, token encountered was not one of two expected ones 
++ */
++void
++expected2(exp1, exp2)
++	tok_kind exp1, exp2;
++{
++	s_print(expectbuf, "expected '%s' or '%s'",
++		toktostr(exp1),
++		toktostr(exp2));
++	error(expectbuf);
++}
++
++/*
++ * error, token encountered was not one of 3 expected ones 
++ */
++void
++expected3(exp1, exp2, exp3)
++	tok_kind exp1, exp2, exp3;
++{
++	s_print(expectbuf, "expected '%s', '%s' or '%s'",
++		toktostr(exp1),
++		toktostr(exp2),
++		toktostr(exp3));
++	error(expectbuf);
++}
++
++void
++tabify(f, tab)
++	FILE *f;
++	int tab;
++{
++	while (tab--) {
++		(void) fputc('\t', f);
++	}
++}
++
++
++static token tokstrings[] = {
++			     {TOK_IDENT, "identifier"},
++			     {TOK_CONST, "const"},
++			     {TOK_RPAREN, ")"},
++			     {TOK_LPAREN, "("},
++			     {TOK_RBRACE, "}"},
++			     {TOK_LBRACE, "{"},
++			     {TOK_LBRACKET, "["},
++			     {TOK_RBRACKET, "]"},
++			     {TOK_STAR, "*"},
++			     {TOK_COMMA, ","},
++			     {TOK_EQUAL, "="},
++			     {TOK_COLON, ":"},
++			     {TOK_SEMICOLON, ";"},
++			     {TOK_UNION, "union"},
++			     {TOK_STRUCT, "struct"},
++			     {TOK_SWITCH, "switch"},
++			     {TOK_CASE, "case"},
++			     {TOK_DEFAULT, "default"},
++			     {TOK_ENUM, "enum"},
++			     {TOK_TYPEDEF, "typedef"},
++			     {TOK_INT, "int"},
++			     {TOK_SHORT, "short"},
++			     {TOK_INT32, "int32"},
++			     {TOK_UNSIGNED, "unsigned"},
++			     {TOK_DOUBLE, "double"},
++			     {TOK_FLOAT, "float"},
++			     {TOK_CHAR, "char"},
++			     {TOK_STRING, "string"},
++			     {TOK_OPAQUE, "opaque"},
++			     {TOK_BOOL, "bool"},
++			     {TOK_VOID, "void"},
++			     {TOK_PROGRAM, "program"},
++			     {TOK_VERSION, "version"},
++			     {TOK_EOF, "??????"}
++};
++
++static char *
++toktostr(kind)
++	tok_kind kind;
++{
++	token *sp;
++
++	for (sp = tokstrings; sp->kind != TOK_EOF && sp->kind != kind; sp++);
++	return (sp->str);
++}
++
++static void
++printbuf(void)
++{
++	char c;
++	int i;
++	int cnt;
++
++#	define TABSIZE 4
++
++	for (i = 0; (c = curline[i]) != '\0'; i++) {
++		if (c == '\t') {
++			cnt = 8 - (i % TABSIZE);
++			c = ' ';
++		} else {
++			cnt = 1;
++		}
++		while (cnt--) {
++			(void) fputc(c, stderr);
++		}
++	}
++}
++
++static void
++printwhere(void)
++{
++	int i;
++	char c;
++	int cnt;
++
++	printbuf();
++	for (i = 0; i < where - curline; i++) {
++		c = curline[i];
++		if (c == '\t') {
++			cnt = 8 - (i % TABSIZE);
++		} else {
++			cnt = 1;
++		}
++		while (cnt--) {
++			(void) fputc('^', stderr);
++		}
++	}
++	(void) fputc('\n', stderr);
++}
++
++char * 
++make_argname(char *pname, char *vname) 
++{
++	char *name;
++	
++	name = malloc(strlen(pname) + strlen(vname) + strlen(ARGEXT) + 3);
++	if (!name) {
++		fprintf(stderr, "failed in malloc");
++		exit(1);
++	}
++	sprintf(name, "%s_%s_%s", locase(pname), vname, ARGEXT);
++	return(name);
++}
++
++bas_type *typ_list_h;
++bas_type *typ_list_t;
++
++void
++add_type(int len, char *type)
++{
++	bas_type       *ptr;
++
++
++	if ((ptr = (bas_type *) malloc(sizeof(bas_type))) == (bas_type *) NULL) {
++		fprintf(stderr, "failed in malloc");
++		exit(1);
++	}
++	ptr->name = type;
++	ptr->length = len;
++	ptr->next = NULL;
++	if (typ_list_t == NULL) {
++
++		typ_list_t = ptr;
++		typ_list_h = ptr;
++	} else {
++
++		typ_list_t->next = ptr;
++		typ_list_t = ptr;
++	}
++}
++
++
++bas_type *
++find_type(char *type)
++{
++	bas_type       *ptr;
++
++	ptr = typ_list_h;
++
++
++	while (ptr != NULL) {
++		if (strcmp(ptr->name, type) == 0)
++			return (ptr);
++		else
++			ptr = ptr->next;
++	};
++	return (NULL);
++}
++
+diff --git a/rpcgen/rpc_util.h b/rpcgen/rpc_util.h
+new file mode 100644
+index 0000000..fa115be
+--- /dev/null
++++ b/rpcgen/rpc_util.h
+@@ -0,0 +1,166 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*      @(#)rpc_util.h  1.5  90/08/29  (C) 1987 SMI   */
++
++/*
++ * rpc_util.h, Useful definitions for the RPC protocol compiler 
++ */
++
++#include <stdlib.h>
++
++#define alloc(size)		malloc((unsigned)(size))
++#define ALLOC(object)   (object *) malloc(sizeof(object))
++
++#define s_print	(void) sprintf
++#define f_print (void) fprintf
++
++struct list {
++	definition *val;
++	struct list *next;
++};
++typedef struct list list;
++
++#define PUT 1
++#define GET 2
++
++/*
++ * Global variables 
++ */
++#define MAXLINESIZE 1024
++extern char curline[MAXLINESIZE];
++extern char *where;
++extern int linenum;
++
++extern char *infilename;
++extern FILE *fout;
++extern FILE *fin;
++
++extern list *defined;
++
++
++extern bas_type *typ_list_h;
++extern bas_type *typ_list_t;
++
++/*
++ * All the option flags
++ */
++extern int inetdflag;
++extern int pmflag;   
++extern int tblflag;
++extern int logflag;
++extern int newstyle;
++extern int Cflag;	/* C++ flag */
++extern int tirpcflag;	/* flag for generating tirpc code */
++extern int Inline;	/* if this is 0, then do not generate inline code */
++
++/*
++ * Other flags related with inetd jumpstart.
++ */
++extern int indefinitewait;
++extern int exitnow;
++extern int timerflag;
++
++extern int nonfatalerrors;
++
++/*
++ * rpc_util routines 
++ */
++void storeval();
++
++#define STOREVAL(list,item)	\
++	storeval(list,item)
++
++definition *findval();
++
++#define FINDVAL(list,item,finder) \
++	findval(list, item, finder)
++
++
++/*
++ * rpc_cout routines
++ */
++void            cprint(void);
++void            emit(definition *);
++
++/*
++ * rpc_hout routines
++ */
++void            print_datadef(definition *);
++void            print_funcdef(definition *);
++
++/*
++ * rpc_svcout routines
++ */
++void            write_most(char *, int, int);
++void            write_register(void);
++void		write_netid_register(char *);
++void		write_nettype_register(char *);
++void		write_inetd_register(char *);
++void            write_rest(void);
++void            write_programs(char *);
++void            write_svc_aux(int);
++
++/*
++ * rpc_clntout routines
++ */
++void            write_stubs(void);
++void		printarglist(proc_list *, char *, char *);
++
++/*
++ * rpc_tblout routines
++ */
++void            write_tables(void);
++
++/*
++ * rpc_util
++ */
++void            pvname_svc(char *, char *);
++void            pvname(char *, char *);
++void            ptype(char *, char *, int);
++char *		make_argname(char *, char *);
++void		add_type(int, char *);
++void		reinitialize(void);
++void		crash(void);
++void		error(char *);
++char           *fixtype(char *);
++char           *stringfix(char *);
++char           *locase(char *);
++int             isvectordef(char *, relation);
++int             streq(char *, char *);
++void            tabify(FILE *, int);
++void            record_open(char *);
++bas_type       *find_type(char *type);
++
++/*
++ * rpc_sample
++ */
++void		write_sample_svc(definition *);
++int		write_sample_clnt(definition *);
++void		write_sample_clnt_main(void);
++void		add_sample_msg(void);
+diff --git a/rpcgen/rpcgen.1 b/rpcgen/rpcgen.1
+new file mode 100644
+index 0000000..89df7ed
+--- /dev/null
++++ b/rpcgen/rpcgen.1
+@@ -0,0 +1,521 @@
++.\" @(#)rpcgen.1 1.35 93/06/02 SMI
++.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.12.2.4 2002/06/21 15:28:50 charnier Exp $
++.\" Copyright 1985-1993 Sun Microsystems, Inc.
++.Dd March 28, 1993
++.Dt RPCGEN 1
++.Os
++.Sh NAME
++.Nm rpcgen
++.Nd an RPC protocol compiler
++.Sh SYNOPSIS
++.Nm
++.Ar infile
++.Nm
++.Op Fl a
++.Op Fl b
++.Op Fl C
++.Oo
++.Fl D Ns Ar name Ns Op Ar =value
++.Oc
++.Op Fl i Ar size
++.Op Fl I Op Fl K Ar seconds
++.Op Fl L
++.Op Fl M
++.Op Fl N
++.Op Fl T
++.Op Fl Y Ar pathname
++.Ar infile
++.Nm
++.Oo
++.Fl c |
++.Fl h |
++.Fl l |
++.Fl m |
++.Fl t |
++.Fl \&Sc |
++.Fl \&Ss |
++.Fl \&Sm
++.Oc
++.Op Fl o Ar outfile
++.Op Ar infile
++.Nm
++.Op Fl s Ar nettype
++.Op Fl o Ar outfile
++.Op Ar infile
++.Nm
++.Op Fl n Ar netid
++.Op Fl o Ar outfile
++.Op Ar infile
++.\" .SH AVAILABILITY
++.\" .LP
++.\" SUNWcsu
++.Sh DESCRIPTION
++The
++.Nm
++utility is a tool that generates C code to implement an
++.Tn RPC
++protocol.
++The input to
++.Nm
++is a language similar to C known as
++.Tn RPC
++Language (Remote Procedure Call Language).
++.Pp
++The
++.Nm
++utility is normally used as in the first synopsis where
++it takes an input file and generates three output files.
++If the
++.Ar infile
++is named
++.Pa proto.x ,
++then
++.Nm
++generates a header in
++.Pa proto.h ,
++XDR routines in
++.Pa proto_xdr.c ,
++server-side stubs in
++.Pa proto_svc.c ,
++and client-side stubs in
++.Pa proto_clnt.c .
++With the
++.Fl T
++option,
++it also generates the
++.Tn RPC
++dispatch table in
++.Pa proto_tbl.i .
++.Pp
++The
++.Nm
++utility can also generate sample client and server files
++that can be customized to suit a particular application.
++The
++.Fl \&Sc ,
++.Fl \&Ss
++and
++.Fl \&Sm
++options generate sample client, server and makefile, respectively.
++The
++.Fl a
++option generates all files, including sample files.
++If the
++.Ar infile
++is
++.Pa proto.x ,
++then the client side sample file is written to
++.Pa proto_client.c ,
++the server side sample file to
++.Pa proto_server.c
++and the sample makefile to
++.Pa makefile.proto .
++.Pp
++The server created can be started both by the port monitors
++(for example,
++.Xr inetd 8 )
++or by itself.
++When it is started by a port monitor,
++it creates servers only for the transport for which
++the file descriptor
++.Em 0
++was passed.
++The name of the transport must be specified
++by setting up the environment variable
++.Ev PM_TRANSPORT .
++When the server generated by
++.Nm
++is executed,
++it creates server handles for all the transports
++specified in
++.Ev NETPATH
++environment variable,
++or if it is unset,
++it creates server handles for all the visible transports from
++.Pa /etc/netconfig
++file.
++Note:
++the transports are chosen at run time and not at compile time.
++When the server is self-started,
++it backgrounds itself by default.
++A special define symbol
++.Em RPC_SVC_FG
++can be used to run the server process in foreground.
++.Pp
++The second synopsis provides special features which allow
++for the creation of more sophisticated
++.Tn RPC
++servers.
++These features include support for user provided
++.Em #defines
++and
++.Tn RPC
++dispatch tables.
++The entries in the
++.Tn RPC
++dispatch table contain:
++.Bl -bullet -offset indent -compact
++.It
++pointers to the service routine corresponding to that procedure,
++.It
++a pointer to the input and output arguments,
++.It
++the size of these routines.
++.El
++A server can use the dispatch table to check authorization
++and then to execute the service routine;
++a client library may use it to deal with the details of storage
++management and XDR data conversion.
++.Pp
++The other three synopses shown above are used when
++one does not want to generate all the output files,
++but only a particular one.
++See the
++.Sx EXAMPLES
++section below for examples of
++.Nm
++usage.
++When
++.Nm
++is executed with the
++.Fl s
++option,
++it creates servers for that particular class of transports.
++When
++executed with the
++.Fl n
++option,
++it creates a server for the transport specified by
++.Ar netid .
++If
++.Ar infile
++is not specified,
++.Nm
++accepts the standard input.
++.Pp
++The C preprocessor,
++.Em cc -E
++is run on the input file before it is actually interpreted by
++.Nm .
++For each type of output file,
++.Nm
++defines a special preprocessor symbol for use by the
++.Nm
++programmer:
++.Bl -tag -width indent
++.It RPC_HDR
++defined when compiling into headers
++.It RPC_XDR
++defined when compiling into XDR routines
++.It RPC_SVC
++defined when compiling into server-side stubs
++.It RPC_CLNT
++defined when compiling into client-side stubs
++.It RPC_TBL
++defined when compiling into RPC dispatch tables
++.El
++.Pp
++Any line beginning with
++.Dq %
++is passed directly into the output file,
++uninterpreted by
++.Nm .
++To specify the path name of the C preprocessor use
++.Fl Y
++flag.
++.Pp
++For every data type referred to in
++.Ar infile ,
++.Nm
++assumes that there exists a
++routine with the string
++.Em xdr_
++prepended to the name of the data type.
++If this routine does not exist in the
++.Tn RPC/XDR
++library, it must be provided.
++Providing an undefined data type
++allows customization of
++.Xr xdr 3
++routines.
++.Sh OPTIONS
++The following options are available:
++.Bl -tag -width indent
++.It Fl a
++Generate all files, including sample files.
++.It Fl b
++Backward compatibility mode.
++Generate transport specific
++.Tn RPC
++code for older versions
++of the operating system.
++.Pp
++Note: in
++.Fx ,
++this compatibility flag is turned on by
++default since
++.Fx
++supports only the older
++.Tn ONC RPC
++library.
++.It Fl c
++Compile into
++.Tn XDR
++routines.
++.It Fl C
++Generate header and stub files which can be used with
++.Tn ANSI
++C compilers.  Headers generated with this flag can also be
++used with C++ programs.
++.It Fl D Ns Ar name
++.It Fl D Ns Ar name=value
++.\".It Fl D Ns Ar name Ns Op Ar =value
++Define a symbol
++.Ar name .
++Equivalent to the
++.Em #define
++directive in the source.
++If no
++.Ar value
++is given,
++.Ar value
++is defined as
++.Em 1 .
++This option may be specified more than once.
++.It Fl h
++Compile into C data-definitions (a header).
++.Fl T
++option can be used in conjunction to produce a
++header which supports
++.Tn RPC
++dispatch tables.
++.It Fl i Ar size
++Size at which to start generating inline code.
++This option is useful for optimization.
++The default size is 5.
++.Pp
++Note: in order to provide backwards compatibility with the older
++.Nm
++on the
++.Fx
++platform, the default is actually 0 (which means
++that inline code generation is disabled by default). You must specify
++a non-zero value explicitly to override this default.
++.It Fl I
++Compile support for
++.Xr inetd 8
++in the server side stubs.
++Such servers can be self-started or can be started by
++.Nm inetd .
++When the server is self-started, it backgrounds itself by default.
++A special define symbol
++.Em RPC_SVC_FG
++can be used to run the
++server process in foreground, or the user may simply compile without
++the
++.Fl I
++option.
++.Pp
++If there are no pending client requests, the
++.Nm inetd
++servers exit after 120 seconds (default).
++The default can be changed with the
++.Fl K
++option.
++All the error messages for
++.Nm inetd
++servers
++are always logged with
++.Xr syslog 3 .
++.\" .IP
++.\" Note:
++.\" this option is supported for backward compatibility only.
++.\" By default,
++.\" .B rpcgen
++.\" generates servers that can be invoked through portmonitors.
++.Pp
++.It Fl K Ar seconds
++By default, services created using
++.Nm
++and invoked through
++port monitors wait 120 seconds
++after servicing a request before exiting.
++That interval can be changed using the
++.Fl K
++flag.
++To create a server that exits immediately upon servicing a request,
++use
++.Fl K Ar 0 .
++To create a server that never exits, the appropriate argument is
++.Fl k Ar -1 .
++.Pp
++When monitoring for a server,
++some portmonitors
++.Em always
++spawn a new process in response to a service request.
++If it is known that a server will be used with such a monitor, the
++server should exit immediately on completion.
++For such servers,
++.Nm
++should be used with
++.Fl K Ar 0 .
++.It Fl l
++Compile into client-side stubs.
++.It Fl L
++When the servers are started in foreground, use
++.Xr syslog 3
++to log the server errors instead of printing them on the standard
++error.
++.It Fl m
++Compile into server-side stubs,
++but do not generate a
++.Qq main
++routine.
++This option is useful for doing callback-routines
++and for users who need to write their own
++.Qq main
++routine to do initialization.
++.It Fl M
++Generate multithread-safe stubs for passing arguments and results between
++rpcgen generated code and user written code.
++This option is useful
++for users who want to use threads in their code.
++However, the
++.Xr rpc_svc_calls 3
++functions are not yet MT-safe, which means that rpcgen generated server-side
++code will not be MT-safe.
++.It Fl N
++This option allows procedures to have multiple arguments.
++It also uses the style of parameter passing that closely resembles C.
++So, when passing an argument to a remote procedure, you do not have to
++pass a pointer to the argument, but can pass the argument itself.
++This behavior is different from the old style of
++.Nm
++generated code.
++To maintain backward compatibility,
++this option is not the default.
++.It Fl n Ar netid
++Compile into server-side stubs for the transport
++specified by
++.Ar netid .
++There should be an entry for
++.Ar netid
++in the
++netconfig database.
++This option may be specified more than once,
++so as to compile a server that serves multiple transports.
++.It Fl o Ar outfile
++Specify the name of the output file.
++If none is specified,
++standard output is used
++(
++.Fl c ,
++.Fl h ,
++.Fl l ,
++.Fl m ,
++.Fl n ,
++.Fl s ,
++.Fl \&Sc ,
++.Fl \&Sm ,
++.Fl \&Ss ,
++and
++.Fl t
++modes only).
++.It Fl s Ar nettype
++Compile into server-side stubs for all the
++transports belonging to the class
++.Ar nettype .
++The supported classes are
++.Em netpath ,
++.Em visible ,
++.Em circuit_n ,
++.Em circuit_v ,
++.Em datagram_n ,
++.Em datagram_v ,
++.Em tcp ,
++and
++.Em udp
++(see
++.Xr rpc 3
++for the meanings associated with these classes).
++This option may be specified more than once.
++Note:
++the transports are chosen at run time and not at compile time.
++.It Fl \&Sc
++Generate sample client code that uses remote procedure calls.
++.It Fl \&Sm
++Generate a sample
++.Pa Makefile
++which can be used for compiling the application.
++.It Fl \&Ss
++Generate sample server code that uses remote procedure calls.
++.It Fl t
++Compile into
++.Tn RPC
++dispatch table.
++.It Fl T
++Generate the code to support
++.Tn RPC
++dispatch tables.
++.Pp
++The options
++.Fl c ,
++.Fl h ,
++.Fl l ,
++.Fl m ,
++.Fl s ,
++.Fl \&Sc ,
++.Fl \&Sm ,
++.Fl \&Ss ,
++and
++.Fl t
++are used exclusively to generate a particular type of file,
++while the options
++.Fl D
++and
++.Fl T
++are global and can be used with the other options.
++.It Fl Y Ar pathname
++Give the name of the directory where
++.Nm
++will start looking for the C-preprocessor.
++.El
++.Sh EXAMPLES
++The following example:
++.Dl example% rpcgen -T prot.x
++.Pp
++generates all the five files:
++.Pa prot.h ,
++.Pa prot_clnt.c ,
++.Pa prot_svc.c ,
++.Pa prot_xdr.c
++and
++.Pa prot_tbl.i .
++.Pp
++The following example sends the C data-definitions (header)
++to the standard output.
++.Dl example% rpcgen -h prot.x
++.Pp
++To send the test version of the
++.Fl D Ns Ar TEST ,
++server side stubs for
++all the transport belonging to the class
++.Ar datagram_n
++to standard output, use:
++.Dl example% rpcgen -s datagram_n -DTEST prot.x
++.Pp
++To create the server side stubs for the transport indicated
++by
++.Ar netid
++tcp,
++use:
++.Dl example% rpcgen -n tcp -o prot_svc.c prot.x
++.Sh SEE ALSO
++.Xr cc 1 ,
++.Xr rpc 3 ,
++.Xr syslog 3 ,
++.Xr inetd 8
++.\" .BR rpc_svc_calls (3)
++.Rs
++.%T The rpcgen chapter in the NETP manual
++.Re
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0009-Automatically-generate-XDR-header-files-from-.x-sour.patch b/package/libtirpc/libtirpc-0009-Automatically-generate-XDR-header-files-from-.x-sour.patch
new file mode 100644
index 0000000000..787452a6de
--- /dev/null
+++ b/package/libtirpc/libtirpc-0009-Automatically-generate-XDR-header-files-from-.x-sour.patch
@@ -0,0 +1,999 @@
+From 30fac06891c59a7fb784f6faa4e92921a84c73db Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 17:29:53 +0100
+Subject: [PATCH] Automatically generate XDR header files from .x sources
+ using rpcgen
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am           |   23 +-
+ src/Makefile.am       |    2 +-
+ tirpc/rpc/rpcb_prot.h |  797 -------------------------------------------------
+ tirpc/rpcsvc/crypt.h  |  109 -------
+ 4 files changed, 21 insertions(+), 910 deletions(-)
+ delete mode 100644 tirpc/rpc/rpcb_prot.h
+ delete mode 100644 tirpc/rpcsvc/crypt.h
+
+diff --git a/Makefile.am b/Makefile.am
+index afb4e38..7e63f78 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,9 +1,12 @@
+ SUBDIRS = src man doc rpcgen
+ ACLOCAL_AMFLAGS = -I m4
+ 
++GENFILES = \
++			 tirpc/rpcsvc/crypt.h \
++			 tirpc/rpc/rpcb_prot.h
++
+ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpcsvc/crypt.x \
+-			 tirpc/rpcsvc/crypt.h \
+ 			 tirpc/rpc/xdr.h \
+ 			 tirpc/rpc/types.h \
+ 			 tirpc/rpc/svc_soc.h \
+@@ -15,7 +18,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpc/rpcent.h \
+ 			 tirpc/rpc/rpc_com.h \
+ 			 tirpc/rpc/rpcb_prot.x \
+-			 tirpc/rpc/rpcb_prot.h \
+ 			 tirpc/rpc/rpcb_clnt.h \
+ 			 tirpc/rpc/raw.h \
+ 			 tirpc/rpc/pmap_rmt.h \
+@@ -32,6 +34,21 @@ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpc/auth.h \
+ 			 tirpc/rpc/auth_gss.h \
+ 			 tirpc/rpc/auth_des.h
+-    
++
++nobase_nodist_include_HEADERS = $(GENFILES)
++
++BUILT_SOURCES = $(GENFILES)
++
+ pkgconfigdir=$(libdir)/pkgconfig
+ pkgconfig_DATA = libtirpc.pc
++
++$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen
++	mkdir -p $(dir $@)
++	$(top_builddir)/rpcgen/rpcgen -h -o $@ $<
++
++$(top_builddir)/rpcgen/rpcgen: force
++	cd rpcgen && $(MAKE)
++
++force:
++
++CLEANFILES = $(GENFILES)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6dc259e..bd276cf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@
+ 
+ 
+ INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DVERSION="\"$(VERSION)\"" \
+-		-D_GNU_SOURCE -Wall -pipe  
++		-D_GNU_SOURCE -Wall -pipe -I$(top_builddir)/tirpc
+ 
+ lib_LTLIBRARIES = libtirpc.la
+ 
+diff --git a/tirpc/rpc/rpcb_prot.h b/tirpc/rpc/rpcb_prot.h
+deleted file mode 100644
+index 7ae48b8..0000000
+--- a/tirpc/rpc/rpcb_prot.h
++++ /dev/null
+@@ -1,797 +0,0 @@
+-/*
+- * Please do not edit this file.
+- * It was generated using rpcgen.
+- */
+-
+-#ifndef _RPCB_PROT_H_RPCGEN
+-#define _RPCB_PROT_H_RPCGEN
+-
+-#include <rpc/rpc.h>
+-
+-#ifndef IXDR_GET_INT32
+-#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_INT32
+-#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
+-#endif
+-#ifndef IXDR_GET_U_INT32
+-#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_U_INT32
+-#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
+-#endif
+-/*
+- * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
+- *
+- * Copyright (c) 2009, Sun Microsystems, Inc.
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- * - Redistributions of source code must retain the above copyright notice,
+- *   this list of conditions and the following disclaimer.
+- * - Redistributions in binary form must reproduce the above copyright notice,
+- *   this list of conditions and the following disclaimer in the documentation
+- *   and/or other materials provided with the distribution.
+- * - Neither the name of Sun Microsystems, Inc. nor the names of its
+- *   contributors may be used to endorse or promote products derived
+- *   from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+- * POSSIBILITY OF SUCH DAMAGE.
+- */
+-/*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
+- */
+-/* from rpcb_prot.x */
+-
+-/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
+-
+-#ifndef _KERNEL
+-
+-
+-/*
+- * The following procedures are supported by the protocol in version 3:
+- *
+- * RPCBPROC_NULL() returns ()
+- * 	takes nothing, returns nothing
+- *
+- * RPCBPROC_SET(rpcb) returns (bool_t)
+- * 	TRUE is success, FALSE is failure.  Registers the tuple
+- *	[prog, vers, address, owner, netid].
+- *	Finds out owner and netid information on its own.
+- *
+- * RPCBPROC_UNSET(rpcb) returns (bool_t)
+- *	TRUE is success, FALSE is failure.  Un-registers tuple
+- *	[prog, vers, netid].  addresses is ignored.
+- *	If netid is NULL, unregister all.
+- *
+- * RPCBPROC_GETADDR(rpcb) returns (string).
+- *	0 is failure.  Otherwise returns the universal address where the
+- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
+- *
+- * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
+- *	used to dump the entire rpcbind maps
+- *
+- * RPCBPROC_CALLIT(rpcb_rmtcallargs)
+- * 	RETURNS (rpcb_rmtcallres);
+- * 	Calls the procedure on the remote machine.  If it is not registered,
+- *	this procedure is quiet; i.e. it does not return error information!!!
+- *	This routine only passes null authentication parameters.
+- *	It has no interface to xdr routines for RPCBPROC_CALLIT.
+- *
+- * RPCBPROC_GETTIME() returns (int).
+- *	Gets the remote machines time
+- *
+- * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
+- *	Returns the netbuf address from universal address.
+- *
+- * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
+- *	Returns the universal address from netbuf address.
+- *
+- * END OF RPCBIND VERSION 3 PROCEDURES
+- */
+-/*
+- * Except for RPCBPROC_CALLIT, the procedures above are carried over to
+- * rpcbind version 4.  Those below are added or modified for version 4.
+- * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
+- * AS RPCBPROC_CALLIT.
+- *
+- * RPCBPROC_BCAST(rpcb_rmtcallargs)
+- * 	RETURNS (rpcb_rmtcallres);
+- * 	Calls the procedure on the remote machine.  If it is not registered,
+- *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
+- *	This routine should be used for broadcasting and nothing else.
+- *
+- * RPCBPROC_GETVERSADDR(rpcb) returns (string).
+- *	0 is failure.  Otherwise returns the universal address where the
+- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
+- *	Same as RPCBPROC_GETADDR except that if the given version number
+- *	is not available, the address is not returned.
+- *
+- * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
+- * 	RETURNS (rpcb_rmtcallres);
+- * 	Calls the procedure on the remote machine.  If it is not registered,
+- *	this procedure is NOT quiet; i.e. it DOES return error information!!!
+- * 	as any normal application would expect.
+- *
+- * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
+- *	Same as RPCBPROC_GETADDR except that it returns a list of all the
+- *	addresses registered for the combination (prog, vers) (for all
+- *	transports).
+- *
+- * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
+- *	Returns the statistics about the kind of requests received by rpcbind.
+- */
+-
+-/*
+- * A mapping of (program, version, network ID) to address
+- */
+-
+-struct rpcb {
+-	rpcprog_t r_prog;
+-	rpcvers_t r_vers;
+-	char *r_netid;
+-	char *r_addr;
+-	char *r_owner;
+-};
+-typedef struct rpcb rpcb;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb(XDR *, rpcb*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb(XDR *, rpcb*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcb RPCB;
+-
+-
+-/*
+- * A list of mappings
+- *
+- * Below are two definitions for the rpcblist structure.  This is done because
+- * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
+- * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
+- * structure (actually called rp__list) is used with rpcgen, and the other is
+- * defined only in the header file for compatibility with the specified
+- * interface.
+- */
+-
+-struct rp__list {
+-	rpcb rpcb_map;
+-	struct rp__list *rpcb_next;
+-};
+-typedef struct rp__list rp__list;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rp__list(XDR *, rp__list*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rp__list(XDR *, rp__list*);
+-#else /* Old Style C */ 
+-bool_t xdr_rp__list();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rp__list *rpcblist_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcblist_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-typedef struct rp__list rpcblist;
+-typedef struct rp__list RPCBLIST;
+-
+-#ifndef __cplusplus
+-struct rpcblist {
+- RPCB rpcb_map;
+- struct rpcblist *rpcb_next;
+-};
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-extern bool_t xdr_rpcblist(XDR *, rpcblist**);
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-
+-/*
+- * Arguments of remote calls
+- */
+-
+-struct rpcb_rmtcallargs {
+-	rpcprog_t prog;
+-	rpcvers_t vers;
+-	rpcproc_t proc;
+-	struct {
+-		u_int args_len;
+-		char *args_val;
+-	} args;
+-};
+-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_rmtcallargs();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * Client-side only representation of rpcb_rmtcallargs structure.
+- *
+- * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
+- * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
+- * be passed the XDR routine that knows the args' structure.  This routine
+- * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
+- * the application being called already knows the args structure.  So we use a
+- * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
+- * includes the args' XDR routine.
+- */
+-struct r_rpcb_rmtcallargs {
+- rpcprog_t prog;
+- rpcvers_t vers;
+- rpcproc_t proc;
+- struct {
+- u_int args_len;
+- char *args_val;
+- } args;
+- xdrproc_t xdr_args; /* encodes args */
+-};
+-
+-
+-/*
+- * Results of the remote call
+- */
+-
+-struct rpcb_rmtcallres {
+-	char *addr;
+-	struct {
+-		u_int results_len;
+-		char *results_val;
+-	} results;
+-};
+-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_rmtcallres();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * Client-side only representation of rpcb_rmtcallres structure.
+- */
+-struct r_rpcb_rmtcallres {
+- char *addr;
+- struct {
+- u_int32_t results_len;
+- char *results_val;
+- } results;
+- xdrproc_t xdr_res; /* decodes results */
+-};
+-
+-/*
+- * rpcb_entry contains a merged address of a service on a particular
+- * transport, plus associated netconfig information.  A list of rpcb_entrys
+- * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
+- * in r_nc_* fields.
+- */
+-
+-struct rpcb_entry {
+-	char *r_maddr;
+-	char *r_nc_netid;
+-	u_int r_nc_semantics;
+-	char *r_nc_protofmly;
+-	char *r_nc_proto;
+-};
+-typedef struct rpcb_entry rpcb_entry;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_entry();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * A list of addresses supported by a service.
+- */
+-
+-struct rpcb_entry_list {
+-	rpcb_entry rpcb_entry_map;
+-	struct rpcb_entry_list *rpcb_entry_next;
+-};
+-typedef struct rpcb_entry_list rpcb_entry_list;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_entry_list();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcb_entry_list *rpcb_entry_list_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_entry_list_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * rpcbind statistics
+- */
+-
+-#define rpcb_highproc_2 RPCBPROC_CALLIT
+-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
+-#define rpcb_highproc_4 RPCBPROC_GETSTAT
+-#define RPCBSTAT_HIGHPROC 13
+-#define RPCBVERS_STAT 3
+-#define RPCBVERS_4_STAT 2
+-#define RPCBVERS_3_STAT 1
+-#define RPCBVERS_2_STAT 0
+-
+-/* Link list of all the stats about getport and getaddr */
+-
+-struct rpcbs_addrlist {
+-	rpcprog_t prog;
+-	rpcvers_t vers;
+-	int success;
+-	int failure;
+-	char *netid;
+-	struct rpcbs_addrlist *next;
+-};
+-typedef struct rpcbs_addrlist rpcbs_addrlist;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_addrlist();
+-#endif /* Old Style C */ 
+-
+-
+-/* Link list of all the stats about rmtcall */
+-
+-struct rpcbs_rmtcalllist {
+-	rpcprog_t prog;
+-	rpcvers_t vers;
+-	rpcproc_t proc;
+-	int success;
+-	int failure;
+-	int indirect;
+-	char *netid;
+-	struct rpcbs_rmtcalllist *next;
+-};
+-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_rmtcalllist();
+-#endif /* Old Style C */ 
+-
+-
+-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_proc();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_addrlist_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_rmtcalllist_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-struct rpcb_stat {
+-	rpcbs_proc info;
+-	int setinfo;
+-	int unsetinfo;
+-	rpcbs_addrlist_ptr addrinfo;
+-	rpcbs_rmtcalllist_ptr rmtinfo;
+-};
+-typedef struct rpcb_stat rpcb_stat;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_stat();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * One rpcb_stat structure is returned for each version of rpcbind
+- * being monitored.
+- */
+-
+-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_stat_byvers();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * We don't define netbuf in RPCL, since it would contain structure member
+- * names that would conflict with the definition of struct netbuf in
+- * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
+- * and implement it ourselves in rpc/rpcb_prot.c.
+- */
+-#ifdef __cplusplus
+-extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
+-
+-#else /* __STDC__ */
+-extern bool_t xdr_netbuf(XDR *, struct netbuf *);
+-
+-#endif
+-
+-#define RPCBVERS_3 RPCBVERS
+-#define RPCBVERS_4 RPCBVERS4
+-
+-#define _PATH_RPCBINDSOCK "/var/run/rpcbind.sock"
+-
+-#else /* ndef _KERNEL */
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/*
+- * A mapping of (program, version, network ID) to address
+- */
+-struct rpcb {
+- rpcprog_t r_prog; /* program number */
+- rpcvers_t r_vers; /* version number */
+- char *r_netid; /* network id */
+- char *r_addr; /* universal address */
+- char *r_owner; /* owner of the mapping */
+-};
+-typedef struct rpcb RPCB;
+-
+-/*
+- * A list of mappings
+- */
+-struct rpcblist {
+- RPCB rpcb_map;
+- struct rpcblist *rpcb_next;
+-};
+-typedef struct rpcblist RPCBLIST;
+-typedef struct rpcblist *rpcblist_ptr;
+-
+-/*
+- * Remote calls arguments
+- */
+-struct rpcb_rmtcallargs {
+- rpcprog_t prog; /* program number */
+- rpcvers_t vers; /* version number */
+- rpcproc_t proc; /* procedure number */
+- u_int32_t arglen; /* arg len */
+- caddr_t args_ptr; /* argument */
+- xdrproc_t xdr_args; /* XDR routine for argument */
+-};
+-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
+-
+-/*
+- * Remote calls results
+- */
+-struct rpcb_rmtcallres {
+- char *addr_ptr; /* remote universal address */
+- u_int32_t resultslen; /* results length */
+- caddr_t results_ptr; /* results */
+- xdrproc_t xdr_results; /* XDR routine for result */
+-};
+-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
+-
+-struct rpcb_entry {
+- char *r_maddr;
+- char *r_nc_netid;
+- unsigned int r_nc_semantics;
+- char *r_nc_protofmly;
+- char *r_nc_proto;
+-};
+-typedef struct rpcb_entry rpcb_entry;
+-
+-/*
+- * A list of addresses supported by a service.
+- */
+-
+-struct rpcb_entry_list {
+- rpcb_entry rpcb_entry_map;
+- struct rpcb_entry_list *rpcb_entry_next;
+-};
+-typedef struct rpcb_entry_list rpcb_entry_list;
+-
+-typedef rpcb_entry_list *rpcb_entry_list_ptr;
+-
+-/*
+- * rpcbind statistics
+- */
+-
+-#define rpcb_highproc_2 RPCBPROC_CALLIT
+-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
+-#define rpcb_highproc_4 RPCBPROC_GETSTAT
+-#define RPCBSTAT_HIGHPROC 13
+-#define RPCBVERS_STAT 3
+-#define RPCBVERS_4_STAT 2
+-#define RPCBVERS_3_STAT 1
+-#define RPCBVERS_2_STAT 0
+-
+-/* Link list of all the stats about getport and getaddr */
+-
+-struct rpcbs_addrlist {
+- rpcprog_t prog;
+- rpcvers_t vers;
+- int success;
+- int failure;
+- char *netid;
+- struct rpcbs_addrlist *next;
+-};
+-typedef struct rpcbs_addrlist rpcbs_addrlist;
+-
+-/* Link list of all the stats about rmtcall */
+-
+-struct rpcbs_rmtcalllist {
+- rpcprog_t prog;
+- rpcvers_t vers;
+- rpcproc_t proc;
+- int success;
+- int failure;
+- int indirect;
+- char *netid;
+- struct rpcbs_rmtcalllist *next;
+-};
+-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
+-
+-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
+-
+-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
+-
+-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
+-
+-struct rpcb_stat {
+- rpcbs_proc info;
+- int setinfo;
+- int unsetinfo;
+- rpcbs_addrlist_ptr addrinfo;
+- rpcbs_rmtcalllist_ptr rmtinfo;
+-};
+-typedef struct rpcb_stat rpcb_stat;
+-
+-/*
+- * One rpcb_stat structure is returned for each version of rpcbind
+- * being monitored.
+- */
+-
+-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* ndef _KERNEL */
+-
+-#define RPCBPROG ((u_int32_t)100000)
+-#define RPCBVERS ((u_int32_t)3)
+-
+-#ifdef __cplusplus
+-#define RPCBPROC_SET ((u_int32_t)1)
+-extern "C" bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_UNSET ((u_int32_t)2)
+-extern "C" bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETADDR ((u_int32_t)3)
+-extern "C" char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
+-extern "C" char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_DUMP ((u_int32_t)4)
+-extern "C" rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
+-extern "C" rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_CALLIT ((u_int32_t)5)
+-extern "C" rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
+-extern "C" rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETTIME ((u_int32_t)6)
+-extern "C" u_int * rpcbproc_gettime_3(void *, CLIENT *);
+-extern "C" u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
+-#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
+-extern "C" char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
+-extern "C" char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
+-
+-#elif __STDC__
+-#define RPCBPROC_SET ((u_int32_t)1)
+-extern  bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_UNSET ((u_int32_t)2)
+-extern  bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETADDR ((u_int32_t)3)
+-extern  char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
+-extern  char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_DUMP ((u_int32_t)4)
+-extern  rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
+-extern  rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_CALLIT ((u_int32_t)5)
+-extern  rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
+-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETTIME ((u_int32_t)6)
+-extern  u_int * rpcbproc_gettime_3(void *, CLIENT *);
+-extern  u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
+-#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
+-extern  char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
+-extern  char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
+-
+-#else /* Old Style C */ 
+-#define RPCBPROC_SET ((u_int32_t)1)
+-extern  bool_t * rpcbproc_set_3();
+-extern  bool_t * rpcbproc_set_3_svc();
+-#define RPCBPROC_UNSET ((u_int32_t)2)
+-extern  bool_t * rpcbproc_unset_3();
+-extern  bool_t * rpcbproc_unset_3_svc();
+-#define RPCBPROC_GETADDR ((u_int32_t)3)
+-extern  char ** rpcbproc_getaddr_3();
+-extern  char ** rpcbproc_getaddr_3_svc();
+-#define RPCBPROC_DUMP ((u_int32_t)4)
+-extern  rpcblist_ptr * rpcbproc_dump_3();
+-extern  rpcblist_ptr * rpcbproc_dump_3_svc();
+-#define RPCBPROC_CALLIT ((u_int32_t)5)
+-extern  rpcb_rmtcallres * rpcbproc_callit_3();
+-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc();
+-#define RPCBPROC_GETTIME ((u_int32_t)6)
+-extern  u_int * rpcbproc_gettime_3();
+-extern  u_int * rpcbproc_gettime_3_svc();
+-#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3();
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc();
+-#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
+-extern  char ** rpcbproc_taddr2uaddr_3();
+-extern  char ** rpcbproc_taddr2uaddr_3_svc();
+-#endif /* Old Style C */ 
+-#define RPCBVERS4 ((u_int32_t)4)
+-
+-#ifdef __cplusplus
+-extern "C" bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
+-extern "C" bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
+-extern "C" char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
+-extern "C" char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
+-extern "C" rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
+-extern "C" rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
+-#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
+-extern "C" rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
+-extern "C" rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-extern "C" u_int * rpcbproc_gettime_4(void *, CLIENT *);
+-extern "C" u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
+-extern "C" char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
+-extern "C" char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
+-#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
+-extern "C" char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
+-extern "C" char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_INDIRECT ((u_int32_t)10)
+-extern "C" rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
+-extern "C" rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
+-extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
+-extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETSTAT ((u_int32_t)12)
+-extern "C" rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
+-extern "C" rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
+-
+-#elif __STDC__
+-extern  bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
+-extern  bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
+-extern  char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
+-extern  char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
+-extern  rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
+-extern  rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
+-#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-extern  u_int * rpcbproc_gettime_4(void *, CLIENT *);
+-extern  u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
+-extern  char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
+-extern  char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
+-#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
+-extern  char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
+-extern  char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_INDIRECT ((u_int32_t)10)
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETSTAT ((u_int32_t)12)
+-extern  rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
+-extern  rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
+-
+-#else /* Old Style C */ 
+-extern  bool_t * rpcbproc_set_4();
+-extern  bool_t * rpcbproc_set_4_svc();
+-extern  bool_t * rpcbproc_unset_4();
+-extern  bool_t * rpcbproc_unset_4_svc();
+-extern  char ** rpcbproc_getaddr_4();
+-extern  char ** rpcbproc_getaddr_4_svc();
+-extern  rpcblist_ptr * rpcbproc_dump_4();
+-extern  rpcblist_ptr * rpcbproc_dump_4_svc();
+-#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4();
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc();
+-extern  u_int * rpcbproc_gettime_4();
+-extern  u_int * rpcbproc_gettime_4_svc();
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4();
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc();
+-extern  char ** rpcbproc_taddr2uaddr_4();
+-extern  char ** rpcbproc_taddr2uaddr_4_svc();
+-#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
+-extern  char ** rpcbproc_getversaddr_4();
+-extern  char ** rpcbproc_getversaddr_4_svc();
+-#define RPCBPROC_INDIRECT ((u_int32_t)10)
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4();
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc();
+-#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4();
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc();
+-#define RPCBPROC_GETSTAT ((u_int32_t)12)
+-extern  rpcb_stat * rpcbproc_getstat_4();
+-extern  rpcb_stat * rpcbproc_getstat_4_svc();
+-#endif /* Old Style C */ 
+-
+-#endif /* !_RPCB_PROT_H_RPCGEN */
+diff --git a/tirpc/rpcsvc/crypt.h b/tirpc/rpcsvc/crypt.h
+deleted file mode 100644
+index da1f9cc..0000000
+--- a/tirpc/rpcsvc/crypt.h
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/*
+- * Please do not edit this file.
+- * It was generated using rpcgen.
+- */
+-
+-#ifndef _CRYPT_H_RPCGEN
+-#define _CRYPT_H_RPCGEN
+-
+-#include <rpc/rpc.h>
+-
+-#ifndef IXDR_GET_INT32
+-#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_INT32
+-#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
+-#endif
+-#ifndef IXDR_GET_U_INT32
+-#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_U_INT32
+-#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
+-#endif
+-
+-enum des_dir {
+-	ENCRYPT_DES = 0,
+-	DECRYPT_DES = 1,
+-};
+-typedef enum des_dir des_dir;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_des_dir(XDR *, des_dir*);
+-#elif __STDC__ 
+-extern  bool_t xdr_des_dir(XDR *, des_dir*);
+-#else /* Old Style C */ 
+-bool_t xdr_des_dir();
+-#endif /* Old Style C */ 
+-
+-
+-enum des_mode {
+-	CBC_DES = 0,
+-	ECB_DES = 1,
+-};
+-typedef enum des_mode des_mode;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_des_mode(XDR *, des_mode*);
+-#elif __STDC__ 
+-extern  bool_t xdr_des_mode(XDR *, des_mode*);
+-#else /* Old Style C */ 
+-bool_t xdr_des_mode();
+-#endif /* Old Style C */ 
+-
+-
+-struct desargs {
+-	u_char des_key[8];
+-	des_dir des_dir;
+-	des_mode des_mode;
+-	u_char des_ivec[8];
+-	struct {
+-		u_int desbuf_len;
+-		char *desbuf_val;
+-	} desbuf;
+-};
+-typedef struct desargs desargs;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_desargs(XDR *, desargs*);
+-#elif __STDC__ 
+-extern  bool_t xdr_desargs(XDR *, desargs*);
+-#else /* Old Style C */ 
+-bool_t xdr_desargs();
+-#endif /* Old Style C */ 
+-
+-
+-struct desresp {
+-	struct {
+-		u_int desbuf_len;
+-		char *desbuf_val;
+-	} desbuf;
+-	u_char des_ivec[8];
+-	int stat;
+-};
+-typedef struct desresp desresp;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_desresp(XDR *, desresp*);
+-#elif __STDC__ 
+-extern  bool_t xdr_desresp(XDR *, desresp*);
+-#else /* Old Style C */ 
+-bool_t xdr_desresp();
+-#endif /* Old Style C */ 
+-
+-
+-#define CRYPT_PROG ((u_int32_t)600100029)
+-#define CRYPT_VERS ((u_int32_t)1)
+-
+-#ifdef __cplusplus
+-#define DES_CRYPT ((u_int32_t)1)
+-extern "C" desresp * des_crypt_1(desargs *, CLIENT *);
+-extern "C" desresp * des_crypt_1_svc(desargs *, struct svc_req *);
+-
+-#elif __STDC__
+-#define DES_CRYPT ((u_int32_t)1)
+-extern  desresp * des_crypt_1(desargs *, CLIENT *);
+-extern  desresp * des_crypt_1_svc(desargs *, struct svc_req *);
+-
+-#else /* Old Style C */ 
+-#define DES_CRYPT ((u_int32_t)1)
+-extern  desresp * des_crypt_1();
+-extern  desresp * des_crypt_1_svc();
+-#endif /* Old Style C */ 
+-
+-#endif /* !_CRYPT_H_RPCGEN */
+-- 
+1.7.9.5
+
diff --git a/package/libtirpc/libtirpc-0010-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/package/libtirpc/libtirpc-0010-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
new file mode 100644
index 0000000000..360a27f833
--- /dev/null
+++ b/package/libtirpc/libtirpc-0010-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
@@ -0,0 +1,1649 @@
+From 52aecb645b2e45d120a941f42fdbe193e22c27e1 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 17:45:03 +0100
+Subject: [PATCH] Add more XDR files needed to build rpcbind on top of
+ libtirpc
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am             |    6 +
+ tirpc/rpcsvc/mount.x    |  257 ++++++++++
+ tirpc/rpcsvc/nfs_prot.x | 1266 +++++++++++++++++++++++++++++++++++++++++++++++
+ tirpc/rpcsvc/rquota.x   |   67 +++
+ 4 files changed, 1596 insertions(+)
+ create mode 100644 tirpc/rpcsvc/mount.x
+ create mode 100644 tirpc/rpcsvc/nfs_prot.x
+ create mode 100644 tirpc/rpcsvc/rquota.x
+
+diff --git a/Makefile.am b/Makefile.am
+index 7e63f78..351c5df 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,10 +3,16 @@ ACLOCAL_AMFLAGS = -I m4
+ 
+ GENFILES = \
+ 			 tirpc/rpcsvc/crypt.h \
++			 tirpc/rpcsvc/mount.h \
++			 tirpc/rpcsvc/nfs_prot.h \
++			 tirpc/rpcsvc/rquota.h \
+ 			 tirpc/rpc/rpcb_prot.h
+ 
+ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpcsvc/crypt.x \
++			 tirpc/rpcsvc/mount.x \
++			 tirpc/rpcsvc/nfs_prot.x \
++			 tirpc/rpcsvc/rquota.x \
+ 			 tirpc/rpc/xdr.h \
+ 			 tirpc/rpc/types.h \
+ 			 tirpc/rpc/svc_soc.h \
+diff --git a/tirpc/rpcsvc/mount.x b/tirpc/rpcsvc/mount.x
+new file mode 100644
+index 0000000..f68a06f
+--- /dev/null
++++ b/tirpc/rpcsvc/mount.x
+@@ -0,0 +1,257 @@
++/*
++ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
++ * unrestricted use provided that this legend is included on all tape
++ * media and as a part of the software program in whole or part.  Users
++ * may copy or modify Sun RPC without charge, but are not authorized
++ * to license or distribute it to anyone else except as part of a product or
++ * program developed by the user.
++ * 
++ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
++ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
++ * 
++ * Sun RPC is provided with no support and without any obligation on the
++ * part of Sun Microsystems, Inc. to assist in its use, correction,
++ * modification or enhancement.
++ * 
++ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
++ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
++ * OR ANY PART THEREOF.
++ * 
++ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
++ * or profits or other special, indirect and consequential damages, even if
++ * Sun has been advised of the possibility of such damages.
++ * 
++ * Sun Microsystems, Inc.
++ * 2550 Garcia Avenue
++ * Mountain View, California  94043
++ */
++
++/*
++ * Protocol description for the mount program
++ */
++
++#ifndef RPC_HDR
++%#ifndef lint
++%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
++%/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
++%static const char rcsid[] =
++%  "$FreeBSD: src/include/rpcsvc/mount.x,v 1.6 1999/08/27 23:45:08 peter Exp $";
++%#endif /* not lint */
++#endif
++
++const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
++const MNTNAMLEN = 255;		/* maximum bytes in a name argument */
++const FHSIZE = 32;		/* size in bytes of a file handle */
++#ifdef WANT_NFS3
++const FHSIZE3 = 64;		/* size in bytes of a file handle (v3) */
++#endif
++
++/*
++ * The fhandle is the file handle that the server passes to the client.
++ * All file operations are done using the file handles to refer to a file
++ * or a directory. The file handle can contain whatever information the
++ * server needs to distinguish an individual file.
++ */
++typedef opaque fhandle[FHSIZE];	
++#ifdef WANT_NFS3
++typedef opaque fhandle3<FHSIZE3>;
++#endif
++
++/*
++ * If a status of zero is returned, the call completed successfully, and 
++ * a file handle for the directory follows. A non-zero status indicates
++ * some sort of error. The status corresponds with UNIX error numbers.
++ */
++union fhstatus switch (unsigned fhs_status) {
++case 0:
++	fhandle fhs_fhandle;
++default:
++	void;
++};
++
++#ifdef WANT_NFS3
++/*
++ * Status codes returned by the version 3 mount call.
++ */
++enum mountstat3 {
++	MNT3_OK = 0,                 /* no error */
++	MNT3ERR_PERM = 1,            /* Not owner */
++	MNT3ERR_NOENT = 2,           /* No such file or directory */
++	MNT3ERR_IO = 5,              /* I/O error */
++	MNT3ERR_ACCES = 13,          /* Permission denied */
++	MNT3ERR_NOTDIR = 20,         /* Not a directory */
++	MNT3ERR_INVAL = 22,          /* Invalid argument */
++	MNT3ERR_NAMETOOLONG = 63,    /* Filename too long */
++	MNT3ERR_NOTSUPP = 10004,     /* Operation not supported */
++	MNT3ERR_SERVERFAULT = 10006  /* A failure on the server */
++};
++
++struct mountres3_ok {
++	fhandle3	fhandle;
++	int		auth_flavors<>;
++};
++
++union mountres3 switch (mountstat3 fhs_status) {
++case 0:
++	mountres3_ok	mountinfo;
++default:
++	void;
++};
++#endif
++
++/*
++ * The type dirpath is the pathname of a directory
++ */
++typedef string dirpath<MNTPATHLEN>;
++
++/*
++ * The type name is used for arbitrary names (hostnames, groupnames)
++ */
++typedef string name<MNTNAMLEN>;
++
++/*
++ * A list of who has what mounted
++ */
++typedef struct mountbody *mountlist;
++struct mountbody {
++	name ml_hostname;
++	dirpath ml_directory;
++	mountlist ml_next;
++};
++
++/*
++ * A list of netgroups
++ */
++typedef struct groupnode *groups;
++struct groupnode {
++	name gr_name;
++	groups gr_next;
++};
++
++/*
++ * A list of what is exported and to whom
++ */
++typedef struct exportnode *exports;
++struct exportnode {
++	dirpath ex_dir;
++	groups ex_groups;
++	exports ex_next;
++};
++
++program MOUNTPROG {
++	/*
++	 * Version one of the mount protocol communicates with version two
++	 * of the NFS protocol. Version three communicates with
++	 * version three of the NFS protocol. The only connecting
++	 * point is the fhandle structure, which is the same for both
++	 * protocols.
++	 */
++	version MOUNTVERS {
++		/*
++		 * Does no work. It is made available in all RPC services
++		 * to allow server reponse testing and timing
++		 */
++		void
++		MOUNTPROC_NULL(void) = 0;
++
++		/*	
++		 * If fhs_status is 0, then fhs_fhandle contains the
++	 	 * file handle for the directory. This file handle may
++		 * be used in the NFS protocol. This procedure also adds
++		 * a new entry to the mount list for this client mounting
++		 * the directory.
++		 * Unix authentication required.
++		 */
++		fhstatus 
++		MOUNTPROC_MNT(dirpath) = 1;
++
++		/*
++		 * Returns the list of remotely mounted filesystems. The 
++		 * mountlist contains one entry for each hostname and 
++		 * directory pair.
++		 */
++		mountlist
++		MOUNTPROC_DUMP(void) = 2;
++
++		/*
++		 * Removes the mount list entry for the directory
++		 * Unix authentication required.
++		 */
++		void
++		MOUNTPROC_UMNT(dirpath) = 3;
++
++		/*
++		 * Removes all of the mount list entries for this client
++		 * Unix authentication required.
++		 */
++		void
++		MOUNTPROC_UMNTALL(void) = 4;
++
++		/*
++		 * Returns a list of all the exported filesystems, and which
++		 * machines are allowed to import it.
++		 */
++		exports
++		MOUNTPROC_EXPORT(void)  = 5;
++
++		/*
++		 * Identical to MOUNTPROC_EXPORT above
++		 */
++		exports
++		MOUNTPROC_EXPORTALL(void) = 6;
++	} = 1;
++#ifdef WANT_NFS3
++	version MOUNTVERS3 {
++		/*
++		 * Does no work. It is made available in all RPC services
++		 * to allow server reponse testing and timing
++		 */
++		void
++		MOUNTPROC_NULL(void) = 0;
++
++		/*
++		 * If mountres3.fhs_status is MNT3_OK, then
++		 * mountres3.mountinfo contains the file handle for
++		 * the directory and a list of acceptable
++		 * authentication flavors.  This file handle may only
++		 * be used in the NFS version 3 protocol.  This
++		 * procedure also results in the server adding a new
++		 * entry to its mount list recording that this client
++		 * has mounted the directory. AUTH_UNIX authentication
++		 * or better is required.
++		 */
++		mountres3
++		MOUNTPROC_MNT(dirpath) = 1;
++
++		/*
++		 * Returns the list of remotely mounted filesystems. The 
++		 * mountlist contains one entry for each hostname and 
++		 * directory pair.
++		 */
++		mountlist
++		MOUNTPROC_DUMP(void) = 2;
++
++		/*
++		 * Removes the mount list entry for the directory
++		 * Unix authentication required.
++		 */
++		void
++		MOUNTPROC_UMNT(dirpath) = 3;
++
++		/*
++		 * Removes all of the mount list entries for this client
++		 * Unix authentication required.
++		 */
++		void
++		MOUNTPROC_UMNTALL(void) = 4;
++
++		/*
++		 * Returns a list of all the exported filesystems, and which
++		 * machines are allowed to import it.
++		 */
++		exports
++		MOUNTPROC_EXPORT(void)  = 5;
++	} = 3;
++#endif
++} = 100005;
+diff --git a/tirpc/rpcsvc/nfs_prot.x b/tirpc/rpcsvc/nfs_prot.x
+new file mode 100644
+index 0000000..01564f8
+--- /dev/null
++++ b/tirpc/rpcsvc/nfs_prot.x
+@@ -0,0 +1,1266 @@
++/*
++ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
++ * unrestricted use provided that this legend is included on all tape
++ * media and as a part of the software program in whole or part.  Users
++ * may copy or modify Sun RPC without charge, but are not authorized
++ * to license or distribute it to anyone else except as part of a product or
++ * program developed by the user.
++ * 
++ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
++ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
++ * 
++ * Sun RPC is provided with no support and without any obligation on the
++ * part of Sun Microsystems, Inc. to assist in its use, correction,
++ * modification or enhancement.
++ * 
++ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
++ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
++ * OR ANY PART THEREOF.
++ * 
++ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
++ * or profits or other special, indirect and consequential damages, even if
++ * Sun has been advised of the possibility of such damages.
++ * 
++ * Sun Microsystems, Inc.
++ * 2550 Garcia Avenue
++ * Mountain View, California  94043
++ */
++
++#ifndef RPC_HDR
++%#ifndef lint
++%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
++%/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
++%static const char rcsid[] =
++%  "$FreeBSD: src/include/rpcsvc/nfs_prot.x,v 1.7 1999/08/27 23:45:08 peter Exp $";
++%#endif /* not lint */
++#endif
++
++const NFS_PORT          = 2049;
++const NFS_MAXDATA       = 8192;
++const NFS_MAXPATHLEN    = 1024;
++const NFS_MAXNAMLEN	= 255;
++const NFS_FHSIZE	= 32;
++const NFS_COOKIESIZE	= 4;
++const NFS_FIFO_DEV	= -1;	/* size kludge for named pipes */
++
++/*
++ * File types
++ */
++const NFSMODE_FMT  = 0170000;	/* type of file */
++const NFSMODE_DIR  = 0040000;	/* directory */
++const NFSMODE_CHR  = 0020000;	/* character special */
++const NFSMODE_BLK  = 0060000;	/* block special */
++const NFSMODE_REG  = 0100000;	/* regular */
++const NFSMODE_LNK  = 0120000;	/* symbolic link */
++const NFSMODE_SOCK = 0140000;	/* socket */
++const NFSMODE_FIFO = 0010000;	/* fifo */
++
++/*
++ * Error status
++ */
++enum nfsstat {
++	NFS_OK= 0,		/* no error */
++	NFSERR_PERM=1,		/* Not owner */
++	NFSERR_NOENT=2,		/* No such file or directory */
++	NFSERR_IO=5,		/* I/O error */
++	NFSERR_NXIO=6,		/* No such device or address */
++	NFSERR_ACCES=13,	/* Permission denied */
++	NFSERR_EXIST=17,	/* File exists */
++	NFSERR_NODEV=19,	/* No such device */
++	NFSERR_NOTDIR=20,	/* Not a directory*/
++	NFSERR_ISDIR=21,	/* Is a directory */
++	NFSERR_FBIG=27,		/* File too large */
++	NFSERR_NOSPC=28,	/* No space left on device */
++	NFSERR_ROFS=30,		/* Read-only file system */
++	NFSERR_NAMETOOLONG=63,	/* File name too long */
++	NFSERR_NOTEMPTY=66,	/* Directory not empty */
++	NFSERR_DQUOT=69,	/* Disc quota exceeded */
++	NFSERR_STALE=70,	/* Stale NFS file handle */
++	NFSERR_WFLUSH=99	/* write cache flushed */
++};
++
++/*
++ * File types
++ */
++enum ftype {
++	NFNON = 0,	/* non-file */
++	NFREG = 1,	/* regular file */
++	NFDIR = 2,	/* directory */
++	NFBLK = 3,	/* block special */
++	NFCHR = 4,	/* character special */
++	NFLNK = 5,	/* symbolic link */
++	NFSOCK = 6,	/* unix domain sockets */
++	NFBAD = 7,	/* unused */
++	NFFIFO = 8 	/* named pipe */
++};
++
++/*
++ * File access handle
++ */
++struct nfs_fh {
++	opaque data[NFS_FHSIZE];
++};
++
++/* 
++ * Timeval
++ */
++struct nfstime {
++	unsigned seconds;
++	unsigned useconds;
++};
++
++
++/*
++ * File attributes
++ */
++struct fattr {
++	ftype type;		/* file type */
++	unsigned mode;		/* protection mode bits */
++	unsigned nlink;		/* # hard links */
++	unsigned uid;		/* owner user id */
++	unsigned gid;		/* owner group id */
++	unsigned size;		/* file size in bytes */
++	unsigned blocksize;	/* prefered block size */
++	unsigned rdev;		/* special device # */
++	unsigned blocks;	/* Kb of disk used by file */
++	unsigned fsid;		/* device # */
++	unsigned fileid;	/* inode # */
++	nfstime	atime;		/* time of last access */
++	nfstime	mtime;		/* time of last modification */
++	nfstime	ctime;		/* time of last change */
++};
++
++/*
++ * File attributes which can be set
++ */
++struct sattr {
++	unsigned mode;	/* protection mode bits */
++	unsigned uid;	/* owner user id */
++	unsigned gid;	/* owner group id */
++	unsigned size;	/* file size in bytes */
++	nfstime	atime;	/* time of last access */
++	nfstime	mtime;	/* time of last modification */
++};
++
++
++typedef string filename<NFS_MAXNAMLEN>; 
++typedef string nfspath<NFS_MAXPATHLEN>;
++
++/*
++ * Reply status with file attributes
++ */
++union attrstat switch (nfsstat status) {
++case NFS_OK:
++	fattr attributes;
++default:
++	void;
++};
++
++struct sattrargs {
++	nfs_fh file;
++	sattr attributes;
++};
++
++/*
++ * Arguments for directory operations
++ */
++struct diropargs {
++	nfs_fh	dir;	/* directory file handle */
++	filename name;		/* name (up to NFS_MAXNAMLEN bytes) */
++};
++
++struct diropokres {
++	nfs_fh file;
++	fattr attributes;
++};
++
++/*
++ * Results from directory operation
++ */
++union diropres switch (nfsstat status) {
++case NFS_OK:
++	diropokres diropres;
++default:
++	void;
++};
++
++union readlinkres switch (nfsstat status) {
++case NFS_OK:
++	nfspath data;
++default:
++	void;
++};
++
++/*
++ * Arguments to remote read
++ */
++struct readargs {
++	nfs_fh file;		/* handle for file */
++	unsigned offset;	/* byte offset in file */
++	unsigned count;		/* immediate read count */
++	unsigned totalcount;	/* total read count (from this offset)*/
++};
++
++/*
++ * Status OK portion of remote read reply
++ */
++struct readokres {
++	fattr	attributes;	/* attributes, need for pagin*/
++	opaque data<NFS_MAXDATA>;
++};
++
++union readres switch (nfsstat status) {
++case NFS_OK:
++	readokres reply;
++default:
++	void;
++};
++
++/*
++ * Arguments to remote write 
++ */
++struct writeargs {
++	nfs_fh	file;		/* handle for file */
++	unsigned beginoffset;	/* beginning byte offset in file */
++	unsigned offset;	/* current byte offset in file */
++	unsigned totalcount;	/* total write count (to this offset)*/
++	opaque data<NFS_MAXDATA>;
++};
++
++struct createargs {
++	diropargs where;
++	sattr attributes;
++};
++
++struct renameargs {
++	diropargs from;
++	diropargs to;
++};
++
++struct linkargs {
++	nfs_fh from;
++	diropargs to;
++};
++
++struct symlinkargs {
++	diropargs from;
++	nfspath to;
++	sattr attributes;
++};
++
++
++typedef opaque nfscookie[NFS_COOKIESIZE];
++
++/*
++ * Arguments to readdir
++ */
++struct readdirargs {
++	nfs_fh dir;		/* directory handle */
++	nfscookie cookie;
++	unsigned count;		/* number of directory bytes to read */
++};
++
++struct entry {
++	unsigned fileid;
++	filename name;
++	nfscookie cookie;
++	entry *nextentry;
++};
++
++struct dirlist {
++	entry *entries;
++	bool eof;
++};
++
++union readdirres switch (nfsstat status) {
++case NFS_OK:
++	dirlist reply;
++default:
++	void;
++};
++
++struct statfsokres {
++	unsigned tsize;	/* preferred transfer size in bytes */
++	unsigned bsize;	/* fundamental file system block size */
++	unsigned blocks;	/* total blocks in file system */
++	unsigned bfree;	/* free blocks in fs */
++	unsigned bavail;	/* free blocks avail to non-superuser */
++};
++
++union statfsres switch (nfsstat status) {
++case NFS_OK:
++	statfsokres reply;
++default:
++	void;
++};
++
++#ifdef WANT_NFS3
++
++/*
++ * NFSv3 constants and types
++ */
++const NFS3_FHSIZE	= 64;	/* maximum size in bytes of a file handle */
++const NFS3_COOKIEVERFSIZE = 8;	/* size of a cookie verifier for READDIR */
++const NFS3_CREATEVERFSIZE = 8;	/* size of the verifier used for CREATE */
++const NFS3_WRITEVERFSIZE = 8;	/* size of the verifier used for WRITE */
++
++typedef unsigned hyper uint64;
++typedef hyper int64;
++typedef unsigned long uint32;
++typedef long int32;
++typedef string filename3<>;
++typedef string nfspath3<>;
++typedef uint64 fileid3;
++typedef uint64 cookie3;
++typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE];
++typedef opaque createverf3[NFS3_CREATEVERFSIZE];
++typedef opaque writeverf3[NFS3_WRITEVERFSIZE];
++typedef uint32 uid3;
++typedef uint32 gid3;
++typedef uint64 size3;
++typedef uint64 offset3;
++typedef uint32 mode3;
++typedef uint32 count3;
++
++/*
++ * Error status (v3)
++ */
++enum nfsstat3 {
++	NFS3_OK	= 0,
++	NFS3ERR_PERM		= 1,
++	NFS3ERR_NOENT		= 2,
++	NFS3ERR_IO		= 5,
++	NFS3ERR_NXIO		= 6,
++	NFS3ERR_ACCES		= 13,
++	NFS3ERR_EXIST		= 17,
++	NFS3ERR_XDEV		= 18,
++	NFS3ERR_NODEV		= 19,
++	NFS3ERR_NOTDIR		= 20,
++	NFS3ERR_ISDIR		= 21,
++	NFS3ERR_INVAL		= 22,
++	NFS3ERR_FBIG		= 27,
++	NFS3ERR_NOSPC		= 28,
++	NFS3ERR_ROFS		= 30,
++	NFS3ERR_MLINK		= 31,
++	NFS3ERR_NAMETOOLONG	= 63,
++	NFS3ERR_NOTEMPTY	= 66,
++	NFS3ERR_DQUOT		= 69,
++	NFS3ERR_STALE		= 70,
++	NFS3ERR_REMOTE		= 71,
++	NFS3ERR_BADHANDLE	= 10001,
++	NFS3ERR_NOT_SYNC	= 10002,
++	NFS3ERR_BAD_COOKIE	= 10003,
++	NFS3ERR_NOTSUPP		= 10004,
++	NFS3ERR_TOOSMALL	= 10005,
++	NFS3ERR_SERVERFAULT	= 10006,
++	NFS3ERR_BADTYPE		= 10007,
++	NFS3ERR_JUKEBOX		= 10008
++};
++
++/*
++ * File types (v3)
++ */
++enum ftype3 {
++	NF3REG	= 1,		/* regular file */
++	NF3DIR	= 2,		/* directory */
++	NF3BLK	= 3,		/* block special */
++	NF3CHR	= 4,		/* character special */
++	NF3LNK	= 5,		/* symbolic link */
++	NF3SOCK	= 6,		/* unix domain sockets */
++	NF3FIFO	= 7		/* named pipe */
++};
++
++struct specdata3 {
++	uint32	specdata1;
++	uint32	specdata2;
++};
++
++/*
++ * File access handle (v3)
++ */
++struct nfs_fh3 {
++	opaque data<NFS3_FHSIZE>;
++};
++
++/* 
++ * Timeval (v3)
++ */
++struct nfstime3 {
++	uint32	seconds;
++	uint32	nseconds;
++};
++
++
++/*
++ * File attributes (v3)
++ */
++struct fattr3 {
++	ftype3	type;		/* file type */
++	mode3	mode;		/* protection mode bits */
++	uint32	nlink;		/* # hard links */
++	uid3	uid;		/* owner user id */
++	gid3	gid;		/* owner group id */
++	size3	size;		/* file size in bytes */
++	size3	used;		/* prefered block size */
++	specdata3 rdev;		/* special device # */
++	uint64 fsid;		/* device # */
++	fileid3	fileid;		/* inode # */
++	nfstime3 atime;		/* time of last access */
++	nfstime3 mtime;		/* time of last modification */
++	nfstime3 ctime;		/* time of last change */
++};
++
++union post_op_attr switch (bool attributes_follow) {
++case TRUE:
++	fattr3	attributes;
++case FALSE:
++	void;
++};
++
++struct wcc_attr {
++	size3	size;
++	nfstime3 mtime;
++	nfstime3 ctime;
++};
++
++union pre_op_attr switch (bool attributes_follow) {
++case TRUE:
++	wcc_attr attributes;
++case FALSE:
++	void;
++};
++
++struct wcc_data {
++	pre_op_attr before;
++	post_op_attr after;
++};
++
++union post_op_fh3 switch (bool handle_follows) {
++case TRUE:
++	nfs_fh3	handle;
++case FALSE:
++	void;
++};
++
++/*
++ * File attributes which can be set (v3)
++ */
++enum time_how {
++	DONT_CHANGE		= 0,
++	SET_TO_SERVER_TIME	= 1,
++	SET_TO_CLIENT_TIME	= 2
++};
++
++union set_mode3 switch (bool set_it) {
++case TRUE:
++	mode3	mode;
++default:
++	void;
++};
++
++union set_uid3 switch (bool set_it) {
++case TRUE:
++	uid3	uid;
++default:
++	void;
++};
++
++union set_gid3 switch (bool set_it) {
++case TRUE:
++	gid3	gid;
++default:
++	void;
++};
++
++union set_size3 switch (bool set_it) {
++case TRUE:
++	size3	size;
++default:
++	void;
++};
++
++union set_atime switch (time_how set_it) {
++case SET_TO_CLIENT_TIME:
++	nfstime3	atime;
++default:
++	void;
++};
++
++union set_mtime switch (time_how set_it) {
++case SET_TO_CLIENT_TIME:
++	nfstime3	mtime;
++default:
++	void;
++};
++
++struct sattr3 {
++	set_mode3	mode;
++	set_uid3	uid;
++	set_gid3	gid;
++	set_size3	size;
++	set_atime	atime;
++	set_mtime	mtime;
++};
++
++/*
++ * Arguments for directory operations (v3)
++ */
++struct diropargs3 {
++	nfs_fh3	dir;		/* directory file handle */
++	filename3 name;		/* name (up to NFS_MAXNAMLEN bytes) */
++};
++
++/*
++ * Arguments to getattr (v3).
++ */
++struct GETATTR3args {
++	nfs_fh3		object;
++};
++
++struct GETATTR3resok {
++	fattr3		obj_attributes;
++};
++
++union GETATTR3res switch (nfsstat3 status) {
++case NFS3_OK:
++	GETATTR3resok	resok;
++default:
++	void;
++};
++
++/*
++ * Arguments to setattr (v3).
++ */
++union sattrguard3 switch (bool check) {
++case TRUE:
++	nfstime3	obj_ctime;
++case FALSE:
++	void;
++};
++
++struct SETATTR3args {
++	nfs_fh3		object;
++	sattr3		new_attributes;
++	sattrguard3	guard;
++};
++
++struct SETATTR3resok {
++	wcc_data	obj_wcc;
++};
++
++struct SETATTR3resfail {
++	wcc_data	obj_wcc;
++};
++
++union SETATTR3res switch (nfsstat3 status) {
++case NFS3_OK:
++	SETATTR3resok	resok;
++default:
++	SETATTR3resfail	resfail;
++};
++
++/*
++ * Arguments to lookup (v3).
++ */
++struct LOOKUP3args {
++	diropargs3	what;
++};
++
++struct LOOKUP3resok {
++	nfs_fh3		object;
++	post_op_attr	obj_attributes;
++	post_op_attr	dir_attributes;
++};
++
++struct LOOKUP3resfail {
++	post_op_attr	dir_attributes;
++};
++
++union LOOKUP3res switch (nfsstat3 status) {
++case NFS3_OK:
++	LOOKUP3resok	resok;
++default:
++	LOOKUP3resfail	resfail;
++};
++
++/*
++ * Arguments to access (v3).
++ */
++const ACCESS3_READ	= 0x0001;
++const ACCESS3_LOOKUP	= 0x0002;
++const ACCESS3_MODIFY	= 0x0004;
++const ACCESS3_EXTEND	= 0x0008;
++const ACCESS3_DELETE	= 0x0010;
++const ACCESS3_EXECUTE	= 0x0020;
++
++struct ACCESS3args {
++	nfs_fh3		object;
++	uint32		access;
++};
++
++struct ACCESS3resok {
++	post_op_attr	obj_attributes;
++	uint32		access;
++};
++
++struct ACCESS3resfail {
++	post_op_attr	obj_attributes;
++};
++
++union ACCESS3res switch (nfsstat3 status) {
++case NFS3_OK:
++	ACCESS3resok	resok;
++default:
++	ACCESS3resfail	resfail;
++};
++
++/*
++ * Arguments to readlink (v3).
++ */
++struct READLINK3args {
++	nfs_fh3		symlink;
++};
++
++struct READLINK3resok {
++	post_op_attr	symlink_attributes;
++	nfspath3	data;
++};
++
++struct READLINK3resfail {
++	post_op_attr	symlink_attributes;
++};
++
++union READLINK3res switch (nfsstat3 status) {
++case NFS3_OK:
++	READLINK3resok	resok;
++default:
++	READLINK3resfail resfail;
++};
++
++/*
++ * Arguments to read (v3).
++ */
++struct READ3args {
++	nfs_fh3		file;
++	offset3		offset;
++	count3		count;
++};
++
++struct READ3resok {
++	post_op_attr	file_attributes;
++	count3		count;
++	bool		eof;
++	opaque		data<>;
++};
++
++struct READ3resfail {
++	post_op_attr	file_attributes;
++};
++
++/* XXX: solaris 2.6 uses ``nfsstat'' here */
++union READ3res switch (nfsstat3 status) {
++case NFS3_OK:
++	READ3resok	resok;
++default:
++	READ3resfail	resfail;
++};
++
++/*
++ * Arguments to write (v3).
++ */
++enum stable_how {
++	UNSTABLE	= 0,
++	DATA_SYNC	= 1,
++	FILE_SYNC	= 2
++};
++
++struct WRITE3args {
++	nfs_fh3		file;
++	offset3		offset;
++	count3		count;
++	stable_how	stable;
++	opaque		data<>;
++};
++
++struct WRITE3resok {
++	wcc_data	file_wcc;
++	count3		count;
++	stable_how	committed;
++	writeverf3	verf;
++};
++
++struct WRITE3resfail {
++	wcc_data	file_wcc;
++};
++
++union WRITE3res switch (nfsstat3 status) {
++case NFS3_OK:
++	WRITE3resok	resok;
++default:
++	WRITE3resfail	resfail;
++};
++
++/*
++ * Arguments to create (v3).
++ */
++enum createmode3 {
++	UNCHECKED	= 0,
++	GUARDED		= 1,
++	EXCLUSIVE	= 2
++};
++
++union createhow3 switch (createmode3 mode) {
++case UNCHECKED:
++case GUARDED:
++	sattr3		obj_attributes;
++case EXCLUSIVE:
++	createverf3	verf;
++};
++
++struct CREATE3args {
++	diropargs3	where;
++	createhow3	how;
++};
++
++struct CREATE3resok {
++	post_op_fh3	obj;
++	post_op_attr	obj_attributes;
++	wcc_data	dir_wcc;
++};
++
++struct CREATE3resfail {
++	wcc_data	dir_wcc;
++};
++
++union CREATE3res switch (nfsstat3 status) {
++case NFS3_OK:
++	CREATE3resok	resok;
++default:
++	CREATE3resfail	resfail;
++};
++
++/*
++ * Arguments to mkdir (v3).
++ */
++struct MKDIR3args {
++	diropargs3	where;
++	sattr3		attributes;
++};
++
++struct MKDIR3resok {
++	post_op_fh3	obj;
++	post_op_attr	obj_attributes;
++	wcc_data	dir_wcc;
++};
++
++struct MKDIR3resfail {
++	wcc_data	dir_wcc;
++};
++
++union MKDIR3res switch (nfsstat3 status) {
++case NFS3_OK:
++	MKDIR3resok	resok;
++default:
++	MKDIR3resfail	resfail;
++};
++
++/*
++ * Arguments to symlink (v3).
++ */
++struct symlinkdata3 {
++	sattr3		symlink_attributes;
++	nfspath3	symlink_data;
++};
++
++struct SYMLINK3args {
++	diropargs3	where;
++	symlinkdata3	symlink;
++};
++
++struct SYMLINK3resok {
++	post_op_fh3	obj;
++	post_op_attr	obj_attributes;
++	wcc_data	dir_wcc;
++};
++
++struct SYMLINK3resfail {
++	wcc_data	dir_wcc;
++};
++
++union SYMLINK3res switch (nfsstat3 status) {
++case NFS3_OK:
++	SYMLINK3resok	resok;
++default:
++	SYMLINK3resfail	resfail;
++};
++
++/*
++ * Arguments to mknod (v3).
++ */
++struct devicedata3 {
++	sattr3		dev_attributes;
++	specdata3	spec;
++};
++
++union mknoddata3 switch (ftype3 type) {
++case NF3CHR:
++case NF3BLK:
++	devicedata3	device;
++case NF3SOCK:
++case NF3FIFO:
++	sattr3		pipe_attributes;
++default:
++	void;
++};
++
++struct MKNOD3args {
++	diropargs3	where;
++	mknoddata3	what;
++};
++
++struct MKNOD3resok {
++	post_op_fh3	obj;
++	post_op_attr	obj_attributes;
++	wcc_data	dir_wcc;
++};
++
++struct MKNOD3resfail {
++	wcc_data	dir_wcc;
++};
++
++union MKNOD3res switch (nfsstat3 status) {
++case NFS3_OK:
++	MKNOD3resok	resok;
++default:
++	MKNOD3resfail	resfail;
++};
++
++/*
++ * Arguments to remove (v3).
++ */
++struct REMOVE3args {
++	diropargs3	object;
++};
++
++struct REMOVE3resok {
++	wcc_data	dir_wcc;
++};
++
++struct REMOVE3resfail {
++	wcc_data	dir_wcc;
++};
++
++union REMOVE3res switch (nfsstat3 status) {
++case NFS3_OK:
++	REMOVE3resok	resok;
++default:
++	REMOVE3resfail	resfail;
++};
++
++/*
++ * Arguments to rmdir (v3).
++ */
++struct RMDIR3args {
++	diropargs3	object;
++};
++
++struct RMDIR3resok {
++	wcc_data	dir_wcc;
++};
++
++struct RMDIR3resfail {
++	wcc_data	dir_wcc;
++};
++
++union RMDIR3res switch (nfsstat3 status) {
++case NFS3_OK:
++	RMDIR3resok	resok;
++default:
++	RMDIR3resfail	resfail;
++};
++
++/*
++ * Arguments to rename (v3).
++ */
++struct RENAME3args {
++	diropargs3	from;
++	diropargs3	to;
++};
++
++struct RENAME3resok {
++	wcc_data	fromdir_wcc;
++	wcc_data	todir_wcc;
++};
++
++struct RENAME3resfail {
++	wcc_data	fromdir_wcc;
++	wcc_data	todir_wcc;
++};
++
++union RENAME3res switch (nfsstat3 status) {
++case NFS3_OK:
++	RENAME3resok	resok;
++default:
++	RENAME3resfail	resfail;
++};
++
++/*
++ * Arguments to link (v3).
++ */
++struct LINK3args {
++	nfs_fh3		file;
++	diropargs3	link;
++};
++
++struct LINK3resok {
++	post_op_attr	file_attributes;
++	wcc_data	linkdir_wcc;
++};
++
++struct LINK3resfail {
++	post_op_attr	file_attributes;
++	wcc_data	linkdir_wcc;
++};
++
++union LINK3res switch (nfsstat3 status) {
++case NFS3_OK:
++	LINK3resok	resok;
++default:
++	LINK3resfail	resfail;
++};
++
++/*
++ * Arguments to readdir (v3).
++ */
++struct READDIR3args {
++	nfs_fh3		dir;
++	cookie3		cookie;
++	cookieverf3	cookieverf;
++	count3		count;
++};
++
++struct entry3 {
++	fileid3		fileid;
++	filename3	name;
++	cookie3		cookie;
++	entry3		*nextentry;
++};
++
++struct dirlist3 {
++	entry3		*entries;
++	bool		eof;
++};
++
++struct READDIR3resok {
++	post_op_attr	dir_attributes;
++	cookieverf3	cookieverf;
++	dirlist3	reply;
++};
++
++struct READDIR3resfail {
++	post_op_attr	dir_attributes;
++};
++
++union READDIR3res switch (nfsstat3 status) {
++case NFS3_OK:
++	READDIR3resok	resok;
++default:
++	READDIR3resfail	resfail;
++};
++
++/*
++ * Arguments to readdirplus (v3).
++ */
++struct READDIRPLUS3args {
++	nfs_fh3		dir;
++	cookie3		cookie;
++	cookieverf3	cookieverf;
++	count3		dircount;
++	count3		maxcount;
++};
++
++struct entryplus3 {
++	fileid3		fileid;
++	filename3	name;
++	cookie3		cookie;
++	post_op_attr	name_attributes;
++	post_op_fh3	name_handle;
++	entryplus3	*nextentry;
++};
++
++struct dirlistplus3 {
++	entryplus3	*entries;
++	bool		eof;
++};
++
++struct READDIRPLUS3resok {
++	post_op_attr	dir_attributes;
++	cookieverf3	cookieverf;
++	dirlistplus3	reply;
++};
++
++struct READDIRPLUS3resfail {
++	post_op_attr	dir_attributes;
++};
++
++union READDIRPLUS3res switch (nfsstat3 status) {
++case NFS3_OK:
++	READDIRPLUS3resok	resok;
++default:
++	READDIRPLUS3resfail	resfail;
++};
++
++/*
++ * Arguments to fsstat (v3).
++ */
++struct FSSTAT3args {
++	nfs_fh3		fsroot;
++};
++
++struct FSSTAT3resok {
++	post_op_attr	obj_attributes;
++	size3		tbytes;
++	size3		fbytes;
++	size3		abytes;
++	size3		tfiles;
++	size3		ffiles;
++	size3		afiles;
++	uint32		invarsec;
++};
++
++struct FSSTAT3resfail {
++	post_op_attr	obj_attributes;
++};
++
++union FSSTAT3res switch (nfsstat3 status) {
++case NFS3_OK:
++	FSSTAT3resok	resok;
++default:
++	FSSTAT3resfail	resfail;
++};
++
++/*
++ * Arguments to fsinfo (v3).
++ */
++const FSF3_LINK		= 0x0001;
++const FSF3_SYMLINK	= 0x0002;
++const FSF3_HOMOGENEOUS	= 0x0008;
++const FSF3_CANSETTIME	= 0x0010;
++
++struct FSINFO3args {
++	nfs_fh3		fsroot;
++};
++
++struct FSINFO3resok {
++	post_op_attr	obj_attributes;
++	uint32		rtmax;
++	uint32		rtpref;
++	uint32		rtmult;
++	uint32		wtmax;
++	uint32		wtpref;
++	uint32		wtmult;
++	uint32		dtpref;
++	size3		maxfilesize;
++	nfstime3	time_delta;
++	uint32		properties;
++};
++
++struct FSINFO3resfail {
++	post_op_attr	obj_attributes;
++};
++
++union FSINFO3res switch (nfsstat3 status) {
++case NFS3_OK:
++	FSINFO3resok	resok;
++default:
++	FSINFO3resfail	resfail;
++};
++
++/*
++ * Arguments to pathconf (v3).
++ */
++struct PATHCONF3args {
++	nfs_fh3		object;
++};
++
++struct PATHCONF3resok {
++	post_op_attr	obj_attributes;
++	uint32		linkmax;
++	uint32		name_max;
++	bool		no_trunc;
++	bool		chown_restricted;
++	bool		case_insensitive;
++	bool		case_preserving;
++};
++
++struct PATHCONF3resfail {
++	post_op_attr	obj_attributes;
++};
++
++union PATHCONF3res switch (nfsstat3 status) {
++case NFS3_OK:
++	PATHCONF3resok	resok;
++default:
++	PATHCONF3resfail	resfail;
++};
++
++/*
++ * Arguments to commit (v3).
++ */
++struct COMMIT3args {
++	nfs_fh3		file;
++	offset3		offset;
++	count3		count;
++};
++
++struct COMMIT3resok {
++	wcc_data	file_wcc;
++	writeverf3	verf;
++};
++
++struct COMMIT3resfail {
++	wcc_data	file_wcc;
++};
++
++union COMMIT3res switch (nfsstat3 status) {
++case NFS3_OK:
++	COMMIT3resok	resok;
++default:
++	COMMIT3resfail	resfail;
++};
++
++#endif /* WANT_NFS3 */
++
++/*
++ * Remote file service routines
++ */
++program NFS_PROGRAM {
++	version NFS_VERSION {
++		void 
++		NFSPROC_NULL(void) = 0;
++
++		attrstat 
++		NFSPROC_GETATTR(nfs_fh) =	1;
++
++		attrstat 
++		NFSPROC_SETATTR(sattrargs) = 2;
++
++		void 
++		NFSPROC_ROOT(void) = 3;
++
++		diropres 
++		NFSPROC_LOOKUP(diropargs) = 4;
++
++		readlinkres 
++		NFSPROC_READLINK(nfs_fh) = 5;
++
++		readres 
++		NFSPROC_READ(readargs) = 6;
++
++		void 
++		NFSPROC_WRITECACHE(void) = 7;
++
++		attrstat
++		NFSPROC_WRITE(writeargs) = 8;
++
++		diropres
++		NFSPROC_CREATE(createargs) = 9;
++
++		nfsstat
++		NFSPROC_REMOVE(diropargs) = 10;
++
++		nfsstat
++		NFSPROC_RENAME(renameargs) = 11;
++
++		nfsstat
++		NFSPROC_LINK(linkargs) = 12;
++
++		nfsstat
++		NFSPROC_SYMLINK(symlinkargs) = 13;
++
++		diropres
++		NFSPROC_MKDIR(createargs) = 14;
++
++		nfsstat
++		NFSPROC_RMDIR(diropargs) = 15;
++
++		readdirres
++		NFSPROC_READDIR(readdirargs) = 16;
++
++		statfsres
++		NFSPROC_STATFS(nfs_fh) = 17;
++	} = 2;
++} = 100003;
++#ifdef WANT_NFS3
++program NFS3_PROGRAM {
++	version NFS_V3 {
++		void
++		NFSPROC3_NULL(void)			= 0;
++
++		GETATTR3res
++		NFSPROC3_GETATTR(GETATTR3args)		= 1;
++
++		SETATTR3res
++		NFSPROC3_SETATTR(SETATTR3args)		= 2;
++
++		LOOKUP3res
++		NFSPROC3_LOOKUP(LOOKUP3args)		= 3;
++
++		ACCESS3res
++		NFSPROC3_ACCESS(ACCESS3args)		= 4;
++
++		READLINK3res
++		NFSPROC3_READLINK(READLINK3args)	= 5;
++
++		READ3res
++		NFSPROC3_READ(READ3args)		= 6;
++
++		WRITE3res
++		NFSPROC3_WRITE(WRITE3args)		= 7;
++
++		CREATE3res
++		NFSPROC3_CREATE(CREATE3args)		= 8;
++
++		MKDIR3res
++		NFSPROC3_MKDIR(MKDIR3args)		= 9;
++
++		SYMLINK3res
++		NFSPROC3_SYMLINK(SYMLINK3args)		= 10;
++
++		MKNOD3res
++		NFSPROC3_MKNOD(MKNOD3args)		= 11;
++
++		REMOVE3res
++		NFSPROC3_REMOVE(REMOVE3args)		= 12;
++
++		RMDIR3res
++		NFSPROC3_RMDIR(RMDIR3args)		= 13;
++
++		RENAME3res
++		NFSPROC3_RENAME(RENAME3args)		= 14;
++
++		LINK3res
++		NFSPROC3_LINK(LINK3args)		= 15;
++
++		READDIR3res
++		NFSPROC3_READDIR(READDIR3args)		= 16;
++
++		READDIRPLUS3res
++		NFSPROC3_READDIRPLUS(READDIRPLUS3args)	= 17;
++
++		FSSTAT3res
++		NFSPROC3_FSSTAT(FSSTAT3args)		= 18;
++
++		FSINFO3res
++		NFSPROC3_FSINFO(FSINFO3args)		= 19;
++
++		PATHCONF3res
++		NFSPROC3_PATHCONF(PATHCONF3args)	= 20;
++
++		COMMIT3res
++		NFSPROC3_COMMIT(COMMIT3args)		= 21;
++	} = 3;
++} = 100003;
++#endif
++
+diff --git a/tirpc/rpcsvc/rquota.x b/tirpc/rpcsvc/rquota.x
+new file mode 100644
+index 0000000..72864d1
+--- /dev/null
++++ b/tirpc/rpcsvc/rquota.x
+@@ -0,0 +1,67 @@
++/*
++ * Remote quota protocol
++ * Requires unix authentication
++ */
++
++#ifndef RPC_HDR
++%#ifndef lint
++%/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
++%/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
++%static const char rcsid[] =
++%  "$FreeBSD: src/include/rpcsvc/rquota.x,v 1.6 1999/08/27 23:45:10 peter Exp $";
++%#endif /* not lint */
++#endif
++
++const RQ_PATHLEN = 1024;
++
++struct getquota_args {
++	string gqa_pathp<RQ_PATHLEN>;  	/* path to filesystem of interest */
++	int gqa_uid;	        	/* inquire about quota for uid */
++};
++
++/*
++ * remote quota structure
++ */
++struct rquota {
++	int rq_bsize;			/* block size for block counts */
++	bool rq_active;  		/* indicates whether quota is active */
++	unsigned int rq_bhardlimit;	/* absolute limit on disk blks alloc */
++	unsigned int rq_bsoftlimit;	/* preferred limit on disk blks */
++	unsigned int rq_curblocks;	/* current block count */
++	unsigned int rq_fhardlimit;	/* absolute limit on allocated files */
++	unsigned int rq_fsoftlimit;	/* preferred file limit */
++	unsigned int rq_curfiles;	/* current # allocated files */
++	unsigned int rq_btimeleft;	/* time left for excessive disk use */
++	unsigned int rq_ftimeleft;	/* time left for excessive files */
++};	
++
++enum gqr_status {
++	Q_OK = 1,		/* quota returned */
++	Q_NOQUOTA = 2,  	/* noquota for uid */
++	Q_EPERM = 3		/* no permission to access quota */
++};
++
++union getquota_rslt switch (gqr_status status) {
++case Q_OK:
++	rquota gqr_rquota;	/* valid if status == Q_OK */
++case Q_NOQUOTA:
++	void;
++case Q_EPERM:
++	void;
++};
++
++program RQUOTAPROG {
++	version RQUOTAVERS {
++		/*
++		 * Get all quotas
++		 */
++		getquota_rslt
++		RQUOTAPROC_GETQUOTA(getquota_args) = 1;
++
++		/*
++	 	 * Get active quotas only
++		 */
++		getquota_rslt
++		RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2;
++	} = 1;
++} = 100011;
+-- 
+1.7.9.5
+

From c54af0a294de09ecb8699d0d9a0fca8b39247a79 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:41 +0000
Subject: [PATCH 3243/6849] libtirpc: handle the case where uClibc may have RPC
 support

When uClibc has RPC support, it is not needed to define the 'struct
rpcent' structure.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ut-RPC-support-does-not-install-rpcent.h.patch | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
index b950cb31a0..3ad25afe3b 100644
--- a/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
+++ b/package/libtirpc/libtirpc-0002-uClibc-without-RPC-support-does-not-install-rpcent.h.patch
@@ -5,19 +5,22 @@ Subject: [PATCH] uClibc without RPC support does not install rpcent.h
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- tirpc/rpc/rpcent.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ tirpc/rpc/rpcent.h |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
-index 7fd93d9..df1f5ed 100644
+index 7fd93d9..8ce05ed 100644
 --- a/tirpc/rpc/rpcent.h
 +++ b/tirpc/rpc/rpcent.h
-@@ -47,7 +47,7 @@
+@@ -46,8 +46,9 @@
+ 
  __BEGIN_DECLS
  
- /* These are defined in /usr/include/rpc/netdb.h */
+-/* These are defined in /usr/include/rpc/netdb.h */
 -#if 0
-+#if __UCLIBC__
++/* These are defined in /usr/include/rpc/netdb.h, unless we are using
++   the C library without RPC support. */
++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__)
  struct rpcent {
  	char	*r_name;	/* name of server for this rpc program */
  	char	**r_aliases;	/* alias list */

From 9f0c314674cb8f9d79d30540359d1df7f564d37e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:42 +0000
Subject: [PATCH 3244/6849] nfs-utils: reformat patch set as git patches

As we will need to add more patches to nfs-utils, we need a correct
ordering when applying patches. Therefore, reformat the patches to use
a git format and git naming.

The nfs-utils-dont-mix-flags.patch is no longer needed as it was
patching Makefile.in files that were being regenerated due to the
package having _AUTORECONF = YES. The Makefile.in are properly
regenerated thanks to the nfs-utils-0002-Patch-taken-from-Gentoo.patch
patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ONDITIONAL-in-conditional-execution.patch} |   9 +-
 ...-utils-0002-Patch-taken-from-Gentoo.patch} |  22 +-
 ...ch-legacy-index-in-favour-of-strchr.patch} |  44 ++-
 ...fs-utils-0004-fix-build-with-uClibc.patch} |  16 +-
 .../nfs-utils/nfs-utils-dont-mix-flags.patch  | 288 ------------------
 5 files changed, 63 insertions(+), 316 deletions(-)
 rename package/nfs-utils/{nfs-utils-conditionals.patch => nfs-utils-0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch} (89%)
 rename package/nfs-utils/{nfs-utils-cross-build.patch => nfs-utils-0002-Patch-taken-from-Gentoo.patch} (69%)
 rename package/nfs-utils/{nfs-utils-susv3-legacy.patch => nfs-utils-0003-Switch-legacy-index-in-favour-of-strchr.patch} (50%)
 rename package/nfs-utils/{nfs-utils-uclibc-libio.h.patch => nfs-utils-0004-fix-build-with-uClibc.patch} (56%)
 delete mode 100644 package/nfs-utils/nfs-utils-dont-mix-flags.patch

diff --git a/package/nfs-utils/nfs-utils-conditionals.patch b/package/nfs-utils/nfs-utils-0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch
similarity index 89%
rename from package/nfs-utils/nfs-utils-conditionals.patch
rename to package/nfs-utils/nfs-utils-0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch
index a2342b36b9..ba9ad420fa 100644
--- a/package/nfs-utils/nfs-utils-conditionals.patch
+++ b/package/nfs-utils/nfs-utils-0001-build-avoid-AM_CONDITIONAL-in-conditional-execution.patch
@@ -1,8 +1,7 @@
-From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001
+From 2a44ed7558f981e15db58dcda799ff7cd3827a6e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
 Date: Thu, 17 May 2012 16:26:44 -0700
-Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional
- execution.
+Subject: [PATCH] build: avoid AM_CONDITIONAL in conditional execution.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -20,7 +19,7 @@ Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
 ---
  aclocal/libsqlite3.m4 |    1 -
  configure.ac          |    3 +--
- 2 files changed, 1 insertions(+), 3 deletions(-)
+ 2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
 index 73d1e46..8c38993 100644
@@ -54,5 +53,5 @@ index 9ba53e2..b408f1b 100644
  
  
 -- 
-1.7.8.6
+1.7.9.5
 
diff --git a/package/nfs-utils/nfs-utils-cross-build.patch b/package/nfs-utils/nfs-utils-0002-Patch-taken-from-Gentoo.patch
similarity index 69%
rename from package/nfs-utils/nfs-utils-cross-build.patch
rename to package/nfs-utils/nfs-utils-0002-Patch-taken-from-Gentoo.patch
index 43928bf503..e310c4977d 100644
--- a/package/nfs-utils/nfs-utils-cross-build.patch
+++ b/package/nfs-utils/nfs-utils-0002-Patch-taken-from-Gentoo.patch
@@ -1,7 +1,17 @@
-Patch taken from Gentoo.
+From 971389625c9602085d399d8ae7fc42b75efcfb7c Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Sat, 10 Nov 2012 18:56:12 +0100
+Subject: [PATCH] Patch taken from Gentoo
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ tools/locktest/Makefile.am |    7 +++----
+ tools/rpcdebug/Makefile.am |    7 +++----
+ tools/rpcgen/Makefile.am   |    8 +++-----
+ 3 files changed, 9 insertions(+), 13 deletions(-)
 
+diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
+index 3156815..efe6fcd 100644
 --- a/tools/locktest/Makefile.am
 +++ b/tools/locktest/Makefile.am
 @@ -1,12 +1,11 @@
@@ -20,6 +30,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 -testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  
  MAINTAINERCLEANFILES = Makefile.in
+diff --git a/tools/rpcdebug/Makefile.am b/tools/rpcdebug/Makefile.am
+index 39b70c9..0056597 100644
 --- a/tools/rpcdebug/Makefile.am
 +++ b/tools/rpcdebug/Makefile.am
 @@ -1,15 +1,14 @@
@@ -41,6 +53,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 -rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  
  MAINTAINERCLEANFILES = Makefile.in
+diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
+index 8a9ec89..5a5b4d3 100644
 --- a/tools/rpcgen/Makefile.am
 +++ b/tools/rpcgen/Makefile.am
 @@ -1,7 +1,9 @@
@@ -54,7 +68,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  
  noinst_PROGRAMS = rpcgen
  rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
-@@ -9,10 +11,6 @@
+@@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
  		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
  		 rpc_scan.h rpc_util.h
  
@@ -65,4 +79,6 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  
  MAINTAINERCLEANFILES = Makefile.in
  
- EXTRA_DIST = rpcgen.new.1
+-- 
+1.7.9.5
+
diff --git a/package/nfs-utils/nfs-utils-susv3-legacy.patch b/package/nfs-utils/nfs-utils-0003-Switch-legacy-index-in-favour-of-strchr.patch
similarity index 50%
rename from package/nfs-utils/nfs-utils-susv3-legacy.patch
rename to package/nfs-utils/nfs-utils-0003-Switch-legacy-index-in-favour-of-strchr.patch
index 66dd181db5..82a6c43659 100644
--- a/package/nfs-utils/nfs-utils-susv3-legacy.patch
+++ b/package/nfs-utils/nfs-utils-0003-Switch-legacy-index-in-favour-of-strchr.patch
@@ -1,11 +1,20 @@
-Switch legacy index() in favour of strchr()
-Updated for 1.2.6 from the previous patch by Frederik Pasch.
+From 636e78e4c9bc8be174805bde2f3ae7f940dc3d0e Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Sat, 10 Nov 2012 18:58:15 +0100
+Subject: [PATCH] Switch legacy index() in favour of strchr() Updated for
+ 1.2.6 from the previous patch by Frederik Pasch.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ support/nfs/nfs_mntent.c |    6 +++---
+ utils/mount/error.c      |    2 +-
+ utils/mountd/fsloc.c     |    2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
 
-diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support/nfs/nfs_mntent.c
---- nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c	2012-05-29 10:06:37.901255998 -0300
-+++ nfs-utils-1.2.6/support/nfs/nfs_mntent.c	2012-05-29 10:06:45.726312410 -0300
+diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c
+index a2118a2..7496ed6 100644
+--- a/support/nfs/nfs_mntent.c
++++ b/support/nfs/nfs_mntent.c
 @@ -9,7 +9,7 @@
   */
  
@@ -15,7 +24,7 @@ diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support
  #include <ctype.h>		/* for isdigit */
  #include <sys/stat.h>		/* for umask */
  #include <unistd.h>		/* for ftruncate */
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) {
  			return NULL;
  
  		mfp->mntent_lineno++;
@@ -24,7 +33,7 @@ diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support
  		if (s == NULL) {
  			/* Missing final newline?  Otherwise extremely */
  			/* long line - assume file was corrupted */
-@@ -180,7 +180,7 @@
+@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) {
  				fprintf(stderr, _("[mntent]: warning: no final "
  					"newline at the end of %s\n"),
  					mfp->mntent_file);
@@ -33,10 +42,11 @@ diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support
  			} else {
  				mfp->mntent_errs = 1;
  				goto err;
-diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/error.c
---- nfs-utils-1.2.6.orig/utils/mount/error.c	2012-05-29 10:06:37.946256325 -0300
-+++ nfs-utils-1.2.6/utils/mount/error.c	2012-05-29 10:06:45.727312416 -0300
-@@ -62,7 +62,7 @@
+diff --git a/utils/mount/error.c b/utils/mount/error.c
+index 83ad1d2..428deef 100644
+--- a/utils/mount/error.c
++++ b/utils/mount/error.c
+@@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
  	char *tmp;
  
  	if (estr) {
@@ -45,10 +55,11 @@ diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/
  			estr = ++ptr;
  
  		tmp = &errbuf[spos];
-diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mountd/fsloc.c
---- nfs-utils-1.2.6.orig/utils/mountd/fsloc.c	2012-05-29 10:06:37.911256072 -0300
-+++ nfs-utils-1.2.6/utils/mountd/fsloc.c	2012-05-29 10:07:11.140322564 -0300
-@@ -127,7 +127,7 @@
+diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c
+index bc737d1..ddbe92f 100644
+--- a/utils/mountd/fsloc.c
++++ b/utils/mountd/fsloc.c
+@@ -127,7 +127,7 @@ static struct servers *method_list(char *data)
  	bool v6esc = false;
  
  	xlog(L_NOTICE, "method_list(%s)", data);
@@ -57,3 +68,6 @@ diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mount
  		ptr++;
  	list = malloc(listsize * sizeof(char *));
  	copy = strdup(data);
+-- 
+1.7.9.5
+
diff --git a/package/nfs-utils/nfs-utils-uclibc-libio.h.patch b/package/nfs-utils/nfs-utils-0004-fix-build-with-uClibc.patch
similarity index 56%
rename from package/nfs-utils/nfs-utils-uclibc-libio.h.patch
rename to package/nfs-utils/nfs-utils-0004-fix-build-with-uClibc.patch
index 589b96f7a4..23da28f20c 100644
--- a/package/nfs-utils/nfs-utils-uclibc-libio.h.patch
+++ b/package/nfs-utils/nfs-utils-0004-fix-build-with-uClibc.patch
@@ -1,4 +1,7 @@
-[PATCH] fix build with uClibc
+From ff82d4c89d6ca771dea06bbaa06ddf3fed760402 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Sat, 10 Nov 2012 18:58:48 +0100
+Subject: [PATCH] fix build with uClibc
 
 uClibc doesn't have/need libio.h, so don't include it from sockaddr.h
 
@@ -7,10 +10,10 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  support/include/sockaddr.h |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-Index: nfs-utils-1.2.3/support/include/sockaddr.h
-===================================================================
---- nfs-utils-1.2.3.orig/support/include/sockaddr.h
-+++ nfs-utils-1.2.3/support/include/sockaddr.h
+diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
+index 9af2543..5eef2ec 100644
+--- a/support/include/sockaddr.h
++++ b/support/include/sockaddr.h
 @@ -20,7 +20,10 @@
  #ifndef NFS_UTILS_SOCKADDR_H
  #define NFS_UTILS_SOCKADDR_H
@@ -23,3 +26,6 @@ Index: nfs-utils-1.2.3/support/include/sockaddr.h
  #include <stdbool.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
+-- 
+1.7.9.5
+
diff --git a/package/nfs-utils/nfs-utils-dont-mix-flags.patch b/package/nfs-utils/nfs-utils-dont-mix-flags.patch
deleted file mode 100644
index b5ef5c7172..0000000000
--- a/package/nfs-utils/nfs-utils-dont-mix-flags.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-[PATCH] don't mix build/target compiler/linker flags
-
-Build tools should only use CFLAGS_FOR_BUILD / LDFLAGS_FOR_BUILD, and
-not the normal CFLAGS / LDFLAGS (which are used for target builds).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- tools/locktest/Makefile.in |   12 +++---
- tools/rpcdebug/Makefile.in |   12 +++---
- tools/rpcgen/Makefile.in   |   84 ++++++++++++++++++++++-----------------------
- 3 files changed, 54 insertions(+), 54 deletions(-)
-
-Index: nfs-utils-1.2.3/tools/locktest/Makefile.in
-===================================================================
---- nfs-utils-1.2.3.orig/tools/locktest/Makefile.in
-+++ nfs-utils-1.2.3/tools/locktest/Makefile.in
-@@ -67,8 +67,8 @@
- testlk_OBJECTS = $(am_testlk_OBJECTS)
- testlk_LDADD = $(LDADD)
- testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(testlk_CFLAGS) $(CFLAGS) \
--	$(testlk_LDFLAGS) $(LDFLAGS) -o $@
-+	--mode=link $(CCLD) $(testlk_CFLAGS) \
-+	$(testlk_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -330,18 +330,18 @@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- testlk-testlk.o: testlk.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) $(CFLAGS) -MT testlk-testlk.o -MD -MP -MF $(DEPDIR)/testlk-testlk.Tpo -c -o testlk-testlk.o `test -f 'testlk.c' || echo '$(srcdir)/'`testlk.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) -MT testlk-testlk.o -MD -MP -MF $(DEPDIR)/testlk-testlk.Tpo -c -o testlk-testlk.o `test -f 'testlk.c' || echo '$(srcdir)/'`testlk.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/testlk-testlk.Tpo $(DEPDIR)/testlk-testlk.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='testlk.c' object='testlk-testlk.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) $(CFLAGS) -c -o testlk-testlk.o `test -f 'testlk.c' || echo '$(srcdir)/'`testlk.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) -c -o testlk-testlk.o `test -f 'testlk.c' || echo '$(srcdir)/'`testlk.c
- 
- testlk-testlk.obj: testlk.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) $(CFLAGS) -MT testlk-testlk.obj -MD -MP -MF $(DEPDIR)/testlk-testlk.Tpo -c -o testlk-testlk.obj `if test -f 'testlk.c'; then $(CYGPATH_W) 'testlk.c'; else $(CYGPATH_W) '$(srcdir)/testlk.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) -MT testlk-testlk.obj -MD -MP -MF $(DEPDIR)/testlk-testlk.Tpo -c -o testlk-testlk.obj `if test -f 'testlk.c'; then $(CYGPATH_W) 'testlk.c'; else $(CYGPATH_W) '$(srcdir)/testlk.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/testlk-testlk.Tpo $(DEPDIR)/testlk-testlk.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='testlk.c' object='testlk-testlk.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) $(CFLAGS) -c -o testlk-testlk.obj `if test -f 'testlk.c'; then $(CYGPATH_W) 'testlk.c'; else $(CYGPATH_W) '$(srcdir)/testlk.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testlk_CPPFLAGS) $(CPPFLAGS) $(testlk_CFLAGS) -c -o testlk-testlk.obj `if test -f 'testlk.c'; then $(CYGPATH_W) 'testlk.c'; else $(CYGPATH_W) '$(srcdir)/testlk.c'; fi`
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-Index: nfs-utils-1.2.3/tools/rpcdebug/Makefile.in
-===================================================================
---- nfs-utils-1.2.3.orig/tools/rpcdebug/Makefile.in
-+++ nfs-utils-1.2.3/tools/rpcdebug/Makefile.in
-@@ -68,8 +68,8 @@
- rpcdebug_OBJECTS = $(am_rpcdebug_OBJECTS)
- rpcdebug_LDADD = $(LDADD)
- rpcdebug_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(rpcdebug_CFLAGS) $(CFLAGS) \
--	$(rpcdebug_LDFLAGS) $(LDFLAGS) -o $@
-+	--mode=link $(CCLD) $(rpcdebug_CFLAGS) \
-+	$(rpcdebug_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -391,18 +391,18 @@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- rpcdebug-rpcdebug.o: rpcdebug.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) $(CFLAGS) -MT rpcdebug-rpcdebug.o -MD -MP -MF $(DEPDIR)/rpcdebug-rpcdebug.Tpo -c -o rpcdebug-rpcdebug.o `test -f 'rpcdebug.c' || echo '$(srcdir)/'`rpcdebug.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) -MT rpcdebug-rpcdebug.o -MD -MP -MF $(DEPDIR)/rpcdebug-rpcdebug.Tpo -c -o rpcdebug-rpcdebug.o `test -f 'rpcdebug.c' || echo '$(srcdir)/'`rpcdebug.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcdebug-rpcdebug.Tpo $(DEPDIR)/rpcdebug-rpcdebug.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpcdebug.c' object='rpcdebug-rpcdebug.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) $(CFLAGS) -c -o rpcdebug-rpcdebug.o `test -f 'rpcdebug.c' || echo '$(srcdir)/'`rpcdebug.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) -c -o rpcdebug-rpcdebug.o `test -f 'rpcdebug.c' || echo '$(srcdir)/'`rpcdebug.c
- 
- rpcdebug-rpcdebug.obj: rpcdebug.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) $(CFLAGS) -MT rpcdebug-rpcdebug.obj -MD -MP -MF $(DEPDIR)/rpcdebug-rpcdebug.Tpo -c -o rpcdebug-rpcdebug.obj `if test -f 'rpcdebug.c'; then $(CYGPATH_W) 'rpcdebug.c'; else $(CYGPATH_W) '$(srcdir)/rpcdebug.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) -MT rpcdebug-rpcdebug.obj -MD -MP -MF $(DEPDIR)/rpcdebug-rpcdebug.Tpo -c -o rpcdebug-rpcdebug.obj `if test -f 'rpcdebug.c'; then $(CYGPATH_W) 'rpcdebug.c'; else $(CYGPATH_W) '$(srcdir)/rpcdebug.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcdebug-rpcdebug.Tpo $(DEPDIR)/rpcdebug-rpcdebug.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpcdebug.c' object='rpcdebug-rpcdebug.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) $(CFLAGS) -c -o rpcdebug-rpcdebug.obj `if test -f 'rpcdebug.c'; then $(CYGPATH_W) 'rpcdebug.c'; else $(CYGPATH_W) '$(srcdir)/rpcdebug.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rpcdebug_CPPFLAGS) $(CPPFLAGS) $(rpcdebug_CFLAGS) -c -o rpcdebug-rpcdebug.obj `if test -f 'rpcdebug.c'; then $(CYGPATH_W) 'rpcdebug.c'; else $(CYGPATH_W) '$(srcdir)/rpcdebug.c'; fi`
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-Index: nfs-utils-1.2.3/tools/rpcgen/Makefile.in
-===================================================================
---- nfs-utils-1.2.3.orig/tools/rpcgen/Makefile.in
-+++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in
-@@ -72,8 +72,8 @@
- rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
- rpcgen_LDADD = $(LDADD)
- rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
--	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
-+	--mode=link $(CCLD) $(rpcgen_CFLAGS) \
-+	$(rpcgen_LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -349,144 +349,144 @@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- rpcgen-rpc_clntout.o: rpc_clntout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_clntout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_clntout.Tpo -c -o rpcgen-rpc_clntout.o `test -f 'rpc_clntout.c' || echo '$(srcdir)/'`rpc_clntout.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_clntout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_clntout.Tpo -c -o rpcgen-rpc_clntout.o `test -f 'rpc_clntout.c' || echo '$(srcdir)/'`rpc_clntout.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_clntout.Tpo $(DEPDIR)/rpcgen-rpc_clntout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_clntout.c' object='rpcgen-rpc_clntout.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_clntout.o `test -f 'rpc_clntout.c' || echo '$(srcdir)/'`rpc_clntout.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_clntout.o `test -f 'rpc_clntout.c' || echo '$(srcdir)/'`rpc_clntout.c
- 
- rpcgen-rpc_clntout.obj: rpc_clntout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_clntout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_clntout.Tpo -c -o rpcgen-rpc_clntout.obj `if test -f 'rpc_clntout.c'; then $(CYGPATH_W) 'rpc_clntout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_clntout.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_clntout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_clntout.Tpo -c -o rpcgen-rpc_clntout.obj `if test -f 'rpc_clntout.c'; then $(CYGPATH_W) 'rpc_clntout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_clntout.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_clntout.Tpo $(DEPDIR)/rpcgen-rpc_clntout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_clntout.c' object='rpcgen-rpc_clntout.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_clntout.obj `if test -f 'rpc_clntout.c'; then $(CYGPATH_W) 'rpc_clntout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_clntout.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_clntout.obj `if test -f 'rpc_clntout.c'; then $(CYGPATH_W) 'rpc_clntout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_clntout.c'; fi`
- 
- rpcgen-rpc_cout.o: rpc_cout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_cout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_cout.Tpo -c -o rpcgen-rpc_cout.o `test -f 'rpc_cout.c' || echo '$(srcdir)/'`rpc_cout.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_cout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_cout.Tpo -c -o rpcgen-rpc_cout.o `test -f 'rpc_cout.c' || echo '$(srcdir)/'`rpc_cout.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_cout.Tpo $(DEPDIR)/rpcgen-rpc_cout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_cout.c' object='rpcgen-rpc_cout.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_cout.o `test -f 'rpc_cout.c' || echo '$(srcdir)/'`rpc_cout.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_cout.o `test -f 'rpc_cout.c' || echo '$(srcdir)/'`rpc_cout.c
- 
- rpcgen-rpc_cout.obj: rpc_cout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_cout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_cout.Tpo -c -o rpcgen-rpc_cout.obj `if test -f 'rpc_cout.c'; then $(CYGPATH_W) 'rpc_cout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_cout.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_cout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_cout.Tpo -c -o rpcgen-rpc_cout.obj `if test -f 'rpc_cout.c'; then $(CYGPATH_W) 'rpc_cout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_cout.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_cout.Tpo $(DEPDIR)/rpcgen-rpc_cout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_cout.c' object='rpcgen-rpc_cout.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_cout.obj `if test -f 'rpc_cout.c'; then $(CYGPATH_W) 'rpc_cout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_cout.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_cout.obj `if test -f 'rpc_cout.c'; then $(CYGPATH_W) 'rpc_cout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_cout.c'; fi`
- 
- rpcgen-rpc_hout.o: rpc_hout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_hout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_hout.Tpo -c -o rpcgen-rpc_hout.o `test -f 'rpc_hout.c' || echo '$(srcdir)/'`rpc_hout.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_hout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_hout.Tpo -c -o rpcgen-rpc_hout.o `test -f 'rpc_hout.c' || echo '$(srcdir)/'`rpc_hout.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_hout.Tpo $(DEPDIR)/rpcgen-rpc_hout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_hout.c' object='rpcgen-rpc_hout.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_hout.o `test -f 'rpc_hout.c' || echo '$(srcdir)/'`rpc_hout.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_hout.o `test -f 'rpc_hout.c' || echo '$(srcdir)/'`rpc_hout.c
- 
- rpcgen-rpc_hout.obj: rpc_hout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_hout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_hout.Tpo -c -o rpcgen-rpc_hout.obj `if test -f 'rpc_hout.c'; then $(CYGPATH_W) 'rpc_hout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_hout.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_hout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_hout.Tpo -c -o rpcgen-rpc_hout.obj `if test -f 'rpc_hout.c'; then $(CYGPATH_W) 'rpc_hout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_hout.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_hout.Tpo $(DEPDIR)/rpcgen-rpc_hout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_hout.c' object='rpcgen-rpc_hout.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_hout.obj `if test -f 'rpc_hout.c'; then $(CYGPATH_W) 'rpc_hout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_hout.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_hout.obj `if test -f 'rpc_hout.c'; then $(CYGPATH_W) 'rpc_hout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_hout.c'; fi`
- 
- rpcgen-rpc_main.o: rpc_main.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_main.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_main.Tpo -c -o rpcgen-rpc_main.o `test -f 'rpc_main.c' || echo '$(srcdir)/'`rpc_main.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_main.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_main.Tpo -c -o rpcgen-rpc_main.o `test -f 'rpc_main.c' || echo '$(srcdir)/'`rpc_main.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_main.Tpo $(DEPDIR)/rpcgen-rpc_main.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_main.c' object='rpcgen-rpc_main.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_main.o `test -f 'rpc_main.c' || echo '$(srcdir)/'`rpc_main.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_main.o `test -f 'rpc_main.c' || echo '$(srcdir)/'`rpc_main.c
- 
- rpcgen-rpc_main.obj: rpc_main.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_main.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_main.Tpo -c -o rpcgen-rpc_main.obj `if test -f 'rpc_main.c'; then $(CYGPATH_W) 'rpc_main.c'; else $(CYGPATH_W) '$(srcdir)/rpc_main.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_main.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_main.Tpo -c -o rpcgen-rpc_main.obj `if test -f 'rpc_main.c'; then $(CYGPATH_W) 'rpc_main.c'; else $(CYGPATH_W) '$(srcdir)/rpc_main.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_main.Tpo $(DEPDIR)/rpcgen-rpc_main.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_main.c' object='rpcgen-rpc_main.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_main.obj `if test -f 'rpc_main.c'; then $(CYGPATH_W) 'rpc_main.c'; else $(CYGPATH_W) '$(srcdir)/rpc_main.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_main.obj `if test -f 'rpc_main.c'; then $(CYGPATH_W) 'rpc_main.c'; else $(CYGPATH_W) '$(srcdir)/rpc_main.c'; fi`
- 
- rpcgen-rpc_parse.o: rpc_parse.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_parse.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_parse.Tpo -c -o rpcgen-rpc_parse.o `test -f 'rpc_parse.c' || echo '$(srcdir)/'`rpc_parse.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_parse.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_parse.Tpo -c -o rpcgen-rpc_parse.o `test -f 'rpc_parse.c' || echo '$(srcdir)/'`rpc_parse.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_parse.Tpo $(DEPDIR)/rpcgen-rpc_parse.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_parse.c' object='rpcgen-rpc_parse.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_parse.o `test -f 'rpc_parse.c' || echo '$(srcdir)/'`rpc_parse.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_parse.o `test -f 'rpc_parse.c' || echo '$(srcdir)/'`rpc_parse.c
- 
- rpcgen-rpc_parse.obj: rpc_parse.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_parse.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_parse.Tpo -c -o rpcgen-rpc_parse.obj `if test -f 'rpc_parse.c'; then $(CYGPATH_W) 'rpc_parse.c'; else $(CYGPATH_W) '$(srcdir)/rpc_parse.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_parse.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_parse.Tpo -c -o rpcgen-rpc_parse.obj `if test -f 'rpc_parse.c'; then $(CYGPATH_W) 'rpc_parse.c'; else $(CYGPATH_W) '$(srcdir)/rpc_parse.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_parse.Tpo $(DEPDIR)/rpcgen-rpc_parse.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_parse.c' object='rpcgen-rpc_parse.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_parse.obj `if test -f 'rpc_parse.c'; then $(CYGPATH_W) 'rpc_parse.c'; else $(CYGPATH_W) '$(srcdir)/rpc_parse.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_parse.obj `if test -f 'rpc_parse.c'; then $(CYGPATH_W) 'rpc_parse.c'; else $(CYGPATH_W) '$(srcdir)/rpc_parse.c'; fi`
- 
- rpcgen-rpc_scan.o: rpc_scan.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_scan.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_scan.Tpo -c -o rpcgen-rpc_scan.o `test -f 'rpc_scan.c' || echo '$(srcdir)/'`rpc_scan.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_scan.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_scan.Tpo -c -o rpcgen-rpc_scan.o `test -f 'rpc_scan.c' || echo '$(srcdir)/'`rpc_scan.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_scan.Tpo $(DEPDIR)/rpcgen-rpc_scan.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_scan.c' object='rpcgen-rpc_scan.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_scan.o `test -f 'rpc_scan.c' || echo '$(srcdir)/'`rpc_scan.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_scan.o `test -f 'rpc_scan.c' || echo '$(srcdir)/'`rpc_scan.c
- 
- rpcgen-rpc_scan.obj: rpc_scan.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_scan.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_scan.Tpo -c -o rpcgen-rpc_scan.obj `if test -f 'rpc_scan.c'; then $(CYGPATH_W) 'rpc_scan.c'; else $(CYGPATH_W) '$(srcdir)/rpc_scan.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_scan.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_scan.Tpo -c -o rpcgen-rpc_scan.obj `if test -f 'rpc_scan.c'; then $(CYGPATH_W) 'rpc_scan.c'; else $(CYGPATH_W) '$(srcdir)/rpc_scan.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_scan.Tpo $(DEPDIR)/rpcgen-rpc_scan.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_scan.c' object='rpcgen-rpc_scan.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_scan.obj `if test -f 'rpc_scan.c'; then $(CYGPATH_W) 'rpc_scan.c'; else $(CYGPATH_W) '$(srcdir)/rpc_scan.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_scan.obj `if test -f 'rpc_scan.c'; then $(CYGPATH_W) 'rpc_scan.c'; else $(CYGPATH_W) '$(srcdir)/rpc_scan.c'; fi`
- 
- rpcgen-rpc_svcout.o: rpc_svcout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_svcout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_svcout.Tpo -c -o rpcgen-rpc_svcout.o `test -f 'rpc_svcout.c' || echo '$(srcdir)/'`rpc_svcout.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_svcout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_svcout.Tpo -c -o rpcgen-rpc_svcout.o `test -f 'rpc_svcout.c' || echo '$(srcdir)/'`rpc_svcout.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_svcout.Tpo $(DEPDIR)/rpcgen-rpc_svcout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_svcout.c' object='rpcgen-rpc_svcout.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_svcout.o `test -f 'rpc_svcout.c' || echo '$(srcdir)/'`rpc_svcout.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_svcout.o `test -f 'rpc_svcout.c' || echo '$(srcdir)/'`rpc_svcout.c
- 
- rpcgen-rpc_svcout.obj: rpc_svcout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_svcout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_svcout.Tpo -c -o rpcgen-rpc_svcout.obj `if test -f 'rpc_svcout.c'; then $(CYGPATH_W) 'rpc_svcout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_svcout.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_svcout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_svcout.Tpo -c -o rpcgen-rpc_svcout.obj `if test -f 'rpc_svcout.c'; then $(CYGPATH_W) 'rpc_svcout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_svcout.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_svcout.Tpo $(DEPDIR)/rpcgen-rpc_svcout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_svcout.c' object='rpcgen-rpc_svcout.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_svcout.obj `if test -f 'rpc_svcout.c'; then $(CYGPATH_W) 'rpc_svcout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_svcout.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_svcout.obj `if test -f 'rpc_svcout.c'; then $(CYGPATH_W) 'rpc_svcout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_svcout.c'; fi`
- 
- rpcgen-rpc_tblout.o: rpc_tblout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_tblout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_tblout.Tpo -c -o rpcgen-rpc_tblout.o `test -f 'rpc_tblout.c' || echo '$(srcdir)/'`rpc_tblout.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_tblout.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_tblout.Tpo -c -o rpcgen-rpc_tblout.o `test -f 'rpc_tblout.c' || echo '$(srcdir)/'`rpc_tblout.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_tblout.Tpo $(DEPDIR)/rpcgen-rpc_tblout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_tblout.c' object='rpcgen-rpc_tblout.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_tblout.o `test -f 'rpc_tblout.c' || echo '$(srcdir)/'`rpc_tblout.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_tblout.o `test -f 'rpc_tblout.c' || echo '$(srcdir)/'`rpc_tblout.c
- 
- rpcgen-rpc_tblout.obj: rpc_tblout.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_tblout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_tblout.Tpo -c -o rpcgen-rpc_tblout.obj `if test -f 'rpc_tblout.c'; then $(CYGPATH_W) 'rpc_tblout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_tblout.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_tblout.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_tblout.Tpo -c -o rpcgen-rpc_tblout.obj `if test -f 'rpc_tblout.c'; then $(CYGPATH_W) 'rpc_tblout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_tblout.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_tblout.Tpo $(DEPDIR)/rpcgen-rpc_tblout.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_tblout.c' object='rpcgen-rpc_tblout.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_tblout.obj `if test -f 'rpc_tblout.c'; then $(CYGPATH_W) 'rpc_tblout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_tblout.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_tblout.obj `if test -f 'rpc_tblout.c'; then $(CYGPATH_W) 'rpc_tblout.c'; else $(CYGPATH_W) '$(srcdir)/rpc_tblout.c'; fi`
- 
- rpcgen-rpc_util.o: rpc_util.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_util.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_util.Tpo -c -o rpcgen-rpc_util.o `test -f 'rpc_util.c' || echo '$(srcdir)/'`rpc_util.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_util.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_util.Tpo -c -o rpcgen-rpc_util.o `test -f 'rpc_util.c' || echo '$(srcdir)/'`rpc_util.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_util.Tpo $(DEPDIR)/rpcgen-rpc_util.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_util.c' object='rpcgen-rpc_util.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_util.o `test -f 'rpc_util.c' || echo '$(srcdir)/'`rpc_util.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_util.o `test -f 'rpc_util.c' || echo '$(srcdir)/'`rpc_util.c
- 
- rpcgen-rpc_util.obj: rpc_util.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_util.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_util.Tpo -c -o rpcgen-rpc_util.obj `if test -f 'rpc_util.c'; then $(CYGPATH_W) 'rpc_util.c'; else $(CYGPATH_W) '$(srcdir)/rpc_util.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_util.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_util.Tpo -c -o rpcgen-rpc_util.obj `if test -f 'rpc_util.c'; then $(CYGPATH_W) 'rpc_util.c'; else $(CYGPATH_W) '$(srcdir)/rpc_util.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_util.Tpo $(DEPDIR)/rpcgen-rpc_util.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_util.c' object='rpcgen-rpc_util.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_util.obj `if test -f 'rpc_util.c'; then $(CYGPATH_W) 'rpc_util.c'; else $(CYGPATH_W) '$(srcdir)/rpc_util.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_util.obj `if test -f 'rpc_util.c'; then $(CYGPATH_W) 'rpc_util.c'; else $(CYGPATH_W) '$(srcdir)/rpc_util.c'; fi`
- 
- rpcgen-rpc_sample.o: rpc_sample.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_sample.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_sample.Tpo -c -o rpcgen-rpc_sample.o `test -f 'rpc_sample.c' || echo '$(srcdir)/'`rpc_sample.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_sample.o -MD -MP -MF $(DEPDIR)/rpcgen-rpc_sample.Tpo -c -o rpcgen-rpc_sample.o `test -f 'rpc_sample.c' || echo '$(srcdir)/'`rpc_sample.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_sample.Tpo $(DEPDIR)/rpcgen-rpc_sample.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_sample.c' object='rpcgen-rpc_sample.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_sample.o `test -f 'rpc_sample.c' || echo '$(srcdir)/'`rpc_sample.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_sample.o `test -f 'rpc_sample.c' || echo '$(srcdir)/'`rpc_sample.c
- 
- rpcgen-rpc_sample.obj: rpc_sample.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -MT rpcgen-rpc_sample.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_sample.Tpo -c -o rpcgen-rpc_sample.obj `if test -f 'rpc_sample.c'; then $(CYGPATH_W) 'rpc_sample.c'; else $(CYGPATH_W) '$(srcdir)/rpc_sample.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -MT rpcgen-rpc_sample.obj -MD -MP -MF $(DEPDIR)/rpcgen-rpc_sample.Tpo -c -o rpcgen-rpc_sample.obj `if test -f 'rpc_sample.c'; then $(CYGPATH_W) 'rpc_sample.c'; else $(CYGPATH_W) '$(srcdir)/rpc_sample.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/rpcgen-rpc_sample.Tpo $(DEPDIR)/rpcgen-rpc_sample.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rpc_sample.c' object='rpcgen-rpc_sample.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) $(CFLAGS) -c -o rpcgen-rpc_sample.obj `if test -f 'rpc_sample.c'; then $(CYGPATH_W) 'rpc_sample.c'; else $(CYGPATH_W) '$(srcdir)/rpc_sample.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpcgen_CFLAGS) -c -o rpcgen-rpc_sample.obj `if test -f 'rpc_sample.c'; then $(CYGPATH_W) 'rpc_sample.c'; else $(CYGPATH_W) '$(srcdir)/rpc_sample.c'; fi`
- 
- mostlyclean-libtool:
- 	-rm -f *.lo

From aca0d2a1af44acb610d4f23ceafda482590a3011 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:43 +0000
Subject: [PATCH 3245/6849] nfs-utils: add patches to allow compilation against
 libtirpc

libtirpc does not implement the reentrant function getrpcbynumber_r(),
so allow nfs-utils to use the non-reentrant version
getrpcbynumber(). This should not be a problem as nfs-utils tools are
not multi-threaded.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...etrpcbynumber-when-getrpcbynumber_r-.patch | 70 +++++++++++++++++++
 ...e-script-find-getrpcbynumber-in-libt.patch | 38 ++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 package/nfs-utils/nfs-utils-0005-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch
 create mode 100644 package/nfs-utils/nfs-utils-0006-Let-the-configure-script-find-getrpcbynumber-in-libt.patch

diff --git a/package/nfs-utils/nfs-utils-0005-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch b/package/nfs-utils/nfs-utils-0005-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch
new file mode 100644
index 0000000000..7c9f3c38f6
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-0005-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch
@@ -0,0 +1,70 @@
+From a4c15a4f9f49fd2ae5eee7eef54c67f4842952b2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 18:42:28 +0100
+Subject: [PATCH] Allow usage of getrpcbynumber() when getrpcbynumber_r() is
+ not available
+
+getrpcbynumber_r() is not implemented by libtirpc at the moment, only
+the non-reentrant getrpcbynumber() is available. Since nfs-utils seems
+to only be using getrpcbynumber_r() is a non multithreaded context,
+using getrpcbynumber() should work just as well.
+
+We also take this opportunity to adjust the autoconf checks to verify
+whether any of getrpcbynumber() or getrpcbynumber_r() is available,
+and error out if none of them is available.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac             |    8 ++++----
+ support/nfs/svc_socket.c |    6 ++++++
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b408f1b..41216c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -246,9 +246,6 @@ AC_CHECK_FUNC([connect], ,
+ AC_CHECK_FUNC([getaddrinfo], ,
+               [AC_MSG_ERROR([Function 'getaddrinfo' not found.])])
+ 
+-AC_CHECK_FUNC([getrpcbynumber], ,
+-              [AC_MSG_ERROR([Function 'getrpcbynumber' not found.])])
+-
+ AC_CHECK_FUNC([getservbyname], ,
+               [AC_MSG_ERROR([Function 'getservbyname' not found.])])
+ 
+@@ -393,8 +390,11 @@ AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
+                getnameinfo getrpcbyname getifaddrs \
+                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
+                realpath rmdir select socket strcasecmp strchr strdup \
+-               strerror strrchr strtol strtoul sigprocmask])
++               strerror strrchr strtol strtoul sigprocmask getrpcbynumber getrpcbynumber_r])
+ 
++if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
++   AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
++fi
+ 
+ dnl *************************************************************
+ dnl Check for data sizes
+diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c
+index f56f310..61ccf5b 100644
+--- a/support/nfs/svc_socket.c
++++ b/support/nfs/svc_socket.c
+@@ -42,8 +42,14 @@ int getservport(u_long number, const char *proto)
+ 	struct servent servbuf, *servp = NULL;
+ 	int ret;
+ 
++#if HAVE_GETRPCBYNUMBER_R
+ 	ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
+ 				&rpcp);
++#else
++	rpcp = getrpcbynumber(number);
++	ret = 0;
++#endif
++
+ 	if (ret == 0 && rpcp != NULL) {
+ 		/* First try name.  */
+ 		ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
+-- 
+1.7.9.5
+
diff --git a/package/nfs-utils/nfs-utils-0006-Let-the-configure-script-find-getrpcbynumber-in-libt.patch b/package/nfs-utils/nfs-utils-0006-Let-the-configure-script-find-getrpcbynumber-in-libt.patch
new file mode 100644
index 0000000000..1ca17b77e9
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-0006-Let-the-configure-script-find-getrpcbynumber-in-libt.patch
@@ -0,0 +1,38 @@
+From 7ea7814a8b87a0faa50fb9f4a486bfd7a376f3fc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 18:53:03 +0100
+Subject: [PATCH] Let the configure script find getrpcbynumber in libtirpc
+
+The getrpcbynumber() function may not be available in the C library,
+but only in the libtirpc library. Take this into account when checking
+for the existence of getrpcbynumber() and getrpcbynumber_r().
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 41216c9..1bbecfa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -390,7 +390,15 @@ AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
+                getnameinfo getrpcbyname getifaddrs \
+                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
+                realpath rmdir select socket strcasecmp strchr strdup \
+-               strerror strrchr strtol strtoul sigprocmask getrpcbynumber getrpcbynumber_r])
++               strerror strrchr strtol strtoul sigprocmask])
++
++save_CFLAGS=$CFLAGS
++save_LIBS=$LIBS
++CFLAGS="$CFLAGS $AM_CPPFLAGS"
++LIBS="$LIBS $LIBTIRPC"
++AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
++CFLAGS=$save_CFLAGS
++LIBS=$save_LIBS
+ 
+ if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
+    AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
+-- 
+1.7.9.5
+

From 96bdfdf08a88e190c8e36ec4112a09f5f7c07e89 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:44 +0000
Subject: [PATCH 3246/6849] quota: allow usage of getrpcbynumber() instead of
 getrpcbynumber_r()

libtirpc does not implement the reentrant function getrpcbynumber_r(),
so allow quota to use the non-reentrant version getrpcbynumber(). This
should not be a problem as quota tools are not multi-threaded.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../quota/quota-tools-getrpcbynumber.patch    | 42 +++++++++++++++++++
 package/quota/quota.mk                        |  4 ++
 2 files changed, 46 insertions(+)
 create mode 100644 package/quota/quota-tools-getrpcbynumber.patch

diff --git a/package/quota/quota-tools-getrpcbynumber.patch b/package/quota/quota-tools-getrpcbynumber.patch
new file mode 100644
index 0000000000..3fed853c0d
--- /dev/null
+++ b/package/quota/quota-tools-getrpcbynumber.patch
@@ -0,0 +1,42 @@
+allow usage of getrpcbynumber() instead of getrpcbynumber_r()
+
+libtirpc does not implement the reentrant function getrpcbynumber_r(),
+so allow quota to use the non-reentrant version getrpcbynumber(). This
+should not be a problem as quota tools are not multi-threaded.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -182,6 +182,12 @@
+ AC_C_CONST
+ AC_C_INLINE
+ 
++AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
++
++if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
++   AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
++fi
++
+ AC_ARG_ENABLE(altformat,
+ 	[  --enable-altformat=[yes/no]     Enable alternative format used by edquota [default=yes].],
+ 	,
+Index: b/svc_socket.c
+===================================================================
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -55,7 +55,12 @@
+ 	addr.sin_family = AF_INET;
+ 
+ 	if (!port) {
++#if HAVE_GETRPCBYNUMBER_R
+ 		ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
++#else
++		rpcp = getrpcbynumber(number);
++		ret = 0;
++#endif
+ 		if (ret == 0 && rpcp != NULL) {
+ 			/* First try name */
+ 			ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 7019059643..899dfddf86 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -8,6 +8,8 @@ QUOTA_VERSION = 4.00
 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
 
+QUOTA_AUTORECONF = YES
+
 QUOTA_CFLAGS = $(TARGET_CFLAGS)
 QUOTA_LDFLAGS = $(TARGET_LDFLAGS)
 
@@ -23,6 +25,8 @@ QUOTA_LDFLAGS += -ltirpc
 endif
 
 QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+QUOTA_CONF_ENV = \
+	CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 
 # Package uses autoconf but not automake.
 QUOTA_INSTALL_TARGET_OPT = \

From bff62a2a8783d9f65e05586ff61e7229c8cab357 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:45 +0000
Subject: [PATCH 3247/6849] rpcbind: convert to git patch

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ind-0001-Remove-yellow-pages-support.patch} | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
 rename package/rpcbind/{rpcbind-01-no-yp-support.patch => rpcbind-0001-Remove-yellow-pages-support.patch} (65%)

diff --git a/package/rpcbind/rpcbind-01-no-yp-support.patch b/package/rpcbind/rpcbind-0001-Remove-yellow-pages-support.patch
similarity index 65%
rename from package/rpcbind/rpcbind-01-no-yp-support.patch
rename to package/rpcbind/rpcbind-0001-Remove-yellow-pages-support.patch
index e9e6c9d767..eba17bf058 100644
--- a/package/rpcbind/rpcbind-01-no-yp-support.patch
+++ b/package/rpcbind/rpcbind-0001-Remove-yellow-pages-support.patch
@@ -1,12 +1,19 @@
-Remove yellow pages support
+From 6b5db966ae01c0bdaa7b3b90d9332394af6ea0be Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 22:03:43 +0100
+Subject: [PATCH] Remove yellow pages support
 
 This support requires yellow pages support in libtirpc, which isn't
 available. As most Buildroot users are most likely never going to need
 such feature, get rid of it.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/src/security.c
-===================================================================
+---
+ src/security.c |   18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/src/security.c b/src/security.c
+index 0edeac6..c6c977f 100644
 --- a/src/security.c
 +++ b/src/security.c
 @@ -23,9 +23,6 @@
@@ -19,7 +26,7 @@ Index: b/src/security.c
  
  #include "rpcbind.h"
  
-@@ -322,24 +319,9 @@
+@@ -322,24 +319,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused*
  		    args->rmt_proc != MOUNTPROC_UMNT)
  			break;
  		goto deny;
@@ -44,3 +51,6 @@ Index: b/src/security.c
  	default:
  		break;
  	}
+-- 
+1.7.9.5
+

From 1d4bc3790250d757876e42fcb78fd41fdab63707 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:46 +0000
Subject: [PATCH 3248/6849] rpcbind: allow build without NSS support

uClibc doesn't provide NSS support, so we shouldn't try to include nss
related headers or call nss related functions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...e-NSS-support-when-not-available-in-.patch | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 package/rpcbind/rpcbind-0002-Do-not-try-to-use-NSS-support-when-not-available-in-.patch

diff --git a/package/rpcbind/rpcbind-0002-Do-not-try-to-use-NSS-support-when-not-available-in-.patch b/package/rpcbind/rpcbind-0002-Do-not-try-to-use-NSS-support-when-not-available-in-.patch
new file mode 100644
index 0000000000..f7cc4a68c9
--- /dev/null
+++ b/package/rpcbind/rpcbind-0002-Do-not-try-to-use-NSS-support-when-not-available-in-.patch
@@ -0,0 +1,60 @@
+From cfc70fb4c54e044f724516e9352f974187adb448 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 22:04:12 +0100
+Subject: [PATCH] Do not try to use NSS support when not available in the C
+ library
+
+uClibc does not have NSS support, so it is unnecessary to tell the C
+library to use the "files" as the source for "services", since it is
+the only possible choice.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/rpcbind.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index 525ffba..cde8685 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -67,7 +67,9 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <errno.h>
++#ifdef HAVE_NSS_H
+ #include <nss.h>
++#endif
+ #include "config.h"
+ #include "rpcbind.h"
+ 
+@@ -156,11 +158,13 @@ main(int argc, char *argv[])
+ 		exit(1);
+ 	}
+ 
++#ifdef HAVE_NSS_H
+ 	/*
+ 	 * Make sure we use the local service file 
+ 	 * for service lookkups
+ 	 */
+ 	__nss_configure_lookup("services", "files");
++#endif
+ 
+ 	nc_handle = setnetconfig(); 	/* open netconfig file */
+ 	if (nc_handle == NULL) {
+@@ -222,11 +226,13 @@ main(int argc, char *argv[])
+ 		struct passwd *p;
+ 		char *id = runasdaemon ? RUN_AS : rpcbinduser;
+ 
++#ifdef HAVE_NSS_H
+ 		/*
+ 		 * Make sure we use the local password file
+ 		 * for these lookups.
+ 		 */
+ 		__nss_configure_lookup("passwd", "files");
++#endif
+ 
+ 		if((p = getpwnam(id)) == NULL) {
+ 			syslog(LOG_ERR, "cannot get uid of '%s': %m", id);
+-- 
+1.7.9.5
+

From 55107970cdebd991ad2d6e27bf7b99489cccc9ee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:47 +0000
Subject: [PATCH 3249/6849] libnetfilter_queue: does not build without IPv6
 support

Fixes the following build failure:

extra/checksum.c:16:25: fatal error: netinet/ip6.h: No such file or directory
compilation terminated.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnetfilter_queue/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libnetfilter_queue/Config.in b/package/libnetfilter_queue/Config.in
index d06aa77cda..d04853d3b7 100644
--- a/package/libnetfilter_queue/Config.in
+++ b/package/libnetfilter_queue/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBNETFILTER_QUEUE
 	bool "libnetfilter_queue"
 	depends on BR2_LARGEFILE
+	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_LIBNFNETLINK
 	select BR2_PACKAGE_LIBMNL
 	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_LIBNETFILTER_QUEUE
 
 	  http://www.netfilter.org/projects/libnetfilter_queue/
 
-comment "libnetfilter_queue requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libnetfilter_queue requires a toolchain with LARGEFILE and IPv6 support"
+	depends on !BR2_LARGEFILE && !BR2_INET_IPV6

From 0a4d6111c05f59d48231bd3cca4592cce4235e46 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 11:42:48 +0000
Subject: [PATCH 3250/6849] rpcbind: fix build on toolchains without IPv6
 support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../rpcbind-0003-Make-IPv6-configurable.patch | 42 +++++++++++++++++++
 package/rpcbind/rpcbind.mk                    |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 package/rpcbind/rpcbind-0003-Make-IPv6-configurable.patch

diff --git a/package/rpcbind/rpcbind-0003-Make-IPv6-configurable.patch b/package/rpcbind/rpcbind-0003-Make-IPv6-configurable.patch
new file mode 100644
index 0000000000..576434b56a
--- /dev/null
+++ b/package/rpcbind/rpcbind-0003-Make-IPv6-configurable.patch
@@ -0,0 +1,42 @@
+From ab7769e4b57741c654f1a815b006d6548104ba95 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 22:24:56 +0100
+Subject: [PATCH] Make IPv6 configurable
+
+Add an autoconf check that verifies whether IPv6 is available or not,
+and define the INET6 macro if available, instead of hardcoding it in
+src/Makefile.am.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.in    |    3 +++
+ src/Makefile.am |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index de1c730..57f0bf0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -61,6 +61,9 @@ AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking],
+ 	esac],[libwarp=false])
+ AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
+ 
++AC_CHECK_HEADER(netinet/ip6.h,
++        AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]))
++
+ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
+ AC_OUTPUT()
+                                                                    
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cc0a85b..3826eca 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
++INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DVERSION="\"$(VERSION)\"" \
+                                                 -D_GNU_SOURCE -Wall -pipe
+ if DEBUG
+ INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
+-- 
+1.7.9.5
+
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
index de9a421aad..382e53bf9e 100644
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -9,6 +9,7 @@ RPCBIND_SITE    = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPC
 RPCBIND_SOURCE  = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_LICENSE = BSD-3c
 RPCBIND_LICENSE_FILES = COPYING
+RPCBIND_AUTORECONF = YES
 
 RPCBIND_CONF_ENV += \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"

From c86cfd91c480671a9223a3c2adc8aaa9ca6b33e0 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 9 Nov 2012 14:40:25 +0000
Subject: [PATCH 3251/6849] Revert "auto{conf, make}: only make available on
 archs supported by qemu"

Since perl no longer requires host-qemu, autoconf and automake work
again on the architectures that are not supported by host-qemu.

This reverts commit c65d92e8e2767b09aaee6b717cbd9b66f88ea39c.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/Config.in | 4 ----
 package/automake/Config.in | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
index c304572ae0..5f2f148928 100644
--- a/package/autoconf/Config.in
+++ b/package/autoconf/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf"
-	depends on !(BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64)
 	select BR2_PACKAGE_PERL
 	help
 	  Extensible program for developing configure scripts.  These
 	  scripts handle all the mundane system/feature detection.
 
 	  http://www.gnu.org/software/autoconf/
-
-comment "autoconf requires an architecture supported by qemu"
-	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64
diff --git a/package/automake/Config.in b/package/automake/Config.in
index f8d74ef739..9a9673a6e8 100644
--- a/package/automake/Config.in
+++ b/package/automake/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake"
-	depends on !(BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64)
 	select BR2_PACKAGE_AUTOCONF
 	select BR2_PACKAGE_PERL
 	help
@@ -8,6 +7,3 @@ config BR2_PACKAGE_AUTOMAKE
 	  configure scripts (made by autoconf).
 
 	  http://www.gnu.org/software/automake/
-
-comment "automake requires an architecture supported by qemu"
-	depends on BR2_avr32 || BR2_bfin || BR2_sh2 || BR2_sh2a || BR2_sh3 || BR2_sh3eb || BR2_sh64

From 62652478541c4bde626c218e747c067e431d2507 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 15 Nov 2012 10:13:58 +0100
Subject: [PATCH 3252/6849] vala: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 5c333c5fad..6abcdd8816 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 VALA_VERSION_MAJOR = 0.18
-VALA_VERSION_MINOR = 0
+VALA_VERSION_MINOR = 1
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz

From 9de94e34773407224dd8e59c76227d86538b59d2 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 3 Sep 2012 20:58:37 +0000
Subject: [PATCH 3253/6849] lua-msgpack-native: new package v2

[Peter: reformat Config.in to fit 80-col]
Signed-off-by: Wojciech M. Zabolotny <wzab01@gmail.com>
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/lua-msgpack-native/Config.in          |  7 +++++
 .../lua-msgpack-native/lua-msgpack-native.mk  | 29 +++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/lua-msgpack-native/Config.in
 create mode 100644 package/lua-msgpack-native/lua-msgpack-native.mk

diff --git a/package/Config.in b/package/Config.in
index 074e9dfdeb..5d9783ad59 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -277,6 +277,7 @@ source "package/luacjson/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
+source "package/lua-msgpack-native/Config.in"
 source "package/rings/Config.in"
 source "package/wsapi/Config.in"
 source "package/xavante/Config.in"
diff --git a/package/lua-msgpack-native/Config.in b/package/lua-msgpack-native/Config.in
new file mode 100644
index 0000000000..8894ee5352
--- /dev/null
+++ b/package/lua-msgpack-native/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_MSGPACK_NATIVE
+	bool "lua-msgpack-native"
+	help
+	  This is a native, C language implementation of msgpack
+	  (http://msgpack.org) library/protocol for Lua language
+
+	  https://github.com/kengonakajima/lua-msgpack-native
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
new file mode 100644
index 0000000000..5d8cd2d8b2
--- /dev/null
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# lua-msgpack-native
+#
+#############################################################
+LUA_MSGPACK_NATIVE_VERSION = 41cce91ab6
+LUA_MSGPACK_NATIVE_SITE = git://github.com/kengonakajima/lua-msgpack-native.git
+LUA_MSGPACK_NATIVE_METHOD = git
+LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
+LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0
+LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt
+
+define LUA_MSGPACK_NATIVE_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) -fPIC -shared -o $(@D)/msgpack.so $(@D)/mp.c
+endef
+
+define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/msgpack.so $(TARGET_DIR)/usr/lib/lua/msgpack.so
+endef
+
+define LUA_MSGPACK_NATIVE_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/lua/msgpack.so
+endef
+
+define LUA_MSGPACK_NATIVE_CLEAN_CMDS
+	rm -f $(@D)/msgpack.so
+endef
+
+$(eval $(generic-package))

From 76983349cf2c77ed86e636cf81df5a61dce15a59 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 3 Sep 2012 20:58:40 +0000
Subject: [PATCH 3254/6849] lua: remove 3 sub-options, always install all

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/Config.in | 18 ------------------
 package/lua/lua.mk    | 18 +-----------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/package/lua/Config.in b/package/lua/Config.in
index 76359c0df5..8233e2a69b 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -7,29 +7,11 @@ config BR2_PACKAGE_LUA
 
 if BR2_PACKAGE_LUA
 
-config BR2_PACKAGE_LUA_COMPILER
-	bool "lua compiler"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
-	help
-	  Install luac binary
-
-config BR2_PACKAGE_LUA_INTERPRETER
-	bool "lua interpreter"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
-	help
-	  Install lua binary
-
 config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	bool "readline support"
-	depends on BR2_PACKAGE_LUA_INTERPRETER
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_NCURSES
 	help
 	  Enables command-line editing in the lua interpreter.
 
-config BR2_PACKAGE_LUA_SHARED_LIBRARY
-	bool "shared library"
-	help
-	  Install shared liblua.so
-
 endif
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index de60c57e88..4704e4caac 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -10,11 +10,7 @@ LUA_INSTALL_STAGING = YES
 LUA_LICENSE = MIT
 LUA_LICENSE_FILES = COPYRIGHT
 
-LUA_CFLAGS = -Wall
-ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
-	LUA_CFLAGS += -fPIC
-endif
-
+LUA_CFLAGS = -Wall -fPIC
 LUA_MYLIBS += -ldl
 
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
@@ -46,13 +42,11 @@ define HOST_LUA_BUILD_CMDS
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef
 
-ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_STAGING_SHARED_LIB
 	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
 		$(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
 	ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
 endef
-endif
 
 define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
@@ -66,29 +60,19 @@ define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
 endef
 
-ifeq ($(BR2_PACKAGE_LUA_INTERPRETER),y)
 define LUA_INSTALL_INTERPRETER
 	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
 endef
-endif
 
-ifeq ($(BR2_PACKAGE_LUA_COMPILER),y)
 define LUA_INSTALL_COMPILER
 	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
 endef
-endif
 
-ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_LIBRARY
 	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
 		$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
 	ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
 	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endef
-else
-define LUA_INSTALL_LIBRARY
-	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endef
 endif
 
 ifeq ($(BR2_HAVE_DEVFILES),y)

From 53adfc5f4976704d426681a0404c1643db009552 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 3 Sep 2012 20:58:41 +0000
Subject: [PATCH 3255/6849] lua: refactor without useless define's

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/lua.mk | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 4704e4caac..9e0d38764c 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -42,39 +42,21 @@ define HOST_LUA_BUILD_CMDS
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef
 
-define LUA_INSTALL_STAGING_SHARED_LIB
-	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
-		$(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
-	ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
-endef
-
 define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
-	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
 	$(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua
 	$(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac
+	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
+		$(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
+	ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
 	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h
 	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h
 	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h
 	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
 endef
 
-define LUA_INSTALL_INTERPRETER
-	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
-endef
-
-define LUA_INSTALL_COMPILER
-	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
-endef
-
-define LUA_INSTALL_LIBRARY
-	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
-		$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
-	ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
-	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endif
-
 ifeq ($(BR2_HAVE_DEVFILES),y)
 define LUA_INSTALL_DEVFILES
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
@@ -86,10 +68,14 @@ define LUA_INSTALL_DEVFILES
 endef
 endif
 
+
 define LUA_INSTALL_TARGET_CMDS
-	$(LUA_INSTALL_INTERPRETER)
-	$(LUA_INSTALL_COMPILER)
-	$(LUA_INSTALL_LIBRARY)
+	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
+	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
+	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
+		$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
+	ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
 	$(LUA_INSTALL_DEVFILES)
 endef
 

From 44c04a2b4aa998e9c52c4d30f45b1ded933b966a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 03:53:48 +0000
Subject: [PATCH 3256/6849] arch: improve definition of gcc mtune, mcpu, etc.

As suggested by Yann E. Morin, there is a better way than our current
big Config.in.common to define the gcc mtune, mcpu, march,
etc. values. We can split the setting of those values in each
architecture file, which makes a lot more sense.

Therefore, the Config.in file now creates empty kconfig variables
BR2_ARCH, BR2_ENDIAN, BR2_GCC_TARGET_TUNE, BR2_GCC_TARGET_ARCH,
BR2_GCC_TARGET_ABI and BR2_GCC_TARGET_CPU. The values of those
variables are set by the individual Config.in.<arch> files. This is
possible because such files are now only conditionally included
depending on the top-level architecture that has been selected.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in            |  59 ++++++++-
 arch/Config.in.aarch64    |   5 +
 arch/Config.in.arm        |  52 ++++++++
 arch/Config.in.avr32      |   5 +
 arch/Config.in.bfin       |   6 +
 arch/Config.in.common     | 245 --------------------------------------
 arch/Config.in.m68k       |  21 ++++
 arch/Config.in.microblaze |  10 ++
 arch/Config.in.mips       |  25 ++++
 arch/Config.in.powerpc    |  45 +++++++
 arch/Config.in.sh         |  17 +++
 arch/Config.in.sparc      |  31 +++++
 arch/Config.in.x86        |  89 ++++++++++++++
 13 files changed, 361 insertions(+), 249 deletions(-)
 create mode 100644 arch/Config.in.aarch64
 create mode 100644 arch/Config.in.avr32
 delete mode 100644 arch/Config.in.common
 create mode 100644 arch/Config.in.m68k
 create mode 100644 arch/Config.in.microblaze

diff --git a/arch/Config.in b/arch/Config.in
index 4d1f81f598..b326cb5abf 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -147,15 +147,66 @@ config BR2_x86_64
 
 endchoice
 
-config BR2_microblaze
-	bool
-	default y if BR2_microblazeel || BR2_microblazebe
+# The following string values are defined by the individual
+# Config.in.$ARCH files
+config BR2_ARCH
+	string
 
+config BR2_ENDIAN
+	string
+
+config BR2_GCC_TARGET_TUNE
+	string
+
+config BR2_GCC_TARGET_ARCH
+	string
+
+config BR2_GCC_TARGET_ABI
+	string
+
+config BR2_GCC_TARGET_CPU
+	string
+
+if BR2_arm || BR2_armeb
 source "arch/Config.in.arm"
+endif
+
+if BR2_aarch64
+source "arch/Config.in.aarch64"
+endif
+
+if BR2_avr32
+source "arch/Config.in.avr32"
+endif
+
+if BR2_bfin
 source "arch/Config.in.bfin"
+endif
+
+if BR2_m68k
+source "arch/Config.in.m68k"
+endif
+
+if BR2_microblazeel || BR2_microblazebe
+source "arch/Config.in.microblaze"
+endif
+
+if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
+endif
+
+if BR2_powerpc
 source "arch/Config.in.powerpc"
+endif
+
+if BR2_sh || BR2_sh64
 source "arch/Config.in.sh"
+endif
+
+if BR2_sparc
 source "arch/Config.in.sparc"
+endif
+
+if BR2_i386 || BR2_x86_64
 source "arch/Config.in.x86"
-source "arch/Config.in.common"
+endif
diff --git a/arch/Config.in.aarch64 b/arch/Config.in.aarch64
new file mode 100644
index 0000000000..4c68a378c2
--- /dev/null
+++ b/arch/Config.in.aarch64
@@ -0,0 +1,5 @@
+config BR2_ARCH
+	default "aarch64"	if BR2_aarch64
+
+config BR2_ENDIAN
+	default "LITTLE"
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 8d9db3cf07..2acedc476c 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -60,3 +60,55 @@ config BR2_ARM_OABI
 	depends on !BR2_GCC_VERSION_4_7_X
 endchoice
 
+config BR2_ARCH
+	default "arm"	if BR2_arm
+	default "armeb"	if BR2_armeb
+
+config BR2_ENDIAN
+	default "LITTLE" if BR2_arm
+	default "BIG"	 if BR2_armeb
+
+config BR2_GCC_TARGET_TUNE
+	default arm600		if BR2_arm600
+	default arm610		if BR2_arm610
+	default arm620		if BR2_arm620
+	default arm7tdmi	if BR2_arm7tdmi
+	default arm7tdmi	if BR2_arm720t
+	default arm7tdmi	if BR2_arm740t
+	default arm920		if BR2_arm920
+	default arm920t		if BR2_arm920t
+	default arm922t		if BR2_arm922t
+	default arm926ej-s	if BR2_arm926t
+	default arm1136j-s	if BR2_arm1136j_s
+	default arm1136jf-s	if BR2_arm1136jf_s
+	default arm1176jz-s	if BR2_arm1176jz_s
+	default arm1176jzf-s	if BR2_arm1176jzf_s
+	default cortex-a8	if BR2_cortex_a8
+	default cortex-a9	if BR2_cortex_a9
+	default strongarm110	if BR2_sa110
+	default strongarm1100	if BR2_sa1100
+	default xscale		if BR2_xscale
+	default iwmmxt		if BR2_iwmmxt
+
+config BR2_GCC_TARGET_ARCH
+	default armv4t		if BR2_arm7tdmi
+	default armv3		if BR2_arm610
+	default armv3		if BR2_arm710
+	default armv4t		if BR2_arm720t
+	default armv4t		if BR2_arm920t
+	default armv4t		if BR2_arm922t
+	default armv5te		if BR2_arm926t
+	default armv5t		if BR2_arm10t
+	default armv6j		if BR2_arm1136jf_s
+	default armv6zk		if BR2_arm1176jz_s
+	default armv6zk		if BR2_arm1176jzf_s
+	default armv7-a		if BR2_cortex_a8
+	default armv7-a		if BR2_cortex_a9
+	default armv4		if BR2_sa110
+	default armv4		if BR2_sa1100
+	default armv5te		if BR2_xscale
+	default iwmmxt		if BR2_iwmmxt
+
+config BR2_GCC_TARGET_ABI
+	default apcs-gnu	if BR2_ARM_OABI
+	default aapcs-linux	if BR2_ARM_EABI
diff --git a/arch/Config.in.avr32 b/arch/Config.in.avr32
new file mode 100644
index 0000000000..ebf8454150
--- /dev/null
+++ b/arch/Config.in.avr32
@@ -0,0 +1,5 @@
+config BR2_ARCH
+       default "avr32"
+
+config BR2_ENDIAN
+       default "BIG"
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index 1823bde811..0b137ae8e8 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -8,3 +8,9 @@ config BR2_BFIN_FLAT
 	bool "FLAT"
 	select BR2_PREFER_STATIC_LIB
 endchoice
+
+config BR2_ARCH
+	default "bfin"
+
+config BR2_ENDIAN
+        default "LITTLE"
diff --git a/arch/Config.in.common b/arch/Config.in.common
deleted file mode 100644
index 1ed9929f0e..0000000000
--- a/arch/Config.in.common
+++ /dev/null
@@ -1,245 +0,0 @@
-config BR2_ARCH
-	string
-	default "arm"		if BR2_arm
-	default "armeb"		if BR2_armeb
-	default "aarch64"       if BR2_aarch64
-	default "avr32"		if BR2_avr32
-	default "bfin"		if BR2_bfin
-	default "i386"		if BR2_x86_i386
-	default "i486"		if BR2_x86_i486
-	default "i586"		if BR2_x86_i586
-	default "i586"		if BR2_x86_pentium_mmx
-	default "i586"		if BR2_x86_geode
-	default "i586"		if BR2_x86_c3
-	default "i686"		if BR2_x86_c32
-	default "i586"		if BR2_x86_winchip_c6
-	default "i586"		if BR2_x86_winchip2
-	default "i686"		if BR2_x86_i686
-	default "i686"		if BR2_x86_pentium2
-	default "i686"		if BR2_x86_pentium3
-	default "i686"		if BR2_x86_pentium4
-	default "i686"		if BR2_x86_pentium_m
-	default "i686"		if BR2_x86_pentiumpro
-	default "i686"		if BR2_x86_prescott
-	default "i686"		if BR2_x86_nocona && BR2_i386
-	default "i686"		if BR2_x86_core2 && BR2_i386
-	default "i686"		if BR2_x86_atom && BR2_i386
-	default "i686"		if BR2_x86_opteron && BR2_i386
-	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
-	default "i686"		if BR2_x86_barcelona && BR2_i386
-	default "i686"		if BR2_x86_k6
-	default "i686"		if BR2_x86_k6_2
-	default "i686"		if BR2_x86_athlon
-	default "i686"		if BR2_x86_athlon_4
-	default "x86_64"	if BR2_x86_64
-	default "m68k"		if BR2_m68k
-	default "microblaze"	if BR2_microblaze
-	default "mips"		if BR2_mips
-	default "mipsel"	if BR2_mipsel
-	default "mips64"	if BR2_mips64
-	default "mips64el"	if BR2_mips64el
-	default "powerpc"	if BR2_powerpc
-	default "sh2"		if BR2_sh2
-	default "sh2a"		if BR2_sh2a
-	default "sh3"		if BR2_sh3
-	default "sh3eb"		if BR2_sh3eb
-	default "sh4"		if BR2_sh4
-	default "sh4eb"		if BR2_sh4eb
-	default "sh4a"		if BR2_sh4a
-	default "sh4aeb"	if BR2_sh4aeb
-	default "sh64"		if BR2_sh64
-	default "sparc"		if BR2_sparc
-
-
-config BR2_ENDIAN
-	string
-	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || BR2_mips64el || \
-			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64 || \
-			    BR2_microblazeel
-	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || BR2_mips64 || \
-			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \
-			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc || \
-			    BR2_microblazebe
-
-config BR2_GCC_TARGET_TUNE
-	string
-	default i386		if BR2_x86_i386
-	default i486		if BR2_x86_i486
-	default i586		if BR2_x86_i586
-	default pentium-mmx	if BR2_x86_pentium_mmx
-	default i686		if BR2_x86_i686
-	default pentiumpro	if BR2_x86_pentiumpro
-	default pentium-m	if BR2_x86_pentium_m
-	default pentium2	if BR2_x86_pentium2
-	default pentium3	if BR2_x86_pentium3
-	default pentium4	if BR2_x86_pentium4
-	default prescott	if BR2_x86_prescott
-	default nocona		if BR2_x86_nocona
-	default core2		if BR2_x86_core2
-	default atom		if BR2_x86_atom
-	default k8		if BR2_x86_opteron
-	default k8-sse3		if BR2_x86_opteron_sse3
-	default barcelona	if BR2_x86_barcelona
-	default k6		if BR2_x86_k6
-	default k6-2		if BR2_x86_k6_2
-	default athlon		if BR2_x86_athlon
-	default athlon-4	if BR2_x86_athlon_4
-	default winchip-c6	if BR2_x86_winchip_c6
-	default winchip2	if BR2_x86_winchip2
-	default c3		if BR2_x86_c3
-	default c3-2		if BR2_x86_c32
-	default geode		if BR2_x86_geode
-	default generic		if BR2_x86_generic
-	default arm600		if BR2_arm600
-	default arm610		if BR2_arm610
-	default arm620		if BR2_arm620
-	default arm7tdmi	if BR2_arm7tdmi
-	default arm7tdmi	if BR2_arm720t
-	default arm7tdmi	if BR2_arm740t
-	default arm920		if BR2_arm920
-	default arm920t		if BR2_arm920t
-	default arm922t		if BR2_arm922t
-	default arm926ej-s	if BR2_arm926t
-	default arm1136j-s	if BR2_arm1136j_s
-	default arm1136jf-s	if BR2_arm1136jf_s
-	default arm1176jz-s	if BR2_arm1176jz_s
-	default arm1176jzf-s	if BR2_arm1176jzf_s
-	default cortex-a8	if BR2_cortex_a8
-	default cortex-a9	if BR2_cortex_a9
-	default strongarm110	if BR2_sa110
-	default strongarm1100	if BR2_sa1100
-	default xscale		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
-	default mips1		if BR2_mips_1
-	default mips2		if BR2_mips_2
-	default mips3		if BR2_mips_3
-	default mips4		if BR2_mips_4
-	default mips32		if BR2_mips_32
-	default mips32r2	if BR2_mips_32r2
-	default mips64		if BR2_mips_64
-	default mips64r2	if BR2_mips_64r2
-	default 401		if BR2_powerpc_401
-	default 403		if BR2_powerpc_403
-	default 405		if BR2_powerpc_405
-	default 405fp		if BR2_powerpc_405fp
-	default 440		if BR2_powerpc_440
-	default 440fp		if BR2_powerpc_440fp
-	default 505		if BR2_powerpc_505
-	default 601		if BR2_powerpc_601
-	default 602		if BR2_powerpc_602
-	default 603		if BR2_powerpc_603
-	default 603e		if BR2_powerpc_603e
-	default 604		if BR2_powerpc_604
-	default 604e		if BR2_powerpc_604e
-	default 620		if BR2_powerpc_620
-	default 630		if BR2_powerpc_630
-	default 740		if BR2_powerpc_740
-	default 7400		if BR2_powerpc_7400
-	default 7450		if BR2_powerpc_7450
-	default 750		if BR2_powerpc_750
-	default 801		if BR2_powerpc_801
-	default 821		if BR2_powerpc_821
-	default 823		if BR2_powerpc_823
-	default 860		if BR2_powerpc_860
-	default 970		if BR2_powerpc_970
-	default 8540		if BR2_powerpc_8540
-	default	8548		if BR2_powerpc_8548
-	default e300c2		if BR2_powerpc_e300c2
-	default e300c3		if BR2_powerpc_e300c3
-	default e500mc		if BR2_powerpc_e500mc
-	default v7		if BR2_sparc_v7
-	default cypress		if BR2_sparc_cypress
-	default v8		if BR2_sparc_v8
-	default supersparc	if BR2_sparc_supersparc
-	default hypersparc	if BR2_sparc_hypersparc
-	default sparclite	if BR2_sparc_sparclite
-	default f930		if BR2_sparc_f930
-	default f934		if BR2_sparc_f934
-	default sparclite86x	if BR2_sparc_sparclite86x
-	default sparclet	if BR2_sparc_sparclet
-	default tsc701		if BR2_sparc_tsc701
-	default v9		if BR2_sparc_v9
-	default v9		if BR2_sparc_v9a
-	default v9		if BR2_sparc_v9b
-	default ultrasparc	if BR2_sparc_ultrasparc
-	default ultrasparc3	if BR2_sparc_ultrasparc3
-	default niagara		if BR2_sparc_niagara
-
-config BR2_GCC_TARGET_ARCH
-	string
-	default i386		if BR2_x86_i386
-	default i486		if BR2_x86_i486
-	default i586		if BR2_x86_i586
-	default pentium-mmx	if BR2_x86_pentium_mmx
-	default i686		if BR2_x86_i686
-	default pentiumpro	if BR2_x86_pentiumpro
-	default pentium-m	if BR2_x86_pentium_m
-	default pentium2	if BR2_x86_pentium2
-	default pentium3	if BR2_x86_pentium3
-	default pentium4	if BR2_x86_pentium4
-	default prescott	if BR2_x86_prescott
-	default nocona		if BR2_x86_nocona
-	default core2		if BR2_x86_core2
-	default atom		if BR2_x86_atom
-	default k8		if BR2_x86_opteron
-	default k8-sse3		if BR2_x86_opteron_sse3
-	default barcelona	if BR2_x86_barcelona
-	default k6		if BR2_x86_k6
-	default k6-2		if BR2_x86_k6_2
-	default athlon		if BR2_x86_athlon
-	default athlon-4	if BR2_x86_athlon_4
-	default winchip-c6	if BR2_x86_winchip_c6
-	default winchip2	if BR2_x86_winchip2
-	default c3		if BR2_x86_c3
-	default c3-2		if BR2_x86_c32
-	default geode		if BR2_x86_geode
-	default armv4t		if BR2_arm7tdmi
-	default armv3		if BR2_arm610
-	default armv3		if BR2_arm710
-	default armv4t		if BR2_arm720t
-	default armv4t		if BR2_arm920t
-	default armv4t		if BR2_arm922t
-	default armv5te		if BR2_arm926t
-	default armv5t		if BR2_arm10t
-	default armv6j		if BR2_arm1136jf_s
-	default armv6zk		if BR2_arm1176jz_s
-	default armv6zk		if BR2_arm1176jzf_s
-	default armv7-a		if BR2_cortex_a8
-	default armv7-a		if BR2_cortex_a9
-	default armv4		if BR2_sa110
-	default armv4		if BR2_sa1100
-	default armv5te		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
-
-config BR2_GCC_TARGET_ABI
-	string
-	default apcs-gnu	if BR2_ARM_OABI
-	default aapcs-linux	if BR2_ARM_EABI
-	default 32		if BR2_MIPS_OABI32
-	default n32		if BR2_MIPS_NABI32
-	default 64		if BR2_MIPS_NABI64
-	default altivec		if BR2_powerpc && BR2_PPC_ABI_altivec
-	default no-altivec	if BR2_powerpc && BR2_PPC_ABI_no-altivec
-	default spe		if BR2_powerpc && BR2_PPC_ABI_spe
-	default no-spe		if BR2_powerpc && BR2_PPC_ABI_no-spe
-	default ibmlongdouble	if BR2_powerpc && BR2_PPC_ABI_ibmlongdouble
-	default ieeelongdouble	if BR2_powerpc && BR2_PPC_ABI_ieeelongdouble
-
-config BR2_GCC_TARGET_CPU
-	string
-	default sparchfleon	if BR2_sparc_sparchfleon
-	default sparchfleonv8	if BR2_sparc_sparchfleonv8
-	default sparcsfleon	if BR2_sparc_sparcsfleon
-	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8
diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k
new file mode 100644
index 0000000000..b3d95b71ed
--- /dev/null
+++ b/arch/Config.in.m68k
@@ -0,0 +1,21 @@
+config BR2_ARCH
+	default "m68k"		if BR2_m68k
+
+config BR2_ENDIAN
+	default "BIG"
+
+config BR2_GCC_TARGET_TUNE
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
+
+config BR2_GCC_TARGET_ARCH
+	default 68000		if BR2_m68k_68000
+	default 68010		if BR2_m68k_68010
+	default 68020		if BR2_m68k_68020
+	default 68030		if BR2_m68k_68030
+	default 68040		if BR2_m68k_68040
+	default 68060		if BR2_m68k_68060
diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze
new file mode 100644
index 0000000000..dbdd99a19b
--- /dev/null
+++ b/arch/Config.in.microblaze
@@ -0,0 +1,10 @@
+config BR2_ARCH
+	default "microblaze"
+
+config BR2_ENDIAN
+	default "LITTLE" if BR2_microblazeel
+	default "BIG"	 if BR2_microblazebe
+
+config BR2_microblaze
+	bool
+	default y if BR2_microblazeel || BR2_microblazebe
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 93a21bfaeb..c71c3f4704 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -51,3 +51,28 @@ config BR2_MIPS_NABI64
 	bool "n64"
 	depends on BR2_ARCH_IS_64
 endchoice
+
+config BR2_ARCH
+	default "mips"		if BR2_mips
+	default "mipsel"	if BR2_mipsel
+	default "mips64"	if BR2_mips64
+	default "mips64el"	if BR2_mips64el
+
+config BR2_ENDIAN
+	default "LITTLE"	if BR2_mipsel || BR2_mips64el
+	default "BIG" 	    	if BR2_mips || BR2_mips64
+
+config BR2_GCC_TARGET_TUNE
+	default mips1		if BR2_mips_1
+	default mips2		if BR2_mips_2
+	default mips3		if BR2_mips_3
+	default mips4		if BR2_mips_4
+	default mips32		if BR2_mips_32
+	default mips32r2	if BR2_mips_32r2
+	default mips64		if BR2_mips_64
+	default mips64r2	if BR2_mips_64r2
+
+config BR2_GCC_TARGET_ABI
+	default 32		if BR2_MIPS_OABI32
+	default n32		if BR2_MIPS_NABI32
+	default 64		if BR2_MIPS_NABI64
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 20b0b064d2..55c1651cfe 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -81,3 +81,48 @@ config BR2_powerpc_SPE
 	bool "SPE"
 	depends on BR2_powerpc_8540 || BR2_powerpc_8548
 endchoice
+
+config BR2_ARCH
+	default "powerpc"	if BR2_powerpc
+
+config BR2_ENDIAN
+	default "BIG"
+
+config BR2_GCC_TARGET_TUNE
+	default 401		if BR2_powerpc_401
+	default 403		if BR2_powerpc_403
+	default 405		if BR2_powerpc_405
+	default 405fp		if BR2_powerpc_405fp
+	default 440		if BR2_powerpc_440
+	default 440fp		if BR2_powerpc_440fp
+	default 505		if BR2_powerpc_505
+	default 601		if BR2_powerpc_601
+	default 602		if BR2_powerpc_602
+	default 603		if BR2_powerpc_603
+	default 603e		if BR2_powerpc_603e
+	default 604		if BR2_powerpc_604
+	default 604e		if BR2_powerpc_604e
+	default 620		if BR2_powerpc_620
+	default 630		if BR2_powerpc_630
+	default 740		if BR2_powerpc_740
+	default 7400		if BR2_powerpc_7400
+	default 7450		if BR2_powerpc_7450
+	default 750		if BR2_powerpc_750
+	default 801		if BR2_powerpc_801
+	default 821		if BR2_powerpc_821
+	default 823		if BR2_powerpc_823
+	default 860		if BR2_powerpc_860
+	default 970		if BR2_powerpc_970
+	default 8540		if BR2_powerpc_8540
+	default	8548		if BR2_powerpc_8548
+	default e300c2		if BR2_powerpc_e300c2
+	default e300c3		if BR2_powerpc_e300c3
+	default e500mc		if BR2_powerpc_e500mc
+
+config BR2_GCC_TARGET_ABI
+	default altivec		if BR2_PPC_ABI_altivec
+	default no-altivec	if BR2_PPC_ABI_no-altivec
+	default spe		if BR2_PPC_ABI_spe
+	default no-spe		if BR2_PPC_ABI_no-spe
+	default ibmlongdouble	if BR2_PPC_ABI_ibmlongdouble
+	default ieeelongdouble	if BR2_PPC_ABI_ieeelongdouble
diff --git a/arch/Config.in.sh b/arch/Config.in.sh
index 314c55ae98..cf70fd5ffc 100644
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -22,3 +22,20 @@ config BR2_sh4a
 config BR2_sh4aeb
 	bool "sh4aeb (SH4A big endian)"
 endchoice
+
+config BR2_ARCH
+	default "sh2"		if BR2_sh2
+	default "sh2a"		if BR2_sh2a
+	default "sh3"		if BR2_sh3
+	default "sh3eb"		if BR2_sh3eb
+	default "sh4"		if BR2_sh4
+	default "sh4eb"		if BR2_sh4eb
+	default "sh4a"		if BR2_sh4a
+	default "sh4aeb"	if BR2_sh4aeb
+	default "sh64"		if BR2_sh64
+
+config BR2_ENDIAN
+	default "LITTLE"	if BR2_sh3 || BR2_sh4 || BR2_sh4a || \
+				   BR2_x86_64 || BR2_sh64
+	default "BIG"		if BR2_sh2 || BR2_sh2a || BR2_sh3eb || \
+				   BR2_sh4eb || BR2_sh4aeb
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index 85e0833a0d..d810b75865 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -36,3 +36,34 @@ config BR2_sparc_sparclet
 config BR2_sparc_tsc701
 	bool "tsc701"
 endchoice
+
+config BR2_ARCH
+	default "sparc"	if BR2_sparc
+
+config BR2_ENDIAN
+	default "BIG"
+
+config BR2_GCC_TARGET_TUNE
+	default v7		if BR2_sparc_v7
+	default cypress		if BR2_sparc_cypress
+	default v8		if BR2_sparc_v8
+	default supersparc	if BR2_sparc_supersparc
+	default hypersparc	if BR2_sparc_hypersparc
+	default sparclite	if BR2_sparc_sparclite
+	default f930		if BR2_sparc_f930
+	default f934		if BR2_sparc_f934
+	default sparclite86x	if BR2_sparc_sparclite86x
+	default sparclet	if BR2_sparc_sparclet
+	default tsc701		if BR2_sparc_tsc701
+	default v9		if BR2_sparc_v9
+	default v9		if BR2_sparc_v9a
+	default v9		if BR2_sparc_v9b
+	default ultrasparc	if BR2_sparc_ultrasparc
+	default ultrasparc3	if BR2_sparc_ultrasparc3
+	default niagara		if BR2_sparc_niagara
+
+config BR2_GCC_TARGET_CPU
+	default sparchfleon	if BR2_sparc_sparchfleon
+	default sparchfleonv8	if BR2_sparc_sparchfleonv8
+	default sparcsfleon	if BR2_sparc_sparcsfleon
+	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index 4f32d7458d..ef29a71f25 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -144,3 +144,92 @@ config BR2_x86_winchip2
 	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
 endchoice
+
+config BR2_ARCH
+	default "i386"		if BR2_x86_i386
+	default "i486"		if BR2_x86_i486
+	default "i586"		if BR2_x86_i586
+	default "i586"		if BR2_x86_pentium_mmx
+	default "i586"		if BR2_x86_geode
+	default "i586"		if BR2_x86_c3
+	default "i686"		if BR2_x86_c32
+	default "i586"		if BR2_x86_winchip_c6
+	default "i586"		if BR2_x86_winchip2
+	default "i686"		if BR2_x86_i686
+	default "i686"		if BR2_x86_pentium2
+	default "i686"		if BR2_x86_pentium3
+	default "i686"		if BR2_x86_pentium4
+	default "i686"		if BR2_x86_pentium_m
+	default "i686"		if BR2_x86_pentiumpro
+	default "i686"		if BR2_x86_prescott
+	default "i686"		if BR2_x86_nocona && BR2_i386
+	default "i686"		if BR2_x86_core2 && BR2_i386
+	default "i686"		if BR2_x86_atom && BR2_i386
+	default "i686"		if BR2_x86_opteron && BR2_i386
+	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
+	default "i686"		if BR2_x86_barcelona && BR2_i386
+	default "i686"		if BR2_x86_k6
+	default "i686"		if BR2_x86_k6_2
+	default "i686"		if BR2_x86_athlon
+	default "i686"		if BR2_x86_athlon_4
+	default "x86_64"	if BR2_x86_64
+
+config BR2_ENDIAN
+	default "LITTLE"
+
+config BR2_GCC_TARGET_TUNE
+	default i386		if BR2_x86_i386
+	default i486		if BR2_x86_i486
+	default i586		if BR2_x86_i586
+	default pentium-mmx	if BR2_x86_pentium_mmx
+	default i686		if BR2_x86_i686
+	default pentiumpro	if BR2_x86_pentiumpro
+	default pentium-m	if BR2_x86_pentium_m
+	default pentium2	if BR2_x86_pentium2
+	default pentium3	if BR2_x86_pentium3
+	default pentium4	if BR2_x86_pentium4
+	default prescott	if BR2_x86_prescott
+	default nocona		if BR2_x86_nocona
+	default core2		if BR2_x86_core2
+	default atom		if BR2_x86_atom
+	default k8		if BR2_x86_opteron
+	default k8-sse3		if BR2_x86_opteron_sse3
+	default barcelona	if BR2_x86_barcelona
+	default k6		if BR2_x86_k6
+	default k6-2		if BR2_x86_k6_2
+	default athlon		if BR2_x86_athlon
+	default athlon-4	if BR2_x86_athlon_4
+	default winchip-c6	if BR2_x86_winchip_c6
+	default winchip2	if BR2_x86_winchip2
+	default c3		if BR2_x86_c3
+	default c3-2		if BR2_x86_c32
+	default geode		if BR2_x86_geode
+	default generic		if BR2_x86_generic
+
+config BR2_GCC_TARGET_ARCH
+	default i386		if BR2_x86_i386
+	default i486		if BR2_x86_i486
+	default i586		if BR2_x86_i586
+	default pentium-mmx	if BR2_x86_pentium_mmx
+	default i686		if BR2_x86_i686
+	default pentiumpro	if BR2_x86_pentiumpro
+	default pentium-m	if BR2_x86_pentium_m
+	default pentium2	if BR2_x86_pentium2
+	default pentium3	if BR2_x86_pentium3
+	default pentium4	if BR2_x86_pentium4
+	default prescott	if BR2_x86_prescott
+	default nocona		if BR2_x86_nocona
+	default core2		if BR2_x86_core2
+	default atom		if BR2_x86_atom
+	default k8		if BR2_x86_opteron
+	default k8-sse3		if BR2_x86_opteron_sse3
+	default barcelona	if BR2_x86_barcelona
+	default k6		if BR2_x86_k6
+	default k6-2		if BR2_x86_k6_2
+	default athlon		if BR2_x86_athlon
+	default athlon-4	if BR2_x86_athlon_4
+	default winchip-c6	if BR2_x86_winchip_c6
+	default winchip2	if BR2_x86_winchip2
+	default c3		if BR2_x86_c3
+	default c3-2		if BR2_x86_c32
+	default geode		if BR2_x86_geode

From d3bdb15f23d8ff911400c26fcb7b9d41fa0a648b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 03:53:49 +0000
Subject: [PATCH 3257/6849] uClibc: remove useless linuxthreads-errno-fix patch

This patch has since a long time been merged upstream in uClibc, so it
cannot apply on any of the recent uClibc snapshots.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libc.snapshot.linuxthreads-errno-fix.patch | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch

diff --git a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
deleted file mode 100644
index c4d0d00df9..0000000000
--- a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 5 Jul 2010 14:08:17 +0200
-Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
-
-Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
-
-__errno_location / __h_errno_location access has to go through the PLT
-like malloc/free, so the linuxthread variants gets used instead when
-compiling with -pthread.
-
-Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/netdb.h                               |    1 -
- libc/misc/internals/__errno_location.c        |    3 ---
- libc/misc/internals/__h_errno_location.c      |    1 -
- libc/sysdeps/linux/common/bits/errno.h        |    1 -
- 6 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/include/netdb.h b/include/netdb.h
-index 9d3807d..ac411ab 100644
---- a/include/netdb.h
-+++ b/include/netdb.h
-@@ -59,7 +59,6 @@ __BEGIN_DECLS
- 
- /* Function to get address of global `h_errno' variable.  */
- extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__h_errno_location)
- 
- /* Macros for accessing h_errno from inside libc.  */
- #ifdef _LIBC
-diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
-index 487a9c2..0620860 100644
---- a/libc/misc/internals/__errno_location.c
-+++ b/libc/misc/internals/__errno_location.c
-@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void)
- {
-     return &errno;
- }
--#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
--libc_hidden_weak(__errno_location)
--#endif
-diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
-index 213d398..235df4e 100644
---- a/libc/misc/internals/__h_errno_location.c
-+++ b/libc/misc/internals/__h_errno_location.c
-@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
- {
-     return &h_errno;
- }
--libc_hidden_weak(__h_errno_location)
-diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
-index 6e520fa..f4a9ebb 100644
---- a/libc/sysdeps/linux/common/bits/errno.h
-+++ b/libc/sysdeps/linux/common/bits/errno.h
-@@ -43,7 +43,6 @@
- # ifndef __ASSEMBLER__
- /* Function to get address of global `errno' variable.  */
- extern int *__errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__errno_location)
- 
- #  ifdef __UCLIBC_HAS_THREADS__
- /* When using threads, errno is a per-thread value.  */
--- 
-1.7.1
-

From 86f6987bf7bc1bd9eae3c2a9ffa427cc87da9bbd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 03:53:50 +0000
Subject: [PATCH 3258/6849] uClibc: update uClibc-snapshot.config to recent
 uClibcs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uClibc-snapshot.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index eb39df6eda..71fa4720e5 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -93,6 +93,7 @@ LDSO_PRELOAD_ENV_SUPPORT=y
 # LDSO_PRELINK_SUPPORT is not set
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set

From 75720db391376ef23b92e504c43f9972efd53141 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Thu, 15 Nov 2012 03:53:51 +0000
Subject: [PATCH 3259/6849] xtensa: add support for the Xtensa architecture

The Xtensa architecture had been removed because it required special
handling and depended on additional directories and files that became
obsolete over time. This change is more aligned to other architectures.

[Thomas: rebased on top of the "arch: improve definition of gcc mtune,
mcpu, etc." patch].

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in                            | 11 +++++++++++
 arch/Config.in.xtensa                     |  2 ++
 linux/Config.in                           |  3 ++-
 package/ltrace/Config.in                  |  1 +
 toolchain/Config.in                       |  2 +-
 toolchain/toolchain-buildroot/Config.in.2 |  4 +++-
 toolchain/toolchain-common.in             |  2 +-
 toolchain/uClibc/Config.in                |  5 +++--
 toolchain/uClibc/uclibc.mk                |  1 +
 9 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 arch/Config.in.xtensa

diff --git a/arch/Config.in b/arch/Config.in
index b326cb5abf..472b10c7b2 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -145,6 +145,13 @@ config BR2_x86_64
 	  architecture compatible microprocessor).
 	  http://en.wikipedia.org/wiki/X86_64
 
+config BR2_xtensa
+	bool "Xtensa"
+	help
+	  Xtensa is a Tensilica processor IP architecture.
+	  http://en.wikipedia.org/wiki/Xtensa
+	  http://www.tensilica.com/
+
 endchoice
 
 # The following string values are defined by the individual
@@ -210,3 +217,7 @@ endif
 if BR2_i386 || BR2_x86_64
 source "arch/Config.in.x86"
 endif
+
+if BR2_xtensa
+source "arch/Config.in.xtensa"
+endif
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
new file mode 100644
index 0000000000..66749eeb13
--- /dev/null
+++ b/arch/Config.in.xtensa
@@ -0,0 +1,2 @@
+config BR2_ARCH
+	default "xtensa"	if BR2_xtensa
diff --git a/linux/Config.in b/linux/Config.in
index 277ef0eb1d..29a21109e9 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -152,7 +152,8 @@ config BR2_LINUX_KERNEL_BZIMAGE
 
 config BR2_LINUX_KERNEL_ZIMAGE
 	bool "zImage"
-	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64
+	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || \
+		   BR2_sh || BR2_sh64 || BR2_xtensa
 
 config BR2_LINUX_KERNEL_APPENDED_ZIMAGE
 	bool "zImage with appended DT"
diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index a65ca481e7..4cce76748c 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
 	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
+	depends on !BR2_xtensa
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 29ed2f035b..7edf82b361 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -23,7 +23,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
-	depends on !BR2_microblaze && !BR2_aarch64
+	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 	help
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 956ec2fe2d..d27c9f35f5 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -68,7 +68,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI
+	default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !BR2_xtensa
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -82,6 +82,7 @@ choice
 
 	config BR2_PTHREADS
 		bool "linuxthreads"
+		depends on !BR2_xtensa
 	        select BR2_TOOLCHAIN_HAS_THREADS
 
 	config BR2_PTHREADS_OLD
@@ -94,6 +95,7 @@ choice
 		depends on !BR2_UCLIBC_VERSION_0_9_31
 		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
+		depends on !BR2_xtensa
 endchoice
 
 source "toolchain/elf2flt/Config.in"
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 4c2a28bf8f..9f11a3984c 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -93,7 +93,7 @@ config BR2_NEEDS_GETTEXT_IF_LOCALE
 	default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE)
 
 config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh
+	bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh || BR2_xtensa
 	default y if !BR2_bfin
 	help
 	  If your target has a MMU, you should say Y here.  If you
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index f46a415ac9..e47bc9bb09 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -12,14 +12,15 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_31
 		bool "uClibc 0.9.31.x"
+		depends on !BR2_xtensa
 
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
-		depends on !(BR2_avr32 || BR2_sh)
+		depends on !(BR2_avr32 || BR2_sh || BR2_xtensa)
 
 	config BR2_UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.x"
-		depends on !BR2_avr32
+		depends on !(BR2_avr32 || BR2_xtensa)
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 8cf59bce71..055267cbcb 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -38,6 +38,7 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
 		-e 's/sh[234].*/sh/' \
 		-e 's/mips.*/mips/' \
 		-e 's/cris.*/cris/' \
+		-e 's/xtensa.*/xtensa/' \
 ")
 
 UCLIBC_TARGET_ENDIAN:=$(call qstrip,$(BR2_ENDIAN))

From d8792a04ca0d8615424f7964155782b1206b5c8d Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Thu, 15 Nov 2012 03:53:52 +0000
Subject: [PATCH 3260/6849] xtensa: support configurable processor
 configurations

Xtensa is a configurable processor architecture, which allows to define
additional instructions and registers. The required variant specific
information for the toolchain is delivered in an 'overlay' file, which
needs to be 'untarred' to the corresponding directories after the
source is installed and patched.
This patch provides support for binutils, gcc, and gdb with a very
limited changes to the build scripts. These additions are only executed
for the Xtensa architecture and have no effect on other architectures.

[Thomas: rebased on top of the 'arch: improve definition of gcc mtune,
mcpu, etc.' patch, and changed 'Target ABI' to 'Target Architecture
Variant'].

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.xtensa           | 31 +++++++++++++++++++++++++++++++
 package/binutils/binutils.mk    |  9 +++++++++
 toolchain/gcc/gcc-uclibc-4.x.mk |  4 ++++
 toolchain/gdb/gdb.mk            |  4 ++++
 4 files changed, 48 insertions(+)

diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 66749eeb13..af66125cbd 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -1,2 +1,33 @@
+choice
+	prompt "Target Architecture Variant"
+	depends on BR2_xtensa
+	default BR2_xtensa_fsf
+config BR2_xtensa_custom
+	bool "Custom Xtensa processor configuration"
+config BR2_xtensa_fsf
+	bool "fsf - Default configuration"
+endchoice
+
+config BR2_xtensa_custom_name
+	string "Custom Xtensa processor configuration anme"
+	depends on BR2_xtensa_custom
+	default ""
+	help
+	  Name given to a custom Xtensa processor configuration.
+
+config BR2_xtensa_core_name
+	string
+	default BR2_xtensa_custom_name	if BR2_xtensa_custom
+	default ""			if BR2_xtensa_fsf
+
+config BR2_xtensa_overlay_dir
+	string "Overlay directory for custom configuration"
+	depends on BR2_xtensa_custom
+	default ""
+	help
+	  Provide a directory path that contains the overlay files
+	  for the custom configuration. The path is based on the
+	  buildroot top directory.
+
 config BR2_ARCH
 	default "xtensa"	if BR2_xtensa
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 6c51fc7868..82f8fd2346 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -68,5 +68,14 @@ define BINUTILS_INSTALL_TARGET_CMDS
 endef
 endif
 
+XTENSA_CORE_NAME = $(call qstrip, $(BR2_xtensa_core_name))
+ifneq ($(XTENSA_CORE_NAME),)
+define BINUTILS_XTENSA_PRE_PATCH
+	tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(XTENSA_CORE_NAME).tar \
+		-C $(@D) bfd include ld
+endef
+HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 1a075cc004..1710070edd 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -251,6 +251,10 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	rm -rf $(GCC_DIR)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
 	$(call CONFIG_UPDATE,$(@D))
+ifneq ($(call qstrip, $(BR2_xtensa_core_name)),)
+	tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip,\
+		$(BR2_xtensa_core_name)).tar -C $(@D) include
+endif
 	touch $@
 
 gcc-patched: $(GCC_DIR)/.patched
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 6b029a8c6d..dc305a63bf 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -25,6 +25,10 @@ gdb-unpacked: $(GDB_DIR)/.unpacked
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
 	mkdir -p $(GDB_DIR)
 	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
+ifneq ($(call qstrip, $(BR2_xtensa_core_name)),)
+	tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip, \
+		$(BR2_xtensa_core_name)).tar -C $(@D) bfd include gdb
+endif
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch
 endif

From 171075ed4fca754907d2c83800a7f383805196ec Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 03:53:53 +0000
Subject: [PATCH 3261/6849] arch: Config.in string configuration options must
 be quoted

Suggested by Yann E. Morin.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm     |  78 +++++++++++++++---------------
 arch/Config.in.m68k    |  24 +++++-----
 arch/Config.in.mips    |  22 ++++-----
 arch/Config.in.powerpc |  70 +++++++++++++--------------
 arch/Config.in.sparc   |  42 ++++++++--------
 arch/Config.in.x86     | 106 ++++++++++++++++++++---------------------
 6 files changed, 171 insertions(+), 171 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 2acedc476c..6e5d258cf2 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -69,46 +69,46 @@ config BR2_ENDIAN
 	default "BIG"	 if BR2_armeb
 
 config BR2_GCC_TARGET_TUNE
-	default arm600		if BR2_arm600
-	default arm610		if BR2_arm610
-	default arm620		if BR2_arm620
-	default arm7tdmi	if BR2_arm7tdmi
-	default arm7tdmi	if BR2_arm720t
-	default arm7tdmi	if BR2_arm740t
-	default arm920		if BR2_arm920
-	default arm920t		if BR2_arm920t
-	default arm922t		if BR2_arm922t
-	default arm926ej-s	if BR2_arm926t
-	default arm1136j-s	if BR2_arm1136j_s
-	default arm1136jf-s	if BR2_arm1136jf_s
-	default arm1176jz-s	if BR2_arm1176jz_s
-	default arm1176jzf-s	if BR2_arm1176jzf_s
-	default cortex-a8	if BR2_cortex_a8
-	default cortex-a9	if BR2_cortex_a9
-	default strongarm110	if BR2_sa110
-	default strongarm1100	if BR2_sa1100
-	default xscale		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
+	default "arm600"	if BR2_arm600
+	default "arm610"	if BR2_arm610
+	default "arm620"	if BR2_arm620
+	default "arm7tdmi"	if BR2_arm7tdmi
+	default "arm7tdmi"	if BR2_arm720t
+	default "arm7tdmi"	if BR2_arm740t
+	default "arm920"	if BR2_arm920
+	default "arm920t"	if BR2_arm920t
+	default "arm922t"	if BR2_arm922t
+	default "arm926ej-s"	if BR2_arm926t
+	default "arm1136j-s"	if BR2_arm1136j_s
+	default "arm1136jf-s"	if BR2_arm1136jf_s
+	default "arm1176jz-s"	if BR2_arm1176jz_s
+	default "arm1176jzf-s"	if BR2_arm1176jzf_s
+	default "cortex-a8"	if BR2_cortex_a8
+	default "cortex-a9"	if BR2_cortex_a9
+	default "strongarm110"	if BR2_sa110
+	default "strongarm1100"	if BR2_sa1100
+	default "xscale"	if BR2_xscale
+	default "iwmmxt"	if BR2_iwmmxt
 
 config BR2_GCC_TARGET_ARCH
-	default armv4t		if BR2_arm7tdmi
-	default armv3		if BR2_arm610
-	default armv3		if BR2_arm710
-	default armv4t		if BR2_arm720t
-	default armv4t		if BR2_arm920t
-	default armv4t		if BR2_arm922t
-	default armv5te		if BR2_arm926t
-	default armv5t		if BR2_arm10t
-	default armv6j		if BR2_arm1136jf_s
-	default armv6zk		if BR2_arm1176jz_s
-	default armv6zk		if BR2_arm1176jzf_s
-	default armv7-a		if BR2_cortex_a8
-	default armv7-a		if BR2_cortex_a9
-	default armv4		if BR2_sa110
-	default armv4		if BR2_sa1100
-	default armv5te		if BR2_xscale
-	default iwmmxt		if BR2_iwmmxt
+	default "armv4t"	if BR2_arm7tdmi
+	default "armv3"		if BR2_arm610
+	default "armv3"		if BR2_arm710
+	default "armv4t"	if BR2_arm720t
+	default "armv4t"	if BR2_arm920t
+	default "armv4t"	if BR2_arm922t
+	default "armv5te"	if BR2_arm926t
+	default "armv5t"	if BR2_arm10t
+	default "armv6j"	if BR2_arm1136jf_s
+	default "armv6zk"	if BR2_arm1176jz_s
+	default "armv6zk"	if BR2_arm1176jzf_s
+	default "armv7-a"	if BR2_cortex_a8
+	default "armv7-a"	if BR2_cortex_a9
+	default "armv4"		if BR2_sa110
+	default "armv4"		if BR2_sa1100
+	default "armv5te"	if BR2_xscale
+	default "iwmmxt"	if BR2_iwmmxt
 
 config BR2_GCC_TARGET_ABI
-	default apcs-gnu	if BR2_ARM_OABI
-	default aapcs-linux	if BR2_ARM_EABI
+	default "apcs-gnu"	if BR2_ARM_OABI
+	default "aapcs-linux"	if BR2_ARM_EABI
diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k
index b3d95b71ed..ba6cedf7d3 100644
--- a/arch/Config.in.m68k
+++ b/arch/Config.in.m68k
@@ -5,17 +5,17 @@ config BR2_ENDIAN
 	default "BIG"
 
 config BR2_GCC_TARGET_TUNE
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
+	default "68000"		if BR2_m68k_68000
+	default "68010"		if BR2_m68k_68010
+	default "68020"		if BR2_m68k_68020
+	default "68030"		if BR2_m68k_68030
+	default "68040"		if BR2_m68k_68040
+	default "68060"		if BR2_m68k_68060
 
 config BR2_GCC_TARGET_ARCH
-	default 68000		if BR2_m68k_68000
-	default 68010		if BR2_m68k_68010
-	default 68020		if BR2_m68k_68020
-	default 68030		if BR2_m68k_68030
-	default 68040		if BR2_m68k_68040
-	default 68060		if BR2_m68k_68060
+	default "68000"		if BR2_m68k_68000
+	default "68010"		if BR2_m68k_68010
+	default "68020"		if BR2_m68k_68020
+	default "68030"		if BR2_m68k_68030
+	default "68040"		if BR2_m68k_68040
+	default "68060"		if BR2_m68k_68060
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index c71c3f4704..1454fb4419 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -63,16 +63,16 @@ config BR2_ENDIAN
 	default "BIG" 	    	if BR2_mips || BR2_mips64
 
 config BR2_GCC_TARGET_TUNE
-	default mips1		if BR2_mips_1
-	default mips2		if BR2_mips_2
-	default mips3		if BR2_mips_3
-	default mips4		if BR2_mips_4
-	default mips32		if BR2_mips_32
-	default mips32r2	if BR2_mips_32r2
-	default mips64		if BR2_mips_64
-	default mips64r2	if BR2_mips_64r2
+	default "mips1"		if BR2_mips_1
+	default "mips2"		if BR2_mips_2
+	default "mips3"		if BR2_mips_3
+	default "mips4"		if BR2_mips_4
+	default "mips32"	if BR2_mips_32
+	default "mips32r2"	if BR2_mips_32r2
+	default "mips64"	if BR2_mips_64
+	default "mips64r2"	if BR2_mips_64r2
 
 config BR2_GCC_TARGET_ABI
-	default 32		if BR2_MIPS_OABI32
-	default n32		if BR2_MIPS_NABI32
-	default 64		if BR2_MIPS_NABI64
+	default "32"		if BR2_MIPS_OABI32
+	default "n32"		if BR2_MIPS_NABI32
+	default "64"		if BR2_MIPS_NABI64
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 55c1651cfe..693246b7c7 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -89,40 +89,40 @@ config BR2_ENDIAN
 	default "BIG"
 
 config BR2_GCC_TARGET_TUNE
-	default 401		if BR2_powerpc_401
-	default 403		if BR2_powerpc_403
-	default 405		if BR2_powerpc_405
-	default 405fp		if BR2_powerpc_405fp
-	default 440		if BR2_powerpc_440
-	default 440fp		if BR2_powerpc_440fp
-	default 505		if BR2_powerpc_505
-	default 601		if BR2_powerpc_601
-	default 602		if BR2_powerpc_602
-	default 603		if BR2_powerpc_603
-	default 603e		if BR2_powerpc_603e
-	default 604		if BR2_powerpc_604
-	default 604e		if BR2_powerpc_604e
-	default 620		if BR2_powerpc_620
-	default 630		if BR2_powerpc_630
-	default 740		if BR2_powerpc_740
-	default 7400		if BR2_powerpc_7400
-	default 7450		if BR2_powerpc_7450
-	default 750		if BR2_powerpc_750
-	default 801		if BR2_powerpc_801
-	default 821		if BR2_powerpc_821
-	default 823		if BR2_powerpc_823
-	default 860		if BR2_powerpc_860
-	default 970		if BR2_powerpc_970
-	default 8540		if BR2_powerpc_8540
-	default	8548		if BR2_powerpc_8548
-	default e300c2		if BR2_powerpc_e300c2
-	default e300c3		if BR2_powerpc_e300c3
-	default e500mc		if BR2_powerpc_e500mc
+	default "401"		if BR2_powerpc_401
+	default "403"		if BR2_powerpc_403
+	default "405"		if BR2_powerpc_405
+	default "405fp"		if BR2_powerpc_405fp
+	default "440"		if BR2_powerpc_440
+	default "440fp"		if BR2_powerpc_440fp
+	default "505"		if BR2_powerpc_505
+	default "601"		if BR2_powerpc_601
+	default "602"		if BR2_powerpc_602
+	default "603"		if BR2_powerpc_603
+	default "603e"		if BR2_powerpc_603e
+	default "604"		if BR2_powerpc_604
+	default "604e"		if BR2_powerpc_604e
+	default "620"		if BR2_powerpc_620
+	default "630"		if BR2_powerpc_630
+	default "740"		if BR2_powerpc_740
+	default "7400"		if BR2_powerpc_7400
+	default "7450"		if BR2_powerpc_7450
+	default "750"		if BR2_powerpc_750
+	default "801"		if BR2_powerpc_801
+	default "821"		if BR2_powerpc_821
+	default "823"		if BR2_powerpc_823
+	default "860"		if BR2_powerpc_860
+	default "970"		if BR2_powerpc_970
+	default "8540"		if BR2_powerpc_8540
+	default	"8548"		if BR2_powerpc_8548
+	default "e300c2"	if BR2_powerpc_e300c2
+	default "e300c3"	if BR2_powerpc_e300c3
+	default "e500mc"	if BR2_powerpc_e500mc
 
 config BR2_GCC_TARGET_ABI
-	default altivec		if BR2_PPC_ABI_altivec
-	default no-altivec	if BR2_PPC_ABI_no-altivec
-	default spe		if BR2_PPC_ABI_spe
-	default no-spe		if BR2_PPC_ABI_no-spe
-	default ibmlongdouble	if BR2_PPC_ABI_ibmlongdouble
-	default ieeelongdouble	if BR2_PPC_ABI_ieeelongdouble
+	default "altivec"		if BR2_PPC_ABI_altivec
+	default "no-altivec"		if BR2_PPC_ABI_no-altivec
+	default "spe"			if BR2_PPC_ABI_spe
+	default "no-spe"		if BR2_PPC_ABI_no-spe
+	default "ibmlongdouble"		if BR2_PPC_ABI_ibmlongdouble
+	default "ieeelongdouble"	if BR2_PPC_ABI_ieeelongdouble
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index d810b75865..e1f72cc7b3 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -44,26 +44,26 @@ config BR2_ENDIAN
 	default "BIG"
 
 config BR2_GCC_TARGET_TUNE
-	default v7		if BR2_sparc_v7
-	default cypress		if BR2_sparc_cypress
-	default v8		if BR2_sparc_v8
-	default supersparc	if BR2_sparc_supersparc
-	default hypersparc	if BR2_sparc_hypersparc
-	default sparclite	if BR2_sparc_sparclite
-	default f930		if BR2_sparc_f930
-	default f934		if BR2_sparc_f934
-	default sparclite86x	if BR2_sparc_sparclite86x
-	default sparclet	if BR2_sparc_sparclet
-	default tsc701		if BR2_sparc_tsc701
-	default v9		if BR2_sparc_v9
-	default v9		if BR2_sparc_v9a
-	default v9		if BR2_sparc_v9b
-	default ultrasparc	if BR2_sparc_ultrasparc
-	default ultrasparc3	if BR2_sparc_ultrasparc3
-	default niagara		if BR2_sparc_niagara
+	default "v7"		if BR2_sparc_v7
+	default "cypress"	if BR2_sparc_cypress
+	default "v8"		if BR2_sparc_v8
+	default "supersparc"	if BR2_sparc_supersparc
+	default "hypersparc"	if BR2_sparc_hypersparc
+	default "sparclite"	if BR2_sparc_sparclite
+	default "f930"		if BR2_sparc_f930
+	default "f934"		if BR2_sparc_f934
+	default "sparclite86x"	if BR2_sparc_sparclite86x
+	default "sparclet"	if BR2_sparc_sparclet
+	default "tsc701"	if BR2_sparc_tsc701
+	default "v9"		if BR2_sparc_v9
+	default "v9"		if BR2_sparc_v9a
+	default "v9"		if BR2_sparc_v9b
+	default "ultrasparc"	if BR2_sparc_ultrasparc
+	default "ultrasparc3"	if BR2_sparc_ultrasparc3
+	default "niagara"	if BR2_sparc_niagara
 
 config BR2_GCC_TARGET_CPU
-	default sparchfleon	if BR2_sparc_sparchfleon
-	default sparchfleonv8	if BR2_sparc_sparchfleonv8
-	default sparcsfleon	if BR2_sparc_sparcsfleon
-	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8
+	default "sparchfleon"	if BR2_sparc_sparchfleon
+	default "sparchfleonv8"	if BR2_sparc_sparchfleonv8
+	default "sparcsfleon"	if BR2_sparc_sparcsfleon
+	default "sparcsfleonv8"	if BR2_sparc_sparcsfleonv8
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index ef29a71f25..d2e080798c 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -178,58 +178,58 @@ config BR2_ENDIAN
 	default "LITTLE"
 
 config BR2_GCC_TARGET_TUNE
-	default i386		if BR2_x86_i386
-	default i486		if BR2_x86_i486
-	default i586		if BR2_x86_i586
-	default pentium-mmx	if BR2_x86_pentium_mmx
-	default i686		if BR2_x86_i686
-	default pentiumpro	if BR2_x86_pentiumpro
-	default pentium-m	if BR2_x86_pentium_m
-	default pentium2	if BR2_x86_pentium2
-	default pentium3	if BR2_x86_pentium3
-	default pentium4	if BR2_x86_pentium4
-	default prescott	if BR2_x86_prescott
-	default nocona		if BR2_x86_nocona
-	default core2		if BR2_x86_core2
-	default atom		if BR2_x86_atom
-	default k8		if BR2_x86_opteron
-	default k8-sse3		if BR2_x86_opteron_sse3
-	default barcelona	if BR2_x86_barcelona
-	default k6		if BR2_x86_k6
-	default k6-2		if BR2_x86_k6_2
-	default athlon		if BR2_x86_athlon
-	default athlon-4	if BR2_x86_athlon_4
-	default winchip-c6	if BR2_x86_winchip_c6
-	default winchip2	if BR2_x86_winchip2
-	default c3		if BR2_x86_c3
-	default c3-2		if BR2_x86_c32
-	default geode		if BR2_x86_geode
-	default generic		if BR2_x86_generic
+	default "i386"		if BR2_x86_i386
+	default "i486"		if BR2_x86_i486
+	default "i586"		if BR2_x86_i586
+	default "pentium-mmx"	if BR2_x86_pentium_mmx
+	default "i686"		if BR2_x86_i686
+	default "pentiumpro"	if BR2_x86_pentiumpro
+	default "pentium-m"	if BR2_x86_pentium_m
+	default "pentium2"	if BR2_x86_pentium2
+	default "pentium3"	if BR2_x86_pentium3
+	default "pentium4"	if BR2_x86_pentium4
+	default "prescott"	if BR2_x86_prescott
+	default "nocona"	if BR2_x86_nocona
+	default "core2"		if BR2_x86_core2
+	default "atom"		if BR2_x86_atom
+	default "k8"		if BR2_x86_opteron
+	default "k8-sse3"	if BR2_x86_opteron_sse3
+	default "barcelona"	if BR2_x86_barcelona
+	default "k6"		if BR2_x86_k6
+	default "k6-2"		if BR2_x86_k6_2
+	default "athlon"	if BR2_x86_athlon
+	default "athlon-4"	if BR2_x86_athlon_4
+	default "winchip-c6"	if BR2_x86_winchip_c6
+	default "winchip2"	if BR2_x86_winchip2
+	default "c3"		if BR2_x86_c3
+	default "c3-2"		if BR2_x86_c32
+	default "geode"		if BR2_x86_geode
+	default "generic"	if BR2_x86_generic
 
 config BR2_GCC_TARGET_ARCH
-	default i386		if BR2_x86_i386
-	default i486		if BR2_x86_i486
-	default i586		if BR2_x86_i586
-	default pentium-mmx	if BR2_x86_pentium_mmx
-	default i686		if BR2_x86_i686
-	default pentiumpro	if BR2_x86_pentiumpro
-	default pentium-m	if BR2_x86_pentium_m
-	default pentium2	if BR2_x86_pentium2
-	default pentium3	if BR2_x86_pentium3
-	default pentium4	if BR2_x86_pentium4
-	default prescott	if BR2_x86_prescott
-	default nocona		if BR2_x86_nocona
-	default core2		if BR2_x86_core2
-	default atom		if BR2_x86_atom
-	default k8		if BR2_x86_opteron
-	default k8-sse3		if BR2_x86_opteron_sse3
-	default barcelona	if BR2_x86_barcelona
-	default k6		if BR2_x86_k6
-	default k6-2		if BR2_x86_k6_2
-	default athlon		if BR2_x86_athlon
-	default athlon-4	if BR2_x86_athlon_4
-	default winchip-c6	if BR2_x86_winchip_c6
-	default winchip2	if BR2_x86_winchip2
-	default c3		if BR2_x86_c3
-	default c3-2		if BR2_x86_c32
-	default geode		if BR2_x86_geode
+	default "i386"		if BR2_x86_i386
+	default "i486"		if BR2_x86_i486
+	default "i586"		if BR2_x86_i586
+	default "pentium-mmx"	if BR2_x86_pentium_mmx
+	default "i686"		if BR2_x86_i686
+	default "pentiumpro"	if BR2_x86_pentiumpro
+	default "pentium-m"	if BR2_x86_pentium_m
+	default "pentium2"	if BR2_x86_pentium2
+	default "pentium3"	if BR2_x86_pentium3
+	default "pentium4"	if BR2_x86_pentium4
+	default "prescott"	if BR2_x86_prescott
+	default "nocona"	if BR2_x86_nocona
+	default "core2"		if BR2_x86_core2
+	default "atom"		if BR2_x86_atom
+	default "k8"		if BR2_x86_opteron
+	default "k8-sse3"	if BR2_x86_opteron_sse3
+	default "barcelona"	if BR2_x86_barcelona
+	default "k6"		if BR2_x86_k6
+	default "k6-2"		if BR2_x86_k6_2
+	default "athlon"	if BR2_x86_athlon
+	default "athlon-4"	if BR2_x86_athlon_4
+	default "winchip-c6"	if BR2_x86_winchip_c6
+	default "winchip2"	if BR2_x86_winchip2
+	default "c3"		if BR2_x86_c3
+	default "c3-2"		if BR2_x86_c32
+	default "geode"		if BR2_x86_geode

From 695c4bcebc6093f44d21117489bb72cc7c76c5af Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 12:43:01 +0000
Subject: [PATCH 3262/6849] tremor: force ARM mode when building to avoid
 Thumb2 build problems

Fixes:

  http://autobuild.buildroot.org/results/502b7d3f29d7982d56de2ae4a0b943315e04713b/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tremor/tremor.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index fceee1bdc8..cd1d32363b 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -12,4 +12,11 @@ TREMOR_AUTORECONF = YES
 TREMOR_INSTALL_STAGING = YES
 TREMOR_DEPENDENCIES = libogg
 
+# tremor has ARM assembly code that cannot be compiled in Thumb2 mode,
+# so we must force the traditional ARM mode.
+ifeq ($(BR2_arm),y)
+TREMOR_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) -marm"
+endif
+
 $(eval $(autotools-package))

From 6713fbd3301bcdca06c435f8b2ce1ac6664a096d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 06:13:14 +0000
Subject: [PATCH 3263/6849] support/gnuconfig: update config.{guess, sub} to a
 newer version

We need more recent versions of config.guess and config.sub in order
to support the aarch64 architecture. Otherwise, all autoconf packages
fail to build with failures like:

  http://autobuild.buildroot.org/results/abcdbe1aaf1c203c82dc3e4ec8c002b9b9e550e0/build-end.log

We take this opportunity to turn the config.* patches into proper Git
patches, and note which Git commit of the config.git repository we
used as the original source.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/gnuconfig/README.buildroot            |   5 +-
 support/gnuconfig/config.guess                |  74 +++++++---
 support/gnuconfig/config.sub                  | 138 ++++++++++++------
 ... 0001-config-add-support-for-uClibc.patch} |  73 ++++++---
 ... => 0002-config-add-support-for-ps2.patch} |  29 +++-
 5 files changed, 224 insertions(+), 95 deletions(-)
 rename support/gnuconfig/patches/{config.guess.uclibc.patch => 0001-config-add-support-for-uClibc.patch} (67%)
 rename support/gnuconfig/patches/{config.sub.ps2.patch => 0002-config-add-support-for-ps2.patch} (60%)

diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot
index 83a4e9cc96..5f96b3c230 100644
--- a/support/gnuconfig/README.buildroot
+++ b/support/gnuconfig/README.buildroot
@@ -17,9 +17,12 @@ GNU config is now managed in git, so to update:
 
 # git clone git://git.savannah.gnu.org/config.git
 # cp config/config.* .
-# for p in $(ls patches/*.patch); do patch -p0 < $p; done
+# for p in $(ls patches/*.patch); do patch -p1 < $p; done
 # rm -rf config
 
 A few local customizations are used to support uClibc so you may
 have to make sure they're still needed.  The patches are broken
 out in the patches/ dir to keep things simple.
+
+The current Buildroot version is based on the Git commit
+9582436dfae5755279f96898ce30bde28e4e69ea of the config.git repository.
diff --git a/support/gnuconfig/config.guess b/support/gnuconfig/config.guess
index 40cf0af79d..95091799ad 100755
--- a/support/gnuconfig/config.guess
+++ b/support/gnuconfig/config.guess
@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-02-02'
+timestamp='2012-09-25'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-02-02'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -162,7 +160,7 @@ fi
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -219,6 +217,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -321,7 +323,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -809,21 +811,26 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -878,6 +885,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -899,20 +913,29 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
 	eval $set_cc_for_build
@@ -953,7 +976,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -988,13 +1011,13 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1201,6 +1224,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1256,7 +1282,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1325,11 +1351,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
diff --git a/support/gnuconfig/config.sub b/support/gnuconfig/config.sub
index 8ad167cbc6..8509813dd6 100755
--- a/support/gnuconfig/config.sub
+++ b/support/gnuconfig/config.sub
@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-02-24'
+timestamp='2012-10-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-02-24'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +123,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -154,7 +156,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -223,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,20 +255,27 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx | dvp \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -286,22 +301,23 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -314,8 +330,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -325,6 +340,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -339,11 +369,13 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -352,12 +384,15 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -382,24 +417,26 @@ case $basic_machine in
 	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -697,7 +734,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -755,9 +791,13 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -812,10 +852,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -968,9 +1016,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1064,6 +1113,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1120,13 +1172,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1196,6 +1243,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1327,15 +1377,15 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1518,6 +1568,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1545,9 +1598,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
diff --git a/support/gnuconfig/patches/config.guess.uclibc.patch b/support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch
similarity index 67%
rename from support/gnuconfig/patches/config.guess.uclibc.patch
rename to support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch
index 85f9b89661..3627e8e050 100644
--- a/support/gnuconfig/patches/config.guess.uclibc.patch
+++ b/support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch
@@ -1,6 +1,18 @@
---- config.guess
-+++ config.guess
-@@ -140,6 +141,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+From eee83aa62993b15b7f460cca9583cd69a15b5357 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 15 Nov 2012 17:01:13 +0100
+Subject: [PATCH 1/2] config: add support for uClibc
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ config.guess |   70 ++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 43 insertions(+), 27 deletions(-)
+
+diff --git a/config.guess b/config.guess
+index 872b96a..9509179 100755
+--- a/config.guess
++++ b/config.guess
+@@ -138,6 +138,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -24,7 +36,21 @@
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -872,33 +890,32 @@ EOF
+@@ -869,11 +886,11 @@ EOF
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -886,15 +903,15 @@ EOF
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
  	esac
  	objdump --private-headers /bin/sh | grep -q ld.so.1
@@ -41,7 +67,9 @@
 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	else
- 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ 		| grep -q __ARM_PCS_VFP
+@@ -906,22 +923,21 @@ EOF
  	fi
  	exit ;;
      avr32*:Linux:*:*)
@@ -49,23 +77,27 @@
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      cris:Linux:*:*)
--	echo cris-axis-linux-gnu
-+	echo cris-axis-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  	exit ;;
      crisv32:Linux:*:*)
--	echo crisv32-axis-linux-gnu
-+	echo crisv32-axis-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  	exit ;;
      frv:Linux:*:*)
--	echo frv-unknown-linux-gnu
-+	echo frv-unknown-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      i*86:Linux:*:*)
 -	LIBC=gnu
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#ifdef __dietlibc__
-@@ -909,13 +926,13 @@ EOF
+@@ -932,13 +948,13 @@ EOF
  	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  	exit ;;
      ia64:Linux:*:*)
@@ -82,7 +114,7 @@
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -934,10 +951,10 @@ EOF
+@@ -957,10 +973,10 @@ EOF
  	#endif
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
@@ -90,12 +122,12 @@
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
      or32:Linux:*:*)
--	echo or32-unknown-linux-gnu
-+	echo or32-unknown-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      padre:Linux:*:*)
  	echo sparc-unknown-linux-gnu
-@@ -948,40 +965,40 @@ EOF
+@@ -971,40 +987,40 @@ EOF
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -131,15 +163,15 @@
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      tile*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-tilera-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      vax:Linux:*:*)
 -	echo ${UNAME_MACHINE}-dec-linux-gnu
 +	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
  	exit ;;
      x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
-+	echo x86_64-unknown-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      xtensa*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -147,3 +179,6 @@
  	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+-- 
+1.7.9.5
+
diff --git a/support/gnuconfig/patches/config.sub.ps2.patch b/support/gnuconfig/patches/0002-config-add-support-for-ps2.patch
similarity index 60%
rename from support/gnuconfig/patches/config.sub.ps2.patch
rename to support/gnuconfig/patches/0002-config-add-support-for-ps2.patch
index 57d09dcf2b..781b9588d6 100644
--- a/support/gnuconfig/patches/config.sub.ps2.patch
+++ b/support/gnuconfig/patches/0002-config-add-support-for-ps2.patch
@@ -1,15 +1,27 @@
---- config.sub
-+++ config.sub
-@@ -253,7 +253,7 @@ case $basic_machine in
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+From 144194fe916a14b630324c19f7b098109122bca2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 15 Nov 2012 17:01:25 +0100
+Subject: [PATCH 2/2] config: add support for ps2
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ config.sub |   22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/config.sub b/config.sub
+index 89b1286..8509813 100755
+--- a/config.sub
++++ b/config.sub
+@@ -265,7 +265,7 @@ case $basic_machine in
+ 	| be32 | be64 \
  	| bfin \
  	| c4x | clipper \
 -	| d10v | d30v | dlx | dsp16xx \
 +	| d10v | d30v | dlx | dsp16xx | dvp \
+ 	| epiphany \
  	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
-@@ -773,6 +773,24 @@ case $basic_machine in
+@@ -813,6 +813,24 @@ case $basic_machine in
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -34,7 +46,7 @@
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -1325,7 +1343,7 @@ case $os in
+@@ -1375,7 +1393,7 @@ case $os in
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -43,3 +55,6 @@
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
+-- 
+1.7.9.5
+

From f92a2371957caf4e72951d7c9e33438a6e105250 Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Date: Thu, 15 Nov 2012 07:41:35 +0000
Subject: [PATCH 3264/6849] grantlee: fix -lpthread build error

Fixing linking time error with certain toolchains. The issue caused by a missing explicit linking to
libpthread. The failed buildlog:
Linking CXX executable testgenerictypes_exec
/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libQtCore.so: undefined reference to symbol 'pthread_cancel'
/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: note: 'pthread_cancel' is defined in DSO /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0 so try adding it to the linker command line
/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
make[3]: *** [templates/tests/testgenerictypes_exec] Error 1
make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
make[2]: *** [templates/tests/CMakeFiles/testgenerictypes_exec.dir/all] Error 2
make[2]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
make: *** [/home/buildroot12git/output/build/grantlee-0.2.0/.stamp_built] Error

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rantlee-0.2.0-fix-lphread-link-error.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch

diff --git a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch b/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch
new file mode 100644
index 0000000000..7964fd0d1a
--- /dev/null
+++ b/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch
@@ -0,0 +1,42 @@
+From d46475b6bb9d99a4c5c95489be6c14d0d219d5f8 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Thu, 15 Nov 2012 17:00:39 +0100
+Subject: [PATCH] fix -lpthread build error
+
+Fixing linking time error with certain toolchains. The issue caused by a missing explicit linking to
+libpthread. The failed buildlog:
+Linking CXX executable testgenerictypes_exec
+/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libQtCore.so: undefined reference to symbol 'pthread_cancel'
+/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: note: 'pthread_cancel' is defined in DSO /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0 so try adding it to the linker command line
+/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0: could not read symbols: Invalid operation
+collect2: ld returned 1 exit status
+make[3]: *** [templates/tests/testgenerictypes_exec] Error 1
+make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
+make[2]: *** [templates/tests/CMakeFiles/testgenerictypes_exec.dir/all] Error 2
+make[2]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
+make[1]: *** [all] Error 2
+make[1]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
+make: *** [/home/buildroot12git/output/build/grantlee-0.2.0/.stamp_built] Error
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ templates/tests/CMakeLists.txt |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt
+index caab003..f400622 100644
+--- a/templates/tests/CMakeLists.txt
++++ b/templates/tests/CMakeLists.txt
+@@ -68,7 +68,8 @@ macro(GRANTLEE_TEMPLATES_UNIT_TESTS)
+                   ${_testresource_rcc_src}
+     )
+     add_test(${_testname} ${_testname}_exec )
+-    target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} grantlee_core )
++    find_package (Threads)
++    target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}  grantlee_core )
+ 
+     set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" )
+   endforeach(_testname)
+-- 
+1.7.9.5
+

From 75ed0f2effa939c59726e7c6478276da0b6f5b25 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 13 Nov 2012 02:56:31 +0000
Subject: [PATCH 3265/6849] libnfc: bump version

Note that libnfc has also switched from Subversion to Git.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnfc/libnfc.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index c343551c1d..b9ff583cf4 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -3,9 +3,9 @@
 # libnfc
 #
 #############################################################
-LIBNFC_VERSION = 1446
-LIBNFC_SITE = http://libnfc.googlecode.com/svn/trunk/
-LIBNFC_SITE_METHOD = svn
+LIBNFC_VERSION = fda8d60ce062
+LIBNFC_SITE = http://libnfc.googlecode.com/git/
+LIBNFC_SITE_METHOD = git
 LIBNFC_LICENSE = LGPLv3+
 LIBNFC_LICENSE_FILES = COPYING
 LIBNFC_AUTORECONF = YES

From 7319eaecbe075f67bb4f71d56c7cbe7f6a4776e5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 13 Nov 2012 02:56:49 +0000
Subject: [PATCH 3266/6849] libnfc-llcp: bump version

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnfc-llcp/libnfc-llcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnfc-llcp/libnfc-llcp.mk b/package/libnfc-llcp/libnfc-llcp.mk
index 57821c1cb6..0bff089e23 100644
--- a/package/libnfc-llcp/libnfc-llcp.mk
+++ b/package/libnfc-llcp/libnfc-llcp.mk
@@ -3,7 +3,7 @@
 # libnfc-llcp
 #
 #############################################################
-LIBNFC_LLCP_VERSION = 1090
+LIBNFC_LLCP_VERSION = 1103
 LIBNFC_LLCP_SITE = http://nfc-tools.googlecode.com/svn/trunk/libnfc-llcp/
 LIBNFC_LLCP_SITE_METHOD = svn
 LIBNFC_LLCP_DEPENDENCIES = libnfc

From a064238c3c0e5743e1f66353e620bd35399d6a76 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 13 Nov 2012 02:57:08 +0000
Subject: [PATCH 3267/6849] python-nfc: bump version

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-nfc/python-nfc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk
index 90f7c4648e..a053b2cb51 100644
--- a/package/python-nfc/python-nfc.mk
+++ b/package/python-nfc/python-nfc.mk
@@ -3,7 +3,7 @@
 # python-nfc
 #
 #############################################################
-PYTHON_NFC_VERSION = 112
+PYTHON_NFC_VERSION = 142
 PYTHON_NFC_SITE = https://launchpad.net/nfcpy
 PYTHON_NFC_SITE_METHOD = bzr
 PYTHON_NFC_DEPENDENCIES = python libusb libusb-compat

From 38c42da73e81ce2af168b88ed9e6edd99639a8af Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:34 +0000
Subject: [PATCH 3268/6849] qemu/x86: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-3.5.config => linux-3.6.config} | 0
 board/qemu/x86/readme.txt                             | 2 +-
 configs/qemu_x86_defconfig                            | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/x86/{linux-3.5.config => linux-3.6.config} (100%)

diff --git a/board/qemu/x86/linux-3.5.config b/board/qemu/x86/linux-3.6.config
similarity index 100%
rename from board/qemu/x86/linux-3.5.config
rename to board/qemu/x86/linux-3.6.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index f6f5437a71..3cca68253f 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 73c16a3160..90524b5242 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.6.config"

From 790c3f0ca2ec1e9d56051b131d2561d2519e619b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:35 +0000
Subject: [PATCH 3269/6849] qemu/x86_64: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86_64/{linux-3.5.config => linux-3.6.config} | 0
 board/qemu/x86_64/readme.txt                             | 2 +-
 configs/qemu_x86_64_defconfig                            | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/x86_64/{linux-3.5.config => linux-3.6.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.5.config b/board/qemu/x86_64/linux-3.6.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.5.config
rename to board/qemu/x86_64/linux-3.6.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index de50f3c4a4..791109cd62 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index b7dac33ffb..03cc5b3a50 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.6.config"

From 70a4131e624bd6a50bc2c425c87cbaadd5040735 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:36 +0000
Subject: [PATCH 3270/6849] qemu/sparc: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sparc-ss10/readme.txt  | 2 +-
 configs/qemu_sparc_ss10_defconfig | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 4c20702f38..e5a1d457f1 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 8818ad1e42..e13b610e9d 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,12 +6,12 @@ BR2_sparc_supersparc=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 0e35f3d4b8d32c1621c9604ba4e4dc7989045432 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:37 +0000
Subject: [PATCH 3271/6849] qemu/ppc-mpc8544ds: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/powerpc-mpc8544ds/readme.txt | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index 646f459df5..07a9e3bc8f 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index cc8b81a2a9..95218a70d0 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,13 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 

From 678ea5d8c940d0b92a3c6e58fe1dae91c4890e16 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:38 +0000
Subject: [PATCH 3272/6849] qemu/sh4-r2d: update to use kernel 3.2.33

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sh4-r2d/readme.txt  | 2 +-
 configs/qemu_sh4_r2d_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index c9b4a1035f..0eaf1cf014 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 2168853a5f..d766bc37df 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.33"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 033be287bb07b63e56c952beaf8a5acd18e53fa5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:39 +0000
Subject: [PATCH 3273/6849] qemu/ppc-g3beige: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{linux-3.3.config => linux-3.6.config}                | 0
 board/qemu/powerpc-g3beige/readme.txt                     | 2 ++
 configs/qemu_ppc_g3beige_defconfig                        | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-3.3.config => linux-3.6.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-3.3.config b/board/qemu/powerpc-g3beige/linux-3.6.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.3.config
rename to board/qemu/powerpc-g3beige/linux-3.6.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index a481b11dda..01f0baf8e0 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -4,3 +4,5 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
+
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 1e297e5aa7..420710b94e 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,15 +6,15 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_3=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.6.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 6fc80273b7c9b5289e0a8ef48f5d4c7851112862 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:40 +0000
Subject: [PATCH 3274/6849] qemu/arm-vexpress: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-vexpress/readme.txt  | 2 +-
 configs/qemu_arm_vexpress_defconfig | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index aeea842b8a..41a5f6714a 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 8ac7a07f5c..424a7c59e5 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -11,12 +11,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y

From b099efd367d5169a9af1c26f955e47db87ebd601 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:41 +0000
Subject: [PATCH 3275/6849] qemu/arm-versatile: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../arm-versatile/{linux-3.5.config => linux-3.6.config}  | 0
 board/qemu/arm-versatile/readme.txt                       | 2 ++
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.5.config => linux-3.6.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.5.config b/board/qemu/arm-versatile/linux-3.6.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.5.config
rename to board/qemu/arm-versatile/linux-3.6.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 2ca5dec512..78682048f0 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -4,3 +4,5 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
+
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 2037565690..85efa2b1ad 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.6.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 5072c2a8a1579dfc1c58efdfaa4f8d2f6f585d4f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:42 +0000
Subject: [PATCH 3276/6849] qemu/microblaze: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../microblazebe-mmu/{kernel-3.5.config => linux-3.6.config}  | 0
 board/qemu/microblazebe-mmu/readme.txt                        | 2 +-
 .../microblazeel-mmu/{kernel-3.5.config => linux-3.6.config}  | 0
 board/qemu/microblazeel-mmu/readme.txt                        | 2 +-
 configs/qemu_microblazebe_mmu_defconfig                       | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                       | 4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename board/qemu/microblazebe-mmu/{kernel-3.5.config => linux-3.6.config} (100%)
 rename board/qemu/microblazeel-mmu/{kernel-3.5.config => linux-3.6.config} (100%)

diff --git a/board/qemu/microblazebe-mmu/kernel-3.5.config b/board/qemu/microblazebe-mmu/linux-3.6.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/kernel-3.5.config
rename to board/qemu/microblazebe-mmu/linux-3.6.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 5281a0f184..889b561755 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/board/qemu/microblazeel-mmu/kernel-3.5.config b/board/qemu/microblazeel-mmu/linux-3.6.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/kernel-3.5.config
rename to board/qemu/microblazeel-mmu/linux-3.6.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 003d2a88de..9bc54409be 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 1d7be07afc..6ca7cc9aa9 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.6.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 941bc3049e..a4e13d226c 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.6.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"

From 53a4941b2ae41fff0c3c2503756baedf6dd892d3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:43 +0000
Subject: [PATCH 3277/6849] qemu/mips{el}-malta: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mips-malta/{linux-3.5.config => linux-3.6.config}     | 0
 board/qemu/mips-malta/readme.txt                          | 2 +-
 .../mipsel-malta/{linux-3.5.config => linux-3.6.config}   | 0
 board/qemu/mipsel-malta/readme.txt                        | 2 +-
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename board/qemu/mips-malta/{linux-3.5.config => linux-3.6.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.5.config => linux-3.6.config} (100%)

diff --git a/board/qemu/mips-malta/linux-3.5.config b/board/qemu/mips-malta/linux-3.6.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.5.config
rename to board/qemu/mips-malta/linux-3.6.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index 0288df5086..104c427823 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/board/qemu/mipsel-malta/linux-3.5.config b/board/qemu/mipsel-malta/linux-3.6.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.5.config
rename to board/qemu/mipsel-malta/linux-3.6.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 09ad500e61..d8a5847743 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.1.1
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 3bb2a72b4d..435b02d900 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.6.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 8208379c7a..42992d7e67 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.5 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_5=y
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.6.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 08e182523b1b9a073cda184dd040c1980ac54548 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 10:25:44 +0000
Subject: [PATCH 3278/6849] qemu/mips64-malta: update to use kernel 3.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mips64-malta/{linux-3.5.config => linux-3.6.config}    | 0
 board/qemu/mips64-malta/readme.txt                         | 4 ++++
 configs/qemu_mips64_malta_defconfig                        | 7 +++++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 rename board/qemu/mips64-malta/{linux-3.5.config => linux-3.6.config} (100%)

diff --git a/board/qemu/mips64-malta/linux-3.5.config b/board/qemu/mips64-malta/linux-3.6.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.5.config
rename to board/qemu/mips64-malta/linux-3.6.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 5087b01985..ad24b6ef8b 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -5,3 +5,7 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
+
+This configuration is known to be flaky.
+
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index c7e977ae8c..2c1192a142 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,12 +10,15 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.6.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From b566e8cb56b65d1b86f3502abf19d4f7304100bb Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 15 Nov 2012 12:07:28 +0000
Subject: [PATCH 3279/6849] manual: make clean target consistent with others in
 buildroot

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/manual.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index 1eaf73a5bd..fd9091eb66 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -38,10 +38,10 @@ $(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML)
 $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
 $(call GENDOC_INNER,$(1),text,txt,text,Text)
 $(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
-clean: clean-$(1)
-clean-$(1):
+clean: $(1)-clean
+$(1)-clean:
 	$(Q)$(RM) -rf $(O)/docs/$(1)
-.PHONY: $(1) clean-$(1)
+.PHONY: $(1) $(1)-clean
 endef
 
 MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)

From 17feaf00160de8f68b647092e0849e77866fb4dc Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:41 +0000
Subject: [PATCH 3280/6849] manual: set toc depth to 4 for html outputs

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/manual.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index fd9091eb66..d664603a65 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -33,8 +33,8 @@ endef
 # The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
 ################################################################################
 define GENDOC
-$(call GENDOC_INNER,$(1),xhtml,html,html,HTML)
-$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML)
+$(call GENDOC_INNER,$(1),xhtml,html,html,HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
+$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
 $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
 $(call GENDOC_INNER,$(1),text,txt,text,Text)
 $(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)

From 5e84b8b73cc32b307642917c70bc3186c1ffd69b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:42 +0000
Subject: [PATCH 3281/6849] manual: rework the whole documentation stub

The new skeleton of the manual as it has been thought:
1.  About Buildroot:
     Presentation of Buildroot
2.  Starting up:
     Everything to quickly and easily start working with Buildroot
3.  Working with Buildroot
     Basics to make your work fitting your needs
4.  Troubleshooting
5.  Going further in Buildroot's innards
     Explaination of how buildroot is organised, how it works, etc
6.  Developer Guidelines
7.  Getting involved
8.  Contibuting to Buildroot
9.  Legal notice
10. Appendix

It is easy to distinguish two parts in this plan:
- Sections 1 to 4 mainly address people starting with Buildroot
- Sections 5 to 10 are more focused on how to develop Buildroot itself

Most of the existing sections have just been moved in the hierarchy,
few were split and dispatch in, what i think was the relevant section,
and numerous others have been created.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt  |  8 +++++---
 docs/manual/adding-packages-cmake.txt      |  8 +++++---
 docs/manual/adding-packages-conclusion.txt |  4 +++-
 docs/manual/adding-packages-directory.txt  |  8 +++++---
 docs/manual/adding-packages-generic.txt    |  8 +++++---
 docs/manual/adding-packages-gettext.txt    |  4 +++-
 docs/manual/adding-packages.txt            |  6 ++++--
 docs/manual/advanced.txt                   | 12 ++++++++++++
 docs/manual/appendix.txt                   |  2 ++
 docs/manual/board-support.txt              |  5 ++++-
 docs/manual/ccache-support.txt             |  5 ++++-
 docs/manual/common-usage.txt               |  6 ++++++
 docs/manual/customize-busybox-config.txt   |  8 +++++---
 docs/manual/customize-kernel-config.txt    |  5 ++++-
 docs/manual/customize-rootfs.txt           |  5 ++++-
 docs/manual/customize-toolchain.txt        | 12 +++++++-----
 docs/manual/customize-uclibc-config.txt    |  6 ++++--
 docs/manual/customize.txt                  |  4 +++-
 docs/manual/developer-guide.txt            |  8 ++++++++
 docs/manual/download-location.txt          |  4 +++-
 docs/manual/external-toolchain.txt         |  6 ++++--
 docs/manual/getting.txt                    |  5 ++++-
 docs/manual/going-further.txt              |  6 ++++++
 docs/manual/how-buildroot-works.txt        |  4 +++-
 docs/manual/makedev-syntax.txt             |  2 ++
 docs/manual/manual.txt                     | 22 ++++++----------------
 docs/manual/rebuilding-packages.txt        |  4 +++-
 docs/manual/starting-up.txt                |  9 +++++++++
 docs/manual/using-buildroot-toolchain.txt  |  4 +++-
 docs/manual/using.txt                      |  7 +++----
 docs/manual/working-with.txt               | 21 +++++++++++++++++++++
 31 files changed, 160 insertions(+), 58 deletions(-)
 create mode 100644 docs/manual/advanced.txt
 create mode 100644 docs/manual/common-usage.txt
 create mode 100644 docs/manual/developer-guide.txt
 create mode 100644 docs/manual/going-further.txt
 create mode 100644 docs/manual/starting-up.txt
 create mode 100644 docs/manual/working-with.txt

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index b85b7af9f1..1184b69966 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -1,10 +1,12 @@
+// -*- mode:doc; -*-
+
 Infrastructure for autotools-based packages
--------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [[autotools-package-tutorial]]
 
 +autotools-package+ tutorial
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 First, let's see how to write a +.mk+ file for an autotools-based
 package, with an example :
@@ -64,7 +66,7 @@ package to be built.
 [[autotools-package-reference]]
 
 +autotools-package+ reference
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The main macro of the autotools package infrastructure is
 +autotools-package+. It is similar to the +generic-package+ macro. The ability to
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index da4984a525..81ac0a722d 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -1,10 +1,12 @@
+// -*- mode:doc; -*-
+
 Infrastructure for CMake-based packages
----------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [[cmake-package-tutorial]]
 
 +cmake-package+ tutorial
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 First, let's see how to write a +.mk+ file for a CMake-based package,
 with an example :
@@ -63,7 +65,7 @@ package to be built.
 [[cmake-package-reference]]
 
 +cmake-package+ reference
-~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The main macro of the CMake package infrastructure is
 +cmake-package+. It is similar to the +generic-package+ macro. The ability to
diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt
index 3475827275..ac20875ad5 100644
--- a/docs/manual/adding-packages-conclusion.txt
+++ b/docs/manual/adding-packages-conclusion.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Conclusion
-----------
+~~~~~~~~~~
 
 As you can see, adding a software package to Buildroot is simply a
 matter of writing a Makefile using an  existing example and modifying it
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 4a96415adb..6030e0852c 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Package directory
------------------
+~~~~~~~~~~~~~~~~~
 
 First of all, create a directory under the +package+ directory for
 your software, for example +libfoo+.
@@ -10,7 +12,7 @@ one of these categories, then create your package directory in these.
 
 
 +Config.in+ file
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 Then, create a file named +Config.in+. This file will contain the
 option descriptions related to our +libfoo+ software that will be used
@@ -146,7 +148,7 @@ so, the dependency also needs to be expressed in the +.mk+ file of the
 package.
 
 The +.mk+ file
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
 Finally, here's the hardest part. Create a file named +libfoo.mk+. It
 describes how the package should be downloaded, configured, built,
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 7ecdb91184..e3f16c25e1 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Infrastructure for packages with specific build systems
--------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 By 'packages with specific build systems' we mean all the packages
 whose build system is not one of the standard ones, such as
@@ -9,7 +11,7 @@ system is based on hand-written Makefiles or shell scripts.
 [[generic-package-tutorial]]
 
 +generic-package+ Tutorial
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ------------------------------
 01: #############################################################
@@ -90,7 +92,7 @@ Makefile code necessary to make your package working.
 [[generic-package-reference]]
 
 +generic-package+ Reference
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There are two variants of the generic target. The +generic-package+ macro is
 used for packages to be cross-compiled for the target.  The
diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt
index e0df1a412e..89461a7cd1 100644
--- a/docs/manual/adding-packages-gettext.txt
+++ b/docs/manual/adding-packages-gettext.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Gettext integration and interaction with packages
--------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Many packages that support internationalization use the gettext
 library. Dependencies for this library are fairly complicated and
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index f672ec625b..8221c855af 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -1,6 +1,8 @@
-Adding new packages to Buildroot
-================================
+// -*- mode:doc -*- ;
+
 [[adding-packages]]
+Adding new packages to Buildroot
+--------------------------------
 
 This section covers how new packages (userspace libraries or
 applications) can be integrated into Buildroot. It also shows how
diff --git a/docs/manual/advanced.txt b/docs/manual/advanced.txt
new file mode 100644
index 0000000000..cd53182ba5
--- /dev/null
+++ b/docs/manual/advanced.txt
@@ -0,0 +1,12 @@
+// -*- mode:doc; -*-
+
+Advanced usage
+--------------
+
+include::using-buildroot-toolchain.txt[]
+
+include::external-toolchain.txt[]
+
+include::ccache-support.txt[]
+
+include::download-location.txt[]
diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index f41c82cdbf..a6642b5cbb 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -1,3 +1,5 @@
+// -*- mode:doc; -*-
+
 Appendix
 ========
 
diff --git a/docs/manual/board-support.txt b/docs/manual/board-support.txt
index d1d9d63801..e20e72186d 100644
--- a/docs/manual/board-support.txt
+++ b/docs/manual/board-support.txt
@@ -1,5 +1,8 @@
+// -*- mode:doc -*- ;
+
+[[board-support]]
 Creating your own board support
-===============================
+-------------------------------
 
 Creating your own board support in Buildroot allows users of a
 particular hardware platform to easily build a system that is known to
diff --git a/docs/manual/ccache-support.txt b/docs/manual/ccache-support.txt
index ab8cbad1de..95cd662033 100644
--- a/docs/manual/ccache-support.txt
+++ b/docs/manual/ccache-support.txt
@@ -1,5 +1,8 @@
+// -*- mode:doc -*- ;
+
+[[ccache]]
 Using +ccache+ in Buildroot
-===========================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 http://ccache.samba.org[ccache] is a compiler cache. It stores the
 object files resulting from each compilation process, and is able to
diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt
new file mode 100644
index 0000000000..b3436063e4
--- /dev/null
+++ b/docs/manual/common-usage.txt
@@ -0,0 +1,6 @@
+// -*- mode:doc; -*-
+
+Daily use
+---------
+
+include::rebuilding-packages.txt[]
diff --git a/docs/manual/customize-busybox-config.txt b/docs/manual/customize-busybox-config.txt
index 60e6a55618..fe9cddaad5 100644
--- a/docs/manual/customize-busybox-config.txt
+++ b/docs/manual/customize-busybox-config.txt
@@ -1,6 +1,8 @@
-Customizing the Busybox configuration
--------------------------------------
+// -*- mode:doc -*- ;
+
 [[busybox-custom]]
+Customizing the Busybox configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 http://www.busybox.net/[Busybox] is very configurable, and you may
 want to customize it. You can follow these simple steps to do so. This
@@ -20,5 +22,5 @@ Otherwise, you can simply change the
 options you want to change, without using the configuration tool.
 
 If you want to use an existing config file for busybox, then see
-section xref:env-vars[].
+xref:env-vars[].
 
diff --git a/docs/manual/customize-kernel-config.txt b/docs/manual/customize-kernel-config.txt
index 6bafe46d71..107227040b 100644
--- a/docs/manual/customize-kernel-config.txt
+++ b/docs/manual/customize-kernel-config.txt
@@ -1,5 +1,8 @@
+// -*- mode:doc -*- ;
+
+[[kernel-custom]]
 Customizing the Linux kernel configuration
-------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Linux kernel configuration can be customized just like
 xref:busybox-custom[BusyBox] and xref:uclibc-custom[uClibc] using
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 44007c70ff..7ac5195541 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -1,5 +1,8 @@
+// -*- mode:doc -*- ;
+
+[[rootfs-custom]]
 Customizing the generated target filesystem
--------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 There are a few ways to customize the resulting target filesystem:
 
diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 08b60a264e..91657cf679 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -1,12 +1,14 @@
-Customizing the toolchain
--------------------------
+// -*- mode:doc -*- ;
+
 [[toolchain-custom]]
+Customizing the toolchain
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 There are three distinct types of toolchain backend supported in Buildroot,
 available under the menu +Toolchain+, invoking +make menuconfig+.
 
 Using the external toolchain backend
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There is no way of tuning an external toolchain since Buildroot does not
 generate it.
@@ -15,7 +17,7 @@ It also requires to set the Buildroot settings according to the toolchain ones
 (see xref:external-toolchain[]).
 
 Using the internal Buildroot toolchain backend
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The internal Buildroot toolchain backend *only* allows to generate
 *http://www.uclibc.org/[uClibc]-based toolchains*.
@@ -32,7 +34,7 @@ This is directly available after selecting the +Buildroot toolchain+ type in
 the menu +Toolchain+.
 
 Using the Crosstool-NG backend
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The http://crosstool-ng.org[crosstool-NG] toolchain backend enables a rather
 limited set of settings under the Buildroot +Toolchain+ menu (ie. when invoking
diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt
index e2e6799200..88121ea8ad 100644
--- a/docs/manual/customize-uclibc-config.txt
+++ b/docs/manual/customize-uclibc-config.txt
@@ -1,6 +1,8 @@
-Customizing the uClibc configuration
-------------------------------------
+// -*- mode:doc -*- ;
+
 [[uclibc-custom]]
+Customizing the uClibc configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Just like xref:busybox-custom[BusyBox], http://www.uclibc.org/[uClibc]
 offers a lot of configuration options. They allow you to select
diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt
index e8235dee86..1e6f4e85ac 100644
--- a/docs/manual/customize.txt
+++ b/docs/manual/customize.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Customization
-=============
+-------------
 
 include::customize-rootfs.txt[]
 
diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
new file mode 100644
index 0000000000..37f703d708
--- /dev/null
+++ b/docs/manual/developer-guide.txt
@@ -0,0 +1,8 @@
+// -*- mode:doc; -*-
+
+Developer Guidelines
+====================
+
+include::adding-packages.txt[]
+
+include::board-support.txt[]
diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
index cb6147f2bb..8c66a76dd0 100644
--- a/docs/manual/download-location.txt
+++ b/docs/manual/download-location.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Location of downloaded packages
-===============================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 It might be useful to know that the various tarballs that are
 downloaded by the Makefiles are all stored in the +DL_DIR+ which by
diff --git a/docs/manual/external-toolchain.txt b/docs/manual/external-toolchain.txt
index 62eb0a386f..b33737609f 100644
--- a/docs/manual/external-toolchain.txt
+++ b/docs/manual/external-toolchain.txt
@@ -1,6 +1,8 @@
-Using an external toolchain
-===========================
+// -*- mode:doc -*- ;
+
 [[external-toolchain]]
+Using an external toolchain
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Using an already existing toolchain is useful for different
 reasons:
diff --git a/docs/manual/getting.txt b/docs/manual/getting.txt
index 42ca0098d3..a51caa0e78 100644
--- a/docs/manual/getting.txt
+++ b/docs/manual/getting.txt
@@ -1,5 +1,8 @@
+// -*- mode:doc -*- ;
+
+[[getting-buildroot]]
 Getting Buildroot
-=================
+-----------------
 
 Buildroot releases are made approximately every 3 months. Direct Git
 access and daily snapshots are also available, if you want more
diff --git a/docs/manual/going-further.txt b/docs/manual/going-further.txt
new file mode 100644
index 0000000000..6f3cd6ec70
--- /dev/null
+++ b/docs/manual/going-further.txt
@@ -0,0 +1,6 @@
+Going further in Buildroot's innards
+====================================
+
+include::how-buildroot-works.txt[]
+
+include::advanced.txt[]
diff --git a/docs/manual/how-buildroot-works.txt b/docs/manual/how-buildroot-works.txt
index 481e5a480d..879cff3991 100644
--- a/docs/manual/how-buildroot-works.txt
+++ b/docs/manual/how-buildroot-works.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 How Buildroot works
-===================
+-------------------
 
 As mentioned above, Buildroot is basically a set of Makefiles that
 download, configure, and compile software with the correct options. It
diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt
index 4728c4bebc..4703b2f0ee 100644
--- a/docs/manual/makedev-syntax.txt
+++ b/docs/manual/makedev-syntax.txt
@@ -1,3 +1,5 @@
+// -*- mode:doc -*- ;
+
 [[makedev-syntax]]
 Makedev syntax documentation
 ----------------------------
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index de4b5949bc..00bd0372e5 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -1,3 +1,5 @@
+// -*- mode:doc; -*-
+
 The Buildroot user manual
 =========================
 :toc:
@@ -11,25 +13,13 @@ image::logo.png[]
 
 include::introduction.txt[]
 
-include::getting.txt[]
-
-include::using.txt[]
-
-include::customize.txt[]
-
-include::rebuilding-packages.txt[]
-
-include::how-buildroot-works.txt[]
-
-include::using-buildroot-toolchain.txt[]
-
-include::external-toolchain.txt[]
+include::starting-up.txt[]
 
-include::ccache-support.txt[]
+include::working-with.txt[]
 
-include::download-location.txt[]
+include::going-further.txt[]
 
-include::adding-packages.txt[]
+include::developer-guide.txt[]
 
 include::faq.txt[]
 
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index fb6d69646f..824b35c329 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc -*- ;
+
 Understanding how to rebuild packages
-=====================================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 One of the most common questions asked by Buildroot users is how to
 rebuild a given package or how to remove a package without rebuilding
diff --git a/docs/manual/starting-up.txt b/docs/manual/starting-up.txt
new file mode 100644
index 0000000000..8ba16c92b0
--- /dev/null
+++ b/docs/manual/starting-up.txt
@@ -0,0 +1,9 @@
+// -*- mode:doc; -*-
+
+Starting up
+===========
+
+include::getting.txt[]
+
+include::using.txt[]
+
diff --git a/docs/manual/using-buildroot-toolchain.txt b/docs/manual/using-buildroot-toolchain.txt
index 712e9a89ee..750fa99483 100644
--- a/docs/manual/using-buildroot-toolchain.txt
+++ b/docs/manual/using-buildroot-toolchain.txt
@@ -1,5 +1,7 @@
+// -*- mode:doc; -*-
+
 Using the generated toolchain outside Buildroot
-===============================================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You may want to compile, for your target, your own programs or other
 software that are not packaged in Buildroot. In order to do this you
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index fcbd24b850..5741473c07 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -1,8 +1,7 @@
-Using Buildroot
-===============
+// -*- mode:doc; -*-
 
-Configuration and general usage
--------------------------------
+Using Buildroot
+---------------
 
 Buildroot has a nice configuration tool similar to the one you can
 find in the http://www.kernel.org/[Linux kernel] or in
diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
new file mode 100644
index 0000000000..3c57504bd0
--- /dev/null
+++ b/docs/manual/working-with.txt
@@ -0,0 +1,21 @@
+// -*- mode:doc; -*-
+
+Working with Buildroot
+======================
+
+This section explains how you can customize Buildroot to fit your
+needs.
+
+include::customize.txt[]
+
+include::common-usage.txt[]
+
+Hacking Buildroot
+-----------------
+
+If Buildroot does not yet fit all your requirements, you may be
+interested in hacking it to add:
+
+* new packages: refer to the xref:adding-packages[Developer guide]
+
+* new board support: refer to the xref:board-support[Developer guide]

From 0119ef3778e33d71020d6c812c967d87e42d959a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:43 +0000
Subject: [PATCH 3282/6849] manual: rework introduction.txt and add
 embedded-basics.txt

Split and rephrasing of introduction.txt.

Cross-toolchain explainations moved from introduction.txt into
embedded-basics.txt.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/embedded-basics.txt | 110 ++++++++++++++++++++++++++++++++
 docs/manual/going-further.txt   |   4 ++
 docs/manual/introduction.txt    |  72 ++++-----------------
 3 files changed, 126 insertions(+), 60 deletions(-)
 create mode 100644 docs/manual/embedded-basics.txt

diff --git a/docs/manual/embedded-basics.txt b/docs/manual/embedded-basics.txt
new file mode 100644
index 0000000000..27dda37a0a
--- /dev/null
+++ b/docs/manual/embedded-basics.txt
@@ -0,0 +1,110 @@
+// -*- mode:doc; -*-
+
+Embedded system basics
+----------------------
+
+When developing an embedded system, there are a number of choices to
+do:
+
+* the cross-toolchain: target architecture/C library/...
+* the bootloader
+* kernel options
+* the device management
+* the init system
+* the package selection (busybox vs. "real" programs, ...)
+* ...
+
+Some of them may be influenced by the target hardware.
+
+Some of them may also add some constraints when you will develop the
+final application for what your target is designed (e.g. some
+functions may be provided by soem C libraries and missing in some
+others, ...). So, these choices should be carefully done.
+
+Buildroot allows to set most of these options to fit your needs.
+
+Moreover, Buildroot provides an infrastructure for reproducing the
+build process of your kernel, cross-toolchain, and embedded root
+filesystem. Being able to reproduce the build process will be useful
+when a component needs to be patched or updated or when another person
+is supposed to take over the project.
+
+[[cross-compilation-and-cross-toolchain]]
+Cross-compilation & cross-toolchain
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A compilation toolchain is the set of tools that allows you to compile
+code for your system. It consists of a compiler (in our case, +gcc+),
+binary utils like assembler and linker (in our case, +binutils+) and a
+C standard library (for example
+http://www.gnu.org/software/libc/libc.html[GNU Libc],
+http://www.uclibc.org/[uClibc] or
+http://www.fefe.de/dietlibc/[dietlibc]).
+
+The system installed on your development station certainly already has
+a compilation toolchain that you can use to compile an application
+that runs on your system. If you're using a PC, your compilation
+toolchain runs on an x86 processor and generates code for an x86
+processor. Under most Linux systems, the compilation toolchain uses
+the GNU libc (glibc) as the C standard library. This compilation
+toolchain is called the "host compilation toolchain". The machine on
+which it is running, and on which you're working, is called the "host
+system".
+
+The compilation toolchain is provided by your distribution, and
+Buildroot has nothing to do with it (other than using it to build a
+cross-compilation toolchain and other tools that are run on the
+development host).
+
+As said above, the compilation toolchain that comes with your system
+runs on and generates code for the processor in your host system. As
+your embedded system has a different processor, you need a
+cross-compilation toolchain - a compilation toolchain that runs on
+your _host system_ but generates code for your _target system_ (and
+target processor). For example, if your host system uses x86 and your
+target system uses ARM, the regular compilation toolchain on your host
+runs on x86 and generates code for x86, while the cross-compilation
+toolchain runs on x86 and generates code for ARM.
+
+Even if your embedded system uses an x86 processor, you might be
+interested in Buildroot for two reasons:
+
+* The compilation toolchain on your host certainly uses the GNU Libc
+  which is a complete but huge C standard library. Instead of using
+  GNU Libc on your target system, you can use uClibc which is a tiny C
+  standard library. If you want to use this C library, then you need a
+  compilation toolchain to generate binaries linked with it. Buildroot
+  can do that for you.
+
+* Buildroot automates the building of a root filesystem with all
+  needed tools like busybox. That makes it much easier than doing it
+  by hand.
+
+You might wonder why such a tool is needed when you can compile +gcc+,
++binutils+, +uClibc+ and all the other tools by hand. Of course doing
+so is possible but, dealing with all of the configure options and
+problems of every +gcc+ or +binutils+ version is very time-consuming
+and uninteresting.  Buildroot automates this process through the use
+of Makefiles and has a collection of patches for each +gcc+ and
++binutils+ version to make them work on most architectures.
+
+Buildroot offers a number of options and settings that can be tuned
+when defining the cross-toolchain (refer to xref:toolchain-custom[]).
+
+[[bootloader]]
+Bootloader
+~~~~~~~~~~
+
+TODO
+
+[[device-management]]
+Device management
+~~~~~~~~~~~~~~~~~
+
+TODO
+
+[[init-system]]
+Init system
+~~~~~~~~~~~
+
+TODO
diff --git a/docs/manual/going-further.txt b/docs/manual/going-further.txt
index 6f3cd6ec70..15324c4e24 100644
--- a/docs/manual/going-further.txt
+++ b/docs/manual/going-further.txt
@@ -1,6 +1,10 @@
+// -*- mode:doc; -*-
+
 Going further in Buildroot's innards
 ====================================
 
+include::embedded-basics.txt[]
+
 include::how-buildroot-works.txt[]
 
 include::advanced.txt[]
diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt
index 476ce257be..91ecb04fa9 100644
--- a/docs/manual/introduction.txt
+++ b/docs/manual/introduction.txt
@@ -1,69 +1,21 @@
+// -*- mode:doc; -*-
+
 About Buildroot
 ===============
 
-Buildroot is a set of Makefiles and patches that allows you to easily
-generate a cross-compilation toolchain, a root filesystem and a Linux
-kernel image for your target. Buildroot can be used for one, two or
-all of these options, independently.
+Buildroot provides a full featured environment for cross-development.
+Buildroot is able to generate a cross-compilation toolchain, a root
+filesystem, a Linux kernel image and a bootloader for your target.
+Buildroot can be used for any combinaison of these options,
+independently.
 
 Buildroot is useful mainly for people working with embedded systems.
 Embedded systems often use processors that are not the regular x86
 processors everyone is used to having in his PC. They can be PowerPC
 processors, MIPS processors, ARM processors, etc.
 
-A compilation toolchain is the set of tools that allows you to compile
-code for your system. It consists of a compiler (in our case, +gcc+),
-binary utils like assembler and linker (in our case, +binutils+) and a
-C standard library (for example
-http://www.gnu.org/software/libc/libc.html[GNU Libc],
-http://www.uclibc.org/[uClibc] or
-http://www.fefe.de/dietlibc/[dietlibc]). The system installed on your
-development station certainly already has a compilation toolchain that
-you can use to compile an application that runs on your system. If
-you're using a PC, your compilation toolchain runs on an x86 processor
-and generates code for an x86 processor. Under most Linux systems, the
-compilation toolchain uses the GNU libc (glibc) as the C standard
-library.  This compilation toolchain is called the "host compilation
-toolchain". The machine on which it is running, and on which you're
-working, is called the "host system". The compilation toolchain is
-provided by your distribution, and Buildroot has nothing to do with it
-(other than using it to build a cross-compilation toolchain and other
-tools that are run on the development host).
-
-As said above, the compilation toolchain that comes with your system
-runs on and generates code for the processor in your host system. As
-your embedded system has a different processor, you need a
-cross-compilation toolchain - a compilation toolchain that runs on
-your host system but generates code for your target system (and target
-processor). For example, if your host system uses x86 and your target
-system uses ARM, the regular compilation toolchain on your host runs on
-x86 and generates code for x86, while the cross-compilation toolchain
-runs on x86 and generates code for ARM.
-
-Even if your embedded system uses an x86 processor, you might be
-interested in Buildroot for two reasons:
-
-* The compilation toolchain on your host certainly uses the GNU Libc
-  which is a complete but huge C standard library. Instead of using
-  GNU Libc on your target system, you can use uClibc which is a tiny C
-  standard library. If you want to use this C library, then you need a
-  compilation toolchain to generate binaries linked with it. Buildroot
-  can do that for you.
-
-* Buildroot automates the building of a root filesystem with all
-  needed tools like busybox. That makes it much easier than doing it
-  by hand.
-
-You might wonder why such a tool is needed when you can compile +gcc+,
-+binutils+, +uClibc+ and all the other tools by hand. Of course doing
-so is possible but, dealing with all of the configure options and
-problems of every +gcc+ or +binutils+ version is very time-consuming
-and uninteresting.  Buildroot automates this process through the use
-of Makefiles and has a collection of patches for each +gcc+ and
-+binutils+ version to make them work on most architectures.
-
-Moreover, Buildroot provides an infrastructure for reproducing the
-build process of your kernel, cross-toolchain, and embedded root
-filesystem. Being able to reproduce the build process will be useful
-when a component needs to be patched or updated or when another person
-is supposed to take over the project.
+Buildroot supports numerous processors and their variants; it also
+comes with default configuration for several boards available
+off-the-shelf. Besides, a number of third-party projects are based on
+or develop their BSP footnote:[BSP: Board Software Package] or
+SDK footnote:[SDK: Standard Development Kit] on top of Buildroot.

From a90382616cfa02f784c24c8bc540c21e64c2c449 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:44 +0000
Subject: [PATCH 3283/6849] manual: rework using.txt and update
 common-usage.txt

Consider the second chapter: "starting-up", as a tutorial.
Assuming that, using.txt only contains the very first commands used to get
configure and build its very first target system.

So, the following subsection from using.txt have been to common-usage.txt:
- Offline builds
- Building out-of-tree
- Environment variables

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/common-usage.txt |  95 +++++++++++++++++++++++++++++++++
 docs/manual/using.txt        | 100 ++++++-----------------------------
 2 files changed, 110 insertions(+), 85 deletions(-)

diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt
index b3436063e4..c08c10ea61 100644
--- a/docs/manual/common-usage.txt
+++ b/docs/manual/common-usage.txt
@@ -4,3 +4,98 @@ Daily use
 ---------
 
 include::rebuilding-packages.txt[]
+
+Offline builds
+~~~~~~~~~~~~~~
+
+If you intend to do an offline build and just want to download
+all sources that you previously selected in the configurator
+('menuconfig', 'xconfig' or 'gconfig'), then issue:
+
+--------------------
+ $ make source
+--------------------
+
+You can now disconnect or copy the content of your +dl+
+directory to the build-host.
+
+Building out-of-tree
+~~~~~~~~~~~~~~~~~~~~
+
+As default, everything built by Buildroot is stored in the directory
++output+ in the buildroot tree.
+
+Buildroot also supports building out of tree with a syntax similar to
+the Linux kernel. To use it, add +O=<directory>+ to the make command
+line:
+
+--------------------
+ $ make O=/tmp/build
+--------------------
+
+Or:
+
+--------------------
+ $ cd /tmp/build; make O=$PWD -C path/to/buildroot
+--------------------
+
+All the output files will be located under +/tmp/build+.
+
+When using out-of-tree builds, the Buildroot +.config+ and temporary
+files are also stored in the output directory. This means that you can
+safely run multiple builds in parallel using the same source tree as
+long as they use unique output directories.
+
+For ease of use, Buildroot generates a Makefile wrapper in the output
+directory - So after the first run, you no longer need to pass +O=..+
+and +-C ..+, simply run (in the output directory):
+
+--------------------
+ $ make <target>
+--------------------
+
+[[env-vars]]
+
+Environment variables
+~~~~~~~~~~~~~~~~~~~~~
+
+Buildroot also honors some environment variables, when they are passed
+to +make+ or set in the environment:
+
+* +HOSTCXX+, the host C++ compiler to use
+* +HOSTCC+, the host C compiler to use
+* +UCLIBC_CONFIG_FILE=<path/to/.config>+, path to
+  the uClibc configuration file, used to compile uClibc, if an
+  internal toolchain is being built.
+  +
+  Note that the uClibc configuration file can also be set from the
+  configuration interface, so through the Buildroot .config file; this
+  the actual recommended way of setting it.
+  +
+* +BUSYBOX_CONFIG_FILE=<path/to/.config>+, path to
+  the Busybox configuration file.
+  +
+  Note that the Busybox configuration file can also be set from the
+  configuration interface, so through the Buildroot .config file; this
+  the actual recommended way of setting it.
+  +
+* +BUILDROOT_DL_DIR+ to override the directory in which
+  Buildroot stores/retrieves downloaded files
+  +
+  Note that the Buildroot download directory can also be set from the
+  configuration interface, so through the Buildroot .config file; this
+  the actual recommended way of setting it.
+
+An example that uses config files located in the toplevel directory and
+in your $HOME:
+
+--------------------
+ $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
+--------------------
+
+If you want to use a compiler other than the default +gcc+
+or +g+++ for building helper-binaries on your host, then do
+
+--------------------
+ $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
+--------------------
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 5741473c07..56ed23b022 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -5,8 +5,8 @@ Using Buildroot
 
 Buildroot has a nice configuration tool similar to the one you can
 find in the http://www.kernel.org/[Linux kernel] or in
-http://www.busybox.net/[Busybox]. Note that you can (and should) build
-everything as a normal user. There is no need to be root to configure
+http://www.busybox.net/[Busybox]. Note that you can *and should build
+everything as a normal user*. There is no need to be root to configure
 and use Buildroot. The first step is to run the configuration
 assistant:
 
@@ -29,12 +29,11 @@ or
 to run the Qt or GTK-based configurators.
 
 All of these "make" commands will need to build a configuration
-utility, so you may need to install "development" packages for
-relevant libraries used by the configuration utilities. On Debian-like
-systems, the +libncurses5-dev+ package is required to use the
-'menuconfig' interface, +libqt4-dev+ is required to use the 'xconfig'
-interface, and +libglib2.0-dev, libgtk2.0-dev and libglade2-dev+ are
-needed to use the 'gconfig' interface.
+utility (including the interface), so you may need to install
+"development" packages for relevant libraries used by the
+configuration utilities. Check the xref:requirement[] to know what
+Buildroot needs, and specifically the xref:requirement-optional[system requirements]
+to get the dependencies of favorite interface.
 
 For each menu entry in the configuration tool, you can find associated
 help that describes the purpose of the entry.
@@ -56,9 +55,9 @@ tell Buildroot to run each package compilation with +make -jN+.
 This command will generally perform the following steps:
 
 * Download source files (as required)
-* Configure, build and install the cross-compiling toolchain if an
-  internal toolchain is used, or import a toolchain if an external
-  toolchain is used
+* Configure, build and install the cross-compiling toolchain using the
+  appropriate toolchain backend is used, or simply import a toolchain
+  if an external toolchain
 * Build/install selected target packages
 * Build a kernel image, if selected
 * Build a bootloader image, if selected
@@ -105,81 +104,12 @@ This directory contains several subdirectories:
 * +toolchain/+ contains the build directories for the various
   components of the cross-compilation toolchain.
 
-Offline builds
---------------
+These commands, +make menuconfig|gconfig|xconfig+ and +make+, are the
+basic ones that allow to easily and quickly generate images fitting
+your needs, with all the supports and applications you enabled.
 
-If you intend to do an offline build and just want to download
-all sources that you previously selected in the configurator
-('menuconfig', 'xconfig' or 'gconfig'), then issue:
-
---------------------
- $ make source
---------------------
-
-You can now disconnect or copy the content of your +dl+
-directory to the build-host.
-
-Building out-of-tree
---------------------
-
-Buildroot supports building out of tree with a syntax similar to the
-Linux kernel. To use it, add +O=<directory>+ to the make command line:
-
---------------------
- $ make O=/tmp/build
---------------------
-
-Or:
-
---------------------
- $ cd /tmp/build; make O=$PWD -C path/to/buildroot
---------------------
-
-All the output files will be located under +/tmp/build+.
-
-When using out-of-tree builds, the Buildroot +.config+ and temporary
-files are also stored in the output directory. This means that you can
-safely run multiple builds in parallel using the same source tree as
-long as they use unique output directories.
-
-For ease of use, Buildroot generates a Makefile wrapper in the output
-directory - So after the first run, you no longer need to pass +O=..+
-and +-C ..+, simply run (in the output directory):
-
---------------------
- $ make <target>
---------------------
-
-Environment variables
----------------------
-[[env-vars]]
-
-Buildroot also honors some environment variables, when they are passed
-to +make+ or set in the environment:
-
-* +HOSTCXX+, the host C++ compiler to use
-* +HOSTCC+, the host C compiler to use
-* +UCLIBC_CONFIG_FILE=<path/to/.config>+, path to
-  the uClibc configuration file, used to compile uClibc, if an
-  internal toolchain is being built
-* +BUSYBOX_CONFIG_FILE=<path/to/.config>+, path to
-  the Busybox configuration file
-* +BUILDROOT_DL_DIR+ to override the directory in which
-  Buildroot stores/retrieves downloaded files
-
-An example that uses config files located in the toplevel directory and
-in your $HOME:
-
---------------------
- $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
---------------------
-
-If you want to use a compiler other than the default +gcc+
-or +g+++ for building helper-binaries on your host, then do
-
---------------------
- $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
---------------------
+More details about the "make" command usage are given in
+xref:make-tips[].
 
 Complying with opensource licenses
 ----------------------------------

From 483a1f82811a744e4683395986beceb0486a0c1d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:45 +0000
Subject: [PATCH 3284/6849] manual: customize-rootfs.txt: refactoring, misc.
 fixes and update

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-rootfs.txt | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 7ac5195541..d6224ffb40 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -4,7 +4,8 @@
 Customizing the generated target filesystem
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-There are a few ways to customize the resulting target filesystem:
+Besides changing one or another configuration through +make *config+,
+there are a few ways to customize the resulting target filesystem:
 
 * Customize the target filesystem directly and rebuild the image.  The
   target filesystem is available under +output/target/+.  You can
@@ -12,28 +13,33 @@ There are a few ways to customize the resulting target filesystem:
   rebuild the target filesystem image. This method allows you to do
   anything to the target filesystem, but if you decide to completely
   rebuild your toolchain and tools, these changes will be lost.
+  _Changes are not resistent to the +make clean+ command_.
 
 * Create your own 'target skeleton'. You can start with the default
   skeleton available under +system/skeleton+ and then customize it to
   suit your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
   +BR2_ROOTFS_SKELETON_CUSTOM_PATH+ will allow you to specify the
-  location of your custom skeleton. At build time, the contents of the
+  location of your custom skeleton. These options can be found in the
+  +System configuration+ menu. At build time, the contents of the
   skeleton are copied to output/target before any package
   installation.
 
 * In the Buildroot configuration, you can specify the path to a
-  post-build script, that gets called 'after' Buildroot builds all the
+  *post-build script*, that gets called 'after' Buildroot builds all the
   selected software, but 'before' the rootfs packages are
-  assembled. The destination root filesystem folder is given as the
-  first argument to this script, and this script can then be used to
-  copy programs, static data or any other needed file to your target
-  filesystem. You should, however, use this feature with care.
-  Whenever you find that a certain package generates wrong or unneeded
-  files, you should fix that package rather than work around it with a
-  post-build cleanup script.
+  assembled. The +BR2_ROOTFS_POST_BUILD_SCRIPT+ will allow you to
+  specify the location of your post-build script. This option can be
+  found in the +System configuration+ menu. The destination root
+  filesystem folder *is given as the first argument to this script,
+  and this script can then be used to copy programs, static data or
+  any other needed file to your target filesystem. You should,
+  however, use this feature with care. Whenever you find that a
+  certain package generates wrong or unneeded files, you should fix
+  that package rather than work around it with a post-build cleanup
+  script. _Among these first 3 methods, this one should be prefere_d.
 
 * A special package, 'customize', stored in +package/customize+ can be
   used. You can put all the files that you want to see in the final
   target root filesystem in +package/customize/source+, and then
-  enable this special package in the configuration system.
-
+  enable this special package in the configuration system. _This
+  method is marked as deprecated_.

From df469937a5878fb26de1616c4de7100a4ef3f58a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:46 +0000
Subject: [PATCH 3285/6849] manual: update rebuilding-packages.txt

- update "Understanding how to rebuild packages" section
- add "Understanding when a full rebuild is necessary" section

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/rebuilding-packages.txt | 65 ++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index 824b35c329..2225200200 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -1,5 +1,39 @@
 // -*- mode:doc -*- ;
 
+[[full-rebuild]]
+Understanding when a full rebuild is necessary
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A full rebuild is achieved by running:
+
+---------------
+$ make clean all
+---------------
+
+In what cases, a full rebuild is mandatory:
+
+* each time the toolchain properties are changed, this includes:
+
+** after changing some toolchain option under the _Toolchain_ menu (if
+   the internal Buildroot backend is used);
+** after running +make ctng-menuconfig+ (if the crosstool-NG backend
+   is used);
+** after running +make uclibc-menuconfig+.
+
+* after removing some libraries from the package selection.
+
+In what cases, a full rebuild is recommended:
+
+* after adding some libraries to the package selection (otherwise,
+  some packages that can be optionally linked against those libraries
+  won't be rebuilt, so they won't support those new available
+  features).
+
+In other cases, it is up to you to decide if you should or not run a
+full rebuild, but you should know what is impacted and understand what
+you are doing anyway.
+
+[[rebuild-pkg]]
 Understanding how to rebuild packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -42,27 +76,10 @@ files are relevant:
   Buildroot will trigger the recompilation of the package from the
   compilation step (execution of +make+).
 
-For other packages, an analysis of the specific 'package.mk' file is
-needed. For example, the zlib Makefile used to look like this (before
-it was converted to the generic package infrastructure):
-
------------------
-$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
-	(cd $(ZLIB_DIR); rm -rf config.cache; \
-		[...]
-	)
-	touch $@
-
-$(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured
-	$(MAKE) -C $(ZLIB_DIR) all libz.a
-	touch -c $@
------------------
-
-If you want to trigger the reconfiguration, you need to remove
-+output/build/zlib-version/.configured+. If you want to trigger only
-the recompilation, you need to remove
-+output/build/zlib-version/libz.a+.
-
-Note that most packages, if not all, will progressively be ported over
-to the generic or autotools infrastructure, making it much easier to
-rebuild individual packages.
+.Notes
+- Since the _Buildroot-2012.11_ release, all packages rely on the
+Buildroot infrastructures.
+- Only toolchain packages remain using custom makefiles (i.e. do not
+use any Buildroot infrastructure).
+- Most packages and toolchain packages, if not all, will progressively
+be ported over to the generic, autotools or CMake infrastructure,

From b4783b41a90bf4791b5d0b6354e969a51c9c5425 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:47 +0000
Subject: [PATCH 3286/6849] manual: adding-package-directory.txt: update,
 cleanup and typo fixes

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 34 +++++++++++++++--------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 6030e0852c..35d28b6d5a 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -49,6 +49,7 @@ supposed to contain anything but the 'bare' name of the package.
 source "package/libfoo/Config.in"
 --------------------------
 
+[[depends-on-vs-select]]
 The +Config.in+ file of your package must also ensure that
 dependencies are enabled. Typically, Buildroot uses the following
 rules:
@@ -59,15 +60,26 @@ rules:
   dependencies are selected. For example, the _libgtk2_ package uses
   +select BR2_PACKAGE_LIBGLIB2+ to make sure this library is also
   enabled.
+  The +select+ keyword express the dependency with a backward
+  semantic.
 
 * Use a +depends on+ type of dependency when the user really needs to
   be aware of the dependency. Typically, Buildroot uses this type of
-  dependency for dependencies on toolchain options (large file
-  support, RPC support, IPV6 support), or for dependencies on "big"
-  things, such as the X.org system. In some cases, especially
-  dependency on toolchain options, it is recommended to add a
-  +comment+ displayed when the option is not enabled, so that the user
-  knows why the package is not available.
+  dependency for dependencies on toolchain options (target
+  architecture, MMU support, C library, C++ support, large file
+  support, thread support, RPC support, IPV6 support, WCHAR support),
+  or for dependencies on "big" things, such as the X.org system. In
+  some cases, especially dependency on toolchain options, it is
+  recommended to add a +comment+ displayed when the option is not
+  enabled, so that the user knows why the package is not available.
+  The +depends on+ keyword express the dependency with a forward
+  semantic.
+
+.Note
+The current problem with the _kconfig_ language is that these two
+dependency semantics are not internally linked. Therefore, it may be
+possible to select a package, whom one of its dependencies/requirement
+is not met.
 
 An example illustrates both the usage of +select+ and +depends on+.
 
@@ -147,6 +159,9 @@ is also enabled, but not necessarily built before your package. To do
 so, the dependency also needs to be expressed in the +.mk+ file of the
 package.
 
+Further formating details: see xref:writing-rules-config-in[the
+writing rules].
+
 The +.mk+ file
 ^^^^^^^^^^^^^^
 
@@ -182,8 +197,5 @@ different way, using different infrastructures:
    CMake. We cover them through a xref:cmake-package-tutorial[tutorial]
    and xref:cmake-package-reference[reference].
 
-* *Hand-written Makefiles:* These are currently obsolete, and no new
-  manual Makefiles should be added. However, since there are still
-  many of them in the tree, we keep them documented in a
-  xref:handwritten-tutorial[tutorial].
-
+Further formating details: see xref:writing-rules-mk[the writing
+rules].

From 4ea3644afdd396efadbe1e1efd2eaa098cc2bc03 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:48 +0000
Subject: [PATCH 3287/6849] manual: add prerequisite.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/prerequisite.txt | 84 ++++++++++++++++++++++++++++++++++++
 docs/manual/starting-up.txt  |  2 +
 2 files changed, 86 insertions(+)
 create mode 100644 docs/manual/prerequisite.txt

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
new file mode 100644
index 0000000000..b24731fba7
--- /dev/null
+++ b/docs/manual/prerequisite.txt
@@ -0,0 +1,84 @@
+// -*- mode:doc -*- ;
+
+[[requirement]]
+System requirements
+-------------------
+
+Buildroot is design to run on Linux system.
+
+Buildroot needs some software to be already installed on the host
+system; hereafter the lists of the mandatory and optional packages
+(package names may vary between distributions).
+
+Take care of _installing both runtime and development data_, especially
+for the libraries that may be packaged in 2 distinct packages.
+
+
+[[requirement-mandatory]]
+
+Mandatory packages
+~~~~~~~~~~~~~~~~~~
+
+* Build tools:
+
+** +which+
+** +sed+
+** +make+ (version 3.82 or any later)
+** +binutils+
+** +build-essential+ (only for Debian based systems)
+** +gcc+ (version 2.95 or any later)
+** `g++` (version 2.95 or any later)
+** +bash+
+** +gawk+
+** +bison+
+** +flex+
+** +gettext+
+** +patch+
+** +gzip+
+** +bzip2+
+** +perl+
+** +tar+
+** +cpio+
+** +python+ (version 2.6 or 2.7)
+** +unzip+
+** +rsync+
+
+* Source fetching tools:
+** +wget+
+
+* Configuration interface dependencies (requires development libraries):
+** +ncurses5+
+
+[[requirement-optional]]
+
+Optional packages
+~~~~~~~~~~~~~~~~~
+
+* Source fetching tools:
++
+In the official tree, most of the package sources are retrieved
+using +wget+, few are only available through their +git+, +mercurial+,
+or +svn+ repository.
++
+All other source fetching methods are implemented and may be used in a
+development context.
++
+** +bazaar+
+** +cvs+
+** +git+
+** +mercurial+
+** +rsync+
+** +scp+
+** +subversion+
+
+* Configuration interface dependencies (requires development libraries):
+** +qt4+ to use the 'xconfig' interface
+** +glib2+, +gtk2+ and +glade2+ to use the 'gconfig' interface
+
+* Development libraries:
+** +zlib1+
+** +netpbm10+ (for +fbtest+)
+** +python-xcbgen+ (for +Matchbox+ on Debian based system)
+
+* Documentation generation tools:
+** +asciidoc+
diff --git a/docs/manual/starting-up.txt b/docs/manual/starting-up.txt
index 8ba16c92b0..2999fd4888 100644
--- a/docs/manual/starting-up.txt
+++ b/docs/manual/starting-up.txt
@@ -3,6 +3,8 @@
 Starting up
 ===========
 
+include::prerequisite.txt[]
+
 include::getting.txt[]
 
 include::using.txt[]

From b0cdae65f7e062ccfa00790fe6c4419b4c143b36 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:49 +0000
Subject: [PATCH 3288/6849] manual: add make-tips.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/make-tips.txt    | 58 ++++++++++++++++++++++++++++++++++++
 docs/manual/working-with.txt |  2 ++
 2 files changed, 60 insertions(+)
 create mode 100644 docs/manual/make-tips.txt

diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
new file mode 100644
index 0000000000..5b00536bef
--- /dev/null
+++ b/docs/manual/make-tips.txt
@@ -0,0 +1,58 @@
+// -*- mode:doc -*- ;
+
+[[make-tips]]
+'make' tips
+-----------
+
+Because Buildroot is a set of Makefiles and patches, there are few
+things useful to know, such as:
+
++make *config+ commands offer a search tool. Read the help message in
+the different frontend menu to know how to use it:
+
+* in _menuconfig_, search tool is called by pressing +/+;
+* in _xconfig_, search tool is called by pressing +ctrl+ + +f+.
+
+The result of the search show the help message of the matching items.
+
+Display all command executed by make:
+
+--------------------
+ $ make V=0|1 <target>
+--------------------
+
+Display all available targets:
+
+--------------------
+ $ make help
+--------------------
+
+Note that some settings in the +.config+ file may hide some targets:
+
+* +busybox-menuconfig+ depends on whether +busybox+ is enabled or not
+  in the +Package selection+ menu
+* +linux-menuconfig+ and +linux-savedefconfig+ depend on whether
+  +linux+ is enabled or not
+* +uclibc-menuconfig+ depends on whether the toolchain uses the
+  Buildroot internal toolchain backend or not
+* +ctng-menuconfig+ depends on whether the toolchain uses the
+  crosstool-NG backend or not
+* +barebox-menuconfig+ and +barebox-savedefconfig+ depend on whether
+  +barebox+ bootloader is enabled or not
+
+Delete all build products (including build directories, host, staging
+and target trees, the images and the toolchain):
+
+--------------------
+ $ make clean
+--------------------
+
+Delete all build products as well as the configuration:
+
+--------------------
+ $ make distclean
+--------------------
+
+Note that if +ccache+ is enabled, running +make clean|distclean+ does
+not empty the cache of compiler used by Buildroot. To delete it, refer
+to xref:ccache[].
diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
index 3c57504bd0..4ea9239e2b 100644
--- a/docs/manual/working-with.txt
+++ b/docs/manual/working-with.txt
@@ -6,6 +6,8 @@ Working with Buildroot
 This section explains how you can customize Buildroot to fit your
 needs.
 
+include::make-tips.txt[]
+
 include::customize.txt[]
 
 include::common-usage.txt[]

From cc02514f954e8280c010044320790caed698174a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:50 +0000
Subject: [PATCH 3289/6849] manual: faq.txt: rework and update

Also rename faq.txt -> faq-troubleshooting.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/faq-troubleshooting.txt | 134 ++++++++++++++++++++++++++++
 docs/manual/faq.txt                 |  59 ------------
 docs/manual/manual.txt              |   4 +-
 3 files changed, 136 insertions(+), 61 deletions(-)
 create mode 100644 docs/manual/faq-troubleshooting.txt
 delete mode 100644 docs/manual/faq.txt

diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt
new file mode 100644
index 0000000000..6911c55e66
--- /dev/null
+++ b/docs/manual/faq-troubleshooting.txt
@@ -0,0 +1,134 @@
+// -*- mode:doc; -*-
+
+Frequently Asked Questions & Troubleshooting
+============================================
+
+[[faq-boot-hang-after-starting]]
+The boot hangs after 'Starting network...'
+------------------------------------------
+
+If the boot process seems to hand after the following messages
+(messages not necessarily exactly similar, depending on the list of
+packages selected):
+
+------------------------
+Freeing init memory: 3972K
+Initializing random number generator... done.
+Starting network...
+Starting dropbear sshd: generating rsa key... generating dsa key... OK
+------------------------
+
+then it means that your system is running, but didn't start a shell on
+the serial console. In order to have the system start a shell on your
+serial console, you have to go in the Buildroot configuration, +System
+configuration+, and modify +Port to run a getty (login prompt) on+ and
++Baudrate to use+ as appropriate. This will automatically tune the
++/etc/inittab+ file of the generated system so that a shell starts on
+the correct serial port.
+
+[[faq-module-init-tool-build-failure]]
+module-init-tools fails to build with 'cannot find -lc'
+-------------------------------------------------------
+
+If the build of +module-init-tools+ for the host fails with:
+
+------------------------
+/usr/bin/ld: cannot find -lc
+------------------------
+
+then probably you are running a Fedora (or similar) distribution, and
+you should install the +glibc-static+ package. This is because the
++module-init-tools+ build process wants to link statically against the
+C library.
+
+[[faq-no-compiler-on-target]]
+Why there is no compiler on the target?
+---------------------------------------
+
+It has been decided that the support of the _native compiler for the
+target_ would be stopped since the Buildroot-2012.11 release because:
+
+* this feature was not maintained nor tested and often broken;
+* this feature was only available for Buildroot toolchains;
+* Buildroot mostly targets _small_ or _very small_ target hardware
+  with limited resource onboard (CPU, ram, mass-storage), on which
+  compiling does not make much sense.
+
+If you need a compiler on your target anyway, then Buildroot is not
+suitable for your purpose. In such case, you need a _real
+distribution_ and you should for something like:
+
+* http://www.openembedded.org[openembedded]
+* https://www.yoctoproject.org[yocto]
+* http://www.emdebian.org[emdebian]
+* https://fedoraproject.org/wiki/Architectures[Fedora]
+* http://en.opensuse.org/Portal:ARM[openSUSE ARM]
+* http://archlinuxarm.org[Arch Linux ARM]
+* ...
+
+[[faq-no-dev-files-on-target]]
+Why there is no development files on the target?
+------------------------------------------------
+
+Since there is no compiler available on the target (see
+xref:faq-no-compiler-on-target[]), it does not make sense to waste
+space with headers or static libraries.
+
+Therefore, those files are always removed from the target since the
+Buildroot-2012.11 release.
+
+[[faq-no-doc-on-target]]
+Why there is no documentation on the target?
+--------------------------------------------
+
+Because Buildroot mostly targets _small_ or _very small_ target
+hardware with limited resource onboard (CPU, ram, mass-storage), it
+does not make sense to waste space with the documentation data.
+
+If you need documentation data on your target anyway, then Buildroot
+is not suitable for your purpose, and you should look for a _real
+distribution_ (see: xref:faq-no-compiler-on-target[]).
+
+[[faq-depends-on-vs-select]]
++Config.in+: _depends on_ vs _select_
+-------------------------------------
+
+When adding a new package to Buildroot, you will most likely have to
+deal with expressing the dependencies of this package.
+
+In the +Config.in+ file, dependencies may be expressed following two
+semantics.
+See xref:depends-on-vs-select[].
+
+[[faq-why-not-visible-package]]
+Why some packages are not visible in the Buildroot config menu?
+---------------------------------------------------------------
+
+If a package exists in the Buildroot tree and does not appears in the
+config menu, this most likely means that some of the package's
+dependencies are not met.
+
+To know more about the dependencies of a package, search the package
+symbol using in teh config menu (see xref:make-tips[]).
+
+Then, you may have to recursively enable several options (which
+correspond to the unmeet dependencies) to finally be able to select
+the package.
+
+If the package is not visible due to some unmeet toolchain options,
+then you should certainly run a full rebuild (see xref:make-tips[] for
+more explanations).
+
+[[faq-why-not-use-target-as-chroot]]
+Why not use the target directory as a chroot directory?
+-------------------------------------------------------
+
+There are plenty of reason to *not* use the target directory a chroot
+one, among these:
+
+* files' owners, modes and permissions are not correctly set in the
+  target directory;
+* devices nodes are not created in the target directory.
+
+Because of that, commands run in through chroot, using the target
+directory as new root, will fail.
diff --git a/docs/manual/faq.txt b/docs/manual/faq.txt
deleted file mode 100644
index 97a754bbfe..0000000000
--- a/docs/manual/faq.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-Frequently Asked Questions
-==========================
-
-The boot hangs after 'Starting network...'
-------------------------------------------
-
-If the boot process seems to hand after the following messages
-(messages not necessarily exactly similar, depending on the list of
-packages selected):
-
-------------------------
-Freeing init memory: 3972K
-Initializing random number generator... done.
-Starting network...
-Starting dropbear sshd: generating rsa key... generating dsa key... OK
-------------------------
-
-then it means that your system is running, but didn't start a shell on
-the serial console. In order to have the system start a shell on your
-serial console, you have to go in the Buildroot configuration, +System
-configuration+, and modify +Port to run a getty (login prompt) on+ and
-+Baudrate to use+ as appropriate. This will automatically tune the
-+/etc/inittab+ file of the generated system so that a shell starts on
-the correct serial port.
-
-module-init-tools fails to build with 'cannot find -lc'
--------------------------------------------------------
-
-If the build of +module-init-tools+ for the host fails with:
-
-------------------------
-/usr/bin/ld: cannot find -lc
-------------------------
-
-then probably you are running a Fedora (or similar) distribution, and
-you should install the +glibc-static+ package. This is because the
-+module-init-tools+ build process wants to link statically against the
-C library.
-
-How to add package from github
-------------------------------
-
-If the package has no release version, or its version cannot be
-identified using tag, then the sha1 of the particular commit should be
-used to identify the version (the first 7 characters of the sha1 are
-enough):
-
-------------------------
-FOO_VERSION = 1234567
-FOO_SITE = http://github.com/<user>/<package>/tarball/<branch>
-------------------------
-
-If the package version matches a tag, then this tag should be used to
-identify the version:
-
-------------------------
-FOO_VERSION = v1.0
-FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
-------------------------
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 00bd0372e5..4df1657349 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -17,10 +17,10 @@ include::starting-up.txt[]
 
 include::working-with.txt[]
 
+include::faq-troubleshooting.txt[]
+
 include::going-further.txt[]
 
 include::developer-guide.txt[]
 
-include::faq.txt[]
-
 include::appendix.txt[]

From ea1fa83bc39c9e0848feb36883d766c28394bf1e Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:51 +0000
Subject: [PATCH 3290/6849] manual: add writing-rules.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/developer-guide.txt |   2 +
 docs/manual/writing-rules.txt   | 125 ++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 docs/manual/writing-rules.txt

diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
index 37f703d708..b254b0f9eb 100644
--- a/docs/manual/developer-guide.txt
+++ b/docs/manual/developer-guide.txt
@@ -3,6 +3,8 @@
 Developer Guidelines
 ====================
 
+include::writing-rules.txt[]
+
 include::adding-packages.txt[]
 
 include::board-support.txt[]
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
new file mode 100644
index 0000000000..e0a5a2afdd
--- /dev/null
+++ b/docs/manual/writing-rules.txt
@@ -0,0 +1,125 @@
+// -*- mode:doc; -*-
+
+Writing rules
+-------------
+
+Overall, those writing rules are here to help you add new files in
+Buildroot or refactor existing ones.
+
+If you slightly modify some existing file, the important thing is
+keeping the consistency of the whole file, so you can:
+* either follow the potentially deprecated rules used all over this
+file
+* or entirely rework it in order to make it comply with those rules.
+
+[[writing-rules-config-in]]
+
++Config.in+ file
+~~~~~~~~~~~~~~~~
+
++Config.in+ files contain entries for almost anything configurable in
+Buildroot.
+
+An entry has the following pattern:
+
+---------------------
+config BR2_PACKAGE_LIBFOO
+	bool "libfoo"
+	depends on BR2_PACKAGE_LIBBAZ
+	select BR2_PACKAGE_LIBBAR
+	help
+	  This is a comment that explains what libfoo is.
+
+	  http://foosoftware.org/libfoo/
+---------------------
+
+* The +bool+, +depends on+, +select+ and +help+ lines are indented
+  with one tab.
+
+* The help text itself should be indented with one tab and two
+  spaces.
+
+The configuration system used in Buildroot, so the content of the
++Config.in+ files, is regular _Kconfig_. Further details about
+_Kconfig_: refer to
+http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[].
+
+[[writing-rules-mk]]
+
+The +.mk+ file
+~~~~~~~~~~~~~~
+
+* Assignment: use +=+ preceded and followed by one space:
++
+---------------------
+LIBFOO_VERSION = 1.0
+LIBFOO_CONF_OPT += --without-python-support
+---------------------
+
+* Indentation: use tab only:
++
+---------------------
+define LIBFOO_REMOVE_DOC
+$(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \
+	$(TARGET_DIR)/usr/share/man/man3/libfoo*
+endef
+---------------------
+
+* Optional dependency:
+
+** Prefer multi-line syntax.
++
+YES:
++
+---------------------
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+LIBFOO_CONF_OPT += --with-python-support
+LIBFOO_DEPENDENCIES += python
+else
+LIBFOO_CONF_OPT += --without-python-support
+endif
+---------------------
++
+NO:
++
+---------------------
+LIBFOO_CONF_OPT += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
+LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,)
+---------------------
+
+** Keep configure options and dependencies close together.
+
+* Optional hooks: keep hook definition and assignment together in one
+  if block.
++
+YES:
++
+---------------------
+ifneq ($(BR2_LIBFOO_INSTALL_DATA),y)
+define LIBFOO_REMOVE_DATA
+	$(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data
+endef
+LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA
+endif
+---------------------
++
+NO:
++
+---------------------
+define LIBFOO_REMOVE_DATA
+	$(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data
+endef
+
+ifneq ($(BR2_LIBFOO_INSTALL_DATA),y)
+LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA
+endif
+---------------------
+
+The documentation
+~~~~~~~~~~~~~~~~~
+
+The documentation uses the
+http://www.methods.co.nz/asciidoc/[asciidoc] format.
+
+Further details about the http://www.methods.co.nz/asciidoc/[asciidoc]
+syntax: refer to http://www.methods.co.nz/asciidoc/userguide.html[].

From 3b785593b61c4ec9bdde56e35c0e7f62e03d6cd5 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:52 +0000
Subject: [PATCH 3291/6849] manual: add get-involved.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/get-involved.txt | 98 ++++++++++++++++++++++++++++++++++++
 docs/manual/manual.txt       |  2 +
 2 files changed, 100 insertions(+)
 create mode 100644 docs/manual/get-involved.txt

diff --git a/docs/manual/get-involved.txt b/docs/manual/get-involved.txt
new file mode 100644
index 0000000000..566516b97b
--- /dev/null
+++ b/docs/manual/get-involved.txt
@@ -0,0 +1,98 @@
+// -*- mode:doc; -*-
+
+Getting involved
+================
+
+Like any open source project, Buildroot has different ways to share
+information in its community and outside.
+
+One piece of it is the document you are currently reading ;-).
+
+Each of those ways may interest you if you are looking for some help,
+want to understand Buildroot or contribute to the project.
+
+Mailing List
+------------
+
+Buildroot has a mailing list
+http://lists.busybox.net/pipermail/buildroot[] for discussion and
+development.
+
+[[mailing-list-subscribe]]
+
+Subscribing to the mailing list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can subscribe by visiting
+http://lists.busybox.net/mailman/listinfo/buildroot[].
+Only subscribers to the Buildroot mailing list are allowed to post to
+this list.
+
+The list is also available through _Gmane_ http://gmane.org[], at
++gmane.comp.lib.uclibc.buildroot+
+http://dir.gmane.org/gmane.comp.lib.uclibc.buildroot[].
+
+Searching the List Archives
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please search the mailing list archives before asking questions on the
+mailing list, since there is a good chance someone else has asked the
+same question before. Checking the archives is a great way to avoid
+annoying everyone on the list with frequently asked questions...
+
+IRC
+---
+
+The Buildroot IRC is irc://freenode.net/#buildroot[].
+The channel +#buildroot+ is hosted on Freenode
+http://webchat.freenode.net[].
+
+When asking for help on IRC, share relevant logs or pieces of code
+using a code sharing website (see
+http://en.wikipedia.org/wiki/Comparison_of_pastebins[], and pick one).
+
+[[patchwork]]
+Patchwork
+---------
+
+The Buildroot patch management interface is at
+http://patchwork.buildroot.org[].
+
+All patches and comments sent through the mailing list are
+automatically indexed in http://patchwork.buildroot.org[patchwork].
+
+Bugtracker
+----------
+
+The Buildroot bugtracker is at https://bugs.busybox.net[].
+
+Buildroot wikipage
+------------------
+
+After the Buildroot developer day on February 3, 2012,
+a page dedicated to Buildroot has been created on
+http://elinux.org[elinux.org].
+
+This page is reachable at http://elinux.org/Buildroot[].
+
+Currently, this page is mainly used as a _todo-list_.
+
+[[events]]
+Events
+------
+
+Buildroot Developer Days aside ELC-E 2012 (November 3-4, 2012 - Barcelona)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Event page: http://elinux.org/Buildroot:DeveloperDaysELCE2012[]
+
+Buildroot presentation at LSM 2012 (July 12-14, 2012 - Geneva)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Announcement: http://lists.busybox.net/pipermail/buildroot/2012-May/053845.html[]
+
+Buildroot Developer Days aside FOSDEM 2012 (February 3, 2012 - Brussels)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Announcement & agenda thread: http://lists.busybox.net/pipermail/buildroot/2012-January/049340.html[]
+* Report: http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html[]
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 4df1657349..3331cbf8e1 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -23,4 +23,6 @@ include::going-further.txt[]
 
 include::developer-guide.txt[]
 
+include::get-involved.txt[]
+
 include::appendix.txt[]

From a79a54a0e7effdc1f06caa01a5441ffbf2ad554b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:53 +0000
Subject: [PATCH 3292/6849] manual: add contribute.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/contribute.txt   | 126 +++++++++++++++++++++++++++++++++++
 docs/manual/get-involved.txt |   3 +
 docs/manual/manual.txt       |   2 +
 3 files changed, 131 insertions(+)
 create mode 100644 docs/manual/contribute.txt

diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
new file mode 100644
index 0000000000..ddf790d71b
--- /dev/null
+++ b/docs/manual/contribute.txt
@@ -0,0 +1,126 @@
+// -*- mode:doc; -*-
+
+Contibuting to Buildroot
+========================
+
+If you want to contribute to Buildroot, you will need a git view of
+the project. Refer to xref:getting-buildroot[] to get it.
+
+Currently, the mailing list is the central place for contribution.
+If you have not already subscribed to it, then refer to
+xref:mailing-list-subscribe[].
+
+Recently, a web interface is also used to manage patches sent to the
+mailing list, see xref:patchwork[].
+
+[NOTE]
+_Please, do not attach patches to bugs, send them to the mailing list
+instead_ (see xref:submitting-patches[]).
+
+[[submitting-patches]]
+Submitting patches
+------------------
+
+When your changes are done, and committed in your local git view,
+_rebase_ your development branch on top of the upstream tree before
+generating the patch set. To do so, run:
+
+---------------------
+ $ git fetch --all --tags
+ $ git rebase origin/master
+---------------------
+
+Here, you are ready to generate then submit your patch set.
+
+To generate it, run:
+
+---------------------
+ $ git format-patch -M -n -s -o outgoing origin/master
+---------------------
+
+This will generate patch files in the +outgoing+ subdirectory,
+automatically adding the +signed-off-by+ line.
+
+If you want to present the whole patch set in a separate mail, add
++--cover-letter --summary+ to the previous command line (+man
+git-format-patch+ for further information).
+
+Once patch files are generated, you can review/edit the commit message
+before submitting them using your favorite text editor.
+
+Lastly, send/submit your patch set to the Buildroot mailing list:
+
+---------------------
+ $ git send-email --to buildroot@busybox.net outgoing/*
+---------------------
+
+Note that +git+ should be configured to use your mail account.
+To configure +git+, see +man git-send-email+ or google it.
+
+Make sure posted *patches are not line-wrapped*, otherwise it cannot
+easily be applied. In such a case, fix your e-mail client, or better,
+use +git send-email+ to send your patches.
+
+Reviewing/Testing patches
+-------------------------
+
+In the review process, do not hesitate to respond to patch submissions
+for remarks, suggestions or anything that will help everyone to
+understand the patches and make them better.
+
+Some tags are used to help following the state of any patch posted on
+the mailing-list:
+
+Acked-by:: Indicates that the patch can be committed.
+
+Tested-by:: Indicates that the patch has been tested. It is useful
+  but not necessary to add a comment about what has been tested.
+
+Autobuild
+---------
+
+The Buildroot community is currently setting up automatic build i
+order to test more and more configuration. All build results are
+available at http://autobuild.buildroot.org[]
+
+A way to contribute is fixing broken builds.
+
+In the commit message of a patch fixing an _autobuild_, add a
+reference to the _build result directory_ (the +dir+ link in the _data
+column_):
+
+---------------------
+Fixes http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2e4069
+---------------------
+
+[[reporting-bugs]]
+Reporting issues/bugs, get help
+-------------------------------
+
+Before reporting some issues, please chek
+xref:mailing-list-subscribe[the mailing list archive] in case someone had
+already reported and fixed a similar problem.
+
+Whatever the way you choose to report some bugs or get help,
+xref:bugtracker[opening a bug] or
+xref:mailing-list-subscribe[send a mail to the mailing list], there is
+a number of detail to provide in order to help people reproduce and
+find a solution to the issue.
+
+Try to think as you would be the one who will help someone else; in
+that case, what would you need?
+
+Here is a short list of details to provide in such case:
+
+* host machine (OS/release)
+* version of Buildroot
+* target for which the build fails
+* package(s) which the build fails
+* the command that fails and its output
+* any information you think that may be relevant
+
+Additionnally, your can add the +.config+ file.
+
+If some of these details are too large, do not hesitate to use some
+pastebin service (see
+http://en.wikipedia.org/wiki/Comparison_of_pastebins[]).
diff --git a/docs/manual/get-involved.txt b/docs/manual/get-involved.txt
index 566516b97b..3a00b1e801 100644
--- a/docs/manual/get-involved.txt
+++ b/docs/manual/get-involved.txt
@@ -61,11 +61,14 @@ http://patchwork.buildroot.org[].
 All patches and comments sent through the mailing list are
 automatically indexed in http://patchwork.buildroot.org[patchwork].
 
+[[bugtracker]]
 Bugtracker
 ----------
 
 The Buildroot bugtracker is at https://bugs.busybox.net[].
 
+To open a bug, see xref:reporting-bugs[].
+
 Buildroot wikipage
 ------------------
 
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 3331cbf8e1..4032a6b9b4 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -25,4 +25,6 @@ include::developer-guide.txt[]
 
 include::get-involved.txt[]
 
+include::contribute.txt[]
+
 include::appendix.txt[]

From 0e886fc3f6486268bdc54541d2fe2c32acace648 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:54 +0000
Subject: [PATCH 3293/6849] manual: add package-make-target.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/advanced.txt            |  2 +
 docs/manual/package-make-target.txt | 88 +++++++++++++++++++++++++++++
 docs/manual/rebuilding-packages.txt |  4 ++
 3 files changed, 94 insertions(+)
 create mode 100644 docs/manual/package-make-target.txt

diff --git a/docs/manual/advanced.txt b/docs/manual/advanced.txt
index cd53182ba5..ba6574cac3 100644
--- a/docs/manual/advanced.txt
+++ b/docs/manual/advanced.txt
@@ -10,3 +10,5 @@ include::external-toolchain.txt[]
 include::ccache-support.txt[]
 
 include::download-location.txt[]
+
+include::package-make-target.txt[]
diff --git a/docs/manual/package-make-target.txt b/docs/manual/package-make-target.txt
new file mode 100644
index 0000000000..1813af3d03
--- /dev/null
+++ b/docs/manual/package-make-target.txt
@@ -0,0 +1,88 @@
+// -*- mode:doc; -*-
+
+[[pkg-build-steps]]
+
+Package make targets
+~~~~~~~~~~~~~~~~~~~~
+
+A +make <package>+ call achieves several _make targets_ with, as a
+result, this particular package and its dependencies built, installed
+in their destination directory (target, staging or host directory).
+
+For packages based on the Buildroot infrastructures (+generic-package+,
++autotools-package+ or +cmake-package+), each of those
+actions/steps/commands. For packages relying on other build system,
+then there is no other choice than looking at the +.mk+ file (see also
+the xref:rebuild-pkg[]).
+
+For packages relying on the Buildroot infrastructures, there are
+numerous special make targets that can be called independently like
+this:
+
+------------
+make <package>-<target>
+------------
+
+In order, the package build commands are:
+
+[width="90%",cols="^1,4",options="header"]
+|===================================================
+| command/target    | Description
+
+| +source+          | Fetch the source (download the tarball, clone
+the source repository, etc)
+
+| +depends+         | Build and install all dependencies required to
+build the package
+
+| +extract+         | Put the source in the package build directory
+(extract the tarball, copy the source, etc)
+
+| +patch+           | Apply the patches if any
+
+| +configure+       | Run the configure command
+
+| +build+           | Compile the source
+
+| +install-staging+ |
+*target package:* Run the installation of the package in the
+staging directory
+
+*host package:* Does nothing
+
+| +install-target+  |
+*target package:* Run the installation of the package in the
+staging directory
+
+*host package:* Does nothing
+
+| +install+         |
+*target package:* Run the 2 previous installation commands for the
+target packages
+
+*host package:* Run the installation of the package in the host
+directory
+
+|===================================================
+
+Additionally, there are some other useful make targets:
+
+[width="90%",cols="^1,4",options="header"]
+|===================================================
+| command/target    | Description
+
+| +show-depends+    | Displays the dependencies required to build the
+package
+
+| +clean+           | Clean the package build directory, also
+uninstall the package from both the target and the staging directory
+
+| +dirclean+        | Remove the whole package build directory
+
+| +rebuild+         | Rebuild only necessary binaries and install them
+again
+
+| +reconfigure+     | Run again the configure command, then rebuild
+only necessary binaries, and lastly install them again
+
+|===================================================
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index 2225200200..a723d113ce 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -83,3 +83,7 @@ Buildroot infrastructures.
 use any Buildroot infrastructure).
 - Most packages and toolchain packages, if not all, will progressively
 be ported over to the generic, autotools or CMake infrastructure,
+making it much easier to rebuild individual packages.
+
+Further details about package special make target at the
+xref:pkg-build-steps[].

From 6bdeb7420e0230747e8edd7691f99f64541f8cf4 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:55 +0000
Subject: [PATCH 3294/6849] manual: add download-infra.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/developer-guide.txt | 2 ++
 docs/manual/download-infra.txt  | 8 ++++++++
 docs/manual/prerequisite.txt    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 docs/manual/download-infra.txt

diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
index b254b0f9eb..f3fc1dd6af 100644
--- a/docs/manual/developer-guide.txt
+++ b/docs/manual/developer-guide.txt
@@ -7,4 +7,6 @@ include::writing-rules.txt[]
 
 include::adding-packages.txt[]
 
+include::download-infra.txt[]
+
 include::board-support.txt[]
diff --git a/docs/manual/download-infra.txt b/docs/manual/download-infra.txt
new file mode 100644
index 0000000000..63908adadc
--- /dev/null
+++ b/docs/manual/download-infra.txt
@@ -0,0 +1,8 @@
+// -*- mode:doc -*- ;
+
+[[download-infra]]
+
+Download infrastructure
+-----------------------
+
+TODO
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index b24731fba7..693347b96a 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -61,7 +61,7 @@ using +wget+, few are only available through their +git+, +mercurial+,
 or +svn+ repository.
 +
 All other source fetching methods are implemented and may be used in a
-development context.
+development context (further details: refer to xref:download-infra[]).
 +
 ** +bazaar+
 ** +cvs+

From 6c61000c3a8ef46a0ded12476b005ae220b90371 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:56 +0000
Subject: [PATCH 3295/6849] manual: add patch-policy.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/developer-guide.txt |   2 +
 docs/manual/patch-policy.txt    | 128 ++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 docs/manual/patch-policy.txt

diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
index f3fc1dd6af..5002897077 100644
--- a/docs/manual/developer-guide.txt
+++ b/docs/manual/developer-guide.txt
@@ -7,6 +7,8 @@ include::writing-rules.txt[]
 
 include::adding-packages.txt[]
 
+include::patch-policy.txt[]
+
 include::download-infra.txt[]
 
 include::board-support.txt[]
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
new file mode 100644
index 0000000000..551ea1288f
--- /dev/null
+++ b/docs/manual/patch-policy.txt
@@ -0,0 +1,128 @@
+// -*- mode:doc; -*-
+
+[[patch-policy]]
+
+Patch Policy
+------------
+
+While integrating a new package or updating an existing one, it may be
+necessary to patch the source of the software to get it built within
+Buildroot.
+
+Buildroot offers an infrastructure to automatically handle this during
+the builds. It support several ways of applying patch sets:
+
+Provinding patches
+~~~~~~~~~~~~~~~~~~
+
+Additionnal tarball
+^^^^^^^^^^^^^^^^^^^
+
+If there needs to apply a patch set available as a tarball and
+downloadable, then add the patch tarball to the +<packagename>_PATCH+
+variable.
+
+Note that the patch tarballs are downloaded from the same site as the
+sources.
+
+Within Buildroot
+^^^^^^^^^^^^^^^^
+
+Most of the patches are provided within Buildroot, in the package
+directory, because they aim to fix cross-compilation, +libc+ support,
+or whatever the reason is.
+
+These patch files should have the extension +*.patch+.
+
+A +series+ file, like +quilt+ uses it, may also be added in the
+package directory. In that case, the +series+ file defines the patch
+application order.
+
+How patches are applied
+~~~~~~~~~~~~~~~~~~~~~~~
+
+. Run the +<packagename>_PRE_PATCH_HOOKS+ commands if defined;
+
+. Cleanup the build directory from any existing +*.rej+ files;
+
+. If +<packagename>_PATCH+ is defined, then patches from these
+  tarballs are applied;
+
+. If there are some +*.patch+ files in the package directory or in the
+  a package subdirectory named +<packagename>-<packageversion>+, then:
++
+* If a +series+ file exists in the package directory, then patches are
+  applied according to the +series+ file;
++
+* Otherwise, patch files matching `<packagename>-*.patch` or
+  `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
+  name) are applied following the +ls+ command order.
+
+. Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.
+
+If something goes wrong in the steps _3_ or _4_, then the build fails.
+
+Format and licensing of the package patches
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Patches are released under the same license the software that is
+modified.
+
+A message explaining what does the patch and why should be add in the
+patch's header.
+
+You should add a +signed-off-by+ statement in the header of the each
+patch to help keeping track of the changes.
+
+If the software is under versionning, it is recommended to use the SCM
+software to generate the patch set.
+
+Otherwise, concatenate the header with the output of the
++diff -purN source.c.orig source.c+ command.
+
+At the end, the patch should look like:
+
+---------------
+configure.ac: add C++ support test
+
+signed-off-by John Doe <john.doe@noname.org>
+
+--- configure.ac.orig
++++ configure.ac
+@@ -40,2 +40,12 @@
+
+AC_PROG_MAKE_SET
++
++AC_CACHE_CHECK([whether the C++ compiler works],
++               [rw_cv_prog_cxx_works],
++               [AC_LANG_PUSH([C++])
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
++                               [rw_cv_prog_cxx_works=yes],
++                               [rw_cv_prog_cxx_works=no])
++                AC_LANG_POP([C++])])
++
++AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
+---------------
+
+Integrating patches found on the Web
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When integrating a patch whom you are not the author, you have to add
+few things in the header of the patch itself.
+
+Depending on whether the patch has been pick-up from the project
+repository itself, or from somewhere on the web, add one of the
+following tags:
+
+---------------
+Backported from: <some commit id>
+---------------
+
+or
+
+---------------
+Fetch from: <some url>
+---------------
+
+It is also possible to add few words about the changes that may have
+been necessary if any.

From baa838e39251d298dbb4c031638b83a1b28f6881 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:57 +0000
Subject: [PATCH 3296/6849] manual: add adding-package-tips.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-tips.txt | 54 ++++++++++++++++++++++++++++
 docs/manual/adding-packages.txt      |  2 ++
 2 files changed, 56 insertions(+)
 create mode 100644 docs/manual/adding-packages-tips.txt

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
new file mode 100644
index 0000000000..acc73d3113
--- /dev/null
+++ b/docs/manual/adding-packages-tips.txt
@@ -0,0 +1,54 @@
+// -*- mode:doc; -*-
+
+Tips and tricks
+~~~~~~~~~~~~~~~
+
+[[package-name-variable-relation]]
+Package name, config entry name and makefile variable relationship
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In Buildroot, there are some relation between:
+
+* the _package name_, which is the package directory name (and the
+  name of the +*.mk+ file);
+
+* the config entry name that is declared in the +Config.in+ file;
+
+* the makefile variable prefix.
+
+Thus, it is mandatory to keep consistency between all this stuff,
+matching the following rules:
+
+* the _make_ target name will be the _package name_ itself (e.g.:
+  +foo-bar_boo+);
+
+* the config entry is the upper case _package name_ with `.` and `-`
+  characters substituted with `_`, prefixed with +BR2_PACKAGE_+ (e.g.:
+  +BR2_PACKAGE_FOO_BAR_BOO+);
+
+* the +*.mk+ file variable prefix is the upper case _package name_
+  `.` and `-` characters substituted with `_` (e.g.:
+  +FOO_BAR_BOO_VERSION+).
+
+
+[[github-download-url]]
+How to add package from github
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If the package has no release version, or its version cannot be
+identified using tag, then the sha1 of the particular commit should be
+used to identify the version (the first 7 characters of the sha1 are
+enough):
+
+------------------------
+FOO_VERSION = 1234567
+FOO_SITE = http://github.com/<user>/<package>/tarball/<branch>
+------------------------
+
+If the package version matches a tag, then this tag should be used to
+identify the version:
+
+------------------------
+FOO_VERSION = v1.0
+FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
+------------------------
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index 8221c855af..b909d47a83 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -19,4 +19,6 @@ include::adding-packages-cmake.txt[]
 
 include::adding-packages-gettext.txt[]
 
+include::adding-packages-tips.txt[]
+
 include::adding-packages-conclusion.txt[]

From 757eb1910e4a66d57c876f6d19fed45e8283a414 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:58 +0000
Subject: [PATCH 3297/6849] manual: add legal-info.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt |  58 +++++-----
 docs/manual/legal-notice.txt            | 136 ++++++++++++++++++++++++
 docs/manual/manual.txt                  |   2 +
 docs/manual/using.txt                   | 130 ----------------------
 4 files changed, 168 insertions(+), 158 deletions(-)
 create mode 100644 docs/manual/legal-notice.txt

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index e3f16c25e1..b05043a448 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -22,33 +22,35 @@ system is based on hand-written Makefiles or shell scripts.
 06: LIBFOO_VERSION = 1.0
 07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
 08: LIBFOO_SITE = http://www.foosoftware.org/download
-09: LIBFOO_INSTALL_STAGING = YES
-10: LIBFOO_DEPENDENCIES = host-libaaa libbbb
-11:
-12: define LIBFOO_BUILD_CMDS
-13: 	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
-14: endef
-15:
-16: define LIBFOO_INSTALL_STAGING_CMDS
-17: 	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
-18: 	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
-19: 	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
-20: endef
-21:
-22: define LIBFOO_INSTALL_TARGET_CMDS
-23: 	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
-24: 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
-25: endef
-26:
-27: define LIBFOO_DEVICES
-28: 	/dev/foo  c  666  0  0  42  0  -  -  -
-29: endef
-30:
-31: define LIBFOO_PERMISSIONS
-32: 	/bin/foo  f  4755  0  0  -  -  -  -  -
-33: endef
-34:
-35: $(eval $(generic-package))
+09: LIBFOO_LICENSE = GPLv3+
+10: LIBFOO_LICENSE_FILES = COPYING
+11: LIBFOO_INSTALL_STAGING = YES
+12: LIBFOO_DEPENDENCIES = host-libaaa libbbb
+13:
+14: define LIBFOO_BUILD_CMDS
+15:	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
+16: endef
+17:
+18: define LIBFOO_INSTALL_STAGING_CMDS
+19:	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
+20:	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
+21:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
+22: endef
+23:
+24: define LIBFOO_INSTALL_TARGET_CMDS
+25:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
+26:	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
+27: endef
+28:
+29: define LIBFOO_DEVICES
+30:	/dev/foo  c  666  0  0	42  0  -  -  -
+31: endef
+32:
+33: define LIBFOO_PERMISSIONS
+34:	/bin/foo  f  4755  0  0	 -  -  -  -  -
+35: endef
+36:
+37: $(eval $(generic-package))
 --------------------------------
 
 The Makefile begins on line 6 to 8 with metadata information: the
@@ -245,7 +247,7 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_LICENSE+ defines the license (or licenses) under which the package
   is released.
   This name will appear in the manifest file produced by +make legal-info+.
-  If the license is one of those listed in xref:legal-info[],
+  If the license appears in xref:legal-info-list-licenses[the following list],
   use the same string to make the manifest file uniform.
   Otherwise, describe the license in a precise and concise way, avoiding
   ambiguous names such as +BSD+ which actually name a family of licenses.
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
new file mode 100644
index 0000000000..22e5769b65
--- /dev/null
+++ b/docs/manual/legal-notice.txt
@@ -0,0 +1,136 @@
+// -*- mode:doc; -*-
+
+[[legal-info]]
+
+Legal notice and licensing
+==========================
+
+Complying with opensource licenses
+----------------------------------
+
+All of the end products of Buildroot (toolchain, root filesystem, kernel,
+bootloaders) contain opensource software, released under various licenses.
+
+Using opensource software gives you the freedom to build rich embedded
+systems choosing from a wide range of packages, but also gives some
+obligations that you must know and honour.
+Some licenses require you to publish the license text in the documentation of
+your product. Other require you to redistribute the source code of the
+software to those that receive your product.
+
+The exact requirements of each license is documented in each package, and it is
+your (or your legal office's) responsibility to comply with these requirements.
+To make this easier for you, Buildroot can collect for you some material you
+will probably need. To produce this material, after you configured Buildroot
+with +make menuconfig+, +make xconfig+ or +make gconfig+, run:
+
+--------------------
+make legal-info
+--------------------
+
+Buildroot will collect legally-relevant material in your output directory,
+under the +legal-info/+ subdirectory.
+There you will find:
+
+* A +README+ file, that summarizes the produced material and contains warnings
+  about material that Buildroot could not produce.
+* +buildroot.config+: this is the Buildroot configuration file that is usually
+  produced with +make menuconfig+, and which is necessary to reproduce the
+  build.
+* The source code for all packages; this is saved in the +sources/+
+  subdirectory (except for proprietary packages, whose source code is not
+  saved);
+  patches applied to some packages by Buildroot are distributed with the
+  Buildroot sources and are not duplicated in the +sources/+ subdirectory.
+* A manifest file listing the configured packages, their version, license and
+  related information.
+  Some of these information might be not defined in Buildroot; in this case
+  they are clearly marked as "unknown" or similar.
+* A +licenses/+ subdirectory, which contains the license text of packages.
+  If the license file(s) are not defined in Buildroot, the file is not produced
+  and a warning in the +README+ indicates this.
+
+Please note that the aim of the +legal-info+ feature of Buildroot is to
+produce all the material that is somehow relevant for legal compliance with the
+package licenses. Buildroot does not try to produce the exact material that
+you must somehow make public. It does surely produce some more material than is
+needed for a strict legal compliance. For example, it produces the source code
+for packages released under BSD-like licenses, that you might not want to
+redistribute in source form.
+
+Moreover, due to technical limitations, Buildroot does not produce some
+material that you will or may need, such as the toolchain source code and the
+Buildroot source code itself.
+When you run +make legal-info+, Buildroot produces warnings in the +README+
+file to inform you of relevant material that could not be saved.
+
+[[legal-info-list-licenses]]
+Here is a list of the licenses that are most widely used by packages in
+Buildroot, with the name used in the manifest file:
+
+* +GPLv2+:
+  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
+  GNU General Public License, version 2];
+* +GPLv2++:
+  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
+  GNU General Public License, version 2]
+  or (at your option) any later version;
+* +GPLv3+:
+  http://www.gnu.org/licenses/gpl.html[
+  GNU General Public License, version 3];
+* +GPLv3++:
+  http://www.gnu.org/licenses/gpl.html[
+  GNU General Public License, version 3]
+  or (at your option) any later version;
+* +GPL+:
+  http://www.gnu.org/licenses/gpl.html[
+  GNU General Public License] (any version);
+* +LGPLv2.1+:
+  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
+  GNU Lesser General Public License, version 2.1];
+* +LGPLv2.1++:
+  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
+  GNU Lesser General Public License, version 2.1]
+  or (at your option) any later version;
+* +LGPLv3+:
+  http://www.gnu.org/licenses/lgpl.html[
+  GNU Lesser General Public License, version 3];
+* +LGPLv3++:
+  http://www.gnu.org/licenses/lgpl.html[
+  GNU Lesser General Public License, version 3]
+  or (at your option) any later version;
+* +LGPL+:
+  http://www.gnu.org/licenses/lgpl.html[
+  GNU Lesser General Public License] (any version);
+* +BSD-4c+: Original BSD 4-clause license;
+* +BSD-3c+: BSD 3-clause license;
+* +BSD-2c+: BSD 2-clause license;
+* +PROPRIETARY+: marks a non-opensource package;
+  Buildroot does not save any licensing info or source code for these packages.
+
+Complying with the Buildroot license
+------------------------------------
+
+Buildroot itself is an opensource software, released under the
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU General Public
+License, version 2] or (at your option) any later version.
+However, being a build system, it is not normally part of the end product:
+if you develop the root filesystem, kernel, bootloader or toolchain for a
+device, the code of Buildroot is only present on the development machine, not
+in the device storage.
+
+Nevertheless, the general view of the Buildroot developers is that you should
+release the Buildroot source code along with the source code of other packages
+when releasing a product that contains GPL-licensed software.
+This is because the
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU GPL]
+defines the "'complete source code'" for an executable work as "'all the
+source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable'".
+Buildroot is part of the 'scripts used to control compilation and
+installation of the executable', and as such it is considered part of the
+material that must be redistributed.
+
+Keep in mind this is only the Buildroot developers' opinion, and you should
+consult your legal department or lawyer in case of any doubt.
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 4032a6b9b4..a1ee68ad3e 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -23,6 +23,8 @@ include::going-further.txt[]
 
 include::developer-guide.txt[]
 
+include::legal-notice.txt[]
+
 include::get-involved.txt[]
 
 include::contribute.txt[]
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 56ed23b022..e8136f80ae 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -110,133 +110,3 @@ your needs, with all the supports and applications you enabled.
 
 More details about the "make" command usage are given in
 xref:make-tips[].
-
-Complying with opensource licenses
-----------------------------------
-[[legal-info]]
-
-All of the end products of Buildroot (toolchain, root filesystem, kernel,
-bootloaders) contain opensource software, released under various licenses.
-
-Using opensource software gives you the freedom to build rich embedded
-systems choosing from a wide range of packages, but also gives some
-obligations that you must know and honour.
-Some licenses require you to publish the license text in the documentation of
-your product. Other require you to redistribute the source code of the
-software to those that receive your product.
-
-The exact requirements of each license is documented in each package, and it is
-your (or your legal office's) responsibility to comply with these requirements.
-To make this easier for you, Buildroot can collect for you some material you
-will probably need. To produce this material, after you configured Buildroot
-with +make menuconfig+, +make xconfig+ or +make gconfig+, run:
-
---------------------
-make legal-info
---------------------
-
-Buildroot will collect legally-relevant material in your output directory,
-under the +legal-info/+ subdirectory.
-There you will find:
-
-* A +README+ file, that summarizes the produced material and contains warnings
-  about material that Buildroot could not produce.
-* +buildroot.config+: this is the Buildroot configuration file that is usually
-  produced with +make menuconfig+, and which is necessary to reproduce the
-  build.
-* The source code for all packages; this is saved in the +sources/+
-  subdirectory (except for proprietary packages, whose source code is not
-  saved);
-  patches applied to some packages by Buildroot are distributed with the
-  Buildroot sources and are not duplicated in the +sources/+ subdirectory.
-* A manifest file listing the configured packages, their version, license and
-  related information.
-  Some of these information might be not defined in Buildroot; in this case
-  they are clearly marked as "unknown" or similar.
-* A +licenses/+ subdirectory, which contains the license text of packages.
-  If the license file(s) are not defined in Buildroot, the file is not produced
-  and a warning in the +README+ indicates this.
-
-Please note that the aim of the +legal-info+ feature of Buildroot is to
-produce all the material that is somehow relevant for legal compliance with the
-package licenses. Buildroot does not try to produce the exact material that
-you must somehow make public. It does surely produce some more material than is
-needed for a strict legal compliance. For example, it produces the source code
-for packages released under BSD-like licenses, that you might not want to
-redistribute in source form.
-
-Moreover, due to technical limitations, Buildroot does not produce some
-material that you will or may need, such as the toolchain source code and the
-Buildroot source code itself.
-When you run +make legal-info+, Buildroot produces warnings in the +README+
-file to inform you of relevant material that could not be saved.
-
-Here is a list of the licenses that are most widely used by packages in
-Buildroot, with the name used in the manifest file:
-
-* +GPLv2+:
-  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
-  GNU General Public License, version 2];
-* +GPLv2++:
-  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
-  GNU General Public License, version 2]
-  or (at your option) any later version;
-* +GPLv3+:
-  http://www.gnu.org/licenses/gpl.html[
-  GNU General Public License, version 3];
-* +GPLv3++:
-  http://www.gnu.org/licenses/gpl.html[
-  GNU General Public License, version 3]
-  or (at your option) any later version;
-* +GPL+:
-  http://www.gnu.org/licenses/gpl.html[
-  GNU General Public License] (any version);
-* +LGPLv2.1+:
-  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
-  GNU Lesser General Public License, version 2.1];
-* +LGPLv2.1++:
-  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
-  GNU Lesser General Public License, version 2.1]
-  or (at your option) any later version;
-* +LGPLv3+:
-  http://www.gnu.org/licenses/lgpl.html[
-  GNU Lesser General Public License, version 3];
-* +LGPLv3++:
-  http://www.gnu.org/licenses/lgpl.html[
-  GNU Lesser General Public License, version 3]
-  or (at your option) any later version;
-* +LGPL+:
-  http://www.gnu.org/licenses/lgpl.html[
-  GNU Lesser General Public License] (any version);
-* +BSD-4c+: Original BSD 4-clause license;
-* +BSD-3c+: BSD 3-clause license;
-* +BSD-2c+: BSD 2-clause license;
-* +PROPRIETARY+: marks a non-opensource package;
-  Buildroot does not save any licensing info or source code for these packages.
-
-Complying with the Buildroot license
-------------------------------------
-
-Buildroot itself is an opensource software, released under the
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU General Public
-License, version 2] or (at your option) any later version.
-However, being a build system, it is not normally part of the end product:
-if you develop the root filesystem, kernel, bootloader or toolchain for a
-device, the code of Buildroot is only present on the development machine, not
-in the device storage.
-
-Nevertheless, the general view of the Buildroot developers is that you should
-release the Buildroot source code along with the source code of other packages
-when releasing a product that contains GPL-licensed software.
-This is because the
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU GPL]
-defines the "'complete source code'" for an executable work as "'all the
-source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and installation
-of the executable'".
-Buildroot is part of the 'scripts used to control compilation and
-installation of the executable', and as such it is considered part of the
-material that must be redistributed.
-
-Keep in mind this is only the Buildroot developers' opinion, and you should
-consult your legal department or lawyer in case of any doubt.

From c39686fc88dadfd4baa3f7ffef31fa1699650256 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:14:59 +0000
Subject: [PATCH 3298/6849] manual: add pkg-list.txt (generated list of
 available packages)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/appendix.txt |  13 +
 docs/manual/pkg-list.txt | 870 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 883 insertions(+)
 create mode 100644 docs/manual/pkg-list.txt

diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index a6642b5cbb..6f1e9f3617 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -4,3 +4,16 @@ Appendix
 ========
 
 include::makedev-syntax.txt[]
+
+[[package-list]]
+Available packages
+------------------
+// docs/manaual/pkg-list.txt is generated using the following command:
+// $ git grep -E '\((autotools|cmake|generic)-package\)' package/ |  \
+//     cut -d':' -f1 | grep '\.mk$' | \
+//     sed -e 's;.*\?/\(.*\?\).mk;* \1;' | \
+//     sort > docs/manual/pkg-list.txt
+
+include::pkg-list.txt[]
+
+include::deprecated-list.txt[]
diff --git a/docs/manual/pkg-list.txt b/docs/manual/pkg-list.txt
new file mode 100644
index 0000000000..5d9b54fd14
--- /dev/null
+++ b/docs/manual/pkg-list.txt
@@ -0,0 +1,870 @@
+* acl
+* acpid
+* alsa-lib
+* alsamixergui
+* alsa-utils
+* apr
+* apr-util
+* argp-standalone
+* argus
+* arptables
+* at
+* atk
+* attr
+* audiofile
+* aumix
+* autoconf
+* automake
+* avahi
+* axel
+* bash
+* beecrypt
+* bellagio
+* berkeleydb
+* bind
+* binutils
+* bison
+* blackbox
+* bluez_utils
+* bmon
+* boa
+* bonnie
+* boost
+* bootutils
+* bridge-utils
+* bsdiff
+* busybox
+* bwm-ng
+* bzip2
+* cairo
+* can-utils
+* ccache
+* ccid
+* cdrkit
+* cgilua
+* cifs-utils
+* cjson
+* cloop
+* cmake
+* collectd
+* connman
+* conntrack-tools
+* copas
+* coreutils
+* coxpcall
+* cpanminus
+* cpuload
+* cramfs
+* ctorrent
+* cups
+* cvs
+* dash
+* dbus
+* dbus-glib
+* dbus-python
+* devmem2
+* dhcp
+* dhcpdump
+* dhrystone
+* dialog
+* diffutils
+* directfb
+* directfb-examples
+* distcc
+* divine
+* dmalloc
+* dmidecode
+* dmraid
+* dnsmasq
+* docker
+* doom-wad
+* dosfstools
+* dropbear
+* dsp-tools
+* dstat
+* e2fsprogs
+* ebtables
+* ed
+* eeprog
+* empty
+* enchant
+* erlang
+* ethtool
+* evtest
+* expat
+* expedite
+* explorercanvas
+* ezxml
+* faad2
+* fbdump
+* fbgrab
+* fbset
+* fbterm
+* fb-test-app
+* fbv
+* fconfig
+* feh
+* ffmpeg
+* fftw
+* file
+* findutils
+* fis
+* flac
+* flashrom
+* flex
+* flot
+* fltk
+* fluxbox
+* fmtools
+* fontconfig
+* freerdp
+* freetype
+* fxload
+* gadgetfs-test
+* gamin
+* gawk
+* gdbm
+* gdisk
+* gdk-pixbuf
+* genext2fs
+* genromfs
+* gettext
+* giblib
+* glib-networking
+* gmp
+* gmpc
+* gnuchess
+* gnupg
+* gnutls
+* gob2
+* googlefontdirectory
+* gperf
+* gpsd
+* gqview
+* grantlee
+* grep
+* gsl
+* gst-dsp
+* gst-ffmpeg
+* gst-omapfb
+* gst-plugins-bad
+* gst-plugins-base
+* gst-plugins-good
+* gst-plugins-ugly
+* gstreamer
+* gtk2-engines
+* gtk2-theme-hicolor
+* gtkperf
+* gvfs
+* gzip
+* haserl
+* hdparm
+* heirloom-mailx
+* hiawatha
+* hostapd
+* htop
+* hwdata
+* i2c-tools
+* icu
+* ifplugd
+* igh-ethercat
+* imagemagick
+* imlib2
+* inadyn
+* inotify-tools
+* input-event-daemon
+* input-tools
+* intltool
+* iostat
+* iperf
+* ipkg
+* iproute2
+* ipsec-tools
+* ipset
+* iptables
+* irda-utils
+* iw
+* jpeg
+* jquery
+* jquery-sparkline
+* jquery-validation
+* jsmin
+* json-c
+* kbd
+* kexec
+* kismet
+* kmod
+* lame
+* latencytop
+* lcdapi
+* lcdproc
+* leafpad
+* less
+* libaio
+* libao
+* libarchive
+* libargtable2
+* libart
+* libatomic_ops
+* libcap
+* libcap-ng
+* libcdaudio
+* libcgi
+* libcgicc
+* libconfig
+* libconfuse
+* libcue
+* libcuefile
+* libcurl
+* libdaemon
+* libdmtx
+* libdnet
+* libdrm
+* libdvdnav
+* libdvdread
+* libecore
+* libedbus
+* libedje
+* libeet
+* libefreet
+* libeina
+* libelementary
+* libelf
+* libembryo
+* liberation
+* libesmtp
+* libethumb
+* libev
+* libevas
+* libevent
+* libexif
+* libeXosip2
+* libfcgi
+* libffi
+* libfreefare
+* libftdi
+* libfuse
+* libgail
+* libgcrypt
+* libgeotiff
+* libglade
+* libglib2
+* libgpg-error
+* libgtk2
+* libhid
+* libical
+* libiconv
+* libid3tag
+* libidn
+* libiqrf
+* liblo
+* liblockfile
+* liblog4c-localtime
+* libmad
+* libmbus
+* libmicrohttpd
+* libmms
+* libmnl
+* libmodbus
+* libmpd
+* libmpeg2
+* libnetfilter-acct
+* libnetfilter-conntrack
+* libnetfilter-cthelper
+* libnetfilter-cttimeout
+* libnetfilter-log
+* libnetfilter-queue
+* libnfc
+* libnfc-llcp
+* libnfnetlink
+* libnl
+* libnspr
+* libnss
+* liboauth
+* libogg
+* liboping
+* libosip2
+* libpcap
+* libplayer
+* libpng
+* libraw
+* libraw1394
+* libreplaygain
+* libroxml
+* librsvg
+* librsync
+* libsamplerate
+* libsexy
+* libsigc
+* libsndfile
+* libsoup
+* libsvgtiny
+* libsysfs
+* libtheora
+* libtirpc
+* libtool
+* libtorrent
+* libtpl
+* libungif
+* libupnp
+* liburcu
+* libusb
+* libusb-compat
+* libv4l
+* libvncserver
+* libvorbis
+* libxcb
+* libxml2
+* libxml-parser-perl
+* libxslt
+* libyaml
+* lighttpd
+* links
+* linphone
+* linux-firmware
+* linux-fusion
+* linux-pam
+* lite
+* live555
+* lmbench
+* lm-sensors
+* lockfile-progs
+* logrotate
+* logsurfer
+* lrzsz
+* lshw
+* lsof
+* lsuio
+* ltp-testsuite
+* ltrace
+* lttng-babeltrace
+* lttng-libust
+* lttng-modules
+* lttng-tools
+* lua
+* luacjson
+* luaexpat
+* luafilesystem
+* luajit
+* luasocket
+* lvm2
+* lzma
+* lzo
+* lzop
+* m4
+* macchanger
+* madplay
+* make
+* makedevs
+* matchbox-common
+* matchbox-desktop
+* matchbox-fakekey
+* matchbox-keyboard
+* matchbox-lib
+* matchbox-panel
+* matchbox-startup-monitor
+* matchbox-wm
+* mcookie
+* mdadm
+* mediastreamer
+* memstat
+* memtester
+* mesa3d
+* metacity
+* microperl
+* midori
+* mii-diag
+* minicom
+* mobile_broadband_provider_info
+* module-init-tools
+* monit
+* mpc
+* mpd
+* mpfr
+* mpg123
+* mplayer
+* mrouted
+* msmtp
+* mtd
+* mtdev
+* mtdev2tuio
+* musepack
+* mutt
+* mxml
+* mysql_client
+* nano
+* nanocom
+* nasm
+* nbd
+* ncftp
+* ncurses
+* ndisc6
+* neon
+* netatalk
+* netcat
+* netkitbase
+* netkittelnet
+* netperf
+* netplug
+* netsnmp
+* netstat-nat
+* network-manager
+* newt
+* nfacct
+* nfs-utils
+* ngircd
+* ngrep
+* noip
+* nss-mdns
+* ntfs-3g
+* ntp
+* nuttcp
+* ocf-linux
+* ofono
+* olsr
+* open2300
+* opencv
+* openntpd
+* openocd
+* openssh
+* openssl
+* openswan
+* openvpn
+* opkg
+* oprofile
+* opus
+* opus-tools
+* orc
+* ortp
+* owl-linux
+* pango
+* parted
+* patch
+* pciutils
+* pcmanfm
+* pcre
+* pcsc-lite
+* perl
+* php
+* picocom
+* pixman
+* pkgconf
+* pkg-config
+* poco
+* polarssl
+* popt
+* portaudio
+* portmap
+* pppd
+* pptp-linux
+* prboom
+* procps
+* proftpd
+* protobuf
+* psmisc
+* pthread-stubs
+* pulseaudio
+* pv
+* python
+* python3
+* python-dpkt
+* python-id3
+* python-mad
+* python-meld3
+* python-netifaces
+* python-nfc
+* python-protobuf
+* python-pygame
+* python-serial
+* python-setuptools
+* qextserialport
+* qt
+* qtuio
+* quagga
+* quota
+* radvd
+* ramspeed
+* rdesktop
+* read-edid
+* readline
+* rings
+* rng-tools
+* rpcbind
+* rpm
+* rp-pppoe
+* rrdtool
+* rsh-redone
+* rsync
+* rsyslog
+* rtai
+* rtorrent
+* rt-tests
+* rubix
+* ruby
+* samba
+* sane-backends
+* sawman
+* schifra
+* sconeserver
+* screen
+* sdl
+* sdl_gfx
+* sdl_image
+* sdl_mixer
+* sdl_net
+* sdl_sound
+* sdl_ttf
+* sdparm
+* sed
+* ser2net
+* setserial
+* shared-mime-info
+* slang
+* smartmontools
+* socat
+* socketcand
+* sound-theme-borealis
+* sound-theme-freedesktop
+* spawn-fcgi
+* speex
+* sqlcipher
+* sqlite
+* squashfs
+* squashfs3
+* squid
+* sredird
+* sshfs
+* sstrip
+* startup-notification
+* statserial
+* strace
+* stress
+* stunnel
+* sudo
+* supervisor
+* sylpheed
+* synergy
+* sysklogd
+* sysprof
+* sysstat
+* systemd
+* sysvinit
+* taglib
+* tar
+* tcl
+* tcpdump
+* tcpreplay
+* tftpd
+* thttpd
+* tidsp-binaries
+* tiff
+* time
+* tinyhttpd
+* ti-utils
+* tn5250
+* torsmo
+* transmission
+* tremor
+* tslib
+* ttcp
+* uboot-tools
+* udev
+* udpcast
+* uemacs
+* ulogd
+* unionfs
+* usb_modeswitch
+* usb_modeswitch_data
+* usbmount
+* usbutils
+* ushare
+* util-linux
+* vala
+* valgrind
+* vim
+* vorbis-tools
+* vpnc
+* vsftpd
+* vtun
+* wavpack
+* webkit
+* webrtc-audio-processing
+* wget
+* whetstone
+* which
+* wipe
+* wireless_tools
+* wpa_supplicant
+* wsapi
+* x11vnc
+* xapp_appres
+* xapp_bdftopcf
+* xapp_beforelight
+* xapp_bitmap
+* xapp_editres
+* xapp_fonttosfnt
+* xapp_fslsfonts
+* xapp_fstobdf
+* xapp_iceauth
+* xapp_ico
+* xapp_listres
+* xapp_luit
+* xapp_mkfontdir
+* xapp_mkfontscale
+* xapp_oclock
+* xapp_rgb
+* xapp_rstart
+* xapp_scripts
+* xapp_sessreg
+* xapp_setxkbmap
+* xapp_showfont
+* xapp_smproxy
+* xapp_twm
+* xapp_viewres
+* xapp_x11perf
+* xapp_xauth
+* xapp_xbacklight
+* xapp_xbiff
+* xapp_xcalc
+* xapp_xclipboard
+* xapp_xclock
+* xapp_xcmsdb
+* xapp_xcursorgen
+* xapp_xdbedizzy
+* xapp_xditview
+* xapp_xdm
+* xapp_xdpyinfo
+* xapp_xdriinfo
+* xapp_xedit
+* xapp_xev
+* xapp_xeyes
+* xapp_xf86dga
+* xapp_xfd
+* xapp_xfontsel
+* xapp_xfs
+* xapp_xfsinfo
+* xapp_xgamma
+* xapp_xgc
+* xapp_xhost
+* xapp_xinit
+* xapp_xinput
+* xapp_xinput-calibrator
+* xapp_xkbcomp
+* xapp_xkbevd
+* xapp_xkbprint
+* xapp_xkbutils
+* xapp_xkill
+* xapp_xload
+* xapp_xlogo
+* xapp_xlsatoms
+* xapp_xlsclients
+* xapp_xlsfonts
+* xapp_xmag
+* xapp_xman
+* xapp_xmessage
+* xapp_xmh
+* xapp_xmodmap
+* xapp_xmore
+* xapp_xplsprinters
+* xapp_xpr
+* xapp_xprehashprinterlist
+* xapp_xprop
+* xapp_xrandr
+* xapp_xrdb
+* xapp_xrefresh
+* xapp_xset
+* xapp_xsetmode
+* xapp_xsetpointer
+* xapp_xsetroot
+* xapp_xsm
+* xapp_xstdcmap
+* xapp_xvidtune
+* xapp_xvinfo
+* xapp_xwd
+* xapp_xwininfo
+* xapp_xwud
+* xavante
+* xcb-proto
+* xcb-util
+* xdata_xbitmaps
+* xdata_xcursor-themes
+* xdriver_xf86-input-acecad
+* xdriver_xf86-input-aiptek
+* xdriver_xf86-input-evdev
+* xdriver_xf86-input-joystick
+* xdriver_xf86-input-keyboard
+* xdriver_xf86-input-mouse
+* xdriver_xf86-input-synaptics
+* xdriver_xf86-input-tslib
+* xdriver_xf86-input-vmmouse
+* xdriver_xf86-input-void
+* xdriver_xf86-video-apm
+* xdriver_xf86-video-ark
+* xdriver_xf86-video-ast
+* xdriver_xf86-video-ati
+* xdriver_xf86-video-chips
+* xdriver_xf86-video-cirrus
+* xdriver_xf86-video-dummy
+* xdriver_xf86-video-fbdev
+* xdriver_xf86-video-geode
+* xdriver_xf86-video-glide
+* xdriver_xf86-video-glint
+* xdriver_xf86-video-i128
+* xdriver_xf86-video-i740
+* xdriver_xf86-video-intel
+* xdriver_xf86-video-mach64
+* xdriver_xf86-video-mga
+* xdriver_xf86-video-neomagic
+* xdriver_xf86-video-newport
+* xdriver_xf86-video-nv
+* xdriver_xf86-video-openchrome
+* xdriver_xf86-video-r128
+* xdriver_xf86-video-rendition
+* xdriver_xf86-video-s3
+* xdriver_xf86-video-s3virge
+* xdriver_xf86-video-savage
+* xdriver_xf86-video-siliconmotion
+* xdriver_xf86-video-sis
+* xdriver_xf86-video-sisusb
+* xdriver_xf86-video-suncg14
+* xdriver_xf86-video-suncg3
+* xdriver_xf86-video-suncg6
+* xdriver_xf86-video-sunffb
+* xdriver_xf86-video-sunleo
+* xdriver_xf86-video-suntcx
+* xdriver_xf86-video-tdfx
+* xdriver_xf86-video-tga
+* xdriver_xf86-video-trident
+* xdriver_xf86-video-tseng
+* xdriver_xf86-video-v4l
+* xdriver_xf86-video-vesa
+* xdriver_xf86-video-vmware
+* xdriver_xf86-video-voodoo
+* xdriver_xf86-video-wsfb
+* xdriver_xf86-video-xgi
+* xdriver_xf86-video-xgixp
+* xenomai
+* xerces
+* xfont_encodings
+* xfont_font-adobe-100dpi
+* xfont_font-adobe-75dpi
+* xfont_font-adobe-utopia-100dpi
+* xfont_font-adobe-utopia-75dpi
+* xfont_font-adobe-utopia-type1
+* xfont_font-alias
+* xfont_font-arabic-misc
+* xfont_font-bh-100dpi
+* xfont_font-bh-75dpi
+* xfont_font-bh-lucidatypewriter-100dpi
+* xfont_font-bh-lucidatypewriter-75dpi
+* xfont_font-bh-ttf
+* xfont_font-bh-type1
+* xfont_font-bitstream-100dpi
+* xfont_font-bitstream-75dpi
+* xfont_font-bitstream-speedo
+* xfont_font-bitstream-type1
+* xfont_font-cronyx-cyrillic
+* xfont_font-cursor-misc
+* xfont_font-daewoo-misc
+* xfont_font-dec-misc
+* xfont_font-ibm-type1
+* xfont_font-isas-misc
+* xfont_font-jis-misc
+* xfont_font-micro-misc
+* xfont_font-misc-cyrillic
+* xfont_font-misc-ethiopic
+* xfont_font-misc-meltho
+* xfont_font-misc-misc
+* xfont_font-mutt-misc
+* xfont_font-schumacher-misc
+* xfont_font-screen-cyrillic
+* xfont_font-sony-misc
+* xfont_font-sun-misc
+* xfont_font-util
+* xfont_font-winitzki-cyrillic
+* xfont_font-xfree86-type1
+* xfsprogs
+* xinetd
+* xkeyboard-config
+* xl2tp
+* xlib_libdmx
+* xlib_libfontenc
+* xlib_libFS
+* xlib_libICE
+* xlib_liboldX
+* xlib_libpciaccess
+* xlib_libSM
+* xlib_libX11
+* xlib_libXau
+* xlib_libXaw
+* xlib_libXcomposite
+* xlib_libXcursor
+* xlib_libXdamage
+* xlib_libXdmcp
+* xlib_libXext
+* xlib_libXfixes
+* xlib_libXfont
+* xlib_libXfontcache
+* xlib_libXft
+* xlib_libXi
+* xlib_libXinerama
+* xlib_libxkbfile
+* xlib_libxkbui
+* xlib_libXmu
+* xlib_libXp
+* xlib_libXpm
+* xlib_libXprintAppUtil
+* xlib_libXprintUtil
+* xlib_libXrandr
+* xlib_libXrender
+* xlib_libXres
+* xlib_libXScrnSaver
+* xlib_libXt
+* xlib_libXtst
+* xlib_libXv
+* xlib_libXvMC
+* xlib_libXxf86dga
+* xlib_libXxf86vm
+* xlib_xtrans
+* xmlstarlet
+* xproto_applewmproto
+* xproto_bigreqsproto
+* xproto_compositeproto
+* xproto_damageproto
+* xproto_dmxproto
+* xproto_dri2proto
+* xproto_fixesproto
+* xproto_fontcacheproto
+* xproto_fontsproto
+* xproto_glproto
+* xproto_inputproto
+* xproto_kbproto
+* xproto_printproto
+* xproto_randrproto
+* xproto_recordproto
+* xproto_renderproto
+* xproto_resourceproto
+* xproto_scrnsaverproto
+* xproto_videoproto
+* xproto_windowswmproto
+* xproto_xcmiscproto
+* xproto_xextproto
+* xproto_xf86bigfontproto
+* xproto_xf86dgaproto
+* xproto_xf86driproto
+* xproto_xf86rushproto
+* xproto_xf86vidmodeproto
+* xproto_xineramaproto
+* xproto_xproto
+* xserver_xorg-server
+* xstroke
+* xterm
+* xutil_makedepend
+* xutil_util-macros
+* xvkbd
+* xz
+* yajl
+* yasm
+* zeromq
+* zlib
+* zxing

From 8cbd58f013502652e29f7b5ba342cdfd543b485d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:15:00 +0000
Subject: [PATCH 3299/6849] manual: add deprecated-list.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/deprecated-list.txt | 46 +++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 docs/manual/deprecated-list.txt

diff --git a/docs/manual/deprecated-list.txt b/docs/manual/deprecated-list.txt
new file mode 100644
index 0000000000..6dc87a4456
--- /dev/null
+++ b/docs/manual/deprecated-list.txt
@@ -0,0 +1,46 @@
+// -*- mode:doc -*- ;
+
+[[deprecated]]
+Deprecated list
+---------------
+
+The following stuff are marked as _deprecated_ in Buildroot due to
+their status either too old or unmaintained.
+
+// list generated using the followings command:
+// $ git grep -EB4 'depends on BR2_DEPRECATED'
+// and
+// $ git grep -EB4 'depends on BR2_DEPRECATED' | \
+//     grep -Eo '(:|-).*?(config|comment) BR2_.*'
+//
+// Need manual checks and sorting.
+
+* Packages:
+
+** +busybox+ 1.18.x
+** +customize+
+** +lzma+
+** +microperl+
+** +netkitbase+
+** +netkittelnet+
+** +pkg-config+
+** +squashfs3+
+** +ttcp+
+
+* Toolchain:
+
+** +gdb+ 6.8
+** +gdb+ 7.0.1
+** +gdb+ 7.1
+** +kernel headers+ 2.6.37
+** +kernel headers+ 2.6.38
+** +kernel headers+ 2.6.39
+
+* Bootloaders:
+
+** +u-boot+ 2011-06
+** +u-boot+ 2011-09
+
+* Output images:
+
+** squashfs3 image

From b6584017b4621bad2de7f7d441bd3ea78e70e67d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 11 Nov 2012 03:15:01 +0000
Subject: [PATCH 3300/6849] manual: add beyond-buildroot.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/beyond-buildroot.txt | 38 ++++++++++++++++++++++++++++++++
 docs/manual/manual.txt           |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 docs/manual/beyond-buildroot.txt

diff --git a/docs/manual/beyond-buildroot.txt b/docs/manual/beyond-buildroot.txt
new file mode 100644
index 0000000000..12ce78cc27
--- /dev/null
+++ b/docs/manual/beyond-buildroot.txt
@@ -0,0 +1,38 @@
+// -*- mode:doc; -*-
+
+Beyond Buildroot
+================
+
+Boot the generated images
+-------------------------
+
+NFS boot
+~~~~~~~~
+
+To achieve NFS-boot, enable _tar root filesystem_ in the _Filesystem
+images_ menu.
+
+After complete build, just run the following commands to setup the
+NFS-root directory:
+
+-------------------
+sudo tar -xavf /path/to/output_dir/rootfs.tar -C /path/to/nfs_root_dir
+-------------------
+
+Then, you can execute a NFS-boot from your target.
+
+Chroot
+------
+
+If you want to chroot in a generated image, then there are few thing
+you should be aware of:
+
+* you should setup the new root from the _tar root filesystem_ image;
+
+* either the selected target architecture is compatible with your host
+  machine, or you should use some +qemu-*+ binary and correctly set it
+  within the +binfmt+ properties to be able to run the binaries built
+  for the target on your host machine;
+
+* Buildroot does not currently provide +host-qemu+ and +binfmt+
+  correctly built and set for that kind of use.
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index a1ee68ad3e..c34e0ca46e 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -25,6 +25,8 @@ include::developer-guide.txt[]
 
 include::legal-notice.txt[]
 
+include::beyond-buildroot.txt[]
+
 include::get-involved.txt[]
 
 include::contribute.txt[]

From ffdb08d2219d2613f3aa9b20c30b20090948dded Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 11 Nov 2012 23:18:12 +0000
Subject: [PATCH 3301/6849] lcdproc: fix autobuilder failures

The lcdproc version bump to 0.5.6 has resulted in autobuilder failures such as
the following.

  http://autobuild.buildroot.org/results/9967bc20a6094e836c4c18ff2cd30edef143bb8e/build-end.log

The 0.5.6 release added a new glcd driver, which requires the freetype and zlib
libraries. This patch makes the lcdproc package depend on freetype and zlib.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdproc/Config.in  | 2 ++
 package/lcdproc/lcdproc.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in
index 820f4eae57..e0afc44b96 100644
--- a/package/lcdproc/Config.in
+++ b/package/lcdproc/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_LCDPROC
        bool "lcdproc"
+       select BR2_PACKAGE_FREETYPE
        select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_ZLIB
        help
          LCD display driver daemon and clients
 
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index aa204f15c6..2a80289e39 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -16,6 +16,6 @@ ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
 LCDPROC_CONF_OPT += --enable-lcdproc-menus
 endif
 
-LCDPROC_DEPENDENCIES = ncurses
+LCDPROC_DEPENDENCIES = freetype ncurses zlib
 
 $(eval $(autotools-package))

From a5004bcab189b3dc72e682bd37f0adabeb71cb30 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 12 Nov 2012 01:47:21 +0000
Subject: [PATCH 3302/6849] lcdproc: remove patch rejected upstream

Remove an lcdproc patch which has been rejected upstream. It has been
decided by lcdproc developer Markus Dolze that the behaviour of the
client_add_key command when handling the minus key is "intentional to
some degree."

This patch also takes the opportunity to remove the version number from the
single remaining lcdproc patch.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...c-0.5.5-fix-client_add_key-for-minus.patch | 38 -------------------
 ...CDd.conf.patch => lcdproc-LCDd.conf.patch} |  0
 2 files changed, 38 deletions(-)
 delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
 rename package/lcdproc/{lcdproc-0.5.5-LCDd.conf.patch => lcdproc-LCDd.conf.patch} (100%)

diff --git a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch b/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
deleted file mode 100644
index c17ee83af8..0000000000
--- a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Calling client_add_key as follows
-
-  client_add_key -
-
-will fail. However using an explicit -shared option, like this:
-
-  client_add_key -shared -
-
-will succeed. This is caused by a failure to parse the - key token, which is
-mistaken for the first character of an option argument.
-
-The client_add_key command also returns a spurious "success" message when a
-malformed option is supplied.
-
-This patch fixes both issues.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/server/commands/client_commands.c b/server/commands/client_commands.c
---- a/server/commands/client_commands.c	2011-08-14 13:29:16.000000000 +0100
-+++ b/server/commands/client_commands.c	2012-10-05 07:50:40.357795535 +0100
-@@ -181,7 +181,7 @@ client_add_key_func(Client *c, int argc,
- 	}
- 
- 	argnr = 1;
--	if (argv[argnr][0] == '-') {
-+	if (argv[argnr][0] == '-' && strcmp(argv[argnr], "-") != 0) {
- 		if (strcmp( argv[argnr], "-shared") == 0) {
- 			exclusively = 0;
- 		}
-@@ -190,6 +190,7 @@ client_add_key_func(Client *c, int argc,
- 		}
- 		else {
- 			sock_printf_error(c->sock, "Invalid option: %s\n", argv[argnr]);
-+			return 0;
- 		}
- 		argnr++;
- 	}
diff --git a/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch b/package/lcdproc/lcdproc-LCDd.conf.patch
similarity index 100%
rename from package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch
rename to package/lcdproc/lcdproc-LCDd.conf.patch

From dcc6bcd516ceeacf556c37364570796cd0d1eba7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Nov 2012 12:07:50 +0000
Subject: [PATCH 3303/6849] binutils: bump 2.23 series to 2.23.1 and deprecate
 2.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host                        | 10 +++++-----
 .../120-sh-conf.patch                                  |  0
 .../300-001_ld_makefile_patch.patch                    |  0
 .../300-012_check_ldrunpath_length.patch               |  0
 .../500-sysroot.patch                                  |  0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename package/binutils/{binutils-2.23 => binutils-2.23.1}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.23 => binutils-2.23.1}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.23 => binutils-2.23.1}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.23 => binutils-2.23.1}/500-sysroot.patch (100%)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 26c5f73ad1..81a4cf7d0f 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -13,7 +13,7 @@ choice
 	       bool "binutils 2.18-avr32-1.0.1"
 
 	config BR2_BINUTILS_VERSION_2_20
-		depends on !BR2_avr32
+		depends on !BR2_avr32 && BR2_DEPRECATED
 		bool "binutils 2.20"
 
 	config BR2_BINUTILS_VERSION_2_20_1
@@ -31,10 +31,10 @@ choice
 	config BR2_BINUTILS_VERSION_2_22
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.22"
-	
-	config BR2_BINUTILS_VERSION_2_23
+
+	config BR2_BINUTILS_VERSION_2_23_1
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
-		bool "binutils 2.23"
+		bool "binutils 2.23.1"
 
 endchoice
 
@@ -46,7 +46,7 @@ config BR2_BINUTILS_VERSION
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
 	default "2.22"		if BR2_BINUTILS_VERSION_2_22
-	default "2.23"		if BR2_BINUTILS_VERSION_2_23
+	default "2.23.1"	if BR2_BINUTILS_VERSION_2_23_1
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
diff --git a/package/binutils/binutils-2.23/120-sh-conf.patch b/package/binutils/binutils-2.23.1/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.23/120-sh-conf.patch
rename to package/binutils/binutils-2.23.1/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.23.1/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.23/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.23.1/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.23.1/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.23/300-012_check_ldrunpath_length.patch
rename to package/binutils/binutils-2.23.1/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.23/500-sysroot.patch b/package/binutils/binutils-2.23.1/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.23/500-sysroot.patch
rename to package/binutils/binutils-2.23.1/500-sysroot.patch

From cea473d8afaf164a83b1bef92965d3d28e11c41f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 12:28:47 +0000
Subject: [PATCH 3304/6849] xlib_libXt: add patch to fix cross-compilation
 issue

Fixes the following build failure:

 http://autobuild.buildroot.org/results/2815885d589d75259508bcce4f272b8dddb3be77/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...n-t-link-makestrs-with-target-cflags.patch | 51 +++++++++++++++++++
 package/x11r7/xlib_libXt/xlib_libXt.mk        |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch

diff --git a/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch b/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch
new file mode 100644
index 0000000000..aafb352355
--- /dev/null
+++ b/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch
@@ -0,0 +1,51 @@
+From 9324466141626518e5a67838813562ec6ef62ba3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 15 Nov 2012 18:31:53 +0100
+Subject: [PATCH] util: don't link makestrs with target cflags
+
+The line:
+
+makestrs_CFLAGS = $(XT_CFLAGS)
+
+in util/Makefile.am is wrong because it adds target cflags to the
+compilation of makestrs, which is built for the build machine, which
+leads to build failures when cross-compiling.
+
+We also remove the inclusion of <X11/Xos.h> from makestrs.c, because
+it was the only non-standard header being included (and therefore
+possibly requiring special cflags), but it was in reality not useful
+at all to build makestrs.c.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ util/Makefile.am |    1 -
+ util/makestrs.c  |    1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/util/Makefile.am b/util/Makefile.am
+index 969ecef..cc6f3fc 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -10,7 +10,6 @@ EXTRA_DIST = \
+ 	StrDefs.ht \
+ 	string.list
+ 
+-makestrs_CFLAGS = $(XT_CFLAGS)
+ makestrs_SOURCES = makestrs.c
+ 
+ 
+diff --git a/util/makestrs.c b/util/makestrs.c
+index 3551cc1..456735b 100644
+--- a/util/makestrs.c
++++ b/util/makestrs.c
+@@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group.
+ /* Constructs string definitions */
+ 
+ #include <stdio.h>
+-#include <X11/Xos.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
+-- 
+1.7.9.5
+
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index b2667d3db1..fd8f079363 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -10,5 +10,6 @@ XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
 XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
+XLIB_LIBXT_AUTORECONF = YES
 
 $(eval $(autotools-package))

From 27a0cfaa64605eac86a69e6a565eeda556b6b125 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 12:12:05 +0000
Subject: [PATCH 3305/6849] libnspr: fix build with ARMv7 toolchains

Fixes the following build failure:

  http://autobuild.buildroot.org/results/d7323831372050e425a34f5104a46d8cbd6be214/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 736984d096..a9d5812f21 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -16,6 +16,12 @@ LIBNSPR_CONF_OPT  = --host=$(GNU_HOST_NAME)
 LIBNSPR_CONF_OPT += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
 LIBNSPR_CONF_OPT += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
+ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
+LIBNSPR_CONF_OPT += --enable-thumb2
+else
+LIBNSPR_CONF_OPT += --disable-thumb2
+endif
+
 define LIBNSPR_INSTALL_STAGING_PC
 	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnspr/nspr.pc.in \
 		$(STAGING_DIR)/usr/lib/pkgconfig/nspr.pc

From b0e53fef86814d0e300665f80374e61840e9a38c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 12:28:55 +0000
Subject: [PATCH 3306/6849] toolchain/gdb: disable support of full gdb on
 target for blackfin

There is no support in gdb 6.6 for the Blackfin architecture, so
disallow this choice. This fixes the following build failure:

  http://autobuild.buildroot.org/results/e37db29810265a756833da163fda444d967d7874/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 8acce1e386..ca0c82176e 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
-	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
 	# The newest versions of gdb require thread debugging in the
 	# toolchain. The only cases for which this is not needed is if
 	# we use gdb 6.8 (marked deprecated)

From c7ece205fae5070b2ddaddf60ee73357ce4ad2bf Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 15 Nov 2012 20:13:32 +0000
Subject: [PATCH 3307/6849] manual: prerequisite.txt: add texinfo to the
 mandatory package list

Using the internal Buildroot toolchain backend, makeinfo, whom belongs to
the texinfo package, is required to build gcc and gdb.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/prerequisite.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 693347b96a..31d437d9c3 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -42,6 +42,7 @@ Mandatory packages
 ** +python+ (version 2.6 or 2.7)
 ** +unzip+
 ** +rsync+
+** +texinfo+ (required for internal Buildroot toolchain backend)
 
 * Source fetching tools:
 ** +wget+

From b04a6d7bda0a0241003a79d026569d6e81e07105 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 15 Nov 2012 20:13:33 +0000
Subject: [PATCH 3308/6849] manual: contribute.txt: do not use --summary option
 with 'git format-patch'

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/contribute.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index ddf790d71b..b2e6e7d631 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -42,8 +42,8 @@ This will generate patch files in the +outgoing+ subdirectory,
 automatically adding the +signed-off-by+ line.
 
 If you want to present the whole patch set in a separate mail, add
-+--cover-letter --summary+ to the previous command line (+man
-git-format-patch+ for further information).
++--cover-letter+ to the previous command line (+man git-format-patch+
+for further information).
 
 Once patch files are generated, you can review/edit the commit message
 before submitting them using your favorite text editor.

From b5ffa8e3dfca9db911de15e06daafae1f5cc2b07 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 15 Nov 2012 22:56:22 +0000
Subject: [PATCH 3309/6849] can-utils: add CAN FD support

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/can-utils/can-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
index ea1dc06e7d..321dc5231b 100644
--- a/package/can-utils/can-utils.mk
+++ b/package/can-utils/can-utils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-CAN_UTILS_VERSION = 50775159276d896d8b3102b6dbc658a91a2a1d53
+CAN_UTILS_VERSION = 836d3cc0122ce31a1b732d369cbd27b690c3110f
 CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
 CAN_UTILS_AUTORECONF = YES
 

From 3116742e8f0c45e5ca06b32f91e481763356e03e Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 16 Nov 2012 00:42:10 +0000
Subject: [PATCH 3310/6849] kexec: disable on unsupported architectures

kexec only supports the following architectures.

  i?86
  powerpc
  powerpc64
  arm*
  s390x|s390
  sh4|sh4a|sh3|sh
  mips*
  cris
  crisv32
  ia64
  x86_64
  alpha

The Buildroot kexec package is available when an unsupported target
architecture is selected, leading to autobuild failures like the following.

  http://autobuild.buildroot.net/results/e706b08abb4fd1987fc4aa970d6be50fc92dc1fa/build-end.log

This patch makes the kexec package available only for the supported
architectures.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/kexec/Config.in b/package/kexec/Config.in
index e59a07b9d5..886144f9c7 100644
--- a/package/kexec/Config.in
+++ b/package/kexec/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_KEXEC
 	bool "kexec"
-	depends on !BR2_avr32
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
+		BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \
+		BR2_powerpc || BR2_sh4 || BR2_sh4a || BR2_sh3
 	help
 	  Kexec is a user space utiltity for loading another kernel
 	  and asking the currently running kernel to do something with it.

From 30d99041ce5f32c30c470c3b114d612ba26e49ef Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 04:01:14 +0000
Subject: [PATCH 3311/6849] cpanminus: mark as broken

cpanminus is currently responsible for about half of the autobuilder
failures, due to the missing dependency on host-qemu. However, even
with the host-qemu proposed by Arnout, cpanminus will still not work
properly: it will try to execute on the build machine executables
built for the target. While qemu is here to emulate the instruction
set, there is still the unsolved problem of kernel headers version
mismatch between the target and the build environments.

So the whole approach that consists in using host-qemu for building
simply cannot work properly, and until it is solved, the package
should be marked as broken.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpanminus/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/cpanminus/Config.in b/package/cpanminus/Config.in
index b8b39dc016..b10d211cc0 100644
--- a/package/cpanminus/Config.in
+++ b/package/cpanminus/Config.in
@@ -1,5 +1,9 @@
 config BR2_PACKAGE_CPANMINUS
 	bool "cpanminus"
+	# Requires host-qemu, which cannot work properly due to kernel
+	# headers mismatch between the build environment and the
+	# target.
+	depends on BR2_BROKEN
 	help
 	  cpanminus is a script to get, unpack, build and install Perl modules
 	  from CPAN.

From ecd23535551d0cd8ae265d75eadc43e88c580fc0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 16 Nov 2012 04:54:19 +0000
Subject: [PATCH 3312/6849] manual: minor tweaks

Minor grammatical and spelling tweaks to the manual content.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-conclusion.txt |  2 +-
 docs/manual/adding-packages-directory.txt  |  6 +--
 docs/manual/adding-packages-gettext.txt    |  6 +--
 docs/manual/adding-packages-tips.txt       |  6 +--
 docs/manual/beyond-buildroot.txt           |  2 +-
 docs/manual/board-support.txt              |  8 ++--
 docs/manual/common-usage.txt               |  8 ++--
 docs/manual/contribute.txt                 | 25 ++++++------
 docs/manual/customize-uclibc-config.txt    |  2 +-
 docs/manual/download-location.txt          |  4 +-
 docs/manual/embedded-basics.txt            | 14 +++----
 docs/manual/faq-troubleshooting.txt        | 44 ++++++++++-----------
 docs/manual/get-involved.txt               |  3 +-
 docs/manual/introduction.txt               |  8 ++--
 docs/manual/legal-notice.txt               | 23 +++++------
 docs/manual/make-tips.txt                  | 12 +++---
 docs/manual/makedev-syntax.txt             | 17 ++++----
 docs/manual/package-make-target.txt        |  2 +-
 docs/manual/patch-policy.txt               | 46 +++++++++++-----------
 docs/manual/prerequisite.txt               |  8 ++--
 docs/manual/rebuilding-packages.txt        |  8 ++--
 docs/manual/using.txt                      |  3 +-
 docs/manual/writing-rules.txt              |  2 +-
 23 files changed, 128 insertions(+), 131 deletions(-)

diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt
index ac20875ad5..42f1c8fe00 100644
--- a/docs/manual/adding-packages-conclusion.txt
+++ b/docs/manual/adding-packages-conclusion.txt
@@ -4,7 +4,7 @@ Conclusion
 ~~~~~~~~~~
 
 As you can see, adding a software package to Buildroot is simply a
-matter of writing a Makefile using an  existing example and modifying it
+matter of writing a Makefile using an existing example and modifying it
 according to the compilation process required by the package.
 
 If you package software that might be useful for other people, don't
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 35d28b6d5a..c8f41ff31d 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -154,12 +154,12 @@ config BR2_PACKAGE_E
 Overall, for package library dependencies, +select+ should be
 preferred.
 
-Note that such dependencies will make sure that the dependency option
+Note that such dependencies will ensure that the dependency option
 is also enabled, but not necessarily built before your package. To do
 so, the dependency also needs to be expressed in the +.mk+ file of the
 package.
 
-Further formating details: see xref:writing-rules-config-in[the
+Further formatting details: see xref:writing-rules-config-in[the
 writing rules].
 
 The +.mk+ file
@@ -174,7 +174,7 @@ different way, using different infrastructures:
 
 * *Makefiles for generic packages* (not using autotools or CMake):
   These are based on an infrastructure similar to the one used for
-  autotools-based packages, but requires a little more work from the
+  autotools-based packages, but require a little more work from the
   developer. They specify what should be done for the configuration,
   compilation, installation and cleanup of the package. This
   infrastructure must be used for all packages that do not use the
diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt
index 89461a7cd1..e9446d2dda 100644
--- a/docs/manual/adding-packages-gettext.txt
+++ b/docs/manual/adding-packages-gettext.txt
@@ -5,12 +5,12 @@ Gettext integration and interaction with packages
 
 Many packages that support internationalization use the gettext
 library. Dependencies for this library are fairly complicated and
-therefore, deserves some explanation.
+therefore, deserve some explanation.
 
-The 'uClibc' C library doesn't implement gettext functionality,
+The 'uClibc' C library doesn't implement gettext functionality;
 therefore with this C library, a separate gettext must be compiled. On
 the other hand, the 'glibc' C library does integrate its own gettext,
-and in this case, the separate gettext library should not be compiled,
+and in this case the separate gettext library should not be compiled,
 because it creates various kinds of build failures.
 
 Additionally, some packages (such as +libglib2+) do require gettext
diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index acc73d3113..6ec632de28 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -7,7 +7,7 @@ Tips and tricks
 Package name, config entry name and makefile variable relationship
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In Buildroot, there are some relation between:
+In Buildroot, there is some relationship between:
 
 * the _package name_, which is the package directory name (and the
   name of the +*.mk+ file);
@@ -16,8 +16,8 @@ In Buildroot, there are some relation between:
 
 * the makefile variable prefix.
 
-Thus, it is mandatory to keep consistency between all this stuff,
-matching the following rules:
+It is mandatory to maintain consistency between these elements,
+using the following rules:
 
 * the _make_ target name will be the _package name_ itself (e.g.:
   +foo-bar_boo+);
diff --git a/docs/manual/beyond-buildroot.txt b/docs/manual/beyond-buildroot.txt
index 12ce78cc27..e7b902ddc0 100644
--- a/docs/manual/beyond-buildroot.txt
+++ b/docs/manual/beyond-buildroot.txt
@@ -12,7 +12,7 @@ NFS boot
 To achieve NFS-boot, enable _tar root filesystem_ in the _Filesystem
 images_ menu.
 
-After complete build, just run the following commands to setup the
+After a complete build, just run the following commands to setup the
 NFS-root directory:
 
 -------------------
diff --git a/docs/manual/board-support.txt b/docs/manual/board-support.txt
index e20e72186d..271f3e0772 100644
--- a/docs/manual/board-support.txt
+++ b/docs/manual/board-support.txt
@@ -23,10 +23,10 @@ savedefconfig+. This will generate a minimal +defconfig+ file at the
 root of the Buildroot source tree. Move this file into the +configs/+
 directory, and rename it +MYBOARD_defconfig+.
 
-It is recommended to use as much as possible upstream versions of the
-Linux kernel and bootloaders, and to use as much as possible default
-kernel and bootloader configurations. If they are incorrect for your
-platform, we encourage you to send fixes to the corresponding upstream
+It is recommended to use upstream versions of the Linux kernel and
+bootloaders where possible, and also to use default kernel and bootloader
+configurations if possible. If the defaults are incorrect for
+your platform, we encourage you to send fixes to the corresponding upstream
 projects.
 
 However, in the mean time, you may want to store kernel or bootloader
diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt
index c08c10ea61..98503b5f5c 100644
--- a/docs/manual/common-usage.txt
+++ b/docs/manual/common-usage.txt
@@ -23,7 +23,7 @@ Building out-of-tree
 ~~~~~~~~~~~~~~~~~~~~
 
 As default, everything built by Buildroot is stored in the directory
-+output+ in the buildroot tree.
++output+ in the Buildroot tree.
 
 Buildroot also supports building out of tree with a syntax similar to
 the Linux kernel. To use it, add +O=<directory>+ to the make command
@@ -70,21 +70,21 @@ to +make+ or set in the environment:
   +
   Note that the uClibc configuration file can also be set from the
   configuration interface, so through the Buildroot .config file; this
-  the actual recommended way of setting it.
+  is the recommended way of setting it.
   +
 * +BUSYBOX_CONFIG_FILE=<path/to/.config>+, path to
   the Busybox configuration file.
   +
   Note that the Busybox configuration file can also be set from the
   configuration interface, so through the Buildroot .config file; this
-  the actual recommended way of setting it.
+  is the recommended way of setting it.
   +
 * +BUILDROOT_DL_DIR+ to override the directory in which
   Buildroot stores/retrieves downloaded files
   +
   Note that the Buildroot download directory can also be set from the
   configuration interface, so through the Buildroot .config file; this
-  the actual recommended way of setting it.
+  is the recommended way of setting it.
 
 An example that uses config files located in the toplevel directory and
 in your $HOME:
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index b2e6e7d631..a33aab2afd 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -57,7 +57,7 @@ Lastly, send/submit your patch set to the Buildroot mailing list:
 Note that +git+ should be configured to use your mail account.
 To configure +git+, see +man git-send-email+ or google it.
 
-Make sure posted *patches are not line-wrapped*, otherwise it cannot
+Make sure posted *patches are not line-wrapped*, otherwise they cannot
 easily be applied. In such a case, fix your e-mail client, or better,
 use +git send-email+ to send your patches.
 
@@ -79,11 +79,11 @@ Tested-by:: Indicates that the patch has been tested. It is useful
 Autobuild
 ---------
 
-The Buildroot community is currently setting up automatic build i
-order to test more and more configuration. All build results are
+The Buildroot community is currently setting up automatic builds in
+order to test more and more configurations. All build results are
 available at http://autobuild.buildroot.org[]
 
-A way to contribute is fixing broken builds.
+A good way to contribute is by fixing broken builds.
 
 In the commit message of a patch fixing an _autobuild_, add a
 reference to the _build result directory_ (the +dir+ link in the _data
@@ -97,17 +97,17 @@ Fixes http://autobuild.buildroot.org/results/51000a9d4656afe9e0ea6f07b9f8ed374c2
 Reporting issues/bugs, get help
 -------------------------------
 
-Before reporting some issues, please chek
-xref:mailing-list-subscribe[the mailing list archive] in case someone had
+Before reporting any issue, please check
+xref:mailing-list-subscribe[the mailing list archive] in case someone has
 already reported and fixed a similar problem.
 
-Whatever the way you choose to report some bugs or get help,
+However you choose to report bugs or get help,
 xref:bugtracker[opening a bug] or
-xref:mailing-list-subscribe[send a mail to the mailing list], there is
-a number of detail to provide in order to help people reproduce and
+xref:mailing-list-subscribe[send a mail to the mailing list], there are
+a number of details to provide in order to help people reproduce and
 find a solution to the issue.
 
-Try to think as you would be the one who will help someone else; in
+Try to think as if you were trying to help someone else; in
 that case, what would you need?
 
 Here is a short list of details to provide in such case:
@@ -121,6 +121,5 @@ Here is a short list of details to provide in such case:
 
 Additionnally, your can add the +.config+ file.
 
-If some of these details are too large, do not hesitate to use some
-pastebin service (see
-http://en.wikipedia.org/wiki/Comparison_of_pastebins[]).
+If some of these details are too large, do not hesitate to use a
+pastebin service (see http://www.similarsitesearch.com/alternatives-to/pastebin.com[]).
diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt
index 88121ea8ad..d340c9aba0 100644
--- a/docs/manual/customize-uclibc-config.txt
+++ b/docs/manual/customize-uclibc-config.txt
@@ -14,7 +14,7 @@ follow these steps:
 * Do an initial compilation of Buildroot without trying to customize
   uClibc.
 
-* Invoke +make uclibc-menuconfig+.  The nice configuration assistant,
+* Invoke +make uclibc-menuconfig+. The nice configuration assistant,
   similar to the one used in the Linux kernel or Buildroot,
   appears. Make your configuration changes as appropriate.
 
diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
index 8c66a76dd0..13e675cf40 100644
--- a/docs/manual/download-location.txt
+++ b/docs/manual/download-location.txt
@@ -4,8 +4,8 @@ Location of downloaded packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 It might be useful to know that the various tarballs that are
-downloaded by the Makefiles are all stored in the +DL_DIR+ which by
-default is the +dl+ directory. It's useful, for example, if you want
+downloaded by the Makefiles are all stored in +DL_DIR+ which by
+default is the +dl+ directory. This is useful, for example, if you want
 to keep a complete version of Buildroot which is known to be working
 with the associated tarballs. This will allow you to regenerate the
 toolchain and the target filesystem with exactly the same versions.
diff --git a/docs/manual/embedded-basics.txt b/docs/manual/embedded-basics.txt
index 27dda37a0a..d1ee88c0c9 100644
--- a/docs/manual/embedded-basics.txt
+++ b/docs/manual/embedded-basics.txt
@@ -4,7 +4,7 @@ Embedded system basics
 ----------------------
 
 When developing an embedded system, there are a number of choices to
-do:
+address:
 
 * the cross-toolchain: target architecture/C library/...
 * the bootloader
@@ -14,14 +14,14 @@ do:
 * the package selection (busybox vs. "real" programs, ...)
 * ...
 
-Some of them may be influenced by the target hardware.
+Some of these may be influenced by the target hardware.
 
-Some of them may also add some constraints when you will develop the
-final application for what your target is designed (e.g. some
-functions may be provided by soem C libraries and missing in some
-others, ...). So, these choices should be carefully done.
+Some of the choices may also add some constraints when you develop the
+final application for which your target is designed (e.g. some
+functions may be provided by some C libraries and missing in some
+others, ...). So, these choices should be carefully made.
 
-Buildroot allows to set most of these options to fit your needs.
+Buildroot allows you to set most of these options to fit your needs.
 
 Moreover, Buildroot provides an infrastructure for reproducing the
 build process of your kernel, cross-toolchain, and embedded root
diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt
index 6911c55e66..fc75d66279 100644
--- a/docs/manual/faq-troubleshooting.txt
+++ b/docs/manual/faq-troubleshooting.txt
@@ -7,7 +7,7 @@ Frequently Asked Questions & Troubleshooting
 The boot hangs after 'Starting network...'
 ------------------------------------------
 
-If the boot process seems to hand after the following messages
+If the boot process seems to hang after the following messages
 (messages not necessarily exactly similar, depending on the list of
 packages selected):
 
@@ -20,7 +20,7 @@ Starting dropbear sshd: generating rsa key... generating dsa key... OK
 
 then it means that your system is running, but didn't start a shell on
 the serial console. In order to have the system start a shell on your
-serial console, you have to go in the Buildroot configuration, +System
+serial console, you have to go into the Buildroot configuration, +System
 configuration+, and modify +Port to run a getty (login prompt) on+ and
 +Baudrate to use+ as appropriate. This will automatically tune the
 +/etc/inittab+ file of the generated system so that a shell starts on
@@ -42,21 +42,21 @@ you should install the +glibc-static+ package. This is because the
 C library.
 
 [[faq-no-compiler-on-target]]
-Why there is no compiler on the target?
+Why is there no compiler on the target?
 ---------------------------------------
 
-It has been decided that the support of the _native compiler for the
-target_ would be stopped since the Buildroot-2012.11 release because:
+It has been decided that support for the _native compiler on the
+target_ would be stopped from the Buildroot-2012.11 release because:
 
-* this feature was not maintained nor tested and often broken;
+* this feature was neither maintained nor tested, and often broken;
 * this feature was only available for Buildroot toolchains;
 * Buildroot mostly targets _small_ or _very small_ target hardware
-  with limited resource onboard (CPU, ram, mass-storage), on which
+  with limited resource onboard (CPU, ram, mass-storage), for which
   compiling does not make much sense.
 
 If you need a compiler on your target anyway, then Buildroot is not
 suitable for your purpose. In such case, you need a _real
-distribution_ and you should for something like:
+distribution_ and you should opt for something like:
 
 * http://www.openembedded.org[openembedded]
 * https://www.yoctoproject.org[yocto]
@@ -67,8 +67,8 @@ distribution_ and you should for something like:
 * ...
 
 [[faq-no-dev-files-on-target]]
-Why there is no development files on the target?
-------------------------------------------------
+Why are there no development files on the target?
+-------------------------------------------------
 
 Since there is no compiler available on the target (see
 xref:faq-no-compiler-on-target[]), it does not make sense to waste
@@ -78,7 +78,7 @@ Therefore, those files are always removed from the target since the
 Buildroot-2012.11 release.
 
 [[faq-no-doc-on-target]]
-Why there is no documentation on the target?
+Why is there no documentation on the target?
 --------------------------------------------
 
 Because Buildroot mostly targets _small_ or _very small_ target
@@ -101,21 +101,21 @@ semantics.
 See xref:depends-on-vs-select[].
 
 [[faq-why-not-visible-package]]
-Why some packages are not visible in the Buildroot config menu?
+Why are some packages not visible in the Buildroot config menu?
 ---------------------------------------------------------------
 
-If a package exists in the Buildroot tree and does not appears in the
+If a package exists in the Buildroot tree and does not appear in the
 config menu, this most likely means that some of the package's
 dependencies are not met.
 
-To know more about the dependencies of a package, search the package
-symbol using in teh config menu (see xref:make-tips[]).
+To know more about the dependencies of a package, search for the
+package symbol in the config menu (see xref:make-tips[]).
 
 Then, you may have to recursively enable several options (which
-correspond to the unmeet dependencies) to finally be able to select
+correspond to the unmet dependencies) to finally be able to select
 the package.
 
-If the package is not visible due to some unmeet toolchain options,
+If the package is not visible due to some unmet toolchain options,
 then you should certainly run a full rebuild (see xref:make-tips[] for
 more explanations).
 
@@ -123,12 +123,12 @@ more explanations).
 Why not use the target directory as a chroot directory?
 -------------------------------------------------------
 
-There are plenty of reason to *not* use the target directory a chroot
+There are plenty of reasons to *not* use the target directory a chroot
 one, among these:
 
-* files' owners, modes and permissions are not correctly set in the
+* file ownerships, modes and permissions are not correctly set in the
   target directory;
-* devices nodes are not created in the target directory.
+* device nodes are not created in the target directory.
 
-Because of that, commands run in through chroot, using the target
-directory as new root, will fail.
+For these reasons, commands run through chroot, using the target
+directory as the new root, would fail.
diff --git a/docs/manual/get-involved.txt b/docs/manual/get-involved.txt
index 3a00b1e801..59ddd711b4 100644
--- a/docs/manual/get-involved.txt
+++ b/docs/manual/get-involved.txt
@@ -48,8 +48,7 @@ The channel +#buildroot+ is hosted on Freenode
 http://webchat.freenode.net[].
 
 When asking for help on IRC, share relevant logs or pieces of code
-using a code sharing website (see
-http://en.wikipedia.org/wiki/Comparison_of_pastebins[], and pick one).
+using a code sharing website.
 
 [[patchwork]]
 Patchwork
diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt
index 91ecb04fa9..bcca544f78 100644
--- a/docs/manual/introduction.txt
+++ b/docs/manual/introduction.txt
@@ -3,10 +3,10 @@
 About Buildroot
 ===============
 
-Buildroot provides a full featured environment for cross-development.
+Buildroot provides a full-featured environment for cross-development.
 Buildroot is able to generate a cross-compilation toolchain, a root
 filesystem, a Linux kernel image and a bootloader for your target.
-Buildroot can be used for any combinaison of these options,
+Buildroot can be used for any combination of these options,
 independently.
 
 Buildroot is useful mainly for people working with embedded systems.
@@ -15,7 +15,7 @@ processors everyone is used to having in his PC. They can be PowerPC
 processors, MIPS processors, ARM processors, etc.
 
 Buildroot supports numerous processors and their variants; it also
-comes with default configuration for several boards available
-off-the-shelf. Besides, a number of third-party projects are based on
+comes with default configurations for several boards available
+off-the-shelf. Besides this, a number of third-party projects are based on,
 or develop their BSP footnote:[BSP: Board Software Package] or
 SDK footnote:[SDK: Standard Development Kit] on top of Buildroot.
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
index 22e5769b65..a7af5a85a4 100644
--- a/docs/manual/legal-notice.txt
+++ b/docs/manual/legal-notice.txt
@@ -12,17 +12,18 @@ All of the end products of Buildroot (toolchain, root filesystem, kernel,
 bootloaders) contain opensource software, released under various licenses.
 
 Using opensource software gives you the freedom to build rich embedded
-systems choosing from a wide range of packages, but also gives some
+systems, choosing from a wide range of packages, but also imposes some
 obligations that you must know and honour.
 Some licenses require you to publish the license text in the documentation of
-your product. Other require you to redistribute the source code of the
+your product. Others require you to redistribute the source code of the
 software to those that receive your product.
 
-The exact requirements of each license is documented in each package, and it is
-your (or your legal office's) responsibility to comply with these requirements.
+The exact requirements of each license are documented in each package, and
+it is your responsibility (or that of your legal office) to comply with those
+requirements.
 To make this easier for you, Buildroot can collect for you some material you
-will probably need. To produce this material, after you configured Buildroot
-with +make menuconfig+, +make xconfig+ or +make gconfig+, run:
+will probably need. To produce this material, after you have configured
+Buildroot with +make menuconfig+, +make xconfig+ or +make gconfig+, run:
 
 --------------------
 make legal-info
@@ -44,8 +45,8 @@ There you will find:
   Buildroot sources and are not duplicated in the +sources/+ subdirectory.
 * A manifest file listing the configured packages, their version, license and
   related information.
-  Some of these information might be not defined in Buildroot; in this case
-  they are clearly marked as "unknown" or similar.
+  Some of this information might not be defined in Buildroot; such items are
+  clearly marked as "unknown" or similar.
 * A +licenses/+ subdirectory, which contains the license text of packages.
   If the license file(s) are not defined in Buildroot, the file is not produced
   and a warning in the +README+ indicates this.
@@ -53,7 +54,7 @@ There you will find:
 Please note that the aim of the +legal-info+ feature of Buildroot is to
 produce all the material that is somehow relevant for legal compliance with the
 package licenses. Buildroot does not try to produce the exact material that
-you must somehow make public. It does surely produce some more material than is
+you must somehow make public. Certainly, more material is produced than is
 needed for a strict legal compliance. For example, it produces the source code
 for packages released under BSD-like licenses, that you might not want to
 redistribute in source form.
@@ -132,5 +133,5 @@ Buildroot is part of the 'scripts used to control compilation and
 installation of the executable', and as such it is considered part of the
 material that must be redistributed.
 
-Keep in mind this is only the Buildroot developers' opinion, and you should
-consult your legal department or lawyer in case of any doubt.
+Keep in mind that this is only the Buildroot developers' opinion, and you
+should consult your legal department or lawyer in case of any doubt.
diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index 5b00536bef..25c4e35179 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -4,18 +4,18 @@
 'make' tips
 -----------
 
-Because Buildroot is a set of Makefiles and patches, there are few
-things useful to know, such as:
+Because Buildroot is a set of Makefiles and patches, there are a few
+things that are useful to know, such as:
 
 +make *config+ commands offer a search tool. Read the help message in
-the different frontend menu to know how to use it:
+the different frontend menus to know how to use it:
 
 * in _menuconfig_, search tool is called by pressing +/+;
 * in _xconfig_, search tool is called by pressing +ctrl+ + +f+.
 
-The result of the search show the help message of the matching items.
+The result of the search shows the help message of the matching items.
 
-Display all command executed by make:
+Display all commands executed by make:
 
 --------------------
  $ make V=0|1 <target>
@@ -54,5 +54,5 @@ Delete all build products as well as the configuration:
 --------------------
 
 Note that if +ccache+ is enabled, running +make clean|distclean+ does
-not empty the cache of compiler used by Buildroot. To delete it, refer
+not empty the compiler cache used by Buildroot. To delete it, refer
 to xref:ccache[].
diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt
index 4703b2f0ee..99ecdea82f 100644
--- a/docs/manual/makedev-syntax.txt
+++ b/docs/manual/makedev-syntax.txt
@@ -4,12 +4,11 @@
 Makedev syntax documentation
 ----------------------------
 
-The makedev syntax is used across several places in Buildroot to
-define changes to be made for permissions or which device files to
-create and how to create them, in order to avoid to call mkdnod every
-now and then.
+The makedev syntax is used in several places in Buildroot to
+define changes to be made for permissions, or which device files to
+create and how to create them, in order to avoid calls to mknod.
 
-This syntax is derived from the makedev utility, and a more complete
+This syntax is derived from the makedev utility, and more complete
 documentation can be found in the +package/makedevs/README+ file.
 
 It takes the form of a line for each file, with the following layout:
@@ -18,7 +17,7 @@ It takes the form of a line for each file, with the following layout:
 |name |type |mode |uid |gid |major |minor |start |inc |count
 |===========================================================
 
-There is a few non-trivial blocks here:
+There are a few non-trivial blocks here:
 
 - +name+ is the path to the file you want to create/modify
 - +type+ is the type of the file, being one of :
@@ -27,13 +26,13 @@ There is a few non-trivial blocks here:
   * c: a character device file
   * b: a block device file
   * p: a named pipe
-- +mode+, +uid+ and +gid+ are the usual permissions stuff
+- +mode+, +uid+ and +gid+ are the usual permissions settings
 - +major+ and +minor+ are here for device files
-- +start+, +inc+ and +count+ are when you want to create a whole batch
+- +start+, +inc+ and +count+ are for when you want to create a batch
   of files, and can be reduced to a loop, beginning at +start+,
   incrementing its counter by +inc+ until it reaches +count+
 
-Let's say you want to change the permissions of a given file, using
+Let's say you want to change the permissions of a given file; using
 this syntax, you will need to put:
 -------------------------------------------------------------------
 /usr/bin/foobar	f	644	0	0	-	-	-	-	-
diff --git a/docs/manual/package-make-target.txt b/docs/manual/package-make-target.txt
index 1813af3d03..e8d5f530cb 100644
--- a/docs/manual/package-make-target.txt
+++ b/docs/manual/package-make-target.txt
@@ -82,7 +82,7 @@ uninstall the package from both the target and the staging directory
 | +rebuild+         | Rebuild only necessary binaries and install them
 again
 
-| +reconfigure+     | Run again the configure command, then rebuild
+| +reconfigure+     | Re-run the configure command, then rebuild
 only necessary binaries, and lastly install them again
 
 |===================================================
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 551ea1288f..1fdb04ef73 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -10,16 +10,16 @@ necessary to patch the source of the software to get it built within
 Buildroot.
 
 Buildroot offers an infrastructure to automatically handle this during
-the builds. It support several ways of applying patch sets:
+the builds. It supports several ways of applying patch sets:
 
-Provinding patches
-~~~~~~~~~~~~~~~~~~
+Providing patches
+~~~~~~~~~~~~~~~~~
 
-Additionnal tarball
-^^^^^^^^^^^^^^^^^^^
+Additional tarball
+^^^^^^^^^^^^^^^^^^
 
-If there needs to apply a patch set available as a tarball and
-downloadable, then add the patch tarball to the +<packagename>_PATCH+
+If it is necessary to apply a patch set available as a downloadable
+tarball, then add the patch tarball to the +<packagename>_PATCH+
 variable.
 
 Note that the patch tarballs are downloaded from the same site as the
@@ -28,13 +28,13 @@ sources.
 Within Buildroot
 ^^^^^^^^^^^^^^^^
 
-Most of the patches are provided within Buildroot, in the package
-directory, because they aim to fix cross-compilation, +libc+ support,
-or whatever the reason is.
+Most patches are provided within Buildroot, in the package
+directory; these typically aim to fix cross-compilation, +libc+ support,
+or other such issues.
 
 These patch files should have the extension +*.patch+.
 
-A +series+ file, like +quilt+ uses it, may also be added in the
+A +series+ file, as used by +quilt+, may also be added in the
 package directory. In that case, the +series+ file defines the patch
 application order.
 
@@ -43,7 +43,7 @@ How patches are applied
 
 . Run the +<packagename>_PRE_PATCH_HOOKS+ commands if defined;
 
-. Cleanup the build directory from any existing +*.rej+ files;
+. Cleanup the build directory, removing any existing +*.rej+ files;
 
 . If +<packagename>_PATCH+ is defined, then patches from these
   tarballs are applied;
@@ -65,17 +65,17 @@ If something goes wrong in the steps _3_ or _4_, then the build fails.
 Format and licensing of the package patches
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Patches are released under the same license the software that is
+Patches are released under the same license as the software that is
 modified.
 
-A message explaining what does the patch and why should be add in the
-patch's header.
+A message explaining what the patch does, and why it is needed, should
+be added in the header commentary of the patch.
 
 You should add a +signed-off-by+ statement in the header of the each
-patch to help keeping track of the changes.
+patch to help with keeping track of the changes.
 
-If the software is under versionning, it is recommended to use the SCM
-software to generate the patch set.
+If the software is under version control, it is recommended to use the
+SCM software to generate the patch set.
 
 Otherwise, concatenate the header with the output of the
 +diff -purN source.c.orig source.c+ command.
@@ -107,10 +107,10 @@ AC_PROG_MAKE_SET
 Integrating patches found on the Web
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When integrating a patch whom you are not the author, you have to add
-few things in the header of the patch itself.
+When integrating a patch of which you are not the author, you have to
+add a few things in the header of the patch itself.
 
-Depending on whether the patch has been pick-up from the project
+Depending on whether the patch has been obtained from the project
 repository itself, or from somewhere on the web, add one of the
 following tags:
 
@@ -124,5 +124,5 @@ or
 Fetch from: <some url>
 ---------------
 
-It is also possible to add few words about the changes that may have
-been necessary if any.
+It is also sensible to add a few words about any changes to the patch
+that may have been necessary.
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 31d437d9c3..36d8da7b81 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -4,13 +4,13 @@
 System requirements
 -------------------
 
-Buildroot is design to run on Linux system.
+Buildroot is designed to run on Linux systems.
 
 Buildroot needs some software to be already installed on the host
-system; hereafter the lists of the mandatory and optional packages
+system; here are the lists of the mandatory and optional packages
 (package names may vary between distributions).
 
-Take care of _installing both runtime and development data_, especially
+Take care to _install both runtime and development data_, especially
 for the libraries that may be packaged in 2 distinct packages.
 
 
@@ -58,7 +58,7 @@ Optional packages
 * Source fetching tools:
 +
 In the official tree, most of the package sources are retrieved
-using +wget+, few are only available through their +git+, +mercurial+,
+using +wget+; a few are only available through their +git+, +mercurial+,
 or +svn+ repository.
 +
 All other source fetching methods are implemented and may be used in a
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index a723d113ce..83f6a3670d 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -10,7 +10,7 @@ A full rebuild is achieved by running:
 $ make clean all
 ---------------
 
-In what cases, a full rebuild is mandatory:
+In some cases, a full rebuild is mandatory:
 
 * each time the toolchain properties are changed, this includes:
 
@@ -22,14 +22,14 @@ In what cases, a full rebuild is mandatory:
 
 * after removing some libraries from the package selection.
 
-In what cases, a full rebuild is recommended:
+In some cases, a full rebuild is recommended:
 
 * after adding some libraries to the package selection (otherwise,
   some packages that can be optionally linked against those libraries
   won't be rebuilt, so they won't support those new available
   features).
 
-In other cases, it is up to you to decide if you should or not run a
+In other cases, it is up to you to decide if you should run a
 full rebuild, but you should know what is impacted and understand what
 you are doing anyway.
 
@@ -81,7 +81,7 @@ files are relevant:
 Buildroot infrastructures.
 - Only toolchain packages remain using custom makefiles (i.e. do not
 use any Buildroot infrastructure).
-- Most packages and toolchain packages, if not all, will progressively
+- Most, if not all, packages and toolchain packages will progressively
 be ported over to the generic, autotools or CMake infrastructure,
 making it much easier to rebuild individual packages.
 
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index e8136f80ae..892caf580f 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -56,8 +56,7 @@ This command will generally perform the following steps:
 
 * Download source files (as required)
 * Configure, build and install the cross-compiling toolchain using the
-  appropriate toolchain backend is used, or simply import a toolchain
-  if an external toolchain
+  appropriate toolchain backend, or simply import an external toolchain
 * Build/install selected target packages
 * Build a kernel image, if selected
 * Build a bootloader image, if selected
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index e0a5a2afdd..c32f855be4 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -3,7 +3,7 @@
 Writing rules
 -------------
 
-Overall, those writing rules are here to help you add new files in
+Overall, these writing rules are here to help you add new files in
 Buildroot or refactor existing ones.
 
 If you slightly modify some existing file, the important thing is

From b392a68308d587162e8cf9bf52ede5e8d3dcd2c7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 03:57:10 +0000
Subject: [PATCH 3313/6849] gdb: not available on aarch64 for the target

Fixes

  http://autobuild.buildroot.org/results/d32a0fb1584a125cccde521a3960fb87ff7e2de6/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index ca0c82176e..50aafdf154 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
-	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin && !BR2_aarch64
 	# The newest versions of gdb require thread debugging in the
 	# toolchain. The only cases for which this is not needed is if
 	# we use gdb 6.8 (marked deprecated)

From 4b8215714da48367fa67bdbc98fa12fd9371e6ba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 16 Nov 2012 03:24:22 +0000
Subject: [PATCH 3314/6849] mysql_client: security bump to version 5.1.66

Fixes multiple security isssues, most of them of the server component
though.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mysql_client/mysql_client.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 46862a1de7..9785aeed8b 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MYSQL_CLIENT_VERSION = 5.1.65
+MYSQL_CLIENT_VERSION = 5.1.66
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-5.1
 MYSQL_CLIENT_INSTALL_STAGING = YES

From 0003b0d1f7975f4528c402eefe995b655f64ea4e Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 16 Nov 2012 12:04:18 +0000
Subject: [PATCH 3315/6849] barebox: Add 2012.11, remove 2012.07

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index d6ce8dd680..c9e7088243 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_10
+	default BR2_TARGET_BAREBOX_2012_11
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_07
-	bool "2012.07"
-
 config BR2_TARGET_BAREBOX_2012_08
 	bool "2012.08"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2012_09
 config BR2_TARGET_BAREBOX_2012_10
 	bool "2012.10"
 
+config BR2_TARGET_BAREBOX_2012_11
+	bool "2012.11"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 

From 37c739f226dbbf8bb4cb64ecf4f1bc7d9551c543 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:50 +0000
Subject: [PATCH 3316/6849] xlib_libXt: bump version to 1.1.3

Needed by the bump of xapp_clipboard, itself needed to avoid the
following build failure:

  http://autobuild.buildroot.org/results/1a4f84ad76ad8c4e70bff6878fc232edf46ff8f1/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...n-t-link-makestrs-with-target-cflags.patch | 19 +++++++++----------
 package/x11r7/xlib_libXt/xlib_libXt.mk        |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch b/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch
index aafb352355..692d03b31f 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch
+++ b/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch
@@ -1,11 +1,11 @@
-From 9324466141626518e5a67838813562ec6ef62ba3 Mon Sep 17 00:00:00 2001
+From 3f064076c783914cafdff028db303681dae4291d Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Thu, 15 Nov 2012 18:31:53 +0100
-Subject: [PATCH] util: don't link makestrs with target cflags
+Subject: [PATCH] libXt: util: don't link makestrs with target cflags
 
 The line:
 
-makestrs_CFLAGS = $(XT_CFLAGS)
+AM_CFLAGS = $(XT_CFLAGS)
 
 in util/Makefile.am is wrong because it adds target cflags to the
 compilation of makestrs, which is built for the build machine, which
@@ -23,19 +23,19 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  2 files changed, 2 deletions(-)
 
 diff --git a/util/Makefile.am b/util/Makefile.am
-index 969ecef..cc6f3fc 100644
+index dedfa6b..cc6f3fc 100644
 --- a/util/Makefile.am
 +++ b/util/Makefile.am
 @@ -10,7 +10,6 @@ EXTRA_DIST = \
- 	StrDefs.ht \
- 	string.list
+        StrDefs.ht \
+        string.list
  
--makestrs_CFLAGS = $(XT_CFLAGS)
+-AM_CFLAGS = $(XT_CFLAGS)
  makestrs_SOURCES = makestrs.c
  
  
 diff --git a/util/makestrs.c b/util/makestrs.c
-index 3551cc1..456735b 100644
+index a52866a..00c861f 100644
 --- a/util/makestrs.c
 +++ b/util/makestrs.c
 @@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group.
@@ -45,7 +45,6 @@ index 3551cc1..456735b 100644
 -#include <X11/Xos.h>
  #include <stdlib.h>
  #include <unistd.h>
- #if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
+ 
 -- 
 1.7.9.5
-
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index fd8f079363..9f9aaea818 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXT_VERSION = 1.0.9
+XLIB_LIBXT_VERSION = 1.1.3
 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXT_INSTALL_STAGING = YES

From a1ca198dd79bdbd9c73aa94a075e3c2e5464c010 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:51 +0000
Subject: [PATCH 3317/6849] xutil_util-macros: bump to version 1.17

Needed by other xapp versions bump, which themselves are needed to fix
the missing link against the Xmu library (build failures similar to
http://autobuild.buildroot.org/results/1a4f84ad76ad8c4e70bff6878fc232edf46ff8f1/build-end.log).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xutil_util-macros/xutil_util-macros.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 7a13a6186e..6171c397d0 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XUTIL_UTIL_MACROS_VERSION = 1.11.0
+XUTIL_UTIL_MACROS_VERSION = 1.17
 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES

From fe75161ef58ffd08680991d4965a93554d6081a4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:52 +0000
Subject: [PATCH 3318/6849] xapp_editres: bump to 1.0.5 to fix Xmu related
 build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_editres/xapp_editres.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index e5371fa8be..440ce61135 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_EDITRES_VERSION = 1.0.2
+XAPP_EDITRES_VERSION = 1.0.5
 XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2
 XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt

From 984faefb26b8a58e507d49d307a5075162e4a83e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:53 +0000
Subject: [PATCH 3319/6849] xapp_twm: bump to 1.0.6 to fix Xmu related build
 failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_twm/xapp_twm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index c8f15d33aa..9474ecac4d 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_TWM_VERSION = 1.0.3
+XAPP_TWM_VERSION = 1.0.6
 XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
 XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu

From 44039de8702f9680cf37767b77d66f373e88234a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:54 +0000
Subject: [PATCH 3320/6849] xapp_viewres: bump to 1.0.3 to fix Xmu related
 build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_viewres/xapp_viewres.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 622dcd9f46..04ba936bcc 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_VIEWRES_VERSION = 1.0.1
+XAPP_VIEWRES_VERSION = 1.0.3
 XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2
 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw

From 5047087f46991e3a6c58924408e10458a81b20fe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:55 +0000
Subject: [PATCH 3321/6849] xapp_xclipboard: bump to 1.1.2 to fix Xmu related
 build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index a7bc4abd18..1fb7ca4a54 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XAPP_XCLIPBOARD_VERSION = 1.0.1
+XAPP_XCLIPBOARD_VERSION = 1.1.2
 XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2
 XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
+XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(autotools-package))

From fa8754680f298f67cc21448edfca02dd092f0870 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:56 +0000
Subject: [PATCH 3322/6849] xapp_xditview: bump version to 1.0.2 to fix Xmu
 related build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xditview/xapp_xditview.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 00d6038c40..773ed21851 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XDITVIEW_VERSION = 1.0.1
+XAPP_XDITVIEW_VERSION = 1.0.2
 XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2
 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw

From 0a4f38f1d9bf1d1f73a9b411eee0524b9c199638 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:57 +0000
Subject: [PATCH 3323/6849] xapp_xfd: bump version to 1.1.1 to fix Xmu related
 build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xfd/xapp_xfd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 50f15b19b8..72c1aca6a0 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XFD_VERSION = 1.0.1
+XAPP_XFD_VERSION = 1.1.1
 XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft

From 2ec8bf1235e12e5f363cf5beab1831452fb06311 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:58 +0000
Subject: [PATCH 3324/6849] xapp_xload: bump version to 1.1.1 to fix Xmu
 related build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xload/xapp_xload.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index ace06c6d86..85803918ef 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XLOAD_VERSION = 1.0.2
+XAPP_XLOAD_VERSION = 1.1.1
 XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw

From d8da7ab30e514a51b8e642d7363bb2db4f10647f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:23:59 +0000
Subject: [PATCH 3325/6849] xapp_xlogo: bump version to 1.0.4 to fix Xmu
 related build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xlogo/xapp_xlogo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index c3467bab24..674b943a27 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XLOGO_VERSION = 1.0.1
+XAPP_XLOGO_VERSION = 1.0.4
 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \

From 2327d04ec67ed8e9f7413cbce3c8ba5f0c9b063a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:24:00 +0000
Subject: [PATCH 3326/6849] xapp_xmh: bump version to 1.0.2 to fix Xmu related
 build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xmh/xapp_xmh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 463c31d567..934f38d537 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XMH_VERSION = 1.0.1
+XAPP_XMH_VERSION = 1.0.2
 XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMH_DEPENDENCIES = xlib_libXaw

From 56fc639584735ce0b9d9cf754880d245ced2bf3b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 07:24:01 +0000
Subject: [PATCH 3327/6849] xapp_xvidtune: bump version to 1.0.2 to fix Xmu
 related build failure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 8ac49f7b10..eb1cac283a 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XVIDTUNE_VERSION = 1.0.1
+XAPP_XVIDTUNE_VERSION = 1.0.2
 XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2
 XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm

From 645f10ac0f79d3e53d0371b2b0dcd1ee73f51ef5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 00:48:09 +0000
Subject: [PATCH 3328/6849] libffi: make blackfin patch a proper git patch

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ibffi-0001-Add-support-for-Blackfin.patch} | 175 ++++++++++--------
 1 file changed, 99 insertions(+), 76 deletions(-)
 rename package/libffi/{libffi-blackfin-support.patch => libffi-0001-Add-support-for-Blackfin.patch} (93%)

diff --git a/package/libffi/libffi-blackfin-support.patch b/package/libffi/libffi-0001-Add-support-for-Blackfin.patch
similarity index 93%
rename from package/libffi/libffi-blackfin-support.patch
rename to package/libffi/libffi-0001-Add-support-for-Blackfin.patch
index 1af0fce15c..7a55b402a5 100644
--- a/package/libffi/libffi-blackfin-support.patch
+++ b/package/libffi/libffi-0001-Add-support-for-Blackfin.patch
@@ -1,4 +1,7 @@
-Add support for Blackfin
+From 643764d29559e2ca6280837069972b1d4790d61a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 16 Nov 2012 01:10:10 +0100
+Subject: [PATCH 1/2] Add support for Blackfin
 
 Taken upstream from
 https://github.com/atgreen/libffi/commit/213ed15c70e72d666154c08e2b41dae3f61f20d3. Will
@@ -11,11 +14,25 @@ requires autoconf 2.68.
 Code written by Alexandre Keunecke.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ ChangeLog            |    8 +++
+ Makefile.am          |    4 ++
+ Makefile.in          |  160 ++++++++++++++++++++++-------------------
+ README               |    8 ++-
+ configure            |  113 +++++++++++++----------------
+ configure.ac         |    5 ++
+ src/bfin/ffi.c       |  195 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/bfin/ffitarget.h |   43 +++++++++++
+ src/bfin/sysv.S      |  177 +++++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 574 insertions(+), 139 deletions(-)
+ create mode 100644 src/bfin/ffi.c
+ create mode 100644 src/bfin/ffitarget.h
+ create mode 100644 src/bfin/sysv.S
 
-Index: libffi/ChangeLog
-===================================================================
---- libffi.orig/ChangeLog
-+++ libffi/ChangeLog
+diff --git a/ChangeLog b/ChangeLog
+index f4148a9..376edf7 100644
+--- a/ChangeLog
++++ b/ChangeLog
 @@ -1,3 +1,11 @@
 +2012-04-23  Alexandre Keunecke I. de Mendonca <alexandre.keunecke@gmail.com>
 +
@@ -28,11 +45,11 @@ Index: libffi/ChangeLog
  2012-04-11  Anthony Green  <green@moxielogic.com>
  
  	* Makefile.am (EXTRA_DIST): Add new script.
-Index: libffi/Makefile.am
-===================================================================
---- libffi.orig/Makefile.am
-+++ libffi/Makefile.am
-@@ -27,6 +27,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+diff --git a/Makefile.am b/Makefile.am
+index 4a855d7..16f32a6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,6 +27,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
  	src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
  	src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h	\
  	src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
@@ -50,10 +67,10 @@ Index: libffi/Makefile.am
  if X86
  nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
  endif
-Index: libffi/Makefile.in
-===================================================================
---- libffi.orig/Makefile.in
-+++ libffi/Makefile.in
+diff --git a/Makefile.in b/Makefile.in
+index 4308193..f5c10af 100644
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -38,35 +38,36 @@ host_triplet = @host@
  target_triplet = @target@
  @FFI_DEBUG_TRUE@am__append_1 = src/debug.c
@@ -118,7 +135,7 @@ Index: libffi/Makefile.in
  subdir = .
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
-@@ -75,17 +76,7 @@ DIST_COMMON = README $(am__configure_dep
+@@ -75,17 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	compile config.guess config.sub depcomp install-sh ltmain.sh \
  	mdate-sh missing texinfo.tex
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -137,7 +154,7 @@ Index: libffi/Makefile.in
  	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
-@@ -126,44 +117,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
+@@ -126,44 +117,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \
  @FFI_DEBUG_TRUE@am__objects_1 = src/debug.lo
  @MIPS_TRUE@am__objects_2 = src/mips/ffi.lo src/mips/o32.lo \
  @MIPS_TRUE@	src/mips/n32.lo
@@ -209,7 +226,7 @@ Index: libffi/Makefile.in
  nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
  	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
  	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-@@ -173,17 +165,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
+@@ -173,17 +165,17 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
  	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
  	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
  	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
@@ -231,7 +248,7 @@ Index: libffi/Makefile.in
  	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
  	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
  	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-@@ -192,8 +184,8 @@ am__objects_30 = $(am__objects_1) $(am__
+@@ -192,8 +184,8 @@ am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
  	$(am__objects_19) $(am__objects_20) $(am__objects_21) \
  	$(am__objects_22) $(am__objects_23) $(am__objects_24) \
  	$(am__objects_25) $(am__objects_26) $(am__objects_27) \
@@ -242,7 +259,7 @@ Index: libffi/Makefile.in
  libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
  	$(nodist_libffi_convenience_la_OBJECTS)
  DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -440,6 +432,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+@@ -440,6 +432,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
  	src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
  	src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h	\
  	src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
@@ -250,7 +267,7 @@ Index: libffi/Makefile.in
  	src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
  	src/moxie/ffi.c src/moxie/eabi.S libtool-version \
  	ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
-@@ -508,10 +501,10 @@ nodist_libffi_la_SOURCES = $(am__append_
+@@ -508,10 +501,10 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \
  	$(am__append_18) $(am__append_19) $(am__append_20) \
  	$(am__append_21) $(am__append_22) $(am__append_23) \
  	$(am__append_24) $(am__append_25) $(am__append_26) \
@@ -263,7 +280,7 @@ Index: libffi/Makefile.in
  libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
  AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
  AM_CCASFLAGS = $(AM_CPPFLAGS) -g
-@@ -637,6 +630,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp
+@@ -637,6 +630,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp) \
  	src/mips/$(DEPDIR)/$(am__dirstamp)
  src/mips/n32.lo: src/mips/$(am__dirstamp) \
  	src/mips/$(DEPDIR)/$(am__dirstamp)
@@ -317,7 +334,7 @@ Index: libffi/Makefile.in
  	-rm -f src/cris/$(DEPDIR)/$(am__dirstamp)
  	-rm -f src/cris/$(am__dirstamp)
  	-rm -f src/frv/$(DEPDIR)/$(am__dirstamp)
-@@ -1670,7 +1682,7 @@ clean-am: clean-aminfo clean-generic cle
+@@ -1670,7 +1682,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \
  
  distclean: distclean-recursive
  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -335,10 +352,43 @@ Index: libffi/Makefile.in
  	-rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-aminfo \
  	maintainer-clean-generic maintainer-clean-vti
-Index: libffi/configure
-===================================================================
---- libffi.orig/configure
-+++ libffi/configure
+diff --git a/README b/README
+index bcc7178..ec240a4 100644
+--- a/README
++++ b/README
+@@ -1,8 +1,8 @@
+ Status
+ ======
+ 
+-libffi-3.0.11 was released on April 11, 2012.  Check the libffi web
+-page for updates: <URL:http://sourceware.org/libffi/>.
++libffi-3.0.XX was released on XXXXXXX.  Check the libffi web page for
++updates: <URL:http://sourceware.org/libffi/>.
+ 
+ 
+ What is libffi?
+@@ -56,6 +56,7 @@ tested:
+ | ARM          | Linux            |
+ | ARM          | iOS              |
+ | AVR32        | Linux            |
++| Blackfin     | uClinux          |
+ | HPPA         | HPUX             |
+ | IA-64        | Linux            |
+ | M68K         | FreeMiNT         |
+@@ -148,6 +149,9 @@ History
+ 
+ See the ChangeLog files for details.
+ 
++3.0.12 XXX-XX-XX
++        Add Blackfin support.
++
+ 3.0.11 Apr-11-12
+         Add support for variadic functions (ffi_prep_cif_var).
+ 	Add Linux/x32 support.
+diff --git a/configure b/configure
+index 91b2317..4ccba55 100755
+--- a/configure
++++ b/configure
 @@ -679,6 +679,8 @@ X86_FALSE
  X86_TRUE
  SPARC_FALSE
@@ -348,7 +398,7 @@ Index: libffi/configure
  MIPS_FALSE
  MIPS_TRUE
  AM_LTLDFLAGS
-@@ -6840,14 +6842,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6840,14 +6842,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
  	  x86_64-*linux*)
@@ -364,7 +414,7 @@ Index: libffi/configure
  	    ;;
  	  ppc64-*linux*|powerpc64-*linux*)
  	    LD="${LD-ld} -m elf32ppclinux"
-@@ -8418,10 +8413,6 @@ _lt_linker_boilerplate=`cat conftest.err
+@@ -8418,10 +8413,6 @@ _lt_linker_boilerplate=`cat conftest.err`
  $RM -r conftest*
  
  
@@ -480,7 +530,7 @@ Index: libffi/configure
   if test x$TARGET = xSPARC; then
    SPARC_TRUE=
    SPARC_FALSE='#'
-@@ -14134,40 +14150,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
+@@ -14134,40 +14150,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
   esac
  
  
@@ -522,7 +572,7 @@ Index: libffi/configure
  
  if test x$TARGET = xSPARC; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5
-@@ -14739,6 +14722,10 @@ if test -z "${MIPS_TRUE}" && test -z "${
+@@ -14739,6 +14722,10 @@ if test -z "${MIPS_TRUE}" && test -z "${MIPS_FALSE}"; then
    as_fn_error $? "conditional \"MIPS\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -533,10 +583,10 @@ Index: libffi/configure
  if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then
    as_fn_error $? "conditional \"SPARC\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
-Index: libffi/configure.ac
-===================================================================
---- libffi.orig/configure.ac
-+++ libffi/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 1021769..9b946a2 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -75,6 +75,10 @@ case "$host" in
  	TARGET=AVR32; TARGETDIR=avr32
  	;;
@@ -556,10 +606,11 @@ Index: libffi/configure.ac
  AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
  AM_CONDITIONAL(X86, test x$TARGET = xX86)
  AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
-Index: libffi/src/bfin/ffi.c
-===================================================================
+diff --git a/src/bfin/ffi.c b/src/bfin/ffi.c
+new file mode 100644
+index 0000000..0beccc1
 --- /dev/null
-+++ libffi/src/bfin/ffi.c
++++ b/src/bfin/ffi.c
 @@ -0,0 +1,195 @@
 +/* -----------------------------------------------------------------------
 +   ffi.c - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
@@ -756,10 +807,11 @@ Index: libffi/src/bfin/ffi.c
 +
 +
 +
-Index: libffi/src/bfin/ffitarget.h
-===================================================================
+diff --git a/src/bfin/ffitarget.h b/src/bfin/ffitarget.h
+new file mode 100644
+index 0000000..2175c01
 --- /dev/null
-+++ libffi/src/bfin/ffitarget.h
++++ b/src/bfin/ffitarget.h
 @@ -0,0 +1,43 @@
 +/* -----------------------------------------------------------------------
 +   ffitarget.h - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
@@ -804,10 +856,11 @@ Index: libffi/src/bfin/ffitarget.h
 +
 +#endif
 +
-Index: libffi/src/bfin/sysv.S
-===================================================================
+diff --git a/src/bfin/sysv.S b/src/bfin/sysv.S
+new file mode 100644
+index 0000000..ae7a152
 --- /dev/null
-+++ libffi/src/bfin/sysv.S
++++ b/src/bfin/sysv.S
 @@ -0,0 +1,177 @@
 +/* -----------------------------------------------------------------------
 +   sysv.S - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
@@ -986,36 +1039,6 @@ Index: libffi/src/bfin/sysv.S
 +
 +.size _ffi_call_SYSV,.-_ffi_call_SYSV;
 +.endfunc
-Index: libffi/README
-===================================================================
---- libffi.orig/README
-+++ libffi/README
-@@ -1,8 +1,8 @@
- Status
- ======
- 
--libffi-3.0.11 was released on April 11, 2012.  Check the libffi web
--page for updates: <URL:http://sourceware.org/libffi/>.
-+libffi-3.0.XX was released on XXXXXXX.  Check the libffi web page for
-+updates: <URL:http://sourceware.org/libffi/>.
- 
- 
- What is libffi?
-@@ -56,6 +56,7 @@ tested:
- | ARM          | Linux            |
- | ARM          | iOS              |
- | AVR32        | Linux            |
-+| Blackfin     | uClinux          |
- | HPPA         | HPUX             |
- | IA-64        | Linux            |
- | M68K         | FreeMiNT         |
-@@ -148,6 +149,9 @@ History
- 
- See the ChangeLog files for details.
- 
-+3.0.12 XXX-XX-XX
-+        Add Blackfin support.
-+
- 3.0.11 Apr-11-12
-         Add support for variadic functions (ffi_prep_cif_var).
- 	Add Linux/x32 support.
+-- 
+1.7.9.5
+

From cdbb04096b99eb317eabd2b55610cf4056928ee6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Nov 2012 00:48:10 +0000
Subject: [PATCH 3329/6849] libffi: add aarch64 support from upstream

Fixes build failures like:

  http://autobuild.buildroot.org/results/6b4b4c414d366c936df480747c78272050c84293/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...02-Add-aarch64-support-from-upstream.patch | 2326 +++++++++++++++++
 1 file changed, 2326 insertions(+)
 create mode 100644 package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch

diff --git a/package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch b/package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch
new file mode 100644
index 0000000000..a4071302a5
--- /dev/null
+++ b/package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch
@@ -0,0 +1,2326 @@
+From c77c9625dd63138512ce0f67e07dd254771e566f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 16 Nov 2012 01:15:28 +0100
+Subject: [PATCH 2/2] Add aarch64 support from upstream
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ ChangeLog                |   27 ++
+ Makefile.am              |    4 +
+ Makefile.in              |   44 +-
+ README                   |    3 +
+ configure                |  185 +++++---
+ configure.ac             |    5 +
+ src/aarch64/ffi.c        | 1076 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/aarch64/ffitarget.h  |   59 +++
+ src/aarch64/sysv.S       |  307 +++++++++++++
+ testsuite/lib/libffi.exp |    4 +
+ 10 files changed, 1647 insertions(+), 67 deletions(-)
+ create mode 100644 src/aarch64/ffi.c
+ create mode 100644 src/aarch64/ffitarget.h
+ create mode 100644 src/aarch64/sysv.S
+
+diff --git a/ChangeLog b/ChangeLog
+index 376edf7..4e8ea91 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,30 @@
++2012-10-30  James Greenhalgh  <james.greenhalgh at arm.com>
++            Marcus Shawcroft  <marcus.shawcroft at arm.com>
++
++        * README: Add details of aarch64 port.
++        * src/aarch64/ffi.c: New.
++        * src/aarch64/ffitarget.h: Likewise.
++        * src/aarch64/sysv.S: Likewise.
++	* Makefile.am: Support aarch64.
++	* configure.ac: Support aarch64.
++	* Makefile.in, configure: Rebuilt.
++
++2012-10-30  James Greenhalgh  <james.greenhalgh at arm.com>
++            Marcus Shawcroft  <marcus.shawcroft at arm.com>
++
++        * testsuite/lib/libffi.exp: Add support for aarch64.
++        * testsuite/libffi.call/cls_struct_va1.c: New.
++        * testsuite/libffi.call/cls_uchar_va.c: Likewise.
++        * testsuite/libffi.call/cls_uint_va.c: Likewise.
++        * testsuite/libffi.call/cls_ulong_va.c: Liekwise.
++        * testsuite/libffi.call/cls_ushort_va.c: Likewise.
++        * testsuite/libffi.call/nested_struct11.c: Likewise.
++        * testsuite/libffi.call/uninitialized.c: Likewise.
++        * testsuite/libffi.call/va_1.c: Likewise.
++        * testsuite/libffi.call/va_struct1.c: Likewise.
++        * testsuite/libffi.call/va_struct2.c: Likewise.
++        * testsuite/libffi.call/va_struct3.c: Likewise.
++
+ 2012-04-23  Alexandre Keunecke I. de Mendonca <alexandre.keunecke@gmail.com>
+ 
+ 	* configure.ac: Add Blackfin/sysv support
+diff --git a/Makefile.am b/Makefile.am
+index 16f32a6..bd4d5c4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
+ SUBDIRS = include testsuite man
+ 
+ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
++	src/aarch64/ffi.c src/aarch64/ffitarget.h \
+ 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
+ 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
+ 	src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
+@@ -151,6 +152,9 @@ endif
+ if POWERPC_FREEBSD
+ nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
+ endif
++if AARCH64
++nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
++endif
+ if ARM
+ nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
+ if FFI_EXEC_TRAMPOLINE_TABLE
+diff --git a/Makefile.in b/Makefile.in
+index f5c10af..c4f4470 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,9 +65,10 @@ target_triplet = @target@
+ @SH64_TRUE@am__append_27 = src/sh64/sysv.S src/sh64/ffi.c
+ @PA_LINUX_TRUE@am__append_28 = src/pa/linux.S src/pa/ffi.c
+ @PA_HPUX_TRUE@am__append_29 = src/pa/hpux32.S src/pa/ffi.c
++@AARCH64_TRUE@am__append_30 = src/aarch64/sysv.S src/aarch64/ffi.c
+ # Build debug. Define FFI_DEBUG on the commandline so that, when building with
+ # MSVC, it can link against the debug CRT.
+-@FFI_DEBUG_TRUE@am__append_30 = -DFFI_DEBUG
++@FFI_DEBUG_TRUE@am__append_31 = -DFFI_DEBUG
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
+@@ -156,6 +157,7 @@ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \
+ @SH64_TRUE@am__objects_27 = src/sh64/sysv.lo src/sh64/ffi.lo
+ @PA_LINUX_TRUE@am__objects_28 = src/pa/linux.lo src/pa/ffi.lo
+ @PA_HPUX_TRUE@am__objects_29 = src/pa/hpux32.lo src/pa/ffi.lo
++@AARCH64_TRUE@am__objects_29 = src/aarch64/sysv.lo src/aarch64/ffi.lo
+ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+ 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+@@ -165,17 +167,18 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+ 	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
+ 	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
+-	$(am__objects_27) $(am__objects_28) $(am__objects_29)
++	$(am__objects_27) $(am__objects_28) $(am__objects_29) \
++	$(am__objects_30)
+ libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \
+ 	$(nodist_libffi_la_OBJECTS)
+ libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libffi_la_LDFLAGS) $(LDFLAGS) -o $@
+ libffi_convenience_la_LIBADD =
+-am__objects_30 = src/prep_cif.lo src/types.lo src/raw_api.lo \
++am__objects_31 = src/prep_cif.lo src/types.lo src/raw_api.lo \
+ 	src/java_raw_api.lo src/closures.lo
+-am_libffi_convenience_la_OBJECTS = $(am__objects_30)
+-am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
++am_libffi_convenience_la_OBJECTS = $(am__objects_31)
++am__objects_32 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
+ 	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
+ 	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
+ 	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+@@ -185,7 +188,7 @@ am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
+ 	$(am__objects_22) $(am__objects_23) $(am__objects_24) \
+ 	$(am__objects_25) $(am__objects_26) $(am__objects_27) \
+ 	$(am__objects_28) $(am__objects_29)
+-nodist_libffi_convenience_la_OBJECTS = $(am__objects_31)
++nodist_libffi_convenience_la_OBJECTS = $(am__objects_32)
+ libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
+ 	$(nodist_libffi_convenience_la_OBJECTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@
+@@ -410,6 +413,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+ SUBDIRS = include testsuite man
+ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
++	src/aarch64/ffi.c src/aarch64/ffitarget.h \
+ 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
+ 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
+ 	src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
+@@ -501,10 +505,11 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \
+ 	$(am__append_18) $(am__append_19) $(am__append_20) \
+ 	$(am__append_21) $(am__append_22) $(am__append_23) \
+ 	$(am__append_24) $(am__append_25) $(am__append_26) \
+-	$(am__append_27) $(am__append_28) $(am__append_29)
++	$(am__append_27) $(am__append_28) $(am__append_29) \
++	$(am__append_30)
+ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
+ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
+-AM_CFLAGS = -g $(am__append_30)
++AM_CFLAGS = -g $(am__append_31)
+ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
+ AM_CCASFLAGS = $(AM_CPPFLAGS) -g
+@@ -640,6 +645,16 @@ src/bfin/ffi.lo: src/bfin/$(am__dirstamp) \
+ 	src/bfin/$(DEPDIR)/$(am__dirstamp)
+ src/bfin/sysv.lo: src/bfin/$(am__dirstamp) \
+ 	src/bfin/$(DEPDIR)/$(am__dirstamp)
++src/aarch64/$(am__dirstamp):
++	@$(MKDIR_P) src/aarch64
++	@: > src/aarch64/$(am__dirstamp)
++src/aarch64/$(DEPDIR)/$(am__dirstamp):
++	@$(MKDIR_P) src/aarch64/$(DEPDIR)
++	@: > src/aarch64/$(DEPDIR)/$(am__dirstamp)
++src/aarch64/ffi.lo: src/aarch64/$(am__dirstamp) \
++	src/aarch64/$(DEPDIR)/$(am__dirstamp)
++src/aarch64/sysv.lo: src/aarch64/$(am__dirstamp) \
++	src/aarch64/$(DEPDIR)/$(am__dirstamp)
+ src/x86/$(am__dirstamp):
+ 	@$(MKDIR_P) src/x86
+ 	@: > src/x86/$(am__dirstamp)
+@@ -859,6 +874,10 @@ mostlyclean-compile:
+ 	-rm -f src/bfin/ffi.lo
+ 	-rm -f src/bfin/sysv.$(OBJEXT)
+ 	-rm -f src/bfin/sysv.lo
++	-rm -f src/aarch64/ffi.$(OBJEXT)
++	-rm -f src/aarch64/ffi.lo
++	-rm -f src/aarch64/sysv.$(OBJEXT)
++	-rm -f src/aarch64/sysv.lo
+ 	-rm -f src/closures.$(OBJEXT)
+ 	-rm -f src/closures.lo
+ 	-rm -f src/cris/ffi.$(OBJEXT)
+@@ -973,6 +992,8 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/prep_cif.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/raw_api.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/types.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@src/aarch64/$(DEPDIR)/ffi.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@src/aarch64/$(DEPDIR)/sysv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/ffi.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@
+@@ -1083,6 +1104,7 @@ mostlyclean-libtool:
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 	-rm -rf src/.libs src/_libs
++	-rm -rf src/aarch64/.libs src/aarch64/_libs
+ 	-rm -rf src/alpha/.libs src/alpha/_libs
+ 	-rm -rf src/arm/.libs src/arm/_libs
+ 	-rm -rf src/avr32/.libs src/avr32/_libs
+@@ -1635,6 +1657,8 @@ distclean-generic:
+ 	-rm -f doc/$(am__dirstamp)
+ 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f src/$(am__dirstamp)
++	-rm -f src/aarch64/$(DEPDIR)/$(am__dirstamp)
++	-rm -f src/aarch64/$(am__dirstamp)
+ 	-rm -f src/alpha/$(DEPDIR)/$(am__dirstamp)
+ 	-rm -f src/alpha/$(am__dirstamp)
+ 	-rm -f src/arm/$(DEPDIR)/$(am__dirstamp)
+@@ -1682,7 +1706,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \
+ 
+ distclean: distclean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
++	-rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-hdr distclean-libtool distclean-tags
+@@ -1802,7 +1826,7 @@ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -rf $(top_srcdir)/autom4te.cache
+-	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
++	-rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+ 	maintainer-clean-generic maintainer-clean-vti
+diff --git a/README b/README
+index ec240a4..9aa99f4 100644
+--- a/README
++++ b/README
+@@ -51,6 +51,7 @@ tested:
+ |--------------+------------------|
+ | Architecture | Operating System |
+ |--------------+------------------|
++| AArch64         | Linux            |
+ | Alpha        | Linux            |
+ | Alpha        | Tru64            |
+ | ARM          | Linux            |
+@@ -151,6 +152,7 @@ See the ChangeLog files for details.
+ 
+ 3.0.12 XXX-XX-XX
+         Add Blackfin support.
++	Add AArch64 support.
+ 
+ 3.0.11 Apr-11-12
+         Add support for variadic functions (ffi_prep_cif_var).
+@@ -320,6 +322,7 @@ Thorup.
+ Major processor architecture ports were contributed by the following
+ developers:
+ 
++aarch64		Marcus Shawcroft, James Greenhalgh
+ alpha		Richard Henderson
+ arm		Raffaele Sena
+ cris		Simon Posnjak, Hans-Peter Nilsson
+diff --git a/configure b/configure
+index 4ccba55..419275b 100755
+--- a/configure
++++ b/configure
+@@ -649,6 +649,8 @@ AVR32_FALSE
+ AVR32_TRUE
+ ARM_FALSE
+ ARM_TRUE
++AARCH64_FALSE
++AARCH64_TRUE
+ POWERPC_FREEBSD_FALSE
+ POWERPC_FREEBSD_TRUE
+ POWERPC_DARWIN_FALSE
+@@ -1478,7 +1480,7 @@ Optional Features:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-pic              try to use only PIC/non-PIC objects [default=use
++  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                           both]
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-sysroot=DIR Search for dependent libraries within DIR
+@@ -5276,6 +5278,11 @@ else
+     lt_cv_sys_max_cmd_len=196608
+     ;;
+ 
++  os2*)
++    # The test takes a long time on OS/2.
++    lt_cv_sys_max_cmd_len=8192
++    ;;
++
+   osf*)
+     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -5315,7 +5322,7 @@ else
+       # If test is not a shell built-in, we'll probably end up computing a
+       # maximum length that is only half of the actual maximum length, but
+       # we can't tell.
+-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ 	      test $i != 17 # 1/2 MB should be enough
+       do
+@@ -5744,7 +5751,7 @@ irix5* | irix6* | nonstopux*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -6538,6 +6545,7 @@ for ac_symprfx in "" "_"; do
+     # which start with @ or ?.
+     lt_cv_sys_global_symbol_pipe="$AWK '"\
+ "     {last_section=section; section=\$ 3};"\
++"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+ "     \$ 0!~/External *\|/{next};"\
+ "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+@@ -6926,7 +6934,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
+-sparc*-*solaris*)
++*-*solaris*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -6937,7 +6945,20 @@ sparc*-*solaris*)
+     case `/usr/bin/file conftest.o` in
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      yes*)
++        case $host in
++        i?86-*-solaris*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        sparc*-*-solaris*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++        esac
++        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
++        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++          LD="${LD-ld}_sol2"
++        fi
++        ;;
+       *)
+ 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ 	  LD="${LD-ld} -64"
+@@ -7577,7 +7598,13 @@ else
+ 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+         _lt_result=$?
+-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++	# If there is a non-empty error log, and "single_module"
++	# appears in it, assume the flag caused a linker warning
++        if test -s conftest.err && $GREP single_module conftest.err; then
++	  cat conftest.err >&5
++	# Otherwise, if the output was created with a 0 exit code from
++	# the compiler, it worked.
++	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ 	  lt_cv_apple_cc_single_mod=yes
+ 	else
+ 	  cat conftest.err >&5
+@@ -7588,6 +7615,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
++
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+ if ${lt_cv_ld_exported_symbols_list+:} false; then :
+@@ -7620,6 +7648,7 @@ rm -f core conftest.err conftest.$ac_objext \
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
++
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+ $as_echo_n "checking for -force_load linker flag... " >&6; }
+ if ${lt_cv_ld_force_load+:} false; then :
+@@ -7641,7 +7670,9 @@ _LT_EOF
+       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+       _lt_result=$?
+-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++      if test -s conftest.err && $GREP force_load conftest.err; then
++	cat conftest.err >&5
++      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ 	lt_cv_ld_force_load=yes
+       else
+ 	cat conftest.err >&5
+@@ -8046,7 +8077,22 @@ fi
+ 
+ # Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then :
+-  withval=$with_pic; pic_mode="$withval"
++  withval=$with_pic; lt_p=${PACKAGE-default}
++    case $withval in
++    yes|no) pic_mode=$withval ;;
++    *)
++      pic_mode=default
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for lt_pkg in $withval; do
++	IFS="$lt_save_ifs"
++	if test "X$lt_pkg" = "X$lt_p"; then
++	  pic_mode=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
+ else
+   pic_mode=default
+ fi
+@@ -8124,6 +8170,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ 
+ 
++
++
++
++
+ test -z "$LN_S" && LN_S="ln -s"
+ 
+ 
+@@ -8579,7 +8629,9 @@ lt_prog_compiler_static=
+     case $cc_basename in
+     nvcc*) # Cuda Compiler Driver 2.2
+       lt_prog_compiler_wl='-Xlinker '
+-      lt_prog_compiler_pic='-Xcompiler -fPIC'
++      if test -n "$lt_prog_compiler_pic"; then
++        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
++      fi
+       ;;
+     esac
+   else
+@@ -8670,18 +8722,33 @@ lt_prog_compiler_static=
+ 	;;
+       *)
+ 	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ F* | *Sun*Fortran*)
++	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+ 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ 	  lt_prog_compiler_pic='-KPIC'
+ 	  lt_prog_compiler_static='-Bstatic'
+ 	  lt_prog_compiler_wl=''
+ 	  ;;
++	*Sun\ F* | *Sun*Fortran*)
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Qoption ld '
++	  ;;
+ 	*Sun\ C*)
+ 	  # Sun C 5.9
+ 	  lt_prog_compiler_pic='-KPIC'
+ 	  lt_prog_compiler_static='-Bstatic'
+ 	  lt_prog_compiler_wl='-Wl,'
+ 	  ;;
++        *Intel*\ [CF]*Compiler*)
++	  lt_prog_compiler_wl='-Wl,'
++	  lt_prog_compiler_pic='-fPIC'
++	  lt_prog_compiler_static='-static'
++	  ;;
++	*Portland\ Group*)
++	  lt_prog_compiler_wl='-Wl,'
++	  lt_prog_compiler_pic='-fpic'
++	  lt_prog_compiler_static='-Bstatic'
++	  ;;
+ 	esac
+ 	;;
+       esac
+@@ -9043,7 +9110,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   hardcode_direct=no
+   hardcode_direct_absolute=no
+   hardcode_libdir_flag_spec=
+-  hardcode_libdir_flag_spec_ld=
+   hardcode_libdir_separator=
+   hardcode_minus_L=no
+   hardcode_shlibpath_var=unsupported
+@@ -9293,8 +9359,7 @@ _LT_EOF
+ 	xlf* | bgf* | bgxlf* | mpixlf*)
+ 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+-	  hardcode_libdir_flag_spec=
+-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
++	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ 	  if test "x$supports_anon_versioning" = xyes; then
+ 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+@@ -9673,6 +9738,7 @@ fi
+ 	# The linker will not automatically build a static lib if we build a DLL.
+ 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ 	enable_shared_with_static_runtimes=yes
++	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 	# Don't use ranlib
+ 	old_postinstall_cmds='chmod 644 $oldlib'
+@@ -9718,6 +9784,7 @@ fi
+   hardcode_shlibpath_var=unsupported
+   if test "$lt_cv_ld_force_load" = "yes"; then
+     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++
+   else
+     whole_archive_flag_spec=''
+   fi
+@@ -9746,10 +9813,6 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
+-      ld_shlibs=no
+-      ;;
+-
+     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+     # support.  Future versions do this automatically, but an explicit c++rt0.o
+     # does not break anything, and helps significantly (at the cost of a little
+@@ -9762,7 +9825,7 @@ fi
+       ;;
+ 
+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
++    freebsd2.*)
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_direct=yes
+       hardcode_minus_L=yes
+@@ -9801,7 +9864,6 @@ fi
+       fi
+       if test "$with_gnu_ld" = no; then
+ 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-	hardcode_libdir_flag_spec_ld='+b $libdir'
+ 	hardcode_libdir_separator=:
+ 	hardcode_direct=yes
+ 	hardcode_direct_absolute=yes
+@@ -10425,11 +10487,6 @@ esac
+ 
+ 
+ 
+-
+-
+-
+-
+-
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+ 
+@@ -10519,7 +10576,7 @@ need_version=unknown
+ 
+ case $host_os in
+ aix3*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+   shlibpath_var=LIBPATH
+ 
+@@ -10528,7 +10585,7 @@ aix3*)
+   ;;
+ 
+ aix[4-9]*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   hardcode_into_libs=yes
+@@ -10593,7 +10650,7 @@ beos*)
+   ;;
+ 
+ bsdi[45]*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -10732,7 +10789,7 @@ darwin* | rhapsody*)
+   ;;
+ 
+ dgux*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -10740,10 +10797,6 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -10751,7 +10804,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[23].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -10769,7 +10822,7 @@ freebsd* | dragonfly*)
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  freebsd2*)
++  freebsd2.*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -10789,17 +10842,18 @@ freebsd* | dragonfly*)
+   ;;
+ 
+ gnu*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+   ;;
+ 
+ haiku*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   dynamic_linker="$host_os runtime_loader"
+@@ -10860,7 +10914,7 @@ hpux9* | hpux10* | hpux11*)
+   ;;
+ 
+ interix[3-9]*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -10876,7 +10930,7 @@ irix5* | irix6* | nonstopux*)
+     nonstopux*) version_type=nonstopux ;;
+     *)
+ 	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
++		version_type=linux # correct to gnu/linux during the next big refactor
+ 	else
+ 		version_type=irix
+ 	fi ;;
+@@ -10913,9 +10967,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+   dynamic_linker=no
+   ;;
+ 
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11001,7 +11055,7 @@ netbsd*)
+   ;;
+ 
+ newsos6)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+@@ -11070,7 +11124,7 @@ rdos*)
+   ;;
+ 
+ solaris*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11095,7 +11149,7 @@ sunos4*)
+   ;;
+ 
+ sysv4 | sysv4.3*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -11119,7 +11173,7 @@ sysv4 | sysv4.3*)
+ 
+ sysv4*MP*)
+   if test -d /usr/nec ;then
+-    version_type=linux
++    version_type=linux # correct to gnu/linux during the next big refactor
+     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+     soname_spec='$libname${shared_ext}.$major'
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -11150,7 +11204,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ 
+ tpf*)
+   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11160,7 +11214,7 @@ tpf*)
+   ;;
+ 
+ uts4*)
+-  version_type=linux
++  version_type=linux # correct to gnu/linux during the next big refactor
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -11942,6 +11996,8 @@ CC="$lt_save_CC"
+ 
+ 
+ 
++
++
+         ac_config_commands="$ac_config_commands libtool"
+ 
+ 
+@@ -13132,6 +13188,10 @@ fi
+ 
+ TARGETDIR="unknown"
+ case "$host" in
++  aarch64*-*-*)
++	TARGET=AARCH64; TARGETDIR=aarch64
++	;;
++
+   alpha*-*-*)
+ 	TARGET=ALPHA; TARGETDIR=alpha;
+ 	# Support 128-bit long double, changeable via command-line switch.
+@@ -13431,6 +13491,14 @@ else
+   POWERPC_FREEBSD_FALSE=
+ fi
+ 
++ if test x$TARGET = xAARCH64; then
++  AARCH64_TRUE=
++  AARCH64_FALSE='#'
++else
++  AARCH64_TRUE='#'
++  AARCH64_FALSE=
++fi
++
+  if test x$TARGET = xARM; then
+   ARM_TRUE=
+   ARM_FALSE='#'
+@@ -14786,6 +14854,10 @@ if test -z "${POWERPC_FREEBSD_TRUE}" && test -z "${POWERPC_FREEBSD_FALSE}"; then
+   as_fn_error $? "conditional \"POWERPC_FREEBSD\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${AARCH64_TRUE}" && test -z "${AARCH64_FALSE}"; then
++  as_fn_error $? "conditional \"AARCH64\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${ARM_TRUE}" && test -z "${ARM_FALSE}"; then
+   as_fn_error $? "conditional \"ARM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -15463,6 +15535,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
++PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+ host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+ host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+ host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+@@ -15545,7 +15618,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+@@ -15601,6 +15673,7 @@ _LTECHO_EOF'
+ # Quote evaled strings.
+ for var in SHELL \
+ ECHO \
++PATH_SEPARATOR \
+ SED \
+ GREP \
+ EGREP \
+@@ -15651,7 +15724,6 @@ with_gnu_ld \
+ allow_undefined_flag \
+ no_undefined_flag \
+ hardcode_libdir_flag_spec \
+-hardcode_libdir_flag_spec_ld \
+ hardcode_libdir_separator \
+ exclude_expsyms \
+ include_expsyms \
+@@ -16633,8 +16705,8 @@ $as_echo X"$file" |
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-#                 Inc.
++#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++#                 Foundation, Inc.
+ #   Written by Gordon Matzigkeit, 1996
+ #
+ #   This file is part of GNU Libtool.
+@@ -16688,6 +16760,9 @@ SHELL=$lt_SHELL
+ # An echo program that protects backslashes.
+ ECHO=$lt_ECHO
+ 
++# The PATH separator for the build system.
++PATH_SEPARATOR=$lt_PATH_SEPARATOR
++
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+@@ -16989,10 +17064,6 @@ no_undefined_flag=$lt_no_undefined_flag
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into a binary
+-# during linking.  This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+-
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+ 
+diff --git a/configure.ac b/configure.ac
+index 9b946a2..8c3f40c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,10 @@ AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
+ 
+ TARGETDIR="unknown"
+ case "$host" in
++  aarch64*-*-*)
++	TARGET=AARCH64; TARGETDIR=aarch64
++	;;
++
+   alpha*-*-*)
+ 	TARGET=ALPHA; TARGETDIR=alpha;
+ 	# Support 128-bit long double, changeable via command-line switch.
+@@ -233,6 +237,7 @@ AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
+ AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
+ AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
+ AM_CONDITIONAL(POWERPC_FREEBSD, test x$TARGET = xPOWERPC_FREEBSD)
++AM_CONDITIONAL(AARCH64, test x$TARGET = xAARCH64)
+ AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+ AM_CONDITIONAL(AVR32, test x$TARGET = xAVR32)
+ AM_CONDITIONAL(LIBFFI_CRIS, test x$TARGET = xLIBFFI_CRIS)
+diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c
+new file mode 100644
+index 0000000..1405665
+--- /dev/null
++++ b/src/aarch64/ffi.c
+@@ -0,0 +1,1076 @@
++/* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
++
++Permission is hereby granted, free of charge, to any person obtaining
++a copy of this software and associated documentation files (the
++``Software''), to deal in the Software without restriction, including
++without limitation the rights to use, copy, modify, merge, publish,
++distribute, sublicense, and/or sell copies of the Software, and to
++permit persons to whom the Software is furnished to do so, subject to
++the following conditions:
++
++The above copyright notice and this permission notice shall be
++included in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
++
++#include <stdio.h>
++
++#include <ffi.h>
++#include <ffi_common.h>
++
++#include <stdlib.h>
++
++/* Stack alignment requirement in bytes */
++#define AARCH64_STACK_ALIGN 16
++
++#define N_X_ARG_REG 8
++#define N_V_ARG_REG 8
++
++#define AARCH64_FFI_WITH_V (1 << AARCH64_FFI_WITH_V_BIT)
++
++union _d
++{
++  UINT64 d;
++  UINT32 s[2];
++};
++
++struct call_context
++{
++  UINT64 x [AARCH64_N_XREG];
++  struct
++  {
++    union _d d[2];
++  } v [AARCH64_N_VREG];
++};
++
++static void *
++get_x_addr (struct call_context *context, unsigned n)
++{
++  return &context->x[n];
++}
++
++static void *
++get_s_addr (struct call_context *context, unsigned n)
++{
++#if defined __AARCH64EB__
++  return &context->v[n].d[1].s[1];
++#else
++  return &context->v[n].d[0].s[0];
++#endif
++}
++
++static void *
++get_d_addr (struct call_context *context, unsigned n)
++{
++#if defined __AARCH64EB__
++  return &context->v[n].d[1];
++#else
++  return &context->v[n].d[0];
++#endif
++}
++
++static void *
++get_v_addr (struct call_context *context, unsigned n)
++{
++  return &context->v[n];
++}
++
++/* Return the memory location at which a basic type would reside
++   were it to have been stored in register n.  */
++
++static void *
++get_basic_type_addr (unsigned short type, struct call_context *context,
++		     unsigned n)
++{
++  switch (type)
++    {
++    case FFI_TYPE_FLOAT:
++      return get_s_addr (context, n);
++    case FFI_TYPE_DOUBLE:
++      return get_d_addr (context, n);
++    case FFI_TYPE_LONGDOUBLE:
++      return get_v_addr (context, n);
++    case FFI_TYPE_UINT8:
++    case FFI_TYPE_SINT8:
++    case FFI_TYPE_UINT16:
++    case FFI_TYPE_SINT16:
++    case FFI_TYPE_UINT32:
++    case FFI_TYPE_SINT32:
++    case FFI_TYPE_INT:
++    case FFI_TYPE_POINTER:
++    case FFI_TYPE_UINT64:
++    case FFI_TYPE_SINT64:
++      return get_x_addr (context, n);
++    default:
++      FFI_ASSERT (0);
++      return NULL;
++    }
++}
++
++/* Return the alignment width for each of the basic types.  */
++
++static size_t
++get_basic_type_alignment (unsigned short type)
++{
++  switch (type)
++    {
++    case FFI_TYPE_FLOAT:
++    case FFI_TYPE_DOUBLE:
++      return sizeof (UINT64);
++    case FFI_TYPE_LONGDOUBLE:
++      return sizeof (long double);
++    case FFI_TYPE_UINT8:
++    case FFI_TYPE_SINT8:
++    case FFI_TYPE_UINT16:
++    case FFI_TYPE_SINT16:
++    case FFI_TYPE_UINT32:
++    case FFI_TYPE_INT:
++    case FFI_TYPE_SINT32:
++    case FFI_TYPE_POINTER:
++    case FFI_TYPE_UINT64:
++    case FFI_TYPE_SINT64:
++      return sizeof (UINT64);
++
++    default:
++      FFI_ASSERT (0);
++      return 0;
++    }
++}
++
++/* Return the size in bytes for each of the basic types.  */
++
++static size_t
++get_basic_type_size (unsigned short type)
++{
++  switch (type)
++    {
++    case FFI_TYPE_FLOAT:
++      return sizeof (UINT32);
++    case FFI_TYPE_DOUBLE:
++      return sizeof (UINT64);
++    case FFI_TYPE_LONGDOUBLE:
++      return sizeof (long double);
++    case FFI_TYPE_UINT8:
++      return sizeof (UINT8);
++    case FFI_TYPE_SINT8:
++      return sizeof (SINT8);
++    case FFI_TYPE_UINT16:
++      return sizeof (UINT16);
++    case FFI_TYPE_SINT16:
++      return sizeof (SINT16);
++    case FFI_TYPE_UINT32:
++      return sizeof (UINT32);
++    case FFI_TYPE_INT:
++    case FFI_TYPE_SINT32:
++      return sizeof (SINT32);
++    case FFI_TYPE_POINTER:
++    case FFI_TYPE_UINT64:
++      return sizeof (UINT64);
++    case FFI_TYPE_SINT64:
++      return sizeof (SINT64);
++
++    default:
++      FFI_ASSERT (0);
++      return 0;
++    }
++}
++
++extern void
++ffi_call_SYSV (unsigned (*)(struct call_context *context, unsigned char *,
++			    extended_cif *),
++               struct call_context *context,
++               extended_cif *,
++               unsigned,
++               void (*fn)(void));
++
++extern void
++ffi_closure_SYSV (ffi_closure *);
++
++/* Test for an FFI floating point representation.  */
++
++static unsigned
++is_floating_type (unsigned short type)
++{
++  return (type == FFI_TYPE_FLOAT || type == FFI_TYPE_DOUBLE
++	  || type == FFI_TYPE_LONGDOUBLE);
++}
++
++/* Test for a homogeneous structure.  */
++
++static unsigned short
++get_homogeneous_type (ffi_type *ty)
++{
++  if (ty->type == FFI_TYPE_STRUCT && ty->elements)
++    {
++      unsigned i;
++      unsigned short candidate_type
++	= get_homogeneous_type (ty->elements[0]);
++      for (i =1; ty->elements[i]; i++)
++	{
++	  unsigned short iteration_type = 0;
++	  /* If we have a nested struct, we must find its homogeneous type.
++	     If that fits with our candidate type, we are still
++	     homogeneous.  */
++	  if (ty->elements[i]->type == FFI_TYPE_STRUCT
++	      && ty->elements[i]->elements)
++	    {
++	      iteration_type = get_homogeneous_type (ty->elements[i]);
++	    }
++	  else
++	    {
++	      iteration_type = ty->elements[i]->type;
++	    }
++
++	  /* If we are not homogeneous, return FFI_TYPE_STRUCT.  */
++	  if (candidate_type != iteration_type)
++	    return FFI_TYPE_STRUCT;
++	}
++      return candidate_type;
++    }
++
++  /* Base case, we have no more levels of nesting, so we
++     are a basic type, and so, trivially homogeneous in that type.  */
++  return ty->type;
++}
++
++/* Determine the number of elements within a STRUCT.
++
++   Note, we must handle nested structs.
++
++   If ty is not a STRUCT this function will return 0.  */
++
++static unsigned
++element_count (ffi_type *ty)
++{
++  if (ty->type == FFI_TYPE_STRUCT && ty->elements)
++    {
++      unsigned n;
++      unsigned elems = 0;
++      for (n = 0; ty->elements[n]; n++)
++	{
++	  if (ty->elements[n]->type == FFI_TYPE_STRUCT
++	      && ty->elements[n]->elements)
++	    elems += element_count (ty->elements[n]);
++	  else
++	    elems++;
++	}
++      return elems;
++    }
++  return 0;
++}
++
++/* Test for a homogeneous floating point aggregate.
++
++   A homogeneous floating point aggregate is a homogeneous aggregate of
++   a half- single- or double- precision floating point type with one
++   to four elements.  Note that this includes nested structs of the
++   basic type.  */
++
++static int
++is_hfa (ffi_type *ty)
++{
++  if (ty->type == FFI_TYPE_STRUCT
++      && ty->elements[0]
++      && is_floating_type (get_homogeneous_type (ty)))
++    {
++      unsigned n = element_count (ty);
++      return n >= 1 && n <= 4;
++    }
++  return 0;
++}
++
++/* Test if an ffi_type is a candidate for passing in a register.
++
++   This test does not check that sufficient registers of the
++   appropriate class are actually available, merely that IFF
++   sufficient registers are available then the argument will be passed
++   in register(s).
++
++   Note that an ffi_type that is deemed to be a register candidate
++   will always be returned in registers.
++
++   Returns 1 if a register candidate else 0.  */
++
++static int
++is_register_candidate (ffi_type *ty)
++{
++  switch (ty->type)
++    {
++    case FFI_TYPE_VOID:
++    case FFI_TYPE_FLOAT:
++    case FFI_TYPE_DOUBLE:
++    case FFI_TYPE_LONGDOUBLE:
++    case FFI_TYPE_UINT8:
++    case FFI_TYPE_UINT16:
++    case FFI_TYPE_UINT32:
++    case FFI_TYPE_UINT64:
++    case FFI_TYPE_POINTER:
++    case FFI_TYPE_SINT8:
++    case FFI_TYPE_SINT16:
++    case FFI_TYPE_SINT32:
++    case FFI_TYPE_INT:
++    case FFI_TYPE_SINT64:
++      return 1;
++
++    case FFI_TYPE_STRUCT:
++      if (is_hfa (ty))
++        {
++          return 1;
++        }
++      else if (ty->size > 16)
++        {
++          /* Too large. Will be replaced with a pointer to memory. The
++             pointer MAY be passed in a register, but the value will
++             not. This test specifically fails since the argument will
++             never be passed by value in registers. */
++          return 0;
++        }
++      else
++        {
++          /* Might be passed in registers depending on the number of
++             registers required. */
++          return (ty->size + 7) / 8 < N_X_ARG_REG;
++        }
++      break;
++
++    default:
++      FFI_ASSERT (0);
++      break;
++    }
++
++  return 0;
++}
++
++/* Test if an ffi_type argument or result is a candidate for a vector
++   register.  */
++
++static int
++is_v_register_candidate (ffi_type *ty)
++{
++  return is_floating_type (ty->type)
++	   || (ty->type == FFI_TYPE_STRUCT && is_hfa (ty));
++}
++
++/* Representation of the procedure call argument marshalling
++   state.
++
++   The terse state variable names match the names used in the AARCH64
++   PCS. */
++
++struct arg_state
++{
++  unsigned ngrn;                /* Next general-purpose register number. */
++  unsigned nsrn;                /* Next vector register number. */
++  unsigned nsaa;                /* Next stack offset. */
++};
++
++/* Initialize a procedure call argument marshalling state.  */
++static void
++arg_init (struct arg_state *state, unsigned call_frame_size)
++{
++  state->ngrn = 0;
++  state->nsrn = 0;
++  state->nsaa = 0;
++}
++
++/* Return the number of available consecutive core argument
++   registers.  */
++
++static unsigned
++available_x (struct arg_state *state)
++{
++  return N_X_ARG_REG - state->ngrn;
++}
++
++/* Return the number of available consecutive vector argument
++   registers.  */
++
++static unsigned
++available_v (struct arg_state *state)
++{
++  return N_V_ARG_REG - state->nsrn;
++}
++
++static void *
++allocate_to_x (struct call_context *context, struct arg_state *state)
++{
++  FFI_ASSERT (state->ngrn < N_X_ARG_REG)
++  return get_x_addr (context, (state->ngrn)++);
++}
++
++static void *
++allocate_to_s (struct call_context *context, struct arg_state *state)
++{
++  FFI_ASSERT (state->nsrn < N_V_ARG_REG)
++  return get_s_addr (context, (state->nsrn)++);
++}
++
++static void *
++allocate_to_d (struct call_context *context, struct arg_state *state)
++{
++  FFI_ASSERT (state->nsrn < N_V_ARG_REG)
++  return get_d_addr (context, (state->nsrn)++);
++}
++
++static void *
++allocate_to_v (struct call_context *context, struct arg_state *state)
++{
++  FFI_ASSERT (state->nsrn < N_V_ARG_REG)
++  return get_v_addr (context, (state->nsrn)++);
++}
++
++/* Allocate an aligned slot on the stack and return a pointer to it.  */
++static void *
++allocate_to_stack (struct arg_state *state, void *stack, unsigned alignment,
++		   unsigned size)
++{
++  void *allocation;
++
++  /* Round up the NSAA to the larger of 8 or the natural
++     alignment of the argument's type.  */
++  state->nsaa = ALIGN (state->nsaa, alignment);
++  state->nsaa = ALIGN (state->nsaa, alignment);
++  state->nsaa = ALIGN (state->nsaa, 8);
++
++  allocation = stack + state->nsaa;
++
++  state->nsaa += size;
++  return allocation;
++}
++
++static void
++copy_basic_type (void *dest, void *source, unsigned short type)
++{
++  /* This is neccessary to ensure that basic types are copied
++     sign extended to 64-bits as libffi expects.  */
++  switch (type)
++    {
++    case FFI_TYPE_FLOAT:
++      *(float *) dest = *(float *) source;
++      break;
++    case FFI_TYPE_DOUBLE:
++      *(double *) dest = *(double *) source;
++      break;
++    case FFI_TYPE_LONGDOUBLE:
++      *(long double *) dest = *(long double *) source;
++      break;
++    case FFI_TYPE_UINT8:
++      *(ffi_arg *) dest = *(UINT8 *) source;
++      break;
++    case FFI_TYPE_SINT8:
++      *(ffi_sarg *) dest = *(SINT8 *) source;
++      break;
++    case FFI_TYPE_UINT16:
++      *(ffi_arg *) dest = *(UINT16 *) source;
++      break;
++    case FFI_TYPE_SINT16:
++      *(ffi_sarg *) dest = *(SINT16 *) source;
++      break;
++    case FFI_TYPE_UINT32:
++      *(ffi_arg *) dest = *(UINT32 *) source;
++      break;
++    case FFI_TYPE_INT:
++    case FFI_TYPE_SINT32:
++      *(ffi_sarg *) dest = *(SINT32 *) source;
++      break;
++    case FFI_TYPE_POINTER:
++    case FFI_TYPE_UINT64:
++      *(ffi_arg *) dest = *(UINT64 *) source;
++      break;
++    case FFI_TYPE_SINT64:
++      *(ffi_sarg *) dest = *(SINT64 *) source;
++      break;
++
++    default:
++      FFI_ASSERT (0);
++    }
++}
++
++static void
++copy_hfa_to_reg_or_stack (void *memory,
++			  ffi_type *ty,
++			  struct call_context *context,
++			  unsigned char *stack,
++			  struct arg_state *state)
++{
++  unsigned elems = element_count (ty);
++  if (available_v (state) < elems)
++    {
++      /* There are insufficient V registers. Further V register allocations
++	 are prevented, the NSAA is adjusted (by allocate_to_stack ())
++	 and the argument is copied to memory at the adjusted NSAA.  */
++      state->nsrn = N_V_ARG_REG;
++      memcpy (allocate_to_stack (state, stack, ty->alignment, ty->size),
++	      memory,
++	      ty->size);
++    }
++  else
++    {
++      int i;
++      unsigned short type = get_homogeneous_type (ty);
++      unsigned elems = element_count (ty);
++      for (i = 0; i < elems; i++)
++	{
++	  void *reg = allocate_to_v (context, state);
++	  copy_basic_type (reg, memory, type);
++	  memory += get_basic_type_size (type);
++	}
++    }
++}
++
++/* Either allocate an appropriate register for the argument type, or if
++   none are available, allocate a stack slot and return a pointer
++   to the allocated space.  */
++
++static void *
++allocate_to_register_or_stack (struct call_context *context,
++			       unsigned char *stack,
++			       struct arg_state *state,
++			       unsigned short type)
++{
++  size_t alignment = get_basic_type_alignment (type);
++  size_t size = alignment;
++  switch (type)
++    {
++    case FFI_TYPE_FLOAT:
++      /* This is the only case for which the allocated stack size
++	 should not match the alignment of the type.  */
++      size = sizeof (UINT32);
++      /* Fall through.  */
++    case FFI_TYPE_DOUBLE:
++      if (state->nsrn < N_V_ARG_REG)
++	return allocate_to_d (context, state);
++      state->nsrn = N_V_ARG_REG;
++      break;
++    case FFI_TYPE_LONGDOUBLE:
++      if (state->nsrn < N_V_ARG_REG)
++	return allocate_to_v (context, state);
++      state->nsrn = N_V_ARG_REG;
++      break;
++    case FFI_TYPE_UINT8:
++    case FFI_TYPE_SINT8:
++    case FFI_TYPE_UINT16:
++    case FFI_TYPE_SINT16:
++    case FFI_TYPE_UINT32:
++    case FFI_TYPE_SINT32:
++    case FFI_TYPE_INT:
++    case FFI_TYPE_POINTER:
++    case FFI_TYPE_UINT64:
++    case FFI_TYPE_SINT64:
++      if (state->ngrn < N_X_ARG_REG)
++	return allocate_to_x (context, state);
++      state->ngrn = N_X_ARG_REG;
++      break;
++    default:
++      FFI_ASSERT (0);
++    }
++
++    return allocate_to_stack (state, stack, alignment, size);
++}
++
++/* Copy a value to an appropriate register, or if none are
++   available, to the stack.  */
++
++static void
++copy_to_register_or_stack (struct call_context *context,
++			   unsigned char *stack,
++			   struct arg_state *state,
++			   void *value,
++			   unsigned short type)
++{
++  copy_basic_type (
++	  allocate_to_register_or_stack (context, stack, state, type),
++	  value,
++	  type);
++}
++
++/* Marshall the arguments from FFI representation to procedure call
++   context and stack.  */
++
++static unsigned
++aarch64_prep_args (struct call_context *context, unsigned char *stack,
++		   extended_cif *ecif)
++{
++  int i;
++  struct arg_state state;
++
++  arg_init (&state, ALIGN(ecif->cif->bytes, 16));
++
++  for (i = 0; i < ecif->cif->nargs; i++)
++    {
++      ffi_type *ty = ecif->cif->arg_types[i];
++      switch (ty->type)
++	{
++	case FFI_TYPE_VOID:
++	  FFI_ASSERT (0);
++	  break;
++
++	/* If the argument is a basic type the argument is allocated to an
++	   appropriate register, or if none are available, to the stack.  */
++	case FFI_TYPE_FLOAT:
++	case FFI_TYPE_DOUBLE:
++	case FFI_TYPE_LONGDOUBLE:
++	case FFI_TYPE_UINT8:
++	case FFI_TYPE_SINT8:
++	case FFI_TYPE_UINT16:
++	case FFI_TYPE_SINT16:
++	case FFI_TYPE_UINT32:
++	case FFI_TYPE_INT:
++	case FFI_TYPE_SINT32:
++	case FFI_TYPE_POINTER:
++	case FFI_TYPE_UINT64:
++	case FFI_TYPE_SINT64:
++	  copy_to_register_or_stack (context, stack, &state,
++				     ecif->avalue[i], ty->type);
++	  break;
++
++	case FFI_TYPE_STRUCT:
++	  if (is_hfa (ty))
++	    {
++	      copy_hfa_to_reg_or_stack (ecif->avalue[i], ty, context,
++					stack, &state);
++	    }
++	  else if (ty->size > 16)
++	    {
++	      /* If the argument is a composite type that is larger than 16
++		 bytes, then the argument has been copied to memory, and
++		 the argument is replaced by a pointer to the copy.  */
++
++	      copy_to_register_or_stack (context, stack, &state,
++					 &(ecif->avalue[i]), FFI_TYPE_POINTER);
++	    }
++	  else if (available_x (&state) >= (ty->size + 7) / 8)
++	    {
++	      /* If the argument is a composite type and the size in
++		 double-words is not more than the number of available
++		 X registers, then the argument is copied into consecutive
++		 X registers.  */
++	      int j;
++	      for (j = 0; j < (ty->size + 7) / 8; j++)
++		{
++		  memcpy (allocate_to_x (context, &state),
++			  &(((UINT64 *) ecif->avalue[i])[j]),
++			  sizeof (UINT64));
++		}
++	    }
++	  else
++	    {
++	      /* Otherwise, there are insufficient X registers. Further X
++		 register allocations are prevented, the NSAA is adjusted
++		 (by allocate_to_stack ()) and the argument is copied to
++		 memory at the adjusted NSAA.  */
++	      state.ngrn = N_X_ARG_REG;
++
++	      memcpy (allocate_to_stack (&state, stack, ty->alignment,
++					 ty->size), ecif->avalue + i, ty->size);
++	    }
++	  break;
++
++	default:
++	  FFI_ASSERT (0);
++	  break;
++	}
++    }
++
++  return ecif->cif->aarch64_flags;
++}
++
++ffi_status
++ffi_prep_cif_machdep (ffi_cif *cif)
++{
++  /* Round the stack up to a multiple of the stack alignment requirement. */
++  cif->bytes =
++    (cif->bytes + (AARCH64_STACK_ALIGN - 1)) & ~ (AARCH64_STACK_ALIGN - 1);
++
++  /* Initialize our flags. We are interested if this CIF will touch a
++     vector register, if so we will enable context save and load to
++     those registers, otherwise not. This is intended to be friendly
++     to lazy float context switching in the kernel.  */
++  cif->aarch64_flags = 0;
++
++  if (is_v_register_candidate (cif->rtype))
++    {
++      cif->aarch64_flags |= AARCH64_FFI_WITH_V;
++    }
++  else
++    {
++      int i;
++      for (i = 0; i < cif->nargs; i++)
++        if (is_v_register_candidate (cif->arg_types[i]))
++          {
++            cif->aarch64_flags |= AARCH64_FFI_WITH_V;
++            break;
++          }
++    }
++
++  return FFI_OK;
++}
++
++/* Call a function with the provided arguments and capture the return
++   value.  */
++void
++ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
++{
++  extended_cif ecif;
++
++  ecif.cif = cif;
++  ecif.avalue = avalue;
++  ecif.rvalue = rvalue;
++
++  switch (cif->abi)
++    {
++    case FFI_SYSV:
++      {
++        struct call_context context;
++	unsigned stack_bytes;
++
++	/* Figure out the total amount of stack space we need, the
++	   above call frame space needs to be 16 bytes aligned to
++	   ensure correct alignment of the first object inserted in
++	   that space hence the ALIGN applied to cif->bytes.*/
++	stack_bytes = ALIGN(cif->bytes, 16);
++
++	memset (&context, 0, sizeof (context));
++        if (is_register_candidate (cif->rtype))
++          {
++            ffi_call_SYSV (aarch64_prep_args, &context, &ecif, stack_bytes, fn);
++            switch (cif->rtype->type)
++              {
++              case FFI_TYPE_VOID:
++              case FFI_TYPE_FLOAT:
++              case FFI_TYPE_DOUBLE:
++              case FFI_TYPE_LONGDOUBLE:
++              case FFI_TYPE_UINT8:
++              case FFI_TYPE_SINT8:
++              case FFI_TYPE_UINT16:
++              case FFI_TYPE_SINT16:
++              case FFI_TYPE_UINT32:
++              case FFI_TYPE_SINT32:
++              case FFI_TYPE_POINTER:
++              case FFI_TYPE_UINT64:
++              case FFI_TYPE_INT:
++              case FFI_TYPE_SINT64:
++		{
++		  void *addr = get_basic_type_addr (cif->rtype->type,
++						    &context, 0);
++		  copy_basic_type (rvalue, addr, cif->rtype->type);
++		  break;
++		}
++
++              case FFI_TYPE_STRUCT:
++                if (is_hfa (cif->rtype))
++		  {
++		    int j;
++		    unsigned short type = get_homogeneous_type (cif->rtype);
++		    unsigned elems = element_count (cif->rtype);
++		    for (j = 0; j < elems; j++)
++		      {
++			void *reg = get_basic_type_addr (type, &context, j);
++			copy_basic_type (rvalue, reg, type);
++			rvalue += get_basic_type_size (type);
++		      }
++		  }
++                else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG)
++                  {
++                    unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64));
++                    memcpy (rvalue, get_x_addr (&context, 0), size);
++                  }
++                else
++                  {
++                    FFI_ASSERT (0);
++                  }
++                break;
++
++              default:
++                FFI_ASSERT (0);
++                break;
++              }
++          }
++        else
++          {
++            memcpy (get_x_addr (&context, 8), &rvalue, sizeof (UINT64));
++            ffi_call_SYSV (aarch64_prep_args, &context, &ecif,
++			   stack_bytes, fn);
++          }
++        break;
++      }
++
++    default:
++      FFI_ASSERT (0);
++      break;
++    }
++}
++
++static unsigned char trampoline [] =
++{ 0x70, 0x00, 0x00, 0x58,	/* ldr	x16, 1f	*/
++  0x91, 0x00, 0x00, 0x10,	/* adr	x17, 2f	*/
++  0x00, 0x02, 0x1f, 0xd6	/* br	x16	*/
++};
++
++/* Build a trampoline.  */
++
++#define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX,FLAGS)			\
++  ({unsigned char *__tramp = (unsigned char*)(TRAMP);			\
++    UINT64  __fun = (UINT64)(FUN);					\
++    UINT64  __ctx = (UINT64)(CTX);					\
++    UINT64  __flags = (UINT64)(FLAGS);					\
++    memcpy (__tramp, trampoline, sizeof (trampoline));			\
++    memcpy (__tramp + 12, &__fun, sizeof (__fun));			\
++    memcpy (__tramp + 20, &__ctx, sizeof (__ctx));			\
++    memcpy (__tramp + 28, &__flags, sizeof (__flags));			\
++    __clear_cache(__tramp, __tramp + FFI_TRAMPOLINE_SIZE);		\
++  })
++
++ffi_status
++ffi_prep_closure_loc (ffi_closure* closure,
++                      ffi_cif* cif,
++                      void (*fun)(ffi_cif*,void*,void**,void*),
++                      void *user_data,
++                      void *codeloc)
++{
++  if (cif->abi != FFI_SYSV)
++    return FFI_BAD_ABI;
++
++  FFI_INIT_TRAMPOLINE (&closure->tramp[0], &ffi_closure_SYSV, codeloc,
++		       cif->aarch64_flags);
++
++  closure->cif  = cif;
++  closure->user_data = user_data;
++  closure->fun  = fun;
++
++  return FFI_OK;
++}
++
++/* Primary handler to setup and invoke a function within a closure.
++
++   A closure when invoked enters via the assembler wrapper
++   ffi_closure_SYSV(). The wrapper allocates a call context on the
++   stack, saves the interesting registers (from the perspective of
++   the calling convention) into the context then passes control to
++   ffi_closure_SYSV_inner() passing the saved context and a pointer to
++   the stack at the point ffi_closure_SYSV() was invoked.
++
++   On the return path the assembler wrapper will reload call context
++   regsiters.
++
++   ffi_closure_SYSV_inner() marshalls the call context into ffi value
++   desriptors, invokes the wrapped function, then marshalls the return
++   value back into the call context.  */
++
++void
++ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
++			void *stack)
++{
++  ffi_cif *cif = closure->cif;
++  void **avalue = (void**) alloca (cif->nargs * sizeof (void*));
++  void *rvalue = NULL;
++  int i;
++  struct arg_state state;
++
++  arg_init (&state, ALIGN(cif->bytes, 16));
++
++  for (i = 0; i < cif->nargs; i++)
++    {
++      ffi_type *ty = cif->arg_types[i];
++
++      switch (ty->type)
++	{
++	case FFI_TYPE_VOID:
++	  FFI_ASSERT (0);
++	  break;
++
++	case FFI_TYPE_UINT8:
++	case FFI_TYPE_SINT8:
++	case FFI_TYPE_UINT16:
++	case FFI_TYPE_SINT16:
++	case FFI_TYPE_UINT32:
++	case FFI_TYPE_SINT32:
++	case FFI_TYPE_INT:
++	case FFI_TYPE_POINTER:
++	case FFI_TYPE_UINT64:
++	case FFI_TYPE_SINT64:
++	case  FFI_TYPE_FLOAT:
++	case  FFI_TYPE_DOUBLE:
++	case  FFI_TYPE_LONGDOUBLE:
++	  avalue[i] = allocate_to_register_or_stack (context, stack,
++						     &state, ty->type);
++	  break;
++
++	case FFI_TYPE_STRUCT:
++	  if (is_hfa (ty))
++	    {
++	      unsigned n = element_count (ty);
++	      if (available_v (&state) < n)
++		{
++		  state.nsrn = N_V_ARG_REG;
++		  avalue[i] = allocate_to_stack (&state, stack, ty->alignment,
++						 ty->size);
++		}
++	      else
++		{
++		  switch (get_homogeneous_type (ty))
++		    {
++		    case FFI_TYPE_FLOAT:
++		      {
++			/* Eeek! We need a pointer to the structure,
++			   however the homogeneous float elements are
++			   being passed in individual S registers,
++			   therefore the structure is not represented as
++			   a contiguous sequence of bytes in our saved
++			   register context. We need to fake up a copy
++			   of the structure layed out in memory
++			   correctly. The fake can be tossed once the
++			   closure function has returned hence alloca()
++			   is sufficient. */
++			int j;
++			UINT32 *p = avalue[i] = alloca (ty->size);
++			for (j = 0; j < element_count (ty); j++)
++			  memcpy (&p[j],
++				  allocate_to_s (context, &state),
++				  sizeof (*p));
++			break;
++		      }
++
++		    case FFI_TYPE_DOUBLE:
++		      {
++			/* Eeek! We need a pointer to the structure,
++			   however the homogeneous float elements are
++			   being passed in individual S registers,
++			   therefore the structure is not represented as
++			   a contiguous sequence of bytes in our saved
++			   register context. We need to fake up a copy
++			   of the structure layed out in memory
++			   correctly. The fake can be tossed once the
++			   closure function has returned hence alloca()
++			   is sufficient. */
++			int j;
++			UINT64 *p = avalue[i] = alloca (ty->size);
++			for (j = 0; j < element_count (ty); j++)
++			  memcpy (&p[j],
++				  allocate_to_d (context, &state),
++				  sizeof (*p));
++			break;
++		      }
++
++		    case FFI_TYPE_LONGDOUBLE:
++			  memcpy (&avalue[i],
++				  allocate_to_v (context, &state),
++				  sizeof (*avalue));
++		      break;
++
++		    default:
++		      FFI_ASSERT (0);
++		      break;
++		    }
++		}
++	    }
++	  else if (ty->size > 16)
++	    {
++	      /* Replace Composite type of size greater than 16 with a
++		 pointer.  */
++	      memcpy (&avalue[i],
++		      allocate_to_register_or_stack (context, stack,
++						     &state, FFI_TYPE_POINTER),
++		      sizeof (avalue[i]));
++	    }
++	  else if (available_x (&state) >= (ty->size + 7) / 8)
++	    {
++	      avalue[i] = get_x_addr (context, state.ngrn);
++	      state.ngrn += (ty->size + 7) / 8;
++	    }
++	  else
++	    {
++	      state.ngrn = N_X_ARG_REG;
++
++	      avalue[i] = allocate_to_stack (&state, stack, ty->alignment,
++					     ty->size);
++	    }
++	  break;
++
++	default:
++	  FFI_ASSERT (0);
++	  break;
++	}
++    }
++
++  /* Figure out where the return value will be passed, either in
++     registers or in a memory block allocated by the caller and passed
++     in x8.  */
++
++  if (is_register_candidate (cif->rtype))
++    {
++      /* Register candidates are *always* returned in registers. */
++
++      /* Allocate a scratchpad for the return value, we will let the
++         callee scrible the result into the scratch pad then move the
++         contents into the appropriate return value location for the
++         call convention.  */
++      rvalue = alloca (cif->rtype->size);
++      (closure->fun) (cif, rvalue, avalue, closure->user_data);
++
++      /* Copy the return value into the call context so that it is returned
++         as expected to our caller.  */
++      switch (cif->rtype->type)
++        {
++        case FFI_TYPE_VOID:
++          break;
++
++        case FFI_TYPE_UINT8:
++        case FFI_TYPE_UINT16:
++        case FFI_TYPE_UINT32:
++        case FFI_TYPE_POINTER:
++        case FFI_TYPE_UINT64:
++        case FFI_TYPE_SINT8:
++        case FFI_TYPE_SINT16:
++        case FFI_TYPE_INT:
++        case FFI_TYPE_SINT32:
++        case FFI_TYPE_SINT64:
++        case FFI_TYPE_FLOAT:
++        case FFI_TYPE_DOUBLE:
++        case FFI_TYPE_LONGDOUBLE:
++	  {
++	    void *addr = get_basic_type_addr (cif->rtype->type, context, 0);
++	    copy_basic_type (addr, rvalue, cif->rtype->type);
++            break;
++	  }
++        case FFI_TYPE_STRUCT:
++          if (is_hfa (cif->rtype))
++	    {
++	      int i;
++	      unsigned short type = get_homogeneous_type (cif->rtype);
++	      unsigned elems = element_count (cif->rtype);
++	      for (i = 0; i < elems; i++)
++		{
++		  void *reg = get_basic_type_addr (type, context, i);
++		  copy_basic_type (reg, rvalue, type);
++		  rvalue += get_basic_type_size (type);
++		}
++	    }
++          else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG)
++            {
++              unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64)) ;
++              memcpy (get_x_addr (context, 0), rvalue, size);
++            }
++          else
++            {
++              FFI_ASSERT (0);
++            }
++          break;
++        default:
++          FFI_ASSERT (0);
++          break;
++        }
++    }
++  else
++    {
++      memcpy (&rvalue, get_x_addr (context, 8), sizeof (UINT64));
++      (closure->fun) (cif, rvalue, avalue, closure->user_data);
++    }
++}
++
+diff --git a/src/aarch64/ffitarget.h b/src/aarch64/ffitarget.h
+new file mode 100644
+index 0000000..6f1a348
+--- /dev/null
++++ b/src/aarch64/ffitarget.h
+@@ -0,0 +1,59 @@
++/* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
++
++Permission is hereby granted, free of charge, to any person obtaining
++a copy of this software and associated documentation files (the
++``Software''), to deal in the Software without restriction, including
++without limitation the rights to use, copy, modify, merge, publish,
++distribute, sublicense, and/or sell copies of the Software, and to
++permit persons to whom the Software is furnished to do so, subject to
++the following conditions:
++
++The above copyright notice and this permission notice shall be
++included in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
++
++#ifndef LIBFFI_TARGET_H
++#define LIBFFI_TARGET_H
++
++#ifndef LIBFFI_H
++#error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
++#endif
++
++#ifndef LIBFFI_ASM
++typedef unsigned long ffi_arg;
++typedef signed long ffi_sarg;
++
++typedef enum ffi_abi
++  {
++    FFI_FIRST_ABI = 0,
++    FFI_SYSV,
++    FFI_LAST_ABI,
++    FFI_DEFAULT_ABI = FFI_SYSV
++  } ffi_abi;
++#endif
++
++/* ---- Definitions for closures ----------------------------------------- */
++
++#define FFI_CLOSURES 1
++#define FFI_TRAMPOLINE_SIZE 36
++#define FFI_NATIVE_RAW_API 0
++
++/* ---- Internal ---- */
++
++
++#define FFI_EXTRA_CIF_FIELDS unsigned aarch64_flags
++
++#define AARCH64_FFI_WITH_V_BIT 0
++
++#define AARCH64_N_XREG 32
++#define AARCH64_N_VREG 32
++#define AARCH64_CALL_CONTEXT_SIZE (AARCH64_N_XREG * 8 + AARCH64_N_VREG * 16)
++
++#endif
+diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
+new file mode 100644
+index 0000000..b8cd421
+--- /dev/null
++++ b/src/aarch64/sysv.S
+@@ -0,0 +1,307 @@
++/* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
++
++Permission is hereby granted, free of charge, to any person obtaining
++a copy of this software and associated documentation files (the
++``Software''), to deal in the Software without restriction, including
++without limitation the rights to use, copy, modify, merge, publish,
++distribute, sublicense, and/or sell copies of the Software, and to
++permit persons to whom the Software is furnished to do so, subject to
++the following conditions:
++
++The above copyright notice and this permission notice shall be
++included in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
++
++#define LIBFFI_ASM
++#include <fficonfig.h>
++#include <ffi.h>
++
++#define cfi_adjust_cfa_offset(off)	.cfi_adjust_cfa_offset off
++#define cfi_rel_offset(reg, off)	.cfi_rel_offset reg, off
++#define cfi_restore(reg)		.cfi_restore reg
++#define cfi_def_cfa_register(reg)	.cfi_def_cfa_register reg
++
++        .text
++        .globl ffi_call_SYSV
++        .type ffi_call_SYSV, #function
++
++/* ffi_call_SYSV()
++
++   Create a stack frame, setup an argument context, call the callee
++   and extract the result.
++
++   The maximum required argument stack size is provided,
++   ffi_call_SYSV() allocates that stack space then calls the
++   prepare_fn to populate register context and stack.  The
++   argument passing registers are loaded from the register
++   context and the callee called, on return the register passing
++   register are saved back to the context.  Our caller will
++   extract the return value from the final state of the saved
++   register context.
++
++   Prototype:
++
++   extern unsigned
++   ffi_call_SYSV (void (*)(struct call_context *context, unsigned char *,
++			   extended_cif *),
++                  struct call_context *context,
++                  extended_cif *,
++                  unsigned required_stack_size,
++                  void (*fn)(void));
++
++   Therefore on entry we have:
++
++   x0 prepare_fn
++   x1 &context
++   x2 &ecif
++   x3 bytes
++   x4 fn
++
++   This function uses the following stack frame layout:
++
++   ==
++                saved x30(lr)
++   x29(fp)->    saved x29(fp)
++                saved x24
++                saved x23
++                saved x22
++   sp'    ->    saved x21
++                ...
++   sp     ->    (constructed callee stack arguments)
++   ==
++
++   Voila! */
++
++#define ffi_call_SYSV_FS (8 * 4)
++
++        .cfi_startproc
++ffi_call_SYSV:
++        stp     x29, x30, [sp, #-16]!
++	cfi_adjust_cfa_offset (16)
++        cfi_rel_offset (x29, 0)
++        cfi_rel_offset (x30, 8)
++
++        mov     x29, sp
++	cfi_def_cfa_register (x29)
++        sub     sp, sp, #ffi_call_SYSV_FS
++
++        stp     x21, x22, [sp, 0]
++        cfi_rel_offset (x21, 0 - ffi_call_SYSV_FS)
++        cfi_rel_offset (x22, 8 - ffi_call_SYSV_FS)
++
++        stp     x23, x24, [sp, 16]
++        cfi_rel_offset (x23, 16 - ffi_call_SYSV_FS)
++        cfi_rel_offset (x24, 24 - ffi_call_SYSV_FS)
++
++        mov     x21, x1
++        mov     x22, x2
++        mov     x24, x4
++
++        /* Allocate the stack space for the actual arguments, many
++           arguments will be passed in registers, but we assume
++           worst case and allocate sufficient stack for ALL of
++           the arguments.  */
++        sub     sp, sp, x3
++
++        /* unsigned (*prepare_fn) (struct call_context *context,
++				   unsigned char *stack, extended_cif *ecif);
++	 */
++        mov     x23, x0
++        mov     x0, x1
++        mov     x1, sp
++        /* x2 already in place */
++        blr     x23
++
++        /* Preserve the flags returned.  */
++        mov     x23, x0
++
++        /* Figure out if we should touch the vector registers.  */
++        tbz     x23, #AARCH64_FFI_WITH_V_BIT, 1f
++
++        /* Load the vector argument passing registers.  */
++        ldp     q0, q1, [x21, #8*32 +  0]
++        ldp     q2, q3, [x21, #8*32 + 32]
++        ldp     q4, q5, [x21, #8*32 + 64]
++        ldp     q6, q7, [x21, #8*32 + 96]
++1:
++        /* Load the core argument passing registers.  */
++        ldp     x0, x1, [x21,  #0]
++        ldp     x2, x3, [x21, #16]
++        ldp     x4, x5, [x21, #32]
++        ldp     x6, x7, [x21, #48]
++
++        /* Don't forget x8 which may be holding the address of a return buffer.
++	 */
++        ldr     x8,     [x21, #8*8]
++
++        blr     x24
++
++        /* Save the core argument passing registers.  */
++        stp     x0, x1, [x21,  #0]
++        stp     x2, x3, [x21, #16]
++        stp     x4, x5, [x21, #32]
++        stp     x6, x7, [x21, #48]
++
++        /* Note nothing useful ever comes back in x8!  */
++
++        /* Figure out if we should touch the vector registers.  */
++        tbz     x23, #AARCH64_FFI_WITH_V_BIT, 1f
++
++        /* Save the vector argument passing registers.  */
++        stp     q0, q1, [x21, #8*32 + 0]
++        stp     q2, q3, [x21, #8*32 + 32]
++        stp     q4, q5, [x21, #8*32 + 64]
++        stp     q6, q7, [x21, #8*32 + 96]
++1:
++        /* All done, unwind our stack frame.  */
++        ldp     x21, x22, [x29,  # - ffi_call_SYSV_FS]
++        cfi_restore (x21)
++        cfi_restore (x22)
++
++        ldp     x23, x24, [x29,  # - ffi_call_SYSV_FS + 16]
++        cfi_restore (x23)
++        cfi_restore (x24)
++
++        mov     sp, x29
++	cfi_def_cfa_register (sp)
++
++        ldp     x29, x30, [sp], #16
++	cfi_adjust_cfa_offset (-16)
++        cfi_restore (x29)
++        cfi_restore (x30)
++
++        ret
++
++        .cfi_endproc
++        .size ffi_call_SYSV, .-ffi_call_SYSV
++
++#define ffi_closure_SYSV_FS (8 * 2 + AARCH64_CALL_CONTEXT_SIZE)
++
++/* ffi_closure_SYSV
++
++   Closure invocation glue. This is the low level code invoked directly by
++   the closure trampoline to setup and call a closure.
++
++   On entry x17 points to a struct trampoline_data, x16 has been clobbered
++   all other registers are preserved.
++
++   We allocate a call context and save the argument passing registers,
++   then invoked the generic C ffi_closure_SYSV_inner() function to do all
++   the real work, on return we load the result passing registers back from
++   the call context.
++
++   On entry
++
++   extern void
++   ffi_closure_SYSV (struct trampoline_data *);
++
++   struct trampoline_data
++   {
++        UINT64 *ffi_closure;
++        UINT64 flags;
++   };
++
++   This function uses the following stack frame layout:
++
++   ==
++                saved x30(lr)
++   x29(fp)->    saved x29(fp)
++                saved x22
++                saved x21
++                ...
++   sp     ->    call_context
++   ==
++
++   Voila!  */
++
++        .text
++        .globl ffi_closure_SYSV
++        .cfi_startproc
++ffi_closure_SYSV:
++        stp     x29, x30, [sp, #-16]!
++	cfi_adjust_cfa_offset (16)
++        cfi_rel_offset (x29, 0)
++        cfi_rel_offset (x30, 8)
++
++        mov     x29, sp
++
++        sub     sp, sp, #ffi_closure_SYSV_FS
++	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
++
++        stp     x21, x22, [x29, #-16]
++        cfi_rel_offset (x21, 0)
++        cfi_rel_offset (x22, 8)
++
++        /* Load x21 with &call_context.  */
++        mov     x21, sp
++        /* Preserve our struct trampoline_data *  */
++        mov     x22, x17
++
++        /* Save the rest of the argument passing registers.  */
++        stp     x0, x1, [x21, #0]
++        stp     x2, x3, [x21, #16]
++        stp     x4, x5, [x21, #32]
++        stp     x6, x7, [x21, #48]
++        /* Don't forget we may have been given a result scratch pad address.
++	 */
++        str     x8,     [x21, #64]
++
++        /* Figure out if we should touch the vector registers.  */
++        ldr     x0, [x22, #8]
++        tbz     x0, #AARCH64_FFI_WITH_V_BIT, 1f
++
++        /* Save the argument passing vector registers.  */
++        stp     q0, q1, [x21, #8*32 + 0]
++        stp     q2, q3, [x21, #8*32 + 32]
++        stp     q4, q5, [x21, #8*32 + 64]
++        stp     q6, q7, [x21, #8*32 + 96]
++1:
++        /* Load &ffi_closure..  */
++        ldr     x0, [x22, #0]
++        mov     x1, x21
++        /* Compute the location of the stack at the point that the
++           trampoline was called.  */
++        add     x2, x29, #16
++
++        bl      ffi_closure_SYSV_inner
++
++        /* Figure out if we should touch the vector registers.  */
++        ldr     x0, [x22, #8]
++        tbz     x0, #AARCH64_FFI_WITH_V_BIT, 1f
++
++        /* Load the result passing vector registers.  */
++        ldp     q0, q1, [x21, #8*32 + 0]
++        ldp     q2, q3, [x21, #8*32 + 32]
++        ldp     q4, q5, [x21, #8*32 + 64]
++        ldp     q6, q7, [x21, #8*32 + 96]
++1:
++        /* Load the result passing core registers.  */
++        ldp     x0, x1, [x21,  #0]
++        ldp     x2, x3, [x21, #16]
++        ldp     x4, x5, [x21, #32]
++        ldp     x6, x7, [x21, #48]
++        /* Note nothing usefull is returned in x8.  */
++
++        /* We are done, unwind our frame.  */
++        ldp     x21, x22, [x29,  #-16]
++        cfi_restore (x21)
++        cfi_restore (x22)
++
++        mov     sp, x29
++	cfi_adjust_cfa_offset (-ffi_closure_SYSV_FS)
++
++        ldp     x29, x30, [sp], #16
++	cfi_adjust_cfa_offset (-16)
++        cfi_restore (x29)
++        cfi_restore (x30)
++
++        ret
++        .cfi_endproc
++        .size ffi_closure_SYSV, .-ffi_closure_SYSV
+diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
+index 4a65ed1..8ee3f15 100644
+--- a/testsuite/lib/libffi.exp
++++ b/testsuite/lib/libffi.exp
+@@ -203,6 +203,10 @@ proc libffi_target_compile { source dest type options } {
+ 
+     lappend options "libs= -lffi"
+ 
++    if { [string match "aarch64*-*-linux*" $target_triplet] } {
++	lappend options "libs= -lpthread"
++    }
++
+     verbose "options: $options"
+     return [target_compile $source $dest $type $options]
+ }
+-- 
+1.7.9.5
+

From 8fe6efa874c535d5e8cfa05f5837bff2018b07fc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 12:36:02 +0000
Subject: [PATCH 3330/6849] Deprecate the support for the toolchain on target

As discussed during the ELCE 2012 Buildroot Developers Meeting, we no
longer want to support the possibility of building a toolchain for the
target. None of the core developers have any use for this, it has been
known to be broken or cause problems for a long time without anyone
providing fixes for it.

In addition to this, Buildroot is inherently a cross-compilation tool,
so the usage of a native toolchain on the target is not really
useful. Many newcomers are tempted to use this possibility even though
it is clearly not the intended usage of Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                 | 4 ++++
 toolchain/gcc/Config.in.2 | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Config.in b/Config.in
index 68190a530c..eaafece61f 100644
--- a/Config.in
+++ b/Config.in
@@ -393,6 +393,8 @@ config BR2_PREFER_STATIC_LIB
 
 config BR2_HAVE_DOCUMENTATION
 	bool "documentation on the target"
+	# We no longer want to support a toolchain on the target
+	depends on BR2_DEPRECATED
 	help
 	  Install the documentation, including manual pages and info
 	  pages, on the target.
@@ -401,6 +403,8 @@ config BR2_HAVE_DOCUMENTATION
 
 config BR2_HAVE_DEVFILES
 	bool "development files in target filesystem"
+	# We no longer want to support a toolchain on the target
+	depends on BR2_DEPRECATED
 	help
 	  Install headers and static libraries in the
 	  target filesystem
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index d060a80e08..c8a8cf63a7 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_GCC_TARGET
 	bool "gcc"
+	# We no longer want to support a toolchain on the target
+	depends on BR2_DEPRECATED
 	depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
 	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_BINUTILS_TARGET
@@ -30,6 +32,3 @@ config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
 	  Any additional target gcc options you may want to include....
 	  Including, but not limited to --disable-checking etc.
 	  Refer to */configure in your gcc sources.
-
-comment "gcc needs development files in target filesystem"
-	depends on !BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT

From d4e8f3cd4874c963da77480bcb76df05ffaaa739 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Nov 2012 12:36:03 +0000
Subject: [PATCH 3331/6849] Mark a number of development related packages as
 deprecated

automake, autoconf, libtool and make on the target are basically
useless if we don't support building a toolchain on the target. Of
course, the host variant of automake, autoconf and libtool will remain
available.

[Peter: fixup to apply after perl change]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/Config.in | 2 ++
 package/automake/Config.in | 2 ++
 package/libtool/Config.in  | 2 ++
 package/make/Config.in     | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
index 5f2f148928..60128e9cb7 100644
--- a/package/autoconf/Config.in
+++ b/package/autoconf/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf"
+	# We no longer support a toolchain on the target
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_PERL
 	help
 	  Extensible program for developing configure scripts.  These
diff --git a/package/automake/Config.in b/package/automake/Config.in
index 9a9673a6e8..e2f6cc7f61 100644
--- a/package/automake/Config.in
+++ b/package/automake/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake"
+	# We no longer support a toolchain on the target
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_AUTOCONF
 	select BR2_PACKAGE_PERL
 	help
diff --git a/package/libtool/Config.in b/package/libtool/Config.in
index d3cf2d7843..42df25b0a6 100644
--- a/package/libtool/Config.in
+++ b/package/libtool/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBTOOL
 	bool "libtool"
+	# We no longer support a toolchain on the target
+	depends on BR2_DEPRECATED
 	help
 	  Library that hides the complexity of using shared/static libraries
 	  on different platforms behind a consistent, portable interface.
diff --git a/package/make/Config.in b/package/make/Config.in
index ea2ae1b58b..e5cc970097 100644
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_MAKE
 	bool "make"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	# We no longer support a toolchain on the target
+	depends on BR2_DEPRECATED
 	help
 	  A tool which controls the generation of executables and other
 	  non-source files of a program from the program's source files.

From 7bf219a900d3070e8e954617131f54210825419f Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 16 Nov 2012 22:12:50 +0000
Subject: [PATCH 3332/6849] python: uses fork(), only available on MMU
 platforms

Fixes
http://autobuild.buildroot.org/results/1738a8b09b04d2b2fc1de6d1ff5eb0363fed6348/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/python/Config.in b/package/python/Config.in
index 11aa2670d5..4089ccefe6 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_PYTHON
 	bool "python"
 	depends on BR2_USE_WCHAR
+	# uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBFFI
 	help
 	  The python language interpreter.

From f72b561789032b69e7fa62479abd34259731605c Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 17 Oct 2012 22:02:06 +0000
Subject: [PATCH 3333/6849] mxs-bootloader: Barebox entry point symbol changed
 in 2012.08

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/mxs-bootlets/barebox_ivt.bd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/mxs-bootlets/barebox_ivt.bd b/boot/mxs-bootlets/barebox_ivt.bd
index e02ddd68f6..0c67e9cfce 100644
--- a/boot/mxs-bootlets/barebox_ivt.bd
+++ b/boot/mxs-bootlets/barebox_ivt.bd
@@ -28,7 +28,7 @@ section (0) {
 	//----------------------------------------------------------
 
         load barebox;
-        load ivt (entry = barebox:exception_vectors) > 0x8000;
+        load ivt (entry = barebox:start) > 0x8000;
 	hab call 0x8000;
 
 }

From ee3a96137b6cbb8f970c540c61f75300a44ea803 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 16 Nov 2012 02:42:56 +0000
Subject: [PATCH 3334/6849] lua-msgpack-native: fix fetch

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua-msgpack-native/lua-msgpack-native.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 5d8cd2d8b2..97ce83ce57 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -3,9 +3,8 @@
 # lua-msgpack-native
 #
 #############################################################
-LUA_MSGPACK_NATIVE_VERSION = 41cce91ab6
-LUA_MSGPACK_NATIVE_SITE = git://github.com/kengonakajima/lua-msgpack-native.git
-LUA_MSGPACK_NATIVE_METHOD = git
+LUA_MSGPACK_NATIVE_VERSION = g41cce91
+LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/master
 LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
 LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0
 LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt

From 9226a9907c4eb0fffab777f50e88b74aa14d1737 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 03:52:14 +0000
Subject: [PATCH 3335/6849] Warn the user about the usage of output/target as
 the root filesystem

A very common mistake done by our users is that they use
output/target/ directory as their root filesystem. Even though this is
loudly documented in our Buildroot manual, people don't read
documentation, so it is not sufficient.

This patch adds a text file named
output/target/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM which explains why
output/target isn't appropriate to use as the root filesystem. The
process is:

 * At the beginning of the build, right after the skeleton has been
   copied, support/misc/target-dir-warning.txt is copied to
   output/target/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM

 * In the filesystem images creation code, this file is removed before
   launching fakeroot, and restored right after that, so that this
   file is not present in the generated root filesystem images.

Note that the file has not been added to the default skeleton for two
reasons:

 * It would have annoying to have in our source tree a file named in
   capital letters inside system/skeleton/

 * The proposed way works even if the user uses a custom skeleton.

[Peter: fixed typo]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Juha Lumme <juha.lumme@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                            |  5 +++++
 fs/common.mk                        |  2 ++
 support/misc/target-dir-warning.txt | 29 +++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 support/misc/target-dir-warning.txt

diff --git a/Makefile b/Makefile
index c526fe1c10..3e7d520af5 100644
--- a/Makefile
+++ b/Makefile
@@ -269,6 +269,10 @@ LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt
 LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
 LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
 
+# Location of a file giving a big fat warning that output/target
+# should not be used as the root filesystem.
+TARGET_DIR_WARNING_FILE=$(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
+
 ifeq ($(BR2_CCACHE),y)
 CCACHE:=$(HOST_DIR)/usr/bin/ccache
 BUILDROOT_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
@@ -403,6 +407,7 @@ $(BUILD_DIR)/.root:
 			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
 		fi; \
 	fi
+	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
 	-find $(TARGET_DIR) -type f \( -name .empty -o -name '*~' \) -print0 | xargs -0 rm -rf
 	touch $@
diff --git a/fs/common.mk b/fs/common.mk
index 0f0eae996c..b1512dd957 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -45,6 +45,7 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
 	rm -f $(FAKEROOT_SCRIPT)
+	rm -f $(TARGET_DIR_WARNING_FILE)
 	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
 	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
@@ -57,6 +58,7 @@ endif
 	echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)
 	chmod a+x $(FAKEROOT_SCRIPT)
 	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
+	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	-@rm -f $(FAKEROOT_SCRIPT) $(FULL_DEVICE_TABLE)
 	$(foreach hook,$(ROOTFS_$(2)_POST_GEN_HOOKS),$(call $(hook))$(sep))
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
diff --git a/support/misc/target-dir-warning.txt b/support/misc/target-dir-warning.txt
new file mode 100644
index 0000000000..90f88414b7
--- /dev/null
+++ b/support/misc/target-dir-warning.txt
@@ -0,0 +1,29 @@
+Warning!
+========
+
+This directory does *not* contain the root filesystem that you can use
+on your embedded system. Since Buildroot does not run as root, it
+cannot create device files and set the permissions and ownership of
+files correctly in this directory to make it usable as a root
+filesystem.
+
+For that reason, do *not* use the contents of this directory to mount
+your root filesystem over NFS or copy the contents of this directory
+to a SD card or USB key, thinking it will work as the root filesystem
+for your embedded system. It will simply *not* work.
+
+Instead, if you need a usable root filesystem, please select one of
+the filesystem image formats available in the Buildroot configuration
+interface (make menuconfig or others) in the "Filesystem images"
+sub-menu. If you want to get a filesystem image that you can easily
+extract to your SD card or to some directory exposed through NFS,
+please use the "tar the root filesystem" option. It will generate a
+images/rootfs.tar image in your Buildroot output directory, which you
+can extract as root:
+
+  sudo tar -C /destination/of/extraction -xf images/rootfs.tar
+
+Those image files are created using the contents of the target/
+directory, but there is a post-processing step to create device files
+and set owernship/permissions properly even if Buildroot does not run
+as root.

From 4f2e4f24d8a29c40519daa07f39e702a1d70fd4f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 17 Nov 2012 02:28:00 +0000
Subject: [PATCH 3336/6849] alsa-lib: bump to version 1.0.26

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsa-lib/alsa-lib.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 8ed133947b..daa551d399 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-ALSA_LIB_VERSION = 1.0.25
+ALSA_LIB_VERSION = 1.0.26
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
-ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
+ALSA_LIB_SITE = http://alsa.cybermirror.org/lib
 ALSA_LIB_LICENSE = LGPLv2.1+
 ALSA_LIB_LICENSE_FILES = COPYING
 ALSA_LIB_INSTALL_STAGING = YES

From 27abfbb4513bae931151778b5aa0783ca94ba0cc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 17 Nov 2012 02:28:01 +0000
Subject: [PATCH 3337/6849] alsa-utils: bump to version 1.0.26

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/alsa-utils/alsa-utils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 7043837e44..622857401d 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-ALSA_UTILS_VERSION = 1.0.25
+ALSA_UTILS_VERSION = 1.0.26
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
-ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
+ALSA_UTILS_SITE = http://alsa.cybermirror.org/utils
 ALSA_UTILS_LICENSE = GPLv2
 ALSA_UTILS_LICENSE_FILES = COPYING
 ALSA_UTILS_INSTALL_STAGING = YES

From dbf4978e6b1b24973cb7fbf9be636dda3ae67862 Mon Sep 17 00:00:00 2001
From: Philippe Reynes <philippe.reynes@sagemcom.com>
Date: Sat, 17 Nov 2012 13:01:22 +0100
Subject: [PATCH 3338/6849] Allow to run severals post build scripts instead of
 only one

Using severals post build scripts is usefull to share
script between severals boards/projects.

[Peter: fix trailing spaces in Config.in]
Signed-off-by: Philippe Reynes <philippe.reynes@sagemcom.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile         |  5 +++--
 system/Config.in | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3e7d520af5..7602499555 100644
--- a/Makefile
+++ b/Makefile
@@ -470,8 +470,9 @@ endif
 	) >  $(TARGET_DIR)/etc/os-release
 
 ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
-	@$(call MESSAGE,"Executing post-build script")
-	$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
+	@$(call MESSAGE,"Executing post-build script\(s\)")
+	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
+		$(s) $(TARGET_DIR)$(sep))
 endif
 
 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
diff --git a/system/Config.in b/system/Config.in
index 10c9d9db31..58232108e4 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -170,15 +170,16 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
 	string "Custom script to run before creating filesystem images"
 	default ""
 	help
-	  Specify a script to be run after the build has finished and before
-	  Buildroot starts packing the files into selected filesystem images.
+	  Specify a space-separated list of scripts to be run after the build
+	  has finished and before Buildroot starts packing the files into
+	  selected filesystem images.
 
 	  This gives users the oportunity to do board-specific cleanups,
 	  add-ons and the like, so the generated files can be used directly
 	  without further processing.
 
-	  The script is called with the target directory name as first and
-	  only argument. Make sure the exit code of that script is 0,
-	  otherwise make will stop after calling it.
+	  These scripts are called with the target directory name as first and
+	  only argument. Make sure the exit code of those scripts are 0,
+	  otherwise make will stop after calling them.
 
 endmenu

From 7451db3d3aed29c65b7c9acfc880536b381ce1dd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 17 Nov 2012 06:42:08 +0000
Subject: [PATCH 3339/6849] collectd: bump to version 5.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 6164df233b..f6aeb0dcd4 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-COLLECTD_VERSION = 5.1.0
+COLLECTD_VERSION = 5.1.1
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
+COLLECTD_LICENSE = GPLv2 LGPLv2.1
+COLLECTD_LICENSE_FILES = COPYING
 
 # These require unmet dependencies, are fringe, pointless or deprecated
 COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \

From b5a34e750f25cd97b1717c7cf56d0e90d6b0f895 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 17 Nov 2012 06:42:27 +0000
Subject: [PATCH 3340/6849] polarssl: bump to version 1.2.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../polarssl-shared-and-static-library.patch  | 19 +++++++++++--------
 package/polarssl/polarssl.mk                  |  6 ++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 562b9005af..e11cab3f59 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,21 +9,22 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
+[Gustavo: update for polarssl 1.2.0]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-Index: polarssl-1.1.1/library/CMakeLists.txt
-===================================================================
---- polarssl-1.1.1.orig/library/CMakeLists.txt
-+++ polarssl-1.1.1/library/CMakeLists.txt
+diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt
+--- polarssl-1.2.0.orig/library/CMakeLists.txt	2012-11-15 15:01:58.239248830 -0300
++++ polarssl-1.2.0/library/CMakeLists.txt	2012-11-15 15:00:10.310806353 -0300
 @@ -1,4 +1,5 @@
  option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
 +option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
  
  set(src
       aes.c
-@@ -40,17 +41,21 @@
-      xtea.c
- )
+@@ -50,19 +51,23 @@
+ set(libs ws2_32)
+ endif(WIN32)
  
 -if(NOT USE_SHARED_POLARSSL_LIBRARY)
 -
@@ -33,7 +34,7 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
@@ -46,6 +47,8 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
 -endif(NOT USE_SHARED_POLARSSL_LIBRARY)
 +endif(USE_STATIC_POLARSSL_LIBRARY)
  
+ target_link_libraries(polarssl ${libs})
+ 
 -install(TARGETS polarssl
 +install(TARGETS polarssl polarssl-static
          DESTINATION ${LIB_INSTALL_DIR}
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 34fbe293b8..edda9bfa38 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
-POLARSSL_SITE = http://polarssl.org/code/releases/
-POLARSSL_VERSION = 1.1.4
+POLARSSL_SITE = https://polarssl.org/download
+POLARSSL_VERSION = 1.2.0
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \
@@ -8,6 +8,8 @@ POLARSSL_CONF_OPT = \
 	-DBUILD_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
 
 POLARSSL_INSTALL_STAGING = YES
+POLARSSL_LICENSE = GPLv2
+POLARSSL_LICENSE_FILES = LICENSE
 
 $(eval $(cmake-package))
 

From 56cbd27a4c14709163ec5437c41a8a046631b8c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 17 Nov 2012 06:42:28 +0000
Subject: [PATCH 3341/6849] hiawatha: bump to version 8.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 79546e3978..bd9da43d6c 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,5 +1,5 @@
-HIAWATHA_VERSION = 8.5
-HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
+HIAWATHA_VERSION = 8.6
+HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
 HIAWATHA_LICENSE_FILES = LICENSE
 

From 684f208ecf1da23ce7013a91a69adb2ff7161715 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Nov 2012 22:19:26 +0100
Subject: [PATCH 3342/6849] lua: don't be fancy when creating shared library

(Possibly) fixes #5354

The lua shared library patch was creating the shared library with
-nostdlib -lgcc for some unknown reason, which most likely is
the reason for the link issue reported in #5354.

Fix it by dropping these arguments, so gcc gets to figure out itself
what dependencies are needed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/lua-02-shared-libs-for-lua.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lua/lua-02-shared-libs-for-lua.patch b/package/lua/lua-02-shared-libs-for-lua.patch
index 454e660024..97a70684f8 100644
--- a/package/lua/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/lua-02-shared-libs-for-lua.patch
@@ -39,7 +39,7 @@ Index: b/src/Makefile
 -$(LUA_T): $(LUA_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 +$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
++	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
 +	ln -fs $@.$(PKG_VERSION) $@
 +
 +$(LUA_T): $(LUA_O) $(LUA_SO)

From e4f33d4a8c08eca2668320a97dbdd157bbb5ecd4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Nov 2012 22:39:33 +0100
Subject: [PATCH 3343/6849] news.html: announce dev days report / next dev days

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index 2f545679c9..416857c7f0 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,21 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>17 November 2012 -- Buildroot Developer Day</b>
+
+    <p>A report from the recent <i>Buildroot Developer Days</i> meeting
+    in Barcelona, Spain is now <a
+    href="http://lists.busybox.net/pipermail/buildroot/2012-November/061558.html">available</a>.
+    Many thanks to all the participants, and a special thanks to Arnout
+    Vandecappelle from <a href="http://mind.be/">mind</a> for taking
+    notes and Thomas Petazzoni from <a
+    href="http://free-electrons.com/">Free Electrons</a> for handling
+    all the practical arrangements, and naturally our sponsors, <a
+    href="http://www.fluendo.com/">Fluendo</a> and <a href="http://www.synopsys.com/">Synopsis</a>.
+    </p>
+    <p>The next Developer Days will take place on February 4th and 5th
+    in Brussels, Belgium, right after <a href="http://fosdem.org">FOSDEM</a>.</p>
+
    <li><b>31 August 2012 -- 2012.08 released</b>
 
     <p>The stable 2012.08 release is out - Thanks to everyone

From 48f0fe07e3dd33137205bcc5bab360a3ff46a763 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Nov 2012 23:08:59 +0100
Subject: [PATCH 3344/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 78 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/CHANGES b/CHANGES
index f5d4cdff2a..d1a4888e9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,42 +7,57 @@
 	+ nitrogen6x defconfigs.
 
 	Bootloaders: add u-boot 2012.07/10, ais target format, add
-	barebox 2012.08/09/10, linker overlap issue fix for
-	at91bootstrap.
+	barebox 2012.08/09/10/11, linker overlap issue fix for
+	at91bootstrap, mxs-bootlets updated for new Barebox versions.
 
-	Toolchains: binutils 2.23, gcc 4.72, default to gcc 4.6.x,
+	Toolchains: binutils 2.23.1, gcc 4.72, default to gcc 4.6.x,
 	Codebench arm/sh/x86 2012.03/09, Linaro 2012.08/09/10.
-	Libtirpc support for modern glibc variants.
+	Libtirpc support for modern glibc variants. Toolchain on
+	target has been deprecated.
 
-	Initial Aarch64 support.
+	Initial Aarch64 support, Xtensa support re-added.
 
 	Infrastructure: Use shallow git clone when possible, use
 	tarballs rather than git URLs for github. Moved to pkgconf
 	rather than pkg-config. System directory added, default
-	skeleton/device tables moved.
-
-	Updated/fixed packages: acpid, alsa-lib, alsamixergui,
-	automake, bind, binutils, bison, blackbox, busybox, cairo,
-	cifs-utils, cjson, cmake, collectd, connman, conntrack-tools,
-	coreutils, cups, cvs, dbus, dhcp, directfb, dnsmasq,
-	e2fsprogs, ethtool, fbdump, feh, fftw, flashrom, fluxbox, gdb,
-	gdisk, gdk-pixbuf, genext2fs, gettext, gnutls, gpsd, gqview,
-	grep, gst-plugins-{bad,good}, hdparm, hiawatha, hostapd,
-	input-tools, iproute2, ipset, iptables, iw, json-c, kmod,
-	lcdproc, leafpad, less, libcurl, libdrm, libdvdnav,
-	libdvdread, libfuse, libglib2, libhid, libmad, libmbus,
-	libmnl, libnetfilter_{acct,conntrack,cthelper,cttimeout,queue},
-	libnfnetlink, libnl, libnspr, libnss, libpcap, libplayer,
-	libtorrent, liburcu, libv4l, libxcb, libxml2, libxslt, links,
-	linux-firmware, lm-sensors, lmbench, lshw, lttng-babeltrace,
-	lttng-tools, luajit, mesa3d, microperl, mpc, mpd, mpg123,
-	mplayer, mtd-utils, mysql_client, nbd, netatalk, netkitbase,
-	netkittelnet, netsnmp, newt, nfs-utils, openssh, openssl,
-	opkg, patch, pcre, php, poco, portmap, pppd, pulseaudio,
+	skeleton/device tables moved. More than 1 post-build script
+	can now be used. output/target now contains a
+	THIS_IS_NOT_YOUR_ROOT_FILESYSTEM warning, to help people
+	understand how to (not) use it.
+
+	Manual has been reworked and extended.
+
+	Legal-info: Lots of package annotations, CSV file fixes,
+	_LICENSE / _REDISTRIBUTE splitup, per-package hooks.
+
+	Updated/fixed packages: acpid, alsa-lib, alsa-utils,
+	alsamixergui, autoconf, automake, bash, bind, binutils, bison,
+	blackbox, bluez-utils, busybox, cairo, can-utils, cifs-utils,
+	cjson, cmake, collectd, connman, conntrack-tools, coreutils,
+	cups, cvs, dbus, dhcp, directfb, dmalloc, dnsmasq, dropbear,
+	e2fsprogs, ethtool, fbdump, feh, fftw, file, flashrom,
+	fluxbox, gdb, gdisk, gdk-pixbuf, genext2fs, gettext, gnutls,
+	gpsd, gqview, grep, gst-plugins-{bad,good}, hdparm, hiawatha,
+	hostapd, input-tools, iproute2, ipset, iptables, iw, json-c,
+	kexec, kmod, lcdproc, leafpad, less, libcurl, libdrm,
+	libdvdnav, libdvdread, libffi, libfuse, libglib2, libhid,
+	liblockfile, libmad, libmbus, libmnl,
+	libnetfilter_{acct,conntrack,cthelper,cttimeout,queue},
+	libnfc, libnfc-llcp, libnfnetlink, libnl, libnspr, libnss,
+	libpcap, libplayer, libtool, libtorrent, liburcu, libv4l,
+	libxcb, libxml2, libxslt, links, linux-firmware, lm-sensors,
+	lmbench, lockfile-progs, logrotate, lshw, lsof,
+	lttng-babeltrace, lttng-tools, lua, luajit, mesa3d, microperl,
+	mii-diag, module-init-tools, mpc, mpd, mpg123, mplayer,
+	mtd-utils, mysql_client, nbd, ncurses, netatalk, netkitbase,
+	netkittelnet, netsnmp, newt, nfs-utils, openntpd, openssh,
+	openssl, opkg, patch, pciutils, pcre, php, poco, polarssl,
+	popt, portmap, pppd, procps, pulseaudio, python, python-nfc,
 	python-protobuf, qt, quota, rp-pppoe, rtorrent, sam-ba, samba,
 	scons, sdl_gfx, smartmontools, sqlite, squid, strace, sudo,
-	sylpheed, ttcp, tiff, unionfs, usb_modeswitch, vala, vpnc,
-	vsftpd, webkit, wget, wpa_supplicant, x11vnc, xapp_*,
+	sylpheed, tcpdump, tremor, ttcp, tiff, unionfs,
+	usb_modeswitch, usbutils, util-linux, vala, valgrind, vpnc,
+	vsftpd, webkit, wget, which, wpa_supplicant, x11vnc, xapp_*,
 	xdriver_*, xenomai, xfont_*, xinetd, xl2tp, xlib_*, xlsclient,
 	xproto_*, xserver_xorg-server, xutil_util-macros, xz, zeromq
 
@@ -50,10 +65,11 @@
 	ccid, cpanminus, cpuload, erlang, evtest, fb-test-apps,
 	fxload, gdbm, gnupg, googlefontdirectory, grantlee, gsl,
 	lcdapi, liblo, liblog4c-localtime, libtirpc, linux-pam,
-	macchanger, mtdev, mtdev2tuio, nfacct, opus, opus-tools,
-	pcsc-lite, perl, pkgconf, python-meld3, python3, qemu,
-	qextserialport, qtuio, rpcbind, schifra, sconeserver,
-	supervisor, time, ulogd, usb_modeswitch_data, yasm
+	lua-msgpack-native, macchanger, mtdev, mtdev2tuio, nfacct,
+	opus, opus-tools, pcsc-lite, perl, pkgconf, python-meld3,
+	python3, qemu, qextserialport, qtuio, rpcbind, schifra,
+	sconeserver, supervisor, time, ulogd, usb_modeswitch_data,
+	yasm
 
 	Deprecated packages: netkitbase, netkittelnet
 

From cd4d6ff77cdabe60f3dd185d4101cb70eafb25a7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:23:59 +0000
Subject: [PATCH 3345/6849] python: use default configure commands to get
 shared build

Commit 3c90f754961c6d99059c0b6d0a66bc797a3c017b made Python use a
special ./configure command in order to avoid --enable-shared
--disable-static being passed, because it was causing issues when
building certain modules for a 64 bits system.

However, not having a shared libpython2.7 library for the host
prevents the libxml2 Python binding to get built.

So instead, we use the default configure command, but we add
--enable-static which is needed for Python to build correctly.

Note that we tested the build of Python on a 64 bits host as well as
the build of Python for a 64 bits target, and both went fine, with all
modules built properly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/package/python/python.mk b/package/python/python.mk
index 87237bba0e..e0ec9bb6f0 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -17,6 +17,7 @@ PYTHON_LICENSE_FILES = LICENSE
 # third-party Python modules.
 
 HOST_PYTHON_CONF_OPT += 	\
+	--enable-static		\
 	--without-cxx-main 	\
 	--disable-sqlite3	\
 	--disable-tk		\
@@ -38,19 +39,6 @@ HOST_PYTHON_MAKE_ENV = \
 
 HOST_PYTHON_AUTORECONF = YES
 
-define HOST_PYTHON_CONFIGURE_CMDS
-	(cd $(@D) && rm -rf config.cache; \
-	        $(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-                $(HOST_PYTHON_CONF_ENV) \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
-		$(HOST_PYTHON_CONF_OPT) \
-	)
-endef
-
 PYTHON_DEPENDENCIES  = host-python libffi
 
 HOST_PYTHON_DEPENDENCIES = host-expat host-zlib

From e445f54bc74ea762a2444cf92be0864e639027a3 Mon Sep 17 00:00:00 2001
From: Vellemans Noel <noel.vellemans@visionbms.com>
Date: Sat, 17 Nov 2012 12:24:00 +0000
Subject: [PATCH 3346/6849] libxml2: add support for building host library with
 python support

Patch based on the initial work of Will Wagner (Thanks Will).
libxml2 host library with python support is required to build mesa3d (7.10.1)

Signed-off-by: Vellemans Noel <noel.vellemans@visionbms.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/Config.in  |  3 +++
 package/libxml2/libxml2.mk | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/libxml2/Config.in b/package/libxml2/Config.in
index ebd63fe54c..ea62663dd2 100644
--- a/package/libxml2/Config.in
+++ b/package/libxml2/Config.in
@@ -4,3 +4,6 @@ config BR2_PACKAGE_LIBXML2
 	  XML C Parser
 
 	  http://xmlsoft.org/
+
+config BR2_PACKAGE_HOST_LIBXML2_PYTHON
+    bool
\ No newline at end of file
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 71f2bd15be..fde3735b8d 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -26,7 +26,15 @@ LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
 
 HOST_LIBXML2_DEPENDENCIES = host-pkgconf
 
-HOST_LIBXML2_CONF_OPT = --without-debug --without-python
+HOST_LIBXML2_CONF_OPT = --without-debug
+
+ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)
+HOST_LIBXML2_DEPENDENCIES += host-python
+HOST_LIBXML2_CONF_OPT += --with-python=$(HOST_DIR)/usr
+else
+HOST_LIBXML2_CONF_OPT += --without-python
+endif
+
 
 define LIBXML2_REMOVE_CONFIG_SCRIPTS
 	$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config

From 517e5395a187d9c6b7dc322ee15f7b75f5ffe7fc Mon Sep 17 00:00:00 2001
From: Vellemans Noel <noel.vellemans@visionbms.com>
Date: Sat, 17 Nov 2012 12:24:01 +0000
Subject: [PATCH 3347/6849] mesa3d: requires host-libxml2 and host-python to
 generate some files

mesa3d now generates some C files at build time (related to the OpenGL
API) from XML files. This generation process is done using Python
scripts that require the libxml2 Python module.

Patch based on the initial work of Will Wagner (Thanks Will).

Signed-off-by: Vellemans Noel <noel.vellemans@visionbms.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mesa3d/Config.in | 1 +
 package/x11r7/mesa3d/mesa3d.mk | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index 47ded29002..e5b426eaff 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_HOST_LIBXML2_PYTHON
 	depends on BR2_PACKAGE_XSERVER_xorg
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 8d311e1e93..b16d5e6c16 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -28,6 +28,8 @@ MESA3D_DEPENDENCIES = \
 	xproto_dri2proto \
 	libdrm \
 	expat \
-	host-xutil_makedepend
+	host-xutil_makedepend \
+	host-libxml2 \
+	host-python
 
 $(eval $(autotools-package))

From b2ed6a0564946932ebfc6eaf2470d333bf188f62 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:24:02 +0000
Subject: [PATCH 3348/6849] libatomic_ops: bump to version 7.2

The 1.2 we were using doesn't build on ARM Thumb platforms:

  http://autobuild.buildroot.org/results/94ef6be7dcb31021462e7313724217627d4b29df/build-end.log

Moreover, the 7.2 version is the one used by Debian/Ubuntu, and it has
been tested to build fine with the two packages that depend on
libatomic_ops: libdrm and pulseaudio.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libatomic_ops/libatomic_ops.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index 6d50d0a59b..8f66f88ddd 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBATOMIC_OPS_VERSION = 1.2
+LIBATOMIC_OPS_VERSION = 7.2
 LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
 LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
 LIBATOMIC_OPS_INSTALL_STAGING = YES

From 29b792690b4939b414fef1ad06f71c53feb1ed75 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:24:03 +0000
Subject: [PATCH 3349/6849] gnutls: fix build failure due to non-existing gets
 in recent C libraries

Fixes:

  http://autobuild.buildroot.org/results/7414989c182f8fd5b3ac849b7897b8e15df0024f/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ets-no-longer-exists-in-e-glibc-2.16.patch | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch

diff --git a/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch b/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
new file mode 100644
index 0000000000..802e7ac970
--- /dev/null
+++ b/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
@@ -0,0 +1,56 @@
+From 855f72c4fe7f4bbf2137ab60357ae3b27bb65185 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 17 Nov 2012 17:45:41 +0100
+Subject: [PATCH] gets() no longer exists in (e)glibc >= 2.16
+
+gnutls has already updated gnulib upstream in more recent versions
+(3.x) but apparently not in the 2.x branch that we are using.
+
+This patch comes from OpenEmbedded, and has originally been written by
+Khem Raj <raj.khem@gmail.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gl/stdio.in.h     |    2 ++
+ lib/gl/stdio.in.h |    2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gl/stdio.in.h b/gl/stdio.in.h
+index 9dc7c4a..8cb19d7 100644
+--- a/gl/stdio.in.h
++++ b/gl/stdio.in.h
+@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ #  undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+ 
+ 
+diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h
+index 03bea2a..cb6483b 100644
+--- a/lib/gl/stdio.in.h
++++ b/lib/gl/stdio.in.h
+@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ #  undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+ 
+ 
+-- 
+1.7.9.5
+

From 7603f9d38af9d950686319d0ded621e82f4f1694 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:24:04 +0000
Subject: [PATCH 3350/6849] gsl: fix build on !i386 uClibc

uClibc pretends to implement <fenv.h> as it installs the header, but
in practice, it only implements the functions for i386. This makes gsl
unhappy as it detects fenv.h, but then cannot use the fenv functions.

Fixes:

  http://autobuild.buildroot.org/results/732cc07faeca2a9098dc5106e8f654eb1323451a/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gsl/gsl.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 71968590a6..65915916cd 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -10,4 +10,17 @@ GSL_INSTALL_STAGING = YES
 GSL_LICENSE = GPLv3
 GSL_LICENSE_FILES = COPYING
 
+# uClibc pretends to have fenv support as it installs <fenv.h>, but in
+# practice, it only implements it for i386. Problem reported upstream
+# at: http://lists.busybox.net/pipermail/uclibc/2012-October/047067.html.
+# So we tell gsl that fenv related functions are not available in this
+# case.
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifneq ($(BR2_i386),y)
+GSL_CONF_ENV = \
+       ac_cv_have_decl_feenableexcept=no \
+       ac_cv_have_decl_fesettrapenable=no
+endif
+endif
+
 $(eval $(autotools-package))

From 5995d68f953aa0066eeaa245e2db52cc147de0d5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:24:06 +0000
Subject: [PATCH 3351/6849] php: fix C++ link issue

The intl module is implemented in C++, but PHP fails to use g++ as the
compiler for the final link. As a workaround, tell it to link
with libstdc++.

Fixes:

  http://autobuild.buildroot.org/results/13eefdf2121fa1aea7a844bbed8b6cbce3b45996/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/php/php.mk b/package/php/php.mk
index 6ac9f2992e..0dfb6db4bf 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -102,6 +102,10 @@ endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
 	PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += icu
+	# The intl module is implemented in C++, but PHP fails to use
+	# g++ as the compiler for the final link. As a workaround,
+	# tell it to link libstdc++.
+	PHP_CONF_ENV += EXTRA_LIBS="-lstdc++"
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)

From 5ad2879a8bca386fa5c256a4286ccc928601cc1a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:24:07 +0000
Subject: [PATCH 3352/6849] attr: fix static build

Fixes:

  http://autobuild.buildroot.org/results/58a3d4113172813183d43fddc1248b35bd0c4994/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...1-attr-Fix-static-build-installation.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/attr/attr-0001-attr-Fix-static-build-installation.patch

diff --git a/package/attr/attr-0001-attr-Fix-static-build-installation.patch b/package/attr/attr-0001-attr-Fix-static-build-installation.patch
new file mode 100644
index 0000000000..ed51dbb4da
--- /dev/null
+++ b/package/attr/attr-0001-attr-Fix-static-build-installation.patch
@@ -0,0 +1,30 @@
+From 1d510e6049e7c7cb7ed4e87780b2c1a997d47b64 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 17 Nov 2012 19:36:39 +0100
+Subject: [PATCH] attr: Fix static build installation
+
+When doing a static build the .lai file is not created, so do not try
+to install it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ include/buildmacros |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..d81e62b 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -98,8 +98,7 @@ endif
+ 
+ INSTALL_LTLIB_STATIC = \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
++	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
+ 
+ INSTALL_MAN = \
+ 	@for d in $(MAN_PAGES); do \
+-- 
+1.7.9.5
+

From 3845a93b3082d73604881966544f1eb7d5e55daa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 17 Nov 2012 12:24:08 +0000
Subject: [PATCH 3353/6849] dbus: uses fork(), requires MMU

In order to solve
http://autobuild.buildroot.org/results/34f6843137efda20626af72714c110280ec577d7/build-end.log,
this patch makes the D-Bus package as well as all the packages that
select the D-Bus package 'depends on BR2_USE_MMU'.

In addition, for the specific case of gvfs, the missing
BR2_TOOLCHAIN_HAS_THREADS dependency is added (threads are required by
D-Bus, so they are also required by gvfs which selects D-Bus).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/Config.in     | 1 +
 package/connman/Config.in         | 1 +
 package/dbus/Config.in            | 2 ++
 package/efl/libedbus/Config.in    | 1 +
 package/gvfs/Config.in            | 2 ++
 package/network-manager/Config.in | 1 +
 package/ofono/Config.in           | 1 +
 package/qt/Config.in              | 1 +
 package/samba/Config.in           | 1 +
 package/systemd/Config.in         | 1 +
 system/Config.in                  | 1 +
 11 files changed, 13 insertions(+)

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index c06f8cd263..7ca23fcba8 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_BLUEZ_UTILS
 	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	help
diff --git a/package/connman/Config.in b/package/connman/Config.in
index b67b54059c..93f9ab518f 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_CONNMAN
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
 	  managing internet connections within embedded devices running
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 2b04e945b8..62f3eee72d 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_DBUS
 	bool "dbus"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  The D-Bus message bus system.
 
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 985939edc7..9b57592f24 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBEDBUS
 	select BR2_PACKAGE_LIBECORE
 	select BR2_PACKAGE_DBUS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	help
 	  E_Dbus is a set of wrappers around D-Bus APIs so they can be
 	  easily used by EFL applications, automatically providing
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 87f9a03216..e0a945e7f5 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_GVFS
 	bool "gvfs"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_USE_MMU # dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_SHARED_MIME_INFO
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 3f01fefb33..e2324d6602 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	depends on BR2_LARGEFILE # acl
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index 74c8b534a4..6248544052 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_OFONO
 	bool "ofono"
 	depends on BR2_USE_WCHAR # gettext/libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_LIBCAP_NG
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
diff --git a/package/qt/Config.in b/package/qt/Config.in
index b99bf4c195..fdbb598172 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -286,6 +286,7 @@ config BR2_PACKAGE_QT_DBUS
 	bool "DBus Module"
 	select BR2_PACKAGE_DBUS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	help
 	  Build the Qt DBus module.
 
diff --git a/package/samba/Config.in b/package/samba/Config.in
index b4028b1671..fedbccdd63 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -233,6 +233,7 @@ config BR2_PACKAGE_SAMBA_AVAHI
 	default y
 	depends on BR2_PACKAGE_AVAHI_DAEMON
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	help
 	  Include support for avahi
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 0e7fc397df..86ab2cf1b8 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSTEMD
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBCAP
 	help
diff --git a/system/Config.in b/system/Config.in
index 58232108e4..622b2427ff 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -56,6 +56,7 @@ config BR2_INIT_SYSTEMD
 	depends on BR2_INET_IPV6
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_SYSTEMD
 

From 0ab9a3fb790b3c734c08d4819201e9d76fe670e6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Nov 2012 23:54:08 +0100
Subject: [PATCH 3354/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index d1a4888e9d..9c3be6bc0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
 	barebox 2012.08/09/10/11, linker overlap issue fix for
 	at91bootstrap, mxs-bootlets updated for new Barebox versions.
 
-	Toolchains: binutils 2.23.1, gcc 4.72, default to gcc 4.6.x,
+	Toolchains: binutils 2.23.1, gcc 4.7.2, default to gcc 4.6.x,
 	Codebench arm/sh/x86 2012.03/09, Linaro 2012.08/09/10.
 	Libtirpc support for modern glibc variants. Toolchain on
 	target has been deprecated.
@@ -31,17 +31,17 @@
 	_LICENSE / _REDISTRIBUTE splitup, per-package hooks.
 
 	Updated/fixed packages: acpid, alsa-lib, alsa-utils,
-	alsamixergui, autoconf, automake, bash, bind, binutils, bison,
-	blackbox, bluez-utils, busybox, cairo, can-utils, cifs-utils,
-	cjson, cmake, collectd, connman, conntrack-tools, coreutils,
-	cups, cvs, dbus, dhcp, directfb, dmalloc, dnsmasq, dropbear,
-	e2fsprogs, ethtool, fbdump, feh, fftw, file, flashrom,
-	fluxbox, gdb, gdisk, gdk-pixbuf, genext2fs, gettext, gnutls,
-	gpsd, gqview, grep, gst-plugins-{bad,good}, hdparm, hiawatha,
-	hostapd, input-tools, iproute2, ipset, iptables, iw, json-c,
-	kexec, kmod, lcdproc, leafpad, less, libcurl, libdrm,
-	libdvdnav, libdvdread, libffi, libfuse, libglib2, libhid,
-	liblockfile, libmad, libmbus, libmnl,
+	alsamixergui, attr, autoconf, automake, bash, bind, binutils,
+	bison, blackbox, bluez-utils, busybox, cairo, can-utils,
+	cifs-utils, cjson, cmake, collectd, connman, conntrack-tools,
+	coreutils, cups, cvs, dbus, dhcp, directfb, dmalloc, dnsmasq,
+	dropbear, e2fsprogs, ethtool, fbdump, feh, fftw, file,
+	flashrom, fluxbox, gdb, gdisk, gdk-pixbuf, genext2fs, gettext,
+	gnutls, gpsd, gqview, grep, gsl, gst-plugins-{bad,good},
+	hdparm, hiawatha, hostapd, input-tools, iproute2, ipset,
+	iptables, iw, json-c, kexec, kmod, lcdproc, leafpad, less,
+	libcurl, libdrm, libdvdnav, libdvdread, libffi, libfuse,
+	libglib2, libhid, liblockfile, libmad, libmbus, libmnl,
 	libnetfilter_{acct,conntrack,cthelper,cttimeout,queue},
 	libnfc, libnfc-llcp, libnfnetlink, libnl, libnspr, libnss,
 	libpcap, libplayer, libtool, libtorrent, liburcu, libv4l,

From 47ee3051fc49d928d3ba6f83a8dea4102d8536f4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 17 Nov 2012 23:15:45 +0100
Subject: [PATCH 3355/6849] Update for 2012.11-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html |  9 ++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9c3be6bc0e..f8ac04b6c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2012.11, Not released yet:
+2012.11-rc1, Released November 17th, 2012
 
 	Fixes all over the tree and new features.
 
diff --git a/Makefile b/Makefile
index 7602499555..21aa054a96 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.11-git
+export BR2_VERSION:=2012.11-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 51b7a82a08..c34a311006 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -13,16 +13,15 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.08.tar.bz2">buildroot-2012.08.tar.bz2</a>.
 
-<!--
 <p>
-The latest release candidate is <b>2012.08-rc3</b>, which can be
+The latest release candidate is <b>2012.11-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.08-rc3.tar.gz">buildroot-2012.08-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2012.11-rc1.tar.gz">buildroot-2012.11-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.08-rc3.tar.bz2">buildroot-2012.08-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.11-rc1.tar.bz2">buildroot-2012.11-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 416857c7f0..e1e641de84 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>17 November 2012 -- 2012.11-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.11_rc1">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.11-rc1.tar.bz2">2012.11-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>17 November 2012 -- Buildroot Developer Day</b>
 
     <p>A report from the recent <i>Buildroot Developer Days</i> meeting

From b40ec0b651c36610a74c57bf5237c892c1647ea1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 19 Nov 2012 09:12:23 +0100
Subject: [PATCH 3356/6849] news.html: add 2012.11-rc1 annoucement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index e1e641de84..94183e092a 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.11_rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-November/061995.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.11-rc1.tar.bz2">2012.11-rc1

From 4c60854f00a687f25f6012c960c202bfd0cc6455 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Tue, 20 Nov 2012 01:14:46 +0000
Subject: [PATCH 3357/6849] barebox: Add BR2_TARGET_BAREBOX_2012_11

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index c9e7088243..997f45bf91 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -45,6 +45,7 @@ config BR2_TARGET_BAREBOX_VERSION
 	default "2012.08.0"	if BR2_TARGET_BAREBOX_2012_08
 	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
 	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10
+	default "2012.11.0"	if BR2_TARGET_BAREBOX_2012_11
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From cd0f43a2c56e1ac2cb30c0af15cb7029e668a219 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Tue, 20 Nov 2012 17:21:31 +0000
Subject: [PATCH 3358/6849] cjson: fix copy/paste error in target installation

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cjson/cjson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index dd64010748..ccc60102d3 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -23,7 +23,7 @@ define CJSON_INSTALL_STAGING_CMDS
 endef
 
 define CJSON_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h
+	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h
 	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so
 endef
 

From 5e0f1e1fcfbaca2b33397b3076a55b23b0e02cd8 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 20 Nov 2012 22:15:36 +0000
Subject: [PATCH 3359/6849] busybox: fix link with tirpc

Busybox does partial linking of its modules before linking everything
together into the binary.  Those partial links are done without the
standard libraries, but that also means -ltirpc can't be found.  In
addition, this probably fails horribly with static linking (untested).

The problem is that the LDFLAGS are also used in the partial links.
So instead, use CFLAGS_busybox, which is only used for the busybox
link step.  Also make sure that this is passed through the environment,
not on the command line, so the busybox Makefile can still append to
it.

Fixes e.g.
http://autobuild.buildroot.net/results/e8351e3ba86fdcdb2999548658271a6fde0526a9

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 549e150be0..9154c08925 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -27,12 +27,17 @@ BUSYBOX_LDFLAGS = \
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
 BUSYBOX_DEPENDENCIES += libtirpc
 BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
-BUSYBOX_LDFLAGS += -ltirpc
+# Don't use LDFLAGS for -ltirpc, because LDFLAGS is used for
+# the non-final link of modules as well.
+BUSYBOX_CFLAGS_busybox += -ltirpc
 endif
 
 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
 # Allows the build system to tweak CFLAGS
-BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(BUSYBOX_CFLAGS)"
+BUSYBOX_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	CFLAGS="$(BUSYBOX_CFLAGS)" \
+	CFLAGS_busybox="$(BUSYBOX_CFLAGS_busybox)"
 BUSYBOX_MAKE_OPTS = \
 	CC="$(TARGET_CC)" \
 	ARCH=$(KERNEL_ARCH) \

From fdd5bc948ed5fa3d14f9bfa09968f8216fb08ae1 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Tue, 20 Nov 2012 08:31:36 +0000
Subject: [PATCH 3360/6849] xtensa: use uppercase for configurations and
 modified overlay structure

Except for architecture and processor names, buildroot uses capitalized
configuration names, so change the macro names for xtensa to follow that
standard.
Change the overlay file to have a subdirectory for each component
(gdb, binutils, gcc, etc.) to make it more future-prove.

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.xtensa           | 26 +++++++++++++++-----------
 package/binutils/binutils.mk    |  6 +++---
 toolchain/gcc/gcc-uclibc-4.x.mk |  6 +++---
 toolchain/gdb/gdb.mk            |  6 +++---
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index af66125cbd..60c03f5515 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -2,32 +2,36 @@ choice
 	prompt "Target Architecture Variant"
 	depends on BR2_xtensa
 	default BR2_xtensa_fsf
-config BR2_xtensa_custom
+config BR2_XTENSA_CUSTOM
 	bool "Custom Xtensa processor configuration"
 config BR2_xtensa_fsf
 	bool "fsf - Default configuration"
 endchoice
 
-config BR2_xtensa_custom_name
-	string "Custom Xtensa processor configuration anme"
-	depends on BR2_xtensa_custom
+config BR2_XTENSA_CUSTOM_NAME
+	string "Custom Xtensa processor configuration name"
+	depends on BR2_XTENSA_CUSTOM
 	default ""
 	help
 	  Name given to a custom Xtensa processor configuration.
 
-config BR2_xtensa_core_name
+config BR2_XTENSA_CORE_NAME
 	string
-	default BR2_xtensa_custom_name	if BR2_xtensa_custom
+	default BR2_XTENSA_CUSTOM_NAME	if BR2_XTENSA_CUSTOM
 	default ""			if BR2_xtensa_fsf
 
-config BR2_xtensa_overlay_dir
+config BR2_XTENSA_OVERLAY_DIR
 	string "Overlay directory for custom configuration"
-	depends on BR2_xtensa_custom
+	depends on BR2_XTENSA_CUSTOM
 	default ""
 	help
-	  Provide a directory path that contains the overlay files
-	  for the custom configuration. The path is based on the
-	  buildroot top directory.
+	  Provide the directory path that contains the overlay file
+	  for a custom processor configuration. The path is relative
+	  to the top directory of buildroot.
+	  These overlay files are tar packages with updated configuration
+	  files for various toolchain packages and Xtensa processor
+	  configurations. They are provided by the processor vendor or
+	  directly from Tensilica.
 
 config BR2_ARCH
 	default "xtensa"	if BR2_xtensa
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 82f8fd2346..92e0a74836 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -68,11 +68,11 @@ define BINUTILS_INSTALL_TARGET_CMDS
 endef
 endif
 
-XTENSA_CORE_NAME = $(call qstrip, $(BR2_xtensa_core_name))
+XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME))
 ifneq ($(XTENSA_CORE_NAME),)
 define BINUTILS_XTENSA_PRE_PATCH
-	tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(XTENSA_CORE_NAME).tar \
-		-C $(@D) bfd include ld
+	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
+		-C $(@D) --strip-components=1 binutils
 endef
 HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
 endif
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 1710070edd..7a0b4caa09 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -251,9 +251,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	rm -rf $(GCC_DIR)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
 	$(call CONFIG_UPDATE,$(@D))
-ifneq ($(call qstrip, $(BR2_xtensa_core_name)),)
-	tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip,\
-		$(BR2_xtensa_core_name)).tar -C $(@D) include
+ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
+		$(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
 endif
 	touch $@
 
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index dc305a63bf..c42c755467 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -25,9 +25,9 @@ gdb-unpacked: $(GDB_DIR)/.unpacked
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
 	mkdir -p $(GDB_DIR)
 	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
-ifneq ($(call qstrip, $(BR2_xtensa_core_name)),)
-	tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip, \
-		$(BR2_xtensa_core_name)).tar -C $(@D) bfd include gdb
+ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip, \
+		$(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gdb
 endif
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch

From c28e15debff2078f4ef1b123e9a047a0cad2c18a Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Tue, 20 Nov 2012 08:43:59 +0000
Subject: [PATCH 3361/6849] xtensa: fix target gdb build and 64-bit host side
 gdb

Fix build breakage, use the version of the ptrace header file in asm
instead of sys. Also, fix GDB running on 64 bit hosts. GDB was using
unsigned long for 32-bit registers, but unsigned long is 64 bit on
64-bit hosts.

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch | 22 +++++++++++++++++++
 toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch  | 19 ++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch
 create mode 100644 toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch

diff --git a/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch b/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch
new file mode 100644
index 0000000000..3d1b07c99c
--- /dev/null
+++ b/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch
@@ -0,0 +1,22 @@
+--- gdb-7.4.1/gdb/xtensa-linux-nat.c.orig	2012-10-19 16:23:06.908165323 -0700
++++ gdb-7.4.1/gdb/xtensa-linux-nat.c	2012-10-19 16:35:30.792134876 -0700
+@@ -36,7 +36,7 @@
+ #include "gdb_wait.h"
+ #include <fcntl.h>
+ #include <sys/procfs.h>
+-#include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ 
+ #include "gregset.h"
+ #include "xtensa-tdep.h"
+--- gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c.orig	2012-10-19 16:24:06.260162894 -0700
++++ gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c	2012-10-19 16:36:07.920133357 -0700
+@@ -23,7 +23,7 @@
+ /* Defined in auto-generated file reg-xtensa.c.  */
+ void init_registers_xtensa (void);
+ 
+-#include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ #include <xtensa-config.h>
+ 
+ #include "xtensa-xtregs.c"
diff --git a/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch b/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch
new file mode 100644
index 0000000000..e10bb8f3ee
--- /dev/null
+++ b/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch
@@ -0,0 +1,19 @@
+--- gdb-7.4.1/gdb/xtensa-tdep.h.orig	2012-10-30 11:40:23.546448594 -0700
++++ gdb-7.4.1/gdb/xtensa-tdep.h	2012-10-30 11:41:43.078445337 -0700
+@@ -17,6 +17,7 @@
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
++#include <stdint.h>
+ 
+ /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION
+    whenever the "tdep" structure changes in an incompatible way.  */
+@@ -84,7 +85,7 @@
+ /* Xtensa ELF core file register set representation ('.reg' section).
+    Copied from target-side ELF header <xtensa/elf.h>.  */
+ 
+-typedef unsigned long xtensa_elf_greg_t;
++typedef uint32_t xtensa_elf_greg_t;
+ 
+ typedef struct
+ {

From 8f717d54ba37d289e9e15b2a302cd4d2fe3fb93c Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 21 Nov 2012 00:08:12 +0000
Subject: [PATCH 3362/6849] Remove unused barebox 2012.07 string

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 997f45bf91..95f330f587 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -41,7 +41,6 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.07.0"	if BR2_TARGET_BAREBOX_2012_07
 	default "2012.08.0"	if BR2_TARGET_BAREBOX_2012_08
 	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
 	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10

From e1ebae700ace80ded99e1a977e28375dc4f7255d Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Sun, 4 Nov 2012 23:44:54 +0000
Subject: [PATCH 3363/6849] fs/common: Create initial console device

A /dev/console node must be present in rootfs when the Linux kernel
boots otherwise the kernel will print the following warning:
"Warning: unable to open an initial console"

This is because when we use an initramfs the /dev directory is not
populated at this point. This can cause problems when a program
(e.g ldso with early debugging enabled) opens a standard file
descriptor for read/write before these descriptors are actually
created by the init process later on.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cpio/cpio.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index aa20b41074..5533322d1c 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -21,6 +21,8 @@ define ROOTFS_CPIO_ADD_INIT
         fi
 endef
 
+PACKAGES_PERMISSIONS_TABLE += /dev/console c 622 0 0 5 1 - - -$(sep)
+
 endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
 
 ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT

From 1c7f8c45f2f6f0b2a1214ad59f6540df0e6eb4be Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 21 Nov 2012 00:35:19 +0000
Subject: [PATCH 3364/6849] kernel-headers: bump 3.{0, 2, 4, 6}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.52-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index e195def195..d24e7f9c7b 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.51"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.52"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.33"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.34"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.18"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.19"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.6"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.7"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.52-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.52-headers_install-fix-__packed-in-exported-kernel-head.patch

From 36d36f0de19bd5f23453dc1391f83843f9042849 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 21 Nov 2012 00:35:20 +0000
Subject: [PATCH 3365/6849] linux: bump 3.6.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 29a21109e9..e24273cbd1 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6.6"
+	bool "3.6.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.6" if BR2_LINUX_KERNEL_3_6
+	default "3.6.7" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 8fd455921296751f142c655b013f602a6522fa8d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 21 Nov 2012 23:46:35 +0000
Subject: [PATCH 3366/6849] arptables: needs mmu

arptables uses fork() and breaks on !mmu.
Fixes
http://autobuild.buildroot.net/results/fe18dd4a0b0d17404560abf3e4a332b58751f5cb/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/arptables/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/arptables/Config.in b/package/arptables/Config.in
index 510eedf3b0..414fabb258 100644
--- a/package/arptables/Config.in
+++ b/package/arptables/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_ARPTABLES
 	bool "arptables"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  Tool to set up, maintain, and inspect the tables of ARP rules.
 

From a645383c841f5016f81e90e29b829fcf6a8a312b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:17:51 +0000
Subject: [PATCH 3367/6849] libecore: fix build with glibc >= 2.16

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-ecore_exe-fix-build-with-glibc-2-16.patch | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch

diff --git a/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
new file mode 100644
index 0000000000..d9b439cb79
--- /dev/null
+++ b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
@@ -0,0 +1,94 @@
+Backported for commit a0df6712b6afcd07facd32e5a66809170277bdf3
+Fixed the ChangeLog part.
+
+This patch fix build with glibc >=2.16, avoiding the following error occurs:
+
+Making all in ecore
+make[6]: Entering directory `/opt/buildroot/output/build/host-libecore-1.1.0/src/lib/ecore'
+  CC     ecore.lo
+  CC     ecore_anim.lo
+  CC     ecore_app.lo
+  CC     ecore_events.lo
+  CC     ecore_getopt.lo
+  CC     ecore_idle_enterer.lo
+  CC     ecore_idle_exiter.lo
+  CC     ecore_idler.lo
+  CC     ecore_job.lo
+  CC     ecore_main.lo
+  CC     ecore_pipe.lo
+  CC     ecore_poll.lo
+  CC     ecore_time.lo
+  CC     ecore_timer.lo
+  CC     ecore_thread.lo
+  CC     ecore_glib.lo
+  CC     ecore_throttle.lo
+  CC     ecore_signal.lo
+  CC     ecore_exe.lo
+ecore_exe.c: In function ‘ecore_exe_pipe_run’:
+ecore_exe.c:486:15: warning: implicit declaration of function ‘setpriority’ [-Wimplicit-function-declaration]
+ecore_exe.c:486:27: error ‘PRIO_PROCESS’ undeclared (first use in this function)
+ecore_exe.c:486:27: note: each undeclared identifier is reported only once for each function it appears in
+make[6]: *** [ecore_exe.lo] Error 1
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+From a0df6712b6afcd07facd32e5a66809170277bdf3 Mon Sep 17 00:00:00 2001
+From: caro <caro>
+Date: Fri, 22 Jun 2012 05:36:00 +0000
+Subject: [PATCH] ecore_exe: fix compilation on fedora 18.
+
+setpriority needs sys/resource.h. See:
+
+http://linux.die.net/man/2/setpriority
+
+I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems.
+
+
+git-svn-id: http://svn.enlightenment.org/svn/e@72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
+---
+ ChangeLog                 | 4 ++++
+ src/lib/ecore/ecore_exe.c | 7 ++-----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a306f75..549ad19 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -763,3 +763,7 @@
+ 2011-11-29 Mike McCormack
+
+ 	* Allow quitting before entering the glib version of the main loop
++
++2012-06-22 Vincent Torri
++
++	* ecore_exe: fix compilation on fedora 18.
+diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
+index 7931a96..6db32a9 100644
+--- a/src/lib/ecore/ecore_exe.c
++++ b/src/lib/ecore/ecore_exe.c
+@@ -2,11 +2,6 @@
+ # include <config.h>
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+-# include <sys/time.h>
+-# include <sys/resource.h>
+-#endif
+-
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -14,6 +9,8 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ 
+ #ifdef HAVE_SYS_PRCTL_H
+ # include <sys/prctl.h>
+-- 
+1.7.12.2
+

From d15637d1715f155f7af6cd5fdf8ed3ffeedad04a Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 22 Nov 2012 23:16:36 +0000
Subject: [PATCH 3368/6849] AVR32: fix libusb build

The libc of the avr32 toolchains seem to lack the timerfd-associated
functions.

Pass --disable-timerfd to libusb configure script when building for
avr32.

Fixes most of the recent avr32 breakages, such as
http://autobuild.buildroot.org/results/f418b6c0b026891c27467f61444b6eac8c105681
or
http://autobuild.buildroot.org/results/1a9e571998bc0a40822dca84267abbdd969bab5e

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libusb/libusb.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 06a148543b..fc2f10b558 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -11,5 +11,9 @@ LIBUSB_LICENSE_FILES = COPYING
 LIBUSB_DEPENDENCIES = host-pkgconf
 LIBUSB_INSTALL_STAGING = YES
 
+ifeq ($(BR2_avr32),y)
+LIBUSB_CONF_OPT += --disable-timerfd
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From bf5d51717ba4988d41c2e86157b95b08b26f379b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 23 Nov 2012 10:47:38 +0100
Subject: [PATCH 3369/6849] Revert "libhid: disable on avr32"

This reverts commit 2424cc6783bbfb542f08cf1985b8c9ef18282161.

Now that we have a timerfd fix for libusb, this can be reverted.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libhid/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libhid/Config.in b/package/libhid/Config.in
index bd1cfcb3df..093b98fcb9 100644
--- a/package/libhid/Config.in
+++ b/package/libhid/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBHID
 	bool "libhid"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-	depends on !BR2_avr32 # timerfd not in uClibc-0.9.31
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
@@ -10,4 +9,4 @@ config BR2_PACKAGE_LIBHID
 	  http://libhid.alioth.debian.org
 
 comment "libhid needs a toolchain with thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From ade0a8a856e1009210538170cd72d92a07c06233 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 23 Nov 2012 22:01:38 +0100
Subject: [PATCH 3370/6849] directfb: needs threads support

Fixes http://autobuild.buildroot.net/results/237aaf7b036a98867de1df47d39d01ec4137efd3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in                   | 4 ++++
 package/multimedia/gst-plugins-bad/Config.in | 1 +
 2 files changed, 5 insertions(+)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 47f9feaaf4..a1845689de 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DIRECTFB
 	bool "directfb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
@@ -107,3 +108,6 @@ config BR2_PACKAGE_DIRECTB_TESTS
 	bool "build directfb tests"
 
 endif # BR2_PACKAGE_DIRECTFB
+
+comment "directfb needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 7784ad70f6..d87aec4aa7 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -262,6 +262,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
 	select BR2_PACKAGE_DIRECTFB
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"

From 3bdbe9abb90de0262832d5d545f239fa41fb0e91 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 25 Nov 2012 05:52:43 +0000
Subject: [PATCH 3371/6849] lcdproc: fix autobuild errors

The autobuilders are falling over building lcdproc, with failures like the
following.

  http://autobuild.buildroot.net/results/622b7da10be751c725ba25eb40102269790b4b03/build-end.log

As Thomas Petazzoni has pointed out, the compile command lines incorrectly
contain host header and library search paths, such as the following.

  -I/home/peko/scratch/host/usr/include/freetype2
  -L/home/peko/scratch/host/usr/lib -lfreetype

This patch changes the lcdproc package to pass the freetype installation
prefixes on the configure command line.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdproc/lcdproc.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 2a80289e39..fe88f46f0d 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -10,7 +10,9 @@ LCDPROC_LICENSE = GPLv2+
 LCDPROC_LICENSE_FILES = COPYING
 LCDPROC_MAKE = $(MAKE1)
 
-LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
+LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \
+	--with-ft-prefix="$(STAGING_DIR)/usr" \
+	--with-ft-exec-prefix="$(STAGING_DIR)/usr"
 
 ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
 LCDPROC_CONF_OPT += --enable-lcdproc-menus

From d0a13821d7f6ceb34061014b9899eb81c3988ccf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Nov 2012 10:42:49 -0800
Subject: [PATCH 3372/6849] package: add gd package

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/gd/Config.in           | 62 ++++++++++++++++++++++++
 package/gd/gd-fontconfig.patch | 28 +++++++++++
 package/gd/gd-maxcolors.patch  | 20 ++++++++
 package/gd/gd-no-zlib.patch    | 51 ++++++++++++++++++++
 package/gd/gd.mk               | 87 ++++++++++++++++++++++++++++++++++
 6 files changed, 249 insertions(+)
 create mode 100644 package/gd/Config.in
 create mode 100644 package/gd/gd-fontconfig.patch
 create mode 100644 package/gd/gd-maxcolors.patch
 create mode 100644 package/gd/gd-no-zlib.patch
 create mode 100644 package/gd/gd.mk

diff --git a/package/Config.in b/package/Config.in
index 5d9783ad59..d566a39bf1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -376,6 +376,7 @@ source "package/cairo/Config.in"
 source "package/fltk/Config.in"
 source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
+source "package/gd/Config.in"
 source "package/giblib/Config.in"
 source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
diff --git a/package/gd/Config.in b/package/gd/Config.in
new file mode 100644
index 0000000000..efac21d7ef
--- /dev/null
+++ b/package/gd/Config.in
@@ -0,0 +1,62 @@
+config BR2_PACKAGE_GD
+	bool "gd"
+	help
+	  GD is a graphics library. It allows your code to quickly
+	  draw images complete with lines, arcs, text, multiple
+	  colours, cut and paste from other images, flood fills, and
+	  write out the result as a PNG file. This is particularly
+	  useful in World Wide Web applications, where PNG is one of
+	  the formats accepted for inline images by most browsers.
+
+	  http://www.boutell.com/gd/
+
+if BR2_PACKAGE_GD
+
+menu "gd tools"
+
+config BR2_PACKAGE_GD_ANNOTATE
+       bool "annotate"
+
+config BR2_PACKAGE_GD_BDFTOGD
+       bool "bdftogd"
+       depends on BR2_PACKAGE_PERL
+
+config BR2_PACKAGE_GD_GD2COPYPAL
+       bool "gd2copypal"
+
+config BR2_PACKAGE_GD_GD2TOGIF
+       bool "gd2togif"
+
+config BR2_PACKAGE_GD_GD2TOPNG
+       bool "gd2topng"
+       select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_GD_GDCMPGIF
+       bool "gdcmpgif"
+
+config BR2_PACKAGE_GD_GDPARTTOPNG
+       bool "gdparttopng"
+       select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_GD_GDTOPNG
+       bool "gdtopng"
+       select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_GD_GIFTOGD2
+       bool "giftogd2"
+
+config BR2_PACKAGE_GD_PNGTOGD
+       bool "pngtogd"
+       select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_GD_PNGTOGD2
+       bool "pngtogd2"
+       select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_GD_WEBPNG
+       bool "webpng"
+       select BR2_PACKAGE_LIBPNG
+
+endmenu
+
+endif
diff --git a/package/gd/gd-fontconfig.patch b/package/gd/gd-fontconfig.patch
new file mode 100644
index 0000000000..651fbec8a0
--- /dev/null
+++ b/package/gd/gd-fontconfig.patch
@@ -0,0 +1,28 @@
+Patch from Gentoo:
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/gd/files/gd-2.0.35-fontconfig.patch?view=log
+
+fix from upstream
+
+http://bugs.gentoo.org/363367
+
+# HG changeset patch
+# User tabe
+# Date 1239812355 0
+# Node ID 3ea283efcdafcb2acc1dd0ace1d3d48da6d8cec8
+# Parent  4f29a877875f63cee5a64e7bea406a61882a565e
+fixed FS#199
+
+199, Fixed useFontConfig() to work as documented (Ethan Merritt)
+ 
+diff -r 4f29a877875f -r 3ea283efcdaf gdft.c
+--- a/gdft.c	Sat Apr 04 12:00:37 2009 +0000
++++ b/gdft.c	Wed Apr 15 16:19:15 2009 +0000
+@@ -1659,7 +1659,7 @@
+ BGD_DECLARE(int) gdFTUseFontConfig(int flag)
+ {
+ #ifdef HAVE_LIBFONTCONFIG
+-	fontConfigFlag = 1;
++	fontConfigFlag = flag;
+ 	return 1;
+ #else
+ 	return 0;
diff --git a/package/gd/gd-maxcolors.patch b/package/gd/gd-maxcolors.patch
new file mode 100644
index 0000000000..161cf19935
--- /dev/null
+++ b/package/gd/gd-maxcolors.patch
@@ -0,0 +1,20 @@
+Patch from Gentoo:
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/gd/files/gd-2.0.35-maxcolors.patch?view=log
+
+http://bugs.gentoo.org/292130
+
+fix in usptream repo already
+
+--- gd-2.0.35/gd_gd.c
++++ gd-2.0.35/gd_gd.c
+@@ -44,6 +44,10 @@
+ 	    {
+ 	      goto fail1;
+ 	    }
++	  if (im->colorsTotal > gdMaxColors)
++	    {
++		   goto fail1;
++		 }
+ 	}
+       /* Int to accommodate truecolor single-color transparency */
+       if (!gdGetInt (&im->transparent, in))
diff --git a/package/gd/gd-no-zlib.patch b/package/gd/gd-no-zlib.patch
new file mode 100644
index 0000000000..cb265b2a3b
--- /dev/null
+++ b/package/gd/gd-no-zlib.patch
@@ -0,0 +1,51 @@
+[PATCH] gd_gd2: provide dummy implementations for all public symbols when !zlib
+
+gd_gd2.c only provides dummy implementations for some of it's public symbols
+when zlib isn't found, causing build failures in several of the tools.
+
+Fix it by providing dummy implementations for all of them.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ gd_gd2.c |   30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+Index: gd-2.0.35/gd_gd2.c
+===================================================================
+--- gd-2.0.35.orig/gd_gd2.c
++++ gd-2.0.35/gd_gd2.c
+@@ -1068,4 +1068,34 @@
+   fprintf (stderr, "GD2 support is not available - no libz\n");
+   return NULL;
+ }
++
++BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2Part (FILE * inFile, int srcx, int srcy, int w, int h)
++{
++  fprintf (stderr, "GD2 support is not available - no libz\n");
++  return NULL;
++}
++
++BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2PartPtr (int size, void *data, int srcx, int srcy, int w,
++			     int h)
++{
++  fprintf (stderr, "GD2 support is not available - no libz\n");
++  return NULL;
++}
++
++BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2PartCtx (gdIOCtx * in, int srcx, int srcy, int w, int h)
++{
++  fprintf (stderr, "GD2 support is not available - no libz\n");
++  return NULL;
++}
++
++BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt)
++{
++  fprintf (stderr, "GD2 support is not available - no libz\n");
++}
++
++BGD_DECLARE(void *) gdImageGd2Ptr (gdImagePtr im, int cs, int fmt, int *size)
++{
++  fprintf (stderr, "GD2 support is not available - no libz\n");
++  return NULL;
++}
+ #endif /* HAVE_LIBZ */
diff --git a/package/gd/gd.mk b/package/gd/gd.mk
new file mode 100644
index 0000000000..476976430a
--- /dev/null
+++ b/package/gd/gd.mk
@@ -0,0 +1,87 @@
+################################################################################
+#
+# gd
+#
+################################################################################
+
+GD_VERSION = 2.0.35
+GD_SOURCE = gd-$(GD_VERSION).tar.bz2
+GD_SITE = http://distfiles.gentoo.org/distfiles
+# needed because of configure.ac timestamp
+GD_AUTORECONF = YES
+GD_INSTALL_STAGING = YES
+GD_LICENSE = GD license
+GD_LICENSE_FILES = COPYING
+
+GD_CONF_OPT = --without-x --disable-rpath
+
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+GD_DEPENDENCIES += fontconfig
+GD_CONF_OPT += --with-fontconfig
+GD_CONF_ENV += ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+GD_DEPENDENCIES += jpeg
+GD_CONF_OPT += --with-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+GD_DEPENDENCIES += libpng
+GD_CONF_OPT += --with-png
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
+GD_DEPENDENCIES += xlib_libXpm
+GD_CONF_OPT += --with-xpm
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+GD_DEPENDENCIES += zlib
+endif
+
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+GD_DEPENDENCIES += gettext
+else
+# configure.ac has newer timestamp than aclocal.m4 / configure, so we need
+# to autoreconf to regenerate them (or set configure.ac timestamp to older
+# than them) to make the Makefile happy.
+# configure.ac refers to AM_ICONV which we only have if gettext is enabled,
+# so add a dummy definition elsewise
+define GD_FIXUP_ICONV
+	echo 'm4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])])' \
+		>> $(@D)/acinclude.m4
+endef
+
+GD_PRE_CONFIGURE_HOOKS += GD_FIXUP_ICONV
+endif
+
+define GD_FIXUP_GDLIB_CONFIG
+	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
+	    -e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
+		$(STAGING_DIR)/usr/bin/gdlib-config
+endef
+
+GD_POST_INSTALL_STAGING_HOOKS += GD_FIXUP_GDLIB_CONFIG
+
+GD_TOOLS_                         	+= gdlib-config
+GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE)	+= annotate
+GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD)	+= bdftogd
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL)	+= gd2copypal
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF)	+= gd2togif
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG)	+= gd2topng
+GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF)	+= gdcmpgif
+GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG)	+= gdparttopng
+GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG)	+= gdtopng
+GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2)	+= giftogd2
+GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD)	+= pngtogd
+GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2)	+= pngtogd2
+GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG)	+= webpng
+
+define GD_REMOVE_TOOLS
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GD_TOOLS_))
+endef
+
+GD_POST_INSTALL_TARGET_HOOKS += GD_REMOVE_TOOLS
+
+$(eval $(autotools-package))

From d19be01683b6f79427beb4edfa8ae5a711fc81ef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Nov 2012 16:05:52 -0800
Subject: [PATCH 3373/6849] package: add libebml package

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libebml/Config.in  | 11 +++++++++++
 package/libebml/libebml.mk | 26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/libebml/Config.in
 create mode 100644 package/libebml/libebml.mk

diff --git a/package/Config.in b/package/Config.in
index d566a39bf1..fa04fd731e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -435,6 +435,7 @@ endmenu
 menu "Multimedia"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
+source "package/libebml/Config.in"
 source "package/libmms/Config.in"
 source "package/libmpeg2/Config.in"
 source "package/libogg/Config.in"
diff --git a/package/libebml/Config.in b/package/libebml/Config.in
new file mode 100644
index 0000000000..ce855b232c
--- /dev/null
+++ b/package/libebml/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBEBML
+	bool "libebml"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Access library for the EBML (Extensible Binary Meta
+	  Language, a binary derivative of XML) format.
+
+	  http://matroska.org
+
+comment "libebml requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk
new file mode 100644
index 0000000000..0a04635e1e
--- /dev/null
+++ b/package/libebml/libebml.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# libebml
+#
+#############################################################
+
+LIBEBML_VERSION = 1.2.2
+LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.bz2
+LIBEBML_SITE = http://dl.matroska.org/downloads/libebml/
+LIBEBML_INSTALL_STAGING = YES
+LIBEBML_LICENSE = LGPLv2.1+
+LIBEBML_LICENSE_FILES = LICENSE.LGPL
+
+define LIBEBML_BUILD_CMDS
+	$(MAKE) -C $(@D)/make/linux CROSS="$(CCACHE) $(TARGET_CROSS)"
+endef
+
+define LIBEBML_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D)/make/linux prefix=$(STAGING_DIR)/usr install
+endef
+
+define LIBEBML_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/make/linux prefix=$(TARGET_DIR)/usr install
+endef
+
+$(eval $(generic-package))

From d69172d7d807769f5091a612f7145bd464c7bc82 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Nov 2012 16:42:43 -0800
Subject: [PATCH 3374/6849] package: add libmatroska package

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/libmatroska/Config.in      | 12 ++++++++++++
 package/libmatroska/libmatroska.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 package/libmatroska/Config.in
 create mode 100644 package/libmatroska/libmatroska.mk

diff --git a/package/Config.in b/package/Config.in
index fa04fd731e..f3ca496538 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -436,6 +436,7 @@ menu "Multimedia"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
 source "package/libebml/Config.in"
+source "package/libmatroska/Config.in"
 source "package/libmms/Config.in"
 source "package/libmpeg2/Config.in"
 source "package/libogg/Config.in"
diff --git a/package/libmatroska/Config.in b/package/libmatroska/Config.in
new file mode 100644
index 0000000000..b1c53eec09
--- /dev/null
+++ b/package/libmatroska/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBMATROSKA
+	bool "libmatroska"
+	select BR2_PACKAGE_LIBEBML
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Extensible open standard audio/video container format access
+	  library.
+
+	  http://matroska.org
+
+comment "libmatroska requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libmatroska/libmatroska.mk b/package/libmatroska/libmatroska.mk
new file mode 100644
index 0000000000..605a2fb03a
--- /dev/null
+++ b/package/libmatroska/libmatroska.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# libmatroska
+#
+#############################################################
+
+LIBMATROSKA_VERSION = 1.3.0
+LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska/
+LIBMATROSKA_INSTALL_STAGING = YES
+LIBMATROSKA_LICENSE = LGPLv2.1+
+LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL
+LIBMATROSKA_DEPENDENCIES = libebml
+
+define LIBMATROSKA_BUILD_CMDS
+	$(MAKE) -C $(@D)/make/linux CROSS="$(CCACHE) $(TARGET_CROSS)"
+endef
+
+define LIBMATROSKA_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D)/make/linux prefix=$(STAGING_DIR)/usr install
+endef
+
+define LIBMATROSKA_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/make/linux prefix=$(TARGET_DIR)/usr install
+endef
+
+$(eval $(generic-package))

From 670d60dc919fe6d99224ad1056c426812b38d108 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 27 Nov 2012 09:23:08 +0000
Subject: [PATCH 3375/6849] ocf-linux: tweak kernel patch for newer kernels

Newer kernels had a slight change in the random number API so the OCF
patchset requires a slight tweak to build and run properly.

Affected kernels are, per series:
>=3.0.41, >=3.2.29, >=3.4.9, >=3.5.2 and any newer version.

The fix is applied by detecting the API change rather than guessing the
kernel version.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux-ext-ocf-linux.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux/linux-ext-ocf-linux.mk b/linux/linux-ext-ocf-linux.mk
index faf7360e49..1a601d58cf 100644
--- a/linux/linux-ext-ocf-linux.mk
+++ b/linux/linux-ext-ocf-linux.mk
@@ -15,6 +15,8 @@ LINUX_DEPENDENCIES += ocf-linux
 define OCF_LINUX_PREPARE_KERNEL
 	support/scripts/apply-patches.sh $(LINUX_DIR) \
 		$(OCF_LINUX_DIR)/patches/ linux-3.2.1-ocf.patch ; \
+	grep -q __mix_pool_bytes $(LINUX_DIR)/drivers/char/random.c && \
+	$(SED) 's:wordcount\*4:&, NULL:' $(LINUX_DIR)/drivers/char/random.c ; \
 	cp -rf $(OCF_LINUX_DIR)/ocf $(LINUX_DIR)/crypto/ocf ;
 endef
 

From 1d989fafba761d29b3b2960bf388821d3ac0f6e7 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 27 Nov 2012 11:59:16 +0000
Subject: [PATCH 3376/6849] manual: trivial fixes

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt  |  4 +-
 docs/manual/adding-packages-cmake.txt      |  4 +-
 docs/manual/adding-packages-conclusion.txt |  2 +-
 docs/manual/adding-packages-directory.txt  |  2 +-
 docs/manual/adding-packages-generic.txt    | 34 +++++++--------
 docs/manual/adding-packages-tips.txt       |  4 +-
 docs/manual/board-support.txt              |  2 +-
 docs/manual/common-usage.txt               |  8 ++--
 docs/manual/customize-rootfs.txt           |  8 ++--
 docs/manual/customize-toolchain.txt        | 10 ++---
 docs/manual/customize-uclibc-config.txt    | 11 +++--
 docs/manual/embedded-basics.txt            |  2 +-
 docs/manual/external-toolchain.txt         |  9 ++--
 docs/manual/how-buildroot-works.txt        |  2 +-
 docs/manual/introduction.txt               |  4 +-
 docs/manual/legal-notice.txt               | 27 ++++++++----
 docs/manual/make-tips.txt                  | 50 ++++++++++++----------
 docs/manual/makedev-syntax.txt             |  2 +-
 docs/manual/patch-policy.txt               |  9 ++--
 docs/manual/prerequisite.txt               |  2 +-
 docs/manual/rebuilding-packages.txt        |  4 +-
 docs/manual/using.txt                      | 22 +++++-----
 docs/manual/writing-rules.txt              |  4 +-
 23 files changed, 122 insertions(+), 104 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 1184b69966..4127df46ee 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -133,13 +133,13 @@ cases, typical packages will therefore only use a few of them.
 
 * +LIBFOO_INSTALL_STAGING_OPT+ contains the make options
   used to install the package to the staging directory. By default, the
-  value is +DESTDIR=$$(STAGING_DIR) install+, which is
+  value is +DESTDIR=$(STAGING_DIR) install+, which is
   correct for most autotools packages. It is still possible to override
   it.
 
 * +LIBFOO_INSTALL_TARGET_OPT+ contains the make options
   used to install the package to the target directory. By default, the
-  value is +DESTDIR=$$(TARGET_DIR) install+. The default
+  value is +DESTDIR=$(TARGET_DIR) install+. The default
   value is correct for most autotools packages, but it is still possible
   to override it if needed.
 
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index 81ac0a722d..4a9e893f27 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -115,12 +115,12 @@ typical packages will therefore only use a few of them.
 
 * +LIBFOO_INSTALL_STAGING_OPT+ contains the make options used to
   install the package to the staging directory. By default, the value
-  is +DESTDIR=$$(STAGING_DIR) install+, which is correct for most
+  is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
   CMake packages. It is still possible to override it.
 
 * +LIBFOO_INSTALL_TARGET_OPT+ contains the make options used to
   install the package to the target directory. By default, the value
-  is +DESTDIR=$$(TARGET_DIR) install+. The default value is correct
+  is +DESTDIR=$(TARGET_DIR) install+. The default value is correct
   for most CMake packages, but it is still possible to override it if
   needed.
 
diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt
index 42f1c8fe00..137b7c3b23 100644
--- a/docs/manual/adding-packages-conclusion.txt
+++ b/docs/manual/adding-packages-conclusion.txt
@@ -8,5 +8,5 @@ matter of writing a Makefile using an existing example and modifying it
 according to the compilation process required by the package.
 
 If you package software that might be useful for other people, don't
-forget to send a patch to Buildroot developers!
+forget to send a patch to the Buildroot mailing list!
 
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index c8f41ff31d..88a4645249 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -7,7 +7,7 @@ First of all, create a directory under the +package+ directory for
 your software, for example +libfoo+.
 
 Some packages have been grouped by topic in a sub-directory:
-+multimedia+, +java+, +x11r7+, and +games+. If your package fits in
++multimedia+, +x11r7+, +efl+ and +matchbox+. If your package fits in
 one of these categories, then create your package directory in these.
 
 
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index b05043a448..ee96bc1361 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -175,8 +175,8 @@ information is (assuming the package name is +libfoo+) :
   Examples: +
     +LIBFOO_SITE=http://www.libfoosoftware.org/libfoo+ +
     +LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/+ +
-    +LIBFOO_SITE=git://github.com/kergoth/tslib.git+
-    +LIBFOO_SITE=/opt/software/libfoo.tar.gz+
+    +LIBFOO_SITE=git://github.com/kergoth/tslib.git+ +
+    +LIBFOO_SITE=/opt/software/libfoo.tar.gz+ +
     +LIBFOO_SITE=$(TOPDIR)/../src/libfoo/+
 
 * +LIBFOO_SITE_METHOD+ determines the method used to fetch or copy the
@@ -221,7 +221,7 @@ information is (assuming the package name is +libfoo+) :
   name) that are required for the current target package to
   compile. These dependencies are guaranteed to be compiled and
   installed before the configuration of the current package starts. In
-  a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependency for
+  a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for
   the current host package.
 
 * +LIBFOO_INSTALL_STAGING+ can be set to +YES+ or +NO+ (default). If
@@ -275,20 +275,20 @@ LIBFOO_VERSION = 2.32
 Now, the variables that define what should be performed at the
 different steps of the build process.
 
-* +LIBFOO_CONFIGURE_CMDS+, used to list the actions to be performed to
-  configure the package before its compilation
+* +LIBFOO_CONFIGURE_CMDS+ lists the actions to be performed to
+  configure the package before its compilation.
 
-* +LIBFOO_BUILD_CMDS+, used to list the actions to be performed to
-  compile the package
+* +LIBFOO_BUILD_CMDS+ lists the actions to be performed to
+  compile the package.
 
-* +HOST_LIBFOO_INSTALL_CMDS+, used to list the actions to be performed
+* +HOST_LIBFOO_INSTALL_CMDS+ lists the actions to be performed
   to install the package, when the package is a host package. The
   package must install its files to the directory given by
   +$(HOST_DIR)+. All files, including development files such as
   headers should be installed, since other packages might be compiled
   on top of this package.
 
-* +LIBFOO_INSTALL_TARGET_CMDS+, used to list the actions to be
+* +LIBFOO_INSTALL_TARGET_CMDS+ lists the actions to be
   performed to install the package to the target directory, when the
   package is a target package. The package must install its files to
   the directory given by +$(TARGET_DIR)+. Only the files required for
@@ -297,24 +297,24 @@ different steps of the build process.
   to the target, if the +development files in target filesystem+
   option is selected.
 
-* +LIBFOO_INSTALL_STAGING_CMDS+, used to list the actions to be
+* +LIBFOO_INSTALL_STAGING_CMDS+ lists the actions to be
   performed to install the package to the staging directory, when the
   package is a target package. The package must install its files to
   the directory given by +$(STAGING_DIR)+. All development files
   should be installed, since they might be needed to compile other
   packages.
 
-* +LIBFOO_CLEAN_CMDS+, used to list the actions to perform to clean up
+* +LIBFOO_CLEAN_CMDS+, lists the actions to perform to clean up
   the build directory of the package.
 
-* +LIBFOO_UNINSTALL_TARGET_CMDS+, used to list the actions to
+* +LIBFOO_UNINSTALL_TARGET_CMDS+ lists the actions to
   uninstall the package from the target directory +$(TARGET_DIR)+
 
-* +LIBFOO_UNINSTALL_STAGING_CMDS+, used to list the actions to
+* +LIBFOO_UNINSTALL_STAGING_CMDS+ lists the actions to
   uninstall the package from the staging directory +$(STAGING_DIR)+.
 
-* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+, used
-  to install init scripts either for the systemV-like init systems
+* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+ list the
+  actions to install init scripts either for the systemV-like init systems
   (busybox, sysvinit, etc.) or for the systemd units. These commands
   will be run only when the relevant init system is installed (i.e. if
   systemd is selected as the init system in the configuration, only
@@ -352,8 +352,8 @@ using the autotools infrastructure described below.  However, since
 they are provided by the generic infrastructure, they are documented
 here. The exception is +LIBFOO_POST_PATCH_HOOKS+.  Patching the
 package and producing legal info are not user definable, so
-+LIBFOO_POST_PATCH_HOOKS+ and +LIBFOO_POST_LEGAL_INFO_HOOKS+ will be
-userful for generic packages.
++LIBFOO_POST_PATCH_HOOKS+ and +LIBFOO_POST_LEGAL_INFO_HOOKS+ are
+useful for generic packages.
 
 The following hook points are available:
 
diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 6ec632de28..5e327d26b9 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -32,8 +32,8 @@ using the following rules:
 
 
 [[github-download-url]]
-How to add package from github
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+How to add a package from github
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If the package has no release version, or its version cannot be
 identified using tag, then the sha1 of the particular commit should be
diff --git a/docs/manual/board-support.txt b/docs/manual/board-support.txt
index 271f3e0772..5a4da2c403 100644
--- a/docs/manual/board-support.txt
+++ b/docs/manual/board-support.txt
@@ -21,7 +21,7 @@ selections are highly application-specific.
 Once you have a known working configuration, run +make
 savedefconfig+. This will generate a minimal +defconfig+ file at the
 root of the Buildroot source tree. Move this file into the +configs/+
-directory, and rename it +MYBOARD_defconfig+.
+directory, and rename it +BOARDNAME_defconfig+.
 
 It is recommended to use upstream versions of the Linux kernel and
 bootloaders where possible, and also to use default kernel and bootloader
diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt
index 98503b5f5c..5566a39b02 100644
--- a/docs/manual/common-usage.txt
+++ b/docs/manual/common-usage.txt
@@ -47,7 +47,7 @@ safely run multiple builds in parallel using the same source tree as
 long as they use unique output directories.
 
 For ease of use, Buildroot generates a Makefile wrapper in the output
-directory - So after the first run, you no longer need to pass +O=..+
+directory - so after the first run, you no longer need to pass +O=..+
 and +-C ..+, simply run (in the output directory):
 
 --------------------
@@ -69,21 +69,21 @@ to +make+ or set in the environment:
   internal toolchain is being built.
   +
   Note that the uClibc configuration file can also be set from the
-  configuration interface, so through the Buildroot .config file; this
+  configuration interface, so through the Buildroot +.config+ file; this
   is the recommended way of setting it.
   +
 * +BUSYBOX_CONFIG_FILE=<path/to/.config>+, path to
   the Busybox configuration file.
   +
   Note that the Busybox configuration file can also be set from the
-  configuration interface, so through the Buildroot .config file; this
+  configuration interface, so through the Buildroot +.config+ file; this
   is the recommended way of setting it.
   +
 * +BUILDROOT_DL_DIR+ to override the directory in which
   Buildroot stores/retrieves downloaded files
   +
   Note that the Buildroot download directory can also be set from the
-  configuration interface, so through the Buildroot .config file; this
+  configuration interface, so through the Buildroot +.config+ file; this
   is the recommended way of setting it.
 
 An example that uses config files located in the toplevel directory and
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index d6224ffb40..a1a556b85c 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -5,7 +5,7 @@ Customizing the generated target filesystem
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Besides changing one or another configuration through +make *config+,
-there are a few ways to customize the resulting target filesystem:
+there are a few ways to customize the resulting target filesystem.
 
 * Customize the target filesystem directly and rebuild the image.  The
   target filesystem is available under +output/target/+.  You can
@@ -13,7 +13,7 @@ there are a few ways to customize the resulting target filesystem:
   rebuild the target filesystem image. This method allows you to do
   anything to the target filesystem, but if you decide to completely
   rebuild your toolchain and tools, these changes will be lost.
-  _Changes are not resistent to the +make clean+ command_.
+  _Changes do not survive the +make clean+ command_.
 
 * Create your own 'target skeleton'. You can start with the default
   skeleton available under +system/skeleton+ and then customize it to
@@ -30,13 +30,13 @@ there are a few ways to customize the resulting target filesystem:
   assembled. The +BR2_ROOTFS_POST_BUILD_SCRIPT+ will allow you to
   specify the location of your post-build script. This option can be
   found in the +System configuration+ menu. The destination root
-  filesystem folder *is given as the first argument to this script,
+  filesystem folder is given as the first argument to this script,
   and this script can then be used to copy programs, static data or
   any other needed file to your target filesystem. You should,
   however, use this feature with care. Whenever you find that a
   certain package generates wrong or unneeded files, you should fix
   that package rather than work around it with a post-build cleanup
-  script. _Among these first 3 methods, this one should be prefere_d.
+  script. _Among these first 3 methods, this one should be preferred_.
 
 * A special package, 'customize', stored in +package/customize+ can be
   used. You can put all the files that you want to see in the final
diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 91657cf679..11f6f2861e 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -24,13 +24,13 @@ The internal Buildroot toolchain backend *only* allows to generate
 
 However, it allows to tune major settings, such as:
 
-* Linux header version
+* Linux headers version;
 
-* http://www.uclibc.org/[uClibc] configuration (see xref:uclibc-custom[uClibc])
+* http://www.uclibc.org/[uClibc] configuration (see xref:uclibc-custom[uClibc]);
 
-* Binutils, GCC, Gdb and toolchain options
+* Binutils, GCC, Gdb and toolchain options.
 
-This is directly available after selecting the +Buildroot toolchain+ type in
+These settings are available after selecting the +Buildroot toolchain+ type in
 the menu +Toolchain+.
 
 Using the Crosstool-NG backend
@@ -44,4 +44,4 @@ limited set of settings under the Buildroot +Toolchain+ menu (ie. when invoking
 
 * Gdb and some toolchain options
 
-Then, the toolchain can be finely tuned invoking +make ctng-menuconfig+.
+Then, the toolchain can be fine-tuned by invoking +make ctng-menuconfig+.
diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt
index d340c9aba0..38a1575a52 100644
--- a/docs/manual/customize-uclibc-config.txt
+++ b/docs/manual/customize-uclibc-config.txt
@@ -18,17 +18,16 @@ follow these steps:
   similar to the one used in the Linux kernel or Buildroot,
   appears. Make your configuration changes as appropriate.
 
-* Copy the +$(O)/toolchain/uclibc-VERSION/.config+ file to a different
-  place (like +toolchain/uClibc/uClibc-myconfig.config+, or
-  +board/mymanufacturer/myboard/uClibc.config+) and adjust the uClibc
-  configuration (configuration option +BR2_UCLIBC_CONFIG+) to use this
+* Copy the +$(O)/toolchain/uClibc-VERSION/.config+ file to a different
+  place (e.g. +board/MANUFACTURER/BOARDNAME/uClibc.config+) and adjust
+  the uClibc configuration file option +BR2_UCLIBC_CONFIG+ to refer to this
   configuration instead of the default one.
 
 * Run the compilation of Buildroot again.
 
-Otherwise, you can simply change +toolchain/uClibc/uClibc.config+,
+Otherwise, you can simply change +toolchain/uClibc/uClibc-VERSION.config+,
 without running the configuration assistant.
 
-If you want to use an existing config file for uclibc, then see
+If you want to use an existing config file for uClibc, then see
 xref:env-vars[].
 
diff --git a/docs/manual/embedded-basics.txt b/docs/manual/embedded-basics.txt
index d1ee88c0c9..a33338c1df 100644
--- a/docs/manual/embedded-basics.txt
+++ b/docs/manual/embedded-basics.txt
@@ -82,7 +82,7 @@ interested in Buildroot for two reasons:
 
 You might wonder why such a tool is needed when you can compile +gcc+,
 +binutils+, +uClibc+ and all the other tools by hand. Of course doing
-so is possible but, dealing with all of the configure options and
+so is possible, but dealing with all of the configure options and
 problems of every +gcc+ or +binutils+ version is very time-consuming
 and uninteresting.  Buildroot automates this process through the use
 of Makefiles and has a collection of patches for each +gcc+ and
diff --git a/docs/manual/external-toolchain.txt b/docs/manual/external-toolchain.txt
index b33737609f..6124fe4de3 100644
--- a/docs/manual/external-toolchain.txt
+++ b/docs/manual/external-toolchain.txt
@@ -26,8 +26,8 @@ Then, you have three solutions to use an external toolchain:
 
 * Use a predefined external toolchain profile, and let Buildroot
   download, extract and install the toolchain. Buildroot already knows
-  about a few CodeSourcery toolchains for ARM, PowerPC, MIPS and
-  SuperH. Just select the toolchain profile in +Toolchain+ through the
+  about a few CodeSourcery, Linaro, Blackfin and Xilinx toolchains.
+  Just select the toolchain profile in +Toolchain+ from the
   available ones. This is definitely the easiest solution.
 
 * Use a predefined external toolchain profile, but instead of having
@@ -45,7 +45,8 @@ Then, you have three solutions to use an external toolchain:
   toolchain C library+ options. Then, you have to tell Buildroot what
   your external toolchain supports. If your external toolchain uses
   the 'glibc' library, you only have to tell whether your toolchain
-  supports C++ or not. If your external toolchain uses the 'uclibc'
+  supports C\+\+ or not and whether it has built-in RPC support. If
+  your external toolchain uses the 'uClibc'
   library, then you have to tell Buildroot if it supports largefile,
   IPv6, RPC, wide-char, locale, program invocation, threads and
   C++. At the beginning of the execution, Buildroot will tell you if
@@ -53,7 +54,7 @@ Then, you have three solutions to use an external toolchain:
 
 
 Our external toolchain support has been tested with toolchains from
-CodeSourcery, toolchains generated by
+CodeSourcery and Linaro, toolchains generated by
 http://crosstool-ng.org[crosstool-NG], and toolchains generated by
 Buildroot itself. In general, all toolchains that support the
 'sysroot' feature should work. If not, do not hesitate to contact the
diff --git a/docs/manual/how-buildroot-works.txt b/docs/manual/how-buildroot-works.txt
index 879cff3991..7e33d8e01a 100644
--- a/docs/manual/how-buildroot-works.txt
+++ b/docs/manual/how-buildroot-works.txt
@@ -6,7 +6,7 @@ How Buildroot works
 As mentioned above, Buildroot is basically a set of Makefiles that
 download, configure, and compile software with the correct options. It
 also includes patches for various software packages - mainly the ones
-involved in the cross-compilation tool chain (+gcc+, +binutils+ and
+involved in the cross-compilation toolchain (+gcc+, +binutils+ and
 +uClibc+).
 
 There is basically one Makefile per software package, and they are
diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt
index bcca544f78..9353f8c2b5 100644
--- a/docs/manual/introduction.txt
+++ b/docs/manual/introduction.txt
@@ -17,5 +17,5 @@ processors, MIPS processors, ARM processors, etc.
 Buildroot supports numerous processors and their variants; it also
 comes with default configurations for several boards available
 off-the-shelf. Besides this, a number of third-party projects are based on,
-or develop their BSP footnote:[BSP: Board Software Package] or
-SDK footnote:[SDK: Standard Development Kit] on top of Buildroot.
+or develop their BSP footnote:[BSP: Board Support Package] or
+SDK footnote:[SDK: Software Development Kit] on top of Buildroot.
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
index a7af5a85a4..989b285113 100644
--- a/docs/manual/legal-notice.txt
+++ b/docs/manual/legal-notice.txt
@@ -5,13 +5,13 @@
 Legal notice and licensing
 ==========================
 
-Complying with opensource licenses
-----------------------------------
+Complying with open source licenses
+-----------------------------------
 
 All of the end products of Buildroot (toolchain, root filesystem, kernel,
-bootloaders) contain opensource software, released under various licenses.
+bootloaders) contain open source software, released under various licenses.
 
-Using opensource software gives you the freedom to build rich embedded
+Using open source software gives you the freedom to build rich embedded
 systems, choosing from a wide range of packages, but also imposes some
 obligations that you must know and honour.
 Some licenses require you to publish the license text in the documentation of
@@ -46,7 +46,7 @@ There you will find:
 * A manifest file listing the configured packages, their version, license and
   related information.
   Some of this information might not be defined in Buildroot; such items are
-  clearly marked as "unknown" or similar.
+  marked as "unknown".
 * A +licenses/+ subdirectory, which contains the license text of packages.
   If the license file(s) are not defined in Buildroot, the file is not produced
   and a warning in the +README+ indicates this.
@@ -56,16 +56,20 @@ produce all the material that is somehow relevant for legal compliance with the
 package licenses. Buildroot does not try to produce the exact material that
 you must somehow make public. Certainly, more material is produced than is
 needed for a strict legal compliance. For example, it produces the source code
-for packages released under BSD-like licenses, that you might not want to
+for packages released under BSD-like licenses, that you are not required to
 redistribute in source form.
 
 Moreover, due to technical limitations, Buildroot does not produce some
 material that you will or may need, such as the toolchain source code and the
-Buildroot source code itself.
+Buildroot source code itself (including patches to packages for which source
+distribution is required).
 When you run +make legal-info+, Buildroot produces warnings in the +README+
 file to inform you of relevant material that could not be saved.
 
 [[legal-info-list-licenses]]
+License abbreviations
+---------------------
+
 Here is a list of the licenses that are most widely used by packages in
 Buildroot, with the name used in the manifest file:
 
@@ -86,6 +90,13 @@ Buildroot, with the name used in the manifest file:
 * +GPL+:
   http://www.gnu.org/licenses/gpl.html[
   GNU General Public License] (any version);
+* +LGPLv2+:
+  http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
+  GNU Library General Public License, version 2];
+* +LGPLv2++:
+  http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
+  GNU Library General Public License, version 2.1]
+  or (at your option) any later version;
 * +LGPLv2.1+:
   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
   GNU Lesser General Public License, version 2.1];
@@ -112,7 +123,7 @@ Buildroot, with the name used in the manifest file:
 Complying with the Buildroot license
 ------------------------------------
 
-Buildroot itself is an opensource software, released under the
+Buildroot itself is an open source software, released under the
 http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU General Public
 License, version 2] or (at your option) any later version.
 However, being a build system, it is not normally part of the end product:
diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index 25c4e35179..8cd77c030f 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -4,55 +4,61 @@
 'make' tips
 -----------
 
-Because Buildroot is a set of Makefiles and patches, there are a few
-things that are useful to know, such as:
+This is a collection of tips that help you make the most of Buildroot.
 
-+make *config+ commands offer a search tool. Read the help message in
+.Configuration searches:
+
+The +make *config+ commands offer a search tool. Read the help message in
 the different frontend menus to know how to use it:
 
-* in _menuconfig_, search tool is called by pressing +/+;
-* in _xconfig_, search tool is called by pressing +ctrl+ + +f+.
+* in _menuconfig_, the search tool is called by pressing +/+;
+* in _xconfig_, the search tool is called by pressing +Ctrl+ + +f+.
 
 The result of the search shows the help message of the matching items.
 
-Display all commands executed by make:
+.Display all commands executed by make:
 
 --------------------
- $ make V=0|1 <target>
+ $ make V=1 <target>
 --------------------
 
-Display all available targets:
+.Display all available targets:
 
 --------------------
  $ make help
 --------------------
 
-Note that some settings in the +.config+ file may hide some targets:
+.Not all targets are always available,
+
+some settings in the +.config+ file may hide some targets:
+
+* +linux-menuconfig+ and +linux-savedefconfig+ only work when
+  +linux+ is enabled;
+* +uclibc-menuconfig+ is only available when the
+  Buildroot internal toolchain backend is used;
+* +ctng-menuconfig+ is only available when the
+  crosstool-NG backend is used;
+* +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the
+  +barebox+ bootloader is enabled.
+
+.Cleaning:
 
-* +busybox-menuconfig+ depends on whether +busybox+ is enabled or not
-  in the +Package selection+ menu
-* +linux-menuconfig+ and +linux-savedefconfig+ depend on whether
-  +linux+ is enabled or not
-* +uclibc-menuconfig+ depends on whether the toolchain uses the
-  Buildroot internal toolchain backend or not
-* +ctng-menuconfig+ depends on whether the toolchain uses the
-  crosstool-NG backend or not
-* +barebox-menuconfig+ and +barebox-savedefconfig+ depend on whether
-  +barebox+ bootloader is enabled or not
+Explicit cleaning is required when any of the architecture or toolchain
+configuration options are changed.
 
-Delete all build products (including build directories, host, staging
+To delete all build products (including build directories, host, staging
 and target trees, the images and the toolchain):
 
 --------------------
  $ make clean
 --------------------
 
-Delete all build products as well as the configuration:
+To delete all build products as well as the configuration:
 
 --------------------
  $ make distclean
 --------------------
 
-Note that if +ccache+ is enabled, running +make clean|distclean+ does
+Note that if +ccache+ is enabled, running +make clean+ or +distclean+ does
 not empty the compiler cache used by Buildroot. To delete it, refer
 to xref:ccache[].
diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt
index 99ecdea82f..fc571051a5 100644
--- a/docs/manual/makedev-syntax.txt
+++ b/docs/manual/makedev-syntax.txt
@@ -20,7 +20,7 @@ It takes the form of a line for each file, with the following layout:
 There are a few non-trivial blocks here:
 
 - +name+ is the path to the file you want to create/modify
-- +type+ is the type of the file, being one of :
+- +type+ is the type of the file, being one of:
   * f: a regular file
   * d: a directory
   * c: a character device file
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 1fdb04ef73..b65855edba 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -6,11 +6,12 @@ Patch Policy
 ------------
 
 While integrating a new package or updating an existing one, it may be
-necessary to patch the source of the software to get it built within
+necessary to patch the source of the software to get it cross-built within
 Buildroot.
 
 Buildroot offers an infrastructure to automatically handle this during
-the builds. It supports several ways of applying patch sets:
+the builds. It supports two ways of applying patch sets: downloaded patches
+and patches supplied within buildroot.
 
 Providing patches
 ~~~~~~~~~~~~~~~~~
@@ -29,10 +30,10 @@ Within Buildroot
 ^^^^^^^^^^^^^^^^
 
 Most patches are provided within Buildroot, in the package
-directory; these typically aim to fix cross-compilation, +libc+ support,
+directory; these typically aim to fix cross-compilation, libc support,
 or other such issues.
 
-These patch files should have the extension +*.patch+.
+These patch files should be named +<packagename>-*.patch+.
 
 A +series+ file, as used by +quilt+, may also be added in the
 package directory. In that case, the +series+ file defines the patch
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 36d8da7b81..38f9a94ae8 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -23,7 +23,7 @@ Mandatory packages
 
 ** +which+
 ** +sed+
-** +make+ (version 3.82 or any later)
+** +make+ (version 3.81 or any later)
 ** +binutils+
 ** +build-essential+ (only for Debian based systems)
 ** +gcc+ (version 2.95 or any later)
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index 83f6a3670d..e677590b42 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -14,7 +14,7 @@ In some cases, a full rebuild is mandatory:
 
 * each time the toolchain properties are changed, this includes:
 
-** after changing some toolchain option under the _Toolchain_ menu (if
+** after changing any toolchain option under the _Toolchain_ menu (if
    the internal Buildroot backend is used);
 ** after running +make ctng-menuconfig+ (if the crosstool-NG backend
    is used);
@@ -25,7 +25,7 @@ In some cases, a full rebuild is mandatory:
 In some cases, a full rebuild is recommended:
 
 * after adding some libraries to the package selection (otherwise,
-  some packages that can be optionally linked against those libraries
+  packages that can be optionally linked against those libraries
   won't be rebuilt, so they won't support those new available
   features).
 
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 892caf580f..9436981f07 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -31,9 +31,9 @@ to run the Qt or GTK-based configurators.
 All of these "make" commands will need to build a configuration
 utility (including the interface), so you may need to install
 "development" packages for relevant libraries used by the
-configuration utilities. Check the xref:requirement[] to know what
-Buildroot needs, and specifically the xref:requirement-optional[system requirements]
-to get the dependencies of favorite interface.
+configuration utilities. Check xref:requirement[] to know what
+Buildroot needs, and specifically the xref:requirement-optional[optional requirements]
+to get the dependencies of your favorite interface.
 
 For each menu entry in the configuration tool, you can find associated
 help that describes the purpose of the entry.
@@ -52,15 +52,15 @@ You *should never* use +make -jN+ with Buildroot: it does not support
 'top-level parallel make'. Instead, use the +BR2_JLEVEL+ option to
 tell Buildroot to run each package compilation with +make -jN+.
 
-This command will generally perform the following steps:
+The `make` command will generally perform the following steps:
 
-* Download source files (as required)
-* Configure, build and install the cross-compiling toolchain using the
-  appropriate toolchain backend, or simply import an external toolchain
-* Build/install selected target packages
-* Build a kernel image, if selected
-* Build a bootloader image, if selected
-* Create a root filesystem in selected formats
+* download source files (as required);
+* configure, build and install the cross-compiling toolchain using the
+  appropriate toolchain backend, or simply import an external toolchain;
+* build/install selected target packages;
+* build a kernel image, if selected;
+* build a bootloader image, if selected;
+* create a root filesystem in selected formats.
 
 Buildroot output is stored in a single directory, +output/+.
 This directory contains several subdirectories:
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index c32f855be4..2a61639f0b 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -121,5 +121,5 @@ The documentation
 The documentation uses the
 http://www.methods.co.nz/asciidoc/[asciidoc] format.
 
-Further details about the http://www.methods.co.nz/asciidoc/[asciidoc]
-syntax: refer to http://www.methods.co.nz/asciidoc/userguide.html[].
+For further details about the http://www.methods.co.nz/asciidoc/[asciidoc]
+syntax, refer to http://www.methods.co.nz/asciidoc/userguide.html[].

From 65f66c170e6703cf1b75574e7aabea1302f51c50 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 27 Nov 2012 11:59:17 +0000
Subject: [PATCH 3377/6849] manual: various fixes

Various consistency and correctness improvements.

Also removing some sentences that are not or no longer relevant.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-conclusion.txt |  3 +-
 docs/manual/adding-packages-directory.txt  | 13 +++---
 docs/manual/adding-packages-generic.txt    | 25 ++++++-----
 docs/manual/adding-packages-gettext.txt    | 20 +++++----
 docs/manual/adding-packages-tips.txt       | 30 ++++++++-----
 docs/manual/beyond-buildroot.txt           |  2 +
 docs/manual/board-support.txt              |  4 +-
 docs/manual/customize-toolchain.txt        |  3 +-
 docs/manual/download-location.txt          | 14 +++---
 docs/manual/embedded-basics.txt            |  4 +-
 docs/manual/faq-troubleshooting.txt        |  8 +++-
 docs/manual/how-buildroot-works.txt        | 33 +++++++++-----
 docs/manual/legal-notice.txt               | 33 +++++++-------
 docs/manual/makedev-syntax.txt             |  3 +-
 docs/manual/package-make-target.txt        | 51 +++++++++-------------
 docs/manual/patch-policy.txt               | 27 ++++++------
 docs/manual/prerequisite.txt               |  4 +-
 docs/manual/rebuilding-packages.txt        | 40 ++++++-----------
 docs/manual/using.txt                      |  4 +-
 docs/manual/writing-rules.txt              | 37 +++++++++++-----
 20 files changed, 193 insertions(+), 165 deletions(-)

diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt
index 137b7c3b23..0f6f0ca0aa 100644
--- a/docs/manual/adding-packages-conclusion.txt
+++ b/docs/manual/adding-packages-conclusion.txt
@@ -8,5 +8,6 @@ matter of writing a Makefile using an existing example and modifying it
 according to the compilation process required by the package.
 
 If you package software that might be useful for other people, don't
-forget to send a patch to the Buildroot mailing list!
+forget to send a patch to the Buildroot mailing list (see
+xref:submitting-patches[])!
 
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 88a4645249..5903ed11cb 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -9,6 +9,7 @@ your software, for example +libfoo+.
 Some packages have been grouped by topic in a sub-directory:
 +multimedia+, +x11r7+, +efl+ and +matchbox+. If your package fits in
 one of these categories, then create your package directory in these.
+New subdirectories are discouraged, however.
 
 
 +Config.in+ file
@@ -32,12 +33,12 @@ configuration option must be indented with one tab. The help text
 itself should be indented with one tab and two spaces, and it must
 mention the upstream URL of the project.
 
-Of course, you can add other sub-options into a +if
+You can add other sub-options into a +if
 BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things
 in your software. You can look at examples in other packages. The
 syntax of the +Config.in+ file is the same as the one for the kernel
 Kconfig file. The documentation for this syntax is available at
-http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt[]
+http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[]
 
 Finally you have to add your new +libfoo/Config.in+ to
 +package/Config.in+ (or in a category subdirectory if you decided to
@@ -68,9 +69,9 @@ rules:
   dependency for dependencies on toolchain options (target
   architecture, MMU support, C library, C++ support, large file
   support, thread support, RPC support, IPV6 support, WCHAR support),
-  or for dependencies on "big" things, such as the X.org system. In
-  some cases, especially dependency on toolchain options, it is
-  recommended to add a +comment+ displayed when the option is not
+  or for dependencies on "big" things, such as the X.org system. For
+  dependencies on toolchain options, there should be a +comment+ that
+  is displayed when the option is not
   enabled, so that the user knows why the package is not available.
   The +depends on+ keyword express the dependency with a forward
   semantic.
@@ -160,7 +161,7 @@ so, the dependency also needs to be expressed in the +.mk+ file of the
 package.
 
 Further formatting details: see xref:writing-rules-config-in[the
-writing rules].
+coding style].
 
 The +.mk+ file
 ^^^^^^^^^^^^^^
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index ee96bc1361..3f21f86cd4 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -151,11 +151,11 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_PATCH+ may contain the name of a patch, that will be
   downloaded from the same location as the tarball indicated in
   +LIBFOO_SOURCE+. If +HOST_LIBFOO_PATCH+ is not specified, it
-  defaults to +LIBFOO_PATCH+. Also note that another mechanism is
-  available to patch a package: all files of the form
-  +packagename-packageversion-description.patch+ present in the
-  package directory inside Buildroot will be applied to the package
-  after extraction.
+  defaults to +LIBFOO_PATCH+. Note that patches that are included
+  in Buildroot itself use a different mechanism: all files of the
+  form +<packagename>-*.patch+ present in the package directory inside
+  Buildroot will be applied to the package after extraction (see
+  xref:patch-policy[patching a package]).
 
 * +LIBFOO_SITE+ provides the location of the package, which can be a
   URL or a local filesystem path. HTTP, FTP and SCP are supported URL
@@ -251,9 +251,6 @@ information is (assuming the package name is +libfoo+) :
   use the same string to make the manifest file uniform.
   Otherwise, describe the license in a precise and concise way, avoiding
   ambiguous names such as +BSD+ which actually name a family of licenses.
-  If the root filesystem you generate contains non-opensource packages, you
-  can define their license as +PROPRIETARY+: Buildroot will not save any
-  licensing info or source code for this package.
   This variable is optional. If it is not defined, +unknown+ will appear in
   the +license+ field of the manifest file for this package.
 
@@ -265,6 +262,11 @@ information is (assuming the package name is +libfoo+) :
   to let you know, and +not saved+ will appear in the +license files+ field
   of the manifest file for this package.
 
+* +LIBFOO_REDISTRIBUTE+ can be set to +YES+ (default) or +NO+ to indicate if
+  the package source code is allowed to be redistributed. Set it to +NO+ for
+  non-opensource packages: Buildroot will not save the source code for this
+  package when collecting the +legal-info+.
+
 The recommended way to define these variables is to use the following
 syntax:
 
@@ -292,10 +294,9 @@ different steps of the build process.
   performed to install the package to the target directory, when the
   package is a target package. The package must install its files to
   the directory given by +$(TARGET_DIR)+. Only the files required for
-  'documentation' and 'execution' of the package should be
-  installed. Header files should not be installed, they will be copied
-  to the target, if the +development files in target filesystem+
-  option is selected.
+  'execution' of the package have to be
+  installed. Header files, static libraries and documentation will be
+  removed again when the target filesystem is finalized.
 
 * +LIBFOO_INSTALL_STAGING_CMDS+ lists the actions to be
   performed to install the package to the staging directory, when the
diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt
index e9446d2dda..58fd98d4ec 100644
--- a/docs/manual/adding-packages-gettext.txt
+++ b/docs/manual/adding-packages-gettext.txt
@@ -27,16 +27,20 @@ Therefore, Buildroot defines two configuration options:
   doesn't provide its own gettext implementation and if locale support
   is enabled
 
-Therefore, packages that unconditionally need gettext should:
+Packages that need gettext only when locale support is enabled should:
 
-* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT+
+* use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE+ in the
+  +Config.in+ file;
 
-* Use +$(if $(BR2_NEEDS_GETTEXT),gettext)+ in the package
-  +DEPENDENCIES+ variable
+* use +$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)+ in the package
+  +DEPENDENCIES+ variable in the +.mk+ file.
 
-Packages that need gettext only when locale support is enabled should:
+Packages that unconditionally need gettext (which should be very rare)
+should:
+
+* use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT+ in the +Config.in+
+  file;
 
-* Use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE+
+* use +$(if $(BR2_NEEDS_GETTEXT),gettext)+ in the package
+  +DEPENDENCIES+ variable in the +.mk+ file.
 
-* Use +$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)+ in the package
-  +DEPENDENCIES+ variable
diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 5e327d26b9..acdee40e7f 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -19,7 +19,10 @@ In Buildroot, there is some relationship between:
 It is mandatory to maintain consistency between these elements,
 using the following rules:
 
-* the _make_ target name will be the _package name_ itself (e.g.:
+* the package directory and the +*.mk+ name are the _package name_
+  itself (e.g.: +package/foo-bar_boo/foo-bar_boo.mk+);
+
+* the _make_ target name is the _package name_ itself (e.g.:
   +foo-bar_boo+);
 
 * the config entry is the upper case _package name_ with `.` and `-`
@@ -35,15 +38,9 @@ using the following rules:
 How to add a package from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If the package has no release version, or its version cannot be
-identified using tag, then the sha1 of the particular commit should be
-used to identify the version (the first 7 characters of the sha1 are
-enough):
-
-------------------------
-FOO_VERSION = 1234567
-FOO_SITE = http://github.com/<user>/<package>/tarball/<branch>
-------------------------
+Packages on github often don't have a download area with release tarballs.
+However, it is possible to download tarballs directly from the repository
+on github.
 
 If the package version matches a tag, then this tag should be used to
 identify the version:
@@ -52,3 +49,16 @@ identify the version:
 FOO_VERSION = v1.0
 FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
 ------------------------
+
+If the package has no release version, or its version cannot be
+identified using tag, then the SHA1 of the particular commit should be
+used to identify the version (the first 7 characters of the SHA1 are
+enough):
+
+------------------------
+FOO_VERSION = 1234567
+FOO_SITE = http://github.com/<user>/<package>/tarball/<branch>
+------------------------
+
+Note that the name of the tarball is the default +foo-1234567.tar.gz+
+so it is not necessary to specify it in the +.mk+ file.
diff --git a/docs/manual/beyond-buildroot.txt b/docs/manual/beyond-buildroot.txt
index e7b902ddc0..a87b584aa8 100644
--- a/docs/manual/beyond-buildroot.txt
+++ b/docs/manual/beyond-buildroot.txt
@@ -19,6 +19,8 @@ NFS-root directory:
 sudo tar -xavf /path/to/output_dir/rootfs.tar -C /path/to/nfs_root_dir
 -------------------
 
+Remember to add this path to +/etc/exports+.
+
 Then, you can execute a NFS-boot from your target.
 
 Chroot
diff --git a/docs/manual/board-support.txt b/docs/manual/board-support.txt
index 5a4da2c403..44ab6eb645 100644
--- a/docs/manual/board-support.txt
+++ b/docs/manual/board-support.txt
@@ -26,8 +26,8 @@ directory, and rename it +BOARDNAME_defconfig+.
 It is recommended to use upstream versions of the Linux kernel and
 bootloaders where possible, and also to use default kernel and bootloader
 configurations if possible. If the defaults are incorrect for
-your platform, we encourage you to send fixes to the corresponding upstream
-projects.
+your board, or no default exists, we encourage you to send fixes to the
+corresponding upstream projects.
 
 However, in the mean time, you may want to store kernel or bootloader
 configuration or patches specific to your target platform. To do so,
diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 11f6f2861e..2b244120bd 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -37,8 +37,7 @@ Using the Crosstool-NG backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The http://crosstool-ng.org[crosstool-NG] toolchain backend enables a rather
-limited set of settings under the Buildroot +Toolchain+ menu (ie. when invoking
-+make menuconfig+); mostly:
+limited set of settings under the Buildroot +Toolchain+ menu:
 
 * The http://crosstool-ng.org[crosstool-NG] configuration file
 
diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
index 13e675cf40..4befe0a2ad 100644
--- a/docs/manual/download-location.txt
+++ b/docs/manual/download-location.txt
@@ -3,12 +3,12 @@
 Location of downloaded packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-It might be useful to know that the various tarballs that are
-downloaded by the Makefiles are all stored in +DL_DIR+ which by
-default is the +dl+ directory. This is useful, for example, if you want
+The various tarballs that are downloaded by Buildroot are all stored in
++DL_DIR+, which by default is the +dl+ directory. If you want
 to keep a complete version of Buildroot which is known to be working
-with the associated tarballs. This will allow you to regenerate the
-toolchain and the target filesystem with exactly the same versions.
+with the associated tarballs, you can make a copy of this directory.
+This will allow you to regenerate the toolchain and the target filesystem
+with exactly the same versions.
 
 If you maintain several Buildroot trees, it might be better to have a
 shared download location. This can be accessed by creating a symbolic
@@ -26,3 +26,7 @@ should be added to +<~/.bashrc>+.
 -----------------
  $ export BUILDROOT_DL_DIR <shared download location>
 -----------------
+
+The download location can also be set in the +.config+ file, with the
++BR2_DL_DIR+ option. This value is overridden by the +BUILDROOT_DL_DIR+
+environment variable.
diff --git a/docs/manual/embedded-basics.txt b/docs/manual/embedded-basics.txt
index a33338c1df..fdadf62fcd 100644
--- a/docs/manual/embedded-basics.txt
+++ b/docs/manual/embedded-basics.txt
@@ -49,7 +49,9 @@ processor. Under most Linux systems, the compilation toolchain uses
 the GNU libc (glibc) as the C standard library. This compilation
 toolchain is called the "host compilation toolchain". The machine on
 which it is running, and on which you're working, is called the "host
-system".
+system" footnote:[This terminology differs from what is used by GNU
+configure, where the host is the machine on which the application will
+run (which is usually the same as target)].
 
 The compilation toolchain is provided by your distribution, and
 Buildroot has nothing to do with it (other than using it to build a
diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt
index fc75d66279..5a227028e3 100644
--- a/docs/manual/faq-troubleshooting.txt
+++ b/docs/manual/faq-troubleshooting.txt
@@ -98,7 +98,7 @@ deal with expressing the dependencies of this package.
 
 In the +Config.in+ file, dependencies may be expressed following two
 semantics.
-See xref:depends-on-vs-select[].
+See xref:depends-on-vs-select[choosing between _depends_ and _select_].
 
 [[faq-why-not-visible-package]]
 Why are some packages not visible in the Buildroot config menu?
@@ -131,4 +131,8 @@ one, among these:
 * device nodes are not created in the target directory.
 
 For these reasons, commands run through chroot, using the target
-directory as the new root, would fail.
+directory as the new root, will most likely fail.
+
+If you want to run the target filesystem inside a chroot, or as an NFS
+root, then use the tarball image generated in +images/+ and extract it
+as root.
diff --git a/docs/manual/how-buildroot-works.txt b/docs/manual/how-buildroot-works.txt
index 7e33d8e01a..ec08f9520a 100644
--- a/docs/manual/how-buildroot-works.txt
+++ b/docs/manual/how-buildroot-works.txt
@@ -10,25 +10,34 @@ involved in the cross-compilation toolchain (+gcc+, +binutils+ and
 +uClibc+).
 
 There is basically one Makefile per software package, and they are
-named with the +.mk+ extension. Makefiles are split into three main
-sections:
+named with the +.mk+ extension. Makefiles are split into many different
+parts.
 
-* *toolchain* (in the +toolchain/+ directory) contains the Makefiles
+* The +toolchain/+ directory contains the Makefiles
   and associated files for all software related to the
   cross-compilation toolchain: +binutils+, +gcc+, +gdb+,
   +kernel-headers+ and +uClibc+.
 
-* *package* (in the +package/+ directory) contains the Makefiles and
-  associated files for all user-space tools that Buildroot can compile
-  and add to the target root filesystem. There is one sub-directory
-  per tool.
+* The +arch/+ directory contains the definitions for all the processor
+  architectures that are supported by Buildroot.
 
-* *target* (in the +target+ directory) contains the Makefiles and
+* The +package/+ directory contains the Makefiles and
+  associated files for all user-space tools and libraries that Buildroot
+  can compile and add to the target root filesystem. There is one
+  sub-directory per package.
+
+* The +linux/+ directory contains the Makefiles and associated files for
+  the Linux kernel.
+
+* The +boot/+ directory contains the Makefiles and associated files for
+  the bootloaders supported by Buildroot.
+
+* The +system/+ directory contains support for system integration, e.g.
+  the target filesystem skeleton and the selection of an init system.
+
+* The +fs/+ directory contains the Makefiles and
   associated files for software related to the generation of the
-  target root filesystem image. Four types of filesystems are
-  supported: ext2, jffs2, cramfs and squashfs. For each of them there
-  is a sub-directory with the required files. There is also a
-  +default/+ directory that contains the target filesystem skeleton.
+  target root filesystem image.
 
 Each directory contains at least 2 files:
 
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
index 989b285113..0f30234b2e 100644
--- a/docs/manual/legal-notice.txt
+++ b/docs/manual/legal-notice.txt
@@ -73,52 +73,51 @@ License abbreviations
 Here is a list of the licenses that are most widely used by packages in
 Buildroot, with the name used in the manifest file:
 
-* +GPLv2+:
+* `GPLv2`:
   http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
   GNU General Public License, version 2];
-* +GPLv2++:
+* `GPLv2+`:
   http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
   GNU General Public License, version 2]
   or (at your option) any later version;
-* +GPLv3+:
+* `GPLv3`:
   http://www.gnu.org/licenses/gpl.html[
   GNU General Public License, version 3];
-* +GPLv3++:
+* `GPLv3+`:
   http://www.gnu.org/licenses/gpl.html[
   GNU General Public License, version 3]
   or (at your option) any later version;
-* +GPL+:
+* `GPL`:
   http://www.gnu.org/licenses/gpl.html[
   GNU General Public License] (any version);
-* +LGPLv2+:
+* `LGPLv2`:
   http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
   GNU Library General Public License, version 2];
-* +LGPLv2++:
+* `LGPLv2+`:
   http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
   GNU Library General Public License, version 2.1]
   or (at your option) any later version;
-* +LGPLv2.1+:
+* `LGPLv2.1`:
   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
   GNU Lesser General Public License, version 2.1];
-* +LGPLv2.1++:
+* `LGPLv2.1+`:
   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
   GNU Lesser General Public License, version 2.1]
   or (at your option) any later version;
-* +LGPLv3+:
+* `LGPLv3`:
   http://www.gnu.org/licenses/lgpl.html[
   GNU Lesser General Public License, version 3];
-* +LGPLv3++:
+* `LGPLv3+`:
   http://www.gnu.org/licenses/lgpl.html[
   GNU Lesser General Public License, version 3]
   or (at your option) any later version;
-* +LGPL+:
+* `LGPL`:
   http://www.gnu.org/licenses/lgpl.html[
   GNU Lesser General Public License] (any version);
-* +BSD-4c+: Original BSD 4-clause license;
-* +BSD-3c+: BSD 3-clause license;
-* +BSD-2c+: BSD 2-clause license;
-* +PROPRIETARY+: marks a non-opensource package;
-  Buildroot does not save any licensing info or source code for these packages.
+* `BSD-4c`: Original BSD 4-clause license;
+* `BSD-3c`: BSD 3-clause license;
+* `BSD-2c`: BSD 2-clause license;
+* `MIT`: MIT-style license.
 
 Complying with the Buildroot license
 ------------------------------------
diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt
index fc571051a5..27517b3b94 100644
--- a/docs/manual/makedev-syntax.txt
+++ b/docs/manual/makedev-syntax.txt
@@ -27,7 +27,8 @@ There are a few non-trivial blocks here:
   * b: a block device file
   * p: a named pipe
 - +mode+, +uid+ and +gid+ are the usual permissions settings
-- +major+ and +minor+ are here for device files
+- +major+ and +minor+ are here for device files - set to - for other
+  files
 - +start+, +inc+ and +count+ are for when you want to create a batch
   of files, and can be reduced to a loop, beginning at +start+,
   incrementing its counter by +inc+ until it reaches +count+
diff --git a/docs/manual/package-make-target.txt b/docs/manual/package-make-target.txt
index e8d5f530cb..7374957b8c 100644
--- a/docs/manual/package-make-target.txt
+++ b/docs/manual/package-make-target.txt
@@ -2,20 +2,13 @@
 
 [[pkg-build-steps]]
 
-Package make targets
-~~~~~~~~~~~~~~~~~~~~
+Package-specific _make_ targets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A +make <package>+ call achieves several _make targets_ with, as a
-result, this particular package and its dependencies built, installed
-in their destination directory (target, staging or host directory).
+Running +make <package>+ builds and installs that particular package
+and its dependencies.
 
-For packages based on the Buildroot infrastructures (+generic-package+,
-+autotools-package+ or +cmake-package+), each of those
-actions/steps/commands. For packages relying on other build system,
-then there is no other choice than looking at the +.mk+ file (see also
-the xref:rebuild-pkg[]).
-
-For packages relying on the Buildroot infrastructures, there are
+For packages relying on the Buildroot infrastructure, there are
 numerous special make targets that can be called independently like
 this:
 
@@ -23,7 +16,7 @@ this:
 make <package>-<target>
 ------------
 
-In order, the package build commands are:
+The package build targets are (in the order they are executed):
 
 [width="90%",cols="^1,4",options="header"]
 |===================================================
@@ -38,27 +31,22 @@ build the package
 | +extract+         | Put the source in the package build directory
 (extract the tarball, copy the source, etc)
 
-| +patch+           | Apply the patches if any
+| +patch+           | Apply the patches, if any
 
-| +configure+       | Run the configure command
+| +configure+       | Run the configure commands, if any
 
-| +build+           | Compile the source
+| +build+           | Run the compilation commands
 
 | +install-staging+ |
 *target package:* Run the installation of the package in the
-staging directory
-
-*host package:* Does nothing
+staging directory, if necessary
 
 | +install-target+  |
 *target package:* Run the installation of the package in the
-staging directory
-
-*host package:* Does nothing
+target directory, if necessary
 
 | +install+         |
-*target package:* Run the 2 previous installation commands for the
-target packages
+*target package:* Run the 2 previous installation commands
 
 *host package:* Run the installation of the package in the host
 directory
@@ -74,15 +62,18 @@ Additionally, there are some other useful make targets:
 | +show-depends+    | Displays the dependencies required to build the
 package
 
-| +clean+           | Clean the package build directory, also
-uninstall the package from both the target and the staging directory
+| +clean+           | Run the clean command of the package, also
+uninstall the package from both the target and the staging directory; _note
+that this is not implemented for all packages_
 
 | +dirclean+        | Remove the whole package build directory
 
-| +rebuild+         | Rebuild only necessary binaries and install them
-again
+| +rebuild+         | Re-run the compilation commands - this only makes
+sense when using the +OVERRIDE_SRCDIR+ feature or when you modified a file
+directly in the build directory
 
-| +reconfigure+     | Re-run the configure command, then rebuild
-only necessary binaries, and lastly install them again
+| +reconfigure+     | Re-run the configure commands, then rebuild - this only
+makes sense when using the +OVERRIDE_SRCDIR+ feature or when you modified a
+file directly in the build directory
 
 |===================================================
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index b65855edba..9bc6537ca5 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -2,8 +2,8 @@
 
 [[patch-policy]]
 
-Patch Policy
-------------
+Patching a package
+------------------
 
 While integrating a new package or updating an existing one, it may be
 necessary to patch the source of the software to get it cross-built within
@@ -16,15 +16,15 @@ and patches supplied within buildroot.
 Providing patches
 ~~~~~~~~~~~~~~~~~
 
-Additional tarball
-^^^^^^^^^^^^^^^^^^
+Downloaded
+^^^^^^^^^^
 
-If it is necessary to apply a patch set available as a downloadable
-tarball, then add the patch tarball to the +<packagename>_PATCH+
-variable.
+If it is necessary to apply a patch that is available for download, then it
+to the +<packagename>_PATCH+ variable. It is downloaded from the same site
+as the package itself. It can be a single patch, or a tarball containing a
+patch series.
 
-Note that the patch tarballs are downloaded from the same site as the
-sources.
+This method is typically used for packages from Debian.
 
 Within Buildroot
 ^^^^^^^^^^^^^^^^
@@ -72,14 +72,15 @@ modified.
 A message explaining what the patch does, and why it is needed, should
 be added in the header commentary of the patch.
 
-You should add a +signed-off-by+ statement in the header of the each
-patch to help with keeping track of the changes.
+You should add a +Signed-off-by+ statement in the header of the each
+patch to help with keeping track of the changes and to certify that the
+patch is released under the same license as the software that is modified.
 
 If the software is under version control, it is recommended to use the
-SCM software to generate the patch set.
+upstream SCM software to generate the patch set.
 
 Otherwise, concatenate the header with the output of the
-+diff -purN source.c.orig source.c+ command.
++diff -purN package-version.orig/ package-version/+ command.
 
 At the end, the patch should look like:
 
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 38f9a94ae8..17660b7226 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -47,9 +47,6 @@ Mandatory packages
 * Source fetching tools:
 ** +wget+
 
-* Configuration interface dependencies (requires development libraries):
-** +ncurses5+
-
 [[requirement-optional]]
 
 Optional packages
@@ -73,6 +70,7 @@ development context (further details: refer to xref:download-infra[]).
 ** +subversion+
 
 * Configuration interface dependencies (requires development libraries):
+** +ncurses5+ to use the 'menuconfig' interface
 ** +qt4+ to use the 'xconfig' interface
 ** +glib2+, +gtk2+ and +glade2+ to use the 'gconfig' interface
 
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index e677590b42..d6a77a7fcf 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -41,49 +41,37 @@ One of the most common questions asked by Buildroot users is how to
 rebuild a given package or how to remove a package without rebuilding
 everything from scratch.
 
-Removing a package is currently unsupported by Buildroot without
+Removing a package is unsupported by Buildroot without
 rebuilding from scratch. This is because Buildroot doesn't keep track
 of which package installs what files in the +output/staging+ and
-+output/target+ directories. However, implementing clean package
-removal is on the TODO-list of Buildroot developers.
++output/target+ directories, or which package would be compiled differently
+depending on the availability of another package.
 
 The easiest way to rebuild a single package from scratch is to remove
 its build directory in +output/build+. Buildroot will then re-extract,
-re-configure, re-compile and re-install this package from scratch.
+re-configure, re-compile and re-install this package from scratch. You
+can ask buildroot to do this with the +make <package>-dirclean+ command.
 
-For convenience, most packages support the special make targets
-<package>-reconfigure and <package>-rebuild to repeat the configure
-and build steps.
+For convenience, the special make targets
+<package>-reconfigure and <package>-rebuild repeat the configure
+resp. build steps.
 
 However, if you don't want to rebuild the package completely from
 scratch, a better understanding of the Buildroot internals is
 needed. Internally, to keep track of which steps have been done and
 which steps remain to be done, Buildroot maintains stamp files (empty
-files that just tell whether this or that action has been done). The
-problem is that these stamp files are not uniformly named and handled
-by the different packages, so some understanding of the particular
-package is needed.
+files that just tell whether this or that action has been done):
 
-For packages relying on Buildroot packages infrastructures (see
-xref:adding-packages[this section] for details), the following stamp
-files are relevant:
-
-* +output/build/packagename-version/.stamp_configured+. If removed,
+* +output/build/<package>-<version>/.stamp_configured+. If removed,
   Buildroot will trigger the recompilation of the package from the
   configuration step (execution of +./configure+).
 
-* +output/build/packagename-version/.stamp_built+. If removed,
+* +output/build/<package>-<version>/.stamp_built+. If removed,
   Buildroot will trigger the recompilation of the package from the
   compilation step (execution of +make+).
 
-.Notes
-- Since the _Buildroot-2012.11_ release, all packages rely on the
-Buildroot infrastructures.
-- Only toolchain packages remain using custom makefiles (i.e. do not
-use any Buildroot infrastructure).
-- Most, if not all, packages and toolchain packages will progressively
-be ported over to the generic, autotools or CMake infrastructure,
-making it much easier to rebuild individual packages.
+Note: toolchain packages use custom makefiles. Their stamp files are named
+differently.
 
-Further details about package special make target at the
+Further details about package special make targets are explained in
 xref:pkg-build-steps[].
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 9436981f07..6e144d0ddb 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -93,8 +93,8 @@ This directory contains several subdirectories:
   use the tarball image generated in +images/+ and extract it as
   root. Compared to +staging/+, +target/+ contains only the files and
   libraries needed to run the selected target applications: the
-  development files (headers, etc.) are not present, unless the
-  +development files in target filesystem+ option is selected.
+  development files (headers, etc.) are not present, the binaries are
+  stripped.
 
 * +host/+ contains the installation of tools compiled for the host
   that are needed for the proper execution of Buildroot, including the
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index 2a61639f0b..f6382b56dc 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -1,16 +1,18 @@
 // -*- mode:doc; -*-
 
-Writing rules
--------------
+Coding style
+------------
 
-Overall, these writing rules are here to help you add new files in
+Overall, these coding style rules are here to help you to add new files in
 Buildroot or refactor existing ones.
 
 If you slightly modify some existing file, the important thing is
-keeping the consistency of the whole file, so you can:
-* either follow the potentially deprecated rules used all over this
-file
-* or entirely rework it in order to make it comply with those rules.
+to keep the consistency of the whole file, so you can:
+
+* either follow the potentially deprecated coding style used in this
+file,
+
+* or entirely rework it in order to make it comply with these rules.
 
 [[writing-rules-config-in]]
 
@@ -39,9 +41,9 @@ config BR2_PACKAGE_LIBFOO
 * The help text itself should be indented with one tab and two
   spaces.
 
-The configuration system used in Buildroot, so the content of the
-+Config.in+ files, is regular _Kconfig_. Further details about
-_Kconfig_: refer to
+The +Config.in+ files are the input for the configuration tool
+used in Buildroot, which is the regular _Kconfig_. For further
+details about the _Kconfig_ language, refer to
 http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[].
 
 [[writing-rules-mk]]
@@ -55,15 +57,26 @@ The +.mk+ file
 LIBFOO_VERSION = 1.0
 LIBFOO_CONF_OPT += --without-python-support
 ---------------------
++
+It is also possible to align the +=+ signs:
++
+---------------------
+LIBFOO_VERSION   = 1.0
+LIBFOO_SOURCE    = foo-$(LIBFOO_VERSION).tar.gz
+LIBFOO_CONF_OPT += --without-python-support
+---------------------
 
 * Indentation: use tab only:
 +
 ---------------------
 define LIBFOO_REMOVE_DOC
-$(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \
-	$(TARGET_DIR)/usr/share/man/man3/libfoo*
+	$(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \
+		$(TARGET_DIR)/usr/share/man/man3/libfoo*
 endef
 ---------------------
++
+Note that commands inside a +define+ block should always start with a tab,
+so _make_ recognizes them as commands.
 
 * Optional dependency:
 

From 13562ddd2ac2f15e14d5f244675bc3ab2bc63fb2 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 27 Nov 2012 11:59:18 +0000
Subject: [PATCH 3378/6849] manual: more warnings to not use output/target

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/using.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 6e144d0ddb..857aa333b3 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -86,7 +86,8 @@ This directory contains several subdirectories:
 * +target/+ which contains 'almost' the complete root filesystem for
   the target: everything needed is present except the device files in
   +/dev/+ (Buildroot can't create them because Buildroot doesn't run
-  as root and doesn't want to run as root). Therefore, this directory
+  as root and doesn't want to run as root). Also, it doesn't have the correct
+  permissions (e.g. setuid for the busybox binary). Therefore, this directory
   *should not be used on your target*.  Instead, you should use one of
   the images built in the +images/+ directory. If you need an
   extracted image of the root filesystem for booting over NFS, then

From 50b32848c2e8065a4b3646a5e0c17a0adb54781e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 27 Nov 2012 11:59:19 +0000
Subject: [PATCH 3379/6849] manual: give example where _INSTALL_TARGET = NO

The tutorial for autotools-package and cmake-package currently gives
the bad example of setting _INSTALL_TARGET to YES, which is the default.
So change this into an example with _INSTALL_TARGET = NO, and explain in
which case this is relevant.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt | 16 ++++++++--------
 docs/manual/adding-packages-cmake.txt     | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 4127df46ee..84d76f929d 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -21,8 +21,8 @@ package, with an example :
 07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
 08: LIBFOO_SITE = http://www.foosoftware.org/download
 09: LIBFOO_INSTALL_STAGING = YES
-10: LIBFOO_INSTALL_TARGET = YES
-11: LIBFOO_CONF_OPT = --enable-shared
+10: LIBFOO_INSTALL_TARGET = NO
+11: LIBFOO_CONF_OPT = --disable-shared
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
 13:
 14: $(eval $(autotools-package))
@@ -44,13 +44,13 @@ other libraries or applications depending on them. Also by default, when
 staging installation is enabled, packages are installed in this location
 using the +make install+ command.
 
-On line 10, we tell Buildroot to also install the package to the
+On line 10, we tell Buildroot to not install the package to the
 target directory. This directory contains what will become the root
-filesystem running on the target. Usually, we try not to install header
-files and to install stripped versions of the binary. By default, target
-installation is enabled, so in fact, this line is not strictly
-necessary. Also by default, packages are installed in this location
-using the +make install+ command.
+filesystem running on the target. For purely static libraries, it is
+not necessary to install them in the target directory because they will
+not be used at runtime. By default, target installation is enabled; setting
+this variable to NO is almost never needed. Also by default, packages are
+installed in this location using the +make install+ command.
 
 On line 11, we tell Buildroot to pass a custom configure option, that
 will be passed to the +./configure+ script before configuring
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index 4a9e893f27..bb1705bfd9 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -21,7 +21,7 @@ with an example :
 07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
 08: LIBFOO_SITE = http://www.foosoftware.org/download
 09: LIBFOO_INSTALL_STAGING = YES
-10: LIBFOO_INSTALL_TARGET = YES
+10: LIBFOO_INSTALL_TARGET = NO
 11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
 12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
 13:
@@ -44,13 +44,13 @@ other libraries or applications depending on them. Also by default, when
 staging installation is enabled, packages are installed in this location
 using the +make install+ command.
 
-On line 10, we tell Buildroot to also install the package to the
+On line 10, we tell Buildroot to not install the package to the
 target directory. This directory contains what will become the root
-filesystem running on the target. Usually, we try not to install header
-files and to install stripped versions of the binary. By default, target
-installation is enabled, so in fact, this line is not strictly
-necessary. Also by default, packages are installed in this location
-using the +make install+ command.
+filesystem running on the target. For purely static libraries, it is
+not necessary to install them in the target directory because they will
+not be used at runtime. By default, target installation is enabled; setting
+this variable to NO is almost never needed. Also by default, packages are
+installed in this location using the +make install+ command.
 
 On line 11, we tell Buildroot to pass custom options to CMake when it is
 configuring the package.

From 722b82f05bd7e2b46661c721daad99125e655b76 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 27 Nov 2012 11:59:20 +0000
Subject: [PATCH 3380/6849] manual: restructure 'Adding packages' chapter

The depends-on-vs-select part of the manual really deserves its own
section title (especially because it is referred to and the xref gets
a 'sinpara' in PDF if the section doesn't have a title). So restructure
the surrounding sections to reduce the section nesting depth.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 5903ed11cb..5d17aace99 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -13,7 +13,7 @@ New subdirectories are discouraged, however.
 
 
 +Config.in+ file
-^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~
 
 Then, create a file named +Config.in+. This file will contain the
 option descriptions related to our +libfoo+ software that will be used
@@ -51,6 +51,9 @@ source "package/libfoo/Config.in"
 --------------------------
 
 [[depends-on-vs-select]]
+Choosing +depends on+ or +select+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 The +Config.in+ file of your package must also ensure that
 dependencies are enabled. Typically, Buildroot uses the following
 rules:
@@ -164,7 +167,7 @@ Further formatting details: see xref:writing-rules-config-in[the
 coding style].
 
 The +.mk+ file
-^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~
 
 Finally, here's the hardest part. Create a file named +libfoo.mk+. It
 describes how the package should be downloaded, configured, built,

From 008f635d29310b55e0bb3e9a1a6009f12f7f7400 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Nov 2012 04:07:01 +0000
Subject: [PATCH 3381/6849] toolchain-external: add Linaro 2012.11

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f04ced6974..56630fa4fc 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,23 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
+	bool "Linaro 2012.11"
+	depends on BR2_arm
+	depends on BR2_cortex_a8 || BR2_cortex_a9
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.11 (based on gcc 4.7), Linaro GDB 2012.10 (based on
+	  GDB 7.5), eglibc 2.15. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	bool "Linaro 2012.10"
 	depends on BR2_arm
@@ -627,6 +644,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a6025dbdd9..d98fcc6b82 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -193,6 +193,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.09-20120921_linux.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.10/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From ba60360e412663f581848c9f61d1b4dd6c4edce2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Nov 2012 04:07:02 +0000
Subject: [PATCH 3382/6849] toolchain-external: remove Linaro 2012.08

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ------------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 56630fa4fc..469c2830b9 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -54,23 +54,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
-	bool "Linaro 2012.08"
-	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.08 (based on gcc 4.7), Linaro GDB 2012.06 (based on
-	  GDB 7.4), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
-
-	  To use this toolchain, you must disable soft float usage.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
@@ -641,7 +624,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index d98fcc6b82..4429480af2 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -184,9 +184,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_08),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.08/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.08-20120827_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.09/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.09-20120921_linux.tar.bz2

From 90f763c77d2316c2fdefa1301e96d5b31376e2cf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Nov 2012 04:07:03 +0000
Subject: [PATCH 3383/6849] toolchain-external: on ARM, show comment about the
 availability of Linaro toolchains

On ARM, Linaro external toolchains are only visible if the user
selects Cortex-A8 or Cortex-A9. Therefore, we add a comment that tells
the user that the Linaro toolchains are only available under those
conditions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 469c2830b9..4fe605d861 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -54,6 +54,10 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 
 	  To use this toolchain, you must disable soft float usage.
 
+comment "Linaro toolchains available for Cortex-A{8,9}"
+	depends on BR2_arm
+	depends on !BR2_cortex_a8 && !BR2_cortex_a9
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm

From 737d92d9c271093e76a47d1e7c90b3c1e315f16a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Nov 2012 03:24:02 +0000
Subject: [PATCH 3384/6849] hiawatha: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in
index 431a9fa1b0..ac0aa102f1 100644
--- a/package/hiawatha/Config.in
+++ b/package/hiawatha/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_HIAWATHA
 	bool "hiawatha"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  Hiawatha is a webserver for Unix and has been built with
 	  security in mind. This resulted in a highly secure

From 9e12a985a118c3157d74857e395c4af5b153db84 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Nov 2012 03:24:03 +0000
Subject: [PATCH 3385/6849] libdaemon: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/Config.in     | 2 ++
 package/ifplugd/Config.in   | 2 ++
 package/libdaemon/Config.in | 2 ++
 package/nss-mdns/Config.in  | 2 ++
 package/radvd/Config.in     | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 8ba33d5e70..e2f8c53f84 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_AVAHI
 	bool "avahi"
+	# libdaemon uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Avahi is a system which facilitates service
diff --git a/package/ifplugd/Config.in b/package/ifplugd/Config.in
index 0311ad73e3..cbb5128c4a 100644
--- a/package/ifplugd/Config.in
+++ b/package/ifplugd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_IFPLUGD
 	bool "ifplugd"
+	# libdaemon uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBDAEMON
 	help
 	  Ifplugd is a daemon which will automatically configure your
diff --git a/package/libdaemon/Config.in b/package/libdaemon/Config.in
index 69432630d6..bfcedc1968 100644
--- a/package/libdaemon/Config.in
+++ b/package/libdaemon/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBDAEMON
 	bool "libdaemon"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  libdaemon is a lightweight C library that eases the
 	  writing of UNIX daemons.
diff --git a/package/nss-mdns/Config.in b/package/nss-mdns/Config.in
index 485cfcd084..1df0ce4b3a 100644
--- a/package/nss-mdns/Config.in
+++ b/package/nss-mdns/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_NSS_MDNS
 	bool "nss-mdns"
+	# libdaemon->avahi uses fork()
+	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc
 	depends on BR2_PACKAGE_AVAHI_DAEMON
 	help
diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index 90c1fd4cfb..d0d9d70915 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_RADVD
 	bool "radvd"
+	# libdaemon uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_FLEX
 	select BR2_PACKAGE_FLEX_LIBFL
 	select BR2_PACKAGE_LIBDAEMON

From de75da8b13e53f995811a48316882efd753d428d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 28 Nov 2012 04:42:38 +0000
Subject: [PATCH 3386/6849] libpcap: fix static build

The libpcap package contained some interesting attempts to support a
static-only build, but it was not working:

 http://autobuild.buildroot.org/results/01038d3b970092d894d2bae80679247e65722785/build-end.log

In fact the configure.in of libpcap has provision to support
--enable-shared/--disable-shared, but the generated configure script
in the libpcap package has not been regenerated with the configure.in
changes.

So basically, enabling LIBPCAP_AUTORECONF=YES ensures that the
configure script gets generated, which brings us a working
--enable-shared / --disable-shared.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpcap/libpcap.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 7a1d32f40e..d35c22824b 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -10,11 +10,16 @@ LIBPCAP_LICENSE = BSD-3c
 LIBPCAP_LICENSE_FILES = LICENSE
 LIBPCAP_INSTALL_STAGING = YES
 
-# doesn't have an install-strip
-LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
-	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
-LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
-	$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
+# The configure.in file contains the necessary code to handle
+# --enable-shared/--disable-shared properly, but the configure script
+# bundled with the libpcap tarball is not up-to-date with the
+# configure.in file. In order to get proper handling of
+# --enable-shared/--disable-shared, which is needed when doing a
+# static library build, we autoreconfigure this package. This can be
+# removed when bumping libpcap, after checking that the bundled
+# configure script correctly handles --enable-shared/--disable-shared.
+LIBPCAP_AUTORECONF = YES
+
 LIBPCAP_DEPENDENCIES = zlib \
 	$(if $(BR2_PACKAGE_LIBUSB),libusb)
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \

From 660d16f490500ce02c3e4eb78384bfa08a5589c5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 28 Nov 2012 04:36:14 +0000
Subject: [PATCH 3387/6849] binutils: not available for the target on AArch64

Fixes:

  http://autobuild.buildroot.org/results/74082860f607cbd857654e9504f5f7e7ae47c0ac/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in | 1 +
 package/oprofile/Config.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index 64803706e3..38d519a4c2 100644
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BINUTILS
 	bool "binutils"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	depends on !BR2_aarch64
 	help
 	  Install binutils on the target
 
diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index 562c9105e9..8c881d15ee 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_OPROFILE
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_BINUTILS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_aarch64 # binutils
 	help
 	  OProfile is a system-wide profiler for Linux systems,
 	  capable of profiling all running code at low overhead.

From 21a0c11a90f9ff19c78a5f32e0a2e9064fd28054 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 28 Nov 2012 06:34:52 +0000
Subject: [PATCH 3388/6849] gdb: properly pass the PATH when building gdb for
 the host

When building gdb for the host, we properly pass the PATH (through
HOST_CONFIGURE_OPTS) during the configure step, but we forget to do so
for the compilation step.

The result of this is that when the Crosstool-NG backend is used, gawk
is built and installed in $(HOST_DIR), as a dependency of the
crosstool-ng package.

Then, the host gdb configure script detects this gawk binary
($(HOST_DIR) is in the PATH), and assumes gawk is
available. Unfortunately, during the compilation step, it fails to
find the expected gawk binary, because $(HOST_DIR) is no longer in the
PATH. This causes the following build failure:

  http://autobuild.buildroot.org/results/067d0c2ea01673ba98ec11de2426f1ab92dac800/build-end.log

In order to fix this, we simply call the compilation step of gdb for
the host with $(HOST_MAKE_ENV), as it should have been done from the
beginning.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/gdb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index c42c755467..4b8fe3a3d5 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -196,6 +196,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked
 
 $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured
 	# force ELF support since it fails due to BFD linking problems
+	$(HOST_MAKE_ENV) \
 	gdb_cv_var_elf=yes \
 	$(MAKE) -C $(GDB_HOST_DIR)
 	strip $(GDB_HOST_DIR)/gdb/gdb

From 58c72c00466668ce168111048de1b2050687ad2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau@advansee.com>
Date: Wed, 28 Nov 2012 08:35:16 +0000
Subject: [PATCH 3389/6849] ccache: Fix URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ccache/Config.in b/package/ccache/Config.in
index f4f7f8f9cb..4a37973623 100644
--- a/package/ccache/Config.in
+++ b/package/ccache/Config.in
@@ -5,5 +5,5 @@ config BR2_PACKAGE_CCACHE
 	  caching previous compilations and detecting when the same
 	  compilation is being done again
 
-	  http://samba.ccache.org
+	  http://ccache.samba.org
 

From 6d58aed1b0493e2f21ba195ecc3bcad814803c48 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Nov 2012 10:07:08 +0000
Subject: [PATCH 3390/6849] kernel-headers: bump 3.{0, 4, 6}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.52-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d24e7f9c7b..12b3956afc 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.52"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.53"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.34"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.19"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.20"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.7"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.8"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.52-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.52-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch

From 7c9549e84f80d66fcb685a9f2c9b8e44e086c883 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 28 Nov 2012 10:07:09 +0000
Subject: [PATCH 3391/6849] linux: bump 3.6.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index e24273cbd1..f408ad55c9 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6.7"
+	bool "3.6.8"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.7" if BR2_LINUX_KERNEL_3_6
+	default "3.6.8" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From dd6c3d5fc769a1cd11e4f86147bc63103093fcdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau@advansee.com>
Date: Wed, 28 Nov 2012 08:35:32 +0000
Subject: [PATCH 3392/6849] ccache: Bump version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/ccache.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index b9c2039cf3..1cbad6e75c 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-CCACHE_VERSION = 3.1.7
+CCACHE_VERSION = 3.1.8
 CCACHE_SITE    = http://samba.org/ftp/ccache
 CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
 

From d490bb6c371468d027e228a445c258af4a272ba7 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Thu, 29 Nov 2012 07:11:58 +0000
Subject: [PATCH 3393/6849] strace: remove undef-CTL_PROC patch

This patch is no longer necessary since strace-v4.5.15 which always
defines CTL_PROC. Specifically strace git commit
35a55785ea8ff44d214af52085e3a5ea624730aa.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/strace-undef-CTL_PROC.patch | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 package/strace/strace-undef-CTL_PROC.patch

diff --git a/package/strace/strace-undef-CTL_PROC.patch b/package/strace/strace-undef-CTL_PROC.patch
deleted file mode 100644
index d841999d29..0000000000
--- a/package/strace/strace-undef-CTL_PROC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/system.c
-+++ b/system.c
-@@ -1614,7 +1614,9 @@ static const struct xlat sysctl_root[] =
- 	{ CTL_KERN, "CTL_KERN" },
- 	{ CTL_VM, "CTL_VM" },
- 	{ CTL_NET, "CTL_NET" },
-+#ifdef CTL_PROC
- 	{ CTL_PROC, "CTL_PROC" },
-+#endif
- 	{ CTL_FS, "CTL_FS" },
- 	{ CTL_DEBUG, "CTL_DEBUG" },
- 	{ CTL_DEV, "CTL_DEV" },

From ba66de55ffc6a331a69ceac42a065da2200f905e Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:17:59 +0000
Subject: [PATCH 3394/6849] linux-fusion: fix build

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../linux-fusion-fix-include.patch            | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 package/linux-fusion/linux-fusion-fix-include.patch

diff --git a/package/linux-fusion/linux-fusion-fix-include.patch b/package/linux-fusion/linux-fusion-fix-include.patch
new file mode 100644
index 0000000000..fe91488a9a
--- /dev/null
+++ b/package/linux-fusion/linux-fusion-fix-include.patch
@@ -0,0 +1,52 @@
+Fix directfb-fusion kernel module build.
+
+This patch avoids the following error occurs:
+
+/usr/bin/make -f scripts/Makefile.build obj=/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion /opt/br/output/host/usr/bin/ccache 
+  /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -Wp,-MD,/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/.fusioncore_impl.o.d
+  -nostdinc -isystem /opt/br/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/include -I/opt/br/output/build/linux-3.6/arch/arm/include 
+  -Iarch/arm/include/generated -Iinclude  -include /opt/br/output/build/linux-3.6/include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Iarch/arm/mach-versatile/include
+  -Iarch/arm/plat-versatile/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/br/output/build/linux-fusion-8.8.1/linux/include -Wall -Wundef 
+  -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -O2 -marm 
+  -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -funwind-tables -D__LINUX_ARM_ARCH__=5 -march=armv5te -mtune=arm9tdmi -msoft-float -Uarm -Wframe-larger-than=1024
+  -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack  -DMODULE
+  -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(fusioncore_impl)"  -D"KBUILD_MODNAME=KBUILD_STR(fusion)" -c -o 
+/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o /opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
+/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c:25:19: fatal error: debug.h: No such file or directory
+compilation terminated.
+make[3]: *** [/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o] Error 1
+make[2]: *** [_module_/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion] Error 2
+make[2]: Leaving directory `/opt/br/output/build/linux-3.6'
+make[1]: *** [modules] Error 2
+make[1]: Leaving directory `/opt/br/output/build/linux-fusion-8.8.1'
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h
+--- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h	2012-10-15 21:47:53.881834496 +0200
++++ linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h	2012-10-15 22:05:27.232401023 +0200
+@@ -17,7 +17,7 @@
+ 
+ #include <linux/stddef.h>
+ 
+-#include "fusioncore_impl.h"
++#include "single/fusioncore_impl.h"
+ 
+ typedef enum {
+      FC_OK,
+diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
+--- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c	2012-10-15 21:47:53.878501243 +0200
++++ linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c	2012-10-15 22:05:38.585511304 +0200
+@@ -22,9 +22,9 @@
+ #include <linux/slab.h>
+ #include <linux/sched.h>
+ 
+-#include "debug.h"
++#include "../debug.h"
+ 
+-#include "fusioncore.h"
++#include "../fusioncore.h"
+ 
+ 
+ 

From 0f9bad95a08fad5469185628ef91f446ea616d48 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Nov 2012 23:00:40 -0800
Subject: [PATCH 3395/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES b/CHANGES
index f8ac04b6c6..0da2d77ccd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+2012.11, Not released yet:
+
+	Minor fixes around the tree.
+
+	Various manual updates and fixes.
+
+	Updated/fixed packages: arptables, binutils, busybox, ccache,
+	cjson, directfb, gdb, hiawatha, lcdproc, libdaemon, libecore,
+	libhid, libpcap, libusb, linux-fusion, ocf-linux, strace,
+
 2012.11-rc1, Released November 17th, 2012
 
 	Fixes all over the tree and new features.

From 2b7be2f1de3eec185a720310d418719ccc3f22f2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Nov 2012 23:05:44 -0800
Subject: [PATCH 3396/6849] alsa-lib: fix static linking check

Closes #5732

The symbol for static linking is BR2_PREFER_STATIC_LIB.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                      | 4 ++++
 package/alsa-lib/alsa-lib.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0da2d77ccd..db7b233ed6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,10 @@
 	cjson, directfb, gdb, hiawatha, lcdproc, libdaemon, libecore,
 	libhid, libpcap, libusb, linux-fusion, ocf-linux, strace,
 
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5732: Error : package/alsa-lib/alsa-lib.mk
+
 2012.11-rc1, Released November 17th, 2012
 
 	Fixes all over the tree and new features.
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index daa551d399..eddd3d2f36 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -17,7 +17,7 @@ ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVD
 		    --without-versioned
 
 # Can't build with static & shared at the same time (1.0.25+)
-ifeq ($(BR2_PREFER_STATIC),y)
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
 ALSA_LIB_CONF_OPT += --enable-shared=no
 else
 ALSA_LIB_CONF_OPT += --enable-static=no

From 40f175b37ad15969e297c566037fc3ffd15541b3 Mon Sep 17 00:00:00 2001
From: Charles Manning <cdhmanning@gmail.com>
Date: Thu, 29 Nov 2012 15:41:51 +0000
Subject: [PATCH 3397/6849] Change Filesystem utilities heading because it has
 mtd utils too.

Changing it to Filesystem and flash utilities gives far better navigation
for mtd utils.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 5d9783ad59..15d7ad66f5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -177,7 +177,7 @@ source "package/xterm/Config.in"
 source "package/xvkbd/Config.in"
 endmenu
 
-menu "Filesystem utilities"
+menu "Filesystem and flash utilities"
 source "package/cifs-utils/Config.in"
 source "package/cramfs/Config.in"
 source "package/dosfstools/Config.in"

From b17c7963890354d2cffdda2f16eeeaf4c1288e99 Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Thu, 29 Nov 2012 17:20:58 +0000
Subject: [PATCH 3398/6849] libroxml: bump version to 2.2.1

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{libroxml-2.2.0-werror.patch => libroxml-werror.patch}  | 6 +++---
 package/libroxml/libroxml.mk                                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/libroxml/{libroxml-2.2.0-werror.patch => libroxml-werror.patch} (86%)

diff --git a/package/libroxml/libroxml-2.2.0-werror.patch b/package/libroxml/libroxml-werror.patch
similarity index 86%
rename from package/libroxml/libroxml-2.2.0-werror.patch
rename to package/libroxml/libroxml-werror.patch
index a72f2a786e..a99962f30f 100644
--- a/package/libroxml/libroxml-2.2.0-werror.patch
+++ b/package/libroxml/libroxml-werror.patch
@@ -7,10 +7,10 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: libroxml-2.1.0/Makefile
+Index: a/Makefile
 ===================================================================
---- libroxml-2.1.0.orig/Makefile
-+++ libroxml-2.1.0/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -41,7 +41,7 @@
  
  # options
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 457a28a816..d7ef6a48df 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -2,7 +2,7 @@
 # libroxml
 #
 
-LIBROXML_VERSION = 2.2.0
+LIBROXML_VERSION = 2.2.1
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 

From f27ec358ef9b6ecfc0204a3e9e899a778c55bfe8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Nov 2012 23:25:09 -0800
Subject: [PATCH 3399/6849] cramfs.mk: drop invalid -q option

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cramfs/cramfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index 9b0141f48b..55f6bdbf98 100644
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -10,7 +10,7 @@ CRAMFS_OPTS=-l
 endif
 
 define ROOTFS_CRAMFS_CMD
- $(HOST_DIR)/usr/bin/mkcramfs -q $(CRAMFS_OPTS) $(TARGET_DIR) $$@
+ $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $$@
 endef
 
 ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs

From fc50f0c372d8c49dc713b11e756c1d940163b496 Mon Sep 17 00:00:00 2001
From: Tim Sheridan <Tim.Sheridan@imgtec.com>
Date: Mon, 26 Nov 2012 01:26:04 +0000
Subject: [PATCH 3400/6849] gstreamer: Added option to disable plugin registry.

The plugin registry can take a while to be generated when GStreamer is
initialized. Turning it off can speed up up GStreamer application launch
times. Default behaviour is unchanged.

Signed-off-by: Tim Sheridan <tim.sheridan@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/Config.in    | 14 +++++++++++---
 package/multimedia/gstreamer/gstreamer.mk |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 4d279b8b1c..9a6748106b 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -12,9 +12,17 @@ config BR2_PACKAGE_GSTREAMER_GST_DEBUG
 	default y
 	depends on BR2_PACKAGE_GSTREAMER
 	help
-	  Enable support for the gst-debug tracing functionality
-	  in gstreamer. This has limited CPU overhead, but does
-	  increase the rootfs size somewhat.
+	  Enable support for the gst-debug tracing functionality in gstreamer.
+	  This has limited CPU overhead, but does increase the rootfs size
+	  somewhat.
+
+config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
+	bool "enable plugin registry"
+	default y
+	depends on BR2_PACKAGE_GSTREAMER
+	help
+	  Enable support for the GStreamer plugin registry. This may increase
+	  the launch-time for a GStreamer application.
 
 comment "gstreamer requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index a9841b17c0..b87f0294ff 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -21,7 +21,8 @@ GSTREAMER_CONF_OPT = \
 		--disable-tests \
 		--disable-failing-tests \
 		--disable-loadsave \
-		$(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug)
+		$(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \
+		$(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry)
 
 GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf
 

From 1bed3e388a91c7a4ce78eeaa6f958774ab772cb1 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:18:08 +0000
Subject: [PATCH 3401/6849] linux-fusion: bump to version 8.10.4

Also fix directfb build avoiding the following error to occur
(since FCEF_FOLLOW has been added in linux-fusion-8.9.0):

libtool: compile:  /opt/br/output/host/usr/bin/ccache /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../lib -I../../include -I../../lib -DDATADIR=\"/usr/share/directfb-1.4.17\" -DMODULEDIR=\"/usr/lib/directfb-1.4-6\" -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -ffast-math -pipe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -g2 -g3 -fno-inline -Wno-inline -D_GNU_SOURCE -finstrument-functions -std=gnu99 -Werror-implicit-function-declaration -MT call.lo -MD -MP -MF .deps/call.Tpo -c call.c  -fPIC -DPIC -o .libs/call.o
call.c: In function 'fusion_call_execute3':
call.c:311:66: error 'FCEF_FOLLOW' undeclared (first use in this function)
call.c:311:66: note: each undeclared identifier is reported only once for each function it appears in
call.c: In function 'fusion_world_flush_calls':
call.c:444:54: error 'FCEF_FOLLOW' undeclared (first use in this function)
make[5]: *** [call.lo] Error 1
make[5]: Leaving directory `/opt/br/output/build/directfb-1.4.17/lib/fusion'

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-fusion/linux-fusion.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index feb1ab32eb..631f526887 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
 # linux-fusion
 #
 #############################################################
-LINUX_FUSION_VERSION = 8.8.1
+LINUX_FUSION_VERSION = 8.10.4
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES

From 069eccfc7185ebb514f0f1822ddfc8dd261a8841 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:18:12 +0000
Subject: [PATCH 3402/6849] libmad: add license info

[Peter: license is GPLv2+ as pointed out by Arnout]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmad/libmad.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index d9ce0aed88..09f3cdb764 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -8,6 +8,8 @@ LIBMAD_VERSION = 0.15.1b
 LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
 LIBMAD_INSTALL_STAGING = YES
 LIBMAD_LIBTOOL_PATCH = NO
+LIBMAD_LICENSE = GPLv2+
+LIBMAD_LICENSE_FILES = COPYING
 
 define LIBMAD_PREVENT_AUTOMAKE
 	# Prevent automake from running.

From 75817ecd1edf2b67b2dcc395df6079182189f577 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 22 Nov 2012 01:18:13 +0100
Subject: [PATCH 3403/6849] scons: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/scons/scons.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 7cc234e8b8..d2489a021c 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,6 +1,8 @@
 SCONS_VERSION = 2.0.1
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
+SCONS_LICENSE = MIT
+SCONS_LICENSE_FILES = LICENSE.txt
 
 define HOST_SCONS_BUILD_CMDS
 	(cd $(@D); python setup.py build)

From 5e6d537eb7c4805943a2bceb0e1fb338bbf42ab5 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:18:17 +0000
Subject: [PATCH 3404/6849] imagemagick: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imagemagick/imagemagick.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 61a379de64..0476ace702 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -11,6 +11,9 @@ IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
 # available, which is annoying. Use an alternate site that keeps all
 # older versions.
 IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick/
+IMAGEMAGICK_LICENSE = Apache-v2
+IMAGEMAGICK_LICENSE_FILES = LICENSE
+
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 

From 82583bf4b7765df6edad45aaec0aba0ddbd571a7 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:17:58 +0000
Subject: [PATCH 3405/6849] owl-linux: update help text about linux kernel
 dependencies.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/owl-linux/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
index f6e18d557d..1dcf5f1930 100644
--- a/package/owl-linux/Config.in
+++ b/package/owl-linux/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_OWL_LINUX
 	help
 	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
 
+	  owl-linux requires the hidden kernel option WIRELESS_EXT enabled.
+
 	  http://linux.hd-wireless.se/bin/view/Linux/GettingStarted
 
 comment "owl-linux requires a Linux kernel"

From 7e9f8ad164e4776ff89e0f7d674e77032a472d54 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 30 Nov 2012 02:39:11 +0000
Subject: [PATCH 3406/6849] snowball-hdmiservice: new package

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (on various archs and toolchains)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/snowball-hdmiservice/Config.in        | 10 +++++
 .../snowball-hdmiservice.mk                   | 41 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/snowball-hdmiservice/Config.in
 create mode 100644 package/snowball-hdmiservice/snowball-hdmiservice.mk

diff --git a/package/Config.in b/package/Config.in
index f3ca496538..663a17be9b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -250,6 +250,7 @@ source "package/sane-backends/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
 source "package/smartmontools/Config.in"
+source "package/snowball-hdmiservice/Config.in"
 source "package/sredird/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
diff --git a/package/snowball-hdmiservice/Config.in b/package/snowball-hdmiservice/Config.in
new file mode 100644
index 0000000000..0ea7c8120e
--- /dev/null
+++ b/package/snowball-hdmiservice/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SNOWBALL_HDMISERVICE
+	bool "snowball-hdmiservice"
+	depends on BR2_TOOLCHAIN_HAS_THREADS	
+	help
+	  HDMI userspace control daemon
+
+	  This package contains the HDMI userspace control daemon for the 
+	  snowball board
+	  
+	  http://www.igloocommunity.org
diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.mk b/package/snowball-hdmiservice/snowball-hdmiservice.mk
new file mode 100644
index 0000000000..ebd65dfba7
--- /dev/null
+++ b/package/snowball-hdmiservice/snowball-hdmiservice.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# snowball-hdmiservice
+#
+#############################################################
+SNOWBALL_HDMISERVICE_VERSION = f75c99d1c52707240a78b4ba78e41d20d3aa3b08
+SNOWBALL_HDMISERVICE_SITE = git://igloocommunity.org/git/bsp/hdmiservice.git
+SNOWBALL_HDMISERVICE_LICENSE = MIT
+SNOWBALL_HDMISERVICE_LICENSE_FILES = debian/copyright
+SNOWBALL_HDMISERVICE_INSTALL_STAGING = YES
+
+define SNOWBALL_HDMISERVICE_BUILD_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" 	
+endef
+
+define SNOWBALL_HDMISERVICE_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(STAGING_DIR) install
+endef
+
+define SNOWBALL_HDMISERVICE_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(TARGET_DIR) install
+endef
+
+define SNOWBALL_HDMISERVICE_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/usr/lib/hdmiservice.so
+	rm -f $(STAGING_DIR)/usr/bin/hdmistart
+	rm -f $(STAGING_DIR)/usr/include/hdmi_service_api.h
+	rm -f $(STAGING_DIR)/usr/include/hdmi_service_local.h
+endef
+
+define SNOWBALL_HDMISERVICE_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/hdmiservice.so
+	rm -f $(TARGET_DIR)/usr/bin/hdmistart
+endef
+
+define SNOWBALL_HDMISERVICE_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+
+$(eval $(generic-package))

From 367096b0e33913f47545ef8702eaa609960baa1f Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 30 Nov 2012 02:39:12 +0000
Subject: [PATCH 3407/6849] ux500-firmware: new package

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (with the calao_snowball_defconfig)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/ux500-firmware/Config.in         |  7 +++++++
 package/ux500-firmware/ux500-firmware.mk | 22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/ux500-firmware/Config.in
 create mode 100644 package/ux500-firmware/ux500-firmware.mk

diff --git a/package/Config.in b/package/Config.in
index 663a17be9b..c369f74ac7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -261,6 +261,7 @@ source "package/usb_modeswitch/Config.in"
 source "package/usb_modeswitch_data/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
+source "package/ux500-firmware/Config.in"
 source "package/wipe/Config.in"
 endmenu
 
diff --git a/package/ux500-firmware/Config.in b/package/ux500-firmware/Config.in
new file mode 100644
index 0000000000..7e8a94b2a4
--- /dev/null
+++ b/package/ux500-firmware/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_UX500_FIRMWARE
+	bool "ux500-firmware"
+	help
+	  This package provides various binary firmware files (closed binary blobs)
+	  for the Azurewave AW-NH580 combo module (wifi, bt, gps).
+
+	  https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files/
diff --git a/package/ux500-firmware/ux500-firmware.mk b/package/ux500-firmware/ux500-firmware.mk
new file mode 100644
index 0000000000..d354468ab6
--- /dev/null
+++ b/package/ux500-firmware/ux500-firmware.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# ux500-firmware
+#
+#############################################################
+UX500_FIRMWARE_VERSION = 1.1.3-6
+UX500_FIRMWARE_SOURCE = ux500-firmware_$(UX500_FIRMWARE_VERSION)linaro1.tar.gz
+UX500_FIRMWARE_SITE = https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files/
+UX500_FIRMWARE_LICENSE = Snowball click-wrap license
+UX500_FIRMWARE_LICENSE_FILES = license.txt 
+UX500_FIRMWARE_REDISTRIBUTE = NO
+
+# The CG2900 linux driver has to load firmware named CG29XX_* but the firmware
+# filenames contained in this package are CG2900_* hence the code below
+define UX500_FIRMWARE_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	for f in $(TARGET_DIR)/lib/firmware/CG2900* ; do \
+		mv $$f $${f/CG2900/CG29XX}; \
+	done
+endef
+
+$(eval $(generic-package))

From 4052e3325c240034e24cbb1b445adf32320baa98 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 30 Nov 2012 02:39:13 +0000
Subject: [PATCH 3408/6849] Add board files for snowball

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/calao/snowball/linux-3.4.patch | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 board/calao/snowball/linux-3.4.patch

diff --git a/board/calao/snowball/linux-3.4.patch b/board/calao/snowball/linux-3.4.patch
new file mode 100644
index 0000000000..4e6fb518fb
--- /dev/null
+++ b/board/calao/snowball/linux-3.4.patch
@@ -0,0 +1,45 @@
+From 3d1a9b44b9dcd2c0f5d54c09596c96c0524d8340 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Tue, 13 Nov 2012 11:47:41 +0100
+Subject: [PATCH] trace-debug[stm]: Fix for BT/WLAN instability
+
+Pins under mop500_ske_pins array are used for different
+functionalities in snowball. Ex: GPIO161 pin configured
+for keypad here must stay configured as GPIO alternate
+function for operating PMU_EN pin of BT/WLAN chip in snowball.
+So forbid configuring these pins, for snowball
+
+Signed-off-by: Rajanikanth H.V <rajanikanth.hv@stericsson.com>
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ arch/arm/mach-ux500/board-mop500-stm.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-ux500/board-mop500-stm.c b/arch/arm/mach-ux500/board-mop500-stm.c
+index 1bef2a0..532fb9e 100644
+--- a/arch/arm/mach-ux500/board-mop500-stm.c
++++ b/arch/arm/mach-ux500/board-mop500-stm.c
+@@ -121,7 +121,9 @@ static int stm_ste_disable_ape_on_mipi60(void)
+ 	if (retval)
+ 		STM_ERR("Failed to disable MIPI60\n");
+ 	else {
+-		retval = nmk_config_pins(ARRAY_AND_SIZE(mop500_ske_pins));
++		if (!machine_is_snowball())
++			retval = nmk_config_pins(
++				ARRAY_AND_SIZE(mop500_ske_pins));
+ 		if (retval)
+ 			STM_ERR("Failed to enable SKE gpio\n");
+ 	}
+@@ -314,7 +316,8 @@ static int stm_ste_connection(enum stm_connection_type con_type)
+ 		/* Enable altC3 on GPIO70-74 (STMMOD) and GPIO75-76 (UARTMOD) */
+ 		prcmu_enable_stm_mod_uart();
+ 		/* Enable APE on MIPI60 */
+-		retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
++		if (!machine_is_snowball())
++			retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
+ 		if (retval)
+ 			STM_ERR("Failed to disable SKE GPIO\n");
+ 		else {
+-- 
+1.7.9.5
+

From 4d4b1e4c5d98cbaafb8473c29d06b0d472cb34df Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 30 Nov 2012 02:39:14 +0000
Subject: [PATCH 3409/6849] Add init script files for snowball board

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/snowball-init/Config.in        | 14 ++++++++++++++
 package/snowball-init/snowball-init.mk | 15 +++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/snowball-init/Config.in
 create mode 100644 package/snowball-init/snowball-init.mk

diff --git a/package/Config.in b/package/Config.in
index c369f74ac7..9c23ae368e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -554,6 +554,7 @@ source "package/empty/Config.in"
 source "package/googlefontdirectory/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
+source "package/snowball-init/Config.in"
 source "package/sound-theme-borealis/Config.in"
 source "package/sound-theme-freedesktop/Config.in"
 endmenu
diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
new file mode 100644
index 0000000000..99abb350fa
--- /dev/null
+++ b/package/snowball-init/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_SNOWBALL_INIT
+	bool "snowball-init"
+	# Runtime dependency, needed by snowball startup script
+	select BR2_PACKAGE_BLUEZ_UTILS
+	depends on !BR2_avr32
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_UX500_FIRMWARE
+	help
+	  Snowball init scripts
+
+	  http://www.igloocommunity.org
+
diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk
new file mode 100644
index 0000000000..278cacb2c4
--- /dev/null
+++ b/package/snowball-init/snowball-init.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# snowball-init
+#
+#############################################################
+SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7
+SNOWBALL_INIT_SITE = git://igloocommunity.org/git/bsp/snowball-init.git
+SNOWBALL_INIT_LICENSE = BSD-4c
+SNOWBALL_INIT_LICENSE_FILES = debian/copyright
+
+define SNOWBALL_INIT_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/snowball $(TARGET_DIR)/etc/init.d/S50snowball
+endef
+
+$(eval $(generic-package))

From 0ca2a3bb51ff8f69030b12bc67cefde9846348c0 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 30 Nov 2012 02:39:15 +0000
Subject: [PATCH 3410/6849] bluez-utils: add support for the ST-Ericsson cg2900
 combo controller

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (with the calao_snowball_defconfig)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...4.101-enable_cg2900_on_upstream_4.91.patch | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch

diff --git a/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch b/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
new file mode 100644
index 0000000000..e80af5fd90
--- /dev/null
+++ b/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
@@ -0,0 +1,106 @@
+From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Wed, 14 Nov 2012 14:27:02 +0100
+Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth
+ combo controller
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ tools/hciattach.c |   22 +++++++++++++++-------
+ tools/hciattach.h |    1 +
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/tools/hciattach.c b/tools/hciattach.c
+index e4d5aa1..7f08243 100644
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {
+ 	{ "texasalt",   0x0000, 0x0000, HCI_UART_LL,   115200, 115200,
+ 				FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL   },
+ 
++	/* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */
++	{ "cg2900",     0x0000, 0x0000, HCI_UART_STE,  115200, 115200,
++				FLOW_CTL, DISABLE_PM, NULL, NULL     },
++
++
+ 	/* ST Microelectronics minikits based on STLC2410/STLC2415 */
+ 	{ "st",         0x0000, 0x0000, HCI_UART_H4,    57600, 115200,
+ 				FLOW_CTL, DISABLE_PM,  NULL, st       },
+@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)
+ }
+ 
+ /* Initialize UART driver */
+-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
++static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)
+ {
+ 	struct termios ti;
+-	int fd, i;
++	int fd;
+ 	unsigned long flags = 0;
+ 
+ 	if (raw)
+@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+ 	}
+ 
+ 	/* Set TTY to N_HCI line discipline */
+-	i = N_HCI;
+-	if (ioctl(fd, TIOCSETD, &i) < 0) {
++	if (ioctl(fd, TIOCSETD, &line_disc) < 0) {
+ 		perror("Can't set line discipline");
+ 		return -1;
+ 	}
+@@ -1243,7 +1247,7 @@ static void usage(void)
+ {
+ 	printf("hciattach - HCI UART driver initialization utility\n");
+ 	printf("Usage:\n");
+-	printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++	printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
+ 	printf("\thciattach -l\n");
+ }
+ 
+@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])
+ 	struct uart_t *u = NULL;
+ 	int detach, printpid, raw, opt, i, n, ld, err;
+ 	int to = 10;
++	int line_disc = N_HCI;
+ 	int init_speed = 0;
+ 	int send_break = 0;
+ 	pid_t pid;
+@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])
+ 	printpid = 0;
+ 	raw = 0;
+ 
+-	while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {
++	while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {
+ 		switch(opt) {
++		case 'a':
++                        line_disc = atoi(optarg);
++                        break;
+ 		case 'b':
+ 			send_break = 1;
+ 			break;
+@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])
+ 	alarm(to);
+ 	bcsp_max_retries = to;
+ 
+-	n = init_uart(dev, u, send_break, raw);
++	n = init_uart(dev, u, send_break, raw, line_disc);
+ 	if (n < 0) {
+ 		perror("Can't initialize device");
+ 		exit(1);
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index fed0d11..09b534d 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -39,6 +39,7 @@
+ #define HCI_UART_H4DS	3
+ #define HCI_UART_LL	4
+ #define HCI_UART_ATH3K  5
++#define HCI_UART_STE	6
+ 
+ #define HCI_UART_RAW_DEVICE	0
+ 
+-- 
+1.7.9.5
+

From fd1b89f9c97660a8c0c5c2e7dedf9ef577ec3ac8 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 30 Nov 2012 02:39:16 +0000
Subject: [PATCH 3411/6849] Add config file for the snowball board

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_snowball_defconfig | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 configs/calao_snowball_defconfig

diff --git a/configs/calao_snowball_defconfig b/configs/calao_snowball_defconfig
new file mode 100644
index 0000000000..360ed5129a
--- /dev/null
+++ b/configs/calao_snowball_defconfig
@@ -0,0 +1,24 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_GCC_VERSION_4_7_X=y
+# BR2_SOFT_FLOAT is not set
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_VFP_FLOAT=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA2"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_SNOWBALL_HDMISERVICE=y
+BR2_PACKAGE_LIBNL=y
+BR2_PACKAGE_SNOWBALL_INIT=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_TARGET_ROOTFS_TAR_GZIP=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="snowball"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://igloocommunity.org/git/kernel/igloo-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"
+BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"
+BR2_LINUX_KERNEL_DEFCONFIG="u8500"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y

From e2af1822252af1a70a5b199921ede15572b46d0e Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 30 Nov 2012 07:56:25 +0000
Subject: [PATCH 3412/6849] Add /var/www to device table

The /var/www directory is listed in /etc/passwd in the skeleton target
filesystem as the home directory of the www-data user (uid 33).

In the final target filesystem, /var/www should be owned by www-data. This
is important for the lighttpd package, for example.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/device_table.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/device_table.txt b/system/device_table.txt
index fc397a90c9..421728b085 100644
--- a/system/device_table.txt
+++ b/system/device_table.txt
@@ -10,6 +10,7 @@
 /tmp					d	1777	0	0	-	-	-	-	-
 /etc					d	755	0	0	-	-	-	-	-
 /home/default				d	2755	1000	1000	-	-	-	-	-
+/var/www				d	755	33	33	-	-	-	-	-
 /etc/shadow				f	600	0	0	-	-	-	-	-
 /etc/passwd				f	644	0	0	-	-	-	-	-
 /etc/network/if-up.d			d	755	0	0	-	-	-	-	-

From bd72a13a4ca3033bacbaf9e9a2b424acf149f83d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Nov 2012 00:46:03 +0000
Subject: [PATCH 3413/6849] flex: fix build for nommu systems

The flex binary uses fork() so it breaks on !MMU builds.
Since we usually don't require flex in the target and the common
scenario is that we just want libfl in staging reverse the options so
that BR2_PACKAGE_FLEX just builds and install libfl.a and change the
LIBFL option to BR2_PACKAGE_FLEX_BINARY to install the binary in the
target.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/Config.in | 10 +++++-----
 package/flex/flex.mk   | 20 +++++---------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/package/flex/Config.in b/package/flex/Config.in
index b10eb00377..adef46867a 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -6,10 +6,10 @@ config BR2_PACKAGE_FLEX
 
 	  http://www.gnu.org/software/flex/
 
-config BR2_PACKAGE_FLEX_LIBFL
-	bool "Install libfl.a under staging_dir/usr/lib"
-	default y
+config BR2_PACKAGE_FLEX_BINARY
+	bool "Install tool in the target"
+	# needs fork()
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_FLEX
 	help
-	  Install libfl.a under staging_dir/usr/lib for further development
-	  on a host machine.
+	  Install the flex binary tool in the target filesystem.
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 2599cdc75f..0c1ed5af18 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -16,30 +16,20 @@ FLEX_DEPENDENCIES = \
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES =
 
+ifeq ($(BR2_PACKAGE_FLEX_BINARY),y)
 # lex -> flex
 define FLEX_INSTALL_LEX
 	cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
 endef
-
-define FLEX_UNINSTALL_LEX
-	-rm $(TARGET_DIR)/usr/bin/lex
-endef
-
 FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
 
-# libfl installation
-ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
-define FLEX_INSTALL_LIBFL
-	install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
-endef
+else
 
-define FLEX_UNINSTALL_LIBFL
-	-rm $(STAGING_DIR)/lib/libfl.a
+define FLEX_DISABLE_PROGRAM
+	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
 endef
+FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
 
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
 endif
 
 $(eval $(autotools-package))

From cc6da8b28ef6b6dde2eaaaf40d21f366508221ad Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 30 Oct 2012 01:29:14 +0000
Subject: [PATCH 3414/6849] matchbox-lib: Append -lX11 to the linker

Fixes building with binutils-2.22
http://autobuild.buildroot.net/results/b4b26dd9c7d7bebe45638ba125fb49a5f5d0cc14/build-end.log

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/matchbox-lib/matchbox-lib.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index de11dfc91a..339f512f33 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -10,6 +10,7 @@ MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_L
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
+MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
 
 define MATCHBOX_LIB_POST_INSTALL_FIXES
  $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc

From ebcfa987df4095a7805ff124ab648fb607c89215 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 12 Nov 2012 10:08:28 +0000
Subject: [PATCH 3415/6849] pkg-infra: introduce errors for legacy API

As discussed in the BR developer days, we want to be more strict about API
changes in buildroot. I.e., we want to make it less likely that a user's
customizations break down after upgrading buildroot.

A first step is to make sure that the user is warned about API changes.
This patch introduces Makefile.legacy and Config.in.legacy, which will
issue clear error messages for such situations.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in        |  2 ++
 Config.in.legacy | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile         |  7 ++++++-
 Makefile.legacy  | 13 ++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 Config.in.legacy
 create mode 100644 Makefile.legacy

diff --git a/Config.in b/Config.in
index eaafece61f..b319ac78c5 100644
--- a/Config.in
+++ b/Config.in
@@ -434,3 +434,5 @@ source "fs/Config.in"
 source "boot/Config.in"
 
 source "linux/Config.in"
+
+source "Config.in.legacy"
diff --git a/Config.in.legacy b/Config.in.legacy
new file mode 100644
index 0000000000..4bc8784bdf
--- /dev/null
+++ b/Config.in.legacy
@@ -0,0 +1,51 @@
+#
+# Config.in.legacy - support for backward compatibility
+#
+# When an existing Config.in symbol is removed, it should be added again in this
+# file, and take appropriate action to approximate backward compatibility. If
+# there is an equivalent (set of) new symbols, these can just be select'ed by
+# the old symbol. This makes sure that running 'make oldconfig' will make things
+# "just work" when upgrading to a new buildroot version. If the change is too
+# fundamental and cannot be fixed by a simple select, then the old symbol should
+# select BR2_LEGACY.  If that symbol is set, the build will issue an error.
+#
+# When adding legacy symbols to this file, add them to the front. The oldest
+# symbols will be removed again after about two years.
+#
+# The symbol should be copied as-is from the place where it was previously
+# defined, but the help text should be removed or replaced with something that
+# explains how to fix it.
+
+config BR2_LEGACY
+	bool
+	help
+	  This option is selected automatically when your old .config uses an
+	  option that no longer exists in current buildroot. In that case, the
+	  build will fail. Look for config options which are selected in the
+	  menu below: they no longer exist and should be replaced by something
+	  else.
+
+# This comment fits exactly in a 80-column display
+comment "Legacy detected: check the content of the menu below"
+	depends on BR2_LEGACY
+
+# This option should get a new name with every buildroot release, so it defaults
+# to y again for people who upgrade.
+menuconfig BR2_LEGACY_CHECK_2012_11
+	bool "Check for legacy config options"
+	default y
+	help
+	  Select this option to see the config options that are present in your
+	  current .config but are no longer supported by buildroot. If any of
+	  the options in this menu is selected, they should be replaced with
+	  something else. As long as they stay selected, the build will fail.
+	  Just de-select this option to automatically remove all the legacy
+	  configuration.
+
+if BR2_LEGACY_CHECK_2012_11
+
+#
+# Legacy options from 2012.08
+#
+
+endif
diff --git a/Makefile b/Makefile
index 21aa054a96..1e257e97e2 100644
--- a/Makefile
+++ b/Makefile
@@ -290,6 +290,12 @@ endif
 
 all: world
 
+# Include legacy before the other things, because package .mk files
+# may rely on it.
+ifneq ($(BR2_DEPRECATED),y)
+include Makefile.legacy
+endif
+
 include package/Makefile.in
 include support/dependencies/dependencies.mk
 
@@ -762,4 +768,3 @@ print-version:
 include docs/manual/manual.mk
 
 .PHONY: $(noconfig_targets)
-
diff --git a/Makefile.legacy b/Makefile.legacy
new file mode 100644
index 0000000000..2e015a1e3a
--- /dev/null
+++ b/Makefile.legacy
@@ -0,0 +1,13 @@
+#
+# Makefile.legacy - support for backward compatibility
+#
+# This file contains placeholders to detect backward-compatibility problems.
+# When a buildroot "API" feature is being deprecated, a rule should be added
+# here that issues an error when the old feature is used.
+#
+# This file is not included if BR2_DEPRECATED is selected, so it is possible
+# to bypass the errors (although that's usually a bad idea).
+
+ifeq ($(BR2_LEGACY),y)
+$(error "You have legacy configuration in your .config! Please check your configuration.")
+endif

From cc1cd3b267212c0e932db4855ff7c1afe0b45e67 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 12 Nov 2012 10:08:29 +0000
Subject: [PATCH 3416/6849] legacy: move old GENTARGETS macros to
 Makefile.legacy

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile.legacy     | 7 +++++++
 package/Makefile.in | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.legacy b/Makefile.legacy
index 2e015a1e3a..c8b568d75e 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -11,3 +11,10 @@
 ifeq ($(BR2_LEGACY),y)
 $(error "You have legacy configuration in your .config! Please check your configuration.")
 endif
+
+#
+# Legacy options from 2012.05
+#
+GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
+AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
+CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
diff --git a/package/Makefile.in b/package/Makefile.in
index 9fdc745990..2dd81c72ca 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -305,12 +305,6 @@ else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
-# Warn if a package uses the deprecated GENTARGETS macros.  This can be
-# removed again for BR-2012.11.
-GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
-AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
-CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
-
 include package/pkg-utils.mk
 include package/pkg-download.mk
 include package/pkg-autotools.mk

From be2460c545def6f00b6aade8719e1eef5f3ba875 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 12 Nov 2012 10:08:30 +0000
Subject: [PATCH 3417/6849] legacy: add error target for host-pkg-config

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile.legacy | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Makefile.legacy b/Makefile.legacy
index c8b568d75e..e0b7ec29c4 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -12,6 +12,16 @@ ifeq ($(BR2_LEGACY),y)
 $(error "You have legacy configuration in your .config! Please check your configuration.")
 endif
 
+#
+# Legacy options from 2012.08
+#
+
+host-pkg-config:
+	@$(call MESSAGE,host-pkg-config is replaced by host-pkgconf)
+	@$(call MESSAGE,please update your .mk files)
+	@false
+.PHONY: host-pkg-config
+
 #
 # Legacy options from 2012.05
 #

From c430fab22242efd4251a6fc1ccba87f4d732e303 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 12 Nov 2012 10:08:31 +0000
Subject: [PATCH 3418/6849] legacy: evtest is dropped from input-tools package

We select BR2_PACKAGE_EVTEST automatically. This has only limited use:
when the LEGACY_CHECK menu is disabled in menuconfig (or even oldconfig),
it will also unselect BR2_PACKAGE_EVTEST again. Still, it can serve as a
hint of how to fix things.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 4bc8784bdf..04ccb92c66 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -48,4 +48,11 @@ if BR2_LEGACY_CHECK_2012_11
 # Legacy options from 2012.08
 #
 
+config BR2_PACKAGE_INPUT_TOOLS_EVTEST
+	bool "input-tools evtest is now a separate package evtest"
+	select BR2_LEGACY
+	select BR2_PACKAGE_EVTEST
+	help
+	  The evtest program from input-tools is now a separate package.
+
 endif

From 26803e88013ca7e30153952435d110f5da8c88ce Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 12 Nov 2012 10:08:32 +0000
Subject: [PATCH 3419/6849] legacy: BR2_PACKAGE_LIBINTL is replaced by gettext

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 04ccb92c66..7ddc6eaa2b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -48,6 +48,21 @@ if BR2_LEGACY_CHECK_2012_11
 # Legacy options from 2012.08
 #
 
+config BR2_PACKAGE_GETTEXT_STATIC
+	bool "libgettext.a is now selected by BR2_PREFER_STATIC_LIB"
+	select BR2_LEGACY
+	help
+	  To build a static gettext library, select BR2_PREFER_STATIC_LIB.
+
+
+config BR2_PACKAGE_LIBINTL
+	bool "libintl"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GETTEXT
+	help
+	  libintl is now installed by selecting BR2_PACKAGE_GETTEXT. This now
+	  only installs the library, not the executables.
+
 config BR2_PACKAGE_INPUT_TOOLS_EVTEST
 	bool "input-tools evtest is now a separate package evtest"
 	select BR2_LEGACY

From 74b9fa00efa16ec74f1d3df6137b9961fd60d3fc Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 28 Nov 2012 06:09:17 +0000
Subject: [PATCH 3420/6849] perl: remove redundant patches

Now we are using perlcross, the patches to make perl work with qemu are
redundant, so remove them.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl-configure-qemu.patch | 53 --------------------------
 package/perl/perl-make-ext.patch       | 24 ------------
 package/perl/perl-mkppport.patch       | 37 ------------------
 3 files changed, 114 deletions(-)
 delete mode 100644 package/perl/perl-configure-qemu.patch
 delete mode 100644 package/perl/perl-make-ext.patch
 delete mode 100644 package/perl/perl-mkppport.patch

diff --git a/package/perl/perl-configure-qemu.patch b/package/perl/perl-configure-qemu.patch
deleted file mode 100644
index c2d6b92656..0000000000
--- a/package/perl/perl-configure-qemu.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Add qemu support
-
-see https://rt.perl.org/rt3//Public/Bug/Display.html?id=114798
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/Configure
-===================================================================
---- a/Configure
-+++ b/Configure
-@@ -2837,6 +2837,9 @@
-             ;;
-         *)  echo "Using usrinc $usrinc." >&4 ;;
- 	esac
-+	case "$targetrun" in
-+	*qemu*) targethost=dummy ;;
-+	esac
- 	case "$targethost" in
- 	'') echo "Targethost not defined." >&4; croak=y ;;
-         *)  echo "Using targethost $targethost." >&4
-@@ -2868,7 +2871,7 @@
- 	case "$targetfrom" in
- 	'') targetfrom=scp ;;
- 	esac
--    	run=$run-$targetrun
-+    	run=$run-`basename $targetrun`
-     	to=$to-$targetto
-     	from=$from-$targetfrom
- 	case "$targetdir" in
-@@ -2908,6 +2911,14 @@
- $targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
- EOF
- 	    ;;
-+	*qemu*)
-+	    to=:
-+	    from=:
-+	    cat >$run <<EOF
-+#!/bin/sh
-+$targetrun -L $qemulib "\$@"
-+EOF
-+	    ;;
- 	*)  echo "Unknown targetrun '$targetrun'" >&4
- 	    exit 1
- 	    ;;
-@@ -5048,7 +5059,7 @@
- echo " ";
- echo "Checking if your compiler accepts $flag" 2>&1;
- echo "int main(void) { return 0; }" > gcctest.c;
--if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && ./gcctest; then
-+if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then
-     echo "Yes, it does." 2>&1;
-     if $test -s gcctest.out ; then
-         echo "But your platform does not like it:";
diff --git a/package/perl/perl-make-ext.patch b/package/perl/perl-make-ext.patch
deleted file mode 100644
index e0195e7a25..0000000000
--- a/package/perl/perl-make-ext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Don't use RUN with make (only for perl)
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/make_ext.pl
-===================================================================
---- a/make_ext.pl
-+++ b/make_ext.pl
-@@ -458,11 +458,13 @@
- 	# Give makefile an opportunity to rewrite itself.
- 	# reassure users that life goes on...
- 	my @args = ('config', @$pass_through);
--	system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
-+#	system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
-+	system(@make, @args) and print "@make @args failed, continuing anyway...\n";
-     }
-     my @targ = ($target, @$pass_through);
-     print "Making $target in $ext_dir\n@run @make @targ\n";
--    my $code = system(@run, @make, @targ);
-+#    my $code = system(@run, @make, @targ);
-+    my $code = system(@make, @targ);
-     die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
- 
-     chdir $return_dir || die "Cannot cd to $return_dir: $!";
diff --git a/package/perl/perl-mkppport.patch b/package/perl/perl-mkppport.patch
deleted file mode 100644
index 97f27a2027..0000000000
--- a/package/perl/perl-mkppport.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Add RUN
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/mkppport
-===================================================================
---- a/mkppport
-+++ b/mkppport
-@@ -1,6 +1,7 @@
- use strict;
- use warnings;
- 
-+use Config;
- use Getopt::Long;
- use File::Spec;
- use File::Compare qw( compare );
-@@ -136,14 +137,18 @@
- #----------------------------------------------
- sub run
- {
-+  my @run = $Config{run};
-+  @run = () if not defined $run[0] or $run[0] eq '';
-   my @args = ("-I" . File::Spec->catdir((File::Spec->updir) x 2, 'lib'), @_);
-   my $run = $perl =~ m/\s/ ? qq("$perl") : $perl;
-   for (@args) {
-     $_ = qq("$_") if $^O eq 'VMS' && /^[^"]/;
-     $run .= " $_";
-   }
--  print "running $run\n";
--  system $run and die "$run failed: $?\n";
-+#  print "running $run\n";
-+#  system $run and die "$run failed: $?\n";
-+  print "running ", join(' ', @run, $run), "\n";
-+  system join(' ', @run, $run) and die "@run $run failed: $?\n";
- }
- 
- __END__

From 1a002b5a9d2317a046d97c242ba48f79f3fabbd3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 28 Nov 2012 06:09:18 +0000
Subject: [PATCH 3421/6849] perl: substitute perlcross pod with
 perl-version-specific pod

As suggested by Dan Pattison at ethertek ca.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index f3c73dd79d..b84917b7c2 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -13,8 +13,11 @@ PERL_LICENSE_FILES = Artistic
 PERL_INSTALL_STAGING = YES
 
 PERL_CROSS_VERSION = 0.7
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
 PERL_CROSS_SITE    = http://download.berlios.de/perlcross
-PERL_CROSS_SOURCE  = perl-5.$(PERL_VERSION_MAJOR).0-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
+PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
 
 # We use the perlcross hack to cross-compile perl. It should
 # be extracted over the perl sources, so we don't define that
@@ -32,6 +35,11 @@ define PERL_CROSS_EXTRACT
 endef
 PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
 
+define PERL_CROSS_SET_POD
+	$(SED) s/$(PERL_CROSS_OLD_POD)/$(PERL_CROSS_NEW_POD)/g $(@D)/Makefile
+endef
+PERL_POST_PATCH_HOOKS += PERL_CROSS_SET_POD
+
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
     PERL_DEPENDENCIES += berkeleydb
 endif

From 92cad6008d6b6a18f09d77f6e4c08572967eb9f7 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 28 Nov 2012 06:09:19 +0000
Subject: [PATCH 3422/6849] perl: remove the double configure hack

configure had to be called twice because with --mode=cross the
miniperl-step failed.  However, just leaving out the --mode parameter
is sufficient to make it work.  Since GNU_TARGET_NAME is always
different from the host's tuple (it has -buildroot- in it), we can
safely assume that the configure script will automatically enter
cross mode.

Also fix a type in perladmin definition.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index b84917b7c2..0893eb5b0c 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -47,19 +47,10 @@ ifeq ($(BR2_PACKAGE_GDBM),y)
     PERL_DEPENDENCIES += gdbm
 endif
 
-# Normally, --mode=cross should automatically do the two steps
-# below, but it doesn't work for some reason.
-PERL_HOST_CONF_OPT = \
-	--mode=buildmini \
-	--target=$(GNU_TARGET_NAME) \
-	--target-arch=$(GNU_TARGET_NAME) \
-	--set-target-name=$(GNU_TARGET_NAME)
-
 # We have to override LD, because an external multilib toolchain ld is not
 # wrapped to provide the required sysroot options.  We also can't use ccache
 # because the configure script doesn't support it.
 PERL_CONF_OPT = \
-	--mode=target \
 	--target=$(GNU_TARGET_NAME) \
 	--target-tools-prefix=$(TARGET_CROSS) \
 	--prefix=/usr \
@@ -71,7 +62,7 @@ PERL_CONF_OPT = \
 	-A myuname="Buildroot $(BR2_VERSION_FULL)" \
 	-A osname=linux \
 	-A osvers=$(LINUX_VERSION) \
-	-A perlamdin=root
+	-A perladmin=root
 
 ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
     PERL_CONF_OPT += -Dusedevel
@@ -87,8 +78,7 @@ PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
 endif
 
 define PERL_CONFIGURE_CMDS
-	(cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_HOST_CONF_OPT))
-	(cd $(@D); ./configure $(PERL_CONF_OPT))
+	(cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
 	$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
 endef
 

From 9ba19df16ab9da681c2e5be2f2c7693c24ed0d8d Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 28 Nov 2012 06:09:20 +0000
Subject: [PATCH 3423/6849] perl: fix configure step

Configure -A symbol=val generates a extra space in config.sh,
which causes failure like this :
    Building Module-Runtime-0.013
    Unknown OS type ' linux' - using default settings

[Arnout: use -A define:foo instead of patching config.sh]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 0893eb5b0c..391047d382 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -55,14 +55,14 @@ PERL_CONF_OPT = \
 	--target-tools-prefix=$(TARGET_CROSS) \
 	--prefix=/usr \
 	-Dld="$(TARGET_CC_NOCCACHE)" \
-	-A ccflags="$(TARGET_CFLAGS)" \
-	-A ldflags="$(TARGET_LDFLAGS) -lm" \
-	-A mydomain="" \
-	-A myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
-	-A myuname="Buildroot $(BR2_VERSION_FULL)" \
-	-A osname=linux \
-	-A osvers=$(LINUX_VERSION) \
-	-A perladmin=root
+	-Dccflags="$(TARGET_CFLAGS)" \
+	-Dldflags="$(TARGET_LDFLAGS) -lm" \
+	-A define:mydomain="" \
+	-A define:myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
+	-A define:myuname="Buildroot $(BR2_VERSION_FULL)" \
+	-A define:osname=linux \
+	-A define:osvers=$(LINUX_VERSION) \
+	-A define:perladmin=root
 
 ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
     PERL_CONF_OPT += -Dusedevel

From 3ffc4815b79de99228de9b605cec91e2ff5d467c Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 28 Nov 2012 06:09:21 +0000
Subject: [PATCH 3424/6849] cpanminus: requires host-qemu

It's still broken, but is someone wants to try it out then at least
the dependency is there.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpanminus/cpanminus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index d3a338b0b7..af35e930c3 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -7,7 +7,7 @@
 CPANMINUS_VERSION = 1.5018
 CPANMINUS_SOURCE = miyagawa-cpanminus-$(CPANMINUS_VERSION)-0-gee6cd30.tar.gz
 CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/tarball/$(CPANMINUS_VERSION)
-CPANMINUS_DEPENDENCIES = perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
+CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
 
 CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
 CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")

From c4fbc4202ea47829396bc446e84fd85153513974 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 28 Nov 2012 06:09:22 +0000
Subject: [PATCH 3425/6849] cpanminus: fix installation paths

perlcross seems to set the installation paths differently than perl's
Configure, so adapt the reference to these paths in cpanminus.

[Francois: install into /usr/lib/perl]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpanminus/cpanminus.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index af35e930c3..e7e3f29591 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -11,8 +11,8 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA
 
 CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
 CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
-CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)
-CPANMINUS_PERL_SITELIB  = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
+CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl
+CPANMINUS_PERL_SITELIB  = $(TARGET_DIR)/usr/lib/perl
 CPANMINUS_PERL_ARCHLIB  = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
 CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
 CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
@@ -27,8 +27,8 @@ define CPANMINUS_INSTALL_TARGET_CMDS
 	echo "PERL5LIB=$(CPANMINUS_PERL5LIB) $(CPANMINUS_RUN_PERL) \"\$$@\""    >>$(@D)/run_perl
 	chmod +x $(@D)/run_perl
 	PERL5LIB=$(CPANMINUS_PERL5LIB) \
-	PERL_MM_OPT="DESTDIR=$(TARGET_DIR) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
-	PERL_MB_OPT="--destdir $(TARGET_DIR)" \
+	PERL_MM_OPT="DESTDIR=$(CPANMINUS_PERL_SITELIB) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
+	PERL_MB_OPT="--destdir $(CPANMINUS_PERL_SITELIB)" \
 	RUN_PERL="$(@D)/run_perl" \
 	$(CPANMINUS_RUN_PERL) $(@D)/cpanm \
 		--perl=$(@D)/run_perl \
@@ -36,7 +36,7 @@ define CPANMINUS_INSTALL_TARGET_CMDS
 		--no-man-pages \
 		$(CPANMINUS_MIRROR) \
 		$(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
-	find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
+	-find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
 endef
 else
 define CPANMINUS_INSTALL_TARGET_CMDS

From 0435a0913cc43f4dff12a081c5b1416d4a7f7730 Mon Sep 17 00:00:00 2001
From: Davide Viti <zinosat@tiscali.it>
Date: Sun, 25 Nov 2012 06:43:37 +0000
Subject: [PATCH 3426/6849] List the useful hook points available in buildroot

The complete list can be obtained with the following command:
  grep "_HOOKS[ ]\+?=" package/pkg-generic.mk

Signed-off-by: Davide Viti <zinosat@tiscali.it>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 3f21f86cd4..6c1c35eb74 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -358,6 +358,9 @@ useful for generic packages.
 
 The following hook points are available:
 
+* +LIBFOO_POST_DOWNLOAD_HOOKS+
+* +LIBFOO_POST_EXTRACT_HOOKS+
+* +LIBFOO_PRE_PATCH_HOOKS+
 * +LIBFOO_POST_PATCH_HOOKS+
 * +LIBFOO_PRE_CONFIGURE_HOOKS+
 * +LIBFOO_POST_CONFIGURE_HOOKS+

From 8a53d732cdf5732dd2cf1ba7355d133df1849f16 Mon Sep 17 00:00:00 2001
From: Simon Dawson <simond@trainfx.com>
Date: Fri, 30 Nov 2012 00:14:36 +0000
Subject: [PATCH 3427/6849] acpid: add license information

[Patch: change to GPLv2+]
Signed-off-by: Simon Dawson <simond@trainfx.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/acpid/acpid.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index 56f671d99b..4ad9f660b0 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -6,6 +6,8 @@
 ACPID_VERSION = 2.0.11
 ACPID_SOURCE = acpid_$(ACPID_VERSION).orig.tar.gz
 ACPID_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
+ACPID_LICENSE = GPLv2+
+ACPID_LICENSE_FILES = COPYING
 
 define ACPID_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" -C $(@D)

From 4b0b177b26f3d3cf785e5c46a3ec963bbfd9cebc Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 10:38:23 +0000
Subject: [PATCH 3428/6849] matchbox packages: fix broken urls

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/matchbox-common/matchbox-common.mk         | 6 +++---
 package/matchbox/matchbox-desktop/matchbox-desktop.mk       | 5 +++--
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk       | 2 +-
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk     | 2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk               | 2 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk           | 6 +++---
 .../matchbox-startup-monitor/matchbox-startup-monitor.mk    | 2 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk                 | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 2e3cdfffda..3248e748ba 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -3,10 +3,10 @@
 # MatchBox Common
 #
 #############################################################
-
-MATCHBOX_COMMON_VERSION = 0.9.1
+MATCHBOX_COMMON_VERSION_MAJOR = 0.9
+MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
-MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
+MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
 MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
 
 ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 5c518e5ca3..2ef29c675c 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-MATCHBOX_DESKTOP_VERSION = 0.9.1
+MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
+MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
-MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION)
+MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index 255f3c1a92..7a6ac0070a 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_FAKEKEY_VERSION = 0.1
 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
-MATCHBOX_FAKEKEY_SITE = http://matchbox-project.org/sources/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
+MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
 MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
 MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
 MATCHBOX_FAKEKEY_CONF_OPT = --enable-expat
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index c6e9496e80..44aab5cfe4 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
-MATCHBOX_KEYBOARD_SITE = http://matchbox-project.org/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
+MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
 MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
 
 # Workaround bug in configure script
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 339f512f33..6b6025af40 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
-MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index db9d1a8287..0e980ef483 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -3,10 +3,10 @@
 # MatchBox Panel
 #
 #############################################################
-
-MATCHBOX_PANEL_VERSION = 0.9.3
+MATCHBOX_PANEL_VERSION_MAJOR = 0.9
+MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
-MATCHBOX_PANEL_SITE = http://matchbox-project.org/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION)
+MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 6f37bf4dbb..6b30e80a4b 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
 MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
-MATCHBOX_STARTUP_MONITOR_SITE = http://matchbox-project.org/sources/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
+MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
 MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
 MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index ece8866a58..b04cf7603d 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_WM_VERSION = 1.2
 MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
-MATCHBOX_WM_SITE = http://matchbox-project.org/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
+MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
 MATCHBOX_WM_DEPENDENCIES = matchbox-lib
 MATCHBOX_WM_CONF_OPT = --enable-expat
 

From b644575579cb7f1fddf4f9c38928606e138ac053 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Tue, 20 Nov 2012 06:59:57 +0000
Subject: [PATCH 3429/6849] toolchain-crosstool-ng: install libthread_db if
 appropriate

Signed-off-by: Richard Braun <rbraun@sceen.net>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 5f9119d579..6f81e30cde 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -41,6 +41,10 @@ uclibc-source: $(CTNG_DIR)/.config
 CTNG_LIBS_LIB := ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so    \
                  libnsl.so libpthread.so libresolv.so librt.so libutil.so
 
+ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+CTNG_LIBS_LIB += libthread_db.so
+endif
+
 #--------------
 # The libc-specific system libraries (in /lib)
 # Note: it may be needed to tweak the NSS libs in the glibc and eglibc cases...

From 696365f69bdf6261e8b312f98bdc177754bd5517 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Tue, 20 Nov 2012 06:17:23 +0000
Subject: [PATCH 3430/6849] toolchain-external: fix installation of
 libthread_db

Whatever the gdbserver source, as long as it's installed on the target,
assume it requires libthread_db.

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a6025dbdd9..8ce0a84727 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -61,7 +61,7 @@ endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 LIB_EXTERNAL_LIBS+=libpthread.so
-ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
 LIB_EXTERNAL_LIBS+=libthread_db.so
 endif # gdbserver
 endif # ! no threads

From 6ae7886f84e8ca856854fa9ee1a15547f171e8c6 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Tue, 20 Nov 2012 07:18:11 +0000
Subject: [PATCH 3431/6849] Makefile: fix thread libraries stripping

Strip libthread_db the same as any other library, but strip libpthread
with --strip-debug. See the relevant mailing list discussion [1] for
additional details.

[1] http://lists.busybox.net/pipermail/buildroot/2012-October/060126.html

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile            | 10 +++++++++-
 package/Makefile.in |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1e257e97e2..1141ef2c03 100644
--- a/Makefile
+++ b/Makefile
@@ -425,7 +425,7 @@ ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)))
 STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o
 endif
 STRIP_FIND_CMD += -type f -perm +111
-STRIP_FIND_CMD += -not \( $(call findfileclauses,libthread_db*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
+STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
 
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
@@ -456,6 +456,14 @@ endif
 	find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
 		xargs -r $(KSTRIPCMD) || true
 
+# See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
+# besides the one in which crash occurred; or SIGTRAP kills my program when
+# I set a breakpoint"
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+	find $(TARGET_DIR)/lib -type f -name 'libpthread*.so*' | \
+		xargs $(STRIPCMD) $(STRIP_STRIP_DEBUG) || true
+endif
+
 	mkdir -p $(TARGET_DIR)/etc
 	# Mandatory configuration file and auxilliary cache directory
 	# for recent versions of ldconfig
diff --git a/package/Makefile.in b/package/Makefile.in
index 2dd81c72ca..8dea51eff3 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -126,6 +126,7 @@ TARGET_CXX := $(CCACHE) $(TARGET_CXX)
 endif
 
 ifeq ($(BR2_STRIP_strip),y)
+STRIP_STRIP_DEBUG:=--strip-debug
 STRIP_STRIP_UNNEEDED:=--strip-unneeded
 STRIP_STRIP_ALL:=--strip-all
 TARGET_STRIP=$(TARGET_CROSS)strip
@@ -133,6 +134,7 @@ STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
 endif
 ifeq ($(BR2_STRIP_sstrip),y)
+STRIP_STRIP_DEBUG:=
 STRIP_STRIP_UNNEEDED:=
 STRIP_STRIP_ALL:=
 TARGET_STRIP=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip

From d38b25f1be63fe30b190d165a6d6dde891e633f6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Nov 2012 14:27:34 -0800
Subject: [PATCH 3432/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index db7b233ed6..7e5de2e4ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,9 +4,13 @@
 
 	Various manual updates and fixes.
 
-	Updated/fixed packages: arptables, binutils, busybox, ccache,
-	cjson, directfb, gdb, hiawatha, lcdproc, libdaemon, libecore,
-	libhid, libpcap, libusb, linux-fusion, ocf-linux, strace,
+	Add checks for legacy features.
+
+	Updated/fixed packages: acpid, alsa-lib, arptables, binutils,
+	busybox, ccache, cjson, cramfs, directfb, flex, gdb, hiawatha,
+	imagemagick, lcdproc, libdaemon, libecore, libhid, libmad,
+	libpcap, libusb, linux-fusion, matchbox, ocf-linux, owl-linux,
+	scons, strace
 
 	Issues resolved (http://bugs.uclibc.org):
 

From 440c323c9708ef66231de6c4fed34d04c777c759 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:28 +0000
Subject: [PATCH 3433/6849] efl packages: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/expedite/expedite.mk           | 3 +++
 package/efl/libecore/libecore.mk           | 3 +++
 package/efl/libedbus/libedbus.mk           | 3 +++
 package/efl/libedje/libedje.mk             | 3 +++
 package/efl/libeet/libeet.mk               | 3 +++
 package/efl/libefreet/libefreet.mk         | 3 +++
 package/efl/libeina/libeina.mk             | 3 +++
 package/efl/libelementary/libelementary.mk | 3 +++
 package/efl/libembryo/libembryo.mk         | 3 +++
 package/efl/libethumb/libethumb.mk         | 3 +++
 package/efl/libevas/libevas.mk             | 3 +++
 11 files changed, 33 insertions(+)

diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
index a841ac9d5a..26d25f5ba0 100644
--- a/package/efl/expedite/expedite.mk
+++ b/package/efl/expedite/expedite.mk
@@ -6,6 +6,9 @@
 
 EXPEDITE_VERSION = 1.1.0
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
+EXPEDITE_LICENSE = BSD-2c
+EXPEDITE_LICENSE_FILES = COPYING
+
 EXPEDITE_DEPENDENCIES = libevas libeina libeet
 
 $(eval $(autotools-package))
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index b495bdb95c..9eb09ac2f0 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -7,6 +7,9 @@
 LIBECORE_VERSION = 1.1.0
 LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
 LIBECORE_SITE = http://download.enlightenment.org/releases/
+LIBECORE_LICENSE = BSD-2c
+LIBECORE_LICENSE_FILES = COPYING
+
 LIBECORE_INSTALL_STAGING = YES
 
 LIBECORE_DEPENDENCIES = host-pkgconf libeina
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 4ecb0f8e7e..60651e3077 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -7,6 +7,9 @@
 LIBEDBUS_VERSION = 1.1.0
 LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
 LIBEDBUS_SITE = http://download.enlightenment.org/releases/
+LIBEDBUS_LICENSE = BSD-2c
+LIBEDBUS_LICENSE_FILES = COPYING
+
 LIBEDBUS_INSTALL_STAGING = YES
 
 LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index 8b4814eddf..ce17da514d 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -7,6 +7,9 @@
 LIBEDJE_VERSION = 1.1.0
 LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
 LIBEDJE_SITE =  http://download.enlightenment.org/releases/
+LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)
+LIBEDJE_LICENSE_FILES = COPYING
+
 LIBEDJE_INSTALL_STAGING = YES
 
 LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index cb6467582f..ccb3501871 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -7,6 +7,9 @@
 LIBEET_VERSION = 1.5.0
 LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
 LIBEET_SITE = http://download.enlightenment.org/releases/
+LIBEET_LICENSE = BSD-2c
+LIBEET_LICENSE_FILES = COPYING
+
 LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
index 2f00bcff04..c0d73971d4 100644
--- a/package/efl/libefreet/libefreet.mk
+++ b/package/efl/libefreet/libefreet.mk
@@ -7,6 +7,9 @@
 LIBEFREET_VERSION = 1.1.0
 LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
 LIBEFREET_SITE = http://download.enlightenment.org/releases/
+LIBEFREET_LICENSE = BSD-2c
+LIBEFREET_LICENSE_FILES = COPYING
+
 LIBEFREET_INSTALL_STAGING = YES
 
 LIBEFREET_DEPENDENCIES = libeina libeet libecore
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index 465fee1eeb..e5b89c1ce5 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -7,6 +7,9 @@
 LIBEINA_VERSION = 1.1.0
 LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
 LIBEINA_SITE = http://download.enlightenment.org/releases/
+LIBEINA_LICENSE = LGPLv2.1+
+LIBEINA_LICENSE_FILES = COPYING
+
 LIBEINA_INSTALL_STAGING = YES
 
 LIBEINA_DEPENDENCIES = host-pkgconf
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 83c90053df..8957d038d3 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -7,6 +7,9 @@
 LIBELEMENTARY_VERSION = 0.8.0.65643
 LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
 LIBELEMENTARY_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBELEMENTARY_LICENSE = LGPLv2.1
+LIBELEMENTARY_LICENSE_FILES = COPYING
+
 LIBELEMENTARY_INSTALL_STAGING = YES
 
 LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index 5484ccf57b..9cab5aaaf9 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -7,6 +7,9 @@
 LIBEMBRYO_VERSION = 1.1.0
 LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
 LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
+LIBEMBRYO_LICENSE = BSD-2c, Embryo license
+LIBEMBRYO_LICENSE_FILES = COPYING
+
 LIBEMBRYO_INSTALL_STAGING = YES
 
 LIBEMBRYO_DEPENDENCIES = host-pkgconf libeina
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
index 92e4c8331f..ba77e4c071 100644
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -7,6 +7,9 @@
 LIBETHUMB_VERSION = 0.1.1.65643
 LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
 LIBETHUMB_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBETHUMB_LICENSE = LGPLv2.1+
+LIBETHUMB_LICENSE_FILES = COPYING
+
 LIBETHUMB_INSTALL_STAGING = YES
 
 LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 594db60b51..402aa4839d 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -7,6 +7,9 @@
 LIBEVAS_VERSION = 1.1.0
 LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
 LIBEVAS_SITE = http://download.enlightenment.org/releases/
+LIBEVAS_LICENSE = BSD-2c
+LIBEVAS_LICENSE_FILES = COPYING
+
 LIBEVAS_INSTALL_STAGING = YES
 
 LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype

From c788354145b5c10a993c1c9afb2905fa64ce5e96 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:29 +0000
Subject: [PATCH 3434/6849] fluxbox: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fluxbox/fluxbox.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 15136c9336..356c5a274d 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -7,6 +7,8 @@
 FLUXBOX_VERSION = 1.3.2
 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
 FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
+FLUXBOX_LICENSE = MIT
+FLUXBOX_LICENSE_FILES = COPYING
 
 FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		   --x-libraries=$(STAGING_DIR)/usr/lib

From f19c6948c50660bae27c6ca51a39d07533450dd1 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 22:46:30 +0100
Subject: [PATCH 3435/6849] igh-ethercat: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...SSER-to-be-LGPL-2.1-like-in-file-hea.patch | 645 ++++++++++++++++++
 package/igh-ethercat/igh-ethercat.mk          |   2 +
 2 files changed, 647 insertions(+)
 create mode 100644 package/igh-ethercat/igh-ethercat-Fixed-COPYING.LESSER-to-be-LGPL-2.1-like-in-file-hea.patch

diff --git a/package/igh-ethercat/igh-ethercat-Fixed-COPYING.LESSER-to-be-LGPL-2.1-like-in-file-hea.patch b/package/igh-ethercat/igh-ethercat-Fixed-COPYING.LESSER-to-be-LGPL-2.1-like-in-file-hea.patch
new file mode 100644
index 0000000000..00aff82adf
--- /dev/null
+++ b/package/igh-ethercat/igh-ethercat-Fixed-COPYING.LESSER-to-be-LGPL-2.1-like-in-file-hea.patch
@@ -0,0 +1,645 @@
+Fetch from: http://etherlabmaster.hg.sourceforge.net/hgweb/etherlabmaster/etherlabmaster/rev/907948bb2285
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+# HG changeset patch
+# User Florian Pose <fp@igh-essen.com>
+# Date 1342171132 -7200
+# Node ID 907948bb2285cbc30af501729593e4fefa7c20db
+# Parent  5d7d2722dfaa0de2c80efb3187d41e434814f783
+Fixed COPYING.LESSER to be LGPL 2.1 (like in file headers).
+
+diff -r 5d7d2722dfaa -r 907948bb2285 COPYING.LESSER
+--- a/COPYING.LESSER	Fri Jul 13 10:42:31 2012 +0200
++++ b/COPYING.LESSER	Fri Jul 13 11:18:52 2012 +0200
+@@ -1,165 +1,502 @@
+-		   GNU LESSER GENERAL PUBLIC LICENSE
+-                       Version 3, 29 June 2007
++                  GNU LESSER GENERAL PUBLIC LICENSE
++                       Version 2.1, February 1999
+ 
+- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
++ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
++ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
++[This is the first released version of the Lesser GPL.  It also counts
++ as the successor of the GNU Library Public License, version 2, hence
++ the version number 2.1.]
+ 
+-  This version of the GNU Lesser General Public License incorporates
+-the terms and conditions of version 3 of the GNU General Public
+-License, supplemented by the additional permissions listed below.
++                            Preamble
+ 
+-  0. Additional Definitions. 
++  The licenses for most software are designed to take away your
++freedom to share and change it.  By contrast, the GNU General Public
++Licenses are intended to guarantee your freedom to share and change
++free software--to make sure the software is free for all its users.
+ 
+-  As used herein, "this License" refers to version 3 of the GNU Lesser
+-General Public License, and the "GNU GPL" refers to version 3 of the GNU
+-General Public License.
++  This license, the Lesser General Public License, applies to some
++specially designated software packages--typically libraries--of the
++Free Software Foundation and other authors who decide to use it.  You
++can use it too, but we suggest you first think carefully about whether
++this license or the ordinary General Public License is the better
++strategy to use in any particular case, based on the explanations below.
+ 
+-  "The Library" refers to a covered work governed by this License,
+-other than an Application or a Combined Work as defined below.
++  When we speak of free software, we are referring to freedom of use,
++not price.  Our General Public Licenses are designed to make sure that
++you have the freedom to distribute copies of free software (and charge
++for this service if you wish); that you receive source code or can get
++it if you want it; that you can change the software and use pieces of
++it in new free programs; and that you are informed that you can do
++these things.
+ 
+-  An "Application" is any work that makes use of an interface provided
+-by the Library, but which is not otherwise based on the Library.
+-Defining a subclass of a class defined by the Library is deemed a mode
+-of using an interface provided by the Library.
++  To protect your rights, we need to make restrictions that forbid
++distributors to deny you these rights or to ask you to surrender these
++rights.  These restrictions translate to certain responsibilities for
++you if you distribute copies of the library or if you modify it.
+ 
+-  A "Combined Work" is a work produced by combining or linking an
+-Application with the Library.  The particular version of the Library
+-with which the Combined Work was made is also called the "Linked
+-Version".
++  For example, if you distribute copies of the library, whether gratis
++or for a fee, you must give the recipients all the rights that we gave
++you.  You must make sure that they, too, receive or can get the source
++code.  If you link other code with the library, you must provide
++complete object files to the recipients, so that they can relink them
++with the library after making changes to the library and recompiling
++it.  And you must show them these terms so they know their rights.
+ 
+-  The "Minimal Corresponding Source" for a Combined Work means the
+-Corresponding Source for the Combined Work, excluding any source code
+-for portions of the Combined Work that, considered in isolation, are
+-based on the Application, and not on the Linked Version.
++  We protect your rights with a two-step method: (1) we copyright the
++library, and (2) we offer you this license, which gives you legal
++permission to copy, distribute and/or modify the library.
+ 
+-  The "Corresponding Application Code" for a Combined Work means the
+-object code and/or source code for the Application, including any data
+-and utility programs needed for reproducing the Combined Work from the
+-Application, but excluding the System Libraries of the Combined Work.
++  To protect each distributor, we want to make it very clear that
++there is no warranty for the free library.  Also, if the library is
++modified by someone else and passed on, the recipients should know
++that what they have is not the original version, so that the original
++author's reputation will not be affected by problems that might be
++introduced by others.
++
++  Finally, software patents pose a constant threat to the existence of
++any free program.  We wish to make sure that a company cannot
++effectively restrict the users of a free program by obtaining a
++restrictive license from a patent holder.  Therefore, we insist that
++any patent license obtained for a version of the library must be
++consistent with the full freedom of use specified in this license.
+ 
+-  1. Exception to Section 3 of the GNU GPL.
++  Most GNU software, including some libraries, is covered by the
++ordinary GNU General Public License.  This license, the GNU Lesser
++General Public License, applies to certain designated libraries, and
++is quite different from the ordinary General Public License.  We use
++this license for certain libraries in order to permit linking those
++libraries into non-free programs.
+ 
+-  You may convey a covered work under sections 3 and 4 of this License
+-without being bound by section 3 of the GNU GPL.
++  When a program is linked with a library, whether statically or using
++a shared library, the combination of the two is legally speaking a
++combined work, a derivative of the original library.  The ordinary
++General Public License therefore permits such linking only if the
++entire combination fits its criteria of freedom.  The Lesser General
++Public License permits more lax criteria for linking other code with
++the library.
+ 
+-  2. Conveying Modified Versions.
++  We call this license the "Lesser" General Public License because it
++does Less to protect the user's freedom than the ordinary General
++Public License.  It also provides other free software developers Less
++of an advantage over competing non-free programs.  These disadvantages
++are the reason we use the ordinary General Public License for many
++libraries.  However, the Lesser license provides advantages in certain
++special circumstances.
+ 
+-  If you modify a copy of the Library, and, in your modifications, a
+-facility refers to a function or data to be supplied by an Application
+-that uses the facility (other than as an argument passed when the
+-facility is invoked), then you may convey a copy of the modified
+-version:
++  For example, on rare occasions, there may be a special need to
++encourage the widest possible use of a certain library, so that it becomes
++a de-facto standard.  To achieve this, non-free programs must be
++allowed to use the library.  A more frequent case is that a free
++library does the same job as widely used non-free libraries.  In this
++case, there is little to gain by limiting the free library to free
++software only, so we use the Lesser General Public License.
+ 
+-   a) under this License, provided that you make a good faith effort to
+-   ensure that, in the event an Application does not supply the
+-   function or data, the facility still operates, and performs
+-   whatever part of its purpose remains meaningful, or
++  In other cases, permission to use a particular library in non-free
++programs enables a greater number of people to use a large body of
++free software.  For example, permission to use the GNU C Library in
++non-free programs enables many more people to use the whole GNU
++operating system, as well as its variant, the GNU/Linux operating
++system.
+ 
+-   b) under the GNU GPL, with none of the additional permissions of
+-   this License applicable to that copy.
++  Although the Lesser General Public License is Less protective of the
++users' freedom, it does ensure that the user of a program that is
++linked with the Library has the freedom and the wherewithal to run
++that program using a modified version of the Library.
+ 
+-  3. Object Code Incorporating Material from Library Header Files.
++  The precise terms and conditions for copying, distribution and
++modification follow.  Pay close attention to the difference between a
++"work based on the library" and a "work that uses the library".  The
++former contains code derived from the library, whereas the latter must
++be combined with the library in order to run.
++
++                  GNU LESSER GENERAL PUBLIC LICENSE
++   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
+-  The object code form of an Application may incorporate material from
+-a header file that is part of the Library.  You may convey such object
+-code under terms of your choice, provided that, if the incorporated
+-material is not limited to numerical parameters, data structure
+-layouts and accessors, or small macros, inline functions and templates
+-(ten or fewer lines in length), you do both of the following:
++  0. This License Agreement applies to any software library or other
++program which contains a notice placed by the copyright holder or
++other authorized party saying it may be distributed under the terms of
++this Lesser General Public License (also called "this License").
++Each licensee is addressed as "you".
+ 
+-   a) Give prominent notice with each copy of the object code that the
+-   Library is used in it and that the Library and its use are
+-   covered by this License.
++  A "library" means a collection of software functions and/or data
++prepared so as to be conveniently linked with application programs
++(which use some of those functions and data) to form executables.
+ 
+-   b) Accompany the object code with a copy of the GNU GPL and this license
+-   document.
++  The "Library", below, refers to any such software library or work
++which has been distributed under these terms.  A "work based on the
++Library" means either the Library or any derivative work under
++copyright law: that is to say, a work containing the Library or a
++portion of it, either verbatim or with modifications and/or translated
++straightforwardly into another language.  (Hereinafter, translation is
++included without limitation in the term "modification".)
+ 
+-  4. Combined Works.
++  "Source code" for a work means the preferred form of the work for
++making modifications to it.  For a library, complete source code means
++all the source code for all modules it contains, plus any associated
++interface definition files, plus the scripts used to control compilation
++and installation of the library.
+ 
+-  You may convey a Combined Work under terms of your choice that,
+-taken together, effectively do not restrict modification of the
+-portions of the Library contained in the Combined Work and reverse
+-engineering for debugging such modifications, if you also do each of
+-the following:
++  Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope.  The act of
++running a program using the Library is not restricted, and output from
++such a program is covered only if its contents constitute a work based
++on the Library (independent of the use of the Library in a tool for
++writing it).  Whether that is true depends on what the Library does
++and what the program that uses the Library does.
+ 
+-   a) Give prominent notice with each copy of the Combined Work that
+-   the Library is used in it and that the Library and its use are
+-   covered by this License.
++  1. You may copy and distribute verbatim copies of the Library's
++complete source code as you receive it, in any medium, provided that
++you conspicuously and appropriately publish on each copy an
++appropriate copyright notice and disclaimer of warranty; keep intact
++all the notices that refer to this License and to the absence of any
++warranty; and distribute a copy of this License along with the
++Library.
+ 
+-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+-   document.
++  You may charge a fee for the physical act of transferring a copy,
++and you may at your option offer warranty protection in exchange for a
++fee.
++
++  2. You may modify your copy or copies of the Library or any portion
++of it, thus forming a work based on the Library, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
+ 
+-   c) For a Combined Work that displays copyright notices during
+-   execution, include the copyright notice for the Library among
+-   these notices, as well as a reference directing the user to the
+-   copies of the GNU GPL and this license document.
++    a) The modified work must itself be a software library.
+ 
+-   d) Do one of the following:
++    b) You must cause the files modified to carry prominent notices
++    stating that you changed the files and the date of any change.
+ 
+-       0) Convey the Minimal Corresponding Source under the terms of this
+-       License, and the Corresponding Application Code in a form
+-       suitable for, and under terms that permit, the user to
+-       recombine or relink the Application with a modified version of
+-       the Linked Version to produce a modified Combined Work, in the
+-       manner specified by section 6 of the GNU GPL for conveying
+-       Corresponding Source.
++    c) You must cause the whole of the work to be licensed at no
++    charge to all third parties under the terms of this License.
+ 
+-       1) Use a suitable shared library mechanism for linking with the
+-       Library.  A suitable mechanism is one that (a) uses at run time
+-       a copy of the Library already present on the user's computer
+-       system, and (b) will operate properly with a modified version
+-       of the Library that is interface-compatible with the Linked
+-       Version. 
++    d) If a facility in the modified Library refers to a function or a
++    table of data to be supplied by an application program that uses
++    the facility, other than as an argument passed when the facility
++    is invoked, then you must make a good faith effort to ensure that,
++    in the event an application does not supply such function or
++    table, the facility still operates, and performs whatever part of
++    its purpose remains meaningful.
+ 
+-   e) Provide Installation Information, but only if you would otherwise
+-   be required to provide such information under section 6 of the
+-   GNU GPL, and only to the extent that such information is
+-   necessary to install and execute a modified version of the
+-   Combined Work produced by recombining or relinking the
+-   Application with a modified version of the Linked Version. (If
+-   you use option 4d0, the Installation Information must accompany
+-   the Minimal Corresponding Source and Corresponding Application
+-   Code. If you use option 4d1, you must provide the Installation
+-   Information in the manner specified by section 6 of the GNU GPL
+-   for conveying Corresponding Source.)
++    (For example, a function in a library to compute square roots has
++    a purpose that is entirely well-defined independent of the
++    application.  Therefore, Subsection 2d requires that any
++    application-supplied function or table used by this function must
++    be optional: if the application does not supply it, the square
++    root function must still compute square roots.)
+ 
+-  5. Combined Libraries.
++These requirements apply to the modified work as a whole.  If
++identifiable sections of that work are not derived from the Library,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works.  But when you
++distribute the same sections as part of a whole which is a work based
++on the Library, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote
++it.
+ 
+-  You may place library facilities that are a work based on the
+-Library side by side in a single library together with other library
+-facilities that are not Applications and are not covered by this
+-License, and convey such a combined library under terms of your
+-choice, if you do both of the following:
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Library.
+ 
+-   a) Accompany the combined library with a copy of the same work based
+-   on the Library, uncombined with any other library facilities,
+-   conveyed under the terms of this License.
++In addition, mere aggregation of another work not based on the Library
++with the Library (or with a work based on the Library) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
+ 
+-   b) Give prominent notice with the combined library that part of it
+-   is a work based on the Library, and explaining where to find the
+-   accompanying uncombined form of the same work.
++  3. You may opt to apply the terms of the ordinary GNU General Public
++License instead of this License to a given copy of the Library.  To do
++this, you must alter all the notices that refer to this License, so
++that they refer to the ordinary GNU General Public License, version 2,
++instead of to this License.  (If a newer version than version 2 of the
++ordinary GNU General Public License has appeared, then you can specify
++that version instead if you wish.)  Do not make any other change in
++these notices.
++
++  Once this change is made in a given copy, it is irreversible for
++that copy, so the ordinary GNU General Public License applies to all
++subsequent copies and derivative works made from that copy.
+ 
+-  6. Revised Versions of the GNU Lesser General Public License.
++  This option is useful when you wish to copy part of the code of
++the Library into a program that is not a library.
+ 
+-  The Free Software Foundation may publish revised and/or new versions
+-of the GNU Lesser General Public License from time to time. Such new
+-versions will be similar in spirit to the present version, but may
+-differ in detail to address new problems or concerns.
++  4. You may copy and distribute the Library (or a portion or
++derivative of it, under Section 2) in object code or executable form
++under the terms of Sections 1 and 2 above provided that you accompany
++it with the complete corresponding machine-readable source code, which
++must be distributed under the terms of Sections 1 and 2 above on a
++medium customarily used for software interchange.
+ 
+-  Each version is given a distinguishing version number. If the
+-Library as you received it specifies that a certain numbered version
+-of the GNU Lesser General Public License "or any later version"
+-applies to it, you have the option of following the terms and
+-conditions either of that published version or of any later version
+-published by the Free Software Foundation. If the Library as you
+-received it does not specify a version number of the GNU Lesser
+-General Public License, you may choose any version of the GNU Lesser
+-General Public License ever published by the Free Software Foundation.
++  If distribution of object code is made by offering access to copy
++from a designated place, then offering equivalent access to copy the
++source code from the same place satisfies the requirement to
++distribute the source code, even though third parties are not
++compelled to copy the source along with the object code.
+ 
+-  If the Library as you received it specifies that a proxy can decide
+-whether future versions of the GNU Lesser General Public License shall
+-apply, that proxy's public statement of acceptance of any version is
+-permanent authorization for you to choose that version for the
+-Library.
++  5. A program that contains no derivative of any portion of the
++Library, but is designed to work with the Library by being compiled or
++linked with it, is called a "work that uses the Library".  Such a
++work, in isolation, is not a derivative work of the Library, and
++therefore falls outside the scope of this License.
++
++  However, linking a "work that uses the Library" with the Library
++creates an executable that is a derivative of the Library (because it
++contains portions of the Library), rather than a "work that uses the
++library".  The executable is therefore covered by this License.
++Section 6 states terms for distribution of such executables.
++
++  When a "work that uses the Library" uses material from a header file
++that is part of the Library, the object code for the work may be a
++derivative work of the Library even though the source code is not.
++Whether this is true is especially significant if the work can be
++linked without the Library, or if the work is itself a library.  The
++threshold for this to be true is not precisely defined by law.
++
++  If such an object file uses only numerical parameters, data
++structure layouts and accessors, and small macros and small inline
++functions (ten lines or less in length), then the use of the object
++file is unrestricted, regardless of whether it is legally a derivative
++work.  (Executables containing this object code plus portions of the
++Library will still fall under Section 6.)
++
++  Otherwise, if the work is a derivative of the Library, you may
++distribute the object code for the work under the terms of Section 6.
++Any executables containing that work also fall under Section 6,
++whether or not they are linked directly with the Library itself.
++
++  6. As an exception to the Sections above, you may also combine or
++link a "work that uses the Library" with the Library to produce a
++work containing portions of the Library, and distribute that work
++under terms of your choice, provided that the terms permit
++modification of the work for the customer's own use and reverse
++engineering for debugging such modifications.
++
++  You must give prominent notice with each copy of the work that the
++Library is used in it and that the Library and its use are covered by
++this License.  You must supply a copy of this License.  If the work
++during execution displays copyright notices, you must include the
++copyright notice for the Library among them, as well as a reference
++directing the user to the copy of this License.  Also, you must do one
++of these things:
++
++    a) Accompany the work with the complete corresponding
++    machine-readable source code for the Library including whatever
++    changes were used in the work (which must be distributed under
++    Sections 1 and 2 above); and, if the work is an executable linked
++    with the Library, with the complete machine-readable "work that
++    uses the Library", as object code and/or source code, so that the
++    user can modify the Library and then relink to produce a modified
++    executable containing the modified Library.  (It is understood
++    that the user who changes the contents of definitions files in the
++    Library will not necessarily be able to recompile the application
++    to use the modified definitions.)
++
++    b) Use a suitable shared library mechanism for linking with the
++    Library.  A suitable mechanism is one that (1) uses at run time a
++    copy of the library already present on the user's computer system,
++    rather than copying library functions into the executable, and (2)
++    will operate properly with a modified version of the library, if
++    the user installs one, as long as the modified version is
++    interface-compatible with the version that the work was made with.
++
++    c) Accompany the work with a written offer, valid for at
++    least three years, to give the same user the materials
++    specified in Subsection 6a, above, for a charge no more
++    than the cost of performing this distribution.
++
++    d) If distribution of the work is made by offering access to copy
++    from a designated place, offer equivalent access to copy the above
++    specified materials from the same place.
++
++    e) Verify that the user has already received a copy of these
++    materials or that you have already sent this user a copy.
++
++  For an executable, the required form of the "work that uses the
++Library" must include any data and utility programs needed for
++reproducing the executable from it.  However, as a special exception,
++the materials to be distributed need not include anything that is
++normally distributed (in either source or binary form) with the major
++components (compiler, kernel, and so on) of the operating system on
++which the executable runs, unless that component itself accompanies
++the executable.
++
++  It may happen that this requirement contradicts the license
++restrictions of other proprietary libraries that do not normally
++accompany the operating system.  Such a contradiction means you cannot
++use both them and the Library together in an executable that you
++distribute.
++
++  7. You may place library facilities that are a work based on the
++Library side-by-side in a single library together with other library
++facilities not covered by this License, and distribute such a combined
++library, provided that the separate distribution of the work based on
++the Library and of the other library facilities is otherwise
++permitted, and provided that you do these two things:
++
++    a) Accompany the combined library with a copy of the same work
++    based on the Library, uncombined with any other library
++    facilities.  This must be distributed under the terms of the
++    Sections above.
++
++    b) Give prominent notice with the combined library of the fact
++    that part of it is a work based on the Library, and explaining
++    where to find the accompanying uncombined form of the same work.
++
++  8. You may not copy, modify, sublicense, link with, or distribute
++the Library except as expressly provided under this License.  Any
++attempt otherwise to copy, modify, sublicense, link with, or
++distribute the Library is void, and will automatically terminate your
++rights under this License.  However, parties who have received copies,
++or rights, from you under this License will not have their licenses
++terminated so long as such parties remain in full compliance.
++
++  9. You are not required to accept this License, since you have not
++signed it.  However, nothing else grants you permission to modify or
++distribute the Library or its derivative works.  These actions are
++prohibited by law if you do not accept this License.  Therefore, by
++modifying or distributing the Library (or any work based on the
++Library), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Library or works based on it.
++
++  10. Each time you redistribute the Library (or any work based on the
++Library), the recipient automatically receives a license from the
++original licensor to copy, distribute, link with or modify the Library
++subject to these terms and conditions.  You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties with
++this License.
++
++  11. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Library at all.  For example, if a patent
++license would not permit royalty-free redistribution of the Library by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any
++particular circumstance, the balance of the section is intended to apply,
++and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system which is
++implemented by public license practices.  Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++  12. If the distribution and/or use of the Library is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Library under this License may add
++an explicit geographical distribution limitation excluding those countries,
++so that distribution is permitted only in or among countries not thus
++excluded.  In such case, this License incorporates the limitation as if
++written in the body of this License.
++
++  13. The Free Software Foundation may publish revised and/or new
++versions of the Lesser General Public License from time to time.
++Such new versions will be similar in spirit to the present version,
++but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number.  If the Library
++specifies a version number of this License which applies to it and
++"any later version", you have the option of following the terms and
++conditions either of that version or of any later version published by
++the Free Software Foundation.  If the Library does not specify a
++license version number, you may choose any version ever published by
++the Free Software Foundation.
++
++  14. If you wish to incorporate parts of the Library into other free
++programs whose distribution conditions are incompatible with these,
++write to the author to ask for permission.  For software which is
++copyrighted by the Free Software Foundation, write to the Free
++Software Foundation; we sometimes make exceptions for this.  Our
++decision will be guided by the two goals of preserving the free status
++of all derivatives of our free software and of promoting the sharing
++and reuse of software generally.
++
++                            NO WARRANTY
++
++  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
++WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
++EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
++OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
++KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
++LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
++THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
++WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
++AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
++LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
++RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
++FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
++DAMAGES.
++
++                     END OF TERMS AND CONDITIONS
++
++           How to Apply These Terms to Your New Libraries
++
++  If you develop a new library, and you want it to be of the greatest
++possible use to the public, we recommend making it free software that
++everyone can redistribute and change.  You can do so by permitting
++redistribution under these terms (or, alternatively, under the terms of the
++ordinary General Public License).
++
++  To apply these terms, attach the following notices to the library.  It is
++safest to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least the
++"copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the library's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the library, if
++necessary.  Here is a sample; alter the names:
++
++  Yoyodyne, Inc., hereby disclaims all copyright interest in the
++  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
++
++  <signature of Ty Coon>, 1 April 1990
++  Ty Coon, President of Vice
++
++That's all there is to it!
+
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index 9182f767fc..a531cab2e4 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -1,6 +1,8 @@
 IGH_ETHERCAT_VERSION = 1.5.1
 IGH_ETHERCAT_SITE    = http://etherlab.org/download/ethercat/
 IGH_ETHERCAT_SOURCE  = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
+IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries)
+IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
 
 IGH_ETHERCAT_DEPENDENCIES    = linux
 IGH_ETHERCAT_INSTALL_STAGING = YES

From 805529ed287b903300f2baa90f7862fe6a862c32 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:31 +0000
Subject: [PATCH 3436/6849] imlib2: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imlib2/imlib2.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index 3c6c473722..fa0f57803a 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -6,6 +6,9 @@
 IMLIB2_VERSION = 1.4.5
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
+IMLIB2_LICENSE = imlib2 license
+IMLIB2_LICENSE_FILES = COPYING
+
 IMLIB2_INSTALL_STAGING = YES
 IMLIB2_DEPENDENCIES = host-pkgconf freetype
 IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
@@ -61,4 +64,3 @@ endef
 IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG
 
 $(eval $(autotools-package))
-

From 51eb3be3da6e9ee8b32d6872db5159e594dc98e4 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:32 +0000
Subject: [PATCH 3437/6849] owl-linux: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/owl-linux/owl-linux.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk
index 0a111c8370..832f6b154b 100644
--- a/package/owl-linux/owl-linux.mk
+++ b/package/owl-linux/owl-linux.mk
@@ -5,6 +5,9 @@
 #############################################################
 OWL_LINUX_VERSION = 1.0.7
 OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers
+OWL_LINUX_LICENSE = PROPRIETARY
+OWL_LINUX_LICENSE_FILES = LICENSE
+OWL_LINUX_REDISTRIBUTE = NO
 
 OWL_LINUX_DEPENDENCIES = linux
 

From 727ed13234ac337ce15332679943a407fccee432 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:33 +0000
Subject: [PATCH 3438/6849] rrdtool: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rrdtool/rrdtool.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 7521aba992..d3b63ea8a9 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -6,6 +6,9 @@
 
 RRDTOOL_VERSION = 1.2.30
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
+RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
+RRDTOOL_LICENSE_FILES = COPYING COPYRIGHT
+
 RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
 RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES

From 98fa43c41746a183ac81b3bf06865ba8e245a061 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:34 +0000
Subject: [PATCH 3439/6849] sylpheed: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/sylpheed.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index cf55c902ca..f26e5fc1eb 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -8,6 +8,8 @@ SYLPHEED_VERSION_MINOR = 0
 SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
+SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)
+SYLPHEED_LICENSE_FILES = COPIYNG COPYING.LIB
 
 SYLPHEED_CONF_OPT = --disable-gtkspell
 

From 7364f0cb2288262786e38401c91a47a01ba024cb Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:35 +0000
Subject: [PATCH 3440/6849] matchbox packages: add license info

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/matchbox-common/matchbox-common.mk            | 2 ++
 package/matchbox/matchbox-desktop/matchbox-desktop.mk          | 2 ++
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk          | 2 ++
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk        | 2 ++
 package/matchbox/matchbox-lib/matchbox-lib.mk                  | 2 ++
 package/matchbox/matchbox-panel/matchbox-panel.mk              | 2 ++
 .../matchbox-startup-monitor/matchbox-startup-monitor.mk       | 2 ++
 package/matchbox/matchbox-wm/matchbox-wm.mk                    | 3 +++
 8 files changed, 17 insertions(+)

diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 3248e748ba..89c00c2ea8 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -7,6 +7,8 @@ MATCHBOX_COMMON_VERSION_MAJOR = 0.9
 MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
 MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
+MATCHBOX_COMMON_LICENSE = GPLv2+
+MATCHBOX_COMMON_LICENSE_FILES = COPYING
 MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
 
 ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 2ef29c675c..d180d1df6d 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -8,6 +8,8 @@ MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
 MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
 MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
+MATCHBOX_DESKTOP_LICENSE = GPLv2+
+MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index 7a6ac0070a..c3165e0ea7 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -7,6 +7,8 @@
 MATCHBOX_FAKEKEY_VERSION = 0.1
 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
 MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
+MATCHBOX_FAKEKEY_LICENSE = GPLv2+
+MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING
 MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
 MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
 MATCHBOX_FAKEKEY_CONF_OPT = --enable-expat
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 44aab5cfe4..97e3a36bec 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -7,6 +7,8 @@
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
 MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
+MATCHBOX_KEYBOARD_LICENSE = GPLv2+
+MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
 MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
 
 # Workaround bug in configure script
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 6b6025af40..7730d94060 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -7,6 +7,8 @@
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
 MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_LICENSE = LGPLv2.1
+MATCHBOX_LIB_LICENSE_FILES = COPYING
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index 0e980ef483..c9ef3f47af 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -7,6 +7,8 @@ MATCHBOX_PANEL_VERSION_MAJOR = 0.9
 MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
 MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
+MATCHBOX_PANEL_LICENSE = GPLv2+
+MATCHBOX_PANEL_LICENSE_FILES = COPYING
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 6b30e80a4b..18c3b13094 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -7,6 +7,8 @@
 MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
 MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
 MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
+MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+
+MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING
 MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
 MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index b04cf7603d..4c556e51bc 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -7,6 +7,9 @@
 MATCHBOX_WM_VERSION = 1.2
 MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
 MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
+MATCHBOX_WM_LICENSE = GPLv2+
+MATCHBOX_WM_LICENSE_FILES = COPYING
+
 MATCHBOX_WM_DEPENDENCIES = matchbox-lib
 MATCHBOX_WM_CONF_OPT = --enable-expat
 

From 4b3425c0bbe43a6c537a8d0833eec3826f623f67 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Nov 2012 11:46:27 +0000
Subject: [PATCH 3441/6849] python2: bump to 2.7.3

Pyhton 2.7.3 includes several security fixes.
See: http://www.python.org/download/releases/2.7.3/

Also fixes the patch making sqlite optional and remove the symlink patch
(which has been fixed upstream).

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-2.7-009-python-symlink.patch       | 25 ---------------
 ...python-2.7-100-optional-test-modules.patch |  3 +-
 .../python-2.7-101-optional-pydoc.patch       |  3 +-
 .../python/python-2.7-102-optional-2to3.patch | 12 ++-----
 .../python-2.7-103-optional-sqlite.patch      | 31 ++++++++++++++++++-
 .../python/python-2.7-104-optional-tk.patch   |  3 +-
 .../python-2.7-105-optional-curses.patch      |  3 +-
 .../python-2.7-106-optional-expat.patch       |  3 +-
 .../python/python-2.7-110-optional-db.patch   |  7 +++--
 package/python/python.mk                      |  2 +-
 10 files changed, 48 insertions(+), 44 deletions(-)
 delete mode 100644 package/python/python-2.7-009-python-symlink.patch

diff --git a/package/python/python-2.7-009-python-symlink.patch b/package/python/python-2.7-009-python-symlink.patch
deleted file mode 100644
index 1b1d0c866f..0000000000
--- a/package/python/python-2.7-009-python-symlink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Use a symlink between python and pythonVERSION
-
-By default, a hard link is used between /usr/bin/python and
-/usr/bin/pythonVERSION. Using hard links for such things is fairly
-uncommon, so let's make a symbolic link instead.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- Makefile.pre.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: Python-2.7.2/Makefile.pre.in
-===================================================================
---- Python-2.7.2.orig/Makefile.pre.in
-+++ Python-2.7.2/Makefile.pre.in
-@@ -796,7 +796,7 @@
- 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- 	else true; \
- 	fi
--	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-+	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
- 	-rm -f $(DESTDIR)$(BINDIR)/python-config
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
- 	-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
diff --git a/package/python/python-2.7-100-optional-test-modules.patch b/package/python/python-2.7-100-optional-test-modules.patch
index fc49d52191..a988717d05 100644
--- a/package/python/python-2.7-100-optional-test-modules.patch
+++ b/package/python/python-2.7-100-optional-test-modules.patch
@@ -4,6 +4,7 @@ The Python standard distribution comes with many test modules, that
 are not necessarly useful on embedded targets.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   40 +++++++++++++++++++++++++++-------------
@@ -55,7 +56,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +		ctypes/test distutils/tests unittest/test
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-101-optional-pydoc.patch b/package/python/python-2.7-101-optional-pydoc.patch
index 195abcc6e6..ccc937bb27 100644
--- a/package/python/python-2.7-101-optional-pydoc.patch
+++ b/package/python/python-2.7-101-optional-pydoc.patch
@@ -4,6 +4,7 @@ It removes 0.5 MB of data from the target plus the pydoc script
 itself.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |    6 +++++-
@@ -32,7 +33,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +LIBSUBDIRS += pydoc_data
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-102-optional-2to3.patch b/package/python/python-2.7-102-optional-2to3.patch
index 1e04540654..0321619fcd 100644
--- a/package/python/python-2.7-102-optional-2to3.patch
+++ b/package/python/python-2.7-102-optional-2to3.patch
@@ -4,6 +4,7 @@ lib2to3 is a library to convert Python 2.x code to Python 3.x. As
 such, it is probably not very useful on embedded system targets.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   24 +++++++++++++++++-------
@@ -33,7 +34,7 @@ Index: Python-2.7.2/Makefile.pre.in
  		ctypes/test distutils/tests unittest/test
  endif
  
-@@ -884,6 +882,23 @@
+@@ -884,6 +882,16 @@
  LIBSUBDIRS += pydoc_data
  endif
  
@@ -47,14 +48,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +endif
 +endif
 +
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += sqlite3/test
-+endif
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-103-optional-sqlite.patch b/package/python/python-2.7-103-optional-sqlite.patch
index 4172bae48b..a915c55c3a 100644
--- a/package/python/python-2.7-103-optional-sqlite.patch
+++ b/package/python/python-2.7-103-optional-sqlite.patch
@@ -1,10 +1,12 @@
 Add option to disable the sqlite3 module
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
+ Makefile.pre.in |   24 +++++++++++++++++-------
  configure.in |    9 +++++++++
- 1 file changed, 9 insertions(+)
+ 2 file changed, 9 insertions(+)
 
 Index: Python-2.7.2/configure.in
 ===================================================================
@@ -26,3 +28,30 @@ Index: Python-2.7.2/configure.in
  AC_SUBST(PYDOC)
  
  AC_ARG_ENABLE(pydoc,
+Index: Python-2.7.2/Makefile.pre.in
+===================================================================
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -875,7 +874,7 @@
+ 		lib-tk/test/test_ttk test test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ 		test/tracedmodules email/test email/test/data \
+-		json/tests sqlite3/test bsddb/test \
++		json/tests  bsddb/test \
+ 		ctypes/test distutils/tests unittest/test
+ endif
+ 
+@@ -884,6 +882,13 @@
+ LIBSUBDIRS += pydoc_data
+ endif
+ 
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += sqlite3/test
++endif
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch
index 12f1236168..9333e33a62 100644
--- a/package/python/python-2.7-104-optional-tk.patch
+++ b/package/python/python-2.7-104-optional-tk.patch
@@ -1,6 +1,7 @@
 Add an option to disable the tk module
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   14 ++++++++++----
@@ -42,7 +43,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +endif
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-105-optional-curses.patch b/package/python/python-2.7-105-optional-curses.patch
index e3705cbdc5..7f8da7c8a2 100644
--- a/package/python/python-2.7-105-optional-curses.patch
+++ b/package/python/python-2.7-105-optional-curses.patch
@@ -1,6 +1,7 @@
 Add an option to disable the curses module
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |    6 +++++-
@@ -28,7 +29,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +LIBSUBDIRS += curses
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-106-optional-expat.patch b/package/python/python-2.7-106-optional-expat.patch
index be1b4a3c62..2d8ae74e2b 100644
--- a/package/python/python-2.7-106-optional-expat.patch
+++ b/package/python/python-2.7-106-optional-expat.patch
@@ -7,6 +7,7 @@ builtin the Python sources, or no expat at all (which disables the
 installation of XML modules).
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |    6 +++++-
@@ -35,7 +36,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +LIBSUBDIRS += $(XMLLIBSUBDIRS)
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch
index 0d5ee0c260..b32eea970f 100644
--- a/package/python/python-2.7-110-optional-db.patch
+++ b/package/python/python-2.7-110-optional-db.patch
@@ -5,6 +5,7 @@ able to build Python without it, this patch adds an option to disable
 the build/installation of this Python module.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   10 ++++++++--
@@ -28,8 +29,8 @@ Index: Python-2.7.2/Makefile.pre.in
  LIBSUBDIRS +=   test test/data \
  		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
  		test/tracedmodules email/test email/test/data \
--		json/tests sqlite3/test bsddb/test \
-+		json/tests sqlite3/test \
+-		json/tests  bsddb/test \
++		json/tests \
  		ctypes/test distutils/tests unittest/test
  endif
  
@@ -44,7 +45,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +endif
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python.mk b/package/python/python.mk
index e0ec9bb6f0..6e960cdcc3 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).2
+PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).3
 PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
 PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
 PYTHON_LICENSE       = Python software foundation license v2, others

From 537556b22ca6252d319a33ac797afb45b215dbd1 Mon Sep 17 00:00:00 2001
From: Charles Manning <cdhmanning@gmail.com>
Date: Thu, 29 Nov 2012 15:42:32 +0000
Subject: [PATCH 3442/6849] libsigc: Don't copy devel documentation onto target

The libsigc++ developer documentation was being copied onto the target.
Add a clean-up to fix that.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsigc/libsigc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 92d1d8b281..10f580379e 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -8,4 +8,10 @@ LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.bz2
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2
 LIBSIGC_INSTALL_STAGING = YES
 
+define LIBSIGC_INSTALL_TARGET_FIXUP
+	rm -rf $(TARGET_DIR)/usr/share/devhelp/books/libsigc++*
+endef
+
+LIBSIGC_POST_INSTALL_TARGET_HOOKS += LIBSIGC_INSTALL_TARGET_FIXUP
+
 $(eval $(autotools-package))

From 1a59dfae0ce9e93da413285e7c47a16f7317123e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Nov 2012 22:59:02 -0800
Subject: [PATCH 3443/6849] Update for 2012.11-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 11 ++++++-----
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7e5de2e4ef..98fa5c2a20 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2012.11, Not released yet:
+2012.11-rc2, Released November 30th, 2012:
 
 	Minor fixes around the tree.
 
@@ -7,10 +7,11 @@
 	Add checks for legacy features.
 
 	Updated/fixed packages: acpid, alsa-lib, arptables, binutils,
-	busybox, ccache, cjson, cramfs, directfb, flex, gdb, hiawatha,
-	imagemagick, lcdproc, libdaemon, libecore, libhid, libmad,
-	libpcap, libusb, linux-fusion, matchbox, ocf-linux, owl-linux,
-	scons, strace
+	busybox, ccache, cjson, cramfs, directfb, flex, fluxbox, gdb,
+	hiawatha, igh-ethercat, imagemagick, imlib2, lcdproc,
+	libdaemon, libecore, libhid, libmad, libpcap, libsigc, libusb,
+	linux-fusion, matchbox, ocf-linux, owl-linux, python, rrdtool,
+	scons, strace, sylpheed
 
 	Issues resolved (http://bugs.uclibc.org):
 
diff --git a/Makefile b/Makefile
index 1141ef2c03..d3f9b40c82 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.11-rc1
+export BR2_VERSION:=2012.11-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index c34a311006..cdf5950d41 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2012.08.tar.bz2">buildroot-2012.08.tar.bz2</a>.
 
 <p>
-The latest release candidate is <b>2012.11-rc1</b>, which can be
+The latest release candidate is <b>2012.11-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.11-rc1.tar.gz">buildroot-2012.11-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2012.11-rc2.tar.gz">buildroot-2012.11-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.11-rc1.tar.bz2">buildroot-2012.11-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.11-rc2.tar.bz2">buildroot-2012.11-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 94183e092a..84f4cc35bc 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>30 November 2012 -- 2012.11-rc2 released</b>
+
+    <p>RC2 is out with more bugfixes - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.11_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.11-rc2.tar.bz2">2012.11-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>17 November 2012 -- 2012.11-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 8a46d4bf1fe81dc60aca8795d9e2c69a9c252e37 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 1 Dec 2012 18:10:46 -0800
Subject: [PATCH 3444/6849] {rand,allyes}packageconfig: ensure legacy test
 options don't get enabled

The legacy BR2_PACKAGE_* options in Config.in.legacy are not supposed to
be user selectable, so {rand,allyes}packageconfig shouldn't enable them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index d3f9b40c82..b394fd54fa 100644
--- a/Makefile
+++ b/Makefile
@@ -619,6 +619,9 @@ allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
+	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
+		while read config pkg; do \
+		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
 	@$(COMMON_CONFIG_ENV) \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
 		$< --randconfig $(CONFIG_CONFIG_IN)
@@ -627,6 +630,9 @@ randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
+	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
+		while read config pkg; do \
+		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
 	@$(COMMON_CONFIG_ENV) \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
 		$< --allyesconfig $(CONFIG_CONFIG_IN)

From 4a4b0bdd0753fd039d2d3992eb85ea2e118dcbf4 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Sun, 2 Dec 2012 02:55:49 +0000
Subject: [PATCH 3445/6849] qtuio: fix build issue because of missing include

TuioServer.cpp uses usleep but did not include <unistd.h>. This
patch adds the missing #include. This issue has been reported
upstream.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...o-TuioServer.cpp-add-missing-include.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/qtuio/qtuio-TuioServer.cpp-add-missing-include.patch

diff --git a/package/qtuio/qtuio-TuioServer.cpp-add-missing-include.patch b/package/qtuio/qtuio-TuioServer.cpp-add-missing-include.patch
new file mode 100644
index 0000000000..99337026df
--- /dev/null
+++ b/package/qtuio/qtuio-TuioServer.cpp-add-missing-include.patch
@@ -0,0 +1,28 @@
+From 4dd7cad8c95484a882eaa2aeaa74595a3dd93a07 Mon Sep 17 00:00:00 2001
+From: Stephan Hoffmann <sho@relinux.de>
+Date: Sun, 2 Dec 2012 13:36:41 +0100
+Subject: [PATCH] TuioServer.cpp: add missing include
+
+If usleep() is used the header <unistd.h> has to be included
+
+Signed-off-by: Stephan Hoffmann <sho@relinux.de>
+---
+ src/3rdparty/tuio/TuioServer.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/3rdparty/tuio/TuioServer.cpp b/src/3rdparty/tuio/TuioServer.cpp
+index f17bef9..851144c 100644
+--- a/src/3rdparty/tuio/TuioServer.cpp
++++ b/src/3rdparty/tuio/TuioServer.cpp
+@@ -25,6 +25,8 @@ using namespace TUIO;
+ using namespace osc;
+ 
+ #ifndef WIN32
++#include <unistd.h>
++
+ static void* ThreadFunc( void* obj )
+ #else
+ static DWORD WINAPI ThreadFunc( LPVOID obj )
+-- 
+1.7.0.4
+

From d1f5fc29efd40d61e8a185a22e3ee6f52c10d43c Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Sun, 2 Dec 2012 00:56:07 +0000
Subject: [PATCH 3446/6849] pkg-download.mk: Fix shallow clone

Some git versions (e.g. 1.7.0) do not treat trying to shallow clone
a non existing branch or tag as a fatal error but report a warning
and clone HEAD instead. Thus the fallback mechanism does not work
in this case.

This patch introduces a check for the presence of the requested
version as a branch or tag before trying the shallow clone. It
also removes the need to do two clones when a sha1 is given as
a packege version.

[Peter: use cut -f2-]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-download.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 6c57244ac6..ea01b05306 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -74,12 +74,19 @@ domainseparator=$(if $(1),$(1),/)
 ################################################################################
 
 # Try a shallow clone - but that only works if the version is a ref (tag or
-# branch). Fall back on a full clone if it's a generic sha1.
+# branch). Before trying to do a shallow clone we check if $($(PKG)_DL_VERSION)
+# is in the list provided by git ls-remote. If not we fall back on a full clone.
+#
+# Messages for the type of clone used are provided to ease debugging in case of
+# problems
 define DOWNLOAD_GIT
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	 ($(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME) || \
-	  $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) && \
+	 ((test `git ls-remote  $($(PKG)_SITE) | cut -f 2- | grep $($(PKG)_DL_VERSION)` && \
+	   echo "Doing shallow clone" && \
+	   $(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) || \
+	  (echo "Doing full clone" && \
+	   $(GIT) clone --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME))) && \
 	pushd $($(PKG)_BASE_NAME) > /dev/null && \
 	$(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \
 		gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \

From f619d5ba20ef46c57259f35a21bb98b7c85c35a4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Dec 2012 16:30:43 -0800
Subject: [PATCH 3447/6849] libtool: undeprecate for now

Pulseaudio selects libtool, so get rid of the deprecated annotation so
people don't get warnings about unmet dependencies when exiting menuconfig.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtool/Config.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/libtool/Config.in b/package/libtool/Config.in
index 42df25b0a6..d3cf2d7843 100644
--- a/package/libtool/Config.in
+++ b/package/libtool/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_LIBTOOL
 	bool "libtool"
-	# We no longer support a toolchain on the target
-	depends on BR2_DEPRECATED
 	help
 	  Library that hides the complexity of using shared/static libraries
 	  on different platforms behind a consistent, portable interface.

From 4c52ff1acfb2953f1ac40cdce4387b7d1d8cef14 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Sun, 2 Dec 2012 07:13:32 +0000
Subject: [PATCH 3448/6849] skeleton: add /etc/nsswitch.conf

Toolchain Linaro 2012_09 and possibly other glibc based ones
rely on the existence of nsswitch.conf. If it's missing names
from /etc/hosts are not resolved and thus "localhost" is not
known.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/skeleton/etc/nsswitch.conf | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 system/skeleton/etc/nsswitch.conf

diff --git a/system/skeleton/etc/nsswitch.conf b/system/skeleton/etc/nsswitch.conf
new file mode 100644
index 0000000000..d81e2f053e
--- /dev/null
+++ b/system/skeleton/etc/nsswitch.conf
@@ -0,0 +1,17 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+# If you have the `glibc-doc-reference' and `info' packages installed, try:
+# `info libc "Name Service Switch"' for information about this file.
+
+passwd:         files
+group:          files
+shadow:         files
+hosts:          files dns
+networks:       files
+
+protocols:      files
+services:       files
+ethers:         files
+rpc:            files
+

From 4f607edffda4835884f1f013f5d0ae0cb2eadeb7 Mon Sep 17 00:00:00 2001
From: Charles Manning <cdhmanning@gmail.com>
Date: Sun, 2 Dec 2012 11:13:04 +0000
Subject: [PATCH 3449/6849] unexport PKG_CONFIG_SYSROOT_DIR

If this is not done then pkg-config can get confused.

Thomas and Arnout really deserve the credit for this - I just did
the testing.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index b394fd54fa..87943b8ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -172,6 +172,7 @@ export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 
 # Make sure pkg-config doesn't look outside the buildroot tree
 unexport PKG_CONFIG_PATH
+unexport PKG_CONFIG_SYSROOT_DIR
 
 # Having DESTDIR set in the environment confuses the installation
 # steps of some packages.

From d201b95d8c6aa4d21f8655361e12e98630be8c93 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Dec 2012 16:33:09 -0800
Subject: [PATCH 3450/6849] Update for 2012.11

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 10 ++++++++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  9 +++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 98fa5c2a20..2c357eb8a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+2012.11, Released December 2nd, 2012:
+
+	Git shallow clone fix for older git version.
+
+	Updated/fixed packages: ctuio, libtool
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5726: List all the available hook points
+
 2012.11-rc2, Released November 30th, 2012:
 
 	Minor fixes around the tree.
diff --git a/Makefile b/Makefile
index 87943b8ed4..9d9985fd34 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.11-rc2
+export BR2_VERSION:=2012.11
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index cdf5950d41..4cb01c92df 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,13 +6,13 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2012.08</b>, which can be downloaded
+The latest stable release is <b>2012.11</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2012.08.tar.gz">buildroot-2012.08.tar.gz</a>
+<a href="/downloads/buildroot-2012.11.tar.gz">buildroot-2012.11.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.08.tar.bz2">buildroot-2012.08.tar.bz2</a>.
-
+<a href="/downloads/buildroot-2012.11.tar.bz2">buildroot-2012.11.tar.bz2</a>.
+<!--
 <p>
 The latest release candidate is <b>2012.11-rc2</b>, which can be
 downloaded here:<p>
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2012.11-rc2.tar.bz2">buildroot-2012.11-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 84f4cc35bc..7e791be48c 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>2 December 2012 -- 2012.11 released</b>
+
+    <p>The stable 2012.11 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.11">CHANGES</a>
+    file for more details
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.11.tar.bz2">2012.11 release</a>.</p>
+
   <li><b>30 November 2012 -- 2012.11-rc2 released</b>
 
     <p>RC2 is out with more bugfixes - See the <a

From 677d5068b955cf713b73d285e41ec8eedbda8e38 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Dec 2012 17:19:18 -0800
Subject: [PATCH 3451/6849] Makefile: kickoff 2013.02 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9d9985fd34..4b094376f5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.11
+export BR2_VERSION:=2013.02
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From d1692abc007d2c50568e885d7ab6a312e3f8ae1e Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Fri, 30 Nov 2012 04:44:27 +0000
Subject: [PATCH 3452/6849] reorder fs alphabetically
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/Config.in b/fs/Config.in
index 94154ea811..da4c5ff1b4 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -1,15 +1,15 @@
 menu "Filesystem images"
 
-source "fs/cramfs/Config.in"
 source "fs/cloop/Config.in"
+source "fs/cpio/Config.in"
+source "fs/cramfs/Config.in"
 source "fs/ext2/Config.in"
+source "fs/initramfs/Config.in"
+source "fs/iso9660/Config.in"
 source "fs/jffs2/Config.in"
-source "fs/ubifs/Config.in"
+source "fs/romfs/Config.in"
 source "fs/squashfs/Config.in"
 source "fs/tar/Config.in"
-source "fs/cpio/Config.in"
-source "fs/iso9660/Config.in"
-source "fs/initramfs/Config.in"
-source "fs/romfs/Config.in"
+source "fs/ubifs/Config.in"
 
 endmenu

From 61d322c3d258072460fddbab0b39c8bf4cc3e0bc Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 28 Nov 2012 13:54:00 +0000
Subject: [PATCH 3453/6849] package/cURL: fix static link whith openSSL

When openSSL is selected, cURL is configured to use it.

But in this case, the libcurl.pc file /forgets/ to require link
against -ldl.

This can happen, for example, when BR2_PREFER_STATIC_LIB is not set,
but an executable wants to be linked statically (for various reasons
which are irrelevant here).

Fix that by appending a 'Requires: openssl' line to libcurl.pc.in,
but only if openSSL is enabled.

As suggested by Arnout, do it in a post-patch hook, rather as a
post-install hook.

Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 8d8fdb408c..888f6d084b 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -25,17 +25,20 @@ else
 LIBCURL_CONF_OPT += --without-ssl
 endif
 
+define LIBCURL_FIX_DOT_PC
+	printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in
+endef
+LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC)
+
 define LIBCURL_TARGET_CLEANUP
 	rm -rf $(TARGET_DIR)/usr/bin/curl-config \
 	       $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
 endef
-
 LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
 
 define LIBCURL_STAGING_FIXUP_CURL_CONFIG
 	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/curl-config
 endef
-
 LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
 
 $(eval $(autotools-package))

From 68cdb5e2d7b0e8211708012c31dd109e069c098d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Dec 2012 18:12:37 -0800
Subject: [PATCH 3454/6849] xlib_libXdmcp: only build documentation if
 explicitly requested

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 5a702e5ac4..7177ae8f93 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -9,6 +9,8 @@ XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
+XLIB_LIBXDMCP_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-docs)
+HOST_XLIB_LIBXDMCP_CONF_OPT = --disable-docs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 9e5a4b26a272e6a31584b5933e38b05f816a0c7b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Dec 2012 18:28:21 -0800
Subject: [PATCH 3455/6849] xlib_xtrans: only build documentation if explicitly
 requested

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_xtrans/xlib_xtrans.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 85829854bf..d47a0ed7c2 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -8,6 +8,8 @@ XLIB_XTRANS_VERSION = 1.2.6
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_INSTALL_STAGING = YES
+XLIB_XTRANS_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-docs)
+HOST_XLIB_XTRANS_CONF_OPT = --disable-docs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 73bf02320e91380e7f10c7501e35b6b669797564 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Dec 2012 18:34:04 -0800
Subject: [PATCH 3456/6849] xproto_xextproto: only build specs if explicitly
 requested

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xextproto/xproto_xextproto.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 19c79684ac..8114f789fb 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -8,7 +8,8 @@ XPROTO_XEXTPROTO_VERSION = 7.2.0
 XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
 XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES
-XPROTO_XEXTPROTO_INSTALL_TARGET = NO
+XPROTO_XEXTPROTO_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-specs)
+HOST_XPROTO_XEXTPROTO_CONF_OPT = --disable-specs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 440750207d594c932c23196d265847fef5a3426a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Dec 2012 18:35:28 -0800
Subject: [PATCH 3457/6849] xproto_xcmiscproto: only build specs if explicitly
 requested

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 8168b5c96f..027ef4faca 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -8,7 +8,8 @@ XPROTO_XCMISCPROTO_VERSION = 1.2.1
 XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
 XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
-XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
+XPROTO_XCMISCPROTO_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-specs)
+HOST_XPROTO_XCMISCPROTO_CONF_OPT = --disable-specs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From cceda0efeaaa73af490940a628dbd175db3aa277 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Dec 2012 22:55:02 -0800
Subject: [PATCH 3458/6849] xlib_libX11: disable nls compose overview
 generation

Perl is only used to generate compose overview documentation.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index f7dc4eb3c6..75d172cb44 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -12,10 +12,12 @@ XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib
 XLIB_LIBX11_CONF_OPT = \
 	--disable-malloc0returnsnull \
 	--with-xcb \
-	--disable-specs
+	--disable-specs \
+	--without-perl
 
 HOST_XLIB_LIBX11_CONF_OPT = \
-	--disable-specs
+	--disable-specs \
+	--without-perl
 
 # src/util/makekeys is executed at build time to generate ks_tables.h, so
 # it should get compiled for the host. The libX11 makefile unfortunately

From 5062f530081913bd0487f0f879be180f30836ab8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 09:59:09 -0800
Subject: [PATCH 3459/6849] package: add classpath

Requires java, javac and jar on the build machine, similar to how we
require gcc/g++.

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

classpath: fixup
---
 package/Config.in              |  1 +
 package/classpath/Config.in    | 14 +++++++++
 package/classpath/classpath.mk | 55 ++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 package/classpath/Config.in
 create mode 100644 package/classpath/classpath.mk

diff --git a/package/Config.in b/package/Config.in
index 5ba1f05368..66e8352505 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -489,6 +489,7 @@ endmenu
 menu "Other"
 source "package/apr/Config.in"
 source "package/apr-util/Config.in"
+source "package/classpath/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
diff --git a/package/classpath/Config.in b/package/classpath/Config.in
new file mode 100644
index 0000000000..45d598498a
--- /dev/null
+++ b/package/classpath/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_CLASSPATH
+	bool "classpath"
+	depends on BR2_PACKAGE_JAMVM
+	depends on BR2_INET_IPV6
+	help
+	  GNU Classpath, Essential Libraries for Java, is a GNU
+	  project to create free core class libraries for use with
+	  virtual machines and compilers for the java programming
+	  language.
+
+	  http://classpath.org
+
+comment "classpath requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
new file mode 100644
index 0000000000..9142f69151
--- /dev/null
+++ b/package/classpath/classpath.mk
@@ -0,0 +1,55 @@
+CLASSPATH_VERSION = 0.98
+CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
+CLASSPATH_CONF_OPT = \
+	--disable-examples \
+	--disable-plugin \
+	--disable-rpath \
+	--disable-Werror \
+	--disable-gconf-peer \
+	--disable-tools
+
+CLASSPATH_DEPENDENCIES = host-pkgconf
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+CLASSPATH_CONF_OPT += --enable-alsa
+CLASSPATH_DEPENDENCIES += alsa-lib
+else
+CLASSPATH_CONF_OPT += --disable-alsa
+endif
+
+ifeq ($(BR2_PACKAGE_GMP),y)
+CLASSPATH_CONF_OPT += --enable-gmp
+CLASSPATH_DEPENDENCIES += gmp
+else
+CLASSPATH_CONF_OPT += --disable-gmp
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
+CLASSPATH_CONF_OPT += --enable-gstreamer-peer
+CLASSPATH_DEPENDENCIES += gst-plugins-base
+else
+CLASSPATH_CONF_OPT += --disable-gstreamer-peer
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
+CLASSPATH_CONF_OPT += --enable-gtk-peer
+CLASSPATH_DEPENDENCIES += libgtk2
+else
+CLASSPATH_CONF_OPT += --disable-gtk-peer
+endif
+
+ifeq ($(BR2_PACKAGE_QT),y)
+CLASSPATH_CONF_OPT += --enable-qt-peer
+CLASSPATH_DEPENDENCIES += qt
+else
+CLASSPATH_CONF_OPT += --disable-qt-peer
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
+CLASSPATH_CONF_OPT += --enable-xmlj
+CLASSPATH_DEPENDENCIES += libxml2 libxslt
+else
+CLASSPATH_CONF_OPT += --disable-xmlj
+endif
+
+$(eval $(autotools-package))

From ae10e33a504770b0141dd7582c6ca26fc43b4642 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 10:02:25 -0800
Subject: [PATCH 3460/6849] package: add jamvm jvm

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/jamvm/Config.in |  9 +++++++++
 package/jamvm/jamvm.mk  | 11 +++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 package/jamvm/Config.in
 create mode 100644 package/jamvm/jamvm.mk

diff --git a/package/Config.in b/package/Config.in
index 66e8352505..f95e29d3de 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -268,6 +268,7 @@ endmenu
 menu "Interpreter languages and scripting"
 source "package/erlang/Config.in"
 source "package/haserl/Config.in"
+source "package/jamvm/Config.in"
 source "package/lua/Config.in"
 source "package/luajit/Config.in"
 if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
new file mode 100644
index 0000000000..852c6e89f1
--- /dev/null
+++ b/package/jamvm/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_JAMVM
+	bool "jamvm"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_CLASSPATH
+	help
+	  JamVM is a new Java Virtual Machine which conforms to the
+	  JVM specification version 2 (blue book).
+
+	  http://jamvm.sf.net
diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk
new file mode 100644
index 0000000000..f0765d7cd0
--- /dev/null
+++ b/package/jamvm/jamvm.mk
@@ -0,0 +1,11 @@
+JAMVM_VERSION = 1.5.4
+JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION)
+JAMVM_DEPENDENCIES = zlib classpath
+# int inlining seems to crash jamvm, don't build shared version of internal lib
+JAMVM_CONF_OPT = \
+	--with-classpath-install-dir=/usr \
+	--disable-int-inlining \
+	--disable-shared \
+	--without-pic
+
+$(eval $(autotools-package))

From 4be86184e032652863ea826edb9018f5f9b64b7d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 10:28:31 -0800
Subject: [PATCH 3461/6849] dependencies.sh: check for java tools if classpath
 is enabled

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 9f0f6a9fb5..1b79b2395c 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -158,3 +158,11 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
        exit 1 ;
    fi
 fi
+if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
+    for prog in java javac jar; do
+	if ! which $prog > /dev/null ; then
+	    /bin/echo -e "\nYou must install '$prog' on your build machine\n" >&2
+	    exit 1
+	fi
+    done
+fi

From 261f894bb8633646162280f5a9ac1a9abb12a2e5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 04:36:54 +0000
Subject: [PATCH 3462/6849] kernel-headers: bump 3.{0, 4, 6}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.54-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 12b3956afc..6552c62b17 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.53"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.54"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.34"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.20"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.21"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.8"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.9"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.54-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.54-headers_install-fix-__packed-in-exported-kernel-head.patch

From 2422f13aaf6909d22414dba2fd8722135b1bb02b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 04:36:55 +0000
Subject: [PATCH 3463/6849] linux: bump 3.6.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index f408ad55c9..ef3b2a1023 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_6
-	bool "3.6.8"
+	bool "3.6.9"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.8" if BR2_LINUX_KERNEL_3_6
+	default "3.6.9" if BR2_LINUX_KERNEL_3_6
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 6dbd0cd4e1337e0f68d46414174813be382a9678 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 07:24:05 +0000
Subject: [PATCH 3464/6849] jquery: bump to version 1.8.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery/jquery.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index fb3a1b4080..871f7a0b4f 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -1,4 +1,4 @@
-JQUERY_VERSION = 1.7.1
+JQUERY_VERSION = 1.8.3
 JQUERY_SITE = http://code.jquery.com
 JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js
 

From 48e0da1d745435f1c64c17556fc8758c6e37ce42 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 07:24:06 +0000
Subject: [PATCH 3465/6849] jquery-validation: bump to version 1.10.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-validation/jquery-validation.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
index 7d302707ea..746b53485e 100644
--- a/package/jquery-validation/jquery-validation.mk
+++ b/package/jquery-validation/jquery-validation.mk
@@ -1,13 +1,13 @@
-JQUERY_VALIDATION_VERSION = 1.9.0
+JQUERY_VALIDATION_VERSION = 1.10.0
 JQUERY_VALIDATION_SITE = http://jquery.bassistance.de/validate
 JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip
 
 define JQUERY_VALIDATION_EXTRACT_CMDS
-	unzip -d $(BUILD_DIR) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)
+	unzip -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)
 endef
 
 define JQUERY_VALIDATION_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0644 -D $(@D)/jquery.validate.min.js \
+	$(INSTALL) -m 0644 -D $(@D)/dist/jquery.validate.min.js \
 		$(TARGET_DIR)/var/www/jquery.validate.js
 endef
 

From f290aa705db2084c0864fbf6750e4414a82e48a6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 07:24:07 +0000
Subject: [PATCH 3466/6849] jquery-sparkline: bump to version 2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-sparkline/jquery-sparkline.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index d79e7628a4..76adad60ed 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -1,4 +1,4 @@
-JQUERY_SPARKLINE_VERSION = 1.6
+JQUERY_SPARKLINE_VERSION = 2.1
 JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
 JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
 

From 694050ffa2f3cbbfe7234b434f16f02cb93fa940 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 12:09:10 -0800
Subject: [PATCH 3467/6849] dependencies.sh: only javac and jar are needed by
 classpath

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 1b79b2395c..7a02512c08 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -159,7 +159,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
    fi
 fi
 if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
-    for prog in java javac jar; do
+    for prog in javac jar; do
 	if ! which $prog > /dev/null ; then
 	    /bin/echo -e "\nYou must install '$prog' on your build machine\n" >&2
 	    exit 1

From a8249fe21efdc487aded37e001f8039d4bf14bef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 08:13:21 +0000
Subject: [PATCH 3468/6849] usb_modeswitch: bump to version 1.2.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usb_modeswitch/usb_modeswitch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index c517991c3c..653109dbea 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USB_MODESWITCH_VERSION = 1.2.4
+USB_MODESWITCH_VERSION = 1.2.5
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb-compat

From 540c24838cc0d9a11f8bf0db31b54cfd8d5ee746 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Dec 2012 08:13:22 +0000
Subject: [PATCH 3469/6849] usb_modeswitch_data: bump to version 20121109

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usb_modeswitch_data/usb_modeswitch_data.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
index a7b7072993..479137ca4a 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USB_MODESWITCH_DATA_VERSION = 20120815
+USB_MODESWITCH_DATA_VERSION = 20121109
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch

From d97187f8c813bf030b76ee9cf6d43d407d8e2966 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 12:47:19 -0800
Subject: [PATCH 3470/6849] gd: fix build with freetype but without fontconfig

Fixes http://autobuild.buildroot.net/results/3309617d2d5e14c0713dbaf9185815d79293e33b

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gd/gd.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/gd/gd.mk b/package/gd/gd.mk
index 476976430a..972d8dda42 100644
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@@ -18,6 +18,10 @@ GD_CONF_OPT = --without-x --disable-rpath
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 GD_DEPENDENCIES += fontconfig
 GD_CONF_OPT += --with-fontconfig
+endif
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+GD_DEPENDENCIES += freetype
 GD_CONF_ENV += ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 endif
 

From bf0ea51fdd963d3b955847ba7c4de6270c078428 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 30 Nov 2012 00:14:39 +0000
Subject: [PATCH 3471/6849] gmp: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 5bcc6c1be6..72673c7825 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -8,6 +8,8 @@ GMP_VERSION = 5.0.5
 GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES
+GMP_LICENSE = LGPLv3+
+GMP_LICENSE_FILES = COPYING.LIB
 
 # Bad ARM assembly breaks on pure thumb
 ifeq ($(ARCH),arm)

From 329ffe5a60d35f45087fe4aacad6e9026740617f Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 30 Nov 2012 00:14:37 +0000
Subject: [PATCH 3472/6849] argus: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/argus/argus.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index da7ecac214..a4b533055c 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -8,6 +8,8 @@ ARGUS_SOURCE:=argus_$(ARGUS_VERSION).orig.tar.gz
 ARGUS_PATCH:=argus_$(ARGUS_VERSION)-1.diff.gz
 ARGUS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/
 ARGUS_DEPENDENCIES=libpcap
+ARGUS_LICENSE = GPLv2+
+ARGUS_LICENSE_FILES = COPYING
 
 define ARGUS_DEBIAN_PATCH_APPLY
 	if [ -d $(@D)/debian/patches ]; then \

From 914274b4e446396c90c4ca4143705b12dc15d238 Mon Sep 17 00:00:00 2001
From: Simon Dawson <simond@trainfx.com>
Date: Fri, 30 Nov 2012 00:14:38 +0000
Subject: [PATCH 3473/6849] beecrypt: add license information

Signed-off-by: Simon Dawson <simond@trainfx.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/beecrypt/beecrypt.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index d165aee99e..a9cf133e60 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -7,6 +7,8 @@ BEECRYPT_VERSION = 4.2.1
 BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
 BEECRYPT_AUTORECONF = YES
 BEECRYPT_INSTALL_STAGING = YES
+BEECRYPT_LICENSE = LGPLv2.1+
+BEECRYPT_LICENSE_FILES = COPYING.LIB
 
 # beecrypt contains C++ code that g++ 4.7 doesn't really
 # like. Upstream does not seem to be really active, so workaround this

From 01263a085d222b4c39b6ab8c4ac5d4b70f69f1c5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <simond@trainfx.com>
Date: Fri, 30 Nov 2012 00:14:40 +0000
Subject: [PATCH 3474/6849] midori: add license information

Signed-off-by: Simon Dawson <simond@trainfx.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/midori/midori.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 44cce400d3..8fac3d886b 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -7,6 +7,8 @@
 MIDORI_VERSION = 0.4.6
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
+MIDORI_LICENSE = LGPLv2.1+
+MIDORI_LICENSE_FILES = COPYING
 MIDORI_DEPENDENCIES = \
 	host-intltool \
 	host-pkgconf \

From 1356ea38cdee8cfa9a532ebf2c9169585a210f50 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 30 Nov 2012 00:14:41 +0000
Subject: [PATCH 3475/6849] mpfr: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 9caf3acd40..c6f1009814 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -7,6 +7,8 @@
 MPFR_VERSION = 3.1.1
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
 MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
+MPFR_LICENSE = LGPLv3+
+MPFR_LICENSE_FILES = COPYING.LESSER
 MPFR_INSTALL_STAGING = YES
 MPFR_DEPENDENCIES = gmp
 MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)

From 39cde08e1036eab9ca5ad5a4fb231c9bf4a30522 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 14:42:18 -0800
Subject: [PATCH 3476/6849] classpath: gstreamer support needs gtk as well

Fixes http://autobuild.buildroot.net/results/80550a210a72a64c182e00dc2cb3a15ec776b658

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/classpath/classpath.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index 9142f69151..2d1255261a 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -24,6 +24,10 @@ else
 CLASSPATH_CONF_OPT += --disable-gmp
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
+CLASSPATH_CONF_OPT += --enable-gtk-peer
+CLASSPATH_DEPENDENCIES += libgtk2
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
 CLASSPATH_CONF_OPT += --enable-gstreamer-peer
 CLASSPATH_DEPENDENCIES += gst-plugins-base
@@ -31,11 +35,8 @@ else
 CLASSPATH_CONF_OPT += --disable-gstreamer-peer
 endif
 
-ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
-CLASSPATH_CONF_OPT += --enable-gtk-peer
-CLASSPATH_DEPENDENCIES += libgtk2
 else
-CLASSPATH_CONF_OPT += --disable-gtk-peer
+CLASSPATH_CONF_OPT += --disable-gtk-peer --disable-gstreamer-peer
 endif
 
 ifeq ($(BR2_PACKAGE_QT),y)

From c0975586ee3241988afc504f1e19494ef13b3189 Mon Sep 17 00:00:00 2001
From: Simon Dawson <simond@trainfx.com>
Date: Fri, 30 Nov 2012 00:14:42 +0000
Subject: [PATCH 3477/6849] oprofile: add license information

[Peter: GPLv2+ as pointed out by Arnout]
Signed-off-by: Simon Dawson <simond@trainfx.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/oprofile/oprofile.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 54c46dd3a7..75f84073b9 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -6,6 +6,8 @@
 
 OPROFILE_VERSION = 0.9.7
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
+OPROFILE_LICENSE = GPLv2+
+OPROFILE_LICENSE_FILES = COPYING
 OPROFILE_CONF_OPT = --localstatedir=/var --with-kernel-support
 OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof
 OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled

From 29d4d2c6c484b768d7eb36b03f22cb60ac9c285a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 30 Nov 2012 00:14:43 +0000
Subject: [PATCH 3478/6849] screen: add license information

[Peter: GPLv2+ as pointed out by Arnout]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/screen/screen.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index 8786322eb7..dd8a732b2e 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -6,6 +6,8 @@
 
 SCREEN_VERSION = 4.0.3
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
+SCREEN_LICENSE = GPLv2+
+SCREEN_LICENSE_FILES = COPYING
 SCREEN_DEPENDENCIES = ncurses
 SCREEN_CONF_ENV = ac_cv_header_elf_h=no ac_cv_header_dwarf_h=no \
 	CFLAGS="$(TARGET_CFLAGS) -DTERMINFO"

From 5a5eeae999150ec4dcb60d5847440fbb8fbdc341 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Dec 2012 16:00:09 -0800
Subject: [PATCH 3479/6849] jamvm: classpath needs ipv6, so jamvm as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jamvm/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 852c6e89f1..0287f80746 100644
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_JAMVM
 	bool "jamvm"
+	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_CLASSPATH
 	help
@@ -7,3 +8,6 @@ config BR2_PACKAGE_JAMVM
 	  JVM specification version 2 (blue book).
 
 	  http://jamvm.sf.net
+
+comment "jamvm requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6

From 11baa844194ab053298f966641e7081c40a394ea Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:45:59 +0000
Subject: [PATCH 3480/6849] scons: bump to version 2.2.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/scons/scons.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index d2489a021c..79fd6b198b 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,4 +1,4 @@
-SCONS_VERSION = 2.0.1
+SCONS_VERSION = 2.2.0
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
 SCONS_LICENSE = MIT

From 1bdcf9ca634648ad6c9cef38be90a7ee958f305f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:00 +0000
Subject: [PATCH 3481/6849] hdparm: bump to version 9.43

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hdparm/hdparm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index 76223f407a..f70d2329ff 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-HDPARM_VERSION = 9.42
+HDPARM_VERSION = 9.43
 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm
 HDPARM_LICENSE = BSD-Style
 HDPARM_LICENSE_FILES = LICENSE.TXT

From 34c4091d2e3fb0a37e39b0bd740bdd1c17965899 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:01 +0000
Subject: [PATCH 3482/6849] radvd: bump to version 1.9.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd-highjob.patch | 27 ---------------------------
 package/radvd/radvd.mk            |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/radvd/radvd-highjob.patch

diff --git a/package/radvd/radvd-highjob.patch b/package/radvd/radvd-highjob.patch
deleted file mode 100644
index 594543548c..0000000000
--- a/package/radvd/radvd-highjob.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ce4911c13a3ab6877c0288c8a1874decb5d0e90a Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 23 Jul 2012 09:14:24 -0300
-Subject: [PATCH] Makefile: fix high jobcount build failures
-
-gram.h is a dependency for scanner.c rather than scanner.o which is
-unused.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 04b834b..8a90ca7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -131,5 +131,5 @@ dist-hook:
- 	rm -f $(distdir)/gram.h
- 	rm -f $(distdir)/scanner.c
- 
--scanner.o: gram.h
-+scanner.c: gram.h
- 
--- 
-1.7.8.6
-
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 6151236eac..2a6072913e 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RADVD_VERSION = 1.9.1
+RADVD_VERSION = 1.9.2
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkgconf
 RADVD_AUTORECONF = YES

From 4b61d9e9a615cfadacd432212321417ca3493e56 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:02 +0000
Subject: [PATCH 3483/6849] libnl: bump to version 3.2.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index e039fd450f..9bf680ea1f 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.14
+LIBNL_VERSION = 3.2.16
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING

From a72ae74337467dff56a7b6daa6990d92b5547e32 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:03 +0000
Subject: [PATCH 3484/6849] php: bump to version 5.3.19

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 0dfb6db4bf..429017035d 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.18
+PHP_VERSION = 5.3.19
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From c35431d3e49c6e0813c5ac9786d5ca83409c6020 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:04 +0000
Subject: [PATCH 3485/6849] ipset: bump to version 6.16.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 999c5cb520..3ef97472cc 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.14
+IPSET_VERSION = 6.16.1
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf

From ea2df5659831325605a0735e8ea6e7ec6fb5dfe2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:05 +0000
Subject: [PATCH 3486/6849] ed: bump to version 1.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ed/ed.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index a97e19b943..2bb8e0e28f 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-ED_VERSION = 1.6
+ED_VERSION = 1.7
 ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"
+ED_LICENSE = GPLv3+
+ED_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 5e73912a3d3d84ec9e626d1ad5e25d6eb7691a2d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:06 +0000
Subject: [PATCH 3487/6849] polarssl: bump to version 1.2.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../polarssl/polarssl-shared-and-static-library.patch  | 10 +++++-----
 package/polarssl/polarssl.mk                           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index e11cab3f59..ec65285f8d 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,13 +9,13 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.0]
+[Gustavo: update for polarssl 1.2.3]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt
---- polarssl-1.2.0.orig/library/CMakeLists.txt	2012-11-15 15:01:58.239248830 -0300
-+++ polarssl-1.2.0/library/CMakeLists.txt	2012-11-15 15:00:10.310806353 -0300
+diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMakeLists.txt
+--- polarssl-1.2.3.orig/library/CMakeLists.txt	2012-11-27 17:16:20.735678722 -0300
++++ polarssl-1.2.3/library/CMakeLists.txt	2012-11-27 17:18:09.760457733 -0300
 @@ -1,4 +1,5 @@
  option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
 +option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.3 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index edda9bfa38..c66c633f93 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.0
+POLARSSL_VERSION = 1.2.3
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From c0170428f99b5f0fcfa21580a4297cef101b39ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:07 +0000
Subject: [PATCH 3488/6849] libcurl: bump to version 7.28.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 888f6d084b..fd00694b32 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBCURL_VERSION = 7.27.0
+LIBCURL_VERSION = 7.28.1
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_LICENSE = ICS

From ba4021769d1aa9b72179c6da7960cc08d1c52d57 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:08 +0000
Subject: [PATCH 3489/6849] hostapd: bump to version 1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd-cve-2012-4445.patch | 49 -------------------
 package/hostapd/hostapd-openssl-1.0.1.patch | 54 ---------------------
 package/hostapd/hostapd.mk                  |  4 +-
 3 files changed, 3 insertions(+), 104 deletions(-)
 delete mode 100644 package/hostapd/hostapd-cve-2012-4445.patch
 delete mode 100644 package/hostapd/hostapd-openssl-1.0.1.patch

diff --git a/package/hostapd/hostapd-cve-2012-4445.patch b/package/hostapd/hostapd-cve-2012-4445.patch
deleted file mode 100644
index 034a458019..0000000000
--- a/package/hostapd/hostapd-cve-2012-4445.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 567bacefd73782508bfe72d3624df495f0df4cd1 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 7 Oct 2012 20:06:29 +0300
-Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
-
-EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
-Message Length value properly and could end up trying to store more
-information into the message buffer than the allocated size if the first
-fragment is longer than the indicated size. This could result in hostapd
-process terminating in wpabuf length validation. Fix this by rejecting
-messages that have invalid TLS Message Length value.
-
-This would affect cases that use the internal EAP authentication server
-in hostapd either directly with IEEE 802.1X or when using hostapd as a
-RADIUS authentication server and when receiving an incorrectly
-constructed EAP-TLS message. Cases where hostapd uses an external
-authentication are not affected.
-
-Thanks to Timo Warns for finding and reporting this issue.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
-(cherry picked from commit 586c446e0ff42ae00315b014924ec669023bd8de)
----
- src/eap_server/eap_server_tls_common.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
-index e149ee3..2cbe700 100644
---- a/src/eap_server/eap_server_tls_common.c
-+++ b/src/eap_server/eap_server_tls_common.c
-@@ -224,6 +224,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
- 			return -1;
- 		}
- 
-+		if (len > message_length) {
-+			wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
-+				   "first fragment of frame (TLS Message "
-+				   "Length %d bytes)",
-+				   (int) len, (int) message_length);
-+			return -1;
-+		}
-+
- 		data->tls_in = wpabuf_alloc(message_length);
- 		if (data->tls_in == NULL) {
- 			wpa_printf(MSG_DEBUG, "SSL: No memory for message");
--- 
-1.7.4-rc1
-
diff --git a/package/hostapd/hostapd-openssl-1.0.1.patch b/package/hostapd/hostapd-openssl-1.0.1.patch
deleted file mode 100644
index 2e110f43ce..0000000000
--- a/package/hostapd/hostapd-openssl-1.0.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 17 Aug 2012 23:55:14 +0300
-Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1
-
-The mechanism to figure out key block size based on ssl->read_hash
-does not seem to work with OpenSSL 1.0.1, so add an alternative
-mechanism to figure out the NAC key size that seems to work at
-least with the current OpenSSL 1.0.1 releases.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
-(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0)
----
- src/crypto/tls_openssl.c |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 6380ce0..c4a76be 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
-+	int md_size;
- 
- 	if (conn == NULL || conn->ssl == NULL ||
- 	    conn->ssl->enc_read_ctx == NULL ||
-@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- #else
- 	h = conn->ssl->read_hash;
- #endif
-+	if (h)
-+		md_size = EVP_MD_size(h);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	else if (conn->ssl->s3)
-+		md_size = conn->ssl->s3->tmp.new_mac_secret_size;
-+#endif
-+	else
-+		return -1;
- 
-+	wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d "
-+		   "IV_len=%d", EVP_CIPHER_key_length(c), md_size,
-+		   EVP_CIPHER_iv_length(c));
- 	return 2 * (EVP_CIPHER_key_length(c) +
--		    EVP_MD_size(h) +
-+		    md_size +
- 		    EVP_CIPHER_iv_length(c));
- }
- 
--- 
-1.7.4-rc1
-
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 82d6231d4f..45a93fc7bb 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -4,13 +4,15 @@
 #
 #############################################################
 
-HOSTAPD_VERSION = 1.0
+HOSTAPD_VERSION = 1.1
 HOSTAPD_SITE = http://hostap.epitest.fi/releases
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
 HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
+HOSTAPD_LICENSE = GPLv2/BSD-3c
+HOSTAPD_LICENSE_FILES = README
 
 # libnl needs -lm (for rint) if linking statically
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

From 32ed9ebca523347b3294cecfbe9053dbc5c5df9d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:09 +0000
Subject: [PATCH 3490/6849] wpa_supplicant: bump to version 1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../wpa_supplicant-openssl-1.0.1.patch        | 54 -------------------
 package/wpa_supplicant/wpa_supplicant.mk      |  2 +-
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch

diff --git a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch b/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
deleted file mode 100644
index 2e110f43ce..0000000000
--- a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 17 Aug 2012 23:55:14 +0300
-Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1
-
-The mechanism to figure out key block size based on ssl->read_hash
-does not seem to work with OpenSSL 1.0.1, so add an alternative
-mechanism to figure out the NAC key size that seems to work at
-least with the current OpenSSL 1.0.1 releases.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
-(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0)
----
- src/crypto/tls_openssl.c |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 6380ce0..c4a76be 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
-+	int md_size;
- 
- 	if (conn == NULL || conn->ssl == NULL ||
- 	    conn->ssl->enc_read_ctx == NULL ||
-@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- #else
- 	h = conn->ssl->read_hash;
- #endif
-+	if (h)
-+		md_size = EVP_MD_size(h);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	else if (conn->ssl->s3)
-+		md_size = conn->ssl->s3->tmp.new_mac_secret_size;
-+#endif
-+	else
-+		return -1;
- 
-+	wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d "
-+		   "IV_len=%d", EVP_CIPHER_key_length(c), md_size,
-+		   EVP_CIPHER_iv_length(c));
- 	return 2 * (EVP_CIPHER_key_length(c) +
--		    EVP_MD_size(h) +
-+		    md_size +
- 		    EVP_CIPHER_iv_length(c));
- }
- 
--- 
-1.7.4-rc1
-
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index febb80cf00..71be11f117 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WPA_SUPPLICANT_VERSION = 1.0
+WPA_SUPPLICANT_VERSION = 1.1
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
 WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
 WPA_SUPPLICANT_LICENSE_FILES = README

From a781ace2a69fb6fabe8f948479d929d10659edd9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:10 +0000
Subject: [PATCH 3491/6849] lighttpd: security bump to version 1.4.32

Fixes CVE-2012-5533.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lighttpd/lighttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 08ce372360..18ffbef3db 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIGHTTPD_VERSION = 1.4.31
+LIGHTTPD_VERSION = 1.4.32
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_LICENSE = BSD-3c
 LIGHTTPD_LICENSE_FILES = COPYING

From e19201c98f554c267bcf3ad623dd6397615c8875 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:11 +0000
Subject: [PATCH 3492/6849] links: bump to version 2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/links/links.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/links/links.mk b/package/links/links.mk
index 5db2ff7e05..f7401bbd74 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-LINKS_VERSION = 2.5
+LINKS_VERSION = 2.7
 LINKS_SITE = http://links.twibright.com/download
 LINKS_DEPENDENCIES = host-pkgconf
+LINKS_LICNSE = GPLv2+
+LINKS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
 LINKS_CONF_OPT += --enable-graphics

From e1fff19a4f4f668d13aed18648e76e8b5b3b6578 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Dec 2012 04:46:12 +0000
Subject: [PATCH 3493/6849] ltrace: bump to version 0.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/Config.in                      |  3 +-
 ...-in-ARM-arch_-dis-en-able_breakpoint.patch | 67 -------------------
 package/ltrace/ltrace-0.6.0-uclibc.patch      | 22 ------
 ...0.6.0-events.patch => ltrace-events.patch} |  0
 package/ltrace/ltrace-ppc-waitstatus.patch    | 37 ++++++++++
 package/ltrace/ltrace-uclibc.patch            | 20 ++++++
 package/ltrace/ltrace.mk                      | 12 ++--
 7 files changed, 66 insertions(+), 95 deletions(-)
 delete mode 100644 package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
 delete mode 100644 package/ltrace/ltrace-0.6.0-uclibc.patch
 rename package/ltrace/{ltrace-0.6.0-events.patch => ltrace-events.patch} (100%)
 create mode 100644 package/ltrace/ltrace-ppc-waitstatus.patch
 create mode 100644 package/ltrace/ltrace-uclibc.patch

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 4cce76748c..9fd9aaaef8 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
-	depends on !BR2_xtensa
+	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
diff --git a/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch b/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
deleted file mode 100644
index c005932900..0000000000
--- a/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c46448f4e5a4c124fbc75ca9b14697212e676893 Mon Sep 17 00:00:00 2001
-From: Michael K. Edwards <m.k.edwards@gmail.com>
-Date: Mon, 7 Mar 2011 16:15:48 +0000
-Subject: [PATCH] fix type punning in ARM arch_(dis|en)able_breakpoint
-
----
- sysdeps/linux-gnu/arm/breakpoint.c |   26 ++++++++++++++++++--------
- 1 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/sysdeps/linux-gnu/arm/breakpoint.c b/sysdeps/linux-gnu/arm/breakpoint.c
-index 4a5ab92..4e17940 100644
---- a/sysdeps/linux-gnu/arm/breakpoint.c
-+++ b/sysdeps/linux-gnu/arm/breakpoint.c
-@@ -35,10 +35,15 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
- 	debug(1, "arch_enable_breakpoint(%d,%p)", pid, sbp->addr);
- 
- 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
--		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
--		unsigned char *bytes = (unsigned char *)&a;
-+		union _ { long l; unsigned char b[SIZEOF_LONG]; };
-+		union _ orig, current;
-+		unsigned char *bytes = current.b;
-+		for (j = 0; j < sizeof(long); j++) {
-+			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
-+		}
-+		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
- 
--		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
-+		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
- 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
- 
- 			sbp->orig_value[i * sizeof(long) + j] = bytes[j];
-@@ -49,7 +54,7 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
- 				bytes[j] = thumb_break_insn[i * sizeof(long) + j];
- 			}
- 		}
--		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
-+		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
- 	}
- }
- 
-@@ -60,13 +65,18 @@ arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) {
- 	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
- 
- 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
--		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
--		unsigned char *bytes = (unsigned char *)&a;
-+		union _ { long l; unsigned char b[SIZEOF_LONG]; };
-+		union _ orig, current;
-+		unsigned char *bytes = current.b;
-+		for (j = 0; j < sizeof(long); j++) {
-+			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
-+		}
-+		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
- 
--		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
-+		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
- 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
- 			bytes[j] = sbp->orig_value[i * sizeof(long) + j];
- 		}
--		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
-+		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
- 	}
- }
--- 
-1.7.4.1
-
diff --git a/package/ltrace/ltrace-0.6.0-uclibc.patch b/package/ltrace/ltrace-0.6.0-uclibc.patch
deleted file mode 100644
index 8bec2ae0a2..0000000000
--- a/package/ltrace/ltrace-0.6.0-uclibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] configure.ac: Recognize linux-uclibc as well
-
-Ltrace works on uClibc as well as on glibc, so accept it.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ltrace-0.6.0/configure.ac
-===================================================================
---- ltrace-0.6.0.orig/configure.ac
-+++ ltrace-0.6.0/configure.ac
-@@ -11,7 +11,7 @@
- AC_CANONICAL_HOST
- 
- case "${host_os}" in
--    linux-gnu*)	HOST_OS="linux-gnu" ;;
-+    linux-gnu* | linux-uclibc*)	HOST_OS="linux-gnu" ;;
-     *)		AC_MSG_ERROR([unkown host-os ${host_osx}]) ;;
- esac
- AC_SUBST(HOST_OS)
diff --git a/package/ltrace/ltrace-0.6.0-events.patch b/package/ltrace/ltrace-events.patch
similarity index 100%
rename from package/ltrace/ltrace-0.6.0-events.patch
rename to package/ltrace/ltrace-events.patch
diff --git a/package/ltrace/ltrace-ppc-waitstatus.patch b/package/ltrace/ltrace-ppc-waitstatus.patch
new file mode 100644
index 0000000000..fa87ea43ea
--- /dev/null
+++ b/package/ltrace/ltrace-ppc-waitstatus.patch
@@ -0,0 +1,37 @@
+From faa8dfe0507b56fb8a7666e326177aec7f364071 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 3 Dec 2012 11:12:08 -0300
+Subject: [PATCH] Fix build failure on ppc
+
+ppc/trace.c is using waitstatus bits without including the appropiate
+headers, leading to a build failure:
+
+libtool: link:
+/home/gustavoz/b/test/output/host/usr/bin/powerpc-buildroot-linux-uclibc-gcc
+-Wall -Wsign-compare -Wfloat-equal -Wformat-security -pipe -Os -o ltrace
+main.o  ./.libs/libltrace.a -lelf
+./.libs/libltrace.a(lt1-trace.o): In function `syscall_p':
+trace.c:(.text+0x28): undefined reference to `WIFSTOPPED'
+trace.c:(.text+0x40): undefined reference to `WSTOPSIG'
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ sysdeps/linux-gnu/ppc/trace.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c
+index c152101..4357a1e 100644
+--- a/sysdeps/linux-gnu/ppc/trace.c
++++ b/sysdeps/linux-gnu/ppc/trace.c
+@@ -29,6 +29,8 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <string.h>
++#include <sys/types.h>
++#include <sys/wait.h>
+ 
+ #include "backend.h"
+ #include "breakpoint.h"
+-- 
+1.7.8.6
+
diff --git a/package/ltrace/ltrace-uclibc.patch b/package/ltrace/ltrace-uclibc.patch
new file mode 100644
index 0000000000..c1041fbb38
--- /dev/null
+++ b/package/ltrace/ltrace-uclibc.patch
@@ -0,0 +1,20 @@
+[PATCH] configure.ac: Recognize linux-uclibc as well
+
+Ltrace works on uClibc as well as on glibc, so accept it.
+
+[Gustavo: update for ltrace 0.7.1]
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura ltrace-0.7.1.orig/configure.ac ltrace-0.7.1/configure.ac
+--- ltrace-0.7.1.orig/configure.ac	2012-12-03 09:02:32.995352741 -0300
++++ ltrace-0.7.1/configure.ac	2012-12-03 09:02:56.579096389 -0300
+@@ -32,7 +32,7 @@
+ AC_CANONICAL_HOST
+ 
+ case "${host_os}" in
+-    linux-gnu*)	HOST_OS="linux-gnu" ;;
++    linux-gnu* | linux-uclibc*)	HOST_OS="linux-gnu" ;;
+     *)		AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
+ esac
+ AC_SUBST(HOST_OS)
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 0e684fbdad..ca6d6215d5 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -3,10 +3,14 @@
 # ltrace
 #
 #############################################################
-LTRACE_VERSION      = 0.6.0
-LTRACE_SITE         = git://anonscm.debian.org/collab-maint/ltrace.git
+
+LTRACE_VERSION = 0.7.1
+LTRACE_SITE = http://alioth.debian.org/frs/download.php/3844
+LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
 LTRACE_DEPENDENCIES = libelf
-LTRACE_AUTORECONF   = YES
-LTRACE_CONF_OPT     += --disable-werror
+LTRACE_AUTORECONF = YES
+LTRACE_CONF_OPT = --disable-werror
+LTRACE_LICENSE = GPLv2
+LTRACE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From c0507db22c46f4a19398e5476d62e4e242075250 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Thu, 8 Nov 2012 12:04:29 +0000
Subject: [PATCH 3494/6849] netatalk: Add missing dependency to netatalk

Netatalk need host-pkgconf, otherwise the configure script is complaining.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/netatalk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index c01e360700..4063b53320 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -7,7 +7,7 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \

From b855154ee8683e87afa08c6cc50b716d22879922 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Mon, 3 Dec 2012 09:47:45 +0000
Subject: [PATCH 3495/6849] package/crosstool-ng: update to 1.17.0

Updating current crosstool-ng config files to 1.17.0
 crosstool-ng.config-eglibc
 crosstool-ng.config-glibc
 crosstool-ng.config-uClibc

Signed-off-by: Carsten Schoenert <c.schoenert@t-online.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk          |  2 +-
 .../crosstool-ng.config-eglibc                | 73 +++++++++++++-----
 .../crosstool-ng.config-glibc                 | 74 ++++++++++++++-----
 .../crosstool-ng.config-uClibc                | 71 +++++++++++++-----
 4 files changed, 165 insertions(+), 55 deletions(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 5bc65e1d67..3b207a24e1 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.16.0
+CROSSTOOL_NG_VERSION           = 1.17.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 6c559219ef..1b523ec555 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,12 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.16.0 Configuration
-# Sun Aug  5 20:02:42 2012
+# crosstool-NG 1.17.0 Configuration
+# Mon Dec  3 20:10:26 2012
 #
 CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
-CT_BACKEND=y
 CT_MODULES=y
 
 #
@@ -18,15 +16,16 @@ CT_MODULES=y
 #
 # CT_OBSOLETE is not set
 # CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
 
 #
 # Paths
 #
 CT_LOCAL_TARBALLS_DIR=""
-CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/.build"
 CT_PREFIX_DIR=""
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_RM_RF_PREFIX_DIR=y
 CT_REMOVE_DOCS=y
 # CT_INSTALL_DIR_RO is not set
 # CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
@@ -58,16 +57,15 @@ CT_PATCH_ORDER="bundled"
 #
 # Build behavior
 #
-
-#
-# Build options hiden
-#
 CT_PARALLEL_JOBS=0
 CT_LOAD=0
 CT_USE_PIPES=y
 CT_EXTRA_FLAGS_FOR_HOST=""
-CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
-CT_CONFIG_SHELL="/bin/sh"
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
 
 #
 # Logging
@@ -111,8 +109,27 @@ CT_ARCH_BITNESS=32
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
+# CT_ARCH_alpha is not set
 CT_ARCH_arm=y
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
+# CT_ARCH_x86 is not set
+CT_ARCH_alpha_AVAILABLE=y
 CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_microblaze_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
 
 #
 # Generic target options
@@ -178,24 +195,31 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.5"
+CT_KERNEL_VERSION="3.6.3"
+# CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
+CT_KERNEL_bare_metal_AVAILABLE=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_5=y
-# CT_KERNEL_V_3_4_7 is not set
+CT_KERNEL_V_3_6_3=y
+# CT_KERNEL_V_3_6_2 is not set
+# CT_KERNEL_V_3_6_1 is not set
+# CT_KERNEL_V_3_6 is not set
+# CT_KERNEL_V_3_5_7 is not set
+# CT_KERNEL_V_3_4_15 is not set
 # CT_KERNEL_V_3_3_8 is not set
-# CT_KERNEL_V_3_2_25 is not set
+# CT_KERNEL_V_3_2_32 is not set
 # CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_39 is not set
+# CT_KERNEL_V_3_0_48 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
 # CT_KERNEL_V_2_6_33_20 is not set
-# CT_KERNEL_V_2_6_32_59 is not set
+# CT_KERNEL_V_2_6_32_60 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_62 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
+CT_KERNEL_mingw32_AVAILABLE=y
 
 #
 # Common kernel options
@@ -235,6 +259,7 @@ CT_BINUTILS_LINKER_LD=y
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
 CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
 
 #
 # C compiler
@@ -242,6 +267,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
+# CT_CC_V_4_7_2 is not set
 # CT_CC_V_4_6_3 is not set
 # CT_CC_V_4_6_2 is not set
 # CT_CC_V_4_6_1 is not set
@@ -323,6 +349,8 @@ CT_CC_GCC_LDBL_128=m
 CT_LIBC="eglibc"
 CT_LIBC_VERSION="2_12"
 CT_LIBC_eglibc=y
+# CT_LIBC_glibc is not set
+# CT_LIBC_uClibc is not set
 CT_LIBC_eglibc_AVAILABLE=y
 # CT_LIBC_EGLIBC_V_2_16 is not set
 # CT_LIBC_EGLIBC_V_2_15 is not set
@@ -343,6 +371,11 @@ CT_EGLIBC_REVISION="HEAD"
 # CT_EGLIBC_CHECKOUT is not set
 CT_EGLIBC_OPT_SIZE=y
 # CT_EGLIBC_CUSTOM_CONFIG is not set
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_NPTL=y
 CT_LIBC_SUPPORT_LINUXTHREADS=y
@@ -393,12 +426,16 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.5"
+CT_LIBC_GLIBC_MIN_KERNEL="3.6.3"
 
 #
 # Debug facilities
 #
+# CT_DEBUG_dmalloc is not set
+# CT_DEBUG_duma is not set
 # CT_DEBUG_gdb is not set
+# CT_DEBUG_ltrace is not set
+# CT_DEBUG_strace is not set
 
 #
 # Companion libraries
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 3910bdbedd..026c7fdc0f 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,12 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.16.0 Configuration
-# Sun Aug  5 21:39:12 2012
+# crosstool-NG 1.17.0 Configuration
+# Mon Dec  3 20:16:52 2012
 #
 CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
-CT_BACKEND=y
 CT_MODULES=y
 
 #
@@ -18,15 +16,16 @@ CT_MODULES=y
 #
 # CT_OBSOLETE is not set
 # CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
 
 #
 # Paths
 #
 CT_LOCAL_TARBALLS_DIR=""
-CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/.build"
 CT_PREFIX_DIR=""
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_RM_RF_PREFIX_DIR=y
 CT_REMOVE_DOCS=y
 # CT_INSTALL_DIR_RO is not set
 # CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
@@ -58,16 +57,15 @@ CT_PATCH_ORDER="bundled"
 #
 # Build behavior
 #
-
-#
-# Build options hiden
-#
 CT_PARALLEL_JOBS=0
 CT_LOAD=0
 CT_USE_PIPES=y
 CT_EXTRA_FLAGS_FOR_HOST=""
-CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
-CT_CONFIG_SHELL="/bin/sh"
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
 
 #
 # Logging
@@ -111,8 +109,27 @@ CT_ARCH_BITNESS=32
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
+# CT_ARCH_alpha is not set
 CT_ARCH_arm=y
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
+# CT_ARCH_x86 is not set
+CT_ARCH_alpha_AVAILABLE=y
 CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_microblaze_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
 
 #
 # Generic target options
@@ -178,24 +195,31 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.5"
+CT_KERNEL_VERSION="3.6.3"
+# CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
+CT_KERNEL_bare_metal_AVAILABLE=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_5=y
-# CT_KERNEL_V_3_4_7 is not set
+CT_KERNEL_V_3_6_3=y
+# CT_KERNEL_V_3_6_2 is not set
+# CT_KERNEL_V_3_6_1 is not set
+# CT_KERNEL_V_3_6 is not set
+# CT_KERNEL_V_3_5_7 is not set
+# CT_KERNEL_V_3_4_15 is not set
 # CT_KERNEL_V_3_3_8 is not set
-# CT_KERNEL_V_3_2_25 is not set
+# CT_KERNEL_V_3_2_32 is not set
 # CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_39 is not set
+# CT_KERNEL_V_3_0_48 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
 # CT_KERNEL_V_2_6_33_20 is not set
-# CT_KERNEL_V_2_6_32_59 is not set
+# CT_KERNEL_V_2_6_32_60 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_62 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
+CT_KERNEL_mingw32_AVAILABLE=y
 
 #
 # Common kernel options
@@ -235,6 +259,7 @@ CT_BINUTILS_LINKER_LD=y
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
 CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
 
 #
 # C compiler
@@ -242,6 +267,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
+# CT_CC_V_4_7_2 is not set
 # CT_CC_V_4_6_3 is not set
 # CT_CC_V_4_6_2 is not set
 # CT_CC_V_4_6_1 is not set
@@ -322,9 +348,11 @@ CT_CC_GCC_LDBL_128=m
 #
 CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
+# CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
+# CT_LIBC_uClibc is not set
+CT_LIBC_eglibc_AVAILABLE=y
 CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_GLIBC_TARBALL=y
 # CT_LIBC_GLIBC_V_2_14_1 is not set
 # CT_LIBC_GLIBC_V_2_14 is not set
 # CT_LIBC_GLIBC_V_2_13 is not set
@@ -335,6 +363,10 @@ CT_LIBC_GLIBC_TARBALL=y
 # CT_LIBC_GLIBC_V_2_10_1 is not set
 CT_LIBC_GLIBC_V_2_9=y
 # CT_LIBC_GLIBC_V_2_8 is not set
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_NPTL=y
 CT_THREADS="nptl"
@@ -359,7 +391,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.5"
+CT_LIBC_GLIBC_MIN_KERNEL="3.6.3"
 
 #
 # glibc other options
@@ -388,7 +420,11 @@ CT_LIBC_GLIBC_MIN_KERNEL="3.5"
 #
 # Debug facilities
 #
+# CT_DEBUG_dmalloc is not set
+# CT_DEBUG_duma is not set
 # CT_DEBUG_gdb is not set
+# CT_DEBUG_ltrace is not set
+# CT_DEBUG_strace is not set
 
 #
 # Companion libraries
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 5155e6c673..8ad481fe67 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,12 +1,10 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG 1.16.0 Configuration
-# Sun Aug  5 17:33:46 2012
+# crosstool-NG 1.17.0 Configuration
+# Mon Dec  3 20:17:58 2012
 #
 CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_cvs=y
 CT_CONFIGURE_has_svn=y
-CT_BACKEND=y
 CT_MODULES=y
 
 #
@@ -18,15 +16,16 @@ CT_MODULES=y
 #
 # CT_OBSOLETE is not set
 # CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
 
 #
 # Paths
 #
 CT_LOCAL_TARBALLS_DIR=""
-CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/.build"
 CT_PREFIX_DIR=""
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_RM_RF_PREFIX_DIR=y
 CT_REMOVE_DOCS=y
 # CT_INSTALL_DIR_RO is not set
 # CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
@@ -58,16 +57,15 @@ CT_PATCH_ORDER="bundled"
 #
 # Build behavior
 #
-
-#
-# Build options hiden
-#
 CT_PARALLEL_JOBS=0
 CT_LOAD=0
 CT_USE_PIPES=y
 CT_EXTRA_FLAGS_FOR_HOST=""
-CT_CONFIG_SHELL_CUSTOM_PATH="/bin/sh"
-CT_CONFIG_SHELL="/bin/sh"
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
 
 #
 # Logging
@@ -111,8 +109,27 @@ CT_ARCH_BITNESS=32
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
+# CT_ARCH_alpha is not set
 CT_ARCH_arm=y
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
+# CT_ARCH_x86 is not set
+CT_ARCH_alpha_AVAILABLE=y
 CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_microblaze_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
 
 #
 # Generic target options
@@ -178,24 +195,31 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.5"
+CT_KERNEL_VERSION="3.6.3"
+# CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
+CT_KERNEL_bare_metal_AVAILABLE=y
 CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_5=y
-# CT_KERNEL_V_3_4_7 is not set
+CT_KERNEL_V_3_6_3=y
+# CT_KERNEL_V_3_6_2 is not set
+# CT_KERNEL_V_3_6_1 is not set
+# CT_KERNEL_V_3_6 is not set
+# CT_KERNEL_V_3_5_7 is not set
+# CT_KERNEL_V_3_4_15 is not set
 # CT_KERNEL_V_3_3_8 is not set
-# CT_KERNEL_V_3_2_25 is not set
+# CT_KERNEL_V_3_2_32 is not set
 # CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_39 is not set
+# CT_KERNEL_V_3_0_48 is not set
 # CT_KERNEL_V_2_6_39_4 is not set
 # CT_KERNEL_V_2_6_38_8 is not set
 # CT_KERNEL_V_2_6_37_6 is not set
 # CT_KERNEL_V_2_6_36_4 is not set
 # CT_KERNEL_V_2_6_33_20 is not set
-# CT_KERNEL_V_2_6_32_59 is not set
+# CT_KERNEL_V_2_6_32_60 is not set
 # CT_KERNEL_V_2_6_31_14 is not set
 # CT_KERNEL_V_2_6_27_62 is not set
 # CT_KERNEL_LINUX_CUSTOM is not set
+CT_KERNEL_mingw32_AVAILABLE=y
 
 #
 # Common kernel options
@@ -234,6 +258,7 @@ CT_BINUTILS_LINKER_LD=y
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
 CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
 
 #
 # C compiler
@@ -241,6 +266,7 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.6"
 CT_CC_gcc=y
+# CT_CC_V_4_7_2 is not set
 # CT_CC_V_4_6_3 is not set
 # CT_CC_V_4_6_2 is not set
 # CT_CC_V_4_6_1 is not set
@@ -321,7 +347,14 @@ CT_CC_GCC_LDBL_128=m
 #
 CT_LIBC="uClibc"
 CT_LIBC_VERSION="0.9.33.2"
+# CT_LIBC_eglibc is not set
+# CT_LIBC_glibc is not set
 CT_LIBC_uClibc=y
+CT_LIBC_eglibc_AVAILABLE=y
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
 CT_LIBC_uClibc_AVAILABLE=y
 CT_LIBC_UCLIBC_V_0_9_33_2=y
 # CT_LIBC_UCLIBC_V_0_9_33_1 is not set
@@ -369,7 +402,11 @@ CT_LIBC_UCLIBC_WCHAR=y
 #
 # Debug facilities
 #
+# CT_DEBUG_dmalloc is not set
+# CT_DEBUG_duma is not set
 # CT_DEBUG_gdb is not set
+# CT_DEBUG_ltrace is not set
+# CT_DEBUG_strace is not set
 
 #
 # Companion libraries

From f44221c4598e3f5d96b7004b6b3fdb42edc08b0e Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 3 Dec 2012 06:12:11 +0000
Subject: [PATCH 3496/6849] perl: bump to version 5.16.2

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 391047d382..a86ee2afd4 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 PERL_VERSION_MAJOR = 16
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_LICENSE = Artistic

From fa0cea21cdee6c5ac46fba3cceb989419083a432 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 3 Dec 2012 06:12:12 +0000
Subject: [PATCH 3497/6849] luajit: bump to version 2.0.0

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luajit/luajit-01-root-path.patch      |  2 +-
 package/luajit/luajit-04-no-bin-symlink.patch | 18 ++----------------
 package/luajit/luajit.mk                      |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/package/luajit/luajit-01-root-path.patch b/package/luajit/luajit-01-root-path.patch
index 80ad1e9da4..cc2f04f6a6 100644
--- a/package/luajit/luajit-01-root-path.patch
+++ b/package/luajit/luajit-01-root-path.patch
@@ -18,5 +18,5 @@ Index: b/src/luaconf.h
 +#define LUA_LDIR	LUA_ROOT "share/lua/"
 +#define LUA_CDIR	LUA_ROOT "lib/lua/"
  #ifdef LUA_XROOT
- #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta11/"
+ #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0/"
  #define LUA_XPATH \
diff --git a/package/luajit/luajit-04-no-bin-symlink.patch b/package/luajit/luajit-04-no-bin-symlink.patch
index 91a470a66e..0de3162027 100644
--- a/package/luajit/luajit-04-no-bin-symlink.patch
+++ b/package/luajit/luajit-04-no-bin-symlink.patch
@@ -6,7 +6,7 @@ Index: b/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -43,8 +43,7 @@
+@@ -42,8 +42,7 @@
  INSTALL_MAN= $(INSTALL_SHARE)/man/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
@@ -16,7 +16,7 @@ Index: b/Makefile
  INSTALL_ANAME= libluajit-$(ABIVER).a
  INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
  INSTALL_SOSHORT= libluajit-$(ABIVER).so
-@@ -58,7 +57,6 @@
+@@ -57,7 +56,6 @@
  INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
  INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
  INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
@@ -24,17 +24,3 @@ Index: b/Makefile
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
  
  INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-@@ -120,13 +118,6 @@
- 	  $(RM) $(FILE_PC).tmp
- 	cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
- 	cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
--	@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
--	@echo ""
--	@echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
--	@echo "You can do this now by running this command (with sudo):"
--	@echo ""
--	@echo "  $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
--	@echo ""
- 
- uninstall:
- 	@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 2583f929bb..844122e900 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUAJIT_VERSION = 2.0.0-beta11
+LUAJIT_VERSION = 2.0.0
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE    = http://luajit.org/download
 LUAJIT_LICENSE = MIT

From ac3ee237d96731b869eeca435e1b8351aacd245b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Dec 2012 10:17:56 -0800
Subject: [PATCH 3498/6849] jamvm: force ARM mode when building to avoid thumb2
 build problems

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jamvm/jamvm.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk
index f0765d7cd0..3f05361362 100644
--- a/package/jamvm/jamvm.mk
+++ b/package/jamvm/jamvm.mk
@@ -8,4 +8,10 @@ JAMVM_CONF_OPT = \
 	--disable-shared \
 	--without-pic
 
+# jamvm has ARM assembly code that cannot be compiled in Thumb2 mode,
+# so we must force traditional ARM mode.
+ifeq ($(BR2_arm),y)
+JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm"
+endif
+
 $(eval $(autotools-package))

From d87847203f3b1b6af51515978563f0dee737b6fd Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 5 Dec 2012 08:06:51 +0000
Subject: [PATCH 3499/6849] linenoise: new package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/linenoise/Config.in                   |  6 +++
 package/linenoise/linenoise-get-columns.patch | 20 +++++++++
 package/linenoise/linenoise.mk                | 45 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 package/linenoise/Config.in
 create mode 100644 package/linenoise/linenoise-get-columns.patch
 create mode 100644 package/linenoise/linenoise.mk

diff --git a/package/Config.in b/package/Config.in
index f95e29d3de..ae94705c3c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -525,6 +525,7 @@ menu "Text and terminal handling"
 source "package/enchant/Config.in"
 source "package/icu/Config.in"
 source "package/libiconv/Config.in"
+source "package/linenoise/Config.in"
 source "package/ncurses/Config.in"
 source "package/newt/Config.in"
 source "package/pcre/Config.in"
diff --git a/package/linenoise/Config.in b/package/linenoise/Config.in
new file mode 100644
index 0000000000..8e4ab91da5
--- /dev/null
+++ b/package/linenoise/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LINENOISE
+	bool "linenoise"
+	help
+	  A small self-contained alternative to readline and libedit
+
+	  https://github.com/antirez/linenoise
diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch
new file mode 100644
index 0000000000..4fb9e40855
--- /dev/null
+++ b/package/linenoise/linenoise-get-columns.patch
@@ -0,0 +1,20 @@
+returns the default value (80) when a real value is not available
+(0 is not an acceptable value for COLUMNS, the width of the screen).
+
+see pull request on upstream : http://github.com/antirez/linenoise/pull/31
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/linenoise.c
+===================================================================
+--- a/linenoise.c
++++ b/linenoise.c
+@@ -182,7 +182,7 @@
+ static int getColumns(void) {
+     struct winsize ws;
+ 
+-    if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
++    if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
+     return ws.ws_col;
+ }
+ 
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
new file mode 100644
index 0000000000..343a107569
--- /dev/null
+++ b/package/linenoise/linenoise.mk
@@ -0,0 +1,45 @@
+#############################################################
+#
+# linenoise
+#
+#############################################################
+LINENOISE_VERSION = g8c9b481
+LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
+LINENOISE_LICENSE = BSD-2c
+LINENOISE_INSTALL_STAGING = YES
+
+define LINENOISE_BUILD_CMDS
+	cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -c linenoise.c
+	cd $(@D); $(TARGET_AR) rcu liblinenoise.a linenoise.o
+	cd $(@D); $(TARGET_CC) $(TARGET_LDFLAGS) -o linenoise_example example.c -L. -llinenoise
+endef
+
+define LINENOISE_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 644 -D $(@D)/linenoise.h          $(STAGING_DIR)/usr/include/linenoise.h
+	$(INSTALL) -m 644 -D $(@D)/liblinenoise.a       $(STAGING_DIR)/usr/lib/liblinenoise.a
+	$(INSTALL) -m 755 -D $(@D)/linenoise_example    $(STAGING_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_UNINSTALL_STAGING_CMDS
+	rm -f   $(STAGING_DIR)/usr/include/linenoise.h
+	rm -f   $(STAGING_DIR)/usr/lib/liblinenoise.a
+	rm -f   $(STAGING_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 644 -D $(@D)/linenoise.h          $(TARGET_DIR)/usr/include/linenoise.h
+	$(INSTALL) -m 644 -D $(@D)/liblinenoise.a       $(TARGET_DIR)/usr/lib/liblinenoise.a
+	$(INSTALL) -m 755 -D $(@D)/linenoise_example    $(TARGET_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_UNINSTALL_TARGET_CMDS
+	rm -f   $(TARGET_DIR)/usr/include/linenoise.h
+	rm -f   $(TARGET_DIR)/usr/lib/liblinenoise.a
+	rm -f   $(TARGET_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_CLEAN_CMDS
+	rm -f $(@D)/*.o $(@D)/*.a $(@D)/linenoise_example
+endef
+
+$(eval $(generic-package))

From 635bebf559f4f76bc4fa49c3ccb468476a654151 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 3 Dec 2012 06:12:14 +0000
Subject: [PATCH 3500/6849] lua: support linenoise

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/Config.in              | 17 +++++++++++++++++
 package/lua/lua-11-linenoise.patch | 24 ++++++++++++++++++++++++
 package/lua/lua.mk                 |  8 +++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 package/lua/lua-11-linenoise.patch

diff --git a/package/lua/Config.in b/package/lua/Config.in
index 8233e2a69b..4166730269 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -7,6 +7,15 @@ config BR2_PACKAGE_LUA
 
 if BR2_PACKAGE_LUA
 
+choice
+	prompt "Lua Interpreter command-line editing"
+	default BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+
+config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+	bool "none"
+	help
+	  None.
+
 config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	bool "readline support"
 	select BR2_PACKAGE_READLINE
@@ -14,4 +23,12 @@ config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	help
 	  Enables command-line editing in the lua interpreter.
 
+config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
+	bool "linenoise support"
+	select BR2_PACKAGE_LINENOISE
+	help
+	  Enables command-line editing in the lua interpreter.
+
+endchoice
+
 endif
diff --git a/package/lua/lua-11-linenoise.patch b/package/lua/lua-11-linenoise.patch
new file mode 100644
index 0000000000..488c080a1e
--- /dev/null
+++ b/package/lua/lua-11-linenoise.patch
@@ -0,0 +1,24 @@
+Add support of linenoise (replace readline)
+
+see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/src/luaconf.h
+===================================================================
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -279,6 +279,13 @@
+ 	if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
+ 	  add_history(lua_tostring(L, idx));  /* add it to history */
+ #define lua_freeline(L,b)	((void)L, free(b))
++#elif defined(LUA_USE_LINENOISE)
++#include <linenoise.h>
++#define lua_readline(L,b,p)	((void)L, ((b)=linenoise(p)) != NULL)
++#define lua_saveline(L,idx) \
++	if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
++	  linenoiseHistoryAdd(lua_tostring(L, idx));  /* add it to history */
++#define lua_freeline(L,b)	((void)L, free(b))
+ #else
+ #define lua_readline(L,b,p)	\
+ 	((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 9e0d38764c..32acc999d8 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -16,10 +16,16 @@ LUA_MYLIBS += -ldl
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
 	LUA_DEPENDENCIES = readline ncurses
 	LUA_MYLIBS += -lreadline -lhistory -lncurses
-	LUA_CFLAGS += -DLUA_USE_LINUX
+	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE
+else
+ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y)
+	LUA_DEPENDENCIES = linenoise
+	LUA_MYLIBS += -llinenoise
+	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_LINENOISE
 else
 	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 endif
+endif
 
 # We never want to have host-readline and host-ncurses as dependencies
 # of host-lua.

From 34ae9eb63db4ff48da4ed45b9b48997e7c6cd590 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 5 Dec 2012 08:39:07 +0000
Subject: [PATCH 3501/6849] neard: new package

[Peter: add toolchain dependencies for libglib2/libnl/dbus + host-pkgconf]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/neard/Config.in | 18 ++++++++++++++++++
 package/neard/neard.mk  | 14 ++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 package/neard/Config.in
 create mode 100644 package/neard/neard.mk

diff --git a/package/Config.in b/package/Config.in
index ae94705c3c..40ca8e6825 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -237,6 +237,7 @@ source "package/mdadm/Config.in"
 source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
+source "package/neard/Config.in"
 source "package/ofono/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
diff --git a/package/neard/Config.in b/package/neard/Config.in
new file mode 100644
index 0000000000..bcf6171280
--- /dev/null
+++ b/package/neard/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_NEARD
+	bool "neard"
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl / dbus
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBNL
+	help
+	  Near Field Communication (NFC) manager. This userspace daemon is
+	  a part of the NFC stack provided by the Linux NFC project.
+
+	  http://git.kernel.org/?p=network/nfc/neard.git;a=summary
+
+	  https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
+
+comment "neard requires a toolchain with WCHAR and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
new file mode 100644
index 0000000000..2d3e30e26d
--- /dev/null
+++ b/package/neard/neard.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# neard
+#
+#############################################################
+NEARD_VERSION = 0.8
+NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
+NEARD_LICENSE = GPLv2
+NEARD_LICENSE_FILES = COPYING
+
+NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl
+NEARD_CONF_OPT = --disable-traces
+
+$(eval $(autotools-package))

From 907ff8983e51046cd9fddd884440e83545a38088 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 5 Dec 2012 08:40:23 +0000
Subject: [PATCH 3502/6849] neardal: new package

[Peter: add toolchain deps for dbus. add dbus/host-pkgconf, wrap help text]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  (built-test on a minimal powerpc config)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/neardal/Config.in  | 15 +++++++++++++++
 package/neardal/neardal.mk | 16 ++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/neardal/Config.in
 create mode 100644 package/neardal/neardal.mk

diff --git a/package/Config.in b/package/Config.in
index 40ca8e6825..74e439ea16 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -424,6 +424,7 @@ source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
 source "package/mtdev/Config.in"
+source "package/neardal/Config.in"
 source "package/pcsc-lite/Config.in"
 endmenu
 
diff --git a/package/neardal/Config.in b/package/neardal/Config.in
new file mode 100644
index 0000000000..045ccee161
--- /dev/null
+++ b/package/neardal/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_NEARDAL
+	bool "neardal"
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS_GLIB
+	help
+	  Provides a simple C API to exchange data with the neard NFC
+	  manager daemon.
+
+	  https://github.com/connectivity/neardal
+
+comment "neardal requires a toolchain with WCHAR and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk
new file mode 100644
index 0000000000..66b729d6f9
--- /dev/null
+++ b/package/neardal/neardal.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# neardal
+#
+#############################################################
+NEARDAL_VERSION = 0.7
+NEARDAL_SITE = http://github.com/connectivity/neardal/tarball/$(NEARDAL_VERSION)
+NEARDAL_SOURCE = connectivity-neardal-$(NEARDAL_VERSION).tar.gz
+NEARDAL_INSTALL_STAGING = YES
+NEARDAL_LICENSE = GPLv2
+NEARDAL_LICENSE_FILES = COPYING
+
+NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib
+NEARDAL_AUTORECONF = YES
+
+$(eval $(autotools-package))

From 7f77121fdde5a0c16d9b6968c71e982d3e953d25 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Mon, 3 Dec 2012 00:05:51 +0000
Subject: [PATCH 3503/6849] make legal-info: fails with OVERRIDE_SRCDIR

There is a check for OVERRIDE_SRCDIR in pkg-generic.mk that is
supposed to produce a warning when OVERRIDE_SRCDIR is active.
This does not work and instead the whole make terminates with
an error message.

This patch changes the check for active OVERRIDE_SRCDIR so that
it works as expected.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 6fcd359ee4..fc05dc66bb 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -477,7 +477,7 @@ ifneq ($(call qstrip,$$($(2)_SOURCE)),)
 ifeq ($$($(2)_SITE_METHOD),local)
 # Packages without a tarball: don't save and warn
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
-else ifeq ($$($(2)_SITE_METHOD),override)
+else ifneq ($$($(2)_OVERRIDE_SRCDIR),)
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
 else
 # Other packages

From e63dcf20e2e457534346b144b32a2c4abe469a29 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Dec 2012 09:41:52 -0800
Subject: [PATCH 3504/6849] libpcap: fix canusb related build issue

Fixes http://autobuild.buildroot.net/results/1b57e479a643df11ea3b20f848085af4ef40799b

The libusb auto detection oddly enough succeeds, even though libusb isn't
available. Fix it by explicitly enabling/disabling canusb support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpcap/libpcap.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index d35c22824b..7e68f5136d 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -20,12 +20,18 @@ LIBPCAP_INSTALL_STAGING = YES
 # configure script correctly handles --enable-shared/--disable-shared.
 LIBPCAP_AUTORECONF = YES
 
-LIBPCAP_DEPENDENCIES = zlib \
-	$(if $(BR2_PACKAGE_LIBUSB),libusb)
+LIBPCAP_DEPENDENCIES = zlib
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+LIBPCAP_CONF_OPT += --enable-canusb
+LIBPCAP_DEPENDENCIES += libusb
+else
+LIBPCAP_CONF_OPT += --disable-canusb
+endif
+
 # microblaze needs -fPIC instead of -fpic
 ifeq ($(BR2_microblaze),y)
 LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"

From 36c76398dcb5ee604ae24f384d7055ef37b23568 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Dec 2012 10:18:55 -0800
Subject: [PATCH 3505/6849] toolchain-external: bfin 2012R1-BETA toolchain no
 longer available

Replace it by -RC2 instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index beba49fff2..6236235b87 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -245,10 +245,10 @@ TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
-TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/544/9749/
-TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-BETA1.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/544/9773/
-TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R1-BETA1.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9858/
+TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9866/
+TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R1-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0_le.git;a=blob;h=d7b493c5dbcc24ba9cc3be2e4c14d6d9701e6805;hb=00163583b771bb4e937632765dd0c5516b3e31c4;f=

From 9a6d3456f3e7965f30648fd09ef54b13109d210d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Dec 2012 11:39:50 -0800
Subject: [PATCH 3506/6849] alsa-lib: fix build on bfin

Bfin toolchains don't have versionsort (which alsa-lib needs), so fake it
using alphasort instead.

Fixes http://autobuild.buildroot.net/results/cf760651b2e238842813bf0882011b5fbb898c0d

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsa-lib/alsa-lib.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index eddd3d2f36..ba222db3a8 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -70,6 +70,12 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 ALSA_LIB_CONF_OPT += --with-softfloat
 endif
 
+ifeq ($(BR2_bfin),y)
+# blackfin external toolchains don't have versionsort. Fake it using alphasort
+# instead
+ALSA_LIB_CFLAGS += -Dversionsort=alphasort
+endif
+
 ALSA_LIB_CONF_ENV = CFLAGS="$(ALSA_LIB_CFLAGS)" \
 		    LDFLAGS="$(TARGET_LDFLAGS) -lm"
 

From 054f97e1f2de337ea0c788d766212a36d6d4e41c Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 6 Dec 2012 13:16:00 +0000
Subject: [PATCH 3507/6849] pkg-infra: add <pkg>-extract and <pkg>-patch
 targets to OVERRIDE support

The legal-info target (and possibly others as well) depends on
<pkg>-extract to make sure the license file is available.  However,
when <PKG>_OVERRIDE_SRCDIR is active, the <pkg>-extract target
doesn't exist.

To solve this, we add <pkg>-extract which depends on <pkg>-rsync.
While we're at it, we do the same for <pkg>-patch.  That avoids the
same problem in the future if something starts depending on
<pkg>-patch.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index fc05dc66bb..a570ad758f 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -390,6 +390,9 @@ $(1)-configure:		$(1)-depends \
 
 $(1)-depends:		$(1)-rsync $$($(2)_DEPENDENCIES)
 
+$(1)-patch:		$(1)-rsync
+$(1)-extract:		$(1)-rsync
+
 $(1)-rsync:		$$($(2)_TARGET_RSYNC)
 
 $(1)-source:		$$($(2)_TARGET_RSYNC_SOURCE)

From 5c22945d7560c4a5cf184441b8bba7e48c5d099e Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2012 02:09:36 +0000
Subject: [PATCH 3508/6849] package/crosstool-ng: bumpimg default GCC version
 to 4.6.3

This bumps the GCC version from 4.4.6 to 4.6.3 to for
*.config-eglibc
*.config-glibc
*.config-uClibc
be equal to the default GCC setting in buildroot as well in addition to
commit b855154ee8683e87afa08c6cc50b716d22879922.

Signed-off-by: Carsten Schoenert <c.schoenert@t-online.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../crosstool-ng.config-eglibc                | 26 +++++++++++++++----
 .../crosstool-ng.config-glibc                 | 26 +++++++++++++++----
 .../crosstool-ng.config-uClibc                | 26 +++++++++++++++----
 3 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 1b523ec555..11eb602ff4 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # crosstool-NG 1.17.0 Configuration
-# Mon Dec  3 20:10:26 2012
+# Sat Dec  8 12:57:07 2012
 #
 CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_svn=y
@@ -265,10 +265,10 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C compiler
 #
 CT_CC="gcc"
-CT_CC_VERSION="4.4.6"
+CT_CC_VERSION="4.6.3"
 CT_CC_gcc=y
 # CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_6_3 is not set
+CT_CC_V_4_6_3=y
 # CT_CC_V_4_6_2 is not set
 # CT_CC_V_4_6_1 is not set
 # CT_CC_V_4_6_0 is not set
@@ -277,7 +277,7 @@ CT_CC_gcc=y
 # CT_CC_V_4_5_1 is not set
 # CT_CC_V_4_5_0 is not set
 # CT_CC_V_4_4_7 is not set
-CT_CC_V_4_4_6=y
+# CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
 # CT_CC_V_4_4_3 is not set
@@ -294,12 +294,18 @@ CT_CC_V_4_4_6=y
 # CT_CC_V_4_2_2 is not set
 CT_CC_GCC_4_2_or_later=y
 CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6=y
+CT_CC_GCC_4_6_or_later=y
 CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
 CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
 # CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
@@ -326,6 +332,7 @@ CT_CC_STATIC_LIBSTDCXX=y
 # Optimisation features
 #
 CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
 
 #
 # Settings for libraries running on target
@@ -334,6 +341,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 # CT_CC_GCC_LIBMUDFLAP is not set
 # CT_CC_GCC_LIBGOMP is not set
 # CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
 
 #
 # Misc. obscure options.
@@ -342,6 +350,7 @@ CT_CC_CXA_ATEXIT=y
 # CT_CC_GCC_DISABLE_PCH is not set
 CT_CC_GCC_SJLJ_EXCEPTIONS=m
 CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
 
 #
 # C-library
@@ -445,11 +454,13 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
+CT_MPC=y
 # CT_GMP_V_5_0_2 is not set
 # CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
@@ -475,6 +486,11 @@ CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_7 is not set
 # CT_CLOOG_V_0_15_6 is not set
 CT_CLOOG_VERSION="0.15.9"
+CT_MPC_V_0_9=y
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="0.9"
 
 #
 # Companion libraries common options
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 026c7fdc0f..c30a115247 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # crosstool-NG 1.17.0 Configuration
-# Mon Dec  3 20:16:52 2012
+# Sat Dec  8 12:56:02 2012
 #
 CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_svn=y
@@ -265,10 +265,10 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C compiler
 #
 CT_CC="gcc"
-CT_CC_VERSION="4.4.6"
+CT_CC_VERSION="4.6.3"
 CT_CC_gcc=y
 # CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_6_3 is not set
+CT_CC_V_4_6_3=y
 # CT_CC_V_4_6_2 is not set
 # CT_CC_V_4_6_1 is not set
 # CT_CC_V_4_6_0 is not set
@@ -277,7 +277,7 @@ CT_CC_gcc=y
 # CT_CC_V_4_5_1 is not set
 # CT_CC_V_4_5_0 is not set
 # CT_CC_V_4_4_7 is not set
-CT_CC_V_4_4_6=y
+# CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
 # CT_CC_V_4_4_3 is not set
@@ -294,12 +294,18 @@ CT_CC_V_4_4_6=y
 # CT_CC_V_4_2_2 is not set
 CT_CC_GCC_4_2_or_later=y
 CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6=y
+CT_CC_GCC_4_6_or_later=y
 CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
 CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
 # CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
@@ -326,6 +332,7 @@ CT_CC_STATIC_LIBSTDCXX=y
 # Optimisation features
 #
 CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
 
 #
 # Settings for libraries running on target
@@ -334,6 +341,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 # CT_CC_GCC_LIBMUDFLAP is not set
 # CT_CC_GCC_LIBGOMP is not set
 # CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
 
 #
 # Misc. obscure options.
@@ -342,6 +350,7 @@ CT_CC_CXA_ATEXIT=y
 # CT_CC_GCC_DISABLE_PCH is not set
 CT_CC_GCC_SJLJ_EXCEPTIONS=m
 CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
 
 #
 # C-library
@@ -434,11 +443,13 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
+CT_MPC=y
 # CT_GMP_V_5_0_2 is not set
 # CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
@@ -464,6 +475,11 @@ CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_7 is not set
 # CT_CLOOG_V_0_15_6 is not set
 CT_CLOOG_VERSION="0.15.9"
+CT_MPC_V_0_9=y
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="0.9"
 
 #
 # Companion libraries common options
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 8ad481fe67..e93128bb55 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # crosstool-NG 1.17.0 Configuration
-# Mon Dec  3 20:17:58 2012
+# Sat Dec  8 12:50:22 2012
 #
 CT_CONFIGURE_has_xz=y
 CT_CONFIGURE_has_svn=y
@@ -264,10 +264,10 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C compiler
 #
 CT_CC="gcc"
-CT_CC_VERSION="4.4.6"
+CT_CC_VERSION="4.6.3"
 CT_CC_gcc=y
 # CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_6_3 is not set
+CT_CC_V_4_6_3=y
 # CT_CC_V_4_6_2 is not set
 # CT_CC_V_4_6_1 is not set
 # CT_CC_V_4_6_0 is not set
@@ -276,7 +276,7 @@ CT_CC_gcc=y
 # CT_CC_V_4_5_1 is not set
 # CT_CC_V_4_5_0 is not set
 # CT_CC_V_4_4_7 is not set
-CT_CC_V_4_4_6=y
+# CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
 # CT_CC_V_4_4_3 is not set
@@ -293,12 +293,18 @@ CT_CC_V_4_4_6=y
 # CT_CC_V_4_2_2 is not set
 CT_CC_GCC_4_2_or_later=y
 CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6=y
+CT_CC_GCC_4_6_or_later=y
 CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
 CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
 # CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
@@ -325,6 +331,7 @@ CT_CC_STATIC_LIBSTDCXX=y
 # Optimisation features
 #
 CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
 
 #
 # Settings for libraries running on target
@@ -333,6 +340,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
 # CT_CC_GCC_LIBMUDFLAP is not set
 # CT_CC_GCC_LIBGOMP is not set
 # CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
 
 #
 # Misc. obscure options.
@@ -341,6 +349,7 @@ CT_CC_CXA_ATEXIT=y
 # CT_CC_GCC_DISABLE_PCH is not set
 CT_CC_GCC_SJLJ_EXCEPTIONS=m
 CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
 
 #
 # C-library
@@ -416,11 +425,13 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
+CT_MPC=y
 # CT_GMP_V_5_0_2 is not set
 # CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
@@ -446,6 +457,11 @@ CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_7 is not set
 # CT_CLOOG_V_0_15_6 is not set
 CT_CLOOG_VERSION="0.15.9"
+CT_MPC_V_0_9=y
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="0.9"
 
 #
 # Companion libraries common options

From 59795cc98067fe2730e50dd3687fd94b6b36a843 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 03:46:54 +0000
Subject: [PATCH 3509/6849] libroxml: don't build docs

Don't build docs to avoid failures such as
http://autobuild.buildroot.net/results/3f1971472fe35a516b0f26ced477d33cb18280c9/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libroxml/libroxml.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index d7ef6a48df..6e690aa539 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -30,4 +30,10 @@ define LIBROXML_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
+define LIBROXML_DISABLE_DOXYGEN
+	$(SED) 's:) doxy:):' $(@D)/Makefile
+endef
+
+LIBROXML_POST_PATCH_HOOKS += LIBROXML_DISABLE_DOXYGEN
+
 $(eval $(generic-package))

From 65dbff9f7c2ff504d05eb7ab7cf22efe1ab82c18 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 03:57:36 +0000
Subject: [PATCH 3510/6849] ltrace: bump to version 0.7.2

Bump ltrace to version 0.7.2 which includes my ppc fixup patch.
Also exclude aarch64 since it's not supported, fixes
http://autobuild.buildroot.net/results/8fc3a3720d9be2525784b0488653b4fdbb29e676/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/Config.in                   |  1 +
 package/ltrace/ltrace-ppc-waitstatus.patch | 37 ----------------------
 package/ltrace/ltrace.mk                   |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/ltrace/ltrace-ppc-waitstatus.patch

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 9fd9aaaef8..c77108fc3a 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
 	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa)
+	depends on !BR2_aarch64
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
diff --git a/package/ltrace/ltrace-ppc-waitstatus.patch b/package/ltrace/ltrace-ppc-waitstatus.patch
deleted file mode 100644
index fa87ea43ea..0000000000
--- a/package/ltrace/ltrace-ppc-waitstatus.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From faa8dfe0507b56fb8a7666e326177aec7f364071 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 3 Dec 2012 11:12:08 -0300
-Subject: [PATCH] Fix build failure on ppc
-
-ppc/trace.c is using waitstatus bits without including the appropiate
-headers, leading to a build failure:
-
-libtool: link:
-/home/gustavoz/b/test/output/host/usr/bin/powerpc-buildroot-linux-uclibc-gcc
--Wall -Wsign-compare -Wfloat-equal -Wformat-security -pipe -Os -o ltrace
-main.o  ./.libs/libltrace.a -lelf
-./.libs/libltrace.a(lt1-trace.o): In function `syscall_p':
-trace.c:(.text+0x28): undefined reference to `WIFSTOPPED'
-trace.c:(.text+0x40): undefined reference to `WSTOPSIG'
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- sysdeps/linux-gnu/ppc/trace.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c
-index c152101..4357a1e 100644
---- a/sysdeps/linux-gnu/ppc/trace.c
-+++ b/sysdeps/linux-gnu/ppc/trace.c
-@@ -29,6 +29,8 @@
- #include <errno.h>
- #include <signal.h>
- #include <string.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
- 
- #include "backend.h"
- #include "breakpoint.h"
--- 
-1.7.8.6
-
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index ca6d6215d5..4b31690228 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LTRACE_VERSION = 0.7.1
+LTRACE_VERSION = 0.7.2
 LTRACE_SITE = http://alioth.debian.org/frs/download.php/3844
 LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
 LTRACE_DEPENDENCIES = libelf

From b6e514692cf301edb6917c7b8cff486473bff9c4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 04:05:41 +0000
Subject: [PATCH 3511/6849] libfuse: needs threads

libfuse needs threads, fixes:
http://autobuild.buildroot.net/results/0111a67b9ed5f5f5dfc0725d009ea5c756c1755c

[Peter: update sshfs/unionfs comments to match]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/Config.in | 5 +++--
 package/sshfs/Config.in   | 5 +++--
 package/unionfs/Config.in | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/libfuse/Config.in b/package/libfuse/Config.in
index dffadf8a12..2e9b7dc9a6 100644
--- a/package/libfuse/Config.in
+++ b/package/libfuse/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_LIBFUSE
 	bool "libfuse"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  FUSE (Filesystem in UserSpacE)
 
 	  http://fuse.sourceforge.net/
 
-comment "libfuse requires a toolchain with LARGEFILE support"
-        depends on !BR2_LARGEFILE
+comment "libfuse requires a toolchain with LARGEFILE and threads support"
+        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 37188ba82e..d0cf932bb9 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -7,10 +7,11 @@ config BR2_PACKAGE_SSHFS
 	select BR2_PACKAGE_OPENSSH
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	help
 	  FUSE filesystem client based on the SSH File Transfer Protocol.
 
 	  http://fuse.sourceforge.net/sshfs.html
 
-comment "sshfs requires a toolchain with LARGEFILE and WCHAR support"
-	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+comment "sshfs requires a toolchain with LARGEFILE, WCHAR and threads support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in
index a974c8ca24..92f1787540 100644
--- a/package/unionfs/Config.in
+++ b/package/unionfs/Config.in
@@ -2,10 +2,11 @@ config BR2_PACKAGE_UNIONFS
 	bool "unionfs (FUSE)"
 	select BR2_PACKAGE_LIBFUSE
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	help
 	  A userspace unionfs implementation.
 
 	  http://podgorny.cz/moin/UnionFsFuse
 
-comment "unionfs requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "unionfs requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From 941963d258cac48f06c1be49169d81645c5e505c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 04:13:27 +0000
Subject: [PATCH 3512/6849] bmon: needs mmu

Fixes
http://autobuild.buildroot.net/results/673b0e9a1ba75123ba2c59df8ad81550170fffef

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bmon/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bmon/Config.in b/package/bmon/Config.in
index 9692118005..61d72f0b45 100644
--- a/package/bmon/Config.in
+++ b/package/bmon/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BMON
 	bool "bmon"
 	depends on BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
 	help
 	  Linux bandwidth monitor
 

From fc3a89d1cde8da2df17fdcc42289f330c2711d9b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 04:35:02 +0000
Subject: [PATCH 3513/6849] sane-backends: fix documentation build failure

Disable documentation build, it seems to break with older
texlive/kpathsea versions, fixes:
http://autobuild.buildroot.net/results/44327b543d8918929bf252c5284e8691fda87fd0/
Also switch to alioth mirror since the original tarball is gone from the
regular site when 1.0.23 was released.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sane-backends/sane-backends.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 56ce82d866..496dca4dae 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -5,7 +5,7 @@
 #############################################################
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
-SANE_BACKENDS_SITE = ftp://ftp2.sane-project.org/pub/sane/sane-backends-$(SANE_BACKENDS_VERSION)
+SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
@@ -37,4 +37,10 @@ else
 SANE_BACKENDS_CONF_OPT += --without-snmp
 endif
 
+define SANE_BACKENDS_DISABLE_DOCS
+	$(SED) 's/ doc//' $(@D)/Makefile
+endef
+
+SANE_BACKENDS_POST_CONFIGURE_HOOKS += SANE_BACKENDS_DISABLE_DOCS
+
 $(eval $(autotools-package))

From 63eabbb11ec31e6629169c8258b4c73b90b6e8b9 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 6 Dec 2012 16:37:07 +0000
Subject: [PATCH 3514/6849] pkg-download.mk: fix multiple matches in shallow
 clone test

Move the git reference directly to git-ls-remote rather than
piping the output to grep, to help avoid reporting partial
matches rather than the actual requested reference.  Also,
add quotes to protest "test" from failing when multiple
strings are reported.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-download.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index ea01b05306..1705fcd8ed 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -82,7 +82,7 @@ domainseparator=$(if $(1),$(1),/)
 define DOWNLOAD_GIT
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	 ((test `git ls-remote  $($(PKG)_SITE) | cut -f 2- | grep $($(PKG)_DL_VERSION)` && \
+	 ((test "`git ls-remote $($(PKG)_SITE) $($(PKG)_DL_VERSION)`" && \
 	   echo "Doing shallow clone" && \
 	   $(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) || \
 	  (echo "Doing full clone" && \

From b5b4f09f293b64b2d4345170e847cbdd14e1f330 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:13:56 +0000
Subject: [PATCH 3515/6849] ccache: uses fork(), therefore only usable on MMU
 platforms

Fixes:

  http://autobuild.buildroot.org/results/2ba0eb693d24ac4ed9979762db234bfff1952c69/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ccache/Config.in b/package/ccache/Config.in
index 4a37973623..30e6578700 100644
--- a/package/ccache/Config.in
+++ b/package/ccache/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_CCACHE
 	bool "ccache"
+	# needs fork()
+	depends on BR2_USE_MMU
 	help
 	  ccache is a compiler cache. It speeds up recompilation by
 	  caching previous compilations and detecting when the same

From 28acda4b63e9ef4d1203765c83117ffabb5750e0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:13:57 +0000
Subject: [PATCH 3516/6849] ccache: deprecate the target package

Since we have deprecated the capability of building a toolchain for
the target, it makes sense to also deprecate ccache for the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ccache/Config.in b/package/ccache/Config.in
index 30e6578700..41ace52de6 100644
--- a/package/ccache/Config.in
+++ b/package/ccache/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_CCACHE
 	bool "ccache"
 	# needs fork()
 	depends on BR2_USE_MMU
+	# We no longer support a toolchain on the target
+	depends on BR2_DEPRECATED
 	help
 	  ccache is a compiler cache. It speeds up recompilation by
 	  caching previous compilations and detecting when the same

From 3c2a5ba33edd710ce58e56f81214699e56dca233 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:13:58 +0000
Subject: [PATCH 3517/6849] rt-tests: requires thread support in the toolchain

The rt-tests package extensively use threads, so this package should
only be available if the toolchain has thread support.

[Peter: add comment when not available]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rt-tests/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index e6452668c2..5c8a782782 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_RT_TESTS
 	bool "rt-tests"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Set of utilities for testing the real-time behaviour of a
 	  Linux system.
@@ -11,3 +12,6 @@ config BR2_PACKAGE_RT_TESTS
 	  Buildroot configuration.
 
 	  http://rt.wiki.kernel.org
+
+comment "rt-tests requires a toolchain with threads support"
+	!BR2_TOOLCHAIN_HAS_THREADS

From 98e16e7849e5ad63ce084e0564c84233793e6cc1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:13:59 +0000
Subject: [PATCH 3518/6849] rt-tests: not available on avr32, too old uClibc

The old uClibc used for the AVR32 architecture does not implement
priority inheritance, therefore rt-tests cannot build.

Fixes:

  http://autobuild.buildroot.org/results/695293d889128c666174d5fe03c5deadbe4d5415/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rt-tests/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index 5c8a782782..c253339555 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -1,6 +1,9 @@
 config BR2_PACKAGE_RT_TESTS
 	bool "rt-tests"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# Too old uClibc, does not provide priority-inheritance
+	# mutexes
+	depends on !BR2_avr32
 	help
 	  Set of utilities for testing the real-time behaviour of a
 	  Linux system.

From 7e099a6da82d59ce737e48f279495e84d77bd5d3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:14:01 +0000
Subject: [PATCH 3519/6849] xapp_xmh: add dependency on xdata_xbitmap

Fixes:

  http://autobuild.buildroot.org/results/fa059a89a305914700f63d7f0b0d4a3f63beb039/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xmh/Config.in   | 1 +
 package/x11r7/xapp_xmh/xapp_xmh.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xmh/Config.in b/package/x11r7/xapp_xmh/Config.in
index 3da965a698..1ef65c762f 100644
--- a/package/x11r7/xapp_xmh/Config.in
+++ b/package/x11r7/xapp_xmh/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XAPP_XMH
 	bool "xmh"
 	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XDATA_XBITMAPS
 	help
 	  send and read mail with an X interface to MH
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 934f38d537..920289e24b 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -7,6 +7,6 @@
 XAPP_XMH_VERSION = 1.0.2
 XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMH_DEPENDENCIES = xlib_libXaw
+XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
 $(eval $(autotools-package))

From 53f722dff7a9931f67b66a68e9b8e0b11b6b1a85 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:14:02 +0000
Subject: [PATCH 3520/6849] neard: fix build failure caused by missing
 <linux/nfc.h>

Fixes:

  http://autobuild.buildroot.org/results/bd1cb8795415b7369a9f4268b9f058cb78d4000d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../neard-fix-missing-linux-nfc-header.patch  | 387 ++++++++++++++++++
 package/neard/neard.mk                        |   1 +
 2 files changed, 388 insertions(+)
 create mode 100644 package/neard/neard-fix-missing-linux-nfc-header.patch

diff --git a/package/neard/neard-fix-missing-linux-nfc-header.patch b/package/neard/neard-fix-missing-linux-nfc-header.patch
new file mode 100644
index 0000000000..9b9ce32358
--- /dev/null
+++ b/package/neard/neard-fix-missing-linux-nfc-header.patch
@@ -0,0 +1,387 @@
+Add a private copy of <linux/nfc.h>
+
+The addition of the <linux/nfc.h> header in the kernel sources is
+moderately recent, and therefore, a number of toolchains don't have
+this header.
+
+As a workaround until all reasonable toolchains get this header
+included, add a configure check in neard to test whether this header
+is available or not, and if not, use our own private copy of it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: neard-0.8/configure.ac
+===================================================================
+--- neard-0.8.orig/configure.ac	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/configure.ac	2012-12-09 17:08:00.000000000 +0100
+@@ -88,6 +88,8 @@
+ AC_SUBST(NETLINK_CFLAGS)
+ AC_SUBST(NETLINK_LIBS)
+ 
++AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>])
++
+ AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
+ 					[enable test/example scripts]),
+ 					[enable_test=${enableval}])
+Index: neard-0.8/src/near.h
+===================================================================
+--- neard-0.8.orig/src/near.h	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/src/near.h	2012-12-09 16:56:40.000000000 +0100
+@@ -23,7 +23,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "linux-nfc.h"
++#endif
+ 
+ #include <glib.h>
+ 
+Index: neard-0.8/src/linux-nfc.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ neard-0.8/src/linux-nfc.h	2012-12-09 17:11:10.000000000 +0100
+@@ -0,0 +1,197 @@
++/*
++ * Copyright (C) 2011 Instituto Nokia de Tecnologia
++ *
++ * Authors:
++ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
++ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the
++ * Free Software Foundation, Inc.,
++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __LINUX_NFC_H
++#define __LINUX_NFC_H
++
++#include <linux/types.h>
++#include <linux/socket.h>
++
++#define NFC_GENL_NAME "nfc"
++#define NFC_GENL_VERSION 1
++
++#define NFC_GENL_MCAST_EVENT_NAME "events"
++
++/**
++ * enum nfc_commands - supported nfc commands
++ *
++ * @NFC_CMD_UNSPEC: unspecified command
++ *
++ * @NFC_CMD_GET_DEVICE: request information about a device (requires
++ *	%NFC_ATTR_DEVICE_INDEX) or dump request to get a list of all nfc devices
++ * @NFC_CMD_DEV_UP: turn on the nfc device
++ *	(requires %NFC_ATTR_DEVICE_INDEX)
++ * @NFC_CMD_DEV_DOWN: turn off the nfc device
++ *	(requires %NFC_ATTR_DEVICE_INDEX)
++ * @NFC_CMD_START_POLL: start polling for targets using the given protocols
++ *	(requires %NFC_ATTR_DEVICE_INDEX and %NFC_ATTR_PROTOCOLS)
++ * @NFC_CMD_STOP_POLL: stop polling for targets (requires
++ *	%NFC_ATTR_DEVICE_INDEX)
++ * @NFC_CMD_GET_TARGET: dump all targets found by the previous poll (requires
++ *	%NFC_ATTR_DEVICE_INDEX)
++ * @NFC_EVENT_TARGETS_FOUND: event emitted when a new target is found
++ *	(it sends %NFC_ATTR_DEVICE_INDEX)
++ * @NFC_EVENT_DEVICE_ADDED: event emitted when a new device is registred
++ *	(it sends %NFC_ATTR_DEVICE_NAME, %NFC_ATTR_DEVICE_INDEX and
++ *	%NFC_ATTR_PROTOCOLS)
++ * @NFC_EVENT_DEVICE_REMOVED: event emitted when a device is removed
++ *	(it sends %NFC_ATTR_DEVICE_INDEX)
++ * @NFC_EVENT_TM_ACTIVATED: event emitted when the adapter is activated in
++ *      target mode.
++ * @NFC_EVENT_DEVICE_DEACTIVATED: event emitted when the adapter is deactivated
++ *      from target mode.
++ */
++enum nfc_commands {
++	NFC_CMD_UNSPEC,
++	NFC_CMD_GET_DEVICE,
++	NFC_CMD_DEV_UP,
++	NFC_CMD_DEV_DOWN,
++	NFC_CMD_DEP_LINK_UP,
++	NFC_CMD_DEP_LINK_DOWN,
++	NFC_CMD_START_POLL,
++	NFC_CMD_STOP_POLL,
++	NFC_CMD_GET_TARGET,
++	NFC_EVENT_TARGETS_FOUND,
++	NFC_EVENT_DEVICE_ADDED,
++	NFC_EVENT_DEVICE_REMOVED,
++	NFC_EVENT_TARGET_LOST,
++	NFC_EVENT_TM_ACTIVATED,
++	NFC_EVENT_TM_DEACTIVATED,
++/* private: internal use only */
++	__NFC_CMD_AFTER_LAST
++};
++#define NFC_CMD_MAX (__NFC_CMD_AFTER_LAST - 1)
++
++/**
++ * enum nfc_attrs - supported nfc attributes
++ *
++ * @NFC_ATTR_UNSPEC: unspecified attribute
++ *
++ * @NFC_ATTR_DEVICE_INDEX: index of nfc device
++ * @NFC_ATTR_DEVICE_NAME: device name, max 8 chars
++ * @NFC_ATTR_PROTOCOLS: nfc protocols - bitwise or-ed combination from
++ *	NFC_PROTO_*_MASK constants
++ * @NFC_ATTR_TARGET_INDEX: index of the nfc target
++ * @NFC_ATTR_TARGET_SENS_RES: NFC-A targets extra information such as NFCID
++ * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the
++ *	target is not NFC-Forum compliant)
++ * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes
++ * @NFC_ATTR_TARGET_SENSB_RES: NFC-B targets extra information, max 12 bytes
++ * @NFC_ATTR_TARGET_SENSF_RES: NFC-F targets extra information, max 18 bytes
++ * @NFC_ATTR_COMM_MODE: Passive or active mode
++ * @NFC_ATTR_RF_MODE: Initiator or target
++ * @NFC_ATTR_IM_PROTOCOLS: Initiator mode protocols to poll for
++ * @NFC_ATTR_TM_PROTOCOLS: Target mode protocols to listen for
++ */
++enum nfc_attrs {
++	NFC_ATTR_UNSPEC,
++	NFC_ATTR_DEVICE_INDEX,
++	NFC_ATTR_DEVICE_NAME,
++	NFC_ATTR_PROTOCOLS,
++	NFC_ATTR_TARGET_INDEX,
++	NFC_ATTR_TARGET_SENS_RES,
++	NFC_ATTR_TARGET_SEL_RES,
++	NFC_ATTR_TARGET_NFCID1,
++	NFC_ATTR_TARGET_SENSB_RES,
++	NFC_ATTR_TARGET_SENSF_RES,
++	NFC_ATTR_COMM_MODE,
++	NFC_ATTR_RF_MODE,
++	NFC_ATTR_DEVICE_POWERED,
++	NFC_ATTR_IM_PROTOCOLS,
++	NFC_ATTR_TM_PROTOCOLS,
++/* private: internal use only */
++	__NFC_ATTR_AFTER_LAST
++};
++#define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1)
++
++#define NFC_DEVICE_NAME_MAXSIZE 8
++#define NFC_NFCID1_MAXSIZE 10
++#define NFC_SENSB_RES_MAXSIZE 12
++#define NFC_SENSF_RES_MAXSIZE 18
++#define NFC_GB_MAXSIZE        48
++
++/* NFC protocols */
++#define NFC_PROTO_JEWEL		1
++#define NFC_PROTO_MIFARE	2
++#define NFC_PROTO_FELICA	3
++#define NFC_PROTO_ISO14443	4
++#define NFC_PROTO_NFC_DEP	5
++#define NFC_PROTO_ISO14443_B	6
++
++#define NFC_PROTO_MAX		7
++
++/* NFC communication modes */
++#define NFC_COMM_ACTIVE  0
++#define NFC_COMM_PASSIVE 1
++
++/* NFC RF modes */
++#define NFC_RF_INITIATOR 0
++#define NFC_RF_TARGET    1
++#define NFC_RF_NONE      2
++
++/* NFC protocols masks used in bitsets */
++#define NFC_PROTO_JEWEL_MASK      (1 << NFC_PROTO_JEWEL)
++#define NFC_PROTO_MIFARE_MASK     (1 << NFC_PROTO_MIFARE)
++#define NFC_PROTO_FELICA_MASK	  (1 << NFC_PROTO_FELICA)
++#define NFC_PROTO_ISO14443_MASK	  (1 << NFC_PROTO_ISO14443)
++#define NFC_PROTO_NFC_DEP_MASK	  (1 << NFC_PROTO_NFC_DEP)
++#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
++
++struct sockaddr_nfc {
++	sa_family_t sa_family;
++	__u32 dev_idx;
++	__u32 target_idx;
++	__u32 nfc_protocol;
++};
++
++#define NFC_LLCP_MAX_SERVICE_NAME 63
++struct sockaddr_nfc_llcp {
++	sa_family_t sa_family;
++	__u32 dev_idx;
++	__u32 target_idx;
++	__u32 nfc_protocol;
++	__u8 dsap; /* Destination SAP, if known */
++	__u8 ssap; /* Source SAP to be bound to */
++	char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
++	size_t service_name_len;
++};
++
++/* NFC socket protocols */
++#define NFC_SOCKPROTO_RAW	0
++#define NFC_SOCKPROTO_LLCP	1
++#define NFC_SOCKPROTO_MAX	2
++
++#define NFC_HEADER_SIZE 1
++
++/**
++ * Pseudo-header info for raw socket packets
++ * First byte is the adapter index
++ * Second byte contains flags
++ *  - 0x01 - Direction (0=RX, 1=TX)
++ *  - 0x02-0x80 - Reserved
++ **/
++#define NFC_LLCP_RAW_HEADER_SIZE	2
++#define NFC_LLCP_DIRECTION_RX		0x00
++#define NFC_LLCP_DIRECTION_TX		0x01
++
++#endif /*__LINUX_NFC_H */
+Index: neard-0.8/plugins/mifare.c
+===================================================================
+--- neard-0.8.orig/plugins/mifare.c	2012-10-10 05:29:07.000000000 +0200
++++ neard-0.8/plugins/mifare.c	2012-12-09 16:58:22.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/p2p.c
+===================================================================
+--- neard-0.8.orig/plugins/p2p.c	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/plugins/p2p.c	2012-12-09 16:59:06.000000000 +0100
+@@ -30,7 +30,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/handover.c
+===================================================================
+--- neard-0.8.orig/plugins/handover.c	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/plugins/handover.c	2012-12-09 17:13:30.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/types.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/nfctype1.c
+===================================================================
+--- neard-0.8.orig/plugins/nfctype1.c	2012-10-10 05:29:07.000000000 +0200
++++ neard-0.8/plugins/nfctype1.c	2012-12-09 17:09:13.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/nfctype2.c
+===================================================================
+--- neard-0.8.orig/plugins/nfctype2.c	2012-10-10 05:29:07.000000000 +0200
++++ neard-0.8/plugins/nfctype2.c	2012-12-09 17:09:52.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/nfctype3.c
+===================================================================
+--- neard-0.8.orig/plugins/nfctype3.c	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/plugins/nfctype3.c	2012-12-09 17:11:51.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/nfctype4.c
+===================================================================
+--- neard-0.8.orig/plugins/nfctype4.c	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/plugins/nfctype4.c	2012-12-09 17:12:14.000000000 +0100
+@@ -30,7 +30,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/npp.c
+===================================================================
+--- neard-0.8.orig/plugins/npp.c	2012-10-10 05:29:07.000000000 +0200
++++ neard-0.8/plugins/npp.c	2012-12-09 17:12:36.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: neard-0.8/plugins/snep.c
+===================================================================
+--- neard-0.8.orig/plugins/snep.c	2012-11-03 19:56:07.000000000 +0100
++++ neard-0.8/plugins/snep.c	2012-12-09 17:13:07.000000000 +0100
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 2d3e30e26d..3c9dd7c55e 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -8,6 +8,7 @@ NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
 NEARD_LICENSE = GPLv2
 NEARD_LICENSE_FILES = COPYING
 
+NEARD_AUTORECONF = YES
 NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl
 NEARD_CONF_OPT = --disable-traces
 

From d246aad345cc84caa68e054bf3e353a13b4ab1ff Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 08:14:03 +0000
Subject: [PATCH 3521/6849] libev: disable on avr32

Fixes:

  http://autobuild.buildroot.org/results/4951121337fad670d8bf869483774ccf9e91dd47/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libev/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libev/Config.in b/package/libev/Config.in
index 71abe7737d..fd74f55824 100644
--- a/package/libev/Config.in
+++ b/package/libev/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBEV
 	bool "libev"
+	# needs memory fences
+	depends on !BR2_avr32
 	help
 	  Userspace library for handling asynchronous notifications
 

From b9b420bdd55a553c78a815f28ea98db87cd110a6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 6 Dec 2012 14:32:05 +0000
Subject: [PATCH 3522/6849] kernel-headers: bump 3.{0, 2, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.54-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 6552c62b17..0f3ed4f1d1 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -67,11 +67,11 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.54"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.55"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.34"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.35"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.21"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.22"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.9"		if BR2_KERNEL_HEADERS_3_6
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
diff --git a/toolchain/kernel-headers/linux-3.0.54-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.54-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch

From f83339e66290df412603e5694d2ac8e0456efa76 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 6 Dec 2012 14:32:27 +0000
Subject: [PATCH 3523/6849] squid: bump to version 3.2.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 1ccb2da74e..3c08c39b1c 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.2.3
+SQUID_VERSION = 3.2.4
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From 2fdd70e5986f0a3869c142949e352e62543a1dd1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 6 Dec 2012 14:32:28 +0000
Subject: [PATCH 3524/6849] dnsmasq: bump to version 2.64

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index dac30e593f..afa51e28dd 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.63
+DNSMASQ_VERSION = 2.64
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

From e510b0fea65cf6e71c6e9c512204b04282973d43 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 11:48:45 +0000
Subject: [PATCH 3525/6849] rt-tests: fix typo in Config.in threads negative
 logic

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rt-tests/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index c253339555..0999ebfbce 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -17,4 +17,4 @@ config BR2_PACKAGE_RT_TESTS
 	  http://rt.wiki.kernel.org
 
 comment "rt-tests requires a toolchain with threads support"
-	!BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 1291304d7e482ef557cae34042488d0f714bf201 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 11:54:02 +0000
Subject: [PATCH 3526/6849] powerpc: update processor types

Update the powerpc processor types.
Remove the 801, it's the original IBM experimental implementation.
Add the 464, 464fp, 476 and 476fp cores.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.powerpc  | 15 ++++++++++++---
 toolchain/gcc/Config.in |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 693246b7c7..8643efcd72 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -18,6 +18,14 @@ config BR2_powerpc_440
 	bool "440"
 config BR2_powerpc_440fp
 	bool "440 with FPU"
+config BR2_powerpc_464
+	bool "464"
+config BR2_powerpc_464fp
+	bool "464 with FPU"
+config BR2_powerpc_476
+	bool "476"
+config BR2_powerpc_476fp
+	bool "476 with FPU"
 config BR2_powerpc_505
 	bool "505"
 config BR2_powerpc_601
@@ -44,8 +52,6 @@ config BR2_powerpc_7450
 	bool "7450"
 config BR2_powerpc_750
 	bool "750"
-config BR2_powerpc_801
-	bool "801"
 config BR2_powerpc_821
 	bool "821"
 config BR2_powerpc_823
@@ -95,6 +101,10 @@ config BR2_GCC_TARGET_TUNE
 	default "405fp"		if BR2_powerpc_405fp
 	default "440"		if BR2_powerpc_440
 	default "440fp"		if BR2_powerpc_440fp
+	default "464"		if BR2_powerpc_464
+	default "464fp"		if BR2_powerpc_464fp
+	default "476"		if BR2_powerpc_476
+	default "476fp"		if BR2_powerpc_476fp
 	default "505"		if BR2_powerpc_505
 	default "601"		if BR2_powerpc_601
 	default "602"		if BR2_powerpc_602
@@ -108,7 +118,6 @@ config BR2_GCC_TARGET_TUNE
 	default "7400"		if BR2_powerpc_7400
 	default "7450"		if BR2_powerpc_7450
 	default "750"		if BR2_powerpc_750
-	default "801"		if BR2_powerpc_801
 	default "821"		if BR2_powerpc_821
 	default "823"		if BR2_powerpc_823
 	default "860"		if BR2_powerpc_860
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 645650270e..de794523a9 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,11 +15,11 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_x86_atom
+		depends on !BR2_avr32 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X

From 10d042ad34b0741447e6da28631715ea362df631 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Dec 2012 11:54:03 +0000
Subject: [PATCH 3527/6849] arm: update processor types

Update the arm processor types: add the cortex A5 & A15 variants.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm      | 8 ++++++++
 toolchain/gcc/Config.in | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 6e5d258cf2..b65b4ac88d 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -29,10 +29,14 @@ config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
+config BR2_cortex_a5
+	bool "cortex-A5"
 config BR2_cortex_a8
 	bool "cortex-A8"
 config BR2_cortex_a9
 	bool "cortex-A9"
+config BR2_cortex_a15
+	bool "cortex-A15"
 config BR2_sa110
 	bool "sa110"
 config BR2_sa1100
@@ -83,8 +87,10 @@ config BR2_GCC_TARGET_TUNE
 	default "arm1136jf-s"	if BR2_arm1136jf_s
 	default "arm1176jz-s"	if BR2_arm1176jz_s
 	default "arm1176jzf-s"	if BR2_arm1176jzf_s
+	default "cortex-a5"	if BR2_cortex_a5
 	default "cortex-a8"	if BR2_cortex_a8
 	default "cortex-a9"	if BR2_cortex_a9
+	default "cortex-a15"	if BR2_cortex_a15
 	default "strongarm110"	if BR2_sa110
 	default "strongarm1100"	if BR2_sa1100
 	default "xscale"	if BR2_xscale
@@ -102,8 +108,10 @@ config BR2_GCC_TARGET_ARCH
 	default "armv6j"	if BR2_arm1136jf_s
 	default "armv6zk"	if BR2_arm1176jz_s
 	default "armv6zk"	if BR2_arm1176jzf_s
+	default "armv7-a"	if BR2_cortex_a5
 	default "armv7-a"	if BR2_cortex_a8
 	default "armv7-a"	if BR2_cortex_a9
+	default "armv7-a"	if BR2_cortex_a15
 	default "armv4"		if BR2_sa110
 	default "armv4"		if BR2_sa1100
 	default "armv5te"	if BR2_xscale
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index de794523a9..d16e7b05b1 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,15 +15,15 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
+		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X

From 7345c095d3319568173362c16ba7f6f401976aab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 10 Dec 2012 09:54:01 +0100
Subject: [PATCH 3528/6849] ltrace: fix download url

Otherwise we would get the 0.7.1 version.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/Config.in | 3 +--
 package/ltrace/ltrace.mk | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index c77108fc3a..a56c55e783 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa)
-	depends on !BR2_aarch64
+	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa || BR2_aarch64)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 4b31690228..41d48ba10a 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 LTRACE_VERSION = 0.7.2
-LTRACE_SITE = http://alioth.debian.org/frs/download.php/3844
+LTRACE_SITE = http://alioth.debian.org/frs/download.php/3848
 LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
 LTRACE_DEPENDENCIES = libelf
 LTRACE_AUTORECONF = YES

From 695f52c17488e90cac1d4dc5a2a48ae94f2c5bb9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 09:25:07 +0000
Subject: [PATCH 3529/6849] libglib2: don't try to use DTrace/GCov/SystemTap
 for host build

We really only need the host build of libglib2 for a few helper
programs that are used for the target build of libglib2. Therefore,
trying to use bells and whistles like DTrace, GCov and SystemTap is
totally useless.

And it is actually harmful, since it is causing build failures on the
gcc110 PowerPC-based autobuilder that apparently has some
DTrace-feature installed. This commit therefore fixes:

  http://autobuild.buildroot.org/results/1c62d1ce10937bd21f5afcb73782b939d10c2038/build-end.log

Which has been polluting our autobuilder logs since several weeks now.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index a32cab20a3..44274315cb 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -53,6 +53,9 @@ endif
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
+		--disable-dtrace \
+		--disable-systemtap \
+		--disable-gcov
 
 LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
 

From 16dcf2d668953a33c148baebd43afdb1df34cae5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Dec 2012 23:35:07 +0000
Subject: [PATCH 3530/6849] toolchain-external: Linaro toolchains are available
 for Cortex-A{5, 15}

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4fe605d861..456407edd5 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -6,7 +6,7 @@ choice
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	bool "Linaro 2012.11"
 	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
+	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -23,7 +23,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	bool "Linaro 2012.10"
 	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
+	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -40,7 +40,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	bool "Linaro 2012.09"
 	depends on BR2_arm
-	depends on BR2_cortex_a8 || BR2_cortex_a9
+	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -54,9 +54,9 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 
 	  To use this toolchain, you must disable soft float usage.
 
-comment "Linaro toolchains available for Cortex-A{8,9}"
+comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
 	depends on BR2_arm
-	depends on !BR2_cortex_a8 && !BR2_cortex_a9
+	depends on !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"

From 24d9771337d88dae6298db12dd3fb284282c684b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Dec 2012 00:51:20 +0000
Subject: [PATCH 3531/6849] dnsmasq: fix build failure without DHCP

Fixes
http://autobuild.buildroot.net/results/26a9e152f533e467f68b72a373d0fc84d561eb87

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dnsmasq-fix-parse-server-no-dhcp.patch    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch

diff --git a/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch b/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch
new file mode 100644
index 0000000000..817d3b2285
--- /dev/null
+++ b/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch
@@ -0,0 +1,37 @@
+From acd702292afebb8550acbfbe80638995545ccd10 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 10 Dec 2012 07:47:10 -0300
+Subject: [PATCH] Move parse_server outside the HAVE_DHCP ifdef
+
+Fixes build breakage when building without DHCP support.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ src/option.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/option.c b/src/option.c
+index c1643a1..d6e323b 100644
+--- a/src/option.c
++++ b/src/option.c
+@@ -641,6 +641,8 @@ static char *set_prefix(char *arg)
+    return arg;
+ }
+ 
++#endif
++
+ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags)
+ {
+   int source_port = 0, serv_port = NAMESERVER_PORT;
+@@ -728,6 +730,8 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a
+   return NULL;
+ }
+ 
++#ifdef HAVE_DHCP
++
+ /* This is too insanely large to keep in-line in the switch */
+ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
+ {
+-- 
+1.7.8.6
+

From 422700feba3c56a5bb9534d222395c00c930df65 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Dec 2012 03:21:54 +0000
Subject: [PATCH 3532/6849] at91bootstrap: upstream moved to another URL

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index d8caed71d0..46862c0428 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 AT91BOOTSTRAP_VERSION = 1.16
-AT91BOOTSTRAP_SITE = http://www.atmel.com/dyn/resources/prod_documents/
+AT91BOOTSTRAP_SITE = http://www.atmel.com/Images
 AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip
 
 AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))

From eb1dd0761cfef14c5507aff5c01acd326a6ffacb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Dec 2012 04:23:30 +0000
Subject: [PATCH 3533/6849] sqlite: bump to version 3.7.14.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 0320cc4d57..bf4b921244 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071300
+SQLITE_VERSION = 3071401
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_LICENSE = Public domain

From 6f62ce55f037da58cc58a31e67b8e18aee3cec98 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Dec 2012 05:04:20 +0000
Subject: [PATCH 3534/6849] busybox: remove deprecated 1.18.x

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in             |   6 -
 package/busybox/busybox-1.18.x.config | 986 --------------------------
 2 files changed, 992 deletions(-)
 delete mode 100644 package/busybox/busybox-1.18.x.config

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index dedcf185f0..6d9ff11830 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -17,10 +17,6 @@ choice
 	help
 	  Select the version of BusyBox you wish to use.
 
-	config BR2_BUSYBOX_VERSION_1_18_X
-		bool "BusyBox 1.18.x"
-		depends on BR2_DEPRECATED
-
 	config BR2_BUSYBOX_VERSION_1_19_X
 		bool "BusyBox 1.19.x"
 
@@ -34,14 +30,12 @@ endchoice
 
 config BR2_BUSYBOX_VERSION
 	string
-	default "1.18.5"	if BR2_BUSYBOX_VERSION_1_18_X
 	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
 	default "1.20.2"	if BR2_BUSYBOX_VERSION_1_20_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
 	default "package/busybox/busybox-1.20.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
 	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
 	default "package/busybox/busybox-1.20.x.config" if BR2_BUSYBOX_VERSION_1_20_X
 	help
diff --git a/package/busybox/busybox-1.18.x.config b/package/busybox/busybox-1.18.x.config
deleted file mode 100644
index 9e41550bb1..0000000000
--- a/package/busybox/busybox-1.18.x.config
+++ /dev/null
@@ -1,986 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.18.0
-# Tue Nov 30 09:51:07 2010
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_DESKTOP=y
-# CONFIG_EXTRA_COMPAT is not set
-CONFIG_INCLUDE_SUSv2=y
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_UNICODE_SUPPORT is not set
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=0
-CONFIG_LAST_SUPPORTED_WCHAR=0
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-CONFIG_FEATURE_CLEAN_UP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_FEATURE_UTMP=y
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-# CONFIG_LFS is not set
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_VI=y
-CONFIG_FEATURE_EDITING_HISTORY=999
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_FEATURE_AR_CREATE=y
-CONFIG_BUNZIP2=y
-# CONFIG_BZIP2 is not set
-CONFIG_CPIO=y
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-CONFIG_FEATURE_TAR_FROM=y
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_FEATURE_TAR_TO_COMMAND=y
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNLZMA=y
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-# CONFIG_FEATURE_DATE_NANO is not set
-CONFIG_FEATURE_DATE_COMPAT=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-# CONFIG_BASE64 is not set
-# CONFIG_CAL is not set
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-CONFIG_FOLD=y
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LENGTH=y
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-# CONFIG_FEATURE_FLOAT_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-# CONFIG_STAT is not set
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-# CONFIG_TAC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TOUCH=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-# CONFIG_FGCONSOLE is not set
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-# CONFIG_KBD_MODE is not set
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
-CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-CONFIG_SETKEYCODES=y
-CONFIG_SETLOGCONS=y
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_PIPE_PROGRESS=y
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_PATCH=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_ED is not set
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-# CONFIG_FEATURE_FIND_DELETE is not set
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_KILL_REMOVED=y
-CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-CONFIG_FEATURE_INITRD=y
-CONFIG_INIT_TERMINAL_TYPE="linux"
-CONFIG_MESG=y
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-CONFIG_FEATURE_SHADOWPASSWDS=y
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
-CONFIG_ADDUSER=y
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
-CONFIG_ADDGROUP=y
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-CONFIG_DELUSER=y
-CONFIG_DELGROUP=y
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-CONFIG_GETTY=y
-CONFIG_LOGIN=y
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-CONFIG_BLKID=y
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-CONFIG_FDFLUSH=y
-CONFIG_FDFORMAT=y
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-CONFIG_LSPCI=y
-CONFIG_LSUSB=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_RENAME=y
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-CONFIG_FEATURE_MDEV_EXEC=y
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-CONFIG_MORE=y
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-CONFIG_READPROFILE=y
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-CONFIG_SETARCH=y
-CONFIG_SWAPONOFF=y
-# CONFIG_FEATURE_SWAPON_PRI is not set
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-CONFIG_CHRT=y
-CONFIG_CROND=y
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-CONFIG_DEVMEM=y
-CONFIG_EJECT=y
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-CONFIG_LAST=y
-CONFIG_FEATURE_LAST_SMALL=y
-# CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-CONFIG_FEATURE_LESS_REGEXP=y
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MAN is not set
-CONFIG_MICROCOM=y
-CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
-CONFIG_RUNLEVEL=y
-# CONFIG_RX is not set
-CONFIG_SETSID=y
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-# CONFIG_NBDCLIENT is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
-# CONFIG_NC_110_COMPAT is not set
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-CONFIG_ARPING=y
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-CONFIG_DNSD=y
-CONFIG_ETHER_WAKE=y
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-CONFIG_FEATURE_IFUPDOWN_IP=y
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-CONFIG_INETD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NAMEIF=y
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-CONFIG_NETSTAT=y
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
-# CONFIG_FEATURE_NETSTAT_PRG is not set
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_PING=y
-# CONFIG_PING6 is not set
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-CONFIG_DHCPD_LEASES_FILE=""
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-# CONFIG_UDPSVD is not set
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=y
-# CONFIG_NMETER is not set
-# CONFIG_PGREP is not set
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_UPTIME=y
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-# CONFIG_ASH_GETOPTS is not set
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_CTTYHACK is not set
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_FEATURE_KLOGD_KLOGCTL=y
-CONFIG_LOGGER=y

From 62b13aea1dadea09cdddf06f2b9673bc927dcc0c Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Thu, 22 Nov 2012 02:35:11 +0000
Subject: [PATCH 3535/6849] barebox: use the symlink to copy the barebox binary
 to the images directory

Barebox creates a symlink to the binary. This symlink points to
the barebox.bin or to the compressed zbarebox.bin binary.

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Tested-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Tested-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index a025d5f4a3..6cc4976692 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -72,7 +72,11 @@ define BAREBOX_BUILD_CMDS
 endef
 
 define BAREBOX_INSTALL_IMAGES_CMDS
-	cp $(@D)/barebox.bin $(BINARIES_DIR)
+	if test -h $(@D)/barebox-flash-image ; then \
+		cp -L $(@D)/barebox-flash-image $(BINARIES_DIR)/barebox.bin ; \
+	else \
+		cp $(@D)/barebox.bin $(BINARIES_DIR);\
+	fi
 endef
 
 ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)

From 190ef5bac13a1387b526309c194638bfdb6f6e23 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 10 Dec 2012 22:17:39 +0100
Subject: [PATCH 3536/6849] cjson: fix download URL

Downloads.sourceforge.net doesn't like the double '/'.

Reported-by: Viallard Anthony <viallard@syscom-instruments.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Danomi Manchego <danomimanchego123 at gmail.com>
---
 package/cjson/cjson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index ccc60102d3..55af800c67 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -5,7 +5,7 @@
 #############################################################
 CJSON_VERSION         = undefined
 CJSON_SOURCE          = cJSONFiles.zip
-CJSON_SITE            = http://downloads.sourceforge.net/project/cjson/
+CJSON_SITE            = http://downloads.sourceforge.net/project/cjson
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE         = MIT
 

From fe3fee8bb6153be041cc6b28b6eb92ede020ab75 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 6 Dec 2012 08:59:34 +0000
Subject: [PATCH 3537/6849] qemu/ppc-virtex-ml507: add new sample config

Add new powerpc-virtex-ml507 sample qemu config.
Useful for powerpc softfloat testing.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/powerpc-virtex-ml507/readme.txt |  8 ++++++++
 configs/qemu_ppc_virtex_ml507_defconfig    | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 board/qemu/powerpc-virtex-ml507/readme.txt
 create mode 100644 configs/qemu_ppc_virtex_ml507_defconfig

diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
new file mode 100644
index 0000000000..0500a95757
--- /dev/null
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -0,0 +1,8 @@
+Run the emulation with:
+
+ cp output/images/virtex440-ml507.dtb ppc.dtb
+ qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0"
+
+The login prompt will appear in the terminal that started Qemu.
+
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
new file mode 100644
index 0000000000..6b4ea74035
--- /dev/null
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -0,0 +1,22 @@
+# Architecture
+BR2_powerpc=y
+BR2_powerpc_440=y
+
+# Filesystem
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_INITRAMFS=y
+
+# Lock to 3.6 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_6=y
+
+# Use soft float
+BR2_SOFT_FLOAT=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.9"
+BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
+BR2_LINUX_KERNEL_VMLINUX=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507"

From 36f96dbb7816ddeaa7f0a588f0a54ad8fd7a0ee5 Mon Sep 17 00:00:00 2001
From: Gary Coulbourne <bear@bears.org>
Date: Fri, 7 Dec 2012 07:04:37 +0000
Subject: [PATCH 3538/6849] bump connman version to 1.9

A quick patch to bump connman's version to 1.9

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 2c04cdd6bb..2c376c96d6 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.8
+CONNMAN_VERSION = 1.9
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES

From f7ccd30afbd989085be834b23ac2ea997c50b883 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Wed, 5 Dec 2012 19:36:36 +0000
Subject: [PATCH 3539/6849] xtensa: add -mlongcalls to CFLAGS for xtensa

The longcalls option allows calls across a greater range of addresses.

This option may degrade both code size and performance, but
the linker can generally optimize away the unnecessary overhead
when a call ends up within range

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index 8dea51eff3..4281773a31 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -56,6 +56,15 @@ TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc
 endif
 endif
 
+# Use longcalls option for Xtensa globally.
+# The 'longcalls' option allows calls across a greater range of addresses,
+# and is required for some packages. While this option can degrade both
+# code size and performance, the linker can usually optimize away the
+# overhead when a call ends up within a certain range.
+ifeq ($(BR2_xtensa),y)
+TARGET_ABI += -mlongcalls
+endif
+
 STAGING_DIR=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sysroot
 
 TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))

From 04c8ff92c3f4ca645daf44f73b40b22fc13fdc4c Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 7 Dec 2012 00:51:30 +0000
Subject: [PATCH 3540/6849] barebox: add 2012.12, remove 2012.08

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 95f330f587..e7498a884e 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_11
+	default BR2_TARGET_BAREBOX_2012_12
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_08
-	bool "2012.08"
-
 config BR2_TARGET_BAREBOX_2012_09
 	bool "2012.09"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2012_10
 config BR2_TARGET_BAREBOX_2012_11
 	bool "2012.11"
 
+config BR2_TARGET_BAREBOX_2012_12
+	bool "2012.12"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.08.0"	if BR2_TARGET_BAREBOX_2012_08
 	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
 	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10
 	default "2012.11.0"	if BR2_TARGET_BAREBOX_2012_11
+	default "2012.12.0"	if BR2_TARGET_BAREBOX_2012_12
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 85736773fa06118b3a5a754f5f5bd4190298aecf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 7 Dec 2012 02:06:20 +0000
Subject: [PATCH 3541/6849] openssl: fix runtime failure on some powerpc
 variants

OpenSSL's assembly optimizations por PowerPC seem to be broken for at
least 4xx cores.
Thanks go to Jan Schunke for reporting and testing.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 265a4fbe8a..160df2e5c3 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -38,8 +38,11 @@ endif
 endif
 endif
 ifeq ($(ARCH),powerpc)
+# 4xx cores seem to have trouble with openssl's ASM optimizations
+ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),)
 	OPENSSL_TARGET_ARCH = ppc
 endif
+endif
 ifeq ($(ARCH),x86_64)
 	OPENSSL_TARGET_ARCH = x86_64
 endif

From 5611509259e513486dfc35941e80549b081b28fd Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Fri, 7 Dec 2012 00:29:23 +0000
Subject: [PATCH 3542/6849] tslib: add license info

[Peter: Change to LGPL as pointed out by Arnout]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index b10b5ec2c2..c94be7df33 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -5,6 +5,9 @@
 #############################################################
 TSLIB_VERSION = 412d99d
 TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
+TSLIB_LICENSE = LGPL
+TSLIB_LICENSE_FILES = COPYING
+
 TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install

From 7ffda3e241c4d57394d9f5eeb19e41a3546c0495 Mon Sep 17 00:00:00 2001
From: Davide Viti <zinosat@tiscali.it>
Date: Thu, 6 Dec 2012 14:16:25 +0000
Subject: [PATCH 3543/6849] tcllib: new package

Signed-off-by: Davide Viti <zinosat@tiscali.it>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  5 +++++
 package/tcllib/Config.in | 11 +++++++++++
 package/tcllib/tcllib.mk | 14 ++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/tcllib/Config.in
 create mode 100644 package/tcllib/tcllib.mk

diff --git a/package/Config.in b/package/Config.in
index 74e439ea16..cad1221c56 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -313,6 +313,11 @@ endmenu
 endif
 source "package/ruby/Config.in"
 source "package/tcl/Config.in"
+if BR2_PACKAGE_TCL
+menu "tcl libraries/modules"
+source "package/tcllib/Config.in"
+endmenu
+endif
 endmenu
 
 menu "Libraries"
diff --git a/package/tcllib/Config.in b/package/tcllib/Config.in
new file mode 100644
index 0000000000..b0a4ad060e
--- /dev/null
+++ b/package/tcllib/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_TCLLIB
+	bool "tcllib"
+	help
+	  Tcllib is a collection of utility modules for Tcl. These
+	  modules provide a wide variety of functionality, from
+	  implementations of standard data structures to
+	  implementations of common networking protocols. The intent
+	  is to collect commonly used function into a single library,
+	  which users can rely on to be available and stable
+
+	  http://tcl.activestate.com/software/tcllib/
diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk
new file mode 100644
index 0000000000..09d617f445
--- /dev/null
+++ b/package/tcllib/tcllib.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# tcllib
+#
+#############################################################
+TCLLIB_VERSION       = 1.13
+TCLLIB_SOURCE        = tcllib-$(TCLLIB_VERSION).tar.bz2
+TCLLIB_SITE          = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
+TCLLIB_LICENSE       = tcl license
+TCLLIB_LICENSE_FILES = license.terms
+TCLLIB_DEPENDENCIES  = host-tcl
+TCLLIB_CONF_ENV      = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh8.4"
+
+$(eval $(autotools-package))

From 246b384e4a0ed9503cc9c8e2e72b9cdc45225393 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 11 Dec 2012 04:04:13 +0000
Subject: [PATCH 3544/6849] util-linux: fix typo in configuration option label

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 43a84440ff..5eab95694a 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -62,7 +62,7 @@ config BR2_PACKAGE_UTIL_LINUX_RENAME
 	bool "build \"rename\""
 
 config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
-	bool "build \"chrt, ionice, teskset\""
+	bool "build \"chrt, ionice, taskset\""
 
 config BR2_PACKAGE_UTIL_LINUX_WALL
 	bool "build \"wall\""

From 5b24264da4771bd7af8a218619a5563b6a9d4217 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Dec 2012 07:58:32 +0000
Subject: [PATCH 3545/6849] kernel-headers: bump versions, remove deprecated,
 new deprecated

Bump 3.{0, 4, 6}.x stable versions
Add new version 3.7
Remove deprecated 2.6.{37, 38, 39} versions.
Mark 3.{1, 3, 5} as deprecated to follow upstream EOLs.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in            | 32 +++++++------------
 ...ix-__packed-in-exported-kernel-head.patch} |  0
 2 files changed, 12 insertions(+), 20 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 0f3ed4f1d1..daffef7a9c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_6
+	default BR2_KERNEL_HEADERS_3_7
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -15,39 +15,33 @@ choice
 	  For the snapshot, you have to provide the
 	  linux-2.6.tar.bz2 tarball in your download dir.
 
-	config BR2_KERNEL_HEADERS_2_6_37
-		bool "Linux 2.6.37.x kernel headers"
-		depends on BR2_DEPRECATED
-
-	config BR2_KERNEL_HEADERS_2_6_38
-		bool "Linux 2.6.38.x kernel headers"
-		depends on BR2_DEPRECATED
-
-	config BR2_KERNEL_HEADERS_2_6_39
-		bool "Linux 2.6.39.x kernel headers"
-		depends on BR2_DEPRECATED
-
 	config BR2_KERNEL_HEADERS_3_0
 		bool "Linux 3.0.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_3_1
 		bool "Linux 3.1.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_2
 		bool "Linux 3.2.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_3_3
 		bool "Linux 3.3.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_4
 		bool "Linux 3.4.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_3_5
 		bool "Linux 3.5.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_6
 		bool "Linux 3.6.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_7
+		bool "Linux 3.7.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -60,19 +54,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 	depends on BR2_KERNEL_HEADERS_VERSION
 	help
 	  Specify the version you want to use.
-	  E.G.: 2.6.38
+	  E.G.: 3.6.10
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
-	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
-	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.55"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.56"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.35"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.22"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.23"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.9"		if BR2_KERNEL_HEADERS_3_6
+	default "3.6.10"	if BR2_KERNEL_HEADERS_3_6
+	default "3.7"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.55-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch

From 121de4819d0be56f014aea9db275392ebd2f60da Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Dec 2012 07:58:33 +0000
Subject: [PATCH 3546/6849] linux: bump to 3.7.x version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index ef3b2a1023..51810e21f5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -20,8 +20,8 @@ if BR2_LINUX_KERNEL
 choice
 	prompt "Kernel version"
 
-config BR2_LINUX_KERNEL_3_6
-	bool "3.6.9"
+config BR2_LINUX_KERNEL_3_7
+	bool "3.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.6.9" if BR2_LINUX_KERNEL_3_6
+	default "3.7" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 3cc823d4be81fa41b2d0b5ada494f2c2001caf32 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Dec 2012 00:39:00 +0000
Subject: [PATCH 3547/6849] ortp: requires threads

Fixes
http://autobuild.buildroot.net/results/4252c2f0f85c27af0d814d8c9a4a5b4d74f4dac1/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linphone/Config.in      | 5 +++--
 package/mediastreamer/Config.in | 5 +++--
 package/ortp/Config.in          | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index 1a6cfdb00b..a2866a6fba 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LINPHONE
 	select BR2_PACKAGE_ORTP
 	select BR2_PACKAGE_MEDIASTREAMER
 	depends on BR2_INSTALL_LIBSTDCPP # mediastreamer
+	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
 	help
 	  Linphone is an internet phone or Voice Over IP phone (VoIP).
 
@@ -23,5 +24,5 @@ config BR2_PACKAGE_LINPHONE
 
 	  http://www.linphone.org/
 
-comment "linphone requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "linphone requires a toolchain with threads and C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
index 2e1af93790..477d4fab65 100644
--- a/package/mediastreamer/Config.in
+++ b/package/mediastreamer/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_MEDIASTREAMER
 	bool "mediastreamer"
 	select BR2_PACKAGE_ORTP
 	depends on BR2_INSTALL_LIBSTDCPP # until fixed
+	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
 	help
 	  Mediastreamer is a powerful and lightweighted streaming
 	  engine specialized for voice/video telephony applications.
@@ -12,5 +13,5 @@ config BR2_PACKAGE_MEDIASTREAMER
 
 	  http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
 
-comment "mediastreamer requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "mediastreamer requires a toolchain with threads and C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ortp/Config.in b/package/ortp/Config.in
index 39d9c9a3a0..ab9cab467d 100644
--- a/package/ortp/Config.in
+++ b/package/ortp/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_ORTP
 	bool "oRTP"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  oRTP, a Real-time Transport Protocol (RTP,RFC3550) library
 
 	  http://www.linphone.org/eng/documentation/dev/ortp.html
+
+comment "ortp requires a toolchain with threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 3bb1188b66c654c5a1841e14c46fbde1cadfe285 Mon Sep 17 00:00:00 2001
From: Victor Hiairrassary <victor.hiairrassary.ml@gmail.com>
Date: Tue, 11 Dec 2012 21:50:11 +0000
Subject: [PATCH 3548/6849] boost: bump to version 1.52.0

[Peter: merge largefile comment with C++ one]
Signed-off-by: Victor Hiairrassary <victor.hiairrassary.ml@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (x86_64 Sourcery toolchain)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 5 +++--
 package/boost/boost.mk  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 87983676ea..fb5360ecf4 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -1,9 +1,10 @@
-comment "boost requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "boost requires a toolchain with C++ and large file support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
 
 config BR2_PACKAGE_BOOST
 	bool "boost"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_ZLIB
 	help
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 64856bc6dc..005c7ca754 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BOOST_VERSION = 1.49.0
+BOOST_VERSION = 1.52.0
 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
 BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
@@ -15,7 +15,7 @@ TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 BOOST_DEPENDENCIES = bzip2 zlib
 
 BOOST_FLAGS =
-BOOST_WITHOUT_FLAGS = python
+BOOST_WITHOUT_FLAGS = python context
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)

From f944824c47ff9c423be2538702c686f279d88051 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 10 Dec 2012 13:44:21 +0000
Subject: [PATCH 3549/6849] package/qemu: add license information

QEMU is such a snakes-nest of licenses... :-/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index d40d7c9f6d..790d34f532 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -7,6 +7,11 @@
 QEMU_VERSION = 1.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
+QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c
+QEMU_LICENSE_FILES = COPYING COPYING.LIB
+# NOTE: there is no top-level license file for non-(L)GPL licenses;
+#       the non-(L)GPL license texts are specified in the affected
+#       individual source files.
 
 QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
 

From 64c3ce4d886bea18f24231d09914c3be2ede144d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Dec 2012 01:45:48 +0000
Subject: [PATCH 3550/6849] boa: needs MMU

Fixes
http://autobuild.buildroot.net/results/0909856aea5ea5d13206c9a46b8b5174661239b4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boa/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/boa/Config.in b/package/boa/Config.in
index 48943ff046..982833aefb 100644
--- a/package/boa/Config.in
+++ b/package/boa/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BOA
 	bool "boa"
+	depends on BR2_USE_MMU # uses fork()
 	help
 	  A very small and very fast http daemon.  Not intended as
 	  a feature-packed server.

From 489970e047a78f7806747b99a7e1bd170fc5c75b Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Wed, 12 Dec 2012 04:07:22 +0000
Subject: [PATCH 3551/6849] pkg-infra: pass --disable-doc if documentation is
 not enabled

Many configure scripts support an option like --disable-doc, --disable-docs
or --disable-documentation.  Pass all of these to configure.

In addition, not all Xorg packages accept the --disable-xxx. Instead they
look for xmlto and/or fop and build documentation if they exist.  For host
packages, this may lead to build errors because /usr/bin/xmlto uses libxml2
and we set LD_LIBRARY_PATH to point to $(HOST_DIR)/lib, which may contain
a libxml2 as well.  So it's essential to disable xmlto for host packages.

Also some whitespace cleanup.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in      | 10 +++++++++-
 package/pkg-autotools.mk |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 4281773a31..cc8f3202c8 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -290,7 +290,15 @@ DISABLE_LARGEFILE= --disable-largefile
 endif
 
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--disable-gtk-doc
+# The configure option varies, but since unknown options are ignored
+# we can pass all of them.
+DISABLE_DOCUMENTATION = \
+	--disable-gtk-doc \
+	--disable-doc \
+	--disable-docs \
+	--disable-documentation \
+	--with-xmlto=no \
+	--with-fop=no
 endif
 
 ifeq ($(BR2_INET_IPV6),y)
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 785daab0e1..890506bbc2 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -116,6 +116,9 @@ endef
 else
 
 # Configure package for host
+# disable all kind of documentation generation in the process,
+# because it often relies on host tools which may or may not be
+# installed.
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_SRCDIR) && rm -rf config.cache; \
 	        $$(HOST_CONFIGURE_OPTS) \
@@ -126,6 +129,12 @@ define $(2)_CONFIGURE_CMDS
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
 		--enable-shared --disable-static \
+		--disable-gtk-doc \
+		--disable-doc \
+		--disable-docs \
+		--disable-documentation \
+		--with-xmlto=no \
+		--with-fop=no \
 		$$($$(PKG)_CONF_OPT) \
 	)
 endef

From e10cfb1e766441dd6b268e27ca97436f8b5ed0d1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 12 Dec 2012 21:20:22 +0100
Subject: [PATCH 3552/6849] package: remove explicit --disable-doc* passing

Now that it is handled globally (pkg-infra: pass --disable-doc if
documentation is not enabled).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk               | 5 -----
 package/fontconfig/fontconfig.mk             | 1 -
 package/sysstat/sysstat.mk                   | 4 ----
 package/x11r7/xlib_libSM/xlib_libSM.mk       | 5 -----
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 2 --
 package/x11r7/xlib_xtrans/xlib_xtrans.mk     | 2 --
 6 files changed, 19 deletions(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 402aa4839d..2e9e930c9d 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -210,10 +210,5 @@ else
 LIBEVAS_CONF_OPT += --disable-font-loader-eet
 endif
 
-# documentation
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-LIBEVAS_CONF_OPT += --disable-doc
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 98456561fe..67621261f7 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -24,7 +24,6 @@ FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \
 FONTCONFIG_DEPENDENCIES = freetype expat
 
 HOST_FONTCONFIG_CONF_OPT = \
-		--disable-docs \
 		--disable-static
 
 $(eval $(autotools-package))
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 83609a02e5..0513998c27 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -9,10 +9,6 @@ SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
 SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors
 
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-SYSSTAT_CONF_OPT += --disable-documentation
-endif
-
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 SYSSTAT_DEPENDENCIES += gettext
 SYSSTAT_MAKE_OPT += CFLAGS+=-lintl
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index bdbda3fe56..a8d1eff1b5 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -11,9 +11,4 @@ XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
 
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-# documentation generation is slow
-XLIB_LIBSM_CONF_OPT += --disable-docs
-endif
-
 $(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 7177ae8f93..5a702e5ac4 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -9,8 +9,6 @@ XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
-XLIB_LIBXDMCP_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-docs)
-HOST_XLIB_LIBXDMCP_CONF_OPT = --disable-docs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index d47a0ed7c2..85829854bf 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -8,8 +8,6 @@ XLIB_XTRANS_VERSION = 1.2.6
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_INSTALL_STAGING = YES
-XLIB_XTRANS_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-docs)
-HOST_XLIB_XTRANS_CONF_OPT = --disable-docs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 7ce93438c12ca68c9bb12ed28c4d15d1fa840c94 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 12 Dec 2012 21:22:29 +0100
Subject: [PATCH 3553/6849] toolchain/gcc: also disable largefile for pass 1/2
 if needed

Fixes issue with !BR2_LARGEFILE builds on Ubuntu 12.04 and GCC 4.6+

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 7a0b4caa09..b0d741b449 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -308,6 +308,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
+		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 	)
 	touch $@
@@ -373,6 +374,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
+		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 	)
 	touch $@

From 53f2c75754ad7cd5958d9156e01156fe9c8fce53 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Dec 2012 08:21:24 +0000
Subject: [PATCH 3554/6849] samba: bump to version 3.6.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 4f8791767b..161e507bea 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.9
+SAMBA_VERSION = 3.6.10
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From f610bf0c89d036a0451ecde4dd5627fbe2687ef2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Dec 2012 08:21:25 +0000
Subject: [PATCH 3555/6849] squid: bump to version 3.2.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 3c08c39b1c..43e2d24d87 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.2.4
+SQUID_VERSION = 3.2.5
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From 5d4e00bd04183463f878d5c57b3a3dc47fbb2333 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 12 Dec 2012 08:44:22 +0000
Subject: [PATCH 3556/6849] gadgetfs-test: requires thread support

Fixes:

  http://autobuild.buildroot.org/results/012914ed010eac94a2f7bfe18d8375cdb2fe9f06/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gadgetfs-test/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/gadgetfs-test/Config.in b/package/gadgetfs-test/Config.in
index 276ec5402a..a582db61a3 100644
--- a/package/gadgetfs-test/Config.in
+++ b/package/gadgetfs-test/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GADGETFS_TEST
 	bool "gadgetfs-test"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Test program for gadgetfs from linux-usb.org
 
@@ -10,3 +11,6 @@ config BR2_PACKAGE_GADGETFS_TEST_USE_AIO
 	help
 	  Select this to have gadgetfs-test do asynchronous I/O using
 	  the libaio library.
+
+comment "gadgetfs-test requires thread support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 31341e8d40ec6c926419ebce8a71daba98a6ff9e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 12 Dec 2012 09:38:42 +0000
Subject: [PATCH 3557/6849] libhid: replace patch on configure by patch on
 configure.ac

In order to fix some other build problem of libhid, we'll need to do
modifications to the configure.ac. Therefore, let's first convert the
current patch on configure to a patch on configure.ac, and mark the
package as AUTORECONF=YES.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libhid-0.2.16-fix-configure-typo.patch    | 24 -------------------
 .../libhid/libhid-no-newline-in-ldflags.patch | 22 +++++++++++++++++
 package/libhid/libhid.mk                      |  1 +
 3 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 package/libhid/libhid-0.2.16-fix-configure-typo.patch
 create mode 100644 package/libhid/libhid-no-newline-in-ldflags.patch

diff --git a/package/libhid/libhid-0.2.16-fix-configure-typo.patch b/package/libhid/libhid-0.2.16-fix-configure-typo.patch
deleted file mode 100644
index 870ecf24a9..0000000000
--- a/package/libhid/libhid-0.2.16-fix-configure-typo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] fix typo in configure
-
-Somehow a newline character has gotten inserted in the middle of the
-LDFLAGS assignment, breaking the build.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: libhid-0.2.16/configure
-===================================================================
---- libhid-0.2.16.orig/configure
-+++ libhid-0.2.16/configure
-@@ -23050,8 +23050,7 @@ echo "$as_me: doxygen disabled by config
-     CPPFLAGS=$(echo  $CPPFLAGS)
-     CFLAGS=$(echo $OS_CFLAGS $LIBUSB_CFLAGS $CFLAGS)
-     CXXFLAGS=$(echo  $CXXFLAGS)
--    LDFLAGS=$(echo $OS_LDFLAGS $LIBUSB_LIBS
-- $LDFLAGS)
-+    LDFLAGS=$(echo $OS_LDFLAGS $LIBUSB_LIBS $LDFLAGS)
- 
- 
- 
diff --git a/package/libhid/libhid-no-newline-in-ldflags.patch b/package/libhid/libhid-no-newline-in-ldflags.patch
new file mode 100644
index 0000000000..df845ee1f5
--- /dev/null
+++ b/package/libhid/libhid-no-newline-in-ldflags.patch
@@ -0,0 +1,22 @@
+Fix improper usage of macro that introduces a wrong newline
+
+The MD_CONF_FLAGS() macro was used with a final newline that
+introduces an invalid newline in the middle of the macro expansion
+when defining LDFLAGS.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: libhid-0.2.16/configure.ac
+===================================================================
+--- libhid-0.2.16.orig/configure.ac	2007-04-01 22:32:10.000000000 +0200
++++ libhid-0.2.16/configure.ac	2012-12-12 20:24:03.000000000 +0100
+@@ -102,8 +102,7 @@
+   [],
+   [$OS_CFLAGS $LIBUSB_CFLAGS],
+   [],
+-  [$OS_LDFLAGS $LIBUSB_LIBS]
+-)
++  [$OS_LDFLAGS $LIBUSB_LIBS])
+ 
+ MD_CONF_DB2MAN
+ 
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index bad014bca1..484cdcc5b9 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -9,6 +9,7 @@ LIBHID_SOURCE = libhid-$(LIBHID_VERSION).tar.gz
 LIBHID_SITE = http://alioth.debian.org/frs/download.php/1958
 LIBHID_DEPENDENCIES = libusb-compat libusb
 LIBHID_INSTALL_STAGING = YES
+LIBHID_AUTORECONF = YES
 # configure runs libusb-config for cflags/ldflags. Ensure it picks up
 # the target version
 LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(TARGET_PATH)

From d813f707411d525a493b3d91c8266cc516e56dc8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 12 Dec 2012 09:38:43 +0000
Subject: [PATCH 3558/6849] libhib: fix build on PowerPC

Add a patch to remove some stupid configure.ac that does completely
crazy things with the CFLAGS and CXXFLAGS leading to build failures
like:

  http://autobuild.buildroot.org/results/7beec6b72652cc118240c959ed744ee5f2991c12/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libhid-dont-fiddle-with-debug-flags.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libhid/libhid-dont-fiddle-with-debug-flags.patch

diff --git a/package/libhid/libhid-dont-fiddle-with-debug-flags.patch b/package/libhid/libhid-dont-fiddle-with-debug-flags.patch
new file mode 100644
index 0000000000..139357bd46
--- /dev/null
+++ b/package/libhid/libhid-dont-fiddle-with-debug-flags.patch
@@ -0,0 +1,29 @@
+Don't do horrible magic with CFLAGS and CXXFLAGS
+
+The purpose of the lines being removed is to suppress the
+-g<something> option from the CFLAGS or CXXFLAGS, when --enable-debug
+is not used. This is stupid because it is up to the user to pass these
+flags or not.
+
+But it is not only stupid, but utterly broken: if your CFLAGS contains
+a flags like -mfloat-gprs=double, then this option gets truncated to
+-mfloat simply because the option contained the -g string!
+
+Completely ridiculous piece of code, so get rid of it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: libhid-0.2.16/m4/md_conf_debugging.m4
+===================================================================
+--- libhid-0.2.16.orig/m4/md_conf_debugging.m4	2004-11-08 18:16:25.000000000 +0100
++++ libhid-0.2.16/m4/md_conf_debugging.m4	2012-12-12 20:24:50.000000000 +0100
+@@ -1,7 +1,7 @@
+ AC_DEFUN([MD_CONF_DEBUGGING],
+   [
+-    CFLAGS=$(echo $CFLAGS | sed -e 's,-g[[^[:space:]]]*,,g')
+-    CXXFLAGS=$(echo $CXXFLAGS | sed -e 's,-g[[^[:space:]]]*,,g')
++#    CFLAGS=$(echo $CFLAGS | sed -e 's,-g[[^[:space:]]]*,,g')
++#    CXXFLAGS=$(echo $CXXFLAGS | sed -e 's,-g[[^[:space:]]]*,,g')
+     MD_CHECK_ARG_ENABLE(debug,
+       [
+         DEBUG_FLAG=-g

From 2a26c4e17e0f0bb0c5952352bcdfffdde86005ce Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Dec 2012 10:24:07 +0000
Subject: [PATCH 3559/6849] iproute2: bump to version 3.7.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 6f5ee51607..7766ab8703 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPROUTE2_VERSION = 3.6.0
+IPROUTE2_VERSION = 3.7.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 IPROUTE2_LICENSE = GPLv2

From 5c2209ff7928c398d219bdbbfb13c6638c44f031 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Wed, 12 Dec 2012 16:37:35 +0000
Subject: [PATCH 3560/6849] uboot-tools: do not override busybox uninstall
 commands

The uboot-tools.mk has a copy of BUSYBOX_UNINSTALL_TARGET_CMDS
in it, presumably due to a copy/paste error.  This definition
is overriding the (identical) definition in busybox.mk.

Also, add license info.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uboot-tools/uboot-tools.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 7628b77b8b..75cda8e042 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -1,6 +1,13 @@
+#############################################################
+#
+# uboot-tools
+#
+#############################################################
 UBOOT_TOOLS_VERSION = 2012.07
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
+UBOOT_TOOLS_LICENSE = GPLv2+
+UBOOT_TOOLS_LICENSE_FILES = COPYING
 
 define UBOOT_TOOLS_BUILD_CMDS
 	$(MAKE) -C $(@D) 			\
@@ -34,11 +41,6 @@ define UBOOT_TOOLS_UNINSTALL_TARGET_CMDS
 		usr/bin/mkimage usr/sbin/fw_printenv usr/sbin/fw_setenv)
 endef
 
-
-define BUSYBOX_UNINSTALL_TARGET_CMDS
-	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) uninstall
-endef
-
 define HOST_UBOOT_TOOLS_BUILD_CMDS
 	$(MAKE1) -C $(@D) 			\
 		HOSTCC="$(HOSTCC)"		\

From e043dd6c99a801dc7f863986c78c947e25c75b3f Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Wed, 12 Dec 2012 21:44:35 +0000
Subject: [PATCH 3561/6849] barebox: bump to version 2012.12.1

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index e7498a884e..10eb650a5a 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -22,7 +22,7 @@ config BR2_TARGET_BAREBOX_2012_11
 	bool "2012.11"
 
 config BR2_TARGET_BAREBOX_2012_12
-	bool "2012.12"
+	bool "2012.12.1"
 
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
@@ -44,7 +44,7 @@ config BR2_TARGET_BAREBOX_VERSION
 	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
 	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10
 	default "2012.11.0"	if BR2_TARGET_BAREBOX_2012_11
-	default "2012.12.0"	if BR2_TARGET_BAREBOX_2012_12
+	default "2012.12.1"	if BR2_TARGET_BAREBOX_2012_12
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From f9da98c85d661578e0f40d81fac53aa65bd08fbb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 13 Dec 2012 23:20:48 +0100
Subject: [PATCH 3562/6849] arch/Config.in.arm: Add BR2_ARM_CPU_HAS_NEON
 similar to how mmx/sse is handled on x86

NEON support is optional on A5/A9, so let the user choose if SoC has it /
wants to use it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index b65b4ac88d..806b196473 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -1,3 +1,11 @@
+# arm cpu features
+config BR2_ARM_CPU_HAS_NEON
+	bool
+
+# for some cores, NEON support is optional
+config BR2_ARM_CPU_MAYBE_HAS_NEON
+	bool
+
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_arm || BR2_armeb
@@ -31,12 +39,16 @@ config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
 config BR2_cortex_a5
 	bool "cortex-A5"
+	select BR2_ARM_CPU_MAYBE_HAS_NEON
 config BR2_cortex_a8
 	bool "cortex-A8"
+	select BR2_ARM_CPU_HAS_NEON
 config BR2_cortex_a9
 	bool "cortex-A9"
+	select BR2_ARM_CPU_MAYBE_HAS_NEON
 config BR2_cortex_a15
 	bool "cortex-A15"
+	select BR2_ARM_CPU_HAS_NEON
 config BR2_sa110
 	bool "sa110"
 config BR2_sa1100
@@ -64,6 +76,15 @@ config BR2_ARM_OABI
 	depends on !BR2_GCC_VERSION_4_7_X
 endchoice
 
+config BR2_ARM_ENABLE_NEON
+	bool "Enable NEON SIMD extension support"
+	depends on BR2_ARM_CPU_MAYBE_HAS_NEON
+	select BR2_ARM_CPU_HAS_NEON
+	help
+	  For some CPU cores, the NEON SIMD extension is optional.
+	  Select this option if you are certain your particular
+	  implementation has NEON support and you want to use it.
+
 config BR2_ARCH
 	default "arm"	if BR2_arm
 	default "armeb"	if BR2_armeb

From ce8a7d50557d8f4a8dd3ae8a2259cc8996a38c57 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 13 Dec 2012 23:25:30 +0100
Subject: [PATCH 3563/6849] package: use BR2_ARM_CPU_HAS_NEON

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk        | 3 +--
 package/multimedia/ffmpeg/ffmpeg.mk   | 3 +--
 package/multimedia/mplayer/mplayer.mk | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 2e9e930c9d..1f053e37cb 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -142,8 +142,7 @@ else
 LIBEVAS_CONF_OPT += --disable-cpu-altivec
 endif
 
-ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
-# NEON is optional for A9
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 LIBEVAS_CONF_OPT += --enable-cpu-neon
 else
 LIBEVAS_CONF_OPT += --disable-cpu-neon
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 994c7cd309..90c1f1b409 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -143,8 +143,7 @@ endif
 ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a8)$(BR2_cortex_a9),y)
 FFMPEG_CONF_OPT += --enable-armvfp
 endif
-# NEON is optional for A9
-ifeq ($(BR2_cortex_a8),y)
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 FFMPEG_CONF_OPT += --enable-neon
 endif
 # Set powerpc altivec appropriately
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 17680b66a0..4a1abf4957 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -112,7 +112,7 @@ ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv6j)
 MPLAYER_CONF_OPTS += --enable-armv6
 endif
 
-ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a)
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 MPLAYER_CONF_OPTS += --enable-neon
 endif
 

From 39348d803bda0c0f33805b06d302669293e4d38a Mon Sep 17 00:00:00 2001
From: Murat Demirten <mdemirten@yh.com.tr>
Date: Sun, 3 Jun 2012 06:32:24 +0000
Subject: [PATCH 3564/6849] jpeg-turbo: new package

[Peter: Various cleanups/fixes/simplifications]
Signed-off-by: Murat Demirten <mdemirten@yh.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/jpeg-turbo/Config.in     |  9 +++++++++
 package/jpeg-turbo/jpeg-turbo.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/jpeg-turbo/Config.in
 create mode 100644 package/jpeg-turbo/jpeg-turbo.mk

diff --git a/package/Config.in b/package/Config.in
index cad1221c56..7358d93a1a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -391,6 +391,7 @@ source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
 source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
+source "package/jpeg-turbo/Config.in"
 source "package/libart/Config.in"
 source "package/libdmtx/Config.in"
 source "package/libdrm/Config.in"
diff --git a/package/jpeg-turbo/Config.in b/package/jpeg-turbo/Config.in
new file mode 100644
index 0000000000..19765b086a
--- /dev/null
+++ b/package/jpeg-turbo/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_JPEG_TURBO
+	bool "jpeg-turbo"
+	help
+	  Libjpeg-turbo is a derivative of libjpeg that uses SIMD
+	  instructions (MMX, SSE2, NEON) to accelerate baseline JPEG
+	  compression and decompression on x86, x86-64, and ARM
+	  systems.
+
+	  http://www.libjpeg-turbo.org
diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk
new file mode 100644
index 0000000000..19a0292041
--- /dev/null
+++ b/package/jpeg-turbo/jpeg-turbo.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# jpeg-turbo
+#
+#############################################################
+
+JPEG_TURBO_VERSION = 1.2.1
+JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
+JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
+JPEG_TURBO_INSTALL_STAGING = YES
+JPEG_TURBO_CONF_OPT = --with-jpeg8
+
+ifeq ($(BR2_X86_CPU_HAS_MMX)$(BR2_ARM_CPU_HAS_NEON),y)
+JPEG_TURBO_CONF_OPT += --with-simd
+# x86 simd support needs nasm
+JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm)
+else
+JPEG_TURBO_CONF_OPT += --without-simd
+endif
+
+define JPEG_TURBO_REMOVE_USELESS_TOOLS
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom tjbench wrjpgcom)
+endef
+
+JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS
+
+$(eval $(autotools-package))

From 21dd3e777b5b9eb40c6e0fe9fadcf0c7fcc63901 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 13 Dec 2012 23:58:11 +0100
Subject: [PATCH 3565/6849] package: add selection between libjpeg and
 jpeg-turbo

Introduce a virtual 'jpeg' package, which pulls in either libjpeg or
jpeg-turbo depending on a choice selection.

Rename jpeg package to libjpeg so we can reuse 'jpeg' for the virtual
package, making the change transparent to existing users and all the
packages using libjpeg.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 -
 package/jpeg-turbo/Config.in |  9 ---------
 package/jpeg/Config.in       | 27 +++++++++++++++++++++++++++
 package/jpeg/jpeg.mk         | 15 +++------------
 package/libjpeg/libjpeg.mk   | 19 +++++++++++++++++++
 5 files changed, 49 insertions(+), 22 deletions(-)
 delete mode 100644 package/jpeg-turbo/Config.in
 create mode 100644 package/libjpeg/libjpeg.mk

diff --git a/package/Config.in b/package/Config.in
index 7358d93a1a..cad1221c56 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -391,7 +391,6 @@ source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
 source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
-source "package/jpeg-turbo/Config.in"
 source "package/libart/Config.in"
 source "package/libdmtx/Config.in"
 source "package/libdrm/Config.in"
diff --git a/package/jpeg-turbo/Config.in b/package/jpeg-turbo/Config.in
deleted file mode 100644
index 19765b086a..0000000000
--- a/package/jpeg-turbo/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_JPEG_TURBO
-	bool "jpeg-turbo"
-	help
-	  Libjpeg-turbo is a derivative of libjpeg that uses SIMD
-	  instructions (MMX, SSE2, NEON) to accelerate baseline JPEG
-	  compression and decompression on x86, x86-64, and ARM
-	  systems.
-
-	  http://www.libjpeg-turbo.org
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in
index 36d73c51c9..9508faf24d 100644
--- a/package/jpeg/Config.in
+++ b/package/jpeg/Config.in
@@ -1,6 +1,33 @@
 config BR2_PACKAGE_JPEG
+	bool "jpeg support"
+	help
+	  Select the desired JPEG library provider.
+
+if BR2_PACKAGE_JPEG
+
+choice
+	prompt "jpeg variant"
+	default BR2_PACKAGE_JPEG_TURBO if (BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON)
+	help
+	  Select the older stable version, or the newer developer version
+
+config BR2_PACKAGE_LIBJPEG
 	bool "jpeg"
 	help
 	  The ubiquitous C library for manipulating JPEG images.
 
 	  http://www.ijg.org/
+
+config BR2_PACKAGE_JPEG_TURBO
+	bool "jpeg-turbo"
+	help
+	  Libjpeg-turbo is a derivative of libjpeg that uses SIMD
+	  instructions (MMX, SSE2, NEON) to accelerate baseline JPEG
+	  compression and decompression on x86, x86-64, and ARM
+	  systems.
+
+	  http://www.libjpeg-turbo.org
+
+endchoice
+
+endif
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index d7ef25a8ce..9f40e6f789 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,18 +1,9 @@
 #############################################################
 #
-# jpeg (libraries needed by some apps)
+# jpeg
 #
 #############################################################
-JPEG_VERSION = 8d
-JPEG_SITE = http://www.ijg.org/files/
-JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
-JPEG_INSTALL_STAGING = YES
 
-define JPEG_REMOVE_USELESS_TOOLS
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
-endef
+jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg)
 
-JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+host-jpeg: host-libjpeg
diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk
new file mode 100644
index 0000000000..0df2b3a8b0
--- /dev/null
+++ b/package/libjpeg/libjpeg.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# libjpeg (libraries needed by some apps)
+#
+#############################################################
+
+LIBJPEG_VERSION = 8d
+LIBJPEG_SITE = http://www.ijg.org/files/
+LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz
+LIBJPEG_INSTALL_STAGING = YES
+
+define LIBJPEG_REMOVE_USELESS_TOOLS
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
+endef
+
+LIBJPEG_POST_INSTALL_TARGET_HOOKS += LIBJPEG_REMOVE_USELESS_TOOLS
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From 6f7884c81461bdb35ff47da9cd84c8a8ca5d57cb Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 13 Dec 2012 11:39:37 +0000
Subject: [PATCH 3566/6849] package/qemu: fix host-qemu variable names

With the upcoming introduction of qemu-on-target, we need to properly
separate the variables used for the host qemu, from the variables
used for the target qemu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 790d34f532..81cd79f5e1 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -13,7 +13,10 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
 #       the non-(L)GPL license texts are specified in the affected
 #       individual source files.
 
-QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
+#-------------------------------------------------------------
+# Host-qemu
+
+HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
 
 #       BR ARCH         qemu
 #       -------         ----
@@ -44,20 +47,20 @@ QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
 #       sh64            not supported
 #       sparc           sparc
 
-QEMU_ARCH = $(ARCH)
-ifeq ($(QEMU_ARCH),i486)
-    QEMU_ARCH = i386
+HOST_QEMU_ARCH = $(ARCH)
+ifeq ($(HOST_QEMU_ARCH),i486)
+    HOST_QEMU_ARCH = i386
 endif
-ifeq ($(QEMU_ARCH),i586)
-    QEMU_ARCH = i386
+ifeq ($(HOST_QEMU_ARCH),i586)
+    HOST_QEMU_ARCH = i386
 endif
-ifeq ($(QEMU_ARCH),i686)
-    QEMU_ARCH = i386
+ifeq ($(HOST_QEMU_ARCH),i686)
+    HOST_QEMU_ARCH = i386
 endif
-ifeq ($(QEMU_ARCH),powerpc)
-    QEMU_ARCH = ppc
+ifeq ($(HOST_QEMU_ARCH),powerpc)
+    HOST_QEMU_ARCH = ppc
 endif
-HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
+HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
 
 define HOST_QEMU_CONFIGURE_CMDS
 	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \

From 3a489f1ac87ea86c760271b516419fb81bbfc83d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 13 Dec 2012 11:39:38 +0000
Subject: [PATCH 3567/6849] package/qemu: fix host dependencies

'host-*' packages should depends on other 'host-*' packages,
not on target packages.

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 81cd79f5e1..2c0dbde317 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -16,7 +16,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
 #-------------------------------------------------------------
 # Host-qemu
 
-HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
+HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2
 
 #       BR ARCH         qemu
 #       -------         ----

From c51f1d88518fdb7f68438a1144d8f30fe210355e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 13 Dec 2012 11:39:40 +0000
Subject: [PATCH 3568/6849] package/qemu: bump version

Bump QEMU to 1.2.1.

Note: 1.3.0 is out now, but ./configure has changed a bit, and there are
new dependencies, so the bump to 1.3.0 is postponed for a litle while...

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 2c0dbde317..3c0110226b 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEMU_VERSION = 1.2.0
+QEMU_VERSION = 1.2.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c

From 49f16f4b97abb888e918ce3d70d8a26f03db05c1 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Mon, 7 May 2012 11:14:24 +0000
Subject: [PATCH 3569/6849] qt: fix qconfig configure parameter

The Qt configure option for specifying a custom qconfig.h
file changed from -config to -qconfig. This makes the
corresponding change in qt.mk.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index be0808d518..b09d0eda75 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -24,7 +24,7 @@ endif
 QT_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
 
 ifneq ($(QT_CONFIG_FILE),)
-QT_CONFIGURE_OPTS += -config buildroot
+QT_CONFIGURE_OPTS += -qconfig buildroot
 endif
 
 QT_CFLAGS = $(TARGET_CFLAGS)

From 24cb62ed4c7c3e0aa36500cc4d1c0b13ee722f71 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 14 Dec 2012 01:23:34 +0100
Subject: [PATCH 3570/6849] dbus: fix build on microblaze

Fixes http://autobuild.buildroot.net/results/5963d35b8933c452b8574c964e407c23a5d0412f

The microblaze toolchain has sys/inotify.h, but doesn't provide inotify_rm_*
functions, so disable inotify support.

Also disable the legacy dnotify support (which is used when inotify support
is disabled) as it has bitrotten upstream and no longer builds.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index b7cc37820a..ec42874b62 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -18,11 +18,16 @@ DBUS_CONF_OPT = --with-dbus-user=dbus \
 		--disable-xml-docs \
 		--disable-doxygen-docs \
 		--disable-static \
-		--enable-dnotify \
+		--disable-dnotify \
 		--localstatedir=/var \
 		--with-system-socket=/var/run/dbus/system_bus_socket \
 		--with-system-pid-file=/var/run/messagebus.pid
 
+ifeq ($(BR2_microblaze),y)
+# microblaze toolchain doesn't provide inotify_rm_* but does have sys/inotify.h
+DBUS_CONF_OPT += --disable-inotify
+endif
+
 ifeq ($(BR2_DBUS_EXPAT),y)
 DBUS_CONF_OPT += --with-xml=expat
 DBUS_DEPENDENCIES += expat

From 45eda5a15cd8e5b8d4fabfbeac45776eec51fc8a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 14 Dec 2012 08:53:47 +0100
Subject: [PATCH 3571/6849] qemu: fix QEMU_USER variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: François Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 3c0110226b..8d0780773f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -89,4 +89,4 @@ endef
 $(eval $(host-generic-package))
 
 # variable used by other packages
-QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)
+QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)

From 4f3a4c96312e27ca82f6c26a0179536a11594b95 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 14 Dec 2012 00:25:11 +0000
Subject: [PATCH 3572/6849] gpsd: needs threads

Fixes
http://autobuild.buildroot.net/results/05925389ac2531307f23bf5f5f3a83a5a97301bf/

[Peter: move above BR2_PACKAGE_GPSD]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 69f63f9ea7..b26cf0744b 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -1,7 +1,11 @@
+comment "gpsd needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GPSD
 	bool "gpsd"
 	# Uses fork()
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  gpsd is a service daemon that monitors one or more GPSes or AIS
 	  receivers attached to a host computer through serial or USB ports,

From 933ebedd200088600809a1149bb1670c58e25c62 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 13 Dec 2012 10:02:57 +0000
Subject: [PATCH 3573/6849] gettext: bump to version 0.18.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/Config.in                     |   3 +
 package/gettext/gettext-disable-tests.patch   |  37 -----
 .../gettext-uclibc-sched_param-def.patch      |  20 +++
 package/gettext/gettext.mk                    |  12 +-
 package/gettext/libdir-la.patch               | 154 ------------------
 5 files changed, 34 insertions(+), 192 deletions(-)
 delete mode 100644 package/gettext/gettext-disable-tests.patch
 create mode 100644 package/gettext/gettext-uclibc-sched_param-def.patch
 delete mode 100644 package/gettext/libdir-la.patch

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index ee7d8cb209..a97b835328 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -16,6 +16,9 @@ config BR2_PACKAGE_GETTEXT
 config BR2_PACKAGE_GETTEXT_TOOLS
 	bool "Install gettext tools"
 	depends on BR2_PACKAGE_GETTEXT
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  This option allows to install the complete gettext suite in
 	  the target filesystem. This is typically not useful for
diff --git a/package/gettext/gettext-disable-tests.patch b/package/gettext/gettext-disable-tests.patch
deleted file mode 100644
index eded26134a..0000000000
--- a/package/gettext/gettext-disable-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Disable gettext tests that require threads
-
-gettext fails to build with a toolchain with no threads support just
-because some gettext tests (that aren't used in Buildroot) require
-threads. We therefore disable the build of such tests.
-
-Since the change in Makefile.in is simple, we also make it in this
-patch, which avoids the need to autoreconf the gettext package.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/gettext-tools/Makefile.am
-===================================================================
---- a/gettext-tools/Makefile.am
-+++ b/gettext-tools/Makefile.am
-@@ -20,7 +20,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
- 
--SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 examples
- 
- EXTRA_DIST = misc/DISCLAIM
- MOSTLYCLEANFILES = core *.stackdump
-Index: b/gettext-tools/Makefile.in
-===================================================================
---- a/gettext-tools/Makefile.in
-+++ b/gettext-tools/Makefile.in
-@@ -484,7 +484,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 examples
- 
- # Allow users to use "gnulib-tool --update".
- 
diff --git a/package/gettext/gettext-uclibc-sched_param-def.patch b/package/gettext/gettext-uclibc-sched_param-def.patch
new file mode 100644
index 0000000000..4e392780fc
--- /dev/null
+++ b/package/gettext/gettext-uclibc-sched_param-def.patch
@@ -0,0 +1,20 @@
+uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
+and is not needed too per standard. gnulib attempts to use it but we have to account
+for it because in this case uclibc does not behave like glibc.
+
+-Khem
+
+http://bugs.gentoo.org/336484
+http://bugs.gentoo.org/323377
+
+--- gettext/gettext-tools/gnulib-lib/spawn.in.h
++++ gettext/gettext-tools/gnulib-lib/spawn.in.h
+@@ -31,7 +31,7 @@
+ 
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+    But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
++#if !defined __GLIBC__ || defined __UCLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 74f5218099..77881d3e34 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -3,14 +3,18 @@
 # gettext
 #
 #############################################################
-GETTEXT_VERSION = 0.16.1
+
+GETTEXT_VERSION = 0.18.1.1
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+
 GETTEXT_LICENSE_FILES = COPYING
 
+GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
 GETTEXT_CONF_OPT += \
 	--disable-libasprintf \
+	--disable-acl \
 	--disable-openmp \
 	--disable-rpath \
 	--disable-java \
@@ -34,6 +38,12 @@ ifeq ($(BR2_PACKAGE_GETTEXT_TOOLS),)
 define GETTEXT_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
 endef
+# Ditch the tools since they're off and pull other dependencies
+define GETTEXT_DISABLE_TOOLS
+	$(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in
+endef
 endif # GETTEXT_TOOLS = n
 
+GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
+
 $(eval $(autotools-package))
diff --git a/package/gettext/libdir-la.patch b/package/gettext/libdir-la.patch
deleted file mode 100644
index d5076c11ac..0000000000
--- a/package/gettext/libdir-la.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- gettext-0.14.6/autoconf-lib-link/build-aux/ltmain.sh.orig	2007-01-13 14:33:23.000000000 -0700
-+++ gettext-0.14.6/autoconf-lib-link/build-aux/ltmain.sh	2007-01-13 14:35:10.000000000 -0700
-@@ -234,8 +234,9 @@
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -2324,8 +2325,14 @@
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
-@@ -2800,6 +2807,16 @@
- 		esac
- 		if grep "^installed=no" $deplib > /dev/null; then
- 		  path="$absdir/$objdir"
-+#		This interferes with crosscompilation. -CL
-+#		else
-+#		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#		  if test -z "$libdir"; then
-+#		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+#		    exit 1
-+#		  fi
-+#		  if test "$absdir" != "$libdir"; then
-+#		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#		  fi
- 		else
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
-@@ -5210,6 +5227,10 @@
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5528,10 +5549,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
---- gettext-0.14.6/build-aux/ltmain.sh.orig	2005-05-20 15:03:38.000000000 -0600
-+++ gettext-0.14.6/build-aux/ltmain.sh	2007-01-13 14:34:27.000000000 -0700
-@@ -234,8 +234,9 @@
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -2324,8 +2325,14 @@
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
-@@ -2800,6 +2807,16 @@
- 		esac
- 		if grep "^installed=no" $deplib > /dev/null; then
- 		  path="$absdir/$objdir"
-+#		This interferes with crosscompilation. -CL
-+#		else
-+#		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#		  if test -z "$libdir"; then
-+#		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+#		    exit 1
-+#		  fi
-+#		  if test "$absdir" != "$libdir"; then
-+#		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#		  fi
- 		else
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
-@@ -5210,6 +5227,10 @@
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5528,10 +5549,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.

From 599b97203012dbdc4a6663be717d6f1162ff26d9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 13 Dec 2012 11:47:02 +0000
Subject: [PATCH 3574/6849] package/libiscsi: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libiscsi/Config.in   | 12 ++++++++++++
 package/libiscsi/libiscsi.mk | 15 +++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/libiscsi/Config.in
 create mode 100644 package/libiscsi/libiscsi.mk

diff --git a/package/Config.in b/package/Config.in
index cad1221c56..dbb6704ede 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -466,6 +466,7 @@ source "package/libesmtp/Config.in"
 source "package/libeXosip2/Config.in"
 source "package/libfcgi/Config.in"
 source "package/libidn/Config.in"
+source "package/libiscsi/Config.in"
 source "package/liboauth/Config.in"
 source "package/libmicrohttpd/Config.in"
 source "package/neon/Config.in"
diff --git a/package/libiscsi/Config.in b/package/libiscsi/Config.in
new file mode 100644
index 0000000000..f3fc29ee4f
--- /dev/null
+++ b/package/libiscsi/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBISCSI
+	bool "libiscsi"
+	select BR2_PACKAGE_POPT
+	help
+	  Libiscsi is a client-side library to implement the iSCSI protocol
+	  that can be used to access resource of an iSCSI Target.
+	  
+	  The library is fully async with regards to iscsi commands and scsi
+	  tasks, but a sync layer is also provided for ease of use for simpler
+	  applications.
+	  
+	  https://github.com/sahlberg/libiscsi  (no proper homepage)
diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
new file mode 100644
index 0000000000..bfebd7e2d6
--- /dev/null
+++ b/package/libiscsi/libiscsi.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libiscsi
+#
+#############################################################
+
+LIBISCSI_VERSION         = 1.6.0
+LIBISCSI_SOURCE          = libiscsi-$(LIBISCSI_VERSION).tar.gz
+LIBISCSI_SITE            = https://github.com/downloads/sahlberg/libiscsi
+LIBISCSI_LICENSE         = GPLv2+ LGPLv2.1+
+LIBISCSI_LICENSE_FILES   = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
+LIBISCSI_INSTALL_STAGING = YES
+LIBISCSI_DEPENDENCIES    = popt
+
+$(eval $(autotools-package))

From 7b6d368960f2e200a3ca4050d6ed1e7b481bb3f5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 14 Dec 2012 09:15:17 +0000
Subject: [PATCH 3575/6849] gettext: fix build failure with locale and uclibc

As reported by Johan Sagaert in the mailing list, if it's building with
a uClibc toolchain with locale enabled the build fails since the new
gettext does a locale hack for glibc which isn't needed nor supported.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext-uclibc-compat.patch | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/gettext/gettext-uclibc-compat.patch

diff --git a/package/gettext/gettext-uclibc-compat.patch b/package/gettext/gettext-uclibc-compat.patch
new file mode 100644
index 0000000000..5e52665de6
--- /dev/null
+++ b/package/gettext/gettext-uclibc-compat.patch
@@ -0,0 +1,27 @@
+The glibc fix/hack isn't valid for uClibc.
+Patch taken from OpenWRT.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/gettext-runtime/intl/localename.c
++++ b/gettext-runtime/intl/localename.c
+@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego
+     locale_t thread_locale = uselocale (NULL);
+     if (thread_locale != LC_GLOBAL_LOCALE)
+       {
+-#  if __GLIBC__ >= 2
++#  if __GLIBC__ >= 2 && !defined __UCLIBC__
+         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+            glibc < 2.12.
+            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
+--- a/gettext-tools/gnulib-lib/localename.c
++++ b/gettext-tools/gnulib-lib/localename.c
+@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego
+     locale_t thread_locale = uselocale (NULL);
+     if (thread_locale != LC_GLOBAL_LOCALE)
+       {
+-#  if __GLIBC__ >= 2
++#  if __GLIBC__ >= 2 && !defined __UCLIBC__
+         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+            glibc < 2.12.
+            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */

From df6e849d4ed3bfcac50cf2bd9c94fabd7545fb68 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 14 Dec 2012 23:55:10 +0100
Subject: [PATCH 3576/6849] opus: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opus/opus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/opus/opus.mk b/package/opus/opus.mk
index 177adfb098..adaebfbc0c 100644
--- a/package/opus/opus.mk
+++ b/package/opus/opus.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPUS_VERSION = 1.0.1
+OPUS_VERSION = 1.0.2
 OPUS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_INSTALL_STAGING = YES
 OPUS_CONF_OPT = --disable-doc

From ee094dd16f78e27d1c53094b3267fd0d3e6d54d9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 15 Dec 2012 00:07:56 +0100
Subject: [PATCH 3577/6849] opus-tools: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...pus-tools-fix-compilation-on-non-win.patch | 53 -------------------
 package/opus-tools/opus-tools-largefile.patch | 37 +++++++++++++
 package/opus-tools/opus-tools.mk              |  2 +-
 3 files changed, 38 insertions(+), 54 deletions(-)
 delete mode 100644 package/opus-tools/opus-tools-fix-compilation-on-non-win.patch
 create mode 100644 package/opus-tools/opus-tools-largefile.patch

diff --git a/package/opus-tools/opus-tools-fix-compilation-on-non-win.patch b/package/opus-tools/opus-tools-fix-compilation-on-non-win.patch
deleted file mode 100644
index c8cb6a22e6..0000000000
--- a/package/opus-tools/opus-tools-fix-compilation-on-non-win.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7734f55bc535c6d3d0fbb27c55e38f52ba6b7764 Mon Sep 17 00:00:00 2001
-From: Andreas Schlick <schlick@lavabit.com>
-Date: Thu, 13 Sep 2012 19:44:50 +0200
-Subject: [PATCH] Fix compilation on non-Windows x86-32 w/ -msse.
-
-cpusupport.h used __cpuid() from the Windows specific header file intrin.h
-which is not available under gcc. But we can use __get_cpuid() from cpuid.h
-instead.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-
----
- src/cpusupport.h |   18 +++++++++++++++++-
- 1 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/src/cpusupport.h b/src/cpusupport.h
-index 1986d31..5e42337 100644
---- a/src/cpusupport.h
-+++ b/src/cpusupport.h
-@@ -32,7 +32,9 @@
- # if !defined(__SSE__) || defined(_M_X64) || defined(__amd64__)
- #  define query_cpu_support() 0
- #else
--# include <intrin.h>
-+
-+#if defined WIN32 || defined _WIN32
-+#include <intrin.h>
- static inline int query_cpu_support(void)
- {
-    int buffer[4];
-@@ -43,5 +45,19 @@ static inline int query_cpu_support(void)
- #  endif
-        ;
- }
-+#else
-+#include <cpuid.h>
-+static inline int query_cpu_support(void)
-+{
-+   unsigned int eax, ebx, ecx, edx=0;
-+   __get_cpuid(1, &eax, &ebx, &ecx, &edx);
-+   return ((edx & 1<<25) == 0) /*SSE*/
-+#ifdef __SSE2__
-+        + ((edx & 1<<26) == 0) /*SSE2*/
-+#endif
-+       ;
-+}
-+#endif
-+
- # endif
- #endif
--- 
-1.7.2.5
-
diff --git a/package/opus-tools/opus-tools-largefile.patch b/package/opus-tools/opus-tools-largefile.patch
new file mode 100644
index 0000000000..a10fcbc714
--- /dev/null
+++ b/package/opus-tools/opus-tools-largefile.patch
@@ -0,0 +1,37 @@
+From f1d9376b383f4ee7ec2d7c5a1728d38cdb692df6 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Sat, 15 Dec 2012 00:05:41 +0100
+Subject: [PATCH] audio-in.c: Don't force largefile support
+
+Buildroot ensures the correct defines are enabled depending on toolchain
+configuration, so don't hard code largefile support here.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/audio-in.c |   10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/audio-in.c b/src/audio-in.c
+index 9bf4f6f..e404629 100644
+--- a/src/audio-in.c
++++ b/src/audio-in.c
+@@ -32,16 +32,6 @@
+ # include <config.h>
+ #endif
+ 
+-#if !defined(_LARGEFILE_SOURCE)
+-# define _LARGEFILE_SOURCE
+-#endif
+-#if !defined(_LARGEFILE64_SOURCE)
+-# define _LARGEFILE64_SOURCE
+-#endif
+-#if !defined(_FILE_OFFSET_BITS)
+-# define _FILE_OFFSET_BITS 64
+-#endif
+-
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-- 
+1.7.10.4
+
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index 2b649dc9e9..7ee708f9dc 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPUS_TOOLS_VERSION = 0.1.5
+OPUS_TOOLS_VERSION = 0.1.6
 OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_TOOLS_CONF_OPT = --disable-oggtest --disable-opustest
 OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf

From 018a49a507fb9354b10ff7afd39e9fe2603cab4e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 15 Dec 2012 00:58:02 +0100
Subject: [PATCH 3578/6849] package: add flashbench

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/flashbench/Config.in     | 14 ++++++++++++++
 package/flashbench/flashbench.mk | 22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/flashbench/Config.in
 create mode 100644 package/flashbench/flashbench.mk

diff --git a/package/Config.in b/package/Config.in
index dbb6704ede..7607e97892 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -182,6 +182,7 @@ source "package/cifs-utils/Config.in"
 source "package/cramfs/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
+source "package/flashbench/Config.in"
 source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
 source "package/makedevs/Config.in"
diff --git a/package/flashbench/Config.in b/package/flashbench/Config.in
new file mode 100644
index 0000000000..39cdb1dade
--- /dev/null
+++ b/package/flashbench/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_FLASHBENCH
+	bool "flashbench"
+	depends on BR2_LARGEFILE
+	help
+	  Flashbench - Identify characteristics of flash media.
+
+	  This is the tool used to identify the properties of
+	  SD cards and other media for the Linaro flash memory
+	  survey.
+
+	  https://wiki.linaro.org/WorkingGroups/KernelConsolidation/Projects/FlashCardSurvey
+
+comment "flashbench requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk
new file mode 100644
index 0000000000..ead1346f7b
--- /dev/null
+++ b/package/flashbench/flashbench.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# flashbench
+#
+#############################################################
+
+FLASHBENCH_VERSION = 2e30b1968a66147412f21002ea844122a0d5e2f0
+FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git
+FLASHBENCH_LICENSE = GPLv2
+FLASHBENCH_LICENSE_FILES = COPYING
+
+define FLASHBENCH_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		LDFLAGS="$(TARGET_LDFLAGS) -lrt"
+endef
+
+define FLASHBENCH_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/flashbench $(TARGET_DIR)/usr/bin/flashbench
+	$(INSTALL) -m 755 -D $(@D)/erase $(TARGET_DIR)/usr/bin/erase
+endef
+
+$(eval $(generic-package))

From c3e9f1cf49d8fb8039e3501417235044813cfa57 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 15 Dec 2012 01:46:17 +0000
Subject: [PATCH 3579/6849] gd: fix build failure related to iconv/gettext

Fixes
http://autobuild.buildroot.net/results/e3a2a81327877f9482341daff9623d759d1b2900/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gd/gd-iconv.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/gd/gd-iconv.patch

diff --git a/package/gd/gd-iconv.patch b/package/gd/gd-iconv.patch
new file mode 100644
index 0000000000..821f5cbdb2
--- /dev/null
+++ b/package/gd/gd-iconv.patch
@@ -0,0 +1,17 @@
+Seems gd is using an ancient gettext for m4 sources which has issues.
+Idea from OpenWRT patch and general knowledge on the internetweb.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gd-2.0.35.orig/configure.ac gd-2.0.35/configure.ac
+--- gd-2.0.35.orig/configure.ac	2012-12-15 08:36:07.165683957 -0300
++++ gd-2.0.35/configure.ac	2012-12-15 08:42:59.354213570 -0300
+@@ -61,7 +61,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([errno.h limits.h stddef.h stdlib.h string.h unistd.h])
+ 
+-AM_ICONV
++m4_pattern_allow([AM_ICONV])
+ # if test -n "$LIBICONV" ; then
+ #   LIBS="$LIBS $LIBICONV"
+ # fi

From 4e7b07b4d513dc481b5a0a8c49180f2824fcc967 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 15 Dec 2012 07:29:38 +0000
Subject: [PATCH 3580/6849] python: build host-python with MAKE1

Building host-python in parallel sometimes causes "Bus error" during
the installation step on our autobuilders, such as:

  http://autobuild.buildroot.org/results/04bcc907c5e075fe1f39d4f49dcc50ec93708eb4/build-end.log

Extensive testing on one autobuilder has shown that building
host-python with MAKE1 work arounds this strange problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/python/python.mk b/package/python/python.mk
index 6e960cdcc3..71591b7247 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -39,6 +39,14 @@ HOST_PYTHON_MAKE_ENV = \
 
 HOST_PYTHON_AUTORECONF = YES
 
+# Building host python in parallel sometimes triggers a "Bus error"
+# during the execution of "./python setup.py build" in the
+# installation step. It is probably due to the installation of a
+# shared library taking place in parallel to the execution of
+# ./python, causing spurious Bus error. Building host-python with
+# MAKE1 has shown to workaround the problem.
+HOST_PYTHON_MAKE = $(MAKE1)
+
 PYTHON_DEPENDENCIES  = host-python libffi
 
 HOST_PYTHON_DEPENDENCIES = host-expat host-zlib

From f23953d8cf7e136366e044166e6c02558d23b477 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 15 Dec 2012 07:29:39 +0000
Subject: [PATCH 3581/6849] util-linux: rename versioned patch without version

util-linux-2.20.1-sscanf-no-ms-as.patch has a version in its name, and
therefore the other patch, unversioned,
util-linux-uclibc-build-fix.patch, never gets applied.

Fix this by renaming util-linux-2.20.1-sscanf-no-ms-as.patch to
util-linux-sscanf-no-ms-as.patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0.1-sscanf-no-ms-as.patch => util-linux-sscanf-no-ms-as.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/util-linux/{util-linux-2.20.1-sscanf-no-ms-as.patch => util-linux-sscanf-no-ms-as.patch} (100%)

diff --git a/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch b/package/util-linux/util-linux-sscanf-no-ms-as.patch
similarity index 100%
rename from package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
rename to package/util-linux/util-linux-sscanf-no-ms-as.patch

From 24c442bce4cf51dfcce8efbd5e135186e561ea11 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 15 Dec 2012 07:29:40 +0000
Subject: [PATCH 3582/6849] util-linux: fix build on AArch64

Fixes:

 http://autobuild.buildroot.org/results/5b63022f4c2d8bdd72697e8007e8a6101a64dd12/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux-fdisk-aarch64-support.patch    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/util-linux/util-linux-fdisk-aarch64-support.patch

diff --git a/package/util-linux/util-linux-fdisk-aarch64-support.patch b/package/util-linux/util-linux-fdisk-aarch64-support.patch
new file mode 100644
index 0000000000..825e82cf3b
--- /dev/null
+++ b/package/util-linux/util-linux-fdisk-aarch64-support.patch
@@ -0,0 +1,22 @@
+Add case for the aarch64 architecture
+
+Taken from https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1061609
+
+Code written by Wookey.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/fdisk/fdiskbsdlabel.h
+===================================================================
+--- a/fdisk/fdiskbsdlabel.h
++++ b/fdisk/fdiskbsdlabel.h
+@@ -48,7 +48,8 @@
+ 
+ #if defined (i386) || defined (__sparc__) || defined (__arm__) || \
+     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
+-    defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
++    defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \
++    defined(__aarch64__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)

From d2d81f4b3420ae004bdcd3b3edf742ac7f10ff7a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 15 Dec 2012 07:29:41 +0000
Subject: [PATCH 3583/6849] webkit: silence gazillions of warnings

Building webkit with a recent gcc versions gives gazillions of
warnings such as 'warning: cast from 'WTF::AlignedBufferChar* {aka
char*}' to 'JSC::Identifier*' increases required alignment of target
type [-Wcast-align]'.

Those make the webkit build very noise, and hard to debug, so let's
silence those warnings.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 580c5d254f..326be146dc 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -9,7 +9,13 @@ WEBKIT_SITE = http://www.webkitgtk.org
 WEBKIT_INSTALL_STAGING = YES
 WEBKIT_DEPENDENCIES = host-flex host-gperf icu libcurl libxml2 libxslt \
 			libgtk2 sqlite enchant libsoup jpeg libgail
-WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
+
+# Give explicit path to icu-config, and silence gazillions of warnings
+# with recent gcc versions.
+WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config \
+	CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align"
+
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	WEBKIT_CONF_OPT += --with-target=x11

From d11bb6da1c909d4961d6337479ca7fc0cd15ca64 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 15 Dec 2012 07:29:42 +0000
Subject: [PATCH 3584/6849] webkit: fix build with bison 2.6

WebKit 1.2.7 does not build with Bison 2.6, but Bison 2.6 is our
host-bison, so if the build machine has bison 2.6, or if by chance it
gets built before webkit, then the build fails with errors such as:

  http://autobuild.buildroot.org/results/0b7cfbebd4388cabfa243b5ef74e3b6316fd9fd9/build-end.log

(the real error is not visible due to the overwhelming number of
warnings).

So, we add a patch that modifies WebKit to make it compatible with
Bison 2.6 (patch taken from upstream), and we also add 'host-bison' to
the WebKit dependencies, so that we are sure that a well-known version
of bison is used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit-bison-2-6-compat.patch | 672 +++++++++++++++++++
 package/webkit/webkit.mk                     |   4 +-
 2 files changed, 674 insertions(+), 2 deletions(-)
 create mode 100644 package/webkit/webkit-bison-2-6-compat.patch

diff --git a/package/webkit/webkit-bison-2-6-compat.patch b/package/webkit/webkit-bison-2-6-compat.patch
new file mode 100644
index 0000000000..7a94164fe6
--- /dev/null
+++ b/package/webkit/webkit-bison-2-6-compat.patch
@@ -0,0 +1,672 @@
+Bison 2.6 compatibility fix
+
+Taken from upstream at http://trac.webkit.org/changeset/124099, with
+minor adaptations.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: webkit-1.2.7/WebCore/ChangeLog
+===================================================================
+--- webkit-1.2.7.orig/WebCore/ChangeLog	2010-12-28 13:27:37.000000000 +0100
++++ webkit-1.2.7/WebCore/ChangeLog	2012-12-15 15:48:40.000000000 +0100
+@@ -1,3 +1,28 @@
++2012-07-30  Alexis Menard  <alexis.menard@openbossa.org>
++
++        Build fix with newer bison 2.6.
++        https://bugs.webkit.org/show_bug.cgi?id=92264
++
++        Reviewed by Adam Barth.
++
++        As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
++        YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
++        version I had access to as well as recent Linux runs at least version 2.3 so it's safe
++        to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
++        As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
++        of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
++
++        No new tests : build fix and the patch should not trigger any regressions
++
++        * css/CSSGrammar.y:
++        * css/CSSParser.cpp:
++        * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
++        * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
++        therefore including this file within the namespace {} declarations leads to xpathyyparse being
++        defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
++        (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 
++        to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
++
+ 2010-06-21  Philippe Normand  <pnormand@igalia.com>
+ 
+         Reviewed by Xan Lopez.
+Index: webkit-1.2.7/WebCore/css/CSSParser.cpp
+===================================================================
+--- webkit-1.2.7.orig/WebCore/css/CSSParser.cpp	2010-12-28 13:24:33.000000000 +0100
++++ webkit-1.2.7/WebCore/css/CSSParser.cpp	2012-12-15 17:29:57.000000000 +0100
+@@ -81,7 +81,7 @@
+ extern int cssyydebug;
+ #endif
+ 
+-extern int cssyyparse(void* parser);
++extern int cssyyparse(WebCore::CSSParser*);
+ 
+ using namespace std;
+ using namespace WTF;
+@@ -226,7 +226,7 @@
+     m_defaultNamespace = starAtom; // Reset the default namespace.
+     
+     setupParser("", string, "");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     m_rule = 0;
+ }
+ 
+@@ -235,7 +235,7 @@
+     m_styleSheet = sheet;
+     m_allowNamespaceDeclarations = false;
+     setupParser("@-webkit-rule{", string, "} ");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     return m_rule.release();
+ }
+ 
+@@ -243,7 +243,7 @@
+ {
+     m_styleSheet = sheet;
+     setupParser("@-webkit-keyframe-rule{ ", string, "} ");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     return m_keyframe.release();
+ }
+ 
+@@ -257,7 +257,7 @@
+     m_id = id;
+     m_important = important;
+     
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     
+     m_rule = 0;
+ 
+@@ -304,7 +304,7 @@
+     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
+ 
+     setupParser("@-webkit-decls{color:", string, "} ");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     m_rule = 0;
+ 
+     return (m_numParsedProperties && m_parsedProperties[0]->m_id == CSSPropertyColor);
+@@ -319,7 +319,7 @@
+ 
+     setupParser("@-webkit-selector{", string, "}");
+ 
+-    cssyyparse(this);
++    ::cssyyparse(this);
+ 
+     m_selectorListForParseSelector = 0;
+ }
+@@ -330,7 +330,7 @@
+     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
+ 
+     setupParser("@-webkit-decls{", string, "} ");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     m_rule = 0;
+ 
+     bool ok = false;
+@@ -354,7 +354,7 @@
+     // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.
+     // instead insert one " " (which is WHITESPACE in CSSGrammar.y)
+     setupParser("@-webkit-mediaquery ", string, "} ");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+ 
+     bool ok = false;
+     if (m_mediaQuery) {
+@@ -5191,7 +5191,7 @@
+     nameValuePair += variableValue;
+ 
+     setupParser("@-webkit-variables-decls{", nameValuePair, "} ");
+-    cssyyparse(this);
++    ::cssyyparse(this);
+     m_rule = 0;
+ 
+     bool ok = false;
+Index: webkit-1.2.7/WebCore/css/CSSGrammar.y
+===================================================================
+--- webkit-1.2.7.orig/WebCore/css/CSSGrammar.y	2010-09-10 15:20:33.000000000 +0200
++++ webkit-1.2.7/WebCore/css/CSSGrammar.y	2012-12-15 15:48:40.000000000 +0100
+@@ -51,14 +51,13 @@
+ #define YYMAXDEPTH 10000
+ #define YYDEBUG 0
+ 
+-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
+-#define YYPARSE_PARAM parser
+-#define YYLEX_PARAM parser
+-
+ %}
+ 
+ %pure_parser
+ 
++%parse-param { CSSParser* parser }
++%lex-param { CSSParser* parser }
++
+ %union {
+     bool boolean;
+     char character;
+@@ -85,7 +84,7 @@
+ 
+ %{
+ 
+-static inline int cssyyerror(const char*)
++static inline int cssyyerror(void*, const char*)
+ {
+     return 1;
+ }
+Index: webkit-1.2.7/WebCore/xml/XPathParser.cpp
+===================================================================
+--- webkit-1.2.7.orig/WebCore/xml/XPathParser.cpp	2010-09-10 15:20:33.000000000 +0200
++++ webkit-1.2.7/WebCore/xml/XPathParser.cpp	2012-12-15 15:56:37.000000000 +0100
+@@ -35,20 +35,18 @@
+ #include "XPathEvaluator.h"
+ #include "XPathException.h"
+ #include "XPathNSResolver.h"
++#include "XPathPath.h"
+ #include "XPathStep.h"
+ #include <wtf/StdLibExtras.h>
+ 
+-int xpathyyparse(void*);
+-
++using namespace WebCore;
+ using namespace WTF;
+ using namespace Unicode;
+ 
+-namespace WebCore {
+-namespace XPath {
+-
+-class LocationPath;
++using namespace XPath;
+ 
+-#include "XPathGrammar.h"    
++extern int xpathyyparse(WebCore::XPath::Parser*);
++#include "XPathGrammar.h"
+ 
+ Parser* Parser::currentParser = 0;
+     
+@@ -630,7 +628,5 @@
+     delete t;
+ }
+ 
+-}
+-}
+ 
+ #endif // ENABLE(XPATH)
+Index: webkit-1.2.7/WebCore/xml/XPathGrammar.y
+===================================================================
+--- webkit-1.2.7.orig/WebCore/xml/XPathGrammar.y	2010-02-05 17:26:58.000000000 +0100
++++ webkit-1.2.7/WebCore/xml/XPathGrammar.y	2012-12-15 15:48:40.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include "XPathParser.h"
+ #include "XPathPath.h"
+ #include "XPathPredicate.h"
++#include "XPathStep.h"
+ #include "XPathVariableReference.h"
+ #include <wtf/FastMalloc.h>
+ 
+@@ -46,8 +47,6 @@
+ #define YYLTYPE_IS_TRIVIAL 1
+ #define YYDEBUG 0
+ #define YYMAXDEPTH 10000
+-#define YYPARSE_PARAM parserParameter
+-#define PARSER static_cast<Parser*>(parserParameter)
+ 
+ using namespace WebCore;
+ using namespace XPath;
+@@ -55,6 +54,7 @@
+ %}
+ 
+ %pure_parser
++%parse-param { WebCore::XPath::Parser* parser }
+ 
+ %union
+ {
+@@ -73,7 +73,7 @@
+ %{
+ 
+ static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
+-static void xpathyyerror(const char*) { }
++static void xpathyyerror(void*, const char*) { }
+     
+ %}
+ 
+@@ -120,7 +120,7 @@
+ Expr:
+     OrExpr
+     {
+-        PARSER->m_topExpr = $1;
++        parser->m_topExpr = $1;
+     }
+     ;
+ 
+@@ -140,7 +140,7 @@
+     '/'
+     {
+         $$ = new LocationPath;
+-        PARSER->registerParseNode($$);
++        parser->registerParseNode($$);
+     }
+     |
+     '/' RelativeLocationPath
+@@ -152,7 +152,7 @@
+     {
+         $$ = $2;
+         $$->insertFirstStep($1);
+-        PARSER->unregisterParseNode($1);
++        parser->unregisterParseNode($1);
+     }
+     ;
+ 
+@@ -161,22 +161,22 @@
+     {
+         $$ = new LocationPath;
+         $$->appendStep($1);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->registerParseNode($$);
+     }
+     |
+     RelativeLocationPath '/' Step
+     {
+         $$->appendStep($3);
+-        PARSER->unregisterParseNode($3);
++        parser->unregisterParseNode($3);
+     }
+     |
+     RelativeLocationPath DescendantOrSelf Step
+     {
+         $$->appendStep($2);
+         $$->appendStep($3);
+-        PARSER->unregisterParseNode($2);
+-        PARSER->unregisterParseNode($3);
++        parser->unregisterParseNode($2);
++        parser->unregisterParseNode($3);
+     }
+     ;
+ 
+@@ -185,58 +185,58 @@
+     {
+         if ($2) {
+             $$ = new Step(Step::ChildAxis, *$1, *$2);
+-            PARSER->deletePredicateVector($2);
++            parser->deletePredicateVector($2);
+         } else
+             $$ = new Step(Step::ChildAxis, *$1);
+-        PARSER->deleteNodeTest($1);
+-        PARSER->registerParseNode($$);
++        parser->deleteNodeTest($1);
++        parser->registerParseNode($$);
+     }
+     |
+     NAMETEST OptionalPredicateList
+     {
+         String localName;
+         String namespaceURI;
+-        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
+-            PARSER->m_gotNamespaceError = true;
++        if (!parser->expandQName(*$1, localName, namespaceURI)) {
++            parser->m_gotNamespaceError = true;
+             YYABORT;
+         }
+         
+         if ($2) {
+             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
+-            PARSER->deletePredicateVector($2);
++            parser->deletePredicateVector($2);
+         } else
+             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+-        PARSER->deleteString($1);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($1);
++        parser->registerParseNode($$);
+     }
+     |
+     AxisSpecifier NodeTest OptionalPredicateList
+     {
+         if ($3) {
+             $$ = new Step($1, *$2, *$3);
+-            PARSER->deletePredicateVector($3);
++            parser->deletePredicateVector($3);
+         } else
+             $$ = new Step($1, *$2);
+-        PARSER->deleteNodeTest($2);
+-        PARSER->registerParseNode($$);
++        parser->deleteNodeTest($2);
++        parser->registerParseNode($$);
+     }
+     |
+     AxisSpecifier NAMETEST OptionalPredicateList
+     {
+         String localName;
+         String namespaceURI;
+-        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
+-            PARSER->m_gotNamespaceError = true;
++        if (!parser->expandQName(*$2, localName, namespaceURI)) {
++            parser->m_gotNamespaceError = true;
+             YYABORT;
+         }
+ 
+         if ($3) {
+             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
+-            PARSER->deletePredicateVector($3);
++            parser->deletePredicateVector($3);
+         } else
+             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+-        PARSER->deleteString($2);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($2);
++        parser->registerParseNode($$);
+     }
+     |
+     AbbreviatedStep
+@@ -261,23 +261,23 @@
+         else if (*$1 == "comment")
+             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
+ 
+-        PARSER->deleteString($1);
+-        PARSER->registerNodeTest($$);
++        parser->deleteString($1);
++        parser->registerNodeTest($$);
+     }
+     |
+     PI '(' ')'
+     {
+         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
+-        PARSER->deleteString($1);        
+-        PARSER->registerNodeTest($$);
++        parser->deleteString($1);
++        parser->registerNodeTest($$);
+     }
+     |
+     PI '(' LITERAL ')'
+     {
+         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
+-        PARSER->deleteString($1);        
+-        PARSER->deleteString($3);
+-        PARSER->registerNodeTest($$);
++        parser->deleteString($1);
++        parser->deleteString($3);
++        parser->registerNodeTest($$);
+     }
+     ;
+ 
+@@ -295,14 +295,14 @@
+     {
+         $$ = new Vector<Predicate*>;
+         $$->append(new Predicate($1));
+-        PARSER->unregisterParseNode($1);
+-        PARSER->registerPredicateVector($$);
++        parser->unregisterParseNode($1);
++        parser->registerPredicateVector($$);
+     }
+     |
+     PredicateList Predicate
+     {
+         $$->append(new Predicate($2));
+-        PARSER->unregisterParseNode($2);
++        parser->unregisterParseNode($2);
+     }
+     ;
+ 
+@@ -317,7 +317,7 @@
+     SLASHSLASH
+     {
+         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+-        PARSER->registerParseNode($$);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -325,13 +325,13 @@
+     '.'
+     {
+         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+-        PARSER->registerParseNode($$);
++        parser->registerParseNode($$);
+     }
+     |
+     DOTDOT
+     {
+         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+-        PARSER->registerParseNode($$);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -339,8 +339,8 @@
+     VARIABLEREFERENCE
+     {
+         $$ = new VariableReference(*$1);
+-        PARSER->deleteString($1);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($1);
++        parser->registerParseNode($$);
+     }
+     |
+     '(' Expr ')'
+@@ -351,15 +351,15 @@
+     LITERAL
+     {
+         $$ = new StringExpression(*$1);
+-        PARSER->deleteString($1);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($1);
++        parser->registerParseNode($$);
+     }
+     |
+     NUMBER
+     {
+         $$ = new Number($1->toDouble());
+-        PARSER->deleteString($1);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($1);
++        parser->registerParseNode($$);
+     }
+     |
+     FunctionCall
+@@ -371,8 +371,8 @@
+         $$ = createFunction(*$1);
+         if (!$$)
+             YYABORT;
+-        PARSER->deleteString($1);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($1);
++        parser->registerParseNode($$);
+     }
+     |
+     FUNCTIONNAME '(' ArgumentList ')'
+@@ -380,9 +380,9 @@
+         $$ = createFunction(*$1, *$3);
+         if (!$$)
+             YYABORT;
+-        PARSER->deleteString($1);
+-        PARSER->deleteExpressionVector($3);
+-        PARSER->registerParseNode($$);
++        parser->deleteString($1);
++        parser->deleteExpressionVector($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -391,14 +391,14 @@
+     {
+         $$ = new Vector<Expression*>;
+         $$->append($1);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->registerExpressionVector($$);
++        parser->unregisterParseNode($1);
++        parser->registerExpressionVector($$);
+     }
+     |
+     ArgumentList ',' Argument
+     {
+         $$->append($3);
+-        PARSER->unregisterParseNode($3);
++        parser->unregisterParseNode($3);
+     }
+     ;
+ 
+@@ -414,9 +414,9 @@
+         $$ = new Union;
+         $$->addSubExpression($1);
+         $$->addSubExpression($3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -432,9 +432,9 @@
+     {
+         $3->setAbsolute(true);
+         $$ = new Path(static_cast<Filter*>($1), $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     |
+     FilterExpr DescendantOrSelf RelativeLocationPath
+@@ -442,10 +442,10 @@
+         $3->insertFirstStep($2);
+         $3->setAbsolute(true);
+         $$ = new Path(static_cast<Filter*>($1), $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($2);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($2);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -455,9 +455,9 @@
+     PrimaryExpr PredicateList
+     {
+         $$ = new Filter($1, *$2);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->deletePredicateVector($2);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->deletePredicateVector($2);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -467,9 +467,9 @@
+     OrExpr OR AndExpr
+     {
+         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -479,9 +479,9 @@
+     AndExpr AND EqualityExpr
+     {
+         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -491,9 +491,9 @@
+     EqualityExpr EQOP RelationalExpr
+     {
+         $$ = new EqTestOp($2, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -503,9 +503,9 @@
+     RelationalExpr RELOP AdditiveExpr
+     {
+         $$ = new EqTestOp($2, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -515,17 +515,17 @@
+     AdditiveExpr PLUS MultiplicativeExpr
+     {
+         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     |
+     AdditiveExpr MINUS MultiplicativeExpr
+     {
+         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -535,9 +535,9 @@
+     MultiplicativeExpr MULOP UnaryExpr
+     {
+         $$ = new NumericOp($2, $1, $3);
+-        PARSER->unregisterParseNode($1);
+-        PARSER->unregisterParseNode($3);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($1);
++        parser->unregisterParseNode($3);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
+@@ -548,8 +548,8 @@
+     {
+         $$ = new Negative;
+         $$->addSubExpression($2);
+-        PARSER->unregisterParseNode($2);
+-        PARSER->registerParseNode($$);
++        parser->unregisterParseNode($2);
++        parser->registerParseNode($$);
+     }
+     ;
+ 
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 326be146dc..a9701e43e7 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -7,8 +7,8 @@
 WEBKIT_VERSION = 1.2.7
 WEBKIT_SITE = http://www.webkitgtk.org
 WEBKIT_INSTALL_STAGING = YES
-WEBKIT_DEPENDENCIES = host-flex host-gperf icu libcurl libxml2 libxslt \
-			libgtk2 sqlite enchant libsoup jpeg libgail
+WEBKIT_DEPENDENCIES = host-flex host-bison host-gperf icu libcurl libxml2 \
+	libxslt libgtk2 sqlite enchant libsoup jpeg libgail
 
 # Give explicit path to icu-config, and silence gazillions of warnings
 # with recent gcc versions.

From c27d252f3544dac60225973316b8908cc21fc023 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 15 Dec 2012 22:19:49 +0100
Subject: [PATCH 3585/6849] kmod: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 28336295df..2c03435f46 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 11
+KMOD_VERSION = 12
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From d30e5e4fa462815fddefe40fb8f4cc611c71fd25 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 16 Dec 2012 00:49:44 +0100
Subject: [PATCH 3586/6849] flashbench: unbreak build on microblaze

Fixes http://autobuild.buildroot.net/results/498287519fbb588ed4ee9624ff82002a4766a5f4

The old 4.1.2 binary microblaze toolchain only provides LLONG_MAX when
used with the gnu99 dialect.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flashbench/flashbench.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk
index ead1346f7b..faf8ae69ec 100644
--- a/package/flashbench/flashbench.mk
+++ b/package/flashbench/flashbench.mk
@@ -9,8 +9,16 @@ FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git
 FLASHBENCH_LICENSE = GPLv2
 FLASHBENCH_LICENSE_FILES = COPYING
 
+FLASHBENCH_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_microblaze),y)
+# microblaze toolchain only provides LLONG_MAX when used with gnu99 dialect
+FLASHBENCH_CFLAGS += -std=gnu99
+endif
+
 define FLASHBENCH_BUILD_CMDS
 	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(FLASHBENCH_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) -lrt"
 endef
 

From 4fe78ce36cf2d53ee7b7e9b719e0d56937c58941 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 16 Dec 2012 00:53:27 +0100
Subject: [PATCH 3587/6849] transmission: needs threads support in toolchain

Fixes http://autobuild.buildroot.net/results/b1010dcecc98d83f5d3d10d13b7b76b87a58d87c

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/transmission/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index e7e9f66f4b..92840753a2 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_TRANSMISSION
 	bool "transmission"
 	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBCURL
@@ -44,5 +45,5 @@ comment "transmission-gtk requires a toolchain with locale support"
 	depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE
 endif
 
-comment "Transmission requires a toolchain with IPv6 support"
-	depends on !BR2_INET_IPV6
+comment "Transmission requires a toolchain with IPv6 and threads support"
+	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS

From a0df7e1f0bc9247069c0598405e519dd7e190ce3 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Thu, 13 Dec 2012 00:28:11 +0000
Subject: [PATCH 3588/6849] system: add option to configure TERM variable

This option is useful for cases where the terminal isn't a bare serial
vt100, but e.g. a linux tty with more features.

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 6 ++++++
 system/system.mk | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 622b2427ff..a557ea035f 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -154,6 +154,12 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
 	default "57600"		if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600
 	default "115200"	if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
 
+config BR2_TARGET_GENERIC_GETTY_TERM
+	string "Value to assign the TERM environment variable"
+	default "vt100"
+	help
+	  Specify a TERM type.
+
 config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
 	bool "remount root filesystem read-write during boot"
 	default y
diff --git a/system/system.mk b/system/system.mk
index 4185202b73..353d0ba1b5 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -2,6 +2,7 @@ TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
 TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
 TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
 TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
+TARGET_GENERIC_GETTY_TERM:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
 
 target-generic-hostname:
 	mkdir -p $(TARGET_DIR)/etc
@@ -14,13 +15,13 @@ target-generic-issue:
 	echo "$(TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue
 
 target-generic-getty-busybox:
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) vt100 #~' \
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
 
 # In sysvinit inittab, the "id" must not be longer than 4 bytes, so we
 # skip the "tty" part and keep only the remaining.
 target-generic-getty-sysvinit:
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) vt100 #~' \
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
 
 # Find commented line, if any, and remove leading '#'s

From 6cd4b20e4a7a04d8ebde872175cb6d6b583e9f42 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 16 Dec 2012 01:05:47 +0100
Subject: [PATCH 3589/6849] sylpheed: fix license files typo

As pointed out by Arnout.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/sylpheed.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index f26e5fc1eb..12fc18b51e 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)
-SYLPHEED_LICENSE_FILES = COPIYNG COPYING.LIB
+SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
 
 SYLPHEED_CONF_OPT = --disable-gtkspell
 

From efddfcbe6dc531145fe3f4d7a39818e8e27d77b9 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 6 Dec 2012 21:38:07 +0000
Subject: [PATCH 3590/6849] perl: refactor configure step

After discussion with Perl-Cross's author (Alex Suykov)

Note: Using -A with variables that aren't option lists makes little sense.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index a86ee2afd4..da54ef1a18 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -57,12 +57,12 @@ PERL_CONF_OPT = \
 	-Dld="$(TARGET_CC_NOCCACHE)" \
 	-Dccflags="$(TARGET_CFLAGS)" \
 	-Dldflags="$(TARGET_LDFLAGS) -lm" \
-	-A define:mydomain="" \
-	-A define:myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
-	-A define:myuname="Buildroot $(BR2_VERSION_FULL)" \
-	-A define:osname=linux \
-	-A define:osvers=$(LINUX_VERSION) \
-	-A define:perladmin=root
+	-Dmydomain="" \
+	-Dmyhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
+	-Dmyuname="Buildroot $(BR2_VERSION_FULL)" \
+	-Dosname=linux \
+	-Dosvers=$(LINUX_VERSION) \
+	-Dperladmin=root
 
 ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
     PERL_CONF_OPT += -Dusedevel

From 6b8bbd323b01281a9eee7c58ca0a9ac9230f545e Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 6 Dec 2012 05:12:50 +0000
Subject: [PATCH 3591/6849] sconeserver: fix imagemagick build failures

The sconeserver configure script uses Magick++-config to obtain compiler and
linker arguments for the imagemagick libraries. This doesn't work in
Buildroot, and causes build failures such as the following

  http://autobuild.buildroot.net/results/7833edd60bbb2c291aea1efb5ccf407da7f4a51f/build-end.log

The upstream sconeserver code has been changed to use pkg-config directly,
instead of Magick++-config; this patch adapts the sconeserver package to
the upstream change.

Both this patch and the associated upstream change are based on a Buildroot
patch submitted by Samuel Martin: http://patchwork.ozlabs.org/patch/200901/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/sconeserver.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 15a1edc775..ab3d1fc99c 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -5,7 +5,7 @@
 #############################################################
 # Release 0.6.0 doesn't build cleanly, so use a recent
 # Subversion trunk snapshot.
-SCONESERVER_VERSION = 180
+SCONESERVER_VERSION = 183
 SCONESERVER_SITE = \
 	https://sconeserver.svn.sourceforge.net/svnroot/sconeserver/trunk
 SCONESERVER_SITE_METHOD = svn
@@ -51,7 +51,7 @@ else
 endif
 
 ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
-	SCONESERVER_DEPENDENCIES += imagemagick
+	SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf
 	SCONESERVER_CONF_OPT += --with-sconesite-image
 else
 	SCONESERVER_CONF_OPT += --without-sconesite-image

From a63d01f1564397deb97ee679ab97e0bc60d41541 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 6 Dec 2012 12:49:59 +0000
Subject: [PATCH 3592/6849] b43-fwcutter: new package

b43-fwcutter is an open-source tool (BSD-2c) that extracts the
firmwares from the Broadcom proprietary drivers. Those firmwares can
then be used by the open-source b43 and b43-legacy drivers of the
Linux kernel.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/b43-fwcutter/b43-fwcutter.mk | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/b43-fwcutter/b43-fwcutter.mk

diff --git a/package/b43-fwcutter/b43-fwcutter.mk b/package/b43-fwcutter/b43-fwcutter.mk
new file mode 100644
index 0000000000..b48eb4571f
--- /dev/null
+++ b/package/b43-fwcutter/b43-fwcutter.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# b43-fwcutter
+#
+#############################################################
+
+B43_FWCUTTER_VERSION = 015
+B43_FWCUTTER_SITE = http://bues.ch/b43/fwcutter/
+B43_FWCUTTER_SOURCE = b43-fwcutter-$(B43_FWCUTTER_VERSION).tar.bz2
+B43_FWCUTTER_LICENSE = BSD-2c
+B43_FWCUTTER_LICENSE_FILES = COPYING
+
+define HOST_B43_FWCUTTER_BUILD_CMDS
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define HOST_B43_FWCUTTER_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/b43-fwcutter $(HOST_DIR)/usr/bin/b43-fwcutter
+endef
+
+$(eval $(host-generic-package))

From cb8efd3b4d94c83aefed6533e20b24961e9d054f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 6 Dec 2012 12:50:00 +0000
Subject: [PATCH 3593/6849] b43-firmware: new package

This package allows to download the Broadcom Wifi drivers, extract the
firmware from them, and install them in /lib/firmware, so that they
can be used by the open-source kernel driver b43.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/b43-firmware/Config.in       | 25 ++++++++++++++++++++++++
 package/b43-firmware/b43-firmware.mk | 29 ++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 package/b43-firmware/Config.in
 create mode 100644 package/b43-firmware/b43-firmware.mk

diff --git a/package/Config.in b/package/Config.in
index 7607e97892..c605e6f886 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -198,6 +198,7 @@ endmenu
 
 menu "Hardware handling"
 source "package/acpid/Config.in"
+source "package/b43-firmware/Config.in"
 source "package/cdrkit/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
diff --git a/package/b43-firmware/Config.in b/package/b43-firmware/Config.in
new file mode 100644
index 0000000000..ab7f4a7878
--- /dev/null
+++ b/package/b43-firmware/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_B43_FIRMWARE
+	bool "b43-firware"
+	help
+	  Firmware for the Broadcom Wifi devices supported by the b43
+	  kernel driver.
+
+if BR2_PACKAGE_B43_FIRMWARE
+
+choice
+	prompt "Kernel version"
+	default BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2
+	help
+	  Select the kernel version you're using. The b43 driver in
+	  kernel >= 3.2 need a different firmware than the b43 drivers
+	  from kernel < 3.2.
+
+	config BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2
+		bool ">= 3.2"
+
+	config BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2
+		bool "< 3.2"
+
+endchoice
+
+endif
diff --git a/package/b43-firmware/b43-firmware.mk b/package/b43-firmware/b43-firmware.mk
new file mode 100644
index 0000000000..a4383e4ca4
--- /dev/null
+++ b/package/b43-firmware/b43-firmware.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# b43-firmware
+#
+#############################################################
+
+ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2),y)
+B43_FIRMWARE_VERSION = 5.100.138
+B43_FIRMWARE_SITE = http://www.lwfinger.com/b43-firmware/
+B43_FIRMWARE_SOURCE = broadcom-wl-$(B43_FIRMWARE_VERSION).tar.bz2
+B43_FIRMWARE_DRIVER_FILE = linux/wl_apsta.o
+else ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2),y)
+B43_FIRMWARE_VERSION = 5.10.56.27.3
+B43_FIRMWARE_SITE = http://mirror2.openwrt.org/sources/
+B43_FIRMWARE_SOURCE = broadcom-wl-$(B43_FIRMWARE_VERSION)_mipsel.tar.bz2
+B43_FIRMWARE_DRIVER_FILE = driver/wl_apsta/wl_prebuilt.o
+endif
+
+B43_FIRMWARE_LICENSE = PROPRIETARY
+B43_FIRMWARE_REDISTRIBUTE = NO
+
+B43_FIRMWARE_DEPENDENCIES = host-b43-fwcutter
+
+define B43_FIRMWARE_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/
+	$(HOST_DIR)/usr/bin/b43-fwcutter -w $(TARGET_DIR)/lib/firmware/ $(@D)/$(B43_FIRMWARE_DRIVER_FILE)
+endef
+
+$(eval $(generic-package))

From 71a4513e73ec8a3c3d1a18c328c867a8ba2eb471 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 11 Dec 2012 01:10:07 +0000
Subject: [PATCH 3594/6849] host-libxml2: enable debug for mesa3d

The API generation script in mesa3d requires libxml2 to be built with
debug, because it uses the lsCountNode function which is only available
in debug mode.

Note that this is the second "temporary" hack to make mesa3d work.
See http://lists.busybox.net/pipermail/buildroot/2012-November/061936.html
for possible more fundamental solutions.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/libxml2.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index fde3735b8d..0c84652dd7 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -26,7 +26,12 @@ LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
 
 HOST_LIBXML2_DEPENDENCIES = host-pkgconf
 
+# mesa3d uses functions that are only available with debug
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+HOST_LIBXML2_CONF_OPT = --with-debug
+else
 HOST_LIBXML2_CONF_OPT = --without-debug
+endif
 
 ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)
 HOST_LIBXML2_DEPENDENCIES += host-python

From 8b827859f994767052f31d4ee6ca6524b5065d01 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Dec 2012 03:31:00 +0000
Subject: [PATCH 3595/6849] libnss: fix build failures

Such as
http://autobuild.buildroot.net/results/2ca1d135269a67201e6b4d995ce8fbe94db1ed3f

The mozilla build system passes all of the different ways of CFLAGS
(OPTIMIZER, XCFLAGS, OS_CFLAGS) even when building host tools
(nsintall).
The best way around this without patching libnss is just building the
host tools first without any CFLAGS and then going on with the rest.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnss/libnss.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 84fc14996d..96faf370b2 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -17,7 +17,6 @@ LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
 		NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
 		BUILD_OPT=1 \
 		NS_USE_GCC=1 \
-		OPTIMIZER="$(TARGET_CFLAGS)" \
 		NSS_USE_SYSTEM_SQLITE=1 \
 		NSS_ENABLE_ECC=1 \
 		NATIVE_CC="$(HOSTCC)" \
@@ -34,11 +33,16 @@ endif
 
 
 define LIBNSS_BUILD_CMDS
-	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_coreconf build_dbm all \
+	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_coreconf \
 			SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
 			DIST=$(@D)/$(LIBNSS_DISTDIR) \
 			CHECKLOC= \
 			$(LIBNSS_BUILD_VARS)
+	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_dbm all \
+			SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
+			DIST=$(@D)/$(LIBNSS_DISTDIR) \
+			CHECKLOC= \
+			$(LIBNSS_BUILD_VARS) OPTIMIZER="$(TARGET_CFLAGS)"
 endef
 
 define LIBNSS_INSTALL_STAGING_CMDS

From a3671a3f2583c71871a2ac4fdf36b02c5bbdc558 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 16 Dec 2012 10:49:01 +0100
Subject: [PATCH 3596/6849] openssl: fix static build

Just use the default target instead of hardcoding shared library support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 160df2e5c3..ed52577408 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -76,8 +76,7 @@ define OPENSSL_CONFIGURE_CMDS
 endef
 
 define OPENSSL_BUILD_CMDS
-	$(MAKE1) -C $(@D) all build-shared
-	$(MAKE1) -C $(@D) do_linux-shared
+	$(MAKE1) -C $(@D)
 endef
 
 define OPENSSL_INSTALL_STAGING_CMDS

From 4bd01ac2bfc9617821e0e923acef83f7608d0507 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Fri, 7 Dec 2012 00:12:36 +0000
Subject: [PATCH 3597/6849] fbv: add license info

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbv/fbv.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 7949e990e3..f697fe8b1c 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -7,6 +7,9 @@ FBV_VERSION:=1.0b
 FBV_SOURCE:=fbv-$(FBV_VERSION).tar.gz
 FBV_SITE:=http://s-tech.elsat.net.pl/fbv
 
+FBV_LICENSE = GPLv2
+FBV_LICENSE_FILES = COPYING
+
 ### image format dependencies and configure options
 FBV_DEPENDENCIES = # empty
 FBV_CONFIGURE_OPTS = # empty

From 43ef60dc6aea3bd716de2a8cd0b379f1d184721e Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Sat, 8 Dec 2012 05:53:08 +0000
Subject: [PATCH 3598/6849] netatalk : Fix BerkeleyDB library path

This fix is needed for the 64bits build because Netatalk will assume the library
are stored in [..]/lib64/ instead of [..]/lib/

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/netatalk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 4063b53320..23c2a95d40 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -8,7 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
-NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
+NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_LIB)/usr/lib
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \
 	--disable-zeroconf \

From a1cb447c0fc4e471f8cdd4826bdf8d750565dad8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Dec 2012 01:52:15 +0000
Subject: [PATCH 3599/6849] libxml2: bump to version 2.9.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/libxml2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 0c84652dd7..0394e29b15 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBXML2_VERSION = 2.8.0
+LIBXML2_VERSION = 2.9.0
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
 LIBXML2_AUTORECONF = YES

From 37f82a44abc024c64eee8e03d516403caa7a0b2f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Dec 2012 01:52:16 +0000
Subject: [PATCH 3600/6849] libxslt: bump to version 1.1.28

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxslt/libxslt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index aa594c28bd..a35b955072 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBXSLT_VERSION = 1.1.27
+LIBXSLT_VERSION = 1.1.28
 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
 LIBXSLT_INSTALL_STAGING = YES
 LIBXSLT_LICENSE = MIT

From 3ceffe9659ae4a98a4127812126379a263ab991e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 16 Dec 2012 01:52:17 +0000
Subject: [PATCH 3601/6849] dnsmasq: bump to version 2.65

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dnsmasq-fix-parse-server-no-dhcp.patch    | 37 -------------------
 package/dnsmasq/dnsmasq.mk                    |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch

diff --git a/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch b/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch
deleted file mode 100644
index 817d3b2285..0000000000
--- a/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From acd702292afebb8550acbfbe80638995545ccd10 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 10 Dec 2012 07:47:10 -0300
-Subject: [PATCH] Move parse_server outside the HAVE_DHCP ifdef
-
-Fixes build breakage when building without DHCP support.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- src/option.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/option.c b/src/option.c
-index c1643a1..d6e323b 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -641,6 +641,8 @@ static char *set_prefix(char *arg)
-    return arg;
- }
- 
-+#endif
-+
- char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags)
- {
-   int source_port = 0, serv_port = NAMESERVER_PORT;
-@@ -728,6 +730,8 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a
-   return NULL;
- }
- 
-+#ifdef HAVE_DHCP
-+
- /* This is too insanely large to keep in-line in the switch */
- static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- {
--- 
-1.7.8.6
-
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index afa51e28dd..fe75e7b787 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.64
+DNSMASQ_VERSION = 2.65
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

From 835c29a965f62e9da16e3535c0155b2b0219c191 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Dec 2012 04:59:03 +0000
Subject: [PATCH 3602/6849] gnupg: fix build failure on MIPS64

Fixes:

  http://autobuild.buildroot.org/results/49d5891dcecf2cce8de9f2bdb16a76ff86579f45/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnupg/gnupg-mips64-build-fix.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/gnupg/gnupg-mips64-build-fix.patch

diff --git a/package/gnupg/gnupg-mips64-build-fix.patch b/package/gnupg/gnupg-mips64-build-fix.patch
new file mode 100644
index 0000000000..014435c142
--- /dev/null
+++ b/package/gnupg/gnupg-mips64-build-fix.patch
@@ -0,0 +1,20 @@
+Fix build issue on MIPS64
+
+On MIPS64, there is a syntax problem in the preprocessor
+conditions. Fix that to avoid a build failure.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/mpi/longlong.h
+===================================================================
+--- a/mpi/longlong.h
++++ b/mpi/longlong.h
+@@ -752,7 +752,7 @@
+     (w1) = _r >> 64;                                                    \
+     (w0) = (UDItype) _r;                                                \
+   } while (0)
+-# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++# elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #  define umul_ppmm(w1, w0, u, v)                                       \
+      __asm__ ("dmultu %2,%3"                                            \
+               : "=l" ((UDItype)(w0)),                                   \

From a35555b33108e480ce7dae852d25e7eb634ad09a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:52:36 +0000
Subject: [PATCH 3603/6849] package/qemu: bump version to 1.2.2

There are a bunch of important fixes since 1.2.1.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 8d0780773f..315886f39f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEMU_VERSION = 1.2.1
+QEMU_VERSION = 1.2.2
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c

From 5c8b0e6166ea5c8c001485bc6fbf1d146e55c29b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:52:37 +0000
Subject: [PATCH 3604/6849] package/qemu: use autotools-package infrastructure

Turns out that, with a little bit of tweaking, we can use
the autotools-package infrastructure to build QEMU.

That's better than defining all the _CMDS and using the
generic-package infra.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 315886f39f..bd42481669 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -62,6 +62,9 @@ ifeq ($(HOST_QEMU_ARCH),powerpc)
 endif
 HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
 
+# Note: although QEMU has a ./configure script, it is not a real autotools
+# package, and ./configure chokes on options such as --host or --target.
+# So, provide out own _CONFIGURE_CMDS to override the defaults.
 define HOST_QEMU_CONFIGURE_CMDS
 	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
 		--target-list="$(HOST_QEMU_TARGETS)"    \
@@ -74,19 +77,7 @@ define HOST_QEMU_CONFIGURE_CMDS
 	)
 endef
 
-define HOST_QEMU_BUILD_CMDS
-	$(MAKE) -C $(@D) all
-endef
-
-define HOST_QEMU_INSTALL_CMDS
-	$(MAKE) -C $(@D) install
-endef
-
-define HOST_QEMU_CLEAN_CMDS
-	$(MAKE) -C $(@D) clean
-endef
-
-$(eval $(host-generic-package))
+$(eval $(host-autotools-package))
 
 # variable used by other packages
 QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)

From 8b2a81e267fac465064456469ec52c8897c2f59e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:08 +0000
Subject: [PATCH 3605/6849] package/vde2: new package

VDE is an ethernet compliant virtual network that can be
spawned over a set of physical computer over the Internet.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/vde2/Config.in         |  8 +++++++
 package/vde2/vde2-no-cxx.patch | 22 +++++++++++++++++++
 package/vde2/vde2.mk           | 39 ++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 package/vde2/Config.in
 create mode 100644 package/vde2/vde2-no-cxx.patch
 create mode 100644 package/vde2/vde2.mk

diff --git a/package/Config.in b/package/Config.in
index c605e6f886..70a572bf1f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -675,6 +675,7 @@ source "package/ttcp/Config.in"
 source "package/udpcast/Config.in"
 source "package/ulogd/Config.in"
 source "package/ushare/Config.in"
+source "package/vde2/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
diff --git a/package/vde2/Config.in b/package/vde2/Config.in
new file mode 100644
index 0000000000..f069a7936e
--- /dev/null
+++ b/package/vde2/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_VDE2
+	bool "vde2"
+	help
+	  VDE is an ethernet compliant virtual network that can be
+	  spawned over a set of physical computers over the Internet.
+	  VDE is part of the virtualsquare project.
+	  
+	  http://vde.sourceforge.net/
diff --git a/package/vde2/vde2-no-cxx.patch b/package/vde2/vde2-no-cxx.patch
new file mode 100644
index 0000000000..67cefa2bb8
--- /dev/null
+++ b/package/vde2/vde2-no-cxx.patch
@@ -0,0 +1,22 @@
+configure: do not test for CXX, it's not needed
+
+There is no C++ source file, so no reason to require a C++ compiler.
+
+Reported-by: Peter Korsgaard <jacmet@uclibc.org>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch sent upstream
+( not yet in archives, awaits moderator approval... :-/ )
+
+diff -durN vde2-2.3.2.orig/configure.ac vde2-2.3.2/configure.ac
+--- vde2-2.3.2.orig/configure.ac	2011-11-23 17:41:19.000000000 +0100
++++ vde2-2.3.2/configure.ac	2012-12-14 21:56:47.146319686 +0100
+@@ -11,7 +11,6 @@
+ AC_CONFIG_LIBOBJ_DIR(src/common)
+ 
+ # Checks for programs.
+-AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
new file mode 100644
index 0000000000..cb85f57dea
--- /dev/null
+++ b/package/vde2/vde2.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# vde2
+#
+#############################################################
+
+VDE2_VERSION         = 2.3.2
+VDE2_SOURCE          = vde2-$(VDE2_VERSION).tar.bz2
+VDE2_SITE            = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
+VDE2_LICENSE         = GPLv2+ LGPLv2.1+ BSD-3c
+VDE2_LICENSE_FILES   = COPYING COPYING.libvdeplug COPYING.slirpvde
+VDE2_INSTALL_STAGING = YES
+
+# We touch configure.ac, so we need to autoreconf
+VDE2_AUTORECONF      = YES
+
+# Reasons for enabling/disabling stuff:
+# - tuntap is enabled in the hope we're using a recent-enough toolchain
+#   that does have if_tun.h (virtually everything these days)
+# - kvde_switch is disabled because it requires a patched kernel
+# - cryptcab is disabled to not depend on openSSL
+# - python is disabled to not depend on Python
+# - pcap is disabled to not depend on libpcap
+# - profiling is disabled because we do not want to debug/profile
+#
+# Note: disabled features can be added with corresponding dependencies
+#       in future commits.
+VDE2_CONF_OPT = --disable-experimental  \
+                --disable-cryptcab      \
+                --disable-pcap          \
+                --disable-python        \
+                --disable-profile       \
+                --disable-kernel-switch \
+                --enable-tuntap         \
+
+# Package does not build in parallel due to improper make rules
+VDE2_MAKE = $(MAKE1)
+
+$(eval $(autotools-package))

From 511d7317ad72fab84287f32c5a6872593d932d72 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:09 +0000
Subject: [PATCH 3606/6849] package/usbredir: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/usbredir/Config.in   | 29 +++++++++++++++++++++++++++++
 package/usbredir/usbredir.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 package/usbredir/Config.in
 create mode 100644 package/usbredir/usbredir.mk

diff --git a/package/Config.in b/package/Config.in
index 70a572bf1f..1ed77e0b6c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -494,6 +494,7 @@ source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
 source "package/nss-mdns/Config.in"
 source "package/ortp/Config.in"
+source "package/usbredir/Config.in"
 source "package/zeromq/Config.in"
 endmenu
 
diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in
new file mode 100644
index 0000000000..e2a71840ac
--- /dev/null
+++ b/package/usbredir/Config.in
@@ -0,0 +1,29 @@
+comment "usbredir needs a toolchain with threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_USBREDIR
+	bool "usbredir"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
+	help
+	  usbredir is the name of a network protocol for sending usb device
+	  traffic over a network connection. It is also the name of the
+	  software package offering a parsing library, a usbredirhost library
+	  and several utilities implementing this protocol.
+	  
+	  Note: only the library is installed, not the utilities. Say 'y'
+	  below if you want the server too.
+	  
+	  http://www.spice-space.org/page/UsbRedir
+
+if BR2_PACKAGE_USBREDIR
+
+config BR2_PACKAGE_USBREDIR_SERVER
+	bool "usbredirserver on target"
+	help
+	  If you want to serve usbredir requests on your target, say 'y'
+	  here to have the usbredir server on the target.
+	  
+	  Note: the server is not required to use the library.
+
+endif
diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
new file mode 100644
index 0000000000..ac98472b51
--- /dev/null
+++ b/package/usbredir/usbredir.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# usbredir
+#
+#############################################################
+
+USBREDIR_VERSION         = 0.4.3
+USBREDIR_SOURCE          = usbredir-$(USBREDIR_VERSION).tar.bz2
+USBREDIR_SITE            = http://spice-space.org/download/usbredir
+USBREDIR_LICENSE         = LGPLv2.1+
+USBREDIR_LICENSE_FILES   = COPYING.LIB
+USBREDIR_INSTALL_STAGING = YES
+USBREDIR_DEPENDENCIES    = host-pkgconf libusb
+
+ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
+
+USBREDIR_LICENSE         += (for the library), GPLv2+ (for the server)
+USBREDIR_LICENSE_FILES   += COPYING
+
+else # BR2_PACKAGE_USBREDIR_SERVER != y
+
+define USBREDIR_POST_INSTALL_TARGET_RM_SERVER
+	rm -f $(TARGET_DIR)/usr/sbin/usbredirserver
+endef
+USBREDIR_POST_INSTALL_TARGET_HOOKS += USBREDIR_POST_INSTALL_TARGET_RM_SERVER
+
+endif # BR2_PACKAGE_USBREDIR_SERVER
+
+$(eval $(autotools-package))

From da1147e763737f5dd4da3d20c5bf2109d5d85562 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 16 Dec 2012 20:23:17 +0100
Subject: [PATCH 3607/6849] usbredir: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbredir/usbredir.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
index ac98472b51..f0530a79c4 100644
--- a/package/usbredir/usbredir.mk
+++ b/package/usbredir/usbredir.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USBREDIR_VERSION         = 0.4.3
+USBREDIR_VERSION         = 0.4.4
 USBREDIR_SOURCE          = usbredir-$(USBREDIR_VERSION).tar.bz2
 USBREDIR_SITE            = http://spice-space.org/download/usbredir
 USBREDIR_LICENSE         = LGPLv2.1+

From a13fd5f4ceba61570cbfb22c452ee8abb898414e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:10 +0000
Subject: [PATCH 3608/6849] package/celt051: new package

[Peter: move to Libraries->Audio/Sound]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in         |  1 +
 package/celt051/Config.in | 15 +++++++++++++++
 package/celt051/celt.mk   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/celt051/Config.in
 create mode 100644 package/celt051/celt.mk

diff --git a/package/Config.in b/package/Config.in
index 1ed77e0b6c..f3959347f1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -327,6 +327,7 @@ menu "Libraries"
 menu "Audio/Sound"
 source "package/alsa-lib/Config.in"
 source "package/audiofile/Config.in"
+source "package/celt051/Config.in"
 source "package/libao/Config.in"
 source "package/libcdaudio/Config.in"
 source "package/libcue/Config.in"
diff --git a/package/celt051/Config.in b/package/celt051/Config.in
new file mode 100644
index 0000000000..50ed069276
--- /dev/null
+++ b/package/celt051/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_CELT051
+	bool "celt051"
+	select BR2_PACKAGE_LIBOGG
+	help
+	  The CELT ultra-low delay audio codec
+	  
+	  The CELT codec is a compression algorithm for audio. Like MP3,
+	  Vorbis, and AAC it is suitable for transmitting music with high
+	  quality. Unlike these formats CELT imposes very little delay on
+	  the signal, even less than is typical for speech centric formats
+	  like Speex, GSM, or G.729.
+	  
+	  Note: this is version 0.5.1.3 of celt.
+	  
+	  http://www.celt-codec.org/
diff --git a/package/celt051/celt.mk b/package/celt051/celt.mk
new file mode 100644
index 0000000000..9baaa82454
--- /dev/null
+++ b/package/celt051/celt.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# celt051
+#
+#############################################################
+
+# Although version newer than 0.5.1.3 exists, we're
+# stuck with 0.5.1.3 for use by Spice (coming later)
+CELT051_VERSION         = 0.5.1.3
+CELT051_SOURCE          = celt-$(CELT051_VERSION).tar.gz
+CELT051_SITE            = http://downloads.xiph.org/releases/celt
+CELT051_LICENSE         = BSD-2c
+CELT051_LICENSE_FILES   = COPYING
+CELT051_INSTALL_STAGING = YES
+CELT051_DEPENDENCIES    = libogg
+
+# Need to specify --with-ogg, otherwise /usr/lib may be searched for
+# if target is the same kind as host (ie. same arch, same bitness,
+# same endianness, so that /usr/lib contains libraries linkable by
+# our cross-compiler)
+CELT051_CONF_OPT =                  \
+  --enable-fixed-point              \
+  --disable-fixed-point-debug       \
+  --disable-experimental-postfilter \
+  --disable-static-modes            \
+  --disable-assertions              \
+  --disable-oggtest                 \
+  --with-ogg=$(STAGING_DIR)/usr     \
+
+$(eval $(autotools-package))

From df07240d6fb4c60ecc65a54ea10dfc729773a803 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:11 +0000
Subject: [PATCH 3609/6849] package/python-pyparsing: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/python-pyparsing/Config.in           | 11 ++++++
 package/python-pyparsing/python-pyparsing.mk | 38 ++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 package/python-pyparsing/Config.in
 create mode 100644 package/python-pyparsing/python-pyparsing.mk

diff --git a/package/Config.in b/package/Config.in
index f3959347f1..07681b549a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -309,6 +309,7 @@ source "package/python-netifaces/Config.in"
 source "package/python-nfc/Config.in"
 source "package/python-protobuf/Config.in"
 source "package/python-pygame/Config.in"
+source "package/python-pyparsing/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
 endmenu
diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in
new file mode 100644
index 0000000000..126dd0e78c
--- /dev/null
+++ b/package/python-pyparsing/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_PYPARSING
+	bool "pyparsing"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  The pyparsing module is an alternative approach to creating and
+	  executing simple grammars, vs. the traditional lex/yacc approach,
+	  or the use of regular expressions. The pyparsing module provides
+	  a library of classes that client code uses to construct the grammar
+	  directly in Python code.
+	  
+	  http://pyparsing.wikispaces.com/
diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk
new file mode 100644
index 0000000000..246df4db0a
--- /dev/null
+++ b/package/python-pyparsing/python-pyparsing.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# python-pyparsing
+#
+#############################################################
+
+PYTHON_PYPARSING_VERSION         = 1.5.6
+PYTHON_PYPARSING_SOURCE          = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
+PYTHON_PYPARSING_SITE            = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
+PYTHON_PYPARSING_LICENSE         = MIT
+PYTHON_PYPARSING_LICENSE_FILES   = LICENSE
+PYTHON_PYPARSING_INSTALL_STAGING = YES
+PYTHON_PYPARSING_DEPENDENCIES    = python
+
+# Shamelessly vampirised from python-pygame ;-)
+define PYTHON_PYPARSING_BUILD_CMDS
+	(cd $(@D);                                              \
+	 CC="$(TARGET_CC)"                                      \
+	 CFLAGS="$(TARGET_CFLAGS)"                              \
+	 LDSHARED="$(TARGET_CROSS)gcc -shared"                  \
+	 CROSS_COMPILING=yes                                    \
+	 _python_sysroot=$(STAGING_DIR)                         \
+	 _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION)    \
+	 _python_prefix=/usr                                    \
+	 _python_exec_prefix=/usr                               \
+	 $(HOST_DIR)/usr/bin/python setup.py build              \
+	)
+endef
+
+# Shamelessly vampirised from python-pygame ;-)
+define PYTHON_PYPARSING_INSTALL_TARGET_CMDS
+	(cd $(@D);                                              \
+	 $(HOST_DIR)/usr/bin/python setup.py install            \
+	                            --prefix=$(TARGET_DIR)/usr  \
+	)
+endef
+
+$(eval $(generic-package))

From 303c922c62d2eb08ce3ffb02206b9bf959b305dc Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:12 +0000
Subject: [PATCH 3610/6849] package/cegui06: new package

Although there are more recent versions of CEGUI, we are stuck
with 0.6.2b for use by spice.

[Peter: add C++ dependency]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/cegui06/Config.in              | 19 ++++++++++++++
 package/cegui06/cegui06-stddef.h.patch | 26 +++++++++++++++++++
 package/cegui06/cegui06.mk             | 36 ++++++++++++++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 package/cegui06/Config.in
 create mode 100644 package/cegui06/cegui06-stddef.h.patch
 create mode 100644 package/cegui06/cegui06.mk

diff --git a/package/Config.in b/package/Config.in
index 07681b549a..de23724e83 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -109,6 +109,7 @@ comment "Graphic applications"
 source "package/rrdtool/Config.in"
 
 comment "graphic libraries"
+source "package/cegui06/Config.in"
 source "package/directfb/Config.in"
 source "package/directfb-examples/Config.in"
 source "package/divine/Config.in"
diff --git a/package/cegui06/Config.in b/package/cegui06/Config.in
new file mode 100644
index 0000000000..5ce9700da4
--- /dev/null
+++ b/package/cegui06/Config.in
@@ -0,0 +1,19 @@
+comment "cegui06 needs a toolchain with C++ and threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_CEGUI06
+	bool "cegui06"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_PCRE
+	help
+	  Crazy Eddie's GUI System is a free library providing windowing and
+	  widgets for graphics APIs / engines where such functionality is not
+	  natively available, or severely lacking. The library is object
+	  orientated, written in C++, and targeted at games developers who
+	  should be spending their time creating great games, not building
+	  GUI sub-systems!
+	  
+	  http://www.cegui.org.uk/
diff --git a/package/cegui06/cegui06-stddef.h.patch b/package/cegui06/cegui06-stddef.h.patch
new file mode 100644
index 0000000000..cc16effc25
--- /dev/null
+++ b/package/cegui06/cegui06-stddef.h.patch
@@ -0,0 +1,26 @@
+includes: ptrdiff_t is defined in stddef.h
+
+ptrdiff_t is defined in the stddef.h header, so this
+header must be included.
+
+Do the #include in a common header to avoid doing it
+all over the place.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch not sent upstream, it's a no-longer-maintained branch.
+To be noted, however, is that the current devel branch is
+still missing that include.
+
+diff -durN cegui06-0.6.2.orig/include/CEGUIBase.h cegui06-0.6.2/include/CEGUIBase.h
+--- cegui06-0.6.2.orig//include/CEGUIBase.h	2008-02-11 15:38:27.000000000 +0100
++++ cegui06-0.6.2/include/CEGUIBase.h	2012-08-19 22:51:50.260385978 +0200
+@@ -34,6 +34,7 @@
+ #define _CEGUIBase_h_
+ 
+ #include <cassert>
++#include <stddef.h>
+ 
+ // bring in configuration options
+ #include "CEGUIConfig.h"
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
new file mode 100644
index 0000000000..817254f443
--- /dev/null
+++ b/package/cegui06/cegui06.mk
@@ -0,0 +1,36 @@
+#############################################################
+#
+# libcegui
+#
+#############################################################
+
+# Do not update the version, we need exactly that one for Spice.
+CEGUI06_VERSION_MAJOR   = 0.6.2
+CEGUI06_VERSION         = $(CEGUI06_VERSION_MAJOR)b
+CEGUI06_SOURCE          = CEGUI-$(CEGUI06_VERSION).tar.gz
+CEGUI06_SITE            = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
+CEGUI06_LICENSE         = MIT
+CEGUI06_LICENSE_FILES   = COPYING
+CEGUI06_INSTALL_STAGING = YES
+
+CEGUI06_DEPENDENCIES    =       \
+    expat                       \
+    freetype                    \
+    pcre                        \
+
+CEGUI06_CONF_OPT =              \
+    --enable-expat              \
+    --disable-external-tinyxml  \
+    --disable-xerces-c          \
+    --disable-libxml            \
+    --disable-tinyxml           \
+    --disable-opengl-renderer   \
+    --disable-external-glew     \
+    --disable-irrlicht-renderer \
+    --disable-directfb-renderer \
+    --disable-samples           \
+    --disable-lua-module        \
+    --disable-toluacegui        \
+    --disable-external-toluapp  \
+
+$(eval $(autotools-package))

From f6ce8ee9d13d32bbc43b23bf7ed7b7a3f0cbd2f0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:13 +0000
Subject: [PATCH 3611/6849] package/slirp: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/slirp/Config.in | 25 +++++++++++++++++++++++++
 package/slirp/slirp.mk  | 21 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 package/slirp/Config.in
 create mode 100644 package/slirp/slirp.mk

diff --git a/package/Config.in b/package/Config.in
index de23724e83..eaf42e3396 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -497,6 +497,7 @@ source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
 source "package/nss-mdns/Config.in"
 source "package/ortp/Config.in"
+source "package/slirp/Config.in"
 source "package/usbredir/Config.in"
 source "package/zeromq/Config.in"
 endmenu
diff --git a/package/slirp/Config.in b/package/slirp/Config.in
new file mode 100644
index 0000000000..dedded37f2
--- /dev/null
+++ b/package/slirp/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_SLIRP
+	bool "slirp"
+	help
+	  The Spice project aims to provide a complete open source
+	  solution for interaction with virtualized desktop devices.
+	  The Spice project deals with both the virtualized devices
+	  and the front-end. Interaction between front-end and
+	  back-end is done using VD-Interfaces.
+	  
+	  This package implements the slirp-part for Spice.
+	  Slirp emulates a PPP or SLIP connection over a normal terminal.
+	  
+	  http://www.spice-space.org/
+	  
+	  NOTE:
+	  This package has some history of a unique kind:
+	    - originally developped as 'slirp' by Danny Gasparovski, and
+	      seemingly abandonned (developper /disapeared/)
+	    - then re-maintained at sourceforge by "Kelly", up to some
+	      time around 2009: http://slirp.sourceforge.net/
+	    - during that period, QEMU (Fabrice BELLARD) forked the code
+	      and included it in QEMU
+	    - and it was imported from this breed by the Spice project
+	      around May 2009
+	    - which is what we use here
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
new file mode 100644
index 0000000000..b3f4bcdf10
--- /dev/null
+++ b/package/slirp/slirp.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# Spice-slirp
+#
+#############################################################
+
+# There's no tarball releases of slirp, so we use the git repo
+# Also, there's no tag, so we use a random SHA1 (master's HEAD
+# of today)
+SLIRP_VERSION         = 8c2da74c1385242f20799fec8c04f8378edc6550
+SLIRP_SITE            = git://anongit.freedesktop.org/spice/slirp
+SLIRP_LICENSE         = BSD-4c BSD-2c
+# Note: The license file 'COPYRIGHT' is missing from the sources,
+# although some files refer to it.
+SLIRP_INSTALL_STAGING = YES
+
+# As we're using the git tree, there's no ./configure,
+# so we need to autoreconf.
+SLIRP_AUTORECONF      = YES
+
+$(eval $(autotools-package))

From 31d41cdefa4869fdd544dd9812c6f1902b72caab Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:14 +0000
Subject: [PATCH 3612/6849] package/spice-protocol: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/spice-protocol/Config.in         | 12 ++++++++++++
 package/spice-protocol/spice-protocol.mk | 14 ++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/spice-protocol/Config.in
 create mode 100644 package/spice-protocol/spice-protocol.mk

diff --git a/package/Config.in b/package/Config.in
index eaf42e3396..3de01406fa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -665,6 +665,7 @@ source "package/ser2net/Config.in"
 source "package/socat/Config.in"
 source "package/socketcand/Config.in"
 source "package/spawn-fcgi/Config.in"
+source "package/spice-protocol/Config.in"
 source "package/squid/Config.in"
 source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
diff --git a/package/spice-protocol/Config.in b/package/spice-protocol/Config.in
new file mode 100644
index 0000000000..b35436177c
--- /dev/null
+++ b/package/spice-protocol/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_SPICE_PROTOCOL
+	bool "spice protocol"
+	help
+	  The Spice project aims to provide a complete open source
+	  solution for interaction with virtualized desktop devices.
+	  The Spice project deals with both the virtualized devices
+	  and the front-end. Interaction between front-end and
+	  back-end is done using VD-Interfaces.
+	  
+	  This package implements the protocol-part of Spice.
+	  
+	  http://www.spice-space.org/
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
new file mode 100644
index 0000000000..dcfe50d248
--- /dev/null
+++ b/package/spice-protocol/spice-protocol.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# Spice-protocol
+#
+#############################################################
+
+SPICE_PROTOCOL_VERSION         = 0.12.2
+SPICE_PROTOCOL_SOURCE          = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
+SPICE_PROTOCOL_SITE            = http://www.spice-space.org/download/releases/
+SPICE_PROTOCOL_LICENSE         = BSD-3c
+SPICE_PROTOCOL_LICENSE_FILES   = COPYING
+SPICE_PROTOCOL_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 93d4e38450639aef401adfcc2c4e412efaef3da9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:15 +0000
Subject: [PATCH 3613/6849] package/spice: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/spice/Config.in | 23 +++++++++++++++
 package/spice/spice.mk  | 62 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 package/spice/Config.in
 create mode 100644 package/spice/spice.mk

diff --git a/package/Config.in b/package/Config.in
index 3de01406fa..d3f5e8015c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -666,6 +666,7 @@ source "package/socat/Config.in"
 source "package/socketcand/Config.in"
 source "package/spawn-fcgi/Config.in"
 source "package/spice-protocol/Config.in"
+source "package/spice/Config.in"
 source "package/squid/Config.in"
 source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
diff --git a/package/spice/Config.in b/package/spice/Config.in
new file mode 100644
index 0000000000..086b1bc483
--- /dev/null
+++ b/package/spice/Config.in
@@ -0,0 +1,23 @@
+comment "spice server depends on python (for pyparsing)"
+	depends on !BR2_PACKAGE_PYTHON
+
+config BR2_PACKAGE_SPICE
+	bool "spice server"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_CELT051
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_PIXMAN
+	select BR2_PACKAGE_PYTHON_PYPARSING
+	select BR2_PACKAGE_SPICE_PROTOCOL
+	help
+	  The Spice project aims to provide a complete open source
+	  solution for interaction with virtualized desktop devices.
+	  The Spice project deals with both the virtualized devices
+	  and the front-end. Interaction between front-end and
+	  back-end is done using VD-Interfaces.
+	  
+	  This package implements the server-part of Spice.
+	  
+	  http://www.spice-space.org/
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
new file mode 100644
index 0000000000..2752b8af76
--- /dev/null
+++ b/package/spice/spice.mk
@@ -0,0 +1,62 @@
+#############################################################
+#
+# Spice
+#
+#############################################################
+
+SPICE_VERSION         = 0.12.0
+SPICE_SOURCE          = spice-$(SPICE_VERSION).tar.bz2
+SPICE_SITE            = http://www.spice-space.org/download/releases/
+SPICE_LICENSE         = LGPLv2.1+
+SPICE_LICENSE_FILES   = COPYING
+SPICE_INSTALL_STAGING = YES
+SPICE_DEPENDENCIES    = \
+    alsa-lib            \
+    celt051             \
+    jpeg                \
+    openssl             \
+    pixman              \
+    python-pyparsing    \
+    spice-protocol      \
+
+# We disable everything for now, because the dependency tree can become
+# quite deep if we try to enable some features, and I have not tested that.
+SPICE_CONF_OPT =            \
+  --disable-tunnel          \
+  --disable-gui             \
+  --disable-opengl          \
+  --disable-smartcard       \
+  --disable-client          \
+  --disable-automated-tests \
+  --without-sasl            \
+
+SPICE_DEPENDENCIES += host-pkgconf
+
+SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+
+# We need to tweak spice.pc because it /forgets/ (for static linking) that
+# it should link against libz and libjpeg. libz is pkg-config-aware, while
+# libjpeg isn't, hence the two-line tweak
+define SPICE_POST_INSTALL_STAGING_FIX_PC
+	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;'    \
+	       "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
+endef
+SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
+
+# It is currently not possible to detect if stack-protection is available
+# or not, because it requires support from both the compiler *and* the
+# C library, but the C library (eg. uClibc) can be compiled without that
+# support, even if gcc accepts the -fstack-protector-all option.
+# spice's ./configure only checks for gcc's -fstack-protector-all option,
+# so it misses the case where the C library doe not provide the requires
+# support.
+# A correct fix would be to fix spice's ./configure to also check the C
+# library, but it might be much more involved.
+# So, we simply disable it for now. After all, as uClibc's help puts it:
+#     Note that NOEXECSTACK on a kernel with address space randomization
+#     is generally sufficient to prevent most buffer overflow exploits
+#     without increasing code size.
+SPICE_CONF_OPT += gl_cv_warn__fstack_protector_all=no
+
+$(eval $(autotools-package))

From a872142c2f25761cbcfe024d4b9f0072f2639cea Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:16 +0000
Subject: [PATCH 3614/6849] package/spice: enable client

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spice/Config.in | 13 +++++++++++++
 package/spice/spice.mk  |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/package/spice/Config.in b/package/spice/Config.in
index 086b1bc483..aacc779ba5 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -21,3 +21,16 @@ config BR2_PACKAGE_SPICE
 	  This package implements the server-part of Spice.
 	  
 	  http://www.spice-space.org/
+
+if BR2_PACKAGE_SPICE
+
+comment "client depends on X.org"
+	depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_SPICE_CLIENT
+	bool "Enable client"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XLIB_LIBXRANDR
+
+endif # BR2_PACKAGE_SPICE
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 2752b8af76..2f7fc20d19 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -26,12 +26,18 @@ SPICE_CONF_OPT =            \
   --disable-gui             \
   --disable-opengl          \
   --disable-smartcard       \
-  --disable-client          \
   --disable-automated-tests \
   --without-sasl            \
 
 SPICE_DEPENDENCIES += host-pkgconf
 
+ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y)
+SPICE_CONF_OPT += --enable-client
+SPICE_DEPENDENCIES += xlib_libXfixes xlib_libXrandr
+else
+SPICE_CONF_OPT += --disable-client
+endif
+
 SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 

From af103acf4eb7fa6193c0bb9d844ea95f4e15db71 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:17 +0000
Subject: [PATCH 3615/6849] package/spice: enable GUI

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spice/Config.in | 8 ++++++++
 package/spice/spice.mk  | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package/spice/Config.in b/package/spice/Config.in
index aacc779ba5..08c3893f67 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -33,4 +33,12 @@ config BR2_PACKAGE_SPICE_CLIENT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 
+config BR2_PACKAGE_SPICE_GUI
+	bool "Enable GUI"
+	depends on BR2_PACKAGE_SPICE_CLIENT
+	select BR2_PACKAGE_CEGUI06
+	help
+	  Say 'y' here to enable the Graphical User Interface (GUI)
+	  start dialog.
+
 endif # BR2_PACKAGE_SPICE
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 2f7fc20d19..0a5c58e17f 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -23,7 +23,6 @@ SPICE_DEPENDENCIES    = \
 # quite deep if we try to enable some features, and I have not tested that.
 SPICE_CONF_OPT =            \
   --disable-tunnel          \
-  --disable-gui             \
   --disable-opengl          \
   --disable-smartcard       \
   --disable-automated-tests \
@@ -38,6 +37,13 @@ else
 SPICE_CONF_OPT += --disable-client
 endif
 
+ifeq ($(BR2_PACKAGE_SPICE_GUI),y)
+SPICE_CONF_OPT += --enable-gui
+SPICE_DEPENDENCIES += cegui06
+else
+SPICE_CONF_OPT += --disable-gui
+endif
+
 SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 

From 5faf337b39a0515439b828c5ad12858fa9c02b38 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:18 +0000
Subject: [PATCH 3616/6849] package/spice: enable slirp support

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spice/Config.in | 7 +++++++
 package/spice/spice.mk  | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/spice/Config.in b/package/spice/Config.in
index 08c3893f67..b1e187a634 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -41,4 +41,11 @@ config BR2_PACKAGE_SPICE_GUI
 	  Say 'y' here to enable the Graphical User Interface (GUI)
 	  start dialog.
 
+config BR2_PACKAGE_SPICE_TUNNEL
+	bool "Enable network redirection"
+	select BR2_PACKAGE_SLIRP
+	help
+	  Say 'y' here to enable network redirection, aka tunnelling
+	  through a SLIP/SLIRP session.
+
 endif # BR2_PACKAGE_SPICE
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 0a5c58e17f..78ca202b1e 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -22,7 +22,6 @@ SPICE_DEPENDENCIES    = \
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.
 SPICE_CONF_OPT =            \
-  --disable-tunnel          \
   --disable-opengl          \
   --disable-smartcard       \
   --disable-automated-tests \
@@ -44,6 +43,13 @@ else
 SPICE_CONF_OPT += --disable-gui
 endif
 
+ifeq ($(BR2_PACKAGE_SPICE_TUNNEL),y)
+SPICE_CONF_OPT += --enable-tunnel
+SPICE_DEPENDENCIES += slirp
+else
+SPICE_CONF_OPT += --disable-tunnel
+endif
+
 SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 

From fd303038febaf7008a1f04262dc5decb32d1cfab Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:19 +0000
Subject: [PATCH 3617/6849] package/libseccomp: new package

[Peter: fix typo in help text]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libseccomp/Config.in                  | 13 +++++++++++
 ...comp-use-system-headers-from-sysroot.patch | 17 ++++++++++++++
 package/libseccomp/libseccomp.mk              | 22 +++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 package/libseccomp/Config.in
 create mode 100644 package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
 create mode 100644 package/libseccomp/libseccomp.mk

diff --git a/package/Config.in b/package/Config.in
index d3f5e8015c..1b8c5b30cd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -524,6 +524,7 @@ source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
 source "package/libtpl/Config.in"
+source "package/libseccomp/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
 source "package/lttng-libust/Config.in"
diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
new file mode 100644
index 0000000000..1e524d2f19
--- /dev/null
+++ b/package/libseccomp/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBSECCOMP
+	bool "libseccomp"
+	help
+	  High level interface to the Linux Kernel's seccomp filter
+	  
+	  The libseccomp library provides an easy to use, platform independent,
+	  interface to the Linux Kernel's syscall filtering mechanism: seccomp.
+	  The libseccomp API is designed to abstract away the underlying BPF
+	  based syscall filter language and present a more conventional
+	  function-call based filtering interface that should be familiar to,
+	  and easily adopted by application developers.
+	  
+	  http://sourceforge.net/projects/libseccomp/
diff --git a/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch b/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
new file mode 100644
index 0000000000..0997eddb8e
--- /dev/null
+++ b/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
@@ -0,0 +1,17 @@
+configure: check headers in sysroot, not in host's system headers
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN libseccomp-1.0.0.orig/configure libseccomp-1.0.0/configure
+--- libseccomp-1.0.0.orig/configure	2012-07-27 22:35:05.000000000 +0200
++++ libseccomp-1.0.0/configure	2012-10-27 00:12:50.739196219 +0200
+@@ -205,7 +205,8 @@
+ #
+ 
+ # system seccomp includes
+-if [[ -r "/usr/include/linux/seccomp.h" ]]; then
++# ${SYSROOT} added by buildroot for cross-compilation
++if [[ -r "${SYSROOT}/usr/include/linux/seccomp.h" ]]; then
+ 	opt_sysinc_seccomp="yes"
+ else
+ 	opt_sysinc_seccomp="no"
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
new file mode 100644
index 0000000000..73fe632b11
--- /dev/null
+++ b/package/libseccomp/libseccomp.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# libseccomp
+#
+#############################################################
+
+LIBSECCOMP_VERSION         = 1.0.0
+LIBSECCOMP_SOURCE          = libseccomp-$(LIBSECCOMP_VERSION).tar.gz
+LIBSECCOMP_SITE            = http://downloads.sourceforge.net/project/libseccomp
+LIBSECCOMP_LICENSE         = LGPLv2.1
+LIBSECCOMP_LICENSE_FILES   = LICENSE
+LIBSECCOMP_INSTALL_STAGING = YES
+
+# Needed for configure to find our system headers:
+LIBSECCOMP_CONF_ENV            = SYSROOT=$(STAGING_DIR)
+LIBSECCOMP_MAKE_ENV            = $(TARGET_CONFIGURE_OPTS)
+LIBSECCOMP_MAKE_OPT            = SUBDIRS_BUILD=src
+LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
+LIBSECCOMP_INSTALL_TARGET_OPT  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
+
+# Not a real autotools package, but works quite OK nonetheless
+$(eval $(autotools-package))

From 90934a3de8364038b05d33b8145fd6d506809a64 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 06:56:20 +0000
Subject: [PATCH 3618/6849] package/keyutils: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/keyutils/Config.in                    |  7 ++
 .../keyutils-01-memleak-from-realloc.patch    | 51 +++++++++++++++
 .../keyutils-02-another-memleak.patch         | 32 +++++++++
 package/keyutils/keyutils-03-cifs.patch       | 15 +++++
 .../keyutils-04-Makefile-for-buildroot.patch  | 65 +++++++++++++++++++
 .../keyutils-05-fix-install-rule.patch        | 19 ++++++
 package/keyutils/keyutils.mk                  | 32 +++++++++
 8 files changed, 222 insertions(+)
 create mode 100644 package/keyutils/Config.in
 create mode 100644 package/keyutils/keyutils-01-memleak-from-realloc.patch
 create mode 100644 package/keyutils/keyutils-02-another-memleak.patch
 create mode 100644 package/keyutils/keyutils-03-cifs.patch
 create mode 100644 package/keyutils/keyutils-04-Makefile-for-buildroot.patch
 create mode 100644 package/keyutils/keyutils-05-fix-install-rule.patch
 create mode 100644 package/keyutils/keyutils.mk

diff --git a/package/Config.in b/package/Config.in
index 1b8c5b30cd..d6af55d83a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -741,6 +741,7 @@ endif
 source "package/bwm-ng/Config.in"
 source "package/cpuload/Config.in"
 source "package/htop/Config.in"
+source "package/keyutils/Config.in"
 source "package/kmod/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in
new file mode 100644
index 0000000000..9b5a24bbce
--- /dev/null
+++ b/package/keyutils/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KEYUTILS
+	bool "keyutils"
+	help
+	  These tools are used to control the key management system
+	  built into the Linux kernel.
+	  
+	  http://people.redhat.com/~dhowells/keyutils/
diff --git a/package/keyutils/keyutils-01-memleak-from-realloc.patch b/package/keyutils/keyutils-01-memleak-from-realloc.patch
new file mode 100644
index 0000000000..0faa9d8604
--- /dev/null
+++ b/package/keyutils/keyutils-01-memleak-from-realloc.patch
@@ -0,0 +1,51 @@
+Patch vampirised from Debian's packaging of keyutils-1.4
+
+Author: Michael Gebetsroither <gebi@grml.org>
+Description: Fixed memleak from realloc (Closes: #496466).
+
+diff -Naurp keyutils.orig/keyutils.c keyutils/keyutils.c
+--- keyutils.orig/keyutils.c	2008-08-09 21:46:52.000000000 +0200
++++ keyutils/keyutils.c	2008-08-25 13:38:07.000000000 +0200
+@@ -165,6 +165,24 @@ long keyctl_assume_authority(key_serial_
+ 	return keyctl(KEYCTL_ASSUME_AUTHORITY, id);
+ }
+ 
++
++/*****************************************************************************/
++/*
++ * plain realloc is just crazy
++ */
++static void* __xrealloc(void* ptr, size_t size)
++{
++    void* ret;
++
++    ret = realloc(ptr, size);
++    if(!ret) {
++        free(ptr);
++        return 0;
++    }
++    return ret;
++}
++
++
+ /*****************************************************************************/
+ /*
+  * fetch key description into an allocated buffer
+@@ -194,7 +212,7 @@ int keyctl_describe_alloc(key_serial_t i
+ 			break;
+ 
+ 		buflen = ret;
+-		buf = realloc(buf, buflen);
++		buf = __xrealloc(buf, buflen);
+ 		if (!buf)
+ 			return -1;
+ 	}
+@@ -233,7 +251,7 @@ int keyctl_read_alloc(key_serial_t id, v
+ 			break;
+ 
+ 		buflen = ret;
+-		buf = realloc(buf, buflen + 1);
++		buf = __xrealloc(buf, buflen + 1);
+ 		if (!buf)
+ 			return -1;
+ 	}
diff --git a/package/keyutils/keyutils-02-another-memleak.patch b/package/keyutils/keyutils-02-another-memleak.patch
new file mode 100644
index 0000000000..f74fd79ba5
--- /dev/null
+++ b/package/keyutils/keyutils-02-another-memleak.patch
@@ -0,0 +1,32 @@
+Patch vampirised from Debian's packaging of keyutils-1.4
+
+Author: Michael Gebetsroither <gebi@grml.org>
+Description: Fixed another memleak (Closes: #496466).
+
+diff -Naurp keyutils.orig/keyutils.c keyutils/keyutils.c
+--- keyutils.orig/keyutils.c	2008-08-09 21:46:52.000000000 +0200
++++ keyutils/keyutils.c	2008-08-25 13:38:25.000000000 +0200
+@@ -187,8 +187,10 @@ int keyctl_describe_alloc(key_serial_t i
+ 
+ 	for (;;) {
+ 		ret = keyctl_describe(id, buf, buflen);
+-		if (ret < 0)
++		if (ret < 0) {
++            free(buf);
+ 			return -1;
++        }
+ 
+ 		if (buflen >= ret)
+ 			break;
+@@ -226,8 +228,10 @@ int keyctl_read_alloc(key_serial_t id, v
+ 
+ 	for (;;) {
+ 		ret = keyctl_read(id, buf, buflen);
+-		if (ret < 0)
++		if (ret < 0) {
++            free(buf);
+ 			return -1;
++        }
+ 
+ 		if (buflen >= ret)
+ 			break;
diff --git a/package/keyutils/keyutils-03-cifs.patch b/package/keyutils/keyutils-03-cifs.patch
new file mode 100644
index 0000000000..b2903f971f
--- /dev/null
+++ b/package/keyutils/keyutils-03-cifs.patch
@@ -0,0 +1,15 @@
+Patch vampirised from Debian's packaging of keyutils-1.4
+
+Author: Marcus Meissner <meissner@suse.de>
+Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support)
+
+diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf
+--- keyutils.orig/request-key.conf	2008-09-07 23:53:10.000000000 +0000
++++ keyutils/request-key.conf	2009-02-05 00:53:00.000000000 +0000
+@@ -34,4 +34,6 @@
+ create	user	debug:*		negate		/bin/keyctl negate %k 30 %S
+ create	user	debug:loop:*	*		|/bin/cat
+ create	user	debug:*		*		/usr/share/keyutils/request-key-debug.sh %k %d %c %S
++create	cifs.spnego	*	*		/usr/sbin/cifs.upcall -c %k
++create	dns_resolver	*	*		/usr/sbin/cifs.upcall %k
+ negate	*	*		*		/bin/keyctl negate %k 30 %S
diff --git a/package/keyutils/keyutils-04-Makefile-for-buildroot.patch b/package/keyutils/keyutils-04-Makefile-for-buildroot.patch
new file mode 100644
index 0000000000..e10abd55cc
--- /dev/null
+++ b/package/keyutils/keyutils-04-Makefile-for-buildroot.patch
@@ -0,0 +1,65 @@
+diff -durN keyutils-1.5.5.orig/Makefile keyutils-1.5.5/Makefile
+--- keyutils-1.5.5.orig/Makefile	2011-11-30 16:27:43.000000000 +0100
++++ keyutils-1.5.5/Makefile	2012-08-14 17:06:07.064412101 +0200
+@@ -1,7 +1,5 @@
+-CPPFLAGS	:= -I.
+-CFLAGS		:= -g -Wall -Werror
+-INSTALL		:= install
+-DESTDIR		:=
++CPPFLAGS	+= -I.
++CFLAGS		+= -g -Wall -Werror
+ SPECFILE	:= keyutils.spec
+ NO_GLIBC_KEYERR	:= 0
+ NO_ARLIB	:= 0
+@@ -14,7 +12,7 @@
+ MAN5		:= /usr/share/man/man5
+ MAN8		:= /usr/share/man/man8
+ INCLUDEDIR	:= /usr/include
+-LNS		:= ln -sf
++LNS		:= $(LN) -sf
+ 
+ ###############################################################################
+ #
+@@ -48,29 +46,6 @@
+ 
+ ###############################################################################
+ #
+-# Guess at the appropriate lib directory and word size
+-#
+-###############################################################################
+-LIBDIR		:= $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!')
+-USRLIBDIR	:= $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
+-BUILDFOR	:= $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
+-
+-LNS		:= ln -sf
+-
+-ifeq ($(BUILDFOR),32-bit)
+-CFLAGS		+= -m32
+-LIBDIR		:= /lib
+-USRLIBDIR	:= /usr/lib
+-else
+-ifeq ($(BUILDFOR),64-bit)
+-CFLAGS		+= -m64
+-LIBDIR		:= /lib64
+-USRLIBDIR	:= /usr/lib64
+-endif
+-endif
+-
+-###############################################################################
+-#
+ # This is necessary if glibc doesn't know about the key management error codes
+ #
+ ###############################################################################
+@@ -110,10 +85,10 @@
+ 
+ 
+ $(DEVELLIB): $(SONAME)
+-	ln -sf $< $@
++	$(LNS) $< $@
+ 
+ $(SONAME): $(LIBNAME)
+-	ln -sf $< $@
++	$(LNS) $< $@
+ 
+ LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds
+ 
diff --git a/package/keyutils/keyutils-05-fix-install-rule.patch b/package/keyutils/keyutils-05-fix-install-rule.patch
new file mode 100644
index 0000000000..74e5670cf6
--- /dev/null
+++ b/package/keyutils/keyutils-05-fix-install-rule.patch
@@ -0,0 +1,19 @@
+Makefile: fix install rule
+
+Do not link the .so with an absolute path, otherwise it may point to
+the host library.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN keyutils-1.5.5.orig/Makefile keyutils-1.5.5/Makefile
+--- keyutils-1.5.5.orig/Makefile	2012-10-22 20:11:57.188548033 +0200
++++ keyutils-1.5.5/Makefile	2012-10-22 20:14:40.868236838 +0200
+@@ -127,7 +127,7 @@
+ 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+ 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ 	mkdir -p $(DESTDIR)$(USRLIBDIR)
+-	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
++	$(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
+ 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+ 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
new file mode 100644
index 0000000000..184b58d02b
--- /dev/null
+++ b/package/keyutils/keyutils.mk
@@ -0,0 +1,32 @@
+#############################################################
+#
+# keyutils
+#
+##############################################################
+
+KEYUTILS_VERSION         = 1.5.5
+KEYUTILS_SOURCE          = keyutils-$(KEYUTILS_VERSION).tar.bz2
+KEYUTILS_SITE            = http://people.redhat.com/~dhowells/keyutils
+KEYUTILS_LICENSE         = GPLv2+ LGPLv2.1+
+KEYUTILS_LICENSE_FILES   = LICENCE.GPL LICENCE.LGPL
+KEYUTILS_INSTALL_STAGING = YES
+
+KEYUTILS_MAKE_ENV =     \
+    INSTALL=$(INSTALL)  \
+    LIBDIR=/usr/lib     \
+    USRLIBDIR=/usr/lib  \
+    LN=$(HOSTLN)        \
+
+define KEYUTILS_BUILD_CMDS
+	$(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define KEYUTILS_INSTALL_STAGING_CMDS
+	$(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+define KEYUTILS_INSTALL_TARGET_CMDS
+	$(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))

From bdafee20a64492daa4d6dc4f3aaf4516c53e12ba Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 16 Dec 2012 23:17:55 +0100
Subject: [PATCH 3619/6849] netatalk: fix STAGING_DIR typo

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/netatalk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 23c2a95d40..46355cea39 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -8,7 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
-NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_LIB)/usr/lib
+NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_DIR)/usr/lib
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \
 	--disable-zeroconf \

From 3472e094a18147ab8deefbb8dd47d07c041cc222 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 16 Dec 2012 12:56:34 +0000
Subject: [PATCH 3620/6849] package/libseccomp: works only on x86

As it is, the libseccomp code explicitly checks for x86 (32- or 64-bit),
so it can't work on other architectures.

Reported-by: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libseccomp/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
index 1e524d2f19..9ee1697c4f 100644
--- a/package/libseccomp/Config.in
+++ b/package/libseccomp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBSECCOMP
 	bool "libseccomp"
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  High level interface to the Linux Kernel's seccomp filter
 	  

From 4f452a86b8523d90ffa7a94cb1d540e574ceb165 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sun, 16 Dec 2012 22:06:30 +0000
Subject: [PATCH 3621/6849] package/spice: Only builds on x86

The spice configure script explicitly checks for x86 or x86-64, so
disable it on other architectures

Fixes
http://autobuild.buildroot.org/results/7f7e2d46542a685b93211f76ad063f8b2ba7b5e5/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spice/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/spice/Config.in b/package/spice/Config.in
index b1e187a634..1b264e7e21 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -1,8 +1,10 @@
 comment "spice server depends on python (for pyparsing)"
+	depends on BR2_i386 || BR2_x86_64
 	depends on !BR2_PACKAGE_PYTHON
 
 config BR2_PACKAGE_SPICE
 	bool "spice server"
+	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_CELT051

From 8286d7113f481c2acbc9dc5ff62a364087700d51 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 17 Dec 2012 09:27:30 +0100
Subject: [PATCH 3622/6849] pciutils: work around race condition in make
 install with high BR2_JLEVEL

Fixes http://autobuild.buildroot.net/results/908d7368c8dc8e320fd33f3193039f5925adc352

make install and install-lib can race against eachother causing 'install'
to fail. Work around it using MAKE1.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index ba866a00a9..6219711fff 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -48,12 +48,12 @@ endef
 
 # Ditch install-lib if SHARED is an option in the future
 define PCIUTILS_INSTALL_TARGET_CMDS
-	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(TARGET_DIR)/usr \
+	$(MAKE1) BUILDDIR=$(@D) -C $(@D) PREFIX=$(TARGET_DIR)/usr \
 		SHARED=$(PCIUTILS_SHARED) install install-lib
 endef
 
 define PCIUTILS_INSTALL_STAGING_CMDS
-	$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
+	$(MAKE1) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
 		SHARED=$(PCIUTILS_SHARED) install install-lib
 endef
 

From 7cba1dead6ce53ccd8ea1c634fc9589f1b2e956e Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Mon, 17 Dec 2012 01:18:31 +0000
Subject: [PATCH 3623/6849] jpeg: fix make source

'make source' fails because the host-jpeg-source target doesn't exist
anymore. Fix this by adding this target explicitly.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jpeg/jpeg.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 9f40e6f789..3caacaa7ff 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -7,3 +7,4 @@
 jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg)
 
 host-jpeg: host-libjpeg
+host-jpeg-source: host-libjpeg-source

From 69c045d5fbaf54b9468a99f5bbf2c531b2aef335 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 17 Dec 2012 11:48:11 +0000
Subject: [PATCH 3624/6849] netatalk: fix 64-bit build

The configure script sets LD_LIBRARY_PATH to the staging directory,
which makes the `ls` that is called in one of the tests fail. Fix by
not setting LD_LIBRARY_PATH when cross-compiling.

The patch has been sent upstream.

Also remove the BDB_LIB variable: it isn't used.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ng-of-LD_LIBRARY_FLAGS-shlibpath_var.patch | 48 +++++++++++++++++++
 package/netatalk/netatalk.mk                  |  4 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 package/netatalk/netatalk-0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch

diff --git a/package/netatalk/netatalk-0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch b/package/netatalk/netatalk-0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
new file mode 100644
index 0000000000..01d5776596
--- /dev/null
+++ b/package/netatalk/netatalk-0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
@@ -0,0 +1,48 @@
+From 60d100713b5289948e9cdf5b0646ff3cdd2c206b Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Mon, 17 Dec 2012 22:32:44 +0100
+Subject: [PATCH] Fix setting of LD_LIBRARY_FLAGS ($shlibpath_var).
+
+LD_LIBRARY_PATH should not be set when cross-compiling, because it
+adds the cross-libraries to the build's LD-path.
+
+Also the restoring of LD_LIBRARY_PATH was done incorrectly: it would
+set LD_LIBRARY_PATH=LD_LIBRARY_PATH.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ macros/db3-check.m4 |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
+index 902220b..d5a5446 100644
+--- a/macros/db3-check.m4
++++ b/macros/db3-check.m4
+@@ -94,7 +94,7 @@ if test "x$bdb_required" = "xyes"; then
+     savedldflags="$LDFLAGS"
+     savedcppflags="$CPPFLAGS"
+     savedlibs="$LIBS"
+-    saved_shlibpath_var=$shlibpath_var
++    eval saved_shlibpath_var=\$$shlibpath_var
+ 
+     dnl required BDB version: 4.6, because of cursor API change
+     DB_MAJOR_REQ=4
+@@ -148,7 +148,7 @@ if test "x$bdb_required" = "xyes"; then
+                         dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly
+                         dnl -- portable hopefully. Reference:
+                         dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html
+-                        eval export $shlibpath_var=$bdblibdir
++                        test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir
+                         NETATALK_BDB_TRY_LINK
+                         eval export $shlibpath_var=$saved_shlibpath_var
+ 
+@@ -171,7 +171,7 @@ if test "x$bdb_required" = "xyes"; then
+                            CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
+                            LDFLAGS="-L$bdblibdir $LDFLAGS"
+ 
+-                           eval export $shlibpath_var=$bdblibdir
++                           test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir
+                            NETATALK_BDB_TRY_LINK
+                            eval export $shlibpath_var=$saved_shlibpath_var
+ 
+-- 
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 46355cea39..243d3f721a 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -7,8 +7,10 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
+NETATALK_AUTORECONF = YES
+
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
-NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_DIR)/usr/lib
+NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \
 	--disable-zeroconf \

From 9a7e06dc83b70eaed900ab5078206e1c7d0ce141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau@advansee.com>
Date: Mon, 17 Dec 2012 10:05:40 +0000
Subject: [PATCH 3625/6849] libglib2: fix g_print()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If GLib is cross-compiled, the default printf settings that it selects are wrong
for glibc. This leads to issues with the g_print() functions, e.g. "Aborted"
errors returned by gst-inspect.

This patch fixes this issue by setting printf configuration options compatible
with glibc. These options should also be compatible with uClibc.

This solution has been suggested for LTIB by Rogerio Nunes:
https://community.freescale.com/thread/302734

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 44274315cb..c3e510b127 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -40,7 +40,8 @@ LIBGLIB2_CONF_ENV = \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
-		ac_cv_func_posix_getgrgid_r=no \
+		ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \
+		ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r

From ca0e51528eef57d766209de255e74f934a06a336 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 17 Dec 2012 23:14:35 +0000
Subject: [PATCH 3626/6849] libseccomp: Remove the use of /proc when installing
 pc files

Fixes http://autobuild.buildroot.org/results/d9e12bb0f5b2df9064adf3772bcf479b51d72468

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...001-use-system-headers-from-sysroot.patch} |  0
 ...p-0002-Remove-the-dependency-on-proc.patch | 42 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 rename package/libseccomp/{libseccomp-use-system-headers-from-sysroot.patch => libseccomp-0001-use-system-headers-from-sysroot.patch} (100%)
 create mode 100644 package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch

diff --git a/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch b/package/libseccomp/libseccomp-0001-use-system-headers-from-sysroot.patch
similarity index 100%
rename from package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
rename to package/libseccomp/libseccomp-0001-use-system-headers-from-sysroot.patch
diff --git a/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch b/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch
new file mode 100644
index 0000000000..82ae44a9d2
--- /dev/null
+++ b/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch
@@ -0,0 +1,42 @@
+From 58c34ae1343e2a452e08cd160936a231bcdb67a1 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Tue, 18 Dec 2012 09:57:47 +0100
+Subject: [PATCH] Remove the dependency on /proc
+
+The Makefile relied on a broken logic for the INSTALL_PC_MACRO.
+It was used like this: $(INSTALL_PC_MACRO) file.
+
+The INSTALL_PC_MACRO was then expanded with a trailing sharp, to pass
+the name of the file to install as a comment at the end of the command.
+
+And then, to retrieve the file to copy, it used the $NF variable of awk
+on the /proc/self/cmdline file to happily reinvent the argument
+mechanism.
+
+This patch removes of this crazy stuff by using the -t option of
+install, that keeps the same calling convention.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ macros.mk |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/macros.mk b/macros.mk
+index 6162900..eb61ead 100644
+--- a/macros.mk
++++ b/macros.mk
+@@ -150,9 +150,8 @@ endif
+ INSTALL_PC_MACRO += \
+ 		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
+ 			-d "$(INSTALL_LIB_DIR)/pkgconfig"; \
+-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
+-			"$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}')" \
+-			"$(INSTALL_LIB_DIR)/pkgconfig"; \#
++		$(INSTALL) -t -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
++			"$(INSTALL_LIB_DIR)/pkgconfig"
+ 
+ ifeq ($(V),0)
+ 	INSTALL_INC_MACRO = @echo " INSTALL $^ ($(INSTALL_INC_DIR))";
+-- 
+1.7.9.5
+

From 7f1c97c34ab5e5a264fd355de78b18261a05df6b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Dec 2012 01:10:59 +0000
Subject: [PATCH 3627/6849] kernel-headers: bump 3.{0, 4, 6, 7}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.57-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index daffef7a9c..a8a8a2baf8 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.56"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.57"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.35"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.23"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.24"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
-	default "3.6.10"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7"		if BR2_KERNEL_HEADERS_3_7
+	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
+	default "3.7.1"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.57-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.56-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.57-headers_install-fix-__packed-in-exported-kernel-head.patch

From 78342d5834bc4cf846d41ab7792768bf8f93763d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Dec 2012 01:11:00 +0000
Subject: [PATCH 3628/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 51810e21f5..910d9a5241 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7"
+	bool "3.7.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7" if BR2_LINUX_KERNEL_3_7
+	default "3.7.1" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From dc274b38ef2bfd12043d8e962864a509f82e78d9 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 18 Dec 2012 01:21:29 +0000
Subject: [PATCH 3629/6849] gadget-test: inherit arch dependencies from libaio

Fixes
http://autobuild.buildroot.org/results/7ad59020d4584a777d721352ae73ab2dd33326d7/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gadgetfs-test/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/gadgetfs-test/Config.in b/package/gadgetfs-test/Config.in
index a582db61a3..36713fcd6a 100644
--- a/package/gadgetfs-test/Config.in
+++ b/package/gadgetfs-test/Config.in
@@ -6,8 +6,13 @@ config BR2_PACKAGE_GADGETFS_TEST
 
 config BR2_PACKAGE_GADGETFS_TEST_USE_AIO
 	bool "use asynchronous i/o"
-	depends on BR2_PACKAGE_GADGETFS_TEST
 	select BR2_PACKAGE_LIBAIO
+	depends on BR2_PACKAGE_GADGETFS_TEST
+	# libaio is available only on few architectures
+	depends on \
+		BR2_arm   || BR2_armeb || BR2_avr32  || BR2_i386    || \
+		BR2_m68k  || BR2_mips  || BR2_mipsel || BR2_powerpc || \
+		BR2_sparc || BR2_x86_64
 	help
 	  Select this to have gadgetfs-test do asynchronous I/O using
 	  the libaio library.

From 12a7f9971a21df925ddab85b059e7d43f09159d7 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 18 Dec 2012 03:03:45 +0000
Subject: [PATCH 3630/6849] libseccomp: Fix install option order

Commit ca0e5152 introduced a bad option order, leading to another build
failure.

Fixes
http://autobuild.buildroot.org/results/0e7de5e7c792b5ef195ee98fe1e7bb1c6b220bfb/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libseccomp-0002-Remove-the-dependency-on-proc.patch         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch b/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch
index 82ae44a9d2..081bca745b 100644
--- a/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch
+++ b/package/libseccomp/libseccomp-0002-Remove-the-dependency-on-proc.patch
@@ -32,7 +32,7 @@ index 6162900..eb61ead 100644
 -		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
 -			"$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}')" \
 -			"$(INSTALL_LIB_DIR)/pkgconfig"; \#
-+		$(INSTALL) -t -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
++		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 -t \
 +			"$(INSTALL_LIB_DIR)/pkgconfig"
  
  ifeq ($(V),0)

From e4715c2b5b89b5a091924ea199f098963b63e470 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 03:20:29 +0000
Subject: [PATCH 3631/6849] linux-firmware: add support for the Marvell Wifi-Ex
 SD8787 firmware

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 9 +++++++++
 package/linux-firmware/linux-firmware.mk | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 0c24d986b1..f156756890 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -41,6 +41,15 @@ config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688
 
 endmenu
 
+menu "Marvell WiFi-Ex"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787
+	bool "Marvell Wifi-Ex SD 8787"
+	help
+	  Firmware files for the Marvell Wifi-Ex 8787 module on SDIO.
+
+endmenu
+
 menu "Ralink"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 09836a476e..e9a5424b73 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -52,6 +52,10 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9) += \
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688) += \
 	libertas/sd8688.bin libertas/sd8688_helper.bin LICENCE.Marvell
 
+# sd8787
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787) += \
+	mrvl/sd8787_uapsta.bin LICENCE.Marvell
+
 # wl127x
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
 	ti-connectivity/wl1271-fw-2.bin				\

From 0e1c22b85e40197a7c40ec41a1763217ffc4ce17 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Dec 2012 02:08:20 +0000
Subject: [PATCH 3632/6849] bison: bump to version 2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index c93f71697e..31fc22c0fa 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BISON_VERSION = 2.6.3
+BISON_VERSION = 2.7
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING

From 297bd27f4d42528ad1d583e59d25a3a86a5a65f8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Dec 2012 02:08:21 +0000
Subject: [PATCH 3633/6849] ethtool: bump to version 3.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 8c5961c74a..11abbc21be 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.6
+ETHTOOL_VERSION = 3.7
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
 ETHTOOL_LICENSE_FILES = COPYING

From f9f893c46ded9bc81d8aa8204dde190bfdbc8456 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 18 Dec 2012 02:08:22 +0000
Subject: [PATCH 3634/6849] libidn: bump to version 1.26

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libidn/libidn.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index b06b1ec65c..39f3973089 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -4,12 +4,14 @@
 #
 #############################################################
 
-LIBIDN_VERSION = 1.25
+LIBIDN_VERSION = 1.26
 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"
 LIBIDN_CONF_OPT = --disable-java --enable-csharp=no
 LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_LICENSE = GPLv2+ GPLv3+ LGPLv3+
+LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
 
 define LIBIDN_REMOVE_BINARY
 	rm -f $(TARGET_DIR)/usr/bin/idn

From 0ef90a63e845883aa45cedfdb26ed388d400f044 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 10:20:42 +0000
Subject: [PATCH 3635/6849] xstroke: fix link issue

The allyespackageconfig builds have trigerred a link issue on
xstroke. In fact, xstroke must be linked against Xrender, Xext and dl
in addition to the other libraries it was already be linked
against. We fix that by adding a patch that modifies configure.ac and
Makefile.am, and enabling autoreconf for this package.

In addition, since xstroke uses directly Xrender and Xext, we add
those dependencies to the package. In practice, it doesn't change
anything, since some of the xstroke dependencies were already pulling
those libraries, but as xstroke uses directly Xrender and Xext, it
makes sense to have them as dependencies as well.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xstroke/Config.in                     |  2 ++
 package/xstroke/xstroke-fix-link-issues.patch | 35 +++++++++++++++++++
 package/xstroke/xstroke.mk                    |  3 +-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 package/xstroke/xstroke-fix-link-issues.patch

diff --git a/package/xstroke/Config.in b/package/xstroke/Config.in
index 54cb38e390..126993483c 100644
--- a/package/xstroke/Config.in
+++ b/package/xstroke/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_XSTROKE
 	select BR2_PACKAGE_XLIB_LIBXFT
 	select BR2_PACKAGE_XLIB_LIBXTST
 	select BR2_PACKAGE_XLIB_LIBXPM
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  Handwriting recognition for X
 
diff --git a/package/xstroke/xstroke-fix-link-issues.patch b/package/xstroke/xstroke-fix-link-issues.patch
new file mode 100644
index 0000000000..9a6d71ed17
--- /dev/null
+++ b/package/xstroke/xstroke-fix-link-issues.patch
@@ -0,0 +1,35 @@
+Fix link issues by linking against all needed libraries
+
+Since gcc 4.6, all libraries that are directly used must be explicitly
+passed on the command line. In the case of xstroke, linking against
+Xrender, Xext and dl was missing. For the first two, they are added
+through addition PKG_CHECK_MODULES() checks, for the latter, it is
+added next to -lm and -lpthread in Makefile.am.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,7 +40,7 @@
+ BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c
+ AM_YFLAGS = -d
+ 
+-xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst
++xstroke_LDADD = @XSTROKE_LIBS@ -ldl -lm -lpthread $(X_LIBS) -lXpm -lXtst
+ AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS)
+ 
+ EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,7 +26,7 @@
+ AC_CHECK_FUNCS([gettimeofday localtime_r])
+ 
+ AC_PATH_XTRA
+-PKG_CHECK_MODULES(XSTROKE, xft)
++PKG_CHECK_MODULES(XSTROKE, [xft xrender xext])
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index 34595454e3..83f347d1a6 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -7,7 +7,8 @@ XSTROKE_VERSION = 0.6
 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
 XSTROKE_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
 
-XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm
+XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm xlib_libXrender xlib_libXext
+XSTROKE_AUTORECONF = YES
 
 $(eval $(autotools-package))
 

From d0a4e72f4a58385e2992d2956d3b8bd14f3c6db9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 10:20:43 +0000
Subject: [PATCH 3636/6849] xstroke: mark as deprecated

xstroke is just a tarball on the avr32linux.org site, the 0.6 version
has been released in April 2004, so we can consider the upstream to be
dead. So let's mark this package as deprecated.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xstroke/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/xstroke/Config.in b/package/xstroke/Config.in
index 126993483c..4f3f5f6c37 100644
--- a/package/xstroke/Config.in
+++ b/package/xstroke/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_XSTROKE
 	bool "xstroke"
 	depends on BR2_PACKAGE_XORG7
+	# dead upstream, probably not many users
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_XLIB_LIBXFT
 	select BR2_PACKAGE_XLIB_LIBXTST
 	select BR2_PACKAGE_XLIB_LIBXPM

From 50bdab9025f3bcacf4f29e928ed2cba892dfc039 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 10:38:46 +0000
Subject: [PATCH 3637/6849] matchbox-desktop: fix link issue against libdl

matchbox-desktop uses dlopen(), so it needs to link against libdl. The
configure.ac and Makefile.am have the necessary provisions to do so,
but the included configure script does not replace LIBADD_DL in
src/Makefile.am as it should.

Therefore, we force the autoreconf of the package, which solves the
problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/matchbox-desktop/matchbox-desktop.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index d180d1df6d..f8e854c95b 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -13,6 +13,11 @@ MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
+# The bundled configure script does not properly replace LIBADD_DL, so
+# we force an autoreconf even if we don't have any patches touching
+# configure.ac/Makefile.am.
+MATCHBOX_DESKTOP_AUTORECONF = YES
+
 #############################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)

From 0a3b19cdc92429ce4552be108283441ef4334a05 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 18 Dec 2012 16:14:44 +0100
Subject: [PATCH 3638/6849] python-bottle: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/python-bottle/Config.in        |  8 ++++++++
 package/python-bottle/python-bottle.mk | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/python-bottle/Config.in
 create mode 100644 package/python-bottle/python-bottle.mk

diff --git a/package/Config.in b/package/Config.in
index d6af55d83a..66445ff9b8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -302,6 +302,7 @@ source "package/python/Config.in"
 source "package/python3/Config.in"
 if BR2_PACKAGE_PYTHON
 menu "external python modules"
+source "package/python-bottle/Config.in"
 source "package/python-dpkt/Config.in"
 source "package/python-id3/Config.in"
 source "package/python-mad/Config.in"
diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in
new file mode 100644
index 0000000000..f9b60ca724
--- /dev/null
+++ b/package/python-bottle/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_BOTTLE
+	bool "python-bottle"
+	help
+	  Bottle is a fast, simple and lightweight WSGI micro web-framework
+	  for Python. It is distributed as a single file module and has no
+	  dependencies other than the Python Standard Library.
+
+	  http://bottlepy.org
diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk
new file mode 100644
index 0000000000..370b31be04
--- /dev/null
+++ b/package/python-bottle/python-bottle.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# python-bottle
+#
+#############################################################
+
+PYTHON_BOTTLE_VERSION = 0.11.4
+PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz
+PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle
+PYTHON_BOTTLE_DEPENDENCIES = python
+PYTHON_BOTTLE_LICENSE = MIT
+# README.rst refers to the file "LICENSE" but it's not included
+
+define PYTHON_BOTTLE_BUILD_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_BOTTLE_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From d8b333c675232ec5dfa45b6005217a5f499c161a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 11:39:36 +0000
Subject: [PATCH 3639/6849] metacity: fix link issue against libm

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../metacity-add-libm-reference.patch         | 51 +++++++++++++++++++
 .../metacity-mag-add-libm-reference.patch     | 45 ++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 package/metacity/metacity-add-libm-reference.patch
 create mode 100644 package/metacity/metacity-mag-add-libm-reference.patch

diff --git a/package/metacity/metacity-add-libm-reference.patch b/package/metacity/metacity-add-libm-reference.patch
new file mode 100644
index 0000000000..628501726a
--- /dev/null
+++ b/package/metacity/metacity-add-libm-reference.patch
@@ -0,0 +1,51 @@
+Upstream fix to link metacity itself against libm
+
+The upstream fix is modified to also include the changes on the
+configure script directly, so that autoreconfiguring is not
+needed. Autoreconfiguring cannot be done easily on metacity, due to
+missing AM_GCONF_SOURCE_2 and AM_NLS macros.
+
+http://git.gnome.org/browse/metacity/commit/configure.in?id=9cb0b6ff520ea69bdff6c328a21787202aee1bcc
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+From 9cb0b6ff520ea69bdff6c328a21787202aee1bcc Mon Sep 17 00:00:00 2001
+From: Götz Waschk <waschk@mandriva.org>
+Date: Wed, 22 Oct 2008 12:08:48 +0000
+Subject: add libm reference. Closes #557357.
+
+2008-10-22  Götz Waschk  <waschk@mandriva.org>
+
+        * configure.in: add libm reference.  Closes #557357.
+
+
+svn path=/trunk/; revision=3984
+---
+(limited to 'configure.in')
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -413,7 +413,7 @@
+    AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
+ fi
+ 
+-METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+ METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -29509,7 +29509,7 @@
+ 
+ fi
+ 
+-METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+ METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
diff --git a/package/metacity/metacity-mag-add-libm-reference.patch b/package/metacity/metacity-mag-add-libm-reference.patch
new file mode 100644
index 0000000000..d47d807558
--- /dev/null
+++ b/package/metacity/metacity-mag-add-libm-reference.patch
@@ -0,0 +1,45 @@
+Upstream patch to fix link against libm
+
+The upstream patch is modified to also include the necessary
+Makefile.in, which avoids the need for autoreconfiguring the
+package. Autoreconfiguring the package unfortunately doesn't work, due
+to AM_GCONF_SOURCE_2 and AM_NLS macros being missing.
+
+http://git.gnome.org/browse/metacity/commit/src/tools/Makefile.am?id=13d0d52eb885598885b6ff4b73c795c8f29c2a6b
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+From 13d0d52eb885598885b6ff4b73c795c8f29c2a6b Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sun, 02 May 2010 14:50:42 +0000
+Subject: fails to link with pedantic linkers
+
+---
+(limited to 'src/tools/Makefile.am')
+
+Index: b/src/tools/Makefile.am
+===================================================================
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -26,7 +26,7 @@
+ 
+ metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
+ metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
+-metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
++metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm
+ metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
+ 
+ EXTRA_DIST=$(icon_DATA)
+Index: b/src/tools/Makefile.in
+===================================================================
+--- a/src/tools/Makefile.in
++++ b/src/tools/Makefile.in
+@@ -281,7 +281,7 @@
+ 
+ metacity_message_LDADD = @METACITY_MESSAGE_LIBS@
+ metacity_window_demo_LDADD = @METACITY_WINDOW_DEMO_LIBS@
+-metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@
++metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -lm
+ metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
+ EXTRA_DIST = $(icon_DATA)
+ all: all-am

From 9229b82d6326ea425a258b91a9f0157ef6b223b7 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 18 Dec 2012 21:27:32 +0000
Subject: [PATCH 3640/6849] libcurl: needs MMU

Fixes
http://autobuild.buildroot.org/results/5a502f16ad94a410ca21c9a7f223d6c12086bbb5/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in
index 1d6d08e680..10ee0e415d 100644
--- a/package/libcurl/Config.in
+++ b/package/libcurl/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBCURL
 	bool "libcurl"
+	depends on BR2_USE_MMU # Uses fork()
 	help
 	  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
 	  and Dict servers, using any of the supported protocols.

From dd436d46fed1228bdb417c4b5fec0122696efa41 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 18 Dec 2012 21:28:14 +0000
Subject: [PATCH 3641/6849] gdb: Needs threads support

Fixes
http://autobuild.buildroot.org/results/480ee3efd8ffe8043329fec173ef8187bd54e0fb/build-end.log

[Peter: correct autobuilder URL]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 50aafdf154..6a8e48ed70 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin && !BR2_aarch64
 	# The newest versions of gdb require thread debugging in the
 	# toolchain. The only cases for which this is not needed is if
@@ -15,8 +16,8 @@ config BR2_PACKAGE_GDB
 	help
 	    Build the full gdb debugger to run on the target.
 
-comment "Gdb debugger for the target needs WCHAR support in toolchain"
-	depends on !BR2_USE_WCHAR
+comment "Gdb for the target needs WCHAR and threads support in toolchain"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GDB_SERVER
 	bool "Build gdb server for the Target"

From 356c2d7d843f7faa78c9ace79f17b0d947c9435b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 19 Dec 2012 03:07:27 +0000
Subject: [PATCH 3642/6849] ortp: disable Werror

Disable -Werror for the ortp build, fixes:
http://autobuild.buildroot.net/results/b869fcfdfdb9d1ec4864b86c6953b0242200c502

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ortp/ortp.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index 65a03bf3f8..c4c900a314 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -1,5 +1,6 @@
 ORTP_VERSION = 0.20.0
 ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
+ORTP_CONF_OPT = --disable-strict
 ORTP_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From e51fd21cc4e58d6f9b8baad6e5d4a922b4e5841a Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 19 Dec 2012 00:54:31 +0000
Subject: [PATCH 3643/6849] orc: bump to version 0.4.16

The gstreamer-1.0 plug-ins require this version for ORC
acceleration.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/orc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 842ef2510b..77cb29fa80 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -3,7 +3,7 @@
 # orc
 #
 #############################################################
-ORC_VERSION = 0.4.14
+ORC_VERSION = 0.4.16
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_INSTALL_STAGING = YES
 ORC_DEPENDENCIES = host-orc

From a831505a3d32ef8839b7a12eee4b91ad594779ac Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 23:13:21 +0000
Subject: [PATCH 3644/6849] pcmanfm: link against libX11 to avoid build failure

Fixes:

/home/test/outputs/allpkg/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/4.7.3/../../../../arm-linux-gnueabihf/bin/ld: fm-desktop.o: undefined reference to symbol 'XSendEvent'
/home/test/outputs/allpkg/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/4.7.3/../../../../arm-linux-gnueabihf/bin/ld: note: 'XSendEvent' is defined in DSO /home/test/outputs/allpkg/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libX11.so.6 so try adding it to the linker command line
/home/test/outputs/allpkg/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libX11.so.6: could not read symbols: Invalid operation
collect2: error: ld returned 1 exit status
make[4]: *** [pcmanfm] Error 1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../pcmanfm/pcmanfm-link-against-libx11.patch | 20 +++++++++++++++++++
 package/pcmanfm/pcmanfm.mk                    |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 package/pcmanfm/pcmanfm-link-against-libx11.patch

diff --git a/package/pcmanfm/pcmanfm-link-against-libx11.patch b/package/pcmanfm/pcmanfm-link-against-libx11.patch
new file mode 100644
index 0000000000..f571e77450
--- /dev/null
+++ b/package/pcmanfm/pcmanfm-link-against-libx11.patch
@@ -0,0 +1,20 @@
+Link against libX11
+
+fm-desktop.c uses XSendEvent, so we should link against libX11.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -12,7 +12,8 @@
+ 
+ pkg_modules="gtk+-2.0 >= 2.6.0 \
+              gthread-2.0 \
+-             libstartup-notification-1.0"
++             libstartup-notification-1.0 \
++	     x11"
+ 
+ AC_FUNC_MMAP
+ 
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 1f1a330fc3..e4c23ec9bf 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -8,6 +8,7 @@ PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_AUTORECONF = YES
 
 $(eval $(autotools-package))
 

From fff080bdfa7f6a8f18c8b8f7d0d26035b7438e80 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 23:13:22 +0000
Subject: [PATCH 3645/6849] pcmanfm: use a download URL from
 downloads.sourceforge.net

[Peter: use PCMANFM_VERSION in _SITE]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcmanfm/pcmanfm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index e4c23ec9bf..3b0b7278f1 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -5,7 +5,7 @@
 #############################################################
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
-PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
+PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
 PCMANFM_AUTORECONF = YES

From 043ba78869b09da6f1bfa0daaa66fc0960163371 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 18 Dec 2012 23:13:23 +0000
Subject: [PATCH 3646/6849] pcmanfm: replace dependency on X.org server by
 dependency on libX11

There is no reason for a client program like pcmanfm to depend on the
X.org server. Instead, it should depend on the appropriate X
client libraries, in this case libX11.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcmanfm/Config.in  | 1 +
 package/pcmanfm/pcmanfm.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index c8b4debff8..484192b1b8 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_PCMANFM
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_GAMIN
 	select BR2_PACKAGE_STARTUP_NOTIFICATION
+	select BR2_PACKAGE_XLIB_LIBX11
 	depends on BR2_PACKAGE_LIBGTK2
 	help
 	  An extremly fast and lightweight file manager which features
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 3b0b7278f1..392e3ad79a 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,7 +7,7 @@ PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
 PCMANFM_CONF_OPT = --disable-hal
-PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX11
 PCMANFM_AUTORECONF = YES
 
 $(eval $(autotools-package))

From c4c914552e4fba8139e74d90a26bbba5048d6492 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Dec 2012 04:43:04 +0000
Subject: [PATCH 3647/6849] libcap: disable programs

Disable libcap programs since they use fork and fail on !MMU systems.
They're not usually used, if someone wants them they can add an option.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap/libcap.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index b922e5a98c..94a0cbb8ec 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -25,9 +25,15 @@ endef
 define LIBCAP_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \
 		prefix=/usr lib=lib install
-	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps)
 endef
 
+# progs use fork()
+define LIBCAP_DISABLE_PROGS
+	$(SED) '/-C progs/d' $(@D)/Makefile
+endef
+
+LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS
+
 define HOST_LIBCAP_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
 endef

From 14bf3df3a649715246e13a9bf5f0902f09df84a6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 19 Dec 2012 13:27:07 +0000
Subject: [PATCH 3648/6849] mplayer: prevent selection on Microblaze and
 AArch64

MPlayer wants to have some "support" for each architecture, and for
now, it doesn't know about Microblaze and AArch64, so prevent the
selection of MPlayer on those architectures.

For Microblaze, fixes:

  http://autobuild.buildroot.org/results/4e6e0d15694345ded649c92251cc2173dc45fe7c/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/multimedia/mplayer/Config.in b/package/multimedia/mplayer/Config.in
index c64dab719e..e285644576 100644
--- a/package/multimedia/mplayer/Config.in
+++ b/package/multimedia/mplayer/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_MPLAYER
 	bool "mplayer"
-	# "Error: unsupported architecture sh4a" says mplayer
-	# configure script.
-	depends on !BR2_sh4a && !BR2_sh4aeb
+	# Those architectures are not supported by MPlayer
+	depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64
 	depends on BR2_LARGEFILE
 	help
 	  MPlayer is a movie player which runs on many systems and supports

From 2a27ad3d796720c6be79f13f0bc58e595584aa35 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Thu, 20 Dec 2012 03:41:52 +0000
Subject: [PATCH 3649/6849] arch: fix BR2_ARCH for generic target variant

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.x86 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index d2e080798c..ce306056b8 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -173,6 +173,7 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_athlon
 	default "i686"		if BR2_x86_athlon_4
 	default "x86_64"	if BR2_x86_64
+	default "i386"		if BR2_x86_generic
 
 config BR2_ENDIAN
 	default "LITTLE"

From dd1aa62cceff4aa9072d7933042480c20cfd07ef Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 19 Dec 2012 22:48:09 +0000
Subject: [PATCH 3650/6849] linux: Support multiple device tree build

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 5 +++--
 linux/linux.mk  | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 910d9a5241..9ebe0c9632 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -261,11 +261,12 @@ config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
 endchoice
 
 config BR2_LINUX_KERNEL_INTREE_DTS_NAME
-	string "Device Tree Source file name"
+	string "Device Tree Source file names"
 	depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
 	help
 	 Name of the device tree source file, without
-	 the trailing .dts
+	 the trailing .dts. You can provide a list of
+	 dts files to build, separated by spaces.
 
 config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
 	string "Device Tree Source file path"
diff --git a/linux/linux.mk b/linux/linux.mk
index c4bdf90905..3321d809a1 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -187,10 +187,13 @@ endef
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
 ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),)
 define LINUX_BUILD_DTB
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTS_NAME).dtb
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) \
+		$(addsuffix .dtb, $(call qstrip, $(KERNEL_DTS_NAME)))
 endef
 define LINUX_INSTALL_DTB
-	cp $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb $(BINARIES_DIR)/
+	cp $(addprefix $(KERNEL_ARCH_PATH)/boot/, \
+		$(addsuffix .dtb, $(call qstrip, $(KERNEL_DTS_NAME)))) \
+		$(BINARIES_DIR)/
 endef
 endif
 endif

From 309c2f50fa12deeaf7d809e3bdef291a12486b4f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 21 Dec 2012 08:39:14 +0100
Subject: [PATCH 3651/6849] linux: simplify dtb variables

Only qstrip once and add a KERNEL_DTBS helper variable to simplify the dtb
rules.

No functional change.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 3321d809a1..6586e68158 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -53,7 +53,7 @@ LINUX_MAKE_FLAGS = \
 LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
 
 ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
-KERNEL_DTS_NAME = $(BR2_LINUX_KERNEL_INTREE_DTS_NAME)
+KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
 KERNEL_DTS_NAME = $(basename $(notdir $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))
 endif
@@ -65,6 +65,8 @@ $(error Kernel with appended device tree needs exactly one DTS source.\
 endif
 endif
 
+KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
+
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
@@ -187,12 +189,10 @@ endef
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
 ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),)
 define LINUX_BUILD_DTB
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) \
-		$(addsuffix .dtb, $(call qstrip, $(KERNEL_DTS_NAME)))
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTBS)
 endef
 define LINUX_INSTALL_DTB
-	cp $(addprefix $(KERNEL_ARCH_PATH)/boot/, \
-		$(addsuffix .dtb, $(call qstrip, $(KERNEL_DTS_NAME)))) \
+	cp $(addprefix $(KERNEL_ARCH_PATH)/boot/,$(KERNEL_DTBS)) \
 		$(BINARIES_DIR)/
 endef
 endif

From ef34705087b5841809305afc97188f2eb23a270b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 21 Dec 2012 09:07:45 +0100
Subject: [PATCH 3652/6849] linux: handle new dtb location since 3.8-rc1

.dtb files are now generated in arch/$ARCH/boot/dts instead of
arch/$ARCH/boot, so extend the LINUX_INSTALL_DTB rule to look there
as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 6586e68158..e852f626f2 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -192,7 +192,10 @@ define LINUX_BUILD_DTB
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTBS)
 endef
 define LINUX_INSTALL_DTB
-	cp $(addprefix $(KERNEL_ARCH_PATH)/boot/,$(KERNEL_DTBS)) \
+	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	cp $(addprefix \
+		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
+		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
 		$(BINARIES_DIR)/
 endef
 endif

From fdc61667e8d3867b1d196be33ad85f8597463d6c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 19 Dec 2012 13:29:52 +0000
Subject: [PATCH 3653/6849] toolchain-crosstool-ng: update PPL and CLoog
 versions in default configs

We have updated our Crosstool-NG configuration to gcc 4.6.x, but the
PPL and CLoog versions were not updated accordingly. With gcc 4.6.x,
at least PPL 0.11 is needed, and only CLoog > 0.15.9 can work with PLL
0.11.

Fixes:

  http://autobuild.buildroot.org/results/c22758a30c3b8abb582150cefd7099605c527e14/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../crosstool-ng.config-eglibc                   | 16 ++++++++++------
 .../crosstool-ng.config-glibc                    | 16 ++++++++++------
 .../crosstool-ng.config-uClibc                   | 16 ++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 11eb602ff4..08f036cf76 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -474,18 +474,22 @@ CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
+CT_PPL_V_0_11_2=y
 # CT_PPL_V_0_11_1 is not set
 # CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-# CT_CLOOG_V_0_15_11 is not set
+# CT_PPL_V_0_10_2 is not set
+CT_PPL_VERSION="0.11.2"
+CT_PPL_0_11=y
+CT_PPL_NEEDS_LIBPWL=y
+CT_CLOOG_V_0_15_11=y
 # CT_CLOOG_V_0_15_10 is not set
-CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_9 is not set
 # CT_CLOOG_V_0_15_8 is not set
 # CT_CLOOG_V_0_15_7 is not set
 # CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.9"
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
 CT_MPC_V_0_9=y
 # CT_MPC_V_0_8_2 is not set
 # CT_MPC_V_0_8_1 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index c30a115247..ae0bc029e5 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -463,18 +463,22 @@ CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
+CT_PPL_V_0_11_2=y
 # CT_PPL_V_0_11_1 is not set
 # CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-# CT_CLOOG_V_0_15_11 is not set
+# CT_PPL_V_0_10_2 is not set
+CT_PPL_VERSION="0.11.2"
+CT_PPL_0_11=y
+CT_PPL_NEEDS_LIBPWL=y
+CT_CLOOG_V_0_15_11=y
 # CT_CLOOG_V_0_15_10 is not set
-CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_9 is not set
 # CT_CLOOG_V_0_15_8 is not set
 # CT_CLOOG_V_0_15_7 is not set
 # CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.9"
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
 CT_MPC_V_0_9=y
 # CT_MPC_V_0_8_2 is not set
 # CT_MPC_V_0_8_1 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index e93128bb55..4f212639a9 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -445,18 +445,22 @@ CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
+CT_PPL_V_0_11_2=y
 # CT_PPL_V_0_11_1 is not set
 # CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-# CT_CLOOG_V_0_15_11 is not set
+# CT_PPL_V_0_10_2 is not set
+CT_PPL_VERSION="0.11.2"
+CT_PPL_0_11=y
+CT_PPL_NEEDS_LIBPWL=y
+CT_CLOOG_V_0_15_11=y
 # CT_CLOOG_V_0_15_10 is not set
-CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_9 is not set
 # CT_CLOOG_V_0_15_8 is not set
 # CT_CLOOG_V_0_15_7 is not set
 # CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.9"
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
 CT_MPC_V_0_9=y
 # CT_MPC_V_0_8_2 is not set
 # CT_MPC_V_0_8_1 is not set

From 1d0c10c99f8c2d0fabdf2e930b8c05b64813fa27 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 20 Dec 2012 12:16:14 +0000
Subject: [PATCH 3654/6849] toolchain/crosstool-ng: update config for
 glibc-based toolchains

Update the version of glibc to be used, since older versions are
broken with the currently-used binutils versions.

Fixes build issues ending with:
    tmpfs/ccvkz3ro.s:33: Error: CFI instruction used without
    previous .cfi_startproc

This new version does not have RPC support, so update the Config.in.

CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/Config.in                 | 5 ++---
 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 9cd5ca51df..d80f547c9d 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -24,9 +24,8 @@ config BR2_TOOLCHAIN_CTNG_glibc
 	bool "glibc"
 	select BR2_LARGEFILE
 	select BR2_INET_IPV6
-	# Our default ct-ng configuration uses glibc 2.9, which has
-	# native RPC support
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	# Our default ct-ng configuration uses glibc 2.14.1, which
+	# does not have native RPC support
 	select BR2_ENABLE_LOCALE
 	select BR2_USE_WCHAR
 
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index ae0bc029e5..5b4bbbaffb 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -356,13 +356,13 @@ CT_CC_GCC_LDBL_128=m
 # C-library
 #
 CT_LIBC="glibc"
-CT_LIBC_VERSION="2.9"
+CT_LIBC_VERSION="2.14.1"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
 # CT_LIBC_uClibc is not set
 CT_LIBC_eglibc_AVAILABLE=y
 CT_LIBC_glibc_AVAILABLE=y
-# CT_LIBC_GLIBC_V_2_14_1 is not set
+CT_LIBC_GLIBC_V_2_14_1
 # CT_LIBC_GLIBC_V_2_14 is not set
 # CT_LIBC_GLIBC_V_2_13 is not set
 # CT_LIBC_GLIBC_V_2_12_2 is not set
@@ -370,7 +370,7 @@ CT_LIBC_glibc_AVAILABLE=y
 # CT_LIBC_GLIBC_V_2_11_1 is not set
 # CT_LIBC_GLIBC_V_2_11 is not set
 # CT_LIBC_GLIBC_V_2_10_1 is not set
-CT_LIBC_GLIBC_V_2_9=y
+# CT_LIBC_GLIBC_V_2_9 is not set
 # CT_LIBC_GLIBC_V_2_8 is not set
 CT_LIBC_mingw_AVAILABLE=y
 CT_LIBC_newlib_AVAILABLE=y

From 60e26e3b1b6e1172e8a8c915e854272a39a3308c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:20 +0000
Subject: [PATCH 3655/6849] toolchain-external: add support for 'Sourcery
 CodeBench MIPS 2012.03'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 69 ++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 ++
 2 files changed, 72 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 456407edd5..4e945267ab 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -102,6 +102,74 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
+	bool "Sourcery CodeBench MIPS 2012.03"
+	depends on BR2_mips || BR2_mipsel
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
+	  2.15, uClibc 0.9.30 and gdb 7.2.50, kernel headers
+	  3.2.10. It has support for the following variants:
+	    - MIPS32 O32 big endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS64 big endian glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS32 O32 little endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS64 little endian glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	    - MIPS64 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Select BR2_SOFT_FLOAT
+	    - MIPS32 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS64 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 big endian soft float uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian soft float uclibc
+	      Not usable in Buildroot yet.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	bool "Sourcery CodeBench ARM 2011.03"
 	depends on BR2_arm
@@ -640,6 +708,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
+	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6236235b87..2d18af011b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -202,6 +202,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-110-mips-linux-gnu-i686-pc-linux-gnu.tar.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package9761/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 8de1f57e66c65a8c511cc61c47afa54ca181dcdb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:21 +0000
Subject: [PATCH 3656/6849] toolchain-external: add support for 'Sourcery
 CodeBench MIPS 2012.09'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 69 ++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 ++
 2 files changed, 72 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4e945267ab..4104041eec 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -102,6 +102,74 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
+	bool "Sourcery CodeBench MIPS 2012.09"
+	depends on BR2_mips || BR2_mipsel
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, glibc
+	  2.16, uClibc 0.9.30 and gdb 7.4.50, kernel headers
+	  3.5.4. It has support for the following variants:
+	    - MIPS32 O32 big endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS64 big endian glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Disable BR2_SOFT_FLOAT
+	    - MIPS32 O32 little endian glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS64 little endian glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	    - MIPS64 big endian soft float glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Select BR2_SOFT_FLOAT
+	    - MIPS32 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS64 little endian soft float glibc
+	      Select a MIPS generic core
+	      Select the n64 ABI
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL
+	    - MIPS32 big endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian microMIPS glibc
+	      Select a MIPS generic core
+	      Disable BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
+	    - MIPS32 little endian soft float microMIPS glibc
+	      Select a MIPS generic core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	    - MIPS32 big endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 big endian soft float uclibc
+	      Not usable in Buildroot yet.
+	    - MIPS32 little endian soft float uclibc
+	      Not usable in Buildroot yet.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	bool "Sourcery CodeBench MIPS 2012.03"
 	depends on BR2_mips || BR2_mipsel
@@ -709,6 +777,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
+	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2d18af011b..2beac1d182 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -205,6 +205,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.b
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 7540ef8887a06afbdaea6fa61015cd19f6c09794 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:22 +0000
Subject: [PATCH 3657/6849] toolchain-external: remove support for 'Sourcery
 CodeBench MIPS 4.4'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 51 ------------------------
 toolchain/toolchain-external/ext-tool.mk |  3 --
 2 files changed, 54 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4104041eec..e28da870ed 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -378,56 +378,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	    - MIPS32 little endian soft float uclibc
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
-	bool "Sourcery CodeBench MIPS 4.4"
-	depends on BR2_mips || BR2_mipsel
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the MIPS architecture, from
-	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
-	  2.11, uClibc 0.9.30 and gdb 7.0, kernel headers 2.6.32. It
-	  has support for the following variants:
-	    - MIPS32 O32 big endian glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	    - MIPS32 O32 little endian glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
-	    - MIPS32 big endian soft float glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	    - MIPS32 little endian soft float glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
-	    - MIPS32 big endian microMIPS glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mips16
-	    - MIPS32 little endian microMIPS glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-	    - MIPS32 big endian soft float microMIPS glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mips16
-	    - MIPS32 little endian soft float microMIPS glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-	    - MIPS32 big endian uclibc
-	      Not usable in Buildroot yet.
-	    - MIPS32 little endian uclibc
-	      Not usable in Buildroot yet.
-	    - MIPS32 big endian soft float uclibc
-	      Not usable in Buildroot yet.
-	    - MIPS32 little endian soft float uclibc
-	      Not usable in Buildroot yet.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc
@@ -773,7 +723,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
-	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2beac1d182..ac639a74ce 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -193,9 +193,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_li
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9469/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-110-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 7feaa991b51b6480f2dc311041c3ab69df153b5c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:23 +0000
Subject: [PATCH 3658/6849] toolchain-external: remove support for 'Sourcery
 CodeBench MIPS 2011.03'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 51 ------------------------
 toolchain/toolchain-external/ext-tool.mk |  3 --
 2 files changed, 54 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index e28da870ed..4150a0a3fa 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -328,56 +328,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	    - MIPS32 little endian soft float uclibc
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
-	bool "Sourcery CodeBench MIPS 2011.03"
-	depends on BR2_mips || BR2_mipsel
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Sourcery CodeBench toolchain for the MIPS architecture, from
-	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
-	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
-	  2.6.38. It has support for the following variants:
-	    - MIPS32 O32 big endian glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	    - MIPS32 O32 little endian glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
-	    - MIPS32 big endian soft float glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	    - MIPS32 little endian soft float glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
-	    - MIPS32 big endian microMIPS glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mips16
-	    - MIPS32 little endian microMIPS glibc
-	      Select a MIPS generic core
-	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-	    - MIPS32 big endian soft float microMIPS glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mips16
-	    - MIPS32 little endian soft float microMIPS glibc
-	      Select a MIPS generic core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
-	    - MIPS32 big endian uclibc
-	      Not usable in Buildroot yet.
-	    - MIPS32 little endian uclibc
-	      Not usable in Buildroot yet.
-	    - MIPS32 big endian soft float uclibc
-	      Not usable in Buildroot yet.
-	    - MIPS32 little endian soft float uclibc
-	      Not usable in Buildroot yet.
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc
@@ -723,7 +673,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
-	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index ac639a74ce..0724cb6b22 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -193,9 +193,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_li
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9469/public/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-110-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package9761/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 29efac3c23df9431375f26d1b240627f604f42ca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:24 +0000
Subject: [PATCH 3659/6849] toolchain-external: simplify many Sourcery
 CodeBench download URLs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 0724cb6b22..d4278a4d2f 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -176,7 +176,7 @@ TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/arm/portal/package8739/public/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
@@ -194,7 +194,7 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package9761/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
@@ -203,31 +203,31 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2011.03-38-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/superh/portal/package8759/public/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package10148/public/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.03-35-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/GNUToolchain/package10163/public/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/

From 6a0adcec3133d6a62eb64fd7df4680fa9157dbcd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:25 +0000
Subject: [PATCH 3660/6849] toolchain-external: add support for 'Linaro AArch64
 12.11'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 10 ++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4150a0a3fa..956a140749 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -605,6 +605,15 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
+	bool "Linaro AArch64 12.11"
+	depends on BR2_aarch64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the AArch64 architecture, from
+	  http://www.linaro.org/engineering/armv8/
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	bool "Linaro AArch64 12.10"
 	depends on BR2_aarch64
@@ -671,6 +680,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index d4278a4d2f..81aee56b3d 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -259,6 +259,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.10/components/toolchain/gcc-linaro/aarch64/rc3/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7+bzr115029-20121015+bzr2506_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11),y)
+TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.11/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.11-1-20121127_linux.tar.bz2
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From 8fa0a06d5bac419a0c48340942994ae57a63e353 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:26 +0000
Subject: [PATCH 3661/6849] toolchain-external: add support for 'Linaro AArch64
 12.12'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 10 ++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 956a140749..aa2f28f6bf 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -605,6 +605,15 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
+	bool "Linaro AArch64 12.12"
+	depends on BR2_aarch64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the AArch64 architecture, from
+	  http://www.linaro.org/engineering/armv8/
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	bool "Linaro AArch64 12.11"
 	depends on BR2_aarch64
@@ -681,6 +690,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 81aee56b3d..5720cd2f73 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -262,6 +262,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7+bzr115029-20121015+bz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.11/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.11-1-20121127_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12),y)
+TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.12/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.12-20121214_linux.tar.bz2
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From e658cdf1ad6bb93fa1ff80fef7fcd2658dd2f656 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:27 +0000
Subject: [PATCH 3662/6849] toolchain-external: add support for 'Linaro ARM
 2012.12'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index aa2f28f6bf..9dda722e57 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,6 +3,23 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
+	bool "Linaro 2012.12"
+	depends on BR2_arm
+	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Linaro toolchain for the ARM architecture. It uses Linaro
+	  GCC 2012.12 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GDB 7.5), eglibc 2.15. It generates code that runs on all
+	  Cortex-A profile devices, but tuned for the Cortex-A9. The
+	  code generated is Thumb 2, with the hard floating point
+	  calling convention, and uses the VFPv3-D16 FPU instructions.
+
+	  To use this toolchain, you must disable soft float usage.
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	bool "Linaro 2012.11"
 	depends on BR2_arm
@@ -685,6 +702,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 5720cd2f73..ade706e418 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -193,6 +193,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_li
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12),y)
+TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.12/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.12-20121214_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 25347541025401e1d575c198348e2f99b8894ce3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 13:23:28 +0000
Subject: [PATCH 3663/6849] toolchain-external: remove support for 'Linaro ARM
 2012.09'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ------------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9dda722e57..eeb40a375d 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -54,23 +54,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
-	bool "Linaro 2012.09"
-	depends on BR2_arm
-	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.09 (based on gcc 4.7), Linaro GDB 2012.09 (based on
-	  GDB 7.5), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
-
-	  To use this toolchain, you must disable soft float usage.
-
 comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
 	depends on BR2_arm
 	depends on !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15
@@ -699,7 +682,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index ade706e418..649e3a3d03 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -184,9 +184,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_09),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.09/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-2012.09-20120921_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.10/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_linux.tar.bz2

From 9e77eafbd8a15bd22aa162cdff719690c9aa864d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Dec 2012 02:40:31 +0000
Subject: [PATCH 3664/6849] ffmpeg: make ARM optimizations explicit

The ffmpeg configure script tries to autodetermine ARM optimizations by
building a small code snippet with AS.
If AS allows higher-level (>generic) assembly instructions then it
passes and enables the relevant optimization path.
Some toolchains allow/default to more than generic asm and then fail
when the real code is built.
Fixes:
http://autobuild.buildroot.net/results/b6e1225a07a58cc7544e37bc55675be71e2b5088/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 90c1f1b409..b018ea077e 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -133,19 +133,26 @@ FFMPEG_DEPENDENCIES += host-nasm
 endif
 endif
 
-# ARM defaults to v5: clear if less, add extra if more
+# Explicitly disable everything that doesn't match for ARM
+# FFMPEG "autodetects" by compiling an extended instruction via AS
+# This works on compilers that aren't built for generic by default
 ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
 FFMPEG_CONF_OPT += --disable-armv5te
 endif
 ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)
 FFMPEG_CONF_OPT += --enable-armv6
+else
+FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2
 endif
-ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a8)$(BR2_cortex_a9),y)
+ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
 FFMPEG_CONF_OPT += --enable-armvfp
+else
+FFMPEG_CONF_OPT += --disable-armvfp
 endif
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 FFMPEG_CONF_OPT += --enable-neon
 endif
+
 # Set powerpc altivec appropriately
 ifeq ($(BR2_powerpc),y)
 ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)

From 5649176a485e1138ed3e42ebb7700255f6c93153 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Dec 2012 02:48:32 +0000
Subject: [PATCH 3665/6849] dstat: needs mmu

Because python needs MMU, fixes:
http://autobuild.buildroot.net/results/7bb46ed3ffb46741b7cb7e3edd33f4729409b2ef/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dstat/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dstat/Config.in b/package/dstat/Config.in
index 1439c8b095..5b8df23c42 100644
--- a/package/dstat/Config.in
+++ b/package/dstat/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DSTAT
 	bool "dstat"
 	depends on BR2_USE_WCHAR # python
+	depends on BR2_USE_MMU # python
 	select BR2_PACKAGE_PYTHON
 	help
 	  Dstat, written in Python, is a versatile replacement for vmstat,

From 1b603449fd0dcbaf22188e1f2e149da115ff2ea1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 22 Dec 2012 02:06:19 +0000
Subject: [PATCH 3666/6849] pulseaudio: needs threads

Fixes:
http://autobuild.buildroot.net/results/4d6a5793e475683fbc58ccaf03cf7816233a5052/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/Config.in | 1 +
 package/multimedia/mpd/Config.in              | 1 +
 package/multimedia/pulseaudio/Config.in       | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 33ecb5c32c..b5006e6239 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -193,6 +193,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
 	bool "oss4 (Open Sound System 4)"
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	select BR2_PACKAGE_PULSEAUDIO
 	bool "pulseaudio"
 
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 5d0818299f..2e447418a9 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -40,6 +40,7 @@ config BR2_PACKAGE_MPD_AUDIOFILE
 
 config BR2_PACKAGE_MPD_PULSEAUDIO
 	bool "pulseaudio"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	select BR2_PACKAGE_PULSEAUDIO
 	help
 	  Enable pulseaudio output support.
diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index 6c767bb6b9..eeb8b5ab07 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PULSEAUDIO
 	bool "pulseaudio"
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_LIBSNDFILE
@@ -17,5 +18,5 @@ config BR2_PACKAGE_PULSEAUDIO
 
 	  http://pulseaudio.org
 
-comment "pulseaudio requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "pulseaudio requires a toolchain with WCHAR and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

From 0280921a82dcddf827417557d9e17a22e96eeecc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 22 Dec 2012 02:31:02 +0000
Subject: [PATCH 3667/6849] gettext: disable tools tests when no threads

Disable the gettext-tools tests build since they break when a full
toolchain without threads is being used.
Fixes:
http://autobuild.buildroot.net/results/a187c76c359787f8e2ec6e12da2d7b1e33ed43c5/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 77881d3e34..a91cb7f1f7 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -44,6 +44,12 @@ define GETTEXT_DISABLE_TOOLS
 endef
 endif # GETTEXT_TOOLS = n
 
+# The tools tests build fails with full toolchain without threads
+define GETTEXT_DISABLE_TESTS
+	$(SED) 's/m4 tests/m4/' $(@D)/gettext-tools/Makefile.in
+endef
+
 GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
+GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TESTS
 
 $(eval $(autotools-package))

From 5f70f5caea8a8e229a5adad948b32fe4e3c88289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Sat, 22 Dec 2012 14:20:29 +0000
Subject: [PATCH 3668/6849] new package: proxychains
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/proxychains/Config.in      |  7 +++++++
 package/proxychains/proxychains.mk | 10 ++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/proxychains/Config.in
 create mode 100644 package/proxychains/proxychains.mk

diff --git a/package/Config.in b/package/Config.in
index 66445ff9b8..3d556b2b9f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -654,6 +654,7 @@ source "package/portmap/Config.in"
 source "package/pppd/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
+source "package/proxychains/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
diff --git a/package/proxychains/Config.in b/package/proxychains/Config.in
new file mode 100644
index 0000000000..332aa3b04e
--- /dev/null
+++ b/package/proxychains/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PROXYCHAINS
+	bool "proxychains"
+	help
+	  force any tcp connections to flow through a proxy (or proxy chain)
+
+	  http://proxychains.sourceforge.net
+
diff --git a/package/proxychains/proxychains.mk b/package/proxychains/proxychains.mk
new file mode 100644
index 0000000000..7c4500dd31
--- /dev/null
+++ b/package/proxychains/proxychains.mk
@@ -0,0 +1,10 @@
+#############################################################
+#
+# ProxyChains
+#
+#############################################################
+PROXYCHAINS_VERSION = 3.1
+PROXYCHAINS_SOURCE = proxychains-$(PROXYCHAINS_VERSION).tar.gz
+PROXYCHAINS_SITE = http://downloads.sourceforge.net/project/proxychains/proxychains/version%20$(PROXYCHAINS_VERSION)
+
+$(eval $(autotools-package))

From 0810280fec7745b2534c2fa9d0526115e05b26f7 Mon Sep 17 00:00:00 2001
From: Mikhail Boiko <mikhailboiko85@gmail.com>
Date: Tue, 25 Dec 2012 21:40:27 +0000
Subject: [PATCH 3669/6849] dosfstools: fix download link

Signed-off-by: Mikhail Boiko <mikhailboiko85@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 08201d3870..507f485d3d 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 DOSFSTOOLS_VERSION = 3.0.12
-DOSFSTOOLS_SITE = http://www.daniel-baumann.ch/software/dosfstools
+DOSFSTOOLS_SITE = http://fossies.org/linux/misc/
 MKDOSFS_BINARY = mkdosfs
 DOSFSCK_BINARY = dosfsck
 DOSFSLABEL_BINARY = dosfslabel

From eca5721813e66d034fc9e45a83ca202dbccebd72 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 00:49:18 +0000
Subject: [PATCH 3670/6849] cdrkit: needs mmu

Fixes
autobuild.buildroot.net/results/10129d06088149a5ce9bd9762b5a17e5d89eec34

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cdrkit/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
index 7ff50f3f47..dfe3811259 100644
--- a/package/cdrkit/Config.in
+++ b/package/cdrkit/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CDRKIT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_LIBCAP
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork
 	bool "cdrkit"
 	help
 	  cdrkit is a suite of programs for recording CDs and DVDs,

From 6a219e26b6a15b5a073660c96778024915877663 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 00:49:19 +0000
Subject: [PATCH 3671/6849] libfuse: needs mmu

Fixes
http://autobuild.buildroot.net/results/5c64ea05e0ffedcc78f5255f6f76afa1f159cda0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/Config.in | 1 +
 package/sshfs/Config.in   | 1 +
 package/unionfs/Config.in | 1 +
 3 files changed, 3 insertions(+)

diff --git a/package/libfuse/Config.in b/package/libfuse/Config.in
index 2e9b7dc9a6..5d308927f3 100644
--- a/package/libfuse/Config.in
+++ b/package/libfuse/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBFUSE
 	bool "libfuse"
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  FUSE (Filesystem in UserSpacE)
 
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index d0cf932bb9..11b6bb9028 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SSHFS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
 	help
 	  FUSE filesystem client based on the SSH File Transfer Protocol.
 
diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in
index 92f1787540..2ac7be9c23 100644
--- a/package/unionfs/Config.in
+++ b/package/unionfs/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_UNIONFS
 	select BR2_PACKAGE_LIBFUSE
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
 	help
 	  A userspace unionfs implementation.
 

From a12f6402e89d04798cadad8586bd347f62574b7f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 03:55:47 +0000
Subject: [PATCH 3672/6849] libgcrypt: disable tests

The testsuite uses fork() hence fails on !MMU targets.
We don't use/install these so just get rid of them.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgcrypt/libgcrypt.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index a320e4848b..3aa60c6973 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -10,6 +10,7 @@ LIBGCRYPT_LICENSE = LGPLv2.1+
 LIBGCRYPT_LICENSE_FILES = COPYING.LIB
 LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 LIBGCRYPT_INSTALL_STAGING = YES
+LIBGCRYPT_DEPENDENCIES = libgpg-error
 
 LIBGCRYPT_CONF_ENV = \
 	ac_cv_sys_symbol_underscore=no
@@ -17,6 +18,12 @@ LIBGCRYPT_CONF_OPT = \
 	--disable-optimization \
 	--with-gpg-error-prefix=$(STAGING_DIR)/usr
 
-LIBGCRYPT_DEPENDENCIES = libgpg-error
+# Tests use fork()
+define LIBGCRYPT_DISABLE_TESTS
+	$(SED) 's/ tests//' $(@D)/Makefile.in
+endef
+
+LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS
+
 
 $(eval $(autotools-package))

From f1b86cef9884894df26ed25efaabe254f8f0754b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 03:55:48 +0000
Subject: [PATCH 3673/6849] gnutls: make it non-wchar friendly

Make gnutls work for non-wchar toolchains.
It's just a matter of throwing a helping hand to configure.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in         | 2 +-
 package/gnutls/Config.in          | 4 ----
 package/gnutls/gnutls.mk          | 5 ++++-
 package/libsoup/Config.in         | 2 +-
 package/network-manager/Config.in | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 93f9ab518f..4c9741b530 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
-	depends on BR2_USE_WCHAR # libglib2 and gnutls
+	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 556caea2d2..cedf120ee7 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
 	select BR2_PACKAGE_LIBGCRYPT
-	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
 
 	  http://www.gnu.org/software/gnutls/gnutls.html
-
-comment "gnutls requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 2634642572..506d7f5b82 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -10,7 +10,10 @@ GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING lib/COPYING
 GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
-GNUTLS_CONF_ENV = acl_cv_rpath=no
+GNUTLS_CONF_ENV = acl_cv_rpath=no \
+	ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \
+	gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \
+	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)
 GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
 		--without-p11-kit --disable-rpath
 GNUTLS_INSTALL_STAGING = YES
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 57b425f283..c3b4ceb181 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
-	depends on BR2_USE_WCHAR # glib2 and gnutls
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index e2324d6602..f2544da17a 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	select BR2_PACKAGE_DBUS
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2 and gnutls
+	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS_GLIB

From 562d1ad82e33cd2234af9abac7847e990af037ce Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 03:55:49 +0000
Subject: [PATCH 3674/6849] libmicrohttpd: bump to version 0.9.24

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/Config.in        | 5 +++++
 package/libmicrohttpd/libmicrohttpd.mk | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index cfedc8fa95..4e78a996c8 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBMICROHTTPD
 	bool "libmicrohttpd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  GNU libmicrohttpd is a small C library that makes it easy to
 	  run an HTTP server as part of another application.
@@ -9,6 +10,10 @@ config BR2_PACKAGE_LIBMICROHTTPD
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
        bool "https support"
        depends on BR2_PACKAGE_LIBMICROHTTPD
+       select BR2_PACKAGE_GNUTLS
        select BR2_PACKAGE_LIBGCRYPT
        help
          Enable HTTPS (SSL) support.
+
+comment "libmicrohttpd needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index f8690eebf9..cf84b2d173 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -3,14 +3,14 @@
 # libmicrohttpd
 #
 #############################################################
-LIBMICROHTTPD_VERSION = 0.4.6
-LIBMICROHTTPD_SOURCE = libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz
+
+LIBMICROHTTPD_VERSION = 0.9.24
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
-LIBMICROHTTPD_DEPENDENCIES += libgcrypt
-LIBMICROHTTPD_CONF_OPT += --enable-https \
+LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
+LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
 			  --with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
 LIBMICROHTTPD_CONF_OPT += --disable-https

From d8ee2f459628901723e08ab01c4595cf6ed5595b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 07:36:26 +0000
Subject: [PATCH 3675/6849] gettext: bump to version 0.18.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext-uclibc-compat.patch   | 27 -------------------
 .../gettext-uclibc-sched_param-def.patch      | 20 --------------
 package/gettext/gettext.mk                    |  2 +-
 3 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 package/gettext/gettext-uclibc-compat.patch
 delete mode 100644 package/gettext/gettext-uclibc-sched_param-def.patch

diff --git a/package/gettext/gettext-uclibc-compat.patch b/package/gettext/gettext-uclibc-compat.patch
deleted file mode 100644
index 5e52665de6..0000000000
--- a/package/gettext/gettext-uclibc-compat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The glibc fix/hack isn't valid for uClibc.
-Patch taken from OpenWRT.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego
-     locale_t thread_locale = uselocale (NULL);
-     if (thread_locale != LC_GLOBAL_LOCALE)
-       {
--#  if __GLIBC__ >= 2
-+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
-         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-            glibc < 2.12.
-            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
---- a/gettext-tools/gnulib-lib/localename.c
-+++ b/gettext-tools/gnulib-lib/localename.c
-@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego
-     locale_t thread_locale = uselocale (NULL);
-     if (thread_locale != LC_GLOBAL_LOCALE)
-       {
--#  if __GLIBC__ >= 2
-+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
-         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-            glibc < 2.12.
-            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
diff --git a/package/gettext/gettext-uclibc-sched_param-def.patch b/package/gettext/gettext-uclibc-sched_param-def.patch
deleted file mode 100644
index 4e392780fc..0000000000
--- a/package/gettext/gettext-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-http://bugs.gentoo.org/323377
-
---- gettext/gettext-tools/gnulib-lib/spawn.in.h
-+++ gettext/gettext-tools/gnulib-lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index a91cb7f1f7..953077d21a 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GETTEXT_VERSION = 0.18.1.1
+GETTEXT_VERSION = 0.18.2
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+

From 4c1576042e7171d5229414447d99823630e4e309 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 07:36:27 +0000
Subject: [PATCH 3676/6849] php: bump to version 5.3.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 429017035d..a1badabd23 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.19
+PHP_VERSION = 5.3.20
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From 6b449ed5dfb8c8f8c889f242cf3d5b27b18673c7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 26 Dec 2012 07:36:28 +0000
Subject: [PATCH 3677/6849] sed: bump to version 4.2.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sed/sed.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 451ba54de2..5535754967 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -3,9 +3,11 @@
 # sed
 #
 #############################################################
-SED_VERSION = 4.2.1
-SED_SOURCE = sed-$(SED_VERSION).tar.gz
+
+SED_VERSION = 4.2.2
 SED_SITE = $(BR2_GNU_MIRROR)/sed
+SED_LICENSE = GPLv3
+SED_LICENSE_FILES = COPYING
 
 SED_CONF_OPT = --bindir=/usr/bin \
 		--libdir=/lib \

From a61d33a3443e535ce2fde53ffe9fa3161fb6afea Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 25 Dec 2012 08:11:29 +0000
Subject: [PATCH 3678/6849] package/spice: don't enable GUI if dependencies not
 met

The spice GUI selects unconditionally selects cegui06, but cegui06 requires
threads and C++, so spice GUI must also depend on threads and C++.

Fixes:
    http://autobuild.buildroot.net/results/37f8ee90bb4348db97daef83493005c42a193b91/

Merry X-Mas! ;-)

[Peter: add SPICE_CLIENT dependency]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spice/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/spice/Config.in b/package/spice/Config.in
index 1b264e7e21..0c2c7a643a 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -35,8 +35,14 @@ config BR2_PACKAGE_SPICE_CLIENT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 
+comment "GUI requires a toolchain with threads and C++"
+	depends on BR2_PACKAGE_SPICE_CLIENT
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_SPICE_GUI
 	bool "Enable GUI"
+	depends on BR2_TOOLCHAIN_HAS_THREADS    # cegui06
+	depends on BR2_INSTALL_LIBSTDCPP        # cegui06
 	depends on BR2_PACKAGE_SPICE_CLIENT
 	select BR2_PACKAGE_CEGUI06
 	help

From ab76f7c0aff47c23d41bf64e31a7f1870e0417c9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Dec 2012 18:54:31 +0100
Subject: [PATCH 3679/6849] iptables: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 3243b3fdde..518b90eb79 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.16.3
+IPTABLES_VERSION = 1.4.17
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From d8fcbcdfa05eb4bb975caccc35809e6a9f3e467c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Dec 2012 05:39:06 +0000
Subject: [PATCH 3680/6849] iw: bump to version 3.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 19ede3afaa..22ea25c821 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IW_VERSION = 3.7
+IW_VERSION = 3.8
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_LICENSE = iw license

From 32f5ef1ec5e1e0333d389dace7aed2ac88fe19b1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Dec 2012 05:39:07 +0000
Subject: [PATCH 3681/6849] smartmontools: bump to version 6.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/smartmontools/smartmontools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index 7b4c7f98a3..5736771e96 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SMARTMONTOOLS_VERSION = 5.43
+SMARTMONTOOLS_VERSION = 6.0
 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
 SMARTMONTOOLS_LICENSE = GPLv2+
 SMARTMONTOOLS_LICENSE_FILES = COPYING

From 6b307de4f9d6ae806b7cbbf8bc1d412d139d75cf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Dec 2012 05:39:08 +0000
Subject: [PATCH 3682/6849] gawk: bump to version 4.0.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/gawk.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 58c96ced27..4a215926c1 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-GAWK_VERSION = 4.0.1
+GAWK_VERSION = 4.0.2
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_TARGET_BINS = awk gawk igawk pgawk
+GAWK_LICENSE = GPLv3
+GAWK_LICENSE_FILES = COPYING
 
 # Prefer full-blown gawk over busybox awk
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From a2529f7f4d18b18dac1ee00ac7655116cb805818 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Dec 2012 05:39:09 +0000
Subject: [PATCH 3683/6849] rng-tools: bump to version 4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rng-tools/rng-tools.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index 347d89d7f3..e997b151c0 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-RNG_TOOLS_VERSION = 3
+RNG_TOOLS_VERSION = 4
 RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION)
 RNG_TOOLS_CONF_ENV = LIBS="-largp"
 RNG_TOOLS_DEPENDENCIES = argp-standalone
+RNG_TOOLS_LICENSE = GPLv2
+RNG_TOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From fc0d1be16b6ee1a24eeb3498b98034aa37cf4cca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Dec 2012 05:39:10 +0000
Subject: [PATCH 3684/6849] freetype: security bump to version 2.4.11

Fixes a security vulnerability in the BDF implementation.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index a34c9ad0ba..be87a4846a 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,11 +4,13 @@
 #
 #############################################################
 
-FREETYPE_VERSION = 2.4.10
+FREETYPE_VERSION = 2.4.11
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
+FREETYPE_LICENSE = Dual FTL/GPLv2+
+FREETYPE_LICENSE_FILES = docs/FTL.txt docs/GPLv2.txt
 FREETYPE_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_ZLIB),zlib) \
 	$(if $(BR2_PACKAGE_BZIP2),bzip2)

From 20e0926f4469a3486629cfd6fa7f449f2b659aa8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 27 Dec 2012 13:20:36 +0000
Subject: [PATCH 3685/6849] package/keyutils: disable on avr32 & microblaze

keyutils builds on neither avr32, nor microblaze (probably because
the toolchains used for those archictectures are way too old), with:

    ..../microblazeel-unknown-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
    -D_FILE_OFFSET_BITS=64 -I. -DPKGBUILD="\"2012-12-27\"" -DPKGVERSION="\"keyutils-1.5.5\""
    -DAPIVERSION="\"libkeyutils-1.4\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
    -D_FILE_OFFSET_BITS=64  -pipe -Os  -g -Wall -Werror -UNO_GLIBC_KEYERR -o keyutils.o -c keyutils.c
    cc1: warnings being treated as errors
    key.dns_resolver.c: In function 'main':
    key.dns_resolver.c:690: warning: dereferencing type-punned pointer will break strict-aliasing rules

Fixing with -fno-strict-aliasing only partially solves the issue for these
two archs, since the C library does not export the resolver symbols so the
link fails down the road...
  - on microblaze, glibc-2.3.6 is tool old and does not set these symbols
    as GLOBALs;
  - on avr32, uClibc does not have these symbols.

It is much more easy to just disable keyutils for avr32 and microblaze.

Fixes both (avr2, microblaze):
    http://autobuild.buildroot.net/results/aa86f6a68f5d0ea4914ab259ed270615bc9d6a99/
    http://autobuild.buildroot.net/results/70ae127a6e353fd5c64c0c3b4e19a2e93d54ce52/

Merry X-Mas!

PS. Thanks Richard for the help understanding those issues.

Cc: Richard Braun <rbraun@sceen.net>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/keyutils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in
index 9b5a24bbce..9b9f9bc656 100644
--- a/package/keyutils/Config.in
+++ b/package/keyutils/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KEYUTILS
 	bool "keyutils"
+	depends on !BR2_avr32 && !BR2_microblaze
 	help
 	  These tools are used to control the key management system
 	  built into the Linux kernel.

From 141314d38a9b8b007d338dc1caf2c6b0ccd14a9f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 00:34:17 +0000
Subject: [PATCH 3686/6849] freetype: fix legal-info

My mistake, wrong capitalization, fixes
http://autobuild.buildroot.net/results/10261b94d95f7547a08d8fa1d0b0ddcae85c38a3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index be87a4846a..be0f1a71da 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -10,7 +10,7 @@ FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FR
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
-FREETYPE_LICENSE_FILES = docs/FTL.txt docs/GPLv2.txt
+FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_ZLIB),zlib) \
 	$(if $(BR2_PACKAGE_BZIP2),bzip2)

From 9d9d842d871b8645f70c3a90f59f8e2e09935656 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 00:59:00 +0000
Subject: [PATCH 3687/6849] dialog: needs mmu

Fixes
http://autobuild.buildroot.net/results/b673ef6d6315dc5df77e000199a63f90904829d5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dialog/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dialog/Config.in b/package/dialog/Config.in
index 9d3462ec49..db5197fb7a 100644
--- a/package/dialog/Config.in
+++ b/package/dialog/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DIALOG
 	bool "dialog"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # fork()
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help

From 2eb995759d2e24e4e1f584439d2a272be68b4bba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 00:59:01 +0000
Subject: [PATCH 3688/6849] vsftpd: needs mmu

Fixes
http://autobuild.buildroot.net/results/067cfbab9fa26e9e5f321f661e8f4ac0e19249e1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/vsftpd/Config.in b/package/vsftpd/Config.in
index 8414c88f72..3d4cff1c07 100644
--- a/package/vsftpd/Config.in
+++ b/package/vsftpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_VSFTPD
 	bool "vsftpd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # fork()
 	help
 	  vsftpd is an ftp daemon written with security in mind.
 	  http://vsftpd.beasts.org/

From 496f7ca974f025f0c302e53592f4b232a17725e5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 02:07:35 +0000
Subject: [PATCH 3689/6849] mysql: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in     | 3 ++-
 package/mysql_client/Config.in | 1 +
 package/poco/Config.in         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index fe520f8ce9..74419f6e8e 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -212,7 +212,8 @@ config BR2_PACKAGE_COLLECTD_MEMORY
 
 config BR2_PACKAGE_COLLECTD_MYSQL
 	bool "mysql"
-	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP # mysql
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  Connects to a MySQL database and issues a "show status" command.
diff --git a/package/mysql_client/Config.in b/package/mysql_client/Config.in
index f07fdb4ce1..970b9b98cc 100644
--- a/package/mysql_client/Config.in
+++ b/package/mysql_client/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL client"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
diff --git a/package/poco/Config.in b/package/poco/Config.in
index 36d8de91f1..20a8f2dfa5 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -51,6 +51,7 @@ config BR2_PACKAGE_POCO_DATA_SQLITE
 
 config BR2_PACKAGE_POCO_DATA_MYSQL
 	bool "mysql"
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_POCO_DATA
 	select BR2_PACKAGE_MYSQL_CLIENT
 

From fe2ca806b00edb41d2ebbea7583537f37c96a09a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 02:07:36 +0000
Subject: [PATCH 3690/6849] pcre: bump to version 8.32

Bump PCRE to version 8.32
Also add a patch to remove compatibility bits, fixing:
http://autobuild.buildroot.net/results/e380b838296c85ff9aeaec9fa088bded69670307/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/pcre-no-compat.patch | 31 +++++++++++++++++++++++++++++++
 package/pcre/pcre.mk              |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 package/pcre/pcre-no-compat.patch

diff --git a/package/pcre/pcre-no-compat.patch b/package/pcre/pcre-no-compat.patch
new file mode 100644
index 0000000000..7099727737
--- /dev/null
+++ b/package/pcre/pcre-no-compat.patch
@@ -0,0 +1,31 @@
+Kill ABI compatibility bits, we don't need them.
+Fixes build failures on non-ELF (blackfin) targets.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura pcre-8.32.orig/pcrecpp.cc pcre-8.32/pcrecpp.cc
+--- pcre-8.32.orig/pcrecpp.cc	2012-12-28 08:32:10.193847937 -0300
++++ pcre-8.32/pcrecpp.cc	2012-12-28 08:32:26.924376180 -0300
+@@ -58,22 +58,6 @@
+ // Special object that stands-in for no argument
+ Arg RE::no_arg((void*)NULL);
+ 
+-// This is for ABI compatibility with old versions of pcre (pre-7.6),
+-// which defined a global no_arg variable instead of putting it in the
+-// RE class.  This works on GCC >= 3, at least.  It definitely works
+-// for ELF, but may not for other object formats (Mach-O, for
+-// instance, does not support aliases.)  We could probably have a more
+-// inclusive test if we ever needed it.  (Note that not only the
+-// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
+-// gnu-specific.)
+-#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__)
+-# define ULP_AS_STRING(x)            ULP_AS_STRING_INTERNAL(x)
+-# define ULP_AS_STRING_INTERNAL(x)   #x
+-# define USER_LABEL_PREFIX_STR       ULP_AS_STRING(__USER_LABEL_PREFIX__)
+-extern Arg no_arg
+-  __attribute__((alias(USER_LABEL_PREFIX_STR "_ZN7pcrecpp2RE6no_argE")));
+-#endif
+-
+ // If a regular expression has no error, its error_ field points here
+ static const string empty_string;
+ 
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 9947c4b793..9e27cb52c9 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCRE_VERSION = 8.31
+PCRE_VERSION = 8.32
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_LICENSE = BSD-3c
 PCRE_LICENSE_FILES = LICENCE

From 8bbd1204a69dcbdd86bb5a97fb20add667df5a81 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 02:07:37 +0000
Subject: [PATCH 3691/6849] sconeserver: fix depends

sconeserver selects packages that have other depends that aren't taken
account of.
Fixes
http://autobuild.buildroot.net/results/6e858387cfcb3f8d7422a29855a6a3c770d70c0e
among probably others.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index a7e5c75634..0fc3a13efb 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -32,12 +32,16 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
 
 config BR2_PACKAGE_SCONESERVER_MYSQL
 	bool "mysql"
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  MySQL module for Sconeserver
 
 config BR2_PACKAGE_SCONESERVER_BLUETOOTH
 	bool "bluetooth"
+	depends on BR2_USE_WCHAR # bluez->libglib2
+	depends on BR2_USE_MMU # bluez->dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
 	  Bluetooth module for Sconeserver
@@ -50,6 +54,8 @@ config BR2_PACKAGE_SCONESERVER_RSS
 
 config BR2_PACKAGE_SCONESERVER_LOCATION
 	bool "location"
+	depends on BR2_USE_MMU # gpsd
+	depends on BR2_TOOLCHAIN_HAS_THREADS # gpsd
 	select BR2_PACKAGE_GPSD
 	help
 	  Location module for Sconeserver

From 14c0544003cff4d00e638e6b13a884bc61e56a9f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 03:05:54 +0000
Subject: [PATCH 3692/6849] mysql_client: bump to version 5.1.67

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mysql_client/mysql_client.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 9785aeed8b..1477b66a66 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -4,12 +4,14 @@
 #
 #############################################################
 
-MYSQL_CLIENT_VERSION = 5.1.66
+MYSQL_CLIENT_VERSION = 5.1.67
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-5.1
 MYSQL_CLIENT_INSTALL_STAGING = YES
 MYSQL_CLIENT_DEPENDENCIES = readline ncurses
-MYSQL_CLIENT_AUTORECONF=YES
+MYSQL_CLIENT_AUTORECONF = YES
+MYSQL_CLIENT_LICENSE = GPLv2
+MYSQL_CLIENT_LICENSE_FILES = README COPYING
 
 MYSQL_CLIENT_CONF_ENV = \
 	ac_cv_sys_restartable_syscalls=yes \

From ec10d81e46cbcbb644dcfe0f91961fb09706be77 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 03:05:55 +0000
Subject: [PATCH 3693/6849] ulogd: add support for mysql output

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ulogd/ulogd.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
index 4620bbd5af..34d8665275 100644
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -7,7 +7,7 @@
 ULOGD_VERSION = 2.0.1
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
-ULOGD_CONF_OPT = --with-dbi=no --with-mysql=no --with-pgsql=no
+ULOGD_CONF_OPT = --with-dbi=no --with-pgsql=no
 ULOGD_AUTORECONF = YES
 ULOGD_DEPENDENCIES = host-pkgconf \
 	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
@@ -15,4 +15,11 @@ ULOGD_DEPENDENCIES = host-pkgconf \
 ULOGD_LICENSE = GPLv2
 ULOGD_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
+ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
+ULOGD_DEPENDENCIES += mysql_client
+else
+ULOGD_CONF_OPT += --with-mysql=no
+endif
+
 $(eval $(autotools-package))

From 4848386446b937d4d0d9d3e9489932ca3fcb1003 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 05:35:39 +0000
Subject: [PATCH 3694/6849] libffi: fix mips build failures

Fixes
http://autobuild.buildroot.net/results/c4056ed2b969b900f7654e651e0e4cc2e8998e02

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 75705835ef..64b3eb4120 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -8,9 +8,14 @@ LIBFFI_VERSION = 3.0.11
 LIBFFI_SITE    = ftp://sources.redhat.com/pub/libffi/
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE
-
 LIBFFI_INSTALL_STAGING = YES
 
+# Newer CS MIPS toolchains use a different (compact) eh_frame format
+# libffi don't like them, just switch to the older format
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209)$(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
+LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
+endif
+
 # Move the headers to the usual location, and adjust the .pc file
 # accordingly
 define LIBFFI_MOVE_STAGING_HEADERS

From ac4e3c02d43708ed1263186b52a791c615d67cce Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 10:01:08 +0000
Subject: [PATCH 3695/6849] nettle: add new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/nettle/Config.in |  9 +++++++++
 package/nettle/nettle.mk | 12 ++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/nettle/Config.in
 create mode 100644 package/nettle/nettle.mk

diff --git a/package/Config.in b/package/Config.in
index 3d556b2b9f..6c82bab857 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -363,6 +363,7 @@ source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libnss/Config.in"
+source "package/nettle/Config.in"
 source "package/ocf-linux/Config.in"
 source "package/openssl/Config.in"
 source "package/polarssl/Config.in"
diff --git a/package/nettle/Config.in b/package/nettle/Config.in
new file mode 100644
index 0000000000..55776216e4
--- /dev/null
+++ b/package/nettle/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_NETTLE
+	bool "nettle"
+	select BR2_PACKAGE_GMP
+	help
+	  Nettle is a cryptographic library that is designed to fit easily
+	  in more or less any context: In crypto toolkits for object-oriented
+	  languages, in applications like LSH or GNUPG, or even in kernel space
+
+	  http://www.lysator.liu.se/~nisse/nettle/
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
new file mode 100644
index 0000000000..ef7640a237
--- /dev/null
+++ b/package/nettle/nettle.mk
@@ -0,0 +1,12 @@
+NETTLE_VERSION = 2.5
+NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
+NETTLE_DEPENDENCIES = gmp
+NETTLE_INSTALL_STAGING = YES
+
+define NETTLE_DITCH_DEBUGGING_CFLAGS
+	$(SED) '/CFLAGS/ s/ -ggdb3//' $(@D)/configure
+endef
+
+NETTLE_POST_EXTRACT_HOOKS += NETTLE_DITCH_DEBUGGING_CFLAGS
+
+$(eval $(autotools-package))

From 788fcd99e0578e361f192aae4b89b15f1a60faac Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:18 +0000
Subject: [PATCH 3696/6849] hostapd: remove gnutls support

hostapd isn't API compatible with gnutls3 so remove support.
It's probably hardly used since openssl is far more common, and hostapd
can use its internal routines if it's not available.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 45a93fc7bb..b18881ad82 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -27,7 +27,7 @@ define HOSTAPD_LIBTOMMATH_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 
-# Try to use openssl or gnutls if it's already available
+# Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	HOSTAPD_DEPENDENCIES += openssl
 define HOSTAPD_TLS_CONFIG
@@ -35,17 +35,10 @@ define HOSTAPD_TLS_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 else
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
-	HOSTAPD_DEPENDENCIES += gnutls
-define HOSTAPD_TLS_CONFIG
-	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(HOSTAPD_CONFIG)
-endef
-else
 define HOSTAPD_TLS_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(HOSTAPD_CONFIG)
 endef
 endif
-endif
 
 ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
 define HOSTAPD_EAP_CONFIG

From c89cc4b4b311b927d0c02af5717c6cc1150a1480 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:19 +0000
Subject: [PATCH 3697/6849] wpa_supplicant: remove gnutls support

wpa_supplicant isn't API compatible with gnutls3 so remove support.
It's probably hardly used since openssl is far more common, and
wpa_supplicant can use its internal routines if it's not available.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 71be11f117..3830d6549e 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -59,7 +59,7 @@ define WPA_SUPPLICANT_LIBTOMMATH_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 
-# Try to use openssl or gnutls if it's already available
+# Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	WPA_SUPPLICANT_DEPENDENCIES += openssl
 define WPA_SUPPLICANT_TLS_CONFIG
@@ -67,17 +67,10 @@ define WPA_SUPPLICANT_TLS_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 else
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
-	WPA_SUPPLICANT_DEPENDENCIES += gnutls
-define WPA_SUPPLICANT_TLS_CONFIG
-	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(WPA_SUPPLICANT_CONFIG)
-endef
-else
 define WPA_SUPPLICANT_TLS_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(WPA_SUPPLICANT_CONFIG)
 endef
 endif
-endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus

From a8293a376574c439041de48e6571a4b82f7d2c3b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:17 +0000
Subject: [PATCH 3698/6849] gnutls: bump to version 3.1.5

[Peter: add comment when tools not available]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/Config.in                      | 12 +++-
 ...ets-no-longer-exists-in-e-glibc-2.16.patch | 56 -------------------
 package/gnutls/gnutls.mk                      | 26 ++++++---
 3 files changed, 30 insertions(+), 64 deletions(-)
 delete mode 100644 package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch

diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index cedf120ee7..2739088365 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,8 +1,18 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
-	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_NETTLE
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
 
 	  http://www.gnu.org/software/gnutls/gnutls.html
+
+config BR2_PACKAGE_GNUTLS_TOOLS
+	bool "install tools"
+	depends on BR2_PACKAGE_GNUTLS
+	depends on BR2_USE_WCHAR
+	help
+	  Install GnuTLS command line tools for various cryptographic tasks.
+
+comment "gnutls tools requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_GNUTLS && !BR2_USE_WCHAR
diff --git a/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch b/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
deleted file mode 100644
index 802e7ac970..0000000000
--- a/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 855f72c4fe7f4bbf2137ab60357ae3b27bb65185 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 17 Nov 2012 17:45:41 +0100
-Subject: [PATCH] gets() no longer exists in (e)glibc >= 2.16
-
-gnutls has already updated gnulib upstream in more recent versions
-(3.x) but apparently not in the 2.x branch that we are using.
-
-This patch comes from OpenEmbedded, and has originally been written by
-Khem Raj <raj.khem@gmail.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- gl/stdio.in.h     |    2 ++
- lib/gl/stdio.in.h |    2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/gl/stdio.in.h b/gl/stdio.in.h
-index 9dc7c4a..8cb19d7 100644
---- a/gl/stdio.in.h
-+++ b/gl/stdio.in.h
-@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
- _GL_CXXALIAS_SYS (gets, char *, (char *s));
- #  undef gets
- # endif
-+# if defined gets
- _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+# endif
- #endif
- 
- 
-diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h
-index 03bea2a..cb6483b 100644
---- a/lib/gl/stdio.in.h
-+++ b/lib/gl/stdio.in.h
-@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
- _GL_CXXALIAS_SYS (gets, char *, (char *s));
- #  undef gets
- # endif
-+# if defined gets
- _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+# endif
- #endif
- 
- 
--- 
-1.7.9.5
-
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 506d7f5b82..e27c1a3587 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,18 +4,30 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 2.12.20
-GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
+GNUTLS_VERSION = 3.1.5
+GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
-GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
+GNUTLS_LICENSE = GPLv3+ LGPLv3
 GNUTLS_LICENSE_FILES = COPYING lib/COPYING
-GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
-GNUTLS_CONF_ENV = acl_cv_rpath=no \
+GNUTLS_DEPENDENCIES = host-pkgconf nettle $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_OPT = --with-libnettle-prefix=$(STAGING_DIR)/usr --disable-rpath
+GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \
 	ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \
 	gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \
 	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)
-GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
-		--without-p11-kit --disable-rpath
 GNUTLS_INSTALL_STAGING = YES
 
+# Some examples in doc/examples use wchar
+define GNUTLS_DISABLE_DOCS
+	$(SED) 's/ doc / /' $(@D)/Makefile.in
+endef
+
+define GNUTLS_DISABLE_TOOLS
+	$(SED) 's/\$$(PROGRAMS)//' $(@D)/src/Makefile.in
+	$(SED) 's/) install-exec-am/)/' $(@D)/src/Makefile.in
+endef
+
+GNUTLS_POST_PATCH_HOOKS += GNUTLS_DISABLE_DOCS
+GNUTLS_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_GNUTLS_TOOLS),,GNUTLS_DISABLE_TOOLS)
+
 $(eval $(autotools-package))

From 2007e3b1ef5e6e2e646750496c7496ce831aae01 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:20 +0000
Subject: [PATCH 3699/6849] ntfs-3g: needs libgcrypt

Now that we've moved to gnutls 3.x which no longer uses libgcrypt we
need to pull it in as a dependency for ntfs-3g encrypted volume support
to avoid build breakage.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/Config.in  | 1 +
 package/ntfs-3g/ntfs-3g.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index 5301038896..1d3e2fb9bd 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -17,6 +17,7 @@ if BR2_PACKAGE_NTFS_3G
 config BR2_PACKAGE_NTFS_3G_ENCRYPTED
 	bool "encrypted volumes"
 	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_LIBGCRYPT
 	help
 	  Enable support for NTFS encrypted volumes.
 
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index d2e68611d2..cefb73a40d 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -23,7 +23,7 @@ endif
 ifeq ($(BR2_PACKAGE_NTFS_3G_ENCRYPTED),y)
 	NTFS_3G_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 	NTFS_3G_CONF_OPT += --enable-crypto
-	NTFS_3G_DEPENDENCIES += gnutls
+	NTFS_3G_DEPENDENCIES += gnutls libgcrypt
 endif
 
 ifneq ($(BR2_PACKAGE_NTFS_3G_NTFSPROGS),y)

From 484652cbd8d4a647f7833b2e032d0d37147e8424 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:21 +0000
Subject: [PATCH 3700/6849] glib-networking: fix build failure with gnutls3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/glib-networking/glib-networking.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index b1eec4d07c..e8d71e5480 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -25,4 +25,11 @@ else
 GLIB_NETWORKING_CONF_OPT += --without-gnutls
 endif
 
+# gnutls 3.x+ doesn't use libgcrypt, it uses nettle/hogweed
+define GLIB_NETWORKING_NO_LIBGCRYPT
+	$(SED) 's:#include <gcrypt.h>::' $(@D)/tls/gnutls/gtlsbackend-gnutls.c
+endef
+
+GLIB_NETWORKING_POST_EXTRACT_HOOKS += GLIB_NETWORKING_NO_LIBGCRYPT
+
 $(eval $(autotools-package))

From ecb73fbe0ced07034dc637eff4653f732e7487b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:22 +0000
Subject: [PATCH 3701/6849] network-manager: needs libgcrypt

Since we moved to gnutls 3.x series which doesn't use libgcrypt we need
to pull it in as a dependency to avoid build breakage.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/network-manager/Config.in          | 1 +
 package/network-manager/network-manager.mk | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index f2544da17a..9b8408380b 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -11,6 +11,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS
 	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index d14c98dc0b..2a68c96a78 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -7,7 +7,8 @@ NETWORK_MANAGER_VERSION = 0.9.2.0
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
 NETWORK_MANAGER_INSTALL_STAGING = YES
-NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl wireless_tools gnutls util-linux
+NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
+	libgcrypt wireless_tools util-linux
 
 NETWORK_MANAGER_CONF_ENV = \
 	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config

From 6fcb68511e317650b028a911b8fcd7bd241fd89b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 09:47:23 +0000
Subject: [PATCH 3702/6849] connman: bump to version 1.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/connman.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 2c376c96d6..73ea70d932 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,10 +4,12 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.9
+CONNMAN_VERSION = 1.10
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES
+CONNMAN_LICENSE = GPLv2
+CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CONF_OPT += --localstatedir=/var \
 	$(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads)		\
 	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)		\

From 761ae9c3e13da753318851c4c71ab7fc8aa5a9db Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Dec 2012 10:39:53 +0000
Subject: [PATCH 3703/6849] nettle: add license info

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nettle/nettle.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index ef7640a237..ae09ecc163 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -2,6 +2,8 @@ NETTLE_VERSION = 2.5
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES
+NETTLE_LICENSE = LGPLv2.1+
+NETTLE_LICENSE_FILES = COPYING.LIB
 
 define NETTLE_DITCH_DEBUGGING_CFLAGS
 	$(SED) '/CFLAGS/ s/ -ggdb3//' $(@D)/configure

From 695edcbabe5919fe52b593553c409e7ad9a4af83 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 10:41:16 +0000
Subject: [PATCH 3704/6849] xserver_xorg-server: fix build on AArch64

Fixes the following build issue:

Making all in fb
  CC     libfb_la-fb24_32.lo
In file included from fb24_32.c:30:0:
fb.h:98:2: error: #error "GLYPHPADBYTES must be 4"

See:

 http://autobuild.buildroot.org/results/9135238abcde29918f8cb61002f1fb9279884a47/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xserver_xorg-server-aarch64-support.patch | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch
new file mode 100644
index 0000000000..ec497c8092
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch
@@ -0,0 +1,23 @@
+Add necessary definitions for AArch64
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: xserver_xorg-server-1.9.4/include/servermd.h
+===================================================================
+--- xserver_xorg-server-1.9.4.orig/include/servermd.h	2009-11-04 20:31:46.000000000 +0100
++++ xserver_xorg-server-1.9.4/include/servermd.h	2012-12-28 18:16:55.000000000 +0100
+@@ -68,6 +68,14 @@
+  * GLYPHPADBYTES is used.
+  */
+ 
++#ifdef __aarch64__
++
++# define IMAGE_BYTE_ORDER	LSBFirst
++# define BITMAP_BIT_ORDER       LSBFirst
++# define GLYPHPADBYTES		4
++
++#endif
++
+ #ifdef __avr32__
+ 
+ #define IMAGE_BYTE_ORDER        MSBFirst

From 653d64c5094d34ade03d0c30ead151ac9223edbd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 10:41:22 +0000
Subject: [PATCH 3705/6849] diffutils: fix build with recent glibc

Fixes the following build problem with recent toolchains:

In file included from exclude.c:31:0:
./stdio.h:1012:1: error: 'gets' undeclared here (not in a function)
  CC       hard-locale.o
make[4]: *** [exclude.o] Error 1
make[4]: *** Waiting for unfinished jobs....
In file included from stdio-safer.h:20:0,
                 from freopen-safer.c:22:
./stdio.h:1012:1: error: 'gets' undeclared here (not in a function)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...gets-no-longer-exists-in-eglibc-2.16.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch

diff --git a/package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch b/package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch
new file mode 100644
index 0000000000..478571852e
--- /dev/null
+++ b/package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch
@@ -0,0 +1,26 @@
+Handle the fact that gets() no longer exists in glibc >= 2.16
+
+The problem has been fixed upstream, but no release containing the fix
+has been made so far.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/lib/stdio.in.h
+===================================================================
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -693,12 +693,14 @@
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ #  undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

From 5e0b900c72bce75a3f86306d0aae79e9655a4753 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 28 Dec 2012 11:48:34 +0000
Subject: [PATCH 3706/6849] package/dvb-apps: new package

We just need the transponders data, so we just install those.

[Peter: rework install step]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/dvb-apps.mk | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/dvb-apps/dvb-apps.mk

diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
new file mode 100644
index 0000000000..721fbf0e08
--- /dev/null
+++ b/package/dvb-apps/dvb-apps.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# dvb-apps
+#
+#############################################################
+
+DVB_APPS_VERSION        = 3fc7dfa68484
+DVB_APPS_SOURCE         = dvb-apps-$(DVB_APPS_VERSION).tar.bz2
+DVB_APPS_SITE           = http://linuxtv.org/hg/dvb-apps/archive/
+
+# We just install the transponders data. As this is not a 'work' as per
+# traditional copyright, but just a collection of 'facts', there's probably
+# no license to apply to these data files.
+# To be noted however, is that the dvb-apps package bundles a copy of the
+# GPLv2 and a copy of the LGPLv2.1, and that some of the source files refer
+# to either the GPLv2+ or the LGPLv2.1+.
+# But since we do not use any of those source files, their license do not
+# apply to us.
+DVB_APPS_LICENSE        = unknown (probably public domain)
+
+define DVB_APPS_INSTALL_TARGET_CMDS
+	for i in atsc dvb-c dvb-s dvb-t; do \
+		mkdir -p $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \
+		$(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \
+	done
+endef
+
+$(eval $(generic-package))

From 6904b0ea954c22f3efb9619dc4a7b793fe985547 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 12:17:01 +0000
Subject: [PATCH 3707/6849] libplayer: propagate 'depends on' from mplayer

BR2_PACKAGE_LIBPLAYER_MPLAYER should not select BR2_PACKAGE_MPLAYER
without having the 'depends on' that BR2_PACKAGE_MPLAYER has.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libplayer/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index fe851ac6b9..5391b8b67b 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -11,6 +11,10 @@ config BR2_PACKAGE_LIBPLAYER
 if BR2_PACKAGE_LIBPLAYER
 config BR2_PACKAGE_LIBPLAYER_MPLAYER
 	bool "mplayer backend"
+	# mplayer
+	depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64
+	# mplayer
+	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_MPLAYER
 
 config BR2_PACKAGE_LIBPLAYER_GSTREAMER

From 14989d0be59762a354e7c5c15a2eeb4826d8040b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 28 Dec 2012 12:37:43 +0000
Subject: [PATCH 3708/6849] package/tvheadend: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/tvheadend/Config.in                   | 19 ++++++
 package/tvheadend/S99tvheadend                | 54 +++++++++++++++++
 package/tvheadend/accesscontrol.1             | 13 ++++
 package/tvheadend/etc.default.tvheadend       |  7 +++
 .../tvheadend-no-auto-download-dvbscans.patch | 60 +++++++++++++++++++
 package/tvheadend/tvheadend.mk                | 43 +++++++++++++
 7 files changed, 197 insertions(+)
 create mode 100644 package/tvheadend/Config.in
 create mode 100644 package/tvheadend/S99tvheadend
 create mode 100644 package/tvheadend/accesscontrol.1
 create mode 100644 package/tvheadend/etc.default.tvheadend
 create mode 100644 package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
 create mode 100644 package/tvheadend/tvheadend.mk

diff --git a/package/Config.in b/package/Config.in
index 6c82bab857..8cec873b06 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -683,6 +683,7 @@ source "package/tinyhttpd/Config.in"
 source "package/tn5250/Config.in"
 source "package/transmission/Config.in"
 source "package/ttcp/Config.in"
+source "package/tvheadend/Config.in"
 source "package/udpcast/Config.in"
 source "package/ulogd/Config.in"
 source "package/ushare/Config.in"
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
new file mode 100644
index 0000000000..944e31e85f
--- /dev/null
+++ b/package/tvheadend/Config.in
@@ -0,0 +1,19 @@
+comment "tvheadend requires a toolchain with LARGEFILE support"
+    depends on !BR2_LARGEFILE
+
+config BR2_PACKAGE_TVHEADEND
+	bool "tvheadend"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Tvheadend is a TV streaming server for Linux supporting DVB-S,
+	  DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as
+	  input sources.
+	  
+	  https://www.lonelycoder.com/redmine/projects/tvheadend/
+	  
+	  Note:
+	    - a default user has been created to log in the web configuration
+	      GUI: admin/admin; you can change it at your discretion at runtime.
+	    - if you want Avahi support, you'll need to enable:
+	          Avahi, D-Bus, libdaemon
diff --git a/package/tvheadend/S99tvheadend b/package/tvheadend/S99tvheadend
new file mode 100644
index 0000000000..407b8736a5
--- /dev/null
+++ b/package/tvheadend/S99tvheadend
@@ -0,0 +1,54 @@
+#! /bin/sh
+# tvheadend startup script inspired by the Debian one in the package
+
+# Author: Yann E. MORIN <yann.morin.1998@free.fr>
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+NAME=tvheadend
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+
+[ -f "${DAEMON}" -a -x "${DAEMON}" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r "/etc/default/${NAME}" ] && . "/etc/default/${NAME}"
+
+ARGS="-f"
+[ -z "${TVH_USER}"      ] || ARGS="${ARGS} -u ${TVH_USER}"
+[ -z "${TVH_GROUP}"     ] || ARGS="${ARGS} -g ${TVH_GROUP}"
+[ -z "${TVH_ADAPTERS}"  ] || ARGS="${ARGS} -a ${TVH_ADAPTERS}"
+[ -z "${TVH_HTTP_PORT}" ] || ARGS="${ARGS} -w ${TVH_HTTP_PORT}"
+[ -z "${TVH_HTSP_PORT}" ] || ARGS="${ARGS} -e ${TVH_HTSP_PORT}"
+[ "${TVH_DEBUG}" = "1"  ] && ARGS="${ARGS} -s"
+
+case "$1" in
+    start)
+        printf "Starting TVHeadend daemon: "
+        if start-stop-daemon -S -q -p ${PIDFILE} -m --exec "${DAEMON}" -- ${ARGS}; then
+            printf "OK\n"
+        else
+            printf "failed\n"
+        fi
+        ;;
+    stop)
+        printf "Stoping TVHeadend daemon: "
+        start-stop-daemon -K -q -p ${PIDFILE} -s TERM
+        sleep 2
+        if start-stop-daemon -K -q -p ${PIDFILE} -t; then
+            printf "failed, killing: "
+            start-stop-daemon -K -q -p ${PIDFILE} -s KILL -o
+        fi
+        printf "OK\n"
+        ;;
+    restart|force-reload)
+        "${0}" stop
+        sleep 2
+        "${0}" stop
+        ;;
+    *)
+        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+
+:
diff --git a/package/tvheadend/accesscontrol.1 b/package/tvheadend/accesscontrol.1
new file mode 100644
index 0000000000..b920943b51
--- /dev/null
+++ b/package/tvheadend/accesscontrol.1
@@ -0,0 +1,13 @@
+{
+        "enabled": 1,
+        "username": "admin",
+        "password": "admin",
+        "comment": "TVHeadend admin user",
+        "prefix": "0.0.0.0/0",
+        "streaming": 1,
+        "dvr": 1,
+        "dvrallcfg": 1,
+        "webui": 1,
+        "admin": 1,
+        "id": "1"
+}
diff --git a/package/tvheadend/etc.default.tvheadend b/package/tvheadend/etc.default.tvheadend
new file mode 100644
index 0000000000..c769055835
--- /dev/null
+++ b/package/tvheadend/etc.default.tvheadend
@@ -0,0 +1,7 @@
+# Once we have a real user, we'll use it
+TVH_USER=root
+TVH_GROUP=root
+#TVH_ADAPTERS=
+#TVH_HTTP_PORT=9981
+#TVH_HTSP_PORT=9982
+#TVH_DEBUG=1
diff --git a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
new file mode 100644
index 0000000000..50bc4b69d2
--- /dev/null
+++ b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
@@ -0,0 +1,60 @@
+Do not download transponder data as part of the build
+
+If dvb-scan is enabled, tvheadend will download the transponders data
+from the dvb-apps package. This does not play well with buildroot.
+
+Instead, we rely on the dvb-apps package to install those files, so
+it is no longer needed to install those as part of tvheadend.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN tvheadend-v3.3.orig//configure tvheadend-v3.3/configure
+--- tvheadend-v3.3.orig//configure	2012-09-25 15:32:31.000000000 +0200
++++ tvheadend-v3.3/configure	2012-12-28 17:17:23.580253413 +0100
+@@ -96,13 +96,14 @@
+ #
+ # DVB scan
+ #
+-if enabled linuxdvb && enabled dvbscan; then
+-  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then
+-    echo -n "Fetching dvb-scan files... "
+-    ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
+-    echo "done"
+-  fi
+-fi
++# For buildroot, we already installed those files via the dvb-apps package
++#if enabled linuxdvb && enabled dvbscan; then
++#  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then
++#    echo -n "Fetching dvb-scan files... "
++#    ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
++#    echo "done"
++#  fi
++#fi
+ 
+ # ###########################################################################
+ # Write config
+diff -durN tvheadend-v3.3.orig//Makefile tvheadend-v3.3/Makefile
+--- tvheadend-v3.3.orig//Makefile	2012-09-25 15:32:31.000000000 +0200
++++ tvheadend-v3.3/Makefile	2012-12-28 17:17:47.573497346 +0100
+@@ -180,7 +180,7 @@
+ SRCS-${CONFIG_BUNDLE}     += bundle.c
+ BUNDLES-yes               += docs/html docs/docresources src/webui/static
+ BUNDLES-yes               += data/conf
+-BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
++#BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
+ BUNDLES                    = $(BUNDLES-yes)
+ 
+ #
+diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk
+--- tvheadend-v3.3.orig//support/posix.mk	2012-09-25 15:32:31.000000000 +0200
++++ tvheadend-v3.3/support/posix.mk	2012-12-28 17:19:28.903121722 +0100
+@@ -12,7 +12,8 @@
+ 		mkdir -p ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
+ 		cp -r $$bundle/*  ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
+ 	done
+-
++	mkdir -p ${DESTDIR}${datadir}/tvheadend/data
++	ln -s /usr/share/dvb-apps/scan ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
+ 
+ uninstall:
+ 	rm -f ${DESTDIR}${bindir)/tvheadend
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
new file mode 100644
index 0000000000..51007812cf
--- /dev/null
+++ b/package/tvheadend/tvheadend.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# tvheadend
+#
+##############################################################
+
+TVHEADEND_VERSION           = v3.3
+TVHEADEND_SITE              = http://github.com/tvheadend/tvheadend/tarball/$(TVHEADEND_VERSION)
+TVHEADEND_LICENSE           = GPLv3+
+TVHEADEND_LICENSE_FILES     = LICENSE
+TVHEADEND_DEPENDENCIES      = host-pkgconf host-python openssl
+
+ifeq ($(BR2_PACKAGE_AVAHI),y)
+TVHEADEND_DEPENDENCIES     += avahi
+endif
+
+#----------------------------------------------------------------------------
+# tvheadend is a little smuggler and thief! ;-)
+# During the ./configure, it downloads some files from the dvb-apps
+# package, so it has a list of pre-scanned tunner configurations.
+# For buildroot, we add a patch that avoids doing that, but uses the
+# scan files installed by the dvb-apps package
+TVHEADEND_DEPENDENCIES     += dvb-apps
+
+#----------------------------------------------------------------------------
+# To run tvheadend, we need:
+#  - a startup script, and its config file
+#  - a default DB with a tvheadend admin
+define TVHEADEND_INSTALL_DB
+	$(INSTALL) -D package/tvheadend/accesscontrol.1     \
+	              $(TARGET_DIR)/root/.hts/tvheadend/accesscontrol/1
+endef
+TVHEADEND_POST_INSTALL_TARGET_HOOKS  = TVHEADEND_INSTALL_DB
+
+define TVHEADEND_INSTALL_INIT_SYSV
+	$(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend
+	$(INSTALL) -D package/tvheadend/S99tvheadend          $(TARGET_DIR)/etc/init.d/S99tvheadend
+endef
+
+#----------------------------------------------------------------------------
+# tvheadend is not an autotools-based package, but it is possible to
+# call its ./configure script as if it were an autotools one.
+$(eval $(autotools-package))

From 7665bab422e79a252a4a45cfd696c34a19dabfdf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 01:52:35 +0000
Subject: [PATCH 3709/6849] nettle: fix missing link to libm

nettle-benchmark uses ldexp without explicitly linking to libm, fixes:
http://autobuild.buildroot.net/results/c8e64fabcb98b1ff4bf737e2181b7cf2ae731550

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...Added-lm-when-linking-nettle-benchmark.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch

diff --git a/package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch b/package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch
new file mode 100644
index 0000000000..ca4d639768
--- /dev/null
+++ b/package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch
@@ -0,0 +1,17 @@
+Added -lm when linking nettle-benchmark.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff --git a/examples/Makefile.in b/examples/Makefile.in
+index 909fdda..3becd08 100644
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
+@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+ PRE_LDFLAGS = -L..
+ 
+ OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
+-BENCH_LIBS = @BENCH_LIBS@
++BENCH_LIBS = @BENCH_LIBS@ -lm
+ 
+ RSA_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \
+ 	      rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT)

From 01ac10e0f649f4bb322c3235648da3f04e0b6a57 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 01:52:36 +0000
Subject: [PATCH 3710/6849] gnutls: fix legal-info

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index e27c1a3587..0166a74155 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -8,7 +8,7 @@ GNUTLS_VERSION = 3.1.5
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_LICENSE = GPLv3+ LGPLv3
-GNUTLS_LICENSE_FILES = COPYING lib/COPYING
+GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER
 GNUTLS_DEPENDENCIES = host-pkgconf nettle $(if $(BR2_PACKAGE_ZLIB),zlib)
 GNUTLS_CONF_OPT = --with-libnettle-prefix=$(STAGING_DIR)/usr --disable-rpath
 GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \

From 2c5b4ddc1932e7dedec1e412a5c5465f4fbe6f8b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 03:06:11 +0000
Subject: [PATCH 3711/6849] wavpack: fix broken link on newer binutils

Newer versions of binutils (2.22+) default to --no-copy-dt-needed hence
all the used libraries must be explicitly named.
This is accounted for in the source configure script but not in the
compiled form so we just need to autoreconf it.

[Peter: add comment why autoconf is needed]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/wavpack/wavpack.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
index 4b1c59e762..cd9b4f78bb 100644
--- a/package/multimedia/wavpack/wavpack.mk
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -8,9 +8,10 @@ WAVPACK_VERSION = 4.60.1
 WAVPACK_SITE = http://www.wavpack.com
 WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
 WAVPACK_INSTALL_STAGING = YES
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
-WAVPACK_DEPENDENCIES += libiconv
-endif
+# configure not up to date
+WAVPACK_AUTORECONF = YES
+WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),libiconv)
+WAVPACK_LICENSE = BSD-3c
+WAVPACK_LICENSE_FILES = license.txt
 
 $(eval $(autotools-package))

From 3874b04f73ae81ab20fabb648ea78bddc4219ef6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 06:29:04 +0000
Subject: [PATCH 3712/6849] taglib: bump to version 1.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/taglib/Config.in | 2 +-
 package/taglib/taglib.mk | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/taglib/Config.in b/package/taglib/Config.in
index d172c34ade..2777d0d90e 100644
--- a/package/taglib/Config.in
+++ b/package/taglib/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_TAGLIB
           and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and
           Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files.
 
-	  http://developer.kde.org/~wheeler/taglib.html
+	  http://taglib.github.com
 
 config BR2_PACKAGE_TAGLIB_MP4
 	depends on BR2_PACKAGE_TAGLIB
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 268318e4ae..e1e16947f8 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 
-TAGLIB_VERSION = 1.7.1
-TAGLIB_SOURCE = taglib-$(TAGLIB_VERSION).tar.gz
-TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src
+TAGLIB_VERSION = 1.8
+TAGLIB_SITE = http://github.com/downloads/taglib/taglib
 TAGLIB_INSTALL_STAGING = YES
+TAGLIB_LICENSE = LGPLv2.1 MPL
+TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
 
 ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y)
 TAGLIB_CONF_OPT += -DWITH_ASF=ON

From 6a497e3d8c07d816ec5b8d612d4f7563dff9e756 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 06:29:05 +0000
Subject: [PATCH 3713/6849] ruby: bump to version 1.9.3-p362

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby-configure.patch | 30 ------------------------------
 package/ruby/ruby.mk              | 10 +++++-----
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 package/ruby/ruby-configure.patch

diff --git a/package/ruby/ruby-configure.patch b/package/ruby/ruby-configure.patch
deleted file mode 100644
index 0077a67616..0000000000
--- a/package/ruby/ruby-configure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nura ruby-1.9.2-p0.orig/configure.in ruby-1.9.2-p0/configure.in
---- ruby-1.9.2-p0.orig/configure.in	2010-08-14 05:11:59.000000000 -0300
-+++ ruby-1.9.2-p0/configure.in	2010-11-04 15:46:22.478191926 -0300
-@@ -1410,7 +1410,25 @@
- fi
- 
- AC_FUNC_GETPGRP
--AC_FUNC_SETPGRP
-+
-+dnl AC_FUNC_SETPGRP does not work if cross compiling
-+dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
-+if test "$cross_compiling" = no; then
-+  AC_FUNC_SETPGRP
-+else
-+  AC_CACHE_CHECK([whether setpgrp takes no argument], ac_cv_func_setpgrp_void,
-+    [AC_TRY_COMPILE([
-+#include <unistd.h>
-+], [
-+  if (setpgrp(1,1) == -1)
-+    exit (0);
-+  else
-+    exit (1);
-+], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
-+if test $ac_cv_func_setpgrp_void = yes; then
-+  AC_DEFINE(SETPGRP_VOID, 1)
-+fi
-+fi
- 
- AC_C_BIGENDIAN
- AC_C_CONST
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index a5b8cde31a..ee1f9ed287 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,15 +4,15 @@
 #
 #############################################################
 
-RUBY_VERSION = 1.9.2-p320
+RUBY_VERSION = 1.9.3-p362
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
-RUBY_AUTORECONF = YES
-HOST_RUBY_AUTORECONF = YES
-RUBY_DEPENDENCIES = host-ruby
-HOST_RUBY_DEPENDENCIES =
+RUBY_DEPENDENCIES = host-pkgconf host-ruby
+HOST_RUBY_DEPENDENCIES = host-pkgconf
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
 HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
+RUBY_LICENSE = Ruby
+RUBY_LICENSE_FILES = LEGAL
 
 # Force optionals to build before we do
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)

From d21a858792e4646d7b366387608400ff29bca575 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:27 +0000
Subject: [PATCH 3714/6849] docs/manual: add a new 'Details on Buildroot
 configuration' section

As discussed with Samuel Martin, there are a few questions about some
Buildroot configuration aspects that come very often on the IRC
channel and on the mailing-list. Topics such as the /dev management
and init systems are often raised.

Therefore, this patch adds a new section that provides details about
the Buildroot configuration possibilities. It does not aim at
replacing the help text of each configuration option, but rather to
complement them by providing more background. Having those
informations in the manual will also make it easier for us to point
newcomers to the right place in the documentation when they have
questions.

Note that this section will replace the "Embedded basics" section that
comes way too late in the manual. This is done in a followup commit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/configure.txt    | 151 +++++++++++++++++++++++++++++++++++
 docs/manual/working-with.txt |   2 +
 2 files changed, 153 insertions(+)
 create mode 100644 docs/manual/configure.txt

diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
new file mode 100644
index 0000000000..2c7987ddaa
--- /dev/null
+++ b/docs/manual/configure.txt
@@ -0,0 +1,151 @@
+// -*- mode:doc -*- ;
+
+[[configure]]
+Details on Buildroot configuration
+----------------------------------
+
+All the configuration options in +make *config+ have a help text
+providing details about the option. However, a number of topics
+require additional details that cannot easily be covered in the help
+text and are there covered in the following sections.
+
+/dev management
+~~~~~~~~~~~~~~~
+
+On a Linux system, the +/dev+ directory contains special files, called
+_device files_, that allow userspace applications to access the
+hardware devices managed by the Linux kernel. Without these _device
+files_, your userspace applications would not be able to use the
+hardware devices, even if they are properly recognized by the Linux
+kernel.
+
+Under +System configuration+, +/dev management+, Buildroot offers four
+different solutions to handle the +/dev+ directory :
+
+ * The first solution is *Static using device table*. This is the old
+   classical way of handling device files in Linux. With this method,
+   the device files are persistently stored in the root filesystem
+   (i.e they persist accross reboots), and there is nothing that will
+   automatically create and remove those device files when hardware
+   devices are added or removed from the system. Buildroot therefore
+   creates a standard set of device files using a _device table_, the
+   default one being stored in +system/device_table_dev.txt+ in the
+   Buildroot source code. This file is processed when Buildroot
+   generates the final root filesystem image, and the _device files_
+   are therefore not visible in the +output/target+ directory. The
+   +BR2_ROOTFS_STATIC_DEVICE_TABLE+ option allows to change the
+   default device table used by Buildroot, or to add an additional
+   device table, so that additional _device files_ are created by
+   Buildroot during the build. So, if you use this method, and a
+   _device file_ is missing in your system, you can for example create
+   a +board/<yourcompany>/<yourproject>/device_table_dev.txt+ file
+   that contains the description of your additional _device files_,
+   and then you can set +BR2_ROOTFS_STATIC_DEVICE_TABLE+ to
+   +system/device_table_dev.txt
+   board/<yourcompany>/<yourproject>/device_table_dev.txt+. For more
+   details about the format of the device table file, see
+   xref:makedev-syntax[].
+
+ * The second solution is *Dynamic using devtmpfs only*. _devtmpfs_ is
+   a virtual filesystem inside the Linux kernel that has been
+   introduced in kernel 2.6.32 (if you use an older kernel, it is not
+   possible to use this option). When mounted in +/dev+, this virtual
+   filesystem will automatically make _device files_ appear and
+   disappear as hardware devices are added and removed from the
+   system. This filesystem is not persistent accross reboots: it is
+   filled dynamically by the kernel. Using _devtmpfs_ requires the
+   following kernel configuration options to be enabled:
+   +CONFIG_DEVTMPFS+ and +CONFIG_DEVTMPFS_MOUNT+. When Buildroot is in
+   charge of building the Linux kernel for your embedded device, it
+   makes sure that those two options are enabled. However, if you
+   build your Linux kernel outside of Buildroot, then it is your
+   responsability to enable those two options (if you fail to do so,
+   your Buildroot system will not boot).
+
+ * The third solution is *Dynamic using mdev*. This method also relies
+   on the _devtmpfs_ virtual filesystem detailed above (so the
+   requirement to have +CONFIG_DEVTMPFS+ and +CONFIG_DEVTMPFS_MOUNT+
+   enabled in the kernel configuration still apply), but adds the
+   +mdev+ userspace utility on top of it. +mdev+ is a program part of
+   Busybox that the kernel will call every time a device is added or
+   removed. Thanks to the +/etc/mdev.conf+ configuration file, +mdev+
+   can be configured to for example, set specific permissions or
+   ownership on a device file, call a script or application whenever a
+   device appears or disappear, etc. Basically, it allows _userspace_
+   to react on device addition and removal events. +mdev+ can for
+   example be used to automatically load kernel modules when devices
+   appear on the system. +mdev+ is also important if you have devices
+   that require a firmware, as it will be responsible for pushing the
+   firmware contents to the kernel. +mdev+ is a lightweight
+   implementation (with fewer features) of +udev+. For more details
+   about +mdev+ and the syntax of its configuration file, see
+   http://git.busybox.net/busybox/tree/docs/mdev.txt.
+
+ * The fourth solution is *Dynamic using udev*. This method also
+   relies on the _devtmpfs_ virtual filesystem detailed above, but
+   adds the +udev+ userspace daemon on top of it. +udev+ is a daemon
+   that runs in the background, and gets called by the kernel when a
+   device gets added or removed from the system. It is a more
+   heavyweight solution than +mdev+, but provides higher flexibility
+   and is sometimes mandatory for some system components (systemd for
+   example). +udev+ is the mechanism used in most desktop Linux
+   distributions. For more details about +udev+, see
+   http://en.wikipedia.org/wiki/Udev.
+
+The Buildroot developers recommandation is to start with the *Dynamic
+using devtmpfs only* solution, until you have the need for userspace
+to be notified when devices are added/removed, or if firmwares are
+needed, in which case *Dynamic using mdev* is usually a good solution.
+
+init system
+~~~~~~~~~~~
+
+The _init_ program is the first userspace program started by the
+kernel (it carries the PID number 1), and is responsible for starting
+the userspace services and programs (for example: web server,
+graphical applications, other network servers, etc.).
+
+Buildroot allows to use three different types of init systems, which
+can be chosen from +System configuration+, +Init system+:
+
+ * The first solution is *Busybox*. Amongst many programs, Busybox has
+   an implementation of a basic +init+ program, which is sufficient
+   for most embedded systems. Enabling the +BR2_INIT_BUSYBOX+ will
+   ensure Busybox will build and install its +init+ program. This is
+   the default solution in Buildroot. The Busybox +init+ program will
+   read the +/etc/inittab+ file at boot to know what to do. The syntax
+   of this file can be found in
+   http://git.busybox.net/busybox/tree/examples/inittab (note that
+   Busybox +inittab+ syntax is special: do not use a random +inittab+
+   documentation from the Internet to learn about Busybox
+   +inittab+). The default +inittab+ in Buildroot is stored in
+   +system/skeleton/etc/inittab+. Apart from mounting a few important
+   filesystems, the main job the default inittab does is to start the
+   +/etc/init.d/rcS+ shell script, and start a +getty+ program (which
+   provides a login prompt).
+
+ * The second solution is *systemV*. This solution uses the old
+   traditional _sysvinit_ program, packed in Buildroot in
+   +package/sysvinit+. This was the solution used in most desktop
+   Linux distributions, until they switched to more recent
+   alternatives such as Upstart or Systemd. +sysvinit+ also works with
+   an +inittab+ file (which has a slightly different syntax than the
+   one from Busybox). The default +inittab+ installed with this init
+   solution is located in +package/sysvinit/inittab+.
+
+ * The third solution is *systemd*. +systemd+ is the new generation
+   init system for Linux. It does far more than traditional _init_
+   programs: aggressive parallelization capabilities, uses socket and
+   D-Bus activation for starting services, offers on-demand starting
+   of daemons, keeps track of processes using Linux control groups,
+   supports snapshotting and restoring of the system state,
+   etc. +systemd+ will be useful on relatively complex embedded
+   systems, for example the ones requiring D-Bus and services
+   communicating between each other. It is worth noting that +systemd+
+   brings a fairly big number of large dependencies: +dbus+, +glib+
+   and more. For more details about +systemd+, see
+   http://www.freedesktop.org/wiki/Software/systemd.
+
+The solution recommended by Buildroot developers is to use the
+*Busybox init* as it is sufficient for most embedded
+systems. *systemd* can be used for more complex situations.
diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
index 4ea9239e2b..b62bacdcbf 100644
--- a/docs/manual/working-with.txt
+++ b/docs/manual/working-with.txt
@@ -6,6 +6,8 @@ Working with Buildroot
 This section explains how you can customize Buildroot to fit your
 needs.
 
+include::configure.txt[]
+
 include::make-tips.txt[]
 
 include::customize.txt[]

From 26bc50075dcb9e34c62fa198c32caaae868ee130 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:28 +0000
Subject: [PATCH 3715/6849] docs/manual: Slightly improve the introduction

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/introduction.txt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt
index 9353f8c2b5..a567cec64a 100644
--- a/docs/manual/introduction.txt
+++ b/docs/manual/introduction.txt
@@ -3,11 +3,16 @@
 About Buildroot
 ===============
 
-Buildroot provides a full-featured environment for cross-development.
-Buildroot is able to generate a cross-compilation toolchain, a root
-filesystem, a Linux kernel image and a bootloader for your target.
-Buildroot can be used for any combination of these options,
-independently.
+Buildroot is a tool that simplifies and automates the process of
+building a complete Linux system for an embedded system, using
+cross-compilation.
+
+In order to achieve this, Buildroot is able to generate a
+cross-compilation toolchain, a root filesystem, a Linux kernel image
+and a bootloader for your target. Buildroot can be used for any
+combination of these options, independently (you can for example use
+an existing cross-compilation toolchain, and build only your root
+filesystem with Buildroot).
 
 Buildroot is useful mainly for people working with embedded systems.
 Embedded systems often use processors that are not the regular x86

From 401d323698266468e322471530ee1997835fc335 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:29 +0000
Subject: [PATCH 3716/6849] docs/manual: add details on toolchain configuration

This commit adds a new section

 Working with Buildroot
  -> Details in configuration
    -> Cross-compilation toolchain

that gives a lot of details about our three toolchain backends. It
takes some elements that were previously later in the manual in
"Embedded basics" and in "External toolchain" and combines them with
more details about internal backend and Crosstool-NG backend.

The "Embedded basics" section becomes empty and is therefore
removed. A few elements have been lost in the process, but they were
considered to not be really useful, especially located so far in the
manual.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/advanced.txt           |   2 -
 docs/manual/configure.txt          | 277 +++++++++++++++++++++++++++++
 docs/manual/embedded-basics.txt    | 112 ------------
 docs/manual/external-toolchain.txt |  88 ---------
 docs/manual/going-further.txt      |   2 -
 5 files changed, 277 insertions(+), 204 deletions(-)
 delete mode 100644 docs/manual/embedded-basics.txt
 delete mode 100644 docs/manual/external-toolchain.txt

diff --git a/docs/manual/advanced.txt b/docs/manual/advanced.txt
index ba6574cac3..314d300987 100644
--- a/docs/manual/advanced.txt
+++ b/docs/manual/advanced.txt
@@ -5,8 +5,6 @@ Advanced usage
 
 include::using-buildroot-toolchain.txt[]
 
-include::external-toolchain.txt[]
-
 include::ccache-support.txt[]
 
 include::download-location.txt[]
diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index 2c7987ddaa..65e0eeb2f8 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -9,6 +9,283 @@ providing details about the option. However, a number of topics
 require additional details that cannot easily be covered in the help
 text and are there covered in the following sections.
 
+Cross-compilation toolchain
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A compilation toolchain is the set of tools that allows you to compile
+code for your system. It consists of a compiler (in our case, +gcc+),
+binary utils like assembler and linker (in our case, +binutils+) and a
+C standard library (for example
+http://www.gnu.org/software/libc/libc.html[GNU Libc],
+http://www.uclibc.org/[uClibc]).
+
+The system installed on your development station certainly already has
+a compilation toolchain that you can use to compile an application
+that runs on your system. If you're using a PC, your compilation
+toolchain runs on an x86 processor and generates code for an x86
+processor. Under most Linux systems, the compilation toolchain uses
+the GNU libc (glibc) as the C standard library. This compilation
+toolchain is called the "host compilation toolchain". The machine on
+which it is running, and on which you're working, is called the "host
+system" footnote:[This terminology differs from what is used by GNU
+configure, where the host is the machine on which the application will
+run (which is usually the same as target)].
+
+The compilation toolchain is provided by your distribution, and
+Buildroot has nothing to do with it (other than using it to build a
+cross-compilation toolchain and other tools that are run on the
+development host).
+
+As said above, the compilation toolchain that comes with your system
+runs on and generates code for the processor in your host system. As
+your embedded system has a different processor, you need a
+cross-compilation toolchain - a compilation toolchain that runs on
+your _host system_ but generates code for your _target system_ (and
+target processor). For example, if your host system uses x86 and your
+target system uses ARM, the regular compilation toolchain on your host
+runs on x86 and generates code for x86, while the cross-compilation
+toolchain runs on x86 and generates code for ARM.
+
+Buildroot provides different solutions to build, or use existing
+cross-compilation toolchains:
+
+ * The *internal toolchain backend*, called +Buildroot toolchain+ in
+   the configuration interface.
+
+ * The *external toolchain backend*, called +External toolchain+ in
+   the configuration interface.
+
+ * The *Crosstool-NG toolchain backend*, called +Crosstool-NG
+   toolchain+ in the configuration interface.
+
+The choice between these three solutions is done using the +Toolchain
+Type+ option in the +Toolchain+ menu. Once one solution has been
+chosen, a number of configuration options appear, they are detailed in
+the following sections.
+
+Internal toolchain backend
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The _internal toolchain backend_ is the backend where Buildroot builds
+by itself a cross-compilation toolchain, before building the userspace
+applications and libraries for your target embedded system.
+
+This backend is the historical backend of Buildroot, and is limited to
+the usage of the http://www.uclibc.org[uClibc C library] (i.e, the
+_glibc_ and _eglibc_ C libraries are not supported by this backend,
+see the _External toolchain backend_ and _Crosstool-NG toolchain
+backend_ for solutions to use either _glibc_ or _eglibc_).
+
+Once you have selected this backend, a number of options appear. The
+most important ones allow to:
+
+ * Change the version of the Linux kernel headers used to build the
+   toolchain. This item deserves a few explanations. In the process of
+   building a cross-compilation toolchain, the C library is being
+   built. This library provides the interface between userspace
+   applications and the Linux kernel. In order to know how to "talk"
+   to the Linux kernel, the C library needs to have access to the
+   _Linux kernel headers_ (i.e, the +.h+ files from the kernel), which
+   define the interface between userspace and the kernel (system
+   calls, data structures, etc.). Since this interface is backward
+   compatible, the version of the Linux kernel headers used to build
+   your toolchain do not need to match _exactly_ the version of the
+   Linux kernel you intend to run on your embedded system. They only
+   need to have a version equal or older to the version of the Linux
+   kernel you intend to run. If you use kernel headers that are more
+   recent than the Linux kernel you run on your embedded system, then
+   the C library might be using interfaces that are not provided by
+   your Linux kernel.
+
+ * Change the version and the configuration of the uClibc C
+   library. The default options are usually fine. However, if you
+   really need to specifically customize the configuration of your
+   uClibc C library, you can pass a specific configuration file
+   here. Or alternatively, you can run the +make uclibc-menuconfig+
+   command to get access to uClibc's configuration interface. Note
+   that all packages in Buildroot are tested against the default
+   uClibc configuration bundled in Buildroot: if you deviate from this
+   configuration by removing features from uClibc, some packages may
+   no longer build.
+
+ * Change the version of the GCC compiler and binutils.
+
+ * Select a number of toolchain options: whether the toolchain should
+   have largefile support (i.e support for files larger than 2 GB on
+   32 bits systems), IPv6 support, RPC support (used mainly for NFS),
+   wide-char support, locale support (for internationalization), C++
+   support, thread support. Depending on which options you choose, the
+   number of userspace applications and libraries visible in Buildroot
+   menus will change: many applications and libraries require certain
+   toolchain options to be enabled. Most packages show a comment when
+   a certain toolchain option is required to be able to enable those
+   packages.
+
+It is worth noting that whenever one of those options is modified,
+then the entire toolchain and system must be rebuilt. See
+xref:full-rebuild[].
+
+Advantages of this backend:
+
+* Well integrated with Buildroot
+* Fast, only builds what's necessary
+
+Drawbacks of this backend:
+
+* Rebuilding the toolchain is needed when doing +make clean+, which
+  takes time. If you're trying to reduce your build time, consider
+  using the _External toolchain backend_.
+* Limited to the _uClibc_ C library.
+
+External toolchain backend
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The _external toolchain backend_ allows to use existing pre-built
+cross-compilation toolchains. Buildroot knows about a number of
+well-known cross-compilation toolchains (from
+http://www.linaro.org[Linaro] for ARM,
+http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/[Sourcery
+CodeBench] for ARM, x86, x86-64, PowerPC, MIPS and SuperH,
+https://blackfin.uclinux.org/gf/project/toolchain[Blackfin toolchains
+from ADI], http://git.xilinx.com/[Xilinx toolchains for Microblaze],
+etc.) and is capable of downloading them automatically, or it can be
+pointed to a custom toolchain, either available for download or
+installed locally.
+
+Then, you have three solutions to use an external toolchain:
+
+* Use a predefined external toolchain profile, and let Buildroot
+  download, extract and install the toolchain. Buildroot already knows
+  about a few CodeSourcery, Linaro, Blackfin and Xilinx toolchains.
+  Just select the toolchain profile in +Toolchain+ from the
+  available ones. This is definitely the easiest solution.
+
+* Use a predefined external toolchain profile, but instead of having
+  Buildroot download and extract the toolchain, you can tell Buildroot
+  where your toolchain is already installed on your system. Just
+  select the toolchain profile in +Toolchain+ through the available
+  ones, unselect +Download toolchain automatically+, and fill the
+  +Toolchain path+ text entry with the path to your cross-compiling
+  toolchain.
+
+* Use a completely custom external toolchain. This is particularly
+  useful for toolchains generated using crosstool-NG. To do this,
+  select the +Custom toolchain+ solution in the +Toolchain+ list. You
+  need to fill the +Toolchain path+, +Toolchain prefix+ and +External
+  toolchain C library+ options. Then, you have to tell Buildroot what
+  your external toolchain supports. If your external toolchain uses
+  the 'glibc' library, you only have to tell whether your toolchain
+  supports C\+\+ or not and whether it has built-in RPC support. If
+  your external toolchain uses the 'uClibc'
+  library, then you have to tell Buildroot if it supports largefile,
+  IPv6, RPC, wide-char, locale, program invocation, threads and
+  C++. At the beginning of the execution, Buildroot will tell you if
+  the selected options do not match the toolchain configuration.
+
+Our external toolchain support has been tested with toolchains from
+CodeSourcery and Linaro, toolchains generated by
+http://crosstool-ng.org[crosstool-NG], and toolchains generated by
+Buildroot itself. In general, all toolchains that support the
+'sysroot' feature should work. If not, do not hesitate to contact the
+developers.
+
+We do not support toolchains from the
+http://www.denx.de/wiki/DULG/ELDK[ELDK] of Denx, for two reasons:
+
+* The ELDK does not contain a pure toolchain (i.e just the compiler,
+  binutils, the C and C++ libraries), but a toolchain that comes with
+  a very large set of pre-compiled libraries and programs. Therefore,
+  Buildroot cannot import the 'sysroot' of the toolchain, as it would
+  contain hundreds of megabytes of pre-compiled libraries that are
+  normally built by Buildroot.
+
+* The ELDK toolchains have a completely non-standard custom mechanism
+  to handle multiple library variants. Instead of using the standard
+  GCC 'multilib' mechanism, the ARM ELDK uses different symbolic links
+  to the compiler to differentiate between library variants (for ARM
+  soft-float and ARM VFP), and the PowerPC ELDK compiler uses a
+  +CROSS_COMPILE+ environment variable. This non-standard behaviour
+  makes it difficult to support ELDK in Buildroot.
+
+We also do not support using the distribution toolchain (i.e the
+gcc/binutils/C library installed by your distribution) as the
+toolchain to build software for the target. This is because your
+distribution toolchain is not a "pure" toolchain (i.e only with the
+C/C++ library), so we cannot import it properly into the Buildroot
+build environment. So even if you are building a system for a x86 or
+x86_64 target, you have to generate a cross-compilation toolchain with
+Buildroot or crosstool-NG.
+
+If you want to generate a custom toolchain for your project, that can
+be used as an external toolchain in Buildroot, our recommandation is
+definitely to build it with http://crosstool-ng.org[crosstool-NG]. We
+recommend to build the toolchain separately from Buildroot, and then
+_import_ it in Buildroot using the external toolchain backend.
+
+Advantages of this backend:
+
+* Allows to use well-known and well-tested cross-compilation
+  toolchains.
+
+* Avoids the build time of the cross-compilation toolchain, which is
+  often very significant in the overall build time of an embedded
+  Linux system.
+
+* Not limited to uClibc: glibc and eglibc toolchains are supported.
+
+Drawbacks of this backend:
+
+* If your pre-built external toolchain has a bug, may be hard to get a
+  fix from the toolchain vendor, unless you build your external
+  toolchain by yourself using Crosstool-NG.
+
+Crosstool-NG toolchain backend
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The _Crosstool-NG toolchain backend_ integrates the
+http://crosstool-ng.org[Crosstool-NG] project with
+Buildroot. Crosstool-NG is a highly-configurable, versatile and
+well-maintained tool to build cross-compilation toolchains.
+
+If you select the +Crosstool-NG toolchain+ option in +Toolchain Type+,
+then you will be offered to:
+
+ * Choose which C library you want to use. Crosstool-NG supports the
+   three most important C libraries used in Linux systems: glibc,
+   eglibc and uClibc
+
+ * Choose a custom Crosstool-NG configuration file. Buildroot has its
+   own default configuration file (one per C library choice), but you
+   can provide your own. Another option is to run +make
+   ctng-menuconfig+ to get access to the Crosstool-NG configuration
+   interface. However, note that all Buildroot packages have only been
+   tested with the default Crosstool-NG configurations.
+
+ * Choose a number of toolchain options (rather limited if glibc or
+   eglibc are used, or numerous if uClibc is used)
+
+When you will start the Buildroot build process, Buildroot will
+download and install the Crosstool-NG tool, build and install its
+required dependencies, and then run Crosstool-NG with the provided
+configuration.
+
+Advantages of this backend:
+
+* Not limited to uClibc: glibc and eglibc are supported.
+
+* Vast possibilities of toolchain configuration.
+
+Drawbacks of this backend:
+
+* Crosstool-NG is not perfectly integrated with Buildroot. For
+  example, Crosstool-NG has its own download infrastructure, not
+  integrated with the one in Buildroot (for example a Buildroot +make
+  source+ will not download all the source code tarballs needed by
+  Crosstool-NG).
+
+* The toolchain is completely rebuilt from scratch if you do a +make
+  clean+.
+
 /dev management
 ~~~~~~~~~~~~~~~
 
diff --git a/docs/manual/embedded-basics.txt b/docs/manual/embedded-basics.txt
deleted file mode 100644
index fdadf62fcd..0000000000
--- a/docs/manual/embedded-basics.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- mode:doc; -*-
-
-Embedded system basics
-----------------------
-
-When developing an embedded system, there are a number of choices to
-address:
-
-* the cross-toolchain: target architecture/C library/...
-* the bootloader
-* kernel options
-* the device management
-* the init system
-* the package selection (busybox vs. "real" programs, ...)
-* ...
-
-Some of these may be influenced by the target hardware.
-
-Some of the choices may also add some constraints when you develop the
-final application for which your target is designed (e.g. some
-functions may be provided by some C libraries and missing in some
-others, ...). So, these choices should be carefully made.
-
-Buildroot allows you to set most of these options to fit your needs.
-
-Moreover, Buildroot provides an infrastructure for reproducing the
-build process of your kernel, cross-toolchain, and embedded root
-filesystem. Being able to reproduce the build process will be useful
-when a component needs to be patched or updated or when another person
-is supposed to take over the project.
-
-[[cross-compilation-and-cross-toolchain]]
-Cross-compilation & cross-toolchain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A compilation toolchain is the set of tools that allows you to compile
-code for your system. It consists of a compiler (in our case, +gcc+),
-binary utils like assembler and linker (in our case, +binutils+) and a
-C standard library (for example
-http://www.gnu.org/software/libc/libc.html[GNU Libc],
-http://www.uclibc.org/[uClibc] or
-http://www.fefe.de/dietlibc/[dietlibc]).
-
-The system installed on your development station certainly already has
-a compilation toolchain that you can use to compile an application
-that runs on your system. If you're using a PC, your compilation
-toolchain runs on an x86 processor and generates code for an x86
-processor. Under most Linux systems, the compilation toolchain uses
-the GNU libc (glibc) as the C standard library. This compilation
-toolchain is called the "host compilation toolchain". The machine on
-which it is running, and on which you're working, is called the "host
-system" footnote:[This terminology differs from what is used by GNU
-configure, where the host is the machine on which the application will
-run (which is usually the same as target)].
-
-The compilation toolchain is provided by your distribution, and
-Buildroot has nothing to do with it (other than using it to build a
-cross-compilation toolchain and other tools that are run on the
-development host).
-
-As said above, the compilation toolchain that comes with your system
-runs on and generates code for the processor in your host system. As
-your embedded system has a different processor, you need a
-cross-compilation toolchain - a compilation toolchain that runs on
-your _host system_ but generates code for your _target system_ (and
-target processor). For example, if your host system uses x86 and your
-target system uses ARM, the regular compilation toolchain on your host
-runs on x86 and generates code for x86, while the cross-compilation
-toolchain runs on x86 and generates code for ARM.
-
-Even if your embedded system uses an x86 processor, you might be
-interested in Buildroot for two reasons:
-
-* The compilation toolchain on your host certainly uses the GNU Libc
-  which is a complete but huge C standard library. Instead of using
-  GNU Libc on your target system, you can use uClibc which is a tiny C
-  standard library. If you want to use this C library, then you need a
-  compilation toolchain to generate binaries linked with it. Buildroot
-  can do that for you.
-
-* Buildroot automates the building of a root filesystem with all
-  needed tools like busybox. That makes it much easier than doing it
-  by hand.
-
-You might wonder why such a tool is needed when you can compile +gcc+,
-+binutils+, +uClibc+ and all the other tools by hand. Of course doing
-so is possible, but dealing with all of the configure options and
-problems of every +gcc+ or +binutils+ version is very time-consuming
-and uninteresting.  Buildroot automates this process through the use
-of Makefiles and has a collection of patches for each +gcc+ and
-+binutils+ version to make them work on most architectures.
-
-Buildroot offers a number of options and settings that can be tuned
-when defining the cross-toolchain (refer to xref:toolchain-custom[]).
-
-[[bootloader]]
-Bootloader
-~~~~~~~~~~
-
-TODO
-
-[[device-management]]
-Device management
-~~~~~~~~~~~~~~~~~
-
-TODO
-
-[[init-system]]
-Init system
-~~~~~~~~~~~
-
-TODO
diff --git a/docs/manual/external-toolchain.txt b/docs/manual/external-toolchain.txt
deleted file mode 100644
index 6124fe4de3..0000000000
--- a/docs/manual/external-toolchain.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- mode:doc -*- ;
-
-[[external-toolchain]]
-Using an external toolchain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Using an already existing toolchain is useful for different
-reasons:
-
-* you already have a toolchain that is known to work for your specific
-  CPU
-
-* you want to speed up the Buildroot build process by skipping the
-  long toolchain build part
-
-* the toolchain generation feature of Buildroot is not sufficiently
-  flexible for you (for example if you need to generate a system with
-  'glibc' instead of 'uClibc')
-
-Buildroot supports using existing toolchains through a mechanism
-called 'external toolchain'. The external toolchain mechanism is
-enabled in the +Toolchain+ menu, by selecting +External toolchain+ in
-+Toolchain type+.
-
-Then, you have three solutions to use an external toolchain:
-
-* Use a predefined external toolchain profile, and let Buildroot
-  download, extract and install the toolchain. Buildroot already knows
-  about a few CodeSourcery, Linaro, Blackfin and Xilinx toolchains.
-  Just select the toolchain profile in +Toolchain+ from the
-  available ones. This is definitely the easiest solution.
-
-* Use a predefined external toolchain profile, but instead of having
-  Buildroot download and extract the toolchain, you can tell Buildroot
-  where your toolchain is already installed on your system. Just
-  select the toolchain profile in +Toolchain+ through the available
-  ones, unselect +Download toolchain automatically+, and fill the
-  +Toolchain path+ text entry with the path to your cross-compiling
-  toolchain.
-
-* Use a completely custom external toolchain. This is particularly
-  useful for toolchains generated using crosstool-NG. To do this,
-  select the +Custom toolchain+ solution in the +Toolchain+ list. You
-  need to fill the +Toolchain path+, +Toolchain prefix+ and +External
-  toolchain C library+ options. Then, you have to tell Buildroot what
-  your external toolchain supports. If your external toolchain uses
-  the 'glibc' library, you only have to tell whether your toolchain
-  supports C\+\+ or not and whether it has built-in RPC support. If
-  your external toolchain uses the 'uClibc'
-  library, then you have to tell Buildroot if it supports largefile,
-  IPv6, RPC, wide-char, locale, program invocation, threads and
-  C++. At the beginning of the execution, Buildroot will tell you if
-  the selected options do not match the toolchain configuration.
-
-
-Our external toolchain support has been tested with toolchains from
-CodeSourcery and Linaro, toolchains generated by
-http://crosstool-ng.org[crosstool-NG], and toolchains generated by
-Buildroot itself. In general, all toolchains that support the
-'sysroot' feature should work. If not, do not hesitate to contact the
-developers.
-
-We do not support toolchains from the
-http://www.denx.de/wiki/DULG/ELDK[ELDK] of Denx, for two reasons:
-
-* The ELDK does not contain a pure toolchain (i.e just the compiler,
-  binutils, the C and C++ libraries), but a toolchain that comes with
-  a very large set of pre-compiled libraries and programs. Therefore,
-  Buildroot cannot import the 'sysroot' of the toolchain, as it would
-  contain hundreds of megabytes of pre-compiled libraries that are
-  normally built by Buildroot.
-
-* The ELDK toolchains have a completely non-standard custom mechanism
-  to handle multiple library variants. Instead of using the standard
-  GCC 'multilib' mechanism, the ARM ELDK uses different symbolic links
-  to the compiler to differentiate between library variants (for ARM
-  soft-float and ARM VFP), and the PowerPC ELDK compiler uses a
-  +CROSS_COMPILE+ environment variable. This non-standard behaviour
-  makes it difficult to support ELDK in Buildroot.
-
-We also do not support using the distribution toolchain (i.e the
-gcc/binutils/C library installed by your distribution) as the
-toolchain to build software for the target. This is because your
-distribution toolchain is not a "pure" toolchain (i.e only with the
-C/C++ library), so we cannot import it properly into the Buildroot
-build environment. So even if you are building a system for a x86 or
-x86_64 target, you have to generate a cross-compilation toolchain with
-Buildroot or crosstool-NG.
diff --git a/docs/manual/going-further.txt b/docs/manual/going-further.txt
index 15324c4e24..070e0a33a1 100644
--- a/docs/manual/going-further.txt
+++ b/docs/manual/going-further.txt
@@ -3,8 +3,6 @@
 Going further in Buildroot's innards
 ====================================
 
-include::embedded-basics.txt[]
-
 include::how-buildroot-works.txt[]
 
 include::advanced.txt[]

From 163ec179046b83c3362f288a0589b502ee7610ae Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:30 +0000
Subject: [PATCH 3717/6849] docs/manual: remove FAQ entry about 'depends on'
 vs. 'select'

The FAQ is before the section on package development, and only covers
user issues, not developer issues, so the FAQ entry about 'depends on'
vs. 'select' really doesn't have its place here.

And the 'depends on' vs. 'select' issue is already covered in a later
section, see
http://buildroot.org/downloads/manual/manual.html#depends-on-vs-select.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/faq-troubleshooting.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt
index 5a227028e3..5d9531b121 100644
--- a/docs/manual/faq-troubleshooting.txt
+++ b/docs/manual/faq-troubleshooting.txt
@@ -89,17 +89,6 @@ If you need documentation data on your target anyway, then Buildroot
 is not suitable for your purpose, and you should look for a _real
 distribution_ (see: xref:faq-no-compiler-on-target[]).
 
-[[faq-depends-on-vs-select]]
-+Config.in+: _depends on_ vs _select_
--------------------------------------
-
-When adding a new package to Buildroot, you will most likely have to
-deal with expressing the dependencies of this package.
-
-In the +Config.in+ file, dependencies may be expressed following two
-semantics.
-See xref:depends-on-vs-select[choosing between _depends_ and _select_].
-
 [[faq-why-not-visible-package]]
 Why are some packages not visible in the Buildroot config menu?
 ---------------------------------------------------------------

From 479262599a0a91b9539bcedfe17df6cc651772ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:31 +0000
Subject: [PATCH 3718/6849] docs/manual: remove incorrect prerequites

The development files for zlib or netpbm are not needed, and neither
is python-xcbgen. None of these are present in the chroot used in the
autobuilders, and anyway if those would be needed, it would be a
Buildroot bug and not something to be mentionned in the documentation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/prerequisite.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 17660b7226..b8bc906481 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -74,10 +74,5 @@ development context (further details: refer to xref:download-infra[]).
 ** +qt4+ to use the 'xconfig' interface
 ** +glib2+, +gtk2+ and +glade2+ to use the 'gconfig' interface
 
-* Development libraries:
-** +zlib1+
-** +netpbm10+ (for +fbtest+)
-** +python-xcbgen+ (for +Matchbox+ on Debian based system)
-
 * Documentation generation tools:
 ** +asciidoc+

From 961cc7a497b6d3eba422b6a05c442d864ab65a60 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:32 +0000
Subject: [PATCH 3719/6849] docs/manual: mention Java-related optional
 dependencies

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/prerequisite.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index b8bc906481..21e46273d8 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -74,5 +74,10 @@ development context (further details: refer to xref:download-infra[]).
 ** +qt4+ to use the 'xconfig' interface
 ** +glib2+, +gtk2+ and +glade2+ to use the 'gconfig' interface
 
+* Java-related packages, if the Java Classpath needs to be built for
+  the target system:
+** The +javac+ compiler
+** The +jar+ tool
+
 * Documentation generation tools:
 ** +asciidoc+

From 8850c522172acc6586c32a30f2dee79501293636 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 04:42:33 +0000
Subject: [PATCH 3720/6849] docs/manual: do not suggest to create a symlink for
 shared download directory

Creating a symbolic link for the download directory is really not a
useful suggestion, since we have the much better solution of the
BUILDROOT_DL_DIR environment variable. So emphasize this solution
instead, and remove the suggestion of the symbolic link.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/download-location.txt | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
index 4befe0a2ad..36a13562ef 100644
--- a/docs/manual/download-location.txt
+++ b/docs/manual/download-location.txt
@@ -3,25 +3,18 @@
 Location of downloaded packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The various tarballs that are downloaded by Buildroot are all stored in
-+DL_DIR+, which by default is the +dl+ directory. If you want
+The various tarballs that are downloaded by Buildroot are all stored
+in +BR2_DL_DIR+, which by default is the +dl+ directory. If you want
 to keep a complete version of Buildroot which is known to be working
 with the associated tarballs, you can make a copy of this directory.
-This will allow you to regenerate the toolchain and the target filesystem
-with exactly the same versions.
+This will allow you to regenerate the toolchain and the target
+filesystem with exactly the same versions.
 
 If you maintain several Buildroot trees, it might be better to have a
-shared download location. This can be accessed by creating a symbolic
-link from the +dl+ directory to the shared download location:
-
------------------
- $ ln -s <shared download location> dl
------------------
-
-Another way of accessing a shared download location is to create the
-+BUILDROOT_DL_DIR+ environment variable.  If this is set, then the
-value of DL_DIR in the project is overridden. The following line
-should be added to +<~/.bashrc>+.
+shared download location. This can be achieved by pointing the
++BUILDROOT_DL_DIR+ environment variable to a directory.  If this is
+set, then the value of +BR2_DL_DIR+ in the Buildroot configuration is
+overridden. The following line should be added to +<~/.bashrc>+.
 
 -----------------
  $ export BUILDROOT_DL_DIR <shared download location>

From 5def1c1ab747e1650786e1cfe4d9d45042bd6ec1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:19:05 +0100
Subject: [PATCH 3721/6849] efl/libecore: bump version to 1.7.4

The libecore-ecore_exe-fix-build-with-glibc-2-16 patch is no longer
needed, since it has been merged upstream.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...-ecore_exe-fix-build-with-glibc-2-16.patch | 94 -------------------
 package/efl/libecore/libecore.mk              |  2 +-
 2 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch

diff --git a/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
deleted file mode 100644
index d9b439cb79..0000000000
--- a/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Backported for commit a0df6712b6afcd07facd32e5a66809170277bdf3
-Fixed the ChangeLog part.
-
-This patch fix build with glibc >=2.16, avoiding the following error occurs:
-
-Making all in ecore
-make[6]: Entering directory `/opt/buildroot/output/build/host-libecore-1.1.0/src/lib/ecore'
-  CC     ecore.lo
-  CC     ecore_anim.lo
-  CC     ecore_app.lo
-  CC     ecore_events.lo
-  CC     ecore_getopt.lo
-  CC     ecore_idle_enterer.lo
-  CC     ecore_idle_exiter.lo
-  CC     ecore_idler.lo
-  CC     ecore_job.lo
-  CC     ecore_main.lo
-  CC     ecore_pipe.lo
-  CC     ecore_poll.lo
-  CC     ecore_time.lo
-  CC     ecore_timer.lo
-  CC     ecore_thread.lo
-  CC     ecore_glib.lo
-  CC     ecore_throttle.lo
-  CC     ecore_signal.lo
-  CC     ecore_exe.lo
-ecore_exe.c: In function ‘ecore_exe_pipe_run’:
-ecore_exe.c:486:15: warning: implicit declaration of function ‘setpriority’ [-Wimplicit-function-declaration]
-ecore_exe.c:486:27: error ‘PRIO_PROCESS’ undeclared (first use in this function)
-ecore_exe.c:486:27: note: each undeclared identifier is reported only once for each function it appears in
-make[6]: *** [ecore_exe.lo] Error 1
-
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
-From a0df6712b6afcd07facd32e5a66809170277bdf3 Mon Sep 17 00:00:00 2001
-From: caro <caro>
-Date: Fri, 22 Jun 2012 05:36:00 +0000
-Subject: [PATCH] ecore_exe: fix compilation on fedora 18.
-
-setpriority needs sys/resource.h. See:
-
-http://linux.die.net/man/2/setpriority
-
-I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems.
-
-
-git-svn-id: http://svn.enlightenment.org/svn/e@72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
----
- ChangeLog                 | 4 ++++
- src/lib/ecore/ecore_exe.c | 7 ++-----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index a306f75..549ad19 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -763,3 +763,7 @@
- 2011-11-29 Mike McCormack
-
- 	* Allow quitting before entering the glib version of the main loop
-+
-+2012-06-22 Vincent Torri
-+
-+	* ecore_exe: fix compilation on fedora 18.
-diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
-index 7931a96..6db32a9 100644
---- a/src/lib/ecore/ecore_exe.c
-+++ b/src/lib/ecore/ecore_exe.c
-@@ -2,11 +2,6 @@
- # include <config.h>
- #endif
- 
--#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
--# include <sys/time.h>
--# include <sys/resource.h>
--#endif
--
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -14,6 +9,8 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- 
- #ifdef HAVE_SYS_PRCTL_H
- # include <sys/prctl.h>
--- 
-1.7.12.2
-
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 9eb09ac2f0..0220017dfd 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBECORE_VERSION = 1.1.0
+LIBECORE_VERSION = 1.7.4
 LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
 LIBECORE_SITE = http://download.enlightenment.org/releases/
 LIBECORE_LICENSE = BSD-2c

From 698e18f295e542f0d168d6df675b904c5248e831 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:20:04 +0100
Subject: [PATCH 3722/6849] efl/expedite: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/expedite/expedite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
index 26d25f5ba0..4b245ec9be 100644
--- a/package/efl/expedite/expedite.mk
+++ b/package/efl/expedite/expedite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-EXPEDITE_VERSION = 1.1.0
+EXPEDITE_VERSION = 1.7.4
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
 EXPEDITE_LICENSE = BSD-2c
 EXPEDITE_LICENSE_FILES = COPYING

From 6725c0d378c62623309ff182e0417b4e39cdd2c6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:20:18 +0100
Subject: [PATCH 3723/6849] efl/libedbus: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libedbus/libedbus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 60651e3077..9c62ead8f9 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEDBUS_VERSION = 1.1.0
+LIBEDBUS_VERSION = 1.7.4
 LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
 LIBEDBUS_SITE = http://download.enlightenment.org/releases/
 LIBEDBUS_LICENSE = BSD-2c

From acb2d8cd0b0b9b19ef73d22f2a46172f49e31029 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:20:36 +0100
Subject: [PATCH 3724/6849] efl/libedje: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libedje/libedje.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index ce17da514d..a02eaa9a79 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEDJE_VERSION = 1.1.0
+LIBEDJE_VERSION = 1.7.4
 LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
 LIBEDJE_SITE =  http://download.enlightenment.org/releases/
 LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)

From a5d3241f3bb620f7479e30c12bcc632734663792 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:20:43 +0100
Subject: [PATCH 3725/6849] efl/libeet: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libeet/libeet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index ccb3501871..a5a1ce1d5b 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEET_VERSION = 1.5.0
+LIBEET_VERSION = 1.7.4
 LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
 LIBEET_SITE = http://download.enlightenment.org/releases/
 LIBEET_LICENSE = BSD-2c

From ba13ffec1c1cde217cf9b6ed5660a9d96cba3e03 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:21:01 +0100
Subject: [PATCH 3726/6849] efl/libefreet: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libefreet/libefreet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
index c0d73971d4..b23a5a507e 100644
--- a/package/efl/libefreet/libefreet.mk
+++ b/package/efl/libefreet/libefreet.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEFREET_VERSION = 1.1.0
+LIBEFREET_VERSION = 1.7.4
 LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
 LIBEFREET_SITE = http://download.enlightenment.org/releases/
 LIBEFREET_LICENSE = BSD-2c

From 8cba182b99f625da169b1ca9643ed165463e2963 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:21:11 +0100
Subject: [PATCH 3727/6849] efl/libeina: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libeina/libeina.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index e5b89c1ce5..d99a237cc0 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEINA_VERSION = 1.1.0
+LIBEINA_VERSION = 1.7.4
 LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
 LIBEINA_SITE = http://download.enlightenment.org/releases/
 LIBEINA_LICENSE = LGPLv2.1+

From a0b8b6e46d18b0f8f500338b5491598809156a4e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:21:28 +0100
Subject: [PATCH 3728/6849] efl/libelementary: bump to version 1.7.4 and change
 download location

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libelementary/libelementary.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 8957d038d3..81289ff03f 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBELEMENTARY_VERSION = 0.8.0.65643
+LIBELEMENTARY_VERSION = 1.7.4
 LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
-LIBELEMENTARY_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBELEMENTARY_SITE = http://download.enlightenment.org/releases/
 LIBELEMENTARY_LICENSE = LGPLv2.1
 LIBELEMENTARY_LICENSE_FILES = COPYING
 

From 159209c3504a6e600d5f5ddfd82c683b1a85f1fc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:21:44 +0100
Subject: [PATCH 3729/6849] efl/libembryo: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libembryo/libembryo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index 9cab5aaaf9..ce5c96824b 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEMBRYO_VERSION = 1.1.0
+LIBEMBRYO_VERSION = 1.7.4
 LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
 LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
 LIBEMBRYO_LICENSE = BSD-2c, Embryo license

From 58f10d0d1c51f4b1326153bb1aeeaa627b0a5925 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:21:51 +0100
Subject: [PATCH 3730/6849] efl/libevas: bump to version 1.7.4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libevas/libevas.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 1f053e37cb..8e03ba6bf9 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBEVAS_VERSION = 1.1.0
+LIBEVAS_VERSION = 1.7.4
 LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
 LIBEVAS_SITE = http://download.enlightenment.org/releases/
 LIBEVAS_LICENSE = BSD-2c

From 212a5abdbd41298647627a977b336c2f4b1f646c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 16:35:02 +0100
Subject: [PATCH 3731/6849] efl/libevas: remove SVG support

The SVG support requires esvg, which hasn't been released yet. The
recommandation of the EFL developers is to use the SVG loader from the
evas-generic-loaders project.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libevas/Config.in  | 5 -----
 package/efl/libevas/libevas.mk | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index ddac49ef36..d8e5002dac 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -181,11 +181,6 @@ config BR2_PACKAGE_LIBEVAS_TIFF
 	help
 	  This enables the loader code that loads tiff files.
 
-config BR2_PACKAGE_LIBEVAS_SVG
-	bool "libevas svg loader"
-	help
-	  This enables the loader code that loads svg files.
-
 config BR2_PACKAGE_LIBEVAS_XPM
 	bool "libevas xpm loader"
 	help
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 8e03ba6bf9..6e69d7ff83 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -176,12 +176,6 @@ else
 LIBEVAS_CONF_OPT += --disable-image-loader-pmaps
 endif
 
-ifeq ($(BR2_PACKAGE_LIBEVAS_SVG),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-svg
-else
-LIBEVAS_CONF_OPT += --disable-image-loader-svg
-endif
-
 ifeq ($(BR2_PACKAGE_LIBEVAS_TIFF),y)
 LIBEVAS_CONF_OPT += --enable-image-loader-tiff
 LIBEVAS_DEPENDENCIES += tiff

From 7778a20102b4497db39cce819aeb2d3ba804e3e8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 16:35:44 +0100
Subject: [PATCH 3732/6849] efl/libevas: adjust dependency on X11 libraries

The libevas configure script actually checks the presence of libX11
and libXext, so use those two libraries as the dependencies for the
X11 backend of libevas.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libevas/Config.in  | 1 +
 package/efl/libevas/libevas.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index d8e5002dac..bd845c1154 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -91,6 +91,7 @@ config BR2_PACKAGE_LIBEVAS_X11
 	bool "libevas X11 backend"
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  This enables the software X11 rendering engine that renders
 	  to X drawable targets using highly optimised software
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 6e69d7ff83..098afe3f95 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -63,7 +63,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y)
 LIBEVAS_CONF_OPT += --enable-software-xlib
-LIBEVAS_DEPENDENCIES += xproto_xproto
+LIBEVAS_DEPENDENCIES += xlib_libX11 xlib_libXext
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)

From fee5783d17b7e69132d63ba4fb1b660ec2c862e3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 18:02:58 +0100
Subject: [PATCH 3733/6849] efl/libevas: remove examples source code from
 target filesystem

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libevas/libevas.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 098afe3f95..0a908424f0 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -203,5 +203,13 @@ else
 LIBEVAS_CONF_OPT += --disable-font-loader-eet
 endif
 
+# libevas installs the source code of examples on the target, which
+# are generally not useful.
+define LIBEVAS_REMOVE_EXAMPLES
+	rm -rf $(TARGET_DIR)/usr/share/evas/examples/
+endef
+
+LIBEVAS_POST_INSTALL_TARGET_HOOKS += LIBEVAS_REMOVE_EXAMPLES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 20e90e4f0d2628322b0f376043b29668806cf3d3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:23:27 +0100
Subject: [PATCH 3734/6849] efl/libeio: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/Config.in        |  1 +
 package/efl/libeio/Config.in | 18 ++++++++++++++++++
 package/efl/libeio/libeio.mk | 16 ++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/efl/libeio/Config.in
 create mode 100644 package/efl/libeio/libeio.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index c783d7f078..a526d87a4d 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -13,6 +13,7 @@ source "package/efl/libeina/Config.in"
 source "package/efl/libecore/Config.in"
 source "package/efl/libeet/Config.in"
 source "package/efl/libefreet/Config.in"
+source "package/efl/libeio/Config.in"
 source "package/efl/libevas/Config.in"
 source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
diff --git a/package/efl/libeio/Config.in b/package/efl/libeio/Config.in
new file mode 100644
index 0000000000..0b2751ce6d
--- /dev/null
+++ b/package/efl/libeio/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LIBEIO
+	bool "libeio"
+	select BR2_PACKAGE_LIBEET
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBECORE
+	help
+	  Eio integrates with EFL (Ecore, Eina) to provide efficient
+	  filesystem Input/Output (I/O). It use the best techniques to
+	  achieve such purpose, like using at-variants, splice,
+	  properly handling errors and doing it in an asynchronous
+	  fashion by means of worker threads. It is also ported to
+	  Windows, so multi-platform.
+
+	  Whenever you need to list a directory, copy, move or delete
+	  files, Eio will do that task better than you'd achieve with
+	  naive implementations, and it is easy to use.
+
+	  http://trac.enlightenment.org/e/wiki/Eio
diff --git a/package/efl/libeio/libeio.mk b/package/efl/libeio/libeio.mk
new file mode 100644
index 0000000000..f5e08de5b1
--- /dev/null
+++ b/package/efl/libeio/libeio.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# libeio
+#
+#############################################################
+
+LIBEIO_VERSION = 1.7.4
+LIBEIO_SOURCE = eio-$(LIBEIO_VERSION).tar.bz2
+LIBEIO_SITE = http://download.enlightenment.org/releases/
+LIBEIO_LICENSE = LGPLv2.1
+LIBEIO_LICENSE_FILES = COPYING
+
+LIBEIO_INSTALL_STAGING = YES
+LIBEIO_DEPENDENCIES = libeina libeet libecore
+
+$(eval $(autotools-package))

From ad2e427004f93d9f3d3f88991eb66898f8d25347 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 16:34:31 +0100
Subject: [PATCH 3735/6849] efl/libethumb: bump to 1.7.4 and change download
 location

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libethumb/libethumb.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
index ba77e4c071..eb098eaef5 100644
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBETHUMB_VERSION = 0.1.1.65643
+LIBETHUMB_VERSION = 1.7.4
 LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
-LIBETHUMB_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBETHUMB_SITE = http://download.enlightenment.org/releases/
 LIBETHUMB_LICENSE = LGPLv2.1+
 LIBETHUMB_LICENSE_FILES = COPYING
 

From 99f711e9c9d6278ca7471d5ed7c21efb155da1bb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 16:37:36 +0100
Subject: [PATCH 3736/6849] librsvg: relax dependency on Gtk, add gdk-pixbuf
 dependency

librsvg doesn't *require* Gtk, it can optionally build a Gtk theme
engine, but it is not mandatory. Therefore, we make the Gtk dependency
an optional dependency rather than a hard dependency. This will be
useful as librsvg will become a dependency of libevas-generic-loaders,
used in an EFL context in which building libgtk is not really what we
want.

However, gdk-pixbuf is a mandatory dependency to build librsvg, so we
add this one.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/librsvg/Config.in  | 2 +-
 package/librsvg/librsvg.mk | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index fdb7d3109e..855b3d6439 100644
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_LIBGLIB2
-	depends on BR2_PACKAGE_LIBGTK2
+	select BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # glib2
 	help
 	  The rsvg library is an efficient renderer for Scalable
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index e54c06c373..745fcfa457 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -11,6 +11,12 @@ LIBRSVG_SOURCE:=librsvg-$(LIBRSVG_VERSION).tar.gz
 LIBRSVG_SITE:=http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/
 LIBRSVG_INSTALL_STAGING = YES
 LIBRSVG_CONF_OPT = --disable-tools
-LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 libgtk2
+LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 gdk-pixbuf
+
+# If we have Gtk2, let's build it first to benefit from librsvg Gtk
+# support.
+ifeq ($(BR2_PACKAGE_LIBGTK2),y)
+LIBRSVG_DEPENDENCIES += libgtk2
+endif
 
 $(eval $(autotools-package))

From d18ac532cf83ee95b61848c4b32576232c369c26 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 16:23:24 +0100
Subject: [PATCH 3737/6849] efl/libevas-generic-loaders: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/Config.in                         |  1 +
 package/efl/libevas-generic-loaders/Config.in | 21 +++++++++++++
 .../libevas-generic-loaders.mk                | 31 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 package/efl/libevas-generic-loaders/Config.in
 create mode 100644 package/efl/libevas-generic-loaders/libevas-generic-loaders.mk

diff --git a/package/efl/Config.in b/package/efl/Config.in
index a526d87a4d..bb1a986cb5 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -15,6 +15,7 @@ source "package/efl/libeet/Config.in"
 source "package/efl/libefreet/Config.in"
 source "package/efl/libeio/Config.in"
 source "package/efl/libevas/Config.in"
+source "package/efl/libevas-generic-loaders/Config.in"
 source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
 source "package/efl/libethumb/Config.in"
diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
new file mode 100644
index 0000000000..44bc37da2b
--- /dev/null
+++ b/package/efl/libevas-generic-loaders/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+	bool "libevas generic loaders"
+	select BR2_PACKAGE_LIBEINA
+	help
+	  These are additional "generic" loaders for Evas that are
+	  stand-alone executables that evas may run from its generic
+	  loader module.
+
+	  http://trac.enlightenment.org/e/wiki/Evas_Generic_Loaders
+
+if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+
+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
+	bool "SVG loader"
+	select BR2_PACKAGE_LIBRSVG
+	select BR2_PACKAGE_CAIRO
+	depends on BR2_USE_WCHAR # librsvg -> glib2
+	help
+	  This option enables the Evas generic SVG loader
+
+endif
diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
new file mode 100644
index 0000000000..76236b12ca
--- /dev/null
+++ b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# libevas-generic-loaders
+#
+#############################################################
+
+LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.4
+LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
+LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases/
+LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2
+LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING
+
+LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES
+
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina
+
+# For now, we only support the SVG loader
+LIBEVAS_GENERIC_LOADERS_CONF_OPT += \
+	--disable-poppler \
+	--disable-spectre \
+	--disable-libraw \
+	--disable-gstreamer
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y)
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo
+LIBEVAS_GENERIC_LOADERS_CONF_OPT += --enable-svg
+else
+LIBEVAS_GENERIC_LOADERS_CONF_OPT += --disable-svg
+endif
+
+$(eval $(autotools-package))

From 42bc7af2e23fb46d323617644dc1e6d29880cb36 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 28 Dec 2012 16:39:21 +0100
Subject: [PATCH 3738/6849] xcb-util-keysyms: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/x11r7/Config.in                            |  1 +
 package/x11r7/xcb-util-keysyms/Config.in           | 14 ++++++++++++++
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk | 12 ++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/x11r7/xcb-util-keysyms/Config.in
 create mode 100644 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index bb538e1e0f..94ad8a4d1a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -39,6 +39,7 @@ endmenu
 		source package/x11r7/mesa3d/Config.in
 		source package/x11r7/pthread-stubs/Config.in
 		source package/x11r7/xcb-util/Config.in
+		source package/x11r7/xcb-util-keysyms/Config.in
 		source package/x11r7/xlib_libFS/Config.in
 		source package/x11r7/xlib_libICE/Config.in
 		source package/x11r7/xlib_libSM/Config.in
diff --git a/package/x11r7/xcb-util-keysyms/Config.in b/package/x11r7/xcb-util-keysyms/Config.in
new file mode 100644
index 0000000000..ef42eb2920
--- /dev/null
+++ b/package/x11r7/xcb-util-keysyms/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XCB_UTIL_KEYSYMS
+	bool "xcb-util-keysyms"
+	help
+	  The XCB util modules provides a number of libraries which sit on top
+	  of libxcb, the core X protocol library, and some of the extension
+	  libraries. These experimental libraries provide convenience functions
+	  and interfaces which make the raw X protocol more usable. Some of the
+	  libraries also provide client-side code which is not strictly part of
+	  the X protocol but which have traditionally been provided by Xlib.
+
+	  XCB util-keysyms module provides the following library: keysyms:
+	  Standard X key constants and conversion to/from keycodes.
+
+	  http://xcb.freedesktop.org/
diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
new file mode 100644
index 0000000000..18db52acf6
--- /dev/null
+++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# xcb-util-keysyms
+#
+#############################################################
+XCB_UTIL_KEYSYMS_VERSION = 0.3.9
+XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2
+XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist/
+XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
+

From 473af436480f08e78377154783276b1c348b2625 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 24 Dec 2012 12:24:24 +0100
Subject: [PATCH 3739/6849] enlightenment: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/enlightenment/Config.in               | 37 +++++++++++++++++
 .../enlightenment-no-execinfo.patch           | 27 +++++++++++++
 package/enlightenment/enlightenment.mk        | 40 +++++++++++++++++++
 4 files changed, 105 insertions(+)
 create mode 100644 package/enlightenment/Config.in
 create mode 100644 package/enlightenment/enlightenment-no-execinfo.patch
 create mode 100644 package/enlightenment/enlightenment.mk

diff --git a/package/Config.in b/package/Config.in
index 8cec873b06..7860f3fc97 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -151,6 +151,7 @@ source "package/liberation/Config.in"
 source "package/libsexy/Config.in"
 
 comment "X Window managers"
+source "package/enlightenment/Config.in"
 source "package/matchbox/Config.in"
 source "package/metacity/Config.in"
 source "package/blackbox/Config.in"
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
new file mode 100644
index 0000000000..4978367a01
--- /dev/null
+++ b/package/enlightenment/Config.in
@@ -0,0 +1,37 @@
+config BR2_PACKAGE_ENLIGHTENMENT
+	bool "enlightenment"
+	select BR2_PACKAGE_LIBECORE
+	select BR2_PACKAGE_LIBECORE_X
+	select BR2_PACKAGE_LIBEINA
+	select BR2_PACKAGE_LIBEET
+	select BR2_PACKAGE_LIBEVAS
+	select BR2_PACKAGE_LIBEVAS_JPEG
+	select BR2_PACKAGE_LIBEVAS_PNG
+	select BR2_PACKAGE_LIBEVAS_EET
+	select BR2_PACKAGE_LIBECORE_EVAS
+	select BR2_PACKAGE_LIBEDJE
+	select BR2_PACKAGE_LIBEFREET
+	select BR2_PACKAGE_LIBEDBUS
+	select BR2_PACKAGE_LIBEIO
+	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
+	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
+	# libevas-generic-loaders-svg -> librsvg -> glib2
+	depends on BR2_USE_WCHAR
+	# libedbus -> dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# libedbus -> dbus
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_XORG7
+	help
+	  Enlightenment, also known simply as E, is a stacking window
+	  manager for the X Window System which can be used alone or
+	  in conjunction with a desktop environment such as GNOME or
+	  KDE. Enlightenment can be used as a substitute for a full
+	  desktop environment.
+
+	  http://www.enlightenment.org/
+
+comment "enlightenment requires WCHAR and thread support in toolchain"
+	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/enlightenment/enlightenment-no-execinfo.patch b/package/enlightenment/enlightenment-no-execinfo.patch
new file mode 100644
index 0000000000..81fbe17f78
--- /dev/null
+++ b/package/enlightenment/enlightenment-no-execinfo.patch
@@ -0,0 +1,27 @@
+Do not include <execinfo.h> when not available
+
+On uClibc, <execinfo.h> is not necessarily installed, depending on the
+configuration. Enlightenment properly makes <execinfo.h> optional, but
+uses __GLIBC__ to check if it is available or not. Unfortunately,
+uClibc defines __GLIBC__, so it is not the right way to decide if
+<execinfo.h> is available.
+
+Instead, Enlightenment already has a configure.ac check for
+execinfo.h, so we simply use the result of this configure.ac check to
+decide whether execinfo.h is to be included or not.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/bin/e.h
+===================================================================
+--- a/src/bin/e.h
++++ b/src/bin/e.h
+@@ -92,7 +92,7 @@
+ #  include <memcheck.h>
+ # endif
+ 
+-# ifdef __GLIBC__
++# ifdef HAVE_EXECINFO_H
+ #  include <execinfo.h>
+ # endif
+ 
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
new file mode 100644
index 0000000000..cd3b21f7f3
--- /dev/null
+++ b/package/enlightenment/enlightenment.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# enlightenment
+#
+#############################################################
+
+ENLIGHTENMENT_VERSION = 0.17.0-omega
+ENLIGHTENMENT_SITE = http://download.enlightenment.org/releases/
+ENLIGHTENMENT_LICENSE = BSD-2c
+ENLIGHTENMENT_LICENSE_FILES = COPYING
+
+ENLIGHTENMENT_DEPENDENCIES = 	\
+	host-pkgconf 		\
+	libecore 		\
+	libeet 			\
+	libeina 		\
+	libevas 		\
+	libevas-generic-loaders \
+	libedje 		\
+	libefreet 		\
+	libedbus 		\
+	libeio 			\
+	host-libedje 		\
+	host-libeet		\
+	xcb-util-keysyms
+
+ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+			 --disable-rpath
+
+ifeq ($(BR2_HAVE_DOCUMENTATION),)
+define ENLIGHTENMENT_REMOVE_DOCUMENTATION
+	rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/
+	rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING
+	rm -f $(TARGET_DIR)/usr/share/enlightenment/AUTHORS
+endef
+ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION
+endif
+
+$(eval $(autotools-package))

From 0fdfc7db1eb473f49a50a775d90f611e0a46227f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:12 +0000
Subject: [PATCH 3740/6849] qemu/microblaze: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../microblazebe-mmu/{linux-3.6.config => linux-3.7.config}   | 0
 board/qemu/microblazebe-mmu/readme.txt                        | 2 +-
 .../microblazeel-mmu/{linux-3.6.config => linux-3.7.config}   | 0
 board/qemu/microblazeel-mmu/readme.txt                        | 2 +-
 configs/qemu_microblazebe_mmu_defconfig                       | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                       | 4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename board/qemu/microblazebe-mmu/{linux-3.6.config => linux-3.7.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/microblazebe-mmu/linux-3.6.config b/board/qemu/microblazebe-mmu/linux-3.7.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.6.config
rename to board/qemu/microblazebe-mmu/linux-3.7.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 889b561755..a52b9ad8a0 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/board/qemu/microblazeel-mmu/linux-3.6.config b/board/qemu/microblazeel-mmu/linux-3.7.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.6.config
rename to board/qemu/microblazeel-mmu/linux-3.7.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 9bc54409be..e61eeb6ea2 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 6ca7cc9aa9..6f5c871c81 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index a4e13d226c..6f9f8f9ba2 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"

From 05dcaabbdc5ddff6fcc86625d06e76049c071b31 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:13 +0000
Subject: [PATCH 3741/6849] qemu/sparc-ss10: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sparc-ss10/readme.txt  | 2 +-
 configs/qemu_sparc_ss10_defconfig | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index e5a1d457f1..4290c555b6 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index e13b610e9d..38bf243b9c 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,12 +6,12 @@ BR2_sparc_supersparc=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 9f8ba2c918fb1cfe4a645e61e7d28c4c890cf31c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:14 +0000
Subject: [PATCH 3742/6849] qemu/ppc-g3beige: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{linux-3.6.config => linux-3.7.config}                | 0
 board/qemu/powerpc-g3beige/readme.txt                     | 2 +-
 configs/qemu_ppc_g3beige_defconfig                        | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-3.6.config b/board/qemu/powerpc-g3beige/linux-3.7.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.6.config
rename to board/qemu/powerpc-g3beige/linux-3.7.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index 01f0baf8e0..05aa380b1b 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 420710b94e..5aef9bf3a0 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,15 +6,15 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 99a8940dc4f8014acc12234a5600062dc2385256 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:15 +0000
Subject: [PATCH 3743/6849] qemu/ppc-virtex-ml507: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/powerpc-virtex-ml507/readme.txt | 2 +-
 configs/qemu_ppc_virtex_ml507_defconfig    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index 0500a95757..a225985909 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 6b4ea74035..59812c93ea 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -6,8 +6,8 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

From 49b1747048a56f2ca68421c58537d7475519c428 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:16 +0000
Subject: [PATCH 3744/6849] qemu/ppc-mpc8544ds: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/powerpc-mpc8544ds/readme.txt | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index 07a9e3bc8f..d361fd9d7d 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 95218a70d0..39f0339952 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,13 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 

From 7e6122be61ff5cd8256b80fbb1f34b2cde1c4cb0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:17 +0000
Subject: [PATCH 3745/6849] qemu/sh4-r2d: update to use kernel 3.2.35

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/sh4-r2d/readme.txt  | 2 +-
 configs/qemu_sh4_r2d_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 0eaf1cf014..9ae7496734 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index d766bc37df..746dc0b17f 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.33"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.35"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From a5a9b728dadddf8137cad34854ef448c56cca834 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:18 +0000
Subject: [PATCH 3746/6849] qemu/x86_64: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86_64/{linux-3.6.config => linux-3.7.config} | 0
 board/qemu/x86_64/readme.txt                             | 2 +-
 configs/qemu_x86_64_defconfig                            | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/x86_64/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.6.config b/board/qemu/x86_64/linux-3.7.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.6.config
rename to board/qemu/x86_64/linux-3.7.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index 791109cd62..7d3c6c58a1 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 03cc5b3a50..2093242894 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.7.config"

From 6420570f6697405a033d00875739661d39edae5a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:19 +0000
Subject: [PATCH 3747/6849] qemu/x86: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/x86/{linux-3.6.config => linux-3.7.config} | 0
 board/qemu/x86/readme.txt                             | 2 +-
 configs/qemu_x86_defconfig                            | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/x86/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/x86/linux-3.6.config b/board/qemu/x86/linux-3.7.config
similarity index 100%
rename from board/qemu/x86/linux-3.6.config
rename to board/qemu/x86/linux-3.7.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 3cca68253f..434255671c 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 90524b5242..ddb9fd1dfd 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.7.config"

From 5232c1081c517556c8efb7546e0363327910c4f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:20 +0000
Subject: [PATCH 3748/6849] qemu/mipsel-malta: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mipsel-malta/{linux-3.6.config => linux-3.7.config}   | 0
 board/qemu/mipsel-malta/readme.txt                        | 2 +-
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/mipsel-malta/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-3.6.config b/board/qemu/mipsel-malta/linux-3.7.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.6.config
rename to board/qemu/mipsel-malta/linux-3.7.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index d8a5847743..8dd4024b07 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 42992d7e67..3adde2f6b6 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From d6781b73a29488d9e0302bd96295542a18aac5ba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:21 +0000
Subject: [PATCH 3749/6849] qemu/mips-malta: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mips-malta/{linux-3.6.config => linux-3.7.config}     | 0
 board/qemu/mips-malta/readme.txt                          | 2 +-
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/mips-malta/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/mips-malta/linux-3.6.config b/board/qemu/mips-malta/linux-3.7.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.6.config
rename to board/qemu/mips-malta/linux-3.7.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index 104c427823..d3d8446eb9 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 435b02d900..33c389aec1 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From e095c715c347558f73f2a4d31c362361f4195dac Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:22 +0000
Subject: [PATCH 3750/6849] qemu/mips64-malta: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mips64-malta/{linux-3.6.config => linux-3.7.config}   | 0
 board/qemu/mips64-malta/readme.txt                        | 2 +-
 configs/qemu_mips64_malta_defconfig                       | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename board/qemu/mips64-malta/{linux-3.6.config => linux-3.7.config} (100%)

diff --git a/board/qemu/mips64-malta/linux-3.6.config b/board/qemu/mips64-malta/linux-3.7.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.6.config
rename to board/qemu/mips64-malta/linux-3.7.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index ad24b6ef8b..1d6ff1092a 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 2c1192a142..8644acd705 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,15 +10,15 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

From 4bf20cd7bd70f1ad5422240e6dcf858f715d6d26 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:23 +0000
Subject: [PATCH 3751/6849] qemu/arm-vexpress: update to use kernel 3.7.1

Bump to use kernel 3.7.1
Switch to hard float toolchain with NEON and VFP support.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-vexpress/readme.txt  |  2 +-
 configs/qemu_arm_vexpress_defconfig | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index 41a5f6714a..c74bfcd1c2 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 424a7c59e5..f74980000e 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -1,22 +1,25 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_VFP_FLOAT=y
+# BR2_SOFT_FLOAT is not set
 
-# system
+# System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 
-# filesystem
+# Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y

From aa5d13568d193b741d4c20fb8670a3f7334efdcb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Dec 2012 16:23:24 +0000
Subject: [PATCH 3752/6849] qemu/arm-versatile: update to use kernel 3.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../arm-versatile/{linux-3.6.config => linux-3.7.config}  | 6 +++---
 board/qemu/arm-versatile/readme.txt                       | 2 +-
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.6.config => linux-3.7.config} (96%)

diff --git a/board/qemu/arm-versatile/linux-3.6.config b/board/qemu/arm-versatile/linux-3.7.config
similarity index 96%
rename from board/qemu/arm-versatile/linux-3.6.config
rename to board/qemu/arm-versatile/linux-3.7.config
index 5f58b973a4..da73575b5c 100644
--- a/board/qemu/arm-versatile/linux-3.6.config
+++ b/board/qemu/arm-versatile/linux-3.7.config
@@ -1,3 +1,4 @@
+CONFIG_ARCH_VERSATILE=y
 CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
@@ -15,7 +16,6 @@ CONFIG_LEDS_CPU=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=1f03 mem=32M"
-CONFIG_VFP=y
 CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -34,11 +34,12 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_EEPROM_LEGACY=m
 CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_SMC91X=y
@@ -69,7 +70,6 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_EXT2_FS=y
 CONFIG_VFAT_FS=m
-CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_CRAMFS=y
 CONFIG_MINIX_FS=y
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 78682048f0..51364c7bad 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.2.0
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 85efa2b1ad..428e07efc1 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.6 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_6=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From a45871bfc6a3f800548954dd364b5f53e81804ab Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 28 Dec 2012 14:07:33 +0000
Subject: [PATCH 3753/6849] target: add option to set the root password

Add an option in the menuconfig to specify a root password.

If set to empty, no root password is created; otherwise, the password is
encrypted using MD5 (MD5 is not the default for crypt(3), DES-56 is, but
MD5 is widely available, not-so-strong, but not-so-weak either).

Add a check for 'mkpasswd' as a new dependency.

[Peter: fix typo/capitilization and simplify logic]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh |  9 +++++++++
 system/Config.in                     | 21 +++++++++++++++++++++
 system/system.mk                     |  9 +++++++++
 3 files changed, 39 insertions(+)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 7a02512c08..eb5a481848 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -158,6 +158,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
        exit 1 ;
    fi
 fi
+
 if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
     for prog in javac jar; do
 	if ! which $prog > /dev/null ; then
@@ -166,3 +167,11 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
 	fi
     done
 fi
+
+if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1; then
+    if ! which mkpasswd > /dev/null 2>&1; then
+        /bin/echo -e "\nYou need the 'mkpasswd' utility to set the root password\n"
+        /bin/echo -e "(in Debian/ubuntu, 'mkpasswd' provided by the whois package)\n"
+        exit 1
+    fi
+fi
diff --git a/system/Config.in b/system/Config.in
index a557ea035f..f1c260a95e 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -12,6 +12,27 @@ config BR2_TARGET_GENERIC_ISSUE
        help
          Select system banner (/etc/issue) to be displayed at login.
 
+config BR2_TARGET_GENERIC_ROOT_PASSWD
+	string "Root password"
+	default ""
+	help
+	  Set the initial root password (in clear). It will be md5-encrypted.
+	  
+	  If set to empty (the default), then no root password will be set,
+	  and root will need no password to log in.
+	  
+	  WARNING! WARNING!
+	  Although pretty strong, MD5 is now an old hash function, and
+	  suffers from some weaknesses, which makes it susceptible to attacks.
+	  It is showing its age, so this root password should not be trusted
+	  to properly secure any product that can be shipped to the wide,
+	  hostile world.
+	  
+	  WARNING! WARNING!
+	  The password appears in clear in the .config file, and may appear
+	  in the build log! Avoid using a valuable password if either the
+	  .config file or the build log may be distributed!
+
 choice
 	prompt "/dev management"
 	default BR2_ROOTFS_DEVICE_CREATION_STATIC
diff --git a/system/system.mk b/system/system.mk
index 353d0ba1b5..7536ce649e 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -1,5 +1,9 @@
 TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
 TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
+TARGET_GENERIC_ROOT_PASSWD:=$(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
+ifneq ($(TARGET_GENERIC_ROOT_PASSWD),)
+TARGET_GENERIC_ROOT_PASSWD_HASH=$(shell mkpasswd -m md5 "$(TARGET_GENERIC_ROOT_PASSWD)")
+endif
 TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
 TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
 TARGET_GENERIC_GETTY_TERM:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
@@ -14,6 +18,9 @@ target-generic-issue:
 	mkdir -p $(TARGET_DIR)/etc
 	echo "$(TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue
 
+target-root-passwd:
+	$(SED) 's,^root:[^:]*:,root:$(TARGET_GENERIC_ROOT_PASSWD_HASH):,' $(TARGET_DIR)/etc/shadow
+
 target-generic-getty-busybox:
 	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
@@ -40,6 +47,8 @@ ifneq ($(TARGET_GENERIC_ISSUE),)
 TARGETS += target-generic-issue
 endif
 
+TARGETS += target-root-passwd
+
 ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
 ifeq ($(BR2_PACKAGE_SYSVINIT),y)
 TARGETS += target-generic-getty-sysvinit

From f1d44593a04ff3be981c8a3b01a502f0b18193ee Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 30 Dec 2012 10:47:21 +0000
Subject: [PATCH 3754/6849] docs/manual: small fixes and enhancements to adding
 generic packages

Add overall description of LIBFOO_DEVICES and LIBFOO_PERMISSIONS.
Fix line numbers.

Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 34 +++++++++++++++----------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 6c1c35eb74..0759d4fcec 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -53,30 +53,32 @@ system is based on hand-written Makefiles or shell scripts.
 37: $(eval $(generic-package))
 --------------------------------
 
-The Makefile begins on line 6 to 8 with metadata information: the
+The Makefile begins on line 6 to 10 with metadata information: the
 version of the package (+LIBFOO_VERSION+), the name of the
-tarball containing the package (+LIBFOO_SOURCE+) and the
-Internet location at which the tarball can be downloaded
-(+LIBFOO_SITE+). All variables must start with the same prefix,
-+LIBFOO_+ in this case. This prefix is always the uppercased
-version of the package name (see below to understand where the package
-name is defined).
-
-On line 9, we specify that this package wants to install something to
+tarball containing the package (+LIBFOO_SOURCE+) the
+Internet location at which the tarball can be downloaded from
+(+LIBFOO_SITE+), the license (+LIBFOO_LICENSE+) and file with the
+license text (+LIBFOO_LICENSE_FILES+). All variables must start with
+the same prefix, +LIBFOO_+ in this case. This prefix is always the
+uppercased version of the package name (see below to understand where
+the package name is defined).
+
+On line 11, we specify that this package wants to install something to
 the staging space. This is often needed for libraries, since they must
 install header files and other development files in the staging space.
 This will ensure that the commands listed in the
 +LIBFOO_INSTALL_STAGING_CMDS+ variable will be executed.
 
-On line 10, we specify the list of dependencies this package relies
+On line 12, we specify the list of dependencies this package relies
 on. These dependencies are listed in terms of lower-case package names,
 which can be packages for the target (without the +host-+
 prefix) or packages for the host (with the +host-+) prefix).
 Buildroot will ensure that all these packages are built and installed
 'before' the current package starts its configuration.
 
-The rest of the Makefile defines what should be done at the different
-steps of the package configuration, compilation and installation.
+The rest of the Makefile, lines 14..27, defines what should be done
+at the different steps of the package configuration, compilation and
+installation.
 +LIBFOO_BUILD_CMDS+ tells what steps should be performed to
 build the package. +LIBFOO_INSTALL_STAGING_CMDS+ tells what
 steps should be performed to install the package in the staging space.
@@ -87,7 +89,13 @@ All these steps rely on the +$(@D)+ variable, which
 contains the directory where the source code of the package has been
 extracted.
 
-Finally, on line 35, we call the +generic-package+ which
+On line 29..31, we define a device-node file used by this package
+(+LIBFOO_DEVICES+).
+
+On line 33..35, we define the permissions to set to specific files
+installed by this package (+LIBFOO_PERMISSIONS+).
+
+Finally, on line 37, we call the +generic-package+ function, which
 generates, according to the variables defined previously, all the
 Makefile code necessary to make your package working.
 

From 3a8e6fc86ff1db0f2f40029df41cf40cd1318c0f Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Dec 2012 12:54:08 +0000
Subject: [PATCH 3755/6849] matchbox-lib: fix license info

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/matchbox-lib/matchbox-lib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 7730d94060..d18df6b604 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -7,7 +7,7 @@
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
 MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
-MATCHBOX_LIB_LICENSE = LGPLv2.1
+MATCHBOX_LIB_LICENSE = LGPLv2.1+
 MATCHBOX_LIB_LICENSE_FILES = COPYING
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext

From 89913cbec56c1a994d302cfbc86d8c3b22af5aee Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Jan 2013 13:20:38 +0100
Subject: [PATCH 3756/6849] librsvg: pango needs C++ support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/librsvg/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index 855b3d6439..b2ef6adf47 100644
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -7,8 +7,12 @@ config BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_INSTALL_LIBSTDCPP # pango
 	help
 	  The rsvg library is an efficient renderer for Scalable
 	  Vector Graphics (SVG) pictures.
 
 	  http://librsvg.sourceforge.net/
+
+comment "librsvg requires a toolchain with WCHAR and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP

From 02f2d52f59e69b212bbec40e82a7b6b256196b53 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Jan 2013 13:24:20 +0100
Subject: [PATCH 3757/6849] gst-plugins-bad: rsvg support needs C++ (but no
 longer GTK+)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index d87aec4aa7..9dd2daab83 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -288,9 +288,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
 	bool "rsvg"
-	depends on BR2_PACKAGE_LIBGTK2
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBRSVG
 
+comment "rsvg plugin requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
 	select BR2_PACKAGE_SDL

From 65207ec2d1066ec45c77ad8a644e10d1074905f5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Jan 2013 13:26:16 +0100
Subject: [PATCH 3758/6849] libevas-generic-loaders: fix rsvg dependencies

Fixes http://autobuild.buildroot.net/results/f9bab292708f885f5e9713901952406f650491c2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas-generic-loaders/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
index 44bc37da2b..bfa6097622 100644
--- a/package/efl/libevas-generic-loaders/Config.in
+++ b/package/efl/libevas-generic-loaders/Config.in
@@ -15,7 +15,11 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 	select BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_CAIRO
 	depends on BR2_USE_WCHAR # librsvg -> glib2
+	depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
 	help
 	  This option enables the Evas generic SVG loader
 
+comment "SVG loader requires a toolchain with WCHAR and C++ support"
+	depends on !BR2_USE_WCHAR && !BR2_INSTALL_LIBSTDCPP
+
 endif

From 76d190078dc0960e4278cbcb18c85c0b8e82b47b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Jan 2013 13:34:15 +0100
Subject: [PATCH 3759/6849] spice: entire client support needs C++/threads, not
 just start dialog gui

Fixes http://autobuild.buildroot.net/results/230e6d78e3ec740a7794316cc388c6685e040946

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spice/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/spice/Config.in b/package/spice/Config.in
index 0c2c7a643a..cd9183318b 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -32,17 +32,17 @@ comment "client depends on X.org"
 config BR2_PACKAGE_SPICE_CLIENT
 	bool "Enable client"
 	depends on BR2_PACKAGE_XORG7
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_XLIB_LIBXFIXES
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 
-comment "GUI requires a toolchain with threads and C++"
-	depends on BR2_PACKAGE_SPICE_CLIENT
+comment "client requires a toolchain with threads and C++"
+	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_SPICE_GUI
 	bool "Enable GUI"
-	depends on BR2_TOOLCHAIN_HAS_THREADS    # cegui06
-	depends on BR2_INSTALL_LIBSTDCPP        # cegui06
 	depends on BR2_PACKAGE_SPICE_CLIENT
 	select BR2_PACKAGE_CEGUI06
 	help

From 3628791f6f978d23fc07ae0d94a09a1153d2de85 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 1 Jan 2013 13:57:08 +0100
Subject: [PATCH 3760/6849] libeet: fix build with gcrypt

libeet needs both gnutls and libgcrypt for ssl handling.

Fixes http://autobuild.buildroot.net/results/tmp/f45782cf73338930644c69dccf2f18167083d121/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libeet/libeet.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index a5a1ce1d5b..70341987d6 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -14,5 +14,13 @@ LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
 
+ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
+LIBEET_DEPENDENCIES += gnutls libgcrypt
+LIBEET_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+LIBEET_CONF_OPT += --enable-gnutls
+else
+LIBEET_CONF_OPT += --disable-gnutls
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From a24479144fb71a1c6a6b6fb16799cc83f49be56c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 31 Dec 2012 01:41:35 +0000
Subject: [PATCH 3761/6849] package/dvb-apps: fix downloading

As we're using the sources from the Mercurial repository, and Buildroot
does support retrieving from a Mercurial repository, there is no need
to try (and fail1) getting the archive from the Mercurial built-in
tarball mechanism.

(Note: I was beaten by this because I had a cached copy locally, left
after the previous tvheadend-vampirises-files-from-toher-packages attempt,
that I forgot to delete before testing. Ouch...)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/dvb-apps.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index 721fbf0e08..5db81483ba 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -5,8 +5,8 @@
 #############################################################
 
 DVB_APPS_VERSION        = 3fc7dfa68484
-DVB_APPS_SOURCE         = dvb-apps-$(DVB_APPS_VERSION).tar.bz2
-DVB_APPS_SITE           = http://linuxtv.org/hg/dvb-apps/archive/
+DVB_APPS_SITE           = http://linuxtv.org/hg/dvb-apps
+DVB_APPS_SITE_METHOD    = hg
 
 # We just install the transponders data. As this is not a 'work' as per
 # traditional copyright, but just a collection of 'facts', there's probably

From 560e7db37433fc82760f71557dbc3e495f05f909 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 1 Jan 2013 03:23:58 +0000
Subject: [PATCH 3762/6849] efl/libecore: fix build with gcrypt

When building with gnutls, libecore also needs libgcrypt.

Fixes:

  http://autobuild.buildroot.org/results/4da454d6414cf8f4e638defae9b793fb46a0a072/build-end.log

While we're at it, also explicit the --enable-openssl /
--disable-openssl depending on whether openssl is available or not.

[Peter: only enable gnutls support when both gnutls and gcrypt are enabled]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libecore/libecore.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 0220017dfd..dfc5750231 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -36,10 +36,16 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBECORE_DEPENDENCIES += openssl
+LIBECORE_CONF_OPT += --enable-openssl
+else
+LIBECORE_CONF_OPT += --disable-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
-LIBECORE_DEPENDENCIES += gnutls
+ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
+LIBECORE_DEPENDENCIES += gnutls libgcrypt
+LIBECORE_CONF_OPT += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+LIBECORE_CONF_OPT += --disable-gnutls
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)

From 2147db9bdecd7b52ed53bbcd49f4f0e7a1ad1b23 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 1 Jan 2013 06:49:23 +0000
Subject: [PATCH 3763/6849] package/tvheadend: does not reqquire wordexp

Builds just fine without it (probably stray include?)

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/tvheadend-no-wordexp.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/tvheadend/tvheadend-no-wordexp.patch

diff --git a/package/tvheadend/tvheadend-no-wordexp.patch b/package/tvheadend/tvheadend-no-wordexp.patch
new file mode 100644
index 0000000000..ae290edaf8
--- /dev/null
+++ b/package/tvheadend/tvheadend-no-wordexp.patch
@@ -0,0 +1,20 @@
+epggrab: do not include wordexp.h
+
+Nothing from wordexp.h is needed (stray include?)
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Patch sent upstream, but no mailing-list. :-(
+Status: awaiting feedback.
+
+diff -durN tvheadend-v3.3.orig/src/epggrab.c tvheadend-v3.3/src/epggrab.c
+--- tvheadend-v3.3.orig/src/epggrab.c	2012-09-25 15:32:31.000000000 +0200
++++ tvheadend-v3.3/src/epggrab.c	2012-12-31 19:22:29.768431849 +0100
+@@ -20,7 +20,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
+-#include <wordexp.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/un.h>

From b468f3cf525e9c9312e52be78599842deaf791c0 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Dec 2012 12:17:44 +0000
Subject: [PATCH 3764/6849] lttng-libust: bump to 2.1.0

Also remove lttng-libust-uclibc-sed_getcpu.patch because it got merged
upstream.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...t-build-cxx-tests-when-not-available.patch | 13 ++++----
 .../lttng-libust-uclibc-sched_getcpu.patch    | 32 -------------------
 package/lttng-libust/lttng-libust.mk          |  2 +-
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch

diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
index bcc5636b5f..b7e8a8f091 100644
--- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
+++ b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
@@ -38,15 +38,16 @@ index 26227cb..56d84db 100644
 +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
 +
  ## Checks for libraries.
- AC_CHECK_LIB([dl], [dlopen])
- AC_CHECK_LIB([pthread], [pthread_create])
+ AC_CHECK_LIB([dl], [dlopen],
+ [
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e79ab7c..1a8b795 100644
+index 2b12422..7365ce4 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -1,6 +1,10 @@
--SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx
-+SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo
+@@ -1,7 +1,11 @@
+ SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
+-		demo hello.cxx daemon
++		demo daemon
  #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
  
 +if CXX_WORKS
diff --git a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
deleted file mode 100644
index 65361858f2..0000000000
--- a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-[PATCH] fix build with modern uClibc
-
-uClibc has sched_getcpu since 0.9.33, so the compat workaround should only
-be used for older uClibc versions.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- liblttng-ust/compat.h |    5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: lttng-ust-1.9.2/liblttng-ust/compat.h
-===================================================================
---- lttng-ust-1.9.2.orig/liblttng-ust/compat.h
-+++ lttng-ust-1.9.2/liblttng-ust/compat.h
-@@ -17,6 +17,10 @@
- #include <sys/syscall.h>
- 
- #ifdef __UCLIBC__
-+/* old uClibc versions didn't have sched_getcpu */
-+#if __UCLIBC_MAJOR__ == 0 && \
-+	(__UCLIBC_MINOR__ < 9 || \
-+	 (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
- #define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
- static inline
- int sched_getcpu(void)
-@@ -26,5 +30,6 @@
- 	s = __getcpu(&c, NULL, NULL);
- 	return (s == -1) ? s : c;
- }
-+#endif /* <= 0.9.32 */
- #endif	/* __UCLIBC__ */
- #endif /* _UST_COMPAT_H */
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index cd6c65d57a..e1f51b1dbe 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.0.3
+LTTNG_LIBUST_VERSION = 2.1.0
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES

From cf32809c5e04eb0fffa3edf0b8323c8ea0183b05 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Dec 2012 12:17:45 +0000
Subject: [PATCH 3765/6849] lttng-modules: bump to 2.1.0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-modules/lttng-modules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index a245b190bc..54ae864141 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -3,7 +3,7 @@
 # LTTng-modules: the kernel modules (requires at least Linux 2.6.38)
 #
 #############################################################
-LTTNG_MODULES_VERSION = 2.0.3
+LTTNG_MODULES_VERSION = 2.1.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 

From 3f538e53e1250263f7d2a3bc7d0f0c738265c940 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Dec 2012 12:17:46 +0000
Subject: [PATCH 3766/6849] lttng-tools: bump to 2.1.0

* add patch adding src/bin/lttng-sessiond/lttng-ust-error.h which is
  missing in the lttng-tools-2.1.0 release tarball.
* update the sync_file_range patch.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ols-Support-new-lttng-ust-error-code.patch | 82 +++++++++++++++++++
 ...g-tools-no-sync-file-range-in-uclibc.patch | 51 ++++++------
 package/lttng-tools/lttng-tools.mk            |  5 +-
 3 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch

diff --git a/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch b/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
new file mode 100644
index 0000000000..73d0884aee
--- /dev/null
+++ b/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
@@ -0,0 +1,82 @@
+From 49c336c1679295a31b92223dca05feccfe3e3464 Mon Sep 17 00:00:00 2001
+From: David Goulet <dgoulet@efficios.com>
+Date: Fri, 9 Nov 2012 13:37:25 -0500
+Subject: [PATCH] Support new lttng-ust error code
+
+Signed-off-by: David Goulet <dgoulet@efficios.com>
+---
+
+Only keep the src/bin/lttng-sessiond/lttng-ust-error.h adding part,
+needed to build lttng-tool without the lttng-libust dependency, i.e.
+with --disable-lttng-ust. (Samuel Martin)
+
+---
+ src/bin/lttng-sessiond/lttng-ust-error.h | 56 ++++++++++++++++++++++++++++++++
+ 6 files changed, 75 insertions(+), 13 deletions(-)
+ create mode 100644 src/bin/lttng-sessiond/lttng-ust-error.h
+
+diff --git a/src/bin/lttng-sessiond/lttng-ust-error.h b/src/bin/lttng-sessiond/lttng-ust-error.h
+new file mode 100644
+index 0000000..d83ecb8
+--- /dev/null
++++ b/src/bin/lttng-sessiond/lttng-ust-error.h
+@@ -0,0 +1,56 @@
++#ifndef _LTTNG_UST_ERROR_H
++#define _LTTNG_UST_ERROR_H
++
++/*
++ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
++ *                      Julien Desfossez <julien.desfossez@polymtl.ca>
++ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; only
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++/*
++ * This header is meant for liblttng and libust internal use ONLY.
++ * These declarations should NOT be considered stable API.
++ */
++
++#include <limits.h>
++#include <unistd.h>
++
++#include "lttng-ust-abi.h"
++
++/*
++ * ustcomm error code.
++ */
++enum lttng_ust_error_code {
++	LTTNG_UST_OK = 0,			/* Ok */
++	LTTNG_UST_ERR = 1024,			/* Unknown Error */
++	LTTNG_UST_ERR_NOENT = 1025,		/* No entry */
++	LTTNG_UST_ERR_EXIST = 1026,     /* Object exists */
++	LTTNG_UST_ERR_INVAL = 1027,     /* Invalid argument */
++	LTTNG_UST_ERR_PERM  = 1028,     /* Permission denied */
++	LTTNG_UST_ERR_NOSYS = 1029,     /* Not implemented */
++
++	/* MUST be last element */
++	LTTNG_UST_ERR_NR,			/* Last element */
++};
++
++/*
++ * Return a human-readable error message for an lttng-ust error code.
++ * code must be a positive value (or 0).
++ */
++extern const char *lttng_ust_strerror(int code);
++
++#endif	/* _LTTNG_UST_ERROR_H */
+-- 
+1.8.0.3
+
diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
index 3a1807ed50..fcaaa3e32d 100644
--- a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
+++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
@@ -16,35 +16,36 @@ diff --git a/configure.ac b/configure.ac
 index 5808c79..065b9cf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -120,7 +120,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
-
- AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
-
+@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
+ 	)
+ ])
+ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
 -AC_CHECK_FUNCS([sched_getcpu sysconf])
 +AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
-
+ 
  # check for dlopen
  AC_CHECK_LIB([dl], [dlopen],
-diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h
-index 58c1579..dafb33e 100644
---- a/src/common/compat/fcntl.h
-+++ b/src/common/compat/fcntl.h
-@@ -23,10 +23,15 @@
-
- #ifdef __linux__
-
-+#if defined(HAVE_SYNC_FILE_RANGE)
- extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
- 		unsigned int flags);
- #define lttng_sync_file_range(fd, offset, nbytes, flags) \
- 	compat_sync_file_range(fd, offset, nbytes, flags)
+@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[
+ ])
+ 
+ AS_ECHO()
+-
+diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c
+index 5a1c757..7ff63a3 100644
+--- a/src/common/compat/compat-fcntl.c
++++ b/src/common/compat/compat-fcntl.c
+@@ -23,7 +23,11 @@
+ int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+ 		unsigned int flags)
+ {
++#ifdef HAVE_SYNC_FILE_RANGE
+ 	return sync_file_range(fd, offset, nbytes, flags);
 +#else
-+#define lttng_sync_file_range(fd, offset, nbytes, flags) \
-+	fdatasync(fd);
++	return fdatasync(fd);
 +#endif
-
- #elif defined(__FreeBSD__)
-
---
-1.7.10
+ }
+ 
+ #endif /* __linux__ */
+-- 
+1.8.0.3
 
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index fe48ac6fae..18477ba4c0 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -3,7 +3,7 @@
 # LTTng-Tools: the trace control client
 #
 #############################################################
-LTTNG_TOOLS_VERSION = 2.0.4
+LTTNG_TOOLS_VERSION = 2.1.0
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 
@@ -11,6 +11,9 @@ LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 # dependency. However, having the babeltrace utilities built for the
 # host is very useful, since those tools allow to convert the binary
 # trace format into an human readable format.
+# Since the 2.1.0 release, lttng-tools depends on flex and bison,
+# but they are not added to the dependency list since they are
+# already Buildroot dependencies.
 LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace
 
 LTTNG_AUTORECONF = YES

From d70a9f6d645130fd1354ed040a132ac8ed71f46b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Dec 2012 12:17:47 +0000
Subject: [PATCH 3767/6849] lttng-babeltrace: bump to 1.0.0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-babeltrace/lttng-babeltrace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index dd701dfe5b..60b8a9353f 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -1,5 +1,5 @@
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
-LTTNG_BABELTRACE_VERSION = 1.0.0-rc6
+LTTNG_BABELTRACE_VERSION = 1.0.0
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2

From b4c0647e14fe329a8ac3d1d5de064e22b3624eda Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 20 Dec 2012 00:14:54 +0100
Subject: [PATCH 3768/6849] valgrind: rename patches without version in the
 filename

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...d-3.7.0-compiler-check.patch => valgrind-compiler-check.patch} | 0
 ...-out-header.patch => valgrind-dont-include-a-out-header.patch} | 0
 ...fix-ccache-support.patch => valgrind-fix-ccache-support.patch} | 0
 .../{valgrind-3.7.0-largefile.patch => valgrind-largefile.patch}  | 0
 ...algrind-3.7.0-more-ioctls.patch => valgrind-more-ioctls.patch} | 0
 ...SEGV-on-PPC.patch => valgrind-workaround-SIGSEGV-on-PPC.patch} | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename package/valgrind/{valgrind-3.7.0-compiler-check.patch => valgrind-compiler-check.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-dont-include-a-out-header.patch => valgrind-dont-include-a-out-header.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-fix-ccache-support.patch => valgrind-fix-ccache-support.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-largefile.patch => valgrind-largefile.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-more-ioctls.patch => valgrind-more-ioctls.patch} (100%)
 rename package/valgrind/{valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch => valgrind-workaround-SIGSEGV-on-PPC.patch} (100%)

diff --git a/package/valgrind/valgrind-3.7.0-compiler-check.patch b/package/valgrind/valgrind-compiler-check.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-compiler-check.patch
rename to package/valgrind/valgrind-compiler-check.patch
diff --git a/package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch b/package/valgrind/valgrind-dont-include-a-out-header.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
rename to package/valgrind/valgrind-dont-include-a-out-header.patch
diff --git a/package/valgrind/valgrind-3.7.0-fix-ccache-support.patch b/package/valgrind/valgrind-fix-ccache-support.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-fix-ccache-support.patch
rename to package/valgrind/valgrind-fix-ccache-support.patch
diff --git a/package/valgrind/valgrind-3.7.0-largefile.patch b/package/valgrind/valgrind-largefile.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-largefile.patch
rename to package/valgrind/valgrind-largefile.patch
diff --git a/package/valgrind/valgrind-3.7.0-more-ioctls.patch b/package/valgrind/valgrind-more-ioctls.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-more-ioctls.patch
rename to package/valgrind/valgrind-more-ioctls.patch
diff --git a/package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch
rename to package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch

From 85510dae95f90c0d8d5af65715dfa2dd9fe78be5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 19 Dec 2012 13:14:55 +0000
Subject: [PATCH 3769/6849] valgrind: bump to 3.8.1

Status of the patches:

 * valgrind-compiler-check.patch, no longer needed, merged upstream.

 * valgrind-dont-include-a-out-header.patch, kept, just refreshed

 * valgrind-fix-ccache-support.patch, adapted to the newer Valgrind
   release.

 * valgrind-largefile.patch, kept, just refreshed

 * valgrind-more-ioctls.patch, removed. Most of it was merged
   upstream. This patch was anyway a feature addition, so it shouldn't
   be kept in Buildroot.

 * valgrind-workaround-SIGSEGV-on-PPC.patch, kept as is, just
   refreshed.

This bump also fixes the build failure we were experiencing with
Valgrind 3.7.0 against recent Glibc versions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../valgrind/valgrind-compiler-check.patch    |  76 -------
 .../valgrind-dont-include-a-out-header.patch  |   2 +-
 .../valgrind-fix-ccache-support.patch         |  54 +++--
 package/valgrind/valgrind-largefile.patch     |  20 +-
 package/valgrind/valgrind-more-ioctls.patch   | 203 ------------------
 .../valgrind-workaround-SIGSEGV-on-PPC.patch  |   6 +-
 package/valgrind/valgrind.mk                  |   2 +-
 7 files changed, 41 insertions(+), 322 deletions(-)
 delete mode 100644 package/valgrind/valgrind-compiler-check.patch
 delete mode 100644 package/valgrind/valgrind-more-ioctls.patch

diff --git a/package/valgrind/valgrind-compiler-check.patch b/package/valgrind/valgrind-compiler-check.patch
deleted file mode 100644
index 4a9fcbac17..0000000000
--- a/package/valgrind/valgrind-compiler-check.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Fix the compiler version check so that it doesn't misdetect the
-version when the compiler version contains parenthesis.
-
-Taken from upstream r12274.
-
-Index: valgrind-3.7.0/configure.in
-===================================================================
---- valgrind-3.7.0.orig/configure.in	2011-12-22 15:21:22.269669307 +0100
-+++ valgrind-3.7.0/configure.in	2011-12-22 15:21:54.029135051 +0100
-@@ -98,18 +98,21 @@
- # We don't want gcc < 3.0
- AC_MSG_CHECKING([for a supported version of gcc])
- 
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
- # 
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# A few examples of how the ${CC} --version output looks like:
-+#
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
- #
- [gcc_version=`${CC} --version \
--             | head -n 1 \
--             | $SED 's/i686-apple-darwin10//' \
--             | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
-Index: valgrind-3.7.0/configure
-===================================================================
---- valgrind-3.7.0.orig/configure	2011-12-22 15:22:05.138948143 +0100
-+++ valgrind-3.7.0/configure	2011-12-22 15:23:34.807439246 +0100
-@@ -5122,18 +5122,22 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a supported version of gcc" >&5
- $as_echo_n "checking for a supported version of gcc... " >&6; }
- 
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
-+# 
-+# A few examples of how the ${CC} --version output looks like:
- #
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
- #
- gcc_version=`${CC} --version \
--             | head -n 1 \
--             | $SED 's/i686-apple-darwin10//' \
--             | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`
-+             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`
-+
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/package/valgrind/valgrind-dont-include-a-out-header.patch b/package/valgrind/valgrind-dont-include-a-out-header.patch
index ed1c939ed6..2afd44a886 100644
--- a/package/valgrind/valgrind-dont-include-a-out-header.patch
+++ b/package/valgrind/valgrind-dont-include-a-out-header.patch
@@ -20,7 +20,7 @@ Index: b/coregrind/m_debuginfo/readstabs.c
 ===================================================================
 --- a/coregrind/m_debuginfo/readstabs.c
 +++ b/coregrind/m_debuginfo/readstabs.c
-@@ -52,7 +52,21 @@
+@@ -53,7 +53,21 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #if defined(VGO_linux)
diff --git a/package/valgrind/valgrind-fix-ccache-support.patch b/package/valgrind/valgrind-fix-ccache-support.patch
index 56d984b0ba..40ada8d81b 100644
--- a/package/valgrind/valgrind-fix-ccache-support.patch
+++ b/package/valgrind/valgrind-fix-ccache-support.patch
@@ -11,41 +11,39 @@ is:
 
   /path/to/ccache /path/to/crossgcc -o foobar foobar.c -someflags
 
-Since this Perl script simply needs to add additional flags to the
-command line, we simply add them at the end of the command line
-instead of trying to add them at the beginning.
+Therefore, we tune the script to take into account the case where
+ccache is used.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: valgrind-3.6.1/coregrind/link_tool_exe_linux.in
+Index: b/coregrind/link_tool_exe_linux.in
 ===================================================================
---- valgrind-3.6.1.orig/coregrind/link_tool_exe_linux.in	2011-12-22 13:59:08.933499060 +0100
-+++ valgrind-3.6.1/coregrind/link_tool_exe_linux.in	2011-12-22 13:59:50.302782709 +0100
-@@ -55,25 +55,13 @@
-     if (($#ARGV + 1) < 5);
- 
- my $ala = $ARGV[0];
-+shift;
- 
- # check for plausible-ish alt load address
+--- a/coregrind/link_tool_exe_linux.in
++++ b/coregrind/link_tool_exe_linux.in
+@@ -60,8 +60,16 @@
  die "Bogus alt-load address"
      if (length($ala) < 3 || index($ala, "0x") != 0);
  
--# The cc invokation to do the final link
++shift(@ARGV);
++
++if ($ARGV[0] =~ /.*ccache/) {
++    shift(@ARGV);
++}
++
+ # The cc invokation to do the final link
 -my $cc = $ARGV[1];
--
--# and the 'restargs' are argv[2 ..]
--
--# so, build up the complete command here:
--# 'cc' -static -Ttext='ala' 'restargs'
--
--my $cmd="$cc -static -Wl,-Ttext=$ala";
--
--# Add the rest of the parameters
--foreach my $n (2 .. $#ARGV) {
--   $cmd = "$cmd $ARGV[$n]";
--}
-+my $cmd=join(" ", @ARGV) . " -static -Wl,-Ttext=$ala";
++my $cc = $ARGV[0];
++
++shift(@ARGV);
  
- #print "link_tool_exe_linux: $cmd\n";
+ # and the 'restargs' are argv[2 ..]
+ 
+@@ -82,7 +90,7 @@
+ }
+ 
+ # Add the rest of the parameters
+-foreach my $n (2 .. $#ARGV) {
++foreach my $n (0 .. $#ARGV) {
+    $cmd = "$cmd $ARGV[$n]";
+ }
  
diff --git a/package/valgrind/valgrind-largefile.patch b/package/valgrind/valgrind-largefile.patch
index 53b6e6fa8a..3a8a780f0d 100644
--- a/package/valgrind/valgrind-largefile.patch
+++ b/package/valgrind/valgrind-largefile.patch
@@ -6,10 +6,10 @@ is detected.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 
-Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
+Index: b/coregrind/m_initimg/initimg-linux.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_initimg/initimg-linux.c	2011-10-26 23:24:43.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c	2011-12-22 14:53:12.798185055 +0100
+--- a/coregrind/m_initimg/initimg-linux.c
++++ b/coregrind/m_initimg/initimg-linux.c
 @@ -55,7 +55,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
@@ -22,11 +22,11 @@ Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
  /* This is for ELF types etc, and also the AT_ constants. */
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.7.0/coregrind/m_main.c
+Index: b/coregrind/m_main.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_main.c	2011-10-26 23:24:45.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_main.c	2011-12-22 14:53:12.798185055 +0100
-@@ -2743,7 +2743,11 @@
+--- a/coregrind/m_main.c
++++ b/coregrind/m_main.c
+@@ -2948,7 +2948,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #define _GNU_SOURCE
@@ -38,10 +38,10 @@ Index: valgrind-3.7.0/coregrind/m_main.c
  /* This is in order to get AT_NULL and AT_PAGESIZE. */
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.7.0/coregrind/m_ume/elf.c
+Index: b/coregrind/m_ume/elf.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_ume/elf.c	2011-10-26 23:24:41.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_ume/elf.c	2011-12-22 14:53:12.798185055 +0100
+--- a/coregrind/m_ume/elf.c
++++ b/coregrind/m_ume/elf.c
 @@ -48,7 +48,11 @@
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
diff --git a/package/valgrind/valgrind-more-ioctls.patch b/package/valgrind/valgrind-more-ioctls.patch
deleted file mode 100644
index fb58381201..0000000000
--- a/package/valgrind/valgrind-more-ioctls.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Add various ioctl()s
-
-Patch initially written by Eric Andersen <andersen@codepoet.org>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c
-===================================================================
---- valgrind-3.7.0.orig/coregrind/m_syswrap/syswrap-linux.c	2011-10-27 12:55:05.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c	2011-12-22 14:53:16.258126390 +0100
-@@ -4058,7 +4058,33 @@
-    case VKI_SG_GET_SG_TABLESIZE: /* 0x227f */
-       PRE_MEM_WRITE( "ioctl(SG_GET_SG_TABLESIZE)", ARG3, sizeof(int) );
-       break;
-+   case VKI_SCSI_IOCTL_GET_IDLUN:
-+      PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_IDLUN)", ARG3, sizeof(vki_scsi_idlun_t) );
-+      break;
-+   case VKI_SCSI_IOCTL_PROBE_HOST:
-+      {
-+	  int arraylen;
-+	  char *array = (char*)ARG3;
-+	  PRE_MEM_READ("ioctl(SCSI_IOCTL_PROBE_HOST)",  ARG3, sizeof(char)*4 );
-+	  arraylen = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24);
-+	  PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_PROBE_HOST)", ARG3, sizeof(char)*arraylen );
-+      }
-+      break;
-+   case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
-+      PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", ARG3, sizeof(int) );
-+      break;
- 
-+   case VKI_FDRESET:
-+      break;
-+   case VKI_FDGETDRVTYP:
-+      PRE_MEM_WRITE( "ioctl(FDGETDRVTYP)", ARG3, sizeof(char)*16 );
-+      break;
-+   case VKI_FDPOLLDRVSTAT:
-+      PRE_MEM_WRITE( "ioctl(FDPOLLDRVSTAT)", ARG3, sizeof(vki_floppy_drive_struct_t) );
-+      break;
-+   case VKI_FDGETPRM:
-+      PRE_MEM_WRITE( "ioctl(FDGETPRM)", ARG3, sizeof(vki_floppy_struct_t) );
-+      break;
-    case VKI_IIOCGETCPS:
-       PRE_MEM_WRITE( "ioctl(IIOCGETCPS)", ARG3,
- 		     VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
-@@ -4373,6 +4399,8 @@
-    case VKI_BLKROGET:
-       PRE_MEM_WRITE( "ioctl(BLKROGET)", ARG3, sizeof(int));
-       break;
-+   case VKI_BLKRRPART:
-+      break;
-    case VKI_BLKGETSIZE:
-       PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
-       break;
-@@ -4381,6 +4409,8 @@
-    case VKI_BLKRAGET:
-       PRE_MEM_WRITE( "ioctl(BLKRAGET)", ARG3, sizeof(long));
-       break;
-+   case VKI_BLKFLSBUF:
-+      break;
-    case VKI_BLKFRASET:
-       break;
-    case VKI_BLKFRAGET:
-@@ -4447,6 +4477,8 @@
-       PRE_MEM_WRITE( "ioctl(CDROMREADTOCENTRY)", ARG3, 
- 		     sizeof(struct vki_cdrom_tocentry));
-       break;
-+   case VKI_CDROMEJECT:
-+      break;
-    case VKI_CDROMMULTISESSION: /* 0x5310 */
-       PRE_MEM_WRITE( "ioctl(CDROMMULTISESSION)", ARG3,
- 		     sizeof(struct vki_cdrom_multisession));
-@@ -5321,7 +5353,28 @@
-    case VKI_SG_GET_SG_TABLESIZE:
-       POST_MEM_WRITE(ARG3, sizeof(int));
-       break;      
-+   case VKI_SCSI_IOCTL_GET_IDLUN:
-+      POST_MEM_WRITE(ARG3, sizeof(vki_scsi_idlun_t));
-+      break;
-+   case VKI_SCSI_IOCTL_PROBE_HOST:
-+      if (RES > 0 && ARG3 )
-+	  POST_MEM_WRITE(ARG3, sizeof(char)*RES);
-+      break;
-+   case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
-+      POST_MEM_WRITE(ARG3, sizeof(int));
-+      break;
- 
-+   case VKI_FDRESET:
-+      break;
-+   case VKI_FDGETDRVTYP:
-+      POST_MEM_WRITE( ARG3, sizeof(char)*16 );
-+      break;
-+   case VKI_FDPOLLDRVSTAT:
-+      POST_MEM_WRITE( ARG3, sizeof(vki_floppy_drive_struct_t) );
-+      break;
-+   case VKI_FDGETPRM:
-+      POST_MEM_WRITE( ARG3, sizeof(vki_floppy_struct_t) );
-+      break;
-    case VKI_IIOCGETCPS:
-       POST_MEM_WRITE( ARG3, VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
-       break;
-@@ -5542,6 +5595,8 @@
-    case VKI_BLKROGET:
-       POST_MEM_WRITE(ARG3, sizeof(int));
-       break;
-+   case VKI_BLKRRPART:
-+      break;
-    case VKI_BLKGETSIZE:
-       POST_MEM_WRITE(ARG3, sizeof(unsigned long));
-       break;
-@@ -5550,6 +5605,8 @@
-    case VKI_BLKRAGET:
-       POST_MEM_WRITE(ARG3, sizeof(long));
-       break;
-+   case VKI_BLKFLSBUF:
-+      break;
-    case VKI_BLKFRASET:
-       break;
-    case VKI_BLKFRAGET:
-@@ -5591,6 +5648,8 @@
-    case VKI_CDROMREADTOCENTRY:
-       POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_tocentry));
-       break;
-+   case VKI_CDROMEJECT:
-+      break;
-    case VKI_CDROMMULTISESSION:
-       POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_multisession));
-       break;
-Index: valgrind-3.7.0/include/vki/vki-linux.h
-===================================================================
---- valgrind-3.7.0.orig/include/vki/vki-linux.h	2011-10-26 23:24:31.000000000 +0200
-+++ valgrind-3.7.0/include/vki/vki-linux.h	2011-12-22 14:53:16.258126390 +0100
-@@ -1654,7 +1654,9 @@
- 
- #define VKI_BLKROSET   _VKI_IO(0x12,93)	/* set device read-only (0 = read-write) */
- #define VKI_BLKROGET   _VKI_IO(0x12,94)	/* get read-only status (0 = read_write) */
-+#define VKI_BLKRRPART  _VKI_IO(0x12,95) /* re-read partition table */
- #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
-+#define VKI_BLKFLSBUF  _VKI_IO(0x12,97) /* flush buffer cache */
- #define VKI_BLKRASET   _VKI_IO(0x12,98)	/* set read ahead for block device */
- #define VKI_BLKRAGET   _VKI_IO(0x12,99)	/* get current read ahead setting */
- #define VKI_BLKFRASET  _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-@@ -1729,6 +1731,53 @@
- //#define SG_GET_COMMAND_Q 0x2270   /* Yields 0 (queuing off) or 1 (on) */
- #define VKI_SG_SET_COMMAND_Q 0x2271   /* Change queuing state with 0 or 1 */
- 
-+typedef struct vki_scsi_idlun
-+{
-+    int mux4;
-+    int host_unique_id;
-+
-+} vki_scsi_idlun_t;
-+#define VKI_SCSI_IOCTL_GET_IDLUN 0x5382		/* Gets a struct vki_scsi_idlun */
-+#define VKI_SCSI_IOCTL_PROBE_HOST 0x5385	/* Gets an arrary describing the SCSI host */
-+#define VKI_SCSI_IOCTL_GET_BUS_NUMBER 0x5386	/* Get the bus number for a device */
-+
-+//----------------------------------------------------------------------
-+// From linux-2.6.8.1/include/linux/fd.h
-+//----------------------------------------------------------------------
-+#define VKI_FDRESET 0x254		/* Takes an int by value */
-+#define VKI_FDGETDRVTYP 0x20f	/* Returns char floppy_drive_name[16] */
-+typedef struct vki_floppy_drive_struct {
-+	unsigned long flags;
-+	unsigned long spinup_date;
-+	unsigned long select_date;
-+	unsigned long first_read_date;
-+	short probed_format;
-+	short track;
-+	short maxblock;
-+	short maxtrack;
-+	int generation;
-+	int keep_data;
-+	int fd_ref;
-+	int fd_device;
-+	unsigned long last_checked;
-+	char *dmabuf;
-+	int bufblocks;
-+} vki_floppy_drive_struct_t;
-+#define VKI_FDPOLLDRVSTAT 0x213	    /* returns a struct floppy_drive_struct */
-+typedef struct vki_floppy_struct {
-+	unsigned int	size;
-+	unsigned int	sect;
-+	unsigned int	head;
-+	unsigned int	track;
-+	unsigned int	stretch;
-+	unsigned char	gap;
-+	unsigned char	rate;
-+	unsigned char	spec1;
-+	unsigned char	fmt_gap;
-+	const char	* name;
-+} vki_floppy_struct_t;
-+#define VKI_FDGETPRM 0x204	    /* returns a struct floppy_struct */
-+
- //----------------------------------------------------------------------
- // From linux-2.6.8.1/include/linux/cdrom.h
- //----------------------------------------------------------------------
-@@ -1738,6 +1787,7 @@
-                                            (struct cdrom_tochdr) */
- #define VKI_CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
-                                            (struct cdrom_tocentry) */
-+#define VKI_CDROMEJECT		0x5309 /* Eject cdrom media */
- #define VKI_CDROMSUBCHNL	0x530b /* Read subchannel data 
-                                            (struct cdrom_subchnl) */
- #define VKI_CDROMREADMODE2	0x530c /* Read CDROM mode 2 data (2336 Bytes) 
diff --git a/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
index ea91a007e9..3358c24ce3 100644
--- a/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
+++ b/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
@@ -8,10 +8,10 @@ Signed-off-by: Pierre Habouzit <madcoder@debian.org>
  coregrind/m_machine.c |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
 
-Index: valgrind-3.7.0/coregrind/m_machine.c
+Index: b/coregrind/m_machine.c
 ===================================================================
---- valgrind-3.7.0.orig/coregrind/m_machine.c	2011-10-27 12:45:52.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_machine.c	2011-12-22 14:53:19.758067046 +0100
+--- a/coregrind/m_machine.c
++++ b/coregrind/m_machine.c
 @@ -27,6 +27,10 @@
     The GNU General Public License is contained in the file COPYING.
  */
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index cdebbec1cb..ff35e6c8e4 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-VALGRIND_VERSION = 3.7.0
+VALGRIND_VERSION = 3.8.1
 VALGRIND_SITE    = http://valgrind.org/downloads/
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPLv2 GFDLv1.2

From 86d9bda613689229b55445ad90673754f75318ef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 2 Jan 2013 11:18:47 +0100
Subject: [PATCH 3770/6849] libeet: host variant doesn't need gnutls / gcrypt

Fixes http://autobuild.buildroot.net/results/2127880b551d57f16c7907481eeac22e601868eb/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libeet/libeet.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index 70341987d6..3d5b46054e 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -13,6 +13,7 @@ LIBEET_LICENSE_FILES = COPYING
 LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
+HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-jpeg host-libeina
 
 ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
 LIBEET_DEPENDENCIES += gnutls libgcrypt

From 4500504488d04bbe8afa5b240d219627d85ee4e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Jan 2013 03:47:02 +0000
Subject: [PATCH 3771/6849] gnupg: security bump to version 1.4.13

Fixes CVE-2012-6085.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnupg/gnupg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index e63c33c096..7c25ad1c03 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUPG_VERSION = 1.4.12
+GNUPG_VERSION = 1.4.13
 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
 GNUPG_LICENSE = GPLv3+

From 16bcf46a63871b6f0768a59b786a272f8fa312a2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Jan 2013 03:54:32 +0000
Subject: [PATCH 3772/6849] arch/sparc: drop old SUN-specific variants

Drop the old Sun-specific variants used in old workstations (pre-1997)
and other useless ones.

The V7 ISA is a very old cpu only used in the first Sun workstations,
the toolchain support is broken: the cpu doesn't do hardware div and
it's not handled elsewhere.

The sparclite is also a very old Fujitsu cpu only used in early 90s Sun
machines (includes f930 & f934).

The sparclet (tsc701) was a microcontroller-variant.

The supersparc and hypersparc are just V8 variants also used in old Sun
workstations/servers.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.sparc | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index e1f72cc7b3..33204a2484 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -1,14 +1,10 @@
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_sparc
-	default BR2_sparc_v7
+	default BR2_sparc_v8
 	help
 	  Specific CPU variant to use
 
-config BR2_sparc_v7
-	bool "v7"
-config BR2_sparc_cypress
-	bool "cypress"
 config BR2_sparc_v8
 	bool "v8"
 config BR2_sparc_sparchfleon
@@ -19,22 +15,6 @@ config BR2_sparc_sparcsfleon
 	bool "sfleon"
 config BR2_sparc_sparcsfleonv8
 	bool "sfleonv8"
-config BR2_sparc_supersparc
-	bool "supersparc"
-config BR2_sparc_sparclite
-	bool "sparclite"
-config BR2_sparc_f930
-	bool "f930"
-config BR2_sparc_f934
-	bool "f934"
-config BR2_sparc_hypersparc
-	bool "hypersparc"
-config BR2_sparc_sparclite86x
-	bool "sparclite86x"
-config BR2_sparc_sparclet
-	bool "sparclet"
-config BR2_sparc_tsc701
-	bool "tsc701"
 endchoice
 
 config BR2_ARCH
@@ -44,17 +24,7 @@ config BR2_ENDIAN
 	default "BIG"
 
 config BR2_GCC_TARGET_TUNE
-	default "v7"		if BR2_sparc_v7
-	default "cypress"	if BR2_sparc_cypress
 	default "v8"		if BR2_sparc_v8
-	default "supersparc"	if BR2_sparc_supersparc
-	default "hypersparc"	if BR2_sparc_hypersparc
-	default "sparclite"	if BR2_sparc_sparclite
-	default "f930"		if BR2_sparc_f930
-	default "f934"		if BR2_sparc_f934
-	default "sparclite86x"	if BR2_sparc_sparclite86x
-	default "sparclet"	if BR2_sparc_sparclet
-	default "tsc701"	if BR2_sparc_tsc701
 	default "v9"		if BR2_sparc_v9
 	default "v9"		if BR2_sparc_v9a
 	default "v9"		if BR2_sparc_v9b

From 5406b810d032efbabd09e767c16324b912750d46 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Jan 2013 03:54:33 +0000
Subject: [PATCH 3773/6849] qemu/sparc-ss10: switch to v8 optimization

Switch to generic V8 optimization for gcc since we dropped the explicit
supersparc one and works just the same.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sparc_ss10_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 38bf243b9c..0b65866fc3 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -1,6 +1,6 @@
 # Architecture
 BR2_sparc=y
-BR2_sparc_supersparc=y
+BR2_sparc_v8=y
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y

From 50e562bc4ab83128f093f44b34327f8c23782b06 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Jan 2013 04:50:09 +0000
Subject: [PATCH 3774/6849] gnutls: fix build failure related to pthreads

The pthreads autodetection poisons the linkpath thus making other
distribution libraries to take precedence over the cross ones.
Leading to failures such as:
http://autobuild.buildroot.net/results/tmp/3f979d4e2186ee31012c332fedec9591890b0b77

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 0166a74155..1cbcf70219 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -17,6 +17,9 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \
 	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)
 GNUTLS_INSTALL_STAGING = YES
 
+# libpthread autodetection poisons the linkpath
+GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
+
 # Some examples in doc/examples use wchar
 define GNUTLS_DISABLE_DOCS
 	$(SED) 's/ doc / /' $(@D)/Makefile.in

From 7155fb7dd6386377eaf05b7436bc9c5dd024d0ad Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Jan 2013 04:50:10 +0000
Subject: [PATCH 3775/6849] gnutls: handle libidn properly

Add it to the dependencies when it's available.
But disable crywrap when it's a nommu system since it uses fork()

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 1cbcf70219..4c918c1f8b 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -20,6 +20,10 @@ GNUTLS_INSTALL_STAGING = YES
 # libpthread autodetection poisons the linkpath
 GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
 
+# libidn support for nommu must exclude the crywrap wrapper (uses fork)
+GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
+GNUTLS_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBIDN),libidn)
+
 # Some examples in doc/examples use wchar
 define GNUTLS_DISABLE_DOCS
 	$(SED) 's/ doc / /' $(@D)/Makefile.in

From 2404c0db7f32b5194d5a77c7a8040ad1dbf81a45 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 07:08:48 +0000
Subject: [PATCH 3776/6849] graph-depends: remove redundant dependencies

When doing a full graph of the dependencies, graph-depends starts by
doing a "make show-targets", which lists all the packages registered
in the $(TARGETS) variable. This variable contains all packages that
are enabled according to the .config file. Then, for each of those
packages, we used to create a "all" -> "package" dependency, even if
in fact most of some packages are already dependencies of other
packages. This creates a needlessly complex dependency graph.

This patch modifies graph-depends so that it filters out the unneeded
"all" -> "package" dependencies when "package" is already the
dependency of another package.

For example, if you have a configuration with libpng (which selects
zlib), "make show-targets" displays "libpng zlib", so graph-depends
used to create the following dependencies: (all -> libpng, all ->
zlib, libpng -> zlib). However, the (all -> zlib) dependency is not
really needed, as zlib is already the dependency of libpng. Those
dependencies are now filtered out.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 409c123017..c80a65a17d 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -119,6 +119,37 @@ def get_all_depends(pkg):
 def pkg_node_name(pkg):
     return pkg.replace("-","")
 
+# Helper function for remove_redundant_deps(). This function tells
+# whether package "pkg" is the dependency of another package that is
+# not the special "all" package.
+def has_redundant_deps(deps, pkg):
+    for dep in deps:
+        if dep[0] != "all" and dep[1] == pkg:
+            return True
+    return False
+
+# This function removes redundant dependencies of the special "all"
+# package. This "all" package is created to reflect the origin of the
+# selection for all packages that are not themselves selected by any
+# other package. So for example if you enable libpng, zlib is enabled
+# as a dependency. But zlib being selected by libpng, it also appears
+# as a dependency of the "all" package. This needlessly complicates
+# the generated dependency graph. So when we have the dependency list
+# (all -> zlib, all -> libpn, libpng -> zlib), we get rid of the 'all
+# -> zlib' dependency, because zlib is already a dependency of a
+# regular package.
+def remove_redundant_deps(deps):
+    newdeps = []
+    for dep in deps:
+        if dep[0] != "all":
+            newdeps.append(dep)
+            continue
+        if not has_redundant_deps(deps, dep[1]):
+            newdeps.append(dep)
+            continue
+        sys.stderr.write("Removing redundant dep all -> %s\n" % dep[1])
+    return newdeps
+
 # In full mode, start with the result of get_targets() to get the main
 # targets and then use get_all_depends() for each individual target.
 if mode == FULL_MODE:
@@ -144,6 +175,8 @@ if mode == FULL_MODE:
 elif mode == PKG_MODE:
     dependencies = get_all_depends(rootpkg)
 
+dependencies = remove_redundant_deps(dependencies)
+
 # Start printing the graph data
 print "digraph G {"
 

From 41af66ef393754381778ade4228fef7f1ed3cf52 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 07:08:49 +0000
Subject: [PATCH 3777/6849] graph-depends: use a separate TARGET_EXCEPTIONS
 variable

In preparation for more graph-depends improvements, use a
TARGET_EXCEPTIONS list to list all the targets that should be ignored
while building the dependency graph.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index c80a65a17d..d5ef6e09db 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -150,6 +150,15 @@ def remove_redundant_deps(deps):
         sys.stderr.write("Removing redundant dep all -> %s\n" % dep[1])
     return newdeps
 
+TARGET_EXCEPTIONS = [
+    "target-generic-issue",
+    "target-generic-getty-busybox",
+    "target-generic-do-remount-rw",
+    "target-finalize",
+    "erase-fakeroots",
+    "target-generic-hostname",
+]
+
 # In full mode, start with the result of get_targets() to get the main
 # targets and then use get_all_depends() for each individual target.
 if mode == FULL_MODE:
@@ -158,12 +167,7 @@ if mode == FULL_MODE:
     allpkgs.append('all')
     for tg in targets:
         # Skip uninteresting targets
-        if tg == 'target-generic-issue' or \
-                tg == 'target-generic-getty-busybox' or \
-                tg == 'target-generic-do-remount-rw' or \
-                tg == 'target-finalize' or \
-                tg == 'erase-fakeroots' or \
-                tg == 'target-generic-hostname':
+        if tg in TARGET_EXCEPTIONS:
             continue
         dependencies.append(('all', tg))
         deps = get_all_depends(tg)

From 4359685e145798f06d88eb2e5ba5979ba5de882e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 07:08:50 +0000
Subject: [PATCH 3778/6849] graph-depends: optimize execution speed

Until now, graph-depends was calling "make <pkg>-show-depends"
individually for eack package, which was very slow. Now, it calls
"make <pkg1>-show-depends <pkg2>-show-depends ... <pkgN>-show-depends"
for all packages it knows, and then does that recursively. It reduces
the number of make invocations to the deepest dependency chain in the
current configuration, instead of having a number of make invocations
equal to the number of enabled packages.

For a configuration with xvkbd enabled (which brings a significant
number of X.org dependencies) and a tar root filesystem, the time to
execute graph-depends was:

real	5m14.944s
user	4m53.590s
sys	0m14.069s

After our optimizations, it is now:

real	0m33.096s
user	0m30.878s
sys	0m1.472s

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 116 +++++++++++++++++++++-------------
 1 file changed, 71 insertions(+), 45 deletions(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index d5ef6e09db..c168fc4ea0 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -63,52 +63,76 @@ def get_targets():
     return output.split(' ')
 
 # Execute the "make <pkg>-show-depends" command to get the list of
-# dependencies of a given package, and return the list of dependencies
-# formatted as a Python list.
-def get_depends(pkg):
-    sys.stderr.write("Getting dependencies for %s\n" % pkg)
-    cmd = ["make", "-s", "%s-show-depends" % pkg]
+# dependencies of a given list of packages, and return the list of
+# dependencies formatted as a Python dictionary.
+def get_depends(pkgs):
+    sys.stderr.write("Getting dependencies for %s\n" % pkgs)
+    cmd = ["make", "-s" ]
+    for pkg in pkgs:
+        cmd.append("%s-show-depends" % pkg)
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    output = p.communicate()[0].strip()
+    output = p.communicate()[0]
     if p.returncode != 0:
-        return None
-    if output == '':
-        return []
-    return output.split(' ')
+        sys.stderr.write("Error getting dependencies %s\n" % pkgs)
+        sys.exit(1)
+    output = output.split("\n")
+    if len(output) != len(pkgs) + 1:
+        sys.stderr.write("Error getting dependencies\n")
+        sys.exit(1)
+    deps = {}
+    for i in range(0, len(pkgs)):
+        pkg = pkgs[i]
+        pkg_deps = output[i].split(" ")
+        if pkg_deps == ['']:
+            deps[pkg] = []
+        else:
+            deps[pkg] = pkg_deps
+    return deps
 
 # Recursive function that builds the tree of dependencies for a given
-# package. The dependencies are built in a list called 'dependencies',
-# which contains tuples of the form (pkg1 ->
-# pkg2_on_which_pkg1_depends) and the function finally returns this
-# list.
-def get_all_depends(pkg):
+# list of packages. The dependencies are built in a list called
+# 'dependencies', which contains tuples of the form (pkg1 ->
+# pkg2_on_which_pkg1_depends, pkg3 -> pkg4_on_which_pkg3_depends) and
+# the function finally returns this list.
+def get_all_depends(pkgs):
     dependencies = []
 
-    # We already have the dependencies for this package
-    if pkg in allpkgs:
-        return
-    allpkgs.append(pkg)
-    depends = get_depends(pkg)
-
-    # We couldn't get the dependencies of this package, because it
-    # doesn't use the generic or autotools infrastructure. Add it to
-    # unknownpkgs so that it is later rendered in red color to warn
-    # the user.
-    if depends == None:
-        unknownpkgs.append(pkg)
-        return
-
-    # This package has no dependency.
-    if depends == []:
-        return
-
-    # Add dependencies to the list of dependencies
-    for dep in depends:
-        dependencies.append((pkg, dep))
-
-    # Recurse into the dependencies
-    for dep in depends:
-        newdeps = get_all_depends(dep)
+    # Filter the packages for which we already have the dependencies
+    filtered_pkgs = []
+    for pkg in pkgs:
+        if pkg in allpkgs:
+            continue
+        filtered_pkgs.append(pkg)
+        allpkgs.append(pkg)
+
+    if len(filtered_pkgs) == 0:
+        return []
+
+    depends = get_depends(filtered_pkgs)
+
+    deps = set()
+    for pkg in filtered_pkgs:
+        pkg_deps = depends[pkg]
+
+        # We couldn't get the dependencies of this package, because it
+        # doesn't use the generic or autotools infrastructure. Add it to
+        # unknownpkgs so that it is later rendered in red color to warn
+        # the user.
+        if pkg_deps == None:
+            unknownpkgs.append(pkg)
+            continue
+
+        # This package has no dependency.
+        if pkg_deps == []:
+            continue
+
+        # Add dependencies to the list of dependencies
+        for dep in pkg_deps:
+            dependencies.append((pkg, dep))
+            deps.add(dep)
+
+    if len(deps) != 0:
+        newdeps = get_all_depends(deps)
         if newdeps != None:
             dependencies += newdeps
 
@@ -160,24 +184,26 @@ TARGET_EXCEPTIONS = [
 ]
 
 # In full mode, start with the result of get_targets() to get the main
-# targets and then use get_all_depends() for each individual target.
+# targets and then use get_all_depends() for all targets
 if mode == FULL_MODE:
     targets = get_targets()
     dependencies = []
     allpkgs.append('all')
+    filtered_targets = []
     for tg in targets:
         # Skip uninteresting targets
         if tg in TARGET_EXCEPTIONS:
             continue
         dependencies.append(('all', tg))
-        deps = get_all_depends(tg)
-        if deps != None:
-            dependencies += deps
+        filtered_targets.append(tg)
+    deps = get_all_depends(filtered_targets)
+    if deps != None:
+        dependencies += deps
 
 # In pkg mode, start directly with get_all_depends() on the requested
 # package
 elif mode == PKG_MODE:
-    dependencies = get_all_depends(rootpkg)
+    dependencies = get_all_depends([rootpkg])
 
 dependencies = remove_redundant_deps(dependencies)
 

From 393d2a78581a6f49896b81eb1dae9a8aa970c7df Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 07:08:51 +0000
Subject: [PATCH 3779/6849] graph-depends: fix comment

Since 9bc7b1d4ae694b818f941410d1ff59316a2bba6e, all X.org .mk files
are parsed unconditionally, even if BR2_PACKAGE_XORG7 is disabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index c168fc4ea0..10cd76a2e8 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -17,11 +17,6 @@
 #    dependencies as they are with the current Buildroot
 #    configuration.
 #
-#  * The X.org package definitions are only included when
-#    BR2_PACKAGE_XORG7 is enabled, so if this option is not enabled,
-#    it isn't possible to graph the dependencies of X.org stack
-#    components.
-#
 # Copyright (C) 2010 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
 import sys

From 58cd46aa0489f1449b28806d876e46101f7b9ca9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 07:08:52 +0000
Subject: [PATCH 3780/6849] graph-depends: update copyright

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 10cd76a2e8..0658b777ac 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -17,7 +17,7 @@
 #    dependencies as they are with the current Buildroot
 #    configuration.
 #
-# Copyright (C) 2010 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+# Copyright (C) 2010-2013 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
 import sys
 import subprocess

From 1063539c536662f95a0bb14b70b2db7396602564 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 07:08:53 +0000
Subject: [PATCH 3781/6849] graph-depends: remove support for "unknown"
 packages

The "unknown" packages mechanism was used to render packages that did
not implement the make <pkg>-show-depends target, i.e the packages
that were not yet converted to one of the package infrastructures.

Since now all packages have been converted, we can remove this
"unknown" packages feature.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 0658b777ac..556f11d263 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -41,7 +41,6 @@ else:
     sys.exit(1)
 
 allpkgs = []
-unknownpkgs = []
 
 # Execute the "make show-targets" command to get the list of the main
 # Buildroot TARGETS and return it formatted as a Python list. This
@@ -109,14 +108,6 @@ def get_all_depends(pkgs):
     for pkg in filtered_pkgs:
         pkg_deps = depends[pkg]
 
-        # We couldn't get the dependencies of this package, because it
-        # doesn't use the generic or autotools infrastructure. Add it to
-        # unknownpkgs so that it is later rendered in red color to warn
-        # the user.
-        if pkg_deps == None:
-            unknownpkgs.append(pkg)
-            continue
-
         # This package has no dependency.
         if pkg_deps == []:
             continue
@@ -219,9 +210,7 @@ for pkg in allpkgs:
 
     print "%s [label = \"%s\"]" % (pkg_node_name(pkg), pkg)
 
-    if pkg in unknownpkgs:
-        print "%s [color=red,style=filled]" % pkg_node_name(pkg)
-    elif mode == PKG_MODE and pkg == rootpkg:
+    if mode == PKG_MODE and pkg == rootpkg:
         print "%s [color=lightblue,style=filled]" % pkg_node_name(rootpkg)
     else:
         print "%s [color=grey,style=filled]" % pkg_node_name(pkg)

From fbe02c09377ed468ca03e7502c7e32c6071293ed Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:36 +0000
Subject: [PATCH 3782/6849] xapp_xinput-calibrator: rename directory to match
 .mk name

The directory was named xapp_xinput_calibrator, but the .mk file was
named xapp_xinput-calibrator.mk, which isn't consistent. Rename the
directory to xapp_xinput-calibrator to be consistent with the naming
of the .mk file and the other x11r7 directories.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                                         | 2 +-
 .../Config.in                                                   | 0
 .../xapp_xinput-calibrator.mk                                   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename package/x11r7/{xapp_xinput_calibrator => xapp_xinput-calibrator}/Config.in (100%)
 rename package/x11r7/{xapp_xinput_calibrator => xapp_xinput-calibrator}/xapp_xinput-calibrator.mk (100%)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 94ad8a4d1a..6881d4ed95 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -132,7 +132,7 @@ endmenu
 		source package/x11r7/xapp_xhost/Config.in
 		source package/x11r7/xapp_xinit/Config.in
 		source package/x11r7/xapp_xinput/Config.in
-		source package/x11r7/xapp_xinput_calibrator/Config.in
+		source package/x11r7/xapp_xinput-calibrator/Config.in
 		source package/x11r7/xapp_xkbcomp/Config.in
 		source package/x11r7/xapp_xkbevd/Config.in
 		source package/x11r7/xapp_xkbprint/Config.in
diff --git a/package/x11r7/xapp_xinput_calibrator/Config.in b/package/x11r7/xapp_xinput-calibrator/Config.in
similarity index 100%
rename from package/x11r7/xapp_xinput_calibrator/Config.in
rename to package/x11r7/xapp_xinput-calibrator/Config.in
diff --git a/package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
similarity index 100%
rename from package/x11r7/xapp_xinput_calibrator/xapp_xinput-calibrator.mk
rename to package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk

From 9fb388c677e33d3031e62a13335e3bacfcc28f1d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:37 +0000
Subject: [PATCH 3783/6849] xapp_xman: replace := by =

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xman/xapp_xman.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 0fa2582ac7..0c39aaf581 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -3,9 +3,9 @@
 # xapp_xman - Manual page display program for the X Window System
 #
 #############################################################
-XAPP_XMAN_VERSION:=1.0.3
-XAPP_XMAN_SOURCE:=xman-$(XAPP_XMAN_VERSION).tar.bz2
-XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMAN_VERSION = 1.0.3
+XAPP_XMAN_SOURCE = xman-$(XAPP_XMAN_VERSION).tar.bz2
+XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAN_DEPENDENCIES = xlib_libXaw
 
 XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \

From d946a1af93741a7ae22ec69be865a6c14a37fcf1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 2 Jan 2013 10:36:03 +0000
Subject: [PATCH 3784/6849] graph-depends: add to exclusion list

Add the root-password internal target to the exclusion list.

Fixes failures like:
    Getting dependencies for [... 'target-root-passwd' ...]
    Error getting dependencies [... 'target-root-passwd' ...]

Which is easily singled out with:
    $ make target-root-passwd-show-depends
    make[1]: *** No rule to make target `target-root-passwd-show-depends'.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 556f11d263..1163d79673 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -167,6 +167,7 @@ TARGET_EXCEPTIONS = [
     "target-finalize",
     "erase-fakeroots",
     "target-generic-hostname",
+    "target-root-passwd",
 ]
 
 # In full mode, start with the result of get_targets() to get the main

From a025fd9b5a43f61f4b7ed051f6dcb422ec18cc83 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Dec 2012 11:33:26 +0000
Subject: [PATCH 3785/6849] fluxbox: fix build against imlib2

* fix configure.in to take care of the given imlib2-prefix
* disable imlib2 support if imlib2 is not part of the selection

[Peter: imlib2 needs to be built with X support]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../fluxbox/fluxbox-1.3.2-fix-configure.patch | 19 +++++++++++++++++++
 package/fluxbox/fluxbox.mk                    | 10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 package/fluxbox/fluxbox-1.3.2-fix-configure.patch

diff --git a/package/fluxbox/fluxbox-1.3.2-fix-configure.patch b/package/fluxbox/fluxbox-1.3.2-fix-configure.patch
new file mode 100644
index 0000000000..2cb8273609
--- /dev/null
+++ b/package/fluxbox/fluxbox-1.3.2-fix-configure.patch
@@ -0,0 +1,19 @@
+Avoid to call the imlib2-config that may be installed on the host system
+(even when --with-imlib2-prefix or --with-imlib2-exec-prefix is passed to
+the configure script), which totally screws up the resulting linker flags.
+
+Inspired by: http://git.fluxbox.org/fluxbox.git/commit/?id=b178bed60b5bd8b2c9ed0cbc67fd729ff3820589
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- fluxbox-1.3.2.orig/configure.in	2012-10-21 16:11:59.445749396 +0200
++++ fluxbox-1.3.2/configure.in	2012-10-21 16:35:27.658390856 +0200
+@@ -443,8 +443,6 @@ if test x$enable_imlib2 = "xyes"; then
+       [
+          IMLIB2=true
+          AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
+-         IMLIB2_LIBS=`imlib2-config --libs`
+-         IMLIB2_CFLAGS=`imlib2-config --cflags`
+          LIBS="$LIBS $IMLIB2_LIBS"
+          CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
+        ], [ AC_MSG_RESULT(no)]
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 356c5a274d..52503af0dc 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -10,11 +10,19 @@ FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBO
 FLUXBOX_LICENSE = MIT
 FLUXBOX_LICENSE_FILES = COPYING
 
+FLUXBOX_AUTORECONF = YES
+
 FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		   --x-libraries=$(STAGING_DIR)/usr/lib
-
 FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
+ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
+FLUXBOX_CONF_OPT += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
+FLUXBOX_DEPENDENCIES += imlib2
+else
+FLUXBOX_CONF_OPT += --disable-imlib2
+endif
+
 define FLUXBOX_INSTALL_XSESSION_FILE
 	[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
 		package/fluxbox/xsession $(TARGET_DIR)/root/.xsession

From 31ff7b5eac3883a11faf60d9af0b47bfc2d903f3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 3 Jan 2013 22:02:10 +0100
Subject: [PATCH 3786/6849] docs: 2012.11.1 is out

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/download.html |  6 +++---
 docs/news.html     | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index 4cb01c92df..2b1bb80c6c 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,12 +6,12 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2012.11</b>, which can be downloaded
+The latest stable release is <b>2012.11.1</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2012.11.tar.gz">buildroot-2012.11.tar.gz</a>
+<a href="/downloads/buildroot-2012.11.1.tar.gz">buildroot-2012.11.1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.11.tar.bz2">buildroot-2012.11.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.11.1.tar.bz2">buildroot-2012.11.1.tar.bz2</a>.
 <!--
 <p>
 The latest release candidate is <b>2012.11-rc2</b>, which can be
diff --git a/docs/news.html b/docs/news.html
index 7e791be48c..343690f6b8 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,17 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>3 January 2013 -- 2012.11.1 released</b>
+
+    <p>The 2012.11.1 bugfix release is out - Thanks to everyone
+    contributing. This release fixes critical issues discovered since
+    the 2012.11 release, most importantly with non-largefile builds on
+    recent Ubuntu versions. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.11.1">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.11.1.tar.bz2">2012.11.1 release</a>.</p>
+
   <li><b>2 December 2012 -- 2012.11 released</b>
 
     <p>The stable 2012.11 release is out - Thanks to everyone

From c4d4b433999ba9f0fb2804c9b4103a4dff0477e2 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 3 Jan 2013 11:18:57 +0000
Subject: [PATCH 3787/6849] firmwares: add a new package category to locate all
 firmwares

We have quite a few packages that are dedicated to providing firmwares
for miscellanous devices. Those package are spread out in the big
"Hradware handling" menu, so are a bit hard to find.

Move all those packages to their own sub-menu:
    Package Selection for the target  --->
        Hardware handling  --->
            Firmwares  --->
                [ ] b43-firware
                [ ] linux-firmware
                [ ] ux500-firmware

Hopefully, this will make it nicer, when new firmware-providing packages
are added in the future (eg. in the pipe: firmware for the RPI GPU).

Fix a typo in the 'b43-firmware' prompt (missing 'm').

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              | 8 +++++---
 package/b43-firmware/Config.in | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 7860f3fc97..2cbadf4de2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -199,8 +199,12 @@ source "package/xfsprogs/Config.in"
 endmenu
 
 menu "Hardware handling"
-source "package/acpid/Config.in"
+menu "Misc devices firmwares"
 source "package/b43-firmware/Config.in"
+source "package/linux-firmware/Config.in"
+source "package/ux500-firmware/Config.in"
+endmenu
+source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
@@ -232,7 +236,6 @@ source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
 source "package/lcdproc/Config.in"
-source "package/linux-firmware/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lshw/Config.in"
 source "package/lsuio/Config.in"
@@ -266,7 +269,6 @@ source "package/usb_modeswitch/Config.in"
 source "package/usb_modeswitch_data/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
-source "package/ux500-firmware/Config.in"
 source "package/wipe/Config.in"
 endmenu
 
diff --git a/package/b43-firmware/Config.in b/package/b43-firmware/Config.in
index ab7f4a7878..bc69bbcbed 100644
--- a/package/b43-firmware/Config.in
+++ b/package/b43-firmware/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_B43_FIRMWARE
-	bool "b43-firware"
+	bool "b43-firmware"
 	help
 	  Firmware for the Broadcom Wifi devices supported by the b43
 	  kernel driver.

From 337628a0c104e1e8a687cd738500a83946ad2f0f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 3 Jan 2013 11:18:58 +0000
Subject: [PATCH 3788/6849] package/linux-firmware: reorganise config menus

Reorganise the sub-menus for the linux-firmware package, so it is easier
to add new categories of firmwares to install (coming in a future patch).

Remove the per-chipco sub-menus, as all entries have the chipco name in
its prompt (except for TI, which is added).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index f156756890..4cfd4db613 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE
 
 if BR2_PACKAGE_LINUX_FIRMWARE
 
-menu "Atheros"
+menu "WiFi firmwares"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010
 	bool "Atheros 7010"
@@ -20,10 +20,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
 	help
 	  Firmware files for the Atheros 9271 module
 
-endmenu
-
-menu "Marvell Libertas"
-
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8
        bool "Libertas SD 8686 v8"
        help
@@ -39,19 +35,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688
        help
          Firmware files for the Marvell SD8688 module
 
-endmenu
-
-menu "Marvell WiFi-Ex"
-
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787
 	bool "Marvell Wifi-Ex SD 8787"
 	help
 	  Firmware files for the Marvell Wifi-Ex 8787 module on SDIO.
 
-endmenu
-
-menu "Ralink"
-
 config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
 	bool "Ralink rt2501/rt61"
 	help
@@ -67,10 +55,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX
 	help
 	  Ralink rt27xx/rt28xx/rt30xx
 
-endmenu
-
-menu "Realtek"
-
 config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192
 	bool "Realtek 8192"
 	help
@@ -81,17 +65,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
 	help
 	  Realtek 8712
 
-endmenu
-
-menu "Texas Instruments"
-
 config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X
-	bool "wl127X"
+	bool "TI wl127X"
 	help
 	  Firmware files for WLAN and Bluetooth modules wl1271 and wl1273
 
 config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X
-	bool "wl128X"
+	bool "TI wl128X"
 	help
 	  Firmware files for WLAN and Bluetooth modules wl128x
 

From a4e444bb0bc690f1c9f5c846ebd58298b8f7b855 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 3 Jan 2013 11:18:59 +0000
Subject: [PATCH 3789/6849] linux-firmware: add options for DVB firmware files

There are three firmware files that can be installed, each for
different devices.

For example, the DIB0700 firmware can be used by quite a few DVB
USB sticks based on this chipset (I know of at least two of them).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 19 +++++++++++++++++++
 package/linux-firmware/linux-firmware.mk |  9 +++++++++
 2 files changed, 28 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 4cfd4db613..bf264ebb74 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -77,4 +77,23 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X
 
 endmenu
 
+menu "DVB firmwares"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_DIB0700
+	bool "DiBcom dib0700"
+	help
+	  Firmware file for dib0700-based USB DVB tuner driver
+
+config BR2_PACKAGE_LINUX_FIRMWARE_H5_DRXK
+	bool "Terratec H5 DRX-K"
+	help
+	  Firmware file for Terratec H5 DRX-K based DVB tuner driver
+
+config BR2_PACKAGE_LINUX_FIRMWARE_XC5000
+	bool "Xceive xc5000"
+	help
+	  Firmware file for xc5000-based DVB tuner driver
+
+endmenu
+
 endif
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index e9a5424b73..db20d338de 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -92,6 +92,15 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
 	ti-connectivity/TIInit_7.2.31.bts 			\
 	LICENCE.ti-connectivity
 
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_XC5000) += \
+	dvb-fe-xc5000-1.6.114.fw
+
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_DIB0700) += \
+	dvb-usb-dib0700-1.20.fw
+
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_H5_DRXK) += \
+	dvb-usb-terratec-h5-drxk.fw
+
 
 ifneq ($(LINUX_FIRMWARE_FILES_y),)
 

From 09556938df5d46d08f0dc22d7c8c15b84183b9f4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 4 Jan 2013 11:28:25 +0100
Subject: [PATCH 3790/6849] enlightenment: needs C++ support because of
 libevas-generic-loaders-svg

Which pulls in pango.

Fixes http://autobuild.buildroot.net/results/d6c9ea1c293d1784e35ddecc0b02d108756c5cfd/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/enlightenment/Config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 4978367a01..c2944b9570 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -16,8 +16,9 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
 	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
 	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
-	# libevas-generic-loaders-svg -> librsvg -> glib2
+	# libevas-generic-loaders-svg -> librsvg -> glib2 / pango
 	depends on BR2_USE_WCHAR
+	depends on BR2_INSTALL_LIBSTDCPP
 	# libedbus -> dbus
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# libedbus -> dbus
@@ -32,6 +33,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
 
 	  http://www.enlightenment.org/
 
-comment "enlightenment requires WCHAR and thread support in toolchain"
+comment "enlightenment requires WCHAR, C++ and thread support in toolchain"
 	depends on BR2_PACKAGE_XORG7
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

From b16f37b03c383f70c6cc50582f6b3ee4cf5aa037 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 01:02:01 +0000
Subject: [PATCH 3791/6849] zd1211-firmware: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/zd1211-firmware/Config.in          |  4 ++++
 package/zd1211-firmware/zd1211-firmware.mk | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/zd1211-firmware/Config.in
 create mode 100644 package/zd1211-firmware/zd1211-firmware.mk

diff --git a/package/Config.in b/package/Config.in
index 2cbadf4de2..11ff82d126 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -203,6 +203,7 @@ menu "Misc devices firmwares"
 source "package/b43-firmware/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/ux500-firmware/Config.in"
+source "package/zd1211-firmware/Config.in"
 endmenu
 source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
diff --git a/package/zd1211-firmware/Config.in b/package/zd1211-firmware/Config.in
new file mode 100644
index 0000000000..4469533b0a
--- /dev/null
+++ b/package/zd1211-firmware/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_ZD1211_FIRMWARE
+	bool "zd1211-firmware"
+	help
+	  Firmware for the ZyDAS ZD1211 / Atheros AR5007UG wifi devices.
diff --git a/package/zd1211-firmware/zd1211-firmware.mk b/package/zd1211-firmware/zd1211-firmware.mk
new file mode 100644
index 0000000000..afea0e9413
--- /dev/null
+++ b/package/zd1211-firmware/zd1211-firmware.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# zd1211-firmware
+#
+#############################################################
+
+ZD1211_FIRMWARE_VERSION = 1.4
+ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION)
+ZD1211_FIRMWARE_SOURCE = zd1211-firmware-$(ZD1211_FIRMWARE_VERSION).tar.bz2
+ZD1211_FIRMWARE_LICENSE = GPLv2
+ZD1211_FIRMWARE_LICENSE_FILES = COPYING
+
+# Not all of the firmware files are used
+define ZD1211_FIRMWARE_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/zd1211/
+	cp -dpf $(@D)/zd1211*{ub,uphr,ur} $(TARGET_DIR)/lib/firmware/zd1211
+endef
+
+$(eval $(generic-package))

From 150564a8bb82f5577362030b8354aaa68e08a0ea Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 10:22:47 +0000
Subject: [PATCH 3792/6849] uboot-tools: bump to version 2012.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...om-tools.patch => uboot-tools-drop-configh-from-tools.patch} | 0
 ...ride-fix.patch => uboot-tools-hostcflags-override-fix.patch} | 0
 package/uboot-tools/uboot-tools.mk                              | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename package/uboot-tools/{uboot-tools-2012.07-drop-configh-from-tools.patch => uboot-tools-drop-configh-from-tools.patch} (100%)
 rename package/uboot-tools/{uboot-tools-2012.07-hostcflags-override-fix.patch => uboot-tools-hostcflags-override-fix.patch} (100%)

diff --git a/package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-2012.07-drop-configh-from-tools.patch
rename to package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
diff --git a/package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-hostcflags-override-fix.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-2012.07-hostcflags-override-fix.patch
rename to package/uboot-tools/uboot-tools-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 75cda8e042..5957a3dbae 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -3,7 +3,7 @@
 # uboot-tools
 #
 #############################################################
-UBOOT_TOOLS_VERSION = 2012.07
+UBOOT_TOOLS_VERSION = 2012.10
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+

From d3d9d0a0f1ccfbd551802dbd40c9a201b4bab27f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 09:27:57 +0000
Subject: [PATCH 3793/6849] qemu/arm-nuri: add new sample config

Add the new arm-nuri sample qemu config.
Samsung Exynos4210 Cortex-A9 dual-core testing.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-nuri/readme.txt  | 10 ++++++++++
 configs/qemu_arm_nuri_defconfig | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 board/qemu/arm-nuri/readme.txt
 create mode 100644 configs/qemu_arm_nuri_defconfig

diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
new file mode 100644
index 0000000000..3925ab940c
--- /dev/null
+++ b/board/qemu/arm-nuri/readme.txt
@@ -0,0 +1,10 @@
+Run the emulation with:
+
+  qemu-system-arm -M nuri -kernel output/images/zImage -append "console=ttySAC1,115200" -smp 2 -serial null -serial stdio
+
+The login prompt will appear in the terminal that started Qemu. The
+graphical window is the framebuffer.
+
+Startup time is slow because of the SMP CPU emulation so be patient.
+
+Tested with QEMU 1.3.0
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
new file mode 100644
index 0000000000..0ae0de6d99
--- /dev/null
+++ b/configs/qemu_arm_nuri_defconfig
@@ -0,0 +1,25 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_VFP_FLOAT=y
+# BR2_SOFT_FLOAT is not set
+
+# System
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttySAC1"
+
+# Filesystem
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_INITRAMFS=y
+
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_7=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
+BR2_LINUX_KERNEL_ZIMAGE=y

From 2bb2e62a4b90e13d0ae21472491bdea72cd982d6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 4 Jan 2013 21:39:05 +0100
Subject: [PATCH 3794/6849] system: TARGET_GENERIC_GETTY: allow it to be
 disabled

For some systems, you don't want to run any getty, so allow the option
to be disabled when the empty string is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 1 +
 system/system.mk | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/system/Config.in b/system/Config.in
index f1c260a95e..5b66ac0fb0 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -145,6 +145,7 @@ config BR2_TARGET_GENERIC_GETTY_PORT
 	default "ttyS0"
 	help
 	  Specify a port to run a getty (login prompt) on.
+	  Set to the empty string to not run a getty.
 
 choice
 	prompt "Baudrate to use"
diff --git a/system/system.mk b/system/system.mk
index 7536ce649e..3c4d06e69c 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -49,12 +49,15 @@ endif
 
 TARGETS += target-root-passwd
 
+ifneq ($(TARGET_GENERIC_GETTY),)
 ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
 ifeq ($(BR2_PACKAGE_SYSVINIT),y)
 TARGETS += target-generic-getty-sysvinit
 else
 TARGETS += target-generic-getty-busybox
 endif
+endif
+
 ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
 TARGETS += target-generic-do-remount-rw
 else

From 233a0fa63a6da360656829382276930eddb9ae75 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 10:42:15 +0000
Subject: [PATCH 3795/6849] libnl: bump to version 3.2.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 9bf680ea1f..12494f4475 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.16
+LIBNL_VERSION = 3.2.17
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING

From eace38c148c9d6649481d73b5a799e4a9e3788c7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 07:12:46 +0000
Subject: [PATCH 3796/6849] mpfr: bump to 3.1.1-p2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr-patchlevel2.patch | 405 ++++++++++++++++++++++++++++
 1 file changed, 405 insertions(+)
 create mode 100644 package/mpfr/mpfr-patchlevel2.patch

diff --git a/package/mpfr/mpfr-patchlevel2.patch b/package/mpfr/mpfr-patchlevel2.patch
new file mode 100644
index 0000000000..43dfcbfe32
--- /dev/null
+++ b/package/mpfr/mpfr-patchlevel2.patch
@@ -0,0 +1,405 @@
+diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
+--- mpfr-3.1.1-a/PATCHES	2012-08-30 09:28:51.000000000 +0000
++++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:28:51.000000000 +0000
+@@ -0,0 +1 @@
++get_decimal64
+diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
+--- mpfr-3.1.1-a/VERSION	2012-07-03 15:01:13.000000000 +0000
++++ mpfr-3.1.1-b/VERSION	2012-08-30 09:28:51.000000000 +0000
+@@ -1 +1 @@
+-3.1.1
++3.1.1-p1
+diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c
+--- mpfr-3.1.1-a/src/get_d64.c	2012-07-03 15:01:18.000000000 +0000
++++ mpfr-3.1.1-b/src/get_d64.c	2012-08-30 09:28:51.000000000 +0000
+@@ -32,6 +32,10 @@
+ 
+ #ifdef MPFR_WANT_DECIMAL_FLOATS
+ 
++#ifndef DEC64_MAX
++# define DEC64_MAX 9.999999999999999E384dd
++#endif
++
+ #ifdef DPD_FORMAT
+ static int T[1000] = {
+   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32,
+@@ -142,26 +146,14 @@
+ static _Decimal64
+ get_decimal64_min (int negative)
+ {
+-  union ieee_double_extract x;
+-
+-  x.s.sig = (negative) ? 1 : 0;
+-  x.s.exp = 0;
+-  x.s.manh = 0;
+-  x.s.manl = 1;
+-  return x.d;
++  return negative ? - 1E-398dd : 1E-398dd;
+ }
+ 
+ /* construct the decimal64 largest finite number with given sign */
+ static _Decimal64
+ get_decimal64_max (int negative)
+ {
+-  union ieee_double_extract x;
+-
+-  x.s.sig = (negative) ? 1 : 0;
+-  x.s.exp = 1919;
+-  x.s.manh = 1048575; /* 2^20-1 */
+-  x.s.manl = ~0;
+-  return x.d;
++  return negative ? - DEC64_MAX : DEC64_MAX;
+ }
+ 
+ /* one-to-one conversion:
+@@ -334,7 +326,8 @@
+   /* the largest decimal64 number is just below 10^(385) < 2^1279 */
+   else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */
+     {
+-      if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
++      if (rnd_mode == MPFR_RNDZ
++          || (rnd_mode == MPFR_RNDU && negative != 0)
+           || (rnd_mode == MPFR_RNDD && negative == 0))
+         return get_decimal64_max (negative);
+       else
+@@ -354,6 +347,15 @@
+              which corresponds to s=[0.]1000...000 and e=-397 */
+           if (e < -397)
+             {
++              if (rnd_mode == MPFR_RNDN && e == -398)
++                {
++                  /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal),
++                     src should round to +/- 1E-398 in MPFR_RNDN. */
++                  mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA);
++                  return e == -398 && s[negative] <= '5' ?
++                    get_decimal64_zero (negative) :
++                    get_decimal64_min (negative);
++                }
+               if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN
+                   || (rnd_mode == MPFR_RNDD && negative == 0)
+                   || (rnd_mode == MPFR_RNDU && negative != 0))
+@@ -379,7 +381,8 @@
+          which corresponds to s=[0.]9999...999 and e=385 */
+       else if (e > 385)
+         {
+-          if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
++          if (rnd_mode == MPFR_RNDZ
++              || (rnd_mode == MPFR_RNDU && negative != 0)
+               || (rnd_mode == MPFR_RNDD && negative == 0))
+             return get_decimal64_max (negative);
+           else
+diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
+--- mpfr-3.1.1-a/src/mpfr.h	2012-07-03 15:01:19.000000000 +0000
++++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.1.1"
++#define MPFR_VERSION_STRING "3.1.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
+--- mpfr-3.1.1-a/src/version.c	2012-07-03 15:01:18.000000000 +0000
++++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:28:51.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.1";
++  return "3.1.1-p1";
+ }
+diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c
+--- mpfr-3.1.1-a/tests/tget_set_d64.c	2012-07-03 15:01:24.000000000 +0000
++++ mpfr-3.1.1-b/tests/tget_set_d64.c	2012-08-30 09:28:51.000000000 +0000
+@@ -25,6 +25,10 @@
+ #include <stdlib.h> /* for exit */
+ #include "mpfr-test.h"
+ 
++#ifndef DEC64_MAX
++# define DEC64_MAX 9.999999999999999E384dd
++#endif
++
+ /* #define DEBUG */
+ 
+ static void
+@@ -149,6 +153,15 @@
+   mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ);
+   mpfr_set (y, x, MPFR_RNDZ);
+   d = mpfr_get_decimal64 (x, MPFR_RNDU);
++  ASSERT_ALWAYS (d == DEC64_MAX);
++  mpfr_set_ui (x, 0, MPFR_RNDZ);
++  mpfr_set_decimal64 (x, d, MPFR_RNDZ);
++  ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
++
++  mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ);
++  mpfr_set (y, x, MPFR_RNDZ);
++  d = mpfr_get_decimal64 (x, MPFR_RNDA);
++  ASSERT_ALWAYS (d == -DEC64_MAX);
+   mpfr_set_ui (x, 0, MPFR_RNDZ);
+   mpfr_set_decimal64 (x, d, MPFR_RNDZ);
+   ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
+@@ -225,6 +238,83 @@
+   mpfr_clear (x);
+ }
+ 
++static void
++check_overflow (void)
++{
++  mpfr_t x;
++  int err = 0, neg, rnd;
++
++  mpfr_init2 (x, 96);
++  for (neg = 0; neg < 2; neg++)
++    RND_LOOP (rnd)
++      {
++        _Decimal64 d, e;
++        mpfr_rnd_t r = (mpfr_rnd_t) rnd;
++        int sign = neg ? -1 : 1;
++
++        e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX;
++        /* This tests the binary exponent e > 1279 case of get_d64.c */
++        mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN);
++        d = mpfr_get_decimal64 (x, r);
++        if (d != e)
++          {
++            printf ("Error 1 in check_overflow for %s, %s\n",
++                    neg ? "negative" : "positive",
++                    mpfr_print_rnd_mode (r));
++            err = 1;
++          }
++        /* This tests the decimal exponent e > 385 case of get_d64.c */
++        mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN);
++        d = mpfr_get_decimal64 (x, r);
++        if (d != e)
++          {
++            printf ("Error 2 in check_overflow for %s, %s\n",
++                    neg ? "negative" : "positive",
++                    mpfr_print_rnd_mode (r));
++            err = 1;
++          }
++        /* This tests the last else (-382 <= e <= 385) of get_d64.c */
++        mpfr_set_decimal64 (x, e, MPFR_RNDA);
++        d = mpfr_get_decimal64 (x, r);
++        if (d != e)
++          {
++            printf ("Error 3 in check_overflow for %s, %s\n",
++                    neg ? "negative" : "positive",
++                    mpfr_print_rnd_mode (r));
++            err = 1;
++          }
++      }
++  mpfr_clear (x);
++  if (err)
++    exit (1);
++}
++
++static void
++check_tiny (void)
++{
++  mpfr_t x;
++  _Decimal64 d;
++
++  /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round
++     to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between
++     0 and 1E-398 is not a representable binary number, so that there
++     are no tests for it. */
++  mpfr_init2 (x, 128);
++  mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ);
++  d = mpfr_get_decimal64 (x, MPFR_RNDN);
++  MPFR_ASSERTN (d == 1.0E-398dd);
++  mpfr_neg (x, x, MPFR_RNDN);
++  d = mpfr_get_decimal64 (x, MPFR_RNDN);
++  MPFR_ASSERTN (d == -1.0E-398dd);
++  mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU);
++  d = mpfr_get_decimal64 (x, MPFR_RNDN);
++  MPFR_ASSERTN (d == 1.0E-398dd);
++  mpfr_neg (x, x, MPFR_RNDN);
++  d = mpfr_get_decimal64 (x, MPFR_RNDN);
++  MPFR_ASSERTN (d == -1.0E-398dd);
++  mpfr_clear (x);
++}
++
+ int
+ main (void)
+ {
+@@ -241,6 +331,8 @@
+   check_inf_nan ();
+   check_random ();
+   check_native ();
++  check_overflow ();
++  check_tiny ();
+ 
+   tests_end_mpfr ();
+   return 0;
+diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
+--- mpfr-3.1.1-a/PATCHES	2012-08-30 09:35:12.000000000 +0000
++++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:35:12.000000000 +0000
+@@ -0,0 +1 @@
++strtofr-ternary-value
+diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
+--- mpfr-3.1.1-a/VERSION	2012-08-30 09:28:51.000000000 +0000
++++ mpfr-3.1.1-b/VERSION	2012-08-30 09:35:12.000000000 +0000
+@@ -1 +1 @@
+-3.1.1-p1
++3.1.1-p2
+diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
+--- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
++++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.1.1-p1"
++#define MPFR_VERSION_STRING "3.1.1-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c
+--- mpfr-3.1.1-a/src/strtofr.c	2012-07-03 15:01:16.000000000 +0000
++++ mpfr-3.1.1-b/src/strtofr.c	2012-08-30 09:35:12.000000000 +0000
+@@ -667,6 +667,20 @@
+           /* (z, exp_z) = base^(exp_base-pstr_size) */
+           z = result + 2*ysize + 1;
+           err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize);
++          /* Since we want y/z rounded toward zero, we must get an upper
++             bound of z. If err >= 0, the error on z is bounded by 2^err. */
++          if (err >= 0)
++            {
++              mp_limb_t cy;
++              unsigned long h = err / GMP_NUMB_BITS;
++              unsigned long l = err - h * GMP_NUMB_BITS;
++
++              if (h >= ysize) /* not enough precision in z */
++                goto next_loop;
++              cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l);
++              if (cy != 0) /* the code below requires z on ysize limbs */
++                goto next_loop;
++            }
+           exact = exact && (err == -1);
+           if (err == -2)
+             goto underflow; /* FIXME: Sure? */
+@@ -730,6 +744,7 @@
+                                        MPFR_RNDN, rnd, MPFR_PREC(x)))
+         break;
+ 
++    next_loop:
+       /* update the prec for next loop */
+       MPFR_ZIV_NEXT (loop, prec);
+     } /* loop */
+diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
+--- mpfr-3.1.1-a/src/version.c	2012-08-30 09:28:51.000000000 +0000
++++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:35:12.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.1-p1";
++  return "3.1.1-p2";
+ }
+diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c
+--- mpfr-3.1.1-a/tests/tstrtofr.c	2012-07-03 15:01:24.000000000 +0000
++++ mpfr-3.1.1-b/tests/tstrtofr.c	2012-08-30 09:35:12.000000000 +0000
+@@ -1105,6 +1105,92 @@
+   mpfr_clear (y);
+ }
+ 
++/* From a bug reported by Joseph S. Myers
++   https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */
++static void
++bug20120814 (void)
++{
++  mpfr_exp_t emin = -30, e;
++  mpfr_t x, y;
++  int r;
++  char s[64], *p;
++
++  mpfr_init2 (x, 2);
++  mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN);
++  mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD);
++  s[0] = s[1];
++  s[1] = '.';
++  for (p = s; *p != 0; p++) ;
++  *p = 'e';
++  sprintf (p + 1, "%d", (int) e - 1);
++
++  mpfr_init2 (y, 4);
++  r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN);
++  if (r <= 0 || ! mpfr_equal_p (x, y))
++    {
++      printf ("Error in bug20120814\n");
++      printf ("mpfr_strtofr failed on string \"%s\"\n", s);
++      printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin);
++      printf ("Got inex = %-6d and y = ", r);
++      mpfr_dump (y);
++      exit (1);
++    }
++
++  mpfr_clear (x);
++  mpfr_clear (y);
++}
++
++static void
++bug20120829 (void)
++{
++  mpfr_t x1, x2, e;
++  int inex1, inex2, i, r;
++  char s[48] = "1e-1";
++
++  mpfr_init2 (e, 128);
++  mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0);
++
++  inex1 = mpfr_set_si (e, -1, MPFR_RNDN);
++  MPFR_ASSERTN (inex1 == 0);
++
++  for (i = 1; i <= sizeof(s) - 5; i++)
++    {
++      s[3+i] = '0';
++      s[4+i] = 0;
++      inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN);
++      MPFR_ASSERTN (inex1 == 0);
++      RND_LOOP(r)
++        {
++          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
++
++          inex1 = mpfr_exp10 (x1, e, rnd);
++          inex1 = SIGN (inex1);
++          inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd);
++          inex2 = SIGN (inex2);
++          /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do:
++             strtofr.c:...: MPFR assertion failed: cy == 0
++             r8396 is OK.
++             On 64-bit machines, for i = 15,
++             r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0)
++             r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize
++             r8394 and r8396 are OK.
++          */
++          if (! mpfr_equal_p (x1, x2) || inex1 != inex2)
++            {
++              printf ("Error in bug20120829 for i = %d, rnd = %s\n",
++                      i, mpfr_print_rnd_mode (rnd));
++              printf ("Expected inex = %d, x = ", inex1);
++              mpfr_dump (x1);
++              printf ("Got      inex = %d, x = ", inex2);
++              mpfr_dump (x2);
++              exit (1);
++            }
++        }
++    }
++
++  mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -1117,6 +1203,8 @@
+   check_retval ();
+   bug20081028 ();
+   test20100310 ();
++  bug20120814 ();
++  bug20120829 ();
+ 
+   tests_end_mpfr ();
+   return 0;

From 25c03d89f1556218f0d907cce0e6f0613f6bc711 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 07:12:47 +0000
Subject: [PATCH 3797/6849] gmp: bump to version 5.1.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 72673c7825..093d60caff 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-GMP_VERSION = 5.0.5
-GMP_SITE = $(BR2_GNU_MIRROR)/gmp
+GMP_VERSION = 5.1.0
+GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES
 GMP_LICENSE = LGPLv3+

From ea1160d494a0e0ae57ec03190f73c8cc37d91a9c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 05:13:46 +0000
Subject: [PATCH 3798/6849] configs/at91rm9200df: update and fix

Update to the latest maxim.org.za kernel 2.6.38
Lock down headers version, otherwise we were building a toolchain with
3.7 headers for a 2.6.33 kernel - not too wise.
Also the AT91RM9200 is an ARM920T so enable that target.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91rm9200df_defconfig | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 4229155a7c..74b5a6fd92 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -1,5 +1,6 @@
 # Architecture
 BR2_arm=y
+BR2_arm920t=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_JFFS2=y
@@ -9,6 +10,11 @@ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x2100
 BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 BR2_TARGET_ROOTFS_JFFS2_LE=y
 
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.38.8"
+
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91rm9200ek"
@@ -17,7 +23,7 @@ BR2_TARGET_UBOOT_2010_06=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.33"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.33-at91.patch.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.38-at91.patch.gz"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="at91rm9200ek"

From af75ef1fabca7a8918f02d62b6427ec0f51f1e54 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 02:17:43 +0000
Subject: [PATCH 3799/6849] kernel-headers: bmp 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index a8a8a2baf8..4f7a6d91e6 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,7 +60,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "3.0.57"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.35"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.36"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.24"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5

From ca041bfe53752eee09445eb018fe6093c2f0f462 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Jan 2013 02:17:44 +0000
Subject: [PATCH 3800/6849] qemu/sh4-r2d: update to use kernel 3.2.36

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_sh4_r2d_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 746dc0b17f..e7dba9bbbf 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.36"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From bdcbd9fb3dedc69c3b6a6742701ff204dd9fba0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:00 +0000
Subject: [PATCH 3801/6849] divine: fix divine-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/divine/divine.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 779322e559..7c7585f4f2 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -10,4 +10,12 @@ DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
 
+define DIVINE_STAGING_DIVINE_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/divine-config
+endef
+
+DIVINE_POST_INSTALL_STAGING_HOOKS += DIVINE_STAGING_DIVINE_CONFIG_FIXUP
+
 $(eval $(autotools-package))

From 5a6f270344f7c6e857702bbd5591a62f59f12b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:01 +0000
Subject: [PATCH 3802/6849] giblib: fix giblib-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/giblib/giblib.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 751534c809..75e21bbd54 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -13,4 +13,12 @@ GIBLIB_AUTORECONF_OPT = --install
 GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \
 		  --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
 
+define GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/giblib-config
+endef
+
+GIBLIB_POST_INSTALL_STAGING_HOOKS += GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP
+
 $(eval $(autotools-package))

From 6ba5ac89f890b1dd515fc906bbd82cfdc373e5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:02 +0000
Subject: [PATCH 3803/6849] imlib2: fix imlib2-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imlib2/imlib2.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index fa0f57803a..c7029aeb6f 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -57,7 +57,9 @@ endif
 
 # drop -L<dir> from linker flags
 define IMLIB2_FIXUP_IMLIB2_CONFIG
-	$(SED) 's/-L[^ ]*//g' \
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e  's/-L[^ ]*//g' \
 		$(STAGING_DIR)/usr/bin/imlib2-config
 endef
 

From 857413845eac7f00a9219d7ed45177ae1d271f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:03 +0000
Subject: [PATCH 3804/6849] libgcrypt: fix libgcrypt-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgcrypt/libgcrypt.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index 3aa60c6973..b0a8a738dc 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -25,5 +25,13 @@ endef
 
 LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS
 
+define LIBGCRYPT_STAGING_LIBGCRYPT_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/libgcrypt-config
+endef
+
+LIBGCRYPT_POST_INSTALL_STAGING_HOOKS += LIBGCRYPT_STAGING_LIBGCRYPT_CONFIG_FIXUP
+
 
 $(eval $(autotools-package))

From 0db5e1203df9219498fe2ffa749d8818515a5607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:05 +0000
Subject: [PATCH 3805/6849] neon: fix neon-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/neon.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index c2e49497cb..56db6044bb 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -52,4 +52,12 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS
 endif
 
+define NEON_STAGING_NEON_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/neon-config
+endef
+
+NEON_POST_INSTALL_STAGING_HOOKS += NEON_STAGING_NEON_CONFIG_FIXUP
+
 $(eval $(autotools-package))

From 89e642ff4807268eed15873a03af7c1d07936f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:06 +0000
Subject: [PATCH 3806/6849] libnspr: fix nspr-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index a9d5812f21..590a755c9c 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -38,4 +38,12 @@ define LIBNSPR_INSTALL_TARGET_PC
 endef
 LIBNSPR_POST_INSTALL_TARGET_HOOKS += LIBNSPR_INSTALL_TARGET_PC
 
+define LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/nspr-config
+endef
+
+LIBNSPR_POST_INSTALL_STAGING_HOOKS += LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP
+
 $(eval $(autotools-package))

From 1a1009931f8f126087c0c4c013af63ca2037014a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Thu, 3 Jan 2013 12:09:07 +0000
Subject: [PATCH 3807/6849] xlib_libXft: fix xft-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXft/xlib_libXft.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index eab75efa43..01ba323d08 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -11,4 +11,12 @@ XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 
+define XLIB_LIBXFT_STAGING_XLIB_LIBXFT_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/xft-config
+endef
+
+XLIB_LIBXFT_POST_INSTALL_STAGING_HOOKS += XLIB_LIBXFT_STAGING_XLIB_LIBXFT_CONFIG_FIXUP
+
 $(eval $(autotools-package))

From 0b7a34d43f50e8b027288f2a7553e5a8af31b095 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 5 Jan 2013 00:30:39 +0100
Subject: [PATCH 3808/6849] Revert "xlib_libXft: fix xft-config"

This reverts commit 1a1009931f8f126087c0c4c013af63ca2037014a.

Fixes http://autobuild.buildroot.net/results/e8c00cf5ec1e3829cd9013710bb1961d9c226c34

xlib_libXft hasn't provided an xft-config script since 2010.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXft/xlib_libXft.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 01ba323d08..eab75efa43 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -11,12 +11,4 @@ XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 
-define XLIB_LIBXFT_STAGING_XLIB_LIBXFT_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/xft-config
-endef
-
-XLIB_LIBXFT_POST_INSTALL_STAGING_HOOKS += XLIB_LIBXFT_STAGING_XLIB_LIBXFT_CONFIG_FIXUP
-
 $(eval $(autotools-package))

From 77c70467154c8349ea4af8cf0aa4ff6b79b3af68 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 Jan 2013 01:30:43 +0000
Subject: [PATCH 3809/6849] alsa-lib: fix build failures for nommu

Disable the pcm_shm plugin (aserver) and alisp for nommu systems since
they use fork()
Fixes
http://autobuild.buildroot.net/results/7e59e73e516579045538e7cc0efbc22744a45d75

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsa-lib/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index ca063d8560..2ba688681e 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -37,7 +37,8 @@ config BR2_PACKAGE_ALSA_LIB_DEVDIR
 
 config BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS
 	string "built PCM plugins"
-	default "all"
+	default "all" if BR2_USE_MMU
+	default "copy linear route mulaw alaw adpcm rate plug multi file null empty share meter hooks lfloat ladspa dmix dshare dsnoop asym iec958 softvol extplug ioplug mmap_emul" if !BR2_MMU
 
 config BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS
 	string "built control plugins"
@@ -69,6 +70,7 @@ config BR2_PACKAGE_ALSA_LIB_SEQ
 
 config BR2_PACKAGE_ALSA_LIB_ALISP
 	bool "alisp"
+	depends on BR2_USE_MMU
 	default y
 
 config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS

From 1a18a456f223562446c0ea2364109a05faae1bc1 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Thu, 20 Dec 2012 00:49:26 +0000
Subject: [PATCH 3810/6849] gst-plugins-base: make alsa plug-in configurable

It may be desirable not to use the alsa sink for playback
even though alsa-lib is installed. So make this a configuration
option. This also takes care of selecting the proper options
for alsa-lib
(BR2_PACKAGE_ALSA_LIB_MIXER and BR2_PACKAGE_ALSA_LIB_PCM).

[Peter: fix indentation]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-base/Config.in           | 6 ++++++
 package/multimedia/gst-plugins-base/gst-plugins-base.mk | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 5d8253395a..af4fe8c1e0 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -73,6 +73,12 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME
 
 comment "plugins with external dependencies (there may be more available)"
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA
+	bool "alsa (mandatory for audio playback)"
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+	select BR2_PACKAGE_ALSA_LIB_PCM
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
 	bool "ogg (*.ogg audio/video)"
 	select BR2_PACKAGE_LIBOGG
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index b044516cc0..02e7ca41c8 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -40,8 +40,7 @@ ifeq ($(BR2_PACKAGE_ORC),y)
 GST_PLUGINS_BASE_DEPENDENCIES += orc
 endif
 
-# alsa support needs pcm+mixer support, but configure fails to check for it
-ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y)
 GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib
 else
 GST_PLUGINS_BASE_CONF_OPT += --disable-alsa

From 5bd41d165e12a2e3e5b776cb4079077cac995bfc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:38 +0000
Subject: [PATCH 3811/6849] pthread-stubs: rename to xlib_libpthread-stubs

In upstream X.org releases, pthread-stubs is named libpthread-stubs,
so for consistency reasons, we rename the Buildroot package
accordingly. Also, while we're at it, we add a xlib_ prefix to the
package to match other X.org libraries in Buildroot.

The necessary Config.in.legacy code is added to ensure that users
having .config files using the old configuration option name get a
warning.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                                   |  8 ++++++++
 package/libdrm/libdrm.mk                           |  2 +-
 package/x11r7/Config.in                            |  2 +-
 package/x11r7/libxcb/libxcb.mk                     |  2 +-
 package/x11r7/pthread-stubs/pthread-stubs.mk       | 14 --------------
 .../Config.in                                      |  4 ++--
 .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 14 ++++++++++++++
 7 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 package/x11r7/pthread-stubs/pthread-stubs.mk
 rename package/x11r7/{pthread-stubs => xlib_libpthread-stubs}/Config.in (70%)
 create mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 7ddc6eaa2b..4770c94796 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -70,4 +70,12 @@ config BR2_PACKAGE_INPUT_TOOLS_EVTEST
 	help
 	  The evtest program from input-tools is now a separate package.
 
+config BR2_PACKAGE_PTHREAD_STUBS
+	bool "pthread-stubs option has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+	help
+	  For consistency reason, the pthread-stubs package has been
+	  renamed to xlib_libpthread-stubs.
+
 endif
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index fbfc95ece3..4ccfa522f6 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -14,7 +14,7 @@ LIBDRM_DEPENDENCIES = \
 	xlib_libXxf86vm \
 	xlib_libXmu \
 	xproto_dri2proto \
-	pthread-stubs \
+	xlib_libpthread-stubs \
 	host-pkgconf
 
 ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 6881d4ed95..9e08e3f279 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -37,7 +37,6 @@ endmenu
 	menu "X11R7 Libraries"
 		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/xcb-util-keysyms/Config.in
 		source package/x11r7/xlib_libFS/Config.in
@@ -79,6 +78,7 @@ endmenu
 		source package/x11r7/xlib_libxkbui/Config.in
 		source package/x11r7/xlib_xtrans/Config.in
 		source package/x11r7/xlib_libpciaccess/Config.in
+		source package/x11r7/xlib_libpthread-stubs/Config.in
 	endmenu
 	menu "X11R7 Applications"
 		source package/x11r7/xapp_appres/Config.in
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index f7b194591a..15eeeef44f 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -10,7 +10,7 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/
 LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_DEPENDENCIES = \
-	host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
+	host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
 	host-xcb-proto host-python host-pkgconf
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
deleted file mode 100644
index e7032de842..0000000000
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################################################
-#
-# pthread-stubs
-#
-#############################################################
-PTHREAD_STUBS_VERSION = 0.3
-PTHREAD_STUBS_SOURCE = libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2
-PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
-
-PTHREAD_STUBS_INSTALL_STAGING = YES
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
-
diff --git a/package/x11r7/pthread-stubs/Config.in b/package/x11r7/xlib_libpthread-stubs/Config.in
similarity index 70%
rename from package/x11r7/pthread-stubs/Config.in
rename to package/x11r7/xlib_libpthread-stubs/Config.in
index c17f7da2aa..fb53585550 100644
--- a/package/x11r7/pthread-stubs/Config.in
+++ b/package/x11r7/xlib_libpthread-stubs/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_PTHREAD_STUBS
-	bool "pthread-stubs"
+config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+	bool "libpthread-stubs"
 	help
 	  This library provides weak aliases for pthread functions not
 	  provided in libc or otherwise available by default.
diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
new file mode 100644
index 0000000000..909253c11a
--- /dev/null
+++ b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# xlib_libpthread-stubs
+#
+#############################################################
+XLIB_LIBPTHREAD_STUBS_VERSION = 0.3
+XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2
+XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
+
+XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
+

From 6fd3e597c842e382d93122ea81d326392c9301f7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:39 +0000
Subject: [PATCH 3812/6849] xdriver_xf86-input-acecad: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-input-acecad/Config.in    |  8 --------
 .../xdriver_xf86-input-acecad.mk                     | 12 ------------
 3 files changed, 21 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-input-acecad/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 9e08e3f279..7713d679d8 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -170,7 +170,6 @@ endmenu
 	endmenu
 	if BR2_PACKAGE_XSERVER_xorg
 	menu "X11R7 Drivers"
-		source package/x11r7/xdriver_xf86-input-acecad/Config.in
 		source package/x11r7/xdriver_xf86-input-aiptek/Config.in
 		source package/x11r7/xdriver_xf86-input-evdev/Config.in
 		source package/x11r7/xdriver_xf86-input-joystick/Config.in
diff --git a/package/x11r7/xdriver_xf86-input-acecad/Config.in b/package/x11r7/xdriver_xf86-input-acecad/Config.in
deleted file mode 100644
index 7e1838e617..0000000000
--- a/package/x11r7/xdriver_xf86-input-acecad/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_ACECAD
-	bool "xf86-input-acecad"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_INPUTPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Acecad Flair input driver
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
deleted file mode 100644
index dd020a8d64..0000000000
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-input-acecad -- Acecad Flair input driver
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.4.0
-XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-
-$(eval $(autotools-package))

From 0b0a9b258cb0f78839682ffc8c12f470bb01dadf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:40 +0000
Subject: [PATCH 3813/6849] xdriver_xf86-input-aiptek: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-input-aiptek/Config.in    |  8 --------
 .../xdriver_xf86-input-aiptek.mk                     | 12 ------------
 3 files changed, 21 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-input-aiptek/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 7713d679d8..985b72f699 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -170,7 +170,6 @@ endmenu
 	endmenu
 	if BR2_PACKAGE_XSERVER_xorg
 	menu "X11R7 Drivers"
-		source package/x11r7/xdriver_xf86-input-aiptek/Config.in
 		source package/x11r7/xdriver_xf86-input-evdev/Config.in
 		source package/x11r7/xdriver_xf86-input-joystick/Config.in
 		source package/x11r7/xdriver_xf86-input-keyboard/Config.in
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/Config.in b/package/x11r7/xdriver_xf86-input-aiptek/Config.in
deleted file mode 100644
index 87fe5b3983..0000000000
--- a/package/x11r7/xdriver_xf86-input-aiptek/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_INPUT_AIPTEK
-	bool "xf86-input-aiptek"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_INPUTPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Aiptek USB Digital Tablet Input Driver for Linux
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
deleted file mode 100644
index 5e48a74e4d..0000000000
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-input-aiptek -- Aiptek USB Digital Tablet Input Driver for Linux
-#
-################################################################################
-
-XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.3.1
-XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-
-$(eval $(autotools-package))

From cd09ff8da0092a2b4aafe3397b44d929b1d74e8b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:41 +0000
Subject: [PATCH 3814/6849] xdriver_xf86-video-apm: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-apm/Config.in       | 12 ------------
 .../xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk | 12 ------------
 3 files changed, 25 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-apm/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 985b72f699..7a7666e6f3 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -178,7 +178,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-input-tslib/Config.in
 		source package/x11r7/xdriver_xf86-input-vmmouse/Config.in
 		source package/x11r7/xdriver_xf86-input-void/Config.in
-		source package/x11r7/xdriver_xf86-video-apm/Config.in
 		source package/x11r7/xdriver_xf86-video-ark/Config.in
 		source package/x11r7/xdriver_xf86-video-ast/Config.in
 		source package/x11r7/xdriver_xf86-video-ati/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-apm/Config.in b/package/x11r7/xdriver_xf86-video-apm/Config.in
deleted file mode 100644
index dea52580b1..0000000000
--- a/package/x11r7/xdriver_xf86-video-apm/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_APM
-	bool "xf86-video-apm"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Alliance ProMotion video driver
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
deleted file mode 100644
index d0317f5366..0000000000
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-apm -- Alliance ProMotion video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.3
-XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
-
-$(eval $(autotools-package))

From 0de14499a18c037a87c44924894e0795cd4a7dd2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:42 +0000
Subject: [PATCH 3815/6849] xdriver_xf86-video-chips: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-chips/Config.in     | 10 ----------
 .../xdriver_xf86-video-chips.mk                      | 12 ------------
 3 files changed, 23 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-chips/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 7a7666e6f3..8c6a659018 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -181,7 +181,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-ark/Config.in
 		source package/x11r7/xdriver_xf86-video-ast/Config.in
 		source package/x11r7/xdriver_xf86-video-ati/Config.in
-		source package/x11r7/xdriver_xf86-video-chips/Config.in
 		source package/x11r7/xdriver_xf86-video-cirrus/Config.in
 		source package/x11r7/xdriver_xf86-video-dummy/Config.in
 		source package/x11r7/xdriver_xf86-video-fbdev/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-chips/Config.in b/package/x11r7/xdriver_xf86-video-chips/Config.in
deleted file mode 100644
index 29a99ecf73..0000000000
--- a/package/x11r7/xdriver_xf86-video-chips/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CHIPS
-	bool "xf86-video-chips"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Chips and Technologies video driver
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
deleted file mode 100644
index 9856ecb5fe..0000000000
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-chips -- Chips and Technologies video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.3
-XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-
-$(eval $(autotools-package))

From 6ced399048b0e3128699c1ce841dddc8666915ee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:43 +0000
Subject: [PATCH 3816/6849] xdriver_xf86-video-i740: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-i740/Config.in      | 11 -----------
 .../xdriver_xf86-video-i740.mk                       | 12 ------------
 3 files changed, 24 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-i740/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 8c6a659018..2f890da98d 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -188,7 +188,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-glide/Config.in
 		source package/x11r7/xdriver_xf86-video-glint/Config.in
 		source package/x11r7/xdriver_xf86-video-i128/Config.in
-		source package/x11r7/xdriver_xf86-video-i740/Config.in
 		source package/x11r7/xdriver_xf86-video-intel/Config.in
 		source package/x11r7/xdriver_xf86-video-mach64/Config.in
 		source package/x11r7/xdriver_xf86-video-mga/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-i740/Config.in b/package/x11r7/xdriver_xf86-video-i740/Config.in
deleted file mode 100644
index 9d1a040294..0000000000
--- a/package/x11r7/xdriver_xf86-video-i740/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I740
-	bool "xf86-video-i740"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Intel i740 video driver
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
deleted file mode 100644
index 06d808357f..0000000000
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-i740 -- Intel i740 video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_I740_VERSION = 1.3.2
-XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))

From 2601c7f721c252204d8e6fb843c679cd5ce31a48 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:44 +0000
Subject: [PATCH 3817/6849] xdriver_xf86-video-rendition: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-rendition/Config.in | 10 ----------
 .../xdriver_xf86-video-rendition.mk                  | 12 ------------
 3 files changed, 23 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-rendition/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2f890da98d..a6be745b20 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -196,7 +196,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-nv/Config.in
 		source package/x11r7/xdriver_xf86-video-openchrome/Config.in
 		source package/x11r7/xdriver_xf86-video-r128/Config.in
-		source package/x11r7/xdriver_xf86-video-rendition/Config.in
 		source package/x11r7/xdriver_xf86-video-s3/Config.in
 		source package/x11r7/xdriver_xf86-video-s3virge/Config.in
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-rendition/Config.in b/package/x11r7/xdriver_xf86-video-rendition/Config.in
deleted file mode 100644
index 9238aec41a..0000000000
--- a/package/x11r7/xdriver_xf86-video-rendition/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_RENDITION
-	bool "xf86-video-rendition"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Rendition video driver
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
deleted file mode 100644
index d83a1ef4bf..0000000000
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-rendition -- Rendition video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.4
-XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))

From 5bbdbacad851e0f0b697fead5cb87453cd8ea93e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:45 +0000
Subject: [PATCH 3818/6849] xdriver_xf86-video-s3: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  2 --
 package/x11r7/xdriver_xf86-video-s3/Config.in        | 11 -----------
 .../xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk   | 12 ------------
 3 files changed, 25 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-s3/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index a6be745b20..ee5fb047be 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -196,8 +196,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-nv/Config.in
 		source package/x11r7/xdriver_xf86-video-openchrome/Config.in
 		source package/x11r7/xdriver_xf86-video-r128/Config.in
-		source package/x11r7/xdriver_xf86-video-s3/Config.in
-		source package/x11r7/xdriver_xf86-video-s3virge/Config.in
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
 		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-s3/Config.in b/package/x11r7/xdriver_xf86-video-s3/Config.in
deleted file mode 100644
index 109102806b..0000000000
--- a/package/x11r7/xdriver_xf86-video-s3/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3
-	bool "xf86-video-s3"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  X.Org driver for s3 cards
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
deleted file mode 100644
index b2cf5cf495..0000000000
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-s3 -- X.Org driver for s3 cards
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_S3_VERSION = 0.6.3
-XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))

From 43e95a4e19228fde8611621229c41fdedbdf963a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:46 +0000
Subject: [PATCH 3819/6849] xdriver_xf86-video-s3virge: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-s3virge/Config.in   | 11 -----------
 .../xdriver_xf86-video-s3virge.mk                    | 12 ------------
 2 files changed, 23 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-s3virge/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk

diff --git a/package/x11r7/xdriver_xf86-video-s3virge/Config.in b/package/x11r7/xdriver_xf86-video-s3virge/Config.in
deleted file mode 100644
index 6f31864ccd..0000000000
--- a/package/x11r7/xdriver_xf86-video-s3virge/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3VIRGE
-	bool "xf86-video-s3virge"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  S3 ViRGE video driver
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
deleted file mode 100644
index a3fd480da5..0000000000
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-s3virge -- S3 ViRGE video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.10.4
-XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))

From 5d2810b381f38a8eb641f66f6bc79b3cc33dea28 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:47 +0000
Subject: [PATCH 3820/6849] xdriver_xf86-video-sisusb: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-sisusb/Config.in    | 12 ------------
 .../xdriver_xf86-video-sisusb.mk                     | 12 ------------
 3 files changed, 25 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-sisusb/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index ee5fb047be..d6a8bcdf2e 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -199,7 +199,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
 		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
-		source package/x11r7/xdriver_xf86-video-sisusb/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg14/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg3/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/Config.in b/package/x11r7/xdriver_xf86-video-sisusb/Config.in
deleted file mode 100644
index b00a8a77bf..0000000000
--- a/package/x11r7/xdriver_xf86-video-sisusb/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SISUSB
-	bool "xf86-video-sisusb"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  SiS USB video driver
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
deleted file mode 100644
index c59b8760b4..0000000000
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-sisusb -- SiS USB video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.4
-XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto
-
-$(eval $(autotools-package))

From 25e06814d188c6aeaa1dcb46f8233fc042d3dbf9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:48 +0000
Subject: [PATCH 3821/6849] xdriver_xf86-video-suncg14: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-suncg14/Config.in   |  9 ---------
 .../xdriver_xf86-video-suncg14.mk                    | 12 ------------
 3 files changed, 22 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-suncg14/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index d6a8bcdf2e..3a6fabd794 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -199,7 +199,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
 		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
-		source package/x11r7/xdriver_xf86-video-suncg14/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg3/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
 		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/Config.in b/package/x11r7/xdriver_xf86-video-suncg14/Config.in
deleted file mode 100644
index 661c1799e2..0000000000
--- a/package/x11r7/xdriver_xf86-video-suncg14/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG14
-	bool "xf86-video-suncg14"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  CG14 video driver
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
deleted file mode 100644
index 3808828efb..0000000000
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-suncg14 -- CG14 video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SUNCG14_VERSION = 1.1.1
-XDRIVER_XF86_VIDEO_SUNCG14_SOURCE = xf86-video-suncg14-$(XDRIVER_XF86_VIDEO_SUNCG14_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-
-$(eval $(autotools-package))

From 01eeab0c4b200ea9b57362c2e7340c9168f52dc0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:49 +0000
Subject: [PATCH 3822/6849] xdriver_xf86-video-suncg3: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-suncg3/Config.in    |  9 ---------
 .../xdriver_xf86-video-suncg3.mk                     | 12 ------------
 3 files changed, 22 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-suncg3/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 3a6fabd794..84b44bbb45 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -199,7 +199,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
 		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
-		source package/x11r7/xdriver_xf86-video-suncg3/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
 		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
 		source package/x11r7/xdriver_xf86-video-sunleo/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/Config.in b/package/x11r7/xdriver_xf86-video-suncg3/Config.in
deleted file mode 100644
index 539a95ace3..0000000000
--- a/package/x11r7/xdriver_xf86-video-suncg3/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG3
-	bool "xf86-video-suncg3"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  CG3 video driver
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
deleted file mode 100644
index 971cf90e4d..0000000000
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-suncg3 -- CG3 video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SUNCG3_VERSION = 1.1.1
-XDRIVER_XF86_VIDEO_SUNCG3_SOURCE = xf86-video-suncg3-$(XDRIVER_XF86_VIDEO_SUNCG3_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-
-$(eval $(autotools-package))

From 8015b1fac42622445e3e0d972c37b0c9dcbbe7e0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:50 +0000
Subject: [PATCH 3823/6849] xdriver_xf86-video-sunleo: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-sunleo/Config.in    |  9 ---------
 .../xdriver_xf86-video-sunleo.mk                     | 12 ------------
 3 files changed, 22 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-sunleo/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 84b44bbb45..dd04781980 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -201,7 +201,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
 		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
-		source package/x11r7/xdriver_xf86-video-sunleo/Config.in
 		source package/x11r7/xdriver_xf86-video-suntcx/Config.in
 		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
 		source package/x11r7/xdriver_xf86-video-tga/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/Config.in b/package/x11r7/xdriver_xf86-video-sunleo/Config.in
deleted file mode 100644
index 29d24a229d..0000000000
--- a/package/x11r7/xdriver_xf86-video-sunleo/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNLEO
-	bool "xf86-video-sunleo"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Leo video driver
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
deleted file mode 100644
index e56074e06f..0000000000
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-sunleo -- Leo video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SUNLEO_VERSION = 1.2.0
-XDRIVER_XF86_VIDEO_SUNLEO_SOURCE = xf86-video-sunleo-$(XDRIVER_XF86_VIDEO_SUNLEO_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-
-$(eval $(autotools-package))

From 2d34c909f8edb94dfa03407bd53a90ca291a886b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:51 +0000
Subject: [PATCH 3824/6849] xdriver_xf86-video-suntcx: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-suntcx/Config.in    |  9 ---------
 .../xdriver_xf86-video-suntcx.mk                     | 12 ------------
 3 files changed, 22 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-suntcx/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index dd04781980..b03531e030 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -201,7 +201,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
 		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
 		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
-		source package/x11r7/xdriver_xf86-video-suntcx/Config.in
 		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
 		source package/x11r7/xdriver_xf86-video-tga/Config.in
 		source package/x11r7/xdriver_xf86-video-trident/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/Config.in b/package/x11r7/xdriver_xf86-video-suntcx/Config.in
deleted file mode 100644
index 3c82739d62..0000000000
--- a/package/x11r7/xdriver_xf86-video-suntcx/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNTCX
-	bool "xf86-video-suntcx"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  TCX video driver
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
deleted file mode 100644
index edca7fe377..0000000000
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-suntcx -- TCX video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SUNTCX_VERSION = 1.1.1
-XDRIVER_XF86_VIDEO_SUNTCX_SOURCE = xf86-video-suntcx-$(XDRIVER_XF86_VIDEO_SUNTCX_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-
-$(eval $(autotools-package))

From cfbb36a972f48c08816a08c224f4a3e69d471cca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:52 +0000
Subject: [PATCH 3825/6849] xdriver_xf86-video-tseng: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-tseng/Config.in     | 11 -----------
 .../xdriver_xf86-video-tseng.mk                      | 12 ------------
 3 files changed, 24 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-tseng/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index b03531e030..0649086cb9 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -204,7 +204,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
 		source package/x11r7/xdriver_xf86-video-tga/Config.in
 		source package/x11r7/xdriver_xf86-video-trident/Config.in
-		source package/x11r7/xdriver_xf86-video-tseng/Config.in
 		source package/x11r7/xdriver_xf86-video-v4l/Config.in
 		source package/x11r7/xdriver_xf86-video-vesa/Config.in
 		source package/x11r7/xdriver_xf86-video-vmware/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-tseng/Config.in b/package/x11r7/xdriver_xf86-video-tseng/Config.in
deleted file mode 100644
index f72b87be60..0000000000
--- a/package/x11r7/xdriver_xf86-video-tseng/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TSENG
-	bool "xf86-video-tseng"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  Tseng Labs video driver
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
deleted file mode 100644
index 8127c7d71e..0000000000
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-tseng -- Tseng Labs video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.4
-XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))

From b2decde6b6f96e25e9a0dabb46b45c9dfa4bc79b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:53 +0000
Subject: [PATCH 3826/6849] xdriver_xf86-video-xgi: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                             |  2 --
 package/x11r7/xdriver_xf86-video-xgi/Config.in      | 11 -----------
 .../xdriver_xf86-video-xgi.mk                       | 13 -------------
 3 files changed, 26 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-xgi/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 0649086cb9..184afd24f6 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -209,8 +209,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-vmware/Config.in
 		source package/x11r7/xdriver_xf86-video-voodoo/Config.in
 		source package/x11r7/xdriver_xf86-video-wsfb/Config.in
-		source package/x11r7/xdriver_xf86-video-xgi/Config.in
-		source package/x11r7/xdriver_xf86-video-xgixp/Config.in
 	endmenu
 	endif
 	menu "X11R7 Fonts"
diff --git a/package/x11r7/xdriver_xf86-video-xgi/Config.in b/package/x11r7/xdriver_xf86-video-xgi/Config.in
deleted file mode 100644
index d0fe665335..0000000000
--- a/package/x11r7/xdriver_xf86-video-xgi/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGI
-	bool "xf86-video-xgi"
-	select BR2_PACKAGE_MESA3D
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  XGI based chips video driver
diff --git a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
deleted file mode 100644
index 491f4e8caa..0000000000
--- a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-xgi -- XGI video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_XGI_VERSION = 1.6.0
-XDRIVER_XF86_VIDEO_XGI_SOURCE = xf86-video-xgi-$(XDRIVER_XF86_VIDEO_XGI_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_XGI_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_XGI_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-XDRIVER_XF86_VIDEO_XGI_CONF_OPT = --enable-dri
-
-$(eval $(autotools-package))

From c02a49ce19095b5e039abd37a7e2dbe6024f17b3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:54 +0000
Subject: [PATCH 3827/6849] xdriver_xf86-video-xgixp: remove package

This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-video-xgixp/Config.in  | 11 ---------
 ...river_xf86-video-xgixp-cross-compile.patch | 24 -------------------
 .../xdriver_xf86-video-xgixp.mk               | 13 ----------
 3 files changed, 48 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-xgixp/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp-cross-compile.patch
 delete mode 100644 package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk

diff --git a/package/x11r7/xdriver_xf86-video-xgixp/Config.in b/package/x11r7/xdriver_xf86-video-xgixp/Config.in
deleted file mode 100644
index 8d466f45d0..0000000000
--- a/package/x11r7/xdriver_xf86-video-xgixp/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGIXP
-	bool "xf86-video-xgixp"
-	select BR2_PACKAGE_MESA3D
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  XGIXP based chips video driver
diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp-cross-compile.patch b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp-cross-compile.patch
deleted file mode 100644
index 9736252f2e..0000000000
--- a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp-cross-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- xdriver_xf86-video-xgixp-1.7.99.4/configure.ac.orig	2009-09-07 08:09:14.000000000 +0300
-+++ xdriver_xf86-video-xgixp-1.7.99.4/configure.ac	2010-02-04 00:12:22.159108635 +0200
-@@ -63,12 +63,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo
- # Checks for header files.
- AC_HEADER_STDC
- 
--AC_CHECK_FILE([${sdkdir}/dri.h],
-+if test "$cross_compiling" = "no" ; then
-+        AC_CHECK_FILE([${sdkdir}/dri.h],
-               [have_dri_h="yes"], [have_dri_h="no"])
--AC_CHECK_FILE([${sdkdir}/sarea.h],
-+        AC_CHECK_FILE([${sdkdir}/sarea.h],
-               [have_sarea_h="yes"], [have_sarea_h="no"])
--AC_CHECK_FILE([${sdkdir}/dristruct.h],
-+        AC_CHECK_FILE([${sdkdir}/dristruct.h],
-               [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+else
-+        have_dri_h="yes"
-+        have_sarea_h="yes"
-+        have_dristruct_h="yes"
-+fi
- 
- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
- 
diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
deleted file mode 100644
index 4a9a2a2423..0000000000
--- a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-xgixp -- XGIXP video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_XGIXP_VERSION = 1.8.0
-XDRIVER_XF86_VIDEO_XGIXP_SOURCE = xf86-video-xgixp-$(XDRIVER_XF86_VIDEO_XGIXP_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_XGIXP_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_XGIXP_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_XGIXP_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))

From 8afc3e684e1a2a28c552fead367d334aabfd514f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 2 Jan 2013 01:26:55 +0000
Subject: [PATCH 3828/6849] support/scripts: add xorg-release.py script

This script generates a report on the packaging status of X.org
releases in Buildroot. It does so by downloading the list of tarballs
that are part of a given X.org release, and compare that with the
packages that are available in Buildroot.

[Peter: drop .py suffix, make executable]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/xorg-release | 165 +++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100755 support/scripts/xorg-release

diff --git a/support/scripts/xorg-release b/support/scripts/xorg-release
new file mode 100755
index 0000000000..8055658218
--- /dev/null
+++ b/support/scripts/xorg-release
@@ -0,0 +1,165 @@
+#!/usr/bin/python
+
+# This script generates a report on the packaging status of X.org
+# releases in Buildroot. It does so by downloading the list of
+# tarballs that are part of a given X.org release, and compare that
+# with the packages that are available in Buildroot.
+
+import BeautifulSoup
+import re
+import os
+import urllib
+
+# This can be customized
+XORG_VERSION = "X11R7.7"
+
+# Key names in dictionaries
+XORG_VERSION_KEY = "xorg-version"
+BR_VERSION_KEY = "br-version"
+BR_NAME_KEY = "br-name"
+
+# Get the list of tarballs of a X.org release, parse it, and return a
+# dictionary of dictionaries, of the form:
+#
+#   { <name_of_package> : { XORG_VERSION_KEY: <version_of_package> },
+#     <name_of_package2> : { XORG_VERSION_KEY: <version_of_package2> }}
+#
+def get_xorg_release_pkgs():
+    u = urllib.URLopener().open("http://www.x.org/releases/%s/src/everything/" % XORG_VERSION)
+    b = BeautifulSoup.BeautifulSoup()
+    b.feed(u.read())
+    links = b.findAll("a")
+    packages = {}
+    r = re.compile("(.*)-([0-9\.]*).tar.bz2")
+    # We now have a list of all links.
+    for link in links:
+        href = link.get("href")
+        # Skip everything but tarballs
+        if not href.endswith(".tar.bz2"):
+            continue
+        # Separate the name and the version
+        groups = r.match(href)
+        if not groups:
+            continue
+        name = groups.group(1)
+        version = groups.group(2)
+        packages[name] = { XORG_VERSION_KEY : version }
+    return packages
+
+# Files and directories in package/x11r7/ that should be ignored in
+# our processing.
+BUILDROOT_EXCEPTIONS = [
+    "mcookie", # Code is directly in package directory
+    "x11r7.mk",
+    "Config.in",
+    "xdriver_xf86-input-tslib", # From Pengutronix, not part of X.org releases
+]
+
+# Prefixes of directories in package/x11r7/ that must be stripped
+# before trying to match Buildroot package names with X.org tarball
+# names.
+BUILDROOT_PREFIXES = [
+    "xapp",
+    "xdriver",
+    "xfont",
+    "xlib",
+    "xserver",
+    "xutil",
+    "xproto",
+]
+
+# From a Buildroot package name, try to see if a prefix should be
+# stripped from it. For example, passing "xapp_xlsfonts" as argument
+# to this function will return "xlsfonts".
+def buildroot_strip_prefix(dirname):
+    for prefix in BUILDROOT_PREFIXES:
+        if dirname.startswith(prefix + "_"):
+            return dirname[len(prefix) + 1:]
+    return dirname
+
+# From a Buildroot package name, parse its .mk file to find the
+# Buildroot version of the package by looking at the <foo>_VERSION
+# line.
+def buildroot_get_version(dirname):
+    f = open(os.path.join("package", "x11r7", dirname, dirname + ".mk"))
+    r = re.compile("^([A-Z0-9_]*)_VERSION = ([0-9\.]*)$")
+    for l in f.readlines():
+        m = r.match(l)
+        if m:
+            return m.group(2)
+    return None
+
+# Augment the informations of the X.org list of packages (given as
+# argument) by details about their packaging in Buildroot. Those
+# details are found by looking at the contents of package/x11r7/.
+def get_buildroot_pkgs(packages):
+    dirs = os.listdir(os.path.join(os.getcwd(), "package", "x11r7"))
+    for d in dirs:
+        # Skip exceptions
+        if d in BUILDROOT_EXCEPTIONS:
+            continue
+        pkgname = buildroot_strip_prefix(d)
+        version = buildroot_get_version(d)
+        if packages.has_key(pkgname):
+            # There is a X.org package of the same name, so we just
+            # add informations to the existing dict entry.
+            packages[pkgname]['br-version'] = version
+            packages[pkgname]['br-name'] = d
+        else:
+            # There is no X.org package with this name, so we add a
+            # new dict entry.
+            packages[pkgname] = { BR_VERSION_KEY: version,
+                                  BR_NAME_KEY : d }
+    return packages
+
+def show_summary(packages):
+    FORMAT_STRING = "%40s | %15s | %15s | %-30s"
+    print FORMAT_STRING % ("Package name", "Vers in BR", "Vers in X.org", "Action")
+    print FORMAT_STRING % ("-" * 40, "-" * 15, "-" * 15, "-" * 30)
+    pkgs = packages.keys()
+    pkgs.sort()
+    total_pkgs = 0
+    upgrade_pkgs = 0
+    add_pkgs = 0
+    remove_pkgs = 0
+    nothing_todo_pkgs = 0
+    for pkgname in pkgs:
+        pkg = packages[pkgname]
+        total_pkgs += 1
+        if pkg.has_key(XORG_VERSION_KEY) and not pkg.has_key(BR_VERSION_KEY):
+            xorg_version = pkg[XORG_VERSION_KEY]
+            br_version = "N/A"
+            action = "Add to Buildroot"
+            add_pkgs += 1
+        elif not pkg.has_key(XORG_VERSION_KEY) and pkg.has_key(BR_VERSION_KEY):
+            br_version = pkg[BR_VERSION_KEY]
+            xorg_version = "N/A"
+            action = "Remove from Buildroot"
+            remove_pkgs += 1
+        # For now, we assume that if a package version is different,
+        # it's because an upgrade is needed.
+        elif pkg[XORG_VERSION_KEY] != pkg[BR_VERSION_KEY]:
+            br_version = pkg[BR_VERSION_KEY]
+            xorg_version = pkg[XORG_VERSION_KEY]
+            action = "Upgrade"
+            upgrade_pkgs += 1
+        else:
+            br_version = pkg[BR_VERSION_KEY]
+            xorg_version = pkg[XORG_VERSION_KEY]
+            action = "-"
+            nothing_todo_pkgs += 1
+
+        print FORMAT_STRING % (pkgname, br_version.center(15), xorg_version.center(15), action)
+    print FORMAT_STRING % ("-" * 40, "-" * 15, "-" * 15, "-" * 30)
+    STAT_FORMAT_STRING = "%40s : %3d"
+    print STAT_FORMAT_STRING % ("Total number of packages", total_pkgs)
+    print STAT_FORMAT_STRING % ("Packages to upgrade", upgrade_pkgs)
+    print STAT_FORMAT_STRING % ("Packages to add", add_pkgs)
+    print STAT_FORMAT_STRING % ("Packages to remove", remove_pkgs)
+    print STAT_FORMAT_STRING % ("Packages with nothing to do", nothing_todo_pkgs)
+
+packages = get_xorg_release_pkgs()
+packages = get_buildroot_pkgs(packages)
+# print packages
+show_summary(packages)
+

From b1bee2a28874c749f7c038443efa053cc936c606 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 Jan 2013 02:57:08 +0000
Subject: [PATCH 3829/6849] xdriver_xf86-video-suncg6: remove package

The CG6 was an old SBUS video card used in Sun SPARC workstations from
the 90s.
Highly unlikely a target for buildroot.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-suncg6/Config.in    |  9 ---------
 .../xdriver_xf86-video-suncg6.mk                     | 12 ------------
 3 files changed, 22 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-suncg6/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 184afd24f6..fccf33f818 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -199,7 +199,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
 		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
-		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
 		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
 		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
 		source package/x11r7/xdriver_xf86-video-tga/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/Config.in b/package/x11r7/xdriver_xf86-video-suncg6/Config.in
deleted file mode 100644
index 9496f8d997..0000000000
--- a/package/x11r7/xdriver_xf86-video-suncg6/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG6
-	bool "xf86-video-suncg6"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  GX/Turbo GX video driver
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
deleted file mode 100644
index 1314fea46e..0000000000
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-suncg6 -- GX/Turbo GX video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SUNCG6_VERSION = 1.1.1
-XDRIVER_XF86_VIDEO_SUNCG6_SOURCE = xf86-video-suncg6-$(XDRIVER_XF86_VIDEO_SUNCG6_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-
-$(eval $(autotools-package))

From 66bfe1d4fe2de50aef6ac3fc836a710fa577cdef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 Jan 2013 02:57:09 +0000
Subject: [PATCH 3830/6849] xdriver_xf86-video-sunffb: remove package

The FFB was an old SBUS video card used in Sun SPARC workstations
from the 90s.
Highly unlikely a target for buildroot.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xdriver_xf86-video-sunffb/Config.in    | 12 ------------
 .../xdriver_xf86-video-sunffb.mk                     | 12 ------------
 3 files changed, 25 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-sunffb/Config.in
 delete mode 100644 package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index fccf33f818..2aac5a2d36 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -199,7 +199,6 @@ endmenu
 		source package/x11r7/xdriver_xf86-video-savage/Config.in
 		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
 		source package/x11r7/xdriver_xf86-video-sis/Config.in
-		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
 		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
 		source package/x11r7/xdriver_xf86-video-tga/Config.in
 		source package/x11r7/xdriver_xf86-video-trident/Config.in
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/Config.in b/package/x11r7/xdriver_xf86-video-sunffb/Config.in
deleted file mode 100644
index 76f5b9ac89..0000000000
--- a/package/x11r7/xdriver_xf86-video-sunffb/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNFFB
-	bool "xf86-video-sunffb"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	help
-	  SUNFFB video driver
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
deleted file mode 100644
index a3e1d7ca08..0000000000
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-sunffb -- SUNFFB video driver
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.2.1
-XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-
-$(eval $(autotools-package))

From cf6ec44578a06907b9d86dc57b20ddf226ea0c74 Mon Sep 17 00:00:00 2001
From: Mikhail Boiko <mikhailboiko85@gmail.com>
Date: Tue, 25 Dec 2012 21:43:58 +0000
Subject: [PATCH 3831/6849] new package: libfribidi

[Peter: moved under 'Text and terminal handling']
Signed-off-by: Mikhail Boiko <mikhailboiko85@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/libfribidi/Config.in     |  7 +++++++
 package/libfribidi/libfribidi.mk | 13 +++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 package/libfribidi/Config.in
 create mode 100644 package/libfribidi/libfribidi.mk

diff --git a/package/Config.in b/package/Config.in
index 11ff82d126..047af8d0cd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -545,6 +545,7 @@ endmenu
 
 menu "Text and terminal handling"
 source "package/enchant/Config.in"
+source "package/libfribidi/Config.in"
 source "package/icu/Config.in"
 source "package/libiconv/Config.in"
 source "package/linenoise/Config.in"
diff --git a/package/libfribidi/Config.in b/package/libfribidi/Config.in
new file mode 100644
index 0000000000..74d9c5b431
--- /dev/null
+++ b/package/libfribidi/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBFRIBIDI
+	bool "libfribidi"
+	help
+	  GNU FriBidi is an implementation of the Unicode
+	  Bidirectional Algorithm (bidi).
+
+	  http://www.fribidi.org/
diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk
new file mode 100644
index 0000000000..538997c7c2
--- /dev/null
+++ b/package/libfribidi/libfribidi.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# libfribidi
+#
+#############################################################
+
+LIBFRIBIDI_VERSION = 0.19.5
+LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2
+LIBFRIBIDI_SITE = http://www.fribidi.org/download/
+LIBFRIBIDI_LICENSE = LGPLv2.1+
+LIBFRIBIDI_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From d7dde090f4a9b20ae25cf3743d364f24bc8f1c9f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 5 Jan 2013 09:26:45 +0000
Subject: [PATCH 3832/6849] xorg-release: ignore some X.org packages

Following Gustavo's removal of two X.org drivers for old hardware
unlikely to be used in embedded contexts, the xorg-release script now
reports those two X.org packages as "to be added": they exist in
X.org, but not in Buildroot.

So, we add a small list, XORG_EXCEPTIONS, in our xorg-release script,
to list the X.org packages we don't want to hear about. Of course,
packages that exist in X.org, and that are not part of this exception
list, and are not packaged in Buildroot are still listed as "to be
added".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/xorg-release | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/support/scripts/xorg-release b/support/scripts/xorg-release
index 8055658218..70ba41c08b 100755
--- a/support/scripts/xorg-release
+++ b/support/scripts/xorg-release
@@ -18,6 +18,14 @@ XORG_VERSION_KEY = "xorg-version"
 BR_VERSION_KEY = "br-version"
 BR_NAME_KEY = "br-name"
 
+# Packages part of X.org releases that we do not want to package in
+# Buildroot (old drivers for hardware unlikely to be used in embedded
+# contexts).
+XORG_EXCEPTIONS = [
+    'xf86-video-suncg6',
+    'xf86-video-sunffb',
+]
+
 # Get the list of tarballs of a X.org release, parse it, and return a
 # dictionary of dictionaries, of the form:
 #
@@ -43,6 +51,9 @@ def get_xorg_release_pkgs():
             continue
         name = groups.group(1)
         version = groups.group(2)
+        # Skip packages we don't want to hear about
+        if name in XORG_EXCEPTIONS:
+            continue
         packages[name] = { XORG_VERSION_KEY : version }
     return packages
 

From 698cd0a0f401b55553766b6effe5dcc2895d4e3c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 6 Jan 2013 11:16:23 +0100
Subject: [PATCH 3833/6849] package: fixup after pthred-stubs rename

Commit 5bd41d165 (pthread-stubs: rename to xlib_libpthread-stubs) renamed
the pthread-stubs package but forgot to update the select statements.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdrm/Config.in       | 2 +-
 package/x11r7/libxcb/Config.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index f3dab9a2c2..f1c3358c1c 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_XLIB_LIBXXF86VM
 	select BR2_PACKAGE_XLIB_LIBXMU
 	select BR2_PACKAGE_XPROTO_DRI2PROTO
-	select BR2_PACKAGE_PTHREAD_STUBS
+	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
 	# libatomic_ops is only available on a subset of the supported
 	# architectures, and we make the assumption that the intel
 	# driver can only be used on x86 and x86_64 machines.
diff --git a/package/x11r7/libxcb/Config.in b/package/x11r7/libxcb/Config.in
index 9554529fc2..1e1afb4cf7 100644
--- a/package/x11r7/libxcb/Config.in
+++ b/package/x11r7/libxcb/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBXCB
 	bool "libxcb"
-	select BR2_PACKAGE_PTHREAD_STUBS
+	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
 	select BR2_PACKAGE_XCB_PROTO
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXAU

From de1eb105a45f88d8c6bf0e00f9b878a36114a5c1 Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Sat, 5 Jan 2013 19:11:45 +0000
Subject: [PATCH 3834/6849] Fix installation of crosstool-ng libraries to
 target

When using the crosstool-ng toolchain option, the libc libraries were not
installed to target.  Buildroot calls the show-tuple function to determine
the directory to copy from, and it seems that outputs the result to stderr
instead of stdout

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 6f81e30cde..553c9ee5bc 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -66,7 +66,7 @@ endif
 # Actual copy
 $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 	$(Q)mkdir -p $(TARGET_DIR)/lib
-	$(Q)CTNG_TUPLE="$$( $(call ctng,show-tuple) )";                     \
+	$(Q)CTNG_TUPLE="$$( $(call ctng,show-tuple 2>&1) )";                \
 	    CTNG_SYSROOT="$(HOST_DIR)/usr/$${CTNG_TUPLE}/sysroot";          \
 	    echo "CTNG_TUPLE='$${CTNG_TUPLE}'";                             \
 	    echo "CTNG_SYSROOT='$${CTNG_SYSROOT}'";                         \

From 5b33e0b6a139ce3a622817b45a8882a448312fc0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 6 Jan 2013 16:47:05 +0100
Subject: [PATCH 3835/6849] linux: handle new dtb location since 3.8-rc1 for
 appended dtbs

Similar to how we've done it for seperate dtbs (ef34705087b).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index e852f626f2..7ec9cd244b 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -203,14 +203,21 @@ endif
 
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
 define LINUX_APPEND_DTB
-	cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb >> $(KERNEL_ARCH_PATH)/boot/zImage
+define LINUX_APPEND_DTB
+	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\
+		$(KERNEL_DTS_NAME).dtb dts/$(KERNEL_DTS_NAME).dtb)) \
+		>> $(KERNEL_ARCH_PATH)/boot/zImage
 	# We need to generate the uImage here after that so that the uImage is
 	# generated with the right image size.
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage
 endef
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 define LINUX_APPEND_DTB
-	cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb >> $(KERNEL_ARCH_PATH)/boot/zImage
+	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\
+		$(KERNEL_DTS_NAME).dtb dts/$(KERNEL_DTS_NAME).dtb)) \
+		>> $(KERNEL_ARCH_PATH)/boot/zImage
 endef
 endif
 

From 6e6d2363e02a7c905e7141174d778756a129fa8e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 6 Jan 2013 03:06:28 +0000
Subject: [PATCH 3836/6849] package/crosstool-ng: fix show-tuple stdout

Upstream changeset d8bd17248789.

Reported-by: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rosstool-ng-001-fix-showtuple-stdout.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch

diff --git a/package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch b/package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch
new file mode 100644
index 0000000000..416ef76da4
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch
@@ -0,0 +1,35 @@
+changeset:   3141:d8bd17248789
+tag:         tip
+user:        "Yann E. MORIN" <yann.morin.1998@free.fr>
+date:        Sun Jan 06 12:08:33 2013 +0100
+files:       scripts/showTuple.sh.in
+description:
+scripts/showTuple: fix stdout
+
+Since we've had the debug shell feature, fd #7 is now used to
+redirect stderr, while it was previously unused.
+
+Use fd #9 to redirect stdout.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+
+diff --git a/scripts/showTuple.sh.in b/scripts/showTuple.sh.in
+--- a/scripts/showTuple.sh.in
++++ b/scripts/showTuple.sh.in
+@@ -7,7 +7,7 @@
+ . "${CT_LIB_DIR}/paths.sh"
+ 
+ # We'll need the stdout later, save it
+-exec 7>&1
++exec 9>&1
+ 
+ # Parse the common functions
+ . "${CT_LIB_DIR}/scripts/functions"
+@@ -27,4 +27,4 @@
+ CT_DoBuildTargetTuple
+ 
+ # All this for this single echo... :-( Sigh, I'll have to re-arrange things...
+-echo "${CT_TARGET}" >&7
++echo "${CT_TARGET}" >&9
+

From d3210cbac3cce63ae74fd2936849937b90c35cfb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 06:14:02 +0000
Subject: [PATCH 3837/6849] gstreamer: provide necessary config value for
 AArch64

Provide the as_cv_unaligned_access value for the AArch64 architecture.

Fixes:

  http://autobuild.buildroot.net/results/5d6d76451a00d79e1bdfe87b6ced61807666cc48/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/gstreamer.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index b87f0294ff..3fb913e9d0 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -15,6 +15,9 @@ GSTREAMER_INSTALL_STAGING = YES
 ifeq ($(BR2_avr32),y)
 GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
 endif
+ifeq ($(BR2_aarch64),y)
+GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes
+endif
 
 GSTREAMER_CONF_OPT = \
 		--disable-examples \

From 51e810844e0d469afce72503ece1a7b43a661e62 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 07:27:06 +0000
Subject: [PATCH 3838/6849] efl/libevas: fix build of XCB backend

Fixes:

  http://autobuild.buildroot.net/results/b2107dce84bbc24d9afae3c7b53d972043f6d073/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libevas-fix-xcb-backend-typo.patch        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/efl/libevas/libevas-fix-xcb-backend-typo.patch

diff --git a/package/efl/libevas/libevas-fix-xcb-backend-typo.patch b/package/efl/libevas/libevas-fix-xcb-backend-typo.patch
new file mode 100644
index 0000000000..2531e75eee
--- /dev/null
+++ b/package/efl/libevas/libevas-fix-xcb-backend-typo.patch
@@ -0,0 +1,19 @@
+Fix typo in the Evas XCB backend
+
+This typo prevents the XCB backend from building.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/modules/engines/software_x11/evas_xcb_outbuf.c
+===================================================================
+--- a/src/modules/engines/software_x11/evas_xcb_outbuf.c
++++ b/src/modules/engines/software_x11/evas_xcb_outbuf.c
+@@ -871,7 +871,7 @@
+           }
+         else
+           {
+-             int pixelb = evas_software_xcb_output_buffer_depth(obr->xob) / 8;
++             int pixelb = evas_software_xcb_output_buffer_depth(obr->xcbob) / 8;
+              int run;
+              int dstjump;
+              

From 81faecdb9b43ab9f31b7b2a443238c7c78915129 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 5 Jan 2013 12:40:33 +0000
Subject: [PATCH 3839/6849] pacakge/tvheadend: fix failures due to -Werror

(Partially) apply upstream patch 1334869bf0ea668e58e1c72daa3c09c1a95b5d81
to properly protect code-paths depending on execinfo.h (for backtrace(3)).

Fixes:
    http://autobuild.buildroot.net/results/fe25485bde8894daff5bdf806eb4bb2fa776dc55/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/tvheadend-fix-Werror.patch | 44 ++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/tvheadend/tvheadend-fix-Werror.patch

diff --git a/package/tvheadend/tvheadend-fix-Werror.patch b/package/tvheadend/tvheadend-fix-Werror.patch
new file mode 100644
index 0000000000..5f6dbad821
--- /dev/null
+++ b/package/tvheadend/tvheadend-fix-Werror.patch
@@ -0,0 +1,44 @@
+commit 1334869bf0ea668e58e1c72daa3c09c1a95b5d81
+Author: Alexey I. Froloff <raorn@raorn.name>
+Date:   Wed Oct 24 21:10:15 2012 +0400
+
+    [PR-172] Fix compilatioin issues on OpenWRT
+    
+    Fix SHA1_* function names
+    Fix unused variables and functions
+
+---
+"Yann E. MORIN" <yann.morin.1998@free.fr>:
+    For buildroot, I removed the SHA_* fixes, as we're not affected.
+    No point in fixing something that does not bug us.
+
+diff --git a/src/trap.c b/src/trap.c
+index bd76118..b0fe543 100644
+--- a/src/trap.c
++++ b/src/trap.c
+@@ -67,6 +67,7 @@ sappend(char *buf, size_t l, const char *fmt, ...)
+ /**
+  *
+  */
++#if ENABLE_EXECINFO
+ static int
+ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
+ {
+@@ -126,6 +127,7 @@ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
+   close(fd[0]);
+   return 0;
+ }
++#endif /* ENABLE_EXECINFO */
+ 
+ 
+ 
+@@ -133,8 +135,8 @@ static void
+ traphandler(int sig, siginfo_t *si, void *UC)
+ {
+   ucontext_t *uc = UC;
+-  char buf[200];
+ #if ENABLE_EXECINFO
++  char buf[200];
+   static void *frames[MAXFRAMES];
+   int nframes = backtrace(frames, MAXFRAMES);
+   Dl_info dli;

From 4eff1f206416a2ade7f5d88375cfd271a4c425c5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 06:14:48 +0000
Subject: [PATCH 3840/6849] toolchain-external: add dependency on BR2_HOST_ARCH

The pre-build external toolchains are all built for x86, so they are
only available if the build machine is a x86 or x86-64 machine.

[Peter: microblaze toolchains are 64bit]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index eeb40a375d..0da88ef420 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -7,6 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 	bool "Linaro 2012.12"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -24,6 +25,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	bool "Linaro 2012.11"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -41,6 +43,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	bool "Linaro 2012.10"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -61,6 +64,7 @@ comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -83,6 +87,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
 	depends on BR2_arm
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -105,6 +110,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	bool "Sourcery CodeBench MIPS 2012.09"
 	depends on BR2_mips || BR2_mipsel
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -173,6 +179,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	bool "Sourcery CodeBench MIPS 2012.03"
 	depends on BR2_mips || BR2_mipsel
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -241,6 +248,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	bool "Sourcery CodeBench ARM 2011.03"
 	depends on BR2_arm
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -263,6 +271,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	bool "Sourcery CodeBench MIPS 2011.09"
 	depends on BR2_mips || BR2_mipsel
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -331,6 +340,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -359,6 +369,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	bool "Sourcery CodeBench PowerPC 2010.09"
 	depends on BR2_powerpc
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -387,6 +398,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 	bool "Sourcery CodeBench SH 2012.09"
 	depends on BR2_sh4a || BR2_sh4aeb
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -407,6 +419,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	bool "Sourcery CodeBench SH 2012.03"
 	depends on BR2_sh4a || BR2_sh4aeb
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
@@ -426,6 +439,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh4a || BR2_sh4aeb
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -446,6 +460,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh2a
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -463,6 +478,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	bool "Sourcery CodeBench SH 2010.09"
 	depends on BR2_sh2a
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -480,6 +496,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
 	bool "Sourcery CodeBench x86/x86_64 2012.09"
 	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -502,6 +519,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	bool "Sourcery CodeBench x86/x86_64 2012.03"
 	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
@@ -523,6 +541,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	bool "Sourcery CodeBench x86/x86_64 2011.09"
 	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -545,6 +564,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	bool "Blackfin.uclinux.org 2012R1-BETA1"
 	depends on BR2_bfin
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_LARGEFILE
@@ -560,6 +580,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	bool "Blackfin.uclinux.org 2011R1-RC4"
 	depends on BR2_bfin
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_LARGEFILE
@@ -575,6 +596,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	bool "Blackfin.uclinux.org 2010RC1"
 	depends on BR2_bfin
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_LARGEFILE
@@ -590,6 +612,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	bool "Xilinx Little Endian Microblaze GNU Tools"
 	depends on BR2_microblazeel
+	depends on BR2_HOSTARCH = "x86_64"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
@@ -599,6 +622,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
+	depends on BR2_HOSTARCH = "x86_64"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
@@ -608,6 +632,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	bool "Linaro AArch64 12.12"
 	depends on BR2_aarch64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
@@ -617,6 +642,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	bool "Linaro AArch64 12.11"
 	depends on BR2_aarch64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
@@ -626,6 +652,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	bool "Linaro AArch64 12.10"
 	depends on BR2_aarch64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help

From 70d6037e8a47f7a199345f60790bd5d1618e8207 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 06:14:49 +0000
Subject: [PATCH 3841/6849] Infrastructure to warn the user about missing 32
 bits libraries

Many users trying to use external toolchains on x86-64 machines get a
very confusing message:

  "Can't execute cross-compiler"

They get this message because they forgot to install the 32 bits
compatibility libraries that are needed to run binaries compiled for
x86 on x86-64 machines.

Since this is the case for both external toolchains and certain
binary-only tools like SAM-BA, we add a new Kconfig option
BR2_HOSTARCH_NEEDS_IA32_LIBS, that packages must select if they need
the 32 bits compatibility libraries. When this option is enabled,
dependencies.sh checks that the 32 bits dynamic library loader is
present on the system, and if not, it stops and shows an error.

The path and name of the 32 bits dynamic loader is hardcoded because
it is very unlikely to change, as it would break the ABI for all
binaries.

Also, it is worth noting that the check will be done even if we're
running on a 32 bits machine. This is harmless, as 32 bits machines
necessarily have the 32 bits dynamic loader installed, so the error
will never show up in this case.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                            |  6 ++++++
 support/dependencies/dependencies.sh | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Config.in b/Config.in
index b319ac78c5..af77a83cb6 100644
--- a/Config.in
+++ b/Config.in
@@ -14,6 +14,12 @@ config BR2_HOSTARCH
 	string
 	option env="HOSTARCH"
 
+# Hidden boolean selected by pre-built packages for x86, when they
+# need to run on x86-64 machines (example: pre-built external
+# toolchains, binary tools like SAM-BA, etc.).
+config BR2_HOSTARCH_NEEDS_IA32_LIBS
+	bool
+
 source "arch/Config.in"
 
 menu "Build options"
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index eb5a481848..ca58450149 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -175,3 +175,15 @@ if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1
         exit 1
     fi
 fi
+
+if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $CONFIG_FILE ; then
+    if test ! -f /lib/ld-linux.so.2 ; then
+	/bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture,"
+	/bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility"
+	/bin/echo -e "library."
+	/bin/echo -e "If you're running a Debian/Ubuntu distribution, install the libc:i386 package."
+	/bin/echo -e "For other distributions, refer to the documentation on how to install the 32 bits"
+	/bin/echo -e "compatibility libraries."
+	exit 1
+    fi
+fi

From 2d16ba916254291ddbcbe9995fa1b40e66e71c45 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 06:14:50 +0000
Subject: [PATCH 3842/6849] toolchain-external: use
 BR2_HOSTARCH_NEEDS_IA32_LIBS where needed

All supported pre-built external toolchains are built for x86 Linux,
so we add the BR2_HOSTARCH_NEEDS_IA32_LIBS select.

[Peter: microblaze toolchains are 64bit]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 0da88ef420..2e79052ddc 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -11,6 +11,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
 	  GCC 2012.12 (based on gcc 4.7), Linaro GDB 2012.12 (based on
@@ -29,6 +30,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
 	  GCC 2012.11 (based on gcc 4.7), Linaro GDB 2012.10 (based on
@@ -47,6 +49,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
 	  GCC 2012.10 (based on gcc 4.7), Linaro GDB 2012.10 (based on
@@ -68,6 +71,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
 	  Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
@@ -91,6 +95,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
 	  Mentor Graphics. It uses gcc 4.6.1, binutils 2.21.53, glibc
@@ -114,6 +119,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
 	  Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, glibc
@@ -183,6 +189,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
 	  Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
@@ -252,6 +259,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the ARM architecture, from
 	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
@@ -275,6 +283,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
 	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.21.53, glibc
@@ -344,6 +353,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the PowerPC architecture,
 	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51,
@@ -373,6 +383,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the PowerPC architecture,
 	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
@@ -402,6 +413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
 	  from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51,
@@ -422,6 +434,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
 	  from Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53,
@@ -443,6 +456,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
 	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
@@ -468,6 +482,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
 	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
@@ -486,6 +501,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the SuperH architecture,
 	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
@@ -500,6 +516,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the x86/x86_64
 	  architectures, from Mentor Graphics. It uses gcc 4.7.2,
@@ -522,6 +539,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the x86/x86_64
 	  architectures, from Mentor Graphics. It uses gcc 4.6.3,
@@ -545,6 +563,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the x86/x86_64
 	  architectures, from Mentor Graphics. It uses gcc 4.6.1,
@@ -573,6 +592,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
@@ -589,6 +609,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
@@ -605,6 +626,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
@@ -635,6 +657,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
@@ -645,6 +668,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
@@ -655,6 +679,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/

From 4ec970246547dce915aaeff8394a3b0303a205db Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 29 Dec 2012 06:14:51 +0000
Subject: [PATCH 3843/6849] sam-ba: select BR2_HOSTARCH_NEEDS_IA32_LIBS

sam-ba is a pre-built binary tool built for x86 Linux, so on x86-64,
it requires the 32 bits compatibility libraries to be installed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sam-ba/Config.in.host | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host
index 20b2b36daa..6093865e4c 100644
--- a/package/sam-ba/Config.in.host
+++ b/package/sam-ba/Config.in.host
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HOST_SAM_BA
 	bool "host sam-ba"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Atmel SAM-BA software provides an open set of tools for
 	  programming the Atmel SAM3, SAM7 and SAM9 ARM-based

From b98b191b5cb628ed8dd32236c4b08d025b65941f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 5 Jan 2013 04:52:02 +0000
Subject: [PATCH 3844/6849] system: set root password only for default skeleton

In case one is using a custom skeleton, the root pasword might already be
set in this case, and should not be overriden.

Just ask for (and set) the root password only for the default skeleton.

Reported-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 42 +++++++++++++++++++++---------------------
 system/system.mk |  2 ++
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 5b66ac0fb0..19bdd2d746 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -12,27 +12,6 @@ config BR2_TARGET_GENERIC_ISSUE
        help
          Select system banner (/etc/issue) to be displayed at login.
 
-config BR2_TARGET_GENERIC_ROOT_PASSWD
-	string "Root password"
-	default ""
-	help
-	  Set the initial root password (in clear). It will be md5-encrypted.
-	  
-	  If set to empty (the default), then no root password will be set,
-	  and root will need no password to log in.
-	  
-	  WARNING! WARNING!
-	  Although pretty strong, MD5 is now an old hash function, and
-	  suffers from some weaknesses, which makes it susceptible to attacks.
-	  It is showing its age, so this root password should not be trusted
-	  to properly secure any product that can be shipped to the wide,
-	  hostile world.
-	  
-	  WARNING! WARNING!
-	  The password appears in clear in the .config file, and may appear
-	  in the build log! Avoid using a valuable password if either the
-	  .config file or the build log may be distributed!
-
 choice
 	prompt "/dev management"
 	default BR2_ROOTFS_DEVICE_CREATION_STATIC
@@ -140,6 +119,27 @@ endif
 
 if BR2_ROOTFS_SKELETON_DEFAULT
 
+config BR2_TARGET_GENERIC_ROOT_PASSWD
+	string "Root password"
+	default ""
+	help
+	  Set the initial root password (in clear). It will be md5-encrypted.
+	  
+	  If set to empty (the default), then no root password will be set,
+	  and root will need no password to log in.
+	  
+	  WARNING! WARNING!
+	  Although pretty strong, MD5 is now an old hash function, and
+	  suffers from some weaknesses, which makes it susceptible to attacks.
+	  It is showing its age, so this root password should not be trusted
+	  to properly secure any product that can be shipped to the wide,
+	  hostile world.
+	  
+	  WARNING! WARNING!
+	  The password appears in clear in the .config file, and may appear
+	  in the build log! Avoid using a valuable password if either the
+	  .config file or the build log may be distributed!
+
 config BR2_TARGET_GENERIC_GETTY_PORT
 	string "Port to run a getty (login prompt) on"
 	default "ttyS0"
diff --git a/system/system.mk b/system/system.mk
index 3c4d06e69c..651f7df0f6 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -47,7 +47,9 @@ ifneq ($(TARGET_GENERIC_ISSUE),)
 TARGETS += target-generic-issue
 endif
 
+ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
 TARGETS += target-root-passwd
+endif
 
 ifneq ($(TARGET_GENERIC_GETTY),)
 ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)

From 72defc45dd7cb3f75f2cb2669225084293a5d9cb Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 5 Jan 2013 04:52:03 +0000
Subject: [PATCH 3845/6849] target: add different methods to encode passwords

Passwords can be encoded in different ways (from the weakest
to the strongest): des, md5, sha-256, sha-512

Add a choice entry to select the method, defaulting to 'md5'.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 system/system.mk |  3 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/system/Config.in b/system/Config.in
index 19bdd2d746..69863c42b6 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -12,6 +12,60 @@ config BR2_TARGET_GENERIC_ISSUE
        help
          Select system banner (/etc/issue) to be displayed at login.
 
+choice
+	bool "Passwords encoding"
+	default BR2_TARGET_GENERIC_PASSWD_MD5
+	help
+	  Choose the password encoding scheme to use when Buildroot
+	  needs to encode a password (eg. the root password, below).
+	  
+	  Note: this is used at build-time, and *not* at runtime.
+
+config BR2_TARGET_GENERIC_PASSWD_DES
+	bool "des"
+	help
+	  Use standard 56-bit DES-based crypt(3) to encode passwords.
+	  
+	  Old, wildly available, but also the weakest, very susceptible to
+	  brute-force attacks.
+
+config BR2_TARGET_GENERIC_PASSWD_MD5
+	bool "md5"
+	help
+	  Use MD5 to encode passwords.
+	  
+	  The default. Wildly available, and pretty good.
+	  Although pretty strong, MD5 is now an old hash function, and
+	  suffers from some weaknesses, which makes it susceptible to
+	  brute-force attacks.
+
+config BR2_TARGET_GENERIC_PASSWD_SHA256
+	bool "sha-256"
+	help
+	  Use SHA256 to encode passwords.
+	  
+	  Very strong, but not ubiquitous, although available in glibc
+	  for some time now. Choose only if you are sure your C library
+	  understands SHA256 passwords.
+
+config BR2_TARGET_GENERIC_PASSWD_SHA512
+	bool "sha-512"
+	help
+	  Use SHA512 to encode passwords.
+	  
+	  Extremely strong, but not ubiquitous, although available in glibc
+	  for some time now. Choose only if you are sure your C library
+	  understands SHA512 passwords.
+
+endchoice # Passwd encoding
+
+config BR2_TARGET_GENERIC_PASSWD_METHOD
+	string
+	default "des"       if BR2_TARGET_GENERIC_PASSWD_DES
+	default "md5"       if BR2_TARGET_GENERIC_PASSWD_MD5
+	default "sha-256"   if BR2_TARGET_GENERIC_PASSWD_SHA256
+	default "sha-512"   if BR2_TARGET_GENERIC_PASSWD_SHA512
+
 choice
 	prompt "/dev management"
 	default BR2_ROOTFS_DEVICE_CREATION_STATIC
diff --git a/system/system.mk b/system/system.mk
index 651f7df0f6..4e131b0821 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -1,8 +1,9 @@
 TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
 TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
 TARGET_GENERIC_ROOT_PASSWD:=$(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
+TARGET_GENERIC_PASSWD_METHOD:=$(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
 ifneq ($(TARGET_GENERIC_ROOT_PASSWD),)
-TARGET_GENERIC_ROOT_PASSWD_HASH=$(shell mkpasswd -m md5 "$(TARGET_GENERIC_ROOT_PASSWD)")
+TARGET_GENERIC_ROOT_PASSWD_HASH=$(shell mkpasswd -m "$(TARGET_GENERIC_PASSWD_METHOD)" "$(TARGET_GENERIC_ROOT_PASSWD)")
 endif
 TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
 TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))

From 4b2a40b6d7d6ce9a892c6230e3b41e8e0b252896 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 6 Jan 2013 21:51:05 +0100
Subject: [PATCH 3846/6849] system: simplify BR2_ROOTFS_SKELETON_DEFAULT
 handling

No functional change.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/system.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/system/system.mk b/system/system.mk
index 4e131b0821..44a33ae618 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -50,15 +50,9 @@ endif
 
 ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
 TARGETS += target-root-passwd
-endif
 
 ifneq ($(TARGET_GENERIC_GETTY),)
-ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
-ifeq ($(BR2_PACKAGE_SYSVINIT),y)
-TARGETS += target-generic-getty-sysvinit
-else
-TARGETS += target-generic-getty-busybox
-endif
+TARGETS += target-generic-getty-$(if $(BR2_PACKAGE_SYSVINIT),sysvinit,busybox)
 endif
 
 ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)

From 38cdf82a761f15754c609441028ec82d7886bdf8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 5 Jan 2013 11:39:10 +0000
Subject: [PATCH 3847/6849] package/dvb-apps: add option to install utilities

Previously, dvb-apps was a 'blind' package that would install
only the transponders data files for use by external packages
(namely tvheadend).

Now, we add an option to also install the DVB utilities.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/dvb-apps/Config.in                    | 17 ++++++++++++++
 package/dvb-apps/dvb-apps.mk                  | 23 +++++++++++++++++--
 package/tvheadend/Config.in                   |  1 +
 .../tvheadend-no-auto-download-dvbscans.patch |  2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 package/dvb-apps/Config.in

diff --git a/package/Config.in b/package/Config.in
index 047af8d0cd..c25ade2393 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -215,6 +215,7 @@ source "package/devmem2/Config.in"
 endif
 source "package/dmidecode/Config.in"
 source "package/dmraid/Config.in"
+source "package/dvb-apps/Config.in"
 source "package/eeprog/Config.in"
 source "package/evtest/Config.in"
 source "package/flashrom/Config.in"
diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
new file mode 100644
index 0000000000..5d0b6f5ba1
--- /dev/null
+++ b/package/dvb-apps/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_DVB_APPS
+	bool "dvb-apps (transponders data)"
+	help
+	  Install the DVB-C, DVB-S, DVB-T and ATSC transponders data.
+	  
+	  http://linuxtv.org/projects.php
+	  http://linuxtv.org/hg/dvb-apps
+
+if BR2_PACKAGE_DVB_APPS
+
+config BR2_PACKAGE_DVB_APPS_UTILS
+	bool "dvb-apps utilities"
+	help
+	  A small number of DVB test and utility programs,
+	  including szap and dvbscan.
+
+endif
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index 5db81483ba..f914799fd6 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -18,11 +18,30 @@ DVB_APPS_SITE_METHOD    = hg
 # apply to us.
 DVB_APPS_LICENSE        = unknown (probably public domain)
 
+ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
+# Utilitiess are selected, build and install everything
+DVB_APPS_INSTALL_STAGING = YES
+
+define DVB_APPS_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1
+endef
+
+define DVB_APPS_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) V=1 DESTDIR=$(STAGING_DIR) install
+endef
+
+define DVB_APPS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) V=1 DESTDIR=$(TARGET_DIR) install
+endef
+
+else
+# Utilities are not selected, just install the scan files
 define DVB_APPS_INSTALL_TARGET_CMDS
 	for i in atsc dvb-c dvb-s dvb-t; do \
-		mkdir -p $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \
-		$(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb-apps/scan/$$i; \
+		mkdir -p $(TARGET_DIR)/usr/share/dvb/$$i; \
+		$(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb/$$i; \
 	done
 endef
+endif
 
 $(eval $(generic-package))
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 944e31e85f..e6dee3afa7 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -4,6 +4,7 @@ comment "tvheadend requires a toolchain with LARGEFILE support"
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_DVB_APPS
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Tvheadend is a TV streaming server for Linux supporting DVB-S,
diff --git a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
index 50bc4b69d2..963d4f2b76 100644
--- a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
+++ b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
@@ -54,7 +54,7 @@ diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk
  	done
 -
 +	mkdir -p ${DESTDIR}${datadir}/tvheadend/data
-+	ln -s /usr/share/dvb-apps/scan ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
++	ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
  
  uninstall:
  	rm -f ${DESTDIR}${bindir)/tvheadend

From c199fb727e838bab2a8ab359ce3432776ef51db9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 19 Dec 2012 12:34:10 +0000
Subject: [PATCH 3848/6849] libdvdnav: requires thread support in toolchain

libdvdnav requires thread support. The only package that depends on
libdvdnav is mplayer, and it is an optional dependency, only activated
when libdvdnav is enabled. So we don't have to push this thread
support dependency to any other package.

Fixes:

  http://autobuild.buildroot.org/results/54d6a737ae805ef1dbf77e5d11b4dd5366873ec0/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdvdnav/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libdvdnav/Config.in b/package/libdvdnav/Config.in
index 5ba31e8752..4585be935c 100644
--- a/package/libdvdnav/Config.in
+++ b/package/libdvdnav/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBDVDNAV
 	bool "libdvdnav"
 	depends on BR2_LARGEFILE # libdvdread
+	depends on BR2_TOOLCHAIN_HAS_THREADS
         select BR2_PACKAGE_LIBDVDREAD
 	help
 	  libdvdnav is a library that allows easy use of sophisticated
@@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBDVDNAV
 
 	  http://www.mplayerhq.hu
 
-comment "libdvdnav requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libdvdnav requires a toolchain with LARGEFILE and thread support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From af5583f2a032d7ca2c6ed6e9b2727987e3fa04ca Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 17 Dec 2012 03:12:01 +0000
Subject: [PATCH 3849/6849] inadyn: Needs MMU

Fixes
http://autobuild.buildroot.org/results/11d681a7f2c1d55a3d70573e9145aa231f6d4298/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/inadyn/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/inadyn/Config.in b/package/inadyn/Config.in
index 623da419de..a2dfa7419b 100644
--- a/package/inadyn/Config.in
+++ b/package/inadyn/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_INADYN
 	bool "inadyn"
+	depends on BR2_USE_MMU # Uses fork()
 	help
 	  INADYN is a free DynDNS client. It gives the possibility
 	  to have your own fixed hostname registered on the internet,

From a425c2a404066ab8cc5f7c5caef9a6a8bd0bfd1e Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 17 Dec 2012 01:32:02 +0000
Subject: [PATCH 3850/6849] package/liburcu: Requires threads support

Fixes
http://autobuild.buildroot.org/results/eeb6a81588a12e5b572a4e5d27e001b3ae5eac49/build-end.log

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liburcu/Config.in      | 5 +++++
 package/lttng-libust/Config.in | 6 ++++--
 package/lttng-tools/Config.in  | 7 ++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in
index 69878b18c4..f21541f652 100644
--- a/package/liburcu/Config.in
+++ b/package/liburcu/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBURCU
 	bool "liburcu"
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Userspace implementation of the Read-Copy-Update (RCU)
 	  synchronization mechanism. This library is mainly used by
@@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBURCU
 	  purposes as well.
 
 	  http://lttng.org/urcu
+
+comment "liburcu needs threads support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in
index ab1296367a..45e0edea51 100644
--- a/package/lttng-libust/Config.in
+++ b/package/lttng-libust/Config.in
@@ -6,8 +6,9 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	# util-linux needs wchar and largefile
 	depends on BR2_USE_WCHAR
 	depends on BR2_LARGEFILE
-	# liburcu only works on some architectures
+	# liburcu only works on some architectures and requires threads support
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Userspace tracing library for the Lttng tracing
 	  infrastructure. It allows userspace programs to create
@@ -16,5 +17,6 @@ config BR2_PACKAGE_LTTNG_LIBUST
 
 	  http://lttng.org
 
-comment "lttng-libust needs WCHAR and LARGEFILE support"
+comment "lttng-libust needs WCHAR, LARGEFILE and threads support"
 	depends on !(BR2_USE_WCHAR || BR2_LARGEFILE)
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index b8547578b8..3d95eeb3a8 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -3,8 +3,9 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	depends on BR2_PACKAGE_LTTNG_MODULES
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_POPT
-	# liburcu only works on some architectures
+	# liburcu only works on some architectures and requires thread support
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Userspace utilities for the LTTng 2.0 tracing
 	  infrastructure.
@@ -22,3 +23,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  lttng-libust.
 
 	  http://lttng.org
+
+comment "lttng-tools needs threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+

From c8c40f7278ac680c0be4b54d1517699b627cf48b Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Fri, 14 Dec 2012 04:24:09 +0000
Subject: [PATCH 3851/6849] oprofile: bump to version 0.9.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/oprofile/oprofile.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 75f84073b9..f3ea23f921 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -4,13 +4,14 @@
 #
 #############################################################
 
-OPROFILE_VERSION = 0.9.7
+OPROFILE_VERSION = 0.9.8
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
 OPROFILE_LICENSE = GPLv2+
 OPROFILE_LICENSE_FILES = COPYING
 OPROFILE_CONF_OPT = --localstatedir=/var --with-kernel-support
 OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof
 OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled
+OPROFILE_BINARIES += utils/op-check-perfevents pe_profiling/operf libabi/opimport
 
 ifeq ($(BR2_i386),y)
 OPROFILE_ARCH = i386
@@ -33,6 +34,7 @@ OPROFILE_DEPENDENCIES = popt binutils
 define OPROFILE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile
 	if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \
 		cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \
 			$(TARGET_DIR)/usr/share/oprofile; \
@@ -40,12 +42,14 @@ define OPROFILE_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile
 	$(INSTALL) -m 755 $(@D)/utils/opcontrol $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile
 endef
 
 define OPROFILE_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(notdir $(OPROFILE_BINARIES)))
 	rm -f $(TARGET_DIR)/usr/bin/opcontrol
 	rm -rf $(TARGET_DIR)/usr/share/oprofile
+	rm -rf $(TARGET_DIR)/usr/lib/oprofile
 endef
 
 $(eval $(autotools-package))

From 94d33410b2ca2b7cf3ce2600d308780326814e20 Mon Sep 17 00:00:00 2001
From: Alexander Khryukin <alexander@mezon.ru>
Date: Fri, 9 Nov 2012 02:49:02 +0000
Subject: [PATCH 3852/6849] nspr version update 4.9.2 old patch removed

[Peter: upstream now provides nspr.pc]
Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr-fix-flags.patch | 65 -------------------------
 package/libnspr/libnspr.mk              | 18 +------
 package/libnspr/nspr.pc.in              | 10 ----
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 package/libnspr/libnspr-fix-flags.patch
 delete mode 100644 package/libnspr/nspr.pc.in

diff --git a/package/libnspr/libnspr-fix-flags.patch b/package/libnspr/libnspr-fix-flags.patch
deleted file mode 100644
index d5ad4fa01b..0000000000
--- a/package/libnspr/libnspr-fix-flags.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix build issues on ARM with certain toolchains
-
-Some gcc/binutils combinations do not like having a space between
-"-Wa," and the following assembler option, so we simply remove those
-spaces.
-
-However, fixing the configure.in is not sufficient, because libnspr
-absolutely requires the prehistoric autoconf 2.13 to re-generate the
-configure script. So, since the patch to the configure script is not
-horrible, we also patch this script directly.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/mozilla/nsprpub/configure.in
-===================================================================
---- a/mozilla/nsprpub/configure.in
-+++ b/mozilla/nsprpub/configure.in
-@@ -925,8 +925,8 @@
-   case "$target_cpu" in
-     arm*)
-       if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
-+        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
-         ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-@@ -940,8 +940,8 @@
-   case "$target_cpu" in
-     arm*)
-       if test "$GNU_CC"; then
--       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
-+       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
-+        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
-         ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
-       fi
-       ;;
-Index: b/mozilla/nsprpub/configure
-===================================================================
---- a/mozilla/nsprpub/configure
-+++ b/mozilla/nsprpub/configure
-@@ -3101,8 +3101,8 @@
-   case "$target_cpu" in
-     arm*)
-       if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
-+        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
-+        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb"
-         ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
-       else
-         { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; }
-@@ -3116,8 +3116,8 @@
-   case "$target_cpu" in
-     arm*)
-       if test "$GNU_CC"; then
--       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
-+       CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
-+        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork"
-         ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
-       fi
-       ;;
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 590a755c9c..d7ea4b312c 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -3,7 +3,7 @@
 # libnspr
 #
 #############################################################
-LIBNSPR_VERSION = 4.8.7
+LIBNSPR_VERSION = 4.9.2
 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
 LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/
 LIBNSPR_SUBDIR = mozilla/nsprpub
@@ -22,22 +22,6 @@ else
 LIBNSPR_CONF_OPT += --disable-thumb2
 endif
 
-define LIBNSPR_INSTALL_STAGING_PC
-	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnspr/nspr.pc.in \
-		$(STAGING_DIR)/usr/lib/pkgconfig/nspr.pc
-	$(SED) 's/@VERSION@/$(LIBNSPR_VERSION)/g;' \
-		$(STAGING_DIR)/usr/lib/pkgconfig/nspr.pc
-endef
-LIBNSPR_POST_INSTALL_STAGING_HOOKS += LIBNSPR_INSTALL_STAGING_PC
-
-define LIBNSPR_INSTALL_TARGET_PC
-	$(INSTALL) -D -m 0644 $(TOPDIR)/package/libnspr/nspr.pc.in \
-		$(TARGET_DIR)/usr/lib/pkgconfig/nspr.pc
-	$(SED) 's/@VERSION@/$(LIBNSPR_VERSION)/g;' \
-		$(TARGET_DIR)/usr/lib/pkgconfig/nspr.pc
-endef
-LIBNSPR_POST_INSTALL_TARGET_HOOKS += LIBNSPR_INSTALL_TARGET_PC
-
 define LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
 		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
diff --git a/package/libnspr/nspr.pc.in b/package/libnspr/nspr.pc.in
deleted file mode 100644
index 44873d248e..0000000000
--- a/package/libnspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/nspr
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: @VERSION@
-Libs: -L${exec_prefix}/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl
-Cflags: -I${prefix}/include/nspr

From 8bc34206c2ed03f24db1ed196a2fb7c5015acfb8 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Sun, 6 Jan 2013 10:56:20 +0000
Subject: [PATCH 3853/6849] libcofi: new package

replacement for memcpy and memset functionality
This package was originally found at : https://github.com/huceke/buildroot-rbp
By gimli <ebsi4711@gmail.com>

[Peter: wrap help text]
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libcofi/Config.in  |  8 ++++++++
 package/libcofi/libcofi.mk | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/libcofi/Config.in
 create mode 100644 package/libcofi/libcofi.mk

diff --git a/package/Config.in b/package/Config.in
index c25ade2393..3681dd355b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -512,6 +512,7 @@ endmenu
 menu "Other"
 source "package/apr/Config.in"
 source "package/apr-util/Config.in"
+source "package/libcofi/Config.in"
 source "package/classpath/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
diff --git a/package/libcofi/Config.in b/package/libcofi/Config.in
new file mode 100644
index 0000000000..e9914d6e0f
--- /dev/null
+++ b/package/libcofi/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBCOFI
+	bool "libcofi"
+	depends on BR2_arm
+	help
+	  A replacement for memcpy and memset functionality for the
+	  Raspberry Pi with the intention of gaining greater performance.
+
+	  https://github.com/simonjhall/copies-and-fills
diff --git a/package/libcofi/libcofi.mk b/package/libcofi/libcofi.mk
new file mode 100644
index 0000000000..e2ce702479
--- /dev/null
+++ b/package/libcofi/libcofi.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# libcofi
+#
+#############################################################
+
+LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
+LIBCOFI_SITE = http://github.com/simonjhall/copies-and-fills/tarball/master
+LIBCOFI_LICENSE = LGPLv2.1
+LIBCOFI_LICENSE_FILES = README.md
+
+define LIBCOFI_BUILD_CMDS
+    $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define LIBCOFI_INSTALL_TARGET_CMDS
+    $(INSTALL) -D -m 0755 $(@D)/libcofi_rpi.so $(TARGET_DIR)/usr/lib/libcofi_rpi.so
+endef
+
+$(eval $(generic-package))

From abb68f6fa79612830b65ba591534cdd0cb898f68 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Sun, 6 Jan 2013 10:56:21 +0000
Subject: [PATCH 3854/6849] rpi-userland: new package

Introducing a package to build the userland part of the Raspberry,
needed by anyone who would want to build a rootfs for a RaspberryPi.

[Peter: fixup Config.in (rename, move, arm dep, comment, white space)]
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/rpi-userland/Config.in                | 16 +++++
 ...Test-for-the-existence-of-execinfo-h.patch | 69 +++++++++++++++++++
 ...vmcs.cmake-allow-to-override-VMCS_IN.patch | 26 +++++++
 package/rpi-userland/rpi-userland.mk          | 20 ++++++
 5 files changed, 132 insertions(+)
 create mode 100644 package/rpi-userland/Config.in
 create mode 100644 package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
 create mode 100644 package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
 create mode 100644 package/rpi-userland/rpi-userland.mk

diff --git a/package/Config.in b/package/Config.in
index 3681dd355b..69bc2541e8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -256,6 +256,7 @@ source "package/pciutils/Config.in"
 source "package/picocom/Config.in"
 source "package/read-edid/Config.in"
 source "package/rng-tools/Config.in"
+source "package/rpi-userland/Config.in"
 source "package/sane-backends/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
new file mode 100644
index 0000000000..58ea8cb593
--- /dev/null
+++ b/package/rpi-userland/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_RPI_USERLAND
+	bool "rpi-userland"
+	depends on BR2_arm
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
+	help
+	  Raspberry Pi Userland contains the necessary library to use the
+	  VideoCore driver.
+
+	  Includes source for the ARM side code to interface to:
+	  EGL, mmal, GLESv2, vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG.
+
+	  https://github.com/raspberrypi/userland/
+
+comment "rpi-userland requires a toolchain with C++ and LARGEFILE support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
diff --git a/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch b/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
new file mode 100644
index 0000000000..ccc67d9759
--- /dev/null
+++ b/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
@@ -0,0 +1,69 @@
+From 93ae1bcd8005216baf7361ba860b53a2cf2e0401 Mon Sep 17 00:00:00 2001
+From: Floris Bos <bos@je-eigen-domein.nl>
+Date: Sun, 25 Nov 2012 19:05:07 +0100
+Subject: [PATCH] Test for the existence of execinfo.h
+
+Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension.
+This change fixes building the library under buildroot, which uses uClibc by default
+---
+ interface/vcos/glibc/vcos_backtrace.c |    7 +++++--
+ makefiles/cmake/arm-linux.cmake       |    4 ++++
+ makefiles/cmake/cmake_config.h.in     |    3 +++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/interface/vcos/glibc/vcos_backtrace.c b/interface/vcos/glibc/vcos_backtrace.c
+index 474a328..3bb8aa3 100644
+--- a/interface/vcos/glibc/vcos_backtrace.c
++++ b/interface/vcos/glibc/vcos_backtrace.c
+@@ -26,7 +26,10 @@
+ */
+ 
+ #include <interface/vcos/vcos.h>
+-#ifdef __linux__
++#ifdef HAVE_CMAKE_CONFIG
++#include "cmake_config.h"
++#endif
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+ #include <stdio.h>
+@@ -35,7 +38,7 @@
+ 
+ void vcos_backtrace_self(void)
+ {
+-#ifdef __linux__
++#ifdef HAVE_EXECINFO_H
+    void *stack[64];
+    int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
+    char **names = backtrace_symbols(stack, depth);
+diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake
+index 89d8bbf..6f2114f 100644
+--- a/makefiles/cmake/arm-linux.cmake
++++ b/makefiles/cmake/arm-linux.cmake
+@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE
+             ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c
+             OUTPUT_VARIABLE foo)
+ 
++# test for existence of execinfo.h header
++include(CheckIncludeFile)
++check_include_file(execinfo.h HAVE_EXECINFO_H)
++
+ add_definitions(-DHAVE_CMAKE_CONFIG)
+ configure_file (
+     "makefiles/cmake/cmake_config.h.in"
+diff --git a/makefiles/cmake/cmake_config.h.in b/makefiles/cmake/cmake_config.h.in
+index 5f08ad5..080b8e8 100644
+--- a/makefiles/cmake/cmake_config.h.in
++++ b/makefiles/cmake/cmake_config.h.in
+@@ -8,5 +8,8 @@
+ /** Do we have support for GLIBC mtrace() ? */
+ #cmakedefine                    HAVE_MTRACE
+ 
++/** Do we have the execinfo.h include file ? */
++#cmakedefine                    HAVE_EXECINFO_H
++
+ #endif
+ 
+-- 
+1.7.10
+
diff --git a/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch b/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
new file mode 100644
index 0000000000..e54d29e03d
--- /dev/null
+++ b/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
@@ -0,0 +1,26 @@
+From fec2560cfcb8d3398e4f1ccc3de7923365873676 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sat, 5 Jan 2013 16:04:55 +0100
+Subject: [PATCH] makefiles/cmake/vmcs.cmake: allow to override
+ VMCS_INSTALL_PREFIX
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ makefiles/cmake/vmcs.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake
+index 0f8641b..cc70cca 100644
+--- a/makefiles/cmake/vmcs.cmake
++++ b/makefiles/cmake/vmcs.cmake
+@@ -9,7 +9,7 @@ INCLUDE(CPack)
+ # Where shall we install?
+ if (ANDROID)
+   SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE)
+-else()
++elseif(NOT DEFINED VMCS_INSTALL_PREFIX)
+   SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE)
+ endif()
+ 
+-- 
+1.8.1
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
new file mode 100644
index 0000000000..ece37d4882
--- /dev/null
+++ b/package/rpi-userland/rpi-userland.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# rpi-userland
+#
+#############################################################
+
+RPI_USERLAND_VERSION = 9852ce28826889e50c4d6786b942f51bccccac54
+RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
+RPI_USERLAND_LICENSE = BSD-3c
+RPI_USERLAND_LICENSE_FILE = LICENCE
+RPI_USERLAND_INSTALL_STAGING = YES
+RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
+
+define RPI_USERLAND_POST_TARGET_CLEANUP
+    rm -Rf $(TARGET_DIR)/usr/src
+endef
+
+RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
+
+$(eval $(cmake-package))

From 2f511fe31229ab9fd2182aa0ebda0ecf205ab12b Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Sun, 6 Jan 2013 10:56:22 +0000
Subject: [PATCH 3855/6849] rpi-firmware: New package

Introducing a package to install pre-built binaries for the bootloader and
the GPU firmware for the RaspberryPi board.

[Peter: rename to rpi-firmware, add link to http://elinux.org/RPiconfig]
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/rpi-firmware/Config.in       |  9 +++++++++
 package/rpi-firmware/config.txt      | 14 ++++++++++++++
 package/rpi-firmware/rpi-firmware.mk | 21 +++++++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 package/rpi-firmware/Config.in
 create mode 100644 package/rpi-firmware/config.txt
 create mode 100644 package/rpi-firmware/rpi-firmware.mk

diff --git a/package/Config.in b/package/Config.in
index 69bc2541e8..11e6f3ae86 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -202,6 +202,7 @@ menu "Hardware handling"
 menu "Misc devices firmwares"
 source "package/b43-firmware/Config.in"
 source "package/linux-firmware/Config.in"
+source "package/rpi-firmware/Config.in"
 source "package/ux500-firmware/Config.in"
 source "package/zd1211-firmware/Config.in"
 endmenu
diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
new file mode 100644
index 0000000000..eb10a8a808
--- /dev/null
+++ b/package/rpi-firmware/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_RPI_FIRMWARE
+	bool "rpi-firmware"
+	depends on BR2_arm
+	help
+	  RaspberryPi Firmware
+	  Pre-compiled binaries of the current bootloader and GPU firmware
+
+	  https://github.com/raspberrypi/firmware
+
diff --git a/package/rpi-firmware/config.txt b/package/rpi-firmware/config.txt
new file mode 100644
index 0000000000..2cabd683ca
--- /dev/null
+++ b/package/rpi-firmware/config.txt
@@ -0,0 +1,14 @@
+# Please note that this is only a sample, we recommend you to change it to fit
+# your needs.
+# You should override this file using a post-build script.
+# See http://buildroot.org/downloads/manual/manual.html#rootfs-custom
+# and http://elinux.org/RPiconfig for a description of config.txt syntax
+
+arm_freq=700
+core_freq=250
+disable_overscan=1
+gpu_mem_256=100
+gpu_mem_512=100
+sdram_freq=400
+over_voltage=0
+cmdline="dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
new file mode 100644
index 0000000000..5a65e34bee
--- /dev/null
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# rpi-firmware
+#
+#############################################################
+
+RPI_FIRMWARE_VERSION = 76d0ac38f16b6343c6155c80db1e4758b3a5838a
+RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/master
+RPI_FIRMWARE_LICENSE = BSD-3c
+RPI_FIRMWARE_LICENSE_FILE = boot/LICENCE.broadcom
+
+define RPI_FIRMWARE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
+	$(INSTALL) -D -m 0644 $(@D)/boot/start.elf $(BINARIES_DIR)/rpi-firmware/start.elf
+	$(INSTALL) -D -m 0644 $(@D)/boot/start_cd.elf $(BINARIES_DIR)/rpi-firmware/start_cd.elf
+	$(INSTALL) -D -m 0644 $(@D)/boot/fixup.dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+	$(INSTALL) -D -m 0644 $(@D)/boot/fixup_cd.dat $(BINARIES_DIR)/rpi-firmware/fixup_cd.dat
+	$(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
+endef
+
+$(eval $(generic-package))

From 13a9fc901f637a1534baa4f08322f3b29ba66b0d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 7 Jan 2013 09:11:44 +0100
Subject: [PATCH 3856/6849] libnspr: only pass --{enable,disable}-thumb2 on ARM

Fixes http://autobuild.buildroot.net/results/dff3f851ee4c62067a0b231c683383ce8692b8b3

libnspr adds -marm to CFLAGS when passed --disable-thumb2, which is only
recognized by ARM cross compilers, so only use when building for ARM.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index d7ea4b312c..a5307faf9b 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -16,11 +16,13 @@ LIBNSPR_CONF_OPT  = --host=$(GNU_HOST_NAME)
 LIBNSPR_CONF_OPT += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
 LIBNSPR_CONF_OPT += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
+ifeq ($(BR2_arm),y)
 ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
 LIBNSPR_CONF_OPT += --enable-thumb2
 else
 LIBNSPR_CONF_OPT += --disable-thumb2
 endif
+endif
 
 define LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \

From e260a2d9b39ecbdaa6738ac76bd48548746da9d8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:41 +0000
Subject: [PATCH 3857/6849] package: support multiple patches

With this commit, we extend the behaviour of the <pkg>_PATCH variable
so that it now allows to list several patches to be downloaded and
applied, and no longer just one patch.

This will be useful for the elfutils package, and should anyway not
break the existing behaviour for packages using just one patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index a570ad758f..59de0f0d12 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -28,12 +28,19 @@
 $(BUILD_DIR)/%/.stamp_downloaded:
 ifeq ($(DL_MODE),DOWNLOAD)
 # Only show the download message if it isn't already downloaded
-	$(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \
-		(test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \
-		$(call MESSAGE,"Downloading")
+	$(Q)if test ! -e $(DL_DIR)/$($(PKG)_SOURCE); then \
+		$(call MESSAGE,"Downloading") ; \
+	else \
+		for p in $($(PKG)_PATCH) ; do \
+			if test ! -e $(DL_DIR)/$$p ; then \
+				$(call MESSAGE,"Downloading") ; \
+				break ; \
+			fi ; \
+		done ; \
+	fi
 endif
 	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_SOURCE)))
-	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_PATCH)))
+	$(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE)/$(p))$(sep))
 	$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
 ifeq ($(DL_MODE),DOWNLOAD)
 	$(Q)mkdir -p $(@D)
@@ -78,7 +85,7 @@ $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
 	$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
-	$(if $($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
+	$(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(p)$(sep))
 	$(Q)( \
 	if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
 	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \

From b6009b94ca5721b0601b689fc350e1713f342239 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:42 +0000
Subject: [PATCH 3858/6849] docs/manual: update to mention the multiple patches
 support

After the modification of the <pkg>_PATCH semantic, let's update the
documentation accordingly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 0759d4fcec..7b8561a1cc 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -156,14 +156,17 @@ information is (assuming the package name is +libfoo+) :
   +packagename-$(LIBFOO_VERSION).tar.gz+. +
   Example: +LIBFOO_SOURCE = foobar-$(LIBFOO_VERSION).tar.bz2+
 
-* +LIBFOO_PATCH+ may contain the name of a patch, that will be
-  downloaded from the same location as the tarball indicated in
-  +LIBFOO_SOURCE+. If +HOST_LIBFOO_PATCH+ is not specified, it
-  defaults to +LIBFOO_PATCH+. Note that patches that are included
-  in Buildroot itself use a different mechanism: all files of the
-  form +<packagename>-*.patch+ present in the package directory inside
+* +LIBFOO_PATCH+ may contain a space-separated list of patch file
+  names, that will be downloaded from the same location as the tarball
+  indicated in +LIBFOO_SOURCE+, and then applied to the package source
+  code. If +HOST_LIBFOO_PATCH+ is not specified, it defaults to
+  +LIBFOO_PATCH+. Note that patches that are included in Buildroot
+  itself use a different mechanism: all files of the form
+  +<packagename>-*.patch+ present in the package directory inside
   Buildroot will be applied to the package after extraction (see
-  xref:patch-policy[patching a package]).
+  xref:patch-policy[patching a package]). Finally, patches listed in
+  the +LIBFOO_PATCH+ variable are applied _before_ the patches stored
+  in the Buildroot package directory.
 
 * +LIBFOO_SITE+ provides the location of the package, which can be a
   URL or a local filesystem path. HTTP, FTP and SCP are supported URL

From 75bd7d13b2a772786df2b77be9af91ddda450174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Sun, 6 Jan 2013 05:22:43 +0000
Subject: [PATCH 3859/6849] elfutils: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch adds a a package for elfutils. For now, the package is
glibc specific, as adding uClibc support for this package is quite
tedious, and will therefore be done through followup patches.

Heavily based from work done by Stefan Fröberg, but with many further
modifications by Thomas Petazzoni.

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/elfutils/Config.in   | 15 +++++++++++
 package/elfutils/elfutils.mk | 49 ++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 package/elfutils/Config.in
 create mode 100644 package/elfutils/elfutils.mk

diff --git a/package/Config.in b/package/Config.in
index 11e6f3ae86..d9255ab091 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -516,6 +516,7 @@ source "package/apr/Config.in"
 source "package/apr-util/Config.in"
 source "package/libcofi/Config.in"
 source "package/classpath/Config.in"
+source "package/elfutils/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
new file mode 100644
index 0000000000..836ce4cbba
--- /dev/null
+++ b/package/elfutils/Config.in
@@ -0,0 +1,15 @@
+comment "elfutils requires a glibc toolchain"
+	depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		     BR2_TOOLCHAIN_CTNG_glibc     || \
+		     BR2_TOOLCHAIN_CTNG_eglibc)
+
+config BR2_PACKAGE_ELFUTILS
+	bool "elfutils"
+	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		   BR2_TOOLCHAIN_CTNG_glibc     || \
+		   BR2_TOOLCHAIN_CTNG_eglibc
+	help
+	  Libraries/utilities to handle ELF objects (drop in
+	  replacement for libelf).
+
+	  https://fedorahosted.org/elfutils
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
new file mode 100644
index 0000000000..27500606b9
--- /dev/null
+++ b/package/elfutils/elfutils.mk
@@ -0,0 +1,49 @@
+#############################################################
+#
+# elfutils
+#
+#############################################################
+ELFUTILS_VERSION = 0.155
+ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
+ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION)
+ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3
+ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
+
+# The tarball does not have a generated configure script
+ELFUTILS_AUTORECONF = YES
+ELFUTILS_CONF_OPT += --disable-werror
+ELFUTILS_PATCH = \
+	elfutils-portability.patch \
+	elfutils-robustify.patch
+
+ELFUTILS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_LARGEFILE),y)
+# elfutils gets confused when lfs mode is forced, so don't
+ELFUTILS_CONF_ENV += \
+        CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
+        CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+ ELFUTILS_DEPENDENCIES += zlib
+ ELFUTILS_CONF_OPT += --with-zlib
+else
+ ELFUTILS_CONF_OPT += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+ ELFUTILS_DEPENDENCIES += bzip2
+ ELFUTILS_CONF_OPT += --with-bzlib
+else
+ ELFUTILS_CONF_OPT += --without-bzlib
+endif
+
+ifeq ($(BR2_PACKAGE_XZ),y)
+ ELFUTILS_DEPENDENCIES += xz
+ ELFUTILS_CONF_OPT += --with-lzma
+else
+ ELFUTILS_CONF_OPT += --without-lzma
+endif
+
+$(eval $(autotools-package))

From 871846cad435ba3331a9f57c8939889ec86df887 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:44 +0000
Subject: [PATCH 3860/6849] elfutils: make it possible to only install the
 libraries

Add and use a --{enable,disable}-progs configuration option to
selectively enable or disable the elfutils programs. Generally, on an
embedded system, the libraries are more useful than the programs, and
being able to not build the programs will make it easier to build the
elfutils libraries on uClibc.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/Config.in                    | 13 +++++
 .../elfutils/elfutils-01-disable-progs.patch  | 47 +++++++++++++++++++
 package/elfutils/elfutils.mk                  |  6 +++
 3 files changed, 66 insertions(+)
 create mode 100644 package/elfutils/elfutils-01-disable-progs.patch

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 836ce4cbba..87744b59d5 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -12,4 +12,17 @@ config BR2_PACKAGE_ELFUTILS
 	  Libraries/utilities to handle ELF objects (drop in
 	  replacement for libelf).
 
+	  Note that this option only installs the libraries, and not
+	  the programs.
+
 	  https://fedorahosted.org/elfutils
+
+if BR2_PACKAGE_ELFUTILS
+
+config BR2_PACKAGE_ELFUTILS_PROGS
+	bool "Install programs"
+	help
+	  This option tells elfutils to not only install the libelf
+	  libraries, but also the elfutils programs.
+
+endif
diff --git a/package/elfutils/elfutils-01-disable-progs.patch b/package/elfutils/elfutils-01-disable-progs.patch
new file mode 100644
index 0000000000..462de89e37
--- /dev/null
+++ b/package/elfutils/elfutils-01-disable-progs.patch
@@ -0,0 +1,47 @@
+Add a --{enable,disable}-progs configure option
+
+Add a --{enable,disable}-progs configuration option to elfutils. This
+allows to selectively disable the compilation of the elfutils programs
+(in which case only the libraries are built and installed). This is
+useful because the programs are often not needed, and also because
+building the programs against uClibc causes several issues (lack of
+obstack_printf() in uClibc for example).
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,9 +22,13 @@
+ 
+ pkginclude_HEADERS = version.h
+ 
++if ENABLE_PROGS
++PROGS_SUBDIR = src
++endif
++
+ # Add doc back when we have some real content.
+ SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
+-	  src po tests
++	  $(PROGS_SUBDIR) po tests
+ 
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+ 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -263,6 +263,12 @@
+ AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
+ AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
+ 
++AC_ARG_ENABLE([progs],
++	AS_HELP_STRING([--enable-progs], [enable progs]),
++	enable_progs=$enableval,
++	enable_progs=yes)
++AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 27500606b9..f8a4e85dab 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -46,4 +46,10 @@ else
  ELFUTILS_CONF_OPT += --without-lzma
 endif
 
+ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
+ ELFUTILS_CONF_OPT += --enable-progs
+else
+ ELFUTILS_CONF_OPT += --disable-progs
+endif
+
 $(eval $(autotools-package))

From d82f5cb94a163774eb9e0c689d246e2a7e15ca62 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:45 +0000
Subject: [PATCH 3861/6849] perf: new package

This patch adds a new package that allows to build the 'perf'
userspace tool that comes in the tools/perf directory of the kernel
sources.

It is an alternative proposal to the one done by Kaiwan Billimoria
<kaiwan.billimoria@gmail.com>, in that it creates the package in
package/perf/. It therefore properly integrates with the Buildroot
package infrastructure.

Of course, the package depends on the Linux kernel to be built by
Buildroot, in order to get Perf sources matching the version of the
kernel that will be executed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/perf/Config.in | 22 ++++++++++++++++++++++
 package/perf/perf.mk   | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/perf/Config.in
 create mode 100644 package/perf/perf.mk

diff --git a/package/Config.in b/package/Config.in
index d9255ab091..49db3801aa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -35,6 +35,7 @@ source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
 source "package/oprofile/Config.in"
+source "package/perf/Config.in"
 source "package/ramspeed/Config.in"
 source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
diff --git a/package/perf/Config.in b/package/perf/Config.in
new file mode 100644
index 0000000000..54b24fe252
--- /dev/null
+++ b/package/perf/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_PERF
+	bool "perf"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_LARGEFILE
+	help
+	  perf (sometimes "Perf Events" or perf tools, originally
+	  "Performance Counters for Linux") - is a performance
+	  analyzing tool in Linux, available from kernel version
+	  2.6.31. User-space controlling utility, called 'perf' has
+	  git-like interface with subcommands. It is capable of
+	  statistical profiling of entire system (both kernel and user
+	  code), single CPU or severals threads.
+
+	  This package builds and install the userspace 'perf'
+	  command. It is up to the user to ensure that the kernel
+	  configuration has all suitable options enable to allow a
+	  proper operation of 'perf'.
+
+	  https://perf.wiki.kernel.org/
+
+comment "perf only available if Linux kernel is enabled, and requires largefile support"
+	depends on !BR2_LINUX_KERNEL || !BR2_LARGEFILE
diff --git a/package/perf/perf.mk b/package/perf/perf.mk
new file mode 100644
index 0000000000..2aef9005b8
--- /dev/null
+++ b/package/perf/perf.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# perf
+#
+#############################################################
+
+# Source taken from the Linux kernel tree
+PERF_SOURCE =
+PERF_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+
+PERF_DEPENDENCIES = linux
+
+PERF_MAKE_FLAGS = \
+	$(LINUX_MAKE_FLAGS) \
+	NO_LIBELF=1 \
+	NO_DWARF=1 \
+	NO_LIBAUDIT=1 \
+	NO_NEWT=1 \
+	NO_GTK2=1 \
+	NO_LIBPERL=1 \
+	NO_LIBPYTHON=1 \
+	DESTDIR=$(TARGET_DIR) \
+	prefix=/usr \
+	WERROR=0
+
+define PERF_BUILD_CMDS
+	$(MAKE) -C $(LINUX_DIR)/tools/perf \
+		$(PERF_MAKE_FLAGS) O=$(@D)
+endef
+
+# After installation, we remove the Perl and Python scripts from the
+# target.
+define PERF_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(LINUX_DIR)/tools/perf \
+		$(PERF_MAKE_FLAGS) O=$(@D) install
+	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
+endef
+
+$(eval $(generic-package))

From 69030ca5c9324a36ecaf55aa3b23bfa5443b2c8f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:46 +0000
Subject: [PATCH 3862/6849] perf: allow build against libelf when available

Now that libelf is available thanks to elfutils (for glibc only),
allow to build perf against it if available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perf/perf.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/perf/perf.mk b/package/perf/perf.mk
index 2aef9005b8..eed30a289c 100644
--- a/package/perf/perf.mk
+++ b/package/perf/perf.mk
@@ -12,8 +12,6 @@ PERF_DEPENDENCIES = linux
 
 PERF_MAKE_FLAGS = \
 	$(LINUX_MAKE_FLAGS) \
-	NO_LIBELF=1 \
-	NO_DWARF=1 \
 	NO_LIBAUDIT=1 \
 	NO_NEWT=1 \
 	NO_GTK2=1 \
@@ -23,6 +21,12 @@ PERF_MAKE_FLAGS = \
 	prefix=/usr \
 	WERROR=0
 
+ifeq ($(BR2_PACKAGE_ELFUTILS),y)
+	PERF_DEPENDENCIES += elfutils
+else
+	PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1
+endif
+
 define PERF_BUILD_CMDS
 	$(MAKE) -C $(LINUX_DIR)/tools/perf \
 		$(PERF_MAKE_FLAGS) O=$(@D)

From 1727e89e9a6076ac81235a9377b749606e23d110 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:47 +0000
Subject: [PATCH 3863/6849] perf: add kernel version checks

perf is only available since kernel 2.6.31, so if we can't find
tools/perf/Makefile, error out and tell the user about this.

perf without libelf can only be built since kernel 3.7, so error out
and tell the user about this if he's trying to build perf from a < 3.7
kernel without libelf.

Unfortunately, those tests can only be build-time checks as we either
need to know the real kernel version (i.e, using LINUX_VERSION would
not be correct as it can be a Git commit ID, or Git tag), or have
access to the kernel sources themselves. So we can't prevent those
invalid situations at the configuration, we can only nicely tell the
user at build time.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perf/perf.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package/perf/perf.mk b/package/perf/perf.mk
index eed30a289c..4356f5db5d 100644
--- a/package/perf/perf.mk
+++ b/package/perf/perf.mk
@@ -28,6 +28,18 @@ else
 endif
 
 define PERF_BUILD_CMDS
+	$(Q)if test ! -f $(LINUX_DIR)/tools/perf/Makefile ; then \
+		echo "Your kernel version is too old and does not have the perf tool." ; \
+		echo "At least kernel 2.6.31 must be used." ; \
+		exit 1 ; \
+	fi
+	$(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \
+		if ! grep -q NO_LIBELF $(LINUX_DIR)/tools/perf/Makefile ; then \
+			echo "The perf tool in your kernel cannot be built without libelf." ; \
+			echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \
+			exit 1 ; \
+		fi \
+	fi
 	$(MAKE) -C $(LINUX_DIR)/tools/perf \
 		$(PERF_MAKE_FLAGS) O=$(@D)
 endef

From eb6cf3003366864aa29cc56eab88c26c3d8baedf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:48 +0000
Subject: [PATCH 3864/6849] argp-standlone: build position independent code

Even though argp-standalone is built as a static library, it might get
linked in a shared library, so we must built it as
position-independent code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/argp-standalone/argp-standalone.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk
index 47c09b29bd..ba7f7576c0 100644
--- a/package/argp-standalone/argp-standalone.mk
+++ b/package/argp-standalone/argp-standalone.mk
@@ -8,6 +8,9 @@ ARGP_STANDALONE_VERSION = 1.3
 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
 ARGP_STANDALONE_INSTALL_STAGING = YES
 
+ARGP_STANDALONE_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) -fPIC"
+
 define ARGP_STANDALONE_INSTALL_STAGING_CMDS
 	$(INSTALL) -D $(@D)/libargp.a $(STAGING_DIR)/usr/lib/libargp.a
 	$(INSTALL) -D $(@D)/argp.h $(STAGING_DIR)/usr/include/argp.h

From 8e6c06fb11684ab8aa5454338024040dae95e57e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:49 +0000
Subject: [PATCH 3865/6849] elfutils: towards uClibc support: argp-standalone
 usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

elfutils uses the argp family of functions, that isn't available in
uClibc. So, we add a dependency on argp-standalone if building with
uClibc, and modify elfutils source code to link against argp if
needed.

Heavily based from work done by Stefan Fröberg, but with many further
modifications by Thomas Petazzoni.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/Config.in                    |  4 +
 .../elfutils/elfutils-02-argp-support.patch   | 92 +++++++++++++++++++
 package/elfutils/elfutils.mk                  |  4 +
 3 files changed, 100 insertions(+)
 create mode 100644 package/elfutils/elfutils-02-argp-support.patch

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 87744b59d5..ee1e4abe96 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -8,6 +8,10 @@ config BR2_PACKAGE_ELFUTILS
 	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
 		   BR2_TOOLCHAIN_CTNG_glibc     || \
 		   BR2_TOOLCHAIN_CTNG_eglibc
+	select BR2_PACKAGE_ARGP_STANDALONE if \
+	       BR2_TOOLCHAIN_BUILDROOT   || \
+	       BR2_TOOLCHAIN_CTNG_uClibc || \
+	       BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	help
 	  Libraries/utilities to handle ELF objects (drop in
 	  replacement for libelf).
diff --git a/package/elfutils/elfutils-02-argp-support.patch b/package/elfutils/elfutils-02-argp-support.patch
new file mode 100644
index 0000000000..f81ac8f9fa
--- /dev/null
+++ b/package/elfutils/elfutils-02-argp-support.patch
@@ -0,0 +1,92 @@
+Allow the usage of an external implementation of the argp functions
+
+uClibc lack the argp family of functions that glibc has. Therefore, we
+add a check in the configure script to see if argp_parse is available
+in the C library. If not, we look if it is available in the additional
+'argp' library. If so, we link against that library. If not, we error
+out.
+
+This allows to build elfutils against uClibc with an external argp
+library.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -269,6 +269,13 @@
+ 	enable_progs=yes)
+ AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
+ 
++AC_CHECK_FUNC([argp_parse])
++if test "$ac_cv_func_argp_parse" != yes; then
++   AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
++		AC_MSG_ERROR([No argp_parse function available.]))
++fi
++AC_SUBST(ARGP_LIBS)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+Index: b/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -98,26 +98,29 @@
+ # Buggy old compilers.
+ readelf_no_Werror = yes
+ 
+-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
++	$(ARGP_LIBS)
+ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
+-	   $(demanglelib)
+-size_LDADD = $(libelf) $(libeu) $(libmudflap)
+-strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+-ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
++	   $(demanglelib) $(ARGP_LIBS)
++size_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
++ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
+ if NATIVE_LD
+ # -ldl is always needed for libebl.
+ ld_LDADD += libld_elf.a
+ endif
+ ld_LDFLAGS = -rdynamic
+-elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+-findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
+-addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)
+-elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl
+-objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+-ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
+-strings_LDADD = $(libelf) $(libeu) $(libmudflap)
+-ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
+-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl
++elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
++findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
++addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
++elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl $(ARGP_LIBS)
++objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
++	$(ARGP_LIBS)
++ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \
++	$(ARGP_LIBS)
+ 
+ ldlex.o: ldscript.c
+ ldlex_no_Werror = yes
+Index: b/libdw/Makefile.am
+===================================================================
+--- a/libdw/Makefile.am
++++ b/libdw/Makefile.am
+@@ -111,7 +111,7 @@
+ 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
+ 		-Wl,--version-script,$<,--no-undefined \
+ 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+-		-ldl $(zip_LIBS)
++		-ldl $(zip_LIBS) $(ARGP_LIBS)
+ 	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 	ln -fs $@ $@.$(VERSION)
+ 
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index f8a4e85dab..9f9de52ef9 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -25,6 +25,10 @@ ELFUTILS_CONF_ENV += \
         CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
 endif
 
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ ELFUTILS_DEPENDENCIES += argp-standalone
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
  ELFUTILS_DEPENDENCIES += zlib
  ELFUTILS_CONF_OPT += --with-zlib

From a64632e44728450e6fa814ce95fbb67161c8971a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:50 +0000
Subject: [PATCH 3866/6849] elfutils: towards uClibc support: solve memcpy
 problem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

elfutils uses some strange internal alias of memcpy in glibc, so
workaround this when building with uClibc.

Heavily based from work done by Stefan Fröberg, but with many further
modifications by Thomas Petazzoni.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/elfutils-03-memcpy-def.patch | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/elfutils/elfutils-03-memcpy-def.patch

diff --git a/package/elfutils/elfutils-03-memcpy-def.patch b/package/elfutils/elfutils-03-memcpy-def.patch
new file mode 100644
index 0000000000..eb50cf654d
--- /dev/null
+++ b/package/elfutils/elfutils-03-memcpy-def.patch
@@ -0,0 +1,24 @@
+Provide a compatibility alias __memcpy
+
+For some reason, libelf uses the internal glibc alias __memcpy, which
+doesn't exist in uClibc. Add a manual alias so that the build can
+proceed with uClibc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/libelf/libelf.h
+===================================================================
+--- a/libelf/libelf.h
++++ b/libelf/libelf.h
+@@ -34,6 +34,11 @@
+ /* Get the ELF types.  */
+ #include <elf.h>
+ 
++#ifndef _LIBC
++#ifndef __mempcpy
++#define __mempcpy mempcpy
++#endif
++#endif
+ 
+ /* Known translation types.  */
+ typedef enum

From 4031ecfdff7fb2a9d58e3b341d1fd6d11eeabe7b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:51 +0000
Subject: [PATCH 3867/6849] elfutils: towards uClibc support: requires
 largefile

elfutils unconditionally uses off64_t for example, so largefile is
needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index ee1e4abe96..5ec4ca9388 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_ELFUTILS
 	       BR2_TOOLCHAIN_BUILDROOT   || \
 	       BR2_TOOLCHAIN_CTNG_uClibc || \
 	       BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	depends on BR2_LARGEFILE
 	help
 	  Libraries/utilities to handle ELF objects (drop in
 	  replacement for libelf).

From f282139807a7d10cc496b6ede23a4c16e587e0be Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:52 +0000
Subject: [PATCH 3868/6849] elfutils: towards uClibc support: gettext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

elfutils is annoying: it needs gettext even if locale support is
disabled...

Heavily based from work done by Stefan Fröberg, but with many further
modifications by Thomas Petazzoni.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/Config.in   |  1 +
 package/elfutils/elfutils.mk | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 5ec4ca9388..78d02a5bb3 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_ELFUTILS
 	       BR2_TOOLCHAIN_BUILDROOT   || \
 	       BR2_TOOLCHAIN_CTNG_uClibc || \
 	       BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_LARGEFILE
 	help
 	  Libraries/utilities to handle ELF objects (drop in
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 9f9de52ef9..39407dbb7d 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -25,6 +25,17 @@ ELFUTILS_CONF_ENV += \
         CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
 endif
 
+ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS)
+
+# Unconditionnally requires gettext.
+ifeq ($(BR2_NEEDS_GETTEXT),y)
+ELFUTILS_DEPENDENCIES += gettext
+ELFUTILS_LDFLAGS += -lintl
+endif
+
+ELFUTILS_CONF_ENV += \
+	LDFLAGS="$(ELFUTILS_LDFLAGS)"
+
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
  ELFUTILS_DEPENDENCIES += argp-standalone
 endif

From 07f6cdfb71ea19ab24cfa372ac4a874a2690247f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:53 +0000
Subject: [PATCH 3869/6849] elfutils: towards uClibc support: FTS functions

The fts_*() functions are optional in uClibc, and not compiled in our
default configuration. The best option would be to migrate this
elfutils code to the nftw family of functions, but it requires quite
some work.

So we have several options here:

 *) Enable fts_*() functions in our default uClibc configuration. Not
    nice since only one package needs them (the help text of uClibc
    for fts_*() functions explicitly mention that they have been added
    to be able to build elfutils).

 *) Use gnulib, but it is quite heavy to setup, requires modifications
    to configure.ac, and other things.

 *) Copy the fts function from uClibc into elfutils source code. This
    is the solution used below. uClibc is LGPL, and elfutils is
    LGPL/GPL, so there should not be any licensing issue.

Of course, the fts_*() functions are only built if they are not
already provided by the C library.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/elfutils-04-fts.patch | 1307 ++++++++++++++++++++++++
 1 file changed, 1307 insertions(+)
 create mode 100644 package/elfutils/elfutils-04-fts.patch

diff --git a/package/elfutils/elfutils-04-fts.patch b/package/elfutils/elfutils-04-fts.patch
new file mode 100644
index 0000000000..7318236d29
--- /dev/null
+++ b/package/elfutils/elfutils-04-fts.patch
@@ -0,0 +1,1307 @@
+Add an implementation of the fts_*() functions
+
+The fts_*() functions are optional in uClibc, and not compiled in our
+default configuration. The best option would be to migrate this
+elfutils code to the nftw family of functions, but it requires quite
+some work.
+
+So we have several options here:
+
+ *) Enable fts_*() functions in our default uClibc configuration. Not
+    nice since only one package needs them (the help text of uClibc
+    for fts_*() functions explicitly mention that they have been added
+    to be able to build elfutils).
+
+ *) Use gnulib, but it is quite heavy to setup, requires modifications
+    to configure.ac, and other things.
+
+ *) Copy the fts function from uClibc into elfutils source code. This
+    is the solution used below. uClibc is LGPL, and elfutils is
+    LGPL/GPL, so there should not be any licensing issue.
+
+Of course, the fts_*() functions are only built if they are not
+already provided by the C library.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -276,6 +276,10 @@
+ fi
+ AC_SUBST(ARGP_LIBS)
+ 
++AC_CHECK_HEADER([fts.h],
++	AC_DEFINE([HAVE_FTS_H], [], [Define if <fts.h> is available in C library]))
++AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+Index: b/libdwfl/Makefile.am
+===================================================================
+--- a/libdwfl/Makefile.am
++++ b/libdwfl/Makefile.am
+@@ -79,6 +79,9 @@
+ if LZMA
+ libdwfl_a_SOURCES += lzma.c
+ endif
++if !HAVE_FTS
++libdwfl_a_SOURCES += fts.c
++endif
+ 
+ if MUDFLAP
+ libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)
+Index: b/libdwfl/fts.c
+===================================================================
+--- /dev/null
++++ b/libdwfl/fts.c
+@@ -0,0 +1,1095 @@
++/*-
++ * Copyright (c) 1990, 1993, 1994
++ *	The Regents of the University of California.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++#include <sys/param.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <errno.h>
++#include "fts_.h"
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++/* Largest alignment size needed, minus one.
++   Usually long double is the worst case.  */
++#ifndef ALIGNBYTES
++#define ALIGNBYTES	(__alignof__ (long double) - 1)
++#endif
++/* Align P to that size.  */
++#ifndef ALIGN
++#define	ALIGN(p)	(((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
++#endif
++
++
++static FTSENT	*fts_alloc (FTS *, const char *, size_t);
++static FTSENT	*fts_build (FTS *, int);
++static void	 fts_lfree (FTSENT *);
++static void	 fts_load (FTS *, FTSENT *);
++static size_t	 fts_maxarglen (char * const *);
++static void	 fts_padjust (FTS *, FTSENT *);
++static int	 fts_palloc (FTS *, size_t);
++static FTSENT	*fts_sort (FTS *, FTSENT *, int);
++static u_short	 fts_stat (FTS *, FTSENT *, int);
++static int      fts_safe_changedir (FTS *, FTSENT *, int, const char *);
++
++#ifndef MAX
++#define MAX(a, b)	({ __typeof__ (a) _a = (a); \
++			   __typeof__ (b) _b = (b); \
++			   _a > _b ? _a : _b; })
++#endif
++
++#define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
++
++#define CLR(opt)	(sp->fts_options &= ~(opt))
++#define	ISSET(opt)	(sp->fts_options & (opt))
++#define	SET(opt)	(sp->fts_options |= (opt))
++
++#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
++
++/* fts_build flags */
++#define	BCHILD		1		/* fts_children */
++#define	BNAMES		2		/* fts_children, names only */
++#define	BREAD		3		/* fts_read */
++
++FTS *
++fts_open( char * const *argv, register int options,
++		int (*compar) (const FTSENT **, const FTSENT **))
++{
++	register FTS *sp;
++	register FTSENT *p, *root;
++	register int nitems;
++	FTSENT *parent = NULL;
++	FTSENT *tmp = NULL;
++
++	/* Options check. */
++	if (options & ~FTS_OPTIONMASK) {
++		errno = EINVAL;
++		return (NULL);
++	}
++
++	/* Allocate/initialize the stream */
++	if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
++		return (NULL);
++	memset(sp, 0, sizeof(FTS));
++	sp->fts_compar = (int (*) (const void *, const void *)) compar;
++	sp->fts_options = options;
++
++	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
++	if (ISSET(FTS_LOGICAL))
++		SET(FTS_NOCHDIR);
++
++	/*
++	 * Start out with 1K of path space, and enough, in any case,
++	 * to hold the user's paths.
++	 */
++#ifndef MAXPATHLEN
++#define MAXPATHLEN 1024
++#endif
++	size_t maxarglen = fts_maxarglen(argv);
++	if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN)))
++		goto mem1;
++
++	/* Allocate/initialize root's parent. */
++	if (*argv != NULL) {
++		if ((parent = fts_alloc(sp, "", 0)) == NULL)
++			goto mem2;
++		parent->fts_level = FTS_ROOTPARENTLEVEL;
++	  }
++
++	/* Allocate/initialize root(s). */
++	for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
++		/* Don't allow zero-length paths. */
++		size_t len = strlen(*argv);
++		if (len == 0) {
++			errno = ENOENT;
++			goto mem3;
++		}
++
++		p = fts_alloc(sp, *argv, len);
++		p->fts_level = FTS_ROOTLEVEL;
++		p->fts_parent = parent;
++		p->fts_accpath = p->fts_name;
++		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
++
++		/* Command-line "." and ".." are real directories. */
++		if (p->fts_info == FTS_DOT)
++			p->fts_info = FTS_D;
++
++		/*
++		 * If comparison routine supplied, traverse in sorted
++		 * order; otherwise traverse in the order specified.
++		 */
++		if (compar) {
++			p->fts_link = root;
++			root = p;
++		} else {
++			p->fts_link = NULL;
++			if (root == NULL)
++				tmp = root = p;
++			else {
++				tmp->fts_link = p;
++				tmp = p;
++			}
++		}
++	}
++	if (compar && nitems > 1)
++		root = fts_sort(sp, root, nitems);
++
++	/*
++	 * Allocate a dummy pointer and make fts_read think that we've just
++	 * finished the node before the root(s); set p->fts_info to FTS_INIT
++	 * so that everything about the "current" node is ignored.
++	 */
++	if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
++		goto mem3;
++	sp->fts_cur->fts_link = root;
++	sp->fts_cur->fts_info = FTS_INIT;
++
++	/*
++	 * If using chdir(2), grab a file descriptor pointing to dot to ensure
++	 * that we can get back here; this could be avoided for some paths,
++	 * but almost certainly not worth the effort.  Slashes, symbolic links,
++	 * and ".." are all fairly nasty problems.  Note, if we can't get the
++	 * descriptor we run anyway, just more slowly.
++	 */
++	if (!ISSET(FTS_NOCHDIR)
++	    && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0)
++		SET(FTS_NOCHDIR);
++
++	return (sp);
++
++mem3:	fts_lfree(root);
++	free(parent);
++mem2:	free(sp->fts_path);
++mem1:	free(sp);
++	return (NULL);
++}
++
++static void
++fts_load(FTS *sp, register FTSENT *p)
++{
++	register int len;
++	register char *cp;
++
++	/*
++	 * Load the stream structure for the next traversal.  Since we don't
++	 * actually enter the directory until after the preorder visit, set
++	 * the fts_accpath field specially so the chdir gets done to the right
++	 * place and the user can access the first node.  From fts_open it's
++	 * known that the path will fit.
++	 */
++	len = p->fts_pathlen = p->fts_namelen;
++	memmove(sp->fts_path, p->fts_name, len + 1);
++	if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
++		len = strlen(++cp);
++		memmove(p->fts_name, cp, len + 1);
++		p->fts_namelen = len;
++	}
++	p->fts_accpath = p->fts_path = sp->fts_path;
++	sp->fts_dev = p->fts_dev;
++}
++
++int
++fts_close(FTS *sp)
++{
++	register FTSENT *freep, *p;
++	int saved_errno;
++
++	/*
++	 * This still works if we haven't read anything -- the dummy structure
++	 * points to the root list, so we step through to the end of the root
++	 * list which has a valid parent pointer.
++	 */
++	if (sp->fts_cur) {
++		for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
++			freep = p;
++			p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
++			free(freep);
++		}
++		free(p);
++	}
++
++	/* Free up child linked list, sort array, path buffer. */
++	if (sp->fts_child)
++		fts_lfree(sp->fts_child);
++	free(sp->fts_array);
++	free(sp->fts_path);
++
++	/* Return to original directory, save errno if necessary. */
++	if (!ISSET(FTS_NOCHDIR)) {
++		saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
++		(void)close(sp->fts_rfd);
++
++		/* Set errno and return. */
++		if (saved_errno != 0) {
++			/* Free up the stream pointer. */
++			free(sp);
++			errno = saved_errno;
++			return (-1);
++		}
++	}
++
++	/* Free up the stream pointer. */
++	free(sp);
++	return (0);
++}
++
++/*
++ * Special case of "/" at the end of the path so that slashes aren't
++ * appended which would cause paths to be written as "....//foo".
++ */
++#define	NAPPEND(p)							\
++	(p->fts_path[p->fts_pathlen - 1] == '/'				\
++	    ? p->fts_pathlen - 1 : p->fts_pathlen)
++
++FTSENT *
++fts_read(register FTS *sp)
++{
++	register FTSENT *p, *tmp;
++	register int instr;
++	register char *t;
++	int saved_errno;
++
++	/* If finished or unrecoverable error, return NULL. */
++	if (sp->fts_cur == NULL || ISSET(FTS_STOP))
++		return (NULL);
++
++	/* Set current node pointer. */
++	p = sp->fts_cur;
++
++	/* Save and zero out user instructions. */
++	instr = p->fts_instr;
++	p->fts_instr = FTS_NOINSTR;
++
++	/* Any type of file may be re-visited; re-stat and re-turn. */
++	if (instr == FTS_AGAIN) {
++		p->fts_info = fts_stat(sp, p, 0);
++		return (p);
++	}
++
++	/*
++	 * Following a symlink -- SLNONE test allows application to see
++	 * SLNONE and recover.  If indirecting through a symlink, have
++	 * keep a pointer to current location.  If unable to get that
++	 * pointer, follow fails.
++	 */
++	if (instr == FTS_FOLLOW &&
++	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
++		p->fts_info = fts_stat(sp, p, 1);
++		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
++			if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) {
++				p->fts_errno = errno;
++				p->fts_info = FTS_ERR;
++			} else
++				p->fts_flags |= FTS_SYMFOLLOW;
++		}
++		return (p);
++	}
++
++	/* Directory in pre-order. */
++	if (p->fts_info == FTS_D) {
++		/* If skipped or crossed mount point, do post-order visit. */
++		if (instr == FTS_SKIP ||
++		    (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
++			if (p->fts_flags & FTS_SYMFOLLOW)
++				(void)close(p->fts_symfd);
++			if (sp->fts_child) {
++				fts_lfree(sp->fts_child);
++				sp->fts_child = NULL;
++			}
++			p->fts_info = FTS_DP;
++			return (p);
++		}
++
++		/* Rebuild if only read the names and now traversing. */
++		if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
++			CLR(FTS_NAMEONLY);
++			fts_lfree(sp->fts_child);
++			sp->fts_child = NULL;
++		}
++
++		/*
++		 * Cd to the subdirectory.
++		 *
++		 * If have already read and now fail to chdir, whack the list
++		 * to make the names come out right, and set the parent errno
++		 * so the application will eventually get an error condition.
++		 * Set the FTS_DONTCHDIR flag so that when we logically change
++		 * directories back to the parent we don't do a chdir.
++		 *
++		 * If haven't read do so.  If the read fails, fts_build sets
++		 * FTS_STOP or the fts_info field of the node.
++		 */
++		if (sp->fts_child != NULL) {
++			if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
++				p->fts_errno = errno;
++				p->fts_flags |= FTS_DONTCHDIR;
++				for (p = sp->fts_child; p != NULL;
++				     p = p->fts_link)
++					p->fts_accpath =
++					    p->fts_parent->fts_accpath;
++			}
++		} else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
++			if (ISSET(FTS_STOP))
++				return (NULL);
++			return (p);
++		}
++		p = sp->fts_child;
++		sp->fts_child = NULL;
++		sp->fts_cur = p;
++		goto name;
++	}
++
++	/* Move to the next node on this level. */
++next:	tmp = p;
++	if ((p = p->fts_link) != NULL) {
++		sp->fts_cur = p;
++		free(tmp);
++
++		/*
++		 * If reached the top, return to the original directory (or
++		 * the root of the tree), and load the paths for the next root.
++		 */
++		if (p->fts_level == FTS_ROOTLEVEL) {
++			if (FCHDIR(sp, sp->fts_rfd)) {
++				SET(FTS_STOP);
++				return (NULL);
++			}
++			fts_load(sp, p);
++			return p;
++		}
++
++		/*
++		 * User may have called fts_set on the node.  If skipped,
++		 * ignore.  If followed, get a file descriptor so we can
++		 * get back if necessary.
++		 */
++		if (p->fts_instr == FTS_SKIP)
++			goto next;
++		if (p->fts_instr == FTS_FOLLOW) {
++			p->fts_info = fts_stat(sp, p, 1);
++			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
++				if ((p->fts_symfd =
++				    open(".", O_RDONLY, 0)) < 0) {
++					p->fts_errno = errno;
++					p->fts_info = FTS_ERR;
++				} else
++					p->fts_flags |= FTS_SYMFOLLOW;
++			}
++			p->fts_instr = FTS_NOINSTR;
++		}
++
++name:		t = sp->fts_path + NAPPEND(p->fts_parent);
++		*t++ = '/';
++		memmove(t, p->fts_name, p->fts_namelen + 1);
++		return p;
++	}
++
++	/* Move up to the parent node. */
++	p = tmp->fts_parent;
++	sp->fts_cur = p;
++	free(tmp);
++
++	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
++		/*
++		 * Done; free everything up and set errno to 0 so the user
++		 * can distinguish between error and EOF.
++		 */
++		free(p);
++		errno = 0;
++		return (sp->fts_cur = NULL);
++	}
++
++	/* NUL terminate the pathname. */
++	sp->fts_path[p->fts_pathlen] = '\0';
++
++	/*
++	 * Return to the parent directory.  If at a root node or came through
++	 * a symlink, go back through the file descriptor.  Otherwise, cd up
++	 * one directory.
++	 */
++	if (p->fts_level == FTS_ROOTLEVEL) {
++		if (FCHDIR(sp, sp->fts_rfd)) {
++			SET(FTS_STOP);
++			return (NULL);
++		}
++	} else if (p->fts_flags & FTS_SYMFOLLOW) {
++		if (FCHDIR(sp, p->fts_symfd)) {
++			saved_errno = errno;
++			(void)close(p->fts_symfd);
++			errno = saved_errno;
++			SET(FTS_STOP);
++			return (NULL);
++		}
++		(void)close(p->fts_symfd);
++	} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
++		   fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
++		SET(FTS_STOP);
++		return (NULL);
++	}
++	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
++	return p;
++}
++
++/*
++ * Fts_set takes the stream as an argument although it's not used in this
++ * implementation; it would be necessary if anyone wanted to add global
++ * semantics to fts using fts_set.  An error return is allowed for similar
++ * reasons.
++ */
++/* ARGSUSED */
++int
++fts_set(FTS *sp, FTSENT *p, int instr)
++{
++	if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
++	    instr != FTS_NOINSTR && instr != FTS_SKIP) {
++		errno = EINVAL;
++		return (1);
++	}
++	p->fts_instr = instr;
++	return (0);
++}
++
++FTSENT *
++fts_children(register FTS *sp, int instr)
++{
++	register FTSENT *p;
++	int fd;
++
++	if (instr != 0 && instr != FTS_NAMEONLY) {
++		errno = EINVAL;
++		return (NULL);
++	}
++
++	/* Set current node pointer. */
++	p = sp->fts_cur;
++
++	/*
++	 * Errno set to 0 so user can distinguish empty directory from
++	 * an error.
++	 */
++	errno = 0;
++
++	/* Fatal errors stop here. */
++	if (ISSET(FTS_STOP))
++		return (NULL);
++
++	/* Return logical hierarchy of user's arguments. */
++	if (p->fts_info == FTS_INIT)
++		return (p->fts_link);
++
++	/*
++	 * If not a directory being visited in pre-order, stop here.  Could
++	 * allow FTS_DNR, assuming the user has fixed the problem, but the
++	 * same effect is available with FTS_AGAIN.
++	 */
++	if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
++		return (NULL);
++
++	/* Free up any previous child list. */
++	if (sp->fts_child != NULL)
++		fts_lfree(sp->fts_child);
++
++	if (instr == FTS_NAMEONLY) {
++		SET(FTS_NAMEONLY);
++		instr = BNAMES;
++	} else
++		instr = BCHILD;
++
++	/*
++	 * If using chdir on a relative path and called BEFORE fts_read does
++	 * its chdir to the root of a traversal, we can lose -- we need to
++	 * chdir into the subdirectory, and we don't know where the current
++	 * directory is, so we can't get back so that the upcoming chdir by
++	 * fts_read will work.
++	 */
++	if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
++	    ISSET(FTS_NOCHDIR))
++		return (sp->fts_child = fts_build(sp, instr));
++
++	if ((fd = open(".", O_RDONLY, 0)) < 0)
++		return (NULL);
++	sp->fts_child = fts_build(sp, instr);
++	if (fchdir(fd))
++		return (NULL);
++	(void)close(fd);
++	return (sp->fts_child);
++}
++
++/*
++ * This is the tricky part -- do not casually change *anything* in here.  The
++ * idea is to build the linked list of entries that are used by fts_children
++ * and fts_read.  There are lots of special cases.
++ *
++ * The real slowdown in walking the tree is the stat calls.  If FTS_NOSTAT is
++ * set and it's a physical walk (so that symbolic links can't be directories),
++ * we can do things quickly.  First, if it's a 4.4BSD file system, the type
++ * of the file is in the directory entry.  Otherwise, we assume that the number
++ * of subdirectories in a node is equal to the number of links to the parent.
++ * The former skips all stat calls.  The latter skips stat calls in any leaf
++ * directories and for any files after the subdirectories in the directory have
++ * been found, cutting the stat calls by about 2/3.
++ */
++static FTSENT *
++fts_build(register FTS *sp, int type)
++{
++	register struct dirent *dp;
++	register FTSENT *p, *head;
++	register int nitems;
++	FTSENT *cur, *tail;
++	DIR *dirp;
++	void *oldaddr;
++	int cderrno, descend, len, level, nlinks, saved_errno,
++	    nostat, doadjust;
++	size_t maxlen;
++	char *cp;
++
++	/* Set current node pointer. */
++	cur = sp->fts_cur;
++
++	/*
++	 * Open the directory for reading.  If this fails, we're done.
++	 * If being called from fts_read, set the fts_info field.
++	 */
++#if defined FTS_WHITEOUT && 0
++	if (ISSET(FTS_WHITEOUT))
++		oflag = DTF_NODUP|DTF_REWIND;
++	else
++		oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
++#else
++# define opendir2(path, flag) opendir(path)
++#endif
++       if ((dirp = opendir2(cur->fts_accpath, oflag)) == NULL) {
++		if (type == BREAD) {
++			cur->fts_info = FTS_DNR;
++			cur->fts_errno = errno;
++		}
++		return (NULL);
++	}
++
++	/*
++	 * Nlinks is the number of possible entries of type directory in the
++	 * directory if we're cheating on stat calls, 0 if we're not doing
++	 * any stat calls at all, -1 if we're doing stats on everything.
++	 */
++	if (type == BNAMES) {
++		nlinks = 0;
++		/* Be quiet about nostat, GCC. */
++		nostat = 0;
++	} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
++		nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
++		nostat = 1;
++	} else {
++		nlinks = -1;
++		nostat = 0;
++	}
++
++#ifdef notdef
++	(void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
++	(void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
++	    ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
++#endif
++	/*
++	 * If we're going to need to stat anything or we want to descend
++	 * and stay in the directory, chdir.  If this fails we keep going,
++	 * but set a flag so we don't chdir after the post-order visit.
++	 * We won't be able to stat anything, but we can still return the
++	 * names themselves.  Note, that since fts_read won't be able to
++	 * chdir into the directory, it will have to return different path
++	 * names than before, i.e. "a/b" instead of "b".  Since the node
++	 * has already been visited in pre-order, have to wait until the
++	 * post-order visit to return the error.  There is a special case
++	 * here, if there was nothing to stat then it's not an error to
++	 * not be able to stat.  This is all fairly nasty.  If a program
++	 * needed sorted entries or stat information, they had better be
++	 * checking FTS_NS on the returned nodes.
++	 */
++	cderrno = 0;
++	if (nlinks || type == BREAD) {
++		if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
++			if (nlinks && type == BREAD)
++				cur->fts_errno = errno;
++			cur->fts_flags |= FTS_DONTCHDIR;
++			descend = 0;
++			cderrno = errno;
++			(void)closedir(dirp);
++			dirp = NULL;
++		} else
++			descend = 1;
++	} else
++		descend = 0;
++
++	/*
++	 * Figure out the max file name length that can be stored in the
++	 * current path -- the inner loop allocates more path as necessary.
++	 * We really wouldn't have to do the maxlen calculations here, we
++	 * could do them in fts_read before returning the path, but it's a
++	 * lot easier here since the length is part of the dirent structure.
++	 *
++	 * If not changing directories set a pointer so that can just append
++	 * each new name into the path.
++	 */
++	len = NAPPEND(cur);
++	if (ISSET(FTS_NOCHDIR)) {
++		cp = sp->fts_path + len;
++		*cp++ = '/';
++	} else {
++		/* GCC, you're too verbose. */
++		cp = NULL;
++	}
++	len++;
++	maxlen = sp->fts_pathlen - len;
++
++	level = cur->fts_level + 1;
++
++	/* Read the directory, attaching each entry to the `link' pointer. */
++	doadjust = 0;
++	for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
++		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
++			continue;
++
++		if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL)
++			goto mem1;
++		if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
++			oldaddr = sp->fts_path;
++			if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
++				/*
++				 * No more memory for path or structures.  Save
++				 * errno, free up the current structure and the
++				 * structures already allocated.
++				 */
++mem1:				saved_errno = errno;
++				free(p);
++				fts_lfree(head);
++				(void)closedir(dirp);
++				cur->fts_info = FTS_ERR;
++				SET(FTS_STOP);
++				errno = saved_errno;
++				return (NULL);
++			}
++			/* Did realloc() change the pointer? */
++			if (oldaddr != sp->fts_path) {
++				doadjust = 1;
++				if (ISSET(FTS_NOCHDIR))
++					cp = sp->fts_path + len;
++			}
++			maxlen = sp->fts_pathlen - len;
++		}
++
++		if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) {
++			/*
++			 * In an FTSENT, fts_pathlen is a u_short so it is
++			 * possible to wraparound here.  If we do, free up
++			 * the current structure and the structures already
++			 * allocated, then error out with ENAMETOOLONG.
++			 */
++			free(p);
++			fts_lfree(head);
++			(void)closedir(dirp);
++			cur->fts_info = FTS_ERR;
++			SET(FTS_STOP);
++			errno = ENAMETOOLONG;
++			return (NULL);
++		}
++		p->fts_level = level;
++		p->fts_parent = sp->fts_cur;
++		p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
++
++#if defined FTS_WHITEOUT && 0
++		if (dp->d_type == DT_WHT)
++			p->fts_flags |= FTS_ISW;
++#endif
++
++#if 0
++		/* Unreachable code.  cderrno is only ever set to a nonnull
++		   value if dirp is closed at the same time.  But then we
++		   cannot enter this loop.  */
++		if (cderrno) {
++			if (nlinks) {
++				p->fts_info = FTS_NS;
++				p->fts_errno = cderrno;
++			} else
++				p->fts_info = FTS_NSOK;
++			p->fts_accpath = cur->fts_accpath;
++		} else
++#endif
++		if (nlinks == 0
++#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
++			   || (nostat &&
++			       dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
++#endif
++		    ) {
++			p->fts_accpath =
++			    ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
++			p->fts_info = FTS_NSOK;
++		} else {
++			/* Build a file name for fts_stat to stat. */
++			if (ISSET(FTS_NOCHDIR)) {
++				p->fts_accpath = p->fts_path;
++				memmove(cp, p->fts_name, p->fts_namelen + 1);
++			} else
++				p->fts_accpath = p->fts_name;
++			/* Stat it. */
++			p->fts_info = fts_stat(sp, p, 0);
++
++			/* Decrement link count if applicable. */
++			if (nlinks > 0 && (p->fts_info == FTS_D ||
++			    p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
++				--nlinks;
++		}
++
++		/* We walk in directory order so "ls -f" doesn't get upset. */
++		p->fts_link = NULL;
++		if (head == NULL)
++			head = tail = p;
++		else {
++			tail->fts_link = p;
++			tail = p;
++		}
++		++nitems;
++	}
++	if (dirp)
++		(void)closedir(dirp);
++
++	/*
++	 * If realloc() changed the address of the path, adjust the
++	 * addresses for the rest of the tree and the dir list.
++	 */
++	if (doadjust)
++		fts_padjust(sp, head);
++
++	/*
++	 * If not changing directories, reset the path back to original
++	 * state.
++	 */
++	if (ISSET(FTS_NOCHDIR)) {
++		if (len == sp->fts_pathlen || nitems == 0)
++			--cp;
++		*cp = '\0';
++	}
++
++	/*
++	 * If descended after called from fts_children or after called from
++	 * fts_read and nothing found, get back.  At the root level we use
++	 * the saved fd; if one of fts_open()'s arguments is a relative path
++	 * to an empty directory, we wind up here with no other way back.  If
++	 * can't get back, we're done.
++	 */
++	if (descend && (type == BCHILD || !nitems) &&
++	    (cur->fts_level == FTS_ROOTLEVEL ?
++	     FCHDIR(sp, sp->fts_rfd) :
++	     fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
++		cur->fts_info = FTS_ERR;
++		SET(FTS_STOP);
++		fts_lfree(head);
++		return (NULL);
++	}
++
++	/* If didn't find anything, return NULL. */
++	if (!nitems) {
++		if (type == BREAD)
++			cur->fts_info = FTS_DP;
++		fts_lfree(head);
++		return (NULL);
++	}
++
++	/* Sort the entries. */
++	if (sp->fts_compar && nitems > 1)
++		head = fts_sort(sp, head, nitems);
++	return (head);
++}
++
++static u_short
++fts_stat(FTS *sp, register FTSENT *p, int follow)
++{
++	register FTSENT *t;
++	register dev_t dev;
++	register ino_t ino;
++	struct stat *sbp, sb;
++	int saved_errno;
++
++	/* If user needs stat info, stat buffer already allocated. */
++	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
++
++#if defined FTS_WHITEOUT && 0
++	/* check for whiteout */
++	if (p->fts_flags & FTS_ISW) {
++		if (sbp != &sb) {
++			memset(sbp, '\0', sizeof (*sbp));
++			sbp->st_mode = S_IFWHT;
++		}
++		return (FTS_W);
++       }
++#endif
++
++	/*
++	 * If doing a logical walk, or application requested FTS_FOLLOW, do
++	 * a stat(2).  If that fails, check for a non-existent symlink.  If
++	 * fail, set the errno from the stat call.
++	 */
++	if (ISSET(FTS_LOGICAL) || follow) {
++		if (stat(p->fts_accpath, sbp)) {
++			saved_errno = errno;
++			if (!lstat(p->fts_accpath, sbp)) {
++				errno = 0;
++				return (FTS_SLNONE);
++			}
++			p->fts_errno = saved_errno;
++			goto err;
++		}
++	} else if (lstat(p->fts_accpath, sbp)) {
++		p->fts_errno = errno;
++err:		memset(sbp, 0, sizeof(struct stat));
++		return (FTS_NS);
++	}
++
++	if (S_ISDIR(sbp->st_mode)) {
++		/*
++		 * Set the device/inode.  Used to find cycles and check for
++		 * crossing mount points.  Also remember the link count, used
++		 * in fts_build to limit the number of stat calls.  It is
++		 * understood that these fields are only referenced if fts_info
++		 * is set to FTS_D.
++		 */
++		dev = p->fts_dev = sbp->st_dev;
++		ino = p->fts_ino = sbp->st_ino;
++		p->fts_nlink = sbp->st_nlink;
++
++		if (ISDOT(p->fts_name))
++			return (FTS_DOT);
++
++		/*
++		 * Cycle detection is done by brute force when the directory
++		 * is first encountered.  If the tree gets deep enough or the
++		 * number of symbolic links to directories is high enough,
++		 * something faster might be worthwhile.
++		 */
++		for (t = p->fts_parent;
++		    t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
++			if (ino == t->fts_ino && dev == t->fts_dev) {
++				p->fts_cycle = t;
++				return (FTS_DC);
++			}
++		return (FTS_D);
++	}
++	if (S_ISLNK(sbp->st_mode))
++		return (FTS_SL);
++	if (S_ISREG(sbp->st_mode))
++		return (FTS_F);
++	return (FTS_DEFAULT);
++}
++
++static FTSENT *
++fts_sort(FTS *sp, FTSENT *head, register int nitems)
++{
++	register FTSENT **ap, *p;
++
++	/*
++	 * Construct an array of pointers to the structures and call qsort(3).
++	 * Reassemble the array in the order returned by qsort.  If unable to
++	 * sort for memory reasons, return the directory entries in their
++	 * current order.  Allocate enough space for the current needs plus
++	 * 40 so don't realloc one entry at a time.
++	 */
++	if (nitems > sp->fts_nitems) {
++		struct _ftsent **a;
++
++		sp->fts_nitems = nitems + 40;
++		if ((a = realloc(sp->fts_array,
++ 		    (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) {
++			free(sp->fts_array);
++			sp->fts_array = NULL;
++			sp->fts_nitems = 0;
++			return (head);
++		}
++		sp->fts_array = a;
++	}
++	for (ap = sp->fts_array, p = head; p; p = p->fts_link)
++		*ap++ = p;
++	qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar);
++	for (head = *(ap = sp->fts_array); --nitems; ++ap)
++		ap[0]->fts_link = ap[1];
++	ap[0]->fts_link = NULL;
++	return (head);
++}
++
++static FTSENT *
++fts_alloc(FTS *sp, const char *name, size_t namelen)
++{
++	register FTSENT *p;
++	size_t len;
++
++	/*
++	 * The file name is a variable length array and no stat structure is
++	 * necessary if the user has set the nostat bit.  Allocate the FTSENT
++	 * structure, the file name and the stat structure in one chunk, but
++	 * be careful that the stat structure is reasonably aligned.  Since the
++	 * fts_name field is declared to be of size 1, the fts_name pointer is
++	 * namelen + 2 before the first possible address of the stat structure.
++	 */
++	len = sizeof(FTSENT) + namelen;
++	if (!ISSET(FTS_NOSTAT))
++		len += sizeof(struct stat) + ALIGNBYTES;
++	if ((p = malloc(len)) == NULL)
++		return (NULL);
++
++	/* Copy the name and guarantee NUL termination. */
++	memmove(p->fts_name, name, namelen);
++	p->fts_name[namelen] = '\0';
++
++	if (!ISSET(FTS_NOSTAT))
++		p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2);
++	p->fts_namelen = namelen;
++	p->fts_path = sp->fts_path;
++	p->fts_errno = 0;
++	p->fts_flags = 0;
++	p->fts_instr = FTS_NOINSTR;
++	p->fts_number = 0;
++	p->fts_pointer = NULL;
++	return (p);
++}
++
++static void
++fts_lfree(register FTSENT *head)
++{
++	register FTSENT *p;
++
++	/* Free a linked list of structures. */
++	while ((p = head)) {
++		head = head->fts_link;
++		free(p);
++	}
++}
++
++/*
++ * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
++ * Most systems will allow creation of paths much longer than MAXPATHLEN, even
++ * though the kernel won't resolve them.  Add the size (not just what's needed)
++ * plus 256 bytes so don't realloc the path 2 bytes at a time.
++ */
++static int
++fts_palloc(FTS *sp, size_t more)
++{
++	char *p;
++
++	sp->fts_pathlen += more + 256;
++	/*
++	 * Check for possible wraparound.  In an FTS, fts_pathlen is
++	 * a signed int but in an FTSENT it is an unsigned short.
++	 * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
++	 */
++	if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
++		free(sp->fts_path);
++		sp->fts_path = NULL;
++		errno = ENAMETOOLONG;
++		return (1);
++	}
++	p = realloc(sp->fts_path, sp->fts_pathlen);
++	if (p == NULL) {
++		free(sp->fts_path);
++		sp->fts_path = NULL;
++		return 1;
++	}
++	sp->fts_path = p;
++	return 0;
++}
++
++/*
++ * When the path is realloc'd, have to fix all of the pointers in structures
++ * already returned.
++ */
++static void
++fts_padjust(FTS *sp, FTSENT *head)
++{
++	FTSENT *p;
++	char *addr = sp->fts_path;
++
++#define	ADJUST(p) do {							\
++	if ((p)->fts_accpath != (p)->fts_name) {			\
++		(p)->fts_accpath =					\
++		    (char *)addr + ((p)->fts_accpath - (p)->fts_path);	\
++	}								\
++	(p)->fts_path = addr;						\
++} while (0)
++	/* Adjust the current set of children. */
++	for (p = sp->fts_child; p; p = p->fts_link)
++		ADJUST(p);
++
++	/* Adjust the rest of the tree, including the current level. */
++	for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
++		ADJUST(p);
++		p = p->fts_link ? p->fts_link : p->fts_parent;
++	}
++}
++
++static size_t
++fts_maxarglen(char * const *argv)
++{
++	size_t len, max;
++
++	for (max = 0; *argv; ++argv)
++		if ((len = strlen(*argv)) > max)
++			max = len;
++	return (max + 1);
++}
++
++/*
++ * Change to dir specified by fd or p->fts_accpath without getting
++ * tricked by someone changing the world out from underneath us.
++ * Assumes p->fts_dev and p->fts_ino are filled in.
++ */
++static int
++fts_safe_changedir(FTS *sp, FTSENT *p, int fd, const char *path)
++{
++	int ret, oerrno, newfd;
++	struct stat64 sb;
++
++	newfd = fd;
++	if (ISSET(FTS_NOCHDIR))
++		return (0);
++	if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0)
++		return (-1);
++	if (fstat64(newfd, &sb)) {
++		ret = -1;
++		goto bail;
++	}
++	if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
++		errno = ENOENT;		/* disinformation */
++		ret = -1;
++		goto bail;
++	}
++	ret = fchdir(newfd);
++bail:
++	oerrno = errno;
++	if (fd < 0)
++		(void)close(newfd);
++	errno = oerrno;
++	return (ret);
++}
+Index: b/libdwfl/fts_.h
+===================================================================
+--- /dev/null
++++ b/libdwfl/fts_.h
+@@ -0,0 +1,131 @@
++/*
++ * Copyright (c) 1989, 1993
++ *	The Regents of the University of California.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ *	@(#)fts.h	8.3 (Berkeley) 8/14/94
++ */
++
++#ifndef	_FTS_H
++#define	_FTS_H 1
++
++#include <features.h>
++#include <sys/types.h>
++
++/* The fts interface is incompatible with the LFS interface which
++   transparently uses the 64-bit file access functions.  */
++#ifdef __USE_FILE_OFFSET64
++# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
++#endif
++
++
++typedef struct {
++	struct _ftsent *fts_cur;	/* current node */
++	struct _ftsent *fts_child;	/* linked list of children */
++	struct _ftsent **fts_array;	/* sort array */
++	dev_t fts_dev;			/* starting device # */
++	char *fts_path;			/* path for this descent */
++	int fts_rfd;			/* fd for root */
++	int fts_pathlen;		/* sizeof(path) */
++	int fts_nitems;			/* elements in the sort array */
++	int (*fts_compar) (const void *, const void *); /* compare fn */
++
++#define	FTS_COMFOLLOW	0x0001		/* follow command line symlinks */
++#define	FTS_LOGICAL	0x0002		/* logical walk */
++#define	FTS_NOCHDIR	0x0004		/* don't change directories */
++#define	FTS_NOSTAT	0x0008		/* don't get stat info */
++#define	FTS_PHYSICAL	0x0010		/* physical walk */
++#define	FTS_SEEDOT	0x0020		/* return dot and dot-dot */
++#define	FTS_XDEV	0x0040		/* don't cross devices */
++#define FTS_WHITEOUT	0x0080		/* return whiteout information */
++#define	FTS_OPTIONMASK	0x00ff		/* valid user option mask */
++
++#define	FTS_NAMEONLY	0x0100		/* (private) child names only */
++#define	FTS_STOP	0x0200		/* (private) unrecoverable error */
++	int fts_options;		/* fts_open options, global flags */
++} FTS;
++
++typedef struct _ftsent {
++	struct _ftsent *fts_cycle;	/* cycle node */
++	struct _ftsent *fts_parent;	/* parent directory */
++	struct _ftsent *fts_link;	/* next file in directory */
++	long fts_number;	        /* local numeric value */
++	void *fts_pointer;	        /* local address value */
++	char *fts_accpath;		/* access path */
++	char *fts_path;			/* root path */
++	int fts_errno;			/* errno for this node */
++	int fts_symfd;			/* fd for symlink */
++	u_short fts_pathlen;		/* strlen(fts_path) */
++	u_short fts_namelen;		/* strlen(fts_name) */
++
++	ino_t fts_ino;			/* inode */
++	dev_t fts_dev;			/* device */
++	nlink_t fts_nlink;		/* link count */
++
++#define	FTS_ROOTPARENTLEVEL	-1
++#define	FTS_ROOTLEVEL		 0
++	short fts_level;		/* depth (-1 to N) */
++
++#define	FTS_D		 1		/* preorder directory */
++#define	FTS_DC		 2		/* directory that causes cycles */
++#define	FTS_DEFAULT	 3		/* none of the above */
++#define	FTS_DNR		 4		/* unreadable directory */
++#define	FTS_DOT		 5		/* dot or dot-dot */
++#define	FTS_DP		 6		/* postorder directory */
++#define	FTS_ERR		 7		/* error; errno is set */
++#define	FTS_F		 8		/* regular file */
++#define	FTS_INIT	 9		/* initialized only */
++#define	FTS_NS		10		/* stat(2) failed */
++#define	FTS_NSOK	11		/* no stat(2) requested */
++#define	FTS_SL		12		/* symbolic link */
++#define	FTS_SLNONE	13		/* symbolic link without target */
++#define FTS_W		14		/* whiteout object */
++	u_short fts_info;		/* user flags for FTSENT structure */
++
++#define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
++#define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
++	u_short fts_flags;		/* private flags for FTSENT structure */
++
++#define	FTS_AGAIN	 1		/* read node again */
++#define	FTS_FOLLOW	 2		/* follow symbolic link */
++#define	FTS_NOINSTR	 3		/* no instructions */
++#define	FTS_SKIP	 4		/* discard node */
++	u_short fts_instr;		/* fts_set() instructions */
++
++	struct stat *fts_statp;		/* stat(2) information */
++	char fts_name[1];		/* file name */
++} FTSENT;
++
++__BEGIN_DECLS
++FTSENT	*fts_children (FTS *, int);
++int	 fts_close (FTS *);
++FTS	*fts_open (char * const *, int,
++		   int (*)(const FTSENT **, const FTSENT **));
++FTSENT	*fts_read (FTS *);
++int	 fts_set (FTS *, FTSENT *, int) __THROW;
++__END_DECLS
++
++#endif /* fts.h */
+Index: b/libdwfl/linux-kernel-modules.c
+===================================================================
+--- a/libdwfl/linux-kernel-modules.c
++++ b/libdwfl/linux-kernel-modules.c
+@@ -29,7 +29,11 @@
+ /* We include this before config.h because it can't handle _FILE_OFFSET_BITS.
+    Everything we need here is fine if its declarations just come first.  */
+ 
++#ifdef HAVE_FTS_H
+ #include <fts.h>
++#else
++#include "fts_.h"
++#endif
+ 
+ #include <config.h>
+ 

From 8515bb08f33d690c9992fa30ff18b84a566918e1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:54 +0000
Subject: [PATCH 3870/6849] elfutils: towards uClibc support: disable po build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Building the po/ directory complains that the scripts in there have
been generated with gettext 0.17, while we use gettext 0.18 in
Buildroot. Since we don't care that much about po files anyway, just
disable the build of this directory.

Heavily based from work done by Stefan Fröberg, but with many further
modifications by Thomas Petazzoni.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/elfutils-05-disable-po.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/elfutils/elfutils-05-disable-po.patch

diff --git a/package/elfutils/elfutils-05-disable-po.patch b/package/elfutils/elfutils-05-disable-po.patch
new file mode 100644
index 0000000000..d98da0b0f6
--- /dev/null
+++ b/package/elfutils/elfutils-05-disable-po.patch
@@ -0,0 +1,22 @@
+Disable the build of the po/ directory
+
+Building the po/ directory complains that the scripts in there have
+been generated with gettext 0.17, while we use gettext 0.18 in
+Buildroot. Since we don't care that much about po files anyway, just
+disable the build of this directory.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,7 +28,7 @@
+ 
+ # Add doc back when we have some real content.
+ SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
+-	  $(PROGS_SUBDIR) po tests
++	  $(PROGS_SUBDIR) tests
+ 
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+ 	     COPYING COPYING-GPLV2 COPYING-LGPLV3

From 41f7e9b68af564fe4b5a70c17b391a4bf1dcf3f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 05:22:55 +0000
Subject: [PATCH 3871/6849] elfutils: make available on uClibc toolchains

We finally have all the pieces needed to allow the build of elfutils
on uClibc. Only the libraries can be built, the programs remain
available only for glibc/eglibc toolchains.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/Config.in | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 78d02a5bb3..b107a974c3 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -1,13 +1,5 @@
-comment "elfutils requires a glibc toolchain"
-	depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		     BR2_TOOLCHAIN_CTNG_glibc     || \
-		     BR2_TOOLCHAIN_CTNG_eglibc)
-
 config BR2_PACKAGE_ELFUTILS
 	bool "elfutils"
-	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		   BR2_TOOLCHAIN_CTNG_glibc     || \
-		   BR2_TOOLCHAIN_CTNG_eglibc
 	select BR2_PACKAGE_ARGP_STANDALONE if \
 	       BR2_TOOLCHAIN_BUILDROOT   || \
 	       BR2_TOOLCHAIN_CTNG_uClibc || \
@@ -27,6 +19,9 @@ if BR2_PACKAGE_ELFUTILS
 
 config BR2_PACKAGE_ELFUTILS_PROGS
 	bool "Install programs"
+	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		   BR2_TOOLCHAIN_CTNG_glibc     || \
+		   BR2_TOOLCHAIN_CTNG_eglibc
 	help
 	  This option tells elfutils to not only install the libelf
 	  libraries, but also the elfutils programs.

From 3b595d512f52dccfa03105d83cd2a8656804cc8b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 7 Jan 2013 21:59:56 +0100
Subject: [PATCH 3872/6849] elfutils: needs wchar

elfutils contains a call to wmempcpy, which is only available when the
toolchain has wchar support, so add the dependency.

Also display a comment if the toolchain dependencies are not met.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elfutils/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index b107a974c3..914eec6e52 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -1,3 +1,6 @@
+comment "elfutils requires a toolchain with LARGEFILE and WCHAR support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+
 config BR2_PACKAGE_ELFUTILS
 	bool "elfutils"
 	select BR2_PACKAGE_ARGP_STANDALONE if \
@@ -6,6 +9,7 @@ config BR2_PACKAGE_ELFUTILS
 	       BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
 	help
 	  Libraries/utilities to handle ELF objects (drop in
 	  replacement for libelf).

From 88ef92dfcb22f398809dc6bff9e675a6e29afa21 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 8 Jan 2013 10:12:02 +0100
Subject: [PATCH 3873/6849] linux: fix double LINUX_APPEND_DTB

Introduced by 5b33e0b6a (linux: handle new dtb location since 3.8-rc1 for
appended dtbs).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 7ec9cd244b..fe5f738ed6 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -202,7 +202,6 @@ endif
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
-define LINUX_APPEND_DTB
 define LINUX_APPEND_DTB
 	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
 	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\

From b0e63e5b9a736e70a24e156033663088b4a7f199 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 8 Jan 2013 17:11:50 +0100
Subject: [PATCH 3874/6849] package: add green end sftp server

For sftp support in Dropbear or as an alternative for the built in
sftp support in openssh (or to use standalone).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/gesftpserver/Config.in       | 16 ++++++++++++++++
 package/gesftpserver/gesftpserver.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 package/gesftpserver/Config.in
 create mode 100644 package/gesftpserver/gesftpserver.mk

diff --git a/package/Config.in b/package/Config.in
index 49db3801aa..bd1db6b884 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -628,6 +628,7 @@ source "package/ipsec-tools/Config.in"
 source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
+source "package/gesftpserver/Config.in"
 source "package/kismet/Config.in"
 source "package/lighttpd/Config.in"
 source "package/links/Config.in"
diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in
new file mode 100644
index 0000000000..bc38c51eec
--- /dev/null
+++ b/package/gesftpserver/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_GESFTPSERVER
+	bool "gesftpserver"
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Green End SFTP Server
+
+	  This is an SFTP server supporting up to protocol version 6.
+	  It is possible to use it as a drop-in replacement for the
+	  OpenSSH server, or to provide sftp support for Dropbear.
+
+	  http://www.greenend.org.uk/rjk/sftpserver/
+
+comment "gesftpserver requires a toolchain with WCHAR and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk
new file mode 100644
index 0000000000..22035a8e0f
--- /dev/null
+++ b/package/gesftpserver/gesftpserver.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# gesftpserver
+#
+#############################################################
+
+GESFTPSERVER_VERSION = 0.1
+GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz
+GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver/
+GESFTPSERVER_LICENSE = GPLv2+
+GESFTPSERVER_LICENSE_FILES = COPYING
+# forgets to link against pthread when cross compiling
+GESFTPSERVER_CONF_ENV = LIBS=-lpthread
+
+# overwrite openssh version if enabled
+GESFTPSERVER_DEPENDENCIES += \
+	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
+	$(if $(BR2_PACKAGE_OPENSSH),openssh)
+
+# openssh/dropbear looks here
+define GESFTPSERVER_ADD_SYMLINK
+	ln -sf gesftpserver $(TARGET_DIR)/usr/libexec/sftp-server
+endef
+
+GESFTPSERVER_POST_INSTALL_TARGET_HOOKS += GESFTPSERVER_ADD_SYMLINK
+
+$(eval $(autotools-package))

From a1cfe20df6c6b4f148db0c104e8ff701654a2c09 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 8 Jan 2013 11:23:56 +0000
Subject: [PATCH 3875/6849] linux: fix appended dtb handling of pre/post
 v3.8-rc1

The $(wildcard ) doesn't work for LINUX_APPEND_DTB, because the .dtb
doesn't exist yet at that point.

Also factor the common part out.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index fe5f738ed6..61d4267de4 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -201,23 +201,20 @@ endef
 endif
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
-define LINUX_APPEND_DTB
-	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
-	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\
-		$(KERNEL_DTS_NAME).dtb dts/$(KERNEL_DTS_NAME).dtb)) \
-		>> $(KERNEL_ARCH_PATH)/boot/zImage
-	# We need to generate the uImage here after that so that the uImage is
-	# generated with the right image size.
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage
-endef
-else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
+ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
+# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
 define LINUX_APPEND_DTB
-	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
-	cat $(wildcard $(addprefix $(KERNEL_ARCH_PATH)/boot/,\
-		$(KERNEL_DTS_NAME).dtb dts/$(KERNEL_DTS_NAME).dtb)) \
-		>> $(KERNEL_ARCH_PATH)/boot/zImage
+	if [ -e $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb ]; then \
+		cat $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb; \
+	else \
+		cat $(KERNEL_ARCH_PATH)/boot/dts/$(KERNEL_DTS_NAME).dtb; \
+	fi >> $(KERNEL_ARCH_PATH)/boot/zImage
 endef
+ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
+# We need to generate the uImage here after that so that the uImage is
+# generated with the right image size.
+LINUX_APPEND_DTB += $(sep)$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage
+endif
 endif
 
 # Compilation. We make sure the kernel gets rebuilt when the

From 940fcba1a5d86d7f3dd20b2ae953bb15eeb95042 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:13 +0000
Subject: [PATCH 3876/6849] x11r7: move X.org server style option

The selection between "modular" server and "Kdrive" server really
belongs as a sub-option of the X.org server itself, rather than as a
global x11r7 option. So we move it under the X.org server option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                     | 18 ------------------
 package/x11r7/xserver_xorg-server/Config.in | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2aac5a2d36..dc847980f1 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -13,24 +13,6 @@ menuconfig BR2_PACKAGE_XORG7
 
 if BR2_PACKAGE_XORG7
 
-choice
-	prompt "X Window System server type"
-	default BR2_PACKAGE_XSERVER_tinyx
-	help
-	  Select the X Window System server to use
-
-config BR2_PACKAGE_XSERVER_xorg
-	bool "Modular X.org"
-	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
-
-comment 'X.org requires largefile and C++ support'
-	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
-
-config BR2_PACKAGE_XSERVER_tinyx
-	bool "TinyX"
-
-endchoice
-
 menu "X11R7 Servers"
 	source package/x11r7/xserver_xorg-server/Config.in
 endmenu
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 02c28282d4..bea0ffa98b 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -59,6 +59,24 @@ comment "xorg-xserver is BROKEN on AVR32"
 
 if BR2_PACKAGE_XSERVER_XORG_SERVER
 
+choice
+	prompt "X Window System server type"
+	default BR2_PACKAGE_XSERVER_tinyx
+	help
+	  Select the X Window System server to use
+
+config BR2_PACKAGE_XSERVER_xorg
+	bool "Modular X.org"
+	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+
+comment "X.org requires largefile and C++ support"
+	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
+
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "TinyX"
+
+endchoice
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
     bool "Null root cursor"
     help

From 88d66054ed612800043aece9570891145d7ed755 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:14 +0000
Subject: [PATCH 3877/6849] x11r7: remove useless depends on of X.org drivers

All X.org server drivers are already enclosed in a if
BR2_PACKAGE_XSERVER_xorg .. endif block. Now that this option is only
set if a X.org server is enabled, there is no need for each individual
driver to depend on BR2_PACKAGE_XSERVER_XORG.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-input-evdev/Config.in         | 1 -
 package/x11r7/xdriver_xf86-input-joystick/Config.in      | 1 -
 package/x11r7/xdriver_xf86-input-keyboard/Config.in      | 1 -
 package/x11r7/xdriver_xf86-input-mouse/Config.in         | 1 -
 package/x11r7/xdriver_xf86-input-synaptics/Config.in     | 1 -
 package/x11r7/xdriver_xf86-input-tslib/Config.in         | 1 -
 package/x11r7/xdriver_xf86-input-vmmouse/Config.in       | 1 -
 package/x11r7/xdriver_xf86-input-void/Config.in          | 1 -
 package/x11r7/xdriver_xf86-video-ark/Config.in           | 1 -
 package/x11r7/xdriver_xf86-video-ati/Config.in           | 1 -
 package/x11r7/xdriver_xf86-video-cirrus/Config.in        | 1 -
 package/x11r7/xdriver_xf86-video-dummy/Config.in         | 1 -
 package/x11r7/xdriver_xf86-video-fbdev/Config.in         | 1 -
 package/x11r7/xdriver_xf86-video-geode/Config.in         | 1 -
 package/x11r7/xdriver_xf86-video-glide/Config.in         | 1 -
 package/x11r7/xdriver_xf86-video-glint/Config.in         | 1 -
 package/x11r7/xdriver_xf86-video-i128/Config.in          | 1 -
 package/x11r7/xdriver_xf86-video-intel/Config.in         | 1 -
 package/x11r7/xdriver_xf86-video-mach64/Config.in        | 1 -
 package/x11r7/xdriver_xf86-video-mga/Config.in           | 1 -
 package/x11r7/xdriver_xf86-video-neomagic/Config.in      | 1 -
 package/x11r7/xdriver_xf86-video-newport/Config.in       | 1 -
 package/x11r7/xdriver_xf86-video-nv/Config.in            | 1 -
 package/x11r7/xdriver_xf86-video-openchrome/Config.in    | 1 -
 package/x11r7/xdriver_xf86-video-r128/Config.in          | 1 -
 package/x11r7/xdriver_xf86-video-savage/Config.in        | 1 -
 package/x11r7/xdriver_xf86-video-siliconmotion/Config.in | 1 -
 package/x11r7/xdriver_xf86-video-sis/Config.in           | 1 -
 package/x11r7/xdriver_xf86-video-tdfx/Config.in          | 1 -
 package/x11r7/xdriver_xf86-video-tga/Config.in           | 1 -
 package/x11r7/xdriver_xf86-video-trident/Config.in       | 1 -
 package/x11r7/xdriver_xf86-video-v4l/Config.in           | 1 -
 package/x11r7/xdriver_xf86-video-vesa/Config.in          | 1 -
 package/x11r7/xdriver_xf86-video-vmware/Config.in        | 1 -
 package/x11r7/xdriver_xf86-video-voodoo/Config.in        | 1 -
 package/x11r7/xdriver_xf86-video-wsfb/Config.in          | 1 -
 36 files changed, 36 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
index 248be7e96a..798fffc855 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/Config.in
+++ b/package/x11r7/xdriver_xf86-input-evdev/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
 	bool "xf86-input-evdev"
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
diff --git a/package/x11r7/xdriver_xf86-input-joystick/Config.in b/package/x11r7/xdriver_xf86-input-joystick/Config.in
index 4a7439aac1..ff9f25f549 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/Config.in
+++ b/package/x11r7/xdriver_xf86-input-joystick/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_JOYSTICK
 	bool "xf86-input-joystick"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in
index 481c76324c..0a0352424e 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/Config.in
+++ b/package/x11r7/xdriver_xf86-input-keyboard/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD
 	bool "xf86-input-keyboard"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_KBPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
diff --git a/package/x11r7/xdriver_xf86-input-mouse/Config.in b/package/x11r7/xdriver_xf86-input-mouse/Config.in
index c8e39b0221..20e1803a99 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/Config.in
+++ b/package/x11r7/xdriver_xf86-input-mouse/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE
 	bool "xf86-input-mouse"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
index 258dee244d..9c214b73c5 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/Config.in
+++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS
 	bool "xf86-input-synaptics"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xdriver_xf86-input-tslib/Config.in b/package/x11r7/xdriver_xf86-input-tslib/Config.in
index 51852734b9..f0ea13216b 100644
--- a/package/x11r7/xdriver_xf86-input-tslib/Config.in
+++ b/package/x11r7/xdriver_xf86-input-tslib/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	bool "xf86-input-tslib"
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_TSLIB
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
index b2284cda33..de989eb34a 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_VMMOUSE
 	bool "xf86-input-vmmouse"
 	depends on BR2_i386 || BR2_x86_64
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xdriver_xf86-input-void/Config.in b/package/x11r7/xdriver_xf86-input-void/Config.in
index ab4230b52a..d6fdef2914 100644
--- a/package/x11r7/xdriver_xf86-input-void/Config.in
+++ b/package/x11r7/xdriver_xf86-input-void/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID
 	bool "xf86-input-void"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xdriver_xf86-video-ark/Config.in b/package/x11r7/xdriver_xf86-video-ark/Config.in
index d9703de234..cecedde024 100644
--- a/package/x11r7/xdriver_xf86-video-ark/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ark/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ARK
 	bool "xf86-video-ark"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index 107a57b7b0..19bed3c1e0 100644
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
 	bool "xf86-video-ati"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/Config.in b/package/x11r7/xdriver_xf86-video-cirrus/Config.in
index 31ed634298..11c9df8e0e 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/Config.in
+++ b/package/x11r7/xdriver_xf86-video-cirrus/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CIRRUS
 	bool "xf86-video-cirrus"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-dummy/Config.in b/package/x11r7/xdriver_xf86-video-dummy/Config.in
index 2a172cc747..00f7e1df40 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/Config.in
+++ b/package/x11r7/xdriver_xf86-video-dummy/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_DUMMY
 	bool "xf86-video-dummy"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/Config.in b/package/x11r7/xdriver_xf86-video-fbdev/Config.in
index 8907fe1b94..9f7c5402b8 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/Config.in
+++ b/package/x11r7/xdriver_xf86-video-fbdev/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV
 	bool "xf86-video-fbdev"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-geode/Config.in b/package/x11r7/xdriver_xf86-video-geode/Config.in
index c60b62c052..2d2e5bce95 100644
--- a/package/x11r7/xdriver_xf86-video-geode/Config.in
+++ b/package/x11r7/xdriver_xf86-video-geode/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
 	bool "xf86-video-geode"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-glide/Config.in b/package/x11r7/xdriver_xf86-video-glide/Config.in
index ea9abd703c..413acce02c 100644
--- a/package/x11r7/xdriver_xf86-video-glide/Config.in
+++ b/package/x11r7/xdriver_xf86-video-glide/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLIDE
 	bool "xf86-video-glide"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in
index 782b6dac51..bd92788830 100644
--- a/package/x11r7/xdriver_xf86-video-glint/Config.in
+++ b/package/x11r7/xdriver_xf86-video-glint/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
 	bool "xf86-video-glint"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
diff --git a/package/x11r7/xdriver_xf86-video-i128/Config.in b/package/x11r7/xdriver_xf86-video-i128/Config.in
index a66fda6d5f..30b240cc1f 100644
--- a/package/x11r7/xdriver_xf86-video-i128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-i128/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I128
 	bool "xf86-video-i128"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 9a1d6cf92a..595eae5d64 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	bool "xf86-video-intel"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-mach64/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in
index f2464e7317..31f4c5843f 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
 	bool "xf86-video-mach64"
 	select BR2_PACKAGE_MESA3D
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
index 40c6f3a947..2fc38375dd 100644
--- a/package/x11r7/xdriver_xf86-video-mga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
 	bool "xf86-video-mga"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/Config.in b/package/x11r7/xdriver_xf86-video-neomagic/Config.in
index 2e028a7ed6..f8c8c47fce 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/Config.in
+++ b/package/x11r7/xdriver_xf86-video-neomagic/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEOMAGIC
 	bool "xf86-video-neomagic"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-newport/Config.in b/package/x11r7/xdriver_xf86-video-newport/Config.in
index e2effe8f60..d9c89b176d 100644
--- a/package/x11r7/xdriver_xf86-video-newport/Config.in
+++ b/package/x11r7/xdriver_xf86-video-newport/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEWPORT
 	bool "xf86-video-newport"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-nv/Config.in b/package/x11r7/xdriver_xf86-video-nv/Config.in
index 943bc1462e..8898f56729 100644
--- a/package/x11r7/xdriver_xf86-video-nv/Config.in
+++ b/package/x11r7/xdriver_xf86-video-nv/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV
 	bool "xf86-video-nv"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 4a69246890..24b74bc2f0 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
 	bool "xf86-video-openchrome"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XLIB_LIBX11
diff --git a/package/x11r7/xdriver_xf86-video-r128/Config.in b/package/x11r7/xdriver_xf86-video-r128/Config.in
index 96bd8d7d3d..07e314283c 100644
--- a/package/x11r7/xdriver_xf86-video-r128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-r128/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
 	bool "xf86-video-r128"
 	select BR2_PACKAGE_MESA3D
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in
index a9c8f6c4e1..93a731e639 100644
--- a/package/x11r7/xdriver_xf86-video-savage/Config.in
+++ b/package/x11r7/xdriver_xf86-video-savage/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
 	bool "xf86-video-savage"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in b/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
index db1511608b..727004a55a 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SILICONMOTION
 	bool "xf86-video-siliconmotion"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in
index ac2b63201d..e1845052f2 100644
--- a/package/x11r7/xdriver_xf86-video-sis/Config.in
+++ b/package/x11r7/xdriver_xf86-video-sis/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
 	bool "xf86-video-sis"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
index 57bb4117d2..811eba2592 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
 	bool "xf86-video-tdfx"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
diff --git a/package/x11r7/xdriver_xf86-video-tga/Config.in b/package/x11r7/xdriver_xf86-video-tga/Config.in
index 800a8f6ec8..9d03db3b38 100644
--- a/package/x11r7/xdriver_xf86-video-tga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tga/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA
 	bool "xf86-video-tga"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-trident/Config.in b/package/x11r7/xdriver_xf86-video-trident/Config.in
index 4a7a477e3e..15ac3ea726 100644
--- a/package/x11r7/xdriver_xf86-video-trident/Config.in
+++ b/package/x11r7/xdriver_xf86-video-trident/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TRIDENT
 	bool "xf86-video-trident"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-v4l/Config.in b/package/x11r7/xdriver_xf86-video-v4l/Config.in
index 3bb41fc55c..6d85c1781e 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/Config.in
+++ b/package/x11r7/xdriver_xf86-video-v4l/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_V4L
 	bool "xf86-video-v4l"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xdriver_xf86-video-vesa/Config.in b/package/x11r7/xdriver_xf86-video-vesa/Config.in
index 865f52cea2..98f434704f 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/Config.in
+++ b/package/x11r7/xdriver_xf86-video-vesa/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VESA
 	bool "xf86-video-vesa"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-vmware/Config.in b/package/x11r7/xdriver_xf86-video-vmware/Config.in
index 9093b385e0..2ab70e3888 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/Config.in
+++ b/package/x11r7/xdriver_xf86-video-vmware/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
 	bool "xf86-video-vmware"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/Config.in b/package/x11r7/xdriver_xf86-video-voodoo/Config.in
index 9b770bec1b..f531676dab 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/Config.in
+++ b/package/x11r7/xdriver_xf86-video-voodoo/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VOODOO
 	bool "xf86-video-voodoo"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/Config.in b/package/x11r7/xdriver_xf86-video-wsfb/Config.in
index 3b3d406fb2..968ee10c8c 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/Config.in
+++ b/package/x11r7/xdriver_xf86-video-wsfb/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_WSFB
 	bool "xf86-video-wsfb"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO

From 50ca9a88a7394ba3ba48849f7d7dd5c3aac15316 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:15 +0000
Subject: [PATCH 3878/6849] x11r7: fix indentation

Fixup the indentation when including the X.org server Config.in to
match all the other inclusions in x11r7/Config.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index dc847980f1..60c022f748 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -12,10 +12,9 @@ menuconfig BR2_PACKAGE_XORG7
 	  http://xorg.freedesktop.org
 
 if BR2_PACKAGE_XORG7
-
-menu "X11R7 Servers"
-	source package/x11r7/xserver_xorg-server/Config.in
-endmenu
+	menu "X11R7 Servers"
+		source package/x11r7/xserver_xorg-server/Config.in
+	endmenu
 	menu "X11R7 Libraries"
 		source package/x11r7/libxcb/Config.in
 		source package/x11r7/mesa3d/Config.in

From 208a81be5b8ecf3108f1f1490a655288a2e7f56a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:16 +0000
Subject: [PATCH 3879/6849] xserver-xorg_server: Mention that TinyX is also
 known as Kdrive

Since several years, the TinyX name has been somewhat deprecated in
favor of Kdrive, so mention the "Kdrive" wording in our configuration
interface.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index bea0ffa98b..e19d356d22 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -73,7 +73,7 @@ comment "X.org requires largefile and C++ support"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
 
 config BR2_PACKAGE_XSERVER_tinyx
-	bool "TinyX"
+	bool "KDrive / TinyX"
 
 endchoice
 

From 73a84a6972a062f1b3212e92d91d4b186460c784 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:17 +0000
Subject: [PATCH 3880/6849] xserver_xorg-server: rename server-style
 configuration options

The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options
used to select the style of X.org server to use are not named
consistently with the rest of the Buildroot options (in capital
letters and prefixed with the package name).

Therefore, we rename those options, and we take care to add the old
option names in the BR2_LEGACY infrastructure.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                                 | 16 ++++++++++++++++
 package/efl/libevas/Config.in                    |  8 ++++----
 package/x11r7/Config.in                          |  2 +-
 package/x11r7/mesa3d/Config.in                   |  2 +-
 package/x11r7/xserver_xorg-server/Config.in      | 10 +++++-----
 .../xserver_xorg-server/xserver_xorg-server.mk   |  6 +++---
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 4770c94796..906c038298 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -78,4 +78,20 @@ config BR2_PACKAGE_PTHREAD_STUBS
 	  For consistency reason, the pthread-stubs package has been
 	  renamed to xlib_libpthread-stubs.
 
+config BR2_PACKAGE_XSERVER_xorg
+	bool "X.org modular server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
+
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "KDrive / TinyX server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
+
 endif
diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index bd845c1154..f73376be1b 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -79,13 +79,13 @@ config BR2_PACKAGE_LIBEVAS_SDL
 config BR2_PACKAGE_LIBEVAS_SDL_GL
 	bool "libevas SDL OpenGL backend"
 	depends on BR2_PACKAGE_SDL_X11
-	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
 	help
 	  This is the SDL OpenGL engine that uses SDL library
 	  and OpenGL to render. This may be hardware accelerated.
 
 comment "SDL OpenGL backend needs modular X.org and X11 support in SDL"
-	depends on !(BR2_PACKAGE_SDL_X11 && BR2_PACKAGE_XSERVER_xorg)
+	depends on !(BR2_PACKAGE_SDL_X11 && BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR)
 
 config BR2_PACKAGE_LIBEVAS_X11
 	bool "libevas X11 backend"
@@ -99,7 +99,7 @@ config BR2_PACKAGE_LIBEVAS_X11
 
 config BR2_PACKAGE_LIBEVAS_X11_GLX
 	bool "libevas X11 GLX backend"
-	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXEXT
@@ -121,7 +121,7 @@ config BR2_PACKAGE_LIBEVAS_XCB
 
 config BR2_PACKAGE_LIBEVAS_XCB_GLX
 	bool "libevas XCB GLX backend"
-	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
 	select BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XCB_UTIL
 	select BR2_PACKAGE_XCB_PROTO
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 60c022f748..6940725f13 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -149,7 +149,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xwininfo/Config.in
 		source package/x11r7/xapp_xwud/Config.in
 	endmenu
-	if BR2_PACKAGE_XSERVER_xorg
+	if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	menu "X11R7 Drivers"
 		source package/x11r7/xdriver_xf86-input-evdev/Config.in
 		source package/x11r7/xdriver_xf86-input-joystick/Config.in
diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index e5b426eaff..080f56a8b8 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_HOST_LIBXML2_PYTHON
-	depends on BR2_PACKAGE_XSERVER_xorg
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Mesa 3D, an open-source implementation of the OpenGL specification.
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index e19d356d22..4ac0ec7e87 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
-	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_xorg
+	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	select BR2_PACKAGE_MCOOKIE
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
 	select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
 	select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
-	select BR2_PACKAGE_XLIB_LIBPCIACCESS if BR2_PACKAGE_XSERVER_xorg
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXAU
 	select BR2_PACKAGE_XLIB_LIBXCURSOR
@@ -61,18 +61,18 @@ if BR2_PACKAGE_XSERVER_XORG_SERVER
 
 choice
 	prompt "X Window System server type"
-	default BR2_PACKAGE_XSERVER_tinyx
+	default BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
 	help
 	  Select the X Window System server to use
 
-config BR2_PACKAGE_XSERVER_xorg
+config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	bool "Modular X.org"
 	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
 
 comment "X.org requires largefile and C++ support"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
 
-config BR2_PACKAGE_XSERVER_tinyx
+config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
 	bool "KDrive / TinyX"
 
 endchoice
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index ed5b904ff8..623b25d9a7 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -62,14 +62,14 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var \
 		--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
 
-ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg
 XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm
 else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
 endif
 
-ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev \
 		--disable-glx --disable-dri --disable-xsdl
 define XSERVER_CREATE_X_SYMLINK
@@ -133,7 +133,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
 XSERVER_XORG_SERVER_CONF_OPT += --disable-composite
 endif
 
-ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
 XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2

From 924f36de1ac7b193c62b0740ed75ba8bc51d9153 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:18 +0000
Subject: [PATCH 3881/6849] xserver_xorg-server: option to build KDrive input
 drivers

When the Kdrive variant of the X server is selected, the drivers are
directly built into the X server. The X server therefore provides
options to enable or disable certain drivers, especially input
drivers.

This patch adds options to be able to enable or disable the evdev, kbd
and mouse drivers of Kdrive.

[Peter: fix Config.in indentation as pointed out by Arnout]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in   | 29 +++++++++++++++++++
 .../xserver_xorg-server.mk                    | 19 ++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 4ac0ec7e87..053dd81503 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -87,6 +87,35 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
     help
         Enable/Use AIGLX extension.
 
+if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
+
+config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
+	bool "Enable KDrive/TinyX evdev input driver"
+	help
+	  Enable evdev input driver in KDrive. This allows KDrive to
+	  use input devices that are integrated in the Linux input
+	  subsystem, i.e have a /dev/input/eventX device file. This is
+	  most likely the input driver you want to use.
+
+	  This driver can then be enabled by running the X server
+	  using:
+
+	  Xfbdev -keybd evdev,,device=/dev/input/eventX -mouse evdev,,device=/dev/input/eventY.
+
+config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
+	bool "Enable KDrive/TinyX kbd input driver"
+	help
+	  Enable kbd input driver in KDrive. It uses the console
+	  keyboard as input device.
+
+config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE
+	bool "Enable KDrive/TinyX mouse input driver"
+	help
+	  Enable mouse input driver in KDrive. It supports PS/2 mice
+	  and serial port mice.
+
+endif
+
 comment "Optional Servers"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 623b25d9a7..92aa4b3850 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -76,7 +76,26 @@ define XSERVER_CREATE_X_SYMLINK
  ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
 endef
 XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
+
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y)
+XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive-evdev
 else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive-evdev
+endif
+
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y)
+XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive-kbd
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive-kbd
+endif
+
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y)
+XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive-mouse
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive-mouse
+endif
+
+else # modular
 XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
 endif
 

From 3d5f83ffafb1ad3e9a9df975fb581931f2fa9606 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 8 Jan 2013 08:04:31 +0000
Subject: [PATCH 3882/6849] wavpack: fix the iconv breakage ghost

Fix missing comma in DEPENDENCIES, causing to pull in libiconv when it
wasn't necessary and causing other packages to go crazy on (e)glibc
toolchains which don't need it with libiconv being present. Fixes:
http://autobuild.buildroot.org/results/e0ce086a33a1db6fee77f43356e4e94ed6941f17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/wavpack/wavpack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
index cd9b4f78bb..a7c703feae 100644
--- a/package/multimedia/wavpack/wavpack.mk
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -10,7 +10,7 @@ WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
 WAVPACK_INSTALL_STAGING = YES
 # configure not up to date
 WAVPACK_AUTORECONF = YES
-WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),libiconv)
+WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv)
 WAVPACK_LICENSE = BSD-3c
 WAVPACK_LICENSE_FILES = license.txt
 

From 8cc76ff19d7d9482592881bfdeb802a23e810c26 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 Jan 2013 09:14:27 +0100
Subject: [PATCH 3883/6849] enlightenment: fix efl dependency

The efl libraries depends on BR2_PACKAGE_EFL, so ensure enlightenment
selects it as well, otherwise kconfig complains.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/enlightenment/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index c2944b9570..357c72b9dc 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ENLIGHTENMENT
 	bool "enlightenment"
+	select BR2_PACKAGE_EFL
 	select BR2_PACKAGE_LIBECORE
 	select BR2_PACKAGE_LIBECORE_X
 	select BR2_PACKAGE_LIBEINA

From ec100c7e2108d3e174ec082c62e3f8d73ed33a92 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 9 Jan 2013 13:20:05 +0100
Subject: [PATCH 3884/6849] Makefile: system.mk rootfs modifications should be
 done before target-finalize

So they don't override E.G. changes done in post build scripts
(E.G. password settings).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4b094376f5..074674a165 100644
--- a/Makefile
+++ b/Makefile
@@ -322,6 +322,7 @@ include package/*/*.mk
 
 include boot/common.mk
 include linux/linux.mk
+include system/system.mk
 
 TARGETS+=target-finalize
 
@@ -335,7 +336,6 @@ TARGETS+=target-generatelocales
 endif
 endif
 
-include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

From cc06757bed3fb41ff57b5fb05d53f7bcf79414b7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 8 Jan 2013 09:11:50 +0000
Subject: [PATCH 3885/6849] package/dvb-apps: requires largefiles

Fixes (for example):
    http://autobuild.buildroot.net/results/5e12820c6537b176c49671a65afcbdb86c5154c9

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index 5d0b6f5ba1..ca8dc54ef3 100644
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -8,8 +8,12 @@ config BR2_PACKAGE_DVB_APPS
 
 if BR2_PACKAGE_DVB_APPS
 
+comment "dvb-apps utils needs LARGEFILE support in the toolchain"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_DVB_APPS_UTILS
 	bool "dvb-apps utilities"
+	depends on BR2_LARGEFILE
 	help
 	  A small number of DVB test and utility programs,
 	  including szap and dvbscan.

From 1935d0e8ae8267ac187873f55fabd7ffd55ed1bf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Jan 2013 14:04:23 +0000
Subject: [PATCH 3886/6849] kernel-headers: bump 3.{0, 4, 7}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.57-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.58-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 4f7a6d91e6..cdaab3b988 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.57"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.58"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.36"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.24"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.25"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.1"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.2"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.57-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.58-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.57-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.58-headers_install-fix-__packed-in-exported-kernel-head.patch

From ec394d648acc2e4bcbd89214bfe66710086c5174 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 11 Jan 2013 14:04:24 +0000
Subject: [PATCH 3887/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9ebe0c9632..d63626990c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.1"
+	bool "3.7.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.1" if BR2_LINUX_KERNEL_3_7
+	default "3.7.2" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 6abd7864fbcdaeb82074f46b23ad6d7fc7321852 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 12 Jan 2013 02:53:35 +0000
Subject: [PATCH 3888/6849] package/dvb-apps: requires iconv

Use libiconv if the toolchain does not have locales.

Fixes (for example):
    http://autobuild.buildroot.net/results/c5776c95ac128f7c7eadc2fe746ad89f8c1ef49a

[Peter: fixup LDFLAGS for BR2_ENABLE_LOCALE=y builds]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/Config.in   |  1 +
 package/dvb-apps/dvb-apps.mk | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index ca8dc54ef3..7f763307e4 100644
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -14,6 +14,7 @@ comment "dvb-apps utils needs LARGEFILE support in the toolchain"
 config BR2_PACKAGE_DVB_APPS_UTILS
 	bool "dvb-apps utilities"
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  A small number of DVB test and utility programs,
 	  including szap and dvbscan.
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index f914799fd6..ee4aadb51a 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -20,10 +20,18 @@ DVB_APPS_LICENSE        = unknown (probably public domain)
 
 ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
 # Utilitiess are selected, build and install everything
+
+DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS)
+
+ifeq ($(BR2_ENABLE_LOCALE),)
+DVB_APPS_DEPENDENCIES    = libiconv
+DVB_APPS_LDFLAGS        += -liconv
+endif
+
 DVB_APPS_INSTALL_STAGING = YES
 
 define DVB_APPS_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1
+	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" $(MAKE) -C $(@D) V=1
 endef
 
 define DVB_APPS_INSTALL_STAGING_CMDS

From 0ff2e73c058aac371247dca0336ad9caa590c389 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 12 Jan 2013 05:20:00 +0000
Subject: [PATCH 3889/6849] website: Announce the upcoming Buildroot Developers
 Meeting

[Peter: fix typo]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index 343690f6b8..f1580343e9 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,24 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>12 January 2013 -- Next Buildroot Developers Meeting next to FOSDEM, Brussels</b>
+
+    <p>The next Buildroot Developers Meeting will take place on Monday
+    4th February 2013 and Tuesday 5th February 2013 in Brussels,
+    Belgium. Those dates have been chosen to immediately follow the
+    great <a href="http://www.fosdem.org">FOSDEM</a> conference.</p>
+
+    <p>Attending this meeting is free, after registration by
+    contacting <a href="mailto:thomas.petazzoni@free-electrons.com">Thomas
+    Petazzoni</a>. For more details about the meeting, please see
+    the <a href="http://elinux.org/Buildroot:DeveloperDaysFOSDEM2013">related
+    Wiki page</a>.</p>
+
+    <p>We would like to
+    thank <a href="http://www.google.com">Google</a> for providing the
+    meeting location and the Internet connection, and offering free
+    lunch and refreshments to the participants.</p>
+
   <li><b>3 January 2013 -- 2012.11.1 released</b>
 
     <p>The 2012.11.1 bugfix release is out - Thanks to everyone

From 051058f52ae701928829b2304df4507892b44cfc Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 11 Jan 2013 13:45:28 +0000
Subject: [PATCH 3890/6849] libelementary: depends on libethumb

This was exposed because I still had an old libethumb in my staging
directory so it was detected by configure, but because of the missing
dependency it was still the (incompatible) version from before the
1.7.4 bump.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libelementary/libelementary.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 81289ff03f..f63f0dc6ff 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -18,4 +18,11 @@ LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
 LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
 
+ifeq ($(BR2_PACKAGE_LIBETHUMB),y)
+LIBELEMENTARY_DEPENDENCIES += libethumb
+LIBELEMENTARY_CONF_OPT += --enable-ethumb
+else
+LIBELEMENTARY_CONF_OPT += --disable-ethumb
+endif
+
 $(eval $(autotools-package))

From 4a3c29fd4cfb2959e7ff8e62966bf1b5ee470334 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 10 Jan 2013 21:48:48 +0000
Subject: [PATCH 3891/6849] empty: needs MMU

The empty package uses the fork() system call, and so requires MMU.

Fixed autobuilder failures such as the following.

  http://autobuild.buildroot.net/results/4ad23e07b1bfe7bfd622aed8d54fa243b72eed59/build-end.log

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/empty/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/empty/Config.in b/package/empty/Config.in
index 67b09fcb3b..7fd0877cbb 100644
--- a/package/empty/Config.in
+++ b/package/empty/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_EMPTY
 	bool "empty"
+	depends on BR2_USE_MMU # uses fork()
 	help
 	  Run processes and applications under pseudo-terminal (PTY) sessions.
 

From 7b98b094aa182b110deec122969bd53d4bda8cb2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 12 Jan 2013 02:18:44 +0000
Subject: [PATCH 3892/6849] arptables: bump to version 0.0.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/arptables/arptables.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
index dac5ca470e..bf6867061d 100644
--- a/package/arptables/arptables.mk
+++ b/package/arptables/arptables.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-ARPTABLES_VERSION = 0.0.3
-ARPTABLES_VERSION_MINOR = 4
-ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION)-$(ARPTABLES_VERSION_MINOR).tar.gz
+ARPTABLES_VERSION = 0.0.4
+ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz
 ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION)
+ARPTABLES_LICENSE = GPLv2+
 
 define ARPTABLES_BUILD_CMDS
 	$(MAKE) -C $(@D) \

From 7e8881e15125187a2294755552b394d6175432b0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 12 Jan 2013 01:37:54 +0000
Subject: [PATCH 3893/6849] hiawatha: bump to version 8.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index bd9da43d6c..75f96888d8 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.6
+HIAWATHA_VERSION = 8.7
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
 HIAWATHA_LICENSE_FILES = LICENSE

From 229824f475229e1aa0677113a40fd5c4e2a0fd18 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 16 Nov 2012 22:38:59 +0000
Subject: [PATCH 3894/6849] python3: uses fork(), only available on MMU
 platforms

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python3/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/python3/Config.in b/package/python3/Config.in
index 2e1e98b9f7..5959d31c6c 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_PYTHON3
 	bool "python3"
 	depends on BR2_USE_WCHAR
+	# uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBFFI
 	help
 	  The python language interpreter.

From 6c18ea09e87923667a5adc1e11550ab679cc026c Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 14 Dec 2012 05:40:49 +0000
Subject: [PATCH 3895/6849] qemu: bump to version 1.3.0

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index bd42481669..65989f4e06 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEMU_VERSION = 1.2.2
+QEMU_VERSION = 1.3.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c
@@ -16,7 +16,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
 #-------------------------------------------------------------
 # Host-qemu
 
-HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2
+HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
 
 #       BR ARCH         qemu
 #       -------         ----

From 0af470265b80efe8f213644f4488537c017e8089 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 8 Jan 2013 07:45:06 +0000
Subject: [PATCH 3896/6849] libnl: bump to version 3.2.18

Bump to version 3.2.18, fixing:
http://autobuild.buildroot.org/results/28f23910e2c2090e6f37e8d6a26cdb5adf9615c2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 12494f4475..35b2a514b7 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.17
+LIBNL_VERSION = 3.2.18
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING
@@ -22,6 +22,7 @@ endef
 
 define LIBNL_REMOVE_TOOLS
 	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES))
+	rm -rf $(TARGET_DIR)/usr/sbin/genl-ctrl-list
 endef
 
 ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y)

From 83b716a23ad764a5571d7590ab6d38d64d8be13e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 9 Jan 2013 12:52:12 +0000
Subject: [PATCH 3897/6849] toolchain/crosstool-ng: be more explicit in the
 config file help

Some users seem to interpret:
    make ctng-menuconfig

as being a value that can be fit for the ct-ng config file.

Clarify that it is a command to run, not a possible value.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/Config.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index d80f547c9d..df4e9b1092 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -43,10 +43,12 @@ config BR2_TOOLCHAIN_CTNG_CONFIG
 	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc" if BR2_TOOLCHAIN_CTNG_eglibc
 	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc"  if BR2_TOOLCHAIN_CTNG_glibc
 	help
-	  Enter here the crosstool-NG's .config file to use.
-	  To fine-tune your toolchain, you can also call:
-	    make ctng-menuconfig
-
+	  Enter here the path to the crosstool-NG .config file to use.
+	  
+	  Generally, the default crosstool-NG configuration files bundled with
+	  Buildroot work fine in most situations. Use 'make ctng-menuconfig'
+	  from the command line, for expert customization of your toolchain.
+	  
 	  If unsure, keep the default value.
 
 if BR2_TOOLCHAIN_CTNG_uClibc

From 1cd8be320c9732645ebfcf5d28a21b8df0a63bf9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:19 +0000
Subject: [PATCH 3898/6849] xserver_xorg-server: add more explanations about
 the two variants

[Peter: adjust help text according to Arnout's comments]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 053dd81503..c192ef4d19 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -68,12 +68,23 @@ choice
 config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	bool "Modular X.org"
 	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+	help
+	  This variant of the X.org server is the full-blown variant,
+	  as used by desktop GNU/Linux distributions. The drivers (for
+	  input and graphics) are built separately from the X.org
+	  server (see the xdriver* packages).
 
-comment "X.org requires largefile and C++ support"
+comment "Modular X.org requires largefile and C++ support"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
 	bool "KDrive / TinyX"
+	help
+	  This variant of the X.org server is a lightweight version
+	  intended for embedded systems. The drivers (for input and
+	  graphics) are built into the server. It is generally used
+	  directly on top of the Linux framebuffer without DRM or
+	  video card specific drivers.
 
 endchoice
 

From 3679abe0a32e2559c81a9f47820c9af47ee1f84f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:20 +0000
Subject: [PATCH 3899/6849] x11r7: do not globally select libraries

It doesn't make sense for BR2_PACKAGE_XORG7 to globally select
libraries such as libpng, zlib, expat or fontconfig. For example, if
you do a build with just xlib_libX11, then libpng gets built as the
last package, without anybody actually depending on it, even if it was
selected by BR2_PACKAGE_XORG7.

The individual x11r7 packages should select the libraries they need,
and add them in their DEPENDENCIES variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 6940725f13..706574c6e3 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -1,9 +1,5 @@
 menuconfig BR2_PACKAGE_XORG7
 	bool "X.org X Window System"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_FONTCONFIG
 	depends on BR2_USE_WCHAR
 	help
 	  Support for X11R7 libraries, servers, drivers, and/or

From 0a0330a582b58fd3d874a56d3a2ce57fc4fc4445 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:21 +0000
Subject: [PATCH 3900/6849] xlib_libX11: do not depend on bigreqsproto nor
 xcmiscproto

The BR2_PACKAGE_XPROTO_BIGREQSPROTO option was selected by
xlib_libX11, but xlib_libX11 does not have this protocol package in
its DEPENDENCIES. In some builds, it leads to xproto_bigreqsproto to
be built as the last package, with no other package depending on it,
which doesn't make sense.

xproto_xcmiscproto was selected and part of DEPENDENCIES, but an
inspection of libX11 configure.ac and libX11 source code shows that it
does not depend on xcmiscproto at all.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/Config.in      | 2 --
 package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/x11r7/xlib_libX11/Config.in b/package/x11r7/xlib_libX11/Config.in
index e1189ff574..3ad8d00ae5 100644
--- a/package/x11r7/xlib_libX11/Config.in
+++ b/package/x11r7/xlib_libX11/Config.in
@@ -10,7 +10,5 @@ config BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XPROTO_XEXTPROTO
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
-	select BR2_PACKAGE_XPROTO_BIGREQSPROTO
-	select BR2_PACKAGE_XPROTO_XCMISCPROTO
 	help
 	  X.Org X11 library
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 75d172cb44..94107b2ba7 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -8,7 +8,7 @@ XLIB_LIBX11_VERSION = 1.4.2
 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBX11_INSTALL_STAGING = YES
-XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_xcmiscproto host-xproto_xproto
+XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto host-xproto_xproto
 XLIB_LIBX11_CONF_OPT = \
 	--disable-malloc0returnsnull \
 	--with-xcb \

From b6de4b198e3677fcb158fa780329321862b8d171 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:22 +0000
Subject: [PATCH 3901/6849] xlib_libX11: split the DEPENDENCIES variable on
 multiple lines

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 94107b2ba7..ca4f06e1a1 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -8,7 +8,19 @@ XLIB_LIBX11_VERSION = 1.4.2
 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBX11_INSTALL_STAGING = YES
-XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto host-xproto_xproto
+XLIB_LIBX11_DEPENDENCIES = \
+	libxcb \
+	xutil_util-macros \
+	xlib_xtrans \
+	xlib_libXau \
+	xlib_libXdmcp \
+	xproto_kbproto \
+	xproto_xproto \
+	xproto_xextproto \
+	xproto_inputproto \
+	xproto_xf86bigfontproto \
+	host-xproto_xproto
+
 XLIB_LIBX11_CONF_OPT = \
 	--disable-malloc0returnsnull \
 	--with-xcb \

From 4f83232e8d307f6184900c6e4a99a5f76dc66fa4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:23 +0000
Subject: [PATCH 3902/6849] libsha1: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libsha1/Config.in  |  9 +++++++++
 package/libsha1/libsha1.mk | 15 +++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/libsha1/Config.in
 create mode 100644 package/libsha1/libsha1.mk

diff --git a/package/Config.in b/package/Config.in
index bd1db6b884..fcc248011e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -371,6 +371,7 @@ source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libnss/Config.in"
+source "package/libsha1/Config.in"
 source "package/nettle/Config.in"
 source "package/ocf-linux/Config.in"
 source "package/openssl/Config.in"
diff --git a/package/libsha1/Config.in b/package/libsha1/Config.in
new file mode 100644
index 0000000000..5467a6c4cd
--- /dev/null
+++ b/package/libsha1/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBSHA1
+	bool "libsha1"
+	help
+	  libsha1 is a tiny library providing SHA1 implementation,
+	  created for facilitating X server compilation on devices
+	  when larger libraries containing SHA1 implementations
+	  (OpenSSL, Mozilla NSS) are not needed.
+
+	  https://github.com/dottedmag/libsha1
diff --git a/package/libsha1/libsha1.mk b/package/libsha1/libsha1.mk
new file mode 100644
index 0000000000..e9658af4ba
--- /dev/null
+++ b/package/libsha1/libsha1.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libsha1
+#
+#############################################################
+
+LIBSHA1_VERSION = 0.3
+LIBSHA1_SITE = http://github.com/dottedmag/libsha1/tarball/$(LIBSHA1_VERSION)
+LIBSHA1_INSTALL_STAGING = YES
+
+# We're getting the source code from Github, so there is no generated
+# configure script in the tarball.
+LIBSHA1_AUTORECONF = YES
+
+$(eval $(autotools-package))

From cb8895ceffc8140b9d40fca7eba318a49bc7da20 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:24 +0000
Subject: [PATCH 3903/6849] xserver_xorg-server: provide more options for SHA1
 library

Until now, the X.org server was forcefully selecting OpenSSL, just to
have a SHA1 implementation. However, in fact, the X.org server is
capable of using a SHA1 implementation from multiple libraries:
OpenSSL, libgcrypt and libsha1 amongst others.

So, this patch changes the X.org server package so that we use the
SHA1 functions from OpenSSL is OpenSSL is already available, or the
SHA1 functions from libgcrypt is libgcrypt is already available, or if
neither OpenSSL nor libgcrypt are enabled in the configuration, we
select the much smaller libsha1, that has been specifically written to
fulfill the X.org server requirements.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/Config.in          |  5 ++++-
 .../x11r7/xserver_xorg-server/xserver_xorg-server.mk | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index c192ef4d19..5b60398183 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -2,7 +2,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	select BR2_PACKAGE_MCOOKIE
-	select BR2_PACKAGE_OPENSSL
+	# We need a SHA1 implementation. If either openssl or
+	# libgcrypt are already part of the build, we'll use one of
+	# them, otherwise, use the small libsha1 library.
+	select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
 	select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 92aa4b3850..140cb8b7ff 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -51,7 +51,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xproto_xproto 			\
 	xkeyboard-config		\
 	pixman 				\
-	openssl 			\
 	mcookie 			\
 	host-pkgconf
 
@@ -178,4 +177,15 @@ else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
 endif
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libcrypto
+XSERVER_XORG_SERVER_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libgcrypt
+XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt
+else
+XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libsha1
+XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
+endif
+
 $(eval $(autotools-package))

From 90c3150d5f4c732385f3fe0c25c8cddd150da685 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:25 +0000
Subject: [PATCH 3904/6849] cairo: do not depend on xserver-xorg_server, but on
 the right library

cairo is a X client library, so there is no reason for it to build
depend on the X.org server. What Cairo needs is the xlib_libX11
library.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/Config.in | 1 +
 package/cairo/cairo.mk  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 398e47fb6c..4a2078eb31 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_CAIRO
 	bool "cairo"
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	help
 	  Cairo is a 2D graphics library with support for multiple
 	  output devices. Currently supported output targets include
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 59a032a326..41e876a4a0 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -49,7 +49,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	CAIRO_CONF_OPT += --enable-xlib --with-x
-	CAIRO_DEPENDENCIES += xserver_xorg-server
+	CAIRO_DEPENDENCIES += xlib_libX11
 else
 	CAIRO_CONF_OPT += --disable-xlib --without-x
 endif

From d5d2f36367f02f8df4deae952ba3fbc8b1b3f2da Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:26 +0000
Subject: [PATCH 3905/6849] cairo: always enable XCB support when X backend is
 enabled

cairo depends on xlib_libX11 for its Xlib backend. But xlib_libX11
depends on XCB, so the XCB support can always be built into Cairo.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/cairo.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 41e876a4a0..6cf910afa0 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -48,10 +48,10 @@ else
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-	CAIRO_CONF_OPT += --enable-xlib --with-x
+	CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x
 	CAIRO_DEPENDENCIES += xlib_libX11
 else
-	CAIRO_CONF_OPT += --disable-xlib --without-x
+	CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_PS),y)

From 61062f97c2d74b1e2229c013f5511b4542b06bb8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:27 +0000
Subject: [PATCH 3906/6849] docker: depend on xlib_libX11 and not the X.org
 server

docker is a X client application, so it doesn't make sense to depend
on the X.org server. An inspection of docker Makefile and source code
shows that it only needs the libX11 library, so we replace the X.org
server dependency by a libX11 dependency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/docker/Config.in | 1 +
 package/docker/docker.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/docker/Config.in b/package/docker/Config.in
index 75bf5bedeb..f07739a21a 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_XLIB_LIBX11
 	help
 	  a system tray dock for X
 
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 95799e803c..b452386e6e 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -16,6 +16,6 @@ DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
 
 DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
 
-DOCKER_DEPENDENCIES = host-pkgconf libglib2 xserver_xorg-server
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
 
 $(eval $(autotools-package))

From e28272314b3e014e780ac44b9015da24292966a4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:28 +0000
Subject: [PATCH 3907/6849] fltk: replace dependency on X.org server with
 dependency on libraries

fltk is a X client library, so it doesn't make sense for it to depend
on the X.org server. Instead, it depends on libX11, libXext and libXt,
so we use those libraries as fltk dependencies.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fltk/Config.in | 2 ++
 package/fltk/fltk.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index eff72b56e8..20851922ae 100644
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -3,6 +3,8 @@ config BR2_PACKAGE_FLTK
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  A cross-platform C++ GUI toolkit for UNIX/Linux (X11),
 	  Microsoft Windows, and MacOS X.
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index a5dac37b55..3f192cdb48 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -11,6 +11,6 @@ FLTK_INSTALL_STAGING = YES
 FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_CONF_OPT = --enable-threads --with-x
-FLTK_DEPENDENCIES = xserver_xorg-server xlib_libXt
+FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
 
 $(eval $(autotools-package))

From 0e55b8dc8ac082ab8adb48dc790a4105a7630304 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:29 +0000
Subject: [PATCH 3908/6849] libgtk2: replace dependency on X.org server by
 dependency on libraries

libgtk2 is a X client library, so it doesn't make sense for it to
depend on the X.org server. Instead, it should depend on the X client
libraries.

This patch therefore replaces the dependency on the X server by a
dependency on libX11, libXext, libXrender and fontconfig, that are the
mandatory requirements to build the X backend of Gtk.

[Peter: don't add an empty line before gtk demo help text]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/Config.in  | 4 ++++
 package/libgtk2/libgtk2.mk | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index efaf12f334..3e8cf75386 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -8,6 +8,10 @@ config BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_GDK_PIXBUF
+	select BR2_PACKAGE_FONTCONFIG if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7
 	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 9adb6b9f41..3dcecbfe02 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -82,7 +82,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 		--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib \
 		--with-gdktarget=x11
-	LIBGTK2_DEPENDENCIES += xlib_libXcomposite xserver_xorg-server
+	LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
+		xlib_libXext xlib_libXrender
 else
 	LIBGTK2_CONF_OPT += --without-x
 endif

From 7c8cd9f55469ad3121f282ab30caf72d5218e401 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:30 +0000
Subject: [PATCH 3909/6849] libgtk2: add support for some optional X
 dependencies

libgtk2 can optionally use a number of features from additional X
extensions, so we add support for those, to ensure that Gtk gets built
after those extensions if they have been enabled in the Buildroot
configuration.

The extensions are Xinerama, Xinput, Xrandr, Xcursor, Xfixes,
Xcomposite and Xdamage.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/libgtk2.mk | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 3dcecbfe02..e6a9d84c05 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -84,6 +84,41 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 		--with-gdktarget=x11
 	LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
 		xlib_libXext xlib_libXrender
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+	LIBGTK2_CONF_OPT += --enable-xinerama
+	LIBGTK2_DEPENDENCIES += xlib_libXinerama
+else
+	LIBGTK2_CONF_OPT += --disable-xinerama
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y)
+	LIBGTK2_CONF_OPT += --with-xinput=yes
+	LIBGTK2_DEPENDENCIES += xlib_libXi
+else
+	LIBGTK2_CONF_OPT += --with-xinput=no
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+	LIBGTK2_DEPENDENCIES += xlib_libXrandr
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+	LIBGTK2_DEPENDENCIES += xlib_libXcursor
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+	LIBGTK2_DEPENDENCIES += xlib_libXfixes
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
+	LIBGTK2_DEPENDENCIES += xlib_libXcomposite
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
+	LIBGTK2_DEPENDENCIES += xlib_libXdamage
+endif
+
 else
 	LIBGTK2_CONF_OPT += --without-x
 endif

From 8b95ee78a4cdf77ffcb86d30aee1a72e848e04cc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:31 +0000
Subject: [PATCH 3910/6849] atk: remove useless configuration options

ATK is not directly related to X11, and the --with-x, --x-includes,
--x-libraries and --without-x options do not exist.

The --disable-glibtest was duplicated, and is therefore still passed
to the configuration options.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 987a1cbef7..0453acbc7b 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -41,14 +41,6 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
 ATK_CONF_OPT =  --disable-glibtest --enable-explicit-deps=no \
 		--disable-debug
 
-ifeq ($(BR2_PACKAGE_XORG7),y)
-ATK_CONF_OPT += --with-x \
-		--x-includes=$(STAGING_DIR)/usr/include/X11 \
-		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
-else
-ATK_CONF_OPT += --without-x
-endif
-
 ATK_DEPENDENCIES = libglib2 host-pkgconf
 
 HOST_ATK_CONF_OPT = \

From b19ee5cbdf8978d593805483a92b4c9d00c0da76 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:32 +0000
Subject: [PATCH 3911/6849] atk: remove unused host variant

The atk package is used as a dependency in the libglade and libgtk2
packages.

The libglade package has no host variant, and does not depend on
host-atk.

The libgtk2 package depends on atk, and has a host variant, but the
host variant of libgtk2 overrides HOST_LIBGTK2_DEPENDENCIES to limit
the number of dependencies, and host-atk is not amongst those
dependencies.

Therefore, host-atk is useless and can be removed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 0453acbc7b..2a85edde0e 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -43,8 +43,4 @@ ATK_CONF_OPT =  --disable-glibtest --enable-explicit-deps=no \
 
 ATK_DEPENDENCIES = libglib2 host-pkgconf
 
-HOST_ATK_CONF_OPT = \
-		--disable-glibtest
-
 $(eval $(autotools-package))
-$(eval $(host-autotools-package))

From 3ba6d3815d51405454d475fbe1400ee93609a152 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:33 +0000
Subject: [PATCH 3912/6849] pango: fix X.org dependencies

pango is a X client library, so it does not need to depend on the
X.org server. So, we replace the server dependency by dependencies on
the appropriate libraries.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pango/Config.in |  3 +++
 package/pango/pango.mk  | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/package/pango/Config.in b/package/pango/Config.in
index 60e9931a43..6c8a16024e 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -5,7 +5,10 @@ config BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	help
 	  Pango is a library for laying out and rendering of text, with an
 	  emphasis on internationalization. Pango can be used anywhere that
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 7ba53ee6dc..8e0444ea38 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -41,17 +41,26 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
 
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	host-pkgconf \
+	libglib2 \
+	cairo \
+	fontconfig \
+	freetype
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
         PANGO_CONF_OPT += --with-x \
 		--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
-	PANGO_DEPENDENCIES += xserver_xorg-server
+	PANGO_DEPENDENCIES += xlib_libX11
 else
         PANGO_CONF_OPT += --without-x
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy)
+	PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender
+endif
+
 define PANGO_INSTALL_INITSCRIPT
 	$(INSTALL) -m 755 -D package/pango/S25pango \
 		$(TARGET_DIR)/etc/init.d/S25pango

From bfee0ba5dde011f44bcca9e08d35e244e35d0fe4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:34 +0000
Subject: [PATCH 3913/6849] metacity: fix X.org dependencies

Metacity is a X client application, so there is no reason to depend on
the X.org server. Instead, depend on the appropriate X libraries.

In addition to the X.org related dependencies, we also add the
host-libxml-parser-perl dependency, otherwise:

  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool
  make[1]: *** [/home/test/outputs/xorg/build/metacity-2.25.1/.stamp_configured] Error 1
  make: *** [all] Error 2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/metacity/Config.in   | 10 ++++++++++
 package/metacity/metacity.mk | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/package/metacity/Config.in b/package/metacity/Config.in
index c483c44e24..833a091e7f 100644
--- a/package/metacity/Config.in
+++ b/package/metacity/Config.in
@@ -2,5 +2,15 @@ config BR2_PACKAGE_METACITY
 	bool "metacity"
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	# Metacity configure.ac pretends it can be built without
+	# Composite, but in reality, it doesn't build.
+	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE
+	# We do not directly depend on Xft, but they are needed to get
+	# Xft support in Pango, which we require.
+	select BR2_PACKAGE_XLIB_LIBXFT
 	help
 	  Metacity is a window manager for the X Window System.
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 990ec9faec..aa78a7a574 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -17,7 +17,17 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--disable-dependency-tracking \
 		--disable-sm --disable-startup-notification
 
-METACITY_DEPENDENCIES = libgtk2 xserver_xorg-server
+METACITY_DEPENDENCIES = libgtk2 \
+	xlib_libX11 \
+	host-libxml-parser-perl \
+	xlib_libXcomposite \
+	xlib_libXfixes \
+	xlib_libXrender \
+	xlib_libXdamage
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+METACITY_DEPENDENCIES += xlib_libXcursor
+endif
 
 define METACITY_INSTALL_XSESSION
 	install -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession

From 5eb126902974a03bfd4a2fe2da984529465ffaf6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:35 +0000
Subject: [PATCH 3914/6849] rubix: fix X.org dependency

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rubix/Config.in | 1 +
 package/rubix/rubix.mk  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/rubix/Config.in b/package/rubix/Config.in
index 9cf5b46ad4..7afc0ae7b9 100644
--- a/package/rubix/Config.in
+++ b/package/rubix/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_RUBIX
 	bool "rubix"
 	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
 	help
 	  A 3D rubiks cube game for X
 
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
index d39d3533e2..92703671b6 100644
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -10,7 +10,7 @@ RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 
 RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
 
-RUBIX_DEPENDENCIES = xserver_xorg-server
+RUBIX_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
 

From 9d4a588cac1927bb2cfd6a638a0573e77562f274 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:36 +0000
Subject: [PATCH 3915/6849] torsmo: fix X.org dependency

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/torsmo/Config.in | 2 ++
 package/torsmo/torsmo.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/torsmo/Config.in b/package/torsmo/Config.in
index b3aba39469..7d309da04a 100644
--- a/package/torsmo/Config.in
+++ b/package/torsmo/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_TORSMO
 	bool "torsmo"
 	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  Torsmo is a system monitor that sits in the corner of your desktop.
 
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index c42ce112c9..eedb6f783f 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -11,7 +11,7 @@ TORSMO_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
 TORSMO_CONF_ENV = ac_cv_path_HELP2MAN=''
 TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x
 
-TORSMO_DEPENDENCIES = xserver_xorg-server
+TORSMO_DEPENDENCIES = xlib_libX11 xlib_libXext
 
 $(eval $(autotools-package))
 

From ab0e905aaf440374b5059962ca8591197b2cbc54 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:37 +0000
Subject: [PATCH 3916/6849] xvkbd: fix X.org dependencies

xvkbd is a X.org client application, so there is no reason to depend
on the X.org server. Instead, depend on the X.org client libraries
that xvkbd actually links against.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xvkbd/Config.in |  7 +++++++
 package/xvkbd/xvkbd.mk  | 11 ++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in
index a75687d213..bd3f2aa8a0 100644
--- a/package/xvkbd/Config.in
+++ b/package/xvkbd/Config.in
@@ -1,7 +1,14 @@
 config BR2_PACKAGE_XVKBD
 	bool "xvkbd"
 	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBSM
+	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXPM
+	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBXTST
 	help
 	  on-screen keyboard for X
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index ec6302703b..ae81f84d33 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -10,7 +10,16 @@ XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
 XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
 				CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib"
 
-XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw xlib_libXtst
+XVKBD_DEPENDENCIES = \
+	xlib_libICE \
+	xlib_libSM \
+	xlib_libX11 \
+	xlib_libXaw \
+	xlib_libXext \
+	xlib_libXmu \
+	xlib_libXpm \
+	xlib_libXt \
+	xlib_libXtst
 
 $(eval $(autotools-package))
 

From 3ed3b69efe6e85bc599571c7af058c2d6ffffe53 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:38 +0000
Subject: [PATCH 3917/6849] xvkbd: turn into a generic-package

xvkbd was integrated has an autotools package, but it does not have a
./configure script. And to avoid executing the ./configure, the
xvkbd-2.8-makefile.patch was creating a dummy .stamp_configured stamp
file... Ugly.

So, make xvkbd a normal generic package, with BUILD_CMDS and
INSTALL_TARGET_CMDS, and get rid of the crappy part of the patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xvkbd/xvkbd-2.8-makefile.patch |  5 -----
 package/xvkbd/xvkbd.mk                 | 14 +++++++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package/xvkbd/xvkbd-2.8-makefile.patch b/package/xvkbd/xvkbd-2.8-makefile.patch
index e0ac21afc1..a8f6577387 100644
--- a/package/xvkbd/xvkbd-2.8-makefile.patch
+++ b/package/xvkbd/xvkbd-2.8-makefile.patch
@@ -1,8 +1,3 @@
---- a/.stamp_configured	2008-03-04 06:14:55.425005441 -0500
-+++ b/.stamp_configured	2008-03-05 08:42:53.000000000 -0500
-@@ -0,0 +1 @@
-+dummy
-\ No newline at end of file
 --- a/Makefile	2008-03-04 06:14:55.425005441 -0500
 +++ b/Makefile	2008-03-05 08:40:50.000000000 -0500
 @@ -0,0 +1,2397 @@
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index ae81f84d33..59085bf73d 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -7,8 +7,16 @@ XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
 
-XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
-				CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib"
+# Passing USRLIBDIR ensures that the stupid Makefile doesn't add
+# /usr/lib to the library search path.
+define XVKBD_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		USRLIBDIR="$(STAGING_DIR)/usr/lib"
+endef
+
+define XVKBD_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
 
 XVKBD_DEPENDENCIES = \
 	xlib_libICE \
@@ -21,5 +29,5 @@ XVKBD_DEPENDENCIES = \
 	xlib_libXt \
 	xlib_libXtst
 
-$(eval $(autotools-package))
+$(eval $(generic-package))
 

From ca170e06fbb130b821e9cf705c5afdc20208a1da Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 22:29:39 +0100
Subject: [PATCH 3918/6849] xvkbd: remove version from the patch file name

The version in xvkbd patch file name doesn't patch the version of the
package, so use the new convention that consists in not having the
package version in the patch file names.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xvkbd/{xvkbd-2.8-makefile.patch => xvkbd-makefile.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/xvkbd/{xvkbd-2.8-makefile.patch => xvkbd-makefile.patch} (100%)

diff --git a/package/xvkbd/xvkbd-2.8-makefile.patch b/package/xvkbd/xvkbd-makefile.patch
similarity index 100%
rename from package/xvkbd/xvkbd-2.8-makefile.patch
rename to package/xvkbd/xvkbd-makefile.patch

From 2b29492cf7a67a705dc0302018d1a7b35d19f308 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Jan 2013 11:29:40 +0000
Subject: [PATCH 3919/6849] webkit: remove X.org server dependency

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index a9701e43e7..d37601fb63 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -19,7 +19,7 @@ WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config \
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	WEBKIT_CONF_OPT += --with-target=x11
-	WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt
+	WEBKIT_DEPENDENCIES += xlib_libXt
 else
 	WEBKIT_CONF_OPT += --with-target=directfb
 	WEBKIT_DEPENDENCIES += directfb

From 98a51a8f9974612c960d4e39aaf16c33e2921c47 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 13 Jan 2013 02:46:08 +0000
Subject: [PATCH 3920/6849] qextserialport: bump version

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qextserialport/qextserialport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index f240cda3d7..efbfae729b 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEXTSERIALPORT_VERSION     = f83b4e7ca922e53
+QEXTSERIALPORT_VERSION     = 6c47244de4ce6db
 QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git/
 QEXTSERIALPORT_SITE_METHOD = git
 

From 8586b63ed38156578e7f6618d0ad871ad090e227 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 13 Jan 2013 02:47:40 +0000
Subject: [PATCH 3921/6849] qt: bump version to latest 4.8.4

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index b09d0eda75..b436ad8025 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -11,7 +11,7 @@
 #
 ######################################################################
 
-QT_VERSION = 4.8.3
+QT_VERSION = 4.8.4
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE    = http://releases.qt-project.org/qt4/source
 QT_DEPENDENCIES = host-pkgconf

From 1f4017b7fe03d0ece6951ffd0dd8c49ecb9ca293 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 13 Jan 2013 02:55:23 +0000
Subject: [PATCH 3922/6849] pixman: bump version

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pixman/pixman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 48795948b8..607f82ef1b 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,7 +3,7 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.25.2
+PIXMAN_VERSION = 0.28.2
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_INSTALL_STAGING = YES
 PIXMAN_DEPENDENCIES = host-pkgconf

From 98c69143c48eb7eb720f8ad47fc3aa6715f6fa45 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 13 Jan 2013 03:42:14 +0000
Subject: [PATCH 3923/6849] ofono: bump version

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ofono/ofono.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 6e6849b40d..e552eac3c7 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -3,7 +3,7 @@
 # ofono
 #
 #############################################################
-OFONO_VERSION = 1.6
+OFONO_VERSION = 1.7
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_DEPENDENCIES = \
 	host-pkgconf \

From 526dd5d272e519f80ee0422de1dc191df8ba6604 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Wed, 19 Dec 2012 12:42:22 +0000
Subject: [PATCH 3924/6849] cairo: bump version to 1.12.8

Directfb patch no longer needed.

[Peter: Add options for script/xml backends, support for Xrender backend]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/Config.in                   |  9 ++++++
 package/cairo/cairo-1.10.2-directfb.patch | 36 -----------------------
 package/cairo/cairo.mk                    | 26 ++++++++++++++--
 3 files changed, 33 insertions(+), 38 deletions(-)
 delete mode 100644 package/cairo/cairo-1.10.2-directfb.patch

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 4a2078eb31..3a3fb883b1 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -28,6 +28,10 @@ config BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
 
+config BR2_PACKAGE_CAIRO_SCRIPT
+	bool "script support"
+	select BR2_PACKAGE_ZLIB
+
 config BR2_PACKAGE_CAIRO_SVG
 	bool "svg support"
 	select BR2_PACKAGE_CAIRO_PNG
@@ -35,5 +39,10 @@ config BR2_PACKAGE_CAIRO_SVG
 
 config BR2_PACKAGE_CAIRO_TEE
 	bool "tee support"
+
+config BR2_PACKAGE_CAIRO_XML
+	bool "xml support"
+	select BR2_PACKAGE_CAIRO_PNG
+
 endif
 
diff --git a/package/cairo/cairo-1.10.2-directfb.patch b/package/cairo/cairo-1.10.2-directfb.patch
deleted file mode 100644
index 8b4c6f73a8..0000000000
--- a/package/cairo/cairo-1.10.2-directfb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- cairo-1.10.2/src/cairo-directfb-surface.c	2010-06-18 12:47:12.000000000 +0100
-+++ cairo-1.10.2.mod/src/cairo-directfb-surface.c	2012-02-02 11:40:57.835273391 +0000
-@@ -700,6 +700,7 @@
- 	surface->dfbsurface->Blit (surface->dfbsurface,
- 				   buffer, NULL,
- 				   image_rect->x, image_rect->y);
-+        surface->dfbsurface->ReleaseSource (surface->dfbsurface);
-     }
- 
-     cairo_surface_destroy (&image->base);
-@@ -928,6 +929,9 @@
-                             cairo_surface_attributes_t *src_attr)
- {
-     _cairo_pattern_release_surface (src_pattern, src, src_attr);
-+
-+    if (dst->dfbsurface)
-+        dst->dfbsurface->ReleaseSource (dst->dfbsurface);
- }
- #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
- 
-@@ -1584,6 +1588,7 @@
- 
- 	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,
- 					 cache->dfbsurface, NULL, 0, 0);
-+            new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
- 
- 	    _directfb_destroy_font_cache (cache);
- 	    scaled_font->surface_private = cache = new_cache;
-@@ -1809,6 +1814,7 @@
-     RUN_CLIPPED (dst, clip_region, NULL,
- 		 dst->dfbsurface->BatchBlit (dst->dfbsurface,
- 					     cache->dfbsurface, rects, points, num));
-+    dst->dfbsurface->ReleaseSource (dst->dfbsurface);
- 
-     return CAIRO_STATUS_SUCCESS;
- }
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 6cf910afa0..8885ab0dc0 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,8 +3,10 @@
 # cairo
 #
 #############################################################
-CAIRO_VERSION = 1.10.2
-CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
+CAIRO_VERSION = 1.12.8
+CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
+CAIRO_LICENSE = LGPLv2.1+
+CAIRO_LICENSE_FILES = COPYING
 CAIRO_SITE = http://cairographics.org/releases
 CAIRO_INSTALL_STAGING = YES
 
@@ -54,6 +56,13 @@ else
 	CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
+	CAIRO_CONF_OPT += --enable-xlib-xrender
+	CAIRO_DEPENDENCIES += xlib_libXrender
+else
+	CAIRO_CONF_OPT += --disable-xlib-xrender
+endif
+
 ifeq ($(BR2_PACKAGE_CAIRO_PS),y)
 	CAIRO_CONF_OPT += --enable-ps
 	CAIRO_DEPENDENCIES += zlib
@@ -75,6 +84,13 @@ else
 	CAIRO_CONF_OPT += --disable-png
 endif
 
+ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y)
+	CAIRO_CONF_OPT += --enable-script
+	CAIRO_DEPENDENCIES += zlib
+else
+	CAIRO_CONF_OPT += --disable-script
+endif
+
 ifeq ($(BR2_PACKAGE_CAIRO_SVG),y)
 	CAIRO_CONF_OPT += --enable-svg
 else
@@ -87,4 +103,10 @@ else
 	CAIRO_CONF_OPT += --disable-tee
 endif
 
+ifeq ($(BR2_PACKAGE_CAIRO_XML),y)
+	CAIRO_CONF_OPT += --enable-xml
+else
+	CAIRO_CONF_OPT += --disable-xml
+endif
+
 $(eval $(autotools-package))

From 6649d6da3f36e973e87d8a73c9618b3215e16253 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 13 Jan 2013 01:25:15 +0000
Subject: [PATCH 3925/6849] hiawatha: needs threads

Fixes
http://autobuild.buildroot.net/results/9bb3bdb9de43fc6bab119674885df2a28e5559ee/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in
index ac0aa102f1..fbed1bc620 100644
--- a/package/hiawatha/Config.in
+++ b/package/hiawatha/Config.in
@@ -1,7 +1,11 @@
+comment "hiawatha requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_HIAWATHA
 	bool "hiawatha"
 	# needs fork()
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Hiawatha is a webserver for Unix and has been built with
 	  security in mind. This resulted in a highly secure

From 579fea227394db02916d7487762c79a8e76e8748 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 9 Jan 2013 12:12:44 +0000
Subject: [PATCH 3926/6849] linux, uboot, mxs-bootlets, barebox: avoid double
 slash in CUSTOM_TARBALL

Closes #5846

The $(dir ...) function leaves a slash at the end, so that the LINUX_SITE
variable for a custom tarball ends in a slash. The DOWNLOAD macro adds
another slash between SITE and SOURCE, which results in a double slash in
the download URL.

Fix this by stripping off the final slash from the _SITE in all packages that
have a custom tarball.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk           | 2 +-
 boot/mxs-bootlets/mxs-bootlets.mk | 2 +-
 boot/uboot/uboot.mk               | 2 +-
 linux/linux.mk                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 6cc4976692..211e06eaf8 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -9,7 +9,7 @@ BAREBOX_VERSION    = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION))
 ifeq ($(BAREBOX_VERSION),custom)
 # Handle custom Barebox tarballs as specified by the configuration
 BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
-BAREBOX_SITE    = $(dir $(BAREBOX_TARBALL))
+BAREBOX_SITE    = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL)))
 BAREBOX_SOURCE  = $(notdir $(BAREBOX_TARBALL))
 else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y)
 BAREBOX_SITE        = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
index 1975d472ca..f93ff81790 100644
--- a/boot/mxs-bootlets/mxs-bootlets.mk
+++ b/boot/mxs-bootlets/mxs-bootlets.mk
@@ -6,7 +6,7 @@
 
 ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y)
 	MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL))
-	MXS_BOOTLETS_SITE = $(dir $(MXS_BOOTLETS_TARBALL))
+	MXS_BOOTLETS_SITE = $(patsubst %/,%,$(dir $(MXS_BOOTLETS_TARBALL)))
 	MXS_BOOTLETS_SOURCE  = $(notdir $(MXS_BOOTLETS_TARBALL))
 else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y)
 	MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 619f2e1e3b..ea77259d10 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -14,7 +14,7 @@ UBOOT_INSTALL_IMAGES = YES
 ifeq ($(UBOOT_VERSION),custom)
 # Handle custom U-Boot tarballs as specified by the configuration
 UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
-UBOOT_SITE    = $(dir $(UBOOT_TARBALL))
+UBOOT_SITE    = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
 UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
 UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL))
diff --git a/linux/linux.mk b/linux/linux.mk
index 61d4267de4..91a9f500bb 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -10,7 +10,7 @@ LINUX_LICENSE_FILES = COPYING
 # Compute LINUX_SOURCE and LINUX_SITE from the configuration
 ifeq ($(LINUX_VERSION),custom)
 LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
-LINUX_SITE = $(dir $(LINUX_TARBALL))
+LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL)))
 LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
 LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))

From 2b7074cfa1c75b58249e1a65d940c4cc30f28f3d Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 13 Jan 2013 08:58:43 +0000
Subject: [PATCH 3927/6849] New package : GNU SASL Library - libgsasl

GNU SASL is an implementation of the Simple Authentication and Security
Layer framework and a few common SASL mechanisms.  SASL is used by network
servers (e.g., IMAP, SMTP) to request authentication from clients, and in
clients to authenticate against servers.

libgsasl will be used in future versions of libesmtp.

[Peter: Misc minor fixes]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libgsasl/Config.in   | 11 +++++++++++
 package/libgsasl/libgsasl.mk | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/libgsasl/Config.in
 create mode 100644 package/libgsasl/libgsasl.mk

diff --git a/package/Config.in b/package/Config.in
index fcc248011e..427b4dbe8b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -481,6 +481,7 @@ source "package/libdnet/Config.in"
 source "package/libesmtp/Config.in"
 source "package/libeXosip2/Config.in"
 source "package/libfcgi/Config.in"
+source "package/libgsasl/Config.in"
 source "package/libidn/Config.in"
 source "package/libiscsi/Config.in"
 source "package/liboauth/Config.in"
diff --git a/package/libgsasl/Config.in b/package/libgsasl/Config.in
new file mode 100644
index 0000000000..5181386272
--- /dev/null
+++ b/package/libgsasl/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBGSASL
+	bool "libgsasl"
+	help
+	  Simple Authentication and Security Layer framework Library.
+	  GNU SASL is an implementation of the Simple Authentication and
+	  Security Layer framework and a few common SASL mechanisms.
+	  SASL is used by network servers (e.g., IMAP, SMTP) to request
+	  authentication from clients, and in clients to authenticate
+	  against servers.
+
+	  http://www.gnu.org/software/gsasl
diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk
new file mode 100644
index 0000000000..8f9a510571
--- /dev/null
+++ b/package/libgsasl/libgsasl.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libgsasl
+#
+#############################################################
+
+LIBGSASL_VERSION = 1.8.0
+LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
+LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
+LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
+LIBGSASL_INSTALL_STAGING = YES
+LIBGSAS_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBIDN),libidn)
+
+$(eval $(autotools-package))

From afb80a1b28409fdd44a1cd4ffd8ea4df048f8623 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 12 Jan 2013 13:50:32 +0000
Subject: [PATCH 3928/6849] package/dvb-apps: fix licensing terms when utils
 are enabled

When the dvb-apps utilities are selected, the license is clearly a
mix of GPLv2, GPLv2+ and LGPLv2.1+; this, in addition to the initial
unknown license for the transponders data.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/dvb-apps.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index ee4aadb51a..86af824976 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -21,6 +21,9 @@ DVB_APPS_LICENSE        = unknown (probably public domain)
 ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
 # Utilitiess are selected, build and install everything
 
+DVB_APPS_LICENSE       += GPLv2 GPLv2+ LGPLv2.1+
+DVB_APPS_LICENSE_FILES += COPYING COPYING.LGPL
+
 DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS)
 
 ifeq ($(BR2_ENABLE_LOCALE),)

From 0295258dadea23b21eb0890b94e59b6258759268 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 12 Jan 2013 13:50:33 +0000
Subject: [PATCH 3929/6849] package/dvb-apps: bump version

The new version has new transponders data for CZ.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/dvb-apps.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index 86af824976..31a4ff8f15 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DVB_APPS_VERSION        = 3fc7dfa68484
+DVB_APPS_VERSION        = 83c746462ccb
 DVB_APPS_SITE           = http://linuxtv.org/hg/dvb-apps
 DVB_APPS_SITE_METHOD    = hg
 

From 06c22d620abebf0f02588aa1acdabee2dc24a612 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sun, 13 Jan 2013 03:00:03 +0000
Subject: [PATCH 3930/6849] dvbsnoop: new package dvbsnoop

dvbsnoop is a DVB/MPEG stream analyzer. It's designed to debug, dump or
view the digital stream info available via

    satellite   -> DVB-S, DVB-S2
    cable       -> DVB-C, DVB-C2
    terrestrial -> DVB-T, DVB-T2

dvbsnoop can be used on any digital settopbox that running on linux and
provides the DVB APIv3. It's also usable on classical PCs that contains
a DVB hardware (PCI Card or USB Plug).

[Peter: needs largefile, fix help text]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/dvbsnoop/Config.in   | 25 +++++++++++++++++++++++++
 package/dvbsnoop/dvbsnoop.mk | 12 ++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/dvbsnoop/Config.in
 create mode 100644 package/dvbsnoop/dvbsnoop.mk

diff --git a/package/Config.in b/package/Config.in
index 427b4dbe8b..770d842fcd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -218,6 +218,7 @@ endif
 source "package/dmidecode/Config.in"
 source "package/dmraid/Config.in"
 source "package/dvb-apps/Config.in"
+source "package/dvbsnoop/Config.in"
 source "package/eeprog/Config.in"
 source "package/evtest/Config.in"
 source "package/flashrom/Config.in"
diff --git a/package/dvbsnoop/Config.in b/package/dvbsnoop/Config.in
new file mode 100644
index 0000000000..f21191ad41
--- /dev/null
+++ b/package/dvbsnoop/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_DVBSNOOP
+	bool "dvbsnoop"
+	depends on BR2_LARGEFILE
+	help
+	  Dvbsnoop is just a simple tool to analyze, view or debug a transport
+	  stream (TS), program elementary stream (PES) or even a program stream
+	  (PS). Dvbsnoop is trying to get input mostly direct from a frontend
+	  (satellite or cable tuner inside a set-top box for example) via DVB
+	  APIv3 to view into a TS, or a demux to view PES or PS (also mostly
+	  inside the set-top box or even PCI Card or USB Plug) but also from a
+	  file (recorded TS).
+	  Dvbsnoop is working well on SD transport streams but may have some
+	  limited functionality on HD transport streams (DVB-{C,S,T}2 because
+	  of missing knowledge how to handle it.
+
+	  Dvbsnoop itself doesn't do the tuning on the frontend, this has to be
+	  done by external helpers or manually driver call.
+	  The dvbsnoop tool was written while developing the software Neutrino
+	  on the set-top box DBox2.
+
+	  http://dvbsnoop.sourceforge.net
+	  http://en.wikipedia.org/wiki/DBox2
+
+comment "dvbsnoop requires a toolchain with LARGEFILE support"
+        depends on !BR2_LARGEFILE
diff --git a/package/dvbsnoop/dvbsnoop.mk b/package/dvbsnoop/dvbsnoop.mk
new file mode 100644
index 0000000000..dd62e8c842
--- /dev/null
+++ b/package/dvbsnoop/dvbsnoop.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# dvbsnoop
+#
+#############################################################
+
+DVBSNOOP_VERSION        = 1.4.50
+DVBSNOOP_SITE           = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
+DVBSNOOP_LICENSE        = GPLv2
+DVBSNOOP_LICENSE_FILES  = COPYING
+
+$(eval $(autotools-package))

From 63f7e72a28a1c30ad7d4b7765776bf71a93a05aa Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 11 Jan 2013 05:13:49 +0000
Subject: [PATCH 3931/6849] lzop: add host build

Barebox needs host-lzop.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzop/lzop.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 4ab8a4a64c..1f7c835227 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -11,3 +11,4 @@ LZOP_LICENSE_FILES = COPYING
 LZOP_DEPENDENCIES = lzo
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

From 3fd048a99a3bae8682a6d49154d55075628ba95c Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 11 Jan 2013 05:13:50 +0000
Subject: [PATCH 3932/6849] barebox: needs host-lzop

Add host-lzop dependency.
Use $(TARGET_MAKE_ENV) when calling $(MAKE)
to able to use binaries built for host.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/barebox.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 211e06eaf8..143338edd4 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -20,6 +20,7 @@ BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
 BAREBOX_SITE = http://www.barebox.org/download/
 endif
 
+BAREBOX_DEPENDENCIES = host-lzop
 BAREBOX_LICENSE = GPLv2 with exceptions
 BAREBOX_LICENSE_FILES = COPYING
 
@@ -56,7 +57,7 @@ endif
 
 define BAREBOX_CONFIGURE_CMDS
 	cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
+	$(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 endef
 
 ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
@@ -68,7 +69,7 @@ endif
 
 define BAREBOX_BUILD_CMDS
 	$(BAREBOX_BUILD_BAREBOXENV_CMDS)
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D)
 endef
 
 define BAREBOX_INSTALL_IMAGES_CMDS
@@ -96,12 +97,12 @@ endif
 endif
 
 barebox-menuconfig barebox-xconfig barebox-gconfig barebox-nconfig: barebox-configure
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
 		$(subst barebox-,,$@)
 	rm -f $(BAREBOX_DIR)/.stamp_{built,target_installed,images_installed}
 
 barebox-savedefconfig: barebox-configure
-	$(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) \
 		$(subst barebox-,,$@)
 
 ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)

From cbd675224d99113d3b2bddbb95119453cfdcc82b Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 11 Jan 2013 05:13:51 +0000
Subject: [PATCH 3933/6849] barebox: add 2013.01.0, remove 2012.09

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 10eb650a5a..b9e03b3084 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2012_12
+	default BR2_TARGET_BAREBOX_2013_01
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_09
-	bool "2012.09"
-
 config BR2_TARGET_BAREBOX_2012_10
 	bool "2012.10"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2012_11
 config BR2_TARGET_BAREBOX_2012_12
 	bool "2012.12.1"
 
+config BR2_TARGET_BAREBOX_2013_01
+	bool "2013.01.0"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.09.0"	if BR2_TARGET_BAREBOX_2012_09
 	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10
 	default "2012.11.0"	if BR2_TARGET_BAREBOX_2012_11
 	default "2012.12.1"	if BR2_TARGET_BAREBOX_2012_12
+	default "2013.01.0"	if BR2_TARGET_BAREBOX_2013_01
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 97a3493c51f4163957adef686addcde749f98aa8 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Fri, 11 Jan 2013 00:43:53 +0000
Subject: [PATCH 3934/6849] mtd: add options to build flash_otp_unlock and
 flash_otp_write

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtd/Config.in | 6 ++++++
 package/mtd/mtd.mk    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 7330dd598c..ddc3737dcf 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -30,6 +30,12 @@ config BR2_PACKAGE_MTD_FLASH_OTP_DUMP
 config BR2_PACKAGE_MTD_FLASH_OTP_INFO
 	bool "flash_otp_info"
 
+config BR2_PACKAGE_MTD_FLASH_OTP_LOCK
+	bool "flash_otp_lock"
+
+config BR2_PACKAGE_MTD_FLASH_OTP_WRITE
+	bool "flash_otp_write"
+
 config BR2_PACKAGE_MTD_FLASH_UNLOCK
 	bool "flash_unlock"
 	default y
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index aef478f8df..eafce45b99 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -38,6 +38,8 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE)	+= flash_erase
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK)	+= flash_lock
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP)	+= flash_otp_dump
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO)	+= flash_otp_info
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK)	+= flash_otp_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE)	+= flash_otp_write
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK)	+= flash_unlock
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK)	+= ftl_check
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT)	+= ftl_format

From 8a029d7fc90387a66b64feb543696de4b9b19a24 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Jan 2013 08:12:58 +0000
Subject: [PATCH 3935/6849] libmhash: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libmhash/Config.in   |  9 +++++++++
 package/libmhash/libmhash.mk | 14 ++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 package/libmhash/Config.in
 create mode 100644 package/libmhash/libmhash.mk

diff --git a/package/Config.in b/package/Config.in
index 770d842fcd..01e3694f68 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -371,6 +371,7 @@ source "package/beecrypt/Config.in"
 source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
 source "package/libsha1/Config.in"
 source "package/nettle/Config.in"
diff --git a/package/libmhash/Config.in b/package/libmhash/Config.in
new file mode 100644
index 0000000000..a9bd51a2c9
--- /dev/null
+++ b/package/libmhash/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBMHASH
+	bool "libmhash"
+	help
+	  Mhash is a free (under GNU Lesser GPL) library which provides
+	  a uniform interface to a large number of hash algorithms.
+	  These algorithms can be used to compute checksums, message digests,
+	  and other signatures.
+
+	  http://mhash.sourceforge.net/
diff --git a/package/libmhash/libmhash.mk b/package/libmhash/libmhash.mk
new file mode 100644
index 0000000000..aa05f93dfa
--- /dev/null
+++ b/package/libmhash/libmhash.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libmhash
+#
+#############################################################
+
+LIBMHASH_VERSION = 0.9.9.9
+LIBMHASH_SITE = http://downloads.sourceforge.net/project/mhash/mhash/$(LIBMHASH_VERSION)
+LIBMHASH_SOURCE = mhash-$(LIBMHASH_VERSION).tar.bz2
+LIBMHASH_INSTALL_STAGING = YES
+LIBMHASH_LICENSE = LGPLv2
+LIBMHASH_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From eddffaad60357d738550bb832acb419c1452e633 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Jan 2013 15:12:59 -0300
Subject: [PATCH 3936/6849] libmcrypt: new package

[Peter: Do libmcrypt-config fixup in single pass]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                       |  1 +
 package/libmcrypt/Config.in             |  7 +++++++
 package/libmcrypt/libmcrypt-nocxx.patch | 15 +++++++++++++++
 package/libmcrypt/libmcrypt.mk          | 22 ++++++++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 package/libmcrypt/Config.in
 create mode 100644 package/libmcrypt/libmcrypt-nocxx.patch
 create mode 100644 package/libmcrypt/libmcrypt.mk

diff --git a/package/Config.in b/package/Config.in
index 01e3694f68..ef62fb75ab 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -371,6 +371,7 @@ source "package/beecrypt/Config.in"
 source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
 source "package/libsha1/Config.in"
diff --git a/package/libmcrypt/Config.in b/package/libmcrypt/Config.in
new file mode 100644
index 0000000000..e5dc5e23a9
--- /dev/null
+++ b/package/libmcrypt/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBMCRYPT
+	bool "libmcrypt"
+	help
+	  libmcrypt is a library that provides uniform interface to access
+	  several encryption algorithms.
+
+	  http://mcrypt.sourceforge.net/
diff --git a/package/libmcrypt/libmcrypt-nocxx.patch b/package/libmcrypt/libmcrypt-nocxx.patch
new file mode 100644
index 0000000000..b1c28713a1
--- /dev/null
+++ b/package/libmcrypt/libmcrypt-nocxx.patch
@@ -0,0 +1,15 @@
+libmcrypt doesn't use C++ so remove the check.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libmcrypt-2.5.8.orig/configure.in libmcrypt-2.5.8/configure.in
+--- libmcrypt-2.5.8.orig/configure.in	2013-01-07 12:20:44.332200669 -0300
++++ libmcrypt-2.5.8/configure.in	2013-01-07 12:20:50.405390565 -0300
+@@ -19,7 +19,6 @@
+ 
+ AC_PROG_MAKE_SET
+ 
+-AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
diff --git a/package/libmcrypt/libmcrypt.mk b/package/libmcrypt/libmcrypt.mk
new file mode 100644
index 0000000000..a03c89202f
--- /dev/null
+++ b/package/libmcrypt/libmcrypt.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# libmcrypt
+#
+#############################################################
+
+LIBMCRYPT_VERSION = 2.5.8
+LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION)
+LIBMCRYPT_AUTORECONF = YES
+LIBMCRYPT_INSTALL_STAGING = YES
+LIBMCRYPT_LICENSE = LGPLv2.1
+LIBMCRYPT_LICENSE_FILES = COPYING.LIB
+
+define LIBMCRYPT_STAGING_LIBMCRYPT_CONFIG_FIXUP
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/libmcrypt-config
+endef
+
+LIBMCRYPT_POST_INSTALL_STAGING_HOOKS += LIBMCRYPT_STAGING_LIBMCRYPT_CONFIG_FIXUP
+
+$(eval $(autotools-package))

From 9e02c32fd6a064bf256c5e76abbf65e432892489 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Jan 2013 08:13:00 +0000
Subject: [PATCH 3937/6849] mcrypt: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                         |   1 +
 package/mcrypt/Config.in                  |  13 +++
 package/mcrypt/mcrypt-CVE-2012-4409.patch |  25 +++++
 package/mcrypt/mcrypt-CVE-2012-4426.patch |  35 +++++++
 package/mcrypt/mcrypt-CVE-2012-4527.patch | 108 ++++++++++++++++++++++
 package/mcrypt/mcrypt-no-rpath.patch      |  17 ++++
 package/mcrypt/mcrypt.mk                  |  17 ++++
 7 files changed, 216 insertions(+)
 create mode 100644 package/mcrypt/Config.in
 create mode 100644 package/mcrypt/mcrypt-CVE-2012-4409.patch
 create mode 100644 package/mcrypt/mcrypt-CVE-2012-4426.patch
 create mode 100644 package/mcrypt/mcrypt-CVE-2012-4527.patch
 create mode 100644 package/mcrypt/mcrypt-no-rpath.patch
 create mode 100644 package/mcrypt/mcrypt.mk

diff --git a/package/Config.in b/package/Config.in
index ef62fb75ab..ea0586bcfb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -589,6 +589,7 @@ menu "Miscellaneous"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/googlefontdirectory/Config.in"
+source "package/mcrypt/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
 source "package/snowball-init/Config.in"
diff --git a/package/mcrypt/Config.in b/package/mcrypt/Config.in
new file mode 100644
index 0000000000..58567cd751
--- /dev/null
+++ b/package/mcrypt/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_MCRYPT
+	bool "mcrypt"
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBMCRYPT
+	select BR2_PACKAGE_LIBMHASH
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	help
+	  MCrypt is a replacement for the old crypt() package and crypt(1)
+	  command, with extensions.
+	  It allows developers to use a wide range of encryption functions,
+	  without making drastic changes to their code.
+
+	  http://mcrypt.sourceforge.net/
diff --git a/package/mcrypt/mcrypt-CVE-2012-4409.patch b/package/mcrypt/mcrypt-CVE-2012-4409.patch
new file mode 100644
index 0000000000..97c658bb2d
--- /dev/null
+++ b/package/mcrypt/mcrypt-CVE-2012-4409.patch
@@ -0,0 +1,25 @@
+From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:37:06 +0200
+Subject: [PATCH] cleanup: buffer overflow
+
+---
+ src/extra.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/extra.c b/src/extra.c
+index 3082f82..c7a1ac0 100644
+--- a/src/extra.c
++++ b/src/extra.c
+@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode,
+ 		if (m_getbit(6, flags) == 1) { /* if the salt bit is set */
+ 			if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
+ 				*salt_size = m_setbit(0, sflag, 0);
++				if (*salt_size > sizeof(tmp_buf))
++					err_quit(_("Salt is too long\n"));
+ 				if (*salt_size > 0) {
+ 					fread(tmp_buf, 1, *salt_size,
+ 					      fstream);
+-- 
+1.7.8.6
+
diff --git a/package/mcrypt/mcrypt-CVE-2012-4426.patch b/package/mcrypt/mcrypt-CVE-2012-4426.patch
new file mode 100644
index 0000000000..708d4a579e
--- /dev/null
+++ b/package/mcrypt/mcrypt-CVE-2012-4426.patch
@@ -0,0 +1,35 @@
+Patch taken from gentoo.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/src/errors.c
++++ b/src/errors.c
+@@ -25,24 +25,24 @@
+ 
+ void err_quit(char *errmsg)
+ {
+-	fprintf(stderr, errmsg);
++	fprintf(stderr, "%s", errmsg);
+ 	exit(-1);
+ }
+ 
+ void err_warn(char *errmsg)
+ {
+ 	if (quiet <= 1)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+ 
+ void err_info(char *errmsg)
+ {
+ 	if (quiet == 0)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+ 
+ void err_crit(char *errmsg)
+ {
+ 	if (quiet <= 2)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
diff --git a/package/mcrypt/mcrypt-CVE-2012-4527.patch b/package/mcrypt/mcrypt-CVE-2012-4527.patch
new file mode 100644
index 0000000000..a287680958
--- /dev/null
+++ b/package/mcrypt/mcrypt-CVE-2012-4527.patch
@@ -0,0 +1,108 @@
+Description: [CVE-2012-4527] Stack-based buffer overflow with long file names
+ .
+ A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames.
+ If a user were tricked into attempting to encrypt/decrypt specially crafted
+ long filename(s), this flaw would cause a stack-based buffer overflow that
+ could potentially lead to arbitrary code execution.
+ .
+ Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only
+ bug on wheezy.
+Author: Attila Bogar, Jean-Michel Vourgère <jmv_deb@nirgal.com>
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527
+Bug: CVE-2012-4527
+Bug-Debian: http://bugs.debian.org/690924
+Forwarded: no
+Last-Update: 2012-11-01
+Index: mcrypt-2.6.8/src/mcrypt.c
+===================================================================
+--- mcrypt-2.6.8.orig/src/mcrypt.c
++++ mcrypt-2.6.8/src/mcrypt.c
+@@ -41,4 +41,6 @@
+ 
++/* Temporary error message can contain one file name and 1k of text */
++#define ERRWIDTH ((PATH_MAX)+1024)
+-char tmperr[128];
++char tmperr[ERRWIDTH];
+ unsigned int stream_flag = FALSE;
+ char *keymode = NULL;
+ char *mode = NULL;
+@@ -482,7 +485,7 @@
+ #ifdef HAVE_STAT
+       if (stream_flag == FALSE) {
+ 	 if (is_normal_file(file[i]) == FALSE) {
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: %s is not a regular file. Skipping...\n"),
+ 		    program_name, file[i]);
+@@ -501,7 +504,7 @@
+ 	    dinfile = file[i];
+ 	 if ((isatty(fileno((FILE *) (stdin))) == 1)
+ 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: Encrypted data will not be read from a terminal.\n"),
+ 		    program_name);
+@@ -520,7 +523,7 @@
+ 	    einfile = file[i];
+ 	 if ((isatty(fileno((FILE *) (stdout))) == 1)
+ 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: Encrypted data will not be written to a terminal.\n"),
+ 		    program_name);
+@@ -544,7 +547,7 @@
+ 	    strcpy(outfile, einfile);
+ 	    /* if file has already the .nc ignore it */
+ 	    if (strstr(outfile, ".nc") != NULL) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("%s: file %s has the .nc suffix... skipping...\n"),
+ 		       program_name, outfile);
+@@ -590,10 +593,10 @@
+ 
+ 	 if (x == 0) {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
++	       snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile);
+ 	       err_warn(tmperr);
+ 	    } else {
+-	       sprintf(tmperr, _("Stdin was decrypted.\n"));
++	       snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n"));
+ 	       err_warn(tmperr);
+ 	    }
+ #ifdef HAVE_STAT
+@@ -610,7 +613,7 @@
+ 
+ 	 } else {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("File %s was NOT decrypted successfully.\n"),
+ 		       dinfile);
+@@ -636,10 +639,10 @@
+ 
+ 	 if (x == 0) {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
++	       snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile);
+ 	       err_warn(tmperr);
+ 	    } else {
+-	       sprintf(tmperr, _("Stdin was encrypted.\n"));
++	       snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n"));
+ 	       err_warn(tmperr);
+ 	    }
+ #ifdef HAVE_STAT
+@@ -655,7 +658,7 @@
+ 
+ 	 } else {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("File %s was NOT encrypted successfully.\n"),
+ 		       einfile);
diff --git a/package/mcrypt/mcrypt-no-rpath.patch b/package/mcrypt/mcrypt-no-rpath.patch
new file mode 100644
index 0000000000..a0813bcf00
--- /dev/null
+++ b/package/mcrypt/mcrypt-no-rpath.patch
@@ -0,0 +1,17 @@
+Patch out rpath hardcoding since it completely ignores --disable-rpath
+and other configure ways.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura mcrypt-2.6.8.orig/config.rpath mcrypt-2.6.8/config.rpath
+--- mcrypt-2.6.8.orig/config.rpath	2013-01-07 13:05:22.626883480 -0300
++++ mcrypt-2.6.8/config.rpath	2013-01-07 13:12:47.196090608 -0300
+@@ -153,7 +153,7 @@
+   # here allows them to be overridden if necessary.
+   # Unlike libtool, we use -rpath here, not --rpath, since the documented
+   # option of GNU ld is called -rpath, not --rpath.
+-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++  hardcode_libdir_flag_spec=
+   case "$host_os" in
+     aix3* | aix4* | aix5*)
+       # On AIX/PPC, the GNU linker is very broken
diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk
new file mode 100644
index 0000000000..5bd5816776
--- /dev/null
+++ b/package/mcrypt/mcrypt.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# mcrypt
+#
+#############################################################
+
+MCRYPT_VERSION = 2.6.8
+MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VERSION)
+MCRYPT_DEPENDENCIES = libmcrypt libmhash \
+	$(if $(BR2_PACKAGE_ZLIB),zlib) \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+MCRYPT_CONF_OPT = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
+MCRYPT_LICENSE = GPLv3
+MCRYPT_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From afba84d1fcec911094ba54e1777155fa76913fe1 Mon Sep 17 00:00:00 2001
From: Laurent GONZALEZ <br2@gezedo.com>
Date: Sat, 2 Jun 2012 06:14:00 +0000
Subject: [PATCH 3938/6849] libqwt: new package

Patch initially written by Thomas Petazzoni, then reworked and updated
by Laurent Gonzalez, and finally cleaned up by Thomas again.

[Peter: generic-package, deps, download, rename to qwt, move under Qt]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/qwt/Config.in                        | 22 +++++++++
 package/qwt/qwt-remove-installed-check.patch | 32 ++++++++++++
 package/qwt/qwt.mk                           | 52 ++++++++++++++++++++
 4 files changed, 107 insertions(+)
 create mode 100644 package/qwt/Config.in
 create mode 100644 package/qwt/qwt-remove-installed-check.patch
 create mode 100644 package/qwt/qwt.mk

diff --git a/package/Config.in b/package/Config.in
index ea0586bcfb..4f05665e9b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -143,6 +143,7 @@ comment "QT libraries and helper libraries"
 source "package/grantlee/Config.in"
 source "package/qextserialport/Config.in"
 source "package/qtuio/Config.in"
+source "package/qwt/Config.in"
 endif
 
 source "package/x11r7/Config.in"
diff --git a/package/qwt/Config.in b/package/qwt/Config.in
new file mode 100644
index 0000000000..d72b30e0f9
--- /dev/null
+++ b/package/qwt/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_QWT
+	bool "qwt"
+	depends on BR2_PACKAGE_QT_GUI_MODULE
+	help
+	  Qwt is a graphics extension to the Qt GUI application
+	  framework. It provides a 2D plotting widget and more.
+
+	  http://http://sourceforge.net/projects/qwt
+
+if BR2_PACKAGE_QWT
+
+config BR2_PACKAGE_QWT_SVG
+	bool "SVG support"
+	select BR2_PACKAGE_QT_SVG
+
+config BR2_PACKAGE_QWT_MATHML
+	bool "MathML support"
+
+endif
+
+comment "qwt depends on QT gui module"
+	depends on !BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/qwt/qwt-remove-installed-check.patch b/package/qwt/qwt-remove-installed-check.patch
new file mode 100644
index 0000000000..7490a7b776
--- /dev/null
+++ b/package/qwt/qwt-remove-installed-check.patch
@@ -0,0 +1,32 @@
+Remove useless check at build time
+
+At build time, Qwt looks whether the Qwt libraries are already
+installed in the destination directory, to avoid confusion between
+libraries installed system-wide and locally-built shared
+libraries. However, this behaviour conflicts with how Buildroot builds
+and installs libraries, so get rid of it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qwt-6.0.0/qwtbuild.pri
+===================================================================
+--- qwt-6.0.0.orig/qwtbuild.pri	2011-09-12 19:37:35.663275952 +0200
++++ qwt-6.0.0/qwtbuild.pri	2011-09-12 19:37:41.913275949 +0200
+@@ -53,17 +53,3 @@
+ !debug_and_release {
+     OBJECTS_DIR       = obj
+ }
+-
+-unix {
+-
+-    exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
+-
+-        # On some Linux distributions the Qwt libraries are installed 
+-        # in the same directory as the Qt libraries. Unfortunately
+-        # qmake always adds QMAKE_LIBDIR_QT at the beginning of the 
+-        # linker path, so that the installed libraries will be
+-        # used instead of the local ones.
+-
+-        error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
+-    }
+-}
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
new file mode 100644
index 0000000000..1560ea4381
--- /dev/null
+++ b/package/qwt/qwt.mk
@@ -0,0 +1,52 @@
+#############################################################
+#
+# qwt
+#
+#############################################################
+
+QWT_VERSION = 6.0.1
+QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
+QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
+QWT_INSTALL_STAGING = YES
+QWT_DEPENDENCIES = qt
+
+QWT_CONFIG  =    's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
+QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
+QWT_CONFIG += -e 's%/features%/mkspecs/features%'
+
+ifeq ($(BR2_PACKAGE_QWT_SVG),y)
+	QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
+else
+	QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
+endif
+
+ifeq ($(BR2_PACKAGE_QWT_MATHML),y)
+	QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/QWT_CONFIG += QwtMathML/'
+else
+	QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/\# QWT_CONFIG += QwtMathML/'
+endif
+
+define QWT_CONFIGURE_CMDS
+	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
+	(cd $(@D); $(QT_QMAKE))
+endef
+
+define QWT_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+# After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so
+# that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and
+# not -L/usr/lib.
+define QWT_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR)
+	$(SED) "s%QWT_INSTALL_PREFIX = .*%QWT_INSTALL_PREFIX = $(STAGING_DIR)/usr%" \
+		$(STAGING_DIR)/usr/mkspecs/features/qwtconfig.pri
+endef
+
+define QWT_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR)
+	rm -Rf $(TARGET_DIR)/usr/mkspecs
+endef
+
+$(eval $(generic-package))

From 766862434b728c3d647b5544844d305edd5f541a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 13 Jan 2013 22:43:23 +0100
Subject: [PATCH 3939/6849] qwt: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qwt/qwt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 1560ea4381..e35833d54d 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QWT_VERSION = 6.0.1
+QWT_VERSION = 6.0.2
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES

From 2b0f455254149bd0c41c463a58c00d218922f002 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 13 Jan 2013 11:52:20 +0000
Subject: [PATCH 3940/6849] Makefile: export a few variables to help support
 scripts

Support scripts (in support/) may need to parse the .config file, so give
them an easy access to it, by exporting BUILDROOT_CONFIG with the fully-
qualified path to .config.

Also, post-build scripts may need to reference a few locations, so export
those, too.

Note: we export both O and BASE_DIR. Although they are the same, BASE_DIR
is used internally, while O is used on the command line, which makes it a
bit ambiguous to know which to use. As users use O= on the command line,
they will probably tend to use that in their post-build scripts.

Update doc accordingly.

[Peter: fixed typo]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                         | 11 +++++++++++
 docs/manual/customize-rootfs.txt |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/Makefile b/Makefile
index 074674a165..5a83251451 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,8 @@ EXTRAMAKEARGS = O=$(O)
 NEED_WRAPPER=y
 endif
 
+BUILDROOT_CONFIG=$(CONFIG_DIR)/.config
+
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 -include $(CONFIG_DIR)/.config
@@ -282,6 +284,15 @@ HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif
 
+# Scripts in support/ or post-build scripts may need to reference
+# these locations, so export them so it is easier to use
+export BUILDROOT_CONFIG
+export TARGET_DIR
+export STAGING_DIR
+export HOST_DIR
+export BINARIES_DIR
+export BASE_DIR O   # O and BASE_DIR are the same
+
 #############################################################
 #
 # You should probably leave this stuff alone unless you know
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index a1a556b85c..4d3b559706 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -37,6 +37,13 @@ there are a few ways to customize the resulting target filesystem.
   certain package generates wrong or unneeded files, you should fix
   that package rather than work around it with a post-build cleanup
   script. _Among these first 3 methods, this one should be preferred_.
+  You may also use these variables in your post-build script:
+    - +BUILDROOT_CONFIG+: the path to the Buildroot .config file
+    - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see
+      xref:generic-package-reference[]
+    - +BINARIES_DIR+: the place where all binary files (aka images) are
+      stored
+    - +BASE_DIR+ (or +O+): the base output directory
 
 * A special package, 'customize', stored in +package/customize+ can be
   used. You can put all the files that you want to see in the final

From dcb79995aaaa6f1aa9a7d782df8bbccbda1ff409 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 13 Jan 2013 11:52:21 +0000
Subject: [PATCH 3941/6849] Makefile: use newly-introduced BUILDROOT_CONFIG

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 5a83251451..16b5ef41b3 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ BUILDROOT_CONFIG=$(CONFIG_DIR)/.config
 
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(CONFIG_DIR)/.config
+-include $(BUILDROOT_CONFIG)
 endif
 
 # To put more focus on warnings, be less verbose as default
@@ -383,7 +383,7 @@ dirs: $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 
 $(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
 
-$(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config
+$(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG)
 	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
 
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
@@ -557,7 +557,7 @@ legal-info-prepare: $(LEGAL_INFO_DIR)
 	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved)
 	@$(call legal-warning,the Buildroot source code has not been saved)
 	@$(call legal-warning,the toolchain has not been saved)
-	@cp $(CONFIG_DIR)/.config $(LEGAL_INFO_DIR)/buildroot.config
+	@cp $(BUILDROOT_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
 
 legal-info: dirs legal-info-clean legal-info-prepare $(REDIST_SOURCES_DIR) \
 		$(TARGETS_LEGAL_INFO)
@@ -590,7 +590,7 @@ COMMON_CONFIG_ENV = \
 	KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \
 	KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \
 	KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
-	BUILDROOT_CONFIG=$(CONFIG_DIR)/.config
+	BUILDROOT_CONFIG=$(BUILDROOT_CONFIG)
 
 xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -630,7 +630,7 @@ allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
+	@grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
 		while read config pkg; do \
 		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
@@ -641,7 +641,7 @@ randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
+	@grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
 		while read config pkg; do \
 		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
@@ -652,7 +652,7 @@ allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
+	@grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
 		$< --allnoconfig $(CONFIG_CONFIG_IN)
@@ -706,7 +706,7 @@ endif
 ifeq ($(O),output)
 	rm -rf $(O)
 endif
-	rm -rf $(CONFIG_DIR)/.config $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps
+	rm -rf $(BUILDROOT_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps
 
 cross: $(BASE_TARGETS)
 

From e3f20ef2d196ab1c30de3ebea696d5ccfa3d054d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 13 Jan 2013 11:52:22 +0000
Subject: [PATCH 3942/6849] support/dependencies: use newly-introduced
 BUILDROOT_CONFIG

No need to recreate a path we already have.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.mk |  1 -
 support/dependencies/dependencies.sh | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index cee2a4842d..ebe743a658 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -22,7 +22,6 @@ endif
 
 core-dependencies:
 	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
-		CONFIG_FILE="$(CONFIG_DIR)/.config" \
 		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
 		$(TOPDIR)/support/dependencies/dependencies.sh
 
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index ca58450149..acba57c92c 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -147,8 +147,8 @@ for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio p
     fi
 done
 
-if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
-   grep ^BR2_ENABLE_LOCALE=y       $CONFIG_FILE > /dev/null ; then
+if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \
+   grep ^BR2_ENABLE_LOCALE=y       $BUILDROOT_CONFIG > /dev/null ; then
    if ! which locale > /dev/null ; then
        /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n"
        exit 1 ;
@@ -159,7 +159,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
    fi
 fi
 
-if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
+if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then
     for prog in javac jar; do
 	if ! which $prog > /dev/null ; then
 	    /bin/echo -e "\nYou must install '$prog' on your build machine\n" >&2
@@ -168,7 +168,7 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
     done
 fi
 
-if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1; then
+if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $BUILDROOT_CONFIG > /dev/null 2>&1; then
     if ! which mkpasswd > /dev/null 2>&1; then
         /bin/echo -e "\nYou need the 'mkpasswd' utility to set the root password\n"
         /bin/echo -e "(in Debian/ubuntu, 'mkpasswd' provided by the whois package)\n"
@@ -176,7 +176,7 @@ if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1
     fi
 fi
 
-if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $CONFIG_FILE ; then
+if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then
     if test ! -f /lib/ld-linux.so.2 ; then
 	/bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture,"
 	/bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility"

From 0bc0da0bb41dc3ae77913e6321bb0326f039a413 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 13 Jan 2013 11:52:23 +0000
Subject: [PATCH 3943/6849] toolchain/crostool-ng: use newly-introduced
 BUILDROOT_CONFIG

No need to recreate a path we already have.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../toolchain-crosstool-ng/crosstool-ng.mk    | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 553c9ee5bc..c09f732001 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -99,9 +99,9 @@ $(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/.config
 # - second for path options (because they have no prompt, they
 #                            always get set to the default value)
 # - third for C library .config (if it has one, eg. uClibc)
-CTNG_FIX_DOT_CONFIG_SED       :=
-CTNG_FIX_DOT_CONFIG_PATHS_SED :=
-CTNG_FIX_DOT_CONFIG_LIBC_SED  :=
+CTNG_FIX_BUILDROOT_CONFIG_SED       :=
+CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED :=
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED  :=
 
 #--------------
 # A few generic functions
@@ -200,72 +200,72 @@ endif
 # with BR2 config options.
 # Known missing: arch options, uClibc/eglibc config...
 #
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_INSTALL_DIR_RO)=y:\# \1 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_[BL]E).*:\# \2 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_ENDIAN)) is not set:\1=y:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="buildroot":;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(ARCH)-linux":;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_INSTALL_DIR_RO)=y:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_ARCH_[BL]E).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_ENDIAN)) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="buildroot":;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(ARCH)-linux":;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
 ifneq ($(call qstrip,$(BR2_USE_MMU)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
 else
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_ARCH_USE_MMU)=y:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_USE_MMU)=y:\# \1 is not set:;
 endif
 ifneq ($(call qstrip,$(BR2_PACKAGE_GDB_SERVER))$(call qstrip,$(BR2_PACKAGE_GDB_HOST)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_DEBUG_gdb)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_DEBUG_gdb)=.*:\# \1 is not set:;
 endif
 ifeq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_CXX)),y)
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_CC_LANG_CXX) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_CC_LANG_CXX) is not set:\1=y:;
 else
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_CC_LANG_CXX)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_CC_LANG_CXX)=.*:\# \1 is not set:;
 endif
 
 # Shoe-horn CPU variant now
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_ARCH_ARCH)=.*:\1=$(BR2_GCC_TARGET_ARCH):;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_ARCH)=.*:\1=$(BR2_GCC_TARGET_ARCH):;
 endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_ARCH_TUNE)=.*:\1=$(BR2_GCC_TARGET_TUNE):;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_TUNE)=.*:\1=$(BR2_GCC_TARGET_TUNE):;
 endif
 
 # And floating point now
 ifeq ($(call qstrip,$(BR2_SOFT_FLOAT)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_FLOAT_HW) is not set:\1=y:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_ARCH_FLOAT_SW)=y:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_FLOAT_HW) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_FLOAT_SW)=y:\# \1 is not set:;
 else
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_ARCH_FLOAT_HW)=y:\# \1 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_FLOAT_SW) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_FLOAT_HW)=y:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_FLOAT_SW) is not set:\1=y:;
 endif
 
 # Thread implementation selection
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NONE).*:\# \2 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_THREADS_LINUXTHREADS).*:\# \2 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NPTL).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NONE).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_LINUXTHREADS).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NPTL).*:\# \2 is not set:;
 ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS))$(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_THREADS_LINUXTHREADS).*:\2=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_LINUXTHREADS).*:\2=y:;
  ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc)),)
   ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_NEW).*:\# \2 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_OLD).*:\2=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_NEW).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_OLD).*:\2=y:;
   else
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_OLD).*:\# \2 is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_NEW).*:\2=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_OLD).*:\# \2 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_NEW).*:\2=y:;
   endif
  endif
 else ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_NPTL)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NPTL).*:\2=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NPTL).*:\2=y:;
 else ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_NONE)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NONE).*:\2=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NONE).*:\2=y:;
 endif
 
 #--------------
 # And the specials for paths
-CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_PREFIX_DIR)=.*:\1="$(HOST_DIR)/usr":;
-CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LOCAL_TARBALLS_DIR)=.*:\1="$(DL_DIR)":;
-CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_NAME)=.*:\1="sysroot":;
-CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
+CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_PREFIX_DIR)=.*:\1="$(HOST_DIR)/usr":;
+CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_LOCAL_TARBALLS_DIR)=.*:\1="$(DL_DIR)":;
+CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_NAME)=.*:\1="sysroot":;
+CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
 
 #--------------
 # uClibc specific options
@@ -273,53 +273,53 @@ ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y)
 
 # Handle the locales option
 ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_LOCALE)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_LOCALES) is not set:\1=y\n\# CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA is not set:;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_LOCALES) is not set:\1=y\n\# CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA)=.*:\# \1 is not set:;
 else
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES)=.*:\# \1 is not set:;
 endif
 
 # Handle the wide-char option
 ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_WCHAR)),)
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_WCHAR) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_WCHAR) is not set:\1=y:;
 else
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
 endif
 
 # Handle the LFS option
 ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_LARGEFILE)),)
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_LFS) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_LFS) is not set:\1=y:;
 else
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
 endif
 
 # Handle the IPv6 option
 ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6)),)
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_IPV6) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_IPV6) is not set:\1=y:;
 else
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
 endif
 
 # Handle the RPC option
 ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC)),)
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_RPC) is not set:\1=y\nUCLIBC_HAS_FULL_RPC=y\nUCLIBC_HAS_REENTRANT_RPC=y:;
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_FULL_RPC) is not set:\1=y:;
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_REENTRANT_RPC) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_RPC) is not set:\1=y\nUCLIBC_HAS_FULL_RPC=y\nUCLIBC_HAS_REENTRANT_RPC=y:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_FULL_RPC) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_REENTRANT_RPC) is not set:\1=y:;
 else
-CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_RPC)=.*:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_RPC)=.*:\# \1 is not set:;
 endif
 
 # Instruct CT-NG's .config where to find the uClibc's .config
-CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LIBC_UCLIBC_CONFIG_FILE)=.*:\1="$(CTNG_DIR)/libc.config":;
+CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_LIBC_UCLIBC_CONFIG_FILE)=.*:\1="$(CTNG_DIR)/libc.config":;
 
 # And add this to the toolchain build dependency
 $(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/libc.config
 
 # And here is how we get this uClibc's .config
-$(CTNG_DIR)/libc.config: $(CTNG_UCLIBC_CONFIG_FILE) $(CONFIG_DIR)/.config
+$(CTNG_DIR)/libc.config: $(CTNG_UCLIBC_CONFIG_FILE) $(BUILDROOT_CONFIG)
 	-$(Q)cp -a $@ $@.timestamp
 	$(Q)cp -f $< $@
-	$(call ctng-fix-dot-config,$@,$(CTNG_FIX_DOT_CONFIG_LIBC_SED))
+	$(call ctng-fix-dot-config,$@,$(CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED))
 	$(call ctng-check-config-changed,$@,$@.timestamp)
 	$(Q)rm -f $@.timestamp
 
@@ -330,10 +330,10 @@ endif # LIBC is uClibc
 ifeq ($(BR2_TOOLCHAIN_CTNG_glibc)$(BR2_TOOLCHAIN_CTNG_eglibc),y)
 
 # Force unwind support
-CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_GLIBC_FORCE_UNWIND) is not set:\1=y:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_LIBC_GLIBC_FORCE_UNWIND) is not set:\1=y:;
 
 # Force non-fortified build
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_ENABLE_FORTIFIED_BUILD)=y:\# \1 is not set:;
+CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_ENABLE_FORTIFIED_BUILD)=y:\# \1 is not set:;
 
 endif # LIBC is glibc or eglibc
 
@@ -347,14 +347,14 @@ endif # LIBC is glibc or eglibc
 # or a feature of kconfig?)
 # $1: the .config file to munge
 define ctng-oldconfig
-	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_DOT_CONFIG_SED))
+	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_BUILDROOT_CONFIG_SED))
 	$(Q)yes ''                                             |\
 	$(call ctng,CT_IS_A_BACKEND=y                           \
 	            CT_BACKEND_ARCH=$(CTNG_ARCH)                \
 	            CT_BACKEND_KERNEL=linux                     \
 	            CT_BACKEND_LIBC=$(BR2_TOOLCHAIN_CTNG_LIBC)  \
 	            oldconfig                                   )
-	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_DOT_CONFIG_PATHS_SED))
+	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED))
 endef
 
 # We need the host crosstool-NG before we can even begin working
@@ -372,7 +372,7 @@ $(CTNG_DIR)/.config: | host-crosstool-ng
 # can't do anything about it ) Ideally, this should go in oldconfig
 # itself, but it's much easier to handle here.
 
-$(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(CONFIG_DIR)/.config
+$(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(BUILDROOT_CONFIG)
 	$(Q)if [ ! -f $@ ]; then                                                        \
 	        mkdir -p "$(CTNG_DIR)";                                                 \
 	        libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }' "$<")";            \

From 1300cb55621d1565a1b09e907963d77f272eacb4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 10:02:29 +0100
Subject: [PATCH 3944/6849] Makefile: don't export O to the environment

Several projects use the kernel style O=<dir> syntax to build out of tree,
and atleast uClibc doesn't check that it was explictly passed on the command
line, so setting it in the environment breaks the build.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                         | 2 +-
 docs/manual/customize-rootfs.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 16b5ef41b3..f40863247d 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,7 @@ export TARGET_DIR
 export STAGING_DIR
 export HOST_DIR
 export BINARIES_DIR
-export BASE_DIR O   # O and BASE_DIR are the same
+export BASE_DIR
 
 #############################################################
 #
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 4d3b559706..6399699bdc 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -43,7 +43,7 @@ there are a few ways to customize the resulting target filesystem.
       xref:generic-package-reference[]
     - +BINARIES_DIR+: the place where all binary files (aka images) are
       stored
-    - +BASE_DIR+ (or +O+): the base output directory
+    - +BASE_DIR+: the base output directory
 
 * A special package, 'customize', stored in +package/customize+ can be
   used. You can put all the files that you want to see in the final

From 1a5ae24549afa4f374770b58b3008bb5a32e2b9a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 11:17:22 +0100
Subject: [PATCH 3945/6849] cairo: script backend needs png

Fixes http://autobuild.buildroot.org/results/7b21c60d7ba1a8df8910d104e21d4545cb37a4c6

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/Config.in | 2 +-
 package/cairo/cairo.mk  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 3a3fb883b1..89bd315f37 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -30,7 +30,7 @@ config BR2_PACKAGE_CAIRO_PNG
 
 config BR2_PACKAGE_CAIRO_SCRIPT
 	bool "script support"
-	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_CAIRO_PNG
 
 config BR2_PACKAGE_CAIRO_SVG
 	bool "svg support"
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 8885ab0dc0..b3fc4385e6 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -86,7 +86,6 @@ endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y)
 	CAIRO_CONF_OPT += --enable-script
-	CAIRO_DEPENDENCIES += zlib
 else
 	CAIRO_CONF_OPT += --disable-script
 endif

From 6ada8725661f44800ba5a6bdc0b51704f50a1bd1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Jan 2013 01:12:20 +0000
Subject: [PATCH 3946/6849] links: needs mmu

Fixes
http://autobuild.buildroot.net/results/1c1456b19d7483475430b390291240733dbbf21b

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/links/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/links/Config.in b/package/links/Config.in
index 474aa6a2f6..141eaf2404 100644
--- a/package/links/Config.in
+++ b/package/links/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LINKS
 	bool "links"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Graphics and text mode WWW browser (kind of like lynx).
 

From ae3e9e05de56a620165653b6c31710e717b60806 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 14:07:45 +0100
Subject: [PATCH 3947/6849] gst-plugins-bad: sort suboptions alphabetically

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 9dd2daab83..2a386f2b68 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -82,12 +82,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
 	bool "fieldanalysis"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
-	bool "freeze"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB
 	bool "freeverb"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
+	bool "freeze"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R
 	bool "frei0r"
 
@@ -211,12 +211,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED
 	bool "speed"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC
-	bool "subenc"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO
 	bool "stereo"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC
+	bool "subenc"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA
 	bool "tta"
 

From d3ffea31036676a3d409d3cc470fa8dfc380f8fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 14:14:29 +0100
Subject: [PATCH 3948/6849] gst-plugins-bad: add faad option

Based on patch by Bogdan Radulescu <bogdan_radulescu99@yahoo.com>

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-bad/Config.in          | 4 ++++
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 2a386f2b68..8cbe021c60 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -270,6 +270,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV
 	bool "fbdev"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD
+	bool "faad"
+	select BR2_PACKAGE_FAAD2
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "libmms"
 	select BR2_PACKAGE_LIBMMS
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 714c987c1b..183de7ba08 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -508,6 +508,13 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-dvb
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST_PLUGINS_BAD_DEPENDENCIES += faad2
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-faad
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-fbdev
 else

From 3d3dcd932bd4724b32d6ca459efe6baad3f330f1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 14:15:02 +0100
Subject: [PATCH 3949/6849] gst-plugins-good: add wavpack + gdkpixbuf options

Based on patch by Bogdan Radulescu <bogdan_radulescu99@yahoo.com>

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-plugins-good/Config.in      |  8 ++++++++
 .../gst-plugins-good/gst-plugins-good.mk           | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index b5006e6239..1498ed0107 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -186,6 +186,10 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
 	bool "flac (libFLAC)"
 	select BR2_PACKAGE_FLAC
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
+	bool "gdkpixbuf"
+	select BR2_PACKAGE_GDK_PIXBUF
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
 	bool "ossaudio (OSS audio)"
 
@@ -205,4 +209,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
 	bool "speex"
 	select BR2_PACKAGE_SPEEX
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK
+	bool "wavpack (*.wv audio)"
+	select BR2_PACKAGE_WAVPACK
+
 endif
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index f64527dece..2ba3e20103 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -342,6 +342,13 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-flac
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-oss
 else
@@ -375,4 +382,11 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-speex
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST_PLUGINS_GOOD_DEPENDENCIES += wavpack
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+endif
+
 $(eval $(autotools-package))

From 0bb831c2f7450076befcb769a169108bd69cf282 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 19 Dec 2012 13:37:31 +0000
Subject: [PATCH 3950/6849] imx-lib: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/imx-lib/Config.in  | 53 ++++++++++++++++++++++++++++++++++++++
 package/imx-lib/imx-lib.mk | 41 +++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 package/imx-lib/Config.in
 create mode 100644 package/imx-lib/imx-lib.mk

diff --git a/package/Config.in b/package/Config.in
index 4f05665e9b..34abe85ba3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -435,6 +435,7 @@ endmenu
 
 menu "Hardware handling"
 source "package/ccid/Config.in"
+source "package/imx-lib/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
diff --git a/package/imx-lib/Config.in b/package/imx-lib/Config.in
new file mode 100644
index 0000000000..161700985f
--- /dev/null
+++ b/package/imx-lib/Config.in
@@ -0,0 +1,53 @@
+comment "imx-lib needs an imx-specific kernel to be built"
+	depends on BR2_arm && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_IMX_LIB
+	bool "imx-lib"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Library of userspace helpers specific for the Freescale i.MX
+	  platform. It wraps the kernel interfaces for some i.MX platform
+	  specific drivers. It requires a kernel that includes the i.MX
+	  specific headers to be built.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
+
+if BR2_PACKAGE_IMX_LIB
+choice
+	prompt "i.MX platform"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+	bool "imx25-3stack"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+	bool "imx27ads"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+	bool "imx37-3stack"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+	bool "imx50"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+	bool "imx51"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+	bool "imx53"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+	bool "imx6q"
+
+endchoice
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM
+	string
+	default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+	default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+	default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+	default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+	default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+	default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+	default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+endif
diff --git a/package/imx-lib/imx-lib.mk b/package/imx-lib/imx-lib.mk
new file mode 100644
index 0000000000..c168c80f0c
--- /dev/null
+++ b/package/imx-lib/imx-lib.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# imx-lib
+#
+#############################################################
+
+IMX_LIB_VERSION = 12.09.01
+# No official download site from freescale, just this mirror
+IMX_LIB_SITE    = http://download.ossystems.com.br/bsp/freescale/source
+IMX_LIB_LICENSE = LGPLv2.1+
+# No license file included
+
+IMX_LIB_INSTALL_STAGING = YES
+
+# imx-lib needs access to imx-specific kernel headers
+IMX_LIB_DEPENDENCIES += linux
+IMX_LIB_INCLUDE = \
+	-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
+	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
+	-idirafter $(LINUX_DIR)/include
+
+IMX_LIB_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	$(TARGET_CONFIGURE_OPTS) \
+	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+	PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
+	INCLUDE="$(IMX_LIB_INCLUDE)"
+
+define IMX_LIB_BUILD_CMDS
+	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define IMX_LIB_INSTALL_STAGING_CMDS
+	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
+endef
+
+define IMX_LIB_INSTALL_TARGET_CMDS
+	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))

From 85bd7b910c060b1a9649f6cb1b0eec7db04b94b3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 19 Dec 2012 13:37:32 +0000
Subject: [PATCH 3951/6849] libfslvpuwrap: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/libfslvpuwrap/Config.in        | 13 +++++++++++++
 package/libfslvpuwrap/libfslvpuwrap.mk | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/libfslvpuwrap/Config.in
 create mode 100644 package/libfslvpuwrap/libfslvpuwrap.mk

diff --git a/package/Config.in b/package/Config.in
index 34abe85ba3..f891b49b4e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -467,6 +467,7 @@ menu "Multimedia"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
 source "package/libebml/Config.in"
+source "package/libfslvpuwrap/Config.in"
 source "package/libmatroska/Config.in"
 source "package/libmms/Config.in"
 source "package/libmpeg2/Config.in"
diff --git a/package/libfslvpuwrap/Config.in b/package/libfslvpuwrap/Config.in
new file mode 100644
index 0000000000..57b8a0206b
--- /dev/null
+++ b/package/libfslvpuwrap/Config.in
@@ -0,0 +1,13 @@
+comment "libfslvpuwrap needs an imx-specific kernel to be built"
+	depends on BR2_arm && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_LIBFSLVPUWRAP
+	bool "libfslvpuwrap"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm # Only relevant for i.MX
+	select BR2_PACKAGE_IMX_LIB
+	help
+	  Wrapper library for the vpu library, giving it a different API.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
new file mode 100644
index 0000000000..3ad33f9abc
--- /dev/null
+++ b/package/libfslvpuwrap/libfslvpuwrap.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# buildroot makefile for libfslvpuwrap
+#
+#############################################################
+
+LIBFSLVPUWRAP_VERSION = 1.0.17
+# No official download site from freescale, just this mirror
+LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
+LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
+LIBFSLVPUWRAP_REDISTRIBUTE = NO
+
+LIBFSLVPUWRAP_INSTALL_STAGING = YES
+
+LIBFSLVPUWRAP_DEPENDENCIES += imx-lib
+
+$(eval $(autotools-package))

From 22001201ded95850f0f9388f26333c077230b6c6 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 19 Dec 2012 13:37:33 +0000
Subject: [PATCH 3952/6849] firmware-imx: new package

[Peter: ensure lib/firmware exists, move under 'Misc devices firmware']
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/firmware-imx/Config.in       | 13 ++++++++++
 package/firmware-imx/firmware-imx.mk | 39 ++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 package/firmware-imx/Config.in
 create mode 100644 package/firmware-imx/firmware-imx.mk

diff --git a/package/Config.in b/package/Config.in
index f891b49b4e..f87e14302f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -203,6 +203,7 @@ endmenu
 menu "Hardware handling"
 menu "Misc devices firmwares"
 source "package/b43-firmware/Config.in"
+source "package/firmware-imx/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/rpi-firmware/Config.in"
 source "package/ux500-firmware/Config.in"
diff --git a/package/firmware-imx/Config.in b/package/firmware-imx/Config.in
new file mode 100644
index 0000000000..dd96d8889e
--- /dev/null
+++ b/package/firmware-imx/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_FIRMWARE_IMX
+	bool "firmware-imx"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Firmware blobs for the Freescale i.MX SoCs.
+
+	  It contains blobs for Atheros AR6003, SDMA and VPU.
+
+	  Note: it also contains a blob for ar3k/30101 but upstream
+	  linux-firmware has that as well.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/firmware-imx/firmware-imx.mk b/package/firmware-imx/firmware-imx.mk
new file mode 100644
index 0000000000..3b43bef5c6
--- /dev/null
+++ b/package/firmware-imx/firmware-imx.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# buildroot makefile for firmware-imx
+#
+#############################################################
+
+FIRMWARE_IMX_VERSION = 12.09.01
+# No official download site from freescale, just this mirror
+FIRMWARE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source
+FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
+FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
+	Atheros license (ath6k)
+FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
+# This is a legal minefield: the EULA specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+FIRMWARE_IMX_REDISTRIBUTE = NO
+
+FIRMWARE_IMX_BLOBS = ath6k sdma vpu
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (firmware-imx-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info.
+define FIRMWARE_IMX_EXTRACT_CMDS
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept
+endef
+
+
+define FIRMWARE_IMX_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware
+	for blobdir in $(FIRMWARE_IMX_BLOBS); do \
+		cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \
+	done
+endef
+
+$(eval $(generic-package))

From 26fbc4dba9f8e15048763aa16f75cac757887f74 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 19 Dec 2012 13:37:34 +0000
Subject: [PATCH 3953/6849] libfslparser: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/libfslparser/Config.in       |  8 ++++++
 package/libfslparser/libfslparser.mk | 40 ++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 package/libfslparser/Config.in
 create mode 100644 package/libfslparser/libfslparser.mk

diff --git a/package/Config.in b/package/Config.in
index f87e14302f..44e83f94d4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -468,6 +468,7 @@ menu "Multimedia"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
 source "package/libebml/Config.in"
+source "package/libfslparser/Config.in"
 source "package/libfslvpuwrap/Config.in"
 source "package/libmatroska/Config.in"
 source "package/libmms/Config.in"
diff --git a/package/libfslparser/Config.in b/package/libfslparser/Config.in
new file mode 100644
index 0000000000..e3ab980ec9
--- /dev/null
+++ b/package/libfslparser/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBFSLPARSER
+	bool "libfslparser"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Binary parser libraries for the Freescale i.MX SoCs.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
new file mode 100644
index 0000000000..66f48cc133
--- /dev/null
+++ b/package/libfslparser/libfslparser.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# buildroot makefile for libfslparser
+#
+#############################################################
+
+LIBFSLPARSER_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
+LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
+LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
+# This is a legal minefield: the EULA in the bin file specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+LIBFSLPARSER_REDISTRIBUTE = NO
+
+LIBFSLPARSER_INSTALL_STAGING = YES
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslparser-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info
+# Since the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLPARSER_EXTRACT_CMDS
+	awk 'BEGIN      { start=0; } \
+	     /^EOEULA/  { start = 0; } \
+	                { if (start) print; } \
+	     /<<EOEULA/ { start=1; }'\
+	    $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
+endef
+
+# The Makefile installs several versions of the libraries, but we only
+# need one of them, depending on the platform.
+
+$(eval $(autotools-package))

From 98163a02980f1a5e93d987a4f58d4817a94a3e61 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 19 Dec 2012 13:37:35 +0000
Subject: [PATCH 3954/6849] libfslcodec: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/libfslcodec/Config.in      |  8 ++++++
 package/libfslcodec/libfslcodec.mk | 40 ++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 package/libfslcodec/Config.in
 create mode 100644 package/libfslcodec/libfslcodec.mk

diff --git a/package/Config.in b/package/Config.in
index 44e83f94d4..e19e8b9523 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -468,6 +468,7 @@ menu "Multimedia"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
 source "package/libebml/Config.in"
+source "package/libfslcodec/Config.in"
 source "package/libfslparser/Config.in"
 source "package/libfslvpuwrap/Config.in"
 source "package/libmatroska/Config.in"
diff --git a/package/libfslcodec/Config.in b/package/libfslcodec/Config.in
new file mode 100644
index 0000000000..7b31b7a71f
--- /dev/null
+++ b/package/libfslcodec/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBFSLCODEC
+	bool "libfslcodec"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Binary codec libraries for the Freescale i.MX SoCs.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
new file mode 100644
index 0000000000..a2b57b8b31
--- /dev/null
+++ b/package/libfslcodec/libfslcodec.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# buildroot makefile for libfslcodec
+#
+#############################################################
+
+LIBFSLCODEC_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
+LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
+LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
+# This is a legal minefield: the EULA in the bin file specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+LIBFSLCODEC_REDISTRIBUTE = NO
+
+LIBFSLCODEC_INSTALL_STAGING = YES
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslcodec-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info.
+# Since the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLCODEC_EXTRACT_CMDS
+	awk 'BEGIN      { start=0; } \
+	     /^EOEULA/  { start = 0; } \
+	                { if (start) print; } \
+	     /<<EOEULA/ { start=1; }'\
+	    $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
+endef
+
+# FIXME The Makefile installs both the arm9 and arm11 versions of the
+# libraries, but we only need one of them.
+
+$(eval $(autotools-package))

From 31a4dfab1a7c821f4b23c244702ee648e68f816d Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 19 Dec 2012 13:37:36 +0000
Subject: [PATCH 3955/6849] gst-fsl-plugins: new package

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |  1 +
 package/multimedia/gst-fsl-plugins/Config.in  | 92 +++++++++++++++++++
 ...ugins-0001-gplay-add-missing-include.patch | 23 +++++
 ...0002-Fix-bashism-in-configure-script.patch | 65 +++++++++++++
 ...-fsl-plugins-0003-Use-proper-objdump.patch | 36 ++++++++
 .../gst-fsl-plugins/gst-fsl-plugins.mk        | 42 +++++++++
 6 files changed, 259 insertions(+)
 create mode 100644 package/multimedia/gst-fsl-plugins/Config.in
 create mode 100644 package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
 create mode 100644 package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
 create mode 100644 package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
 create mode 100644 package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 273d9bc1bc..e50eda97bd 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -8,6 +8,7 @@ source "package/multimedia/ffmpeg/Config.in"
 source "package/multimedia/gstreamer/Config.in"
 source "package/multimedia/gst-ffmpeg/Config.in"
 source "package/multimedia/gst-dsp/Config.in"
+source "package/multimedia/gst-fsl-plugins/Config.in"
 source "package/multimedia/gst-omapfb/Config.in"
 source "package/multimedia/gst-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
diff --git a/package/multimedia/gst-fsl-plugins/Config.in b/package/multimedia/gst-fsl-plugins/Config.in
new file mode 100644
index 0000000000..42467341a6
--- /dev/null
+++ b/package/multimedia/gst-fsl-plugins/Config.in
@@ -0,0 +1,92 @@
+comment "gst-fsl-plugins requires an imx-specific kernel to be built"
+	depends on BR2_arm && BR2_PACKAGE_GSTREAMER && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_GST_FSL_PLUGINS
+	bool "gst-fsl-plugins"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm # Only relevant for i.MX
+	depends on BR2_PACKAGE_GSTREAMER
+	select BR2_PACKAGE_GST_PLUGINS_BASE
+	select BR2_PACKAGE_LIBFSLVPUWRAP
+	select BR2_PACKAGE_IMX_LIB
+	select BR2_PACKAGE_LIBFSLPARSER
+	select BR2_PACKAGE_LIBFSLCODEC
+	help
+	  GStreamer plugins for hardware-accelerated audio and video
+	  parsers and codecs on i.MX platforms. It requires a kernel that
+	  includes the i.MX specific headers to be built.
+
+	  To use the VPU, its firmware blob must be installed as well. This
+	  can be found in the firmware-imx package in the "Hardware handling"
+	  menu.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream. Pengutronix maintains gst-fsl-plugins at
+	  git://git.pengutronix.de/git/imx/gst-plugins-fsl-vpu.git
+	  but it diverges heavily from Freescale's original implementation.
+
+if BR2_PACKAGE_GST_FSL_PLUGINS
+choice
+	prompt "i.MX platform"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233
+	bool "imx233"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+	bool "imx25"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+	bool "imx27"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28
+	bool "imx28"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31
+	bool "imx31"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35
+	bool "imx35"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+	bool "imx37"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+	bool "imx50"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+	bool "imx51"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+	bool "imx53"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X
+	bool "imx5X"
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+	bool "imx6"
+
+endchoice
+
+config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM
+	string
+	default "MX233" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233
+	default "MX25" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25
+	default "MX27" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27
+	default "MX28" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28
+	default "MX31" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31
+	default "MX35" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35
+	default "MX37" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37
+	default "MX50" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50
+	default "MX51" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51
+	default "MX53" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53
+	default "MX5X" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X
+	default "MX6" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6
+endif
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
new file mode 100644
index 0000000000..19753bc787
--- /dev/null
+++ b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
@@ -0,0 +1,23 @@
+From ed649ccb8ddc724546172d329fca39b23c49b804 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Mon, 17 Dec 2012 17:58:28 +0100
+Subject: [PATCH] gplay: add missing include
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ tools/gplay/gst_snapshot.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/gplay/gst_snapshot.c b/tools/gplay/gst_snapshot.c
+index 40dbb6f..596f399 100755
+--- a/tools/gplay/gst_snapshot.c
++++ b/tools/gplay/gst_snapshot.c
+@@ -22,6 +22,7 @@
+ 
+ #include <gst/gst.h>
+ #include <string.h>
++#include <stdio.h>
+ #include "gst_snapshot.h"
+ 
+ static void
+-- 
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
new file mode 100644
index 0000000000..8af3644f49
--- /dev/null
+++ b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
@@ -0,0 +1,65 @@
+From 83b4f84b1c490b9bb816e1ecbc743d80d48cc06d Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Tue, 18 Dec 2012 12:05:22 +0100
+Subject: [PATCH] Fix bashism in configure script.
+
+The configure script uses +=, which is not POSIX. Debians that
+have the default dash as /bin/sh define a variable ending with
++ instead of appending to it.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ configure.ac |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5968eb6..1a31a06 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,10 +60,10 @@ AC_DEFUN([CHECK_DISABLE_FEATURE],
+         [use_[$1]=yes])
+     if test "$use_[$1]" = "yes"; then
+         SAVE_CPPFLAGS="$CPPFLAGS"
+-        CPPFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec`
+-        CPPFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec`
+-        CPPFLAGS+=`$PKG_CONFIG --cflags libfslparser`
+-        CPPFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap`
++        CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslaudiocodec`"
++        CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvideocodec`"
++        CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslparser`"
++        CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvpuwrap`"
+         AC_CHECK_HEADERS([$4], HAVE_[$3]=yes, HAVE_[$3]=no && break)
+         CPPFLAGS="$SAVE_CPPFLAGS"
+         if test "x$HAVE_[$3]" = "xyes"; then
+@@ -157,7 +157,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS)
+ AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no])
+ if test "x$HAVE_VPU_LIB" = "xyes"; then
+     VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`
+-    VPU_LIBS+=" -lvpu"
++    VPU_LIBS="$VPU_LIBS -lvpu"
+ fi
+ AC_SUBST(VPU_LIBS)
+ 
+@@ -173,15 +173,15 @@ AC_SUBST(IPU_CFLAGS)
+ AC_SUBST(IPU_LIBS)
+ 
+ FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
+-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`
+-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null`
+-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`
++FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
++FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
++FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`"
+ AC_SUBST(FSL_MM_CORE_CFLAGS)
+ 
+ FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null`
+-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`
+-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null`
+-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`
++FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`"
++FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
++FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`"
+ AC_SUBST(FSL_MM_CORE_LIBS)
+ 
+ EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"
+-- 
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
new file mode 100644
index 0000000000..8fce239e50
--- /dev/null
+++ b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
@@ -0,0 +1,36 @@
+From c58b658a93b1b6d6e94ba0306d58de845012cef6 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Tue, 18 Dec 2012 12:22:52 +0100
+Subject: [PATCH] Use proper objdump
+
+If the OBJDUMP environment variable is set, that should be used rather
+than the objdump in PATH.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a31a06..cc7557d 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ AC_DEFUN([FIND_PARSER_SONAME],
+     AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname])
+     path=`$PKG_CONFIG --variable=libdir libfslparser`
+     SONAME=$( $CC -print-file-name=$path/lib_$1_parser_$2_elinux.so | \
+-	    while read output; do objdump -p $output | \
++	    while read output; do $OBJDUMP -p $output | \
+ 	    grep "SONAME" | \
+ 	    sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
+     if [[ -z "$SONAME" ]]; then
+@@ -37,7 +37,7 @@ AC_DEFUN([FIND_ACODEC_SONAME],
+     AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname])
+     path=`$PKG_CONFIG --variable=libdir libfslaudiocodec`
+     SONAME=$( $CC -print-file-name=$path/wrap/lib_$1_wrap_$2_elinux.so | \
+-	    while read output; do objdump -p $output | \
++	    while read output; do $OBJDUMP -p $output | \
+ 	    grep "SONAME" | \
+ 	    sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
+     if [[ -z "$SONAME" ]]; then
+-- 
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
new file mode 100644
index 0000000000..639fd52ae2
--- /dev/null
+++ b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -0,0 +1,42 @@
+#############################################################
+#
+# buildroot makefile for gst-fsl-plugins
+#
+#############################################################
+
+GST_FSL_PLUGINS_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+GST_FSL_PLUGINS_SITE = http://download.ossystems.com.br/bsp/freescale/source
+
+# Most is LGPLv2+, but some sources are copied from upstream and are
+# LGPLv2.1+, which essentially makes it LGPLv2.1+
+GST_FSL_PLUGINS_LICENSE = LGPLv2+, LGPLv2.1+, PROPRIETARY (asf.h)
+GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2
+
+GST_FSL_PLUGINS_INSTALL_STAGING = YES
+GST_FSL_PLUGINS_AUTORECONF = YES
+
+GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \
+	libfslvpuwrap imx-lib libfslparser libfslcodec
+
+GST_FSL_PLUGINS_CONF_ENV = PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM)
+
+# needs access to imx-specific kernel headers
+GST_FSL_PLUGINS_DEPENDENCIES += linux
+GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include"
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11
+GST_FSL_PLUGINS_CONF_OPT += --enable-x11
+else
+GST_FSL_PLUGINS_CONF_OPT += --disable-x11
+endif
+
+# Autoreconf requires an m4 directory to exist
+define GST_FSL_PLUGINS_PATCH_M4
+	mkdir -p $(@D)/m4
+endef
+
+GST_FSL_PLUGINS_POST_PATCH_HOOKS += GST_FSL_PLUGINS_PATCH_M4
+
+$(eval $(autotools-package))

From dfe780994bb7fac4418a931478f732b29a09c34a Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 14 Jan 2013 03:45:05 +0000
Subject: [PATCH 3956/6849] libelementary: only use libethumb if libedbus is
 available.

libelementary uses the ethumb_client library, but that one is only built
if libedbus is available. So fixup the --enable/disable-ethumb according
to the selection of BR2_PACKAGE_LIBEDBUS.

Fixes e.g.
http://autobuild.buildroot.net/results/14ef98da6b0632e24514fef696fae9a650c90c96

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libelementary/libelementary.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index f63f0dc6ff..f20a35d155 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -18,7 +18,9 @@ LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
 LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
 
-ifeq ($(BR2_PACKAGE_LIBETHUMB),y)
+# libethumb_client is only built when ethumbd is built.
+# ethumbd is only built if edbus is built.
+ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
 LIBELEMENTARY_DEPENDENCIES += libethumb
 LIBELEMENTARY_CONF_OPT += --enable-ethumb
 else

From 217ef08a9768221ae02540498ae58e7436801f93 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Jan 2013 04:52:13 +0000
Subject: [PATCH 3957/6849] Integration with Buildroot Toolchain Eclipse plugin

The Eclipse plugin at
https://github.com/mbats/eclipse-buildroot-toolchain-plugin allows
users of Eclipse to easily use the toolchain available in
Buildroot. To do so, this plugin reads
~/.buildroot-eclipse.toolchains, which contains the list of Buildroot
toolchains available on the system, and then offer those toolchains to
compile Eclipse projects.

In order to interface with this plugin, this commit adds an option
that allows the user to tell whether (s)he wants the Buildroot project
toolchain to be visible under this Eclipse plugin. It simply adds a
line in this ~/.buildroot-eclipse.toolchains file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                   |  7 ++++++
 support/scripts/eclipse-register-toolchain | 28 ++++++++++++++++++++++
 toolchain/toolchain-common.in              |  7 ++++++
 3 files changed, 42 insertions(+)
 create mode 100755 support/scripts/eclipse-register-toolchain

diff --git a/Makefile b/Makefile
index f40863247d..1fc51e9cbd 100644
--- a/Makefile
+++ b/Makefile
@@ -347,6 +347,10 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+ifeq ($(BR2_ECLIPSE_REGISTER),y)
+TARGETS+=toolchain-eclipse-register
+endif
+
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
@@ -542,6 +546,9 @@ target-generatelocales: host-localedef
 	done
 endif
 
+toolchain-eclipse-register:
+	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
+
 source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)
 
 external-deps:
diff --git a/support/scripts/eclipse-register-toolchain b/support/scripts/eclipse-register-toolchain
new file mode 100755
index 0000000000..dd9f1587f4
--- /dev/null
+++ b/support/scripts/eclipse-register-toolchain
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+project_directory=$1
+toolchain_prefix=$2
+architecture=$3
+
+TOOLCHAIN_ECLIPSE_FILE=${HOME}/.buildroot-eclipse.toolchains
+
+if test -f ${TOOLCHAIN_ECLIPSE_FILE} ; then
+    mv ${TOOLCHAIN_ECLIPSE_FILE} ${TOOLCHAIN_ECLIPSE_FILE}.tmp
+    cat ${TOOLCHAIN_ECLIPSE_FILE}.tmp | while read toolchain ; do
+	path=$(echo ${toolchain} | cut -f1 -d ':')
+        # Filter lines corresponding to still existing projects
+	echo "Testing ${path} ..."
+	if ! test -d ${path} ; then
+	    continue
+	fi
+	# .. and the current project
+	if test ${path} = ${project_directory} ; then
+	    continue
+	fi
+	echo ${toolchain} >> ${TOOLCHAIN_ECLIPSE_FILE}
+    done
+    rm ${TOOLCHAIN_ECLIPSE_FILE}.tmp
+fi
+
+# Add the toolchain
+echo "${project_directory}:${toolchain_prefix}:${architecture}" >> ${TOOLCHAIN_ECLIPSE_FILE}
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 9f11a3984c..f6905ae231 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -131,3 +131,10 @@ config BR2_TARGET_LDFLAGS
 	string "Target linker options"
 	help
 	  Extra options to pass to the linker when building for the target.
+
+config BR2_ECLIPSE_REGISTER
+	bool "Register toolchain within Eclipse Buildroot plug-in"
+	help
+	  This options tells Buildroot to generate the necessary
+	  configuration files to make your toolchain appear within
+	  Eclipse, through the Eclipse Buildroot plugin.

From d17d1708560ded94587f77e5015d1f966eecae18 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Jan 2013 04:52:14 +0000
Subject: [PATCH 3958/6849] docs/manual: mention the Eclipse integration

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/eclipse-integration.txt | 30 +++++++++++++++++++++++++++++
 docs/manual/working-with.txt        |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 docs/manual/eclipse-integration.txt

diff --git a/docs/manual/eclipse-integration.txt b/docs/manual/eclipse-integration.txt
new file mode 100644
index 0000000000..3d8179fa6a
--- /dev/null
+++ b/docs/manual/eclipse-integration.txt
@@ -0,0 +1,30 @@
+// -*- mode:doc; -*-
+
+Integration with Eclipse
+------------------------
+
+While a part of the embedded Linux developers like classical text
+editors like Vim or Emacs, and command-line based interfaces, a number
+of other embedded Linux developers like richer graphical interfaces to
+do their development work. Eclipse being one of the most popular
+Integrated Development Environment, Buildroot integrates with Eclipse
+in order to ease the development work of Eclipse users.
+
+Our integration with Eclipse simplifies the compilation, remote
+execution and remote debugging of applications and libraries that are
+built on top of a Buildroot system. It does not integrate the
+Buildroot configuration and build processes themselves with
+Eclipse. Therefore, the typical usage model of our Eclipse integration
+would be:
+
+* Configure your Buildroot system with +make menuconfig+, +make
+  xconfig+ or any other configuration interface provided with
+  Buildroot.
+* Build your Buildroot system by running +make+.
+* Start Eclipse to develop, execute and debug your own custom
+  applications and libraries, that will rely on the libraries built
+  and installed by Buildroot.
+
+The Buildroot Eclipse integration installation process and usage is
+described in detail at
+https://github.com/mbats/eclipse-buildroot-bundle/wiki.
diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
index b62bacdcbf..fb6bc40e3b 100644
--- a/docs/manual/working-with.txt
+++ b/docs/manual/working-with.txt
@@ -14,6 +14,8 @@ include::customize.txt[]
 
 include::common-usage.txt[]
 
+include::eclipse-integration.txt[]
+
 Hacking Buildroot
 -----------------
 

From e4d89e7f2de5f2586223466a48d8eefba3b0f216 Mon Sep 17 00:00:00 2001
From: Jan Pedersen <jp@jp-embedded.com>
Date: Mon, 14 Jan 2013 03:30:00 +0000
Subject: [PATCH 3959/6849] infozip: new package

This commit adds a package for infozip, compression and file
packaging/archive utility.

[Peter: fix trailing spaces in help, long line]
Signed-off-by: Jan Pedersen <jp@jp-embedded.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/infozip/Config.in  | 10 ++++++++++
 package/infozip/infozip.mk | 21 +++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/infozip/Config.in
 create mode 100644 package/infozip/infozip.mk

diff --git a/package/Config.in b/package/Config.in
index e19e8b9523..7c49235c9a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -11,6 +11,7 @@ source "package/bzip2/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gzip/Config.in"
 endif
+source "package/infozip/Config.in"
 source "package/lzop/Config.in"
 source "package/lzma/Config.in"
 source "package/xz/Config.in"
diff --git a/package/infozip/Config.in b/package/infozip/Config.in
new file mode 100644
index 0000000000..cfd7533e60
--- /dev/null
+++ b/package/infozip/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_INFOZIP
+	bool "infozip"
+	help
+	  Zip is a compression and file packaging/archive utility.
+	  Although highly compatible both with PKWARE's PKZIP and
+	  PKUNZIP utilities for MS-DOS and with Info-ZIP's own UnZip,
+	  our primary objectives have been portability and
+	  other-than-MSDOS functionality.
+
+	  http://infozip.sourceforge.net/Zip.html
diff --git a/package/infozip/infozip.mk b/package/infozip/infozip.mk
new file mode 100644
index 0000000000..84c4c80a05
--- /dev/null
+++ b/package/infozip/infozip.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# infozip
+#
+#############################################################
+INFOZIP_VERSION = 30
+INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
+INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+INFOZIP_LICENSE = Info-ZIP
+INFOZIP_LICENSE_FILES = LICENSE
+
+define INFOZIP_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile generic
+endef
+
+define INFOZIP_INSTALL_TARGET_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
+		prefix=$(TARGET_DIR)/usr
+endef
+
+$(eval $(generic-package))

From 0a4bd19f4a136930c611027942ce43124a81c5cb Mon Sep 17 00:00:00 2001
From: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Date: Mon, 5 Nov 2012 06:55:26 +0000
Subject: [PATCH 3960/6849] Pass --static rather than -static in LDFLAGS when
 BR2_PREFER_STATIC_LIB

The following changes LDFLAGS from -static to --static if building
with BR2_PREFER_STATIC_LIB so that various components actually build
statically.

Libtool interpret -static as linking statically with libraries that will not
be installed to the libdir; you have to pass it -all-static to force static
linking.  Or, pass --static, which libtool passes on blindly to gcc.  gcc
and (GNU) ld both interpret --static the same as -static (although this
isn't documented).

Signed-off-by: Andy Kennedy <andy.kennedy@adtran.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index cc8f3202c8..038bd9c9cc 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -319,7 +319,7 @@ endif
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared
-TARGET_LDFLAGS += -static
+TARGET_LDFLAGS += --static
 else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif

From 90be89c22f777f77e79cea19b302aa55b7b1913c Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Mon, 10 Dec 2012 07:06:59 +0000
Subject: [PATCH 3961/6849] linux-fusion: don't override CFLAGS/LDFLAGS

Putting $(TARGET_CONFIGURE_OPTS) after $(MAKE) overrides the Makefile's
CFLAGS and LDFLAGS. Some of these flags are required, however. So
instead pass these things in the environment, which allows the Makefile
to append to the flags.

This removes the need for the patch, because now the correct -I options
are added.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../linux-fusion-fix-include.patch            | 52 -------------------
 package/linux-fusion/linux-fusion.mk          |  6 +--
 2 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 package/linux-fusion/linux-fusion-fix-include.patch

diff --git a/package/linux-fusion/linux-fusion-fix-include.patch b/package/linux-fusion/linux-fusion-fix-include.patch
deleted file mode 100644
index fe91488a9a..0000000000
--- a/package/linux-fusion/linux-fusion-fix-include.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix directfb-fusion kernel module build.
-
-This patch avoids the following error occurs:
-
-/usr/bin/make -f scripts/Makefile.build obj=/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion /opt/br/output/host/usr/bin/ccache 
-  /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -Wp,-MD,/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/.fusioncore_impl.o.d
-  -nostdinc -isystem /opt/br/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/include -I/opt/br/output/build/linux-3.6/arch/arm/include 
-  -Iarch/arm/include/generated -Iinclude  -include /opt/br/output/build/linux-3.6/include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Iarch/arm/mach-versatile/include
-  -Iarch/arm/plat-versatile/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/br/output/build/linux-fusion-8.8.1/linux/include -Wall -Wundef 
-  -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -O2 -marm 
-  -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -funwind-tables -D__LINUX_ARM_ARCH__=5 -march=armv5te -mtune=arm9tdmi -msoft-float -Uarm -Wframe-larger-than=1024
-  -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack  -DMODULE
-  -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(fusioncore_impl)"  -D"KBUILD_MODNAME=KBUILD_STR(fusion)" -c -o 
-/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o /opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
-/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c:25:19: fatal error: debug.h: No such file or directory
-compilation terminated.
-make[3]: *** [/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o] Error 1
-make[2]: *** [_module_/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion] Error 2
-make[2]: Leaving directory `/opt/br/output/build/linux-3.6'
-make[1]: *** [modules] Error 2
-make[1]: Leaving directory `/opt/br/output/build/linux-fusion-8.8.1'
-
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
-diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h
---- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h	2012-10-15 21:47:53.881834496 +0200
-+++ linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h	2012-10-15 22:05:27.232401023 +0200
-@@ -17,7 +17,7 @@
- 
- #include <linux/stddef.h>
- 
--#include "fusioncore_impl.h"
-+#include "single/fusioncore_impl.h"
- 
- typedef enum {
-      FC_OK,
-diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
---- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c	2012-10-15 21:47:53.878501243 +0200
-+++ linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c	2012-10-15 22:05:38.585511304 +0200
-@@ -22,9 +22,9 @@
- #include <linux/slab.h>
- #include <linux/sched.h>
- 
--#include "debug.h"
-+#include "../debug.h"
- 
--#include "fusioncore.h"
-+#include "../fusioncore.h"
- 
- 
- 
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 631f526887..5ea7900f1c 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -22,15 +22,15 @@ LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS)
 LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)/kernel
 
 define LINUX_FUSION_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(LINUX_FUSION_MAKE_OPTS) -C $(@D)
 endef
 
 define LINUX_FUSION_INSTALL_STAGING_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install
 endef
 
 define LINUX_FUSION_INSTALL_TARGET_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
 		$(LINUX_FUSION_MAKE_OPTS) \
 		INSTALL_MOD_PATH=$(TARGET_DIR) \
 		-C $(@D) install

From b6b9d86a3e96601aef02f0f1c8d26acd5372954b Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Mon, 17 Dec 2012 21:52:46 +0000
Subject: [PATCH 3962/6849] wpa-supplicant: add options to enable the new DBus
 interface

Allow to configure the DBus interfaces that the wpa_supplicant
binary should support (old or new or both). Also allow to
enable introspection support on the new DBus interface.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (build-test with all features enabled)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/Config.in         | 19 +++++++++++
 package/wpa_supplicant/wpa_supplicant.mk | 42 +++++++++++++++++++++---
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index d7cefe3cb6..8b0b366936 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -30,6 +30,25 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
 	  (optionally, with WPS); this links in parts of hostapd functionality
 	  into wpa_supplicant.
 
+config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD
+	bool "Enable support for old DBus control interface"
+	depends on BR2_PACKAGE_DBUS
+	help
+	  Enable support for old DBus control interface
+	  (fi.epitest.hostap.WPASupplicant).
+
+config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW
+	bool "Enable support for new DBus control interface"
+	depends on BR2_PACKAGE_DBUS
+	help
+	  Enable support for new DBus control interface (fi.w1.wpa_supplicant1).
+
+config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION
+	bool "Introspection support"
+	depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW
+	help
+	  Add introspection support for new DBus control interface.
+
 config BR2_PACKAGE_WPA_SUPPLICANT_WPS
 	bool "Enable support for WPS"
 	help
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 3830d6549e..02ca125604 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -10,7 +10,8 @@ WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
 WPA_SUPPLICANT_LICENSE_FILES = README
 WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
 WPA_SUPPLICANT_SUBDIR = wpa_supplicant
-WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant
+WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant
+WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1
 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
 WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS)
 
@@ -77,9 +78,41 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 	WPA_SUPPLICANT_MAKE_ENV = \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)"	\
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
-define WPA_SUPPLICANT_DBUS_CONFIG
+
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)
+define WPA_SUPPLICANT_DBUS_OLD_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_CTRL_IFACE_DBUS=\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
+define WPA_SUPPLICANT_INSTALL_DBUS_OLD
+	$(INSTALL) -D \
+	  $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service \
+	  $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW),y)
+define WPA_SUPPLICANT_DBUS_NEW_CONFIG
+	$(SED) 's/\(#\)\(CONFIG_CTRL_IFACE_DBUS_NEW=\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+endef
+define WPA_SUPPLICANT_INSTALL_DBUS_NEW
+	$(INSTALL) -D \
+	  $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \
+	  $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y)
+define WPA_SUPPLICANT_DBUS_INTROSPECTION_CONFIG
+	$(SED) 's/\(#\)\(CONFIG_CTRL_IFACE_DBUS_INTRO=\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+endef
+endif
+
+define WPA_SUPPLICANT_DBUS_CONFIG
+	$(WPA_SUPPLICANT_DBUS_OLD_CONFIG)
+	$(WPA_SUPPLICANT_DBUS_NEW_CONFIG)
+	$(WPA_SUPPLICANT_DBUS_INTROSPECTION_CONFIG)
+endef
+
 endif
 
 define WPA_SUPPLICANT_CONFIGURE_CMDS
@@ -124,9 +157,8 @@ define WPA_SUPPLICANT_INSTALL_DBUS
 	$(INSTALL) -D \
 	  $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
 	  $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
-	$(INSTALL) -D \
-	  $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \
-	  $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
+	$(WPA_SUPPLICANT_INSTALL_DBUS_OLD)
+	$(WPA_SUPPLICANT_INSTALL_DBUS_NEW)
 endef
 endif
 

From 73f7994e53e5a3e1749b29bec4c0922b60885c04 Mon Sep 17 00:00:00 2001
From: Charles Manning <cdhmanning@gmail.com>
Date: Sun, 2 Dec 2012 15:06:31 +0000
Subject: [PATCH 3963/6849] Allow selection of individual Liberation font sets

We don't always want all the font sets on small systems.

[Peter: cleanup Config.in, ensure target dir gets created first]
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liberation/Config.in     | 15 +++++++++++++++
 package/liberation/liberation.mk | 22 +++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/package/liberation/Config.in b/package/liberation/Config.in
index 48d4195bac..b68166f638 100644
--- a/package/liberation/Config.in
+++ b/package/liberation/Config.in
@@ -5,3 +5,18 @@ config BR2_PACKAGE_LIBERATION
 	  three most commonly used fonts on Microsoft systems:
 	  Times New Roman, Arial, and Courier New.
 
+if BR2_PACKAGE_LIBERATION
+
+config BR2_PACKAGE_LIBERATION_MONO
+	bool "mono fonts"
+	default y
+
+config BR2_PACKAGE_LIBERATION_SANS
+	bool "sans fonts"
+	default y
+
+config BR2_PACKAGE_LIBERATION_SERIF
+	bool "serif fonts"
+	default y
+
+endif
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index 7d556501b4..363d327e79 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -9,9 +9,29 @@ LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
 
 LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation
 
+ifeq ($(BR2_PACKAGE_LIBERATION_MONO),y)
+define LIBERATION_INSTALL_MONO
+	$(INSTALL) -m 644 $(@D)/LiberationMono*.ttf $(LIBERATION_TARGET_DIR)
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_LIBERATION_SANS),y)
+define LIBERATION_INSTALL_SANS
+	$(INSTALL) -m 644 $(@D)/LiberationSans*.ttf $(LIBERATION_TARGET_DIR)
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_LIBERATION_SERIF),y)
+define LIBERATION_INSTALL_SERIF
+	$(INSTALL) -m 644 $(@D)/LiberationSerif*.ttf $(LIBERATION_TARGET_DIR)
+endef
+endif
+
 define LIBERATION_INSTALL_TARGET_CMDS
 	mkdir -p $(LIBERATION_TARGET_DIR)
-	$(INSTALL) -m 644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR)
+	$(LIBERATION_INSTALL_MONO)
+	$(LIBERATION_INSTALL_SANS)
+	$(LIBERATION_INSTALL_SERIF)
 endef
 
 define LIBERATION_CLEAN_CMDS

From d671715c109eb3c237ed925d5a0971d2eae89362 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 14 Jan 2013 10:37:12 +0000
Subject: [PATCH 3964/6849] eclipse support: document script and add checks

As requested by Peter, add a bit of documentation in the
eclipse-register-toolchain script, and add a few more checks (even
though this script is not intended to be executed manually, which is
also now mentionned in the documentation).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/eclipse-register-toolchain | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/support/scripts/eclipse-register-toolchain b/support/scripts/eclipse-register-toolchain
index dd9f1587f4..6f919985c0 100755
--- a/support/scripts/eclipse-register-toolchain
+++ b/support/scripts/eclipse-register-toolchain
@@ -1,11 +1,59 @@
 #!/bin/sh
 
+# This script registers the toolchain of a Buildroot project into the
+# Eclipse plugin. To do so, it adds a new line for the Buildroot
+# toolchain into the $HOME/.buildroot-eclipse.toolchains file, which
+# the Eclipse Buildroot plugin reads to discover automatically the
+# available Buildroot toolchains on the system.
+#
+# This script should typically not be called manually. Instead, one
+# should enable the BR2_ECLIPSE_REGISTER configuration option, which
+# will lead Buildroot to automatically call this script with the
+# appropriate arguments.
+#
+# Usage:
+#  eclipse-register-toolchain project-directory toolchain-prefix architecture
+#
+#   project-directory is the absolute path to the Buildroot project
+#   output directory (which contains the host/, target/, build/,
+#   images/, etc. subdirectories). It should be an absolute and
+#   canonical path.
+#
+#   toolchain-prefix is the prefix of the cross-compilation tools, i.e
+#   'arm-linux-' if the cross-compiler executable is 'arm-linux-gcc'.
+#
+#   architecture is the lower-cased name of the architecture targetted
+#   by the Buildroot project.
+
+if test $# -ne 3; then
+    echo "Invalid number of arguments."
+    echo "Usage: $0 project-directory toolchain-prefix architecture"
+    exit 1
+fi
+
 project_directory=$1
 toolchain_prefix=$2
 architecture=$3
 
+if test ! -d ${project_directory} ; then
+    echo "Non-existing project directory ${project_directory}"
+    exit 1
+fi
+
+if test ! -d ${project_directory}/host ; then
+    echo "Your project directory does not look like a Buildroot output"
+    exit 1
+fi
+
+if test ! -e ${project_directory}/host/usr/bin/${toolchain_prefix}gcc ; then
+    echo "Cannot find the cross-compiler in the project directory"
+    exit 1
+fi
+
 TOOLCHAIN_ECLIPSE_FILE=${HOME}/.buildroot-eclipse.toolchains
 
+# First, we remove all lines from the ${TOOLCHAIN_ECLISPE_FILE} that
+# correspond to toolchains that no longer exist.
 if test -f ${TOOLCHAIN_ECLIPSE_FILE} ; then
     mv ${TOOLCHAIN_ECLIPSE_FILE} ${TOOLCHAIN_ECLIPSE_FILE}.tmp
     cat ${TOOLCHAIN_ECLIPSE_FILE}.tmp | while read toolchain ; do

From 72df08ee45dbe32e90eecdb763cdb98c6dd59e99 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@>
Date: Tue, 30 Oct 2012 03:35:19 +0000
Subject: [PATCH 3965/6849] curlftpfs: new package

[Peter: updated with BR changes, Config.in tweaks, dropped configure.ac patch]
Signed-off-by: Richard Braun <rbraun@...>
Signed-off-by: Alexander Varnin <fenixk19@mail.ru>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/curlftpfs/Config.in                   | 20 +++++++
 ...curlftpfs-000-fix-CURLOPT_INFILESIZE.patch | 13 ++++
 ...tpfs-001-free_ftpfs_file-memleak-fix.patch | 14 +++++
 .../curlftpfs-002-nocache-memleak-fix.patch   | 59 +++++++++++++++++++
 package/curlftpfs/curlftpfs.mk                | 14 +++++
 6 files changed, 121 insertions(+)
 create mode 100644 package/curlftpfs/Config.in
 create mode 100644 package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch
 create mode 100644 package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch
 create mode 100644 package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch
 create mode 100644 package/curlftpfs/curlftpfs.mk

diff --git a/package/Config.in b/package/Config.in
index 7c49235c9a..42cde075e4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -185,6 +185,7 @@ endmenu
 menu "Filesystem and flash utilities"
 source "package/cifs-utils/Config.in"
 source "package/cramfs/Config.in"
+source "package/curlftpfs/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/flashbench/Config.in"
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
new file mode 100644
index 0000000000..e946d0a73a
--- /dev/null
+++ b/package/curlftpfs/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_CURLFTPFS
+	bool "curlftpfs (FUSE)"
+	select BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBCURL
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
+	help
+	  CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE
+	  and libcurl.
+
+	  http://curlftpfs.sourceforge.net/
+
+comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR and threads support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch b/package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch
new file mode 100644
index 0000000000..dc83af010b
--- /dev/null
+++ b/package/curlftpfs/curlftpfs-000-fix-CURLOPT_INFILESIZE.patch
@@ -0,0 +1,13 @@
+Borrowed from the curlftpfs_0.9.2-5 Debian package.
+
+CURLOPT_INFILESIZE does not support -1 arg. This fix bug #556012.
+--- curlftpfs-0.9.2/ftpfs.c.old	2009-12-13 14:12:25.000000000 +0100
++++ curlftpfs-0.9.2/ftpfs.c	2009-12-13 14:12:32.000000000 +0100
+@@ -503,7 +503,6 @@
+   
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1);
+-  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1);
diff --git a/package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch b/package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch
new file mode 100644
index 0000000000..4966c9dcfb
--- /dev/null
+++ b/package/curlftpfs/curlftpfs-001-free_ftpfs_file-memleak-fix.patch
@@ -0,0 +1,14 @@
+Borrowed from the curlftpfs_0.9.2-5 Debian package.
+
+Fix a memory leak. See Bug #587250.
+--- a/ftpfs.c	2008-04-30 01:05:47.000000000 +0200
++++ a/ftpfs.c.slesimple	2010-01-01 22:12:10.000000000 +0100
+@@ -615,6 +615,8 @@ static void free_ftpfs_file(struct ftpfs
+   sem_destroy(&fh->data_need);
+   sem_destroy(&fh->data_written);
+   sem_destroy(&fh->ready);
++  if (fh->buf.size) { buf_free(&fh->buf); }
++  if (fh->stream_buf.size) { buf_free(&fh->stream_buf); }
+   free(fh);
+ }
+ 
diff --git a/package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch b/package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch
new file mode 100644
index 0000000000..00a4dd64fd
--- /dev/null
+++ b/package/curlftpfs/curlftpfs-002-nocache-memleak-fix.patch
@@ -0,0 +1,59 @@
+Borrowed from the curlftpfs_0.9.2-5 Debian package.
+
+Fix a memory leak when cache is disabled. Closes: #614347.
+diff -ur curlftpfs-0.9.2/cache.c curlftpfs-0.9.2-olexat/cache.c
+--- curlftpfs-0.9.2/cache.c	2008-04-30 01:03:09.000000000 +0200
++++ curlftpfs-0.9.2-olexat/cache.c	2011-02-04 16:43:05.000000000 +0100
+@@ -25,7 +25,7 @@
+     time_t last_cleaned;
+ };
+ 
+-static struct cache cache;
++struct cache cache;
+ 
+ struct node {
+     struct stat stat;
+diff -ur curlftpfs-0.9.2/ftpfs-ls.c curlftpfs-0.9.2-olexat/ftpfs-ls.c
+--- curlftpfs-0.9.2/ftpfs-ls.c	2008-04-23 12:55:41.000000000 +0200
++++ curlftpfs-0.9.2-olexat/ftpfs-ls.c	2011-02-07 17:23:37.000000000 +0100
+@@ -25,6 +25,13 @@
+ #include "charset_utils.h"
+ #include "ftpfs-ls.h"
+ 
++struct cache {
++    int on;
++    char incomplete[];
++};
++
++extern struct cache cache;
++
+ static int parse_dir_unix(const char *line,
+                           struct stat *sbuf,
+                           char *file,
+@@ -243,8 +256,10 @@
+           reallink = g_strdup(link);
+         }
+         int linksize = strlen(reallink);
+-        cache_add_link(full_path, reallink, linksize+1);
+-        DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink);
++        if (cache.on) {
++          cache_add_link(full_path, reallink, linksize+1);
++          DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink);
++        }
+         if (linkbuf && linklen) {
+           if (linksize > linklen) linksize = linklen - 1;
+           strncpy(linkbuf, reallink, linksize);
+@@ -257,8 +272,10 @@
+         DEBUG(1, "filler: %s\n", file);
+         filler(h, file, &stat_buf);
+       } else {
+-        DEBUG(1, "cache_add_attr: %s\n", full_path);
+-        cache_add_attr(full_path, &stat_buf);
++        if (cache.on) {
++          DEBUG(1, "cache_add_attr: %s\n", full_path);
++          cache_add_attr(full_path, &stat_buf);
++        }
+       }
+ 
+       DEBUG(2, "comparing %s %s\n", name, file);
+
diff --git a/package/curlftpfs/curlftpfs.mk b/package/curlftpfs/curlftpfs.mk
new file mode 100644
index 0000000000..c7d04aeea9
--- /dev/null
+++ b/package/curlftpfs/curlftpfs.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# curlftpfs
+#
+#############################################################
+
+CURLFTPFS_VERSION = 0.9.2
+CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION)
+CURLFTPFS_DEPENDENCIES = \
+	libglib2 libfuse openssl libcurl \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(if $(BR2_ENABLE_LOCALE),,libiconv)
+
+$(eval $(autotools-package))

From 413dcfdcf6d4df80626aebe6be13648773ace707 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Mon, 26 Nov 2012 12:49:42 +0000
Subject: [PATCH 3966/6849] xtensa: disable package strace for Xtensa

The current version of strace does not support the Xtensa architecture.

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/strace/Config.in b/package/strace/Config.in
index bbb582ad53..4b203778ef 100644
--- a/package/strace/Config.in
+++ b/package/strace/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_STRACE
 	bool "strace"
+	depends on !BR2_xtensa
 	help
 	  A useful diagnostic, instructional, and debugging tool.
 	  Allows you to track what system calls a program makes

From a066f31a05bb8a357b04269011de5995d81f53df Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 23:06:42 +0100
Subject: [PATCH 3967/6849] minicom: uses fork()

Fixes http://autobuild.buildroot.org/results/83db7c1e6edcfae7edd220a9accb99cb96649feb

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/minicom/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/minicom/Config.in b/package/minicom/Config.in
index a8a2635382..8bbb2b3f3a 100644
--- a/package/minicom/Config.in
+++ b/package/minicom/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MINICOM
 	bool "minicom"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_NCURSES
 	help

From 6ff753f2a8f3f716eb338eb4070fb936118dc129 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 14 Jan 2013 23:44:54 +0100
Subject: [PATCH 3968/6849] mcrypt: rediff CVE-2012-4527 to fix issue with old
 patch versions

Fixes http://autobuild.buildroot.org/results/e648bfb37051c3b73712d2c7881193e9376f2812/

patch 2.5.9 (but not E.G. 2.6.1) had problems with the upstream CVE patch,
so rediff it to make it work.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mcrypt/mcrypt-CVE-2012-4527.patch | 49 +++++++++--------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/package/mcrypt/mcrypt-CVE-2012-4527.patch b/package/mcrypt/mcrypt-CVE-2012-4527.patch
index a287680958..a8cf6f449a 100644
--- a/package/mcrypt/mcrypt-CVE-2012-4527.patch
+++ b/package/mcrypt/mcrypt-CVE-2012-4527.patch
@@ -1,32 +1,23 @@
-Description: [CVE-2012-4527] Stack-based buffer overflow with long file names
- .
- A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames.
- If a user were tricked into attempting to encrypt/decrypt specially crafted
- long filename(s), this flaw would cause a stack-based buffer overflow that
- could potentially lead to arbitrary code execution.
- .
- Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only
- bug on wheezy.
-Author: Attila Bogar, Jean-Michel Vourgère <jmv_deb@nirgal.com>
-Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527
-Bug: CVE-2012-4527
-Bug-Debian: http://bugs.debian.org/690924
-Forwarded: no
-Last-Update: 2012-11-01
-Index: mcrypt-2.6.8/src/mcrypt.c
-===================================================================
---- mcrypt-2.6.8.orig/src/mcrypt.c
-+++ mcrypt-2.6.8/src/mcrypt.c
-@@ -41,4 +41,6 @@
+Fix for CVE-2012-4527.
+Authored by Attila Bogar and Jean-Michel Vourgère <jmv_deb@nirgal.com>
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura mcrypt-2.6.8.orig/src/mcrypt.c mcrypt-2.6.8/src/mcrypt.c
+--- mcrypt-2.6.8.orig/src/mcrypt.c	2013-01-14 19:15:49.465925072 -0300
++++ mcrypt-2.6.8/src/mcrypt.c	2013-01-14 19:28:13.711478000 -0300
+@@ -44,7 +44,9 @@
+ static char rcsid[] =
+     "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $";
  
+-char tmperr[128];
 +/* Temporary error message can contain one file name and 1k of text */
 +#define ERRWIDTH ((PATH_MAX)+1024)
--char tmperr[128];
 +char tmperr[ERRWIDTH];
  unsigned int stream_flag = FALSE;
  char *keymode = NULL;
  char *mode = NULL;
-@@ -482,7 +485,7 @@
+@@ -482,7 +484,7 @@
  #ifdef HAVE_STAT
        if (stream_flag == FALSE) {
  	 if (is_normal_file(file[i]) == FALSE) {
@@ -35,7 +26,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  		    _
  		    ("%s: %s is not a regular file. Skipping...\n"),
  		    program_name, file[i]);
-@@ -501,7 +504,7 @@
+@@ -501,7 +503,7 @@
  	    dinfile = file[i];
  	 if ((isatty(fileno((FILE *) (stdin))) == 1)
  	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
@@ -44,7 +35,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  		    _
  		    ("%s: Encrypted data will not be read from a terminal.\n"),
  		    program_name);
-@@ -520,7 +523,7 @@
+@@ -520,7 +522,7 @@
  	    einfile = file[i];
  	 if ((isatty(fileno((FILE *) (stdout))) == 1)
  	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
@@ -53,7 +44,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  		    _
  		    ("%s: Encrypted data will not be written to a terminal.\n"),
  		    program_name);
-@@ -544,7 +547,7 @@
+@@ -544,7 +546,7 @@
  	    strcpy(outfile, einfile);
  	    /* if file has already the .nc ignore it */
  	    if (strstr(outfile, ".nc") != NULL) {
@@ -62,7 +53,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  		       _
  		       ("%s: file %s has the .nc suffix... skipping...\n"),
  		       program_name, outfile);
-@@ -590,10 +593,10 @@
+@@ -590,10 +592,10 @@
  
  	 if (x == 0) {
  	    if (stream_flag == FALSE) {
@@ -75,7 +66,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  	       err_warn(tmperr);
  	    }
  #ifdef HAVE_STAT
-@@ -610,7 +613,7 @@
+@@ -610,7 +612,7 @@
  
  	 } else {
  	    if (stream_flag == FALSE) {
@@ -84,7 +75,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  		       _
  		       ("File %s was NOT decrypted successfully.\n"),
  		       dinfile);
-@@ -636,10 +639,10 @@
+@@ -636,10 +638,10 @@
  
  	 if (x == 0) {
  	    if (stream_flag == FALSE) {
@@ -97,7 +88,7 @@ Index: mcrypt-2.6.8/src/mcrypt.c
  	       err_warn(tmperr);
  	    }
  #ifdef HAVE_STAT
-@@ -655,7 +658,7 @@
+@@ -655,7 +657,7 @@
  
  	 } else {
  	    if (stream_flag == FALSE) {

From 9fce375dfc7d2040d10925e78286708576334f93 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Thu, 27 Dec 2012 22:04:45 +0000
Subject: [PATCH 3969/6849] webkit: fix compilation without X11

Fixes:
 http://autobuild.buildroot.net/results/86534588d192fe1515ce520c109e884864871d94/
and others.

Webkit includes X11 headers even when configuerd for DirecfFB, because
the test within GNUmakefile.in does not work properly. Autoreconfigure
fails because of incompatibility with buildroot's autotools version.

For now a patch for GNUmakefile.in fixes this problem.

Since webkit release is quite old it doesn't seem to be worth doing more,
on the long run we should bump the version.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...webkit-fix-compilation-on-DirectFB-2.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch

diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
new file mode 100644
index 0000000000..a15226e1bf
--- /dev/null
+++ b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
@@ -0,0 +1,33 @@
+From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001
+From: Stephan Hoffmann <sho@relinux.de>
+Date: Thu, 27 Dec 2012 18:08:29 +0100
+Subject: [PATCH] Fix test for presence of X11
+
+The test in GNUmakefile.in checking for presence of X11 and
+enabling the XP_UNIX define succeeds even when X11 is not
+present and Webkit is built for DirectFB.
+
+Because of this X11-headers are included and the build fails.
+
+Signed-off-by: Stephan Hoffmann <sho@relinux.de>
+---
+ GNUmakefile.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index f14f27b..3ac811f 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -88,7 +88,8 @@ noinst_PROGRAMS = Programs/minidom$(EXEEXT) \
+ 	$(am__EXEEXT_1)
+ 
+ # For the Gtk port we want to use XP_UNIX both in X11 and Mac
+-@TARGET_WIN32_FALSE@am__append_1 = -DXP_UNIX
++@TARGET_X11_TRUE@am__append_1 = -DXP_UNIX
++@TARGET_QUARTZ_TRUE@am__append_1 = -DXP_UNIX
+ @USE_ICU_UNICODE_TRUE@am__append_2 = \
+ @USE_ICU_UNICODE_TRUE@	-DWTF_USE_ICU_UNICODE=1
+ 
+-- 
+1.7.0.4
+

From d3222862f62ebe80c0cb4b680e6fb46c03cc5706 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 14 Jan 2013 13:55:37 +0000
Subject: [PATCH 3970/6849] package/tvheadend: requires IPv6

Fixes autobuild failure:
    http://autobuild.buildroot.org/results/40cc7428b25afe3cddae50ec2098ee43127a2f41/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index e6dee3afa7..67badce0a0 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -1,9 +1,9 @@
-comment "tvheadend requires a toolchain with LARGEFILE support"
-    depends on !BR2_LARGEFILE
+comment "tvheadend requires a toolchain with LARGEFILE and IPv6 support"
+    depends on !BR2_LARGEFILE || !BR2_INET_IPV6
 
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
-	depends on BR2_LARGEFILE
+	depends on BR2_LARGEFILE && BR2_INET_IPV6
 	select BR2_PACKAGE_DVB_APPS
 	select BR2_PACKAGE_OPENSSL
 	help

From 96f6054ccd7edc9add815d44720563c998eca088 Mon Sep 17 00:00:00 2001
From: Gilles Talis <gilles.talis@gmail.com>
Date: Mon, 14 Jan 2013 13:32:07 +0000
Subject: [PATCH 3971/6849] httping: new package

Httping is like 'ping' but for http-requests.
Give it an url, and it'll show you how long it takes to connect,
send a request and retrieve the reply (only the headers)

[Peter: Drop ssl option, use make install, misc cleanup]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/httping/Config.in                     | 17 ++++++
 package/httping/httping-override-cflags.patch | 53 +++++++++++++++++++
 package/httping/httping.mk                    | 29 ++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 package/httping/Config.in
 create mode 100644 package/httping/httping-override-cflags.patch
 create mode 100644 package/httping/httping.mk

diff --git a/package/Config.in b/package/Config.in
index 42cde075e4..c59f342ba3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -631,6 +631,7 @@ source "package/ethtool/Config.in"
 source "package/heirloom-mailx/Config.in"
 source "package/hiawatha/Config.in"
 source "package/hostapd/Config.in"
+source "package/httping/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
 endif
diff --git a/package/httping/Config.in b/package/httping/Config.in
new file mode 100644
index 0000000000..dca68f3b53
--- /dev/null
+++ b/package/httping/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_HTTPING
+       bool "httping"
+       help
+         Httping is like 'ping' but for http-requests.
+         Give it an url, and it'll show you how long it takes to connect,
+         send a request and retrieve the reply (only the headers).
+         Be aware that the transmission across the network also takes time!
+         So it measures the latency of the webserver + network.
+
+         http://www.vanheusden.com/httping/
+
+if BR2_PACKAGE_HTTPING
+
+config BR2_PACKAGE_HTTPING_TFO
+       bool "TCP Fast Open (TFO) support"
+
+endif
diff --git a/package/httping/httping-override-cflags.patch b/package/httping/httping-override-cflags.patch
new file mode 100644
index 0000000000..a3cf59d3c2
--- /dev/null
+++ b/package/httping/httping-override-cflags.patch
@@ -0,0 +1,53 @@
+From 66f5811dd45fa27a7bfacf946dfefd16d765bb4d Mon Sep 17 00:00:00 2001
+From: Gilles Talis <gilles.talis@gmail.com>
+Date: Mon, 14 Jan 2013 11:48:00 -0800
+Subject: [PATCH] allow CFLAGS/LDFLAGS to be overriden from command line
+
+Ensure required CFLAGS/LDFLAGS are appended to those provided in command line
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ Makefile |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4c4f6a8..fdbb4cb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ TARGET=httping
+ DEBUG=yes
+ WFLAGS=-Wall -W
+ OFLAGS=-O3
+-CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
++override CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
+
+ PACKAGE=$(TARGET)-$(VERSION)
+ PREFIX=/usr
+@@ -48,19 +48,19 @@ DOCS=license.txt license.OpenSSL readme.txt
+ # TFO=yes
+
+ ifeq ($(SSL),no)
+-CFLAGS+=-DNO_SSL
++override CFLAGS+=-DNO_SSL
+ else
+ OBJS+=mssl.o
+-LDFLAGS+=-lssl -lcrypto
++override LDFLAGS+=-lssl -lcrypto
+ endif
+
+ ifeq ($(TFO),yes)
+-CFLAGS+=-DTCP_TFO
++override CFLAGS+=-DTCP_TFO
+ endif
+
+ ifeq ($(DEBUG),yes)
+-CFLAGS+=-D_DEBUG -ggdb
+-LDFLAGS+=-g
++override CFLAGS+=-D_DEBUG -ggdb
++override LDFLAGS+=-g
+ endif
+
+ ifeq ($(ARM),yes)
+--
+1.7.4.1
+
diff --git a/package/httping/httping.mk b/package/httping/httping.mk
new file mode 100644
index 0000000000..3ec1dae4ff
--- /dev/null
+++ b/package/httping/httping.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# httping
+#
+#############################################################
+
+HTTPING_VERSION = 1.5.7
+HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
+HTTPING_SITE = http://www.vanheusden.com/httping
+HTTPING_LICENSE = GPLv2
+HTTPING_LICENSE_FILES = license.txt
+HTTPING_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
+
+define HTTPING_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
+		TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
+		DEBUG=no -C $(@D)
+endef
+
+define HTTPING_INSTALL_TARGET_CMDS
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+define HTTPING_CLEAN_CMDS
+       $(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 2a78641583aa396dce64c00e1a3009796295d23c Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 14 Jan 2013 22:02:00 +0000
Subject: [PATCH 3972/6849] Makefile: rename cross target -> toolchain

- Use a more descriptive name, the same of the "toolchain" directory.
- Add missing dependencies to be able to successfully use the target
  right after the configuration.
- Move to a better position.
- Documentation it in the help target.
- Use toolchain target in the world target

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: Markos Chandras <markos.chandras at imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Acked-by: Samuel Martin <s.martin49 at gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1fc51e9cbd..6f8ed0e296 100644
--- a/Makefile
+++ b/Makefile
@@ -392,9 +392,11 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG)
 
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
-world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
+toolchain: prepare dirs dependencies $(BASE_TARGETS)
 
-.PHONY: all world dirs clean distclean source outputmakefile \
+world: toolchain $(TARGETS_ALL)
+
+.PHONY: all world toolchain dirs clean distclean source outputmakefile \
 	legal-info legal-info-prepare legal-info-clean \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
@@ -715,8 +717,6 @@ ifeq ($(O),output)
 endif
 	rm -rf $(BUILDROOT_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps
 
-cross: $(BASE_TARGETS)
-
 help:
 	@echo 'Cleaning:'
 	@echo '  clean                  - delete all files created by build'
@@ -724,6 +724,7 @@ help:
 	@echo
 	@echo 'Build:'
 	@echo '  all                    - make world'
+	@echo '  toolchain              - build toolchain'
 	@echo '  <package>-rebuild      - force recompile <package>'
 	@echo '  <package>-reconfigure  - force reconfigure <package>'
 	@echo

From 87dfeb10ad8aa0c52b20cd1baa05f7403656ca98 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 15 Jan 2013 00:45:26 +0000
Subject: [PATCH 3973/6849] boost: fix build problem by always building a
 threaded version

Boost normally allows to build a non-threaded variant by passing
threading=single or a multi-threaded variant by passing
threading=multi.

Unfortunately, the build of threading=single doesn't seem to work any
more, due to bizarre things in the build system. We get "duplicate
target" errors, that according to
http://lists.boost.org/boost-build/2012/11/26582.php should appear if
we ask for both threading=single,multi. But it seems to happen even in
the threading=single case.

Since Boost is such a big C++ beast, it probably doesn't make much
sense to try to support it on toolchains that don't have thread
support. So, we make the boost package depend on thread support. If
someone cares enough in getting Boost to work in a non-threaded
environment, then we can always revert back.

Note that the boost package has no reverse dependencies in Buildroot,
so we don't need to propagate this new dependency anywhere.

Fixes:

  http://autobuild.buildroot.org/results/439e72ac74c8058f30977e6abc39acd6379a17d3/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 15 ++++++---------
 package/boost/boost.mk  |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index fb5360ecf4..19dcc6044b 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -1,10 +1,14 @@
-comment "boost requires a toolchain with C++ and large file support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
+comment "boost requires a toolchain with C++, large file and thread support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_BOOST
 	bool "boost"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_LARGEFILE
+	# Boost could theorically be built with threading=single, but
+	# that unfortunately doesn't work. Until someone fixes that,
+	# let's depend on threads.
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_ZLIB
 	help
@@ -14,12 +18,6 @@ config BR2_PACKAGE_BOOST
 
 if BR2_PACKAGE_BOOST
 
-config BR2_PACKAGE_BOOST_MULTITHREADED
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	bool "boost-multithreaded"
-	help
-	  Build the boost libraries as multithreaded
-
 config BR2_PACKAGE_BOOST_CHRONO
 	bool "boost-chrono"
 
@@ -76,7 +74,6 @@ config BR2_PACKAGE_BOOST_TEST
 	bool "boost-test"
 
 config BR2_PACKAGE_BOOST_THREAD
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	bool "boost-thread"
 
 config BR2_PACKAGE_BOOST_TIMER
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 005c7ca754..62226ba227 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -46,10 +46,10 @@ BOOST_FLAGS += --without-icu
 endif
 
 BOOST_OPT += toolset=gcc \
+	     threading=multi \
 	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
 	     link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
-	     runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
-	     threading=$(if $(BR2_PACKAGE_BOOST_MULTITHREADED),multi,single)
+	     runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared)
 
 ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)

From ea9ed43045851fda2f12e21d89800ffa643564a2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 15 Jan 2013 00:45:27 +0000
Subject: [PATCH 3974/6849] boost: slightly reduce the verbosity of the build

At the moment, the boost build is very verbose, it gives both the
Jam-level command being executed, and the underlying system command
being executed, with lots of newlines. Makes it hard to see where the
failure is when there is one.

So, we reduce the verbosity level to -d+1, which only gives the
Jam-level command. So now, it looks like:

common.copy /home/test/outputs/e/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/boost/geometry/multi/multi.hpp
common.mkdir /home/test/outputs/e/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/boost/geometry/strategies
gcc.compile.c++ bin.v2/libs/regex/build/gcc-4.7.3/release/threading-multi/icu.o
gcc.compile.c++ bin.v2/libs/regex/build/gcc-4.7.3/release/threading-multi/regex_debug.o
gcc.compile.c++ bin.v2/libs/regex/build/gcc-4.7.3/release/threading-multi/regex_raw_buffer.o

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 62226ba227..5e1bb4e248 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -70,7 +70,7 @@ define BOOST_CONFIGURE_CMDS
 endef
 
 define BOOST_INSTALL_TARGET_CMDS
-	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+2 \
+	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
 	--user-config=$(@D)/user-config.jam \
 	$(BOOST_OPT) \
 	--prefix=$(TARGET_DIR)/usr \
@@ -78,7 +78,7 @@ define BOOST_INSTALL_TARGET_CMDS
 endef
 
 define BOOST_INSTALL_STAGING_CMDS
-	(cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+2 \
+	(cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+1 \
 	--user-config=$(@D)/user-config.jam \
 	$(BOOST_OPT) \
 	--prefix=$(STAGING_DIR)/usr \

From afa677453987175d073f803dddfadc9b36dceef4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 15 Jan 2013 00:45:28 +0000
Subject: [PATCH 3975/6849] gmp: fix build on AArch64

Include an upstream patch to fix the build problem on AArch64.

Fixes:

 http://autobuild.buildroot.org/results/1fb1b3678277e6b0cef220405c54ffb8299c9da1/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._ssaaaa-and-sub_ddmmss-actually-work.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch

diff --git a/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch b/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch
new file mode 100644
index 0000000000..1b835a569c
--- /dev/null
+++ b/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1357413121 -3600
+# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
+# Parent  87a24013e9ee2cabf74e32282c18584a2c669009
+(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
+
+Taken upstream from http://gmplib.org:8000/gmp/rev/187b7b1646ee.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
+--- a/longlong.h	Fri Jan 04 16:32:01 2013 +0100
++++ b/longlong.h	Sat Jan 05 20:12:01 2013 +0100
+@@ -530,23 +530,16 @@
+ #endif /* __arm__ */
+ 
+ #if defined (__aarch64__) && W_TYPE_SIZE == 64
++/* FIXME: Extend the immediate range for the low word by using both
++   ADDS and SUBS, since they set carry in the same way.  */
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+-  __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
++  __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3"			\
+ 	   : "=r" (sh), "=&r" (sl)					\
+-	   : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
++	   : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+-  do {									\
+-    if (__builtin_constant_p (bl))					\
+-      {									\
+-	__asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
+-		 : "=r" (sh), "=&r" (sl)				\
+-		 : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
+-      }									\
+-    else /* only bh might be a constant */				\
+-      __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
+-	       : "=r" (sh), "=&r" (sl)					\
+-	       : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
+-    } while (0)
++  __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3"			\
++	   : "=r,r" (sh), "=&r,&r" (sl)					\
++	   : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
+ #define umul_ppmm(ph, pl, m0, m1) \
+   do {									\
+     UDItype __m0 = (m0), __m1 = (m1);					\
+

From 32ab8f21e6877e47c246896c6fb962861b42717d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 15 Jan 2013 01:54:46 +0000
Subject: [PATCH 3976/6849] gnutls: bump to version 3.1.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/Config.in | 2 +-
 package/gnutls/gnutls.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 2739088365..c2ff4edb91 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_GNUTLS
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
 
-	  http://www.gnu.org/software/gnutls/gnutls.html
+	  http://www.gnutls.org
 
 config BR2_PACKAGE_GNUTLS_TOOLS
 	bool "install tools"
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 4c918c1f8b..f65b05d850 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 3.1.5
+GNUTLS_VERSION = 3.1.6
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
-GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
+GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1
 GNUTLS_LICENSE = GPLv3+ LGPLv3
 GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER
 GNUTLS_DEPENDENCIES = host-pkgconf nettle $(if $(BR2_PACKAGE_ZLIB),zlib)

From 763ad50bd72dead80d2a50c637291f06da8caaaf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 15 Jan 2013 06:26:06 +0000
Subject: [PATCH 3977/6849] openvpn: bump to version 2.3.0

Toolchain IPv6 support isn't optional any more.
New PolarSSL backend besides the usual OpenSSL one.
New small binary option, reduces binary file size ~100 KiB depending on
target architecture.
Removed no crypto option - it still requires some SSL library headers
and it's pointless anyway, after all we're talking about a VPN solution
here.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/Config.in                     | 39 ++++++++--
 .../openvpn/openvpn-allow-polarssl-1.2.patch  | 72 +++++++++++++++++++
 ...penvpn-fix-build-with-disable-crypto.patch | 30 --------
 package/openvpn/openvpn.mk                    | 32 ++++++---
 4 files changed, 126 insertions(+), 47 deletions(-)
 create mode 100644 package/openvpn/openvpn-allow-polarssl-1.2.patch
 delete mode 100644 package/openvpn/openvpn-fix-build-with-disable-crypto.patch

diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 9f9057df0a..a96ed4e00b 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -1,5 +1,10 @@
+comment "openvpn requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
+
 config BR2_PACKAGE_OPENVPN
 	bool "openvpn"
+	depends on BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
  	help
 	  OpenVPN is a full-featured SSL VPN solution which can
 	  accomodate a wide range of configurations, including road
@@ -8,20 +13,42 @@ config BR2_PACKAGE_OPENVPN
 	  remote access solutions with load balancing, failover, and
 	  fine-grained access-controls.
 
-	  http://openvpn.sourceforge.net/
+	  http://openvpn.net/
+
+if BR2_PACKAGE_OPENVPN
 
 config BR2_PACKAGE_OPENVPN_LZO
 	bool "LZO compression"
 	default y
-	depends on BR2_PACKAGE_OPENVPN
 	select BR2_PACKAGE_LZO
 	help
 	  Enable LZO compression.
 
-config BR2_PACKAGE_OPENVPN_OPENSSL
-	bool "OpenSSL support"
-	default y
-	depends on BR2_PACKAGE_OPENVPN
+config BR2_PACKAGE_OPENVPN_SMALL
+	bool "Optimize for small size"
+	help
+	  Make OpenVPN as small as possible.
+	  You loose eurephia, debugging info, help messages and more.
+	  It saves around 100 KiB in binary file size.
+
+choice
+	prompt "Crypto backend"
+	default BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL
+	help
+	  Select the cryptographic library to use.
+
+	config BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL
+	bool "OpenSSL"
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Enable TLS-based key exchange and OpenSSL crypto support.
+
+	config BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL
+	bool "PolarSSL"
+	select BR2_PACKAGE_POLARSSL
+	help
+	  Enable TLS-based key exchange and PolarSSL crypto support.
+
+endchoice
+
+endif
diff --git a/package/openvpn/openvpn-allow-polarssl-1.2.patch b/package/openvpn/openvpn-allow-polarssl-1.2.patch
new file mode 100644
index 0000000000..0aeb2f2db4
--- /dev/null
+++ b/package/openvpn/openvpn-allow-polarssl-1.2.patch
@@ -0,0 +1,72 @@
+Allow OpenVPN to use newer (1.2+) PolarSSL versions.
+https://community.openvpn.net/openvpn/ticket/250
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/src/openvpn/crypto_polarssl.h.ori	2013-01-10 21:38:23.213885934 +0100
++++ a/src/openvpn/crypto_polarssl.h	2013-01-10 21:40:20.597883460 +0100
+@@ -60,7 +60,11 @@
+ #define OPENVPN_MODE_OFB 	POLARSSL_MODE_OFB
+ 
+ /** Cipher is in CFB mode */
++#if POLARSSL_VERSION_NUMBER < 0x01020000
+ #define OPENVPN_MODE_CFB 	POLARSSL_MODE_CFB128
++#else
++#define OPENVPN_MODE_CFB 	POLARSSL_MODE_CFB
++#endif
+ 
+ /** Cipher should encrypt */
+ #define OPENVPN_OP_ENCRYPT 	POLARSSL_ENCRYPT
+--- a/src/openvpn/ssl_polarssl.c.ori	2013-01-10 21:50:16.041870946 +0100
++++ a/src/openvpn/ssl_polarssl.c	2013-01-10 21:54:35.261865496 +0100
+@@ -67,6 +67,20 @@
+ 
+ static int default_ciphersuites[] =
+ {
++#if POLARSSL_VERSION_NUMBER >= 0x0102000
++    TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
++    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
++    TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
++    TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
++    TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
++    TLS_RSA_WITH_AES_256_CBC_SHA,
++    TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
++    TLS_RSA_WITH_AES_128_CBC_SHA,
++    TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
++    TLS_RSA_WITH_3DES_EDE_CBC_SHA,
++    TLS_RSA_WITH_RC4_128_SHA,
++    TLS_RSA_WITH_RC4_128_MD5,
++#else
+     SSL_EDH_RSA_AES_256_SHA,
+     SSL_EDH_RSA_CAMELLIA_256_SHA,
+     SSL_EDH_RSA_AES_128_SHA,
+@@ -79,6 +93,7 @@
+     SSL_RSA_DES_168_SHA,
+     SSL_RSA_RC4_128_SHA,
+     SSL_RSA_RC4_128_MD5,
++#endif
+     0
+ };
+ 
+@@ -515,7 +530,9 @@
+       ssl_set_rng (ks_ssl->ctx, ctr_drbg_random, rand_ctx_get());
+ 
+       ALLOC_OBJ_CLEAR (ks_ssl->ssn, ssl_session);
++#if  POLARSSL_VERSION_NUMBER < 0x01020000
+       ssl_set_session (ks_ssl->ctx, 0, 0, ks_ssl->ssn );
++#endif
+       if (ssl_ctx->allowed_ciphers)
+ 	ssl_set_ciphersuites (ks_ssl->ctx, ssl_ctx->allowed_ciphers);
+       else
+@@ -828,7 +845,11 @@
+ 		    ssl_get_version (ks_ssl->ctx),
+ 		    ssl_get_ciphersuite(ks_ssl->ctx));
+ 
++#if POLARSSL_VERSION_NUMBER >= 0x01020000
++  cert = ks_ssl->ssn->peer_cert;
++#else
+   cert = ks_ssl->ctx->peer_cert;
++#endif
+   if (cert != NULL)
+     {
+       openvpn_snprintf (s2, sizeof (s2), ", " counter_format " bit RSA", (counter_type) cert->rsa.len * 8);
diff --git a/package/openvpn/openvpn-fix-build-with-disable-crypto.patch b/package/openvpn/openvpn-fix-build-with-disable-crypto.patch
deleted file mode 100644
index 5466558758..0000000000
--- a/package/openvpn/openvpn-fix-build-with-disable-crypto.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-[PATCH] fix build with --disable-crypto
-
-options.c is missing the definition for struct context when built with
---disable-crypto, as it then doesn't get pulled in through push.h,
-leading to build errors like:
-
-options.c: In function ‘parse_http_proxy_fallback’:
-options.c:1474: error: dereferencing pointer to incomplete type
-options.c:1477: error: dereferencing pointer to incomplete type
-options.c:1478: error: dereferencing pointer to incomplete type
-
-Fix it by including forward.h
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- options.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: openvpn-2.1.3/options.c
-===================================================================
---- openvpn-2.1.3.orig/options.c
-+++ openvpn-2.1.3/options.c
-@@ -29,6 +29,7 @@
- 
- #include "syshead.h"
- 
-+#include "forward.h"
- #include "buffer.h"
- #include "error.h"
- #include "common.h"
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 1c6e6ecdfa..2658d76a93 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,17 +4,23 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.2.2
+OPENVPN_VERSION = 2.3.0
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
-OPENVPN_CONF_OPT = --enable-small --disable-plugins \
-			--with-ifconfig-path=/sbin/ifconfig \
-			--with-route-path=/sbin/route \
-			--with-netstat-path=/bin/netstat
+OPENVPN_DEPENDENCIES = host-pkgconf
+OPENVPN_CONF_OPT = --disable-plugin-auth-pam --enable-iproute2
+OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
+	NETSTAT=/bin/netstat \
+	ROUTE=/sbin/route
+
+ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y)
+OPENVPN_CONF_OPT += --enable-small --disable-plugins \
+	--disable-debug --disable-eurephia
+endif
 
 ifeq ($(BR2_PACKAGE_IPROUTE2),y)
-OPENVPN_CONF_OPT += --with-iproute-path=/sbin/ip
+OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
 else
-OPENVPN_CONF_OPT += --with-iproute-path=/bin/ip
+OPENVPN_CONF_ENV += IPROUTE=/bin/ip
 endif
 
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
@@ -23,14 +29,18 @@ else
 	OPENVPN_CONF_OPT += --disable-lzo
 endif
 
-ifeq ($(BR2_PACKAGE_OPENVPN_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL),y)
+	OPENVPN_CONF_OPT += --with-crypto-library=openssl
 	OPENVPN_DEPENDENCIES += openssl
-else
-	OPENVPN_CONF_OPT += --disable-crypto --disable-ssl
+endif
+
+ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL),y)
+	OPENVPN_CONF_OPT += --with-crypto-library=polarssl
+	OPENVPN_DEPENDENCIES += polarssl
 endif
 
 define OPENVPN_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 $(@D)/openvpn \
+	$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \
 		$(TARGET_DIR)/usr/sbin/openvpn
 	if [ ! -f $(TARGET_DIR)/etc/init.d/openvpn ]; then \
 		$(INSTALL) -m 755 -D package/openvpn/openvpn.init \

From 41fb3df4bd370b869fea3d0b38d01f596f86f721 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 15 Jan 2013 21:30:14 +0100
Subject: [PATCH 3978/6849] openvpn: fix init script name

Our default (busybox) rc.S implementation requires init scripts to be
named S??*, so rename the openvpn one to S60openvpn (E.G. after network).

At the same time remove the deprecated check-if-custom-skeleton-provided-file
and just always install the init script. People can always fixup/remove
it in their post-build script if needed.

Also name the init script source the same as the destination file name in
TARGET_DIR for consistency.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/{openvpn.init => S60openvpn} | 0
 package/openvpn/openvpn.mk                   | 8 +++-----
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename package/openvpn/{openvpn.init => S60openvpn} (100%)

diff --git a/package/openvpn/openvpn.init b/package/openvpn/S60openvpn
similarity index 100%
rename from package/openvpn/openvpn.init
rename to package/openvpn/S60openvpn
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 2658d76a93..a49daca763 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -42,15 +42,13 @@ endif
 define OPENVPN_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \
 		$(TARGET_DIR)/usr/sbin/openvpn
-	if [ ! -f $(TARGET_DIR)/etc/init.d/openvpn ]; then \
-		$(INSTALL) -m 755 -D package/openvpn/openvpn.init \
-			$(TARGET_DIR)/etc/init.d/openvpn; \
-	fi
+	$(INSTALL) -m 755 -D package/openvpn/S60openvpn \
+		$(TARGET_DIR)/etc/init.d/S60openvpn
 endef
 
 define OPENVPN_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/openvpn
-	rm -f $(TARGET_DIR)/etc/init.d/openvpn
+	rm -f $(TARGET_DIR)/etc/init.d/S60openvpn
 endef
 
 $(eval $(autotools-package))

From 4cf256ec4943fe35f488238dc90fd45ff509a783 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 15 Jan 2013 06:34:44 +0000
Subject: [PATCH 3979/6849] tslib: fix license info

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index c94be7df33..8533cf9cb3 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -5,7 +5,7 @@
 #############################################################
 TSLIB_VERSION = 412d99d
 TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
-TSLIB_LICENSE = LGPL
+TSLIB_LICENSE = GPL, LGPL
 TSLIB_LICENSE_FILES = COPYING
 
 TSLIB_AUTORECONF = YES

From 3d680bf0dd0bd0f62dad91c9bf8c7657ebc5f59b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 15 Jan 2013 06:39:15 +0000
Subject: [PATCH 3980/6849] opkg: fix configure step by adding host-pkgconf
 dependency

The opkg configure.ac uses the PKG_CHECK_MODULES() m4 macro, which is
provided by the .m4 files installed by host-pkgconf, so we must have
this package as a dependency.

Fixes:

  http://autobuild.buildroot.org/results/069fcab6e7dd5a1f07251ba6f52f65643a2f7594/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opkg/opkg.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index 3ba61aea47..9932d3f8bd 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -11,6 +11,8 @@ OPKG_SITE_METHOD = svn
 OPKG_INSTALL_STAGING = YES
 OPKG_CONF_OPT = --disable-curl --disable-gpg
 OPKG_AUTORECONF = YES
+# Uses PKG_CHECK_MODULES() in configure.ac
+OPKG_DEPENDENCIES = host-pkgconf
 
 # Ensure directory for lockfile exists
 define OPKG_CREATE_LOCKDIR

From dbeeaef3a2ae8b03923c26436d3a4f445531e404 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:18:19 +0000
Subject: [PATCH 3981/6849] ltp-testsuite: add license info

[Peter: GPLv2 / GPLv2+ mix as pointed out by Arnout]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltp-testsuite/ltp-testsuite.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index c6b34f0a2b..d0276f2272 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -6,5 +6,7 @@
 LTP_TESTSUITE_VERSION = 20101031
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
 LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
+LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+
+LTP_TESTSUITE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From a391d2ed5153c29ae5bcf250c316c46cc1d14ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Tue, 15 Jan 2013 11:49:49 +0000
Subject: [PATCH 3982/6849] proxychains updated to proxychains-ng 4.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  2 +-
 package/proxychains-ng/Config.in         |  7 +++++++
 package/proxychains-ng/proxychains-ng.mk | 10 ++++++++++
 package/proxychains/Config.in            |  7 -------
 package/proxychains/proxychains.mk       | 10 ----------
 5 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 package/proxychains-ng/Config.in
 create mode 100644 package/proxychains-ng/proxychains-ng.mk
 delete mode 100644 package/proxychains/Config.in
 delete mode 100644 package/proxychains/proxychains.mk

diff --git a/package/Config.in b/package/Config.in
index c59f342ba3..ba03b3cc61 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -682,7 +682,7 @@ source "package/portmap/Config.in"
 source "package/pppd/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
-source "package/proxychains/Config.in"
+source "package/proxychains-ng/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
diff --git a/package/proxychains-ng/Config.in b/package/proxychains-ng/Config.in
new file mode 100644
index 0000000000..6fcebde2e0
--- /dev/null
+++ b/package/proxychains-ng/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PROXYCHAINS_NG
+	bool "proxychains-ng"
+	help
+	  force any tcp connections to flow through a proxy (or proxy chain)
+
+	  https://github.com/rofl0r/proxychains
+
diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk
new file mode 100644
index 0000000000..9cf24bf5d2
--- /dev/null
+++ b/package/proxychains-ng/proxychains-ng.mk
@@ -0,0 +1,10 @@
+#############################################################
+#
+# proxychains-ng
+#
+#############################################################
+PROXYCHAINS_NG_VERSION = 4.4
+PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2
+PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng
+
+$(eval $(autotools-package))
diff --git a/package/proxychains/Config.in b/package/proxychains/Config.in
deleted file mode 100644
index 332aa3b04e..0000000000
--- a/package/proxychains/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PROXYCHAINS
-	bool "proxychains"
-	help
-	  force any tcp connections to flow through a proxy (or proxy chain)
-
-	  http://proxychains.sourceforge.net
-
diff --git a/package/proxychains/proxychains.mk b/package/proxychains/proxychains.mk
deleted file mode 100644
index 7c4500dd31..0000000000
--- a/package/proxychains/proxychains.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#############################################################
-#
-# ProxyChains
-#
-#############################################################
-PROXYCHAINS_VERSION = 3.1
-PROXYCHAINS_SOURCE = proxychains-$(PROXYCHAINS_VERSION).tar.gz
-PROXYCHAINS_SITE = http://downloads.sourceforge.net/project/proxychains/proxychains/version%20$(PROXYCHAINS_VERSION)
-
-$(eval $(autotools-package))

From 7d93f102e181b23359f0763ffa7f2b467ca98ec8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 16 Jan 2013 09:48:44 +0100
Subject: [PATCH 3983/6849] httping: also pass configuration (SSL/TFO/DEBUG)
 doing make install

Fixes http://autobuild.buildroot.net/results/144e146ad3223748c4f06f884aeff93e8c0c2de3

When SSL is enabled (which it is by default) an extra source file is built,
so ensure the same configuration is used at 'make install' time as during
the build step.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/httping/httping.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 3ec1dae4ff..4c4d755d54 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -10,16 +10,17 @@ HTTPING_SITE = http://www.vanheusden.com/httping
 HTTPING_LICENSE = GPLv2
 HTTPING_LICENSE_FILES = license.txt
 HTTPING_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
+HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
+	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
+	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
+	DEBUG=no
 
 define HTTPING_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
-		TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
-		DEBUG=no -C $(@D)
+	$(MAKE) $(HTTPING_MAKE_OPT) -C $(@D)
 endef
 
 define HTTPING_INSTALL_TARGET_CMDS
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(MAKE) $(HTTPING_MAKE_OPT) DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
 define HTTPING_CLEAN_CMDS

From 10e058b0ee7fd8135fef35bcf24ae985707078c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Tue, 15 Jan 2013 18:10:15 +0000
Subject: [PATCH 3984/6849] proxychains-ng: copy proxychains.conf to target dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

proxychains installation does not copy proxychains.conf to
$(TARGET_DIR)/etc anymore so we have to do it manually now.

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proxychains-ng/proxychains-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk
index 9cf24bf5d2..c38a7dbde3 100644
--- a/package/proxychains-ng/proxychains-ng.mk
+++ b/package/proxychains-ng/proxychains-ng.mk
@@ -7,4 +7,11 @@ PROXYCHAINS_NG_VERSION = 4.4
 PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2
 PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng
 
+define PROXYCHAINS_NG_POST_INSTALL_TARGET
+	$(INSTALL) -m 644 -D $(@D)/src/proxychains.conf \
+		$(TARGET_DIR)/etc/proxychains.conf
+endef
+
+PROXYCHAINS_NG_POST_INSTALL_TARGET_HOOKS += PROXYCHAINS_NG_POST_INSTALL_TARGET
+
 $(eval $(autotools-package))

From 476dd1597a7350253ee4b74aeaf3dd00909d9286 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 16 Jan 2013 11:40:20 +0000
Subject: [PATCH 3985/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index cdaab3b988..14e83b47b0 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,7 +60,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "3.0.58"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.36"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.37"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.25"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5

From f5f65705af7de9f98d4b68dbddcb6786884c6d17 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Jan 2013 02:25:40 +0000
Subject: [PATCH 3986/6849] cifs-utils: bump to version 5.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index d208c87ae7..36f171d8f3 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,4 +1,4 @@
-CIFS_UTILS_VERSION = 5.7
+CIFS_UTILS_VERSION = 5.9
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
 CIFS_UTILS_LICENSE = GPLv3

From 0ee7e03b54f92f68b84df58accb5ff2843c9e3ae Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Jan 2013 02:25:41 +0000
Subject: [PATCH 3987/6849] squid: bump to version 3.2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 43e2d24d87..95c212aca8 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.2.5
+SQUID_VERSION = 3.2.6
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From 13a81fa2caf32b4fa1a5452f308eed14e127a8f5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Jan 2013 02:25:42 +0000
Subject: [PATCH 3988/6849] libsigc: bump to version 2.2.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsigc/libsigc.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 10f580379e..3f58686d31 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -3,10 +3,13 @@
 # libsigc++
 #
 #############################################################
-LIBSIGC_VERSION = 2.2.10
-LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.bz2
+
+LIBSIGC_VERSION = 2.2.11
+LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2
 LIBSIGC_INSTALL_STAGING = YES
+LIBSIGC_LICENSE = LGPLv2.1+
+LIBSIGC_LICENSE_FILES = COPYING
 
 define LIBSIGC_INSTALL_TARGET_FIXUP
 	rm -rf $(TARGET_DIR)/usr/share/devhelp/books/libsigc++*

From e59117fe938990f82944f5ec0464330389b0ff0d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Jan 2013 02:25:43 +0000
Subject: [PATCH 3989/6849] vim: bump to version 7.3-762

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vim/Config.in | 1 +
 package/vim/vim.mk    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/vim/Config.in b/package/vim/Config.in
index 0da158fade..891715eb57 100644
--- a/package/vim/Config.in
+++ b/package/vim/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_VIM
 	bool "vim"
+	depends on BR2_USE_MMU # uses fork()
 	select BR2_PACKAGE_NCURSES
 	help
 	  VIM Text editor
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 7fed822f11..fa5f8aef9f 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-# hg 21219ffc9790 = 7.3 release + patchlevel 487
 VIM_SITE = https://vim.googlecode.com/hg
 VIM_SITE_METHOD = hg
-VIM_VERSION = 21219ffc9790
+# 7.3 release patchlevel 762
+VIM_VERSION = 699f8d8f096d
 VIM_DEPENDENCIES = ncurses
 VIM_SUBDIR = src
 VIM_CONF_ENV = vim_cv_toupper_broken=no \
@@ -21,6 +21,8 @@ VIM_CONF_ENV = vim_cv_toupper_broken=no \
 		ac_cv_small_wchar_t=no
 # GUI/X11 headers leak from the host so forcibly disable them
 VIM_CONF_OPT = --with-tlib=ncurses --enable-gui=no --without-x
+VIM_LICENSE = Charityware
+VIM_LICENSE_FILES = README.txt
 
 define VIM_INSTALL_TARGET_CMDS
 	cd $(@D)/src; \

From 4cd111e0df777fdce6f851872e52acd0de51e75d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Jan 2013 00:57:39 +0000
Subject: [PATCH 3990/6849] u-boot: add 2013.01

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index d8458d912a..f10b6d06bf 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -14,10 +14,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2012_10
+	default BR2_TARGET_UBOOT_2013_01
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2013_01
+	bool "2013.01"
+
 config BR2_TARGET_UBOOT_2012_10
 	bool "2012.10"
 
@@ -55,6 +58,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2013.01"	if BR2_TARGET_UBOOT_2013_01
 	default "2012.10"	if BR2_TARGET_UBOOT_2012_10
 	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04

From ef49a1f62762f47cea4459d03a3c49c3e55b8992 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Jan 2013 00:57:40 +0000
Subject: [PATCH 3991/6849] uboot-tools: bump to version 2013.01

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uboot-tools-drop-configh-from-tools.patch | 31 -------------------
 package/uboot-tools/uboot-tools.mk            |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 package/uboot-tools/uboot-tools-drop-configh-from-tools.patch

diff --git a/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
deleted file mode 100644
index 2b3a0e5d1c..0000000000
--- a/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 39857718f4df9b40a7acf38b73140fd86c628ef0 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 30 Apr 2012 09:07:38 -0300
-Subject: [PATCH] fw_env: allow it to build without a config
-
-We need to build u-boot tools without a board configuration for the
-target packages.
-fw_env just uses config.h to define the default environment of the
-created image, so it really isn't mandatory.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- tools/env/fw_env.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
-index e292d2b..2bb061a 100644
---- a/tools/env/fw_env.c
-+++ b/tools/env/fw_env.c
-@@ -45,8 +45,6 @@
- 
- #include "fw_env.h"
- 
--#include <config.h>
--
- #define WHITESPACE(c) ((c == '\t') || (c == ' '))
- 
- #define min(x, y) ({				\
--- 
-1.7.3.4
-
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 5957a3dbae..3470b6022e 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -3,7 +3,7 @@
 # uboot-tools
 #
 #############################################################
-UBOOT_TOOLS_VERSION = 2012.10
+UBOOT_TOOLS_VERSION = 2013.01
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+

From 5c25c462f7f7ea667843bf4f4d9cc954970d5169 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Jan 2013 16:21:25 +0000
Subject: [PATCH 3992/6849] kernel-headers: bump 3.{0, 4, 7}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.58-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.59-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 14e83b47b0..d12a824f5f 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.58"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.59"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.37"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.25"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.26"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.2"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.3"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.58-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.59-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.58-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.59-headers_install-fix-__packed-in-exported-kernel-head.patch

From a1b941d789ad1394a4c6b64a5a6872a79350b7ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Jan 2013 16:21:26 +0000
Subject: [PATCH 3993/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index d63626990c..056b3497c0 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.2"
+	bool "3.7.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.2" if BR2_LINUX_KERNEL_3_7
+	default "3.7.3" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 7b69814d4880c2f58e2aad44f9912468a600708b Mon Sep 17 00:00:00 2001
From: Jean-Christian de Rivaz <jc@eclis.ch>
Date: Fri, 18 Jan 2013 04:55:41 +0000
Subject: [PATCH 3994/6849] gd: ensure libpng-config from staging is used

The gd package configure call 'libpng-config' to get the compiler
flags required to use the libpng. The configure correctly allow to
specify the path of the staging libpng-config by using the
ac_cv_path_LIBPNG_CONFIG but the configure.ac call simply
'libpng-config' instead of the specified one. The configure.ac is now
modified to call the specified libpng_config.

[Peter: explictly pass --without-png instead of auto detect]
Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gd/gd-libpng-config.patch | 30 ++++++++++++++++++++++++++++++
 package/gd/gd.mk                  |  4 ++++
 2 files changed, 34 insertions(+)
 create mode 100644 package/gd/gd-libpng-config.patch

diff --git a/package/gd/gd-libpng-config.patch b/package/gd/gd-libpng-config.patch
new file mode 100644
index 0000000000..cf8b92e445
--- /dev/null
+++ b/package/gd/gd-libpng-config.patch
@@ -0,0 +1,30 @@
+Call the libpng12-confg and libpng-config specified by
+$LIBPNG12_CONFIG and $LIBPNG_CONFIG variables that are set by
+ac_cv_path_LIBPNG12_CONFIG and ac_cv_path_LIBPNG_CONFIG. This is
+important for cross compiler that need to get the staging settings
+instead of the host settings.
+
+Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch>
+
+diff -Nura gd-2.0.35.orig/configure.ac gd-2.0.35/configure.ac
+--- gd-2.0.35.orig/configure.ac	2013-01-18 02:00:59.000000000 +0100
++++ gd-2.0.35/configure.ac	2013-01-18 02:01:44.000000000 +0100
+@@ -353,14 +353,14 @@
+   AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
+   AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
+   if test -n "$LIBPNG12_CONFIG"; then
+-    libpng_CPPFLAGS=`libpng12-config --cflags`
++    libpng_CPPFLAGS=`$LIBPNG12_CONFIG --cflags`
+     # should be --ldopts, but it's currently broken
+-    libpng_LDFLAGS=`libpng12-config --ldflags`
++    libpng_LDFLAGS=`$LIBPNG12_CONFIG --ldflags`
+     libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
+   elif test -n "$LIBPNG_CONFIG"; then
+-    libpng_CPPFLAGS=`libpng-config --cflags`
++    libpng_CPPFLAGS=`$LIBPNG_CONFIG --cflags`
+     # should be --ldopts, but it's currently broken
+-    libpng_LDFLAGS=`libpng-config --ldflags`
++    libpng_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
+     libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
+   elif test -d "$withval"; then
+     libpng_CPPFLAGS="-I$withval/include"
diff --git a/package/gd/gd.mk b/package/gd/gd.mk
index 972d8dda42..de1f5d1714 100644
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@@ -33,6 +33,10 @@ endif
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 GD_DEPENDENCIES += libpng
 GD_CONF_OPT += --with-png
+GD_CONF_ENV += ac_cv_path_LIBPNG12_CONFIG=""
+GD_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
+else
+GD_CONF_OPT += --without-png
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)

From e81e2770aff61d07306d0448bd434d613ed9afef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 18 Jan 2013 22:00:47 +0100
Subject: [PATCH 3995/6849] gd: explictly disable freetype support when not
 available

Otherwise it will try to run freetype-config from the host to check
for availability.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gd/gd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gd/gd.mk b/package/gd/gd.mk
index de1f5d1714..1f9b1d694c 100644
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@@ -23,6 +23,8 @@ endif
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 GD_DEPENDENCIES += freetype
 GD_CONF_ENV += ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+else
+GD_CONF_OPT += --without-freetype
 endif
 
 ifeq ($(BR2_PACKAGE_JPEG),y)

From 1bf238751c5a4b4db563589d733ffe0a11d25b5b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 19 Jan 2013 00:40:53 +0000
Subject: [PATCH 3996/6849] cairo: bump version to 1.12.10

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/cairo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index b3fc4385e6..ab0615c9e6 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,7 +3,7 @@
 # cairo
 #
 #############################################################
-CAIRO_VERSION = 1.12.8
+CAIRO_VERSION = 1.12.10
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
 CAIRO_LICENSE = LGPLv2.1+
 CAIRO_LICENSE_FILES = COPYING

From 95a5ed51ba1fdfed72739a4c05c57bf3f8d17a90 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 19 Jan 2013 00:40:54 +0000
Subject: [PATCH 3997/6849] cairo: add missing dependency on xlib_libXext

The X.org backend of Cairo now requires xlib_libXext. See
http://permalink.gmane.org/gmane.comp.lib.cairo/23385.

Fixes:

 http://autobuild.buildroot.org/results/795404665ec74a7ac929fdf8caf1397c9c54d80d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/Config.in | 1 +
 package/cairo/cairo.mk  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 89bd315f37..9a177a744a 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	help
 	  Cairo is a 2D graphics library with support for multiple
 	  output devices. Currently supported output targets include
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index ab0615c9e6..83c82c03c8 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -51,7 +51,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x
-	CAIRO_DEPENDENCIES += xlib_libX11
+	CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext
 else
 	CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x
 endif

From 7bf847b5373b7833c5a83ed6c9afc57bc0afe13b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 19 Jan 2013 01:04:43 +0000
Subject: [PATCH 3998/6849] uboot-tools: fix build failure for the target

The patch to drop config.h is still required, it just needed a tweak.
Fixes:
http://autobuild.buildroot.net/results/3653c0e3ec460c710524468987d5192337cf210e/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uboot-tools-drop-configh-from-tools.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/uboot-tools/uboot-tools-drop-configh-from-tools.patch

diff --git a/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
new file mode 100644
index 0000000000..21995ecf06
--- /dev/null
+++ b/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
@@ -0,0 +1,37 @@
+We need to build u-boot tools without a board configuration for the target.
+fw_env just uses config.h to define the default environment of the created
+image, so it really isn't mandatory.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura u-boot-2013.01.orig/tools/env/fw_env.h u-boot-2013.01/tools/env/fw_env.h
+--- u-boot-2013.01.orig/tools/env/fw_env.h	2013-01-19 07:50:53.879241660 -0300
++++ u-boot-2013.01/tools/env/fw_env.h	2013-01-19 07:58:11.897903403 -0300
+@@ -21,15 +21,6 @@
+  * MA 02111-1307 USA
+  */
+ 
+-/* Pull in the current config to define the default environment */
+-#ifndef __ASSEMBLY__
+-#define __ASSEMBLY__ /* get only #defines from config.h */
+-#include <config.h>
+-#undef	__ASSEMBLY__
+-#else
+-#include <config.h>
+-#endif
+-
+ /*
+  * To build the utility with the static configuration
+  * comment out the next line.
+diff -Nura u-boot-2013.01.orig/tools/env/Makefile u-boot-2013.01/tools/env/Makefile
+--- u-boot-2013.01.orig/tools/env/Makefile	2013-01-19 07:50:53.879241660 -0300
++++ u-boot-2013.01/tools/env/Makefile	2013-01-19 07:59:34.926486346 -0300
+@@ -26,7 +26,7 @@
+ HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
+ HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
+ HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
+-HEADERS	:= fw_env.h $(OBJTREE)/include/config.h
++HEADERS	:= fw_env.h
+ 
+ # Compile for a hosted environment on the target
+ HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \

From d9b60c79fc7dc84c4d92dde965ce1209ddc1e8b8 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 17 Jan 2013 10:08:36 +0000
Subject: [PATCH 3999/6849] sdl_ttf: bump to version 2.0.11

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_ttf/sdl_ttf.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index b9747d8b02..e9bc537187 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -3,9 +3,12 @@
 # SDL_ttf
 #
 #############################################################
-SDL_TTF_VERSION:=2.0.9
-SDL_TTF_SOURCE:=SDL_ttf-$(SDL_TTF_VERSION).tar.gz
-SDL_TTF_SITE:=http://www.libsdl.org/projects/SDL_ttf/release/
+
+SDL_TTF_VERSION = 2.0.11
+SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz
+SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release/
+SDL_TTF_LICENSE = zlib
+SDL_TTF_LICENSE_FILES = COPYING
 
 SDL_TTF_INSTALL_STAGING = YES
 SDL_TTF_DEPENDENCIES = sdl freetype

From 81a2d9b72cab1cf074054ae2811bd2e8aa8eda22 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 17 Jan 2013 10:08:37 +0000
Subject: [PATCH 4000/6849] sdl_mixer: bump to version 1.2.12

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_mixer/sdl_mixer.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 411b65d0d5..a062c35cc1 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -3,9 +3,12 @@
 # SDL_mixer
 #
 #############################################################
-SDL_MIXER_VERSION:=1.2.11
-SDL_MIXER_SOURCE:=SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
-SDL_MIXER_SITE:=http://www.libsdl.org/projects/SDL_mixer/release/
+
+SDL_MIXER_VERSION = 1.2.12
+SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
+SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release/
+SDL_MIXER_LICENSE = zlib
+SDL_MIXER_LICENSE_FILES = COPYING
 
 SDL_MIXER_INSTALL_STAGING = YES
 SDL_MIXER_DEPENDENCIES = sdl

From 7f2d0c82c287d6d6e4a5c76f2a32a1cc87585022 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 17 Jan 2013 10:08:38 +0000
Subject: [PATCH 4001/6849] sdl_gfx: bump version

[Peter: use 2.0.23 instead of .24 because of build issues with .24]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_gfx/sdl_gfx.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index c1c7f91012..8acc5c5e53 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -3,9 +3,12 @@
 # SDL_gfx addon for SDL
 #
 #############################################################
-SDL_GFX_VERSION = 2.0.19
+
+SDL_GFX_VERSION = 2.0.23
 SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz
 SDL_GFX_SITE = http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+SDL_GFX_LICENSE = zlib
+SDL_GFX_LICENSE_FILES = COPYING LICENSE
 SDL_GFX_INSTALL_STAGING = YES
 SDL_GFX_DEPENDENCIES = sdl
 SDL_GFX_CONF_OPT = \

From ad0279f0ee51e97bf7dbb70fdd6f14f789f344a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 19 Jan 2013 02:06:25 +0000
Subject: [PATCH 4002/6849] gettext: fix static build failure

When static libraries are preferred we don't build dynamic libraries so
it fails on the install phase. So don't try to do it for those cases.
Fixes:
http://autobuild.buildroot.net/results/651537ae1909b039e0cfc5c104ee87f93a9e5792/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 953077d21a..204af10891 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -35,9 +35,12 @@ endif
 # When the gettext tools are not enabled in the configuration, we only
 # install libintl to the target.
 ifeq ($(BR2_PACKAGE_GETTEXT_TOOLS),)
+# When static libs are preferred the .so files aren't created
+ifeq ($(BR2_PREFER_STATIC_LIB),)
 define GETTEXT_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
 endef
+endif
 # Ditch the tools since they're off and pull other dependencies
 define GETTEXT_DISABLE_TOOLS
 	$(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in

From 81b21b2d036ff64c7e3edab945bb7643a796da95 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 06:52:04 +0000
Subject: [PATCH 4003/6849] wireless_tools: don't call ldconfig

The wireless_tools installation process calls ldconfig to update the
ld.so cache, but in a cross-compilation situation, it doesn't make
sense, and simply takes time for nothing. To avoid this, we pass
LDCONFIG=/bin/true during the wireless_tools installation steps.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireless_tools/wireless_tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
index f3556897ef..4dd4084e94 100644
--- a/package/wireless_tools/wireless_tools.mk
+++ b/package/wireless_tools/wireless_tools.mk
@@ -20,7 +20,7 @@ ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y)
 	WIRELESS_TOOLS_INSTALL_TARGETS += install-dynamic
 
 define WIRELESS_TOOLS_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" install-dynamic
+	$(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true install-dynamic
 	$(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)/usr" install-hdr
 endef
 
@@ -36,7 +36,7 @@ define WIRELESS_TOOLS_CLEAN_CMDS
 endef
 
 define WIRELESS_TOOLS_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" $(WIRELESS_TOOLS_INSTALL_TARGETS)
+	$(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true $(WIRELESS_TOOLS_INSTALL_TARGETS)
 	$(MAKE) -C $(@D) INSTALL_MAN="$(TARGET_DIR)/usr/share/man" install-man
 endef
 

From a5ea6e6ac182586d75754c3fdfaf8a7ea7fab8ef Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:30 +0000
Subject: [PATCH 4004/6849] axel: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/axel/axel.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 0ed8ad2e1c..f823b4aa32 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -6,6 +6,8 @@
 AXEL_VERSION = 2.4
 AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
 AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
+AXEL_LICENSE = GPLv2+
+AXEL_LICENSE_FILES = COPYING
 
 AXEL_LDFLAGS = -lpthread
 

From b5dd26cbdae24d366fb9854a5af265a77c71da5e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:31 +0000
Subject: [PATCH 4005/6849] cdrkit: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cdrkit/cdrkit.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index ce89bc7b42..bade956162 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -7,6 +7,8 @@
 CDRKIT_VERSION = 1.1.11
 CDRKIT_SITE = http://www.cdrkit.org/releases
 CDRKIT_DEPENDENCIES = libcap bzip2 zlib
+CDRKIT_LICENSE = GPLv2
+CDRKIT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_ENDIAN),"BIG")
 CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1

From 63bd72508bdd6be18a91c0864323a6d8df94be10 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:32 +0000
Subject: [PATCH 4006/6849] cmake: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index e2bc31f472..6836172556 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -1,5 +1,13 @@
+#############################################################
+#
+# cmake
+#
+#############################################################
+
 CMAKE_VERSION = 2.8.9
 CMAKE_SITE = http://www.cmake.org/files/v2.8/
+CMAKE_LICENSE = BSD-3c
+CMAKE_LICENSE_FILES = Copyright.txt
 
 define HOST_CMAKE_CONFIGURE_CMDS
  (cd $(@D); \

From 13ac891065e4c7295bd4ee12e56a08511e4c8446 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:33 +0000
Subject: [PATCH 4007/6849] icu: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/icu/icu.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 5a2d594046..541ca35cd1 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -7,6 +7,9 @@
 ICU_VERSION = 4.8.1.1
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
+ICU_LICENSE = ICU License
+ICU_LICENSE_FILES = license.html
+
 ICU_DEPENDENCIES = host-icu
 ICU_INSTALL_STAGING = YES
 ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \

From 348e33dd05097ff79a3926c494d0026638a03b9a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:34 +0000
Subject: [PATCH 4008/6849] libcap: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap/libcap.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 94a0cbb8ec..dcd3a184ab 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -9,6 +9,9 @@ LIBCAP_VERSION = 2.22
 #LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
 LIBCAP_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libc/libcap2
 LIBCAP_SOURCE = libcap2_$(LIBCAP_VERSION).orig.tar.gz
+LIBCAP_LICENSE = GPLv2 or BSD-3c
+LIBCAP_LICENSE_FILES = License
+
 LIBCAP_DEPENDENCIES = host-libcap
 LIBCAP_INSTALL_STAGING = YES
 

From b4be060773ce3a7411509c034808df76ae98c104 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:35 +0000
Subject: [PATCH 4009/6849] libogg: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libogg/libogg.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 519ba9d88d..606c004c2e 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -5,8 +5,10 @@
 #############################################################
 LIBOGG_VERSION = 1.3.0
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
-LIBOGG_INSTALL_STAGING = YES
+LIBOGG_LICENSE = BSD-3c
+LIBOGG_LICENSE_FILES = COPYING
 
+LIBOGG_INSTALL_STAGING = YES
 LIBOGG_DEPENDENCIES = host-pkgconf
 
 $(eval $(autotools-package))

From bcd02088b300c99b262be26a53f493ad0c82903b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:36 +0000
Subject: [PATCH 4010/6849] pkgconf: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkgconf/pkgconf.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
index 36a5bb82b7..4b00ad3108 100644
--- a/package/pkgconf/pkgconf.mk
+++ b/package/pkgconf/pkgconf.mk
@@ -7,6 +7,8 @@
 PKGCONF_VERSION = 0.8.9
 PKGCONF_SITE = http://tortois.es/~nenolod/distfiles
 PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
+PKGCONF_LICENSE = pkgconf license
+PKGCONF_LICENSE_FILES = COPYING
 
 PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
 

From 4ebbd5f636d4fbe63b1a2c1c02aa0431e09effa8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:22:37 +0000
Subject: [PATCH 4011/6849] speex: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/speex/speex.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index 917de34064..2fe179c6ba 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -5,6 +5,9 @@
 #############################################################
 SPEEX_VERSION = 1.2rc1
 SPEEX_SITE = http://downloads.us.xiph.org/releases/speex
+SPEEX_LICENSE = BSD-3c
+SPEEX_LICENSE_FILES = COPYING
+
 SPEEX_INSTALL_STAGING = YES
 SPEEX_DEPENDENCIES = libogg
 SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \

From 0e4d25ff0fc5d5698e148a53d751f5fc4b22860a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:45:47 +0000
Subject: [PATCH 4012/6849] packages: remove all := signs

Finally get rid of all := used for variable definitions in packages,
as we suggest in our manual and during the review of new packages.

While I was at it, I also sometimes added a few missing new lines
between the header and the first variable definition.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/argus/argus.mk                         | 11 ++++++-----
 package/autoconf/autoconf.mk                   |  6 +++---
 package/blackbox/blackbox.mk                   |  8 ++++----
 package/ctorrent/ctorrent.mk                   |  7 ++++---
 package/dbus-glib/dbus-glib.mk                 |  2 +-
 package/directfb-examples/directfb-examples.mk | 15 ++++++++-------
 package/directfb/directfb.mk                   | 14 +++++++-------
 package/divine/divine.mk                       |  4 ++--
 package/dmalloc/dmalloc.mk                     | 17 +++++++++--------
 package/dmraid/dmraid.mk                       |  9 +++++----
 package/fbdump/fbdump.mk                       |  7 ++++---
 package/fbv/fbv.mk                             |  7 ++++---
 package/genext2fs/genext2fs.mk                 |  6 +++---
 package/gob2/gob2.mk                           |  2 +-
 package/gtkperf/gtkperf.mk                     |  7 ++++---
 package/libglib2/libglib2.mk                   |  2 +-
 package/libid3tag/libid3tag.mk                 | 12 ++++++------
 package/liblockfile/liblockfile.mk             |  9 +++++----
 package/librsvg/librsvg.mk                     | 10 +++++-----
 package/librsync/librsync.mk                   |  7 ++++---
 package/libsysfs/libsysfs.mk                   |  8 ++++----
 package/libtool/libtool.mk                     |  4 ++--
 package/libungif/libungif.mk                   |  7 ++++---
 .../libxml-parser-perl/libxml-parser-perl.mk   |  7 ++++---
 package/libxml2/libxml2.mk                     |  2 +-
 package/lite/lite.mk                           |  7 ++++---
 package/lmbench/lmbench.mk                     |  7 ++++---
 package/lrzsz/lrzsz.mk                         |  6 +++---
 package/lzma/lzma.mk                           |  9 +++++----
 package/make/make.mk                           |  7 ++++---
 package/mdadm/mdadm.mk                         |  7 ++++---
 package/multimedia/madplay/madplay.mk          | 11 ++++++-----
 .../tidsp-binaries/tidsp-binaries.mk           |  6 +++---
 package/netcat/netcat.mk                       |  6 +++---
 package/olsr/olsr.mk                           | 18 +++++++++---------
 package/openocd/openocd.mk                     |  3 ++-
 package/qt/qt.mk                               |  4 ++--
 package/sdl_image/sdl_image.mk                 | 13 +++++++------
 package/shared-mime-info/shared-mime-info.mk   |  2 +-
 package/udpcast/udpcast.mk                     |  7 ++++---
 package/vtun/vtun.mk                           |  7 ++++---
 package/zlib/zlib.mk                           |  8 ++++----
 42 files changed, 170 insertions(+), 148 deletions(-)

diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index a4b533055c..ba69794b11 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -3,11 +3,12 @@
 # argus
 #
 #############################################################
-ARGUS_VERSION:=3.0.0.rc.34
-ARGUS_SOURCE:=argus_$(ARGUS_VERSION).orig.tar.gz
-ARGUS_PATCH:=argus_$(ARGUS_VERSION)-1.diff.gz
-ARGUS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/
-ARGUS_DEPENDENCIES=libpcap
+
+ARGUS_VERSION = 3.0.0.rc.34
+ARGUS_SOURCE = argus_$(ARGUS_VERSION).orig.tar.gz
+ARGUS_PATCH = argus_$(ARGUS_VERSION)-1.diff.gz
+ARGUS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/
+ARGUS_DEPENDENCIES = libpcap
 ARGUS_LICENSE = GPLv2+
 ARGUS_LICENSE_FILES = COPYING
 
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 8807c10bc9..0c36b66fce 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -24,6 +24,6 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # variables used by other packages
-AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
-AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTOCONF = $(HOST_DIR)/usr/bin/autoconf
+AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader
+AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index 43cd747de0..7e5c73af7f 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -4,11 +4,11 @@
 #
 #############################################################
 
-BLACKBOX_VERSION:=0.70.1
-BLACKBOX_SOURCE:=blackbox-$(BLACKBOX_VERSION).tar.bz2
-BLACKBOX_SITE:=http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
+BLACKBOX_VERSION = 0.70.1
+BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
+BLACKBOX_SITE = http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
 
-BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
+BLACKBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib
 
 BLACKBOX_DEPENDENCIES = xlib_libX11
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index d83011eaca..e67fbe9119 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -3,9 +3,10 @@
 # enhanced ctorrent
 #
 #############################################################
-CTORRENT_VERSION:=dnh3.3.2
-CTORRENT_SOURCE:=ctorrent-$(CTORRENT_VERSION).tar.gz
-CTORRENT_SITE:=http://www.rahul.net/dholmes/ctorrent/
+
+CTORRENT_VERSION = dnh3.3.2
+CTORRENT_SOURCE = ctorrent-$(CTORRENT_VERSION).tar.gz
+CTORRENT_SITE = http://www.rahul.net/dholmes/ctorrent/
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 CTORRENT_CONF_OPT+=--with-ssl=yes
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 318e1b97f4..6a4aab2e13 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -36,4 +36,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # dbus-glib for the host
-DBUS_GLIB_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-binding-tool
+DBUS_GLIB_HOST_BINARY = $(HOST_DIR)/usr/bin/dbus-binding-tool
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 8d038986f7..26cc499745 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -3,14 +3,15 @@
 # directfb examples
 #
 #############################################################
-DIRECTFB_EXAMPLES_VERSION:=1.2.0
-DIRECTFB_EXAMPLES_SITE:=http://www.directfb.org/downloads/Extras
+
+DIRECTFB_EXAMPLES_VERSION = 1.2.0
+DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_INSTALL_STAGING = YES
 DIRECTFB_EXAMPLES_DEPENDENCIES = directfb
 
-DIRECTFB_EXAMPLES_TARGETS_ :=
-DIRECTFB_EXAMPLES_TARGETS_y :=
+DIRECTFB_EXAMPLES_TARGETS_ =
+DIRECTFB_EXAMPLES_TARGETS_y =
 
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI) += usr/bin/df_andi
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD) += usr/bin/df_bltload
@@ -37,8 +38,8 @@ DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO) += usr/bin/df_v
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE) += usr/bin/df_video_particle
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW) += usr/bin/df_window
 
-DIRECTFB_EXAMPLES_DATA_ :=
-DIRECTFB_EXAMPLES_DATA_y :=
+DIRECTFB_EXAMPLES_DATA_ =
+DIRECTFB_EXAMPLES_DATA_y =
 
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI) += usr/share/directfb-examples/destination_mask.png
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI) += usr/share/directfb-examples/tux.png
@@ -77,7 +78,7 @@ DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE) += usr/sh
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW) += usr/share/directfb-examples/desktop.png
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW) += usr/share/directfb-examples/dfblogo.png
 
-DIRECTFB_EXAMPLES_FONT_y :=
+DIRECTFB_EXAMPLES_FONT_y =
 ifeq ($(BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS),y)
 DIRECTFB_EXAMPLES_FONT_y = usr/share/directfb-examples/fonts/*
 endif
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 1ccffc5593..05a6c50764 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -52,7 +52,7 @@ else
 DIRECTFB_CONF_OPT += --disable-unique
 endif
 
-DIRECTFB_GFX := \
+DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \
 	$(if $(BR2_PACKAGE_DIRECTFB_CLE266),cle266) \
 	$(if $(BR2_PACKAGE_DIRECTFB_CYBER5K),cyber5k) \
@@ -63,14 +63,14 @@ DIRECTFB_GFX := \
 	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
-DIRECTFB_GFX:=none
+DIRECTFB_GFX = none
 else
-DIRECTFB_GFX:=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
+DIRECTFB_GFX = $(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif
 
 DIRECTFB_CONF_OPT += --with-gfxdrivers=$(DIRECTFB_GFX)
 
-DIRECTFB_INPUT := \
+DIRECTFB_INPUT = \
 	$(if $(BR2_PACKAGE_DIRECTFB_LINUXINPUT),linuxinput) \
 	$(if $(BR2_PACKAGE_DIRECTFB_KEYBOARD),keyboard) \
 	$(if $(BR2_PACKAGE_DIRECTFB_PS2MOUSE),ps2mouse) \
@@ -82,9 +82,9 @@ DIRECTFB_DEPENDENCIES += tslib
 endif
 
 ifeq ($(strip $(DIRECTFB_INPUT)),)
-DIRECTFB_INPUT:=none
+DIRECTFB_INPUT = none
 else
-DIRECTFB_INPUT:=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
+DIRECTFB_INPUT = $(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif
 
 DIRECTFB_CONF_OPT += --with-inputdrivers=$(DIRECTFB_INPUT)
@@ -146,4 +146,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # directfb-csource for the host
-DIRECTFB_HOST_BINARY:=$(HOST_DIR)/usr/bin/directfb-csource
+DIRECTFB_HOST_BINARY = $(HOST_DIR)/usr/bin/directfb-csource
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 7c7585f4f2..1fd27d258f 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-DIVINE_VERSION := 0.4.0
-DIVINE_SITE := http://www.directfb.org/downloads/Extras
+DIVINE_VERSION = 0.4.0
+DIVINE_SITE = http://www.directfb.org/downloads/Extras
 DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 42e2e644c4..86238291ca 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -3,27 +3,28 @@
 # dmalloc
 #
 #############################################################
-DMALLOC_VERSION:=5.4.3
-DMALLOC_SOURCE:=dmalloc-$(DMALLOC_VERSION).tgz
-DMALLOC_SITE:=http://dmalloc.com/releases
+
+DMALLOC_VERSION = 5.4.3
+DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz
+DMALLOC_SITE = http://dmalloc.com/releases
 
 DMALLOC_LICENSE = MIT-like
 # license is in each file, dmalloc.h.1 is the smallest one
 DMALLOC_LICENSE_FILES = dmalloc.h.1
 
 DMALLOC_INSTALL_STAGING = YES
-DMALLOC_CONF_OPT:= --enable-shlib
+DMALLOC_CONF_OPT = --enable-shlib
 
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-DMALLOC_CONF_OPT+=--enable-cxx
+DMALLOC_CONF_OPT += --enable-cxx
 else
-DMALLOC_CONF_OPT+=--disable-cxx
+DMALLOC_CONF_OPT += --disable-cxx
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-DMALLOC_CONF_OPT+=--enable-threads
+DMALLOC_CONF_OPT += --enable-threads
 else
-DMALLOC_CONF_OPT+=--disable-threads
+DMALLOC_CONF_OPT += --disable-threads
 endif
 
 define DMALLOC_POST_PATCH
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 3fb237537c..66a9d70028 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -3,10 +3,11 @@
 # dmraid
 #
 #############################################################
-DMRAID_VERSION:=1.0.0.rc15
-DMRAID_SOURCE:=dmraid-$(DMRAID_VERSION).tar.bz2
-DMRAID_SITE:=http://people.redhat.com/~heinzm/sw/dmraid/src
-DMRAID_SUBDIR:=$(DMRAID_VERSION)
+
+DMRAID_VERSION = 1.0.0.rc15
+DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2
+DMRAID_SITE = http://people.redhat.com/~heinzm/sw/dmraid/src
+DMRAID_SUBDIR = $(DMRAID_VERSION)
 # lib and tools race with parallel make
 DMRAID_MAKE = $(MAKE1)
 DMRAID_INSTALL_STAGING = YES
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index 820ae9682c..f80cb1ba19 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -3,9 +3,10 @@
 # fbdump
 #
 #############################################################
-FBDUMP_VERSION:=0.4.2
-FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
-FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
+
+FBDUMP_VERSION = 0.4.2
+FBDUMP_SOURCE = fbdump-$(FBDUMP_VERSION).tar.gz
+FBDUMP_SITE = http://www.rcdrummond.net/fbdump
 FBDUMP_LICENSE = GPLv2
 FBDUMP_LICENSE_FILES = COPYING
 
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index f697fe8b1c..2a4029e241 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -3,9 +3,10 @@
 # fbv
 #
 #############################################################
-FBV_VERSION:=1.0b
-FBV_SOURCE:=fbv-$(FBV_VERSION).tar.gz
-FBV_SITE:=http://s-tech.elsat.net.pl/fbv
+
+FBV_VERSION = 1.0b
+FBV_SOURCE = fbv-$(FBV_VERSION).tar.gz
+FBV_SITE = http://s-tech.elsat.net.pl/fbv
 
 FBV_LICENSE = GPLv2
 FBV_LICENSE_FILES = COPYING
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 647281115a..6126a7467a 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-GENEXT2FS_VERSION=1.4.1
-GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
-GENEXT2FS_SITE:=http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
+GENEXT2FS_VERSION = 1.4.1
+GENEXT2FS_SOURCE = genext2fs-$(GENEXT2FS_VERSION).tar.gz
+GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index b64c0db28d..da208ac427 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -13,4 +13,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # gob2 for the host
-GOB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/gob2
+GOB2_HOST_BINARY = $(HOST_DIR)/usr/bin/gob2
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index b2ad94391d..ac18f7bb41 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -3,9 +3,10 @@
 # GtkPerf
 #
 #############################################################
-GTKPERF_VERSION:=0.40
-GTKPERF_SOURCE:=gtkperf_$(GTKPERF_VERSION).tar.gz
-GTKPERF_SITE:=http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION)
+
+GTKPERF_VERSION = 0.40
+GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz
+GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION)
 GTKPERF_DEPENDENCIES = libgtk2
 
 $(eval $(autotools-package))
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c3e510b127..a3684327f6 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -94,4 +94,4 @@ endif
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
-LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal
+LIBGLIB2_HOST_BINARY = $(HOST_DIR)/usr/bin/glib-genmarshal
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index 1e78fcadd9..fc229764df 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -4,11 +4,11 @@
 #
 #############################################################
 
-LIBID3TAG_VERSION:=0.15.1b
-LIBID3TAG_SOURCE:=libid3tag-$(LIBID3TAG_VERSION).tar.gz
-LIBID3TAG_SITE:=http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
-LIBID3TAG_INSTALL_STAGING=YES
-LIBID3TAG_DEPENDENCIES=zlib
-LIBID3TAG_LIBTOOL_PATCH=NO
+LIBID3TAG_VERSION = 0.15.1b
+LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VERSION).tar.gz
+LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
+LIBID3TAG_INSTALL_STAGING = YES
+LIBID3TAG_DEPENDENCIES = zlib
+LIBID3TAG_LIBTOOL_PATCH = NO
 
 $(eval $(autotools-package))
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 84b0212f8e..568d010d87 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -3,10 +3,11 @@
 # liblockfile
 #
 #############################################################
-LIBLOCKFILE_VERSION=1.08
-LIBLOCKFILE_SOURCE:=liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
-LIBLOCKFILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libl/liblockfile/
-LIBLOCKFILE_PATCH:=liblockfile_$(LIBLOCKFILE_VERSION)-4.debian.tar.bz2
+
+LIBLOCKFILE_VERSION = 1.08
+LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
+LIBLOCKFILE_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libl/liblockfile/
+LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-4.debian.tar.bz2
 
 LIBLOCKFILE_LICENSE = LGPLv2+, dotlockfile GPLv2+
 # No license file included, it refers to the gnu.org website
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index 745fcfa457..c574f5a602 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -4,11 +4,11 @@
 #
 #############################################################
 
-LIBRSVG_VERSION_MAJOR:=2.26
-LIBRSVG_VERSION_MINOR:=3
-LIBRSVG_VERSION:=$(LIBRSVG_VERSION_MAJOR).$(LIBRSVG_VERSION_MINOR)
-LIBRSVG_SOURCE:=librsvg-$(LIBRSVG_VERSION).tar.gz
-LIBRSVG_SITE:=http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/
+LIBRSVG_VERSION_MAJOR = 2.26
+LIBRSVG_VERSION_MINOR = 3
+LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).$(LIBRSVG_VERSION_MINOR)
+LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.gz
+LIBRSVG_SITE = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/
 LIBRSVG_INSTALL_STAGING = YES
 LIBRSVG_CONF_OPT = --disable-tools
 LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 gdk-pixbuf
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index 45b715be1a..d80385c004 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -3,9 +3,10 @@
 # librsync
 #
 #############################################################
-LIBRSYNC_VERSION:=0.9.7
-LIBRSYNC_SOURCE:=librsync-$(LIBRSYNC_VERSION).tar.gz
-LIBRSYNC_SITE:=http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
+
+LIBRSYNC_VERSION = 0.9.7
+LIBRSYNC_SOURCE = librsync-$(LIBRSYNC_VERSION).tar.gz
+LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
 LIBRSYNC_LICENSE = LGPLv2.1+
 LIBRSYNC_LICENSE_FILES = COPYING
 LIBRSYNC_INSTALL_STAGING = YES
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index 4fbb195dca..04ad695e81 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -21,9 +21,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-LIBSYSFS_VERSION:=2.1.0
-LIBSYSFS_SITE:=http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
-LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz
-LIBSYSFS_INSTALL_STAGING=YES
+LIBSYSFS_VERSION = 2.1.0
+LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
+LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz
+LIBSYSFS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 0934ffead0..6f0b904646 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -16,5 +16,5 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # variables used by other packages
-LIBTOOL:=$(HOST_DIR)/usr/bin/libtool
-LIBTOOLIZE:=$(HOST_DIR)/usr/bin/libtoolize
+LIBTOOL = $(HOST_DIR)/usr/bin/libtool
+LIBTOOLIZE = $(HOST_DIR)/usr/bin/libtoolize
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index de9dc12344..d4d281ad99 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -3,9 +3,10 @@
 # libungif
 #
 #############################################################
-LIBUNGIF_VERSION:=4.1.4
-LIBUNGIF_SOURCE:=libungif-$(LIBUNGIF_VERSION).tar.bz2
-LIBUNGIF_SITE:=http://downloads.sourceforge.net/project/giflib/libungif-4.x/libungif-$(LIBUNGIF_VERSION)
+
+LIBUNGIF_VERSION = 4.1.4
+LIBUNGIF_SOURCE = libungif-$(LIBUNGIF_VERSION).tar.bz2
+LIBUNGIF_SITE = http://downloads.sourceforge.net/project/giflib/libungif-4.x/libungif-$(LIBUNGIF_VERSION)
 LIBUNGIF_INSTALL_STAGING = YES
 LIBUNGIF_CONF_OPT = --without-x
 
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index a6f8ae9de1..996b10d6b3 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -3,9 +3,10 @@
 # libxml-parser-perl
 #
 #############################################################
-LIBXML_PARSER_PERL_VERSION:=2.36
-LIBXML_PARSER_PERL_SOURCE:=XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
-LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/
+
+LIBXML_PARSER_PERL_VERSION = 2.36
+LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
+LIBXML_PARSER_PERL_SITE = http://www.cpan.org/modules/by-module/XML/
 
 LIBXML_PARSER_PERL_DEPENDENCIES = expat
 
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 0394e29b15..923a813364 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -53,4 +53,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # libxml2 for the host
-LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint
+LIBXML2_HOST_BINARY = $(HOST_DIR)/usr/bin/xmllint
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index cbdb02af2e..03d5eb6c24 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -3,9 +3,10 @@
 # LiTE
 #
 #############################################################
-LITE_VERSION:=0.8.10
-LITE_SOURCE:=LiTE-$(LITE_VERSION).tar.gz
-LITE_SITE:=http://www.directfb.org/downloads/Libs
+
+LITE_VERSION = 0.8.10
+LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz
+LITE_SITE = http://www.directfb.org/downloads/Libs
 LITE_INSTALL_STAGING = YES
 LITE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index 1932adbfb3..65ef62b16c 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -3,9 +3,10 @@
 # lmbench
 #
 #############################################################
-LMBENCH_VERSION:=3.0-a9
-LMBENCH_SOURCE:=lmbench-$(LMBENCH_VERSION).tgz
-LMBENCH_SITE:=http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)/
+
+LMBENCH_VERSION = 3.0-a9
+LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
+LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)/
 LMBENCH_LICENSE =  lmbench license (based on GPLv2)
 LMBENCH_LICENSE_FILES = COPYING COPYING-2
 
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 475760540e..1f58e63a55 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -20,9 +20,9 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
-LRZSZ_VERSION:=0.12.20
-LRZSZ_SITE:=http://www.ohse.de/uwe/releases
-LRZSZ_SOURCE:=lrzsz-$(LRZSZ_VERSION).tar.gz
+LRZSZ_VERSION = 0.12.20
+LRZSZ_SITE = http://www.ohse.de/uwe/releases
+LRZSZ_SOURCE = lrzsz-$(LRZSZ_VERSION).tar.gz
 
 LRZSR_CONF_OPT = --disable-timesync
 
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index c219dc8a70..110437c101 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -3,13 +3,14 @@
 # lzma
 #
 #############################################################
-LZMA_VERSION:=4.32.7
-LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz
-LZMA_SITE:=http://tukaani.org/lzma/
+
+LZMA_VERSION = 4.32.7
+LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.gz
+LZMA_SITE = http://tukaani.org/lzma/
 LZMA_INSTALL_STAGING = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
-LZMA=$(HOST_DIR)/usr/bin/lzma
+LZMA = $(HOST_DIR)/usr/bin/lzma
diff --git a/package/make/make.mk b/package/make/make.mk
index 02b2741fd8..b67f9440cf 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -3,9 +3,10 @@
 # make
 #
 #############################################################
-MAKE_VERSION:=3.81
-MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
-MAKE_SITE:=$(BR2_GNU_MIRROR)/make
+
+MAKE_VERSION = 3.81
+MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
+MAKE_SITE = $(BR2_GNU_MIRROR)/make
 
 MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 460cae51e6..7e9344900f 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -3,9 +3,10 @@
 # mdadm
 #
 #############################################################
-MDADM_VERSION:=2.6.9
-MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
-MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
+
+MDADM_VERSION = 2.6.9
+MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
+MDADM_SITE = http://www.kernel.org/pub/linux/utils/raid/mdadm
 
 MDADM_MAKE_OPT = \
 	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(MDADM_DIR) mdadm
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index 9055951cb4..e80726c1fd 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -3,11 +3,12 @@
 # madplay
 #
 #############################################################
-MADPLAY_VERSION:=0.15.2b
-MADPLAY_SOURCE:=madplay-$(MADPLAY_VERSION).tar.gz
-MADPLAY_SITE:=http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
-MADPLAY_LIBTOOL_PATCH=NO
-MADPLAY_DEPENDENCIES=libmad libid3tag
+
+MADPLAY_VERSION = 0.15.2b
+MADPLAY_SOURCE = madplay-$(MADPLAY_VERSION).tar.gz
+MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
+MADPLAY_LIBTOOL_PATCH = NO
+MADPLAY_DEPENDENCIES = libmad libid3tag
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
diff --git a/package/multimedia/tidsp-binaries/tidsp-binaries.mk b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
index 4019563d8f..356baf4104 100644
--- a/package/multimedia/tidsp-binaries/tidsp-binaries.mk
+++ b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
@@ -1,6 +1,6 @@
-TIDSP_BINARIES_VERSION=23.i3.8
-TIDSP_BINARIES_SOURCE=tidsp-binaries-$(TIDSP_BINARIES_VERSION).tar.gz
-TIDSP_BINARIES_SITE:=http://gst-dsp.googlecode.com/files/
+TIDSP_BINARIES_VERSION = 23.i3.8
+TIDSP_BINARIES_SOURCE = tidsp-binaries-$(TIDSP_BINARIES_VERSION).tar.gz
+TIDSP_BINARIES_SITE = http://gst-dsp.googlecode.com/files/
 
 define TIDSP_BINARIES_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 7513686320..5f6cc4db5e 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-NETCAT_VERSION:=0.7.1
-NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz
-NETCAT_SITE=http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
+NETCAT_VERSION = 0.7.1
+NETCAT_SOURCE = netcat-$(NETCAT_VERSION).tar.gz
+NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index 7a2b49e0b8..a43a90c579 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -4,16 +4,16 @@
 #
 #############################################################
 
-OLSR_VERSION_MAJOR=0.5
-OLSR_VERSION_MINOR=6
-OLSR_VERSION:=$(OLSR_VERSION_MAJOR).$(OLSR_VERSION_MINOR)
-OLSR_SOURCE:=olsrd-$(OLSR_VERSION).tar.bz2
-OLSR_SITE:=http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)
-OLSR_BINARY:=olsrd
-OLSR_TARGET_BINARY:=usr/sbin/olsrd
+OLSR_VERSION_MAJOR = 0.5
+OLSR_VERSION_MINOR = 6
+OLSR_VERSION = $(OLSR_VERSION_MAJOR).$(OLSR_VERSION_MINOR)
+OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2
+OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)
+OLSR_BINARY = olsrd
+OLSR_TARGET_BINARY = usr/sbin/olsrd
 #OLSR_PLUGINS=httpinfo tas dot_draw nameservice dyn_gw dyn_gw_plain pgraph bmf quagga secure
-OLSR_PLUGINS=dot_draw dyn_gw secure
-OLSR_TARGET_PLUGIN=usr/lib/
+OLSR_PLUGINS = dot_draw dyn_gw secure
+OLSR_TARGET_PLUGIN = usr/lib/
 
 define OLSR_BUILD_CMDS
  $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(OLSR_PLUGINS)
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 6354ab7c5e..05876dcc7f 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -3,7 +3,8 @@
 # openocd
 #
 #############################################################
-OPENOCD_VERSION:=0.5.0
+
+OPENOCD_VERSION = 0.5.0
 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
 OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
 
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index b436ad8025..ee1a88b7ac 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -66,7 +66,7 @@ endif
 
 
 ### Pixel depths
-QT_PIXEL_DEPTHS := # empty
+QT_PIXEL_DEPTHS = # empty
 ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
 QT_PIXEL_DEPTHS += 1
 endif
@@ -432,7 +432,7 @@ endif
 # End of workaround.
 
 # Variable for other Qt applications to use
-QT_QMAKE:=$(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
+QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
 
 ################################################################################
 # QT_QMAKE_SET -- helper macro to set <variable> = <value> in
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 8ec6a334b2..46d56791b9 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -3,12 +3,13 @@
 # SDL_image addon for SDL
 #
 #############################################################
-SDL_IMAGE_VERSION:=1.2.6
-SDL_IMAGE_SOURCE:=SDL_image-$(SDL_IMAGE_VERSION).tar.gz
-SDL_IMAGE_SITE:=http://www.libsdl.org/projects/SDL_image/release
-SDL_IMAGE_INSTALL_STAGING:=YES
 
-SDL_IMAGE_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
+SDL_IMAGE_VERSION = 1.2.6
+SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
+SDL_IMAGE_INSTALL_STAGING = YES
+
+SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
 		--disable-sdltest \
 		--disable-static \
@@ -28,7 +29,7 @@ SDL_IMAGE_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
 		--enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
 		--enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
 
-SDL_IMAGE_DEPENDENCIES:=sdl \
+SDL_IMAGE_DEPENDENCIES = sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff)
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index a116840875..49a83233a3 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -29,4 +29,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # shared-mime-info for the host
-SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database
+SHARED_MIME_INFO_HOST_BINARY = $(HOST_DIR)/usr/bin/update-mime-database
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index 734609c12a..f900b924ec 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -3,9 +3,10 @@
 # udpcast
 #
 #############################################################
-UDPCAST_VERSION:=20071228
-UDPCAST_SOURCE:=udpcast-$(UDPCAST_VERSION).tar.gz
-UDPCAST_SITE:=http://www.udpcast.linux.lu/download
+
+UDPCAST_VERSION = 20071228
+UDPCAST_SOURCE = udpcast-$(UDPCAST_VERSION).tar.gz
+UDPCAST_SITE = http://www.udpcast.linux.lu/download
 UDPCAST_CONF_ENV = $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
 
 define UDPCAST_REMOVE_UDP_SENDER
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 2b24c681f8..7bc0a81e56 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -6,9 +6,10 @@
 # to enable that within busybox
 #
 #############################################################
-VTUN_VERSION:=3.0.2
-VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz
-VTUN_SITE:=http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
+
+VTUN_VERSION = 3.0.2
+VTUN_SOURCE = vtun-$(VTUN_VERSION).tar.gz
+VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
 VTUN_DEPENDENCIES = zlib lzo openssl
 
 VTUN_CONF_OPT = \
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index f127138db1..3723839422 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -12,11 +12,11 @@ ZLIB_LICENSE_FILES = README
 ZLIB_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-ZLIB_PIC :=
-ZLIB_SHARED := --static
+ZLIB_PIC =
+ZLIB_SHARED = --static
 else
-ZLIB_PIC := -fPIC
-ZLIB_SHARED := --shared
+ZLIB_PIC = -fPIC
+ZLIB_SHARED = --shared
 endif
 
 define ZLIB_CONFIGURE_CMDS

From 26f16d0fcf778562966dfa82b5a768007266d716 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 20 Jan 2013 09:45:48 +0000
Subject: [PATCH 4013/6849] packages: remove the last remaining copyright
 notices

There is no real reason to keep copyright notices in just four
packages, while none of the other packages have such copyright
notices.

The license is already clearly announced by the COPYING file in the
top Buildroot source directory. The authors are clearly credited
through the Git history of the project.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsysfs/libsysfs.mk | 17 -----------------
 package/lrzsz/lrzsz.mk       | 18 +-----------------
 package/ncurses/ncurses.mk   | 18 ------------------
 package/tcpdump/tcpdump.mk   |  2 --
 4 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index 04ad695e81..da4db6f4ce 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -3,23 +3,6 @@
 # libsysfs
 #
 #############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
 
 LIBSYSFS_VERSION = 2.1.0
 LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 1f58e63a55..14545d1aa5 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -3,23 +3,7 @@
 # lrzsz (provides zmodem)
 #
 #############################################################
-# Copyright (C) 2001-2005 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+
 LRZSZ_VERSION = 0.12.20
 LRZSZ_SITE = http://www.ohse.de/uwe/releases
 LRZSZ_SOURCE = lrzsz-$(LRZSZ_VERSION).tar.gz
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 4c48e8d144..2cfd332c10 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -4,25 +4,7 @@
 # this installs only a few vital termcap entries
 #
 #############################################################
-# Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.7 2005/01/03 04:38:13 andersen Exp $
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
 
-# TARGETS
 NCURSES_VERSION = 5.9
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_INSTALL_STAGING = YES
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 96414ef242..7ca3770654 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -3,8 +3,6 @@
 # tcpdump
 #
 #############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
 
 TCPDUMP_VERSION = 4.3.0
 TCPDUMP_SITE = http://www.tcpdump.org/release

From 847895d29524d81b64afb059b8649a77802a469b Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 20 Jan 2013 15:03:13 +0100
Subject: [PATCH 4014/6849] fs/common.mk: delay evaluation of variables

This makes things easier to understand and more consistent with the pkg-infra.
For example, it removes the need for '$$@' in the CMD variables of fs/*/*.mk.

It also makes it possible to update the variables later, e.g. in the package
override file.

It also makes sure that the date will be recorded correctly in Yann E. Morin's
patch that logs the MESSAGE macros to a file.

The fs/*/*.mk must be updated as well because the '$@' shouldn't be quoted
anymore in the CMD variables or the hooks.

The $(eval ...) for the dependencies is redundant, because the $(ROOTFS_TARGET)
variable is already eval'd. Note that it is only redundant if the evaluation of
the uses of the variable is also delayed.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cloop/cloop.mk       |  2 +-
 fs/common.mk            | 44 ++++++++++++++++++++---------------------
 fs/cpio/cpio.mk         |  2 +-
 fs/cramfs/cramfs.mk     |  2 +-
 fs/ext2/ext2.mk         |  2 +-
 fs/jffs2/jffs2.mk       |  8 ++++----
 fs/romfs/romfs.mk       |  2 +-
 fs/squashfs/squashfs.mk |  4 ++--
 fs/tar/tar.mk           |  2 +-
 fs/ubifs/ubi.mk         |  4 ++--
 fs/ubifs/ubifs.mk       |  2 +-
 11 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/fs/cloop/cloop.mk b/fs/cloop/cloop.mk
index c1d6abb802..c918684073 100644
--- a/fs/cloop/cloop.mk
+++ b/fs/cloop/cloop.mk
@@ -7,7 +7,7 @@
 ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
 
 define ROOTFS_CLOOP_CMD
-	$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $$@
+	$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
 endef
 
 $(eval $(call ROOTFS_TARGET,cloop))
\ No newline at end of file
diff --git a/fs/common.mk b/fs/common.mk
index b1512dd957..8b5b2f2e86 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -39,28 +39,28 @@ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) \
 define ROOTFS_TARGET_INTERNAL
 
 # extra deps
-$(eval ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma))
+ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
 
-$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
-	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
-	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
-	rm -f $(FAKEROOT_SCRIPT)
-	rm -f $(TARGET_DIR_WARNING_FILE)
-	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
-ifneq ($(ROOTFS_DEVICE_TABLES),)
-	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
-ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
-	printf '$(subst $(sep),\n,$(PACKAGES_DEVICES_TABLE))' >> $(FULL_DEVICE_TABLE)
+$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
+	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
+	$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
+	rm -f $$(FAKEROOT_SCRIPT)
+	rm -f $$(TARGET_DIR_WARNING_FILE)
+	echo "chown -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
+ifneq ($$(ROOTFS_DEVICE_TABLES),)
+	cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE)
+ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+	printf '$$(subst $$(sep),\n,$$(PACKAGES_DEVICES_TABLE))' >> $$(FULL_DEVICE_TABLE)
 endif
-	printf '$(subst $(sep),\n,$(PACKAGES_PERMISSIONS_TABLE))' >> $(FULL_DEVICE_TABLE)
-	echo "$(HOST_DIR)/usr/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+	printf '$$(subst $$(sep),\n,$$(PACKAGES_PERMISSIONS_TABLE))' >> $$(FULL_DEVICE_TABLE)
+	echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
 endif
-	echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)
-	chmod a+x $(FAKEROOT_SCRIPT)
-	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
-	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
-	-@rm -f $(FAKEROOT_SCRIPT) $(FULL_DEVICE_TABLE)
-	$(foreach hook,$(ROOTFS_$(2)_POST_GEN_HOOKS),$(call $(hook))$(sep))
+	echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
+	chmod a+x $$(FAKEROOT_SCRIPT)
+	$$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
+	cp support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
+	-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
+	$$(foreach hook,$$(ROOTFS_$(2)_POST_GEN_HOOKS),$$(call $$(hook))$$(sep))
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
 	gzip -9 -c $$@ > $$@.gz
 endif
@@ -68,13 +68,13 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
 	bzip2 -9 -c $$@ > $$@.bz2
 endif
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
-	$(LZMA) -9 -c $$@ > $$@.lzma
+	$$(LZMA) -9 -c $$@ > $$@.lzma
 endif
 
 rootfs-$(1)-show-depends:
-	@echo $(ROOTFS_$(2)_DEPENDENCIES)
+	@echo $$(ROOTFS_$(2)_DEPENDENCIES)
 
-rootfs-$(1): $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
+rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
 
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
 TARGETS += rootfs-$(1)
diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index 5533322d1c..5bcec13908 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -28,7 +28,7 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
 ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT
 
 define ROOTFS_CPIO_CMD
-	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@
+	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
 endef
 
 $(eval $(call ROOTFS_TARGET,cpio))
diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index 55f6bdbf98..6549f39ead 100644
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -10,7 +10,7 @@ CRAMFS_OPTS=-l
 endif
 
 define ROOTFS_CRAMFS_CMD
- $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $$@
+ $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
 endef
 
 ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index cc8da0e4dd..7b71592d97 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -21,7 +21,7 @@ endif
 ROOTFS_EXT2_DEPENDENCIES = host-genext2fs
 
 define ROOTFS_EXT2_CMD
-	PATH=$(TARGET_PATH) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $$@
+	PATH=$(TARGET_PATH) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
 $(eval $(call ROOTFS_TARGET,ext2))
diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk
index 2a69849cd5..b5423a8cb2 100644
--- a/fs/jffs2/jffs2.mk
+++ b/fs/jffs2/jffs2.mk
@@ -36,13 +36,13 @@ ROOTFS_JFFS2_DEPENDENCIES = host-mtd
 
 ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
 define ROOTFS_JFFS2_CMD
-	$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \
-	$(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \
-	rm $$@.nosummary
+	$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@.nosummary && \
+	$(SUMTOOL) $(SUMTOOL_OPTS) -i $@.nosummary -o $@ && \
+	rm $@.nosummary
 endef
 else
 define ROOTFS_JFFS2_CMD
-	$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@
+	$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@
 endef
 endif
 
diff --git a/fs/romfs/romfs.mk b/fs/romfs/romfs.mk
index 971947880b..1a9f49927e 100644
--- a/fs/romfs/romfs.mk
+++ b/fs/romfs/romfs.mk
@@ -9,7 +9,7 @@ ROMFS_TARGET=$(IMAGE).romfs
 ROOTFS_ROMFS_DEPENDENCIES = host-genromfs
 
 define ROOTFS_ROMFS_CMD
-	$(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $$@
+	$(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $@
 endef
 
 $(eval $(call ROOTFS_TARGET,romfs))
\ No newline at end of file
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index a680dae0f0..d4b56f4958 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -33,9 +33,9 @@ endif
 endif
 
 define ROOTFS_SQUASHFS_CMD
-	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend \
+	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
 		$(ROOTFS_SQUASHFS_ARGS) && \
-	chmod 0644 $$@
+	chmod 0644 $@
 endef
 
 $(eval $(call ROOTFS_TARGET,squashfs))
diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
index 4d435cb33b..1d327fa868 100644
--- a/fs/tar/tar.mk
+++ b/fs/tar/tar.mk
@@ -7,7 +7,7 @@
 TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS)
 
 define ROOTFS_TAR_CMD
- tar -c$(TAR_OPTS)f $$@ -C $(TARGET_DIR) .
+ tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
 endef
 
 $(eval $(call ROOTFS_TARGET,tar))
diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk
index c88e33639f..51ab42d15c 100644
--- a/fs/ubifs/ubi.mk
+++ b/fs/ubifs/ubi.mk
@@ -14,9 +14,9 @@ ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 
 define ROOTFS_UBI_CMD
 	cp fs/ubifs/ubinize.cfg . ;\
-	echo "image=$$@fs" \
+	echo "image=$@fs" \
 		>> ./ubinize.cfg ;\
-	$(HOST_DIR)/usr/sbin/ubinize -o $$@ $(UBI_UBINIZE_OPTS) ubinize.cfg ;\
+	$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) ubinize.cfg ;\
 	rm ubinize.cfg
 endef
 
diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk
index 337180edc0..8506dbdb8d 100644
--- a/fs/ubifs/ubifs.mk
+++ b/fs/ubifs/ubifs.mk
@@ -19,7 +19,7 @@ endif
 ROOTFS_UBIFS_DEPENDENCIES = host-mtd
 
 define ROOTFS_UBIFS_CMD
-	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
+	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
 endef
 
 $(eval $(call ROOTFS_TARGET,ubifs))
\ No newline at end of file

From 4d93ca15bce45484305136fd4cd46d52b398b8b8 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 19 Jan 2013 03:52:33 +0000
Subject: [PATCH 4015/6849] httping: remove redundant 'override CFLAGS' patch

It is not necessary to override CFLAGS when CFLAGS is passed through
the environment rather than as an argument to make.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/httping/httping-override-cflags.patch | 53 -------------------
 package/httping/httping.mk                    |  4 +-
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 package/httping/httping-override-cflags.patch

diff --git a/package/httping/httping-override-cflags.patch b/package/httping/httping-override-cflags.patch
deleted file mode 100644
index a3cf59d3c2..0000000000
--- a/package/httping/httping-override-cflags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 66f5811dd45fa27a7bfacf946dfefd16d765bb4d Mon Sep 17 00:00:00 2001
-From: Gilles Talis <gilles.talis@gmail.com>
-Date: Mon, 14 Jan 2013 11:48:00 -0800
-Subject: [PATCH] allow CFLAGS/LDFLAGS to be overriden from command line
-
-Ensure required CFLAGS/LDFLAGS are appended to those provided in command line
-
-Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
----
- Makefile |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4c4f6a8..fdbb4cb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ TARGET=httping
- DEBUG=yes
- WFLAGS=-Wall -W
- OFLAGS=-O3
--CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
-+override CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
-
- PACKAGE=$(TARGET)-$(VERSION)
- PREFIX=/usr
-@@ -48,19 +48,19 @@ DOCS=license.txt license.OpenSSL readme.txt
- # TFO=yes
-
- ifeq ($(SSL),no)
--CFLAGS+=-DNO_SSL
-+override CFLAGS+=-DNO_SSL
- else
- OBJS+=mssl.o
--LDFLAGS+=-lssl -lcrypto
-+override LDFLAGS+=-lssl -lcrypto
- endif
-
- ifeq ($(TFO),yes)
--CFLAGS+=-DTCP_TFO
-+override CFLAGS+=-DTCP_TFO
- endif
-
- ifeq ($(DEBUG),yes)
--CFLAGS+=-D_DEBUG -ggdb
--LDFLAGS+=-g
-+override CFLAGS+=-D_DEBUG -ggdb
-+override LDFLAGS+=-g
- endif
-
- ifeq ($(ARM),yes)
---
-1.7.4.1
-
diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 4c4d755d54..45478cfdc3 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -16,11 +16,11 @@ HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
 	DEBUG=no
 
 define HTTPING_BUILD_CMDS
-	$(MAKE) $(HTTPING_MAKE_OPT) -C $(@D)
+	$(HTTPING_MAKE_OPT) $(MAKE) -C $(@D)
 endef
 
 define HTTPING_INSTALL_TARGET_CMDS
-	$(MAKE) $(HTTPING_MAKE_OPT) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(HTTPING_MAKE_OPT) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
 define HTTPING_CLEAN_CMDS

From d9cbc45b92d760c1c7651ae48bf8d29e55533e32 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 Jan 2013 21:12:11 +0100
Subject: [PATCH 4016/6849] httping: don't override optimization level,
 correctly disable debug support

The httping makefile by default appends -O3 to CFLAGS, overriding the
optimization flags set in Buildroot, so pass OFLAGS= to disable this.

The DEBUG=no argument has to be passed on the make cmdline and not in the
environment to take effect, as it is unconditionally set in the Makefile.
Notice that it shouldn't be passed to 'make install', as that otherwise
will try to run the host strip program.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/httping/httping.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 45478cfdc3..e92be619af 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -12,11 +12,10 @@ HTTPING_LICENSE_FILES = license.txt
 HTTPING_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
 HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
 	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
-	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
-	DEBUG=no
+	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
 
 define HTTPING_BUILD_CMDS
-	$(HTTPING_MAKE_OPT) $(MAKE) -C $(@D)
+	$(HTTPING_MAKE_OPT) $(MAKE) OFLAGS= DEBUG=no -C $(@D)
 endef
 
 define HTTPING_INSTALL_TARGET_CMDS

From 1a111ffd21473c4862c1ce3404c103ac3a46372d Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 20 Jan 2013 00:31:14 +0000
Subject: [PATCH 4017/6849] xapp_xinit/xdm: only makes sense if there is an X
 server

[Peter: also add dependency for xdm (which selects xinit)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xdm/Config.in   | 2 ++
 package/x11r7/xapp_xinit/Config.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in
index b1c50d5247..c962993cf0 100644
--- a/package/x11r7/xapp_xdm/Config.in
+++ b/package/x11r7/xapp_xdm/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_XAPP_XDM
 	bool "xdm"
+	# Runtime dependency: can't start an X server unless there is one
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XAPP_XINIT
 	select BR2_PACKAGE_XAPP_SESSREG
 	select BR2_PACKAGE_XAPP_XRDB
diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in
index 9ac28175a6..30981c3293 100644
--- a/package/x11r7/xapp_xinit/Config.in
+++ b/package/x11r7/xapp_xinit/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_XAPP_XINIT
 	bool "xinit"
+	# Runtime dependency: can't start an X server unless there is one
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XAPP_XAUTH
 	select BR2_PACKAGE_XLIB_LIBX11
 	help

From 17b85cac50181aea39c35301c69e854e0db77656 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 20 Jan 2013 00:31:15 +0000
Subject: [PATCH 4018/6849] xapp_xinit depends on mcookie, not
 xserver_xorg-server

mcookie is not actually used by the Xorg server; it is used by xinit to
generate a xauth cookie before starting the server.

Verified with 'ack-grep -a mcookie build/x*' in an output directory with all
packages selected. The only other package that matches is x11vnc: it does a
runtime check for mcookie and falls back on /dev/random if it's missing.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xinit/Config.in          | 2 ++
 package/x11r7/xserver_xorg-server/Config.in | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in
index 30981c3293..aede5d9691 100644
--- a/package/x11r7/xapp_xinit/Config.in
+++ b/package/x11r7/xapp_xinit/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_XAPP_XINIT
 	bool "xinit"
 	# Runtime dependency: can't start an X server unless there is one
 	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
+	# Runtime dependency; mcookie is also in util-linux
+	select BR2_PACKAGE_MCOOKIE if !BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_XAPP_XAUTH
 	select BR2_PACKAGE_XLIB_LIBX11
 	help
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 5b60398183..21b07009ab 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-	select BR2_PACKAGE_MCOOKIE
 	# We need a SHA1 implementation. If either openssl or
 	# libgcrypt are already part of the build, we'll use one of
 	# them, otherwise, use the small libsha1 library.

From 0a714acf56e470257daa0c9fab9cc61a65eba8bf Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 19 Jan 2013 01:03:45 +0000
Subject: [PATCH 4019/6849] liburcu: bump to version 0.7.6

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liburcu/liburcu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 0bfba37a39..b4a4424cf8 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -3,7 +3,7 @@
 # liburc: userspace RCU (read-copy-update) library
 #
 #############################################################
-LIBURCU_VERSION = 0.7.5
+LIBURCU_VERSION = 0.7.6
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 

From 9cb4e19a136a9172228fd546562fd715be30b675 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 19 Jan 2013 01:03:46 +0000
Subject: [PATCH 4020/6849] lttng-tools: bump to version 2.1.1

* remove lttng-tools-Support-new-lttng-ust-error-code.patch (tarball
  fixed)
* remove lttng-tools-no-sync-file-range-in-uclibc.patch (merged
  upstream)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ols-Support-new-lttng-ust-error-code.patch | 82 -------------------
 ...g-tools-no-sync-file-range-in-uclibc.patch | 51 ------------
 package/lttng-tools/lttng-tools.mk            |  2 +-
 3 files changed, 1 insertion(+), 134 deletions(-)
 delete mode 100644 package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
 delete mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch

diff --git a/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch b/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
deleted file mode 100644
index 73d0884aee..0000000000
--- a/package/lttng-tools/lttng-tools-Support-new-lttng-ust-error-code.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 49c336c1679295a31b92223dca05feccfe3e3464 Mon Sep 17 00:00:00 2001
-From: David Goulet <dgoulet@efficios.com>
-Date: Fri, 9 Nov 2012 13:37:25 -0500
-Subject: [PATCH] Support new lttng-ust error code
-
-Signed-off-by: David Goulet <dgoulet@efficios.com>
----
-
-Only keep the src/bin/lttng-sessiond/lttng-ust-error.h adding part,
-needed to build lttng-tool without the lttng-libust dependency, i.e.
-with --disable-lttng-ust. (Samuel Martin)
-
----
- src/bin/lttng-sessiond/lttng-ust-error.h | 56 ++++++++++++++++++++++++++++++++
- 6 files changed, 75 insertions(+), 13 deletions(-)
- create mode 100644 src/bin/lttng-sessiond/lttng-ust-error.h
-
-diff --git a/src/bin/lttng-sessiond/lttng-ust-error.h b/src/bin/lttng-sessiond/lttng-ust-error.h
-new file mode 100644
-index 0000000..d83ecb8
---- /dev/null
-+++ b/src/bin/lttng-sessiond/lttng-ust-error.h
-@@ -0,0 +1,56 @@
-+#ifndef _LTTNG_UST_ERROR_H
-+#define _LTTNG_UST_ERROR_H
-+
-+/*
-+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
-+ *                      Julien Desfossez <julien.desfossez@polymtl.ca>
-+ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; only
-+ * version 2.1 of the License.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/*
-+ * This header is meant for liblttng and libust internal use ONLY.
-+ * These declarations should NOT be considered stable API.
-+ */
-+
-+#include <limits.h>
-+#include <unistd.h>
-+
-+#include "lttng-ust-abi.h"
-+
-+/*
-+ * ustcomm error code.
-+ */
-+enum lttng_ust_error_code {
-+	LTTNG_UST_OK = 0,			/* Ok */
-+	LTTNG_UST_ERR = 1024,			/* Unknown Error */
-+	LTTNG_UST_ERR_NOENT = 1025,		/* No entry */
-+	LTTNG_UST_ERR_EXIST = 1026,     /* Object exists */
-+	LTTNG_UST_ERR_INVAL = 1027,     /* Invalid argument */
-+	LTTNG_UST_ERR_PERM  = 1028,     /* Permission denied */
-+	LTTNG_UST_ERR_NOSYS = 1029,     /* Not implemented */
-+
-+	/* MUST be last element */
-+	LTTNG_UST_ERR_NR,			/* Last element */
-+};
-+
-+/*
-+ * Return a human-readable error message for an lttng-ust error code.
-+ * code must be a positive value (or 0).
-+ */
-+extern const char *lttng_ust_strerror(int code);
-+
-+#endif	/* _LTTNG_UST_ERROR_H */
--- 
-1.8.0.3
-
diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
deleted file mode 100644
index fcaaa3e32d..0000000000
--- a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Make sync_file_range() usage optional
-
-Under uClibc, sync_file_range() is not available under all
-architectures, so we fall back to fdatasync() in this case.
-
-Inspired by the patch done by Thomas Petazzoni for the
-2.0-pre25 version.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- configure.ac              |    2 +-
- src/common/compat/fcntl.h |    5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5808c79..065b9cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
- 	)
- ])
- AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
--AC_CHECK_FUNCS([sched_getcpu sysconf])
-+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
- 
- # check for dlopen
- AC_CHECK_LIB([dl], [dlopen],
-@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[
- ])
- 
- AS_ECHO()
--
-diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c
-index 5a1c757..7ff63a3 100644
---- a/src/common/compat/compat-fcntl.c
-+++ b/src/common/compat/compat-fcntl.c
-@@ -23,7 +23,11 @@
- int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
- 		unsigned int flags)
- {
-+#ifdef HAVE_SYNC_FILE_RANGE
- 	return sync_file_range(fd, offset, nbytes, flags);
-+#else
-+	return fdatasync(fd);
-+#endif
- }
- 
- #endif /* __linux__ */
--- 
-1.8.0.3
-
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 18477ba4c0..5be3abb587 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -3,7 +3,7 @@
 # LTTng-Tools: the trace control client
 #
 #############################################################
-LTTNG_TOOLS_VERSION = 2.1.0
+LTTNG_TOOLS_VERSION = 2.1.1
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 

From 5cc55a2ad1b48dae063420a56c4cd9ff90543990 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 19 Jan 2013 01:03:47 +0000
Subject: [PATCH 4021/6849] lttng-libust: bump to version 2.1.1

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-libust/lttng-libust.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index e1f51b1dbe..e143118301 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.1.0
+LTTNG_LIBUST_VERSION = 2.1.1
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES

From a686cff2019611f84cc58e9a0fc5d11381a113b4 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 19 Jan 2013 01:03:48 +0000
Subject: [PATCH 4022/6849] lttng-babeltrace: bump to version 1.0.2

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-babeltrace/lttng-babeltrace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 60b8a9353f..82376a3fe5 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -1,5 +1,5 @@
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
-LTTNG_BABELTRACE_VERSION = 1.0.0
+LTTNG_BABELTRACE_VERSION = 1.0.2
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2

From 9976b37f86b03007efad8bb73e0fbd42e17add35 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 18 Jan 2013 04:06:12 +0000
Subject: [PATCH 4023/6849] python3: Point /usr/bin/python to python3 if python
 is not selected

Fixes #5702

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python3/python3.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index bcd83eaf69..0d54162e85 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -148,5 +148,12 @@ PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_USELESS_FILES
 
 PYTHON3_AUTORECONF = YES
 
+define PYTHON3_INSTALL_SYMLINK
+	ln -fs python3 $(TARGET_DIR)/usr/bin/python
+endef
+
+ifneq ($(BR2_PACKAGE_PYTHON),y)
+PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK
+endif
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 6ffab129a3ebc76caf7ae40caf1f6b0185f3e114 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 18 Jan 2013 04:06:14 +0000
Subject: [PATCH 4024/6849] python3: Handle properly the pyc and py files on
 the target

Fixes #5690

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python3/python3.mk | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 0d54162e85..e7c09837ef 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -155,5 +155,27 @@ endef
 ifneq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK
 endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_PY_ONLY),y)
+define PYTHON3_REMOVE_MODULES_FILES
+	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \
+		 -name __pycache__` ; do \
+		rm -rf $$i ; \
+	done
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y)
+define PYTHON3_REMOVE_MODULES_FILES
+	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \
+		 -name *.py` ; do \
+		rm -f $$i ; \
+	done
+endef
+endif
+
+PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_MODULES_FILES
+
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 2934d1bb2d700ecc3bc605b0d4518beeb53a3228 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 20 Jan 2013 06:03:45 +0000
Subject: [PATCH 4025/6849] toolchain/external: sprinkle with some calls to
 MESSAGE

Thus, the failing step can be easily extracted by autobuilders,
to ease with post-mortem analysis.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 649e3a3d03..b0ca3cd74a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -325,7 +325,7 @@ endif
 # matches the configuration provided in Buildroot: ABI, C++ support,
 # type of C library and all C library features.
 $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
-	@echo "Checking external toolchain settings"
+	@$(call MESSAGE,"Checking external toolchain settings")
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
 	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
@@ -414,7 +414,7 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \
 	if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
-		echo "Copy external toolchain libraries to target..." ; \
+		$(call MESSAGE,"Copying external toolchain libraries to target...") ; \
 		for libs in $(LIB_EXTERNAL_LIBS); do \
 			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \
 		done ; \
@@ -422,12 +422,13 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
 		done ; \
 	fi ; \
-	echo "Copy external toolchain sysroot to staging..." ; \
+	$(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \
 	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
 	fi ; \
 	if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \
+		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
 		for d in $${ARCH_SYSROOT_DIR} $${ARCH_SYSROOT_DIR}/../debug-root/ ; do \
 			if test -f $${d}/usr/bin/gdbserver ; then \
@@ -446,6 +447,7 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 # Build toolchain wrapper for preprocessor, C and C++ compiler, and setup
 # symlinks for everything else
 $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
+	$(Q)$(call MESSAGE,"Building ext-toolchain wrapper")
 	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
 	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
 		base=$${i##*/}; \

From 9adea3f859ef6600fc6f42627aa9b0b8accaf545 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 20 Jan 2013 06:03:46 +0000
Subject: [PATCH 4026/6849] toolchain/crosstool-ng: sprinkle with some calls to
 MESSAGE

Thus, the failing step can be easily extracted by autobuilders,
to ease with post-mortem analysis.

At the same time, remove two debug echoes (Arnout).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index c09f732001..6554982548 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -68,9 +68,7 @@ $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 	$(Q)mkdir -p $(TARGET_DIR)/lib
 	$(Q)CTNG_TUPLE="$$( $(call ctng,show-tuple 2>&1) )";                \
 	    CTNG_SYSROOT="$(HOST_DIR)/usr/$${CTNG_TUPLE}/sysroot";          \
-	    echo "CTNG_TUPLE='$${CTNG_TUPLE}'";                             \
-	    echo "CTNG_SYSROOT='$${CTNG_SYSROOT}'";                         \
-	    echo "Copy external toolchain libraries to target...";          \
+	    $(call MESSAGE,"Copying toolchain libraries to target...");     \
 	    for libs in $(CTNG_LIBS_LIB); do                                \
 	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},,lib,$$libs,/lib); \
 	    done;                                                           \
@@ -85,6 +83,7 @@ $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 #       depending on the selected C library. Those deps are added later
 
 $(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/.config
+	$(Q)$(call MESSAGE,"Building the crosstool-NG toolchain")
 	$(Q)$(call ctng,build.$(PARALLEL_JOBS))
 	$(Q)printf "\n"
 	$(Q)touch $@

From ff5c89861b4bf7cbdca61b659bbe6f5e768d1a2a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 20 Jan 2013 06:03:47 +0000
Subject: [PATCH 4027/6849] toolchain/gcc: sprinkle with some calls to MESSAGE

Thus, the failing step can be easily extracted by autobuilders,
to ease with post-mortem analysis.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index b0d741b449..bdc38cd6e1 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -243,10 +243,12 @@ endif
 
 $(DL_DIR)/$(GCC_SOURCE):
 	mkdir -p $(DL_DIR)
+	$(call MESSAGE,"Downloading gcc")
 	$(call DOWNLOAD,$(GCC_SITE)/$(GCC_SOURCE))
 
 gcc-unpacked: $(GCC_DIR)/.patched
 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
+	$(Q)$(call MESSAGE,"Extracting gcc")
 	mkdir -p $(TOOLCHAIN_DIR)
 	rm -rf $(GCC_DIR)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
@@ -259,6 +261,7 @@ endif
 
 gcc-patched: $(GCC_DIR)/.patched
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
+	$(Q)$(call MESSAGE,"Patching gcc")
 	# Apply any files named gcc-*.patch from the source directory to gcc
 ifneq ($(wildcard $(GCC_PATCH_DIR)),)
 	support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch
@@ -279,6 +282,7 @@ endif
 GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial
 
 $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
+	$(Q)$(call MESSAGE,"Configuring gcc pass-1")
 	mkdir -p $(GCC_BUILD_DIR1)
 	(cd $(GCC_BUILD_DIR1); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
@@ -314,6 +318,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 	touch $@
 
 $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
+	$(Q)$(call MESSAGE,"Building gcc pass-1")
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
 	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
 else
@@ -323,6 +328,7 @@ endif
 
 gcc_initial=$(GCC_BUILD_DIR1)/.installed
 $(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
+	$(Q)$(call MESSAGE,"Installing gcc pass-1")
 	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
 	touch $(gcc_initial)
 
@@ -346,6 +352,7 @@ GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-intermediate
 # the step or libgcc will not build...
 
 $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
+	$(Q)$(call MESSAGE,"Configuring gcc pass-2")
 	mkdir -p $(GCC_BUILD_DIR2)
 	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
@@ -380,6 +387,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 	touch $@
 
 $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
+	$(Q)$(call MESSAGE,"Building gcc pass-2")
 	# gcc >= 4.3.0 have to also build all-target-libgcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
 	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc
@@ -390,6 +398,7 @@ endif
 
 gcc_intermediate=$(GCC_BUILD_DIR2)/.installed
 $(gcc_intermediate): $(GCC_BUILD_DIR2)/.compiled
+	$(Q)$(call MESSAGE,"Installing gcc pass-2")
 	# gcc >= 4.3.0 have to also install install-target-libgcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
 	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc
@@ -421,6 +430,7 @@ gcc_intermediate-dirclean:
 
 GCC_BUILD_DIR3:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final
 $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
+	$(Q)$(call MESSAGE,"Configuring gcc final")
 	mkdir -p $(GCC_BUILD_DIR3)
 	# Important! Required for limits.h to be fixed.
 	ln -snf ../include/ $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sys-include
@@ -457,10 +467,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 	touch $@
 
 $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
+	$(Q)$(call MESSAGE,"Building gcc final")
 	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all
 	touch $@
 
 $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled
+	$(Q)$(call MESSAGE,"Installing gcc final")
 	PATH=$(TARGET_PATH) $(MAKE) \
 		-C $(GCC_BUILD_DIR3) install
 	if [ -d "$(STAGING_DIR)/lib64" ]; then \
@@ -492,6 +504,7 @@ endif
 	touch $@
 
 $(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed
+	$(Q)$(call MESSAGE,"Installing gcc final libraries to staging and target")
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 	# These go in /lib, so...
 	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
@@ -548,6 +561,7 @@ $(GCC_BUILD_DIR4)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed
 	touch $@
 
 $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
+	$(Q)$(call MESSAGE,"Configuring gcc on target")
 	(cd $(GCC_BUILD_DIR4); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
@@ -586,6 +600,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 	touch $@
 
 $(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured
+	$(Q)$(call MESSAGE,"Building gcc on target")
 	PATH=$(TARGET_PATH) \
 	$(MAKE) -C $(GCC_BUILD_DIR4) all
 	touch $@
@@ -598,6 +613,7 @@ GCC_INCLUDE_DIR:=include-fixed
 endif
 
 $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
+	$(Q)$(call MESSAGE,"Installing gcc on target")
 	PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \
 		$(MAKE1) -C $(GCC_BUILD_DIR4) install
 	# Remove broken specs file (cross compile flag is set).

From f4a6aafa8cd7ef16da0b2ed016af8b9d95a78362 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 20 Jan 2013 06:03:48 +0000
Subject: [PATCH 4028/6849] toolchain/kernel-headers: sprinkle with some calls
 to MESSAGE

Thus, the failing step can be easily extracted by autobuilders,
to ease with post-mortem analysis.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/kernel-headers.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 568c192058..76602d849b 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -48,6 +48,7 @@ endif
 LINUX_HEADERS_DEPENDS:=
 
 $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
+	$(Q)$(call MESSAGE,"Extracting kernel headers")
 	rm -rf $(LINUX_HEADERS_DIR)
 	$(INSTALL) -d $(@D)
 	$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | \
@@ -55,6 +56,7 @@ $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
 	touch $@
 
 $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
+	$(Q)$(call MESSAGE,"Patching kernel headers")
 	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
 		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
 ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
@@ -64,6 +66,7 @@ endif
 	touch $@
 
 $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_UNPACK_DIR)/.patched
+	$(Q)$(call MESSAGE,"Installing kernel headers")
 	(cd $(LINUX_HEADERS_UNPACK_DIR); \
 	 $(MAKE) ARCH=$(KERNEL_ARCH) \
 		HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
@@ -76,6 +79,7 @@ $(DL_DIR)/$(LINUX_HEADERS_SOURCE):
 ifeq ($(BR2_KERNEL_HEADERS_SNAP),y)
 	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)
 endif
+	$(call MESSAGE,"Downloading kernel headers")
 	$(call DOWNLOAD,$(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE))
 
 kernel-headers: $(LINUX_HEADERS_DIR)/.configured

From f74dbd09818ab25dc79b696a401fd41956033542 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 20 Jan 2013 06:03:49 +0000
Subject: [PATCH 4029/6849] toolchain/uClibc: sprinkle with some calls to
 MESSAGE

Thus, the failing step can be easily extracted by autobuilders,
to ease with post-mortem analysis.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 055267cbcb..1b49a8d3a9 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -62,10 +62,12 @@ UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\
 endif
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
+	$(call MESSAGE,"Downloading uClibc")
 	$(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE))
 
 uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
+	$(Q)$(call MESSAGE,"Extracting uClibc")
 	mkdir -p $(TOOLCHAIN_DIR)
 	rm -rf $(UCLIBC_DIR)
 	$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
@@ -73,6 +75,7 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 
 uclibc-patched: $(UCLIBC_DIR)/.patched
 $(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
+	$(Q)$(call MESSAGE,"Patching uClibc")
 ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
 		uClibc-$(UCLIBC_VERSION)-\*.patch \
@@ -86,6 +89,7 @@ endif
 
 # Some targets may wish to provide their own UCLIBC_CONFIG_FILE...
 $(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.patched $(UCLIBC_CONFIG_FILE)
+	$(Q)$(call MESSAGE,"Pre-configuring uClibc")
 	cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.oldconfig
 	$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
 		-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
@@ -370,6 +374,7 @@ endif
 endif
 
 $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
+	$(Q)$(call MESSAGE,"Configuring uClibc")
 	cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config
 	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/usr/include
 	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib
@@ -393,6 +398,7 @@ $(UCLIBC_DIR)/.config: | host-ccache
 endif
 
 $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.config
+	$(Q)$(call MESSAGE,"Installing uClibc headers")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
 		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
@@ -415,6 +421,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 	touch $@
 
 $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate) $(LIBFLOAT_TARGET)
+	$(Q)$(call MESSAGE,"Building uClibc")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
 		PREFIX= \
@@ -440,6 +447,7 @@ uclibc-menuconfig: dirs $(UCLIBC_DIR)/.config
 
 
 $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
+	$(Q)$(call MESSAGE,"Installing uClibc to staging dir")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
 		PREFIX=$(STAGING_DIR) \
@@ -470,6 +478,7 @@ $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 
 ifneq ($(TARGET_DIR),)
 $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
+	$(Q)$(call MESSAGE,"Installing uClibc runtime to target dir")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
 		PREFIX=$(TARGET_DIR) \
@@ -481,6 +490,7 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
 	touch -c $@
 
 $(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
+	$(Q)$(call MESSAGE,"Installing uClibc utils to target dir")
 	$(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \
 		CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
@@ -525,11 +535,13 @@ uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
 uclibc-target-utils-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 
 $(UCLIBC_DIR)/test/unistd/errno:
+	$(Q)$(call MESSAGE,"Building uClibc test suite")
 	$(MAKE) -C $(UCLIBC_DIR)/test \
 	ARCH_CFLAGS=-I$(STAGING_DIR)/usr/include \
 	UCLIBC_ONLY=1 TEST_INSTALLED_UCLIBC=1 compile
 
 $(TARGET_DIR)/root/uClibc/test/unistd/errno: $(UCLIBC_DIR)/test/unistd/errno
+	$(Q)$(call MESSAGE,"Installing uClibc test suite to target dir")
 	mkdir -p $(TARGET_DIR)/root/uClibc
 	cp -rdpf $(UCLIBC_DIR)/test $(TARGET_DIR)/root/uClibc
 	$(INSTALL) $(UCLIBC_DIR)/Rules.mak $(TARGET_DIR)/root/uClibc
@@ -554,6 +566,7 @@ uclibc-test-dirclean:
 #############################################################
 
 $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a
+	$(Q)$(call MESSAGE,"Installing uClibc development files to target dir")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
 		PREFIX=$(TARGET_DIR) \

From a3ea5e8d3d5faaad209a55ef9e17cc7b5761b2fc Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Tue, 15 Jan 2013 23:24:08 +0000
Subject: [PATCH 4030/6849] vsftpd: install sample config file to /etc

vsftpd comes with a sample config file that can serve as a starting
point for customization and enables a basic functionality.

[Peter: drop /usr/share/empty creation]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/vsftpd.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 8d261c8626..a075e82629 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -44,6 +44,9 @@ define VSFTPD_INSTALL_TARGET_CMDS
 	test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
 		$(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
 			$(TARGET_DIR)/etc/init.d/S70vsftpd
+	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
+		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
+			$(TARGET_DIR)/etc/vsftpd.conf
 endef
 
 define VSFTPD_UNINSTALL_TARGET_CMDS

From ae5f324678458d27073d1c4e544c7c1d3383b4bd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Jan 2013 05:54:05 +0000
Subject: [PATCH 4031/6849] hostapd: bump to version 2.0

802.11ac support isn't enabled on purpose since it's broken on some
architectures.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hostapd/hostapd.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index b18881ad82..e00ad5aec2 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-HOSTAPD_VERSION = 1.1
+HOSTAPD_VERSION = 2.0
 HOSTAPD_SITE = http://hostap.epitest.fi/releases
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
@@ -21,6 +21,7 @@ endif
 
 define HOSTAPD_LIBNL_CONFIG
 	echo 'CONFIG_LIBNL32=y' >>$(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_VLAN_NETLINK.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 
 define HOSTAPD_LIBTOMMATH_CONFIG
@@ -52,6 +53,7 @@ define HOSTAPD_EAP_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_RADIUS_SERVER.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLSV1.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 ifneq ($(BR2_INET_IPV6),y)
 define HOSTAPD_RADIUS_IPV6_CONFIG
@@ -75,8 +77,10 @@ endif
 define HOSTAPD_CONFIGURE_CMDS
 	cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG)
 # Misc
+	$(SED) 's/\(#\)\(CONFIG_HS20.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(HOSTAPD_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_IEEE80211W.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_FULL_DYNAMIC_VLAN.*\)/\2/' $(HOSTAPD_CONFIG)
 	$(HOSTAPD_LIBTOMMATH_CONFIG)

From 5a77caa0f944b3b23a492f88ab991c203d5d9acb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Jan 2013 05:54:06 +0000
Subject: [PATCH 4032/6849] wpa_supplicant: bump to version 2.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wpa_supplicant/wpa_supplicant.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 02ca125604..762ceaf884 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WPA_SUPPLICANT_VERSION = 1.1
+WPA_SUPPLICANT_VERSION = 2.0
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
 WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
 WPA_SUPPLICANT_LICENSE_FILES = README
@@ -37,6 +37,7 @@ define WPA_SUPPLICANT_EAP_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_TLSV1.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 endef
 else
 define WPA_SUPPLICANT_EAP_CONFIG
@@ -117,8 +118,10 @@ endif
 
 define WPA_SUPPLICANT_CONFIGURE_CMDS
 	cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_HS20.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
+	$(SED) 's/\(#\)\(CONFIG_IEEE80211W.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(#\)\(CONFIG_DELAYED_MIC.*\)/\2/' $(WPA_SUPPLICANT_CONFIG)
 	$(SED) 's/\(CONFIG_DRIVER_ATMEL\)/#\1/' $(WPA_SUPPLICANT_CONFIG)

From c81a67056e793b5147f39711a34186b2db3f9313 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 18 Jan 2013 12:08:43 +0000
Subject: [PATCH 4033/6849] sg3_utils: new package

[Peter: rename to sg3-utils, invert package license logic]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/sg3_utils/Config.in    | 16 ++++++++++++++
 package/sg3_utils/sg3_utils.mk | 40 ++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 package/sg3_utils/Config.in
 create mode 100644 package/sg3_utils/sg3_utils.mk

diff --git a/package/Config.in b/package/Config.in
index ba03b3cc61..3fe5c79224 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -267,6 +267,7 @@ source "package/rpi-userland/Config.in"
 source "package/sane-backends/Config.in"
 source "package/sdparm/Config.in"
 source "package/setserial/Config.in"
+source "package/sg3_utils/Config.in"
 source "package/smartmontools/Config.in"
 source "package/snowball-hdmiservice/Config.in"
 source "package/sredird/Config.in"
diff --git a/package/sg3_utils/Config.in b/package/sg3_utils/Config.in
new file mode 100644
index 0000000000..3262eaef0e
--- /dev/null
+++ b/package/sg3_utils/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_SG3_UTILS
+	bool "sg3-utils"
+	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Low level utilities for devices that use a SCSI command set.
+	  This option install only libsgutils2 library not programs.
+
+	  http://sg.danny.cz/sg/sg3_utils.html
+
+config BR2_PACKAGE_SG3_UTILS_PROGS
+	bool "install programs"
+	depends on BR2_PACKAGE_SG3_UTILS
+
+comment "sg3-utils requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
new file mode 100644
index 0000000000..9015b2aab3
--- /dev/null
+++ b/package/sg3_utils/sg3_utils.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# sg3_utils
+#
+#############################################################
+
+SG3_UTILS_VERSION = 1.34
+SG3_UTILS_SITE    = http://sg.danny.cz/sg/p/
+SG3_UTILS_LICENSE = BSD-3c
+# utils progs are GPLv2+ licenced
+ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
+SG3_UTILS_LICENSE += GPLv2+
+endif
+SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
+
+# install the libsgutils2 library
+SG3_UTILS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)
+define SG3_UTILS_REMOVE_PROGS
+	for prog in \
+		dd decode_sense emc_trespass format get_config \
+		get_lba_status ident inq logs luns map26 \
+		map sgm_dd modes opcodes sgp_dd persist prevent \
+		raw rbuf rdac read readcap read_block_limits \
+		read_buffer read_long reassign referrals \
+		requests reset rmsn rtpg safte sanitize \
+		sat_identify sat_phy_event sat_set_features scan \
+		senddiag ses start stpg sync test_rwbuf turs \
+		unmap verify vpd write_buffer write_long \
+		write_same wr_mode ; do \
+		$(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \
+	done
+	$(RM) $(TARGET_DIR)/usr/bin/sginfo
+endef
+
+SG3_UTILS_POST_INSTALL_TARGET_HOOKS += SG3_UTILS_REMOVE_PROGS
+endif
+
+$(eval $(autotools-package))

From ff3c47ee04daa6f97e9911659fdea0636d65327f Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 18 Jan 2013 12:08:44 +0000
Subject: [PATCH 4034/6849] polkit: new package

[Peter: Config.in comment tweak]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/polkit/Config.in | 11 +++++++++++
 package/polkit/polkit.mk | 21 +++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 package/polkit/Config.in
 create mode 100644 package/polkit/polkit.mk

diff --git a/package/Config.in b/package/Config.in
index 3fe5c79224..167a52682a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -779,6 +779,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 endif
 source "package/monit/Config.in"
+source "package/polkit/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"
diff --git a/package/polkit/Config.in b/package/polkit/Config.in
new file mode 100644
index 0000000000..da5f985623
--- /dev/null
+++ b/package/polkit/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_POLKIT
+	bool "polkit"
+	depends on BR2_USE_WCHAR # libglib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_EXPAT
+	help
+	  PolicyKit is a toolkit for defining and handling
+	  authorizations.  It is used for allowing unprivileged
+	  processes to speak to privileged processes.
+
+	  http://www.freedesktop.org/wiki/Software/polkit
diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk
new file mode 100644
index 0000000000..3eb0422be1
--- /dev/null
+++ b/package/polkit/polkit.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# polkit
+#
+#############################################################
+
+POLKIT_VERSION = 0.103
+POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases/
+POLKIT_LICENSE = GPLv2
+POLKIT_LICENSE_FILES = COPYING
+
+POLKIT_INSTALL_STAGING = YES
+
+POLKIT_DEPENDENCIES = libglib2 host-intltool expat
+
+# We could also support --with-authfw=pam
+POLKIT_CONF_OPT = \
+	--with-authfw=shadow \
+	--with-os-type=unknown
+
+$(eval $(autotools-package))

From c7a81abc5421b95ea24efd1d74614ee032c014a4 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 18 Jan 2013 12:08:45 +0000
Subject: [PATCH 4035/6849] libatasmart: new package.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/libatasmart/Config.in      | 11 +++++++++++
 package/libatasmart/libatasmart.mk | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/libatasmart/Config.in
 create mode 100644 package/libatasmart/libatasmart.mk

diff --git a/package/Config.in b/package/Config.in
index 167a52682a..f3aa1c7dd7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -245,6 +245,7 @@ source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
 source "package/lcdproc/Config.in"
+source "package/libatasmart/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lshw/Config.in"
 source "package/lsuio/Config.in"
diff --git a/package/libatasmart/Config.in b/package/libatasmart/Config.in
new file mode 100644
index 0000000000..a3e44f8b2f
--- /dev/null
+++ b/package/libatasmart/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBATASMART
+	bool "libatasmart"
+	depends on BR2_PACKAGE_UDEV # libudev is configure dependency
+	help
+	  The libatasmart package is a disk reporting library.
+	  It only supports a subset of the ATA S.M.A.R.T. functionality.
+
+	  http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html
+
+comment "libatasmart requires udev to be enabled"
+	depends on !BR2_PACKAGE_UDEV
diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
new file mode 100644
index 0000000000..5dbdcc451e
--- /dev/null
+++ b/package/libatasmart/libatasmart.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# libatasmart
+#
+#############################################################
+LIBATASMART_VERSION = 0.19
+LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
+LIBATASMART_SITE    = http://0pointer.de/public
+LIBATASMART_LICENSE = LGPLv2.1
+LIBATASMART_LICENSE_FILE = LGPL
+LIBATASMART_INSTALL_STAGING = YES
+
+# package doesn't include configure script
+LIBATASMART_AUTORECONF = YES
+
+LIBATASMART_DEPENDENCIES = udev
+
+$(eval $(autotools-package))

From d4f2f892885a3e57a21312547328cf3f297f8024 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 21 Jan 2013 08:48:08 +0100
Subject: [PATCH 4036/6849] directfb: fixup input/gfx drivers handling after
 0e4d25ff0fc5

The input/gfx drivers handling got broken by the ':=' -> '=' conversion,
as we redefine the variables in terms of themselves, causing recursion.

Fix it by directly assigning the result to DIRECTFB_CONF_OPT instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 05a6c50764..0df866f22f 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -63,13 +63,12 @@ DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
-DIRECTFB_GFX = none
+DIRECTFB_CONF_OPT += --with-gfxdrivers=none
 else
-DIRECTFB_GFX = $(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
+DIRECTFB_CONF_OPT += \
+	--with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif
 
-DIRECTFB_CONF_OPT += --with-gfxdrivers=$(DIRECTFB_GFX)
-
 DIRECTFB_INPUT = \
 	$(if $(BR2_PACKAGE_DIRECTFB_LINUXINPUT),linuxinput) \
 	$(if $(BR2_PACKAGE_DIRECTFB_KEYBOARD),keyboard) \
@@ -82,13 +81,12 @@ DIRECTFB_DEPENDENCIES += tslib
 endif
 
 ifeq ($(strip $(DIRECTFB_INPUT)),)
-DIRECTFB_INPUT = none
+DIRECTFB_CONF_OPT += --with-inputdrivers=none
 else
-DIRECTFB_INPUT = $(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
+DIRECTFB_CONF_OPT += \
+	--with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif
 
-DIRECTFB_CONF_OPT += --with-inputdrivers=$(DIRECTFB_INPUT)
-
 ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y)
 DIRECTFB_CONF_OPT += --enable-gif
 else

From c60b67320f31cbc77727ceb7273311611a2a9b89 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 21 Jan 2013 09:18:04 +0100
Subject: [PATCH 4037/6849] directfb: drop unneeded AUTORECONF

Hasn't been needed since d1defbf39 (bump to version 1.4.11).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 0df866f22f..6d5b1ce537 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -9,7 +9,6 @@ DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSI
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_LICENSE = LGPLv2.1+
 DIRECTFB_LICENSE_FILES = COPYING
-DIRECTFB_AUTORECONF = YES
 DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \

From 45210100468e9d7f80335c9d181997384ea5fa62 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 20 Jan 2013 23:05:13 +0000
Subject: [PATCH 4038/6849] lttng-tools: fix version bumping to 2.1.1"

* re-introduce lttng-tools-no-sync-file-range-in-uclibc.patch
  (merged upstream just after the 2.1.1 release)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...g-tools-no-sync-file-range-in-uclibc.patch | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch

diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
new file mode 100644
index 0000000000..fcaaa3e32d
--- /dev/null
+++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
@@ -0,0 +1,51 @@
+Make sync_file_range() usage optional
+
+Under uClibc, sync_file_range() is not available under all
+architectures, so we fall back to fdatasync() in this case.
+
+Inspired by the patch done by Thomas Petazzoni for the
+2.0-pre25 version.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.ac              |    2 +-
+ src/common/compat/fcntl.h |    5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5808c79..065b9cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
+ 	)
+ ])
+ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
+-AC_CHECK_FUNCS([sched_getcpu sysconf])
++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
+ 
+ # check for dlopen
+ AC_CHECK_LIB([dl], [dlopen],
+@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[
+ ])
+ 
+ AS_ECHO()
+-
+diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c
+index 5a1c757..7ff63a3 100644
+--- a/src/common/compat/compat-fcntl.c
++++ b/src/common/compat/compat-fcntl.c
+@@ -23,7 +23,11 @@
+ int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+ 		unsigned int flags)
+ {
++#ifdef HAVE_SYNC_FILE_RANGE
+ 	return sync_file_range(fd, offset, nbytes, flags);
++#else
++	return fdatasync(fd);
++#endif
+ }
+ 
+ #endif /* __linux__ */
+-- 
+1.8.0.3
+

From bc0b96255b3258f1934d3058ce24fbb2677d3d8b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 20 Jan 2013 23:05:14 +0000
Subject: [PATCH 4039/6849] lttng-libust: fix version bumping to 2.1.1

* remove lttng-libust-dont-build-cxx-tests-when-not-available.patch
  (included in the 2.1.1 release)

fix http://autobuild.buildroot.net/results/1fcbb7b53536522b26097c858a7a95eeece02277/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...t-build-cxx-tests-when-not-available.patch | 62 -------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch

diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
deleted file mode 100644
index b7e8a8f091..0000000000
--- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 01dfa6e944d083db994f0a1165d3124bb6875437 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Tue, 8 May 2012 15:13:21 +0200
-Subject: [PATCH 1/1] don't build C++ example if a C++ compiler isn't
- available
-
-By default lttng-ust builds a hello.cxx C++ example that demonstrates
-the usage of the userspace tracing library in a C++ program.
-Unfortunately, when no C++ support is available, the build of lttng-ust
-fails just because of this example code. So we make the compilation of
-this code conditional on whether a working C++ compiler was found.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- configure.ac      |   12 ++++++++++++
- tests/Makefile.am |    6 +++++-
- 2 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 26227cb..56d84db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,6 +45,18 @@ AC_PROG_CXX
- AC_PROG_MAKE_SET
- LT_INIT
- 
-+# rw_PROG_CXX_WORKS
-+# Check whether the C++ compiler works.
-+AC_CACHE_CHECK([whether the C++ compiler works],
-+               [rw_cv_prog_cxx_works],
-+               [AC_LANG_PUSH([C++])
-+                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-+                               [rw_cv_prog_cxx_works=yes],
-+                               [rw_cv_prog_cxx_works=no])
-+                AC_LANG_POP([C++])])
-+
-+AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
-+
- ## Checks for libraries.
- AC_CHECK_LIB([dl], [dlopen],
- [
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 2b12422..7365ce4 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,7 +1,11 @@
- SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \
--		demo hello.cxx daemon
-+		demo daemon
- #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
- 
-+if CXX_WORKS
-+SUBDIRS += hello.cxx
-+endif
-+
- dist_noinst_SCRIPTS = test_loop runtests trace_matches
- 
- noinst_LIBRARIES = libtap.a
---
-1.7.10.1
-

From e7ac4d3987408e5b96bc01ce4e728a6ced383257 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 01:51:26 +0000
Subject: [PATCH 4040/6849] busybox: add ntp patch for 1.20.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch  | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch

diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch b/package/busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch
new file mode 100644
index 0000000000..17fc0b1c4a
--- /dev/null
+++ b/package/busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch
@@ -0,0 +1,11 @@
+--- busybox-1.20.2/networking/ntpd.c
++++ busybox-1.20.2-ntpd/networking/ntpd.c
+@@ -1840,7 +1840,7 @@ recv_and_process_client_pkt(void /*int f
+ 
+ 	/* Build a reply packet */
+ 	memset(&msg, 0, sizeof(msg));
+-	msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM;
++	msg.m_status = G.stratum < MAXSTRAT ? (G.ntp_status & LI_MASK) : LI_ALARM;
+ 	msg.m_status |= (query_status & VERSION_MASK);
+ 	msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?
+ 			 MODE_SERVER : MODE_SYM_PAS;

From 5d808d2e4b2237846f843e022934cb40fe4dbc13 Mon Sep 17 00:00:00 2001
From: Bogdan Radulescu <bogdan@nimblex.net>
Date: Mon, 21 Jan 2013 08:47:18 +0000
Subject: [PATCH 4041/6849] ncdu: new package

Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/ncdu/Config.in |  7 +++++++
 package/ncdu/ncdu.mk   | 15 +++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/ncdu/Config.in
 create mode 100644 package/ncdu/ncdu.mk

diff --git a/package/Config.in b/package/Config.in
index f3aa1c7dd7..2bb3d295c9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -780,6 +780,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 endif
 source "package/monit/Config.in"
+source "package/ncdu/Config.in"
 source "package/polkit/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
diff --git a/package/ncdu/Config.in b/package/ncdu/Config.in
new file mode 100644
index 0000000000..dac744410b
--- /dev/null
+++ b/package/ncdu/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_NCDU
+	bool "ncdu"
+	select BR2_PACKAGE_NCURSES
+	help
+	  ncdu is a disk usage analyzer with an ncurses interface
+
+	  http://dev.yorhel.nl/ncdu
diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk
new file mode 100644
index 0000000000..06f5e714d9
--- /dev/null
+++ b/package/ncdu/ncdu.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# ncdu
+#
+#############################################################
+
+NCDU_VERSION = 1.9
+NCDU_SITE = http://dev.yorhel.nl/download/
+
+NCDU_DEPENDENCIES = ncurses
+
+NCDU_LICENSE = MIT
+NCDU_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 30a198196a40ce469cc53f1e261a27acd35b8968 Mon Sep 17 00:00:00 2001
From: Bogdan Radulescu <bogdan@nimblex.net>
Date: Mon, 21 Jan 2013 10:40:41 +0000
Subject: [PATCH 4042/6849] iftop: new package

Added the iftop package which is really useful to see quickly
what uses the bandwidth on your machine.

[Peter: move to 'Networking applications', fix license]
Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/iftop/Config.in | 15 +++++++++++++++
 package/iftop/iftop.mk  | 15 +++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/iftop/Config.in
 create mode 100644 package/iftop/iftop.mk

diff --git a/package/Config.in b/package/Config.in
index 2bb3d295c9..39e2ec723d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -637,6 +637,7 @@ source "package/httping/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
 endif
+source "package/iftop/Config.in"
 source "package/igh-ethercat/Config.in"
 source "package/inadyn/Config.in"
 source "package/iperf/Config.in"
diff --git a/package/iftop/Config.in b/package/iftop/Config.in
new file mode 100644
index 0000000000..99ea973f40
--- /dev/null
+++ b/package/iftop/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_IFTOP
+	bool "iftop"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_LIBPCAP
+	depends on BR2_INET_IPV6
+	help
+	  iftop does for network usage what top(1) does for CPU usage.
+	  It listens to network traffic on a named interface and displays
+	  a table of current bandwidth usage by pairs of hosts. Handy for
+	  answering the question "why is our ADSL link so slow?".
+
+	  http://www.ex-parrot.com/pdw/iftop/
+
+comment "iftop requires IPv6 support in toolchain"
+	depends on !BR2_INET_IPV6
diff --git a/package/iftop/iftop.mk b/package/iftop/iftop.mk
new file mode 100644
index 0000000000..f6f2af27e2
--- /dev/null
+++ b/package/iftop/iftop.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# iftop
+#
+#############################################################
+
+IFTOP_VERSION = 1.0pre2
+IFTOP_SITE = http://www.ex-parrot.com/pdw/iftop/download/
+
+IFTOP_DEPENDENCIES = ncurses libpcap
+
+IFTOP_LICENSE = GPLv2+
+IFTOP_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From caf19397fbad36155a91a3bab4851f08c1585cb0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 21 Jan 2013 10:45:33 +0000
Subject: [PATCH 4043/6849] neardal: bump version to 0.8

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neardal/neardal.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk
index 66b729d6f9..9625f0ebfa 100644
--- a/package/neardal/neardal.mk
+++ b/package/neardal/neardal.mk
@@ -3,7 +3,8 @@
 # neardal
 #
 #############################################################
-NEARDAL_VERSION = 0.7
+
+NEARDAL_VERSION = 0.8
 NEARDAL_SITE = http://github.com/connectivity/neardal/tarball/$(NEARDAL_VERSION)
 NEARDAL_SOURCE = connectivity-neardal-$(NEARDAL_VERSION).tar.gz
 NEARDAL_INSTALL_STAGING = YES

From 198388ba4ce10fd09b07d34303e245e82b9024e6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 12:14:23 +0000
Subject: [PATCH 4044/6849] busybox: add 1.21.x series

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in             |    9 +-
 package/busybox/busybox-1.21.x.config | 1030 +++++++++++++++++++++++++
 2 files changed, 1037 insertions(+), 2 deletions(-)
 create mode 100644 package/busybox/busybox-1.21.x.config

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 6d9ff11830..2890c492d1 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -13,7 +13,7 @@ if BR2_PACKAGE_BUSYBOX
 
 choice
 	prompt "BusyBox Version"
-	default BR2_BUSYBOX_VERSION_1_20_X
+	default BR2_BUSYBOX_VERSION_1_21_X
 	help
 	  Select the version of BusyBox you wish to use.
 
@@ -23,6 +23,9 @@ choice
 	config BR2_BUSYBOX_VERSION_1_20_X
 		bool "BusyBox 1.20.x"
 
+	config BR2_BUSYBOX_VERSION_1_21_X
+		bool "BusyBox 1.21.x"
+
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
 
@@ -32,12 +35,14 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
 	default "1.20.2"	if BR2_BUSYBOX_VERSION_1_20_X
+	default "1.21.0"	if BR2_BUSYBOX_VERSION_1_21_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
-	default "package/busybox/busybox-1.20.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
+	default "package/busybox/busybox-1.21.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
 	default "package/busybox/busybox-1.20.x.config" if BR2_BUSYBOX_VERSION_1_20_X
+	default "package/busybox/busybox-1.21.x.config" if BR2_BUSYBOX_VERSION_1_21_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.
diff --git a/package/busybox/busybox-1.21.x.config b/package/busybox/busybox-1.21.x.config
new file mode 100644
index 0000000000..e46b528ab9
--- /dev/null
+++ b/package/busybox/busybox-1.21.x.config
@@ -0,0 +1,1030 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.21.0
+# Mon Jan 21 18:54:12 2013
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_UNICODE_SUPPORT is not set
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=0
+CONFIG_LAST_SUPPORTED_WCHAR=0
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_PID_FILE_PATH=""
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
+CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+# CONFIG_FEATURE_SYSTEMD is not set
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
+CONFIG_FEATURE_REVERSE_SEARCH=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_FEATURE_AR_CREATE=y
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+# CONFIG_GROUPS is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+# CONFIG_BASE64 is not set
+CONFIG_WHO=y
+# CONFIG_USERS is not set
+# CONFIG_CAL is not set
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+# CONFIG_FGCONSOLE is not set
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+# CONFIG_SHOWKEY is not set
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_PATCH=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_SED=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODINFO is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLOCKDEV is not set
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+CONFIG_BLKID=y
+# CONFIG_FEATURE_BLKID_TYPE is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+# CONFIG_FDISK is not set
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NILFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_DEVMEM=y
+CONFIG_EJECT=y
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+CONFIG_MICROCOM=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPC6 is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE=""
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_IOSTAT is not set
+CONFIG_LSOF=y
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
+# CONFIG_SMEMCAP is not set
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_LONG is not set
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_FEATURE_KMSG_SYSLOG is not set
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y

From 9c078e9222c30c59ebd650ef1bcff81edaeca14c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:41 +0000
Subject: [PATCH 4045/6849] xz: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xz/xz.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index e00c91bcba..8ff3c83d5f 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -3,11 +3,14 @@
 # xz-utils
 #
 #############################################################
+
 XZ_VERSION = 5.0.4
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
+XZ_LICENSE = GPLv2+ GPLv3+ LGPLv2.1+
+XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From d12b5b808537fbfa399b8aca4c13313327d1876b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:42 +0000
Subject: [PATCH 4046/6849] coreutils: add license information

[Peter: License is GPLv3+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/coreutils/coreutils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index d7d077998a..079ec127e5 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -7,6 +7,8 @@
 COREUTILS_VERSION = 8.18
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
+COREUTILS_LICENSE = GPLv3+
+COREUTILS_LICENSE_FILES = COPYING
 
 # If both coreutils and busybox are selected, make certain coreutils
 # wins the fight over who gets to have their utils actually installed.

From 1eb9845ad62c5e224ba736c8c8ad7640dfd79899 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:43 +0000
Subject: [PATCH 4047/6849] audiofile: add license information

[Peter: License is GPLv2+ LGPLv2+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/audiofile/audiofile.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index 1c6e6deaae..504a81a5dd 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -8,6 +8,8 @@ AUDIOFILE_VERSION = 0.3.4
 AUDIOFILE_SITE = http://audiofile.68k.org
 AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
+AUDIOFILE_LICENSE = GPLv2 LGPLv2
+AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
 
 # Useless and needs alsa-lib
 define AUDIOFILE_DISABLE_EXAMPLES

From 8121428b16e10236fb29322f5aeed02ff441f297 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:44 +0000
Subject: [PATCH 4048/6849] flex: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/flex.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 0c1ed5af18..b1963f98b3 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -11,6 +11,8 @@ FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
 FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
 FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
 FLEX_INSTALL_STAGING = YES
+FLEX_LICENSE = FLEX
+FLEX_LICENSE_FILES = COPYING
 FLEX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GETTEXT),gettext)
 # we don't have a host-gettext/libintl

From 194f479ca7a5fbaa8abdc2d93b50b78c3ed5b2b9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:45 +0000
Subject: [PATCH 4049/6849] gzip: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gzip/gzip.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 0c5c124098..821f69409d 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -6,5 +6,7 @@
 
 GZIP_VERSION = 1.5
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
+GZIP_LICENSE = GPLv3+
+GZIP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From ca005cdd214546c53d09233750b412896cc64d37 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:46 +0000
Subject: [PATCH 4050/6849] sshfs: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sshfs/sshfs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index e72db0aad9..f3c86cf570 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -7,6 +7,8 @@
 SSHFS_VERSION = 2.4
 SSHFS_SITE = http://downloads.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION)
 SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
+SSHFS_LICENSE = GPLv2
+SSHFS_LICENSE_FILES = COPYING
 SSHFS_DEPENDENCIES = \
 	libglib2 libfuse openssh \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \

From 9de76455375acc5c3a8660d1d43b3b12f652acba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:47 +0000
Subject: [PATCH 4051/6849] haserl: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/haserl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index 589b3e7a70..762791719d 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -6,6 +6,8 @@
 
 HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel/$(HASERL_VERSION)
+HASERL_LICENSE = GPLv2
+HASERL_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \

From ee4c73b75e0bc869e7fc3a89a4cb7bb00fdb1c45 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:48 +0000
Subject: [PATCH 4052/6849] libao: add license information

[Peter: License is GPLv2+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libao/libao.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index aee85a9e4b..d0234d5b26 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -8,6 +8,8 @@ LIBAO_VERSION = 1.1.0
 LIBAO_SITE = http://downloads.xiph.org/releases/ao
 LIBAO_DEPENDENCIES = host-pkgconf
 LIBAO_INSTALL_STAGING = YES
+LIBAO_LICENSE = GPLv2+
+LIBAO_LICENSE_FILES = COPYING
 LIBAO_CONF_OPT = --disable-esd --disable-wmm --disable-arts \
 			--disable-nas --disable-pulse
 

From 5a016d2148816961b27bbe05bd869024fccf02f7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:49 +0000
Subject: [PATCH 4053/6849] libvorbis: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libvorbis/libvorbis.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index c8ff213a18..ace8147c9c 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -8,9 +8,9 @@ LIBVORBIS_VERSION = 1.3.3
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
 LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
 LIBVORBIS_INSTALL_STAGING = YES
-
 LIBVORBIS_CONF_OPT = --disable-oggtest
-
 LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
+LIBVORBIS_LICENSE = BSD-3c
+LIBVORBIS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From d280e814b667d12d836986e50ae72b7d0c0f8ec6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Jan 2013 11:29:50 +0000
Subject: [PATCH 4054/6849] lame: add license information

[Peter: License is LGPLv2+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/lame/lame.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index a251f020b6..09705926ac 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -12,6 +12,8 @@ LAME_DEPENDENCIES = host-pkgconf
 LAME_INSTALL_STAGING = YES
 LAME_CONF_ENV = GTK_CONFIG=/bin/false
 LAME_CONF_OPT = --enable-dynamic-frontends
+LAME_LICENSE = LGPLv2+
+LAME_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 LAME_DEPENDENCIES += libsndfile

From ed357ebef6042619095e0e3e81cf1dcd27b19abc Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Mon, 21 Jan 2013 08:21:29 +0000
Subject: [PATCH 4055/6849] vsftpd: add empty directory /usr/share/empty

Vsftpd needs an empty directory where it can chroot.
If /usr/share/empty isn't present it refuses to work in the default
configuration.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/vsftpd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index a075e82629..36f2645893 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -47,6 +47,7 @@ define VSFTPD_INSTALL_TARGET_CMDS
 	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
 		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
 			$(TARGET_DIR)/etc/vsftpd.conf
+	install -d -m 700 $(TARGET_DIR)/usr/share/empty
 endef
 
 define VSFTPD_UNINSTALL_TARGET_CMDS

From 7e6b9c577176c792c41db4d65e916d5c4f16cbb5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 Jan 2013 08:43:50 +0100
Subject: [PATCH 4056/6849] can-utils: needs mmu support

Fixes http://autobuild.buildroot.org/results/2a06aecd58bb465f5e3c2610d34162b48c9ebba4/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/can-utils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/can-utils/Config.in b/package/can-utils/Config.in
index 79c1459464..d5d429761d 100644
--- a/package/can-utils/Config.in
+++ b/package/can-utils/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CAN_UTILS
 	bool "can-utils"
+	depends on BR2_USE_MMU # fork()
 	help
 	  SocketCAN is a set of open source CAN drivers and a
 	  networking stack.

From 045603fd65e73b4bcbec49e5d6e3eb052514cd18 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 Jan 2013 08:44:52 +0100
Subject: [PATCH 4057/6849] audiofile: fix license

Somehow this didn't get committed in 1eb9845ad6 (add license information)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/audiofile/audiofile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index 504a81a5dd..9886c4d1e4 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -8,7 +8,7 @@ AUDIOFILE_VERSION = 0.3.4
 AUDIOFILE_SITE = http://audiofile.68k.org
 AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-AUDIOFILE_LICENSE = GPLv2 LGPLv2
+AUDIOFILE_LICENSE = GPLv2+ LGPLv2+
 AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
 
 # Useless and needs alsa-lib

From db7a831da184e2fa2ed1f43ef528b81d2023d986 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 22 Jan 2013 15:55:55 +0100
Subject: [PATCH 4058/6849] package: add bustle dbus monitor package

Only builds the capture tool, not the (host) graphical viewer.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/bustle/Config.in | 22 ++++++++++++++++++++++
 package/bustle/bustle.mk | 23 +++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/bustle/Config.in
 create mode 100644 package/bustle/bustle.mk

diff --git a/package/Config.in b/package/Config.in
index 39e2ec723d..c4e5ad5f64 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -53,6 +53,7 @@ source "package/automake/Config.in"
 source "package/binutils/Config.in"
 source "package/bison/Config.in"
 source "package/bsdiff/Config.in"
+source "package/bustle/Config.in"
 source "package/ccache/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/coreutils/Config.in"
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
new file mode 100644
index 0000000000..2a2a2c1d68
--- /dev/null
+++ b/package/bustle/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_BUSTLE
+	bool "bustle"
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_PACKAGE_DBUS # runtime
+	help
+	  Bustle is a better dbus-monitor! It records and draws
+	  sequence diagrams of D-Bus activity, showing signal
+	  emissions, method calls and their corresponding returns,
+	  with timestamps for each individual event and the duration
+	  of each method call. This can help you check for unwanted
+	  D-Bus traffic, and pinpoint why your D-Bus-based application
+	  isn't performing as well as you like.
+
+	  This only installs the command line bustle-pcap tool, not
+	  the graphical viewer.
+
+	  http://www.willthompson.co.uk/bustle/
+
+comment "bustle requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/bustle/bustle.mk b/package/bustle/bustle.mk
new file mode 100644
index 0000000000..88d49b62e6
--- /dev/null
+++ b/package/bustle/bustle.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# bustle
+#
+#############################################################
+
+BUSTLE_VERSION = 0.4.2
+BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION)/
+BUSTLE_LICENSE = LGPLv2.1+
+BUSTLE_LICENSE_FILES = LICENSE
+BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
+
+define BUSTLE_BUILD_CMDS
+	PATH=$(TARGET_PATH) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		PCAP_FLAGS='-lpcap' -C $(@D) dist/build/bustle-pcap
+endef
+
+define BUSTLE_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/dist/build/bustle-pcap \
+		$(TARGET_DIR)/usr/bin/bustle-pcap
+endef
+
+$(eval $(generic-package))

From 6e044a3a5bb624eb44e3935d0a08d28b44c1b234 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 00:46:02 +0000
Subject: [PATCH 4059/6849] kernel-headers: bump 3.{0, 4, 7}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.59-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.60-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index d12a824f5f..a966220726 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.59"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.60"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.37"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.26"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.27"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.3"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.4"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.59-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.60-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.59-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.60-headers_install-fix-__packed-in-exported-kernel-head.patch

From b2d2cdca5f86c89ee2756a0d935b034061982fbf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 00:46:03 +0000
Subject: [PATCH 4060/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 056b3497c0..175a999231 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.3"
+	bool "3.7.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.3" if BR2_LINUX_KERNEL_3_7
+	default "3.7.4" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From fb6404e1e20a718cc47176823f320cf67c0d6cc7 Mon Sep 17 00:00:00 2001
From: Patrick Gerber <kpa_info@yahoo.fr>
Date: Tue, 22 Jan 2013 00:09:32 +0000
Subject: [PATCH 4061/6849] Yavta: new package

[Peter: License is GPLv2+, move out of package/multimedia]
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in |  1 +
 package/yavta/Config.in      |  6 ++++++
 package/yavta/yavta.mk       | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/yavta/Config.in
 create mode 100644 package/yavta/yavta.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index e50eda97bd..931e6d39a2 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -25,4 +25,5 @@ source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
 source "package/multimedia/wavpack/Config.in"
+source "package/yavta/Config.in"
 endmenu
diff --git a/package/yavta/Config.in b/package/yavta/Config.in
new file mode 100644
index 0000000000..6a42a944d6
--- /dev/null
+++ b/package/yavta/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_YAVTA
+	bool "yavta"
+	help
+	  Yet Another V4L2 Test Application
+
+	  http://git.ideasonboard.org/yavta.git
diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk
new file mode 100644
index 0000000000..b8a72de982
--- /dev/null
+++ b/package/yavta/yavta.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# yavta
+#
+#############################################################
+
+YAVTA_VERSION = 82ff2efdb9787737b9f21b6f4759f077c827b238
+YAVTA_SITE = git://git.ideasonboard.org/yavta.git
+YAVTA_LICENSE = GPLv2+
+YAVTA_LICENSE_FILES = COPYING.GPL
+
+define YAVTA_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define YAVTA_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/yavta $(TARGET_DIR)/usr/bin/yavta
+endef
+
+$(eval $(generic-package))

From d76a37d1d2e38d59127b5da53a20c48e177a9f7c Mon Sep 17 00:00:00 2001
From: Patrick Gerber <kpa_info@yahoo.fr>
Date: Tue, 22 Jan 2013 00:09:33 +0000
Subject: [PATCH 4062/6849] Media-ctl: new package

[Peter: fix help text]
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/media-ctl/Config.in    |  9 +++++++++
 package/media-ctl/media-ctl.mk | 17 +++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/media-ctl/Config.in
 create mode 100644 package/media-ctl/media-ctl.mk

diff --git a/package/Config.in b/package/Config.in
index c4e5ad5f64..ebd9817580 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -252,6 +252,7 @@ source "package/lshw/Config.in"
 source "package/lsuio/Config.in"
 source "package/lvm2/Config.in"
 source "package/mdadm/Config.in"
+source "package/media-ctl/Config.in"
 source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
diff --git a/package/media-ctl/Config.in b/package/media-ctl/Config.in
new file mode 100644
index 0000000000..8d1beda69a
--- /dev/null
+++ b/package/media-ctl/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_MEDIA_CTL
+	bool "media-ctl"
+	help
+	  Media controller control application
+
+	  Useful mostly with ARM OMAP processors to configure and
+	  control the image subsystem
+
+	  http://git.ideasonboard.org/media-ctl.git
diff --git a/package/media-ctl/media-ctl.mk b/package/media-ctl/media-ctl.mk
new file mode 100644
index 0000000000..065751e5c9
--- /dev/null
+++ b/package/media-ctl/media-ctl.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# media-ctl
+#
+#############################################################
+
+MEDIA_CTL_VERSION = ac40b79f002a2315f909548614ccd2d408da25b7
+MEDIA_CTL_SITE = git://git.ideasonboard.org/media-ctl.git
+MEDIA_CTL_INSTALL_STAGING = YES
+MEDIA_CTL_LICENSE = LGPLv2.1+
+MEDIA_CTL_LICENSE_FILES = COPYING.LIB
+
+MEDIA_CTL_AUTORECONF = YES
+MEDIA_CTL_CONF_OPT = --with-kernel-headers=$(STAGING_DIR)/usr/include
+MEDIA_CTL_DEPENDENCIES = host-pkgconf
+
+$(eval $(autotools-package))

From 6271f9099749744545eda66a31eb5c80e6278e52 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 24 Jan 2013 09:26:52 +0100
Subject: [PATCH 4063/6849] polkit: show comment when wchar isn't enabled

As pointed out by Arnout.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polkit/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/polkit/Config.in b/package/polkit/Config.in
index da5f985623..b47022a026 100644
--- a/package/polkit/Config.in
+++ b/package/polkit/Config.in
@@ -9,3 +9,6 @@ config BR2_PACKAGE_POLKIT
 	  processes to speak to privileged processes.
 
 	  http://www.freedesktop.org/wiki/Software/polkit
+
+comment "polkit requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From 9fe6a4d0b7f994d2fd484ddd6af44480a8868209 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@gmail.com>
Date: Thu, 24 Jan 2013 01:33:53 +0000
Subject: [PATCH 4064/6849] gdb: Add support for gdb 7.5.1 and make it the
 default

Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/Config.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 6a8e48ed70..53dcb93bea 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -45,7 +45,7 @@ choice
 	prompt "GDB debugger Version"
 	default BR2_GDB_VERSION_6_6 if BR2_bfin
 	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
-	default BR2_GDB_VERSION_7_4
+	default BR2_GDB_VERSION_7_5
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
 	help
 	  Select the version of gdb you wish to use.
@@ -95,6 +95,12 @@ choice
 		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
+	config BR2_GDB_VERSION_7_5
+		bool "gdb 7.5.x"
+		depends on !BR2_bfin
+		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
+		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
+
 endchoice
 
 comment "gdb support needs pthread debug support in toolchain"
@@ -110,3 +116,4 @@ config BR2_GDB_VERSION
 	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
 	default "7.4.1"    if BR2_GDB_VERSION_7_4
+	default "7.5.1"    if BR2_GDB_VERSION_7_5

From 9cf65c41c868e19a974b31bbeb54d6b5bac77b8c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 24 Jan 2013 14:44:06 +0100
Subject: [PATCH 4065/6849] gdb: remove 6.8 / 7.0.1 / 7.1, deprecate 7.2 / 7.3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../6.8a/600-fix-compile-flag-mismatch.patch  | 31 -------------------
 toolchain/gdb/Config.in                       | 24 ++------------
 2 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch

diff --git a/toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch b/toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch
deleted file mode 100644
index 13b72bb96d..0000000000
--- a/toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/gdb/gdbserver/configure
-+++ b/gdb/gdbserver/configure
-@@ -1239,7 +1239,7 @@
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
--      if test "x$ac_old_val" != "x$ac_new_val"; then
-+      if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
- 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=
- 
- ac_unique_file="main.c"
--ac_subdirs_all="$ac_subdirs_all doc testsuite"
-+ac_subdirs_all="$ac_subdirs_all doc"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-@@ -3077,7 +3077,7 @@
- 
- 
- 
--subdirs="$subdirs doc testsuite"
-+subdirs="$subdirs doc"
- 
- 
- # Provide defaults for some variables set by the per-host and per-target
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 53dcb93bea..69f79157b0 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -58,34 +58,17 @@ choice
 		depends on BR2_avr32
 		bool "gdb 6.7.1-avr32-2.1.5"
 
-	config BR2_GDB_VERSION_6_8
-		bool "gdb 6.8"
-		depends on !(BR2_avr32 || BR2_bfin)
-		depends on BR2_DEPRECATED
-
-	config BR2_GDB_VERSION_7_0_1
-		bool "gdb 7.0.1"
-		depends on !BR2_bfin
-		depends on BR2_DEPRECATED
-		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
-
-	config BR2_GDB_VERSION_7_1
-		bool "gdb 7.1"
-		depends on !BR2_bfin
-		depends on BR2_DEPRECATED
-		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
-
 	config BR2_GDB_VERSION_7_2
 		bool "gdb 7.2.x"
 		depends on !BR2_bfin
+		depends on BR2_DEPRECATED
 		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
 	config BR2_GDB_VERSION_7_3
 		bool "gdb 7.3.x"
 		depends on !BR2_bfin
+		depends on BR2_DEPRECATED
 		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
 
@@ -110,9 +93,6 @@ config BR2_GDB_VERSION
 	string
 	default "6.6a"     if BR2_GDB_VERSION_6_6
 	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
-	default "6.8a"     if BR2_GDB_VERSION_6_8
-	default "7.0.1a"   if BR2_GDB_VERSION_7_0_1
-	default "7.1a"     if BR2_GDB_VERSION_7_1
 	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
 	default "7.4.1"    if BR2_GDB_VERSION_7_4

From f375feb74a71745d9e0ce49d95f9f2561506b5b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Jan 2013 02:50:37 +0000
Subject: [PATCH 4066/6849] e2fsprogs: bump to version 1.42.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5b3b7d0293..edc3e8ef0b 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-E2FSPROGS_VERSION = 1.42.6
+E2FSPROGS_VERSION = 1.42.7
 E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
 E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h

From 13b0a3fa84140a1b45a487914dd3a6397204c171 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Jan 2013 02:50:38 +0000
Subject: [PATCH 4067/6849] ntfs-3g: bump to version 2013.1.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/ntfs-3g.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index cefb73a40d..e9a91a4ddf 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -4,12 +4,14 @@
 #
 #############################################################
 
-NTFS_3G_VERSION = 2012.1.15
+NTFS_3G_VERSION = 2013.1.13
 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
 NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
 NTFS_3G_DEPENDENCIES = host-pkgconf
+NTFS_3G_LICENSE = GPLv2+ LGPLv2+
+NTSF_3G_LICENSE_FILES = COPYING COPYING.LIB
 
 ifeq ($(BR2_PACKAGE_LIBFUSE),y)
 	NTFS_3G_CONF_OPT += --with-fuse=external

From a58506aa0863a888863f2e9c77f6cd729cb0bd11 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Jan 2013 02:50:39 +0000
Subject: [PATCH 4068/6849] flex: bump to version 2.5.37

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/Config.in                                    | 2 +-
 .../{flex-2.5.35-prog-ar.patch => flex-prog-ar.patch}     | 0
 package/flex/flex.mk                                      | 8 ++------
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename package/flex/{flex-2.5.35-prog-ar.patch => flex-prog-ar.patch} (100%)

diff --git a/package/flex/Config.in b/package/flex/Config.in
index adef46867a..90a75f4756 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_FLEX
 	  A fast lexical analyser generator.  A tool for generating
 	  programs that perform pattern-matching on text.
 
-	  http://www.gnu.org/software/flex/
+	  http://flex.sourceforge.net/
 
 config BR2_PACKAGE_FLEX_BINARY
 	bool "Install tool in the target"
diff --git a/package/flex/flex-2.5.35-prog-ar.patch b/package/flex/flex-prog-ar.patch
similarity index 100%
rename from package/flex/flex-2.5.35-prog-ar.patch
rename to package/flex/flex-prog-ar.patch
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index b1963f98b3..834f0b548f 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -4,12 +4,8 @@
 #
 #############################################################
 
-FLEX_VERSION = 2.5.35
-FLEX_PATCH_VERSION = 10
-FLEX_SOURCE = flex_$(FLEX_VERSION).orig.tar.gz
-FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
-FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
-FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
+FLEX_VERSION = 2.5.37
+FLEX_SITE = http://download.sourceforge.net/project/flex
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING

From 41a221332682db9902ca1572d548e56cda87f260 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Jan 2013 02:50:40 +0000
Subject: [PATCH 4069/6849] sudo: bump to version 1.8.6p4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index e6b554c498..a01ac0cc70 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.6
+SUDO_VERSION = 1.8.6p4
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 SUDO_LICENSE = ICS BSD-3c
 SUDO_LICENSE_FILES = doc/LICENSE

From e69cf9411d4f15abdee9ede99a21650c86de4830 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 27 Jan 2013 05:07:19 +0000
Subject: [PATCH 4070/6849] polkit: don't build documentation and examples

Building the manpages of polkit fails with issues in xsltproc. Since
we are generally not that much interested in documentation, we disable
them. This solves the build issues like
http://autobuild.buildroot.org/results/751b71a594fa04924c7c3bb8f2c460ce1e44aa90/build-end.log.

While we're at it, we also disable the build of the polkit example
programs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polkit/polkit.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk
index 3eb0422be1..54782dd6bf 100644
--- a/package/polkit/polkit.mk
+++ b/package/polkit/polkit.mk
@@ -16,6 +16,8 @@ POLKIT_DEPENDENCIES = libglib2 host-intltool expat
 # We could also support --with-authfw=pam
 POLKIT_CONF_OPT = \
 	--with-authfw=shadow \
-	--with-os-type=unknown
+	--with-os-type=unknown \
+	--disable-man-pages \
+	--disable-examples
 
 $(eval $(autotools-package))

From f99c2a82fa1a2aa94072a5d2066828fd589075f8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 27 Jan 2013 05:35:11 +0000
Subject: [PATCH 4071/6849] olsr: reindent commands with tabs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/olsr/olsr.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index a43a90c579..a93312e987 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -16,18 +16,18 @@ OLSR_PLUGINS = dot_draw dyn_gw secure
 OLSR_TARGET_PLUGIN = usr/lib/
 
 define OLSR_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(OLSR_PLUGINS)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(OLSR_PLUGINS)
 endef
 
 define OLSR_INSTALL_TARGET_CMDS
- cp -dpf $(@D)/$(OLSR_BINARY) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
- cp -R $(@D)/lib/*/olsrd_*.so* $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)
- mkdir -p $(TARGET_DIR)/etc/init.d
- cp -dpf package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/
- test -r $(TARGET_DIR)/etc/olsrd.conf || \
-   cp -dpf $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so*
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
+	cp -dpf $(@D)/$(OLSR_BINARY) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
+	cp -R $(@D)/lib/*/olsrd_*.so* $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)
+	mkdir -p $(TARGET_DIR)/etc/init.d
+	cp -dpf package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/
+	test -r $(TARGET_DIR)/etc/olsrd.conf || \
+		cp -dpf $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so*
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
 endef
 
 define OLSR_CLEAN_CMDS

From 7f8fa1afeb72a89eac9508fcae1ea6e3a42b10ed Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 27 Jan 2013 05:35:12 +0000
Subject: [PATCH 4072/6849] olsr: rework build and install procedure

This commit reworks the build and install steps of the olsr package,
to fix a number of problems and do minor improvements:

 1. The build step was doing "make <foo>" for each
    plugin. Unfortunately, inside olsr build system, doing "make
    <foo>" for a plugin triggers a clean of the plugin directory, a
    build, and then an installation of the plugin. This installation
    fails because DESTDIR is not passed at the install step. This
    leads to build issues like
    http://autobuild.buildroot.org/results/a9fed78cd0b3991763a797c38387edd4157fbdb9/build-end.log. To
    fix this, we call make in each plugin's directory, which is what
    "make <foo>" was doing internally.

 2. The install step was manually installing the olsrd binary. We now
    instead use the install_bin make target that comes in olsr's build
    system.

 3. The install step was manually installing the olsr plugins. We now
    instead use the install make target available in each plugin's
    makefile.

 4. We use 'install' to install the init script, which avoids the
    manual creation of /etc/init.d.

 5. We use 'install' to install the sample configuration file.

 6. We remove the useless strip commands.

 7. We add a patch that allows us to pass LDCONFIG=/bin/true to avoid
    ldconfig being called during the installation process.

 8. We remove commands from the clean step that were in fact
    uninstallation commands. We don't bother re-adding those commands
    in an uninstallation step, since it is now generally accepted that
    the uninstall step is quite useless and should be deprecated.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/olsr/olsr-configurable-ldconfig.patch | 30 +++++++++++++++++++
 package/olsr/olsr.mk                          | 26 +++++++---------
 2 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 package/olsr/olsr-configurable-ldconfig.patch

diff --git a/package/olsr/olsr-configurable-ldconfig.patch b/package/olsr/olsr-configurable-ldconfig.patch
new file mode 100644
index 0000000000..09e34f137a
--- /dev/null
+++ b/package/olsr/olsr-configurable-ldconfig.patch
@@ -0,0 +1,30 @@
+Make ldconfig configurable
+
+In a cross-compilation set up, running /sbin/ldconfig is useless, so
+we make the path to ldconfig configurable through the environment/make
+command line. This allows to pass LDCONFIG=/bin/true when doing
+cross-compilation.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/make/Makefile.linux
+===================================================================
+--- a/make/Makefile.linux
++++ b/make/Makefile.linux
+@@ -3,6 +3,7 @@
+ #
+ 
+ ARCH := $(shell uname -m)
++LDCONFIG ?= /sbin/ldconfig
+ DESTDIR ?=
+ LIBDIR =	$(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
+ 
+@@ -14,7 +15,7 @@
+ 
+ PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
+ INSTALL_LIB =	install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
+-		/sbin/ldconfig -n $(LIBDIR)
++		$(LDCONFIG) -n $(LIBDIR)
+ 
+ ifdef OLSRD_PLUGIN
+ GENERATE_PIC = true
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index a93312e987..be1ae1e4b4 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -9,32 +9,28 @@ OLSR_VERSION_MINOR = 6
 OLSR_VERSION = $(OLSR_VERSION_MAJOR).$(OLSR_VERSION_MINOR)
 OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2
 OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)
-OLSR_BINARY = olsrd
-OLSR_TARGET_BINARY = usr/sbin/olsrd
 #OLSR_PLUGINS=httpinfo tas dot_draw nameservice dyn_gw dyn_gw_plain pgraph bmf quagga secure
 OLSR_PLUGINS = dot_draw dyn_gw secure
-OLSR_TARGET_PLUGIN = usr/lib/
 
 define OLSR_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(OLSR_PLUGINS)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd
+	for p in $(OLSR_PLUGINS) ; do \
+		$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D)/lib/$$p ; \
+	done
 endef
 
 define OLSR_INSTALL_TARGET_CMDS
-	cp -dpf $(@D)/$(OLSR_BINARY) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
-	cp -R $(@D)/lib/*/olsrd_*.so* $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)
-	mkdir -p $(TARGET_DIR)/etc/init.d
-	cp -dpf package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install_bin
+	for p in $(OLSR_PLUGINS) ; do \
+		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib/$$p \
+			LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) install ; \
+	done
+	$(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr
 	test -r $(TARGET_DIR)/etc/olsrd.conf || \
-		cp -dpf $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so*
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(OLSR_TARGET_BINARY)
+		$(INSTALL) -D -m 0644 $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf
 endef
 
 define OLSR_CLEAN_CMDS
-	rm -f $(TARGET_DIR)/$(OLSR_TARGET_BINARY) \
-		$(TARGET_DIR)/$(OLSR_TARGET_PLUGIN)/olsrd_*.so* \
-		$(TARGET_DIR)/etc/init.d/S50olsr \
-		$(TARGET_DIR)/etc/olsrd.conf
 	-$(MAKE) -C $(@D) clean
 endef
 

From eed556c7feae527b59bb48b88737d77c3ca8a333 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 28 Jan 2013 08:42:30 +0100
Subject: [PATCH 4073/6849] libvncserver: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libvncserver/libvncserver.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index ac55a959bb..011b174af3 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -4,10 +4,11 @@
 #
 #############################################################
 
-LIBVNCSERVER_VERSION = 0.9.8.2
+LIBVNCSERVER_VERSION = 0.9.9
 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
 LIBVNCSERVER_SITE = http://downloads.sourceforge.net/project/libvncserver/libvncserver/$(LIBVNCSERVER_VERSION)
-
+LIBVNCSERVER_LICENSE = GPLv2+
+LIBVNCSERVER_LICENSE_FILES = COPYING
 LIBVNCSERVER_INSTALL_STAGING = YES
 
 # only used for examples

From ec52e5ffe2d378c0317c5073fadda0ffe27dc73b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 Jan 2013 01:14:49 +0000
Subject: [PATCH 4074/6849] kernel-headers: bump 3.{0, 4, 7}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.60-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.61-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index a966220726..5fda8151f9 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.60"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.61"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.37"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.27"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.28"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.4"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.5"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.60-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.61-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.60-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.61-headers_install-fix-__packed-in-exported-kernel-head.patch

From 3ae806d5dcc3c6a0f3d55194379575fcffa73ce5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 Jan 2013 01:14:50 +0000
Subject: [PATCH 4075/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 175a999231..78b7b0c837 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.4"
+	bool "3.7.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.4" if BR2_LINUX_KERNEL_3_7
+	default "3.7.5" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 93af90cfb670849931ffe3741baa630c00682fe5 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 28 Jan 2013 05:35:11 +0000
Subject: [PATCH 4076/6849] qwt: fix project's URL

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qwt/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index d72b30e0f9..3dc6f2275e 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_QWT
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
 
-	  http://http://sourceforge.net/projects/qwt
+	  http://qwt.sourceforge.net/
 
 if BR2_PACKAGE_QWT
 

From b4fc984b8728206c142b1ecfcd162d97126f2080 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 28 Jan 2013 09:19:45 +0000
Subject: [PATCH 4077/6849] linux-firmware: add new config option of iwlwifi
 5000 firmware

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 6 ++++++
 package/linux-firmware/linux-firmware.mk | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index bf264ebb74..9998f22667 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -20,6 +20,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
 	help
 	  Firmware files for the Atheros 9271 module
 
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
+	bool "Intel iwlwifi 5000"
+	help
+	  Firmware files for the Intel Wifi 5000 devices supported by
+	  the iwlwifi kernel driver.
+
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8
        bool "Libertas SD 8686 v8"
        help
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index db20d338de..8f9645298d 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -92,6 +92,13 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
 	ti-connectivity/TIInit_7.2.31.bts 			\
 	LICENCE.ti-connectivity
 
+# iwlwifi 5000. Multiple files are available (iwlwifi-5000-1.ucode,
+# iwlwifi-5000-2.ucode, iwlwifi-5000-5.ucode), corresponding to
+# different versions of the firmware API. For now, we only install the
+# most recent one.
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000) += \
+	iwlwifi-5000-5.ucode LICENCE.iwlwifi_firmware
+
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_XC5000) += \
 	dvb-fe-xc5000-1.6.114.fw
 

From ae20051b93871525295074659d879bdc61ad6340 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 28 Jan 2013 06:01:11 +0000
Subject: [PATCH 4078/6849] collectd: bump to version 5.1.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index f6aeb0dcd4..a50be9c608 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-COLLECTD_VERSION = 5.1.1
+COLLECTD_VERSION = 5.1.2
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes

From 08d9ac9fe7972582263254a3c9484fc9826fbfd4 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Mon, 28 Jan 2013 06:48:31 +0000
Subject: [PATCH 4079/6849] Add support for the Calao-systems USB-A9260

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../at91bootstrap-1.16-usb-a9260.patch        | 603 ++++++++++++++++++
 board/calao/usb-a9260/linux-3.7.4.config      |  97 +++
 configs/calao_usb_a9260_defconfig             |  15 +
 3 files changed, 715 insertions(+)
 create mode 100644 board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch
 create mode 100644 board/calao/usb-a9260/linux-3.7.4.config
 create mode 100644 configs/calao_usb_a9260_defconfig

diff --git a/board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch b/board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch
new file mode 100644
index 0000000000..1393677dfc
--- /dev/null
+++ b/board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch
@@ -0,0 +1,603 @@
+From 43e8c90f13806405bde8eaaf3a956d0ddc806f64 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Tue, 2 Oct 2012 09:19:15 +0200
+Subject: [PATCH] Add support for the USB-A9260
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ board/usb_a9260/nandflash/Makefile    |  122 ++++++++++++++
+ board/usb_a9260/nandflash/usb-a9260.h |  109 ++++++++++++
+ board/usb_a9260/usb_a9260.c           |  298 +++++++++++++++++++++++++++++++++
+ crt0_gnu.S                            |    7 +
+ include/part.h                        |    6 +-
+ 5 files changed, 541 insertions(+), 1 deletion(-)
+ create mode 100644 board/usb_a9260/nandflash/Makefile
+ create mode 100644 board/usb_a9260/nandflash/usb-a9260.h
+ create mode 100644 board/usb_a9260/usb_a9260.c
+
+diff --git a/board/usb_a9260/nandflash/Makefile b/board/usb_a9260/nandflash/Makefile
+new file mode 100644
+index 0000000..02f4b50
+--- /dev/null
++++ b/board/usb_a9260/nandflash/Makefile
+@@ -0,0 +1,122 @@
++# TODO: set this appropriately for your local toolchain
++ifndef ERASE_FCT
++ERASE_FCT=rm -f
++endif
++ifndef CROSS_COMPILE
++CROSS_COMPILE=arm-elf-
++endif
++
++TOOLCHAIN=gcc
++
++BOOTSTRAP_PATH=../../..
++
++# NandFlashBoot Configuration for USB-A9260
++
++# Target name (case sensitive!!!)
++TARGET=AT91SAM9260
++# Board name (case sensitive!!!)
++BOARD=usb_a9260
++# Link Address and Top_of_Memory
++LINK_ADDR=0x200000
++TOP_OF_MEMORY=0x301000
++# Name of current directory
++PROJECT=nandflash
++
++ifndef BOOT_NAME
++BOOT_NAME=$(PROJECT)_$(BOARD)
++endif
++
++INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
++
++ifeq ($(TOOLCHAIN), gcc)
++
++AS=$(CROSS_COMPILE)gcc
++CC=$(CROSS_COMPILE)gcc
++LD=$(CROSS_COMPILE)gcc
++NM= $(CROSS_COMPILE)nm
++SIZE=$(CROSS_COMPILE)size
++OBJCOPY=$(CROSS_COMPILE)objcopy
++OBJDUMP=$(CROSS_COMPILE)objdump
++CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
++ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
++
++# Linker flags.
++#  -Wl,...:     tell GCC to pass this to linker.
++#    -Map:      create map file
++#    --cref:    add cross reference to map file
++LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref
++LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
++OBJS=crt0_gnu.o
++
++endif
++
++OBJS+=\
++	$(BOARD).o \
++	main.o \
++	gpio.o \
++	pmc.o \
++	debug.o \
++	sdramc.o \
++	nandflash.o \
++	_udivsi3.o \
++	_umodsi3.o \
++	div0.o \
++	udiv.o \
++	string.o
++
++
++rebuild: clean all
++
++all: 	$(BOOT_NAME)
++
++ifeq ($(TOOLCHAIN), gcc)
++$(BOOT_NAME): $(OBJS)
++	$(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
++	$(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
++endif
++
++
++$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
++
++main.o: $(BOOTSTRAP_PATH)/main.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
++
++gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
++
++pmc.o:  $(BOOTSTRAP_PATH)/driver/pmc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
++
++debug.o: $(BOOTSTRAP_PATH)/driver/debug.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
++
++sdramc.o:  $(BOOTSTRAP_PATH)/driver/sdramc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
++
++dataflash.o:  $(BOOTSTRAP_PATH)/driver/dataflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
++
++nandflash.o:  $(BOOTSTRAP_PATH)/driver/nandflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o
++
++crt0_gnu.o:  $(BOOTSTRAP_PATH)/crt0_gnu.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
++
++div0.o:  $(BOOTSTRAP_PATH)/lib/div0.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
++
++string.o:  $(BOOTSTRAP_PATH)/lib/string.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
++
++udiv.o:  $(BOOTSTRAP_PATH)/lib/udiv.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
++
++_udivsi3.o:  $(BOOTSTRAP_PATH)/lib/_udivsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
++
++_umodsi3.o:  $(BOOTSTRAP_PATH)/lib/_umodsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
++
++clean:
++	$(ERASE_FCT) *.o *.bin *.elf *.map
+diff --git a/board/usb_a9260/nandflash/usb-a9260.h b/board/usb_a9260/nandflash/usb-a9260.h
+new file mode 100644
+index 0000000..2aaf759
+--- /dev/null
++++ b/board/usb_a9260/nandflash/usb-a9260.h
+@@ -0,0 +1,109 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb-a9260.h
++ * Object              :
++ * Creation            : GH Oct 1th 2012
++ *-----------------------------------------------------------------------------
++ */
++#ifndef _USB_A9260_H
++#define _USB_A9260_H
++
++/* ******************************************************************* */
++/* PMC Settings                                                        */
++/*                                                                     */
++/* The main oscillator is enabled as soon as possible in the c_startup */
++/* and MCK is switched on the main oscillator.                         */
++/* PLL initialization is done later in the hw_init() function          */
++/* ******************************************************************* */
++#define MASTER_CLOCK		(180000000/2)
++#define PLL_LOCK_TIMEOUT	1000000
++
++#define PLLA_SETTINGS	0x20593F06
++#define PLLB_SETTINGS	0x10483F0E
++
++/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */
++#define MCKR_SETTINGS		(AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2)
++#define MCKR_CSS_SETTINGS	(AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
++
++/* ******************************************************************* */
++/* NandFlash Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_SMARTMEDIA_BASE	0x40000000
++
++#define AT91_SMART_MEDIA_ALE    (1 << 21)	/* our ALE is AD21 */
++#define AT91_SMART_MEDIA_CLE    (1 << 22)	/* our CLE is AD22 */
++
++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0)
++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0)
++
++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13))
++
++
++/* ******************************************************************** */
++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000.*/
++/* Please refer to SMC section in AT91SAM datasheet to learn how 	*/
++/* to generate these values. 						*/
++/* ******************************************************************** */
++#define AT91C_SM_NWE_SETUP	(1 << 0)
++#define AT91C_SM_NCS_WR_SETUP	(0 << 8)
++#define AT91C_SM_NRD_SETUP	(1 << 16)
++#define AT91C_SM_NCS_RD_SETUP	(0 << 24)
++  
++#define AT91C_SM_NWE_PULSE 	(3 << 0)
++#define AT91C_SM_NCS_WR_PULSE	(3 << 8)
++#define AT91C_SM_NRD_PULSE	(3 << 16)
++#define AT91C_SM_NCS_RD_PULSE	(3 << 24)
++  
++#define AT91C_SM_NWE_CYCLE 	(5 << 0)
++#define AT91C_SM_NRD_CYCLE	(5 << 16)
++#define AT91C_SM_TDF	        (2 << 16)
++
++/* ******************************************************************* */
++/* BootStrap Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define IMG_ADDRESS 		0x20000		/* Image Address in NandFlash */
++#define	IMG_SIZE		0x40000		/* Image Size in NandFlash    */
++
++#define MACH_TYPE       	0x6AD		/* USB-A9260 */
++#define JUMP_ADDR		0x23F00000	/* Final Jump Address 	      */
++
++/* ******************************************************************* */
++/* Application Settings                                                */
++/* ******************************************************************* */
++#undef CFG_DEBUG
++#undef CFG_DATAFLASH
++
++#define CFG_NANDFLASH
++#undef	NANDFLASH_SMALL_BLOCKS	/* NANDFLASH_LARGE_BLOCKS used instead */
++
++#define CFG_HW_INIT
++#define CFG_SDRAM
++
++#endif	/* _USB_A9260_H */
+diff --git a/board/usb_a9260/usb_a9260.c b/board/usb_a9260/usb_a9260.c
+new file mode 100644
+index 0000000..de30f0b
+--- /dev/null
++++ b/board/usb_a9260/usb_a9260.c
+@@ -0,0 +1,298 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2006, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaiimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : usb_a9260.c
++ * Object              :
++ * Creation            : GH Oct 1th 2012
++ *-----------------------------------------------------------------------------
++ */
++#include "../../include/part.h"
++#include "../../include/gpio.h"
++#include "../../include/pmc.h"
++#include "../../include/debug.h"
++#include "../../include/sdramc.h"
++#include "../../include/main.h"
++#ifdef CFG_NANDFLASH
++#include "../../include/nandflash.h"
++#endif
++#ifdef CFG_DATAFLASH
++#include "../../include/dataflash.h"
++#endif
++
++static inline unsigned int get_cp15(void)
++{
++	unsigned int value;
++	__asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value));
++	return value;
++}
++
++static inline void set_cp15(unsigned int value)
++{
++	__asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value));
++}
++
++#ifdef CFG_HW_INIT
++/*----------------------------------------------------------------------------*/
++/* \fn    hw_init							      */
++/* \brief This function performs very low level HW initialization	      */
++/* This function is invoked as soon as possible during the c_startup	      */
++/* The bss segment must be initialized					      */
++/*----------------------------------------------------------------------------*/
++void hw_init(void)
++{
++	unsigned int cp15;
++	
++	/* Configure PIOs */
++	const struct pio_desc hw_pio[] = {
++#ifdef CFG_DEBUG
++		{"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Disable watchdog */
++	writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR);
++
++	/* At this stage the main oscillator is supposed to be enabled
++	 * PCK = MCK = MOSC */
++
++	/* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
++	pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* PCK = PLLA = 2 * MCK */
++	pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT);
++	/* Switch MCK on PLLA output */
++	pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure PLLB */
++	pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure CP15 */
++	cp15 = get_cp15();
++	cp15 |= I_CACHE;
++	set_cp15(cp15);
++
++	/* Configure the PIO controller */
++	pio_setup(hw_pio);
++
++	/* Configure the EBI Slave Slot Cycle to 64 */
++	writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3));
++
++#ifdef CFG_DEBUG
++	/* Enable Debug messages on the DBGU */
++	dbg_init(BAUDRATE(MASTER_CLOCK, 115200));
++
++	dbg_print("Start AT91Bootstrap...\n\r");
++#endif /* CFG_DEBUG */
++
++#ifdef CFG_SDRAM
++	/* Initialize the matrix */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA);
++
++	/* Configure SDRAM Controller */
++	sdram_init(	AT91C_SDRAMC_NC_9  |
++				AT91C_SDRAMC_NR_13 |
++				AT91C_SDRAMC_CAS_2 |
++				AT91C_SDRAMC_NB_4_BANKS |
++				AT91C_SDRAMC_DBW_32_BITS |
++				AT91C_SDRAMC_TWR_2 |
++				AT91C_SDRAMC_TRC_7 |
++				AT91C_SDRAMC_TRP_2 |
++				AT91C_SDRAMC_TRCD_2 |
++				AT91C_SDRAMC_TRAS_5 |
++				AT91C_SDRAMC_TXSR_8,		/* Control Register */
++				(MASTER_CLOCK * 7)/1000000,	/* Refresh Timer Register */
++				AT91C_SDRAMC_MD_SDRAM);		/* SDRAM (no low power)   */ 
++
++
++#endif /* CFG_SDRAM */
++}
++#endif /* CFG_HW_INIT */
++
++#ifdef CFG_SDRAM
++/*------------------------------------------------------------------------------*/
++/* \fn    sdramc_hw_init							*/
++/* \brief This function performs SDRAMC HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void sdramc_hw_init(void)
++{
++	/* Configure PIOs */
++/*	const struct pio_desc sdramc_pio[] = {
++		{"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++*/
++	/* Configure the SDRAMC PIO controller to output PCK0 */
++/*	pio_setup(sdramc_pio); */
++
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0));
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0));
++
++}
++#endif /* CFG_SDRAM */
++
++#ifdef CFG_DATAFLASH
++
++/*------------------------------------------------------------------------------*/
++/* \fn    df_recovery								*/
++/* \brief This function erases DataFlash Page 0 if USR PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++void df_recovery(AT91PS_DF pDf)
++{
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
++	/* Configure PIOs */
++	const struct pio_desc usrpb_pio[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb_pio);
++	
++	/* If USR PB is pressed during Boot sequence */
++	/* Erase DataFlash Page 0*/
++	if ( !pio_get_value(AT91C_PIN_PB(10)) )
++		df_page_erase(pDf, 0);
++#endif
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    df_hw_init								*/
++/* \brief This function performs DataFlash HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void df_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc df_pio[] = {
++		{"MISO",  AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"MOSI",  AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"SPCK",  AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
++		{"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	pio_setup(df_pio);
++}
++#endif /* CFG_DATAFLASH */
++
++
++
++#ifdef CFG_NANDFLASH
++/*------------------------------------------------------------------------------*/
++/* \fn    nand_recovery						*/
++/* \brief This function erases NandFlash Block 0 if USR PB is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++static void nand_recovery(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc usrpb_pio[] = {
++		{"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(usrpb_pio);
++	
++	/* If USR PB is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if (!pio_get_value(AT91C_PIN_PB(10)) )
++		AT91F_NandEraseBlock0();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_hw_init							*/
++/* \brief NandFlash HW init							*/
++/*------------------------------------------------------------------------------*/
++void nandflash_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc nand_pio[] = {
++		{"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT},
++		{"NANDCS",  AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT},
++		{(char *) 0, 0, 0,  PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA);
++		    
++	/* Configure SMC CS3 */
++ 	writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3);
++  	writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3);
++	writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE)						, AT91C_BASE_SMC + SMC_CYCLE3);
++	writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | 
++  		AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF)						, AT91C_BASE_SMC + SMC_CTRL3);
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(nand_pio);
++	
++	nand_recovery();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_16bits_dbw_init						*/
++/* \brief Configure SMC in 16 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_16bits_dbw_init(void)
++{
++	writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_8bits_dbw_init						*/
++/* \brief Configure SMC in 8 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_8bits_dbw_init(void)
++{
++	writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++
++#endif /* #ifdef CFG_NANDFLASH */
+diff --git a/crt0_gnu.S b/crt0_gnu.S
+index 042b617..002feef 100644
+--- a/crt0_gnu.S
++++ b/crt0_gnu.S
+@@ -106,6 +106,13 @@ _relocate_to_sram:
+ #endif /* CFG_NORFLASH */
+ 
+ _setup_clocks:
++/* Test if main osc is bypassed */
++	ldr 	r0,=AT91C_PMC_MOR
++	ldr 	r1, [r0]
++	ldr 	r2,=AT91C_CKGR_OSCBYPASS 
++	ands 	r1, r1, r2
++	bne	_init_data	/* branch if OSCBYPASS=1 */
++
+ /* Test if main oscillator is enabled */
+ 	ldr 	r0,=AT91C_PMC_SR
+ 	ldr 	r1, [r0]
+diff --git a/include/part.h b/include/part.h
+index ba5985a..212789f 100644
+--- a/include/part.h
++++ b/include/part.h
+@@ -35,7 +35,11 @@
+ 
+ #ifdef AT91SAM9260
+ #include "AT91SAM9260_inc.h"
+-#include "at91sam9260ek.h"
++	#ifdef at91sam9260ek
++	#include "at91sam9260ek.h"
++	#elif usb_a9260
++	#include "usb-a9260.h"
++	#endif
+ #endif
+ 
+ #ifdef AT91SAM9XE
+-- 
+1.7.9.5
+
diff --git a/board/calao/usb-a9260/linux-3.7.4.config b/board/calao/usb-a9260/linux-3.7.4.config
new file mode 100644
index 0000000000..c466bdc88c
--- /dev/null
+++ b/board/calao/usb-a9260/linux-3.7.4.config
@@ -0,0 +1,97 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_ARCH_AT91SAM9260=y
+CONFIG_MACH_USB_A9260=y
+CONFIG_AT91_SLOW_CLOCK=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200"
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+# CONFIG_HWMON is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_EXT2_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
diff --git a/configs/calao_usb_a9260_defconfig b/configs/calao_usb_a9260_defconfig
new file mode 100644
index 0000000000..d84f718333
--- /dev/null
+++ b/configs/calao_usb_a9260_defconfig
@@ -0,0 +1,15 @@
+BR2_arm=y
+BR2_arm926t=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_HOST_SAM_BA=y
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9260"
+BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9260"
+BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9260"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9260/linux-3.7.4.config"
+BR2_LINUX_KERNEL_ZIMAGE=y

From 6b340425e8af3f6f8e1489eb3550f35ee28b59b9 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@sigpwr.com>
Date: Sun, 27 Jan 2013 15:38:56 +0000
Subject: [PATCH 4080/6849] python3: Fix pyc-only related runtime exceptions

Python3 changes the pyc lookup strategy, ignoring the
__pycache__ directory if the .py file is missing. Change
install location to enable use of .pyc without their parent .py

See http://www.python.org/dev/peps/pep-3147

[Peter: add patch header]
Signed-off-by: Daniel Nelson <daniel@sigpwr.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
  (untested)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python3-3.3-012-old-stdlib-cache.patch    | 63 +++++++++++++++++++
 package/python3/python3.mk                    |  4 ++
 2 files changed, 67 insertions(+)
 create mode 100644 package/python3/python3-3.3-012-old-stdlib-cache.patch

diff --git a/package/python3/python3-3.3-012-old-stdlib-cache.patch b/package/python3/python3-3.3-012-old-stdlib-cache.patch
new file mode 100644
index 0000000000..5a2cf8b961
--- /dev/null
+++ b/package/python3/python3-3.3-012-old-stdlib-cache.patch
@@ -0,0 +1,63 @@
+python3: Fix pyc-only related runtime exceptions
+
+Python3 changes the pyc lookup strategy, ignoring the
+__pycache__ directory if the .py file is missing. Change
+install location to enable use of .pyc without their parent .py
+
+See http://www.python.org/dev/peps/pep-3147
+
+Signed-off-by: Daniel Nelson <daniel@sigpwr.com>
+
+--- python3-3.3.0/configure.ac	2013-01-27 16:35:52.429067797 -0800
++++ python3-3.3.0/configure.ac	2013-01-27 16:43:43.528601443 -0800
+@@ -1827,6 +1827,23 @@
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+ 
++STDLIB_CACHE_FLAGS=
++AC_MSG_CHECKING(for --enable-old-stdlib-cache)
++AC_ARG_ENABLE(old-stdlib-cache,
++    AS_HELP_STRING([--enable-old-stdlib-cache], [enable pre-pep3147 stdlib cache]),
++[
++    if test "$enableval" = "yes"
++    then
++        STDLIB_CACHE_FLAGS="-b"
++    else
++        STDLIB_CACHE_FLAGS="" 
++    fi
++],
++[
++    STDLIB_CACHE_FLAGS="" 
++])
++AC_SUBST(STDLIB_CACHE_FLAGS)
++
+ AC_MSG_CHECKING(for --enable-framework)
+ if test "$enable_framework"
+ then
+--- python3-3.3.0/Makefile.pre.in	2013-01-27 16:35:52.422067642 -0800
++++ python3-3.3.0/Makefile.pre.in	2013-01-27 16:37:03.710650439 -0800
+@@ -143,6 +143,9 @@
+ # Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
+ OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
+ 
++# Option to enable old-style precompiled stdlib
++STDLIB_CACHE_FLAGS=@STDLIB_CACHE_FLAGS@
++
+ # Environment to run shared python without installed libraries
+ RUNSHARED=       @RUNSHARED@
+ 
+@@ -1079,12 +1082,12 @@
+ 	fi
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST) -f \
++		-d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST)/site-packages -f \
++		-d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index e7c09837ef..7551a7b5a0 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -70,6 +70,10 @@ else
 PYTHON3_CONF_OPT += --with-expat=none
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y)
+PYTHON3_CONF_OPT += --enable-old-stdlib-cache
+endif
+
 ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y)
 PYTHON3_DEPENDENCIES += sqlite
 endif

From 18b04970a2c0bf9db72d7c052d1fe4252d94267b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 28 Jan 2013 10:10:34 +0000
Subject: [PATCH 4081/6849] barebox: Allow to build an environment image

[Peter: Tweaked help text]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in  | 19 +++++++++++++++++++
 boot/barebox/barebox.mk | 14 ++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index b9e03b3084..1ffe5966b5 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -99,4 +99,23 @@ config BR2_TARGET_BAREBOX_BAREBOXENV
 	help
 	  Install bareboxenv tool in target.
 
+config BR2_TARGET_BAREBOX_CUSTOM_ENV
+	bool "Generate an environment image"
+	help
+	  Generate a custom environment image. This environment will
+	  contain the variables and scripts to be used at boot by
+	  barebox.
+
+config BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH
+	string "Environment path"
+	depends on BR2_TARGET_BAREBOX_CUSTOM_ENV
+	help
+	  Path to the directory containing the custom barebox
+	  environment. Depending on your setup, it will probably be
+	  based on either the content of the defaultenv or
+	  defaultenv-2 directories in the barebox source code, plus
+	  the additions needed. The output will be an image in the
+	  barebox devfs format, stored in the images directory, with
+	  the same name as the directory name given here.
+
 endif
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 143338edd4..5ec47f64f4 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -67,9 +67,22 @@ define BAREBOX_BUILD_BAREBOXENV_CMDS
 endef
 endif
 
+ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
+BAREBOX_ENV_NAME = $(notdir $(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
+define BAREBOX_BUILD_CUSTOM_ENV
+	$(@D)/scripts/bareboxenv -s \
+		$(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)) \
+		$(@D)/$(BAREBOX_ENV_NAME)
+endef
+define BAREBOX_INSTALL_CUSTOM_ENV
+	cp $(@D)/$(BAREBOX_ENV_NAME) $(BINARIES_DIR)
+endef
+endif
+
 define BAREBOX_BUILD_CMDS
 	$(BAREBOX_BUILD_BAREBOXENV_CMDS)
 	$(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D)
+	$(BAREBOX_BUILD_CUSTOM_ENV)
 endef
 
 define BAREBOX_INSTALL_IMAGES_CMDS
@@ -78,6 +91,7 @@ define BAREBOX_INSTALL_IMAGES_CMDS
 	else \
 		cp $(@D)/barebox.bin $(BINARIES_DIR);\
 	fi
+	$(BAREBOX_INSTALL_CUSTOM_ENV)
 endef
 
 ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)

From 73beeccf448115db57115eb86b88376d46010e86 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 01:17:00 +0000
Subject: [PATCH 4082/6849] samba: bump to version 3.6.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 161e507bea..4eb6a3381a 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.10
+SAMBA_VERSION = 3.6.11
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 4160ccf159750b7efa94c946939e3f3f2c5ff394 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 01:17:01 +0000
Subject: [PATCH 4083/6849] nettle: bump to version 2.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...Added-lm-when-linking-nettle-benchmark.patch | 17 -----------------
 package/nettle/nettle.mk                        |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch

diff --git a/package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch b/package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch
deleted file mode 100644
index ca4d639768..0000000000
--- a/package/nettle/nettle-Added-lm-when-linking-nettle-benchmark.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Added -lm when linking nettle-benchmark.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff --git a/examples/Makefile.in b/examples/Makefile.in
-index 909fdda..3becd08 100644
---- a/examples/Makefile.in
-+++ b/examples/Makefile.in
-@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
- PRE_LDFLAGS = -L..
- 
- OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
--BENCH_LIBS = @BENCH_LIBS@
-+BENCH_LIBS = @BENCH_LIBS@ -lm
- 
- RSA_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \
- 	      rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT)
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index ae09ecc163..5080fab8f8 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -1,4 +1,4 @@
-NETTLE_VERSION = 2.5
+NETTLE_VERSION = 2.6
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES

From a04558b3f0464a7c3139d1751b5238796080b5f7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 01:17:02 +0000
Subject: [PATCH 4084/6849] mpd: bump to version 0.17.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index ab3a35786a..5fbc8f6dc0 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPD_VERSION = 0.17.2
+MPD_VERSION = 0.17.3
 MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 MPD_DEPENDENCIES = host-pkgconf libglib2
 MPD_LICENSE = GPLv2

From 07d732af917f158b1788ff4bfe9ea6b98d452dbc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:46 +0000
Subject: [PATCH 4085/6849] dosfstools: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 507f485d3d..4f89364c79 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -6,6 +6,8 @@
 
 DOSFSTOOLS_VERSION = 3.0.12
 DOSFSTOOLS_SITE = http://fossies.org/linux/misc/
+DOSFSTOOLS_LICENSE = GPLv3+
+DOSFSTOOLS_LICENSE_FILES = COPYING
 MKDOSFS_BINARY = mkdosfs
 DOSFSCK_BINARY = dosfsck
 DOSFSLABEL_BINARY = dosfslabel

From 46acbdb58dab9aa0e268a155668794d351630274 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:47 +0000
Subject: [PATCH 4086/6849] bind: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index bd7e5edfd0..8a66534ebc 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -7,6 +7,8 @@
 BIND_VERSION = 9.6-ESV-R8
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
+BIND_LICENSE = ISC
+BIND_LICENSE_FILES = COPYRIGHT
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
 BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen dnssec-dsfromkey
 BIND_TARGET_SBINS += dnssec-keyfromlabel dnssec-keygen dnssec-signzone

From 30a29c848b040a0ad2c6f8f4cb156445292cbbbd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:48 +0000
Subject: [PATCH 4087/6849] dhcp: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index c9d0b41284..8d90ea48cf 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-DHCP_VERSION  = 4.1-ESV-R7
-DHCP_SITE     = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
+DHCP_VERSION = 4.1-ESV-R7
+DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
+DHCP_LICENSE = ISC
+DHCP_LICENSE_FILES = LICENSE
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes
 DHCP_CONF_OPT = \
 	--localstatedir=/var/lib/dhcp \

From 8fab45efd155c3ec980dccf26f4e842fc71adcc3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:49 +0000
Subject: [PATCH 4088/6849] tar: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tar/tar.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index c1e625fa40..e465bfad9f 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -6,6 +6,8 @@
 
 TAR_VERSION = 1.26
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
+TAR_LICENSE = GPLv3+
+TAR_LICENSE_FILES = COPYING
 
 # Prefer full-blown tar over buybox's version
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From 7a52cda9bd494f6a2530752b2d97199cd7891b69 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:50 +0000
Subject: [PATCH 4089/6849] sdparm: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdparm/sdparm.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index b251b3c8ab..ef30887156 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -1,5 +1,7 @@
 SDPARM_VERSION = 1.07
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
 SDPARM_SITE = http://sg.danny.cz/sg/p/
+SDPARM_LICENSE = BSD-3c
+SDPARM_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 24511f3cdee394c8b2d741b616dbc8524bb90bfc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:51 +0000
Subject: [PATCH 4090/6849] readline: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/readline/readline.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 12d3fbad7e..505f1e3415 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -10,6 +10,8 @@ READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES
 READLINE_DEPENDENCIES = ncurses
 READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes
+READLINE_LICENSE = GPLv3+
+READLINE_LICENSE_FILES = COPYING
 
 define READLINE_INSTALL_TARGET_CMDS
 	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall

From dedd61c471d129796951f55371d0f3bea61cdb27 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:52 +0000
Subject: [PATCH 4091/6849] quagga: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/quagga.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index da022c33d7..fb060ef1ba 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -7,6 +7,8 @@
 QUAGGA_VERSION = 0.99.21
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk
+QUAGGA_LICENSE = GPLv2+
+QUAGGA_LICENSE_FILES = COPYING
 QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink
 
 QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra)

From 42169a4e71bf02e496aab3b8dccc3f2e800559eb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 03:35:53 +0000
Subject: [PATCH 4092/6849] genext2fs: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/genext2fs/genext2fs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 6126a7467a..45e9695ad4 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -7,6 +7,8 @@
 GENEXT2FS_VERSION = 1.4.1
 GENEXT2FS_SOURCE = genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
+GENEXT2FS_LICENSE = GPLv2
+GENEXT2FS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 3c80d680f2e4d3e568bfeef2c46ceccc952db42d Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Mon, 28 Jan 2013 23:53:52 +0000
Subject: [PATCH 4093/6849] New package: cache-calibrator

The Calibrator is a small C program that is supposed to analyze
a computers (cache-) memory system and extract the following
parameters:

    number of cache levels
    for each cache level:
        its size
        its linesize
        its access/miss latency
    main memory access latency
    number of TLB levels
    for each TLB level:
        its capacity (i.e. number of entries)
        the pagesize used
        the TLB miss latency

http://homepages.cwi.nl/~manegold/Calibrator/

It is also recommended as a load generator for realtime testing in:

https://rt.wiki.kernel.org/index.php/RT_PREEMPT_HOWTO#Benchmarking

[Peter: reformat help text, fix extract step]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/cache-calibrator/Config.in            |  13 +++
 ...rator-Fix-conflicting-round-function.patch | 108 ++++++++++++++++++
 package/cache-calibrator/cache-calibrator.mk  |  24 ++++
 4 files changed, 146 insertions(+)
 create mode 100644 package/cache-calibrator/Config.in
 create mode 100644 package/cache-calibrator/cache-calibrator-Fix-conflicting-round-function.patch
 create mode 100644 package/cache-calibrator/cache-calibrator.mk

diff --git a/package/Config.in b/package/Config.in
index ebd9817580..e6682fc03f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -19,6 +19,7 @@ endmenu
 
 menu "Debugging, profiling and benchmark"
 source "package/bonnie/Config.in"
+source "package/cache-calibrator/Config.in"
 source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
diff --git a/package/cache-calibrator/Config.in b/package/cache-calibrator/Config.in
new file mode 100644
index 0000000000..db780e9fcd
--- /dev/null
+++ b/package/cache-calibrator/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_CACHE_CALIBRATOR
+	bool "cache-calibrator"
+	help
+	  Cache calibrator is a small C program that is supposed to
+	  analyze a computers (cache-) memory system and extract
+	  useful information
+
+	  http://homepages.cwi.nl/~manegold/Calibrator/
+
+	  It is also recommended as a load generator for realtime
+	  testing in:
+
+	  https://rt.wiki.kernel.org/index.php/RT_PREEMPT_HOWTO
diff --git a/package/cache-calibrator/cache-calibrator-Fix-conflicting-round-function.patch b/package/cache-calibrator/cache-calibrator-Fix-conflicting-round-function.patch
new file mode 100644
index 0000000000..71181a6387
--- /dev/null
+++ b/package/cache-calibrator/cache-calibrator-Fix-conflicting-round-function.patch
@@ -0,0 +1,108 @@
+From 39ac7268c4350040976005da98daf10edf676d3e Mon Sep 17 00:00:00 2001
+From: Stephan Hoffmann <sho@relinux.de>
+Date: Mon, 28 Jan 2013 17:32:10 +0100
+Subject: [PATCH] Fix conflicting round() function
+
+calibrator.c defines a local round() function that conflicts
+with the one from the standard library.
+
+This is fixed by renaming the local function.
+
+Signed-off-by: Stephan Hoffmann <sho@relinux.de>
+---
+ calibrator.c |   30 +++++++++++++++---------------
+ 1 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/calibrator.c b/calibrator.c
+index e045dfd..8471c04 100644
+--- a/calibrator.c
++++ b/calibrator.c
+@@ -128,7 +128,7 @@ void ErrXit(char *format, ...) {
+ 	exit(1);
+ }
+ 
+-lng round(dbl x)
++lng lng_round(dbl x)
+ {
+ 	return (lng)(x + 0.5);
+ }
+@@ -890,16 +890,16 @@ void plotCache(cacheInfo *cache, lng **result, lng MHz, char *fn, FILE *fp, lng
+ 	fprintf(fp, ")\n");
+ 	fprintf(fp, "set y2tics");
+ 	for (l = 0, s = " ("; l <= cache->levels; l++, s = ", ") {
+-		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay));
+-			else	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay));
++		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay));
++			else	fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay));
+ 	}
+ 	for (y = 1; y <= yh; y *= 10) {
+ 		fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y);
+ 	}
+ 	fprintf(fp, ")\n");
+ 	for (l = 0; l <= cache->levels; l++) {
+-		if (!delay)	z = (dbl)round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
+-			else	z = (dbl)round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
++		if (!delay)	z = (dbl)lng_round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
++			else	z = (dbl)lng_round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
+ 		fprintf(fp, "set label %ld '(%1.3g)  ' at %f,%f right\n", l + 1, z, xl, z);
+ 		fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z);
+ 	}
+@@ -986,16 +986,16 @@ void plotTLB(TLBinfo *TLB, lng **result, lng MHz, char *fn, FILE *fp, lng delay)
+ 	fprintf(fp, "%s'<L1>' %ld)\n", s, TLB->mincachelines);
+ 	fprintf(fp, "set y2tics");
+ 	for (l = 0, s = " ("; l <= TLB->levels; l++, s = ", ") {
+-		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay));
+-			else	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay));
++		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay));
++			else	fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay));
+ 	}
+ 	for (y = 1; y <= yh; y *= 10) {
+ 		fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y);
+ 	}
+ 	fprintf(fp, ")\n");
+ 	for (l = 0; l <= TLB->levels; l++) {
+-		if (!delay)	z = (dbl)round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
+-			else	z = (dbl)round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
++		if (!delay)	z = (dbl)lng_round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
++			else	z = (dbl)lng_round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
+ 		fprintf(fp, "set label %ld '(%1.3g)  ' at %f,%f right\n", l + 1, z, xl, z);
+ 		fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z);
+ 	}
+@@ -1023,9 +1023,9 @@ void printCPU(cacheInfo *cache, lng MHz, lng delay)
+ 	FILE	*fp = stdout;
+ 		
+ 	fprintf(fp, "CPU loop + L1 access:    ");
+-	fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), round(CYperIt(cache->latency1[0])));
++	fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), lng_round(CYperIt(cache->latency1[0])));
+ 	fprintf(fp, "             ( delay:    ");
+-	fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay),            round(CYperIt(delay)));
++	fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay),            lng_round(CYperIt(delay)));
+ 	fprintf(fp, "\n");
+ 	fflush(fp);
+ }
+@@ -1047,8 +1047,8 @@ void printCache(cacheInfo *cache, lng MHz)
+ 			fprintf(fp, " %3ld KB ", cache->size[l] / 1024);
+ 		}
+ 		fprintf(fp, " %3ld bytes ", cache->linesize[l + 1]);
+-		fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), round(CYperIt(cache->latency2[l + 1] - cache->latency2[l])));
+-		fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), round(CYperIt(cache->latency1[l + 1] - cache->latency1[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), lng_round(CYperIt(cache->latency2[l + 1] - cache->latency2[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), lng_round(CYperIt(cache->latency1[l + 1] - cache->latency1[l])));
+ 	}
+ 	fprintf(fp, "\n");
+ 	fflush(fp);
+@@ -1075,9 +1075,9 @@ void printTLB(TLBinfo *TLB, lng MHz)
+ 		} else {
+ 			fprintf(fp, "  %3ld KB  ", TLB->pagesize[l + 1] / 1024);
+ 		}
+-		fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), lng_round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l])));
+ /*
+-		fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), lng_round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l])));
+ */
+ 		fprintf(fp, "\n");
+ 	}
+-- 
+1.7.0.4
+
diff --git a/package/cache-calibrator/cache-calibrator.mk b/package/cache-calibrator/cache-calibrator.mk
new file mode 100644
index 0000000000..35c9f94914
--- /dev/null
+++ b/package/cache-calibrator/cache-calibrator.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# cache-calibrator
+#
+#############################################################
+
+CACHE_CALIBRATOR_SOURCE = calibrator.c
+CACHE_CALIBRATOR_SITE = http://homepages.cwi.nl/~manegold/Calibrator/src
+CACHE_CALIBRATOR_LICENSE = Cache calibrator license
+CACHE_CALIBRATOR_LICENSE_FILES = calibrator.c
+
+define CACHE_CALIBRATOR_EXTRACT_CMDS
+	cp $(DL_DIR)/$(CACHE_CALIBRATOR_SOURCE) $(@D)
+endef
+
+define CACHE_CALIBRATOR_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(@D)/calibrator.c -o $(@D)/cache_calibrator -lm
+endef
+
+define CACHE_CALIBRATOR_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/cache_calibrator $(TARGET_DIR)/usr/bin/cache_calibrator
+endef
+
+$(eval $(generic-package))

From 9b48690efb592ae17c9dd5a7db7b5ecebed09100 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 11:20:04 +0000
Subject: [PATCH 4094/6849] olsr: bump to version 0.6.4

Bump olsrd to version 0.6.4

Fixes:
http://autobuild.buildroot.net/results/553c8157cd83ca60475caacc119779c778806781/
which is due to the old version not being friendly with newer flex
versions.

Enabled more plugins to make it more useful.

Switch to forked mode in the init script to avoid console noise.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/olsr/Config.in                        |  6 ++++--
 package/olsr/S50olsr                          |  2 +-
 package/olsr/olsr-configurable-ldconfig.patch | 19 +++++++++++--------
 package/olsr/olsr.mk                          | 18 ++++++++++++------
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/package/olsr/Config.in b/package/olsr/Config.in
index ada82b4066..a4fbe01040 100644
--- a/package/olsr/Config.in
+++ b/package/olsr/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_OLSR
 	bool "OLSR mesh networking Daemon"
+	depends on BR2_USE_MMU # fork()
 	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  The Optimized Link State Routing protocol (OLSR) is a
 	  routing protocol that is optimised for mobile ad-hoc
@@ -11,5 +13,5 @@ config BR2_PACKAGE_OLSR
 
 	  http://www.olsr.org/
 
-comment "olsr requires a toolchain with IPv6 support"
-	depends on !BR2_INET_IPV6
+comment "olsr requires a toolchain with IPv6 and threads support"
+	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/olsr/S50olsr b/package/olsr/S50olsr
index a8aefd3745..9f052da53e 100755
--- a/package/olsr/S50olsr
+++ b/package/olsr/S50olsr
@@ -6,7 +6,7 @@
 case "$1" in
   start)
   	echo "Starting OLSRd daemon: "
-	/usr/sbin/olsrd -d 0 -nofork & 
+	/usr/sbin/olsrd -d 0
 	;;
   stop)
   	echo "Stopping OLSRd daemon: "
diff --git a/package/olsr/olsr-configurable-ldconfig.patch b/package/olsr/olsr-configurable-ldconfig.patch
index 09e34f137a..73fff7eecf 100644
--- a/package/olsr/olsr-configurable-ldconfig.patch
+++ b/package/olsr/olsr-configurable-ldconfig.patch
@@ -5,25 +5,28 @@ we make the path to ldconfig configurable through the environment/make
 command line. This allows to pass LDCONFIG=/bin/true when doing
 cross-compilation.
 
+[Gustavo: update patch for olsr 0.6.4]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/make/Makefile.linux
-===================================================================
---- a/make/Makefile.linux
-+++ b/make/Makefile.linux
+diff -Nura olsrd-0.6.4.orig/make/Makefile.linux olsrd-0.6.4/make/Makefile.linux
+--- olsrd-0.6.4.orig/make/Makefile.linux	2013-01-29 09:00:18.041356389 -0300
++++ olsrd-0.6.4/make/Makefile.linux	2013-01-29 09:01:51.598226624 -0300
 @@ -3,6 +3,7 @@
  #
  
  ARCH := $(shell uname -m)
 +LDCONFIG ?= /sbin/ldconfig
- DESTDIR ?=
- LIBDIR =	$(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
- 
-@@ -14,7 +15,7 @@
  
+ DESTDIR ?=
+ prefix ?= /usr/local
+@@ -26,9 +27,9 @@
+ PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so
  PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
  INSTALL_LIB =	install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
 -		/sbin/ldconfig -n $(LIBDIR)
++		$(LDCONFIG) -n $(LIBDIR)
+ UNINSTALL_LIB =	rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+-		/sbin/ldconfig -n $(LIBDIR)
 +		$(LDCONFIG) -n $(LIBDIR)
  
  ifdef OLSRD_PLUGIN
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index be1ae1e4b4..97088f33b3 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -4,13 +4,17 @@
 #
 #############################################################
 
-OLSR_VERSION_MAJOR = 0.5
-OLSR_VERSION_MINOR = 6
+OLSR_VERSION_MAJOR = 0.6
+OLSR_VERSION_MINOR = 4
 OLSR_VERSION = $(OLSR_VERSION_MAJOR).$(OLSR_VERSION_MINOR)
 OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2
 OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)
-#OLSR_PLUGINS=httpinfo tas dot_draw nameservice dyn_gw dyn_gw_plain pgraph bmf quagga secure
-OLSR_PLUGINS = dot_draw dyn_gw secure
+OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \
+	mdns nameservice p2pd pgraph secure txtinfo watchdog
+# Doesn't really need quagga but not very useful without it
+OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga)
+OLSR_LICENSE = BSD-3c LGPLv2.1+
+OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE
 
 define OLSR_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd
@@ -20,10 +24,12 @@ define OLSR_BUILD_CMDS
 endef
 
 define OLSR_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install_bin
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
+		prefix="/usr" install_bin
 	for p in $(OLSR_PLUGINS) ; do \
 		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib/$$p \
-			LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) install ; \
+			LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) \
+			prefix="/usr" install ; \
 	done
 	$(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr
 	test -r $(TARGET_DIR)/etc/olsrd.conf || \

From b0978d6a1400fdc68aeabf649b3eef08d833cea6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:50 +0000
Subject: [PATCH 4095/6849] bluez_utils: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/bluez_utils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 643b1fe5b2..89e88e7279 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -11,6 +11,8 @@ BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
+BLUEZ_UTILS_LICENSE = GPLv2+ LGPLv2.1+
+BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
 # BlueZ 3.x compatibility
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)

From 4ec86f27b2d5790ee3e4775a239b1b72906c4dce Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:51 +0000
Subject: [PATCH 4096/6849] dialog: add license information

[Peter: License is LGPLv2.1]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dialog/dialog.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 8d87b771af..6d46299f2a 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -10,6 +10,8 @@ DIALOG_SITE = ftp://invisible-island.net/dialog
 DIALOG_CONF_OPT = --with-ncurses
 DIALOG_CONF_ENV = ac_cv_path_NCURSES_CONFIG=true LIBS=-lncurses
 DIALOG_DEPENDENCIES = ncurses
+DIALOG_LICENSE = LGPLv2.1
+DIALOG_LICENSE_FILES = COPYING
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 DIALOG_DEPENDENCIES+=libiconv

From c2b45d31946ae9e1de7cd38dcfd35812604f4647 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:52 +0000
Subject: [PATCH 4097/6849] distcc: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/distcc/distcc.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index 1e09f57f72..006c0aa8f3 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -3,11 +3,13 @@
 # distcc
 #
 #############################################################
+
 DISTCC_VERSION = 2.18.3
 DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2
 DISTCC_SITE = http://distcc.googlecode.com/files/
-
 DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome
+DISTCC_LICENSE = GPLv2+
+DISTCC_LICENSE_FILES = COPYING
 
 define DISTCC_INSTALL_TARGET_CMDS
 	install -D $(@D)/distccd $(TARGET_DIR)/usr/bin/distccd

From 9e189f0150fcd2c813b686d69b81478f9095aff0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:53 +0000
Subject: [PATCH 4098/6849] gmpc: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmpc/gmpc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 5f914ffa8b..81e9f1ffc3 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -8,6 +8,8 @@ GMPC_VERSION = 11.8.16
 GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
 GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
 GMPC_CONF_OPT = --disable-mmkeys --disable-unique
+GMPC_LICENSE = GPLv2+
+GMPC_LICENSE_FILES = COPYING
 GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \
 	libglib2 libgtk2 libmpd libsoup sqlite \
 	xlib_libICE xlib_libSM xlib_libX11 \

From 563ffadac1d1d86d81f607b7420cad637b515b32 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:54 +0000
Subject: [PATCH 4099/6849] libmpd: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmpd/libmpd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libmpd/libmpd.mk b/package/libmpd/libmpd.mk
index a2b9d56849..9b4a1edad7 100644
--- a/package/libmpd/libmpd.mk
+++ b/package/libmpd/libmpd.mk
@@ -8,5 +8,7 @@ LIBMPD_VERSION = 11.8.17
 LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/11.8.16
 LIBMPD_INSTALL_STAGING = YES
 LIBMPD_DEPENDENCIES = libglib2
+LIBMPD_LICENSE = GPLv2+
+LIBMPD_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From fc1d0c3d47aee2d178c74454c2404f85ccde2554 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:55 +0000
Subject: [PATCH 4100/6849] tn5250: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tn5250/tn5250.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index f43f847590..7b16eb1448 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -8,6 +8,8 @@ TN5250_VERSION = 0.17.4
 TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
 TN5250_MAKE_OPT = CPPFLAGS=""
 TN5250_DEPENDENCIES = ncurses
+TN5250_LICENSE = LGPLv2.1+
+TN5250_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	TN5250_CONF_OPT += --with-ssl

From 706a016b29f6fe11c996cd61ab5a8b66cbc6b5e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:56 +0000
Subject: [PATCH 4101/6849] libungif: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libungif/libungif.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index d4d281ad99..5196ccd962 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -9,6 +9,8 @@ LIBUNGIF_SOURCE = libungif-$(LIBUNGIF_VERSION).tar.bz2
 LIBUNGIF_SITE = http://downloads.sourceforge.net/project/giflib/libungif-4.x/libungif-$(LIBUNGIF_VERSION)
 LIBUNGIF_INSTALL_STAGING = YES
 LIBUNGIF_CONF_OPT = --without-x
+LIBUNGIF_LICENSE = MIT
+LIBUNGIF_LICENSE_FILES = COPYING
 
 LIBUNGIF_BINS = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
 		gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip  \

From 3edc40ec84ab3aef5d27a818de5b12f431aa9235 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:58 +0000
Subject: [PATCH 4102/6849] kismet: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/kismet.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index c8ae8e301e..3787f07093 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -7,6 +7,8 @@
 KISMET_VERSION = 2011-03-R2
 KISMET_SITE = http://www.kismetwireless.net/code
 KISMET_DEPENDENCIES = libpcap ncurses
+KISMET_LICENSE = GPLv2+
+KISMET_LICENSE_FILES = GPL
 
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	KISMET_DEPENDENCIES += libnl

From b9565d594ea8d259bc23847deece3963d062a56d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:59 +0000
Subject: [PATCH 4103/6849] wipe: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wipe/wipe.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index e523a311c9..eed90beb81 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -8,6 +8,8 @@ WIPE_VERSION = 2.3.1
 WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION)
 WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2
 WIPE_AUTORECONF = YES
+WIPE_LICENSE = GPLv2+
+WIPE_LICENSE_FILES = LICENSE
 
 define WIPE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/wipe $(TARGET_DIR)/usr/bin/wipe

From bf885f10b798ef5b2e687c7f8171034bae6e3888 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 22 Jan 2013 08:02:23 +0000
Subject: [PATCH 4104/6849] package/linux-firmware: update to newer version

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/linux-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 8f9645298d..9268608fde 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -3,7 +3,7 @@
 # linux-firmware
 #
 #############################################################
-LINUX_FIRMWARE_VERSION = a707c25a6e992b8ee6127a6ebab63dd063043047
+LINUX_FIRMWARE_VERSION = 65a5163b8bb77bd7759efa3ca780867fcaed89b0
 LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 

From 6a30cd3fb30b8057ddde2c72a88c0bb6ad7d1761 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Tue, 22 Jan 2013 10:33:19 +0000
Subject: [PATCH 4105/6849] xtensa: sqlite requires special compiler option

Some of the generated object files are too large for PC-relative addressing,
so use the -mtext-section-literals compiler flag to move symbols closer to
the code.

[Peter: fix commit message]
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sqlite/sqlite.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index bf4b921244..8eb6b2f76c 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -33,6 +33,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_SECURE_DELETE),y)
 SQLITE_CFLAGS += -DSQLITE_SECURE_DELETE
 endif
 
+ifeq ($(BR2_xtensa),y)
+SQLITE_CFLAGS += -mtext-section-literals
+endif
+
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
 SQLITE_CONF_OPT = \

From 22f4d99273d6f173b996eaeb80426442efe31b1c Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 29 Jan 2013 22:02:59 +0000
Subject: [PATCH 4106/6849] ebtables: needs MMU

Fixes:
http://autobuild.buildroot.net/results/201f8d3d58cdff0c3501a673003558103237fb22/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ebtables/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
index 40bc45c028..ce672851b3 100644
--- a/package/ebtables/Config.in
+++ b/package/ebtables/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_EBTABLES
 	bool "ebtables"
 	depends on BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
 	help
 	  Ethernet bridge frame table administration
 

From 94a05f966874defe4d678f110c11cb87bce1af4f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Jan 2013 00:25:46 +0000
Subject: [PATCH 4107/6849] pcsc-lite: requires mmu

Fixes:
http://autobuild.buildroot.net/results/14400ae2c9e312729efa9a9026b5fdd487868c8a/

Also add license information while at it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccid/Config.in         | 1 +
 package/pcsc-lite/Config.in    | 1 +
 package/pcsc-lite/pcsc-lite.mk | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/ccid/Config.in b/package/ccid/Config.in
index c9b77d13c1..c85a71c3e0 100644
--- a/package/ccid/Config.in
+++ b/package/ccid/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CCID
 	select BR2_PACKAGE_PCSC_LITE
 	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	depends on BR2_USE_MMU # pcsc-lite
 	help
 	  PC/SC driver for USB CCID smart card readers
 
diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in
index 621cc668fe..d6629d0f3e 100644
--- a/package/pcsc-lite/Config.in
+++ b/package/pcsc-lite/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PCSC_LITE
 	bool "pcsc-lite"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Middleware to access smart card using SCard API (PC/SC).
 
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index d1d7691daf..e1def7c03f 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -2,12 +2,15 @@
 #
 # PCSC-Lite
 #
-# ########################################################
+#########################################################
+
 PCSC_LITE_VERSION = 1.8.6
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
 PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/3757
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
+PCSC_LITE_LICENSE = BSD-3c
+PCSC_LITE_LICENSE_FILES = COPYING
 
 # - libudev and libusb are optional
 # - libudev and libusb can't be used together

From 604f35dd5f42c71adc23d787e66767fe74486e3d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 30 Jan 2013 22:16:04 +0000
Subject: [PATCH 4108/6849] neard: bump version to 0.9

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neard/neard.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 3c9dd7c55e..c3466e6509 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -3,7 +3,8 @@
 # neard
 #
 #############################################################
-NEARD_VERSION = 0.8
+
+NEARD_VERSION = 0.9
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
 NEARD_LICENSE = GPLv2
 NEARD_LICENSE_FILES = COPYING

From 7bb7c0843449d605ad93d93dad6c12d275cae31b Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Wed, 30 Jan 2013 17:26:37 +0000
Subject: [PATCH 4109/6849] cjson: change source to svn repo

The original cJSON submittal downloaded a .zip file from SourceForge.
The .zip file did not have a version number, making it impossible
to gaurantee that the same archive is downloaded on any given build.
It also required a custom EXTRACT command.

This patch changes the source for cJSON to the svn repository
listed on the sf project web page - giving us an actual version
number, and letting us use buildroot's normal extraction functionality.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cjson/cjson.mk | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 55af800c67..3722adbed7 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -3,28 +3,24 @@
 # cjson
 #
 #############################################################
-CJSON_VERSION         = undefined
-CJSON_SOURCE          = cJSONFiles.zip
-CJSON_SITE            = http://downloads.sourceforge.net/project/cjson
+CJSON_VERSION         = 42
+CJSON_SITE_METHOD     = svn
+CJSON_SITE            = https://cjson.svn.sourceforge.net/svnroot/cjson
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE         = MIT
 
-define CJSON_EXTRACT_CMDS
-	unzip -d $(@D) $(DL_DIR)/$(CJSON_SOURCE)
-endef
-
 define CJSON_BUILD_CMDS
-	cd $(@D)/cJSON && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so
+	cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so
 endef
 
 define CJSON_INSTALL_STAGING_CMDS
-	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h
-	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(STAGING_DIR)/usr/lib/libcJSON.so
+	$(INSTALL) -D $(@D)/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h
+	$(INSTALL) -D $(@D)/libcJSON.so $(STAGING_DIR)/usr/lib/libcJSON.so
 endef
 
 define CJSON_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/cJSON/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h
-	$(INSTALL) -D $(@D)/cJSON/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so
+	$(INSTALL) -D $(@D)/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h
+	$(INSTALL) -D $(@D)/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so
 endef
 
 define CJSON_UNINSTALL_STAGING_CMDS
@@ -38,7 +34,7 @@ define CJSON_UNINSTALL_TARGET_CMDS
 endef
 
 define CJSON_CLEAN_CMDS
-	cd $(@D)/cJSON && rm -f libcJSON.so
+	rm -f $(@D)/libcJSON.so
 endef
 
 $(eval $(generic-package))

From 82e39a2900aa7605590d93d1019c91dc3615f0f6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Feb 2013 03:04:50 +0000
Subject: [PATCH 4110/6849] blackfin: add 2012r2 and remove 2010rc1 toolchains

Remove the old 2010RC1 toolchain and add the new 2012R2-RC2 toolchain.
On related good news the new toolchain fixes:
http://autobuild.buildroot.net/results/eac5bd4f4766d98431e72a3c81492a962c85fa98/
since it's got unshare() support now.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 16 ++++++++--------
 toolchain/toolchain-external/ext-tool.mk | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2e79052ddc..5f9ebdbb66 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -580,8 +580,8 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	  Other architecture variants (beyond Pentium-4/Xeon) are
 	  supported as well, but glibc is not optimised for it.
 
-config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
-	bool "Blackfin.uclinux.org 2012R1-BETA1"
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
+	bool "Blackfin.uclinux.org 2012R2-RC2"
 	depends on BR2_bfin
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
@@ -597,8 +597,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
 
-config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
-	bool "Blackfin.uclinux.org 2011R1-RC4"
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFI_UCLINUX_2012R1
+	bool "Blackfin.uclinux.org 2012R1-RC2"
 	depends on BR2_bfin
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
@@ -614,8 +614,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
 
-config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
-	bool "Blackfin.uclinux.org 2010RC1"
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
+	bool "Blackfin.uclinux.org 2011R1-RC4"
 	depends on BR2_bfin
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
@@ -758,12 +758,12 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
-	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
-	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BFIN_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BFIN_FDPIC
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && !BR2_BFIN_FDPIC
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b0ca3cd74a..2c2d5f7185 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -232,12 +232,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
-TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
-TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8386/
-TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2010R1-RC4.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9509/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2
@@ -250,6 +244,12 @@ TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9866/
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R1-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
+TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/588/10139/
+TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/588/10147/
+TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0_le.git;a=blob;h=d7b493c5dbcc24ba9cc3be2e4c14d6d9701e6805;hb=00163583b771bb4e937632765dd0c5516b3e31c4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
@@ -283,7 +283,7 @@ endif
 # contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
 # which themselves contain the toolchain. This is why we strip more
 # components than usual.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 

From 88cf3bb91792c9c04586e14f293d89a6e0c13e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?=
 <benoit.thebaudeau@advansee.com>
Date: Fri, 1 Feb 2013 09:33:24 +0000
Subject: [PATCH 4111/6849] arch/Config.in.arm: Use armv6k for arm1136jf-s rev1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the ARM1136JF-S and ARM1136J-S Revision r1p5 Technical Reference
Manual, from release rev1 (r1pn), the ARM1136JF-S processor implements the ARMv6
instruction set with the ARMv6k additions.

This patch differentiates the ARM1136JF-S revisions 0 and 1 in order to use
either ARMv6j (e.g. on Freescale i.MX31) or ARMv6k (e.g. on Freescale i.MX35).

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 806b196473..b681d27f45 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -31,8 +31,10 @@ config BR2_arm926t
 	bool "arm926t"
 config BR2_arm10t
 	bool "arm10t"
-config BR2_arm1136jf_s
-	bool "arm1136jf_s"
+config BR2_arm1136jf_s_r0
+	bool "arm1136jf_s rev0"
+config BR2_arm1136jf_s_r1
+	bool "arm1136jf_s rev1"
 config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 config BR2_arm1176jzf_s
@@ -59,6 +61,10 @@ config BR2_iwmmxt
 	bool "iwmmxt"
 endchoice
 
+config BR2_arm1136jf_s
+	bool
+	default BR2_arm1136jf_s_r0 || BR2_arm1136jf_s_r1
+
 choice
 	prompt "Target ABI"
 	depends on BR2_arm || BR2_armeb
@@ -126,7 +132,8 @@ config BR2_GCC_TARGET_ARCH
 	default "armv4t"	if BR2_arm922t
 	default "armv5te"	if BR2_arm926t
 	default "armv5t"	if BR2_arm10t
-	default "armv6j"	if BR2_arm1136jf_s
+	default "armv6j"	if BR2_arm1136jf_s_r0
+	default "armv6k"	if BR2_arm1136jf_s_r1
 	default "armv6zk"	if BR2_arm1176jz_s
 	default "armv6zk"	if BR2_arm1176jzf_s
 	default "armv7-a"	if BR2_cortex_a5

From a84075b5f48b35c1449f17fdedc63b5c7bf6ab0c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 2 Feb 2013 13:42:03 +0100
Subject: [PATCH 4112/6849] toolchain-external: add linaro 2013.01, remove
 2012.10

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 20 ++++++++++----------
 toolchain/toolchain-external/ext-tool.mk |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5f9ebdbb66..28e9444b63 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,8 +3,8 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
-	bool "Linaro 2012.12"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
+	bool "Linaro 2013.01"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -14,7 +14,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.12 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GCC 2013.01 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -22,8 +22,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
-	bool "Linaro 2012.11"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
+	bool "Linaro 2012.12"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -33,7 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.11 (based on gcc 4.7), Linaro GDB 2012.10 (based on
+	  GCC 2012.12 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -41,8 +41,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
-	bool "Linaro 2012.10"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
+	bool "Linaro 2012.11"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -52,7 +52,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.10 (based on gcc 4.7), Linaro GDB 2012.10 (based on
+	  GCC 2012.11 (based on gcc 4.7), Linaro GDB 2012.10 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -734,9 +734,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2c2d5f7185..92bf235acc 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -184,15 +184,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.10/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.12/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.12-20121214_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01),y)
+TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2013.01/+download/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From d7937773fd85daa675290816af981ff0079f21b8 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 20 Jan 2013 11:55:41 +0000
Subject: [PATCH 4113/6849] avr32: support uClibc 0.9.33.2

Add a uClibc patch from OpenWRT, and tweak an existing patch to cope with
the lack of a dup3 Linux syscall on avr32. This allow uClibc 0.9.33.2 to be
built for avr32.

[Peter: add upstream url for openwrt patch]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2        |  3 ++-
 toolchain/uClibc/Config.in                       |  3 +--
 ...c-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch | 16 ++++++++++++++++
 toolchain/uClibc/uClibc-0.9.33.2-dup3.patch      |  4 +++-
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index d27c9f35f5..a713727f5b 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -68,7 +68,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !BR2_xtensa
+	default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -95,6 +95,7 @@ choice
 		depends on !BR2_UCLIBC_VERSION_0_9_31
 		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
+		depends on !BR2_avr32
 		depends on !BR2_xtensa
 endchoice
 
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index e47bc9bb09..a48b6a0bff 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,7 +5,6 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_0_9_31 if BR2_avr32 # 0.9.32 broken
 	default BR2_UCLIBC_VERSION_0_9_33
 	help
 	  Select the version of uClibc you wish to use.
@@ -20,7 +19,7 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.x"
-		depends on !(BR2_avr32 || BR2_xtensa)
+		depends on !BR2_xtensa
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
diff --git a/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch b/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch
new file mode 100644
index 0000000000..e28b6d25d9
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch
@@ -0,0 +1,16 @@
+Patch from OpenWRT for avr32.
+
+https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+--- a/libc/sysdeps/linux/avr32/bits/atomic.h
++++ b/libc/sysdeps/linux/avr32/bits/atomic.h
+@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
+ 
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
+ 	({								\
++		__uint32_t __result;					\
+ 		__typeof__(*(mem)) __prev;				\
+ 		__asm__ __volatile__(					\
+ 			"/* __arch_compare_and_exchange_val_32_acq */\n" \
diff --git a/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
index 66b419e2bf..87fe2a679f 100644
--- a/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
+++ b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
@@ -29,7 +29,7 @@ new file mode 100644
 index 0000000..5fdab2e
 --- /dev/null
 +++ b/libc/sysdeps/linux/common/dup3.c
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,17 @@
 +/* vi: set sw=4 ts=4: */
 +/*
 + * dup3() for uClibc
@@ -43,8 +43,10 @@ index 0000000..5fdab2e
 +#include <unistd.h>
 +
 +
++#ifdef __NR_dup3
 +_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
 +libc_hidden_def(dup3)
++#endif
 -- 
 1.7.5.4
 

From 82245c6f21aa72bca05801de2ad5c0207abad454 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 2 Feb 2013 00:24:35 +0000
Subject: [PATCH 4114/6849] nuttcp: needs mmu

Fixes:
http://autobuild.buildroot.net/results/b8c019a5701377a1e134d01ac0bae5fe34dc975f/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nuttcp/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nuttcp/Config.in b/package/nuttcp/Config.in
index fb6d3b186d..eea88fd4e5 100644
--- a/package/nuttcp/Config.in
+++ b/package/nuttcp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NUTTCP
 	bool "nuttcp"
+	depends on BR2_USE_MMU # fork()
 	help
 	  nuttcp is a TCP/UDP network testing tool, much like iperf
 

From 7bf0e3538f6252ca9c4cd2f69a23ea23af4ebb7f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Feb 2013 03:46:22 +0000
Subject: [PATCH 4115/6849] toolchain-external: add support for AArch64 Linaro
 2013.01 toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 12 ++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 28e9444b63..1021b62d9e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -651,6 +651,17 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
+	bool "Linaro AArch64 13.01"
+	depends on BR2_aarch64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Toolchain for the AArch64 architecture, from
+	  http://www.linaro.org/engineering/armv8/
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	bool "Linaro AArch64 12.12"
 	depends on BR2_aarch64
@@ -743,6 +754,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 92bf235acc..8a41043544 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -265,6 +265,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.11-1-20121127_li
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.12/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.12-20121214_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01),y)
+TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/13.01/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.01-20130125_linux.tar.xz
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From 1382af876b1f5d89201c1b96116b0814990a8dba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Feb 2013 03:46:23 +0000
Subject: [PATCH 4116/6849] toolchain-external: remove support for AArch64
 Linaro 2012.10 toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 12 ------------
 toolchain/toolchain-external/ext-tool.mk |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 1021b62d9e..5b26aa9b8d 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -684,17 +684,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
-	bool "Linaro AArch64 12.10"
-	depends on BR2_aarch64
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	help
-	  Toolchain for the AArch64 architecture, from
-	  http://www.linaro.org/engineering/armv8/
-
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 	bool "Custom toolchain"
 	help
@@ -751,7 +740,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 8a41043544..452204b59a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -256,9 +256,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10),y)
-TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.10/components/toolchain/gcc-linaro/aarch64/rc3/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7+bzr115029-20121015+bzr2506_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.11/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.11-1-20121127_linux.tar.bz2

From e407fac85ce51e652c7cd4fd422c788aa3f5f0cf Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 18 Jan 2013 12:08:46 +0000
Subject: [PATCH 4117/6849] lvm2: Install devmapper.pc to staging/target
 pkgconfig directory.

Without this change if some package which have dependency on device mapper
and use pkgconfig to check version always fail to find library because
devmapper.pc file wasn't installed.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lvm2/lvm2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 52326eae64..f54caa44d4 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -21,7 +21,7 @@ LVM2_BINS = \
 
 # Make sure that binaries and libraries are installed with write
 # permissions for the owner.
-LVM2_CONF_OPT += --enable-write_install
+LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig
 
 # LVM2 uses autoconf, but not automake, and the build system does not
 # take into account the CC passed at configure time.

From 171f5d41665e8ef305e694118b5503dbb50b736e Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Mon, 7 Jan 2013 10:43:18 +0000
Subject: [PATCH 4118/6849] lvm2: add option for application library

[Peter: make mutual exclusive with dmsetup-only, drop special install / make]
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lvm2/Config.in | 7 +++++++
 package/lvm2/lvm2.mk   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index 30af14e699..374de94600 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -21,5 +21,12 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY
 	help
 	  Install dmsetup only and skip the LVM2 suite.
 
+config BR2_PACKAGE_LVM2_APP_LIBRARY
+	bool "install application library"
+	depends on BR2_PACKAGE_LVM2
+	depends on !BR2_PACKAGE_LVM2_DMSETUP_ONLY
+	help
+	  Install application library (liblvm2app).
+
 comment "lvm2 requires a toolchain with LARGEFILE support"
         depends on !BR2_LARGEFILE
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index f54caa44d4..49f135d56b 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -41,6 +41,12 @@ LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
 LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
 endif
 
+ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
+LVM2_CONF_OPT += --enable-applib
+else
+LVM2_CONF_OPT += --disable-applib
+endif
+
 define LVM2_UNINSTALL_STAGING_CMDS
 	rm -f $(addprefix $(STAGING_DIR)/usr/sbin/,$(LVM2_BINS))
 	rm -f $(addprefix $(STAGING_DIR)/usr/lib/,libdevmapper.so*)

From 00c1f03ee72659800221f00b657941050f2d880f Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 18 Jan 2013 12:08:47 +0000
Subject: [PATCH 4119/6849] udisks: new package

[Peter: fix dependencies, comment]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/udisks/Config.in | 34 ++++++++++++++++++++++++++++++++++
 package/udisks/udisks.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 package/udisks/Config.in
 create mode 100644 package/udisks/udisks.mk

diff --git a/package/Config.in b/package/Config.in
index e6682fc03f..2f219b6f2d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -280,6 +280,7 @@ source "package/sysstat/Config.in"
 source "package/ti-utils/Config.in"
 source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
+source "package/udisks/Config.in"
 source "package/usb_modeswitch/Config.in"
 source "package/usb_modeswitch_data/Config.in"
 source "package/usbmount/Config.in"
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
new file mode 100644
index 0000000000..77cbcb885c
--- /dev/null
+++ b/package/udisks/Config.in
@@ -0,0 +1,34 @@
+config BR2_PACKAGE_UDISKS
+	bool "udisks"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_UDEV
+	select BR2_PACKAGE_UDEV_ALL_EXTRAS
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_SG3_UTILS
+	select BR2_PACKAGE_POLKIT
+	select BR2_PACKAGE_PARTED
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_LIBATASMART
+	help
+	  The udisks project provides
+
+	   o A storage daemon that implements well-defined D-Bus
+	     interfaces that can be used to query and manipulate
+	     storage devices.
+
+	   o a command-line tool, udisks(1), that can be used to query
+	     and use the daemon
+
+	  http://www.freedesktop.org/wiki/Software/udisks
+
+config BR2_PACKAGE_UDISKS_LVM2
+	bool "lvm2 support"
+	depends on BR2_PACKAGE_UDISKS
+	select BR2_PACKAGE_LVM2_APP_LIBRARY
+	help
+	  Enable LVM2 support
+
+comment "udisks requires /dev mgmnt set to udev under System configuration"
+	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
new file mode 100644
index 0000000000..844dfcd5d2
--- /dev/null
+++ b/package/udisks/udisks.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# udisks
+#
+#############################################################
+
+UDISKS_VERSION = 1.0.4
+UDISKS_SITE    = http://hal.freedesktop.org/releases/
+UDISKS_LICENCE = GPLv2+
+UDISKS_LICENCE_FILES = COPYING
+
+UDISKS_DEPENDENCIES = 	\
+	sg3_utils	\
+	host-pkgconf	\
+	udev		\
+	dbus		\
+	dbus-glib	\
+	polkit		\
+	parted		\
+	lvm2		\
+	libatasmart
+
+UDISKS_CONF_OPT = --disable-remote-access
+
+ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
+UDISKS_CONF_OPT += --enable-lvm2
+endif
+
+$(eval $(autotools-package))

From ea6f3bd9f25d7a0c3e39a166036a7f8b74935a72 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 3 Feb 2013 15:29:14 +0100
Subject: [PATCH 4120/6849] u-boot: bump 2013.01.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index f10b6d06bf..d22e23bd72 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -19,7 +19,7 @@ choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_2013_01
-	bool "2013.01"
+	bool "2013.01.01"
 
 config BR2_TARGET_UBOOT_2012_10
 	bool "2012.10"
@@ -58,7 +58,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2013.01"	if BR2_TARGET_UBOOT_2013_01
+	default "2013.01.01"	if BR2_TARGET_UBOOT_2013_01
 	default "2012.10"	if BR2_TARGET_UBOOT_2012_10
 	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04

From d3e7fbd75e49e3368b8c361c45344266ceca5cfd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 09:52:22 +0000
Subject: [PATCH 4121/6849] heirloom-mailx: needs fork()

heirloom-mailx uses fork(), so we can't use it as is on !mmu
platforms.

Fixes:

http://autobuild.buildroot.org/results/c5a8e3a4cbc1e1de985fe3c724b711027865abe7/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/heirloom-mailx/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/heirloom-mailx/Config.in b/package/heirloom-mailx/Config.in
index 9a871d4f6a..ca83dc365d 100644
--- a/package/heirloom-mailx/Config.in
+++ b/package/heirloom-mailx/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_HEIRLOOM_MAILX
 	bool "heirloom-mailx"
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  Heirloom mailx (previously known as nail) is a mail user
 	  agent for Unix systems.

From f72c65a3ae83ffd3d5e3bf0367d53daf437bea28 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 21:53:20 +0100
Subject: [PATCH 4122/6849] pptp-linux: rename patches to remove the version
 number

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0-001-susv3-legacy.patch => pptp-linux-001-susv3-legacy.patch} | 0
 ...1.7.2-drop-stropts.patch => pptp-linux-002-drop-stropts.patch} | 0
 ...ptp-linux-1.7.2-ip-path.patch => pptp-linux-003-ip-path.patch} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename package/pptp-linux/{pptp-linux-1.7.0-001-susv3-legacy.patch => pptp-linux-001-susv3-legacy.patch} (100%)
 rename package/pptp-linux/{pptp-linux-1.7.2-drop-stropts.patch => pptp-linux-002-drop-stropts.patch} (100%)
 rename package/pptp-linux/{pptp-linux-1.7.2-ip-path.patch => pptp-linux-003-ip-path.patch} (100%)

diff --git a/package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch b/package/pptp-linux/pptp-linux-001-susv3-legacy.patch
similarity index 100%
rename from package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch
rename to package/pptp-linux/pptp-linux-001-susv3-legacy.patch
diff --git a/package/pptp-linux/pptp-linux-1.7.2-drop-stropts.patch b/package/pptp-linux/pptp-linux-002-drop-stropts.patch
similarity index 100%
rename from package/pptp-linux/pptp-linux-1.7.2-drop-stropts.patch
rename to package/pptp-linux/pptp-linux-002-drop-stropts.patch
diff --git a/package/pptp-linux/pptp-linux-1.7.2-ip-path.patch b/package/pptp-linux/pptp-linux-003-ip-path.patch
similarity index 100%
rename from package/pptp-linux/pptp-linux-1.7.2-ip-path.patch
rename to package/pptp-linux/pptp-linux-003-ip-path.patch

From a5b8081b89ebd5f9ff224440376e811c43696866 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 21:53:21 +0100
Subject: [PATCH 4123/6849] pptp-linux: fix parallel build

Add a patch to fix a parallel build issue caused by a header file
being generated too late.

Fixes:

http://autobuild.buildroot.org/results/2324974d4818b2657a7df4beee33fc4713d6116f/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../pptp-linux-004-fix-parallel-build.patch   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/pptp-linux/pptp-linux-004-fix-parallel-build.patch

diff --git a/package/pptp-linux/pptp-linux-004-fix-parallel-build.patch b/package/pptp-linux/pptp-linux-004-fix-parallel-build.patch
new file mode 100644
index 0000000000..04a797743f
--- /dev/null
+++ b/package/pptp-linux/pptp-linux-004-fix-parallel-build.patch
@@ -0,0 +1,23 @@
+Fix parallel build issue
+
+The config.h header file must be created before being used to build
+source files that include it, especially version.c. In order for this
+to happen even in highly-parallel builds, we add a dependency of all
+object files on config.h, in order to ensure it gets generated before
+make attempts to build the object files.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -37,6 +37,8 @@
+ 
+ all: config.h $(PPTP_BIN) pptpsetup.8
+ 
++$(PPTP_OBJS): config.h
++
+ $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS)
+ 	$(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS)
+ 

From c118c4350b38d2c936afbe2d696229eb8dd7ae8e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 22:53:06 +0100
Subject: [PATCH 4124/6849] libfuse: add patch to fix AArch64 build issue

Fixes http://autobuild.buildroot.org/results/1fb89ab412935ab02494b269a367b283cf9618c1/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libfuse/libfuse-fix-aarch64-build.patch   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/libfuse/libfuse-fix-aarch64-build.patch

diff --git a/package/libfuse/libfuse-fix-aarch64-build.patch b/package/libfuse/libfuse-fix-aarch64-build.patch
new file mode 100644
index 0000000000..3b88687f6c
--- /dev/null
+++ b/package/libfuse/libfuse-fix-aarch64-build.patch
@@ -0,0 +1,22 @@
+Fix build on the AArch64 platform
+
+Upstream-Status: Submitted
+
+Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
+
+--- a/include/fuse_kernel.h
++++ b/include/fuse_kernel.h
+@@ -88,12 +88,7 @@
+ #ifndef _LINUX_FUSE_H
+ #define _LINUX_FUSE_H
+ 
+-#include <sys/types.h>
+-#define __u64 uint64_t
+-#define __s64 int64_t
+-#define __u32 uint32_t
+-#define __s32 int32_t
+-#define __u16 uint16_t
++#include <linux/types.h>
+ 
+ /*
+  * Version negotiation:

From 6de88cabd7b22005a8d40df8aec369eb90525ce5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Feb 2013 22:33:47 +0100
Subject: [PATCH 4125/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/CHANGES b/CHANGES
index 2c357eb8a1..56bfd6305a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,111 @@
+2013.02, Not released yet:
+
+	Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target
+	libraries install fixed. Add Linaro ARM
+	2012.11/2012.12/2013.01, Aarch4 12.11/12.12/13.01. Sourcery
+	CodeBench MIPS 2012.03/09. Infrastructure to warn about
+	missing 32bit support for binary toolchains. Add GDB 7.5.1 /
+	Remove 6.8 / 7.0 / 7.1.
+
+	Architecture: Xtensa fixes, add missing powerpc variants, arm
+	1136jf-s rev1, add A5/A15, neon support toggle, Sparc: drop
+	old unused variants
+
+	Bootloaders: At91bootstap: fix upstream URL, Barebox: add
+	2012.12/2013.01, remove 2012.08/09, lzop fixes, environment
+	image support, U-Boot: add 2013.01.01
+
+	Linux: fix appended dtb handling for v3.8+ kernels, support
+	multiple device trees
+
+	Defconfigs: calao USB-A9260, snowball, QEMU PPC440 on ML507
+	board, QEMU ARM Exynos4210, Kernel version in QEMU defconfigs
+	updated, at91rm9200df: misc fixes
+
+	Infrastructure: Git download fixes. Toolchain make target
+	renamed from 'cross' to 'toolchain'. Eclipse integration
+	support. Option to set root password.
+
+	Updated/fixed packages: alsa-lib, argp-standalone, argus,
+	arptables, atk, audiofile, axel, beecrypt, bind, bison,
+	bluez_utils, boost, cairo, can-utils, bmon, boa, busybox,
+	cairo, ccache, cdrkit, cifs-utils, cjson, cmake, collectd,
+	connman, coreutils, cpanminus, dbus, dhcp, dialog, diffutils,
+	directfb, distcc, divine, dnsmasq, docker, dosfstools, dstat,
+	e2fsprogs, ebtables, ed, empty, ethtool, expedite, fbv,
+	ffmpeg, flex, fltk, fluxbox, freetype, gadget-test, gawk, gdb,
+	genext2fs, gettext, giblib, glib-networking, gmp, gmpc, gnupg,
+	gnutls, gpsd, gst-plugins-{bad,base,good}, gstreamer, gzip,
+	haserl, hdparm, heirloom-mailx, hiawanta, hostapd, icu,
+	imlib2, inadyn, infozip, iproute2, ipset, iptables, iw, jpeg,
+	jquery, jquery-sparklines, jqeury-validation, kismet, kmod,
+	lame, libao, libcap, libcurl, libdvdnav, libecore, libedbus,
+	libedje, libeet, libefreet, libeina, libeio, liberation,
+	libelementary, libembryo, libethumb, libev, libevas, libffi,
+	libfribidi, libfuse, libgcrypt, libglib2, libgtk2, libhid,
+	libidn, libmicrohttpd, libmpd, libnl, libnspr, libnss, libogg,
+	libpcap, libplayer, libroxml, librsvg, libseccomp, libsigc,
+	libungif, liburcu, libvncserver, libvorbis, libxml2, libxslt,
+	lighttpd, links, linux-firmware, linux-fusion, ltp-testsuite,
+	ltrace, lttng-{babel,libust,modules,tools}, lvm2, lua, luajit,
+	lzop, matchbox-{desktop,lib}, metacity, midori, minicom, mpd,
+	mpfr, mplayer, mtd, mysql_client, neon, netatalk,
+	networkmanager, nspr, ntfs-3g, nuttcp, ofone, olsr, openssl,
+	openvpn, opkg, oprofile, opus, opus-tools, orc, ortp, pango,
+	pciutils, pcmanfm, pcre, pcsc-lite, perl, php, pixman,
+	pkgconf, polarssl, pptp-linux, proxychains, pulseaudio,
+	python, python3, qemu, qextserialport, qt, quagga, radvd,
+	readline, rng-tools, rt-tests, rubix, ruby, sam-ba, samba,
+	sane-backends, sconeserver, scons, screen, sdl, sdl_gfx,
+	sdl_mixer, sdl_ttf, sdparm, sed, smartmontools, speex, sqlite,
+	squid, sshfs, strace, sudo, sylpheed, tn5250, taglib, tar,
+	torsmo, transmission, tslib, uboot-tools, ulogd,
+	usb_modeswitch, util-linux, valgrind, vim, vsftpd, wavpack,
+	webkit, wipe, wireless_tools, wpa_supplicant, xapp_xinit,
+	xapp_xinput-calibrator, xapp_xman, xapp_xmh, xlib_libX11,
+	xlib_libXdmcp, xlib_libXft, xlib_libpthread-stubs,
+	xlib_xtrans, xproto_xcmiscproto, xproto_xextproto,
+	xserver_xorg-server, xstroke, xvkbd, xz
+
+	New packages: b43-firmware, b43-fwcutter, bustle,
+	cache-calibrator, cegui06, celt051, classpath, curlftpfs,
+	dvb-apps, dvbsnoop, elfutils, enlightenment, firmware-imx,
+	flashbench, gd, gesftpserver, gst-fsl-plugins, httping, iftop,
+	imx-lib, jamvm, jpeg-turbo, keyutils, libatasmart, libcofi,
+	libebml, libevas-generic-loaders, libfslcodec, libfslparser,
+	libfslvpuwrap, libgsasl, libiscsi, libmatroska, libmcrypt,
+	libmhash, libqwt, libseccomp, libsha1, linenoise, mcrypt,
+	media-ctl, ncdu, neard, neardal, nettle, perf, polkit,
+	proxychains, python-bottle, python-pyparsing, rpi-firmware,
+	rpi-userland, sg3_utils, slirp, snowball-hdmiservice, spice,
+	spice-protocol, tcllib, tvheadend, udisks, usbredir
+	ux500-firmware, vde2, xcb-utils-keysyms, yavta,
+	zd1211-firmware
+
+	Removed packages: xdriver_xf86-input-{acecad,aiptek},
+	xdriver_xf86-video-{apm,chips,i740,rendition,s3,s3virge,sisusb},
+	xdriver_xf86-video-sun{cg14,cg3,cg6,ffb,leo,tcx},
+	xdriver_xf86-video-{tsend,xgi,xgixp}
+
+	Deprecated packages: xstroke
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4237: building shared openssl w/-Os fails due to gcc bug
+	#5690: python3 does not obey to BR2_PACKAGE_PYTHON3_PYC_ONLY=y
+	#5602: python3 should install a "python" symbolic link
+	#5846: Extra slash added to last slash in URL
+
+2012.11.1, Released January 3rd, 2013:
+
+	Toolchain: Fixed non-largefile builds on recent Ubuntu
+	versions.
+
+	Arch: fix missing x86/generic handling, Build for Xtensa with
+	longcalls option.
+
+	Updated/fixed packages: dosfstools, qt
+
 2012.11, Released December 2nd, 2012:
 
 	Git shallow clone fix for older git version.

From 90de2b9d96695f949b1c88e9b0999875d761fe06 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 03:37:23 +0000
Subject: [PATCH 4126/6849] neard: fix missing nfc.h header

We have a patch that allows neard to build even on toolchain using old
kernel headers that lack the nfc.h header. However, after the bump to
neard 0.9, this patch was not updated to take into account the two new
plugins that neard has added.

Fixes http://autobuild.buildroot.org/results/5eeb6f62cc0e654a536b6614dc51e8af4e301bb6/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../neard-fix-missing-linux-nfc-header.patch  | 104 ++++++++++++------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/package/neard/neard-fix-missing-linux-nfc-header.patch b/package/neard/neard-fix-missing-linux-nfc-header.patch
index 9b9ce32358..b04c5daff8 100644
--- a/package/neard/neard-fix-missing-linux-nfc-header.patch
+++ b/package/neard/neard-fix-missing-linux-nfc-header.patch
@@ -10,10 +10,10 @@ is available or not, and if not, use our own private copy of it.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: neard-0.8/configure.ac
+Index: b/configure.ac
 ===================================================================
---- neard-0.8.orig/configure.ac	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/configure.ac	2012-12-09 17:08:00.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -88,6 +88,8 @@
  AC_SUBST(NETLINK_CFLAGS)
  AC_SUBST(NETLINK_LIBS)
@@ -23,10 +23,10 @@ Index: neard-0.8/configure.ac
  AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
  					[enable test/example scripts]),
  					[enable_test=${enableval}])
-Index: neard-0.8/src/near.h
+Index: b/src/near.h
 ===================================================================
---- neard-0.8.orig/src/near.h	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/src/near.h	2012-12-09 16:56:40.000000000 +0100
+--- a/src/near.h
++++ b/src/near.h
 @@ -23,7 +23,11 @@
  #include <sys/socket.h>
  
@@ -39,10 +39,10 @@ Index: neard-0.8/src/near.h
  
  #include <glib.h>
  
-Index: neard-0.8/src/linux-nfc.h
+Index: b/src/linux-nfc.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ neard-0.8/src/linux-nfc.h	2012-12-09 17:11:10.000000000 +0100
+--- /dev/null
++++ b/src/linux-nfc.h
 @@ -0,0 +1,197 @@
 +/*
 + * Copyright (C) 2011 Instituto Nokia de Tecnologia
@@ -241,10 +241,10 @@ Index: neard-0.8/src/linux-nfc.h
 +#define NFC_LLCP_DIRECTION_TX		0x01
 +
 +#endif /*__LINUX_NFC_H */
-Index: neard-0.8/plugins/mifare.c
+Index: b/plugins/mifare.c
 ===================================================================
---- neard-0.8.orig/plugins/mifare.c	2012-10-10 05:29:07.000000000 +0200
-+++ neard-0.8/plugins/mifare.c	2012-12-09 16:58:22.000000000 +0100
+--- a/plugins/mifare.c
++++ b/plugins/mifare.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  
@@ -257,10 +257,10 @@ Index: neard-0.8/plugins/mifare.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/p2p.c
+Index: b/plugins/p2p.c
 ===================================================================
---- neard-0.8.orig/plugins/p2p.c	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/plugins/p2p.c	2012-12-09 16:59:06.000000000 +0100
+--- a/plugins/p2p.c
++++ b/plugins/p2p.c
 @@ -30,7 +30,11 @@
  #include <sys/socket.h>
  
@@ -273,10 +273,10 @@ Index: neard-0.8/plugins/p2p.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/handover.c
+Index: b/plugins/handover.c
 ===================================================================
---- neard-0.8.orig/plugins/handover.c	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/plugins/handover.c	2012-12-09 17:13:30.000000000 +0100
+--- a/plugins/handover.c
++++ b/plugins/handover.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  
@@ -289,10 +289,10 @@ Index: neard-0.8/plugins/handover.c
  
  #include <near/types.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/nfctype1.c
+Index: b/plugins/nfctype1.c
 ===================================================================
---- neard-0.8.orig/plugins/nfctype1.c	2012-10-10 05:29:07.000000000 +0200
-+++ neard-0.8/plugins/nfctype1.c	2012-12-09 17:09:13.000000000 +0100
+--- a/plugins/nfctype1.c
++++ b/plugins/nfctype1.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  
@@ -305,10 +305,10 @@ Index: neard-0.8/plugins/nfctype1.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/nfctype2.c
+Index: b/plugins/nfctype2.c
 ===================================================================
---- neard-0.8.orig/plugins/nfctype2.c	2012-10-10 05:29:07.000000000 +0200
-+++ neard-0.8/plugins/nfctype2.c	2012-12-09 17:09:52.000000000 +0100
+--- a/plugins/nfctype2.c
++++ b/plugins/nfctype2.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  
@@ -321,10 +321,10 @@ Index: neard-0.8/plugins/nfctype2.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/nfctype3.c
+Index: b/plugins/nfctype3.c
 ===================================================================
---- neard-0.8.orig/plugins/nfctype3.c	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/plugins/nfctype3.c	2012-12-09 17:11:51.000000000 +0100
+--- a/plugins/nfctype3.c
++++ b/plugins/nfctype3.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  
@@ -337,10 +337,10 @@ Index: neard-0.8/plugins/nfctype3.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/nfctype4.c
+Index: b/plugins/nfctype4.c
 ===================================================================
---- neard-0.8.orig/plugins/nfctype4.c	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/plugins/nfctype4.c	2012-12-09 17:12:14.000000000 +0100
+--- a/plugins/nfctype4.c
++++ b/plugins/nfctype4.c
 @@ -30,7 +30,11 @@
  #include <sys/socket.h>
  
@@ -353,10 +353,10 @@ Index: neard-0.8/plugins/nfctype4.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/npp.c
+Index: b/plugins/npp.c
 ===================================================================
---- neard-0.8.orig/plugins/npp.c	2012-10-10 05:29:07.000000000 +0200
-+++ neard-0.8/plugins/npp.c	2012-12-09 17:12:36.000000000 +0100
+--- a/plugins/npp.c
++++ b/plugins/npp.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  
@@ -369,10 +369,42 @@ Index: neard-0.8/plugins/npp.c
  
  #include <near/plugin.h>
  #include <near/log.h>
-Index: neard-0.8/plugins/snep.c
+Index: b/plugins/snep.c
 ===================================================================
---- neard-0.8.orig/plugins/snep.c	2012-11-03 19:56:07.000000000 +0100
-+++ neard-0.8/plugins/snep.c	2012-12-09 17:13:07.000000000 +0100
+--- a/plugins/snep.c
++++ b/plugins/snep.c
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: b/plugins/snep-core.c
+===================================================================
+--- a/plugins/snep-core.c
++++ b/plugins/snep-core.c
+@@ -29,7 +29,11 @@
+ #include <sys/socket.h>
+ 
+ #include <linux/socket.h>
++#ifdef HAVE_LINUX_NFC_H
+ #include <linux/nfc.h>
++#else
++#include "../src/linux-nfc.h"
++#endif
+ 
+ #include <near/plugin.h>
+ #include <near/log.h>
+Index: b/plugins/snep-validation.c
+===================================================================
+--- a/plugins/snep-validation.c
++++ b/plugins/snep-validation.c
 @@ -29,7 +29,11 @@
  #include <sys/socket.h>
  

From 095d7f1e2f5e721521cdd660e2775388412f6687 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Feb 2013 00:50:14 +0000
Subject: [PATCH 4127/6849] kernel-headers: bump 3.{0, 4, 7}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.61-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 5fda8151f9..432ef20124 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.61"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.62"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.37"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.28"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.29"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.5"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.6"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.61-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.61-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch

From 5ee8a38cb200b8d6a8d28798753521ad0d253ab3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Feb 2013 00:50:15 +0000
Subject: [PATCH 4128/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 78b7b0c837..3c50acc222 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.5"
+	bool "3.7.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.5" if BR2_LINUX_KERNEL_3_7
+	default "3.7.6" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 614e400b5b6f64327fc7b46ae23ba569069a002b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Feb 2013 02:20:30 +0000
Subject: [PATCH 4129/6849] iw: switch upstream site

It's moved from wireless.kernel.org to generic kernel.org

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 22ea25c821..9233833751 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -6,7 +6,7 @@
 
 IW_VERSION = 3.8
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
-IW_SITE = http://wireless.kernel.org/download/iw
+IW_SITE = http://www.kernel.org/pub/software/network/iw
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl

From 7c42bb1f3af67a063400a3926c5614d06da17d47 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Feb 2013 02:25:17 +0000
Subject: [PATCH 4130/6849] uboot-tools: also bump to 2013.01.01

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uboot-tools/uboot-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 3470b6022e..9d7596a702 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -3,7 +3,7 @@
 # uboot-tools
 #
 #############################################################
-UBOOT_TOOLS_VERSION = 2013.01
+UBOOT_TOOLS_VERSION = 2013.01.01
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+

From a17820fe3f060421816aaefaafaab73077e9529e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Feb 2013 02:51:03 +0000
Subject: [PATCH 4131/6849] polarssl: security bump to version 1.2.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 4 ++--
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index ec65285f8d..8f7ce5f5b8 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.3]
+[Gustavo: update for polarssl 1.2.5]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.3 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.5 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index c66c633f93..0478f8a3de 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.3
+POLARSSL_VERSION = 1.2.5
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From 78e8ed096d643717026392cca19573fb278a1c8d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 02:15:27 +0000
Subject: [PATCH 4132/6849] tvheadend: get rid of trailing spaces/tabs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 67badce0a0..899b160cda 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -10,9 +10,9 @@ config BR2_PACKAGE_TVHEADEND
 	  Tvheadend is a TV streaming server for Linux supporting DVB-S,
 	  DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as
 	  input sources.
-	  
+
 	  https://www.lonelycoder.com/redmine/projects/tvheadend/
-	  
+
 	  Note:
 	    - a default user has been created to log in the web configuration
 	      GUI: admin/admin; you can change it at your discretion at runtime.

From ca83edc9af7af33b985f2175396b34857b774fbc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 02:15:28 +0000
Subject: [PATCH 4133/6849] tvheadend: disable on avr32

tvheadend requires an atomic_add operation. Either you have a gcc >=
4.3 toolchain and it uses the gcc intrinsics, or it has special code
for x86, x86-64, PPC and ARM. So in the context of Buildroot, the only
really problematic architecture is avr32, which uses gcc 4.2.

Fixes http://autobuild.buildroot.org/results/f015b1888d739c383aca61609059aa7675a4da7d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 899b160cda..19ab27674d 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -4,6 +4,12 @@ comment "tvheadend requires a toolchain with LARGEFILE and IPv6 support"
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
 	depends on BR2_LARGEFILE && BR2_INET_IPV6
+	# tvheadend requires an atomic_add operation. Either you have
+	# a gcc >= 4.3 toolchain and it uses the gcc intrinsics, or it
+	# has special code for x86, x86-64, PPC and ARM. So in the
+	# context of Buildroot, the only really problematic
+	# architecture is avr32, which uses gcc 4.2.
+	depends on !BR2_avr32
 	select BR2_PACKAGE_DVB_APPS
 	select BR2_PACKAGE_OPENSSL
 	help

From 9a70663904fc2e9acad4e32a7da945c7603a0222 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Feb 2013 02:30:22 +0000
Subject: [PATCH 4134/6849] gdb: build gdbserver with TARGET_MAKE_ENV

This commit fixes the exact same problem than
21a0c11a90f9ff19c78a5f32e0a2e9064fd28054, but for the gdbserver
build. The problem is that when you use the Crosstool-NG toolchain
backend, gawk gets built as a dependency of Crosstool-NG. So the gdb
configure scripts detects it, and assumes it is in the PATH (because
the gdb configure step gets run with TARGET_MAKE_ENV).

But then, the build fails, because it tries to run gawk, but gawk
isn't in the PATH, because we forget to use this TARGET_MAKE_ENV
variable when building gdbserver.

Fixes http://autobuild.buildroot.org/results/d0173de533b5e2fffed2eff7327a502ed2d787cd/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gdb/gdb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 4b8fe3a3d5..a932b1fab1 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -144,6 +144,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
 	touch $@
 
 $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
+	$(TARGET_MAKE_ENV) \
 	$(MAKE) CC="$(TARGET_CC)" MT_CFLAGS="$(TARGET_CFLAGS)" \
 		-C $(GDB_SERVER_DIR)
 

From 834f9311aacb5297d563292e69bc144f24e90187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Wed, 30 Jan 2013 02:46:40 +0000
Subject: [PATCH 4135/6849] pkg-infra: add <pkg>_CONFIG_FIXUP to fix *-config
 files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch will add <pkg>_CONFIG_FIXUP variable to buildroot infra.

It's purpose is to inform buildroot that the package in question
contains some $(STAGING_DIR)/usr/bin/*-config files and that we
want to automatically fix prefixes of such files.

It is often the case that many packages call these
files during their configuration step to determine 3rd party
library package locations and any flags needed to link against them.

For example:
Some package might try to check the existense and linking flags
of NSPR package by calling $(STAGING_DIR)/usr/bin/nspr-config --prefix.
Without this fix. NSPR would return /usr/ as it's prefix which is
wrong when cross-compiling.
Correct would be $(STAGING_DIR)/usr.

All packages that have <pkg>_INSTALL_STAGING = YES defined and
also install some config file(s) into $(STAGING_DIR)/usr/bin must
hereafter also define <pkg>_CONFIG_FIXUP with the correspondig
filename(s).

For example:

DIVINE_CONFIG_FIXUP = divine-config

or for multiple files:

IMAGEMAGICK_CONFIG_FIXUP = Magick-config Wand-config

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 98 ++++++++++++++++++-------
 package/pkg-generic.mk                  |  7 ++
 2 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 7b8561a1cc..41a94d73c6 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -25,32 +25,33 @@ system is based on hand-written Makefiles or shell scripts.
 09: LIBFOO_LICENSE = GPLv3+
 10: LIBFOO_LICENSE_FILES = COPYING
 11: LIBFOO_INSTALL_STAGING = YES
-12: LIBFOO_DEPENDENCIES = host-libaaa libbbb
-13:
-14: define LIBFOO_BUILD_CMDS
-15:	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
-16: endef
-17:
-18: define LIBFOO_INSTALL_STAGING_CMDS
-19:	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
-20:	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
-21:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
-22: endef
-23:
-24: define LIBFOO_INSTALL_TARGET_CMDS
-25:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
-26:	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
-27: endef
-28:
-29: define LIBFOO_DEVICES
-30:	/dev/foo  c  666  0  0	42  0  -  -  -
-31: endef
-32:
-33: define LIBFOO_PERMISSIONS
-34:	/bin/foo  f  4755  0  0	 -  -  -  -  -
-35: endef
-36:
-37: $(eval $(generic-package))
+12: LIBFOO_CONFIG_FIXUP = libfoo-config
+13: LIBFOO_DEPENDENCIES = host-libaaa libbbb
+14:
+15: define LIBFOO_BUILD_CMDS
+16:	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
+17: endef
+18:
+19: define LIBFOO_INSTALL_STAGING_CMDS
+20:	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
+21:	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
+22:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
+23: endef
+24:
+25: define LIBFOO_INSTALL_TARGET_CMDS
+26:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
+27:	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
+28: endef
+29:
+30: define LIBFOO_DEVICES
+31:	/dev/foo  c  666  0  0	42  0  -  -  -
+32: endef
+33:
+34: define LIBFOO_PERMISSIONS
+35:	/bin/foo  f  4755  0  0	 -  -  -  -  -
+36: endef
+37:
+38: $(eval $(generic-package))
 --------------------------------
 
 The Makefile begins on line 6 to 10 with metadata information: the
@@ -69,7 +70,45 @@ install header files and other development files in the staging space.
 This will ensure that the commands listed in the
 +LIBFOO_INSTALL_STAGING_CMDS+ variable will be executed.
 
-On line 12, we specify the list of dependencies this package relies
+On line 12, we specify that there is some fixing to be done to some
+of the 'libfoo-config' files that were installed during
++LIBFOO_INSTALL_STAGING_CMDS+ phase.
+These *-config files are executable shell script files that are
+located in '$(STAGING_DIR)/usr/bin' directory and are executed
+by other 3rd party packages to find out the location and the linking
+flags of this particular package.
+
+The problem is that all these *-config files by default give wrong,
+host system linking flags that are unsuitable for cross-compiling.
+
+For example:	'-I/usr/include' instead of '-I$(STAGING_DIR)/usr/include'
+or:		'-L/usr/lib' instead of '-L$(STAGING_DIR)/usr/lib'
+
+So some sed magic is done to these scripts to make them give correct
+flags.
+The argument to be given to +LIBFOO_CONFIG_FIXUP+ is the file name(s)
+of the shell script(s) needing fixing. All these names are relative to
+'$(STAGING_DIR)/usr/bin' and if needed multiple names can be given.
+
+Example 1:
+
+Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'.
+
+So it's fixup would be:
+
+DIVINE_CONFIG = divine-config
+
+Example 2:
+
+Package imagemagick installs the following scripts:
+'$(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config'
+
+So it's fixup would be:
+
+IMAGEMAGICK_CONFIG_FIXUP = Magick-config Magick++-config \
+			   MagickCore-config MagickWand-config Wand-config
+
+On line 13, we specify the list of dependencies this package relies
 on. These dependencies are listed in terms of lower-case package names,
 which can be packages for the target (without the +host-+
 prefix) or packages for the host (with the +host-+) prefix).
@@ -245,6 +284,11 @@ information is (assuming the package name is +libfoo+) :
   variables are executed to install the package into the target
   directory.
 
+* +LIBFOO_CONFIG_FIXUP+ lists the names of the files in
+  '$(STAGING_DIR)/usr/bin' that need some special fixing to make them
+  cross-compiling friendly. Multiple file names separated by space can be
+  given and all are relative to '$(STAGING_DIR)/usr/bin'.
+
 * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot
   when using the static device table. The syntax to use is the
   makedevs one. You can find some documentation for this syntax in the
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 59de0f0d12..19a115ecde 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -128,6 +128,13 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 	@$(call MESSAGE,"Installing to staging directory")
 	$($(PKG)_INSTALL_STAGING_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
+	$(Q)if test -n "$($(PKG)_CONFIG_FIXUP)" ; then \
+		$(call MESSAGE,"Fixing package configuration files") ;\
+			$(SED)  "s,^\(exec_\)\?prefix=.*,\1prefix=$(STAGING_DIR)/usr,g" \
+				-e "s,-I/usr/,-I$(STAGING_DIR)/usr/,g" \
+				-e "s,-L/usr/,-L$(STAGING_DIR)/usr/,g" \
+				$(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_FIXUP)) ;\
+	fi
 	$(Q)touch $@
 
 # Install to images dir

From d4d9ece91e80dad662efbb0c7342ff14096e711b Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sat, 2 Feb 2013 20:04:15 +0000
Subject: [PATCH 4136/6849] libpcap: fixup pcap-config

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpcap/libpcap.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 7e68f5136d..5be61bf051 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -24,6 +24,7 @@ LIBPCAP_DEPENDENCIES = zlib
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
+LIBPCAP_CONFIG_FIXUP = pcap-config
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 LIBPCAP_CONF_OPT += --enable-canusb

From d780f83a5a882af066e865119e2697b5754ad69a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 29 Jan 2013 08:23:57 +0000
Subject: [PATCH 4137/6849] liboping: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liboping/liboping.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
index e253fbd15b..d852ef90c6 100644
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -9,5 +9,7 @@ LIBOPING_SITE = http://verplant.org/liboping/files
 LIBOPING_INSTALL_STAGING = YES
 LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
 LIBOPING_CONF_OPT = --without-perl-bindings
+LIBOPING_LICENSE = LGPLv2.1+ GPLv2
+LIBOPING_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))

From 3762f79646497a2fbd01faff094dbe98fcd30937 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Mon, 4 Feb 2013 10:50:28 +0000
Subject: [PATCH 4138/6849] gdb: fixing gdb 7.4.1 build with eglibc-2_16

gdb 7.4.1 fails with the following error
  gdb-7.4.1/gdb/linux-nat.h:79:18: error: field 'siginfo' has incomplete type
because gdb use 'struct siginfo' instead of 'struct siginfo_t'.
Crosstool-NG allready use the patches to prevent this error so use this
patches for buildroot too.

see also http://permalink.gmane.org/gmane.comp.gcc.cross-compiling/15305

Fixes http://autobuild.buildroot.net/results/b894a5cecd9c5e0a1a751ebbff90a14aea1803da/build-end.log

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gdb/7.4.1/00_all_ptrace_setsiginfo.patch  | 314 ++++++++++++++++++
 .../gdb/7.4.1/05_all_readline-headers.patch   |  42 +++
 2 files changed, 356 insertions(+)
 create mode 100644 toolchain/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
 create mode 100644 toolchain/gdb/7.4.1/05_all_readline-headers.patch

diff --git a/toolchain/gdb/7.4.1/00_all_ptrace_setsiginfo.patch b/toolchain/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
new file mode 100644
index 0000000000..81a92db9a2
--- /dev/null
+++ b/toolchain/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
@@ -0,0 +1,314 @@
+fix from upstream for building with newer kernel headers
+
+From a7f9ca9cb797d653dc7919538e1dfa0c26010331 Mon Sep 17 00:00:00 2001
+From: tschwinge <tschwinge>
+Date: Wed, 21 Mar 2012 13:43:50 +0000
+Subject: [PATCH] struct siginfo vs. siginfo_t
+
+gdb/
+	* amd64-linux-nat.c (amd64_linux_siginfo_fixup): Use siginfo_t instead
+	of struct siginfo.
+	* arm-linux-nat.c (arm_linux_stopped_data_address): Likewise.
+	* ia64-linux-nat.c (ia64_linux_stopped_data_address): Likewise.
+	* linux-nat.c (linux_nat_siginfo_fixup, siginfo_fixup)
+	(linux_xfer_siginfo, linux_nat_set_siginfo_fixup)
+	(linux_nat_get_siginfo): Likewise.
+	* linux-nat.h (struct lwp_info, linux_nat_set_siginfo_fixup)
+	(linux_nat_get_siginfo): Likewise.
+	* linux-tdep.c (linux_get_siginfo_type): Likewise.
+	* ppc-linux-nat.c (ppc_linux_stopped_data_address): Likewise.
+	* procfs.c (gdb_siginfo_t): Likewise.
+
+gdbserver/
+	* linux-arm-low.c (arm_stopped_by_watchpoint): Use siginfo_t instead of
+	struct siginfo.
+	* linux-low.c (siginfo_fixup, linux_xfer_siginfo): Likewise.
+	* linux-x86-low.c (x86_siginfo_fixup): Likewise.
+	* linux-low.h: Include <signal.h>.
+	(struct siginfo): Remove forward declaration.
+	(struct linux_target_ops) <siginfo_fixup>: Use siginfo_t instead of
+	struct siginfo.
+---
+ gdb/ChangeLog                 |   15 +++++++++++++++
+ gdb/amd64-linux-nat.c         |    4 ++--
+ gdb/arm-linux-nat.c           |    2 +-
+ gdb/gdbserver/ChangeLog       |   11 +++++++++++
+ gdb/gdbserver/linux-arm-low.c |    2 +-
+ gdb/gdbserver/linux-low.c     |   10 +++++-----
+ gdb/gdbserver/linux-low.h     |    5 ++---
+ gdb/gdbserver/linux-x86-low.c |    4 ++--
+ gdb/ia64-linux-nat.c          |    2 +-
+ gdb/linux-nat.c               |   16 ++++++++--------
+ gdb/linux-nat.h               |    6 +++---
+ gdb/ppc-linux-nat.c           |    2 +-
+ gdb/procfs.c                  |    2 +-
+ 13 files changed, 53 insertions(+), 28 deletions(-)
+
+diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
+index f954483..5ebba3a 100644
+--- a/gdb/amd64-linux-nat.c
++++ b/gdb/amd64-linux-nat.c
+@@ -731,13 +731,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+    INF.  */
+ 
+ static int
+-amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction)
++amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction)
+ {
+   /* Is the inferior 32-bit?  If so, then do fixup the siginfo
+      object.  */
+   if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32)
+     {
+-      gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t));
++      gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
+ 
+       if (direction == 0)
+ 	compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
+diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
+index c5ce21c..f9f6ba5 100644
+--- a/gdb/arm-linux-nat.c
++++ b/gdb/arm-linux-nat.c
+@@ -1137,7 +1137,7 @@ arm_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw,
+ static int
+ arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+ {
+-  struct siginfo *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
++  siginfo_t *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+   int slot = siginfo_p->si_errno;
+ 
+   /* This must be a hardware breakpoint.  */
+diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
+index ff2437d..01208ef 100644
+--- a/gdb/gdbserver/linux-arm-low.c
++++ b/gdb/gdbserver/linux-arm-low.c
+@@ -631,7 +631,7 @@ static int
+ arm_stopped_by_watchpoint (void)
+ {
+   struct lwp_info *lwp = get_thread_lwp (current_inferior);
+-  struct siginfo siginfo;
++  siginfo_t siginfo;
+ 
+   /* We must be able to set hardware watchpoints.  */
+   if (arm_linux_get_hw_watchpoint_count () == 0)
+diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
+index d2d4c1d..4734f15 100644
+--- a/gdb/gdbserver/linux-low.c
++++ b/gdb/gdbserver/linux-low.c
+@@ -4779,7 +4779,7 @@ linux_qxfer_osdata (const char *annex,
+    layout of the inferiors' architecture.  */
+ 
+ static void
+-siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
++siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction)
+ {
+   int done = 0;
+ 
+@@ -4791,9 +4791,9 @@ siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
+   if (!done)
+     {
+       if (direction == 1)
+-	memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
++	memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
+       else
+-	memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
++	memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
+     }
+ }
+ 
+@@ -4802,8 +4802,8 @@ linux_xfer_siginfo (const char *annex, unsigned char *readbuf,
+ 		    unsigned const char *writebuf, CORE_ADDR offset, int len)
+ {
+   int pid;
+-  struct siginfo siginfo;
+-  char inf_siginfo[sizeof (struct siginfo)];
++  siginfo_t siginfo;
++  char inf_siginfo[sizeof (siginfo_t)];
+ 
+   if (current_inferior == NULL)
+     return -1;
+diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
+index 677d261..3aeae70 100644
+--- a/gdb/gdbserver/linux-low.h
++++ b/gdb/gdbserver/linux-low.h
+@@ -20,6 +20,7 @@
+ #ifdef HAVE_THREAD_DB_H
+ #include <thread_db.h>
+ #endif
++#include <signal.h>
+ 
+ #include "gdb_proc_service.h"
+ 
+@@ -46,8 +47,6 @@ struct regset_info
+ extern struct regset_info target_regsets[];
+ #endif
+ 
+-struct siginfo;
+-
+ struct process_info_private
+ {
+   /* Arch-specific additions.  */
+@@ -109,7 +108,7 @@ struct linux_target_ops
+      Returns true if any conversion was done; false otherwise.
+      If DIRECTION is 1, then copy from INF to NATIVE.
+      If DIRECTION is 0, copy from NATIVE to INF.  */
+-  int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction);
++  int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction);
+ 
+   /* Hook to call when a new process is created or attached to.
+      If extra per-process architecture-specific data is needed,
+diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
+index ed1f8a8..b466b5d 100644
+--- a/gdb/gdbserver/linux-x86-low.c
++++ b/gdb/gdbserver/linux-x86-low.c
+@@ -918,13 +918,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+    INF.  */
+ 
+ static int
+-x86_siginfo_fixup (struct siginfo *native, void *inf, int direction)
++x86_siginfo_fixup (siginfo_t *native, void *inf, int direction)
+ {
+ #ifdef __x86_64__
+   /* Is the inferior 32-bit?  If so, then fixup the siginfo object.  */
+   if (register_size (0) == 4)
+     {
+-      if (sizeof (struct siginfo) != sizeof (compat_siginfo_t))
++      if (sizeof (siginfo_t) != sizeof (compat_siginfo_t))
+ 	fatal ("unexpected difference in siginfo");
+ 
+       if (direction == 0)
+diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
+index 8773195..19b827f 100644
+--- a/gdb/ia64-linux-nat.c
++++ b/gdb/ia64-linux-nat.c
+@@ -637,7 +637,7 @@ static int
+ ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
+ {
+   CORE_ADDR psr;
+-  struct siginfo *siginfo_p;
++  siginfo_t *siginfo_p;
+   struct regcache *regcache = get_current_regcache ();
+ 
+   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
+index f80c0c1..d81d55e 100644
+--- a/gdb/linux-nat.c
++++ b/gdb/linux-nat.c
+@@ -188,7 +188,7 @@ static void (*linux_nat_prepare_to_resume) (struct lwp_info *);
+ /* The method to call, if any, when the siginfo object needs to be
+    converted between the layout returned by ptrace, and the layout in
+    the architecture of the inferior.  */
+-static int (*linux_nat_siginfo_fixup) (struct siginfo *,
++static int (*linux_nat_siginfo_fixup) (siginfo_t *,
+ 				       gdb_byte *,
+ 				       int);
+ 
+@@ -4232,7 +4232,7 @@ linux_nat_mourn_inferior (struct target_ops *ops)
+    layout of the inferiors' architecture.  */
+ 
+ static void
+-siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
++siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction)
+ {
+   int done = 0;
+ 
+@@ -4244,9 +4244,9 @@ siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
+   if (!done)
+     {
+       if (direction == 1)
+-	memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
++	memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
+       else
+-	memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
++	memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
+     }
+ }
+ 
+@@ -4256,8 +4256,8 @@ linux_xfer_siginfo (struct target_ops *ops, enum target_object object,
+ 		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+ {
+   int pid;
+-  struct siginfo siginfo;
+-  gdb_byte inf_siginfo[sizeof (struct siginfo)];
++  siginfo_t siginfo;
++  gdb_byte inf_siginfo[sizeof (siginfo_t)];
+ 
+   gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
+   gdb_assert (readbuf || writebuf);
+@@ -5266,7 +5266,7 @@ linux_nat_set_new_thread (struct target_ops *t,
+    inferior.  */
+ void
+ linux_nat_set_siginfo_fixup (struct target_ops *t,
+-			     int (*siginfo_fixup) (struct siginfo *,
++			     int (*siginfo_fixup) (siginfo_t *,
+ 						   gdb_byte *,
+ 						   int))
+ {
+@@ -5285,7 +5285,7 @@ linux_nat_set_prepare_to_resume (struct target_ops *t,
+ }
+ 
+ /* Return the saved siginfo associated with PTID.  */
+-struct siginfo *
++siginfo_t *
+ linux_nat_get_siginfo (ptid_t ptid)
+ {
+   struct lwp_info *lp = find_lwp_pid (ptid);
+diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
+index c9878d9..d87f0cf 100644
+--- a/gdb/linux-nat.h
++++ b/gdb/linux-nat.h
+@@ -78,7 +78,7 @@ struct lwp_info
+ 
+   /* Non-zero si_signo if this LWP stopped with a trap.  si_addr may
+      be the address of a hardware watchpoint.  */
+-  struct siginfo siginfo;
++  siginfo_t siginfo;
+ 
+   /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
+      watchpoint trap.  */
+@@ -184,7 +184,7 @@ void linux_nat_set_new_thread (struct target_ops *, void (*) (struct lwp_info *)
+    that ptrace returns, and the layout in the architecture of the
+    inferior.  */
+ void linux_nat_set_siginfo_fixup (struct target_ops *,
+-				  int (*) (struct siginfo *,
++				  int (*) (siginfo_t *,
+ 					   gdb_byte *,
+ 					   int));
+ 
+@@ -198,7 +198,7 @@ void linux_nat_set_prepare_to_resume (struct target_ops *,
+ void linux_nat_switch_fork (ptid_t new_ptid);
+ 
+ /* Return the saved siginfo associated with PTID.  */
+-struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
++siginfo_t *linux_nat_get_siginfo (ptid_t ptid);
+ 
+ /* Compute and return the processor core of a given thread.  */
+ int linux_nat_core_of_thread_1 (ptid_t ptid);
+diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
+index 1bd157b..9bd11fd 100644
+--- a/gdb/ppc-linux-nat.c
++++ b/gdb/ppc-linux-nat.c
+@@ -2218,7 +2218,7 @@ ppc_linux_thread_exit (struct thread_info *tp, int silent)
+ static int
+ ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+ {
+-  struct siginfo *siginfo_p;
++  siginfo_t *siginfo_p;
+ 
+   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+ 
+diff --git a/gdb/procfs.c b/gdb/procfs.c
+index 903621d..cb4bc7c 100644
+--- a/gdb/procfs.c
++++ b/gdb/procfs.c
+@@ -266,7 +266,7 @@ typedef struct sigaction gdb_sigaction_t;
+ #ifdef HAVE_PR_SIGINFO64_T
+ typedef pr_siginfo64_t gdb_siginfo_t;
+ #else
+-typedef struct siginfo gdb_siginfo_t;
++typedef siginfo_t gdb_siginfo_t;
+ #endif
+ 
+ /* On mips-irix, praddset and prdelset are defined in such a way that
+-- 
+1.7.9.7
+
diff --git a/toolchain/gdb/7.4.1/05_all_readline-headers.patch b/toolchain/gdb/7.4.1/05_all_readline-headers.patch
new file mode 100644
index 0000000000..e65adf6e6d
--- /dev/null
+++ b/toolchain/gdb/7.4.1/05_all_readline-headers.patch
@@ -0,0 +1,42 @@
+--- a/readline/complete.c
++++ b/readline/complete.c
+@@ -25,6 +25,11 @@
+ #  include <config.h>
+ #endif
+ 
++#ifdef HAVE_WCHAR_H /* wcwidth() */
++# define _GNU_SOURCE
++# include <wchar.h>
++#endif
++
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #if defined (HAVE_SYS_FILE_H)
+--- a/readline/display.c
++++ b/readline/display.c
+@@ -25,6 +25,11 @@
+ #  include <config.h>
+ #endif
+ 
++#ifdef HAVE_WCHAR_H /* wcwidth() */
++# define _GNU_SOURCE
++# include <wchar.h>
++#endif
++
+ #include <sys/types.h>
+ 
+ #if defined (HAVE_UNISTD_H)
+--- a/readline/mbutil.c
++++ b/readline/mbutil.c
+@@ -25,6 +25,11 @@
+ #  include <config.h>
+ #endif
+ 
++#ifdef HAVE_WCHAR_H /* wcwidth() */
++# define _GNU_SOURCE
++# include <wchar.h>
++#endif
++
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include "posixjmp.h"

From f47ae4ea0f67e1ae093365dc73bf82b7e7fdd80a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 4 Feb 2013 06:01:14 +0000
Subject: [PATCH 4139/6849] package/usbredir: update to version 0.6

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbredir/usbredir.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
index f0530a79c4..efdb1be1ad 100644
--- a/package/usbredir/usbredir.mk
+++ b/package/usbredir/usbredir.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-USBREDIR_VERSION         = 0.4.4
+USBREDIR_VERSION         = 0.6
 USBREDIR_SOURCE          = usbredir-$(USBREDIR_VERSION).tar.bz2
 USBREDIR_SITE            = http://spice-space.org/download/usbredir
 USBREDIR_LICENSE         = LGPLv2.1+

From 41fbdb0959c7b08e88eff271672522ecbd51d6e0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 3 Feb 2013 04:06:38 +0000
Subject: [PATCH 4140/6849] package/qemu: bump version to 1.3.1

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 65989f4e06..806ffd88da 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEMU_VERSION = 1.3.0
+QEMU_VERSION = 1.3.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c

From 94e04800b2bf063628a261f803781de91cbfc791 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 08:45:02 +0100
Subject: [PATCH 4141/6849] liboping: fix legal-info

Fixes http://autobuild.buildroot.org/results/c0bfc03389382235782474b278ca4afd1d283d60

The included (LGPL) license file is called COPYING.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liboping/liboping.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
index d852ef90c6..3198b710b6 100644
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -10,6 +10,6 @@ LIBOPING_INSTALL_STAGING = YES
 LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
 LIBOPING_CONF_OPT = --without-perl-bindings
 LIBOPING_LICENSE = LGPLv2.1+ GPLv2
-LIBOPING_LICENSE_FILES = COPYING.LIB
+LIBOPING_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From e47219ea320dc9641e5674714352b4943095919e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 09:00:22 +0100
Subject: [PATCH 4142/6849] lvm2: uses fork()

Fixes http://autobuild.buildroot.org/results/cbc74e2fb5eaefac1fe17ada1dc46a5c906cc1c9

Also propagate BR2_USE_MMU to lvm2's reverse dependencies.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dmraid/Config.in | 1 +
 package/lvm2/Config.in   | 1 +
 package/parted/Config.in | 1 +
 package/udisks/Config.in | 1 +
 4 files changed, 4 insertions(+)

diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
index 7b3724487a..641b17fdd9 100644
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DMRAID
 	bool "dmraid"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # lvm2
 	select BR2_PACKAGE_LVM2
 	help
 	  dmraid discovers, activates, deactivates and displays properties
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index 374de94600..df9f4554f1 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LVM2
 	bool "lvm2 & device mapper"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # needs fork()
 	help
 	  This is LVM2, the rewrite of The Linux Logical Volume Manager.
 	  LVM supports enterprise level volume management of disk and disk
diff --git a/package/parted/Config.in b/package/parted/Config.in
index 7349763bd1..6c6840d79c 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED
 	bool "parted"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # lvm2
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_UTIL_LINUX
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index 77cbcb885c..a50b3ea335 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_UDISKS
 	bool "udisks"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # lvm2
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS
 	select BR2_PACKAGE_DBUS

From b5f69736be4156832e22dec583a4721389553142 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 09:36:50 +0100
Subject: [PATCH 4143/6849] Revert "gawk: bump to version 4.0.2"

This reverts commit 6b307de4f9d6ae806b7cbbf8bc1d412d139d75cf (version part).

Fixes http://autobuild.buildroot.org/results/46828cef48bc1267583ba8174c0e8ee993fac865

As discussed on the list, let's revert this for the 2013.02 release
and then bring it up wiith gawk upstream / try to fix for 2013.05+

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/gawk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 4a215926c1..366dea78fa 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GAWK_VERSION = 4.0.2
+GAWK_VERSION = 4.0.1
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_TARGET_BINS = awk gawk igawk pgawk
 GAWK_LICENSE = GPLv3

From 0b8daf87b1526f258c5c1b48dfb2b7dcf21bfe0e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Feb 2013 16:13:10 +0000
Subject: [PATCH 4144/6849] libupnp: security bump to version 1.6.18

Fixes CVE-2012-5958, CVE-2012-5959, CVE-2012-5960, CVE-2012-5961,
CVE-2012-5962, CVE-2012-5963, CVE-2012-5964 and CVE-2012-5965.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libupnp/libupnp-1.6.17-no-ipv6.patch | 37 --------------------
 package/libupnp/libupnp.mk                   |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 package/libupnp/libupnp-1.6.17-no-ipv6.patch

diff --git a/package/libupnp/libupnp-1.6.17-no-ipv6.patch b/package/libupnp/libupnp-1.6.17-no-ipv6.patch
deleted file mode 100644
index 67b3895e5f..0000000000
--- a/package/libupnp/libupnp-1.6.17-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 812bdabc2c293173ea943059a577d480884a6cc1 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 11 Apr 2012 11:17:45 -0300
-Subject: [PATCH] ssdp_device: exclude IPv6 stuff when there's no IPv6
-
-Add an additional INET_IPV6 exclusion around IPV6_MULTICAST_HOPS since
-the definition isn't guaranteed to exist when the toolchain lacks IPv6
-support.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- upnp/src/ssdp/ssdp_device.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
-index d3517cc..a439005 100644
---- a/upnp/src/ssdp/ssdp_device.c
-+++ b/upnp/src/ssdp/ssdp_device.c
-@@ -210,6 +210,7 @@ static int NewRequestHandler(
- 			   (char *)&ttl, sizeof(int));
- 		socklen = sizeof(struct sockaddr_in);
- 		break;
-+#ifdef INET_IPV6
- 	case AF_INET6:
- 		inet_ntop(AF_INET6,
- 			  &((struct sockaddr_in6 *)DestAddr)->sin6_addr,
-@@ -219,6 +220,7 @@ static int NewRequestHandler(
- 		setsockopt(ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
- 			   (char *)&hops, sizeof(hops));
- 		break;
-+#endif
- 	default:
- 		UpnpPrintf(UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
- 			   "Invalid destination address specified.");
--- 
-1.7.3.4
-
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 3d4606b727..295dace395 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBUPNP_VERSION = 1.6.17
+LIBUPNP_VERSION = 1.6.18
 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no

From ab6f23bda038e83c7ff4f407579572fd4f4d8437 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 10:39:17 +0100
Subject: [PATCH 4145/6849] gnutls: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index f65b05d850..cadc14785f 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 3.1.6
+GNUTLS_VERSION = 3.1.7
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1
 GNUTLS_LICENSE = GPLv3+ LGPLv3

From 68c3f5257d94d0fc0437747014f3c1ff4d02aa8b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 11:45:28 +0100
Subject: [PATCH 4146/6849] Revert "gnutls: make it non-wchar friendly"

This reverts commit f1b86cef9884894df26ed25efaabe254f8f0754b

While the fix makes gnutls build without wchar, it doesn't actually work as
there's no rpl_wctomb implementation so the .so ends up with an undefined
reference to wctomb:

./host/usr/bin/arm-linux-nm -D staging/usr/lib/libgnutls.so.28|grep wctomb
         U wctomb

Causing linker errors for packages trying to use it:

  CCLD   msmtp
host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgnutls.so:
undefined reference to `wctomb'
collect2: ld returned 1 exit status

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in         | 2 +-
 package/gnutls/Config.in          | 6 +++---
 package/libmicrohttpd/Config.in   | 4 ++++
 package/libsoup/Config.in         | 2 +-
 package/network-manager/Config.in | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 4c9741b530..93f9ab518f 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
-	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index c2ff4edb91..3a34c48b69 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
 	select BR2_PACKAGE_NETTLE
+	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
@@ -9,10 +10,9 @@ config BR2_PACKAGE_GNUTLS
 
 config BR2_PACKAGE_GNUTLS_TOOLS
 	bool "install tools"
-	depends on BR2_PACKAGE_GNUTLS
 	depends on BR2_USE_WCHAR
 	help
 	  Install GnuTLS command line tools for various cryptographic tasks.
 
-comment "gnutls tools requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_GNUTLS && !BR2_USE_WCHAR
+comment "gnutls requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index 4e78a996c8..2e4de0f6a9 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBMICROHTTPD
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
        bool "https support"
        depends on BR2_PACKAGE_LIBMICROHTTPD
+       depends on BR2_USE_WCHAR
        select BR2_PACKAGE_GNUTLS
        select BR2_PACKAGE_LIBGCRYPT
        help
@@ -17,3 +18,6 @@ config BR2_PACKAGE_LIBMICROHTTPD_SSL
 
 comment "libmicrohttpd needs a toolchain with thread support"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "libmicrohttpd https support needs a toolchain with wchar support"
+	depends on BR2_PACKAGE_LIBMICROHTTPD && !BR2_USE_WCHAR
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index c3b4ceb181..57b425f283 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
-	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_USE_WCHAR # glib2 and gnutls
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 9b8408380b..cc33a1dad5 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	select BR2_PACKAGE_DBUS
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS_GLIB

From dcc50b72a40d3fb5a708a5e9849c26d5148c83bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 12:10:13 +0100
Subject: [PATCH 4147/6849] CHANGES: fix Aarch64 typo

Thanks to WIll Newton to noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 56bfd6305a..316f866104 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
 
 	Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target
 	libraries install fixed. Add Linaro ARM
-	2012.11/2012.12/2013.01, Aarch4 12.11/12.12/13.01. Sourcery
+	2012.11/2012.12/2013.01, Aarch64 12.11/12.12/13.01. Sourcery
 	CodeBench MIPS 2012.03/09. Infrastructure to warn about
 	missing 32bit support for binary toolchains. Add GDB 7.5.1 /
 	Remove 6.8 / 7.0 / 7.1.

From b93bc6ebdcbae89547dc89dbce4701ea8037e02b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 00:22:58 +0000
Subject: [PATCH 4148/6849] samba: security bump to version 3.6.12

Fixes CVE-2013-0213

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 4eb6a3381a..b31787ba36 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.11
+SAMBA_VERSION = 3.6.12
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 323eec4c3ca50060ec4e07bc68462410235c218b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 01:38:19 +0000
Subject: [PATCH 4149/6849] busybox: add mdev patch for 1.21.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.21.0/busybox-1.21.0-mdev.patch  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch

diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch b/package/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch
new file mode 100644
index 0000000000..cb873fafc1
--- /dev/null
+++ b/package/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch
@@ -0,0 +1,35 @@
+--- busybox-1.21.0/util-linux/mdev.c
++++ busybox-1.21.0-mdev/util-linux/mdev.c
+@@ -661,6 +661,8 @@ static void make_device(char *device_nam
+ 			if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
+ 				bb_perror_msg("can't create '%s'", node_name);
+ 			if (ENABLE_FEATURE_MDEV_CONF) {
++				if (G.verbose)
++					bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid);
+ 				chmod(node_name, rule->mode);
+ 				chown(node_name, rule->ugid.uid, rule->ugid.gid);
+ 			}
+@@ -813,6 +815,7 @@ static void load_firmware(const char *fi
+ 		full_write(loading_fd, "-1", 2);
+ 
+  out:
++	xchdir("/dev");
+ 	if (ENABLE_FEATURE_CLEAN_UP) {
+ 		close(firmware_fd);
+ 		close(loading_fd);
+@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 		}
+ 
+ 		{
+-			int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND);
++			int logfd = open("mdev.log", O_WRONLY | O_APPEND);
+ 			if (logfd >= 0) {
+ 				xmove_fd(logfd, STDERR_FILENO);
+ 				G.verbose = 1;
+-				bb_error_msg("seq: %s action: %s", seq, action);
++				if (seq)
++					applet_name = xasprintf("%s[%s]", applet_name, seq);
++				bb_error_msg("action: %s", action);
+ 			}
+ 		}
+ 

From 1b2ab4a43c2090f6d2b9c6b96db5c9284783d329 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 03:49:54 +0000
Subject: [PATCH 4150/6849] gnutls: tools require the package

[Peter: remove the unneeded BR2_USE_WCHAR dependency]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 3a34c48b69..038b3fb9b6 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_GNUTLS
 
 config BR2_PACKAGE_GNUTLS_TOOLS
 	bool "install tools"
-	depends on BR2_USE_WCHAR
+	depends on BR2_PACKAGE_GNUTLS
 	help
 	  Install GnuTLS command line tools for various cryptographic tasks.
 

From befb9a3ee0c5994162f527d8ef763d57d68ec48e Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sun, 15 Jul 2012 01:12:05 +0000
Subject: [PATCH 4151/6849] Make external toolchain relocatable

The external toolchain wrapper sets sysroot etc. to an absolute path.
By changing this to a relative path, it is possible to move the host
directory to a different location and still have a working build
system.

This only works for a downloaded external toolchain.  For a pre-installed
external toolchain, it is possible to move the host directory to a
different location, but not the external toolchain directory (it does work
if the external toolchain directory lies within the host directory).  For
an internal or crosstool-ng toolchain, there is no wrapper so updating the
sysroot path should be done in a different way.

See http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html
for information about others things to do to make the host directory
relocatable.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in                           |  3 +-
 toolchain/toolchain-external/ext-tool.mk      | 16 +++--
 .../ext-toolchain-wrapper.c                   | 64 ++++++++++++++-----
 3 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 038bd9c9cc..a8bf36b184 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -65,7 +65,8 @@ ifeq ($(BR2_xtensa),y)
 TARGET_ABI += -mlongcalls
 endif
 
-STAGING_DIR=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sysroot
+STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot
+STAGING_DIR    = $(HOST_DIR)/$(STAGING_SUBDIR)
 
 TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 452204b59a..b477bc0456 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -121,9 +121,17 @@ endif
 TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
 TOOLCHAIN_EXTERNAL_CXX=$(TOOLCHAIN_EXTERNAL_CROSS)g++
-TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \
-	-DBR_CROSS_PATH='"$(TOOLCHAIN_EXTERNAL_BIN)/"' \
-	-DBR_SYSROOT='"$(STAGING_DIR)"'
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = -DBR_SYSROOT='"$(STAGING_SUBDIR)"'
+
+ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),)
+# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
+	-DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"'
+else
+# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
+	-DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"'
+endif
 
 CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
 CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))
@@ -456,7 +464,7 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
 			ln -sf $(@F) $$base; \
 			;; \
 		*) \
-			ln -sf $$i .; \
+			ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
 			;; \
 		esac; \
 	done ;
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 82595eaa72..a92badac0d 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -2,9 +2,12 @@
  * Buildroot wrapper for external toolchains. This simply executes the real
  * toolchain with a number of arguments (sysroot/arch/..) hardcoded,
  * to ensure the external toolchain uses the correct configuration.
+ * The hardcoded path arguments are defined relative to the actual location
+ * of the binary.
  *
  * (C) 2011 Peter Korsgaard <jacmet@sunsite.dk>
  * (C) 2011 Daniel Nyström <daniel.nystrom@timeterminal.se>
+ * (C) 2012 Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
@@ -17,11 +20,12 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-static char path[PATH_MAX] = BR_CROSS_PATH;
+static char path[PATH_MAX];
+static char sysroot[PATH_MAX];
 
 static char *predef_args[] = {
 	path,
-	"--sysroot", BR_SYSROOT,
+	"--sysroot", sysroot,
 #ifdef BR_ARCH
 	"-march=" BR_ARCH,
 #endif /* BR_ARCH */
@@ -48,22 +52,50 @@ static char *predef_args[] = {
 #endif
 };
 
-static const char *get_basename(const char *name)
-{
-	const char *base;
-
-	base = strrchr(name, '/');
-	if (base)
-		base++;
-	else
-		base = name;
-
-	return base;
-}
-
 int main(int argc, char **argv)
 {
 	char **args, **cur;
+	char *relbasedir, *absbasedir;
+	char *progpath = argv[0];
+	char *basename;
+	int ret;
+
+	/* Calculate the relative paths */
+	basename = strrchr(progpath, '/');
+	if (basename) {
+		*basename = '\0';
+		basename++;
+		relbasedir = malloc(strlen(progpath) + 7);
+		if (relbasedir == NULL) {
+			perror(__FILE__ ": malloc");
+			return 2;
+		}
+		sprintf(relbasedir, "%s/../..", argv[0]);
+		absbasedir = realpath(relbasedir, NULL);
+	} else {
+		basename = progpath;
+		absbasedir = realpath("../..", NULL);
+	}
+	if (absbasedir == NULL) {
+		perror(__FILE__ ": realpath");
+		return 2;
+	}
+
+	/* Fill in the relative paths */
+#ifdef BR_CROSS_PATH_REL
+	ret = snprintf(path, sizeof(path), "%s/" BR_CROSS_PATH_REL "/%s", absbasedir, basename);
+#else /* BR_CROSS_PATH_ABS */
+	ret = snprintf(path, sizeof(path), BR_CROSS_PATH_ABS "/%s", basename);
+#endif
+	if (ret >= sizeof(path)) {
+		perror(__FILE__ ": overflow");
+		return 3;
+	}
+	ret = snprintf(sysroot, sizeof(sysroot), "%s/" BR_SYSROOT, absbasedir);
+	if (ret >= sizeof(sysroot)) {
+		perror(__FILE__ ": overflow");
+		return 3;
+	}
 
 	cur = args = malloc(sizeof(predef_args) + (sizeof(char *) * argc));
 	if (args == NULL) {
@@ -82,8 +114,6 @@ int main(int argc, char **argv)
 	/* finish with NULL termination */
 	*cur = NULL;
 
-	strcat(path, get_basename(argv[0]));
-
 	if (execv(path, args))
 		perror(path);
 

From 01e859ebffe7e0e335ba0b834789c04afea3f404 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 4 Feb 2013 12:52:07 +0000
Subject: [PATCH 4152/6849] util-linux: add numbers to patches

As we are going to add an Xtensa related patch that needs to be
applied *after* the AArch64 patch, let's first add a number to each
util-linux patch file name, so that we know they will be applied in
the right order.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...sscanf-no-ms-as.patch => util-linux-001-sscanf-no-ms-as.patch} | 0
 ...libc-build-fix.patch => util-linux-002-uclibc-build-fix.patch} | 0
 ...4-support.patch => util-linux-003-fdisk-aarch64-support.patch} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename package/util-linux/{util-linux-sscanf-no-ms-as.patch => util-linux-001-sscanf-no-ms-as.patch} (100%)
 rename package/util-linux/{util-linux-uclibc-build-fix.patch => util-linux-002-uclibc-build-fix.patch} (100%)
 rename package/util-linux/{util-linux-fdisk-aarch64-support.patch => util-linux-003-fdisk-aarch64-support.patch} (100%)

diff --git a/package/util-linux/util-linux-sscanf-no-ms-as.patch b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
similarity index 100%
rename from package/util-linux/util-linux-sscanf-no-ms-as.patch
rename to package/util-linux/util-linux-001-sscanf-no-ms-as.patch
diff --git a/package/util-linux/util-linux-uclibc-build-fix.patch b/package/util-linux/util-linux-002-uclibc-build-fix.patch
similarity index 100%
rename from package/util-linux/util-linux-uclibc-build-fix.patch
rename to package/util-linux/util-linux-002-uclibc-build-fix.patch
diff --git a/package/util-linux/util-linux-fdisk-aarch64-support.patch b/package/util-linux/util-linux-003-fdisk-aarch64-support.patch
similarity index 100%
rename from package/util-linux/util-linux-fdisk-aarch64-support.patch
rename to package/util-linux/util-linux-003-fdisk-aarch64-support.patch

From b26e9f54996f1ccb198bf9599f6760be07da446f Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Mon, 4 Feb 2013 12:52:08 +0000
Subject: [PATCH 4153/6849] util-linux: add support for Xtensa

[Thomas Petazzoni: rename patch to not have the package version in the
patch file name, adjust the commit title.]

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux/util-linux-004-xtensa-support.patch    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/util-linux/util-linux-004-xtensa-support.patch

diff --git a/package/util-linux/util-linux-004-xtensa-support.patch b/package/util-linux/util-linux-004-xtensa-support.patch
new file mode 100644
index 0000000000..ab294cc04b
--- /dev/null
+++ b/package/util-linux/util-linux-004-xtensa-support.patch
@@ -0,0 +1,11 @@
+--- util-linux-2.20.1/fdisk/fdiskbsdlabel.h.orig	2013-01-21 19:17:58.023049856 -0800
++++ util-linux-2.20.1/fdisk/fdiskbsdlabel.h	2013-01-21 19:18:09.867050151 -0800
+@@ -49,7 +49,7 @@
+ #if defined (i386) || defined (__sparc__) || defined (__arm__) || \
+     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
+     defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__xtensa__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)

From ddd69b5609cc9bd954afcfc2f91831d64b9cfff7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 4 Feb 2013 12:52:09 +0000
Subject: [PATCH 4154/6849] libffi: switch to using a Git version, brings
 Microblaze and Xtensa support

We already had backported patches for the Blackfin and AArch64
support, and now we would have needed to also backport the Xtensa
support and the Microblaze support. This starts to get crazy.

Let's switch to using a Git version from Github, until libffi finally
releases a new stable version.

In order to achieve this, we also need to:

 * autoreconf the package, so that a libffi.pc file gets generated

 * manually install the libffi.pc file, because it doesn't get
   installed by libffi Makefile, for some reason

 * remove the part of the target post install hook that was messing
   with libffi.pc, since it was modifying the one in STAGING_DIR
   (which is odd for a target post install hook), and the libffi.pc
   file is anyway not installed to the target anymore.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libffi-0001-Add-support-for-Blackfin.patch | 1044 --------
 ...02-Add-aarch64-support-from-upstream.patch | 2326 -----------------
 package/libffi/libffi.mk                      |   29 +-
 3 files changed, 23 insertions(+), 3376 deletions(-)
 delete mode 100644 package/libffi/libffi-0001-Add-support-for-Blackfin.patch
 delete mode 100644 package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch

diff --git a/package/libffi/libffi-0001-Add-support-for-Blackfin.patch b/package/libffi/libffi-0001-Add-support-for-Blackfin.patch
deleted file mode 100644
index 7a55b402a5..0000000000
--- a/package/libffi/libffi-0001-Add-support-for-Blackfin.patch
+++ /dev/null
@@ -1,1044 +0,0 @@
-From 643764d29559e2ca6280837069972b1d4790d61a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 16 Nov 2012 01:10:10 +0100
-Subject: [PATCH 1/2] Add support for Blackfin
-
-Taken upstream from
-https://github.com/atgreen/libffi/commit/213ed15c70e72d666154c08e2b41dae3f61f20d3. Will
-be part of the upcoming 3.0.12 release.
-
-We have kept the part of the patches changing configure and
-Makefile.in in order to avoid having to autoreconf the package, which
-requires autoconf 2.68.
-
-Code written by Alexandre Keunecke.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- ChangeLog            |    8 +++
- Makefile.am          |    4 ++
- Makefile.in          |  160 ++++++++++++++++++++++-------------------
- README               |    8 ++-
- configure            |  113 +++++++++++++----------------
- configure.ac         |    5 ++
- src/bfin/ffi.c       |  195 ++++++++++++++++++++++++++++++++++++++++++++++++++
- src/bfin/ffitarget.h |   43 +++++++++++
- src/bfin/sysv.S      |  177 +++++++++++++++++++++++++++++++++++++++++++++
- 9 files changed, 574 insertions(+), 139 deletions(-)
- create mode 100644 src/bfin/ffi.c
- create mode 100644 src/bfin/ffitarget.h
- create mode 100644 src/bfin/sysv.S
-
-diff --git a/ChangeLog b/ChangeLog
-index f4148a9..376edf7 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+2012-04-23  Alexandre Keunecke I. de Mendonca <alexandre.keunecke@gmail.com>
-+
-+	* configure.ac: Add Blackfin/sysv support
-+	* Makefile.am: Add Blackfin/sysv support
-+	* src/bfin/ffi.c:  Add Blackfin/sysv support
-+	* src/bfin/ffitarget.h: Add Blackfin/sysv support
-+	* src/bfin/sysv.S: Add Blackfin/sysv support
-+
- 2012-04-11  Anthony Green  <green@moxielogic.com>
- 
- 	* Makefile.am (EXTRA_DIST): Add new script.
-diff --git a/Makefile.am b/Makefile.am
-index 4a855d7..16f32a6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,6 +27,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
- 	src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
- 	src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h	\
- 	src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
-+	src/bfin/ffi.c src/bfin/ffitarget.h src/bfin/sysv.S \
- 	src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
- 	src/moxie/ffi.c src/moxie/eabi.S libtool-version \
- 	ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
-@@ -105,6 +106,9 @@ endif
- if MIPS
- nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
- endif
-+if BFIN
-+nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
-+endif
- if X86
- nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
- endif
-diff --git a/Makefile.in b/Makefile.in
-index 4308193..f5c10af 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -38,35 +38,36 @@ host_triplet = @host@
- target_triplet = @target@
- @FFI_DEBUG_TRUE@am__append_1 = src/debug.c
- @MIPS_TRUE@am__append_2 = src/mips/ffi.c src/mips/o32.S src/mips/n32.S
--@X86_TRUE@am__append_3 = src/x86/ffi.c src/x86/sysv.S
--@X86_FREEBSD_TRUE@am__append_4 = src/x86/ffi.c src/x86/freebsd.S
--@X86_WIN32_TRUE@am__append_5 = src/x86/ffi.c src/x86/win32.S
--@X86_WIN64_TRUE@am__append_6 = src/x86/ffi.c src/x86/win64.S
--@X86_DARWIN_TRUE@am__append_7 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
--@SPARC_TRUE@am__append_8 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
--@ALPHA_TRUE@am__append_9 = src/alpha/ffi.c src/alpha/osf.S
--@IA64_TRUE@am__append_10 = src/ia64/ffi.c src/ia64/unix.S
--@M32R_TRUE@am__append_11 = src/m32r/sysv.S src/m32r/ffi.c
--@M68K_TRUE@am__append_12 = src/m68k/ffi.c src/m68k/sysv.S
--@POWERPC_TRUE@am__append_13 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
--@POWERPC_AIX_TRUE@am__append_14 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
--@POWERPC_DARWIN_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
--@POWERPC_FREEBSD_TRUE@am__append_16 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
--@ARM_TRUE@am__append_17 = src/arm/sysv.S src/arm/ffi.c
--@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_18 = src/arm/trampoline.S
--@AVR32_TRUE@am__append_19 = src/avr32/sysv.S src/avr32/ffi.c
--@LIBFFI_CRIS_TRUE@am__append_20 = src/cris/sysv.S src/cris/ffi.c
--@FRV_TRUE@am__append_21 = src/frv/eabi.S src/frv/ffi.c
--@MOXIE_TRUE@am__append_22 = src/moxie/eabi.S src/moxie/ffi.c
--@S390_TRUE@am__append_23 = src/s390/sysv.S src/s390/ffi.c
--@X86_64_TRUE@am__append_24 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
--@SH_TRUE@am__append_25 = src/sh/sysv.S src/sh/ffi.c
--@SH64_TRUE@am__append_26 = src/sh64/sysv.S src/sh64/ffi.c
--@PA_LINUX_TRUE@am__append_27 = src/pa/linux.S src/pa/ffi.c
--@PA_HPUX_TRUE@am__append_28 = src/pa/hpux32.S src/pa/ffi.c
-+@BFIN_TRUE@am__append_3 = src/bfin/ffi.c src/bfin/sysv.S
-+@X86_TRUE@am__append_4 = src/x86/ffi.c src/x86/sysv.S
-+@X86_FREEBSD_TRUE@am__append_5 = src/x86/ffi.c src/x86/freebsd.S
-+@X86_WIN32_TRUE@am__append_6 = src/x86/ffi.c src/x86/win32.S
-+@X86_WIN64_TRUE@am__append_7 = src/x86/ffi.c src/x86/win64.S
-+@X86_DARWIN_TRUE@am__append_8 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
-+@SPARC_TRUE@am__append_9 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
-+@ALPHA_TRUE@am__append_10 = src/alpha/ffi.c src/alpha/osf.S
-+@IA64_TRUE@am__append_11 = src/ia64/ffi.c src/ia64/unix.S
-+@M32R_TRUE@am__append_12 = src/m32r/sysv.S src/m32r/ffi.c
-+@M68K_TRUE@am__append_13 = src/m68k/ffi.c src/m68k/sysv.S
-+@POWERPC_TRUE@am__append_14 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
-+@POWERPC_AIX_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
-+@POWERPC_DARWIN_TRUE@am__append_16 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
-+@POWERPC_FREEBSD_TRUE@am__append_17 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
-+@ARM_TRUE@am__append_18 = src/arm/sysv.S src/arm/ffi.c
-+@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_19 = src/arm/trampoline.S
-+@AVR32_TRUE@am__append_20 = src/avr32/sysv.S src/avr32/ffi.c
-+@LIBFFI_CRIS_TRUE@am__append_21 = src/cris/sysv.S src/cris/ffi.c
-+@FRV_TRUE@am__append_22 = src/frv/eabi.S src/frv/ffi.c
-+@MOXIE_TRUE@am__append_23 = src/moxie/eabi.S src/moxie/ffi.c
-+@S390_TRUE@am__append_24 = src/s390/sysv.S src/s390/ffi.c
-+@X86_64_TRUE@am__append_25 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
-+@SH_TRUE@am__append_26 = src/sh/sysv.S src/sh/ffi.c
-+@SH64_TRUE@am__append_27 = src/sh64/sysv.S src/sh64/ffi.c
-+@PA_LINUX_TRUE@am__append_28 = src/pa/linux.S src/pa/ffi.c
-+@PA_HPUX_TRUE@am__append_29 = src/pa/hpux32.S src/pa/ffi.c
- # Build debug. Define FFI_DEBUG on the commandline so that, when building with
- # MSVC, it can link against the debug CRT.
--@FFI_DEBUG_TRUE@am__append_29 = -DFFI_DEBUG
-+@FFI_DEBUG_TRUE@am__append_30 = -DFFI_DEBUG
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
-@@ -75,17 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	compile config.guess config.sub depcomp install-sh ltmain.sh \
- 	mdate-sh missing texinfo.tex
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \
--	$(top_srcdir)/m4/ax_cc_maxopt.m4 \
--	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
--	$(top_srcdir)/m4/ax_compiler_vendor.m4 \
--	$(top_srcdir)/m4/ax_configure_args.m4 \
--	$(top_srcdir)/m4/ax_enable_builddir.m4 \
--	$(top_srcdir)/m4/ax_gcc_archflag.m4 \
--	$(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \
--	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
--	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
--	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- 	$(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -126,44 +117,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \
- @FFI_DEBUG_TRUE@am__objects_1 = src/debug.lo
- @MIPS_TRUE@am__objects_2 = src/mips/ffi.lo src/mips/o32.lo \
- @MIPS_TRUE@	src/mips/n32.lo
--@X86_TRUE@am__objects_3 = src/x86/ffi.lo src/x86/sysv.lo
--@X86_FREEBSD_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/freebsd.lo
--@X86_WIN32_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/win32.lo
--@X86_WIN64_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win64.lo
--@X86_DARWIN_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/darwin.lo \
-+@BFIN_TRUE@am__objects_3 = src/bfin/ffi.lo src/bfin/sysv.lo
-+@X86_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/sysv.lo
-+@X86_FREEBSD_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/freebsd.lo
-+@X86_WIN32_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win32.lo
-+@X86_WIN64_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/win64.lo
-+@X86_DARWIN_TRUE@am__objects_8 = src/x86/ffi.lo src/x86/darwin.lo \
- @X86_DARWIN_TRUE@	src/x86/ffi64.lo src/x86/darwin64.lo
--@SPARC_TRUE@am__objects_8 = src/sparc/ffi.lo src/sparc/v8.lo \
-+@SPARC_TRUE@am__objects_9 = src/sparc/ffi.lo src/sparc/v8.lo \
- @SPARC_TRUE@	src/sparc/v9.lo
--@ALPHA_TRUE@am__objects_9 = src/alpha/ffi.lo src/alpha/osf.lo
--@IA64_TRUE@am__objects_10 = src/ia64/ffi.lo src/ia64/unix.lo
--@M32R_TRUE@am__objects_11 = src/m32r/sysv.lo src/m32r/ffi.lo
--@M68K_TRUE@am__objects_12 = src/m68k/ffi.lo src/m68k/sysv.lo
--@POWERPC_TRUE@am__objects_13 = src/powerpc/ffi.lo src/powerpc/sysv.lo \
-+@ALPHA_TRUE@am__objects_10 = src/alpha/ffi.lo src/alpha/osf.lo
-+@IA64_TRUE@am__objects_11 = src/ia64/ffi.lo src/ia64/unix.lo
-+@M32R_TRUE@am__objects_12 = src/m32r/sysv.lo src/m32r/ffi.lo
-+@M68K_TRUE@am__objects_13 = src/m68k/ffi.lo src/m68k/sysv.lo
-+@POWERPC_TRUE@am__objects_14 = src/powerpc/ffi.lo src/powerpc/sysv.lo \
- @POWERPC_TRUE@	src/powerpc/ppc_closure.lo \
- @POWERPC_TRUE@	src/powerpc/linux64.lo \
- @POWERPC_TRUE@	src/powerpc/linux64_closure.lo
--@POWERPC_AIX_TRUE@am__objects_14 = src/powerpc/ffi_darwin.lo \
-+@POWERPC_AIX_TRUE@am__objects_15 = src/powerpc/ffi_darwin.lo \
- @POWERPC_AIX_TRUE@	src/powerpc/aix.lo \
- @POWERPC_AIX_TRUE@	src/powerpc/aix_closure.lo
--@POWERPC_DARWIN_TRUE@am__objects_15 = src/powerpc/ffi_darwin.lo \
-+@POWERPC_DARWIN_TRUE@am__objects_16 = src/powerpc/ffi_darwin.lo \
- @POWERPC_DARWIN_TRUE@	src/powerpc/darwin.lo \
- @POWERPC_DARWIN_TRUE@	src/powerpc/darwin_closure.lo
--@POWERPC_FREEBSD_TRUE@am__objects_16 = src/powerpc/ffi.lo \
-+@POWERPC_FREEBSD_TRUE@am__objects_17 = src/powerpc/ffi.lo \
- @POWERPC_FREEBSD_TRUE@	src/powerpc/sysv.lo \
- @POWERPC_FREEBSD_TRUE@	src/powerpc/ppc_closure.lo
--@ARM_TRUE@am__objects_17 = src/arm/sysv.lo src/arm/ffi.lo
--@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_18 = src/arm/trampoline.lo
--@AVR32_TRUE@am__objects_19 = src/avr32/sysv.lo src/avr32/ffi.lo
--@LIBFFI_CRIS_TRUE@am__objects_20 = src/cris/sysv.lo src/cris/ffi.lo
--@FRV_TRUE@am__objects_21 = src/frv/eabi.lo src/frv/ffi.lo
--@MOXIE_TRUE@am__objects_22 = src/moxie/eabi.lo src/moxie/ffi.lo
--@S390_TRUE@am__objects_23 = src/s390/sysv.lo src/s390/ffi.lo
--@X86_64_TRUE@am__objects_24 = src/x86/ffi64.lo src/x86/unix64.lo \
-+@ARM_TRUE@am__objects_18 = src/arm/sysv.lo src/arm/ffi.lo
-+@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_19 = src/arm/trampoline.lo
-+@AVR32_TRUE@am__objects_20 = src/avr32/sysv.lo src/avr32/ffi.lo
-+@LIBFFI_CRIS_TRUE@am__objects_21 = src/cris/sysv.lo src/cris/ffi.lo
-+@FRV_TRUE@am__objects_22 = src/frv/eabi.lo src/frv/ffi.lo
-+@MOXIE_TRUE@am__objects_23 = src/moxie/eabi.lo src/moxie/ffi.lo
-+@S390_TRUE@am__objects_24 = src/s390/sysv.lo src/s390/ffi.lo
-+@X86_64_TRUE@am__objects_25 = src/x86/ffi64.lo src/x86/unix64.lo \
- @X86_64_TRUE@	src/x86/ffi.lo src/x86/sysv.lo
--@SH_TRUE@am__objects_25 = src/sh/sysv.lo src/sh/ffi.lo
--@SH64_TRUE@am__objects_26 = src/sh64/sysv.lo src/sh64/ffi.lo
--@PA_LINUX_TRUE@am__objects_27 = src/pa/linux.lo src/pa/ffi.lo
--@PA_HPUX_TRUE@am__objects_28 = src/pa/hpux32.lo src/pa/ffi.lo
-+@SH_TRUE@am__objects_26 = src/sh/sysv.lo src/sh/ffi.lo
-+@SH64_TRUE@am__objects_27 = src/sh64/sysv.lo src/sh64/ffi.lo
-+@PA_LINUX_TRUE@am__objects_28 = src/pa/linux.lo src/pa/ffi.lo
-+@PA_HPUX_TRUE@am__objects_29 = src/pa/hpux32.lo src/pa/ffi.lo
- nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
- 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
- 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-@@ -173,17 +165,17 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
- 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
- 	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
- 	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
--	$(am__objects_27) $(am__objects_28)
-+	$(am__objects_27) $(am__objects_28) $(am__objects_29)
- libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \
- 	$(nodist_libffi_la_OBJECTS)
- libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libffi_la_LDFLAGS) $(LDFLAGS) -o $@
- libffi_convenience_la_LIBADD =
--am__objects_29 = src/prep_cif.lo src/types.lo src/raw_api.lo \
-+am__objects_30 = src/prep_cif.lo src/types.lo src/raw_api.lo \
- 	src/java_raw_api.lo src/closures.lo
--am_libffi_convenience_la_OBJECTS = $(am__objects_29)
--am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-+am_libffi_convenience_la_OBJECTS = $(am__objects_30)
-+am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
- 	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
- 	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
- 	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-@@ -192,8 +184,8 @@ am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
- 	$(am__objects_19) $(am__objects_20) $(am__objects_21) \
- 	$(am__objects_22) $(am__objects_23) $(am__objects_24) \
- 	$(am__objects_25) $(am__objects_26) $(am__objects_27) \
--	$(am__objects_28)
--nodist_libffi_convenience_la_OBJECTS = $(am__objects_30)
-+	$(am__objects_28) $(am__objects_29)
-+nodist_libffi_convenience_la_OBJECTS = $(am__objects_31)
- libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
- 	$(nodist_libffi_convenience_la_OBJECTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -440,6 +432,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
- 	src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
- 	src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h	\
- 	src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
-+	src/bfin/ffi.c src/bfin/ffitarget.h src/bfin/sysv.S \
- 	src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
- 	src/moxie/ffi.c src/moxie/eabi.S libtool-version \
- 	ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
-@@ -508,10 +501,10 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \
- 	$(am__append_18) $(am__append_19) $(am__append_20) \
- 	$(am__append_21) $(am__append_22) $(am__append_23) \
- 	$(am__append_24) $(am__append_25) $(am__append_26) \
--	$(am__append_27) $(am__append_28)
-+	$(am__append_27) $(am__append_28) $(am__append_29)
- libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
- nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
--AM_CFLAGS = -g $(am__append_29)
-+AM_CFLAGS = -g $(am__append_30)
- libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
- AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
- AM_CCASFLAGS = $(AM_CPPFLAGS) -g
-@@ -637,6 +630,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp) \
- 	src/mips/$(DEPDIR)/$(am__dirstamp)
- src/mips/n32.lo: src/mips/$(am__dirstamp) \
- 	src/mips/$(DEPDIR)/$(am__dirstamp)
-+src/bfin/$(am__dirstamp):
-+	@$(MKDIR_P) src/bfin
-+	@: > src/bfin/$(am__dirstamp)
-+src/bfin/$(DEPDIR)/$(am__dirstamp):
-+	@$(MKDIR_P) src/bfin/$(DEPDIR)
-+	@: > src/bfin/$(DEPDIR)/$(am__dirstamp)
-+src/bfin/ffi.lo: src/bfin/$(am__dirstamp) \
-+	src/bfin/$(DEPDIR)/$(am__dirstamp)
-+src/bfin/sysv.lo: src/bfin/$(am__dirstamp) \
-+	src/bfin/$(DEPDIR)/$(am__dirstamp)
- src/x86/$(am__dirstamp):
- 	@$(MKDIR_P) src/x86
- 	@: > src/x86/$(am__dirstamp)
-@@ -852,6 +855,10 @@ mostlyclean-compile:
- 	-rm -f src/avr32/ffi.lo
- 	-rm -f src/avr32/sysv.$(OBJEXT)
- 	-rm -f src/avr32/sysv.lo
-+	-rm -f src/bfin/ffi.$(OBJEXT)
-+	-rm -f src/bfin/ffi.lo
-+	-rm -f src/bfin/sysv.$(OBJEXT)
-+	-rm -f src/bfin/sysv.lo
- 	-rm -f src/closures.$(OBJEXT)
- 	-rm -f src/closures.lo
- 	-rm -f src/cris/ffi.$(OBJEXT)
-@@ -973,6 +980,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/trampoline.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@src/bfin/$(DEPDIR)/ffi.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@src/bfin/$(DEPDIR)/sysv.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/sysv.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/frv/$(DEPDIR)/eabi.Plo@am__quote@
-@@ -1077,6 +1086,7 @@ clean-libtool:
- 	-rm -rf src/alpha/.libs src/alpha/_libs
- 	-rm -rf src/arm/.libs src/arm/_libs
- 	-rm -rf src/avr32/.libs src/avr32/_libs
-+	-rm -rf src/bfin/.libs src/bfin/_libs
- 	-rm -rf src/cris/.libs src/cris/_libs
- 	-rm -rf src/frv/.libs src/frv/_libs
- 	-rm -rf src/ia64/.libs src/ia64/_libs
-@@ -1631,6 +1641,8 @@ distclean-generic:
- 	-rm -f src/arm/$(am__dirstamp)
- 	-rm -f src/avr32/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f src/avr32/$(am__dirstamp)
-+	-rm -f src/bfin/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f src/bfin/$(am__dirstamp)
- 	-rm -f src/cris/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f src/cris/$(am__dirstamp)
- 	-rm -f src/frv/$(DEPDIR)/$(am__dirstamp)
-@@ -1670,7 +1682,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
--	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
-+	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- 	distclean-hdr distclean-libtool distclean-tags
-@@ -1790,7 +1802,7 @@ installcheck-am:
- maintainer-clean: maintainer-clean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -rf $(top_srcdir)/autom4te.cache
--	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
-+	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
- 	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-aminfo \
- 	maintainer-clean-generic maintainer-clean-vti
-diff --git a/README b/README
-index bcc7178..ec240a4 100644
---- a/README
-+++ b/README
-@@ -1,8 +1,8 @@
- Status
- ======
- 
--libffi-3.0.11 was released on April 11, 2012.  Check the libffi web
--page for updates: <URL:http://sourceware.org/libffi/>.
-+libffi-3.0.XX was released on XXXXXXX.  Check the libffi web page for
-+updates: <URL:http://sourceware.org/libffi/>.
- 
- 
- What is libffi?
-@@ -56,6 +56,7 @@ tested:
- | ARM          | Linux            |
- | ARM          | iOS              |
- | AVR32        | Linux            |
-+| Blackfin     | uClinux          |
- | HPPA         | HPUX             |
- | IA-64        | Linux            |
- | M68K         | FreeMiNT         |
-@@ -148,6 +149,9 @@ History
- 
- See the ChangeLog files for details.
- 
-+3.0.12 XXX-XX-XX
-+        Add Blackfin support.
-+
- 3.0.11 Apr-11-12
-         Add support for variadic functions (ffi_prep_cif_var).
- 	Add Linux/x32 support.
-diff --git a/configure b/configure
-index 91b2317..4ccba55 100755
---- a/configure
-+++ b/configure
-@@ -679,6 +679,8 @@ X86_FALSE
- X86_TRUE
- SPARC_FALSE
- SPARC_TRUE
-+BFIN_FALSE
-+BFIN_TRUE
- MIPS_FALSE
- MIPS_TRUE
- AM_LTLDFLAGS
-@@ -6840,14 +6842,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- 	    LD="${LD-ld} -m elf_i386_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
--	    case `/usr/bin/file conftest.o` in
--	      *x86-64*)
--	         LD="${LD-ld} -m elf32_x86_64"
--	         ;;
--	      *)
--	         LD="${LD-ld} -m elf_i386"
--	         ;;
--	    esac
-+	    LD="${LD-ld} -m elf_i386"
- 	    ;;
- 	  ppc64-*linux*|powerpc64-*linux*)
- 	    LD="${LD-ld} -m elf32ppclinux"
-@@ -8418,10 +8413,6 @@ _lt_linker_boilerplate=`cat conftest.err`
- $RM -r conftest*
- 
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
- if test -n "$compiler"; then
- 
- lt_prog_compiler_no_builtin_flag=
-@@ -10972,10 +10963,14 @@ fi
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12419,7 +12414,7 @@ if test "x$ax_gcc_arch" = xyes; then
- ax_gcc_arch=""
- if test "$cross_compiling" = no; then
- case $host_cpu in
--  i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
-+  i[3456]86*|x86_64*) # use cpuid codes
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -12535,18 +12530,24 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-           case $ax_cv_gcc_x86_cpuid_1 in
- 	    *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
- 	    *5??:*:*:*) ax_gcc_arch=pentium ;;
--	    *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
--	    *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
--	    *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
--	    *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
--	    *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
--	    *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
--            *f3[347]:*:*:*|*f41347:*:*:*)
-+	    *0?6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
-+	    *0?6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
-+	    *0?6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
-+	    *0?6[9de]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
-+	    *0?6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
-+	    *0?6f?:*:*:*|*1?66?:*:*:*) ax_gcc_arch="core2 pentium-m pentium3 pentiumpro" ;;
-+	    *1?6[7d]?:*:*:*) ax_gcc_arch="penryn core2 pentium-m pentium3 pentiumpro" ;;
-+	    *1?6[aef]?:*:*:*|*2?6[5cef]?:*:*:*) ax_gcc_arch="corei7 core2 pentium-m pentium3 pentiumpro" ;;
-+	    *1?6c?:*:*:*|*[23]?66?:*:*:*) ax_gcc_arch="atom core2 pentium-m pentium3 pentiumpro" ;;
-+	    *2?6[ad]?:*:*:*) ax_gcc_arch="corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;;
-+	    *0?6??:*:*:*) ax_gcc_arch=pentiumpro ;;
-+	    *6??:*:*:*) ax_gcc_arch="core2 pentiumpro" ;;
-+	    ?000?f3[347]:*:*:*|?000?f41347:*:*:*|?000?f6?:*:*:*)
- 		case $host_cpu in
--                  x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
--                  *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
--                esac ;;
--            *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
-+	          x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
-+	          *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
-+	        esac ;;
-+	    ?000?f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
-           esac ;;
-        *:68747541:*:*) # AMD
-           case $ax_cv_gcc_x86_cpuid_1 in
-@@ -12618,10 +12619,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 			ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
-                  *) ax_gcc_arch="athlon-4 athlon k7" ;;
- 	       esac ;;
--	    *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
--	    *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
--	    *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
--	    *f??:*:*:*) ax_gcc_arch="k8" ;;
-+	    ?00??f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
-+	    ?00??f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
-+	    ?00??f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
-+	    ?00??f??:*:*:*) ax_gcc_arch="k8" ;;
-+	    ?05??f??:*:*:*) ax_gcc_arch="btver1 amdfam10 k8" ;;
-+	    ?06??f??:*:*:*) ax_gcc_arch="bdver1 amdfam10 k8" ;;
-+	    *f??:*:*:*) ax_gcc_arch="amdfam10 k8" ;;
-           esac ;;
- 	*:746e6543:*:*) # IDT
- 	   case $ax_cv_gcc_x86_cpuid_1 in
-@@ -13150,6 +13154,10 @@ case "$host" in
- 	TARGET=AVR32; TARGETDIR=avr32
- 	;;
- 
-+  bfin*)
-+  	TARGET=BFIN; TARGETDIR=bfin
-+  	;;
-+
-   cris-*-*)
- 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
- 	;;
-@@ -13295,6 +13303,14 @@ else
-   MIPS_FALSE=
- fi
- 
-+ if test x$TARGET = xBFIN; then
-+  BFIN_TRUE=
-+  BFIN_FALSE='#'
-+else
-+  BFIN_TRUE='#'
-+  BFIN_FALSE=
-+fi
-+
-  if test x$TARGET = xSPARC; then
-   SPARC_TRUE=
-   SPARC_FALSE='#'
-@@ -14134,40 +14150,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-  esac
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .cfi pseudo-op support" >&5
--$as_echo_n "checking assembler .cfi pseudo-op support... " >&6; }
--if ${gcc_cv_as_cfi_pseudo_op+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--
--    gcc_cv_as_cfi_pseudo_op=unknown
--    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--asm (".cfi_startproc\n\t.cfi_endproc");
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  gcc_cv_as_cfi_pseudo_op=yes
--else
--  gcc_cv_as_cfi_pseudo_op=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_cfi_pseudo_op" >&5
--$as_echo "$gcc_cv_as_cfi_pseudo_op" >&6; }
-- if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then
--
--$as_echo "#define HAVE_AS_CFI_PSEUDO_OP 1" >>confdefs.h
--
-- fi
--
-+GCC_AS_CFI_PSEUDO_OP
- 
- if test x$TARGET = xSPARC; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5
-@@ -14739,6 +14722,10 @@ if test -z "${MIPS_TRUE}" && test -z "${MIPS_FALSE}"; then
-   as_fn_error $? "conditional \"MIPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${BFIN_TRUE}" && test -z "${BFIN_FALSE}"; then
-+  as_fn_error $? "conditional \"BFIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then
-   as_fn_error $? "conditional \"SPARC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff --git a/configure.ac b/configure.ac
-index 1021769..9b946a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,6 +75,10 @@ case "$host" in
- 	TARGET=AVR32; TARGETDIR=avr32
- 	;;
- 
-+  bfin*)
-+  	TARGET=BFIN; TARGETDIR=bfin
-+  	;;
-+
-   cris-*-*)
- 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
- 	;;
-@@ -213,6 +217,7 @@ if test $TARGETDIR = unknown; then
- fi
- 
- AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
-+AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
- AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
- AM_CONDITIONAL(X86, test x$TARGET = xX86)
- AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
-diff --git a/src/bfin/ffi.c b/src/bfin/ffi.c
-new file mode 100644
-index 0000000..0beccc1
---- /dev/null
-+++ b/src/bfin/ffi.c
-@@ -0,0 +1,195 @@
-+/* -----------------------------------------------------------------------
-+   ffi.c - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
-+
-+   Blackfin Foreign Function Interface
-+
-+   Permission is hereby granted, free of charge, to any person obtaining
-+   a copy of this software and associated documentation files (the
-+   ``Software''), to deal in the Software without restriction, including
-+   without limitation the rights to use, copy, modify, merge, publish,
-+   distribute, sublicense, and/or sell copies of the Software, and to
-+   permit persons to whom the Software is furnished to do so, subject to
-+   the following conditions:
-+
-+   The above copyright notice and this permission notice shall be included
-+   in all copies or substantial portions of the Software.
-+
-+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+   DEALINGS IN THE SOFTWARE.
-+   ----------------------------------------------------------------------- */
-+#include <ffi.h>
-+#include <ffi_common.h>
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+/* Maximum number of GPRs available for argument passing.  */
-+#define MAX_GPRARGS 3
-+
-+/*
-+ * Return types
-+ */
-+#define FFIBFIN_RET_VOID 0
-+#define FFIBFIN_RET_BYTE 1
-+#define FFIBFIN_RET_HALFWORD 2
-+#define FFIBFIN_RET_INT64 3
-+#define FFIBFIN_RET_INT32 4
-+
-+/*====================================================================*/
-+/*                          PROTOTYPE          *
-+ /*====================================================================*/
-+void ffi_prep_args(unsigned char *, extended_cif *);
-+
-+/*====================================================================*/
-+/*                          Externals                                 */
-+/*                          (Assembly)                                */
-+/*====================================================================*/
-+
-+extern void ffi_call_SYSV(unsigned, extended_cif *, void(*)(unsigned char *, extended_cif *), unsigned, void *, void(*fn)(void));
-+
-+/*====================================================================*/
-+/*                          Implementation                            */
-+/*                                                            */
-+/*====================================================================*/
-+
-+
-+/*
-+ * This function calculates the return type (size) based on type.
-+ */
-+
-+ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
-+{
-+   /* --------------------------------------*
-+    *   Return handling                *
-+    * --------------------------------------*/
-+   switch (cif->rtype->type) {
-+      case FFI_TYPE_VOID:
-+         cif->flags = FFIBFIN_RET_VOID;
-+         break;
-+      case FFI_TYPE_UINT16:
-+      case FFI_TYPE_SINT16:
-+         cif->flags = FFIBFIN_RET_HALFWORD;
-+         break;
-+      case FFI_TYPE_UINT8:
-+         cif->flags = FFIBFIN_RET_BYTE;
-+         break;
-+      case FFI_TYPE_INT:
-+      case FFI_TYPE_UINT32:
-+      case FFI_TYPE_SINT32:
-+      case FFI_TYPE_FLOAT:
-+      case FFI_TYPE_POINTER:
-+      case FFI_TYPE_SINT8:
-+         cif->flags = FFIBFIN_RET_INT32;
-+         break;
-+      case FFI_TYPE_SINT64:
-+      case FFI_TYPE_UINT64:
-+      case FFI_TYPE_DOUBLE:
-+          cif->flags = FFIBFIN_RET_INT64;
-+          break;
-+      case FFI_TYPE_STRUCT:
-+         if (cif->rtype->size <= 4){
-+        	 cif->flags = FFIBFIN_RET_INT32;
-+         }else if (cif->rtype->size == 8){
-+        	 cif->flags = FFIBFIN_RET_INT64;
-+         }else{
-+        	 //it will return via a hidden pointer in P0
-+        	 cif->flags = FFIBFIN_RET_VOID;
-+         }
-+         break;
-+      default:
-+         FFI_ASSERT(0);
-+         break;
-+   }
-+   return FFI_OK;
-+}
-+
-+/*
-+ * This will prepare the arguments and will call the assembly routine
-+ * cif = the call interface
-+ * fn = the function to be called
-+ * rvalue = the return value
-+ * avalue = the arguments
-+ */
-+void ffi_call(ffi_cif *cif, void(*fn)(void), void *rvalue, void **avalue)
-+{
-+   int ret_type = cif->flags;
-+   extended_cif ecif;
-+   ecif.cif = cif;
-+   ecif.avalue = avalue;
-+   ecif.rvalue = rvalue;
-+
-+   switch (cif->abi) {
-+      case FFI_SYSV:
-+         ffi_call_SYSV(cif->bytes, &ecif, ffi_prep_args, ret_type, ecif.rvalue, fn);
-+         break;
-+      default:
-+         FFI_ASSERT(0);
-+         break;
-+   }
-+}
-+
-+
-+/*
-+* This function prepares the parameters (copies them from the ecif to the stack)
-+*  to call the function (ffi_prep_args is called by the assembly routine in file
-+*  sysv.S, which also calls the actual function)
-+*/
-+void ffi_prep_args(unsigned char *stack, extended_cif *ecif)
-+{
-+   register unsigned int i = 0;
-+   void **p_argv;
-+   unsigned char *argp;
-+   ffi_type **p_arg;
-+   argp = stack;
-+   p_argv = ecif->avalue;
-+   for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
-+        (i != 0);
-+        i--, p_arg++) {
-+      size_t z;
-+      z = (*p_arg)->size;
-+      if (z < sizeof(int)) {
-+         z = sizeof(int);
-+         switch ((*p_arg)->type) {
-+            case FFI_TYPE_SINT8: {
-+                  signed char v = *(SINT8 *)(* p_argv);
-+                  signed int t = v;
-+                  *(signed int *) argp = t;
-+               }
-+               break;
-+            case FFI_TYPE_UINT8: {
-+                  unsigned char v = *(UINT8 *)(* p_argv);
-+                  unsigned int t = v;
-+                  *(unsigned int *) argp = t;
-+               }
-+               break;
-+            case FFI_TYPE_SINT16:
-+               *(signed int *) argp = (signed int) * (SINT16 *)(* p_argv);
-+               break;
-+            case FFI_TYPE_UINT16:
-+               *(unsigned int *) argp = (unsigned int) * (UINT16 *)(* p_argv);
-+               break;
-+            case FFI_TYPE_STRUCT:
-+               memcpy(argp, *p_argv, (*p_arg)->size);
-+               break;
-+            default:
-+               FFI_ASSERT(0);
-+               break;
-+         }
-+      } else if (z == sizeof(int)) {
-+         *(unsigned int *) argp = (unsigned int) * (UINT32 *)(* p_argv);
-+      } else {
-+         memcpy(argp, *p_argv, z);
-+      }
-+      p_argv++;
-+      argp += z;
-+   }
-+}
-+
-+
-+
-diff --git a/src/bfin/ffitarget.h b/src/bfin/ffitarget.h
-new file mode 100644
-index 0000000..2175c01
---- /dev/null
-+++ b/src/bfin/ffitarget.h
-@@ -0,0 +1,43 @@
-+/* -----------------------------------------------------------------------
-+   ffitarget.h - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
-+
-+   Blackfin Foreign Function Interface
-+
-+   Permission is hereby granted, free of charge, to any person obtaining
-+   a copy of this software and associated documentation files (the
-+   ``Software''), to deal in the Software without restriction, including
-+   without limitation the rights to use, copy, modify, merge, publish,
-+   distribute, sublicense, and/or sell copies of the Software, and to
-+   permit persons to whom the Software is furnished to do so, subject to
-+   the following conditions:
-+
-+   The above copyright notice and this permission notice shall be included
-+   in all copies or substantial portions of the Software.
-+
-+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+   DEALINGS IN THE SOFTWARE.
-+   ----------------------------------------------------------------------- */
-+
-+#ifndef LIBFFI_TARGET_H
-+#define LIBFFI_TARGET_H
-+
-+#ifndef LIBFFI_ASM
-+typedef unsigned long          ffi_arg;
-+typedef signed 	 long          ffi_sarg;
-+
-+typedef enum ffi_abi {
-+  FFI_FIRST_ABI = 0,
-+  FFI_SYSV,
-+  FFI_LAST_ABI,
-+  FFI_DEFAULT_ABI = FFI_SYSV
-+} ffi_abi;
-+#endif
-+
-+#endif
-+
-diff --git a/src/bfin/sysv.S b/src/bfin/sysv.S
-new file mode 100644
-index 0000000..ae7a152
---- /dev/null
-+++ b/src/bfin/sysv.S
-@@ -0,0 +1,177 @@
-+/* -----------------------------------------------------------------------
-+   sysv.S - Copyright (c) 2012  Alexandre K. I. de Mendonca <alexandre.keunecke@gmail.com>
-+
-+   Blackfin Foreign Function Interface
-+
-+   Permission is hereby granted, free of charge, to any person obtaining
-+   a copy of this software and associated documentation files (the
-+   ``Software''), to deal in the Software without restriction, including
-+   without limitation the rights to use, copy, modify, merge, publish,
-+   distribute, sublicense, and/or sell copies of the Software, and to
-+   permit persons to whom the Software is furnished to do so, subject to
-+   the following conditions:
-+
-+   The above copyright notice and this permission notice shall be included
-+   in all copies or substantial portions of the Software.
-+
-+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+   DEALINGS IN THE SOFTWARE.
-+   ----------------------------------------------------------------------- */
-+
-+#define LIBFFI_ASM
-+#include <fficonfig.h>
-+#include <ffi.h>
-+
-+.text
-+.align 4
-+
-+	/*
-+	 There is a "feature" in the bfin toolchain that it puts a _ before funcion names
-+	 that's why the function here it's called _ffi_call_SYSV and not ffi_call_SYSV
-+	 */
-+	.global _ffi_call_SYSV;
-+	.type _ffi_call_SYSV, STT_FUNC;
-+	.func ffi_call_SYSV
-+
-+	/*
-+	cif->bytes  	= R0	(fp+8)
-+	&ecif			= R1	(fp+12)
-+	ffi_prep_args	= R2	(fp+16)
-+	ret_type		= stack (fp+20)
-+	ecif.rvalue		= stack (fp+24)
-+	fn				= stack	(fp+28)
-+					  got	(fp+32)
-+    There is room for improvement here (we can use temporary registers
-+        instead of saving the values in the memory)
-+	REGS:
-+		P5 => Stack pointer (function arguments)
-+		R5 => cif->bytes
-+		R4 => ret->type
-+
-+		FP-20 = P3
-+		FP-16 = SP (parameters area)
-+		FP-12 = SP (temp)
-+		FP-08 = function return part 1 [R0]
-+		FP-04 = function return part 2 [R1]
-+	*/
-+
-+_ffi_call_SYSV:
-+.prologue:
-+	LINK 20;
-+	[FP-20] = P3;
-+	[FP+8] = R0;
-+	[FP+12] = R1;
-+	[FP+16] = R2;
-+
-+.allocate_stack:
-+	//alocate cif->bytes into the stack
-+	R1 = [FP+8];
-+	R0 = SP;
-+	R0 = R0 - R1;
-+	R1 = 4;
-+	R0 = R0 - R1;
-+	[FP-12] = SP;
-+	SP = R0;
-+	[FP-16] = SP;
-+
-+.call_prep_args:
-+	//get the addr of prep_args
-+	P0 = [P3 + _ffi_prep_args@FUNCDESC_GOT17M4];
-+	P1 = [P0];
-+	P3 = [P0+4];
-+	R0 = [FP-16];//SP (parameter area)
-+	R1 = [FP+12];//ecif
-+	call (P1);
-+
-+.call_user_function:
-+	//ajust SP so as to allow the user function access the parameters on the stack
-+	SP = [FP-16]; //point to function parameters
-+	R0 = [SP];
-+	R1 = [SP+4];
-+	R2 = [SP+8];
-+	//load user function address
-+	P0 = FP;
-+	P0 +=28;
-+	P1 = [P0];
-+	P1 = [P1];
-+	P3 = [P0+4];
-+	/*
-+		For functions returning aggregate values (struct) occupying more than 8 bytes,
-+		the caller allocates the return value object on the stack and the address
-+		of this object is passed to the callee as a hidden argument in register P0.
-+	*/
-+	P0 = [FP+24];
-+
-+	call (P1);
-+	SP = [FP-12];
-+.compute_return:
-+	P2 = [FP-20];
-+	[FP-8] = R0;
-+	[FP-4] = R1;
-+
-+	R0 = [FP+20];
-+	R1 = R0 << 2;
-+
-+	R0 = [P2+.rettable@GOT17M4];
-+	R0 = R1 + R0;
-+	P2 = R0;
-+	R1 = [P2];
-+
-+	P2 = [FP+-20];
-+	R0 = [P2+.rettable@GOT17M4];
-+	R0 = R1 + R0;
-+	P2 = R0;
-+	R0 = [FP-8];
-+	R1 = [FP-4];
-+	jump (P2);
-+
-+/*
-+#define FFIBFIN_RET_VOID 0
-+#define FFIBFIN_RET_BYTE 1
-+#define FFIBFIN_RET_HALFWORD 2
-+#define FFIBFIN_RET_INT64 3
-+#define FFIBFIN_RET_INT32 4
-+*/
-+.align 4
-+.align 4
-+.rettable:
-+	.dd .epilogue - .rettable
-+	.dd	.rbyte - .rettable;
-+	.dd	.rhalfword - .rettable;
-+	.dd	.rint64 - .rettable;
-+	.dd	.rint32 - .rettable;
-+
-+.rbyte:
-+	P0 = [FP+24];
-+	R0 = R0.B (Z);
-+	[P0] = R0;
-+	JUMP .epilogue
-+.rhalfword:
-+	P0 = [FP+24];
-+	R0 = R0.L;
-+	[P0] = R0;
-+	JUMP .epilogue
-+.rint64:
-+	P0 = [FP+24];// &rvalue
-+	[P0] = R0;
-+	[P0+4] = R1;
-+	JUMP .epilogue
-+.rint32:
-+	P0 = [FP+24];
-+	[P0] = R0;
-+.epilogue:
-+	R0 = [FP+8];
-+	R1 = [FP+12];
-+	R2 = [FP+16];
-+	P3 = [FP-20];
-+	UNLINK;
-+	RTS;
-+
-+.size _ffi_call_SYSV,.-_ffi_call_SYSV;
-+.endfunc
--- 
-1.7.9.5
-
diff --git a/package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch b/package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch
deleted file mode 100644
index a4071302a5..0000000000
--- a/package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch
+++ /dev/null
@@ -1,2326 +0,0 @@
-From c77c9625dd63138512ce0f67e07dd254771e566f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 16 Nov 2012 01:15:28 +0100
-Subject: [PATCH 2/2] Add aarch64 support from upstream
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- ChangeLog                |   27 ++
- Makefile.am              |    4 +
- Makefile.in              |   44 +-
- README                   |    3 +
- configure                |  185 +++++---
- configure.ac             |    5 +
- src/aarch64/ffi.c        | 1076 ++++++++++++++++++++++++++++++++++++++++++++++
- src/aarch64/ffitarget.h  |   59 +++
- src/aarch64/sysv.S       |  307 +++++++++++++
- testsuite/lib/libffi.exp |    4 +
- 10 files changed, 1647 insertions(+), 67 deletions(-)
- create mode 100644 src/aarch64/ffi.c
- create mode 100644 src/aarch64/ffitarget.h
- create mode 100644 src/aarch64/sysv.S
-
-diff --git a/ChangeLog b/ChangeLog
-index 376edf7..4e8ea91 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,30 @@
-+2012-10-30  James Greenhalgh  <james.greenhalgh at arm.com>
-+            Marcus Shawcroft  <marcus.shawcroft at arm.com>
-+
-+        * README: Add details of aarch64 port.
-+        * src/aarch64/ffi.c: New.
-+        * src/aarch64/ffitarget.h: Likewise.
-+        * src/aarch64/sysv.S: Likewise.
-+	* Makefile.am: Support aarch64.
-+	* configure.ac: Support aarch64.
-+	* Makefile.in, configure: Rebuilt.
-+
-+2012-10-30  James Greenhalgh  <james.greenhalgh at arm.com>
-+            Marcus Shawcroft  <marcus.shawcroft at arm.com>
-+
-+        * testsuite/lib/libffi.exp: Add support for aarch64.
-+        * testsuite/libffi.call/cls_struct_va1.c: New.
-+        * testsuite/libffi.call/cls_uchar_va.c: Likewise.
-+        * testsuite/libffi.call/cls_uint_va.c: Likewise.
-+        * testsuite/libffi.call/cls_ulong_va.c: Liekwise.
-+        * testsuite/libffi.call/cls_ushort_va.c: Likewise.
-+        * testsuite/libffi.call/nested_struct11.c: Likewise.
-+        * testsuite/libffi.call/uninitialized.c: Likewise.
-+        * testsuite/libffi.call/va_1.c: Likewise.
-+        * testsuite/libffi.call/va_struct1.c: Likewise.
-+        * testsuite/libffi.call/va_struct2.c: Likewise.
-+        * testsuite/libffi.call/va_struct3.c: Likewise.
-+
- 2012-04-23  Alexandre Keunecke I. de Mendonca <alexandre.keunecke@gmail.com>
- 
- 	* configure.ac: Add Blackfin/sysv support
-diff --git a/Makefile.am b/Makefile.am
-index 16f32a6..bd4d5c4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
- SUBDIRS = include testsuite man
- 
- EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
-+	src/aarch64/ffi.c src/aarch64/ffitarget.h \
- 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
- 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
- 	src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
-@@ -151,6 +152,9 @@ endif
- if POWERPC_FREEBSD
- nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
- endif
-+if AARCH64
-+nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
-+endif
- if ARM
- nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
- if FFI_EXEC_TRAMPOLINE_TABLE
-diff --git a/Makefile.in b/Makefile.in
-index f5c10af..c4f4470 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -65,9 +65,10 @@ target_triplet = @target@
- @SH64_TRUE@am__append_27 = src/sh64/sysv.S src/sh64/ffi.c
- @PA_LINUX_TRUE@am__append_28 = src/pa/linux.S src/pa/ffi.c
- @PA_HPUX_TRUE@am__append_29 = src/pa/hpux32.S src/pa/ffi.c
-+@AARCH64_TRUE@am__append_30 = src/aarch64/sysv.S src/aarch64/ffi.c
- # Build debug. Define FFI_DEBUG on the commandline so that, when building with
- # MSVC, it can link against the debug CRT.
--@FFI_DEBUG_TRUE@am__append_30 = -DFFI_DEBUG
-+@FFI_DEBUG_TRUE@am__append_31 = -DFFI_DEBUG
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
-@@ -156,6 +157,7 @@ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \
- @SH64_TRUE@am__objects_27 = src/sh64/sysv.lo src/sh64/ffi.lo
- @PA_LINUX_TRUE@am__objects_28 = src/pa/linux.lo src/pa/ffi.lo
- @PA_HPUX_TRUE@am__objects_29 = src/pa/hpux32.lo src/pa/ffi.lo
-+@AARCH64_TRUE@am__objects_29 = src/aarch64/sysv.lo src/aarch64/ffi.lo
- nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
- 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
- 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-@@ -165,17 +167,18 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
- 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
- 	$(am__objects_21) $(am__objects_22) $(am__objects_23) \
- 	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
--	$(am__objects_27) $(am__objects_28) $(am__objects_29)
-+	$(am__objects_27) $(am__objects_28) $(am__objects_29) \
-+	$(am__objects_30)
- libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \
- 	$(nodist_libffi_la_OBJECTS)
- libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libffi_la_LDFLAGS) $(LDFLAGS) -o $@
- libffi_convenience_la_LIBADD =
--am__objects_30 = src/prep_cif.lo src/types.lo src/raw_api.lo \
-+am__objects_31 = src/prep_cif.lo src/types.lo src/raw_api.lo \
- 	src/java_raw_api.lo src/closures.lo
--am_libffi_convenience_la_OBJECTS = $(am__objects_30)
--am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-+am_libffi_convenience_la_OBJECTS = $(am__objects_31)
-+am__objects_32 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
- 	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
- 	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
- 	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-@@ -185,7 +188,7 @@ am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
- 	$(am__objects_22) $(am__objects_23) $(am__objects_24) \
- 	$(am__objects_25) $(am__objects_26) $(am__objects_27) \
- 	$(am__objects_28) $(am__objects_29)
--nodist_libffi_convenience_la_OBJECTS = $(am__objects_31)
-+nodist_libffi_convenience_la_OBJECTS = $(am__objects_32)
- libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
- 	$(nodist_libffi_convenience_la_OBJECTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -410,6 +413,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign subdir-objects
- SUBDIRS = include testsuite man
- EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
-+	src/aarch64/ffi.c src/aarch64/ffitarget.h \
- 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
- 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
- 	src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
-@@ -501,10 +505,11 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \
- 	$(am__append_18) $(am__append_19) $(am__append_20) \
- 	$(am__append_21) $(am__append_22) $(am__append_23) \
- 	$(am__append_24) $(am__append_25) $(am__append_26) \
--	$(am__append_27) $(am__append_28) $(am__append_29)
-+	$(am__append_27) $(am__append_28) $(am__append_29) \
-+	$(am__append_30)
- libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
- nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
--AM_CFLAGS = -g $(am__append_30)
-+AM_CFLAGS = -g $(am__append_31)
- libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
- AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
- AM_CCASFLAGS = $(AM_CPPFLAGS) -g
-@@ -640,6 +645,16 @@ src/bfin/ffi.lo: src/bfin/$(am__dirstamp) \
- 	src/bfin/$(DEPDIR)/$(am__dirstamp)
- src/bfin/sysv.lo: src/bfin/$(am__dirstamp) \
- 	src/bfin/$(DEPDIR)/$(am__dirstamp)
-+src/aarch64/$(am__dirstamp):
-+	@$(MKDIR_P) src/aarch64
-+	@: > src/aarch64/$(am__dirstamp)
-+src/aarch64/$(DEPDIR)/$(am__dirstamp):
-+	@$(MKDIR_P) src/aarch64/$(DEPDIR)
-+	@: > src/aarch64/$(DEPDIR)/$(am__dirstamp)
-+src/aarch64/ffi.lo: src/aarch64/$(am__dirstamp) \
-+	src/aarch64/$(DEPDIR)/$(am__dirstamp)
-+src/aarch64/sysv.lo: src/aarch64/$(am__dirstamp) \
-+	src/aarch64/$(DEPDIR)/$(am__dirstamp)
- src/x86/$(am__dirstamp):
- 	@$(MKDIR_P) src/x86
- 	@: > src/x86/$(am__dirstamp)
-@@ -859,6 +874,10 @@ mostlyclean-compile:
- 	-rm -f src/bfin/ffi.lo
- 	-rm -f src/bfin/sysv.$(OBJEXT)
- 	-rm -f src/bfin/sysv.lo
-+	-rm -f src/aarch64/ffi.$(OBJEXT)
-+	-rm -f src/aarch64/ffi.lo
-+	-rm -f src/aarch64/sysv.$(OBJEXT)
-+	-rm -f src/aarch64/sysv.lo
- 	-rm -f src/closures.$(OBJEXT)
- 	-rm -f src/closures.lo
- 	-rm -f src/cris/ffi.$(OBJEXT)
-@@ -973,6 +992,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/prep_cif.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/raw_api.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/types.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@src/aarch64/$(DEPDIR)/ffi.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@src/aarch64/$(DEPDIR)/sysv.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/ffi.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@
-@@ -1083,6 +1104,7 @@ mostlyclean-libtool:
- clean-libtool:
- 	-rm -rf .libs _libs
- 	-rm -rf src/.libs src/_libs
-+	-rm -rf src/aarch64/.libs src/aarch64/_libs
- 	-rm -rf src/alpha/.libs src/alpha/_libs
- 	-rm -rf src/arm/.libs src/arm/_libs
- 	-rm -rf src/avr32/.libs src/avr32/_libs
-@@ -1635,6 +1657,8 @@ distclean-generic:
- 	-rm -f doc/$(am__dirstamp)
- 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f src/$(am__dirstamp)
-+	-rm -f src/aarch64/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f src/aarch64/$(am__dirstamp)
- 	-rm -f src/alpha/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f src/alpha/$(am__dirstamp)
- 	-rm -f src/arm/$(DEPDIR)/$(am__dirstamp)
-@@ -1682,7 +1706,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
--	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
-+	-rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- 	distclean-hdr distclean-libtool distclean-tags
-@@ -1802,7 +1826,7 @@ installcheck-am:
- maintainer-clean: maintainer-clean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -rf $(top_srcdir)/autom4te.cache
--	-rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
-+	-rm -rf src/$(DEPDIR) src/aarch64/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR)
- 	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-aminfo \
- 	maintainer-clean-generic maintainer-clean-vti
-diff --git a/README b/README
-index ec240a4..9aa99f4 100644
---- a/README
-+++ b/README
-@@ -51,6 +51,7 @@ tested:
- |--------------+------------------|
- | Architecture | Operating System |
- |--------------+------------------|
-+| AArch64         | Linux            |
- | Alpha        | Linux            |
- | Alpha        | Tru64            |
- | ARM          | Linux            |
-@@ -151,6 +152,7 @@ See the ChangeLog files for details.
- 
- 3.0.12 XXX-XX-XX
-         Add Blackfin support.
-+	Add AArch64 support.
- 
- 3.0.11 Apr-11-12
-         Add support for variadic functions (ffi_prep_cif_var).
-@@ -320,6 +322,7 @@ Thorup.
- Major processor architecture ports were contributed by the following
- developers:
- 
-+aarch64		Marcus Shawcroft, James Greenhalgh
- alpha		Richard Henderson
- arm		Raffaele Sena
- cris		Simon Posnjak, Hans-Peter Nilsson
-diff --git a/configure b/configure
-index 4ccba55..419275b 100755
---- a/configure
-+++ b/configure
-@@ -649,6 +649,8 @@ AVR32_FALSE
- AVR32_TRUE
- ARM_FALSE
- ARM_TRUE
-+AARCH64_FALSE
-+AARCH64_TRUE
- POWERPC_FREEBSD_FALSE
- POWERPC_FREEBSD_TRUE
- POWERPC_DARWIN_FALSE
-@@ -1478,7 +1480,7 @@ Optional Features:
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --with-pic              try to use only PIC/non-PIC objects [default=use
-+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-sysroot=DIR Search for dependent libraries within DIR
-@@ -5276,6 +5278,11 @@ else
-     lt_cv_sys_max_cmd_len=196608
-     ;;
- 
-+  os2*)
-+    # The test takes a long time on OS/2.
-+    lt_cv_sys_max_cmd_len=8192
-+    ;;
-+
-   osf*)
-     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-@@ -5315,7 +5322,7 @@ else
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
--      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
- 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- 	      test $i != 17 # 1/2 MB should be enough
-       do
-@@ -5744,7 +5751,7 @@ irix5* | irix6* | nonstopux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--# This must be Linux ELF.
-+# This must be glibc/ELF.
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
-@@ -6538,6 +6545,7 @@ for ac_symprfx in "" "_"; do
-     # which start with @ or ?.
-     lt_cv_sys_global_symbol_pipe="$AWK '"\
- "     {last_section=section; section=\$ 3};"\
-+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
- "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
- "     \$ 0!~/External *\|/{next};"\
- "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -6926,7 +6934,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
-     CFLAGS="$SAVE_CFLAGS"
-   fi
-   ;;
--sparc*-*solaris*)
-+*-*solaris*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-@@ -6937,7 +6945,20 @@ sparc*-*solaris*)
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      yes*)
-+        case $host in
-+        i?86-*-solaris*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        sparc*-*-solaris*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+        esac
-+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+          LD="${LD-ld}_sol2"
-+        fi
-+        ;;
-       *)
- 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- 	  LD="${LD-ld} -64"
-@@ -7577,7 +7598,13 @@ else
- 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-         _lt_result=$?
--	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	# If there is a non-empty error log, and "single_module"
-+	# appears in it, assume the flag caused a linker warning
-+        if test -s conftest.err && $GREP single_module conftest.err; then
-+	  cat conftest.err >&5
-+	# Otherwise, if the output was created with a 0 exit code from
-+	# the compiler, it worked.
-+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
- 	  lt_cv_apple_cc_single_mod=yes
- 	else
- 	  cat conftest.err >&5
-@@ -7588,6 +7615,7 @@ else
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
- $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-+
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
- $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
- if ${lt_cv_ld_exported_symbols_list+:} false; then :
-@@ -7620,6 +7648,7 @@ rm -f core conftest.err conftest.$ac_objext \
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
- $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
- $as_echo_n "checking for -force_load linker flag... " >&6; }
- if ${lt_cv_ld_force_load+:} false; then :
-@@ -7641,7 +7670,9 @@ _LT_EOF
-       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-       _lt_result=$?
--      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-+      if test -s conftest.err && $GREP force_load conftest.err; then
-+	cat conftest.err >&5
-+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
- 	lt_cv_ld_force_load=yes
-       else
- 	cat conftest.err >&5
-@@ -8046,7 +8077,22 @@ fi
- 
- # Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then :
--  withval=$with_pic; pic_mode="$withval"
-+  withval=$with_pic; lt_p=${PACKAGE-default}
-+    case $withval in
-+    yes|no) pic_mode=$withval ;;
-+    *)
-+      pic_mode=default
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for lt_pkg in $withval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$lt_pkg" = "X$lt_p"; then
-+	  pic_mode=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
- else
-   pic_mode=default
- fi
-@@ -8124,6 +8170,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- 
- 
-+
-+
-+
-+
- test -z "$LN_S" && LN_S="ln -s"
- 
- 
-@@ -8579,7 +8629,9 @@ lt_prog_compiler_static=
-     case $cc_basename in
-     nvcc*) # Cuda Compiler Driver 2.2
-       lt_prog_compiler_wl='-Xlinker '
--      lt_prog_compiler_pic='-Xcompiler -fPIC'
-+      if test -n "$lt_prog_compiler_pic"; then
-+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-+      fi
-       ;;
-     esac
-   else
-@@ -8670,18 +8722,33 @@ lt_prog_compiler_static=
- 	;;
-       *)
- 	case `$CC -V 2>&1 | sed 5q` in
--	*Sun\ F* | *Sun*Fortran*)
-+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
- 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
- 	  lt_prog_compiler_pic='-KPIC'
- 	  lt_prog_compiler_static='-Bstatic'
- 	  lt_prog_compiler_wl=''
- 	  ;;
-+	*Sun\ F* | *Sun*Fortran*)
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Qoption ld '
-+	  ;;
- 	*Sun\ C*)
- 	  # Sun C 5.9
- 	  lt_prog_compiler_pic='-KPIC'
- 	  lt_prog_compiler_static='-Bstatic'
- 	  lt_prog_compiler_wl='-Wl,'
- 	  ;;
-+        *Intel*\ [CF]*Compiler*)
-+	  lt_prog_compiler_wl='-Wl,'
-+	  lt_prog_compiler_pic='-fPIC'
-+	  lt_prog_compiler_static='-static'
-+	  ;;
-+	*Portland\ Group*)
-+	  lt_prog_compiler_wl='-Wl,'
-+	  lt_prog_compiler_pic='-fpic'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  ;;
- 	esac
- 	;;
-       esac
-@@ -9043,7 +9110,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
-   hardcode_direct=no
-   hardcode_direct_absolute=no
-   hardcode_libdir_flag_spec=
--  hardcode_libdir_flag_spec_ld=
-   hardcode_libdir_separator=
-   hardcode_minus_L=no
-   hardcode_shlibpath_var=unsupported
-@@ -9293,8 +9359,7 @@ _LT_EOF
- 	xlf* | bgf* | bgxlf* | mpixlf*)
- 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
--	  hardcode_libdir_flag_spec=
--	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
- 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-@@ -9673,6 +9738,7 @@ fi
- 	# The linker will not automatically build a static lib if we build a DLL.
- 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- 	enable_shared_with_static_runtimes=yes
-+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
- 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- 	# Don't use ranlib
- 	old_postinstall_cmds='chmod 644 $oldlib'
-@@ -9718,6 +9784,7 @@ fi
-   hardcode_shlibpath_var=unsupported
-   if test "$lt_cv_ld_force_load" = "yes"; then
-     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+
-   else
-     whole_archive_flag_spec=''
-   fi
-@@ -9746,10 +9813,6 @@ fi
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
--      ld_shlibs=no
--      ;;
--
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-     # support.  Future versions do this automatically, but an explicit c++rt0.o
-     # does not break anything, and helps significantly (at the cost of a little
-@@ -9762,7 +9825,7 @@ fi
-       ;;
- 
-     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
-+    freebsd2.*)
-       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_direct=yes
-       hardcode_minus_L=yes
-@@ -9801,7 +9864,6 @@ fi
-       fi
-       if test "$with_gnu_ld" = no; then
- 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--	hardcode_libdir_flag_spec_ld='+b $libdir'
- 	hardcode_libdir_separator=:
- 	hardcode_direct=yes
- 	hardcode_direct_absolute=yes
-@@ -10425,11 +10487,6 @@ esac
- 
- 
- 
--
--
--
--
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
-@@ -10519,7 +10576,7 @@ need_version=unknown
- 
- case $host_os in
- aix3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-   shlibpath_var=LIBPATH
- 
-@@ -10528,7 +10585,7 @@ aix3*)
-   ;;
- 
- aix[4-9]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   hardcode_into_libs=yes
-@@ -10593,7 +10650,7 @@ beos*)
-   ;;
- 
- bsdi[45]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -10732,7 +10789,7 @@ darwin* | rhapsody*)
-   ;;
- 
- dgux*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -10740,10 +10797,6 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -10751,7 +10804,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[23].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -10769,7 +10822,7 @@ freebsd* | dragonfly*)
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
--  freebsd2*)
-+  freebsd2.*)
-     shlibpath_overrides_runpath=yes
-     ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -10789,17 +10842,18 @@ freebsd* | dragonfly*)
-   ;;
- 
- gnu*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
-   ;;
- 
- haiku*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   dynamic_linker="$host_os runtime_loader"
-@@ -10860,7 +10914,7 @@ hpux9* | hpux10* | hpux11*)
-   ;;
- 
- interix[3-9]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -10876,7 +10930,7 @@ irix5* | irix6* | nonstopux*)
-     nonstopux*) version_type=nonstopux ;;
-     *)
- 	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
-+		version_type=linux # correct to gnu/linux during the next big refactor
- 	else
- 		version_type=irix
- 	fi ;;
-@@ -10913,9 +10967,9 @@ linux*oldld* | linux*aout* | linux*coff*)
-   dynamic_linker=no
-   ;;
- 
--# This must be Linux ELF.
-+# This must be glibc/ELF.
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11001,7 +11055,7 @@ netbsd*)
-   ;;
- 
- newsos6)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
-@@ -11070,7 +11124,7 @@ rdos*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11095,7 +11149,7 @@ sunos4*)
-   ;;
- 
- sysv4 | sysv4.3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -11119,7 +11173,7 @@ sysv4 | sysv4.3*)
- 
- sysv4*MP*)
-   if test -d /usr/nec ;then
--    version_type=linux
-+    version_type=linux # correct to gnu/linux during the next big refactor
-     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-     soname_spec='$libname${shared_ext}.$major'
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -11150,7 +11204,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- 
- tpf*)
-   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11160,7 +11214,7 @@ tpf*)
-   ;;
- 
- uts4*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -11942,6 +11996,8 @@ CC="$lt_save_CC"
- 
- 
- 
-+
-+
-         ac_config_commands="$ac_config_commands libtool"
- 
- 
-@@ -13132,6 +13188,10 @@ fi
- 
- TARGETDIR="unknown"
- case "$host" in
-+  aarch64*-*-*)
-+	TARGET=AARCH64; TARGETDIR=aarch64
-+	;;
-+
-   alpha*-*-*)
- 	TARGET=ALPHA; TARGETDIR=alpha;
- 	# Support 128-bit long double, changeable via command-line switch.
-@@ -13431,6 +13491,14 @@ else
-   POWERPC_FREEBSD_FALSE=
- fi
- 
-+ if test x$TARGET = xAARCH64; then
-+  AARCH64_TRUE=
-+  AARCH64_FALSE='#'
-+else
-+  AARCH64_TRUE='#'
-+  AARCH64_FALSE=
-+fi
-+
-  if test x$TARGET = xARM; then
-   ARM_TRUE=
-   ARM_FALSE='#'
-@@ -14786,6 +14854,10 @@ if test -z "${POWERPC_FREEBSD_TRUE}" && test -z "${POWERPC_FREEBSD_FALSE}"; then
-   as_fn_error $? "conditional \"POWERPC_FREEBSD\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${AARCH64_TRUE}" && test -z "${AARCH64_FALSE}"; then
-+  as_fn_error $? "conditional \"AARCH64\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${ARM_TRUE}" && test -z "${ARM_FALSE}"; then
-   as_fn_error $? "conditional \"ARM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -15463,6 +15535,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
- enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
- SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
- ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
- host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
- host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
- host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-@@ -15545,7 +15618,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
- allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
- no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
- hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
- hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
- hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
- hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-@@ -15601,6 +15673,7 @@ _LTECHO_EOF'
- # Quote evaled strings.
- for var in SHELL \
- ECHO \
-+PATH_SEPARATOR \
- SED \
- GREP \
- EGREP \
-@@ -15651,7 +15724,6 @@ with_gnu_ld \
- allow_undefined_flag \
- no_undefined_flag \
- hardcode_libdir_flag_spec \
--hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- exclude_expsyms \
- include_expsyms \
-@@ -16633,8 +16705,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--#                 Inc.
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
-@@ -16688,6 +16760,9 @@ SHELL=$lt_SHELL
- # An echo program that protects backslashes.
- ECHO=$lt_ECHO
- 
-+# The PATH separator for the build system.
-+PATH_SEPARATOR=$lt_PATH_SEPARATOR
-+
- # The host system.
- host_alias=$host_alias
- host=$host
-@@ -16989,10 +17064,6 @@ no_undefined_flag=$lt_no_undefined_flag
- # This must work even if \$libdir does not exist
- hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
- 
--# If ld is used when linking, flag to hardcode \$libdir into a binary
--# during linking.  This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
--
- # Whether we need a single "-rpath" flag with a separated argument.
- hardcode_libdir_separator=$lt_hardcode_libdir_separator
- 
-diff --git a/configure.ac b/configure.ac
-index 9b946a2..8c3f40c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,6 +53,10 @@ AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
- 
- TARGETDIR="unknown"
- case "$host" in
-+  aarch64*-*-*)
-+	TARGET=AARCH64; TARGETDIR=aarch64
-+	;;
-+
-   alpha*-*-*)
- 	TARGET=ALPHA; TARGETDIR=alpha;
- 	# Support 128-bit long double, changeable via command-line switch.
-@@ -233,6 +237,7 @@ AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
- AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
- AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
- AM_CONDITIONAL(POWERPC_FREEBSD, test x$TARGET = xPOWERPC_FREEBSD)
-+AM_CONDITIONAL(AARCH64, test x$TARGET = xAARCH64)
- AM_CONDITIONAL(ARM, test x$TARGET = xARM)
- AM_CONDITIONAL(AVR32, test x$TARGET = xAVR32)
- AM_CONDITIONAL(LIBFFI_CRIS, test x$TARGET = xLIBFFI_CRIS)
-diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c
-new file mode 100644
-index 0000000..1405665
---- /dev/null
-+++ b/src/aarch64/ffi.c
-@@ -0,0 +1,1076 @@
-+/* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+``Software''), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include <stdio.h>
-+
-+#include <ffi.h>
-+#include <ffi_common.h>
-+
-+#include <stdlib.h>
-+
-+/* Stack alignment requirement in bytes */
-+#define AARCH64_STACK_ALIGN 16
-+
-+#define N_X_ARG_REG 8
-+#define N_V_ARG_REG 8
-+
-+#define AARCH64_FFI_WITH_V (1 << AARCH64_FFI_WITH_V_BIT)
-+
-+union _d
-+{
-+  UINT64 d;
-+  UINT32 s[2];
-+};
-+
-+struct call_context
-+{
-+  UINT64 x [AARCH64_N_XREG];
-+  struct
-+  {
-+    union _d d[2];
-+  } v [AARCH64_N_VREG];
-+};
-+
-+static void *
-+get_x_addr (struct call_context *context, unsigned n)
-+{
-+  return &context->x[n];
-+}
-+
-+static void *
-+get_s_addr (struct call_context *context, unsigned n)
-+{
-+#if defined __AARCH64EB__
-+  return &context->v[n].d[1].s[1];
-+#else
-+  return &context->v[n].d[0].s[0];
-+#endif
-+}
-+
-+static void *
-+get_d_addr (struct call_context *context, unsigned n)
-+{
-+#if defined __AARCH64EB__
-+  return &context->v[n].d[1];
-+#else
-+  return &context->v[n].d[0];
-+#endif
-+}
-+
-+static void *
-+get_v_addr (struct call_context *context, unsigned n)
-+{
-+  return &context->v[n];
-+}
-+
-+/* Return the memory location at which a basic type would reside
-+   were it to have been stored in register n.  */
-+
-+static void *
-+get_basic_type_addr (unsigned short type, struct call_context *context,
-+		     unsigned n)
-+{
-+  switch (type)
-+    {
-+    case FFI_TYPE_FLOAT:
-+      return get_s_addr (context, n);
-+    case FFI_TYPE_DOUBLE:
-+      return get_d_addr (context, n);
-+    case FFI_TYPE_LONGDOUBLE:
-+      return get_v_addr (context, n);
-+    case FFI_TYPE_UINT8:
-+    case FFI_TYPE_SINT8:
-+    case FFI_TYPE_UINT16:
-+    case FFI_TYPE_SINT16:
-+    case FFI_TYPE_UINT32:
-+    case FFI_TYPE_SINT32:
-+    case FFI_TYPE_INT:
-+    case FFI_TYPE_POINTER:
-+    case FFI_TYPE_UINT64:
-+    case FFI_TYPE_SINT64:
-+      return get_x_addr (context, n);
-+    default:
-+      FFI_ASSERT (0);
-+      return NULL;
-+    }
-+}
-+
-+/* Return the alignment width for each of the basic types.  */
-+
-+static size_t
-+get_basic_type_alignment (unsigned short type)
-+{
-+  switch (type)
-+    {
-+    case FFI_TYPE_FLOAT:
-+    case FFI_TYPE_DOUBLE:
-+      return sizeof (UINT64);
-+    case FFI_TYPE_LONGDOUBLE:
-+      return sizeof (long double);
-+    case FFI_TYPE_UINT8:
-+    case FFI_TYPE_SINT8:
-+    case FFI_TYPE_UINT16:
-+    case FFI_TYPE_SINT16:
-+    case FFI_TYPE_UINT32:
-+    case FFI_TYPE_INT:
-+    case FFI_TYPE_SINT32:
-+    case FFI_TYPE_POINTER:
-+    case FFI_TYPE_UINT64:
-+    case FFI_TYPE_SINT64:
-+      return sizeof (UINT64);
-+
-+    default:
-+      FFI_ASSERT (0);
-+      return 0;
-+    }
-+}
-+
-+/* Return the size in bytes for each of the basic types.  */
-+
-+static size_t
-+get_basic_type_size (unsigned short type)
-+{
-+  switch (type)
-+    {
-+    case FFI_TYPE_FLOAT:
-+      return sizeof (UINT32);
-+    case FFI_TYPE_DOUBLE:
-+      return sizeof (UINT64);
-+    case FFI_TYPE_LONGDOUBLE:
-+      return sizeof (long double);
-+    case FFI_TYPE_UINT8:
-+      return sizeof (UINT8);
-+    case FFI_TYPE_SINT8:
-+      return sizeof (SINT8);
-+    case FFI_TYPE_UINT16:
-+      return sizeof (UINT16);
-+    case FFI_TYPE_SINT16:
-+      return sizeof (SINT16);
-+    case FFI_TYPE_UINT32:
-+      return sizeof (UINT32);
-+    case FFI_TYPE_INT:
-+    case FFI_TYPE_SINT32:
-+      return sizeof (SINT32);
-+    case FFI_TYPE_POINTER:
-+    case FFI_TYPE_UINT64:
-+      return sizeof (UINT64);
-+    case FFI_TYPE_SINT64:
-+      return sizeof (SINT64);
-+
-+    default:
-+      FFI_ASSERT (0);
-+      return 0;
-+    }
-+}
-+
-+extern void
-+ffi_call_SYSV (unsigned (*)(struct call_context *context, unsigned char *,
-+			    extended_cif *),
-+               struct call_context *context,
-+               extended_cif *,
-+               unsigned,
-+               void (*fn)(void));
-+
-+extern void
-+ffi_closure_SYSV (ffi_closure *);
-+
-+/* Test for an FFI floating point representation.  */
-+
-+static unsigned
-+is_floating_type (unsigned short type)
-+{
-+  return (type == FFI_TYPE_FLOAT || type == FFI_TYPE_DOUBLE
-+	  || type == FFI_TYPE_LONGDOUBLE);
-+}
-+
-+/* Test for a homogeneous structure.  */
-+
-+static unsigned short
-+get_homogeneous_type (ffi_type *ty)
-+{
-+  if (ty->type == FFI_TYPE_STRUCT && ty->elements)
-+    {
-+      unsigned i;
-+      unsigned short candidate_type
-+	= get_homogeneous_type (ty->elements[0]);
-+      for (i =1; ty->elements[i]; i++)
-+	{
-+	  unsigned short iteration_type = 0;
-+	  /* If we have a nested struct, we must find its homogeneous type.
-+	     If that fits with our candidate type, we are still
-+	     homogeneous.  */
-+	  if (ty->elements[i]->type == FFI_TYPE_STRUCT
-+	      && ty->elements[i]->elements)
-+	    {
-+	      iteration_type = get_homogeneous_type (ty->elements[i]);
-+	    }
-+	  else
-+	    {
-+	      iteration_type = ty->elements[i]->type;
-+	    }
-+
-+	  /* If we are not homogeneous, return FFI_TYPE_STRUCT.  */
-+	  if (candidate_type != iteration_type)
-+	    return FFI_TYPE_STRUCT;
-+	}
-+      return candidate_type;
-+    }
-+
-+  /* Base case, we have no more levels of nesting, so we
-+     are a basic type, and so, trivially homogeneous in that type.  */
-+  return ty->type;
-+}
-+
-+/* Determine the number of elements within a STRUCT.
-+
-+   Note, we must handle nested structs.
-+
-+   If ty is not a STRUCT this function will return 0.  */
-+
-+static unsigned
-+element_count (ffi_type *ty)
-+{
-+  if (ty->type == FFI_TYPE_STRUCT && ty->elements)
-+    {
-+      unsigned n;
-+      unsigned elems = 0;
-+      for (n = 0; ty->elements[n]; n++)
-+	{
-+	  if (ty->elements[n]->type == FFI_TYPE_STRUCT
-+	      && ty->elements[n]->elements)
-+	    elems += element_count (ty->elements[n]);
-+	  else
-+	    elems++;
-+	}
-+      return elems;
-+    }
-+  return 0;
-+}
-+
-+/* Test for a homogeneous floating point aggregate.
-+
-+   A homogeneous floating point aggregate is a homogeneous aggregate of
-+   a half- single- or double- precision floating point type with one
-+   to four elements.  Note that this includes nested structs of the
-+   basic type.  */
-+
-+static int
-+is_hfa (ffi_type *ty)
-+{
-+  if (ty->type == FFI_TYPE_STRUCT
-+      && ty->elements[0]
-+      && is_floating_type (get_homogeneous_type (ty)))
-+    {
-+      unsigned n = element_count (ty);
-+      return n >= 1 && n <= 4;
-+    }
-+  return 0;
-+}
-+
-+/* Test if an ffi_type is a candidate for passing in a register.
-+
-+   This test does not check that sufficient registers of the
-+   appropriate class are actually available, merely that IFF
-+   sufficient registers are available then the argument will be passed
-+   in register(s).
-+
-+   Note that an ffi_type that is deemed to be a register candidate
-+   will always be returned in registers.
-+
-+   Returns 1 if a register candidate else 0.  */
-+
-+static int
-+is_register_candidate (ffi_type *ty)
-+{
-+  switch (ty->type)
-+    {
-+    case FFI_TYPE_VOID:
-+    case FFI_TYPE_FLOAT:
-+    case FFI_TYPE_DOUBLE:
-+    case FFI_TYPE_LONGDOUBLE:
-+    case FFI_TYPE_UINT8:
-+    case FFI_TYPE_UINT16:
-+    case FFI_TYPE_UINT32:
-+    case FFI_TYPE_UINT64:
-+    case FFI_TYPE_POINTER:
-+    case FFI_TYPE_SINT8:
-+    case FFI_TYPE_SINT16:
-+    case FFI_TYPE_SINT32:
-+    case FFI_TYPE_INT:
-+    case FFI_TYPE_SINT64:
-+      return 1;
-+
-+    case FFI_TYPE_STRUCT:
-+      if (is_hfa (ty))
-+        {
-+          return 1;
-+        }
-+      else if (ty->size > 16)
-+        {
-+          /* Too large. Will be replaced with a pointer to memory. The
-+             pointer MAY be passed in a register, but the value will
-+             not. This test specifically fails since the argument will
-+             never be passed by value in registers. */
-+          return 0;
-+        }
-+      else
-+        {
-+          /* Might be passed in registers depending on the number of
-+             registers required. */
-+          return (ty->size + 7) / 8 < N_X_ARG_REG;
-+        }
-+      break;
-+
-+    default:
-+      FFI_ASSERT (0);
-+      break;
-+    }
-+
-+  return 0;
-+}
-+
-+/* Test if an ffi_type argument or result is a candidate for a vector
-+   register.  */
-+
-+static int
-+is_v_register_candidate (ffi_type *ty)
-+{
-+  return is_floating_type (ty->type)
-+	   || (ty->type == FFI_TYPE_STRUCT && is_hfa (ty));
-+}
-+
-+/* Representation of the procedure call argument marshalling
-+   state.
-+
-+   The terse state variable names match the names used in the AARCH64
-+   PCS. */
-+
-+struct arg_state
-+{
-+  unsigned ngrn;                /* Next general-purpose register number. */
-+  unsigned nsrn;                /* Next vector register number. */
-+  unsigned nsaa;                /* Next stack offset. */
-+};
-+
-+/* Initialize a procedure call argument marshalling state.  */
-+static void
-+arg_init (struct arg_state *state, unsigned call_frame_size)
-+{
-+  state->ngrn = 0;
-+  state->nsrn = 0;
-+  state->nsaa = 0;
-+}
-+
-+/* Return the number of available consecutive core argument
-+   registers.  */
-+
-+static unsigned
-+available_x (struct arg_state *state)
-+{
-+  return N_X_ARG_REG - state->ngrn;
-+}
-+
-+/* Return the number of available consecutive vector argument
-+   registers.  */
-+
-+static unsigned
-+available_v (struct arg_state *state)
-+{
-+  return N_V_ARG_REG - state->nsrn;
-+}
-+
-+static void *
-+allocate_to_x (struct call_context *context, struct arg_state *state)
-+{
-+  FFI_ASSERT (state->ngrn < N_X_ARG_REG)
-+  return get_x_addr (context, (state->ngrn)++);
-+}
-+
-+static void *
-+allocate_to_s (struct call_context *context, struct arg_state *state)
-+{
-+  FFI_ASSERT (state->nsrn < N_V_ARG_REG)
-+  return get_s_addr (context, (state->nsrn)++);
-+}
-+
-+static void *
-+allocate_to_d (struct call_context *context, struct arg_state *state)
-+{
-+  FFI_ASSERT (state->nsrn < N_V_ARG_REG)
-+  return get_d_addr (context, (state->nsrn)++);
-+}
-+
-+static void *
-+allocate_to_v (struct call_context *context, struct arg_state *state)
-+{
-+  FFI_ASSERT (state->nsrn < N_V_ARG_REG)
-+  return get_v_addr (context, (state->nsrn)++);
-+}
-+
-+/* Allocate an aligned slot on the stack and return a pointer to it.  */
-+static void *
-+allocate_to_stack (struct arg_state *state, void *stack, unsigned alignment,
-+		   unsigned size)
-+{
-+  void *allocation;
-+
-+  /* Round up the NSAA to the larger of 8 or the natural
-+     alignment of the argument's type.  */
-+  state->nsaa = ALIGN (state->nsaa, alignment);
-+  state->nsaa = ALIGN (state->nsaa, alignment);
-+  state->nsaa = ALIGN (state->nsaa, 8);
-+
-+  allocation = stack + state->nsaa;
-+
-+  state->nsaa += size;
-+  return allocation;
-+}
-+
-+static void
-+copy_basic_type (void *dest, void *source, unsigned short type)
-+{
-+  /* This is neccessary to ensure that basic types are copied
-+     sign extended to 64-bits as libffi expects.  */
-+  switch (type)
-+    {
-+    case FFI_TYPE_FLOAT:
-+      *(float *) dest = *(float *) source;
-+      break;
-+    case FFI_TYPE_DOUBLE:
-+      *(double *) dest = *(double *) source;
-+      break;
-+    case FFI_TYPE_LONGDOUBLE:
-+      *(long double *) dest = *(long double *) source;
-+      break;
-+    case FFI_TYPE_UINT8:
-+      *(ffi_arg *) dest = *(UINT8 *) source;
-+      break;
-+    case FFI_TYPE_SINT8:
-+      *(ffi_sarg *) dest = *(SINT8 *) source;
-+      break;
-+    case FFI_TYPE_UINT16:
-+      *(ffi_arg *) dest = *(UINT16 *) source;
-+      break;
-+    case FFI_TYPE_SINT16:
-+      *(ffi_sarg *) dest = *(SINT16 *) source;
-+      break;
-+    case FFI_TYPE_UINT32:
-+      *(ffi_arg *) dest = *(UINT32 *) source;
-+      break;
-+    case FFI_TYPE_INT:
-+    case FFI_TYPE_SINT32:
-+      *(ffi_sarg *) dest = *(SINT32 *) source;
-+      break;
-+    case FFI_TYPE_POINTER:
-+    case FFI_TYPE_UINT64:
-+      *(ffi_arg *) dest = *(UINT64 *) source;
-+      break;
-+    case FFI_TYPE_SINT64:
-+      *(ffi_sarg *) dest = *(SINT64 *) source;
-+      break;
-+
-+    default:
-+      FFI_ASSERT (0);
-+    }
-+}
-+
-+static void
-+copy_hfa_to_reg_or_stack (void *memory,
-+			  ffi_type *ty,
-+			  struct call_context *context,
-+			  unsigned char *stack,
-+			  struct arg_state *state)
-+{
-+  unsigned elems = element_count (ty);
-+  if (available_v (state) < elems)
-+    {
-+      /* There are insufficient V registers. Further V register allocations
-+	 are prevented, the NSAA is adjusted (by allocate_to_stack ())
-+	 and the argument is copied to memory at the adjusted NSAA.  */
-+      state->nsrn = N_V_ARG_REG;
-+      memcpy (allocate_to_stack (state, stack, ty->alignment, ty->size),
-+	      memory,
-+	      ty->size);
-+    }
-+  else
-+    {
-+      int i;
-+      unsigned short type = get_homogeneous_type (ty);
-+      unsigned elems = element_count (ty);
-+      for (i = 0; i < elems; i++)
-+	{
-+	  void *reg = allocate_to_v (context, state);
-+	  copy_basic_type (reg, memory, type);
-+	  memory += get_basic_type_size (type);
-+	}
-+    }
-+}
-+
-+/* Either allocate an appropriate register for the argument type, or if
-+   none are available, allocate a stack slot and return a pointer
-+   to the allocated space.  */
-+
-+static void *
-+allocate_to_register_or_stack (struct call_context *context,
-+			       unsigned char *stack,
-+			       struct arg_state *state,
-+			       unsigned short type)
-+{
-+  size_t alignment = get_basic_type_alignment (type);
-+  size_t size = alignment;
-+  switch (type)
-+    {
-+    case FFI_TYPE_FLOAT:
-+      /* This is the only case for which the allocated stack size
-+	 should not match the alignment of the type.  */
-+      size = sizeof (UINT32);
-+      /* Fall through.  */
-+    case FFI_TYPE_DOUBLE:
-+      if (state->nsrn < N_V_ARG_REG)
-+	return allocate_to_d (context, state);
-+      state->nsrn = N_V_ARG_REG;
-+      break;
-+    case FFI_TYPE_LONGDOUBLE:
-+      if (state->nsrn < N_V_ARG_REG)
-+	return allocate_to_v (context, state);
-+      state->nsrn = N_V_ARG_REG;
-+      break;
-+    case FFI_TYPE_UINT8:
-+    case FFI_TYPE_SINT8:
-+    case FFI_TYPE_UINT16:
-+    case FFI_TYPE_SINT16:
-+    case FFI_TYPE_UINT32:
-+    case FFI_TYPE_SINT32:
-+    case FFI_TYPE_INT:
-+    case FFI_TYPE_POINTER:
-+    case FFI_TYPE_UINT64:
-+    case FFI_TYPE_SINT64:
-+      if (state->ngrn < N_X_ARG_REG)
-+	return allocate_to_x (context, state);
-+      state->ngrn = N_X_ARG_REG;
-+      break;
-+    default:
-+      FFI_ASSERT (0);
-+    }
-+
-+    return allocate_to_stack (state, stack, alignment, size);
-+}
-+
-+/* Copy a value to an appropriate register, or if none are
-+   available, to the stack.  */
-+
-+static void
-+copy_to_register_or_stack (struct call_context *context,
-+			   unsigned char *stack,
-+			   struct arg_state *state,
-+			   void *value,
-+			   unsigned short type)
-+{
-+  copy_basic_type (
-+	  allocate_to_register_or_stack (context, stack, state, type),
-+	  value,
-+	  type);
-+}
-+
-+/* Marshall the arguments from FFI representation to procedure call
-+   context and stack.  */
-+
-+static unsigned
-+aarch64_prep_args (struct call_context *context, unsigned char *stack,
-+		   extended_cif *ecif)
-+{
-+  int i;
-+  struct arg_state state;
-+
-+  arg_init (&state, ALIGN(ecif->cif->bytes, 16));
-+
-+  for (i = 0; i < ecif->cif->nargs; i++)
-+    {
-+      ffi_type *ty = ecif->cif->arg_types[i];
-+      switch (ty->type)
-+	{
-+	case FFI_TYPE_VOID:
-+	  FFI_ASSERT (0);
-+	  break;
-+
-+	/* If the argument is a basic type the argument is allocated to an
-+	   appropriate register, or if none are available, to the stack.  */
-+	case FFI_TYPE_FLOAT:
-+	case FFI_TYPE_DOUBLE:
-+	case FFI_TYPE_LONGDOUBLE:
-+	case FFI_TYPE_UINT8:
-+	case FFI_TYPE_SINT8:
-+	case FFI_TYPE_UINT16:
-+	case FFI_TYPE_SINT16:
-+	case FFI_TYPE_UINT32:
-+	case FFI_TYPE_INT:
-+	case FFI_TYPE_SINT32:
-+	case FFI_TYPE_POINTER:
-+	case FFI_TYPE_UINT64:
-+	case FFI_TYPE_SINT64:
-+	  copy_to_register_or_stack (context, stack, &state,
-+				     ecif->avalue[i], ty->type);
-+	  break;
-+
-+	case FFI_TYPE_STRUCT:
-+	  if (is_hfa (ty))
-+	    {
-+	      copy_hfa_to_reg_or_stack (ecif->avalue[i], ty, context,
-+					stack, &state);
-+	    }
-+	  else if (ty->size > 16)
-+	    {
-+	      /* If the argument is a composite type that is larger than 16
-+		 bytes, then the argument has been copied to memory, and
-+		 the argument is replaced by a pointer to the copy.  */
-+
-+	      copy_to_register_or_stack (context, stack, &state,
-+					 &(ecif->avalue[i]), FFI_TYPE_POINTER);
-+	    }
-+	  else if (available_x (&state) >= (ty->size + 7) / 8)
-+	    {
-+	      /* If the argument is a composite type and the size in
-+		 double-words is not more than the number of available
-+		 X registers, then the argument is copied into consecutive
-+		 X registers.  */
-+	      int j;
-+	      for (j = 0; j < (ty->size + 7) / 8; j++)
-+		{
-+		  memcpy (allocate_to_x (context, &state),
-+			  &(((UINT64 *) ecif->avalue[i])[j]),
-+			  sizeof (UINT64));
-+		}
-+	    }
-+	  else
-+	    {
-+	      /* Otherwise, there are insufficient X registers. Further X
-+		 register allocations are prevented, the NSAA is adjusted
-+		 (by allocate_to_stack ()) and the argument is copied to
-+		 memory at the adjusted NSAA.  */
-+	      state.ngrn = N_X_ARG_REG;
-+
-+	      memcpy (allocate_to_stack (&state, stack, ty->alignment,
-+					 ty->size), ecif->avalue + i, ty->size);
-+	    }
-+	  break;
-+
-+	default:
-+	  FFI_ASSERT (0);
-+	  break;
-+	}
-+    }
-+
-+  return ecif->cif->aarch64_flags;
-+}
-+
-+ffi_status
-+ffi_prep_cif_machdep (ffi_cif *cif)
-+{
-+  /* Round the stack up to a multiple of the stack alignment requirement. */
-+  cif->bytes =
-+    (cif->bytes + (AARCH64_STACK_ALIGN - 1)) & ~ (AARCH64_STACK_ALIGN - 1);
-+
-+  /* Initialize our flags. We are interested if this CIF will touch a
-+     vector register, if so we will enable context save and load to
-+     those registers, otherwise not. This is intended to be friendly
-+     to lazy float context switching in the kernel.  */
-+  cif->aarch64_flags = 0;
-+
-+  if (is_v_register_candidate (cif->rtype))
-+    {
-+      cif->aarch64_flags |= AARCH64_FFI_WITH_V;
-+    }
-+  else
-+    {
-+      int i;
-+      for (i = 0; i < cif->nargs; i++)
-+        if (is_v_register_candidate (cif->arg_types[i]))
-+          {
-+            cif->aarch64_flags |= AARCH64_FFI_WITH_V;
-+            break;
-+          }
-+    }
-+
-+  return FFI_OK;
-+}
-+
-+/* Call a function with the provided arguments and capture the return
-+   value.  */
-+void
-+ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
-+{
-+  extended_cif ecif;
-+
-+  ecif.cif = cif;
-+  ecif.avalue = avalue;
-+  ecif.rvalue = rvalue;
-+
-+  switch (cif->abi)
-+    {
-+    case FFI_SYSV:
-+      {
-+        struct call_context context;
-+	unsigned stack_bytes;
-+
-+	/* Figure out the total amount of stack space we need, the
-+	   above call frame space needs to be 16 bytes aligned to
-+	   ensure correct alignment of the first object inserted in
-+	   that space hence the ALIGN applied to cif->bytes.*/
-+	stack_bytes = ALIGN(cif->bytes, 16);
-+
-+	memset (&context, 0, sizeof (context));
-+        if (is_register_candidate (cif->rtype))
-+          {
-+            ffi_call_SYSV (aarch64_prep_args, &context, &ecif, stack_bytes, fn);
-+            switch (cif->rtype->type)
-+              {
-+              case FFI_TYPE_VOID:
-+              case FFI_TYPE_FLOAT:
-+              case FFI_TYPE_DOUBLE:
-+              case FFI_TYPE_LONGDOUBLE:
-+              case FFI_TYPE_UINT8:
-+              case FFI_TYPE_SINT8:
-+              case FFI_TYPE_UINT16:
-+              case FFI_TYPE_SINT16:
-+              case FFI_TYPE_UINT32:
-+              case FFI_TYPE_SINT32:
-+              case FFI_TYPE_POINTER:
-+              case FFI_TYPE_UINT64:
-+              case FFI_TYPE_INT:
-+              case FFI_TYPE_SINT64:
-+		{
-+		  void *addr = get_basic_type_addr (cif->rtype->type,
-+						    &context, 0);
-+		  copy_basic_type (rvalue, addr, cif->rtype->type);
-+		  break;
-+		}
-+
-+              case FFI_TYPE_STRUCT:
-+                if (is_hfa (cif->rtype))
-+		  {
-+		    int j;
-+		    unsigned short type = get_homogeneous_type (cif->rtype);
-+		    unsigned elems = element_count (cif->rtype);
-+		    for (j = 0; j < elems; j++)
-+		      {
-+			void *reg = get_basic_type_addr (type, &context, j);
-+			copy_basic_type (rvalue, reg, type);
-+			rvalue += get_basic_type_size (type);
-+		      }
-+		  }
-+                else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG)
-+                  {
-+                    unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64));
-+                    memcpy (rvalue, get_x_addr (&context, 0), size);
-+                  }
-+                else
-+                  {
-+                    FFI_ASSERT (0);
-+                  }
-+                break;
-+
-+              default:
-+                FFI_ASSERT (0);
-+                break;
-+              }
-+          }
-+        else
-+          {
-+            memcpy (get_x_addr (&context, 8), &rvalue, sizeof (UINT64));
-+            ffi_call_SYSV (aarch64_prep_args, &context, &ecif,
-+			   stack_bytes, fn);
-+          }
-+        break;
-+      }
-+
-+    default:
-+      FFI_ASSERT (0);
-+      break;
-+    }
-+}
-+
-+static unsigned char trampoline [] =
-+{ 0x70, 0x00, 0x00, 0x58,	/* ldr	x16, 1f	*/
-+  0x91, 0x00, 0x00, 0x10,	/* adr	x17, 2f	*/
-+  0x00, 0x02, 0x1f, 0xd6	/* br	x16	*/
-+};
-+
-+/* Build a trampoline.  */
-+
-+#define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX,FLAGS)			\
-+  ({unsigned char *__tramp = (unsigned char*)(TRAMP);			\
-+    UINT64  __fun = (UINT64)(FUN);					\
-+    UINT64  __ctx = (UINT64)(CTX);					\
-+    UINT64  __flags = (UINT64)(FLAGS);					\
-+    memcpy (__tramp, trampoline, sizeof (trampoline));			\
-+    memcpy (__tramp + 12, &__fun, sizeof (__fun));			\
-+    memcpy (__tramp + 20, &__ctx, sizeof (__ctx));			\
-+    memcpy (__tramp + 28, &__flags, sizeof (__flags));			\
-+    __clear_cache(__tramp, __tramp + FFI_TRAMPOLINE_SIZE);		\
-+  })
-+
-+ffi_status
-+ffi_prep_closure_loc (ffi_closure* closure,
-+                      ffi_cif* cif,
-+                      void (*fun)(ffi_cif*,void*,void**,void*),
-+                      void *user_data,
-+                      void *codeloc)
-+{
-+  if (cif->abi != FFI_SYSV)
-+    return FFI_BAD_ABI;
-+
-+  FFI_INIT_TRAMPOLINE (&closure->tramp[0], &ffi_closure_SYSV, codeloc,
-+		       cif->aarch64_flags);
-+
-+  closure->cif  = cif;
-+  closure->user_data = user_data;
-+  closure->fun  = fun;
-+
-+  return FFI_OK;
-+}
-+
-+/* Primary handler to setup and invoke a function within a closure.
-+
-+   A closure when invoked enters via the assembler wrapper
-+   ffi_closure_SYSV(). The wrapper allocates a call context on the
-+   stack, saves the interesting registers (from the perspective of
-+   the calling convention) into the context then passes control to
-+   ffi_closure_SYSV_inner() passing the saved context and a pointer to
-+   the stack at the point ffi_closure_SYSV() was invoked.
-+
-+   On the return path the assembler wrapper will reload call context
-+   regsiters.
-+
-+   ffi_closure_SYSV_inner() marshalls the call context into ffi value
-+   desriptors, invokes the wrapped function, then marshalls the return
-+   value back into the call context.  */
-+
-+void
-+ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
-+			void *stack)
-+{
-+  ffi_cif *cif = closure->cif;
-+  void **avalue = (void**) alloca (cif->nargs * sizeof (void*));
-+  void *rvalue = NULL;
-+  int i;
-+  struct arg_state state;
-+
-+  arg_init (&state, ALIGN(cif->bytes, 16));
-+
-+  for (i = 0; i < cif->nargs; i++)
-+    {
-+      ffi_type *ty = cif->arg_types[i];
-+
-+      switch (ty->type)
-+	{
-+	case FFI_TYPE_VOID:
-+	  FFI_ASSERT (0);
-+	  break;
-+
-+	case FFI_TYPE_UINT8:
-+	case FFI_TYPE_SINT8:
-+	case FFI_TYPE_UINT16:
-+	case FFI_TYPE_SINT16:
-+	case FFI_TYPE_UINT32:
-+	case FFI_TYPE_SINT32:
-+	case FFI_TYPE_INT:
-+	case FFI_TYPE_POINTER:
-+	case FFI_TYPE_UINT64:
-+	case FFI_TYPE_SINT64:
-+	case  FFI_TYPE_FLOAT:
-+	case  FFI_TYPE_DOUBLE:
-+	case  FFI_TYPE_LONGDOUBLE:
-+	  avalue[i] = allocate_to_register_or_stack (context, stack,
-+						     &state, ty->type);
-+	  break;
-+
-+	case FFI_TYPE_STRUCT:
-+	  if (is_hfa (ty))
-+	    {
-+	      unsigned n = element_count (ty);
-+	      if (available_v (&state) < n)
-+		{
-+		  state.nsrn = N_V_ARG_REG;
-+		  avalue[i] = allocate_to_stack (&state, stack, ty->alignment,
-+						 ty->size);
-+		}
-+	      else
-+		{
-+		  switch (get_homogeneous_type (ty))
-+		    {
-+		    case FFI_TYPE_FLOAT:
-+		      {
-+			/* Eeek! We need a pointer to the structure,
-+			   however the homogeneous float elements are
-+			   being passed in individual S registers,
-+			   therefore the structure is not represented as
-+			   a contiguous sequence of bytes in our saved
-+			   register context. We need to fake up a copy
-+			   of the structure layed out in memory
-+			   correctly. The fake can be tossed once the
-+			   closure function has returned hence alloca()
-+			   is sufficient. */
-+			int j;
-+			UINT32 *p = avalue[i] = alloca (ty->size);
-+			for (j = 0; j < element_count (ty); j++)
-+			  memcpy (&p[j],
-+				  allocate_to_s (context, &state),
-+				  sizeof (*p));
-+			break;
-+		      }
-+
-+		    case FFI_TYPE_DOUBLE:
-+		      {
-+			/* Eeek! We need a pointer to the structure,
-+			   however the homogeneous float elements are
-+			   being passed in individual S registers,
-+			   therefore the structure is not represented as
-+			   a contiguous sequence of bytes in our saved
-+			   register context. We need to fake up a copy
-+			   of the structure layed out in memory
-+			   correctly. The fake can be tossed once the
-+			   closure function has returned hence alloca()
-+			   is sufficient. */
-+			int j;
-+			UINT64 *p = avalue[i] = alloca (ty->size);
-+			for (j = 0; j < element_count (ty); j++)
-+			  memcpy (&p[j],
-+				  allocate_to_d (context, &state),
-+				  sizeof (*p));
-+			break;
-+		      }
-+
-+		    case FFI_TYPE_LONGDOUBLE:
-+			  memcpy (&avalue[i],
-+				  allocate_to_v (context, &state),
-+				  sizeof (*avalue));
-+		      break;
-+
-+		    default:
-+		      FFI_ASSERT (0);
-+		      break;
-+		    }
-+		}
-+	    }
-+	  else if (ty->size > 16)
-+	    {
-+	      /* Replace Composite type of size greater than 16 with a
-+		 pointer.  */
-+	      memcpy (&avalue[i],
-+		      allocate_to_register_or_stack (context, stack,
-+						     &state, FFI_TYPE_POINTER),
-+		      sizeof (avalue[i]));
-+	    }
-+	  else if (available_x (&state) >= (ty->size + 7) / 8)
-+	    {
-+	      avalue[i] = get_x_addr (context, state.ngrn);
-+	      state.ngrn += (ty->size + 7) / 8;
-+	    }
-+	  else
-+	    {
-+	      state.ngrn = N_X_ARG_REG;
-+
-+	      avalue[i] = allocate_to_stack (&state, stack, ty->alignment,
-+					     ty->size);
-+	    }
-+	  break;
-+
-+	default:
-+	  FFI_ASSERT (0);
-+	  break;
-+	}
-+    }
-+
-+  /* Figure out where the return value will be passed, either in
-+     registers or in a memory block allocated by the caller and passed
-+     in x8.  */
-+
-+  if (is_register_candidate (cif->rtype))
-+    {
-+      /* Register candidates are *always* returned in registers. */
-+
-+      /* Allocate a scratchpad for the return value, we will let the
-+         callee scrible the result into the scratch pad then move the
-+         contents into the appropriate return value location for the
-+         call convention.  */
-+      rvalue = alloca (cif->rtype->size);
-+      (closure->fun) (cif, rvalue, avalue, closure->user_data);
-+
-+      /* Copy the return value into the call context so that it is returned
-+         as expected to our caller.  */
-+      switch (cif->rtype->type)
-+        {
-+        case FFI_TYPE_VOID:
-+          break;
-+
-+        case FFI_TYPE_UINT8:
-+        case FFI_TYPE_UINT16:
-+        case FFI_TYPE_UINT32:
-+        case FFI_TYPE_POINTER:
-+        case FFI_TYPE_UINT64:
-+        case FFI_TYPE_SINT8:
-+        case FFI_TYPE_SINT16:
-+        case FFI_TYPE_INT:
-+        case FFI_TYPE_SINT32:
-+        case FFI_TYPE_SINT64:
-+        case FFI_TYPE_FLOAT:
-+        case FFI_TYPE_DOUBLE:
-+        case FFI_TYPE_LONGDOUBLE:
-+	  {
-+	    void *addr = get_basic_type_addr (cif->rtype->type, context, 0);
-+	    copy_basic_type (addr, rvalue, cif->rtype->type);
-+            break;
-+	  }
-+        case FFI_TYPE_STRUCT:
-+          if (is_hfa (cif->rtype))
-+	    {
-+	      int i;
-+	      unsigned short type = get_homogeneous_type (cif->rtype);
-+	      unsigned elems = element_count (cif->rtype);
-+	      for (i = 0; i < elems; i++)
-+		{
-+		  void *reg = get_basic_type_addr (type, context, i);
-+		  copy_basic_type (reg, rvalue, type);
-+		  rvalue += get_basic_type_size (type);
-+		}
-+	    }
-+          else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG)
-+            {
-+              unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64)) ;
-+              memcpy (get_x_addr (context, 0), rvalue, size);
-+            }
-+          else
-+            {
-+              FFI_ASSERT (0);
-+            }
-+          break;
-+        default:
-+          FFI_ASSERT (0);
-+          break;
-+        }
-+    }
-+  else
-+    {
-+      memcpy (&rvalue, get_x_addr (context, 8), sizeof (UINT64));
-+      (closure->fun) (cif, rvalue, avalue, closure->user_data);
-+    }
-+}
-+
-diff --git a/src/aarch64/ffitarget.h b/src/aarch64/ffitarget.h
-new file mode 100644
-index 0000000..6f1a348
---- /dev/null
-+++ b/src/aarch64/ffitarget.h
-@@ -0,0 +1,59 @@
-+/* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+``Software''), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#ifndef LIBFFI_TARGET_H
-+#define LIBFFI_TARGET_H
-+
-+#ifndef LIBFFI_H
-+#error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
-+#endif
-+
-+#ifndef LIBFFI_ASM
-+typedef unsigned long ffi_arg;
-+typedef signed long ffi_sarg;
-+
-+typedef enum ffi_abi
-+  {
-+    FFI_FIRST_ABI = 0,
-+    FFI_SYSV,
-+    FFI_LAST_ABI,
-+    FFI_DEFAULT_ABI = FFI_SYSV
-+  } ffi_abi;
-+#endif
-+
-+/* ---- Definitions for closures ----------------------------------------- */
-+
-+#define FFI_CLOSURES 1
-+#define FFI_TRAMPOLINE_SIZE 36
-+#define FFI_NATIVE_RAW_API 0
-+
-+/* ---- Internal ---- */
-+
-+
-+#define FFI_EXTRA_CIF_FIELDS unsigned aarch64_flags
-+
-+#define AARCH64_FFI_WITH_V_BIT 0
-+
-+#define AARCH64_N_XREG 32
-+#define AARCH64_N_VREG 32
-+#define AARCH64_CALL_CONTEXT_SIZE (AARCH64_N_XREG * 8 + AARCH64_N_VREG * 16)
-+
-+#endif
-diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
-new file mode 100644
-index 0000000..b8cd421
---- /dev/null
-+++ b/src/aarch64/sysv.S
-@@ -0,0 +1,307 @@
-+/* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+``Software''), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#define LIBFFI_ASM
-+#include <fficonfig.h>
-+#include <ffi.h>
-+
-+#define cfi_adjust_cfa_offset(off)	.cfi_adjust_cfa_offset off
-+#define cfi_rel_offset(reg, off)	.cfi_rel_offset reg, off
-+#define cfi_restore(reg)		.cfi_restore reg
-+#define cfi_def_cfa_register(reg)	.cfi_def_cfa_register reg
-+
-+        .text
-+        .globl ffi_call_SYSV
-+        .type ffi_call_SYSV, #function
-+
-+/* ffi_call_SYSV()
-+
-+   Create a stack frame, setup an argument context, call the callee
-+   and extract the result.
-+
-+   The maximum required argument stack size is provided,
-+   ffi_call_SYSV() allocates that stack space then calls the
-+   prepare_fn to populate register context and stack.  The
-+   argument passing registers are loaded from the register
-+   context and the callee called, on return the register passing
-+   register are saved back to the context.  Our caller will
-+   extract the return value from the final state of the saved
-+   register context.
-+
-+   Prototype:
-+
-+   extern unsigned
-+   ffi_call_SYSV (void (*)(struct call_context *context, unsigned char *,
-+			   extended_cif *),
-+                  struct call_context *context,
-+                  extended_cif *,
-+                  unsigned required_stack_size,
-+                  void (*fn)(void));
-+
-+   Therefore on entry we have:
-+
-+   x0 prepare_fn
-+   x1 &context
-+   x2 &ecif
-+   x3 bytes
-+   x4 fn
-+
-+   This function uses the following stack frame layout:
-+
-+   ==
-+                saved x30(lr)
-+   x29(fp)->    saved x29(fp)
-+                saved x24
-+                saved x23
-+                saved x22
-+   sp'    ->    saved x21
-+                ...
-+   sp     ->    (constructed callee stack arguments)
-+   ==
-+
-+   Voila! */
-+
-+#define ffi_call_SYSV_FS (8 * 4)
-+
-+        .cfi_startproc
-+ffi_call_SYSV:
-+        stp     x29, x30, [sp, #-16]!
-+	cfi_adjust_cfa_offset (16)
-+        cfi_rel_offset (x29, 0)
-+        cfi_rel_offset (x30, 8)
-+
-+        mov     x29, sp
-+	cfi_def_cfa_register (x29)
-+        sub     sp, sp, #ffi_call_SYSV_FS
-+
-+        stp     x21, x22, [sp, 0]
-+        cfi_rel_offset (x21, 0 - ffi_call_SYSV_FS)
-+        cfi_rel_offset (x22, 8 - ffi_call_SYSV_FS)
-+
-+        stp     x23, x24, [sp, 16]
-+        cfi_rel_offset (x23, 16 - ffi_call_SYSV_FS)
-+        cfi_rel_offset (x24, 24 - ffi_call_SYSV_FS)
-+
-+        mov     x21, x1
-+        mov     x22, x2
-+        mov     x24, x4
-+
-+        /* Allocate the stack space for the actual arguments, many
-+           arguments will be passed in registers, but we assume
-+           worst case and allocate sufficient stack for ALL of
-+           the arguments.  */
-+        sub     sp, sp, x3
-+
-+        /* unsigned (*prepare_fn) (struct call_context *context,
-+				   unsigned char *stack, extended_cif *ecif);
-+	 */
-+        mov     x23, x0
-+        mov     x0, x1
-+        mov     x1, sp
-+        /* x2 already in place */
-+        blr     x23
-+
-+        /* Preserve the flags returned.  */
-+        mov     x23, x0
-+
-+        /* Figure out if we should touch the vector registers.  */
-+        tbz     x23, #AARCH64_FFI_WITH_V_BIT, 1f
-+
-+        /* Load the vector argument passing registers.  */
-+        ldp     q0, q1, [x21, #8*32 +  0]
-+        ldp     q2, q3, [x21, #8*32 + 32]
-+        ldp     q4, q5, [x21, #8*32 + 64]
-+        ldp     q6, q7, [x21, #8*32 + 96]
-+1:
-+        /* Load the core argument passing registers.  */
-+        ldp     x0, x1, [x21,  #0]
-+        ldp     x2, x3, [x21, #16]
-+        ldp     x4, x5, [x21, #32]
-+        ldp     x6, x7, [x21, #48]
-+
-+        /* Don't forget x8 which may be holding the address of a return buffer.
-+	 */
-+        ldr     x8,     [x21, #8*8]
-+
-+        blr     x24
-+
-+        /* Save the core argument passing registers.  */
-+        stp     x0, x1, [x21,  #0]
-+        stp     x2, x3, [x21, #16]
-+        stp     x4, x5, [x21, #32]
-+        stp     x6, x7, [x21, #48]
-+
-+        /* Note nothing useful ever comes back in x8!  */
-+
-+        /* Figure out if we should touch the vector registers.  */
-+        tbz     x23, #AARCH64_FFI_WITH_V_BIT, 1f
-+
-+        /* Save the vector argument passing registers.  */
-+        stp     q0, q1, [x21, #8*32 + 0]
-+        stp     q2, q3, [x21, #8*32 + 32]
-+        stp     q4, q5, [x21, #8*32 + 64]
-+        stp     q6, q7, [x21, #8*32 + 96]
-+1:
-+        /* All done, unwind our stack frame.  */
-+        ldp     x21, x22, [x29,  # - ffi_call_SYSV_FS]
-+        cfi_restore (x21)
-+        cfi_restore (x22)
-+
-+        ldp     x23, x24, [x29,  # - ffi_call_SYSV_FS + 16]
-+        cfi_restore (x23)
-+        cfi_restore (x24)
-+
-+        mov     sp, x29
-+	cfi_def_cfa_register (sp)
-+
-+        ldp     x29, x30, [sp], #16
-+	cfi_adjust_cfa_offset (-16)
-+        cfi_restore (x29)
-+        cfi_restore (x30)
-+
-+        ret
-+
-+        .cfi_endproc
-+        .size ffi_call_SYSV, .-ffi_call_SYSV
-+
-+#define ffi_closure_SYSV_FS (8 * 2 + AARCH64_CALL_CONTEXT_SIZE)
-+
-+/* ffi_closure_SYSV
-+
-+   Closure invocation glue. This is the low level code invoked directly by
-+   the closure trampoline to setup and call a closure.
-+
-+   On entry x17 points to a struct trampoline_data, x16 has been clobbered
-+   all other registers are preserved.
-+
-+   We allocate a call context and save the argument passing registers,
-+   then invoked the generic C ffi_closure_SYSV_inner() function to do all
-+   the real work, on return we load the result passing registers back from
-+   the call context.
-+
-+   On entry
-+
-+   extern void
-+   ffi_closure_SYSV (struct trampoline_data *);
-+
-+   struct trampoline_data
-+   {
-+        UINT64 *ffi_closure;
-+        UINT64 flags;
-+   };
-+
-+   This function uses the following stack frame layout:
-+
-+   ==
-+                saved x30(lr)
-+   x29(fp)->    saved x29(fp)
-+                saved x22
-+                saved x21
-+                ...
-+   sp     ->    call_context
-+   ==
-+
-+   Voila!  */
-+
-+        .text
-+        .globl ffi_closure_SYSV
-+        .cfi_startproc
-+ffi_closure_SYSV:
-+        stp     x29, x30, [sp, #-16]!
-+	cfi_adjust_cfa_offset (16)
-+        cfi_rel_offset (x29, 0)
-+        cfi_rel_offset (x30, 8)
-+
-+        mov     x29, sp
-+
-+        sub     sp, sp, #ffi_closure_SYSV_FS
-+	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
-+
-+        stp     x21, x22, [x29, #-16]
-+        cfi_rel_offset (x21, 0)
-+        cfi_rel_offset (x22, 8)
-+
-+        /* Load x21 with &call_context.  */
-+        mov     x21, sp
-+        /* Preserve our struct trampoline_data *  */
-+        mov     x22, x17
-+
-+        /* Save the rest of the argument passing registers.  */
-+        stp     x0, x1, [x21, #0]
-+        stp     x2, x3, [x21, #16]
-+        stp     x4, x5, [x21, #32]
-+        stp     x6, x7, [x21, #48]
-+        /* Don't forget we may have been given a result scratch pad address.
-+	 */
-+        str     x8,     [x21, #64]
-+
-+        /* Figure out if we should touch the vector registers.  */
-+        ldr     x0, [x22, #8]
-+        tbz     x0, #AARCH64_FFI_WITH_V_BIT, 1f
-+
-+        /* Save the argument passing vector registers.  */
-+        stp     q0, q1, [x21, #8*32 + 0]
-+        stp     q2, q3, [x21, #8*32 + 32]
-+        stp     q4, q5, [x21, #8*32 + 64]
-+        stp     q6, q7, [x21, #8*32 + 96]
-+1:
-+        /* Load &ffi_closure..  */
-+        ldr     x0, [x22, #0]
-+        mov     x1, x21
-+        /* Compute the location of the stack at the point that the
-+           trampoline was called.  */
-+        add     x2, x29, #16
-+
-+        bl      ffi_closure_SYSV_inner
-+
-+        /* Figure out if we should touch the vector registers.  */
-+        ldr     x0, [x22, #8]
-+        tbz     x0, #AARCH64_FFI_WITH_V_BIT, 1f
-+
-+        /* Load the result passing vector registers.  */
-+        ldp     q0, q1, [x21, #8*32 + 0]
-+        ldp     q2, q3, [x21, #8*32 + 32]
-+        ldp     q4, q5, [x21, #8*32 + 64]
-+        ldp     q6, q7, [x21, #8*32 + 96]
-+1:
-+        /* Load the result passing core registers.  */
-+        ldp     x0, x1, [x21,  #0]
-+        ldp     x2, x3, [x21, #16]
-+        ldp     x4, x5, [x21, #32]
-+        ldp     x6, x7, [x21, #48]
-+        /* Note nothing usefull is returned in x8.  */
-+
-+        /* We are done, unwind our frame.  */
-+        ldp     x21, x22, [x29,  #-16]
-+        cfi_restore (x21)
-+        cfi_restore (x22)
-+
-+        mov     sp, x29
-+	cfi_adjust_cfa_offset (-ffi_closure_SYSV_FS)
-+
-+        ldp     x29, x30, [sp], #16
-+	cfi_adjust_cfa_offset (-16)
-+        cfi_restore (x29)
-+        cfi_restore (x30)
-+
-+        ret
-+        .cfi_endproc
-+        .size ffi_closure_SYSV, .-ffi_closure_SYSV
-diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
-index 4a65ed1..8ee3f15 100644
---- a/testsuite/lib/libffi.exp
-+++ b/testsuite/lib/libffi.exp
-@@ -203,6 +203,10 @@ proc libffi_target_compile { source dest type options } {
- 
-     lappend options "libs= -lffi"
- 
-+    if { [string match "aarch64*-*-linux*" $target_triplet] } {
-+	lappend options "libs= -lpthread"
-+    }
-+
-     verbose "options: $options"
-     return [target_compile $source $dest $type $options]
- }
--- 
-1.7.9.5
-
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 64b3eb4120..9fb86d71cb 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -4,12 +4,17 @@
 #
 #############################################################
 
-LIBFFI_VERSION = 3.0.11
-LIBFFI_SITE    = ftp://sources.redhat.com/pub/libffi/
+LIBFFI_VERSION = bcc0c28001b6d427d5cd8037d2e3c892babc6b4c
+LIBFFI_SITE    = http://github.com/atgreen/libffi/tarball/$(LIBFFI_VERSION)
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE
 LIBFFI_INSTALL_STAGING = YES
 
+# We're using a version from Git which strangely bundles a generated
+# configure script, but it's broken (doesn't generate the libffi.pc
+# file).
+LIBFFI_AUTORECONF = YES
+
 # Newer CS MIPS toolchains use a different (compact) eh_frame format
 # libffi don't like them, just switch to the older format
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209)$(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
@@ -17,9 +22,11 @@ LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
 endif
 
 # Move the headers to the usual location, and adjust the .pc file
-# accordingly
+# accordingly. For some reason, the libffi build system forgets to
+# install the .pc file, so we do it manually.
 define LIBFFI_MOVE_STAGING_HEADERS
 	mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/
+	$(INSTALL) -D -m 0644 $(@D)/libffi.pc $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	$(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	$(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
@@ -31,13 +38,23 @@ LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
 define LIBFFI_MOVE_TARGET_HEADERS
 	install -d $(TARGET_DIR)/usr/include/
 	mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/
-	$(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
-	$(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
 endef
 
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
+# We're using a version from Git which strangely bundles a generated
+# configure script, but it's broken (doesn't generate the libffi.pc
+# file).
+HOST_LIBFFI_AUTORECONF = YES
+
+# For some reason, the libffi build system forgets to install the .pc
+# file, so we do it manually.
+define HOST_LIBFFI_INSTALL_PC_FILE
+	$(INSTALL) -D $(@D)/libffi.pc $(HOST_DIR)/usr/lib/pkgconfig/libffi.pc
+endef
+
+HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_INSTALL_PC_FILE
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-

From ae27c455682480af4c2e1c23f21ca3fc450b130b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 12:06:53 -0300
Subject: [PATCH 4155/6849] openssl: security bump to version 1.0.1d

Fixes CVE-2013-0169, CVE-2012-2686 and CVE-2013-0166.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index ed52577408..b4a3674626 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.1c
+OPENSSL_VERSION = 1.0.1d
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_LICENSE = OpenSSL or SSLeay
 OPENSSL_LICENSE_FILES = LICENSE

From 8ccef3b3e6428aaa11a63ade4bffb4ae49c4ed2a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 19:28:09 +0100
Subject: [PATCH 4156/6849] CHANGES: ARMv8 64bit arch is called AArch64

Thanks to Thomas for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 316f866104..e8247622e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
 
 	Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target
 	libraries install fixed. Add Linaro ARM
-	2012.11/2012.12/2013.01, Aarch64 12.11/12.12/13.01. Sourcery
+	2012.11/2012.12/2013.01, AArch64 12.11/12.12/13.01. Sourcery
 	CodeBench MIPS 2012.03/09. Infrastructure to warn about
 	missing 32bit support for binary toolchains. Add GDB 7.5.1 /
 	Remove 6.8 / 7.0 / 7.1.

From a91a5c160811cfa874ab39ffce4f49cea80ec7d3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 5 Feb 2013 05:34:32 +0000
Subject: [PATCH 4157/6849] Legacy: make the menu a normal menu.

The help text is moved to comments.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 906c038298..70958c3fbd 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -29,20 +29,17 @@ config BR2_LEGACY
 comment "Legacy detected: check the content of the menu below"
 	depends on BR2_LEGACY
 
-# This option should get a new name with every buildroot release, so it defaults
-# to y again for people who upgrade.
-menuconfig BR2_LEGACY_CHECK_2012_11
-	bool "Check for legacy config options"
-	default y
-	help
-	  Select this option to see the config options that are present in your
-	  current .config but are no longer supported by buildroot. If any of
-	  the options in this menu is selected, they should be replaced with
-	  something else. As long as they stay selected, the build will fail.
-	  Just de-select this option to automatically remove all the legacy
-	  configuration.
+menu "Legacy config options"
+
+if BR2_LEGACY
+comment "Your old configuration uses legacy options that no  "
+comment "longer exist in buildroot.                          "
+comment "Please look at the options which have been selected "
+comment "and read their help text.                           "
+comment "As long as these options stay selected, the build   "
+comment "will fail.                                          "
+endif
 
-if BR2_LEGACY_CHECK_2012_11
 
 #
 # Legacy options from 2012.08
@@ -94,4 +91,4 @@ config BR2_PACKAGE_XSERVER_tinyx
 	  The option has been renamed
 	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
 
-endif
+endmenu

From 2cd9121c77d9f052c3e047bd18b319cbda6f54bf Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 5 Feb 2013 05:34:33 +0000
Subject: [PATCH 4158/6849] Legacy: order the options reverse-chronologically.

This makes sure that the most interesting ones are at the top.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 55 ++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 70958c3fbd..90a7b67bae 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -42,7 +42,36 @@ endif
 
 
 #
-# Legacy options from 2012.08
+# Legacy options since 2012.11
+#
+
+config BR2_PACKAGE_XSERVER_xorg
+	bool "X.org modular server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
+
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "KDrive / TinyX server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
+
+config BR2_PACKAGE_PTHREAD_STUBS
+	bool "pthread-stubs option has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+	help
+	  For consistency reason, the pthread-stubs package has been
+	  renamed to xlib_libpthread-stubs.
+
+
+#
+# Legacy options since 2012.08
 #
 
 config BR2_PACKAGE_GETTEXT_STATIC
@@ -67,28 +96,4 @@ config BR2_PACKAGE_INPUT_TOOLS_EVTEST
 	help
 	  The evtest program from input-tools is now a separate package.
 
-config BR2_PACKAGE_PTHREAD_STUBS
-	bool "pthread-stubs option has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-	help
-	  For consistency reason, the pthread-stubs package has been
-	  renamed to xlib_libpthread-stubs.
-
-config BR2_PACKAGE_XSERVER_xorg
-	bool "X.org modular server"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
-
-config BR2_PACKAGE_XSERVER_tinyx
-	bool "KDrive / TinyX server"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
-
 endmenu

From a0ad75a1255a742b4e4c95e7becf56b20dfecda3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 5 Feb 2013 07:15:59 +0000
Subject: [PATCH 4159/6849] manual: add section about storing the
 configuration.

Reuse part of board-support.txt, and remove that one because it
was unused.

[Peter: minor tweaks to text]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt |   1 +
 docs/manual/board-support.txt             |  38 -----
 docs/manual/customize-store.txt           | 160 ++++++++++++++++++++++
 docs/manual/customize.txt                 |   2 +
 4 files changed, 163 insertions(+), 38 deletions(-)
 delete mode 100644 docs/manual/board-support.txt
 create mode 100644 docs/manual/customize-store.txt

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 5d17aace99..cc68497108 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -168,6 +168,7 @@ coding style].
 
 The +.mk+ file
 ~~~~~~~~~~~~~~
+[[adding-packages-mk]]
 
 Finally, here's the hardest part. Create a file named +libfoo.mk+. It
 describes how the package should be downloaded, configured, built,
diff --git a/docs/manual/board-support.txt b/docs/manual/board-support.txt
deleted file mode 100644
index 44ab6eb645..0000000000
--- a/docs/manual/board-support.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- mode:doc -*- ;
-
-[[board-support]]
-Creating your own board support
--------------------------------
-
-Creating your own board support in Buildroot allows users of a
-particular hardware platform to easily build a system that is known to
-work.
-
-To do so, you need to create a normal Buildroot configuration that
-builds a basic system for the hardware: toolchain, kernel, bootloader,
-filesystem and a simple Busybox-only userspace. No specific package
-should be selected: the configuration should be as minimal as
-possible, and should only build a working basic Busybox system for the
-target platform. You can of course use more complicated configurations
-for your internal projects, but the Buildroot project will only
-integrate basic board configurations. This is because package
-selections are highly application-specific.
-
-Once you have a known working configuration, run +make
-savedefconfig+. This will generate a minimal +defconfig+ file at the
-root of the Buildroot source tree. Move this file into the +configs/+
-directory, and rename it +BOARDNAME_defconfig+.
-
-It is recommended to use upstream versions of the Linux kernel and
-bootloaders where possible, and also to use default kernel and bootloader
-configurations if possible. If the defaults are incorrect for
-your board, or no default exists, we encourage you to send fixes to the
-corresponding upstream projects.
-
-However, in the mean time, you may want to store kernel or bootloader
-configuration or patches specific to your target platform. To do so,
-create a directory +board/MANUFACTURER+ and a subdirectory
-+board/MANUFACTURER/BOARDNAME+ (after replacing, of course,
-MANUFACTURER and BOARDNAME with the appropriate values, in lower case
-letters). You can then store your patches and configurations in these
-directories, and reference them from the main Buildroot configuration.
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
new file mode 100644
index 0000000000..b6e3d08132
--- /dev/null
+++ b/docs/manual/customize-store.txt
@@ -0,0 +1,160 @@
+// -*- mode:doc -*-
+
+[[customize-store]]
+Storing the configuration
+-------------------------
+
+When you have a buildroot configuration that you are satisfied with and
+you want to share it with others, put it under revision control or move
+on to a different buildroot project, you need to store the configuration
+so it can be rebuilt later. The configuration that needs to be stored
+consists of the buildroot configuration, the configuration files for
+packages that you use (kernel, busybox, uClibc, ...), and your rootfs
+modifications.
+
+Basics for storing the configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[[customize-store-basics]]
+
+Buildroot configuration
+^^^^^^^^^^^^^^^^^^^^^^^
+
+For storing the buildroot configuration itself, buildroot offers the
+following command: +make savedefconfig+
+
+This strips the buildroot configuration down by removing configuration
+options that are at their default value. The result is stored in a file
+called +defconfig+. Copy this file to +foo_defconfig+ in the +configs+
+directory. The configuration can then be rebuilt by running
++make foo_defconfig+
+
+Alternatively, you can copy the file to any other place and rebuild with
++make defconfig BR2_DEFCONFIG=<path-to-defconfig-file>+.
+
+
+Other package configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The configuration files for busybox, the linux kernel, barebox, uClibc and
+crosstool-NG should be stored as well if changed. For each of these, a
+buildroot configuration option exists to point to an input configuration
+file, e.g. +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+.  To save their
+configuration, set those configuration options to a path outside
+your output directory, e.g. +board/<manufacturer>/<boardname>/linux.config+.
+Then, copy the configuration files to that path.
+
+Make sure that you create a configuration file 'before' changing
+the +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ etc. options.  Otherwise,
+buildroot will try to access this config file, which doesn't exist
+yet, and will fail. You can create the configuration file by running
++make linux-menuconfig+ etc.
+
+Buildroot provides a few helper targets to make the saving of
+configuration files easier.
+
+* +make linux-update-defconfig+ saves the linux configuration to the
+  path specified by +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+.  It
+  simplifies the config file by removing default values.  However,
+  this only works with kernels starting from 2.6.33.  For earlier
+  kernels, use +make linux-update-config+.
+* +make busybox-update-config+ saves the busybox configuration to the
+  path specified by +BR2_PACKAGE_BUSYBOX_CONFIG+.
+* +make uclibc-update-config+ saves the uClibc configuration to the
+  path specified by +BR2_UCLIBC_CONFIG+.
+* +make barebox-update-defconfig+ saves the barebox configuration to the
+  path specified by +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+.
+* For crosstool-NG and at91bootstrap3, no helper exists so you
+  have to copy the config file manually to +BR2_TOOLCHAIN_CTNG_CONFIG+,
+  resp. +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+.
+
+
+Creating your own board support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Creating your own board support in Buildroot allows users of a
+particular hardware platform to easily build a system that is known to
+work.
+
+To do so, you need to create a normal Buildroot configuration that
+builds a basic system for the hardware: toolchain, kernel, bootloader,
+filesystem and a simple Busybox-only userspace. No specific package
+should be selected: the configuration should be as minimal as
+possible, and should only build a working basic Busybox system for the
+target platform. You can of course use more complicated configurations
+for your internal projects, but the Buildroot project will only
+integrate basic board configurations. This is because package
+selections are highly application-specific.
+
+Once you have a known working configuration, run +make
+savedefconfig+. This will generate a minimal +defconfig+ file at the
+root of the Buildroot source tree. Move this file into the +configs/+
+directory, and rename it +<boardname>_defconfig+.
+
+It is recommended to use as much as possible upstream versions of the
+Linux kernel and bootloaders, and to use as much as possible default
+kernel and bootloader configurations. If they are incorrect for your
+board, or no default exists, we encourage you to send fixes to the
+corresponding upstream projects.
+
+However, in the mean time, you may want to store kernel or bootloader
+configuration or patches specific to your target platform. To do so,
+create a directory +board/<manufacturer>+ and a subdirectory
++board/<manufacturer>/<boardname>+. You can then store your patches
+and configurations in these directories, and reference them from the main
+Buildroot configuration.
+
+
+Step-by-step instructions for storing configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To store the configuration for a specific product, device or
+application, it is advisable to use the same conventions as for the
+board support: put the buildroot defconfig in the +configs+ directory,
+and any other files in a subdirectory of the +boards+ directory.  This
+section gives step-by-step instructions about how to do that. Of course,
+you can skip the steps that are not relevant for your use case.
+
+1. +make menuconfig+ to configure toolchain, packages and kernel.
+1. +make linux-menuconfig+ to update the kernel config, similar for
+   other configuration.
+1. +mkdir -p board/<manufacturer>/<boardname>+
+1. Set the following options to +board/<manufacturer>/<boardname>/<package>.config+
+   (as far as they are relevant):
+   * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+
+   * +BR2_PACKAGE_BUSYBOX_CONFIG+
+   * +BR2_TOOLCHAIN_CTNG_CONFIG+
+   * +BR2_UCLIBC_CONFIG+
+   * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+
+   * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+
+1. Write the configuration files:
+   * +make linux-update-defconfig+
+   * +make busybox-update-config+
+   * +cp <output>/build/build-toolchain/.config board/<manufacturer>/<boardname>/ctng.config+
+   * +make uclibc-update-config+
+   * +cp <output>/build/at91bootstrap3-*/.config board/<manufacturer>/<boardname>/at91bootstrap3.config+
+   * +make barebox-update-defconfig+
+1. Create +board/<manufacturer>/<boardname>/fs-overlay/+ and fill it
+   with additional files you need on your rootfs, e.g.
+   +board/<manufacturer>/<boardname>/fs-overlay/etc/inittab+.
+1. Create a post-build script
+   +board/<manufacturer>/<boardname>/post-build.sh+.  It should contain
+   the following command:
++
+------------
+rsync -a --exclude .empty --exclude '*~' ${0%/*}/fs-overlay $1
+------------
++
+1. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board/<manufacturer>/<boardname>/post-build.sh+
+1. If additional setuid permissions have to be set or device nodes have
+   to be created, create +board/<manufacturer>/<boardname>/device_table.txt+
+   and add that path to +BR2_ROOTFS_DEVICE_TABLE+.
+1. +make savedefconfig+ to save the buildroot configuration.
+1. +cp defconfig configs/<boardname>_defconfig+
+1. To add patches to the linux build, set +BR2_LINUX_KERNEL_PATCH+ to
+   +board/<manufacturer>/<boardname>/patches/linux/+ and add your
+   patches in that directory. Each patch should be called
+   +linux-<num>-<description>.patch+. Similar for U-Boot, barebox,
+   at91bootstrap and at91bootstrap3.
+1. If you need modifications to other packages, or if you need to add
+   packages, do that directly in the +packages/+ directory, following the
+   instructions in xref:adding-packages[].
diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt
index 1e6f4e85ac..a13ba8f3e6 100644
--- a/docs/manual/customize.txt
+++ b/docs/manual/customize.txt
@@ -12,3 +12,5 @@ include::customize-uclibc-config.txt[]
 include::customize-kernel-config.txt[]
 
 include::customize-toolchain.txt[]
+
+include::customize-store.txt[]

From 7f86089292e4fa7e6a7b1907611bd007153f452a Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 5 Feb 2013 07:16:00 +0000
Subject: [PATCH 4160/6849] target/generic: add filesystem overlay option

The filesystem overlay is a tree that is copied over the target fs
after building everything - which is currently usually done in the
post-build script.

[Peter: don't ignore missing directories]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                         |  7 +++++++
 docs/manual/customize-rootfs.txt | 17 +++++++++++------
 docs/manual/customize-store.txt  | 13 +++++--------
 system/Config.in                 | 11 +++++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 6f8ed0e296..98db8b1eed 100644
--- a/Makefile
+++ b/Makefile
@@ -501,6 +501,13 @@ endif
 		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
 	) >  $(TARGET_DIR)/etc/os-release
 
+	@for dir in $(call qstrip,$(BR2_ROOTFS_OVERLAY)); do \
+		$(call MESSAGE,"Copying overlay $${dir}"); \
+		rsync -a \
+			--exclude .svn --exclude .git --exclude .hg --exclude '*~' \
+			$${dir}/ $(TARGET_DIR); \
+	done
+
 ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
 	@$(call MESSAGE,"Executing post-build script\(s\)")
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 6399699bdc..fa04d85e25 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -24,6 +24,12 @@ there are a few ways to customize the resulting target filesystem.
   skeleton are copied to output/target before any package
   installation.
 
+* Create a filesystem overlay: a tree of files that are copied directly
+  over the target filesystem after it has been built.  Set
+  +BR2_ROOTFS_OVERLAY+ to the top of the tree.  +.git+, +.svn+,
+  +.hg+ directories and files ending with +~+ are excluded.
+  _Among these first 3 methods, this one should be preferred_.
+
 * In the Buildroot configuration, you can specify the path to a
   *post-build script*, that gets called 'after' Buildroot builds all the
   selected software, but 'before' the rootfs packages are
@@ -31,12 +37,11 @@ there are a few ways to customize the resulting target filesystem.
   specify the location of your post-build script. This option can be
   found in the +System configuration+ menu. The destination root
   filesystem folder is given as the first argument to this script,
-  and this script can then be used to copy programs, static data or
-  any other needed file to your target filesystem. You should,
-  however, use this feature with care. Whenever you find that a
-  certain package generates wrong or unneeded files, you should fix
-  that package rather than work around it with a post-build cleanup
-  script. _Among these first 3 methods, this one should be preferred_.
+  and this script can then be used to remove or modify any file in your
+  target filesystem. You should, however, use this feature with care.
+  Whenever you find that a certain package generates wrong or unneeded
+  files, you should fix that package rather than work around it with a
+  post-build cleanup script.
   You may also use these variables in your post-build script:
     - +BUILDROOT_CONFIG+: the path to the Buildroot .config file
     - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
index b6e3d08132..298b5e96a4 100644
--- a/docs/manual/customize-store.txt
+++ b/docs/manual/customize-store.txt
@@ -136,15 +136,12 @@ you can skip the steps that are not relevant for your use case.
 1. Create +board/<manufacturer>/<boardname>/fs-overlay/+ and fill it
    with additional files you need on your rootfs, e.g.
    +board/<manufacturer>/<boardname>/fs-overlay/etc/inittab+.
+   Set +BR2_ROOTFS_OVERLAY+
+   to +board/<manufacturer>/<boardname>/fs-overlay+.
 1. Create a post-build script
-   +board/<manufacturer>/<boardname>/post-build.sh+.  It should contain
-   the following command:
-+
-------------
-rsync -a --exclude .empty --exclude '*~' ${0%/*}/fs-overlay $1
-------------
-+
-1. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board/<manufacturer>/<boardname>/post-build.sh+
+   +board/<manufacturer>/<boardname>/post-build.sh+.  Set
+   +BR2_ROOTFS_POST_BUILD_SCRIPT+ to
+   +board/<manufacturer>/<boardname>/post-build.sh+
 1. If additional setuid permissions have to be set or device nodes have
    to be created, create +board/<manufacturer>/<boardname>/device_table.txt+
    and add that path to +BR2_ROOTFS_DEVICE_TABLE+.
diff --git a/system/Config.in b/system/Config.in
index 69863c42b6..fa01d914be 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -249,6 +249,17 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
 
 endif # BR2_ROOTFS_SKELETON_DEFAULT
 
+config BR2_ROOTFS_OVERLAY
+	string "Root filesystem overlay directories"
+	default ""
+	help
+	  Specify a list of directories that are copied over the target
+	  root filesystem after the build has finished and before it is
+	  packed into the selected filesystem images.
+
+	  They are copied as-is into the rootfs, excluding files ending with
+	  ~ and .git, .svn and .hg directories.
+
 config BR2_ROOTFS_POST_BUILD_SCRIPT
 	string "Custom script to run before creating filesystem images"
 	default ""

From f026d3642d9ea3bcbc85f2f1ab302a3e35eaa0de Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 5 Feb 2013 07:16:01 +0000
Subject: [PATCH 4161/6849] busybox: busybox-update-config should depend on
 busybox-configure

Before the config file can be copied, it has to exist.  The
other xxx-update-config targets do this as well.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 9154c08925..599e145538 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -223,5 +223,5 @@ busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
 	rm -f $(BUSYBOX_DIR)/.stamp_built
 	rm -f $(BUSYBOX_DIR)/.stamp_target_installed
 
-busybox-update-config:
+busybox-update-config: busybox-configure
 	cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE)

From 1ed4996346c6504241c7a2c7541fefc914790219 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 5 Feb 2013 07:16:02 +0000
Subject: [PATCH 4162/6849] Make savedefconfig save to a configured file.

Store BR2_DEFCONFIG in .config, and use it to update the original input
defconfig file after updating the configuration.  When a config is
created by using the BR2_DEFCONFIG=... option, this is saved in the
.config file; later runs of savedefconfig will update that same location.
It is also possible to configure this place in the interactive
configuration.

The BR2_DEFCONFIG value itself is not saved into the generated
defconfig, since Kconfig considers it at its default. This is
intentional, to avoid hard-coding an absolute path in the defconfig.
It will anyway be set again when the defconfig is used with the
'make BR2_DEFCONFIG=... defconfig' command.

As a side-effect of this change, the *config options have been moved out
of the BR2_HAVE_DOT_CONFIG condition.  This doesn't make any functional
difference, because the .config is still not read for the *config targets.
However, the defconfig and savedefconfig targets do need to include
.config now, which makes them slightly slower.

[Peter: slightly tweak help text]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                       | 12 ++++++++++++
 Makefile                        | 17 +++++++++++++----
 docs/manual/customize-store.txt | 10 ++++++----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Config.in b/Config.in
index af77a83cb6..4929a8070e 100644
--- a/Config.in
+++ b/Config.in
@@ -22,6 +22,18 @@ config BR2_HOSTARCH_NEEDS_IA32_LIBS
 
 source "arch/Config.in"
 
+config BR2_DEFCONFIG_FROM_ENV
+	string
+	option env="BR2_DEFCONFIG"
+
+config BR2_DEFCONFIG
+	string "Location to save buildroot config"
+	default BR2_DEFCONFIG_FROM_ENV if BR2_DEFCONFIG_FROM_ENV != ""
+	default "$(CONFIG_DIR)/defconfig"
+	help
+	  When running 'make savedefconfig', the defconfig file will be saved
+	  in this location.
+
 menu "Build options"
 
 menu "Commands"
diff --git a/Makefile b/Makefile
index 98db8b1eed..d9e5f24081 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ DATE:=$(shell date +%Y%m%d)
 export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
 
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
-	defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \
+	%_defconfig allyesconfig allnoconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
 	source-check print-version
 
@@ -592,6 +592,8 @@ else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 all: menuconfig
 
+endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+
 # configuration
 # ---------------------------------------------------------------------------
 
@@ -602,7 +604,12 @@ $(BUILD_DIR)/buildroot-config/%onf:
 	mkdir -p $(@D)/lxdialog
 	$(MAKE) CC="$(HOSTCC_NOCCACHE)" HOSTCC="$(HOSTCC_NOCCACHE)" obj=$(@D) -C $(CONFIG) -f Makefile.br $(@F)
 
+DEFCONFIG = $(call qstrip,$(BR2_DEFCONFIG))
+
+# We don't want to fully expand BR2_DEFCONFIG here, so Kconfig will
+# recognize that if it's still at its default $(CONFIG_DIR)/defconfig
 COMMON_CONFIG_ENV = \
+	BR2_DEFCONFIG='$(call qstrip,$(value BR2_DEFCONFIG))' \
 	KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \
 	KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \
 	KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
@@ -680,7 +687,7 @@ silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(BR2_DEFCONFIG),=$(BR2_DEFCONFIG)) $(CONFIG_CONFIG_IN)
+	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
 
 %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -688,13 +695,15 @@ defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --savedefconfig=$(CONFIG_DIR)/defconfig $(CONFIG_CONFIG_IN)
+	@$(COMMON_CONFIG_ENV) $< \
+		--savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \
+		$(CONFIG_CONFIG_IN)
 
 # check if download URLs are outdated
 source-check:
 	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source
 
-endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+.PHONY: defconfig savedefconfig
 
 #############################################################
 #
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
index 298b5e96a4..63ea82dcf9 100644
--- a/docs/manual/customize-store.txt
+++ b/docs/manual/customize-store.txt
@@ -20,13 +20,15 @@ Buildroot configuration
 ^^^^^^^^^^^^^^^^^^^^^^^
 
 For storing the buildroot configuration itself, buildroot offers the
-following command: +make savedefconfig+
+following command: +make savedefconfig+.
 
 This strips the buildroot configuration down by removing configuration
 options that are at their default value. The result is stored in a file
-called +defconfig+. Copy this file to +foo_defconfig+ in the +configs+
-directory. The configuration can then be rebuilt by running
-+make foo_defconfig+
+called +defconfig+.  If you want to save it in another place, change
+the +BR2_DEFCONFIG+ option, or call make with +make savedefconfig
+BR2_DEFCONFIG=<path-to-defconfig>+.  The usual place is
++configs/<boardname>_defconfig+. The configuration can then be rebuilt by
+running +make <boardname>_defconfig+.
 
 Alternatively, you can copy the file to any other place and rebuild with
 +make defconfig BR2_DEFCONFIG=<path-to-defconfig-file>+.

From 524e1251dcd1be3efb77847a0aad5db6a797a175 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 09:29:50 +0000
Subject: [PATCH 4163/6849] squid: bump to version 3.2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 95c212aca8..7cae0bef2a 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.2.6
+SQUID_VERSION = 3.2.7
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From af3fdf3e7b9ddff419b0834a8b07d6dd0575a637 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 09:29:51 +0000
Subject: [PATCH 4164/6849] dhcp: bump to version 4.1-ESV-R8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/dhcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 8d90ea48cf..34c0afac65 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DHCP_VERSION = 4.1-ESV-R7
+DHCP_VERSION = 4.1-ESV-R8
 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_LICENSE = ISC
 DHCP_LICENSE_FILES = LICENSE

From 8f8e537d4329832fbe6e62e52ecfee8c41673f7d Mon Sep 17 00:00:00 2001
From: Ryan Mallon <rmallon@gmail.com>
Date: Tue, 5 Feb 2013 07:00:05 +0000
Subject: [PATCH 4165/6849] libsndfile: Add dependency on BR2_LARGEFILE

libsndfile requires sizeof(sf_count_t) == 8, where sf_count_t is a
typedef alias for off_t. This is not true by default for all
tool-chains, which leads to a runtime assert failure in binaries
compiled against libsndfile. See:

  http://permalink.gmane.org/gmane.comp.audio.libsndfile.devel/229

Add a dependency on BR2_LARGEFILE for libsndfile, and a comment if
BR2_LARGEFILE is not selected.

[Thomas: rebased patch, added more propagation of the new
BR2_LARGEFILE dependency to gst-plugins-good and mpd.]

Signed-off-by: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bluez_utils/Config.in                 | 4 ++++
 package/libsndfile/Config.in                  | 7 +++++++
 package/multimedia/gst-plugins-bad/Config.in  | 4 ++++
 package/multimedia/gst-plugins-good/Config.in | 1 +
 package/multimedia/mpd/Config.in              | 5 +++++
 package/multimedia/pulseaudio/Config.in       | 5 +++--
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 7ca23fcba8..72b900c38e 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -22,9 +22,13 @@ config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
 	bool "audio support"
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_LIBSNDFILE
+	depends on BR2_LARGEFILE
 	help
 	  Audio support
 
+comment "bluez-utils audio requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_BLUEZ_UTILS_USB
 	bool "USB support"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
diff --git a/package/libsndfile/Config.in b/package/libsndfile/Config.in
index 9afe4966c0..cdba70bad8 100644
--- a/package/libsndfile/Config.in
+++ b/package/libsndfile/Config.in
@@ -1,8 +1,15 @@
 config BR2_PACKAGE_LIBSNDFILE
 	bool "libsndfile"
+	# The absence of largefile doesn't prevent libsndfile to
+	# build, but at runtime the code assumes that off_t is 64
+	# bits, and asserts if not.
+	depends on BR2_LARGEFILE
 	help
 	  Libsndfile is a C library for reading and writing files containing
 	  sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
 	  through one standard library interface.
 
 	  http://www.mega-nerd.com/libsndfile/
+
+comment "libsndfile requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 8cbe021c60..370259bbfa 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -305,6 +305,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE
 	bool "sndfile"
 	select BR2_PACKAGE_LIBSNDFILE
+	depends on BR2_LARGEFILE
+
+comment "gst-plugins-bad-plugin-sndfile requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
 	bool "vcd"
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 1498ed0107..978aa0b328 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -198,6 +198,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
+	depends on BR2_LARGEFILE # pulseaudio -> libsndfile
 	select BR2_PACKAGE_PULSEAUDIO
 	bool "pulseaudio"
 
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 2e447418a9..6e5c6900bb 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -41,6 +41,7 @@ config BR2_PACKAGE_MPD_AUDIOFILE
 config BR2_PACKAGE_MPD_PULSEAUDIO
 	bool "pulseaudio"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
+	depends on BR2_LARGEFILE # pulseaudio -> libsndfile
 	select BR2_PACKAGE_PULSEAUDIO
 	help
 	  Enable pulseaudio output support.
@@ -105,10 +106,14 @@ config BR2_PACKAGE_MPD_LIBSAMPLERATE
 config BR2_PACKAGE_MPD_LIBSNDFILE
 	bool "libsndfile"
 	select BR2_PACKAGE_LIBSNDFILE
+	depends on BR2_LARGEFILE
 	help
 	  Enable libsndfile input/streaming support.
 	  Select this if you want to play back WAV files.
 
+comment "mpd-libsndfile requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_MPD_MAD
 	bool "mad"
 	default y
diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index eeb8b5ab07..03c26137e5 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_PULSEAUDIO
 	select BR2_PACKAGE_LIBSNDFILE
 	select BR2_PACKAGE_SPEEX
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	depends on BR2_LARGEFILE
 	help
 	  PulseAudio is a sound system for POSIX OSes, meaning that it
 	  is a proxy for your sound applications. It allows you to do
@@ -18,5 +19,5 @@ config BR2_PACKAGE_PULSEAUDIO
 
 	  http://pulseaudio.org
 
-comment "pulseaudio requires a toolchain with WCHAR and threads support"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+comment "pulseaudio requires a toolchain with WCHAR, LARGEFILE and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From cd88dae7e667c5ef8ef4c3fa2e5c65568efbf2e5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 23:09:44 +0100
Subject: [PATCH 4166/6849] libvncserver: gnutls support needs gcrypt as well

Fixes http://autobuild.buildroot.org/results/3b479b8cf751cc0c075ab942b56aad36f79ada71

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libvncserver/libvncserver.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index 011b174af3..550abc4738 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -31,7 +31,7 @@ else
 LIBVNCSERVER_CONF_OPT += --without-gcrypt
 endif
 
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
+ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
 LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf
 else
 LIBVNCSERVER_CONF_OPT += --without-gnutls

From 042e0b54f91c71594fd09731d1cc3173b65dad1c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 5 Feb 2013 23:28:51 +0100
Subject: [PATCH 4167/6849] sdl: use default autotools target-install

Fixes http://autobuild.buildroot.org/results/c950d7920d384cb0d37403cbe8344691d4231a1a

The normal 'make install' is perfectly fine, and it also works for static
builds.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 139312f176..4786dc5d75 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -70,8 +70,4 @@ endef
 
 SDL_POST_INSTALL_STAGING_HOOKS+=SDL_FIXUP_SDL_CONFIG
 
-define SDL_INSTALL_TARGET_CMDS
-	cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
-endef
-
 $(eval $(autotools-package))

From 142d65c31b7c47bb9613eb47f6cb219ccb00657c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Feb 2013 09:14:08 +0100
Subject: [PATCH 4168/6849] iftop: needs threads support

Fixes http://autobuild.buildroot.org/results/f2cb6113c360b8dbf63bafe5ae425921babdf636

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iftop/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/iftop/Config.in b/package/iftop/Config.in
index 99ea973f40..5c683160f1 100644
--- a/package/iftop/Config.in
+++ b/package/iftop/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_IFTOP
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBPCAP
 	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  iftop does for network usage what top(1) does for CPU usage.
 	  It listens to network traffic on a named interface and displays
@@ -11,5 +12,5 @@ config BR2_PACKAGE_IFTOP
 
 	  http://www.ex-parrot.com/pdw/iftop/
 
-comment "iftop requires IPv6 support in toolchain"
-	depends on !BR2_INET_IPV6
+comment "iftop requires IPv6 and threads support in toolchain"
+	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS

From b243cbb0f4f84fa12dc8bba632e3c05e568d2786 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Feb 2013 09:19:02 +0100
Subject: [PATCH 4169/6849] libatasmart: move under libraries->hardware
 handling

It is a library, so it should go under libraries.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 2f219b6f2d..85889515c2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -247,7 +247,6 @@ source "package/iostat/Config.in"
 source "package/irda-utils/Config.in"
 source "package/kbd/Config.in"
 source "package/lcdproc/Config.in"
-source "package/libatasmart/Config.in"
 source "package/lm-sensors/Config.in"
 source "package/lshw/Config.in"
 source "package/lsuio/Config.in"
@@ -447,6 +446,7 @@ source "package/ccid/Config.in"
 source "package/imx-lib/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
+source "package/libatasmart/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
 source "package/libfreefare/Config.in"

From 5c4cee35dcf445b0d653fadc597b38849e9d6554 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Feb 2013 14:20:27 +0100
Subject: [PATCH 4170/6849] libatasmart: fix host/build flags confusion with
 strpool

Fixes http://autobuild.buildroot.org/results/3fbdcd1db0272232231a2a5546925ef30e93bf9a

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libatasmart-strpool-cross-flags.patch     | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/libatasmart/libatasmart-strpool-cross-flags.patch

diff --git a/package/libatasmart/libatasmart-strpool-cross-flags.patch b/package/libatasmart/libatasmart-strpool-cross-flags.patch
new file mode 100644
index 0000000000..89b91cca41
--- /dev/null
+++ b/package/libatasmart/libatasmart-strpool-cross-flags.patch
@@ -0,0 +1,42 @@
+From 730158700ea7a554c37f24bfbf5f4985f7280f3e Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Wed, 6 Feb 2013 14:07:02 +0100
+Subject: [PATCH] strpool: don't mix up host/build flags when cross compiling
+
+Submitted upstream as https://bugs.freedesktop.org/show_bug.cgi?id=60364
+
+Commit b71035ce89 (build-sys: modernize build system) changed the strpool
+(which needs to be built for the build machine) compilation to use
+AM_CFLAGS / AM_LDFLAGS rather than CFLAGS / LDFLAGS. This is wrong, as
+The AM_ version is used TOGETHER with (the user supplied) CFLAGS/LDFLAGS,
+causing strpool to use both CFLAGS (for host) and CCFLAGS_FOR_BUILD (for
+build) flags, breaking cross compilation with errors like:
+
+cc1: error: unrecognized command line option "-mabi=spe"
+
+Instead overwrite the (user supplied) CFLAGS with the (user supplied)
+CFLAGS_FOR_BUILD (and similar for LDFLAGS) like we used to do.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ strpool/Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/strpool/Makefile.am b/strpool/Makefile.am
+index b041cea..5b335a5 100644
+--- a/strpool/Makefile.am
++++ b/strpool/Makefile.am
+@@ -17,8 +17,8 @@
+ # <http://www.gnu.org/licenses/>.
+ 
+ CC = @CC_FOR_BUILD@
+-AM_CFLAGS = @BUILD_CFLAGS@
+-AM_LDFLAGS = @BUILD_LDFLAGS@
++CFLAGS = @BUILD_CFLAGS@
++LDFLAGS = @BUILD_LDFLAGS@
+ 
+ noinst_PROGRAMS = \
+ 	strpool
+-- 
+1.7.10.4
+

From 4b8a6ae84cbafa6c276af6120dca34f541a96acb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 03:36:56 +0000
Subject: [PATCH 4171/6849] iw: use BR2_KERNEL_MIRROR for SITE

As pointed by Arnout Vandecappelle.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 9233833751..54c42d7cc5 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -6,7 +6,7 @@
 
 IW_VERSION = 3.8
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
-IW_SITE = http://www.kernel.org/pub/software/network/iw
+IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl

From dc27510ed2b32f26e067fa5bc492695dd9d2b8cb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 03:36:57 +0000
Subject: [PATCH 4172/6849] mdadm: use BR2_KERNEL_MIRROR for SITE

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mdadm/mdadm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 7e9344900f..dd2b49fe60 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -6,7 +6,7 @@
 
 MDADM_VERSION = 2.6.9
 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
-MDADM_SITE = http://www.kernel.org/pub/linux/utils/raid/mdadm
+MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
 
 MDADM_MAKE_OPT = \
 	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(MDADM_DIR) mdadm

From 0c73c5b4f30fdafb072a01ace1daab55492d73cd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 03:39:21 +0000
Subject: [PATCH 4173/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 432ef20124..710dd13b4d 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,7 +60,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "3.0.62"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.37"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.38"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.29"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5

From 4345586586fc3fbc43b9a31dfca21c371a81cca5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 6 Feb 2013 22:18:53 +0100
Subject: [PATCH 4174/6849] uClibc: mark 0.9.31 as deprecated

0.9.31 is old and doesn't actually build with modern kernel headers,
so mark it as deprecated.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index a48b6a0bff..57c9933497 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -11,6 +11,7 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_31
 		bool "uClibc 0.9.31.x"
+		depends on BR2_DEPRECATED
 		depends on !BR2_xtensa
 
 	config BR2_UCLIBC_VERSION_0_9_32

From c82bc107b77aec933c414da1d3648fc5eda096bf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 08:43:25 +0000
Subject: [PATCH 4175/6849] toolchain/kernel-headers: not just 2.6 for manual
 version

The manual linux headers option may specify versions other than the 2.6
series, so drop the "2.6"

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 710dd13b4d..38e051f924 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -43,7 +43,7 @@ choice
 		bool "Linux 3.7.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_VERSION
-		bool "Linux 2.6 (manually specified version)"
+		bool "Manually specified Linux version"
 
 	config BR2_KERNEL_HEADERS_SNAP
 		bool "Local Linux snapshot (linux-2.6.tar.bz2)"

From 1975bbf11ea108411380af81c6823c0feedb7d02 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 06:37:31 +0000
Subject: [PATCH 4176/6849] ser2net: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ser2net/ser2net.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index d2c3270acd..e4ad340d0d 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -7,5 +7,7 @@
 SER2NET_VERSION = 2.7
 SER2NET_SOURCE = ser2net-$(SER2NET_VERSION).tar.gz
 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net/$(SER2NET_VERSION)
+SER2NET_LICENSE = GPLv2+
+SER2NET_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From b5baf9cbb267e5973be02524bd1f0538d5e3b186 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 08:49:39 +0000
Subject: [PATCH 4177/6849] configs/qemu: update to use latest kernels

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_nuri_defconfig         | 2 +-
 configs/qemu_arm_versatile_defconfig    | 2 +-
 configs/qemu_arm_vexpress_defconfig     | 2 +-
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips64_malta_defconfig     | 2 +-
 configs/qemu_mips_malta_defconfig       | 2 +-
 configs/qemu_mipsel_malta_defconfig     | 2 +-
 configs/qemu_ppc_g3beige_defconfig      | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 2 +-
 configs/qemu_ppc_virtex_ml507_defconfig | 2 +-
 configs/qemu_sh4_r2d_defconfig          | 2 +-
 configs/qemu_sparc_ss10_defconfig       | 2 +-
 configs/qemu_x86_64_defconfig           | 2 +-
 configs/qemu_x86_defconfig              | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 0ae0de6d99..4bc7bb289e 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 428e07efc1..cbd7dd1720 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index f74980000e..8ff5a468c3 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 6f5c871c81..46430170a9 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 6f9f8f9ba2..6ecbd4c7d0 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 8644acd705..b8ca9488ae 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 33c389aec1..6b034f62a3 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 3adde2f6b6..adaaedd798 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 5aef9bf3a0..080ee4d949 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 39f0339952..68211a0087 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 59812c93ea..9dfbe52451 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index e7dba9bbbf..4dfccd99d7 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.36"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.38"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 0b65866fc3..906671b294 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 2093242894..74011fc30e 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.7.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index ddb9fd1dfd..2734fdb9c8 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.7.config"

From c4cfa85b798cb744954d35aa05fa41e7a6956abd Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 6 Feb 2013 13:51:24 +0000
Subject: [PATCH 4178/6849] arm: deprecate OABI

The BR2_ARM_EABI config symbol is still kept in order to minimize
the impact.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index b681d27f45..37152c01a8 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -68,6 +68,7 @@ config BR2_arm1136jf_s
 choice
 	prompt "Target ABI"
 	depends on BR2_arm || BR2_armeb
+	depends on BR2_DEPRECATED
 	default BR2_ARM_EABI
 	help
 	  Application Binary Interface to use
@@ -82,6 +83,10 @@ config BR2_ARM_OABI
 	depends on !BR2_GCC_VERSION_4_7_X
 endchoice
 
+config BR2_ARM_EABI
+	default y
+	depends on !BR2_DEPRECATED
+
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"
 	depends on BR2_ARM_CPU_MAYBE_HAS_NEON

From 4e0170d66da0b83604d497e717dbbe1052759b65 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Wed, 6 Feb 2013 21:50:57 +0000
Subject: [PATCH 4179/6849] Config.in: move BR2_DEFCONFIG to Build options
 menu.

As suggested by gustavoz.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Config.in b/Config.in
index 4929a8070e..a2c305f9d4 100644
--- a/Config.in
+++ b/Config.in
@@ -22,18 +22,6 @@ config BR2_HOSTARCH_NEEDS_IA32_LIBS
 
 source "arch/Config.in"
 
-config BR2_DEFCONFIG_FROM_ENV
-	string
-	option env="BR2_DEFCONFIG"
-
-config BR2_DEFCONFIG
-	string "Location to save buildroot config"
-	default BR2_DEFCONFIG_FROM_ENV if BR2_DEFCONFIG_FROM_ENV != ""
-	default "$(CONFIG_DIR)/defconfig"
-	help
-	  When running 'make savedefconfig', the defconfig file will be saved
-	  in this location.
-
 menu "Build options"
 
 menu "Commands"
@@ -107,6 +95,18 @@ config BR2_TAR_OPTIONS
 
 endmenu
 
+config BR2_DEFCONFIG_FROM_ENV
+	string
+	option env="BR2_DEFCONFIG"
+
+config BR2_DEFCONFIG
+	string "Location to save buildroot config"
+	default BR2_DEFCONFIG_FROM_ENV if BR2_DEFCONFIG_FROM_ENV != ""
+	default "$(CONFIG_DIR)/defconfig"
+	help
+	  When running 'make savedefconfig', the defconfig file will be saved
+	  in this location.
+
 config BR2_DL_DIR
 	string "Download dir"
 	default "$(TOPDIR)/dl"

From 69d9fc6b4e2508556c81443a062e298ad9a5daf2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 7 Feb 2013 00:37:52 +0000
Subject: [PATCH 4180/6849] coreutils: needs mmu

Fixes:
http://autobuild.buildroot.net/results/bb975d928c08d31d0c1ecfb9519034865120b244/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/coreutils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
index bfd6f26203..c416ab1d45 100644
--- a/package/coreutils/Config.in
+++ b/package/coreutils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_COREUTILS
 	bool "coreutils"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
 	help
 	  All of the basic file/text/shell utilities.  These are the
 	  core utilities which are expected to exist on every system.

From 0eb3eef966bbdf3d4d52bdb4d0c0b193cb447de4 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Thu, 7 Feb 2013 02:59:22 +0000
Subject: [PATCH 4181/6849] barebox: add 2013.02.0, remove 2012.10

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 1ffe5966b5..769a1bd272 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2013_01
+	default BR2_TARGET_BAREBOX_2013_02
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_10
-	bool "2012.10"
-
 config BR2_TARGET_BAREBOX_2012_11
 	bool "2012.11"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2012_12
 config BR2_TARGET_BAREBOX_2013_01
 	bool "2013.01.0"
 
+config BR2_TARGET_BAREBOX_2013_02
+	bool "2013.02.0"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.10.0"	if BR2_TARGET_BAREBOX_2012_10
 	default "2012.11.0"	if BR2_TARGET_BAREBOX_2012_11
 	default "2012.12.1"	if BR2_TARGET_BAREBOX_2012_12
 	default "2013.01.0"	if BR2_TARGET_BAREBOX_2013_01
+	default "2013.02.0"	if BR2_TARGET_BAREBOX_2013_02
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 2356d08bbdf18677e14cb21d18c9e024e749d50b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Feb 2013 10:21:53 +0000
Subject: [PATCH 4182/6849] configs/{ea3250, fdi3250, phy3250}: lock down
 kernel headers version

Update {ea3250,fdi3250,phy3250}_defconfig to lock down kernel headers to
an appropiate version.
Otherwise the target is building with, at the moment of this writing,
version 3.7 headers and a 2.6.34 kernel which usually isn't wise.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/ea3250_defconfig  | 4 ++++
 configs/fdi3250_defconfig | 4 ++++
 configs/phy3250_defconfig | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/configs/ea3250_defconfig b/configs/ea3250_defconfig
index 9cd7b3481d..2574dde7f8 100644
--- a/configs/ea3250_defconfig
+++ b/configs/ea3250_defconfig
@@ -11,6 +11,10 @@ BR2_ARM_EABI=y
 # that will compile a kernel with ethernet working correctly
 BR2_GCC_VERSION_4_3_X=y
 
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.34.7"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.34.7"
 
 #
 # Host utilities
diff --git a/configs/fdi3250_defconfig b/configs/fdi3250_defconfig
index 1fd0b05d1e..b1c6684694 100644
--- a/configs/fdi3250_defconfig
+++ b/configs/fdi3250_defconfig
@@ -11,6 +11,10 @@ BR2_ARM_EABI=y
 # that will compile a kernel with ethernet working correctly
 BR2_GCC_VERSION_4_3_X=y
 
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.34.7"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.34.7"
 
 #
 # Host utilities
diff --git a/configs/phy3250_defconfig b/configs/phy3250_defconfig
index bc17d5c800..e95546fea3 100644
--- a/configs/phy3250_defconfig
+++ b/configs/phy3250_defconfig
@@ -11,6 +11,10 @@ BR2_ARM_EABI=y
 # that will compile a kernel with ethernet working correctly
 BR2_GCC_VERSION_4_3_X=y
 
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.34.7"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.34.7"
 
 #
 # Host utilities

From 2831427373db54b076e19c59c60c20f1018e8204 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 7 Feb 2013 19:09:38 +0100
Subject: [PATCH 4183/6849] proxychains-ng: ensure cross compiler is used

Fixes http://autobuild.buildroot.org/results/e184fcb1c100e9d8aa3d9f18a8caee8c0839e207

Contrary to what the .mk file states, proxychains-ng doesn't use autotools.
Instead it uses a handwritten configure script, so convert it to
generic-package.

This handwritten configure script generates config.mak which is then
included by the Makefile. Unfortunately config.mak does:

CC ?= $(TARGET_CC)

But as make sets CC to 'cc' by default, this never does anything - So
it ends up using the host compiler (and target CFLAGS), breaking the build.

Fix it by passing the correct CC setting at build time as well.

While we're at it, also cleanup the package by using 'make install-config'
to install the configuration file.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proxychains-ng/proxychains-ng.mk | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk
index c38a7dbde3..2020e3f9ec 100644
--- a/package/proxychains-ng/proxychains-ng.mk
+++ b/package/proxychains-ng/proxychains-ng.mk
@@ -3,15 +3,22 @@
 # proxychains-ng
 #
 #############################################################
+
 PROXYCHAINS_NG_VERSION = 4.4
 PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2
 PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng
 
-define PROXYCHAINS_NG_POST_INSTALL_TARGET
-	$(INSTALL) -m 644 -D $(@D)/src/proxychains.conf \
-		$(TARGET_DIR)/etc/proxychains.conf
+define PROXYCHAINS_NG_CONFIGURE_CMDS
+	cd $(@D) && \
+	$(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc
+endef
+
+define PROXYCHAINS_NG_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
 
-PROXYCHAINS_NG_POST_INSTALL_TARGET_HOOKS += PROXYCHAINS_NG_POST_INSTALL_TARGET
+define PROXYCHAINS_NG_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install install-config
+endef
 
-$(eval $(autotools-package))
+$(eval $(generic-package))

From 124c4e040af817951ceb67bab04e2575269c827a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 7 Feb 2013 19:20:30 +0100
Subject: [PATCH 4184/6849] proxychains-ng: needs threads

Also capitalize help text while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proxychains-ng/Config.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/proxychains-ng/Config.in b/package/proxychains-ng/Config.in
index 6fcebde2e0..99e49bdaaa 100644
--- a/package/proxychains-ng/Config.in
+++ b/package/proxychains-ng/Config.in
@@ -1,7 +1,10 @@
 config BR2_PACKAGE_PROXYCHAINS_NG
 	bool "proxychains-ng"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  force any tcp connections to flow through a proxy (or proxy chain)
+	  Force any tcp connections to flow through a proxy (or proxy chain)
 
 	  https://github.com/rofl0r/proxychains
 
+comment "proxychains-ng needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 58c2500e2ab550e28a5edd8369e1cf9b043874d8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 7 Feb 2013 09:04:48 +0000
Subject: [PATCH 4185/6849] arch/arm: fix-up the ARM Kconfig warning

Kconfig does not accepts that a symbol that is part of a choice
be affected a default value.

Fix this by introducing a dummy EABI symbol, and make the real
EABI symbol a prompt-less option that depends on !OABI.

[Peter: drop arm dependency, rename to EABI_CHOICE]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 37152c01a8..79f08f77c8 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -76,7 +76,7 @@ choice
 	  Note:
 	    Using OABI is discouraged.
 
-config BR2_ARM_EABI
+config BR2_ARM_EABI_CHOICE
 	bool "EABI"
 config BR2_ARM_OABI
 	bool "OABI"
@@ -84,8 +84,8 @@ config BR2_ARM_OABI
 endchoice
 
 config BR2_ARM_EABI
-	default y
-	depends on !BR2_DEPRECATED
+	def_bool y
+	depends on !BR2_ARM_OABI
 
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"

From e1dd19d2a7b4a19395ed99420cf08d1a48081167 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 6 Feb 2013 06:24:12 +0000
Subject: [PATCH 4186/6849] fbset: define license

[Peter: license is GPLv2 like Linux]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbset/fbset.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 3423259e8a..b8a8f439d7 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -7,6 +7,7 @@
 FBSET_VERSION = 2.1
 FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
+FBSET_LICENSE = GPLv2
 
 # Make sure full fbset wins over busybox fbset
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From 85ffaecb27d3ae5929437ae878a865b57f708df1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Feb 2013 02:46:49 +0000
Subject: [PATCH 4187/6849] configs/beaglebone_defconfig: lock down kernel
 headers version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/beaglebone_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index f78a4008bc..e19cdcbc4d 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -8,6 +8,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.2.9"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
 BR2_TARGET_UBOOT_2012_10=y

From 9fa32ba0b76d0790f67e0cc655c56484e44397bc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:58:43 +0000
Subject: [PATCH 4188/6849] Add a post-image script mechanism

Just like we have a post-build script mechanism that gets executed
after the build of all packages but before the creation of the
filesystem images, let's introduce a post-image script mechanism, that
gets executed once all filesystem images have been generated.

This can for example be used to call a tool building a firmware image
from different images generated by Buildroot, or automatically extract
the tarball root filesystem image into some location exported by NFS,
or any other custom action.

[Peter: fix image script check]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile         |  9 +++++++++
 system/Config.in | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/Makefile b/Makefile
index d9e5f24081..395d270c95 100644
--- a/Makefile
+++ b/Makefile
@@ -353,6 +353,8 @@ endif
 
 include fs/common.mk
 
+TARGETS+=target-post-image
+
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
@@ -555,6 +557,13 @@ target-generatelocales: host-localedef
 	done
 endif
 
+target-post-image:
+ifneq ($(BR2_ROOTFS_POST_IMAGE_SCRIPT),"")
+	@$(call MESSAGE,"Executing post-image script\(s\)")
+	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
+		$(s) $(BINARIES_DIR)$(sep))
+endif
+
 toolchain-eclipse-register:
 	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
 
diff --git a/system/Config.in b/system/Config.in
index fa01d914be..bdd47c5608 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -276,4 +276,22 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
 	  only argument. Make sure the exit code of those scripts are 0,
 	  otherwise make will stop after calling them.
 
+config BR2_ROOTFS_POST_IMAGE_SCRIPT
+	string "Custom scripts to run after creating filesystem images"
+	default ""
+	help
+	  Specify a space-separated list of scripts to be run after
+	  the build has finished and after Buildroot has packed the
+	  files into selected filesystem images.
+
+	  This can for example be used to call a tool building a
+	  firmware image from different images generated by Buildroot,
+	  or automatically extract the tarball root filesystem image
+	  into some location exported by NFS, or any other custom
+	  action.
+
+	  These scripts are called with the images directory name as
+	  first and only argument. The script is executed from the
+	  main Buildroot source directory as the current directory.
+
 endmenu

From 04dea0c48b57177fab80bfff46d74162011b199d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:58:44 +0000
Subject: [PATCH 4189/6849] docs/manual: mention the new post-image mechanism

[Peter: fix minor typos]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-rootfs.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index fa04d85e25..f396c0da24 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -55,3 +55,25 @@ there are a few ways to customize the resulting target filesystem.
   target root filesystem in +package/customize/source+, and then
   enable this special package in the configuration system. _This
   method is marked as deprecated_.
+
+Note also that if you want to perform some specific actions *after*
+all filesystem images have been created (for example to automatically
+extract your root filesystem tarball in a location exported by your
+NFS server, or to create a special firmware image that bundles your
+root filesystem and kernel image, or any other custom action), you can
+specify a space-separated list of scripts in the
++BR2_ROOTFS_POST_IMAGE_SCRIPT+ configuration option.
+
+Each of those scripts will be called with the path to the +images+
+output directory as first and unique argument, and will be executed
+with the main Buildroot source directory as the current
+directory. Those scripts will be executed as the user that executes
+Buildroot, which should normally not be the root user. Therefore, any
+action requiring root permissions in one of these post-image script
+will require special handling (usage of fakeroot or sudo), which is
+left to the script developer.
+
+Just like for the _post-build scripts_ mentioned above, you also have
+access to the following environment variables from your _post-image
+scripts_: +BUILDROOT_CONFIG+, +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+,
++BINARIES_DIR+ and +BASE_DIR+.

From 12ccc43fb7afe0f2dee850e33f8261f652ff4dd4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:58:45 +0000
Subject: [PATCH 4190/6849] package/customize: remove

This mechanism of root filesystem customization has been deprecated
since a long time, so let's remove it now.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                |  8 ++++++++
 package/Config.in               |  1 -
 package/customize/Config.in     |  7 -------
 package/customize/customize.mk  | 32 --------------------------------
 package/customize/source/.empty |  0
 support/scripts/pkg-stats       |  1 -
 6 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 package/customize/Config.in
 delete mode 100644 package/customize/customize.mk
 delete mode 100644 package/customize/source/.empty

diff --git a/Config.in.legacy b/Config.in.legacy
index 90a7b67bae..d90132c53d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -44,6 +44,14 @@ endif
 #
 # Legacy options since 2012.11
 #
+config BR2_PACKAGE_CUSTOMIZE
+	bool "customize package has been removed"
+	select BR2_LEGACY
+	help
+	  The 'customize' special package has been removed. Instead,
+	  we recommend to create either your own packages, or use a
+	  post-build script to customize your root filesystem. See
+	  Buildroot's documentation for more details.
 
 config BR2_PACKAGE_XSERVER_xorg
 	bool "X.org modular server"
diff --git a/package/Config.in b/package/Config.in
index 85889515c2..2fad94d1f5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1,7 +1,6 @@
 menu "Package Selection for the target"
 
 source "package/busybox/Config.in"
-source "package/customize/Config.in"
 
 # Audio and video applications
 source "package/multimedia/Config.in"
diff --git a/package/customize/Config.in b/package/customize/Config.in
deleted file mode 100644
index 8f8aaa21b8..0000000000
--- a/package/customize/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_CUSTOMIZE
-	bool "customize"
-	depends on BR2_DEPRECATED
-	help
-	  Add custom stuff to your buildroot.
-
-	  (edit package/customize/customize.mk)
diff --git a/package/customize/customize.mk b/package/customize/customize.mk
deleted file mode 100644
index d2b8518725..0000000000
--- a/package/customize/customize.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#############################################################
-#
-# Any custom stuff you feel like doing....
-#
-#############################################################
-CUST_DIR:=package/customize/source
-
-$(BUILD_DIR)/.customize:
-	rm -f $(BUILD_DIR)/series
-	(cd $(CUST_DIR); \
-	 /bin/ls -d * > $(BUILD_DIR)/series || \
-	 touch $(BUILD_DIR)/series )
-	for f in `cat $(BUILD_DIR)/series`; do \
-		cp -af $(CUST_DIR)/$$f $(TARGET_DIR); \
-	done
-	rm -f $(BUILD_DIR)/series
-	touch $@
-
-customize: $(BUILD_DIR)/.customize
-
-customize-clean:
-	rm -f $(BUILD_DIR)/.customize
-
-.PHONY: customize
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CUSTOMIZE),y)
-TARGETS+=customize
-endif
diff --git a/package/customize/source/.empty b/package/customize/source/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 929b8d1eaa..a65a6aee3f 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -92,7 +92,6 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	$i = "package/games/games.mk" -o \
 	$i = "package/gtk2-themes/gtk2-themes.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \
- 	$i = "package/customize/customize.mk" -o \
  	$i = "package/pkg-autotools.mk" -o \
  	$i = "package/pkg-cmake.mk" -o \
  	$i = "package/pkg-generic.mk" -o \

From 598fe672135fad66b55b4ab79a59e8110f3c590e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:58:46 +0000
Subject: [PATCH 4191/6849] docs/manual: no longer mention the
 package/customize thing

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-rootfs.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index f396c0da24..5692887e8a 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -50,12 +50,6 @@ there are a few ways to customize the resulting target filesystem.
       stored
     - +BASE_DIR+: the base output directory
 
-* A special package, 'customize', stored in +package/customize+ can be
-  used. You can put all the files that you want to see in the final
-  target root filesystem in +package/customize/source+, and then
-  enable this special package in the configuration system. _This
-  method is marked as deprecated_.
-
 Note also that if you want to perform some specific actions *after*
 all filesystem images have been created (for example to automatically
 extract your root filesystem tarball in a location exported by your

From bd86e4ff737d271e1051f899596e0e717e02ac13 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:58:47 +0000
Subject: [PATCH 4192/6849] docs/manual: slightly reword the solutions to
 customize rootfs

The order of the solutions to customize the root filesystem is
changed: we now mention the post-build script mechanism *before* the
custom root filesystem skeleton mechanism, because the former is
preferred over the latter.

In addition to this, we give a few more details about direct
customization of the root filesystem in output/target, and about the
custom target skeleton solution.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-rootfs.txt | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 5692887e8a..3cdbaa1ce9 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -12,17 +12,11 @@ there are a few ways to customize the resulting target filesystem.
   simply make your changes here and run make afterwards - this will
   rebuild the target filesystem image. This method allows you to do
   anything to the target filesystem, but if you decide to completely
-  rebuild your toolchain and tools, these changes will be lost.
-  _Changes do not survive the +make clean+ command_.
-
-* Create your own 'target skeleton'. You can start with the default
-  skeleton available under +system/skeleton+ and then customize it to
-  suit your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
-  +BR2_ROOTFS_SKELETON_CUSTOM_PATH+ will allow you to specify the
-  location of your custom skeleton. These options can be found in the
-  +System configuration+ menu. At build time, the contents of the
-  skeleton are copied to output/target before any package
-  installation.
+  rebuild your toolchain and tools, these changes will be lost. This
+  solution is therefore only useful for quick tests only: _changes do
+  not survive the +make clean+ command_. Once you have validated your
+  changes, you should make sure that they will persist after a +make
+  clean+ by using one of the following methods.
 
 * Create a filesystem overlay: a tree of files that are copied directly
   over the target filesystem after it has been built.  Set
@@ -50,6 +44,19 @@ there are a few ways to customize the resulting target filesystem.
       stored
     - +BASE_DIR+: the base output directory
 
+* Create your own 'target skeleton'. You can start with the default
+  skeleton available under +system/skeleton+ and then customize it to
+  suit your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
+  +BR2_ROOTFS_SKELETON_CUSTOM_PATH+ will allow you to specify the
+  location of your custom skeleton. These options can be found in the
+  +System configuration+ menu. At build time, the contents of the
+  skeleton are copied to output/target before any package
+  installation. Note that this method is *not recommended*, as it
+  duplicates the entire skeleton, which prevents from taking advantage
+  of the fixes or improvements brought to the default Buildroot
+  skeleton. The recommended method is to use the _post-build script_
+  mechanism described in the previous item.
+
 Note also that if you want to perform some specific actions *after*
 all filesystem images have been created (for example to automatically
 extract your root filesystem tarball in a location exported by your

From c482eed74c5238065ab1211c1e094be656fcda4f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:58:48 +0000
Subject: [PATCH 4193/6849] Adjust prompt for the post-build scripts option

Since the post-image config option uses the plural for "Custom
scripts", do the same for the post-build config option, for
consistency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Config.in b/system/Config.in
index bdd47c5608..1e4fff3ebc 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -261,7 +261,7 @@ config BR2_ROOTFS_OVERLAY
 	  ~ and .git, .svn and .hg directories.
 
 config BR2_ROOTFS_POST_BUILD_SCRIPT
-	string "Custom script to run before creating filesystem images"
+	string "Custom scripts to run before creating filesystem images"
 	default ""
 	help
 	  Specify a space-separated list of scripts to be run after the build

From afea3037ef3a6718051e79dd7f7e3bb2e4cc224e Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 7 Feb 2013 11:58:10 +0000
Subject: [PATCH 4194/6849] rootfs-overlay: also exclude .empty files

This makes it possible to put empty directories in the overlay.
Thanks to Aras Vaichas for pointing that out.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                         | 3 ++-
 docs/manual/customize-rootfs.txt | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 395d270c95..7f0822f15f 100644
--- a/Makefile
+++ b/Makefile
@@ -506,7 +506,8 @@ endif
 	@for dir in $(call qstrip,$(BR2_ROOTFS_OVERLAY)); do \
 		$(call MESSAGE,"Copying overlay $${dir}"); \
 		rsync -a \
-			--exclude .svn --exclude .git --exclude .hg --exclude '*~' \
+			--exclude .empty --exclude .svn --exclude .git \
+			--exclude .hg --exclude '*~' \
 			$${dir}/ $(TARGET_DIR); \
 	done
 
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 3cdbaa1ce9..b1662cb797 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -20,8 +20,8 @@ there are a few ways to customize the resulting target filesystem.
 
 * Create a filesystem overlay: a tree of files that are copied directly
   over the target filesystem after it has been built.  Set
-  +BR2_ROOTFS_OVERLAY+ to the top of the tree.  +.git+, +.svn+,
-  +.hg+ directories and files ending with +~+ are excluded.
+  +BR2_ROOTFS_OVERLAY+ to the top of the tree.  +.git+, +.svn+, +.hg+
+  directories, +.empty+ files and files ending with +~+ are excluded.
   _Among these first 3 methods, this one should be preferred_.
 
 * In the Buildroot configuration, you can specify the path to a

From aac46c75d9ffe4fe8db79efc18b36f439defaf1c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Feb 2013 01:36:01 +0000
Subject: [PATCH 4195/6849] configs/sheevaplug_defconfig: lock down kernel
 headers version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/sheevaplug_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index ead1831f0a..70572d7999 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -10,6 +10,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
 
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.5.4"
+
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="sheevaplug"

From 6f6803089dc6c4a2a2f9dfa1e26d7e580e7e7e1a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Feb 2013 01:36:02 +0000
Subject: [PATCH 4196/6849] configs/mini2440_defconfig: lock down kernel
 headers version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/mini2440_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/mini2440_defconfig b/configs/mini2440_defconfig
index a7db8551bf..6adcea0f4e 100644
--- a/configs/mini2440_defconfig
+++ b/configs/mini2440_defconfig
@@ -15,6 +15,11 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 BR2_TARGET_ROOTFS_JFFS2_LE=y
 BR2_TARGET_ROOTFS_TAR=y
 
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.0.4"
+
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mini2440"

From dc8bd0ecb148f5fc60802394b51dda20cdc2b62b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Feb 2013 01:36:03 +0000
Subject: [PATCH 4197/6849] configs/armadeus_apf9328_defconfig: lock down
 kernel headers version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/armadeus_apf9328_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig
index 945d3855ca..1ed1dd587c 100644
--- a/configs/armadeus_apf9328_defconfig
+++ b/configs/armadeus_apf9328_defconfig
@@ -14,6 +14,11 @@ BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.1.1"
+
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf9328"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"

From 843c3674e57cb8eb152f43811097a12b392c7f3c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Feb 2013 01:36:04 +0000
Subject: [PATCH 4198/6849] configs/at91sam9g20dfc_defconfig: lock down kernel
 headers vesion

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9g20dfc_defconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 723b9e197f..60764e64ad 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -2,6 +2,10 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.1.6"
+
 # Host utilities
 #
 BR2_PACKAGE_HOST_SAM_BA=y

From d780c00c7df3e2e3eece60300c38be6dbd191beb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Feb 2013 01:36:05 +0000
Subject: [PATCH 4199/6849] config/kb9202_defconfig: update to latest at91
 kernel and lock headers

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/kb9202_defconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 50b278c528..1d01a22a00 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -5,10 +5,14 @@ BR2_arm920t=y
 # Filesystem
 BR2_TARGET_ROOTFS_TAR=y
 
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
+
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.33"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.33-at91.patch.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.38-at91.patch.gz"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="kb9202"

From 80e47a533bed9745f56379e45e4ec136a1590697 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 11:59:09 +0000
Subject: [PATCH 4200/6849] libffi: add patch to fix library installation
 location

The libffi library was installed in a wrong directory when using the
non-default variant of a multilib toolchain. We fix this by patching
the libffi Makefile.am to install its library in a normal
location. The patch has been submitted upstream.

Fixes:

 http://autobuild.buildroot.org/results/471b1d1547c8d726999ba9a865b87fd75429dcab/build-end.log (dbus-glib)
 http://autobuild.buildroot.org/results/eda3ae14eea61e777511fca561f8d43dc7f4a2a5/build-end.log (shared-mime-info)
 http://autobuild.buildroot.org/results/9c86692ae3485d5ae371c695bfbb4a9b67aa2368/build-end.log (librsvg)
 http://autobuild.buildroot.org/results/affd7f20c95f1019d040e2911877694300e3c876/build-end.log (bustle)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-Fix-installation-location-of-libffi.patch | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/libffi/libffi-001-Fix-installation-location-of-libffi.patch

diff --git a/package/libffi/libffi-001-Fix-installation-location-of-libffi.patch b/package/libffi/libffi-001-Fix-installation-location-of-libffi.patch
new file mode 100644
index 0000000000..56e08f7363
--- /dev/null
+++ b/package/libffi/libffi-001-Fix-installation-location-of-libffi.patch
@@ -0,0 +1,50 @@
+From 102c02de867bfe831b5366c89d66bcf170db962e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 7 Feb 2013 22:26:56 +0100
+Subject: [PATCH] Fix installation location of libffi
+
+The libffi is currently declared as toolexeclib_LTLIBRARIES. In many
+cases, toolexeclib libraries will be installed in /usr/lib, so it
+doesn't make any difference.
+
+However, with multilib toolchains, they get installed in a
+subdirectory of /usr/lib/. For example, with a Sourcery CodeBench
+PowerPC toolchain, if the e500mc multilib variant is used, the libffi
+library gets installed in /usr/lib/te500mc/. This is due to the
+following code in the configure script:
+
+  multi_os_directory=`$CC -print-multi-os-directory`
+  case $multi_os_directory in
+    .) ;; # Avoid trailing /.
+    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+  esac
+
+Once the library is installed in /usr/lib/te500mc/, nothing works
+because this installation location is inconsistent with the
+installation location declared in libffi.pc.
+
+So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use
+the more standard lib_LTLIBRARIES, which ensures that the libffi
+library is always installed in /usr/lib.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6f669ca..b60bcc1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -93,7 +93,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+ 
+ MAKEOVERRIDES=
+ 
+-toolexeclib_LTLIBRARIES = libffi.la
++lib_LTLIBRARIES = libffi.la
+ noinst_LTLIBRARIES = libffi_convenience.la
+ 
+ libffi_la_SOURCES = src/prep_cif.c src/types.c \
+-- 
+1.7.9.5
+

From 4705347ddfeaab3953cd86df2c7309b31b719f50 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 12:35:03 +0000
Subject: [PATCH 4201/6849] package: rename <pkg>_CONFIG_FIXUP to
 <pkg>_CONFIG_SCRIPTS

This commit renames the newly introduced <pkg>_CONFIG_FIXUP variable
to <pkg>_CONFIG_SCRIPTS, for two reasons:

 * <pkg>_CONFIG_SCRIPTS will not only "fixup" the scripts in
   $(STAGING_DIR)/usr/bin, but also remove them from
   $(TARGET_DIR)/usr/bin. So it is not only about doing a "fixup".

 * On the principle, it is strange that the variable carries an
   indication of the action that will take place on those files. It
   should rather be named to say "Here are the <foo>-config scripts",
   and let the package infrastructure decide if it should fix them up,
   remove them, etc.

This commit also updates the documentation accordingly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 17 +++++++++--------
 package/libpcap/libpcap.mk              |  2 +-
 package/pkg-generic.mk                  |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 41a94d73c6..13d200decb 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -25,7 +25,7 @@ system is based on hand-written Makefiles or shell scripts.
 09: LIBFOO_LICENSE = GPLv3+
 10: LIBFOO_LICENSE_FILES = COPYING
 11: LIBFOO_INSTALL_STAGING = YES
-12: LIBFOO_CONFIG_FIXUP = libfoo-config
+12: LIBFOO_CONFIG_SCRIPTS = libfoo-config
 13: LIBFOO_DEPENDENCIES = host-libaaa libbbb
 14:
 15: define LIBFOO_BUILD_CMDS
@@ -86,7 +86,7 @@ or:		'-L/usr/lib' instead of '-L$(STAGING_DIR)/usr/lib'
 
 So some sed magic is done to these scripts to make them give correct
 flags.
-The argument to be given to +LIBFOO_CONFIG_FIXUP+ is the file name(s)
+The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s)
 of the shell script(s) needing fixing. All these names are relative to
 '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given.
 
@@ -96,7 +96,7 @@ Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'.
 
 So it's fixup would be:
 
-DIVINE_CONFIG = divine-config
+DIVINE_CONFIG_SCRIPTS = divine-config
 
 Example 2:
 
@@ -105,8 +105,9 @@ Package imagemagick installs the following scripts:
 
 So it's fixup would be:
 
-IMAGEMAGICK_CONFIG_FIXUP = Magick-config Magick++-config \
-			   MagickCore-config MagickWand-config Wand-config
+IMAGEMAGICK_CONFIG_SCRIPTS = \
+   Magick-config Magick++-config \
+   MagickCore-config MagickWand-config Wand-config
 
 On line 13, we specify the list of dependencies this package relies
 on. These dependencies are listed in terms of lower-case package names,
@@ -284,10 +285,10 @@ information is (assuming the package name is +libfoo+) :
   variables are executed to install the package into the target
   directory.
 
-* +LIBFOO_CONFIG_FIXUP+ lists the names of the files in
+* +LIBFOO_CONFIG_SCRIPTS+ lists the names of the files in
   '$(STAGING_DIR)/usr/bin' that need some special fixing to make them
-  cross-compiling friendly. Multiple file names separated by space can be
-  given and all are relative to '$(STAGING_DIR)/usr/bin'.
+  cross-compiling friendly. Multiple file names separated by space can
+  be given and all are relative to '$(STAGING_DIR)/usr/bin'.
 
 * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot
   when using the static device table. The syntax to use is the
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 5be61bf051..06aec0f4d2 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -24,7 +24,7 @@ LIBPCAP_DEPENDENCIES = zlib
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
-LIBPCAP_CONFIG_FIXUP = pcap-config
+LIBPCAP_CONFIG_SCRIPTS = pcap-config
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 LIBPCAP_CONF_OPT += --enable-canusb
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 19a115ecde..066b6c8630 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -128,12 +128,12 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 	@$(call MESSAGE,"Installing to staging directory")
 	$($(PKG)_INSTALL_STAGING_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
-	$(Q)if test -n "$($(PKG)_CONFIG_FIXUP)" ; then \
+	$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
 		$(call MESSAGE,"Fixing package configuration files") ;\
 			$(SED)  "s,^\(exec_\)\?prefix=.*,\1prefix=$(STAGING_DIR)/usr,g" \
 				-e "s,-I/usr/,-I$(STAGING_DIR)/usr/,g" \
 				-e "s,-L/usr/,-L$(STAGING_DIR)/usr/,g" \
-				$(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_FIXUP)) ;\
+				$(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\
 	fi
 	$(Q)touch $@
 

From 580225af20b6c692da76eb43b20382a47b3ed170 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 12:35:04 +0000
Subject: [PATCH 4202/6849] package: remove scripts listed in
 <pkg>_CONFIG_SCRIPTS from target

The <foo>-config scripts are useless on the target, since they are
only needed for development, so we remove them automatically.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 7 ++++++-
 package/pkg-generic.mk                  | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 13d200decb..78df24ade9 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -90,6 +90,9 @@ The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s)
 of the shell script(s) needing fixing. All these names are relative to
 '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given.
 
+In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed
+from +$(TARGET_DIR)/usr/bin+, since they are not needed on the target.
+
 Example 1:
 
 Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'.
@@ -288,7 +291,9 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_CONFIG_SCRIPTS+ lists the names of the files in
   '$(STAGING_DIR)/usr/bin' that need some special fixing to make them
   cross-compiling friendly. Multiple file names separated by space can
-  be given and all are relative to '$(STAGING_DIR)/usr/bin'.
+  be given and all are relative to '$(STAGING_DIR)/usr/bin'. The files
+  listed in +LIBFOO_CONFIG_SCRIPTS+ are also removed from
+  +$(TARGET_DIR)/usr/bin+ since they are not needed on the target.
 
 * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot
   when using the static device table. The syntax to use is the
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 066b6c8630..57b0fd08c1 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -153,6 +153,11 @@ $(BUILD_DIR)/%/.stamp_target_installed:
 		$($(PKG)_INSTALL_INIT_SYSV))
 	$($(PKG)_INSTALL_TARGET_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
+ifeq ($(BR2_HAVE_DEVFILES),)
+	$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
+		$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
+	fi
+endif
 	$(Q)touch $@
 
 # Clean package

From a5ce8576748421b6dece97a665e575d7dfc9fbe8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 12:35:05 +0000
Subject: [PATCH 4203/6849] package: use <pkg>_CONFIG_SCRIPTS wherever possible

Use the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it
does all what the package was doing. A few packages, like libxslt, are
for now left out, since they need some additional fixup (for example a
fixup of includedir).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk                   | 10 +---------
 package/directfb/directfb.mk           |  9 +--------
 package/divine/divine.mk               |  9 +--------
 package/gd/gd.mk                       | 10 +---------
 package/giblib/giblib.mk               |  9 +--------
 package/icu/icu.mk                     |  9 +--------
 package/imagemagick/imagemagick.mk     | 12 ++----------
 package/libcurl/libcurl.mk             | 11 ++++-------
 package/libdvdnav/libdvdnav.mk         | 16 +---------------
 package/libdvdread/libdvdread.mk       | 15 +--------------
 package/libgcrypt/libgcrypt.mk         | 10 +---------
 package/libmcrypt/libmcrypt.mk         |  9 +--------
 package/libnspr/libnspr.mk             | 10 ++--------
 package/libusb-compat/libusb-compat.mk |  9 +--------
 package/libxml2/libxml2.mk             | 17 +----------------
 package/ncurses/ncurses.mk             |  8 +-------
 package/neon/neon.mk                   | 18 +-----------------
 package/pcre/pcre.mk                   | 17 +----------------
 package/php/php.mk                     | 11 +----------
 19 files changed, 24 insertions(+), 195 deletions(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 3eb83eac9c..f8ace71f94 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -15,6 +15,7 @@ CUPS_CONF_OPT = --without-perl \
 		--disable-gnutls \
 		--disable-gssapi \
 		--libdir=/usr/lib
+CUPS_CONFIG_SCRIPTS = cups-config
 
 CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
 		    $(if $(BR2_PACKAGE_LIBPNG),libpng) \
@@ -61,13 +62,4 @@ CUPS_DEPENDENCIES += host-autoconf
 
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
 
-# Fixup prefix= and exec_prefix= in cups-config
-define CUPS_FIXUP_CUPS_CONFIG
-	$(SED) 's%^prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-		-e 's%^exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/cups-config
-endef
-
-CUPS_POST_INSTALL_STAGING_HOOKS += CUPS_FIXUP_CUPS_CONFIG
-
 $(eval $(autotools-package))
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 6d5b1ce537..4f05ed271a 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -23,6 +23,7 @@ DIRECTFB_CONF_OPT = \
 	--disable-video4linux \
 	--disable-video4linux2 \
 	--without-tools
+DIRECTFB_CONFIG_SCRIPTS = directfb-config
 
 DIRECTFB_DEPENDENCIES = freetype zlib
 
@@ -131,14 +132,6 @@ HOST_DIRECTFB_BUILD_CMDS = \
 HOST_DIRECTFB_INSTALL_CMDS = \
 	$(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/usr/bin
 
-define DIRECTFB_STAGING_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/directfb-config
-endef
-
-DIRECTFB_POST_INSTALL_STAGING_HOOKS += DIRECTFB_STAGING_CONFIG_FIXUP
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 1fd27d258f..b94960121f 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -9,13 +9,6 @@ DIVINE_SITE = http://www.directfb.org/downloads/Extras
 DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
-
-define DIVINE_STAGING_DIVINE_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/divine-config
-endef
-
-DIVINE_POST_INSTALL_STAGING_HOOKS += DIVINE_STAGING_DIVINE_CONFIG_FIXUP
+DIVINE_CONFIG_SCRIPTS = divine-config
 
 $(eval $(autotools-package))
diff --git a/package/gd/gd.mk b/package/gd/gd.mk
index 1f9b1d694c..60c1c51437 100644
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@@ -13,6 +13,7 @@ GD_INSTALL_STAGING = YES
 GD_LICENSE = GD license
 GD_LICENSE_FILES = COPYING
 
+GD_CONFIG_SCRIPTS = gdlib-config
 GD_CONF_OPT = --without-x --disable-rpath
 
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
@@ -66,15 +67,6 @@ endef
 GD_PRE_CONFIGURE_HOOKS += GD_FIXUP_ICONV
 endif
 
-define GD_FIXUP_GDLIB_CONFIG
-	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-	    -e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/gdlib-config
-endef
-
-GD_POST_INSTALL_STAGING_HOOKS += GD_FIXUP_GDLIB_CONFIG
-
-GD_TOOLS_                         	+= gdlib-config
 GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE)	+= annotate
 GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD)	+= bdftogd
 GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL)	+= gd2copypal
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 75e21bbd54..ab2bbef745 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -12,13 +12,6 @@ GIBLIB_AUTORECONF = YES
 GIBLIB_AUTORECONF_OPT = --install
 GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \
 		  --with-imlib2-exec-prefix=$(STAGING_DIR)/usr
-
-define GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/giblib-config
-endef
-
-GIBLIB_POST_INSTALL_STAGING_HOOKS += GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP
+GIBLIB_CONFIG_SCRIPTS = giblib-config
 
 $(eval $(autotools-package))
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 541ca35cd1..5a884968fd 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -12,6 +12,7 @@ ICU_LICENSE_FILES = license.html
 
 ICU_DEPENDENCIES = host-icu
 ICU_INSTALL_STAGING = YES
+ICU_CONFIG_SCRIPTS = icu-config
 ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
 		--disable-tests
 HOST_ICU_CONF_OPT = --disable-samples --disable-tests
@@ -19,13 +20,5 @@ ICU_MAKE = $(MAKE1)
 ICU_SUBDIR = source
 HOST_ICU_SUBDIR = source
 
-define ICU_PREFIX_FIXUP
-	$(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/icu-config
-endef
-
-ICU_POST_INSTALL_TARGET_HOOKS += ICU_PREFIX_FIXUP
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 0476ace702..722ab40038 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -16,6 +16,8 @@ IMAGEMAGICK_LICENSE_FILES = LICENSE
 
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
+IMAGEMAGICK_CONFIG_SCRIPTS = \
+	$(addsuffix -config,Magick MagickCore MagickWand Wand Magick++)
 
 ifeq ($(BR2_LARGEFILE),y)
 IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
@@ -113,14 +115,4 @@ else
 IMAGEMAGICK_CONF_OPT += --without-bzip2
 endif
 
-define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
-	$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,	\
-		   $(addsuffix -config,			\
-		     Magick MagickCore MagickWand Wand Magick++))
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-IMAGEMAGICK_POST_INSTALL_TARGET_HOOKS += IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS
-endif
-
 $(eval $(autotools-package))
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index fd00694b32..38ca854b2d 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -11,6 +11,7 @@ LIBCURL_LICENSE = ICS
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
 LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
+LIBCURL_CONFIG_SCRIPTS = curl-config
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
@@ -30,16 +31,12 @@ define LIBCURL_FIX_DOT_PC
 endef
 LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC)
 
+ifeq ($(BR2_PACKAGE_CURL),)
 define LIBCURL_TARGET_CLEANUP
-	rm -rf $(TARGET_DIR)/usr/bin/curl-config \
-	       $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
+	rm -rf $(TARGET_DIR)/usr/bin/curl
 endef
 LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
-
-define LIBCURL_STAGING_FIXUP_CURL_CONFIG
-	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/curl-config
-endef
-LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
+endif
 
 $(eval $(autotools-package))
 
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index 520f58de4c..e975313ca2 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -9,25 +9,11 @@ LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases
 LIBDVDNAV_AUTORECONF = YES
 LIBDVDNAV_INSTALL_STAGING = YES
-
+LIBDVDNAV_CONFIG_SCRIPTS = dvdnav-config
 LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf
 
 # By default libdvdnav tries to find dvdread-config in $PATH. Because
 # of cross compilation, we prefer using pkg-config.
 LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 
-define LIBDVDNAV_TARGET_CLEANUP
-	$(RM) -f $(TARGET_DIR)/usr/bin/dvdnav-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-LIBDVDNAV_POST_INSTALL_TARGET_HOOKS += LIBDVDNAV_TARGET_CLEANUP
-endif
-
-define LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG
-	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdnav-config
-endef
-
-LIBDVDNAV_POST_INSTALL_STAGING_HOOKS += LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG
-
 $(eval $(autotools-package))
diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
index ee616f04cb..29c3472de9 100644
--- a/package/libdvdread/libdvdread.mk
+++ b/package/libdvdread/libdvdread.mk
@@ -10,19 +10,6 @@ LIBDVDREAD_SITE = http://dvdnav.mplayerhq.hu/releases
 LIBDVDREAD_AUTORECONF = YES
 LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES
-
-define LIBDVDREAD_TARGET_CLEANUP
-	$(RM) -f $(TARGET_DIR)/usr/bin/dvdread-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-LIBDVDREAD_POST_INSTALL_TARGET_HOOKS += LIBDVDREAD_TARGET_CLEANUP
-endif
-
-define LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG
-	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdread-config
-endef
-
-LIBDVDREAD_POST_INSTALL_STAGING_HOOKS += LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG
+LIBDVDREAD_CONFIG_SCRIPTS = dvdread-config
 
 $(eval $(autotools-package))
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index b0a8a738dc..b7c27424e4 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -11,6 +11,7 @@ LIBGCRYPT_LICENSE_FILES = COPYING.LIB
 LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 LIBGCRYPT_INSTALL_STAGING = YES
 LIBGCRYPT_DEPENDENCIES = libgpg-error
+LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config
 
 LIBGCRYPT_CONF_ENV = \
 	ac_cv_sys_symbol_underscore=no
@@ -25,13 +26,4 @@ endef
 
 LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS
 
-define LIBGCRYPT_STAGING_LIBGCRYPT_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/libgcrypt-config
-endef
-
-LIBGCRYPT_POST_INSTALL_STAGING_HOOKS += LIBGCRYPT_STAGING_LIBGCRYPT_CONFIG_FIXUP
-
-
 $(eval $(autotools-package))
diff --git a/package/libmcrypt/libmcrypt.mk b/package/libmcrypt/libmcrypt.mk
index a03c89202f..b67b1c7750 100644
--- a/package/libmcrypt/libmcrypt.mk
+++ b/package/libmcrypt/libmcrypt.mk
@@ -10,13 +10,6 @@ LIBMCRYPT_AUTORECONF = YES
 LIBMCRYPT_INSTALL_STAGING = YES
 LIBMCRYPT_LICENSE = LGPLv2.1
 LIBMCRYPT_LICENSE_FILES = COPYING.LIB
-
-define LIBMCRYPT_STAGING_LIBMCRYPT_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/libmcrypt-config
-endef
-
-LIBMCRYPT_POST_INSTALL_STAGING_HOOKS += LIBMCRYPT_STAGING_LIBMCRYPT_CONFIG_FIXUP
+LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config
 
 $(eval $(autotools-package))
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index a5307faf9b..5b1333dc8f 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -8,6 +8,8 @@ LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
 LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/
 LIBNSPR_SUBDIR = mozilla/nsprpub
 LIBNSPR_INSTALL_STAGING = YES
+LIBNSPR_CONFIG_SCRIPTS = nspr-config
+
 # Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly
 LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
 		   HOST_LDFLAGS="-lc"
@@ -24,12 +26,4 @@ LIBNSPR_CONF_OPT += --disable-thumb2
 endif
 endif
 
-define LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/nspr-config
-endef
-
-LIBNSPR_POST_INSTALL_STAGING_HOOKS += LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP
-
 $(eval $(autotools-package))
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 848c70561a..9551dfe4e0 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -8,14 +8,7 @@ LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
 LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
 LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
 LIBUSB_COMPAT_INSTALL_STAGING = YES
-
-define LIBUSB_COMPAT_FIXUP_CONFIG
-	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-	    -e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/libusb-config
-endef
-
-LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG
+LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 923a813364..6a974ef8b1 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -10,6 +10,7 @@ LIBXML2_INSTALL_STAGING = YES
 LIBXML2_AUTORECONF = YES
 LIBXML2_LICENSE = MIT
 LIBXML2_LICENSE_FILES = COPYING
+LIBXML2_CONFIG_SCRIPTS = xml2-config
 
 ifneq ($(BR2_LARGEFILE),y)
 LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
@@ -17,13 +18,6 @@ endif
 
 LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug
 
-define LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
-	$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
-endef
-
-LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
-
 HOST_LIBXML2_DEPENDENCIES = host-pkgconf
 
 # mesa3d uses functions that are only available with debug
@@ -40,15 +34,6 @@ else
 HOST_LIBXML2_CONF_OPT += --without-python
 endif
 
-
-define LIBXML2_REMOVE_CONFIG_SCRIPTS
-	$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 2cfd332c10..aa2b6bc04e 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -11,6 +11,7 @@ NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
 NCURSES_LICENSE = MIT with advertising clause
 NCURSES_LICENSE_FILES = README
+NCURSES_CONFIG_SCRIPTS = ncurses5-config
 
 NCURSES_CONF_OPT = \
 	$(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \
@@ -37,13 +38,6 @@ define NCURSES_BUILD_CMDS
 	$(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR)
 endef
 
-define NCURSES_PATCH_NCURSES_CONFIG
-	$(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
-		$(STAGING_DIR)/usr/bin/ncurses5-config
-endef
-
-NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
-
 ifeq ($(BR2_HAVE_DEVFILES),y)
 define NCURSES_INSTALL_TARGET_DEVFILES
 	mkdir -p $(TARGET_DIR)/usr/include
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 56db6044bb..cec72f89bd 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -7,7 +7,7 @@ NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPT = --without-gssapi --disable-rpath
-
+NEON_CONFIG_SCRIPTS = neon-config
 NEON_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
@@ -44,20 +44,4 @@ ifeq ($(BR2_PACKAGE_NEON_NOXML),y)
 NEON_CONF_OPT += --disable-webdav
 endif
 
-define NEON_REMOVE_CONFIG_SCRIPTS
-	$(RM) -f $(TARGET_DIR)/usr/bin/neon-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS
-endif
-
-define NEON_STAGING_NEON_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		$(STAGING_DIR)/usr/bin/neon-config
-endef
-
-NEON_POST_INSTALL_STAGING_HOOKS += NEON_STAGING_NEON_CONFIG_FIXUP
-
 $(eval $(autotools-package))
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 9e27cb52c9..48266ff74d 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -9,26 +9,11 @@ PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_LICENSE = BSD-3c
 PCRE_LICENSE_FILES = LICENCE
 PCRE_INSTALL_STAGING = YES
+PCRE_CONFIG_SCRIPTS = pcre-config
 
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 # pcre will use the host g++ if a cross version isn't available
 PCRE_CONF_OPT = --disable-cpp
 endif
 
-define PCRE_STAGING_PCRE_CONFIG_FIXUP
-	$(SED) 's,^prefix=.*,prefix=$(STAGING_DIR)/usr,' \
-		-e 's,^exec_prefix=.*,exec_prefix=$(STAGING_DIR)/usr,' \
-		$(STAGING_DIR)/usr/bin/pcre-config
-endef
-
-PCRE_POST_INSTALL_STAGING_HOOKS += PCRE_STAGING_PCRE_CONFIG_FIXUP
-
-define PCRE_TARGET_REMOVE_PCRE_CONFIG
-	rm -f $(TARGET_DIR)/usr/bin/pcre-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-PCRE_POST_INSTALL_TARGET_HOOKS += PCRE_TARGET_REMOVE_PCRE_CONFIG
-endif
-
 $(eval $(autotools-package))
diff --git a/package/php/php.mk b/package/php/php.mk
index a1badabd23..c89b4674c4 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -19,6 +19,7 @@ PHP_CONF_OPT =  --mandir=/usr/share/man \
 		--with-config-file-path=/etc \
 		--localstatedir=/var \
 		--disable-rpath
+PHP_CONFIG_SCRIPTS = php-config
 
 PHP_CFLAGS = $(TARGET_CFLAGS)
 
@@ -200,19 +201,9 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y)
 	PHP_DEPENDENCIES += netsnmp
 endif
 
-# Fixup prefix= and exec_prefix= in php-config
-define PHP_FIXUP_PHP_CONFIG
-	$(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \
-		-e 's%^exec_prefix="/usr"%exec_prefix="$(STAGING_DIR)/usr"%' \
-		$(STAGING_DIR)/usr/bin/php-config
-endef
-
-PHP_POST_INSTALL_STAGING_HOOKS += PHP_FIXUP_PHP_CONFIG
-
 define PHP_INSTALL_FIXUP
 	rm -rf $(TARGET_DIR)/usr/lib/php
 	rm -f $(TARGET_DIR)/usr/bin/phpize
-	rm -f $(TARGET_DIR)/usr/bin/php-config
 	if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \
 		$(INSTALL) -m 0755  $(PHP_DIR)/php.ini-production \
 			$(TARGET_DIR)/etc/php.ini; \

From 4d3f810aaf43aac7cb29ab6b875206da2a9a15b1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 12:35:06 +0000
Subject: [PATCH 4204/6849] package: use <pkg>_CONFIG_SCRIPTS in packages that
 used special handling

The packages changed by this commit were not only changing prefix= and
exec_prefix= during their <foo>-config fixups, they were also changing
includedir= and/or libdir=. So, they could not be directly converted
to the new <pkg>_CONFIG_SCRIPTS infrastructure.

However, a careful analysis of their default <foo>-config shows that
includedir= and libdir= is defined relatively to either ${prefix} and
${exec_prefix}. Therefore, the manual fixing of includedir= and
libdir= is useless, and fixing prefix= and exec_prefix=, as done by
the <pkg>_CONFIG_SCRIPTS mechanism is sufficient.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 19 +------------------
 package/libpng/libpng.mk     | 20 +-------------------
 package/libxslt/libxslt.mk   | 18 +-----------------
 3 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index be0f1a71da..b08bbf7cbb 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -14,26 +14,9 @@ FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_ZLIB),zlib) \
 	$(if $(BR2_PACKAGE_BZIP2),bzip2)
+FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 
-define FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/freetype2\',g" \
-		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
-		$(STAGING_DIR)/usr/bin/freetype-config
-endef
-
-FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP
-
-define FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE
-	rm -f $(TARGET_DIR)/usr/bin/freetype-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-FREETYPE_POST_INSTALL_TARGET_HOOKS += FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index d834876b3d..2c18fdec95 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -12,25 +12,7 @@ LIBPNG_LICENSE = libpng license
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkgconf zlib
-
-define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng$(LIBPNG_SERIES)\',g" \
-		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
-		$(STAGING_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config
-endef
-
-LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
-
-define LIBPNG_REMOVE_CONFIG_SCRIPTS
-	$(RM) -f $(TARGET_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config \
-		 $(TARGET_DIR)/usr/bin/libpng-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS
-endif
+LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index a35b955072..b6c6aad8a1 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -12,7 +12,7 @@ LIBXSLT_LICENSE_FILES = COPYING
 
 LIBXSLT_CONF_OPT = --with-gnu-ld --without-debug \
 		--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
-
+LIBXSLT_CONFIG_SCRIPTS = xslt-config
 LIBXSLT_DEPENDENCIES = libxml2
 
 # If we have enabled libgcrypt then use it, else disable crypto support.
@@ -27,21 +27,5 @@ HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto
 
 HOST_LIBXSLT_DEPENDENCIES = host-libxml2
 
-define LIBXSLT_XSLT_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config
-	$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config
-	$(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/xslt-config
-endef
-
-LIBXSLT_POST_INSTALL_STAGING_HOOKS += LIBXSLT_XSLT_CONFIG_FIXUP
-
-define LIBXSLT_REMOVE_CONFIG_SCRIPTS
-	$(RM) -f $(TARGET_DIR)/usr/bin/xslt-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 5ff6989445eac9ce59a5041c656bcb0319dce0eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Feb 2013 12:35:07 +0000
Subject: [PATCH 4205/6849] libgpg-error: use <pkg>_CONFIG_SCRIPTS

libgpg-error installs a gpg-error-config script, but it wasn't fixed
up properly. Use the <pkg>_CONFIG_SCRIPTS to handle this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgpg-error/libgpg-error.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 288165bad2..4114310d59 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -9,5 +9,6 @@ LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 LIBGPG_ERROR_LICENSE = LGPLv2.1+
 LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB
 LIBGPG_ERROR_INSTALL_STAGING = YES
+LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
 
 $(eval $(autotools-package))

From 5946dcfc582370fa8b55f06517a98bac2b2c1c1e Mon Sep 17 00:00:00 2001
From: Ignacy Gawedzki <i@lri.fr>
Date: Thu, 7 Feb 2013 03:48:35 +0000
Subject: [PATCH 4206/6849] boost: Pass staging dir to --with-icu option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When using the --with-icu option without specifying the directory, boost's
bootstrap.sh script will look at "common" locations (lines 289-294):

    COMMON_ICU_PATHS="/usr /usr/local /sw"
    for p in $COMMON_ICU_PATHS; do
      if test -r $p/include/unicode/utypes.h; then
        ICU_ROOT=$p
      fi
    done

With buildroot it may surely become problematic at some point.

Signed-off-by: Ignacy Gawędzki <i@lri.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 5e1bb4e248..a2028484b4 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -39,7 +39,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave)
 
 ifeq ($(BR2_PACKAGE_ICU),y)
-BOOST_FLAGS += --with-icu
+BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr
 BOOST_DEPENDENCIES += icu
 else
 BOOST_FLAGS += --without-icu

From 47b3a845cfa171a4f76c6c213e027acf4607c1c7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 9 Feb 2013 12:13:59 +0100
Subject: [PATCH 4207/6849] imagemagick: fix CONFIG_SCRIPTS handling when C++
 isn't available

Fixes http://autobuild.buildroot.org/results/0b35567af8a41a14c9c33f3be5299978c5847e03

Magick++-config only gets installed when C++ support is detected.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imagemagick/imagemagick.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 722ab40038..def7a5dd4b 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -17,7 +17,11 @@ IMAGEMAGICK_LICENSE_FILES = LICENSE
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 IMAGEMAGICK_CONFIG_SCRIPTS = \
-	$(addsuffix -config,Magick MagickCore MagickWand Wand Magick++)
+	$(addsuffix -config,Magick MagickCore MagickWand Wand)
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config
+endif
 
 ifeq ($(BR2_LARGEFILE),y)
 IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64

From 1ccf523713dda8bccbc8bb3dcea591d54d8d9278 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 9 Feb 2013 16:03:29 +0100
Subject: [PATCH 4208/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 70 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/CHANGES b/CHANGES
index e8247622e8..63a16fda63 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,52 +4,58 @@
 	libraries install fixed. Add Linaro ARM
 	2012.11/2012.12/2013.01, AArch64 12.11/12.12/13.01. Sourcery
 	CodeBench MIPS 2012.03/09. Infrastructure to warn about
-	missing 32bit support for binary toolchains. Add GDB 7.5.1 /
-	Remove 6.8 / 7.0 / 7.1.
+	missing 32bit support for binary toolchains. Toolchain wrapper
+	is now relocatable. Add GDB 7.5.1 / Remove 6.8 / 7.0 /
+	7.1. Deprecate uClibc 0.9.31.
 
 	Architecture: Xtensa fixes, add missing powerpc variants, arm
-	1136jf-s rev1, add A5/A15, neon support toggle, Sparc: drop
-	old unused variants
+	1136jf-s rev1, add A5/A15, neon support toggle, OABI
+	deprecated. Sparc: drop old unused variants
 
 	Bootloaders: At91bootstap: fix upstream URL, Barebox: add
-	2012.12/2013.01, remove 2012.08/09, lzop fixes, environment
-	image support, U-Boot: add 2013.01.01
+	2012.12/2013.01/2013.02, remove 2012.08/09/10, lzop fixes,
+	environment image support, U-Boot: add 2013.01.01
 
 	Linux: fix appended dtb handling for v3.8+ kernels, support
 	multiple device trees
 
 	Defconfigs: calao USB-A9260, snowball, QEMU PPC440 on ML507
 	board, QEMU ARM Exynos4210, Kernel version in QEMU defconfigs
-	updated, at91rm9200df: misc fixes
+	updated, at91rm9200df: misc fixes. Lock kernel headers to
+	match kernel.
 
 	Infrastructure: Git download fixes. Toolchain make target
 	renamed from 'cross' to 'toolchain'. Eclipse integration
-	support. Option to set root password.
+	support. Option to set root password, post image scripts,
+	config scripts handling.
 
 	Updated/fixed packages: alsa-lib, argp-standalone, argus,
 	arptables, atk, audiofile, axel, beecrypt, bind, bison,
 	bluez_utils, boost, cairo, can-utils, bmon, boa, busybox,
 	cairo, ccache, cdrkit, cifs-utils, cjson, cmake, collectd,
-	connman, coreutils, cpanminus, dbus, dhcp, dialog, diffutils,
-	directfb, distcc, divine, dnsmasq, docker, dosfstools, dstat,
-	e2fsprogs, ebtables, ed, empty, ethtool, expedite, fbv,
-	ffmpeg, flex, fltk, fluxbox, freetype, gadget-test, gawk, gdb,
-	genext2fs, gettext, giblib, glib-networking, gmp, gmpc, gnupg,
-	gnutls, gpsd, gst-plugins-{bad,base,good}, gstreamer, gzip,
-	haserl, hdparm, heirloom-mailx, hiawanta, hostapd, icu,
-	imlib2, inadyn, infozip, iproute2, ipset, iptables, iw, jpeg,
-	jquery, jquery-sparklines, jqeury-validation, kismet, kmod,
-	lame, libao, libcap, libcurl, libdvdnav, libecore, libedbus,
-	libedje, libeet, libefreet, libeina, libeio, liberation,
-	libelementary, libembryo, libethumb, libev, libevas, libffi,
-	libfribidi, libfuse, libgcrypt, libglib2, libgtk2, libhid,
-	libidn, libmicrohttpd, libmpd, libnl, libnspr, libnss, libogg,
-	libpcap, libplayer, libroxml, librsvg, libseccomp, libsigc,
-	libungif, liburcu, libvncserver, libvorbis, libxml2, libxslt,
-	lighttpd, links, linux-firmware, linux-fusion, ltp-testsuite,
-	ltrace, lttng-{babel,libust,modules,tools}, lvm2, lua, luajit,
-	lzop, matchbox-{desktop,lib}, metacity, midori, minicom, mpd,
-	mpfr, mplayer, mtd, mysql_client, neon, netatalk,
+	connman, coreutils, cpanminus, cups, dbus, dhcp, dialog,
+	diffutils, directfb, distcc, divine, dnsmasq, docker,
+	dosfstools, dstat, e2fsprogs, ebtables, ed, empty, ethtool,
+	expedite, fbset, fbv, ffmpeg, flex, fltk, fluxbox, freetype,
+	gadget-test, gawk, gdb, genext2fs, gettext, giblib,
+	glib-networking, gmp, gmpc, gnupg, gnutls, gpsd,
+	gst-plugins-{bad,base,good}, gstreamer, gzip, haserl, hdparm,
+	heirloom-mailx, hiawanta, hostapd, icu, imagemagick, imlib2,
+	inadyn, infozip, iproute2, ipset, iptables, iw, jpeg, jquery,
+	jquery-sparklines, jqeury-validation, kismet, kmod, lame,
+	libao, libcap, libcurl, libdvdnav, libdvdread, libecore,
+	libedbus, libedje, libeet, libefreet, libeina, libeio,
+	liberation, libelementary, libembryo, libethumb, libev,
+	libevas, libffi, libfribidi, libfuse, libgcrypt, libglib2,
+	libgpg-error, libgtk2, libhid, libidn, libmicrohttpd, libmpd,
+	libnl, libnspr, libnss, libogg, libpcap, libplayer, libpng,
+	libroxml, librsvg, libseccomp, libsigc, libsndfile, libungif,
+	libupnp, liburcu, libusb-compat, libvncserver, libvorbis,
+	libxml2, libxslt, lighttpd, links, linux-firmware,
+	linux-fusion, ltp-testsuite, ltrace,
+	lttng-{babel,libust,modules,tools}, lvm2, lua, luajit, lzop,
+	matchbox-{desktop,lib}, mdadm, metacity, midori, minicom, mpd,
+	mpfr, mplayer, mtd, mysql_client, ncurses, neon, netatalk,
 	networkmanager, nspr, ntfs-3g, nuttcp, ofone, olsr, openssl,
 	openvpn, opkg, oprofile, opus, opus-tools, orc, ortp, pango,
 	pciutils, pcmanfm, pcre, pcsc-lite, perl, php, pixman,
@@ -57,9 +63,9 @@
 	python, python3, qemu, qextserialport, qt, quagga, radvd,
 	readline, rng-tools, rt-tests, rubix, ruby, sam-ba, samba,
 	sane-backends, sconeserver, scons, screen, sdl, sdl_gfx,
-	sdl_mixer, sdl_ttf, sdparm, sed, smartmontools, speex, sqlite,
-	squid, sshfs, strace, sudo, sylpheed, tn5250, taglib, tar,
-	torsmo, transmission, tslib, uboot-tools, ulogd,
+	sdl_mixer, sdl_ttf, sdparm, sed, ser2net, smartmontools,
+	speex, sqlite, squid, sshfs, strace, sudo, sylpheed, tn5250,
+	taglib, tar, torsmo, transmission, tslib, uboot-tools, ulogd,
 	usb_modeswitch, util-linux, valgrind, vim, vsftpd, wavpack,
 	webkit, wipe, wireless_tools, wpa_supplicant, xapp_xinit,
 	xapp_xinput-calibrator, xapp_xman, xapp_xmh, xlib_libX11,
@@ -82,7 +88,7 @@
 	ux500-firmware, vde2, xcb-utils-keysyms, yavta,
 	zd1211-firmware
 
-	Removed packages: xdriver_xf86-input-{acecad,aiptek},
+	Removed packages: customize, xdriver_xf86-input-{acecad,aiptek},
 	xdriver_xf86-video-{apm,chips,i740,rendition,s3,s3virge,sisusb},
 	xdriver_xf86-video-sun{cg14,cg3,cg6,ffb,leo,tcx},
 	xdriver_xf86-video-{tsend,xgi,xgixp}

From 7ee0c793653ebd03acf90eea2913328a0bd8d0ee Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Sat, 9 Feb 2013 08:20:00 +0000
Subject: [PATCH 4209/6849] mplayer: not supported on sh2/sh2a

mplayer configure script says that sh2a is not supported.

Fixes:
http://autobuild.buildroot.org/results/0e530fd99c4b37782208ee0549be500220643999/

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mplayer/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/mplayer/Config.in b/package/multimedia/mplayer/Config.in
index e285644576..e36fc4681f 100644
--- a/package/multimedia/mplayer/Config.in
+++ b/package/multimedia/mplayer/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_MPLAYER
 	bool "mplayer"
 	# Those architectures are not supported by MPlayer
-	depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64
+	depends on !(BR2_sh2 || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
+			|| BR2_microblaze || BR2_aarch64)
 	depends on BR2_LARGEFILE
 	help
 	  MPlayer is a movie player which runs on many systems and supports

From fced72cc72d607df3de86e86f71910c94fe6427c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Feb 2013 10:58:14 +0100
Subject: [PATCH 4210/6849] docs/news.html: announce dev meeting report

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index f1580343e9..ceb3c694db 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,17 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>10 February 2013 -- Report from Buildroot Developers Meeting</b>
+
+    <p>A report from the recent Buildroot Developers Meeting is now
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-February/067105.html">available</a>.
+    <a href="http://emlinews.net">Embedded Linux News</a> also has a
+    <a href="http://www.emlinews.net/2013/02/buildroot-developers-meeting-report/">
+    writeup about the event</a>, including photos.</p>
+
+    <p>Once again, thanks to all the participants and to
+    <a href="http://www.google.com">Google</a> for sponsoring the event.</p>
+
   <li><b>12 January 2013 -- Next Buildroot Developers Meeting next to FOSDEM, Brussels</b>
 
     <p>The next Buildroot Developers Meeting will take place on Monday

From e68acefb3bad6c61a214c9919c8f76fdf4739b03 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Feb 2013 11:07:12 +0100
Subject: [PATCH 4211/6849] Update for 2013.02-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 63a16fda63..02dbc27b67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.02, Not released yet:
+2013.02-rc1, Released February 10th, 2013
 
 	Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target
 	libraries install fixed. Add Linaro ARM
diff --git a/Makefile b/Makefile
index 7f0822f15f..3f967b246f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.02
+export BR2_VERSION:=2013.02-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 2b1bb80c6c..f7369d6032 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -12,16 +12,16 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2012.11.1.tar.gz">buildroot-2012.11.1.tar.gz</a>
 or
 <a href="/downloads/buildroot-2012.11.1.tar.bz2">buildroot-2012.11.1.tar.bz2</a>.
-<!--
+
 <p>
-The latest release candidate is <b>2012.11-rc2</b>, which can be
+The latest release candidate is <b>2013.02-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.11-rc2.tar.gz">buildroot-2012.11-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2013.02-rc1.tar.gz">buildroot-2013.02-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.11-rc2.tar.bz2">buildroot-2012.11-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.02-rc1.tar.bz2">buildroot-2013.02-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index ceb3c694db..bc8a16acb5 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>10 February 2013 -- 2013.02-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.02_rc1">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.02-rc1.tar.bz2">2013.02-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>10 February 2013 -- Report from Buildroot Developers Meeting</b>
 
     <p>A report from the recent Buildroot Developers Meeting is now

From 4bf3c452a507d4997f869875e4fd412a3af1a5cd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Feb 2013 13:49:23 +0100
Subject: [PATCH 4212/6849] Kickoff 2013.05 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3f967b246f..1300725bf0 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.02-rc1
+export BR2_VERSION:=2013.05-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From 0ec1cf5a51fe65ee88a6d9faa7c6acbfc1581684 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 10 Feb 2013 13:54:11 +0100
Subject: [PATCH 4213/6849] news.html: add 2013.02-rc1 annoucement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index bc8a16acb5..2ebbe029cd 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.02_rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-February/067148.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2013.02-rc1.tar.bz2">2013.02-rc1

From 6056de8971bf25c9853c38583dc50b5abcb982de Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 10 Feb 2013 01:58:26 +0000
Subject: [PATCH 4214/6849] rpi-userland: update to fix no-longer applying
 patch

Our patches do not apply as-is against the version of rpi-userland we
package (weird...).

Since rpi-userland does not have releases, and is a relatively fast-moving
target, just bump the version to the latest cset from the git tree, and
get rid of one our failing patch, since it was applied upstream.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...Test-for-the-existence-of-execinfo-h.patch | 69 -------------------
 package/rpi-userland/rpi-userland.mk          |  2 +-
 2 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch

diff --git a/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch b/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
deleted file mode 100644
index ccc67d9759..0000000000
--- a/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 93ae1bcd8005216baf7361ba860b53a2cf2e0401 Mon Sep 17 00:00:00 2001
-From: Floris Bos <bos@je-eigen-domein.nl>
-Date: Sun, 25 Nov 2012 19:05:07 +0100
-Subject: [PATCH] Test for the existence of execinfo.h
-
-Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension.
-This change fixes building the library under buildroot, which uses uClibc by default
----
- interface/vcos/glibc/vcos_backtrace.c |    7 +++++--
- makefiles/cmake/arm-linux.cmake       |    4 ++++
- makefiles/cmake/cmake_config.h.in     |    3 +++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/interface/vcos/glibc/vcos_backtrace.c b/interface/vcos/glibc/vcos_backtrace.c
-index 474a328..3bb8aa3 100644
---- a/interface/vcos/glibc/vcos_backtrace.c
-+++ b/interface/vcos/glibc/vcos_backtrace.c
-@@ -26,7 +26,10 @@
- */
- 
- #include <interface/vcos/vcos.h>
--#ifdef __linux__
-+#ifdef HAVE_CMAKE_CONFIG
-+#include "cmake_config.h"
-+#endif
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
- #include <stdio.h>
-@@ -35,7 +38,7 @@
- 
- void vcos_backtrace_self(void)
- {
--#ifdef __linux__
-+#ifdef HAVE_EXECINFO_H
-    void *stack[64];
-    int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
-    char **names = backtrace_symbols(stack, depth);
-diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake
-index 89d8bbf..6f2114f 100644
---- a/makefiles/cmake/arm-linux.cmake
-+++ b/makefiles/cmake/arm-linux.cmake
-@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE
-             ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c
-             OUTPUT_VARIABLE foo)
- 
-+# test for existence of execinfo.h header
-+include(CheckIncludeFile)
-+check_include_file(execinfo.h HAVE_EXECINFO_H)
-+
- add_definitions(-DHAVE_CMAKE_CONFIG)
- configure_file (
-     "makefiles/cmake/cmake_config.h.in"
-diff --git a/makefiles/cmake/cmake_config.h.in b/makefiles/cmake/cmake_config.h.in
-index 5f08ad5..080b8e8 100644
---- a/makefiles/cmake/cmake_config.h.in
-+++ b/makefiles/cmake/cmake_config.h.in
-@@ -8,5 +8,8 @@
- /** Do we have support for GLIBC mtrace() ? */
- #cmakedefine                    HAVE_MTRACE
- 
-+/** Do we have the execinfo.h include file ? */
-+#cmakedefine                    HAVE_EXECINFO_H
-+
- #endif
- 
--- 
-1.7.10
-
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index ece37d4882..522a97f852 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RPI_USERLAND_VERSION = 9852ce28826889e50c4d6786b942f51bccccac54
+RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILE = LICENCE

From c111e4a3920fda9d300d211643d22bf7c06720d6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 13 Feb 2013 00:03:43 +0000
Subject: [PATCH 4215/6849] thttpd: needs mmu

Fixes
http://autobuild.buildroot.net/results/0b73d2b45a5bac94b65893725de46d87a9626b37/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/thttpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/thttpd/Config.in b/package/thttpd/Config.in
index 172a2d69e7..d359785435 100644
--- a/package/thttpd/Config.in
+++ b/package/thttpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_THTTPD
 	bool "thttpd"
+	depends on BR2_USE_MMU # fork()
 	help
 	  thttpd is a simple, small, portable, fast, and secure HTTP server
 

From 933e0ffe2ca1613e7b98deac61d8f3a94485b712 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 13 Feb 2013 11:55:56 +0000
Subject: [PATCH 4216/6849] libvorbis: fix LIBVORBIS_SITE

The LIBVORBIS_SITE included a reference to $(LIBVORBIS-SOURCE), which
doesn't exist. And anyway was useless because the <pkg>_SITE variable
should not contain the name of the tarball.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libvorbis/libvorbis.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index ace8147c9c..5b9048eade 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -6,7 +6,7 @@
 
 LIBVORBIS_VERSION = 1.3.3
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
-LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
+LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/
 LIBVORBIS_INSTALL_STAGING = YES
 LIBVORBIS_CONF_OPT = --disable-oggtest
 LIBVORBIS_DEPENDENCIES = host-pkgconf libogg

From 3edb0271db4e7c34b361f87db7bc02340877bab5 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 13 Feb 2013 12:59:02 +0000
Subject: [PATCH 4217/6849] manual: cleanup and update editor tags

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt  | 1 +
 docs/manual/adding-packages-cmake.txt      | 1 +
 docs/manual/adding-packages-conclusion.txt | 1 +
 docs/manual/adding-packages-directory.txt  | 1 +
 docs/manual/adding-packages-generic.txt    | 1 +
 docs/manual/adding-packages-gettext.txt    | 1 +
 docs/manual/adding-packages-tips.txt       | 1 +
 docs/manual/adding-packages.txt            | 3 ++-
 docs/manual/advanced.txt                   | 1 +
 docs/manual/appendix.txt                   | 1 +
 docs/manual/beyond-buildroot.txt           | 1 +
 docs/manual/ccache-support.txt             | 3 ++-
 docs/manual/common-usage.txt               | 1 +
 docs/manual/configure.txt                  | 3 ++-
 docs/manual/contribute.txt                 | 1 +
 docs/manual/customize-busybox-config.txt   | 3 ++-
 docs/manual/customize-kernel-config.txt    | 3 ++-
 docs/manual/customize-rootfs.txt           | 3 ++-
 docs/manual/customize-store.txt            | 3 ++-
 docs/manual/customize-toolchain.txt        | 3 ++-
 docs/manual/customize-uclibc-config.txt    | 3 ++-
 docs/manual/customize.txt                  | 1 +
 docs/manual/developer-guide.txt            | 1 +
 docs/manual/download-infra.txt             | 3 ++-
 docs/manual/download-location.txt          | 1 +
 docs/manual/eclipse-integration.txt        | 1 +
 docs/manual/faq-troubleshooting.txt        | 1 +
 docs/manual/get-involved.txt               | 1 +
 docs/manual/getting.txt                    | 3 ++-
 docs/manual/going-further.txt              | 1 +
 docs/manual/how-buildroot-works.txt        | 1 +
 docs/manual/introduction.txt               | 1 +
 docs/manual/legal-notice.txt               | 1 +
 docs/manual/make-tips.txt                  | 3 ++-
 docs/manual/makedev-syntax.txt             | 3 ++-
 docs/manual/manual.txt                     | 1 +
 docs/manual/package-make-target.txt        | 1 +
 docs/manual/patch-policy.txt               | 1 +
 docs/manual/prerequisite.txt               | 3 ++-
 docs/manual/rebuilding-packages.txt        | 3 ++-
 docs/manual/starting-up.txt                | 1 +
 docs/manual/using-buildroot-toolchain.txt  | 1 +
 docs/manual/using.txt                      | 1 +
 docs/manual/working-with.txt               | 1 +
 docs/manual/writing-rules.txt              | 1 +
 45 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 84d76f929d..5a0d27f065 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Infrastructure for autotools-based packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index bb1705bfd9..44c38e90b0 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Infrastructure for CMake-based packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt
index 0f6f0ca0aa..8e1b2c6a73 100644
--- a/docs/manual/adding-packages-conclusion.txt
+++ b/docs/manual/adding-packages-conclusion.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Conclusion
 ~~~~~~~~~~
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index cc68497108..6296596d7e 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Package directory
 ~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 78df24ade9..74d379b1c4 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Infrastructure for packages with specific build systems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt
index 58fd98d4ec..98c994cdaf 100644
--- a/docs/manual/adding-packages-gettext.txt
+++ b/docs/manual/adding-packages-gettext.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Gettext integration and interaction with packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index acdee40e7f..21e520bcde 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Tips and tricks
 ~~~~~~~~~~~~~~~
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index b909d47a83..0123b32f8b 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[adding-packages]]
 Adding new packages to Buildroot
diff --git a/docs/manual/advanced.txt b/docs/manual/advanced.txt
index 314d300987..764b71a5c7 100644
--- a/docs/manual/advanced.txt
+++ b/docs/manual/advanced.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Advanced usage
 --------------
diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index 6f1e9f3617..ef34169f84 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Appendix
 ========
diff --git a/docs/manual/beyond-buildroot.txt b/docs/manual/beyond-buildroot.txt
index a87b584aa8..a0d4af0a74 100644
--- a/docs/manual/beyond-buildroot.txt
+++ b/docs/manual/beyond-buildroot.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Beyond Buildroot
 ================
diff --git a/docs/manual/ccache-support.txt b/docs/manual/ccache-support.txt
index 95cd662033..4969180a29 100644
--- a/docs/manual/ccache-support.txt
+++ b/docs/manual/ccache-support.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[ccache]]
 Using +ccache+ in Buildroot
diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt
index 5566a39b02..c7f511ad70 100644
--- a/docs/manual/common-usage.txt
+++ b/docs/manual/common-usage.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Daily use
 ---------
diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index 65e0eeb2f8..86cb17386f 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[configure]]
 Details on Buildroot configuration
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index a33aab2afd..9425effdd3 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Contibuting to Buildroot
 ========================
diff --git a/docs/manual/customize-busybox-config.txt b/docs/manual/customize-busybox-config.txt
index fe9cddaad5..981d534af7 100644
--- a/docs/manual/customize-busybox-config.txt
+++ b/docs/manual/customize-busybox-config.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[busybox-custom]]
 Customizing the Busybox configuration
diff --git a/docs/manual/customize-kernel-config.txt b/docs/manual/customize-kernel-config.txt
index 107227040b..a2d31ed849 100644
--- a/docs/manual/customize-kernel-config.txt
+++ b/docs/manual/customize-kernel-config.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[kernel-custom]]
 Customizing the Linux kernel configuration
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index b1662cb797..4a4d620d34 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[rootfs-custom]]
 Customizing the generated target filesystem
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
index 63ea82dcf9..d770f0eefb 100644
--- a/docs/manual/customize-store.txt
+++ b/docs/manual/customize-store.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*-
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[customize-store]]
 Storing the configuration
diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 2b244120bd..4397979567 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[toolchain-custom]]
 Customizing the toolchain
diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt
index 38a1575a52..7fd20f706b 100644
--- a/docs/manual/customize-uclibc-config.txt
+++ b/docs/manual/customize-uclibc-config.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[uclibc-custom]]
 Customizing the uClibc configuration
diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt
index a13ba8f3e6..3b1a5a7342 100644
--- a/docs/manual/customize.txt
+++ b/docs/manual/customize.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Customization
 -------------
diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
index 5002897077..43272f5676 100644
--- a/docs/manual/developer-guide.txt
+++ b/docs/manual/developer-guide.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Developer Guidelines
 ====================
diff --git a/docs/manual/download-infra.txt b/docs/manual/download-infra.txt
index 63908adadc..fe031a640e 100644
--- a/docs/manual/download-infra.txt
+++ b/docs/manual/download-infra.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[download-infra]]
 
diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
index 36a13562ef..4aa8cead3e 100644
--- a/docs/manual/download-location.txt
+++ b/docs/manual/download-location.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Location of downloaded packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/eclipse-integration.txt b/docs/manual/eclipse-integration.txt
index 3d8179fa6a..d1a42cf074 100644
--- a/docs/manual/eclipse-integration.txt
+++ b/docs/manual/eclipse-integration.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Integration with Eclipse
 ------------------------
diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt
index 5d9531b121..f91a8ef504 100644
--- a/docs/manual/faq-troubleshooting.txt
+++ b/docs/manual/faq-troubleshooting.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Frequently Asked Questions & Troubleshooting
 ============================================
diff --git a/docs/manual/get-involved.txt b/docs/manual/get-involved.txt
index 59ddd711b4..8515d34dc1 100644
--- a/docs/manual/get-involved.txt
+++ b/docs/manual/get-involved.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Getting involved
 ================
diff --git a/docs/manual/getting.txt b/docs/manual/getting.txt
index a51caa0e78..6b2a824f9d 100644
--- a/docs/manual/getting.txt
+++ b/docs/manual/getting.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[getting-buildroot]]
 Getting Buildroot
diff --git a/docs/manual/going-further.txt b/docs/manual/going-further.txt
index 070e0a33a1..d3f183037a 100644
--- a/docs/manual/going-further.txt
+++ b/docs/manual/going-further.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Going further in Buildroot's innards
 ====================================
diff --git a/docs/manual/how-buildroot-works.txt b/docs/manual/how-buildroot-works.txt
index ec08f9520a..68ddd13793 100644
--- a/docs/manual/how-buildroot-works.txt
+++ b/docs/manual/how-buildroot-works.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 How Buildroot works
 -------------------
diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt
index a567cec64a..c014565ab1 100644
--- a/docs/manual/introduction.txt
+++ b/docs/manual/introduction.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 About Buildroot
 ===============
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
index 0f30234b2e..51292f6d3e 100644
--- a/docs/manual/legal-notice.txt
+++ b/docs/manual/legal-notice.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[legal-info]]
 
diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index 8cd77c030f..b4a9c123da 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[make-tips]]
 'make' tips
diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt
index 27517b3b94..2c985312b4 100644
--- a/docs/manual/makedev-syntax.txt
+++ b/docs/manual/makedev-syntax.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[makedev-syntax]]
 Makedev syntax documentation
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index c34e0ca46e..ffb6fb93ef 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 The Buildroot user manual
 =========================
diff --git a/docs/manual/package-make-target.txt b/docs/manual/package-make-target.txt
index 7374957b8c..dc9d31072e 100644
--- a/docs/manual/package-make-target.txt
+++ b/docs/manual/package-make-target.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[pkg-build-steps]]
 
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 9bc6537ca5..78ac5b645a 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[patch-policy]]
 
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 21e46273d8..5a9d049e02 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[requirement]]
 System requirements
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index d6a77a7fcf..044c908962 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[full-rebuild]]
 Understanding when a full rebuild is necessary
diff --git a/docs/manual/starting-up.txt b/docs/manual/starting-up.txt
index 2999fd4888..7326f60c77 100644
--- a/docs/manual/starting-up.txt
+++ b/docs/manual/starting-up.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Starting up
 ===========
diff --git a/docs/manual/using-buildroot-toolchain.txt b/docs/manual/using-buildroot-toolchain.txt
index 750fa99483..b4db686256 100644
--- a/docs/manual/using-buildroot-toolchain.txt
+++ b/docs/manual/using-buildroot-toolchain.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Using the generated toolchain outside Buildroot
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 857aa333b3..de29ad6b57 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Using Buildroot
 ---------------
diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
index fb6bc40e3b..b69d1e2928 100644
--- a/docs/manual/working-with.txt
+++ b/docs/manual/working-with.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Working with Buildroot
 ======================
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index f6382b56dc..c9816a4402 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Coding style
 ------------

From 4b95b369b1422b205ffde220d9cb20cc18f6b2dd Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 13 Feb 2013 12:59:04 +0000
Subject: [PATCH 4218/6849] manual: sprinkle with some calls to MESSAGE

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/manual.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index d664603a65..aa205341da 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -18,7 +18,7 @@ $(1): $(1)-$(3)
 $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
 
 $$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
-	@echo "Generating $(5) $(1)..."
+	@$(call MESSAGE,"Generating $(5) $(1)...")
 	$(Q)mkdir -p $$(@D)
 	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
 	  -D $$(@D) $$<

From 58e2e9d8048907acda3fe14d03a6094a3dd05370 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 13 Feb 2013 12:59:07 +0000
Subject: [PATCH 4219/6849] manual: minor fix in patch-policy.txt

[Peter: Drop *.patch.<arch> description as noted by Thomas]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/patch-policy.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 78ac5b645a..14c6efc538 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -34,7 +34,7 @@ Most patches are provided within Buildroot, in the package
 directory; these typically aim to fix cross-compilation, libc support,
 or other such issues.
 
-These patch files should be named +<packagename>-*.patch+.
+These patch files should be named +<packagename>-<description>.patch+.
 
 A +series+ file, as used by +quilt+, may also be added in the
 package directory. In that case, the +series+ file defines the patch
@@ -56,9 +56,8 @@ How patches are applied
 * If a +series+ file exists in the package directory, then patches are
   applied according to the +series+ file;
 +
-* Otherwise, patch files matching `<packagename>-*.patch` or
-  `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
-  name) are applied following the +ls+ command order.
+* Otherwise, patch files matching `<packagename>-*.patch` are applied
+  following the +ls+ command order.
 
 . Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.
 

From a32a55d87e4a2476fcc0dc3edc27e0a7f2dc4350 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Feb 2013 03:03:00 +0000
Subject: [PATCH 4220/6849] gesftpserver: needs mmu

Fixes:
http://autobuild.buildroot.net/results/23298ba81896e473e903c17e12ad547049b8d348

Also fix the sort order.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              | 2 +-
 package/gesftpserver/Config.in | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 2fad94d1f5..faee5c30b6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -633,6 +633,7 @@ source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
+source "package/gesftpserver/Config.in"
 source "package/heirloom-mailx/Config.in"
 source "package/hiawatha/Config.in"
 source "package/hostapd/Config.in"
@@ -649,7 +650,6 @@ source "package/ipsec-tools/Config.in"
 source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
-source "package/gesftpserver/Config.in"
 source "package/kismet/Config.in"
 source "package/lighttpd/Config.in"
 source "package/links/Config.in"
diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in
index bc38c51eec..57bbf293b2 100644
--- a/package/gesftpserver/Config.in
+++ b/package/gesftpserver/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_GESFTPSERVER
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Green End SFTP Server
 

From e32c29a09849b71cb20c964880b9be671132b7b5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 14 Feb 2013 03:50:18 +0000
Subject: [PATCH 4221/6849] libcurl: re-enable on non-MMU platforms

In 9229b82d6326ea425a258b91a9f0157ef6b223b7 ('libcurl: needs MMU'),
the libcurl package was disabled on non-MMU systems, due to the usage
of the fork() function in the library.

However, a deeper inspection reveals that fork() is only used in the
implementation of NTLM, an obscure, undocumented, Microsoft specific
authentication method that apparently isn't common anymore. See
http://curl.haxx.se/docs/manpage.html#--ntlm.

Therefore, this commit re-enables libcurl on non-MMU systems by
explicitly disabling the NTLM support. If someone ever needs NTLM
support in Buildroot's libcurl package, it will always be time to add
a libcurl sub-option to enable it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/Config.in  | 1 -
 package/libcurl/libcurl.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in
index 10ee0e415d..1d6d08e680 100644
--- a/package/libcurl/Config.in
+++ b/package/libcurl/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBCURL
 	bool "libcurl"
-	depends on BR2_USE_MMU # Uses fork()
 	help
 	  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
 	  and Dict servers, using any of the supported protocols.
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 38ca854b2d..a631953af0 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -10,7 +10,13 @@ LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_LICENSE = ICS
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
+
+# We disable NTLM support because it uses fork(), which doesn't work
+# on non-MMU platforms. Moreover, this authentication method is
+# probably almost never used. See
+# http://curl.haxx.se/docs/manpage.html#--ntlm.
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual \
+	--enable-hidden-symbols --disable-ntlm-wb
 LIBCURL_CONFIG_SCRIPTS = curl-config
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)

From f73f6787bd836e72436efd3339e3232c9637d316 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Feb 2013 04:11:21 +0000
Subject: [PATCH 4222/6849] collectd: also install to staging

Fixes bug #5906

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index a50be9c608..6d26622639 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -8,6 +8,7 @@ COLLECTD_VERSION = 5.1.2
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
+COLLECTD_INSTALL_STAGING = YES
 COLLECTD_LICENSE = GPLv2 LGPLv2.1
 COLLECTD_LICENSE_FILES = COPYING
 

From a83d7a83ac7af673f241d6347025d865bfd8c419 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 15 Feb 2013 02:48:38 +0000
Subject: [PATCH 4223/6849] kernel-headers: bump 3.{0, 4, 7}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 38e051f924..ea65b4fbd7 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.62"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.64"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.38"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.29"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.31"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.6"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.8"		if BR2_KERNEL_HEADERS_3_7
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch

From 21de23ef6505bae1cbf7f95916d2c2883ebba974 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 15 Feb 2013 02:48:39 +0000
Subject: [PATCH 4224/6849] linux: bump 3.7.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 3c50acc222..f48e6609e7 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.6"
+	bool "3.7.8"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.6" if BR2_LINUX_KERNEL_3_7
+	default "3.7.8" if BR2_LINUX_KERNEL_3_7
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 92da10e3d87f41331d1ddd673c81d1d04d6c5833 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 15 Feb 2013 02:48:40 +0000
Subject: [PATCH 4225/6849] configs/qemu: bump relevant configurations to new
 3.7.x stable kernels

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_nuri_defconfig         | 2 +-
 configs/qemu_arm_versatile_defconfig    | 2 +-
 configs/qemu_arm_vexpress_defconfig     | 2 +-
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips64_malta_defconfig     | 2 +-
 configs/qemu_mips_malta_defconfig       | 2 +-
 configs/qemu_mipsel_malta_defconfig     | 2 +-
 configs/qemu_ppc_g3beige_defconfig      | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 2 +-
 configs/qemu_ppc_virtex_ml507_defconfig | 2 +-
 configs/qemu_sparc_ss10_defconfig       | 2 +-
 configs/qemu_x86_64_defconfig           | 2 +-
 configs/qemu_x86_defconfig              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 4bc7bb289e..a18f5a9a2b 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index cbd7dd1720..65ee198674 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 8ff5a468c3..7b8a7bacba 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 46430170a9..6e47edf2b6 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 6ecbd4c7d0..8be173a4b7 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index b8ca9488ae..1b0b6221ee 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 6b034f62a3..f5a6e09c01 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index adaaedd798..a7685562af 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 080ee4d949..8cbf170a83 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 68211a0087..ddaaa45c98 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 9dfbe52451..f7f957d2a9 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 906671b294..6b883653c3 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 74011fc30e..45f0e0a553 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.7.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 2734fdb9c8..60ceacc1c8 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.7.config"

From dcb88a5500f7ce6fd877370b797009bb78e8f014 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 16 Feb 2013 07:34:27 +0000
Subject: [PATCH 4226/6849] neard: fix build with kernel headers 3.1 - 3.6

neard uses the linux/nfc.h header which is fairly recent, so we have a
patch that creates linux-nfc.h and uses it if necessary. However, since
the bump to 0.9, neard uses some symbols that are introduced in linux 3.7
so the build fails with headers 3.1 (which introduced nfc.h) to 3.6.

To resolve that, add a check for one of the newly introduced symbols
(that is used by neard).

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../neard/neard-fix-missing-linux-nfc-header.patch  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/neard/neard-fix-missing-linux-nfc-header.patch b/package/neard/neard-fix-missing-linux-nfc-header.patch
index b04c5daff8..377269e571 100644
--- a/package/neard/neard-fix-missing-linux-nfc-header.patch
+++ b/package/neard/neard-fix-missing-linux-nfc-header.patch
@@ -8,17 +8,26 @@ As a workaround until all reasonable toolchains get this header
 included, add a configure check in neard to test whether this header
 is available or not, and if not, use our own private copy of it.
 
+Since symbols from the v3.7 kernel header are used, but linux/nfc.h
+already exists since the v3.1 kernel, check for one of the most
+recently added symbols: NFC_LLCP_RAW_HEADER_SIZE.
+
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 
 Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -88,6 +88,8 @@
+@@ -88,6 +88,12 @@
  AC_SUBST(NETLINK_CFLAGS)
  AC_SUBST(NETLINK_LIBS)
  
-+AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>])
++AC_TRY_COMPILE([
++#include <sys/socket.h>
++#include <linux/nfc.h>
++	], [int err[NFC_LLCP_RAW_HEADER_SIZE-2];],
++	[AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [])
 +
  AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
  					[enable test/example scripts]),

From 2b88c0e4510457fefc6603243d4ff16a2d7a90fc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Feb 2013 01:37:37 +0000
Subject: [PATCH 4227/6849] ntfs-3g: needs mmu

The internal libfuse-lite implementation uses it, and since the external
full-blown libfuse also requires it there's no other choice.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index 1d3e2fb9bd..be19a579ea 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_NTFS_3G
 	bool "ntfs-3g"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU
 	help
 	  The NTFS-3G driver is an open source, freely available
 	  read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD,

From 0ff2d0f74b311c5b235a1294521e0e80bb82af2b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 11 Feb 2013 15:37:54 +0000
Subject: [PATCH 4228/6849] openssl: bump to version 1.0.1e

Fixes some regressions introduced by 1.0.1d

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index b4a3674626..96f817d2b2 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.1d
+OPENSSL_VERSION = 1.0.1e
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_LICENSE = OpenSSL or SSLeay
 OPENSSL_LICENSE_FILES = LICENSE

From f167245f6036b9d4dde77f6a41a27cac44bedc6a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Feb 2013 02:20:11 +0000
Subject: [PATCH 4229/6849] libcurl: add SASL security patch

Fixes CVE-2013-0249, see http://curl.haxx.se/docs/adv_20130206.html

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl-cve-2013-0249.patch | 65 +++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 package/libcurl/libcurl-cve-2013-0249.patch

diff --git a/package/libcurl/libcurl-cve-2013-0249.patch b/package/libcurl/libcurl-cve-2013-0249.patch
new file mode 100644
index 0000000000..7d2af2ac82
--- /dev/null
+++ b/package/libcurl/libcurl-cve-2013-0249.patch
@@ -0,0 +1,65 @@
+From ee45a34907ffeb5fd95b0513040d8491d565b663 Mon Sep 17 00:00:00 2001
+From: Eldar Zaitov <kyprizel@volema.com>
+Date: Wed, 30 Jan 2013 23:22:27 +0100
+Subject: [PATCH] Curl_sasl_create_digest_md5_message: fix buffer overflow
+
+When negotiating SASL DIGEST-MD5 authentication, the function
+Curl_sasl_create_digest_md5_message() uses the data provided from the
+server without doing the proper length checks and that data is then
+appended to a local fixed-size buffer on the stack.
+
+This vulnerability can be exploited by someone who is in control of a
+server that a libcurl based program is accessing with POP3, SMTP or
+IMAP. For applications that accept user provided URLs, it is also
+thinkable that a malicious user would feed an application with a URL to
+a server hosting code targetting this flaw.
+
+Bug: http://curl.haxx.se/docs/adv_20130206.html
+---
+ lib/curl_sasl.c |   23 ++++++-----------------
+ 1 file changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
+index 57116b6..d07387d 100644
+--- a/lib/curl_sasl.c
++++ b/lib/curl_sasl.c
+@@ -346,9 +346,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
+     snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]);
+ 
+   /* Prepare the URL string */
+-  strcpy(uri, service);
+-  strcat(uri, "/");
+-  strcat(uri, realm);
++  snprintf(uri, sizeof(uri), "%s/%s", service, realm);
+ 
+   /* Calculate H(A2) */
+   ctxt = Curl_MD5_init(Curl_DIGEST_MD5);
+@@ -392,20 +390,11 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
+   for(i = 0; i < MD5_DIGEST_LEN; i++)
+     snprintf(&resp_hash_hex[2 * i], 3, "%02x", digest[i]);
+ 
+-  strcpy(response, "username=\"");
+-  strcat(response, userp);
+-  strcat(response, "\",realm=\"");
+-  strcat(response, realm);
+-  strcat(response, "\",nonce=\"");
+-  strcat(response, nonce);
+-  strcat(response, "\",cnonce=\"");
+-  strcat(response, cnonce);
+-  strcat(response, "\",nc=");
+-  strcat(response, nonceCount);
+-  strcat(response, ",digest-uri=\"");
+-  strcat(response, uri);
+-  strcat(response, "\",response=");
+-  strcat(response, resp_hash_hex);
++  snprintf(response, sizeof(response),
++           "username=\"%s\",realm=\"%s\",nonce=\"%s\","
++           "cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s",
++           userp, realm, nonce,
++           cnonce, nonceCount, uri, resp_hash_hex);
+ 
+   /* Base64 encode the reply */
+   return Curl_base64_encode(data, response, 0, outptr, outlen);
+-- 
+1.7.10.4
+

From e6f0a3bd5ff4bcbb5cc24a0c79f7669055a16a75 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Feb 2013 02:20:33 +0000
Subject: [PATCH 4230/6849] gnutls: bump to version 3.1.8

Fixes a regression in 3.1.7 regarding the priority string NORMAL.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index cadc14785f..ff9cffa87f 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 3.1.7
+GNUTLS_VERSION = 3.1.8
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1
 GNUTLS_LICENSE = GPLv3+ LGPLv3

From 4b6f552a070b378fb12b07756f1df35db745598b Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 18 Feb 2013 09:39:32 +0000
Subject: [PATCH 4231/6849] qt: disable precompiled headers to workaround
 compilation failure

Precompiled header implementation is buggy in current Qt as described at
http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.

The only known workaround is currently to add -no-pch to configure.

Fixes build failure terminating with error
  compiling ../3rdparty/pixman/pixman-arm-neon-asm.S
  cc1: fatal error: .pch/release-shared-emb-arm/QtGui: No such file or directory
  compilation terminated.
such as:
http://autobuild.buildroot.net/results/648265012591280fa592a239f86ee39aec2d5fa6/build-end.log

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ee1a88b7ac..9f50f9135d 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -416,10 +416,10 @@ else
 QT_CONFIGURE_OPTS += -no-declarative
 endif
 
-# ccache and precompiled headers don't play well together
-ifeq ($(BR2_CCACHE),y)
+# -no-pch is needed to workaround the issue described at
+# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.
+# In addition, ccache and precompiled headers don't play well together
 QT_CONFIGURE_OPTS += -no-pch
-endif
 
 # x86x86fix
 # Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux

From 34945ebbd00c19f534d7d11d62bd03da2b3c4425 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 18 Feb 2013 00:38:31 +0000
Subject: [PATCH 4232/6849] busybox: support millisecond watchdog periods

The BusyBox watchdog application supports reset periods specified in
milliseconds. The Buildroot package will only allow an integer reset period,
which prevents the use of the required "ms" suffix. Change the watchdog period
configuration item to a string, to allow the use of the "ms" suffix.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/Config.in  | 4 +++-
 package/busybox/busybox.mk | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 2890c492d1..4d9899dbff 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -64,12 +64,14 @@ config BR2_PACKAGE_BUSYBOX_WATCHDOG
 if BR2_PACKAGE_BUSYBOX_WATCHDOG
 
 config BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD
-	int "Delay between reset"
+	string "Delay between reset"
 	default "5"
 	help
 	  Select the number of seconds between each
 	  reset of the watchdog (default 5)
 
+	  Use ms suffix to specify milliseconds (e.g. 500ms)
+
 endif
 
 endif
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 599e145538..900896f700 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -168,7 +168,7 @@ define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
 	[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \
 		install -D -m 0755 package/busybox/S15watchdog \
 			$(TARGET_DIR)/etc/init.d/S15watchdog && \
-		sed -i s/PERIOD/$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD)/ \
+		sed -i s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \
 			$(TARGET_DIR)/etc/init.d/S15watchdog
 endef
 endif

From 192efcdaeb58cdb5c0e82d6f6d34c069af1a7f82 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 18 Feb 2013 23:28:42 +0100
Subject: [PATCH 4233/6849] libffi: bump version

It makes more sense to use a released version for 2013.02 rather than a
git snapshot.

The build system now correctly installs libffi.pc, so we can drop the
manual install.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 9fb86d71cb..28a29162df 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -4,15 +4,11 @@
 #
 #############################################################
 
-LIBFFI_VERSION = bcc0c28001b6d427d5cd8037d2e3c892babc6b4c
-LIBFFI_SITE    = http://github.com/atgreen/libffi/tarball/$(LIBFFI_VERSION)
+LIBFFI_VERSION = 3.0.12
+LIBFFI_SITE    = ftp://sourceware.org/pub/libffi/
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE
 LIBFFI_INSTALL_STAGING = YES
-
-# We're using a version from Git which strangely bundles a generated
-# configure script, but it's broken (doesn't generate the libffi.pc
-# file).
 LIBFFI_AUTORECONF = YES
 
 # Newer CS MIPS toolchains use a different (compact) eh_frame format
@@ -22,13 +18,11 @@ LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
 endif
 
 # Move the headers to the usual location, and adjust the .pc file
-# accordingly. For some reason, the libffi build system forgets to
-# install the .pc file, so we do it manually.
+# accordingly.
 define LIBFFI_MOVE_STAGING_HEADERS
 	mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/
-	$(INSTALL) -D -m 0644 $(@D)/libffi.pc $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
-	$(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
-	$(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
+	$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
+		$(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
 endef
 
@@ -43,18 +37,7 @@ endef
 
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
-# We're using a version from Git which strangely bundles a generated
-# configure script, but it's broken (doesn't generate the libffi.pc
-# file).
 HOST_LIBFFI_AUTORECONF = YES
 
-# For some reason, the libffi build system forgets to install the .pc
-# file, so we do it manually.
-define HOST_LIBFFI_INSTALL_PC_FILE
-	$(INSTALL) -D $(@D)/libffi.pc $(HOST_DIR)/usr/lib/pkgconfig/libffi.pc
-endef
-
-HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_INSTALL_PC_FILE
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From c17096720edaea39219916f40244a3253101c7a7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Feb 2013 12:28:02 +0100
Subject: [PATCH 4234/6849] libglib2: fix build with binary microblaze
 toolchains

The toolchains don't have qsort_r or working inotify, so disable those.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index a3684327f6..278e6355b5 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -45,12 +45,17 @@ LIBGLIB2_CONF_ENV = \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r
-ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 else
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
 endif
 
+# old toolchains don't have working inotify support
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no
+endif
+
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \

From d1eccc01ff8d38a9e4e6e1864ebd66f491c962d1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Feb 2013 00:15:25 +0000
Subject: [PATCH 4235/6849] inotify-tools: needs mmu

Fixes
http://autobuild.buildroot.net/results/8424451b46d6787fc586502fa5774564e4715ce8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/inotify-tools/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/inotify-tools/Config.in b/package/inotify-tools/Config.in
index ed94b3f0ef..0a8c7c9f73 100644
--- a/package/inotify-tools/Config.in
+++ b/package/inotify-tools/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_INOTIFY_TOOLS
 	bool "inotify-tools"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork()
 	help
 	  inotify-tools is a C library and a set of command-line
 	  programs for Linux providing a simple interface to inotify.

From 443b66ae4bd6957ba66851324a8d1bd9f8a86075 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 12 Feb 2013 00:51:39 +0000
Subject: [PATCH 4236/6849] vim: Add post-install hook to remove documentation
 from target

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vim/vim.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index fa5f8aef9f..4e273d49f0 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -36,8 +36,16 @@ define VIM_INSTALL_RUNTIME_CMDS
 		$(MAKE) DESTDIR=$(TARGET_DIR) installmacros
 endef
 
+define VIM_REMOVE_DOCS
+	find $(TARGET_DIR)/usr/share/vim -type f -name "*.txt" -delete
+endef
+
 ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS
 endif
 
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS
+endif
+
 $(eval $(autotools-package))

From 2f230025e846c46dd6424878accdb5183f53f162 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Feb 2013 13:14:43 +0100
Subject: [PATCH 4237/6849] network-manager: needs host-intltool

Fixes http://autobuild.buildroot.net/results/a37bb8395334814d5c829c27194ad99409baf54b/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/network-manager/network-manager.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 2a68c96a78..b3715d8df1 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -8,7 +8,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
 NETWORK_MANAGER_INSTALL_STAGING = YES
 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
-	libgcrypt wireless_tools util-linux
+	libgcrypt wireless_tools util-linux host-intltool
 
 NETWORK_MANAGER_CONF_ENV = \
 	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config

From 6bec692f9790021e937f612f71ea90ae42512659 Mon Sep 17 00:00:00 2001
From: Henrique Camargo <henrique@henriquecamargo.com>
Date: Mon, 18 Feb 2013 11:28:19 +0000
Subject: [PATCH 4238/6849] glib-networking: fix a typo in the .mk file

The variable GLIB_NETWORKING_MINOR_VERSION had a typo.

Signed-off-by: Henrique Camargo <henrique@henriquecamargo.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/glib-networking/glib-networking.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index e8d71e5480..4812fd6c54 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -5,8 +5,8 @@
 #############################################################
 
 GLIB_NETWORKING_MAJOR_VERSION = 2.30
-GLIB_NETWORLING_MINOR_VERSION = 2
-GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORLING_MINOR_VERSION)
+GLIB_NETWORKING_MINOR_VERSION = 2
+GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION)
 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION)
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 

From 2ac83dd9279add3adfb650850b19ab0c3d42cbb1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Feb 2013 16:23:17 +0100
Subject: [PATCH 4239/6849] libtorrent: needs threads support

Fixes http://autobuild.buildroot.net/results/25e6a0a65d0b75050e02a5748b3f08a80b686188

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtorrent/Config.in | 5 +++--
 package/rtorrent/Config.in   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in
index f0315a4f37..379f4a5c74 100644
--- a/package/libtorrent/Config.in
+++ b/package/libtorrent/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_LIBTORRENT
 	bool "libtorrent"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBSIGC
 	help
 	  BitTorrent library written in C++ for *nix
 
 	  http://libtorrent.rakshasa.no/
 
-comment "libtorrent requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "libtorrent requires a toolchain with C++ and threads support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index 142ff8b41a..7b21b5af10 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_RTORRENT
 	bool "rtorrent"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBSIGC
 	select BR2_PACKAGE_LIBTORRENT
@@ -12,5 +13,5 @@ config BR2_PACKAGE_RTORRENT
 
 	  http://libtorrent.rakshasa.no/
 
-comment "rtorrent requires a toolchain with C++ and WCHAR support"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
+comment "rtorrent requires a toolchain with C++, threads and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

From 033928fd01456f599ee86a95d1a1894246ac90ae Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 19 Feb 2013 06:30:46 +0000
Subject: [PATCH 4240/6849] vim: Docs are only available when
 BR2_PACKAGE_VIM_RUNTIME is selected

Fixes
http://autobuild.buildroot.net/results/adc3e2f876f83a4011574e03bceb0007d7e891a2/build-end.log

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vim/vim.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 4e273d49f0..cb08cd9c0b 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -42,10 +42,9 @@ endef
 
 ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS
-endif
-
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS
 endif
+endif
 
 $(eval $(autotools-package))

From 8290a6261aaa4af8e8a4b3cbd6c8bedd83622572 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Feb 2013 22:05:42 +0100
Subject: [PATCH 4241/6849] Update for 2013.02-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 15 +++++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 02dbc27b67..5fdd457c82 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+2013.02-rc2, Released February 19th, 2013
+
+	Fixes all over the tree.
+
+	Various manual updates and fixes.
+
+	Updated/fixed packages: busybox, collectd, gesftpserver,
+	glib-networking, gnutls, inotify-tools, libcurl, libffi,
+	libglib2, libtorrent, libvorbis, neard, network-manager,
+	ntfs-3g, openssl, qt, rpi-userland, rtorrent, thttpd, vim.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5906: collectd client headers not exported
+
 2013.02-rc1, Released February 10th, 2013
 
 	Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target
diff --git a/Makefile b/Makefile
index 3f967b246f..3bab85530d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.02-rc1
+export BR2_VERSION:=2013.02-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index f7369d6032..36e3ddd289 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2012.11.1.tar.bz2">buildroot-2012.11.1.tar.bz2</a>.
 
 <p>
-The latest release candidate is <b>2013.02-rc1</b>, which can be
+The latest release candidate is <b>2013.02-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.02-rc1.tar.gz">buildroot-2013.02-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2013.02-rc2.tar.gz">buildroot-2013.02-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.02-rc1.tar.bz2">buildroot-2013.02-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.02-rc2.tar.bz2">buildroot-2013.02-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 2ebbe029cd..127b6d1728 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>19 February 2013 -- 2013.02-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.02_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.02-rc2.tar.bz2">2013.02-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>10 February 2013 -- 2013.02-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 88d350ca3ccdd91fd78ecf3e24e31e27726c5bc8 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 14 Feb 2013 04:27:54 +0000
Subject: [PATCH 4242/6849] linux: Install the device tree in /boot when
 installing the kernel

The option BR2_LINUX_KERNEL_INSTALL_TARGET used to install the kernel in
/boot in the rootfs. The introduction of the device tree builds made it
possible to generate device tree blobs, and stored them in IMAGES_DIR
like the kernel, but didn't copy the dtb in /boot when _INSTALL_TARGET
was enabled.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index 91a9f500bb..0352acd505 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -198,6 +198,13 @@ define LINUX_INSTALL_DTB
 		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
 		$(BINARIES_DIR)/
 endef
+define LINUX_INSTALL_DTB_TARGET
+	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	cp $(addprefix \
+		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
+		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
+		$(TARGET_DIR)/boot/
+endef
 endif
 endif
 
@@ -234,6 +241,7 @@ endef
 ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
 define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
 	install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+	$(LINUX_INSTALL_DTB_TARGET)
 endef
 endif
 

From 1d8c3e6caf6be14644ef8ef5ae2704105322442b Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Thu, 14 Feb 2013 03:15:01 +0000
Subject: [PATCH 4243/6849] uClibc: port linuxthreads errno patch to 0.9.33.2

Without this patch programs using libglib2 (libsoup, etc.. ) and pthread
may be broken.

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libc-0.9.33.2-linuxthreads-errno-fix.patch | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch
new file mode 100644
index 0000000000..c4d0d00df9
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch
@@ -0,0 +1,68 @@
+From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Jul 2010 14:08:17 +0200
+Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
+
+Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
+
+__errno_location / __h_errno_location access has to go through the PLT
+like malloc/free, so the linuxthread variants gets used instead when
+compiling with -pthread.
+
+Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/netdb.h                               |    1 -
+ libc/misc/internals/__errno_location.c        |    3 ---
+ libc/misc/internals/__h_errno_location.c      |    1 -
+ libc/sysdeps/linux/common/bits/errno.h        |    1 -
+ 6 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/include/netdb.h b/include/netdb.h
+index 9d3807d..ac411ab 100644
+--- a/include/netdb.h
++++ b/include/netdb.h
+@@ -59,7 +59,6 @@ __BEGIN_DECLS
+ 
+ /* Function to get address of global `h_errno' variable.  */
+ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__h_errno_location)
+ 
+ /* Macros for accessing h_errno from inside libc.  */
+ #ifdef _LIBC
+diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
+index 487a9c2..0620860 100644
+--- a/libc/misc/internals/__errno_location.c
++++ b/libc/misc/internals/__errno_location.c
+@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void)
+ {
+     return &errno;
+ }
+-#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
+-libc_hidden_weak(__errno_location)
+-#endif
+diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
+index 213d398..235df4e 100644
+--- a/libc/misc/internals/__h_errno_location.c
++++ b/libc/misc/internals/__h_errno_location.c
+@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
+ {
+     return &h_errno;
+ }
+-libc_hidden_weak(__h_errno_location)
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index 6e520fa..f4a9ebb 100644
+--- a/libc/sysdeps/linux/common/bits/errno.h
++++ b/libc/sysdeps/linux/common/bits/errno.h
+@@ -43,7 +43,6 @@
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__errno_location)
+ 
+ #  ifdef __UCLIBC_HAS_THREADS__
+ /* When using threads, errno is a per-thread value.  */
+-- 
+1.7.1
+

From a87471ee758b464c87f24e50e46d314a964176ef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 20 Feb 2013 20:48:22 +0100
Subject: [PATCH 4244/6849] uClibc: backport bits/time.h update to 0.9.33.2

Some packages uses CLOCK_MONOTONIC_RAW, so add it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...3.2-bits-time.h-sync-with-glibc-2.16.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch b/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
new file mode 100644
index 0000000000..2ad00328d2
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
@@ -0,0 +1,36 @@
+From 3d1b82c7d9dce11c733fe23a85df7f975c7e2486 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Tue, 3 Jul 2012 15:54:57 +0200
+Subject: [PATCH] bits/time.h: sync with glibc 2.16
+
+CLOCK_MONOTONIC_RAW is available since 2.6.28
+(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and
+CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce
+CLOCK_REALTIME_COARSE).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/time.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
+index 7ed54bf..c871223 100644
+--- a/libc/sysdeps/linux/common/bits/time.h
++++ b/libc/sysdeps/linux/common/bits/time.h
+@@ -54,6 +54,12 @@
+ #   define CLOCK_PROCESS_CPUTIME_ID	2
+ /* Thread-specific CPU-time clock.  */
+ #   define CLOCK_THREAD_CPUTIME_ID	3
++/* Monotonic system-wide clock, not adjusted for frequency scaling.  */
++#   define CLOCK_MONOTONIC_RAW		4
++/* Identifier for system-wide realtime clock, updated only on ticks.  */
++#   define CLOCK_REALTIME_COARSE	5
++/* Monotonic system-wide clock, updated only on ticks.  */
++#   define CLOCK_MONOTONIC_COARSE	6
+ 
+ /* Flag to indicate time is absolute.  */
+ #   define TIMER_ABSTIME		1
+-- 
+1.7.10.4
+

From 30876b26a7683384f7aeb3b6254e387c6bea6cac Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Feb 2013 10:55:57 +0100
Subject: [PATCH 4245/6849] matchbox-desktop: needs zlib

Otherwise the build fails with:

In file included from mbdesktop_win_plugin.c:1:0:
mbdesktop.h:31:18: fatal error: zlib.h: No such file or directory

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/Config.in                            | 1 +
 package/matchbox/matchbox-desktop/matchbox-desktop.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index e4b6149d70..d89a1762ea 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -19,6 +19,7 @@ config BR2_PACKAGE_MATCHBOX_PANEL
 config BR2_PACKAGE_MATCHBOX_DESKTOP
 	bool "Matchbox Desktop"
 	depends on BR2_PACKAGE_MATCHBOX
+	select BR2_PACKAGE_ZLIB
 	help
 	  A PDA style application launcher or 'item browser'.
 
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index f8e854c95b..13ea73074e 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -10,7 +10,7 @@ MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
 MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
 MATCHBOX_DESKTOP_LICENSE = GPLv2+
 MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
-MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
+MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
 # The bundled configure script does not properly replace LIBADD_DL, so

From 32ceab7ec0584be334618576e52b214aa2c3c04e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 21 Feb 2013 10:59:06 +0100
Subject: [PATCH 4246/6849] matchbox-wm: fix mbtheme build issue when png
 support is disabled

Fixes http://autobuild.buildroot.net/results/c02af7b66ae2c14d94edaa940f9edfcde9a9fad5

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../matchbox-wm-defaulttheme.patch            | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch

diff --git a/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch b/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch
new file mode 100644
index 0000000000..b4da66409c
--- /dev/null
+++ b/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch
@@ -0,0 +1,47 @@
+[PATCH] fix mbtheme build issue when png support is disabled
+
+DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading
+to compile errors in mbtheme.c:
+
+mbtheme.c: In function 'show_parse_error':
+mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function)
+mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in
+mbtheme.c: In function 'mbtheme_init':
+mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function)
+mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function)
+
+Fix it by unconditionally defining them as the values used are the same
+in png / !png cases anyway.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/structs.h |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+Index: matchbox-window-manager-1.2/src/structs.h
+===================================================================
+--- matchbox-window-manager-1.2.orig/src/structs.h
++++ matchbox-window-manager-1.2/src/structs.h
+@@ -81,8 +81,6 @@
+ 
+ #define GENERIC_ICON        PKGDATADIR "/mbnoapp.xpm"
+ 
+-#ifdef MB_HAVE_PNG
+-
+ #define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
+ 
+ #define DEFAULTTHEME       DATADIR "/themes/Default/matchbox/theme.xml"
+@@ -91,13 +89,6 @@
+ 
+ #define DEFAULTTHEMENAME  "Default"
+ 
+-#else
+-
+-#define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
+-#define DEFAULT_THEME_NAME  "Default"
+-
+-#endif
+-
+ #define CONFDEFAULTS       PKGDATADIR "/defaults"
+ 
+ /* Simple Macros  */

From 6f786dcf7a8bda85b0095d76477c863338896656 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Feb 2013 04:09:47 +0000
Subject: [PATCH 4247/6849] Revert "uClibc: port linuxthreads errno patch to
 0.9.33.2"

This reverts commit 1d8c3e6caf6be14644ef8ef5ae2704105322442b

The forward port breaks compilation at least for SPARC NPTL toolchains:

LD libuClibc-0.9.33.2.so
libc/libc_so.a(pipe.os): In function `__GI_pipe':
(.text+0x38): undefined reference to `__GI___errno_location'
collect2: ld returned 1 exit status

Easily triggered by a "make qemu_sparc_ss10_defconfig && make".

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libc-0.9.33.2-linuxthreads-errno-fix.patch | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch
deleted file mode 100644
index c4d0d00df9..0000000000
--- a/toolchain/uClibc/uClibc-0.9.33.2-linuxthreads-errno-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 5 Jul 2010 14:08:17 +0200
-Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
-
-Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
-
-__errno_location / __h_errno_location access has to go through the PLT
-like malloc/free, so the linuxthread variants gets used instead when
-compiling with -pthread.
-
-Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/netdb.h                               |    1 -
- libc/misc/internals/__errno_location.c        |    3 ---
- libc/misc/internals/__h_errno_location.c      |    1 -
- libc/sysdeps/linux/common/bits/errno.h        |    1 -
- 6 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/include/netdb.h b/include/netdb.h
-index 9d3807d..ac411ab 100644
---- a/include/netdb.h
-+++ b/include/netdb.h
-@@ -59,7 +59,6 @@ __BEGIN_DECLS
- 
- /* Function to get address of global `h_errno' variable.  */
- extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__h_errno_location)
- 
- /* Macros for accessing h_errno from inside libc.  */
- #ifdef _LIBC
-diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
-index 487a9c2..0620860 100644
---- a/libc/misc/internals/__errno_location.c
-+++ b/libc/misc/internals/__errno_location.c
-@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void)
- {
-     return &errno;
- }
--#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
--libc_hidden_weak(__errno_location)
--#endif
-diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
-index 213d398..235df4e 100644
---- a/libc/misc/internals/__h_errno_location.c
-+++ b/libc/misc/internals/__h_errno_location.c
-@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
- {
-     return &h_errno;
- }
--libc_hidden_weak(__h_errno_location)
-diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
-index 6e520fa..f4a9ebb 100644
---- a/libc/sysdeps/linux/common/bits/errno.h
-+++ b/libc/sysdeps/linux/common/bits/errno.h
-@@ -43,7 +43,6 @@
- # ifndef __ASSEMBLER__
- /* Function to get address of global `errno' variable.  */
- extern int *__errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__errno_location)
- 
- #  ifdef __UCLIBC_HAS_THREADS__
- /* When using threads, errno is a per-thread value.  */
--- 
-1.7.1
-

From 3dc86ad93759ccd110541f4dc535257e8084c414 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 21 Feb 2013 20:08:56 +0000
Subject: [PATCH 4248/6849] keyutils: needs mmu

Fixes:
http://autobuild.buildroot.org/results/ff84ee5335e3302dbb47d881d9903db81884014c

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/keyutils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in
index 9b9f9bc656..6978687f13 100644
--- a/package/keyutils/Config.in
+++ b/package/keyutils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KEYUTILS
 	bool "keyutils"
 	depends on !BR2_avr32 && !BR2_microblaze
+	depends on BR2_USE_MMU # fork()
 	help
 	  These tools are used to control the key management system
 	  built into the Linux kernel.

From 669dcf3a624c18a9b260e890a48cc416217bbd28 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 22 Feb 2013 00:24:33 +0000
Subject: [PATCH 4249/6849] conntrack-tools: needs mmu

Fixes
http://autobuild.buildroot.net/results/641755fbc61b47361b71161eabbf3075c7598c88/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index ddede0eeab..50f2000364 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 	bool "conntrack-tools"
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	select BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT

From 00a11f5640616931a920f27da4ea59671c8d3aaf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 22 Feb 2013 08:56:54 +0000
Subject: [PATCH 4250/6849] libffi: fix powerpc build breakage

Happens with the latest release when there are no FP registers.
Fixes:
http://autobuild.buildroot.net/results/bc43261d3ddc9d4c320522563249f4a0695a35a4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi-002-fix-ppc-nofpr.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libffi/libffi-002-fix-ppc-nofpr.patch

diff --git a/package/libffi/libffi-002-fix-ppc-nofpr.patch b/package/libffi/libffi-002-fix-ppc-nofpr.patch
new file mode 100644
index 0000000000..729bae812b
--- /dev/null
+++ b/package/libffi/libffi-002-fix-ppc-nofpr.patch
@@ -0,0 +1,29 @@
+From: Gilles Talis <gilles.talis@gmail.com>
+
+On PPC, if __NO_FPRS__ is defined, fparg_count and NUM_FPR_ARG_REGISTERS
+are not defined, thus must not be used.
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ src/powerpc/ffi.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
+index f3a96a1..9c69584 100644
+--- a/src/powerpc/ffi.c
++++ b/src/powerpc/ffi.c
+@@ -376,9 +376,10 @@ ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack)
+      with the number found in ffi_prep_cif_machdep().  However, intarg_count
+      is incremeneted whenever we place an FP arg on the stack, so account for
+      that before our assert test.  */
++#ifndef __NO_FPRS__
+   if (fparg_count > NUM_FPR_ARG_REGISTERS)
+     intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS;
+-#ifndef __NO_FPRS__
++
+   FFI_ASSERT (fpr_base.u
+ 	      <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS);
+ #endif
+-- 
+1.7.10.4
+

From 4992307bd1d76ef7fd88978896675d57fa62e663 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 19 Feb 2013 22:29:00 +0000
Subject: [PATCH 4251/6849] linenoise: patch was merged on upstream

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linenoise/linenoise-get-columns.patch | 20 -------------------
 package/linenoise/linenoise.mk                |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 package/linenoise/linenoise-get-columns.patch

diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch
deleted file mode 100644
index 4fb9e40855..0000000000
--- a/package/linenoise/linenoise-get-columns.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-returns the default value (80) when a real value is not available
-(0 is not an acceptable value for COLUMNS, the width of the screen).
-
-see pull request on upstream : http://github.com/antirez/linenoise/pull/31
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/linenoise.c
-===================================================================
---- a/linenoise.c
-+++ b/linenoise.c
-@@ -182,7 +182,7 @@
- static int getColumns(void) {
-     struct winsize ws;
- 
--    if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
-+    if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
-     return ws.ws_col;
- }
- 
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 343a107569..fb739602a2 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -3,7 +3,7 @@
 # linenoise
 #
 #############################################################
-LINENOISE_VERSION = g8c9b481
+LINENOISE_VERSION = g27a3b4d
 LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
 LINENOISE_LICENSE = BSD-2c
 LINENOISE_INSTALL_STAGING = YES

From 7f68a28d78eee37dd32f0fcf9083e86ad1e79485 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 19 Feb 2013 22:29:29 +0000
Subject: [PATCH 4252/6849] luajit: bump to version 2.0.1

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luajit/luajit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 844122e900..bf9cfe8356 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUAJIT_VERSION = 2.0.0
+LUAJIT_VERSION = 2.0.1
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE    = http://luajit.org/download
 LUAJIT_LICENSE = MIT

From 4667e1cb86ebcad372c61c72c8ad0f15a30d0552 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Feb 2013 13:22:28 +0000
Subject: [PATCH 4253/6849] package/tvheadend: update to v3.5

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...eadend-001-no-auto-download-dvbscans.patch | 66 +++++++++++++++++++
 .../tvheadend-002-no-check_config.patch       | 23 +++++++
 package/tvheadend/tvheadend-fix-Werror.patch  | 44 -------------
 .../tvheadend-no-auto-download-dvbscans.patch | 60 -----------------
 package/tvheadend/tvheadend-no-wordexp.patch  | 20 ------
 package/tvheadend/tvheadend.mk                |  2 +-
 6 files changed, 90 insertions(+), 125 deletions(-)
 create mode 100644 package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
 create mode 100644 package/tvheadend/tvheadend-002-no-check_config.patch
 delete mode 100644 package/tvheadend/tvheadend-fix-Werror.patch
 delete mode 100644 package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
 delete mode 100644 package/tvheadend/tvheadend-no-wordexp.patch

diff --git a/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
new file mode 100644
index 0000000000..cc25c564cc
--- /dev/null
+++ b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
@@ -0,0 +1,66 @@
+Do not download transponder data as part of the build
+
+If dvb-scan is enabled, tvheadend will download the transponders data
+from the dvb-apps package. This does not play well with buildroot.
+
+Instead, we rely on the dvb-apps package to install those files, so
+it is no longer needed to install those as part of tvheadend.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
+--- tvheadend-v3.5.orig/configure	2013-02-15 14:41:26.000000000 +0100
++++ tvheadend-v3.5/configure	2013-02-16 15:41:16.675556099 +0100
+@@ -178,15 +178,16 @@
+ #
+ # DVB scan
+ #
+-if enabled linuxdvb && enabled dvbscan; then
+-  printf "${TAB}" "fetching dvb-scan files ..."
+-  ${ROOTDIR}/support/getmuxlist
+-  if [ $? -ne 0 ]; then
+-    echo "fail"
+-    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
+-  fi
+-  echo "ok"
+-fi
++# For buildroot, we already installed those files via the dvb-apps package
++#if enabled linuxdvb && enabled dvbscan; then
++#  printf "${TAB}" "fetching dvb-scan files ..."
++#  ${ROOTDIR}/support/getmuxlist
++#  if [ $? -ne 0 ]; then
++#    echo "fail"
++#    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
++#  fi
++#  echo "ok"
++#fi
+ 
+ # ###########################################################################
+ # Write config
+Binary files tvheadend-v3.5.orig/.configure.swp and tvheadend-v3.5/.configure.swp differ
+diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
+--- tvheadend-v3.5.orig/Makefile	2013-02-15 14:41:26.000000000 +0100
++++ tvheadend-v3.5/Makefile	2013-02-16 15:41:38.218821287 +0100
+@@ -207,7 +207,7 @@
+ SRCS-${CONFIG_BUNDLE}     += bundle.c
+ BUNDLES-yes               += docs/html docs/docresources src/webui/static
+ BUNDLES-yes               += data/conf
+-BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
++#BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
+ BUNDLES                    = $(BUNDLES-yes)
+ 
+ #
+diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk
+--- tvheadend-v3.5.orig/support/posix.mk	2013-02-15 14:41:26.000000000 +0100
++++ tvheadend-v3.5/support/posix.mk	2013-02-16 15:42:41.015290003 +0100
+@@ -15,6 +15,10 @@
+ 
+ 	find ${DESTDIR}${datadir}/tvheadend -name .git -exec rm -rf {} \; &>/dev/null || /bin/true
+ 
++	mkdir -p ${DESTDIR}${datadir}/tvheadend/data
++	rm -f ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
++	ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
++
+ uninstall:
+ 	rm -f ${DESTDIR}${bindir)/tvheadend
+ 	rm -f ${DESTDIR}${mandir)/tvheadend.1
diff --git a/package/tvheadend/tvheadend-002-no-check_config.patch b/package/tvheadend/tvheadend-002-no-check_config.patch
new file mode 100644
index 0000000000..a0edcdcfde
--- /dev/null
+++ b/package/tvheadend/tvheadend-002-no-check_config.patch
@@ -0,0 +1,23 @@
+Makefile: do not use check_config
+
+test(1) only uses the second to compare two files dates.
+test(1) also does a strict comparison wrt. dates.
+
+But, on very fast systems, the configure and .config.mk
+files may be created in the same second, and so would lead
+to a false comparison of the files' dates.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
+--- tvheadend-v3.5.orig/Makefile	2013-02-17 15:15:03.228749505 +0100
++++ tvheadend-v3.5/Makefile	2013-02-17 15:15:51.591923062 +0100
+@@ -246,7 +246,7 @@
+ 	$(CURDIR)/configure $(CONFIGURE_ARGS)
+ 
+ # Binary
+-${PROG}: check_config $(OBJS) $(ALLDEPS)
++${PROG}: $(OBJS) $(ALLDEPS)
+ 	$(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS)
+ 
+ # Object
diff --git a/package/tvheadend/tvheadend-fix-Werror.patch b/package/tvheadend/tvheadend-fix-Werror.patch
deleted file mode 100644
index 5f6dbad821..0000000000
--- a/package/tvheadend/tvheadend-fix-Werror.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 1334869bf0ea668e58e1c72daa3c09c1a95b5d81
-Author: Alexey I. Froloff <raorn@raorn.name>
-Date:   Wed Oct 24 21:10:15 2012 +0400
-
-    [PR-172] Fix compilatioin issues on OpenWRT
-    
-    Fix SHA1_* function names
-    Fix unused variables and functions
-
----
-"Yann E. MORIN" <yann.morin.1998@free.fr>:
-    For buildroot, I removed the SHA_* fixes, as we're not affected.
-    No point in fixing something that does not bug us.
-
-diff --git a/src/trap.c b/src/trap.c
-index bd76118..b0fe543 100644
---- a/src/trap.c
-+++ b/src/trap.c
-@@ -67,6 +67,7 @@ sappend(char *buf, size_t l, const char *fmt, ...)
- /**
-  *
-  */
-+#if ENABLE_EXECINFO
- static int
- add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
- {
-@@ -126,6 +127,7 @@ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
-   close(fd[0]);
-   return 0;
- }
-+#endif /* ENABLE_EXECINFO */
- 
- 
- 
-@@ -133,8 +135,8 @@ static void
- traphandler(int sig, siginfo_t *si, void *UC)
- {
-   ucontext_t *uc = UC;
--  char buf[200];
- #if ENABLE_EXECINFO
-+  char buf[200];
-   static void *frames[MAXFRAMES];
-   int nframes = backtrace(frames, MAXFRAMES);
-   Dl_info dli;
diff --git a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
deleted file mode 100644
index 963d4f2b76..0000000000
--- a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Do not download transponder data as part of the build
-
-If dvb-scan is enabled, tvheadend will download the transponders data
-from the dvb-apps package. This does not play well with buildroot.
-
-Instead, we rely on the dvb-apps package to install those files, so
-it is no longer needed to install those as part of tvheadend.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN tvheadend-v3.3.orig//configure tvheadend-v3.3/configure
---- tvheadend-v3.3.orig//configure	2012-09-25 15:32:31.000000000 +0200
-+++ tvheadend-v3.3/configure	2012-12-28 17:17:23.580253413 +0100
-@@ -96,13 +96,14 @@
- #
- # DVB scan
- #
--if enabled linuxdvb && enabled dvbscan; then
--  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then
--    echo -n "Fetching dvb-scan files... "
--    ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
--    echo "done"
--  fi
--fi
-+# For buildroot, we already installed those files via the dvb-apps package
-+#if enabled linuxdvb && enabled dvbscan; then
-+#  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then
-+#    echo -n "Fetching dvb-scan files... "
-+#    ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
-+#    echo "done"
-+#  fi
-+#fi
- 
- # ###########################################################################
- # Write config
-diff -durN tvheadend-v3.3.orig//Makefile tvheadend-v3.3/Makefile
---- tvheadend-v3.3.orig//Makefile	2012-09-25 15:32:31.000000000 +0200
-+++ tvheadend-v3.3/Makefile	2012-12-28 17:17:47.573497346 +0100
-@@ -180,7 +180,7 @@
- SRCS-${CONFIG_BUNDLE}     += bundle.c
- BUNDLES-yes               += docs/html docs/docresources src/webui/static
- BUNDLES-yes               += data/conf
--BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
-+#BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
- BUNDLES                    = $(BUNDLES-yes)
- 
- #
-diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk
---- tvheadend-v3.3.orig//support/posix.mk	2012-09-25 15:32:31.000000000 +0200
-+++ tvheadend-v3.3/support/posix.mk	2012-12-28 17:19:28.903121722 +0100
-@@ -12,7 +12,8 @@
- 		mkdir -p ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
- 		cp -r $$bundle/*  ${DESTDIR}${datadir}/tvheadend/$$bundle ;\
- 	done
--
-+	mkdir -p ${DESTDIR}${datadir}/tvheadend/data
-+	ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
- 
- uninstall:
- 	rm -f ${DESTDIR}${bindir)/tvheadend
diff --git a/package/tvheadend/tvheadend-no-wordexp.patch b/package/tvheadend/tvheadend-no-wordexp.patch
deleted file mode 100644
index ae290edaf8..0000000000
--- a/package/tvheadend/tvheadend-no-wordexp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-epggrab: do not include wordexp.h
-
-Nothing from wordexp.h is needed (stray include?)
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
-Patch sent upstream, but no mailing-list. :-(
-Status: awaiting feedback.
-
-diff -durN tvheadend-v3.3.orig/src/epggrab.c tvheadend-v3.3/src/epggrab.c
---- tvheadend-v3.3.orig/src/epggrab.c	2012-09-25 15:32:31.000000000 +0200
-+++ tvheadend-v3.3/src/epggrab.c	2012-12-31 19:22:29.768431849 +0100
-@@ -20,7 +20,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
--#include <wordexp.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/un.h>
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 51007812cf..5a971b854d 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ##############################################################
 
-TVHEADEND_VERSION           = v3.3
+TVHEADEND_VERSION           = v3.5
 TVHEADEND_SITE              = http://github.com/tvheadend/tvheadend/tarball/$(TVHEADEND_VERSION)
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE

From 54b2bad158fd10c0514fe37832108c30e0c4a291 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Feb 2013 13:22:30 +0000
Subject: [PATCH 4254/6849] package/vtun: add missing 'depends on' zlib

The dependency on zlib is correctly expresed in vtun.mk,
but was missing from the Config.in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vtun/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/vtun/Config.in b/package/vtun/Config.in
index b40de255bc..7afda9e2aa 100644
--- a/package/vtun/Config.in
+++ b/package/vtun/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_VTUN
 	bool "vtun - BEWARE: read package/vtun/README.txt before use"
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_ZLIB
 	help
 	  Tool for easily creating Virtual Tunnels over TCP/IP networks
 	  with traffic shaping, compression, and encryption.

From 2b36d80c63afae74bf759f27e3eecf9e1f394e77 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Feb 2013 13:22:31 +0000
Subject: [PATCH 4255/6849] package/vtun: update to 3.0.3

Against all odds, vtun had a new release sometime last year.

Still, the code needs patching:
  - the existing patch to fix installation has been refreshed
  - the existing patch to fix blowfish header location has been
    replaced (see below)
  - configure looks in hard-coded, host paths (eg. /usr/include)
    without any consideration for scross-compilation
    --> new patch
  - configure.in does not even pass an autoreconf without a
    bit of love first (it's written in an ancient dialect that
    autoreconf does no longer recognise)
    --> new patch

Remove obsolete, unused, bit-rotting scripts and warning.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vtun/Config.in                        |  2 +-
 package/vtun/README.txt                       | 37 --------
 ....patch => vtun-001-fix-installation.patch} | 21 ++++-
 .../vtun-002-fix-ssl-headers-checks.patch     | 47 ++++++++++
 .../vtun/vtun-003-fixup-configure.in.patch    | 92 +++++++++++++++++++
 package/vtun/vtun-3.0.2-003-configure.patch   | 12 ---
 package/vtun/vtun.mk                          |  3 +-
 package/vtun/vtund.rc.debian-2.6              | 50 ----------
 package/vtun/vtund.rc.debian-3.0.2            | 61 ------------
 9 files changed, 158 insertions(+), 167 deletions(-)
 delete mode 100644 package/vtun/README.txt
 rename package/vtun/{vtun-3.0.2-001-Makefile.in.patch => vtun-001-fix-installation.patch} (57%)
 create mode 100644 package/vtun/vtun-002-fix-ssl-headers-checks.patch
 create mode 100644 package/vtun/vtun-003-fixup-configure.in.patch
 delete mode 100644 package/vtun/vtun-3.0.2-003-configure.patch
 delete mode 100644 package/vtun/vtund.rc.debian-2.6
 delete mode 100644 package/vtun/vtund.rc.debian-3.0.2

diff --git a/package/vtun/Config.in b/package/vtun/Config.in
index 7afda9e2aa..fc352125ca 100644
--- a/package/vtun/Config.in
+++ b/package/vtun/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_VTUN
-	bool "vtun - BEWARE: read package/vtun/README.txt before use"
+	bool "vtun"
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
diff --git a/package/vtun/README.txt b/package/vtun/README.txt
deleted file mode 100644
index 5ee047958d..0000000000
--- a/package/vtun/README.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Previous vtun was version 2.6.
-This does not buld because its "configure" requires
-that -llzo contains "lzolx_decompress".
-"vtun" does not build, evenm if liblzo is available.
-
-The LZO package currently used by buildroot
-does not contain ANY reference to "lzolx_decompress"
-
-"vtun" has been upgraded to 3.0.2 and now builds OK,
-but is yet to be tested on a target.
-The previous patch containing three diffs,
-has been broken up into three files.
-
-The second patch fails.
-
-This patch tries to replace a perl script
-($(VTUN_DIR)/scripts/vtund.rc.debian)
-with a shell script with the same name.
-
-In vtun-3.0.2, vtund.rc.debian is a shell script which is
-fairly similar to the shell script provided by the patch.
-For now, it has been decided not to replace this shell 
-script with the script generated by the patch for 2.6
-
-vtun will thus be built with the 3.0.2 vtund.rc.debian.
-The start-stop-daemon parameters and other things
-in this script may be inappropriate for something based on busybox.
-
-I will leave the decision which script to use,
-the 2-6 script or the 3.0.2 script to someone else.
-
-Both files are kept in the directory, but should
-be removed once it has been decided what to do
-about this script.
-
-Signed-Off by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
-
diff --git a/package/vtun/vtun-3.0.2-001-Makefile.in.patch b/package/vtun/vtun-001-fix-installation.patch
similarity index 57%
rename from package/vtun/vtun-3.0.2-001-Makefile.in.patch
rename to package/vtun/vtun-001-fix-installation.patch
index 1f93969260..d9659fa885 100644
--- a/package/vtun/vtun-3.0.2-001-Makefile.in.patch
+++ b/package/vtun/vtun-001-fix-installation.patch
@@ -1,6 +1,17 @@
-diff -urN vtun/Makefile.in vtun-2.6/Makefile.in
---- vtun/Makefile.in	2002-12-20 09:55:47.000000000 -0700
-+++ vtun-2.6/Makefile.in	2003-06-05 12:38:31.000000000 -0600
+Makefile.in: fix installation steps
+
+Not sure what the reason for that patch is, but originally added by Ulf
+Samuelsson <ulf.samuelsson@atmel.com>, when upgrading from 2.6.x to 3.0.2.
+
+yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the
+SoB by Ulf, but it was not explicitly reproduced here in the patch; so I
+added it here directly in the patch.
+
+Somewhat-signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in
+--- vtun-3.0.3.orig/Makefile.in	2012-07-09 06:55:38.000000000 +0200
++++ vtun-3.0.3/Makefile.in	2013-02-16 23:28:47.034036869 +0100
 @@ -28,7 +28,7 @@
  LEXFLAGS = -t 
  
@@ -10,7 +21,7 @@ diff -urN vtun/Makefile.in vtun-2.6/Makefile.in
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-@@ -86,15 +86,15 @@
+@@ -89,16 +89,15 @@
  
  install_config: 
  	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
@@ -26,8 +37,8 @@ diff -urN vtun/Makefile.in vtun-2.6/Makefile.in
  	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
  	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
  	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
+-	$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund
 +	$(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \
 +		$(DESTDIR)$(ETC_DIR)/init.d/S90vtun
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
-
diff --git a/package/vtun/vtun-002-fix-ssl-headers-checks.patch b/package/vtun/vtun-002-fix-ssl-headers-checks.patch
new file mode 100644
index 0000000000..765411af84
--- /dev/null
+++ b/package/vtun/vtun-002-fix-ssl-headers-checks.patch
@@ -0,0 +1,47 @@
+configure.in: do not hard-code search patch for SSL headers
+
+Do. Not. Do. That. It breaks cross-compilation.
+
+Also use the SSL headers dir to look for blowfish headers.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in
+--- vtun-3.0.3.orig/configure.in	2009-03-29 12:08:51.000000000 +0200
++++ vtun-3.0.3/configure.in	2013-02-16 23:44:44.004339680 +0100
+@@ -166,7 +166,7 @@
+    AC_MSG_RESULT()
+    AC_CHECKING( for md5 Library and Header files ... )
+ AC_SEARCH_HEADERS(md5.h,
+-    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys, 
++    $SSL_HDR_DIR "" , 
+     ,
+     AC_MSG_ERROR( SSL headers not found. )
+    )
+@@ -176,7 +176,7 @@
+    AC_MSG_RESULT()
+    AC_CHECKING( for blowfish Library and Header files ... )
+    AC_SEARCH_HEADERS(blowfish.h,
+-    $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto,
++    $BLOWFISH_HDR_DIR $SSL_HDR_DIR,
+ 	AC_CHECK_LIB(crypto, BF_set_key,
+ 	    [
+ 	       LIBS="$LIBS -lcrypto"
+@@ -193,7 +193,7 @@
+    AC_MSG_RESULT()
+    AC_CHECKING( for AES Library and Header files ... )
+    AC_SEARCH_HEADERS(aes.h,
+-    $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto,
++    $SSL_HDR_DIR ,
+ 	AC_CHECK_LIB(crypto, AES_set_encrypt_key,
+ 	    [
+ 	       AC_DEFINE(HAVE_SSL_AES)
+@@ -208,7 +208,7 @@
+    AC_MSG_RESULT()
+    AC_CHECKING( for EVP Library and Header files ... )
+    AC_SEARCH_HEADERS(evp.h,
+-    $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto,
++    $SSL_HDR_DIR ,
+ 	AC_CHECK_LIB(crypto, EVP_EncryptInit,
+ 	    [
+ 	       AC_DEFINE(HAVE_SSL_EVP)
diff --git a/package/vtun/vtun-003-fixup-configure.in.patch b/package/vtun/vtun-003-fixup-configure.in.patch
new file mode 100644
index 0000000000..cb2ac67aa2
--- /dev/null
+++ b/package/vtun/vtun-003-fixup-configure.in.patch
@@ -0,0 +1,92 @@
+configure.in: minimal syntax fixup for autoreconf
+
+This is the strictly minimal syntax fixups to make autoreconf happy...
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Note: configure.in is still full of incorrect syntax, but fixing it is
+a task for another day, and would have to be upstreamed. But upstream
+looks to be moribund at best, if not dead... :-(
+
+So, keep it for ourselves for now... Too bad, vtun is really helpfull.
+
+--- vtun-3.0.3.orig/configure.in	2013-02-16 23:54:52.582451817 +0100
++++ vtun-3.0.3/configure.in	2013-02-17 00:03:13.640887353 +0100
+@@ -110,10 +110,10 @@
+ AC_SEARCH_LIBS(nanosleep, rt posix4)
+ 
+ dnl Check for setproctitle in libutil
+-AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE(HAVE_SETPROC_TITLE) )
++AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE([HAVE_SETPROC_TITLE],[],[Define to set title in /proc]) )
+ 
+ if test "$SHAPER" = "yes"; then
+-   AC_DEFINE(HAVE_SHAPER)
++   AC_DEFINE([HAVE_SHAPER],[],[Define to use shapper])
+ fi
+ 
+ if test "$ZLIB" = "yes"; then
+@@ -121,7 +121,7 @@
+    AC_CHECKING( for ZLIB Library and Header files ... )
+    AC_CHECK_LIB(z, deflate,
+ 	LIBS="$LIBS -lz"
+-	AC_DEFINE(HAVE_ZLIB),
++	AC_DEFINE([HAVE_ZLIB],[],[Define to use ZLIB]),
+ 	AC_MSG_ERROR( Zlib library not found.)
+    )
+ fi
+@@ -148,7 +148,7 @@
+ 	    AC_CHECK_LIB($I, lzo1x_decompress,
+ 	    [
+ 	          LIBS="$LIBS -l"$I
+-	       AC_DEFINE(HAVE_LZO)
++	       AC_DEFINE([HAVE_LZO],[],[Define to use LZO])
+ 	          havelzo=1
+ 	      ]
+ 	    )
+@@ -180,8 +180,8 @@
+ 	AC_CHECK_LIB(crypto, BF_set_key,
+ 	    [
+ 	       LIBS="$LIBS -lcrypto"
+-	       AC_DEFINE(HAVE_SSL)
+-	       AC_DEFINE(HAVE_SSL_BLOWFISH)
++	       AC_DEFINE([HAVE_SSL],[],[Define to use SSL])
++	       AC_DEFINE([HAVE_SSL_BLOWFISH],[],[Define to use blowfish])
+ 	    ],
+ 	    AC_MSG_ERROR( SSL library not found. )
+ 	),
+@@ -196,7 +196,7 @@
+     $SSL_HDR_DIR ,
+ 	AC_CHECK_LIB(crypto, AES_set_encrypt_key,
+ 	    [
+-	       AC_DEFINE(HAVE_SSL_AES)
++	       AC_DEFINE([HAVE_SSL_AES],[],[Define to use AES])
+ 	    ],
+ 	    AC_MSG_ERROR( AES library not found. )
+ 	),
+@@ -211,7 +211,7 @@
+     $SSL_HDR_DIR ,
+ 	AC_CHECK_LIB(crypto, EVP_EncryptInit,
+ 	    [
+-	       AC_DEFINE(HAVE_SSL_EVP)
++	       AC_DEFINE([HAVE_SSL_EVP],[],Define to use EVP)
+ 	    ],
+ 	    AC_MSG_ERROR( EVP library not found. )
+ 	),
+@@ -220,7 +220,7 @@
+ fi
+ 
+ if test "$NATHACK" = "yes"; then
+-   AC_DEFINE(ENABLE_NAT_HACK)
++   AC_DEFINE([ENABLE_NAT_HACK],[],[Define to use NAT hack])
+ fi
+ 
+ if test "$SOCKS" = "yes"; then
+@@ -274,6 +274,6 @@
+ REL=`echo 'BRANCH-3_X' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
+ changequote([,])
+ 
+-AC_DEFINE_UNQUOTED(VTUN_VER, "$REL `date '+%m/%d/%Y'`")
++AC_DEFINE_UNQUOTED([VTUN_VER], ["$REL `date '+%m/%d/%Y'`"], [vtun version])
+ 
+ AC_OUTPUT(Makefile)
diff --git a/package/vtun/vtun-3.0.2-003-configure.patch b/package/vtun/vtun-3.0.2-003-configure.patch
deleted file mode 100644
index 7ddc0431a3..0000000000
--- a/package/vtun/vtun-3.0.2-003-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vtun-2.6/configure.dist	2004-03-11 10:39:10.000000000 -0600
-+++ vtun-2.6/configure	2004-03-11 10:45:52.000000000 -0600
-@@ -2112,7 +2112,7 @@
-     echo $ac_n "checking "for blowfish.h"""... $ac_c" 1>&6
- echo "configure:2114: checking "for blowfish.h"" >&5 
-     ac_hdr_found=no
--    for p in $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto; do
-+    for p in $BLOWFISH_HDR_DIR $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto; do
- 	if test -n "$p"; then
- 	  dir="$p"
- 	else
-
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 7bc0a81e56..2affa2e44d 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -7,10 +7,11 @@
 #
 #############################################################
 
-VTUN_VERSION = 3.0.2
+VTUN_VERSION = 3.0.3
 VTUN_SOURCE = vtun-$(VTUN_VERSION).tar.gz
 VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
 VTUN_DEPENDENCIES = zlib lzo openssl
+VTUN_AUTORECONF = YES
 
 VTUN_CONF_OPT = \
 		--with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
diff --git a/package/vtun/vtund.rc.debian-2.6 b/package/vtun/vtund.rc.debian-2.6
deleted file mode 100644
index eb8226e9cb..0000000000
--- a/package/vtun/vtund.rc.debian-2.6
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-#
- 
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/vtund
-CONFFILE=/etc/vtund-start.conf
-PIDPREFIX=/var/run/vtund
-  
-test -f $DAEMON || exit 0
-  
-case "$1" in 
-       start)
-      # find all the defined tunnels
-      egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true;
-      do
-          read i
-          # no more lines available? done, then.
-          if [ $? != 0 ] ; then break; fi
-              SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`;
-              if [ -n "$SARGS" ];
-              then
-                 echo "Starting vtund server."
-                  start-stop-daemon -S -x $DAEMON -- $SARGS;
-              else
-                  # split args into host and rest
-                  HOST=`echo $i|cut -f 1 -d " "`;
-                  TARGET=`echo $i|cut -f 2 -d " "`;
-                  echo  "Starting vtund client $HOST to $TARGET.";
-                  start-stop-daemon -S -x $DAEMON -- $i;
-
-              fi
-          done
-              ;;
-       stop) 
-	  echo "Stopping vtund.";
-	  start-stop-daemon -K -x vtund;
-	  ;;
-
-       restart|reload|force-reload) 
-	   $0 stop
-	   sleep 1;
-	   $0 start
-	   ;;
-   *)
-      echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-       exit 1
-               ;;
-esac
-exit 0
-
diff --git a/package/vtun/vtund.rc.debian-3.0.2 b/package/vtun/vtund.rc.debian-3.0.2
deleted file mode 100644
index 5158663f16..0000000000
--- a/package/vtun/vtund.rc.debian-3.0.2
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-#
-# submitted by Morgon Kanter
-# 
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/vtund
-CONFFILE=/etc/vtund-start.conf
-PIDPREFIX=/var/run/vtund
-  
-test -f $DAEMON || exit 0
-  
-case "$1" in 
-       start)
-      # find all the defined tunnels
-      egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true;
-      do
-          read i
-          # no more lines available? done, then.
-          if [ $? != 0 ] ; then break; fi
-              SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`;
-              if [ -n "$SARGS" ];
-              then
-                 echo "Starting vtund server."
-                  start-stop-daemon --start --exec $DAEMON --pidfile $PIDPREFIX.pid -- $SARGS;
-              else
-                  # split args into host and rest
-                  HOST=`echo $i|cut -f 1 -d " "`;
-                  TARGET=`echo $i|cut -f 2 -d " "`;
-                  echo  "Starting vtund client $HOST to $TARGET.";
-                  start-stop-daemon --start --exec $DAEMON --pidfile $PIDPREFIX.$HOST.pid -- $i;
- 
-              fi
-          done
-              ;;
-       stop) 
-          echo "Stopping vtund.";
-          for i in $PIDPREFIX*;
-          do
-              start-stop-daemon --stop --pidfile $i; 
-              rm -f $i;
-          done
-               ;;
-       reload|force-reload)
-          echo "Reloading vtund.";
-          for i in $PIDPREFIX*;
-          do
-              start-stop-daemon --stop --signal 1 --pidfile $i; 
-          done
-              ;;
-       restart) 
-          $0 stop
-          sleep 1;
-          $0 start
-          ;;
-   *)
-      echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-       exit 1
-               ;;
-esac
-exit 0

From 3833cf499484a1ccab971c3b74210e10ce4028bd Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Feb 2013 13:22:32 +0000
Subject: [PATCH 4256/6849] package/connman: bump version to 1.11

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 73ea70d932..bb528b4a9b 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.10
+CONNMAN_VERSION = 1.11
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES

From 0b9e763e161ceb0b4d81a344d10c1a33c1036af7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Feb 2013 13:22:30 +0000
Subject: [PATCH 4257/6849] package/vtun: add missing 'depends on' zlib

The dependency on zlib is correctly expresed in vtun.mk,
but was missing from the Config.in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vtun/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/vtun/Config.in b/package/vtun/Config.in
index b40de255bc..7afda9e2aa 100644
--- a/package/vtun/Config.in
+++ b/package/vtun/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_VTUN
 	bool "vtun - BEWARE: read package/vtun/README.txt before use"
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_ZLIB
 	help
 	  Tool for easily creating Virtual Tunnels over TCP/IP networks
 	  with traffic shaping, compression, and encryption.

From 3f73abd78ba566f664f6012d0cd90dd26f4eb434 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 00:48:03 +0000
Subject: [PATCH 4258/6849] exfat: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/exfat/Config.in | 15 +++++++++++++++
 package/exfat/exfat.mk  | 25 +++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/exfat/Config.in
 create mode 100644 package/exfat/exfat.mk

diff --git a/package/Config.in b/package/Config.in
index 2fad94d1f5..983ac4a3db 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -189,6 +189,7 @@ source "package/cramfs/Config.in"
 source "package/curlftpfs/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
+source "package/exfat/Config.in"
 source "package/flashbench/Config.in"
 source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
diff --git a/package/exfat/Config.in b/package/exfat/Config.in
new file mode 100644
index 0000000000..c7e7fdbf00
--- /dev/null
+++ b/package/exfat/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_EXFAT
+	bool "exFAT (FUSE)"
+	depends on BR2_LARGEFILE # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBFUSE
+	help
+	  A full-featured exFAT file system implementation for GNU/Linux
+	  and other Unix-like systems as a FUSE module.
+
+	  http://code.google.com/p/exfat/
+
+comment "exfat requires a toolchain with LARGEFILE, WCHAR and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk
new file mode 100644
index 0000000000..673b6d206b
--- /dev/null
+++ b/package/exfat/exfat.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# exfat
+#
+#############################################################
+
+EXFAT_VERSION = 1.0.1
+EXFAT_SITE = http://exfat.googlecode.com/files
+EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
+EXFAT_DEPENDENCIES = host-scons libfuse
+EXFAT_LICENSE = GPLv3
+EXFAT_LICENSE_FILES = COPYING
+
+define EXFAT_BUILD_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) $(SCONS))
+endef
+
+define EXFAT_INSTALL_TARGET_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) $(SCONS) \
+		DESTDIR=$(TARGET_DIR)/usr/sbin install)
+endef
+
+$(eval $(generic-package))

From fe1504bb62722ddc815f2043a28dd9bec7e36653 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Feb 2013 00:48:04 +0000
Subject: [PATCH 4259/6849] exfat-utils: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/exfat-utils/Config.in      | 11 +++++++++++
 package/exfat-utils/exfat-utils.mk | 24 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/exfat-utils/Config.in
 create mode 100644 package/exfat-utils/exfat-utils.mk

diff --git a/package/Config.in b/package/Config.in
index 983ac4a3db..3df85f49b9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -190,6 +190,7 @@ source "package/curlftpfs/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/exfat/Config.in"
+source "package/exfat-utils/Config.in"
 source "package/flashbench/Config.in"
 source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
diff --git a/package/exfat-utils/Config.in b/package/exfat-utils/Config.in
new file mode 100644
index 0000000000..1fc68be8a6
--- /dev/null
+++ b/package/exfat-utils/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_EXFAT_UTILS
+	bool "exfat-utils"
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	help
+	  exFAT filesystem utilities.
+
+	  http://code.google.com/p/exfat/
+
+comment "exfat-utils requires a toolchain with LARGEFILE and WCHAR support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk
new file mode 100644
index 0000000000..b1191e8a82
--- /dev/null
+++ b/package/exfat-utils/exfat-utils.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# exfat-utils
+#
+#############################################################
+
+EXFAT_UTILS_VERSION = 1.0.1
+EXFAT_UTILS_SITE = http://exfat.googlecode.com/files
+EXFAT_UTILS_DEPENDENCIES = host-scons
+EXFAT_UTILS_LICENSE = GPLv3
+EXFAT_UTILS_LICENSE_FILES = COPYING
+
+define EXFAT_UTILS_BUILD_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) $(SCONS))
+endef
+
+define EXFAT_UTILS_INSTALL_TARGET_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) $(SCONS) \
+		DESTDIR=$(TARGET_DIR)/usr/bin install)
+endef
+
+$(eval $(generic-package))

From 313094d7874a4dd8638a83be7952dda490eaa1bc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 4 Feb 2013 22:37:29 +0000
Subject: [PATCH 4260/6849] toolchain-external: add new Microblaze toolchains

The existing Microblaze toolchains that we have have the annoying
property of being based on a very old glibc version: 2.3.6. Xilinx
provides newer toolchains with glibc 2.14, generated by Crosstool-NG,
but they are only available as part of a huge Git repository that
contains the gcc, Linux, binutils, glibc sources unpacked (4.4 GB
total), which makes is very unpractical.

I contacted the Xilinx person who did those toolchains, but they
apparently didn't intend to change that anytime soon.

So, we have created a tarball for those toolchains, adding a
README.txt file in the tarball that points back to the original
location that contains the source code for them. Those tarballs are
hosted on sources.buildroot.net.

This commit then adds support for those two new external toolchains,
one for little endian Microblaze, another one for big endian
Microblaze.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 26 ++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  6 ++++++
 2 files changed, 32 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5b26aa9b8d..d2f39264bb 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -631,6 +631,18 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
 
+config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
+	bool "Xilinx Little Endian Microblaze GNU Tools"
+	depends on BR2_microblazeel
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Toolchain for the Microblaze architecture, from
+	  http://git.xilinx.com/?p=microblaze-gnu.git;a=tree;f=binaries. It
+	  uses gcc 4.6.2, binutils 2.21.53, glibc 2.14 and gdb 7.4.50.
+
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	bool "Xilinx Little Endian Microblaze GNU Tools"
 	depends on BR2_microblazeel
@@ -641,6 +653,18 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
+config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
+	bool "Xilinx Big Endian Microblaze GNU Tools"
+	depends on BR2_microblaze
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Toolchain for the Microblaze architecture, from
+	  http://git.xilinx.com/?p=microblaze-gnu.git;a=tree;f=binaries. It
+	  uses gcc 4.6.2, binutils 2.21.53, glibc 2.14 and gdb 7.4.50.
+
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
@@ -743,7 +767,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
+	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
+	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b477bc0456..5f467b7505 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -258,9 +258,15 @@ TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/588/10147/
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
+TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0_le.git;a=blob;h=d7b493c5dbcc24ba9cc3be2e4c14d6d9701e6805;hb=00163583b771bb4e937632765dd0c5516b3e31c4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
+TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz

From a9aa6c065cbf29e7642c016474be9aa89f4e00c1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Feb 2013 06:43:38 +0000
Subject: [PATCH 4261/6849] ruby: security bump to version 1.9.3-p392

Fixes JSON DoS (CVE-2013-0269) and REXML DoS (no assigned CVE yet).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index ee1f9ed287..601ae9080a 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RUBY_VERSION = 1.9.3-p362
+RUBY_VERSION = 1.9.3-p392
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_DEPENDENCIES = host-pkgconf host-ruby
 HOST_RUBY_DEPENDENCIES = host-pkgconf

From 9332a1ad4157605c290639b270a68050ee60cbfe Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 23 Feb 2013 21:37:07 +0100
Subject: [PATCH 4262/6849] ruby: disable parallel build

Fixes http://autobuild.buildroot.net/results/c71100ee21a12db47047563c6e70afdc552595d4/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 601ae9080a..692e2652a2 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -9,6 +9,7 @@ RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_DEPENDENCIES = host-pkgconf host-ruby
 HOST_RUBY_DEPENDENCIES = host-pkgconf
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
+RUBY_MAKE = $(MAKE1)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
 HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
 RUBY_LICENSE = Ruby

From 4cf77df51bd958e850abfb8eea44587c72327726 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 23 Feb 2013 21:37:36 +0100
Subject: [PATCH 4263/6849] haserl: needs fork()

Fixes http://autobuild.buildroot.net/results/e265d061e1956522dad4566827ed4171160dfecc

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 7710fa1c3b..36bfca75c5 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HASERL
 	bool "haserl"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Haserl is a small cgi wrapper that enables shell scripts to be
 	  embedded into html documents. It is intended for environments

From 885ae427272f31eb53fc29e8056e6e78577ddeb5 Mon Sep 17 00:00:00 2001
From: Gilles Talis <gilles.talis@gmail.com>
Date: Fri, 22 Feb 2013 20:15:54 +0000
Subject: [PATCH 4264/6849] libmad: force architecture-specific optimisations
 on AVR32

Fixes:
http://autobuild.buildroot.net/results/e01f5a5484299dce1797966445f3972583c67b22
http://autobuild.buildroot.net/results/7ed0563fbbfc19c93ec5be35d3b6a95e496b4c5d

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmad/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libmad/Config.in b/package/libmad/Config.in
index d0edc497c4..80ed85357d 100644
--- a/package/libmad/Config.in
+++ b/package/libmad/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBMAD
 	bool "libmad"
+	select BR2_PACKAGE_LIBMAD_ASO if BR2_avr32
 	help
 	  High-quality MPEG audio decoder.  All computations are performed
 	  with fixed-point integer arithmetic, making it ideal for systems

From eda24e12a5e95753d6cebf082109951681ab6905 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 25 Feb 2013 00:20:49 +0000
Subject: [PATCH 4265/6849] spawn-fcgi: needs mmu

Fixes
http://autobuild.buildroot.net/results/cb6605b223642e647981e697f17d89bb97e223a6/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/spawn-fcgi/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/spawn-fcgi/Config.in b/package/spawn-fcgi/Config.in
index 34cbbb1739..59791e8d8e 100644
--- a/package/spawn-fcgi/Config.in
+++ b/package/spawn-fcgi/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SPAWN_FCGI
 	bool "spawn-fcgi"
+	depends on BR2_USE_MMU # fork()
 	help
 	  FastCGI process spawner.
 	  Project split from lighttpd.

From 2c1fecebaa4e7378042783d7ef81fa55b0ffdc42 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 25 Feb 2013 00:22:16 +0000
Subject: [PATCH 4266/6849] dialog: needs mmu

Fixes
http://autobuild.buildroot.net/results/bfb968d611e8dea43c604726a3005c72a7d6ee28/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dialog/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dialog/Config.in b/package/dialog/Config.in
index db5197fb7a..b3efd8d85b 100644
--- a/package/dialog/Config.in
+++ b/package/dialog/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DIALOG
 	bool "dialog"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # fork()
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help

From 5c54347c35006acbcade56256b5b09d12ee8938d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Feb 2013 15:53:01 +0100
Subject: [PATCH 4267/6849] enlightenment: Alsa backend needs mixer support

Fixes http://autobuild.buildroot.net/results/3d6e35e3cda9428cc422b4f6203ba912bdc11faf/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/enlightenment/enlightenment.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index cd3b21f7f3..5d77869ffc 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -28,6 +28,13 @@ ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 			 --disable-rpath
 
+# alsa backend needs mixer support
+ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+ENLIGHTENMENT_DEPENDENCIES += alsa-lib
+else
+ENLIGHTENMENT_CONF_ENV += enable_alsa=no
+endif
+
 ifeq ($(BR2_HAVE_DOCUMENTATION),)
 define ENLIGHTENMENT_REMOVE_DOCUMENTATION
 	rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/

From 9ef10c2cf302a6a45205c998e555dc80b0409884 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 25 Feb 2013 06:26:37 +0000
Subject: [PATCH 4268/6849] linux-firmware: switch to http url

As recommended by Yegor Yefremov for f2fs-tools some firewalls might
restrict the git port and make life harder.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/linux-firmware.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 9268608fde..0cb08b4aa3 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -3,8 +3,9 @@
 # linux-firmware
 #
 #############################################################
+
 LINUX_FIRMWARE_VERSION = 65a5163b8bb77bd7759efa3ca780867fcaed89b0
-LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
 # rt2501/rt61

From 98de049686e67b0866f7024c61eb51bdbd1091f5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 25 Feb 2013 08:47:36 +0000
Subject: [PATCH 4269/6849] f2fs-tools: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/f2fs-tools/Config.in     | 12 ++++++++++++
 package/f2fs-tools/f2fs-tools.mk | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/f2fs-tools/Config.in
 create mode 100644 package/f2fs-tools/f2fs-tools.mk

diff --git a/package/Config.in b/package/Config.in
index 3df85f49b9..882d3c0e0f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -191,6 +191,7 @@ source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/exfat/Config.in"
 source "package/exfat-utils/Config.in"
+source "package/f2fs-tools/Config.in"
 source "package/flashbench/Config.in"
 source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
diff --git a/package/f2fs-tools/Config.in b/package/f2fs-tools/Config.in
new file mode 100644
index 0000000000..20db9283a0
--- /dev/null
+++ b/package/f2fs-tools/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_F2FS_TOOLS
+	bool "f2fs-tools"
+	select BR2_PACKAGE_UTIL_LINUX
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR # util-linux
+	help
+	  Tools for Flash-Friendly File System (F2FS)
+
+	  http://sourceforge.net/projects/f2fs-tools/
+
+comment "f2fs-tools requires a toolchain with LARGEFILE and WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk
new file mode 100644
index 0000000000..f217bf4261
--- /dev/null
+++ b/package/f2fs-tools/f2fs-tools.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# f2fs-tools
+#
+#############################################################
+
+F2FS_TOOLS_VERSION = e3eadd686ed1da1828f32977a36b694bc0090f4e
+F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
+F2FS_TOOLS_SITE_METHOD = git
+F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no
+F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux
+# GIT version, shipped without configure
+F2FS_TOOLS_AUTORECONF = YES
+F2FS_LICENSE = GPLv2
+F2FS_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 06b3e4c50d8c110f8b905f133afa31739d7817fd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 25 Feb 2013 04:39:51 +0000
Subject: [PATCH 4270/6849] nmap: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/nmap/Config.in | 16 ++++++++++++++++
 package/nmap/nmap.mk   | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/nmap/Config.in
 create mode 100644 package/nmap/nmap.mk

diff --git a/package/Config.in b/package/Config.in
index 882d3c0e0f..e96b58fce8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -677,6 +677,7 @@ source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/network-manager/Config.in"
 source "package/nfacct/Config.in"
+source "package/nmap/Config.in"
 source "package/noip/Config.in"
 source "package/ngircd/Config.in"
 source "package/ngrep/Config.in"
diff --git a/package/nmap/Config.in b/package/nmap/Config.in
new file mode 100644
index 0000000000..be1be33dbb
--- /dev/null
+++ b/package/nmap/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_NMAP
+	bool "nmap"
+	depends on BR2_INET_IPV6
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_PCRE
+	help
+	  Nmap ("Network Mapper") is a free and open source (license)
+	  utility for network discovery and security auditing.
+
+	  http://nmap.org
+
+comment "nmap requires a toolchain with C++, IPV6 and thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
new file mode 100644
index 0000000000..a5b085d7fd
--- /dev/null
+++ b/package/nmap/nmap.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# nmap
+#
+#############################################################
+
+NMAP_VERSION = 6.01
+NMAP_SITE = http://nmap.org/dist
+NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
+NMAP_DEPENDENCIES = libpcap pcre
+NMAP_CONF_OPT = --without-liblua --without-zenmap \
+	--with-libdnet=included --with-liblinear=included \
+	--with-libpcre="$(STAGING_DIR)/usr"
+NMAP_LICENSE = GPLv2
+NMAP_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NMAP_CONF_OPT += --with-openssl="$(STAGING_DIR)/usr"
+NMAP_DEPENDENCIES += openssl
+else
+NMAP_CONF_OPT += --without-openssl
+endif
+
+$(eval $(autotools-package))

From b7988b0fda1ceaacd7b23b2b98065a537c3cd87c Mon Sep 17 00:00:00 2001
From: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Date: Tue, 19 Feb 2013 02:07:33 +0000
Subject: [PATCH 4271/6849] bump json-c to 0.10

this patch bumps json-c to version 0.10 and adapts the no-reentrant patch
to the new version.

Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/json-c/json-c-no-reentrant.patch | 16 +++++++---------
 package/json-c/json-c.mk                 |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/package/json-c/json-c-no-reentrant.patch b/package/json-c/json-c-no-reentrant.patch
index a01181cfbb..31343c0a83 100644
--- a/package/json-c/json-c-no-reentrant.patch
+++ b/package/json-c/json-c-no-reentrant.patch
@@ -8,26 +8,24 @@ patch to avoid having to autoreconfigure the package.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/Makefile.am
+Index: b/Makefile.am.inc
 ===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
+--- a/Makefile.am.inc
++++ b/Makefile.am.inc
+@@ -1,2 +1,2 @@
 -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
 +AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
  
- EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
- 
 Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -219,7 +219,7 @@
+@@ -263,7 +263,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
 +AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
- EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
+ SUBDIRS = . tests
  lib_LTLIBRARIES = libjson.la
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
index ed4a6d0a70..a0b5cae5a9 100644
--- a/package/json-c/json-c.mk
+++ b/package/json-c/json-c.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-JSON_C_VERSION = 0.9
-JSON_C_SITE = http://oss.metaparadigm.com/json-c/
+JSON_C_VERSION = 0.10
+JSON_C_SITE = https://github.com/downloads/json-c/json-c
 JSON_C_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From e3b3be6bb63e9cf5d2465ff55c01c24299f0caed Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 17 Feb 2013 20:18:11 +0000
Subject: [PATCH 4272/6849] wireshark: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is only the bare minimum needed to build the textual tshark utility.
Support for more options, including the wireshark GUI, can be added later.

[Peter: point includedir at staging to workaround host/target headers issue]
Cc: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/wireshark/Config.in                   | 14 +++++++
 .../wireshark-dont-include-prefix.patch       | 41 +++++++++++++++++++
 package/wireshark/wireshark.mk                | 23 +++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 package/wireshark/Config.in
 create mode 100644 package/wireshark/wireshark-dont-include-prefix.patch
 create mode 100644 package/wireshark/wireshark.mk

diff --git a/package/Config.in b/package/Config.in
index e96b58fce8..1393652487 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -732,6 +732,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
 source "package/wireless_tools/Config.in"
+source "package/wireshark/Config.in"
 source "package/wpa_supplicant/Config.in"
 source "package/xinetd/Config.in"
 source "package/xl2tp/Config.in"
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
new file mode 100644
index 0000000000..e6d4e72556
--- /dev/null
+++ b/package/wireshark/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_WIRESHARK
+	bool "wireshark"
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # glib2
+	help
+	  Network traffic sniffer and protocol decoder. Currently only tshark,
+	  the console interface, is enabled.
+
+	  http://www.wireshark.org
+
+comment "wireshark requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/wireshark/wireshark-dont-include-prefix.patch b/package/wireshark/wireshark-dont-include-prefix.patch
new file mode 100644
index 0000000000..567af9a0b6
--- /dev/null
+++ b/package/wireshark/wireshark-dont-include-prefix.patch
@@ -0,0 +1,41 @@
+configure.in: don't add the build host's /usr/include and /usr/lib to the 
+search path of include files and libraries. This is not what you want when 
+cross compiling.
+
+Sent upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7926.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+diff -Nuar wireshark-1.8.3.orig/configure.in wireshark-1.8.3/configure.in
+--- wireshark-1.8.3.orig/configure.in	2012-08-15 23:33:32.000000000 +0300
++++ wireshark-1.8.3/configure.in	2012-10-28 10:07:54.864388531 +0200
+@@ -635,29 +635,6 @@
+ AC_SUBST(CORESERVICES_FRAMEWORKS)
+ AC_SUBST(LAUNCHSERVICES_FRAMEWORKS)
+ 
+-#
+-# If using $prefix we add "$prefix/include" to the include search path
+-# and "$prefix/lib" to the library search path.
+-#
+-if test "x$prefix" != "x" ; then
+-	AC_MSG_CHECKING(whether to use $prefix for headers and libraries)
+-	if test -d $prefix/include ; then
+-		AC_MSG_RESULT(yes)
+-		#
+-		# Arrange that we search for header files in "$prefix/include", as
+-		# various packages we use may have been installed under "$prefix/include".
+-		#
+-		CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-
+-		#
+-		# Arrange that we search for libraries in "$prefix/lib".
+-		#
+-		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
+-	else
+-		AC_MSG_RESULT(no)
+-	fi
+-fi
+-
+ dnl Look in /usr/local for header files and libraries ?
+ dnl XXX FIXME don't include /usr/local if it is already in the system
+ dnl search path as this causes gcc 3.2 on Linux to complain about a change
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
new file mode 100644
index 0000000000..2e89987dec
--- /dev/null
+++ b/package/wireshark/wireshark.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# wireshark
+#
+#############################################################
+
+WIRESHARK_VERSION = 1.8.5
+WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
+WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
+WIRESHARK_LICENSE = wireshark license
+WIRESHARK_LICENSE_FILES = COPYING
+WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
+WIRESHARK_AUTORECONF = YES
+WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
+			ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
+
+# wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
+# Work around it by pointing includedir at staging
+WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
+		     --enable-static=no --with-gnutls=no \
+		     --includedir=$(STAGING_DIR)/usr/include
+
+$(eval $(call autotools-package))

From affe885c3cefdce64025c4bc8537e926897c5cea Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 26 Feb 2013 08:01:59 +0000
Subject: [PATCH 4273/6849] package/exfat{,-utils}: license is GPLv3+

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/exfat-utils/exfat-utils.mk | 2 +-
 package/exfat/exfat.mk             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk
index b1191e8a82..de66d55ff5 100644
--- a/package/exfat-utils/exfat-utils.mk
+++ b/package/exfat-utils/exfat-utils.mk
@@ -7,7 +7,7 @@
 EXFAT_UTILS_VERSION = 1.0.1
 EXFAT_UTILS_SITE = http://exfat.googlecode.com/files
 EXFAT_UTILS_DEPENDENCIES = host-scons
-EXFAT_UTILS_LICENSE = GPLv3
+EXFAT_UTILS_LICENSE = GPLv3+
 EXFAT_UTILS_LICENSE_FILES = COPYING
 
 define EXFAT_UTILS_BUILD_CMDS
diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk
index 673b6d206b..bc794a02c4 100644
--- a/package/exfat/exfat.mk
+++ b/package/exfat/exfat.mk
@@ -8,7 +8,7 @@ EXFAT_VERSION = 1.0.1
 EXFAT_SITE = http://exfat.googlecode.com/files
 EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
 EXFAT_DEPENDENCIES = host-scons libfuse
-EXFAT_LICENSE = GPLv3
+EXFAT_LICENSE = GPLv3+
 EXFAT_LICENSE_FILES = COPYING
 
 define EXFAT_BUILD_CMDS

From 77e5e0d3fad2a97628aa959187cdbf06015ddd15 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 26 Feb 2013 07:54:15 +0000
Subject: [PATCH 4274/6849] kernel-headers: remove legacy code

The BR2_KERNEL_HEADERS_2_6_35 symbol no longer exists since some time,
so get rid of code that was specific to this kernel version.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/kernel-headers.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 76602d849b..073d609e18 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -36,15 +36,6 @@ LINUX_HEADERS_CAT:=$(BZCAT)
 LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION)
 LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux
 
-# long term support kernels are stored in a longterm/v2.6.x subdir
-ifeq ($(BR2_KERNEL_HEADERS_2_6_35),y)
-DEFAULT_KERNEL_HEADERS_MAJOR := \
-	$(shell echo $(DEFAULT_KERNEL_HEADERS) | sed 's/\.[0-9]*$$//')
-# += adds a space between
-LINUX_HEADERS_SITE:= \
-	$(LINUX_HEADERS_SITE)longterm/v$(DEFAULT_KERNEL_HEADERS_MAJOR)/
-endif
-
 LINUX_HEADERS_DEPENDS:=
 
 $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)

From 208b36a234fe3bf1c02ad8ea1dcb45b4a378d260 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 23 Feb 2013 07:18:48 +0000
Subject: [PATCH 4275/6849] linux-fusion: bump to 9.0.0

Fixes https://bugs.busybox.net/show_bug.cgi?id=5960

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: broot@monkster.hopto.org
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-fusion/linux-fusion.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 5ea7900f1c..a2340bd4b3 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
 # linux-fusion
 #
 #############################################################
-LINUX_FUSION_VERSION = 8.10.4
+LINUX_FUSION_VERSION = 9.0.0
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES

From d65bb7e3154ed0f78c28fa3ec645b41ec6fca704 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Feb 2013 23:19:03 +0100
Subject: [PATCH 4276/6849] Update for 2013.02-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 13 +++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5fdd457c82..8d03703660 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+2013.02-rc3, Released February 26th, 2013
+
+	Minor fixes.
+
+	Updated/fixed packages: conntrack-tools, dialog,
+	enlightenment, haserl, keyutils, libfif, libmad,
+	linux-firmware, linux-fusion, matchbox-desktop, matchbox-wm,
+	ruby, spawn-fcgi, vtun
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5960: fusion.ko driver does not install to target rootfs
+
 2013.02-rc2, Released February 19th, 2013
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 3bab85530d..0a4c5f2fb9 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.02-rc2
+export BR2_VERSION:=2013.02-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 36e3ddd289..c06270a45d 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2012.11.1.tar.bz2">buildroot-2012.11.1.tar.bz2</a>.
 
 <p>
-The latest release candidate is <b>2013.02-rc2</b>, which can be
+The latest release candidate is <b>2013.02-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.02-rc2.tar.gz">buildroot-2013.02-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2013.02-rc3.tar.gz">buildroot-2013.02-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.02-rc2.tar.bz2">buildroot-2013.02-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.02-rc3.tar.bz2">buildroot-2013.02-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 127b6d1728..d9b6b0df78 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>26 February 2013 -- 2013.02-rc3 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.02_rc3">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.02-rc3.tar.bz2">2013.02-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>19 February 2013 -- 2013.02-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From a84432044e0eed6f6c2f895fd5641a08c370bd4b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Feb 2013 23:47:19 +0100
Subject: [PATCH 4277/6849] mii-diag: fix race condition

The mii-diag buildsystem doesn't correctly encode the needed
dependencies, so the install step can race against the mii-diag-udeb
(through all) to either cause mii-diag to be built for the host or
not be available when 'install' is executed.

Work around it by explicitly calling the needed steps and not building
the (unused) udeb version at all.

Fixes http://autobuild.buildroot.net/results/4825d267025c74c522077f84330b47f1110315fa

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mii-diag/mii-diag.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index a4ad4744c9..b9d763c85e 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -21,11 +21,11 @@ endef
 MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES
 
 define MII_DIAG_BUILD_CMDS
-	$(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D)
+	$(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) mii-diag
 endef
 
 define MII_DIAG_INSTALL_TARGET_CMDS
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-mii-diag
 endef
 
 define MII_DIAG_UNINSTALL_TARGET_CMDS

From c264e38fce27789a0ab050b6296c2fee8da3752c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Feb 2013 00:01:36 +0100
Subject: [PATCH 4278/6849] collectd: don't build with -Werror

Fixes http://autobuild.buildroot.net/results/09659472f504a364590727a05ac900108ed027b4

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 6d26622639..88f67370dd 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -122,6 +122,14 @@ ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 	COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr
 endif
 
+# released software should not break on minor warnings
+define COLLECTD_DROP_WERROR
+	$(SED) 's/-Werror//' \
+		$(@D)/src/Makefile.in $(@D)/src/libcollectdclient/Makefile.in
+endef
+
+COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR
+
 define COLLECTD_INSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
 	rm -f $(TARGET_DIR)/usr/bin/collectd-nagios

From ba5ba0a279a9ed5dbc1d29f930d4183a34db1acf Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Tue, 26 Feb 2013 15:22:38 +0000
Subject: [PATCH 4279/6849] flashbench: force gnu99 dialect on sh2a

Fixes:
http://autobuild.buildroot.org/results/33880036054c39cb04dad71bc8c0a9eece16fac6

CodeSourcery toolchains for sh2a only provide LLONG_MAX when
used with the gnu99 dialect.

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flashbench/flashbench.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk
index faf8ae69ec..45d054004d 100644
--- a/package/flashbench/flashbench.mk
+++ b/package/flashbench/flashbench.mk
@@ -11,8 +11,8 @@ FLASHBENCH_LICENSE_FILES = COPYING
 
 FLASHBENCH_CFLAGS = $(TARGET_CFLAGS)
 
-ifeq ($(BR2_microblaze),y)
-# microblaze toolchain only provides LLONG_MAX when used with gnu99 dialect
+ifeq ($(BR2_microblaze)$(BR2_sh2a),y)
+# microblaze and sh2a toolchains only provide LLONG_MAX when used with gnu99 dialect
 FLASHBENCH_CFLAGS += -std=gnu99
 endif
 

From 9403f92867f67c26ccbfba3fd47de03a52d1a776 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Feb 2013 09:22:59 +0100
Subject: [PATCH 4280/6849] quota: needs mmu

Fixes http://autobuild.buildroot.net/results/85e3c73d1c0b5c6843d65a487203b20f62bf3075

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quota/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/quota/Config.in b/package/quota/Config.in
index f7d0fe921b..f6341d3193 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_QUOTA
 	bool "quota"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_MOUNT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

From bd08eeaffab7fa88dd27b304016a06fceb350cf5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Feb 2013 00:27:04 +0000
Subject: [PATCH 4281/6849] libupnp: requires threads

Fixes:
http://autobuild.buildroot.net/results/ac5a18a6241d36a751cce1867c4da63047eafbaa/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libupnp/Config.in | 5 +++--
 package/ushare/Config.in  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/libupnp/Config.in b/package/libupnp/Config.in
index 2e6edcdb5a..52fa739203 100644
--- a/package/libupnp/Config.in
+++ b/package/libupnp/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBUPNP
 	bool "libupnp"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  The portable SDK for UPnP(tm) Devices (libupnp) provides developers
 	  with an API and open source code for building control points,
@@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBUPNP
 
 	  http://pupnp.sourceforge.net/
 
-comment "libupnp requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libupnp requires a toolchain with LARGEFILE and thread support"
+	depends on !(BR2_LARGEFILE && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/ushare/Config.in b/package/ushare/Config.in
index f7b2124de7..5b87087280 100644
--- a/package/ushare/Config.in
+++ b/package/ushare/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_USHARE
 	bool "ushare"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp
 	select BR2_PACKAGE_LIBUPNP
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_USHARE
 
 	  http://ushare.geexbox.org/
 
-comment "ushare requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "ushare requires a toolchain with LARGEFILE and thread support"
+	depends on !(BR2_LARGEFILE && BR2_TOOLCHAIN_HAS_THREADS)

From d8024d2d87864eb0ba381291e0e2986f7643c8dc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Feb 2013 15:57:37 +0100
Subject: [PATCH 4282/6849] busybox: 1.21.1 fix for move_to_unaligned16()

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.21.0/busybox-1.21.0-platform.patch      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch

diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch b/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch
new file mode 100644
index 0000000000..2401b86af5
--- /dev/null
+++ b/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch
@@ -0,0 +1,11 @@
+--- busybox-1.21.0/include/platform.h
++++ busybox-1.21.0-platform/include/platform.h
+@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI
+ # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
+ # define move_to_unaligned16(u16p, v) do { \
+ 	uint16_t __t = (v); \
+-	memcpy((u16p), &__t, 4); \
++	memcpy((u16p), &__t, 2); \
+ } while (0)
+ # define move_to_unaligned32(u32p, v) do { \
+ 	uint32_t __t = (v); \

From 44efedbec469da9c94ecbb71f81f83a5025c30f0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Feb 2013 18:55:02 +0100
Subject: [PATCH 4283/6849] busybox: add 1.21.0 xz fix

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.21.0/busybox-1.21.0-xz.patch    | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch

diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch b/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch
new file mode 100644
index 0000000000..56ba1a2731
--- /dev/null
+++ b/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch
@@ -0,0 +1,84 @@
+--- busybox-1.21.0/archival/libarchive/decompress_unxz.c
++++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c
+@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *
+ IF_DESKTOP(long long) int FAST_FUNC
+ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+ {
++	enum xz_ret xz_result;
+ 	struct xz_buf iobuf;
+ 	struct xz_dec *state;
+ 	unsigned char *membuf;
+@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t
+ 	/* Limit memory usage to about 64 MiB. */
+ 	state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
+ 
++	xz_result = X_OK;
+ 	while (1) {
+-		enum xz_ret r;
+-
+ 		if (iobuf.in_pos == iobuf.in_size) {
+ 			int rd = safe_read(src_fd, membuf, BUFSIZ);
+ 			if (rd < 0) {
+@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t
+ 				total = -1;
+ 				break;
+ 			}
++			if (rd == 0 && xz_result == XZ_STREAM_END)
++				break;
+ 			iobuf.in_size = rd;
+ 			iobuf.in_pos = 0;
+ 		}
++		if (xz_result == XZ_STREAM_END) {
++			/*
++			 * Try to start decoding next concatenated stream.
++			 * Stream padding must always be a multiple of four
++			 * bytes to preserve four-byte alignment. To keep the
++			 * code slightly smaller, we aren't as strict here as
++			 * the .xz spec requires. We just skip all zero-bytes
++			 * without checking the alignment and thus can accept
++			 * files that aren't valid, e.g. the XZ utils test
++			 * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
++			 */
++			do {
++				if (membuf[iobuf.in_pos] != 0) {
++					xz_dec_reset(state);
++					goto do_run;
++				}
++				iobuf.in_pos++;
++			} while (iobuf.in_pos < iobuf.in_size);
++		}
++ do_run:
+ //		bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
+ //				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
+-		r = xz_dec_run(state, &iobuf);
++		xz_result = xz_dec_run(state, &iobuf);
+ //		bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
+-//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
++//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
+ 		if (iobuf.out_pos) {
+ 			xwrite(dst_fd, iobuf.out, iobuf.out_pos);
+ 			IF_DESKTOP(total += iobuf.out_pos;)
+ 			iobuf.out_pos = 0;
+ 		}
+-		if (r == XZ_STREAM_END) {
+-			break;
++		if (xz_result == XZ_STREAM_END) {
++			/*
++			 * Can just "break;" here, if not for concatenated
++			 * .xz streams.
++			 * Checking for padding may require buffer
++			 * replenishment. Can't do it here.
++			 */
++			continue;
+ 		}
+-		if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
++		if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
+ 			bb_error_msg("corrupted data");
+ 			total = -1;
+ 			break;
+ 		}
+ 	}
++
+ 	xz_dec_end(state);
+ 	free(membuf);
+ 

From e4ee2811e30a952bf5a9c35b4d069c7c9b4c3bfe Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Feb 2013 19:23:58 +0100
Subject: [PATCH 4284/6849] busybox: 1.21.0 platform fix-on-fix

The unxz hunk was missing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox-1.21.0/busybox-1.21.0-platform.patch    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch b/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch
index 2401b86af5..9be6cb8f21 100644
--- a/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch
+++ b/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch
@@ -1,3 +1,16 @@
+--- busybox-1.21.0/archival/libarchive/decompress_unxz.c
++++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c
+@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *
+ /* We use arch-optimized unaligned accessors */
+ #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
+ #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
+-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
+-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
++#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
++#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
+ 
+ #include "unxz/xz_dec_bcj.c"
+ #include "unxz/xz_dec_lzma2.c"
 --- busybox-1.21.0/include/platform.h
 +++ busybox-1.21.0-platform/include/platform.h
 @@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI

From 1942836999ad64b7a84bd95a6bd1f5c75b81bf45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Nystr=C3=B6m?= <daniel.nystrom@timeterminal.se>
Date: Wed, 20 Feb 2013 00:18:51 +0000
Subject: [PATCH 4285/6849] qt: install QML imports on target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When selecting the Qt declarative module, all the QML imports was
built and installed to staging, but never installed to the target.

Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
Acked-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ee1a88b7ac..376781057f 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -498,6 +498,7 @@ define QT_CONFIGURE_CMDS
 		-no-separate-debug-info \
 		-prefix /usr \
 		-plugindir /usr/lib/qt/plugins \
+		-importdir /usr/lib/qt/imports \
 		-hostprefix $(STAGING_DIR) \
 		-fast \
 		-no-rpath \
@@ -610,6 +611,14 @@ define QT_INSTALL_TARGET_PLUGINS
 	fi
 endef
 
+# Import installation
+define QT_INSTALL_TARGET_IMPORTS
+	if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \
+		mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \
+		cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \
+	fi
+endef
+
 # Fonts installation
 ifneq ($(QT_FONTS),)
 define QT_INSTALL_TARGET_FONTS
@@ -628,6 +637,7 @@ endif
 define QT_INSTALL_TARGET_CMDS
 	$(QT_INSTALL_TARGET_LIBS)
 	$(QT_INSTALL_TARGET_PLUGINS)
+	$(QT_INSTALL_TARGET_IMPORTS)
 	$(QT_INSTALL_TARGET_FONTS)
 	$(QT_INSTALL_TARGET_FONTS_TTF)
 endef

From 0e0e42176d4a46515aff577d9702d91208e27c5d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Feb 2013 13:20:47 +0100
Subject: [PATCH 4286/6849] libgtk2: warn that directfb backend is deprecated

And will go away in the future, as discussed here:

http://lists.busybox.net/pipermail/buildroot/2013-February/067977.html

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 3e8cf75386..88f4cc195b 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -29,3 +29,6 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 
 comment "libgtk2 requires a toolchain with WCHAR and C++ support"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+
+comment "WARNING: Libgtk2 directfb backend is deprecated"
+	depends on BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_XORG7

From 5b02e6cad837da36c87cb5534b85f4ee8679cac5 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Feb 2013 11:31:21 +0000
Subject: [PATCH 4287/6849] manual: fix cross-refs

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/configure.txt           | 3 +++
 docs/manual/customize-store.txt     | 7 ++++++-
 docs/manual/customize-toolchain.txt | 2 +-
 docs/manual/working-with.txt        | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index 86cb17386f..4f9a6bbcf3 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -64,6 +64,7 @@ Type+ option in the +Toolchain+ menu. Once one solution has been
 chosen, a number of configuration options appear, they are detailed in
 the following sections.
 
+[[internal-toolchain-backend]]
 Internal toolchain backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -138,6 +139,7 @@ Drawbacks of this backend:
   using the _External toolchain backend_.
 * Limited to the _uClibc_ C library.
 
+[[external-toolchain-backend]]
 External toolchain backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -240,6 +242,7 @@ Drawbacks of this backend:
   fix from the toolchain vendor, unless you build your external
   toolchain by yourself using Crosstool-NG.
 
+[[crosstool-ng-toolchain-backend]]
 Crosstool-NG toolchain backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
index d770f0eefb..5083339ec0 100644
--- a/docs/manual/customize-store.txt
+++ b/docs/manual/customize-store.txt
@@ -13,10 +13,13 @@ consists of the buildroot configuration, the configuration files for
 packages that you use (kernel, busybox, uClibc, ...), and your rootfs
 modifications.
 
+
+[[customize-store-basics]]
 Basics for storing the configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-[[customize-store-basics]]
 
+
+[[customize-store-buildroot-config]]
 Buildroot configuration
 ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -35,6 +38,7 @@ Alternatively, you can copy the file to any other place and rebuild with
 +make defconfig BR2_DEFCONFIG=<path-to-defconfig-file>+.
 
 
+[[customize-store-package-config]]
 Other package configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -71,6 +75,7 @@ configuration files easier.
   resp. +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+.
 
 
+[[customize-store-board-support]]
 Creating your own board support
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 4397979567..811a6dc7f9 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -15,7 +15,7 @@ There is no way of tuning an external toolchain since Buildroot does not
 generate it.
 
 It also requires to set the Buildroot settings according to the toolchain ones
-(see xref:external-toolchain[]).
+(see xref:external-toolchain-backend[]).
 
 Using the internal Buildroot toolchain backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
index b69d1e2928..a57169c66a 100644
--- a/docs/manual/working-with.txt
+++ b/docs/manual/working-with.txt
@@ -25,4 +25,5 @@ interested in hacking it to add:
 
 * new packages: refer to the xref:adding-packages[Developer guide]
 
-* new board support: refer to the xref:board-support[Developer guide]
+* new board support: refer to the xref:customize-store[], more specifically
+  xref:customize-store-board-support[].

From 7a26f2f66360ddbcf1be5833d4834a72ccde769f Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 28 Feb 2013 11:24:26 +0000
Subject: [PATCH 4288/6849] manual: minor fix in patch-policy.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/patch-policy.txt | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 14c6efc538..0f55b26dc3 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -34,12 +34,18 @@ Most patches are provided within Buildroot, in the package
 directory; these typically aim to fix cross-compilation, libc support,
 or other such issues.
 
-These patch files should be named +<packagename>-<description>.patch+.
+These patch files should be named +<packagename>-<number>-<description>.patch+.
 
 A +series+ file, as used by +quilt+, may also be added in the
 package directory. In that case, the +series+ file defines the patch
 application order.
 
+.Notes
+- The patch files coming with Buildroot should not contain any package version
+reference in their filename.
+- The field +<number>+ in the patch file name refers to the 'apply order'.
+
+
 How patches are applied
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -56,8 +62,12 @@ How patches are applied
 * If a +series+ file exists in the package directory, then patches are
   applied according to the +series+ file;
 +
-* Otherwise, patch files matching `<packagename>-*.patch` are applied
-  following the +ls+ command order.
+* Otherwise, patch files matching +<packagename>-*.patch+
+  are applied in alphabetical order.
+  So, to ensure they are applied in the right order, it is hightly
+  recommended to named the patch files like this:
+  +<packagename>-<number>-<description>.patch+, where +<number>+
+  refers to the 'apply order'.
 
 . Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.
 

From 0ccfbb5db930812c43d8688dd102eb7204af7fea Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Feb 2013 11:31:23 +0000
Subject: [PATCH 4289/6849] manual: misc. post-{build, image} scripts fixes

* update post-build scripts mechanism that now support several scripts
* fix formatting

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-rootfs.txt | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 4a4d620d34..7ff8d8b1e9 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -25,18 +25,18 @@ there are a few ways to customize the resulting target filesystem.
   directories, +.empty+ files and files ending with +~+ are excluded.
   _Among these first 3 methods, this one should be preferred_.
 
-* In the Buildroot configuration, you can specify the path to a
-  *post-build script*, that gets called 'after' Buildroot builds all the
-  selected software, but 'before' the rootfs packages are
-  assembled. The +BR2_ROOTFS_POST_BUILD_SCRIPT+ will allow you to
-  specify the location of your post-build script. This option can be
+* In the Buildroot configuration, you can specify the paths to one or
+  more *post-build scripts*. These scripts are called in the given order,
+  'after' Buildroot builds all the selected software, but 'before' the
+  rootfs images are assembled. The +BR2_ROOTFS_POST_BUILD_SCRIPT+ allows
+  you to specify the location of your post-build scripts. This option can be
   found in the +System configuration+ menu. The destination root
-  filesystem folder is given as the first argument to this script,
-  and this script can then be used to remove or modify any file in your
+  filesystem folder is given as the first argument to these scripts,
+  and these scripts can then be used to remove or modify any file in your
   target filesystem. You should, however, use this feature with care.
   Whenever you find that a certain package generates wrong or unneeded
-  files, you should fix that package rather than work around it with a
-  post-build cleanup script.
+  files, you should fix that package rather than work around it with some
+  post-build cleanup scripts.
   You may also use these variables in your post-build script:
     - +BUILDROOT_CONFIG+: the path to the Buildroot .config file
     - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see
@@ -55,23 +55,25 @@ there are a few ways to customize the resulting target filesystem.
   installation. Note that this method is *not recommended*, as it
   duplicates the entire skeleton, which prevents from taking advantage
   of the fixes or improvements brought to the default Buildroot
-  skeleton. The recommended method is to use the _post-build script_
+  skeleton. The recommended method is to use the _post-build scripts_
   mechanism described in the previous item.
 
-Note also that if you want to perform some specific actions *after*
-all filesystem images have been created (for example to automatically
+Note also that you can use the *post-image scripts*
+if you want to perform some specific actions 'after' all
+filesystem images have been created (for example to automatically
 extract your root filesystem tarball in a location exported by your
 NFS server, or to create a special firmware image that bundles your
 root filesystem and kernel image, or any other custom action), you can
 specify a space-separated list of scripts in the
-+BR2_ROOTFS_POST_IMAGE_SCRIPT+ configuration option.
++BR2_ROOTFS_POST_IMAGE_SCRIPT+ configuration option. This option can be
+found in the +System configuration+ menu as well.
 
 Each of those scripts will be called with the path to the +images+
 output directory as first and unique argument, and will be executed
 with the main Buildroot source directory as the current
 directory. Those scripts will be executed as the user that executes
 Buildroot, which should normally not be the root user. Therefore, any
-action requiring root permissions in one of these post-image script
+action requiring root permissions in one of these _post-image scripts_
 will require special handling (usage of fakeroot or sudo), which is
 left to the script developer.
 

From 9bdf69b49d107beeddff05c3419e9ef2dcfba4ea Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Feb 2013 11:31:24 +0000
Subject: [PATCH 4290/6849] working-with: board support

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/working-with.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt
index a57169c66a..4432b548db 100644
--- a/docs/manual/working-with.txt
+++ b/docs/manual/working-with.txt
@@ -25,5 +25,5 @@ interested in hacking it to add:
 
 * new packages: refer to the xref:adding-packages[Developer guide]
 
-* new board support: refer to the xref:customize-store[], more specifically
-  xref:customize-store-board-support[].
+* new board support: refer to the
+  xref:customize-store-board-support[Developer guide].

From 6dc0596274e6ad529fd93d40d6a9096062bff793 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Mon, 25 Feb 2013 11:31:31 +0000
Subject: [PATCH 4291/6849] Manual: add empty line after header in .mk files

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt | 33 ++++-----
 docs/manual/adding-packages-cmake.txt     | 33 ++++-----
 docs/manual/adding-packages-generic.txt   | 83 ++++++++++++-----------
 3 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 5a0d27f065..1d5f30bc3c 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -18,24 +18,25 @@ package, with an example :
 03: # libfoo
 04: #
 05: #############################################################
-06: LIBFOO_VERSION = 1.0
-07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE = http://www.foosoftware.org/download
-09: LIBFOO_INSTALL_STAGING = YES
-10: LIBFOO_INSTALL_TARGET = NO
-11: LIBFOO_CONF_OPT = --disable-shared
-12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
-13:
-14: $(eval $(autotools-package))
+06:
+07: LIBFOO_VERSION = 1.0
+08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+09: LIBFOO_SITE = http://www.foosoftware.org/download
+10: LIBFOO_INSTALL_STAGING = YES
+11: LIBFOO_INSTALL_TARGET = NO
+12: LIBFOO_CONF_OPT = --disable-shared
+13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
+14:
+15: $(eval $(autotools-package))
 ------------------------
 
-On line 6, we declare the version of the package.
+On line 7, we declare the version of the package.
 
-On line 7 and 8, we declare the name of the tarball and the location
+On line 8 and 9, we declare the name of the tarball and the location
 of the tarball on the Web. Buildroot will automatically download the
 tarball from this location.
 
-On line 9, we tell Buildroot to install the package to the staging
+On line 10, we tell Buildroot to install the package to the staging
 directory. The staging directory, located in +output/staging/+
 is the directory where all the packages are installed, including their
 development files, etc. By default, packages are not installed to the
@@ -45,7 +46,7 @@ other libraries or applications depending on them. Also by default, when
 staging installation is enabled, packages are installed in this location
 using the +make install+ command.
 
-On line 10, we tell Buildroot to not install the package to the
+On line 11, we tell Buildroot to not install the package to the
 target directory. This directory contains what will become the root
 filesystem running on the target. For purely static libraries, it is
 not necessary to install them in the target directory because they will
@@ -53,14 +54,14 @@ not be used at runtime. By default, target installation is enabled; setting
 this variable to NO is almost never needed. Also by default, packages are
 installed in this location using the +make install+ command.
 
-On line 11, we tell Buildroot to pass a custom configure option, that
+On line 12, we tell Buildroot to pass a custom configure option, that
 will be passed to the +./configure+ script before configuring
 and building the package.
 
-On line 12, we declare our dependencies, so that they are built
+On line 13, we declare our dependencies, so that they are built
 before the build process of our package starts.
 
-Finally, on line line 14, we invoke the +autotools-package+
+Finally, on line line 15, we invoke the +autotools-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index 44c38e90b0..6ac073c359 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -18,24 +18,25 @@ with an example :
 03: # libfoo
 04: #
 05: #############################################################
-06: LIBFOO_VERSION = 1.0
-07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE = http://www.foosoftware.org/download
-09: LIBFOO_INSTALL_STAGING = YES
-10: LIBFOO_INSTALL_TARGET = NO
-11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
-12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
-13:
-14: $(eval $(cmake-package))
+06:
+07: LIBFOO_VERSION = 1.0
+08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+09: LIBFOO_SITE = http://www.foosoftware.org/download
+10: LIBFOO_INSTALL_STAGING = YES
+11: LIBFOO_INSTALL_TARGET = NO
+12: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
+13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
+14:
+15: $(eval $(cmake-package))
 ------------------------
 
-On line 6, we declare the version of the package.
+On line 7, we declare the version of the package.
 
-On line 7 and 8, we declare the name of the tarball and the location
+On line 8 and 9, we declare the name of the tarball and the location
 of the tarball on the Web. Buildroot will automatically download the
 tarball from this location.
 
-On line 9, we tell Buildroot to install the package to the staging
+On line 10, we tell Buildroot to install the package to the staging
 directory. The staging directory, located in +output/staging/+
 is the directory where all the packages are installed, including their
 development files, etc. By default, packages are not installed to the
@@ -45,7 +46,7 @@ other libraries or applications depending on them. Also by default, when
 staging installation is enabled, packages are installed in this location
 using the +make install+ command.
 
-On line 10, we tell Buildroot to not install the package to the
+On line 11, we tell Buildroot to not install the package to the
 target directory. This directory contains what will become the root
 filesystem running on the target. For purely static libraries, it is
 not necessary to install them in the target directory because they will
@@ -53,13 +54,13 @@ not be used at runtime. By default, target installation is enabled; setting
 this variable to NO is almost never needed. Also by default, packages are
 installed in this location using the +make install+ command.
 
-On line 11, we tell Buildroot to pass custom options to CMake when it is
+On line 12, we tell Buildroot to pass custom options to CMake when it is
 configuring the package.
 
-On line 12, we declare our dependencies, so that they are built
+On line 13, we declare our dependencies, so that they are built
 before the build process of our package starts.
 
-Finally, on line line 14, we invoke the +cmake-package+
+Finally, on line line 15, we invoke the +cmake-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 74d379b1c4..a615ae2c92 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -20,42 +20,43 @@ system is based on hand-written Makefiles or shell scripts.
 03: # libfoo
 04: #
 05: #############################################################
-06: LIBFOO_VERSION = 1.0
-07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE = http://www.foosoftware.org/download
-09: LIBFOO_LICENSE = GPLv3+
-10: LIBFOO_LICENSE_FILES = COPYING
-11: LIBFOO_INSTALL_STAGING = YES
-12: LIBFOO_CONFIG_SCRIPTS = libfoo-config
-13: LIBFOO_DEPENDENCIES = host-libaaa libbbb
-14:
-15: define LIBFOO_BUILD_CMDS
-16:	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
-17: endef
-18:
-19: define LIBFOO_INSTALL_STAGING_CMDS
-20:	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
-21:	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
-22:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
-23: endef
-24:
-25: define LIBFOO_INSTALL_TARGET_CMDS
-26:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
-27:	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
-28: endef
-29:
-30: define LIBFOO_DEVICES
-31:	/dev/foo  c  666  0  0	42  0  -  -  -
-32: endef
-33:
-34: define LIBFOO_PERMISSIONS
-35:	/bin/foo  f  4755  0  0	 -  -  -  -  -
-36: endef
-37:
-38: $(eval $(generic-package))
+06:
+07: LIBFOO_VERSION = 1.0
+08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
+09: LIBFOO_SITE = http://www.foosoftware.org/download
+10: LIBFOO_LICENSE = GPLv3+
+11: LIBFOO_LICENSE_FILES = COPYING
+12: LIBFOO_INSTALL_STAGING = YES
+13: LIBFOO_CONFIG_SCRIPTS = libfoo-config
+14: LIBFOO_DEPENDENCIES = host-libaaa libbbb
+15:
+16: define LIBFOO_BUILD_CMDS
+17:	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
+18: endef
+19:
+20: define LIBFOO_INSTALL_STAGING_CMDS
+21:	$(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a
+22:	$(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h
+23:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib
+24: endef
+25:
+26: define LIBFOO_INSTALL_TARGET_CMDS
+27:	$(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib
+28:	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
+29: endef
+30:
+31: define LIBFOO_DEVICES
+32:	/dev/foo  c  666  0  0	42  0  -  -  -
+33: endef
+34:
+35: define LIBFOO_PERMISSIONS
+36:	/bin/foo  f  4755  0  0	 -  -  -  -  -
+37: endef
+38:
+39: $(eval $(generic-package))
 --------------------------------
 
-The Makefile begins on line 6 to 10 with metadata information: the
+The Makefile begins on line 7 to 11 with metadata information: the
 version of the package (+LIBFOO_VERSION+), the name of the
 tarball containing the package (+LIBFOO_SOURCE+) the
 Internet location at which the tarball can be downloaded from
@@ -65,13 +66,13 @@ the same prefix, +LIBFOO_+ in this case. This prefix is always the
 uppercased version of the package name (see below to understand where
 the package name is defined).
 
-On line 11, we specify that this package wants to install something to
+On line 12, we specify that this package wants to install something to
 the staging space. This is often needed for libraries, since they must
 install header files and other development files in the staging space.
 This will ensure that the commands listed in the
 +LIBFOO_INSTALL_STAGING_CMDS+ variable will be executed.
 
-On line 12, we specify that there is some fixing to be done to some
+On line 13, we specify that there is some fixing to be done to some
 of the 'libfoo-config' files that were installed during
 +LIBFOO_INSTALL_STAGING_CMDS+ phase.
 These *-config files are executable shell script files that are
@@ -113,14 +114,14 @@ IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config
 
-On line 13, we specify the list of dependencies this package relies
+On line 14, we specify the list of dependencies this package relies
 on. These dependencies are listed in terms of lower-case package names,
 which can be packages for the target (without the +host-+
 prefix) or packages for the host (with the +host-+) prefix).
 Buildroot will ensure that all these packages are built and installed
 'before' the current package starts its configuration.
 
-The rest of the Makefile, lines 14..27, defines what should be done
+The rest of the Makefile, lines 16..29, defines what should be done
 at the different steps of the package configuration, compilation and
 installation.
 +LIBFOO_BUILD_CMDS+ tells what steps should be performed to
@@ -133,13 +134,13 @@ All these steps rely on the +$(@D)+ variable, which
 contains the directory where the source code of the package has been
 extracted.
 
-On line 29..31, we define a device-node file used by this package
+On line 31..33, we define a device-node file used by this package
 (+LIBFOO_DEVICES+).
 
-On line 33..35, we define the permissions to set to specific files
+On line 35..37, we define the permissions to set to specific files
 installed by this package (+LIBFOO_PERMISSIONS+).
 
-Finally, on line 37, we call the +generic-package+ function, which
+Finally, on line 39, we call the +generic-package+ function, which
 generates, according to the variables defined previously, all the
 Makefile code necessary to make your package working.
 

From 15ace1a845c9e7fc65b648bbaf4dd14e03d938fd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 28 Feb 2013 22:48:28 +0100
Subject: [PATCH 4292/6849] Update for 2013.02

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  7 +++++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  9 +++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8d03703660..4e327a88c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+2013.02, Released February 28th, 2013:
+
+	Misc manual updates.
+
+	Updated/fixed packages: busybox, collectd, flashbench,
+	libgtk2, libupnp, mii-diag, quota
+
 2013.02-rc3, Released February 26th, 2013
 
 	Minor fixes.
diff --git a/Makefile b/Makefile
index 0a4c5f2fb9..7f0822f15f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.02-rc3
+export BR2_VERSION:=2013.02
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index c06270a45d..10bf5d854e 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,13 +6,13 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2012.11.1</b>, which can be downloaded
+The latest stable release is <b>2013.02</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2012.11.1.tar.gz">buildroot-2012.11.1.tar.gz</a>
+<a href="/downloads/buildroot-2013.02.tar.gz">buildroot-2013.02.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.11.1.tar.bz2">buildroot-2012.11.1.tar.bz2</a>.
-
+<a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>.
+<!--
 <p>
 The latest release candidate is <b>2013.02-rc3</b>, which can be
 downloaded here:<p>
@@ -21,7 +21,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2013.02-rc3.tar.bz2">buildroot-2013.02-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index d9b6b0df78..db203ac1af 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>28 February 2013 -- 2013.02 released</b>
+
+    <p>The stable 2013.02 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.02">CHANGES</a>
+    file for more details
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.02.tar.bz2">2013.02 release</a>.</p>
+
   <li><b>26 February 2013 -- 2013.02-rc3 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From 37d2ab569d83845a86b980bf4e27e27755294538 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 1 Mar 2013 11:11:02 +0100
Subject: [PATCH 4293/6849] Kickoff 2013.05 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7f0822f15f..1300725bf0 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.02
+export BR2_VERSION:=2013.05-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From ec9ae46bcb4691370bd4783d4ee0563a358514f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:16:26 +0000
Subject: [PATCH 4294/6849] kernel-headers: bump 3.{0, 2, 4, 7}.x stable
 version and add 3.8.1

Also mark 3.6.x as deprecated to match upstream EOL.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                | 15 ++++++++++-----
 ...ll-fix-__packed-in-exported-kernel-head.patch} |  0
 2 files changed, 10 insertions(+), 5 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.67-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index ea65b4fbd7..38cf9d3460 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_7
+	default BR2_KERNEL_HEADERS_3_8
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -38,10 +38,14 @@ choice
 
 	config BR2_KERNEL_HEADERS_3_6
 		bool "Linux 3.6.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_7
 		bool "Linux 3.7.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_8
+		bool "Linux 3.8.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Manually specified Linux version"
 
@@ -58,13 +62,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.64"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.67"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.38"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.39"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.31"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.34"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
-	default "3.7.8"		if BR2_KERNEL_HEADERS_3_7
+	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
+	default "3.8.1"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.67-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.67-headers_install-fix-__packed-in-exported-kernel-head.patch

From 839214ef67906c0288be722d972c97aa0ce8e888 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:16:27 +0000
Subject: [PATCH 4295/6849] linux: bump to 3.8.x series

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index f48e6609e7..78aa30cada 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -20,8 +20,8 @@ if BR2_LINUX_KERNEL
 choice
 	prompt "Kernel version"
 
-config BR2_LINUX_KERNEL_3_7
-	bool "3.7.8"
+config BR2_LINUX_KERNEL_3_8
+	bool "3.8.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.8" if BR2_LINUX_KERNEL_3_7
+	default "3.8.1" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 244404a11d0a5a36f64caf98513cb7080d8deb08 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:16:28 +0000
Subject: [PATCH 4296/6849] configs/qemu: bump relevant configs to kernel
 version 3.8.x

Problematic configurations not bumped:

arm-versatilepb - IRQ failure for symbios scsi
sh4-r2d - Qemu still doesn't emulate advanced features from the UART
sparc-ss10 - Illegal instruction

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-nuri/readme.txt                            | 2 +-
 board/qemu/arm-versatile/readme.txt                       | 2 +-
 board/qemu/arm-vexpress/readme.txt                        | 2 +-
 .../{linux-3.7.config => linux-3.8.config}                | 0
 board/qemu/microblazebe-mmu/readme.txt                    | 2 +-
 .../{linux-3.7.config => linux-3.8.config}                | 0
 board/qemu/microblazeel-mmu/readme.txt                    | 2 +-
 .../mips-malta/{linux-3.7.config => linux-3.8.config}     | 0
 board/qemu/mips-malta/readme.txt                          | 2 +-
 .../mips64-malta/{linux-3.7.config => linux-3.8.config}   | 0
 board/qemu/mips64-malta/readme.txt                        | 2 +-
 .../mipsel-malta/{linux-3.7.config => linux-3.8.config}   | 0
 board/qemu/mipsel-malta/readme.txt                        | 2 +-
 .../{linux-3.7.config => linux-3.8.config}                | 0
 board/qemu/powerpc-g3beige/readme.txt                     | 2 +-
 board/qemu/powerpc-mpc8544ds/readme.txt                   | 2 +-
 board/qemu/powerpc-virtex-ml507/readme.txt                | 2 +-
 board/qemu/sh4-r2d/readme.txt                             | 2 +-
 board/qemu/sparc-ss10/readme.txt                          | 2 +-
 board/qemu/x86/{linux-3.7.config => linux-3.8.config}     | 0
 board/qemu/x86/readme.txt                                 | 2 +-
 board/qemu/x86_64/{linux-3.7.config => linux-3.8.config}  | 0
 board/qemu/x86_64/readme.txt                              | 2 +-
 configs/qemu_arm_nuri_defconfig                           | 6 +++---
 configs/qemu_arm_versatile_defconfig                      | 2 +-
 configs/qemu_arm_vexpress_defconfig                       | 6 +++---
 configs/qemu_microblazebe_mmu_defconfig                   | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                   | 4 ++--
 configs/qemu_mips64_malta_defconfig                       | 8 ++++----
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 configs/qemu_ppc_g3beige_defconfig                        | 8 ++++----
 configs/qemu_ppc_mpc8544ds_defconfig                      | 6 +++---
 configs/qemu_ppc_virtex_ml507_defconfig                   | 6 +++---
 configs/qemu_sh4_r2d_defconfig                            | 2 +-
 configs/qemu_sparc_ss10_defconfig                         | 2 +-
 configs/qemu_x86_64_defconfig                             | 8 ++++----
 configs/qemu_x86_defconfig                                | 8 ++++----
 38 files changed, 58 insertions(+), 58 deletions(-)
 rename board/qemu/microblazebe-mmu/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/mips-malta/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/mips64-malta/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/x86/{linux-3.7.config => linux-3.8.config} (100%)
 rename board/qemu/x86_64/{linux-3.7.config => linux-3.8.config} (100%)

diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
index 3925ab940c..dc97c20436 100644
--- a/board/qemu/arm-nuri/readme.txt
+++ b/board/qemu/arm-nuri/readme.txt
@@ -7,4 +7,4 @@ graphical window is the framebuffer.
 
 Startup time is slow because of the SMP CPU emulation so be patient.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 51364c7bad..3801f4870f 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index c74bfcd1c2..26657a53f2 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/microblazebe-mmu/linux-3.7.config b/board/qemu/microblazebe-mmu/linux-3.8.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.7.config
rename to board/qemu/microblazebe-mmu/linux-3.8.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index a52b9ad8a0..36adbd3dd6 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/microblazeel-mmu/linux-3.7.config b/board/qemu/microblazeel-mmu/linux-3.8.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.7.config
rename to board/qemu/microblazeel-mmu/linux-3.8.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index e61eeb6ea2..585c35d6b7 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/mips-malta/linux-3.7.config b/board/qemu/mips-malta/linux-3.8.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.7.config
rename to board/qemu/mips-malta/linux-3.8.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index d3d8446eb9..21d44e7328 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/mips64-malta/linux-3.7.config b/board/qemu/mips64-malta/linux-3.8.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.7.config
rename to board/qemu/mips64-malta/linux-3.8.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 1d6ff1092a..332b09e283 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/mipsel-malta/linux-3.7.config b/board/qemu/mipsel-malta/linux-3.8.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.7.config
rename to board/qemu/mipsel-malta/linux-3.8.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 8dd4024b07..54a2c58c0a 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/powerpc-g3beige/linux-3.7.config b/board/qemu/powerpc-g3beige/linux-3.8.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.7.config
rename to board/qemu/powerpc-g3beige/linux-3.8.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index 05aa380b1b..1efbdf08d7 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index d361fd9d7d..00603fe97b 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index a225985909..f59f9c1172 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 9ae7496734..5760f78f83 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 4290c555b6..3f70a0364d 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/x86/linux-3.7.config b/board/qemu/x86/linux-3.8.config
similarity index 100%
rename from board/qemu/x86/linux-3.7.config
rename to board/qemu/x86/linux-3.8.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 434255671c..7ada1be04b 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/board/qemu/x86_64/linux-3.7.config b/board/qemu/x86_64/linux-3.8.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.7.config
rename to board/qemu/x86_64/linux-3.8.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index 7d3c6c58a1..6c81853218 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.3.0
+Tested with QEMU 1.4.0
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index a18f5a9a2b..b2493eba9a 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -14,12 +14,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySAC1"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 65ee198674..ff264c770b 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 7b8a7bacba..6b2e5ab929 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -14,12 +14,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 6e47edf2b6..5eeb31e874 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.8.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 8be173a4b7..2a14c07cf9 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.8.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 1b0b6221ee..e69cb56109 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,15 +10,15 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.8.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index f5a6e09c01..6134cb4ed4 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.8.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index a7685562af..81723f6341 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.8.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 8cbf170a83..10701cd981 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,15 +6,15 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.8.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index ddaaa45c98..07b9ae9690 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,13 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index f7f957d2a9..4fd2eb8205 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -6,8 +6,8 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 4dfccd99d7..c04f6e89ab 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.38"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 6b883653c3..eb21c318f4 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.10"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 45f0e0a553..e22da44648 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.8.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 60ceacc1c8..55b0f53bec 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.8.config"

From dd3abd75cb0a71152e457f4d6ec3ffe4e16f80f7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:21:16 +0000
Subject: [PATCH 4297/6849] libeXosip2: needs mmu

Fixes
http://autobuild.buildroot.net/results/24ecad26f908a74de8335f1852117d3eda0c2110/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/Config.in | 1 +
 package/linphone/Config.in   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/libeXosip2/Config.in b/package/libeXosip2/Config.in
index 755d284618..3fe9c96974 100644
--- a/package/libeXosip2/Config.in
+++ b/package/libeXosip2/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBEXOSIP2
 	bool "libeXosip2"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBOSIP2
 	help
 	  eXosip is a library that hides the complexity of using the
diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index a2866a6fba..bd5141261b 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LINPHONE
 	select BR2_PACKAGE_MEDIASTREAMER
 	depends on BR2_INSTALL_LIBSTDCPP # mediastreamer
 	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
+	depends on BR2_USE_MMU # libeXosip2
 	help
 	  Linphone is an internet phone or Voice Over IP phone (VoIP).
 

From dd807973d851625f4d9b575b97035e3e15261b3a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:23:21 +0000
Subject: [PATCH 4298/6849] libmicrohttpd: bump to version 0.9.25

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/libmicrohttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index cf84b2d173..ab637deda7 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBMICROHTTPD_VERSION = 0.9.24
+LIBMICROHTTPD_VERSION = 0.9.25
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_INSTALL_STAGING = YES
 

From 70c402120e83c4bd1a14d191c7016207c1ec0cb8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:23:22 +0000
Subject: [PATCH 4299/6849] hiawatha: bump to version 8.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 75f96888d8..5c328bf19e 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.7
+HIAWATHA_VERSION = 8.8
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
 HIAWATHA_LICENSE_FILES = LICENSE

From 9cfecbbab6e24e87a38868b81ba30b4fdf1deed3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:23:23 +0000
Subject: [PATCH 4300/6849] ipset: bump to version 6.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 3ef97472cc..4628066ac5 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.16.1
+IPSET_VERSION = 6.17
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf

From fca82fceec87ddf5e2267471d67ea0d906acefa3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:23:25 +0000
Subject: [PATCH 4301/6849] libnl: bump to version 3.2.21

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 35b2a514b7..7620cf721b 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.18
+LIBNL_VERSION = 3.2.21
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING

From 289f3a33a459dafd902207fd273903f0ba489695 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:23:26 +0000
Subject: [PATCH 4302/6849] php: bump to version 5.3.22

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index c89b4674c4..a4179396cf 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.20
+PHP_VERSION = 5.3.22
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From afcc59259c4e299e6aaed89dc8bbc92a21397d38 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 00:23:27 +0000
Subject: [PATCH 4303/6849] file: bump to version 5.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index db68f6674c..720670511e 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FILE_VERSION = 5.11
+FILE_VERSION = 5.13
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 FILE_INSTALL_STAGING = YES

From d68d96487d61705efbecd15dcefe245eafb4f61c Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 1 Mar 2013 04:17:49 +0000
Subject: [PATCH 4304/6849] feh: bump to 2.9.1

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index fab1c0a1b0..97a272d557 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,4 +1,4 @@
-FEH_VERSION = 2.7
+FEH_VERSION = 2.9.1
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From 462f828228301cca5d08b3eb188e3a7e068d2063 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 1 Mar 2013 04:17:50 +0000
Subject: [PATCH 4305/6849] mpg123: bump to 1.15.1

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 415fc242f5..43a558adf3 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.14.4
+MPG123_VERSION = 1.15.1
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From d57f905d93bdb635c60c0213f0e4eaec2b0ace59 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Mar 2013 06:24:04 +0000
Subject: [PATCH 4306/6849] dosfstools: bump to version 3.0.15

[Peter: update comment dependency, use DOSFSTOOLS_LDFLAGS for all flags]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/Config.in     |  6 ++++--
 package/dosfstools/dosfstools.mk | 15 +++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in
index 1b92026993..2156a0418d 100644
--- a/package/dosfstools/Config.in
+++ b/package/dosfstools/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_DOSFSTOOLS
 	bool "dosfstools"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Tools for creating and checking DOS FAT filesystems.
 
@@ -24,5 +26,5 @@ config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL
 	help
 	  Get or set the DOS FAT filesystem label.
 
-comment "dosfstools requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "dosfstools requires a toolchain with LARGEFILE and WCHAR support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 4f89364c79..e3cc9cfb57 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -4,17 +4,24 @@
 #
 #############################################################
 
-DOSFSTOOLS_VERSION = 3.0.12
-DOSFSTOOLS_SITE = http://fossies.org/linux/misc/
+DOSFSTOOLS_VERSION = 3.0.15
+DOSFSTOOLS_SITE = http://fossies.org/linux/misc
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
+DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)
+
+ifneq ($(BR2_ENABLE_LOCALE),y)
+DOSFSTOOLS_DEPENDENCIES += libiconv
+DOSFSTOOLS_LDFLAGS += -liconv
+endif
+
 MKDOSFS_BINARY = mkdosfs
 DOSFSCK_BINARY = dosfsck
 DOSFSLABEL_BINARY = dosfslabel
 
 define DOSFSTOOLS_BUILD_CMDS
-	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
-		CC="$(TARGET_CC)" -C $(@D)
+	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \
+		LDFLAGS="$(DOSFSTOOLS_LDFLAGS)" -C $(@D)
 endef
 
 DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS)+=$(MKDOSFS_BINARY)

From b49e2c11f66254502c5071a5ded611ccd702e2bc Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:18:01 +0000
Subject: [PATCH 4307/6849] ltp-testsuite: fix build on uClibc exp10

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...e-20101031-fix-build-on-uClibc-exp10.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch

diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
new file mode 100644
index 0000000000..7a02d95208
--- /dev/null
+++ b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
@@ -0,0 +1,22 @@
+Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
+
+exp10 extension is not part of uClibc, so compute it.
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c ltp-testsuite-20101031/testcases/realtime/lib/libstats.c
+--- ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c	2012-10-22 23:19:02.306646174 +0200
++++ ltp-testsuite-20101031/testcases/realtime/lib/libstats.c	2012-10-22 23:25:41.554847766 +0200
+@@ -46,6 +46,11 @@
+ #include <libstats.h>
+ #include <librttest.h>
+ 
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
++
+ int save_stats = 0;
+ 
+ /* static helper functions */

From 88685c9dd5dc0cc0b406e48d196dc73ca3f672e1 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 21 Nov 2012 14:18:00 +0000
Subject: [PATCH 4308/6849] ltp-testsuite: add warning about bessel function
 support if uclibc toolchain

[Peter: Reword, add SV4_DEPRECATED, move to help text]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltp-testsuite/Config.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 86aa4fb8cd..41462743a2 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -1,3 +1,7 @@
+comment "ltp-testsuite needs specific uClibc options, see help"
+	depends on BR2_PACKAGE_LTP_TESTSUITE
+	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_UCLIBC || BR2_TOOLCHAIN_CTNG_uClibc
+
 config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -7,8 +11,9 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	  The LTP testsuite uses several functions that are considered
 	  obsolete, such as sigset() and others. Therefore, the LTP
 	  testsuite does not build with Buildroot's default uClibc
-	  configuration, and options such as
-	  UCLIBC_HAS_OBSOLETE_BSD_SIGNAL are needed.
+	  configuration, and options such as DO_XSI_MATH,
+	  UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and UCLIBC_SV4_DEPRECATED
+	  are needed.
 
 	  http://ltp.sourceforge.net/
 

From 8c05fb21fccefb08c0af652952fa1722eaba68dd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 4 Mar 2013 09:35:11 +0100
Subject: [PATCH 4309/6849] ltp-testsuite: needs IPv6 and RPC support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltp-testsuite/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 41462743a2..46e7380d81 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -5,6 +5,8 @@ comment "ltp-testsuite needs specific uClibc options, see help"
 config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  The Linux Test Project provides a huge testsuite for Linux.
 
@@ -17,5 +19,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
 
 	  http://ltp.sourceforge.net/
 
-comment "ltp-testsuite requires a toolchain with thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "ltp-testsuite requires a toolchain with IPV6, RPC and thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
+		!BR2_TOOLCHAIN_HAS_NATIVE_RPC

From acc1939be3ac6b0dc67acf78f10afe46065e634c Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinjacobk@gmail.com>
Date: Thu, 28 Feb 2013 04:55:40 +0000
Subject: [PATCH 4310/6849] ltp-testsuite: bump version to 20130109

[Peter: drop version number in patches]
Signed-off-by: Jerin Jacob <jerinjacobk@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...stsuite-20101031-disable-controllers.patch | 25 ----------------
 .../ltp-testsuite-disable-controllers.patch   | 29 +++++++++++++++++++
 ...testsuite-fix-build-on-uClibc-exp10.patch} |  0
 package/ltp-testsuite/ltp-testsuite.mk        |  2 +-
 4 files changed, 30 insertions(+), 26 deletions(-)
 delete mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch
 create mode 100644 package/ltp-testsuite/ltp-testsuite-disable-controllers.patch
 rename package/ltp-testsuite/{ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch => ltp-testsuite-fix-build-on-uClibc-exp10.patch} (100%)

diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch b/package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch
deleted file mode 100644
index 57d6038647..0000000000
--- a/package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Disable controllers testcases
-
-The cpuset controllers testcases do not build due to bug
-https://sourceforge.net/tracker/?func=detail&aid=3126942&group_id=3382&atid=103382. Disabling
-just the cpuset controllers do not seem to be easily possible, and
-those controller features are rarely used on embedded systems anyway.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- testcases/kernel/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ltp-testsuite-20101031/testcases/kernel/Makefile
-===================================================================
---- ltp-testsuite-20101031.orig/testcases/kernel/Makefile
-+++ ltp-testsuite-20101031/testcases/kernel/Makefile
-@@ -28,7 +28,7 @@
- #
- # KEEP THIS LIST ALPHABETIZED PLEASE!
- ifneq ($(UCLINUX),1)
--SUBDIRS		:= containers connectors controllers fs hotplug io ipc mem \
-+SUBDIRS		:= containers connectors fs hotplug io ipc mem \
- 		   numa performance_counters power_management pty sched \
- 		   security syscalls timers tracing
- else
diff --git a/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch b/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch
new file mode 100644
index 0000000000..85ef262d09
--- /dev/null
+++ b/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch
@@ -0,0 +1,29 @@
+Disable controllers testcases.
+This fix is carried over from 20101031 version.
+
+The cpuset controllers testcases do not build due to bug
+https://sourceforge.net/tracker/?func=detail&aid=3126942&group_id=3382&atid=103382.
+Disabling just the cpuset controllers do not seem to be easily possible, and
+those controller features are rarely used on embedded systems anyway.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Jerin Jacob  <jerinjacobk@gmail.com>
+---
+ testcases/kernel/Makefile |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
+index 4b4800d..d6ab7b6 100644
+--- a/testcases/kernel/Makefile
++++ b/testcases/kernel/Makefile
+@@ -37,7 +37,6 @@ ifneq ($(UCLINUX),1)
+ # KEEP THIS LIST ALPHABETIZED PLEASE!
+ SUBDIRS			+= connectors \
+ 			   containers \
+-			   controllers \
+ 			   fs \
+ 			   hotplug \
+ 			   io \
+-- 
+1.7.6.5
+
diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-fix-build-on-uClibc-exp10.patch
similarity index 100%
rename from package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
rename to package/ltp-testsuite/ltp-testsuite-fix-build-on-uClibc-exp10.patch
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index d0276f2272..caed4b3ab9 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -3,7 +3,7 @@
 # ltp-testsuite
 #
 #############################################################
-LTP_TESTSUITE_VERSION = 20101031
+LTP_TESTSUITE_VERSION = 20130109
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
 LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
 LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+

From 4e7d5d0a93114ed49095079f66124dd163e23f9c Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sun, 3 Mar 2013 08:37:52 +0000
Subject: [PATCH 4311/6849] aumix.mk: fix whitespace

No functional change.

[Peter: adjust commit message]
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/aumix/aumix.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index 534f3cfcd5..130bda0360 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-AUMIX_VERSION=2.8
-AUMIX_SOURCE=aumix-$(AUMIX_VERSION).tar.bz2
-AUMIX_SITE=http://jpj.net/~trevor/aumix/releases
-AUMIX_AUTORECONF=YES
+AUMIX_VERSION = 2.8
+AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2
+AUMIX_SITE = http://jpj.net/~trevor/aumix/releases
+AUMIX_AUTORECONF = YES
 
 AUMIX_CONF_OPT = \
 	--without-gtk \

From 5323cd35b657c9f444b3a96aab203639df0ee707 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 00:51:58 +0000
Subject: [PATCH 4312/6849] kernel-headers: bump 3.{0, 4, 8}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.67-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.68-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 38cf9d3460..0c417e675b 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -62,14 +62,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.67"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.68"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.39"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.34"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.35"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.1"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.2"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.67-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.68-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.67-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.68-headers_install-fix-__packed-in-exported-kernel-head.patch

From 7c95e04e947db87b253e7ddb867fa7d7b714093b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 00:51:59 +0000
Subject: [PATCH 4313/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 78aa30cada..94ce951469 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.1"
+	bool "3.8.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.1" if BR2_LINUX_KERNEL_3_8
+	default "3.8.2" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 6afbd13c2a22783d6815b0b58e604646375da1a7 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sat, 2 Mar 2013 22:55:44 +0000
Subject: [PATCH 4314/6849] wireshark: explicitly disable libsmi

wireshark's libsmi detection is not cross compile friendly. We don't have
libsmi in Buildroot yet anyway, so just disable support for it in wireshark.

Fixes
http://autobuild.buildroot.net/results/0daaa3dd74315ac901920e7daf89620ef4c088a0

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 2e89987dec..c9fb44ba92 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -17,7 +17,7 @@ WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
 # wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
 # Work around it by pointing includedir at staging
 WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
-		     --enable-static=no --with-gnutls=no \
+		     --enable-static=no --with-gnutls=no --with-libsmi=no \
 		     --includedir=$(STAGING_DIR)/usr/include
 
 $(eval $(call autotools-package))

From 8e8eddaf2f1a66e80605e4e9e349799f1ff3cd43 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 3 Mar 2013 01:28:47 +0000
Subject: [PATCH 4315/6849] f2fs-tools: explicitly select libuuid

Explicitly select BR2_PACKAGE_UTIL_LINUX_LIBUUID. Fixes:
http://autobuild.buildroot.net/results/da5c52b658d9efc25d2c2ad3980add3a36b99ee2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/f2fs-tools/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/f2fs-tools/Config.in b/package/f2fs-tools/Config.in
index 20db9283a0..99ee91cd2e 100644
--- a/package/f2fs-tools/Config.in
+++ b/package/f2fs-tools/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_F2FS_TOOLS
 	bool "f2fs-tools"
 	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # util-linux
 	help

From 06ae891a39655568cbf4956cb3217994207876dd Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Tue, 5 Feb 2013 00:54:17 +0000
Subject: [PATCH 4316/6849] ProFTPD: Add config option to enable mod_rewrite

[Peter: tweak Config.in text]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proftpd/Config.in  | 6 ++++++
 package/proftpd/proftpd.mk | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
index abdedc9e5b..7793713474 100644
--- a/package/proftpd/Config.in
+++ b/package/proftpd/Config.in
@@ -4,3 +4,9 @@ config BR2_PACKAGE_PROFTPD
 	  ProFTPD, a highly configurable FTP server.
 
 	  http://www.proftpd.org/
+
+config BR2_PACKAGE_PROFTPD_MOD_REWRITE
+	bool "mod_rewrite support"
+	depends on BR2_PACKAGE_PROFTPD
+	help
+	  Compile ProFTPD with mod_rewrite support
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 1d02194b91..92644a80ae 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -20,6 +20,10 @@ PROFTPD_CONF_OPT = --localstatedir=/var/run \
 		--enable-shadow \
 		--with-gnu-ld
 
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
+PROFTPD_CONF_OPT += --with-modules=mod_rewrite
+endif
+
 define PROFTPD_MAKENAMES
 	$(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames
 endef

From bbd47813f3196864e4f88aa9f771cf723b5d2fd6 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Sun, 3 Mar 2013 11:27:39 +0000
Subject: [PATCH 4317/6849] httping: bump to version 1.6.0

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/httping/httping.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index e92be619af..2ebc75e614 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-HTTPING_VERSION = 1.5.7
+HTTPING_VERSION = 1.6
 HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
 HTTPING_SITE = http://www.vanheusden.com/httping
 HTTPING_LICENSE = GPLv2

From bd5ae087837330b9445f3c35358b19497781bbff Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 25 Feb 2013 23:16:09 +0000
Subject: [PATCH 4318/6849] gpsd: bump version to 3.8

Version 3.8 of gpsd has been released, which includes some patches sent
upstream by Thomas Petazzoni. This patch bumps the gpsd package version,
and removes the upstreamed patches.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...gpsd-01-sconstruct-python-2.5-compat.patch | 79 -------------------
 ...truct-python-2.5-compat-distro-check.patch | 27 -------
 ...d-05-fix-leapsecond-script-python2.5.patch | 71 -----------------
 package/gpsd/gpsd.mk                          |  3 +-
 4 files changed, 2 insertions(+), 178 deletions(-)
 delete mode 100644 package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
 delete mode 100644 package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch
 delete mode 100644 package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch

diff --git a/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch b/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
deleted file mode 100644
index 4306af2fbb..0000000000
--- a/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Remove all the with ... as foo constructs
-
-Those constructs have been introduced in Python 2.6, and some of our
-autobuilders still use Python 2.5, so replace them with constructs
-that are compatible with Python 2.5.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/SConstruct
-===================================================================
---- a/SConstruct
-+++ b/SConstruct
-@@ -366,8 +366,8 @@
- 
- def CheckXsltproc(context):
-     context.Message('Checking that xsltproc can make man pages... ')
--    with open("xmltest.xml", "w") as ofp:
--        ofp.write('''
-+    ofp = open("xmltest.xml", "w")
-+    ofp.write('''
-        <refentry id="foo.1">
-       <refmeta>
-         <refentrytitle>foo</refentrytitle>
-@@ -380,6 +380,7 @@
-       </refnamediv>
-     </refentry>
- ''')
-+    ofp.close()
-     probe = "xsltproc --nonet --noout '%s' xmltest.xml" % (docbook_man_uri,)
-     ret = context.TryAction(probe)[0]
-     os.remove("xmltest.xml")
-@@ -1042,8 +1043,9 @@
- # build timebase.h
- def timebase_h(target, source, env):
-     from leapsecond import make_leapsecond_include
--    with open(target[0].abspath, 'w') as f:
--        f.write(make_leapsecond_include(source[0].abspath))
-+    f = open(target[0].abspath, 'w')
-+    f.write(make_leapsecond_include(source[0].abspath))
-+    f.close()
- env.Command(target="timebase.h", source="leapseconds.cache",
-             action=timebase_h)
- 
-@@ -1116,15 +1118,17 @@
-         ('@DEVMAIL@',    devmail),
-         ('@LIBGPSVERSION@', libgps_version),
-         )
--    with open(str(source[0])) as sfp:
--        content = sfp.read()
-+    sfp = open(str(source[0]))
-+    content = sfp.read()
-+    sfp.close()
-     for (s, t) in substmap:
-         content = content.replace(s, t)
-     m = re.search("@[A-Z]+@", content)
-     if m and m.group(0) not in map(lambda x: x[0], substmap):
-         print >>sys.stderr, "Unknown subst token %s in %s." % (m.group(0), sfp.name)
--    with open(str(target[0]), "w") as tfp:
--        tfp.write(content)
-+    tfp = open(str(target[0]), "w")
-+    tfp.write(content)
-+    tfp.close()
- 
- templated = glob.glob("*.in") + glob.glob("*/*.in") + glob.glob("*/*/*.in")
- 
-@@ -1560,9 +1564,10 @@
- def validation_list(target, source, env):
-     for page in glob.glob("www/*.html"):
-         if not '-head' in page:
--            with open(page) as fp:
--                if "Valid HTML" in fp.read():
--                    print os.path.join(website, os.path.basename(page))
-+            fp = open(page)
-+            if "Valid HTML" in fp.read():
-+                print os.path.join(website, os.path.basename(page))
-+            fp.close()
- Utility("validation-list", [www], validation_list)
- 
- # How to update the website
diff --git a/package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch b/package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch
deleted file mode 100644
index 767a450b7b..0000000000
--- a/package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The platform.linux_distribution method was introduced in Python 2.6. Some
-of the Buildroot autobuilders still use Python 2.5, which is causing build
-failures such as the following.
-
-  http://autobuild.buildroot.net/results/045f1f69bac170d8e75cb4952a2e5b4e85a677b8/build-end.log
-
-This patch removes the linux distribution check from the gpsd SConstruct file.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-diff -Nurp a/SConstruct b/SConstruct
---- a/SConstruct	2012-07-30 07:57:16.515688546 +0100
-+++ b/SConstruct	2012-07-30 08:00:30.135679914 +0100
-@@ -80,14 +80,6 @@ systemd = os.path.exists("/usr/share/sys
- 
- # Set distribution-specific defaults here
- imloads = True
--if sys.platform.startswith('linux'):
--    (distro, version, cutename) = platform.linux_distribution()
--    if distro == 'Fedora':
--        if int(version) >= 13:
--            # See https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
--            imloads = False
--    elif os.path.exists("/etc/arch-release"):
--        imloads = False
- 
- # Does our platform has a working memory-barrier instruction?
- # The shared-memory export won't be reliable without it.
diff --git a/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch b/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch
deleted file mode 100644
index 8866b81d31..0000000000
--- a/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-the json module was added with python2.6, so a regular python 2.5
-machine will lack this module and won't probably have the simplejson
-module imported by the leapsecond.py script.
-
-Since the only function used is the isotime function, which is
-self-contained and quite trivial, only copy this function into the
-leapsecond script to avoid the import of the gps.misc module, which
-needs simplejson.
-
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
----
- leapsecond.py |   27 ++++++++++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/leapsecond.py b/leapsecond.py
-index 2059f6c..cdacdb4 100755
---- a/leapsecond.py
-+++ b/leapsecond.py
-@@ -24,7 +24,6 @@
- # BSD terms apply: see the file COPYING in the distribution root for details.
- #
- import os, urllib, re, random, time, calendar, math, sys
--import gps.misc
- 
- __locations = [
-     (
-@@ -48,6 +47,28 @@ __locations = [
- # between times it might change, in seconds since Unix epoch GMT.
- __cachepath = "/var/run/leapsecond"
- 
-+def isotime(s):
-+    "Convert timestamps in ISO8661 format to and from Unix time."
-+    if type(s) == type(1):
-+        return time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(s))
-+    elif type(s) == type(1.0):
-+        date = int(s)
-+        msec = s - date
-+        date = time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(s))
-+        return date + "." + repr(msec)[3:]
-+    elif type(s) == type("") or type(s) == type(u""):
-+        if s[-1] == "Z":
-+            s = s[:-1]
-+        if "." in s:
-+            (date, msec) = s.split(".")
-+        else:
-+            date = s
-+            msec = "0"
-+        # Note: no leap-second correction!
-+        return calendar.timegm(time.strptime(date, "%Y-%m-%dT%H:%M:%S")) + float("0." + msec)
-+    else:
-+        raise TypeError
-+
- def retrieve():
-     "Retrieve current leap-second from Web sources."
-     random.shuffle(__locations)	# To spread the load
-@@ -261,10 +282,10 @@ if __name__ == '__main__':
-             print unix_to_rfc822(float(val))
-             raise SystemExit, 0
-         elif (switch == '-I'):  # Compute Unix time from ISO8601 date
--            print gps.misc.isotime(val)
-+            print isotime(val)
-             raise SystemExit, 0
-         elif (switch == '-O'):  # Compute ISO8601 date from Unix time
--            print gps.misc.isotime(float(val))
-+            print isotime(float(val))
-             raise SystemExit, 0
- 
-         print "Current leap second:", retrieve()
--- 
-1.7.9.5
-
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index e4720446f5..ccf99ca162 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -3,7 +3,8 @@
 # gpsd
 #
 #############################################################
-GPSD_VERSION = 3.7
+
+GPSD_VERSION = 3.8
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd/
 GPSD_LICENSE = BSD-3c
 GPSD_LICENSE_FILES = COPYING

From abaab88e578683dd56fbb9f57737131549b1f648 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Sat, 2 Mar 2013 00:38:58 +0000
Subject: [PATCH 4319/6849] microperl: remove it

microperl has been deprecated by perl

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 -
 .../libxml-parser-perl/libxml-parser-perl.mk  |   6 -
 package/microperl/Config.in                   |  30 ----
 .../microperl-no-signal-handlers.patch        |  22 ---
 package/microperl/microperl-uudmap.patch      |  47 ------
 package/microperl/microperl.mk                | 156 ------------------
 6 files changed, 262 deletions(-)
 delete mode 100644 package/microperl/Config.in
 delete mode 100644 package/microperl/microperl-no-signal-handlers.patch
 delete mode 100644 package/microperl/microperl-uudmap.patch
 delete mode 100644 package/microperl/microperl.mk

diff --git a/package/Config.in b/package/Config.in
index 8a0250630d..6701dc61fe 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -316,7 +316,6 @@ menu "Perl libraries/modules"
 source "package/cpanminus/Config.in"
 endmenu
 endif
-source "package/microperl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
 source "package/python3/Config.in"
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 996b10d6b3..4454e57c62 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -10,12 +10,6 @@ LIBXML_PARSER_PERL_SITE = http://www.cpan.org/modules/by-module/XML/
 
 LIBXML_PARSER_PERL_DEPENDENCIES = expat
 
-ifeq ($(BR2_PACKAGE_MICROPERL),y)
-# microperl builds host-microperl, so ensure we build after that to build
-# against host-microperl instead of the system perl
-LIBXML_PARSER_PERL_DEPENDENCIES += microperl
-endif
-
 define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
  (cd $(@D) ; \
    $(HOST_CONFIGURE_OPTS) perl Makefile.PL \
diff --git a/package/microperl/Config.in b/package/microperl/Config.in
deleted file mode 100644
index 19d104a698..0000000000
--- a/package/microperl/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-config BR2_PACKAGE_MICROPERL
-	bool "microperl"
-	# needs fork()
-	depends on BR2_USE_MMU
-	depends on BR2_DEPRECATED
-	help
-	  Perl without operating-specific functions such as readdir.
-
-if BR2_PACKAGE_MICROPERL
-
-config BR2_PACKAGE_MICROPERL_MODULES
-	string "additional modules"
-	help
-	  List of space-separated microperl modules to copy to the rootfs.
-
-	  Examples: warnings.pm Getopt/Std.pm Time::Local
-
-	  Module dependencies are not automatic so check your needs.
-	  You can't use XS modules like IO.
-
-menu "module bundles"
-
-config BR2_PACKAGE_MICROPERL_BUNDLE_CGI
-	bool "CGI"
-	help
-	  Copy required modules to do CGI scripting.
-
-endmenu
-
-endif
diff --git a/package/microperl/microperl-no-signal-handlers.patch b/package/microperl/microperl-no-signal-handlers.patch
deleted file mode 100644
index 3c9aa418ea..0000000000
--- a/package/microperl/microperl-no-signal-handlers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Backport of http://perl5.git.perl.org/perl.git/commitdiff/01d65469392dfc0a?hp=a82b5f080d91ffe184d8ac4795ac71e72e612c2f
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura perl-5.12.3/miniperlmain.c perl-5.12.3-nosig/miniperlmain.c
---- perl-5.12.3/miniperlmain.c	2011-01-09 17:20:57.000000000 -0300
-+++ perl-5.12.3-nosig/miniperlmain.c	2011-04-14 10:16:53.564639438 -0300
-@@ -116,12 +116,14 @@
-     if (!exitstatus)
-         perl_run(my_perl);
- 
-+#ifndef PERL_MICRO
-     /* Unregister our signal handler before destroying my_perl */
-     for (i = 0; PL_sig_name[i]; i++) {
- 	if (rsignal_state(PL_sig_num[i]) == (Sighandler_t) PL_csighandlerp) {
- 	    rsignal(PL_sig_num[i], (Sighandler_t) SIG_DFL);
- 	}
-     }
-+#endif
- 
-     exitstatus = perl_destruct(my_perl);
- 
diff --git a/package/microperl/microperl-uudmap.patch b/package/microperl/microperl-uudmap.patch
deleted file mode 100644
index c72f9c9a14..0000000000
--- a/package/microperl/microperl-uudmap.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a82b5f080d91ffe184d8ac4795ac71e72e612c2f Mon Sep 17 00:00:00 2001
-From: David Leadbeater <dgl@dgl.cx>
-Date: Mon, 7 Mar 2011 18:40:55 +0000
-Subject: [PATCH] microperl: Update generate_uudmap in Makefile.micro
-
-Makefile.micro hadn't kept up with the changes for generate_uudmap,
-make it match the real Makefile.
----
- Makefile.micro |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.micro b/Makefile.micro
-index 4b738f5..567d98a 100644
---- a/Makefile.micro
-+++ b/Makefile.micro
-@@ -35,7 +35,7 @@ H = av.h uconfig.h cop.h cv.h embed.h embedvar.h form.h gv.h handy.h \
- HE = $(H) EXTERN.h
- 
- clean:
--	-rm -f $(O) microperl generate_uudmap$(_X) uudmap.h
-+	-rm -f $(O) microperl generate_uudmap$(_X) uudmap.h bitcount.h
- 
- distclean:	clean
- 
-@@ -74,7 +74,7 @@ udoop$(_O):	$(HE) doop.c
- udump$(_O):	$(HE) dump.c regcomp.h regnodes.h
- 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) dump.c
- 
--uglobals$(_O):	$(H) globals.c INTERN.h perlapi.h
-+uglobals$(_O):	$(H) globals.c INTERN.h perlapi.h uudmap.h bitcount.h
- 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) globals.c
- 
- ugv$(_O):	$(HE) gv.c
-@@ -173,8 +173,8 @@ uutil$(_O):	$(HE) util.c
- uperlapi$(_O):	$(HE) perlapi.c perlapi.h
- 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c
- 
--uudmap.h: generate_uudmap$(_X)
--	$(RUN) ./generate_uudmap$(_X) >uudmap.h
-+uudmap.h bitcount.h: generate_uudmap$(_X)
-+	$(RUN) ./generate_uudmap$(_X) uudmap.h bitcount.h
- 
- generate_uudmap$(_O): generate_uudmap.c
- 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c
--- 
-1.6.5.2.74.g610f9.dirty
-
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
deleted file mode 100644
index b2a912a094..0000000000
--- a/package/microperl/microperl.mk
+++ /dev/null
@@ -1,156 +0,0 @@
-#############################################################
-#
-# microperl
-#
-#############################################################
-
-MICROPERL_VERSION = 5.12.4
-MICROPERL_SITE = http://www.cpan.org/src/5.0
-MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2
-MICROPERL_LICENSE = Artistic
-MICROPERL_LICENSE_FILES = Artistic
-MICROPERL_DEPENDENCIES = host-microperl
-MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION)
-MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(GNU_TARGET_NAME)
-MICROPERL_MODS = $(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES))
-
-# Minimal set of modules required for 'perl -V' to work
-MICROPERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl
-MICROPERL_BASE_MODS = strict.pm
-
-# CGI bundle
-ifeq ($(BR2_PACKAGE_MICROPERL_BUNDLE_CGI),y)
-MICROPERL_MODS += constant.pm CGI CGI.pm Carp.pm Exporter.pm overload.pm \
-	vars.pm warnings.pm warnings/register.pm
-endif
-
-# Host microperl is actually full-blown perl
-define HOST_MICROPERL_CONFIGURE_CMDS
-	cd $(@D) ; \
-	./Configure -Dcc="$(HOSTCC)" -Dprefix="$(HOST_DIR)/usr" \
-		-Dloclibpth='/lib /lib64 /usr/lib /usr/lib64' -des
-endef
-
-define HOST_MICROPERL_BUILD_CMDS
-	$(MAKE) -C $(@D)
-endef
-
-define HOST_MICROPERL_INSTALL_CMDS
-	$(MAKE) -C $(@D) install
-endef
-
-ifeq ($(BR2_ENDIAN),"BIG")
-define MICROPERL_BIGENDIAN
-	$(SED) '/^byteorder=/d' $(@D)/uconfig.sh
-	echo "byteorder='4321'" >>$(@D)/uconfig.sh
-endef
-endif
-
-ifeq ($(BR2_LARGEFILE),y)
-define MICROPERL_LARGEFILE
-	$(SED) '/^uselargefiles=/d' $(@D)/uconfig.sh
-	echo "uselargefiles='define'" >>$(@D)/uconfig.sh
-endef
-endif
-
-ifeq ($(BR2_USE_WCHAR),y)
-define MICROPERL_WCHAR
-	$(SED) '/^d_mbstowcs=/d' -e '/^d_mbtowc=/d' -e '/^d_wcstombs=/d' \
-		-e '/^d_wctomb=/d' $(@D)/uconfig.sh
-	echo "d_mbstowcs='define'" >>$(@D)/uconfig.sh
-	echo "d_mbtowc='define'" >>$(@D)/uconfig.sh
-	echo "d_wcstombs='define'" >>$(@D)/uconfig.sh
-	echo "d_wctomb='define'" >>$(@D)/uconfig.sh
-endef
-endif
-
-define MICROPERL_CONFIGURE_CMDS
-	$(SED) '/^archlib=/d' -e '/^archlibexp=/d' -e '/^optimize=/d' \
-		-e '/^archname=/d' -e '/^d_poll=/d' -e '/^i_poll=/d' \
-		-e '/^osname=/d' -e '/^u32type=/d' -e '/^d_archlib=/d' \
-		-e '/^d_memset=/d' -e '/^i_fcntl=/d' -e '/^useperlio=/d' \
-		-e '/^need_va_copy=/d' $(@D)/uconfig.sh
-	$(SED) 's/5.12/$(MICROPERL_VERSION)/' $(@D)/uconfig.sh
-	echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh
-	echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh
-	echo "d_archlib='define'" >>$(@D)/uconfig.sh
-	echo "archname='$(GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh
-	echo "osname='linux'" >>$(@D)/uconfig.sh
-	echo "cc='$(TARGET_CC)'" >>$(@D)/uconfig.sh
-	echo "ccflags='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh
-	echo "optimize='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh
-	echo "usecrosscompile='define'" >>$(@D)/uconfig.sh
-	echo "d_memset='define'" >>$(@D)/uconfig.sh
-	echo "i_fcntl='define'" >>$(@D)/uconfig.sh
-	echo "useperlio='define'" >>$(@D)/uconfig.sh
-	echo "u32type='unsigned int'" >>$(@D)/uconfig.sh
-	echo "need_va_copy='define'" >>$(@D)/uconfig.sh
-	echo "d_poll='define'" >>$(@D)/uconfig.sh
-	echo "i_poll='define'" >>$(@D)/uconfig.sh
-	$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
-	$(SED) 's/local\///' $(@D)/uconfig.sh
-	$(MICROPERL_BIGENDIAN)
-	$(MICROPERL_LARGEFILE)
-	$(MICROPERL_WCHAR)
-	$(MAKE) -C $(@D) -f Makefile.micro regen_uconfig
-	cp -f $(@D)/uconfig.h $(@D)/config.h
-	cp -f $(@D)/uconfig.sh $(@D)/config.sh
-	echo "ccname='$(TARGET_CC)'" >>$(@D)/config.sh
-	echo "PERL_CONFIG_SH=true" >>$(@D)/config.sh
-	cd $(@D) ; $(HOST_DIR)/usr/bin/perl make_patchnum.pl ; \
-	$(HOST_DIR)/usr/bin/perl configpm
-endef
-
-define MICROPERL_BUILD_CMDS
-	$(MAKE) -f Makefile.micro -C $(@D) \
-		CC="$(HOSTCC)" bitcount.h
-	$(MAKE) -f Makefile.micro -C $(@D) \
-		CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)"
-endef
-
-# Some extensions don't need a build run
-# We try to build anyway to avoid a huge black list
-# Just ignore make_ext.pl warning/errors
-define MICROPERL_BUILD_EXTENSIONS
-	for i in $(MICROPERL_MODS); do \
-	cd $(@D); ln -sf $(HOST_DIR)/usr/bin/perl miniperl; \
-		PERL5LIB=$(TARGET_DIR)/$(MICROPERL_ARCH_DIR) \
-		$(HOST_DIR)/usr/bin/perl make_ext.pl MAKE="$(MAKE)" --nonxs \
-		`echo $$i|sed -e 's/.pm//'`; \
-	done
-endef
-
-define MICROPERL_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/microperl $(TARGET_DIR)/usr/bin/microperl
-	ln -sf microperl $(TARGET_DIR)/usr/bin/perl
-	for i in $(MICROPERL_ARCH_MODS); do \
-		$(INSTALL) -m 0644 -D $(@D)/lib/$$i \
-			$(TARGET_DIR)/$(MICROPERL_ARCH_DIR)/$$i; \
-	done
-	for i in $(MICROPERL_BASE_MODS); do \
-		$(INSTALL) -m 0644 -D $(@D)/lib/$$i \
-			$(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
-	done
-	$(MICROPERL_BUILD_EXTENSIONS)
-	for i in $(MICROPERL_MODS); do \
-		j=`echo $$i|cut -d : -f 1` ; \
-		if [ -d $(@D)/lib/$$j ] ; then \
-			cp -af $(@D)/lib/$$j $(TARGET_DIR)/$(MICROPERL_MODS_DIR) ; \
-		fi ; \
-		if [ -f $(@D)/lib/$$i ] ; then \
-			$(INSTALL) -m 0644 -D $(@D)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
-		fi ; \
-	done
-	# Remove test files
-	find $(TARGET_DIR)/$(MICROPERL_MODS_DIR) -type f -name *.t \
-		-exec rm -f {} \;
-endef
-
-define MICROPERL_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/bin/perl
-	rm -f $(TARGET_DIR)/usr/bin/microperl
-	rm -rf $(TARGET_DIR)/usr/lib/perl5
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))

From 1def3f8843a91dd546bcd52aa27937406fc43497 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Sat, 2 Mar 2013 00:39:00 +0000
Subject: [PATCH 4320/6849] cpanminus: bump to version 1.6002

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpanminus/cpanminus.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index e7e3f29591..7e7b47d7a3 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-CPANMINUS_VERSION = 1.5018
-CPANMINUS_SOURCE = miyagawa-cpanminus-$(CPANMINUS_VERSION)-0-gee6cd30.tar.gz
-CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/tarball/$(CPANMINUS_VERSION)
+CPANMINUS_VERSION = 1.6002
+CPANMINUS_SOURCE = $(CPANMINUS_VERSION).tar.gz
+CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/archive
 CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
 
 CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl

From 6deb0685e40d2e0023032565e60725632877be3a Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Sat, 2 Mar 2013 10:45:54 +0000
Subject: [PATCH 4321/6849] Add Armadeus systems APF28 SOM basic support.

Buildroot toolchain, UBIFS rootfs, Linux kernel (board is mainlined
since 3.8).

Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/armadeus/apf28/linux-3.8.config | 180 ++++++++++++++++++++++++++
 configs/armadeus_apf28_defconfig      |  29 +++++
 2 files changed, 209 insertions(+)
 create mode 100644 board/armadeus/apf28/linux-3.8.config
 create mode 100644 configs/armadeus_apf28_defconfig

diff --git a/board/armadeus/apf28/linux-3.8.config b/board/armadeus/apf28/linux-3.8.config
new file mode 100644
index 0000000000..c9f11429f0
--- /dev/null
+++ b/board/armadeus/apf28/linux-3.8.config
@@ -0,0 +1,180 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_BSD_DISKLABEL=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MXS=y
+CONFIG_MACH_MXS_DT=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CPU_IDLE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_FLEXCAN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_MAC80211_RC_PID=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER=m
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_UBI=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_NETDEVICES=y
+CONFIG_RTL8187=m
+CONFIG_RT2X00=m
+CONFIG_RT73USB=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MXS_AUART=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MXS=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_MXS=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_HWMON=m
+CONFIG_WATCHDOG=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_FB=y
+CONFIG_FB_MXS=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_USB=y
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_WDM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_ETH=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_MMC=y
+CONFIG_MMC_MXS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_STMP=y
+CONFIG_DMADEVICES=y
+CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_MXS_LRADC=y
+CONFIG_IIO=y
+CONFIG_PWM=y
+CONFIG_PWM_MXS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_FS=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig
new file mode 100644
index 0000000000..ae443e11de
--- /dev/null
+++ b/configs/armadeus_apf28_defconfig
@@ -0,0 +1,29 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.8.1"
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="apf28"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+
+# Filesystem
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-3.8.config"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"

From 3ceb91e8b14233f4b40c3acb14384f5898461f95 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:00:00 +0000
Subject: [PATCH 4322/6849] ethtool: bump to version 3.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 11abbc21be..b791ca79d7 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.7
+ETHTOOL_VERSION = 3.8
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
 ETHTOOL_LICENSE_FILES = COPYING

From 3a1fd4be2c849fabb54cf303c2ca753eb9a0314e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:00:01 +0000
Subject: [PATCH 4323/6849] dosfstools: bump to version 3.0.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index e3cc9cfb57..3a0856ab4b 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DOSFSTOOLS_VERSION = 3.0.15
+DOSFSTOOLS_VERSION = 3.0.16
 DOSFSTOOLS_SITE = http://fossies.org/linux/misc
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING

From fcfb3946743bfa2db871031ccaed884eb36c5395 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:00:02 +0000
Subject: [PATCH 4324/6849] gnutls: bump to version 3.1.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index ff9cffa87f..21ace1c566 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 3.1.8
+GNUTLS_VERSION = 3.1.9
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1
 GNUTLS_LICENSE = GPLv3+ LGPLv3

From 63b2ee6b86e2214362bc75cb0363b42d11f15ff5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:00:03 +0000
Subject: [PATCH 4325/6849] squid: bump to version 3.3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 7cae0bef2a..a4093f4356 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.2.7
-SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
+SQUID_VERSION = 3.3.2
+SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \

From 1b9a4f1e91ac98d836775c293acb9a947b846de1 Mon Sep 17 00:00:00 2001
From: roylee17 <roylee17@gmail.com>
Date: Mon, 4 Mar 2013 07:47:20 +0000
Subject: [PATCH 4326/6849] stress: honor the BR2_PREFER_STATIC_LIB preference

Stress is linked statically if the --enable-static is specified.
However, this option is always specified in the global
SHARED_STATIC_LIBS_OPTS to tell packages to build static libraries,
if supported.

If the BR2_PREFER_STATIC_LIB is not defined, we have to specify
--disable-static explicitly to get stress linked dynamically.

Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/stress/stress.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index 3a047b5691..a20b0c6f65 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -10,4 +10,14 @@ STRESS_VERSION = 1.0.4
 STRESS_SITE    = http://weather.ou.edu/~apw/projects/stress
 STRESS_AUTORECONF = YES
 
+# Stress is linked statically if the --enable-static is specified.
+# However, this option is always specified in the global
+# SHARED_STATIC_LIBS_OPTS to tell packages to build static libraries,
+# if supported.
+#
+# If the BR2_PREFER_STATIC_LIB is not defined, we have to specify
+# --disable-static explicitly to get stress linked dynamically.
+STRESS_CONF_OPT = \
+	$(if $(BR2_PREFER_STATIC_LIB),,--disable-static)
+
 $(eval $(autotools-package))

From 66dc450f1dabfce90cb87d5e7c2c91be83dc7859 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:50:35 +0000
Subject: [PATCH 4327/6849] libnetfilter_conntrack: bump to version 1.0.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index 725c39ee9c..989a34e19a 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNETFILTER_CONNTRACK_VERSION = 1.0.2
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.3
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES

From 6c1df894a972bb60a0a1863710f71807e7307343 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:50:36 +0000
Subject: [PATCH 4328/6849] libnetfilter_acct: bump to version 1.0.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnetfilter_acct/libnetfilter-acct.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_acct/libnetfilter-acct.mk b/package/libnetfilter_acct/libnetfilter-acct.mk
index 615c94c5ea..f08fc44735 100644
--- a/package/libnetfilter_acct/libnetfilter-acct.mk
+++ b/package/libnetfilter_acct/libnetfilter-acct.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNETFILTER_ACCT_VERSION = 1.0.1
+LIBNETFILTER_ACCT_VERSION = 1.0.2
 LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2
 LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files
 LIBNETFILTER_ACCT_INSTALL_STAGING = YES

From 6017be12eee553ad946706ebc623ffa621051228 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:50:37 +0000
Subject: [PATCH 4329/6849] nfacct: bump to version 1.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nfacct/nfacct.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk
index 60c6e44f6e..cde9cada1f 100644
--- a/package/nfacct/nfacct.mk
+++ b/package/nfacct/nfacct.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NFACCT_VERSION = 1.0.0
+NFACCT_VERSION = 1.0.1
 NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
 NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files
 NFACCT_DEPENDENCIES = host-pkgconf \

From 530ba040554b2964ddc2078decac3df7c1235d04 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:50:38 +0000
Subject: [PATCH 4330/6849] ulogd: bump to version 2.0.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../ulogd/ulogd-fix-libpcap-conditional.patch | 29 -------------------
 package/ulogd/ulogd.mk                        |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 package/ulogd/ulogd-fix-libpcap-conditional.patch

diff --git a/package/ulogd/ulogd-fix-libpcap-conditional.patch b/package/ulogd/ulogd-fix-libpcap-conditional.patch
deleted file mode 100644
index 3d73d37d4a..0000000000
--- a/package/ulogd/ulogd-fix-libpcap-conditional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 08387386821f356834bac14c7c5ea7296fb0f428 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 9 Oct 2012 16:23:12 -0300
-Subject: [PATCH] autoconf/ulogd: fix broken libpcap AM_CONDITIONAL
-
-The AM_CONDITIONAL lacks the opening bracket, hence it always evaluates
-as true, even if there's no libpcap found thus causing build breakage.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 10b6e1f..57c596c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,7 +21,7 @@ AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
- AC_SUBST([libdl_LIBS])
- AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
- AC_SUBST([libpcap_LIBS])
--AM_CONDITIONAL([HAVE_PCAP], test -n "$libpcap_LIBS"])
-+AM_CONDITIONAL([HAVE_PCAP],[test -n "$libpcap_LIBS"])
- 
- dnl Checks for header files.
- AC_HEADER_DIRENT
--- 
-1.7.8.6
-
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
index 34d8665275..9425ac59d0 100644
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ULOGD_VERSION = 2.0.1
+ULOGD_VERSION = 2.0.2
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
 ULOGD_CONF_OPT = --with-dbi=no --with-pgsql=no

From 8164fd827784bf5ef3d897a142ea499d5d7eb166 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:50:39 +0000
Subject: [PATCH 4331/6849] conntrack-tools: bump to version 1.4.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/conntrack-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index ece30903d8..a961c6f53d 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-CONNTRACK_TOOLS_VERSION = 1.4.0
+CONNTRACK_TOOLS_VERSION = 1.4.1
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \

From d4f49fc1fef5cc0d5f42d035b48c96ad941c9001 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Mar 2013 06:50:40 +0000
Subject: [PATCH 4332/6849] iptables: bump to version 1.4.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 518b90eb79..ed11fdc040 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.17
+IPTABLES_VERSION = 1.4.18
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 5d8acdc937c67f2309017fbe783f8fb75f681c65 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Feb 2013 07:27:50 +0000
Subject: [PATCH 4333/6849] ncurses: speed up the build by not installing
 manpages

The installation of manpages during the installation step of
host-ncurses and ncurses is horribly slow, and useless. This commit
therefore disables the installation of those manpages, using the
--without-manpages configuration option.

It brings the combined host-ncurses+ncurses configure/build/install
time from 3 minutes and 18 seconds to 1 minute and 36 seconds.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index aa2b6bc04e..e77a0f1afb 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -27,7 +27,8 @@ NCURSES_CONF_OPT = \
 	--enable-echo \
 	--enable-const \
 	--enable-overwrite \
-	--enable-pc-files
+	--enable-pc-files \
+	$(if $(BR2_HAVE_DOCUMENTATION),,--without-manpages)
 
 ifneq ($(BR2_ENABLE_DEBUG),y)
 NCURSES_CONF_OPT += --without-debug
@@ -115,7 +116,8 @@ define HOST_NCURSES_BUILD_CMDS
 endef
 
 HOST_NCURSES_CONF_OPT = \
-	--without-shared --without-gpm
+	--without-shared --without-gpm \
+	--without-manpages
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From bfbfc93cc7b7a9e2cf54736561a41db67ac8e67a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Feb 2013 07:27:51 +0000
Subject: [PATCH 4334/6849] ncurses: speed up host build

Disable C++ and Ada bindings in host-ncurses, since those are not
needed. Save 9 seconds of build time on my laptop.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index e77a0f1afb..c01dfbc36b 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -117,7 +117,10 @@ endef
 
 HOST_NCURSES_CONF_OPT = \
 	--without-shared --without-gpm \
-	--without-manpages
+	--without-manpages \
+	--without-cxx \
+	--without-cxx-binding \
+	--without-ada
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 44b11564e4ca61a6b5c0f4bd8ea54bd411886e2f Mon Sep 17 00:00:00 2001
From: Laurent Cans <laurent.cans@gmail.com>
Date: Mon, 18 Feb 2013 08:49:45 +0000
Subject: [PATCH 4335/6849] aircrack-ng: new package

Aircrack-ng is a set of tools for auditing wireless security.

[Peter: mention that iw is a runtime dependency, use MAKE1]
Signed-off-by: Laurent Cans <laurent.cans@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/aircrack-ng/Config.in      | 13 +++++++++
 package/aircrack-ng/aircrack-ng.mk | 43 ++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 package/aircrack-ng/Config.in
 create mode 100644 package/aircrack-ng/aircrack-ng.mk

diff --git a/package/Config.in b/package/Config.in
index 6701dc61fe..56fdd2fa06 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -613,6 +613,7 @@ source "package/sound-theme-freedesktop/Config.in"
 endmenu
 
 menu "Networking applications"
+source "package/aircrack-ng/Config.in"
 source "package/argus/Config.in"
 source "package/arptables/Config.in"
 source "package/avahi/Config.in"
diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
new file mode 100644
index 0000000000..419f991efd
--- /dev/null
+++ b/package/aircrack-ng/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_AIRCRACK_NG
+	bool "aircrack-ng"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_IW # runtime
+	help
+	  A set of tools for auditing wireless networks
+
+	  http://www.aircrack-ng.org/
+
+comment "aircrack-ng needs a toolchain with largefile support"
+	depends on !BR2_LARGEFILE
+
diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
new file mode 100644
index 0000000000..48897da7c2
--- /dev/null
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# Aircrack-ng
+#
+#############################################################
+
+AIRCRACK_NG_VERSION = 1.1
+AIRCRACK_NG_SOURCE = aircrack-ng-$(AIRCRACK_NG_VERSION).tar.gz
+AIRCRACK_NG_SITE = http://download.aircrack-ng.org
+AIRCRACK_NG_LICENSE = GPLv2+
+AIRCRACK_NG_LICENSE_FILES = LICENSE
+AIRCRACK_NG_DEPENDENCIES = openssl
+
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+	AIRCRACK_NG_MAKE_OPTS = sqlite=true
+	AIRCRACK_NG_MAKE_OPTS += LIBSQL="-lsqlite3"
+
+	AIRCRACK_NG_DEPENDENCIES += sqlite
+else
+	AIRCRACK_NG_MAKE_OPTS = sqlite=false
+endif
+
+define AIRCRACK_NG_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)\
+		$(AIRCRACK_NG_MAKE_OPTS) all
+endef
+
+define AIRCRACK_NG_CLEAN_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)\
+		$(AIRCRACK_NG_MAKE_OPTS) clean
+endef
+
+define AIRCRACK_NG_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) \
+		$(AIRCRACK_NG_MAKE_OPTS) install
+endef
+
+define AIRCRACK_NG_UNINSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) \
+		$(AIRCRACK_NG_MAKE_OPTS) uninstall
+endef
+
+$(eval $(generic-package))

From e4d32a7a465e98770cb1da7afddf4b2d6b154790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Mon, 18 Feb 2013 10:28:58 +0000
Subject: [PATCH 4336/6849] new package: libtasn1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
other packages. It was written by Fabio Fiorina, and has been
shipped as part of GnuTLS for some time but is now a proper
GNU package.

[Peter: Both licenses are '+']
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libtasn1/Config.in   |  6 ++++++
 package/libtasn1/libtasn1.mk | 14 ++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 package/libtasn1/Config.in
 create mode 100644 package/libtasn1/libtasn1.mk

diff --git a/package/Config.in b/package/Config.in
index 56fdd2fa06..370676383b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -555,6 +555,7 @@ source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libsigc/Config.in"
+source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
 source "package/libseccomp/Config.in"
 source "package/liburcu/Config.in"
diff --git a/package/libtasn1/Config.in b/package/libtasn1/Config.in
new file mode 100644
index 0000000000..181fc69895
--- /dev/null
+++ b/package/libtasn1/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBTASN1
+	bool "libtasn1"
+	help
+	  ASN.1 library
+
+	  http://www.gnu.org/software/libtasn1
diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk
new file mode 100644
index 0000000000..d874b9a683
--- /dev/null
+++ b/package/libtasn1/libtasn1.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# libtasn1
+#
+#############################################################
+
+LIBTASN1_VERSION = 3.2
+LIBTASN1_SITE = http://ftp.gnu.org/gnu/libtasn1
+LIBTASN1_DEPENDENCIES = host-bison
+LIBTASN1_LICENSE = GPLv3+ LGPLv2.1+
+LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB
+LIBTASN1_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 83287ee571db6ffd876c90b6db12fa59be87ae67 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Mon, 4 Mar 2013 18:41:55 +0000
Subject: [PATCH 4337/6849] htop: needs MMU

Fixes:
http://autobuild.buildroot.org/results/023b40f48c8006cd49c585efae3cfa065b21bf51

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/htop/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/htop/Config.in b/package/htop/Config.in
index 55b4b151fc..51304afb53 100644
--- a/package/htop/Config.in
+++ b/package/htop/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HTOP
 	bool "htop"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
 	  htop is an interactive text-mode process viewer for Linux.

From b9bb2c64cde21018f298b59c9a63a442286bf569 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Tue, 5 Mar 2013 20:31:08 +0000
Subject: [PATCH 4338/6849] json-c: Add json_object_iterator.h to installed
 headers

json_object_iterator.h is not installed in staging directory.
This leads to an error during pulseaudio build process:

fatal error: json_object_iterator.h: No such file or directory

Fixes autobuild failures like:
http://autobuild.buildroot.org/results/079f9265cd768f88ad57f6f7b794641c845f3079

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...dd-missing-file-to-installed-headers.patch | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/json-c/json-c-add-missing-file-to-installed-headers.patch

diff --git a/package/json-c/json-c-add-missing-file-to-installed-headers.patch b/package/json-c/json-c-add-missing-file-to-installed-headers.patch
new file mode 100644
index 0000000000..12ef8558d1
--- /dev/null
+++ b/package/json-c/json-c-add-missing-file-to-installed-headers.patch
@@ -0,0 +1,43 @@
+From 2ab6524ca0cfaab7feb42f7c328db8fca7b111fc Mon Sep 17 00:00:00 2001
+From: Gilles Talis <gilles.talis@gmail.com>
+Date: Tue, 5 Mar 2013 21:59:11 -0800
+Subject: [PATCH] Add json_object_iterator.h to installed headers
+
+Backported from: 4154c55edae6f6b34d6ef4fcc331055fdf8e1a23
+
+In addition to original patch, applied the same change to Makefile.in
+to avoid having the package to be autoreconfigured.
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ Makefile.am |    1 +
+ Makefile.in |    1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index d4a7bbb..8f09ca8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,6 +17,7 @@ libjsoninclude_HEADERS = \
+ 	json_config.h \
+ 	json_inttypes.h \
+ 	json_object.h \
++	json_object_iterator.h \
+ 	json_object_private.h \
+ 	json_tokener.h \
+ 	json_util.h \
+diff --git a/Makefile.in b/Makefile.in
+index c06db3e..9d924cd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -278,6 +278,7 @@ libjsoninclude_HEADERS = \
+ 	json_config.h \
+ 	json_inttypes.h \
+ 	json_object.h \
++	json_object_iterator.h \
+ 	json_object_private.h \
+ 	json_tokener.h \
+ 	json_util.h \
+-- 
+1.7.10.4
+

From a9ba807c588e285960e08140127ea43a6066204c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 5 Mar 2013 08:59:21 +0000
Subject: [PATCH 4339/6849] graph-depends: ignore the 'target-post-image'
 target

Since the introduction of the post-image mechanism, the graph-depends
script is broken: it tries to call 'make
target-post-image-show-depends', which doesn't exist since
'target-post-image' is not a package.

So we should simply ignore this 'target-post-image'.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 1163d79673..180c81d94c 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -168,6 +168,7 @@ TARGET_EXCEPTIONS = [
     "erase-fakeroots",
     "target-generic-hostname",
     "target-root-passwd",
+    "target-post-image",
 ]
 
 # In full mode, start with the result of get_targets() to get the main

From 7154798a461a8b2c2882fa2c1ce2c58b0d8d6614 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 6 Mar 2013 10:22:43 +0000
Subject: [PATCH 4340/6849] pcre: add support for 16 bits and 32 bits variants

Until now, we have been building only the 8bits PCRE variant. However,
Qt5 requires the 16bits variant. This commit therefore adds support to
build the 16bits and 32bits variants of PCRE. In order to preserve
backward compatibility, the 8bits variant is automatically chosen if
no specific variant is defined.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/Config.in | 22 ++++++++++++++++++++++
 package/pcre/pcre.mk   |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/package/pcre/Config.in b/package/pcre/Config.in
index a4e2547cef..5d16e6d1bc 100644
--- a/package/pcre/Config.in
+++ b/package/pcre/Config.in
@@ -1,6 +1,28 @@
 config BR2_PACKAGE_PCRE
 	bool "pcre"
+	# Ensure at least the default 8-bit library is enabled.
+	select BR2_PACKAGE_PCRE_8 if \
+	       (!BR2_PACKAGE_PCRE_16 && !BR2_PACKAGE_PCRE_32)
 	help
 	  Perl Compatible Regular Expressions
 
 	  http://www.pcre.org/
+
+if BR2_PACKAGE_PCRE
+
+config BR2_PACKAGE_PCRE_8
+	bool "8-bit pcre"
+	help
+	  This option builds the 8-bits pcre library, i.e 'libpcre'
+
+config BR2_PACKAGE_PCRE_16
+	bool "16-bit pcre"
+	help
+	  This option builds the 16-bits pcre library, i.e 'libpcre16'
+
+config BR2_PACKAGE_PCRE_32
+	bool "32-bit pcre"
+	help
+	  This option builds the 32-bits pcre library, i.e 'libpcre32'
+
+endif
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 48266ff74d..b1339fbbc4 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -16,4 +16,8 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 PCRE_CONF_OPT = --disable-cpp
 endif
 
+PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_8),--enable-pcre8,--disable-pcre8)
+PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16)
+PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32)
+
 $(eval $(autotools-package))

From 09fef507b03decc2dcc9a520c5a0bd8fd23ae34c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 6 Mar 2013 10:22:44 +0000
Subject: [PATCH 4341/6849] x11r7/xcb-util: bump to 0.3.9

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xcb-util/xcb-util.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index 5681b725e1..fcf99ea671 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -3,7 +3,7 @@
 # xcb-util
 #
 #############################################################
-XCB_UTIL_VERSION = 0.3.6
+XCB_UTIL_VERSION = 0.3.9
 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
 XCB_UTIL_INSTALL_STAGING = YES

From 5e6696713c20615d0c1fdbafb8189fce9992e534 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 6 Mar 2013 10:22:47 +0000
Subject: [PATCH 4342/6849] package: create virtual package for libGLES,
 libOpenVG and libEGL

Those acceleration libraries typically have multiple implementations:
some are free (Mesa), some are proprietary (generally SoC specific).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                     |  1 +
 package/opengl/Config.in              |  8 ++++++++
 package/opengl/libegl/libegl.mk       | 16 ++++++++++++++++
 package/opengl/libgles/libgles.mk     | 16 ++++++++++++++++
 package/opengl/libopenvg/libopenvg.mk | 16 ++++++++++++++++
 package/opengl/opengl.mk              |  1 +
 6 files changed, 58 insertions(+)
 create mode 100644 package/opengl/Config.in
 create mode 100644 package/opengl/libegl/libegl.mk
 create mode 100644 package/opengl/libgles/libgles.mk
 create mode 100644 package/opengl/libopenvg/libopenvg.mk
 create mode 100644 package/opengl/opengl.mk

diff --git a/package/Config.in b/package/Config.in
index 370676383b..22e64f8692 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -435,6 +435,7 @@ source "package/librsvg/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
 source "package/opencv/Config.in"
+source "package/opengl/Config.in"
 source "package/pango/Config.in"
 source "package/pixman/Config.in"
 source "package/tiff/Config.in"
diff --git a/package/opengl/Config.in b/package/opengl/Config.in
new file mode 100644
index 0000000000..81616f99fb
--- /dev/null
+++ b/package/opengl/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HAS_OPENGL_EGL
+	bool
+
+config BR2_PACKAGE_HAS_OPENGL_ES
+	bool
+
+config BR2_PACKAGE_HAS_OPENVG
+	bool
diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
new file mode 100644
index 0000000000..56cc8ac0d6
--- /dev/null
+++ b/package/opengl/libegl/libegl.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# Virtual package for libEGL
+#
+#############################################################
+
+LIBEGL_SOURCE =
+
+ifeq ($(LIBEGL_DEPENDENCIES),y)
+define LIBEGL_CONFIGURE_CMDS
+	echo "No libEGL implementation selected. Configuration error."
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
new file mode 100644
index 0000000000..753f53efe1
--- /dev/null
+++ b/package/opengl/libgles/libgles.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# Virtual package for libGLES
+#
+#############################################################
+
+LIBGLES_SOURCE =
+
+ifeq ($(LIBGLES_DEPENDENCIES),y)
+define LIBGLES_CONFIGURE_CMDS
+	echo "No libGLES implementation selected. Configuration error."
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
new file mode 100644
index 0000000000..2fcc99fa3b
--- /dev/null
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# Virtual package for libOpenVG
+#
+#############################################################
+
+LIBOPENVG_SOURCE =
+
+ifeq ($(LIBOPENVG_DEPENDENCIES),y)
+define LIBOPENVG_CONFIGURE_CMDS
+	echo "No libOpenVG implementation selected. Configuration error."
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))
diff --git a/package/opengl/opengl.mk b/package/opengl/opengl.mk
new file mode 100644
index 0000000000..68df3b171b
--- /dev/null
+++ b/package/opengl/opengl.mk
@@ -0,0 +1 @@
+include package/opengl/*/*.mk

From 203c30796e232faaf3a7de19090657bf3e7db16a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 6 Mar 2013 10:22:48 +0000
Subject: [PATCH 4343/6849] rpi-userland: provides OpenGL ES, EGL and OpenVG

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opengl/libegl/libegl.mk       | 4 ++++
 package/opengl/libgles/libgles.mk     | 4 ++++
 package/opengl/libopenvg/libopenvg.mk | 4 ++++
 package/rpi-userland/Config.in        | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index 56cc8ac0d6..c4954963c8 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -6,6 +6,10 @@
 
 LIBEGL_SOURCE =
 
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+LIBEGL_DEPENDENCIES += rpi-userland
+endif
+
 ifeq ($(LIBEGL_DEPENDENCIES),y)
 define LIBEGL_CONFIGURE_CMDS
 	echo "No libEGL implementation selected. Configuration error."
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index 753f53efe1..f0d0eec9c3 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -6,6 +6,10 @@
 
 LIBGLES_SOURCE =
 
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+LIBGLES_DEPENDENCIES += rpi-userland
+endif
+
 ifeq ($(LIBGLES_DEPENDENCIES),y)
 define LIBGLES_CONFIGURE_CMDS
 	echo "No libGLES implementation selected. Configuration error."
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
index 2fcc99fa3b..573fa786dd 100644
--- a/package/opengl/libopenvg/libopenvg.mk
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -6,6 +6,10 @@
 
 LIBOPENVG_SOURCE =
 
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+LIBOPENVG_DEPENDENCIES += rpi-userland
+endif
+
 ifeq ($(LIBOPENVG_DEPENDENCIES),y)
 define LIBOPENVG_CONFIGURE_CMDS
 	echo "No libOpenVG implementation selected. Configuration error."
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 58ea8cb593..2c35fb76c8 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -3,6 +3,9 @@ config BR2_PACKAGE_RPI_USERLAND
 	depends on BR2_arm
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_HAS_OPENGL_EGL
+	select BR2_PACKAGE_HAS_OPENGL_ES
+	select BR2_PACKAGE_HAS_OPENVG
 	help
 	  Raspberry Pi Userland contains the necessary library to use the
 	  VideoCore driver.

From d2be9be63d2b1120c4ec0c3c445075a7311ef523 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 6 Mar 2013 23:18:22 +0000
Subject: [PATCH 4344/6849] autoconf: don't try to build Emacs files

When building autoconf for the target, we already passed EMACS="no" to
prevent autoconf from building Emacs mode files. But we weren't doing
that when building autoconf for the host. This causes problems when
'emacs' is not really emacs, but a sort of clone like Jove. So we also
pass EMACS="no" when building host-autoconf to avoid autoconf
./configure script from detecting emacs and then use it to build .elc
files from .el source code.

Reported-by: Spielmann Werner <Werner.Spielmann@swarovski.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/autoconf/autoconf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 0c36b66fce..daac1f2179 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -15,7 +15,7 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 
 AUTOCONF_DEPENDENCIES = host-m4 perl
 
-HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+HOST_AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 			ac_cv_prog_gnu_m4_gnu=no
 
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool

From 70f99d80ef87b1de02fe0f4353128dc9f5101409 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:29 +0000
Subject: [PATCH 4345/6849] xcb-util: add dependency on libxcb

The xcb-util lacks a dependency on libxcb. Without this dependency, it
fails to build with:

checking for XCB... no
configure: error: in `/home/thomas/projets/buildroot/output/build/xcb-util-0.3.9':
configure: error: The pkg-config script could not be found or is too old.  Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.

Alternatively, you may set the environment variables XCB_CFLAGS
and XCB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xcb-util/Config.in   | 1 +
 package/x11r7/xcb-util/xcb-util.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xcb-util/Config.in b/package/x11r7/xcb-util/Config.in
index cf79327353..dd77b1d9d4 100644
--- a/package/x11r7/xcb-util/Config.in
+++ b/package/x11r7/xcb-util/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XCB_UTIL
 	bool "xcb-util"
+	depends on BR2_PACKAGE_LIBXCB
 	help
 	  Libraries which sit on top of libxcb, the core X protocol library,
 	  and some of the extension libraries.
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index fcf99ea671..a1948e1c24 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -7,7 +7,7 @@ XCB_UTIL_VERSION = 0.3.9
 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
 XCB_UTIL_INSTALL_STAGING = YES
-XCB_UTIL_DEPENDENCIES = host-gperf
+XCB_UTIL_DEPENDENCIES = host-gperf libxcb
 
 $(eval $(autotools-package))
 

From 046a908b01e26cb90572e36260d7cd3674e61ff5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:30 +0000
Subject: [PATCH 4346/6849] x11r7/xcb-util-wm: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                  |  1 +
 package/x11r7/xcb-util-wm/Config.in      | 16 ++++++++++++++++
 package/x11r7/xcb-util-wm/xcb-util-wm.mk | 14 ++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/x11r7/xcb-util-wm/Config.in
 create mode 100644 package/x11r7/xcb-util-wm/xcb-util-wm.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 706574c6e3..2abd5931d4 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -16,6 +16,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/mesa3d/Config.in
 		source package/x11r7/xcb-util/Config.in
 		source package/x11r7/xcb-util-keysyms/Config.in
+		source package/x11r7/xcb-util-wm/Config.in
 		source package/x11r7/xlib_libFS/Config.in
 		source package/x11r7/xlib_libICE/Config.in
 		source package/x11r7/xlib_libSM/Config.in
diff --git a/package/x11r7/xcb-util-wm/Config.in b/package/x11r7/xcb-util-wm/Config.in
new file mode 100644
index 0000000000..5e7d94e1d2
--- /dev/null
+++ b/package/x11r7/xcb-util-wm/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_XCB_UTIL_WM
+	bool "xcb-util-wm"
+	select BR2_PACKAGE_LIBXCB
+	help
+	  The XCB util modules provides a number of libraries which sit on top
+	  of libxcb, the core X protocol library, and some of the extension
+	  libraries. These experimental libraries provide convenience functions
+	  and interfaces which make the raw X protocol more usable. Some of the
+	  libraries also provide client-side code which is not strictly part of
+	  the X protocol but which have traditionally been provided by Xlib.
+
+	  XCB util-wm module provides the following libraries:
+	    - ewmh: Both client and window-manager helpers for EWMH.
+	    - icccm: Both client and window-manager helpers for ICCCM.
+
+	  http://xcb.freedesktop.org/
diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/package/x11r7/xcb-util-wm/xcb-util-wm.mk
new file mode 100644
index 0000000000..0338b8535b
--- /dev/null
+++ b/package/x11r7/xcb-util-wm/xcb-util-wm.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# xcb-util-wm
+#
+#############################################################
+
+XCB_UTIL_WM_VERSION = 0.3.9
+XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist/
+XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2
+XCB_UTIL_WM_INSTALL_STAGING = YES
+XCB_UTIL_WM_LICENSE = MIT
+XCB_UTIL_WM_DEPENDENCIES = libxcb
+
+$(eval $(autotools-package))

From 8d3f97257ffb9ed89761f503014f0e3375f2d6a3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:31 +0000
Subject: [PATCH 4347/6849] x11r7/xcb-util-image: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                        |  1 +
 package/x11r7/xcb-util-image/Config.in         | 15 +++++++++++++++
 package/x11r7/xcb-util-image/xcb-util-image.mk | 14 ++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/x11r7/xcb-util-image/Config.in
 create mode 100644 package/x11r7/xcb-util-image/xcb-util-image.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2abd5931d4..5d0f991ca8 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -15,6 +15,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/libxcb/Config.in
 		source package/x11r7/mesa3d/Config.in
 		source package/x11r7/xcb-util/Config.in
+		source package/x11r7/xcb-util-image/Config.in
 		source package/x11r7/xcb-util-keysyms/Config.in
 		source package/x11r7/xcb-util-wm/Config.in
 		source package/x11r7/xlib_libFS/Config.in
diff --git a/package/x11r7/xcb-util-image/Config.in b/package/x11r7/xcb-util-image/Config.in
new file mode 100644
index 0000000000..31fc61a50c
--- /dev/null
+++ b/package/x11r7/xcb-util-image/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_XCB_UTIL_IMAGE
+	bool "xcb-util-image"
+	select BR2_PACKAGE_XCB_UTIL
+	help
+	  The XCB util modules provides a number of libraries which sit on top
+	  of libxcb, the core X protocol library, and some of the extension
+	  libraries. These experimental libraries provide convenience functions
+	  and interfaces which make the raw X protocol more usable. Some of the
+	  libraries also provide client-side code which is not strictly part of
+	  the X protocol but which have traditionally been provided by Xlib.
+
+	  XCB util-image module provides the following library:
+	    - image: Port of Xlib's XImage and XShmImage functions.
+
+	  http://xcb.freedesktop.org/
diff --git a/package/x11r7/xcb-util-image/xcb-util-image.mk b/package/x11r7/xcb-util-image/xcb-util-image.mk
new file mode 100644
index 0000000000..0309f3b009
--- /dev/null
+++ b/package/x11r7/xcb-util-image/xcb-util-image.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# xcb-util-image
+#
+#############################################################
+
+XCB_UTIL_IMAGE_VERSION = 0.3.9
+XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist/
+XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2
+XCB_UTIL_IMAGE_INSTALL_STAGING = YES
+XCB_UTIL_IMAGE_LICENSE = MIT
+XCB_UTIL_IMAGE_DEPENDENCIES = xcb-util
+
+$(eval $(autotools-package))

From eaf42394208b2cbcb73f374e39ddb4ee7b8aee60 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 04:40:35 +0000
Subject: [PATCH 4348/6849] pcre: always enable the 8-bits version

Commit 7154798a461a8b2c (pcre: add support for 16 bits and 32 bits
variants), added in preparation to the introduction of the Qt5
packages, could break other packages that use pcre.

Even though by default the pcre 8 bits library is selected if no other
variant is selected, a randpackageconfig, or an user, could
potentially enable the 16 bits variant even if a package requires the
8 bits variant.

This has caused a number of build breakage on packages like ngrep,
cegui, nmap and others in the autobuilders.

In older to solve this, we simply unconditionally build the 8-bits
variant. Since each variant is only ~90k in size, it's probably not
worth the effort giving the possibility of building the 16 bits
variant only.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/Config.in | 12 +++---------
 package/pcre/pcre.mk   |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/package/pcre/Config.in b/package/pcre/Config.in
index 5d16e6d1bc..dc92274102 100644
--- a/package/pcre/Config.in
+++ b/package/pcre/Config.in
@@ -1,20 +1,14 @@
 config BR2_PACKAGE_PCRE
 	bool "pcre"
-	# Ensure at least the default 8-bit library is enabled.
-	select BR2_PACKAGE_PCRE_8 if \
-	       (!BR2_PACKAGE_PCRE_16 && !BR2_PACKAGE_PCRE_32)
 	help
-	  Perl Compatible Regular Expressions
+	  Perl Compatible Regular Expressions. By default, only the
+	  8-bits libpcre is built. To get the 16-bits and/or 32-bits
+	  variants libpcre16/libpcre32, use the package sub-options.
 
 	  http://www.pcre.org/
 
 if BR2_PACKAGE_PCRE
 
-config BR2_PACKAGE_PCRE_8
-	bool "8-bit pcre"
-	help
-	  This option builds the 8-bits pcre library, i.e 'libpcre'
-
 config BR2_PACKAGE_PCRE_16
 	bool "16-bit pcre"
 	help
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index b1339fbbc4..745309fa88 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -16,7 +16,7 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 PCRE_CONF_OPT = --disable-cpp
 endif
 
-PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_8),--enable-pcre8,--disable-pcre8)
+PCRE_CONF_OPT += --enable-pcre8
 PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16)
 PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32)
 

From 3bae624d5fd924f34dfccb6c020f599b189ca8f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 08:21:26 +0000
Subject: [PATCH 4349/6849] aircrack-ng: disable on non-MMU systems

aircrack-ng uses fork() and therefore fails to build on non-MMU
systems:

aircrack-ng.o: In function `_clean_exit':
aircrack-ng.c:(.text+0x555c): undefined reference to `_fork'
collect2: ld returned 1 exit status

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aircrack-ng/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
index 419f991efd..319b7c40b5 100644
--- a/package/aircrack-ng/Config.in
+++ b/package/aircrack-ng/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_AIRCRACK_NG
 	bool "aircrack-ng"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # uses fork()
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_IW # runtime
 	help

From d4b074554faa9451630cde47eb8378a8b0803252 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 08:21:27 +0000
Subject: [PATCH 4350/6849] alsa-lib: fix noMMU build

Add a patch to use vfork() instead of fork().

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/alsa-lib/alsa-lib-no-mmu.patch | 44 ++++++++++++++++++++++++++
 package/alsa-lib/alsa-lib.mk           |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 package/alsa-lib/alsa-lib-no-mmu.patch

diff --git a/package/alsa-lib/alsa-lib-no-mmu.patch b/package/alsa-lib/alsa-lib-no-mmu.patch
new file mode 100644
index 0000000000..317676af4c
--- /dev/null
+++ b/package/alsa-lib/alsa-lib-no-mmu.patch
@@ -0,0 +1,44 @@
+Don't use fork() on noMMU platforms
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: alsa-lib-1.0.26/configure.in
+===================================================================
+--- alsa-lib-1.0.26.orig/configure.in	2012-09-06 10:55:14.000000000 +0200
++++ alsa-lib-1.0.26/configure.in	2013-03-09 16:22:08.000000000 +0100
+@@ -66,6 +66,8 @@
+ AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes])
+ AC_CHECK_FUNCS([uselocale])
+ 
++AC_CHECK_FUNC([fork])
++
+ SAVE_LIBRARY_VERSION
+ AC_SUBST(LIBTOOL_VERSION_INFO)
+ 
+Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c
+===================================================================
+--- alsa-lib-1.0.26.orig/src/pcm/pcm_direct.c	2012-09-06 10:55:14.000000000 +0200
++++ alsa-lib-1.0.26/src/pcm/pcm_direct.c	2013-03-09 16:22:51.000000000 +0100
+@@ -424,13 +424,21 @@
+ 		close(dmix->server_fd);
+ 		return ret;
+ 	}
+-	
++
++#ifdef HAVE_FORK
+ 	ret = fork();
++#else
++	ret = vfork();
++#endif
+ 	if (ret < 0) {
+ 		close(dmix->server_fd);
+ 		return ret;
+ 	} else if (ret == 0) {
++#ifdef HAVE_FORK
+ 		ret = fork();
++#else
++		ret = vfork();
++#endif
+ 		if (ret == 0)
+ 			server_job(dmix);
+ 		_exit(EXIT_SUCCESS);
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index ba222db3a8..2856407680 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -11,6 +11,7 @@ ALSA_LIB_LICENSE = LGPLv2.1+
 ALSA_LIB_LICENSE_FILES = COPYING
 ALSA_LIB_INSTALL_STAGING = YES
 ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
+ALSA_LIB_AUTORECONF = YES
 ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
 		    --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
 		    --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \

From 2d9c65f63f8e5ede6a080d5f2e1a10908d9b2a7e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 08:21:28 +0000
Subject: [PATCH 4351/6849] libglib2: don't build tests

Add a patch that provides an additional --disable-tests option to the
configure script.

Disabling the build of tests has two benefits:
 * Prevents the build of a lot of code that doesn't build on noMMU
   platforms.
 * Reduces the build time.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2-no-tests.patch | 117 +++++++++++++++++++++++
 package/libglib2/libglib2.mk             |   7 +-
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 package/libglib2/libglib2-no-tests.patch

diff --git a/package/libglib2/libglib2-no-tests.patch b/package/libglib2/libglib2-no-tests.patch
new file mode 100644
index 0000000000..81b5af2d1b
--- /dev/null
+++ b/package/libglib2/libglib2-no-tests.patch
@@ -0,0 +1,117 @@
+Add a --disable-tests option to the configure script
+
+Disabling the build of tests has two benefits:
+ * Prevents the build of a lot of code that doesn't build on noMMU
+   platforms.
+ * Reduces the build time.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: libglib2-2.30.3/Makefile.am
+===================================================================
+--- libglib2-2.30.3.orig/Makefile.am	2012-03-11 22:43:28.000000000 +0100
++++ libglib2-2.30.3/Makefile.am	2013-03-09 17:32:01.000000000 +0100
+@@ -6,7 +6,11 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++if BUILD_TESTS
++TEST_SUBDIR = tests
++endif
++
++SUBDIRS = . m4macros glib gmodule gthread gobject gio $(TEST_SUBDIR) po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
+ 
+ bin_SCRIPTS = glib-gettextize
+Index: libglib2-2.30.3/gio/Makefile.am
+===================================================================
+--- libglib2-2.30.3.orig/gio/Makefile.am	2012-03-11 22:44:19.000000000 +0100
++++ libglib2-2.30.3/gio/Makefile.am	2013-03-09 17:32:38.000000000 +0100
+@@ -282,7 +282,11 @@
+ 
+ endif
+ 
+-SUBDIRS += tests
++if BUILD_TESTS
++TEST_SUBDIR = tests
++endif
++
++SUBDIRS += $(TEST_SUBDIR)
+ 
+ libgio_2_0_la_SOURCES =		\
+ 	gappinfo.c 		\
+Index: libglib2-2.30.3/configure.ac
+===================================================================
+--- libglib2-2.30.3.orig/configure.ac	2013-03-09 17:30:55.000000000 +0100
++++ libglib2-2.30.3/configure.ac	2013-03-09 17:37:27.000000000 +0100
+@@ -234,11 +234,18 @@
+               [AC_HELP_STRING([--disable-rebuilds],
+                               [disable all source autogeneration rules])],,
+               [enable_rebuilds=yes])
++AC_ARG_ENABLE(tests,
++		[AC_HELP_STRING([--disable-tests],
++				[disable all tests])],
++		enable_tests=${enableval},
++		enable_tests=yes)
+ 
+ if test "x$enable_threads" != "xyes"; then
+   enable_threads=no
+ fi
+ 
++AM_CONDITIONAL(BUILD_TESTS, [test x$enable_tests = xyes])
++
+ AC_MSG_CHECKING([whether to enable garbage collector friendliness])
+ if test "x$enable_gc_friendly" = "xyes"; then
+   AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default])
+Index: libglib2-2.30.3/glib/Makefile.am
+===================================================================
+--- libglib2-2.30.3.orig/glib/Makefile.am	2012-03-11 22:43:28.000000000 +0100
++++ libglib2-2.30.3/glib/Makefile.am	2013-03-09 18:02:59.000000000 +0100
+@@ -42,7 +42,11 @@
+ gregex_h =
+ endif
+ 
+-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
++if BUILD_TESTS
++TEST_SUBDIR = tests
++endif
++
++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . $(TEST_SUBDIR)
+ 
+ DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
+ 
+Index: libglib2-2.30.3/gobject/Makefile.am
+===================================================================
+--- libglib2-2.30.3.orig/gobject/Makefile.am	2012-03-11 22:43:29.000000000 +0100
++++ libglib2-2.30.3/gobject/Makefile.am	2013-03-09 18:03:40.000000000 +0100
+@@ -4,7 +4,11 @@
+ ## Process this file with automake to produce Makefile.in
+ include $(top_srcdir)/Makefile.decl
+ 
+-SUBDIRS = . tests
++if BUILD_TESTS
++TEST_SUBDIR = tests
++endif
++
++SUBDIRS = . $(TEST_SUBDIR)
+ 
+ BUILT_SOURCES=
+ CLEANFILES=
+Index: libglib2-2.30.3/gthread/Makefile.am
+===================================================================
+--- libglib2-2.30.3.orig/gthread/Makefile.am	2012-03-11 22:43:29.000000000 +0100
++++ libglib2-2.30.3/gthread/Makefile.am	2013-03-09 18:04:16.000000000 +0100
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ include $(top_srcdir)/Makefile.decl
+ 
+-SUBDIRS = . tests
++if BUILD_TESTS
++TEST_SUBDIR = tests
++endif
++
++SUBDIRS = . $(TEST_SUBDIR)
+ DIST_SUBDIRS = tests
+ 
+ AM_CPPFLAGS = 				\
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 278e6355b5..b108b89c04 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -9,6 +9,8 @@ LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 
+LIBGLIB2_AUTORECONF = YES
+HOST_LIBGLIB2_AUTORECONF = YES
 LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
@@ -61,7 +63,10 @@ HOST_LIBGLIB2_CONF_OPT = \
 		--enable-debug=no \
 		--disable-dtrace \
 		--disable-systemtap \
-		--disable-gcov
+		--disable-gcov \
+		--disable-tests
+
+LIBGLIB2_CONF_OPT += --disable-tests
 
 LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
 

From fe192908a4e3195b6f724310fe83fadaf18b66e7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 08:21:30 +0000
Subject: [PATCH 4352/6849] libglib2: use system pcre when available

By default, glib builds its own internal copy of the pcre library, but
it also allows to use the one available from the system. Use this
possibility when pcre is already selected in the Buildroot
configuration.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index b108b89c04..4ca6ca3cbd 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -81,6 +81,13 @@ LIBGLIB2_CONF_OPT += --with-libiconv=gnu
 LIBGLIB2_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_PACKAGE_PCRE),y)
+LIBGLIB2_CONF_OPT += --with-pcre=system
+LIBGLIB2_DEPENDENCIES += pcre
+else
+LIBGLIB2_CONF_OPT += --with-pcre=internal
+endif
+
 define LIBGLIB2_REMOVE_DEV_FILES
 	rm -rf $(TARGET_DIR)/usr/lib/glib-2.0
 	rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gettext

From 58e2d30b4d2ea3fcb752f71c20b150dbeb333723 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Mar 2013 07:12:02 +0000
Subject: [PATCH 4353/6849] gettext: bump to version 0.18.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 204af10891..d374050ed2 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GETTEXT_VERSION = 0.18.2
+GETTEXT_VERSION = 0.18.2.1
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+

From ef123e427878ee02fdaf8b22c9f9ba419eab758a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Mar 2013 08:22:32 +0000
Subject: [PATCH 4354/6849] ser2net: bump to version 2.8

Bump ser2net to version 2.8.

Exclude for nommu (uses fork).
Version 2.7 also did, guess the autobuilders never caught it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ser2net/Config.in  | 4 ++++
 package/ser2net/ser2net.mk | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in
index 7eb3a6af77..e3b8870cb6 100644
--- a/package/ser2net/Config.in
+++ b/package/ser2net/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_SER2NET
 	bool "ser2net"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_INET_IPV6
 	help
 	  Ser2net provides a way for a user to connect from a network
 	  connection to a serial port..
 
 	  http://ser2net.sourceforge.net
 
+comment "ser2net requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index e4ad340d0d..378dc068b4 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-SER2NET_VERSION = 2.7
-SER2NET_SOURCE = ser2net-$(SER2NET_VERSION).tar.gz
-SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net/$(SER2NET_VERSION)
+SER2NET_VERSION = 2.8
+SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
 SER2NET_LICENSE = GPLv2+
 SER2NET_LICENSE_FILES = COPYING
 

From f46682109b4cb01d91cbbeb6f269f084058995ee Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 8 Mar 2013 11:53:29 +0000
Subject: [PATCH 4355/6849] package/tvheadend: fix startup script

Obvious fix to the startup script: 'restart' is 'stop+start',
not 'stop+stop'.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/S99tvheadend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tvheadend/S99tvheadend b/package/tvheadend/S99tvheadend
index 407b8736a5..c29e32d333 100644
--- a/package/tvheadend/S99tvheadend
+++ b/package/tvheadend/S99tvheadend
@@ -43,7 +43,7 @@ case "$1" in
     restart|force-reload)
         "${0}" stop
         sleep 2
-        "${0}" stop
+        "${0}" start
         ;;
     *)
         echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2

From 98d7bb16a6a63e9b73b52e9519c9925e3f9685b6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Mar 2013 02:17:54 +0000
Subject: [PATCH 4356/6849] wireshark: security bump to version 1.8.6

Fixes CVE-2013-2475, CVE-2013-2476, CVE-2013-2477, CVE-2013-2478,
CVE-2013-2479, CVE-2013-2480, CVE-2013-2481, CVE-2013-2482,
CVE-2013-2483, CVE-2013-2484, CVE-2013-2485, CVE-2013-2486,
CVE-2013-2487, and CVE-2013-2488.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index c9fb44ba92..5a4d8b5788 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WIRESHARK_VERSION = 1.8.5
+WIRESHARK_VERSION = 1.8.6
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license

From 442aa88f95d6c4a921aa3d4de91f54d50bd0cd35 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 7 Mar 2013 12:46:37 +0000
Subject: [PATCH 4357/6849] util-linux: bump version and revamp options

Bump to latest 2.22.2 version and revamp available options.

* Remove the assumed enable/disable defaults since these seem to change
  quite often, so do what's wise and always enable/disable things.

* Switch from build "X" menu options to just X, add some help and sort.

* Introduce new option to install binaries (or not) to reduce bloat for
  packages that just need libblkid and/or libuuid.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/Config.in                  | 189 ++++++++++++------
 .../util-linux-001-sscanf-no-ms-as.patch      |  75 ++++---
 .../util-linux-002-add-missing-rpmatch.patch  |  51 +++++
 .../util-linux-002-uclibc-build-fix.patch     |  16 --
 ...util-linux-003-fdisk-aarch64-support.patch |  22 --
 ...ux-003-program-invocation-short-name.patch |  18 ++
 .../util-linux-004-xtensa-support.patch       |  21 +-
 package/util-linux/util-linux.mk              |  88 ++++----
 8 files changed, 311 insertions(+), 169 deletions(-)
 create mode 100644 package/util-linux/util-linux-002-add-missing-rpmatch.patch
 delete mode 100644 package/util-linux/util-linux-002-uclibc-build-fix.patch
 delete mode 100644 package/util-linux/util-linux-003-fdisk-aarch64-support.patch
 create mode 100644 package/util-linux/util-linux-003-program-invocation-short-name.patch

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 5eab95694a..799833e9b9 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_UTIL_LINUX
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
 	help
-	  Various useful/essential Linux utilities.
+	  Various useful/essential linux libraries and utilities.
 
 	  Things like mkfs, mkswap, swapon, fdisk, mount, dmesg, etc...
 
@@ -11,96 +11,165 @@ config BR2_PACKAGE_UTIL_LINUX
 
 if BR2_PACKAGE_UTIL_LINUX
 
-############################################
-# default enabled and should be disabled by
-#  --disable-foo
-#
-
-config BR2_PACKAGE_UTIL_LINUX_MOUNT
-	bool "build mount utilties"
-	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
-
-config BR2_PACKAGE_UTIL_LINUX_FSCK
-	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
-	bool "build \"fsck\""
+config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	bool "libblkid"
+	help
+	  Install libblkid.
 
 config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
-	bool "build libmount"
+	# libc lacks UTIME_NOW & UTIME_COMMIT
+	depends on !(BR2_microblazeel || BR2_microblazebe)
+	bool "libmount"
+	help
+	  Install libmount.
 
 config BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	bool "build libuuid and uuid utilities"
-	default y
-
-config BR2_PACKAGE_UTIL_LINUX_UUIDD
-	bool "build \"uuidd\""
+	bool "libuuid"
+	help
+	  Install libuuid.
 
-config BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+config BR2_PACKAGE_UTIL_LINUX_BINARIES
+	bool "install utilities"
+	depends on BR2_USE_MMU # fork()
+	# libc lacks UTIME_NOW & UTIME_COMMIT for libmount
+	depends on !(BR2_microblazeel || BR2_microblazebe)
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	bool "build libblkid and blkid utilities"
-	default y
+	help
+	  Install the basic set of util-linux binaries.
+
+if BR2_PACKAGE_UTIL_LINUX_BINARIES
 
 config BR2_PACKAGE_UTIL_LINUX_AGETTY
-	bool "build \"agetty\""
+	bool "agetty"
+	help
+	  Alternative linux getty
+
+config BR2_PACKAGE_UTIL_LINUX_ARCH
+	bool "arch"
+	help
+	  Print machine architecture
 
 config BR2_PACKAGE_UTIL_LINUX_CRAMFS
-	bool "build \"fsck.cramfs, mkfs.cramfs\""
+	bool "cramfs utilities"
+	select BR2_PACKAGE_ZLIB
+	help
+	  Build fsck.cramfs and mkfs.cramfs
 
-config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
-	bool "build \"switch_root\""
+config BR2_PACKAGE_UTIL_LINUX_DDATE
+	bool "ddate"
+	help
+	  Convert Gregorian dates to Discordian dates
 
-config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
-	bool "build \"pivot_root\""
+config BR2_PACKAGE_UTIL_LINUX_EJECT
+	bool "eject"
+	help
+	  Eject removable media
 
 config BR2_PACKAGE_UTIL_LINUX_FALLOCATE
-	bool "build \"fallocate\""
+	bool "fallocate"
+	help
+	  Preallocate space to a file
 
-config BR2_PACKAGE_UTIL_LINUX_UNSHARE
-	bool "build \"unshare\""
+config BR2_PACKAGE_UTIL_LINUX_FSCK
+	bool "fsck"
+	help
+	  Check and repair a linux filesystem
 
-config BR2_PACKAGE_UTIL_LINUX_RENAME
-	bool "build \"rename\""
+config BR2_PACKAGE_UTIL_LINUX_KILL
+	bool "kill"
+	help
+	  Send a signal to a process
 
-config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
-	bool "build \"chrt, ionice, taskset\""
+config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
+	bool "login utilities"
+	depends on BR2_ENABLE_LOCALE # linux-pam
+	select BR2_PACKAGE_LINUX_PAM
+	help
+	  Build login utilities (last, login, su, sulogin)
 
-config BR2_PACKAGE_UTIL_LINUX_WALL
-	bool "build \"wall\""
+comment "login utilities require a toolchain with locale support"
+	depends on !BR2_ENABLE_LOCALE
+
+config BR2_PACKAGE_UTIL_LINUX_MESG
+	bool "mesg"
+	help
+	  Control write access to your terminal
+
+config BR2_PACKAGE_UTIL_LINUX_MOUNT
+	bool "mount/umount"
+	help
+	  Mount/unmount filesystems
+
+config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
+	bool "pivot_root"
+	help
+	  Change the root filesystem
 
 config BR2_PACKAGE_UTIL_LINUX_PARTX
-	bool "build \"addpart, delpart, partx\""
-	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	bool "partition utilities"
+	help
+	  Partition tools (addpart, delpart, partx)
 
-############################################
-# default disabled and should be enabled by
-#  --enable-foo
-#
-config BR2_PACKAGE_UTIL_LINUX_ARCH
-	bool "build \"arch\""
+config BR2_PACKAGE_UTIL_LINUX_RAW
+	bool "raw"
+	help
+	  Build a linux raw character device
 
-config BR2_PACKAGE_UTIL_LINUX_INIT
-	bool "build \"simpleinit, shutdown, initctl\""
+config BR2_PACKAGE_UTIL_LINUX_RENAME
+	bool "rename"
+	help
+	  Rename files
 
-config BR2_PACKAGE_UTIL_LINUX_KILL
-	bool "build \"kill\""
+config BR2_PACKAGE_UTIL_LINUX_RESET
+	bool "reset"
+	help
+	  Reset the terminal
+
+config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
+	bool "schedutils"
+	help
+	  Scheduling utilities (chrt, ionice, taskset)
 
-config BR2_PACKAGE_UTIL_LINUX_LAST
-	bool "build \"last\""
+config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
+	bool "switch_root"
+	help
+	  Switch to another filesystem as the root of the mount tree
 
-config BR2_PACKAGE_UTIL_LINUX_MESG
-	bool "build \"mesg\""
+config BR2_PACKAGE_UTIL_LINUX_UNSHARE
+	bool "unshare"
+	help
+	  Run program with some namespaces unshared from parent
 
-config BR2_PACKAGE_UTIL_LINUX_RAW
-	bool "build \"raw\""
+config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP
+	bool "utmpdump"
+	help
+	  Dump UTMP and WTMP files in raw format
 
-config BR2_PACKAGE_UTIL_LINUX_RESET
-	bool "build \"reset\""
+config BR2_PACKAGE_UTIL_LINUX_UUIDD
+	bool "uuidd"
+	help
+	 UUID generation daemon
 
-config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
-	bool "build \"chfn, chsh, login, newgrp, vipw\""
+config BR2_PACKAGE_UTIL_LINUX_WALL
+	bool "wall"
+	help
+	  Send a message to everybody's terminal
+
+config BR2_PACKAGE_WDCTL
+	bool "wdctl"
+	help
+	  Shows hardware watchdog status
 
 config BR2_PACKAGE_UTIL_LINUX_WRITE
-	bool "build \"write\""
+	bool "write"
+	help
+	  Send a message to another user
+
+endif
 
 endif
 
diff --git a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
index 5b0ac36463..6ba7bab511 100644
--- a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
+++ b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
@@ -1,29 +1,39 @@
-[PATCH] Fix libmount build under uClibc
+Fix libmount build under uClibc
 
-Taken from gentoo-hardened:
-http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=91879751
+See https://bugs.gentoo.org/show_bug.cgi?id=406303
+Patch from http://repository.timesys.com/buildsources/u/util-linux/util-linux-2.21.2/util-linux-2.21.2-sscanf-no-ms-as.patch ported to util-linux-2.22.2
 
-For details, see https://bugs.gentoo.org/show_bug.cgi?id=406303
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c util-linux-2.20.1/libmount/src/tab_parse.c
---- util-linux-2.20.1.orig/libmount/src/tab_parse.c	2011-12-12 20:51:06.646614964 -0500
-+++ util-linux-2.20.1/libmount/src/tab_parse.c	2011-12-12 21:02:03.587865010 -0500
-@@ -51,19 +51,21 @@
+diff -Nura util-linux-2.22.2/configure.ac util-linux-2.22.2-sscanf-no-ms-as/configure.ac
+--- util-linux-2.22.2/configure.ac	2012-12-13 08:16:02.973822890 -0300
++++ util-linux-2.22.2-sscanf-no-ms-as/configure.ac	2013-03-07 14:50:39.975512873 -0300
+@@ -733,7 +733,6 @@
+ UL_BUILD_INIT([libmount])
+ UL_REQUIRES_LINUX([libmount])
+ UL_REQUIRES_BUILD([libmount], [libblkid])
+-UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
+ AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes)
+ AM_CONDITIONAL(BUILD_LIBMOUNT_TESTS, test "x$build_libmount" = xyes -a "x$enable_static" = xyes)
+
+diff -Nura util-linux-2.22.2/libmount/src/tab_parse.c util-linux-2.22.2-sscanf-no-ms-as/libmount/src/tab_parse.c
+--- util-linux-2.22.2/libmount/src/tab_parse.c	2012-12-12 17:04:47.906355128 -0300
++++ util-linux-2.22.2-sscanf-no-ms-as/libmount/src/tab_parse.c	2013-03-07 15:08:29.589503961 -0300
+@@ -58,19 +58,21 @@
   */
  static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
  {
--	int rc, n = 0;
--	char *src, *fstype, *optstr;
+-	int rc, n = 0, xrc;
+-	char *src = NULL, *fstype = NULL, *optstr = NULL;
 -
 -	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
 -			UL_SCNsA" "	/* (2) target */
 -			UL_SCNsA" "	/* (3) FS type */
 -			UL_SCNsA" "	/* (4) options */
-+	int rc, n = 0, len = strlen (s) + 1;
++	int rc, n = 0, len = strlen (s) + 1, xrc;
 +	char *src     = malloc (sizeof *src * len);
-+  char *fstype  = malloc (sizeof *fstype * len);
-+  char *optstr  = malloc (sizeof *optstr * len);
++	char *fstype  = malloc (sizeof *fstype * len);
++	char *optstr  = malloc (sizeof *optstr * len);
 +
 +	rc = sscanf(s,	"%s"" "	/* (1) source */
 +			"%s"" "	/* (2) target */
@@ -40,20 +50,20 @@ diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c util-linux-2.20.1/lib
 +			fstype,
 +			optstr,
  			&n);
+	xrc = rc;
  
- 	if (rc == 4) {
-@@ -108,16 +110,20 @@
+@@ -132,16 +134,20 @@
   */
  static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
  {
 -	int rc, end = 0;
 +	int rc, end = 0, len = strlen (s) + 1;
  	unsigned int maj, min;
- 	char *fstype, *src, *p;
+	char *fstype = NULL, *src = NULL, *p;
  
-+  fs->root        = malloc (sizeof *fs->root * len);
-+  fs->target      = malloc (sizeof *fs->target * len);
-+  fs->vfs_optstr  = malloc (sizeof *fs->vfs_optstr * len);
++	fs->root        = malloc (sizeof *fs->root * len);
++	fs->target      = malloc (sizeof *fs->target * len);
++	fs->vfs_optstr  = malloc (sizeof *fs->vfs_optstr * len);
 +
  	rc = sscanf(s,	"%u "		/* (1) id */
  			"%u "		/* (2) parent */
@@ -67,17 +77,17 @@ diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c util-linux-2.20.1/lib
  			"%n",		/* number of read bytes */
  
  			&fs->id,
-@@ -139,9 +145,14 @@
+@@ -163,9 +169,14 @@
  	}
  	s = p + 3;
  
 -	rc += sscanf(s,	UL_SCNsA" "	/* (8) FS type */
 -			UL_SCNsA" "	/* (9) source */
 -			UL_SCNsA,	/* (10) fs options (fs specific) */
-+  len           = strlen (s) + 1;
++	len           = strlen (s) + 1;
 +	fstype        = malloc (sizeof *fstype * len);
-+  src           = malloc (sizeof *src * len);
-+  fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len);
++	src           = malloc (sizeof *src * len);
++	fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len);
 +
 +	rc += sscanf(s,	"%s"" "	/* (8) FS type */
 +			"%s"" "	/* (9) source */
@@ -85,3 +95,20 @@ diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c util-linux-2.20.1/lib
  
  			&fstype,
  			&src,
+@@ -274,11 +285,12 @@
+ static int mnt_parse_swaps_line(struct libmnt_fs *fs, char *s)
+ {
+	uintmax_t fsz, usz;
+-	int rc;
+-	char *src = NULL;
++	int rc, len = strlen (s) + 1;
++	char *src = malloc (sizeof *src * len);
++	fs->swaptype = malloc (sizeof *fs->swaptype * len);
+
+-	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
+-			UL_SCNsA" "	/* (2) type */
++	rc = sscanf(s,	"%s"		/* (1) source */
++			"%s"		/* (2) type */
+			"%jd"		/* (3) size */
+			"%jd"		/* (4) used */
+			"%d",		/* priority */
diff --git a/package/util-linux/util-linux-002-add-missing-rpmatch.patch b/package/util-linux/util-linux-002-add-missing-rpmatch.patch
new file mode 100644
index 0000000000..d311e3f5dc
--- /dev/null
+++ b/package/util-linux/util-linux-002-add-missing-rpmatch.patch
@@ -0,0 +1,51 @@
+From 51924a4ef0dd8f4906729cb6760d1929049c1983 Mon Sep 17 00:00:00 2001
+From: William Pitcock <nenolod@dereferenced.org>
+Date: Wed, 20 Feb 2013 13:04:02 +0100
+Subject: [PATCH] add missing rpmatch.h everywhere it needs to be
+
+Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ disk-utils/fsck.minix.c | 1 +
+ login-utils/vipw.c      | 1 +
+ term-utils/mesg.c       | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
+index 1426950..3482200 100644
+--- a/disk-utils/fsck.minix.c
++++ b/disk-utils/fsck.minix.c
+@@ -111,6 +111,7 @@
+ #include "ismounted.h"
+ #include "all-io.h"
+ #include "closestream.h"
++#include "rpmatch.h"
+
+ #define ROOT_INO 1
+ #define YESNO_LENGTH 64
+diff --git a/login-utils/vipw.c b/login-utils/vipw.c
+index 20c05c2..8c47801 100644
+--- a/login-utils/vipw.c
++++ b/login-utils/vipw.c
+@@ -78,6 +78,7 @@
+ #include "setpwnam.h"
+ #include "strutils.h"
+ #include "xalloc.h"
++#include "rpmatch.h"
+
+ #ifdef HAVE_LIBSELINUX
+ # include <selinux/selinux.h>
+diff --git a/term-utils/mesg.c b/term-utils/mesg.c
+index 6ac5a2e..430236f 100644
+--- a/term-utils/mesg.c
++++ b/term-utils/mesg.c
+@@ -58,6 +58,7 @@
+ #include "closestream.h"
+ #include "nls.h"
+ #include "c.h"
++#include "rpmatch.h"
+
+ /* exit codes */
+
+--
+1.8.1.5
diff --git a/package/util-linux/util-linux-002-uclibc-build-fix.patch b/package/util-linux/util-linux-002-uclibc-build-fix.patch
deleted file mode 100644
index f9da863f4d..0000000000
--- a/package/util-linux/util-linux-002-uclibc-build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: util-linux-2.19.1/configure.ac
-===================================================================
---- util-linux-2.19.1.orig/configure.ac
-+++ util-linux-2.19.1/configure.ac
-@@ -250,7 +250,7 @@ esac
-
-
- AC_MSG_CHECKING(whether program_invocation_short_name is defined)
--AC_TRY_COMPILE([#include <argp.h>],
-+AC_TRY_COMPILE([#include <errno.h>],
-                [program_invocation_short_name = "test";],
-                AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
-                          [Define if program_invocation_short_name is defined])
-
diff --git a/package/util-linux/util-linux-003-fdisk-aarch64-support.patch b/package/util-linux/util-linux-003-fdisk-aarch64-support.patch
deleted file mode 100644
index 825e82cf3b..0000000000
--- a/package/util-linux/util-linux-003-fdisk-aarch64-support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Add case for the aarch64 architecture
-
-Taken from https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1061609
-
-Code written by Wookey.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/fdisk/fdiskbsdlabel.h
-===================================================================
---- a/fdisk/fdiskbsdlabel.h
-+++ b/fdisk/fdiskbsdlabel.h
-@@ -48,7 +48,8 @@
- 
- #if defined (i386) || defined (__sparc__) || defined (__arm__) || \
-     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
--    defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
-+    defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \
-+    defined(__aarch64__)
- #define BSD_LABELSECTOR   1
- #define BSD_LABELOFFSET   0
- #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
diff --git a/package/util-linux/util-linux-003-program-invocation-short-name.patch b/package/util-linux/util-linux-003-program-invocation-short-name.patch
new file mode 100644
index 0000000000..2d2fa5de0f
--- /dev/null
+++ b/package/util-linux/util-linux-003-program-invocation-short-name.patch
@@ -0,0 +1,18 @@
+uClibc build fix: program_invocation_short_name is defined in errno.h
+and not argp.h
+Update to util-linux-2.22.2 from a previous patch by Khem.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura util-linux-2.22.2.orig/configure.ac util-linux-2.22.2/configure.ac
+--- util-linux-2.22.2.orig/configure.ac	2013-03-07 15:16:18.912418476 -0300
++++ util-linux-2.22.2/configure.ac	2013-03-07 15:16:25.909640745 -0300
+@@ -372,7 +372,7 @@
+
+
+ AC_MSG_CHECKING(whether program_invocation_short_name is defined)
+-AC_TRY_COMPILE([#include <argp.h>],
++AC_TRY_COMPILE([#include <errno.h>],
+	       [program_invocation_short_name = "test";],
+	       AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
+			 [Define if program_invocation_short_name is defined])
diff --git a/package/util-linux/util-linux-004-xtensa-support.patch b/package/util-linux/util-linux-004-xtensa-support.patch
index ab294cc04b..abec5d9e30 100644
--- a/package/util-linux/util-linux-004-xtensa-support.patch
+++ b/package/util-linux/util-linux-004-xtensa-support.patch
@@ -1,11 +1,16 @@
---- util-linux-2.20.1/fdisk/fdiskbsdlabel.h.orig	2013-01-21 19:17:58.023049856 -0800
-+++ util-linux-2.20.1/fdisk/fdiskbsdlabel.h	2013-01-21 19:18:09.867050151 -0800
-@@ -49,7 +49,7 @@
- #if defined (i386) || defined (__sparc__) || defined (__arm__) || \
+Forward-port of xtensa support patch to util-linux-2.22.2 by ??
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura util-linux-2.22.2/fdisks/fdiskbsdlabel.h util-linux-2.22.2.xtensa/fdisks/fdiskbsdlabel.h
+--- util-linux-2.22.2/fdisks/fdiskbsdlabel.h	2012-12-12 17:04:47.898355058 -0300
++++ util-linux-2.22.2.xtensa/fdisks/fdiskbsdlabel.h	2013-03-07 18:17:32.292723061 -0300
+@@ -48,7 +48,7 @@
+
+ #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
      defined (__mips__) || defined (__s390__) || defined (__sh__) || \
-     defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__xtensa__)
+-    defined (__aarch64__) || \
++    defined (__aarch64__) || defined (__xtensa__) || \
+     defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
  #define BSD_LABELSECTOR   1
  #define BSD_LABELOFFSET   0
- #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 73ae174390..5e8820604e 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -3,21 +3,21 @@
 # util-linux
 #
 #############################################################
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
-UTIL_LINUX_VERSION_MAJOR = 2.20
+
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
+UTIL_LINUX_VERSION_MAJOR = 2.22
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
 # README.licensing claims that some files are GPLv2-only, but this is not true.
 # Some files are GPLv3+ but only in tests.
-UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid and libmount LGPLv2+, libuuid BSD-3c
-UTIL_LINUX_LICENSE_FILES = README.licensing COPYING licenses/COPYING.UCB libblkid/COPYING.libblkid libuuid/COPYING.libuuid
+UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid and libmount LGPLv2.1+, libuuid BSD-3c
+UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
 
 UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf
 UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
-
 UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
 
 # We don't want the host-busybox dependency to be added automatically
@@ -40,42 +40,40 @@ UTIL_LINUX_DEPENDENCIES += gettext
 UTIL_LINUX_MAKE_OPT += LIBS=-lintl
 endif
 
-#############################################
-#
-# disable default utilities
-#
-UTIL_LINUX_CONF_OPT += \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),,--disable-mount) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),,--disable-fsck) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),,--disable-libmount) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),,--disable-libuuid) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),,--disable-uuidd) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),,--disable-libblkid) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),,--disable-agetty) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),,--disable-cramfs) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),,--disable-switch_root) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),,--disable-pivot_root) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),,--disable-fallocate) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),,--disable-unshare) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx)
+# Used by cramfs utils
+UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)
 
-#############################################
-#
-# enable extra utilities
-#
+# Used by login-utils
+UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam)
+
+# Disable/Enable utilities
 UTIL_LINUX_CONF_OPT += \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_INIT),--enable-init) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
+	$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch,--disable-arch) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_DDATE),--enable-ddate,--disable-ddate) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-su --enable-sulogin,--disable-last --disable-login --disable-su --disable-sulogin) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write)
 
 # In the host version of util-linux, we so far only require libuuid,
 # and none of the util-linux utilities, so we disable all of them.
@@ -87,6 +85,18 @@ HOST_UTIL_LINUX_CONF_OPT += \
 	--disable-fallocate --disable-unshare --disable-rename \
 	--disable-schedutils --disable-wall --disable-partx
 
+# Avoid building the tools if they are disabled since we can't install on
+# a per-directory basis.
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)
+define UTIL_LINUX_DISABLE_TOOLS
+	$(SED) '/schedutils/d' -e '/text-utils/d' -e '/term-utils/d' \
+		-e '/login-utils/d' -e '/mount-deprecated/d' \
+		-e '/sys-utils/d' -e '/misc-utils/d' -e '/disk-utils/d' \
+		-e '/fdisks/d' $(@D)/Makefile.am
+endef
+UTIL_LINUX_PRE_PATCH_HOOKS += UTIL_LINUX_DISABLE_TOOLS
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 

From e265a1fa05eef1f05e522f4f9acb452b8d6d9e39 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 7 Mar 2013 10:17:21 +0000
Subject: [PATCH 4358/6849] packages/flex: remove unnecessary
 BR2_PACKAGE_FLEX_LIBFL

The BR2_PACKAGE_FLEX_LIBFL knob was removed by
bd72a13a4ca3033bacbaf9e9a2b424acf149f83d so remove it from the packages
that used it since it's completely unnecessary.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gob2/Config.in        | 1 -
 package/ipsec-tools/Config.in | 1 -
 package/libcue/Config.in      | 1 -
 package/linux-pam/Config.in   | 1 -
 package/radvd/Config.in       | 1 -
 5 files changed, 5 deletions(-)

diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index cbe30d66d0..4a09c41917 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_GOB2
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_FLEX_LIBFL
 	select BR2_PACKAGE_BISON
 	help
 	  GOB (GTK+ Object Builder) is a preprocessor which simplifies
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 6f6dc372be..06a5a56ad6 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_IPSEC_TOOLS
 	bool "ipsec-tools"
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_FLEX_LIBFL
 	help
 	  This package is required to support IPSec for Linux 2.6+
 
diff --git a/package/libcue/Config.in b/package/libcue/Config.in
index e5e2e16265..61217467d7 100644
--- a/package/libcue/Config.in
+++ b/package/libcue/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBCUE
 	bool "libcue"
 	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_FLEX_LIBFL
 	help
 	  CUE Sheet Parser Library
 
diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 7cfd8147a5..7a4ae947fa 100644
--- a/package/linux-pam/Config.in
+++ b/package/linux-pam/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_LINUX_PAM
 	bool "linux-pam"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_FLEX_LIBFL
 	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
 	help
 	  A Security Framework that Provides Authentication for Applications
diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index d0d9d70915..98dbae2a6d 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_RADVD
 	# libdaemon uses fork()
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_FLEX_LIBFL
 	select BR2_PACKAGE_LIBDAEMON
 	depends on BR2_INET_IPV6
 	help

From 2282b93f4248a32de84805456efa352f69b28624 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:32 +0000
Subject: [PATCH 4359/6849] rpi-userland: add .pc files for OpenGLESv2 and EGL
 libs

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../rpi-userland-add-pkgconfig-files.patch    | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 package/rpi-userland/rpi-userland-add-pkgconfig-files.patch

diff --git a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
new file mode 100644
index 0000000000..0da9afd89b
--- /dev/null
+++ b/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
@@ -0,0 +1,53 @@
+Add .pc files for the OpenGLESv2 and EGL libraries
+
+Those pkg-config files make it easier for Qt5 to find those libraries
+and the appropriate link flags.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/interface/khronos/egl/egl.pc.in
+===================================================================
+--- /dev/null
++++ b/interface/khronos/egl/egl.pc.in
+@@ -0,0 +1,10 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: egl
++Description: RasberryPi implementation of EGL
++Version: 1.0
++Libs: -L${libdir} -lEGL -lGLESv2
++Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/
+Index: b/interface/khronos/CMakeLists.txt
+===================================================================
+--- a/interface/khronos/CMakeLists.txt
++++ b/interface/khronos/CMakeLists.txt
+@@ -73,3 +73,11 @@
+ 
+ install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib)
+ install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc"
++  DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc"
++  DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+Index: b/interface/khronos/glxx/glesv2.pc.in
+===================================================================
+--- /dev/null
++++ b/interface/khronos/glxx/glesv2.pc.in
+@@ -0,0 +1,10 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: glesv2
++Description: RasberryPi implementation of OpenGL ESv2
++Version: 2.0
++Libs: -L${libdir} -lGLESv2
++Cflags: -I${includedir}/

From 2e1fb3f7c42817495e5b25fe0c85c655720c8d4e Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Thu, 7 Mar 2013 10:18:33 +0000
Subject: [PATCH 4360/6849] rpi-userland: add bcm_host to egl.pc

bcm_host is the Broadcom hardware interface library
And is currently a dependency to use the EGL functions

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../rpi-userland/rpi-userland-add-pkgconfig-files.patch    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
index 0da9afd89b..4ffc2b0bb6 100644
--- a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
+++ b/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
@@ -9,7 +9,7 @@ Index: b/interface/khronos/egl/egl.pc.in
 ===================================================================
 --- /dev/null
 +++ b/interface/khronos/egl/egl.pc.in
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
 +prefix=@CMAKE_INSTALL_PREFIX@
 +exec_prefix=${prefix}
 +libdir=${exec_prefix}/lib
@@ -18,8 +18,9 @@ Index: b/interface/khronos/egl/egl.pc.in
 +Name: egl
 +Description: RasberryPi implementation of EGL
 +Version: 1.0
-+Libs: -L${libdir} -lEGL -lGLESv2
-+Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/
++Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host
++Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \
++        -I${includedir}/interface/vmcs_host/linux/
 Index: b/interface/khronos/CMakeLists.txt
 ===================================================================
 --- a/interface/khronos/CMakeLists.txt

From 917315ac5563fc654ad0f86583234be18c7db89a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:34 +0000
Subject: [PATCH 4361/6849] efl/libeet, efl/libevas: use host-libjpeg instead
 of host-jpeg

Before creating a real virtual package named 'jpeg', we want to ensure
that no package is using the host variant of the virtual
package. Instead, we make them use directly the host-libjpeg package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libeet/libeet.mk   | 2 +-
 package/efl/libevas/libevas.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index 3d5b46054e..db3ec6e80c 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -13,7 +13,7 @@ LIBEET_LICENSE_FILES = COPYING
 LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
-HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-jpeg host-libeina
+HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-libjpeg host-libeina
 
 ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
 LIBEET_DEPENDENCIES += gnutls libgcrypt
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 0a908424f0..5bdcba53e9 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -15,7 +15,7 @@ LIBEVAS_INSTALL_STAGING = YES
 LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
 
 HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \
-				host-freetype host-libpng host-jpeg
+				host-freetype host-libpng host-libjpeg
 HOST_LIBEVAS_CONF_OPT += \
 	--enable-image-loader-png \
 	--enable-image-loader-jpeg \

From 30c695ef01340855cb74a35bb465fb7408c0fb7e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:35 +0000
Subject: [PATCH 4362/6849] jpeg: convert to a real package

jpeg is a virtual package, but since it is listed in the dependencies
of other packages, it should obey to all the normal make rules for
packages. Notably, the jpeg-show-depends target is mandatory for the
graph-depends script to work.

Instead to implement such a make target manually, make jpeg a normal
generic-package, except that it doesn't have any source.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jpeg/jpeg.mk | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 3caacaa7ff..962908df39 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,10 +1,24 @@
 #############################################################
 #
-# jpeg
+# Virtual jpeg package
 #
 #############################################################
 
-jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg)
+JPEG_SOURCE =
 
-host-jpeg: host-libjpeg
-host-jpeg-source: host-libjpeg-source
+ifeq ($(BR2_PACKAGE_JPEG_TURBO),y)
+JPEG_DEPENDENCIES += jpeg-turbo
+endif
+
+ifeq ($(BR2_PACKAGE_LIBJPEG),y)
+JPEG_DEPENDENCIES += libjpeg
+endif
+
+ifeq ($(JPEG_DEPENDENCIES),)
+define JPEG_CONFIGURE_CMDS
+	echo "No JPEG implementation defined. Configuration error"
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))

From a9b0023c5b2c41002aae8826a63e1127cb6d846d Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 6 Mar 2013 07:14:22 +0000
Subject: [PATCH 4363/6849] cmake: convert spaces to tabs in make rules

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 6836172556..d0db502e17 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -10,19 +10,19 @@ CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
 
 define HOST_CMAKE_CONFIGURE_CMDS
- (cd $(@D); \
-	LDFLAGS="$(HOST_LDFLAGS)" \
-	CFLAGS="$(HOST_CFLAGS)" \
-	./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
- )
+	(cd $(@D); \
+		LDFLAGS="$(HOST_LDFLAGS)" \
+		CFLAGS="$(HOST_CFLAGS)" \
+		./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
+	)
 endef
 
 define HOST_CMAKE_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 define HOST_CMAKE_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
 $(eval $(generic-package))

From cea14a589a1632cbf16af9192c18a72d8b89790d Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 7 Mar 2013 06:57:01 +0000
Subject: [PATCH 4364/6849] cmake: remove target package macro

The dummy target package is not needed anymore since commit 79bfcd556027901.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index d0db502e17..cfe8ab4203 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -25,5 +25,4 @@ define HOST_CMAKE_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-$(eval $(generic-package))
 $(eval $(host-generic-package))

From be9e675ae3c10db39b0babe9a8225b572596b2e2 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 6 Mar 2013 07:14:24 +0000
Subject: [PATCH 4365/6849] cmake: bump to 2.8.10.2

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cmake/cmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index cfe8ab4203..8e3e7518ae 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-CMAKE_VERSION = 2.8.9
+CMAKE_VERSION = 2.8.10.2
 CMAKE_SITE = http://www.cmake.org/files/v2.8/
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt

From df99efb3d9114aa09153fdb1f47b7ce695e8f53b Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 6 Mar 2013 07:14:26 +0000
Subject: [PATCH 4366/6849] CMake packages: remove .cmake files from target
 directory

Just like pkgconfig files.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1300725bf0..c462bb1d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -452,7 +452,9 @@ ifeq ($(BR2_HAVE_DEVFILES),y)
 	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
 else
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
-		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig
+		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
+		$(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
+	find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f
 	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 endif

From 7cbb30115b0c0e70e298c4f0c7b048c396db46b0 Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard10@gmail.com>
Date: Thu, 7 Mar 2013 10:45:23 +0000
Subject: [PATCH 4367/6849] gdisk: Update gdisk (gptfdisk) to version 0.8.6

[Thomas Petazzoni: bump to 0.8.6 and not 0.8.5]

Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdisk/gdisk-0.6.14-unistd.patch | 19 -----------
 package/gdisk/gdisk-0.6.14-uuid.h.patch | 22 -------------
 package/gdisk/gdisk-001-no-utf16.patch  | 43 +++++++++++++++++++++++++
 package/gdisk/gdisk.mk                  |  6 ++--
 4 files changed, 46 insertions(+), 44 deletions(-)
 delete mode 100644 package/gdisk/gdisk-0.6.14-unistd.patch
 delete mode 100644 package/gdisk/gdisk-0.6.14-uuid.h.patch
 create mode 100644 package/gdisk/gdisk-001-no-utf16.patch

diff --git a/package/gdisk/gdisk-0.6.14-unistd.patch b/package/gdisk/gdisk-0.6.14-unistd.patch
deleted file mode 100644
index 97627da74f..0000000000
--- a/package/gdisk/gdisk-0.6.14-unistd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-[PATCH] close(2) needs unistd.h
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- diskio-unix.cc |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: gdisk-0.6.14/diskio-unix.cc
-===================================================================
---- gdisk-0.6.14.orig/diskio-unix.cc
-+++ gdisk-0.6.14/diskio-unix.cc
-@@ -22,6 +22,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <iostream>
- 
- #include "diskio.h"
diff --git a/package/gdisk/gdisk-0.6.14-uuid.h.patch b/package/gdisk/gdisk-0.6.14-uuid.h.patch
deleted file mode 100644
index ba447a1c32..0000000000
--- a/package/gdisk/gdisk-0.6.14-uuid.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] Don't hardcode uuid.h location
-
-Breaks cross compilation.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- guid.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gdisk-0.6.14/guid.h
-===================================================================
---- gdisk-0.6.14.orig/guid.h
-+++ gdisk-0.6.14/guid.h
-@@ -22,7 +22,7 @@
- #ifdef _WIN32
- typedef unsigned char my_uuid_t[16];
- #else
--#include </usr/include/uuid/uuid.h>
-+#include <uuid/uuid.h>
- typedef uuid_t my_uuid_t;
- #endif
- 
diff --git a/package/gdisk/gdisk-001-no-utf16.patch b/package/gdisk/gdisk-001-no-utf16.patch
new file mode 100644
index 0000000000..540e74190d
--- /dev/null
+++ b/package/gdisk/gdisk-001-no-utf16.patch
@@ -0,0 +1,43 @@
+[PATCH] Disable UTF16 support
+
+libicu is quite large, and unicode partition names are uncommon.
+
+Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
+---
+diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile
+--- gdisk-0.8.5/Makefile	2012-05-30 08:38:43.000000000 -0700
++++ gptfdisk-0.8.5/Makefile	2012-06-05 11:38:23.710597974 -0700
+@@ -1,8 +1,8 @@
+ CC=gcc
+ CXX=g++
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
+ LDFLAGS+=
+ LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
+ MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
+@@ -14,16 +14,16 @@
+ all:	cgdisk gdisk sgdisk fixparts
+ 
+ gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
+-#	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+-	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
++#	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
+ 
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-#	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+-	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
++#	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
+ 
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+-#	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+-	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
++#	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
+ 
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ 	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
index f93343647c..cda369eded 100644
--- a/package/gdisk/gdisk.mk
+++ b/package/gdisk/gdisk.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-GDISK_VERSION = 0.6.14
-GDISK_SITE = http://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$(GDISK_VERSION)
-GDISK_SOURCE = gdisk-$(GDISK_VERSION).tgz
+GDISK_VERSION = 0.8.6
+GDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
+GDISK_SOURCE = gptfdisk-$(GDISK_VERSION).tar.gz
 
 GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk
 GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk

From 29b83f05274d312a0088dcfdfd52fffb65f64422 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:24 +0000
Subject: [PATCH 4368/6849] gdisk: rename to gptfdisk

In order to match the new upstream name, rename the gdisk package to
gptfdisk. We add the relevant legacy configuration options to ensure a
smooth transition for users.

[Peter: fixup Config.in indentation]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                              | 26 +++++++++++++
 package/Config.in                             |  2 +-
 package/gdisk/gdisk.mk                        | 39 -------------------
 package/{gdisk => gptfdisk}/Config.in         | 14 +++----
 .../gptfdisk-001-no-utf16.patch}              |  0
 package/gptfdisk/gptfdisk.mk                  | 38 ++++++++++++++++++
 6 files changed, 72 insertions(+), 47 deletions(-)
 delete mode 100644 package/gdisk/gdisk.mk
 rename package/{gdisk => gptfdisk}/Config.in (80%)
 rename package/{gdisk/gdisk-001-no-utf16.patch => gptfdisk/gptfdisk-001-no-utf16.patch} (100%)
 create mode 100644 package/gptfdisk/gptfdisk.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index d90132c53d..43e2afe8ea 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -40,6 +40,32 @@ comment "As long as these options stay selected, the build   "
 comment "will fail.                                          "
 endif
 
+#
+# Legacy options since 2013.02
+#
+
+config BR2_PACKAGE_GDISK
+	bool "gdisk has been replaced by gptfdisk"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GPTFDISK
+	help
+	  The option has been renamed BR2_PACKAGE_GPTFDISK.
+
+config BR2_PACKAGE_GDISK_GDISK
+	bool "gdisk tool from gdisk has been replaced by gdisk in gptfdisk"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GPTFDISK
+	select BR2_PACKAGE_GPTFDISK_GDISK
+	help
+	  The option has been renamed BR2_PACKAGE_GPTFDISK_GDISK.
+
+config BR2_PACKAGE_GDISK_SGDISK
+	bool "sgdisk tool from gdisk has been replaced by sgdisk in gptfdisk"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GPTFDISK
+	select BR2_PACKAGE_GPTFDISK_SGDISK
+	help
+	  The option has been renamed BR2_PACKAGE_GPTFDISK_SGDISK.
 
 #
 # Legacy options since 2012.11
diff --git a/package/Config.in b/package/Config.in
index 22e64f8692..6458b6eca3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -235,8 +235,8 @@ source "package/fis/Config.in"
 source "package/fmtools/Config.in"
 source "package/fxload/Config.in"
 source "package/gadgetfs-test/Config.in"
-source "package/gdisk/Config.in"
 source "package/gpsd/Config.in"
+source "package/gptfdisk/Config.in"
 source "package/gvfs/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hdparm/Config.in"
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
deleted file mode 100644
index cda369eded..0000000000
--- a/package/gdisk/gdisk.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################
-#
-# gdisk
-#
-#############################################################
-
-GDISK_VERSION = 0.8.6
-GDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
-GDISK_SOURCE = gptfdisk-$(GDISK_VERSION).tar.gz
-
-GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk
-GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk
-
-ifneq ($(GDISK_TARGETS_y),)
-
-GDISK_DEPENDENCIES += util-linux
-ifeq ($(BR2_PACKAGE_GDISK_SGDISK),y)
-    GDISK_DEPENDENCIES += popt
-endif
-
-
-define GDISK_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
-		-C $(@D) $(GDISK_TARGETS_y)
-endef
-
-define GDISK_INSTALL_TARGET_CMDS
-	for i in $(GDISK_TARGETS_y); do \
-	    $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
-	done
-endef
-
-define GDISK_UNINSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GDISK_TARGETS_y))
-endef
-
-endif
-
-$(eval $(generic-package))
diff --git a/package/gdisk/Config.in b/package/gptfdisk/Config.in
similarity index 80%
rename from package/gdisk/Config.in
rename to package/gptfdisk/Config.in
index 24d305d1f9..7851dc3dc8 100644
--- a/package/gdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_GDISK
-	bool "gdisk"
+config BR2_PACKAGE_GPTFDISK
+	bool "gptfdisk"
 	depends on BR2_LARGEFILE
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # util-linux
@@ -11,9 +11,9 @@ config BR2_PACKAGE_GDISK
 
 	  http://www.rodsbooks.com/gdisk/
 
-config BR2_PACKAGE_GDISK_GDISK
+config BR2_PACKAGE_GPTFDISK_GDISK
 	bool "interactive gdisk"
-	depends on BR2_PACKAGE_GDISK
+	depends on BR2_PACKAGE_GPTFDISK
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
@@ -21,9 +21,9 @@ config BR2_PACKAGE_GDISK_GDISK
 	  /usr/sbin/gdisk which is modelled after and quite similar in use
 	  to the traditional MBR based fdisk tool.
 
-config BR2_PACKAGE_GDISK_SGDISK
+config BR2_PACKAGE_GPTFDISK_SGDISK
 	bool "command line sgdisk"
-	depends on BR2_PACKAGE_GDISK
+	depends on BR2_PACKAGE_GPTFDISK
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_POPT
@@ -32,5 +32,5 @@ config BR2_PACKAGE_GDISK_SGDISK
 	  /usr/sbin/sgdisk which is named after the traditional MBR based
 	  sfdisk tool albeit with an entirely different option syntax.
 
-comment "gdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
+comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/gdisk/gdisk-001-no-utf16.patch b/package/gptfdisk/gptfdisk-001-no-utf16.patch
similarity index 100%
rename from package/gdisk/gdisk-001-no-utf16.patch
rename to package/gptfdisk/gptfdisk-001-no-utf16.patch
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
new file mode 100644
index 0000000000..7755a30c98
--- /dev/null
+++ b/package/gptfdisk/gptfdisk.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# gptfdisk
+#
+#############################################################
+
+GPTFDISK_VERSION = 0.8.6
+GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
+
+GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
+GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk
+
+ifneq ($(GPTFDISK_TARGETS_y),)
+
+GPTFDISK_DEPENDENCIES += util-linux
+ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
+    GPTFDISK_DEPENDENCIES += popt
+endif
+
+
+define GPTFDISK_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
+		-C $(@D) $(GPTFDISK_TARGETS_y)
+endef
+
+define GPTFDISK_INSTALL_TARGET_CMDS
+	for i in $(GPTFDISK_TARGETS_y); do \
+	    $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
+	done
+endef
+
+define GPTFDISK_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GPTFDISK_TARGETS_y))
+endef
+
+endif
+
+$(eval $(generic-package))

From 2a86ea7fc968f297e5b8c6679770d6b5b8fd4646 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:25 +0000
Subject: [PATCH 4369/6849] gptfdisk: ensure that the package always
 builds/installs something

Until now, selecting just the gptfdisk package wouldn't do anything.
It wouldn't build anything at all, and wouldn't install anything.
This is rather odd.

So now, we ensure that at least one of the two tools that gptfdisk can
build and install is selected. This allows use to factorize a bit the
select of util-linux in Config.in, and remove the if condition in the
makefile that was preventing the package from being built if no tools
was selected.

[Peter: Reword commit text]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gptfdisk/Config.in   | 7 +++----
 package/gptfdisk/gptfdisk.mk | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 7851dc3dc8..0d7e35836e 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -3,6 +3,9 @@ config BR2_PACKAGE_GPTFDISK
 	depends on BR2_LARGEFILE
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_GPTFDISK_GDISK if !BR2_PACKAGE_GPTFDISK_SGDISK
 	help
 	  GPT fdisk (consisting of the gdisk and sgdisk programs) is a
 	  text-mode partitioning tool that works on Globally Unique Identifier
@@ -14,8 +17,6 @@ config BR2_PACKAGE_GPTFDISK
 config BR2_PACKAGE_GPTFDISK_GDISK
 	bool "interactive gdisk"
 	depends on BR2_PACKAGE_GPTFDISK
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
 	  Install the interactive GUID partition table (GPT) manipulator
 	  /usr/sbin/gdisk which is modelled after and quite similar in use
@@ -24,8 +25,6 @@ config BR2_PACKAGE_GPTFDISK_GDISK
 config BR2_PACKAGE_GPTFDISK_SGDISK
 	bool "command line sgdisk"
 	depends on BR2_PACKAGE_GPTFDISK
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_POPT
 	help
 	  Install the command-line GUID partition table (GPT) manipulator
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 7755a30c98..2d3cb1addc 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -10,8 +10,6 @@ GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
 GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
 GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk
 
-ifneq ($(GPTFDISK_TARGETS_y),)
-
 GPTFDISK_DEPENDENCIES += util-linux
 ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
     GPTFDISK_DEPENDENCIES += popt
@@ -33,6 +31,4 @@ define GPTFDISK_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GPTFDISK_TARGETS_y))
 endef
 
-endif
-
 $(eval $(generic-package))

From 8e14c0429d23bde17451b982d5b3d58f3b685fe8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:26 +0000
Subject: [PATCH 4370/6849] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use
 TARGET_MAKE_ENV

$(TARGET_CONFIGURE_OPTS) should be passed as $(MAKE) argument, not in
the environment. We can then remove the redefined CC and LD variables
that were useless. We also take this opportunity to pass
$(TARGET_MAKE_ENV) in the environment of make.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gptfdisk/gptfdisk.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 2d3cb1addc..656a18761d 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -15,10 +15,9 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
     GPTFDISK_DEPENDENCIES += popt
 endif
 
-
 define GPTFDISK_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
-		-C $(@D) $(GPTFDISK_TARGETS_y)
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		$(GPTFDISK_TARGETS_y)
 endef
 
 define GPTFDISK_INSTALL_TARGET_CMDS

From a4b61bf3785283605252876825d49253434da5b9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:27 +0000
Subject: [PATCH 4371/6849] gptfdisk: fix installation step

The installation step was not giving the full destination path even
though it was using -D, and it was forgetting to explicitly specify
the permissions of the file to install. This commit fixes both of
these minor issues.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gptfdisk/gptfdisk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 656a18761d..988eecf084 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -22,7 +22,7 @@ endef
 
 define GPTFDISK_INSTALL_TARGET_CMDS
 	for i in $(GPTFDISK_TARGETS_y); do \
-	    $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
+	    $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i; \
 	done
 endef
 

From 6c83b40a1b2d1eb46de50d49572db13a4ce59f03 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:28 +0000
Subject: [PATCH 4372/6849] gptfdisk: make utf16 support configurable

Instead of always disabling the UTF16 support, make it
configurable. When ICU is available, enable UTF16 support, otherwise
disable it.

[Peter: wrap long line]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...disk-001-configurable-utf16-support.patch} | 33 +++++++++++--------
 package/gptfdisk/gptfdisk.mk                  |  7 +++-
 2 files changed, 25 insertions(+), 15 deletions(-)
 rename package/gptfdisk/{gptfdisk-001-no-utf16.patch => gptfdisk-001-configurable-utf16-support.patch} (57%)

diff --git a/package/gptfdisk/gptfdisk-001-no-utf16.patch b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
similarity index 57%
rename from package/gptfdisk/gptfdisk-001-no-utf16.patch
rename to package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
index 540e74190d..2d51e6f7bf 100644
--- a/package/gptfdisk/gptfdisk-001-no-utf16.patch
+++ b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
@@ -1,43 +1,48 @@
-[PATCH] Disable UTF16 support
+[PATCH] Make the UTF16 support configurable
 
-libicu is quite large, and unicode partition names are uncommon.
+libicu is quite large, and unicode partition names are uncommon, so we
+may not necessarily want to have UTF16 support unconditionnally. This
+patch adds a USE_UTF16 environment variable to tell whether we want
+the UTF16 support or not.
 
 Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
-diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile
---- gdisk-0.8.5/Makefile	2012-05-30 08:38:43.000000000 -0700
-+++ gptfdisk-0.8.5/Makefile	2012-06-05 11:38:23.710597974 -0700
-@@ -1,8 +1,8 @@
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,11 @@
  CC=gcc
  CXX=g++
  CFLAGS+=-D_FILE_OFFSET_BITS=64
 -CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
 -#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
-+#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
 +CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++ifeq ($(USE_UTF16),y)
++CXXFLAGS+=-D USE_UTF16
++UTF16_LIBS=-licuio -licuuc
++endif
  LDFLAGS+=
  LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
  MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
-@@ -14,16 +14,16 @@
+@@ -14,16 +17,13 @@
  all:	cgdisk gdisk sgdisk fixparts
  
  gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
 -#	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
 -	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
-+	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
-+#	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(UTF16_LIBS) -luuid -o gdisk
  
  cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
 -#	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
 -	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
-+	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
-+#	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lncurses -o cgdisk
  
  sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
 -#	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
 -	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
-+	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
-+#	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lpopt -o sgdisk
  
  fixparts: $(MBR_LIB_OBJS) fixparts.o
  	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 988eecf084..0478041d9a 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -15,9 +15,14 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
     GPTFDISK_DEPENDENCIES += popt
 endif
 
+ifeq ($(BR2_PACKAGE_ICU),y)
+    GPTFDISK_DEPENDENCIES += icu
+    GPTFDISK_MAKE_OPTS += USE_UTF16=y
+endif
+
 define GPTFDISK_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		$(GPTFDISK_TARGETS_y)
+		$(GPTFDISK_MAKE_OPTS) $(GPTFDISK_TARGETS_y)
 endef
 
 define GPTFDISK_INSTALL_TARGET_CMDS

From 20a60679c463ef1ec83a870358a2114c1b9babd6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:29 +0000
Subject: [PATCH 4373/6849] gptfdisk: add support for building and install
 cgdisk

In addition to the command-line tool gdisk and the interactive tool
sgdisk, gptfdisk also provides a ncurses based tool, cgdisk. This
commit adds support for building and installing this tool.

[Peter: Update gdisk autoselection logic to consider cgdisk as well]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gptfdisk/Config.in   | 11 ++++++++++-
 package/gptfdisk/gptfdisk.mk |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 0d7e35836e..28b20df048 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -5,7 +5,8 @@ config BR2_PACKAGE_GPTFDISK
 	depends on BR2_USE_WCHAR # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	select BR2_PACKAGE_GPTFDISK_GDISK if !BR2_PACKAGE_GPTFDISK_SGDISK
+	select BR2_PACKAGE_GPTFDISK_GDISK if \
+	       !(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK)
 	help
 	  GPT fdisk (consisting of the gdisk and sgdisk programs) is a
 	  text-mode partitioning tool that works on Globally Unique Identifier
@@ -31,5 +32,13 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
 	  /usr/sbin/sgdisk which is named after the traditional MBR based
 	  sfdisk tool albeit with an entirely different option syntax.
 
+config BR2_PACKAGE_GPTFDISK_CGDISK
+	bool "ncurses cgdisk"
+	depends on BR2_PACKAGE_GPTFDISK
+	select BR2_PACKAGE_NCURSES
+	help
+	  Install the ncurses-based GUID partition table (GPT)
+	  manipulator /usr/sbin/cgdisk.
+
 comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 0478041d9a..15ec842de6 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -9,11 +9,15 @@ GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
 
 GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
 GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk
+GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk
 
 GPTFDISK_DEPENDENCIES += util-linux
 ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
     GPTFDISK_DEPENDENCIES += popt
 endif
+ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y)
+    GPTFDISK_DEPENDENCIES += ncurses
+endif
 
 ifeq ($(BR2_PACKAGE_ICU),y)
     GPTFDISK_DEPENDENCIES += icu

From ac26e65cc3591c1185a7d13309d3d0744acb2c3b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:45:30 +0000
Subject: [PATCH 4374/6849] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK
 dependency

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gptfdisk/Config.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 28b20df048..70acde796b 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -1,3 +1,6 @@
+comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
+	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
+
 config BR2_PACKAGE_GPTFDISK
 	bool "gptfdisk"
 	depends on BR2_LARGEFILE
@@ -15,9 +18,10 @@ config BR2_PACKAGE_GPTFDISK
 
 	  http://www.rodsbooks.com/gdisk/
 
+if BR2_PACKAGE_GPTFDISK
+
 config BR2_PACKAGE_GPTFDISK_GDISK
 	bool "interactive gdisk"
-	depends on BR2_PACKAGE_GPTFDISK
 	help
 	  Install the interactive GUID partition table (GPT) manipulator
 	  /usr/sbin/gdisk which is modelled after and quite similar in use
@@ -25,7 +29,6 @@ config BR2_PACKAGE_GPTFDISK_GDISK
 
 config BR2_PACKAGE_GPTFDISK_SGDISK
 	bool "command line sgdisk"
-	depends on BR2_PACKAGE_GPTFDISK
 	select BR2_PACKAGE_POPT
 	help
 	  Install the command-line GUID partition table (GPT) manipulator
@@ -34,11 +37,9 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
 
 config BR2_PACKAGE_GPTFDISK_CGDISK
 	bool "ncurses cgdisk"
-	depends on BR2_PACKAGE_GPTFDISK
 	select BR2_PACKAGE_NCURSES
 	help
 	  Install the ncurses-based GUID partition table (GPT)
 	  manipulator /usr/sbin/cgdisk.
 
-comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
-	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
+endif

From ca249584cb64bdffe968db0d0addde89350e9e6c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:36 +0000
Subject: [PATCH 4375/6849] qt5: base infrastructure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in | 18 ++++++++++++++++++
 package/qt5/qt5.mk    |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 package/qt5/Config.in
 create mode 100644 package/qt5/qt5.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
new file mode 100644
index 0000000000..0acb89e799
--- /dev/null
+++ b/package/qt5/Config.in
@@ -0,0 +1,18 @@
+comment "Qt5 needs a toolchain with WCHAR, IPv6, thread and C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+
+menuconfig BR2_PACKAGE_QT5
+	bool "Qt5"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  This option enables the Qt5 framework. Sub-options allow to
+	  select which modules should be built.
+
+	  http://qt-project.org
+
+if BR2_PACKAGE_QT5
+
+endif
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
new file mode 100644
index 0000000000..8b1a7ed3ea
--- /dev/null
+++ b/package/qt5/qt5.mk
@@ -0,0 +1 @@
+include package/qt5/*/*.mk

From 1737b5648c9f778149eb7da5897b66a9577d22c4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:37 +0000
Subject: [PATCH 4376/6849] qt5: add macro to fixup Qt5 .la and .prl files

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 8b1a7ed3ea..f22050876c 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1 +1,11 @@
 include package/qt5/*/*.mk
+
+define QT5_LA_PRL_FILES_FIXUP
+	for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \
+		$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$i; \
+		$(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \
+	done
+	for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \
+		$(SED) "s%-L/usr/lib%%" $$i; \
+	done
+endef

From 54e95512e5125a650a59c6c7dc0cef70ea832157 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:38 +0000
Subject: [PATCH 4377/6849] qt5base: new package

This is the beginning of the Qt5 packaging. This commit allows to
build only the qtbase module, which contains QtCore, QtNetwork, QtXml,
QtTest, QtSql and QtConcurrent.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/qt5/Config.in                         |   2 +-
 package/qt5/qt5base/Config.in                 |  56 ++++++++
 .../qt5/qt5base/qt5base-mkspecs-files.patch   |  61 ++++++++
 .../qt5/qt5base/qt5base-uclibc-no-lfs.patch   |  36 +++++
 package/qt5/qt5base/qt5base.mk                | 130 ++++++++++++++++++
 6 files changed, 285 insertions(+), 1 deletion(-)
 create mode 100644 package/qt5/qt5base/Config.in
 create mode 100644 package/qt5/qt5base/qt5base-mkspecs-files.patch
 create mode 100644 package/qt5/qt5base/qt5base-uclibc-no-lfs.patch
 create mode 100644 package/qt5/qt5base/qt5base.mk

diff --git a/package/Config.in b/package/Config.in
index 6458b6eca3..0ba77621e0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -148,6 +148,7 @@ source "package/qtuio/Config.in"
 source "package/qwt/Config.in"
 endif
 
+source "package/qt5/Config.in"
 source "package/x11r7/Config.in"
 
 comment "X libraries and helper libraries"
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 0acb89e799..1c9f8a6342 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -14,5 +14,5 @@ menuconfig BR2_PACKAGE_QT5
 	  http://qt-project.org
 
 if BR2_PACKAGE_QT5
-
+source "package/qt5/qt5base/Config.in"
 endif
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
new file mode 100644
index 0000000000..4cd6ce0024
--- /dev/null
+++ b/package/qt5/qt5base/Config.in
@@ -0,0 +1,56 @@
+config BR2_PACKAGE_QT5BASE
+	bool "qt5base"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE_16
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5base module, which
+	  contains the base Qt libraries: QtCore, QtNetwork, QtGui,
+	  QtWidgets, etc.
+
+	  http://qt-project.org
+
+if BR2_PACKAGE_QT5BASE
+
+config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
+	bool "Approve free license"
+	help
+	  Select this if you approve one of the available free licenses for the
+	  Qt5 library.
+	  By doing this you will not be asked while the library is compiled.
+	  Please read and understand the license terms before approving this.
+
+	  LGPL v2.1: http://qt-project.org/doc/qt-5.0/qtdoc/lgpl.html
+	  GPL  v3.0: http://qt-project.org/doc/qt-5.0/qtdoc/gpl.html
+
+	  See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
+
+config BR2_PACKAGE_QT5BASE_NETWORK
+	bool "network module"
+	help
+	  This options enables the Qt5Network library.
+
+config BR2_PACKAGE_QT5BASE_CONCURRENT
+	bool "concurrent module"
+	help
+	  This options enables the Qt5Concurrent library.
+
+config BR2_PACKAGE_QT5BASE_SQL
+	bool "sql module"
+	help
+	  This options enables the Qt5Sql library.
+
+config BR2_PACKAGE_QT5BASE_TEST
+	bool "test module"
+	help
+	  This options enables the Qt5Test library.
+
+config BR2_PACKAGE_QT5BASE_XML
+	bool "XML module"
+	help
+	  This options enables the Qt5Xml library.
+
+endif
diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-mkspecs-files.patch
new file mode 100644
index 0000000000..a86d0b19ec
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
@@ -0,0 +1,61 @@
+Add a Buildroot 'device' to ease cross-compilation
+
+Qt5 has a mechanism to support "device" profiles, so that people can
+specify the compiler, compiler flags and so on for a specific device.
+
+We leverage this mechanism in the Buildroot packaging of qt5 to
+simplify cross-compilation: we have our own "device" definition, which
+allows us to easily pass the cross-compiler paths and flags from our
+qt5.mk.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
+===================================================================
+--- /dev/null
++++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
+@@ -0,0 +1,38 @@
++MAKEFILE_GENERATOR      = UNIX
++CONFIG                  += incremental gdb_dwarf_index
++QMAKE_INCREMENTAL_STYLE = sublib
++
++include(../../common/linux.conf)
++include(../../common/gcc-base-unix.conf)
++include(../../common/g++-unix.conf)
++
++load(device_config)
++
++QT_QPA_DEFAULT_PLATFORM = eglfs
++
++CROSS_COMPILE =
++COMPILER_CFLAGS =
++COMPILER_CXXFLAGS =
++
++# modifications to g++.conf
++QMAKE_CC                = $${CROSS_COMPILE}gcc
++QMAKE_CXX               = $${CROSS_COMPILE}g++
++QMAKE_LINK              = $${QMAKE_CXX}
++QMAKE_LINK_SHLIB        = $${QMAKE_CXX}
++
++# modifications to linux.conf
++QMAKE_AR                = $${CROSS_COMPILE}ar cqs
++QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
++QMAKE_STRIP             = $${CROSS_COMPILE}strip
++
++#modifications to gcc-base.conf
++QMAKE_CFLAGS           += $${COMPILER_CFLAGS}
++QMAKE_CXXFLAGS         += $${COMPILER_CXXFLAGS}
++QMAKE_CXXFLAGS_RELEASE += -O3
++
++QMAKE_LIBS             += -lrt -lpthread -ldl
++
++# Sanity check
++deviceSanityCheckCompiler()
++
++load(qt_config)
+Index: b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
+===================================================================
+--- /dev/null
++++ b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
+@@ -0,0 +1 @@
++#include "../../linux-g++/qplatformdefs.h"
diff --git a/package/qt5/qt5base/qt5base-uclibc-no-lfs.patch b/package/qt5/qt5base/qt5base-uclibc-no-lfs.patch
new file mode 100644
index 0000000000..9772d49144
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-uclibc-no-lfs.patch
@@ -0,0 +1,36 @@
+From 6f88b27de256266947a7f6a3e70e18510754aab2 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Sat, 14 Apr 2012 20:36:07 +0200
+Subject: [PATCH] mkspecs/common/posix: fix !largefile builds on uClibc
+
+uClibc doesn't even define O_LARGEFILE when not configured with large file
+support, so ensure this define is only used when Qt is built with
+-largefile, otherwise the build fails with:
+
+io/qtemporaryfile.cpp: In function 'bool createFileFromTemplate(
+        NativeFileHandle&, QFileSystemEntry::NativePath&, size_t, size_t,
+        QSystemError&)':
+io/qtemporaryfile.cpp:197:57: error: 'O_LARGEFILE' was not declared in
+        this scope
+
+Moved to qt5 by Thomas Petazzoni.
+
+Reported-Upstream: https://bugreports.qt-project.org/browse/QTBUG-25321
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+
+Index: b/mkspecs/common/posix/qplatformdefs.h
+===================================================================
+--- a/mkspecs/common/posix/qplatformdefs.h
++++ b/mkspecs/common/posix/qplatformdefs.h
+@@ -123,7 +123,11 @@
+ #define QT_READ                 ::read
+ #define QT_WRITE                ::write
+ 
++#ifdef QT_LARGEFILE_SUPPORT
+ #define QT_OPEN_LARGEFILE       O_LARGEFILE
++#else
++#define QT_OPEN_LARGEFILE       0
++#endif
+ #define QT_OPEN_RDONLY          O_RDONLY
+ #define QT_OPEN_WRONLY          O_WRONLY
+ #define QT_OPEN_RDWR            O_RDWR
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
new file mode 100644
index 0000000000..fd85c4d292
--- /dev/null
+++ b/package/qt5/qt5base/qt5base.mk
@@ -0,0 +1,130 @@
+#############################################################
+#
+# qt5base
+#
+#############################################################
+
+QT5BASE_VERSION = 5.0.1
+QT5BASE_SITE = http://releases.qt-project.org/qt5/$(QT5BASE_VERSION)/submodules_tar/
+QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz
+
+QT5BASE_DEPENDENCIES = host-pkgconf zlib pcre
+QT5BASE_INSTALL_STAGING = YES
+
+# A few comments:
+#  * -no-pch to workaround the issue described at
+#     http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.
+#  * -system-zlib because zlib is mandatory for Qt build, and we
+#     want to use the Buildroot packaged zlib
+#  * -system-pcre because pcre is mandatory to build Qt, and we
+#    want to use the one packaged in Buildroot
+QT5BASE_CONFIGURE_OPTS += \
+	-optimized-qmake \
+	-no-linuxfb \
+	-no-xcb \
+	-no-directfb \
+	-no-eglfs \
+	-no-kms \
+	-no-gui \
+	-no-widgets \
+	-no-opengl \
+	-no-glib \
+	-no-cups \
+	-no-nis \
+	-no-libudev \
+	-no-iconv \
+	-no-openssl \
+	-no-fontconfig \
+	-no-gif \
+	-no-libpng \
+	-no-libjpeg \
+	-no-icu \
+	-no-dbus \
+	-no-gstreamer \
+	-no-gtkstyle \
+	-system-zlib \
+	-system-pcre \
+	-no-pch
+
+ifeq ($(BR2_LARGEFILE),y)
+QT5BASE_CONFIGURE_OPTS += -largefile
+else
+QT5BASE_CONFIGURE_OPTS += -no-largefile
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
+QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0
+QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+else
+QT5BASE_LICENSE = Commercial license
+QT5BASE_REDISTRIBUTE = NO
+endif
+
+# Build the list of libraries to be installed on the target
+QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
+
+# Ideally, we could use -device-option to substitute variable values
+# in our linux-buildroot-g++/qmake.config, but this mechanism doesn't
+# nicely support variable values that contain spaces. So we use the
+# good old sed solution here.
+define QT5BASE_CONFIG_SET
+	$(SED) 's%^$(1).*%$(1) = $(2)%g' $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
+endef
+
+define QT5BASE_CONFIGURE_CMDS
+	$(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS))
+	$(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS))
+	$(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))
+	(cd $(@D); \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
+		MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \
+		./configure \
+		-v \
+		-prefix /usr \
+		-hostprefix $(HOST_DIR)/usr \
+		-sysroot $(STAGING_DIR) \
+		-plugindir /usr/lib/qt/plugins \
+		-no-rpath \
+		-nomake examples -nomake demos -nomake tests \
+		-device buildroot \
+		-no-c++11 \
+		$(QT5BASE_CONFIGURE_OPTS) \
+	)
+endef
+
+define QT5BASE_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define QT5BASE_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+define QT5BASE_INSTALL_TARGET_LIBS
+	for lib in $(QT5BASE_INSTALL_LIBS_y); do \
+		cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \
+	done
+endef
+
+define QT5BASE_INSTALL_TARGET_PLUGINS
+	if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \
+		mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \
+		cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \
+	fi
+endef
+
+define QT5BASE_INSTALL_TARGET_CMDS
+	$(QT5BASE_INSTALL_TARGET_LIBS)
+	$(QT5BASE_INSTALL_TARGET_PLUGINS)
+endef
+
+$(eval $(generic-package))

From cc8c7277513d1d10c5b55948c7a97d1f54eaee82 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:39 +0000
Subject: [PATCH 4378/6849] qt5base: add GUI support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/Config.in  | 44 ++++++++++++++++++++++++++++++++++
 package/qt5/qt5base/qt5base.mk | 29 ++++++++++++++++++----
 2 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 4cd6ce0024..801ef6f60e 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -53,4 +53,48 @@ config BR2_PACKAGE_QT5BASE_XML
 	help
 	  This options enables the Qt5Xml library.
 
+config BR2_PACKAGE_QT5BASE_GUI
+	bool "gui module"
+	# At least one graphic backend must be enabled, so enable
+	# linuxfb if nothing is enabled.
+	select BR2_PACKAGE_QT5BASE_LINUXFB if \
+	       !BR2_PACKAGE_QT5BASE_DIRECTFB && \
+	       !BR2_PACKAGE_QT5BASE_XCB
+	help
+	  This option enables the Qt5Gui library.
+
+if BR2_PACKAGE_QT5BASE_GUI
+
+config BR2_PACKAGE_QT5BASE_WIDGETS
+	bool "widgets module"
+	help
+	  This option enables the Qt5Widgets library.
+
+config BR2_PACKAGE_QT5BASE_LINUXFB
+	bool "linuxfb support"
+
+config BR2_PACKAGE_QT5BASE_DIRECTFB
+	bool "directfb support"
+	select BR2_PACKAGE_DIRECTFB
+
+config BR2_PACKAGE_QT5BASE_XCB
+	bool "X.org XCB support"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBX11
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XCB_UTIL_IMAGE
+	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
+	select BR2_PACKAGE_XCB_UTIL_WM
+
+comment "X.org XCB backend available if X.org is enabled"
+	depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
+	bool "print support module"
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	help
+	  This option enables the Qt5PrintSupport
+
+endif
+
 endif
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index fd85c4d292..cad7b8dd69 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -20,13 +20,8 @@ QT5BASE_INSTALL_STAGING = YES
 #    want to use the one packaged in Buildroot
 QT5BASE_CONFIGURE_OPTS += \
 	-optimized-qmake \
-	-no-linuxfb \
-	-no-xcb \
-	-no-directfb \
 	-no-eglfs \
 	-no-kms \
-	-no-gui \
-	-no-widgets \
 	-no-opengl \
 	-no-glib \
 	-no-cups \
@@ -61,6 +56,26 @@ QT5BASE_LICENSE = Commercial license
 QT5BASE_REDISTRIBUTE = NO
 endif
 
+# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
+# is to add a link against the "inuxfb" library.
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
+
+ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
+QT5BASE_CONFIGURE_OPTS += -xcb
+QT5BASE_DEPENDENCIES   += \
+	libxcb \
+	xcb-util-wm \
+	xcb-util-image \
+	xcb-util-keysyms \
+	xlib_libX11
+else
+QT5BASE_CONFIGURE_OPTS += -no-xcb
+endif
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network
@@ -69,6 +84,10 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
 
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
+
 # Ideally, we could use -device-option to substitute variable values
 # in our linux-buildroot-g++/qmake.config, but this mechanism doesn't
 # nicely support variable values that contain spaces. So we use the

From c64cfee04325dbcc57028885cbaf278dddca451d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Mar 2013 10:18:40 +0000
Subject: [PATCH 4379/6849] qt5base: support debug or release modes

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index cad7b8dd69..33555aef32 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -41,6 +41,12 @@ QT5BASE_CONFIGURE_OPTS += \
 	-system-pcre \
 	-no-pch
 
+ifeq ($(BR2_ENABLE_DEBUG),y)
+QT5BASE_CONFIGURE_OPTS += -debug
+else
+QT5BASE_CONFIGURE_OPTS += -release
+endif
+
 ifeq ($(BR2_LARGEFILE),y)
 QT5BASE_CONFIGURE_OPTS += -largefile
 else

From 4f249a8b349206fb82ed1cbd65bab2253451d844 Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@lacie.com>
Date: Thu, 7 Mar 2013 00:21:05 +0000
Subject: [PATCH 4380/6849] package/mdadm: update to v3.2.6

Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mdadm/Config.in                       |  4 +--
 ...-install-targets-for-mdadm-and-mdmon.patch | 32 +++++++++++++++++++
 ...adm-020-uclibc-dont-force-largefile.patch} |  8 ++---
 ...ine-off64_t-as-off_t-if-no-largefile.patch | 27 ++++++++++++++++
 ...m-2.6.9-002.install-without-manpages.patch | 15 ---------
 package/mdadm/mdadm.mk                        |  2 +-
 6 files changed, 66 insertions(+), 22 deletions(-)
 create mode 100644 package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch
 rename package/mdadm/{mdadm-2.6.9-001.uclibc-dont-force-largefile.patch => mdadm-020-uclibc-dont-force-largefile.patch} (88%)
 create mode 100644 package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch
 delete mode 100644 package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch

diff --git a/package/mdadm/Config.in b/package/mdadm/Config.in
index 64264531de..c5133488f5 100644
--- a/package/mdadm/Config.in
+++ b/package/mdadm/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_MDADM
 	bool "mdadm"
 	help
-	  Utility for managing RAID hardware.
+	  Utility for managing Linux Software RAID arrays.
 
-	  http://cgi.cse.unsw.edu.au/~neilb/mdadm
+	  http://neil.brown.name/blog/mdadm
diff --git a/package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch
new file mode 100644
index 0000000000..15df7557e7
--- /dev/null
+++ b/package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch
@@ -0,0 +1,32 @@
+From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier <cvubrugier@lacie.com>
+Date: Wed, 6 Mar 2013 16:03:14 +0100
+Subject: [PATCH] Add install targets for mdadm and mdmon
+
+
+Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
+---
+ Makefile |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 315455b..27d8eeb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h
+ sha1.o : sha1.c sha1.h md5.h
+ 	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
+ 
+-install : mdadm mdmon install-man install-udev
++install : install-mdadm install-mdmon install-man install-udev
++
++install-mdadm :
+ 	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
++
++install-mdmon :
+ 	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
+ 
+ install-static : mdadm.static install-man
+-- 
+1.7.10.4
+
diff --git a/package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch b/package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch
similarity index 88%
rename from package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch
rename to package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch
index c671437d28..fe3ab47d3c 100644
--- a/package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch
+++ b/package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch
@@ -9,11 +9,11 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  mdadm.h |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: mdadm-2.6.7.1/mdadm.h
+Index: mdadm-3.2.6/mdadm.h
 ===================================================================
---- mdadm-2.6.7.1.orig/mdadm.h
-+++ mdadm-2.6.7.1/mdadm.h
-@@ -28,7 +28,11 @@
+--- mdadm-3.2.6.orig/mdadm.h
++++ mdadm-3.2.6/mdadm.h
+@@ -23,7 +23,11 @@
   */
  
  #define	_GNU_SOURCE
diff --git a/package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch b/package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch
new file mode 100644
index 0000000000..d958ab800a
--- /dev/null
+++ b/package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch
@@ -0,0 +1,27 @@
+From 9c63360a2db71882cc548305774ce87af5f52b6e Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier <cvubrugier@lacie.com>
+Date: Thu, 7 Mar 2013 10:37:09 +0100
+Subject: [PATCH] uClibc: redefine off64_t as off_t if largefile support is
+ disabled
+
+
+Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
+---
+ mdadm.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdadm.h b/mdadm.h
+index 216c31d..1c72cc4 100644
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -1008,6 +1008,7 @@ struct stat64;
+ # include <features.h>
+ # ifndef __UCLIBC_HAS_LFS__
+ #  define lseek64 lseek
++#  define off64_t off_t
+ # endif
+ # ifndef  __UCLIBC_HAS_FTW__
+ #  undef HAVE_FTW
+-- 
+1.7.10.4
+
diff --git a/package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch b/package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch
deleted file mode 100644
index 7ab1a7bf6e..0000000000
--- a/package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur mdadm-2.6.9/Makefile mdadm-2.6.9-patched/Makefile
---- mdadm-2.6.9/Makefile	2009-03-10 07:01:17.000000000 +0100
-+++ mdadm-2.6.9-patched/Makefile	2009-10-10 15:53:13.329068128 +0200
-@@ -161,7 +161,9 @@
- sha1.o : sha1.c sha1.h md5.h
- 	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
- 
--install : mdadm install-man
-+install : install-mdadm install-man
-+
-+install-mdadm : mdadm
- 	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
- 
- install-static : mdadm.static install-man
-
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index dd2b49fe60..d5d1766c18 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MDADM_VERSION = 2.6.9
+MDADM_VERSION = 3.2.6
 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
 MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
 

From 8c2395549cbaa91e819737e30f5a82e1fbd22846 Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@lacie.com>
Date: Thu, 7 Mar 2013 00:21:06 +0000
Subject: [PATCH 4381/6849] package/mdadm: add license information

Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mdadm/mdadm.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index d5d1766c18..e8cefda2b9 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -7,6 +7,8 @@
 MDADM_VERSION = 3.2.6
 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
 MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
+MDADM_LICENSE = GPLv2+
+MDADM_LICENSE_FILES = COPYING
 
 MDADM_MAKE_OPT = \
 	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(MDADM_DIR) mdadm

From bcbd68f7d194a6fb29560deafa61fc08ab34eea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= <rebillout@syscom.ch>
Date: Wed, 13 Feb 2013 05:25:45 +0000
Subject: [PATCH 4382/6849] flot: add fillbetween plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flot plugin for computing bottoms for filled line and bar charts.

[Peter: fixup help text]
Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flot/Config.in | 5 +++++
 package/flot/flot.mk   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/package/flot/Config.in b/package/flot/Config.in
index 60534c1da9..0bd6b14a96 100644
--- a/package/flot/Config.in
+++ b/package/flot/Config.in
@@ -20,6 +20,11 @@ if BR2_PACKAGE_FLOT
 
 comment "flot plugins"
 
+config BR2_PACKAGE_FLOT_FILLBETWEEN
+	bool "fillbetween"
+	help
+	  Flot plugin for computing bottoms for filled line and bar charts
+
 config BR2_PACKAGE_FLOT_NAVIGATE
 	bool "navigate"
 	help
diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index f4ba60458f..41f5a423aa 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -1,6 +1,7 @@
 FLOT_VERSION = 0.7
 FLOT_SITE = http://flot.googlecode.com/files
 FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
+	$(if $(BR2_PACKAGE_FLOT_FILLBETWEEN),fillbetween) \
 	$(if $(BR2_PACKAGE_FLOT_NAVIGATE),navigate) \
 	$(if $(BR2_PACKAGE_FLOT_PIE),pie) \
 	$(if $(BR2_PACKAGE_FLOT_RESIZE),resize) \

From 867b986721d275e74edd6d61dad4a63e540dece1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 04:02:58 +0000
Subject: [PATCH 4383/6849] icu: workaround toolchain bugs

Many of ARM Sourcery CodeBench toolchain have a bug when compiling
icu's translit.cpp source file. The bug is trigerred when there is a
combination of "-W -Wall" and "-Os", and causes an internal compiler
error. The bug has been reported to Mentor Graphics.

Even though it is clearly a toolchain bug, having a workaround for it
is trivial in this case. So it will avoid our users falling into this
internal compiler error, and allow our autobuilders to test more
packages using this Sourcery CodeBench toolchain.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../icu/icu-workaround-toolchain-bugs.patch   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/icu/icu-workaround-toolchain-bugs.patch

diff --git a/package/icu/icu-workaround-toolchain-bugs.patch b/package/icu/icu-workaround-toolchain-bugs.patch
new file mode 100644
index 0000000000..df9d5283ff
--- /dev/null
+++ b/package/icu/icu-workaround-toolchain-bugs.patch
@@ -0,0 +1,36 @@
+Workaround toolchain bugs
+
+Many of ARM Sourcery CodeBench toolchain have a bug when compiling
+icu's translit.cpp source file. The bug is trigerred when there is a
+combination of "-W -Wall" and "-Os", and causes an internal compiler
+error. The bug has been reported to Mentor Graphics.
+
+Even though it is clearly a toolchain bug, having a workaround for it
+is trivial in this case. So it will avoid our users falling into this
+internal compiler error, and allow our autobuilders to test more
+packages using this Sourcery CodeBench toolchain.qq
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/source/configure
+===================================================================
+--- a/source/configure
++++ b/source/configure
+@@ -4320,7 +4320,7 @@
+                 echo "# Note: We are not using '-ansi' with HP/UX GCC because int64_t broke, see <http://bugs.icu-project.org/trac/ticket/8493>"
+                 CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
+             *)
+-                CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
++                CFLAGS="$CFLAGS -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
+             esac
+         else
+             case "${host}" in
+@@ -4333,7 +4333,7 @@
+         fi
+         if test "$GXX" = yes
+         then
+-            CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
++            CXXFLAGS="$CXXFLAGS -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+             case "${host}" in
+             *-*-solaris*)
+                 CXXFLAGS="$CXXFLAGS -D__STDC__=0";;

From a33baa1ef9dadbec8e45d411c30d636fa6b8872a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 04:02:59 +0000
Subject: [PATCH 4384/6849] icu: don't build object files twice

When passed --enable-static and --enable-shared, icu will generate
both a shared and a static version of its libraries.

However, in order to do so, it builds each and every object file
twice: once with -fPIC (for the shared library), and once without
-fPIC (for the static library). While admittedly building -fPIC for a
static library generates a slightly suboptimal code, this is what all
the autotools-based project are doing. They build each object file
once, and they use it for both the static and shared libraries.

icu builds the object files for the shared library as .o files, and
the object files for static library as .ao files. By simply changing
the suffix of object files used for static libraries to ".o", we tell
icu to use the ones built for the shared library (i.e, with -fPIC),
and avoid the double build of icu.

On a fast build server, this brings the target icu build from
3m41.302s down to 1m43.926s (approximate numbers: some other builds
are running on the system at the same time).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../icu-dont-build-static-dynamic-twice.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/icu/icu-dont-build-static-dynamic-twice.patch

diff --git a/package/icu/icu-dont-build-static-dynamic-twice.patch b/package/icu/icu-dont-build-static-dynamic-twice.patch
new file mode 100644
index 0000000000..ccbe534aa2
--- /dev/null
+++ b/package/icu/icu-dont-build-static-dynamic-twice.patch
@@ -0,0 +1,37 @@
+Don't build object files twice
+
+When passed --enable-static and --enable-shared, icu will generate
+both a shared and a static version of its libraries.
+
+However, in order to do so, it builds each and every object file
+twice: once with -fPIC (for the shared library), and once without
+-fPIC (for the static library). While admittedly building -fPIC for a
+static library generates a slightly suboptimal code, this is what all
+the autotools-based project are doing. They build each object file
+once, and they use it for both the static and shared libraries.
+
+icu builds the object files for the shared library as .o files, and
+the object files for static library as .ao files. By simply changing
+the suffix of object files used for static libraries to ".o", we tell
+icu to use the ones built for the shared library (i.e, with -fPIC),
+and avoid the double build of icu.
+
+On a fast build server, this brings the target icu build from
+3m41.302s down to 1m43.926s (approximate numbers: some other builds
+are running on the system at the same time).
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/source/config/mh-linux
+===================================================================
+--- a/source/config/mh-linux
++++ b/source/config/mh-linux
+@@ -35,7 +35,7 @@
+ ## Shared object suffix
+ SO = so
+ ## Non-shared intermediate object suffix
+-STATIC_O = ao
++STATIC_O = o
+ 
+ ## Compilation rules
+ %.$(STATIC_O): $(srcdir)/%.c

From 5f6baf89d487c6aaf5fb3684c48032a3460e2b45 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 9 Mar 2013 04:03:00 +0000
Subject: [PATCH 4385/6849] icu: speed up host build

The host build of icu doesn't need to build everything, so we can add
a few more --disable-<foo> options to save a little bit of build time.

On a fast build server, this bring the host icu build from 2m28.517s
to 2m5.192s.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/icu/icu.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 5a884968fd..7658589e4e 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -15,7 +15,12 @@ ICU_INSTALL_STAGING = YES
 ICU_CONFIG_SCRIPTS = icu-config
 ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
 		--disable-tests
-HOST_ICU_CONF_OPT = --disable-samples --disable-tests
+HOST_ICU_CONF_OPT = \
+	--disable-samples \
+	--disable-tests \
+	--disable-extras \
+	--disable-icuio \
+	--disable-layout
 ICU_MAKE = $(MAKE1)
 ICU_SUBDIR = source
 HOST_ICU_SUBDIR = source

From 8d13f6718742553b144946d56205ab23fe1f2972 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Thu, 7 Mar 2013 11:53:40 +0000
Subject: [PATCH 4386/6849] package/zic: new host package

This is the zone information compiler, used to compile the time zone
database.

Signed-off-by: Richard Braun <rbraun@sceen.net>
[yann.morin.1998@free.fr: export ZIC for all to use]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zic/zic-fix-dependencies.patch | 27 ++++++++++++++++++++++++
 package/zic/zic.mk                     | 29 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 package/zic/zic-fix-dependencies.patch
 create mode 100644 package/zic/zic.mk

diff --git a/package/zic/zic-fix-dependencies.patch b/package/zic/zic-fix-dependencies.patch
new file mode 100644
index 0000000000..e1cbc12f0d
--- /dev/null
+++ b/package/zic/zic-fix-dependencies.patch
@@ -0,0 +1,27 @@
+From 4a2a55a640dd9316dac5f31832064f28f59ab0ae Mon Sep 17 00:00:00 2001
+From: Richard Braun <rbraun@sceen.net>
+Date: Fri, 4 Jan 2013 10:57:24 +0100
+Subject: [PATCH] zic: fix dependencies
+
+The yearistype script is provided by the tzdata package, and is required
+at runtime only.
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d76a81e..30df7dc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -349,7 +349,7 @@ version.h:
+ zdump:		$(TZDOBJS)
+ 		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
+ 
+-zic:		$(TZCOBJS) yearistype
++zic:		$(TZCOBJS)
+ 		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
+ 
+ yearistype:	yearistype.sh
+-- 
+1.7.2.5
+
diff --git a/package/zic/zic.mk b/package/zic/zic.mk
new file mode 100644
index 0000000000..3dec6af73d
--- /dev/null
+++ b/package/zic/zic.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# zic
+#
+#############################################################
+
+ZIC_VERSION = 2012j
+ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz
+ZIC_SITE = http://www.iana.org/time-zones/repository/releases
+ZIC_LICENSE = Public domain
+
+# Don't strip any path components during extraction.
+define HOST_ZIC_EXTRACT_CMDS
+	gzip -d -c $(DL_DIR)/$(ZIC_SOURCE) \
+		| $(TAR) --strip-components=0 -C $(@D) -xf -
+endef
+
+define HOST_ZIC_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic
+endef
+
+define HOST_ZIC_INSTALL_CMDS
+	mkdir -p $(HOST_DIR)/usr/sbin
+	install -D -m 755 $(@D)/zic $(HOST_DIR)/usr/sbin/zic
+endef
+
+$(eval $(host-generic-package))
+
+ZIC = $(HOST_DIR)/usr/sbin/zic

From 1ca9e06f1c9a5ef12feb63711a48379c0eae7e42 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Thu, 7 Mar 2013 11:53:41 +0000
Subject: [PATCH 4387/6849] package/tzdata: new package

This is the time zone database, used by glibc for translations between
UTC and local time.

Signed-off-by: Richard Braun <rbraun@sceen.net>
[yann.morin.1998@free.fr: use global ZIC, install posix TZ only once]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/tzdata/Config.in | 20 +++++++++++++++++
 package/tzdata/tzdata.mk | 46 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 package/tzdata/Config.in
 create mode 100644 package/tzdata/tzdata.mk

diff --git a/package/Config.in b/package/Config.in
index 0ba77621e0..a65054cec6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -570,6 +570,7 @@ source "package/protobuf/Config.in"
 source "package/schifra/Config.in"
 source "package/startup-notification/Config.in"
 source "package/liblog4c-localtime/Config.in"
+source "package/tzdata/Config.in"
 endmenu
 
 menu "Text and terminal handling"
diff --git a/package/tzdata/Config.in b/package/tzdata/Config.in
new file mode 100644
index 0000000000..4e68a97b52
--- /dev/null
+++ b/package/tzdata/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_TZDATA
+	bool "tzdata"
+	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc
+	help
+	  Time zone database
+
+	  http://www.iana.org/time-zones/repository/tz-link.html
+
+config BR2_PACKAGE_TZDATA_ZONELIST
+	string "Time zone list"
+	depends on BR2_PACKAGE_TZDATA
+	default "default"
+	help
+	  Space-separated list of time zones to compile.
+
+	  The value "default" includes all commonly used time zones. Note
+	  that this set consumes around 5.5M.
+
+	  The full list is the list of files in the time zone database source,
+	  not including the build and .tab files.
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
new file mode 100644
index 0000000000..04d9b27690
--- /dev/null
+++ b/package/tzdata/tzdata.mk
@@ -0,0 +1,46 @@
+#############################################################
+#
+# tzdata
+#
+#############################################################
+
+TZDATA_VERSION = 2012j
+TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
+TZDATA_SITE = http://www.iana.org/time-zones/repository/releases
+TZDATA_DEPENDENCIES = host-zic
+TZDATA_LICENSE = Public domain
+
+TZDATA_DEFAULT_ZONELIST = africa antarctica asia australasia backward etcetera \
+			europe factory northamerica pacificnew southamerica
+
+ifeq ($(call qstrip,$(BR2_PACKAGE_TZDATA_ZONELIST)),default)
+TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST)
+else
+TZDATA_ZONELIST = $(call qstrip,$(BR2_PACKAGE_TZDATA_ZONELIST))
+endif
+
+# Don't strip any path components during extraction.
+define TZDATA_EXTRACT_CMDS
+	gzip -d -c $(DL_DIR)/$(TZDATA_SOURCE) \
+		| $(TAR) --strip-components=0 -C $(@D) -xf -
+endef
+
+define TZDATA_BUILD_CMDS
+	(cd $(@D); \
+		for zone in $(TZDATA_ZONELIST); do \
+			$(ZIC) -d _output/posix -y yearistype.sh $$zone; \
+			$(ZIC) -d _output/right -L leapseconds -y yearistype.sh $$zone; \
+		done; \
+	)
+endef
+
+define TZDATA_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo
+	cp -a $(@D)/_output/* $(TARGET_DIR)/usr/share/zoneinfo
+	cd $(TARGET_DIR)/usr/share/zoneinfo;    \
+	for zone in posix/*; do                 \
+	    ln -sfn "$${zone}" "$${zone##*/}";    \
+	done
+endef
+
+$(eval $(generic-package))

From 4af3bb1d0e8054a8041bf0c9e015b93b5d124a46 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Mon, 11 Mar 2013 07:41:24 +0000
Subject: [PATCH 4388/6849] lcdproc: needs MMU

Fixes:
http://autobuild.buildroot.org/results/58d0231cc39ee6be3064906f07307b438ea4c30b

Also fixed some indentation issues

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lcdproc/Config.in | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in
index e0afc44b96..5635a02091 100644
--- a/package/lcdproc/Config.in
+++ b/package/lcdproc/Config.in
@@ -1,12 +1,13 @@
 config BR2_PACKAGE_LCDPROC
-       bool "lcdproc"
-       select BR2_PACKAGE_FREETYPE
-       select BR2_PACKAGE_NCURSES
-       select BR2_PACKAGE_ZLIB
-       help
-         LCD display driver daemon and clients
+	bool "lcdproc"
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_ZLIB
+	help
+	  LCD display driver daemon and clients
 
-         http://lcdproc.org/
+	  http://lcdproc.org/
 
 config BR2_PACKAGE_LCDPROC_DRIVERS
 	string "List of drivers to build"

From 49610bbc2149213ffcca2d160f0d108669e7021a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 12 Mar 2013 10:52:26 +0100
Subject: [PATCH 4389/6849] at91bootstrap: fix upstream URL

AT91Bootstrap 1.x seems to have disappeared from atmel.com (but return
HTML instead of a 404), so use the at91.com FTP server instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 46862c0428..67b68c00d6 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 AT91BOOTSTRAP_VERSION = 1.16
-AT91BOOTSTRAP_SITE = http://www.atmel.com/Images
+AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap/
 AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip
 
 AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))

From 7bc8cd99591491b622f6444de2f1f9d7aa6048e1 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 12 Mar 2013 03:24:25 +0000
Subject: [PATCH 4390/6849] eeprog.mk: fix site

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eeprog/eeprog.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk
index e64fa068de..3b1b3e9bf6 100644
--- a/package/eeprog/eeprog.mk
+++ b/package/eeprog/eeprog.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 EEPROG_VERSION = 0.7.6
-EEPROG_SITE = http://codesink.org/download
+EEPROG_SITE = http://www.codesink.org/download
 
 define EEPROG_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From 196c716bc61582f1ccf03dc834cbb929c553e9aa Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 12 Mar 2013 11:17:05 +0000
Subject: [PATCH 4391/6849] libv4l: depends on jpeg so must select it

Fixes http://autobuild.buildroot.net/results/3053854fccd65bc5b28384f2a2039a33abeeea47

The introduction of the error message for the jpeg virtual package exposes
this kind of error.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index 1e5eec642d..cb0f43c5e5 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBV4L
 	bool "libv4l"
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_JPEG
 	help
 	  libv4l is an accompanying collection of libraries that adds a thin
 	  abstraction layer on top of video4linux2 (V4L2) devices.

From a7fbcd013be42075a3c98056bcb82a471c2ff7a3 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Sun, 10 Mar 2013 23:54:08 +0000
Subject: [PATCH 4392/6849] barebox: add 2013.03.0, remove 2012.11

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 769a1bd272..f111c04c73 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2013_02
+	default BR2_TARGET_BAREBOX_2013_03
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_11
-	bool "2012.11"
-
 config BR2_TARGET_BAREBOX_2012_12
 	bool "2012.12.1"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2013_01
 config BR2_TARGET_BAREBOX_2013_02
 	bool "2013.02.0"
 
+config BR2_TARGET_BAREBOX_2013_03
+	bool "2013.03.0"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.11.0"	if BR2_TARGET_BAREBOX_2012_11
 	default "2012.12.1"	if BR2_TARGET_BAREBOX_2012_12
 	default "2013.01.0"	if BR2_TARGET_BAREBOX_2013_01
 	default "2013.02.0"	if BR2_TARGET_BAREBOX_2013_02
+	default "2013.03.0"	if BR2_TARGET_BAREBOX_2013_03
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 55700e9871d6f74c280aaf399a7b3d91252640ba Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 12 Mar 2013 22:15:48 +0000
Subject: [PATCH 4393/6849] poco: needs threads

Fixes
http://autobuild.buildroot.net/results/98f8ae541939bd7b44601d3ee039bbc84becea84.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index 20a8f2dfa5..b8230717b4 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_POCO
 	bool "poco"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
@@ -57,5 +58,6 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
 
 endif # BR2_PACKAGE_POCO
 
-comment "poco requires a toolchain with WCHAR and C++ support"
-	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+comment "poco requires a toolchain with WCHAR, threads, and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
+		|| !BR2_TOOLCHAIN_HAS_THREADS

From 19d1cfdb25b4a313b8f916ae80da9f60dc134bf5 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 12 Mar 2013 22:15:49 +0000
Subject: [PATCH 4394/6849] poco: bump to 1.4.6p1

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/poco.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 942b9b2e68..32a026be1e 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -3,8 +3,8 @@
 # poco
 #
 #############################################################
-POCO_VERSION_MAJOR = 1.4.4
-POCO_VERSION = $(POCO_VERSION_MAJOR)
+POCO_VERSION_MAJOR = 1.4.6
+POCO_VERSION = $(POCO_VERSION_MAJOR)p1
 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
 POCO_SITE = http://downloads.sourceforge.net/project/poco/sources/poco-$(POCO_VERSION_MAJOR)
 POCO_LICENSE = Boost-v1.0

From 402d1476f7159ab8055ec8b811b4fb5cd78b5609 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date: Wed, 13 Mar 2013 02:28:16 +0000
Subject: [PATCH 4395/6849] fs/common.mk: Strip extra whitespace when device
 table is empty

Since ROOTFS_DEVICE_TABLES is a concatenation of two strings separated by
spaces, there will always be a space in it, which means it's never empty.
Therefore, when testing for empty, the condition never evaluate to false.

The following change fixes this problem; it runs qstrip on the overall
combination of the variables, causing the space to be removed if it's the
only thing left.

Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/common.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index 8b5b2f2e86..a0b7b3909c 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -33,8 +33,8 @@
 
 FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
 FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
-ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) \
-	$(call qstrip,$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
+ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
+       $(BR2_ROOTFS_STATIC_DEVICE_TABLE))
 
 define ROOTFS_TARGET_INTERNAL
 

From 04092fa3570f0315042327148a0fe62854fc8722 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 11 Mar 2013 18:58:39 +0000
Subject: [PATCH 4396/6849] openobex: new package

Cc: Julien Boibessot <julien.boibessot@armadeus.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/openobex/Config.in                    | 45 +++++++++++++++++++
 ...ex-libusb_check_when_cross-compiling.patch | 18 ++++++++
 ...penobex-replace_deprecated_functions.patch | 30 +++++++++++++
 package/openobex/openobex.mk                  | 38 ++++++++++++++++
 5 files changed, 132 insertions(+)
 create mode 100644 package/openobex/Config.in
 create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
 create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
 create mode 100644 package/openobex/openobex.mk

diff --git a/package/Config.in b/package/Config.in
index a65054cec6..560ae9cc7c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -689,6 +689,7 @@ source "package/ntp/Config.in"
 source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
 source "package/openntpd/Config.in"
+source "package/openobex/Config.in"
 source "package/openssh/Config.in"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
diff --git a/package/openobex/Config.in b/package/openobex/Config.in
new file mode 100644
index 0000000000..6494b2952d
--- /dev/null
+++ b/package/openobex/Config.in
@@ -0,0 +1,45 @@
+comment "openobex requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
+
+config BR2_PACKAGE_OPENOBEX
+	bool "openobex"
+	depends on BR2_INET_IPV6
+	help
+	  Free open source implementation of the Object Exchange (OBEX)
+	  protocol.
+
+	  http://www.openobex.org
+
+if BR2_PACKAGE_OPENOBEX
+
+comment "bluez support require a toolchain with WCHAR and thread support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_OPENOBEX_BLUEZ
+	bool "enable bluez support"
+	depends on !BR2_avr32
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_BLUEZ_UTILS
+
+comment "libusb support require a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_OPENOBEX_LIBUSB
+	bool "enable libusb support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBUSB
+
+config BR2_PACKAGE_OPENOBEX_APPS
+	bool "install test applications"
+	help
+	  Also install the openobex test applications on target.
+
+config BR2_PACKAGE_OPENOBEX_SYSLOG
+	bool "enable debugging to the system logger"
+
+config BR2_PACKAGE_OPENOBEX_DUMP
+	bool "enable protocol dumping for debugging"
+
+endif
diff --git a/package/openobex/openobex-libusb_check_when_cross-compiling.patch b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
new file mode 100644
index 0000000000..7b8056afcc
--- /dev/null
+++ b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
@@ -0,0 +1,18 @@
+Fix libusb check when cross-compiling.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+Index: openobex-1.5/acinclude.m4
+===================================================================
+--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
++++ openobex-1.5/acinclude.m4	2010-06-16 10:35:33.000000000 +0200
+@@ -158,7 +158,7 @@
+ 		;;
+ 	*)
+ 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++		REQUIRES="libusb"
+ 		;;
+ 	esac
+ 	AC_SUBST(USB_CFLAGS)
diff --git a/package/openobex/openobex-replace_deprecated_functions.patch b/package/openobex/openobex-replace_deprecated_functions.patch
new file mode 100644
index 0000000000..17274d385b
--- /dev/null
+++ b/package/openobex/openobex-replace_deprecated_functions.patch
@@ -0,0 +1,30 @@
+obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
+--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
++++ openobex-1.5/apps/obex_test_cable.c	2010-06-16 11:11:05.000000000 +0200
+@@ -113,9 +113,9 @@
+ 			if(total == sizeof(tmpbuf))
+ 				return -1;
+ 
+-			if( (answer = index(tmpbuf, '\n')) )	{
++			if( (answer = strchr(tmpbuf, '\n')) )	{
+ 				// Remove first line (echo)
+-				if( (answer_end = index(answer+1, '\n')) )	{
++				if( (answer_end = strchr(answer+1, '\n')) )	{
+ 					// Found end of answer
+ 					done = 1;
+ 				}
+@@ -178,7 +178,7 @@
+ 	}
+ 
+ 	tcgetattr(gt->ttyfd, &gt->oldtio);
+-	bzero(&gt->newtio, sizeof(struct termios));
++	memset(&gt->newtio, 0, sizeof(struct termios));
+ 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
+ 	gt->newtio.c_iflag = IGNPAR;
+ 	gt->newtio.c_oflag = 0;
diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
new file mode 100644
index 0000000000..0fb4f6572b
--- /dev/null
+++ b/package/openobex/openobex.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# openobex
+#
+#############################################################
+
+OPENOBEX_VERSION = 1.5
+OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
+# Libraries seems to be released under LGPLv2.1+,
+# while other material is under GPLv2+.
+OPENOBEX_LICENSE = GPLv2+/LGPLv2.1+
+OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
+
+OPENOBEX_DEPENDENCIES = host-pkgconf
+OPENOBEX_AUTORECONF = YES
+OPENOBEX_INSTALL_STAGING = YES
+
+OPENOBEX_CONF_OPT += \
+	$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
+	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
+	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
+	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
+OPENOBEX_DEPENDENCIES += bluez_utils
+OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
+OPENOBEX_DEPENDENCIES += libusb
+OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-usb
+endif
+
+$(eval $(autotools-package))

From 87854c12d1c81bade3522405ce1ac42d45475263 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 11 Mar 2013 18:58:40 +0000
Subject: [PATCH 4397/6849] ussp-push: new package

Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                              |  1 +
 package/ussp-push/Config.in                    | 18 ++++++++++++++++++
 .../ussp-push-fix-build-against-bluez-4.patch  | 15 +++++++++++++++
 package/ussp-push/ussp-push.mk                 | 14 ++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 package/ussp-push/Config.in
 create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
 create mode 100644 package/ussp-push/ussp-push.mk

diff --git a/package/Config.in b/package/Config.in
index 560ae9cc7c..b8b1e607fa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -729,6 +729,7 @@ source "package/tvheadend/Config.in"
 source "package/udpcast/Config.in"
 source "package/ulogd/Config.in"
 source "package/ushare/Config.in"
+source "package/ussp-push/Config.in"
 source "package/vde2/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
new file mode 100644
index 0000000000..716ce34a88
--- /dev/null
+++ b/package/ussp-push/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_USSP_PUSH
+	bool "ussp-push"
+	depends on BR2_INET_IPV6
+	depends on !BR2_avr32
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_OPENOBEX
+	select BR2_PACKAGE_OPENOBEX_BLUEZ
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
+	  BlueTooth stack.
+
+	  http://www.xmailserver.org/ussp-push.html
+
+comment "ussp-push require a toolchain with WCHAR, IPV6 and thread support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
diff --git a/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
new file mode 100644
index 0000000000..0694bfbadd
--- /dev/null
+++ b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
@@ -0,0 +1,15 @@
+Fix build against bluez4.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
new file mode 100644
index 0000000000..c1095542cb
--- /dev/null
+++ b/package/ussp-push/ussp-push.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# ussp-push
+#
+#############################################################
+
+USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+USSP_PUSH_LICENSE = GPLv2+
+USSP_PUSH_LICENSE_FILES = COPYING
+
+USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+
+$(eval $(autotools-package))

From 8215e19b5343387db0714bcc373030ee4a565e68 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Wed, 13 Mar 2013 11:13:24 +0000
Subject: [PATCH 4398/6849] linux: Add a load address option for building
 uImage on 3.7+ multi-platform kernels

[Peter: add quotes as suggested by Arnout]
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 13 +++++++++++++
 linux/linux.mk  |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index 94ce951469..a44880f5b7 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -213,6 +213,19 @@ config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
 	  Specify the kernel make target to build the kernel that you
 	  need.
 
+config BR2_LINUX_KERNEL_UIMAGE_LOADADDR
+	string "load address (for 3.7+ multi-platform image)"
+	depends on BR2_arm || BR2_armeb
+	depends on BR2_LINUX_KERNEL_UIMAGE || BR2_LINUX_KERNEL_APPENDED_UIMAGE
+	help
+	  If your ARM system's Linux kernel is configured with the new (3.7+)
+	  multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y in your
+	  kernel config), then it is necessary to specify a kernel load address
+	  when building the uImage. This should be a hexadecimal string
+	  beginning with 0x, for example: 0x00008000.
+
+	  If unsure, let this option empty.
+
 config BR2_LINUX_KERNEL_DTS_SUPPORT
 	bool "Device tree support"
 	help
diff --git a/linux/linux.mk b/linux/linux.mk
index 0352acd505..8a73767df9 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -95,6 +95,11 @@ LINUX_IMAGE_NAME=vmlinuz
 endif
 endif
 
+LINUX_KERNEL_UIMAGE_LOADADDR=$(call qstrip,$(BR2_LINUX_KERNEL_UIMAGE_LOADADDR))
+ifneq ($(LINUX_KERNEL_UIMAGE_LOADADDR),)
+LINUX_MAKE_FLAGS+=LOADADDR="$(LINUX_KERNEL_UIMAGE_LOADADDR)"
+endif
+
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
 LINUX_IMAGE_TARGET=zImage
 else

From b81e1a82ab4a1a41bdfa4d5c73955b538853f8ef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 15 Mar 2013 00:51:34 +0000
Subject: [PATCH 4399/6849] kernel-headers: bump 3.{0, 2, 4, 8}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.68-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.69-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 0c417e675b..91d3b23705 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -62,14 +62,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.68"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.69"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.39"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.40"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.35"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.36"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.2"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.3"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.68-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.69-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.68-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.69-headers_install-fix-__packed-in-exported-kernel-head.patch

From 6e52947e7c513d6541d7a55c416115cc0a8bdb33 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 15 Mar 2013 00:51:35 +0000
Subject: [PATCH 4400/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index a44880f5b7..438140c4b8 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.2"
+	bool "3.8.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.2" if BR2_LINUX_KERNEL_3_8
+	default "3.8.3" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 58917a65dc6ec987621fc07c865322cdef0ddb7f Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 12 Mar 2013 00:00:03 +0000
Subject: [PATCH 4401/6849] perl: bump to version 5.16.3

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index da54ef1a18..66f7daac9d 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 PERL_VERSION_MAJOR = 16
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_LICENSE = Artistic

From 3b681efa4c2910c020662c1510efb4ee17008a17 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 1 Mar 2013 10:26:38 +0000
Subject: [PATCH 4402/6849] <pkg>-rsync: exclude version control files

When using rsync to import package sources (typically with
PKG_OVERRIDE_SRCDIR), it often happens that these external sources
are under version control, and contain directories like .git,
.hg, etc.

Depending on the project, these directories can become pretty large
and typically have a lot of files. Moreover, they are not necessary
in the context of building the package. Therefore, this commit adds
the --cvs-exclude option to the rsync call, saving both disk space
and sync time.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 57b0fd08c1..8d964a18c1 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -62,7 +62,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_rsynced:
 	@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
 	@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
-	rsync -au $(SRCDIR)/ $(@D)
+	rsync -au --cvs-exclude $(SRCDIR)/ $(@D)
 	$(Q)touch $@
 
 # Handle the SOURCE_CHECK and SHOW_EXTERNAL_DEPS cases for rsynced

From 3cc2cdb72fde97e211c42f67dc7973e051f95494 Mon Sep 17 00:00:00 2001
From: Alexander Lukichev <alexander.lukichev@gmail.com>
Date: Mon, 11 Mar 2013 01:43:09 +0000
Subject: [PATCH 4403/6849] zeromq: bump version to 3.2.2

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/zeromq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index 284a168fe4..2d0026d2d9 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ZEROMQ_VERSION = 2.2.0
+ZEROMQ_VERSION = 3.2.2
 ZEROMQ_SITE = http://download.zeromq.org/
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux

From e019b10ac25e0876b4706a584842be4595b8fd2b Mon Sep 17 00:00:00 2001
From: Alexander Lukichev <alexander.lukichev@espotel.com>
Date: Sun, 3 Mar 2013 23:48:11 +0000
Subject: [PATCH 4404/6849] openpgm: new package

OpenPGM is an open source implementation of the Pragmatic General
Multicast (PGM) specification in RFC 3208 available at www.ietf.org.
It is required for PGM/EPGM support in ZeroMQ library.

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                           |  1 +
 package/openpgm/Config.in                   | 16 +++++++++
 package/openpgm/openpgm-cross-compile.patch | 38 +++++++++++++++++++++
 package/openpgm/openpgm.mk                  | 18 ++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 package/openpgm/Config.in
 create mode 100644 package/openpgm/openpgm-cross-compile.patch
 create mode 100644 package/openpgm/openpgm.mk

diff --git a/package/Config.in b/package/Config.in
index b8b1e607fa..0361fa85a5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -528,6 +528,7 @@ source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
 source "package/nss-mdns/Config.in"
+source "package/openpgm/Config.in"
 source "package/ortp/Config.in"
 source "package/slirp/Config.in"
 source "package/usbredir/Config.in"
diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
new file mode 100644
index 0000000000..1b385a3e6d
--- /dev/null
+++ b/package/openpgm/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_OPENPGM
+	bool "openpgm"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INET_IPV6
+	depends on BR2_USE_WCHAR
+	help
+	  OpenPGM is an open source implementation of the Pragmatic General
+	  Multicast (PGM) specification in RFC 3208 available at www.ietf.org.
+	  PGM is a reliable and scalable multicast protocol that enables
+	  receivers to detect loss, request retransmission of lost data, or
+	  notify an application of unrecoverable loss.
+
+	  http://code.google.com/p/openpgm/
+
+comment "openpgm needs a toolchain with WCHAR, threads and IPv6 support"
+	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
diff --git a/package/openpgm/openpgm-cross-compile.patch b/package/openpgm/openpgm-cross-compile.patch
new file mode 100644
index 0000000000..07a24492e5
--- /dev/null
+++ b/package/openpgm/openpgm-cross-compile.patch
@@ -0,0 +1,38 @@
+configure.ac: cross-compilation fix
+
+This patch enables to configure the package when cross-compiling in a way
+recommended by Autoconf manual (see manual for version 2.69, Section 6.6
+Checking Runtime Behavior).
+
+Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
+
+--- a/openpgm/pgm/configure.ac	2011-09-27 20:59:08.000000000 +0300
++++ b/openpgm/pgm/configure.ac	2013-02-12 10:33:53.000000000 +0200
+@@ -272,14 +272,19 @@ uint32_t add32_with_carry (uint32_t a, u
+ 	;;
+ esac
+ # ticket spinlock friendly: unaligned pointers & atomic ops (excl. Sun Pro)
+-AC_MSG_CHECKING([for unaligned pointers])
+-AC_RUN_IFELSE(
+-	[AC_LANG_PROGRAM([[char* nezumi = "mouse";]],
+-		[[short x = *(short*)(nezumi + 2)]])],
+-	[AC_MSG_RESULT([yes])
+-		pgm_unaligned_pointers=yes],
+-	[AC_MSG_RESULT([no])
+-		pgm_unaligned_pointers=no])
++AC_CACHE_CHECK([if unaligned access fails], [ac_cv_lbl_unaligned_fail],
++	[AC_RUN_IFELSE(
++		[AC_LANG_PROGRAM([[char* nezumi = "mouse";]],
++			[[short x = *(short*)(nezumi + 2)]])],
++		[ac_cv_lbl_unaligned_fail=no],
++		[ac_cv_lbl_unaligned_fail=yes],
++		[ac_cv_lbl_unaligned_fail=yes])
++	])
++if test "$ac_cv_lbl_unaligned_fail" = yes; then
++	pgm_unaligned_pointers=no
++else
++	pgm_unaligned_pointers=yes
++fi
+ AC_MSG_CHECKING([for intrinsic atomic ops])
+ # AC_PREPROC_IFELSE not always portable
+ AC_COMPILE_IFELSE(
diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
new file mode 100644
index 0000000000..c476014453
--- /dev/null
+++ b/package/openpgm/openpgm.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# openpgm
+#
+#############################################################
+
+OPENPGM_VERSION = 5.1.118~dfsg
+OPENPGM_SOURCE = libpgm-$(OPENPGM_VERSION).tar.gz
+OPENPGM_SITE = http://openpgm.googlecode.com/files/
+OPENPGM_LICENSE = LGPLv2.1+
+OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE
+OPENPGM_INSTALL_STAGING = YES
+OPENPGM_AUTORECONF = YES
+OPENPGM_SUBDIR = openpgm/pgm/
+OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \
+                   ac_cv_file__dev_hpet=no
+
+$(eval $(autotools-package))

From eaf746eb9e8b10d5ff5011a989014b3df4b31ddc Mon Sep 17 00:00:00 2001
From: Alexander Lukichev <alexander.lukichev@gmail.com>
Date: Sun, 3 Mar 2013 23:48:12 +0000
Subject: [PATCH 4405/6849] zeromq: add PGM/EPGM support

This adds support for Pragmatic General Multicast protocol on raw
IP (PGM, RFC 3208) or UDP frames (EPGM) for use as zeromq reliable
multicast transport. The library relies on openpgm package to
implement the protocol itself.

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/Config.in | 9 +++++++++
 package/zeromq/zeromq.mk | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index e1d3d520b8..b7dc8a6338 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -23,3 +23,12 @@ config BR2_PACKAGE_ZEROMQ
 	  ØMQ is from iMatix and is LGPL open source.
 
 	  http://www.zeromq.org/
+
+config BR2_PACKAGE_ZEROMQ_PGM
+	bool "PGM/EPGM support"
+	depends on BR2_PACKAGE_ZEROMQ
+	select BR2_PACKAGE_OPENPGM
+	help
+	  Add support for Pragmatic General Multicast protocol (RFC 3208)
+	  implemented either over raw IP packets or UDP datagrams
+	  (encapsulated PGM). This requires OpenPGM library.
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index 2d0026d2d9..ba585d9660 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -11,4 +11,9 @@ ZEROMQ_DEPENDENCIES = util-linux
 ZEROMQ_LICENSE = LGPLv3+ with exceptions
 ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
 
+ifeq ($(BR2_PACKAGE_ZEROMQ_PGM),y)
+	ZEROMQ_DEPENDENCIES += host-pkgconf openpgm
+	ZEROMQ_CONF_OPT = --with-system-pgm
+endif
+
 $(eval $(autotools-package))

From 976e3b2dc4db12a6ac20dbc6d5a523c2929ebdde Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 11 Mar 2013 18:58:41 +0000
Subject: [PATCH 4406/6849] urg: new package

[Peter: drop 'library' from name]
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |  1 +
 package/urg/Config.in | 13 +++++++++++++
 package/urg/urg.mk    | 27 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/urg/Config.in
 create mode 100644 package/urg/urg.mk

diff --git a/package/Config.in b/package/Config.in
index 0361fa85a5..9be62c18b5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -464,6 +464,7 @@ source "package/libv4l/Config.in"
 source "package/mtdev/Config.in"
 source "package/neardal/Config.in"
 source "package/pcsc-lite/Config.in"
+source "package/urg/Config.in"
 endmenu
 
 menu "Javascript"
diff --git a/package/urg/Config.in b/package/urg/Config.in
new file mode 100644
index 0000000000..cbc6e6ac98
--- /dev/null
+++ b/package/urg/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_URG
+	bool "urg"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_NET
+	help
+	  Library to control Hokuyo's URG series sensors.
+	  Requires SDL & SDL_net.
+
+	  http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+
+comment "urg requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
new file mode 100644
index 0000000000..3f68bf2bb6
--- /dev/null
+++ b/package/urg/urg.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# urg library
+#
+#############################################################
+
+URG_VERSION = 0.8.18
+URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+URG_SOURCE = urg-$(URG_VERSION).zip
+URG_LICENSE = LGPLv3+
+URG_LICENSE_FILES = COPYING
+
+URG_INSTALL_STAGING = YES
+
+URG_DEPENDENCIES = sdl sdl_net
+
+URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
+
+define URG_EXTRACT_CMDS
+	$(RM) -rf $(URG_DIR)
+	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
+	test -d $(URG_DIR) || \
+		mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
+endef
+
+$(eval $(autotools-package))

From a42e10c61b19a6054d10fc809460c7e23c46fde7 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Tue, 5 Feb 2013 08:16:08 +0000
Subject: [PATCH 4407/6849] New package: gtest

Google's framework for writing C++ tests on a variety of platforms (Linux,
Mac OS X, Windows, Cygwin, Windows CE, and Symbian). Based on the xUnit
architecture. Supports automatic test discovery, a rich set of assertions,
user-defined assertions, death tests, fatal and non-fatal failures, value-
and type-parameterized tests, various options for running the tests, and XML
test report generation.

Gtest also allows to easily build testsuites for C programs.

This package allows running testsuites on the target which might be
advantgeous in certain cases.

http://code.google.com/p/googletest/

[Peter: Tweak Config.in, use GTEST_VERSION in _SOURCE]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/gtest/Config.in | 24 ++++++++++++++++++++++++
 package/gtest/gtest.mk  | 23 +++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 package/gtest/Config.in
 create mode 100644 package/gtest/gtest.mk

diff --git a/package/Config.in b/package/Config.in
index 9be62c18b5..1a99a17128 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -546,6 +546,7 @@ source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
 source "package/boost/Config.in"
+source "package/gtest/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
 source "package/libcap-ng/Config.in"
diff --git a/package/gtest/Config.in b/package/gtest/Config.in
new file mode 100644
index 0000000000..c50b5f7098
--- /dev/null
+++ b/package/gtest/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_GTEST
+	bool "gtest"
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Google's framework for writing C++ tests on a variety of
+	  platforms (Linux, Mac OS X, Windows, Cygwin, Windows CE, and
+	  Symbian). Based on the xUnit architecture. Supports
+	  automatic test discovery, a rich set of assertions,
+	  user-defined assertions, death tests, fatal and non-fatal
+	  failures, value- and type-parameterized tests, various
+	  options for running the tests, and XML test report
+	  generation.
+
+	  Gtest also allows to easily build testsuites for C programs.
+
+	  This package allows running testsuites on the target which
+	  might be advantageous in certain cases.
+
+	  http://code.google.com/p/googletest/
+
+comment "gtest requires a toolchain with c++, WCHAR and THREADS support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
new file mode 100644
index 0000000000..6ede13776c
--- /dev/null
+++ b/package/gtest/gtest.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# googletest
+#
+#############################################################
+
+GTEST_VERSION = 1.6.0
+GTEST_SOURCE = gtest-$(GTEST_VERSION).zip
+GTEST_SITE = http://googletest.googlecode.com/files/
+GTEST_INSTALL_STAGING = YES
+GTEST_INSTALL_TARGET = NO
+
+define GTEST_EXTRACT_CMDS
+	unzip $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR)
+endef
+
+define GTEST_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/libgtest.a $(STAGING_DIR)/usr/lib/libgtest.a
+	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gtest/
+	cp -rp $(@D)/include/gtest/* $(STAGING_DIR)/usr/include/gtest/
+endef
+
+$(eval $(cmake-package))

From b31bc7d4387095091a109eb879464d54d37a5eab Mon Sep 17 00:00:00 2001
From: Daniel Price <daniel.price@gmail.com>
Date: Thu, 7 Mar 2013 15:31:16 +0000
Subject: [PATCH 4408/6849] nodejs: new package

Based off of patches posted by (and Signed-off-by:) Jonathan Liu <net147@gmail.com>

[Peter: fix Config.in whitespace]
Signed-off-by: Daniel Price <daniel.price@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/nodejs/Config.in                      |  79 ++++++++++++
 .../nodejs-remove-python-bz2-dependency.patch |  27 +++++
 package/nodejs/nodejs-v8-gregs-fix.patch      |  29 +++++
 package/nodejs/nodejs.mk                      | 114 ++++++++++++++++++
 5 files changed, 250 insertions(+)
 create mode 100644 package/nodejs/Config.in
 create mode 100644 package/nodejs/nodejs-remove-python-bz2-dependency.patch
 create mode 100644 package/nodejs/nodejs-v8-gregs-fix.patch
 create mode 100644 package/nodejs/nodejs.mk

diff --git a/package/Config.in b/package/Config.in
index 1a99a17128..9853b06628 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -311,6 +311,7 @@ source "package/wsapi/Config.in"
 source "package/xavante/Config.in"
 endmenu
 endif
+source "package/nodejs/Config.in"
 source "package/perl/Config.in"
 if BR2_PACKAGE_PERL
 menu "Perl libraries/modules"
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
new file mode 100644
index 0000000000..aa65c6f42e
--- /dev/null
+++ b/package/nodejs/Config.in
@@ -0,0 +1,79 @@
+config BR2_PACKAGE_NODEJS
+	bool "nodejs"
+	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_arm || BR2_i386 || BR2_x86_64
+	# uses fork()
+	depends on BR2_USE_MMU
+	help
+	  Event-driven I/O server-side JavaScript environment based on V8.
+
+	  http://nodejs.org/
+
+comment "nodejs requires a toolchain with C++, IPv6, large files, and threading"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || \
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
+
+if BR2_PACKAGE_NODEJS
+
+menu "Module Selection"
+
+config BR2_PACKAGE_NODEJS_NPM
+	bool "NPM for the target"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  NPM is the package manager for the Node JavaScript platform.
+	  Note that enabling NPM on the target also selects OpenSSL for the
+	  target.
+
+	  http://www.npmjs.org
+
+	  Note that NPM is always built for the buildroot host.
+
+config BR2_PACKAGE_NODEJS_MODULES_EXPRESS
+	bool "Express web application framework"
+	help
+	  Express is a minimal and flexible node.js web application
+	  framework, providing a robust set of features for building
+	  single and multi-page, and hybrid web applications.
+
+	  http://www.expressjs.com
+	  https://github.com/visionmedia/express
+
+config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT
+	bool "CoffeeScript"
+	help
+	  CoffeeScript is a little language that compiles into JavaScript.
+
+	  http://www.coffeescript.org
+
+config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL
+	string "Additional modules"
+	help
+	  List of space-separated nodejs modules to install via npm.
+	  See https://npmjs.org/ to find modules and 'npm help install'
+	  for available installation methods.  For repeatable builds,
+	  download and save tgz files or clone git repos for the
+	  components you care about.
+
+	  Example: serialport uglify-js@1.3.4 /my/module/mymodule.tgz git://github.com/someuser/somemodule.git#v1.2
+
+	  This would install the serialport module (at the newest version),
+	  the uglify-js module at 1.3.4, a module from a filesystem path,
+	  and a module from a git repository.
+
+config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS
+	string "Additional module dependencies"
+	help
+	  List of space-separated buildroot recipes which must be built before
+	  your npms can be installed.  For example, if in 'Additional modules'
+	  you specified 'node-curl' (see:
+	  https://github.com/jiangmiao/node-curl), you could then specify
+	  'libcurl' here, to ensure that buildroot builds the libcurl package,
+	  and does so before building your node modules.
+
+endmenu
+
+endif
diff --git a/package/nodejs/nodejs-remove-python-bz2-dependency.patch b/package/nodejs/nodejs-remove-python-bz2-dependency.patch
new file mode 100644
index 0000000000..75fe437502
--- /dev/null
+++ b/package/nodejs/nodejs-remove-python-bz2-dependency.patch
@@ -0,0 +1,27 @@
+Remove dependency on Python bz2 module
+
+The Python bz2 module is only needed in certain cases, so only import
+it when needed. In the normal nodejs build, this allows to remove the
+dependency on this module.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Index: b/deps/v8/tools/js2c.py
+===================================================================
+--- a/deps/v8/tools/js2c.py
++++ b/deps/v8/tools/js2c.py
+@@ -33,7 +33,6 @@
+ 
+ import os, re, sys, string
+ import jsmin
+-import bz2
+ 
+ 
+ def ToCAsciiArray(lines):
+@@ -344,6 +343,7 @@
+   else:
+     raw_sources_declaration = RAW_SOURCES_COMPRESSION_DECLARATION
+     if env['COMPRESSION'] == 'bz2':
++      import bz2
+       all_sources = bz2.compress("".join(all_sources))
+     total_length = len(all_sources)
+     sources_data = ToCArray(all_sources)
diff --git a/package/nodejs/nodejs-v8-gregs-fix.patch b/package/nodejs/nodejs-v8-gregs-fix.patch
new file mode 100644
index 0000000000..4af33bc428
--- /dev/null
+++ b/package/nodejs/nodejs-v8-gregs-fix.patch
@@ -0,0 +1,29 @@
+Fix compilation for ARM/uClibc
+Patch from Remi Duraffort <remi.duraffort@st.com>, taken from
+https://code.google.com/p/v8/source/detail?r=12094
+
+Signed-off-by: Daniel Price <daniel.price@gmail.com>
+
+--- a/deps/v8/src/platform-linux.cc
++++ b/deps/v8/src/platform-linux.cc
+@@ -1025,7 +1025,8 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
+   sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]);
+ #elif V8_HOST_ARCH_ARM
+ // An undefined macro evaluates to 0, so this applies to Android's Bionic also.
+-#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
++#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \
++     !defined(__UCLIBC__))
+   sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]);
+   sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]);
+   sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]);
+@@ -1033,7 +1034,8 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
+   sample->pc = reinterpret_cast<Address>(mcontext.arm_pc);
+   sample->sp = reinterpret_cast<Address>(mcontext.arm_sp);
+   sample->fp = reinterpret_cast<Address>(mcontext.arm_fp);
+-#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
++#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) &&
++        //  !defined(__UCLIBC__))
+ #elif V8_HOST_ARCH_MIPS
+   sample->pc = reinterpret_cast<Address>(mcontext.pc);
+   sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]);
+
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
new file mode 100644
index 0000000000..a77709d4f2
--- /dev/null
+++ b/package/nodejs/nodejs.mk
@@ -0,0 +1,114 @@
+#############################################################
+#
+# nodejs
+#
+#############################################################
+
+NODEJS_VERSION = 0.8.22
+NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz
+NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
+NODEJS_DEPENDENCIES = host-python host-nodejs \
+    $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
+HOST_NODEJS_DEPENDENCIES = host-python
+NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
+NODEJS_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	NODEJS_DEPENDENCIES += openssl
+endif
+
+define HOST_NODEJS_CONFIGURE_CMDS
+	# Build with the static, built-in OpenSSL which is supplied as part of
+	# the nodejs source distribution.  This is needed on the host because
+	# NPM is non-functional without it, and host-openssl isn't part of
+	# buildroot.
+	(cd $(@D); \
+                ./configure \
+		--prefix=$(HOST_DIR)/usr \
+		--without-snapshot \
+		--without-dtrace \
+		--without-etw \
+	)
+endef
+
+define HOST_NODEJS_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_NODEJS_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_i386),y)
+NODEJS_CPU=ia32
+else ifeq ($(BR2_x86_64),y)
+NODEJS_CPU=x64
+else ifeq ($(BR2_arm),y)
+NODEJS_CPU=arm
+# V8 needs to know what floating point ABI the target is using.  There's also
+# a 'hard' option which we're not exposing here at the moment, because
+# buildroot itself doesn't really support it at present.
+ifeq ($(BR2_SOFT_FLOAT),y)
+NODEJS_ARM_FP=soft
+else
+NODEJS_ARM_FP=softfp
+endif
+endif
+
+define NODEJS_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		LD="$(TARGET_CXX)" \
+		./configure \
+		--prefix=/usr \
+		--without-snapshot \
+		$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
+		$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
+		--without-dtrace \
+		--without-etw \
+		--dest-cpu=$(NODEJS_CPU) \
+		$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \
+		--dest-os=linux \
+	)
+endef
+
+define NODEJS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+#
+# Build the list of modules to install based on the booleans for
+# popular modules, as well as the "additional modules" list.
+#
+NODEJS_MODULES_LIST= $(call qstrip,\
+	$(if $(BR2_PACKAGE_NODEJS_MODULES_EXPRESS),express) \
+	$(if $(BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT),coffee-script) \
+	$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))
+
+#
+# We can only call NPM if there's something to install.
+#
+ifneq ($(NODEJS_MODULES_LIST),)
+define NODEJS_INSTALL_MODULES
+	# If you're having trouble with module installation, adding -d to the
+	# npm install call below and setting npm_config_rollback=false can both
+	# help in diagnosing the problem.
+	(cd $(TARGET_DIR)/usr/lib && mkdir -p node_modules && \
+		$(TARGET_CONFIGURE_OPTS) \
+		LD="$(TARGET_CXX)" \
+		npm_config_arch=$(NODEJS_CPU) \
+		npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \
+		$(HOST_DIR)/usr/bin/npm install \
+		$(NODEJS_MODULES_LIST) \
+	)
+endef
+endif
+
+define NODEJS_INSTALL_TARGET_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	$(NODEJS_INSTALL_MODULES)
+endef
+
+# node.js configure is a Python script and does not use autotools
+$(eval $(generic-package))
+$(eval $(host-generic-package))

From ffa779564e6367a2133f0a3e7bd5bd070287dbbb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 Mar 2013 22:36:17 +0000
Subject: [PATCH 4409/6849] urg: fix license

The urg.mk file mentions a LGPLv3+ license. However, none of the
source code in the urg package carries a copyright notice that
indicates the "v3 or later". The only license information we have is
the COPYING file, that contains the text of the LGPLv3
license. Therefore, we should probably assume that the code is under
LGPLv3 only.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/urg/urg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index 3f68bf2bb6..b544ece8ea 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -7,7 +7,7 @@
 URG_VERSION = 0.8.18
 URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
 URG_SOURCE = urg-$(URG_VERSION).zip
-URG_LICENSE = LGPLv3+
+URG_LICENSE = LGPLv3
 URG_LICENSE_FILES = COPYING
 
 URG_INSTALL_STAGING = YES

From e7d8d855f0ab28d6cd608b7204a9e13a18b15092 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 Mar 2013 22:36:18 +0000
Subject: [PATCH 4410/6849] urg: handle config scripts properly

urg installs two <foo>-config scripts, so the ones installed in
$(STAGING_DIR) should be fixed up, and the ones installed in
$(TARGET_DIR) should be removed. Use the <pkg>_CONFIG_SCRIPTS
infrastructure to do this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/urg/urg.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index b544ece8ea..99f63a9cd0 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -17,6 +17,8 @@ URG_DEPENDENCIES = sdl sdl_net
 URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
 
+URG_CONFIG_SCRIPTS = c_urg-config urg-config
+
 define URG_EXTRACT_CMDS
 	$(RM) -rf $(URG_DIR)
 	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)

From 95da46dfd6536a13768ef029a97c14de6805a947 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 Mar 2013 22:36:19 +0000
Subject: [PATCH 4411/6849] sdl: use <pkg>_CONFIG_SCRIPTS for sdl-config

Use the <pkg>_CONFIG_SCRIPTS mechanism to handle the sdl-config
script, so that it properly gets removed from the target. However, we
can't completely remove the manual fixup, because it also takes care
of removing the -Wl,-rpath option, which the general
<pkg>_CONFIG_SCRIPTS doesn't do.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 4786dc5d75..fb47c4d19e 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -57,13 +57,10 @@ SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-nasm \
 		--disable-video-ps3
 
-# Fixup prefix= and exec_prefix= in sdl-config, and remove the
-# -Wl,-rpath option.
+SDL_CONFIG_SCRIPTS = sdl-config
+
+# Remove the -Wl,-rpath option.
 define SDL_FIXUP_SDL_CONFIG
-	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/sdl-config
-	$(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/sdl-config
 	$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
 		$(STAGING_DIR)/usr/bin/sdl-config
 endef

From f7f28c09767200dbf04cd1c87861370085188188 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 17 Mar 2013 23:42:05 +0000
Subject: [PATCH 4412/6849] zeromq: require IPv6 support in toolchain

The zeromq package was recently bumped from version 2.2.0 to version 3.2.2,
which has introduced a requirement for IPv6 support in the toolchain. At
present, IPv6 support is mandatory in zeromq: there is no configuration option
to enable/disable the feature.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index b7dc8a6338..f93ab5d893 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -1,9 +1,10 @@
-comment "zeromq requires a toolchain with C++, LARGEFILE + WCHAR support"
-	depends on !(BR2_INSTALL_LIBSTDCPP &&  BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "zeromq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_ZEROMQ
 	bool "zeromq"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 	select BR2_PACKAGE_UTIL_LINUX

From 8e7b4ae8d27f612684ce7e82b4d7c53b01c91567 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 18 Mar 2013 05:18:09 +0000
Subject: [PATCH 4413/6849] Mark AArch64 as a 64 bits architecture

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/Config.in b/arch/Config.in
index 472b10c7b2..795f24f467 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -25,6 +25,7 @@ config BR2_armeb
 
 config BR2_aarch64
 	bool "AArch64"
+	select BR2_ARCH_IS_64
 	help
 	  Aarch64 is a 64-bit architecture developed by ARM Holdings.
 	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php

From 901282aa6e330c5e61ab25a83ba68e443cb3aec2 Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Sat, 16 Mar 2013 02:42:22 +0000
Subject: [PATCH 4414/6849] Added lcms2 package

Little CMS intends to be an OPEN SOURCE small-footprint color management
engine, with special focus on accuracy and performance.

[Peter: tweak help text, fix white space]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/lcms2/Config.in | 10 ++++++++++
 package/lcms2/lcms2.mk  | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/lcms2/Config.in
 create mode 100644 package/lcms2/lcms2.mk

diff --git a/package/Config.in b/package/Config.in
index 9853b06628..10ce824708 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -422,6 +422,7 @@ source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
 source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
+source "package/lcms2/Config.in"
 source "package/libart/Config.in"
 source "package/libdmtx/Config.in"
 source "package/libdrm/Config.in"
diff --git a/package/lcms2/Config.in b/package/lcms2/Config.in
new file mode 100644
index 0000000000..d94c075e1e
--- /dev/null
+++ b/package/lcms2/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LCMS2
+	bool "lcms2"
+	help
+	  Little Color Management Software (CMS) intends to be an OPEN
+	  SOURCE small-footprint color management engine, with special
+	  focus on accuracy and performance.
+	  It uses the International Color Consortium standard (ICC), which is
+	  the modern standard when regarding to color management.
+
+	  http://www.littlecms.com/
diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk
new file mode 100644
index 0000000000..0d222c0105
--- /dev/null
+++ b/package/lcms2/lcms2.mk
@@ -0,0 +1,35 @@
+#############################################################
+#
+# lcms2
+#
+#############################################################
+
+LCMS2_VERSION = 2.4
+LCMS2_SITE = http://downloads.sourceforge.net/lcms/lcms
+LCMS2_LICENSE = MIT
+LCMS2_LICENSE_FILES = COPYING
+
+LCMS2_CONF_OPT = \
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+	LCMS2_CONF_OPT += --with-jpeg
+	LCMS2_DEPENDENCIES += jpeg
+else
+	LCMS2_CONF_OPT += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+	LCMS2_CONF_OPT += --with-tiff
+	LCMS2_DEPENDENCIES += tiff
+else
+	LCMS2_CONF_OPT += --without-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+	LCMS2_CONF_OPT += --with-zlib
+	LCMS2_DEPENDENCIES += zlib
+else
+	LCMS2_CONF_OPT += --without-zlib
+endif
+
+$(eval $(autotools-package))

From 0a2a3c9cd6a873a0ca190c9f20e9a42a9d1df58a Mon Sep 17 00:00:00 2001
From: Henrique Camargo <henrique@henriquecamargo.com>
Date: Mon, 18 Feb 2013 11:29:03 +0000
Subject: [PATCH 4415/6849] json-glib: new package

JSON-GLib is a library providing serialization and deserialization
support for the JavaScript Object Notation (JSON) format described by
RFC 4627.

https://live.gnome.org/JsonGlib/

[Peter: add license info, tweak help text]
Signed-off-by: Henrique Camargo <henrique@henriquecamargo.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/json-glib/Config.in    | 14 ++++++++++++++
 package/json-glib/json-glib.mk | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/json-glib/Config.in
 create mode 100644 package/json-glib/json-glib.mk

diff --git a/package/Config.in b/package/Config.in
index 10ce824708..167eb5b034 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -597,6 +597,7 @@ source "package/cjson/Config.in"
 source "package/expat/Config.in"
 source "package/ezxml/Config.in"
 source "package/json-c/Config.in"
+source "package/json-glib/Config.in"
 source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
diff --git a/package/json-glib/Config.in b/package/json-glib/Config.in
new file mode 100644
index 0000000000..3ebc76db27
--- /dev/null
+++ b/package/json-glib/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_JSON_GLIB
+	bool "json-glib"
+	depends on BR2_USE_WCHAR # glib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	help
+	  JSON-GLib is a library providing serialization and
+	  deserialization support for the JavaScript Object Notation
+	  (JSON) format described by RFC 4627.
+
+	  https://live.gnome.org/JsonGlib/
+
+comment "json-glib requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk
new file mode 100644
index 0000000000..4e3f987bc3
--- /dev/null
+++ b/package/json-glib/json-glib.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# json-glib
+#
+#############################################################
+
+JSON_GLIB_MAJOR_VERSION = 0.14
+JSON_GLIB_MINOR_VERSION = 2
+JSON_GLIB_VERSION = $(JSON_GLIB_MAJOR_VERSION).$(JSON_GLIB_MINOR_VERSION)
+JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_MAJOR_VERSION)
+JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz
+JSON_GLIB_LICENSE = LGPLv2.1+
+JSON_GLIB_LICENSE_FILES = COPYING
+JSON_GLIB_INSTALL_STAGING = YES
+
+JSON_GLIB_DEPENDENCIES = \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	host-pkgconf \
+	libglib2
+
+$(eval $(autotools-package))

From bb83d5b074738352a1f1ba2f26afead6de6bbd4a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 16 Mar 2013 11:07:13 +0000
Subject: [PATCH 4416/6849] gpsd: add upstream patches

Add a couple of patches submitted by Mike Frysinger to gpsd upstream. One of
these patches (that for the gpsd/dbus interface) fixes autobuild failures
such as the following.

  http://autobuild.buildroot.net/results/41ccc838c5d44ab237a7195767940585bbb8b1f6

Note that neither of these patches has yet been accepted upstream.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/gpsd-03-upstream-dbus.patch | 31 ++++++++++++++++++++++++
 package/gpsd/gpsd-04-upstream-udev.patch | 31 ++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 package/gpsd/gpsd-03-upstream-dbus.patch
 create mode 100644 package/gpsd/gpsd-04-upstream-udev.patch

diff --git a/package/gpsd/gpsd-03-upstream-dbus.patch b/package/gpsd/gpsd-03-upstream-dbus.patch
new file mode 100644
index 0000000000..2345484c5f
--- /dev/null
+++ b/package/gpsd/gpsd-03-upstream-dbus.patch
@@ -0,0 +1,31 @@
+The current libgps.a logic doesn't pass down pkg-config output from
+dbus and such which breaks building when compiling:
+
+gcc -o libgps_dbus.o -c -D_GNU_SOURCE -Wextra -Wall -Wno-uninitialized \
+	-Wno-missing-field-initializers -Wcast-align -Wmissing-declarations \
+	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type \
+	-O2 libgps_dbus.c
+libgps_dbus.c:26:23: fatal error: dbus/dbus.h: No such file or directory
+compilation terminated.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+---
+ SConstruct | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index e5d1f54..a56fa9b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -886,7 +886,9 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs + caplibs
+ #          linking
+ # The final executable will build but not be portable.
+ 
+-env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
++env.StaticLibrary(target='libgps.a',
++                  source=libgps_sources,
++                  parse_flags=dbus_libs + rtlibs)
+ 
+ # Source groups
+ 
diff --git a/package/gpsd/gpsd-04-upstream-udev.patch b/package/gpsd/gpsd-04-upstream-udev.patch
new file mode 100644
index 0000000000..6de058d9cb
--- /dev/null
+++ b/package/gpsd/gpsd-04-upstream-udev.patch
@@ -0,0 +1,31 @@
+Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR
+logic when upgrading the udev path handling.
+
+It also slightly broke the mkdir setup by not creating the rules.d
+subdir under the udev path.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+---
+ SConstruct | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index a56fa9b..1c187f3 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1662,10 +1662,10 @@ if env['python']:
+ # is plugged in.
+ 
+ Utility('udev-install', 'install', [
+-    'mkdir -p ' + env['udevdir'],
+-    'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
+-    'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
+-    'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
++    'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
++    'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
++    'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++    'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
+         ])
+ 
+ Utility('udev-uninstall', '', [

From f5fca1330ce572bcfcc3d783b34ba1517b9b41b6 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 12 Mar 2013 08:10:54 +0000
Subject: [PATCH 4417/6849] libpfm4: new package

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libpfm4/Config.in  |  7 +++++++
 package/libpfm4/libpfm4.mk | 28 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/libpfm4/Config.in
 create mode 100644 package/libpfm4/libpfm4.mk

diff --git a/package/Config.in b/package/Config.in
index 167eb5b034..777e06b60d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -561,6 +561,7 @@ source "package/gsl/Config.in"
 source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
+source "package/libpfm4/Config.in"
 source "package/libsigc/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
diff --git a/package/libpfm4/Config.in b/package/libpfm4/Config.in
new file mode 100644
index 0000000000..6b491a4054
--- /dev/null
+++ b/package/libpfm4/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBPFM4
+	bool "libpfm4"
+	help
+	  A helper library to help encode Performance Events to use with
+	  Operating system kernels performance monitoring interfaces.
+
+	  http://perfmon2.sourceforge.net/
diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk
new file mode 100644
index 0000000000..8689bbe9ea
--- /dev/null
+++ b/package/libpfm4/libpfm4.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# libpfm4
+#
+#############################################################
+
+LIBPFM4_VERSION = 4.3.0
+LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz
+LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4
+LIBPFM4_LICENSE = libpfm4 license
+LIBPFM4_LICENSE_FILES = COPYING
+LIBPFM4_INSTALL_STAGING = YES
+
+LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" LDCONFIG=true
+
+define LIBPFM4_BUILD_CMDS
+	$(MAKE) -C $(@D) $(LIBPFM4_FLAGS)
+endef
+
+define LIBPFM4_INSTALL_STAGING_CMDS
+	make -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(STAGING_DIR)/usr install
+endef
+
+define LIBPFM4_INSTALL_TARGET_CMDS
+	make -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(TARGET_DIR)/usr install
+endef
+
+$(eval $(generic-package))

From 145794b56fd0b5df0d6e2ff12c23ad859f40e4a8 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 12 Mar 2013 19:10:55 +0100
Subject: [PATCH 4418/6849] oprofile: upstep 0.9.7 patches to 0.9.8

The patches to oprofile 0.9.7 seem still relevant for 0.9.8, but for some
reason they were not upstepped.

[Peter: drop version number from patch filenames]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ookie.patch => oprofile-001-avr32-enable-lookup_dcookie.patch} | 0
 ...no-query-modules.patch => oprofile-002-no-query-modules.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/oprofile/{oprofile-0.9.7-001-avr32-enable-lookup_dcookie.patch => oprofile-001-avr32-enable-lookup_dcookie.patch} (100%)
 rename package/oprofile/{oprofile-0.9.7-002-no-query-modules.patch => oprofile-002-no-query-modules.patch} (100%)

diff --git a/package/oprofile/oprofile-0.9.7-001-avr32-enable-lookup_dcookie.patch b/package/oprofile/oprofile-001-avr32-enable-lookup_dcookie.patch
similarity index 100%
rename from package/oprofile/oprofile-0.9.7-001-avr32-enable-lookup_dcookie.patch
rename to package/oprofile/oprofile-001-avr32-enable-lookup_dcookie.patch
diff --git a/package/oprofile/oprofile-0.9.7-002-no-query-modules.patch b/package/oprofile/oprofile-002-no-query-modules.patch
similarity index 100%
rename from package/oprofile/oprofile-0.9.7-002-no-query-modules.patch
rename to package/oprofile/oprofile-002-no-query-modules.patch

From 96879b87a90d8c1e4de3c399a9e8df6dc4537180 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Thu, 21 Feb 2013 04:58:43 +0000
Subject: [PATCH 4419/6849] Install libfribidi to staging

Install libfribi to staging to be able to link against it.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfribidi/libfribidi.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk
index 538997c7c2..45568ca493 100644
--- a/package/libfribidi/libfribidi.mk
+++ b/package/libfribidi/libfribidi.mk
@@ -9,5 +9,6 @@ LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2
 LIBFRIBIDI_SITE = http://www.fribidi.org/download/
 LIBFRIBIDI_LICENSE = LGPLv2.1+
 LIBFRIBIDI_LICENSE_FILES = COPYING
+LIBFRIBIDI_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 80a902c407462dbd2d239ded97c2cdf66fae4a51 Mon Sep 17 00:00:00 2001
From: Daniel Price <daniel.price@gmail.com>
Date: Mon, 11 Mar 2013 15:47:11 +0000
Subject: [PATCH 4420/6849] new package: redis

[Peter: fix white space, drop _SOURCE]
Signed-off-by: Daniel Price <daniel.price@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/redis/Config.in              | 14 +++++++++
 package/redis/redis-001-uclibc.patch | 45 ++++++++++++++++++++++++++++
 package/redis/redis-002-lua-AR.patch | 32 ++++++++++++++++++++
 package/redis/redis.mk               | 27 +++++++++++++++++
 5 files changed, 119 insertions(+)
 create mode 100644 package/redis/Config.in
 create mode 100644 package/redis/redis-001-uclibc.patch
 create mode 100644 package/redis/redis-002-lua-AR.patch
 create mode 100644 package/redis/redis.mk

diff --git a/package/Config.in b/package/Config.in
index 777e06b60d..fec5020618 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -397,6 +397,7 @@ menu "Database"
 source "package/berkeleydb/Config.in"
 source "package/gdbm/Config.in"
 source "package/mysql_client/Config.in"
+source "package/redis/Config.in"
 source "package/sqlcipher/Config.in"
 source "package/sqlite/Config.in"
 endmenu
diff --git a/package/redis/Config.in b/package/redis/Config.in
new file mode 100644
index 0000000000..a1d810145b
--- /dev/null
+++ b/package/redis/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_REDIS
+	bool "redis"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_LARGEFILE
+	help
+	  Redis is an open source, advanced key-value store. It is
+	  often referred to as a data structure server since keys can
+	  contain strings, hashes, lists, sets and sorted sets.
+
+	  http://www.redis.io
+
+comment "redis needs a toolchain with LARGEFILE and thread support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch
new file mode 100644
index 0000000000..d7fd9c3c56
--- /dev/null
+++ b/package/redis/redis-001-uclibc.patch
@@ -0,0 +1,45 @@
+redis-001-uclibc.patch: This patch fixes redis so that it can be compiled
+against uclibc.  Patch originates from:
+
+  Support cross-compiling for uClibc targets
+  https://github.com/antirez/redis/pull/537
+  Mike Steinert, mike.steinert@gmail.com
+
+Signed-off-by: Daniel Price <daniel.price@gmail.com>
+
+=========================================================================
+diff -ur old/src/config.h new/src/config.h
+--- old/src/config.h	2012-10-26 07:20:24.000000000 -0700
++++ new/src/config.h	2012-10-31 13:41:51.206309564 -0700
+@@ -1,6 +1,10 @@
+ #ifndef __CONFIG_H
+ #define __CONFIG_H
+ 
++#ifdef __unix
++#include <features.h>
++#endif
++
+ #ifdef __APPLE__
+ #include <AvailabilityMacros.h>
+ #endif
+@@ -25,7 +29,7 @@
+ #endif
+ 
+ /* Test for backtrace() */
+-#if defined(__APPLE__) || defined(__linux__)
++#if (defined(__APPLE__) || defined(__linux__) && !defined(__UCLIBC__))
+ #define HAVE_BACKTRACE 1
+ #endif
+ 
+diff -ur old/src/Makefile new/src/Makefile
+--- old/src/Makefile	2012-10-26 07:20:24.000000000 -0700
++++ new/src/Makefile	2012-10-31 13:40:39.224728830 -0700
+@@ -135,7 +135,7 @@
+ 	echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
+ 	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
+ 	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
+-	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
++	-(cd ../deps && $(MAKE) CC=$(CC) $(DEPENDENCY_TARGETS))
+ 
+ .PHONY: persist-settings
+ 
diff --git a/package/redis/redis-002-lua-AR.patch b/package/redis/redis-002-lua-AR.patch
new file mode 100644
index 0000000000..68ee70c568
--- /dev/null
+++ b/package/redis/redis-002-lua-AR.patch
@@ -0,0 +1,32 @@
+
+redis-002-lua-AR.patch: Improve redis Makefiles to handle Lua's unusual
+definition of AR.  Patch originates from:
+
+  Define AR to help with lua cross-compilation
+  https://github.com/antirez/redis/pull/997
+  Daniel Price, daniel.price@gmail.com
+
+Signed-off-by: Daniel Price <daniel.price@gmail.com>
+
+=========================================================================
+diff --git a/deps/Makefile b/deps/Makefile
+index d58ee56..c9d7116 100644
+--- a/deps/Makefile
++++ b/deps/Makefile
+@@ -60,10 +60,15 @@ endif
+ 
+ LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
+ LUA_LDFLAGS+= $(LDFLAGS)
++# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
++# challenging to cross-compile lua (and redis).  These defines make it easier
++# to fit redis into cross-compilation environments, which typically set AR.
++AR = ar
++ARFLAGS = rcu
+ 
+ lua: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
++	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+ 
+ .PHONY: lua
+ 
diff --git a/package/redis/redis.mk b/package/redis/redis.mk
new file mode 100644
index 0000000000..fc7d23fec0
--- /dev/null
+++ b/package/redis/redis.mk
@@ -0,0 +1,27 @@
+#############################################################
+#
+# redis
+#
+#############################################################
+
+REDIS_VERSION = 2.6.11
+REDIS_SITE = http://redis.googlecode.com/files
+REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components)
+REDIS_LICENSE_FILES = COPYING
+
+# Redis doesn't support DESTDIR (yet, see
+# https://github.com/antirez/redis/pull/609).  We set PREFIX
+# instead.
+REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \
+    PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
+
+define REDIS_BUILD_CMDS
+        $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D)
+endef
+
+define REDIS_INSTALL_TARGET_CMDS
+        $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) \
+	    LDCONFIG=true install
+endef
+
+$(eval $(generic-package))

From 28bb03ac9d6c8cb73dc01451efcc02c8b87b0456 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 11 Mar 2013 15:58:31 +0000
Subject: [PATCH 4421/6849] pkg-autotools.mk: remove extra space from
 config-update message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If you do a "make -s", you will notice that the UPDATE_CONFIG_HOOK message
has an extra space compared to other highlighted messages.  For example:

>>> util-linux 2.20.1  Updating config.sub and config.guess
>>> util-linux 2.20.1 Patching libtool
>>> util-linux 2.20.1 Autoreconfiguring

A grep shows this is the only instance of the extra space. This patch
removes the extra space.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-autotools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 890506bbc2..995c68596b 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -145,7 +145,7 @@ endif
 # Hook to update config.sub and config.guess if needed
 #
 define UPDATE_CONFIG_HOOK
-       @$$(call MESSAGE, "Updating config.sub and config.guess")
+       @$$(call MESSAGE,"Updating config.sub and config.guess")
        $$(call CONFIG_UPDATE,$$(@D))
 endef
 

From 4123d76e76e26ab8af351b8f9af5fa8eb38bae2a Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@lacie.com>
Date: Mon, 11 Mar 2013 06:19:37 +0000
Subject: [PATCH 4422/6849] host util-linux: disable login and su since they
 depend on PAM

This fixes the following errors when building util-linux v2.22.2 for
the host in case the PAM headers are missing:

  configure: error: login selected, but required PAM header file not available
  configure: error: su selected, but required PAM header file not available

Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/util-linux/util-linux.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 5e8820604e..b562206488 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -79,11 +79,12 @@ UTIL_LINUX_CONF_OPT += \
 # and none of the util-linux utilities, so we disable all of them.
 HOST_UTIL_LINUX_CONF_OPT += \
 	--enable-libuuid \
-	--disable-mount --disable-fsck --disable-libmount \
-	--disable-uuidd --disable-libblkid --disable-agetty \
-	--disable-cramfs --disable-switch_root --disable-pivot_root \
-	--disable-fallocate --disable-unshare --disable-rename \
-	--disable-schedutils --disable-wall --disable-partx
+	--disable-agetty --disable-cramfs --disable-fallocate \
+	--disable-fsck --disable-libblkid --disable-libmount \
+	--disable-login --disable-mount --disable-partx \
+	--disable-pivot_root --disable-rename --disable-schedutils \
+	--disable-su --disable-switch_root --disable-unshare \
+	--disable-uuidd --disable-wall
 
 # Avoid building the tools if they are disabled since we can't install on
 # a per-directory basis.

From 59d1fe58fac77ae6d4e574719b48475c8030ed07 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Mar 2013 08:19:40 +0000
Subject: [PATCH 4423/6849] package/e2fsprogs: add host-package selection

Add the e2fsprogs as a host-package selection in the menuconfig.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host           | 1 +
 package/e2fsprogs/Config.in.host | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 package/e2fsprogs/Config.in.host

diff --git a/package/Config.in.host b/package/Config.in.host
index 79050f25d9..8813f5b7a5 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,6 +1,7 @@
 menu "Host utilities"
 
 source "package/dfu-util/Config.in.host"
+source "package/e2fsprogs/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
diff --git a/package/e2fsprogs/Config.in.host b/package/e2fsprogs/Config.in.host
new file mode 100644
index 0000000000..ea6a0bdc82
--- /dev/null
+++ b/package/e2fsprogs/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_E2FSPROGS
+	bool "host e2fsprogs"
+	help
+	  The EXT2 file system utilities.
+	  
+	  http://e2fsprogs.sf.net

From 24c2535f52550095a863a65e48bbf423b09fbed0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Mar 2013 08:19:41 +0000
Subject: [PATCH 4424/6849] package/dosfstools: add host-package selection

Add dosfstools as a host-package selection in the menuconfig.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host            | 1 +
 package/dosfstools/Config.in.host | 6 ++++++
 package/dosfstools/dosfstools.mk  | 9 +++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 package/dosfstools/Config.in.host

diff --git a/package/Config.in.host b/package/Config.in.host
index 8813f5b7a5..43f292c174 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,6 +1,7 @@
 menu "Host utilities"
 
 source "package/dfu-util/Config.in.host"
+source "package/dosfstools/Config.in.host"
 source "package/e2fsprogs/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
diff --git a/package/dosfstools/Config.in.host b/package/dosfstools/Config.in.host
new file mode 100644
index 0000000000..9f9ceabbe6
--- /dev/null
+++ b/package/dosfstools/Config.in.host
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_DOSFSTOOLS
+	bool "host dosfstools"
+	help
+	  Tools for creating and checking DOS FAT filesystems.
+	  
+	  http://www.daniel-baumann.ch/software/dosfstools/
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 3a0856ab4b..332f2eef35 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -43,4 +43,13 @@ define DOSFSTOOLS_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
+define HOST_DOSFSTOOLS_BUILD_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define HOST_DOSFSTOOLS_INSTALL_CMDS
+	$(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr install
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))

From 3007e5894972f27e318adc8c8b1c3a618d5188e3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Mar 2013 08:19:42 +0000
Subject: [PATCH 4425/6849] package/libconfuse: add host variant

Needed later by genimage.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfuse/libconfuse.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index 2fa824150a..d88a2096e7 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -10,3 +10,4 @@ LIBCONFUSE_INSTALL_STAGING = YES
 LIBCONFUSE_CONF_OPT = --disable-rpath
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

From 1520628df1b1ff4c65033f4789841ce38c367217 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Mar 2013 08:19:43 +0000
Subject: [PATCH 4426/6849] package/genimage: new host-only package

[Peter: wrap help text]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host          |  1 +
 package/genimage/Config.in.host | 13 +++++++++++++
 package/genimage/genimage.mk    | 13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/genimage/Config.in.host
 create mode 100644 package/genimage/genimage.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index 43f292c174..c456d5dd78 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -3,6 +3,7 @@ menu "Host utilities"
 source "package/dfu-util/Config.in.host"
 source "package/dosfstools/Config.in.host"
 source "package/e2fsprogs/Config.in.host"
+source "package/genimage/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
diff --git a/package/genimage/Config.in.host b/package/genimage/Config.in.host
new file mode 100644
index 0000000000..697dcdadf3
--- /dev/null
+++ b/package/genimage/Config.in.host
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_HOST_GENIMAGE
+	bool "host genimage"
+	help
+	  genimage is a tool to generate multiple filesystem and flash
+	  images from a given root filesystem tree. genimage is
+	  intended to be run in a fakeroot environment.
+	  
+	  Configuration is done is a config file parsed by
+	  libconfuse. Options like the path to tools can be given in
+	  environment variables, the config file or commandline
+	  switches.
+	  
+	  http://www.pengutronix.de/software/genimage/
diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
new file mode 100644
index 0000000000..6ed44a4c65
--- /dev/null
+++ b/package/genimage/genimage.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# genimage
+#
+##############################################################
+
+GENIMAGE_VERSION        = 4
+GENIMAGE_SOURCE         = genimage-$(GENIMAGE_VERSION).tar.xz
+GENIMAGE_SITE           = http://www.pengutronix.de/software/genimage/download/
+GENIMAGE_DEPENDENCIES   = libconfuse
+GENIMAGE_LICENSE        = GPLv2
+
+$(eval $(host-autotools-package))

From dfa976593e6e8cc0b6b2549c758ca084b768f5d8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Mar 2013 08:19:44 +0000
Subject: [PATCH 4427/6849] package/genpart: new host-only package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host                        |  1 +
 package/genpart/Config.in.host                |  8 ++++++
 package/genpart/genpart-fix-return-code.patch | 25 +++++++++++++++++++
 package/genpart/genpart.mk                    | 18 +++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 package/genpart/Config.in.host
 create mode 100644 package/genpart/genpart-fix-return-code.patch
 create mode 100644 package/genpart/genpart.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index c456d5dd78..e97f6e8474 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -4,6 +4,7 @@ source "package/dfu-util/Config.in.host"
 source "package/dosfstools/Config.in.host"
 source "package/e2fsprogs/Config.in.host"
 source "package/genimage/Config.in.host"
+source "package/genpart/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
diff --git a/package/genpart/Config.in.host b/package/genpart/Config.in.host
new file mode 100644
index 0000000000..f986504815
--- /dev/null
+++ b/package/genpart/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_GENPART
+	bool "host genpart"
+	help
+	  Generate a 16 byte partition table entry defined by command line
+	  arguments and dump it to stdout. No CHS magic is done, only lba
+	  entries are filled out.
+	  
+	  http://www.pengutronix.de/software/genpart/index_en.html
diff --git a/package/genpart/genpart-fix-return-code.patch b/package/genpart/genpart-fix-return-code.patch
new file mode 100644
index 0000000000..ec18c82f8c
--- /dev/null
+++ b/package/genpart/genpart-fix-return-code.patch
@@ -0,0 +1,25 @@
+genpart: return 0 if partition writen OK, with no do_magic
+
+If do_magic is false, we don't won't write the 0xaa55 magic.
+However, if we succesfully wrote the partition entry, we still
+want to return 0 to indicate success.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Cc: Robert Schwebel <r.schwebel@pengutronix.de>
+
+--
+Patch sent upstream, but no mailing list.
+Status: accepted upstream, not yet released.
+
+diff -durN host-genpart-1.0.2.orig/src/genpart.c host-genpart-1.0.2/src/genpart.c
+--- host-genpart-1.0.2.orig/src/genpart.c	2009-12-20 21:54:56.000000000 +0100
++++ host-genpart-1.0.2/src/genpart.c	2013-01-22 23:13:24.109752579 +0100
+@@ -92,6 +92,8 @@
+ 		if (do_magic) {
+ 			if (fwrite(&magic, 2, 1, stdout) > 0)
+ 				rc=0;
++		} else {
++			rc=0;
+ 		}
+ 	}
+ 	return rc;
diff --git a/package/genpart/genpart.mk b/package/genpart/genpart.mk
new file mode 100644
index 0000000000..7757ae484a
--- /dev/null
+++ b/package/genpart/genpart.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# genpart
+#
+#############################################################
+
+GENPART_VERSION       = 1.0.2
+GENPART_SOURCE        = genpart-$(GENPART_VERSION).tar.bz2
+GENPART_SITE          = http://www.pengutronix.de/software/genpart/download/
+# genpart has no license embedded in its source release.
+# However, their project page mentions:
+#   > This community portal offers an overview about our own OSS
+#   > projects and projects Pengutronix is or was involved with.
+# We can thus assume genpart is under a FLOSS license.
+# So, until the authors have clarified the licensing terms:
+GENPART_LICENSE       = Unknown (clarification has been asked to the authors)
+
+$(eval $(host-autotools-package))

From ae2cd54a2706082c6056017790da01ab5139419d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 17 Mar 2013 08:19:45 +0000
Subject: [PATCH 4428/6849] package/mtools: new host-package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in.host        |  1 +
 package/mtools/Config.in.host |  9 +++++++++
 package/mtools/mtools.mk      | 17 +++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/mtools/Config.in.host
 create mode 100644 package/mtools/mtools.mk

diff --git a/package/Config.in.host b/package/Config.in.host
index e97f6e8474..7c0dd201fa 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -6,6 +6,7 @@ source "package/e2fsprogs/Config.in.host"
 source "package/genimage/Config.in.host"
 source "package/genpart/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
+source "package/mtools/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
 source "package/sam-ba/Config.in.host"
diff --git a/package/mtools/Config.in.host b/package/mtools/Config.in.host
new file mode 100644
index 0000000000..d534b5ee7c
--- /dev/null
+++ b/package/mtools/Config.in.host
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_MTOOLS
+	bool "host mtools"
+	help
+	  Mtools is a collection of utilities to access MS-DOS disks from
+	  Unix without mounting them. It supports Win'95 style long file
+	  names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high
+	  density 3 1/2 disk).
+	  
+	  http://www.tux.org/pub/tux/mtools/
diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk
new file mode 100644
index 0000000000..a27c4fdda3
--- /dev/null
+++ b/package/mtools/mtools.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# mtools
+#
+#############################################################
+
+MTOOLS_VERSION       = 4.0.18
+MTOOLS_SOURCE        = mtools-$(MTOOLS_VERSION).tar.bz2
+MTOOLS_SITE          = $(BR2_GNU_MIRROR)/mtools/
+MTOOLS_LICENSE       = GPLv3+
+MTOOLS_LICENSE_FILES = COPYING
+
+MTOOLS_CONF_OPT = --enable-xdf        \
+                  --enable-vold       \
+                  --enable-new-vold
+
+$(eval $(host-autotools-package))

From bae18e117b52c73cf2b84fc0e357d68d18fa39c6 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 18 Mar 2013 12:03:03 +0000
Subject: [PATCH 4429/6849] toolchain/crosstool-NG: do not depend on the
 top-level Buildroot's .config

Previously, the crosstool-NG backend did depend on the top-level
Buildroot's .config to detect changes in the toolchain options,
using a tentatively-clever heuristic, which also included the full
Buildroot's version string to push down to set the components' versions
strings.

In doing so, any commit in the Buildroot tree would imply a complete
rebuild of the toolchain, even in the case the toolchain options did
not change, thus being a large annoyance (to say the least).

As Buildroot never guaranteed that toolchain options would be detected,
even less handled, and that the internal backend does neither detect nor
act on toolchain options changes, and delegate that to the user, there
is no point in individualising the crosstool-NG backend's behaviour.

This reasoning also applies to the depdency on the crosstool-NG's bundled
.config file, too.

So, just drop the not-so-clever heuristic, and just build the toolchain
once, leaving to the user the responsibility to explictly ask Buildroot
to rebuild the toolchain.

Reported-by: "Przemyslaw Wrzos" <przemyslaw.wrzos@calyptech.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: "Przemyslaw Wrzos" <przemyslaw.wrzos@calyptech.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 6554982548..59f18c793d 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -362,32 +362,28 @@ endef
 $(CTNG_DIR)/.config: | host-crosstool-ng
 
 # Default configuration
-# Depends on top-level .config because it has options we have to shoe-horn
-# into crosstool-NG's .config
 # Only copy the original .config file if we don't have one already.
 # Check that given config file matches selected C library.
 # We need to call oldconfig twice in a row to ensure the options
 # are correctly set ( eg. if an option is new, then the initial sed
 # can't do anything about it ) Ideally, this should go in oldconfig
 # itself, but it's much easier to handle here.
-
-$(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(BUILDROOT_CONFIG)
+$(CTNG_DIR)/.config:
 	$(Q)if [ ! -f $@ ]; then                                                        \
 	        mkdir -p "$(CTNG_DIR)";                                                 \
-	        libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }' "$<")";            \
+	        libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }'                    \
+	                        "$(CTNG_CONFIG_FILE)"                                   \
+	                )";                                                             \
 	        if [ "$${libc}" != "$(BR2_TOOLCHAIN_CTNG_LIBC)" ]; then                 \
-	            echo "* Inconsistency in crosstool-NG config file '$<'";            \
+	            echo "* Inconsistency in crosstool-NG config file '$(CTNG_CONFIG_FILE)'"; \
 	            echo "* - buildroot configured for '$(BR2_TOOLCHAIN_CTNG_LIBC)'";   \
 	            echo "* - given config file for '$${libc}'";                        \
 	            exit 1;                                                             \
 	        fi;                                                                     \
-	        cp -f $< $@;                                                            \
+	        cp -f $(CTNG_CONFIG_FILE) $@;                                                            \
 	    fi
-	$(Q)cp -a $@ $@.timestamp
 	$(call ctng-oldconfig,$@)
 	$(call ctng-oldconfig,$@)
-	$(call ctng-check-config-changed,$@,$@.timestamp)
-	$(Q)rm -f $@.timestamp
 
 # Manual configuration
 ctng-menuconfig: $(CTNG_DIR)/.config

From aeb1bbabe38be3a7ed88879484ca2ce292953709 Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Mon, 18 Mar 2013 20:55:16 +0000
Subject: [PATCH 4430/6849] Added package HPLIP for printing to HP printers

HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed solution
for printing, scanning, and faxing with HP inkjet and laser based printers
in Linux.

[Peter: fix Config.in white space]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/hplip/Config.in            | 17 +++++++
 package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++
 package/hplip/hplip.mk             | 53 +++++++++++++++++++++
 4 files changed, 145 insertions(+)
 create mode 100644 package/hplip/Config.in
 create mode 100644 package/hplip/hplip-fix-make.patch
 create mode 100644 package/hplip/hplip.mk

diff --git a/package/Config.in b/package/Config.in
index fec5020618..e12228fbff 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -640,6 +640,7 @@ source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
 source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
+source "package/hplip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
diff --git a/package/hplip/Config.in b/package/hplip/Config.in
new file mode 100644
index 0000000000..5bcd63bbf1
--- /dev/null
+++ b/package/hplip/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_HPLIP
+	bool "hplip"
+	depends on BR2_PACKAGE_CUPS
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_JPEG
+	help
+	  HP Linux Imaging and Printing (HPLIP)
+	  HPLIP is an HP-developed solution for printing, scanning, and faxing
+	  with HP inkjet and laser based printers in Linux. The HPLIP project
+	  provides printing support for 2,211 printer models, including
+	  Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business
+	  Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
+
+	  http://hplipopensource.com/
+
+comment "hplip requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
new file mode 100644
index 0000000000..b26277dd2f
--- /dev/null
+++ b/package/hplip/hplip-fix-make.patch
@@ -0,0 +1,74 @@
+From 6019d012246578ae1a191d3510284e7b894fb528 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Sat, 2 Mar 2013 18:01:03 +0200
+Subject: [PATCH] Changed Makefile.am to allow cross-compilation of HPLIP
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ Makefile.am |   28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 16ea902..b22f46a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -72,7 +72,7 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/
+ 	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
+ 	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c
+ else
+-libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
++libhpmud_la_CFLAGS = -I$(includedir)/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+ libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
+ 	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
+ 	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c
+@@ -292,7 +292,7 @@ hpmudext_la_LIBADD = libhpmud.la
+ if LIBUSB01_BUILD
+ hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+ else
+-hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
++hpmudext_la_CFLAGS =-I$(includedir)/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+ endif
+ 
+ # ui (qt3)
+@@ -564,26 +564,26 @@ endif
+ 
+ install-dist_hplip_LogDATA:
+ if FULL_BUILD
+-	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+-	chmod 775 $(DESTDIR)$(hplip_Logdir)
++#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++#	chmod 775 $(DESTDIR)$(hplip_Logdir)
+ endif	#FULL_BUILD
+ if HPLIP_BUILD
+-	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+-	chmod 775 $(DESTDIR)$(hplip_Logdir)
++#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++#	chmod 775 $(DESTDIR)$(hplip_Logdir)
+ endif	#FULL_BUILD
+ 
+ install-dist_hplip_tmpDATA:
+ if FULL_BUILD
+-	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
++#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
+ endif	#FULL_BUILD
+ if HPLIP_BUILD
+-	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
++#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
+ endif	#FULL_BUILD
+ 
+ install-dist_cronDATA:$(dist_cron_DATA)
+-- 
+1.7.10.4
+
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
new file mode 100644
index 0000000000..6944f509dd
--- /dev/null
+++ b/package/hplip/hplip.mk
@@ -0,0 +1,53 @@
+#############################################################
+#
+# hplip
+#
+#############################################################
+
+HPLIP_VERSION = 3.13.3
+HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
+HPLIP_AUTORECONF = YES
+HPLIP_DEPENDENCIES = cups libusb jpeg
+HPLIP_LICENSE = GPLv2 BSD-3c MIT
+HPLIP_LICENSE_FILES = COPYING
+
+HPLIP_CONF_OPT = \
+	--disable-qt4 \
+	--disable-scan-build \
+	--disable-gui-build \
+	--disable-doc-build \
+	--disable-network-build \
+	--enable-hpcups-install \
+	--disable-hpijs-install \
+	--enable-cups-ppd-install \
+	--enable-cups-drv-install \
+	--disable-foomatic-ppd-install \
+	--disable-foomatic-drv-install \
+	--disable-foomatic-rip-hplip-install \
+	--enable-new-hpcups \
+	--enable-lite-build \
+	--with-sysroot=$(STAGING_DIR) \
+	--includedir=$(STAGING_DIR)/usr/include
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+	HPLIP_CONF_OPT += --enable-dbus-build
+	HPLIP_DEPENDENCIES += dbus
+else
+	HPLIP_CONF_OPT += --disable-dbus-build
+endif
+
+define HPLIP_POST_INSTALL_TARGET_FIXUP
+	mkdir -p $(TARGET_DIR)/usr/share/hplip/data/models
+	cp $(@D)/data/models/* $(TARGET_DIR)/usr/share/hplip/data/models
+endef
+HPLIP_POST_INSTALL_TARGET_HOOKS += HPLIP_POST_INSTALL_TARGET_FIXUP
+
+define HPLIP_PRE_CONFIGURE_FIXUP
+	touch $(@D)/AUTHORS
+	touch $(@D)/ChangeLog
+	touch $(@D)/NEWS
+	touch $(@D)/README
+endef
+HPLIP_PRE_CONFIGURE_HOOKS += HPLIP_PRE_CONFIGURE_FIXUP
+
+$(eval $(autotools-package))

From 1bf3d6f8cf3a2dca9ce1c6f3e68b077724f21db6 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 19 Mar 2013 00:51:48 +0000
Subject: [PATCH 4431/6849] libcap: Add optional support for libattr
 capabilities

libcap can optionally link to libattr to support extra
file capabilities. Link to this library and pull it as
dependency if BR2_PACKAGE_ATTR is selected.

[Peter: use LIBCAP_ prefix on variable]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap/libcap.mk | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index dcd3a184ab..6adac73096 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -15,19 +15,27 @@ LIBCAP_LICENSE_FILES = License
 LIBCAP_DEPENDENCIES = host-libcap
 LIBCAP_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_ATTR),y)
+	LIBCAP_DEPENDENCIES += attr
+	LIBCAP_HAVE_LIBATTR = yes
+else
+	LIBCAP_HAVE_LIBATTR = no
+endif
+
 define LIBCAP_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		LIBATTR=no BUILD_CC="$(HOSTCC)" BUILD_CFLAGS="$(HOST_CFLAGS)"
+		LIBATTR=$(LIBCAP_HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" \
+		BUILD_CFLAGS="$(HOST_CFLAGS)"
 endef
 
 define LIBCAP_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) \
-		prefix=/usr lib=lib install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
+		DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
 endef
 
 define LIBCAP_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \
-		prefix=/usr lib=lib install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
+		DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
 endef
 
 # progs use fork()

From 1fc61cca6912779391ac3a205b05e0a7bd14a378 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 19 Mar 2013 16:12:36 +0100
Subject: [PATCH 4432/6849] libcap: fix host build when BR2_PACKAGE_ATTR is
 enabled

We don't have (or need) a host-attr package.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap/libcap.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 6adac73096..15a2cfbc7c 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -22,6 +22,9 @@ else
 	LIBCAP_HAVE_LIBATTR = no
 endif
 
+# we don't have host-attr
+HOST_LIBCAP_DEPENDENCIES =
+
 define LIBCAP_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		LIBATTR=$(LIBCAP_HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" \

From 765e6bb3b09f469c23c98ae391f72c7f1256cd62 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 02:25:39 +0000
Subject: [PATCH 4433/6849] sudo: security bump to version 1.8.6p7

Fixes CVE-2013-1775 and CVE-2013-1776.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sudo/sudo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index a01ac0cc70..5fd3c61a29 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SUDO_VERSION = 1.8.6p4
+SUDO_VERSION = 1.8.6p7
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 SUDO_LICENSE = ICS BSD-3c
 SUDO_LICENSE_FILES = doc/LICENSE

From 395f0e5621c4e31081d3db58b23b4aedb1b21061 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 02:33:13 +0000
Subject: [PATCH 4434/6849] mpfr: bump to version 3.1.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpfr/mpfr-patchlevel2.patch | 405 ----------------------------
 package/mpfr/mpfr.mk                |   2 +-
 2 files changed, 1 insertion(+), 406 deletions(-)
 delete mode 100644 package/mpfr/mpfr-patchlevel2.patch

diff --git a/package/mpfr/mpfr-patchlevel2.patch b/package/mpfr/mpfr-patchlevel2.patch
deleted file mode 100644
index 43dfcbfe32..0000000000
--- a/package/mpfr/mpfr-patchlevel2.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:28:51.000000000 +0000
-@@ -0,0 +1 @@
-+get_decimal64
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-07-03 15:01:13.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:28:51.000000000 +0000
-@@ -1 +1 @@
--3.1.1
-+3.1.1-p1
-diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c
---- mpfr-3.1.1-a/src/get_d64.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/get_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -32,6 +32,10 @@
- 
- #ifdef MPFR_WANT_DECIMAL_FLOATS
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- #ifdef DPD_FORMAT
- static int T[1000] = {
-   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32,
-@@ -142,26 +146,14 @@
- static _Decimal64
- get_decimal64_min (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 0;
--  x.s.manh = 0;
--  x.s.manl = 1;
--  return x.d;
-+  return negative ? - 1E-398dd : 1E-398dd;
- }
- 
- /* construct the decimal64 largest finite number with given sign */
- static _Decimal64
- get_decimal64_max (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 1919;
--  x.s.manh = 1048575; /* 2^20-1 */
--  x.s.manl = ~0;
--  return x.d;
-+  return negative ? - DEC64_MAX : DEC64_MAX;
- }
- 
- /* one-to-one conversion:
-@@ -334,7 +326,8 @@
-   /* the largest decimal64 number is just below 10^(385) < 2^1279 */
-   else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */
-     {
--      if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+      if (rnd_mode == MPFR_RNDZ
-+          || (rnd_mode == MPFR_RNDU && negative != 0)
-           || (rnd_mode == MPFR_RNDD && negative == 0))
-         return get_decimal64_max (negative);
-       else
-@@ -354,6 +347,15 @@
-              which corresponds to s=[0.]1000...000 and e=-397 */
-           if (e < -397)
-             {
-+              if (rnd_mode == MPFR_RNDN && e == -398)
-+                {
-+                  /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal),
-+                     src should round to +/- 1E-398 in MPFR_RNDN. */
-+                  mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA);
-+                  return e == -398 && s[negative] <= '5' ?
-+                    get_decimal64_zero (negative) :
-+                    get_decimal64_min (negative);
-+                }
-               if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN
-                   || (rnd_mode == MPFR_RNDD && negative == 0)
-                   || (rnd_mode == MPFR_RNDU && negative != 0))
-@@ -379,7 +381,8 @@
-          which corresponds to s=[0.]9999...999 and e=385 */
-       else if (e > 385)
-         {
--          if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+          if (rnd_mode == MPFR_RNDZ
-+              || (rnd_mode == MPFR_RNDU && negative != 0)
-               || (rnd_mode == MPFR_RNDD && negative == 0))
-             return get_decimal64_max (negative);
-           else
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-07-03 15:01:19.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1"
-+#define MPFR_VERSION_STRING "3.1.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1";
-+  return "3.1.1-p1";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c
---- mpfr-3.1.1-a/tests/tget_set_d64.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tget_set_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,6 +25,10 @@
- #include <stdlib.h> /* for exit */
- #include "mpfr-test.h"
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- /* #define DEBUG */
- 
- static void
-@@ -149,6 +153,15 @@
-   mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ);
-   mpfr_set (y, x, MPFR_RNDZ);
-   d = mpfr_get_decimal64 (x, MPFR_RNDU);
-+  ASSERT_ALWAYS (d == DEC64_MAX);
-+  mpfr_set_ui (x, 0, MPFR_RNDZ);
-+  mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-+  ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-+
-+  mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ);
-+  mpfr_set (y, x, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDA);
-+  ASSERT_ALWAYS (d == -DEC64_MAX);
-   mpfr_set_ui (x, 0, MPFR_RNDZ);
-   mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-   ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-@@ -225,6 +238,83 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+check_overflow (void)
-+{
-+  mpfr_t x;
-+  int err = 0, neg, rnd;
-+
-+  mpfr_init2 (x, 96);
-+  for (neg = 0; neg < 2; neg++)
-+    RND_LOOP (rnd)
-+      {
-+        _Decimal64 d, e;
-+        mpfr_rnd_t r = (mpfr_rnd_t) rnd;
-+        int sign = neg ? -1 : 1;
-+
-+        e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX;
-+        /* This tests the binary exponent e > 1279 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 1 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the decimal exponent e > 385 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 2 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the last else (-382 <= e <= 385) of get_d64.c */
-+        mpfr_set_decimal64 (x, e, MPFR_RNDA);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 3 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+      }
-+  mpfr_clear (x);
-+  if (err)
-+    exit (1);
-+}
-+
-+static void
-+check_tiny (void)
-+{
-+  mpfr_t x;
-+  _Decimal64 d;
-+
-+  /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round
-+     to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between
-+     0 and 1E-398 is not a representable binary number, so that there
-+     are no tests for it. */
-+  mpfr_init2 (x, 128);
-+  mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_clear (x);
-+}
-+
- int
- main (void)
- {
-@@ -241,6 +331,8 @@
-   check_inf_nan ();
-   check_random ();
-   check_native ();
-+  check_overflow ();
-+  check_tiny ();
- 
-   tests_end_mpfr ();
-   return 0;
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:35:12.000000000 +0000
-@@ -0,0 +1 @@
-+strtofr-ternary-value
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:35:12.000000000 +0000
-@@ -1 +1 @@
--3.1.1-p1
-+3.1.1-p2
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1-p1"
-+#define MPFR_VERSION_STRING "3.1.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c
---- mpfr-3.1.1-a/src/strtofr.c	2012-07-03 15:01:16.000000000 +0000
-+++ mpfr-3.1.1-b/src/strtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -667,6 +667,20 @@
-           /* (z, exp_z) = base^(exp_base-pstr_size) */
-           z = result + 2*ysize + 1;
-           err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize);
-+          /* Since we want y/z rounded toward zero, we must get an upper
-+             bound of z. If err >= 0, the error on z is bounded by 2^err. */
-+          if (err >= 0)
-+            {
-+              mp_limb_t cy;
-+              unsigned long h = err / GMP_NUMB_BITS;
-+              unsigned long l = err - h * GMP_NUMB_BITS;
-+
-+              if (h >= ysize) /* not enough precision in z */
-+                goto next_loop;
-+              cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l);
-+              if (cy != 0) /* the code below requires z on ysize limbs */
-+                goto next_loop;
-+            }
-           exact = exact && (err == -1);
-           if (err == -2)
-             goto underflow; /* FIXME: Sure? */
-@@ -730,6 +744,7 @@
-                                        MPFR_RNDN, rnd, MPFR_PREC(x)))
-         break;
- 
-+    next_loop:
-       /* update the prec for next loop */
-       MPFR_ZIV_NEXT (loop, prec);
-     } /* loop */
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:35:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1-p1";
-+  return "3.1.1-p2";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c
---- mpfr-3.1.1-a/tests/tstrtofr.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tstrtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -1105,6 +1105,92 @@
-   mpfr_clear (y);
- }
- 
-+/* From a bug reported by Joseph S. Myers
-+   https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */
-+static void
-+bug20120814 (void)
-+{
-+  mpfr_exp_t emin = -30, e;
-+  mpfr_t x, y;
-+  int r;
-+  char s[64], *p;
-+
-+  mpfr_init2 (x, 2);
-+  mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN);
-+  mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD);
-+  s[0] = s[1];
-+  s[1] = '.';
-+  for (p = s; *p != 0; p++) ;
-+  *p = 'e';
-+  sprintf (p + 1, "%d", (int) e - 1);
-+
-+  mpfr_init2 (y, 4);
-+  r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN);
-+  if (r <= 0 || ! mpfr_equal_p (x, y))
-+    {
-+      printf ("Error in bug20120814\n");
-+      printf ("mpfr_strtofr failed on string \"%s\"\n", s);
-+      printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin);
-+      printf ("Got inex = %-6d and y = ", r);
-+      mpfr_dump (y);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+}
-+
-+static void
-+bug20120829 (void)
-+{
-+  mpfr_t x1, x2, e;
-+  int inex1, inex2, i, r;
-+  char s[48] = "1e-1";
-+
-+  mpfr_init2 (e, 128);
-+  mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0);
-+
-+  inex1 = mpfr_set_si (e, -1, MPFR_RNDN);
-+  MPFR_ASSERTN (inex1 == 0);
-+
-+  for (i = 1; i <= sizeof(s) - 5; i++)
-+    {
-+      s[3+i] = '0';
-+      s[4+i] = 0;
-+      inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN);
-+      MPFR_ASSERTN (inex1 == 0);
-+      RND_LOOP(r)
-+        {
-+          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
-+
-+          inex1 = mpfr_exp10 (x1, e, rnd);
-+          inex1 = SIGN (inex1);
-+          inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd);
-+          inex2 = SIGN (inex2);
-+          /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do:
-+             strtofr.c:...: MPFR assertion failed: cy == 0
-+             r8396 is OK.
-+             On 64-bit machines, for i = 15,
-+             r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0)
-+             r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize
-+             r8394 and r8396 are OK.
-+          */
-+          if (! mpfr_equal_p (x1, x2) || inex1 != inex2)
-+            {
-+              printf ("Error in bug20120829 for i = %d, rnd = %s\n",
-+                      i, mpfr_print_rnd_mode (rnd));
-+              printf ("Expected inex = %d, x = ", inex1);
-+              mpfr_dump (x1);
-+              printf ("Got      inex = %d, x = ", inex2);
-+              mpfr_dump (x2);
-+              exit (1);
-+            }
-+        }
-+    }
-+
-+  mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1117,6 +1203,8 @@
-   check_retval ();
-   bug20081028 ();
-   test20100310 ();
-+  bug20120814 ();
-+  bug20120829 ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index c6f1009814..7fa97fe614 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPFR_VERSION = 3.1.1
+MPFR_VERSION = 3.1.2
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
 MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_LICENSE = LGPLv3+

From 4c2b77b1f9bb05ba9247a0008b7d3e3b45e8f185 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 02:33:14 +0000
Subject: [PATCH 4435/6849] libffi: bump to version 3.0.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi-002-fix-ppc-nofpr.patch | 29 -------------------
 package/libffi/libffi.mk                      |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 package/libffi/libffi-002-fix-ppc-nofpr.patch

diff --git a/package/libffi/libffi-002-fix-ppc-nofpr.patch b/package/libffi/libffi-002-fix-ppc-nofpr.patch
deleted file mode 100644
index 729bae812b..0000000000
--- a/package/libffi/libffi-002-fix-ppc-nofpr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Gilles Talis <gilles.talis@gmail.com>
-
-On PPC, if __NO_FPRS__ is defined, fparg_count and NUM_FPR_ARG_REGISTERS
-are not defined, thus must not be used.
-
-Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
----
- src/powerpc/ffi.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
-index f3a96a1..9c69584 100644
---- a/src/powerpc/ffi.c
-+++ b/src/powerpc/ffi.c
-@@ -376,9 +376,10 @@ ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack)
-      with the number found in ffi_prep_cif_machdep().  However, intarg_count
-      is incremeneted whenever we place an FP arg on the stack, so account for
-      that before our assert test.  */
-+#ifndef __NO_FPRS__
-   if (fparg_count > NUM_FPR_ARG_REGISTERS)
-     intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS;
--#ifndef __NO_FPRS__
-+
-   FFI_ASSERT (fpr_base.u
- 	      <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS);
- #endif
--- 
-1.7.10.4
-
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 28a29162df..791c464ffd 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBFFI_VERSION = 3.0.12
+LIBFFI_VERSION = 3.0.13
 LIBFFI_SITE    = ftp://sourceware.org/pub/libffi/
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE

From 10a681bf19221e8c4bab4c82b8d9ab37b49e7a20 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 02:33:15 +0000
Subject: [PATCH 4436/6849] samba: bump to version 3.6.13

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index b31787ba36..7f9b91877e 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.12
+SAMBA_VERSION = 3.6.13
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 61aa05cc89d31de083c624185aa8ba1a910a6c7d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 03:05:11 +0000
Subject: [PATCH 4437/6849] audiofile: bump to version 0.3.6

Now with FLAC support.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/audiofile/audiofile.mk | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index 9886c4d1e4..51173e6066 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -4,18 +4,20 @@
 #
 #############################################################
 
-AUDIOFILE_VERSION = 0.3.4
+AUDIOFILE_VERSION = 0.3.6
 AUDIOFILE_SITE = http://audiofile.68k.org
 AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-AUDIOFILE_LICENSE = GPLv2+ LGPLv2+
+AUDIOFILE_CONF_OPT = --disable-examples --disable-docs
+AUDIOFILE_DEPENDENCIES = host-pkgconf
+AUDIOFILE_LICENSE = GPLv2+ LGPLv2.1+
 AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
 
-# Useless and needs alsa-lib
-define AUDIOFILE_DISABLE_EXAMPLES
-	$(SED) 's/examples//' $(@D)/Makefile.in
-endef
-
-AUDIOFILE_POST_PATCH_HOOKS += AUDIOFILE_DISABLE_EXAMPLES
+ifeq ($(BR2_PACKAGE_FLAC),y)
+AUDIOFILE_DEPENDENCIES += flac
+AUDIOFILE_CONF_OPT += --enable-flac
+else
+AUDIOFILE_CONF_OPT += --disable-flac
+endif
 
 $(eval $(autotools-package))

From aff304d535b9fd622f7c71679087553562594e8a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 03:22:12 +0000
Subject: [PATCH 4438/6849] iproute2: needs mmu

Fixes
http://autobuild.buildroot.net/results/08beca1cae9dc55b2f770a01ad95bcbe56594300/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/Config.in | 1 +
 package/openswan/Config.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in
index b6ee86e9b8..4da0d2b1ca 100644
--- a/package/iproute2/Config.in
+++ b/package/iproute2/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_IPROUTE2
 	bool "iproute2"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Kernel routing and traffic control utilities.  Provides things
 	  like ip and tc.
diff --git a/package/openswan/Config.in b/package/openswan/Config.in
index 3336156207..932a75f672 100644
--- a/package/openswan/Config.in
+++ b/package/openswan/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENSWAN
 	bool "openswan"
+	depends on BR2_USE_MMU # iproute2
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_IPROUTE2
 	help

From ae04535e5e5f67874dfaddab1128fe5e76e549fe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 03:32:05 +0000
Subject: [PATCH 4439/6849] packages: re-categorize gmp, mpc and mpfr

They're not development tools, they're libraries, so place them under
libraries->other.
Also adjust gsl sort order.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index e12228fbff..94e279b3af 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -72,15 +72,12 @@ source "package/gawk/Config.in"
 endif
 source "toolchain/gcc/Config.in.2"
 source "package/gettext/Config.in"
-source "package/gmp/Config.in"
 source "package/gperf/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
 endif
 source "package/intltool/Config.in"
 source "package/make/Config.in"
-source "package/mpc/Config.in"
-source "package/mpfr/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -549,6 +546,8 @@ source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
 source "package/boost/Config.in"
+source "package/gmp/Config.in"
+source "package/gsl/Config.in"
 source "package/gtest/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
@@ -558,7 +557,6 @@ source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/libev/Config.in"
 source "package/libffi/Config.in"
-source "package/gsl/Config.in"
 source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
@@ -570,6 +568,8 @@ source "package/libseccomp/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
 source "package/lttng-libust/Config.in"
+source "package/mpc/Config.in"
+source "package/mpfr/Config.in"
 source "package/mtdev2tuio/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"

From 9540e4ceebd7e567f79fc68cf019e18dff3aebf7 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Tue, 19 Mar 2013 06:12:41 +0000
Subject: [PATCH 4440/6849] kexec: bump to version 2.0.4

Version 2.0.4 has improved support for handling of device-tree
blobs on the ARM platform.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/kexec.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index a8192f750e..6510b172dc 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -3,8 +3,9 @@
 # kexec
 #
 #############################################################
-KEXEC_VERSION = 2.0.3
-KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.bz2
+
+KEXEC_VERSION = 2.0.4
+KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
 
 ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y)

From 4fcdc6a3338b7cd86caf40ba8660161eda088d36 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 06:58:46 +0000
Subject: [PATCH 4441/6849] stunnel: security bump to version 4.55

Fixes CVE-2013-1762, improves CVE-2010-3684 workaround.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/stunnel/Config.in  | 1 +
 package/stunnel/stunnel.mk | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/stunnel/Config.in b/package/stunnel/Config.in
index b1977ed175..e4a956770e 100644
--- a/package/stunnel/Config.in
+++ b/package/stunnel/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_STUNNEL
 	bool "stunnel"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Stunnel is a program that wraps any TCP connection with an SSL
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 7c280cc4b4..92344d116f 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -4,12 +4,12 @@
 #
 #############################################################
 
-STUNNEL_VERSION = 4.44
+STUNNEL_VERSION = 4.55
 STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel
 STUNNEL_DEPENDENCIES = openssl
-STUNNEL_CONF_OPT += \
-	--with-ssl=$(STAGING_DIR)/usr \
-	--with-threads=fork
+STUNNEL_CONF_OPT = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork
+STUNNEL_LICENSE = GPLv2+
+STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL
 
 define STUNNEL_INSTALL_CONF_SCRIPT
 	$(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel

From 3216dca03bdaa5c25eeaa46f42fccf8f84ef0708 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 07:55:22 +0000
Subject: [PATCH 4442/6849] psmisc: bump to version 22.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/psmisc/psmisc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 5d2333fd28..f251c17310 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PSMISC_VERSION = 22.16
+PSMISC_VERSION = 22.20
 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
 PSMISC_LICENSE = GPLv2
 PSMISC_LICENSE_FILES = COPYING

From 52b7e7cbadae4a5d7cbcab1b6e19cfad77a114ff Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:34 +0000
Subject: [PATCH 4443/6849] qt5base: add OpenSSL support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 33555aef32..736965d368 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -28,7 +28,6 @@ QT5BASE_CONFIGURE_OPTS += \
 	-no-nis \
 	-no-libudev \
 	-no-iconv \
-	-no-openssl \
 	-no-fontconfig \
 	-no-gif \
 	-no-libpng \
@@ -82,6 +81,9 @@ else
 QT5BASE_CONFIGURE_OPTS += -no-xcb
 endif
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network

From d2b86608ac37b5bce78d0214ffee0a93f58da0f0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:35 +0000
Subject: [PATCH 4444/6849] qt5base: add eglfs graphics backend

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/Config.in                 | 11 ++++++-
 ...dd-egl-to-CONFIG-to-get-correct-incl.patch | 32 +++++++++++++++++++
 package/qt5/qt5base/qt5base.mk                |  9 ++++--
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 801ef6f60e..0af5df642c 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -59,7 +59,8 @@ config BR2_PACKAGE_QT5BASE_GUI
 	# linuxfb if nothing is enabled.
 	select BR2_PACKAGE_QT5BASE_LINUXFB if \
 	       !BR2_PACKAGE_QT5BASE_DIRECTFB && \
-	       !BR2_PACKAGE_QT5BASE_XCB
+	       !BR2_PACKAGE_QT5BASE_XCB && \
+	       !BR2_PACKAGE_QT5BASE_EGLFS
 	help
 	  This option enables the Qt5Gui library.
 
@@ -89,6 +90,14 @@ config BR2_PACKAGE_QT5BASE_XCB
 comment "X.org XCB backend available if X.org is enabled"
 	depends on !BR2_PACKAGE_XORG7
 
+config BR2_PACKAGE_QT5BASE_EGLFS
+	bool "eglfs support"
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+
+comment "eglfs backend available if OpenGLES and EGL are enabled"
+	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+
 config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
 	bool "print support module"
 	select BR2_PACKAGE_QT5BASE_WIDGETS
diff --git a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
new file mode 100644
index 0000000000..a85a5aafa4
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
@@ -0,0 +1,32 @@
+From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 13 Jan 2013 14:36:48 +0100
+Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include
+ paths
+
+The eglconvenience code includes <EGL/egl.h>. Therefore, it should get
+the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL,
+otherwise the build might if the EGL library has its headers in
+special locations. In order to achieve this, we simply add the "egl"
+feature to the list of features imported by eglconvenience.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ .../eglconvenience/eglconvenience.pri              |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
+index 188eb1c..8996cea 100644
+--- a/src/platformsupport/eglconvenience/eglconvenience.pri
++++ b/src/platformsupport/eglconvenience/eglconvenience.pri
+@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
+     SOURCES += \
+         $$PWD/qeglconvenience.cpp \
+         $$PWD/qeglplatformcontext.cpp
++    CONFIG += egl
+ 
+     contains(QT_CONFIG,xlib) {
+         HEADERS += \
+-- 
+1.7.9.5
+
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 736965d368..700bc67b8c 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -20,9 +20,7 @@ QT5BASE_INSTALL_STAGING = YES
 #    want to use the one packaged in Buildroot
 QT5BASE_CONFIGURE_OPTS += \
 	-optimized-qmake \
-	-no-eglfs \
 	-no-kms \
-	-no-opengl \
 	-no-glib \
 	-no-cups \
 	-no-nis \
@@ -81,6 +79,13 @@ else
 QT5BASE_CONFIGURE_OPTS += -no-xcb
 endif
 
+ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
+QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs
+QT5BASE_DEPENDENCIES   += libgles libegl
+else
+QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs
+endif
+
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)
 

From 9e9a3e6b0055938adf266a17fee9b0f75d750b9d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:36 +0000
Subject: [PATCH 4445/6849] qt5base: add support for fontconfig, png, jpeg, gif

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/Config.in  | 26 ++++++++++++++++++++++++++
 package/qt5/qt5base/qt5base.mk | 12 ++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 0af5df642c..8b0291b54b 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -104,6 +104,32 @@ config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
 	help
 	  This option enables the Qt5PrintSupport
 
+config BR2_PACKAGE_QT5BASE_FONTCONFIG
+	bool "fontconfig support"
+	select BR2_PACKAGE_FONTCONFIG
+	help
+	  This option enables Fontconfig and Freetype support using
+	  the system fontconfig and freetype2 libraries.
+
+config BR2_PACKAGE_QT5BASE_GIF
+	bool "GIF support"
+	help
+	  This compiles and installs the plugin for GIF reading support.
+
+config BR2_PACKAGE_QT5BASE_JPEG
+	bool "JPEG support"
+	select BR2_PACKAGE_JPEG
+	help
+	  This option enables JPEG support using the system libjpeg
+	  library.
+
+config BR2_PACKAGE_QT5BASE_PNG
+	bool "PNG support"
+	select BR2_PACKAGE_LIBPNG
+	help
+	  This option enables PNG support using the system libpng
+	  library.
+
 endif
 
 endif
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 700bc67b8c..65fe451e02 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -26,10 +26,6 @@ QT5BASE_CONFIGURE_OPTS += \
 	-no-nis \
 	-no-libudev \
 	-no-iconv \
-	-no-fontconfig \
-	-no-gif \
-	-no-libpng \
-	-no-libjpeg \
 	-no-icu \
 	-no-dbus \
 	-no-gstreamer \
@@ -89,6 +85,14 @@ endif
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network

From f5b9811a837ca562c94ffc148e0679c974813fdf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:37 +0000
Subject: [PATCH 4446/6849] qt5base: add D-Bus support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/Config.in  | 8 ++++++++
 package/qt5/qt5base/qt5base.mk | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 8b0291b54b..d313db9185 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -132,4 +132,12 @@ config BR2_PACKAGE_QT5BASE_PNG
 
 endif
 
+config BR2_PACKAGE_QT5BASE_DBUS
+	bool "DBus module"
+	select BR2_PACKAGE_DBUS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
+	help
+	  This option enables the D-Bus module.
+
 endif
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 65fe451e02..62f0b9a9dd 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -27,7 +27,6 @@ QT5BASE_CONFIGURE_OPTS += \
 	-no-libudev \
 	-no-iconv \
 	-no-icu \
-	-no-dbus \
 	-no-gstreamer \
 	-no-gtkstyle \
 	-system-zlib \
@@ -93,6 +92,9 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network
@@ -105,6 +107,8 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
 
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
+
 # Ideally, we could use -device-option to substitute variable values
 # in our linux-buildroot-g++/qmake.config, but this mechanism doesn't
 # nicely support variable values that contain spaces. So we use the

From f8ffed2dbe8312202169efba6182ba8bf76be026 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:38 +0000
Subject: [PATCH 4447/6849] qt5base: add glib support

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 62f0b9a9dd..d5dcb7d3f0 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -21,7 +21,6 @@ QT5BASE_INSTALL_STAGING = YES
 QT5BASE_CONFIGURE_OPTS += \
 	-optimized-qmake \
 	-no-kms \
-	-no-glib \
 	-no-cups \
 	-no-nis \
 	-no-libudev \
@@ -95,6 +94,9 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network

From 53fbd8a7c529ba307f6d693ceb1f42696cdf05d9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:39 +0000
Subject: [PATCH 4448/6849] qt5base: add support to build against ICU

Qt5Webkit requires Qt5Base to be built with ICU support, so we add
such support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/Config.in  | 7 +++++++
 package/qt5/qt5base/qt5base.mk | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index d313db9185..7974357118 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -140,4 +140,11 @@ config BR2_PACKAGE_QT5BASE_DBUS
 	help
 	  This option enables the D-Bus module.
 
+config BR2_PACKAGE_QT5BASE_ICU
+	bool "Enable ICU support"
+	select BR2_PACKAGE_ICU
+	help
+	  This option enables ICU support in Qt5. This is for example
+	  needed for Qt5Webkit.
+
 endif
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index d5dcb7d3f0..ac63e9814a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -25,7 +25,6 @@ QT5BASE_CONFIGURE_OPTS += \
 	-no-nis \
 	-no-libudev \
 	-no-iconv \
-	-no-icu \
 	-no-gstreamer \
 	-no-gtkstyle \
 	-system-zlib \
@@ -97,6 +96,9 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network

From 6cd7b60f8bd2ad827028e3a82d2f62cf63831a99 Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Tue, 19 Mar 2013 09:29:40 +0000
Subject: [PATCH 4449/6849] qt5base: add rPi EGL glue code

When the rpi-userland package is selected, assume we are targetting
the Raspberry Pi, and add the right platform glue code when building
the Qt5 EGLFS plugin.

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base-mkspecs-files.patch | 5 ++++-
 package/qt5/qt5base/qt5base.mk                  | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-mkspecs-files.patch
index a86d0b19ec..d5827f6005 100644
--- a/package/qt5/qt5base/qt5base-mkspecs-files.patch
+++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
@@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 ===================================================================
 --- /dev/null
 +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,41 @@
 +MAKEFILE_GENERATOR      = UNIX
 +CONFIG                  += incremental gdb_dwarf_index
 +QMAKE_INCREMENTAL_STYLE = sublib
@@ -49,6 +49,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 +
 +QMAKE_LIBS             += -lrt -lpthread -ldl
 +
++# device specific glue code
++EGLFS_PLATFORM_HOOKS_SOURCES =
++
 +# Sanity check
 +deviceSanityCheckCompiler()
 +
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index ac63e9814a..3b4c007a0b 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -75,6 +75,10 @@ endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
 QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs
 QT5BASE_DEPENDENCIES   += libgles libegl
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
+	$(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+endif
 else
 QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs
 endif
@@ -125,6 +129,8 @@ define QT5BASE_CONFIGURE_CMDS
 	$(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS))
 	$(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS))
 	$(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))
+	$(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \
+		$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES))
 	(cd $(@D); \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \

From cdfa21b06041eb601e0bea79f2c8f50e9d637384 Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Tue, 19 Mar 2013 09:29:41 +0000
Subject: [PATCH 4450/6849] qt5base: install bundled fonts to target

If not using font-config, Qt 5 offers a set of standard fonts to
use instead. Install these to target.

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 3b4c007a0b..83ce9998ce 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -172,9 +172,17 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
 	fi
 endef
 
+define QT5BASE_INSTALL_TARGET_FONTS
+	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
+		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
+		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
+	fi
+endef
+
 define QT5BASE_INSTALL_TARGET_CMDS
 	$(QT5BASE_INSTALL_TARGET_LIBS)
 	$(QT5BASE_INSTALL_TARGET_PLUGINS)
+	$(QT5BASE_INSTALL_TARGET_FONTS)
 endef
 
 $(eval $(generic-package))

From 424d69bc9b48e08398fce3adafd0c5c94edc7281 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Mar 2013 10:04:24 +0000
Subject: [PATCH 4451/6849] smartmontools: bump to version 6.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/smartmontools/Config.in        | 1 +
 package/smartmontools/smartmontools.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/smartmontools/Config.in b/package/smartmontools/Config.in
index 18320f0225..dd8197fe0d 100644
--- a/package/smartmontools/Config.in
+++ b/package/smartmontools/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SMARTMONTOOLS
 	bool "smartmontools"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
 	help
 	  Control and monitor storage systems using S.M.A.R.T.
 
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index 5736771e96..850001a365 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SMARTMONTOOLS_VERSION = 6.0
+SMARTMONTOOLS_VERSION = 6.1
 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
 SMARTMONTOOLS_LICENSE = GPLv2+
 SMARTMONTOOLS_LICENSE_FILES = COPYING

From 5538e4766201aa0c1c23721cfc99cbbde595964b Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 17 Mar 2013 23:13:47 +0000
Subject: [PATCH 4452/6849] rework patch model

At the Buildroot Developers Meeting (4-5 February 2013, in Brussels) a change
to the patch logic was discussed. See

http://elinux.org/Buildroot:DeveloperDaysFOSDEM2013

for details. In summary:

* For patches stored in the package directory, if
  package/<pkg>/<version>/ does exist, apply package/<pkg>/<version>/*.patch,
  otherwise, apply package/<pkg>/*.patch
* For patches stored in the global patches directory, if
  $(GLOBAL_PATCH_DIR)/<pkg>/<version>/ does exist, apply
  $(GLOBAL_PATCH_DIR)/<pkg>/<version>/*.patch, otherwise, apply
  $(GLOBAL_PATCH_DIR)/<pkg>/*.patch

This patch adds the new BR2_GLOBAL_PATCH_DIR configuration item, and reworks
the generic package infrastructure to implement the new patch logic.

[Peter: fixup doc nits as pointed out by Thomas]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                          | 15 +++++++++++++++
 docs/manual/customize-packages.txt | 23 +++++++++++++++++++++++
 docs/manual/customize.txt          |  2 ++
 docs/manual/patch-policy.txt       | 14 +++++++++++---
 package/pkg-generic.mk             | 16 ++++++++--------
 5 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 docs/manual/customize-packages.txt

diff --git a/Config.in b/Config.in
index a2c305f9d4..bbb9885ef3 100644
--- a/Config.in
+++ b/Config.in
@@ -437,6 +437,21 @@ config BR2_PACKAGE_OVERRIDE_FILE
 	  as the source directory for a particular package. See the
 	  Buildroot documentation for more details on this feature.
 
+config BR2_GLOBAL_PATCH_DIR
+	string "global patch directory"
+	help
+	  You may specify a directory containing global package patches.
+	  For a specific version <packageversion> of a specific package
+	  <packagename>, patches are applied as follows.
+
+	  First, the default Buildroot patch set for the package is applied.
+
+	  If the directory $(BR2_GLOBAL_PATCH_DIR)/<packagename>/<packageversion>
+	  exists, then all *.patch files in the directory will be applied.
+
+	  Otherwise, if the directory $(BR2_GLOBAL_PATCH_DIR)/<packagename> exists,
+	  then all *.patch files in the directory will be applied.
+
 endmenu
 
 source "toolchain/Config.in"
diff --git a/docs/manual/customize-packages.txt b/docs/manual/customize-packages.txt
new file mode 100644
index 0000000000..1820c544e5
--- /dev/null
+++ b/docs/manual/customize-packages.txt
@@ -0,0 +1,23 @@
+// -*- mode:doc -*- ;
+
+[[packages-custom]]
+Customizing packages
+~~~~~~~~~~~~~~~~~~~~
+
+It is sometimes useful to apply 'extra' patches to packages - over and
+above those provided in Buildroot. This might be used to support custom
+features in a project, for example, or when working on a new architecture.
+
+The +BR2_GLOBAL_PATCH_DIR+ configuration file option can be
+used to specify a directory containing global package patches.
+
+For a specific version <packageversion> of a specific package <packagename>,
+patches are applied as follows.
+
+First, the default Buildroot patch set for the package is applied.
+
+If the directory +$(BR2_GLOBAL_PATCH_DIR)/<packagename>/<packageversion>+
+exists, then all +*.patch+ files in the directory will be applied.
+
+Otherwise, if the directory +$(BR2_GLOBAL_PATCH_DIR)/<packagename>+
+exists, then all +*.patch+ files in the directory will be applied.
diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt
index 3b1a5a7342..0456ef16f0 100644
--- a/docs/manual/customize.txt
+++ b/docs/manual/customize.txt
@@ -15,3 +15,5 @@ include::customize-kernel-config.txt[]
 include::customize-toolchain.txt[]
 
 include::customize-store.txt[]
+
+include::customize-packages.txt[]
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 0f55b26dc3..d2250ad0cd 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -11,8 +11,9 @@ necessary to patch the source of the software to get it cross-built within
 Buildroot.
 
 Buildroot offers an infrastructure to automatically handle this during
-the builds. It supports two ways of applying patch sets: downloaded patches
-and patches supplied within buildroot.
+the builds. It supports three ways of applying patch sets: downloaded patches,
+patches supplied within buildroot and patches located in a user-defined
+global patch directory.
 
 Providing patches
 ~~~~~~~~~~~~~~~~~
@@ -45,6 +46,13 @@ application order.
 reference in their filename.
 - The field +<number>+ in the patch file name refers to the 'apply order'.
 
+Global patch directory
+^^^^^^^^^^^^^^^^^^^^^^
+
+The +BR2_GLOBAL_PATCH_DIR+ configuration file option can be
+used to specify a directory containing global package patches. See
+xref:packages-custom[] for details.
+
 
 How patches are applied
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -57,7 +65,7 @@ How patches are applied
   tarballs are applied;
 
 . If there are some +*.patch+ files in the package directory or in the
-  a package subdirectory named +<packagename>-<packageversion>+, then:
+  a package subdirectory named +<packageversion>+, then:
 +
 * If a +series+ file exists in the package directory, then patches are
   applied according to the +series+ file;
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 8d964a18c1..afb90bf791 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -82,21 +82,21 @@ endif
 # find the package directory (typically package/<pkgname>) and the
 # prefix of the patches
 $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
+$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME)
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
 	$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
 	$(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(p)$(sep))
 	$(Q)( \
-	if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
-	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
-	    support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
-	  else \
-	    support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
-	    if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \
-	      support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
+	for D in $(PATCH_BASE_DIRS); do \
+	  if test -d $${D}; then \
+	    if test -d $${D}/$($(PKG)_VERSION); then \
+	      support/scripts/apply-patches.sh $(@D) $${D}/$($(PKG)_VERSION) \*.patch \*.patch.$(ARCH) || exit 1; \
+	    else \
+	      support/scripts/apply-patches.sh $(@D) $${D} \*.patch \*.patch.$(ARCH) || exit 1; \
 	    fi; \
 	  fi; \
-	fi; \
+	done; \
 	)
 	$(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@

From abb4a5b66d5b0a64a3e6e0eddf24622a4290ca96 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 10:49:19 +0100
Subject: [PATCH 4453/6849] libdrm: bump version and add lib_pciaccess
 dependancy

---
 package/libdrm/Config.in | 1 +
 package/libdrm/libdrm.mk | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index f1c3358c1c..8bf676b9de 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
 	select BR2_PACKAGE_XLIB_LIBXXF86VM
 	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
 	# libatomic_ops is only available on a subset of the supported
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 4ccfa522f6..5dd276f8ca 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -3,7 +3,7 @@
 # libdrm
 #
 #############################################################
-LIBDRM_VERSION = 2.4.23
+LIBDRM_VERSION = 2.4.38
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
 LIBDRM_INSTALL_STAGING = YES
@@ -13,6 +13,7 @@ LIBDRM_DEPENDENCIES = \
 	xproto_xf86vidmodeproto \
 	xlib_libXxf86vm \
 	xlib_libXmu \
+	xlib_libpciaccess \
 	xproto_dri2proto \
 	xlib_libpthread-stubs \
 	host-pkgconf

From 4a615d82a0f38fcc644f0f9479d30f754721b816 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:39:46 +0100
Subject: [PATCH 4454/6849] xapp_iceauth: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_iceauth/xapp_iceauth.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 569f05373d..a42e5bd1fb 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_ICEAUTH_VERSION = 1.0.4
+XAPP_ICEAUTH_VERSION = 1.0.5
 XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11

From e5719a014bce1c8cd4ff336ee900527dccc993bd Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:40:06 +0100
Subject: [PATCH 4455/6849] xapp_luit: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_luit/xapp_luit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index 7a0ab35df0..ddb7883c59 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_LUIT_VERSION = 1.1.0
+XAPP_LUIT_VERSION = 1.1.1
 XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
 XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc

From 3bce5eedcd7f3c3ec1af5090496410f7081e9fae Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:40:42 +0100
Subject: [PATCH 4456/6849] xapp_makefontscale: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 99155495b2..2f299a643c 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_MKFONTSCALE_VERSION = 1.0.8
+XAPP_MKFONTSCALE_VERSION = 1.1.0
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto

From 2b00ce79e2bec34c111669c4bf6619d2664510f0 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:41:02 +0100
Subject: [PATCH 4457/6849] xapp_sessreg: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_sessreg/xapp_sessreg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 6b0fbdee95..6f7fd887c1 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_SESSREG_VERSION = 1.0.6
+XAPP_SESSREG_VERSION = 1.0.7
 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
 XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto

From 1b600d9a76913b2cec678f4ebbdad8a254829f6f Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:41:22 +0100
Subject: [PATCH 4458/6849] xapp_setxkbmap: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index ef28f1ca0b..1f1e5d3d89 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_SETXKBMAP_VERSION = 1.2.0
+XAPP_SETXKBMAP_VERSION = 1.3.0
 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
 XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile

From 123aaf1e43df75d16e5d49890a1e3ba4a9a80051 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:41:53 +0100
Subject: [PATCH 4459/6849] xapp_smproxy: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_smproxy/xapp_smproxy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 2653cf49f9..11c470dc6d 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_SMPROXY_VERSION = 1.0.4
+XAPP_SMPROXY_VERSION = 1.0.5
 XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
 XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt

From ec981d0a1b8bea1dcb68d547357ede61d74469fe Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:42:47 +0100
Subject: [PATCH 4460/6849] xapp_xauth: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xauth/xapp_xauth.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index d075c05513..a34ec00400 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XAUTH_VERSION = 1.0.5
+XAPP_XAUTH_VERSION = 1.0.7
 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu

From c57edf592e7060230714c47aa9f8f4dce216d58f Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:43:42 +0100
Subject: [PATCH 4461/6849] xapp_xcmsdb: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 64fe99f682..7b513a87b7 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XCMSDB_VERSION = 1.0.3
+XAPP_XCMSDB_VERSION = 1.0.4
 XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
 XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11

From 61c4b01e80b143a9ca6a148f4361c41aa2ccf7f3 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:44:19 +0100
Subject: [PATCH 4462/6849] xapp_xdpyinfo: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index fea4fb03f7..47a004b4ec 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XDPYINFO_VERSION = 1.2.0
+XAPP_XDPYINFO_VERSION = 1.3.0
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx

From b86f1e9001e91aff9b4567d5992f6399b760aefa Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:45:07 +0100
Subject: [PATCH 4463/6849] xapp_xev: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xev/xapp_xev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index c246be5331..bf4cd30324 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XEV_VERSION = 1.1.0
+XAPP_XEV_VERSION = 1.2.0
 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEV_DEPENDENCIES = xlib_libX11

From d10f1bd792041a97b0ac84ce40c9587a82d250c6 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:45:25 +0100
Subject: [PATCH 4464/6849] xapp_xgamma: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xgamma/xapp_xgamma.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index b755c858e9..6e2197dc05 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XGAMMA_VERSION = 1.0.4
+XAPP_XGAMMA_VERSION = 1.0.5
 XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
 XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm

From 7e645b934c5d741e785167f3b54a30a84f3ad4c6 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:45:39 +0100
Subject: [PATCH 4465/6849] xapp_xhost: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xhost/xapp_xhost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 874bf5e955..2b72d81d6e 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XHOST_VERSION = 1.0.4
+XAPP_XHOST_VERSION = 1.0.5
 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu

From df5468822c435770862012df7591a239ff1de6fc Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:45:52 +0100
Subject: [PATCH 4466/6849] xapp_xinput: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xinput/xapp_xinput.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 022deec865..0eaa50c6e5 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XINPUT_VERSION = 1.5.4
+XAPP_XINPUT_VERSION = 1.6.0
 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi

From fada259d56481b76e5a24479ebb7931c00a0df46 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:46:09 +0100
Subject: [PATCH 4467/6849] xapp_xkbcomp: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 5bfb01b1fc..095c047b67 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBCOMP_VERSION = 1.2.0
+XAPP_XKBCOMP_VERSION = 1.2.4
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile

From bbe77edf0b75effd5392b36ad3938fe47ba6d2f6 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:46:29 +0100
Subject: [PATCH 4468/6849] xapp_xkbevd: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 0e93b484e5..6327b20f35 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBEVD_VERSION = 1.1.2
+XAPP_XKBEVD_VERSION = 1.1.3
 XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
 XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile

From 59264d56af346170cc6a4e95206e6aa889a46eb3 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:48:14 +0100
Subject: [PATCH 4469/6849] xpp_xlsatoms: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index 1863ca6b0f..c10f5c22db 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XLSATOMS_VERSION = 1.1.0
+XAPP_XLSATOMS_VERSION = 1.1.1
 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu

From ff1d83a7a0ea5d3860e5a9021b19039ed7af1e1c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:48:38 +0100
Subject: [PATCH 4470/6849] xpp_xlsclients: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index 259fab58db..c8bf9309c6 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XLSCLIENTS_VERSION = 1.1.1
+XAPP_XLSCLIENTS_VERSION = 1.1.2
 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util

From b700ebfb7407fe367c44aa162a5509b1d4170c84 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:48:53 +0100
Subject: [PATCH 4471/6849] xapp_xmodmap: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index 4fa06cd09c..a1a1882cb7 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XMODMAP_VERSION = 1.0.5
+XAPP_XMODMAP_VERSION = 1.0.7
 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11

From 1301872defbbf736f372ada837570804cb6c4fde Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:49:15 +0100
Subject: [PATCH 4472/6849] xapp_xpr: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xpr/xapp_xpr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index e2c944fd88..c1220dccf9 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XPR_VERSION = 1.0.3
+XAPP_XPR_VERSION = 1.0.4
 XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
 XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 2b0c7a9baf9ccf04a2fa9303bd5d362113a1419a Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:49:31 +0100
Subject: [PATCH 4473/6849] xapp_xprop: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xprop/xapp_xprop.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 65e55d759c..d442ce90b5 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XPROP_VERSION = 1.2.0
+XAPP_XPROP_VERSION = 1.2.1
 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 3b40ceae9ca01cacbee4e04eff4a0f16978adc8c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:49:47 +0100
Subject: [PATCH 4474/6849] xapp_xrandr: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xrandr/xapp_xrandr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 5a1b363bb5..07c4c59044 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XRANDR_VERSION = 1.3.4
+XAPP_XRANDR_VERSION = 1.3.5
 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
 XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11

From 2f53bacf9e605fdde0cd24927cb40dd1f74457bb Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:51:16 +0100
Subject: [PATCH 4475/6849] xapp_xrdb: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xrdb/xapp_xrdb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index f6e5e51da5..60908c7131 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XRDB_VERSION = 1.0.7
+XAPP_XRDB_VERSION = 1.0.9
 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 98080f2ffec460be5c8ea9cdd5465c481924798e Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:51:48 +0100
Subject: [PATCH 4476/6849] xapp_xset: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xset/Config.in    | 1 -
 package/x11r7/xapp_xset/xapp_xset.mk | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/x11r7/xapp_xset/Config.in b/package/x11r7/xapp_xset/Config.in
index ff697e5091..71497ab7da 100644
--- a/package/x11r7/xapp_xset/Config.in
+++ b/package/x11r7/xapp_xset/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XAPP_XSET
 	bool "xset"
-	select BR2_PACKAGE_XLIB_LIBXFONTCACHE
 	select BR2_PACKAGE_XLIB_LIBXMU
 	help
 	  X.Org xset application
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 088cebcb21..afa6b53de6 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XAPP_XSET_VERSION = 1.2.1
+XAPP_XSET_VERSION = 1.2.2
 XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
+XAPP_XSET_DEPENDENCIES = xlib_libXmu
 
 $(eval $(autotools-package))

From 59a9c8c5938e618f58f21d55798df5bd8425e650 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:52:29 +0100
Subject: [PATCH 4477/6849] xapp_xwd: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xwd/xapp_xwd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 94ae800a62..17ad45232c 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XWD_VERSION = 1.0.4
+XAPP_XWD_VERSION = 1.0.5
 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 835cf0ba9847cc6d7a804a7d1e90088fa7c7c427 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:52:43 +0100
Subject: [PATCH 4478/6849] xapp_xwininfo: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index e7f0e038d3..b9f5f67434 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XWININFO_VERSION = 1.1.1
+XAPP_XWININFO_VERSION = 1.1.2
 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu

From 17b83d0671b7d03d62937cb60d8653d315ace286 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:52:58 +0100
Subject: [PATCH 4479/6849] xapp_xwud: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xapp_xwud/xapp_xwud.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index cbe229f775..acf5cca313 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XWUD_VERSION = 1.0.3
+XAPP_XWUD_VERSION = 1.0.4
 XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWUD_DEPENDENCIES = xlib_libX11

From a607353befae6f84290a0c18c4e73e3ebda1b979 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:53:44 +0100
Subject: [PATCH 4480/6849] xcb-proto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xcb-proto/xcb-proto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 18ca6f6bef..e76f82907c 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -3,7 +3,7 @@
 # xcb-proto
 #
 #############################################################
-XCB_PROTO_VERSION = 1.6
+XCB_PROTO_VERSION = 1.7.1
 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
 XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
 

From 57455b5a29787ec33f5dccfb567f86eab95b607a Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 13:24:17 +0100
Subject: [PATCH 4481/6849] xdriver_xf86-input-evdev: bump revision to X11R7.7

---
 package/x11r7/xdriver_xf86-input-evdev/Config.in              | 4 ++++
 .../xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk      | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
index 798fffc855..cc159c9efe 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/Config.in
+++ b/package/x11r7/xdriver_xf86-input-evdev/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
 	bool "xf86-input-evdev"
+	depends on BR2_PACKAGE_UDEV # libudev is configure dependency
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  Generic Linux input driver
+
+comment "xf86-input-evdev requires udev to be enabled"
+        depends on !BR2_PACKAGE_UDEV
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 1f69388f70..aca0373618 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.5.0
+XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.7.0
 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto udev
 
 $(eval $(autotools-package))

From 734017ed119ee3988ef0a21bc0767f1a82ab7641 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:55:53 +0100
Subject: [PATCH 4482/6849] xdriver_xf86-input-joystick: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index e4b23241eb..e76ff9cf06 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.5.0
+XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.1
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From 89095d408f2a633be23bb5ea8b7d90644e0634ac Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:56:12 +0100
Subject: [PATCH 4483/6849] xdriver_xf86-input-keyboard: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index 2035e1f2c3..5834b51891 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.5.0
+XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.6.1
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto

From cdcd42d1880bc86c3c19c441e6657e5d99d0b5fb Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:56:30 +0100
Subject: [PATCH 4484/6849] xdriver_xf86-input-mouse: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 39f5396970..4d670bd267 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.6.0
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.7.2
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From 68ad35ad568f584630fd446021d45ba79b6d8651 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 13:36:52 +0100
Subject: [PATCH 4485/6849] xdriver_xf86-input-synaptics: bump revision to
 X11R7.7

---
 package/x11r7/xdriver_xf86-input-synaptics/Config.in          | 1 +
 .../xdriver_xf86-input-synaptics.mk                           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
index 9c214b73c5..6b5e5b6185 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/Config.in
+++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
@@ -3,5 +3,6 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_MTDEV
 	help
 	  X.Org driver for synaptics input devices
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index e66acb5bd5..74a3f8698a 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.3.0
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.6.1
 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev
 
 $(eval $(autotools-package))

From 3df79efd34bb8aca362ba3749d376b7d3dec6491 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:57:24 +0100
Subject: [PATCH 4486/6849] xdriver_xf86-input-vmmouse: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index c54b2aac17..024ec01f0c 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.6.10
+XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.8.0
 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From b696efb1933ed0005310de991c7b2d7fef332905 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:57:49 +0100
Subject: [PATCH 4487/6849] xdriver_xf86-input-void: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index 191467d06a..c1a8beb1ab 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_VOID_VERSION = 1.3.1
+XDRIVER_XF86_INPUT_VOID_VERSION = 1.4.0
 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto

From db413e0066ea09a619c693938c8f2a49de42259a Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:58:15 +0100
Subject: [PATCH 4488/6849] xdriver_xf86-video-ark: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index d3b3bd7ef1..739a4d5ce0 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.3
+XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.4
 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto

From e0451922260ef1fc58d51281ebd0fcba5a7f655e Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:58:34 +0100
Subject: [PATCH 4489/6849] xdriver_xf86-video-ast: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index b1067355a3..6940a20432 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_AST_VERSION = 0.91.10
+XDRIVER_XF86_VIDEO_AST_VERSION = 0.93.10
 XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
 

From 0a1cefdd93e12a9e0bf15359a9d94b8cae856959 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:58:50 +0100
Subject: [PATCH 4490/6849] xdriver_xf86-video-ati: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index ea2d3c3134..65ecffbc3c 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.1
+XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.4
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto

From c4148c771d6a580e88730a6a6b776ec854f235ba Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:59:09 +0100
Subject: [PATCH 4491/6849] xdriver_xf86-video-cirrus: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 8071460ad1..97f0257d13 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.3.2
+XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.4.0
 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From 0c0414646050846eabd345a04efcdde4fcac2b75 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:59:24 +0100
Subject: [PATCH 4492/6849] xdriver_xf86-video-dummy: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index b1c98ec20e..5c035854cc 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.4
+XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.5
 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto

From d9d091d834fc65ca774bc28593b2979429e966f4 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:59:59 +0100
Subject: [PATCH 4493/6849] xdriver_xf86-video-geode: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index 785f2dbab3..2b963a447d 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.10
+XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.13
 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From b843b9de00bcc19a721dc189cda48402cfa2bbdd Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:00:24 +0100
Subject: [PATCH 4494/6849] xdriver_xf86-video-glide: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 64d50ed757..2d4f80ff3b 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From fc8d9e549ff113b18f4830edaa88145a0477e1b7 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:00:39 +0100
Subject: [PATCH 4495/6849] xdriver_xf86-video-glint: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 ...xf86-video-glint-1.2.1-cross-compile.patch | 29 -------------------
 .../xdriver_xf86-video-glint.mk               |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch

diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch
deleted file mode 100644
index 8c420d3a85..0000000000
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.ac	2008-06-23 11:17:07.000000000 -0400
-+++ b/configure.ac	2008-06-23 11:16:31.000000000 -0400
-@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS"
- AC_HEADER_STDC
- 
- if test "$DRI" != no; then
--        AC_CHECK_FILE([${sdkdir}/dri.h],
--                      [have_dri_h="yes"], [have_dri_h="no"])
--        AC_CHECK_FILE([${sdkdir}/sarea.h],
--                      [have_sarea_h="yes"], [have_sarea_h="no"])
--        AC_CHECK_FILE([${sdkdir}/dristruct.h],
--                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+  	if test "$cross_compiling" = "no" ; then
-+ 		AC_CHECK_FILE([${sdkdir}/dri.h],
-+                        [have_dri_h="yes"], [have_dri_h="no"])
-+ 		AC_CHECK_FILE([${sdkdir}/sarea.h],
-+                        [have_sarea_h="yes"], [have_sarea_h="no"])
-+ 		AC_CHECK_FILE([${sdkdir}/dristruct.h],
-+                        [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ 		AC_CHECK_FILE([${sdkdir}/damage.h],
-+                        [have_damage_h="yes"], [have_damage_h="no"])
-+  	else
-+  		have_dri_h="yes"
-+  		have_sarea_h="yes"
-+  		have_dristruct_h="yes"
-+  	fi
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index cd294a554b..40a0716e4b 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.5
+XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.7
 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES

From db3e7b59b9a7104a9dcac55d391ea22e7d29045d Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:00:58 +0100
Subject: [PATCH 4496/6849] xdriver_xf86-video-i128: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 4852a75c12..d2f2cd526b 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.4
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.5
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From d7f87f81dea74ae1cd5b144b2060535bdbdd2246 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 14:33:15 +0100
Subject: [PATCH 4497/6849] xdriver_xf86-video-intel: bump revision to X11R7.7

---
 .../xdriver_xf86-video-intel-cross-compile.patch      | 11 -----------
 .../xdriver_xf86-video-intel.mk                       |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch

diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch
deleted file mode 100644
index 0b020ac5cb..0000000000
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac.orig	2010-01-04 22:20:07.000000000 +0000
-+++ b/configure.ac	2010-02-19 12:12:50.000000000 +0000
-@@ -103,7 +103,7 @@
- CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
- CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
- AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
-+if test "$cross_compiling" = "no" -a test x$DRI != xno; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-         AC_CHECK_FILE([${sdkdir}/sarea.h],
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index b5bdf1a3c5..3450ab8571 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.13.0
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.19.0
 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES

From a0718d1f39dbca3da17122db06f0a12607654f72 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:02:38 +0100
Subject: [PATCH 4498/6849] xdriver_xf86-video-mach64: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index ad83661763..6e25cd1b0f 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.8.2
+XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.1
 XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES

From f570d65480e0d116a1a8c01ec5165232001ca723 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:02:56 +0100
Subject: [PATCH 4499/6849] xdriver_xf86-video-mga: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 391ca20195..17e457908d 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.13
+XDRIVER_XF86_VIDEO_MGA_VERSION = 1.5.0
 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES

From 62ab5a2533502c1dea4e19447e9d224750c7f690 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:03:12 +0100
Subject: [PATCH 4500/6849] xdriver_xf86-video-neomagic: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index c92a49d308..2690e3837f 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.5
+XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.6
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto

From a77da265be651591bd9f70783f3df4f96aed9337 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:09:46 +0100
Subject: [PATCH 4501/6849] xdriver_xf86-video-newport: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index 4924a91758..9edac5f7e1 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.3
+XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.4
 XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWPORT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto

From fa22b28ff137dd857094a52d3122a7bffefc43c5 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:03:47 +0100
Subject: [PATCH 4502/6849] xdriver_xf86-video-openchrome: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-openchrome.mk                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 9abc02e28c..e61a369d82 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -3,7 +3,7 @@
 # openchrome
 #
 #############################################################
-XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.904
+XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.906
 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://www.openchrome.org/releases
 

From c86c79513c090d457c93be9b2d789424a980b3ac Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:04:05 +0100
Subject: [PATCH 4503/6849] xdriver_xf86-video-r128: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index 8eeef5039f..a6603d77d1 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_R128_VERSION = 6.8.1
+XDRIVER_XF86_VIDEO_R128_VERSION = 6.8.2
 XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES

From bcfd75ddf18cca9214eb0d1367f9427b7d9b658e Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:04:24 +0100
Subject: [PATCH 4504/6849] xdriver_xf86-video-savage: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 89eb55b349..92d84b5769 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.1
+XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.4
 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES

From 439acdf55b0782bdce1c09448e0f1110ba122f3d Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:04:39 +0100
Subject: [PATCH 4505/6849] xdriver_xf86-video-siliconmotion: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-siliconmotion.mk                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 88e8f077ea..d7db8cee67 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.4
+XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.6
 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto

From 2e12afc342f88d89d2daf4e7e5a4c2412b8305b3 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:04:55 +0100
Subject: [PATCH 4506/6849] xdriver_xf86-video-sis: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 390c61390c..762f6abaf5 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.3
+XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.4
 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES

From 58e16644b2f9031fd8890b151f1e86860e754ac7 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:05:14 +0100
Subject: [PATCH 4507/6849] xdriver_xf86-video-tdfx: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index 5031319b4a..db3ba8cc77 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.3
+XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.4
 XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES

From cfc1a0457155d52369cc4281dd4a4bfa2ef3a039 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:05:39 +0100
Subject: [PATCH 4508/6849] xdriver_xf86-video-trident: bump revision to
 X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index a6002e8144..00e50a16ed 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.4
+XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.5
 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto

From 87eb307ac22d401e630a9ea5372f9b58ab0e2bbd Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:05:54 +0100
Subject: [PATCH 4509/6849] xdriver_xf86-video-vesa: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index b8831a04db..fea23650e8 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.0
+XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.1
 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto

From 8935f597b74c5011ab95706bbdee5493865e48a3 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:06:09 +0100
Subject: [PATCH 4510/6849] xdriver_xf86-video-vmware: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 6e87ce185d..bd014a6568 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 11.0.3
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 12.0.2
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto

From 0f8a2d727f8e26a9112c2cb47794391e5ba48271 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:06:44 +0100
Subject: [PATCH 4511/6849] xdriver_xf86-video-wsfb: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 .../x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index 355e42c702..c2948b2e3e 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.3.0
+XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.4.0
 XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto

From 5a16194efbdd611b794371304dd5dcaf8d259241 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:07:15 +0100
Subject: [PATCH 4512/6849] xfont: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xfont_font-util/xfont_font-util.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index f91b998277..f318500ace 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_UTIL_VERSION = 1.2.0
+XFONT_FONT_UTIL_VERSION = 1.3.0
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf

From 3e2f4e4b059d3e5a78d1297e91ccbf89c6075ec6 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:07:46 +0100
Subject: [PATCH 4513/6849] xkeyboard-config: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index c619da90e7..bd3314c163 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -3,7 +3,7 @@
 # xkeyboard-config
 #
 #############################################################
-XKEYBOARD_CONFIG_VERSION = 2.0
+XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
 XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp

From eacfb12f6b1d606117e165cabb57191132bba5af Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:09:23 +0100
Subject: [PATCH 4514/6849] xlib_libFS: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 47fb03a834..58a87dd53c 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBFS_VERSION = 1.0.3
+XLIB_LIBFS_VERSION = 1.0.4
 XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFS_INSTALL_STAGING = YES

From 8fc86a48afca20062fd1161065f6ea7df158b098 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:09:37 +0100
Subject: [PATCH 4515/6849] xlib_libICE: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libICE/xlib_libICE.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index c9eda7e57f..77fc3103d9 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBICE_VERSION = 1.0.7
+XLIB_LIBICE_VERSION = 1.0.8
 XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
 XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBICE_INSTALL_STAGING = YES

From 08960129486545273fee7a55c699591574d9d37d Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:09:56 +0100
Subject: [PATCH 4516/6849] xlib_libSM: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index a8d1eff1b5..ee2d25f73b 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBSM_VERSION = 1.2.0
+XLIB_LIBSM_VERSION = 1.2.1
 XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
 XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBSM_INSTALL_STAGING = YES

From 94017498819031784babe36bbef2f3b899f15653 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:10:10 +0100
Subject: [PATCH 4517/6849] xlib_libX11: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index ca4f06e1a1..3b106cd999 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBX11_VERSION = 1.4.2
+XLIB_LIBX11_VERSION = 1.5.0
 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBX11_INSTALL_STAGING = YES

From 97e90a63ccea99bbd4119e94e7b025a5b36d9cdf Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:10:34 +0100
Subject: [PATCH 4518/6849] xlib_libXScrnSaver: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 11cfa99f7b..3885aa175b 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXSCRNSAVER_VERSION = 1.2.1
+XLIB_LIBXSCRNSAVER_VERSION = 1.2.2
 XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
 XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES

From fe3c3f53971122473c5321328b6b405d47bd0ab5 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:10:53 +0100
Subject: [PATCH 4519/6849] xlib_libXau: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXau/xlib_libXau.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 6a228a2f5a..dc7f91e27e 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXAU_VERSION = 1.0.6
+XLIB_LIBXAU_VERSION = 1.0.7
 XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_INSTALL_STAGING = YES

From 515bd0873fcddc3b8612cf746180510f5199671c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:11:08 +0100
Subject: [PATCH 4520/6849] xlib_libXaw: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 6c8a681bf1..1f559c73eb 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXAW_VERSION = 1.0.9
+XLIB_LIBXAW_VERSION = 1.0.11
 XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAW_INSTALL_STAGING = YES

From 48062f4ad6ecf50b3e55a31589668fc72ebe2773 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:11:37 +0100
Subject: [PATCH 4521/6849] xlib_libXcursor: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 5adffb2a05..0b2c8aeacd 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXCURSOR_VERSION = 1.1.11
+XLIB_LIBXCURSOR_VERSION = 1.1.13
 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES

From 7d568347dae73886b8c470843cc7faad667cf21b Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:12:03 +0100
Subject: [PATCH 4522/6849] xlib_libXdmcp: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 5a702e5ac4..1437836a8d 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXDMCP_VERSION = 1.1.0
+XLIB_LIBXDMCP_VERSION = 1.1.1
 XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_INSTALL_STAGING = YES

From b102f9ddeb8b421adccff267ba085323453ad098 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:12:16 +0100
Subject: [PATCH 4523/6849] xlib_libXext: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 2ce38ef4cc..390ed0cb3d 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXEXT_VERSION = 1.2.0
+XLIB_LIBXEXT_VERSION = 1.3.1
 XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXEXT_INSTALL_STAGING = YES

From 67763f1acf6775958edd620c64f942ed67b89b02 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:12:36 +0100
Subject: [PATCH 4524/6849] xlib_libXfixes: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 35bb125173..9b2a30905b 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXFIXES_VERSION = 4.0.5
+XLIB_LIBXFIXES_VERSION = 5.0
 XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFIXES_INSTALL_STAGING = YES

From 802c43ac3058c538e0d41844d7180a3f94e29570 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:12:55 +0100
Subject: [PATCH 4525/6849] xlib_libXfont: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXfont/Config.in        | 1 -
 package/x11r7/xlib_libXfont/xlib_libXfont.mk | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/x11r7/xlib_libXfont/Config.in b/package/x11r7/xlib_libXfont/Config.in
index 407a0992af..cc1da0ea39 100644
--- a/package/x11r7/xlib_libXfont/Config.in
+++ b/package/x11r7/xlib_libXfont/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_XLIB_LIBFONTENC
 	select BR2_PACKAGE_XLIB_XTRANS
-	select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XFONT_ENCODINGS
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index c08a69b812..72f9416b5e 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-XLIB_LIBXFONT_VERSION = 1.4.3
+XLIB_LIBXFONT_VERSION = 1.4.5
 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONT_AUTORECONF = YES
 XLIB_LIBXFONT_INSTALL_STAGING = YES
-XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
+XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
 XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
 
 HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs

From e579af9dd53e8e91707ba26dcc2ff2d80cc8ab8f Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:13:17 +0100
Subject: [PATCH 4526/6849] xlib_libXft: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index eab75efa43..9bf10ef6d5 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXFT_VERSION = 2.2.0
+XLIB_LIBXFT_VERSION = 2.3.1
 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFT_AUTORECONF = YES

From 4318733ee413ea192a99610dbfc35ed0e3e42b3c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:13:29 +0100
Subject: [PATCH 4527/6849] xlib_libXi: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index b658df61f2..b258883fc5 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXI_VERSION = 1.4.2
+XLIB_LIBXI_VERSION = 1.6.1
 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXI_INSTALL_STAGING = YES

From 53c31fe57c605b1c58fbe22cbca2b5236b65704a Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:13:46 +0100
Subject: [PATCH 4528/6849] xlib_libXinerama: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index a716e95392..ae3d41a07b 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXINERAMA_VERSION = 1.1.1
+XLIB_LIBXINERAMA_VERSION = 1.1.2
 XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXINERAMA_INSTALL_STAGING = YES

From 6aa29af0942406546784f3577db216f642aa7bb3 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:14:05 +0100
Subject: [PATCH 4529/6849] xlib_libXmu: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXmu/xlib_libXmu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index ce20897922..fd2a6791ff 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXMU_VERSION = 1.1.0
+XLIB_LIBXMU_VERSION = 1.1.1
 XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
 XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXMU_INSTALL_STAGING = YES

From a74bee4a19fb5b97b96b40adf665dff7406ef6cb Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:14:18 +0100
Subject: [PATCH 4530/6849] xlib_libXpm: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 8e1001b174..bef2d0133e 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXPM_VERSION = 3.5.9
+XLIB_LIBXPM_VERSION = 3.5.10
 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPM_INSTALL_STAGING = YES

From 8ac6330cadd707d49ccfbebb4e3994af9e376786 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:14:31 +0100
Subject: [PATCH 4531/6849] xlib_libXrandr: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 1ff166c253..6c3fdbf1a1 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRANDR_VERSION = 1.3.1
+XLIB_LIBXRANDR_VERSION = 1.3.2
 XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRANDR_INSTALL_STAGING = YES

From f57b3ad9f9c779b0e81f23a834f3ad533bc8e37b Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:15:05 +0100
Subject: [PATCH 4532/6849] xlib_libXres: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 8b6e31bc38..d2d492fd76 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRES_VERSION = 1.0.5
+XLIB_LIBXRES_VERSION = 1.0.6
 XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRES_INSTALL_STAGING = YES

From 5aa802b3b97c39ab12ea20c3280f7159f1fdd192 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:15:35 +0100
Subject: [PATCH 4533/6849] xlib_libXtst: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXtst/xlib_libXtst.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index ea12389fb6..8ca44b71cd 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXTST_VERSION = 1.2.0
+XLIB_LIBXTST_VERSION = 1.2.1
 XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2
 XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXTST_INSTALL_STAGING = YES

From 1d618d26c2d2a5b7aaf43273a7a1247c7f0b5fdb Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:15:49 +0100
Subject: [PATCH 4534/6849] xlib_libXv: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 8d69217dba..06c1145d47 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXV_VERSION = 1.0.6
+XLIB_LIBXV_VERSION = 1.0.7
 XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXV_INSTALL_STAGING = YES

From 09c85128c230fd252632eaf871d7d3090ee72137 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:16:02 +0100
Subject: [PATCH 4535/6849] xlib_libXvMC: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index f6d291266e..5b92612e67 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXVMC_VERSION = 1.0.6
+XLIB_LIBXVMC_VERSION = 1.0.7
 XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXVMC_INSTALL_STAGING = YES

From 086197e12a028d57aafc273b6beaa4af1543ccee Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 14:53:02 +0100
Subject: [PATCH 4536/6849] xlib_libXxf86dga: bump revision to X11R7.7

---
 ...lib_libXxf86dga-0001-fix-compilation.patch | 27 ++++++++++++++++++
 ...lib_libXxf86dga-0002-fix-compilation.patch | 28 +++++++++++++++++++
 .../xlib_libXxf86dga/xlib_libXxf86dga.mk      |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch
 create mode 100644 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch

diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch
new file mode 100644
index 0000000000..23ab1179ff
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch
@@ -0,0 +1,27 @@
+Backported from d4f89f7f42484963575b4c7d2fa694051e111e76 
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+From d4f89f7f42484963575b4c7d2fa694051e111e76 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri, 09 Mar 2012 10:48:14 +0000
+Subject: Include <stdint.h> for uintptr_t
+
+Found-by: Tinderbox
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index 32f455b..964de18 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -21,6 +21,7 @@ Copyright (c) 1995,1996  The XFree86 Project, Inc
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+ 
++#include <stdint.h>
+ 
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch
new file mode 100644
index 0000000000..f586e2eae9
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch
@@ -0,0 +1,28 @@
+Backported from 56b5a5887349e9d0e1d28da157fe6441ca691f56
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+From 56b5a5887349e9d0e1d28da157fe6441ca691f56 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu, 08 Mar 2012 19:49:36 +0000
+Subject: Build fix when sizeof(off_t) > sizeof(void *)
+
+https://trac.macports.org/ticket/33532
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index e81b486..32f455b 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -928,7 +928,7 @@ DGAMapPhysical(
+     if ((pMap->fd = open(name, O_RDWR)) < 0)
+ 	return False;
+     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+     if (pMap->virtual == (void *)-1)
+ 	return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index 2bd9ce70c3..d57b7947a0 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXXF86DGA_VERSION = 1.1.2
+XLIB_LIBXXF86DGA_VERSION = 1.1.3
 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86DGA_INSTALL_STAGING = YES

From b648a37ac0b2e36262405fc5e6a367a1ca69453d Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:16:57 +0100
Subject: [PATCH 4537/6849] xlib_libXxf86vm: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index b445f0246d..f032b06567 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXXF86VM_VERSION = 1.1.1
+XLIB_LIBXXF86VM_VERSION = 1.1.2
 XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86VM_INSTALL_STAGING = YES

From 68c948b7b1bcf61d99ec31e4a2400d556daa7588 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:17:19 +0100
Subject: [PATCH 4538/6849] xlib_libdmx: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 6429bb33dd..0b21f8d3f1 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBDMX_VERSION = 1.1.1
+XLIB_LIBDMX_VERSION = 1.1.2
 XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBDMX_INSTALL_STAGING = YES

From ba45a9b081cb2d4d02f6214e08542a77475a5b93 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:17:33 +0100
Subject: [PATCH 4539/6849] xlib_libfontenc: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 219cf7a9fb..191db88a97 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBFONTENC_VERSION = 1.1.0
+XLIB_LIBFONTENC_VERSION = 1.1.1
 XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFONTENC_INSTALL_STAGING = YES

From 857e93aa71479913a9abf5aa1a03ccd47d03aa66 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:17:46 +0100
Subject: [PATCH 4540/6849] xlib_libpciaccess: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 53e035653f..f2a5d24380 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBPCIACCESS_VERSION = 0.12.1
+XLIB_LIBPCIACCESS_VERSION = 0.13.1
 XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES

From 2af3bc5ba4f2e14072578140eb68b7fc0afdaf0f Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:18:05 +0100
Subject: [PATCH 4541/6849] xlib_libxkbfile: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 6db20db509..bd63961566 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXKBFILE_VERSION = 1.0.7
+XLIB_LIBXKBFILE_VERSION = 1.0.8
 XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
 XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES

From 3a7b857d154b246e602e15a5259571b45297bab8 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:18:33 +0100
Subject: [PATCH 4542/6849] xlib_xtrans: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xlib_xtrans/xlib_xtrans.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 85829854bf..1d2d68a192 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_XTRANS_VERSION = 1.2.6
+XLIB_XTRANS_VERSION = 1.2.7
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_INSTALL_STAGING = YES

From 636f42afebce3aec30a43a3113284776683f4b01 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:19:43 +0100
Subject: [PATCH 4543/6849] xproto_applewmproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index f7b763a1de..a860227e89 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_APPLEWMPROTO_VERSION = 1.4.1
+XPROTO_APPLEWMPROTO_VERSION = 1.4.2
 XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2
 XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES

From f4dfa14eb3eadede81b8b7c6cb819489d81901c4 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:20:03 +0100
Subject: [PATCH 4544/6849] xproto_bigreqsproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index dc236fa1cb..1cf4b5f0ce 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_BIGREQSPROTO_VERSION = 1.1.1
+XPROTO_BIGREQSPROTO_VERSION = 1.1.2
 XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
 XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES

From 0a7ffcf73ceabea9848ecc5067b798987d978306 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:21:24 +0100
Subject: [PATCH 4545/6849] xproto_fontsproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 5252fd9082..bb5efd3466 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_FONTSPROTO_VERSION = 2.1.1
+XPROTO_FONTSPROTO_VERSION = 2.1.2
 XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
 XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES

From e7e8974c9f3256942ef7236a6c0eeab154cecb91 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:21:41 +0100
Subject: [PATCH 4546/6849] xproto_glproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_glproto/xproto_glproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index f576d0dfaa..38a9a65faa 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_GLPROTO_VERSION = 1.4.12
+XPROTO_GLPROTO_VERSION = 1.4.15
 XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
 XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_GLPROTO_INSTALL_STAGING = YES

From 11b45ab87a5495fc6e43ff77a226e33c10824d05 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:21:56 +0100
Subject: [PATCH 4547/6849] xproto_inputproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_inputproto/xproto_inputproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 9e9b0ab5f1..a265d96979 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_INPUTPROTO_VERSION = 2.0.1
+XPROTO_INPUTPROTO_VERSION = 2.2
 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES

From a48579303639d17681a931675d0ee80396246084 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:22:21 +0100
Subject: [PATCH 4548/6849] xproto_kbproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_kbproto/xproto_kbproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index 8fcc8df546..1c1973a6ee 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_KBPROTO_VERSION = 1.0.5
+XPROTO_KBPROTO_VERSION = 1.0.6
 XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
 XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_KBPROTO_INSTALL_STAGING = YES

From dce4f431bafb506f3c848d2a30e50417cb28eb5c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:22:53 +0100
Subject: [PATCH 4549/6849] xproto_recordproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_recordproto/xproto_recordproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 73f8a3379c..e97ebef70c 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_RECORDPROTO_VERSION = 1.14
+XPROTO_RECORDPROTO_VERSION = 1.14.2
 XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2
 XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RECORDPROTO_INSTALL_STAGING = YES

From a7d8e583ee6370f58184675712ee0e176de8311f Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:23:21 +0100
Subject: [PATCH 4550/6849] proto_resourceproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index 7f8121d661..4ff8736ced 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_RESOURCEPROTO_VERSION = 1.1.1
+XPROTO_RESOURCEPROTO_VERSION = 1.2.0
 XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
 XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES

From 8d79087ae69ae8939760146f4bdd21627d0697e9 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:23:37 +0100
Subject: [PATCH 4551/6849] xproto_scrnsaverproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 360db11896..34e708c33d 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_SCRNSAVERPROTO_VERSION = 1.2.1
+XPROTO_SCRNSAVERPROTO_VERSION = 1.2.2
 XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
 XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES

From 58ddbbc0cca18b868f6fe167f47d5a533f8da895 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:24:07 +0100
Subject: [PATCH 4552/6849] xproto_xcmiscproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 027ef4faca..d13a361e22 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XCMISCPROTO_VERSION = 1.2.1
+XPROTO_XCMISCPROTO_VERSION = 1.2.2
 XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
 XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES

From 040baa82f3769ac6c6ea4557f81bc7eb16d4709c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:24:26 +0100
Subject: [PATCH 4553/6849] xproto_xextproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_xextproto/xproto_xextproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 8114f789fb..cf7bd21205 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XEXTPROTO_VERSION = 7.2.0
+XPROTO_XEXTPROTO_VERSION = 7.2.1
 XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
 XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES

From 6d351b5184c8707441ef721dfca6611b35a38670 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:25:45 +0100
Subject: [PATCH 4554/6849] xproto_xproto: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xproto_xproto/xproto_xproto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index 1f480b5b24..25d1541588 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_XPROTO_VERSION = 7.0.21
+XPROTO_XPROTO_VERSION = 7.0.23
 XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
 XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_XPROTO_INSTALL_STAGING = YES

From a793ff0aa467daa3f057a091e80513f6f956dc1b Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:26:10 +0100
Subject: [PATCH 4555/6849] xutil_makedepend: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xutil_makedepend/xutil_makedepend.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index e6b6238672..ff4d9bd005 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XUTIL_MAKEDEPEND_VERSION = 1.0.2
+XUTIL_MAKEDEPEND_VERSION = 1.0.4
 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2
 XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
 

From 5a5bc044d1bf8d7a1d287a3b3b88800cc5f7d813 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:26:52 +0100
Subject: [PATCH 4556/6849] xserver_xorg-server: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/xserver_xorg-server/Config.in              | 1 -
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 21b07009ab..c860a1d9a1 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -45,7 +45,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
 	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
 	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
-	select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
 	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XUTIL_UTIL_MACROS
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 140cb8b7ff..f0b19aad39 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XSERVER_XORG_SERVER_VERSION = 1.9.4
+XSERVER_XORG_SERVER_VERSION = 1.12.2
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
@@ -46,7 +46,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xproto_xextproto 		\
 	xproto_xf86bigfontproto 	\
 	xproto_xf86dgaproto 		\
-	xproto_xf86rushproto 		\
 	xproto_xf86vidmodeproto 	\
 	xproto_xproto 			\
 	xkeyboard-config		\

From 53cea4462c67a6707bf8dad83fa928262e44fce9 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 21:30:07 +0100
Subject: [PATCH 4557/6849] mesa3d: bump version

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/mesa3d/mesa3d.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index b16d5e6c16..7b7f5b4d9c 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MESA3D_VERSION = 7.10.1
+MESA3D_VERSION = 7.10.3
 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 MESA3D_AUTORECONF = YES

From 6d56b9970309d01a1b1c49865169a9d1901b1e67 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Mon, 11 Mar 2013 15:38:35 +0100
Subject: [PATCH 4558/6849] xproto_dri2proto: bump version

---
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index 99af25ce35..f2f387544e 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XPROTO_DRI2PROTO_VERSION = 2.3
+XPROTO_DRI2PROTO_VERSION = 2.6
 XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2
 XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_DRI2PROTO_INSTALL_STAGING = YES

From 3a41542d9b370241601cf5c8f81e988ebe5211e8 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 20:38:52 +0100
Subject: [PATCH 4559/6849] libxcb: bump revision to X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/libxcb/libxcb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 15eeeef44f..0999dc4f09 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -3,7 +3,7 @@
 # libxcb
 #
 #############################################################
-LIBXCB_VERSION = 1.7
+LIBXCB_VERSION = 1.8.1
 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
 LIBXCB_SITE = http://xcb.freedesktop.org/dist/
 

From f386dcd39be98ad1a76c9ef69021148cf9af1d26 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 14:27:29 +0100
Subject: [PATCH 4560/6849] xdriver_xf86-input-tslib: fixed build against new
 x11 version

---
 ...r_xf86-input-tslib-0001-fix-segfault.patch |  34 +++
 ...er_xf86-input-tslib-0002-port-abi-12.patch | 196 ++++++++++++++++++
 2 files changed, 230 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch
 create mode 100644 package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch

diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch
new file mode 100644
index 0000000000..adef18b302
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch
@@ -0,0 +1,34 @@
+Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+--- xf86-input-tslib-0.0.6/src/tslib.c	2009-10-19 18:07:18.000000000 +0300
++++ xf86-input-tslib-0.0.6.new/src/tslib.c	2010-02-12 16:15:05.000000000 +0200
+@@ -103,8 +103,6 @@
+ static void
+ PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
+ {
+-	ErrorF("%s\n", __FUNCTION__);
+-	return;
+ }
+ 
+ static Bool
+@@ -406,7 +404,9 @@
+ 		xf86MotionHistoryAllocate(pInfo);
+ #endif
+ 
+-		break;
++		if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
++			return !Success;
++		break;
+ 
+ 	case DEVICE_ON:
+ 		AddEnabledDevice(pInfo->fd);
+@@ -435,6 +435,7 @@
+ 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ 	ts_close(priv->ts);
+ 	xfree(pInfo->private);
++	pInfo->private = NULL;
+ 	xf86DeleteInput(pInfo, 0);
+ }
+ 
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch
new file mode 100644
index 0000000000..eb8fb542fd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch
@@ -0,0 +1,196 @@
+Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
+Fixes build against newer versions of xorg.
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+Index: xf86-input-tslib-trunk/src/tslib.c
+===================================================================
+--- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
++++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
+@@ -69,6 +69,13 @@
+ #define DEFAULT_HEIGHT		240
+ #define DEFAULT_WIDTH		320
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
++#else
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
++#endif
++
++
+ enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
+ 
+ enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
+@@ -106,7 +113,7 @@
+ }
+ 
+ static Bool
+-ConvertProc( LocalDevicePtr local,
++ConvertProc( InputInfoPtr local,
+ 			 int first,
+ 			 int num,
+ 			 int v0,
+@@ -135,7 +142,7 @@
+     return t;
+ }
+ 
+-static void ReadInput (LocalDevicePtr local)
++static void ReadInput (InputInfoPtr local)
+ {
+ 	struct ts_priv *priv = (struct ts_priv *) (local->private);
+ 	struct ts_sample samp;
+@@ -382,7 +389,11 @@
+ 					       axiswidth - 1,	/* max val */
+ 					       axiswidth,	/* resolution */
+ 					       0,		/* min_res */
+-					       axiswidth);	/* max_res */
++					       axiswidth	/* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		InitValuatorAxisStruct(device, 1,
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+@@ -392,7 +403,11 @@
+ 					       axisheight - 1,	/* max val */
+ 					       axisheight,	/* resolution */
+ 					       0,		/* min_res */
+-					       axisheight);	/* max_res */
++					       axisheight	/* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		if (InitProximityClassDeviceStruct (device) == FALSE) {
+ 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
+@@ -434,7 +449,7 @@
+ 	ErrorF("%s\n", __FUNCTION__);
+ 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ 	ts_close(priv->ts);
+-	xfree(pInfo->private);
++	free(pInfo->private);
+ 	pInfo->private = NULL;
+ 	xf86DeleteInput(pInfo, 0);
+ }
+@@ -444,47 +459,57 @@
+  *
+  * called when the module subsection is found in XF86Config
+  */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++static int 
++xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
++#else
+ static InputInfoPtr
+ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
++#endif
+ {
+ 	struct ts_priv *priv;
+ 	char *s;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	InputInfoPtr pInfo;
++#endif
+ 
+-	priv = xcalloc (1, sizeof (struct ts_priv));
++	priv = calloc (1, sizeof (struct ts_priv));
+         if (!priv)
+-                return NULL;
++                return BadValue;
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
+-		xfree(priv);
+-		return NULL;
++		free(priv);
++		return BadValue;
+ 	}
+ 
+ 	/* Initialise the InputInfoRec. */
+ 	pInfo->name = dev->identifier;
+-	pInfo->type_name = XI_TOUCHSCREEN;
+ 	pInfo->flags =
+ 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
+ 	    XI86_SEND_DRAG_EVENTS;
+-	pInfo->device_control = xf86TslibControlProc;
+-	pInfo->read_input = ReadInput;
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 	pInfo->motion_history_proc = xf86GetMotionEvents;
+ 	pInfo->history_size = 0;
+ #endif
+-	pInfo->control_proc = NULL;
++	pInfo->conf_idev = dev;
+ 	pInfo->close_proc = NULL;
+-	pInfo->switch_mode = NULL;
+ 	pInfo->conversion_proc = ConvertProc;
+ 	pInfo->reverse_conversion_proc = NULL;
+-	pInfo->dev = NULL;
+ 	pInfo->private_flags = 0;
+ 	pInfo->always_core_feedback = 0;
+-	pInfo->conf_idev = dev;
++#endif
++
++	pInfo->type_name = XI_TOUCHSCREEN;
++	pInfo->control_proc = NULL;
++	pInfo->read_input = ReadInput;
++	pInfo->device_control = xf86TslibControlProc;
++	pInfo->switch_mode = NULL;
+ 	pInfo->private = priv;
++	pInfo->dev = NULL;
+ 
+ 	/* Collect the options, and process the common options. */
+-	xf86CollectInputOptions(pInfo, NULL, NULL);
++	COLLECT_INPUT_OPTIONS(pInfo, NULL);
+ 	xf86ProcessCommonOptions(pInfo, pInfo->options);
+ 
+ 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
+@@ -510,23 +535,31 @@
+ 		priv->rotate = TSLIB_ROTATE_NONE;
+ 	}
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
++#else
++	s = xf86CheckStrOption(pInfo->options, "path", NULL);
++#endif
+   	if (!s)
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
++#else
++		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
++#endif
+  
+ 	priv->ts = ts_open(s, 1);
+-	xfree(s);
++	free(s);
+ 
+ 	if (!priv->ts) {
+ 		ErrorF("ts_open failed (device=%s)\n",s);
+ 		xf86DeleteInput(pInfo, 0);
+-		return NULL;
++		return BadValue;
+ 	}
+ 
+ 	if (ts_config(priv->ts)) {
+ 		ErrorF("ts_config failed\n");
+ 		xf86DeleteInput(pInfo, 0);
+-		return NULL;
++		return BadValue;
+ 	}
+ 
+ 	pInfo->fd = ts_fd(priv->ts);
+@@ -536,11 +569,13 @@
+ 		priv->state = BUTTON_EMULATION_OFF;
+ 	}
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	/* Mark the device configured */
+ 	pInfo->flags |= XI86_CONFIGURED;
++#endif
+ 
+ 	/* Return the configured device */
+-	return (pInfo);
++	return Success;
+ }
+ 
+ _X_EXPORT InputDriverRec TSLIB = {

From 6a9f13a24783104b71c175c23ba3234264996cc6 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 11:55:13 +0100
Subject: [PATCH 4561/6849] xapp_xplsprinters: removed in X11R7.7

---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xapp_xplsprinters/Config.in            |  7 -------
 package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk | 12 ------------
 3 files changed, 20 deletions(-)
 delete mode 100644 package/x11r7/xapp_xplsprinters/Config.in
 delete mode 100644 package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 5d0f991ca8..026b448ce1 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -128,7 +128,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xmh/Config.in
 		source package/x11r7/xapp_xmodmap/Config.in
 		source package/x11r7/xapp_xmore/Config.in
-		source package/x11r7/xapp_xplsprinters/Config.in
 		source package/x11r7/xapp_xpr/Config.in
 		source package/x11r7/xapp_xprehashprinterlist/Config.in
 		source package/x11r7/xapp_xprop/Config.in
diff --git a/package/x11r7/xapp_xplsprinters/Config.in b/package/x11r7/xapp_xplsprinters/Config.in
deleted file mode 100644
index 16a139b8bf..0000000000
--- a/package/x11r7/xapp_xplsprinters/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XAPP_XPLSPRINTERS
-	bool "xplsprinters"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXP
-	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
-	help
-	  shows a list of Xprint printers and it's attributes
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
deleted file mode 100644
index 4d2c697463..0000000000
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xplsprinters -- shows a list of Xprint printers and it's attributes
-#
-################################################################################
-
-XAPP_XPLSPRINTERS_VERSION = 1.0.1
-XAPP_XPLSPRINTERS_SOURCE = xplsprinters-$(XAPP_XPLSPRINTERS_VERSION).tar.bz2
-XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-
-$(eval $(autotools-package))

From f5ca572282a492200847a7ef6ddba63950f18634 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 12:00:22 +0100
Subject: [PATCH 4562/6849] xapp_xprehashprinterlist: removed in X11R7.7

---
 package/x11r7/Config.in                              |  1 -
 package/x11r7/xapp_xprehashprinterlist/Config.in     |  6 ------
 .../xapp_xprehashprinterlist.mk                      | 12 ------------
 3 files changed, 19 deletions(-)
 delete mode 100644 package/x11r7/xapp_xprehashprinterlist/Config.in
 delete mode 100644 package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 026b448ce1..e17201a96c 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -129,7 +129,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xmodmap/Config.in
 		source package/x11r7/xapp_xmore/Config.in
 		source package/x11r7/xapp_xpr/Config.in
-		source package/x11r7/xapp_xprehashprinterlist/Config.in
 		source package/x11r7/xapp_xprop/Config.in
 		source package/x11r7/xapp_xrandr/Config.in
 		source package/x11r7/xapp_xrdb/Config.in
diff --git a/package/x11r7/xapp_xprehashprinterlist/Config.in b/package/x11r7/xapp_xprehashprinterlist/Config.in
deleted file mode 100644
index 056fdb6b5b..0000000000
--- a/package/x11r7/xapp_xprehashprinterlist/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_XAPP_XPREHASHPRINTERLIST
-	bool "xprehashprinterlist"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXP
-	help
-	  Recomputes the list of available printers.
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
deleted file mode 100644
index 5ae32d2a21..0000000000
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xprehashprinterlist -- Recomputes the list of available printers.
-#
-################################################################################
-
-XAPP_XPREHASHPRINTERLIST_VERSION = 1.0.1
-XAPP_XPREHASHPRINTERLIST_SOURCE = xprehashprinterlist-$(XAPP_XPREHASHPRINTERLIST_VERSION).tar.bz2
-XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
-
-$(eval $(autotools-package))

From bc138da9f9a4a182fa221da2585968921add9270 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:41:47 +0100
Subject: [PATCH 4563/6849] xlib_liboldX: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                    |  1 -
 package/x11r7/xlib_liboldX/Config.in       |  5 -----
 package/x11r7/xlib_liboldX/xlib_liboldX.mk | 14 --------------
 3 files changed, 20 deletions(-)
 delete mode 100644 package/x11r7/xlib_liboldX/Config.in
 delete mode 100644 package/x11r7/xlib_liboldX/xlib_liboldX.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index e17201a96c..81b16f0301 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -52,7 +52,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXxf86vm/Config.in
 		source package/x11r7/xlib_libdmx/Config.in
 		source package/x11r7/xlib_libfontenc/Config.in
-		source package/x11r7/xlib_liboldX/Config.in
 		source package/x11r7/xlib_libxkbfile/Config.in
 		source package/x11r7/xlib_libxkbui/Config.in
 		source package/x11r7/xlib_xtrans/Config.in
diff --git a/package/x11r7/xlib_liboldX/Config.in b/package/x11r7/xlib_liboldX/Config.in
deleted file mode 100644
index e3129216f7..0000000000
--- a/package/x11r7/xlib_liboldX/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBOLDX
-	bool "liboldX"
-	select BR2_PACKAGE_XLIB_LIBX11
-	help
-	  X.Org oldX library
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
deleted file mode 100644
index f4db12b379..0000000000
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_liboldX -- X.Org oldX library
-#
-################################################################################
-
-XLIB_LIBOLDX_VERSION = 1.0.1
-XLIB_LIBOLDX_SOURCE = liboldX-$(XLIB_LIBOLDX_VERSION).tar.bz2
-XLIB_LIBOLDX_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBOLDX_INSTALL_STAGING = YES
-XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
-XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
-
-$(eval $(autotools-package))

From 3ecb1945835036127b317554c0fb737d4b24cbc4 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:42:19 +0100
Subject: [PATCH 4564/6849] xlib_libXfontcache: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                            |  1 -
 package/x11r7/xlib_libXfontcache/Config.in         |  7 -------
 .../x11r7/xlib_libXfontcache/xlib_libXfontcache.mk | 14 --------------
 3 files changed, 22 deletions(-)
 delete mode 100644 package/x11r7/xlib_libXfontcache/Config.in
 delete mode 100644 package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 81b16f0301..3773e45795 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -32,7 +32,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXext/Config.in
 		source package/x11r7/xlib_libXfixes/Config.in
 		source package/x11r7/xlib_libXfont/Config.in
-		source package/x11r7/xlib_libXfontcache/Config.in
 		source package/x11r7/xlib_libXft/Config.in
 		source package/x11r7/xlib_libXi/Config.in
 		source package/x11r7/xlib_libXinerama/Config.in
diff --git a/package/x11r7/xlib_libXfontcache/Config.in b/package/x11r7/xlib_libXfontcache/Config.in
deleted file mode 100644
index 3a20451143..0000000000
--- a/package/x11r7/xlib_libXfontcache/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXFONTCACHE
-	bool "libXfontcache"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
-	help
-	  X.Org Xfontcache library
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
deleted file mode 100644
index b2faf5c941..0000000000
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_libXfontcache -- X.Org Xfontcache library
-#
-################################################################################
-
-XLIB_LIBXFONTCACHE_VERSION = 1.0.5
-XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2
-XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
-XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
-XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
-
-$(eval $(autotools-package))

From 922a349431af614a92530c1dc83d4faeb5ae8a22 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:43:03 +0100
Subject: [PATCH 4565/6849] xlib_libxkbui: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                      |  1 -
 package/x11r7/xlib_libxkbui/Config.in        |  7 -------
 package/x11r7/xlib_libxkbui/xlib_libxkbui.mk | 13 -------------
 3 files changed, 21 deletions(-)
 delete mode 100644 package/x11r7/xlib_libxkbui/Config.in
 delete mode 100644 package/x11r7/xlib_libxkbui/xlib_libxkbui.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 3773e45795..3c342e727a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -52,7 +52,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libdmx/Config.in
 		source package/x11r7/xlib_libfontenc/Config.in
 		source package/x11r7/xlib_libxkbfile/Config.in
-		source package/x11r7/xlib_libxkbui/Config.in
 		source package/x11r7/xlib_xtrans/Config.in
 		source package/x11r7/xlib_libpciaccess/Config.in
 		source package/x11r7/xlib_libpthread-stubs/Config.in
diff --git a/package/x11r7/xlib_libxkbui/Config.in b/package/x11r7/xlib_libxkbui/Config.in
deleted file mode 100644
index ceab3053ce..0000000000
--- a/package/x11r7/xlib_libxkbui/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXKBUI
-	bool "libxkbui"
-	select BR2_PACKAGE_XLIB_LIBXKBFILE
-	select BR2_PACKAGE_XLIB_LIBXT
-	select BR2_PACKAGE_XPROTO_KBPROTO
-	help
-	  X.Org xkbui library
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
deleted file mode 100644
index 7e6ec258d9..0000000000
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xlib_libxkbui -- X.Org xkbui library
-#
-################################################################################
-
-XLIB_LIBXKBUI_VERSION = 1.0.2
-XLIB_LIBXKBUI_SOURCE = libxkbui-$(XLIB_LIBXKBUI_VERSION).tar.bz2
-XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXKBUI_INSTALL_STAGING = YES
-XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
-
-$(eval $(autotools-package))

From 061ae564c456e5d0b4e118767f4252107456dfce Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:44:07 +0100
Subject: [PATCH 4566/6849] xlib_libXprintAppUtil: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                             |  1 -
 package/x11r7/xlib_libXprintAppUtil/Config.in       |  7 -------
 .../xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk  | 13 -------------
 3 files changed, 21 deletions(-)
 delete mode 100644 package/x11r7/xlib_libXprintAppUtil/Config.in
 delete mode 100644 package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 3c342e727a..42ecea3f06 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -38,7 +38,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXmu/Config.in
 		source package/x11r7/xlib_libXp/Config.in
 		source package/x11r7/xlib_libXpm/Config.in
-		source package/x11r7/xlib_libXprintAppUtil/Config.in
 		source package/x11r7/xlib_libXprintUtil/Config.in
 		source package/x11r7/xlib_libXrandr/Config.in
 		source package/x11r7/xlib_libXrender/Config.in
diff --git a/package/x11r7/xlib_libXprintAppUtil/Config.in b/package/x11r7/xlib_libXprintAppUtil/Config.in
deleted file mode 100644
index 351675ab34..0000000000
--- a/package/x11r7/xlib_libXprintAppUtil/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXPRINTAPPUTIL
-	bool "libXprintAppUtil"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXP
-	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
-	help
-	  X.Org XprintAppUtil library
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
deleted file mode 100644
index b01af405ca..0000000000
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xlib_libXprintAppUtil -- X.Org XprintAppUtil library
-#
-################################################################################
-
-XLIB_LIBXPRINTAPPUTIL_VERSION = 1.0.1
-XLIB_LIBXPRINTAPPUTIL_SOURCE = libXprintAppUtil-$(XLIB_LIBXPRINTAPPUTIL_VERSION).tar.bz2
-XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
-XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-
-$(eval $(autotools-package))

From 3c7eb6ca23b6b17357059688b47c150a06310dac Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 11:56:25 +0100
Subject: [PATCH 4567/6849] xlib_libXprintUtil: removed in X11R7.7

---
 package/x11r7/Config.in                             |  1 -
 package/x11r7/xapp_xdbedizzy/Config.in              |  1 -
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk      |  2 +-
 package/x11r7/xapp_xedit/Config.in                  |  1 -
 package/x11r7/xapp_xedit/xapp_xedit.mk              |  2 +-
 package/x11r7/xapp_xlogo/Config.in                  |  1 -
 package/x11r7/xapp_xlogo/xapp_xlogo.mk              |  2 +-
 package/x11r7/xapp_xmore/Config.in                  |  1 -
 package/x11r7/xapp_xmore/xapp_xmore.mk              |  2 +-
 package/x11r7/xlib_libXprintUtil/Config.in          |  8 --------
 .../x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk  | 13 -------------
 11 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 package/x11r7/xlib_libXprintUtil/Config.in
 delete mode 100644 package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 42ecea3f06..954bb236d4 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -38,7 +38,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXmu/Config.in
 		source package/x11r7/xlib_libXp/Config.in
 		source package/x11r7/xlib_libXpm/Config.in
-		source package/x11r7/xlib_libXprintUtil/Config.in
 		source package/x11r7/xlib_libXrandr/Config.in
 		source package/x11r7/xlib_libXrender/Config.in
 		source package/x11r7/xlib_libXres/Config.in
diff --git a/package/x11r7/xapp_xdbedizzy/Config.in b/package/x11r7/xapp_xdbedizzy/Config.in
index 5cba398f11..fc51fee2ab 100644
--- a/package/x11r7/xapp_xdbedizzy/Config.in
+++ b/package/x11r7/xapp_xdbedizzy/Config.in
@@ -2,6 +2,5 @@ config BR2_PACKAGE_XAPP_XDBEDIZZY
 	bool "xdbedizzy"
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXP
-	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
 	help
 	  X.Org xdbedizzy application
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index bab2151adb..870d1d7868 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -7,6 +7,6 @@
 XAPP_XDBEDIZZY_VERSION = 1.0.2
 XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
 XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
+XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp 
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xedit/Config.in b/package/x11r7/xapp_xedit/Config.in
index 98e230d3d5..5a7045907c 100644
--- a/package/x11r7/xapp_xedit/Config.in
+++ b/package/x11r7/xapp_xedit/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XAPP_XEDIT
 	bool "xedit"
 	select BR2_PACKAGE_XLIB_LIBXAW
-	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
 	help
 	  simple text editor for X
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index f69d122ae9..3e26f367aa 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -7,6 +7,6 @@
 XAPP_XEDIT_VERSION = 1.2.0
 XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
 XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
+XAPP_XEDIT_DEPENDENCIES = xlib_libXaw 
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlogo/Config.in b/package/x11r7/xapp_xlogo/Config.in
index 04f779dee3..aacb75ffb0 100644
--- a/package/x11r7/xapp_xlogo/Config.in
+++ b/package/x11r7/xapp_xlogo/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XAPP_XLOGO
 	bool "xlogo"
 	select BR2_PACKAGE_XLIB_LIBXAW
-	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXFT
 	help
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index 674b943a27..73de828dc5 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -7,7 +7,7 @@
 XAPP_XLOGO_VERSION = 1.0.4
 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
+XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXrender \
 			  xlib_libXft host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmore/Config.in b/package/x11r7/xapp_xmore/Config.in
index 23fd1477ba..80c3950bb0 100644
--- a/package/x11r7/xapp_xmore/Config.in
+++ b/package/x11r7/xapp_xmore/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XAPP_XMORE
 	bool "xmore"
-	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
 	select BR2_PACKAGE_XLIB_LIBXAW
 	help
 	  plain text display program for the X Window System
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index c77c3dd2a3..e5c54b0695 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -7,6 +7,6 @@
 XAPP_XMORE_VERSION = 1.0.1
 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
+XAPP_XMORE_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXprintUtil/Config.in b/package/x11r7/xlib_libXprintUtil/Config.in
deleted file mode 100644
index 1f397f4788..0000000000
--- a/package/x11r7/xlib_libXprintUtil/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXPRINTUTIL
-	bool "libXprintUtil"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXP
-	select BR2_PACKAGE_XLIB_LIBXT
-	select BR2_PACKAGE_XPROTO_PRINTPROTO
-	help
-	  X.Org XprintUtil library
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
deleted file mode 100644
index 8e76686d74..0000000000
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xlib_libXprintUtil -- X.Org XprintUtil library
-#
-################################################################################
-
-XLIB_LIBXPRINTUTIL_VERSION = 1.0.1
-XLIB_LIBXPRINTUTIL_SOURCE = libXprintUtil-$(XLIB_LIBXPRINTUTIL_VERSION).tar.bz2
-XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
-XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
-
-$(eval $(autotools-package))

From 0cf3a6adc320d8baa9da05d17429b229074bfa43 Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 12:01:25 +0100
Subject: [PATCH 4568/6849] xlib_libXp: removed in X11R7.7

---
 package/x11r7/Config.in                        |  1 -
 package/x11r7/xapp_xdbedizzy/Config.in         |  1 -
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk |  2 +-
 package/x11r7/xapp_xdpyinfo/Config.in          |  1 -
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk   |  2 +-
 package/x11r7/xlib_libXaw/Config.in            |  1 -
 package/x11r7/xlib_libXaw/xlib_libXaw.mk       |  2 +-
 package/x11r7/xlib_libXp/Config.in             |  8 --------
 package/x11r7/xlib_libXp/xlib_libXp.mk         | 14 --------------
 9 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 package/x11r7/xlib_libXp/Config.in
 delete mode 100644 package/x11r7/xlib_libXp/xlib_libXp.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 954bb236d4..2ae59a4f0b 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -36,7 +36,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXi/Config.in
 		source package/x11r7/xlib_libXinerama/Config.in
 		source package/x11r7/xlib_libXmu/Config.in
-		source package/x11r7/xlib_libXp/Config.in
 		source package/x11r7/xlib_libXpm/Config.in
 		source package/x11r7/xlib_libXrandr/Config.in
 		source package/x11r7/xlib_libXrender/Config.in
diff --git a/package/x11r7/xapp_xdbedizzy/Config.in b/package/x11r7/xapp_xdbedizzy/Config.in
index fc51fee2ab..e4a5960fdd 100644
--- a/package/x11r7/xapp_xdbedizzy/Config.in
+++ b/package/x11r7/xapp_xdbedizzy/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XAPP_XDBEDIZZY
 	bool "xdbedizzy"
 	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XLIB_LIBXP
 	help
 	  X.Org xdbedizzy application
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 870d1d7868..f5925fc1f0 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -7,6 +7,6 @@
 XAPP_XDBEDIZZY_VERSION = 1.0.2
 XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
 XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp 
+XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdpyinfo/Config.in b/package/x11r7/xapp_xdpyinfo/Config.in
index e6ff686113..9b19ad3b79 100644
--- a/package/x11r7/xapp_xdpyinfo/Config.in
+++ b/package/x11r7/xapp_xdpyinfo/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_XAPP_XDPYINFO
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXI
-	select BR2_PACKAGE_XLIB_LIBXP
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXTST
 	select BR2_PACKAGE_XLIB_LIBXXF86DGA
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 47a004b4ec..8c23eb78f4 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -7,6 +7,6 @@
 XAPP_XDPYINFO_VERSION = 1.3.0
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
+XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXaw/Config.in b/package/x11r7/xlib_libXaw/Config.in
index 1c10bc0476..3695bb679f 100644
--- a/package/x11r7/xlib_libXaw/Config.in
+++ b/package/x11r7/xlib_libXaw/Config.in
@@ -5,6 +5,5 @@ config BR2_PACKAGE_XLIB_LIBXAW
 	select BR2_PACKAGE_XLIB_LIBXMU
 	select BR2_PACKAGE_XLIB_LIBXPM
 	select BR2_PACKAGE_XPROTO_XPROTO
-	select BR2_PACKAGE_XLIB_LIBXP
 	help
 	  X.Org Xaw library
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 1f559c73eb..5e95ae07e0 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -8,7 +8,7 @@ XLIB_LIBXAW_VERSION = 1.0.11
 XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAW_INSTALL_STAGING = YES
-XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
+XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
 XLIB_LIBXAW_CONF_OPT = --disable-docs
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXp/Config.in b/package/x11r7/xlib_libXp/Config.in
deleted file mode 100644
index 532d8ac739..0000000000
--- a/package/x11r7/xlib_libXp/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXP
-	bool "libXp"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXAU
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XPROTO_PRINTPROTO
-	help
-	  X.Org Xp library
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
deleted file mode 100644
index 9b2e4de0d2..0000000000
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_libXp -- X.Org Xp library
-#
-################################################################################
-
-XLIB_LIBXP_VERSION = 1.0.1
-XLIB_LIBXP_SOURCE = libXp-$(XLIB_LIBXP_VERSION).tar.bz2
-XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXP_INSTALL_STAGING = YES
-XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
-XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
-
-$(eval $(autotools-package))

From 52753d84a9f8c0cd36cc5ac297ae19a1c87b852c Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:49:58 +0100
Subject: [PATCH 4569/6849] xfont_font-bitstream-speedo: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                           |  1 -
 .../x11r7/xfont_font-bitstream-speedo/Config.in   |  4 ----
 .../xfont_font-bitstream-speedo.mk                | 15 ---------------
 3 files changed, 20 deletions(-)
 delete mode 100644 package/x11r7/xfont_font-bitstream-speedo/Config.in
 delete mode 100644 package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2ae59a4f0b..f0cbd6f3f6 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -198,7 +198,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xfont_font-bh-type1/Config.in
 		source package/x11r7/xfont_font-bitstream-100dpi/Config.in
 		source package/x11r7/xfont_font-bitstream-75dpi/Config.in
-		source package/x11r7/xfont_font-bitstream-speedo/Config.in
 		source package/x11r7/xfont_font-bitstream-type1/Config.in
 		source package/x11r7/xfont_font-cronyx-cyrillic/Config.in
 		source package/x11r7/xfont_font-cursor-misc/Config.in
diff --git a/package/x11r7/xfont_font-bitstream-speedo/Config.in b/package/x11r7/xfont_font-bitstream-speedo/Config.in
deleted file mode 100644
index 70750f632d..0000000000
--- a/package/x11r7/xfont_font-bitstream-speedo/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XFONT_FONT_BITSTREAM_SPEEDO
-	bool "font-bitstream-speedo"
-	help
-	  No description available
diff --git a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
deleted file mode 100644
index 79cb6ca930..0000000000
--- a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# font-bitstream-speedo -- No description available
-#
-################################################################################
-
-XFONT_FONT_BITSTREAM_SPEEDO_VERSION = 1.0.1
-XFONT_FONT_BITSTREAM_SPEEDO_SOURCE = font-bitstream-speedo-$(XFONT_FONT_BITSTREAM_SPEEDO_VERSION).tar.bz2
-XFONT_FONT_BITSTREAM_SPEEDO_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
-XFONT_FONT_BITSTREAM_SPEEDO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-
-$(eval $(autotools-package))
-

From a64a015302863df83d72a3ac33b9026ceac9eafa Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:52:41 +0100
Subject: [PATCH 4570/6849] xproto_printproto: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                             |  1 -
 package/x11r7/xapp_xdpyinfo/Config.in               |  1 -
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk        |  2 +-
 package/x11r7/xproto_printproto/Config.in           |  4 ----
 .../x11r7/xproto_printproto/xproto_printproto.mk    | 13 -------------
 5 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 package/x11r7/xproto_printproto/Config.in
 delete mode 100644 package/x11r7/xproto_printproto/xproto_printproto.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index f0cbd6f3f6..57b16edd53 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -233,7 +233,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xproto_glproto/Config.in
 		source package/x11r7/xproto_inputproto/Config.in
 		source package/x11r7/xproto_kbproto/Config.in
-		source package/x11r7/xproto_printproto/Config.in
 		source package/x11r7/xproto_randrproto/Config.in
 		source package/x11r7/xproto_recordproto/Config.in
 		source package/x11r7/xproto_renderproto/Config.in
diff --git a/package/x11r7/xapp_xdpyinfo/Config.in b/package/x11r7/xapp_xdpyinfo/Config.in
index 9b19ad3b79..261a63fe71 100644
--- a/package/x11r7/xapp_xdpyinfo/Config.in
+++ b/package/x11r7/xapp_xdpyinfo/Config.in
@@ -9,7 +9,6 @@ config BR2_PACKAGE_XAPP_XDPYINFO
 	select BR2_PACKAGE_XLIB_LIBXXF86VM
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_KBPROTO
-	select BR2_PACKAGE_XPROTO_PRINTPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
 	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 8c23eb78f4..0b724de76b 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -7,6 +7,6 @@
 XAPP_XDPYINFO_VERSION = 1.3.0
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
+XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xproto_printproto/Config.in b/package/x11r7/xproto_printproto/Config.in
deleted file mode 100644
index 69e214fa1e..0000000000
--- a/package/x11r7/xproto_printproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_PRINTPROTO
-	bool "printproto"
-	help
-	  X.Org Print protocol headers
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
deleted file mode 100644
index 641553f343..0000000000
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xproto_printproto -- X.Org Print protocol headers
-#
-################################################################################
-
-XPROTO_PRINTPROTO_VERSION = 1.0.5
-XPROTO_PRINTPROTO_SOURCE = printproto-$(XPROTO_PRINTPROTO_VERSION).tar.bz2
-XPROTO_PRINTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_PRINTPROTO_INSTALL_STAGING = YES
-XPROTO_PRINTPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))

From e31f61dcfdc031abe7ac1bc62cf5a94c39c76c9b Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 14 Jun 2012 12:53:11 +0100
Subject: [PATCH 4571/6849] xproto_xf86rushproto: removed in X11R7.7

Signed-off-by: Will Wagner <will_wagner@carallon.com>
---
 package/x11r7/Config.in                             |  1 -
 package/x11r7/xproto_xf86rushproto/Config.in        |  4 ----
 .../xproto_xf86rushproto/xproto_xf86rushproto.mk    | 13 -------------
 3 files changed, 18 deletions(-)
 delete mode 100644 package/x11r7/xproto_xf86rushproto/Config.in
 delete mode 100644 package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 57b16edd53..73803a87d8 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -245,7 +245,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xproto_xf86bigfontproto/Config.in
 		source package/x11r7/xproto_xf86dgaproto/Config.in
 		source package/x11r7/xproto_xf86driproto/Config.in
-		source package/x11r7/xproto_xf86rushproto/Config.in
 		source package/x11r7/xproto_xf86vidmodeproto/Config.in
 		source package/x11r7/xproto_xineramaproto/Config.in
 		source package/x11r7/xproto_xproto/Config.in
diff --git a/package/x11r7/xproto_xf86rushproto/Config.in b/package/x11r7/xproto_xf86rushproto/Config.in
deleted file mode 100644
index 961c31f73a..0000000000
--- a/package/x11r7/xproto_xf86rushproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XF86RUSHPROTO
-	bool "xf86rushproto"
-	help
-	  X.Org XF86Rush protocol headers
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
deleted file mode 100644
index 16094300f2..0000000000
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xproto_xf86rushproto -- X.Org XF86Rush protocol headers
-#
-################################################################################
-
-XPROTO_XF86RUSHPROTO_VERSION = 1.1.2
-XPROTO_XF86RUSHPROTO_SOURCE = xf86rushproto-$(XPROTO_XF86RUSHPROTO_VERSION).tar.bz2
-XPROTO_XF86RUSHPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
-XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))

From 96182fac06916e642184da40a1b3589d6aa293dd Mon Sep 17 00:00:00 2001
From: Jesper Baekdahl <jbb@gamblify.com>
Date: Wed, 20 Mar 2013 09:30:12 +0100
Subject: [PATCH 4572/6849] xapp_xinit: removed in X11R7.7

---
 package/x11r7/Config.in                |  1 -
 package/x11r7/xapp_xdm/Config.in       |  1 -
 package/x11r7/xapp_xdm/xapp_xdm.mk     |  2 +-
 package/x11r7/xapp_xinit/Config.in     | 10 ----------
 package/x11r7/xapp_xinit/xapp_xinit.mk | 12 ------------
 5 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 package/x11r7/xapp_xinit/Config.in
 delete mode 100644 package/x11r7/xapp_xinit/xapp_xinit.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 73803a87d8..fba49b3539 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -103,7 +103,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xgamma/Config.in
 		source package/x11r7/xapp_xgc/Config.in
 		source package/x11r7/xapp_xhost/Config.in
-		source package/x11r7/xapp_xinit/Config.in
 		source package/x11r7/xapp_xinput/Config.in
 		source package/x11r7/xapp_xinput-calibrator/Config.in
 		source package/x11r7/xapp_xkbcomp/Config.in
diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in
index c962993cf0..477cd771cd 100644
--- a/package/x11r7/xapp_xdm/Config.in
+++ b/package/x11r7/xapp_xdm/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XAPP_XDM
 	bool "xdm"
 	# Runtime dependency: can't start an X server unless there is one
 	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
-	select BR2_PACKAGE_XAPP_XINIT
 	select BR2_PACKAGE_XAPP_SESSREG
 	select BR2_PACKAGE_XAPP_XRDB
 	select BR2_PACKAGE_XLIB_LIBX11
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 16b6aa9669..1c74708697 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -8,7 +8,7 @@ XAPP_XDM_VERSION = 1.1.11
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
-XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx \
 		    --with-wtmp-file=/var/adm/wtmpx
 
diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in
deleted file mode 100644
index aede5d9691..0000000000
--- a/package/x11r7/xapp_xinit/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_XAPP_XINIT
-	bool "xinit"
-	# Runtime dependency: can't start an X server unless there is one
-	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
-	# Runtime dependency; mcookie is also in util-linux
-	select BR2_PACKAGE_MCOOKIE if !BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_XAPP_XAUTH
-	select BR2_PACKAGE_XLIB_LIBX11
-	help
-	  X Window System initializer
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
deleted file mode 100644
index fc9218d0c3..0000000000
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xinit -- X Window System initializer
-#
-################################################################################
-
-XAPP_XINIT_VERSION = 1.3.2
-XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
-XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
-
-$(eval $(autotools-package))

From 66f962224aaaad5a79e3ff49804db8034e8cdd65 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 20 Mar 2013 20:50:14 +0100
Subject: [PATCH 4573/6849] hplip: needs C++ support in toolchain

As pointed out by Thomas.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hplip/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/hplip/Config.in b/package/hplip/Config.in
index 5bcd63bbf1..d8a1580e39 100644
--- a/package/hplip/Config.in
+++ b/package/hplip/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HPLIP
 	bool "hplip"
+	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_CUPS
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_JPEG

From 77b298c67e4378c53905e504053c38ba52fd0700 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 20 Mar 2013 04:57:52 +0000
Subject: [PATCH 4574/6849] php: security bump to version 5.3.23

Fixes CVE-2013-1635 and CVE-2013-1643.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index a4179396cf..692ceb8d86 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.22
+PHP_VERSION = 5.3.23
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From 1f721a2f009393c29c6554f643f15f80a8dc5443 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 20 Mar 2013 22:16:17 +0100
Subject: [PATCH 4575/6849] xinetd: follow the convention for patch location

Following 5538e4766201aa0 ("rework patch model"), the xinetd patches
were no longer being applied, because they were stored in
package/xinetd/xinetd-2.3.15/*.patch. This lead to xinetd build
failures such as:
http://autobuild.buildroot.org/results/1a032bca894b76facd9e7f01c3b5d370987d7fc8/build-end.log.

This patch fixes this by changing the location and name of the xinetd
patches to follow the new conventions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xinetd/{xinetd-2.3.15/001-ar.patch => xinetd-001-ar.patch}    | 0
 .../{xinetd-2.3.15/002-destdir.patch => xinetd-002-destdir.patch} | 0
 .../{xinetd-2.3.15/003-rpc_fix.patch => xinetd-003-rpc-fix.patch} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename package/xinetd/{xinetd-2.3.15/001-ar.patch => xinetd-001-ar.patch} (100%)
 rename package/xinetd/{xinetd-2.3.15/002-destdir.patch => xinetd-002-destdir.patch} (100%)
 rename package/xinetd/{xinetd-2.3.15/003-rpc_fix.patch => xinetd-003-rpc-fix.patch} (100%)

diff --git a/package/xinetd/xinetd-2.3.15/001-ar.patch b/package/xinetd/xinetd-001-ar.patch
similarity index 100%
rename from package/xinetd/xinetd-2.3.15/001-ar.patch
rename to package/xinetd/xinetd-001-ar.patch
diff --git a/package/xinetd/xinetd-2.3.15/002-destdir.patch b/package/xinetd/xinetd-002-destdir.patch
similarity index 100%
rename from package/xinetd/xinetd-2.3.15/002-destdir.patch
rename to package/xinetd/xinetd-002-destdir.patch
diff --git a/package/xinetd/xinetd-2.3.15/003-rpc_fix.patch b/package/xinetd/xinetd-003-rpc-fix.patch
similarity index 100%
rename from package/xinetd/xinetd-2.3.15/003-rpc_fix.patch
rename to package/xinetd/xinetd-003-rpc-fix.patch

From 99fc6299dbceaf6d58be2fb516a346451968a704 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 21 Mar 2013 09:03:17 +0000
Subject: [PATCH 4576/6849] oprofile 0.9.8: fix compilation on powerpc

The oprofile build was broken on powerpc since version 0.9.8.
This was detected in several autobuilds, like
http://autobuild.buildroot.net/results/6f6c02d18495907d50fcdfc6003ac20d493c55fe/

Thomas Petazzoni had some fixes pending in his own tree, and this patch is
partially based on this work (credits to him). Here is an overview:
- I took over (and fixed) the oprofile.mk changes, except for the powerpc-
  specific part. For powerpc, there is a new dependency to libpfm4.
- I reimported those Yocto patches that were specific to the ppc build
  issues, but left out the other ones. Those can be added in separate
  commits.

[Peter: simplify libpfm4 check]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/oprofile/Config.in                    |   1 +
 ...profile-003-oprofile-ppc32-build-fix.patch |  32 ++++
 ...-004-fix-ppc64-specific-libpfm-usage.patch | 105 ++++++++++++
 ...-to-handle-architectures-that-do-not.patch | 154 ++++++++++++++++++
 package/oprofile/oprofile.mk                  |  19 ++-
 5 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 package/oprofile/oprofile-003-oprofile-ppc32-build-fix.patch
 create mode 100644 package/oprofile/oprofile-004-fix-ppc64-specific-libpfm-usage.patch
 create mode 100644 package/oprofile/oprofile-005-fix-up-configure-to-handle-architectures-that-do-not.patch

diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index 8c881d15ee..0fbc87c4f2 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_OPROFILE
 	bool "oprofile"
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_BINUTILS
+	select BR2_PACKAGE_LIBPFM4 if BR2_powerpc
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_aarch64 # binutils
 	help
diff --git a/package/oprofile/oprofile-003-oprofile-ppc32-build-fix.patch b/package/oprofile/oprofile-003-oprofile-ppc32-build-fix.patch
new file mode 100644
index 0000000000..0f609df0e2
--- /dev/null
+++ b/package/oprofile/oprofile-003-oprofile-ppc32-build-fix.patch
@@ -0,0 +1,32 @@
+Upstream-Status: Backport
+
+From fa889ea74b6b931e241a8cd57e90edc23cd7ab03 Mon Sep 17 00:00:00 2001
+From: William Cohen <wcohen@redhat.com>
+Date: Mon, 15 Oct 2012 15:09:55 -0500
+Subject: [PATCH] OProfile doesn't build for 32-bit ppc; the operf_utils.cpp
+ compile fails. Need to be able to build the 32-bit ppc
+ version of oprofile to provide the 32-bit ppc java support
+ libraries. The configure only handles the case of ppc64
+ with perf support.
+
+Signed-off-by: William Cohen <wcohen@redhat.com>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b739133..7449854 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,7 +104,7 @@ AC_DEFINE_UNQUOTED(HAVE_PERF_EVENTS, $HAVE_PERF_EVENTS, [Kernel support for perf
+ if test "$HAVE_PERF_EVENTS" = "1"; then
+ 	PFM_LIB=
+ 	arch="`uname -m`"
+-	if test "$arch" = "ppc64"; then
++	if test "$arch" = "ppc64" || test "$arch" = "ppc"; then
+ 		AC_CHECK_HEADER(perfmon/pfmlib.h,,[AC_MSG_ERROR([pfmlib.h not found; usually provided in papi devel package])])
+ 		AC_CHECK_LIB(pfm,pfm_get_event_name, HAVE_LIBPFM3='1'; HAVE_LIBPFM='1', [
+ 			AC_CHECK_LIB(pfm,pfm_get_os_event_encoding, HAVE_LIBPFM3='0'; HAVE_LIBPFM='1',
+-- 
+1.7.9.7
+
diff --git a/package/oprofile/oprofile-004-fix-ppc64-specific-libpfm-usage.patch b/package/oprofile/oprofile-004-fix-ppc64-specific-libpfm-usage.patch
new file mode 100644
index 0000000000..d8a43de082
--- /dev/null
+++ b/package/oprofile/oprofile-004-fix-ppc64-specific-libpfm-usage.patch
@@ -0,0 +1,105 @@
+From 8e36ad01ceb1257d05773b684dbe9358aecd3f71 Mon Sep 17 00:00:00 2001
+From: Maynard Johnson <maynardj@us.ibm.com>
+Date: Tue, 26 Feb 2013 13:41:27 -0600
+Subject: [PATCH] Fix PPC64-specific libpfm usage so it doesn't break ppc32
+ architecture
+
+The configure check to determine whether we should use libpfm or not
+is intended only for the ppc64 architecture, but was incorrectly
+hitting on the ppc32 architecture, too.  Not only that, but it was using
+'uname' which is not a good idea in cross-compile situtations.
+
+Then, aside from that, we had several instances in the source code
+of the following:
+   #if (defined(__powerpc__) || defined(__powerpc64__))
+which incorrectly included ppc32 architecutre also, when it was intended
+for use as PPC64 architecture.
+
+This patch fixes both errors.
+
+Signed-off-by: Maynard Johnson <maynardj@us.ibm.com
+---
+ configure.ac                   |    5 ++---
+ libperf_events/operf_utils.cpp |    4 ++--
+ libperf_events/operf_utils.h   |    6 ++++++
+ pe_profiling/operf.cpp         |   10 +++++-----
+ 4 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,11 +100,10 @@ else
+ 	HAVE_PERF_EVENTS='0'
+ fi
+ AC_DEFINE_UNQUOTED(HAVE_PERF_EVENTS, $HAVE_PERF_EVENTS, [Kernel support for perf_events exists])
+-
++AC_CANONICAL_HOST
+ if test "$HAVE_PERF_EVENTS" = "1"; then
+ 	PFM_LIB=
+-	arch="`uname -m`"
+-	if test "$arch" = "ppc64" || test "$arch" = "ppc"; then
++	if test "$host_cpu" = "powerpc64"; then
+ 		AC_CHECK_HEADER(perfmon/pfmlib.h,,[AC_MSG_ERROR([pfmlib.h not found; usually provided in papi devel package])])
+ 		AC_CHECK_LIB(pfm,pfm_get_event_name, HAVE_LIBPFM3='1'; HAVE_LIBPFM='1', [
+ 			AC_CHECK_LIB(pfm,pfm_get_os_event_encoding, HAVE_LIBPFM3='0'; HAVE_LIBPFM='1',
+diff --git a/libperf_events/operf_utils.cpp b/libperf_events/operf_utils.cpp
+--- a/libperf_events/operf_utils.cpp
++++ b/libperf_events/operf_utils.cpp
+@@ -82,7 +82,7 @@ static event_t comm_event;
+  * the following method is to map the operf-record event value to a value that
+  * opreport can understand.
+  */
+-#if (defined(__powerpc__) || defined(__powerpc64__))
++#if PPC64_ARCH
+ #define NIL_CODE ~0U
+ 
+ #if HAVE_LIBPFM3
+@@ -708,7 +708,7 @@ static void __handle_sample_event(event_
+ 	} else if (event->header.misc == PERF_RECORD_MISC_USER) {
+ 		in_kernel = false;
+ 	}
+-#if (defined(__powerpc__) || defined(__powerpc64__))
++#if PPC64_ARCH
+ 	else if (event->header.misc == PERF_RECORD_MISC_HYPERVISOR) {
+ #define MAX_HYPERVISOR_ADDRESS 0xfffffffULL
+ 		if (data.ip > MAX_HYPERVISOR_ADDRESS) {
+diff --git a/libperf_events/operf_utils.h b/libperf_events/operf_utils.h
+--- a/libperf_events/operf_utils.h
++++ b/libperf_events/operf_utils.h
+@@ -45,6 +45,12 @@ extern bool throttled;
+ #define MMAP_WINDOW_SZ (32 * 1024 * 1024ULL)
+ #endif
+ 
++/* A macro to be used for ppc64 architecture-specific code.  The '__powerpc__' macro
++ * is defined for both ppc64 and ppc32 architectures, so we must further qualify by
++ * including the 'HAVE_LIBPFM' macro, since that macro will be defined only for ppc64.
++ */
++#define PPC64_ARCH (HAVE_LIBPFM) && ((defined(__powerpc__) || defined(__powerpc64__)))
++
+ extern unsigned int op_nr_counters;
+ 
+ static inline size_t align_64bit(u64 x)
+diff --git a/pe_profiling/operf.cpp b/pe_profiling/operf.cpp
+--- a/pe_profiling/operf.cpp
++++ b/pe_profiling/operf.cpp
+@@ -1197,9 +1197,9 @@ static void _process_events_list(void)
+ 		_get_event_code(&event);
+ 		events.push_back(event);
+ 	}
+-#if (defined(__powerpc__) || defined(__powerpc64__))
++#if PPC64_ARCH
+ 	{
+-		/* This section of code is for architectures such as ppc[64] for which
++		/* This section of code is soley for the ppc64 architecture for which
+ 		 * the oprofile event code needs to be converted to the appropriate event
+ 		 * code to pass to the perf_event_open syscall.
+ 		 */
+@@ -1244,7 +1244,7 @@ static void get_default_event(void)
+ 	_get_event_code(&dft_evt);
+ 	events.push_back(dft_evt);
+ 
+-#if (defined(__powerpc__) || defined(__powerpc64__))
++#if PPC64_ARCH
+ 	{
+ 		/* This section of code is for architectures such as ppc[64] for which
+ 		 * the oprofile event code needs to be converted to the appropriate event
diff --git a/package/oprofile/oprofile-005-fix-up-configure-to-handle-architectures-that-do-not.patch b/package/oprofile/oprofile-005-fix-up-configure-to-handle-architectures-that-do-not.patch
new file mode 100644
index 0000000000..6d7a6ef64c
--- /dev/null
+++ b/package/oprofile/oprofile-005-fix-up-configure-to-handle-architectures-that-do-not.patch
@@ -0,0 +1,154 @@
+Upstream-Status: Backport
+
+From ca6d916a6f8f0f8abbb4c9b6a97dd1a1615bb124 Mon Sep 17 00:00:00 2001
+From: Maynard Johnson <maynardj@us.ibm.com>
+Date: Wed, 5 Dec 2012 10:16:35 -0600
+Subject: [PATCH] Fix up configure to handle architectures that do not
+ implement perf_event_open
+
+This patch fixes the following problems:
+
+1) The configure script allows the user to pass a location to kernel
+headers (via --with-kernel option) such that, even if the running
+kernel does not have perf_events support, it may be possible to
+build operf (e.g., in cross-compile environments).  But the message
+'This kernel does not have perf_events support; falling back to legacy
+oprofile' was being displayed inappropriately in such cases.  This
+patch changes the configure script so that the "falling back to
+legacy oprofile" message will only be displayed if we're running
+on a kernel that does not have perf_events support AND the user
+did not pass specify the "--with-kernel" option.
+
+2) Some architectures don't even implement the perf_event_open syscall, so the
+configure script must do more than checking kernel version and whether or not
+perf_event.h is present in order to decide if perf_events is supported.
+This patch provides that extra capability.
+
+These problems were reported by Tony Jones <tonyj@suse.com>.
+
+Signed-off-by:  Maynard Johnson <maynardj@us.ibm.com>
+---
+ configure.ac                   |   74 +++++++++++++++++++++++++++++-----------
+ utils/op_perf_events_checker.c |    6 ++--
+ 2 files changed, 58 insertions(+), 22 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,35 +70,70 @@ KERNELDIR=$withval)
+ 
+ 
+ dnl Check kernel version for perf_events supported
+-AC_MSG_CHECKING([kernel version supports perf_events])
+ if test "$KERNELDIR" != ""; then
+ 	KINC="$KERNELDIR/include"
++	PERF_EVENT_FLAGS=" -I$KERNELDIR/include"
++	AC_SUBST(PERF_EVENT_FLAGS)
++	PERF_EVENT_H="$KERNELDIR/include/linux/perf_event.h"
++else
++	PERF_EVENT_H="/usr/include/linux/perf_event.h"
+ fi
+-AX_KERNEL_VERSION(2, 6, 31, <=, kernel_has_perf_events_support="yes",
++
++PERF_EVENT_H_EXISTS="no"
++kernel_may_have_perf_events_support="no"
++AX_KERNEL_VERSION(2, 6, 31, <=, kernel_may_have_perf_events_support="yes",
+ kernel_has_perf_events_support="no")
+ 
+-if test "$kernel_has_perf_events_support" = "no"; then
+-	AC_MSG_RESULT([This kernel does not have perf_events support; falling back to legacy oprofile])
++dnl The AX_KERNEL_VERSION macro may return kernel_may_have_perf_events_support="yes",
++dnl indicating a partial answer.  Some architectures do not implement the Performance
++dnl Events Kernel Subsystem even with kernel versions > 2.6.31 -- i.e., not even
++dnl implementing the perf_event_open syscall to return ENOSYS.  So the check below
++dnl will identify and handle such situations.
++
++if test "$kernel_may_have_perf_events_support" = "yes"; then
++	AC_CHECK_HEADER($PERF_EVENT_H,PERF_EVENT_H_EXISTS="yes")
++	AC_MSG_CHECKING([kernel supports perf_events])
++	if test "$PERF_EVENT_H_EXISTS" = "yes"; then
++		rm -f test-for-PERF_EVENT_OPEN
++		AC_LANG_CONFTEST(
++			[AC_LANG_PROGRAM([[#include <linux/perf_event.h>
++				#include <asm/unistd.h>
++				#include <sys/types.h>
++				#include <string.h>
++			]],
++			[[struct perf_event_attr attr;
++				pid_t pid;
++				memset(&attr, 0, sizeof(attr));
++				attr.size = sizeof(attr);
++				attr.sample_type = PERF_SAMPLE_IP;
++				pid = getpid();
++				syscall(__NR_perf_event_open, &attr, pid, 0, -1, 0);
++				]])
++		])
++		$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-PERF_EVENT_OPEN  > /dev/null 2>&1
++		if test -f test-for-PERF_EVENT_OPEN; then
++			kernel_has_perf_events_support="yes"
++			AC_MSG_RESULT(yes)
++		else
++			AC_MSG_RESULT(no)
++			kernel_has_perf_events_support="no"
++		fi
++	else
++		AC_MSG_RESULT(unknown -- perf_event.h not found)
++	fi
+ else
+-	AC_MSG_RESULT([This kernel has perf_events support])
++	AC_MSG_RESULT(kernel supports perf_events... no)
++	kernel_has_perf_events_support="no"
++fi
++AM_CONDITIONAL(BUILD_FOR_PERF_EVENT, test "$kernel_has_perf_events_support" = "yes")
++
++if test "$kernel_has_perf_events_support" = "yes"; then
++	HAVE_PERF_EVENTS='1'
++else
++	HAVE_PERF_EVENTS='0'
++	AC_MSG_RESULT([No perf_events support available; falling back to legacy oprofile])
+ fi
+ 
+-if test "$KERNELDIR" == ""; then
+-	PERF_EVENT_H="/usr/include/linux/perf_event.h"
+-else
+-	PERF_EVENT_H="$KERNELDIR/include/linux/perf_event.h"
+-fi
+-AC_CHECK_HEADER($PERF_EVENT_H,PERF_EVENT_H_EXISTS="yes")
+-AM_CONDITIONAL(BUILD_FOR_PERF_EVENT, test -n "$PERF_EVENT_H_EXISTS")
+-if test "$PERF_EVENT_H_EXISTS" = "yes"; then
+-	HAVE_PERF_EVENTS='1'
+-	if test "$KERNELDIR" != ""; then
+-		PERF_EVENT_FLAGS=" -I$KERNELDIR/include"
+-		AC_SUBST(PERF_EVENT_FLAGS)
+-	fi
+-else
+-	HAVE_PERF_EVENTS='0'
+-fi
+ AC_DEFINE_UNQUOTED(HAVE_PERF_EVENTS, $HAVE_PERF_EVENTS, [Kernel support for perf_events exists])
+ AC_CANONICAL_HOST
+ if test "$HAVE_PERF_EVENTS" = "1"; then
+@@ -414,7 +449,7 @@ elif test "`getent passwd oprofile 2>/de
+ 	fi
+ fi
+ 
+-if  test "$PERF_EVENT_H_EXISTS" != "yes" && test "$kernel_has_perf_events_support" = "yes"; then
++if  test "$PERF_EVENT_H_EXISTS" != "yes" && test "$kernel_may_have_perf_events_support" = "yes"; then
+ 	echo "Warning: perf_event.h not found.  Please install the kernel headers package if you"
+ 	echo "         want non-root support built into OProfile."
+ fi
+diff --git a/utils/op_perf_events_checker.c b/utils/op_perf_events_checker.c
+--- a/utils/op_perf_events_checker.c
++++ b/utils/op_perf_events_checker.c
+@@ -49,8 +49,10 @@ int main(int argc, char **argv)
+ 	}
+ 
+ #if HAVE_PERF_EVENTS
+-	/* If perf_events syscall is not implemented, the syscall below will fail
+-	 * with ENOSYS (38).  If implemented, but the processor type on which this
++	/* Even if the perf_event_open syscall is implemented, the architecture may still
++	 * not provide a full implementation of the perf_events subsystem, in which case,
++	 * the syscall below will fail with ENOSYS (38).  If the perf_events subsystem is
++	 * implemented for the architecture, but the processor type on which this
+ 	 * program is running is not supported by perf_events, the syscall returns
+ 	 * ENOENT (2).
+ 	 */
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index f3ea23f921..6c397020cd 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -8,7 +8,12 @@ OPROFILE_VERSION = 0.9.8
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
 OPROFILE_LICENSE = GPLv2+
 OPROFILE_LICENSE_FILES = COPYING
-OPROFILE_CONF_OPT = --localstatedir=/var --with-kernel-support
+OPROFILE_CONF_OPT = \
+	--localstatedir=/var \
+	--disable-account-check \
+	--enable-gui=no \
+	--with-kernel=$(STAGING_DIR)/usr
+OPROFILE_AUTORECONF = YES
 OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof
 OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled
 OPROFILE_BINARIES += utils/op-check-perfevents pe_profiling/operf libabi/opimport
@@ -29,7 +34,17 @@ ifeq ($(OPROFILE_ARCH),)
 OPROFILE_ARCH = $(BR2_ARCH)
 endif
 
-OPROFILE_DEPENDENCIES = popt binutils
+OPROFILE_DEPENDENCIES = popt binutils host-pkgconf
+
+ifeq ($(BR2_PACKAGE_LIBPFM4),y)
+OPROFILE_DEPENDENCIES += libpfm4
+endif
+
+define OPROFILE_CREATE_FILES
+	touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/ChangeLog
+endef
+
+OPROFILE_POST_PATCH_HOOKS += OPROFILE_CREATE_FILES
 
 define OPROFILE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin

From c12b0672264dc8c7ef0039d0c2aa6a58d6ae9bfb Mon Sep 17 00:00:00 2001
From: Daniel Price <daniel.price@gmail.com>
Date: Tue, 19 Mar 2013 12:21:38 +0000
Subject: [PATCH 4577/6849] syslinux: bump to version 4.06

Signed-off-by: Daniel Price <daniel.price@gmail.com>
Tested-by: Will Moore <will.moore@beraninstruments.com>
Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 ---------------
 boot/syslinux/syslinux.mk                       |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 boot/syslinux/syslinux-build-fix-for-uuid.patch

diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch b/boot/syslinux/syslinux-build-fix-for-uuid.patch
deleted file mode 100644
index 04ff562356..0000000000
--- a/boot/syslinux/syslinux-build-fix-for-uuid.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Micah Gersten <micahg@ubuntu.com>
-Description: Fix build failure with --as-needed (Closes: #654838).
-
-diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile
---- syslinux.orig/utils/Makefile       2011-12-23 14:53:26.653571511 +0100
-+++ syslinux/utils/Makefile    2012-01-22 18:55:03.849466924 +0100
-@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
- 	$(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
-
- isohybrid: isohybrid.o isohdpfx.o
--	$(CC) $(LDFLAGS) -luuid -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^ -luuid
-
- gethostip: gethostip.o
- 	$(CC) $(LDFLAGS) -o $@ $^
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index f63f2e06c3..046bdc352f 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SYSLINUX_VERSION = 4.05
+SYSLINUX_VERSION = 4.06
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
 

From fc53ebdca51a88aae44a4d33aa143916450873dc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Mar 2013 02:12:34 +0000
Subject: [PATCH 4578/6849] dosfstools: fix host variant dependencies

host-dosfstools shouldn't pull host-libiconv in since that's for
uClibc-based toolchains and we don't have that package anyway.
Fixes:
http://autobuild.buildroot.net/results/7637985bfb0afdd9217c297e9b0ac5de797c137d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 332f2eef35..79d1c7acf1 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -10,6 +10,9 @@ DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
 DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)
 
+# Avoid target dosfstools dependencies, no host-libiconv
+HOST_DOSFSTOOLS_DEPENDENCIES =
+
 ifneq ($(BR2_ENABLE_LOCALE),y)
 DOSFSTOOLS_DEPENDENCIES += libiconv
 DOSFSTOOLS_LDFLAGS += -liconv

From 3d86e2f0ae5c4e1cbcb5d552779622dd1acaee82 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Mar 2013 01:53:47 +0000
Subject: [PATCH 4579/6849] kernel-headers: bump 3.{0, 2, 4, 8}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.69-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.70-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 91d3b23705..4900aef905 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -62,14 +62,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.69"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.70"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.40"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.41"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.36"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.37"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.3"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.4"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.69-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.70-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.69-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.70-headers_install-fix-__packed-in-exported-kernel-head.patch

From 8af2f091aba3d9521c09b086785c6fc8db51cc91 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Mar 2013 01:53:48 +0000
Subject: [PATCH 4580/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 438140c4b8..e37a97105a 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.3"
+	bool "3.8.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.3" if BR2_LINUX_KERNEL_3_8
+	default "3.8.4" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 3f251aa5b93be64ba61edeea93e5822962cebf39 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 23 Mar 2013 22:26:25 +0000
Subject: [PATCH 4581/6849] package/connman: version bump to 1.12, and fix
 build with newer kernels headers

... while keeping compatibility with older ones.

Fixes autobuild failure:
http://autobuild.buildroot.org/results/f99ae7af46c70f7c356b7771321511a42eb3694d/

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...tch => connman-000-uclibc-backtrace.patch} |  0
 ...nman-001-fix-for-latest-headers-3.8+.patch | 19 +++++++++++++++++++
 package/connman/connman.mk                    |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 rename package/connman/{connman-uclibc-backtrace.patch => connman-000-uclibc-backtrace.patch} (100%)
 create mode 100644 package/connman/connman-001-fix-for-latest-headers-3.8+.patch

diff --git a/package/connman/connman-uclibc-backtrace.patch b/package/connman/connman-000-uclibc-backtrace.patch
similarity index 100%
rename from package/connman/connman-uclibc-backtrace.patch
rename to package/connman/connman-000-uclibc-backtrace.patch
diff --git a/package/connman/connman-001-fix-for-latest-headers-3.8+.patch b/package/connman/connman-001-fix-for-latest-headers-3.8+.patch
new file mode 100644
index 0000000000..ef1fabcc7c
--- /dev/null
+++ b/package/connman/connman-001-fix-for-latest-headers-3.8+.patch
@@ -0,0 +1,19 @@
+tethering: fix build with kernel headers 3.8+
+
+Highly inspired by:
+    package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
+    http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN connman-1.11.orig/src/tethering.c connman-1.11/src/tethering.c
+--- connman-1.11.orig/src/tethering.c	2012-12-22 22:52:47.000000000 +0100
++++ connman-1.11/src/tethering.c	2013-03-21 19:39:17.036029270 +0100
+@@ -35,6 +35,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <linux/if_tun.h>
++#include <netinet/in.h>
+ #include <linux/if_bridge.h>
+ 
+ #include "connman.h"
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index bb528b4a9b..f29ff3b838 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.11
+CONNMAN_VERSION = 1.12
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES

From a452db1d822e88f0fe00bf6e65d5979a2f221d72 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 23 Mar 2013 22:26:26 +0000
Subject: [PATCH 4582/6849] gettext: fix tools build failure for uClibc
 toolchain with C++

Fixes:
http://autobuild.buildroot.net/results/e5777d754653edef9d8c8558f04c2836734f2c25/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gettext-fix_rpl_gettimeofday.patch        | 282 ++++++++++++++++++
 1 file changed, 282 insertions(+)
 create mode 100644 package/gettext/gettext-fix_rpl_gettimeofday.patch

diff --git a/package/gettext/gettext-fix_rpl_gettimeofday.patch b/package/gettext/gettext-fix_rpl_gettimeofday.patch
new file mode 100644
index 0000000000..e97ceb248c
--- /dev/null
+++ b/package/gettext/gettext-fix_rpl_gettimeofday.patch
@@ -0,0 +1,282 @@
+Newer sys_time.in.h from gnulib breaks on uClibc with C++ so roll back
+to a previous version that's known to work.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h
+--- gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h	2013-03-12 09:17:10.530475932 -0300
++++ gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h	2013-03-19 12:00:17.557958255 -0300
+@@ -1,6 +1,6 @@
+ /* Provide a more complete sys/time.h.
+ 
+-   Copyright (C) 2007-2013 Free Software Foundation, Inc.
++   Copyright (C) 2007-2012 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -17,34 +17,37 @@
+ 
+ /* Written by Paul Eggert.  */
+ 
+-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
+-
+ #if __GNUC__ >= 3
+ @PRAGMA_SYSTEM_HEADER@
+ #endif
+ @PRAGMA_COLUMNS@
+ 
+-/* The include_next requires a split double-inclusion guard.  */
+-#if @HAVE_SYS_TIME_H@
+-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+-#endif
++#if defined _@GUARD_PREFIX@_SYS_TIME_H
+ 
+-#ifndef _@GUARD_PREFIX@_SYS_TIME_H
+-#define _@GUARD_PREFIX@_SYS_TIME_H
++/* Simply delegate to the system's header, without adding anything.  */
++# if @HAVE_SYS_TIME_H@
++#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
++# endif
+ 
+-#if ! @HAVE_SYS_TIME_H@
+-# include <time.h>
+-#endif
++#else
++
++# define _@GUARD_PREFIX@_SYS_TIME_H
++
++# if @HAVE_SYS_TIME_H@
++#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
++# else
++#  include <time.h>
++# endif
+ 
+ /* On native Windows with MSVC, get the 'struct timeval' type.
+    Also, on native Windows with a 64-bit time_t, where we are overriding the
+    'struct timeval' type, get all declarations of system functions whose
+    signature contains 'struct timeval'.  */
+-#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
+-# define _GL_INCLUDING_WINSOCK2_H
+-# include <winsock2.h>
+-# undef _GL_INCLUDING_WINSOCK2_H
+-#endif
++# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
++#  define _GL_INCLUDING_WINSOCK2_H
++#  include <winsock2.h>
++#  undef _GL_INCLUDING_WINSOCK2_H
++# endif
+ 
+ /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+ 
+@@ -52,112 +55,112 @@
+ 
+ /* The definition of _GL_WARN_ON_USE is copied here.  */
+ 
+-#ifdef __cplusplus
++# ifdef __cplusplus
+ extern "C" {
+-#endif
++# endif
+ 
+-#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
++# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
+ 
+-# if @REPLACE_STRUCT_TIMEVAL@
+-#  define timeval rpl_timeval
+-# endif
++#  if @REPLACE_STRUCT_TIMEVAL@
++#   define timeval rpl_timeval
++#  endif
+ 
+-# if !GNULIB_defined_struct_timeval
++#  if !GNULIB_defined_struct_timeval
+ struct timeval
+ {
+   time_t tv_sec;
+   long int tv_usec;
+ };
+-#  define GNULIB_defined_struct_timeval 1
+-# endif
++#   define GNULIB_defined_struct_timeval 1
++#  endif
+ 
+-#endif
++# endif
+ 
+-#ifdef __cplusplus
++# ifdef __cplusplus
+ }
+-#endif
++# endif
+ 
+-#if @GNULIB_GETTIMEOFDAY@
+-# if @REPLACE_GETTIMEOFDAY@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gettimeofday
+-#   define gettimeofday rpl_gettimeofday
+-#  endif
++# if @GNULIB_GETTIMEOFDAY@
++#  if @REPLACE_GETTIMEOFDAY@
++#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
++#    undef gettimeofday
++#    define gettimeofday rpl_gettimeofday
++#   endif
+ _GL_FUNCDECL_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ _GL_CXXALIAS_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict));
+-# else
+-#  if !@HAVE_GETTIMEOFDAY@
++                  (struct timeval *__restrict, void *__restrict));
++#  else
++#   if !@HAVE_GETTIMEOFDAY@
+ _GL_FUNCDECL_SYS (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+-#  endif
++#   endif
+ /* Need to cast, because on glibc systems, by default, the second argument is
+                                                   struct timezone *.  */
+ _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
+-                       (struct timeval *restrict, void *restrict));
+-# endif
++                       (struct timeval *__restrict, void *__restrict));
++#  endif
+ _GL_CXXALIASWARN (gettimeofday);
+-#elif defined GNULIB_POSIXCHECK
+-# undef gettimeofday
+-# if HAVE_RAW_DECL_GETTIMEOFDAY
++# elif defined GNULIB_POSIXCHECK
++#  undef gettimeofday
++#  if HAVE_RAW_DECL_GETTIMEOFDAY
+ _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
+                  "use gnulib module gettimeofday for portability");
++#  endif
+ # endif
+-#endif
+ 
+ /* Hide some function declarations from <winsock2.h>.  */
+ 
+-#if defined _MSC_VER && @HAVE_WINSOCK2_H@
+-# if !defined _@GUARD_PREFIX@_UNISTD_H
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef close
+-#   define close close_used_without_including_unistd_h
+-#  else
++# if defined _MSC_VER && @HAVE_WINSOCK2_H@
++#  if !defined _@GUARD_PREFIX@_UNISTD_H
++#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
++#    undef close
++#    define close close_used_without_including_unistd_h
++#   else
+      _GL_WARN_ON_USE (close,
+                       "close() used without including <unistd.h>");
+-#  endif
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gethostname
+-#   define gethostname gethostname_used_without_including_unistd_h
+-#  else
++#   endif
++#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
++#    undef gethostname
++#    define gethostname gethostname_used_without_including_unistd_h
++#   else
+      _GL_WARN_ON_USE (gethostname,
+                       "gethostname() used without including <unistd.h>");
++#   endif
+ #  endif
+-# endif
+-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef socket
+-#   define socket              socket_used_without_including_sys_socket_h
+-#   undef connect
+-#   define connect             connect_used_without_including_sys_socket_h
+-#   undef accept
+-#   define accept              accept_used_without_including_sys_socket_h
+-#   undef bind
+-#   define bind                bind_used_without_including_sys_socket_h
+-#   undef getpeername
+-#   define getpeername         getpeername_used_without_including_sys_socket_h
+-#   undef getsockname
+-#   define getsockname         getsockname_used_without_including_sys_socket_h
+-#   undef getsockopt
+-#   define getsockopt          getsockopt_used_without_including_sys_socket_h
+-#   undef listen
+-#   define listen              listen_used_without_including_sys_socket_h
+-#   undef recv
+-#   define recv                recv_used_without_including_sys_socket_h
+-#   undef send
+-#   define send                send_used_without_including_sys_socket_h
+-#   undef recvfrom
+-#   define recvfrom            recvfrom_used_without_including_sys_socket_h
+-#   undef sendto
+-#   define sendto              sendto_used_without_including_sys_socket_h
+-#   undef setsockopt
+-#   define setsockopt          setsockopt_used_without_including_sys_socket_h
+-#   undef shutdown
+-#   define shutdown            shutdown_used_without_including_sys_socket_h
+-#  else
++#  if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
++#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
++#    undef socket
++#    define socket              socket_used_without_including_sys_socket_h
++#    undef connect
++#    define connect             connect_used_without_including_sys_socket_h
++#    undef accept
++#    define accept              accept_used_without_including_sys_socket_h
++#    undef bind
++#    define bind                bind_used_without_including_sys_socket_h
++#    undef getpeername
++#    define getpeername         getpeername_used_without_including_sys_socket_h
++#    undef getsockname
++#    define getsockname         getsockname_used_without_including_sys_socket_h
++#    undef getsockopt
++#    define getsockopt          getsockopt_used_without_including_sys_socket_h
++#    undef listen
++#    define listen              listen_used_without_including_sys_socket_h
++#    undef recv
++#    define recv                recv_used_without_including_sys_socket_h
++#    undef send
++#    define send                send_used_without_including_sys_socket_h
++#    undef recvfrom
++#    define recvfrom            recvfrom_used_without_including_sys_socket_h
++#    undef sendto
++#    define sendto              sendto_used_without_including_sys_socket_h
++#    undef setsockopt
++#    define setsockopt          setsockopt_used_without_including_sys_socket_h
++#    undef shutdown
++#    define shutdown            shutdown_used_without_including_sys_socket_h
++#   else
+      _GL_WARN_ON_USE (socket,
+                       "socket() used without including <sys/socket.h>");
+      _GL_WARN_ON_USE (connect,
+@@ -186,18 +189,17 @@
+                       "setsockopt() used without including <sys/socket.h>");
+      _GL_WARN_ON_USE (shutdown,
+                       "shutdown() used without including <sys/socket.h>");
++#   endif
+ #  endif
+-# endif
+-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef select
+-#   define select select_used_without_including_sys_select_h
+-#  else
++#  if !defined _@GUARD_PREFIX@_SYS_SELECT_H
++#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
++#    undef select
++#    define select select_used_without_including_sys_select_h
++#   else
+      _GL_WARN_ON_USE (select,
+                       "select() used without including <sys/select.h>");
++#   endif
+ #  endif
+ # endif
+-#endif
+ 
+ #endif /* _@GUARD_PREFIX@_SYS_TIME_H */
+-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */

From dd1848bc73ee9dfe211ca3ed3a233707e3bc5955 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:27 +0000
Subject: [PATCH 4583/6849] libgtk2: use non-host specific patch

The libgtk2 package was using a host-<foo>.patch that should be
applied only on the host variant of the package. Unfortunately, with
the patch model rework, this doesn't work anymore: Buildroot tries to
apply the patch twice, for some reason.

But instead of fixing the patch model, it is probably a lot better to
fix this patch itself, which is the only usage of host-only patch in
Buildroot.

So instead of simply removing code that detects dependencies in gtk2's
configure.in script, we use a condition based on the value of
gdktarget. And it turns out that it makes the patch shorter.

However, it requires autoreconfiguring the libgtk2 target package,
because we are now modifying its configure.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../host-libgtk2-reduce-dependencies.patch    | 168 ------------------
 .../libgtk2/libgtk2-reduce-dependencies.patch | 117 ++++++++++++
 package/libgtk2/libgtk2.mk                    |   2 +
 3 files changed, 119 insertions(+), 168 deletions(-)
 delete mode 100644 package/libgtk2/host-libgtk2-reduce-dependencies.patch
 create mode 100644 package/libgtk2/libgtk2-reduce-dependencies.patch

diff --git a/package/libgtk2/host-libgtk2-reduce-dependencies.patch b/package/libgtk2/host-libgtk2-reduce-dependencies.patch
deleted file mode 100644
index 091eeb0e58..0000000000
--- a/package/libgtk2/host-libgtk2-reduce-dependencies.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Hack the configure.in file to add a "none" gdktarget which removes
-dependencies on graphic backends such as X.org or DirectFB. Gtk does
-not fully build in this mode, but it builds sufficiently to build the
-host tools that are needed to build the target Gtk.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.in |  101 ++---------------------------------------------------------
- 1 file changed, 4 insertions(+), 97 deletions(-)
-
-Index: gtk+-2.24.8/configure.in
-===================================================================
---- gtk+-2.24.8.orig/configure.in
-+++ gtk+-2.24.8/configure.in
-@@ -259,12 +259,12 @@
-   gdktarget=x11
- fi
- 
--AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
-+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
- 	gdktarget=$with_gdktarget)
- 
- AC_SUBST(gdktarget)
- case $gdktarget in
--  x11|win32|quartz|directfb) ;;
-+  x11|win32|quartz|directfb|none) ;;
-   *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
- esac
- 
-@@ -374,9 +374,6 @@
- ## annoying to construct
- PKG_CHECK_MODULES(BASE_DEPENDENCIES,
-   [glib-2.0 >= glib_required_version dnl
--   atk >= atk_required_version dnl
--   pango >= pango_required_version dnl
--   cairo >= cairo_required_version dnl
-    gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
- 
- ## In addition to checking that cairo is present, we also need to
-@@ -389,8 +386,6 @@
- if test "x$cairo_backend" = "xx11"; then
-    cairo_backend=xlib
- fi
--PKG_CHECK_MODULES(CAIRO_BACKEND,
--  [cairo-$cairo_backend >= cairo_required_version])
- 
- if test "$os_win32" != yes; then
-     # libtool option to control which symbols are exported
-@@ -1280,50 +1275,6 @@
- fi
- 
- 
--# Check for Pango flags
--
--if test "x$gdktarget" = "xwin32"; then
--	PANGO_PACKAGES="pangowin32 pangocairo"
--else
--	PANGO_PACKAGES="pango pangocairo"
--fi
--
--AC_MSG_CHECKING(Pango flags)
--if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
--        PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
--        PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
--
--        AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
--else
--        AC_MSG_ERROR([
--*** Pango not found. Pango built with Cairo support is required
--*** to build GTK+. See http://www.pango.org for Pango information.
--])
--fi
--
--CFLAGS="$CFLAGS $PANGO_CFLAGS"
--
--if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
--        :
--else
--	gtk_save_LIBS="$LIBS"
--        LIBS="$PANGO_LIBS $LIBS"
--        AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
--*** Can't link to Pango. Pango is required to build
--*** GTK+. For more information see http://www.pango.org]))
--        LIBS="$gtk_save_LIBS"
--fi
--
--CFLAGS="$saved_cflags"
--LDFLAGS="$saved_ldflags"
--
--# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
--if test "x$gdktarget" = "xx11"; then
--  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
--else
--  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
--fi
--
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
- GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
- #
-@@ -1331,7 +1282,7 @@
- # into the pkg-config files
- #
- if test $enable_explicit_deps != yes ; then
--  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
-+  GDK_PACKAGES="gdk-pixbuf-2.0"
-   GDK_EXTRA_LIBS=
- fi
- 
-@@ -1341,37 +1292,7 @@
- AC_SUBST(GDK_DEP_LIBS)
- AC_SUBST(GDK_DEP_CFLAGS)
- 
--
--########################################
--# Check for Accessibility Toolkit flags
--########################################
--
--ATK_PACKAGES=atk
--AC_MSG_CHECKING(ATK flags)
--if $PKG_CONFIG --exists $ATK_PACKAGES ; then
--        ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
--        ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
--
--        AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
--else
--        AC_MSG_ERROR([
--*** Accessibility Toolkit not found. Accessibility Toolkit is required
--*** to build GTK+.
--])
--fi
--
--if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
--        :
--else
--	gtk_save_LIBS="$LIBS"
--        LIBS="$ATK_LIBS $LIBS"
--        AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
--                *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
--                *** to build GTK+]))
--        LIBS="$gtk_save_LIBS"
--fi
--
--GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
-+GTK_PACKAGES="gdk-pixbuf-2.0"
- if test "x$gdktarget" = "xx11"; then
-   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
- fi
-@@ -1527,20 +1448,6 @@
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
- 
--AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
--*** Can't find cairo-pdf.h. You must build Cairo with the pdf
--*** backend enabled.]))
--
--if test "$os_win32" != "yes"; then
--  AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
--*** Can't find cairo-ps.h. You must build Cairo with the 
--*** postscript backend enabled.]))
--
--  AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
--*** Can't find cairo-svg.h. You must build Cairo with the
--*** svg backend enabled.]))
--fi   
--
- CPPFLAGS="$gtk_save_cppflags"
-      
- 			  	
diff --git a/package/libgtk2/libgtk2-reduce-dependencies.patch b/package/libgtk2/libgtk2-reduce-dependencies.patch
new file mode 100644
index 0000000000..5bb9db9a06
--- /dev/null
+++ b/package/libgtk2/libgtk2-reduce-dependencies.patch
@@ -0,0 +1,117 @@
+Hack the configure.in file to add a "none" gdktarget which removes
+dependencies on graphic backends such as X.org or DirectFB. Gtk does
+not fully build in this mode, but it builds sufficiently to build the
+host tools that are needed to build the target Gtk.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.in |   34 +++++++++++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 7 deletions(-)
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -259,12 +259,12 @@
+   gdktarget=x11
+ fi
+ 
+-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
++AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
+ 	gdktarget=$with_gdktarget)
+ 
+ AC_SUBST(gdktarget)
+ case $gdktarget in
+-  x11|win32|quartz|directfb) ;;
++  x11|win32|quartz|directfb|none) ;;
+   *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
+ esac
+ 
+@@ -374,11 +374,15 @@
+ ## annoying to construct
+ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
+   [glib-2.0 >= glib_required_version dnl
+-   atk >= atk_required_version dnl
+-   pango >= pango_required_version dnl
+-   cairo >= cairo_required_version dnl
+    gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
+ 
++if test "x$gdktarget" != "xnone"; then
++   PKG_CHECK_MODULES(BASE_DEPENDENCIES,
++	[atk >= atk_required_version dnl
++	 pango >= pango_required_version dnl
++	 cairo >= cairo_required_version])
++fi
++
+ ## In addition to checking that cairo is present, we also need to
+ ## check that the correct cairo backend is there. E.g. if the GDK
+ ## target is win32 we need the cairo-win32 backend and so on.
+@@ -389,8 +393,11 @@
+ if test "x$cairo_backend" = "xx11"; then
+    cairo_backend=xlib
+ fi
+-PKG_CHECK_MODULES(CAIRO_BACKEND,
+-  [cairo-$cairo_backend >= cairo_required_version])
++
++if test "x$gdktarget" != "xnone"; then
++   PKG_CHECK_MODULES(CAIRO_BACKEND,
++	[cairo-$cairo_backend >= cairo_required_version])
++fi
+ 
+ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
+ 
+@@ -1281,6 +1288,7 @@
+   AM_CONDITIONAL(USE_DIRECTFB, false)
+ fi
+ 
++if test "x$gdktarget" != "xnone"; then
+ 
+ # Check for Pango flags
+ 
+@@ -1326,6 +1334,8 @@
+   GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
+ fi
+ 
++fi # gdktarget != none
++
+ GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
+ GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
+ #
+@@ -1344,6 +1354,8 @@
+ AC_SUBST(GDK_DEP_CFLAGS)
+ 
+ 
++if test "x$gdktarget" != "xnone"; then
++
+ ########################################
+ # Check for Accessibility Toolkit flags
+ ########################################
+@@ -1374,6 +1386,10 @@
+ fi
+ 
+ GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
++else # gdktarget != none
++GTK_PACKAGES="gdk-pixbuf-2.0"
++fi # gdktarget != none
++
+ if test "x$gdktarget" = "xx11"; then
+   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
+ fi
+@@ -1529,6 +1545,8 @@
+ gtk_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
+ 
++if test "x$gdktarget" != "xnone"; then
++
+ AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
+ *** Can't find cairo-pdf.h. You must build Cairo with the pdf
+ *** backend enabled.]))
+@@ -1543,6 +1561,8 @@
+ *** svg backend enabled.]))
+ fi   
+ 
++fi # gdktarget != none
++
+ CPPFLAGS="$gtk_save_cppflags"
+      
+ 			  	
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index e6a9d84c05..b1ce99ae17 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -12,6 +12,8 @@ LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJ
 LIBGTK2_INSTALL_STAGING = YES
 LIBGTK2_INSTALL_TARGET = YES
 
+LIBGTK2_AUTORECONF = YES
+
 LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no \
 		ac_cv_func_strtod=yes \

From e30c5bc58e35b1043f0fe619b6aca122558344d0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:28 +0000
Subject: [PATCH 4584/6849] gcc: fix location of snapshots

The gcc snapshots are now located at
ftp://gcc.gnu.org/pub/gcc/snapshots/. This has been tested with a
recent 4.8.0-RC snapshot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index bdc38cd6e1..3bfa13ba59 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -26,7 +26,7 @@ GCC_SNAP_DATE:=
 endif
 
 ifneq ($(GCC_SNAP_DATE),)
- GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
+ GCC_SITE:=ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
  GCC_SITE:=ftp://www.at91.com/pub/buildroot/
 else

From b8103112ea8d9d03647a60f45768494dc14eaa1b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:29 +0000
Subject: [PATCH 4585/6849] gcc: add support for gcc 4.8

This commit adds support for the recently released gcc 4.8. We re-add
the same patch series as the one used for 4.7.x, after refreshing the
patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/4.8.0/100-uclibc-conf.patch     |  37 ++++++
 .../gcc/4.8.0/301-missing-execinfo_h.patch    |  13 ++
 toolchain/gcc/4.8.0/302-c99-snprintf.patch    |  13 ++
 .../4.8.0/305-libmudflap-susv3-legacy.patch   |  49 +++++++
 .../gcc/4.8.0/810-arm-softfloat-libgcc.patch  |  30 +++++
 .../gcc/4.8.0/830-arm_unbreak_armv4t.patch    |  13 ++
 ...werpc-link-with-math-lib.patch.conditional | 122 ++++++++++++++++++
 toolchain/gcc/Config.in                       |   5 +
 toolchain/gcc/gcc-uclibc-4.x.mk               |  10 ++
 9 files changed, 292 insertions(+)
 create mode 100644 toolchain/gcc/4.8.0/100-uclibc-conf.patch
 create mode 100644 toolchain/gcc/4.8.0/301-missing-execinfo_h.patch
 create mode 100644 toolchain/gcc/4.8.0/302-c99-snprintf.patch
 create mode 100644 toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch
 create mode 100644 toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch
 create mode 100644 toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch
 create mode 100644 toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional

diff --git a/toolchain/gcc/4.8.0/100-uclibc-conf.patch b/toolchain/gcc/4.8.0/100-uclibc-conf.patch
new file mode 100644
index 0000000000..d855b30ee8
--- /dev/null
+++ b/toolchain/gcc/4.8.0/100-uclibc-conf.patch
@@ -0,0 +1,37 @@
+Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
+===================================================================
+--- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
++++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+Index: gcc-4.8.0/libjava/classpath/ltconfig
+===================================================================
+--- gcc-4.8.0.orig/libjava/classpath/ltconfig	2011-02-13 12:45:53.000000000 +0100
++++ gcc-4.8.0/libjava/classpath/ltconfig	2013-03-23 17:39:04.000000000 +0100
+@@ -603,7 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1247,7 +1247,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch
new file mode 100644
index 0000000000..00efda24aa
--- /dev/null
+++ b/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.8.0/boehm-gc/include/gc.h
+===================================================================
+--- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
++++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/toolchain/gcc/4.8.0/302-c99-snprintf.patch b/toolchain/gcc/4.8.0/302-c99-snprintf.patch
new file mode 100644
index 0000000000..cd4d2ccfb6
--- /dev/null
+++ b/toolchain/gcc/4.8.0/302-c99-snprintf.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.8.0/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- gcc-4.8.0.orig/libstdc++-v3/include/c_global/cstdio	2013-02-03 18:54:05.000000000 +0100
++++ gcc-4.8.0/libstdc++-v3/include/c_global/cstdio	2013-03-23 17:39:32.000000000 +0100
+@@ -138,7 +138,7 @@
+   using ::vsprintf;
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 0000000000..35d5f50207
--- /dev/null
+++ b/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,49 @@
+Index: gcc-4.8.0/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
++++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
+@@ -424,7 +424,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -434,7 +434,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -444,7 +444,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -453,7 +453,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -462,7 +462,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch
new file mode 100644
index 0000000000..c8cb377d55
--- /dev/null
+++ b/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,30 @@
+Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
+===================================================================
+--- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
+@@ -55,7 +55,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+Index: gcc-4.8.0/libgcc/config/arm/t-linux
+===================================================================
+--- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
++++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch
new file mode 100644
index 0000000000..37f8f2a54d
--- /dev/null
+++ b/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch
@@ -0,0 +1,13 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional
new file mode 100644
index 0000000000..b7094fe652
--- /dev/null
+++ b/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional
@@ -0,0 +1,122 @@
+http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
+
+On glibc the libc.so carries a copy of the math function copysignl() but
+on uClibc math functions like copysignl() live in libm. Since libgcc_s
+contains unresolved symbols, any attempt to link against libgcc_s
+without explicitely specifying -lm fails, resulting in a broken
+bootstrap of the compiler.
+
+Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+---
+ libgcc/Makefile.in  |    4 +++-
+ libgcc/configure    |   32 ++++++++++++++++++++++++++++++++
+ libgcc/configure.ac |   21 +++++++++++++++++++++
+ 3 files changed, 56 insertions(+), 1 deletion(-)
+
+Index: gcc-4.8.0/libgcc/Makefile.in
+===================================================================
+--- gcc-4.8.0.orig/libgcc/Makefile.in	2013-02-04 20:06:20.000000000 +0100
++++ gcc-4.8.0/libgcc/Makefile.in	2013-03-24 09:12:43.000000000 +0100
+@@ -41,6 +41,7 @@
+ decimal_float = @decimal_float@
+ enable_decimal_float = @enable_decimal_float@
+ fixed_point = @fixed_point@
++LIBGCC_LIBM = @LIBGCC_LIBM@
+ 
+ host_noncanonical = @host_noncanonical@
+ target_noncanonical = @target_noncanonical@
+@@ -927,9 +928,10 @@
+ 		@multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_objs@,$(objects) libgcc.a,$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
++		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
+ 		@shlib_map_file@,$(mapfile),$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
+-		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
++		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
+ 
+ libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
+ 	# @multilib_flags@ is still needed because this may use
+Index: gcc-4.8.0/libgcc/configure
+===================================================================
+--- gcc-4.8.0.orig/libgcc/configure	2012-11-05 00:08:42.000000000 +0100
++++ gcc-4.8.0/libgcc/configure	2013-03-24 09:12:43.000000000 +0100
+@@ -564,6 +564,7 @@
+ tmake_file
+ sfp_machine_header
+ set_use_emutls
++LIBGCC_LIBM
+ set_have_cc_tls
+ vis_hide
+ fixed_point
+@@ -4481,6 +4482,37 @@
+ 	fi
+ fi
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++echo "$as_me:$LINENO: checking for library containing copysignl" >&5
++echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
++if test "${libgcc_cv_copysignl_lib+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++
++fi
++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
+ 
+ # Conditionalize the makefile for this target machine.
+ tmake_file_=
+Index: gcc-4.8.0/libgcc/configure.ac
+===================================================================
+--- gcc-4.8.0.orig/libgcc/configure.ac	2012-10-15 15:10:30.000000000 +0200
++++ gcc-4.8.0/libgcc/configure.ac	2013-03-24 09:12:43.000000000 +0100
+@@ -326,6 +326,27 @@
+ fi
+ AC_SUBST(set_have_cc_tls)
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++AC_CACHE_CHECK
++  libgcc_cv_copysignl_lib,
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++  ])
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
++AC_SUBST(LIBGCC_LIBM)
++
+ # See if we have emulated thread-local storage.
+ GCC_CHECK_EMUTLS
+ set_use_emutls=
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d16e7b05b1..1499c05029 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -34,6 +34,10 @@ choice
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.7.x"
 
+	config BR2_GCC_VERSION_4_8_X
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		bool "gcc 4.8.x"
+
 	config BR2_GCC_VERSION_SNAP
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc snapshot"
@@ -65,6 +69,7 @@ config BR2_GCC_VERSION
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.2"     if BR2_GCC_VERSION_4_7_X
+	default "4.8.0"     if BR2_GCC_VERSION_4_8_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 3bfa13ba59..4f1bb49842 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -191,6 +191,16 @@ endif
 GCC_HOST_PREREQ += host-mpc
 endif
 
+# GCC 4.8.x prerequisites
+ifeq ($(findstring x4.8.,x$(GCC_VERSION)),x4.8.)
+GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
+GCC_TARGET_PREREQ += mpc
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+HOST_SOURCE += host-mpc-source
+endif
+GCC_HOST_PREREQ += host-mpc
+endif
+
 # GCC snapshot prerequisites
 # Since we don't know and it can be quite new just ask for everything known
 ifneq ($(GCC_SNAP_DATE),)

From d37d99b588f1a11f63140e4ba1baec194d4a0da7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:30 +0000
Subject: [PATCH 4586/6849] gcc: introduce BR2_GCC_NEEDS_MPC to reduce code
 duplication

For each version of gcc, we need to check whether it requires mpc as a
dependency. Since this is true for 4.5, 4.6, 4.7, snapshots and now
4.8, let's factorize this code a bit by using a Kconfig symbol that
tells us whether we are using a gcc version that requires mpc.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in         |  8 ++++++
 toolchain/gcc/gcc-uclibc-4.x.mk | 44 +--------------------------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 1499c05029..87d9cc192f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,6 +2,9 @@
 
 comment "GCC Options"
 
+config BR2_GCC_NEEDS_MPC
+	bool
+
 choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_6_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
@@ -24,22 +27,27 @@ choice
 
 	config BR2_GCC_VERSION_4_5_X
 		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
 
 	config BR2_GCC_VERSION_4_7_X
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.7.x"
 
 	config BR2_GCC_VERSION_4_8_X
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.8.x"
 
 	config BR2_GCC_VERSION_SNAP
 		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
 		bool "gcc snapshot"
 endchoice
 
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 4f1bb49842..db9715afac 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -161,49 +161,7 @@ endif
 GCC_HOST_PREREQ = host-gmp host-mpfr
 GCC_TARGET_PREREQ += mpfr gmp
 
-# GCC 4.5.x prerequisites
-ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
-GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
-GCC_TARGET_PREREQ += mpc
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE += host-mpc-source
-endif
-GCC_HOST_PREREQ += host-mpc
-endif
-
-# GCC 4.6.x prerequisites
-ifeq ($(findstring x4.6.,x$(GCC_VERSION)),x4.6.)
-GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
-GCC_TARGET_PREREQ += mpc
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE += host-mpc-source
-endif
-GCC_HOST_PREREQ += host-mpc
-endif
-
-# GCC 4.7.x prerequisites
-ifeq ($(findstring x4.7.,x$(GCC_VERSION)),x4.7.)
-GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
-GCC_TARGET_PREREQ += mpc
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE += host-mpc-source
-endif
-GCC_HOST_PREREQ += host-mpc
-endif
-
-# GCC 4.8.x prerequisites
-ifeq ($(findstring x4.8.,x$(GCC_VERSION)),x4.8.)
-GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
-GCC_TARGET_PREREQ += mpc
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE += host-mpc-source
-endif
-GCC_HOST_PREREQ += host-mpc
-endif
-
-# GCC snapshot prerequisites
-# Since we don't know and it can be quite new just ask for everything known
-ifneq ($(GCC_SNAP_DATE),)
+ifeq ($(BR2_GCC_NEEDS_MPC),y)
 GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
 GCC_TARGET_PREREQ += mpc
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

From 46f37dabc52be03dba56b98d8e0b4ae1d1bc53b0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:31 +0000
Subject: [PATCH 4587/6849] gcc: add missing $(Q)

Add a missing $(Q) in front of a MESSAGE call, which leads to the
message being displayed but also the command that shows the message.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index db9715afac..1b7f222239 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -211,7 +211,7 @@ endif
 
 $(DL_DIR)/$(GCC_SOURCE):
 	mkdir -p $(DL_DIR)
-	$(call MESSAGE,"Downloading gcc")
+	$(Q)$(call MESSAGE,"Downloading gcc")
 	$(call DOWNLOAD,$(GCC_SITE)/$(GCC_SOURCE))
 
 gcc-unpacked: $(GCC_DIR)/.patched

From f05104dc62d940b15c6c998840a44d46b3371274 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:32 +0000
Subject: [PATCH 4588/6849] kernel-headers: add missing $(Q)

Add a missing $(Q) in front of a MESSAGE call, which leads to the
message being displayed but also the command that shows the message.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/kernel-headers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 073d609e18..7ce6264935 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -70,7 +70,7 @@ $(DL_DIR)/$(LINUX_HEADERS_SOURCE):
 ifeq ($(BR2_KERNEL_HEADERS_SNAP),y)
 	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)
 endif
-	$(call MESSAGE,"Downloading kernel headers")
+	$(Q)$(call MESSAGE,"Downloading kernel headers")
 	$(call DOWNLOAD,$(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE))
 
 kernel-headers: $(LINUX_HEADERS_DIR)/.configured

From 69c50c5945c08d7777cc2a36b6acf9c0cc4d8be2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:33 +0000
Subject: [PATCH 4589/6849] uClibc: add missing $(Q)

Add a missing $(Q) in front of a MESSAGE call, which leads to the
message being displayed but also the command that shows the message.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 1b49a8d3a9..e8b2bb4944 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -62,7 +62,7 @@ UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\
 endif
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
-	$(call MESSAGE,"Downloading uClibc")
+	$(Q)$(call MESSAGE,"Downloading uClibc")
 	$(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE))
 
 uclibc-unpacked: $(UCLIBC_DIR)/.unpacked

From 6593ff6a87194c2d6bb6767d29648f9fc669df14 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:34 +0000
Subject: [PATCH 4590/6849] gmp: requires host-m4

On a system where m4 is not installed, gmp does not build due to the
lack of m4. Add the missing host-m4 dependency.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 093d60caff..24fbb3db61 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -11,6 +11,8 @@ GMP_INSTALL_STAGING = YES
 GMP_LICENSE = LGPLv3+
 GMP_LICENSE_FILES = COPYING.LIB
 
+GMP_DEPENDENCIES = host-m4
+
 # Bad ARM assembly breaks on pure thumb
 ifeq ($(ARCH),arm)
 GMP_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -marm"

From 2f55f8e440ea6040ec7fc9ba0692dd0980a36bd9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:35 +0000
Subject: [PATCH 4591/6849] libpcap: add missing flex/bison dependencies

In preparation for the removal of the flex/bison mandatory
dependencies, make sure libpcap builds host-flex/host-bison.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libpcap/libpcap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 06aec0f4d2..5e077a271d 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -20,7 +20,7 @@ LIBPCAP_INSTALL_STAGING = YES
 # configure script correctly handles --enable-shared/--disable-shared.
 LIBPCAP_AUTORECONF = YES
 
-LIBPCAP_DEPENDENCIES = zlib
+LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux

From fad8177bb33f2e7750efbd365d4431cabf7d0396 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:36 +0000
Subject: [PATCH 4592/6849] iproute2: add dependency on host-bison

iproute2 requires bison, so we add the necessary dependency. In
addition, in order for iproute2 to find bison, we need to pass
$(TARGET_MAKE_ENV).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 7766ab8703..98a7da0784 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -10,6 +10,8 @@ IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct
 IPROUTE2_LICENSE = GPLv2
 IPROUTE2_LICENSE_FILES = COPYING
 
+IPROUTE2_DEPENDENCIES += host-bison
+
 # If both iproute2 and busybox are selected, make certain we win
 # the fight over who gets to have their utils actually installed.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -42,11 +44,12 @@ endef
 
 define IPROUTE2_BUILD_CMDS
 	$(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile
-	$(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
 endef
 
 define IPROUTE2_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" SBINDIR=/sbin \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" \
+		SBINDIR=/sbin \
 		DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \
 		MANDIR=/usr/share/man install
 	# Wants bash

From af23d762e51be20f812b9d958268843ae4e369cb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:37 +0000
Subject: [PATCH 4593/6849] ncurses: enable shared library build on the host

On the host, we generally build and install a shared library rather
than a static version of libraries. In this specific case, we will
want to build host-gettext, which builds a shared library that depends
on ncurses. And this doesn't work well if ncurses is static because it
hasn't been built with -fPIC. Therefore, let's build ncurses as shared
on the host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ncurses/ncurses.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index c01dfbc36b..eb47c3695b 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -116,7 +116,7 @@ define HOST_NCURSES_BUILD_CMDS
 endef
 
 HOST_NCURSES_CONF_OPT = \
-	--without-shared --without-gpm \
+	--with-shared --without-gpm \
 	--without-manpages \
 	--without-cxx \
 	--without-cxx-binding \

From 3a188b578e490f2a8b5922329b7abfae57122e3b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:38 +0000
Subject: [PATCH 4594/6849] gettext: provide a host variant

In preparation for the removal of gettext as a hard dependency, we
need to be able to provide a host variant of gettext for the few
packages that require msgfmt.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index d374050ed2..4757cf857f 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -56,3 +56,4 @@ GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
 GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TESTS
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

From a5ade38d78f0e7e62908be25557f86613e7b973b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:39 +0000
Subject: [PATCH 4595/6849] libglib2: add dependency on host-gettext

libglib2 requires msgfmt, which is now provided by host-gettext since
gettext will no longer be part of the mandatory dependencies.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 4ca6ca3cbd..d78e8ec0fa 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -68,9 +68,9 @@ HOST_LIBGLIB2_CONF_OPT = \
 
 LIBGLIB2_CONF_OPT += --disable-tests
 
-LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
+LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext
 
-HOST_LIBGLIB2_DEPENDENCIES = host-pkgconf host-libffi host-zlib
+HOST_LIBGLIB2_DEPENDENCIES = host-pkgconf host-libffi host-zlib host-gettext
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 LIBGLIB2_DEPENDENCIES += libiconv

From a0b497b062bada5d05adfb3555ea9f99e973b8f2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:40 +0000
Subject: [PATCH 4596/6849] at: needs host-flex and host-bison

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/at/at.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/at/at.mk b/package/at/at.mk
index 1cea39bdcd..6432ae31c0 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -9,7 +9,7 @@ AT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
 # missing deps for parsetime.l
 AT_MAKE = $(MAKE1)
 AT_AUTORECONF = YES
-AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex)
+AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
 
 AT_CONF_OPT = \
         --with-jobdir=/var/spool/cron/atjobs \

From d8f9237553e4f839de32eb5e82805017fc758cd9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:41 +0000
Subject: [PATCH 4597/6849] dependencies: remove a few useless mandatory
 dependencies

awk, bison, flex, makeinfo, gettext should be built as dependencies of
packages when needed. In practice, even the toolchain build doesn't
need any of these, and only a few packages do require them.

It is not needed to list gzip and bzip2 since they are already checked
through ${DL_TOOLS}: whenever a package needs gzip or bzip2 for its
extraction, the dependency is added.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/prerequisite.txt         | 5 -----
 support/dependencies/dependencies.sh | 8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 5a9d049e02..9d36402047 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -30,10 +30,6 @@ Mandatory packages
 ** +gcc+ (version 2.95 or any later)
 ** `g++` (version 2.95 or any later)
 ** +bash+
-** +gawk+
-** +bison+
-** +flex+
-** +gettext+
 ** +patch+
 ** +gzip+
 ** +bzip2+
@@ -43,7 +39,6 @@ Mandatory packages
 ** +python+ (version 2.6 or 2.7)
 ** +unzip+
 ** +rsync+
-** +texinfo+ (required for internal Buildroot toolchain backend)
 
 * Source fetching tools:
 ** +wget+
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index acba57c92c..cd3c839b62 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -131,14 +131,10 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
 fi;
 
 # Check that a few mandatory programs are installed
-for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
+for prog in patch perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
 	/bin/echo -e "\nYou must install '$prog' on your build machine";
-	if test $prog = "makeinfo" ; then
-	    /bin/echo -e "makeinfo is usually part of the texinfo package in your distribution\n"
-	elif test $prog = "msgfmt" ; then
-	    /bin/echo -e "msgfmt is usually part of the gettext package in your distribution\n"
-	elif test $prog = "svn" ; then
+	if test $prog = "svn" ; then
 	    /bin/echo -e "svn is usually part of the subversion package in your distribution\n"
 	else
 	    /bin/echo -e "\n"

From 3a8dbba84d39ac20dc61ce3bc9180cfb164e4cc2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:42 +0000
Subject: [PATCH 4598/6849] dependencies: remove useless newlines

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index cd3c839b62..9d06a0d21a 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -133,11 +133,9 @@ fi;
 # Check that a few mandatory programs are installed
 for prog in patch perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
-	/bin/echo -e "\nYou must install '$prog' on your build machine";
+	/bin/echo -e "You must install '$prog' on your build machine";
 	if test $prog = "svn" ; then
-	    /bin/echo -e "svn is usually part of the subversion package in your distribution\n"
-	else
-	    /bin/echo -e "\n"
+	    /bin/echo -e "svn is usually part of the subversion package in your distribution"
 	fi
 	exit 1;
     fi

From b2406e4a7852cadb5cfb5af59fd6a437bdc3b0eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:43 +0000
Subject: [PATCH 4599/6849] dependencies: add details about which distro
 package to install

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 9d06a0d21a..ab7f4a42f1 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -135,7 +135,13 @@ for prog in patch perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
 	/bin/echo -e "You must install '$prog' on your build machine";
 	if test $prog = "svn" ; then
-	    /bin/echo -e "svn is usually part of the subversion package in your distribution"
+	    /bin/echo -e "  svn is usually part of the subversion package in your distribution"
+	elif test $prog = "hg" ; then
+            /bin/echo -e "  hg is usually part of the mercurial package in your distribution"
+	elif test $prog = "zcat" ; then
+            /bin/echo -e "  zcat is usually part of the gzip package in your distribution"
+	elif test $prog = "bzcat" ; then
+            /bin/echo -e "  bzcat is usually part of the bzip2 package in your distribution"
 	fi
 	exit 1;
     fi

From 11f4c694e97f9610148b043f1c4119af047dba6a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:44 +0000
Subject: [PATCH 4600/6849] dependencies: test all programs before bailing out

The current dependencies code abort as soon as one program is
missing. It is quite annoying when multiple programs are
missing. Instead, bail out if needed after testing all programs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index ab7f4a42f1..c11d362b43 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -131,9 +131,11 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
 fi;
 
 # Check that a few mandatory programs are installed
+missing_progs="no"
 for prog in patch perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
 	/bin/echo -e "You must install '$prog' on your build machine";
+	missing_progs="yes"
 	if test $prog = "svn" ; then
 	    /bin/echo -e "  svn is usually part of the subversion package in your distribution"
 	elif test $prog = "hg" ; then
@@ -143,10 +145,13 @@ for prog in patch perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
 	elif test $prog = "bzcat" ; then
             /bin/echo -e "  bzcat is usually part of the bzip2 package in your distribution"
 	fi
-	exit 1;
     fi
 done
 
+if test "${missing_progs}" = "yes" ; then
+    exit 1
+fi
+
 if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \
    grep ^BR2_ENABLE_LOCALE=y       $BUILDROOT_CONFIG > /dev/null ; then
    if ! which locale > /dev/null ; then

From 876e91dc447d874ac17ea1038e836655f24e6750 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:45 +0000
Subject: [PATCH 4601/6849] dependencies: check that a full perl installation
 is available

The host-autoconf build process requires a full Perl installation, or
at least a Perl installation that has the Data::Dumper module
installed. On a basic Debian system, only 'perl-base' is installed,
but Data::Dumper is in the 'perl' package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index c11d362b43..0b44c5afb3 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -192,3 +192,11 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then
 	exit 1
     fi
 fi
+
+# Check that the Perl installation is complete enough to build
+# host-autoconf.
+if ! perl  -e "require Data::Dumper" > /dev/null 2>&1 ; then
+    /bin/echo -e "Your Perl installation is not complete enough, at least Data::Dumper is missing."
+    /bin/echo -e "On Debian/Ubuntu distributions, install the 'perl' package."
+    exit 1
+fi

From d66cd067f3dc3d5e2479e1e8c05f24fd82329f7a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 22:26:46 +0000
Subject: [PATCH 4602/6849] dependencies: check that SSL certificates are
 installed

Some packages are hosted on https:// servers, and wget only works on
these if the SSL certificates are installed. For example, downloading
the kernel sources from kernel.org requires those SSL certificates to
be installed.

[Peter: fix typo]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 0b44c5afb3..ce4d9e17bc 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -200,3 +200,12 @@ if ! perl  -e "require Data::Dumper" > /dev/null 2>&1 ; then
     /bin/echo -e "On Debian/Ubuntu distributions, install the 'perl' package."
     exit 1
 fi
+
+# Check that we have the SSL certificates to make https:// downloads
+# work.
+if ! test -d /etc/ssl/certs; then
+    /bin/echo -e "Your system lacks Common CA certificates for SSL."
+    /bin/echo -e "This prevents https:// downloads from succeeding."
+    /bin/echo -e "On Debian/Ubuntu distributions, install 'ca-certificates' package."
+    exit 1
+fi

From 0be9ece5e75d6eeff06f3c8f395dcbb4ef95a16c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 24 Mar 2013 02:20:07 +0000
Subject: [PATCH 4603/6849] quota: select BR2_PACKAGE_UTIL_LINUX_BINARIES

All of the util-linux tools options depend on
BR2_PACKAGE_UTIL_LINUX_BINARIES that select all the required util-linux
libraries and enable the tools build process.
So basically quota is selecting a hidden/unavailable option and
triggering a util-linux build failure. Fixes:
http://autobuild.buildroot.net/results/bc3c75e7c60fe6db54ea56dd7c398ba7878bff83/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quota/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/quota/Config.in b/package/quota/Config.in
index f6341d3193..5127a9a9ca 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -3,7 +3,9 @@ config BR2_PACKAGE_QUOTA
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
+	depends on !(BR2_microblazeel || BR2_microblazebe) # util-linux
 	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_BINARIES
 	select BR2_PACKAGE_UTIL_LINUX_MOUNT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC

From 9a82b0f95d915bdf88b156b00249a73c83f87f7d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 24 Mar 2013 02:47:50 +0000
Subject: [PATCH 4604/6849] squid: bump to version 3.3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index a4093f4356..5832aa7da5 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.3.2
+SQUID_VERSION = 3.3.3
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From 11b9e21ee628893fa0bdbd65f1b55f5aa05f6636 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 24 Mar 2013 02:48:06 +0000
Subject: [PATCH 4605/6849] file: bump to version 5.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/file/file.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index 720670511e..5422e2f984 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FILE_VERSION = 5.13
+FILE_VERSION = 5.14
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 FILE_INSTALL_STAGING = YES

From 9c1eefa3986d19ffc93b3b9f3367fb2f68562b30 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 23 Mar 2013 23:33:40 +0000
Subject: [PATCH 4606/6849] toolchain: update crosstool-NG project URL

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7edf82b361..f1cca144f7 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -28,7 +28,7 @@ config BR2_TOOLCHAIN_CTNG
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 	help
 	  Say 'y' if you want to generate the toolchain with crosstool-NG
-	  ( http://ymorin.is-a-geek.org/projects/crosstool )
+	  (http://crosstool-ng.org).
 
 	  This is considered experimental, and you can expect some breakage.
 

From 47d62c9097fb15a500d885aaeca7cbfe93db05b8 Mon Sep 17 00:00:00 2001
From: Davide Viti <zinosat@tiscali.it>
Date: Fri, 7 Dec 2012 11:15:01 +0000
Subject: [PATCH 4607/6849] tcl: add license information

Signed-off-by: Davide Viti <zinosat@tiscali.it>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcl/tcl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 606042e4e7..ec089eed47 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -8,6 +8,8 @@ TCL_VERSION_MINOR = 19
 TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
+TCL_LICENSE = tcl license
+TCL_LICENSE_FILE = license.terms
 TCL_SUBDIR = unix
 TCL_CONF_OPT = \
 		--disable-symbols \

From 62322acb2ce186d544ab21fe253ccc8561a68a48 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 22 Mar 2013 10:32:28 +0000
Subject: [PATCH 4608/6849] toolchain/gcc: disable makeinfo

Newer versions of texinfo (>=5) break the gcc makeinfo routine, so just
disable it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 1b7f222239..9d131d5577 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -254,6 +254,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 	mkdir -p $(GCC_BUILD_DIR1)
 	(cd $(GCC_BUILD_DIR1); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
+		MAKEINFO=missing \
 		$(GCC_DIR)/configure $(QUIET) \
 		--prefix=$(HOST_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
@@ -324,6 +325,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 	mkdir -p $(GCC_BUILD_DIR2)
 	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
+		MAKEINFO=missing \
 		$(GCC_DIR)/configure $(QUIET) \
 		--prefix=$(HOST_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
@@ -404,6 +406,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 	ln -snf ../include/ $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sys-include
 	(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
 		$(HOST_CONFIGURE_OPTS) \
+		MAKEINFO=missing \
 		$(GCC_SRC_DIR)/configure $(QUIET) \
 		--prefix=$(HOST_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \

From 45934386505ccea444b9c5b84742a3504d75de02 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Mar 2013 08:02:23 +0000
Subject: [PATCH 4609/6849] dropbear: bump to version 2013.56

Switch ECHOs to SEDs to avoid issues with defines changing after
sysoptions.h was included - and it's cleaner.
Enable hmac-sha2-256 and hmac-sha2-512 support for the full featured.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear.mk | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index bd4522189a..cec57dbeb5 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,8 +4,9 @@
 #
 #############################################################
 
-DROPBEAR_VERSION = 2012.55
+DROPBEAR_VERSION = 2013.56
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
+DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
 DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \
 		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
@@ -24,16 +25,18 @@ endef
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
 
 define DROPBEAR_DISABLE_REVERSE_DNS
-	$(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h
+	$(SED) 's:\(#define DO_HOST_LOOKUP\):/*\1 */:' $(@D)/options.h
 endef
 
 define DROPBEAR_BUILD_SMALL
-	echo "#define DROPBEAR_SMALL_CODE" >>$(@D)/options.h
-	echo "#define NO_FAST_EXPTMOD" >>$(@D)/options.h
+	$(SED) 's:.*\(#define DROPBEAR_SMALL_CODE\).*:\1:' $(@D)/options.h
+	$(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
 endef
 
 define DROPBEAR_BUILD_FEATURED
-	echo "#define DROPBEAR_BLOWFISH" >>$(@D)/options.h
+	$(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
+	$(SED) 's:.*\(#define DROPBEAR_SHA2_256_HMAC\).*:\1:' $(@D)/options.h
+	$(SED) 's:.*\(#define DROPBEAR_SHA2_512_HMAC\).*:\1:' $(@D)/options.h
 endef
 
 ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)

From 20ca008d02668c8f5880c81e2b8d1c9fd7841bd5 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Tue, 10 Jul 2012 07:37:22 +0000
Subject: [PATCH 4610/6849] unexport TERMINFO to correct ncurses behavior

The ncurses build can become polluted by the user's TERMINFO
environment variable, causing the user's ~/.terminfo to be modified
and preventing the install from succeeding:

/bin/sh ./run_tic.sh
** Building terminfo database, please wait...
Running tic to install /home/nathanl/devel/buildroot.git/output/host/usr/i686-unknown-linux-gnu/sysroot/usr/share/emacs/24.0.97/etc/ ...

	You may see messages regarding extended capabilities, e.g., AX.
	These are extended terminal capabilities which are compiled
	using
		tic -x
	If you have ncurses 4.2 applications, you should read the INSTALL
	document, and install the terminfo without the -x option.

1562 entries written to /home/nathanl/.terminfo
** built new /home/nathanl/devel/buildroot.git/output/host/usr/i686-unknown-linux-gnu/sysroot/usr/share/emacs/24.0.97/etc/
installing std
installing stdcrt
installing vt100
installing vt300
make[2]: Leaving directory `/home/nathanl/devel/buildroot.git/output/build/ncurses-5.7/misc'
make[1]: Leaving directory `/home/nathanl/devel/buildroot.git/output/build/ncurses-5.7'
for i in $(find /home/nathanl/devel/buildroot.git/output/host/usr/i686-unknown-linux-gnu/sysroot/usr/lib* -name "*.la"); do cp -f $i $i~; /usr/bin/sed -i -e "s:\(['= ]\)/usr:\\1/home/nathanl/devel/buildroot.git/output/host/usr/i686-unknown-linux-gnu/sysroot/usr:g" $i; done
>>> ncurses 5.7 Installing to target
mkdir -p /home/nathanl/devel/buildroot.git/output/target/usr/lib
cp -dpf /home/nathanl/devel/buildroot.git/output/build/ncurses-5.7/lib/libncurses.so* /home/nathanl/devel/buildroot.git/output/target/usr/lib/
ln -snf /usr/share/terminfo /home/nathanl/devel/buildroot.git/output/target/usr/lib/terminfo
mkdir -p /home/nathanl/devel/buildroot.git/output/target/usr/share/terminfo/x
cp -dpf /home/nathanl/devel/buildroot.git/output/host/usr/i686-unknown-linux-gnu/sysroot/usr/share/terminfo/x/xterm /home/nathanl/devel/buildroot.git/output/target/usr/share/terminfo/x
cp: cannot stat `/home/nathanl/devel/buildroot.git/output/host/usr/i686-unknown-linux-gnu/sysroot/usr/share/terminfo/x/xterm': No such file or directory
make: *** [/home/nathanl/devel/buildroot.git/output/build/ncurses-5.7/.stamp_target_installed] Error 1

So unexport TERMINFO in the top-level Makefile.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index c462bb1d4f..f1c98aa933 100644
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,7 @@ unexport CXXFLAGS
 unexport GREP_OPTIONS
 unexport CONFIG_SITE
 unexport QMAKESPEC
+unexport TERMINFO
 
 GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 

From 22c4c4b9491fc509af42d300bfa8cb6f727e1f66 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 19 Mar 2013 09:29:42 +0000
Subject: [PATCH 4611/6849] qt5: factor Qt5 version

Since the Qt5 version will be the same for all Qt5 modules, factor it
in qt5/qt5.mk as QT5_VERSION.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5.mk             | 1 +
 package/qt5/qt5base/qt5base.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index f22050876c..83cc0e1085 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,3 +1,4 @@
+QT5_VERSION = 5.0.1
 include package/qt5/*/*.mk
 
 define QT5_LA_PRL_FILES_FIXUP
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 83ce9998ce..d22ab66f37 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QT5BASE_VERSION = 5.0.1
+QT5BASE_VERSION = $(QT5_VERSION)
 QT5BASE_SITE = http://releases.qt-project.org/qt5/$(QT5BASE_VERSION)/submodules_tar/
 QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz
 

From dce7be4d7652506790464d71b05d2404bab2f705 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 05:08:58 +0000
Subject: [PATCH 4612/6849] gettext: do not get the libiconv dependency on the
 host

Fixes
http://autobuild.buildroot.org/results/e47a439c7dd763c6abc02f77730838036472e828/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 4757cf857f..8dc701e044 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -11,6 +11,7 @@ GETTEXT_LICENSE = GPLv2+
 GETTEXT_LICENSE_FILES = COPYING
 
 GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
 
 GETTEXT_CONF_OPT += \
 	--disable-libasprintf \

From 87827beff7f26fd3cee64a4952d973e207332469 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 05:08:59 +0000
Subject: [PATCH 4613/6849] iproute2: add missing host-flex dependency

Fixes
http://autobuild.buildroot.org/results/0931e622a0e80fc7321f0e26c96ae4607eaadd00/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 98a7da0784..a83133b31b 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -10,7 +10,7 @@ IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct
 IPROUTE2_LICENSE = GPLv2
 IPROUTE2_LICENSE_FILES = COPYING
 
-IPROUTE2_DEPENDENCIES += host-bison
+IPROUTE2_DEPENDENCIES += host-bison host-flex
 
 # If both iproute2 and busybox are selected, make certain we win
 # the fight over who gets to have their utils actually installed.

From 50bcee6ad5dd2aab273f6a055367ca2c232598f7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 05:09:00 +0000
Subject: [PATCH 4614/6849] flex: needs host-m4

Fixes
http://autobuild.buildroot.org/results/9f5c2ad2b3d268dd82985a3a386530a12e5681ef/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/flex.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 834f0b548f..59551f22b3 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -10,9 +10,9 @@ FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
 FLEX_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext)
+	$(if $(BR2_PACKAGE_GETTEXT),gettext) host-m4
 # we don't have a host-gettext/libintl
-HOST_FLEX_DEPENDENCIES =
+HOST_FLEX_DEPENDENCIES = host-m4
 
 ifeq ($(BR2_PACKAGE_FLEX_BINARY),y)
 # lex -> flex

From 767ad5b4a738d5848d8c5042892fca85053370bc Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 15 Sep 2012 14:27:53 +0000
Subject: [PATCH 4615/6849] openssh: add linux-pam support

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...penssh-fix-pam-uclibc-pthreads-clash.patch | 44 +++++++++++++++++++
 package/openssh/openssh.mk                    |  5 +++
 2 files changed, 49 insertions(+)
 create mode 100644 package/openssh/openssh-fix-pam-uclibc-pthreads-clash.patch

diff --git a/package/openssh/openssh-fix-pam-uclibc-pthreads-clash.patch b/package/openssh/openssh-fix-pam-uclibc-pthreads-clash.patch
new file mode 100644
index 0000000000..d9bc6e5d0c
--- /dev/null
+++ b/package/openssh/openssh-fix-pam-uclibc-pthreads-clash.patch
@@ -0,0 +1,44 @@
+When PAM is enabled, openssh makes its own static versions of pthreads
+functions.  But when built with a uclibc toolchain, pthreads.h gets
+indirectly included.  The clashing exported and static definitions of
+the pthreads functions then cause a compile error.  This patch fixes
+the problem by changing the static pthread function names with macros
+when the static functions are defined.
+
+Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
+
+diff -urN openssh-6.1p1.orig/auth-pam.c openssh-6.1p1/auth-pam.c
+--- openssh-6.1p1.orig/auth-pam.c	2009-07-12 08:07:21.000000000 -0400
++++ openssh-6.1p1/auth-pam.c	2012-09-15 19:49:47.677288199 -0400
+@@ -166,6 +166,7 @@
+ 		sigdie("PAM: authentication thread exited uncleanly");
+ }
+ 
++#define pthread_exit pthread_exit_AVOID_UCLIBC_PTHREAD_CLASH
+ /* ARGSUSED */
+ static void
+ pthread_exit(void *value)
+@@ -173,6 +174,7 @@
+ 	_exit(0);
+ }
+ 
++#define pthread_create pthread_create_AVOID_UCLIBC_PTHREAD_CLASH
+ /* ARGSUSED */
+ static int
+ pthread_create(sp_pthread_t *thread, const void *attr,
+@@ -200,6 +202,7 @@
+ 	}
+ }
+ 
++#define pthread_cancel pthread_cancel_AVOID_UCLIBC_PTHREAD_CLASH
+ static int
+ pthread_cancel(sp_pthread_t thread)
+ {
+@@ -207,6 +210,7 @@
+ 	return (kill(thread, SIGTERM));
+ }
+ 
++#define pthread_join pthread_join_AVOID_UCLIBC_PTHREAD_CLASH
+ /* ARGSUSED */
+ static int
+ pthread_join(sp_pthread_t thread, void **value)
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 81a28a1993..03ea73d73c 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -12,6 +12,11 @@ OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \
 
 OPENSSH_DEPENDENCIES = zlib openssl
 
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+OPENSSH_DEPENDENCIES += linux-pam
+OPENSSH_CONF_OPT += --with-pam
+endif
+
 define OPENSSH_INSTALL_INITSCRIPT
 	$(INSTALL) -D -m 755 package/openssh/S50sshd $(TARGET_DIR)/etc/init.d/S50sshd
 endef

From 97e723b0f1c32284c7a87fb4039ed7ef12956877 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 05:42:41 +0000
Subject: [PATCH 4616/6849] libnl: add missing dependency on host-flex

Fixes
http://autobuild.buildroot.org/results/9c496031fef011b86113e342a8ca4a36ae360bb1/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 7620cf721b..2a9f5a9a77 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -9,7 +9,7 @@ LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING
 LIBNL_INSTALL_STAGING = YES
-LIBNL_DEPENDENCIES = host-bison
+LIBNL_DEPENDENCIES = host-bison host-flex
 LIBNL_MAKE = $(MAKE1)
 LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \
 	cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \

From a22a21c76f36b87a1823df05518b1b55c457e127 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:22 +0000
Subject: [PATCH 4617/6849] rt-tests: mention that NPTL thread implementation
 is needed

This patch superseds http://patchwork.ozlabs.org/patch/150161/, but
does it in a different way. Since we don't have a way of selecting the
thread implementation for external toolchains, and it sounds a bit too
heavy to add new config options just for the sake of rt-tests, we
instead simply add some help text to the rt-tests package explaining
that NPTL thread implementation is needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rt-tests/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index 0999ebfbce..a040139579 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -14,6 +14,12 @@ config BR2_PACKAGE_RT_TESTS
 	  installed if a Python interpreter has been selected in the
 	  Buildroot configuration.
 
+	  Note that this package requires a toolchain built with the
+	  NPTL implementation of the pthread API (this is always the
+	  case with glibc/eglibc toolchains, but may not necessarily
+	  be the case with uClibc toolchains, since the thread
+	  implementation is configurable).
+
 	  http://rt.wiki.kernel.org
 
 comment "rt-tests requires a toolchain with threads support"

From c3cf74351daadf5f72481a74e7584071476dc05a Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard@netgear.com>
Date: Sun, 24 Mar 2013 08:19:23 +0000
Subject: [PATCH 4618/6849] dtach: new package

Signed-off-by: Justin Maggard <jmaggard@netgear.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/dtach/Config.in |  8 ++++++++
 package/dtach/dtach.mk  | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/dtach/Config.in
 create mode 100644 package/dtach/dtach.mk

diff --git a/package/Config.in b/package/Config.in
index 94e279b3af..c66e139645 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -774,6 +774,7 @@ source "package/bash/Config.in"
 source "package/dash/Config.in"
 endif
 source "package/dialog/Config.in"
+source "package/dtach/Config.in"
 source "package/file/Config.in"
 source "package/gnupg/Config.in"
 source "package/inotify-tools/Config.in"
diff --git a/package/dtach/Config.in b/package/dtach/Config.in
new file mode 100644
index 0000000000..033536bdb8
--- /dev/null
+++ b/package/dtach/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_DTACH
+	bool "dtach"
+	help
+	  dtach is a tiny program that emulates the detach feature of screen,
+	  allowing you to run a program in an environment that is protected
+	  from the controlling terminal and attach to it later.
+
+	  http://dtach.sourceforge.net/
diff --git a/package/dtach/dtach.mk b/package/dtach/dtach.mk
new file mode 100644
index 0000000000..77ad7c0272
--- /dev/null
+++ b/package/dtach/dtach.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# dtach
+#
+#############################################################
+
+DTACH_VERSION = 0.8
+DTACH_SITE = http://downloads.sourceforge.net/project/dtach/dtach/$(DTACH_VERSION)
+DTACH_LICENSE = GPLv2+
+DTACH_LICENSE_FILES = COPYING
+
+# The Makefile does not have an install target.
+define DTACH_INSTALL_TARGET_CMDS
+        $(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach
+endef
+
+$(eval $(autotools-package))

From d50c7be769f078aa1e867b03d297777c89ae956c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:24 +0000
Subject: [PATCH 4619/6849] gd: add patch to fix gdlib-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gd/gd-gdlib-config.patch | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/gd/gd-gdlib-config.patch

diff --git a/package/gd/gd-gdlib-config.patch b/package/gd/gd-gdlib-config.patch
new file mode 100644
index 0000000000..bfff88bbc5
--- /dev/null
+++ b/package/gd/gd-gdlib-config.patch
@@ -0,0 +1,32 @@
+Fix gdlib-config
+
+Since the @LIBICONV@ macro doesn't get replaced at compile time, we
+end up installing an invalid gdlib-config: the gdlib-config --libs
+says that one should link against @LIBICONV@ which obviously doesn't
+work.
+
+Use the OpenWRT patch from
+https://dev.openwrt.org/browser/packages/libs/gd/patches/101-gdlib-config.patch
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+--- a/config/gdlib-config.in
++++ b/config/gdlib-config.in
+@@ -71,7 +71,7 @@ while test $# -gt 0; do
+ 	echo @LDFLAGS@
+ 	;;
+     --libs)
+-	echo @LIBS@ @LIBICONV@
++	echo @LIBS@
+ 	;;
+     --cflags|--includes)
+ 	echo -I@includedir@
+@@ -84,7 +84,7 @@ while test $# -gt 0; do
+ 	echo "includedir: $includedir"
+ 	echo "cflags:     -I@includedir@"
+ 	echo "ldflags:    @LDFLAGS@"
+-	echo "libs:       @LIBS@ @LIBICONV@"
++	echo "libs:       @LIBS@"
+ 	echo "libdir:     $libdir"
+ 	echo "features:   @FEATURES@"
+ 	;;

From 83d871809c52c3f79989164a07c6b9021bfa1851 Mon Sep 17 00:00:00 2001
From: Anthony Viallard <viallard@syscom-instruments.com>
Date: Sun, 24 Mar 2013 08:19:25 +0000
Subject: [PATCH 4620/6849] gnuplot: new package

[Thomas: Improved by adding support to use readline functionality, gd
functionality, and various fixes.]

Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/gnuplot/Config.in                     |  6 ++
 ...01-configure-add-without-demo-option.patch | 66 +++++++++++++++++++
 ...uplot-0002-use-gdlib-config-properly.patch | 27 ++++++++
 package/gnuplot/gnuplot.mk                    | 50 ++++++++++++++
 5 files changed, 150 insertions(+)
 create mode 100644 package/gnuplot/Config.in
 create mode 100644 package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
 create mode 100644 package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch
 create mode 100644 package/gnuplot/gnuplot.mk

diff --git a/package/Config.in b/package/Config.in
index c66e139645..5f33e45264 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -106,6 +106,7 @@ endmenu
 menu "Graphic libraries and applications (graphic/text)"
 
 comment "Graphic applications"
+source "package/gnuplot/Config.in"
 source "package/rrdtool/Config.in"
 
 comment "graphic libraries"
diff --git a/package/gnuplot/Config.in b/package/gnuplot/Config.in
new file mode 100644
index 0000000000..603c194fe5
--- /dev/null
+++ b/package/gnuplot/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GNUPLOT
+	bool "gnuplot"
+	help
+	  A portable command-line driven graphing utility.
+
+	  http://www.gnuplot.info/
diff --git a/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
new file mode 100644
index 0000000000..ccca4e3aa7
--- /dev/null
+++ b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
@@ -0,0 +1,66 @@
+Add options to enable/disable docs and demos
+
+Originally written by Anthony Viallard
+<viallard@syscom-instruments.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: gnuplot-4.6.0/configure.in
+===================================================================
+--- gnuplot-4.6.0.orig/configure.in	2012-03-08 05:34:42.000000000 +0100
++++ gnuplot-4.6.0/configure.in	2013-01-07 11:50:03.003804463 +0100
+@@ -748,6 +748,16 @@
+ AC_ARG_WITH(lisp-files,dnl
+ [  --without-lisp-files    do not build emacs lisp files])
+ 
++dnl Whether we want to build the demo files
++dnl Does nothing here, is passed on to the demo subdir
++AC_ARG_ENABLE(demo,dnl
++[  --disable-demo    do not build demo files])
++
++dnl Whether we want to build the doc files
++dnl Does nothing here, is passed on to the doc subdir
++AC_ARG_ENABLE(doc,dnl
++[  --disable-doc    do not build doc files])
++
+ dnl Sort help/subtopic tables by row or column
+ AC_ARG_WITH(row-help,dnl
+ [  --with-row-help         format help and subtopic tables by row (default)
+@@ -1200,6 +1210,24 @@
+ fi
+ AC_SUBST(LISPDIR)
+ 
++dnl build demo files
++if test "$enable_demo" != no; then
++  AC_CONFIG_SUBDIRS(demo)
++  DEMOSUBDIR=demo
++else
++  DEMOSUBDIR=
++fi
++AC_SUBST(DEMOSUBDIR)
++
++dnl build doc files
++if test "$enable_doc" != no; then
++  AC_CONFIG_SUBDIRS(docs)
++  DOCSUBDIR=docs
++else
++  DOCSUBDIR=
++fi
++AC_SUBST(DOCSUBDIR)
++
+ dnl Substitute variables
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION_MAJOR)
+Index: gnuplot-4.6.0/Makefile.am
+===================================================================
+--- gnuplot-4.6.0.orig/Makefile.am	2013-01-04 14:07:02.239120935 +0100
++++ gnuplot-4.6.0/Makefile.am	2013-01-07 11:51:12.034846363 +0100
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ 
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
+ 
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \
diff --git a/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch b/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch
new file mode 100644
index 0000000000..690a82652a
--- /dev/null
+++ b/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch
@@ -0,0 +1,27 @@
+Fix usage of gdlib-config
+
+gnuplot configure.in script properly takes care of finding
+gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config
+instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG
+has defined. Which means that whenever a gdlib-config binary not in
+the PATH is being used, it does not use it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -537,9 +537,9 @@
+ if test "$with_gd" != no; then
+   AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
+   if test -n "$GDLIB_CONFIG"; then
+-    libgd_CPPFLAGS=`gdlib-config --cflags`
+-    libgd_LDFLAGS=`gdlib-config --ldflags`
+-    libgd_LIBS=`gdlib-config --libs`
++    libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
++    libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
++    libgd_LIBS=`$GDLIB_CONFIG --libs`
+   elif test -d "$with_gd"; then
+     libgd_CPPFLAGS="-I$with_gd/include"
+     libgd_LDFLAGS="-L$with_gd/lib"
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
new file mode 100644
index 0000000000..a68c7ae391
--- /dev/null
+++ b/package/gnuplot/gnuplot.mk
@@ -0,0 +1,50 @@
+#############################################################
+#
+# gnuplot
+#
+#############################################################
+
+GNUPLOT_VERSION = 4.6.2
+GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
+GNUPLOT_LICENSE = gnuplot license (open source)
+GNUPLOT_LICENSE_FILES = Copyright
+
+GNUPLOT_AUTORECONF = YES
+
+GNUPLOT_CONF_OPT = --without-x \
+		--disable-raise-console \
+		--disable-mouse \
+	        --without-tutorial \
+		--disable-demo \
+	        --without-row-help \
+		--disable-history-file \
+	        --without-lisp-files \
+	        --disable-wxwidgets \
+	        --without-lua \
+		--without-latex \
+	        --without-cairo
+
+ifeq ($(BR2_PACKAGE_GD),y)
+GNUPLOT_CONF_OPT += --with-gd
+GNUPLOT_DEPENDENCIES += gd
+GNUPLOT_CONF_ENV += \
+	ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config
+else
+GNUPLOT_CONF_OPT += --without-gd
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+GNUPLOT_CONF_OPT += --with-readline=gnu
+GNUPLOT_DEPENDENCIES += readline
+else
+GNUPLOT_CONF_OPT += --without-readline
+endif
+
+# Remove Javascript scripts, lua scripts, PostScript files
+define GNUPLOT_REMOVE_UNNEEDED_FILES
+	$(RM) -rf $(TARGET_DIR)/usr/share/gnuplot
+endef
+
+GNUPLOT_POST_INSTALL_TARGET_HOOKS += GNUPLOT_REMOVE_UNNEEDED_FILES
+
+$(eval $(autotools-package))

From ff0865a94694dd964278585c85c4401598b5a6aa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:26 +0000
Subject: [PATCH 4621/6849] neon: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/neon.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index cec72f89bd..58e01e1ff4 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -5,6 +5,8 @@
 #############################################################
 NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
+NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
+NEON_LICENSE_FILES = src/COPYING.LIB src/COPYING README
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPT = --without-gssapi --disable-rpath
 NEON_CONFIG_SCRIPTS = neon-config

From a315d073d555a5141337c1860b1c425046a351b5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:27 +0000
Subject: [PATCH 4622/6849] apr: various improvements

This commit:
 * Adds licensing informations
 * Ensures the apr-1-config script gets fixed appropriately
 * Remove the usr/build-1/ directory from the target, since it is only
   used during the compilation of packages that rely on APR.
 * Fix up a few paths in usr/build-1/ so that the compilation of
   apr-util works properly on top of this apr package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/apr/apr.mk | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index e502490ead..a9dcb40203 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -5,6 +5,8 @@
 #############################################################
 APR_VERSION = 1.4.6
 APR_SITE = http://archive.apache.org/dist/apr
+APR_LICENSE = Apache-2.0
+APR_LICENSE_FILES = LICENSE
 APR_INSTALL_STAGING = YES
 APR_CONF_ENV = \
 	ac_cv_file__dev_zero=yes \
@@ -14,5 +16,21 @@ APR_CONF_ENV = \
 	apr_cv_tcp_nodelay_with_cork=yes \
 	ac_cv_sizeof_struct_iovec=8 \
 	apr_cv_mutex_recursive=yes
+APR_CONFIG_SCRIPTS = apr-1-config
+
+define APR_CLEANUP_UNNEEDED_FILES
+	$(RM) -rf $(TARGET_DIR)/usr/build-1/
+endef
+
+APR_POST_INSTALL_TARGET_HOOKS += APR_CLEANUP_UNNEEDED_FILES
+
+define APR_FIXUP_RULES_MK
+	$(SED) 's%apr_builddir=%apr_builddir=$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/build-1/apr_rules.mk
+	$(SED) 's%apr_builders=%apr_builders=$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/build-1/apr_rules.mk
+endef
+
+APR_POST_INSTALL_STAGING_HOOKS += APR_FIXUP_RULES_MK
 
 $(eval $(autotools-package))

From a00fc22779983440d0bec2b996b55f4064079e55 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:28 +0000
Subject: [PATCH 4623/6849] apr-util: various improvements

This commit:
 * Adds licensing informations.
 * Uses the apr-1-config script instead of pointing apr-util to the
   apr build directory.
 * Ensures apu-1-config gets fixed properly using the
   <pkg>_CONFIG_SCRIPTS mechanism.
 * Ensures that libiconv gets built before apr-util if available, so
   that character set conversion features of apr-util can be enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/apr-util/apr-util.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index b9ff904c75..94b181724c 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -5,9 +5,16 @@
 #############################################################
 APR_UTIL_VERSION = 1.4.1
 APR_UTIL_SITE = http://archive.apache.org/dist/apr
+APR_UTIL_LICENSE = Apache-2.0
+APR_UTIL_LICENSE_FILES = LICENSE
 APR_UTIL_INSTALL_STAGING = YES
 APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
 APR_UTIL_CONF_OPT = \
-	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
+	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
+APR_UTIL_CONFIG_SCRIPTS = apu-1-config
+
+# When iconv is available, then use it to provide charset conversion
+# features.
+APR_UTIL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(autotools-package))

From 6ebb930b694e97e5cf85a724957d9c0eb129dea7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:29 +0000
Subject: [PATCH 4624/6849] log4cxx: new package

Initial work done by Aleksandar Zivkovic at
http://patchwork.ozlabs.org/patch/171109/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/log4cxx/Config.in                     | 15 +++++++
 .../log4cxx/log4cxx-0001-charset-fixes.patch  | 43 ++++++++++++++++++
 .../log4cxx-0002-missing-includes.patch       | 44 +++++++++++++++++++
 .../log4cxx-0003-missing-includes.patch       | 21 +++++++++
 package/log4cxx/log4cxx.mk                    | 20 +++++++++
 6 files changed, 144 insertions(+)
 create mode 100644 package/log4cxx/Config.in
 create mode 100644 package/log4cxx/log4cxx-0001-charset-fixes.patch
 create mode 100644 package/log4cxx/log4cxx-0002-missing-includes.patch
 create mode 100644 package/log4cxx/log4cxx-0003-missing-includes.patch
 create mode 100644 package/log4cxx/log4cxx.mk

diff --git a/package/Config.in b/package/Config.in
index 5f33e45264..bdfc0f2e4d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -568,6 +568,7 @@ source "package/libtpl/Config.in"
 source "package/libseccomp/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
+source "package/log4cxx/Config.in"
 source "package/lttng-libust/Config.in"
 source "package/mpc/Config.in"
 source "package/mpfr/Config.in"
diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in
new file mode 100644
index 0000000000..e98aedc46e
--- /dev/null
+++ b/package/log4cxx/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LOG4CXX
+	bool "log4cxx"
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_APR_UTIL
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Apache log4cxx is a logging framework for C++ patterned
+	  after Apache log4j.
+
+	  http://apache.linux-mirror.org/logging/log4cxx/0.10.0
+
+comment "log4cxx requires C++ support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/log4cxx/log4cxx-0001-charset-fixes.patch b/package/log4cxx/log4cxx-0001-charset-fixes.patch
new file mode 100644
index 0000000000..75567fdad1
--- /dev/null
+++ b/package/log4cxx/log4cxx-0001-charset-fixes.patch
@@ -0,0 +1,43 @@
+Fix build when iconv support is not available
+
+When iconv support is not available, the apr-util library does not
+provide character set conversion features, and therefore APR_HAS_XLATE
+is false.
+
+However, on Linux !defined(_WIN32) is always true, but the part of the
+code that defines the APRCharsetDecoder and APRCharsetEncoder are only
+enclosed in a #if APR_HAS_XLATE, without the "|| defined(_WIN32)"
+which leads to build failures: the APRCharsetEncoder and
+APRCharsetDecoder classes are used without being defined.
+
+This patch removes the || !defined(_WIN32) so that when iconv support
+is not here, we fall back to raising an exception at runtime.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/main/cpp/charsetdecoder.cpp
+===================================================================
+--- a/src/main/cpp/charsetdecoder.cpp
++++ b/src/main/cpp/charsetdecoder.cpp
+@@ -476,7 +476,7 @@
+         StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("ISO-LATIN-1"), LOG4CXX_STR("iso-latin-1"))) {
+         return new ISOLatinCharsetDecoder();
+     }
+-#if APR_HAS_XLATE || !defined(_WIN32)
++#if APR_HAS_XLATE
+     return new APRCharsetDecoder(charset);
+ #else    
+     throw IllegalArgumentException(charset);
+Index: b/src/main/cpp/charsetencoder.cpp
+===================================================================
+--- a/src/main/cpp/charsetencoder.cpp
++++ b/src/main/cpp/charsetencoder.cpp
+@@ -484,7 +484,7 @@
+     } else if (StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("UTF-16LE"), LOG4CXX_STR("utf-16le"))) {
+         return new UTF16LECharsetEncoder();
+     }
+-#if APR_HAS_XLATE || !defined(_WIN32)
++#if APR_HAS_XLATE
+     return new APRCharsetEncoder(charset);
+ #else    
+     throw IllegalArgumentException(charset);
diff --git a/package/log4cxx/log4cxx-0002-missing-includes.patch b/package/log4cxx/log4cxx-0002-missing-includes.patch
new file mode 100644
index 0000000000..dd4da11619
--- /dev/null
+++ b/package/log4cxx/log4cxx-0002-missing-includes.patch
@@ -0,0 +1,44 @@
+commit bcaf1f8a682d641cee325142099c371464fd5946
+Author: Curtis William Arnold <carnold@apache.org>
+Date:   Tue May 20 16:05:37 2008 +0000
+
+    LOGCXX-286: gcc 4.3 requires #include <cstring>
+    
+    git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@658304 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
+index 6a01d8a..a673a10 100755
+--- a/src/examples/cpp/console.cpp
++++ b/src/examples/cpp/console.cpp
+@@ -22,6 +22,7 @@
+ #include <log4cxx/logmanager.h>
+ #include <iostream>
+ #include <locale.h>
++#include <cstring>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff --git a/src/main/cpp/inputstreamreader.cpp b/src/main/cpp/inputstreamreader.cpp
+index 52b1c0a..cb45181 100644
+--- a/src/main/cpp/inputstreamreader.cpp
++++ b/src/main/cpp/inputstreamreader.cpp
+@@ -20,6 +20,7 @@
+ #include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <cstring>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff --git a/src/main/cpp/socketoutputstream.cpp b/src/main/cpp/socketoutputstream.cpp
+index 185f835..c61eb11 100644
+--- a/src/main/cpp/socketoutputstream.cpp
++++ b/src/main/cpp/socketoutputstream.cpp
+@@ -19,6 +19,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <cstring>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/log4cxx-0003-missing-includes.patch b/package/log4cxx/log4cxx-0003-missing-includes.patch
new file mode 100644
index 0000000000..cd21bbab3e
--- /dev/null
+++ b/package/log4cxx/log4cxx-0003-missing-includes.patch
@@ -0,0 +1,21 @@
+commit ce62c00ea5f9bf2f0740ecde5b245c9b7edc80ff
+Author: Curtis William Arnold <carnold@apache.org>
+Date:   Mon Apr 27 03:53:50 2009 +0000
+
+    LOGCXX-332: fails to build with gcc 4.4
+    
+    git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@768863 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
+index a673a10..f44c944 100755
+--- a/src/examples/cpp/console.cpp
++++ b/src/examples/cpp/console.cpp
+@@ -23,6 +23,8 @@
+ #include <iostream>
+ #include <locale.h>
+ #include <cstring>
++#include <cstdio>
++#include <stdint.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk
new file mode 100644
index 0000000000..83afded9cb
--- /dev/null
+++ b/package/log4cxx/log4cxx.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# log4cxx
+#
+#############################################################
+
+LOG4CXX_VERSION = 0.10.0
+LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
+LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
+LOG4CXX_INSTALL_STAGING = YES
+LOG4CXX_LICENSE = Apache-2.0
+LOG4CXX_LICENSE_FILES = LICENSE
+
+LOG4CXX_CONF_OPT = \
+	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \
+	--with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config
+
+LOG4CXX_DEPENDENCIES = apr apr-util
+
+$(eval $(autotools-package))

From c415c33959d15b5632708c051acb4fcdacaa90a4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 08:19:30 +0000
Subject: [PATCH 4625/6849] xcursor-transparent-theme: new package

Based on work originally done by Aleksandar Zivkovic at
http://patchwork.ozlabs.org/patch/171109/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                       |  1 +
 .../x11r7/xcursor-transparent-theme/Config.in |  7 ++++
 .../xcursor-transparent-theme/index.theme     |  2 +
 ...r-transparent-theme-0001-fix-symlink.patch | 37 +++++++++++++++++++
 .../xcursor-transparent-theme.mk              | 18 +++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 package/x11r7/xcursor-transparent-theme/Config.in
 create mode 100644 package/x11r7/xcursor-transparent-theme/index.theme
 create mode 100644 package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch
 create mode 100644 package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 5d0f991ca8..7b32ac7a0a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -268,6 +268,7 @@ if BR2_PACKAGE_XORG7
 	menu "X11R7 Other data"
 		source package/x11r7/xdata_xbitmaps/Config.in
 		source package/x11r7/xdata_xcursor-themes/Config.in
+		source package/x11r7/xcursor-transparent-theme/Config.in
 		source package/x11r7/xkeyboard-config/Config.in
 	endmenu
 endif
diff --git a/package/x11r7/xcursor-transparent-theme/Config.in b/package/x11r7/xcursor-transparent-theme/Config.in
new file mode 100644
index 0000000000..8282db897a
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XCURSOR_TRANSPARENT_THEME
+	bool "xcursor-transparent-theme"
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
+	help
+	  Completely transparent theme for hiding the X11 cursor.
+
+	  No upstream site.
diff --git a/package/x11r7/xcursor-transparent-theme/index.theme b/package/x11r7/xcursor-transparent-theme/index.theme
new file mode 100644
index 0000000000..5300850fba
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/index.theme
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=xcursor-transparent
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch
new file mode 100644
index 0000000000..9cf351f238
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch
@@ -0,0 +1,37 @@
+Do not symlink to a host directory
+
+The installation of xcursor-transparent-theme creates many symbolic
+links to the 'transp' cursor file, but it does so using an absolute
+directory, that happens to point to the installation location, which
+is incorrect when cross-compiling.
+
+Also add the -f option so that the package can be reinstalled even if
+it has already been installed.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/cursors/Makefile.am
+===================================================================
+--- a/cursors/Makefile.am
++++ b/cursors/Makefile.am
+@@ -91,6 +91,6 @@
+ 	$(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ 
+ 	for CURSOR in $(CURSOR_NAMES); do \
+ 		echo '-- Installing cursor '$$CURSOR; \
+-		ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
++		ln -sf transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
+ 	done
+ 
+Index: b/cursors/Makefile.in
+===================================================================
+--- a/cursors/Makefile.in
++++ b/cursors/Makefile.in
+@@ -177,7 +177,7 @@
+ 	$(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ 
+ 	for CURSOR in $(CURSOR_NAMES); do \
+ 		echo '-- Installing cursor '$$CURSOR; \
+-		ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
++		ln -sf transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
+ 	done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
new file mode 100644
index 0000000000..3ad985bf6e
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# xcursor-transparent-theme - No description available
+#
+#############################################################
+
+XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1
+XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils/
+XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
+
+define ICONS_DEFAULT_CONFIG_INSTALL
+        $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \
+		$(TARGET_DIR)/usr/share/icons/default/index.theme
+endef
+
+XCURSOR_TRANSPARENT_THEME_POST_INSTALL_TARGET_HOOKS += ICONS_DEFAULT_CONFIG_INSTALL
+
+$(eval $(autotools-package))

From a8694c3cb5711023fcce911bb673c01b36d48d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= <rebillout@syscom.ch>
Date: Thu, 20 Dec 2012 02:47:17 +0000
Subject: [PATCH 4626/6849] uboot-tools: add option for mkenvimage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The tool mkenvimage generates a valid binary environment image from
a text file describing the key=value pairs of the environment.
This commit allows installation on target and host.

Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uboot-tools/Config.in      | 7 +++++++
 package/uboot-tools/uboot-tools.mk | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in
index 9cc837c93a..7c8f17ce6b 100644
--- a/package/uboot-tools/Config.in
+++ b/package/uboot-tools/Config.in
@@ -13,6 +13,13 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE
 	  The mkimage tool from Das U-Boot bootloader, which allows
 	  generation of U-Boot images in various formats.
 
+config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE
+	bool "mkenvimage"
+	help
+	  The mkenvimage tool from Das U-Boot bootloader, which allows
+	  generation of a valid binary environment image from a text file
+	  describing the key=value pairs of the environment.
+
 config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
 	bool "fw_printenv"
 	default y
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 9d7596a702..f03ff91475 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -24,6 +24,12 @@ define UBOOT_TOOLS_INSTALL_MKIMAGE
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE),y)
+define UBOOT_TOOLS_INSTALL_MKENVIMAGE
+	$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(TARGET_DIR)/usr/bin/mkenvimage
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
 define UBOOT_TOOLS_INSTALL_FWPRINTENV
 	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
@@ -33,6 +39,7 @@ endif
 
 define UBOOT_TOOLS_INSTALL_TARGET_CMDS
 	$(UBOOT_TOOLS_INSTALL_MKIMAGE)
+	$(UBOOT_TOOLS_INSTALL_MKENVIMAGE)
 	$(UBOOT_TOOLS_INSTALL_FWPRINTENV)
 endef
 
@@ -51,6 +58,7 @@ endef
 
 define HOST_UBOOT_TOOLS_INSTALL_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
+	$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage
 endef
 
 $(eval $(generic-package))

From 7b252919409e7bb63f6035fbe3b7167f4abbfed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= <rebillout@syscom.ch>
Date: Thu, 20 Dec 2012 02:47:18 +0000
Subject: [PATCH 4627/6849] uboot: integrate mkenvimage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit provides configuration options to automatically generate a
binary environment image for U-Boot.
Two options are available (and mandatory):
 * the location of a text file describing U-Boot environment.
 * the size of the environment.

[Peter: fix Config.in indentation + typo]
Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 23 +++++++++++++++++++++++
 boot/uboot/uboot.mk  | 16 ++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index d22e23bd72..bc5ce19daa 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -212,4 +212,27 @@ config BR2_TARGET_UBOOT_SPL_NAME
 	  u-boot build. For most platform it is u-boot-spl.bin
 	  but not always. It is MLO on OMAP for example.
 
+menuconfig BR2_TARGET_UBOOT_ENVIMAGE
+	bool "Environment image"
+	help
+	  Generate a valid binary environment image from a text file
+	  describing the key=value pairs of the environment.
+
+	  The environment image will be called uboot-env.bin.
+
+if BR2_TARGET_UBOOT_ENVIMAGE
+
+config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE
+	string "Source file for environment"
+	help
+	  Text file describing the environment.
+
+config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
+	string "Size of environment"
+	help
+	  Size of envronment, can be prefixed with 0x for hexadecimal
+	  values.
+
+endif # BR2_TARGET_UBOOT_ENVIMAGE
+
 endif # BR2_TARGET_UBOOT
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index ea77259d10..c337e75527 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -104,6 +104,9 @@ define UBOOT_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
 	$(if $(BR2_TARGET_UBOOT_SPL),
 		cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
+	$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
+		$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
+		-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
 endef
 
 define UBOOT_INSTALL_OMAP_IFT_IMAGE
@@ -125,6 +128,19 @@ UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
 UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y)
+# we NEED a environment settings unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),)
+$(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting))
+endif
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),)
+$(error Please provide Uboot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting))
+endif
+endif
+UBOOT_DEPENDENCIES += host-uboot-tools
+endif
+
 $(eval $(generic-package))
 
 ifeq ($(BR2_TARGET_UBOOT),y)

From 1539efc5d525641a9ac13a6c96bea7fdd45ed183 Mon Sep 17 00:00:00 2001
From: Andreas Naumann <dev@andin.de>
Date: Fri, 22 Mar 2013 16:56:54 +0100
Subject: [PATCH 4628/6849] <pkg>-rsync: Reincluding core files and folders,
 which got kicked out by --cvs-exclude option.

The --cvs-exclude option also excludes 'core', which when rsyncing
e.g. a linux tree is less than optimal..

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index afb90bf791..901bcf7bae 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -62,7 +62,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_rsynced:
 	@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
 	@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
-	rsync -au --cvs-exclude $(SRCDIR)/ $(@D)
+	rsync -au --cvs-exclude --include core $(SRCDIR)/ $(@D)
 	$(Q)touch $@
 
 # Handle the SOURCE_CHECK and SHOW_EXTERNAL_DEPS cases for rsynced

From 9a1f303ea24075d8d2f2388452cec965591d5e57 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 21 Mar 2013 12:36:13 +0000
Subject: [PATCH 4629/6849] package/bridge-utils: fix build with newer kernels

... while keeping compatibility with older ones.

Preventive fix to autobuild failures! ;-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ch => bridge-utils-000-build-system.patch} |  0
 ...tils-001-fix-for-kernel-headers-3.8+.patch | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 rename package/bridge-utils/{bridge-utils.patch => bridge-utils-000-build-system.patch} (100%)
 create mode 100644 package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch

diff --git a/package/bridge-utils/bridge-utils.patch b/package/bridge-utils/bridge-utils-000-build-system.patch
similarity index 100%
rename from package/bridge-utils/bridge-utils.patch
rename to package/bridge-utils/bridge-utils-000-build-system.patch
diff --git a/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch b/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
new file mode 100644
index 0000000000..0455a9085c
--- /dev/null
+++ b/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
@@ -0,0 +1,30 @@
+commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
+Author: Russell Senior <russell@personaltelco.net>
+Date:   Wed Mar 6 12:49:42 2013 -0800
+
+    bridge-utils: Fix compile against linux-3.8.x
+    
+    Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
+    struct in6_addr but doesn't define it.  The trivial seeming fix of
+    including the header that does define it causes more problems.  The
+    problem was discussed on mailing lists in January 2013.  The final
+    suggestion I found was here:
+    
+          http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
+    
+    This is intended to implement that suggestion.
+    
+    Signed-off-by: Russell Senior <russell@personaltelco.net>
+
+diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
+index 39964f2..dd14bae 100644
+--- a/libbridge/libbridge.h
++++ b/libbridge/libbridge.h
+@@ -20,6 +20,7 @@
+ #define _LIBBRIDGE_H
+ 
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 

From 3400663620e039427c704f6c73b061d23ac54a4a Mon Sep 17 00:00:00 2001
From: przemyslaw <przemyslaw.wrzos@calyptech.com>
Date: Wed, 20 Mar 2013 20:09:42 +0000
Subject: [PATCH 4630/6849] Fix autoreconf libtool patching

Some ltmain.sh files enclose the version number in quotes. This is
already handled corretly by pkg-autotools.mk in LIBTOOL_PATCH_HOOK.
This patch adds the same fix for AUTORECONF_HOOK.

Signed-off-by: przemyslaw <przemyslaw.wrzos@calyptech.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-autotools.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 995c68596b..d8d7e6d470 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -185,7 +185,8 @@ define AUTORECONF_HOOK
 	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
 	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
-			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
+			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
+			sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = "1.5"; then \
 				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\

From 468e9595be307b06ffd8bdcd6b7cac624e6549cc Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Sun, 24 Mar 2013 11:34:05 +0000
Subject: [PATCH 4631/6849] libpthsem: new package

[Peter: remove extra newlines]
[Thomas: various fixes/improvements]
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libpthsem/Config.in                   |  8 ++++++
 ...em-2.0.8-fix-build-on-linux-3.x-host.patch | 28 +++++++++++++++++++
 package/libpthsem/libpthsem.mk                | 17 +++++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 package/libpthsem/Config.in
 create mode 100644 package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch
 create mode 100644 package/libpthsem/libpthsem.mk

diff --git a/package/Config.in b/package/Config.in
index bdfc0f2e4d..1ba356ce8f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -562,6 +562,7 @@ source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
+source "package/libpthsem/Config.in"
 source "package/libsigc/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
diff --git a/package/libpthsem/Config.in b/package/libpthsem/Config.in
new file mode 100644
index 0000000000..9ab13c3ed8
--- /dev/null
+++ b/package/libpthsem/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBPTHSEM
+	bool "libpthsem"
+	select BR2_PACKAGE_ARGP_STANDALONE
+	help
+	  GNU pth is a user mode multi threading library. pthsem is an extend
+	  version, with support for semaphores added.
+
+	  http://www.auto.tuwien.ac.at/~mkoegler/pth/
diff --git a/package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch b/package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch
new file mode 100644
index 0000000000..21fff4e7cc
--- /dev/null
+++ b/package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch
@@ -0,0 +1,28 @@
+From 2d0450bfa3fb7003098da1a7fe24c3ae140912dc Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Mon, 22 Oct 2012 15:11:53 +0200
+Subject: [PATCH] pthsem build on Linux 3.x host
+
+
+Signed-off-by: Michael Markstaller <mm@elabnet.de>
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ acinclude.m4 |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 03b42de..fea9bc8 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -892,6 +892,8 @@ case $PLATFORM in
+         case "x`uname -r`" in
+ changequote(, )dnl
+             x2.[23456789]* ) ;;
++changequote(, )dnl
++            x3.* ) ;;
+ changequote([, ])
+             * ) braindead=yes ;;
+         esac
+-- 
+1.7.9.5
+
diff --git a/package/libpthsem/libpthsem.mk b/package/libpthsem/libpthsem.mk
new file mode 100644
index 0000000000..2c6e239c96
--- /dev/null
+++ b/package/libpthsem/libpthsem.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# libpthsem
+#
+#############################################################
+
+LIBPTHSEM_VERSION = 2.0.8
+LIBPTHSEM_SOURCE = pthsem_$(LIBPTHSEM_VERSION).tar.gz
+LIBPTHSEM_SITE = http://www.auto.tuwien.ac.at/~mkoegler/pth/
+LIBPTHSEM_LICENSE = LGPLv2.1+
+LIBPTHSEM_LICENSE_FILES = COPYING
+LIBPTHSEM_AUTORECONF = YES
+LIBPTHSEM_INSTALL_STAGING = YES
+LIBPTHSEM_DEPENDENCIES = argp-standalone
+LIBPTHSEM_CONFIG_SCRIPTS = pthsem-config
+
+$(eval $(autotools-package))

From 94e147012bd45a5b95d257af1589d5d368b2614d Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Sun, 24 Mar 2013 11:34:06 +0000
Subject: [PATCH 4632/6849] bcusdk: new package

[Peter: tweak comment]
[Thomas: various fixes/improvements]
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/bcusdk/Config.in | 22 ++++++++++++++++++++++
 package/bcusdk/bcusdk.mk | 26 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 package/bcusdk/Config.in
 create mode 100644 package/bcusdk/bcusdk.mk

diff --git a/package/Config.in b/package/Config.in
index 1ba356ce8f..be1aa99673 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -633,6 +633,7 @@ source "package/argus/Config.in"
 source "package/arptables/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
+source "package/bcusdk/Config.in"
 source "package/bluez_utils/Config.in"
 source "package/boa/Config.in"
 source "package/bind/Config.in"
diff --git a/package/bcusdk/Config.in b/package/bcusdk/Config.in
new file mode 100644
index 0000000000..cf082e7dcb
--- /dev/null
+++ b/package/bcusdk/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_BCUSDK
+	bool "bcusdk"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBPTHSEM
+	help
+	  A free development environment for the Bus Coupling Units of
+	  the European Installation Bus.
+
+	  The European Installation Bus EIB is a home and building
+	  automation bus system. It is optimized for low-speed control
+	  applications like lighting and blinds control.
+
+	  BCUs (Bus Coupling Units) are standardized, generic
+	  platforms for embedded EIB devices. They include the entire
+	  physical layer network interface, power supply and a
+	  microcontroller with an implementation of the EIB protocol
+	  stack stored in the ROM.
+
+	  http://www.auto.tuwien.ac.at/~mkoegler/eib/
+
+comment "bcusdk requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
new file mode 100644
index 0000000000..3e07143137
--- /dev/null
+++ b/package/bcusdk/bcusdk.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# bcusck
+#
+#############################################################
+
+BCUSDK_VERSION = 0.0.5
+BCUSDK_SOURCE = bcusdk_$(BCUSDK_VERSION).tar.gz
+BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib/
+BCUSDK_LICENSE = GPLv2+
+BCUSDK_LICENSE_FILES = COPYING
+BCUSDK_INSTALL_STAGING = YES
+BCUSDK_CONF_OPT =  --enable-onlyeibd --enable-ft12 --enable-pei16 \
+		 --enable-eibnetip --enable-eibnetipserver \
+		 --enable-eibnetiptunnel --without-pth-test \
+		 --with-pth=$(STAGING_DIR)/usr
+
+BCUSDK_DEPENDENCIES = libpthsem
+
+define BCUSDK_REMOVE_EXAMPLES
+	$(RM) -rf $(TARGET_DIR)/usr/share/bcusdk
+endef
+
+BCUSDK_POST_INSTALL_TARGET_HOOKS += BCUSDK_REMOVE_EXAMPLES
+
+$(eval $(autotools-package))

From ca0c174e53dd4f23d00c81dd38657107a1c4e3de Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 11:34:08 +0000
Subject: [PATCH 4633/6849] argp-standalone: add license information

There is unfortunately no license file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/argp-standalone/argp-standalone.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk
index ba7f7576c0..4fc4321b42 100644
--- a/package/argp-standalone/argp-standalone.mk
+++ b/package/argp-standalone/argp-standalone.mk
@@ -7,6 +7,7 @@
 ARGP_STANDALONE_VERSION = 1.3
 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
 ARGP_STANDALONE_INSTALL_STAGING = YES
+ARGP_STANDALONE_LICENSE = LGPLv2+
 
 ARGP_STANDALONE_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -fPIC"

From 69aeb066a68108e0f78af34d5baf770c490954d0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 12:29:05 +0000
Subject: [PATCH 4634/6849] texinfo: new host package

The makeinfo program from texinfo is needed to get Crosstool-NG to
build properly a toolchain. Long term, it would be great if
Crosstool-NG supported building without texinfo, simply by disabling
the build of documentation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/texinfo/texinfo.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 package/texinfo/texinfo.mk

diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk
new file mode 100644
index 0000000000..54d18b68ab
--- /dev/null
+++ b/package/texinfo/texinfo.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# texinfo
+#
+#############################################################
+
+# We are intentionally not using the latest version 5.x, because it
+# causes issues with the documentation building process when creating
+# a toolchain with the Crosstool-NG backend.
+
+TEXINFO_VERSION = 4.13a
+TEXINFO_SITE = $(BR2_GNU_MIRROR)/texinfo
+
+$(eval $(host-autotools-package))

From 8dfe032f7e2db454453ba868d3356d5f3afdbab5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 12:29:06 +0000
Subject: [PATCH 4635/6849] crosstool-ng: add missing dependencies

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crosstool-ng/crosstool-ng.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 3b207a24e1..2d93f90f80 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -3,6 +3,10 @@ CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
-HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake host-gperf
+
+HOST_CROSSTOOL_NG_DEPENDENCIES = \
+	$(if $(BR2_CCACHE),host-ccache) host-gawk \
+	host-automake host-gperf host-bison host-flex \
+	host-texinfo
 
 $(eval $(host-autotools-package))

From be8e32d585f38cb5527fa65c53bf23fba025c62c Mon Sep 17 00:00:00 2001
From: przemyslaw <przemyslaw.wrzos@calyptech.com>
Date: Tue, 29 Jan 2013 16:14:44 +0000
Subject: [PATCH 4636/6849] netsnmp: configurable MIB modules

Make the MIB modules, which are included/excluded in the build, to be
configurable instead of being hard coded.

[Peter: drop menuconfig]
Signed-off-by: przemyslaw <przemyslaw.wrzos@calyptech.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/Config.in  | 14 ++++++++++++++
 package/netsnmp/netsnmp.mk |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index 108ab83936..d5056f928b 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -15,6 +15,20 @@ config BR2_PACKAGE_NETSNMP_ENABLE_MIBS
 	  Say yes if you want those MIB files installed on the target
 	  and enable the code that parses the MIB files.
 
+config BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES
+	string "Build with these MIB modules"
+	default "host ucd-snmp/dlmod"
+	depends on BR2_PACKAGE_NETSNMP
+	help
+	  Specify which MIB modules to include.
+
+config BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES
+	string "Build without these MIB modules"
+	default "disman/event disman/schedule utilities"
+	depends on BR2_PACKAGE_NETSNMP
+	help
+	  Specify which MIB modules to exclude.
+
 config BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING
 	bool "Enable debugging code"
 	depends on BR2_PACKAGE_NETSNMP
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 2670cf33b1..a6912e5c97 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -20,8 +20,8 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
 		--enable-silent-libtool --enable-mfd-rewrites \
 		--with-sys-contact="root@localhost" \
 		--with-sys-location="Unknown" \
-		--with-mib-modules="host ucd-snmp/dlmod" \
-		--with-out-mib-modules="disman/event disman/schedule utilities" \
+		--with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
+		--with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
 		--with-out-transports="Unix"
 NETSNMP_MAKE = $(MAKE1)
 NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX

From 633a5e3cfa9d33b0fe1e4373de6a0f85309dd426 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 12:48:38 +0000
Subject: [PATCH 4637/6849] apr-util: fix incorrect operator leading to missing
 dependencies

Fixes
http://autobuild.buildroot.org/results/490a07cc161391b98193ab2c225458effc030ce7/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/apr-util/apr-util.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index 94b181724c..cc90f9e49f 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -15,6 +15,6 @@ APR_UTIL_CONFIG_SCRIPTS = apu-1-config
 
 # When iconv is available, then use it to provide charset conversion
 # features.
-APR_UTIL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(autotools-package))

From 4bce66aa6bdda71c38f555082d1f799f573f52cd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 13:28:29 +0000
Subject: [PATCH 4638/6849] linux-pam: add missing dependency on host-flex

Fixes
http://autobuild.buildroot.org/results/d8c52c0563e912e03c5f006f5865aa58f70d10e1/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-pam/linux-pam.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index be510498b2..f5388c1721 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -16,7 +16,8 @@ LINUX_PAM_CONF_OPT = \
 	--disable-regenerate-docu \
 	--enable-securedir=/lib/security \
 	--libdir=/lib
-LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) flex
+LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	flex host-flex
 LINUX_PAM_AUTORECONF = YES
 LINUX_PAM_LICENSE = BSD-3c
 LINUX_PAM_LICENSE_FILES = Copyright

From e5ce4e4164e30189e02f04d37708e7d4703851cf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 13:42:59 +0000
Subject: [PATCH 4639/6849] gstreamer: add missing dependencies on host-flex
 and host-bison

Fixes:
http://autobuild.buildroot.org/results/f9f32bfd44a3f74ec30fc61594bf6eb04f80f872/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/gstreamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 3fb913e9d0..5abce53970 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -27,6 +27,6 @@ GSTREAMER_CONF_OPT = \
 		$(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \
 		$(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry)
 
-GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf
+GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex
 
 $(eval $(autotools-package))

From 94dad5d0351c1577237ecc77421cfb74a976c068 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 21:34:59 +0000
Subject: [PATCH 4640/6849] mrouted: add missing dependency on host-bison

Fixes
http://autobuild.buildroot.org/results/10d875724388034369e7673a6c08ecad3863ba06/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mrouted/mrouted.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 90f2f595af..56aa7e11d1 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -7,6 +7,7 @@
 MROUTED_VERSION = 3.9.6
 MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
 MROUTED_SITE = http://cloud.github.com/downloads/troglobit/mrouted
+MROUTED_DEPENDENCIES = host-bison
 
 define MROUTED_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From 48465f0796b0ffc53300161b746ff20ccce1e8df Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 21:42:30 +0000
Subject: [PATCH 4641/6849] gnuchess: add missing dependencies on flex and
 host-flex

And also add a missing newline and licensing informations while we're
at it.

Fixes:
http://autobuild.buildroot.org/results/2851f23990c9f6642b1e706a94b1afc15a24b6f7/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuchess/Config.in   | 1 +
 package/gnuchess/gnuchess.mk | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/gnuchess/Config.in b/package/gnuchess/Config.in
index c79c52dd46..105fbbc308 100644
--- a/package/gnuchess/Config.in
+++ b/package/gnuchess/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GNUCHESS
 	bool "gnuchess"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_FLEX
 	help
 	  GNU Chess lets most modern computers play a full game of chess.
 
diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
index 3e0b724fa6..90d2274a64 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/gnuchess/gnuchess.mk
@@ -3,11 +3,15 @@
 # gnuchess
 #
 #############################################################
+
 GNUCHESS_VERSION = 5.07
 GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
+GNUCHESS_LICENSE = GPLv2+
+GNUCHESS_LICENSE_FILES = COPYING
 
-GNUCHESS_DEPENDENCIES = $(if $(BR2_PACKAGE_READLINE),readline)
+GNUCHESS_DEPENDENCIES = host-flex flex
+GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline)
 
 $(eval $(autotools-package))
 

From cdae2b24f01281c830ac74bc3818fa1773a59ea8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 24 Mar 2013 21:51:55 +0000
Subject: [PATCH 4642/6849] openswan: add missing TARGET_MAKE_ENV

openswan needs host-bison. The dependency was already there, but the
build was not executed with $(TARGET_MAKE_ENV) in the environment, and
therefore $(HOST_DIR)/usr/bin was not in the PATH.

While we're at it, add licensing informations to openswan.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openswan/openswan.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 781dc00413..153d6590f1 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -6,6 +6,9 @@
 
 OPENSWAN_VERSION = 2.6.38
 OPENSWAN_SITE = http://download.openswan.org/openswan
+OPENSWAN_LICENSE = GPLv2+, BSD-3c
+OPENSWAN_LICENSE_FILES = COPYING LICENSE
+
 OPENSWAN_DEPENDENCIES = host-bison gmp iproute2
 OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
 	USERCOMPILE="$(TARGET_CFLAGS)" INC_USRLOCAL=/usr \
@@ -25,11 +28,13 @@ endif
 endif
 
 define OPENSWAN_BUILD_CMDS
-	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) programs
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(OPENSWAN_MAKE_OPT) programs
 endef
 
 define OPENSWAN_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
 endef
 
 $(eval $(generic-package))

From 6b9bdfbba31c3288dd2e520a0f11a80b35032c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tilman=20Keskin=C3=B6z?= <arved@arved.at>
Date: Mon, 25 Mar 2013 04:48:10 +0000
Subject: [PATCH 4643/6849] manual: fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tilman Keskinöz <arved@arved.at>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/contribute.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 9425effdd3..0106df0a84 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -1,7 +1,7 @@
 // -*- mode:doc; -*-
 // vim: set syntax=asciidoc:
 
-Contibuting to Buildroot
+Contributing to Buildroot
 ========================
 
 If you want to contribute to Buildroot, you will need a git view of

From fe2bcc9ea903365d9c8f86ed5785cbd9f6228899 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 08:17:07 +0000
Subject: [PATCH 4644/6849] conntrack-tools: add missing dependencies on
 host-flex/host-bison

Fixes
http://autobuild.buildroot.org/results/fd739aa0028fac1418ed33bc0ea831b6fc17a853/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/conntrack-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index a961c6f53d..bbf6eaed33 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -9,7 +9,7 @@ CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
 	libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
-	libnetfilter_queue
+	libnetfilter_queue host-bison host-flex
 CONNTRACK_TOOLS_LICENSE = GPLv2
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 

From af9605d822e8712c2bd4d3cb585595c2fe6b41a6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 08:31:41 +0000
Subject: [PATCH 4645/6849] dnsmasq: add missing dependency on host-gettext

When idn support is enabled, the dnsmasq build procedure requires
xgettext, which is provided by host-gettext.

Moreover, dnsmasq.mk was not passing $(TARGET_MAKE_ENV) in the
environment, so $(HOST_DIR)/usr/bin was not in the PATH. For that
reason, the dnsmasq Makefile could not find the xgettext program.

Fixes:
http://autobuild.buildroot.org/results/f7feaa818500a369a6c4c5fd8899c168f21b1460/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index fe75e7b787..285f06e964 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -6,7 +6,7 @@
 
 DNSMASQ_VERSION = 2.65
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
-DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
+DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_LICENSE = Dual GPLv2/GPLv3
@@ -26,7 +26,7 @@ endif
 
 # NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
-	DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
 	DNSMASQ_COPTS += -DHAVE_IDN
 	DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)

From 02c26700f4bb038ff5ec64570f8fc7f8b90250de Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 25 Mar 2013 19:40:59 +0100
Subject: [PATCH 4646/6849] toolchain: default to gcc 4.7.x

With 4.8.x released, it makes sense to update our default gcc version
before 4.6.x becomes unmaintained.

At the same time simplify the kconfig logic a bit.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 87d9cc192f..f8cb82aab8 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -7,9 +7,9 @@ config BR2_GCC_NEEDS_MPC
 
 choice
 	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_4_6_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
+	default BR2_GCC_VERSION_4_7_X
 	help
 	  Select the version of gcc you wish to use.
 

From 280d3093cb6917d052ece893f576ba29cce47ebe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 08:43:44 +0000
Subject: [PATCH 4647/6849] olsr: add missing dependency on
 host-bison/host-flex

Fixes:
http://autobuild.buildroot.org/results/19e8426d749411f7a8625a849b024f3811b06729/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/olsr/olsr.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index 97088f33b3..fff7b34335 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -15,6 +15,7 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \
 OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga)
 OLSR_LICENSE = BSD-3c LGPLv2.1+
 OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE
+OLSR_DEPENDENCIES = host-flex host-bison
 
 define OLSR_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd

From dcbde39f32304044434d546ac3527967c137953e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 09:19:57 +0000
Subject: [PATCH 4648/6849] xapp_xinput: add missing dependencies

Following the big X.org bump, a few dependencies were missing in the
xapp_xinput package.

Fixes:
http://autobuild.buildroot.org/results/7e4ebd4dd47f49bcd4d225b17fbbc8b211e5201a/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xinput/Config.in      | 2 ++
 package/x11r7/xapp_xinput/xapp_xinput.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xinput/Config.in b/package/x11r7/xapp_xinput/Config.in
index 2505dd3495..e438a45bdb 100644
--- a/package/x11r7/xapp_xinput/Config.in
+++ b/package/x11r7/xapp_xinput/Config.in
@@ -2,5 +2,7 @@ config BR2_PACKAGE_XAPP_XINPUT
 	bool "xinput"
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXI
+	select BR2_PACKAGE_XLIB_LIBXRANDR
+	select BR2_PACKAGE_XLIB_LIBXINERAMA
 	help
 	  xinput
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 0eaa50c6e5..fea939eb81 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -7,6 +7,6 @@
 XAPP_XINPUT_VERSION = 1.6.0
 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
+XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi xlib_libXrandr xlib_libXinerama
 
 $(eval $(autotools-package))

From e68c544ef89144f73b7d814e439476dac3c4d1bc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 10:27:12 +0000
Subject: [PATCH 4649/6849] xapp_xev: add missing dependencies on
 xlib_libXrandr

Fixes:
http://autobuild.buildroot.org/results/ec1855d3d96cf01409999492c77a2709be8c4d01/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_xev/Config.in   | 1 +
 package/x11r7/xapp_xev/xapp_xev.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xapp_xev/Config.in b/package/x11r7/xapp_xev/Config.in
index e2e05b35d0..864d6424da 100644
--- a/package/x11r7/xapp_xev/Config.in
+++ b/package/x11r7/xapp_xev/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XAPP_XEV
 	bool "xev"
 	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXRANDR
 	help
 	  print contents of X events
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index bf4cd30324..dd7c7981fd 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -7,6 +7,6 @@
 XAPP_XEV_VERSION = 1.2.0
 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XEV_DEPENDENCIES = xlib_libX11
+XAPP_XEV_DEPENDENCIES = xlib_libX11 xlib_libXrandr
 
 $(eval $(autotools-package))

From bbce7505232614e2ad8638bd20c5057e2fa7764d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 10:44:08 +0000
Subject: [PATCH 4650/6849] mediastreamer: add missing host-gettext
 dependencies and other fixes

Fixes:
http://autobuild.buildroot.org/results/5e6c465c56f85a3017900613facc6e54c85d32da/build-end.log.

While we're at it, add the usual comment header block at the beginning
of the file, as well as licensing informations.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mediastreamer/mediastreamer.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index b32412677e..6a0664e2b3 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -1,9 +1,17 @@
+#############################################################
+#
+# mediastreamer
+#
+#############################################################
+
 MEDIASTREAMER_VERSION = 2.8.2
 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
 MEDIASTREAMER_INSTALL_STAGING = YES
-MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp
+MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext
 # tests fail linking on some architectures, so disable them
 MEDIASTREAMER_CONF_OPT = --disable-tests
+MEDIASTREAMER_LICENSE = GPLv2+
+MEDIASTREAMER_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy)
 MEDIASTREAMER_CONF_OPT += --enable-alsa

From 5b13261dc7be4b82d8e64b08744569090b7da71c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 11:15:34 +0000
Subject: [PATCH 4651/6849] redis: build fix and minor improvement

The redis-001-uclibc.patch was properly adding conditionals to ensure
HAVE_BACKTRACE is not defined when uClibc is used. However, __unix
doesn't seem to be define with the toolchain Peter uses on gcc14, so
the <features.h> doesn't get included, therefore __UCLIBC isn't
defined, and the code believes that backtrace support is available. We
fix this by including <features.h> when __linux__ is defined.

Fixes:
http://autobuild.buildroot.org/results/4ba818f877af145a547a1fede0bb738192c2f181/build-end.log.

Also add another patch that do not redefine the _LARGEFILE_SOURCE and
_FILE_OFFSET_BITS macros if they are already defined on the command
line. It avoids the ugly warnings that we could see from the build
logs, and therefore make it easier to spot real errors.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/redis/redis-001-uclibc.patch          |  2 +-
 ...dis-003-largefile-conditional-define.patch | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 package/redis/redis-003-largefile-conditional-define.patch

diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch
index d7fd9c3c56..8762ca2fb9 100644
--- a/package/redis/redis-001-uclibc.patch
+++ b/package/redis/redis-001-uclibc.patch
@@ -15,7 +15,7 @@ diff -ur old/src/config.h new/src/config.h
  #ifndef __CONFIG_H
  #define __CONFIG_H
  
-+#ifdef __unix
++#if defined(__unix) || defined(__linux__)
 +#include <features.h>
 +#endif
 +
diff --git a/package/redis/redis-003-largefile-conditional-define.patch b/package/redis/redis-003-largefile-conditional-define.patch
new file mode 100644
index 0000000000..747e0552b3
--- /dev/null
+++ b/package/redis/redis-003-largefile-conditional-define.patch
@@ -0,0 +1,32 @@
+Define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS conditionally
+
+In order to avoid ugly warnings at compile time, only define
+_LARGEFILE_SOURCE and _FILE_OFFSET_BITS if they have not already been
+defined through the build command line.
+
+Avoids:
+
+  In file included from redis.h:33:0,
+                   from migrate.c:1:
+  fmacros.h:45:0: warning: "_LARGEFILE_SOURCE" redefined
+  <command-line>:0:0: note: this is the location of the previous definition
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: redis-2.6.11/src/fmacros.h
+===================================================================
+--- redis-2.6.11.orig/src/fmacros.h	2013-03-25 22:09:15.000000000 +0100
++++ redis-2.6.11/src/fmacros.h	2013-03-25 22:09:40.000000000 +0100
+@@ -42,7 +42,12 @@
+ #define _XOPEN_SOURCE
+ #endif
+ 
++#ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE
++#endif
++
++#ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
++#endif
+ 
+ #endif

From 7441228fb62b3c93efc03a173f57d6fec5486068 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 11:42:35 +0000
Subject: [PATCH 4652/6849] vala: add missing host-bison dependency

Fixes:
http://autobuild.buildroot.org/results/a59cceb695298c212c91d2e32b381a096f875274/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/vala.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 6abcdd8816..8cf616fccd 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -10,7 +10,7 @@ VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
 
-VALA_DEPENDENCIES = host-flex libglib2 \
+VALA_DEPENDENCIES = host-flex host-bison libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # If we want the documentation, then xsltproc is needed. If we don't

From d26c729845a9e04e871f88878fa3916c7ab272b0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 11:42:36 +0000
Subject: [PATCH 4653/6849] vala: deprecate target package

Vala generates C code from Vala code, and therefore requires a
compiler. Since we are deprecating the native compiler support on the
target, having vala on the target doesn't make sense.

Of course, we keep vala for the host, where compilation happens.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vala/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/vala/Config.in b/package/vala/Config.in
index e0d665c892..805c7707cf 100644
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_VALA
 	bool "vala"
+	# We no longer support a toolchain on the target
+	depends on BR2_DEPRECATED
 	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

From 1cd3f992fb3659aacbb0cdd3ed64347a37569891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tilman=20Keskin=C3=B6z?= <arved@arved.at>
Date: Mon, 25 Mar 2013 04:48:11 +0000
Subject: [PATCH 4654/6849] Support .dotfiles in / being copied to the TARGET
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

An example is .init_enable_core, to enable coredumps in busybox

Signed-off-by: Tilman Keskinöz <arved@arved.at>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f1c98aa933..62311ede36 100644
--- a/Makefile
+++ b/Makefile
@@ -431,7 +431,7 @@ $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
 		if [ -d "$(TARGET_SKELETON)" ]; then \
-			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
+			rsync -au $(TARGET_SKELETON)/ $(TARGET_DIR)/; \
 		fi; \
 	fi
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)

From 13c07c79a401a8821b3224bc00c60c097f011add Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Mar 2013 08:33:18 +0100
Subject: [PATCH 4655/6849] Makefile: simplify target skeleton copying

We already use the .root stamp file to remember if we have copied the
skeleton, so we can remove the /bin check.

Likewise, we should always have a TARGET_SKELETON (or explicitly error
out otherwise), so remove that check as well.

Finally, now that we're using rsync to do the copy, we might as well
use its exclude support instead of cleaning up unwanted files afterwards.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 62311ede36..c95bb1e921 100644
--- a/Makefile
+++ b/Makefile
@@ -429,14 +429,9 @@ endif
 
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
-	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
-		if [ -d "$(TARGET_SKELETON)" ]; then \
-			rsync -au $(TARGET_SKELETON)/ $(TARGET_DIR)/; \
-		fi; \
-	fi
+	rsync -au --exclude=.empty --exclude=CVS --exclude=.svn --exclude='*~' \
+		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
-	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
-	-find $(TARGET_DIR) -type f \( -name .empty -o -name '*~' \) -print0 | xargs -0 rm -rf
 	touch $@
 
 $(TARGET_DIR): $(BUILD_DIR)/.root

From 895c6ce9b178091a1992f9cd17ee426006ab3303 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 21:38:29 +0000
Subject: [PATCH 4656/6849] bash: add missing dependency on host-bison

Fixes:
http://autobuild.buildroot.org/results/dfedb4377a95e36e590c9a5a5853e3ed0ecbc247/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bash/bash.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index d28c6159e1..fff06043ef 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -6,7 +6,7 @@
 
 BASH_VERSION = 4.2
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
-BASH_DEPENDENCIES = ncurses
+BASH_DEPENDENCIES = ncurses host-bison
 BASH_LICENSE = GPLv3+
 BASH_LICENSE_FILES = COPYING
 

From a3facdcf31c9b6a46aa470be65894fac5a55b165 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 21:49:51 +0000
Subject: [PATCH 4657/6849] gpsd: nmea2000 requires aivdm support

Fixes:
http://autobuild.buildroot.org/results/853cac5becf9d071c6ec1181e1e951bc8e7d80d5/build-end.log
and tons of identical build failures.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index b26cf0744b..337f8e7319 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -169,6 +169,7 @@ config BR2_PACKAGE_GPSD_NMEA
 config BR2_PACKAGE_GPSD_NMEA2000
 	bool "NMEA2000"
 	select BR2_PACKAGE_GPSD_NAVCOM
+	select BR2_PACKAGE_GPSD_AIVDM
 	help
 	  NMEA2000/CAN support
 

From 040a82bbb48a472660497b5092e2b9f4568eb6bc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 25 Mar 2013 22:12:26 +0000
Subject: [PATCH 4658/6849] avahi: add missing dependency on host-gettext

Fixes:
http://autobuild.buildroot.org/results/1dd5993d2ead9a92e2eb73227b19697728950b86/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 5f07a2f20f..e8ca5606e6 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -85,7 +85,8 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--with-autoipd-user=default \
 		--with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkgconf
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
+       host-pkgconf host-gettext
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon

From 1eb716f74998acdfbe6d0826c8b10baf7523c1af Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Mon, 25 Mar 2013 13:27:56 +0000
Subject: [PATCH 4659/6849] configs: add RaspberryPi defconfig

This is a default configuration for the RaspberryPi, tested and functional.

The kernel used is the one developped by the RaspberryPi foundation as
it's not fully supported currently in mainline kernel.  The configuration
used for the kernel is the default bcmrpi.

For more info, please find board/raspberrypi/readme.txt

[Peter: minor README tweaks, rename to readme.txt]
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
[yann.morin.1998@free.fr: use correct kernel headers, update kernel cset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/raspberrypi/readme.txt | 127 +++++++++++++++++++++++++++++++++++
 configs/rpi_defconfig        |  23 +++++++
 2 files changed, 150 insertions(+)
 create mode 100644 board/raspberrypi/readme.txt
 create mode 100644 configs/rpi_defconfig

diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt
new file mode 100644
index 0000000000..32877951da
--- /dev/null
+++ b/board/raspberrypi/readme.txt
@@ -0,0 +1,127 @@
+RaspberryPi
+
+Intro
+=====
+
+To be able to use your RaspberryPi board with the images generated by
+Buildroot, you have a prior choice to make, will you use:
+    - Volatile rootfs in RAM (The rootfs is an initramfs) or
+    - Persistent rootfs on the SDCard
+
+Also, a good source of information is http://elinux.org/R-Pi_Hub
+
+Volatile rootfs
+===============
+
+How to build it
+---------------
+
+You need to use the rpi_defconfig, to do so:
+ * make rpi_defconfig
+
+Then, you need to select the kind of images you want:
+ * make menuconfig
+ * Select "Filesystem images"
+ * Select "initial RAM filesystem linked into linux kernel"
+
+What is generated
+-----------------
+
+After building, you should obtain this tree:
+
+    output/images/
+    +-- rootfs.tar
+    +-- rpi-firmware
+    |   +-- bootcode.bin
+    |   +-- config.txt
+    |   +-- fixup_cd.dat
+    |   +-- fixup.dat
+    |   +-- start_cd.elf
+    |   `-- start.elf
+    `-- zImage
+
+Note : rootfs.tar will only be there if you kept "tar the root filesystem"
+option selected in "Filesystem images".
+
+Where should the binaries be copied on the SDCard
+-------------------------------------------------
+
+Your SDCard must have its first partition using fat32 and marked bootable.
+
+At the root of the partition, the RaspberryPi must find the following files:
+
+ * bootcode.bin
+ * config.txt
+ * fixup_cd.dat
+ * fixup.dat
+ * start_cd.elf
+ * start.elf
+ * zImage
+
+So you should copy the entire content of output/images/rpi-firmware along with
+zImage.
+
+Note: You can create any number of partitions you desire, the only requirement
+is that the first partition must be using fat32 and bootable.
+
+Persistent rootfs
+=================
+
+How to build it
+---------------
+
+You only need to use the rpi_defconfig, to do so:
+ * make rpi_defconfig
+
+What is generated
+-----------------
+
+After building, you should obtain this tree:
+
+    output/images/
+    +-- rootfs.tar
+    +-- rpi-firmware
+    |   +-- bootcode.bin
+    |   +-- config.txt
+    |   +-- fixup_cd.dat
+    |   +-- fixup.dat
+    |   +-- start_cd.elf
+    |   `-- start.elf
+    `-- zImage
+
+Where should the binaries be copied on the SDCard
+-------------------------------------------------
+
+Your SDCard must have its first partition using fat32 and marked bootable.
+It should also have another partition which will contain your rootfs, it should
+be partitioned as ext4.
+
+Boot partition
+~~~~~~~~~~~~~~
+
+The first partition will contain everything used to boot the RaspberryPi.
+You must copy theses files at the root of partition:
+
+ * bootcode.bin
+ * config.txt
+ * fixup_cd.dat
+ * fixup.dat
+ * start_cd.elf
+ * start.elf
+ * zImage
+
+So you should copy the entire content of output/images/rpi-firmware along with
+zImage.
+
+Rootfs partition
+~~~~~~~~~~~~~~~~
+
+The second partition will contain your rootfs.
+Simply extract (as root!) the contents of the rootfs.tar archive
+into this partition.
+
+For example: (Assuming mountpoint is a directory and exist)
+
+ $ sudo mount /dev/sdXY /mnt/mountpoint
+ $ sudo tar xf rootfs.tar -C /mnt/mountpoint
+
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
new file mode 100644
index 0000000000..96f63ba128
--- /dev/null
+++ b/configs/rpi_defconfig
@@ -0,0 +1,23 @@
+BR2_arm=y
+BR2_arm1176jzf_s=y
+
+BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_TARGET_GENERIC_GETTY_PORT="tty1"
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_USERLAND=y
+BR2_PACKAGE_LIBCOFI=y
+
+# Lock to 3.6 headers as the RPi kernel is based off the 3.6 branch
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.6.11"
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="e959a8e"
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
+BR2_LINUX_KERNEL_ZIMAGE=y

From c3e8188815f608f783a8d6a5e95cc76ef17ac95b Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Mon, 25 Mar 2013 13:27:57 +0000
Subject: [PATCH 4660/6849] package: add enscript

GNU Enscript is a free replacement for Adobe's enscript program.
GNU Enscript converts ASCII files to PostScript, HTML, or RTF and
stores generated output to a file or sends it directly to the
printer. It includes features for `pretty-printing' (language-
sensitive code highlighting) in several programming languages.

[Peter: fix Config.in indentation]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
[yann.morin.1998@free.fr: space-damage, unneeded variables, licensing terms]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/enscript/Config.in   | 11 +++++++++++
 package/enscript/enscript.mk | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/enscript/Config.in
 create mode 100644 package/enscript/enscript.mk

diff --git a/package/Config.in b/package/Config.in
index be1aa99673..82e6c5c84a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -290,6 +290,7 @@ endmenu
 
 menu "Interpreter languages and scripting"
 source "package/erlang/Config.in"
+source "package/enscript/Config.in"
 source "package/haserl/Config.in"
 source "package/jamvm/Config.in"
 source "package/lua/Config.in"
diff --git a/package/enscript/Config.in b/package/enscript/Config.in
new file mode 100644
index 0000000000..26c45e1e2f
--- /dev/null
+++ b/package/enscript/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_ENSCRIPT
+	bool "enscript"
+	help
+	  GNU Enscript is a free replacement for Adobe's enscript program.
+
+	  GNU Enscript converts ASCII files to PostScript, HTML, or RTF and
+	  stores generated output to a file or sends it directly to the
+	  printer. It includes features for `pretty-printing' (language-
+	  sensitive code highlighting) in several programming languages.
+
+	  http://www.gnu.org/software/enscript
diff --git a/package/enscript/enscript.mk b/package/enscript/enscript.mk
new file mode 100644
index 0000000000..93e4d6da65
--- /dev/null
+++ b/package/enscript/enscript.mk
@@ -0,0 +1,19 @@
+#############################################################
+#
+# enscript
+#
+#############################################################
+
+ENSCRIPT_VERSION = 1.6.6
+ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript/
+ENSCRIPT_LICENSE = GPLv3+
+ENSCRIPT_LICENSE_FILES = COPYING
+
+# Enable pthread threads if toolchain supports threads
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+	ENSCRIPT_CONF_OPT += --enable-threads=pth
+else
+	ENSCRIPT_CONF_OPT += --disable-threads
+endif
+
+$(eval $(autotools-package))

From 2320f6a309c405124aa3958948c3577378d07968 Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Mon, 25 Mar 2013 13:27:58 +0000
Subject: [PATCH 4661/6849] package: add foomatic-filters

Foomatic is a database-driven system for integrating free software
printer drivers with common spoolers under Unix. It supports CUPS,
LPRng, LPD, GNUlpr, Solaris LP, PPR, PDQ, CPS, and direct printing
with every free software printer driver known to us and every
printer known to work with these drivers.

[Peter: minor whitespace fixes]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
[yann.morin.1998@free.fr: space-damage, licensing terms, unneeded vars]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/foomatic-filters/Config.in           | 18 ++++++++++++++++
 package/foomatic-filters/foomatic-filters.mk | 22 ++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/foomatic-filters/Config.in
 create mode 100644 package/foomatic-filters/foomatic-filters.mk

diff --git a/package/Config.in b/package/Config.in
index 82e6c5c84a..74537e4d39 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -645,6 +645,7 @@ source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
 source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
+source "package/foomatic-filters/Config.in"
 source "package/hplip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
diff --git a/package/foomatic-filters/Config.in b/package/foomatic-filters/Config.in
new file mode 100644
index 0000000000..aa056b9274
--- /dev/null
+++ b/package/foomatic-filters/Config.in
@@ -0,0 +1,18 @@
+comment "foomatic-filters requires a toolchain with support for THREADS"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_FOOMATIC_FILTERS
+	bool "foomatic_filters"
+	depends on BR2_PACKAGE_CUPS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_ENSCRIPT
+	help
+	  Foomatic Filters
+	  Foomatic is a database-driven system for integrating free software
+	  printer drivers with common spoolers under Unix. It supports CUPS,
+	  LPRng, LPD, GNUlpr, Solaris LP, PPR, PDQ, CPS, and direct printing
+	  with every free software printer driver known to us and every
+	  printer known to work with these drivers.
+
+	  http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
diff --git a/package/foomatic-filters/foomatic-filters.mk b/package/foomatic-filters/foomatic-filters.mk
new file mode 100644
index 0000000000..ad7ab7a68d
--- /dev/null
+++ b/package/foomatic-filters/foomatic-filters.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# foomatic_filters
+#
+#############################################################
+
+FOOMATIC_FILTERS_VERSION = 4.0.17
+FOOMATIC_FILTERS_SITE = http://www.openprinting.org/download/foomatic
+FOOMATIC_FILTERS_LICENSE = GPLv2+
+FOOMATIC_FILTERS_LICENSE_FILES = COPYING
+FOOMATIC_FILTERS_DEPENDENCIES = cups libusb enscript
+
+FOOMATIC_FILTERS_CONF_OPT = --with-file-converter=enscript
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+FOOMATIC_FILTERS_CONF_OPT += --enable-dbus
+FOOMATIC_FILTERS_DEPENDENCIES += dbus
+else
+FOOMATIC_FILTERS_CONF_OPT += --disable-dbus
+endif
+
+$(eval $(autotools-package))

From e5407614efabd9a6a3d8277e9567fe412f459fbf Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Mon, 25 Mar 2013 13:27:59 +0000
Subject: [PATCH 4662/6849] package: add gutenprint

Gutenprint, formerly named Gimp-Print, is a suite of printer
drivers that may be used with most common UNIX print spooling
systems, including CUPS, lpr, LPRng, or others

[Peter: needs host-pkgconf]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
[yann.morin.1998@free.fr: needs libiconv, cleanup]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/gutenprint/Config.in                  | 14 ++++
 ...nprint-000-use-pregen-xmli18n-header.patch | 48 ++++++++++++
 package/gutenprint/gutenprint.mk              | 74 +++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 package/gutenprint/Config.in
 create mode 100644 package/gutenprint/gutenprint-000-use-pregen-xmli18n-header.patch
 create mode 100644 package/gutenprint/gutenprint.mk

diff --git a/package/Config.in b/package/Config.in
index 74537e4d39..5d8f4f6b73 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -646,6 +646,7 @@ source "package/ctorrent/Config.in"
 source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
 source "package/foomatic-filters/Config.in"
+source "package/gutenprint/Config.in"
 source "package/hplip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
new file mode 100644
index 0000000000..eb06efd4c1
--- /dev/null
+++ b/package/gutenprint/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_GUTENPRINT
+	bool "gutenprint"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_CUPS
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  Gutenprint, formerly named Gimp-Print, is a suite of printer
+	  drivers that may be used with most common UNIX print spooling
+	  systems, including CUPS, lpr, LPRng, or others
+
+	  http://gimp-print.sourceforge.net/
+
+comment "gutenprint requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gutenprint/gutenprint-000-use-pregen-xmli18n-header.patch b/package/gutenprint/gutenprint-000-use-pregen-xmli18n-header.patch
new file mode 100644
index 0000000000..533fe33d82
--- /dev/null
+++ b/package/gutenprint/gutenprint-000-use-pregen-xmli18n-header.patch
@@ -0,0 +1,48 @@
+src/xml: use preg-gen xmli18n_tmp.h if specified
+
+Ideally, the programs needed at build-time should be built with
+CC_FOR_BUILD, and not with CC_FOR_HOST.
+
+Unfortunately, this program wants to link against the gutenprint libs,
+so we would also need to build them with CC_FOR_HOST, that is build them
+twice, once for build, once for host.
+
+Instead, in the Buildroot context, we first build gutenprint for the build
+system, use that to generate the incriminated header, and then re-use that
+header to build the gutenprint for the host.
+
+It is not possible to have such constructs in Makefile.am:
+    ifeq ($(FOO),)
+    bar: bla
+        cat $< >$@
+    else
+    bar:
+        echo $(FOO) >$@
+    endif
+
+as autoreconf will yell loudly that there is an 'endif' without an 'if'.
+Sigh... :-(
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN gutenprint-5.2.9.orig/src/xml/Makefile.am gutenprint-5.2.9/src/xml/Makefile.am
+--- gutenprint-5.2.9.orig/src/xml/Makefile.am	2011-03-30 02:43:24.000000000 +0200
++++ gutenprint-5.2.9/src/xml/Makefile.am	2013-03-24 17:08:08.435918773 +0100
+@@ -52,10 +52,13 @@
+ 
+ 
+ xmli18n-tmp.h: xml-stamp extract-strings
+-	-rm -f $@ $@.tmp
+-	./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp
+-	mv $@.tmp $@
+-
++	if [ -z "$(BR2_USE_PREGEN_XMLI18N_TMP_H)" ]; then \
++	    rm -f $@ $@.tmp; \
++	    ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp; \
++	    mv $@.tmp $@; \
++	else \
++	    cp $(BR2_USE_PREGEN_XMLI18N_TMP_H) $@; \
++	fi
+ 
+ dist-hook: xmli18n-tmp.h xml-stamp
+ # xmli18n-tmp.h is needed by po/POTFILES.in at dist time
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
new file mode 100644
index 0000000000..0463771381
--- /dev/null
+++ b/package/gutenprint/gutenprint.mk
@@ -0,0 +1,74 @@
+#############################################################
+#
+# gutenprint
+#
+#############################################################
+
+GUTENPRINT_VERSION = 5.2.9
+GUTENPRINT_SITE = http://downloads.sourceforge.net/gimp-print/gutenprint-5.2/$(GUTENPRINT_VERSION)
+GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
+GUTENPRINT_LICENSE = GPLv2+
+GUTENPRINT_LICENSE_FILES = COPYING
+
+# Needed, as we touch Makefile.am
+GUTENPRINT_AUTORECONF = YES
+
+GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+# host-gutenprint is needed to generate XML as part of compilation
+# the program that generates the xml also links against libgutenprint
+# so we need to build both a host package and a target package
+GUTENPRINT_DEPENDENCIES += host-gutenprint
+
+GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
+                      --disable-samples \
+                      --without-gimp2 \
+                      --without-foomatic \
+                      --without-foomatic3 \
+                      --disable-escputil \
+                      --disable-test \
+                      --disable-testpattern \
+                      --with-cups="/usr" \
+                      --with-sysroot="$(STAGING_DIR)" \
+                      --disable-cups-ppds
+
+# USE_PREGEN_XMLI18N_TMP_H is added by our patch
+GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h
+
+# We have no host dependencies
+HOST_GUTENPRINT_DEPENDENCIES =
+# The host-gutenprint shall create the required header
+HOST_GUTENPRINT_MAKE_ENV =
+
+HOST_GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
+                           --disable-samples \
+                           --without-gimp2 \
+                           --without-doc \
+                           --disable-nls \
+                           --disable-nls-macos \
+                           --without-foomatic \
+                           --without-foomatic3 \
+                           --disable-escputil \
+                           --disable-test \
+                           --disable-testpattern
+
+# Needed by autoreconf
+define GUTENPRINT_CREATE_M4_DIR
+	mkdir -p $(@D)/m4local
+endef
+GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
+
+define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
+	cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include
+endef
+HOST_GUTENPRINT_POST_BUILD_HOOKS += HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
+
+define GUTENPRINT_POST_INSTALL_TARGET_FIXUP
+	mkdir -p $(TARGET_DIR)/usr/share/gutenprint/5.2
+	cp -rf $(HOST_DIR)/usr/share/gutenprint/5.2/xml $(TARGET_DIR)/usr/share/gutenprint/5.2
+endef
+GUTENPRINT_POST_INSTALL_TARGET_HOOKS += GUTENPRINT_POST_INSTALL_TARGET_FIXUP
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From cc0fd417d4521100779a500a9c7d770f3f371c24 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Mon, 25 Mar 2013 13:28:00 +0000
Subject: [PATCH 4663/6849] apply-patches.sh: applying xz-ed patches

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
[yann.morin.1998@free.fr: space-damage]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 7a6c1fa986..7d5856c65d 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -23,8 +23,8 @@
 # files than series file and archives are considered as a patch.
 #
 # Once a patch is found, the script will try to apply it. If its name doesn't
-# end with '.gz', '.bz', '.bz2', '.zip', '.Z', '.diff*' or '.patch*', it will
-# be skipped. If necessary, the patch will be uncompressed before being
+# end with '.gz', '.bz', '.bz2', '.xz', '.zip', '.Z', '.diff*' or '.patch*',
+# it will be skipped. If necessary, the patch will be uncompressed before being
 # applied. The list of the patches applied is stored in '.applied_patches_list'
 # file in the build directory.
 
@@ -59,6 +59,8 @@ function apply_patch {
 	type="bzip"; uncomp="bunzip -dc"; ;; 
 	*.bz2)
 	type="bzip2"; uncomp="bunzip2 -dc"; ;; 
+	*.xz)
+	type="xz"; uncomp="unxz -dc"; ;;
 	*.zip)
 	type="zip"; uncomp="unzip -d"; ;; 
 	*.Z)

From 653bfd0b913f5bea69737c6ae10d765e10595b62 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 27 Mar 2013 00:38:03 +0100
Subject: [PATCH 4664/6849] webkit: select jpeg

Fixes http://autobuild.buildroot.net/results/fc6ca5d72aefcb2d2276c34663579d0633dc900c/

Webkit has jpeg as a dependency, so ensure it also gets selected in
Config.in

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 34071e4859..c6711b8d48 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_WEBKIT
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_ENCHANT
 	select BR2_PACKAGE_LIBSOUP
+	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_LIBGAIL
 	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7

From 34c6fc10342ffc1da2e4151b539832e17ce6c47c Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 25 Mar 2013 13:28:01 +0000
Subject: [PATCH 4665/6849] czmq: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
[yann.morin.1998@free.fr: create dir as post-patch, not pre-configure]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/czmq/Config.in | 14 ++++++++++++++
 package/czmq/czmq.mk   | 23 +++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/czmq/Config.in
 create mode 100644 package/czmq/czmq.mk

diff --git a/package/Config.in b/package/Config.in
index 5d8f4f6b73..d3901b40d2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -496,6 +496,7 @@ source "package/mediastreamer/Config.in"
 endmenu
 
 menu "Networking"
+source "package/czmq/Config.in"
 source "package/glib-networking/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
new file mode 100644
index 0000000000..9fd8e86d2c
--- /dev/null
+++ b/package/czmq/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_CZMQ
+	bool "czmq"
+	select BR2_PACKAGE_ZEROMQ
+	depends on BR2_INSTALL_LIBSTDCPP # zeromq
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	help
+	  High-level C Binding for 0MQ
+
+	  http://czmq.zeromq.org/
+
+comment "czmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
new file mode 100644
index 0000000000..2b34654faa
--- /dev/null
+++ b/package/czmq/czmq.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# czmq
+#
+#############################################################
+
+CZMQ_VERSION = cb9839cf90
+CZMQ_SITE = git://github.com/zeromq/czmq.git
+
+# Autoreconf required as we use the git tree
+CZMQ_AUTORECONF = YES
+CZMQ_INSTALL_STAGING = YES
+CZMQ_DEPENDENCIES = zeromq
+CZMQ_LICENSE = LGPLv3+ with exceptions
+CZMQ_LICENSE_FILES = COPYING COPYING.LESSER
+
+define CZMQ_CREATE_CONFIG_DIR
+	mkdir -p $(@D)/config
+endef
+
+CZMQ_POST_PATCH_HOOKS += CZMQ_CREATE_CONFIG_DIR
+
+$(eval $(autotools-package))

From 5514b7a520dea993e05d6fcddc40e4d55f467b7c Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 25 Mar 2013 13:28:02 +0000
Subject: [PATCH 4666/6849] cppzmq: new package

Now that zeromq has been bumped to version 3.2.2, we need to provide the
C++ binding using a separate package. The cppzmq package provides a simple
single-header C++ binding.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
[yann.morin.1998@free.fr: add comment about no license file]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/cppzmq/Config.in | 15 +++++++++++++++
 package/cppzmq/cppzmq.mk | 23 +++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/cppzmq/Config.in
 create mode 100644 package/cppzmq/cppzmq.mk

diff --git a/package/Config.in b/package/Config.in
index d3901b40d2..23c9bb3496 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -497,6 +497,7 @@ endmenu
 
 menu "Networking"
 source "package/czmq/Config.in"
+source "package/cppzmq/Config.in"
 source "package/glib-networking/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in
new file mode 100644
index 0000000000..ea632d143e
--- /dev/null
+++ b/package/cppzmq/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_CPPZMQ
+	bool "cppzmq"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_ZEROMQ
+	help
+	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).
+
+	  http://github.com/zeromq/cppzmq
+
+comment "cppzmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR)
diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk
new file mode 100644
index 0000000000..d4609bf234
--- /dev/null
+++ b/package/cppzmq/cppzmq.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# cppzmq
+#
+#############################################################
+
+CPPZMQ_VERSION = b232978
+CPPZMQ_SITE = git://github.com/zeromq/cppzmq.git
+CPPZMQ_INSTALL_STAGING = YES
+CPPZMQ_DEPENDENCIES = zeromq
+CPPZMQ_LICENSE = MIT
+# No license file, the license is in the installed header
+CPPZMQ_LICENSE_FILES = zmq.hpp
+
+define CPPZMQ_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/zmq.hpp $(STAGING_DIR)/usr/include/zmq.hpp
+endef
+
+define CPPZMQ_UNINSTALL_STAGING_CMDS
+	$(RM) $(STAGING_DIR)/usr/include/zmq.hpp
+endef
+
+$(eval $(generic-package))

From a427c0e62182979f982961c5fed4909a0ccf28be Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 25 Mar 2013 13:28:03 +0000
Subject: [PATCH 4667/6849] zmqpp: new package

Now that zeromq has been bumped to version 3.2.2, we need to provide the
C++ binding using a separate package.  The zmqpp package provides a
high-level C++ wrapper library around the zeromq C API.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                           |  1 +
 package/zmqpp/Config.in                     | 32 ++++++++++++
 package/zmqpp/zmqpp-fix-typos-in-code.patch | 46 ++++++++++++++++++
 package/zmqpp/zmqpp.mk                      | 54 +++++++++++++++++++++
 4 files changed, 133 insertions(+)
 create mode 100644 package/zmqpp/Config.in
 create mode 100644 package/zmqpp/zmqpp-fix-typos-in-code.patch
 create mode 100644 package/zmqpp/zmqpp.mk

diff --git a/package/Config.in b/package/Config.in
index 23c9bb3496..77dc0d3a19 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -538,6 +538,7 @@ source "package/ortp/Config.in"
 source "package/slirp/Config.in"
 source "package/usbredir/Config.in"
 source "package/zeromq/Config.in"
+source "package/zmqpp/Config.in"
 endmenu
 
 menu "Other"
diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
new file mode 100644
index 0000000000..7a124621ec
--- /dev/null
+++ b/package/zmqpp/Config.in
@@ -0,0 +1,32 @@
+config BR2_PACKAGE_ZMQPP
+	bool "zmqpp"
+	depends on !BR2_avr32 # compiler needs c++0x support
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_ZEROMQ
+	help
+	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).
+
+	  This C++ binding is a 'high-level' library that hides most of the
+	  C-style interface core zeromq provides.
+
+	  http://github.com/benjamg/zmqpp
+
+comment "zmqpp requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR)
+
+config BR2_PACKAGE_ZMQPP_CLIENT
+	bool "zmqpp client"
+	depends on BR2_PACKAGE_ZMQPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	help
+	  Build and install the zmqpp client, a command line tool that can be
+	  used to listen or send to zeromq sockets.
+
+comment "zmqpp client requires a toolchain with thread support"
+	depends on BR2_PACKAGE_ZMQPP && !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/zmqpp/zmqpp-fix-typos-in-code.patch b/package/zmqpp/zmqpp-fix-typos-in-code.patch
new file mode 100644
index 0000000000..a873de9d53
--- /dev/null
+++ b/package/zmqpp/zmqpp-fix-typos-in-code.patch
@@ -0,0 +1,46 @@
+Fix a couple of typos in the zmqpp source code.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/src/zmqpp/socket.cpp b/src/zmqpp/socket.cpp
+--- a/src/zmqpp/socket.cpp	2012-12-11 11:06:23.000000000 +0000
++++ b/src/zmqpp/socket.cpp	2013-03-18 17:32:01.464761776 +0000
+@@ -587,7 +587,7 @@ void socket::get(socket_option const& op
+ 	}
+ }
+ 
+-socket::socket(socket&& source) noexcept
++socket::socket(socket& source) noexcept
+ 	: _socket(source._socket)
+ 	, _type(source._type)
+ 	, _recv_buffer()
+@@ -601,7 +601,7 @@ socket::socket(socket&& source) noexcept
+ 	source._socket = nullptr;
+ }
+ 
+-socket& socket::operator=(socket&& source) noexcept
++socket& socket::operator=(socket& source) noexcept
+ {
+ 	_socket = source._socket;
+ 	source._socket = nullptr;
+diff -Nurp a/src/zmqpp/socket.hpp b/src/zmqpp/socket.hpp
+--- a/src/zmqpp/socket.hpp	2012-12-11 11:06:23.000000000 +0000
++++ b/src/zmqpp/socket.hpp	2013-03-18 17:31:53.556790457 +0000
+@@ -400,7 +400,7 @@ public:
+ 	 *
+ 	 * \param source target socket to steal internals from
+ 	 */
+-	socket(socket&& source) noexcept;
++	socket(socket& source) noexcept;
+ 
+ 	/*!
+ 	 * Move operator
+@@ -413,7 +413,7 @@ public:
+ 	 * \param source target socket to steal internals from
+ 	 * \return socket reference to this
+ 	 */
+-	socket& operator=(socket&& source) noexcept;
++	socket& operator=(socket& source) noexcept;
+ 
+ 	/*!
+ 	 * Check the socket is still valid
diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
new file mode 100644
index 0000000000..c64b256127
--- /dev/null
+++ b/package/zmqpp/zmqpp.mk
@@ -0,0 +1,54 @@
+#############################################################
+#
+# zmqpp
+#
+#############################################################
+
+ZMQPP_VERSION = 31220ca
+ZMQPP_SITE = git://github.com/benjamg/zmqpp.git
+ZMQPP_INSTALL_STAGING = YES
+ZMQPP_DEPENDENCIES = zeromq
+ZMQPP_LICENSE = MIT
+ZMQPP_LICENSE_FILES = LICENSE
+
+ZMQPP_MAKE_OPT = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
+
+ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y)
+ZMQPP_DEPENDENCIES += boost
+endif
+
+define ZMQPP_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(ZMQPP_MAKE_OPT) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
+endef
+
+define ZMQPP_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/include/zmqpp
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(ZMQPP_MAKE_OPT) DESTDIR=$(TARGET_DIR) install -C $(@D)
+endef
+
+define ZMQPP_UNINSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(ZMQPP_MAKE_OPT) DESTDIR=$(TARGET_DIR) uninstall -C $(@D)
+	$(RM) $(TARGET_DIR)/usr/include/zmqpp
+endef
+
+define ZMQPP_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/zmqpp
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(ZMQPP_MAKE_OPT) DESTDIR=$(STAGING_DIR) install -C $(@D)
+endef
+
+define ZMQPP_UNINSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(ZMQPP_MAKE_OPT) DESTDIR=$(STAGING_DIR) uninstall -C $(@D)
+	$(RM) $(STAGING_DIR)/usr/include/zmqpp
+endef
+
+define ZMQPP_CLEAN_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(ZMQPP_MAKE_OPT) \
+		clean -C $(@D)
+endef
+
+$(eval $(generic-package))

From 1ce3dfb84f35904e0ffbe27b497ee5952189205b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:04 +0000
Subject: [PATCH 4668/6849] manual: add manual generation date/git revision in
 the manual text

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/manual.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index ffb6fb93ef..968566792e 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -8,6 +8,9 @@ The Buildroot user manual
 Buildroot usage and documentation by Thomas Petazzoni. Contributions
 from Karsten Kruse, Ned Ludd, Martin Herren and others.
 
+Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {docdate}
+{doctime} from git revision {sys:git rev-parse --short HEAD}
+
 image::logo.png[]
 
 :leveloffset: 1

From bc3e18486441034c02d03ed66760375af5f313ee Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Mar 2013 08:25:58 +0000
Subject: [PATCH 4669/6849] binutils: add 2.23.2 and remove deprecated 2.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host               |  10 +-
 .../binutils-2.20/110-arm-eabi-conf.patch     |  24 ---
 .../binutils/binutils-2.20/120-sh-conf.patch  |  42 ----
 .../300-012_check_ldrunpath_length.patch      |  21 --
 .../binutils-2.20/400-arm_link_speed.patch    | 183 ------------------
 .../binutils-2.23.2/120-sh-conf.patch         |  29 +++
 .../300-001_ld_makefile_patch.patch           |   0
 .../300-012_check_ldrunpath_length.patch      |  21 ++
 .../500-sysroot.patch                         |  21 +-
 9 files changed, 66 insertions(+), 285 deletions(-)
 delete mode 100644 package/binutils/binutils-2.20/110-arm-eabi-conf.patch
 delete mode 100644 package/binutils/binutils-2.20/120-sh-conf.patch
 delete mode 100644 package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch
 delete mode 100644 package/binutils/binutils-2.20/400-arm_link_speed.patch
 create mode 100644 package/binutils/binutils-2.23.2/120-sh-conf.patch
 rename package/binutils/{binutils-2.20 => binutils-2.23.2}/300-001_ld_makefile_patch.patch (100%)
 create mode 100644 package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch
 rename package/binutils/{binutils-2.20 => binutils-2.23.2}/500-sysroot.patch (62%)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 81a4cf7d0f..a61a503533 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -12,10 +12,6 @@ choice
 	       depends on BR2_avr32
 	       bool "binutils 2.18-avr32-1.0.1"
 
-	config BR2_BINUTILS_VERSION_2_20
-		depends on !BR2_avr32 && BR2_DEPRECATED
-		bool "binutils 2.20"
-
 	config BR2_BINUTILS_VERSION_2_20_1
 		depends on !BR2_avr32
 		bool "binutils 2.20.1"
@@ -36,17 +32,21 @@ choice
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.23.1"
 
+	config BR2_BINUTILS_VERSION_2_23_2
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		bool "binutils 2.23.2"
+
 endchoice
 
 config BR2_BINUTILS_VERSION
 	string
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "2.20"		if BR2_BINUTILS_VERSION_2_20
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
 	default "2.22"		if BR2_BINUTILS_VERSION_2_22
 	default "2.23.1"	if BR2_BINUTILS_VERSION_2_23_1
+	default "2.23.2"	if BR2_BINUTILS_VERSION_2_23_2
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
diff --git a/package/binutils/binutils-2.20/110-arm-eabi-conf.patch b/package/binutils/binutils-2.20/110-arm-eabi-conf.patch
deleted file mode 100644
index af26329d90..0000000000
--- a/package/binutils/binutils-2.20/110-arm-eabi-conf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
diff --git a/package/binutils/binutils-2.20/120-sh-conf.patch b/package/binutils/binutils-2.20/120-sh-conf.patch
deleted file mode 100644
index 071d15a41b..0000000000
--- a/package/binutils/binutils-2.20/120-sh-conf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -rdup binutils-2.18.50.0.9.old/configure binutils-2.18.50.0.9/configure
---- binutils-2.18.50.0.9.old/configure	2008-08-23 17:36:13.000000000 +0200
-+++ binutils-2.18.50.0.9/configure	2008-10-14 14:25:22.000000000 +0200
-@@ -2281,7 +2281,7 @@ case "${target}" in
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -2606,7 +2606,7 @@ case "${target}" in
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[3456789]86-*-vsta) ;; # don't add gprof back in
-       i[3456789]86-*-go32*) ;; # don't add gprof back in
-diff -rdup binutils-2.18.50.0.9.old/configure.ac binutils-2.18.50.0.9/configure.ac
---- binutils-2.18.50.0.9.old/configure.ac	2008-08-23 17:36:13.000000000 +0200
-+++ binutils-2.18.50.0.9/configure.ac	2008-10-14 14:25:11.000000000 +0200
-@@ -530,7 +530,7 @@ case "${target}" in
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;    
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -855,7 +855,7 @@ case "${target}" in
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[[3456789]]86-*-vsta) ;; # don't add gprof back in
-       i[[3456789]]86-*-go32*) ;; # don't add gprof back in
diff --git a/package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 6e809213d8..0000000000
--- a/package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/package/binutils/binutils-2.20/400-arm_link_speed.patch b/package/binutils/binutils-2.20/400-arm_link_speed.patch
deleted file mode 100644
index d03385a13b..0000000000
--- a/package/binutils/binutils-2.20/400-arm_link_speed.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From Binutils CVS:
-
-http://sourceware.org/cgi-bin/cvsweb.cgi/src/bfd/elf32-arm.c?rev=1.230&content-type=text/x-cvsweb-markup&cvsroot=src
-
-Improves linking time from large projects on ARM.
-diff -dupr binutils-2.20.orig/bfd/elf32-arm.c binutils-2.20/bfd/elf32-arm.c
---- binutils-2.20.orig/bfd/elf32-arm.c	2010-04-19 10:08:50.000000000 -0700
-+++ binutils-2.20/bfd/elf32-arm.c	2010-04-19 10:12:45.000000000 -0700
-@@ -12736,108 +12736,15 @@ elf32_arm_section_from_shdr (bfd *abfd,
-   return TRUE;
- }
-
--/* A structure used to record a list of sections, independently
--   of the next and prev fields in the asection structure.  */
--typedef struct section_list
--{
--  asection * sec;
--  struct section_list * next;
--  struct section_list * prev;
--}
--section_list;
--
--/* Unfortunately we need to keep a list of sections for which
--   an _arm_elf_section_data structure has been allocated.  This
--   is because it is possible for functions like elf32_arm_write_section
--   to be called on a section which has had an elf_data_structure
--   allocated for it (and so the used_by_bfd field is valid) but
--   for which the ARM extended version of this structure - the
--   _arm_elf_section_data structure - has not been allocated.  */
--static section_list * sections_with_arm_elf_section_data = NULL;
--
--static void
--record_section_with_arm_elf_section_data (asection * sec)
--{
--  struct section_list * entry;
--
--  entry = bfd_malloc (sizeof (* entry));
--  if (entry == NULL)
--    return;
--  entry->sec = sec;
--  entry->next = sections_with_arm_elf_section_data;
--  entry->prev = NULL;
--  if (entry->next != NULL)
--    entry->next->prev = entry;
--  sections_with_arm_elf_section_data = entry;
--}
--
--static struct section_list *
--find_arm_elf_section_entry (asection * sec)
--{
--  struct section_list * entry;
--  static struct section_list * last_entry = NULL;
--
--  /* This is a short cut for the typical case where the sections are added
--     to the sections_with_arm_elf_section_data list in forward order and
--     then looked up here in backwards order.  This makes a real difference
--     to the ld-srec/sec64k.exp linker test.  */
--  entry = sections_with_arm_elf_section_data;
--  if (last_entry != NULL)
--    {
--      if (last_entry->sec == sec)
--	entry = last_entry;
--      else if (last_entry->next != NULL
--	       && last_entry->next->sec == sec)
--	entry = last_entry->next;
--    }
--
--  for (; entry; entry = entry->next)
--    if (entry->sec == sec)
--      break;
--
--  if (entry)
--    /* Record the entry prior to this one - it is the entry we are most
--       likely to want to locate next time.  Also this way if we have been
--       called from unrecord_section_with_arm_elf_section_data() we will not
--       be caching a pointer that is about to be freed.  */
--    last_entry = entry->prev;
--
--  return entry;
--}
--
- static _arm_elf_section_data *
- get_arm_elf_section_data (asection * sec)
- {
--  struct section_list * entry;
--
--  entry = find_arm_elf_section_entry (sec);
--
--  if (entry)
--    return elf32_arm_section_data (entry->sec);
-+  if (sec && sec->owner && is_arm_elf (sec->owner))
-+    return elf32_arm_section_data (sec);
-   else
-     return NULL;
- }
-
--static void
--unrecord_section_with_arm_elf_section_data (asection * sec)
--{
--  struct section_list * entry;
--
--  entry = find_arm_elf_section_entry (sec);
--
--  if (entry)
--    {
--      if (entry->prev != NULL)
--	entry->prev->next = entry->next;
--      if (entry->next != NULL)
--	entry->next->prev = entry->prev;
--      if (entry == sections_with_arm_elf_section_data)
--	sections_with_arm_elf_section_data = entry->next;
--      free (entry);
--    }
--}
--
--
- typedef struct
- {
-   void *finfo;
-@@ -13230,8 +13137,6 @@ elf32_arm_new_section_hook (bfd *abfd, a
-       sec->used_by_bfd = sdata;
-     }
-
--  record_section_with_arm_elf_section_data (sec);
--
-   return _bfd_elf_new_section_hook (abfd, sec);
- }
-
-@@ -13659,44 +13564,13 @@ elf32_arm_write_section (bfd *output_bfd
-     }
-
-   free (map);
--  arm_data->mapcount = 0;
-+  arm_data->mapcount = -1;
-   arm_data->mapsize = 0;
-   arm_data->map = NULL;
--  unrecord_section_with_arm_elf_section_data (sec);
-
-   return FALSE;
- }
-
--static void
--unrecord_section_via_map_over_sections (bfd * abfd ATTRIBUTE_UNUSED,
--					asection * sec,
--					void * ignore ATTRIBUTE_UNUSED)
--{
--  unrecord_section_with_arm_elf_section_data (sec);
--}
--
--static bfd_boolean
--elf32_arm_close_and_cleanup (bfd * abfd)
--{
--  if (abfd->sections)
--    bfd_map_over_sections (abfd,
--			   unrecord_section_via_map_over_sections,
--			   NULL);
--
--  return _bfd_elf_close_and_cleanup (abfd);
--}
--
--static bfd_boolean
--elf32_arm_bfd_free_cached_info (bfd * abfd)
--{
--  if (abfd->sections)
--    bfd_map_over_sections (abfd,
--			   unrecord_section_via_map_over_sections,
--			   NULL);
--
--  return _bfd_free_cached_info (abfd);
--}
--
- /* Display STT_ARM_TFUNC symbols as functions.  */
-
- static void
-@@ -13882,8 +13756,6 @@ const struct elf_size_info elf32_arm_siz
- #define bfd_elf32_find_inliner_info	        elf32_arm_find_inliner_info
- #define bfd_elf32_new_section_hook		elf32_arm_new_section_hook
- #define bfd_elf32_bfd_is_target_special_symbol	elf32_arm_is_target_special_symbol
--#define bfd_elf32_close_and_cleanup             elf32_arm_close_and_cleanup
--#define bfd_elf32_bfd_free_cached_info          elf32_arm_bfd_free_cached_info
- #define bfd_elf32_bfd_final_link		elf32_arm_final_link
-
- #define elf_backend_get_symbol_type             elf32_arm_get_symbol_type
diff --git a/package/binutils/binutils-2.23.2/120-sh-conf.patch b/package/binutils/binutils-2.23.2/120-sh-conf.patch
new file mode 100644
index 0000000000..ea3d1b6068
--- /dev/null
+++ b/package/binutils/binutils-2.23.2/120-sh-conf.patch
@@ -0,0 +1,29 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+--- a/configure
++++ b/configure
+@@ -1495,7 +1495,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,7 +712,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/package/binutils/binutils-2.20/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.23.2/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.20/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.23.2/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..df783109bb
--- /dev/null
+++ b/package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1497,6 +1499,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/package/binutils/binutils-2.20/500-sysroot.patch b/package/binutils/binutils-2.23.2/500-sysroot.patch
similarity index 62%
rename from package/binutils/binutils-2.20/500-sysroot.patch
rename to package/binutils/binutils-2.23.2/500-sysroot.patch
index d21e4cb105..e49c795332 100644
--- a/package/binutils/binutils-2.20/500-sysroot.patch
+++ b/package/binutils/binutils-2.23.2/500-sysroot.patch
@@ -7,23 +7,24 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -308,18 +308,24 @@
+@@ -308,18 +308,25 @@
       directory first.  */
-   if (! entry->is_archive)
+   if (! entry->flags.maybe_archive)
      {
--      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
 +      /* For absolute pathnames, try to always open the file in the
 +	 sysroot first. If this fails, try to open the file at the
-+	 given location. */
-+      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
-+      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
++	 given location.  */
++      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++	  && ld_sysroot)
  	{
  	  char *name = concat (ld_sysroot, entry->filename,
  			       (const char *) NULL);
  	  if (ldfile_try_open_bfd (name, entry))
  	    {
  	      entry->filename = name;
-+	      entry->sysrooted = TRUE;
++	      entry->flags.sysrooted = TRUE;
  	      return TRUE;
  	    }
  	  free (name);
@@ -31,6 +32,6 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 -      else if (ldfile_try_open_bfd (entry->filename, entry))
 +
 +      if (ldfile_try_open_bfd (entry->filename, entry))
- 	{
- 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
- 	    && is_sysrooted_pathname (entry->filename, TRUE);
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))

From ff2038924fee4fbf6b2459a491138c337bdb8ace Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 04:43:07 +0000
Subject: [PATCH 4670/6849] php: fix typo for fileinfo extension

As reported by Aleksandar <aleksandar.zivkovic@gmail.com> in bug #6140

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 692ceb8d86..515244dfe1 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -57,7 +57,7 @@ PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
 		$(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
 		$(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
 		$(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
-		$(if $(BR2_PACKAGE_PHP_EXT_FILENIFO),--enable-fileinfo) \
+		$(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \
 		$(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath)
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)

From b41f4081a6be0fa8768208d4459bd62e001253a3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 05:06:59 +0000
Subject: [PATCH 4671/6849] libsigc: needs host-m4

Fixes
http://autobuild.buildroot.net/results/e0e5ec38208ac6cc163b6ca882690de177cb8c51/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsigc/libsigc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 3f58686d31..c0a0835654 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -7,6 +7,7 @@
 LIBSIGC_VERSION = 2.2.11
 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2
+LIBSIGC_DEPENDENCIES = host-m4
 LIBSIGC_INSTALL_STAGING = YES
 LIBSIGC_LICENSE = LGPLv2.1+
 LIBSIGC_LICENSE_FILES = COPYING

From a590595c700370eef5c024d7e264bf26f29db2fe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 06:32:32 +0000
Subject: [PATCH 4672/6849] xkeyboard-config: needs libX11 and xproto_xproto

Fixes a build failure i've found while debugging another one :)

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xkeyboard-config/Config.in           | 2 ++
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xkeyboard-config/Config.in b/package/x11r7/xkeyboard-config/Config.in
index 8e27dacb46..640bb1d539 100644
--- a/package/x11r7/xkeyboard-config/Config.in
+++ b/package/x11r7/xkeyboard-config/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_XKEYBOARD_CONFIG
 	bool "xkeyboard-config"
 	select BR2_PACKAGE_XAPP_XKBCOMP
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  keyboard configuration database for X
 
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index bd3314c163..0e63a452c1 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -6,7 +6,7 @@
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
+XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
 $(eval $(autotools-package))

From 43a54d0846525817e1ee69b833047bd8d7a0642f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 06:32:33 +0000
Subject: [PATCH 4673/6849] xkeyboard-config: add missing dependency on
 host-gettext and sanitize

xkeyboard-config needs msgfmt so we need to pull host-gettext into the
dependencies.
And remove GMSGFMT path hardcoding otherwise host-gettext msgfmt won't
work. Fixes:
http://autobuild.buildroot.net/results/ec956056aba54ab7993cf58a74a93a3b900dee95/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 0e63a452c1..78ed1ee5dc 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -6,8 +6,7 @@
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
-XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
+XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
 
 $(eval $(autotools-package))
 

From 674cbf25f69dc5df70679d6d4b31b78091ccaaa5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 07:03:59 +0000
Subject: [PATCH 4674/6849] jhead: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                     |  1 +
 package/jhead/Config.in               | 11 +++++++++++
 package/jhead/jhead-use-ldflags.patch | 16 ++++++++++++++++
 package/jhead/jhead.mk                | 20 ++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 package/jhead/Config.in
 create mode 100644 package/jhead/jhead-use-ldflags.patch
 create mode 100644 package/jhead/jhead.mk

diff --git a/package/Config.in b/package/Config.in
index 77dc0d3a19..d522804b56 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -107,6 +107,7 @@ menu "Graphic libraries and applications (graphic/text)"
 
 comment "Graphic applications"
 source "package/gnuplot/Config.in"
+source "package/jhead/Config.in"
 source "package/rrdtool/Config.in"
 
 comment "graphic libraries"
diff --git a/package/jhead/Config.in b/package/jhead/Config.in
new file mode 100644
index 0000000000..247ac53bf1
--- /dev/null
+++ b/package/jhead/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_JHEAD
+	bool "jhead"
+	depends on BR2_USE_WCHAR
+	help
+	  Jhead is a program for manipulating settings and thumbnails
+	  in Exif jpeg headers used by most Digital Cameras.
+
+	  http://www.sentex.net/~mwandel/jhead/
+
+comment "jhead requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/jhead/jhead-use-ldflags.patch b/package/jhead/jhead-use-ldflags.patch
new file mode 100644
index 0000000000..a1d8185a26
--- /dev/null
+++ b/package/jhead/jhead-use-ldflags.patch
@@ -0,0 +1,16 @@
+Make jhead use LDFLAGS for the final link.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura jhead-2.97.orig/makefile jhead-2.97/makefile
+--- jhead-2.97.orig/makefile	2013-03-27 09:22:38.759966389 -0300
++++ jhead-2.97/makefile	2013-03-27 09:25:06.290691745 -0300
+@@ -14,7 +14,7 @@
+ 	${CC} $(CFLAGS) -c $< -o $@
+ 
+ jhead: $(objs) jhead.h
+-	${CC} -o jhead $(objs) -lm
++	${CC} $(LDFLAGS) -o jhead $(objs) -lm
+ 
+ clean:
+ 	rm -f $(objs) jhead
diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk
new file mode 100644
index 0000000000..e9843ae3b6
--- /dev/null
+++ b/package/jhead/jhead.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# jhead
+#
+#############################################################
+
+JHEAD_VERSION = 2.97
+JHEAD_SITE = http://www.sentex.net/~mwandel/jhead
+JHEAD_LICENSE = Public Domain
+JHEAD_LICENSE_FILES = readme.txt
+
+define JHEAD_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define JHEAD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/jhead $(TARGET_DIR)/usr/bin/jhead
+endef
+
+$(eval $(generic-package))

From ba9c34787b5c089eab29302df2c6adb3a2de24ae Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 27 Mar 2013 03:58:48 +0000
Subject: [PATCH 4675/6849] filemq: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/filemq/Config.in | 16 ++++++++++++++++
 package/filemq/filemq.mk | 22 ++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/filemq/Config.in
 create mode 100644 package/filemq/filemq.mk

diff --git a/package/Config.in b/package/Config.in
index d522804b56..463d1b91b4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -499,6 +499,7 @@ endmenu
 menu "Networking"
 source "package/czmq/Config.in"
 source "package/cppzmq/Config.in"
+source "package/filemq/Config.in"
 source "package/glib-networking/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
new file mode 100644
index 0000000000..b8eb8bdb40
--- /dev/null
+++ b/package/filemq/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_FILEMQ
+	bool "filemq"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_CZMQ
+	select BR2_PACKAGE_ZEROMQ
+	depends on BR2_INSTALL_LIBSTDCPP # zeromq
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	help
+	  FileMQ is a publish-subscribe file service based on 0MQ.
+
+	  http://github.com/zeromq/filemq
+
+comment "filemq requires a toolchain with C++, IPv6, LARGEFILE and WCHAR support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk
new file mode 100644
index 0000000000..0ea7a9dc6e
--- /dev/null
+++ b/package/filemq/filemq.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# filemq
+#
+#############################################################
+
+FILEMQ_VERSION = 8fac5140dd
+FILEMQ_SITE = git://github.com/zeromq/filemq.git
+
+FILEMQ_AUTORECONF = YES
+FILEMQ_INSTALL_STAGING = YES
+FILEMQ_DEPENDENCIES = czmq openssl zeromq
+FILEMQ_LICENSE = LGPLv3+ with exceptions
+FILEMQ_LICENSE_FILES = COPYING COPYING.LESSER
+
+define FILEMQ_CREATE_CONFIG_DIR
+	mkdir -p $(@D)/config
+endef
+
+FILEMQ_POST_PATCH_HOOKS += FILEMQ_CREATE_CONFIG_DIR
+
+$(eval $(autotools-package))

From db5db3486f0f6e3113ffc890b2076e4534d4ee69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tilman=20Keskin=C3=B6z?= <arved@arved.at>
Date: Thu, 28 Mar 2013 05:29:24 +0000
Subject: [PATCH 4676/6849] libarchive: update to 3.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tilman Keskinöz <arved@arved.at>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libarchive/Config.in     | 2 +-
 package/libarchive/libarchive.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in
index 38928b00f2..a60b50c07a 100644
--- a/package/libarchive/Config.in
+++ b/package/libarchive/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBARCHIVE
 	  Libarchive is a reusable C library for reading and writing a
 	  variety of streaming archive formats.
 
-	  http://code.google.com/p/libarchive/
+	  http://www.libarchive.org/
 
 comment "libarchive requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index d25f7f899c..c00bc7bd80 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -3,8 +3,8 @@
 # libarchive (reusable C library for archive formats)
 #
 #############################################################
-LIBARCHIVE_VERSION = 2.8.5
-LIBARCHIVE_SITE = http://libarchive.googlecode.com/files/
+LIBARCHIVE_VERSION = 3.0.4
+LIBARCHIVE_SITE = http://github.com/downloads/libarchive/libarchive
 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz
 LIBARCHIVE_INSTALL_STAGING = YES
 

From 8206d0a18d7bc48bac3bc317e182601aaa70a295 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 02:34:02 +0000
Subject: [PATCH 4677/6849] kernel-headers: bump 3.{0, 2, 4, 8}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.70-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.71-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 4900aef905..fa5e779208 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -62,14 +62,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.70"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.71"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.41"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.42"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.37"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.38"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.4"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.5"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.70-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.71-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.70-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.71-headers_install-fix-__packed-in-exported-kernel-head.patch

From 56e14a6bc0077ce8e234fc50548caae538749683 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 02:34:03 +0000
Subject: [PATCH 4678/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index e37a97105a..df718c381b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.4"
+	bool "3.8.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.4" if BR2_LINUX_KERNEL_3_8
+	default "3.8.5" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f19928597b8e1c71b6546e69e76ec3896849c4be Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 01:19:50 +0000
Subject: [PATCH 4679/6849] gtest: needs mmu

Fixes:
http://autobuild.buildroot.net/results/ed2026b98d0cdded8d8ee4d5c86823142a5bdab9/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gtest/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gtest/Config.in b/package/gtest/Config.in
index c50b5f7098..5c065d6da3 100644
--- a/package/gtest/Config.in
+++ b/package/gtest/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_GTEST
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
 	help
 	  Google's framework for writing C++ tests on a variety of
 	  platforms (Linux, Mac OS X, Windows, Cygwin, Windows CE, and

From 5ec152a6f04c1a97f484bc2383564dba6cb12071 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 01:19:51 +0000
Subject: [PATCH 4680/6849] orc: needs threads

Fixes:
http://autobuild.buildroot.net/results/b44c09c7ca81b16267ad653e65f52c4e5ec7b36f/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/orc/Config.in b/package/orc/Config.in
index 1de0f235fd..022c455abb 100644
--- a/package/orc/Config.in
+++ b/package/orc/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_ORC
 	bool "orc"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Orc is a library and set of tools for compiling and executing
 	  very simple programs that operate on arrays of data.
 
 	  http://code.entropywave.com/projects/orc/
+
+comment "orc requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 421d9d636271e5872d10a521922b06683ab967b5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 01:19:52 +0000
Subject: [PATCH 4681/6849] intltool: host variant needs host-gettext

Fixes issues like:
http://autobuild.buildroot.net/results/1c7d2e50b622179aff469fddedaa4dc2015fb496/
http://autobuild.buildroot.net/results/7d85ff51b339f1da720bb079eb05e7fba179f101/
and probably a lot more.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/intltool/intltool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 19b523858a..1a32a79f4c 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -8,7 +8,7 @@ INTLTOOL_VERSION = 0.40.6
 INTLTOOL_SOURCE = intltool-$(INTLTOOL_VERSION).tar.bz2
 INTLTOOL_SITE = http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/
 
-HOST_INTLTOOL_DEPENDENCIES = host-libxml-parser-perl
+HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl
 HOST_INTLTOOL_CONF_OPT = \
   PERLLIB=$(HOST_DIR)/usr/lib/perl
 

From 9f2b3f9605c92f6a9fa2247b12d11985c1688f17 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 01:19:53 +0000
Subject: [PATCH 4682/6849] genimage: needs host-pkgconf

Fixes:
http://autobuild.buildroot.net/results/1561c26e45d0604f058eb0c7a8bebf08d4abe756/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/genimage/genimage.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
index 6ed44a4c65..2c45a8dcae 100644
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@@ -7,7 +7,7 @@
 GENIMAGE_VERSION        = 4
 GENIMAGE_SOURCE         = genimage-$(GENIMAGE_VERSION).tar.xz
 GENIMAGE_SITE           = http://www.pengutronix.de/software/genimage/download/
-GENIMAGE_DEPENDENCIES   = libconfuse
+GENIMAGE_DEPENDENCIES   = host-pkgconf libconfuse
 GENIMAGE_LICENSE        = GPLv2
 
 $(eval $(host-autotools-package))

From 294ac7ef0af50fb38492eaf1800772ac8411fee8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 01:19:54 +0000
Subject: [PATCH 4683/6849] socat: needs threads

Fixes:
http://autobuild.buildroot.net/results/d2231d0db9cebfa77739a229513035ed6814f34c/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socat/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/socat/Config.in b/package/socat/Config.in
index ae88be9073..c47828251b 100644
--- a/package/socat/Config.in
+++ b/package/socat/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_SOCAT
 	bool "socat"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Multipurpose socket relay program.
 
 	  http://www.dest-unreach.org/socat/
+
+comment "socat requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From d3a1037bb62a2ab877e9443fbb15ec66a0adfef8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Mar 2013 01:19:55 +0000
Subject: [PATCH 4684/6849] libpthsem: needs mmu

The need can be patched out by disabling the tests, however the only
package that uses libpthsem (bcusdk) needs a fork-enabled libpthsem so
there's not much point. Fixes:

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bcusdk/Config.in    | 1 +
 package/libpthsem/Config.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/bcusdk/Config.in b/package/bcusdk/Config.in
index cf082e7dcb..c9a1947ebd 100644
--- a/package/bcusdk/Config.in
+++ b/package/bcusdk/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BCUSDK
 	bool "bcusdk"
+	depends on BR2_USE_MMU # libpthsem
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBPTHSEM
 	help
diff --git a/package/libpthsem/Config.in b/package/libpthsem/Config.in
index 9ab13c3ed8..ae1c78f5ea 100644
--- a/package/libpthsem/Config.in
+++ b/package/libpthsem/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPTHSEM
 	bool "libpthsem"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_ARGP_STANDALONE
 	help
 	  GNU pth is a user mode multi threading library. pthsem is an extend

From 1b22957a2c8cb79024f811618f4d09f191d88a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tilman=20Keskin=C3=B6z?= <arved@arved.at>
Date: Mon, 25 Mar 2013 04:48:12 +0000
Subject: [PATCH 4685/6849] Fix path to pidfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tilman Keskinöz <arved@arved.at>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/S01logging | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/busybox/S01logging b/package/busybox/S01logging
index edece39f56..37a2c117b1 100644
--- a/package/busybox/S01logging
+++ b/package/busybox/S01logging
@@ -6,13 +6,13 @@
 case "$1" in
   start)
 	echo -n "Starting logging: "
-	start-stop-daemon -S -q -p /var/run/syslog.pid --exec /sbin/syslogd -- -m 0
+	start-stop-daemon -S -q -p /var/run/syslogd.pid --exec /sbin/syslogd -- -m 0
 	start-stop-daemon -S -q -p /var/run/klogd.pid --exec /sbin/klogd
 	echo "OK"
 	;;
   stop)
 	echo -n "Stopping logging: "
-	start-stop-daemon -K -q -p /var/run/syslog.pid
+	start-stop-daemon -K -q -p /var/run/syslogd.pid
 	start-stop-daemon -K -q -p /var/run/klogd.pid
 	echo "OK"
 	;;

From 4deba5c3d91d97de80b45241bcdc67e25f6e92e8 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Thu, 28 Mar 2013 03:36:34 +0000
Subject: [PATCH 4686/6849] linknx: new package

[Peter: add patch to fix build issue with gcc 4.7+]
[Thomas: various fixes/improvements]
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/linknx/Config.in                   | 12 +++++++++
 package/linknx/linknx-missing-unistd.patch | 22 ++++++++++++++++
 package/linknx/linknx.mk                   | 30 ++++++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 package/linknx/Config.in
 create mode 100644 package/linknx/linknx-missing-unistd.patch
 create mode 100644 package/linknx/linknx.mk

diff --git a/package/Config.in b/package/Config.in
index 463d1b91b4..69d87f04f5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -680,6 +680,7 @@ source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
 source "package/lighttpd/Config.in"
+source "package/linknx/Config.in"
 source "package/links/Config.in"
 source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
diff --git a/package/linknx/Config.in b/package/linknx/Config.in
new file mode 100644
index 0000000000..18e98677b7
--- /dev/null
+++ b/package/linknx/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LINKNX
+	bool "linknx"
+	select BR2_PACKAGE_LIBPTHSEM
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Linknx is an automation platform providing high level functionalities
+	  to EIB/KNX installation.
+
+	  http://linknx.sourceforge.net/
+
+comment "linknx requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/linknx/linknx-missing-unistd.patch b/package/linknx/linknx-missing-unistd.patch
new file mode 100644
index 0000000000..04b088fc3f
--- /dev/null
+++ b/package/linknx/linknx-missing-unistd.patch
@@ -0,0 +1,22 @@
+[PATCH]: ioport.cpp: close(2) needs unistd.h
+
+Fixed in upstream CVS:
+http://linknx.cvs.sourceforge.net/viewvc/linknx/linknx/linknx/src/ioport.cpp?revision=1.20&view=markup
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/ioport.cpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linknx-0.0.1.30/src/ioport.cpp
+===================================================================
+--- linknx-0.0.1.30.orig/src/ioport.cpp
++++ linknx-0.0.1.30/src/ioport.cpp
+@@ -21,6 +21,7 @@
+ #include <iomanip>
+ #include "ioport.h"
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ Logger& IOPort::logger_m(Logger::getInstance("IOPort"));
+ Logger& RxThread::logger_m(Logger::getInstance("RxThread"));
diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
new file mode 100644
index 0000000000..42700a717c
--- /dev/null
+++ b/package/linknx/linknx.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# linknx
+#
+#############################################################
+
+LINKNX_VERSION = 0.0.1.30
+LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
+LINKNX_LICENSE = GPLv2+
+LINKNX_INSTALL_STAGING = YES
+LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
+		  --with-pth=$(STAGING_DIR)/usr
+
+LINKNX_DEPENDENCIES = libpthsem
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
+LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
+LINKNX_DEPENDENCIES = mysql_client
+else
+LINKNX_CONF_OPT += --without-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LINKNX_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
+LINKNX_DEPENDENCIES += libcurl
+else
+LINKNX_CONF_OPT += --without-libcurl
+endif
+
+$(eval $(autotools-package))

From e8f853bd8098186058335ebb2af287122bc47516 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Mar 2013 01:34:06 +0000
Subject: [PATCH 4687/6849] hiawatha: bump to version 9.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 5c328bf19e..1cd700ac20 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 8.8
+HIAWATHA_VERSION = 9.0
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
 HIAWATHA_LICENSE_FILES = LICENSE

From ce0703bd0fa9c75a075574413c8f68ff8ce48c28 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Mar 2013 01:34:07 +0000
Subject: [PATCH 4688/6849] polarssl: security bump to version 1.2.6

Fixes CVE-2013-0169.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 4 ++--
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 8f7ce5f5b8..f4f4746306 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.5]
+[Gustavo: update for polarssl 1.2.6]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.5 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.6 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 0478f8a3de..c05a307696 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.5
+POLARSSL_VERSION = 1.2.6
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From 766d3b93ad0ea6f2693a492efca0a34ae1bc08ba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Mar 2013 01:48:40 +0000
Subject: [PATCH 4689/6849] fbset: needs host-bison and host-flex

Fixes:
http://autobuild.buildroot.net/results/08d6d70f7c89617c20e727e77e0f6be09974dfc1/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbset/fbset.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index b8a8f439d7..920ccc876a 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -7,6 +7,7 @@
 FBSET_VERSION = 2.1
 FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
+FBSET_DEPENDENCIES = host-bison host-flex
 FBSET_LICENSE = GPLv2
 
 # Make sure full fbset wins over busybox fbset

From e99d21b5e59413885083be2de93c9b8e42f4568d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Apr 2013 12:27:31 +0000
Subject: [PATCH 4690/6849] openvpn: bump to version 2.3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../openvpn/openvpn-allow-polarssl-1.2.patch  | 72 -------------------
 package/openvpn/openvpn.mk                    |  2 +-
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 package/openvpn/openvpn-allow-polarssl-1.2.patch

diff --git a/package/openvpn/openvpn-allow-polarssl-1.2.patch b/package/openvpn/openvpn-allow-polarssl-1.2.patch
deleted file mode 100644
index 0aeb2f2db4..0000000000
--- a/package/openvpn/openvpn-allow-polarssl-1.2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Allow OpenVPN to use newer (1.2+) PolarSSL versions.
-https://community.openvpn.net/openvpn/ticket/250
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- a/src/openvpn/crypto_polarssl.h.ori	2013-01-10 21:38:23.213885934 +0100
-+++ a/src/openvpn/crypto_polarssl.h	2013-01-10 21:40:20.597883460 +0100
-@@ -60,7 +60,11 @@
- #define OPENVPN_MODE_OFB 	POLARSSL_MODE_OFB
- 
- /** Cipher is in CFB mode */
-+#if POLARSSL_VERSION_NUMBER < 0x01020000
- #define OPENVPN_MODE_CFB 	POLARSSL_MODE_CFB128
-+#else
-+#define OPENVPN_MODE_CFB 	POLARSSL_MODE_CFB
-+#endif
- 
- /** Cipher should encrypt */
- #define OPENVPN_OP_ENCRYPT 	POLARSSL_ENCRYPT
---- a/src/openvpn/ssl_polarssl.c.ori	2013-01-10 21:50:16.041870946 +0100
-+++ a/src/openvpn/ssl_polarssl.c	2013-01-10 21:54:35.261865496 +0100
-@@ -67,6 +67,20 @@
- 
- static int default_ciphersuites[] =
- {
-+#if POLARSSL_VERSION_NUMBER >= 0x0102000
-+    TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-+    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
-+    TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-+    TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
-+    TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-+    TLS_RSA_WITH_AES_256_CBC_SHA,
-+    TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
-+    TLS_RSA_WITH_AES_128_CBC_SHA,
-+    TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
-+    TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-+    TLS_RSA_WITH_RC4_128_SHA,
-+    TLS_RSA_WITH_RC4_128_MD5,
-+#else
-     SSL_EDH_RSA_AES_256_SHA,
-     SSL_EDH_RSA_CAMELLIA_256_SHA,
-     SSL_EDH_RSA_AES_128_SHA,
-@@ -79,6 +93,7 @@
-     SSL_RSA_DES_168_SHA,
-     SSL_RSA_RC4_128_SHA,
-     SSL_RSA_RC4_128_MD5,
-+#endif
-     0
- };
- 
-@@ -515,7 +530,9 @@
-       ssl_set_rng (ks_ssl->ctx, ctr_drbg_random, rand_ctx_get());
- 
-       ALLOC_OBJ_CLEAR (ks_ssl->ssn, ssl_session);
-+#if  POLARSSL_VERSION_NUMBER < 0x01020000
-       ssl_set_session (ks_ssl->ctx, 0, 0, ks_ssl->ssn );
-+#endif
-       if (ssl_ctx->allowed_ciphers)
- 	ssl_set_ciphersuites (ks_ssl->ctx, ssl_ctx->allowed_ciphers);
-       else
-@@ -828,7 +845,11 @@
- 		    ssl_get_version (ks_ssl->ctx),
- 		    ssl_get_ciphersuite(ks_ssl->ctx));
- 
-+#if POLARSSL_VERSION_NUMBER >= 0x01020000
-+  cert = ks_ssl->ssn->peer_cert;
-+#else
-   cert = ks_ssl->ctx->peer_cert;
-+#endif
-   if (cert != NULL)
-     {
-       openvpn_snprintf (s2, sizeof (s2), ", " counter_format " bit RSA", (counter_type) cert->rsa.len * 8);
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index a49daca763..c911465259 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENVPN_VERSION = 2.3.0
+OPENVPN_VERSION = 2.3.1
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkgconf
 OPENVPN_CONF_OPT = --disable-plugin-auth-pam --enable-iproute2

From 83800fa2598bf21aaec18f6176ae1cbcea2fa205 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 2 Apr 2013 12:29:48 +0000
Subject: [PATCH 4691/6849] dropbear: add vfork fix

Causes scp to fail badly.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dropbear/dropbear-fix-vfork-logic.patch   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/dropbear/dropbear-fix-vfork-logic.patch

diff --git a/package/dropbear/dropbear-fix-vfork-logic.patch b/package/dropbear/dropbear-fix-vfork-logic.patch
new file mode 100644
index 0000000000..2706bc85cc
--- /dev/null
+++ b/package/dropbear/dropbear-fix-vfork-logic.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Matt Johnston <matt@ucc.asn.au>
+# Date 1364743743 -28800
+# Node ID fedfb8ede1fdebad5d19df7bd4d452c3264d9545
+# Parent  f27058078d61a8c3a057530d3ddcd19bd5062569
+Fix incorrect logic for USE_VFORK and calling arg_setup()
+
+diff -r f27058078d61 -r fedfb8ede1fd scp.c
+--- a/scp.c	Sun Mar 31 23:15:35 2013 +0800
++++ b/scp.c	Sun Mar 31 23:29:03 2013 +0800
+@@ -230,7 +230,7 @@
+ 		close(pin[0]);
+ 		close(pout[1]);
+ 
+-#ifdef USE_VFORK
++#ifndef USE_VFORK
+ 		arg_setup(host, remuser, cmd);
+ #endif
+ 
+

From 9172282710605f355e21510107a6a87f24317f09 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 00:11:05 +0000
Subject: [PATCH 4692/6849] vtun: requires host-bison and host-flex

Fixes:
http://autobuild.buildroot.net/results/f321700d2b060d11e3f98ff37be24c647a77a405/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vtun/vtun.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 2affa2e44d..6aeca65661 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -10,7 +10,7 @@
 VTUN_VERSION = 3.0.3
 VTUN_SOURCE = vtun-$(VTUN_VERSION).tar.gz
 VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
-VTUN_DEPENDENCIES = zlib lzo openssl
+VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
 VTUN_AUTORECONF = YES
 
 VTUN_CONF_OPT = \

From 09d0f1d338132f8117edfb56691a917812808234 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 00:27:58 +0000
Subject: [PATCH 4693/6849] linknx: forcilbly disable smtp support

linknx has support for SMTP via libesmtp, however there's no clean way
to specify where libesmtp-config lives.
So when libesmtp is built it finds it via the headers and is
automatically enabled, but it fails to get the appropiate link line from
libesmtp-config because it's not found.
Fix it by forcibly disabling it. If someone is interested in working
with upstream about this an option like --with-libcurl should be
implemented in configure.
Solves:
http://autobuild.buildroot.net/results/90ebb383d7a2d7bdf09ffac65e2504da7b6d19f5/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linknx/linknx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
index 42700a717c..54e04267cd 100644
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@@ -9,7 +9,7 @@ LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LI
 LINKNX_LICENSE = GPLv2+
 LINKNX_INSTALL_STAGING = YES
 LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
-		  --with-pth=$(STAGING_DIR)/usr
+		  --with-pth=$(STAGING_DIR)/usr --disable-smtp
 
 LINKNX_DEPENDENCIES = libpthsem
 

From 1087713131132f2db92865a730a326f8b6e7a39a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 00:31:58 +0000
Subject: [PATCH 4694/6849] aumix: needs host-gettext

Fixes:
http://autobuild.buildroot.net/results/fff0ddfd7cebe6535f506be41d09c6e64290f93a/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/aumix/aumix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index 130bda0360..da42bba091 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
@@ -16,6 +16,6 @@ AUMIX_CONF_OPT = \
 	--without-gpm \
 	--without-sysmouse
 
-AUMIX_DEPENDENCIES = ncurses
+AUMIX_DEPENDENCIES = host-gettext ncurses
 
 $(eval $(autotools-package))

From aae616e5550e0a466a956bbf5b8d8e8d1016c6b7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 00:37:57 +0000
Subject: [PATCH 4695/6849] gob2: host variant needs host-bison and host-flex

Fixes:
http://autobuild.buildroot.net/results/837ab8dc79f732c2cdf52b9ac6c53d64e841b35f/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gob2/gob2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index da208ac427..c52f26c74d 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -7,7 +7,7 @@
 GOB2_VERSION = 2.0.18
 GOB2_SITE = http://ftp.5z.com/pub/gob
 GOB2_DEPENDENCIES = libglib2 flex bison host-pkgconf host-flex
-HOST_GOB2_DEPENDENCIES = host-libglib2
+HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 204b1d61d061012ce42534eaaef12fa24d141a16 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 00:50:26 +0000
Subject: [PATCH 4696/6849] dtach: needs mmu

Fixes:
http://autobuild.buildroot.net/results/b07f6f05552aa9c8850ec8d9f67b2aa666dffbf4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dtach/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dtach/Config.in b/package/dtach/Config.in
index 033536bdb8..bea112b36d 100644
--- a/package/dtach/Config.in
+++ b/package/dtach/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DTACH
 	bool "dtach"
+	depends on BR2_USE_MMU # fork()
 	help
 	  dtach is a tiny program that emulates the detach feature of screen,
 	  allowing you to run a program in an environment that is protected

From 05c73a95718908b8223a37e6c3e6d36b7eded565 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 00:50:41 +0000
Subject: [PATCH 4697/6849] quota: needs host-gettext

Fixes:
http://autobuild.buildroot.net/results/ce1016e38e3e629dec8a54fa2d1436252831e0bf/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quota/quota.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 899dfddf86..c89ed9b867 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -7,7 +7,7 @@
 QUOTA_VERSION = 4.00
 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
-
+QUOTA_DEPENDENCIES = host-gettext
 QUOTA_AUTORECONF = YES
 
 QUOTA_CFLAGS = $(TARGET_CFLAGS)

From 18ff7e0503651aa5b76bc5ccb9c75ba6b85da2c5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 01:04:23 +0000
Subject: [PATCH 4698/6849] gnuplot: gd support needs libpng

GD support in gnuplot needs PNG support in GD.
So make sure we are getting the full package to enable it, fixes:
http://autobuild.buildroot.net/results/678bd3babfcb3535e3a9ed1e111f741c3d3101f3/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnuplot/gnuplot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index a68c7ae391..25ba90d8b5 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -24,7 +24,7 @@ GNUPLOT_CONF_OPT = --without-x \
 		--without-latex \
 	        --without-cairo
 
-ifeq ($(BR2_PACKAGE_GD),y)
+ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
 GNUPLOT_CONF_OPT += --with-gd
 GNUPLOT_DEPENDENCIES += gd
 GNUPLOT_CONF_ENV += \

From e853215eaae4cdef22720e9ee317a02b756fc3af Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 01:11:53 +0000
Subject: [PATCH 4699/6849] linknx: needs mmu

Inherited from libpthsem which uses fork()

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linknx/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/linknx/Config.in b/package/linknx/Config.in
index 18e98677b7..f35351e688 100644
--- a/package/linknx/Config.in
+++ b/package/linknx/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LINKNX
 	bool "linknx"
 	select BR2_PACKAGE_LIBPTHSEM
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # libpthsem
 	help
 	  Linknx is an automation platform providing high level functionalities
 	  to EIB/KNX installation.

From 6cdd1c5f92a7428ac21eb037393e444912b0a920 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 3 Apr 2013 03:54:06 +0000
Subject: [PATCH 4700/6849] libmicrohttpd: bump to version 0.9.26

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/libmicrohttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index ab637deda7..b1bee53e82 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBMICROHTTPD_VERSION = 0.9.25
+LIBMICROHTTPD_VERSION = 0.9.26
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_INSTALL_STAGING = YES
 

From c5fc984e15a292a61226142c8d1c18674d44a6ba Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 00:32:21 +0000
Subject: [PATCH 4701/6849] sysstat: needs host-gettext

Fixes:
http://autobuild.buildroot.net/results/50182a661367af1a9c09f510c672fb3a144cd869/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sysstat/sysstat.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 0513998c27..d211f9c89b 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -8,6 +8,7 @@ SYSSTAT_VERSION = 10.0.3
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
 SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors
+SYSSTAT_DEPENDENCIES = host-gettext
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 SYSSTAT_DEPENDENCIES += gettext

From c830a1a510c32d3f0d9db045762950e24a8d9b0c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 00:39:16 +0000
Subject: [PATCH 4702/6849] avahi: needs threads

Fixes:
http://autobuild.buildroot.net/results/bc64cd3499d7c3c674e8e79b749ff96a756852ea/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index e2f8c53f84..60fd50f7c1 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_AVAHI
 	bool "avahi"
 	# libdaemon uses fork()
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Avahi is a system which facilitates service
@@ -32,3 +33,6 @@ config BR2_PACKAGE_AVAHI_DAEMON
 	  architecture (also known as "Rendezvous" or "Bonjour").
 	  The daemon registers local IP addresses and services using
 	  mDNS/DNS-SD.
+
+comment "avahi requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From b392cb4c743cce128c2c777f3b2116d546118ec6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 00:55:01 +0000
Subject: [PATCH 4703/6849] foomatic-filters: make location of enscript very
 clear

Passing --with-file-converter=enscript isn't enough since the build
system will try the fallback options (a2ps, mpage, texttops) if it's not
found.
This has two bad effects: one of the tools leaking from the distribution
making foomatic-filters think everything will be the same on the target
(and failing when that's not the case), and failed builds when none is
found (enscript is installed in the target directory, the build system
doesn't look there).
So just avoid the test by stating explicitly where enscript will live in
the target. Fixes:
http://autobuild.buildroot.net/results/37ad3d2c5c35f00c644a2c572f1429bafa4b7cf4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/foomatic-filters/foomatic-filters.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/foomatic-filters/foomatic-filters.mk b/package/foomatic-filters/foomatic-filters.mk
index ad7ab7a68d..6e13486010 100644
--- a/package/foomatic-filters/foomatic-filters.mk
+++ b/package/foomatic-filters/foomatic-filters.mk
@@ -9,8 +9,8 @@ FOOMATIC_FILTERS_SITE = http://www.openprinting.org/download/foomatic
 FOOMATIC_FILTERS_LICENSE = GPLv2+
 FOOMATIC_FILTERS_LICENSE_FILES = COPYING
 FOOMATIC_FILTERS_DEPENDENCIES = cups libusb enscript
-
 FOOMATIC_FILTERS_CONF_OPT = --with-file-converter=enscript
+FOOMATIC_FILTERS_CONF_ENV = ac_cv_path_ENSCRIPT="/usr/bin/enscript"
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 FOOMATIC_FILTERS_CONF_OPT += --enable-dbus

From 1627fb54715406d6c76461d5104ee11dabbf5870 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 11:32:53 +0000
Subject: [PATCH 4704/6849] openvpn: adjust iproute2 path logic

As reported in bug #6164 when using busybox iproute2 openvpn can fail to
locate the 'ip' utility.
This was correct until busybox 1.21.0 was released since it changed the
location of /bin/ip to /sbin/ip (what iproute2 proper does).
So adjust the ip path accordingly.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/openvpn.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index c911465259..7a4385b63d 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -17,10 +17,14 @@ OPENVPN_CONF_OPT += --enable-small --disable-plugins \
 	--disable-debug --disable-eurephia
 endif
 
+# Busybox 1.21+ places the ip applet in the "correct" place
+# but previous versions didn't.
 ifeq ($(BR2_PACKAGE_IPROUTE2),y)
 OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
-else
+else ifeq ($(BR2_BUSYBOX_VERSION_1_19_X)$(BR2_BUSYBOX_VERSION_1_20_X),y)
 OPENVPN_CONF_ENV += IPROUTE=/bin/ip
+else
+OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
 endif
 
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)

From 184850a4239c9677421ac6c6c4582b51a3caddd4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 9 Apr 2013 16:36:21 +0200
Subject: [PATCH 4705/6849] nitrogen6x_defconfig: bump u-boot / linux versions
 to current stable

As described on http://boundarydevices.com/u-boot-branches-for-i-mx6-april-2013/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index e3a78c73da..9828c8e7be 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -12,13 +12,14 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6q_sabrelite"
+BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-2009-08/tarball/1f7edab/u-boot-1f7edab.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/7176d07/u-boot-7176d07.tar.gz"
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/5f84e92/linux-imx6-5f84e92.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/2dc5560/linux-imx6-2dc5560.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 5d10c45e0c8e1a864ee678b7e3a84017384d950f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 01:50:51 +0000
Subject: [PATCH 4706/6849] tinyhttpd: needs mmu

Fixes:
http://autobuild.buildroot.net/results/2a3b5ab3ef58443c1bf86df5498df2f145cd840c/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tinyhttpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/tinyhttpd/Config.in b/package/tinyhttpd/Config.in
index 5a6ee886cb..f7365afa6f 100644
--- a/package/tinyhttpd/Config.in
+++ b/package/tinyhttpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TINYHTTPD
 	bool "tinyhttpd"
+	depends on BR2_USE_MMU # fork()
 	help
 	  A relatively simple webserver written as a school project. It is
 	  exceedingly simple, threaded and handles basic CGI scripts.

From f1a251e7223c9732ca47d46c836851d3dbbfaa0f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 01:50:52 +0000
Subject: [PATCH 4707/6849] radvd: needs host-bison

Fixes:
http://autobuild.buildroot.net/results/849c48029ba77789f33ff726c5a33cd959200e38/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 2a6072913e..95bfe0799f 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -6,7 +6,7 @@
 
 RADVD_VERSION = 1.9.2
 RADVD_SITE = http://www.litech.org/radvd/dist
-RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkgconf
+RADVD_DEPENDENCIES = host-bison flex libdaemon host-flex host-pkgconf
 RADVD_AUTORECONF = YES
 
 define RADVD_INSTALL_INITSCRIPT

From 7e37d235f94f4ff0514bd20456e8aa2465ba32b1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 02:00:33 +0000
Subject: [PATCH 4708/6849] zeromq: needs threads

Fixes:
http://autobuild.buildroot.net/results/11a1c085e3f5c490cbf3fec8f26169ade29f7363/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cppzmq/Config.in | 3 ++-
 package/czmq/Config.in   | 4 +++-
 package/filemq/Config.in | 6 ++++--
 package/zeromq/Config.in | 6 ++++--
 package/zmqpp/Config.in  | 5 +++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in
index ea632d143e..72f0238fe1 100644
--- a/package/cppzmq/Config.in
+++ b/package/cppzmq/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CPPZMQ
 	depends on BR2_INET_IPV6 # zeromq
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).
@@ -12,4 +13,4 @@ config BR2_PACKAGE_CPPZMQ
 
 comment "cppzmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
-		&& BR2_USE_WCHAR)
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index 9fd8e86d2c..7e4205e87a 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -5,10 +5,12 @@ config BR2_PACKAGE_CZMQ
 	depends on BR2_INET_IPV6 # zeromq
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	help
 	  High-level C Binding for 0MQ
 
 	  http://czmq.zeromq.org/
 
 comment "czmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE && BR2_USE_WCHAR)
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index b8eb8bdb40..d25f03f4b8 100644
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -7,10 +7,12 @@ config BR2_PACKAGE_FILEMQ
 	depends on BR2_INET_IPV6 # zeromq
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	help
 	  FileMQ is a publish-subscribe file service based on 0MQ.
 
 	  http://github.com/zeromq/filemq
 
-comment "filemq requires a toolchain with C++, IPv6, LARGEFILE and WCHAR support"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "filemq requires a toolchain with C++, IPv6, LARGEFILE, WCHAR & thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index f93ab5d893..35704c3981 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -1,5 +1,6 @@
-comment "zeromq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
-	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "zeromq requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
 
 config BR2_PACKAGE_ZEROMQ
 	bool "zeromq"
@@ -7,6 +8,7 @@ config BR2_PACKAGE_ZEROMQ
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index 7a124621ec..9afcca49fd 100644
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_ZMQPP
 	depends on BR2_INET_IPV6 # zeromq
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	select BR2_PACKAGE_ZEROMQ
 	help
 	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).
@@ -14,9 +15,9 @@ config BR2_PACKAGE_ZMQPP
 
 	  http://github.com/benjamg/zmqpp
 
-comment "zmqpp requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+comment "zmqpp requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
-		&& BR2_USE_WCHAR)
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
 
 config BR2_PACKAGE_ZMQPP_CLIENT
 	bool "zmqpp client"

From 4c008d8e29fe29e046696dd93c7e680edfa16ebb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 5 Apr 2013 10:48:49 +0000
Subject: [PATCH 4709/6849] kernel-headers: bump 3.{0, 4, 8}.x stable version
 and EOL 3.7.x series

The 3.7.x series is EOLed upstream so match that marking it as
deprecated.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                         | 7 ++++---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.71-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.72-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index fa5e779208..0cfaab6d7c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -42,6 +42,7 @@ choice
 
 	config BR2_KERNEL_HEADERS_3_7
 		bool "Linux 3.7.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_8
 		bool "Linux 3.8.x kernel headers"
@@ -62,14 +63,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.71"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.72"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.42"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.38"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.39"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.5"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.6"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.71-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.72-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.71-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.72-headers_install-fix-__packed-in-exported-kernel-head.patch

From c461e64201598eae85ff32e130ed3f0ccd9fed78 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 5 Apr 2013 10:48:50 +0000
Subject: [PATCH 4710/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index df718c381b..8208277e5c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.5"
+	bool "3.8.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"

From 868d0e0599964ee0f084b9c00bdc0f153b4427f6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 03:39:56 +0000
Subject: [PATCH 4711/6849] mpg123: bump to version 1.15.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 43a558adf3..c65920fc75 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.15.1
+MPG123_VERSION = 1.15.3
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From 79828fc01d92cee84f8703d25f72121f52880ee9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 08:00:59 +0000
Subject: [PATCH 4712/6849] toolchain-external: update ARM Linaro toolchains

Add the ARM Linaro toolchains 2013.02 and 2013.03, remove 2012.11 and
2012.12.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 22 +++++++++++-----------
 toolchain/toolchain-external/ext-tool.mk | 14 +++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index d2f39264bb..8dcbc6d10d 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,8 +3,8 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
-	bool "Linaro 2013.01"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
+	bool "Linaro 2013.03"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -14,7 +14,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.01 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GCC 2013.03 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -22,8 +22,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
-	bool "Linaro 2012.12"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
+	bool "Linaro 2013.02"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -33,7 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.12 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GCC 2013.02 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -41,8 +41,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
-	bool "Linaro 2012.11"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
+	bool "Linaro 2013.01"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -52,7 +52,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2012.11 (based on gcc 4.7), Linaro GDB 2012.10 (based on
+	  GCC 2013.01 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -758,9 +758,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 5f467b7505..6d9a706dba 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -192,15 +192,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2012.11/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.11-20121123_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12),y)
-TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.12/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2012.12-20121214_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2013.01/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz2
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.02/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.02-01-20130221_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 4a0379645085e5ce2d96506991f39c63e66cfd77 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 08:01:00 +0000
Subject: [PATCH 4713/6849] toolchain-external: update AArch64 Linaro
 toolchains

Add the AArch64 Linaro toolchains 2013.02 and 2013.03, remove 2012.11
and 2012.12.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 16 ++++++++--------
 toolchain/toolchain-external/ext-tool.mk | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 8dcbc6d10d..433df4b74b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -675,8 +675,8 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
-	bool "Linaro AArch64 13.01"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
+	bool "Linaro AArch64 13.03"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -686,8 +686,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
-	bool "Linaro AArch64 12.12"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02
+	bool "Linaro AArch64 13.02"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -697,8 +697,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
-	bool "Linaro AArch64 12.11"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
+	bool "Linaro AArch64 13.01"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -764,8 +764,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6d9a706dba..d667b86277 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -270,15 +270,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11),y)
-TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.11/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.11-1-20121127_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12),y)
-TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/12.12/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2012.12-20121214_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/13.01/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.01-20130125_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.02/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.02-01-20130221_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.03-20130313_linux.tar.xz
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From 8d8a73fae1ea250ec13a5db1d8bc5847413f508d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 08:01:01 +0000
Subject: [PATCH 4714/6849] toolchain-external: fix typo in Blackfin toolchain
 config option

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 433df4b74b..4e75d85315 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -597,7 +597,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
 
-config BR2_TOOLCHAIN_EXTERNAL_BLACKFI_UCLINUX_2012R1
+config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	bool "Blackfin.uclinux.org 2012R1-RC2"
 	depends on BR2_bfin
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"

From 742d24c68e7b0f931003152ec2e1a3b203f77206 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 9 Apr 2013 02:58:48 +0000
Subject: [PATCH 4715/6849] collectd: bump to version 5.1.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 88f67370dd..6022ab3e28 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-COLLECTD_VERSION = 5.1.2
+COLLECTD_VERSION = 5.1.3
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes

From 964f36fe06a9fdd7be4b5b942176454a6cc052e4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 00:16:10 +0200
Subject: [PATCH 4716/6849] uboot: simplify patch wildcard for
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR

To match the logic we have for BR2_LINUX_KERNEL_PATCH. The user has
already specified a custom patch directory, so we don't need to be
so specific about the what file names we accept, and it becomes quite
cumbersome when a custom git version is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 2 +-
 boot/uboot/uboot.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index bc5ce19daa..d377fd1986 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -73,7 +73,7 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	help
 	  If your board requires custom patches, add the path to the
 	  directory containing the patches here. The patches must be
-	  named uboot-<version>-<something>.patch.
+	  named uboot-<something>.patch.
 
 	  Most users may leave this empty
 
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index c337e75527..004bdf2bc4 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -64,7 +64,7 @@ endef
 ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
 define UBOOT_APPLY_CUSTOM_PATCHES
 	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
-		uboot-$(UBOOT_VERSION)-\*.patch
+		uboot-\*.patch
 endef
 
 UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES

From 25b3af0a978169760aecf0ef95246b02f8c06ffb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 07:48:18 +0200
Subject: [PATCH 4717/6849] toolchain-external: get old microblaze toolchains
 from sources.buildroot.net

git.xilinx.com is no longer available (moved to github), and github
doesn't allow downloading the tarball blobs directly, so use a local
mirror on sources.buildroot.net instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index d667b86277..c4ddb0be4f 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -262,13 +262,13 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
-TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0_le.git;a=blob;h=d7b493c5dbcc24ba9cc3be2e4c14d6d9701e6805;hb=00163583b771bb4e937632765dd0c5516b3e31c4;f=
+TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
-TOOLCHAIN_EXTERNAL_SITE=http://git.xilinx.com/?p=xldk/microblaze_v2.0.git;a=blob;h=71e031ae990e063a5718f90d30cf97ad85e2f565;hb=569081301f0f1d8d3b24335a364e8ff1774190d4;f=
+TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01),y)
 TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/13.01/components/toolchain/binaries/

From c1a6f6863a58776a8b89550476ebd224471f5c2b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 07:50:53 +0200
Subject: [PATCH 4718/6849] toolchain-external: Only show MICROBLAZEBE_14_3
 toolchain for BE systems

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4e75d85315..bc1c6553de 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -655,7 +655,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
 	bool "Xilinx Big Endian Microblaze GNU Tools"
-	depends on BR2_microblaze
+	depends on BR2_microblazebe
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC

From 36319e23e84fd04dec18d5cdce9848fff25f2cb0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 02:21:14 +0000
Subject: [PATCH 4719/6849] kismet: bump to version 2013-03-R1a

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/kismet-libnl-30-support.patch | 128 -------------------
 package/kismet/kismet.mk                     |   6 +-
 2 files changed, 3 insertions(+), 131 deletions(-)
 delete mode 100644 package/kismet/kismet-libnl-30-support.patch

diff --git a/package/kismet/kismet-libnl-30-support.patch b/package/kismet/kismet-libnl-30-support.patch
deleted file mode 100644
index dca6151d3c..0000000000
--- a/package/kismet/kismet-libnl-30-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
----
- configure |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 78 insertions(+), 1 deletion(-)
-
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -601,6 +601,8 @@
- libnl1_CFLAGS
- libnl20_LIBS
- libnl20_CFLAGS
-+libnl30_LIBS
-+libnl30_CFLAGS
- PKG_CONFIG_LIBDIR
- PKG_CONFIG_PATH
- PKG_CONFIG
-@@ -712,6 +714,8 @@
- PKG_CONFIG
- PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
-+libnl30_CFLAGS
-+libnl30_LIBS
- libnl20_CFLAGS
- libnl20_LIBS
- libnl1_CFLAGS
-@@ -1361,6 +1365,10 @@
-               directories to add to pkg-config's search path
-   PKG_CONFIG_LIBDIR
-               path overriding pkg-config's built-in search path
-+  libnl30_CFLAGS
-+              C compiler flags for libnl30, overriding pkg-config
-+  libnl30_LIBS
-+              linker flags for libnl30, overriding pkg-config
-   libnl20_CFLAGS
-               C compiler flags for libnl20, overriding pkg-config
-   libnl20_LIBS
-@@ -6760,6 +6768,76 @@
- 	fi
- fi
-
-+#libnl-3.0
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl30" >&5
-+$as_echo_n "checking for libnl30... " >&6; }
-+
-+if test -n "$libnl30_CFLAGS"; then
-+    pkg_cv_libnl20_CFLAGS="$libnl30_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_libnl30_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$libnl30_LIBS"; then
-+    pkg_cv_libnl20_LIBS="$libnl30_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_libnl30_LIBS=`$PKG_CONFIG --libs "libnl-3.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        libnl30_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0" 2>&1`
-+        else
-+	        libnl30_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$libnl30_PKG_ERRORS" >&5
-+
-+	libnl30=no
-+elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	libnl30=no
-+else
-+	libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS
-+	libnl30_LIBS=$pkg_cv_libnl30_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+	CPPFLAGS="$CPPFLAGS $libnl30_CFLAGS"
-+$as_echo "yes" >&6; }
-+	libnl30=yes
-+fi
-+
-+# libnl-2.0
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5
- $as_echo_n "checking for libnl20... " >&6; }
-@@ -6897,7 +6974,11 @@
- $as_echo "yes" >&6; }
- 	libnl1=yes
- fi
--	if test "$libnl20" = "yes"; then
-+	if test "$libnl30" = "yes"; then
-+$as_echo "#define HAVE_LIBNL 1" >>confdefs.h
-+$as_echo "#define HAVE_LIBNL20 1" >>confdefs.h
-+               NLLIBS="-lnl-genl-3 -lnl-3"
-+	elif test "$libnl20" = "yes"; then
- 
- $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
-
-
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 3787f07093..845df6bc16 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -4,15 +4,15 @@
 #
 #############################################################
 
-KISMET_VERSION = 2011-03-R2
+KISMET_VERSION = 2013-03-R1a
 KISMET_SITE = http://www.kismetwireless.net/code
-KISMET_DEPENDENCIES = libpcap ncurses
+KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses
 KISMET_LICENSE = GPLv2+
 KISMET_LICENSE_FILES = GPL
 
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	KISMET_DEPENDENCIES += libnl
-	KISMET_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/"
+	KISMET_CONF_OPT += --with-netlink-version=3
 endif
 ifeq ($(BR2_PACKAGE_PCRE),y)
 	KISMET_DEPENDENCIES += pcre

From 9474421da36d8602f56b84b150e4cf4c78e788b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 07:29:45 +0000
Subject: [PATCH 4720/6849] toolchain/arm: drop generic and old, add fa526/626,
 unify strongarm

* Add Faraday FA526/626 as suggested on bug #1291
Note however that these cores are v4 and NOT v4t.

* Make the sa110 & sa1110 cores -> strongarm since they're the same.

* Drop all of the ARM variants lower than v4 including generic, there's
no point in supporting obsolete targets.

* Fix uClibc USE_BX logic, it was always on, this would break the new
FA526/626 support and broke StrongARM since it's a v4 core.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                      | 16 +++++++++++++++
 arch/Config.in.arm                    | 29 +++++++++------------------
 toolchain/gcc/Config.in               |  6 +++---
 toolchain/uClibc/Config.in            |  7 ++-----
 toolchain/uClibc/uClibc-0.9.31.config |  2 +-
 toolchain/uClibc/uclibc.mk            |  3 +++
 6 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 43e2afe8ea..4cd62b80da 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -44,6 +44,22 @@ endif
 # Legacy options since 2013.02
 #
 
+config BR2_sa110
+	bool "sa110 ARM target switched to strongarm"
+	select BR2_LEGACY
+	select BR2_strongarm
+	help
+	  The SA110 is the same as a generic StrongARM, it just differs
+	  in speed, peripherals and cache.
+
+config BR2_sa1100
+	bool "sa1100 ARM target switched to strongarm"
+	select BR2_LEGACY
+	select BR2_strongarm
+	help
+	  The SA1100 is the same as a generic StrongARM, it just differs
+	  in speed, peripherals and cache.
+
 config BR2_PACKAGE_GDISK
 	bool "gdisk has been replaced by gptfdisk"
 	select BR2_LEGACY
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 79f08f77c8..f706dcc4f6 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -9,18 +9,12 @@ config BR2_ARM_CPU_MAYBE_HAS_NEON
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_arm || BR2_armeb
-	default BR2_generic_arm
+	default BR2_arm926t
 	help
 	  Specific CPU variant to use
 
-config BR2_generic_arm
-	bool "generic_arm"
 config BR2_arm7tdmi
 	bool "arm7tdmi"
-config BR2_arm610
-	bool "arm610"
-config BR2_arm710
-	bool "arm710"
 config BR2_arm720t
 	bool "arm720t"
 config BR2_arm920t
@@ -51,10 +45,10 @@ config BR2_cortex_a9
 config BR2_cortex_a15
 	bool "cortex-A15"
 	select BR2_ARM_CPU_HAS_NEON
-config BR2_sa110
-	bool "sa110"
-config BR2_sa1100
-	bool "sa1100"
+config BR2_fa526
+	bool "fa526/626"
+config BR2_strongarm
+	bool "strongarm sa110/sa1100"
 config BR2_xscale
 	bool "xscale"
 config BR2_iwmmxt
@@ -105,9 +99,6 @@ config BR2_ENDIAN
 	default "BIG"	 if BR2_armeb
 
 config BR2_GCC_TARGET_TUNE
-	default "arm600"	if BR2_arm600
-	default "arm610"	if BR2_arm610
-	default "arm620"	if BR2_arm620
 	default "arm7tdmi"	if BR2_arm7tdmi
 	default "arm7tdmi"	if BR2_arm720t
 	default "arm7tdmi"	if BR2_arm740t
@@ -123,15 +114,13 @@ config BR2_GCC_TARGET_TUNE
 	default "cortex-a8"	if BR2_cortex_a8
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a15"	if BR2_cortex_a15
-	default "strongarm110"	if BR2_sa110
-	default "strongarm1100"	if BR2_sa1100
+	default "fa526"		if BR2_fa526
+	default "strongarm"	if BR2_strongarm
 	default "xscale"	if BR2_xscale
 	default "iwmmxt"	if BR2_iwmmxt
 
 config BR2_GCC_TARGET_ARCH
 	default "armv4t"	if BR2_arm7tdmi
-	default "armv3"		if BR2_arm610
-	default "armv3"		if BR2_arm710
 	default "armv4t"	if BR2_arm720t
 	default "armv4t"	if BR2_arm920t
 	default "armv4t"	if BR2_arm922t
@@ -145,8 +134,8 @@ config BR2_GCC_TARGET_ARCH
 	default "armv7-a"	if BR2_cortex_a8
 	default "armv7-a"	if BR2_cortex_a9
 	default "armv7-a"	if BR2_cortex_a15
-	default "armv4"		if BR2_sa110
-	default "armv4"		if BR2_sa1100
+	default "armv4"		if BR2_fa526
+	default "armv4"		if BR2_strongarm
 	default "armv5te"	if BR2_xscale
 	default "iwmmxt"	if BR2_iwmmxt
 
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f8cb82aab8..527288f714 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -18,15 +18,15 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
+		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.5.x"
 
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 57c9933497..b53bb24500 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -81,9 +81,7 @@ config BR2_UCLIBC_INSTALL_TEST_SUITE
 config BR2_UCLIBC_ARM_TYPE
 	string
 	depends on BR2_arm || BR2_armeb
-	default GENERIC_ARM	if BR2_generic_arm
-	default ARM610		if BR2_arm610
-	default ARM710		if BR2_arm710
+	default GENERIC_ARM	if BR2_fa526
 	default ARM7TDMI	if BR2_arm7tdmi
 	default ARM720T		if BR2_arm720t
 	default ARM920T		if BR2_arm920t
@@ -93,8 +91,7 @@ config BR2_UCLIBC_ARM_TYPE
 	default ARM1136JF_S	if BR2_arm1136jf_s
 	default ARM1176JZ_S	if BR2_arm1176jz_s
 	default ARM1176JZF_S	if BR2_arm1176jzf_s
-	default ARM_SA110	if BR2_sa110
-	default ARM_SA1100	if BR2_sa1100
+	default ARM_SA1100	if BR2_strongarm
 	default ARM_XSCALE	if BR2_xscale
 	default ARM_IWMMXT	if BR2_iwmmxt
 	default ARM_CORTEXA8	if BR2_cortex_a8
diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
index 2f363db08f..e990178df5 100644
--- a/toolchain/uClibc/uClibc-0.9.31.config
+++ b/toolchain/uClibc/uClibc-0.9.31.config
@@ -238,7 +238,7 @@ WARNINGS="-Wall"
 # DOMULTI is not set
 # UCLIBC_MJN3_ONLY is not set
 
-# USE_BX is not set
+USE_BX=y
 # CONFIG_GENERIC_ARM is not set
 # CONFIG_ARM610 is not set
 # CONFIG_ARM710 is not set
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index e8b2bb4944..113dc79e58 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -130,6 +130,9 @@ ifeq ($(BR2_ARM_OABI),y)
 	/bin/echo "CONFIG_ARM_OABI=y" >> $(UCLIBC_DIR)/.oldconfig
 	/bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
+ifeq ($(BR2_fa526)$(BR2_strongarm),y)
+	$(SED) 's,USE_BX=y,# USE_BX is not set,' $(UCLIBC_DIR)/.oldconfig
+endif
 endif
 ifeq ($(UCLIBC_TARGET_ARCH),mips)
 	$(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(UCLIBC_DIR)/.oldconfig

From 1b7f398dbbc5d11e0c795f1644ccbdfbd12491ad Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 07:29:46 +0000
Subject: [PATCH 4721/6849] openssl: adjust ARM optimizations

We no longer support ARM less than v4 so just kill dead code that we had
for those cases.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 96f817d2b2..7701d5159d 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -29,14 +29,8 @@ endif
 
 # Some architectures are optimized in OpenSSL
 ifeq ($(ARCH),arm)
-ifneq ($(BR2_generic_arm),y)
-ifneq ($(BR2_arm610),y)
-ifneq ($(BR2_arm710),y)
 	OPENSSL_TARGET_ARCH = armv4
 endif
-endif
-endif
-endif
 ifeq ($(ARCH),powerpc)
 # 4xx cores seem to have trouble with openssl's ASM optimizations
 ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),)

From d6a4227bd83e619385ad12c31ae124a55dbe7a61 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 07:29:47 +0000
Subject: [PATCH 4722/6849] speex: adjust ARM optimizations

We no longer support ARM less than v4 so drop the generic asm option.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/speex/Config.in | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/package/speex/Config.in b/package/speex/Config.in
index 424a830019..7e87566974 100644
--- a/package/speex/Config.in
+++ b/package/speex/Config.in
@@ -8,18 +8,13 @@ config BR2_PACKAGE_SPEEX
 
 	  http://www.speex.org/
 
-config BR2_PACKAGE_SPEEX_ARM_GENERIC
-       bool
-       default y
-       depends on BR2_PACKAGE_SPEEX && (BR2_generic_arm || BR2_arm610 || BR2_arm710)
-
 config BR2_PACKAGE_SPEEX_ARM4
        bool
        default y
-       depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_sa110 || BR2_sa1100)
+       depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_strongarm || BR2_fa526)
 
 config BR2_PACKAGE_SPEEX_ARM5E
 	default y
 	bool
-	depends on BR2_PACKAGE_SPEEX && BR2_arm && !(BR2_PACKAGE_SPEEX_ARM_GENERIC || BR2_PACKAGE_SPEEX_ARM4)
+	depends on BR2_PACKAGE_SPEEX && BR2_arm && !BR2_PACKAGE_SPEEX_ARM4
 

From 383932277e91f87bbcf473758452a5b5dec68c4d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 07:29:48 +0000
Subject: [PATCH 4723/6849] ffmpeg: adjust ARM optimizations

We no longer support ARM less than v3 so kill dead code.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b018ea077e..2e88b6b87e 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -136,7 +136,7 @@ endif
 # Explicitly disable everything that doesn't match for ARM
 # FFMPEG "autodetects" by compiling an extended instruction via AS
 # This works on compilers that aren't built for generic by default
-ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
+ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
 FFMPEG_CONF_OPT += --disable-armv5te
 endif
 ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)

From cfe70c5e13fcf6d99394c646c758236a79041653 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Apr 2013 09:09:16 +0000
Subject: [PATCH 4724/6849] cifs-utils: bump to version 6.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index 36f171d8f3..3e221e8338 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,4 +1,4 @@
-CIFS_UTILS_VERSION = 5.9
+CIFS_UTILS_VERSION = 6.0
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
 CIFS_UTILS_LICENSE = GPLv3

From 6997e461fdb39985957d24d81e612113cf39e35c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Apr 2013 11:24:24 +0000
Subject: [PATCH 4725/6849] support/kconfig: upgrade to 3.9-rc2

Our kconfig code is updated to the version of kernel 3.9-rc2. No major
issues during the migration, except:

 * Some conflicts when applying 03-change-config-option-prefix.patch
   due to upstream kernel changes.

 * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix
   the make rule that generates the moc file for the Qt-based
   interface.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/kconfig/Makefile                      | 145 +++----
 support/kconfig/README.buildroot2             |   2 +-
 support/kconfig/check.sh                      |   2 +-
 support/kconfig/conf.c                        |  98 ++++-
 support/kconfig/confdata.c                    | 369 ++++++++++------
 support/kconfig/expr.c                        |  15 +-
 support/kconfig/expr.h                        |  12 +-
 support/kconfig/gconf.c                       |  51 +--
 support/kconfig/kconfig_load.c                |  35 --
 support/kconfig/kxgettext.c                   |   1 -
 support/kconfig/list.h                        |  91 ++++
 support/kconfig/lkc.h                         |  32 +-
 support/kconfig/lkc_proto.h                   |   7 +-
 support/kconfig/lxdialog/check-lxdialog.sh    |  11 +-
 support/kconfig/lxdialog/dialog.h             |  10 +-
 support/kconfig/lxdialog/inputbox.c           | 121 ++++--
 support/kconfig/lxdialog/menubox.c            |  20 +-
 support/kconfig/lxdialog/textbox.c            | 177 ++++----
 support/kconfig/lxdialog/util.c               |   7 +
 support/kconfig/mconf.c                       | 269 ++++++++----
 support/kconfig/menu.c                        |  75 +++-
 support/kconfig/merge_config.sh               | 142 +++++++
 support/kconfig/nconf.c                       | 401 +++++++++---------
 support/kconfig/nconf.gui.c                   |  69 ++-
 support/kconfig/nconf.h                       |   2 +-
 .../01-kconfig-kernel-to-buildroot.patch      |  32 +-
 .../02-cpp-comments-to-c-comments.patch       |  30 +-
 .../03-change-config-option-prefix.patch      | 174 ++++----
 .../06-br-build-system-integration.patch      |  10 +-
 .../09-implement-kconfig-probability.patch    |  10 +-
 .../kconfig/patches/10-br-build-system.patch  |   8 +-
 .../patches/11-use-mktemp-for-lxdialog.patch  |   8 +-
 .../patches/12-fix-glade-file-path.patch      |   8 +-
 .../14-support-out-of-tree-config.patch       |  38 +-
 .../patches/15-fix-qconf-moc-rule.patch       |  24 ++
 support/kconfig/patches/series                |   1 +
 support/kconfig/qconf.cc                      |  18 +-
 support/kconfig/qconf.h                       |   2 +-
 support/kconfig/streamline_config.pl          | 291 ++++++++++---
 support/kconfig/symbol.c                      |  66 ++-
 support/kconfig/util.c                        |  25 +-
 support/kconfig/zconf.gperf                   |   2 +-
 support/kconfig/zconf.hash.c_shipped          | 273 +++++++-----
 support/kconfig/zconf.l                       |  17 +-
 ...ex.zconf.c_shipped => zconf.lex.c_shipped} |  35 +-
 support/kconfig/zconf.tab.c_shipped           |  69 ++-
 support/kconfig/zconf.y                       |  19 +-
 47 files changed, 2076 insertions(+), 1248 deletions(-)
 delete mode 100644 support/kconfig/kconfig_load.c
 create mode 100644 support/kconfig/list.h
 create mode 100755 support/kconfig/merge_config.sh
 create mode 100644 support/kconfig/patches/15-fix-qconf-moc-rule.patch
 rename support/kconfig/{lex.zconf.c_shipped => zconf.lex.c_shipped} (98%)

diff --git a/support/kconfig/Makefile b/support/kconfig/Makefile
index f2def76f0a..d28b7ac45c 100644
--- a/support/kconfig/Makefile
+++ b/support/kconfig/Makefile
@@ -11,6 +11,9 @@ else
 Kconfig := Kconfig
 endif
 
+# We need this, in case the user has it in its environment
+unexport CONFIG_
+
 xconfig: $(obj)/qconf
 	$< $(Kconfig)
 
@@ -33,17 +36,9 @@ silentoldconfig: $(obj)/conf
 	$(Q)mkdir -p include/generated
 	$< --$@ $(Kconfig)
 
-# if no path is given, then use src directory to find file
-ifdef LSMOD
-LSMOD_F := $(LSMOD)
-ifeq ($(findstring /,$(LSMOD)),)
-  LSMOD_F := $(objtree)/$(LSMOD)
-endif
-endif
-
-localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 	$(Q)mkdir -p include/generated
-	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
+	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
 	$(Q)if [ -f .config ]; then 					\
 			cmp -s .tmp.config .config ||			\
 			(mv -f .config .config.old.1;			\
@@ -56,27 +51,10 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 	fi
 	$(Q)rm -f .tmp.config
 
-localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
-	$(Q)mkdir -p include/generated
-	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-	$(Q)sed -i s/=m/=y/ .tmp.config
-	$(Q)if [ -f .config ]; then					\
-			cmp -s .tmp.config .config ||			\
-			(mv -f .config .config.old.1;			\
-			 mv -f .tmp.config .config;			\
-			 $(obj)/conf --silentoldconfig $(Kconfig);	\
-			 mv -f .config.old.1 .config.old)		\
-	else								\
-			mv -f .tmp.config .config;			\
-			$(obj)/conf --silentoldconfig $(Kconfig);	\
-	fi
-	$(Q)rm -f .tmp.config
-
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
-# The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-	$(Q)echo "  GEN config"
+	$(Q)echo "  GEN     config.pot"
 	$(Q)xgettext --default-domain=linux                         \
 	    --add-comments --keyword=_ --keyword=N_                 \
 	    --from-code=UTF-8                                       \
@@ -84,16 +62,16 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
 	    --directory=$(srctree) --directory=$(objtree)           \
 	    --output $(obj)/config.pot
 	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig
-	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
+	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
+	    $(srctree)/arch/*/um/Kconfig`;               \
 	    do                                           \
-		echo "  GEN $$i";                        \
+		echo "  GEN     $$i";                    \
 		$(obj)/kxgettext $$i                     \
 		     >> $(obj)/config.pot;               \
 	    done )
+	$(Q)echo "  GEN     linux.pot"
 	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
 	    --output $(obj)/linux.pot
-	$(Q)rm -f $(srctree)/arch/um/Kconfig
 	$(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -101,11 +79,17 @@ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
 	$< --$@ $(Kconfig)
 
-PHONY += listnewconfig oldnoconfig savedefconfig defconfig
+PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
 
-listnewconfig oldnoconfig: $(obj)/conf
+listnewconfig olddefconfig: $(obj)/conf
 	$< --$@ $(Kconfig)
 
+# oldnoconfig is an alias of olddefconfig, because people already are dependent
+# on its behavior(sets new symbols to their default value but not 'n') with the
+# counter-intuitive name.
+oldnoconfig: $(obj)/conf
+	$< --olddefconfig $(Kconfig)
+
 savedefconfig: $(obj)/conf
 	$< --$@=defconfig $(Kconfig)
 
@@ -139,7 +123,7 @@ help:
 	@echo  '  alldefconfig    - New config with all symbols set to default'
 	@echo  '  randconfig	  - New config with random answer to all options'
 	@echo  '  listnewconfig   - List new options'
-	@echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'
+	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their default value'
 
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -170,8 +154,8 @@ mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs	:= kxgettext.o zconf.tab.o
 qconf-cxxobjs	:= qconf.o
-qconf-objs	:= kconfig_load.o zconf.tab.o
-gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
+qconf-objs	:= zconf.tab.o
+gconf-objs	:= gconf.o zconf.tab.o
 
 hostprogs-y := conf
 
@@ -203,8 +187,8 @@ ifeq ($(gconf-target),1)
 	hostprogs-y += gconf
 endif
 
-clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
-clean-files	+= zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 
@@ -220,15 +204,18 @@ always := dochecklxdialog
 HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
 
 # generated files seem to need this to find local include files
-HOSTCFLAGS_lex.zconf.o	:= -I$(src)
+HOSTCFLAGS_zconf.lex.o	:= -I$(src)
 HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 
-HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl
-HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
+LEX_PREFIX_zconf	:= zconf
+YACC_PREFIX_zconf	:= zconf
+
+HOSTLOADLIBES_qconf	= $(KC_QT_LIBS)
+HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS)
 
-HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
+HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
 HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-                          -D LKC_DIRECT_LINK
+                          -Wno-missing-prototypes
 
 HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 
@@ -256,12 +243,12 @@ $(obj)/.tmp_qtcheck:
 	        if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
 	      done; \
 	      if [ -z "$$dir" ]; then \
-	        echo "*"; \
-	        echo "* Unable to find any QT installation. Please make sure that"; \
-	        echo "* the QT4 or QT3 development package is correctly installed and"; \
-	        echo "* either qmake can be found or install pkg-config or set"; \
-	        echo "* the QTDIR environment variable to the correct location."; \
-	        echo "*"; \
+	        echo >&2 "*"; \
+	        echo >&2 "* Unable to find any QT installation. Please make sure that"; \
+	        echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \
+	        echo >&2 "* either qmake can be found or install pkg-config or set"; \
+	        echo >&2 "* the QTDIR environment variable to the correct location."; \
+	        echo >&2 "*"; \
 	        false; \
 	      fi; \
 	      libpath=$$dir/lib; lib=qt; osdir=""; \
@@ -282,8 +269,8 @@ $(obj)/.tmp_qtcheck:
 	else \
 	  cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
 	  libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-	  binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
-	  moc="$$binpath/bin/moc"; \
+	  moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
+	  [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
 	fi; \
 	echo "KC_QT_CFLAGS=$$cflags" > $@; \
 	echo "KC_QT_LIBS=$$libs" >> $@; \
@@ -301,62 +288,30 @@ $(obj)/.tmp_gtkcheck:
 		if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then			\
 			touch $@;								\
 		else									\
-			echo "*"; 							\
-			echo "* GTK+ is present but version >= 2.0.0 is required.";	\
-			echo "*";							\
+			echo >&2 "*"; 							\
+			echo >&2 "* GTK+ is present but version >= 2.0.0 is required.";	\
+			echo >&2 "*";							\
 			false;								\
 		fi									\
 	else										\
-		echo "*"; 								\
-		echo "* Unable to find the GTK+ installation. Please make sure that"; 	\
-		echo "* the GTK+ 2.0 development package is correctly installed..."; 	\
-		echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; 		\
-		echo "*"; 								\
+		echo >&2 "*"; 								\
+		echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; 	\
+		echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; 	\
+		echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; 		\
+		echo >&2 "*"; 								\
 		false;									\
 	fi
 endif
 
-$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c
+$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c
 
-$(obj)/kconfig_load.o: $(obj)/lkc_defs.h
+$(obj)/qconf.o: $(obj)/qconf.moc
 
-$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h
-
-$(obj)/gconf.o: $(obj)/lkc_defs.h
-
-$(obj)/%.moc: $(src)/%.h
+$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
 	$(KC_QT_MOC) -i $< -o $@
 
-$(obj)/lkc_defs.h: $(src)/lkc_proto.h
-	$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
-
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
 	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
 	$(obj)/gconf.glade
 
-###
-# The following requires flex/bison/gperf
-# By default we use the _shipped versions, uncomment the following line if
-# you are modifying the flex/bison src.
-# LKC_GENPARSER := 1
-
-ifdef LKC_GENPARSER
-
-$(obj)/zconf.tab.c: $(src)/zconf.y
-$(obj)/lex.zconf.c: $(src)/zconf.l
-$(obj)/zconf.hash.c: $(src)/zconf.gperf
-
-%.tab.c: %.y
-	bison -l -b $* -p $(notdir $*) $<
-	cp $@ $@_shipped
-
-lex.%.c: %.l
-	flex -L -P$(notdir $*) -o$@ $<
-	cp $@ $@_shipped
-
-%.hash.c: %.gperf
-	gperf < $< > $@
-	cp $@ $@_shipped
-
-endif
diff --git a/support/kconfig/README.buildroot2 b/support/kconfig/README.buildroot2
index b92ec1427b..7de485cd72 100644
--- a/support/kconfig/README.buildroot2
+++ b/support/kconfig/README.buildroot2
@@ -1,4 +1,4 @@
-This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked
+This is a copy of the kconfig code in the kernel (currently 3.9-rc2) tweaked
 to suit Buildroot.
 
 To update:
diff --git a/support/kconfig/check.sh b/support/kconfig/check.sh
index fa59cbf9d6..854d9c7c67 100755
--- a/support/kconfig/check.sh
+++ b/support/kconfig/check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Needed for systems without gettext
-$* -xc -o /dev/null - > /dev/null 2>&1 << EOF
+$* -x c -o /dev/null - > /dev/null 2>&1 << EOF
 #include <libintl.h>
 int main()
 {
diff --git a/support/kconfig/conf.c b/support/kconfig/conf.c
index ed9402a602..c104941cb2 100644
--- a/support/kconfig/conf.c
+++ b/support/kconfig/conf.c
@@ -14,11 +14,11 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static void conf(struct menu *menu);
 static void check_conf(struct menu *menu);
+static void xfgets(char *str, int size, FILE *in);
 
 enum input_mode {
 	oldaskconfig,
@@ -32,12 +32,11 @@ enum input_mode {
 	defconfig,
 	savedefconfig,
 	listnewconfig,
-	oldnoconfig,
+	olddefconfig,
 } input_mode = oldaskconfig;
 
-char *defconfig_file;
-
 static int indent = 1;
+static int tty_stdio;
 static int valid_stdin = 1;
 static int sync_kconfig;
 static int conf_cnt;
@@ -106,9 +105,12 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 			return 0;
 		}
 		check_stdin();
+		/* fall through */
 	case oldaskconfig:
 		fflush(stdout);
 		xfgets(line, 128, stdin);
+		if (!tty_stdio)
+			printf("\n");
 		return 1;
 	default:
 		break;
@@ -150,6 +152,7 @@ static int conf_string(struct menu *menu)
 				def = NULL;
 				break;
 			}
+			/* fall through */
 		default:
 			line[strlen(line)-1] = 0;
 			def = line;
@@ -304,6 +307,7 @@ static int conf_choice(struct menu *menu)
 				break;
 			}
 			check_stdin();
+			/* fall through */
 		case oldaskconfig:
 			fflush(stdout);
 			xfgets(line, 128, stdin);
@@ -364,11 +368,12 @@ static void conf(struct menu *menu)
 		case P_MENU:
 			if ((input_mode == silentoldconfig ||
 			     input_mode == listnewconfig ||
-			     input_mode == oldnoconfig) &&
+			     input_mode == olddefconfig) &&
 			    rootEntry != menu) {
 				check_conf(menu);
 				return;
 			}
+			/* fall through */
 		case P_COMMENT:
 			prompt = menu_get_prompt(menu);
 			if (prompt)
@@ -427,7 +432,7 @@ static void check_conf(struct menu *menu)
 				if (sym->name && !sym_is_choice_value(sym)) {
 					printf("%s%s\n", CONFIG_, sym->name);
 				}
-			} else if (input_mode != oldnoconfig) {
+			} else if (input_mode != olddefconfig) {
 				if (!conf_cnt++)
 					printf(_("*\n* Restart config...\n*\n"));
 				rootEntry = menu_get_parent_menu(menu);
@@ -452,20 +457,49 @@ static struct option long_opts[] = {
 	{"alldefconfig",    no_argument,       NULL, alldefconfig},
 	{"randconfig",      no_argument,       NULL, randconfig},
 	{"listnewconfig",   no_argument,       NULL, listnewconfig},
-	{"oldnoconfig",     no_argument,       NULL, oldnoconfig},
+	{"olddefconfig",    no_argument,       NULL, olddefconfig},
+	/*
+	 * oldnoconfig is an alias of olddefconfig, because people already
+	 * are dependent on its behavior(sets new symbols to their default
+	 * value but not 'n') with the counter-intuitive name.
+	 */
+	{"oldnoconfig",     no_argument,       NULL, olddefconfig},
 	{NULL, 0, NULL, 0}
 };
 
+static void conf_usage(const char *progname)
+{
+
+	printf("Usage: %s [option] <kconfig-file>\n", progname);
+	printf("[option] is _one_ of the following:\n");
+	printf("  --listnewconfig         List new options\n");
+	printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
+	printf("  --oldconfig             Update a configuration using a provided .config as base\n");
+	printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");
+	printf("  --olddefconfig          Same as silentoldconfig but sets new symbols to their default value\n");
+	printf("  --oldnoconfig           An alias of olddefconfig\n");
+	printf("  --defconfig <file>      New config with default defined in <file>\n");
+	printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
+	printf("  --allnoconfig           New config where all options are answered with no\n");
+	printf("  --allyesconfig          New config where all options are answered with yes\n");
+	printf("  --allmodconfig          New config where all options are answered with mod\n");
+	printf("  --alldefconfig          New config with all symbols set to default\n");
+	printf("  --randconfig            New config with random answer to all options\n");
+}
+
 int main(int ac, char **av)
 {
+	const char *progname = av[0];
 	int opt;
-	const char *name;
+	const char *name, *defconfig_file = NULL /* gcc uninit */;
 	struct stat tmpstat;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	tty_stdio = isatty(0) && isatty(1) && isatty(2);
+
 	while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {
 		input_mode = (enum input_mode)opt;
 		switch (opt) {
@@ -491,14 +525,24 @@ int main(int ac, char **av)
 			srand(seed);
 			break;
 		}
+		case oldaskconfig:
+		case oldconfig:
+		case allnoconfig:
+		case allyesconfig:
+		case allmodconfig:
+		case alldefconfig:
+		case listnewconfig:
+		case olddefconfig:
+			break;
 		case '?':
-			fprintf(stderr, _("See README for usage info\n"));
+			conf_usage(progname);
 			exit(1);
 			break;
 		}
 	}
 	if (ac == optind) {
 		printf(_("%s: Kconfig file missing\n"), av[0]);
+		conf_usage(progname);
 		exit(1);
 	}
 	name = av[optind];
@@ -532,7 +576,7 @@ int main(int ac, char **av)
 	case oldaskconfig:
 	case oldconfig:
 	case listnewconfig:
-	case oldnoconfig:
+	case olddefconfig:
 		conf_read(NULL);
 		break;
 	case allnoconfig:
@@ -541,8 +585,15 @@ int main(int ac, char **av)
 	case alldefconfig:
 	case randconfig:
 		name = getenv("KCONFIG_ALLCONFIG");
-		if (name && !stat(name, &tmpstat)) {
-			conf_read_simple(name, S_DEF_USER);
+		if (!name)
+			break;
+		if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
+			if (conf_read_simple(name, S_DEF_USER)) {
+				fprintf(stderr,
+					_("*** Can't read seed configuration \"%s\"!\n"),
+					name);
+				exit(1);
+			}
 			break;
 		}
 		switch (input_mode) {
@@ -553,10 +604,13 @@ int main(int ac, char **av)
 		case randconfig:	name = "allrandom.config"; break;
 		default: break;
 		}
-		if (!stat(name, &tmpstat))
-			conf_read_simple(name, S_DEF_USER);
-		else if (!stat("all.config", &tmpstat))
-			conf_read_simple("all.config", S_DEF_USER);
+		if (conf_read_simple(name, S_DEF_USER) &&
+		    conf_read_simple("all.config", S_DEF_USER)) {
+			fprintf(stderr,
+				_("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+				name);
+			exit(1);
+		}
 		break;
 	default:
 		break;
@@ -571,7 +625,7 @@ int main(int ac, char **av)
 				return 1;
 			}
 		}
-		valid_stdin = isatty(0) && isatty(1) && isatty(2);
+		valid_stdin = tty_stdio;
 	}
 
 	switch (input_mode) {
@@ -602,7 +656,7 @@ int main(int ac, char **av)
 		/* fall through */
 	case oldconfig:
 	case listnewconfig:
-	case oldnoconfig:
+	case olddefconfig:
 	case silentoldconfig:
 		/* Update until a loop caused no more changes */
 		do {
@@ -610,7 +664,7 @@ int main(int ac, char **av)
 			check_conf(&rootmenu);
 		} while (conf_cnt &&
 			 (input_mode != listnewconfig &&
-			  input_mode != oldnoconfig));
+			  input_mode != olddefconfig));
 		break;
 	}
 
@@ -640,13 +694,11 @@ int main(int ac, char **av)
 	}
 	return 0;
 }
+
 /*
  * Helper function to facilitate fgets() by Jean Sacren.
  */
-void xfgets(str, size, in)
-	char *str;
-	int size;
-	FILE *in;
+void xfgets(char *str, int size, FILE *in)
 {
 	if (fgets(str, size, in) == NULL)
 		fprintf(stderr, "\nError in reading or end of file.\n");
diff --git a/support/kconfig/confdata.c b/support/kconfig/confdata.c
index 54f20ca96a..b7df92f9be 100644
--- a/support/kconfig/confdata.c
+++ b/support/kconfig/confdata.c
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,7 +15,6 @@
 #include <unistd.h>
 #include <libgen.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static void conf_warning(const char *fmt, ...)
@@ -127,6 +127,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			sym->flags |= def_flags;
 			break;
 		}
+		/* fall through */
 	case S_BOOLEAN:
 		if (p[0] == 'y') {
 			sym->def[def].tri = yes;
@@ -139,7 +140,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			break;
 		}
 		conf_warning("symbol value '%s' invalid for %s", p, sym->name);
-		break;
+		return 1;
 	case S_OTHER:
 		if (*p != '"') {
 			for (p2 = p; *p2 && !isspace(*p2); p2++)
@@ -147,6 +148,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			sym->type = S_STRING;
 			goto done;
 		}
+		/* fall through */
 	case S_STRING:
 		if (*p++ != '"')
 			break;
@@ -161,6 +163,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 			conf_warning("invalid string found");
 			return 1;
 		}
+		/* fall through */
 	case S_INT:
 	case S_HEX:
 	done:
@@ -178,10 +181,66 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 	return 0;
 }
 
+#define LINE_GROWTH 16
+static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
+{
+	char *nline;
+	size_t new_size = slen + 1;
+	if (new_size > *n) {
+		new_size += LINE_GROWTH - 1;
+		new_size *= 2;
+		nline = realloc(*lineptr, new_size);
+		if (!nline)
+			return -1;
+
+		*lineptr = nline;
+		*n = new_size;
+	}
+
+	(*lineptr)[slen] = c;
+
+	return 0;
+}
+
+static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)
+{
+	char *line = *lineptr;
+	size_t slen = 0;
+
+	for (;;) {
+		int c = getc(stream);
+
+		switch (c) {
+		case '\n':
+			if (add_byte(c, &line, slen, n) < 0)
+				goto e_out;
+			slen++;
+			/* fall through */
+		case EOF:
+			if (add_byte('\0', &line, slen, n) < 0)
+				goto e_out;
+			*lineptr = line;
+			if (slen == 0)
+				return -1;
+			return slen;
+		default:
+			if (add_byte(c, &line, slen, n) < 0)
+				goto e_out;
+			slen++;
+		}
+	}
+
+e_out:
+	line[slen-1] = '\0';
+	*lineptr = line;
+	return -1;
+}
+
 int conf_read_simple(const char *name, int def)
 {
 	FILE *in = NULL;
-	char line[1024];
+	char   *line = NULL;
+	size_t  line_asize = 0;
 	char *p, *p2;
 	struct symbol *sym;
 	int i, def_flags;
@@ -236,13 +295,14 @@ int conf_read_simple(const char *name, int def)
 		case S_STRING:
 			if (sym->def[def].val)
 				free(sym->def[def].val);
+			/* fall through */
 		default:
 			sym->def[def].val = NULL;
 			sym->def[def].tri = no;
 		}
 	}
 
-	while (fgets(line, sizeof(line), in)) {
+	while (compat_getline(&line, &line_asize, in) != -1) {
 		conf_lineno++;
 		sym = NULL;
 		if (line[0] == '#') {
@@ -330,6 +390,7 @@ int conf_read_simple(const char *name, int def)
 			cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
 		}
 	}
+	free(line);
 	fclose(in);
 
 	if (modules_sym)
@@ -339,10 +400,8 @@ int conf_read_simple(const char *name, int def)
 
 int conf_read(const char *name)
 {
-	struct symbol *sym, *choice_sym;
-	struct property *prop;
-	struct expr *e;
-	int i, flags;
+	struct symbol *sym;
+	int i;
 
 	sym_set_change_count(0);
 
@@ -352,7 +411,7 @@ int conf_read(const char *name)
 	for_all_symbols(i, sym) {
 		sym_calc_value(sym);
 		if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
-			goto sym_ok;
+			continue;
 		if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
 			/* check that calculated value agrees with saved value */
 			switch (sym->type) {
@@ -361,29 +420,18 @@ int conf_read(const char *name)
 				if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
 					break;
 				if (!sym_is_choice(sym))
-					goto sym_ok;
+					continue;
+				/* fall through */
 			default:
 				if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
-					goto sym_ok;
+					continue;
 				break;
 			}
 		} else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE))
 			/* no previous value and not saved */
-			goto sym_ok;
+			continue;
 		conf_unsaved++;
 		/* maybe print value in verbose mode... */
-	sym_ok:
-		if (!sym_is_choice(sym))
-			continue;
-		/* The choice symbol only has a set value (and thus is not new)
-		 * if all its visible childs have values.
-		 */
-		prop = sym_get_choice_prop(sym);
-		flags = sym->flags;
-		expr_list_for_each_sym(prop->expr, e, choice_sym)
-			if (choice_sym->visible != no)
-				flags &= choice_sym->flags;
-		sym->flags &= flags | ~SYMBOL_DEF_USER;
 	}
 
 	for_all_symbols(i, sym) {
@@ -416,64 +464,191 @@ int conf_read(const char *name)
 	return 0;
 }
 
-/* Write a S_STRING */
-static void conf_write_string(bool headerfile, const char *name,
-                              const char *str, FILE *out)
+/*
+ * Kconfig configuration printer
+ *
+ * This printer is used when generating the resulting configuration after
+ * kconfig invocation and `defconfig' files. Unset symbol might be omitted by
+ * passing a non-NULL argument to the printer.
+ *
+ */
+static void
+kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
 {
-	int l;
-	if (headerfile)
-		fprintf(out, "#define %s \"", name);
-	else
-		fprintf(out, "%s=\"", name);
 
-	while (1) {
-		l = strcspn(str, "\"\\");
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		if (*value == 'n') {
+			bool skip_unset = (arg != NULL);
+
+			if (!skip_unset)
+				fprintf(fp, "# %s is not set\n",
+				    sym->name);
+			return;
+		}
+		break;
+	default:
+		break;
+	}
+
+	fprintf(fp, "%s=%s\n", sym->name, value);
+}
+
+static void
+kconfig_print_comment(FILE *fp, const char *value, void *arg)
+{
+	const char *p = value;
+	size_t l;
+
+	for (;;) {
+		l = strcspn(p, "\n");
+		fprintf(fp, "#");
 		if (l) {
-			xfwrite(str, l, 1, out);
-			str += l;
+			fprintf(fp, " ");
+			xfwrite(p, l, 1, fp);
+			p += l;
 		}
-		if (!*str)
+		fprintf(fp, "\n");
+		if (*p++ == '\0')
 			break;
-		fprintf(out, "\\%c", *str++);
 	}
-	fputs("\"\n", out);
 }
 
-static void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no)
+static struct conf_printer kconfig_printer_cb =
+{
+	.print_symbol = kconfig_print_symbol,
+	.print_comment = kconfig_print_comment,
+};
+
+/*
+ * Header printer
+ *
+ * This printer is used when generating the `include/generated/autoconf.h' file.
+ */
+static void
+header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
 {
-	const char *str;
 
 	switch (sym->type) {
 	case S_BOOLEAN:
-	case S_TRISTATE:
-		switch (sym_get_tristate_value(sym)) {
-		case no:
-			if (write_no)
-				fprintf(out, "# %s is not set\n",
-				    sym->name);
-			break;
-		case mod:
-			fprintf(out, "%s=m\n", sym->name);
-			break;
-		case yes:
-			fprintf(out, "%s=y\n", sym->name);
+	case S_TRISTATE: {
+		const char *suffix = "";
+
+		switch (*value) {
+		case 'n':
 			break;
+		case 'm':
+			suffix = "_MODULE";
+			/* fall through */
+		default:
+			fprintf(fp, "#define %s%s 1\n",
+			    sym->name, suffix);
 		}
 		break;
-	case S_STRING:
-		conf_write_string(false, sym->name, sym_get_string_value(sym), out);
+	}
+	case S_HEX: {
+		const char *prefix = "";
+
+		if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
+			prefix = "0x";
+		fprintf(fp, "#define %s %s%s\n",
+		    sym->name, prefix, value);
 		break;
-	case S_HEX:
+	}
+	case S_STRING:
 	case S_INT:
-		str = sym_get_string_value(sym);
-		fprintf(out, "%s=%s\n", sym->name, str);
+		fprintf(fp, "#define %s %s\n",
+		    sym->name, value);
 		break;
+	default:
+		break;
+	}
+
+}
+
+static void
+header_print_comment(FILE *fp, const char *value, void *arg)
+{
+	const char *p = value;
+	size_t l;
+
+	fprintf(fp, "/*\n");
+	for (;;) {
+		l = strcspn(p, "\n");
+		fprintf(fp, " *");
+		if (l) {
+			fprintf(fp, " ");
+			xfwrite(p, l, 1, fp);
+			p += l;
+		}
+		fprintf(fp, "\n");
+		if (*p++ == '\0')
+			break;
+	}
+	fprintf(fp, " */\n");
+}
+
+static struct conf_printer header_printer_cb =
+{
+	.print_symbol = header_print_symbol,
+	.print_comment = header_print_comment,
+};
+
+/*
+ * Tristate printer
+ *
+ * This printer is used when generating the `include/config/tristate.conf' file.
+ */
+static void
+tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
+{
+
+	if (sym->type == S_TRISTATE && *value != 'n')
+		fprintf(fp, "%s=%c\n", sym->name, (char)toupper(*value));
+}
+
+static struct conf_printer tristate_printer_cb =
+{
+	.print_symbol = tristate_print_symbol,
+	.print_comment = kconfig_print_comment,
+};
+
+static void conf_write_symbol(FILE *fp, struct symbol *sym,
+			      struct conf_printer *printer, void *printer_arg)
+{
+	const char *str;
+
+	switch (sym->type) {
 	case S_OTHER:
 	case S_UNKNOWN:
 		break;
+	case S_STRING:
+		str = sym_get_string_value(sym);
+		str = sym_escape_string_value(str);
+		printer->print_symbol(fp, sym, str, printer_arg);
+		free((void *)str);
+		break;
+	default:
+		str = sym_get_string_value(sym);
+		printer->print_symbol(fp, sym, str, printer_arg);
 	}
 }
 
+static void
+conf_write_heading(FILE *fp, struct conf_printer *printer, void *printer_arg)
+{
+	char buf[256];
+
+	snprintf(buf, sizeof(buf),
+	    "\n"
+	    "Automatically generated file; DO NOT EDIT.\n"
+	    "%s\n",
+	    rootmenu.prompt->text);
+
+	printer->print_comment(fp, buf, printer_arg);
+}
+
 /*
  * Write out a minimal config.
  * All values that has default values are skipped as this is redundant.
@@ -530,7 +705,7 @@ int conf_write_defconfig(const char *filename)
 						goto next_menu;
 				}
 			}
-			conf_write_symbol(sym, out, true);
+			conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
 		}
 next_menu:
 		if (menu->list != NULL) {
@@ -598,11 +773,7 @@ int conf_write(const char *name)
 	if (!out)
 		return 1;
 
-	fprintf(out, _("#\n"
-		       "# Automatically generated make config: don't edit\n"
-		       "# %s\n"
-		       "#\n"),
-		     rootmenu.prompt->text);
+	conf_write_heading(out, &kconfig_printer_cb, NULL);
 
 	if (!conf_get_changed())
 		sym_clear_all_valid();
@@ -623,8 +794,8 @@ int conf_write(const char *name)
 			if (!(sym->flags & SYMBOL_WRITE))
 				goto next;
 			sym->flags &= ~SYMBOL_WRITE;
-			/* Write config symbol to file */
-			conf_write_symbol(sym, out, true);
+
+			conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
 		}
 
 next:
@@ -788,7 +959,6 @@ static int conf_split_config(void)
 int conf_write_autoconf(void)
 {
 	struct symbol *sym;
-	const char *str;
 	const char *name;
 	FILE *out, *tristate, *out_h;
 	int i;
@@ -830,68 +1000,23 @@ int conf_write_autoconf(void)
 		return 1;
 	}
 
-	fprintf(out, "#\n"
-		     "# Automatically generated make config: don't edit\n"
-		     "# %s\n"
-		     "#\n",
-		     rootmenu.prompt->text);
-	fprintf(tristate, "#\n"
-			  "# Automatically generated - do not edit\n"
-			  "\n");
-	fprintf(out_h, "/*\n"
-		       " * Automatically generated C config: don't edit\n"
-		       " * %s\n"
-		       " */\n",
-		       rootmenu.prompt->text);
+	conf_write_heading(out, &kconfig_printer_cb, NULL);
+
+	conf_write_heading(tristate, &tristate_printer_cb, NULL);
+
+	conf_write_heading(out_h, &header_printer_cb, NULL);
 
 	for_all_symbols(i, sym) {
 		sym_calc_value(sym);
 		if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
 			continue;
 
-		/* write symbol to config file */
-		conf_write_symbol(sym, out, false);
+		/* write symbol to auto.conf, tristate and header files */
+		conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
 
-		/* update autoconf and tristate files */
-		switch (sym->type) {
-		case S_BOOLEAN:
-		case S_TRISTATE:
-			switch (sym_get_tristate_value(sym)) {
-			case no:
-				break;
-			case mod:
-				fprintf(tristate, "%s=M\n",
-				    sym->name);
-				fprintf(out_h, "#define %s_MODULE 1\n",
-				    sym->name);
-				break;
-			case yes:
-				if (sym->type == S_TRISTATE)
-					fprintf(tristate,"%s=Y\n",
-					    sym->name);
-				fprintf(out_h, "#define %s 1\n",
-				    sym->name);
-				break;
-			}
-			break;
-		case S_STRING:
-			conf_write_string(true, sym->name, sym_get_string_value(sym), out_h);
-			break;
-		case S_HEX:
-			str = sym_get_string_value(sym);
-			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-				fprintf(out_h, "#define %s 0x%s\n",
-				    sym->name, str);
-				break;
-			}
-		case S_INT:
-			str = sym_get_string_value(sym);
-			fprintf(out_h, "#define %s %s\n",
-			    sym->name, str);
-			break;
-		default:
-			break;
-		}
+		conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
+
+		conf_write_symbol(out_h, sym, &header_printer_cb, NULL);
 	}
 	fclose(out);
 	fclose(tristate);
diff --git a/support/kconfig/expr.c b/support/kconfig/expr.c
index c5182f4d43..bf776b6e90 100644
--- a/support/kconfig/expr.c
+++ b/support/kconfig/expr.c
@@ -7,15 +7,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 #define DEBUG_EXPR	0
 
 struct expr *expr_alloc_symbol(struct symbol *sym)
 {
-	struct expr *e = malloc(sizeof(*e));
-	memset(e, 0, sizeof(*e));
+	struct expr *e = xcalloc(1, sizeof(*e));
 	e->type = E_SYMBOL;
 	e->left.sym = sym;
 	return e;
@@ -23,8 +21,7 @@ struct expr *expr_alloc_symbol(struct symbol *sym)
 
 struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)
 {
-	struct expr *e = malloc(sizeof(*e));
-	memset(e, 0, sizeof(*e));
+	struct expr *e = xcalloc(1, sizeof(*e));
 	e->type = type;
 	e->left.expr = ce;
 	return e;
@@ -32,8 +29,7 @@ struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)
 
 struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2)
 {
-	struct expr *e = malloc(sizeof(*e));
-	memset(e, 0, sizeof(*e));
+	struct expr *e = xcalloc(1, sizeof(*e));
 	e->type = type;
 	e->left.expr = e1;
 	e->right.expr = e2;
@@ -42,8 +38,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e
 
 struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2)
 {
-	struct expr *e = malloc(sizeof(*e));
-	memset(e, 0, sizeof(*e));
+	struct expr *e = xcalloc(1, sizeof(*e));
 	e->type = type;
 	e->left.sym = s1;
 	e->right.sym = s2;
@@ -71,7 +66,7 @@ struct expr *expr_copy(const struct expr *org)
 	if (!org)
 		return NULL;
 
-	e = malloc(sizeof(*org));
+	e = xmalloc(sizeof(*org));
 	memcpy(e, org, sizeof(*org));
 	switch (org->type) {
 	case E_SYMBOL:
diff --git a/support/kconfig/expr.h b/support/kconfig/expr.h
index 16bfae2d32..cdd48600e0 100644
--- a/support/kconfig/expr.h
+++ b/support/kconfig/expr.h
@@ -10,7 +10,9 @@
 extern "C" {
 #endif
 
+#include <assert.h>
 #include <stdio.h>
+#include "list.h"
 #ifndef __cplusplus
 #include <stdbool.h>
 #endif
@@ -172,7 +174,14 @@ struct menu {
 #define MENU_CHANGED		0x0001
 #define MENU_ROOT		0x0002
 
-#ifndef SWIG
+struct jump_key {
+	struct list_head entries;
+	size_t offset;
+	struct menu *target;
+	int index;
+};
+
+#define JUMP_NB			9
 
 extern struct file *file_list;
 extern struct file *current_file;
@@ -218,7 +227,6 @@ static inline int expr_is_no(struct expr *e)
 {
 	return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no);
 }
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/support/kconfig/gconf.c b/support/kconfig/gconf.c
index 79479c3239..7cbe68eb01 100644
--- a/support/kconfig/gconf.c
+++ b/support/kconfig/gconf.c
@@ -10,6 +10,7 @@
 #  include <config.h>
 #endif
 
+#include <stdlib.h>
 #include "lkc.h"
 #include "images.c"
 
@@ -22,7 +23,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <stdlib.h>
 
 //#define DEBUG
 
@@ -285,8 +285,6 @@ void init_left_tree(void)
 static void renderer_edited(GtkCellRendererText * cell,
 			    const gchar * path_string,
 			    const gchar * new_text, gpointer user_data);
-static void renderer_toggled(GtkCellRendererToggle * cellrenderertoggle,
-			     gchar * arg1, gpointer user_data);
 
 void init_right_tree(void)
 {
@@ -320,8 +318,6 @@ void init_right_tree(void)
 					    "inconsistent", COL_BTNINC,
 					    "visible", COL_BTNVIS,
 					    "radio", COL_BTNRAD, NULL);
-	/*g_signal_connect(G_OBJECT(renderer), "toggled",
-	   G_CALLBACK(renderer_toggled), NULL); */
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
 					renderer, FALSE);
@@ -687,7 +683,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
 	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
 					GTK_DIALOG_DESTROY_WITH_PARENT,
 					GTK_MESSAGE_INFO,
-					GTK_BUTTONS_CLOSE, intro_text);
+					GTK_BUTTONS_CLOSE, "%s", intro_text);
 	g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
 				 G_CALLBACK(gtk_widget_destroy),
 				 GTK_OBJECT(dialog));
@@ -705,7 +701,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
 	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
 					GTK_DIALOG_DESTROY_WITH_PARENT,
 					GTK_MESSAGE_INFO,
-					GTK_BUTTONS_CLOSE, about_text);
+					GTK_BUTTONS_CLOSE, "%s", about_text);
 	g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
 				 G_CALLBACK(gtk_widget_destroy),
 				 GTK_OBJECT(dialog));
@@ -724,7 +720,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
 	dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
 					GTK_DIALOG_DESTROY_WITH_PARENT,
 					GTK_MESSAGE_INFO,
-					GTK_BUTTONS_CLOSE, license_text);
+					GTK_BUTTONS_CLOSE, "%s", license_text);
 	g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
 				 G_CALLBACK(gtk_widget_destroy),
 				 GTK_OBJECT(dialog));
@@ -834,7 +830,7 @@ static void renderer_edited(GtkCellRendererText * cell,
 static void change_sym_value(struct menu *menu, gint col)
 {
 	struct symbol *sym = menu->sym;
-	tristate oldval, newval;
+	tristate newval;
 
 	if (!sym)
 		return;
@@ -851,7 +847,6 @@ static void change_sym_value(struct menu *menu, gint col)
 	switch (sym_get_type(sym)) {
 	case S_BOOLEAN:
 	case S_TRISTATE:
-		oldval = sym_get_tristate_value(sym);
 		if (!sym_tristate_within_range(sym, newval))
 			newval = yes;
 		sym_set_tristate_value(sym, newval);
@@ -888,35 +883,6 @@ static void toggle_sym_value(struct menu *menu)
 		display_tree_part();	//fixme: keep exp/coll
 }
 
-static void renderer_toggled(GtkCellRendererToggle * cell,
-			     gchar * path_string, gpointer user_data)
-{
-	GtkTreePath *path, *sel_path = NULL;
-	GtkTreeIter iter, sel_iter;
-	GtkTreeSelection *sel;
-	struct menu *menu;
-
-	path = gtk_tree_path_new_from_string(path_string);
-	if (!gtk_tree_model_get_iter(model2, &iter, path))
-		return;
-
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree2_w));
-	if (gtk_tree_selection_get_selected(sel, NULL, &sel_iter))
-		sel_path = gtk_tree_model_get_path(model2, &sel_iter);
-	if (!sel_path)
-		goto out1;
-	if (gtk_tree_path_compare(path, sel_path))
-		goto out2;
-
-	gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
-	toggle_sym_value(menu);
-
-      out2:
-	gtk_tree_path_free(sel_path);
-      out1:
-	gtk_tree_path_free(path);
-}
-
 static gint column2index(GtkTreeViewColumn * column)
 {
 	gint i;
@@ -1172,6 +1138,7 @@ static gchar **fill_row(struct menu *menu)
 			row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
 		if (sym_is_choice(sym))
 			break;
+		/* fall through */
 	case S_TRISTATE:
 		val = sym_get_tristate_value(sym);
 		switch (val) {
@@ -1310,7 +1277,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
 	gboolean valid;
 	GtkTreeIter *sibling;
 	struct symbol *sym;
-	struct property *prop;
 	struct menu *menu1, *menu2;
 
 	if (src == &rootmenu)
@@ -1319,7 +1285,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
 	valid = gtk_tree_model_iter_children(model2, child2, dst);
 	for (child1 = src->list; child1; child1 = child1->next) {
 
-		prop = child1->prompt;
 		sym = child1->sym;
 
 	      reparse:
@@ -1506,10 +1471,6 @@ int main(int ac, char *av[])
 	char *env;
 	gchar *glade_file;
 
-#ifndef LKC_DIRECT_LINK
-	kconfig_load();
-#endif
-
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
 	textdomain(PACKAGE);
diff --git a/support/kconfig/kconfig_load.c b/support/kconfig/kconfig_load.c
deleted file mode 100644
index dbdcaad823..0000000000
--- a/support/kconfig/kconfig_load.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "lkc.h"
-
-#define P(name,type,arg)	type (*name ## _p) arg
-#include "lkc_proto.h"
-#undef P
-
-void kconfig_load(void)
-{
-	void *handle;
-	char *error;
-
-	handle = dlopen("./libkconfig.so", RTLD_LAZY);
-	if (!handle) {
-		handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY);
-		if (!handle) {
-			fprintf(stderr, "%s\n", dlerror());
-			exit(1);
-		}
-	}
-
-#define P(name,type,arg)			\
-{						\
-	name ## _p = dlsym(handle, #name);	\
-        if ((error = dlerror()))  {		\
-                fprintf(stderr, "%s\n", error);	\
-		exit(1);			\
-	}					\
-}
-#include "lkc_proto.h"
-#undef P
-}
diff --git a/support/kconfig/kxgettext.c b/support/kconfig/kxgettext.c
index e9d8e791bf..2858738b22 100644
--- a/support/kconfig/kxgettext.c
+++ b/support/kconfig/kxgettext.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static char *escape(const char* text, char *bf, int len)
diff --git a/support/kconfig/list.h b/support/kconfig/list.h
new file mode 100644
index 0000000000..0ae730be5f
--- /dev/null
+++ b/support/kconfig/list.h
@@ -0,0 +1,91 @@
+#ifndef LIST_H
+#define LIST_H
+
+/*
+ * Copied from include/linux/...
+ */
+
+#undef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:        the pointer to the member.
+ * @type:       the type of the container struct this is embedded in.
+ * @member:     the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({                      \
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add(struct list_head *_new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = _new;
+	_new->next = next;
+	_new->prev = prev;
+	prev->next = _new;
+}
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *_new, struct list_head *head)
+{
+	__list_add(_new, head->prev, head);
+}
+
+#endif
diff --git a/support/kconfig/lkc.h b/support/kconfig/lkc.h
index e899066221..eeb6a905ac 100644
--- a/support/kconfig/lkc.h
+++ b/support/kconfig/lkc.h
@@ -21,12 +21,7 @@ static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c;
 extern "C" {
 #endif
 
-#ifdef LKC_DIRECT_LINK
 #define P(name,type,arg)	extern type name arg
-#else
-#include "lkc_defs.h"
-#define P(name,type,arg)	extern type (*name ## _p) arg
-#endif
 #include "lkc_proto.h"
 #undef P
 
@@ -44,6 +39,12 @@ extern "C" {
 #ifndef CONFIG_
 #define CONFIG_ "BR2_"
 #endif
+static inline const char *CONFIG_prefix(void)
+{
+	return getenv( "CONFIG_" ) ?: CONFIG_;
+}
+#undef CONFIG_
+#define CONFIG_ CONFIG_prefix()
 
 #define TF_COMMAND	0x0001
 #define TF_PARAM	0x0002
@@ -68,9 +69,7 @@ struct kconf_id {
 	enum symbol_type stype;
 };
 
-#ifdef YYDEBUG
 extern int zconfdebug;
-#endif
 
 int zconfparse(void);
 void zconfdump(FILE *out);
@@ -81,9 +80,6 @@ void zconf_nextfile(const char *name);
 int zconf_lineno(void);
 const char *zconf_curname(void);
 
-/* conf.c */
-void xfgets(char *str, int size, FILE *in);
-
 /* confdata.c */
 const char *conf_get_configname(void);
 const char *conf_get_autoconfig_name(void);
@@ -92,15 +88,19 @@ void sym_set_change_count(int count);
 void sym_add_change_count(int count);
 void conf_set_all_new_symbols(enum conf_def_mode mode);
 
+struct conf_printer {
+	void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
+	void (*print_comment)(FILE *, const char *, void *);
+};
+
 /* confdata.c and expr.c */
 static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
 {
-	if (fwrite(str, len, count, out) < count)
-		fprintf(stderr, "\nError in writing or end of file.\n");
-}
+	assert(len != 0);
 
-/* kconfig_load.c */
-void kconfig_load(void);
+	if (fwrite(str, len, count, out) != count)
+		fprintf(stderr, "Error in writing or end of file.\n");
+}
 
 /* menu.c */
 void _menu_init(void);
@@ -122,6 +122,8 @@ void menu_set_type(int type);
 /* util.c */
 struct file *file_lookup(const char *name);
 int file_write_dep(const char *name);
+void *xmalloc(size_t size);
+void *xcalloc(size_t nmemb, size_t size);
 
 struct gstr {
 	size_t len;
diff --git a/support/kconfig/lkc_proto.h b/support/kconfig/lkc_proto.h
index 17342fef38..ef1a7381f9 100644
--- a/support/kconfig/lkc_proto.h
+++ b/support/kconfig/lkc_proto.h
@@ -21,8 +21,10 @@ P(menu_get_root_menu,struct menu *,(struct menu *menu));
 P(menu_get_parent_menu,struct menu *,(struct menu *menu));
 P(menu_has_help,bool,(struct menu *menu));
 P(menu_get_help,const char *,(struct menu *menu));
-P(get_symbol_str, void, (struct gstr *r, struct symbol *sym));
-P(get_relations_str, struct gstr, (struct symbol **sym_arr));
+P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head
+			 *head));
+P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head
+				   *head));
 P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 
 /* symbol.c */
@@ -31,6 +33,7 @@ P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
 P(sym_lookup,struct symbol *,(const char *name, int flags));
 P(sym_find,struct symbol *,(const char *name));
 P(sym_expand_string_value,const char *,(const char *in));
+P(sym_escape_string_value, const char *,(const char *in));
 P(sym_re_search,struct symbol **,(const char *pattern));
 P(sym_type_name,const char *,(enum symbol_type type));
 P(sym_calc_value,void,(struct symbol *sym));
diff --git a/support/kconfig/lxdialog/check-lxdialog.sh b/support/kconfig/lxdialog/check-lxdialog.sh
index 969cd4cc0e..6f6fd9d5c8 100644
--- a/support/kconfig/lxdialog/check-lxdialog.sh
+++ b/support/kconfig/lxdialog/check-lxdialog.sh
@@ -4,7 +4,7 @@
 # What library to link
 ldflags()
 {
-	for ext in so a dylib ; do
+	for ext in so a dll.a dylib ; do
 		for lib in ncursesw ncurses curses ; do
 			$cc -print-file-name=lib${lib}.${ext} | grep -q /
 			if [ $? -eq 0 ]; then
@@ -19,12 +19,13 @@ ldflags()
 # Where is ncurses.h?
 ccflags()
 {
-	if [ -f /usr/include/ncurses/ncurses.h ]; then
+	if [ -f /usr/include/ncursesw/curses.h ]; then
+		echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+		echo ' -DNCURSES_WIDECHAR=1'
+	elif [ -f /usr/include/ncurses/ncurses.h ]; then
 		echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
 	elif [ -f /usr/include/ncurses/curses.h ]; then
 		echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
-	elif [ -f /usr/include/ncursesw/curses.h ]; then
-		echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
 	elif [ -f /usr/include/ncurses.h ]; then
 		echo '-DCURSES_LOC="<ncurses.h>"'
 	else
@@ -38,7 +39,7 @@ trap "rm -f $tmp" 0 1 2 3 15
 
 # Check if we can link to ncurses
 check() {
-        $cc -xc - -o $tmp 2>/dev/null <<'EOF'
+        $cc -x c - -o $tmp 2>/dev/null <<'EOF'
 #include CURSES_LOC
 main() {}
 EOF
diff --git a/support/kconfig/lxdialog/dialog.h b/support/kconfig/lxdialog/dialog.h
index b5211fce0d..307022a8be 100644
--- a/support/kconfig/lxdialog/dialog.h
+++ b/support/kconfig/lxdialog/dialog.h
@@ -144,6 +144,7 @@ struct dialog_info {
  */
 extern struct dialog_info dlg;
 extern char dialog_input_result[];
+extern int saved_x, saved_y;		/* Needed in signal handler in mconf.c */
 
 /*
  * Function prototypes
@@ -209,12 +210,17 @@ int first_alpha(const char *string, const char *exempt);
 int dialog_yesno(const char *title, const char *prompt, int height, int width);
 int dialog_msgbox(const char *title, const char *prompt, int height,
 		  int width, int pause);
-int dialog_textbox(const char *title, const char *file, int height, int width);
+
+
+typedef void (*update_text_fn)(char *buf, size_t start, size_t end, void
+			       *_data);
+int dialog_textbox(const char *title, char *tbuf, int initial_height,
+		   int initial_width, int *keys, int *_vscroll, int *_hscroll,
+		   update_text_fn update_text, void *data);
 int dialog_menu(const char *title, const char *prompt,
 		const void *selected, int *s_scroll);
 int dialog_checklist(const char *title, const char *prompt, int height,
 		     int width, int list_height);
-extern char dialog_input_result[];
 int dialog_inputbox(const char *title, const char *prompt, int height,
 		    int width, const char *init);
 
diff --git a/support/kconfig/lxdialog/inputbox.c b/support/kconfig/lxdialog/inputbox.c
index dd8e587c50..21404a04d7 100644
--- a/support/kconfig/lxdialog/inputbox.c
+++ b/support/kconfig/lxdialog/inputbox.c
@@ -45,7 +45,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
                     const char *init)
 {
 	int i, x, y, box_y, box_x, box_width;
-	int input_x = 0, scroll = 0, key = 0, button = -1;
+	int input_x = 0, key = 0, button = -1;
+	int show_x, len, pos;
 	char *instr = dialog_input_result;
 	WINDOW *dialog;
 
@@ -97,14 +98,17 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
 	wmove(dialog, box_y, box_x);
 	wattrset(dialog, dlg.inputbox.atr);
 
-	input_x = strlen(instr);
+	len = strlen(instr);
+	pos = len;
 
-	if (input_x >= box_width) {
-		scroll = input_x - box_width + 1;
+	if (len >= box_width) {
+		show_x = len - box_width + 1;
 		input_x = box_width - 1;
 		for (i = 0; i < box_width - 1; i++)
-			waddch(dialog, instr[scroll + i]);
+			waddch(dialog, instr[show_x + i]);
 	} else {
+		show_x = 0;
+		input_x = len;
 		waddstr(dialog, instr);
 	}
 
@@ -121,45 +125,104 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
 			case KEY_UP:
 			case KEY_DOWN:
 				break;
-			case KEY_LEFT:
-				continue;
-			case KEY_RIGHT:
-				continue;
 			case KEY_BACKSPACE:
 			case 127:
-				if (input_x || scroll) {
+				if (pos) {
 					wattrset(dialog, dlg.inputbox.atr);
-					if (!input_x) {
-						scroll = scroll < box_width - 1 ? 0 : scroll - (box_width - 1);
-						wmove(dialog, box_y, box_x);
-						for (i = 0; i < box_width; i++)
-							waddch(dialog,
-							       instr[scroll + input_x + i] ?
-							       instr[scroll + input_x + i] : ' ');
-						input_x = strlen(instr) - scroll;
+					if (input_x == 0) {
+						show_x--;
 					} else
 						input_x--;
-					instr[scroll + input_x] = '\0';
-					mvwaddch(dialog, box_y, input_x + box_x, ' ');
+
+					if (pos < len) {
+						for (i = pos - 1; i < len; i++) {
+							instr[i] = instr[i+1];
+						}
+					}
+
+					pos--;
+					len--;
+					instr[len] = '\0';
+					wmove(dialog, box_y, box_x);
+					for (i = 0; i < box_width; i++) {
+						if (!instr[show_x + i]) {
+							waddch(dialog, ' ');
+							break;
+						}
+						waddch(dialog, instr[show_x + i]);
+					}
 					wmove(dialog, box_y, input_x + box_x);
 					wrefresh(dialog);
 				}
 				continue;
+			case KEY_LEFT:
+				if (pos > 0) {
+					if (input_x > 0) {
+						wmove(dialog, box_y, --input_x + box_x);
+					} else if (input_x == 0) {
+						show_x--;
+						wmove(dialog, box_y, box_x);
+						for (i = 0; i < box_width; i++) {
+							if (!instr[show_x + i]) {
+								waddch(dialog, ' ');
+								break;
+							}
+							waddch(dialog, instr[show_x + i]);
+						}
+						wmove(dialog, box_y, box_x);
+					}
+					pos--;
+				}
+				continue;
+			case KEY_RIGHT:
+				if (pos < len) {
+					if (input_x < box_width - 1) {
+						wmove(dialog, box_y, ++input_x + box_x);
+					} else if (input_x == box_width - 1) {
+						show_x++;
+						wmove(dialog, box_y, box_x);
+						for (i = 0; i < box_width; i++) {
+							if (!instr[show_x + i]) {
+								waddch(dialog, ' ');
+								break;
+							}
+							waddch(dialog, instr[show_x + i]);
+						}
+						wmove(dialog, box_y, input_x + box_x);
+					}
+					pos++;
+				}
+				continue;
 			default:
 				if (key < 0x100 && isprint(key)) {
-					if (scroll + input_x < MAX_LEN) {
+					if (len < MAX_LEN) {
 						wattrset(dialog, dlg.inputbox.atr);
-						instr[scroll + input_x] = key;
-						instr[scroll + input_x + 1] = '\0';
+						if (pos < len) {
+							for (i = len; i > pos; i--)
+								instr[i] = instr[i-1];
+							instr[pos] = key;
+						} else {
+							instr[len] = key;
+						}
+						pos++;
+						len++;
+						instr[len] = '\0';
+
 						if (input_x == box_width - 1) {
-							scroll++;
-							wmove(dialog, box_y, box_x);
-							for (i = 0; i < box_width - 1; i++)
-								waddch(dialog, instr [scroll + i]);
+							show_x++;
 						} else {
-							wmove(dialog, box_y, input_x++ + box_x);
-							waddch(dialog, key);
+							input_x++;
+						}
+
+						wmove(dialog, box_y, box_x);
+						for (i = 0; i < box_width; i++) {
+							if (!instr[show_x + i]) {
+								waddch(dialog, ' ');
+								break;
+							}
+							waddch(dialog, instr[show_x + i]);
 						}
+						wmove(dialog, box_y, input_x + box_x);
 						wrefresh(dialog);
 					} else
 						flash();	/* Alarm user about overflow */
diff --git a/support/kconfig/lxdialog/menubox.c b/support/kconfig/lxdialog/menubox.c
index 1d604738fa..48d382e7e3 100644
--- a/support/kconfig/lxdialog/menubox.c
+++ b/support/kconfig/lxdialog/menubox.c
@@ -26,7 +26,7 @@
  *
  *    *)  A bugfix for the Page-Down problem
  *
- *    *)  Formerly when I used Page Down and Page Up, the cursor would be set 
+ *    *)  Formerly when I used Page Down and Page Up, the cursor would be set
  *        to the first position in the menu box.  Now lxdialog is a bit
  *        smarter and works more like other menu systems (just have a look at
  *        it).
@@ -154,12 +154,14 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
  */
 static void print_buttons(WINDOW * win, int height, int width, int selected)
 {
-	int x = width / 2 - 16;
+	int x = width / 2 - 28;
 	int y = height - 2;
 
 	print_button(win, gettext("Select"), y, x, selected == 0);
 	print_button(win, gettext(" Exit "), y, x + 12, selected == 1);
 	print_button(win, gettext(" Help "), y, x + 24, selected == 2);
+	print_button(win, gettext(" Save "), y, x + 36, selected == 3);
+	print_button(win, gettext(" Load "), y, x + 48, selected == 4);
 
 	wmove(win, y, x + 1 + 12 * selected);
 	wrefresh(win);
@@ -372,7 +374,7 @@ int dialog_menu(const char *title, const char *prompt,
 		case TAB:
 		case KEY_RIGHT:
 			button = ((key == KEY_LEFT ? --button : ++button) < 0)
-			    ? 2 : (button > 2 ? 0 : button);
+			    ? 4 : (button > 4 ? 0 : button);
 
 			print_buttons(dialog, height, width, button);
 			wrefresh(menu);
@@ -399,17 +401,17 @@ int dialog_menu(const char *title, const char *prompt,
 				return 2;
 			case 's':
 			case 'y':
-				return 3;
+				return 5;
 			case 'n':
-				return 4;
+				return 6;
 			case 'm':
-				return 5;
+				return 7;
 			case ' ':
-				return 6;
+				return 8;
 			case '/':
-				return 7;
+				return 9;
 			case 'z':
-				return 8;
+				return 10;
 			case '\n':
 				return button;
 			}
diff --git a/support/kconfig/lxdialog/textbox.c b/support/kconfig/lxdialog/textbox.c
index c704712d02..a48bb93e09 100644
--- a/support/kconfig/lxdialog/textbox.c
+++ b/support/kconfig/lxdialog/textbox.c
@@ -22,23 +22,25 @@
 #include "dialog.h"
 
 static void back_lines(int n);
-static void print_page(WINDOW * win, int height, int width);
-static void print_line(WINDOW * win, int row, int width);
+static void print_page(WINDOW *win, int height, int width, update_text_fn
+		       update_text, void *data);
+static void print_line(WINDOW *win, int row, int width);
 static char *get_line(void);
 static void print_position(WINDOW * win);
 
 static int hscroll;
 static int begin_reached, end_reached, page_length;
-static const char *buf;
-static const char *page;
+static char *buf;
+static char *page;
 
 /*
  * refresh window content
  */
 static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
-							  int cur_y, int cur_x)
+			     int cur_y, int cur_x, update_text_fn update_text,
+			     void *data)
 {
-	print_page(box, boxh, boxw);
+	print_page(box, boxh, boxw, update_text, data);
 	print_position(dialog);
 	wmove(dialog, cur_y, cur_x);	/* Restore cursor position */
 	wrefresh(dialog);
@@ -47,14 +49,18 @@ static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
 
 /*
  * Display text from a file in a dialog box.
+ *
+ * keys is a null-terminated array
+ * update_text() may not add or remove any '\n' or '\0' in tbuf
  */
-int dialog_textbox(const char *title, const char *tbuf,
-		   int initial_height, int initial_width)
+int dialog_textbox(const char *title, char *tbuf, int initial_height,
+		   int initial_width, int *keys, int *_vscroll, int *_hscroll,
+		   update_text_fn update_text, void *data)
 {
 	int i, x, y, cur_x, cur_y, key = 0;
 	int height, width, boxh, boxw;
-	int passed_end;
 	WINDOW *dialog, *box;
+	bool done = false;
 
 	begin_reached = 1;
 	end_reached = 0;
@@ -63,6 +69,15 @@ int dialog_textbox(const char *title, const char *tbuf,
 	buf = tbuf;
 	page = buf;	/* page is pointer to start of page to be displayed */
 
+	if (_vscroll && *_vscroll) {
+		begin_reached = 0;
+
+		for (i = 0; i < *_vscroll; i++)
+			get_line();
+	}
+	if (_hscroll)
+		hscroll = *_hscroll;
+
 do_resize:
 	getmaxyx(stdscr, height, width);
 	if (height < 8 || width < 8)
@@ -120,25 +135,28 @@ int dialog_textbox(const char *title, const char *tbuf,
 
 	/* Print first page of text */
 	attr_clear(box, boxh, boxw, dlg.dialog.atr);
-	refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x);
+	refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x, update_text,
+			 data);
 
-	while ((key != KEY_ESC) && (key != '\n')) {
+	while (!done) {
 		key = wgetch(dialog);
 		switch (key) {
 		case 'E':	/* Exit */
 		case 'e':
 		case 'X':
 		case 'x':
-			delwin(box);
-			delwin(dialog);
-			return 0;
+		case 'q':
+		case '\n':
+			done = true;
+			break;
 		case 'g':	/* First page */
 		case KEY_HOME:
 			if (!begin_reached) {
 				begin_reached = 1;
 				page = buf;
 				refresh_text_box(dialog, box, boxh, boxw,
-						 cur_y, cur_x);
+						 cur_y, cur_x, update_text,
+						 data);
 			}
 			break;
 		case 'G':	/* Last page */
@@ -148,78 +166,48 @@ int dialog_textbox(const char *title, const char *tbuf,
 			/* point to last char in buf */
 			page = buf + strlen(buf);
 			back_lines(boxh);
-			refresh_text_box(dialog, box, boxh, boxw,
-					 cur_y, cur_x);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case 'K':	/* Previous line */
 		case 'k':
 		case KEY_UP:
-			if (!begin_reached) {
-				back_lines(page_length + 1);
-
-				/* We don't call print_page() here but use
-				 * scrolling to ensure faster screen update.
-				 * However, 'end_reached' and 'page_length'
-				 * should still be updated, and 'page' should
-				 * point to start of next page. This is done
-				 * by calling get_line() in the following
-				 * 'for' loop. */
-				scrollok(box, TRUE);
-				wscrl(box, -1);	/* Scroll box region down one line */
-				scrollok(box, FALSE);
-				page_length = 0;
-				passed_end = 0;
-				for (i = 0; i < boxh; i++) {
-					if (!i) {
-						/* print first line of page */
-						print_line(box, 0, boxw);
-						wnoutrefresh(box);
-					} else
-						/* Called to update 'end_reached' and 'page' */
-						get_line();
-					if (!passed_end)
-						page_length++;
-					if (end_reached && !passed_end)
-						passed_end = 1;
-				}
+			if (begin_reached)
+				break;
 
-				print_position(dialog);
-				wmove(dialog, cur_y, cur_x);	/* Restore cursor position */
-				wrefresh(dialog);
-			}
+			back_lines(page_length + 1);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case 'B':	/* Previous page */
 		case 'b':
+		case 'u':
 		case KEY_PPAGE:
 			if (begin_reached)
 				break;
 			back_lines(page_length + boxh);
-			refresh_text_box(dialog, box, boxh, boxw,
-					 cur_y, cur_x);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case 'J':	/* Next line */
 		case 'j':
 		case KEY_DOWN:
-			if (!end_reached) {
-				begin_reached = 0;
-				scrollok(box, TRUE);
-				scroll(box);	/* Scroll box region up one line */
-				scrollok(box, FALSE);
-				print_line(box, boxh - 1, boxw);
-				wnoutrefresh(box);
-				print_position(dialog);
-				wmove(dialog, cur_y, cur_x);	/* Restore cursor position */
-				wrefresh(dialog);
-			}
+			if (end_reached)
+				break;
+
+			back_lines(page_length - 1);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case KEY_NPAGE:	/* Next page */
 		case ' ':
+		case 'd':
 			if (end_reached)
 				break;
 
 			begin_reached = 0;
-			refresh_text_box(dialog, box, boxh, boxw,
-					 cur_y, cur_x);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case '0':	/* Beginning of line */
 		case 'H':	/* Scroll left */
@@ -234,8 +222,8 @@ int dialog_textbox(const char *title, const char *tbuf,
 				hscroll--;
 			/* Reprint current page to scroll horizontally */
 			back_lines(page_length);
-			refresh_text_box(dialog, box, boxh, boxw,
-					 cur_y, cur_x);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case 'L':	/* Scroll right */
 		case 'l':
@@ -245,11 +233,12 @@ int dialog_textbox(const char *title, const char *tbuf,
 			hscroll++;
 			/* Reprint current page to scroll horizontally */
 			back_lines(page_length);
-			refresh_text_box(dialog, box, boxh, boxw,
-					 cur_y, cur_x);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
 			break;
 		case KEY_ESC:
-			key = on_key_esc(dialog);
+			if (on_key_esc(dialog) == KEY_ESC)
+				done = true;
 			break;
 		case KEY_RESIZE:
 			back_lines(height);
@@ -257,11 +246,31 @@ int dialog_textbox(const char *title, const char *tbuf,
 			delwin(dialog);
 			on_key_resize();
 			goto do_resize;
+		default:
+			for (i = 0; keys[i]; i++) {
+				if (key == keys[i]) {
+					done = true;
+					break;
+				}
+			}
 		}
 	}
 	delwin(box);
 	delwin(dialog);
-	return key;		/* ESC pressed */
+	if (_vscroll) {
+		const char *s;
+
+		s = buf;
+		*_vscroll = 0;
+		back_lines(page_length);
+		while (s < page && (s = strchr(s, '\n'))) {
+			(*_vscroll)++;
+			s++;
+		}
+	}
+	if (_hscroll)
+		*_hscroll = hscroll;
+	return key;
 }
 
 /*
@@ -298,12 +307,23 @@ static void back_lines(int n)
 }
 
 /*
- * Print a new page of text. Called by dialog_textbox().
+ * Print a new page of text.
  */
-static void print_page(WINDOW * win, int height, int width)
+static void print_page(WINDOW *win, int height, int width, update_text_fn
+		       update_text, void *data)
 {
 	int i, passed_end = 0;
 
+	if (update_text) {
+		char *end;
+
+		for (i = 0; i < height; i++)
+			get_line();
+		end = page;
+		back_lines(height);
+		update_text(buf, page - buf, end - buf, data);
+	}
+
 	page_length = 0;
 	for (i = 0; i < height; i++) {
 		print_line(win, i, width);
@@ -316,11 +336,10 @@ static void print_page(WINDOW * win, int height, int width)
 }
 
 /*
- * Print a new line of text. Called by dialog_textbox() and print_page().
+ * Print a new line of text.
  */
 static void print_line(WINDOW * win, int row, int width)
 {
-	int y, x;
 	char *line;
 
 	line = get_line();
@@ -329,10 +348,10 @@ static void print_line(WINDOW * win, int row, int width)
 	waddch(win, ' ');
 	waddnstr(win, line, MIN(strlen(line), width - 2));
 
-	getyx(win, y, x);
 	/* Clear 'residue' of previous line */
 #if OLD_NCURSES
 	{
+		int x = getcurx(win);
 		int i;
 		for (i = 0; i < width - x; i++)
 			waddch(win, ' ');
@@ -355,10 +374,8 @@ static char *get_line(void)
 	end_reached = 0;
 	while (*page != '\n') {
 		if (*page == '\0') {
-			if (!end_reached) {
-				end_reached = 1;
-				break;
-			}
+			end_reached = 1;
+			break;
 		} else if (i < MAX_LEN)
 			line[i++] = *(page++);
 		else {
@@ -371,7 +388,7 @@ static char *get_line(void)
 	if (i <= MAX_LEN)
 		line[i] = '\0';
 	if (!end_reached)
-		page++;		/* move pass '\n' */
+		page++;		/* move past '\n' */
 
 	return line;
 }
diff --git a/support/kconfig/lxdialog/util.c b/support/kconfig/lxdialog/util.c
index f2375ad7eb..109d53117d 100644
--- a/support/kconfig/lxdialog/util.c
+++ b/support/kconfig/lxdialog/util.c
@@ -23,6 +23,9 @@
 
 #include "dialog.h"
 
+/* Needed in signal handler in mconf.c */
+int saved_x, saved_y;
+
 struct dialog_info dlg;
 
 static void set_mono_theme(void)
@@ -273,6 +276,10 @@ int init_dialog(const char *backtitle)
 	int height, width;
 
 	initscr();		/* Init curses */
+
+	/* Get current cursor position for signal handler in mconf.c */
+	getyx(stdscr, saved_y, saved_x);
+
 	getmaxyx(stdscr, height, width);
 	if (height < 19 || width < 80) {
 		endwin();
diff --git a/support/kconfig/mconf.c b/support/kconfig/mconf.c
index 3ed8a25300..fa61759aa9 100644
--- a/support/kconfig/mconf.c
+++ b/support/kconfig/mconf.c
@@ -15,10 +15,10 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
 #include <locale.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 #include "lxdialog/dialog.h"
 
@@ -105,10 +105,10 @@ static const char mconf_readme[] = N_(
 "Text Box    (Help Window)\n"
 "--------\n"
 "o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <SPACE BAR> and <B> for those\n"
-"   who are familiar with less and lynx.\n"
+"   keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n"
+"   those who are familiar with less and lynx.\n"
 "\n"
-"o  Press <E>, <X>, <Enter> or <Esc><Esc> to exit.\n"
+"o  Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
 "\n"
 "\n"
 "Alternate Configuration Files\n"
@@ -236,16 +236,19 @@ search_help[] = N_(
 	"Result:\n"
 	"-----------------------------------------------------------------\n"
 	"Symbol: FOO [=m]\n"
+	"Type  : tristate\n"
 	"Prompt: Foo bus is used to drive the bar HW\n"
-	"Defined at drivers/pci/Kconfig:47\n"
-	"Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
-	"Location:\n"
-	"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
-	"    -> PCI support (PCI [=y])\n"
-	"      -> PCI access mode (<choice> [=y])\n"
-	"Selects: LIBCRC32\n"
-	"Selected by: BAR\n"
+	"  Defined at drivers/pci/Kconfig:47\n"
+	"  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+	"  Location:\n"
+	"    -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
+	"      -> PCI support (PCI [=y])\n"
+	"(1)     -> PCI access mode (<choice> [=y])\n"
+	"  Selects: LIBCRC32\n"
+	"  Selected by: BAR\n"
 	"-----------------------------------------------------------------\n"
+	"o The line 'Type:' shows the type of the configuration option for\n"
+	"  this symbol (boolean, tristate, string, ...)\n"
 	"o The line 'Prompt:' shows the text used in the menu structure for\n"
 	"  this symbol\n"
 	"o The 'Defined at' line tell at what file / line number the symbol\n"
@@ -254,8 +257,12 @@ search_help[] = N_(
 	"  this symbol to be visible in the menu (selectable)\n"
 	"o The 'Location:' lines tell where in the menu structure this symbol\n"
 	"  is located\n"
-	"    A location followed by a [=y] indicate that this is a selectable\n"
-	"    menu item - and current value is displayed inside brackets.\n"
+	"    A location followed by a [=y] indicates that this is a\n"
+	"    selectable menu item - and the current value is displayed inside\n"
+	"    brackets.\n"
+	"    Press the key in the (#) prefix to jump directly to that\n"
+	"    location. You will be returned to the current search results\n"
+	"    after exiting this new menu.\n"
 	"o The 'Selects:' line tell what symbol will be automatically\n"
 	"  selected if this symbol is selected (y or m)\n"
 	"o The 'Selected by' line tell what symbol has selected this symbol\n"
@@ -273,12 +280,16 @@ static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
 static int show_all_options;
+static int save_and_exit;
 
-static void conf(struct menu *menu);
+static void conf(struct menu *menu, struct menu *active_menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
 static void conf_load(void);
 static void conf_save(void);
+static int show_textbox_ext(const char *title, char *text, int r, int c,
+			    int *keys, int *vscroll, int *hscroll,
+			    update_text_fn update_text, void *data);
 static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
@@ -301,17 +312,56 @@ static void set_config_filename(const char *config_filename)
 }
 
 
+struct search_data {
+	struct list_head *head;
+	struct menu **targets;
+	int *keys;
+};
+
+static void update_text(char *buf, size_t start, size_t end, void *_data)
+{
+	struct search_data *data = _data;
+	struct jump_key *pos;
+	int k = 0;
+
+	list_for_each_entry(pos, data->head, entries) {
+		if (pos->offset >= start && pos->offset < end) {
+			char header[4];
+
+			if (k < JUMP_NB) {
+				int key = '0' + (pos->index % JUMP_NB) + 1;
+
+				sprintf(header, "(%c)", key);
+				data->keys[k] = key;
+				data->targets[k] = pos->target;
+				k++;
+			} else {
+				sprintf(header, "   ");
+			}
+
+			memcpy(buf + pos->offset, header, sizeof(header) - 1);
+		}
+	}
+	data->keys[k] = 0;
+}
+
 static void search_conf(void)
 {
 	struct symbol **sym_arr;
 	struct gstr res;
+	struct gstr title;
 	char *dialog_input;
-	int dres;
+	int dres, vscroll = 0, hscroll = 0;
+	bool again;
+
+	title = str_new();
+	str_printf( &title, _("Enter %s (sub)string to search for "
+			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
+
 again:
 	dialog_clear();
 	dres = dialog_inputbox(_("Search Configuration Parameter"),
-			      _("Enter " CONFIG_ " (sub)string to search for "
-				"(with or without \"" CONFIG_ "\")"),
+			      str_get(&title),
 			      10, 75, "");
 	switch (dres) {
 	case 0:
@@ -320,6 +370,7 @@ static void search_conf(void)
 		show_helptext(_("Search Configuration"), search_help);
 		goto again;
 	default:
+		str_free(&title);
 		return;
 	}
 
@@ -329,10 +380,31 @@ static void search_conf(void)
 		dialog_input += strlen(CONFIG_);
 
 	sym_arr = sym_re_search(dialog_input);
-	res = get_relations_str(sym_arr);
+	do {
+		LIST_HEAD(head);
+		struct menu *targets[JUMP_NB];
+		int keys[JUMP_NB + 1], i;
+		struct search_data data = {
+			.head = &head,
+			.targets = targets,
+			.keys = keys,
+		};
+
+		res = get_relations_str(sym_arr, &head);
+		dres = show_textbox_ext(_("Search Results"), (char *)
+					str_get(&res), 0, 0, keys, &vscroll,
+					&hscroll, &update_text, (void *)
+					&data);
+		again = false;
+		for (i = 0; i < JUMP_NB && keys[i]; i++)
+			if (dres == keys[i]) {
+				conf(targets[i]->parent, targets[i]);
+				again = true;
+			}
+		str_free(&res);
+	} while (again);
 	free(sym_arr);
-	show_textbox(_("Search Results"), str_get(&res), 0, 0);
-	str_free(&res);
+	str_free(&title);
 }
 
 static void build_conf(struct menu *menu)
@@ -513,12 +585,11 @@ static void build_conf(struct menu *menu)
 	indent -= doint;
 }
 
-static void conf(struct menu *menu)
+static void conf(struct menu *menu, struct menu *active_menu)
 {
 	struct menu *submenu;
 	const char *prompt = menu_get_prompt(menu);
 	struct symbol *sym;
-	struct menu *active_menu = NULL;
 	int res;
 	int s_scroll = 0;
 
@@ -528,14 +599,6 @@ static void conf(struct menu *menu)
 		build_conf(menu);
 		if (!child_count)
 			break;
-		if (menu == &rootmenu) {
-			item_make("--- ");
-			item_set_tag(':');
-			item_make(_("    Load an Alternate Configuration File"));
-			item_set_tag('L');
-			item_make(_("    Save an Alternate Configuration File"));
-			item_set_tag('S');
-		}
 		dialog_clear();
 		res = dialog_menu(prompt ? _(prompt) : _("Main Menu"),
 				  _(menu_instructions),
@@ -561,23 +624,17 @@ static void conf(struct menu *menu)
 				if (single_menu_mode)
 					submenu->data = (void *) (long) !submenu->data;
 				else
-					conf(submenu);
+					conf(submenu, NULL);
 				break;
 			case 't':
 				if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
 					conf_choice(submenu);
 				else if (submenu->prompt->type == P_MENU)
-					conf(submenu);
+					conf(submenu, NULL);
 				break;
 			case 's':
 				conf_string(submenu);
 				break;
-			case 'L':
-				conf_load();
-				break;
-			case 'S':
-				conf_save();
-				break;
 			}
 			break;
 		case 2:
@@ -587,6 +644,12 @@ static void conf(struct menu *menu)
 				show_helptext(_("README"), _(mconf_readme));
 			break;
 		case 3:
+			conf_save();
+			break;
+		case 4:
+			conf_load();
+			break;
+		case 5:
 			if (item_is_tag('t')) {
 				if (sym_set_tristate_value(sym, yes))
 					break;
@@ -594,34 +657,43 @@ static void conf(struct menu *menu)
 					show_textbox(NULL, setmod_text, 6, 74);
 			}
 			break;
-		case 4:
+		case 6:
 			if (item_is_tag('t'))
 				sym_set_tristate_value(sym, no);
 			break;
-		case 5:
+		case 7:
 			if (item_is_tag('t'))
 				sym_set_tristate_value(sym, mod);
 			break;
-		case 6:
+		case 8:
 			if (item_is_tag('t'))
 				sym_toggle_tristate_value(sym);
 			else if (item_is_tag('m'))
-				conf(submenu);
+				conf(submenu, NULL);
 			break;
-		case 7:
+		case 9:
 			search_conf();
 			break;
-		case 8:
+		case 10:
 			show_all_options = !show_all_options;
 			break;
 		}
 	}
 }
 
-static void show_textbox(const char *title, const char *text, int r, int c)
+static int show_textbox_ext(const char *title, char *text, int r, int c, int
+			    *keys, int *vscroll, int *hscroll, update_text_fn
+			    update_text, void *data)
 {
 	dialog_clear();
-	dialog_textbox(title, text, r, c);
+	return dialog_textbox(title, text, r, c, keys, vscroll, hscroll,
+			      update_text, data);
+}
+
+static void show_textbox(const char *title, const char *text, int r, int c)
+{
+	show_textbox_ext(title, (char *) text, r, c, (int []) {0}, NULL, NULL,
+			 NULL, NULL);
 }
 
 static void show_helptext(const char *title, const char *text)
@@ -629,6 +701,17 @@ static void show_helptext(const char *title, const char *text)
 	show_textbox(title, text, 0, 0);
 }
 
+static void conf_message_callback(const char *fmt, va_list ap)
+{
+	char buf[PATH_MAX+1];
+
+	vsnprintf(buf, sizeof(buf), fmt, ap);
+	if (save_and_exit)
+		printf("%s", buf);
+	else
+		show_textbox(NULL, buf, 6, 60);
+}
+
 static void show_help(struct menu *menu)
 {
 	struct gstr help = str_new();
@@ -793,9 +876,57 @@ static void conf_save(void)
 	}
 }
 
+static int handle_exit(void)
+{
+	int res;
+
+	save_and_exit = 1;
+	dialog_clear();
+	if (conf_get_changed())
+		res = dialog_yesno(NULL,
+				   _("Do you wish to save your new configuration ?\n"
+				     "<ESC><ESC> to continue."),
+				   6, 60);
+	else
+		res = -1;
+
+	end_dialog(saved_x, saved_y);
+
+	switch (res) {
+	case 0:
+		if (conf_write(filename)) {
+			fprintf(stderr, _("\n\n"
+					  "Error while writing of the configuration.\n"
+					  "Your configuration changes were NOT saved."
+					  "\n\n"));
+			return 1;
+		}
+		/* fall through */
+	case -1:
+		printf(_("\n\n"
+			 "*** End of the configuration.\n"
+			 "*** Execute 'make' to start the build or try 'make help'."
+			 "\n\n"));
+		res = 0;
+		break;
+	default:
+		fprintf(stderr, _("\n\n"
+				  "Your configuration changes were NOT saved."
+				  "\n\n"));
+		if (res != KEY_ESC)
+			res = 0;
+	}
+
+	return res;
+}
+
+static void sig_handler(int signo)
+{
+	exit(handle_exit());
+}
+
 int main(int ac, char **av)
 {
-	int saved_x, saved_y;
 	char *mode;
 	int res;
 
@@ -803,6 +934,8 @@ int main(int ac, char **av)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	signal(SIGINT, sig_handler);
+
 	conf_parse(av[1]);
 	conf_read(NULL);
 
@@ -812,9 +945,6 @@ int main(int ac, char **av)
 			single_menu_mode = 1;
 	}
 
-	initscr();
-
-	getyx(stdscr, saved_y, saved_x);
 	if (init_dialog(NULL)) {
 		fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
 		fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
@@ -822,41 +952,12 @@ int main(int ac, char **av)
 	}
 
 	set_config_filename(conf_get_configname());
+	conf_set_message_callback(conf_message_callback);
 	do {
-		conf(&rootmenu);
-		dialog_clear();
-		if (conf_get_changed())
-			res = dialog_yesno(NULL,
-					   _("Do you wish to save your "
-					     "new configuration?\n"
-					     "<ESC><ESC> to continue."),
-					   6, 60);
-		else
-			res = -1;
+		conf(&rootmenu, NULL);
+		res = handle_exit();
 	} while (res == KEY_ESC);
-	end_dialog(saved_x, saved_y);
-
-	switch (res) {
-	case 0:
-		if (conf_write(filename)) {
-			fprintf(stderr, _("\n\n"
-				"Error while writing of the configuration.\n"
-				"Your configuration changes were NOT saved."
-				"\n\n"));
-			return 1;
-		}
-	case -1:
-		printf(_("\n\n"
-			"*** End of the configuration.\n"
-			"*** Execute 'make' to start the build or try 'make help'."
-			"\n\n"));
-		break;
-	default:
-		fprintf(stderr, _("\n\n"
-			"Your configuration changes were NOT saved."
-			"\n\n"));
-	}
 
-	return 0;
+	return res;
 }
 
diff --git a/support/kconfig/menu.c b/support/kconfig/menu.c
index d49f8b8ff1..06a93646d5 100644
--- a/support/kconfig/menu.c
+++ b/support/kconfig/menu.c
@@ -3,14 +3,14 @@
  * Released under the terms of the GNU GPL v2.0.
  */
 
+#include <ctype.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
-static const char nohelp_text[] = N_(
-	"There is no help available for this option.\n");
+static const char nohelp_text[] = "There is no help available for this option.";
 
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -48,7 +48,7 @@ void menu_add_entry(struct symbol *sym)
 {
 	struct menu *menu;
 
-	menu = malloc(sizeof(*menu));
+	menu = xmalloc(sizeof(*menu));
 	memset(menu, 0, sizeof(*menu));
 	menu->sym = sym;
 	menu->parent = current_menu;
@@ -350,7 +350,7 @@ void menu_finalize(struct menu *parent)
 			last_menu->next = NULL;
 		}
 
-		sym->dir_dep.expr = parent->dep;
+		sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep);
 	}
 	for (menu = parent->list; menu; menu = menu->next) {
 		if (sym && sym_is_choice(sym) &&
@@ -507,10 +507,12 @@ const char *menu_get_help(struct menu *menu)
 		return "";
 }
 
-static void get_prompt_str(struct gstr *r, struct property *prop)
+static void get_prompt_str(struct gstr *r, struct property *prop,
+			   struct list_head *head)
 {
 	int i, j;
-	struct menu *submenu[8], *menu;
+	struct menu *submenu[8], *menu, *location = NULL;
+	struct jump_key *jump;
 
 	str_printf(r, _("Prompt: %s\n"), _(prop->text));
 	str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
@@ -521,13 +523,44 @@ static void get_prompt_str(struct gstr *r, struct property *prop)
 		str_append(r, "\n");
 	}
 	menu = prop->menu->parent;
-	for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
+	for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
+		bool accessible = menu_is_visible(menu);
+
 		submenu[i++] = menu;
+		if (location == NULL && accessible)
+			location = menu;
+	}
+	if (head && location) {
+		jump = xmalloc(sizeof(struct jump_key));
+
+		if (menu_is_visible(prop->menu)) {
+			/*
+			 * There is not enough room to put the hint at the
+			 * beginning of the "Prompt" line. Put the hint on the
+			 * last "Location" line even when it would belong on
+			 * the former.
+			 */
+			jump->target = prop->menu;
+		} else
+			jump->target = location;
+
+		if (list_empty(head))
+			jump->index = 0;
+		else
+			jump->index = list_entry(head->prev, struct jump_key,
+						 entries)->index + 1;
+
+		list_add_tail(&jump->entries, head);
+	}
+
 	if (i > 0) {
 		str_printf(r, _("  Location:\n"));
 		for (j = 4; --i >= 0; j += 2) {
 			menu = submenu[i];
-			str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
+			if (head && location && menu == location)
+				jump->offset = r->len - 1;
+			str_printf(r, "%*c-> %s", j, ' ',
+				   _(menu_get_prompt(menu)));
 			if (menu->sym) {
 				str_printf(r, " (%s [=%s])", menu->sym->name ?
 					menu->sym->name : _("<choice>"),
@@ -538,7 +571,11 @@ static void get_prompt_str(struct gstr *r, struct property *prop)
 	}
 }
 
-void get_symbol_str(struct gstr *r, struct symbol *sym)
+/*
+ * head is optional and may be NULL
+ */
+void get_symbol_str(struct gstr *r, struct symbol *sym,
+		    struct list_head *head)
 {
 	bool hit;
 	struct property *prop;
@@ -557,7 +594,7 @@ void get_symbol_str(struct gstr *r, struct symbol *sym)
 		}
 	}
 	for_all_prompts(sym, prop)
-		get_prompt_str(r, prop);
+		get_prompt_str(r, prop, head);
 	hit = false;
 	for_all_properties(sym, prop, P_SELECT) {
 		if (!hit) {
@@ -577,14 +614,14 @@ void get_symbol_str(struct gstr *r, struct symbol *sym)
 	str_append(r, "\n\n");
 }
 
-struct gstr get_relations_str(struct symbol **sym_arr)
+struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
 {
 	struct symbol *sym;
 	struct gstr res = str_new();
 	int i;
 
 	for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
-		get_symbol_str(&res, sym);
+		get_symbol_str(&res, sym, head);
 	if (!i)
 		str_append(&res, _("No matches found.\n"));
 	return res;
@@ -594,16 +631,14 @@ struct gstr get_relations_str(struct symbol **sym_arr)
 void menu_get_ext_help(struct menu *menu, struct gstr *help)
 {
 	struct symbol *sym = menu->sym;
+	const char *help_text = nohelp_text;
 
 	if (menu_has_help(menu)) {
-		if (sym->name) {
+		if (sym->name)
 			str_printf(help, "%s:\n\n", sym->name);
-			str_append(help, _(menu_get_help(menu)));
-			str_append(help, "\n");
-		}
-	} else {
-		str_append(help, nohelp_text);
+		help_text = menu_get_help(menu);
 	}
+	str_printf(help, "%s\n", _(help_text));
 	if (sym)
-		get_symbol_str(help, sym);
+		get_symbol_str(help, sym, NULL);
 }
diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh
new file mode 100755
index 0000000000..05274fccb8
--- /dev/null
+++ b/support/kconfig/merge_config.sh
@@ -0,0 +1,142 @@
+#!/bin/sh
+#  merge_config.sh - Takes a list of config fragment values, and merges
+#  them one by one. Provides warnings on overridden values, and specified
+#  values that did not make it to the resulting .config file (due to missed
+#  dependencies or config symbol removal).
+#
+#  Portions reused from kconf_check and generate_cfg:
+#  http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-tools/tree/tools/kconf_check
+#  http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-tools/tree/tools/generate_cfg
+#
+#  Copyright (c) 2009-2010 Wind River Systems, Inc.
+#  Copyright 2011 Linaro
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the GNU General Public License for more details.
+
+clean_up() {
+	rm -f $TMP_FILE
+	exit
+}
+trap clean_up HUP INT TERM
+
+usage() {
+	echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
+	echo "  -h    display this help text"
+	echo "  -m    only merge the fragments, do not execute the make command"
+	echo "  -n    use allnoconfig instead of alldefconfig"
+	echo "  -r    list redundant entries when merging fragments"
+	echo "  -O    dir to put generated output files"
+}
+
+MAKE=true
+ALLTARGET=alldefconfig
+WARNREDUN=false
+OUTPUT=.
+
+while true; do
+	case $1 in
+	"-n")
+		ALLTARGET=allnoconfig
+		shift
+		continue
+		;;
+	"-m")
+		MAKE=false
+		shift
+		continue
+		;;
+	"-h")
+		usage
+		exit
+		;;
+	"-r")
+		WARNREDUN=true
+		shift
+		continue
+		;;
+	"-O")
+		if [ -d $2 ];then
+			OUTPUT=$(echo $2 | sed 's/\/*$//')
+		else
+			echo "output directory $2 does not exist" 1>&2
+			exit 1
+		fi
+		shift 2
+		continue
+		;;
+	*)
+		break
+		;;
+	esac
+done
+
+INITFILE=$1
+shift;
+
+MERGE_LIST=$*
+SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
+TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
+
+echo "Using $INITFILE as base"
+cat $INITFILE > $TMP_FILE
+
+# Merge files, printing warnings on overrided values
+for MERGE_FILE in $MERGE_LIST ; do
+	echo "Merging $MERGE_FILE"
+	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
+
+	for CFG in $CFG_LIST ; do
+		grep -q -w $CFG $TMP_FILE
+		if [ $? -eq 0 ] ; then
+			PREV_VAL=$(grep -w $CFG $TMP_FILE)
+			NEW_VAL=$(grep -w $CFG $MERGE_FILE)
+			if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
+			echo Value of $CFG is redefined by fragment $MERGE_FILE:
+			echo Previous  value: $PREV_VAL
+			echo New value:       $NEW_VAL
+			echo
+			elif [ "$WARNREDUN" = "true" ]; then
+			echo Value of $CFG is redundant by fragment $MERGE_FILE:
+			fi
+			sed -i "/$CFG[ =]/d" $TMP_FILE
+		fi
+	done
+	cat $MERGE_FILE >> $TMP_FILE
+done
+
+if [ "$MAKE" = "false" ]; then
+	cp $TMP_FILE $OUTPUT/.config
+	echo "#"
+	echo "# merged configuration written to $OUTPUT/.config (needs make)"
+	echo "#"
+	clean_up
+	exit
+fi
+
+# Use the merged file as the starting point for:
+# alldefconfig: Fills in any missing symbols with Kconfig default
+# allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
+make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET
+
+
+# Check all specified config values took (might have missed-dependency issues)
+for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
+
+	REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
+	ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config)
+	if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
+		echo "Value requested for $CFG not in final .config"
+		echo "Requested value:  $REQUESTED_VAL"
+		echo "Actual value:     $ACTUAL_VAL"
+		echo ""
+	fi
+done
+
+clean_up
diff --git a/support/kconfig/nconf.c b/support/kconfig/nconf.c
index 488dd74107..dbf31edd22 100644
--- a/support/kconfig/nconf.c
+++ b/support/kconfig/nconf.c
@@ -7,217 +7,208 @@
  */
 #define _GNU_SOURCE
 #include <string.h>
-#define LKC_DIRECT_LINK
+#include <stdlib.h>
+
 #include "lkc.h"
 #include "nconf.h"
 #include <ctype.h>
 
-static const char nconf_readme[] = N_(
-"Overview\n"
-"--------\n"
-"This interface let you select features and parameters for the build.\n"
-"Features can either be built-in, modularized, or ignored. Parameters\n"
-"must be entered in as decimal or hexadecimal numbers or text.\n"
-"\n"
-"Menu items beginning with following braces represent features that\n"
-"  [ ] can be built in or removed\n"
-"  < > can be built in, modularized or removed\n"
-"  { } can be built in or modularized (selected by other feature)\n"
-"  - - are selected by other feature,\n"
-"  XXX cannot be selected. Use Symbol Info to find out why,\n"
-"while *, M or whitespace inside braces means to build in, build as\n"
-"a module or to exclude the feature respectively.\n"
+static const char nconf_global_help[] = N_(
+"Help windows\n"
+"------------\n"
+"o  Global help:  Unless in a data entry window, pressing <F1> will give \n"
+"   you the global help window, which you are just reading.\n"
 "\n"
-"To change any of these features, highlight it with the cursor\n"
-"keys and press <Y> to build it in, <M> to make it a module or\n"
-"<N> to removed it.  You may also press the <Space Bar> to cycle\n"
-"through the available options (ie. Y->N->M->Y).\n"
+"o  A short version of the global help is available by pressing <F3>.\n"
 "\n"
-"Some additional keyboard hints:\n"
+"o  Local help:  To get help related to the current menu entry, use any\n"
+"   of <?> <h>, or if in a data entry window then press <F1>.\n"
 "\n"
-"Menus\n"
-"----------\n"
-"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
-"   you wish to change use <Enter> or <Space>. Goto submenu by \n"
-"   pressing <Enter> of <right-arrow>. Use <Esc> or <left-arrow> to go back.\n"
-"   Submenus are designated by \"--->\".\n"
 "\n"
-"   Searching: pressing '/' triggers interactive search mode.\n"
-"              nconfig performs a case insensitive search for the string\n"
-"              in the menu prompts (no regex support).\n"
-"              Pressing the up/down keys highlights the previous/next\n"
-"              matching item. Backspace removes one character from the\n"
-"              match string. Pressing either '/' again or ESC exits\n"
-"              search mode. All other keys behave normally.\n"
+"Menu entries\n"
+"------------\n"
+"This interface lets you select features and parameters for the kernel\n"
+"build.  Kernel features can either be built-in, modularized, or removed.\n"
+"Parameters must be entered as text or decimal or hexadecimal numbers.\n"
 "\n"
-"   You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
-"   unseen options into view.\n"
+"Menu entries beginning with following braces represent features that\n"
+"  [ ]  can be built in or removed\n"
+"  < >  can be built in, modularized or removed\n"
+"  { }  can be built in or modularized, are selected by another feature\n"
+"  - -  are selected by another feature\n"
+"  XXX  cannot be selected.  Symbol Info <F2> tells you why.\n"
+"*, M or whitespace inside braces means to build in, build as a module\n"
+"or to exclude the feature respectively.\n"
 "\n"
-"o  To exit a menu use the just press <ESC> <F5> <F8> or <left-arrow>.\n"
+"To change any of these features, highlight it with the movement keys\n"
+"listed below and press <y> to build it in, <m> to make it a module or\n"
+"<n> to remove it.  You may press the <Space> key to cycle through the\n"
+"available options.\n"
 "\n"
-"o  To get help with an item, press <F1>\n"
-"   Shortcut: Press <h> or <?>.\n"
+"A trailing \"--->\" designates a submenu.\n"
 "\n"
 "\n"
-"Radiolists  (Choice lists)\n"
-"-----------\n"
-"o  Use the cursor keys to select the option you wish to set and press\n"
-"   <S> or the <SPACE BAR>.\n"
+"Menu navigation keys\n"
+"----------------------------------------------------------------------\n"
+"Linewise up                 <Up>\n"
+"Linewise down               <Down>\n"
+"Pagewise up                 <Page Up>\n"
+"Pagewise down               <Page Down>\n"
+"First entry                 <Home>\n"
+"Last entry                  <End>\n"
+"Enter a submenu             <Right>  <Enter>\n"
+"Go back to parent menu      <Left>   <Esc>  <F5>\n"
+"Close a help window         <Enter>  <Esc>  <F5>\n"
+"Close entry window, apply   <Enter>\n"
+"Close entry window, forget  <Esc>  <F5>\n"
+"Start incremental, case-insensitive search for STRING in menu entries,\n"
+"    no regex support, STRING is displayed in upper left corner\n"
+"                            </>STRING\n"
+"    Remove last character   <Backspace>\n"
+"    Jump to next hit        <Down>\n"
+"    Jump to previous hit    <Up>\n"
+"Exit menu search mode       </>  <Esc>\n"
+"Search for configuration variables with or without leading CONFIG_\n"
+"                            <F8>RegExpr<Enter>\n"
+"Verbose search help         <F8><F1>\n"
+"----------------------------------------------------------------------\n"
 "\n"
-"   Shortcut: Press the first letter of the option you wish to set then\n"
-"             press <S> or <SPACE BAR>.\n"
+"Unless in a data entry window, key <1> may be used instead of <F1>,\n"
+"<2> instead of <F2>, etc.\n"
 "\n"
-"o  To see available help for the item, press <F1>\n"
-"   Shortcut: Press <H> or <?>.\n"
 "\n"
+"Radiolist (Choice list)\n"
+"-----------------------\n"
+"Use the movement keys listed above to select the option you wish to set\n"
+"and press <Space>.\n"
 "\n"
-"Data Entry\n"
-"-----------\n"
-"o  Enter the requested information and press <ENTER>\n"
-"   If you are entering hexadecimal values, it is not necessary to\n"
-"   add the '0x' prefix to the entry.\n"
 "\n"
-"o  For help, press <F1>.\n"
+"Data entry\n"
+"----------\n"
+"Enter the requested information and press <Enter>.  Hexadecimal values\n"
+"may be entered without the \"0x\" prefix.\n"
 "\n"
 "\n"
-"Text Box    (Help Window)\n"
-"--------\n"
-"o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <SPACE BAR> for those\n"
-"   who are familiar with less and lynx.\n"
+"Text Box (Help Window)\n"
+"----------------------\n"
+"Use movement keys as listed in table above.\n"
 "\n"
-"o  Press <Enter>, <F1>, <F5>, <F7> or <Esc> to exit.\n"
+"Press any of <Enter> <Esc> <q> <F5> <F9> to exit.\n"
 "\n"
 "\n"
-"Alternate Configuration Files\n"
+"Alternate configuration files\n"
 "-----------------------------\n"
-"nconfig supports the use of alternate configuration files for\n"
-"those who, for various reasons, find it necessary to switch\n"
-"between different configurations.\n"
+"nconfig supports switching between different configurations.\n"
+"Press <F6> to save your current configuration.  Press <F7> and enter\n"
+"a file name to load a previously saved configuration.\n"
 "\n"
-"At the end of the main menu you will find two options.  One is\n"
-"for saving the current configuration to a file of your choosing.\n"
-"The other option is for loading a previously saved alternate\n"
-"configuration.\n"
 "\n"
-"Even if you don't use alternate configuration files, but you\n"
-"find during a nconfig session that you have completely messed\n"
-"up your settings, you may use the \"Load Alternate...\" option to\n"
-"restore your previously saved settings from \".config\" without\n"
-"restarting nconfig.\n"
+"Terminal configuration\n"
+"----------------------\n"
+"If you use nconfig in a xterm window, make sure your TERM environment\n"
+"variable specifies a terminal configuration which supports at least\n"
+"16 colors.  Otherwise nconfig will look rather bad.\n"
 "\n"
-"Other information\n"
-"-----------------\n"
-"If you use nconfig in an XTERM window make sure you have your\n"
-"$TERM variable set to point to a xterm definition which supports color.\n"
-"Otherwise, nconfig will look rather bad.  nconfig will not\n"
-"display correctly in a RXVT window because rxvt displays only one\n"
-"intensity of color, bright.\n"
+"If the \"stty size\" command reports the current terminalsize correctly,\n"
+"nconfig will adapt to sizes larger than the traditional 80x25 \"standard\"\n"
+"and display longer menus properly.\n"
 "\n"
-"nconfig will display larger menus on screens or xterms which are\n"
-"set to display more than the standard 25 row by 80 column geometry.\n"
-"In order for this to work, the \"stty size\" command must be able to\n"
-"display the screen's current row and column geometry.  I STRONGLY\n"
-"RECOMMEND that you make sure you do NOT have the shell variables\n"
-"LINES and COLUMNS exported into your environment.  Some distributions\n"
-"export those variables via /etc/profile.  Some ncurses programs can\n"
-"become confused when those variables (LINES & COLUMNS) don't reflect\n"
-"the true screen size.\n"
 "\n"
-"Optional personality available\n"
-"------------------------------\n"
-"If you prefer to have all of the options listed in a single menu, rather\n"
-"than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n"
-"environment variable set to single_menu. Example:\n"
+"Single menu mode\n"
+"----------------\n"
+"If you prefer to have all of the menu entries listed in a single menu,\n"
+"rather than the default multimenu hierarchy, run nconfig with\n"
+"NCONFIG_MODE environment variable set to single_menu.  Example:\n"
 "\n"
 "make NCONFIG_MODE=single_menu nconfig\n"
 "\n"
-"<Enter> will then unroll the appropriate category, or enfold it if it\n"
-"is already unrolled.\n"
+"<Enter> will then unfold the appropriate category, or fold it if it\n"
+"is already unfolded.  Folded menu entries will be designated by a\n"
+"leading \"++>\" and unfolded entries by a leading \"-->\".\n"
 "\n"
-"Note that this mode can eventually be a little more CPU expensive\n"
-"(especially with a larger number of unrolled categories) than the\n"
-"default mode.\n"
+"Note that this mode can eventually be a little more CPU expensive than\n"
+"the default mode, especially with a larger number of unfolded submenus.\n"
 "\n"),
 menu_no_f_instructions[] = N_(
-" You do not have function keys support. Please follow the\n"
-" following instructions:\n"
-" Arrow keys navigate the menu.\n"
-" <Enter> or <right-arrow> selects submenus --->.\n"
-" Capital Letters are hotkeys.\n"
-" Pressing <Y> includes, <N> excludes, <M> modularizes features.\n"
-" Pressing SpaceBar toggles between the above options.\n"
-" Press <Esc> or <left-arrow> to go back one menu,\n"
-" <?> or <h> for Help, </> for Search.\n"
-" <1> is interchangeable with <F1>, <2> with <F2>, etc.\n"
-" Legend: [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
-" <Esc> always leaves the current window.\n"),
+"Legend:  [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
+"Submenus are designated by a trailing \"--->\".\n"
+"\n"
+"Use the following keys to navigate the menus:\n"
+"Move up or down with <Up> and <Down>.\n"
+"Enter a submenu with <Enter> or <Right>.\n"
+"Exit a submenu to its parent menu with <Esc> or <Left>.\n"
+"Pressing <y> includes, <n> excludes, <m> modularizes features.\n"
+"Pressing <Space> cycles through the available options.\n"
+"To search for menu entries press </>.\n"
+"<Esc> always leaves the current window.\n"
+"\n"
+"You do not have function keys support.\n"
+"Press <1> instead of <F1>, <2> instead of <F2>, etc.\n"
+"For verbose global help use key <1>.\n"
+"For help related to the current menu entry press <?> or <h>.\n"),
 menu_instructions[] = N_(
-" Arrow keys navigate the menu.\n"
-" <Enter> or <right-arrow> selects submenus --->.\n"
-" Capital Letters are hotkeys.\n"
-" Pressing <Y> includes, <N> excludes, <M> modularizes features.\n"
-" Pressing SpaceBar toggles between the above options\n"
-" Press <Esc>, <F5> or <left-arrow> to go back one menu,\n"
-" <?>, <F1> or <h> for Help, </> for Search.\n"
-" <1> is interchangeable with <F1>, <2> with <F2>, etc.\n"
-" Legend: [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
-" <Esc> always leaves the current window\n"),
+"Legend:  [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
+"Submenus are designated by a trailing \"--->\".\n"
+"\n"
+"Use the following keys to navigate the menus:\n"
+"Move up or down with <Up> or <Down>.\n"
+"Enter a submenu with <Enter> or <Right>.\n"
+"Exit a submenu to its parent menu with <Esc> or <Left>.\n"
+"Pressing <y> includes, <n> excludes, <m> modularizes features.\n"
+"Pressing <Space> cycles through the available options.\n"
+"To search for menu entries press </>.\n"
+"<Esc> always leaves the current window.\n"
+"\n"
+"Pressing <1> may be used instead of <F1>, <2> instead of <F2>, etc.\n"
+"For verbose global help press <F1>.\n"
+"For help related to the current menu entry press <?> or <h>.\n"),
 radiolist_instructions[] = N_(
-" Use the arrow keys to navigate this window or\n"
-" press the hotkey of the item you wish to select\n"
-" followed by the <SPACE BAR>.\n"
-" Press <?>, <F1> or <h> for additional information about this option.\n"),
+"Press <Up>, <Down>, <Home> or <End> to navigate a radiolist, select\n"
+"with <Space>.\n"
+"For help related to the current entry press <?> or <h>.\n"
+"For global help press <F1>.\n"),
 inputbox_instructions_int[] = N_(
 "Please enter a decimal value.\n"
 "Fractions will not be accepted.\n"
-"Press <RETURN> to accept, <ESC> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel."),
 inputbox_instructions_hex[] = N_(
 "Please enter a hexadecimal value.\n"
-"Press <RETURN> to accept, <ESC> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel."),
 inputbox_instructions_string[] = N_(
 "Please enter a string value.\n"
-"Press <RETURN> to accept, <ESC> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel."),
 setmod_text[] = N_(
-"This feature depends on another which\n"
-"has been configured as a module.\n"
-"As a result, this feature will be built as a module."),
-nohelp_text[] = N_(
-"There is no help available for this option.\n"),
+"This feature depends on another feature which has been configured as a\n"
+"module.  As a result, the current feature will be built as a module too."),
 load_config_text[] = N_(
 "Enter the name of the configuration file you wish to load.\n"
-"Accept the name shown to restore the configuration you\n"
-"last retrieved.  Leave blank to abort."),
+"Accept the name shown to restore the configuration you last\n"
+"retrieved.  Leave empty to abort."),
 load_config_help[] = N_(
-"\n"
 "For various reasons, one may wish to keep several different\n"
 "configurations available on a single machine.\n"
 "\n"
 "If you have saved a previous configuration in a file other than the\n"
-"default one, entering its name here will allow you to modify that\n"
-"configuration.\n"
+"default one, entering its name here will allow you to load and modify\n"
+"that configuration.\n"
 "\n"
-"If you are uncertain, then you have probably never used alternate\n"
-"configuration files.  You should therefor leave this blank to abort.\n"),
+"Leave empty to abort.\n"),
 save_config_text[] = N_(
 "Enter a filename to which this configuration should be saved\n"
-"as an alternate.  Leave blank to abort."),
+"as an alternate.  Leave empty to abort."),
 save_config_help[] = N_(
-"\n"
-"For various reasons, one may wish to keep different configurations\n"
-"available on a single machine.\n"
+"For various reasons, one may wish to keep several different\n"
+"configurations available on a single machine.\n"
 "\n"
 "Entering a file name here will allow you to later retrieve, modify\n"
 "and use the current configuration as an alternate to whatever\n"
 "configuration options you have selected at that time.\n"
 "\n"
-"If you are uncertain what all this means then you should probably\n"
-"leave this blank.\n"),
+"Leave empty to abort.\n"),
 search_help[] = N_(
-"\n"
-"Search for symbols and display their relations. Regular expressions\n"
-"are allowed.\n"
-"Example: search for \"^FOO\"\n"
+"Search for symbols (configuration variable names CONFIG_*) and display\n"
+"their relations.  Regular expressions are supported.\n"
+"Example:  Search for \"^FOO\".\n"
 "Result:\n"
 "-----------------------------------------------------------------\n"
 "Symbol: FOO [ = m]\n"
@@ -225,32 +216,32 @@ search_help[] = N_(
 "Defined at drivers/pci/Kconfig:47\n"
 "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
 "Location:\n"
-"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+"  -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
 "    -> PCI support (PCI [ = y])\n"
 "      -> PCI access mode (<choice> [ = y])\n"
 "Selects: LIBCRC32\n"
 "Selected by: BAR\n"
 "-----------------------------------------------------------------\n"
-"o The line 'Prompt:' shows the text used in the menu structure for\n"
-"  this symbol\n"
-"o The 'Defined at' line tell at what file / line number the symbol\n"
-"  is defined\n"
-"o The 'Depends on:' line tell what symbols needs to be defined for\n"
-"  this symbol to be visible in the menu (selectable)\n"
-"o The 'Location:' lines tell where in the menu structure this symbol\n"
-"  is located\n"
-"    A location followed by a [ = y] indicate that this is a selectable\n"
-"    menu item - and current value is displayed inside brackets.\n"
-"o The 'Selects:' line tell what symbol will be automatically\n"
-"  selected if this symbol is selected (y or m)\n"
-"o The 'Selected by' line tell what symbol has selected this symbol\n"
+"o  The line 'Prompt:' shows the text displayed for this symbol in\n"
+"   the menu hierarchy.\n"
+"o  The 'Defined at' line tells at what file / line number the symbol is\n"
+"   defined.\n"
+"o  The 'Depends on:' line lists symbols that need to be defined for\n"
+"   this symbol to be visible and selectable in the menu.\n"
+"o  The 'Location:' lines tell, where in the menu structure this symbol\n"
+"   is located.  A location followed by a [ = y] indicates that this is\n"
+"   a selectable menu item, and the current value is displayed inside\n"
+"   brackets.\n"
+"o  The 'Selects:' line tells, what symbol will be automatically selected\n"
+"   if this symbol is selected (y or m).\n"
+"o  The 'Selected by' line tells what symbol has selected this symbol.\n"
 "\n"
 "Only relevant lines are shown.\n"
 "\n\n"
 "Search examples:\n"
-"Examples: USB  => find all symbols containing USB\n"
-"          ^USB => find all symbols starting with USB\n"
-"          USB$ => find all symbols ending with USB\n"
+"USB  => find all symbols containing USB\n"
+"^USB => find all symbols starting with USB\n"
+"USB$ => find all symbols ending with USB\n"
 "\n");
 
 struct mitem {
@@ -280,6 +271,9 @@ static int global_exit;
 /* the currently selected button */
 const char *current_instructions = menu_instructions;
 
+static char *dialog_input_result;
+static int dialog_input_result_len;
+
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
@@ -318,19 +312,19 @@ struct function_keys function_keys[] = {
 	},
 	{
 		.key_str = "F2",
-		.func = "Sym Info",
+		.func = "SymInfo",
 		.key = F_SYMBOL,
 		.handler = handle_f2,
 	},
 	{
 		.key_str = "F3",
-		.func = "Insts",
+		.func = "Help 2",
 		.key = F_INSTS,
 		.handler = handle_f3,
 	},
 	{
 		.key_str = "F4",
-		.func = "Config",
+		.func = "ShowAll",
 		.key = F_CONF,
 		.handler = handle_f4,
 	},
@@ -354,7 +348,7 @@ struct function_keys function_keys[] = {
 	},
 	{
 		.key_str = "F8",
-		.func = "Sym Search",
+		.func = "SymSearch",
 		.key = F_SEARCH,
 		.handler = handle_f8,
 	},
@@ -391,7 +385,7 @@ static void print_function_line(void)
 static void handle_f1(int *key, struct menu *current_item)
 {
 	show_scroll_win(main_window,
-			_("README"), _(nconf_readme));
+			_("Global help"), _(nconf_global_help));
 	return;
 }
 
@@ -406,7 +400,7 @@ static void handle_f2(int *key, struct menu *current_item)
 static void handle_f3(int *key, struct menu *current_item)
 {
 	show_scroll_win(main_window,
-			_("Instructions"),
+			_("Short help"),
 			_(current_instructions));
 	return;
 }
@@ -695,15 +689,19 @@ static void search_conf(void)
 {
 	struct symbol **sym_arr;
 	struct gstr res;
-	char dialog_input_result[100];
+	struct gstr title;
 	char *dialog_input;
 	int dres;
+
+	title = str_new();
+	str_printf( &title, _("Enter %s (sub)string to search for "
+			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
+
 again:
 	dres = dialog_inputbox(main_window,
 			_("Search Configuration Parameter"),
-			_("Enter " CONFIG_ " (sub)string to search for "
-				"(with or without \"" CONFIG_ "\")"),
-			"", dialog_input_result, 99);
+			str_get(&title),
+			"", &dialog_input_result, &dialog_input_result_len);
 	switch (dres) {
 	case 0:
 		break;
@@ -712,6 +710,7 @@ static void search_conf(void)
 				_("Search Configuration"), search_help);
 		goto again;
 	default:
+		str_free(&title);
 		return;
 	}
 
@@ -721,11 +720,12 @@ static void search_conf(void)
 		dialog_input += strlen(CONFIG_);
 
 	sym_arr = sym_re_search(dialog_input);
-	res = get_relations_str(sym_arr);
+	res = get_relations_str(sym_arr, NULL);
 	free(sym_arr);
 	show_scroll_win(main_window,
 			_("Search Results"), str_get(&res));
 	str_free(&res);
+	str_free(&title);
 }
 
 
@@ -1067,7 +1067,6 @@ static void conf(struct menu *menu)
 	struct menu *submenu = 0;
 	const char *prompt = menu_get_prompt(menu);
 	struct symbol *sym;
-	struct menu *active_menu = NULL;
 	int res;
 	int current_index = 0;
 	int last_top_row = 0;
@@ -1152,13 +1151,9 @@ static void conf(struct menu *menu)
 			continue;
 
 		submenu = (struct menu *) item_data();
-		active_menu = (struct menu *)item_data();
 		if (!submenu || !menu_is_visible(submenu))
 			continue;
-		if (submenu)
-			sym = submenu->sym;
-		else
-			sym = NULL;
+		sym = submenu->sym;
 
 		switch (res) {
 		case ' ':
@@ -1222,20 +1217,13 @@ static void conf_message_callback(const char *fmt, va_list ap)
 
 static void show_help(struct menu *menu)
 {
-	struct gstr help = str_new();
-
-	if (menu && menu->sym && menu_has_help(menu)) {
-		if (menu->sym->name) {
-			str_printf(&help, "%s%s:\n\n", CONFIG_, menu->sym->name);
-			str_append(&help, _(menu_get_help(menu)));
-			str_append(&help, "\n");
-			get_symbol_str(&help, menu->sym);
-		} else {
-			str_append(&help, _(menu_get_help(menu)));
-		}
-	} else {
-		str_append(&help, nohelp_text);
-	}
+	struct gstr help;
+
+	if (!menu)
+		return;
+
+	help = str_new();
+	menu_get_ext_help(menu, &help);
 	show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help));
 	str_free(&help);
 }
@@ -1360,7 +1348,6 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
 	const char *prompt = menu_get_prompt(menu);
-	char dialog_input_result[256];
 
 	while (1) {
 		int res;
@@ -1383,8 +1370,8 @@ static void conf_string(struct menu *menu)
 				prompt ? _(prompt) : _("Main Menu"),
 				heading,
 				sym_get_string_value(menu->sym),
-				dialog_input_result,
-				sizeof(dialog_input_result));
+				&dialog_input_result,
+				&dialog_input_result_len);
 		switch (res) {
 		case 0:
 			if (sym_set_string_value(menu->sym,
@@ -1404,14 +1391,13 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
-	char dialog_input_result[256];
 	while (1) {
 		int res;
 		res = dialog_inputbox(main_window,
 				NULL, load_config_text,
 				filename,
-				dialog_input_result,
-				sizeof(dialog_input_result));
+				&dialog_input_result,
+				&dialog_input_result_len);
 		switch (res) {
 		case 0:
 			if (!dialog_input_result[0])
@@ -1436,14 +1422,13 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
-	char dialog_input_result[256];
 	while (1) {
 		int res;
 		res = dialog_inputbox(main_window,
 				NULL, save_config_text,
 				filename,
-				dialog_input_result,
-				sizeof(dialog_input_result));
+				&dialog_input_result,
+				&dialog_input_result_len);
 		switch (res) {
 		case 0:
 			if (!dialog_input_result[0])
@@ -1518,7 +1503,11 @@ int main(int ac, char **av)
 	}
 
 	notimeout(stdscr, FALSE);
+#if NCURSES_REENTRANT
+	set_escdelay(1);
+#else
 	ESCDELAY = 1;
+#endif
 
 	/* set btns menu */
 	curses_menu = new_menu(curses_menu_items);
diff --git a/support/kconfig/nconf.gui.c b/support/kconfig/nconf.gui.c
index f8137b3a53..9f8c44ecc7 100644
--- a/support/kconfig/nconf.gui.c
+++ b/support/kconfig/nconf.gui.c
@@ -48,7 +48,7 @@ static void set_normal_colors(void)
 	init_pair(INPUT_FIELD, -1, -1);
 
 	init_pair(FUNCTION_HIGHLIGHT, -1, -1);
-	init_pair(FUNCTION_TEXT, COLOR_BLUE, -1);
+	init_pair(FUNCTION_TEXT, COLOR_YELLOW, -1);
 }
 
 /* available attributes:
@@ -356,7 +356,7 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
 
 int dialog_inputbox(WINDOW *main_window,
 		const char *title, const char *prompt,
-		const char *init, char *result, int result_len)
+		const char *init, char **resultp, int *result_len)
 {
 	int prompt_lines = 0;
 	int prompt_width = 0;
@@ -367,7 +367,13 @@ int dialog_inputbox(WINDOW *main_window,
 	int i, x, y;
 	int res = -1;
 	int cursor_position = strlen(init);
+	int cursor_form_win;
+	char *result = *resultp;
 
+	if (strlen(init)+1 > *result_len) {
+		*result_len = strlen(init)+1;
+		*resultp = result = realloc(result, *result_len);
+	}
 
 	/* find the widest line of msg: */
 	prompt_lines = get_line_no(prompt);
@@ -384,7 +390,7 @@ int dialog_inputbox(WINDOW *main_window,
 	y = (LINES-(prompt_lines+4))/2;
 	x = (COLS-(prompt_width+4))/2;
 
-	strncpy(result, init, result_len);
+	strncpy(result, init, *result_len);
 
 	/* create the windows */
 	win = newwin(prompt_lines+6, prompt_width+7, y, x);
@@ -405,7 +411,9 @@ int dialog_inputbox(WINDOW *main_window,
 	fill_window(prompt_win, prompt);
 
 	mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-	mvwprintw(form_win, 0, 0, "%s", result);
+	cursor_form_win = min(cursor_position, prompt_width-1);
+	mvwprintw(form_win, 0, 0, "%s",
+		  result + cursor_position-cursor_form_win);
 
 	/* create panels */
 	panel = new_panel(win);
@@ -431,6 +439,8 @@ int dialog_inputbox(WINDOW *main_window,
 						&result[cursor_position],
 						len-cursor_position+1);
 				cursor_position--;
+				cursor_form_win--;
+				len--;
 			}
 			break;
 		case KEY_DC:
@@ -438,38 +448,63 @@ int dialog_inputbox(WINDOW *main_window,
 				memmove(&result[cursor_position],
 						&result[cursor_position+1],
 						len-cursor_position+1);
+				len--;
 			}
 			break;
 		case KEY_UP:
 		case KEY_RIGHT:
-			if (cursor_position < len &&
-			    cursor_position < min(result_len, prompt_width))
+			if (cursor_position < len) {
 				cursor_position++;
+				cursor_form_win++;
+			}
 			break;
 		case KEY_DOWN:
 		case KEY_LEFT:
-			if (cursor_position > 0)
+			if (cursor_position > 0) {
 				cursor_position--;
+				cursor_form_win--;
+			}
+			break;
+		case KEY_HOME:
+			cursor_position = 0;
+			cursor_form_win = 0;
+			break;
+		case KEY_END:
+			cursor_position = len;
+			cursor_form_win = min(cursor_position, prompt_width-1);
 			break;
 		default:
-			if ((isgraph(res) || isspace(res)) &&
-					len-2 < result_len) {
+			if ((isgraph(res) || isspace(res))) {
+				/* one for new char, one for '\0' */
+				if (len+2 > *result_len) {
+					*result_len = len+2;
+					*resultp = result = realloc(result,
+								*result_len);
+				}
 				/* insert the char at the proper position */
 				memmove(&result[cursor_position+1],
 						&result[cursor_position],
-						len+1);
+						len-cursor_position+1);
 				result[cursor_position] = res;
 				cursor_position++;
+				cursor_form_win++;
+				len++;
 			} else {
-				mvprintw(0, 0, "unknow key: %d\n", res);
+				mvprintw(0, 0, "unknown key: %d\n", res);
 			}
 			break;
 		}
+		if (cursor_form_win < 0)
+			cursor_form_win = 0;
+		else if (cursor_form_win > prompt_width-1)
+			cursor_form_win = prompt_width-1;
+
 		wmove(form_win, 0, 0);
 		wclrtoeol(form_win);
 		mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-		mvwprintw(form_win, 0, 0, "%s", result);
-		wmove(form_win, 0, cursor_position);
+		mvwprintw(form_win, 0, 0, "%s",
+			result + cursor_position-cursor_form_win);
+		wmove(form_win, 0, cursor_form_win);
 		touchwin(win);
 		refresh_all_windows(main_window);
 
@@ -569,9 +604,11 @@ void show_scroll_win(WINDOW *main_window,
 		switch (res) {
 		case KEY_NPAGE:
 		case ' ':
+		case 'd':
 			start_y += text_lines-2;
 			break;
 		case KEY_PPAGE:
+		case 'u':
 			start_y -= text_lines+2;
 			break;
 		case KEY_HOME:
@@ -597,10 +634,10 @@ void show_scroll_win(WINDOW *main_window,
 			start_x++;
 			break;
 		}
-		if (res == 10 || res == 27 || res == 'q'
-		    || res == KEY_F(F_BACK) || res == KEY_F(F_EXIT)) {
+		if (res == 10 || res == 27 || res == 'q' ||
+			res == KEY_F(F_HELP) || res == KEY_F(F_BACK) ||
+			res == KEY_F(F_EXIT))
 			break;
-		}
 		if (start_y < 0)
 			start_y = 0;
 		if (start_y >= total_lines-text_lines)
diff --git a/support/kconfig/nconf.h b/support/kconfig/nconf.h
index 58fbda8fc0..0d5261705e 100644
--- a/support/kconfig/nconf.h
+++ b/support/kconfig/nconf.h
@@ -89,7 +89,7 @@ void fill_window(WINDOW *win, const char *text);
 int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...);
 int dialog_inputbox(WINDOW *main_window,
 		const char *title, const char *prompt,
-		const char *init, char *result, int result_len);
+		const char *init, char **resultp, int *result_len);
 void refresh_all_windows(WINDOW *main_window);
 void show_scroll_win(WINDOW *main_window,
 		const char *title,
diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
index ef3a05e43c..f28131cf8c 100644
--- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
+++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
@@ -5,10 +5,10 @@
  zconf.y             |    2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: config/gconf.glade
+Index: b/gconf.glade
 ===================================================================
---- config.orig/gconf.glade
-+++ config/gconf.glade
+--- a/gconf.glade
++++ b/gconf.glade
 @@ -4,7 +4,7 @@
  
  <widget class="GtkWindow" id="window1">
@@ -18,10 +18,10 @@ Index: config/gconf.glade
    <property name="type">GTK_WINDOW_TOPLEVEL</property>
    <property name="window_position">GTK_WIN_POS_NONE</property>
    <property name="modal">False</property>
-Index: config/mconf.c
+Index: b/mconf.c
 ===================================================================
---- config.orig/mconf.c
-+++ config/mconf.c
+--- a/mconf.c
++++ b/mconf.c
 @@ -178,9 +178,9 @@
  	"Arrow keys navigate the menu.  "
  	"<Enter> selects submenus --->.  "
@@ -34,29 +34,29 @@ Index: config/mconf.c
  radiolist_instructions[] = N_(
  	"Use the arrow keys to navigate this window or "
  	"press the hotkey of the item you wish to select "
-Index: config/zconf.tab.c_shipped
+Index: b/zconf.tab.c_shipped
 ===================================================================
---- config.orig/zconf.tab.c_shipped
-+++ config/zconf.tab.c_shipped
-@@ -2256,7 +2256,7 @@
+--- a/zconf.tab.c_shipped
++++ b/zconf.tab.c_shipped
+@@ -2259,7 +2259,7 @@
  	modules_sym = sym_lookup(NULL, 0);
  	modules_sym->type = S_BOOLEAN;
  	modules_sym->flags |= SYMBOL_AUTO;
 -	rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 +	rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
  
- #if YYDEBUG
  	if (getenv("ZCONF_DEBUG"))
-Index: config/zconf.y
+ 		zconfdebug = 1;
+Index: b/zconf.y
 ===================================================================
---- config.orig/zconf.y
-+++ config/zconf.y
-@@ -501,7 +501,7 @@
+--- a/zconf.y
++++ b/zconf.y
+@@ -496,7 +496,7 @@
  	modules_sym = sym_lookup(NULL, 0);
  	modules_sym->type = S_BOOLEAN;
  	modules_sym->flags |= SYMBOL_AUTO;
 -	rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 +	rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
  
- #if YYDEBUG
  	if (getenv("ZCONF_DEBUG"))
+ 		zconfdebug = 1;
diff --git a/support/kconfig/patches/02-cpp-comments-to-c-comments.patch b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
index cb27056adf..72afa84ff9 100644
--- a/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
+++ b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
@@ -2,11 +2,11 @@
  expr.c |   42 +++++++++++++++++++++---------------------
  1 file changed, 21 insertions(+), 21 deletions(-)
 
-Index: config/expr.c
+Index: b/expr.c
 ===================================================================
---- config.orig/expr.c
-+++ config/expr.c
-@@ -331,7 +331,7 @@
+--- a/expr.c
++++ b/expr.c
+@@ -326,7 +326,7 @@
  		e->right.expr = expr_trans_bool(e->right.expr);
  		break;
  	case E_UNEQUAL:
@@ -15,7 +15,7 @@ Index: config/expr.c
  		if (e->left.sym->type == S_TRISTATE) {
  			if (e->right.sym == &symbol_no) {
  				e->type = E_SYMBOL;
-@@ -380,19 +380,19 @@
+@@ -375,19 +375,19 @@
  		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
  		    ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
  		     (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
@@ -38,7 +38,7 @@ Index: config/expr.c
  			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
  		}
  	}
-@@ -443,29 +443,29 @@
+@@ -438,29 +438,29 @@
  
  	if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
  	    (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
@@ -73,7 +73,7 @@ Index: config/expr.c
  			sym2 = e2->right.sym;
  			if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
  				return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
-@@ -474,19 +474,19 @@
+@@ -469,19 +469,19 @@
  		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
  			   ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
  			    (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
@@ -96,7 +96,7 @@ Index: config/expr.c
  			return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
  
  		if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
-@@ -579,7 +579,7 @@
+@@ -574,7 +574,7 @@
  	switch (e1->type) {
  	case E_OR:
  		expr_eliminate_dups2(e1->type, &e1, &e1);
@@ -105,7 +105,7 @@ Index: config/expr.c
  		tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
  		tmp2 = expr_copy(e2);
  		tmp = expr_extract_eq_and(&tmp1, &tmp2);
-@@ -594,7 +594,7 @@
+@@ -589,7 +589,7 @@
  		break;
  	case E_AND:
  		expr_eliminate_dups2(e1->type, &e1, &e1);
@@ -114,7 +114,7 @@ Index: config/expr.c
  		tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
  		tmp2 = expr_copy(e2);
  		tmp = expr_extract_eq_or(&tmp1, &tmp2);
-@@ -703,7 +703,7 @@
+@@ -698,7 +698,7 @@
  	case E_NOT:
  		switch (e->left.expr->type) {
  		case E_NOT:
@@ -123,7 +123,7 @@ Index: config/expr.c
  			tmp = e->left.expr->left.expr;
  			free(e->left.expr);
  			free(e);
-@@ -712,14 +712,14 @@
+@@ -707,14 +707,14 @@
  			break;
  		case E_EQUAL:
  		case E_UNEQUAL:
@@ -140,7 +140,7 @@ Index: config/expr.c
  			tmp = e->left.expr;
  			e->type = E_AND;
  			e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
-@@ -728,7 +728,7 @@
+@@ -723,7 +723,7 @@
  			e = expr_transform(e);
  			break;
  		case E_AND:
@@ -149,7 +149,7 @@ Index: config/expr.c
  			tmp = e->left.expr;
  			e->type = E_OR;
  			e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
-@@ -738,7 +738,7 @@
+@@ -733,7 +733,7 @@
  			break;
  		case E_SYMBOL:
  			if (e->left.expr->left.sym == &symbol_yes) {
@@ -158,7 +158,7 @@ Index: config/expr.c
  				tmp = e->left.expr;
  				free(e);
  				e = tmp;
-@@ -747,7 +747,7 @@
+@@ -742,7 +742,7 @@
  				break;
  			}
  			if (e->left.expr->left.sym == &symbol_mod) {
@@ -167,7 +167,7 @@ Index: config/expr.c
  				tmp = e->left.expr;
  				free(e);
  				e = tmp;
-@@ -756,7 +756,7 @@
+@@ -751,7 +751,7 @@
  				break;
  			}
  			if (e->left.expr->left.sym == &symbol_no) {
diff --git a/support/kconfig/patches/03-change-config-option-prefix.patch b/support/kconfig/patches/03-change-config-option-prefix.patch
index 4c51eaa9b8..0644ab0d3e 100644
--- a/support/kconfig/patches/03-change-config-option-prefix.patch
+++ b/support/kconfig/patches/03-change-config-option-prefix.patch
@@ -4,18 +4,18 @@
  menu.c     |    2 +-
  3 files changed, 31 insertions(+), 30 deletions(-)
 
-Index: kconfig/confdata.c
+Index: b/confdata.c
 ===================================================================
---- kconfig.orig/confdata.c
-+++ kconfig/confdata.c
-@@ -12,6 +12,7 @@
+--- a/confdata.c
++++ b/confdata.c
+@@ -13,6 +13,7 @@
  #include <string.h>
  #include <time.h>
  #include <unistd.h>
 +#include <libgen.h>
  
- #define LKC_DIRECT_LINK
  #include "lkc.h"
+ 
 @@ -25,7 +26,7 @@
  static const char *conf_filename;
  static int conf_lineno, conf_warnings, conf_unsaved;
@@ -34,7 +34,7 @@ Index: kconfig/confdata.c
  
  	return name ? name : ".config";
  }
-@@ -249,20 +250,20 @@
+@@ -309,20 +310,20 @@
  		if (line[0] == '#') {
  			if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
  				continue;
@@ -58,7 +58,7 @@ Index: kconfig/confdata.c
  				if (sym->type == S_UNKNOWN)
  					sym->type = S_BOOLEAN;
  			}
-@@ -278,8 +279,8 @@
+@@ -338,8 +339,8 @@
  			default:
  				;
  			}
@@ -69,7 +69,7 @@ Index: kconfig/confdata.c
  			if (!p)
  				continue;
  			*p++ = 0;
-@@ -290,13 +291,13 @@
+@@ -350,13 +351,13 @@
  					*p2 = 0;
  			}
  			if (def == S_DEF_USER) {
@@ -85,114 +85,88 @@ Index: kconfig/confdata.c
  				if (sym->type == S_UNKNOWN)
  					sym->type = S_OTHER;
  			}
-@@ -423,9 +424,9 @@
- {
- 	int l;
- 	if (headerfile)
--		fprintf(out, "#define %s%s \"", CONFIG_, name);
-+		fprintf(out, "#define %s \"", name);
- 	else
--		fprintf(out, "%s%s=\"", CONFIG_, name);
-+		fprintf(out, "%s=\"", name);
+@@ -484,8 +485,8 @@
+ 			bool skip_unset = (arg != NULL);
  
- 	while (1) {
- 		l = strcspn(str, "\"\\");
-@@ -450,14 +451,14 @@
- 		switch (sym_get_tristate_value(sym)) {
- 		case no:
- 			if (write_no)
--				fprintf(out, "# %s%s is not set\n",
+ 			if (!skip_unset)
+-				fprintf(fp, "# %s%s is not set\n",
 -				    CONFIG_, sym->name);
-+				fprintf(out, "# %s is not set\n",
++				fprintf(fp, "# %s is not set\n",
 +				    sym->name);
- 			break;
- 		case mod:
--			fprintf(out, "%s%s=m\n", CONFIG_, sym->name);
-+			fprintf(out, "%s=m\n", sym->name);
- 			break;
- 		case yes:
--			fprintf(out, "%s%s=y\n", CONFIG_, sym->name);
-+			fprintf(out, "%s=y\n", sym->name);
- 			break;
+ 			return;
  		}
  		break;
-@@ -467,7 +468,7 @@
- 	case S_HEX:
- 	case S_INT:
- 		str = sym_get_string_value(sym);
--		fprintf(out, "%s%s=%s\n", CONFIG_, sym->name, str);
-+		fprintf(out, "%s=%s\n", sym->name, str);
+@@ -493,7 +494,7 @@
  		break;
- 	case S_OTHER:
- 	case S_UNKNOWN:
-@@ -830,17 +831,17 @@
- 			case no:
- 				break;
- 			case mod:
--				fprintf(tristate, "%s%s=M\n",
--				    CONFIG_, sym->name);
--				fprintf(out_h, "#define %s%s_MODULE 1\n",
--				    CONFIG_, sym->name);
-+				fprintf(tristate, "%s=M\n",
-+				    sym->name);
-+				fprintf(out_h, "#define %s_MODULE 1\n",
-+				    sym->name);
- 				break;
- 			case yes:
- 				if (sym->type == S_TRISTATE)
--					fprintf(tristate,"%s%s=Y\n",
--					    CONFIG_, sym->name);
--				fprintf(out_h, "#define %s%s 1\n",
--				    CONFIG_, sym->name);
-+					fprintf(tristate,"%s=Y\n",
-+					    sym->name);
-+				fprintf(out_h, "#define %s 1\n",
-+				    sym->name);
- 				break;
- 			}
- 			break;
-@@ -850,14 +851,14 @@
- 		case S_HEX:
- 			str = sym_get_string_value(sym);
- 			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
--				fprintf(out_h, "#define %s%s 0x%s\n",
--				    CONFIG_, sym->name, str);
-+				fprintf(out_h, "#define %s 0x%s\n",
-+				    sym->name, str);
- 				break;
- 			}
- 		case S_INT:
- 			str = sym_get_string_value(sym);
--			fprintf(out_h, "#define %s%s %s\n",
--			    CONFIG_, sym->name, str);
-+			fprintf(out_h, "#define %s %s\n",
-+			    sym->name, str);
- 			break;
+ 	}
+ 
+-	fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);
++	fprintf(fp, "%s=%s\n", sym->name, value);
+ }
+ 
+ static void
+@@ -543,8 +544,8 @@
+ 			suffix = "_MODULE";
+ 			/* fall through */
  		default:
- 			break;
-Index: kconfig/lkc.h
+-			fprintf(fp, "#define %s%s%s 1\n",
+-			    CONFIG_, sym->name, suffix);
++			fprintf(fp, "#define %s%s 1\n",
++			    sym->name, suffix);
+ 		}
+ 		break;
+ 	}
+@@ -553,14 +554,14 @@
+ 
+ 		if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
+ 			prefix = "0x";
+-		fprintf(fp, "#define %s%s %s%s\n",
+-		    CONFIG_, sym->name, prefix, value);
++		fprintf(fp, "#define %s %s%s\n",
++		    sym->name, prefix, value);
+ 		break;
+ 	}
+ 	case S_STRING:
+ 	case S_INT:
+-		fprintf(fp, "#define %s%s %s\n",
+-		    CONFIG_, sym->name, value);
++		fprintf(fp, "#define %s %s\n",
++		    sym->name, value);
+ 		break;
+ 	default:
+ 		break;
+@@ -606,7 +607,7 @@
+ {
+ 
+ 	if (sym->type == S_TRISTATE && *value != 'n')
+-		fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));
++		fprintf(fp, "%s=%c\n", sym->name, (char)toupper(*value));
+ }
+ 
+ static struct conf_printer tristate_printer_cb =
+Index: b/lkc.h
 ===================================================================
---- kconfig.orig/lkc.h
-+++ kconfig/lkc.h
-@@ -42,7 +42,7 @@
+--- a/lkc.h
++++ b/lkc.h
+@@ -37,7 +37,7 @@
  #define N_(text) (text)
  
  #ifndef CONFIG_
 -#define CONFIG_ "CONFIG_"
 +#define CONFIG_ "BR2_"
  #endif
- 
- #define TF_COMMAND	0x0001
-Index: kconfig/menu.c
+ static inline const char *CONFIG_prefix(void)
+ {
+Index: b/menu.c
 ===================================================================
---- kconfig.orig/menu.c
-+++ kconfig/menu.c
-@@ -597,7 +597,7 @@
+--- a/menu.c
++++ b/menu.c
+@@ -635,7 +635,7 @@
  
  	if (menu_has_help(menu)) {
- 		if (sym->name) {
+ 		if (sym->name)
 -			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
 +			str_printf(help, "%s:\n\n", sym->name);
- 			str_append(help, _(menu_get_help(menu)));
- 			str_append(help, "\n");
- 		}
+ 		help_text = menu_get_help(menu);
+ 	}
+ 	str_printf(help, "%s\n", _(help_text));
diff --git a/support/kconfig/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.patch
index feb166d36c..3faa39ed63 100644
--- a/support/kconfig/patches/06-br-build-system-integration.patch
+++ b/support/kconfig/patches/06-br-build-system-integration.patch
@@ -2,11 +2,11 @@
  Makefile |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: kconfig/Makefile
+Index: b/Makefile
 ===================================================================
---- kconfig.orig/Makefile
-+++ kconfig/Makefile
-@@ -175,11 +175,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -159,11 +159,11 @@
  
  hostprogs-y := conf
  
@@ -20,7 +20,7 @@ Index: kconfig/Makefile
  	hostprogs-y += mconf
  endif
  
-@@ -187,10 +187,10 @@
+@@ -171,10 +171,10 @@
  	hostprogs-y += kxgettext
  endif
  
diff --git a/support/kconfig/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
index 3b6eb898f8..72e2a254f9 100644
--- a/support/kconfig/patches/09-implement-kconfig-probability.patch
+++ b/support/kconfig/patches/09-implement-kconfig-probability.patch
@@ -2,11 +2,11 @@
  confdata.c |   22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)
 
-Index: kconfig/confdata.c
+Index: b/confdata.c
 ===================================================================
---- kconfig.orig/confdata.c
-+++ kconfig/confdata.c
-@@ -982,7 +982,16 @@
+--- a/confdata.c
++++ b/confdata.c
+@@ -1107,7 +1107,16 @@
  void conf_set_all_new_symbols(enum conf_def_mode mode)
  {
  	struct symbol *sym, *csym;
@@ -24,7 +24,7 @@ Index: kconfig/confdata.c
  
  	for_all_symbols(i, sym) {
  		if (sym_has_value(sym))
-@@ -1001,8 +1010,15 @@
+@@ -1126,8 +1135,15 @@
  				sym->def[S_DEF_USER].tri = no;
  				break;
  			case def_random:
diff --git a/support/kconfig/patches/10-br-build-system.patch b/support/kconfig/patches/10-br-build-system.patch
index c5d9a7573b..a877318e72 100644
--- a/support/kconfig/patches/10-br-build-system.patch
+++ b/support/kconfig/patches/10-br-build-system.patch
@@ -3,10 +3,10 @@
  foo.h       |   12 ++++++++++++
  2 files changed, 65 insertions(+)
 
-Index: kconfig/Makefile.br
+Index: b/Makefile.br
 ===================================================================
 --- /dev/null
-+++ kconfig/Makefile.br
++++ b/Makefile.br
 @@ -0,0 +1,53 @@
 +src := .
 +top_srcdir=../../
@@ -61,10 +61,10 @@ Index: kconfig/Makefile.br
 +
 +FORCE:
 +.PHONY: FORCE clean distclean
-Index: kconfig/foo.h
+Index: b/foo.h
 ===================================================================
 --- /dev/null
-+++ kconfig/foo.h
++++ b/foo.h
 @@ -0,0 +1,12 @@
 +#ifndef __KCONFIG_FOO_H
 +#define __KCONFIG_FOO_H
diff --git a/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
index 21ca228831..1e0c80396a 100644
--- a/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
+++ b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
@@ -2,11 +2,11 @@
  lxdialog/check-lxdialog.sh |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: config/lxdialog/check-lxdialog.sh
+Index: b/lxdialog/check-lxdialog.sh
 ===================================================================
---- config.orig/lxdialog/check-lxdialog.sh
-+++ config/lxdialog/check-lxdialog.sh
-@@ -33,7 +33,7 @@
+--- a/lxdialog/check-lxdialog.sh
++++ b/lxdialog/check-lxdialog.sh
+@@ -34,7 +34,7 @@
  }
  
  # Temp file, try to clean up after us
diff --git a/support/kconfig/patches/12-fix-glade-file-path.patch b/support/kconfig/patches/12-fix-glade-file-path.patch
index badfc91d81..a5777da3e9 100644
--- a/support/kconfig/patches/12-fix-glade-file-path.patch
+++ b/support/kconfig/patches/12-fix-glade-file-path.patch
@@ -2,11 +2,11 @@
  gconf.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: kconfig/gconf.c
+Index: b/gconf.c
 ===================================================================
---- kconfig.orig/gconf.c
-+++ kconfig/gconf.c
-@@ -1525,7 +1525,7 @@
+--- a/gconf.c
++++ b/gconf.c
+@@ -1486,7 +1486,7 @@
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
  	if (env)
diff --git a/support/kconfig/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
index 8d76df2e65..318d0ddd94 100644
--- a/support/kconfig/patches/14-support-out-of-tree-config.patch
+++ b/support/kconfig/patches/14-support-out-of-tree-config.patch
@@ -4,11 +4,11 @@
  util.c     |   16 +++++++++++++--
  3 files changed, 61 insertions(+), 18 deletions(-)
 
-Index: kconfig/conf.c
+Index: b/conf.c
 ===================================================================
---- kconfig.orig/conf.c
-+++ kconfig/conf.c
-@@ -503,7 +503,6 @@
+--- a/conf.c
++++ b/conf.c
+@@ -547,7 +547,6 @@
  	}
  	name = av[optind];
  	conf_parse(name);
@@ -16,10 +16,10 @@ Index: kconfig/conf.c
  	if (sync_kconfig) {
  		name = conf_get_configname();
  		if (stat(name, &tmpstat)) {
-Index: kconfig/confdata.c
+Index: b/confdata.c
 ===================================================================
---- kconfig.orig/confdata.c
-+++ kconfig/confdata.c
+--- a/confdata.c
++++ b/confdata.c
 @@ -71,9 +71,7 @@
  
  const char *conf_get_autoconfig_name(void)
@@ -31,7 +31,7 @@ Index: kconfig/confdata.c
  }
  
  static char *conf_expand_value(const char *in)
-@@ -563,6 +561,9 @@
+@@ -738,6 +736,9 @@
  	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
  	char *env;
  
@@ -41,7 +41,7 @@ Index: kconfig/confdata.c
  	dirname[0] = 0;
  	if (name && name[0]) {
  		struct stat st;
-@@ -661,6 +662,7 @@
+@@ -832,6 +833,7 @@
  {
  	const char *name;
  	char path[PATH_MAX+1];
@@ -49,7 +49,7 @@ Index: kconfig/confdata.c
  	char *s, *d, c;
  	struct symbol *sym;
  	struct stat sb;
-@@ -669,8 +671,20 @@
+@@ -840,8 +842,20 @@
  	name = conf_get_autoconfig_name();
  	conf_read_simple(name, S_DEF_AUTO);
  
@@ -72,7 +72,7 @@ Index: kconfig/confdata.c
  
  	res = 0;
  	for_all_symbols(i, sym) {
-@@ -763,9 +777,11 @@
+@@ -934,9 +948,11 @@
  		close(fd);
  	}
  out:
@@ -87,7 +87,7 @@ Index: kconfig/confdata.c
  	return res;
  }
  
-@@ -776,25 +792,38 @@
+@@ -946,25 +962,38 @@
  	const char *name;
  	FILE *out, *tristate, *out_h;
  	int i;
@@ -130,7 +130,7 @@ Index: kconfig/confdata.c
  	if (!out_h) {
  		fclose(out);
  		fclose(tristate);
-@@ -871,19 +900,22 @@
+@@ -996,19 +1025,22 @@
  	name = getenv("KCONFIG_AUTOHEADER");
  	if (!name)
  		name = "include/generated/autoconf.h";
@@ -156,11 +156,11 @@ Index: kconfig/confdata.c
  		return 1;
  
  	return 0;
-Index: kconfig/util.c
+Index: b/util.c
 ===================================================================
---- kconfig.orig/util.c
-+++ kconfig/util.c
-@@ -32,6 +32,8 @@
+--- a/util.c
++++ b/util.c
+@@ -34,6 +34,8 @@
  /* write a dependency file as used by kbuild to track dependencies */
  int file_write_dep(const char *name)
  {
@@ -169,7 +169,7 @@ Index: kconfig/util.c
  	struct symbol *sym, *env_sym;
  	struct expr *e;
  	struct file *file;
-@@ -39,7 +41,16 @@
+@@ -41,7 +43,16 @@
  
  	if (!name)
  		name = ".kconfig.d";
@@ -187,7 +187,7 @@ Index: kconfig/util.c
  	if (!out)
  		return 1;
  	fprintf(out, "deps_config := \\\n");
-@@ -70,7 +81,8 @@
+@@ -72,7 +83,8 @@
  
  	fprintf(out, "\n$(deps_config): ;\n");
  	fclose(out);
diff --git a/support/kconfig/patches/15-fix-qconf-moc-rule.patch b/support/kconfig/patches/15-fix-qconf-moc-rule.patch
new file mode 100644
index 0000000000..eae978ebf1
--- /dev/null
+++ b/support/kconfig/patches/15-fix-qconf-moc-rule.patch
@@ -0,0 +1,24 @@
+Fix the rule that generates the .moc file
+
+The Linux kernel has a "cmd" make function, but we don't have it in
+Buildroot, so we need to adjust this rule.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -307,11 +307,8 @@
+ 
+ $(obj)/qconf.o: $(obj)/qconf.moc
+ 
+-quiet_cmd_moc = MOC     $@
+-      cmd_moc = $(KC_QT_MOC) -i $< -o $@
+-
+ $(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
+-	$(call cmd,moc)
++	$(KC_QT_MOC) -i $< -o $@
+ 
+ # Extract gconf menu items for I18N support
+ $(obj)/gconf.glade.h: $(obj)/gconf.glade
diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series
index 573911bdd3..2d0e9919a0 100644
--- a/support/kconfig/patches/series
+++ b/support/kconfig/patches/series
@@ -7,3 +7,4 @@
 11-use-mktemp-for-lxdialog.patch
 12-fix-glade-file-path.patch
 14-support-out-of-tree-config.patch
+15-fix-qconf-moc-rule.patch
diff --git a/support/kconfig/qconf.cc b/support/kconfig/qconf.cc
index c2796b866f..1500c38f0c 100644
--- a/support/kconfig/qconf.cc
+++ b/support/kconfig/qconf.cc
@@ -6,6 +6,7 @@
 #include <qglobal.h>
 
 #if QT_VERSION < 0x040000
+#include <stddef.h>
 #include <qmainwindow.h>
 #include <qvbox.h>
 #include <qvaluelist.h>
@@ -1478,10 +1479,13 @@ void ConfigMainWindow::loadConfig(void)
 	ConfigView::updateListAll();
 }
 
-void ConfigMainWindow::saveConfig(void)
+bool ConfigMainWindow::saveConfig(void)
 {
-	if (conf_write(NULL))
+	if (conf_write(NULL)) {
 		QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+		return false;
+	}
+	return true;
 }
 
 void ConfigMainWindow::saveConfigAs(void)
@@ -1642,7 +1646,11 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
 	mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
 	switch (mb.exec()) {
 	case QMessageBox::Yes:
-		saveConfig();
+		if (saveConfig())
+			e->accept();
+		else
+			e->ignore();
+		break;
 	case QMessageBox::No:
 		e->accept();
 		break;
@@ -1745,10 +1753,6 @@ int main(int ac, char** av)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-#ifndef LKC_DIRECT_LINK
-	kconfig_load();
-#endif
-
 	progname = av[0];
 	configApp = new QApplication(ac, av);
 	if (ac > 1 && av[1][0] == '-') {
diff --git a/support/kconfig/qconf.h b/support/kconfig/qconf.h
index 91677d900d..3715b3e721 100644
--- a/support/kconfig/qconf.h
+++ b/support/kconfig/qconf.h
@@ -311,7 +311,7 @@ public slots:
 	void listFocusChanged(void);
 	void goBack(void);
 	void loadConfig(void);
-	void saveConfig(void);
+	bool saveConfig(void);
 	void saveConfigAs(void);
 	void searchConfig(void);
 	void showSingleView(void);
diff --git a/support/kconfig/streamline_config.pl b/support/kconfig/streamline_config.pl
index a4fe923c01..3368939695 100644
--- a/support/kconfig/streamline_config.pl
+++ b/support/kconfig/streamline_config.pl
@@ -43,6 +43,17 @@
 #    make oldconfig
 #
 use strict;
+use Getopt::Long;
+
+# set the environment variable LOCALMODCONFIG_DEBUG to get
+# debug output.
+my $debugprint = 0;
+$debugprint = 1 if (defined($ENV{LOCALMODCONFIG_DEBUG}));
+
+sub dprint {
+    return if (!$debugprint);
+    print STDERR @_;
+}
 
 my $config = ".config";
 
@@ -89,7 +100,7 @@
 	},
 );
 
-sub find_config {
+sub read_config {
     foreach my $conf (@searchconfigs) {
 	my $file = $conf->{"file"};
 
@@ -104,18 +115,27 @@ sub find_config {
 
 	print STDERR "using config: '$file'\n";
 
-	open(CIN, "$exec $file |") || die "Failed to run $exec $file";
-	return;
+	open(my $infile, '-|', "$exec $file") || die "Failed to run $exec $file";
+	my @x = <$infile>;
+	close $infile;
+	return @x;
     }
     die "No config file found";
 }
 
-find_config;
+my @config_file = read_config;
+
+# Parse options
+my $localmodconfig = 0;
+my $localyesconfig = 0;
+
+GetOptions("localmodconfig" => \$localmodconfig,
+	   "localyesconfig" => \$localyesconfig);
 
 # Get the build source and top level Kconfig file (passed in)
-my $ksource = $ARGV[0];
+my $ksource = ($ARGV[0] ? $ARGV[0] : '.');
 my $kconfig = $ARGV[1];
-my $lsmod_file = $ARGV[2];
+my $lsmod_file = $ENV{'LSMOD'};
 
 my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
 chomp @makefiles;
@@ -151,8 +171,8 @@ sub read_kconfig {
 	$source =~ s/\$$env/$ENV{$env}/;
     }
 
-    open(KIN, "$source") || die "Can't open $kconfig";
-    while (<KIN>) {
+    open(my $kinfile, '<', $source) || die "Can't open $kconfig";
+    while (<$kinfile>) {
 	chomp;
 
 	# Make sure that lines ending with \ continue
@@ -178,6 +198,7 @@ sub read_kconfig {
 	    $state = "NEW";
 	    $config = $2;
 
+	    # Add depends for 'if' nesting
 	    for (my $i = 0; $i < $iflevel; $i++) {
 		if ($i) {
 		    $depends{$config} .= " " . $ifdeps[$i];
@@ -196,10 +217,11 @@ sub read_kconfig {
 
 	# Get the configs that select this config
 	} elsif ($state ne "NONE" && /^\s*select\s+(\S+)/) {
-	    if (defined($selects{$1})) {
-		$selects{$1} .= " " . $config;
+	    my $conf = $1;
+	    if (defined($selects{$conf})) {
+		$selects{$conf} .= " " . $config;
 	    } else {
-		$selects{$1} = $config;
+		$selects{$conf} = $config;
 	    }
 
 	# configs without prompts must be selected
@@ -227,10 +249,10 @@ sub read_kconfig {
 	    $state = "NONE";
 	}
     }
-    close(KIN);
+    close($kinfile);
 
     # read in any configs that were found.
-    foreach $kconfig (@kconfigs) {
+    foreach my $kconfig (@kconfigs) {
 	if (!defined($read_kconfigs{$kconfig})) {
 	    $read_kconfigs{$kconfig} = 1;
 	    read_kconfig($kconfig);
@@ -242,33 +264,63 @@ sub read_kconfig {
     read_kconfig($kconfig);
 }
 
+# Makefiles can use variables to define their dependencies
+sub convert_vars {
+    my ($line, %vars) = @_;
+
+    my $process = "";
+
+    while ($line =~ s/^(.*?)(\$\((.*?)\))//) {
+	my $start = $1;
+	my $variable = $2;
+	my $var = $3;
+
+	if (defined($vars{$var})) {
+	    $process .= $start . $vars{$var};
+	} else {
+	    $process .= $start . $variable;
+	}
+    }
+
+    $process .= $line;
+
+    return $process;
+}
+
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
 
-    my $cont = 0;
+    my $line = "";
+    my %make_vars;
+
+    open(my $infile, '<', $makefile) || die "Can't open $makefile";
+    while (<$infile>) {
+	# if this line ends with a backslash, continue
+	chomp;
+	if (/^(.*)\\$/) {
+	    $line .= $1;
+	    next;
+	}
+
+	$line .= $_;
+	$_ = $line;
+	$line = "";
 
-    open(MIN,$makefile) || die "Can't open $makefile";
-    while (<MIN>) {
 	my $objs;
 
-	# is this a line after a line with a backslash?
-	if ($cont && /(\S.*)$/) {
-	    $objs = $1;
-	}
-	$cont = 0;
+	# Convert variables in a line (could define configs)
+	$_ = convert_vars($_, %make_vars);
 
 	# collect objects after obj-$(CONFIG_FOO_BAR)
 	if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
 	    $var = $1;
 	    $objs = $2;
+
+	# check if variables are set
+	} elsif (/^\s*(\S+)\s*[:]?=\s*(.*\S)/) {
+	    $make_vars{$1} = $2;
 	}
 	if (defined($objs)) {
-	    # test if the line ends with a backslash
-	    if ($objs =~ m,(.*)\\$,) {
-		$objs = $1;
-		$cont = 1;
-	    }
-
 	    foreach my $obj (split /\s+/,$objs) {
 		$obj =~ s/-/_/g;
 		if ($obj =~ /(.*)\.o$/) {
@@ -289,22 +341,24 @@ sub read_kconfig {
 	    }
 	}
     }
-    close(MIN);
+    close($infile);
 }
 
 my %modules;
+my $linfile;
 
 if (defined($lsmod_file)) {
     if ( ! -f $lsmod_file) {
-	die "$lsmod_file not found";
-    }
-    if ( -x $lsmod_file) {
-	# the file is executable, run it
-	open(LIN, "$lsmod_file|");
-    } else {
-	# Just read the contents
-	open(LIN, "$lsmod_file");
+	if ( -f $ENV{'objtree'}."/".$lsmod_file) {
+	    $lsmod_file = $ENV{'objtree'}."/".$lsmod_file;
+	} else {
+		die "$lsmod_file not found";
+	}
     }
+
+    my $otype = ( -x $lsmod_file) ? '-|' : '<';
+    open($linfile, $otype, $lsmod_file);
+
 } else {
 
     # see what modules are loaded on this system
@@ -321,25 +375,27 @@ sub read_kconfig {
 	$lsmod = "lsmod";
     }
 
-    open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod";
+    open($linfile, '-|', $lsmod) || die "Can not call lsmod with $lsmod";
 }
 
-while (<LIN>) {
+while (<$linfile>) {
 	next if (/^Module/);  # Skip the first line.
 	if (/^(\S+)/) {
 		$modules{$1} = 1;
 	}
 }
-close (LIN);
+close ($linfile);
 
 # add to the configs hash all configs that are needed to enable
-# a loaded module.
+# a loaded module. This is a direct obj-${CONFIG_FOO} += bar.o
+# where we know we need bar.o so we add FOO to the list.
 my %configs;
 foreach my $module (keys(%modules)) {
     if (defined($objects{$module})) {
 	my @arr = @{$objects{$module}};
 	foreach my $conf (@arr) {
 	    $configs{$conf} = $module;
+	    dprint "$conf added by direct ($module)\n";
 	}
     } else {
 	# Most likely, someone has a custom (binary?) module loaded.
@@ -347,9 +403,24 @@ sub read_kconfig {
     }
 }
 
+# Read the current config, and see what is enabled. We want to
+# ignore configs that we would not enable anyway.
+
+my %orig_configs;
 my $valid = "A-Za-z_0-9";
+
+foreach my $line (@config_file) {
+    $_ = $line;
+
+    if (/(CONFIG_[$valid]*)=(m|y)/) {
+	$orig_configs{$1} = $2;
+    }
+}
+
 my $repeat = 1;
 
+my $depconfig;
+
 #
 # Note, we do not care about operands (like: &&, ||, !) we want to add any
 # config that is in the depend list of another config. This script does
@@ -358,7 +429,7 @@ sub read_kconfig {
 # to keep on. If A was on in the original config, B would not have been
 # and B would not be turned on by this script.
 #
-sub parse_config_dep_select
+sub parse_config_depends
 {
     my ($p) = @_;
 
@@ -369,10 +440,16 @@ sub parse_config_dep_select
 
 	    $p =~ s/^[^$valid]*[$valid]+//;
 
+	    # We only need to process if the depend config is a module
+	    if (!defined($orig_configs{$conf}) || !$orig_configs{conf} eq "m") {
+		next;
+	    }
+
 	    if (!defined($configs{$conf})) {
 		# We must make sure that this config has its
 		# dependencies met.
 		$repeat = 1; # do again
+		dprint "$conf selected by depend $depconfig\n";
 		$configs{$conf} = 1;
 	    }
 	} else {
@@ -381,31 +458,132 @@ sub parse_config_dep_select
     }
 }
 
-while ($repeat) {
-    $repeat = 0;
+# Select is treated a bit differently than depends. We call this
+# when a config has no prompt and requires another config to be
+# selected. We use to just select all configs that selected this
+# config, but found that that can balloon into enabling hundreds
+# of configs that we do not care about.
+#
+# The idea is we look at all the configs that select it. If one
+# is already in our list of configs to enable, then there's nothing
+# else to do. If there isn't, we pick the first config that was
+# enabled in the orignal config and use that.
+sub parse_config_selects
+{
+    my ($config, $p) = @_;
 
-    foreach my $config (keys %configs) {
-	$config =~ s/^CONFIG_//;
+    my $next_config;
+
+    while ($p =~ /[$valid]/) {
+
+	if ($p =~ /^[^$valid]*([$valid]+)/) {
+	    my $conf = "CONFIG_" . $1;
 
-	if (defined($depends{$config})) {
-	    # This config has dependencies. Make sure they are also included
-	    parse_config_dep_select $depends{$config};
+	    $p =~ s/^[^$valid]*[$valid]+//;
+
+	    # Make sure that this config exists in the current .config file
+	    if (!defined($orig_configs{$conf})) {
+		dprint "$conf not set for $config select\n";
+		next;
+	    }
+
+	    # Check if something other than a module selects this config
+	    if (defined($orig_configs{$conf}) && $orig_configs{$conf} ne "m") {
+		dprint "$conf (non module) selects config, we are good\n";
+		# we are good with this
+		return;
+	    }
+	    if (defined($configs{$conf})) {
+		dprint "$conf selects $config so we are good\n";
+		# A set config selects this config, we are good
+		return;
+	    }
+	    # Set this config to be selected
+	    if (!defined($next_config)) {
+		$next_config = $conf;
+	    }
+	} else {
+	    die "this should never happen";
 	}
+    }
 
-	if (defined($prompts{$config}) || !defined($selects{$config})) {
-	    next;
+    # If no possible config selected this, then something happened.
+    if (!defined($next_config)) {
+	print STDERR "WARNING: $config is required, but nothing in the\n";
+	print STDERR "  current config selects it.\n";
+	return;
+    }
+
+    # If we are here, then we found no config that is set and
+    # selects this config. Repeat.
+    $repeat = 1;
+    # Make this config need to be selected
+    $configs{$next_config} = 1;
+    dprint "$next_config selected by select $config\n";
+}
+
+my %process_selects;
+
+# loop through all configs, select their dependencies.
+sub loop_depend {
+    $repeat = 1;
+
+    while ($repeat) {
+	$repeat = 0;
+
+      forloop:
+	foreach my $config (keys %configs) {
+
+	    # If this config is not a module, we do not need to process it
+	    if (defined($orig_configs{$config}) && $orig_configs{$config} ne "m") {
+		next forloop;
+	    }
+
+	    $config =~ s/^CONFIG_//;
+	    $depconfig = $config;
+
+	    if (defined($depends{$config})) {
+		# This config has dependencies. Make sure they are also included
+		parse_config_depends $depends{$config};
+	    }
+
+	    # If the config has no prompt, then we need to check if a config
+	    # that is enabled selected it. Or if we need to enable one.
+	    if (!defined($prompts{$config}) && defined($selects{$config})) {
+		$process_selects{$config} = 1;
+	    }
 	}
+    }
+}
+
+sub loop_select {
+
+    foreach my $config (keys %process_selects) {
+	$config =~ s/^CONFIG_//;
+
+	dprint "Process select $config\n";
 
 	# config has no prompt and must be selected.
-	parse_config_dep_select $selects{$config};
+	parse_config_selects $config, $selects{$config};
     }
 }
 
+while ($repeat) {
+    # Get the first set of configs and their dependencies.
+    loop_depend;
+
+    $repeat = 0;
+
+    # Now we need to see if we have to check selects;
+    loop_select;
+}	    
+
 my %setconfigs;
 
 # Finally, read the .config file and turn off any module enabled that
 # we could not find a reason to keep enabled.
-while(<CIN>) {
+foreach my $line (@config_file) {
+    $_ = $line;
 
     if (/CONFIG_IKCONFIG/) {
 	if (/# CONFIG_IKCONFIG is not set/) {
@@ -421,7 +599,13 @@ sub parse_config_dep_select
 
     if (/^(CONFIG.*)=(m|y)/) {
 	if (defined($configs{$1})) {
-	    $setconfigs{$1} = $2;
+	    if ($localyesconfig) {
+	        $setconfigs{$1} = 'y';
+		print "$1=y\n";
+		next;
+	    } else {
+	        $setconfigs{$1} = $2;
+	    }
 	} elsif ($2 eq "m") {
 	    print "# $1 is not set\n";
 	    next;
@@ -429,7 +613,6 @@ sub parse_config_dep_select
     }
     print;
 }
-close(CIN);
 
 # Integrity check, make sure all modules that we want enabled do
 # indeed have their configs set.
diff --git a/support/kconfig/symbol.c b/support/kconfig/symbol.c
index a796c95fe8..ecc5aa5f86 100644
--- a/support/kconfig/symbol.c
+++ b/support/kconfig/symbol.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/utsname.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 struct symbol symbol_yes = {
@@ -263,11 +262,18 @@ static struct symbol *sym_calc_choice(struct symbol *sym)
 	struct symbol *def_sym;
 	struct property *prop;
 	struct expr *e;
+	int flags;
 
 	/* first calculate all choice values' visibilities */
+	flags = sym->flags;
 	prop = sym_get_choice_prop(sym);
-	expr_list_for_each_sym(prop->expr, e, def_sym)
+	expr_list_for_each_sym(prop->expr, e, def_sym) {
 		sym_calc_visibility(def_sym);
+		if (def_sym->visible != no)
+			flags &= def_sym->flags;
+	}
+
+	sym->flags &= flags | ~SYMBOL_DEF_USER;
 
 	/* is the user choice visible? */
 	def_sym = sym->def[S_DEF_USER].val;
@@ -650,11 +656,11 @@ bool sym_set_string_value(struct symbol *sym, const char *newval)
 	size = strlen(newval) + 1;
 	if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) {
 		size += 2;
-		sym->def[S_DEF_USER].val = val = malloc(size);
+		sym->def[S_DEF_USER].val = val = xmalloc(size);
 		*val++ = '0';
 		*val++ = 'x';
 	} else if (!oldval || strcmp(oldval, newval))
-		sym->def[S_DEF_USER].val = val = malloc(size);
+		sym->def[S_DEF_USER].val = val = xmalloc(size);
 	else
 		return true;
 
@@ -751,7 +757,8 @@ const char *sym_get_string_value(struct symbol *sym)
 		case no:
 			return "n";
 		case mod:
-			return "m";
+			sym_calc_value(modules_sym);
+			return (modules_sym->curr.tri == no) ? "n" : "m";
 		case yes:
 			return "y";
 		}
@@ -805,7 +812,7 @@ struct symbol *sym_lookup(const char *name, int flags)
 		hash = 0;
 	}
 
-	symbol = malloc(sizeof(*symbol));
+	symbol = xmalloc(sizeof(*symbol));
 	memset(symbol, 0, sizeof(*symbol));
 	symbol->name = new_name;
 	symbol->type = S_UNKNOWN;
@@ -856,7 +863,7 @@ const char *sym_expand_string_value(const char *in)
 	size_t reslen;
 
 	reslen = strlen(in) + 1;
-	res = malloc(reslen);
+	res = xmalloc(reslen);
 	res[0] = '\0';
 
 	while ((src = strchr(in, '$'))) {
@@ -893,6 +900,49 @@ const char *sym_expand_string_value(const char *in)
 	return res;
 }
 
+const char *sym_escape_string_value(const char *in)
+{
+	const char *p;
+	size_t reslen;
+	char *res;
+	size_t l;
+
+	reslen = strlen(in) + strlen("\"\"") + 1;
+
+	p = in;
+	for (;;) {
+		l = strcspn(p, "\"\\");
+		p += l;
+
+		if (p[0] == '\0')
+			break;
+
+		reslen++;
+		p++;
+	}
+
+	res = xmalloc(reslen);
+	res[0] = '\0';
+
+	strcat(res, "\"");
+
+	p = in;
+	for (;;) {
+		l = strcspn(p, "\"\\");
+		strncat(res, p, l);
+		p += l;
+
+		if (p[0] == '\0')
+			break;
+
+		strcat(res, "\\");
+		strncat(res, p++, 1);
+	}
+
+	strcat(res, "\"");
+	return res;
+}
+
 struct symbol **sym_re_search(const char *pattern)
 {
 	struct symbol *sym, **sym_arr = NULL;
@@ -1178,7 +1228,7 @@ struct property *prop_alloc(enum prop_type type, struct symbol *sym)
 	struct property *prop;
 	struct property **propp;
 
-	prop = malloc(sizeof(*prop));
+	prop = xmalloc(sizeof(*prop));
 	memset(prop, 0, sizeof(*prop));
 	prop->type = type;
 	prop->sym = sym;
diff --git a/support/kconfig/util.c b/support/kconfig/util.c
index 6edd8a3d12..60eb566180 100644
--- a/support/kconfig/util.c
+++ b/support/kconfig/util.c
@@ -5,6 +5,8 @@
  * Released under the terms of the GNU GPL v2.0.
  */
 
+#include <stdarg.h>
+#include <stdlib.h>
 #include <string.h>
 #include "lkc.h"
 
@@ -21,7 +23,7 @@ struct file *file_lookup(const char *name)
 		}
 	}
 
-	file = malloc(sizeof(*file));
+	file = xmalloc(sizeof(*file));
 	memset(file, 0, sizeof(*file));
 	file->name = file_name;
 	file->next = file_list;
@@ -91,7 +93,7 @@ int file_write_dep(const char *name)
 struct gstr str_new(void)
 {
 	struct gstr gs;
-	gs.s = malloc(sizeof(char) * 64);
+	gs.s = xmalloc(sizeof(char) * 64);
 	gs.len = 64;
 	gs.max_width = 0;
 	strcpy(gs.s, "\0");
@@ -148,3 +150,22 @@ const char *str_get(struct gstr *gs)
 	return gs->s;
 }
 
+void *xmalloc(size_t size)
+{
+	void *p = malloc(size);
+	if (p)
+		return p;
+	fprintf(stderr, "Out of memory.\n");
+	exit(1);
+}
+
+void *xcalloc(size_t nmemb, size_t size)
+{
+	void *p = calloc(nmemb, size);
+	if (p)
+		return p;
+	fprintf(stderr, "Out of memory.\n");
+	exit(1);
+}
+
+
diff --git a/support/kconfig/zconf.gperf b/support/kconfig/zconf.gperf
index c9e690eb75..f14ab41154 100644
--- a/support/kconfig/zconf.gperf
+++ b/support/kconfig/zconf.gperf
@@ -9,7 +9,7 @@
 
 struct kconf_id;
 
-static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
+static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
 
 %%
 mainmenu,	T_MAINMENU,	TF_COMMAND
diff --git a/support/kconfig/zconf.hash.c_shipped b/support/kconfig/zconf.hash.c_shipped
index 4055d5de17..40df0005da 100644
--- a/support/kconfig/zconf.hash.c_shipped
+++ b/support/kconfig/zconf.hash.c_shipped
@@ -1,6 +1,5 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: gperf  */
-/* Computed positions: -k'1,3' */
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -29,10 +28,11 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
+#line 10 "scripts/kconfig/zconf.gperf"
 struct kconf_id;
 
-static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
-/* maximum key range = 50, duplicates = 0 */
+static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
+/* maximum key range = 71, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -44,34 +44,34 @@ inline
 static unsigned int
 kconf_id_hash (register const char *str, register unsigned int len)
 {
-  static unsigned char asso_values[] =
+  static const unsigned char asso_values[] =
     {
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 40,  5,
-       0,  0,  5, 52,  0, 20, 52, 52, 10, 20,
-       5,  0, 35, 52,  0, 30,  0, 15,  0, 52,
-      15, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-      52, 52, 52, 52, 52, 52
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 25, 25,
+       0,  0,  0,  5,  0,  0, 73, 73,  5,  0,
+      10,  5, 45, 73, 20, 20,  0, 15, 15, 73,
+      20, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73
     };
   register int hval = len;
 
@@ -85,87 +85,87 @@ kconf_id_hash (register const char *str, register unsigned int len)
         hval += asso_values[(unsigned char)str[0]];
         break;
     }
-  return hval;
+  return hval + asso_values[(unsigned char)str[len - 1]];
 }
 
 struct kconf_id_strings_t
   {
-    char kconf_id_strings_str2[sizeof("on")];
-    char kconf_id_strings_str3[sizeof("env")];
+    char kconf_id_strings_str2[sizeof("if")];
+    char kconf_id_strings_str3[sizeof("int")];
     char kconf_id_strings_str5[sizeof("endif")];
-    char kconf_id_strings_str6[sizeof("option")];
-    char kconf_id_strings_str7[sizeof("endmenu")];
-    char kconf_id_strings_str8[sizeof("optional")];
+    char kconf_id_strings_str7[sizeof("default")];
+    char kconf_id_strings_str8[sizeof("tristate")];
     char kconf_id_strings_str9[sizeof("endchoice")];
-    char kconf_id_strings_str10[sizeof("range")];
-    char kconf_id_strings_str11[sizeof("choice")];
-    char kconf_id_strings_str12[sizeof("default")];
+    char kconf_id_strings_str12[sizeof("def_tristate")];
     char kconf_id_strings_str13[sizeof("def_bool")];
-    char kconf_id_strings_str14[sizeof("help")];
-    char kconf_id_strings_str16[sizeof("config")];
-    char kconf_id_strings_str17[sizeof("def_tristate")];
-    char kconf_id_strings_str18[sizeof("hex")];
-    char kconf_id_strings_str19[sizeof("defconfig_list")];
-    char kconf_id_strings_str22[sizeof("if")];
-    char kconf_id_strings_str23[sizeof("int")];
+    char kconf_id_strings_str14[sizeof("defconfig_list")];
+    char kconf_id_strings_str17[sizeof("on")];
+    char kconf_id_strings_str18[sizeof("optional")];
+    char kconf_id_strings_str21[sizeof("option")];
+    char kconf_id_strings_str22[sizeof("endmenu")];
+    char kconf_id_strings_str23[sizeof("mainmenu")];
+    char kconf_id_strings_str25[sizeof("menuconfig")];
     char kconf_id_strings_str27[sizeof("modules")];
-    char kconf_id_strings_str28[sizeof("tristate")];
     char kconf_id_strings_str29[sizeof("menu")];
+    char kconf_id_strings_str31[sizeof("select")];
     char kconf_id_strings_str32[sizeof("comment")];
-    char kconf_id_strings_str35[sizeof("menuconfig")];
-    char kconf_id_strings_str36[sizeof("string")];
-    char kconf_id_strings_str37[sizeof("visible")];
-    char kconf_id_strings_str41[sizeof("prompt")];
-    char kconf_id_strings_str42[sizeof("depends")];
-    char kconf_id_strings_str44[sizeof("bool")];
-    char kconf_id_strings_str46[sizeof("select")];
+    char kconf_id_strings_str33[sizeof("env")];
+    char kconf_id_strings_str35[sizeof("range")];
+    char kconf_id_strings_str36[sizeof("choice")];
+    char kconf_id_strings_str39[sizeof("bool")];
+    char kconf_id_strings_str41[sizeof("source")];
+    char kconf_id_strings_str42[sizeof("visible")];
+    char kconf_id_strings_str43[sizeof("hex")];
+    char kconf_id_strings_str46[sizeof("config")];
     char kconf_id_strings_str47[sizeof("boolean")];
-    char kconf_id_strings_str48[sizeof("mainmenu")];
-    char kconf_id_strings_str51[sizeof("source")];
+    char kconf_id_strings_str51[sizeof("string")];
+    char kconf_id_strings_str54[sizeof("help")];
+    char kconf_id_strings_str56[sizeof("prompt")];
+    char kconf_id_strings_str72[sizeof("depends")];
   };
-static struct kconf_id_strings_t kconf_id_strings_contents =
+static const struct kconf_id_strings_t kconf_id_strings_contents =
   {
-    "on",
-    "env",
+    "if",
+    "int",
     "endif",
-    "option",
-    "endmenu",
-    "optional",
-    "endchoice",
-    "range",
-    "choice",
     "default",
-    "def_bool",
-    "help",
-    "config",
+    "tristate",
+    "endchoice",
     "def_tristate",
-    "hex",
+    "def_bool",
     "defconfig_list",
-    "if",
-    "int",
+    "on",
+    "optional",
+    "option",
+    "endmenu",
+    "mainmenu",
+    "menuconfig",
     "modules",
-    "tristate",
     "menu",
+    "select",
     "comment",
-    "menuconfig",
-    "string",
-    "visible",
-    "prompt",
-    "depends",
+    "env",
+    "range",
+    "choice",
     "bool",
-    "select",
+    "source",
+    "visible",
+    "hex",
+    "config",
     "boolean",
-    "mainmenu",
-    "source"
+    "string",
+    "help",
+    "prompt",
+    "depends"
   };
 #define kconf_id_strings ((const char *) &kconf_id_strings_contents)
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
-struct kconf_id *
+const struct kconf_id *
 kconf_id_lookup (register const char *str, register unsigned int len)
 {
   enum
@@ -174,54 +174,94 @@ kconf_id_lookup (register const char *str, register unsigned int len)
       MIN_WORD_LENGTH = 2,
       MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 2,
-      MAX_HASH_VALUE = 51
+      MAX_HASH_VALUE = 72
     };
 
-  static struct kconf_id wordlist[] =
+  static const struct kconf_id wordlist[] =
     {
       {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_ON,		TF_PARAM},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,		T_OPT_ENV,	TF_OPTION},
+#line 25 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_IF,		TF_COMMAND|TF_PARAM},
+#line 36 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,		T_TYPE,		TF_COMMAND, S_INT},
       {-1},
+#line 26 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_OPTION,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_ENDMENU,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_OPTIONAL,	TF_COMMAND},
+      {-1},
+#line 29 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
+#line 31 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_TYPE,		TF_COMMAND, S_TRISTATE},
+#line 20 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,		T_RANGE,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,		T_CHOICE,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
+      {-1}, {-1},
+#line 32 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
+#line 35 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,		T_HELP,		TF_COMMAND},
-      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,		T_CONFIG,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,		T_TYPE,		TF_COMMAND, S_HEX},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19,	T_OPT_DEFCONFIG_LIST,TF_OPTION},
+#line 45 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,	T_OPT_DEFCONFIG_LIST,TF_OPTION},
       {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,		T_IF,		TF_COMMAND|TF_PARAM},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,		T_TYPE,		TF_COMMAND, S_INT},
-      {-1}, {-1}, {-1},
+#line 43 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,		T_ON,		TF_PARAM},
+#line 28 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,	T_OPTIONAL,	TF_COMMAND},
+      {-1}, {-1},
+#line 42 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_OPTION,	TF_COMMAND},
+#line 17 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,	T_ENDMENU,	TF_COMMAND},
+#line 15 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,	T_MAINMENU,	TF_COMMAND},
+      {-1},
+#line 23 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25,	T_MENUCONFIG,	TF_COMMAND},
+      {-1},
+#line 44 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_OPT_MODULES,	TF_OPTION},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_TYPE,		TF_COMMAND, S_TRISTATE},
+      {-1},
+#line 16 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,		T_MENU,		TF_COMMAND},
-      {-1}, {-1},
+      {-1},
+#line 39 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SELECT,	TF_COMMAND},
+#line 21 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},
-      {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,	T_MENUCONFIG,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,		T_TYPE,		TF_COMMAND, S_STRING},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,	T_VISIBLE,	TF_COMMAND},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_PROMPT,	TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_DEPENDS,	TF_COMMAND},
+#line 46 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,		T_OPT_ENV,	TF_OPTION},
       {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44,		T_TYPE,		TF_COMMAND, S_BOOLEAN},
+#line 40 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,		T_RANGE,	TF_COMMAND},
+#line 19 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,		T_CHOICE,	TF_COMMAND},
+      {-1}, {-1},
+#line 33 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39,		T_TYPE,		TF_COMMAND, S_BOOLEAN},
       {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,		T_SELECT,	TF_COMMAND},
+#line 18 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_SOURCE,	TF_COMMAND},
+#line 41 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_VISIBLE,	TF_COMMAND},
+#line 37 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43,		T_TYPE,		TF_COMMAND, S_HEX},
+      {-1}, {-1},
+#line 22 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,		T_CONFIG,	TF_COMMAND},
+#line 34 "scripts/kconfig/zconf.gperf"
       {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47,	T_TYPE,		TF_COMMAND, S_BOOLEAN},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48,	T_MAINMENU,	TF_COMMAND},
+      {-1}, {-1}, {-1},
+#line 38 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51,		T_TYPE,		TF_COMMAND, S_STRING},
       {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51,		T_SOURCE,	TF_COMMAND}
+#line 24 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str54,		T_HELP,		TF_COMMAND},
+      {-1},
+#line 30 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56,		T_PROMPT,	TF_COMMAND},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 27 "scripts/kconfig/zconf.gperf"
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72,	T_DEPENDS,	TF_COMMAND}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -242,4 +282,5 @@ kconf_id_lookup (register const char *str, register unsigned int len)
     }
   return 0;
 }
+#line 47 "scripts/kconfig/zconf.gperf"
 
diff --git a/support/kconfig/zconf.l b/support/kconfig/zconf.l
index b22f884f90..6555a47545 100644
--- a/support/kconfig/zconf.l
+++ b/support/kconfig/zconf.l
@@ -1,5 +1,5 @@
-%option backup nostdinit noyywrap never-interactive full ecs
-%option 8bit backup nodefault perf-report perf-report
+%option nostdinit noyywrap never-interactive full ecs
+%option 8bit nodefault perf-report perf-report
 %option noinput
 %x COMMAND HELP STRING PARAM
 %{
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 #define START_STRSIZE	16
@@ -41,7 +40,7 @@ static void zconf_endfile(void);
 
 static void new_string(void)
 {
-	text = malloc(START_STRSIZE);
+	text = xmalloc(START_STRSIZE);
 	text_asize = START_STRSIZE;
 	text_size = 0;
 	*text = 0;
@@ -63,7 +62,7 @@ static void append_string(const char *str, int size)
 
 static void alloc_string(const char *str, int size)
 {
-	text = malloc(size + 1);
+	text = xmalloc(size + 1);
 	memcpy(text, str, size);
 	text[size] = 0;
 }
@@ -96,7 +95,7 @@ n	[A-Za-z0-9_]
 
 <COMMAND>{
 	{n}+	{
-		struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+		const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
 		BEGIN(PARAM);
 		current_pos.file = current_file;
 		current_pos.lineno = current_file->lineno;
@@ -132,7 +131,7 @@ n	[A-Za-z0-9_]
 	\n	BEGIN(INITIAL); current_file->lineno++; return T_EOL;
 	---	/* ignore */
 	({n}|[-/.])+	{
-		struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+		const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
 		if (id && id->flags & TF_PARAM) {
 			zconflval.id = id;
 			return id->token;
@@ -289,7 +288,7 @@ void zconf_initscan(const char *name)
 		exit(1);
 	}
 
-	current_buf = malloc(sizeof(*current_buf));
+	current_buf = xmalloc(sizeof(*current_buf));
 	memset(current_buf, 0, sizeof(*current_buf));
 
 	current_file = file_lookup(name);
@@ -300,7 +299,7 @@ void zconf_nextfile(const char *name)
 {
 	struct file *iter;
 	struct file *file = file_lookup(name);
-	struct buffer *buf = malloc(sizeof(*buf));
+	struct buffer *buf = xmalloc(sizeof(*buf));
 	memset(buf, 0, sizeof(*buf));
 
 	current_buf->state = YY_CURRENT_BUFFER;
diff --git a/support/kconfig/lex.zconf.c_shipped b/support/kconfig/zconf.lex.c_shipped
similarity index 98%
rename from support/kconfig/lex.zconf.c_shipped
rename to support/kconfig/zconf.lex.c_shipped
index d9182916f7..a0521aa597 100644
--- a/support/kconfig/lex.zconf.c_shipped
+++ b/support/kconfig/zconf.lex.c_shipped
@@ -1,5 +1,5 @@
 
-#line 3 "scripts/kconfig/lex.zconf.c"
+#line 3 "scripts/kconfig/zconf.lex.c_shipped"
 
 #define  YY_INT_ALIGNED short int
 
@@ -72,6 +72,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -102,8 +103,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -160,15 +159,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -785,7 +776,6 @@ char *zconftext;
 #include <string.h>
 #include <unistd.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 #define START_STRSIZE	16
@@ -812,7 +802,7 @@ static void zconf_endfile(void);
 
 static void new_string(void)
 {
-	text = malloc(START_STRSIZE);
+	text = xmalloc(START_STRSIZE);
 	text_asize = START_STRSIZE;
 	text_size = 0;
 	*text = 0;
@@ -834,7 +824,7 @@ static void append_string(const char *str, int size)
 
 static void alloc_string(const char *str, int size)
 {
-	text = malloc(size + 1);
+	text = xmalloc(size + 1);
 	memcpy(text, str, size);
 	text[size] = 0;
 }
@@ -922,12 +912,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1100,7 +1085,7 @@ YY_RULE_SETUP
 case 6:
 YY_RULE_SETUP
 {
-		struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+		const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
 		BEGIN(PARAM);
 		current_pos.file = current_file;
 		current_pos.lineno = current_file->lineno;
@@ -1175,7 +1160,7 @@ YY_RULE_SETUP
 case 19:
 YY_RULE_SETUP
 {
-		struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+		const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
 		if (id && id->flags & TF_PARAM) {
 			zconflval.id = id;
 			return id->token;
@@ -2073,8 +2058,8 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
@@ -2358,7 +2343,7 @@ void zconf_initscan(const char *name)
 		exit(1);
 	}
 
-	current_buf = malloc(sizeof(*current_buf));
+	current_buf = xmalloc(sizeof(*current_buf));
 	memset(current_buf, 0, sizeof(*current_buf));
 
 	current_file = file_lookup(name);
@@ -2369,7 +2354,7 @@ void zconf_nextfile(const char *name)
 {
 	struct file *iter;
 	struct file *file = file_lookup(name);
-	struct buffer *buf = malloc(sizeof(*buf));
+	struct buffer *buf = xmalloc(sizeof(*buf));
 	memset(buf, 0, sizeof(*buf));
 
 	current_buf->state = YY_CURRENT_BUFFER;
diff --git a/support/kconfig/zconf.tab.c_shipped b/support/kconfig/zconf.tab.c_shipped
index c27391d42b..47fa84904c 100644
--- a/support/kconfig/zconf.tab.c_shipped
+++ b/support/kconfig/zconf.tab.c_shipped
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -88,7 +87,6 @@
 #include <string.h>
 #include <stdbool.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
@@ -102,22 +100,18 @@ extern int zconflex(void);
 static void zconfprint(const char *err, ...);
 static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
-static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 
 static struct menu *current_menu, *current_entry;
 
-#define YYDEBUG 0
-#if YYDEBUG
-#define YYERROR_VERBOSE
-#endif
 
 
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 
 /* Enabling verbose error messages.  */
@@ -188,7 +182,7 @@ typedef union YYSTYPE
 	struct symbol *symbol;
 	struct expr *expr;
 	struct menu *menu;
-	struct kconf_id *id;
+	const struct kconf_id *id;
 
 
 
@@ -255,7 +249,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -535,18 +529,18 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   108,   108,   108,   110,   110,   112,   114,   115,   116,
-     117,   118,   119,   123,   127,   127,   127,   127,   127,   127,
-     127,   127,   131,   132,   133,   134,   135,   136,   140,   141,
-     147,   155,   161,   169,   179,   181,   182,   183,   184,   185,
-     186,   189,   197,   203,   213,   219,   225,   228,   230,   241,
-     242,   247,   256,   261,   269,   272,   274,   275,   276,   277,
-     278,   281,   287,   298,   304,   314,   316,   321,   329,   337,
-     340,   342,   343,   344,   349,   356,   363,   368,   376,   379,
-     381,   382,   383,   386,   394,   401,   408,   414,   421,   423,
-     424,   425,   428,   436,   438,   439,   442,   449,   451,   456,
-     457,   460,   461,   462,   466,   467,   470,   471,   474,   475,
-     476,   477,   478,   479,   480,   483,   484,   487,   488
+       0,   104,   104,   104,   106,   106,   108,   110,   111,   112,
+     113,   114,   115,   119,   123,   123,   123,   123,   123,   123,
+     123,   123,   127,   128,   129,   130,   131,   132,   136,   137,
+     143,   151,   157,   165,   175,   177,   178,   179,   180,   181,
+     182,   185,   193,   199,   209,   215,   221,   224,   226,   237,
+     238,   243,   252,   257,   265,   268,   270,   271,   272,   273,
+     274,   277,   283,   294,   300,   310,   312,   317,   325,   333,
+     336,   338,   339,   340,   345,   352,   359,   364,   372,   375,
+     377,   378,   379,   382,   390,   397,   404,   410,   417,   419,
+     420,   421,   424,   432,   434,   435,   438,   445,   447,   452,
+     453,   456,   457,   458,   462,   463,   466,   467,   470,   471,
+     472,   473,   474,   475,   476,   479,   480,   483,   484
 };
 #endif
 
@@ -806,9 +800,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -865,7 +868,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -1753,7 +1756,7 @@ yyreduce:
   case 48:
 
     {
-	struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string)));
+	const struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string)));
 	if (id && id->flags & TF_OPTION)
 		menu_add_option(id->token, (yyvsp[(3) - (3)].string));
 	else
@@ -2258,10 +2261,8 @@ void conf_parse(const char *name)
 	modules_sym->flags |= SYMBOL_AUTO;
 	rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
 
-#if YYDEBUG
 	if (getenv("ZCONF_DEBUG"))
 		zconfdebug = 1;
-#endif
 	zconfparse();
 	if (zconfnerrs)
 		exit(1);
@@ -2300,7 +2301,7 @@ static const char *zconf_tokenname(int token)
 	return "<token>";
 }
 
-static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken)
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
 {
 	if (id->token != endtoken) {
 		zconf_error("unexpected '%s' within %s block",
@@ -2345,9 +2346,7 @@ static void zconf_error(const char *err, ...)
 
 static void zconferror(const char *err)
 {
-#if YYDEBUG
 	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
-#endif
 }
 
 static void print_quoted_string(FILE *out, const char *str)
@@ -2496,7 +2495,7 @@ void zconfdump(FILE *out)
 	}
 }
 
-#include "lex.zconf.c"
+#include "zconf.lex.c"
 #include "util.c"
 #include "confdata.c"
 #include "expr.c"
diff --git a/support/kconfig/zconf.y b/support/kconfig/zconf.y
index 0717a32353..92ac107f4e 100644
--- a/support/kconfig/zconf.y
+++ b/support/kconfig/zconf.y
@@ -11,7 +11,6 @@
 #include <string.h>
 #include <stdbool.h>
 
-#define LKC_DIRECT_LINK
 #include "lkc.h"
 
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
@@ -25,16 +24,12 @@ extern int zconflex(void);
 static void zconfprint(const char *err, ...);
 static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
-static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 
 static struct menu *current_menu, *current_entry;
 
-#define YYDEBUG 0
-#if YYDEBUG
-#define YYERROR_VERBOSE
-#endif
 %}
 %expect 30
 
@@ -45,7 +40,7 @@ static struct menu *current_menu, *current_entry;
 	struct symbol *symbol;
 	struct expr *expr;
 	struct menu *menu;
-	struct kconf_id *id;
+	const struct kconf_id *id;
 }
 
 %token <id>T_MAINMENU
@@ -229,7 +224,7 @@ symbol_option_list:
 	  /* empty */
 	| symbol_option_list T_WORD symbol_option_arg
 {
-	struct kconf_id *id = kconf_id_lookup($2, strlen($2));
+	const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
 	if (id && id->flags & TF_OPTION)
 		menu_add_option(id->token, $3);
 	else
@@ -503,10 +498,8 @@ void conf_parse(const char *name)
 	modules_sym->flags |= SYMBOL_AUTO;
 	rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL);
 
-#if YYDEBUG
 	if (getenv("ZCONF_DEBUG"))
 		zconfdebug = 1;
-#endif
 	zconfparse();
 	if (zconfnerrs)
 		exit(1);
@@ -545,7 +538,7 @@ static const char *zconf_tokenname(int token)
 	return "<token>";
 }
 
-static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken)
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
 {
 	if (id->token != endtoken) {
 		zconf_error("unexpected '%s' within %s block",
@@ -590,9 +583,7 @@ static void zconf_error(const char *err, ...)
 
 static void zconferror(const char *err)
 {
-#if YYDEBUG
 	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
-#endif
 }
 
 static void print_quoted_string(FILE *out, const char *str)
@@ -741,7 +732,7 @@ void zconfdump(FILE *out)
 	}
 }
 
-#include "lex.zconf.c"
+#include "zconf.lex.c"
 #include "util.c"
 #include "confdata.c"
 #include "expr.c"

From 9db3b47ea1b37b1ac52561f94ca39fa9cf4ae74c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Apr 2013 11:24:25 +0000
Subject: [PATCH 4726/6849] support/kconfig: add support for olddefconfig

olddefconfig is a new target available in kconfig that allows to take
an old .config file, and update it to the latest version of the code,
without being asked for questions: it automatically assumes the
default value for options whose value was not defined.

It for example allows to take a minimal defconfig, copy it as .config,
and do 'make olddefconfig' to get the full .config.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c95bb1e921..0a91658db1 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setloca
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
 	%_defconfig allyesconfig allnoconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	source-check print-version
+	source-check print-version olddefconfig
 
 # Strip quotes and then whitespaces
 qstrip=$(strip $(subst ",,$(1)))
@@ -693,6 +693,10 @@ silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	$(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN)
 
+olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+	@mkdir -p $(BUILD_DIR)/buildroot-config
+	$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN)
+
 defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
@@ -758,6 +762,8 @@ help:
 	@echo '  xconfig                - interactive Qt-based configurator'
 	@echo '  gconfig                - interactive GTK-based configurator'
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
+	@echo '  silentoldconfig        - Same as oldconfig, but quietly, additionally update deps'
+	@echo '  olddefconfig           - Same as silentoldconfig but sets new symbols to their default value'
 	@echo '  randconfig             - New config with random answer to all options'
 	@echo '  defconfig              - New config with default answer to all options'
 	@echo '                             BR2_DEFCONFIG, if set, is used as input'

From 2f43a9105dac6760ea1f6456e5cf29b956bc4fe7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 10:10:48 +0200
Subject: [PATCH 4727/6849] nitrogen6x_defconfig: drop double linux tarball
 location

Somehow the old setting wasn't dropped in 184850a42 (bump u-boot /
linux versions to current stable).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 9828c8e7be..9b4d473525 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -19,7 +19,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/5f84e92/linux-imx6-5f84e92.tar.gz"
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/2dc5560/linux-imx6-2dc5560.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 099b41b91dc83692460006a6973af0a8bb91f879 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Sun, 7 Apr 2013 22:56:03 +0000
Subject: [PATCH 4728/6849] barebox: add 2013.04.0, remove 2012.12.1

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index f111c04c73..581cc52615 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,13 +8,10 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2013_03
+	default BR2_TARGET_BAREBOX_2013_04
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2012_12
-	bool "2012.12.1"
-
 config BR2_TARGET_BAREBOX_2013_01
 	bool "2013.01.0"
 
@@ -24,6 +21,9 @@ config BR2_TARGET_BAREBOX_2013_02
 config BR2_TARGET_BAREBOX_2013_03
 	bool "2013.03.0"
 
+config BR2_TARGET_BAREBOX_2013_04
+	bool "2013.04.0"
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -41,10 +41,10 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2012.12.1"	if BR2_TARGET_BAREBOX_2012_12
 	default "2013.01.0"	if BR2_TARGET_BAREBOX_2013_01
 	default "2013.02.0"	if BR2_TARGET_BAREBOX_2013_02
 	default "2013.03.0"	if BR2_TARGET_BAREBOX_2013_03
+	default "2013.04.0"	if BR2_TARGET_BAREBOX_2013_04
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 76d9abd810a9739b78b818e982fd6f11ff4dbe67 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:15 +0000
Subject: [PATCH 4729/6849] qt5: disallow the selection of Qt4 and Qt5

As noticed by Arnout, Qt4 and Qt5 cannot be installed together,
because for example the qt.conf installed by one version cannot be
understood by the qmake of another version. We therefore make them
mutually exclusive, which sounds reasonable for the embedded systems
targeted by Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 1c9f8a6342..9e9104a565 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_USE_WCHAR
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PACKAGE_QT
 	help
 	  This option enables the Qt5 framework. Sub-options allow to
 	  select which modules should be built.

From 2f5de0c465c9a15fbf63357d390510e27667e47d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 13:50:59 +0000
Subject: [PATCH 4730/6849] xdriver_xf86-video-intel: only available for i386
 and x86_64

Fixes build failures on other architectures.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-intel/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 595eae5d64..c972ce141e 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -7,5 +7,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_MESA3D
+	depends on (BR2_i386 || BR2_x86_64)
 	help
 	  Intel video driver

From 1413447256167c27364217a905ee2a4fce77df4f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 14:25:59 +0000
Subject: [PATCH 4731/6849] xdriver_xf86-video-geode: only available for i386
 and x86_64

Builtin-video from NSC/AMD Geode x86 processors.
Fixes build failures on other architectures.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xdriver_xf86-video-geode/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xdriver_xf86-video-geode/Config.in b/package/x11r7/xdriver_xf86-video-geode/Config.in
index 2d2e5bce95..2b868d0d45 100644
--- a/package/x11r7/xdriver_xf86-video-geode/Config.in
+++ b/package/x11r7/xdriver_xf86-video-geode/Config.in
@@ -5,5 +5,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
+	depends on (BR2_i386 || BR2_x86_64)
 	help
 	  video driver for geode device

From 0f1bce64bde1a17e4b8d2eceef19a3a4e9d40482 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:25:24 +0000
Subject: [PATCH 4732/6849] fs/jffs2: refactor endianess selection to use
 BR2_ENDIAN

Instead of explicitly listing the sub-architectures or architectures
that are big-endian, use BR2_ENDIAN directly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/jffs2/Config.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index 9a96d7da18..f15e73033d 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -92,10 +92,7 @@ config BR2_TARGET_ROOTFS_JFFS2_PADSIZE
 
 choice
 	prompt "Endianess"
-	default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_armeb || \
-			BR2_avr32 || BR2_m68k || BR2_mips || \
-			BR2_powerpc || BR2_sh2 || BR2_sh2a || \
-			BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc
+	default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_ENDIAN = "BIG"
 
 config BR2_TARGET_ROOTFS_JFFS2_LE
 	bool "little-endian"

From ae37c5413464e42247bd44c2ff08a1b544d85d20 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 4 Apr 2013 13:09:19 +0000
Subject: [PATCH 4733/6849] aircrack-ng: needs toolchain with threads support

Fixes:
http://autobuild.buildroot.org/results/418c9385a9a5a5087a6790001560056d32cd9708

[Peter: drop iw comment]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aircrack-ng/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
index 319b7c40b5..ee887aed0f 100644
--- a/package/aircrack-ng/Config.in
+++ b/package/aircrack-ng/Config.in
@@ -4,11 +4,12 @@ config BR2_PACKAGE_AIRCRACK_NG
 	depends on BR2_USE_MMU # uses fork()
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_IW # runtime
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A set of tools for auditing wireless networks
 
 	  http://www.aircrack-ng.org/
 
-comment "aircrack-ng needs a toolchain with largefile support"
-	depends on !BR2_LARGEFILE
+comment "aircrack-ng needs a toolchain with largefile and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 

From 316aaf97575b226bbd86560fa097841d4805b032 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 5 Apr 2013 00:47:31 +0000
Subject: [PATCH 4734/6849] lm_sensors: needs host-bison and host-flex

Fixes:
http://autobuild.buildroot.net/results/f88461702cd2f249e5d28eeac26f5e4d9edece6d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lm-sensors/lm-sensors.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 3f956767e6..fcd278e6e9 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -8,6 +8,7 @@ LM_SENSORS_VERSION = 3.3.3
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES
+LM_SENSORS_DEPENDENCIES = host-bison host-flex
 LM_SENSORS_LICENSE = libsensors LGPLv2.1+, programs GPLv2+
 LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING
 

From 52763c16bec40fcf007122d355aeab6f3412e24f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 5 Apr 2013 00:47:32 +0000
Subject: [PATCH 4735/6849] libev: also fails for blackfin

Also fails for blackfin because of a lack of memory fences so disable
it. Fixes:
http://autobuild.buildroot.net/results/d895f0b0a5f4b6c173c2843a76277e6fe611627b/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libev/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libev/Config.in b/package/libev/Config.in
index fd74f55824..3d10cd70d8 100644
--- a/package/libev/Config.in
+++ b/package/libev/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBEV
 	bool "libev"
 	# needs memory fences
-	depends on !BR2_avr32
+	depends on !(BR2_avr32 || BR2_bfin)
 	help
 	  Userspace library for handling asynchronous notifications
 

From 1c4aa7a3028bce2cf7c6a779376f7efae1ce4224 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Apr 2013 13:19:38 +0000
Subject: [PATCH 4736/6849] mesa3d: requires host-bison and host-flex

Fixes a local build failure when testing other things.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mesa3d/mesa3d.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 7b7f5b4d9c..397dbb2911 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -30,6 +30,8 @@ MESA3D_DEPENDENCIES = \
 	expat \
 	host-xutil_makedepend \
 	host-libxml2 \
-	host-python
+	host-python \
+	host-bison \
+	host-flex
 
 $(eval $(autotools-package))

From 741ceb80a44112bf5e07b50b56bf5729c6f33638 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 8 Apr 2013 03:36:20 +0000
Subject: [PATCH 4737/6849] tslib: bump version

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 8533cf9cb3..2c072723e2 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -3,7 +3,7 @@
 # tslib
 #
 #############################################################
-TSLIB_VERSION = 412d99d
+TSLIB_VERSION = 158ee49b32f83cb7b02d5315f41c2e4cff38942d
 TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
 TSLIB_LICENSE = GPL, LGPL
 TSLIB_LICENSE_FILES = COPYING

From 62c92adb5cfd46eca8b806da816a906faf4465bb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 16:07:34 +0200
Subject: [PATCH 4738/6849] tslib: correct option text

Option text should only be the package name, descriptions go in help text.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tslib/Config.in b/package/tslib/Config.in
index 76f13490ec..73b35dfaaf 100644
--- a/package/tslib/Config.in
+++ b/package/tslib/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_TSLIB
-	bool "libts - The Touchscreen tslib Library"
+	bool "tslib"
 	help
 	    http://tslib.berlios.de/
 

From 186ef9f6f4647ed34b67a3427a5e0e249f0794e7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:16 +0000
Subject: [PATCH 4739/6849] qt5base: support static library building

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index d22ab66f37..0d0fb11777 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -37,6 +37,14 @@ else
 QT5BASE_CONFIGURE_OPTS += -release
 endif
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+QT5BASE_CONFIGURE_OPTS += -static
+else
+# We apparently can't build both the shared and static variants of the
+# library.
+QT5BASE_CONFIGURE_OPTS += -shared
+endif
+
 ifeq ($(BR2_LARGEFILE),y)
 QT5BASE_CONFIGURE_OPTS += -largefile
 else
@@ -179,10 +187,16 @@ define QT5BASE_INSTALL_TARGET_FONTS
 	fi
 endef
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define QT5BASE_INSTALL_TARGET_CMDS
+	$(QT5BASE_INSTALL_TARGET_FONTS)
+endef
+else
 define QT5BASE_INSTALL_TARGET_CMDS
 	$(QT5BASE_INSTALL_TARGET_LIBS)
 	$(QT5BASE_INSTALL_TARGET_PLUGINS)
 	$(QT5BASE_INSTALL_TARGET_FONTS)
 endef
+endif
 
 $(eval $(generic-package))

From 92a0a1089134f18399b9b4f84ef341dac20c40d2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:17 +0000
Subject: [PATCH 4740/6849] qt5base: adjust linux-buildroot-g++ qmake.conf

In order for qmake to generate correct moc command lines, we need to
make sure INCLUDEPATH contains $(STAGING_DIR)/usr/include. To do so,
we add a new line in our custom qmake.conf.

Also, in order to clearly identify the Buildroot specific variables
from the qmake standard variables, we prefix all the custom Buildroot
variables by BUILDROOT_ in qmake.conf.

This solves compilation issues of qt5svg such as "Undefined
interface", due to the fact that moc isn't passed a -I path pointing
to the main header directory.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qt5/qt5base/qt5base-mkspecs-files.patch   | 24 ++++++++++---------
 package/qt5/qt5base/qt5base.mk                |  7 +++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-mkspecs-files.patch
index d5827f6005..bfa9c15836 100644
--- a/package/qt5/qt5base/qt5base-mkspecs-files.patch
+++ b/package/qt5/qt5base/qt5base-mkspecs-files.patch
@@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 ===================================================================
 --- /dev/null
 +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,43 @@
 +MAKEFILE_GENERATOR      = UNIX
 +CONFIG                  += incremental gdb_dwarf_index
 +QMAKE_INCREMENTAL_STYLE = sublib
@@ -27,25 +27,27 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 +
 +QT_QPA_DEFAULT_PLATFORM = eglfs
 +
-+CROSS_COMPILE =
-+COMPILER_CFLAGS =
-+COMPILER_CXXFLAGS =
++BUILDROOT_CROSS_COMPILE =
++BUILDROOT_COMPILER_CFLAGS =
++BUILDROOT_COMPILER_CXXFLAGS =
++BUILDROOT_INCLUDE_PATH =
 +
 +# modifications to g++.conf
-+QMAKE_CC                = $${CROSS_COMPILE}gcc
-+QMAKE_CXX               = $${CROSS_COMPILE}g++
++QMAKE_CC                = $${BUILDROOT_CROSS_COMPILE}gcc
++QMAKE_CXX               = $${BUILDROOT_CROSS_COMPILE}g++
 +QMAKE_LINK              = $${QMAKE_CXX}
 +QMAKE_LINK_SHLIB        = $${QMAKE_CXX}
 +
 +# modifications to linux.conf
-+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
-+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-+QMAKE_STRIP             = $${CROSS_COMPILE}strip
++QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs
++QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy
++QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip
 +
 +#modifications to gcc-base.conf
-+QMAKE_CFLAGS           += $${COMPILER_CFLAGS}
-+QMAKE_CXXFLAGS         += $${COMPILER_CXXFLAGS}
++QMAKE_CFLAGS           += $${BUILDROOT_COMPILER_CFLAGS}
++QMAKE_CXXFLAGS         += $${BUILDROOT_COMPILER_CXXFLAGS}
 +QMAKE_CXXFLAGS_RELEASE += -O3
++INCLUDEPATH            += $${BUILDROOT_INCLUDE_PATH}
 +
 +QMAKE_LIBS             += -lrt -lpthread -ldl
 +
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 0d0fb11777..303d255c98 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -134,9 +134,10 @@ define QT5BASE_CONFIG_SET
 endef
 
 define QT5BASE_CONFIGURE_CMDS
-	$(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS))
-	$(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS))
-	$(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_CROSS_COMPILE,$(TARGET_CROSS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CFLAGS,$(TARGET_CFLAGS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_INCLUDE_PATH,$(STAGING_DIR)/usr/include)
 	$(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \
 		$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES))
 	(cd $(@D); \

From 29e8426bd655d8b36476fb593d43945132aed16b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:18 +0000
Subject: [PATCH 4741/6849] qt5/qt5svg: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in        |  1 +
 package/qt5/qt5svg/Config.in | 11 ++++++++
 package/qt5/qt5svg/qt5svg.mk | 50 ++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/qt5/qt5svg/Config.in
 create mode 100644 package/qt5/qt5svg/qt5svg.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 9e9104a565..f0585abfc0 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -16,4 +16,5 @@ menuconfig BR2_PACKAGE_QT5
 
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
+source "package/qt5/qt5svg/Config.in"
 endif
diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in
new file mode 100644
index 0000000000..27e6b05da6
--- /dev/null
+++ b/package/qt5/qt5svg/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT5SVG
+	bool "qt5svg"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5svg module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
new file mode 100644
index 0000000000..65fb04b748
--- /dev/null
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -0,0 +1,50 @@
+#############################################################
+#
+# qt5svg
+#
+#############################################################
+
+QT5SVG_VERSION = $(QT5_VERSION)
+QT5SVG_SITE = http://releases.qt-project.org/qt5/$(QT5SVG_VERSION)/submodules_tar/
+QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz
+QT5SVG_DEPENDENCIES = qt5base
+QT5SVG_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5SVG_CONFIGURE_OPTS += -opensource -confirm-license
+QT5SVG_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for qt5svg.
+else
+QT5SVG_LICENSE = Commercial license
+QT5SVG_REDISTRIBUTE = NO
+endif
+
+define QT5SVG_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5SVG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5SVG_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+define QT5SVG_INSTALL_ICONENGINES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/iconengines $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5SVG_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/libqsvg.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/
+	$(QT5SVG_INSTALL_ICONENGINES)
+endef
+endif
+
+$(eval $(generic-package))

From dc2aef6e7636df56aef1fd1b1288c891270c42f4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:19 +0000
Subject: [PATCH 4742/6849] qt5/qt5script: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in              |  1 +
 package/qt5/qt5script/Config.in    | 10 +++++++
 package/qt5/qt5script/qt5script.mk | 43 ++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/qt5/qt5script/Config.in
 create mode 100644 package/qt5/qt5script/qt5script.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index f0585abfc0..01bedfdb71 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -16,5 +16,6 @@ menuconfig BR2_PACKAGE_QT5
 
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
+source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
 endif
diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in
new file mode 100644
index 0000000000..3c5d60c127
--- /dev/null
+++ b/package/qt5/qt5script/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5SCRIPT
+	bool "qt5script"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5script module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
new file mode 100644
index 0000000000..ec3359fb4e
--- /dev/null
+++ b/package/qt5/qt5script/qt5script.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# qt5script
+#
+#############################################################
+
+QT5SCRIPT_VERSION = $(QT5_VERSION)
+QT5SCRIPT_SITE = http://releases.qt-project.org/qt5/$(QT5SCRIPT_VERSION)/submodules_tar/
+QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz
+QT5SCRIPT_DEPENDENCIES = qt5base
+QT5SCRIPT_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5SCRIPT_CONFIGURE_OPTS += -opensource -confirm-license
+QT5SCRIPT_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5SCRIPT_LICENSE = Commercial license
+QT5SCRIPT_REDISTRIBUTE = NO
+endif
+
+define QT5SCRIPT_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5SCRIPT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5SCRIPT_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5SCRIPT_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
+$(eval $(generic-package))

From 3923924b60507d245fd3e946a0a5c89beee9595f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:20 +0000
Subject: [PATCH 4743/6849] qt5/qt5imageformats: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in                         |  1 +
 package/qt5/qt5imageformats/Config.in         | 10 +++++
 .../qt5/qt5imageformats/qt5imageformats.mk    | 41 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/qt5/qt5imageformats/Config.in
 create mode 100644 package/qt5/qt5imageformats/qt5imageformats.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 01bedfdb71..b90c6e8803 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -16,6 +16,7 @@ menuconfig BR2_PACKAGE_QT5
 
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
+source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
 endif
diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in
new file mode 100644
index 0000000000..d37e08f0cb
--- /dev/null
+++ b/package/qt5/qt5imageformats/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5IMAGEFORMATS
+	bool "qt5imageformats"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5imageformats module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
new file mode 100644
index 0000000000..5130cfbb08
--- /dev/null
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# qt5imageformats
+#
+#############################################################
+
+QT5IMAGEFORMATS_VERSION = $(QT5_VERSION)
+QT5IMAGEFORMATS_SITE = http://releases.qt-project.org/qt5/$(QT5IMAGEFORMATS_VERSION)/submodules_tar/
+QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION).tar.xz
+QT5IMAGEFORMATS_DEPENDENCIES = qt5base
+QT5IMAGEFORMATS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5IMAGEFORMATS_CONFIGURE_OPTS += -opensource -confirm-license
+QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for qt5svg.
+else
+QT5IMAGEFORMATS_LICENSE = Commercial license
+QT5IMAGEFORMATS_REDISTRIBUTE = NO
+endif
+
+define QT5IMAGEFORMATS_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5IMAGEFORMATS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5IMAGEFORMATS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5IMAGEFORMATS_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/*.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/
+endef
+endif
+
+$(eval $(generic-package))

From 55fde61f67d0e4c9a1473d5d27aa3ebf6c32f103 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:21 +0000
Subject: [PATCH 4744/6849] qt5/qt5xmlpatterns: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in                        |  1 +
 package/qt5/qt5xmlpatterns/Config.in         | 10 +++++
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 43 ++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/qt5/qt5xmlpatterns/Config.in
 create mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index b90c6e8803..84efa89cad 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -19,4 +19,5 @@ source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
+source "package/qt5/qt5xmlpatterns/Config.in"
 endif
diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in
new file mode 100644
index 0000000000..6ea746639d
--- /dev/null
+++ b/package/qt5/qt5xmlpatterns/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5XMLPATTERNS
+	bool "qt5xmlpatterns"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5xmlpatterns module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
new file mode 100644
index 0000000000..3bd6aac5d2
--- /dev/null
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# qt5xmlpatterns
+#
+#############################################################
+
+QT5XMLPATTERNS_VERSION = $(QT5_VERSION)
+QT5XMLPATTERNS_SITE = http://releases.qt-project.org/qt5/$(QT5XMLPATTERNS_VERSION)/submodules_tar/
+QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).tar.xz
+QT5XMLPATTERNS_DEPENDENCIES = qt5base
+QT5XMLPATTERNS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5XMLPATTERNS_CONFIGURE_OPTS += -opensource -confirm-license
+QT5XMLPATTERNS_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5XMLPATTERNS_LICENSE = Commercial license
+QT5XMLPATTERNS_REDISTRIBUTE = NO
+endif
+
+define QT5XMLPATTERNS_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5XMLPATTERNS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5XMLPATTERNS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
+$(eval $(generic-package))

From 130a48356b79f1a78b3d25b14ae07a32bb4437e5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:22 +0000
Subject: [PATCH 4745/6849] qt5/qt5jsbackend: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in                         |  1 +
 package/qt5/qt5jsbackend/Config.in            | 10 +++++
 ...ackend-dont-import-bz2-python-module.patch | 29 +++++++++++++
 .../qt5jsbackend-fix-uclibc.patch             | 33 ++++++++++++++
 package/qt5/qt5jsbackend/qt5jsbackend.mk      | 43 +++++++++++++++++++
 5 files changed, 116 insertions(+)
 create mode 100644 package/qt5/qt5jsbackend/Config.in
 create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch
 create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
 create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 84efa89cad..e149706c8a 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -17,6 +17,7 @@ menuconfig BR2_PACKAGE_QT5
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
+source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/package/qt5/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in
new file mode 100644
index 0000000000..89d506771e
--- /dev/null
+++ b/package/qt5/qt5jsbackend/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5JSBACKEND
+	bool "qt5jsbackend"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5jsbackend module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch b/package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch
new file mode 100644
index 0000000000..08f343e5ea
--- /dev/null
+++ b/package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch
@@ -0,0 +1,29 @@
+Only import bz2 python module when needed
+
+The js2c.py script imports the bz2 module unconditionnally, which
+would require us to build the bzip2 support in host-python. Since in
+fact bzip2 support is not technically used when building this package,
+we ensure that the bz2 module is only imported when needed.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/3rdparty/v8/tools/js2c.py
+===================================================================
+--- a/src/3rdparty/v8/tools/js2c.py
++++ b/src/3rdparty/v8/tools/js2c.py
+@@ -33,7 +33,6 @@
+ 
+ import os, re, sys, string
+ import jsmin
+-import bz2
+ 
+ 
+ def ToCAsciiArray(lines):
+@@ -344,6 +343,7 @@
+   else:
+     raw_sources_declaration = RAW_SOURCES_COMPRESSION_DECLARATION
+     if env['COMPRESSION'] == 'bz2':
++      import bz2
+       all_sources = bz2.compress("".join(all_sources))
+     total_length = len(all_sources)
+     sources_data = ToCArray(all_sources)
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
new file mode 100644
index 0000000000..50a6dbcacf
--- /dev/null
+++ b/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
@@ -0,0 +1,33 @@
+Fix build on uClibc
+
+Patch taken from https://code.google.com/p/v8/source/detail?r=12094.
+
+Review URL: https://chromiumcodereview.appspot.com/10784012
+Patch from Remi Duraffort <remi.duraffort@st.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc
+===================================================================
+--- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc	2012-12-18 20:04:01.000000000 +0100
++++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc	2013-03-03 20:31:46.000000000 +0100
+@@ -1030,7 +1030,8 @@
+   sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]);
+ #elif V8_HOST_ARCH_ARM
+ // An undefined macro evaluates to 0, so this applies to Android's Bionic also.
+-#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
++#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \
++     !defined(__UCLIBC__))
+   sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]);
+   sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]);
+   sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]);
+@@ -1038,7 +1039,8 @@
+   sample->pc = reinterpret_cast<Address>(mcontext.arm_pc);
+   sample->sp = reinterpret_cast<Address>(mcontext.arm_sp);
+   sample->fp = reinterpret_cast<Address>(mcontext.arm_fp);
+-#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
++#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) &&
++        // !defined(__UCLIBC__))
+ #elif V8_HOST_ARCH_MIPS
+   sample->pc = reinterpret_cast<Address>(mcontext.pc);
+   sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]);
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
new file mode 100644
index 0000000000..bc6a53af27
--- /dev/null
+++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# qt5jsbackend
+#
+#############################################################
+
+QT5JSBACKEND_VERSION = $(QT5_VERSION)
+QT5JSBACKEND_SITE = http://releases.qt-project.org/qt5/$(QT5JSBACKEND_VERSION)/submodules_tar/
+QT5JSBACKEND_SOURCE = qtjsbackend-opensource-src-$(QT5JSBACKEND_VERSION).tar.xz
+QT5JSBACKEND_DEPENDENCIES = qt5base
+QT5JSBACKEND_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5JSBACKEND_CONFIGURE_OPTS += -opensource -confirm-license
+QT5JSBACKEND_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5JSBACKEND_LICENSE = Commercial license
+QT5JSBACKEND_REDISTRIBUTE = NO
+endif
+
+define QT5JSBACKEND_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5JSBACKEND_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5JSBACKEND_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5JSBACKEND_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5V8*.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
+$(eval $(generic-package))

From a80292cfbae6a1cd98fe750111192c0d0487e65c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:23 +0000
Subject: [PATCH 4746/6849] qt5/qt5declarative: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in                        |  1 +
 package/qt5/qt5declarative/Config.in         | 18 +++++++
 package/qt5/qt5declarative/qt5declarative.mk | 54 ++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 package/qt5/qt5declarative/Config.in
 create mode 100644 package/qt5/qt5declarative/qt5declarative.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index e149706c8a..089e29b3b7 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -16,6 +16,7 @@ menuconfig BR2_PACKAGE_QT5
 
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
+source "package/qt5/qt5declarative/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5script/Config.in"
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
new file mode 100644
index 0000000000..f862b94bff
--- /dev/null
+++ b/package/qt5/qt5declarative/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_QT5DECLARATIVE
+	bool "qt5declarative"
+	select BR2_PACKAGE_QT5XMLPATTERNS
+	select BR2_PACKAGE_QT5JSBACKEND
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_EGLFS
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5declarative module.
+
+	  http://qt-project.org
+
+comment "qt5declarative requires an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
new file mode 100644
index 0000000000..de20017103
--- /dev/null
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -0,0 +1,54 @@
+#############################################################
+#
+# qt5declarative
+#
+#############################################################
+
+QT5DECLARATIVE_VERSION = $(QT5_VERSION)
+QT5DECLARATIVE_SITE = http://releases.qt-project.org/qt5/$(QT5DECLARATIVE_VERSION)/submodules_tar/
+QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).tar.xz
+QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns qt5jsbackend
+QT5DECLARATIVE_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5DECLARATIVE_CONFIGURE_OPTS += -opensource -confirm-license
+QT5DECLARATIVE_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5DECLARATIVE_LICENSE = Commercial license
+QT5DECLARATIVE_REDISTRIBUTE = NO
+endif
+
+define QT5DECLARATIVE_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5DECLARATIVE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		sub-src-all sub-tools-all
+endef
+
+define QT5DECLARATIVE_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		sub-src-install_subtargets \
+		sub-tools-install_subtargets
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5DECLARATIVE_INSTALL_TARGET_LIBS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+
+define QT5DECLARATIVE_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
+	cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr
+	$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
+endef
+
+$(eval $(generic-package))

From 6b65be6b19c2189f3631e8ac2c71bca0de740d0d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:24 +0000
Subject: [PATCH 4747/6849] qt5/qt5graphicaleffects: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in                         |  1 +
 package/qt5/qt5graphicaleffects/Config.in     | 16 ++++++++
 .../qt5graphicaleffects.mk                    | 40 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 package/qt5/qt5graphicaleffects/Config.in
 create mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 089e29b3b7..fe85ee6ff2 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -17,6 +17,7 @@ menuconfig BR2_PACKAGE_QT5
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5declarative/Config.in"
+source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5script/Config.in"
diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
new file mode 100644
index 0000000000..9a32bc72fc
--- /dev/null
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_QT5GRAPHICALEFFECTS
+	bool "qt5graphicaleffects"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5graphicaleffects module.
+
+	  http://qt-project.org
+
+comment "qt5graphicaleffects requires an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
new file mode 100644
index 0000000000..c4b7231aea
--- /dev/null
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# qt5graphicaleffects
+#
+#############################################################
+
+QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION)
+QT5GRAPHICALEFFECTS_SITE = http://releases.qt-project.org/qt5/$(QT5GRAPHICALEFFECTS_VERSION)/submodules_tar/
+QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz
+QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
+QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5GRAPHICALEFFECTS_CONFIGURE_OPTS += -opensource -confirm-license
+QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5GRAPHICALEFFECTS_LICENSE = Commercial license
+QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
+endif
+
+define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5GRAPHICALEFFECTS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5GRAPHICALEFFECTS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5GRAPHICALEFFECTS_INSTALL_TARGET_CMDS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtGraphicalEffects $(TARGET_DIR)/usr/qml
+endef
+
+$(eval $(generic-package))

From 1eb15de182484261538f815dcc8f59e84ba3b2fd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:25 +0000
Subject: [PATCH 4748/6849] qt5/qt5multimedia: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in                      |  1 +
 package/qt5/qt5multimedia/Config.in        | 16 +++++++
 package/qt5/qt5multimedia/qt5multimedia.mk | 49 ++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 package/qt5/qt5multimedia/Config.in
 create mode 100644 package/qt5/qt5multimedia/qt5multimedia.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index fe85ee6ff2..7dff33f2e0 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -20,6 +20,7 @@ source "package/qt5/qt5declarative/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5jsbackend/Config.in"
+source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
new file mode 100644
index 0000000000..fd36672f0f
--- /dev/null
+++ b/package/qt5/qt5multimedia/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_QT5MULTIMEDIA
+	bool "qt5multimedia"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5multimedia module.
+
+	  http://qt-project.org
+
+comment "qt5multimedia requires an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
new file mode 100644
index 0000000000..6725701ca3
--- /dev/null
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -0,0 +1,49 @@
+#############################################################
+#
+# qt5multimedia
+#
+#############################################################
+
+QT5MULTIMEDIA_VERSION = $(QT5_VERSION)
+QT5MULTIMEDIA_SITE = http://releases.qt-project.org/qt5/$(QT5MULTIMEDIA_VERSION)/submodules_tar/
+QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz
+QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative
+QT5MULTIMEDIA_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5MULTIMEDIA_CONFIGURE_OPTS += -opensource -confirm-license
+QT5MULTIMEDIA_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5MULTIMEDIA_LICENSE = Commercial license
+QT5MULTIMEDIA_REDISTRIBUTE = NO
+endif
+
+define QT5MULTIMEDIA_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5MULTIMEDIA_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+
+define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
+	cp -dpfr $(STAGING_DIR)/usr/qml/* $(TARGET_DIR)/usr/qml
+	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
+endef
+
+$(eval $(generic-package))

From 4948aa5e65212223ac755f5a3417b47c3d966bf1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:26 +0000
Subject: [PATCH 4749/6849] qt5/qt5webkit: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in              |  1 +
 package/qt5/qt5webkit/Config.in    | 14 ++++++++++
 package/qt5/qt5webkit/qt5webkit.mk | 43 ++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 package/qt5/qt5webkit/Config.in
 create mode 100644 package/qt5/qt5webkit/qt5webkit.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 7dff33f2e0..e328b0e0a9 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -23,5 +23,6 @@ source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
+source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 endif
diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
new file mode 100644
index 0000000000..319d84a0d1
--- /dev/null
+++ b/package/qt5/qt5webkit/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_QT5WEBKIT
+	bool "qt5webkit"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_ICU
+	select BR2_PACKAGE_SQLITE
+	# This module does not support static linking
+	depends on !BR2_PREFER_STATIC_LIB
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5webkit module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
new file mode 100644
index 0000000000..d577cf8bf2
--- /dev/null
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# qt5webkit
+#
+#############################################################
+
+QT5WEBKIT_VERSION = $(QT5_VERSION)
+QT5WEBKIT_SITE = http://releases.qt-project.org/qt5/$(QT5WEBKIT_VERSION)/submodules_tar/
+QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
+QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf
+QT5WEBKIT_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5WEBKIT_CONFIGURE_OPTS += -opensource -confirm-license
+QT5WEBKIT_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5WEBKIT_LICENSE = Commercial license
+QT5WEBKIT_REDISTRIBUTE = NO
+endif
+
+define QT5WEBKIT_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5WEBKIT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKIT_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+define QT5WEBKIT_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/
+endef
+
+$(eval $(generic-package))

From 58b8a19f985f6f2037c5659a81ba724f0216ec42 Mon Sep 17 00:00:00 2001
From: Floris Bos <bos@je-eigen-domein.nl>
Date: Sun, 7 Apr 2013 09:57:27 +0000
Subject: [PATCH 4750/6849] qt5webkit: add EGL dir to includepath

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../qt5webkit/qt5webkit-egl-includepath.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/qt5/qt5webkit/qt5webkit-egl-includepath.patch

diff --git a/package/qt5/qt5webkit/qt5webkit-egl-includepath.patch b/package/qt5/qt5webkit/qt5webkit-egl-includepath.patch
new file mode 100644
index 0000000000..de5bcff0d3
--- /dev/null
+++ b/package/qt5/qt5webkit/qt5webkit-egl-includepath.patch
@@ -0,0 +1,40 @@
+From d6b1b33a12c0cf6c52667afafe34e58a7b00d0d8 Mon Sep 17 00:00:00 2001
+From: Floris Bos <bos@je-eigen-domein.nl>
+Date: Thu, 7 Mar 2013 19:25:17 +0100
+Subject: [PATCH] Webcore: add EGL and OpenGL (ES) INCDIR to INCLUDEPATH
+
+When building with 3D graphics support enabled, add the
+OpenGL (ES) and EGL include directories to the include path.
+
+Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
+---
+ Source/WebCore/Target.pri |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
+index 2669748..421a849 100644
+--- a/Source/WebCore/Target.pri
++++ b/Source/WebCore/Target.pri
+@@ -3992,15 +3992,19 @@ use?(3D_GRAPHICS) {
+ 
+     contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
+         !contains(QT_CONFIG, opengles2) {
++            INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+             SOURCES += \
+                platform/graphics/opengl/GraphicsContext3DOpenGL.cpp \
+                platform/graphics/opengl/Extensions3DOpenGL.cpp
+         } else {
++            INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
+             SOURCES += \
+                platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \
+                platform/graphics/opengl/Extensions3DOpenGLES.cpp
+         }
+ 
++        !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
++
+         HEADERS += platform/graphics/opengl/Extensions3DOpenGL.h
+ 
+         SOURCES += \
+-- 
+1.7.10.4
+

From 998ebc98b54bbfde52e1789a29492e38a2719b12 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 09:57:28 +0000
Subject: [PATCH 4751/6849] qt5/qt5quick1: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/Config.in              |  1 +
 package/qt5/qt5quick1/Config.in    | 22 +++++++++++++++
 package/qt5/qt5quick1/qt5quick1.mk | 45 ++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 package/qt5/qt5quick1/Config.in
 create mode 100644 package/qt5/qt5quick1/qt5quick1.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index e328b0e0a9..2945d96f62 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -21,6 +21,7 @@ source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
+source "package/qt5/qt5quick1/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
new file mode 100644
index 0000000000..99fd5a4d80
--- /dev/null
+++ b/package/qt5/qt5quick1/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_QT5QUICK1
+	bool "qt5quick1"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5SCRIPT
+	select BR2_PACKAGE_QT5XMLPATTERNS
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5JSBACKEND
+	select BR2_PACKAGE_QT5WEBKIT
+	# This module does not support static linking
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5quick1 module.
+
+	  http://qt-project.org
+
+comment "qt5quick1 requires an OpenGL-capable backend"
+	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
new file mode 100644
index 0000000000..42b5895bef
--- /dev/null
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -0,0 +1,45 @@
+#############################################################
+#
+# qt5quick1
+#
+#############################################################
+
+QT5QUICK1_VERSION = $(QT5_VERSION)
+QT5QUICK1_SITE = http://releases.qt-project.org/qt5/$(QT5QUICK1_VERSION)/submodules_tar/
+QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz
+QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend qt5webkit
+QT5QUICK1_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
+QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0
+# Here we would like to get license files from qt5base, but qt5base
+# may not be extracted at the time we get the legal-info for
+# qt5script.
+else
+QT5QUICK1_LICENSE = Commercial license
+QT5QUICK1_REDISTRIBUTE = NO
+endif
+
+define QT5QUICK1_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5QUICK1_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5QUICK1_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+define QT5QUICK1_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
+	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
+	cp -dpf $(STAGING_DIR)/usr/bin/qmlviewer $(TARGET_DIR)/usr/bin
+	cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr
+endef
+
+$(eval $(generic-package))

From 36f13ad186f5d7dbfc6a95280f4d16893ef72669 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Apr 2013 04:22:56 +0000
Subject: [PATCH 4752/6849] alsa-utils: needs host-gettext

Fixes:
http://autobuild.buildroot.net/results/31ca7306ca345bf057a844eab5b5d711e6c82842/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/alsa-utils/alsa-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 622857401d..84082d18ff 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -10,7 +10,7 @@ ALSA_UTILS_SITE = http://alsa.cybermirror.org/utils
 ALSA_UTILS_LICENSE = GPLv2
 ALSA_UTILS_LICENSE_FILES = COPYING
 ALSA_UTILS_INSTALL_STAGING = YES
-ALSA_UTILS_DEPENDENCIES = alsa-lib \
+ALSA_UTILS_DEPENDENCIES = host-gettext alsa-lib \
 	$(if $(BR2_PACKAGE_NCURSES),ncurses)
 
 ALSA_UTILS_CONF_ENV = \

From 15ada1c1846a243893f5e734fbb5039aa8e4b1a4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Apr 2013 08:49:39 +0000
Subject: [PATCH 4753/6849] toolchain/gcc: bump 4.7.x series to 4.7.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../{4.7.2 => 4.7.3}/100-uclibc-conf.patch    |  0
 .../301-missing-execinfo_h.patch              |  0
 .../{4.7.2 => 4.7.3}/302-c99-snprintf.patch   |  0
 .../305-libmudflap-susv3-legacy.patch         |  0
 .../810-arm-softfloat-libgcc.patch            |  0
 .../830-arm_unbreak_armv4t.patch              |  0
 ...werpc-link-with-math-lib.patch.conditional | 80 ++++++++++---------
 toolchain/gcc/Config.in                       |  2 +-
 8 files changed, 42 insertions(+), 40 deletions(-)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/830-arm_unbreak_armv4t.patch (100%)
 rename toolchain/gcc/{4.7.2 => 4.7.3}/powerpc-link-with-math-lib.patch.conditional (73%)

diff --git a/toolchain/gcc/4.7.2/100-uclibc-conf.patch b/toolchain/gcc/4.7.3/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.7.2/100-uclibc-conf.patch
rename to toolchain/gcc/4.7.3/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.7.2/301-missing-execinfo_h.patch b/toolchain/gcc/4.7.3/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.7.2/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.7.3/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.7.2/302-c99-snprintf.patch b/toolchain/gcc/4.7.3/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.7.2/302-c99-snprintf.patch
rename to toolchain/gcc/4.7.3/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.7.2/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.7.3/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.7.2/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.7.3/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.7.2/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.7.3/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.7.2/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.7.3/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.7.2/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.7.3/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.7.2/830-arm_unbreak_armv4t.patch
rename to toolchain/gcc/4.7.3/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/4.7.2/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional
similarity index 73%
rename from toolchain/gcc/4.7.2/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional
index 7e75e87f23..2554263a00 100644
--- a/toolchain/gcc/4.7.2/powerpc-link-with-math-lib.patch.conditional
+++ b/toolchain/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional
@@ -6,11 +6,13 @@ contains unresolved symbols, any attempt to link against libgcc_s
 without explicitely specifying -lm fails, resulting in a broken
 bootstrap of the compiler.
 
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
+Forward ported to gcc 4.7.3
 
-diff -Nura gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.5.1/gcc/config/t-slibgcc-elf-ver
---- gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:08.644904042 -0300
-+++ gcc-4.5.1/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:56.332904024 -0300
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gcc-4.7.3.orig/libgcc/config/t-slibgcc gcc-4.7.3/libgcc/config/t-slibgcc
+--- gcc-4.7.3.orig/libgcc/config/t-slibgcc	2013-04-11 15:23:46.491571116 -0300
++++ gcc-4.7.3/libgcc/config/t-slibgcc	2013-04-11 15:25:06.241141824 -0300
 @@ -27,7 +27,7 @@
  SHLIB_OBJS = @shlib_objs@
  SHLIB_DIR = @multilib_dir@
@@ -19,43 +21,20 @@ diff -Nura gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.5.1/gcc/config/t-sl
 +SHLIB_LC = @libgcc_libm@ -lc
  SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
  SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- 	$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
-diff -Nura gcc-4.5.1.orig/libgcc/Makefile.in gcc-4.5.1/libgcc/Makefile.in
---- gcc-4.5.1.orig/libgcc/Makefile.in	2010-11-03 14:32:44.272904042 -0300
-+++ gcc-4.5.1/libgcc/Makefile.in	2010-11-03 14:37:03.893904042 -0300
-@@ -39,6 +39,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
- 
- host_noncanonical = @host_noncanonical@
- 
-@@ -798,9 +799,10 @@
- 		@multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_objs@,$(objects),$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
-+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- 		@shlib_map_file@,$(mapfile),$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
--		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
- 
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- 	# @multilib_flags@ is still needed because this may use
-diff -Nura gcc-4.5.1.orig/libgcc/configure gcc-4.5.1/libgcc/configure
---- gcc-4.5.1.orig/libgcc/configure	2010-11-03 14:32:44.283904042 -0300
-+++ gcc-4.5.1/libgcc/configure	2010-11-03 14:39:48.685904042 -0300
-@@ -557,6 +557,7 @@
- extra_parts
+ 	$(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+diff -Nura gcc-4.7.3.orig/libgcc/configure gcc-4.7.3/libgcc/configure
+--- gcc-4.7.3.orig/libgcc/configure	2013-04-11 15:23:46.551573051 -0300
++++ gcc-4.7.3/libgcc/configure	2013-04-11 15:25:06.243141875 -0300
+@@ -563,6 +563,7 @@
  tmake_file
+ sfp_machine_header
  set_use_emutls
 +LIBGCC_LIBM
  set_have_cc_tls
  vis_hide
  fixed_point
-@@ -3847,6 +3848,37 @@
-   set_use_emutls="-DUSE_EMUTLS"
+@@ -4445,6 +4446,37 @@
+ 	fi
  fi
  
 +# On powerpc libgcc_s references copysignl which is a libm function but
@@ -92,10 +71,10 @@ diff -Nura gcc-4.5.1.orig/libgcc/configure gcc-4.5.1/libgcc/configure
  
  # Conditionalize the makefile for this target machine.
  tmake_file_=
-diff -Nura gcc-4.5.1.orig/libgcc/configure.ac gcc-4.5.1/libgcc/configure.ac
---- gcc-4.5.1.orig/libgcc/configure.ac	2010-11-03 14:32:44.735904042 -0300
-+++ gcc-4.5.1/libgcc/configure.ac	2010-11-03 14:42:11.278904045 -0300
-@@ -238,6 +238,27 @@
+diff -Nura gcc-4.7.3.orig/libgcc/configure.ac gcc-4.7.3/libgcc/configure.ac
+--- gcc-4.7.3.orig/libgcc/configure.ac	2013-04-11 15:23:46.551573051 -0300
++++ gcc-4.7.3/libgcc/configure.ac	2013-04-11 15:25:06.244141901 -0300
+@@ -324,6 +324,27 @@
  fi
  AC_SUBST(set_have_cc_tls)
  
@@ -123,3 +102,26 @@ diff -Nura gcc-4.5.1.orig/libgcc/configure.ac gcc-4.5.1/libgcc/configure.ac
  # See if we have emulated thread-local storage.
  GCC_CHECK_EMUTLS
  set_use_emutls=
+diff -Nura gcc-4.7.3.orig/libgcc/Makefile.in gcc-4.7.3/libgcc/Makefile.in
+--- gcc-4.7.3.orig/libgcc/Makefile.in	2013-04-11 15:23:46.537572599 -0300
++++ gcc-4.7.3/libgcc/Makefile.in	2013-04-11 15:25:06.241141824 -0300
+@@ -41,6 +41,7 @@
+ decimal_float = @decimal_float@
+ enable_decimal_float = @enable_decimal_float@
+ fixed_point = @fixed_point@
++LIBGCC_LIBM = @LIBGCC_LIBM@
+ 
+ host_noncanonical = @host_noncanonical@
+ target_noncanonical = @target_noncanonical@
+@@ -928,9 +929,10 @@
+ 		@multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_objs@,$(objects) libgcc.a,$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
++		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
+ 		@shlib_map_file@,$(mapfile),$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
+-		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
++		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
+ 
+ libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
+ 	# @multilib_flags@ is still needed because this may use
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 527288f714..5dd37ce18f 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -76,7 +76,7 @@ config BR2_GCC_VERSION
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
-	default "4.7.2"     if BR2_GCC_VERSION_4_7_X
+	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
 	default "4.8.0"     if BR2_GCC_VERSION_4_8_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 

From a0b6faaab4dcb7e372fe16ffb335e39b9e06a8fb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 00:04:33 +0000
Subject: [PATCH 4754/6849] gdb: convert to the package infrastructure

This commit converts gdb to the package infrastructure, and therefore
moves it from toolchain/gdb to package/gdb.

The target package is now visible in "Package selection for the
target" => "Debugging, profiling and benchmark". The main option,
"gdb", forcefully selects the "gdbserver" sub-option by
default. Another sub-option, "full debugger" allows to install the
complete gdb on the target. When this option is enabled, then
"gdbserver" is no longer forcefully selected. This ensures that at
least gdbserver or the full debugger gets built/installed, so that the
package is not a no-op.

The host debugger is still enabled through a configuration option in
"Toolchain". It is now visible regardless of the toolchain type (it
used to be hidden for External Toolchains). The configuration options
relative to the host debugger are now in package/gdb/Config.in.host,
similar to how we have package/binutils/Config.in.host.

Since gdb is now a proper package, it is no longer allowed to 'select
BR2_PTHREADS_DEBUG' to ensure thread debugging is available when
needed. Instead, it now 'depends on
BR2_TOOLCHAIN_HAS_THREADS_DEBUG'. This option, in turn, is selected by
the different toolchain backends when appropriate. The
'BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED' option is removed, since
we no longer need to know when it is allowed to 'select
BR2_PTHREADS_DEBUG'. Also, the 'BR2_PTHREADS_DEBUG' option is moved to
appear right below the thread implementation selection (in the case of
the Buildroot toolchain backend).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                              |   9 +
 package/Config.in                             |   1 +
 .../gdb/6.6a/100-uclibc-conf.patch            |   0
 .../6.6a/600-fix-compile-flag-mismatch.patch  |   0
 .../gdb/6.6a/gdb-6.6-bfin-gdbserver.patch     |   0
 .../gdb/7.4.1/00_all_ptrace_setsiginfo.patch  |   0
 .../gdb/7.4.1/05_all_readline-headers.patch   |   0
 .../gdb/7.4.1/xtensa-asm-ptrace-h.patch       |   0
 .../gdb/7.4.1/xtensa-gdb-regsize.patch        |   0
 package/gdb/Config.in                         |  41 +++
 package/gdb/Config.in.host                    |  56 +++++
 package/gdb/gdb.mk                            | 101 ++++++++
 toolchain/Config.in                           |   2 -
 toolchain/gdb/Config.in                       |  99 --------
 toolchain/gdb/gdb.mk                          | 234 ------------------
 toolchain/toolchain-buildroot.mk              |   1 -
 toolchain/toolchain-buildroot/Config.in.2     |   7 +
 toolchain/toolchain-common.in                 |   7 +-
 toolchain/toolchain-crosstool-ng.mk           |   1 -
 toolchain/toolchain-crosstool-ng/Config.in    |   3 +
 toolchain/toolchain-external.mk               |   1 -
 toolchain/toolchain-external/Config.in        |   7 +
 toolchain/uClibc/Config.in                    |   6 -
 23 files changed, 226 insertions(+), 350 deletions(-)
 rename {toolchain => package}/gdb/6.6a/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gdb/6.6a/600-fix-compile-flag-mismatch.patch (100%)
 rename {toolchain => package}/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch (100%)
 rename {toolchain => package}/gdb/7.4.1/00_all_ptrace_setsiginfo.patch (100%)
 rename {toolchain => package}/gdb/7.4.1/05_all_readline-headers.patch (100%)
 rename {toolchain => package}/gdb/7.4.1/xtensa-asm-ptrace-h.patch (100%)
 rename {toolchain => package}/gdb/7.4.1/xtensa-gdb-regsize.patch (100%)
 create mode 100644 package/gdb/Config.in
 create mode 100644 package/gdb/Config.in.host
 create mode 100644 package/gdb/gdb.mk
 delete mode 100644 toolchain/gdb/Config.in
 delete mode 100644 toolchain/gdb/gdb.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 4cd62b80da..9de4e14036 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -83,6 +83,15 @@ config BR2_PACKAGE_GDISK_SGDISK
 	help
 	  The option has been renamed BR2_PACKAGE_GPTFDISK_SGDISK.
 
+config BR2_PACKAGE_GDB_HOST
+	bool "gdb for the host option has been renamed"
+	select BR2_PACKAGE_HOST_GDB
+	select BR2_LEGACY
+	help
+	  Due to the conversion of gdb to the package infrastructure,
+	  the BR2_PACKAGE_GDB_HOST option has been renamed
+	  BR2_PACKAGE_HOST_GDB.
+
 #
 # Legacy options since 2012.11
 #
diff --git a/package/Config.in b/package/Config.in
index 69d87f04f5..97ba790f94 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -22,6 +22,7 @@ source "package/cache-calibrator/Config.in"
 source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
+source "package/gdb/Config.in"
 source "package/kexec/Config.in"
 source "package/latencytop/Config.in"
 source "package/lmbench/Config.in"
diff --git a/toolchain/gdb/6.6a/100-uclibc-conf.patch b/package/gdb/6.6a/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gdb/6.6a/100-uclibc-conf.patch
rename to package/gdb/6.6a/100-uclibc-conf.patch
diff --git a/toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch b/package/gdb/6.6a/600-fix-compile-flag-mismatch.patch
similarity index 100%
rename from toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch
rename to package/gdb/6.6a/600-fix-compile-flag-mismatch.patch
diff --git a/toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch b/package/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch
similarity index 100%
rename from toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch
rename to package/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch
diff --git a/toolchain/gdb/7.4.1/00_all_ptrace_setsiginfo.patch b/package/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
similarity index 100%
rename from toolchain/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
rename to package/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
diff --git a/toolchain/gdb/7.4.1/05_all_readline-headers.patch b/package/gdb/7.4.1/05_all_readline-headers.patch
similarity index 100%
rename from toolchain/gdb/7.4.1/05_all_readline-headers.patch
rename to package/gdb/7.4.1/05_all_readline-headers.patch
diff --git a/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch b/package/gdb/7.4.1/xtensa-asm-ptrace-h.patch
similarity index 100%
rename from toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch
rename to package/gdb/7.4.1/xtensa-asm-ptrace-h.patch
diff --git a/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch b/package/gdb/7.4.1/xtensa-gdb-regsize.patch
similarity index 100%
rename from toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch
rename to package/gdb/7.4.1/xtensa-gdb-regsize.patch
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
new file mode 100644
index 0000000000..6eb29d5bdf
--- /dev/null
+++ b/package/gdb/Config.in
@@ -0,0 +1,41 @@
+comment "gdb/gdbserver require a toolchain with thread and thread debug support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+
+config BR2_PACKAGE_GDB
+	bool "gdb"
+	select BR2_PACKAGE_GDB_SERVER if !BR2_PACKAGE_GDB_DEBUGGER
+	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	help
+	  GDB, the GNU Project debugger, allows you to see what is
+	  going on `inside' another program while it executes -- or
+	  what another program was doing at the moment it crashed.
+
+	  This option allows to build gdbserver and/or the gdb
+	  debugger for the target.
+
+	  For embedded development, the most common solution is to
+	  build only 'gdbserver' for the target, and use a cross-gdb
+	  on the host. See BR2_PACKAGE_HOST_GDB in the Toolchain menu
+	  to enable one. Notice that external toolchains often provide
+	  their own pre-built cross-gdb and gdbserver binaries.
+
+	  http://www.gnu.org/software/gdb/
+
+if BR2_PACKAGE_GDB
+
+config BR2_PACKAGE_GDB_SERVER
+	bool "gdbserver"
+	help
+	  Build the gdbserver stub to run on the target.
+	  A full gdb is needed to debug the progam.
+
+config BR2_PACKAGE_GDB_DEBUGGER
+	bool "full debugger"
+	select BR2_PACKAGE_NCURSES
+	depends on BR2_USE_WCHAR
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin && !BR2_aarch64
+
+comment "full gdb on target needs WCHAR support in toolchain"
+	depends on !BR2_USE_WCHAR
+
+endif
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
new file mode 100644
index 0000000000..223c4268c5
--- /dev/null
+++ b/package/gdb/Config.in.host
@@ -0,0 +1,56 @@
+config BR2_PACKAGE_HOST_GDB
+	bool "Build cross gdb for the host"
+	help
+	  Build a cross gdb that runs on the host machine and debugs
+	  programs running on the target. It requires 'gdbserver'
+	  installed on the target, see BR2_PACKAGE_GDB_SERVER to
+	  enable it.
+
+if BR2_PACKAGE_HOST_GDB
+
+choice
+	prompt "GDB debugger Version"
+	default BR2_GDB_VERSION_6_6 if BR2_bfin
+	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
+	default BR2_GDB_VERSION_7_5
+	help
+	  Select the version of gdb you wish to use.
+
+	config BR2_GDB_VERSION_6_6
+		bool "gdb 6.6"
+		depends on BR2_bfin
+
+	config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+		depends on BR2_avr32
+		bool "gdb 6.7.1-avr32-2.1.5"
+
+	config BR2_GDB_VERSION_7_2
+		bool "gdb 7.2.x"
+		depends on !BR2_bfin
+		depends on BR2_DEPRECATED
+
+	config BR2_GDB_VERSION_7_3
+		bool "gdb 7.3.x"
+		depends on !BR2_bfin
+		depends on BR2_DEPRECATED
+
+	config BR2_GDB_VERSION_7_4
+		bool "gdb 7.4.x"
+		depends on !BR2_bfin
+
+	config BR2_GDB_VERSION_7_5
+		bool "gdb 7.5.x"
+		depends on !BR2_bfin
+
+endchoice
+
+config BR2_GDB_VERSION
+	string
+	default "6.6a"     if BR2_GDB_VERSION_6_6
+	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+	default "7.2a"     if BR2_GDB_VERSION_7_2
+	default "7.3.1"    if BR2_GDB_VERSION_7_3
+	default "7.4.1"    if BR2_GDB_VERSION_7_4
+	default "7.5.1"    if BR2_GDB_VERSION_7_5
+
+endif
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
new file mode 100644
index 0000000000..24ce9bf210
--- /dev/null
+++ b/package/gdb/gdb.mk
@@ -0,0 +1,101 @@
+#############################################################
+#
+# gdb
+#
+#############################################################
+
+GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
+GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
+
+# When no version is defined, it means that cross-gdb for the host has
+# not been enabled, and we will only build gdbserver or gdb for the
+# target. In this case, use the latest available version
+# automatically.
+ifeq ($(GDB_VERSION),)
+ifeq ($(BR2_bfin),y)
+GDB_VERSION = 6.6a
+else ifeq ($(BR2_avr32),y)
+GDB_VERSION = 6.7.1-avr32-2.1.5
+GDB_SITE    = ftp://www.at91.com/pub/buildroot/
+else
+GDB_VERSION = 7.5.1
+endif
+endif
+
+GDB_SOURCE = gdb-$(GDB_VERSION).tar.bz2
+GDB_LICENSE = GPLv2+ LGPLv2+ GPLv3+ LGPLv3+
+GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
+
+# We only want gdbserver and not the entire debugger.
+ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),)
+GDB_SUBDIR = gdb/gdbserver
+HOST_GDB_SUBDIR = .
+else
+GDB_DEPENDENCIES = ncurses
+endif
+
+# For the host variant, we really want to build with XML support,
+# which is needed to read XML descriptions of target architectures.
+HOST_GDB_DEPENDENCIES = host-expat
+
+# Apply the Xtensa specific patches
+XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME))
+ifneq ($(XTENSA_CORE_NAME),)
+define GDB_XTENSA_PRE_PATCH
+	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
+		-C $(@D) --strip-components=1 gdb
+endef
+HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
+endif
+
+GDB_CONF_ENV = \
+	ac_cv_type_uintptr_t=yes \
+	gt_cv_func_gettext_libintl=yes \
+	ac_cv_func_dcgettext=yes \
+	gdb_cv_func_sigsetjmp=yes \
+	bash_cv_func_strcoll_broken=no \
+	bash_cv_must_reinstall_sighandlers=no \
+	bash_cv_func_sigsetjmp=present \
+	bash_cv_have_mbstate_t=yes \
+	gdb_cv_func_sigsetjmp=yes
+
+GDB_CONF_OPT = \
+	--without-uiout \
+	--disable-tui \
+	--disable-gdbtk \
+	--without-x \
+	--disable-sim \
+	$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \
+	--with-curses \
+	--without-included-gettext \
+	--disable-werror
+
+# This removes some unneeded Python scripts and XML target description
+# files that are not useful for a normal usage of the debugger.
+define GDB_REMOVE_UNNEEDED_FILES
+	$(RM) -rf $(TARGET_DIR)/usr/share/gdb
+endef
+
+GDB_POST_INSTALL_TARGET_HOOKS += GDB_REMOVE_UNNEEDED_FILES
+
+# A few notes:
+#  * --target, because we're doing a cross build rather than a real
+#    host build.
+#  * --enable-static because gdb really wants to use libbfd.a
+#  * --disable-shared, otherwise the old 6.7 version specific to AVR32
+#    doesn't build because it wants to link a shared libbfd.so against
+#    non-PIC liberty.a.
+HOST_GDB_CONF_OPT = \
+	--target=$(GNU_TARGET_NAME) \
+	--enable-static --disable-shared \
+	--without-uiout \
+	--disable-tui \
+	--disable-gdbtk \
+	--without-x \
+	--enable-threads \
+	--disable-werror \
+	--without-included-gettext \
+	--disable-sim
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/toolchain/Config.in b/toolchain/Config.in
index f1cca144f7..fa78cf4da6 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -12,7 +12,6 @@ config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
 	depends on !BR2_microblaze && !BR2_aarch64
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
@@ -25,7 +24,6 @@ config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
 	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
 	help
 	  Say 'y' if you want to generate the toolchain with crosstool-NG
 	  (http://crosstool-ng.org).
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
deleted file mode 100644
index 69f79157b0..0000000000
--- a/toolchain/gdb/Config.in
+++ /dev/null
@@ -1,99 +0,0 @@
-comment "Gdb Options"
-
-config BR2_PACKAGE_GDB
-	bool "Build gdb debugger for the Target"
-	select BR2_PACKAGE_NCURSES
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin && !BR2_aarch64
-	# The newest versions of gdb require thread debugging in the
-	# toolchain. The only cases for which this is not needed is if
-	# we use gdb 6.8 (marked deprecated)
-	depends on \
-		BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED || \
-		BR2_DEPRECATED || \
-		BR2_bfin
-	help
-	    Build the full gdb debugger to run on the target.
-
-comment "Gdb for the target needs WCHAR and threads support in toolchain"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_GDB_SERVER
-	bool "Build gdb server for the Target"
-	depends on !BR2_TOOLCHAIN_EXTERNAL
-	help
-	    Build the gdbserver stub to run on the target.
-	    A full gdb is needed to debug the progam.
-
-config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
-	bool "Copy gdb server to the Target"
-	depends on BR2_TOOLCHAIN_EXTERNAL
-	help
-	  Copy the gdbserver provided by the external toolchain to the
-	  target.
-
-config BR2_PACKAGE_GDB_HOST
-	bool "Build gdb for the Host"
-	# cross-gdb is supposed to be part of the external
-	# toolchain. And the build currently fails.
-	depends on !BR2_TOOLCHAIN_EXTERNAL
-	help
-	    Build gdb to run on the host to debug programs run on the target.
-
-choice
-	prompt "GDB debugger Version"
-	default BR2_GDB_VERSION_6_6 if BR2_bfin
-	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
-	default BR2_GDB_VERSION_7_5
-	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
-	help
-	  Select the version of gdb you wish to use.
-
-	config BR2_GDB_VERSION_6_6
-		bool "gdb 6.6"
-		depends on BR2_bfin
-
-	config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
-		depends on BR2_avr32
-		bool "gdb 6.7.1-avr32-2.1.5"
-
-	config BR2_GDB_VERSION_7_2
-		bool "gdb 7.2.x"
-		depends on !BR2_bfin
-		depends on BR2_DEPRECATED
-		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
-
-	config BR2_GDB_VERSION_7_3
-		bool "gdb 7.3.x"
-		depends on !BR2_bfin
-		depends on BR2_DEPRECATED
-		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
-
-	config BR2_GDB_VERSION_7_4
-		bool "gdb 7.4.x"
-		depends on !BR2_bfin
-		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
-
-	config BR2_GDB_VERSION_7_5
-		bool "gdb 7.5.x"
-		depends on !BR2_bfin
-		depends on BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-		select BR2_PTHREAD_DEBUG if (BR2_TOOLCHAIN_BUILDROOT && !BR2_PTHREADS_NONE)
-
-endchoice
-
-comment "gdb support needs pthread debug support in toolchain"
-	depends on !BR2_DEPRECATED && !BR2_bfin && !BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-
-config BR2_GDB_VERSION
-	string
-	default "6.6a"     if BR2_GDB_VERSION_6_6
-	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
-	default "7.2a"     if BR2_GDB_VERSION_7_2
-	default "7.3.1"    if BR2_GDB_VERSION_7_3
-	default "7.4.1"    if BR2_GDB_VERSION_7_4
-	default "7.5.1"    if BR2_GDB_VERSION_7_5
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
deleted file mode 100644
index a932b1fab1..0000000000
--- a/toolchain/gdb/gdb.mk
+++ /dev/null
@@ -1,234 +0,0 @@
-######################################################################
-#
-# gdb
-#
-######################################################################
-GDB_VERSION:=$(call qstrip,$(BR2_GDB_VERSION))
-
-GDB_SOURCE:=gdb-$(GDB_VERSION).tar.bz2
-GDB_CAT:=$(BZCAT)
-
-ifeq ($(findstring avr32,$(GDB_VERSION)),avr32)
- GDB_SITE:=ftp://www.at91.com/pub/buildroot/
- GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
-else
- GDB_SITE:=$(BR2_GNU_MIRROR)/gdb
- GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
-endif
-
-GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_VERSION)
-
-$(DL_DIR)/$(GDB_SOURCE):
-	$(call DOWNLOAD,$(GDB_SITE)/$(GDB_SOURCE))
-
-gdb-unpacked: $(GDB_DIR)/.unpacked
-$(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
-	mkdir -p $(GDB_DIR)
-	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
-ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
-	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip, \
-		$(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gdb
-endif
-ifneq ($(wildcard $(GDB_PATCH_DIR)),)
-	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch
-endif
-	$(call CONFIG_UPDATE,$(@D))
-	touch $@
-
-gdb-patched: $(GDB_DIR)/.unpacked
-
-gdb-source: $(DL_DIR)/$(GDB_SOURCE)
-gdb-dirclean:
-	rm -rf $(GDB_DIR)
-
-######################################################################
-#
-# gdb target
-#
-######################################################################
-
-GDB_TARGET_DIR:=$(BUILD_DIR)/gdb-$(GDB_VERSION)-target
-
-GDB_TARGET_CONFIGURE_VARS:= \
-	ac_cv_type_uintptr_t=yes \
-	gt_cv_func_gettext_libintl=yes \
-	ac_cv_func_dcgettext=yes \
-	gdb_cv_func_sigsetjmp=yes \
-	bash_cv_func_strcoll_broken=no \
-	bash_cv_must_reinstall_sighandlers=no \
-	bash_cv_func_sigsetjmp=present \
-	bash_cv_have_mbstate_t=yes
-
-$(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked
-	mkdir -p $(GDB_TARGET_DIR)
-	(cd $(GDB_TARGET_DIR); \
-		gdb_cv_func_sigsetjmp=yes \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -Wno-error" \
-		CFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -Wno-error" \
-		$(GDB_TARGET_CONFIGURE_VARS) \
-		$(GDB_DIR)/configure $(QUIET) \
-		--cache-file=/dev/null \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		--prefix=/usr \
-		$(DISABLE_NLS) \
-		--without-uiout $(DISABLE_GDBMI) \
-		--disable-tui --disable-gdbtk --without-x \
-		--disable-sim --enable-gdbserver \
-		--without-included-gettext \
-		--disable-werror \
-		$(QUIET) \
-	)
-ifeq ($(BR2_ENABLE_LOCALE),y)
-	-$(SED) "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile
-endif
-	touch $@
-
-$(GDB_TARGET_DIR)/gdb/gdb: $(GDB_TARGET_DIR)/.configured
-	# force ELF support since it fails due to BFD linking problems
-	gdb_cv_var_elf=yes \
-	$(TARGET_MAKE_ENV) \
-	$(MAKE) CC="$(TARGET_CC)" MT_CFLAGS="$(TARGET_CFLAGS)" \
-		-C $(GDB_TARGET_DIR)
-
-$(TARGET_DIR)/usr/bin/gdb: $(GDB_TARGET_DIR)/gdb/gdb
-	install -c -D $(GDB_TARGET_DIR)/gdb/gdb $(TARGET_DIR)/usr/bin/gdb
-
-gdb_target: ncurses $(TARGET_DIR)/usr/bin/gdb
-
-gdb_target-source: $(DL_DIR)/$(GDB_SOURCE)
-
-gdb_target-clean:
-	-$(MAKE) -C $(GDB_DIR) clean
-
-gdb_target-dirclean:
-	rm -rf $(GDB_DIR)
-
-######################################################################
-#
-# gdbserver
-#
-######################################################################
-
-GDB_SERVER_DIR:=$(BUILD_DIR)/gdbserver-$(GDB_VERSION)
-
-$(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
-	mkdir -p $(GDB_SERVER_DIR)
-	(cd $(GDB_SERVER_DIR); \
-		$(TARGET_CONFIGURE_OPTS) \
-		gdb_cv_func_sigsetjmp=yes \
-		bash_cv_have_mbstate_t=yes \
-		$(GDB_DIR)/gdb/gdbserver/configure $(QUIET) \
-		--cache-file=/dev/null \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		--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 \
-		--includedir=$(STAGING_DIR)/usr/include \
-		$(DISABLE_NLS) \
-		--without-uiout $(DISABLE_GDBMI) \
-		--disable-tui --disable-gdbtk --without-x \
-		--without-included-gettext \
-	)
-	touch $@
-
-$(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
-	$(TARGET_MAKE_ENV) \
-	$(MAKE) CC="$(TARGET_CC)" MT_CFLAGS="$(TARGET_CFLAGS)" \
-		-C $(GDB_SERVER_DIR)
-
-$(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
-ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-	mkdir -p $(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/target_utils
-	install -c $(GDB_SERVER_DIR)/gdbserver \
-		$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/target_utils/gdbserver
-endif
-	install -c -D $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver
-
-gdbserver: $(TARGET_DIR)/usr/bin/gdbserver
-
-gdbserver-source: $(DL_DIR)/$(GDB_SOURCE)
-
-gdbserver-clean:
-	-$(MAKE) -C $(GDB_SERVER_DIR) clean
-
-gdbserver-dirclean:
-	rm -rf $(GDB_SERVER_DIR)
-
-######################################################################
-#
-# gdb on host
-#
-######################################################################
-
-GDB_HOST_DIR:=$(TOOLCHAIN_DIR)/gdbhost-$(GDB_VERSION)
-
-$(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked
-	mkdir -p $(GDB_HOST_DIR)
-	(cd $(GDB_HOST_DIR); \
-		gdb_cv_func_sigsetjmp=yes \
-		bash_cv_have_mbstate_t=yes \
-		$(HOST_CONFIGURE_OPTS) \
-		$(GDB_DIR)/configure $(QUIET) \
-		--cache-file=/dev/null \
-		--prefix=$(STAGING_DIR) \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		$(DISABLE_NLS) \
-		--without-uiout $(DISABLE_GDBMI) \
-		--disable-tui --disable-gdbtk --without-x \
-		--without-included-gettext \
-		--enable-threads \
-		--disable-werror \
-	)
-	touch $@
-
-$(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured
-	# force ELF support since it fails due to BFD linking problems
-	$(HOST_MAKE_ENV) \
-	gdb_cv_var_elf=yes \
-	$(MAKE) -C $(GDB_HOST_DIR)
-	strip $(GDB_HOST_DIR)/gdb/gdb
-
-$(TARGET_CROSS)gdb: $(GDB_HOST_DIR)/gdb/gdb
-	install -c $(GDB_HOST_DIR)/gdb/gdb $(TARGET_CROSS)gdb
-	ln -snf $(@F) $(HOST_DIR)/usr/bin/$(ARCH)-linux-gdb
-
-gdbhost: host-expat $(TARGET_CROSS)gdb
-
-gdbhost-source: $(DL_DIR)/$(GDB_SOURCE)
-
-gdbhost-clean:
-	-$(MAKE) -C $(GDB_HOST_DIR) clean
-
-gdbhost-dirclean:
-	rm -rf $(GDB_HOST_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_GDB),y)
-TARGETS+=gdb_target
-endif
-
-ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
-TARGETS+=gdbserver
-endif
-
-ifeq ($(BR2_PACKAGE_GDB_HOST),y)
-TARGETS+=gdbhost
-endif
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index adab0f7128..5493177536 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -2,6 +2,5 @@
 
 include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
-include toolchain/gdb/gdb.mk
 include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index a713727f5b..7f19b09dfe 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -99,6 +99,13 @@ choice
 		depends on !BR2_xtensa
 endchoice
 
+config BR2_PTHREAD_DEBUG
+	bool "Thread library debugging"
+	depends on BR2_PTHREADS || BR2_PTHREADS_OLD || BR2_PTHREADS_NATIVE
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	help
+	  Build the thread library with debugging enabled.
+
 source "toolchain/elf2flt/Config.in"
 
 config BR2_VFP_FLOAT
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index f6905ae231..208ccac86a 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -3,7 +3,7 @@
 # we want gdb config in the middle of both source and external
 # toolchains, but mconf won't let us source the same file twice,
 # so put it here instead
-source "toolchain/gdb/Config.in"
+source "package/gdb/Config.in.host"
 
 config BR2_LARGEFILE
 	bool
@@ -27,11 +27,6 @@ config BR2_TOOLCHAIN_HAS_THREADS
 	bool
 
 config BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-	bool
-
-config BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED
-	default y if !BR2_TOOLCHAIN_HAS_THREADS
 	bool
 
 config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index d67725651a..d1e755244e 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -4,6 +4,5 @@
 include toolchain/helpers.mk
 include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
-include toolchain/gdb/gdb.mk
 include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index df4e9b1092..93c12e9c9f 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -121,15 +121,18 @@ choice
 	config BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS
 		bool "linuxthreads"
 		select BR2_TOOLCHAIN_HAS_THREADS
+		select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 
 	config BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD
 		bool "linuxthreads (stable/old)"
 		select BR2_TOOLCHAIN_HAS_THREADS
+		select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 		depends on BR2_TOOLCHAIN_CTNG_uClibc
 
 	config BR2_TOOLCHAIN_CTNG_THREADS_NPTL
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
+		select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 endchoice
 
 endif # BR2_TOOLCHAIN_CTNG
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index 4292d85514..9999aa21b2 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -3,7 +3,6 @@
 include toolchain/helpers.mk
 include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
-include toolchain/gdb/gdb.mk
 include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/toolchain-external/ext-tool.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index bc1c6553de..b1aab6a2ed 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -913,5 +913,12 @@ config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS
 
 endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
+config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
+	bool "Copy gdb server to the Target"
+	depends on BR2_TOOLCHAIN_EXTERNAL
+	help
+	  Copy the gdbserver provided by the external toolchain to the
+	  target.
+
 endif # BR2_TOOLCHAIN_EXTERNAL
 
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index b53bb24500..b98e2e8682 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -53,12 +53,6 @@ config BR2_UCLIBC_CONFIG
 	  See also docs/README in this package.
 	  If unsure, use the default.
 
-config BR2_PTHREAD_DEBUG
-	bool "Thread library debugging"
-	depends on BR2_PTHREADS || BR2_PTHREADS_OLD || BR2_PTHREADS_NATIVE
-	help
-	  Build the thread library with debugging enabled.
-
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "Compile and install uClibc tests"
 	select BR2_PACKAGE_MAKE

From f6d02465068eed452c5a1c3ca453eb8641ab034a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 00:04:34 +0000
Subject: [PATCH 4755/6849] gdb: do not allow gdbserver/cross-gdb build in some
 cases

When an external toolchain is used, and the user has chosen to copy
the external toolchain gdbserver to the target, then we should allow
the user to build a gdbserver and/or a cross-gdb: the ones of the
external toolchain should be used.

The reasoning is that one must use a gdbserver and cross-gdb of
identical versions to be sure that debugging will work properly.

Change suggested by Yann E. Morin.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdb/Config.in      | 7 ++++++-
 package/gdb/Config.in.host | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 6eb29d5bdf..38f4564ebe 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -3,7 +3,11 @@ comment "gdb/gdbserver require a toolchain with thread and thread debug support"
 
 config BR2_PACKAGE_GDB
 	bool "gdb"
-	select BR2_PACKAGE_GDB_SERVER if !BR2_PACKAGE_GDB_DEBUGGER
+	# When the external toolchain gdbserver is copied to the
+	# target, we don't allow building a separate gdbserver. The
+	# one from the external toolchain should be used.
+	select BR2_PACKAGE_GDB_SERVER if \
+	       (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
 	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	help
 	  GDB, the GNU Project debugger, allows you to see what is
@@ -25,6 +29,7 @@ if BR2_PACKAGE_GDB
 
 config BR2_PACKAGE_GDB_SERVER
 	bool "gdbserver"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
 	help
 	  Build the gdbserver stub to run on the target.
 	  A full gdb is needed to debug the progam.
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index 223c4268c5..1e092635aa 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -1,5 +1,9 @@
 config BR2_PACKAGE_HOST_GDB
 	bool "Build cross gdb for the host"
+	# When the external toolchain gdbserver is used, we shouldn't
+	# allow to build a cross-gdb, as the one of the external
+	# toolchain should be used.
+	depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
 	help
 	  Build a cross gdb that runs on the host machine and debugs
 	  programs running on the target. It requires 'gdbserver'

From 483fdd6bb73492979f67b6b6bc68e6e2ad3c89fd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 00:04:35 +0000
Subject: [PATCH 4756/6849] gdb: install gdbserver into the SDK

In order for a Buildroot toolchain to be usable as an external
toolchain, we should copy the target gdbserver somewhere into
$(HOST_DIR). In order to match what Crosstool-NG does (and therefore
to match something the external toolchain logic already understands),
we install gdbserver in
$(HOST_DIR)/usr/<tuple>/debug-root/usr/bin/gdbserver.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdb/gdb.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 24ce9bf210..cec64d5c83 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -78,6 +78,20 @@ endef
 
 GDB_POST_INSTALL_TARGET_HOOKS += GDB_REMOVE_UNNEEDED_FILES
 
+# This installs the gdbserver somewhere into the $(HOST_DIR) so that
+# it becomes an integral part of the SDK, if the toolchain generated
+# by Buildroot is later used as an external toolchain. We install it
+# in debug-root/usr/bin/gdbserver so that it matches what Crosstool-NG
+# does.
+define GDB_SDK_INSTALL_GDBSERVER
+	$(INSTALL) -D -m 0755 $(TARGET_DIR)/usr/bin/gdbserver \
+		$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/debug-root/usr/bin/gdbserver
+endef
+
+ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+GDB_POST_INSTALL_TARGET_HOOKS += GDB_SDK_INSTALL_GDBSERVER
+endif
+
 # A few notes:
 #  * --target, because we're doing a cross build rather than a real
 #    host build.

From e8fad4d95d65e11ddb8a40bf9396f0da140c0269 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Apr 2013 00:04:36 +0000
Subject: [PATCH 4757/6849] toolchain-external: support more gdbserver
 locations

The x86/x86-64 CodeSourcery toolchains use some weird locations for
the gdbserver binary:

$ find . -name 'gdbserver'
./i686-pc-linux-gnu/libc/atom/usr/bin/gdbserver
./i686-pc-linux-gnu/libc/atom/usr/lib/bin/gdbserver
./i686-pc-linux-gnu/libc/core2/usr/bin/gdbserver
./i686-pc-linux-gnu/libc/core2/usr/lib64/bin/gdbserver
./i686-pc-linux-gnu/libc/usr/lib/bin/gdbserver
./i686-pc-linux-gnu/libc/usr/lib64/bin/gdbserver

Notice that it's sometimes hidden in a usr/{lib,lib64}/bin
directory. This patch changes the gdbserver logic to also try in this
location.

Originally based on work done by Daniel Nilsson, visible at
http://patchwork.ozlabs.org/patch/155767/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index c4ddb0be4f..5c5935c21d 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -444,9 +444,9 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
-		for d in $${ARCH_SYSROOT_DIR} $${ARCH_SYSROOT_DIR}/../debug-root/ ; do \
-			if test -f $${d}/usr/bin/gdbserver ; then \
-				install -m 0755 -D $${d}/usr/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
+		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \
+			if test -f $${d}/bin/gdbserver ; then \
+				install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
 				gdbserver_found=1 ; \
 				break ; \
 			fi ; \

From f4e6f4fef777bff7635939ed4de61e45733a3e6e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 23:09:13 +0200
Subject: [PATCH 4758/6849] gdb: add back $ARCH-linux-gdb symlink for host-gdb

Like we do for the toolchain and we used to to do for gdb.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdb/gdb.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index cec64d5c83..73ff7a465a 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -111,5 +111,13 @@ HOST_GDB_CONF_OPT = \
 	--without-included-gettext \
 	--disable-sim
 
+# legacy $arch-linux-gdb symlink
+define HOST_GDB_ADD_SYMLINK
+	cd $(HOST_DIR)/usr/bin && \
+		ln -snf $(GNU_TARGET_NAME)-gdb $(ARCH)-linux-gdb
+endef
+
+HOST_GDB_POST_INSTALL_HOOKS += HOST_GDB_ADD_SYMLINK
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 2c4ff68e08e063152245d0a1b211df7a4360f925 Mon Sep 17 00:00:00 2001
From: Soren Brinkmann <soren.brinkmann@xilinx.com>
Date: Wed, 10 Apr 2013 10:34:38 +0000
Subject: [PATCH 4759/6849] system/securetty: Add ttyPS[0-1]

Adding ttyPS0 and ttyPS1 to securetty for Zynq.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/skeleton/etc/securetty | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/skeleton/etc/securetty b/system/skeleton/etc/securetty
index c96f2fb9f3..5a3d0c648e 100644
--- a/system/skeleton/etc/securetty
+++ b/system/skeleton/etc/securetty
@@ -22,6 +22,8 @@ ttyUL0
 ttyUL1
 ttyUL2
 ttyUL3
+ttyPS0
+ttyPS1
 ttyPSC0
 ttyPSC1
 ttyPSC2

From e968ebee7efb85d22a1953c032201c1d9982df20 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Apr 2013 23:57:07 +0200
Subject: [PATCH 4760/6849] kismet: fix license files info

Fixes http://autobuild.buildroot.net/results/9a0ebe157438a07e145026e61c3031e5bf2283b9

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/kismet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 845df6bc16..5abc92c144 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -8,7 +8,7 @@ KISMET_VERSION = 2013-03-R1a
 KISMET_SITE = http://www.kismetwireless.net/code
 KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses
 KISMET_LICENSE = GPLv2+
-KISMET_LICENSE_FILES = GPL
+KISMET_LICENSE_FILES = debian/copyright
 
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 	KISMET_DEPENDENCIES += libnl

From 13e2c9e7b0e9b02828a4d6d54ae3a40ef17046df Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 11 Apr 2013 21:55:05 +0000
Subject: [PATCH 4761/6849] linux: fix 3.8.x stable version

Commit c461e64201598eae85ff32e130ed3f0ccd9fed78 bumped the linux 3.8.x
stable version from 3.8.5 to 3.8.6, but did so in only one of the two places
in which the version number is hard-coded in linux/Config.in

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 8208277e5c..8d301a19b2 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.5" if BR2_LINUX_KERNEL_3_8
+	default "3.8.6" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 6d916b73ce84430ec9c0ee1a61b8d85f59ed8f37 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Apr 2013 23:49:41 +0000
Subject: [PATCH 4762/6849] kismet: bump to version 2013-03-R1b

Fixes issues in the configure script.
Also make libnl a mandatory dependency to fix:
http://autobuild.buildroot.net/results/c8bf63f4ee013bd3467934c87c61478a1f95e3eb/
Kismet isn't too useful without it anyway.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kismet/Config.in | 6 ++++--
 package/kismet/kismet.mk | 9 +++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index 6954665421..8de29beea4 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,12 +1,14 @@
-comment "Kismet requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "Kismet requires a toolchain with thread and C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_KISMET
 	bool "kismet"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_NCURSES_TARGET_PANEL
 	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBNL
 	help
 	  Kismet - 802.11 layer2 wireless network detector, sniffer,
 	  and intrusion detection system.
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 5abc92c144..1fb3f5a29e 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -4,16 +4,13 @@
 #
 #############################################################
 
-KISMET_VERSION = 2013-03-R1a
+KISMET_VERSION = 2013-03-R1b
 KISMET_SITE = http://www.kismetwireless.net/code
-KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses
+KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl
+KISMET_CONF_OPT += --with-netlink-version=3
 KISMET_LICENSE = GPLv2+
 KISMET_LICENSE_FILES = debian/copyright
 
-ifeq ($(BR2_PACKAGE_LIBNL),y)
-	KISMET_DEPENDENCIES += libnl
-	KISMET_CONF_OPT += --with-netlink-version=3
-endif
 ifeq ($(BR2_PACKAGE_PCRE),y)
 	KISMET_DEPENDENCIES += pcre
 endif

From bbf9ed5bf17a8daa8d998f64e9eed0cb509abb76 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 12 Apr 2013 12:18:27 +0200
Subject: [PATCH 4763/6849] kmod: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 2c03435f46..c0b223df7d 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,4 +1,4 @@
-KMOD_VERSION = 12
+KMOD_VERSION = 13
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From 21cbd13c3d194b6883585a1e7cabcdeaa5cedd5e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 00:56:04 +0000
Subject: [PATCH 4764/6849] mpd: bump to version 0.17.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 5fbc8f6dc0..e098c3d754 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-MPD_VERSION = 0.17.3
-MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
+MPD_VERSION = 0.17.4
+MPD_SITE = http://www.musicpd.org/download/mpd/stable
 MPD_DEPENDENCIES = host-pkgconf libglib2
 MPD_LICENSE = GPLv2
 MPD_LICENSE_FILES = COPYING

From 7a3c9cfdbae96fc6760ac6b57af005ba29ffd556 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 02:15:20 +0000
Subject: [PATCH 4765/6849] flot: bump to version 0.8

Also change upstream website and download URL and add new Canvas option.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flot/Config.in | 7 ++++++-
 package/flot/flot.mk   | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/flot/Config.in b/package/flot/Config.in
index 0bd6b14a96..90a4278c00 100644
--- a/package/flot/Config.in
+++ b/package/flot/Config.in
@@ -14,12 +14,17 @@ config BR2_PACKAGE_FLOT
 	  Safari 3.0+, Opera 9.5+ and Konqueror 4.x+ with the HTML
 	  canvas tag.
 
-	  https://code.google.com/p/flot/
+	  http://www.flotcharts.org/
 
 if BR2_PACKAGE_FLOT
 
 comment "flot plugins"
 
+config BR2_PACKAGE_FLOT_CANVAS
+	bool "canvas"
+	help
+	  Flot plugin to render axis tick labels directly to the canvas
+
 config BR2_PACKAGE_FLOT_FILLBETWEEN
 	bool "fillbetween"
 	help
diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index 41f5a423aa..97110bccfe 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -1,6 +1,9 @@
-FLOT_VERSION = 0.7
-FLOT_SITE = http://flot.googlecode.com/files
+FLOT_VERSION = 0.8.0
+FLOT_SITE = http://www.flotcharts.org/downloads
+FLOT_LICENSE = MIT
+FLOT_LICENSE_FILES = LICENSE.txt
 FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
+	$(if $(BR2_PACKAGE_FLOT_CANVAS),canvas) \
 	$(if $(BR2_PACKAGE_FLOT_FILLBETWEEN),fillbetween) \
 	$(if $(BR2_PACKAGE_FLOT_NAVIGATE),navigate) \
 	$(if $(BR2_PACKAGE_FLOT_PIE),pie) \

From 7b8ecc73468b117d7d83fd7231a58b5c612f9df4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 02:15:21 +0000
Subject: [PATCH 4766/6849] jquery-sparkline: bump to version 2.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-sparkline/jquery-sparkline.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index 76adad60ed..aa6395c7d9 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -1,6 +1,7 @@
-JQUERY_SPARKLINE_VERSION = 2.1
+JQUERY_SPARKLINE_VERSION = 2.1.1
 JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
 JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
+JQUERY_SPARKLINE_LICENSE = BSD-3c
 
 define JQUERY_SPARKLINE_EXTRACT_CMDS
 	cp $(DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D)

From f310ee90af3ae1fc9e62b944abf240039b6779df Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 02:15:22 +0000
Subject: [PATCH 4767/6849] jquery-validation: bump to version 1.11.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-validation/jquery-validation.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
index 746b53485e..423d7f1a46 100644
--- a/package/jquery-validation/jquery-validation.mk
+++ b/package/jquery-validation/jquery-validation.mk
@@ -1,6 +1,7 @@
-JQUERY_VALIDATION_VERSION = 1.10.0
+JQUERY_VALIDATION_VERSION = 1.11.1
 JQUERY_VALIDATION_SITE = http://jquery.bassistance.de/validate
 JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip
+JQUERY_VALIDATION_LICENSE = MIT
 
 define JQUERY_VALIDATION_EXTRACT_CMDS
 	unzip -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE)

From 39ce56afde956ceaff7134448df759be6e2aae36 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 02:15:23 +0000
Subject: [PATCH 4768/6849] jquery: bump to version 1.9.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery/jquery.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index 871f7a0b4f..4df280159f 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -1,6 +1,7 @@
-JQUERY_VERSION = 1.8.3
+JQUERY_VERSION = 1.9.1
 JQUERY_SITE = http://code.jquery.com
 JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js
+JQUERY_LICENSE = MIT
 
 define JQUERY_EXTRACT_CMDS
 	cp $(DL_DIR)/$(JQUERY_SOURCE) $(@D)

From 5fbef614802d4de658a387e9306b52f31356db26 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 11 Apr 2013 12:17:50 +0000
Subject: [PATCH 4769/6849] fs/ext2: enclose the ext2 options in if...endif

Use a 'if...endif' construct instead of repeating the
'depends on' for each symbols.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/Config.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index 2af44a826e..cb4beed6dd 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -3,25 +3,23 @@ config BR2_TARGET_ROOTFS_EXT2
 	help
 	  Build an ext2 root filesystem
 
+if BR2_TARGET_ROOTFS_EXT2
+
 config BR2_TARGET_ROOTFS_EXT2_BLOCKS
 	int "size in blocks (leave at 0 for auto calculation)"
-	depends on BR2_TARGET_ROOTFS_EXT2
 	default 0
 
 config BR2_TARGET_ROOTFS_EXT2_INODES
 	int "inodes (leave at 0 for auto calculation)"
-	depends on BR2_TARGET_ROOTFS_EXT2
 	default 0
 
 config BR2_TARGET_ROOTFS_EXT2_RESBLKS
 	int "reserved blocks percentage"
-	depends on BR2_TARGET_ROOTFS_EXT2
 	default 0
 
 choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_EXT2_NONE
-	depends on BR2_TARGET_ROOTFS_EXT2
 	help
 	  Select compressor for ext2 filesystem of the root filesystem
 
@@ -47,3 +45,4 @@ config BR2_TARGET_ROOTFS_EXT2_LZMA
 
 endchoice
 
+endif # BR2_TARGET_ROOTFS_EXT2

From 69036c20f14de6d919bc423af32a51a84b023893 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 11 Apr 2013 12:17:51 +0000
Subject: [PATCH 4770/6849] fs/ext2: add ability to build ext3/4 too

Use the host-e2fsprogs to tune2fs the generated rootfs.ext2 image,
and upgrade it to either one of ext2, ext3 or ext4.

Since calling tune2fs may require running e2fsck (tune2fs will warn
to do so when certain FS options are changed), we systematically call
e2fsck. This makes the code path simpler, and as a side-effect checks
that genext2fs did not generate garbage.

In turn, e2fsck will unconditionally add a UUID to the filesystem,
which is bad for reproducibility, so we call tune2fs again to remove
the UUID. This does not require checking the filesystem.

To ensure compatibility of Buildroot's .config, leave ext2 as the
default. Boards' .config can override this at will.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/Config.in                | 36 +++++++++++++---
 fs/ext2/ext2.mk                  |  6 ++-
 fs/ext2/genext2fs.sh             | 73 +++++++++++++++++++++++++++++++-
 package/e2fsprogs/Config.in.host |  2 +-
 4 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index cb4beed6dd..c8320e281d 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -1,10 +1,32 @@
 config BR2_TARGET_ROOTFS_EXT2
-	bool "ext2 root filesystem"
+	bool "ext2/3/4 root filesystem"
+	select BR2_PACKAGE_HOST_E2FSPROGS
 	help
-	  Build an ext2 root filesystem
+	  Build an ext2/3/4 root filesystem
 
 if BR2_TARGET_ROOTFS_EXT2
 
+choice
+	bool "ext2/3/4 variant"
+	default BR2_TARGET_ROOTFS_EXT2_2
+
+config BR2_TARGET_ROOTFS_EXT2_2
+	bool "ext2"
+
+config BR2_TARGET_ROOTFS_EXT2_3
+	bool "ext3"
+
+config BR2_TARGET_ROOTFS_EXT2_4
+	bool "ext4"
+
+endchoice
+
+config BR2_TARGET_ROOTFS_EXT2_GEN
+	int
+	default 2 if BR2_TARGET_ROOTFS_EXT2_2
+	default 3 if BR2_TARGET_ROOTFS_EXT2_3
+	default 4 if BR2_TARGET_ROOTFS_EXT2_4
+
 config BR2_TARGET_ROOTFS_EXT2_BLOCKS
 	int "size in blocks (leave at 0 for auto calculation)"
 	default 0
@@ -21,27 +43,27 @@ choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_EXT2_NONE
 	help
-	  Select compressor for ext2 filesystem of the root filesystem
+	  Select compressor for ext2/3/4 filesystem of the root filesystem
 
 config BR2_TARGET_ROOTFS_EXT2_NONE
 	bool "no compression"
 	help
-	  Do not compress the ext2 filesystem.
+	  Do not compress the ext2/3/4 filesystem.
 
 config BR2_TARGET_ROOTFS_EXT2_GZIP
 	bool "gzip"
 	help
-	  Do compress the ext2 filesystem with gzip.
+	  Do compress the ext2/3/4 filesystem with gzip.
 
 config BR2_TARGET_ROOTFS_EXT2_BZIP2
 	bool "bzip2"
 	help
-	  Do compress the ext2 filesystem with bzip2.
+	  Do compress the ext2/3/4 filesystem with bzip2.
 
 config BR2_TARGET_ROOTFS_EXT2_LZMA
 	bool "lzma"
 	help
-	  Do compress the ext2 filesystem with lzma.
+	  Do compress the ext2/3/4 filesystem with lzma.
 
 endchoice
 
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index 7b71592d97..018a5a3d00 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -18,10 +18,12 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
 EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
 endif
 
-ROOTFS_EXT2_DEPENDENCIES = host-genext2fs
+ROOTFS_EXT2_DEPENDENCIES = host-genext2fs host-e2fsprogs
+
+EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
 
 define ROOTFS_EXT2_CMD
-	PATH=$(TARGET_PATH) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
+	PATH=$(TARGET_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
 $(eval $(call ROOTFS_TARGET,ext2))
diff --git a/fs/ext2/genext2fs.sh b/fs/ext2/genext2fs.sh
index 7a518aea74..c2049f56c3 100755
--- a/fs/ext2/genext2fs.sh
+++ b/fs/ext2/genext2fs.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 # genext2fs wrapper calculating needed blocks/inodes values if not specified
+set -e
 
 export LC_ALL=C
 
 CALC_BLOCKS=1
 CALC_INODES=1
+EXT_OPTS=
+EXT_OPTS_O=
 
 while getopts x:d:D:b:i:N:m:g:e:zfqUPhVv f
 do
@@ -14,6 +17,7 @@ do
 	d) TARGET_DIR=$OPTARG ;;
     esac
 done
+eval IMG="\"\${${OPTIND}}\""
 
 # calculate needed inodes
 if [ $CALC_INODES -eq 1 ];
@@ -30,7 +34,74 @@ then
     # we scale inodes / blocks with 10% to compensate for bitmaps size + slack
     BLOCKS=$(du -s -c -k $TARGET_DIR | grep total | sed -e "s/total//")
     BLOCKS=$(expr 500 + \( $BLOCKS + $INODES / 8 \) \* 11 / 10)
+    # we add 1081 blocks (a bit more than 1 MiB, assuming 1KiB blocks) for
+    # the journal if ext3/4
+    # Note: I came to 1081 blocks after trial-and-error checks. With 1080 or
+    # less additional blocks, and tune2fs would refuse to add the journal;
+    # with 1081 additional blocks or above, tune2fs wil happily add a journal.
+    # YMMV.
+    if [ ${GEN} -ge 3 ]; then
+        BLOCKS=$(expr 1081 + $BLOCKS )
+    fi
     set -- $@ -b $BLOCKS
 fi
 
-exec genext2fs $@
+e2tunefsck() {
+    # Upgrade the file system
+    if [ $# -ne 0 ]; then
+        tune2fs "$@" "${IMG}"
+    fi
+
+    # After changing filesystem options, running fsck is required
+    # (see: man tune2fs). Running e2fsck in other cases will ensure
+    # coherency of the filesystem, although it is not required.
+    # 'e2fsck -pDf' means:
+    #  - automatically repair
+    #  - optimise and check for duplicate entries
+    #  - force checking
+    # Sending output to oblivion, as e2fsck can be *very* verbose,
+    # especially with filesystems generated by genext2fs.
+    # Exit codes 1 & 2 are OK, it means fs errors were successfully
+    # corrected, hence our little trick with $ret.
+    ret=0
+    e2fsck -pDf "${IMG}" >/dev/null || ret=$?
+    case ${ret} in
+       0|1|2) ;;
+       *)   exit ${ret};;
+    esac
+    printf "\ne2fsck was successfully run on '%s' (ext%d)\n\n"  \
+           "${IMG##*/}" "${GEN}"
+
+    # e2fsck will force a *random* UUID, which is bad
+    # for reproducibility, so we do not want it
+    tune2fs -U clear "${IMG}"
+}
+
+# Check we know what generation to generate
+case "${GEN}" in
+    2|3|4)
+	;;
+    *)
+	printf "%s: unknown ext generation to generate\n" "${0##*/}" >&2
+	exit 1
+	;;
+esac
+
+# Add a journal for ext3 and above
+if [ ${GEN} -ge 3 ]; then
+    EXT_OPTS="${EXT_OPTS} -j -J size=1"
+fi
+
+# Add ext4 specific features
+if [ ${GEN} -ge 4 ]; then
+    EXT_OPTS_O="${EXT_OPTS_O},extents,uninit_bg,dir_index"
+fi
+
+# Add our -O options (there will be at most one leading comma, remove it)
+if [ -n "${EXT_OPTS_O}" ]; then
+    EXT_OPTS="${EXT_OPTS} -O ${EXT_OPTS_O#,}"
+fi
+
+# Generate and upgrade the filesystem
+genext2fs "$@"
+e2tunefsck ${EXT_OPTS}
diff --git a/package/e2fsprogs/Config.in.host b/package/e2fsprogs/Config.in.host
index ea6a0bdc82..0c001c22a0 100644
--- a/package/e2fsprogs/Config.in.host
+++ b/package/e2fsprogs/Config.in.host
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_HOST_E2FSPROGS
 	bool "host e2fsprogs"
 	help
-	  The EXT2 file system utilities.
+	  The EXT2/3/4 file system utilities.
 	  
 	  http://e2fsprogs.sf.net

From aaefab09c7573f81a83c164ce2daca35b6a420e6 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 11 Apr 2013 12:17:52 +0000
Subject: [PATCH 4771/6849] fs/ext2: add a symlink 'rootfs.ext#' ->
 'rootfs.ext2'

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/ext2.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index 018a5a3d00..ffb7257586 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -26,4 +26,11 @@ define ROOTFS_EXT2_CMD
 	PATH=$(TARGET_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
+define ROOTFS_EXT2_HOOK_SYMLINK
+	ln -sf rootfs.ext2 $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)
+endef
+ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2)
+ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_HOOK_SYMLINK
+endif
+
 $(eval $(call ROOTFS_TARGET,ext2))

From 5fd27fc84998c6683728353f57dc7c6000e5b4c3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 11 Apr 2013 12:17:53 +0000
Subject: [PATCH 4772/6849] fs/ext2: add support for ext2 rev0 and rev1

Some bootloaders have a buggy ext2 support, and require ext2 rev1
instead of the traditional ext2 rev0 that genext2fs produces.

tune2fs accepts only one '-O list' at a time, so we need to construct
a list of -O options.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/Config.in    | 20 +++++++++++++++++---
 fs/ext2/ext2.mk      |  3 ++-
 fs/ext2/genext2fs.sh | 12 +++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index c8320e281d..097242ef70 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -6,12 +6,20 @@ config BR2_TARGET_ROOTFS_EXT2
 
 if BR2_TARGET_ROOTFS_EXT2
 
+config BR2_TARGET_ROOTFS_EXT2_2
+	bool
+
 choice
 	bool "ext2/3/4 variant"
-	default BR2_TARGET_ROOTFS_EXT2_2
+	default BR2_TARGET_ROOTFS_EXT2_2r0
 
-config BR2_TARGET_ROOTFS_EXT2_2
-	bool "ext2"
+config BR2_TARGET_ROOTFS_EXT2_2r0
+	bool "ext2 (rev0)"
+	select BR2_TARGET_ROOTFS_EXT2_2
+
+config BR2_TARGET_ROOTFS_EXT2_2r1
+	bool "ext2 (rev1)"
+	select BR2_TARGET_ROOTFS_EXT2_2
 
 config BR2_TARGET_ROOTFS_EXT2_3
 	bool "ext3"
@@ -27,6 +35,12 @@ config BR2_TARGET_ROOTFS_EXT2_GEN
 	default 3 if BR2_TARGET_ROOTFS_EXT2_3
 	default 4 if BR2_TARGET_ROOTFS_EXT2_4
 
+# All ext generations are revision 1, except ext2r0, which is revision 0
+config BR2_TARGET_ROOTFS_EXT2_REV
+    int
+    default 0   if BR2_TARGET_ROOTFS_EXT2_2r0
+    default 1   if !BR2_TARGET_ROOTFS_EXT2_2r0
+
 config BR2_TARGET_ROOTFS_EXT2_BLOCKS
 	int "size in blocks (leave at 0 for auto calculation)"
 	default 0
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index ffb7257586..d74f31e28a 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -20,7 +20,8 @@ endif
 
 ROOTFS_EXT2_DEPENDENCIES = host-genext2fs host-e2fsprogs
 
-EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
+EXT2_ENV  = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
+EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
 
 define ROOTFS_EXT2_CMD
 	PATH=$(TARGET_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
diff --git a/fs/ext2/genext2fs.sh b/fs/ext2/genext2fs.sh
index c2049f56c3..76f454c3cc 100755
--- a/fs/ext2/genext2fs.sh
+++ b/fs/ext2/genext2fs.sh
@@ -78,15 +78,21 @@ e2tunefsck() {
 }
 
 # Check we know what generation to generate
-case "${GEN}" in
-    2|3|4)
+case "${GEN}:${REV}" in
+    2:0|2:1|3:1|4:1)
 	;;
     *)
-	printf "%s: unknown ext generation to generate\n" "${0##*/}" >&2
+	printf "%s: unknown ext generation '%s' and/or revision '%s'\n" \
+	       "${0##*/}" "${GEN}" "${REV}" >&2
 	exit 1
 	;;
 esac
 
+# Upgrade to rev1 if needed
+if [ ${REV} -ge 1 ]; then
+    EXT_OPTS_O="${EXT_OPTS_O},filetype"
+fi
+
 # Add a journal for ext3 and above
 if [ ${GEN} -ge 3 ]; then
     EXT_OPTS="${EXT_OPTS} -j -J size=1"

From a2a266e0cfb94fe623879e9ac43a3894acf05b62 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 11 Apr 2013 12:17:54 +0000
Subject: [PATCH 4773/6849] fs/ext2: remove count- and time-based fsck

Set the count- and time-based checks intervals to 0, thus effectively
disabling automatic checks at boot (after a suggestion by Arnout).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/genext2fs.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/ext2/genext2fs.sh b/fs/ext2/genext2fs.sh
index 76f454c3cc..a4eb35162c 100755
--- a/fs/ext2/genext2fs.sh
+++ b/fs/ext2/genext2fs.sh
@@ -73,8 +73,11 @@ e2tunefsck() {
            "${IMG##*/}" "${GEN}"
 
     # e2fsck will force a *random* UUID, which is bad
-    # for reproducibility, so we do not want it
-    tune2fs -U clear "${IMG}"
+    # for reproducibility, so we do not want it.
+    # Remove count- and time-based checks, they are not welcome
+    # on embedded devices, where they can cause serious boot-time
+    # issues by tremendously slowing down the boot.
+    tune2fs -U clear -c 0 -i 0 "${IMG}"
 }
 
 # Check we know what generation to generate

From 0fab0a4afdff2f27fce49e7b38179e781e7b64ed Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 12 Apr 2013 14:57:36 +0200
Subject: [PATCH 4774/6849] fs/ext2: bump journal overhead to 1300 blocks

A quick test with a ~3.5MB ext4 filesystem shows that 1081 blocks isn't
enough:

tune2fs 1.42.7 (21-Jan-2013)

Please run e2fsck on the filesystem.

Creating journal inode:
Journal size too big for filesystem.

So bump it a bit. Overestimating the journal size is probably not really
a big deal for the kind of systems using ext3/4 anyway.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/genext2fs.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/ext2/genext2fs.sh b/fs/ext2/genext2fs.sh
index a4eb35162c..f7f8d33ec4 100755
--- a/fs/ext2/genext2fs.sh
+++ b/fs/ext2/genext2fs.sh
@@ -34,14 +34,11 @@ then
     # we scale inodes / blocks with 10% to compensate for bitmaps size + slack
     BLOCKS=$(du -s -c -k $TARGET_DIR | grep total | sed -e "s/total//")
     BLOCKS=$(expr 500 + \( $BLOCKS + $INODES / 8 \) \* 11 / 10)
-    # we add 1081 blocks (a bit more than 1 MiB, assuming 1KiB blocks) for
+    # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks) for
     # the journal if ext3/4
-    # Note: I came to 1081 blocks after trial-and-error checks. With 1080 or
-    # less additional blocks, and tune2fs would refuse to add the journal;
-    # with 1081 additional blocks or above, tune2fs wil happily add a journal.
-    # YMMV.
+    # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
     if [ ${GEN} -ge 3 ]; then
-        BLOCKS=$(expr 1081 + $BLOCKS )
+        BLOCKS=$(expr 1300 + $BLOCKS )
     fi
     set -- $@ -b $BLOCKS
 fi

From 7219dfa275abaf332cb3828be381436147f41f04 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 12 Apr 2013 15:02:18 +0200
Subject: [PATCH 4775/6849] nitrogen6x: get rid of ext2 rev 1 notice now we can
 create it directly instead

And update the defconfig to do so.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/boundarydevices/nitrogen6x/readme.txt | 7 -------
 configs/nitrogen6x_defconfig                | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/board/boundarydevices/nitrogen6x/readme.txt b/board/boundarydevices/nitrogen6x/readme.txt
index 6e9b95c0ea..a9ded4929c 100644
--- a/board/boundarydevices/nitrogen6x/readme.txt
+++ b/board/boundarydevices/nitrogen6x/readme.txt
@@ -2,13 +2,6 @@ Buildroot for Boundary Devices Nitrogen6X:
 
 http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
 
-Notice: U-Boot as shipped on the board has a bug reading rev 0 ext2
-file systems (which is what genext2fs generates). To convert it to rev
-1, do:
-
-tune2fs -O filetype output/images/rootfs.ext2
-e2fsck -a output/images/rootfs.ext2
-
 To install, simply extract rootfs.ext2 to first partition of a uSD card:
 
 sudo dd if=output/images/rootfs.ext2 of=/dev/sdX1
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 9b4d473525..cdd800001a 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -9,6 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/nitrogen6x/post-build.sh"
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_2r1=y
 
 # bootloader
 BR2_TARGET_UBOOT=y

From 4d73496230e7de109aa362f4eb1b2d8b45741908 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 11:22:37 +0000
Subject: [PATCH 4776/6849] kernel-headers: bump 3.{0, 2, 4, 8}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.72-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.73-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 0cfaab6d7c..6155ef1350 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,14 +63,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.72"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.73"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.42"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.43"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.39"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.40"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.6"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.7"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.72-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.73-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.72-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.73-headers_install-fix-__packed-in-exported-kernel-head.patch

From f393f7880416bac7bcf6f7c53c7b46cdc510378a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Apr 2013 11:22:38 +0000
Subject: [PATCH 4777/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 8d301a19b2..659ca6cda1 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.6"
+	bool "3.8.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.6" if BR2_LINUX_KERNEL_3_8
+	default "3.8.7" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 2f452bf11c5912ec29c208c44162e3255bcd56d7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 13 Apr 2013 09:40:01 +0200
Subject: [PATCH 4778/6849] toolchain/gcc: bump 4.6.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.6.3 => 4.6.4}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.6.3 => 4.6.4}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.6.3 => 4.6.4}/302-c99-snprintf.patch           | 0
 .../gcc/{4.6.3 => 4.6.4}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.6.3 => 4.6.4}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.6.3 => 4.6.4}/820-arm-unbreak-armv4t.patch     | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/820-arm-unbreak-armv4t.patch (100%)
 rename toolchain/gcc/{4.6.3 => 4.6.4}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.6.3/100-uclibc-conf.patch b/toolchain/gcc/4.6.4/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.6.3/100-uclibc-conf.patch
rename to toolchain/gcc/4.6.4/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.6.3/301-missing-execinfo_h.patch b/toolchain/gcc/4.6.4/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.6.3/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.6.4/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.6.3/302-c99-snprintf.patch b/toolchain/gcc/4.6.4/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.6.3/302-c99-snprintf.patch
rename to toolchain/gcc/4.6.4/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.6.4/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.6.4/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.6.4/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.6.4/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.6.4/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch
rename to toolchain/gcc/4.6.4/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5dd37ce18f..d7e8715bd5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -75,7 +75,7 @@ config BR2_GCC_VERSION
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
-	default "4.6.3"     if BR2_GCC_VERSION_4_6_X
+	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
 	default "4.8.0"     if BR2_GCC_VERSION_4_8_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP

From 5dbb4038153730810e28855ad8c8cb115e421454 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 13 Apr 2013 06:37:07 +0000
Subject: [PATCH 4779/6849] toolchain-external: fix Linaro ARM URL

Commit 79828fc01d92cee84f8703d25f72121f52880ee9 (toolchain-external:
update ARM Linaro toolchains) accidently broke the URL for the Linaro
2013.01 toolchain by replacing a .bz2 extension by .bz. This patch
fixes this problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 5c5935c21d..7a7844dba0 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -194,7 +194,7 @@ TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2013.01/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.02/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.02-01-20130221_linux.tar.xz

From eb29c831179791ef79164d2108fca4d34a603915 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 13 Apr 2013 04:09:10 +0000
Subject: [PATCH 4780/6849] gdb: properly set the gdb site in all cases

Until now, the gdb site for AVR32 was adjusted only when GDB_VERSION
was not set, i.e only when the cross-gdb is *not* built. We should in
fact also set the site when the cross-gdb is built, so when
GDB_VERSION is defined through package/gdb/Config.in.host.

So, instead, we now have something like:

ifeq ($(GDB_VERSION),)
 # we define here a default version that is used when the cross-gdb is
 # not built and only the target gdb is selected.
endif

ifeq ($(GDB_VERSION),something-special)
GDB_SITE = some-special-site-for-some-special-gdb-version
endif

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdb/gdb.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 73ff7a465a..398ef7bbe8 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -16,12 +16,15 @@ ifeq ($(BR2_bfin),y)
 GDB_VERSION = 6.6a
 else ifeq ($(BR2_avr32),y)
 GDB_VERSION = 6.7.1-avr32-2.1.5
-GDB_SITE    = ftp://www.at91.com/pub/buildroot/
 else
 GDB_VERSION = 7.5.1
 endif
 endif
 
+ifeq ($(GDB_VERSION),6.7.1-avr32-2.1.5)
+GDB_SITE = ftp://www.at91.com/pub/buildroot/
+endif
+
 GDB_SOURCE = gdb-$(GDB_VERSION).tar.bz2
 GDB_LICENSE = GPLv2+ LGPLv2+ GPLv3+ LGPLv3+
 GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB

From 0e49733b306b353aad3a29a2c7a6faf25841ef0b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 13 Apr 2013 04:09:11 +0000
Subject: [PATCH 4781/6849] gdb: disable on AArch64

The mainline gdb does not yet have AArch64 support at all, so let's
disable it for this platform. The external toolchain provided by
Linaro has gdbserver + cross-gdb, so it already provides what's
necessary to do some debugging.

Fixes
http://autobuild.buildroot.org/results/c330eb75bd2d3e2f002e7a362dd5b08c4fc7fafc/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdb/Config.in      | 3 ++-
 package/gdb/Config.in.host | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 38f4564ebe..631fdd78ae 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -9,6 +9,7 @@ config BR2_PACKAGE_GDB
 	select BR2_PACKAGE_GDB_SERVER if \
 	       (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
 	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	depends on !BR2_aarch64
 	help
 	  GDB, the GNU Project debugger, allows you to see what is
 	  going on `inside' another program while it executes -- or
@@ -38,7 +39,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
 	bool "full debugger"
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
-	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin && !BR2_aarch64
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
 
 comment "full gdb on target needs WCHAR support in toolchain"
 	depends on !BR2_USE_WCHAR
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index 1e092635aa..a791f09e50 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -4,6 +4,7 @@ config BR2_PACKAGE_HOST_GDB
 	# allow to build a cross-gdb, as the one of the external
 	# toolchain should be used.
 	depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
+	depends on !BR2_aarch64
 	help
 	  Build a cross gdb that runs on the host machine and debugs
 	  programs running on the target. It requires 'gdbserver'

From 3cab8aaeb77128a9c93815e3db9953f5153e8ea8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 14 Apr 2013 19:31:30 +0200
Subject: [PATCH 4782/6849] linux: don't use $ in dtb comment as the shell
 tries to expand them

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 8a73767df9..2fff2e9ce7 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -197,14 +197,14 @@ define LINUX_BUILD_DTB
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTBS)
 endef
 define LINUX_INSTALL_DTB
-	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	# dtbs moved from arch/<ARCH>/boot to arch/<ARCH>/boot/dts since 3.8-rc1
 	cp $(addprefix \
 		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
 		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
 		$(BINARIES_DIR)/
 endef
 define LINUX_INSTALL_DTB_TARGET
-	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	# dtbs moved from arch/<ARCH>/boot to arch/<ARCH>/boot/dts since 3.8-rc1
 	cp $(addprefix \
 		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
 		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \

From dc78b5fc6254b674d7d89c27811ba10ae8304e96 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Apr 2013 14:23:38 +0000
Subject: [PATCH 4783/6849] radvd: bump to version 1.9.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 95bfe0799f..9d1d683099 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RADVD_VERSION = 1.9.2
+RADVD_VERSION = 1.9.3
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = host-bison flex libdaemon host-flex host-pkgconf
 RADVD_AUTORECONF = YES

From 9d3e3cbd46ee5d957e6d5ecf114a257cfbbafd0b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Apr 2013 14:23:39 +0000
Subject: [PATCH 4784/6849] openssh: bump to version 6.2p1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 03ea73d73c..3c299713f8 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSH_VERSION = 6.1p1
+OPENSSH_VERSION = 6.2p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \

From eecdea2aeaccdc028cf88e1575eefccfa0cb8c85 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Apr 2013 14:23:40 +0000
Subject: [PATCH 4785/6849] netperf: bump to version 2.6.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netperf/netperf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index 4af5e85a60..06758b9a36 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETPERF_VERSION = 2.5.0
+NETPERF_VERSION = 2.6.0
 NETPERF_SITE = ftp://ftp.netperf.org/netperf
 NETPERF_CONF_ENV = ac_cv_func_setpgrp_void=set
 

From 586ddf1a9383c3deda90920adeaed5d63183ff38 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Apr 2013 14:23:41 +0000
Subject: [PATCH 4786/6849] nbd: bump to version 3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/Config.in | 2 --
 package/nbd/nbd.mk    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index 6e92f935d4..79b34deb2a 100644
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -6,8 +6,6 @@ config BR2_PACKAGE_NBD
 	  NBD is a set of utilities to configure network block devices,
 	  allowing access to remote block devices over TCP/IP network.
 
-	  Depends on glib.
-
 	  http://nbd.sf.net/
 
 comment "nbd requires a toolchain with WCHAR support"
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 7733d7b4b1..8a129f32ad 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NBD_VERSION = 3.2
+NBD_VERSION = 3.3
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
 NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)

From cbf8cfdbb22eb1490ddf78415541e9e710ef44ba Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 14 Apr 2013 20:40:53 +0200
Subject: [PATCH 4787/6849] radvd: drop autoreconf

We're no longer patching Makefile.am since the 1.9.2 bump, so we don't
need to autoreconf anymore.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/radvd/radvd.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 9d1d683099..6c39fe2751 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -7,7 +7,6 @@
 RADVD_VERSION = 1.9.3
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = host-bison flex libdaemon host-flex host-pkgconf
-RADVD_AUTORECONF = YES
 
 define RADVD_INSTALL_INITSCRIPT
 	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d

From bb61cdfeddec379fa0c7f0ad42165e021e9b7699 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Thu, 28 Mar 2013 22:50:08 +0000
Subject: [PATCH 4788/6849] Add Armadeus systems APF27 SOM basic support

Buildroot toolchain, UBIFS rootfs, Linux kernel (board is mainlined since 3.8).

Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/armadeus/apf27/linux-3.8.config | 229 ++++++++++++++++++++++++++
 configs/armadeus_apf27_defconfig      |  28 ++++
 2 files changed, 257 insertions(+)
 create mode 100644 board/armadeus/apf27/linux-3.8.config
 create mode 100644 configs/armadeus_apf27_defconfig

diff --git a/board/armadeus/apf27/linux-3.8.config b/board/armadeus/apf27/linux-3.8.config
new file mode 100644
index 0000000000..cff947b6d3
--- /dev/null
+++ b/board/armadeus/apf27/linux-3.8.config
@@ -0,0 +1,229 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_MXC=y
+CONFIG_MXC_IRQ_PRIOR=y
+CONFIG_MACH_IMX27_DT=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_FPE_NWFPE=y
+CONFIG_FPE_NWFPE_XP=y
+CONFIG_PM_DEBUG=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_MCP251X=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_UBI=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_SMSC_PHY=y
+CONFIG_RTL8187=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RTL8192CU=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=m
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_W1=y
+CONFIG_W1_MASTER_MXC=y
+CONFIG_W1_SLAVE_THERM=y
+CONFIG_WATCHDOG=y
+CONFIG_IMX2_WDT=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_PWC=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=m
+CONFIG_VIDEO_MX2=m
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_FB=y
+# CONFIG_FB_MX3 is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_DEBUG=y
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_HID=m
+CONFIG_USB_ULPI=y
+CONFIG_MMC=y
+CONFIG_MMC_MXC=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1374=y
+CONFIG_RTC_DRV_MXC=m
+CONFIG_DMADEVICES=y
+CONFIG_IMX_SDMA=y
+CONFIG_IMX_DMA=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=m
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig
new file mode 100644
index 0000000000..09d491c644
--- /dev/null
+++ b/configs/armadeus_apf27_defconfig
@@ -0,0 +1,28 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.8.4"
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="apf27"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# Filesystem
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
+BR2_TARGET_ROOTFS_UBI=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.4"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-3.8.config"
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27"

From e5434583badf1abf4a4620efa76452638ad9e177 Mon Sep 17 00:00:00 2001
From: Victor Hiairrassary <victor.hiairrassary.ml@gmail.com>
Date: Wed, 6 Feb 2013 06:27:16 +0000
Subject: [PATCH 4789/6849] boost: bump version to 1.53.0

and re-enable boost context library since its compilation with
uClibc is fixed. Disable new atomic library because it can not
compile with uClibc (fixed in upstream version).

Signed-off-by: Victor Hiairrassary <victor.hiairrassary.ml@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 3 +++
 package/boost/boost.mk  | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 19dcc6044b..e36e7d3955 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -21,6 +21,9 @@ if BR2_PACKAGE_BOOST
 config BR2_PACKAGE_BOOST_CHRONO
 	bool "boost-chrono"
 
+config BR2_PACKAGE_BOOST_CONTEXT
+	bool "boost-context"
+
 config BR2_PACKAGE_BOOST_DATE_TIME
 	bool "boost-date_time"
 
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index a2028484b4..68b63163a4 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BOOST_VERSION = 1.52.0
+BOOST_VERSION = 1.53.0
 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
 BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
@@ -15,9 +15,12 @@ TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 BOOST_DEPENDENCIES = bzip2 zlib
 
 BOOST_FLAGS =
-BOOST_WITHOUT_FLAGS = python context
+
+# atomic library compile only with upstream version, wait for next release
+BOOST_WITHOUT_FLAGS = python atomic
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,context)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)

From 381c4646c5078cb2f31437598e1e353fb1bdb587 Mon Sep 17 00:00:00 2001
From: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Date: Wed, 6 Feb 2013 01:28:59 +0000
Subject: [PATCH 4790/6849] package: add libwebsockets

[Peter: add missing zlib select to Config.in]
Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/libwebsockets/Config.in        |  9 +++++++++
 package/libwebsockets/libwebsockets.mk | 15 +++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/libwebsockets/Config.in
 create mode 100644 package/libwebsockets/libwebsockets.mk

diff --git a/package/Config.in b/package/Config.in
index 97ba790f94..322e005909 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -535,6 +535,7 @@ source "package/libtirpc/Config.in"
 source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
+source "package/libwebsockets/Config.in"
 source "package/nss-mdns/Config.in"
 source "package/openpgm/Config.in"
 source "package/ortp/Config.in"
diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in
new file mode 100644
index 0000000000..1d927bb4ea
--- /dev/null
+++ b/package/libwebsockets/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBWEBSOCKETS
+	bool "libwebsockets"
+	select BR2_PACKAGE_ZLIB
+	help
+	  Libwebsockets is a lightweight pure C library built to use
+	  minimal CPU and memory resources, and provide fast throughput
+	  in both directions.
+
+	  http://libwebsockets.org/
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
new file mode 100644
index 0000000000..a3d8936733
--- /dev/null
+++ b/package/libwebsockets/libwebsockets.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libwebsockets
+#
+################################################################################
+
+LIBWEBSOCKETS_VERSION = v1.1-chrome26-firefox18
+LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot
+LIBWEBSOCKETS_LICENSE = LGPLv2.1
+LIBWEBSOCKETS_LICENSE_FILES = COPYING
+LIBWEBSOCKETS_DEPENDENCIES = zlib
+LIBWEBSOCKETS_AUTORECONF = YES
+LIBWEBSOCKETS_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 19a537fef77fad50d946d8e87375c67f005471dd Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Date: Fri, 8 Feb 2013 02:09:37 +0000
Subject: [PATCH 4791/6849] Add Gnublin board support with fixed kernel header
 version

[Peter: misc white space fixup]
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/gnublin/README      | 48 +++++++++++++++++++++++++++++++++++++++
 configs/gnublin_defconfig | 27 ++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 board/gnublin/README
 create mode 100644 configs/gnublin_defconfig

diff --git a/board/gnublin/README b/board/gnublin/README
new file mode 100644
index 0000000000..8f6a9f01ea
--- /dev/null
+++ b/board/gnublin/README
@@ -0,0 +1,48 @@
+This the Buildroot support for the LPC3131 based Gnublin board (see here:
+http://en.gnublin.org/) and to the Elektor Linux board
+(http://www.elektor.com/news/elektor-presents-embedded-linux-made-easy.2147294.
+lynkx)
+
+Unfortunately currently the AD and the pwm modules are not supported, i'm about
+to add also those drivers as well to the current kernel later.
+
+Base kernel version: 3.7 (available here:
+https://gitorious.org/linux-3-7-gnublin/linux-3-7-gnublin/commits/gnublin-
+support)
+
+U-boot version: 2009.11 (available here:
+https://gitorious.org/u-boot-gnublin-support/u-boot-gnublin-support)
+
+
+Steps to create a bootable SD card (with the given config you need an at least
+500 MB SD card):
+
+1.Config buildroot with the gnublin_defconfig:
+
+$ make gnublin_defconfig
+
+2.Tweak the config for your needs:
+
+$ make menuconfig
+
+3.Build:
+
+$ make
+
+4.Create two partitions on your SD card, one with type of BootIt (fdisk ID: df),
+the size should be around 1M, and another partition with all of the left space
+on the card, and with the type of normal DOS partition.
+
+5.From the output/images directory dump the u-boot image to the BootIt partition
+(probably you have to modify the output /dev files according to your system):
+
+$ dd if=output/images/u-boot.bin of=/dev/sdc1
+
+6.Dump the root fs image as well:
+
+$ dd if=output/images/rootfs.ext2 of=/dev/sdc2
+
+7.Insert the SD card into the board's slot, and your board should boot up with
+your newly created system.
+
+Any feedback/report is welcome on the mr.zoltan.gyarmati[at]gmail.com
diff --git a/configs/gnublin_defconfig b/configs/gnublin_defconfig
new file mode 100644
index 0000000000..efafe06edb
--- /dev/null
+++ b/configs/gnublin_defconfig
@@ -0,0 +1,27 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# System
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.7"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Gnublin"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=475000
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="GNUBLIN"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://gitorious.org/u-boot-gnublin-support/u-boot-gnublin-support.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="2009.11_gnublin_support_v2"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://gitorious.org/linux-3-7-gnublin/linux-3-7-gnublin.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="v3.7-gnublin-2"
+BR2_LINUX_KERNEL_DEFCONFIG="gnublin"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 3776138c7b3ccc031afcb014a5bf1f2c542ba88f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Feb 2013 00:16:41 +0000
Subject: [PATCH 4792/6849] libfuse: not available for static builds

Unfortunately libfuse uses dl functions exclusively so it can't be used
for static builds so exclude it so.
Fixes:
http://autobuild.buildroot.net/results/a1c3d2b9c436023675c363d9d3b365c95ade0329/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/curlftpfs/Config.in | 5 +++--
 package/libfuse/Config.in   | 6 ++++--
 package/sshfs/Config.in     | 5 +++--
 package/unionfs/Config.in   | 5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index e946d0a73a..0d8e715a5e 100644
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -10,11 +10,12 @@ config BR2_PACKAGE_CURLFTPFS
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	depends on BR2_USE_MMU # libfuse
+	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
 	  CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE
 	  and libcurl.
 
 	  http://curlftpfs.sourceforge.net/
 
-comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR and threads support"
-	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/libfuse/Config.in b/package/libfuse/Config.in
index 5d308927f3..e42f9e0eef 100644
--- a/package/libfuse/Config.in
+++ b/package/libfuse/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBFUSE
 	bool "libfuse"
+	# Really doesn't like static, see fuse/lib/fuse.c
+	depends on !BR2_PREFER_STATIC_LIB
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
@@ -8,5 +10,5 @@ config BR2_PACKAGE_LIBFUSE
 
 	  http://fuse.sourceforge.net/
 
-comment "libfuse requires a toolchain with LARGEFILE and threads support"
-        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+comment "libfuse requires a toolchain with LARGEFILE, threads and dyanmic library support"
+        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 11b6bb9028..b6d5aa6d2f 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -9,10 +9,11 @@ config BR2_PACKAGE_SSHFS
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	depends on BR2_USE_MMU # libfuse
+	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
 	  FUSE filesystem client based on the SSH File Transfer Protocol.
 
 	  http://fuse.sourceforge.net/sshfs.html
 
-comment "sshfs requires a toolchain with LARGEFILE, WCHAR and threads support"
-	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+comment "sshfs requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in
index 2ac7be9c23..6ceee89e8e 100644
--- a/package/unionfs/Config.in
+++ b/package/unionfs/Config.in
@@ -4,10 +4,11 @@ config BR2_PACKAGE_UNIONFS
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	depends on BR2_USE_MMU # libfuse
+	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
 	  A userspace unionfs implementation.
 
 	  http://podgorny.cz/moin/UnionFsFuse
 
-comment "unionfs requires a toolchain with LARGEFILE and threads support"
-	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+comment "unionfs requires a toolchain with LARGEFILE, threads and dynamic library support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

From d9199fabd390d5a3858124b9b8f8b9ee1c71ef98 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Feb 2013 00:18:36 +0000
Subject: [PATCH 4793/6849] exfat: doesn't work on static builds because of
 libfuse

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/exfat/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/exfat/Config.in b/package/exfat/Config.in
index c7e7fdbf00..55be23e257 100644
--- a/package/exfat/Config.in
+++ b/package/exfat/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EXFAT
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	depends on BR2_USE_MMU # libfuse
 	depends on BR2_USE_WCHAR
+	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	select BR2_PACKAGE_LIBFUSE
 	help
 	  A full-featured exFAT file system implementation for GNU/Linux
@@ -11,5 +12,5 @@ config BR2_PACKAGE_EXFAT
 
 	  http://code.google.com/p/exfat/
 
-comment "exfat requires a toolchain with LARGEFILE, WCHAR and threads support"
-	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+comment "exfat requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB

From f5e3178197ff17b9f4a4c2ecb6d32b72a38a1246 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 12 Mar 2013 14:05:38 +0000
Subject: [PATCH 4794/6849] sysvinit: fix linking of sulogin with -lcrypt

The LCRYPT variable is no longer used; use SULOGINLIBS instead.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sysvinit/sysvinit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 10feb96dea..606c33ed31 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -24,7 +24,7 @@ SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES
 define SYSVINIT_BUILD_CMDS
 	# Force sysvinit to link against libcrypt as it otherwise
 	# use an incorrect test to see if it's available
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LCRYPT="-lcrypt" -C $(@D)/src
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) SULOGINLIBS="-lcrypt" -C $(@D)/src
 endef
 
 define SYSVINIT_INSTALL_TARGET_CMDS

From 2d1882ed5705d137e06d5420a10007ff1fcd4564 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 13 Apr 2013 07:53:55 +0000
Subject: [PATCH 4795/6849] ofono: bump to version 1.12

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ofono/ofono.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index e552eac3c7..5410c98caa 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -3,7 +3,7 @@
 # ofono
 #
 #############################################################
-OFONO_VERSION = 1.7
+OFONO_VERSION = 1.12
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_DEPENDENCIES = \
 	host-pkgconf \
@@ -14,6 +14,10 @@ OFONO_DEPENDENCIES = \
 
 OFONO_CONF_OPT = --disable-test
 
+# N.B. Qualcomm QMI modem support requires O_CLOEXEC; so
+# make sure that it is defined.
+OFONO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
 ifeq ($(BR2_PACKAGE_UDEV),y)
 	OFONO_CONF_OPT += --enable-udev
 	OFONO_DEPENDENCIES += udev

From 318f3db0dcc052aa770ca57c143b5f7bc40cdaf3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 13 Apr 2013 08:09:45 +0000
Subject: [PATCH 4796/6849] ne10: new package

The Ne10 project has been set up to provide a set of common, useful
functions which have been heavily optimized for the ARM Architecture
and provide consistent well tested behavior that can be easily
incorporated into applications. C interfaces to the functions are
provided for both assembler and NEON implementations.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/ne10/Config.in | 12 ++++++++++++
 package/ne10/ne10.mk   | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/ne10/Config.in
 create mode 100644 package/ne10/ne10.mk

diff --git a/package/Config.in b/package/Config.in
index 322e005909..4282185708 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -466,6 +466,7 @@ source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
 source "package/mtdev/Config.in"
+source "package/ne10/Config.in"
 source "package/neardal/Config.in"
 source "package/pcsc-lite/Config.in"
 source "package/urg/Config.in"
diff --git a/package/ne10/Config.in b/package/ne10/Config.in
new file mode 100644
index 0000000000..d0c4983ed5
--- /dev/null
+++ b/package/ne10/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_NE10
+	bool "ne10"
+	depends on BR2_arm && BR2_ARM_CPU_HAS_NEON
+	help
+	  The Ne10 project has been set up to provide a set of common,
+	  useful functions which have been heavily optimized for the
+	  ARM Architecture and provide consistent well tested behavior
+	  that can be easily incorporated into applications. C
+	  interfaces to the functions are provided for both assembler
+	  and NEON implementations.
+
+	  http://projectne10.github.io/Ne10/
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
new file mode 100644
index 0000000000..184f0f873e
--- /dev/null
+++ b/package/ne10/ne10.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# ne10
+#
+#############################################################
+
+# We use a Git commit ID because the last tagged version is more than
+# one year old.
+NE10_VERSION = 88c18f02199947b2c8b57796f5a3ca53160aff96
+NE10_SITE = git://github.com/projectNe10/Ne10.git
+NE10_LICENSE = BSD-3c or Apache 2.0
+NE10_LICENSE_FILES = doc/LICENSE
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+NE10_CONF_OPT = \
+	-DNE10_BUILD_SHARED=ON
+endif
+
+# The package does not have any install target, so have to provide
+# INSTALL_STAGING_CMDS and INSTALL_TARGET_CMDS.
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define NE10_INSTALL_STAGING_SHARED_LIB
+	cp -dpf $(@D)/modules/libNE10*.so* $(STAGING_DIR)/usr/lib/
+endef
+endif
+
+define NE10_INSTALL_STAGING_CMDS
+	cp -dpf $(@D)/inc/NE10*h $(STAGING_DIR)/usr/include/
+	cp -dpf $(@D)/modules/libNE10.a $(STAGING_DIR)/usr/lib/
+	$(NE10_INSTALL_STAGING_SHARED_LIB)
+endef
+
+
+define NE10_INSTALL_TARGET_CMDS
+	cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/
+endef
+
+$(eval $(cmake-package))

From 23e5b60fdef5548fa7e5a4285ad22d08a32e8d3a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Apr 2013 04:41:35 +0000
Subject: [PATCH 4797/6849] protobuf-c: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/protobuf-c/Config.in     | 12 ++++++++++++
 package/protobuf-c/protobuf-c.mk | 16 ++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/protobuf-c/Config.in
 create mode 100644 package/protobuf-c/protobuf-c.mk

diff --git a/package/Config.in b/package/Config.in
index 4282185708..566d941bc9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -586,6 +586,7 @@ source "package/mtdev2tuio/Config.in"
 source "package/orc/Config.in"
 source "package/poco/Config.in"
 source "package/protobuf/Config.in"
+source "package/protobuf-c/Config.in"
 source "package/schifra/Config.in"
 source "package/startup-notification/Config.in"
 source "package/liblog4c-localtime/Config.in"
diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in
new file mode 100644
index 0000000000..9aff6e2895
--- /dev/null
+++ b/package/protobuf-c/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_PROTOBUF_C
+	bool "protobuf-c"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_PROTOBUF
+	help
+	  Code generator and runtime libraries to use Protocol Buffers
+	  from pure C (not C++).
+
+	  http://code.google.com/p/protobuf-c/
+
+comment "protobuf-c requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk
new file mode 100644
index 0000000000..eb0047af96
--- /dev/null
+++ b/package/protobuf-c/protobuf-c.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# protobuf-c
+#
+#############################################################
+
+PROTOBUF_C_VERSION = 0.15
+PROTOBUF_C_SITE = http://protobuf-c.googlecode.com/files
+PROTOBUF_C_DEPENDENCIES = protobuf host-protobuf-c
+HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf
+PROTOBUF_C_CONF_OPT = --disable-protoc
+PROTOBUF_C_INSTALL_STAGING = YES
+PROTOBUF_C_LICENSE = BSD-3c
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

From a000029dbf2b42e702fa17c441395bf122564773 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Apr 2013 04:41:36 +0000
Subject: [PATCH 4798/6849] collectd: bump to version 5.3.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in   | 33 +++++++++++++++++++++++++++++++--
 package/collectd/collectd.mk | 10 ++++++++--
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 74419f6e8e..a1d50a4928 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_COLLECTD
 	bool "collectd"
 	# Uses fork()
 	depends on BR2_USE_MMU
+	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  collectd is a daemon which collects system performance
@@ -42,12 +43,27 @@ endmenu
 
 menu "misc plugins"
 
+config BR2_PACKAGE_COLLECTD_AGGREGATION
+	bool "aggregation"
+	help
+	  The Aggregate plugin allows to aggregate multiple values into
+	  a single value using one or several consolidation functions,
+	  e.g. summation and average.
+
 config BR2_PACKAGE_COLLECTD_LOGFILE
 	bool "logfile"
 	default y
 	help
 	  Writes log messages to a file or STDOUT/STDERR.
 
+config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL
+	bool "notify_email"
+	select BR2_PACKAGE_LIBESMTP
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Send an E-mail with the notification message to the
+	  configured recipients.
+
 config BR2_PACKAGE_COLLECTD_SYSLOG
 	bool "syslog"
 	default y
@@ -282,6 +298,12 @@ config BR2_PACKAGE_COLLECTD_TAIL
 	  Tails log files and each line is given to one or more matches
 	  which test if the line is relevant for any statistics.
 
+config BR2_PACKAGE_COLLECTD_TAIL_CSV
+	bool "tail csv"
+	help
+	  Follows (tails) files in CSV format, parses each line and submits
+	  extracted values.
+
 config BR2_PACKAGE_COLLECTD_TCPCONNS
 	bool "tcpconns"
 	help
@@ -373,6 +395,13 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL
 comment "rrdtool support requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
 
+config BR2_PACKAGE_COLLECTD_RIEMANN
+	bool "riemann"
+	depends on BR2_INSTALL_LIBSTDCPP # protobuf
+	select BR2_PACKAGE_PROTOBUF_C
+	help
+	  Sends data to Riemann, a stream processing and monitoring system.
+
 config BR2_PACKAGE_COLLECTD_UNIXSOCK
 	bool "unixsock"
 	help
@@ -389,5 +418,5 @@ endmenu
 
 endif
 
-comment "collectd needs a toolchain with thread support"
-        depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "collectd needs a toolchain with IPv6 and thread support"
+        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 6022ab3e28..4dfa1d1b18 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-COLLECTD_VERSION = 5.1.3
+COLLECTD_VERSION = 5.3.0
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
@@ -16,7 +16,7 @@ COLLECTD_LICENSE_FILES = COPYING
 COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
 		gmond hddtemp ipmi ipvs java libvirt lpar madwifi mbmon \
 		memcachec modbus multimeter netapp netlink nginx \
-		notify_desktop notify_email numa nut onewire oracle perl \
+		notify_desktop notify_email numa nut onewire oracle perl pf \
 		pinba postgresql powerdns python redis routeros rrdcached \
 		sensors tape target_v5upgrade teamspeak2 ted tokyotyrant \
 		uuid varnish vserver write_mongodb write_redis xmms zfs_arc
@@ -24,6 +24,7 @@ COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
 COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	--localstatedir=/var --with-perl-bindings=no \
 	$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
+	$(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \
 	$(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \
 	$(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \
 	$(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \
@@ -59,6 +60,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \
 	$(if $(BR2_PACKAGE_COLLECTD_NFS),--enable-nfs,--disable-nfs) \
 	$(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \
+	$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \
 	$(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \
 	$(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \
 	$(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \
@@ -67,6 +69,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_PROTOCOLS),--enable-protocols,--disable-protocols) \
 	$(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \
 	$(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \
+	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
 	$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
@@ -76,6 +79,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \
 	$(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \
 	$(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \
+	$(if $(BR2_PACKAGE_COLLECTD_TAIL_CSV),--enable-tail_csv,--disable-tail_csv) \
 	$(if $(BR2_PACKAGE_COLLECTD_TCPCONNS),--enable-tcpconns,--disable-tcpconns) \
 	$(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \
 	$(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \
@@ -97,7 +101,9 @@ COLLECTD_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
 	$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
 	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql_client) \
+	$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \
 	$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
+	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)

From 0ffdc16e7dc1d286eeda3447e95381f5a309d492 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Apr 2013 08:55:53 +0200
Subject: [PATCH 4799/6849] linux: error out early if user forgot to specify
 dts name(s)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index 2fff2e9ce7..d375cf0328 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -58,6 +58,11 @@ else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
 KERNEL_DTS_NAME = $(basename $(notdir $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))
 endif
 
+ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
+$(error No kernel device tree source specified, check your \
+BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
+endif
+
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
 ifneq ($(words $(KERNEL_DTS_NAME)),1)
 $(error Kernel with appended device tree needs exactly one DTS source.\

From ced147780401a3791a399dbf1d2f466572ad4ccf Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 20:29:10 +0000
Subject: [PATCH 4800/6849] ofono: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ofono/ofono.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 5410c98caa..9b1181af4a 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -3,8 +3,11 @@
 # ofono
 #
 #############################################################
+
 OFONO_VERSION = 1.12
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
+OFONO_LICENSE = GPLv2
+OFONO_LICENSE_FILES = COPYING
 OFONO_DEPENDENCIES = \
 	host-pkgconf \
 	dbus \

From c24e66a3ee4d8933d21fe0e6207a6a9aec12ba81 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Sun, 14 Apr 2013 20:33:48 +0000
Subject: [PATCH 4801/6849] ne10: Use http instead of git method for package
 fetching.

Rework package fetching according official documentation:
http://buildroot.uclibc.org/downloads/manual/manual.html#github-download-url

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ne10/ne10.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index 184f0f873e..64cd1a936c 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -6,8 +6,8 @@
 
 # We use a Git commit ID because the last tagged version is more than
 # one year old.
-NE10_VERSION = 88c18f02199947b2c8b57796f5a3ca53160aff96
-NE10_SITE = git://github.com/projectNe10/Ne10.git
+NE10_VERSION = 88c18f0
+NE10_SITE = http://github.com/projectNe10/Ne10/tarball/master
 NE10_LICENSE = BSD-3c or Apache 2.0
 NE10_LICENSE_FILES = doc/LICENSE
 

From 1cbffbd015106ea90fe49e27433375769dc1035b Mon Sep 17 00:00:00 2001
From: "Shawn J. Goff" <shawn7400@gmail.com>
Date: Fri, 12 Apr 2013 09:40:30 +0000
Subject: [PATCH 4802/6849] eliminate double slashes caused by FOO_SITE ending
 in a slash

When a FOO_SITE variable ends in a slash and gets joined with a
FOO_SOURCE variable like $(FOO_SITE)/$(FOO_SOURCE), the resulting URI
has a double slash. While double-slashes are fine in unix paths, they
are reserved in URIs - the part following '//' must be an authority.

Signed-off-by: Shawn J. Goff <shawn7400@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perl/perl.mk                       | 2 +-
 package/pkg-generic.mk                     | 4 ++--
 toolchain/gcc/gcc-uclibc-4.x.mk            | 4 ++--
 toolchain/kernel-headers/kernel-headers.mk | 6 +++---
 toolchain/toolchain-external/ext-tool.mk   | 4 ++--
 toolchain/uClibc/uclibc.mk                 | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 66f7daac9d..42512f8d05 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -25,7 +25,7 @@ PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
 # together with perl
 
 define PERL_CROSS_DOWNLOAD
-	$(call DOWNLOAD,$(PERL_CROSS_SITE)/$(PERL_CROSS_SOURCE))
+	$(call DOWNLOAD,$(PERL_CROSS_SITE:/=)/$(PERL_CROSS_SOURCE))
 endef
 PERL_POST_DOWNLOAD_HOOKS += PERL_CROSS_DOWNLOAD
 
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 901bcf7bae..e6bc95599b 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -39,8 +39,8 @@ ifeq ($(DL_MODE),DOWNLOAD)
 		done ; \
 	fi
 endif
-	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_SOURCE)))
-	$(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE)/$(p))$(sep))
+	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))
+	$(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))$(sep))
 	$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
 ifeq ($(DL_MODE),DOWNLOAD)
 	$(Q)mkdir -p $(@D)
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 9d131d5577..fc11ad45be 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -30,7 +30,7 @@ ifneq ($(GCC_SNAP_DATE),)
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
  GCC_SITE:=ftp://www.at91.com/pub/buildroot/
 else
- GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
+ GCC_SITE:=$(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
 endif
 
 GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
@@ -212,7 +212,7 @@ endif
 $(DL_DIR)/$(GCC_SOURCE):
 	mkdir -p $(DL_DIR)
 	$(Q)$(call MESSAGE,"Downloading gcc")
-	$(call DOWNLOAD,$(GCC_SITE)/$(GCC_SOURCE))
+	$(call DOWNLOAD,$(GCC_SITE:/=)/$(GCC_SOURCE))
 
 gcc-unpacked: $(GCC_DIR)/.patched
 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index 7ce6264935..adf7bc45fd 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -27,9 +27,9 @@ EXTRAVERSION:=$(if $(EXTRAVERSION),.$(EXTRAVERSION),)
 
 LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL)$(SUBLEVEL)$(EXTRAVERSION)
 ifeq ($(findstring x2.6.,x$(DEFAULT_KERNEL_HEADERS)),x2.6.)
-LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v2.6/
 else
-LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
+LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v3.x/
 endif
 LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
 LINUX_HEADERS_CAT:=$(BZCAT)
@@ -71,7 +71,7 @@ ifeq ($(BR2_KERNEL_HEADERS_SNAP),y)
 	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)
 endif
 	$(Q)$(call MESSAGE,"Downloading kernel headers")
-	$(call DOWNLOAD,$(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE))
+	$(call DOWNLOAD,$(LINUX_HEADERS_SITE:/=)/$(LINUX_HEADERS_SOURCE))
 
 kernel-headers: $(LINUX_HEADERS_DIR)/.configured
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 7a7844dba0..616f4535be 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -299,10 +299,10 @@ endif
 # components than usual.
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
 	mkdir -p $(@D)
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 113dc79e58..2249651b74 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -63,7 +63,7 @@ endif
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
 	$(Q)$(call MESSAGE,"Downloading uClibc")
-	$(call DOWNLOAD,$(UCLIBC_SITE)/$(UCLIBC_SOURCE))
+	$(call DOWNLOAD,$(UCLIBC_SITE:/=)/$(UCLIBC_SOURCE))
 
 uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)

From e35c700ca0395146d69605a219a8d1f2b19aaedc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 15 Apr 2013 23:39:41 +0200
Subject: [PATCH 4803/6849] package: add fan-ctrl

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/fan-ctrl/Config.in   | 10 ++++++++++
 package/fan-ctrl/fan-ctrl.mk | 30 ++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/fan-ctrl/Config.in
 create mode 100644 package/fan-ctrl/fan-ctrl.mk

diff --git a/package/Config.in b/package/Config.in
index 566d941bc9..f28ceddcf5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -230,6 +230,7 @@ source "package/dvb-apps/Config.in"
 source "package/dvbsnoop/Config.in"
 source "package/eeprog/Config.in"
 source "package/evtest/Config.in"
+source "package/fan-ctrl/Config.in"
 source "package/flashrom/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
diff --git a/package/fan-ctrl/Config.in b/package/fan-ctrl/Config.in
new file mode 100644
index 0000000000..392904c9f9
--- /dev/null
+++ b/package/fan-ctrl/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_FAN_CTRL
+	bool "fan-ctrl"
+	help
+	  Fan-ctrl is a little daemon that controls the speed of one
+	  or more system or CPU fans. It does so by monitoring
+	  temperature inputs and selecting a fan speed from an array
+	  of available speeds based on a set of temperature
+	  thresholds.
+
+	  http://fan-ctrl.sourceforge.net/
diff --git a/package/fan-ctrl/fan-ctrl.mk b/package/fan-ctrl/fan-ctrl.mk
new file mode 100644
index 0000000000..b7bfa795f2
--- /dev/null
+++ b/package/fan-ctrl/fan-ctrl.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# fan-ctrl
+#
+#############################################################
+
+# no release, so grab .c file directly from viewvc
+FAN_CTRL_VERSION = 1.3
+FAN_CTRL_SOURCE = fan-ctrl.c?revision=$(FAN_CTRL_VERSION)
+FAN_CTRL_SITE = http://fan-ctrl.cvs.sourceforge.net/viewvc/fan-ctrl/fan-ctrl/
+FAN_CTRL_LICENSE = GPLv2+
+
+define FAN_CTRL_EXTRACT_CMDS
+	cp $(DL_DIR)/$(FAN_CTRL_SOURCE) $(@D)/fan-ctrl.c
+endef
+
+define FAN_CTRL_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		$(@D)/fan-ctrl.c -o $(@D)/fan-ctrl
+endef
+
+define FAN_CTRL_INSTALL_TARGET_CMDS
+	install -D -m 755 $(@D)/fan-ctrl $(TARGET_DIR)/usr/sbin/fan-ctrl
+endef
+
+define FAN_CTRL_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/fan-ctrl
+endef
+
+$(eval $(generic-package))

From 922b1560abd317a899b85720aee81d9b858345e3 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Sun, 14 Apr 2013 23:10:31 +0000
Subject: [PATCH 4804/6849] boost: fix build of context library

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 68b63163a4..d11f378c14 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -20,7 +20,7 @@ BOOST_FLAGS =
 BOOST_WITHOUT_FLAGS = python atomic
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,context)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)

From 357203d5044f4bc2ef5872bf13e21324f1b7e3d1 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 21:57:11 +0000
Subject: [PATCH 4805/6849] libconfig: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfig/libconfig.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 3e7aa117f1..b826c06931 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -3,8 +3,11 @@
 # libconfig
 #
 #############################################################
+
 LIBCONFIG_VERSION = 1.4.8
 LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig/
+LIBCONFIG_LICENSE = LGPLv2.1+
+LIBCONFIG_LICENSE_FILES = COPYING.LIB
 LIBCONFIG_INSTALL_STAGING = YES
 LIBCONFIG_CONF_OPT = --disable-examples
 

From bc9acefae9d0a02e2c18da2bf31856bd07c9d7d6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 02:50:47 +0000
Subject: [PATCH 4806/6849] netperf: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netperf/netperf.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index 06758b9a36..653dc7a8c0 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -7,6 +7,8 @@
 NETPERF_VERSION = 2.6.0
 NETPERF_SITE = ftp://ftp.netperf.org/netperf
 NETPERF_CONF_ENV = ac_cv_func_setpgrp_void=set
+NETPERF_LICENSE = netperf license
+NETPERF_LICENSE_FILES = COPYING
 
 define NETPERF_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/src/netperf \

From e59a641701196db47e74ee31d0a1c4e675fa1303 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 02:42:10 +0000
Subject: [PATCH 4807/6849] nbd: add license information

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nbd/nbd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 8a129f32ad..708e567438 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -9,6 +9,7 @@ NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
 NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
 NBD_DEPENDENCIES = libglib2
+NBD_LICENSE = GPLv2
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
 # We have linux/falloc.h

From 0db6298cef45ced4bb5d40b027219b9b9dd28464 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 15 Apr 2013 03:11:19 +0000
Subject: [PATCH 4808/6849] qt5: factor <pkg>_SITE variable

Each qt5 package was defining its own QT5<something>_SITE
variable. Unfortunately, the download location has slightly changed
for Qt 5.0.2, so we would have to change it for all packages. Instead,
we factor the <pkg>_SITE variable as QT5_SITE in package/qt5/qt5.mk,
just like we already do for QT5_VERSION.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5.mk                                     | 1 +
 package/qt5/qt5base/qt5base.mk                         | 2 +-
 package/qt5/qt5declarative/qt5declarative.mk           | 2 +-
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +-
 package/qt5/qt5imageformats/qt5imageformats.mk         | 2 +-
 package/qt5/qt5jsbackend/qt5jsbackend.mk               | 2 +-
 package/qt5/qt5multimedia/qt5multimedia.mk             | 2 +-
 package/qt5/qt5quick1/qt5quick1.mk                     | 2 +-
 package/qt5/qt5script/qt5script.mk                     | 2 +-
 package/qt5/qt5svg/qt5svg.mk                           | 2 +-
 package/qt5/qt5webkit/qt5webkit.mk                     | 2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           | 2 +-
 12 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 83cc0e1085..c6bbbe0d58 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,4 +1,5 @@
 QT5_VERSION = 5.0.1
+QT5_SITE = http://releases.qt-project.org/qt5/$(QT5_VERSION)/submodules_tar/
 include package/qt5/*/*.mk
 
 define QT5_LA_PRL_FILES_FIXUP
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 303d255c98..bfc6c911e8 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5BASE_VERSION = $(QT5_VERSION)
-QT5BASE_SITE = http://releases.qt-project.org/qt5/$(QT5BASE_VERSION)/submodules_tar/
+QT5BASE_SITE = $(QT5_SITE)
 QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz
 
 QT5BASE_DEPENDENCIES = host-pkgconf zlib pcre
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index de20017103..e4dd74283d 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5DECLARATIVE_VERSION = $(QT5_VERSION)
-QT5DECLARATIVE_SITE = http://releases.qt-project.org/qt5/$(QT5DECLARATIVE_VERSION)/submodules_tar/
+QT5DECLARATIVE_SITE = $(QT5_SITE)
 QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).tar.xz
 QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns qt5jsbackend
 QT5DECLARATIVE_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index c4b7231aea..93aef534cb 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION)
-QT5GRAPHICALEFFECTS_SITE = http://releases.qt-project.org/qt5/$(QT5GRAPHICALEFFECTS_VERSION)/submodules_tar/
+QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)
 QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz
 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
 QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 5130cfbb08..77dfa8fefb 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5IMAGEFORMATS_VERSION = $(QT5_VERSION)
-QT5IMAGEFORMATS_SITE = http://releases.qt-project.org/qt5/$(QT5IMAGEFORMATS_VERSION)/submodules_tar/
+QT5IMAGEFORMATS_SITE = $(QT5_SITE)
 QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION).tar.xz
 QT5IMAGEFORMATS_DEPENDENCIES = qt5base
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
index bc6a53af27..3c3c2c28c6 100644
--- a/package/qt5/qt5jsbackend/qt5jsbackend.mk
+++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5JSBACKEND_VERSION = $(QT5_VERSION)
-QT5JSBACKEND_SITE = http://releases.qt-project.org/qt5/$(QT5JSBACKEND_VERSION)/submodules_tar/
+QT5JSBACKEND_SITE = $(QT5_SITE)
 QT5JSBACKEND_SOURCE = qtjsbackend-opensource-src-$(QT5JSBACKEND_VERSION).tar.xz
 QT5JSBACKEND_DEPENDENCIES = qt5base
 QT5JSBACKEND_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 6725701ca3..b08a9ab7a3 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5MULTIMEDIA_VERSION = $(QT5_VERSION)
-QT5MULTIMEDIA_SITE = http://releases.qt-project.org/qt5/$(QT5MULTIMEDIA_VERSION)/submodules_tar/
+QT5MULTIMEDIA_SITE = $(QT5_SITE)
 QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz
 QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative
 QT5MULTIMEDIA_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 42b5895bef..371eb621f2 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5QUICK1_VERSION = $(QT5_VERSION)
-QT5QUICK1_SITE = http://releases.qt-project.org/qt5/$(QT5QUICK1_VERSION)/submodules_tar/
+QT5QUICK1_SITE = $(QT5_SITE)
 QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz
 QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend qt5webkit
 QT5QUICK1_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index ec3359fb4e..a090fda430 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5SCRIPT_VERSION = $(QT5_VERSION)
-QT5SCRIPT_SITE = http://releases.qt-project.org/qt5/$(QT5SCRIPT_VERSION)/submodules_tar/
+QT5SCRIPT_SITE = $(QT5_SITE)
 QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz
 QT5SCRIPT_DEPENDENCIES = qt5base
 QT5SCRIPT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 65fb04b748..fdcbfde30d 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5SVG_VERSION = $(QT5_VERSION)
-QT5SVG_SITE = http://releases.qt-project.org/qt5/$(QT5SVG_VERSION)/submodules_tar/
+QT5SVG_SITE = $(QT5_SITE)
 QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz
 QT5SVG_DEPENDENCIES = qt5base
 QT5SVG_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index d577cf8bf2..7366a30d2e 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5WEBKIT_VERSION = $(QT5_VERSION)
-QT5WEBKIT_SITE = http://releases.qt-project.org/qt5/$(QT5WEBKIT_VERSION)/submodules_tar/
+QT5WEBKIT_SITE = $(QT5_SITE)
 QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
 QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf
 QT5WEBKIT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 3bd6aac5d2..7e2d671ff3 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 QT5XMLPATTERNS_VERSION = $(QT5_VERSION)
-QT5XMLPATTERNS_SITE = http://releases.qt-project.org/qt5/$(QT5XMLPATTERNS_VERSION)/submodules_tar/
+QT5XMLPATTERNS_SITE = $(QT5_SITE)
 QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).tar.xz
 QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES

From d6b2bac22524e2b3b063660850b34de5c3e9edc0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 15 Apr 2013 03:11:20 +0000
Subject: [PATCH 4809/6849] qt5: bump to 5.0.2

A new version of Qt5 has been released, 5.0.2, so let's use it, see
http://blog.qt.digia.com/blog/2013/04/10/qt-5-0-2-released/: "Qt 5.0.2
brings over 600 improvements compared to Qt 5.0.1, most of these in
order to address the issues Qt users have noted when bringing their
applications to Qt 5.".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index c6bbbe0d58..c96cdf5c7f 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,5 +1,5 @@
-QT5_VERSION = 5.0.1
-QT5_SITE = http://releases.qt-project.org/qt5/$(QT5_VERSION)/submodules_tar/
+QT5_VERSION = 5.0.2
+QT5_SITE = http://releases.qt-project.org/qt5/$(QT5_VERSION)/submodules/
 include package/qt5/*/*.mk
 
 define QT5_LA_PRL_FILES_FIXUP

From 28a7f942ae5683e8eb0f18ed565723d5949fcb91 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 21:29:19 +0000
Subject: [PATCH 4810/6849] kmod: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index c0b223df7d..5c733b933d 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,6 +1,14 @@
+#############################################################
+#
+# kmod
+#
+#############################################################
+
 KMOD_VERSION = 13
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
+KMOD_LICENSE = GPLv2+ LGPLv2.1+
+KMOD_LICENSE_FILES = COPYING libkmod/COPYING
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
 

From 46ecd9117d0d74fd10c06ff322e87f25cf275d74 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 21:48:56 +0000
Subject: [PATCH 4811/6849] kbd: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kbd/kbd.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index 325978e6cc..08cb077603 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -1,6 +1,14 @@
+#############################################################
+#
+# kbd
+#
+#############################################################
+
 KBD_VERSION = 1.15.2
 KBD_SOURCE = kbd-$(KBD_VERSION).tar.gz
 KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
+KBD_LICENSE = GPLv2+
+KBD_LICENSE_FILES = COPYING
 
 KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 

From eed1d7f00cdd2b91b3ccdc1a8f911638d2147e4a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 21:54:15 +0000
Subject: [PATCH 4812/6849] madplay: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/madplay/madplay.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index e80726c1fd..d68c86b320 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -7,6 +7,8 @@
 MADPLAY_VERSION = 0.15.2b
 MADPLAY_SOURCE = madplay-$(MADPLAY_VERSION).tar.gz
 MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
+MADPLAY_LICENSE = GPLv2+
+MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
 MADPLAY_LIBTOOL_PATCH = NO
 MADPLAY_DEPENDENCIES = libmad libid3tag
 

From f8a82b28597f98dad5d5add037e167666fcf3bdf Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 21:51:40 +0000
Subject: [PATCH 4813/6849] libid3tag: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libid3tag/libid3tag.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index fc229764df..fff8d8bd37 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -7,6 +7,8 @@
 LIBID3TAG_VERSION = 0.15.1b
 LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
+LIBID3TAG_LICENSE = GPLv2+
+LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT
 LIBID3TAG_INSTALL_STAGING = YES
 LIBID3TAG_DEPENDENCIES = zlib
 LIBID3TAG_LIBTOOL_PATCH = NO

From af2522c07b95bd3fca1ac887ed45acf52d390297 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 17 Apr 2013 07:31:24 +0000
Subject: [PATCH 4814/6849] dropbear: bump to version 2013.57

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear-fix-no-zlib.patch   | 32 +++++++++++++++++++
 .../dropbear/dropbear-fix-vfork-logic.patch   | 21 ------------
 package/dropbear/dropbear.mk                  |  2 +-
 3 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 package/dropbear/dropbear-fix-no-zlib.patch
 delete mode 100644 package/dropbear/dropbear-fix-vfork-logic.patch

diff --git a/package/dropbear/dropbear-fix-no-zlib.patch b/package/dropbear/dropbear-fix-no-zlib.patch
new file mode 100644
index 0000000000..ecf3f09c89
--- /dev/null
+++ b/package/dropbear/dropbear-fix-no-zlib.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Matt Johnston <matt@ucc.asn.au>
+# Date 1366121792 -28800
+# Node ID f110d321fe7abb8864a1ab3268984f7cb02ac285
+# Parent  029e769c33c697f9255c40d6552f0aa81466eeed
+Fix build when zlib is disabled, from
+http://freetz.org/browser/trunk/make/dropbear/patches/350-no_zlib_fix.patch
+
+diff -r 029e769c33c6 -r f110d321fe7a common-kex.c
+--- a/common-kex.c	Mon Apr 15 22:11:11 2013 +0800
++++ b/common-kex.c	Tue Apr 16 22:16:32 2013 +0800
+@@ -171,14 +171,18 @@
+ 	}
+ 	if (ses.kexstate.recvnewkeys && ses.newkeys->recv.valid) {
+ 		TRACE(("switch_keys recv"))
++#ifndef DISABLE_ZLIB
+ 		gen_new_zstream_recv();
++#endif
+ 		ses.keys->recv = ses.newkeys->recv;
+ 		m_burn(&ses.newkeys->recv, sizeof(ses.newkeys->recv));
+ 		ses.newkeys->recv.valid = 0;
+ 	}
+ 	if (ses.kexstate.sentnewkeys && ses.newkeys->trans.valid) {
+ 		TRACE(("switch_keys trans"))
++#ifndef DISABLE_ZLIB
+ 		gen_new_zstream_trans();
++#endif
+ 		ses.keys->trans = ses.newkeys->trans;
+ 		m_burn(&ses.newkeys->trans, sizeof(ses.newkeys->trans));
+ 		ses.newkeys->trans.valid = 0;
+
diff --git a/package/dropbear/dropbear-fix-vfork-logic.patch b/package/dropbear/dropbear-fix-vfork-logic.patch
deleted file mode 100644
index 2706bc85cc..0000000000
--- a/package/dropbear/dropbear-fix-vfork-logic.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Matt Johnston <matt@ucc.asn.au>
-# Date 1364743743 -28800
-# Node ID fedfb8ede1fdebad5d19df7bd4d452c3264d9545
-# Parent  f27058078d61a8c3a057530d3ddcd19bd5062569
-Fix incorrect logic for USE_VFORK and calling arg_setup()
-
-diff -r f27058078d61 -r fedfb8ede1fd scp.c
---- a/scp.c	Sun Mar 31 23:15:35 2013 +0800
-+++ b/scp.c	Sun Mar 31 23:29:03 2013 +0800
-@@ -230,7 +230,7 @@
- 		close(pin[0]);
- 		close(pout[1]);
- 
--#ifdef USE_VFORK
-+#ifndef USE_VFORK
- 		arg_setup(host, remuser, cmd);
- #endif
- 
-
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index cec57dbeb5..0715555af3 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DROPBEAR_VERSION = 2013.56
+DROPBEAR_VERSION = 2013.57
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh

From 7a35e3693c8f10ed201da34aa028d0a3a1f193c5 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Tue, 16 Apr 2013 14:39:27 +0000
Subject: [PATCH 4815/6849] ntfs-3g: needs toolchain with threads support

Fixes:
http://autobuild.buildroot.org/results/ff10a72ac5836749155396e87f0cd32cd89f94c7

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index be19a579ea..10db8a3b17 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_NTFS_3G
 	bool "ntfs-3g"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
 	help
 	  The NTFS-3G driver is an open source, freely available
@@ -29,5 +30,5 @@ config BR2_PACKAGE_NTFS_3G_NTFSPROGS
 
 endif
 
-comment "ntfs-3g requires a toolchain with LARGEFILE and WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "ntfs-3g requires a toolchain with LARGEFILE, WCHAR and threads support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

From c295f0797ee5d4f1efa7a5833876638d1e9feab4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 14:39:42 +0000
Subject: [PATCH 4816/6849] netsnmp: enable agentx support by default

Enable agentx support by default, it's required for newer versions of
quagga.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index d5056f928b..d94abb7bda 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -17,7 +17,7 @@ config BR2_PACKAGE_NETSNMP_ENABLE_MIBS
 
 config BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES
 	string "Build with these MIB modules"
-	default "host ucd-snmp/dlmod"
+	default "host ucd-snmp/dlmod agentx"
 	depends on BR2_PACKAGE_NETSNMP
 	help
 	  Specify which MIB modules to include.

From 1f662e47f8628df105c372552c850d99c31bb07e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 14:47:56 +0000
Subject: [PATCH 4817/6849] ipset: bump to version 6.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 4628066ac5..50915ef497 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.17
+IPSET_VERSION = 6.18
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf

From 26e0ef1c23c658cedf78d17486e03efb62e007a9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 14:47:57 +0000
Subject: [PATCH 4818/6849] bison: bump to version 2.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bison/bison.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 31fc22c0fa..24c257629c 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-BISON_VERSION = 2.7
+BISON_VERSION = 2.7.1
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING

From bedb8a463e88ad1c115ae3a7a1542e6596211531 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 14:47:58 +0000
Subject: [PATCH 4819/6849] polarssl: bump to version 1.2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 4 ++--
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index f4f4746306..554eda60f4 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.6]
+[Gustavo: update for polarssl 1.2.7]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.6 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.7 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index c05a307696..7d7fe3eb8f 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.6
+POLARSSL_VERSION = 1.2.7
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From ea7b6d913e5d8970fa91f2aff24d549e11dc013c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 14:47:59 +0000
Subject: [PATCH 4820/6849] hiawatha: bump to version 9.1

Bump to version 9.1 which includes mitigations against BEAST and the RC4
vuln.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hiawatha/hiawatha.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 1cd700ac20..3348d534de 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,4 +1,4 @@
-HIAWATHA_VERSION = 9.0
+HIAWATHA_VERSION = 9.1
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
 HIAWATHA_LICENSE_FILES = LICENSE

From 79154f49f5c6fa15e5500df048ff829f25e6d3f7 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Sun, 14 Apr 2013 23:09:16 +0000
Subject: [PATCH 4821/6849] busybox: don't disable static option

Don't change the busybox STATIC option if buildroots PREFER_STATIC_LIB option
is not set. Not to prefer static linking doesn't imply prefer dynamic linking
for all packages.

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 900896f700..985203c6e6 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -106,10 +106,6 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y)
 define BUSYBOX_PREFER_STATIC
 	$(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG))
 endef
-else
-define BUSYBOX_PREFER_STATIC
-	$(call KCONFIG_DISABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG))
-endef
 endif
 
 # Disable usage of inetd if netkit-base package is selected

From 14dcb32ee45ccc8861365086d3d6c502458edae7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Apr 2013 14:39:43 +0000
Subject: [PATCH 4822/6849] quagga: bump to version 0.99.22.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/quagga.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index fb060ef1ba..42f8506b24 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QUAGGA_VERSION = 0.99.21
+QUAGGA_VERSION = 0.99.22.1
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk
 QUAGGA_LICENSE = GPLv2+
@@ -25,12 +25,9 @@ QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--di
 QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa)
 
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
+QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
 QUAGGA_CONF_OPT += --enable-snmp
 QUAGGA_DEPENDENCIES += netsnmp
-# SNMP support tries -lcrypto by default, disable it if we ain't got openssl
-ifneq ($(BR2_PACKAGE_OPENSSL),y)
-QUAGGA_CONF_OPT +=--without-crypto
-endif
 else
 QUAGGA_CONF_OPT +=--disable-snmp
 endif

From a3efaabced3c2839a6ed1c253397dc75c192bbb3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 17 Apr 2013 09:53:50 +0000
Subject: [PATCH 4823/6849] kernel-headers: bump 3.{0, 4, 8}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.73-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.74-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 6155ef1350..ec75c3450e 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,14 +63,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.73"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.74"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.43"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.40"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.41"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.7"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.8"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.73-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.74-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.73-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.74-headers_install-fix-__packed-in-exported-kernel-head.patch

From 7ab3c58a1d117ed2b48cf195a527f5c8ff08ca60 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 17 Apr 2013 09:53:51 +0000
Subject: [PATCH 4824/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 659ca6cda1..22f03ef1dd 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.7"
+	bool "3.8.8"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.7" if BR2_LINUX_KERNEL_3_8
+	default "3.8.8" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 7842789cb539b6b64d61b03f5c8dbe6813f01da7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Apr 2013 10:29:24 +0000
Subject: [PATCH 4825/6849] openssl: add host variant

Useful for the upcoming host-python-m2crypto package.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 7701d5159d..8486c448b6 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -46,6 +46,18 @@ ifeq ($(BR2_x86_i386),y)
 	OPENSSL_TARGET_ARCH = generic32 386
 endif
 
+define HOST_OPENSSL_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(HOST_CONFIGURE_OPTS) \
+		./config \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--libdir=/lib \
+		shared \
+		no-zlib \
+	)
+endef
+
 define OPENSSL_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_ARGS) \
@@ -69,6 +81,10 @@ define OPENSSL_CONFIGURE_CMDS
 	$(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile
 endef
 
+define HOST_OPENSSL_BUILD_CMDS
+	$(MAKE1) -C $(@D)
+endef
+
 define OPENSSL_BUILD_CMDS
 	$(MAKE1) -C $(@D)
 endef
@@ -77,6 +93,10 @@ define OPENSSL_INSTALL_STAGING_CMDS
 	$(MAKE1) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
 endef
 
+define HOST_OPENSSL_INSTALL_CMDS
+	$(MAKE1) -C $(@D) INSTALL_PREFIX=$(HOST_DIR) install
+endef
+
 define OPENSSL_INSTALL_TARGET_CMDS
 	$(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
 endef
@@ -124,3 +144,4 @@ define OPENSSL_UNINSTALL_CMDS
 endef
 
 $(eval $(generic-package))
+$(eval $(host-generic-package))

From 65dc5b7ad2fb690774fa30af0a39048dc9cab1f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Apr 2013 10:29:25 +0000
Subject: [PATCH 4826/6849] swig: new package

Add the swig package, host-variant only since toolchain on the target is
deprecated and this package wouldn't serve any purpose.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/swig/swig.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 package/swig/swig.mk

diff --git a/package/swig/swig.mk b/package/swig/swig.mk
new file mode 100644
index 0000000000..6aaf9698ff
--- /dev/null
+++ b/package/swig/swig.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# swig
+#
+#############################################################
+
+SWIG_VERSION = 2.0.9
+SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
+SWIG_DEPENDENCIES = host-bison
+HOST_SWIG_CONF_OPT = --without-pcre --disable-ccache
+SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c
+SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
+
+$(eval $(host-autotools-package))

From 978e7c74aa3b54bf2d90c5d94594f649da2f45c3 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Wed, 17 Apr 2013 21:20:14 +0000
Subject: [PATCH 4827/6849] libconfig: bump to 1.4.9

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libconfig/libconfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index b826c06931..6d0abbb1dd 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBCONFIG_VERSION = 1.4.8
+LIBCONFIG_VERSION = 1.4.9
 LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig/
 LIBCONFIG_LICENSE = LGPLv2.1+
 LIBCONFIG_LICENSE_FILES = COPYING.LIB

From 05554f1747bbc2b358819ced2b9d674be6d21db7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 18 Apr 2013 01:47:21 +0000
Subject: [PATCH 4828/6849] quagga: fix build breakage without snmp

Quagga no longer supports explicitly disabling snmp, and what's worse,
it interprets --disable-snmp as --enable-snmp.
Remove the disable configure option.
While at it add a comment about net-snmp requiring AgentX support for
quagga to build properly as suggested by Arnout.
Fixes:
http://autobuild.buildroot.net/results/a9bce6dd8065ddb1850a4e14f0e4eb257ee89286/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/Config.in | 3 +++
 package/quagga/quagga.mk | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 0834201d4d..c364ae1b4b 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -84,4 +84,7 @@ config BR2_PACKAGE_QUAGGA_SNMP
 	help
 	  Make quagga information available via SNMP SMUX.
 
+comment "AgentX support must be enabled in net-snmp or the build will break"
+	depends on BR2_PACKAGE_QUAGGA_SNMP
+
 endif
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 42f8506b24..347ec4ddb5 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -26,10 +26,8 @@ QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--d
 
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
 QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
-QUAGGA_CONF_OPT += --enable-snmp
+QUAGGA_CONF_OPT += --enable-snmp=agentx
 QUAGGA_DEPENDENCIES += netsnmp
-else
-QUAGGA_CONF_OPT +=--disable-snmp
 endif
 
 $(eval $(autotools-package))

From ecfee1073251147f3cbdcbaa531eb5e2b61f4824 Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Date: Mon, 8 Apr 2013 10:35:48 +0000
Subject: [PATCH 4829/6849] qjson: new package

[Peter: misc white space fixes]
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/qjson/Config.in                       |  7 +++++
 ...-fix-qt4-package-error-in-cmakelists.patch | 29 +++++++++++++++++++
 package/qjson/qjson.mk                        | 15 ++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 package/qjson/Config.in
 create mode 100644 package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch
 create mode 100644 package/qjson/qjson.mk

diff --git a/package/Config.in b/package/Config.in
index f28ceddcf5..54a9a2b33e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -144,6 +144,7 @@ if BR2_PACKAGE_QT
 comment "QT libraries and helper libraries"
 source "package/grantlee/Config.in"
 source "package/qextserialport/Config.in"
+source "package/qjson/Config.in"
 source "package/qtuio/Config.in"
 source "package/qwt/Config.in"
 endif
diff --git a/package/qjson/Config.in b/package/qjson/Config.in
new file mode 100644
index 0000000000..c15b12fdab
--- /dev/null
+++ b/package/qjson/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QJSON
+	bool "qjson"
+	help
+	  QJson is a Qt-based library that maps JSON data to
+	  QVariant objects and vice versa.
+
+	  http://qjson.sourceforge.net
diff --git a/package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch b/package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch
new file mode 100644
index 0000000000..058973e99a
--- /dev/null
+++ b/package/qjson/qjson-fix-qt4-package-error-in-cmakelists.patch
@@ -0,0 +1,29 @@
+From 529e50939316abc3c4190f89a482b17a4d4b3355 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Sat, 6 Apr 2013 16:54:25 +0200
+Subject: [PATCH] fix Qt4 package error in CMakeLists.txt
+
+Avoid checking for uic executable by cmake as it results configure
+time error if QtGui isn't installed.
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e65f1..447f209 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks"
+ SET(QT_USE_IMPORTED_TARGETS TRUE)
+ 
+ # Find Qt4
+-FIND_PACKAGE( Qt4 REQUIRED )
++find_package(Qt4 COMPONENTS QtCore REQUIRED )
+ 
+ IF (NOT WIN32)
+   SET( QT_DONT_USE_QTGUI TRUE )
+-- 
+1.7.10.4
+
diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk
new file mode 100644
index 0000000000..d203cd579e
--- /dev/null
+++ b/package/qjson/qjson.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# qjson
+#
+#############################################################
+
+QJSON_VERSION = 0.8.1
+
+QJSON_SITE = http://github.com/flavio/qjson/tarball/$(QJSON_VERSION)
+QJSON_INSTALL_STAGING = YES
+QJSON_DEPENDENCIES =  qt
+QJSON_LICENSE = LGPLv2.1
+QJSON_LICENSE_FILES = COPYING.lib
+
+$(eval $(cmake-package))

From 3d9ce2f563b78ccc40af80f7d20b7a260a8ab3fd Mon Sep 17 00:00:00 2001
From: Dimitrios Siganos <dimitris@siganos.org>
Date: Tue, 9 Apr 2013 03:22:19 +0000
Subject: [PATCH 4830/6849] wireless-regdb: new package

Signed-off-by: Dimitrios Siganos <dimitris@siganos.org>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/wireless-regdb/Config.in         | 10 ++++++++++
 package/wireless-regdb/wireless-regdb.mk | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/wireless-regdb/Config.in
 create mode 100644 package/wireless-regdb/wireless-regdb.mk

diff --git a/package/Config.in b/package/Config.in
index 54a9a2b33e..b9fe726450 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -765,6 +765,7 @@ source "package/vtun/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
+source "package/wireless-regdb/Config.in"
 source "package/wireless_tools/Config.in"
 source "package/wireshark/Config.in"
 source "package/wpa_supplicant/Config.in"
diff --git a/package/wireless-regdb/Config.in b/package/wireless-regdb/Config.in
new file mode 100644
index 0000000000..89a614713a
--- /dev/null
+++ b/package/wireless-regdb/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_WIRELESS_REGDB
+	bool "wireless-regdb"
+	help
+	  Wireless regulatory database.
+
+	  Wireless regulatory database for CRDA. The database lists the
+	  allowed radio frequencies for each local jurisdiction.
+
+	  http://linuxwireless.org/en/developers/Regulatory
+
diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
new file mode 100644
index 0000000000..b4e038c6b3
--- /dev/null
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# wireless-regdb
+#
+#############################################################
+
+WIRELESS_REGDB_VERSION = 2013.01.11
+WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.bz2
+WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
+WIRELESS_REGDB_LICENSE = ISC
+WIRELESS_REGDB_LICENSE_FILES = LICENSE
+
+define WIRELESS_REGDB_INSTALL_TARGET_CMDS
+    install -m 644 -D -T $(@D)/regulatory.bin $(TARGET_DIR)/usr/lib/crda/regulatory.bin
+    install -m 644 -D -T $(@D)/linville.key.pub.pem $(TARGET_DIR)/etc/wireless-regdb/pubkeys/linville.key.pub.pem
+endef
+
+$(eval $(generic-package))

From f39b706b087865112e351503ee51c60e5c2453f5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 16 Apr 2013 22:04:15 +0000
Subject: [PATCH 4831/6849] sam-ba: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sam-ba/sam-ba.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index 067bdf1836..dba653edf7 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -1,6 +1,14 @@
+#############################################################
+#
+# sam-ba
+#
+#############################################################
+
 SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents/
 SAM_BA_VERSION = 2.12
 SAM_BA_SOURCE  = sam-ba_$(SAM_BA_VERSION).zip
+SAM_BA_LICENSE = BSD-like (partly binary-only)
+SAM_BA_LICENSE_FILES = doc/readme.txt
 
 define HOST_SAM_BA_EXTRACT_CMDS
         unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)

From 4f3c8cf94bd610f60c6963cb6c1df041a1ebb7f3 Mon Sep 17 00:00:00 2001
From: "Shawn J. Goff" <shawn7400@gmail.com>
Date: Wed, 17 Apr 2013 11:31:27 +0000
Subject: [PATCH 4832/6849] libcurl: specify capath

Since openssl's path is '/etc/ssl/' (specified in our openssl package),
we should also make sure that's what curl is using.

Previously, it's hasn't been specified, which means it changes depending
on the host system where it's compiled.

Signed-off-by: Shawn J. Goff <shawn7400@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index a631953af0..f0236d97fa 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -27,7 +27,9 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
+	--with-random=/dev/urandom \
+	--with-ca-path=/etc/ssl/certs
 else
 LIBCURL_CONF_OPT += --without-ssl
 endif

From 39afa6d67228158a44291fbea72e687d1a6d020f Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 17 Apr 2013 12:10:35 +0000
Subject: [PATCH 4833/6849] dnsmasq: build with MAKE1

dnsmasq build breaks with parallel builds.
By the time final target needs to be linked, some object files are missing.

Fix it by using MAKE1 instead.

Fixes:
http://autobuild.buildroot.org/results/7a68e2f64105013c1040c01c0e55fb5d910ef8d8

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 285f06e964..8fb1fb1949 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -84,7 +84,7 @@ define DNSMASQ_BUILD_CMDS
 	$(DNSMASQ_ENABLE_DBUS)
 	$(DNSMASQ_ENABLE_LUA)
 	$(DNSMASQ_ENABLE_CONNTRACK)
-	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
+	$(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
 endef
 
 define DNSMASQ_INSTALL_TARGET_CMDS

From 559e00b6308b60a51e1423b8b1192f11b32183f3 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 17 Apr 2013 23:26:22 +0000
Subject: [PATCH 4834/6849] monit: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/monit/monit.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index a8b64477a4..657f0f15cd 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -6,6 +6,8 @@
 
 MONIT_VERSION = 5.4
 MONIT_SITE = http://mmonit.com/monit/dist/
+MONIT_LICENSE = AGPLv3 with OpenSSL exception
+MONIT_LICENSE_FILES = COPYING
 
 MONIT_CONF_ENV = \
 	libmonit_cv_setjmp_available=yes \

From 832a61cc47f4fd0923086abb0892cba303924bf3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 18 Apr 2013 03:13:05 +0000
Subject: [PATCH 4835/6849] qemu/arm-versatile: update to use kernel 3.8.8

The IRQ mapping failures have been fixed in 3.8.8 so update it to the
latest kernel series.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../arm-versatile/{linux-3.7.config => linux-3.8.config}    | 0
 configs/qemu_arm_versatile_defconfig                        | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.7.config => linux-3.8.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.7.config b/board/qemu/arm-versatile/linux-3.8.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.7.config
rename to board/qemu/arm-versatile/linux-3.8.config
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index ff264c770b..db18d5ba96 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -11,12 +11,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
 # Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+BR2_KERNEL_HEADERS_3_8=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.8.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From c8da02c3bf676cc4e193f93cbe4939ffeb3e413e Mon Sep 17 00:00:00 2001
From: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Date: Sun, 14 Apr 2013 22:31:24 +0000
Subject: [PATCH 4836/6849] libwebsockets: bump to version
 1.22-chrome26-firefox18

Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libwebsockets/libwebsockets.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index a3d8936733..e1f1efa9c9 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBWEBSOCKETS_VERSION = v1.1-chrome26-firefox18
+LIBWEBSOCKETS_VERSION = v1.22-chrome26-firefox18
 LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot
 LIBWEBSOCKETS_LICENSE = LGPLv2.1
 LIBWEBSOCKETS_LICENSE_FILES = COPYING

From 72fa62dd7b5a116fa765ec269e67f37245c1bf2f Mon Sep 17 00:00:00 2001
From: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Date: Sun, 14 Apr 2013 22:31:25 +0000
Subject: [PATCH 4837/6849] libwebsockets: do not build/install testapps to
 target

Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libwebsockets/libwebsockets.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index e1f1efa9c9..6672dbe5b4 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -10,6 +10,7 @@ LIBWEBSOCKETS_LICENSE = LGPLv2.1
 LIBWEBSOCKETS_LICENSE_FILES = COPYING
 LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_AUTORECONF = YES
+LIBWEBSOCKETS_CONF_OPT = --without-testapps
 LIBWEBSOCKETS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 90a8c814a1cd1362704dc0e1528760b98eb5e1c0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 7 Apr 2013 20:31:43 +0000
Subject: [PATCH 4838/6849] libsigsegv: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/libsigsegv/Config.in     |  6 ++++++
 package/libsigsegv/libsigsegv.mk | 13 +++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/libsigsegv/Config.in
 create mode 100644 package/libsigsegv/libsigsegv.mk

diff --git a/package/Config.in b/package/Config.in
index b9fe726450..477cc85533 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -575,6 +575,7 @@ source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
 source "package/libpthsem/Config.in"
 source "package/libsigc/Config.in"
+source "package/libsigsegv/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
 source "package/libseccomp/Config.in"
diff --git a/package/libsigsegv/Config.in b/package/libsigsegv/Config.in
new file mode 100644
index 0000000000..c46bb92ece
--- /dev/null
+++ b/package/libsigsegv/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBSIGSEGV
+	bool "libsigsegv"
+	help
+	  Library for handling page faults in user mode.
+
+	  http://libsigsegv.sourceforge.net/
diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk
new file mode 100644
index 0000000000..b8f84da8da
--- /dev/null
+++ b/package/libsigsegv/libsigsegv.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# libsigsegv
+#
+#############################################################
+
+LIBSIGSEGV_VERSION = 2.6
+LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
+LIBSIGSEGV_INSTALL_STAGING = YES
+LIBSIGSEGV_LICENSE = GPLv2+
+LIBSIGSEGV_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 5734f8d03524630f37fd09814605f3bd99b053b9 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 28 Mar 2013 02:15:19 +0000
Subject: [PATCH 4839/6849] rapidjson: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/rapidjson/Config.in    |  6 ++++++
 package/rapidjson/rapidjson.mk | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/rapidjson/Config.in
 create mode 100644 package/rapidjson/rapidjson.mk

diff --git a/package/Config.in b/package/Config.in
index 477cc85533..06bcdef462 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -622,6 +622,7 @@ source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/libyaml/Config.in"
 source "package/mxml/Config.in"
+source "package/rapidjson/Config.in"
 source "package/xerces/Config.in"
 source "package/yajl/Config.in"
 endmenu
diff --git a/package/rapidjson/Config.in b/package/rapidjson/Config.in
new file mode 100644
index 0000000000..d442797b66
--- /dev/null
+++ b/package/rapidjson/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_RAPIDJSON
+	bool "rapidjson"
+	help
+	  A fast JSON parser/generator for C++ with both SAX/DOM style API.
+
+	  https://code.google.com/p/rapidjson/
diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk
new file mode 100644
index 0000000000..cc260e9863
--- /dev/null
+++ b/package/rapidjson/rapidjson.mk
@@ -0,0 +1,34 @@
+#############################################################
+#
+# rapidjson
+#
+#############################################################
+
+RAPIDJSON_VERSION = 0.11
+RAPIDJSON_SOURCE = rapidjson-$(RAPIDJSON_VERSION).zip
+RAPIDJSON_SITE = http://rapidjson.googlecode.com/files
+RAPIDJSON_LICENSE = MIT
+RAPIDJSON_LICENSE_FILES = license.txt
+RAPIDJSON_INSTALL_TARGET = NO
+RAPIDJSON_INSTALL_STAGING = YES
+
+define RAPIDJSON_EXTRACT_CMDS
+	unzip -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE)
+	mv $(@D)/rapidjson/* $(@D)
+	$(RM) -r $(@D)/rapidjson
+endef
+
+define RAPIDJSON_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal
+	$(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \
+		$(STAGING_DIR)/usr/include/rapidjson
+	$(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \
+		$(STAGING_DIR)/usr/include/rapidjson/internal
+endef
+
+define RAPIDJSON_UNINSTALL_STAGING_CMDS
+	$(RM) -r $(STAGING_DIR)/usr/include/rapidjson
+endef
+
+$(eval $(generic-package))

From f989217bd904be8ab31ba160017a89d2c5afb545 Mon Sep 17 00:00:00 2001
From: Viallard Anthony <viallard@syscom-instruments.com>
Date: Tue, 2 Apr 2013 05:37:44 +0000
Subject: [PATCH 4840/6849] mobile-broadband-provider-info: bump to version
 20120614

Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mobile_broadband_provider_info.mk                          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index 8623297ef4..e7c4510d09 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -3,8 +3,9 @@
 # mobile broadband provider info
 #
 #############################################################
-MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511
+MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20120614
 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
+MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz
 MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
 MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf
 

From 49f836380a5b110b583210f28781204e45982b86 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 12 Apr 2013 00:06:53 +0000
Subject: [PATCH 4841/6849] apf9328: Fix build error

Commit a0b6faa ("gdb: convert to the package infrastructure") changed
the name of the host gdb configuration option, and added it to the
legacy option set, leading to a build breakage for the
armadeus_apf9328_defconfig.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/armadeus_apf9328_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig
index 1ed1dd587c..33e9a766bc 100644
--- a/configs/armadeus_apf9328_defconfig
+++ b/configs/armadeus_apf9328_defconfig
@@ -6,7 +6,7 @@ BR2_arm920t=y
 BR2_STRIP_sstrip=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_HOST=y
+BR2_PACKAGE_HOST_GDB=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
 BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y

From b58bf60b519353e983e372f5627d639e7cc72a7a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Apr 2013 02:53:17 +0000
Subject: [PATCH 4842/6849] support/kconfig: use kconfig-provided way of
 setting the CONFIG_ prefix

It's now been a while since it has been possible to build the kconfig
parser to understand a prefix other than CONFIG_, and even no prefix
at all, by setting the CONFIG_ macro (#define) at biuld time.

Just use that, insted of patching, it will make it easier for us in the
future.

Our patches have been refreshed at the same time.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/kconfig/Makefile.br                   |   2 +-
 support/kconfig/confdata.c                    |  35 ++--
 support/kconfig/lkc.h                         |   2 +-
 support/kconfig/menu.c                        |   2 +-
 .../01-kconfig-kernel-to-buildroot.patch      |  25 ++-
 .../03-change-config-option-prefix.patch      | 172 ------------------
 .../09-implement-kconfig-probability.patch    |   4 +-
 .../kconfig/patches/10-br-build-system.patch  |   2 +-
 .../14-support-out-of-tree-config.patch       |  14 +-
 support/kconfig/patches/series                |   1 -
 10 files changed, 54 insertions(+), 205 deletions(-)
 delete mode 100644 support/kconfig/patches/03-change-config-option-prefix.patch

diff --git a/support/kconfig/Makefile.br b/support/kconfig/Makefile.br
index 2f8b6ba927..41c5ce165d 100644
--- a/support/kconfig/Makefile.br
+++ b/support/kconfig/Makefile.br
@@ -19,7 +19,7 @@ host-cxxmulti := $(foreach m,$(__hostprogs),\
 host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))
 host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))
 
-HOST_EXTRACFLAGS += -I$(obj)
+HOST_EXTRACFLAGS += -I$(obj) -DCONFIG_=\"\"
 
 $(host-csingle): %: %.c
 	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
diff --git a/support/kconfig/confdata.c b/support/kconfig/confdata.c
index b7df92f9be..43f08fa1f9 100644
--- a/support/kconfig/confdata.c
+++ b/support/kconfig/confdata.c
@@ -13,7 +13,6 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <libgen.h>
 
 #include "lkc.h"
 
@@ -308,20 +307,20 @@ int conf_read_simple(const char *name, int def)
 		if (line[0] == '#') {
 			if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
 				continue;
-			p = strchr(line + 2, ' ');
+			p = strchr(line + 2 + strlen(CONFIG_), ' ');
 			if (!p)
 				continue;
 			*p++ = 0;
 			if (strncmp(p, "is not set", 10))
 				continue;
 			if (def == S_DEF_USER) {
-				sym = sym_find(line + 2);
+				sym = sym_find(line + 2 + strlen(CONFIG_));
 				if (!sym) {
 					sym_add_change_count(1);
 					goto setsym;
 				}
 			} else {
-				sym = sym_lookup(line + 2, 0);
+				sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
 				if (sym->type == S_UNKNOWN)
 					sym->type = S_BOOLEAN;
 			}
@@ -337,8 +336,8 @@ int conf_read_simple(const char *name, int def)
 			default:
 				;
 			}
-		} else if (isupper(line[0])) {
-			p = strchr(line, '=');
+		} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
+			p = strchr(line + strlen(CONFIG_), '=');
 			if (!p)
 				continue;
 			*p++ = 0;
@@ -349,13 +348,13 @@ int conf_read_simple(const char *name, int def)
 					*p2 = 0;
 			}
 			if (def == S_DEF_USER) {
-				sym = sym_find(line);
+				sym = sym_find(line + strlen(CONFIG_));
 				if (!sym) {
 					sym_add_change_count(1);
 					goto setsym;
 				}
 			} else {
-				sym = sym_lookup(line, 0);
+				sym = sym_lookup(line + strlen(CONFIG_), 0);
 				if (sym->type == S_UNKNOWN)
 					sym->type = S_OTHER;
 			}
@@ -483,8 +482,8 @@ kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
 			bool skip_unset = (arg != NULL);
 
 			if (!skip_unset)
-				fprintf(fp, "# %s is not set\n",
-				    sym->name);
+				fprintf(fp, "# %s%s is not set\n",
+				    CONFIG_, sym->name);
 			return;
 		}
 		break;
@@ -492,7 +491,7 @@ kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
 		break;
 	}
 
-	fprintf(fp, "%s=%s\n", sym->name, value);
+	fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);
 }
 
 static void
@@ -542,8 +541,8 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
 			suffix = "_MODULE";
 			/* fall through */
 		default:
-			fprintf(fp, "#define %s%s 1\n",
-			    sym->name, suffix);
+			fprintf(fp, "#define %s%s%s 1\n",
+			    CONFIG_, sym->name, suffix);
 		}
 		break;
 	}
@@ -552,14 +551,14 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
 
 		if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
 			prefix = "0x";
-		fprintf(fp, "#define %s %s%s\n",
-		    sym->name, prefix, value);
+		fprintf(fp, "#define %s%s %s%s\n",
+		    CONFIG_, sym->name, prefix, value);
 		break;
 	}
 	case S_STRING:
 	case S_INT:
-		fprintf(fp, "#define %s %s\n",
-		    sym->name, value);
+		fprintf(fp, "#define %s%s %s\n",
+		    CONFIG_, sym->name, value);
 		break;
 	default:
 		break;
@@ -605,7 +604,7 @@ tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg
 {
 
 	if (sym->type == S_TRISTATE && *value != 'n')
-		fprintf(fp, "%s=%c\n", sym->name, (char)toupper(*value));
+		fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));
 }
 
 static struct conf_printer tristate_printer_cb =
diff --git a/support/kconfig/lkc.h b/support/kconfig/lkc.h
index eeb6a905ac..f8aee5fc6d 100644
--- a/support/kconfig/lkc.h
+++ b/support/kconfig/lkc.h
@@ -37,7 +37,7 @@ extern "C" {
 #define N_(text) (text)
 
 #ifndef CONFIG_
-#define CONFIG_ "BR2_"
+#define CONFIG_ "CONFIG_"
 #endif
 static inline const char *CONFIG_prefix(void)
 {
diff --git a/support/kconfig/menu.c b/support/kconfig/menu.c
index 06a93646d5..f3bffa3093 100644
--- a/support/kconfig/menu.c
+++ b/support/kconfig/menu.c
@@ -635,7 +635,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
 
 	if (menu_has_help(menu)) {
 		if (sym->name)
-			str_printf(help, "%s:\n\n", sym->name);
+			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
 		help_text = menu_get_help(menu);
 	}
 	str_printf(help, "%s\n", _(help_text));
diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
index f28131cf8c..d7206a0040 100644
--- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
+++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
@@ -1,9 +1,10 @@
 ---
+ confdata.c          |    4 ++--
  gconf.glade         |    2 +-
  mconf.c             |    4 ++--
  zconf.tab.c_shipped |    2 +-
  zconf.y             |    2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
+ 5 files changed, 7 insertions(+), 7 deletions(-)
 
 Index: b/gconf.glade
 ===================================================================
@@ -60,3 +61,25 @@ Index: b/zconf.y
  
  	if (getenv("ZCONF_DEBUG"))
  		zconfdebug = 1;
+Index: b/confdata.c
+===================================================================
+--- a/confdata.c
++++ b/confdata.c
+@@ -25,7 +26,7 @@
+ static const char *conf_filename;
+ static int conf_lineno, conf_warnings, conf_unsaved;
+ 
+-const char conf_defname[] = "arch/$ARCH/defconfig";
++const char conf_defname[] = ".defconfig";
+ 
+ static void conf_warning(const char *fmt, ...)
+ {
+@@ -63,7 +64,7 @@
+ 
+ const char *conf_get_configname(void)
+ {
+-	char *name = getenv("KCONFIG_CONFIG");
++	char *name = getenv("BUILDROOT_CONFIG");
+ 
+ 	return name ? name : ".config";
+ }
diff --git a/support/kconfig/patches/03-change-config-option-prefix.patch b/support/kconfig/patches/03-change-config-option-prefix.patch
deleted file mode 100644
index 0644ab0d3e..0000000000
--- a/support/kconfig/patches/03-change-config-option-prefix.patch
+++ /dev/null
@@ -1,172 +0,0 @@
----
- confdata.c |   57 +++++++++++++++++++++++++++++----------------------------
- lkc.h      |    2 +-
- menu.c     |    2 +-
- 3 files changed, 31 insertions(+), 30 deletions(-)
-
-Index: b/confdata.c
-===================================================================
---- a/confdata.c
-+++ b/confdata.c
-@@ -13,6 +13,7 @@
- #include <string.h>
- #include <time.h>
- #include <unistd.h>
-+#include <libgen.h>
- 
- #include "lkc.h"
- 
-@@ -25,7 +26,7 @@
- static const char *conf_filename;
- static int conf_lineno, conf_warnings, conf_unsaved;
- 
--const char conf_defname[] = "arch/$ARCH/defconfig";
-+const char conf_defname[] = ".defconfig";
- 
- static void conf_warning(const char *fmt, ...)
- {
-@@ -63,7 +64,7 @@
- 
- const char *conf_get_configname(void)
- {
--	char *name = getenv("KCONFIG_CONFIG");
-+	char *name = getenv("BUILDROOT_CONFIG");
- 
- 	return name ? name : ".config";
- }
-@@ -309,20 +310,20 @@
- 		if (line[0] == '#') {
- 			if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
- 				continue;
--			p = strchr(line + 2 + strlen(CONFIG_), ' ');
-+			p = strchr(line + 2, ' ');
- 			if (!p)
- 				continue;
- 			*p++ = 0;
- 			if (strncmp(p, "is not set", 10))
- 				continue;
- 			if (def == S_DEF_USER) {
--				sym = sym_find(line + 2 + strlen(CONFIG_));
-+				sym = sym_find(line + 2);
- 				if (!sym) {
- 					sym_add_change_count(1);
- 					goto setsym;
- 				}
- 			} else {
--				sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
-+				sym = sym_lookup(line + 2, 0);
- 				if (sym->type == S_UNKNOWN)
- 					sym->type = S_BOOLEAN;
- 			}
-@@ -338,8 +339,8 @@
- 			default:
- 				;
- 			}
--		} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
--			p = strchr(line + strlen(CONFIG_), '=');
-+		} else if (isupper(line[0])) {
-+			p = strchr(line, '=');
- 			if (!p)
- 				continue;
- 			*p++ = 0;
-@@ -350,13 +351,13 @@
- 					*p2 = 0;
- 			}
- 			if (def == S_DEF_USER) {
--				sym = sym_find(line + strlen(CONFIG_));
-+				sym = sym_find(line);
- 				if (!sym) {
- 					sym_add_change_count(1);
- 					goto setsym;
- 				}
- 			} else {
--				sym = sym_lookup(line + strlen(CONFIG_), 0);
-+				sym = sym_lookup(line, 0);
- 				if (sym->type == S_UNKNOWN)
- 					sym->type = S_OTHER;
- 			}
-@@ -484,8 +485,8 @@
- 			bool skip_unset = (arg != NULL);
- 
- 			if (!skip_unset)
--				fprintf(fp, "# %s%s is not set\n",
--				    CONFIG_, sym->name);
-+				fprintf(fp, "# %s is not set\n",
-+				    sym->name);
- 			return;
- 		}
- 		break;
-@@ -493,7 +494,7 @@
- 		break;
- 	}
- 
--	fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);
-+	fprintf(fp, "%s=%s\n", sym->name, value);
- }
- 
- static void
-@@ -543,8 +544,8 @@
- 			suffix = "_MODULE";
- 			/* fall through */
- 		default:
--			fprintf(fp, "#define %s%s%s 1\n",
--			    CONFIG_, sym->name, suffix);
-+			fprintf(fp, "#define %s%s 1\n",
-+			    sym->name, suffix);
- 		}
- 		break;
- 	}
-@@ -553,14 +554,14 @@
- 
- 		if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
- 			prefix = "0x";
--		fprintf(fp, "#define %s%s %s%s\n",
--		    CONFIG_, sym->name, prefix, value);
-+		fprintf(fp, "#define %s %s%s\n",
-+		    sym->name, prefix, value);
- 		break;
- 	}
- 	case S_STRING:
- 	case S_INT:
--		fprintf(fp, "#define %s%s %s\n",
--		    CONFIG_, sym->name, value);
-+		fprintf(fp, "#define %s %s\n",
-+		    sym->name, value);
- 		break;
- 	default:
- 		break;
-@@ -606,7 +607,7 @@
- {
- 
- 	if (sym->type == S_TRISTATE && *value != 'n')
--		fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));
-+		fprintf(fp, "%s=%c\n", sym->name, (char)toupper(*value));
- }
- 
- static struct conf_printer tristate_printer_cb =
-Index: b/lkc.h
-===================================================================
---- a/lkc.h
-+++ b/lkc.h
-@@ -37,7 +37,7 @@
- #define N_(text) (text)
- 
- #ifndef CONFIG_
--#define CONFIG_ "CONFIG_"
-+#define CONFIG_ "BR2_"
- #endif
- static inline const char *CONFIG_prefix(void)
- {
-Index: b/menu.c
-===================================================================
---- a/menu.c
-+++ b/menu.c
-@@ -635,7 +635,7 @@
- 
- 	if (menu_has_help(menu)) {
- 		if (sym->name)
--			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
-+			str_printf(help, "%s:\n\n", sym->name);
- 		help_text = menu_get_help(menu);
- 	}
- 	str_printf(help, "%s\n", _(help_text));
diff --git a/support/kconfig/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
index 72e2a254f9..45fa2513a1 100644
--- a/support/kconfig/patches/09-implement-kconfig-probability.patch
+++ b/support/kconfig/patches/09-implement-kconfig-probability.patch
@@ -6,7 +6,7 @@ Index: b/confdata.c
 ===================================================================
 --- a/confdata.c
 +++ b/confdata.c
-@@ -1107,7 +1107,16 @@
+@@ -1106,7 +1106,16 @@
  void conf_set_all_new_symbols(enum conf_def_mode mode)
  {
  	struct symbol *sym, *csym;
@@ -24,7 +24,7 @@ Index: b/confdata.c
  
  	for_all_symbols(i, sym) {
  		if (sym_has_value(sym))
-@@ -1126,8 +1135,15 @@
+@@ -1125,8 +1134,15 @@
  				sym->def[S_DEF_USER].tri = no;
  				break;
  			case def_random:
diff --git a/support/kconfig/patches/10-br-build-system.patch b/support/kconfig/patches/10-br-build-system.patch
index a877318e72..be6fda07af 100644
--- a/support/kconfig/patches/10-br-build-system.patch
+++ b/support/kconfig/patches/10-br-build-system.patch
@@ -29,7 +29,7 @@ Index: b/Makefile.br
 +host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))
 +host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))
 +
-+HOST_EXTRACFLAGS += -I$(obj)
++HOST_EXTRACFLAGS += -I$(obj) -DCONFIG_=\"\"
 +
 +$(host-csingle): %: %.c
 +	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
diff --git a/support/kconfig/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
index 318d0ddd94..9e3f93d4f2 100644
--- a/support/kconfig/patches/14-support-out-of-tree-config.patch
+++ b/support/kconfig/patches/14-support-out-of-tree-config.patch
@@ -20,7 +20,7 @@ Index: b/confdata.c
 ===================================================================
 --- a/confdata.c
 +++ b/confdata.c
-@@ -71,9 +71,7 @@
+@@ -70,9 +70,7 @@
  
  const char *conf_get_autoconfig_name(void)
  {
@@ -31,7 +31,7 @@ Index: b/confdata.c
  }
  
  static char *conf_expand_value(const char *in)
-@@ -738,6 +736,9 @@
+@@ -737,6 +735,9 @@
  	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
  	char *env;
  
@@ -41,7 +41,7 @@ Index: b/confdata.c
  	dirname[0] = 0;
  	if (name && name[0]) {
  		struct stat st;
-@@ -832,6 +833,7 @@
+@@ -831,6 +832,7 @@
  {
  	const char *name;
  	char path[PATH_MAX+1];
@@ -49,7 +49,7 @@ Index: b/confdata.c
  	char *s, *d, c;
  	struct symbol *sym;
  	struct stat sb;
-@@ -840,8 +842,20 @@
+@@ -839,8 +841,20 @@
  	name = conf_get_autoconfig_name();
  	conf_read_simple(name, S_DEF_AUTO);
  
@@ -72,7 +72,7 @@ Index: b/confdata.c
  
  	res = 0;
  	for_all_symbols(i, sym) {
-@@ -934,9 +948,11 @@
+@@ -933,9 +947,11 @@
  		close(fd);
  	}
  out:
@@ -87,7 +87,7 @@ Index: b/confdata.c
  	return res;
  }
  
-@@ -946,25 +962,38 @@
+@@ -945,25 +961,38 @@
  	const char *name;
  	FILE *out, *tristate, *out_h;
  	int i;
@@ -130,7 +130,7 @@ Index: b/confdata.c
  	if (!out_h) {
  		fclose(out);
  		fclose(tristate);
-@@ -996,19 +1025,22 @@
+@@ -995,19 +1024,22 @@
  	name = getenv("KCONFIG_AUTOHEADER");
  	if (!name)
  		name = "include/generated/autoconf.h";
diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series
index 2d0e9919a0..523e652399 100644
--- a/support/kconfig/patches/series
+++ b/support/kconfig/patches/series
@@ -1,6 +1,5 @@
 01-kconfig-kernel-to-buildroot.patch
 02-cpp-comments-to-c-comments.patch
-03-change-config-option-prefix.patch
 06-br-build-system-integration.patch
 09-implement-kconfig-probability.patch
 10-br-build-system.patch

From 326c21bcc26954e285eedb6f6945708132d77e19 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Apr 2013 09:13:07 +0000
Subject: [PATCH 4843/6849] configs: add sample for freescale p1010rdb

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/freescale/p1010rdb/linux-3.8.config | 143 ++++++++++++++++++++++
 board/freescale/p1010rdb/readme.txt       |  63 ++++++++++
 configs/freescale_p1010rdb_defconfig      |  32 +++++
 3 files changed, 238 insertions(+)
 create mode 100644 board/freescale/p1010rdb/linux-3.8.config
 create mode 100644 board/freescale/p1010rdb/readme.txt
 create mode 100644 configs/freescale_p1010rdb_defconfig

diff --git a/board/freescale/p1010rdb/linux-3.8.config b/board/freescale/p1010rdb/linux-3.8.config
new file mode 100644
index 0000000000..5cdb4131d0
--- /dev/null
+++ b/board/freescale/p1010rdb/linux-3.8.config
@@ -0,0 +1,143 @@
+CONFIG_PPC_85xx=y
+CONFIG_PHYS_64BIT=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_AUDIT=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_P1010_RDB=y
+CONFIG_HIGHMEM=y
+CONFIG_SWIOTLB=y
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_RAPIDIO=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_INET_ESP=y
+# CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_LRO=y
+CONFIG_IPV6=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_FTL=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=131072
+CONFIG_EEPROM_LEGACY=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_ATA=y
+CONFIG_SATA_FSL=y
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=y
+CONFIG_GIANFAR=y
+CONFIG_VITESSE_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_QE=m
+CONFIG_NVRAM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_CPM=m
+CONFIG_I2C_MPC=y
+CONFIG_SPI=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_SPI_FSL_ESPI=y
+CONFIG_GPIO_MPC8XXX=y
+# CONFIG_HWMON is not set
+CONFIG_USB=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_STORAGE=y
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_ESDHC=y
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_DMADEVICES=y
+CONFIG_FSL_DMA=y
+# CONFIG_NET_DMA is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_CRC_T10DIF=y
+CONFIG_DEBUG_FS=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_INFO=y
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt
new file mode 100644
index 0000000000..96293b7f39
--- /dev/null
+++ b/board/freescale/p1010rdb/readme.txt
@@ -0,0 +1,63 @@
+
+******************** WARNING ********************
+The compiled U-Boot binary is intended for NOR flash only!
+It won't work for NAND or SPI and will brick those bootloaders!
+
+Also don't go playing around with different U-boot versions or flash targets
+unless you've got the necessary hardware and/or know-how to unbrick your kit.
+
+2012.10 is known good for NOR, but BAD for NAND and SPI.
+******************** WARNING ********************
+
+You'll need to program the files created by buildroot into the flash.
+The fast way is to tftp transfer the files via one of the network interfaces.
+
+Alternatively you can transfer the files via serial console with an Ymodem
+file transfer from your terminal program by using a "loady" command
+from the u-boot prompt instead of the "tftp ..." commands stated below.
+Beware that serial console file transfers are quite slow!
+
+Remember to set the P1010RDB switches to NOR boot if you want to use
+your newly built U-Boot.
+
+1. Program the new U-Boot binary to NOR flash (optional)
+    If you don't feel confident upgrading your bootloader then don't do it,
+    it's unnecessary most of the time.
+
+    => tftp $loadaddr u-boot.bin
+    => protect off 0xeff80000 +$filesize
+    => erase 0xeff80000 +$filesize
+    => cp.b $loadaddr 0xeff80000 $filesize
+
+2. Program the DTB to NOR flash
+
+    => tftp $loadaddr p1010rdb.dtb
+    => erase 0xee000000 +$filesize
+    => cp.b $loadaddr 0xee000000 $filesize
+
+3. Program the kernel to NOR flash
+
+    => tftp $loadaddr uImage
+    => erase 0xee080000 +$filesize
+    => cp.b $loadaddr 0xee080000 $filesize
+
+4. Program the root filesystem to NOR flash
+
+    => tftp $loadaddr rootfs.jffs2
+    => erase 0xee800000 0xeff5ffff
+    => cp.b $loadaddr 0xee800000 $filesize
+
+5. Booting your new system
+
+    => setenv norboot 'setenv bootargs root=/dev/mtdblock2 rootfstype=jffs2 console=$consoledev,$baudrate;bootm 0xee080000 - 0xee000000'
+
+    If you want to set this boot option as default:
+
+    => setenv bootcmd 'run norboot'
+    => saveenv
+
+    ...or for a single boot:
+
+    => run norboot
+
+    You can login with user "root".
diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig
new file mode 100644
index 0000000000..a36f07c09b
--- /dev/null
+++ b/configs/freescale_p1010rdb_defconfig
@@ -0,0 +1,32 @@
+# Architecture
+BR2_powerpc=y
+BR2_powerpc_8548=y
+
+# Filesystem
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_JFFS2=y
+BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
+BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x20
+BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000
+
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.8.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb"
+
+# Serial port config
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR"
+BR2_TARGET_UBOOT_2012_10=y

From 5260f30b2e702d9441f65f60e708b561935cc80f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Apr 2013 09:13:08 +0000
Subject: [PATCH 4844/6849] configs: add sample for freescale mpc8315erdb

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/freescale/mpc8315erdb/linux-3.8.config | 107 +++++++++++++++++++
 board/freescale/mpc8315erdb/readme.txt       |  62 +++++++++++
 configs/freescale_mpc8315erdb_defconfig      |  33 ++++++
 3 files changed, 202 insertions(+)
 create mode 100644 board/freescale/mpc8315erdb/linux-3.8.config
 create mode 100644 board/freescale/mpc8315erdb/readme.txt
 create mode 100644 configs/freescale_mpc8315erdb_defconfig

diff --git a/board/freescale/mpc8315erdb/linux-3.8.config b/board/freescale/mpc8315erdb/linux-3.8.config
new file mode 100644
index 0000000000..120314c2a1
--- /dev/null
+++ b/board/freescale/mpc8315erdb/linux-3.8.config
@@ -0,0 +1,107 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EXPERT=y
+# CONFIG_KALLSYMS is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
+CONFIG_PPC_83xx=y
+CONFIG_MPC831x_RDB=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_PCI=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_FW_LOADER is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_ATA=y
+CONFIG_SATA_FSL=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_NET_PCI=y
+CONFIG_E100=y
+CONFIG_GIANFAR=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MPC=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=y
+CONFIG_WATCHDOG=y
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_ETH=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_INOTIFY=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/board/freescale/mpc8315erdb/readme.txt b/board/freescale/mpc8315erdb/readme.txt
new file mode 100644
index 0000000000..91e58e4d4a
--- /dev/null
+++ b/board/freescale/mpc8315erdb/readme.txt
@@ -0,0 +1,62 @@
+
+******************** WARNING ********************
+The compiled U-Boot binary is intended for NAND flash only!
+It won't work for NOR and will brick that bootloader!
+
+Also don't go playing around with different U-boot versions or flash targets
+unless you've got the necessary hardware and/or know-how to unbrick your kit.
+
+2012.10 is known good for NAND.
+******************** WARNING ********************
+
+You'll need to program the files created by buildroot into the flash.
+The fast way is to tftp transfer the files via one of the network interfaces.
+
+Alternatively you can transfer the files via serial console with an Ymodem
+file transfer from your terminal program by using a "loady" command
+from the u-boot prompt instead of the "tftp ..." commands stated below.
+Beware that serial console file transfers are quite slow!
+
+Remember to set the MPC8315ERDB switches to NAND boot if you want to use
+your newly built U-Boot.
+
+1. Program the new U-Boot binary to NAND flash (optional)
+    If you don't feel confident upgrading your bootloader then don't do it,
+    it's unnecessary most of the time.
+
+    => tftp $loadaddr u-boot-nand.bin
+    => nand erase 0 0x80000
+    => nand write $loadaddr 0 0x80000 $filesize
+
+2. Program the kernel to NAND flash
+
+    => tftp $loadaddr uImage
+    => nand erase 0x100000 0x1e0000
+    => nand write $loadaddr 0x100000 0x1e0000
+
+3. Program the DTB to NAND flash
+
+    => tftp $loadaddr mpc8315erdb.dtb
+    => nand erase 0x2e0000 0x20000
+    => nand write $loadaddr 0x2e0000 0x20000
+
+4. Program the root filesystem to NAND flash
+
+    => tftp $loadaddr rootfs.jffs2
+    => nand erase 0x400000 0x1c00000
+    => nand write $loadaddr 0x400000 $filesize
+
+5. Booting your new system
+
+    => setenv nandboot 'setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=$consoledev,$baudrate;nand read $fdtaddr 0x2e0000 0x20000;nand read $loadaddr 0x100000 0x1e0000;bootm $loadaddr - $fdtaddr'
+
+    If you want to set this boot option as default:
+
+    => setenv bootcmd 'run nandboot'
+    => saveenv
+
+    ...or for a single boot:
+
+    => run nandboot
+
+    You can login with user "root".
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
new file mode 100644
index 0000000000..9f733fae35
--- /dev/null
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -0,0 +1,33 @@
+# Architecture
+BR2_powerpc=y
+BR2_powerpc_e300c3=y
+
+# Filesystem
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ROOTFS_JFFS2=y
+BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
+BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x200
+BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x4000
+BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
+
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.8.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
+
+# Serial port config
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
+BR2_TARGET_UBOOT_2012_10=y

From ba3385dc9091b2f08f1c97ba476000111a3b4ff2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 21 Apr 2013 15:12:09 +0000
Subject: [PATCH 4845/6849] php: bump to version 5.3.24

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 515244dfe1..ba428a664b 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.23
+PHP_VERSION = 5.3.24
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From 9e5fcda1c5201b8623cd80d8c96c9f2b0153798b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 21 Apr 2013 15:12:10 +0000
Subject: [PATCH 4846/6849] dropbear: bump to version 2013.58

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear-fix-no-zlib.patch | 32 ---------------------
 package/dropbear/dropbear.mk                |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 package/dropbear/dropbear-fix-no-zlib.patch

diff --git a/package/dropbear/dropbear-fix-no-zlib.patch b/package/dropbear/dropbear-fix-no-zlib.patch
deleted file mode 100644
index ecf3f09c89..0000000000
--- a/package/dropbear/dropbear-fix-no-zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User Matt Johnston <matt@ucc.asn.au>
-# Date 1366121792 -28800
-# Node ID f110d321fe7abb8864a1ab3268984f7cb02ac285
-# Parent  029e769c33c697f9255c40d6552f0aa81466eeed
-Fix build when zlib is disabled, from
-http://freetz.org/browser/trunk/make/dropbear/patches/350-no_zlib_fix.patch
-
-diff -r 029e769c33c6 -r f110d321fe7a common-kex.c
---- a/common-kex.c	Mon Apr 15 22:11:11 2013 +0800
-+++ b/common-kex.c	Tue Apr 16 22:16:32 2013 +0800
-@@ -171,14 +171,18 @@
- 	}
- 	if (ses.kexstate.recvnewkeys && ses.newkeys->recv.valid) {
- 		TRACE(("switch_keys recv"))
-+#ifndef DISABLE_ZLIB
- 		gen_new_zstream_recv();
-+#endif
- 		ses.keys->recv = ses.newkeys->recv;
- 		m_burn(&ses.newkeys->recv, sizeof(ses.newkeys->recv));
- 		ses.newkeys->recv.valid = 0;
- 	}
- 	if (ses.kexstate.sentnewkeys && ses.newkeys->trans.valid) {
- 		TRACE(("switch_keys trans"))
-+#ifndef DISABLE_ZLIB
- 		gen_new_zstream_trans();
-+#endif
- 		ses.keys->trans = ses.newkeys->trans;
- 		m_burn(&ses.newkeys->trans, sizeof(ses.newkeys->trans));
- 		ses.newkeys->trans.valid = 0;
-
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 0715555af3..d5dfe6dc84 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DROPBEAR_VERSION = 2013.57
+DROPBEAR_VERSION = 2013.58
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh

From bd528977f1dbe232bd1ca2a0bd9a37f9172d579a Mon Sep 17 00:00:00 2001
From: Victor Hiairrassary <victor.hiairrassary.ml@gmail.com>
Date: Sun, 21 Apr 2013 22:07:23 +0000
Subject: [PATCH 4847/6849] xenomai: bump to version 2.6.2.1

- remove BR2_PACKAGE_XENOMAI_SMP since xenomai 2.6.2 no more
requires to pass the --enable-smp option : see release notes at
http://www.xenomai.org/index.php/Xenomai:News#2012-12-26_Xenomai_2.6.2

- remove xenomai-thumb-fix.patch since it was completely merged
in xenomai 2.6.2

Signed-off-by: Victor Hiairrassary <victor.hiairrassary.ml@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xenomai/Config.in               |   7 --
 package/xenomai/xenomai-thumb-fix.patch | 157 ------------------------
 package/xenomai/xenomai.mk              |   6 +-
 3 files changed, 1 insertion(+), 169 deletions(-)
 delete mode 100644 package/xenomai/xenomai-thumb-fix.patch

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index b09472d206..767f6229db 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -39,13 +39,6 @@ config BR2_PACKAGE_XENOMAI_VERSION
 	  BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
 	  Kernel -> Linux Kernel Extensions menu.
 
-config BR2_PACKAGE_XENOMAI_SMP
-	bool "Enable SMP support"
-	depends on BR2_cortex_a9 || !BR2_arm # only A9 has SMP support
-	help
-	  This option allows to enable or disable SMP support. It has
-	  to match your kernel configuration.
-
 config BR2_PACKAGE_XENOMAI_TESTSUITE
        bool "Install testsuite"
        help
diff --git a/package/xenomai/xenomai-thumb-fix.patch b/package/xenomai/xenomai-thumb-fix.patch
deleted file mode 100644
index 7c98c2ebf6..0000000000
--- a/package/xenomai/xenomai-thumb-fix.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From ad3714e925f5c6b4ae0e0d31c4bab7f8c5e659db Mon Sep 17 00:00:00 2001
-From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
-Date: Fri, 10 Aug 2012 21:55:41 +0200
-Subject: [PATCH] hal/arm: fix compilation for thumb
-
----
- include/asm-arm/atomic.h |    3 ++
- ksrc/arch/arm/switch.S   |   84 +++++++++++++++++++++++++++------------------
- 2 files changed, 53 insertions(+), 34 deletions(-)
-
-diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
-index 5d55ae8..ae96847 100644
---- a/include/asm-arm/atomic.h
-+++ b/include/asm-arm/atomic.h
-@@ -183,6 +183,9 @@ xnarch_atomic_cmpxchg(xnarch_atomic_t *ptr,
- 		"ldrex	%1, [%3]\n"
- 		"mov	%0, #0\n"
- 		"teq	%1, %4\n"
-+#ifdef __thumb__
-+		"it	eq\n"
-+#endif
- 		"strexeq %0, %5, [%3]\n"
- 		    : "=&r" (res), "=&r" (curval), "+Qo" (ptr->counter)
- 		    : "r" (&ptr->counter), "Ir" (oldval), "r" (newval)
-diff --git a/ksrc/arch/arm/switch.S b/ksrc/arch/arm/switch.S
-index 83f4746..95c355f 100644
---- a/ksrc/arch/arm/switch.S
-+++ b/ksrc/arch/arm/switch.S
-@@ -37,6 +37,11 @@
- 	.endm
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
-+#define ARM(x...)	x
-+#define THUMB(x...)
-+#endif
-+
- #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 37)
- #ifdef CONFIG_MMU
- #define USE_DOMAINS
-@@ -83,18 +88,19 @@
-  * r0 = pointer to union vfp_state, r1 = fpexc
-  */
- ENTRY(rthal_vfp_save)
--    VFPFSTMIA	r0, r2			@ save the working registers
--    VFPFMRX	r2, FPSCR		@ current status
--    tst		r1, #FPEXC_EX		@ is there additional state to save?
--    beq 1f
--    VFPFMRX	r3, FPINST		@ FPINST (only if FPEXC.EX is set)
--    tst		r1, #FPEXC_FP2V		@ is there an FPINST2 to read?
--    beq 1f
--    VFPFMRX	r12, FPINST2	@ FPINST2 if needed (and present)
-+	VFPFSTMIA	r0, r2		@ save the working registers
-+	VFPFMRX		r2, FPSCR	@ current status
-+	tst		r1, #FPEXC_EX	@ is there additional state to save?
-+	beq		1f
-+	VFPFMRX		r3, FPINST	@ FPINST (only if FPEXC.EX is set)
-+	tst		r1, #FPEXC_FP2V	@ is there an FPINST2 to read?
-+	beq		1f
-+	VFPFMRX		r12, FPINST2	@ FPINST2 if needed (and present)
- 1:
--    stmia	r0, {r1, r2, r3, r12}	@ save FPEXC, FPSCR, FPINST, FPINST2
--    mov		pc, lr
--
-+	stmia		r0, {r1, r2, r3, r12}	@ save FPEXC, FPSCR, FPINST, FPINST2
-+	mov		pc, lr
-+ENDPROC(rthal_vfp_save)
-+	
- /* Copied from no_old_VFP_process in arch/arm/vfp/vfphw.S
-  * r0 = pointer to union vfp_state
-  * r1 = current cpu
-@@ -102,20 +108,21 @@ ENTRY(rthal_vfp_save)
- ENTRY(rthal_vfp_load)
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) \
- 	|| defined(CONFIG_VFP_3_2_BACKPORT)) && defined(CONFIG_SMP)
--    str 	r1, [r0, #VFP_CPU]
-+	str		r1, [r0, #VFP_CPU]
- #endif
--    VFPFLDMIA	r0, r2			@ reload the working registers while
-+	VFPFLDMIA	r0, r2		@ reload the working registers while
- 					@ FPEXC is in a safe state
--    ldmia	r0, {r1, r2, r3, r12}	@ load FPEXC, FPSCR, FPINST, FPINST2
--    tst		r1, #FPEXC_EX		@ is there additional state to restore?
--    beq		1f
--    VFPFMXR	FPINST, r3		@ restore FPINST (only if FPEXC.EX is set)
--    tst		r1, #FPEXC_FP2V		@ is there an FPINST2 to write?
--    beq		1f
--    VFPFMXR	FPINST2, r12	@ FPINST2 if needed (and present)
-+	ldmia		r0, {r1, r2, r3, r12}	@ load FPEXC, FPSCR, FPINST, FPINST2
-+	tst		r1, #FPEXC_EX	@ is there additional state to restore?
-+	beq		1f
-+	VFPFMXR		FPINST, r3	@ restore FPINST (only if FPEXC.EX is set)
-+	tst		r1, #FPEXC_FP2V	@ is there an FPINST2 to write?
-+	beq		1f
-+	VFPFMXR		FPINST2, r12	@ FPINST2 if needed (and present)
- 1:
--    VFPFMXR	FPSCR, r2		@ restore status
--    mov		pc, lr
-+	VFPFMXR		FPSCR, r2	@ restore status
-+	mov		pc, lr
-+ENDPROC(rthal_vfp_load)
- #endif
- 
- /*
-@@ -144,28 +151,37 @@ ENTRY(rthal_vfp_load)
-  * r0 = previous task_struct, r1 = previous thread_info, r2 = next thread_info
-  */
- ENTRY(rthal_thread_switch)
--    add     ip, r1, #TI_CPU_SAVE
--    ldr     r3, [r2, #TI_TP_VALUE]
--    stmia   ip!, {r4 - sl, fp, sp, lr}      @ Store most regs on stack
-+	add     ip, r1, #TI_CPU_SAVE
-+	ldr     r3, [r2, #TI_TP_VALUE]
-+ ARM(	stmia	ip!, {r4 - sl, fp, sp, lr} )	@ Store most regs on stack
-+ THUMB(	stmia	ip!, {r4 - sl, fp}	   )	@ Store most regs on stack
-+ THUMB(	str	sp, [ip], #4		   )
-+ THUMB(	str	lr, [ip], #4		   )
- #ifdef USE_DOMAINS
--    ldr     r6, [r2, #TI_CPU_DOMAIN]
-+	ldr     r6, [r2, #TI_CPU_DOMAIN]
- #endif
- 
--    clear_exclusive_monitor
--    set_tls r3, r4, r5
-+	clear_exclusive_monitor
-+	set_tls r3, r4, r5
- #ifdef USE_DOMAINS
--    mcr     p15, 0, r6, c3, c0, 0           @ Set domain register
-+	mcr     p15, 0, r6, c3, c0, 0           @ Set domain register
- #endif
--    fpu_switch r4
--    add	    r4, r2, #TI_CPU_SAVE
--    ldmia   r4, {r4 - sl, fp, sp, pc}       @ Load all regs saved previously
-+	fpu_switch r4
-+ ARM(	add	r4, r2, #TI_CPU_SAVE	   )
-+ ARM(	ldmia	r4, {r4 - sl, fp, sp, pc}  )	@ Load all regs saved previously
-+ THUMB(	add	ip, r2, #TI_CPU_SAVE	   )
-+ THUMB(	ldmia	ip!, {r4 - sl, fp}	   )	@ Load all regs saved previously
-+ THUMB(	ldr	sp, [ip], #4		   )
-+ THUMB(	ldr	pc, [ip]		   )
-+ENDPROC(rthal_thread_switch)
- 
- /*
-  * r4 = xnarch_thread_trampoline
-  * r5 = xnarchtcb_t *
-  */
- ENTRY(rthal_thread_trampoline)
--    mov     r0, r5
--    mov     pc, r4
-+	mov	r0, r5
-+	mov	pc, r4
-+ENDPROC(rthal_thread_trampoline)
- 
- // vim: ts=4 et sw=4 sts=4
--- 
-1.7.2.5
-
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index f40cbdc48c..fbf20b5a55 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -7,7 +7,7 @@
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
 ifeq ($(XENOMAI_VERSION),)
-XENOMAI_VERSION = 2.6.1
+XENOMAI_VERSION = 2.6.2.1
 endif
 
 XENOMAI_SITE = http://download.gna.org/xenomai/stable/
@@ -18,10 +18,6 @@ XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYIN
 
 XENOMAI_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y)
-XENOMAI_CONF_OPT += --enable-smp
-endif
-
 XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
 
 ifeq ($(BR2_HAVE_DEVFILES),)

From 246d12b5b49c045b6c74ea18ebb53778692a7e3f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Apr 2013 11:47:46 -0300
Subject: [PATCH 4848/6849] busybox: move patches to new model

On commit 5538e4766201aa0c1c23721cfc99cbbde595964b the versioned package
patches changed the directory structure but the packages weren't fixed.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/{busybox-1.19.4 => 1.19.4}/busybox-1.19.4-udhcp.patch | 0
 .../{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-kernel_ver.patch    | 0
 .../busybox/{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-ntpd.patch  | 0
 .../busybox-1.20.2-pkg-config-selinux.patch                       | 0
 .../{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-sys-resource.patch  | 0
 .../busybox/{busybox-1.21.0 => 1.21.0}/busybox-1.21.0-mdev.patch  | 0
 .../{busybox-1.21.0 => 1.21.0}/busybox-1.21.0-platform.patch      | 0
 .../busybox/{busybox-1.21.0 => 1.21.0}/busybox-1.21.0-xz.patch    | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename package/busybox/{busybox-1.19.4 => 1.19.4}/busybox-1.19.4-udhcp.patch (100%)
 rename package/busybox/{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-kernel_ver.patch (100%)
 rename package/busybox/{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-ntpd.patch (100%)
 rename package/busybox/{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-pkg-config-selinux.patch (100%)
 rename package/busybox/{busybox-1.20.2 => 1.20.2}/busybox-1.20.2-sys-resource.patch (100%)
 rename package/busybox/{busybox-1.21.0 => 1.21.0}/busybox-1.21.0-mdev.patch (100%)
 rename package/busybox/{busybox-1.21.0 => 1.21.0}/busybox-1.21.0-platform.patch (100%)
 rename package/busybox/{busybox-1.21.0 => 1.21.0}/busybox-1.21.0-xz.patch (100%)

diff --git a/package/busybox/busybox-1.19.4/busybox-1.19.4-udhcp.patch b/package/busybox/1.19.4/busybox-1.19.4-udhcp.patch
similarity index 100%
rename from package/busybox/busybox-1.19.4/busybox-1.19.4-udhcp.patch
rename to package/busybox/1.19.4/busybox-1.19.4-udhcp.patch
diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
similarity index 100%
rename from package/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
rename to package/busybox/1.20.2/busybox-1.20.2-kernel_ver.patch
diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch b/package/busybox/1.20.2/busybox-1.20.2-ntpd.patch
similarity index 100%
rename from package/busybox/busybox-1.20.2/busybox-1.20.2-ntpd.patch
rename to package/busybox/1.20.2/busybox-1.20.2-ntpd.patch
diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-pkg-config-selinux.patch b/package/busybox/1.20.2/busybox-1.20.2-pkg-config-selinux.patch
similarity index 100%
rename from package/busybox/busybox-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
rename to package/busybox/1.20.2/busybox-1.20.2-pkg-config-selinux.patch
diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-sys-resource.patch b/package/busybox/1.20.2/busybox-1.20.2-sys-resource.patch
similarity index 100%
rename from package/busybox/busybox-1.20.2/busybox-1.20.2-sys-resource.patch
rename to package/busybox/1.20.2/busybox-1.20.2-sys-resource.patch
diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch b/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
similarity index 100%
rename from package/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch
rename to package/busybox/1.21.0/busybox-1.21.0-mdev.patch
diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch b/package/busybox/1.21.0/busybox-1.21.0-platform.patch
similarity index 100%
rename from package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch
rename to package/busybox/1.21.0/busybox-1.21.0-platform.patch
diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch b/package/busybox/1.21.0/busybox-1.21.0-xz.patch
similarity index 100%
rename from package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch
rename to package/busybox/1.21.0/busybox-1.21.0-xz.patch

From 61eea455be3ac10fa40099b811830673d18f546e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Apr 2013 11:47:47 -0300
Subject: [PATCH 4849/6849] binutils: move patches to new model

On commit 5538e4766201aa0c1c23721cfc99cbbde595964b the versioned package
patches changed the directory structure but the packages weren't fixed.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../binutils/{binutils-2.20.1 => 2.20.1}/110-arm-eabi-conf.patch  | 0
 package/binutils/{binutils-2.20.1 => 2.20.1}/120-sh-conf.patch    | 0
 .../{binutils-2.20.1 => 2.20.1}/300-001_ld_makefile_patch.patch   | 0
 .../300-012_check_ldrunpath_length.patch                          | 0
 .../binutils/{binutils-2.20.1 => 2.20.1}/400-arm_link_speed.patch | 0
 package/binutils/{binutils-2.20.1 => 2.20.1}/500-sysroot.patch    | 0
 .../binutils/{binutils-2.21.1 => 2.21.1}/110-arm-eabi-conf.patch  | 0
 package/binutils/{binutils-2.21.1 => 2.21.1}/120-sh-conf.patch    | 0
 .../{binutils-2.21.1 => 2.21.1}/300-001_ld_makefile_patch.patch   | 0
 .../300-012_check_ldrunpath_length.patch                          | 0
 package/binutils/{binutils-2.21.1 => 2.21.1}/500-sysroot.patch    | 0
 package/binutils/{binutils-2.21 => 2.21}/110-arm-eabi-conf.patch  | 0
 package/binutils/{binutils-2.21 => 2.21}/120-sh-conf.patch        | 0
 .../{binutils-2.21 => 2.21}/300-001_ld_makefile_patch.patch       | 0
 .../{binutils-2.21 => 2.21}/300-012_check_ldrunpath_length.patch  | 0
 package/binutils/{binutils-2.21 => 2.21}/500-sysroot.patch        | 0
 package/binutils/{binutils-2.22 => 2.22}/120-sh-conf.patch        | 0
 .../{binutils-2.22 => 2.22}/300-001_ld_makefile_patch.patch       | 0
 .../{binutils-2.22 => 2.22}/300-012_check_ldrunpath_length.patch  | 0
 package/binutils/{binutils-2.22 => 2.22}/500-sysroot.patch        | 0
 package/binutils/{binutils-2.22 => 2.22}/999-ppc-textrels.patch   | 0
 package/binutils/{binutils-2.23.1 => 2.23.1}/120-sh-conf.patch    | 0
 .../{binutils-2.23.1 => 2.23.1}/300-001_ld_makefile_patch.patch   | 0
 .../300-012_check_ldrunpath_length.patch                          | 0
 package/binutils/{binutils-2.23.1 => 2.23.1}/500-sysroot.patch    | 0
 package/binutils/{binutils-2.23.2 => 2.23.2}/120-sh-conf.patch    | 0
 .../{binutils-2.23.2 => 2.23.2}/300-001_ld_makefile_patch.patch   | 0
 .../300-012_check_ldrunpath_length.patch                          | 0
 package/binutils/{binutils-2.23.2 => 2.23.2}/500-sysroot.patch    | 0
 29 files changed, 0 insertions(+), 0 deletions(-)
 rename package/binutils/{binutils-2.20.1 => 2.20.1}/110-arm-eabi-conf.patch (100%)
 rename package/binutils/{binutils-2.20.1 => 2.20.1}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.20.1 => 2.20.1}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.20.1 => 2.20.1}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.20.1 => 2.20.1}/400-arm_link_speed.patch (100%)
 rename package/binutils/{binutils-2.20.1 => 2.20.1}/500-sysroot.patch (100%)
 rename package/binutils/{binutils-2.21.1 => 2.21.1}/110-arm-eabi-conf.patch (100%)
 rename package/binutils/{binutils-2.21.1 => 2.21.1}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.21.1 => 2.21.1}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.21.1 => 2.21.1}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.21.1 => 2.21.1}/500-sysroot.patch (100%)
 rename package/binutils/{binutils-2.21 => 2.21}/110-arm-eabi-conf.patch (100%)
 rename package/binutils/{binutils-2.21 => 2.21}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.21 => 2.21}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.21 => 2.21}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.21 => 2.21}/500-sysroot.patch (100%)
 rename package/binutils/{binutils-2.22 => 2.22}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.22 => 2.22}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.22 => 2.22}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.22 => 2.22}/500-sysroot.patch (100%)
 rename package/binutils/{binutils-2.22 => 2.22}/999-ppc-textrels.patch (100%)
 rename package/binutils/{binutils-2.23.1 => 2.23.1}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.23.1 => 2.23.1}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.23.1 => 2.23.1}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.23.1 => 2.23.1}/500-sysroot.patch (100%)
 rename package/binutils/{binutils-2.23.2 => 2.23.2}/120-sh-conf.patch (100%)
 rename package/binutils/{binutils-2.23.2 => 2.23.2}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{binutils-2.23.2 => 2.23.2}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{binutils-2.23.2 => 2.23.2}/500-sysroot.patch (100%)

diff --git a/package/binutils/binutils-2.20.1/110-arm-eabi-conf.patch b/package/binutils/2.20.1/110-arm-eabi-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
rename to package/binutils/2.20.1/110-arm-eabi-conf.patch
diff --git a/package/binutils/binutils-2.20.1/120-sh-conf.patch b/package/binutils/2.20.1/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.20.1/120-sh-conf.patch
rename to package/binutils/2.20.1/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.20.1/300-001_ld_makefile_patch.patch b/package/binutils/2.20.1/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.20.1/300-001_ld_makefile_patch.patch
rename to package/binutils/2.20.1/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.20.1/300-012_check_ldrunpath_length.patch b/package/binutils/2.20.1/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.20.1/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.20.1/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.20.1/400-arm_link_speed.patch b/package/binutils/2.20.1/400-arm_link_speed.patch
similarity index 100%
rename from package/binutils/binutils-2.20.1/400-arm_link_speed.patch
rename to package/binutils/2.20.1/400-arm_link_speed.patch
diff --git a/package/binutils/binutils-2.20.1/500-sysroot.patch b/package/binutils/2.20.1/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.20.1/500-sysroot.patch
rename to package/binutils/2.20.1/500-sysroot.patch
diff --git a/package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch b/package/binutils/2.21.1/110-arm-eabi-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch
rename to package/binutils/2.21.1/110-arm-eabi-conf.patch
diff --git a/package/binutils/binutils-2.21.1/120-sh-conf.patch b/package/binutils/2.21.1/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.21.1/120-sh-conf.patch
rename to package/binutils/2.21.1/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch b/package/binutils/2.21.1/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch
rename to package/binutils/2.21.1/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch b/package/binutils/2.21.1/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.21.1/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.21.1/500-sysroot.patch b/package/binutils/2.21.1/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.21.1/500-sysroot.patch
rename to package/binutils/2.21.1/500-sysroot.patch
diff --git a/package/binutils/binutils-2.21/110-arm-eabi-conf.patch b/package/binutils/2.21/110-arm-eabi-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.21/110-arm-eabi-conf.patch
rename to package/binutils/2.21/110-arm-eabi-conf.patch
diff --git a/package/binutils/binutils-2.21/120-sh-conf.patch b/package/binutils/2.21/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.21/120-sh-conf.patch
rename to package/binutils/2.21/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.21/300-001_ld_makefile_patch.patch b/package/binutils/2.21/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.21/300-001_ld_makefile_patch.patch
rename to package/binutils/2.21/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.21/300-012_check_ldrunpath_length.patch b/package/binutils/2.21/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.21/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.21/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.21/500-sysroot.patch b/package/binutils/2.21/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.21/500-sysroot.patch
rename to package/binutils/2.21/500-sysroot.patch
diff --git a/package/binutils/binutils-2.22/120-sh-conf.patch b/package/binutils/2.22/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.22/120-sh-conf.patch
rename to package/binutils/2.22/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.22/300-001_ld_makefile_patch.patch b/package/binutils/2.22/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.22/300-001_ld_makefile_patch.patch
rename to package/binutils/2.22/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.22/300-012_check_ldrunpath_length.patch b/package/binutils/2.22/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.22/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.22/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.22/500-sysroot.patch b/package/binutils/2.22/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.22/500-sysroot.patch
rename to package/binutils/2.22/500-sysroot.patch
diff --git a/package/binutils/binutils-2.22/999-ppc-textrels.patch b/package/binutils/2.22/999-ppc-textrels.patch
similarity index 100%
rename from package/binutils/binutils-2.22/999-ppc-textrels.patch
rename to package/binutils/2.22/999-ppc-textrels.patch
diff --git a/package/binutils/binutils-2.23.1/120-sh-conf.patch b/package/binutils/2.23.1/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.23.1/120-sh-conf.patch
rename to package/binutils/2.23.1/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.23.1/300-001_ld_makefile_patch.patch b/package/binutils/2.23.1/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.23.1/300-001_ld_makefile_patch.patch
rename to package/binutils/2.23.1/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.23.1/300-012_check_ldrunpath_length.patch b/package/binutils/2.23.1/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.23.1/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.23.1/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.23.1/500-sysroot.patch b/package/binutils/2.23.1/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.23.1/500-sysroot.patch
rename to package/binutils/2.23.1/500-sysroot.patch
diff --git a/package/binutils/binutils-2.23.2/120-sh-conf.patch b/package/binutils/2.23.2/120-sh-conf.patch
similarity index 100%
rename from package/binutils/binutils-2.23.2/120-sh-conf.patch
rename to package/binutils/2.23.2/120-sh-conf.patch
diff --git a/package/binutils/binutils-2.23.2/300-001_ld_makefile_patch.patch b/package/binutils/2.23.2/300-001_ld_makefile_patch.patch
similarity index 100%
rename from package/binutils/binutils-2.23.2/300-001_ld_makefile_patch.patch
rename to package/binutils/2.23.2/300-001_ld_makefile_patch.patch
diff --git a/package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch b/package/binutils/2.23.2/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.23.2/300-012_check_ldrunpath_length.patch
diff --git a/package/binutils/binutils-2.23.2/500-sysroot.patch b/package/binutils/2.23.2/500-sysroot.patch
similarity index 100%
rename from package/binutils/binutils-2.23.2/500-sysroot.patch
rename to package/binutils/2.23.2/500-sysroot.patch

From 6d9e24f3b4638ee78b9a6e2d045a29efcaa63c0f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 23 Apr 2013 09:02:27 +0200
Subject: [PATCH 4850/6849] haserl: move patches to new model

On commit 5538e4766201aa0c1c23721cfc99cbbde595964b the versioned package
patches changed the directory structure but the packages weren't fixed.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/{haserl-0.8.0 => 0.8.0}/haserl-0.8.0-legacy.patch  | 0
 .../haserl-0.9.29-add-haserl_lualib.inc.patch                     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/haserl/{haserl-0.8.0 => 0.8.0}/haserl-0.8.0-legacy.patch (100%)
 rename package/haserl/{haserl-0.9.29 => 0.9.29}/haserl-0.9.29-add-haserl_lualib.inc.patch (100%)

diff --git a/package/haserl/haserl-0.8.0/haserl-0.8.0-legacy.patch b/package/haserl/0.8.0/haserl-0.8.0-legacy.patch
similarity index 100%
rename from package/haserl/haserl-0.8.0/haserl-0.8.0-legacy.patch
rename to package/haserl/0.8.0/haserl-0.8.0-legacy.patch
diff --git a/package/haserl/haserl-0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch b/package/haserl/0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch
similarity index 100%
rename from package/haserl/haserl-0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch
rename to package/haserl/0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch

From adc231d6a15dd3d2cdc18190c9befaa655bba7ad Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 23 Apr 2013 09:04:47 +0200
Subject: [PATCH 4851/6849] wireless-regdb: strip empty line

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireless-regdb/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/wireless-regdb/Config.in b/package/wireless-regdb/Config.in
index 89a614713a..d9c7b8d2d1 100644
--- a/package/wireless-regdb/Config.in
+++ b/package/wireless-regdb/Config.in
@@ -7,4 +7,3 @@ config BR2_PACKAGE_WIRELESS_REGDB
 	  allowed radio frequencies for each local jurisdiction.
 
 	  http://linuxwireless.org/en/developers/Regulatory
-

From 85ffab574935ae07c090e05b5d720e1fb76569c7 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 23 Apr 2013 04:52:39 +0000
Subject: [PATCH 4852/6849] libserial: new package

Note that the Python binding is disabled; we can't build this in Buildroot
without the sipconfig Python module for the host.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libserial/Config.in                   | 11 ++++++++
 ...bserial-0001-disable-python-bindings.patch | 25 +++++++++++++++++++
 ...rial-0002-add-missing-header-include.patch | 15 +++++++++++
 package/libserial/libserial.mk                | 13 ++++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 package/libserial/Config.in
 create mode 100644 package/libserial/libserial-0001-disable-python-bindings.patch
 create mode 100644 package/libserial/libserial-0002-add-missing-header-include.patch
 create mode 100644 package/libserial/libserial.mk

diff --git a/package/Config.in b/package/Config.in
index 06bcdef462..ad070f4a80 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -464,6 +464,7 @@ source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libnfc/Config.in"
 source "package/libnfc-llcp/Config.in"
+source "package/libserial/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
diff --git a/package/libserial/Config.in b/package/libserial/Config.in
new file mode 100644
index 0000000000..f098e28781
--- /dev/null
+++ b/package/libserial/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBSERIAL
+	bool "libserial"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Simplified serial port programming in C++ under POSIX operating
+	  systems.
+
+	  http://libserial.sourceforge.net/
+
+comment "libserial requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libserial/libserial-0001-disable-python-bindings.patch b/package/libserial/libserial-0001-disable-python-bindings.patch
new file mode 100644
index 0000000000..54b5cb6cf1
--- /dev/null
+++ b/package/libserial/libserial-0001-disable-python-bindings.patch
@@ -0,0 +1,25 @@
+Disable build of Python bindings, which requires the sipconfig module.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2008-11-12 01:27:31.000000000 +0000
++++ b/Makefile.am	2013-04-16 09:41:13.476002178 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS=src doc examples sip
++SUBDIRS=src doc examples
+ 
+ EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
+ 
+diff -Nurp a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2008-11-12 01:28:14.000000000 +0000
++++ b/Makefile.in	2013-04-16 09:41:05.628013626 +0100
+@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src doc examples sip
++SUBDIRS = src doc examples
+ EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libserial.pc
diff --git a/package/libserial/libserial-0002-add-missing-header-include.patch b/package/libserial/libserial-0002-add-missing-header-include.patch
new file mode 100644
index 0000000000..a0226372b9
--- /dev/null
+++ b/package/libserial/libserial-0002-add-missing-header-include.patch
@@ -0,0 +1,15 @@
+Add a missing header include, to fix a build error.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/src/SerialPort.cpp b/src/SerialPort.cpp
+--- a/src/SerialPort.cpp	2008-11-12 01:27:30.000000000 +0000
++++ b/src/SerialPort.cpp	2013-04-23 15:43:41.537495852 +0100
+@@ -27,6 +27,7 @@
+ #include <cassert>
+ #include <termios.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <signal.h>
diff --git a/package/libserial/libserial.mk b/package/libserial/libserial.mk
new file mode 100644
index 0000000000..a835439075
--- /dev/null
+++ b/package/libserial/libserial.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# libserial
+#
+#############################################################
+
+LIBSERIAL_VERSION = 0.6.0rc1
+LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
+LIBSERIAL_INSTALL_STAGING = YES
+LIBSERIAL_LICENSE = GPLv2+
+LIBSERIAL_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 1cb4f40a097211687dd7ec0c48508c91b6d819c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 23 Apr 2013 04:13:18 +0000
Subject: [PATCH 4853/6849] busybox 1.21.0: update mdev patch

Update the mdev patch so that subsystem matching is reintroduced.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/1.21.0/busybox-1.21.0-mdev.patch  | 640 +++++++++++++++++-
 1 file changed, 624 insertions(+), 16 deletions(-)

diff --git a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch b/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
index cb873fafc1..8f6c8d80e2 100644
--- a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
+++ b/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
@@ -1,15 +1,429 @@
 --- busybox-1.21.0/util-linux/mdev.c
 +++ busybox-1.21.0-mdev/util-linux/mdev.c
-@@ -661,6 +661,8 @@ static void make_device(char *device_nam
+@@ -80,7 +80,7 @@
+ //usage:	IF_FEATURE_MDEV_CONF(
+ //usage:       "\n"
+ //usage:       "It uses /etc/mdev.conf with lines\n"
+-//usage:       "	[-]DEVNAME UID:GID PERM"
++//usage:       "	[-][ENV=regex;]...DEVNAME UID:GID PERM"
+ //usage:			IF_FEATURE_MDEV_RENAME(" [>|=PATH]|[!]")
+ //usage:			IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]")
+ //usage:       "\n"
+@@ -230,9 +230,34 @@
+  * SUBSYSTEM=block
+  */
+ 
+-static const char keywords[] ALIGN1 = "add\0remove\0change\0";
++#define DEBUG_LVL 2
++
++#if DEBUG_LVL >= 1
++# define dbg1(...) do { if (G.verbose) bb_error_msg(__VA_ARGS__); } while(0)
++#else
++# define dbg1(...) ((void)0)
++#endif
++#if DEBUG_LVL >= 2
++# define dbg2(...) do { if (G.verbose >= 2) bb_error_msg(__VA_ARGS__); } while(0)
++#else
++# define dbg2(...) ((void)0)
++#endif
++#if DEBUG_LVL >= 3
++# define dbg3(...) do { if (G.verbose >= 3) bb_error_msg(__VA_ARGS__); } while(0)
++#else
++# define dbg3(...) ((void)0)
++#endif
++
++
++static const char keywords[] ALIGN1 = "add\0remove\0"; // "change\0"
+ enum { OP_add, OP_remove };
+ 
++struct envmatch {
++	struct envmatch *next;
++	char *envname;
++	regex_t match;
++};
++
+ struct rule {
+ 	bool keep_matching;
+ 	bool regex_compiled;
+@@ -243,12 +268,14 @@ struct rule {
+ 	char *ren_mov;
+ 	IF_FEATURE_MDEV_EXEC(char *r_cmd;)
+ 	regex_t match;
++	struct envmatch *envmatch;
+ };
+ 
+ struct globals {
+ 	int root_major, root_minor;
+ 	smallint verbose;
+ 	char *subsystem;
++	char *subsys_env; /* for putenv("SUBSYSTEM=subsystem") */
+ #if ENABLE_FEATURE_MDEV_CONF
+ 	const char *filename;
+ 	parser_t *parser;
+@@ -256,6 +283,7 @@ struct globals {
+ 	unsigned rule_idx;
+ #endif
+ 	struct rule cur_rule;
++	char timestr[sizeof("60.123456")];
+ } FIX_ALIASING;
+ #define G (*(struct globals*)&bb_common_bufsiz1)
+ #define INIT_G() do { \
+@@ -270,13 +298,6 @@ struct globals {
+ /* We use additional 64+ bytes in make_device() */
+ #define SCRATCH_SIZE 80
+ 
+-#if 0
+-# define dbg(...) bb_error_msg(__VA_ARGS__)
+-#else
+-# define dbg(...) ((void)0)
+-#endif
+-
+-
+ #if ENABLE_FEATURE_MDEV_CONF
+ 
+ static void make_default_cur_rule(void)
+@@ -288,14 +309,65 @@ static void make_default_cur_rule(void)
+ 
+ static void clean_up_cur_rule(void)
+ {
++	struct envmatch *e;
++
+ 	free(G.cur_rule.envvar);
++	free(G.cur_rule.ren_mov);
+ 	if (G.cur_rule.regex_compiled)
+ 		regfree(&G.cur_rule.match);
+-	free(G.cur_rule.ren_mov);
+ 	IF_FEATURE_MDEV_EXEC(free(G.cur_rule.r_cmd);)
++	e = G.cur_rule.envmatch;
++	while (e) {
++		free(e->envname);
++		regfree(&e->match);
++		e = e->next;
++	}
+ 	make_default_cur_rule();
+ }
+ 
++/* In later versions, endofname is in libbb */
++#define endofname mdev_endofname
++static
++const char* FAST_FUNC
++endofname(const char *name)
++{
++#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
++#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
++	if (!is_name(*name))
++		return name;
++	while (*++name) {
++		if (!is_in_name(*name))
++			break;
++	}
++	return name;
++}
++
++static char *parse_envmatch_pfx(char *val)
++{
++	struct envmatch **nextp = &G.cur_rule.envmatch;
++
++	for (;;) {
++		struct envmatch *e;
++		char *semicolon;
++		char *eq = strchr(val, '=');
++		if (!eq /* || eq == val? */)
++			return val;
++		if (endofname(val) != eq)
++			return val;
++		semicolon = strchr(eq, ';');
++		if (!semicolon)
++			return val;
++		/* ENVVAR=regex;... */
++		*nextp = e = xzalloc(sizeof(*e));
++		nextp = &e->next;
++		e->envname = xstrndup(val, eq - val);
++		*semicolon = '\0';
++		xregcomp(&e->match, eq + 1, REG_EXTENDED);
++		*semicolon = ';';
++		val = semicolon + 1;
++	}
++}
++
+ static void parse_next_rule(void)
+ {
+ 	/* Note: on entry, G.cur_rule is set to default */
+@@ -308,12 +380,13 @@ static void parse_next_rule(void)
+ 			break;
+ 
+ 		/* Fields: [-]regex uid:gid mode [alias] [cmd] */
+-		dbg("token1:'%s'", tokens[1]);
++		dbg3("token1:'%s'", tokens[1]);
+ 
+ 		/* 1st field */
+ 		val = tokens[0];
+ 		G.cur_rule.keep_matching = ('-' == val[0]);
+ 		val += G.cur_rule.keep_matching; /* swallow leading dash */
++		val = parse_envmatch_pfx(val);
+ 		if (val[0] == '@') {
+ 			/* @major,minor[-minor2] */
+ 			/* (useful when name is ambiguous:
+@@ -328,8 +401,10 @@ static void parse_next_rule(void)
+ 			if (sc == 2)
+ 				G.cur_rule.min1 = G.cur_rule.min0;
+ 		} else {
++			char *eq = strchr(val, '=');
+ 			if (val[0] == '$') {
+-				char *eq = strchr(++val, '=');
++				/* $ENVVAR=regex ... */
++				val++;
+ 				if (!eq) {
+ 					bb_error_msg("bad $envvar=regex on line %d", G.parser->lineno);
+ 					goto next_rule;
+@@ -373,7 +448,7 @@ static void parse_next_rule(void)
+ 		clean_up_cur_rule();
+ 	} /* while (config_read) */
+ 
+-	dbg("config_close(G.parser)");
++	dbg3("config_close(G.parser)");
+ 	config_close(G.parser);
+ 	G.parser = NULL;
+ 
+@@ -390,7 +465,7 @@ static const struct rule *next_rule(void
+ 
+ 	/* Open conf file if we didn't do it yet */
+ 	if (!G.parser && G.filename) {
+-		dbg("config_open('%s')", G.filename);
++		dbg3("config_open('%s')", G.filename);
+ 		G.parser = config_open2(G.filename, fopen_for_read);
+ 		G.filename = NULL;
+ 	}
+@@ -399,7 +474,7 @@ static const struct rule *next_rule(void
+ 		/* mdev -s */
+ 		/* Do we have rule parsed already? */
+ 		if (G.rule_vec[G.rule_idx]) {
+-			dbg("< G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
++			dbg3("< G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
+ 			return G.rule_vec[G.rule_idx++];
+ 		}
+ 		make_default_cur_rule();
+@@ -416,13 +491,28 @@ static const struct rule *next_rule(void
+ 			rule = memcpy(xmalloc(sizeof(G.cur_rule)), &G.cur_rule, sizeof(G.cur_rule));
+ 			G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx);
+ 			G.rule_vec[G.rule_idx++] = rule;
+-			dbg("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
++			dbg3("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
+ 		}
+ 	}
+ 
+ 	return rule;
+ }
+ 
++static int env_matches(struct envmatch *e)
++{
++	while (e) {
++		int r;
++		char *val = getenv(e->envname);
++		if (!val)
++			return 0;
++		r = regexec(&e->match, val, /*size*/ 0, /*range[]*/ NULL, /*eflags*/ 0);
++		if (r != 0) /* no match */
++			return 0;
++		e = e->next;
++	}
++	return 1;
++}
++
+ #else
+ 
+ # define next_rule() (&G.cur_rule)
+@@ -479,9 +569,6 @@ static void make_device(char *device_nam
+ {
+ 	int major, minor, type, len;
+ 
+-	if (G.verbose)
+-		bb_error_msg("device: %s, %s", device_name, path);
+-
+ 	/* Try to read major/minor string.  Note that the kernel puts \n after
+ 	 * the data, so we don't need to worry about null terminating the string
+ 	 * because sscanf() will stop at the first nondigit, which \n is.
+@@ -500,8 +587,7 @@ static void make_device(char *device_nam
+ 			/* no "dev" file, but we can still run scripts
+ 			 * based on device name */
+ 		} else if (sscanf(++dev_maj_min, "%u:%u", &major, &minor) == 2) {
+-			if (G.verbose)
+-				bb_error_msg("maj,min: %u,%u", major, minor);
++			dbg1("dev %u,%u", major, minor);
+ 		} else {
+ 			major = -1;
+ 		}
+@@ -511,7 +597,8 @@ static void make_device(char *device_nam
+ 	/* Determine device name, type, major and minor */
+ 	if (!device_name)
+ 		device_name = (char*) bb_basename(path);
+-	/* http://kernel.org/doc/pending/hotplug.txt says that only
++	/*
++	 * http://kernel.org/doc/pending/hotplug.txt says that only
+ 	 * "/sys/block/..." is for block devices. "/sys/bus" etc is not.
+ 	 * But since 2.6.25 block devices are also in /sys/class/block.
+ 	 * We use strstr("/block/") to forestall future surprises.
+@@ -537,6 +624,8 @@ static void make_device(char *device_nam
+ 		rule = next_rule();
+ 
+ #if ENABLE_FEATURE_MDEV_CONF
++		if (!env_matches(rule->envmatch))
++			continue;
+ 		if (rule->maj >= 0) {  /* @maj,min rule */
+ 			if (major != rule->maj)
+ 				continue;
+@@ -547,7 +636,7 @@ static void make_device(char *device_nam
+ 		}
+ 		if (rule->envvar) { /* $envvar=regex rule */
+ 			str_to_match = getenv(rule->envvar);
+-			dbg("getenv('%s'):'%s'", rule->envvar, str_to_match);
++			dbg3("getenv('%s'):'%s'", rule->envvar, str_to_match);
+ 			if (!str_to_match)
+ 				continue;
+ 		}
+@@ -555,7 +644,7 @@ static void make_device(char *device_nam
+ 
+ 		if (rule->regex_compiled) {
+ 			int regex_match = regexec(&rule->match, str_to_match, ARRAY_SIZE(off), off, 0);
+-			dbg("regex_match for '%s':%d", str_to_match, regex_match);
++			dbg3("regex_match for '%s':%d", str_to_match, regex_match);
+ 			//bb_error_msg("matches:");
+ 			//for (int i = 0; i < ARRAY_SIZE(off); i++) {
+ 			//	if (off[i].rm_so < 0) continue;
+@@ -574,9 +663,8 @@ static void make_device(char *device_nam
+ 		}
+ 		/* else: it's final implicit "match-all" rule */
+  rule_matches:
++		dbg2("rule matched, line %d", G.parser ? G.parser->lineno : -1);
+ #endif
+-		dbg("rule matched");
+-
+ 		/* Build alias name */
+ 		alias = NULL;
+ 		if (ENABLE_FEATURE_MDEV_RENAME && rule->ren_mov) {
+@@ -619,34 +707,30 @@ static void make_device(char *device_nam
+ 				}
+ 			}
+ 		}
+-		dbg("alias:'%s'", alias);
++		dbg3("alias:'%s'", alias);
+ 
+ 		command = NULL;
+ 		IF_FEATURE_MDEV_EXEC(command = rule->r_cmd;)
+ 		if (command) {
+-			const char *s = "$@*";
+-			const char *s2 = strchr(s, command[0]);
+-
+ 			/* Are we running this command now?
+-			 * Run $cmd on delete, @cmd on create, *cmd on both
++			 * Run @cmd on create, $cmd on delete, *cmd on any
+ 			 */
+-			if (s2 - s != (operation == OP_remove) || *s2 == '*') {
+-				/* We are here if: '*',
+-				 * or: '@' and delete = 0,
+-				 * or: '$' and delete = 1
+-				 */
++			if ((command[0] == '@' && operation == OP_add)
++			 || (command[0] == '$' && operation == OP_remove)
++			 || (command[0] == '*')
++			) {
+ 				command++;
+ 			} else {
+ 				command = NULL;
+ 			}
+ 		}
+-		dbg("command:'%s'", command);
++		dbg3("command:'%s'", command);
+ 
+ 		/* "Execute" the line we found */
+ 		node_name = device_name;
+ 		if (ENABLE_FEATURE_MDEV_RENAME && alias) {
+ 			node_name = alias = build_alias(alias, device_name);
+-			dbg("alias2:'%s'", alias);
++			dbg3("alias2:'%s'", alias);
+ 		}
+ 
+ 		if (operation == OP_add && major >= 0) {
+@@ -656,8 +740,17 @@ static void make_device(char *device_nam
+ 				mkdir_recursive(node_name);
+ 				*slash = '/';
+ 			}
+-			if (G.verbose)
+-				bb_error_msg("mknod: %s (%d,%d) %o", node_name, major, minor, rule->mode | type);
++			if (ENABLE_FEATURE_MDEV_CONF) {
++				dbg1("mknod %s (%d,%d) %o"
++					" %u:%u",
++					node_name, major, minor, rule->mode | type,
++					rule->ugid.uid, rule->ugid.gid
++				);
++			} else {
++				dbg1("mknod %s (%d,%d) %o",
++					node_name, major, minor, rule->mode | type
++				);
++			}
  			if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
  				bb_perror_msg("can't create '%s'", node_name);
  			if (ENABLE_FEATURE_MDEV_CONF) {
-+				if (G.verbose)
-+					bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid);
- 				chmod(node_name, rule->mode);
- 				chown(node_name, rule->ugid.uid, rule->ugid.gid);
+@@ -671,8 +764,7 @@ static void make_device(char *device_nam
+ //TODO: on devtmpfs, device_name already exists and symlink() fails.
+ //End result is that instead of symlink, we have two nodes.
+ //What should be done?
+-					if (G.verbose)
+-						bb_error_msg("symlink: %s", device_name);
++					dbg1("symlink: %s", device_name);
+ 					symlink(node_name, device_name);
+ 				}
+ 			}
+@@ -681,27 +773,21 @@ static void make_device(char *device_nam
+ 		if (ENABLE_FEATURE_MDEV_EXEC && command) {
+ 			/* setenv will leak memory, use putenv/unsetenv/free */
+ 			char *s = xasprintf("%s=%s", "MDEV", node_name);
+-			char *s1 = xasprintf("%s=%s", "SUBSYSTEM", G.subsystem);
+ 			putenv(s);
+-			putenv(s1);
+-			if (G.verbose)
+-				bb_error_msg("running: %s", command);
++			dbg1("running: %s", command);
+ 			if (system(command) == -1)
+ 				bb_perror_msg("can't run '%s'", command);
+-			bb_unsetenv_and_free(s1);
+ 			bb_unsetenv_and_free(s);
+ 		}
+ 
+ 		if (operation == OP_remove && major >= -1) {
+ 			if (ENABLE_FEATURE_MDEV_RENAME && alias) {
+ 				if (aliaslink == '>') {
+-					if (G.verbose)
+-						bb_error_msg("unlink: %s", device_name);
++					dbg1("unlink: %s", device_name);
+ 					unlink(device_name);
+ 				}
  			}
-@@ -813,6 +815,7 @@ static void load_firmware(const char *fi
+-			if (G.verbose)
+-				bb_error_msg("unlink: %s", node_name);
++			dbg1("unlink: %s", node_name);
+ 			unlink(node_name);
+ 		}
+ 
+@@ -746,9 +832,16 @@ static int FAST_FUNC dirAction(const cha
+ 	 * under /sys/class/ */
+ 	if (1 == depth) {
+ 		free(G.subsystem);
++		if (G.subsys_env) {
++			bb_unsetenv_and_free(G.subsys_env);
++			G.subsys_env = NULL;
++		}
+ 		G.subsystem = strrchr(fileName, '/');
+-		if (G.subsystem)
++		if (G.subsystem) {
+ 			G.subsystem = xstrdup(G.subsystem + 1);
++			G.subsys_env = xasprintf("%s=%s", "SUBSYSTEM", G.subsystem);
++			putenv(G.subsys_env);
++		}
+ 	}
+ 
+ 	return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
+@@ -813,12 +906,107 @@ static void load_firmware(const char *fi
  		full_write(loading_fd, "-1", 2);
  
   out:
@@ -17,19 +431,213 @@
  	if (ENABLE_FEATURE_CLEAN_UP) {
  		close(firmware_fd);
  		close(loading_fd);
-@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 		}
+ 	}
+ }
+ 
++static char *curtime(void)
++{
++	struct timeval tv;
++	gettimeofday(&tv, NULL);
++	sprintf(G.timestr, "%u.%06u", (unsigned)tv.tv_sec % 60, (unsigned)tv.tv_usec);
++	return G.timestr;
++}
++
++static void open_mdev_log(const char *seq, unsigned my_pid)
++{
++	int logfd = open("mdev.log", O_WRONLY | O_APPEND);
++	if (logfd >= 0) {
++		xmove_fd(logfd, STDERR_FILENO);
++		G.verbose = 2;
++		applet_name = xasprintf("%s[%s]", applet_name, seq ? seq : utoa(my_pid));
++	}
++}
++
++/* If it exists, does /dev/mdev.seq match $SEQNUM?
++ * If it does not match, earlier mdev is running
++ * in parallel, and we need to wait.
++ * Active mdev pokes us with SIGCHLD to check the new file.
++ */
++static int
++wait_for_seqfile(const char *seq)
++{
++	/* We time out after 2 sec */
++	static const struct timespec ts = { 0, 32*1000*1000 };
++	int timeout = 2000 / 32;
++	int seq_fd = -1;
++	int do_once = 1;
++	sigset_t set_CHLD;
++
++	sigemptyset(&set_CHLD);
++	sigaddset(&set_CHLD, SIGCHLD);
++	sigprocmask(SIG_BLOCK, &set_CHLD, NULL);
++
++	for (;;) {
++		int seqlen;
++		char seqbuf[sizeof(int)*3 + 2];
++
++		if (seq_fd < 0) {
++			seq_fd = open("mdev.seq", O_RDWR);
++			if (seq_fd < 0)
++				break;
++		}
++		seqlen = pread(seq_fd, seqbuf, sizeof(seqbuf) - 1, 0);
++		if (seqlen < 0) {
++			close(seq_fd);
++			seq_fd = -1;
++			break;
++		}
++		seqbuf[seqlen] = '\0';
++		if (seqbuf[0] == '\n') {
++			/* seed file: write out seq ASAP */
++			xwrite_str(seq_fd, seq);
++			xlseek(seq_fd, 0, SEEK_SET);
++			dbg2("first seq written");
++			break;
++		}
++		if (strcmp(seq, seqbuf) == 0) {
++			/* correct idx */
++			break;
++		}
++		if (do_once) {
++			dbg2("%s waiting for '%s'", curtime(), seqbuf);
++			do_once = 0;
++		}
++		if (sigtimedwait(&set_CHLD, NULL, &ts) >= 0) {
++			dbg3("woken up");
++			continue; /* don't decrement timeout! */
++		}
++		if (--timeout == 0) {
++			dbg1("%s waiting for '%s'", "timed out", seqbuf);
++			break;
++		}
++	}
++	sigprocmask(SIG_UNBLOCK, &set_CHLD, NULL);
++	return seq_fd;
++}
++
++static void signal_mdevs(unsigned my_pid)
++{
++	procps_status_t* p = NULL;
++	while ((p = procps_scan(p, PSSCAN_ARGV0)) != NULL) {
++		if (p->pid != my_pid
++		 && p->argv0
++		 && strcmp(bb_basename(p->argv0), "mdev") == 0
++		) {
++			kill(p->pid, SIGCHLD);
++		}
++	}
++}
++
+ int mdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int mdev_main(int argc UNUSED_PARAM, char **argv)
+ {
+@@ -840,8 +1028,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 	xchdir("/dev");
+ 
+ 	if (argv[1] && strcmp(argv[1], "-s") == 0) {
+-		/* Scan:
+-		 * mdev -s
++		/*
++		 * Scan: mdev -s
+ 		 */
+ 		struct stat st;
+ 
+@@ -853,6 +1041,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 		G.root_major = major(st.st_dev);
+ 		G.root_minor = minor(st.st_dev);
  
- 		{
++		putenv((char*)"ACTION=add");
++
+ 		/* ACTION_FOLLOWLINKS is needed since in newer kernels
+ 		 * /sys/block/loop* (for example) are symlinks to dirs,
+ 		 * not real directories.
+@@ -878,11 +1068,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 		char *action;
+ 		char *env_devname;
+ 		char *env_devpath;
++		unsigned my_pid;
++		int seq_fd;
+ 		smalluint op;
+ 
+ 		/* Hotplug:
+ 		 * env ACTION=... DEVPATH=... SUBSYSTEM=... [SEQNUM=...] mdev
+-		 * ACTION can be "add" or "remove"
++		 * ACTION can be "add", "remove", "change"
+ 		 * DEVPATH is like "/block/sda" or "/class/input/mice"
+ 		 */
+ 		action = getenv("ACTION");
+@@ -893,39 +1085,20 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 		if (!action || !env_devpath /*|| !G.subsystem*/)
+ 			bb_show_usage();
+ 		fw = getenv("FIRMWARE");
+-		/* If it exists, does /dev/mdev.seq match $SEQNUM?
+-		 * If it does not match, earlier mdev is running
+-		 * in parallel, and we need to wait */
+ 		seq = getenv("SEQNUM");
+-		if (seq) {
+-			int timeout = 2000 / 32; /* 2000 msec */
+-			do {
+-				int seqlen;
+-				char seqbuf[sizeof(int)*3 + 2];
+-
+-				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
+-				if (seqlen < 0) {
+-					seq = NULL;
+-					break;
+-				}
+-				seqbuf[seqlen] = '\0';
+-				if (seqbuf[0] == '\n' /* seed file? */
+-				 || strcmp(seq, seqbuf) == 0 /* correct idx? */
+-				) {
+-					break;
+-				}
+-				usleep(32*1000);
+-			} while (--timeout);
+-		}
+ 
+-		{
 -			int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND);
-+			int logfd = open("mdev.log", O_WRONLY | O_APPEND);
- 			if (logfd >= 0) {
- 				xmove_fd(logfd, STDERR_FILENO);
- 				G.verbose = 1;
+-			if (logfd >= 0) {
+-				xmove_fd(logfd, STDERR_FILENO);
+-				G.verbose = 1;
 -				bb_error_msg("seq: %s action: %s", seq, action);
-+				if (seq)
-+					applet_name = xasprintf("%s[%s]", applet_name, seq);
-+				bb_error_msg("action: %s", action);
+-			}
+-		}
++		my_pid = getpid();
++		open_mdev_log(seq, my_pid);
++
++		seq_fd = seq ? wait_for_seqfile(seq) : -1;
++
++		dbg1("%s "
++			"ACTION:%s SUBSYSTEM:%s DEVNAME:%s DEVPATH:%s"
++			"%s%s",
++			curtime(),
++			action, G.subsystem, env_devname, env_devpath,
++			fw ? " FW:" : "", fw ? fw : ""
++		);
+ 
+ 		snprintf(temp, PATH_MAX, "/sys%s", env_devpath);
+ 		if (op == OP_remove) {
+@@ -935,16 +1108,18 @@ int mdev_main(int argc UNUSED_PARAM, cha
+ 			if (!fw)
+ 				make_device(env_devname, temp, op);
+ 		}
+-		else if (op == OP_add) {
++		else {
+ 			make_device(env_devname, temp, op);
+ 			if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
+-				if (fw)
++				if (op == OP_add && fw)
+ 					load_firmware(fw, temp);
  			}
  		}
  
+-		if (seq) {
+-			xopen_xwrite_close("mdev.seq", utoa(xatou(seq) + 1));
++		dbg1("%s exiting", curtime());
++		if (seq_fd >= 0) {
++			xwrite_str(seq_fd, utoa(xatou(seq) + 1));
++			signal_mdevs(my_pid);
+ 		}
+ 	}
+ 

From e5dfb4de46d2855c6c02bc55a670b783789db28f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 23 Apr 2013 06:52:49 +0000
Subject: [PATCH 4854/6849] libgcrypt: bump to version 1.5.2

Also work around a build failure for ARM thumb mode which was also
present in the previous versions.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgcrypt/libgcrypt.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index b7c27424e4..6a3bc7c087 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBGCRYPT_VERSION = 1.5.0
+LIBGCRYPT_VERSION = 1.5.2
 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
 LIBGCRYPT_LICENSE = LGPLv2.1+
 LIBGCRYPT_LICENSE_FILES = COPYING.LIB
@@ -19,6 +19,11 @@ LIBGCRYPT_CONF_OPT = \
 	--disable-optimization \
 	--with-gpg-error-prefix=$(STAGING_DIR)/usr
 
+# Code doesn't build in thumb mode
+ifeq ($(BR2_arm),y)
+	LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))"
+endif
+
 # Tests use fork()
 define LIBGCRYPT_DISABLE_TESTS
 	$(SED) 's/ tests//' $(@D)/Makefile.in

From 28431c2c0ee33dd192933954ca2e667624882503 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 23 Apr 2013 08:59:02 +0000
Subject: [PATCH 4855/6849] wireless-regdb: bump to version 2013.02.13 and
 style fixes

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireless-regdb/wireless-regdb.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
index b4e038c6b3..2d5b86a2a5 100644
--- a/package/wireless-regdb/wireless-regdb.mk
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -4,15 +4,17 @@
 #
 #############################################################
 
-WIRELESS_REGDB_VERSION = 2013.01.11
+WIRELESS_REGDB_VERSION = 2013.02.13
 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.bz2
 WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
 WIRELESS_REGDB_LICENSE_FILES = LICENSE
 
 define WIRELESS_REGDB_INSTALL_TARGET_CMDS
-    install -m 644 -D -T $(@D)/regulatory.bin $(TARGET_DIR)/usr/lib/crda/regulatory.bin
-    install -m 644 -D -T $(@D)/linville.key.pub.pem $(TARGET_DIR)/etc/wireless-regdb/pubkeys/linville.key.pub.pem
+	$(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \
+		$(TARGET_DIR)/usr/lib/crda/regulatory.bin
+	$(INSTALL) -m 644 -D -T $(@D)/linville.key.pub.pem \
+		$(TARGET_DIR)/etc/wireless-regdb/pubkeys/linville.key.pub.pem
 endef
 
 $(eval $(generic-package))

From e2a547fc53fe6c345d873ba19d9975d96b3ef484 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 14 Apr 2013 10:33:01 +0000
Subject: [PATCH 4856/6849] zyre: new package

[Peter: add comment about toolchain dependencies, fix license]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/zyre/Config.in | 17 +++++++++++++++++
 package/zyre/zyre.mk   | 22 ++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 package/zyre/Config.in
 create mode 100644 package/zyre/zyre.mk

diff --git a/package/Config.in b/package/Config.in
index ad070f4a80..f1a3cc570e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -547,6 +547,7 @@ source "package/slirp/Config.in"
 source "package/usbredir/Config.in"
 source "package/zeromq/Config.in"
 source "package/zmqpp/Config.in"
+source "package/zyre/Config.in"
 endmenu
 
 menu "Other"
diff --git a/package/zyre/Config.in b/package/zyre/Config.in
new file mode 100644
index 0000000000..f181ac85cd
--- /dev/null
+++ b/package/zyre/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_ZYRE
+	bool "zyre"
+	depends on BR2_INSTALL_LIBSTDCPP # filemq
+	depends on BR2_INET_IPV6 # filemq
+	depends on BR2_LARGEFILE # filemq
+	depends on BR2_USE_WCHAR # filemq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # filemq
+	select BR2_PACKAGE_FILEMQ
+	help
+	  An open-source framework for proximity-based peer-to-peer
+	  applications.
+
+	  http://zyre.org
+
+comment "zyre requires a toolchain with C++, IPv6, LARGEFILE, WCHAR & thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk
new file mode 100644
index 0000000000..5b4fadb00c
--- /dev/null
+++ b/package/zyre/zyre.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# zyre
+#
+#############################################################
+
+ZYRE_VERSION = 44a57a449a
+ZYRE_SITE = git://github.com/zeromq/zyre.git
+ZYRE_LICENSE = LGPLv3+
+ZYRE_LICENSE_FILES = COPYING COPYING.LESSER
+ZYRE_INSTALL_STAGING = YES
+ZYRE_DEPENDENCIES = filemq
+ZYRE_AUTORECONF = YES
+ZYRE_AUTORECONF_OPT = --install --force --verbose
+
+define ZYRE_CREATE_CONFIG_DIR
+	mkdir -p $(@D)/config
+endef
+
+ZYRE_POST_PATCH_HOOKS += ZYRE_CREATE_CONFIG_DIR
+
+$(eval $(autotools-package))

From f5d6eee6d0e319715ae2cbf07e0fc4b116ed32a2 Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Tue, 16 Apr 2013 10:48:04 +0000
Subject: [PATCH 4857/6849] poppler: new package

Poppler is a PDF rendering library based on the xpdf-3.0 code base.

[Peter: Fix license, comment text and drop explicit library options]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/poppler/Config.in  | 13 ++++++++
 package/poppler/poppler.mk | 63 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 package/poppler/Config.in
 create mode 100644 package/poppler/poppler.mk

diff --git a/package/Config.in b/package/Config.in
index f1a3cc570e..ab514c7e48 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -445,6 +445,7 @@ source "package/opencv/Config.in"
 source "package/opengl/Config.in"
 source "package/pango/Config.in"
 source "package/pixman/Config.in"
+source "package/poppler/Config.in"
 source "package/tiff/Config.in"
 source "package/webkit/Config.in"
 source "package/zxing/Config.in"
diff --git a/package/poppler/Config.in b/package/poppler/Config.in
new file mode 100644
index 0000000000..6a9e1fd86a
--- /dev/null
+++ b/package/poppler/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_POPPLER
+	bool "poppler"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+	help
+	   Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+
+	   http://poppler.freedesktop.org/
+
+comment "poppler requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
new file mode 100644
index 0000000000..1ce7d1ed0c
--- /dev/null
+++ b/package/poppler/poppler.mk
@@ -0,0 +1,63 @@
+#############################################################
+#
+# poppler
+#
+#############################################################
+
+POPPLER_VERSION = 0.22.3
+POPPLER_SITE = http://poppler.freedesktop.org
+POPPLER_DEPENDENCIES = fontconfig
+POPPLER_LICENSE = GPLv2+
+POPPLER_LICENSE_FILES = COPYING
+POPPLER_CONF_OPT = --with-font-configuration=fontconfig
+
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+	POPPLER_CONF_OPT += --enable-cms=lcms2
+	POPPLER_DEPENDENCIES += lcms2
+else
+	POPPLER_CONF_OPT += --enable-cms=none
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+	POPPLER_CONF_OPT += --enable-libtiff
+	POPPLER_DEPENDENCIES += tiff
+else
+	POPPLER_CONF_OPT += --disable-libtiff
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+	POPPLER_CONF_OPT += --enable-libjpeg
+	POPPLER_DEPENDENCIES += jpeg
+else
+	POPPLER_CONF_OPT += --disable-libjpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+	POPPLER_CONF_OPT += --enable-libpng
+	POPPLER_DEPENDENCIES += libpng
+else
+	POPPLER_CONF_OPT += --disable-libpng
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+	POPPLER_CONF_OPT += --enable-zlib
+	POPPLER_DEPENDENCIES += zlib
+else
+	POPPLER_CONF_OPT += --disable-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_POPPLER_LIBCURL),y)
+	POPPLER_CONF_OPT += --enable-libcurl
+	POPPLER_DEPENDENCIES += libcurl
+else
+	POPPLER_CONF_OPT += --disable-libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_XORG7),y)
+	POPPLER_CONF_OPT += --with-x
+	POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext
+else
+	POPPLER_CONF_OPT += --without-x
+endif
+
+$(eval $(autotools-package))

From d8f0d32b7355213ff9753d2e3909d4610abf45f7 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Sun, 14 Apr 2013 23:09:51 +0000
Subject: [PATCH 4858/6849] crosstool-ng: bump to version 1.18.0

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rosstool-ng-001-fix-showtuple-stdout.patch | 35 -------------------
 package/crosstool-ng/crosstool-ng.mk          |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch

diff --git a/package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch b/package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch
deleted file mode 100644
index 416ef76da4..0000000000
--- a/package/crosstool-ng/crosstool-ng-001-fix-showtuple-stdout.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-changeset:   3141:d8bd17248789
-tag:         tip
-user:        "Yann E. MORIN" <yann.morin.1998@free.fr>
-date:        Sun Jan 06 12:08:33 2013 +0100
-files:       scripts/showTuple.sh.in
-description:
-scripts/showTuple: fix stdout
-
-Since we've had the debug shell feature, fd #7 is now used to
-redirect stderr, while it was previously unused.
-
-Use fd #9 to redirect stdout.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-
-diff --git a/scripts/showTuple.sh.in b/scripts/showTuple.sh.in
---- a/scripts/showTuple.sh.in
-+++ b/scripts/showTuple.sh.in
-@@ -7,7 +7,7 @@
- . "${CT_LIB_DIR}/paths.sh"
- 
- # We'll need the stdout later, save it
--exec 7>&1
-+exec 9>&1
- 
- # Parse the common functions
- . "${CT_LIB_DIR}/scripts/functions"
-@@ -27,4 +27,4 @@
- CT_DoBuildTargetTuple
- 
- # All this for this single echo... :-( Sigh, I'll have to re-arrange things...
--echo "${CT_TARGET}" >&7
-+echo "${CT_TARGET}" >&9
-
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 2d93f90f80..b5333969a8 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.17.0
+CROSSTOOL_NG_VERSION           = 1.18.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO

From 3510d8b4af396106e315e21440bc63c2cdf534b1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Apr 2013 09:14:53 +0200
Subject: [PATCH 4859/6849] u-boot: add 2013.04, deprecate 2011.12 / 2012.04,
 drop 2011.06 / 2011.09

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index d377fd1986..2e95f7622d 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -14,10 +14,13 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2013_01
+	default BR2_TARGET_UBOOT_2013_04
 	help
 	  Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2013_04
+	bool "2013.04"
+
 config BR2_TARGET_UBOOT_2013_01
 	bool "2013.01.01"
 
@@ -29,16 +32,10 @@ config BR2_TARGET_UBOOT_2012_07
 
 config BR2_TARGET_UBOOT_2012_04
 	bool "2012.04.01"
+	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_2011_12
 	bool "2011.12"
-
-config BR2_TARGET_UBOOT_2011_09
-	bool "2011.09"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2011_06
-	bool "2011.06"
 	depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -58,13 +55,12 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
+	default "2013.04"	if BR2_TARGET_UBOOT_2013_04
 	default "2013.01.01"	if BR2_TARGET_UBOOT_2013_01
 	default "2012.10"	if BR2_TARGET_UBOOT_2012_10
 	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
 	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
-	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
-	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 

From 97af5c59e3f22e7d6f913e535b773d0080a6cfb0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Apr 2013 09:16:50 +0200
Subject: [PATCH 4860/6849] uboot-tools: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uboot-tools/uboot-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index f03ff91475..410af1e7ce 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -3,7 +3,7 @@
 # uboot-tools
 #
 #############################################################
-UBOOT_TOOLS_VERSION = 2013.01.01
+UBOOT_TOOLS_VERSION = 2013.04
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+

From 53b2e94e2fbcf13ae4ff0d549a44bda3de6b0ab2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 24 Apr 2013 09:19:19 +0200
Subject: [PATCH 4861/6849] beaglebone_defconfig: use u-boot 2013.04, add
 comments

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/beaglebone_defconfig | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index e19cdcbc4d..8eeed77dce 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -1,22 +1,32 @@
+# architecture
 BR2_arm=y
 BR2_cortex_a8=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-fpu=vfpv3 --with-float=hard"
 # BR2_SOFT_FLOAT is not set
+
+# system
 BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+
+# filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
-# Lock down headers to avoid breaking with new defaults
+
+# lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.2.9"
+
+# bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
-BR2_TARGET_UBOOT_2012_10=y
+BR2_TARGET_UBOOT_2013_04=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
+
+# kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/koenkooi/linux.git"

From 1d8c988bc94f94a0a4e296f1520396735d928fc1 Mon Sep 17 00:00:00 2001
From: nmenegale <nicolas.menegale@openwide.fr>
Date: Wed, 24 Apr 2013 05:11:22 +0000
Subject: [PATCH 4862/6849] glibmm: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: fixup white space]
Signed-off-by: Nicolas Ménégale  <nicolas.menegale@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/glibmm/Config.in | 13 +++++++++++++
 package/glibmm/glibmm.mk | 17 +++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/glibmm/Config.in
 create mode 100644 package/glibmm/glibmm.mk

diff --git a/package/Config.in b/package/Config.in
index ab514c7e48..ca947d9f5a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -561,6 +561,7 @@ source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
 source "package/boost/Config.in"
+source "package/glibmm/Config.in"
 source "package/gmp/Config.in"
 source "package/gsl/Config.in"
 source "package/gtest/Config.in"
diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in
new file mode 100644
index 0000000000..cd4ac01fa1
--- /dev/null
+++ b/package/glibmm/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_GLIBMM
+	bool "glibmm"
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBSIGC
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	help
+	  The GLibmm package is a set of C++ bindings for GLib.
+
+	  http://www.gtkmm.org/
+
+comment "glibmm requires a toolchain with C++ & WCHAR support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
new file mode 100644
index 0000000000..abd8b6cebd
--- /dev/null
+++ b/package/glibmm/glibmm.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# Glibmm
+#
+#############################################################
+
+GLIBMM_VERSION_MAJOR = 2.30
+GLIBMM_VERSION_MINOR = 1
+GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).$(GLIBMM_VERSION_MINOR)
+GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+GLIBMM_LICENSE_FILES = COPYING COPYING.tools
+GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz
+GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR)
+GLIBMM_INSTALL_STAGING = YES
+GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf
+
+$(eval $(autotools-package))

From 536ac0f7aaaef63e4c749219125fd1eeed5e76ab Mon Sep 17 00:00:00 2001
From: nmenegale <nicolas.menegale@openwide.fr>
Date: Wed, 24 Apr 2013 05:11:23 +0000
Subject: [PATCH 4863/6849] libxml++: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

libxml++ is a C++ wrapper for libxml2.

[Peter: misc Config.in fixes]
Signed-off-by: Nicolas Ménégale <nicolas.menegale@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libxmlpp/Config.in   | 13 +++++++++++++
 package/libxmlpp/libxmlpp.mk | 17 +++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/libxmlpp/Config.in
 create mode 100644 package/libxmlpp/libxmlpp.mk

diff --git a/package/Config.in b/package/Config.in
index ca947d9f5a..ede0ba0e5a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -623,6 +623,7 @@ source "package/json-glib/Config.in"
 source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
+source "package/libxmlpp/Config.in"
 source "package/libxslt/Config.in"
 source "package/libyaml/Config.in"
 source "package/mxml/Config.in"
diff --git a/package/libxmlpp/Config.in b/package/libxmlpp/Config.in
new file mode 100644
index 0000000000..cf29c2c5c4
--- /dev/null
+++ b/package/libxmlpp/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBXMLPP
+	bool "libxml++"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_GLIBMM
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	help
+	  libxml++ is a C++ wrapper for the libxml XML parser library.
+
+	  http://libxmlplusplus.sourceforge.net/
+
+comment "libxml++ requires a toolchain with C++ & WCHAR support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk
new file mode 100644
index 0000000000..1ed60de74a
--- /dev/null
+++ b/package/libxmlpp/libxmlpp.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# LibXML++
+#
+#############################################################
+
+LIBXMLPP_VERSION_MAJOR = 2.34
+LIBXMLPP_VERSION_MINOR = 2
+LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).$(LIBXMLPP_VERSION_MINOR)
+LIBXMLPP_LICENSE = LGPLv2.1 (library), LGPLv2+ (examples)
+LIBXMLPP_LICENSE_FILE = COPYING
+LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz
+LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR)
+LIBXMLPP_INSTALL_STAGING = YES
+LIBXMLPP_DEPENDENCIES = libxml2 glibmm host-pkgconf
+
+$(eval $(autotools-package))

From 1b9b168562be3466cea2a2e31691c51223a7f88a Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 8 Apr 2013 06:50:14 +0000
Subject: [PATCH 4864/6849] post-build: show each script filename before
 execution

This also simplifies code by removing the ifneq/endif clauses.

[Peter: drop extra space]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0a91658db1..e825bcdfaa 100644
--- a/Makefile
+++ b/Makefile
@@ -509,11 +509,9 @@ endif
 			$${dir}/ $(TARGET_DIR); \
 	done
 
-ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
-	@$(call MESSAGE,"Executing post-build script\(s\)")
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
+		$(call MESSAGE,"Executing post-build script $(s)"); \
 		$(s) $(TARGET_DIR)$(sep))
-endif
 
 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge

From 6d90a69f6c58caff17c1de2f000b65f9bc5a9077 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 8 Apr 2013 06:50:15 +0000
Subject: [PATCH 4865/6849] post-image: show each script filename before
 execution

This also simplifies code by removing the ifneq/endif clauses.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e825bcdfaa..840aa1fe9f 100644
--- a/Makefile
+++ b/Makefile
@@ -555,11 +555,9 @@ target-generatelocales: host-localedef
 endif
 
 target-post-image:
-ifneq ($(BR2_ROOTFS_POST_IMAGE_SCRIPT),"")
-	@$(call MESSAGE,"Executing post-image script\(s\)")
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
+		$(call MESSAGE,"Executing post-image script $(s)"); \
 		$(s) $(BINARIES_DIR)$(sep))
-endif
 
 toolchain-eclipse-register:
 	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)

From 60888bbebd624e2582ff0cda62c9c97f74d9d974 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 01:03:41 +0000
Subject: [PATCH 4866/6849] lzop: add LZOP definition for the host variant

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lzop/lzop.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 1f7c835227..9803b3931f 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -3,6 +3,7 @@
 # lzop
 #
 #############################################################
+
 LZOP_VERSION = 1.03
 LZOP_SOURCE = lzop-$(LZOP_VERSION).tar.gz
 LZOP_SITE = http://www.lzop.org/download/
@@ -12,3 +13,5 @@ LZOP_DEPENDENCIES = lzo
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
+
+LZOP = $(HOST_DIR)/usr/bin/lzop

From 5b935275ec540400b417bd28649e510b4358416a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 01:03:42 +0000
Subject: [PATCH 4867/6849] xz: add XZ definition for the host variant

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xz/xz.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 8ff3c83d5f..877c6313f5 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -14,3 +14,5 @@ XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
+
+XZ = $(HOST_DIR)/usr/bin/xz

From 5419651bfa38355b2b2015868811197ef18577d0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Jan 2013 01:03:43 +0000
Subject: [PATCH 4868/6849] fs/common: add support for LZO and XZ compression
 methods

Add support for LZO and XZ compression methods to cpio, ext2, tar and
ubifs filesystem targets.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/common.mk       |  8 +++++++-
 fs/cpio/Config.in  | 18 ++++++++++++++----
 fs/ext2/Config.in  | 10 ++++++++++
 fs/tar/Config.in   | 18 ++++++++++++++----
 fs/ubifs/Config.in | 10 ++++++++++
 5 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index a0b7b3909c..c6f67d831d 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -39,7 +39,7 @@ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
 define ROOTFS_TARGET_INTERNAL
 
 # extra deps
-ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma) $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZO),host-lzop) $$(if $$(BR2_TARGET_ROOTFS_$(2)_XZ),host-xz)
 
 $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
 	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
@@ -70,6 +70,12 @@ endif
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
 	$$(LZMA) -9 -c $$@ > $$@.lzma
 endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZO),y)
+	$$(LZOP) -9 -c $$@ > $$@.lzo
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y)
+	$(XZ) -9 -C crc32 -c $$@ > $$@.xz
+endif
 
 rootfs-$(1)-show-depends:
 	@echo $$(ROOTFS_$(2)_DEPENDENCIES)
diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in
index 0669a44e17..87dde6414d 100644
--- a/fs/cpio/Config.in
+++ b/fs/cpio/Config.in
@@ -18,22 +18,32 @@ choice
 config BR2_TARGET_ROOTFS_CPIO_NONE
         bool "no compression"
         help
-         Do not compress the cpio filesystem.
+          Do not compress the cpio filesystem.
 
 config BR2_TARGET_ROOTFS_CPIO_GZIP
         bool "gzip"
         help
-         Do compress the cpio filesystem with gzip.
+          Do compress the cpio filesystem with gzip.
 
 config BR2_TARGET_ROOTFS_CPIO_BZIP2
         bool "bzip2"
         help
-         Do compress the cpio filesystem with bzip2.
+          Do compress the cpio filesystem with bzip2.
 
 config BR2_TARGET_ROOTFS_CPIO_LZMA
         bool "lzma"
         help
-         Do compress the cpio filesystem with lzma.
+          Do compress the cpio filesystem with lzma.
+
+config BR2_TARGET_ROOTFS_CPIO_LZO
+	bool "lzo"
+	help
+	  Do compress the cpio filesystem with lzop.
+
+config BR2_TARGET_ROOTFS_CPIO_XZ
+	bool "xz"
+	help
+	  Do compress the cpio filesystem with xz.
 
 endchoice
 
diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index 097242ef70..e75ef54b3a 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -79,6 +79,16 @@ config BR2_TARGET_ROOTFS_EXT2_LZMA
 	help
 	  Do compress the ext2/3/4 filesystem with lzma.
 
+config BR2_TARGET_ROOTFS_EXT2_LZO
+	bool "lzo"
+	help
+	  Do compress the ext2 filesystem with lzop.
+
+config BR2_TARGET_ROOTFS_EXT2_XZ
+	bool "xz"
+	help
+	  Do compress the ext2 filesystem with xz.
+
 endchoice
 
 endif # BR2_TARGET_ROOTFS_EXT2
diff --git a/fs/tar/Config.in b/fs/tar/Config.in
index 60b8bf434d..63663ecd6f 100644
--- a/fs/tar/Config.in
+++ b/fs/tar/Config.in
@@ -14,22 +14,32 @@ choice
 config BR2_TARGET_ROOTFS_TAR_NONE
 	bool "no compression"
 	help
-	 Do not compress the tarball.
+	  Do not compress the tarball.
 
 config BR2_TARGET_ROOTFS_TAR_GZIP
 	bool "gzip"
 	help
-	 Do compress the tarball with gzip.
+	  Do compress the tarball with gzip.
 
 config BR2_TARGET_ROOTFS_TAR_BZIP2
 	bool "bzip2"
 	help
-	 Do compress the tarball with bzip2.
+	  Do compress the tarball with bzip2.
 
 config BR2_TARGET_ROOTFS_TAR_LZMA
 	bool "lzma"
 	help
-	 Do compress the tarball with lzma.
+	  Do compress the tarball with lzma.
+
+config BR2_TARGET_ROOTFS_TAR_LZO
+	bool "lzo"
+	help
+	  Do compress the tarball with lzop.
+
+config BR2_TARGET_ROOTFS_TAR_XZ
+	bool "xz"
+	help
+	  Do compress the tarball with xz.
 
 endchoice
 
diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
index a5ef5f2b29..0a798d861f 100644
--- a/fs/ubifs/Config.in
+++ b/fs/ubifs/Config.in
@@ -75,6 +75,16 @@ config BR2_TARGET_ROOTFS_UBIFS_LZMA
 	help
 	  Do compress the ubifs filesystem with lzma.
 
+config BR2_TARGET_ROOTFS_UBIFS_LZO
+	bool "lzo"
+	help
+	  Do compress the ubifs filesystem with lzop.
+
+config BR2_TARGET_ROOTFS_UBIFS_XZ
+	bool "xz"
+	help
+	  Do compress the ubifs filesystem with xz.
+
 endchoice
 
 config BR2_TARGET_ROOTFS_UBI

From a0f3cb1cbeba376a8a8105b58f7f85e63baa11fe Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@newflow.co.uk>
Date: Wed, 24 Apr 2013 02:29:19 +0000
Subject: [PATCH 4869/6849] fs/ubifs: allow extra options to be passed to ubifs
 creation tools

Allow extra options to be passed to ubifs creation tools.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ubifs/Config.in | 12 ++++++++++++
 fs/ubifs/ubi.mk    |  2 ++
 fs/ubifs/ubifs.mk  |  4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
index 0a798d861f..d716fc0886 100644
--- a/fs/ubifs/Config.in
+++ b/fs/ubifs/Config.in
@@ -87,6 +87,12 @@ config BR2_TARGET_ROOTFS_UBIFS_XZ
 
 endchoice
 
+config BR2_TARGET_ROOTFS_UBIFS_OPTS
+	string "Additional mkfs.ubifs options"
+	depends on BR2_TARGET_ROOTFS_UBIFS
+	help
+	  Any additional mkfs.ubifs options you may want to include.
+
 config BR2_TARGET_ROOTFS_UBI
 	depends on BR2_TARGET_ROOTFS_UBIFS
 	bool "Embed into an UBI image"
@@ -108,3 +114,9 @@ config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 	help
 	  Tells ubinize that the flash supports sub-pages and the sub-page
 	  size. Use 0 if subpages are not supported on flash chip.
+
+config BR2_TARGET_ROOTFS_UBI_OPTS
+	string "Additional ubinize options"
+	depends on BR2_TARGET_ROOTFS_UBI
+	help
+	  Any additional ubinize options you may want to include.
diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk
index 51ab42d15c..e9033e8741 100644
--- a/fs/ubifs/ubi.mk
+++ b/fs/ubifs/ubi.mk
@@ -10,6 +10,8 @@ ifneq ($(BR2_TARGET_ROOTFS_UBI_SUBSIZE),0)
 UBI_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBI_SUBSIZE)
 endif
 
+UBI_UBINIZE_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_OPTS))
+
 ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 
 define ROOTFS_UBI_CMD
diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk
index 8506dbdb8d..dca2e04fb8 100644
--- a/fs/ubifs/ubifs.mk
+++ b/fs/ubifs/ubifs.mk
@@ -16,10 +16,12 @@ ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y)
 UBIFS_OPTS += -x none
 endif
 
+UBIFS_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_OPTS))
+
 ROOTFS_UBIFS_DEPENDENCIES = host-mtd
 
 define ROOTFS_UBIFS_CMD
 	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
 endef
 
-$(eval $(call ROOTFS_TARGET,ubifs))
\ No newline at end of file
+$(eval $(call ROOTFS_TARGET,ubifs))

From 9a4b2642aa0534d21b9377e763e8431e6eade115 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 24 Apr 2013 12:57:04 +0000
Subject: [PATCH 4870/6849] htop: bump to version 1.0.2

Also add license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/htop/htop.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index e7061bbf79..fd78662bcf 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -4,11 +4,13 @@
 #
 #############################################################
 
-HTOP_VERSION = 1.0.1
+HTOP_VERSION = 1.0.2
 HTOP_SITE = http://downloads.sourceforge.net/project/htop/htop/$(HTOP_VERSION)
 HTOP_DEPENDENCIES = ncurses
 HTOP_AUTORECONF = YES
 HTOP_CONF_OPT = --disable-unicode
 HTOP_CONF_ENV = ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
+HTOP_LICENSE = GPLv2
+HTOP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From a3e3909bce549beacddee2b3fcb69a16e7cbb55f Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@newflow.co.uk>
Date: Wed, 24 Apr 2013 21:55:35 +0000
Subject: [PATCH 4871/6849] fs/ubifs: factorize all the "depends on" into
 "if...endif" blocks

Factorize all the "depends on" into "if...endif" blocks

All the UBIFS options use "depends on BR2_TARGET_ROOTFS_UBIFS" but
we can simplify the config file by enclosing them in an "if..endif"
block.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ubifs/Config.in | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
index d716fc0886..4cf5d131ee 100644
--- a/fs/ubifs/Config.in
+++ b/fs/ubifs/Config.in
@@ -3,21 +3,20 @@ config BR2_TARGET_ROOTFS_UBIFS
 	help
 	  Build a ubifs root filesystem
 
+if BR2_TARGET_ROOTFS_UBIFS
+
 config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
 	hex "UBI logical erase block size"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	default 0x1f800
 
 config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
 	hex "UBI minimum I/O size"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	default 0x800
 	help
 	  Some comment required here
 
 config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
 	int "Maximum LEB count"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	default 2048
 	help
 	  Some comment required here
@@ -25,7 +24,6 @@ config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
 choice
 	prompt "ubifs runtime compression"
 	default BR2_TARGET_ROOTFS_UBIFS_RT_LZO
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	help
 	  Select which compression format to use at run-time within
 	  the ubifs file system.
@@ -50,7 +48,6 @@ endchoice
 choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_UBIFS_NONE
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	help
 	  Select which compression format to compress the final image
 	  into.
@@ -89,19 +86,18 @@ endchoice
 
 config BR2_TARGET_ROOTFS_UBIFS_OPTS
 	string "Additional mkfs.ubifs options"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	help
 	  Any additional mkfs.ubifs options you may want to include.
 
 config BR2_TARGET_ROOTFS_UBI
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	bool "Embed into an UBI image"
 	help
 	  Build an ubi image from the ubifs one (with ubinize).
 
+if BR2_TARGET_ROOTFS_UBI
+
 config BR2_TARGET_ROOTFS_UBI_PEBSIZE
 	hex "UBI physical erase block size"
-	depends on BR2_TARGET_ROOTFS_UBI
 	default 0x20000
 	help
 	  Tells ubinize the physical eraseblock size of the flash chip
@@ -109,7 +105,6 @@ config BR2_TARGET_ROOTFS_UBI_PEBSIZE
 
 config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 	int "UBI sub-page size"
-	depends on BR2_TARGET_ROOTFS_UBI
 	default 512
 	help
 	  Tells ubinize that the flash supports sub-pages and the sub-page
@@ -117,6 +112,9 @@ config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 
 config BR2_TARGET_ROOTFS_UBI_OPTS
 	string "Additional ubinize options"
-	depends on BR2_TARGET_ROOTFS_UBI
 	help
 	  Any additional ubinize options you may want to include.
+
+endif # BR2_TARGET_ROOTFS_UBI
+
+endif # BR2_TARGET_ROOTFS_UBIFS

From b6f71564fbee991a4a88202af541f4229bb99ff0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 25 Apr 2013 22:53:00 +0200
Subject: [PATCH 4872/6849] openssh: don't use a custom libexec dir

sftp expects to find sftp-server in the standard (/usr/libexec) location,
so ensure it gets installed there.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 3c299713f8..a56bb7538f 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -7,7 +7,7 @@
 OPENSSH_VERSION = 6.2p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \
+OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \
 		--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
 
 OPENSSH_DEPENDENCIES = zlib openssl

From 74bdc4b9ddf6d4d2ecdd238715dcbf14292b8829 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 12 Apr 2013 00:21:29 +0000
Subject: [PATCH 4873/6849] integrator926: Update the defconfig

the integrator926 defconfig has not been updated for quite some time,
and is still asking for very old linux and u-boot releases. Now that
these versions aren't present in Buildroot anymore, they default to a
newer release, where, in the u-boot case, the defconfig name has
changed, leading to a build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/integrator926_defconfig | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index e596d3389c..e63f455df2 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -4,13 +4,16 @@ BR2_arm926t=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="integratorcp_cm926ejs"
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.35"
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_2_6_35=
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35"
 BR2_LINUX_KERNEL_DEFCONFIG="integrator"
 
 # Filesystem

From 1f3af04db77f9e9e707bd37ee85f6508aef797f2 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 12 Apr 2013 07:14:18 +0000
Subject: [PATCH 4874/6849] packages: add ability for packages to create users

Packages that install daemons may need those daemons to run as a non-root,
or an otherwise non-system (eg. 'daemon'), user.

Add infrastructure for packages to create users, by declaring the FOO_USERS
variable that contain a makedev-syntax-like description of the user(s) to
add.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Samuel Martin <s.martin49@gmail.com>
Cc: Cam Hutchison <camh@xdna.net>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt |  16 +-
 docs/manual/appendix.txt                |   1 +
 docs/manual/makeusers-syntax.txt        |  87 +++++
 fs/common.mk                            |   3 +
 package/pkg-generic.mk                  |   1 +
 support/scripts/mkusers                 | 409 ++++++++++++++++++++++++
 6 files changed, 515 insertions(+), 2 deletions(-)
 create mode 100644 docs/manual/makeusers-syntax.txt
 create mode 100755 support/scripts/mkusers

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index a615ae2c92..aa94b88691 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -53,7 +53,11 @@ system is based on hand-written Makefiles or shell scripts.
 36:	/bin/foo  f  4755  0  0	 -  -  -  -  -
 37: endef
 38:
-39: $(eval $(generic-package))
+39: define LIBFOO_USERS
+40:	foo -1 libfoo -1 * - - - LibFoo daemon
+41: endef
+42:
+43: $(eval $(generic-package))
 --------------------------------
 
 The Makefile begins on line 7 to 11 with metadata information: the
@@ -140,7 +144,10 @@ On line 31..33, we define a device-node file used by this package
 On line 35..37, we define the permissions to set to specific files
 installed by this package (+LIBFOO_PERMISSIONS+).
 
-Finally, on line 39, we call the +generic-package+ function, which
+On lines 39..41, we define a user that is used by this package (eg.
+to run a daemon as non-root) (+LIBFOO_USERS+).
+
+Finally, on line 43, we call the +generic-package+ function, which
 generates, according to the variables defined previously, all the
 Makefile code necessary to make your package working.
 
@@ -307,6 +314,11 @@ information is (assuming the package name is +libfoo+) :
   You can find some documentation for this syntax in the xref:makedev-syntax[].
   This variable is optional.
 
+* +LIBFOO_USERS+ lists the users to create for this package, if it installs
+  a program you want to run as a specific user (eg. as a daemon, or as a
+  cron-job). The syntax is similar in spirit to the makedevs one, and is
+  described in the xref:makeuser-syntax[]. This variable is optional.
+
 * +LIBFOO_LICENSE+ defines the license (or licenses) under which the package
   is released.
   This name will appear in the manifest file produced by +make legal-info+.
diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index ef34169f84..c48c3b1698 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -5,6 +5,7 @@ Appendix
 ========
 
 include::makedev-syntax.txt[]
+include::makeusers-syntax.txt[]
 
 [[package-list]]
 Available packages
diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt
new file mode 100644
index 0000000000..21996546c7
--- /dev/null
+++ b/docs/manual/makeusers-syntax.txt
@@ -0,0 +1,87 @@
+// -*- mode:doc -*- ;
+
+[[makeuser-syntax]]
+Makeuser syntax documentation
+-----------------------------
+
+The syntax to create users is inspired by the makedev syntax, above, but
+is specific to Buildroot.
+
+The syntax for adding a user is a space-separated list of fields, one
+user per line; the fields are:
+
+|=================================================================
+|username |uid |group |gid |password |home |shell |groups |comment
+|=================================================================
+
+Where:
+
+- +username+ is the desired user name (aka login name) for the user.
+  It can not be +root+, and must be unique.
+- +uid+ is the desired UID for the user. It must be unique, and not
+  +0+. If set to +-1+, then a unique UID will be computed by Buildroot
+  in the range [1000...1999]
+- +group+ is the desired name for the user's main group. It can not
+  be +root+. If the group does not exist, it will be created.
+- +gid+ is the desired GID for the user's main group. It must be unique,
+  and not +0+. If set to +-1+, and the group does not already exist, then
+  a unique GID will be computed by Buildroot in the range [1000..1999]
+- +password+ is the crypt(3)-encoded password. If prefixed with +!+,
+  then login is disabled. If prefixed with +=+, then it is interpreted
+  as clear-text, and will be crypt-encoded (using MD5). If prefixed with
+  +!=+, then the password will be crypt-encoded (using MD5) and login
+  will be disabled. If set to +*+, then login is not allowed.
+- +home+ is the desired home directory for the user. If set to '-', no
+  home directory will be created, and the user's home will be +/+.
+  Explicitly setting +home+ to +/+ is not allowed.
+- +shell+ is the desired shell for the user. If set to +-+, then
+  +/bin/false+ is set as the user's shell.
+- +groups+ is the comma-separated list of additional groups the user
+  should be part of. If set to +-+, then the user will be a member of
+  no additional group. Missing groups will be created with an arbitrary
+  +gid+.
+- +comment+ (aka https://en.wikipedia.org/wiki/Gecos_field[GECOS]
+  field) is an almost-free-form text.
+
+There are a few restrictions on the content of each field:
+
+* except for +comment+, all fields are mandatory.
+* except for +comment+, fields may not contain spaces.
+* no field may contain a colon (+:+).
+
+If +home+ is not +-+, then the home directory, and all files below,
+will belong to the user and its main group.
+
+Examples:
+
+----
+foo -1 bar -1 !=blabla /home/foo /bin/sh alpha,bravo Foo user
+----
+
+This will create this user:
+
+- +username+ (aka login name) is: +foo+
+- +uid+ is computed by Buildroot
+- main +group+ is: +bar+
+- main group +gid+ is computed by Buildroot
+- clear-text +password+ is: +blabla+, will be crypt(3)-encoded, and login is disabled.
+- +home+ is: +/home/foo+
+- +shell+ is: +/bin/sh+
+- +foo+ is also a member of +groups+: +alpha+ and +bravo+
+- +comment+ is: +Foo user+
+
+----
+test 8000 wheel -1 = - /bin/sh - Test user
+----
+
+This will create this user:
+
+- +username+ (aka login name) is: +test+
+- +uid+ is : +8000+
+- main +group+ is: +wheel+
+- main group +gid+ is computed by Buildroot, and will use the value defined in the rootfs skeleton
+- +password+ is empty (aka no password).
+- +home+ is +/+ but will not belong to +test+
+- +shell+ is: +/bin/sh+
+- +test+ is not a member of any additional +groups+
+- +comment+ is: +Test user+
diff --git a/fs/common.mk b/fs/common.mk
index c6f67d831d..36da2dd645 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -35,6 +35,7 @@ FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
 FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
 ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
        $(BR2_ROOTFS_STATIC_DEVICE_TABLE))
+USERS_TABLE = $(BUILD_DIR)/_users_table.txt
 
 define ROOTFS_TARGET_INTERNAL
 
@@ -55,6 +56,8 @@ endif
 	printf '$$(subst $$(sep),\n,$$(PACKAGES_PERMISSIONS_TABLE))' >> $$(FULL_DEVICE_TABLE)
 	echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
 endif
+	printf '$(subst $(sep),\n,$(PACKAGES_USERS))' > $(USERS_TABLE)
+	$(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT)
 	echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
 	chmod a+x $$(FAKEROOT_SCRIPT)
 	$$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index e6bc95599b..b55b5f0b48 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -529,6 +529,7 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y)
 TARGETS += $(1)
 PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep)
 PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep)
+PACKAGES_USERS += $$($(2)_USERS)$$(sep)
 
 ifeq ($$($(2)_SITE_METHOD),svn)
 DL_TOOLS_DEPENDENCIES += svn
diff --git a/support/scripts/mkusers b/support/scripts/mkusers
new file mode 100755
index 0000000000..19aa085e10
--- /dev/null
+++ b/support/scripts/mkusers
@@ -0,0 +1,409 @@
+#!/bin/bash
+set -e
+myname="${0##*/}"
+
+#----------------------------------------------------------------------------
+# Configurable items
+MIN_UID=1000
+MAX_UID=1999
+MIN_GID=1000
+MAX_GID=1999
+# No more is configurable below this point
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+error() {
+    local fmt="${1}"
+    shift
+
+    printf "%s: " "${myname}" >&2
+    printf "${fmt}" "${@}" >&2
+}
+fail() {
+    error "$@"
+    exit 1
+}
+
+#----------------------------------------------------------------------------
+if [ ${#} -ne 2 ]; then
+    fail "usage: %s USERS_TABLE TARGET_DIR\n"
+fi
+USERS_TABLE="${1}"
+TARGET_DIR="${2}"
+shift 2
+PASSWD="${TARGET_DIR}/etc/passwd"
+SHADOW="${TARGET_DIR}/etc/shadow"
+GROUP="${TARGET_DIR}/etc/group"
+# /etc/gshadow is not part of the standard skeleton, so not everybody
+# will have it, but some may hav it, and its content must be in sync
+# with /etc/group, so any use of gshadow must be conditional.
+GSHADOW="${TARGET_DIR}/etc/gshadow"
+
+# We can't simply source ${BUILDROOT_CONFIG} as it may contains constructs
+# such as:
+#    BR2_DEFCONFIG="$(CONFIG_DIR)/defconfig"
+# which when sourced from a shell script will eventually try to execute
+# a command name 'CONFIG_DIR', which is plain wrong for virtually every
+# systems out there.
+# So, we have to scan that file instead. Sigh... :-(
+PASSWD_METHOD="$( sed -r -e '/^BR2_TARGET_GENERIC_PASSWD_METHOD="(.*)"$/!d;'    \
+                         -e 's//\1/;'                                           \
+                         "${BUILDROOT_CONFIG}"                                  \
+                )"
+
+#----------------------------------------------------------------------------
+get_uid() {
+    local username="${1}"
+
+    awk -F: -v username="${username}"                           \
+        '$1 == username { printf( "%d\n", $3 ); }' "${PASSWD}"
+}
+
+#----------------------------------------------------------------------------
+get_ugid() {
+    local username="${1}"
+
+    awk -F:i -v username="${username}"                          \
+        '$1 == username { printf( "%d\n", $4 ); }' "${PASSWD}"
+}
+
+#----------------------------------------------------------------------------
+get_gid() {
+    local group="${1}"
+
+    awk -F: -v group="${group}"                             \
+        '$1 == group { printf( "%d\n", $3 ); }' "${GROUP}"
+}
+
+#----------------------------------------------------------------------------
+get_username() {
+    local uid="${1}"
+
+    awk -F: -v uid="${uid}"                                 \
+        '$3 == uid { printf( "%s\n", $1 ); }' "${PASSWD}"
+}
+
+#----------------------------------------------------------------------------
+get_group() {
+    local gid="${1}"
+
+    awk -F: -v gid="${gid}"                             \
+        '$3 == gid { printf( "%s\n", $1 ); }' "${GROUP}"
+}
+
+#----------------------------------------------------------------------------
+get_ugroup() {
+    local username="${1}"
+    local ugid
+
+    ugid="$( get_ugid "${username}" )"
+    if [ -n "${ugid}" ]; then
+        get_group "${ugid}"
+    fi
+}
+
+#----------------------------------------------------------------------------
+# Sanity-check the new user/group:
+#   - check the gid is not already used for another group
+#   - check the group does not already exist with another gid
+#   - check the user does not already exist with another gid
+#   - check the uid is not already used for another user
+#   - check the user does not already exist with another uid
+#   - check the user does not already exist in another group
+check_user_validity() {
+    local username="${1}"
+    local uid="${2}"
+    local group="${3}"
+    local gid="${4}"
+    local _uid _ugid _gid _username _group _ugroup
+
+    _group="$( get_group "${gid}" )"
+    _gid="$( get_gid "${group}" )"
+    _ugid="$( get_ugid "${username}" )"
+    _username="$( get_username "${uid}" )"
+    _uid="$( get_uid "${username}" )"
+    _ugroup="$( get_ugroup "${username}" )"
+
+    if [ "${username}" = "root" ]; then
+        fail "invalid username '%s\n'" "${username}"
+    fi
+
+    if [ ${gid} -lt -1 -o ${gid} -eq 0 ]; then
+        fail "invalid gid '%d'\n" ${gid}
+    elif [ ${gid} -ne -1 ]; then
+        # check the gid is not already used for another group
+        if [ -n "${_group}" -a "${_group}" != "${group}" ]; then
+            fail "gid is already used by group '${_group}'\n"
+        fi
+
+        # check the group does not already exists with another gid
+        if [ -n "${_gid}" -a ${_gid} -ne ${gid} ]; then
+            fail "group already exists with gid '${_gid}'\n"
+        fi
+
+        # check the user does not already exists with another gid
+        if [ -n "${_ugid}" -a ${_ugid} -ne ${gid} ]; then
+            fail "user already exists with gid '${_ugid}'\n"
+        fi
+    fi
+
+    if [ ${uid} -lt -1 -o ${uid} -eq 0 ]; then
+        fail "invalid uid '%d'\n" ${uid}
+    elif [ ${uid} -ne -1 ]; then
+        # check the uid is not already used for another user
+        if [ -n "${_username}" -a "${_username}" != "${username}" ]; then
+            fail "uid is already used by user '${_username}'\n"
+        fi
+
+        # check the user does not already exists with another uid
+        if [ -n "${_uid}" -a ${_uid} -ne ${uid} ]; then
+            fail "user already exists with uid '${_uid}'\n"
+        fi
+    fi
+
+    # check the user does not already exist in another group
+    if [ -n "${_ugroup}" -a "${_ugroup}" != "${group}" ]; then
+        fail "user already exists with group '${_ugroup}'\n"
+    fi
+
+    return 0
+}
+
+#----------------------------------------------------------------------------
+# Generate a unique GID for given group. If the group already exists,
+# then simply report its current GID. Otherwise, generate the lowest GID
+# that is:
+#   - not 0
+#   - comprised in [MIN_GID..MAX_GID]
+#   - not already used by a group
+generate_gid() {
+    local group="${1}"
+    local gid
+
+    gid="$( get_gid "${group}" )"
+    if [ -z "${gid}" ]; then
+        for(( gid=MIN_GID; gid<=MAX_GID; gid++ )); do
+            if [ -z "$( get_group "${gid}" )" ]; then
+                break
+            fi
+        done
+        if [ ${gid} -gt ${MAX_GID} ]; then
+            fail "can not allocate a GID for group '%s'\n" "${group}"
+        fi
+    fi
+    printf "%d\n" "${gid}"
+}
+
+#----------------------------------------------------------------------------
+# Add a group; if it does already exist, remove it first
+add_one_group() {
+    local group="${1}"
+    local gid="${2}"
+    local _f
+
+    # Generate a new GID if needed
+    if [ ${gid} -eq -1 ]; then
+        gid="$( generate_gid "${group}" )"
+    fi
+
+    # Remove any previous instance of this group, and re-add the new one
+    sed -i -e '/^'"${group}"':.*/d;' "${GROUP}"
+    printf "%s:x:%d:\n" "${group}" "${gid}" >>"${GROUP}"
+
+    # Ditto for /etc/gshadow if it exists
+    if [ -f "${GSHADOW}" ]; then
+        sed -i -e '/^'"${group}"':.*/d;' "${GSHADOW}"
+        printf "%s:*::\n" "${group}" >>"${GSHADOW}"
+    fi
+}
+
+#----------------------------------------------------------------------------
+# Generate a unique UID for given username. If the username already exists,
+# then simply report its current UID. Otherwise, generate the lowest UID
+# that is:
+#   - not 0
+#   - comprised in [MIN_UID..MAX_UID]
+#   - not already used by a user
+generate_uid() {
+    local username="${1}"
+    local uid
+
+    uid="$( get_uid "${username}" )"
+    if [ -z "${uid}" ]; then
+        for(( uid=MIN_UID; uid<=MAX_UID; uid++ )); do
+            if [ -z "$( get_username "${uid}" )" ]; then
+                break
+            fi
+        done
+        if [ ${uid} -gt ${MAX_UID} ]; then
+            fail "can not allocate a UID for user '%s'\n" "${username}"
+        fi
+    fi
+    printf "%d\n" "${uid}"
+}
+
+#----------------------------------------------------------------------------
+# Add given user to given group, if not already the case
+add_user_to_group() {
+    local username="${1}"
+    local group="${2}"
+    local _f
+
+    for _f in "${GROUP}" "${GSHADOW}"; do
+        [ -f "${_f}" ] || continue
+        sed -r -i -e 's/^('"${group}"':.*:)(([^:]+,)?)'"${username}"'(,[^:]+*)?$/\1\2\4/;'  \
+                  -e 's/^('"${group}"':.*)$/\1,'"${username}"'/;'                           \
+                  -e 's/,+/,/'                                                              \
+                  -e 's/:,/:/'                                                              \
+                  "${_f}"
+    done
+}
+
+#----------------------------------------------------------------------------
+# Encode a password
+encode_password() {
+    local passwd="${1}"
+
+    mkpasswd -m "${PASSWD_METHOD}" "${passwd}"
+}
+
+#----------------------------------------------------------------------------
+# Add a user; if it does already exist, remove it first
+add_one_user() {
+    local username="${1}"
+    local uid="${2}"
+    local group="${3}"
+    local gid="${4}"
+    local passwd="${5}"
+    local home="${6}"
+    local shell="${7}"
+    local groups="${8}"
+    local comment="${9}"
+    local _f _group _home _shell _gid _passwd
+
+    # First, sanity-check the user
+    check_user_validity "${username}" "${uid}" "${group}" "${gid}"
+
+    # Generate a new UID if needed
+    if [ ${uid} -eq -1 ]; then
+        uid="$( generate_uid "${username}" )"
+    fi
+
+    # Remove any previous instance of this user
+    for _f in "${PASSWD}" "${SHADOW}"; do
+        sed -r -i -e '/^'"${username}"':.*/d;' "${_f}"
+    done
+
+    _gid="$( get_gid "${group}" )"
+    _shell="${shell}"
+    if [ "${shell}" = "-" ]; then
+        _shell="/bin/false"
+    fi
+    case "${home}" in
+        -)  _home="/";;
+        /)  fail "home can not explicitly be '/'\n";;
+        /*) _home="${home}";;
+        *)  fail "home must be an absolute path\n";;
+    esac
+    case "${passwd}" in
+        !=*)
+            _passwd='!'"$( encode_passwd "${passwd#!=}" )"
+            ;;
+        =*)
+            _passwd="$( encode_passwd "${passwd#=}" )"
+            ;;
+        *)
+            _passwd="${passwd}"
+            ;;
+    esac
+
+    printf "%s:x:%d:%d:%s:%s:%s\n"              \
+           "${username}" "${uid}" "${_gid}"     \
+           "${comment}" "${_home}" "${_shell}"  \
+           >>"${PASSWD}"
+    printf "%s:%s:::::::\n"      \
+           "${username}" "${_passwd}"   \
+           >>"${SHADOW}"
+
+    # Add the user to its additional groups
+    if [ "${groups}" != "-" ]; then
+        for _group in ${groups//,/ }; do
+            add_user_to_group "${username}" "${_group}"
+        done
+    fi
+
+    # If the user has a home, chown it
+    # (Note: stdout goes to the fakeroot-script)
+    if [ "${home}" != "-" ]; then
+        mkdir -p "${TARGET_DIR}/${home}"
+        printf "chown -R %d:%d '%s'\n" "${uid}" "${_gid}" "${TARGET_DIR}/${home}"
+    fi
+}
+
+#----------------------------------------------------------------------------
+main() {
+    local username uid group gid passwd home shell groups comment
+
+    # Some sanity checks
+    if [ ${MIN_UID} -le 0 ]; then
+        fail "MIN_UID must be >0 (currently %d)\n" ${MIN_UID}
+    fi
+    if [ ${MIN_GID} -le 0 ]; then
+        fail "MIN_GID must be >0 (currently %d)\n" ${MIN_GID}
+    fi
+
+    # We first create groups whose gid is not -1, and then we create groups
+    # whose gid is -1 (automatic), so that, if a group is defined both with
+    # a specified gid and an automatic gid, we ensure the specified gid is
+    # used, rather than a different automatic gid is computed.
+
+    # First, create all the main groups which gid is *not* automatic
+    while read username uid group gid passwd home shell groups comment; do
+        [ -n "${username}" ] || continue    # Package with no user
+        [ ${gid} -ge 0     ] || continue    # Automatic gid
+        add_one_group "${group}" "${gid}"
+    done <"${USERS_TABLE}"
+
+    # Then, create all the main groups which gid *is* automatic
+    while read username uid group gid passwd home shell groups comment; do
+        [ -n "${username}" ] || continue    # Package with no user
+        [ ${gid} -eq -1    ] || continue    # Non-automatic gid
+        add_one_group "${group}" "${gid}"
+    done <"${USERS_TABLE}"
+
+    # Then, create all the additional groups
+    # If any additional group is already a main group, we should use
+    # the gid of that main group; otherwise, we can use any gid
+    while read username uid group gid passwd home shell groups comment; do
+        [ -n "${username}" ] || continue    # Package with no user
+        if [ "${groups}" != "-" ]; then
+            for g in ${groups//,/ }; do
+                add_one_group "${g}" -1
+            done
+        fi
+    done <"${USERS_TABLE}"
+
+    # When adding users, we do as for groups, in case two packages create
+    # the same user, one with an automatic uid, the other with a specified
+    # uid, to ensure the specified uid is used, rather than an incompatible
+    # uid be generated.
+
+    # Now, add users whose uid is *not* automatic
+    while read username uid group gid passwd home shell groups comment; do
+        [ -n "${username}" ] || continue    # Package with no user
+        [ ${uid} -ge 0     ] || continue    # Automatic uid
+        add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \
+                     "${home}" "${shell}" "${groups}" "${comment}"
+    done <"${USERS_TABLE}"
+
+    # Finally, add users whose uid *is* automatic
+    while read username uid group gid passwd home shell groups comment; do
+        [ -n "${username}" ] || continue    # Package with no user
+        [ ${uid} -eq -1    ] || continue    # Non-automatic uid
+        add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \
+                     "${home}" "${shell}" "${groups}" "${comment}"
+    done <"${USERS_TABLE}"
+}
+
+#----------------------------------------------------------------------------
+main "${@}"

From 5c1f1536d6fd947069338a47669eabdb8f8dcee7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 12 Apr 2013 07:14:19 +0000
Subject: [PATCH 4875/6849] package/tvheadend: use a non-root user to run the
 daemon

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/etc.default.tvheadend |  5 ++---
 package/tvheadend/tvheadend.mk          | 10 ++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package/tvheadend/etc.default.tvheadend b/package/tvheadend/etc.default.tvheadend
index c769055835..253f8320b1 100644
--- a/package/tvheadend/etc.default.tvheadend
+++ b/package/tvheadend/etc.default.tvheadend
@@ -1,6 +1,5 @@
-# Once we have a real user, we'll use it
-TVH_USER=root
-TVH_GROUP=root
+TVH_USER=tvheadend
+TVH_GROUP=tvheadend
 #TVH_ADAPTERS=
 #TVH_HTTP_PORT=9981
 #TVH_HTSP_PORT=9982
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 5a971b854d..58965d6831 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -26,9 +26,11 @@ TVHEADEND_DEPENDENCIES     += dvb-apps
 # To run tvheadend, we need:
 #  - a startup script, and its config file
 #  - a default DB with a tvheadend admin
+#  - a non-root user to run as
 define TVHEADEND_INSTALL_DB
-	$(INSTALL) -D package/tvheadend/accesscontrol.1     \
-	              $(TARGET_DIR)/root/.hts/tvheadend/accesscontrol/1
+	$(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1     \
+	              $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
+	chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
 endef
 TVHEADEND_POST_INSTALL_TARGET_HOOKS  = TVHEADEND_INSTALL_DB
 
@@ -37,6 +39,10 @@ define TVHEADEND_INSTALL_INIT_SYSV
 	$(INSTALL) -D package/tvheadend/S99tvheadend          $(TARGET_DIR)/etc/init.d/S99tvheadend
 endef
 
+define TVHEADEND_USERS
+tvheadend -1 tvheadend -1 * /home/tvheadend - video TVHeadend daemon
+endef
+
 #----------------------------------------------------------------------------
 # tvheadend is not an autotools-based package, but it is possible to
 # call its ./configure script as if it were an autotools one.

From ae760aa7d0cc4a3746539734f0d03f3bb86284a3 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 25 Apr 2013 23:59:08 +0000
Subject: [PATCH 4876/6849] neard: bump version to 0.11

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../neard-fix-missing-linux-nfc-header.patch  | 428 ------------------
 package/neard/neard.mk                        |   2 +-
 2 files changed, 1 insertion(+), 429 deletions(-)
 delete mode 100644 package/neard/neard-fix-missing-linux-nfc-header.patch

diff --git a/package/neard/neard-fix-missing-linux-nfc-header.patch b/package/neard/neard-fix-missing-linux-nfc-header.patch
deleted file mode 100644
index 377269e571..0000000000
--- a/package/neard/neard-fix-missing-linux-nfc-header.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-Add a private copy of <linux/nfc.h>
-
-The addition of the <linux/nfc.h> header in the kernel sources is
-moderately recent, and therefore, a number of toolchains don't have
-this header.
-
-As a workaround until all reasonable toolchains get this header
-included, add a configure check in neard to test whether this header
-is available or not, and if not, use our own private copy of it.
-
-Since symbols from the v3.7 kernel header are used, but linux/nfc.h
-already exists since the v3.1 kernel, check for one of the most
-recently added symbols: NFC_LLCP_RAW_HEADER_SIZE.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,6 +88,12 @@
- AC_SUBST(NETLINK_CFLAGS)
- AC_SUBST(NETLINK_LIBS)
- 
-+AC_TRY_COMPILE([
-+#include <sys/socket.h>
-+#include <linux/nfc.h>
-+	], [int err[NFC_LLCP_RAW_HEADER_SIZE-2];],
-+	[AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [])
-+
- AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
- 					[enable test/example scripts]),
- 					[enable_test=${enableval}])
-Index: b/src/near.h
-===================================================================
---- a/src/near.h
-+++ b/src/near.h
-@@ -23,7 +23,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "linux-nfc.h"
-+#endif
- 
- #include <glib.h>
- 
-Index: b/src/linux-nfc.h
-===================================================================
---- /dev/null
-+++ b/src/linux-nfc.h
-@@ -0,0 +1,197 @@
-+/*
-+ * Copyright (C) 2011 Instituto Nokia de Tecnologia
-+ *
-+ * Authors:
-+ *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
-+ *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the
-+ * Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifndef __LINUX_NFC_H
-+#define __LINUX_NFC_H
-+
-+#include <linux/types.h>
-+#include <linux/socket.h>
-+
-+#define NFC_GENL_NAME "nfc"
-+#define NFC_GENL_VERSION 1
-+
-+#define NFC_GENL_MCAST_EVENT_NAME "events"
-+
-+/**
-+ * enum nfc_commands - supported nfc commands
-+ *
-+ * @NFC_CMD_UNSPEC: unspecified command
-+ *
-+ * @NFC_CMD_GET_DEVICE: request information about a device (requires
-+ *	%NFC_ATTR_DEVICE_INDEX) or dump request to get a list of all nfc devices
-+ * @NFC_CMD_DEV_UP: turn on the nfc device
-+ *	(requires %NFC_ATTR_DEVICE_INDEX)
-+ * @NFC_CMD_DEV_DOWN: turn off the nfc device
-+ *	(requires %NFC_ATTR_DEVICE_INDEX)
-+ * @NFC_CMD_START_POLL: start polling for targets using the given protocols
-+ *	(requires %NFC_ATTR_DEVICE_INDEX and %NFC_ATTR_PROTOCOLS)
-+ * @NFC_CMD_STOP_POLL: stop polling for targets (requires
-+ *	%NFC_ATTR_DEVICE_INDEX)
-+ * @NFC_CMD_GET_TARGET: dump all targets found by the previous poll (requires
-+ *	%NFC_ATTR_DEVICE_INDEX)
-+ * @NFC_EVENT_TARGETS_FOUND: event emitted when a new target is found
-+ *	(it sends %NFC_ATTR_DEVICE_INDEX)
-+ * @NFC_EVENT_DEVICE_ADDED: event emitted when a new device is registred
-+ *	(it sends %NFC_ATTR_DEVICE_NAME, %NFC_ATTR_DEVICE_INDEX and
-+ *	%NFC_ATTR_PROTOCOLS)
-+ * @NFC_EVENT_DEVICE_REMOVED: event emitted when a device is removed
-+ *	(it sends %NFC_ATTR_DEVICE_INDEX)
-+ * @NFC_EVENT_TM_ACTIVATED: event emitted when the adapter is activated in
-+ *      target mode.
-+ * @NFC_EVENT_DEVICE_DEACTIVATED: event emitted when the adapter is deactivated
-+ *      from target mode.
-+ */
-+enum nfc_commands {
-+	NFC_CMD_UNSPEC,
-+	NFC_CMD_GET_DEVICE,
-+	NFC_CMD_DEV_UP,
-+	NFC_CMD_DEV_DOWN,
-+	NFC_CMD_DEP_LINK_UP,
-+	NFC_CMD_DEP_LINK_DOWN,
-+	NFC_CMD_START_POLL,
-+	NFC_CMD_STOP_POLL,
-+	NFC_CMD_GET_TARGET,
-+	NFC_EVENT_TARGETS_FOUND,
-+	NFC_EVENT_DEVICE_ADDED,
-+	NFC_EVENT_DEVICE_REMOVED,
-+	NFC_EVENT_TARGET_LOST,
-+	NFC_EVENT_TM_ACTIVATED,
-+	NFC_EVENT_TM_DEACTIVATED,
-+/* private: internal use only */
-+	__NFC_CMD_AFTER_LAST
-+};
-+#define NFC_CMD_MAX (__NFC_CMD_AFTER_LAST - 1)
-+
-+/**
-+ * enum nfc_attrs - supported nfc attributes
-+ *
-+ * @NFC_ATTR_UNSPEC: unspecified attribute
-+ *
-+ * @NFC_ATTR_DEVICE_INDEX: index of nfc device
-+ * @NFC_ATTR_DEVICE_NAME: device name, max 8 chars
-+ * @NFC_ATTR_PROTOCOLS: nfc protocols - bitwise or-ed combination from
-+ *	NFC_PROTO_*_MASK constants
-+ * @NFC_ATTR_TARGET_INDEX: index of the nfc target
-+ * @NFC_ATTR_TARGET_SENS_RES: NFC-A targets extra information such as NFCID
-+ * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the
-+ *	target is not NFC-Forum compliant)
-+ * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes
-+ * @NFC_ATTR_TARGET_SENSB_RES: NFC-B targets extra information, max 12 bytes
-+ * @NFC_ATTR_TARGET_SENSF_RES: NFC-F targets extra information, max 18 bytes
-+ * @NFC_ATTR_COMM_MODE: Passive or active mode
-+ * @NFC_ATTR_RF_MODE: Initiator or target
-+ * @NFC_ATTR_IM_PROTOCOLS: Initiator mode protocols to poll for
-+ * @NFC_ATTR_TM_PROTOCOLS: Target mode protocols to listen for
-+ */
-+enum nfc_attrs {
-+	NFC_ATTR_UNSPEC,
-+	NFC_ATTR_DEVICE_INDEX,
-+	NFC_ATTR_DEVICE_NAME,
-+	NFC_ATTR_PROTOCOLS,
-+	NFC_ATTR_TARGET_INDEX,
-+	NFC_ATTR_TARGET_SENS_RES,
-+	NFC_ATTR_TARGET_SEL_RES,
-+	NFC_ATTR_TARGET_NFCID1,
-+	NFC_ATTR_TARGET_SENSB_RES,
-+	NFC_ATTR_TARGET_SENSF_RES,
-+	NFC_ATTR_COMM_MODE,
-+	NFC_ATTR_RF_MODE,
-+	NFC_ATTR_DEVICE_POWERED,
-+	NFC_ATTR_IM_PROTOCOLS,
-+	NFC_ATTR_TM_PROTOCOLS,
-+/* private: internal use only */
-+	__NFC_ATTR_AFTER_LAST
-+};
-+#define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1)
-+
-+#define NFC_DEVICE_NAME_MAXSIZE 8
-+#define NFC_NFCID1_MAXSIZE 10
-+#define NFC_SENSB_RES_MAXSIZE 12
-+#define NFC_SENSF_RES_MAXSIZE 18
-+#define NFC_GB_MAXSIZE        48
-+
-+/* NFC protocols */
-+#define NFC_PROTO_JEWEL		1
-+#define NFC_PROTO_MIFARE	2
-+#define NFC_PROTO_FELICA	3
-+#define NFC_PROTO_ISO14443	4
-+#define NFC_PROTO_NFC_DEP	5
-+#define NFC_PROTO_ISO14443_B	6
-+
-+#define NFC_PROTO_MAX		7
-+
-+/* NFC communication modes */
-+#define NFC_COMM_ACTIVE  0
-+#define NFC_COMM_PASSIVE 1
-+
-+/* NFC RF modes */
-+#define NFC_RF_INITIATOR 0
-+#define NFC_RF_TARGET    1
-+#define NFC_RF_NONE      2
-+
-+/* NFC protocols masks used in bitsets */
-+#define NFC_PROTO_JEWEL_MASK      (1 << NFC_PROTO_JEWEL)
-+#define NFC_PROTO_MIFARE_MASK     (1 << NFC_PROTO_MIFARE)
-+#define NFC_PROTO_FELICA_MASK	  (1 << NFC_PROTO_FELICA)
-+#define NFC_PROTO_ISO14443_MASK	  (1 << NFC_PROTO_ISO14443)
-+#define NFC_PROTO_NFC_DEP_MASK	  (1 << NFC_PROTO_NFC_DEP)
-+#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
-+
-+struct sockaddr_nfc {
-+	sa_family_t sa_family;
-+	__u32 dev_idx;
-+	__u32 target_idx;
-+	__u32 nfc_protocol;
-+};
-+
-+#define NFC_LLCP_MAX_SERVICE_NAME 63
-+struct sockaddr_nfc_llcp {
-+	sa_family_t sa_family;
-+	__u32 dev_idx;
-+	__u32 target_idx;
-+	__u32 nfc_protocol;
-+	__u8 dsap; /* Destination SAP, if known */
-+	__u8 ssap; /* Source SAP to be bound to */
-+	char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
-+	size_t service_name_len;
-+};
-+
-+/* NFC socket protocols */
-+#define NFC_SOCKPROTO_RAW	0
-+#define NFC_SOCKPROTO_LLCP	1
-+#define NFC_SOCKPROTO_MAX	2
-+
-+#define NFC_HEADER_SIZE 1
-+
-+/**
-+ * Pseudo-header info for raw socket packets
-+ * First byte is the adapter index
-+ * Second byte contains flags
-+ *  - 0x01 - Direction (0=RX, 1=TX)
-+ *  - 0x02-0x80 - Reserved
-+ **/
-+#define NFC_LLCP_RAW_HEADER_SIZE	2
-+#define NFC_LLCP_DIRECTION_RX		0x00
-+#define NFC_LLCP_DIRECTION_TX		0x01
-+
-+#endif /*__LINUX_NFC_H */
-Index: b/plugins/mifare.c
-===================================================================
---- a/plugins/mifare.c
-+++ b/plugins/mifare.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/p2p.c
-===================================================================
---- a/plugins/p2p.c
-+++ b/plugins/p2p.c
-@@ -30,7 +30,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/handover.c
-===================================================================
---- a/plugins/handover.c
-+++ b/plugins/handover.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/types.h>
- #include <near/log.h>
-Index: b/plugins/nfctype1.c
-===================================================================
---- a/plugins/nfctype1.c
-+++ b/plugins/nfctype1.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/nfctype2.c
-===================================================================
---- a/plugins/nfctype2.c
-+++ b/plugins/nfctype2.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/nfctype3.c
-===================================================================
---- a/plugins/nfctype3.c
-+++ b/plugins/nfctype3.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/nfctype4.c
-===================================================================
---- a/plugins/nfctype4.c
-+++ b/plugins/nfctype4.c
-@@ -30,7 +30,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/npp.c
-===================================================================
---- a/plugins/npp.c
-+++ b/plugins/npp.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/snep.c
-===================================================================
---- a/plugins/snep.c
-+++ b/plugins/snep.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/snep-core.c
-===================================================================
---- a/plugins/snep-core.c
-+++ b/plugins/snep-core.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
-Index: b/plugins/snep-validation.c
-===================================================================
---- a/plugins/snep-validation.c
-+++ b/plugins/snep-validation.c
-@@ -29,7 +29,11 @@
- #include <sys/socket.h>
- 
- #include <linux/socket.h>
-+#ifdef HAVE_LINUX_NFC_H
- #include <linux/nfc.h>
-+#else
-+#include "../src/linux-nfc.h"
-+#endif
- 
- #include <near/plugin.h>
- #include <near/log.h>
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index c3466e6509..056875c48e 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NEARD_VERSION = 0.9
+NEARD_VERSION = 0.11
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
 NEARD_LICENSE = GPLv2
 NEARD_LICENSE_FILES = COPYING

From cfe3f67df38063ba9024d241c0317e51e5beacc7 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 26 Apr 2013 00:25:26 +0000
Subject: [PATCH 4877/6849] neardal: add support for ncl tool

[Peter: move directly under neardal option so it gets indented]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neardal/Config.in  | 6 ++++++
 package/neardal/neardal.mk | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/package/neardal/Config.in b/package/neardal/Config.in
index 045ccee161..76b5ffa50a 100644
--- a/package/neardal/Config.in
+++ b/package/neardal/Config.in
@@ -11,5 +11,11 @@ config BR2_PACKAGE_NEARDAL
 
 	  https://github.com/connectivity/neardal
 
+config BR2_PACKAGE_NEARDAL_NCL
+	bool "ncl tool"
+	depends on BR2_PACKAGE_NEARDAL
+	help
+	  Build and install neardal ncl command line interpreter tool.
+
 comment "neardal requires a toolchain with WCHAR and threads support"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk
index 9625f0ebfa..b937acb814 100644
--- a/package/neardal/neardal.mk
+++ b/package/neardal/neardal.mk
@@ -14,4 +14,12 @@ NEARDAL_LICENSE_FILES = COPYING
 NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib
 NEARDAL_AUTORECONF = YES
 
+define NEARDAL_INSTALL_NCL
+	$(INSTALL) -m 0755 -D $(@D)/ncl/ncl $(TARGET_DIR)/usr/bin/ncl
+endef
+
+ifeq ($(BR2_PACKAGE_NEARDAL_NCL),y)
+	NEARDAL_POST_INSTALL_TARGET_HOOKS += NEARDAL_INSTALL_NCL
+endif
+
 $(eval $(autotools-package))

From b526a80e6d5f415045ea4b44cc885bab73838383 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 26 Apr 2013 00:35:58 +0000
Subject: [PATCH 4878/6849] kernel-headers: bump 3.{0, 2, 4, 8}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.74-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.75-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index ec75c3450e..17bd80b63a 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -63,14 +63,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.74"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.75"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.43"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.44"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.41"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.42"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.8"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.9"		if BR2_KERNEL_HEADERS_3_8
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.74-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.75-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.74-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.75-headers_install-fix-__packed-in-exported-kernel-head.patch

From 01bc22aa03bfe3e623b37c76b21e63596b6c2298 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 26 Apr 2013 00:35:59 +0000
Subject: [PATCH 4879/6849] linux: bump 3.8.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 22f03ef1dd..ec1a636c90 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_8
-	bool "3.8.8"
+	bool "3.8.9"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.8" if BR2_LINUX_KERNEL_3_8
+	default "3.8.9" if BR2_LINUX_KERNEL_3_8
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e08e72d7d1c9f1482217e07255f874187bb5dc63 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 26 Apr 2013 02:39:50 +0000
Subject: [PATCH 4880/6849] php: fix libxml2 build failure

The libxml2 build test uses the PHP_TEST_BUILD macro which in turn uses
AC_TRY_RUN which is bad for cross compilations.
Force php_cv_libxml_build_works to yes when libxml2 is selected. Fixes:
http://autobuild.buildroot.net/results/8b45a1260ab6ae15dc59a5d6b5b98698ec3e7bbe/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/php/php.mk b/package/php/php.mk
index ba428a664b..2a452d1401 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -66,6 +66,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
+	PHP_CONF_ENV += php_cv_libxml_build_works=yes
 	PHP_CONF_OPT += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr
 	PHP_DEPENDENCIES += libxml2
 endif

From 3f14d9baedaca2f55299b7b616b9939336196963 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 26 Apr 2013 01:25:48 +0000
Subject: [PATCH 4881/6849] neard: add support for tools

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neard/Config.in | 6 ++++++
 package/neard/neard.mk  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/package/neard/Config.in b/package/neard/Config.in
index bcf6171280..ec1fcb3023 100644
--- a/package/neard/Config.in
+++ b/package/neard/Config.in
@@ -14,5 +14,11 @@ config BR2_PACKAGE_NEARD
 
 	  https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
 
+config BR2_PACKAGE_NEARD_TOOLS
+	bool "neard tools"
+	depends on BR2_PACKAGE_NEARD
+	help
+	  Build and install neard tools.
+
 comment "neard requires a toolchain with WCHAR and threads support"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 056875c48e..cc6aeacae0 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -13,4 +13,8 @@ NEARD_AUTORECONF = YES
 NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl
 NEARD_CONF_OPT = --disable-traces
 
+ifeq ($(BR2_PACKAGE_NEARD_TOOLS),y)
+	NEARD_CONF_OPT += --enable-tools
+endif
+
 $(eval $(autotools-package))

From 5cae3e8af0fe62e51e4fc675c566501f2bfd1cc2 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 27 Mar 2013 00:33:57 +0000
Subject: [PATCH 4882/6849] jansson: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/jansson/Config.in  |  7 +++++++
 package/jansson/jansson.mk | 12 ++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/jansson/Config.in
 create mode 100644 package/jansson/jansson.mk

diff --git a/package/Config.in b/package/Config.in
index ede0ba0e5a..0b095d4bfb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -618,6 +618,7 @@ menu "JSON/XML"
 source "package/cjson/Config.in"
 source "package/expat/Config.in"
 source "package/ezxml/Config.in"
+source "package/jansson/Config.in"
 source "package/json-c/Config.in"
 source "package/json-glib/Config.in"
 source "package/libroxml/Config.in"
diff --git a/package/jansson/Config.in b/package/jansson/Config.in
new file mode 100644
index 0000000000..960a7c4c38
--- /dev/null
+++ b/package/jansson/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_JANSSON
+	bool "jansson"
+	help
+	  Jansson is a C library for encoding, decoding and manipulating JSON
+	  data.
+
+	  http://www.digip.org/jansson/
diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk
new file mode 100644
index 0000000000..c7183df9ce
--- /dev/null
+++ b/package/jansson/jansson.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# jansson
+#
+#############################################################
+JANSSON_VERSION = 2.4
+JANSSON_SITE = http://www.digip.org/jansson/releases
+JANSSON_LICENSE = MIT
+JANSSON_LICENSE_FILES = LICENSE
+JANSSON_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 93581de0ec4cfc77ea6006b6283d034f82b45b93 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Mar 2013 11:38:01 +0000
Subject: [PATCH 4883/6849] gmp: bump to version 5.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._ssaaaa-and-sub_ddmmss-actually-work.patch | 46 -------------------
 package/gmp/gmp.mk                            |  8 +---
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch

diff --git a/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch b/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch
deleted file mode 100644
index 1b835a569c..0000000000
--- a/package/gmp/gmp-aarch64-make-add_ssaaaa-and-sub_ddmmss-actually-work.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1357413121 -3600
-# Node ID 187b7b1646ee0ace782768bb36117b62c8408bb6
-# Parent  87a24013e9ee2cabf74e32282c18584a2c669009
-(aarch64): Make add_ssaaaa and sub_ddmmss actually work.
-
-Taken upstream from http://gmplib.org:8000/gmp/rev/187b7b1646ee.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-diff -r 87a24013e9ee -r 187b7b1646ee longlong.h
---- a/longlong.h	Fri Jan 04 16:32:01 2013 +0100
-+++ b/longlong.h	Sat Jan 05 20:12:01 2013 +0100
-@@ -530,23 +530,16 @@
- #endif /* __arm__ */
- 
- #if defined (__aarch64__) && W_TYPE_SIZE == 64
-+/* FIXME: Extend the immediate range for the low word by using both
-+   ADDS and SUBS, since they set carry in the same way.  */
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
--  __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
-+  __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3"			\
- 	   : "=r" (sh), "=&r" (sl)					\
--	   : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
-+	   : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
--  do {									\
--    if (__builtin_constant_p (bl))					\
--      {									\
--	__asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
--		 : "=r" (sh), "=&r" (sl)				\
--		 : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
--      }									\
--    else /* only bh might be a constant */				\
--      __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3"			\
--	       : "=r" (sh), "=&r" (sl)					\
--	       : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
--    } while (0)
-+  __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3"			\
-+	   : "=r,r" (sh), "=&r,&r" (sl)					\
-+	   : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
- #define umul_ppmm(ph, pl, m0, m1) \
-   do {									\
-     UDItype __m0 = (m0), __m1 = (m1);					\
-
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 24fbb3db61..e895a485f8 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,19 +4,13 @@
 #
 #############################################################
 
-GMP_VERSION = 5.1.0
+GMP_VERSION = 5.1.1
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES
 GMP_LICENSE = LGPLv3+
 GMP_LICENSE_FILES = COPYING.LIB
-
 GMP_DEPENDENCIES = host-m4
 
-# Bad ARM assembly breaks on pure thumb
-ifeq ($(ARCH),arm)
-GMP_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -marm"
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 4bda4e6ed8875b46e64b401d13d77966a5159f5d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 26 Apr 2013 23:08:20 +0200
Subject: [PATCH 4884/6849] jansson: add empty line after header

Missed from previous commit.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jansson/jansson.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk
index c7183df9ce..9564fc0dce 100644
--- a/package/jansson/jansson.mk
+++ b/package/jansson/jansson.mk
@@ -3,6 +3,7 @@
 # jansson
 #
 #############################################################
+
 JANSSON_VERSION = 2.4
 JANSSON_SITE = http://www.digip.org/jansson/releases
 JANSSON_LICENSE = MIT

From b7175ef726ff8b94033a71c756620dc5fbad4fa1 Mon Sep 17 00:00:00 2001
From: Lionel Orry <lionel.orry@gmail.com>
Date: Wed, 27 Mar 2013 05:09:08 +0000
Subject: [PATCH 4885/6849] mongrel2: new package

[Peter: indent help, use _VERSION in _SITE]
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/mongrel2/Config.in                    | 18 +++++
 ...01-use-CC-variable-to-compile-procer.patch | 28 +++++++
 .../mongrel2-0002-Do-not-run-tests.patch      | 43 +++++++++++
 ...-Fix-Makefiles-for-cross-compilation.patch | 75 +++++++++++++++++++
 package/mongrel2/mongrel2.mk                  | 31 ++++++++
 6 files changed, 196 insertions(+)
 create mode 100644 package/mongrel2/Config.in
 create mode 100644 package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch
 create mode 100644 package/mongrel2/mongrel2-0002-Do-not-run-tests.patch
 create mode 100644 package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch
 create mode 100644 package/mongrel2/mongrel2.mk

diff --git a/package/Config.in b/package/Config.in
index 0b095d4bfb..bcd3d8dfb7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -700,6 +700,7 @@ source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
+source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
 source "package/msmtp/Config.in"
 source "package/mutt/Config.in"
diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
new file mode 100644
index 0000000000..05d10d7492
--- /dev/null
+++ b/package/mongrel2/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_MONGREL2
+	bool "mongrel2"
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ZEROMQ
+	depends on BR2_INSTALL_LIBSTDCPP # zeromq
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_LARGEFILE # zeromq -> util-linux
+	depends on BR2_USE_WCHAR # zeromq -> util-linux
+	help
+	  Mongrel2 is an application, language, and network architecture
+	  agnostic web server that focuses on web applications using
+	  modern browser technologies.
+
+	  Mongrel2 supports 17 languages and platforms, HTTP, Flash
+	  sockets, WebSockets, Long Polling, and many ways to deploy
+	  and hack on it.
+
+	  http://www.mongrel2.org
diff --git a/package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch b/package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch
new file mode 100644
index 0000000000..310177aef8
--- /dev/null
+++ b/package/mongrel2/mongrel2-0001-use-CC-variable-to-compile-procer.patch
@@ -0,0 +1,28 @@
+From d30cf797af4828e49fd3c0f25841e669dec05ed5 Mon Sep 17 00:00:00 2001
+From: Lionel Orry <lionel.orry@gmail.com>
+Date: Wed, 27 Mar 2013 14:02:00 +0100
+Subject: [PATCH 3/4] use CC variable to compile procer.
+
+This fixes procer tool cross-compilation issues.
+
+Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
+---
+ tools/procer/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/procer/Makefile b/tools/procer/Makefile
+index d0d7de0..bb9aa31 100644
+--- a/tools/procer/Makefile
++++ b/tools/procer/Makefile
+@@ -8,7 +8,7 @@ all: procer
+ 
+ 
+ procer: ../../build/libm2.a ${OBJECTS}
+-	gcc $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
++	$(CC) $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
+ 
+ clean:
+ 	rm -f *.o procer
+-- 
+1.8.1.4
+
diff --git a/package/mongrel2/mongrel2-0002-Do-not-run-tests.patch b/package/mongrel2/mongrel2-0002-Do-not-run-tests.patch
new file mode 100644
index 0000000000..557c27edd8
--- /dev/null
+++ b/package/mongrel2/mongrel2-0002-Do-not-run-tests.patch
@@ -0,0 +1,43 @@
+From 3cbef2195533f357c8a80c2840108662461273b7 Mon Sep 17 00:00:00 2001
+From: Lionel Orry <lionel.orry@gmail.com>
+Date: Wed, 27 Mar 2013 14:48:19 +0100
+Subject: [PATCH 4/4] Do not run tests.
+
+This patch is specific to cross-compiled environments and avoids running
+the tests on the host. It is not meant to be applied upstream.
+
+Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
+---
+ Makefile            | 2 +-
+ tools/m2sh/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7dc4089..ca72630 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c)
+ TESTS=$(patsubst %.c,%,${TEST_SRC})
+ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
+ 
+-all: bin/mongrel2 tests m2sh procer
++all: bin/mongrel2 m2sh procer filters config_modules
+ 
+ dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
+ dev: all
+diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile
+index b50d8a0..334e4da 100644
+--- a/tools/m2sh/Makefile
++++ b/tools/m2sh/Makefile
+@@ -9,7 +9,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC})
+ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES})
+ LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
+ 
+-all: ../lemon/lemon tests build/m2sh
++all: ../lemon/lemon build/m2sh
+ 
+ dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
+ dev: all
+-- 
+1.8.1.4
+
diff --git a/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch b/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch
new file mode 100644
index 0000000000..164d7f9e17
--- /dev/null
+++ b/package/mongrel2/mongrel2-0003-Fix-Makefiles-for-cross-compilation.patch
@@ -0,0 +1,75 @@
+From 298356c44a7df2b34c4e307c531d2010e2cb4b79 Mon Sep 17 00:00:00 2001
+From: Lionel Orry <lionel.orry@gmail.com>
+Date: Wed, 27 Mar 2013 15:56:56 +0100
+Subject: [PATCH 1/1] Fix Makefiles for cross-compilation
+
+The CFLAGS handling in mongrel2 is really messy and it is hard to make
+it behave correctly with cross-compiling environments. This patch
+restricts the Makefiles syntax to GNU Make, but help cross-compiling.
+
+This is not meant to be applied upstream.
+
+Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
+---
+ Makefile                      | 2 +-
+ tools/config_modules/Makefile | 2 +-
+ tools/filters/Makefile        | 2 +-
+ tools/m2sh/Makefile           | 2 +-
+ tools/procer/Makefile         | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6dce4a6..d48e05e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
++override CFLAGS += -g -O2 -Wall -Wextra -Isrc -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
+ LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
+ PREFIX?=/usr/local
+ 
+diff --git a/tools/config_modules/Makefile b/tools/config_modules/Makefile
+index 398490c..53f2255 100644
+--- a/tools/config_modules/Makefile
++++ b/tools/config_modules/Makefile
+@@ -1,5 +1,5 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
++override CFLAGS += -I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
+ LDFLAGS=$(OPTLIBS)
+ 
+ MONGO_SRC = mongo-c-driver/src/bson.c \
+diff --git a/tools/filters/Makefile b/tools/filters/Makefile
+index f9f4556..6077b79 100644
+--- a/tools/filters/Makefile
++++ b/tools/filters/Makefile
+@@ -1,5 +1,5 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
++override CFLAGS += -I../../src $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
+ LDFLAGS=$(OPTLIBS)
+ 
+ all: null.so
+diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile
+index b50d8a0..ba378c5 100644
+--- a/tools/m2sh/Makefile
++++ b/tools/m2sh/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
++override CFLAGS += -DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
+ LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
+ 
+ PREFIX?=/usr/local
+diff --git a/tools/procer/Makefile b/tools/procer/Makefile
+index d0d7de0..629b2e9 100644
+--- a/tools/procer/Makefile
++++ b/tools/procer/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
++override CFLAGS += -DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
+ PREFIX?=/usr/local
+ LIBS?=-lzmq 
+ SOURCES=$(wildcard *.c)
+-- 
+1.8.1.4
+
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
new file mode 100644
index 0000000000..c135437586
--- /dev/null
+++ b/package/mongrel2/mongrel2.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# Mongrel2
+#
+#############################################################
+
+MONGREL2_VERSION = 1.8.0
+MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz
+MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v$(MONGREL2_VERSION)
+MONGREL2_LICENSE = BSD-3c
+MONGREL2_LICENSE_FILES = LICENSE
+MONGREL2_DEPENDENCIES = sqlite zeromq
+
+define MONGREL2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		PREFIX=/usr all
+endef
+
+define MONGREL2_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		PREFIX=/usr DESTDIR=$(TARGET_DIR) install
+endef
+
+define MONGREL2_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/mongrel2
+	rm -f $(TARGET_DIR)/usr/bin/m2sh
+	rm -f $(TARGET_DIR)/usr/bin/procer
+endef
+
+$(eval $(generic-package))
+

From 9978b3ed84b24d5fe69e7497a8f708bb5e1e0b32 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 26 Apr 2013 09:49:20 +0000
Subject: [PATCH 4886/6849] xserver_xorg-server: bump to version 1.12.4 and add
 security patch

Bump to version 1.12.4 and add a security patch for CVE-2013-1940.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...rver_xorg-server-01-aarch64-support.patch} |  0
 ...xserver_xorg-server-02-cve-2013-1940.patch | 34 +++++++++++++++++++
 .../xserver_xorg-server.mk                    |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)
 rename package/x11r7/xserver_xorg-server/{xserver_xorg-server-aarch64-support.patch => xserver_xorg-server-01-aarch64-support.patch} (100%)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-aarch64-support.patch
similarity index 100%
rename from package/x11r7/xserver_xorg-server/xserver_xorg-server-aarch64-support.patch
rename to package/x11r7/xserver_xorg-server/xserver_xorg-server-01-aarch64-support.patch
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch
new file mode 100644
index 0000000000..d85494f902
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch
@@ -0,0 +1,34 @@
+From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Wed, 10 Apr 2013 06:09:01 +0000
+Subject: xf86: fix flush input to work with Linux evdev devices.
+
+So when we VT switch back and attempt to flush the input devices,
+we don't succeed because evdev won't return part of an event,
+since we were only asking for 4 bytes, we'd only get -EINVAL back.
+
+This could later cause events to be flushed that we shouldn't have
+gotten.
+
+This is a fix for CVE-2013-1940.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
+index ab3757a..4d08c1e 100644
+--- a/hw/xfree86/os-support/shared/posix_tty.c
++++ b/hw/xfree86/os-support/shared/posix_tty.c
+@@ -421,7 +421,8 @@ xf86FlushInput(int fd)
+ {
+     fd_set fds;
+     struct timeval timeout;
+-    char c[4];
++    /* this needs to be big enough to flush an evdev event. */
++    char c[256];
+ 
+     DebugF("FlushingSerial\n");
+     if (tcflush(fd, TCIFLUSH) == 0)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index f0b19aad39..1c514560c7 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XSERVER_XORG_SERVER_VERSION = 1.12.2
+XSERVER_XORG_SERVER_VERSION = 1.12.4
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make

From 56e99deca7c242837dcfacc73dc2e3a0715d174d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 26 Apr 2013 14:24:17 +0000
Subject: [PATCH 4887/6849] pciutils: bump to version 3.2.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 6219711fff..2cd10c0b5d 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCIUTILS_VERSION = 3.1.10
+PCIUTILS_VERSION = 3.2.0
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 PCIUTILS_INSTALL_STAGING = YES
 PCIUTILS_LICENSE = GPLv2+
@@ -24,6 +24,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 	PCIUTILS_DEPENDENCIES += busybox
 endif
 
+ifeq ($(BR2_PACKAGE_KMOD),y)
+	PCIUTILS_DEPENDENCIES += kmod
+	PCIUTILS_KMOD = yes
+else
+	PCIUTILS_KMOD = no
+endif
+
 define PCIUTILS_CONFIGURE_CMDS
 	$(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh
 	$(SED) 's/uname -s/echo Linux/' \
@@ -43,6 +50,7 @@ define PCIUTILS_BUILD_CMDS
 		SHARED=$(PCIUTILS_SHARED) \
 		ZLIB=$(PCIUTILS_ZLIB) \
 		DNS=$(PCIUTILS_DNS) \
+		LIBKMOD=$(PCIUTILS_KMOD) \
 		PREFIX=/usr
 endef
 

From c4efbeb5577c53e45e20262dbd6d9eff130aa24d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 05:15:27 +0000
Subject: [PATCH 4888/6849] squid: bump to version 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 5832aa7da5..45a0b2ceaa 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.3.3
+SQUID_VERSION = 3.3.4
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From b1c79ec15e724939d7ef2b2357d1f25de3a940f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 28 Apr 2013 02:31:24 +0000
Subject: [PATCH 4889/6849] nettle: bump to version 2.7

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nettle/nettle.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index 5080fab8f8..b3d273052b 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -1,10 +1,22 @@
-NETTLE_VERSION = 2.6
+NETTLE_VERSION = 2.7
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES
 NETTLE_LICENSE = LGPLv2.1+
 NETTLE_LICENSE_FILES = COPYING.LIB
 
+# ARM assembly requires v6+ ISA
+ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_arm10t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)
+NETTLE_CONF_OPT += --disable-assembler
+endif
+
+# ARM NEON
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+NETTLE_CONF_OPT += --enable-arm-neon
+else
+NETTLE_CONF_OPT += --disable-arm-neon
+endif
+
 define NETTLE_DITCH_DEBUGGING_CFLAGS
 	$(SED) '/CFLAGS/ s/ -ggdb3//' $(@D)/configure
 endef

From 41de02bd0277f5df5ce575f08f06958237fb2de7 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sat, 13 Apr 2013 06:52:41 +0000
Subject: [PATCH 4890/6849] at: bump to version 3.1.13

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ve-manual-compiler-check-with-AC_TR.patch} |  0
 ...ert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch} | 10 +++++-----
 ...ile.in-add-LDFLAGS-to-linking-stage.patch} |  0
 ...akefile.in-replace-IROOT-by-DESTDIR.patch} | 20 +++++++++----------
 ...t-0005-Makefile.in-make-install-fix.patch} | 14 ++++++-------
 ...x.patch => at-0006-getloadavg.c-fix.patch} |  8 ++++----
 ...t-0007-parsetime.l-include-config-h.patch} |  6 +++---
 package/at/at.mk                              |  3 ++-
 8 files changed, 31 insertions(+), 30 deletions(-)
 rename package/at/{at-3.1.12-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch => at-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch} (100%)
 rename package/at/{at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch => at-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch} (70%)
 rename package/at/{at-3.1.12-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch => at-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch} (100%)
 rename package/at/{at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch => at-0004-Makefile.in-replace-IROOT-by-DESTDIR.patch} (90%)
 rename package/at/{at-3.1.12-0006-Makefile.in-make-install-fix.patch => at-0005-Makefile.in-make-install-fix.patch} (91%)
 rename package/at/{at-3.1.12-0007-getloadavg-fix.patch => at-0006-getloadavg.c-fix.patch} (81%)
 rename package/at/{at-3.1.12-0007-include-config-h.patch => at-0007-parsetime.l-include-config-h.patch} (72%)

diff --git a/package/at/at-3.1.12-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch b/package/at/at-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
similarity index 100%
rename from package/at/at-3.1.12-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
rename to package/at/at-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
diff --git a/package/at/at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/package/at/at-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
similarity index 70%
rename from package/at/at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
rename to package/at/at-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
index ab6de44283..e4276ac208 100644
--- a/package/at/at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
+++ b/package/at/at-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
@@ -19,13 +19,13 @@ index 997a37f..cab80ed 100644
 -AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
 -    AC_MSG_RESULT(yes)
 -    AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1,
--	      [Define to 1 if compiler supports __attribute__((noreturn))]),
+-              [Define to 1 if compiler supports __attribute__((noreturn))]),
 -    AC_MSG_RESULT(no)
 +AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],
-+	[AC_MSG_RESULT(yes)
-+	 AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))],
-+	[AC_MSG_RESULT(no)]
++       [AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],
++       [AC_MSG_RESULT(yes)
++        AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))],
++       [AC_MSG_RESULT(no)]
  )
  dnl Checks for libraries.
  
diff --git a/package/at/at-3.1.12-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch b/package/at/at-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
similarity index 100%
rename from package/at/at-3.1.12-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
rename to package/at/at-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
diff --git a/package/at/at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/at-0004-Makefile.in-replace-IROOT-by-DESTDIR.patch
similarity index 90%
rename from package/at/at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
rename to package/at/at-0004-Makefile.in-replace-IROOT-by-DESTDIR.patch
index 6a295e37cf..0d1d5f6e3e 100644
--- a/package/at/at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
+++ b/package/at/at-0004-Makefile.in-replace-IROOT-by-DESTDIR.patch
@@ -11,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  Makefile.in |   64 +++++++++++++++++++++++++++++++-----------------------------
  1 file changed, 34 insertions(+), 30 deletions(-)
 
-Index: at-3.1.12/Makefile.in
+Index: at-3.1.13/Makefile.in
 ===================================================================
---- at-3.1.12.orig/Makefile.in
-+++ at-3.1.12/Makefile.in
+--- at-3.1.13.orig/Makefile.in
++++ at-3.1.13/Makefile.in
 @@ -16,6 +16,10 @@ docdir		= $(prefix)/doc
  atdocdir	= $(docdir)/at
  etcdir		= @ETCDIR@
@@ -41,14 +41,14 @@ Index: at-3.1.12/Makefile.in
 -	chmod 600 $(IROOT)$(LFILE)
 -	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
 -	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
--	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
 -	$(LN_S) -f at $(IROOT)$(bindir)/atq
 -	$(LN_S) -f at $(IROOT)$(bindir)/atrm
 -	$(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
 -	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
 -	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
 -	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
--	$(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
 -	$(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
 -	$(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
 -	cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
@@ -63,7 +63,7 @@ Index: at-3.1.12/Makefile.in
 +	touch $(DESTDIR)$(LFILE)
 +	chmod 600 $(DESTDIR)$(LFILE)
 +	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
-+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
++	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$
 +	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
 +	$(LN_S) -f at $(DESTDIR)$(bindir)/atq
 +	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm
@@ -80,14 +80,14 @@ Index: at-3.1.12/Makefile.in
 -	$(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
 +	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  	rm -f tmpman
--	$(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/
--	cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
+-	$(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/
+-	cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
 -	$(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
 -	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
 -		$(IROOT)$(mandir)/cat1/atq.1*
 -	rm -f $(IROOT)$(mandir)/cat1/atd.8*
-+	$(INSTALL) -g root -o root -m 644 at_allow.5 $(DESTDIR)$(man5dir)/
-+	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
++	$(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
++	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
 +	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
 +	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
 +		$(DESTDIR)$(mandir)/cat1/atq.1*
diff --git a/package/at/at-3.1.12-0006-Makefile.in-make-install-fix.patch b/package/at/at-0005-Makefile.in-make-install-fix.patch
similarity index 91%
rename from package/at/at-3.1.12-0006-Makefile.in-make-install-fix.patch
rename to package/at/at-0005-Makefile.in-make-install-fix.patch
index b9a4e56480..ad843449a2 100644
--- a/package/at/at-3.1.12-0006-Makefile.in-make-install-fix.patch
+++ b/package/at/at-0005-Makefile.in-make-install-fix.patch
@@ -8,10 +8,10 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  Makefile.in |   39 +++++++++++++++++++--------------------
  1 file changed, 19 insertions(+), 20 deletions(-)
 
-Index: at-3.1.12/Makefile.in
+Index: at-3.1.13/Makefile.in
 ===================================================================
---- at-3.1.12.orig/Makefile.in
-+++ at-3.1.12/Makefile.in
+--- at-3.1.13.orig/Makefile.in
++++ at-3.1.13/Makefile.in
 @@ -90,35 +90,34 @@ atrun: atrun.in
  	$(CC) -c $(CFLAGS) $(DEFS) $*.c
  
@@ -32,7 +32,7 @@ Index: at-3.1.12/Makefile.in
  	touch $(DESTDIR)$(LFILE)
  	chmod 600 $(DESTDIR)$(LFILE)
 -	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
--	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
+-	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$
 -	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
 +	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/
 +	$(INSTALL) -m 6755 at $(DESTDIR)$(bindir)
@@ -59,9 +59,9 @@ Index: at-3.1.12/Makefile.in
 -	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
 +	$(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  	rm -f tmpman
--	$(INSTALL) -g root -o root -m 644 at_allow.5 $(DESTDIR)$(man5dir)/
-+	$(INSTALL) -m 644 at_allow.5 $(DESTDIR)$(man5dir)/
- 	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
+-	$(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
++	$(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
+ 	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
 -	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
 +	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
  	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
diff --git a/package/at/at-3.1.12-0007-getloadavg-fix.patch b/package/at/at-0006-getloadavg.c-fix.patch
similarity index 81%
rename from package/at/at-3.1.12-0007-getloadavg-fix.patch
rename to package/at/at-0006-getloadavg.c-fix.patch
index 2edb4f0d58..e0739271ef 100644
--- a/package/at/at-3.1.12-0007-getloadavg-fix.patch
+++ b/package/at/at-0006-getloadavg.c-fix.patch
@@ -1,6 +1,6 @@
 [PATCH]: fix getloadavg.c compilation, revert to 3.1.10 version
 
-getloadavg.c shipped with 3.1.12 doesn't compile because it references
+getloadavg.c shipped with 3.1.13 doesn't compile because it references
 headers not shipped. Fix it by simply reverting to the 3.1.10 version.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
@@ -8,10 +8,10 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  getloadavg.c |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: at-3.1.12/getloadavg.c
+Index: at-3.1.13/getloadavg.c
 ===================================================================
---- at-3.1.12.orig/getloadavg.c
-+++ at-3.1.12/getloadavg.c
+--- at-3.1.13.orig/getloadavg.c
++++ at-3.1.13/getloadavg.c
 @@ -66,11 +66,12 @@ Boston, MA  02110-1301  USA */
  
  /* This should always be first.  */
diff --git a/package/at/at-3.1.12-0007-include-config-h.patch b/package/at/at-0007-parsetime.l-include-config-h.patch
similarity index 72%
rename from package/at/at-3.1.12-0007-include-config-h.patch
rename to package/at/at-0007-parsetime.l-include-config-h.patch
index 8afc502c8d..f4111ebf67 100644
--- a/package/at/at-3.1.12-0007-include-config-h.patch
+++ b/package/at/at-0007-parsetime.l-include-config-h.patch
@@ -2,10 +2,10 @@ Make sure to include config.h so that NEEDS_* macros are properly
 taken into account. This was a problem for NEEDS_YYWRAP, which was set
 to 1 in config.h, but the corresponding code wasn't compiled in.
 
-Index: at-3.1.12/parsetime.l
+Index: at-3.1.13/parsetime.l
 ===================================================================
---- at-3.1.12.orig/parsetime.l	2010-02-10 00:17:46.000000000 +0100
-+++ at-3.1.12/parsetime.l	2010-02-10 00:18:07.000000000 +0100
+--- at-3.1.13.orig/parsetime.l
++++ at-3.1.13/parsetime.l
 @@ -4,6 +4,7 @@
  #include <time.h>
  #include "y.tab.h"
diff --git a/package/at/at.mk b/package/at/at.mk
index 6432ae31c0..ad024e3a1c 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -3,7 +3,8 @@
 # at
 #
 #############################################################
-AT_VERSION = 3.1.12
+
+AT_VERSION = 3.1.13
 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz
 AT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
 # missing deps for parsetime.l

From ed205c3878ddce10f485be6bb39d89b87ebec867 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@piout.net>
Date: Mon, 4 Feb 2013 12:26:12 +0000
Subject: [PATCH 4891/6849] Add defconfig for ATMEL at91sam9g45m10ek board

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9g45m10ek_defconfig | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 configs/at91sam9g45m10ek_defconfig

diff --git a/configs/at91sam9g45m10ek_defconfig b/configs/at91sam9g45m10ek_defconfig
new file mode 100644
index 0000000000..c958859df1
--- /dev/null
+++ b/configs/at91sam9g45m10ek_defconfig
@@ -0,0 +1,9 @@
+BR2_arm=y
+BR2_arm926t=y
+BR2_PACKAGE_HOST_SAM_BA=y
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9m10g45ek"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="at91sam9m10g45ek_nandflash"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9g45"

From 861121b4f44d596569dd0c434c4d7aac6f8815e5 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:42 +0000
Subject: [PATCH 4892/6849] directfb: bumping version to 1.6.3

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 4f05ed271a..8c701db148 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -3,8 +3,8 @@
 # directfb
 #
 #############################################################
-DIRECTFB_VERSION_MAJOR = 1.4
-DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).17
+DIRECTFB_VERSION_MAJOR = 1.6
+DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).3
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_LICENSE = LGPLv2.1+

From 3fe23510961fe44db2bf3747163b1a8125ea5be4 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:43 +0000
Subject: [PATCH 4893/6849] divine: bumping version to 1.6.3

To be identical to the version of directfb switching also to version
1.6.3. The divine package needs at minimum directfb 1.6.0 as
dependencie.
Adding the license information to the package divine.
Also switch to Git for getting the package source because the tar.gz
for version 1.6.3 on directfb.org is broken because of a missed header
file inside.

[Peter: tweak comments]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/divine/divine.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index b94960121f..596debff8d 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -4,11 +4,16 @@
 #
 #############################################################
 
-DIVINE_VERSION = 0.4.0
-DIVINE_SITE = http://www.directfb.org/downloads/Extras
-DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz
+# tagged version 1.6.3, tarball is missing files
+DIVINE_VERSION = 83cafc257a42b9465cd9d6185bf66b8c1b7ed704
+DIVINE_SITE = git://git.directfb.org/git/directfb/extras/DiVine.git
+DIVINE_LICENSE = LGPLv2.1+
+DIVINE_LICENSE_FILE = COPYING
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
 DIVINE_CONFIG_SCRIPTS = divine-config
 
+# package has no configure script so we have to generate it
+DIVINE_AUTORECONF = YES
+
 $(eval $(autotools-package))

From 6d1a1431d0d4d860b57ae05ee01da1be17eac0e5 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:44 +0000
Subject: [PATCH 4894/6849] directfb: expanding the help strings

Adding a helper string for the PXA3xx and graphics driver from Marvell
and the EP9x graphics driver from Cirrus Logic.

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index a1845689de..796be3794e 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -49,10 +49,21 @@ config BR2_PACKAGE_DIRECTFB_MATROX
 config BR2_PACKAGE_DIRECTFB_PXA3XX
 	bool "compile pxa3xx graphics driver"
 	depends on BR2_arm
+	help
+	  The Marvell PXA3xx Processor Family is a system-on-chip based
+	  on XScale® microarchitecture. This option enables the graphic
+	  driver support for the PXA3xx processor family.
+
+	  http://www.marvell.com/application-processors/pxa-family/
 
 config BR2_PACKAGE_DIRECTFB_EP9X
 	bool "compile ep9x graphics driver"
 	depends on BR2_arm
+	help
+	  Enable the graphic driver support for the EP93xx ARMv9 based
+	  processors from Cirrus Logic.
+
+	  http://cirrus.com/en/products/arm9.html
 
 config BR2_PACKAGE_DIRECTFB_UNICHROME
 	bool "compile unichrome graphics driver"

From 9bff3c65259911dc075af14d425cd124b7da2ecf Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:45 +0000
Subject: [PATCH 4895/6849] directfb: fixing typo in variables

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in   | 4 ++--
 package/directfb/directfb.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 796be3794e..23f4947376 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -109,13 +109,13 @@ config BR2_PACKAGE_DIRECTFB_PNG
 	default y
 	select BR2_PACKAGE_LIBPNG
 
-config BR2_PACKAGE_DIRECTB_DITHER_RGB16
+config BR2_PACKAGE_DIRECTFB_DITHER_RGB16
 	bool "enable advanced dithering of RGB16 surfaces"
 	help
 	  Enable dithering when loading images to RGB16 surfaces.
 	  This increases the data section by 64 KBytes.
 
-config BR2_PACKAGE_DIRECTB_TESTS
+config BR2_PACKAGE_DIRECTFB_TESTS
 	bool "build directfb tests"
 
 endif # BR2_PACKAGE_DIRECTFB
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 8c701db148..5ead0846d3 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -108,13 +108,13 @@ else
 DIRECTFB_CONF_OPT += --disable-jpeg
 endif
 
-ifeq ($(BR2_PACKAGE_DIRECTB_DITHER_RGB16),y)
+ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y)
 DIRECTFB_CONF_OPT += --with-dither-rgb16=advanced
 else
 DIRECTFB_CONF_OPT += --with-dither-rgb16=none
 endif
 
-ifeq ($(BR2_PACKAGE_DIRECTB_TESTS),y)
+ifeq ($(BR2_PACKAGE_DIRECTFB_TESTS),y)
 DIRECTFB_CONF_OPT += --with-tests
 endif
 

From 76de0f8045371688dab68c0e240b9b8e6d5a45f1 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:46 +0000
Subject: [PATCH 4896/6849] Config.in.legacy: adding renamed BR2 Options

Related to the changed directfb variables for
BR2_PACKAGE_DIRECTFB_DITHER_RGB16 and
BR2_PACKAGE_DIRECTFB_TESTS
adding a legacy check.

[Peter: fix DIRECTB_TESTS typo]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 9de4e14036..5165138581 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -92,6 +92,22 @@ config BR2_PACKAGE_GDB_HOST
 	  the BR2_PACKAGE_GDB_HOST option has been renamed
 	  BR2_PACKAGE_HOST_GDB.
 
+config BR2_PACKAGE_DIRECTB_DITHER_RGB16
+	bool "DirectFB RGB16 dithering option has been renamed"
+	select BR2_PACKAGE_DIRECTFB_DITHER_RGB16
+	select BR2_LEGACY
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_DIRECTFB_DITHER_RGB16.
+
+config BR2_PACKAGE_DIRECTB_TESTS
+	bool "DirectFB Tests option has been renamed"
+	select BR2_PACKAGE_DIRECTFB_TESTS
+	select BR2_LEGACY
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_DIRECTFB_TESTS.
+
 #
 # Legacy options since 2012.11
 #

From 9677b779e7b0a7908b90ec1d24b56f69634554cf Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:47 +0000
Subject: [PATCH 4897/6849] directfb-examples: correct indentation and expand
 help text

[Peter: drop trailing newline]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb-examples/Config.in | 173 ++++++++++++++++++++--------
 1 file changed, 123 insertions(+), 50 deletions(-)

diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in
index c4637847dd..be5ba8619e 100644
--- a/package/directfb-examples/Config.in
+++ b/package/directfb-examples/Config.in
@@ -1,97 +1,170 @@
 config BR2_PACKAGE_DIRECTFB_EXAMPLES
-       bool "directfb examples"
-       depends on BR2_PACKAGE_DIRECTFB
+	bool "directfb examples"
+	depends on BR2_PACKAGE_DIRECTFB
+	help
+	  The DirectFB-examples package contains a set of simple DirectFB
+	  applications that can be used to test and demonstrate various
+	  DirectFB features.
+
+	  http://directfb.org/downloads/Extras/README.DirectFB-examples
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI
-       bool "usr/bin/df_andi"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_andi"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Penguin demo, press 'space' to form convergence logo,
+	  's'/'d' to spawn/destroy 'a' penguin, 'r' to revive penguin
+	  after space was pressed, 'c' tests clipping.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD
-       bool "usr/bin/df_bltload"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_bltload"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Reads information from /proc/bltstat.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD
-       bool "usr/bin/df_cpuload"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_cpuload"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  CPU Load with data from /proc/stat.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER
-       bool "usr/bin/df_databuffer"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_databuffer"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Simple test application for data buffers.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD
-       bool "usr/bin/df_dioload"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_dioload"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Disk IO with data from /proc/stat.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK
-       bool "usr/bin/df_dok"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_dok"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  DirectFB benchmark application, runs some tests and
+	  displays benchmark results afterwards.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST
-       bool "usr/bin/df_drivertest"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_drivertest"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Tool to check drivers for bugs and accuracy.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE
-       bool "usr/bin/df_fire"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_fire"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  The famous fire effect ported to DirectFB (16 bpp only).
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP
-       bool "usr/bin/df_flip"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_flip"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Raw Flip() benchmark.
+
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS
-       bool "usr/bin/df_fonts"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_fonts"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Takes a list of font files and shows character tables.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT
-       bool "usr/bin/df_input"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_input"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Test application for input devices.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK
-       bool "usr/bin/df_joystick"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_joystick"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  A colored version of df_particle, fointain can be moved with
+	  joystick. The particles of different colors can be spawned
+	  with different joystick buttons (1-4).
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES
-       bool "usr/bin/df_knuckles"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_knuckles"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  3D skull drawn using triangles that can be rotated using
+	  the mouse. 'Space' switches to wireframe, 'b' toggles
+	  backface culling.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER
-       bool "usr/bin/df_layer"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_layer"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Simple videoplayer with layers.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO
-       bool "usr/bin/df_neo"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_neo"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Port from a gdk-pixbuf demo to DirectFB, uses scaling,
+	  alpha blending and color modulation, use cursor keys and
+	  space to change parameters.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD
-       bool "usr/bin/df_netload"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_netload"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Network statistica from /proc/net/dev.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE
-       bool "usr/bin/df_palette"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_palette"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  A example blitting from a surface with a
+	  rotating/morphing palette.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE
-       bool "usr/bin/df_particle"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_particle"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  A moving fountain consisting of alphablended rectangles,
+	  nice and fast if hardware accelerated.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_PORTER
-       bool "usr/bin/df_porter"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_porter"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Shows porter/duff blending rules.
+
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS
-       bool "usr/bin/df_stress"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_stress"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Stress tests surface manager, for debugging purposes only.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE
-       bool "usr/bin/df_texture"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_texture"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  A simple texture example. The 3d windows can be rotated
+	  with the mouse.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO
-       bool "usr/bin/df_video"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_video"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Shows window stack with alpha blending and video playback
+	  in a moving window.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE
-       bool "usr/bin/df_video_particle"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_video_particle"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Same as df_particle, but the rectangles have been
+	  replaced by a video (via video4linux). Nice color effects.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW
-       bool "usr/bin/df_window"
-       depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	bool "usr/bin/df_window"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Simple demonstration of the DirectFB window stack, follow
+	  the instructions in the upper left corner. Pass a video
+	  device file or a movie file on the command-line to enable
+	  video playback in one of the windows.

From 4311d719fd7e2fbd117f96ccb37ea4c2b6add43d Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:48 +0000
Subject: [PATCH 4898/6849] directfb-examples: bump to version 1.6.0

The previous version 1.2.0 isn't acting well with directfb 1.6.3 so
increasing the version to the latest available version on directfb.org.

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb-examples/directfb-examples.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 26cc499745..c7235d6bf2 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DIRECTFB_EXAMPLES_VERSION = 1.2.0
+DIRECTFB_EXAMPLES_VERSION = 1.6.0
 DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_INSTALL_STAGING = YES

From 7a6f1927031d80bce111617b84e7d80e44f101c8 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:49 +0000
Subject: [PATCH 4899/6849] directfb-exambles: adding new examples to the menu

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb-examples/Config.in            | 12 ++++++++++++
 package/directfb-examples/directfb-examples.mk |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in
index be5ba8619e..afd6d6d5a3 100644
--- a/package/directfb-examples/Config.in
+++ b/package/directfb-examples/Config.in
@@ -99,6 +99,18 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER
 	help
 	  Simple videoplayer with layers.
 
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX
+	bool "usr/bin/df_matrix"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Testing SetMatrix() for free transforms.
+
+config BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER
+	bool "usr/bin/df_matrix_water"
+	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
+	help
+	  Same as df_matrix, but using new Water API.
+
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO
 	bool "usr/bin/df_neo"
 	depends on BR2_PACKAGE_DIRECTFB_EXAMPLES
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index c7235d6bf2..13420476cb 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -27,6 +27,8 @@ DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT) += usr/bin/df_i
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK) += usr/bin/df_joystick
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES) += usr/bin/df_knuckles
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER) += usr/bin/df_layer
+DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX) += usr/bin/df_matrix
+DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_MATRIX_WATER) += usr/bin/df_matrix_water
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO) += usr/bin/df_neo
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD) += usr/bin/df_netload
 DIRECTFB_EXAMPLES_TARGETS_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE) += usr/bin/df_palette

From ea5bfcae5fc777c6677d19ca00059c0094188f3e Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:50 +0000
Subject: [PATCH 4900/6849] directfb-examples: adding license information

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb-examples/directfb-examples.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 13420476cb..14e544c30d 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -7,6 +7,8 @@
 DIRECTFB_EXAMPLES_VERSION = 1.6.0
 DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
+DIRECTFB_EXAMPLES_LICENSE = MIT
+DIRECTFB_EXAMPLES_LICENSE_FILE = COPYING
 DIRECTFB_EXAMPLES_INSTALL_STAGING = YES
 DIRECTFB_EXAMPLES_DEPENDENCIES = directfb
 

From 36f7b96d6f51d340a2d0bf32b981c00517874410 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 10 Mar 2013 08:32:51 +0000
Subject: [PATCH 4901/6849] sawman: bumping version to 1.6.3

After switching directfb to 1.6.3 sawman must also be bumped to the
current version because the old version can't be builded with newer
libs and headers from directfb.

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sawman/sawman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index 0faae9c110..b8c1121c62 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -3,7 +3,7 @@
 # SAWMAN
 #
 #############################################################
-SAWMAN_VERSION = 1.4.16
+SAWMAN_VERSION = 1.6.3
 SAWMAN_SOURCE = SaWMan-$(SAWMAN_VERSION).tar.gz
 SAWMAN_SITE = http://www.directfb.org/downloads/Extras
 SAWMAN_INSTALL_STAGING = YES

From 37c6e51a15e8f932cfe23b60d2d37c47213fde83 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 28 Apr 2013 21:50:05 +0200
Subject: [PATCH 4902/6849] directfb-examples: drop version number from bzero
 patch

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ....0-remove-bzero.patch => directfb-examples-remove-bzero.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/directfb-examples/{directfb-examples-1.2.0-remove-bzero.patch => directfb-examples-remove-bzero.patch} (100%)

diff --git a/package/directfb-examples/directfb-examples-1.2.0-remove-bzero.patch b/package/directfb-examples/directfb-examples-remove-bzero.patch
similarity index 100%
rename from package/directfb-examples/directfb-examples-1.2.0-remove-bzero.patch
rename to package/directfb-examples/directfb-examples-remove-bzero.patch

From 1655f3c5b735b3dad75df1665b47d309fdf3afcb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 28 Apr 2013 22:32:39 +0200
Subject: [PATCH 4903/6849] sdl: fix directfb configure check

The configure script nicely supports a preconfigured directfb-config
(using ac_cv_path_DIRECTFBCONFIG), except for when it checks the directfb
version where it simply uses whatever directfb-config is in the path,
breaking the build when this isn't available / recent enough.

Fix is to use the correct one instead. As SDL doesn't autoreconf cleanly,
also patch the generated configure script.

Finally move the ac_cv_path_DIRECTFBCONFIG setting under the directfb
conditional as it is only needed there.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sdl/sdl-use-correct-directfb-config.patch | 40 +++++++++++++++++++
 package/sdl/sdl.mk                            |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 package/sdl/sdl-use-correct-directfb-config.patch

diff --git a/package/sdl/sdl-use-correct-directfb-config.patch b/package/sdl/sdl-use-correct-directfb-config.patch
new file mode 100644
index 0000000000..225079083f
--- /dev/null
+++ b/package/sdl/sdl-use-correct-directfb-config.patch
@@ -0,0 +1,40 @@
+[PATCH] configure.in: use correct directfb-config in version check
+
+The configure script has just checked for the correct directfb-config
+script, so also use it for the version check instead of whatever
+might be in the path.
+
+Also patch the generated configure, as it doesn't cleanly autoreconf.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: SDL-1.2.15/configure.in
+===================================================================
+--- SDL-1.2.15.orig/configure.in
++++ SDL-1.2.15/configure.in
+@@ -1276,7 +1276,7 @@
+         else
+             set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
+             NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+-            set -- `directfb-config --version | sed 's/\./ /g'`
++            set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'`
+             HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+             if test $HAVE_VERSION -ge $NEED_VERSION; then
+                 DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
+Index: SDL-1.2.15/configure
+===================================================================
+--- SDL-1.2.15.orig/configure
++++ SDL-1.2.15/configure
+@@ -24958,7 +24958,7 @@
+         else
+             set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
+             NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+-            set -- `directfb-config --version | sed 's/\./ /g'`
++            set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'`
+             HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+             if test $HAVE_VERSION -ge $NEED_VERSION; then
+                 DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index fb47c4d19e..59576fbc42 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -8,7 +8,6 @@ SDL_VERSION = 1.2.15
 SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz
 SDL_SITE = http://www.libsdl.org/release
 SDL_INSTALL_STAGING = YES
-SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
 
 ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
 SDL_CONF_OPT+=--enable-video-fbcon=yes
@@ -19,6 +18,7 @@ endif
 ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
 SDL_DEPENDENCIES += directfb
 SDL_CONF_OPT+=--enable-video-directfb=yes
+SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
 else
 SDL_CONF_OPT=--enable-video-directfb=no
 endif

From 4460c401976d7335e8cf5555331c468822de77cf Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Sun, 28 Apr 2013 16:44:24 +0000
Subject: [PATCH 4904/6849] tcpreplay: needs MMU

Fixes:
http://autobuild.buildroot.org/results/e95f23f79ba139681fb1e51375719329afe7e22c

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpreplay/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/tcpreplay/Config.in b/package/tcpreplay/Config.in
index 6d3a3bf4de..7337070a8e 100644
--- a/package/tcpreplay/Config.in
+++ b/package/tcpreplay/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TCPREPLAY
 	bool "tcpreplay"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBPCAP
 	help
 	  Tcpreplay is a tool for replaying network traffic from files saved

From ebb07458b56326b3bca6f65a5881d9ef05bb8434 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Apr 2013 09:17:15 +0200
Subject: [PATCH 4905/6849] pciutils: ensure cross-pkgconfig is used

For build with libkmod.

Fixes http://autobuild.buildroot.net/results/70cdca5c5a41a14277c616fba3a58d8aa5fa5a2c/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 2cd10c0b5d..c1ae094378 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -40,7 +40,7 @@ define PCIUTILS_CONFIGURE_CMDS
 endef
 
 define PCIUTILS_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" \
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" \
 		HOST="$(KERNEL_ARCH)-linux" \
 		OPT="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \

From c322c57cc458b143672056774f4e3ecd05c7173f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Apr 2013 09:24:44 +0200
Subject: [PATCH 4906/6849] kernel-headers: bump 3.8.10, add 3.9

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 17bd80b63a..12c53d8895 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_8
+	default BR2_KERNEL_HEADERS_3_9
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -47,6 +47,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_8
 		bool "Linux 3.8.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_9
+		bool "Linux 3.9.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Manually specified Linux version"
 
@@ -71,6 +74,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.9"		if BR2_KERNEL_HEADERS_3_8
+	default "3.8.10"	if BR2_KERNEL_HEADERS_3_8
+	default "3.9"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 75b7dc6860706baaae3bf1dc58c10def0df03e8e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Apr 2013 09:49:16 +0200
Subject: [PATCH 4907/6849] linux: default to 3.9, remove 3.8

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index ec1a636c90..3ec687fc02 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -20,8 +20,8 @@ if BR2_LINUX_KERNEL
 choice
 	prompt "Kernel version"
 
-config BR2_LINUX_KERNEL_3_8
-	bool "3.8.9"
+config BR2_LINUX_KERNEL_3_9
+	bool "3.9"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.8.9" if BR2_LINUX_KERNEL_3_8
+	default "3.9" if BR2_LINUX_KERNEL_3_9
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From de33240fe61ac9e779d7eb5cf8e4eba12483f3ad Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 29 Apr 2013 15:16:00 +0200
Subject: [PATCH 4908/6849] directfb: 1.6.x needs C++ support in toolchain

Fixes http://autobuild.buildroot.net/results/b36f5492401a8bba8ed04614decfbf4152464740/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in                   | 5 +++--
 package/multimedia/gst-plugins-bad/Config.in | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 23f4947376..b9ff5f9a08 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DIRECTFB
 	bool "directfb"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
@@ -120,5 +121,5 @@ config BR2_PACKAGE_DIRECTFB_TESTS
 
 endif # BR2_PACKAGE_DIRECTFB
 
-comment "directfb needs a toolchain with thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "directfb needs a toolchain with C++ and thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 370259bbfa..2271036c84 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -263,6 +263,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
 	select BR2_PACKAGE_DIRECTFB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"

From 4b4d0f2f1b6528c0ffd347b3946c0916aec8667b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Apr 2013 08:30:24 +0000
Subject: [PATCH 4909/6849] configs/qemu: bump relevant configs to kernel
 version 3.9.x

Problematic configurations not bumped:

powerpc-g3beige: Kernel oops on boot
sh4-r2d - Qemu doesn't emulate advanced features from the console UART
sparc-ss10 - Illegal instruction

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../arm-versatile/{linux-3.8.config => linux-3.9.config}  | 0
 .../{linux-3.8.config => linux-3.9.config}                | 0
 .../{linux-3.8.config => linux-3.9.config}                | 0
 .../mips-malta/{linux-3.8.config => linux-3.9.config}     | 0
 .../mips64-malta/{linux-3.8.config => linux-3.9.config}   | 0
 .../mipsel-malta/{linux-3.8.config => linux-3.9.config}   | 0
 board/qemu/x86/{linux-3.8.config => linux-3.9.config}     | 0
 board/qemu/x86_64/{linux-3.8.config => linux-3.9.config}  | 0
 configs/qemu_arm_nuri_defconfig                           | 6 +++---
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 configs/qemu_arm_vexpress_defconfig                       | 6 +++---
 configs/qemu_microblazebe_mmu_defconfig                   | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                   | 4 ++--
 configs/qemu_mips64_malta_defconfig                       | 8 ++++----
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 configs/qemu_ppc_g3beige_defconfig                        | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig                      | 6 +++---
 configs/qemu_ppc_virtex_ml507_defconfig                   | 6 +++---
 configs/qemu_sh4_r2d_defconfig                            | 2 +-
 configs/qemu_sparc_ss10_defconfig                         | 4 ++--
 configs/qemu_x86_64_defconfig                             | 8 ++++----
 configs/qemu_x86_defconfig                                | 8 ++++----
 23 files changed, 44 insertions(+), 44 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/mips-malta/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/mips64-malta/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/x86/{linux-3.8.config => linux-3.9.config} (100%)
 rename board/qemu/x86_64/{linux-3.8.config => linux-3.9.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.8.config b/board/qemu/arm-versatile/linux-3.9.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.8.config
rename to board/qemu/arm-versatile/linux-3.9.config
diff --git a/board/qemu/microblazebe-mmu/linux-3.8.config b/board/qemu/microblazebe-mmu/linux-3.9.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.8.config
rename to board/qemu/microblazebe-mmu/linux-3.9.config
diff --git a/board/qemu/microblazeel-mmu/linux-3.8.config b/board/qemu/microblazeel-mmu/linux-3.9.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.8.config
rename to board/qemu/microblazeel-mmu/linux-3.9.config
diff --git a/board/qemu/mips-malta/linux-3.8.config b/board/qemu/mips-malta/linux-3.9.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.8.config
rename to board/qemu/mips-malta/linux-3.9.config
diff --git a/board/qemu/mips64-malta/linux-3.8.config b/board/qemu/mips64-malta/linux-3.9.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.8.config
rename to board/qemu/mips64-malta/linux-3.9.config
diff --git a/board/qemu/mipsel-malta/linux-3.8.config b/board/qemu/mipsel-malta/linux-3.9.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.8.config
rename to board/qemu/mipsel-malta/linux-3.9.config
diff --git a/board/qemu/x86/linux-3.8.config b/board/qemu/x86/linux-3.9.config
similarity index 100%
rename from board/qemu/x86/linux-3.8.config
rename to board/qemu/x86/linux-3.9.config
diff --git a/board/qemu/x86_64/linux-3.8.config b/board/qemu/x86_64/linux-3.9.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.8.config
rename to board/qemu/x86_64/linux-3.9.config
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index b2493eba9a..f83e53dc44 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -14,12 +14,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySAC1"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index db18d5ba96..dcfd0add3f 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.9.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 6b2e5ab929..d48c0aab06 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -14,12 +14,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 5eeb31e874..d79fc1deb2 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.9.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 2a14c07cf9..9a250721a5 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.9.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index e69cb56109..751ce5bce4 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,15 +10,15 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 6134cb4ed4..7049de6580 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 81723f6341..4936df1591 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,15 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 10701cd981..884291d18b 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_8=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.8.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 07b9ae9690..044090460a 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,13 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 4fd2eb8205..909448d8c7 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -6,8 +6,8 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index c04f6e89ab..469ab28aaf 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.39"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.44"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index eb21c318f4..7e58a0f456 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,8 +6,8 @@ BR2_sparc_v8=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_7=y
+# Lock to 3.4 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_4=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index e22da44648..0843062843 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.9.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 55b0f53bec..9c2f050241 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.9.config"

From 8f434ff274941c6facf892098b9e2bf6253f8fe3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Apr 2013 08:54:24 +0000
Subject: [PATCH 4910/6849] toolchain/arm: add support for Marvell PJ4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm      |  4 ++++
 toolchain/gcc/Config.in | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index f706dcc4f6..2f4c0c8778 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -47,6 +47,8 @@ config BR2_cortex_a15
 	select BR2_ARM_CPU_HAS_NEON
 config BR2_fa526
 	bool "fa526/626"
+config BR2_pj4
+	bool "pj4"
 config BR2_strongarm
 	bool "strongarm sa110/sa1100"
 config BR2_xscale
@@ -115,6 +117,7 @@ config BR2_GCC_TARGET_TUNE
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a15"	if BR2_cortex_a15
 	default "fa526"		if BR2_fa526
+	default "marvell-pj4"	if BR2_pj4
 	default "strongarm"	if BR2_strongarm
 	default "xscale"	if BR2_xscale
 	default "iwmmxt"	if BR2_iwmmxt
@@ -135,6 +138,7 @@ config BR2_GCC_TARGET_ARCH
 	default "armv7-a"	if BR2_cortex_a9
 	default "armv7-a"	if BR2_cortex_a15
 	default "armv4"		if BR2_fa526
+	default "armv7-a"	if BR2_pj4
 	default "armv4"		if BR2_strongarm
 	default "armv5te"	if BR2_xscale
 	default "iwmmxt"	if BR2_iwmmxt
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d7e8715bd5..aae422c757 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -18,25 +18,25 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526
+		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526
+		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
 
 	config BR2_GCC_VERSION_4_7_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.7.x"
 

From 26406543db143b546eade6f61629c85a71208329 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 27 Mar 2013 10:28:00 +0000
Subject: [PATCH 4911/6849] libjson: new package

[Peter: fix static builds, don't run ldconfig, disable assert checks]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libjson/Config.in                     | 11 ++++
 .../libjson-0001-fix-broken-makefile.patch    | 16 ++++++
 package/libjson/libjson.mk                    | 56 +++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 package/libjson/Config.in
 create mode 100644 package/libjson/libjson-0001-fix-broken-makefile.patch
 create mode 100644 package/libjson/libjson.mk

diff --git a/package/Config.in b/package/Config.in
index bcd3d8dfb7..bdc1de167a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -621,6 +621,7 @@ source "package/ezxml/Config.in"
 source "package/jansson/Config.in"
 source "package/json-c/Config.in"
 source "package/json-glib/Config.in"
+source "package/libjson/Config.in"
 source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
diff --git a/package/libjson/Config.in b/package/libjson/Config.in
new file mode 100644
index 0000000000..949c748f35
--- /dev/null
+++ b/package/libjson/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBJSON
+	bool "libjson"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  A JSON reader and writer which is super-efficient and usually
+	  runs circles around other JSON libraries.
+
+	  http://sourceforge.net/projects/libjson/
+
+comment "libjson requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libjson/libjson-0001-fix-broken-makefile.patch b/package/libjson/libjson-0001-fix-broken-makefile.patch
new file mode 100644
index 0000000000..8ceb0cac3a
--- /dev/null
+++ b/package/libjson/libjson-0001-fix-broken-makefile.patch
@@ -0,0 +1,16 @@
+Fix the broken libjson makefile.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/makefile b/makefile
+--- a/makefile	2012-05-30 10:15:42.000000000 +0100
++++ b/makefile	2013-03-27 18:45:34.814670534 +0000
+@@ -170,7 +170,7 @@ include_path     = $(prefix)/$(includedi
+ # Usage check
+ ifdef CXXFLAGS
+ ifdef BUILD_TYPE
+-	$(error CXXFLAGS and BUILD_TYPE are mutually exclusive)
++$(error CXXFLAGS and BUILD_TYPE are mutually exclusive)
+ endif
+ endif
+ 
diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
new file mode 100644
index 0000000000..deca0f845d
--- /dev/null
+++ b/package/libjson/libjson.mk
@@ -0,0 +1,56 @@
+#############################################################
+#
+# libjson
+#
+#############################################################
+
+LIBJSON_VERSION = 7.6.1
+LIBJSON_SITE = http://downloads.sourceforge.net/project/libjson
+LIBJSON_SOURCE = libjson_$(LIBJSON_VERSION).zip
+LIBJSON_INSTALL_STAGING = YES
+LIBJSON_LICENSE = BSD-2c
+LIBJSON_LICENSE_FILES = License.txt
+
+LIBJSON_MAKE_OPT = BUILD_TYPE= SHARED=$(if $(BR2_PREFER_STATIC_LIB),0,1) \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -DNDEBUG"
+
+define LIBJSON_EXTRACT_CMDS
+	unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
+	mv $(@D)/libjson/* $(@D)
+	$(RM) -r $(@D)/libjson
+	$(SED) '/ldconfig/d' $(@D)/makefile
+endef
+
+define LIBJSON_BUILD_CMDS
+	mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
+		$(@D)/_internal/Source/Dependencies
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(LIBJSON_MAKE_OPT) -C $(@D)
+endef
+
+define LIBJSON_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr install -C $(@D)
+endef
+
+define LIBJSON_UNINSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr uninstall -C $(@D)
+endef
+
+define LIBJSON_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr install -C $(@D)
+endef
+
+define LIBJSON_UNINSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr uninstall -C $(@D)
+endef
+
+define LIBJSON_CLEAN_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LIBJSON_MAKE_OPT) \
+		clean -C $(@D)
+endef
+
+$(eval $(generic-package))

From 331b14a2aede9259e5b0db20336a371ec223aff2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:29:31 +0000
Subject: [PATCH 4912/6849] qt, php: selecting mysql requires depending on MMU

The mysql_client package is only available on architectures having a
MMU, so all packages that are selecting mysql_client should depend on
BR2_USE_MMU.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/Config.ext   | 3 +++
 package/qt/Config.sql.in | 1 +
 2 files changed, 4 insertions(+)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 2cf71d3625..006d7dd34a 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -105,6 +105,7 @@ config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
 config BR2_PACKAGE_PHP_EXT_MYSQL
 	bool "Mysql"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  MySQL support
@@ -112,6 +113,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQL
 config BR2_PACKAGE_PHP_EXT_MYSQLI
 	bool "Mysqli"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	select BR2_PACKAGE_PHP_EXT_MYSQL
 	help
@@ -127,6 +129,7 @@ if BR2_PACKAGE_PHP_EXT_PDO
 config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
 	bool "MySQL"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  PDO driver for MySQL
diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in
index eceb15d643..04489c75bf 100644
--- a/package/qt/Config.sql.in
+++ b/package/qt/Config.sql.in
@@ -9,6 +9,7 @@ config BR2_PACKAGE_QT_MYSQL
 	select BR2_PACKAGE_MYSQL_CLIENT
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
+	depends on BR2_USE_MMU # mysql
 	help
 	  Build MySQL driver
 	  If unsure, say n.

From 1112eb6b557f769a71eeb5b6b3c39caca01c4086 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:29:32 +0000
Subject: [PATCH 4913/6849] make: undeprecate package as it is used by the
 uClibc test suite

The uClibc test suite can be installed on the target thanks to the
BR2_UCLIBC_INSTALL_TEST_SUITE option, but it requires make to be
installed on the target. Since the make package is currently marked as
deprecated, it leads to the following warning:

warning: (BR2_UCLIBC_INSTALL_TEST_SUITE) selects BR2_PACKAGE_MAKE which has unmet direct dependencies (BR2_DEPRECATED)

We fix this by undeprecating the make package, and also update its
description to explain why we have the make package even if we don't
have support for building a toolchain for the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/make/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/make/Config.in b/package/make/Config.in
index e5cc970097..aea72e31f4 100644
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_MAKE
 	bool "make"
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	# We no longer support a toolchain on the target
-	depends on BR2_DEPRECATED
 	help
 	  A tool which controls the generation of executables and other
 	  non-source files of a program from the program's source files.
 
+	  While Buildroot no longer supports building a toolchain for
+	  the target, we keep a make package that is for example
+	  useful to run the uClibc test suite on the target.
+
 	  http://www.gnu.org/software/make/

From beea18a4d8d3569b4034246f3ce5bc9d95fc5641 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:29:33 +0000
Subject: [PATCH 4914/6849] system: remove trailing tabs in Config.in file

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 1e4fff3ebc..c0e4f4a825 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -18,14 +18,14 @@ choice
 	help
 	  Choose the password encoding scheme to use when Buildroot
 	  needs to encode a password (eg. the root password, below).
-	  
+
 	  Note: this is used at build-time, and *not* at runtime.
 
 config BR2_TARGET_GENERIC_PASSWD_DES
 	bool "des"
 	help
 	  Use standard 56-bit DES-based crypt(3) to encode passwords.
-	  
+
 	  Old, wildly available, but also the weakest, very susceptible to
 	  brute-force attacks.
 
@@ -33,7 +33,7 @@ config BR2_TARGET_GENERIC_PASSWD_MD5
 	bool "md5"
 	help
 	  Use MD5 to encode passwords.
-	  
+
 	  The default. Wildly available, and pretty good.
 	  Although pretty strong, MD5 is now an old hash function, and
 	  suffers from some weaknesses, which makes it susceptible to
@@ -43,7 +43,7 @@ config BR2_TARGET_GENERIC_PASSWD_SHA256
 	bool "sha-256"
 	help
 	  Use SHA256 to encode passwords.
-	  
+
 	  Very strong, but not ubiquitous, although available in glibc
 	  for some time now. Choose only if you are sure your C library
 	  understands SHA256 passwords.
@@ -52,7 +52,7 @@ config BR2_TARGET_GENERIC_PASSWD_SHA512
 	bool "sha-512"
 	help
 	  Use SHA512 to encode passwords.
-	  
+
 	  Extremely strong, but not ubiquitous, although available in glibc
 	  for some time now. Choose only if you are sure your C library
 	  understands SHA512 passwords.
@@ -178,17 +178,17 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD
 	default ""
 	help
 	  Set the initial root password (in clear). It will be md5-encrypted.
-	  
+
 	  If set to empty (the default), then no root password will be set,
 	  and root will need no password to log in.
-	  
+
 	  WARNING! WARNING!
 	  Although pretty strong, MD5 is now an old hash function, and
 	  suffers from some weaknesses, which makes it susceptible to attacks.
 	  It is showing its age, so this root password should not be trusted
 	  to properly secure any product that can be shipped to the wide,
 	  hostile world.
-	  
+
 	  WARNING! WARNING!
 	  The password appears in clear in the .config file, and may appear
 	  in the build log! Avoid using a valuable password if either the

From 7d97a09497174cbf6bd67894c361a17c61cbd41e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:29:34 +0000
Subject: [PATCH 4915/6849] Config.in.legacy: fix consistency warning on
 pthread-stubs option

The old BR2_PACKAGE_PTHREAD_STUBS option (kept for legacy support) now
selects the BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS option, but this creates
a consistency warning from kconfig, because the new option has
BR2_PACKAGE_XORG7 as a dependency.

Since the old option also had BR2_PACKAGE_XORG7 has a dependency, we
make the legacy config option depend on BR2_PACKAGE_XORG7 to avoid
this warning.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 5165138581..fc9f68f248 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -140,6 +140,7 @@ config BR2_PACKAGE_PTHREAD_STUBS
 	bool "pthread-stubs option has been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+	depends on BR2_PACKAGE_XORG7
 	help
 	  For consistency reason, the pthread-stubs package has been
 	  renamed to xlib_libpthread-stubs.

From dde83bc4639a7bf80ddd0d66b9ea3a8cc0157d65 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:26:02 +0000
Subject: [PATCH 4916/6849] xkeyboard-config: make available outside of X.org,
 reduce dependencies

xkeyboard-connfig was selectable only if X.org was enabled. However,
weston, the reference implementation of the Wayland protocol, also
needs xkeyboard-config, so we have to make this package available
outside of the if BR2_PACKAGE_XORG7 ... endif conditional.

In addition to this, the xkeyboard-config currently pulls in
xapp_xkbcomp as a runtime dependency, but this dependency is only
needed with X.org. And it also pulls in xlib_libX11 and xproto_proto
as build-time dependencies. But in fact those ones are runtime
dependencies, and they are only needed under X.org. This helps
reducing the number of dependencies of xkeyboard-config in a
weston/wayland configuration.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                  | 1 +
 package/x11r7/Config.in                            | 1 -
 package/x11r7/xkeyboard-config/Config.in           | 7 ++++---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 7 ++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index bdc1de167a..f39ecf6a83 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -155,6 +155,7 @@ source "package/x11r7/Config.in"
 comment "X libraries and helper libraries"
 source "package/liberation/Config.in"
 source "package/libsexy/Config.in"
+source "package/x11r7/xkeyboard-config/Config.in"
 
 comment "X Window managers"
 source "package/enlightenment/Config.in"
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 971ef377a9..f7487daab8 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -257,7 +257,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdata_xbitmaps/Config.in
 		source package/x11r7/xdata_xcursor-themes/Config.in
 		source package/x11r7/xcursor-transparent-theme/Config.in
-		source package/x11r7/xkeyboard-config/Config.in
 	endmenu
 endif
 
diff --git a/package/x11r7/xkeyboard-config/Config.in b/package/x11r7/xkeyboard-config/Config.in
index 640bb1d539..5d1d6a72ed 100644
--- a/package/x11r7/xkeyboard-config/Config.in
+++ b/package/x11r7/xkeyboard-config/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_XKEYBOARD_CONFIG
 	bool "xkeyboard-config"
-	select BR2_PACKAGE_XAPP_XKBCOMP
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XPROTO_XPROTO
+	# Runtime dependencies
+	select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
 	help
 	  keyboard configuration database for X
 
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 78ed1ee5dc..cdddd95696 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -3,10 +3,15 @@
 # xkeyboard-config
 #
 #############################################################
+
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
+XKEYBOARD_CONFIG_LICENSE = MIT
+XKEYBAORD_CONFIG_LICENSE_FILES = COPYING
+
+XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
+XKEYBOARD_CONFIG_CONF_OPT += --disable-runtime-deps
 
 $(eval $(autotools-package))
 

From 67a96673830383028018f254611a9968b9efeffc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:26:03 +0000
Subject: [PATCH 4917/6849] libxkbcommon: new package

[Peter: set gnu99 C mode]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/libxkbcommon/Config.in       |  8 ++++++++
 package/libxkbcommon/libxkbcommon.mk | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/libxkbcommon/Config.in
 create mode 100644 package/libxkbcommon/libxkbcommon.mk

diff --git a/package/Config.in b/package/Config.in
index f39ecf6a83..83234c13df 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -470,6 +470,7 @@ source "package/libserial/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
+source "package/libxkbcommon/Config.in"
 source "package/mtdev/Config.in"
 source "package/ne10/Config.in"
 source "package/neardal/Config.in"
diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in
new file mode 100644
index 0000000000..0a52c6f43f
--- /dev/null
+++ b/package/libxkbcommon/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBXKBCOMMON
+	bool "libxkbcommon"
+	help
+	  xkbcommon is a keymap compiler and support library which
+	  processes a reduced subset of keymaps as defined by the XKB
+	  specification.
+
+	  http://xkbcommon.org/
diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk
new file mode 100644
index 0000000000..6f668242d2
--- /dev/null
+++ b/package/libxkbcommon/libxkbcommon.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# libxkbcommon
+#
+#############################################################
+
+LIBXKBCOMMON_VERSION = 0.3.0
+LIBXKBCOMMON_SITE = http://xkbcommon.org/download/
+LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz
+LIBXKBCOMMON_LICENSE = MIT/X11
+LIBXKBCOMMON_LICENSE_FILES = COPYING
+
+LIBXKBCOMMON_INSTALL_STAGING = YES
+LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex
+# uses C99 features
+LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+
+$(eval $(autotools-package))

From 41c0864646327d6f28d7379b119ae09e58e9acfe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:26:04 +0000
Subject: [PATCH 4918/6849] wayland: new package

[Peter: fix scanner comment]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/wayland/Config.in  | 10 ++++++++++
 package/wayland/wayland.mk | 30 ++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/wayland/Config.in
 create mode 100644 package/wayland/wayland.mk

diff --git a/package/Config.in b/package/Config.in
index 83234c13df..08ce2d4430 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -448,6 +448,7 @@ source "package/pango/Config.in"
 source "package/pixman/Config.in"
 source "package/poppler/Config.in"
 source "package/tiff/Config.in"
+source "package/wayland/Config.in"
 source "package/webkit/Config.in"
 source "package/zxing/Config.in"
 endmenu
diff --git a/package/wayland/Config.in b/package/wayland/Config.in
new file mode 100644
index 0000000000..e5d26493e1
--- /dev/null
+++ b/package/wayland/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_WAYLAND
+	bool "wayland"
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_EXPAT
+	help
+	  Wayland is a project to define a protocol for a compositor
+	  to talk to its clients as well as a library implementation
+	  of the protocol.
+
+	  http://wayland.freedesktop.org/
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
new file mode 100644
index 0000000000..a0fadc2324
--- /dev/null
+++ b/package/wayland/wayland.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# wayland
+#
+#############################################################
+
+WAYLAND_VERSION = 1.1.0
+WAYLAND_SITE = http://wayland.freedesktop.org/releases/
+WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
+WAYLAND_LICENSE = MIT
+WAYLAND_LICENSE_FILES = COPYING
+
+WAYLAND_INSTALL_STAGING = YES
+WAYLAND_DEPENDENCIES = libffi host-pkgconf expat host-expat
+
+# wayland needs a wayland-scanner program to generate some of its
+# source code. By default, it builds it with CC, so it doesn't work with
+# cross-compilation. Therefore, we build it manually, and tell wayland
+# that the tool is already available.
+WAYLAND_CONF_OPT = --disable-scanner
+
+define WAYLAND_BUILD_SCANNER
+	(cd $(@D)/src/; \
+		$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+			-o wayland-scanner scanner.c wayland-util.c -lexpat)
+endef
+
+WAYLAND_POST_CONFIGURE_HOOKS += WAYLAND_BUILD_SCANNER
+
+$(eval $(autotools-package))

From be33cb9ecae2b4427a23b213f44b96c3dbd1d540 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Apr 2013 10:26:05 +0000
Subject: [PATCH 4919/6849] weston: new package

[Peter: fix udev comment, add upstream URL]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/weston/Config.in                      | 31 ++++++++++++
 ...nt-code-only-when-the-DRM-compositor.patch | 47 +++++++++++++++++++
 package/weston/weston.mk                      | 32 +++++++++++++
 4 files changed, 111 insertions(+)
 create mode 100644 package/weston/Config.in
 create mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
 create mode 100644 package/weston/weston.mk

diff --git a/package/Config.in b/package/Config.in
index 08ce2d4430..a530afca30 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -151,6 +151,7 @@ endif
 
 source "package/qt5/Config.in"
 source "package/x11r7/Config.in"
+source "package/weston/Config.in"
 
 comment "X libraries and helper libraries"
 source "package/liberation/Config.in"
diff --git a/package/weston/Config.in b/package/weston/Config.in
new file mode 100644
index 0000000000..8871ce56d1
--- /dev/null
+++ b/package/weston/Config.in
@@ -0,0 +1,31 @@
+comment "weston requires udev"
+	depends on !BR2_PACKAGE_UDEV
+
+config BR2_PACKAGE_WESTON
+	bool "weston"
+	select BR2_PACKAGE_WAYLAND
+	select BR2_PACKAGE_LIBXKBCOMMON
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_PNG
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_MTDEV
+	depends on BR2_PACKAGE_UDEV
+	# Runtime dependency
+	select BR2_PACKAGE_XKEYBOARD_CONFIG
+	# Make sure at least one backend is selected
+	select BR2_PACKAGE_WESTON_FBDEV
+	help
+	  Weston is the reference implementation of a Wayland
+	  compositor, and a useful compositor in its own right.
+	  Weston has various backends that lets it run on Linux kernel
+	  modesetting and evdev input as well as under X11.
+
+	  http://wayland.freedesktop.org/
+
+if BR2_PACKAGE_WESTON
+
+config BR2_PACKAGE_WESTON_FBDEV
+	bool "fbdev compositor"
+
+endif
diff --git a/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch b/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
new file mode 100644
index 0000000000..d390b025fe
--- /dev/null
+++ b/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
@@ -0,0 +1,47 @@
+From b8a831387a37f09ea5479eeb1d435a26680299c6 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 19 Apr 2013 06:19:05 +0200
+Subject: [PATCH] Pull DRM dependent code only when the DRM compositor is
+ enabled
+
+The <xf86drm.h> header and the drm*() functions may not be available
+at all when the DRM compositor is not enabled, so they should not be
+used. Fixes build failures when building the fbdev compositor on
+systems where DRM is not available.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/launcher-util.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/launcher-util.c b/src/launcher-util.c
+index 9196e4f..d2fb160 100644
+--- a/src/launcher-util.c
++++ b/src/launcher-util.c
+@@ -31,7 +31,9 @@
+ #include <sys/uio.h>
+ #include <fcntl.h>
+ 
++#ifdef BUILD_DRM_COMPOSITOR
+ #include <xf86drm.h>
++#endif
+ 
+ #include "compositor.h"
+ #include "launcher-util.h"
+@@ -103,6 +105,7 @@ weston_launcher_open(struct weston_compositor *compositor,
+ 	return data->fd;
+ }
+ 
++#ifdef BUILD_DRM_COMPOSITOR
+ int
+ weston_launcher_drm_set_master(struct weston_compositor *compositor,
+ 			       int drm_fd, char master)
+@@ -157,4 +160,4 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor,
+ 
+ 	return ret;
+ }
+-
++#endif
+-- 
+1.7.9.5
+
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
new file mode 100644
index 0000000000..4e7cada488
--- /dev/null
+++ b/package/weston/weston.mk
@@ -0,0 +1,32 @@
+#############################################################
+#
+# weston
+#
+#############################################################
+
+WESTON_VERSION = 1.1.0
+WESTON_SITE = http://wayland.freedesktop.org/releases/
+WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz
+WESTON_LICENSE = MIT
+WESTON_LICENSE_FILES = COPYING
+
+WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng jpeg mtdev udev
+WESTON_CONF_OPT = \
+	--disable-egl \
+	--disable-xwayland \
+	--disable-x11-compositor \
+	--disable-drm-compositor \
+	--disable-wayland-compositor \
+	--disable-headless-compositor \
+	--disable-rpi-compositor \
+	--disable-weston-launch \
+	--disable-libunwind
+
+ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
+WESTON_CONF_OPT += --enable-fbdev-compositor
+else
+WESTON_CONF_OPT += --disable-fbdev-compositor
+endif
+
+$(eval $(autotools-package))
+

From 92625d742e5eb0eae2094f7890b475aadff9d03e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 30 Apr 2013 10:50:41 +0200
Subject: [PATCH 4920/6849] xkeyboard-config: fix license files typo

As noticed by Thomas.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index cdddd95696..275ceef49f 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -8,7 +8,7 @@ XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
 XKEYBOARD_CONFIG_LICENSE = MIT
-XKEYBAORD_CONFIG_LICENSE_FILES = COPYING
+XKEYBOARD_CONFIG_LICENSE_FILES = COPYING
 
 XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
 XKEYBOARD_CONFIG_CONF_OPT += --disable-runtime-deps

From e9b771283765e74792df6a05775383f6d4da2636 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Mon, 8 Apr 2013 06:50:16 +0000
Subject: [PATCH 4921/6849] rootfs-overlay: use a make foreach instead of a
 shell for

Makes the code uniform with the post-build and post-image implementation
(which is slightly simpler and, presumably, more efficient).

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 840aa1fe9f..97804ff78c 100644
--- a/Makefile
+++ b/Makefile
@@ -501,13 +501,12 @@ endif
 		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
 	) >  $(TARGET_DIR)/etc/os-release
 
-	@for dir in $(call qstrip,$(BR2_ROOTFS_OVERLAY)); do \
-		$(call MESSAGE,"Copying overlay $${dir}"); \
+	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
+		$(call MESSAGE,"Copying overlay $(d)"); \
 		rsync -a \
 			--exclude .empty --exclude .svn --exclude .git \
 			--exclude .hg --exclude '*~' \
-			$${dir}/ $(TARGET_DIR); \
-	done
+			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 		$(call MESSAGE,"Executing post-build script $(s)"); \

From c85da87012e1e05364aa27e786bf9152847b5325 Mon Sep 17 00:00:00 2001
From: Charles Manning <cdhmanning@gmail.com>
Date: Wed, 12 Dec 2012 12:03:16 +0000
Subject: [PATCH 4922/6849] Add package for mongoose web server

[Peter: drop noauth patch, cleanup Config.in, don't install to staging, ..]
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/mongoose/Config.in   | 10 +++++++++
 package/mongoose/S85mongoose | 41 ++++++++++++++++++++++++++++++++++++
 package/mongoose/mongoose.mk | 26 +++++++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 package/mongoose/Config.in
 create mode 100755 package/mongoose/S85mongoose
 create mode 100644 package/mongoose/mongoose.mk

diff --git a/package/Config.in b/package/Config.in
index a530afca30..78c394f0ff 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -705,6 +705,7 @@ source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
+source "package/mongoose/Config.in"
 source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
 source "package/msmtp/Config.in"
diff --git a/package/mongoose/Config.in b/package/mongoose/Config.in
new file mode 100644
index 0000000000..7199712018
--- /dev/null
+++ b/package/mongoose/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_MONGOOSE
+	bool "mongoose"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Mongoose is a small and easy to use web server
+
+	  https://github.com/valenok/mongoose
+
+comment "mongoose needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mongoose/S85mongoose b/package/mongoose/S85mongoose
new file mode 100755
index 0000000000..e9e8524ca8
--- /dev/null
+++ b/package/mongoose/S85mongoose
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# Start/stop the mongoose HTTP server
+#
+
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=mongoose
+DESC="Mongoose HTTP server"
+
+DAEMON=`which mongoose`
+OPTIONS="-max_threads 3 -root /var/www  -ports 80"
+
+[ -e /etc/default/mongoose ] && . /etc/default/mongoose
+
+case "$1" in
+  start)
+	echo "Starting $DESC:"
+	start-stop-daemon -S -x "$DAEMON" -b -- $OPTIONS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon -K -x "$DAEMON"
+	start-stop-daemon -S -x "$DAEMON" -b -- $OPTIONS
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
new file mode 100644
index 0000000000..5ebeb24f4d
--- /dev/null
+++ b/package/mongoose/mongoose.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# mongoose
+#
+#############################################################
+
+MONGOOSE_VERSION = 3.3
+MONGOOSE_SOURCE = mongoose-$(MONGOOSE_VERSION).tgz
+MONGOOSE_SITE = https://mongoose.googlecode.com/files
+MONGOOSE_LICENSE = MIT
+MONGOOSE_LICENSE_FILES = COPYING
+
+MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -DNO_SSL
+
+define MONGOOSE_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) \
+		linux COPT="$(MONGOOSE_CFLAGS)"
+endef
+
+define MONGOOSE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/mongoose $(TARGET_DIR)/usr/sbin/mongoose
+	$(INSTALL) -D -m 755 package/mongoose/S85mongoose \
+		$(TARGET_DIR)/etc/init.d/S85mongoose
+endef
+
+$(eval $(generic-package))

From aabc7475e6f8f85344fe13d3a603a69cb8d1099e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 May 2013 22:43:48 +0200
Subject: [PATCH 4923/6849] mongoose: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mongoose/mongoose.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
index 5ebeb24f4d..4f7df17f36 100644
--- a/package/mongoose/mongoose.mk
+++ b/package/mongoose/mongoose.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MONGOOSE_VERSION = 3.3
+MONGOOSE_VERSION = 3.7
 MONGOOSE_SOURCE = mongoose-$(MONGOOSE_VERSION).tgz
 MONGOOSE_SITE = https://mongoose.googlecode.com/files
 MONGOOSE_LICENSE = MIT

From a859f06eedc2fb2214a805374ace10cc05996bff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 2 May 2013 22:59:23 +0200
Subject: [PATCH 4924/6849] mongoose: add optional openssl support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mongoose/mongoose.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
index 4f7df17f36..ac03bb6290 100644
--- a/package/mongoose/mongoose.mk
+++ b/package/mongoose/mongoose.mk
@@ -10,7 +10,15 @@ MONGOOSE_SITE = https://mongoose.googlecode.com/files
 MONGOOSE_LICENSE = MIT
 MONGOOSE_LICENSE_FILES = COPYING
 
-MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -DNO_SSL
+MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS)
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MONGOOSE_DEPENDENCIES += openssl
+# directly linked
+MONGOOSE_CFLAGS += -DNO_SSL_DL -lssl -lcrypto -lz
+else
+MONGOOSE_CFLAGS += -DNO_SSL
+endif
 
 define MONGOOSE_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) \

From 3cb0f841e7fb72acbe56844b8bdd42696cf678bc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 2 May 2013 06:15:55 +0000
Subject: [PATCH 4925/6849] iw: bump to version 3.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 54c42d7cc5..6078632ac5 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,28 +4,22 @@
 #
 #############################################################
 
-IW_VERSION = 3.8
+IW_VERSION = 3.10
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl
-IW_CONFIG = $(IW_DIR)/.config
+IW_MAKE_OPT = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
 IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 # libnl needs pthread/m, so we need to explicitly with them when static
 # these need to added AFTER libnl, so we have to override LIBS completely
-IW_MAKE_OPT = LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
+IW_MAKE_OPT += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
 endif
 
-define IW_CONFIGURE_CMDS
-	echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
-	echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
-	echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG)
-endef
-
 define IW_BUILD_CMDS
 	$(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
 endef

From 1516f8bcdf3dbd7238fe8e7a663f9afc41c5d38c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 2 May 2013 04:26:17 +0000
Subject: [PATCH 4926/6849] samba: bump to version 3.6.14

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 7f9b91877e..3a004e1d52 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.13
+SAMBA_VERSION = 3.6.14
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 8867c892ae8079ca78c64f8570ba65d6a730e8a4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 2 May 2013 04:26:32 +0000
Subject: [PATCH 4927/6849] kernel-headers: bump 3.{0, 4, 8}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.75-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.76-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 12c53d8895..6ec39c00b3 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -66,15 +66,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.75"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.76"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.44"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.42"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.43"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.10"	if BR2_KERNEL_HEADERS_3_8
+	default "3.8.11"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.75-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.76-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.75-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.76-headers_install-fix-__packed-in-exported-kernel-head.patch

From de341929676b6a1537de5e6140d6ab3c50482bac Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Thu, 2 May 2013 09:54:08 +0000
Subject: [PATCH 4928/6849] directfb: fix error in *SetRegion* datatypes

DirectFB comes with incorrect declarations for *SetRegion* datatypes,
this breaks the build for some GFX Drivers. Also there are some headers
missend in the archive, this breaks some other modules of directfb that
not covered yet by the autobuilders.
And at least the configure script doesn't use a variable for the
imlib2-config script. That breaks crossbuilds of directfb in most cases.

Fixes:
http://autobuild.buildroot.net/results/03465f0e14accc8d8f8fc2640b7a0dd8bec594e4

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...fb-fix-missing-davinci-voodoo-header.patch | 1726 +++++++++++++++++
 package/directfb/directfb-imlib2-config.patch |   21 +
 .../directfb/directfb-setregion-lock.patch    |   92 +
 3 files changed, 1839 insertions(+)
 create mode 100644 package/directfb/directfb-fix-missing-davinci-voodoo-header.patch
 create mode 100644 package/directfb/directfb-imlib2-config.patch
 create mode 100644 package/directfb/directfb-setregion-lock.patch

diff --git a/package/directfb/directfb-fix-missing-davinci-voodoo-header.patch b/package/directfb/directfb-fix-missing-davinci-voodoo-header.patch
new file mode 100644
index 0000000000..6ad4958f84
--- /dev/null
+++ b/package/directfb/directfb-fix-missing-davinci-voodoo-header.patch
@@ -0,0 +1,1726 @@
+The archive of directfb-1.6.3 is still missing some header files against
+the tagged git tree of directfb. The following files are missing.
+
+gfxdrivers/davinci/davinci_c64x.h
+gfxdrivers/davinci/davincifb.h
+gfxdrivers/davinci/davinci_gfxdriver.h
+tests/voodoo/voodoo_test.h
+
+The headers of course are needed to be able to build every module of
+directfb. The headers are taken from the git tree of directfb
+http://git.directfb.org/?p=core/DirectFB.git;a=commit;h=38b784549bc59bb07c58bb29667cb658695d39a7,
+tag DIRECTFB_1_6_3, SHA1ID 38b784549bc59bb07c58bb29667cb658695d39a7.
+
+Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
+
+diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h
+--- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h	1970-01-01 01:00:00.000000000 +0100
++++ directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h	2013-04-07 21:33:25.928530187 +0200
+@@ -0,0 +1,935 @@
++/*
++   TI Davinci driver - C64X+ DSP Library
++
++   (c) Copyright 2008  directfb.org
++   (c) Copyright 2007  Telio AG
++
++   Written by Denis Oliver Kropp <dok@directfb.org> and
++              Olaf Dreesen <olaf@directfb.org>.
++
++   All rights reserved.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License
++   version 2 as published by the Free Software Foundation.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#ifndef __DAVINCI_C64X_H__
++#define __DAVINCI_C64X_H__
++
++#include <unistd.h>
++
++#include <directfb.h>
++
++#include <direct/messages.h>
++#include <direct/trace.h>
++
++#include <linux/c64x.h>
++
++#define mb() __asm__ __volatile__ ("" : : : "memory")
++
++/**********************************************************************************************************************/
++
++typedef struct {
++     int                 magic;
++
++     int                 fd;
++     c64xTaskControl    *ctl;
++     void               *mem;
++
++     c64xTask           *QueueL;
++} DavinciC64x;
++
++typedef struct {
++     int                 magic;
++     unsigned int        max_tasks;
++     unsigned int        num_tasks;
++     c64xTask           *tasks;
++} DavinciC64xTasks;
++
++typedef enum {
++     C64X_TEF_NONE       = 0x0000,
++     C64X_TEF_RESET      = 0x0001
++} DavinciC64xEmitFlags;
++
++/**********************************************************************************************************************/
++
++DFBResult davinci_c64x_open    ( DavinciC64x *c64x );
++
++DFBResult davinci_c64x_close   ( DavinciC64x *c64x );
++
++DFBResult davinci_c64x_wait_low( DavinciC64x *c64x );
++
++/**********************************************************************************************************************/
++
++DFBResult davinci_c64x_tasks_init   ( DavinciC64xTasks *tasks,
++                                      unsigned int      size );
++
++DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks );
++
++/**********************************************************************************************************************/
++
++DFBResult davinci_c64x_emit_tasks( DavinciC64x          *c64x,
++                                   DavinciC64xTasks     *tasks,
++                                   DavinciC64xEmitFlags  flags );
++
++/**********************************************************************************************************************/
++
++static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" };
++
++static inline c64xTask *
++c64x_get_task( DavinciC64x *c64x )
++{
++     c64xTaskControl *ctl   = c64x->ctl;
++     uint32_t         idx   = ctl->QL_arm;
++     uint32_t         next  = (idx + 1) & C64X_QUEUE_MASK;
++     c64xTask        *task  = &c64x->QueueL[idx];
++     int              loops = 0;
++     uint32_t         idle  = 0;
++
++     /* Wait for the entry (and next) to be processed by the DSP (rare case). */
++     while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) {
++          if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) {
++               c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp];
++
++               D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n",
++                         ctl->QL_dsp,
++                         (dsp_task->c64x_function >> 2) & 0x3fff,
++                         state_names[dsp_task->c64x_function & 3],
++                         ctl->QL_arm,
++                         (task->c64x_function >> 2) & 0x3fff,
++                         state_names[task->c64x_function & 3] );
++
++               break;
++          }
++
++          idle = ctl->idlecounter;
++
++          /* Queue is full, waiting 10-20ms should not be too bad. */
++          if (loops++ > 10)
++               usleep( 5000 );
++     }
++
++     return task;
++}
++
++static inline void
++c64x_submit_task( DavinciC64x *c64x, c64xTask *task )
++{
++     c64xTaskControl *ctl  = c64x->ctl;
++     uint32_t         idx  = ctl->QL_arm;
++     uint32_t         next = (idx + 1) & C64X_QUEUE_MASK;
++
++     mb();
++
++     ctl->QL_arm = next;
++
++     mb();
++}
++
++/**********************************************************************************************************************/
++
++static inline void
++davinci_c64x_wb_inv_range( DavinciC64x   *c64x,
++                           unsigned long  start,
++                           u32            length,
++                           u32            func )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = start;
++     task->c64x_arg[1] = length;
++     task->c64x_arg[2] = func;
++
++     task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_write_back_all( DavinciC64x *c64x )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++/**********************************************************************************************************************/
++
++static inline void
++davinci_c64x_load_block__L( DavinciC64xTasks *tasks,
++                            unsigned long     words,
++                            u32               num,
++                            u32               flags )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = words;
++     task->c64x_arg[1] = num;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_load_block( DavinciC64x   *c64x,
++                         unsigned long  words,
++                         u32            num,
++                         u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = words;
++     task->c64x_arg[1] = num;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_fetch_uyvy( DavinciC64x   *c64x,
++                         unsigned long  dest,
++                         unsigned long  source,
++                         u32            pitch,
++                         u32            height,
++                         u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = source;
++     task->c64x_arg[2] = pitch;
++     task->c64x_arg[3] = height;
++     task->c64x_arg[4] = flags;
++
++     task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_mc( DavinciC64x   *c64x,
++                 unsigned long  dest,
++                 u32            dpitch,
++                 unsigned long  source0,
++                 unsigned long  source1,
++                 u32            spitch,
++                 u32            height,
++                 int            func )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = source0;
++     task->c64x_arg[3] = source1;
++     task->c64x_arg[4] = spitch;
++     task->c64x_arg[5] = height;
++
++     task->c64x_function = func | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks,
++                                     unsigned long     dest,
++                                     u32               pitch,
++                                     u32               flags )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_put_idct_uyvy_16x16( DavinciC64x   *c64x,
++                                  unsigned long  dest,
++                                  u32            pitch,
++                                  u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks,
++                                   unsigned long     dest,
++                                   u32               pitch,
++                                   u32               flags )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_put_mc_uyvy_16x16( DavinciC64x   *c64x,
++                                unsigned long  dest,
++                                u32            pitch,
++                                u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks,
++                                    unsigned long     dest,
++                                    u32               pitch,
++                                    u32               flags )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_put_sum_uyvy_16x16( DavinciC64x   *c64x,
++                                 unsigned long  dest,
++                                 u32            pitch,
++                                 u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = flags;
++
++     task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks,
++                                 u32               pitch,
++                                 unsigned long     current,
++                                 unsigned long     past,
++                                 unsigned long     future,
++                                 u32               flags )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = pitch;
++     task->c64x_arg[1] = current;
++     task->c64x_arg[2] = past;
++     task->c64x_arg[3] = future;
++     task->c64x_arg[4] = flags;
++
++     task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_dva_begin_frame( DavinciC64x   *c64x,
++                              u32            pitch,
++                              unsigned long  current,
++                              unsigned long  past,
++                              unsigned long  future,
++                              u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = pitch;
++     task->c64x_arg[1] = current;
++     task->c64x_arg[2] = past;
++     task->c64x_arg[3] = future;
++     task->c64x_arg[4] = flags;
++
++     task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks,
++                                  unsigned long     macroblock )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = macroblock;
++
++     task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_dva_motion_block( DavinciC64x   *c64x,
++                               unsigned long  macroblock )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = macroblock;
++
++     task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++/**********************************************************************************************************************/
++
++static inline void
++davinci_c64x_dva_idct( DavinciC64x   *c64x,
++				   unsigned long  dest,
++				   u32            pitch,
++				   unsigned long  source )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = source;
++
++     task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++/**********************************************************************************************************************/
++
++static inline void
++davinci_c64x_put_uyvy_16x16( DavinciC64x   *c64x,
++                             unsigned long  dest,
++                             u32            pitch,
++                             unsigned long  source,
++                             u32            flags )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = source;
++     task->c64x_arg[3] = flags;
++
++     task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks,
++                             unsigned long     dst_rgb,
++                             unsigned long     dst_alpha,
++                             u32               dst_pitch,
++                             unsigned long     source,
++                             u32               src_pitch,
++                             u32               width,
++                             u32               height )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dst_rgb;
++     task->c64x_arg[1] = dst_alpha;
++     task->c64x_arg[2] = dst_pitch;
++     task->c64x_arg[3] = source;
++     task->c64x_arg[4] = src_pitch;
++     task->c64x_arg[5] = width;
++     task->c64x_arg[6] = height;
++
++     task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_dither_argb( DavinciC64x   *c64x,
++                          unsigned long  dst_rgb,
++                          unsigned long  dst_alpha,
++                          u32            dst_pitch,
++                          unsigned long  source,
++                          u32            src_pitch,
++                          u32            width,
++                          u32            height )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dst_rgb;
++     task->c64x_arg[1] = dst_alpha;
++     task->c64x_arg[2] = dst_pitch;
++     task->c64x_arg[3] = source;
++     task->c64x_arg[4] = src_pitch;
++     task->c64x_arg[5] = width;
++     task->c64x_arg[6] = height;
++
++     task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_fill_16__L( DavinciC64xTasks *tasks,
++                         unsigned long     dest,
++                         u32               pitch,
++                         u32               width,
++                         u32               height,
++                         u32               value )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = width;
++     task->c64x_arg[3] = height;
++     task->c64x_arg[4] = value;
++
++     task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_fill_16( DavinciC64x   *c64x,
++                      unsigned long  dest,
++                      u32            pitch,
++                      u32            width,
++                      u32            height,
++                      u32            value )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = width;
++     task->c64x_arg[3] = height;
++     task->c64x_arg[4] = value;
++
++     task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_fill_32__L( DavinciC64xTasks *tasks,
++                         unsigned long     dest,
++                         u32               pitch,
++                         u32               width,
++                         u32               height,
++                         u32               value )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = width;
++     task->c64x_arg[3] = height;
++     task->c64x_arg[4] = value;
++
++     task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_fill_32( DavinciC64x   *c64x,
++                      unsigned long  dest,
++                      u32            pitch,
++                      u32            width,
++                      u32            height,
++                      u32            value )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = pitch;
++     task->c64x_arg[2] = width;
++     task->c64x_arg[3] = height;
++     task->c64x_arg[4] = value;
++
++     task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_blit_16__L( DavinciC64xTasks *tasks,
++                         unsigned long     dest,
++                         u32               dpitch,
++                         unsigned long     src,
++                         u32               spitch,
++                         u32               width,
++                         u32               height )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = spitch;
++     task->c64x_arg[4] = width;
++     task->c64x_arg[5] = height;
++
++     task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_blit_16( DavinciC64x   *c64x,
++                      unsigned long  dest,
++                      u32            dpitch,
++                      unsigned long  src,
++                      u32            spitch,
++                      u32            width,
++                      u32            height )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = spitch;
++     task->c64x_arg[4] = width;
++     task->c64x_arg[5] = height;
++
++     task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_blit_32__L( DavinciC64xTasks *tasks,
++                         unsigned long     dest,
++                         u32               dpitch,
++                         unsigned long     src,
++                         u32               spitch,
++                         u32               width,
++                         u32               height )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = spitch;
++     task->c64x_arg[4] = width;
++     task->c64x_arg[5] = height;
++
++     task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_blit_32( DavinciC64x   *c64x,
++                      unsigned long  dest,
++                      u32            dpitch,
++                      unsigned long  src,
++                      u32            spitch,
++                      u32            width,
++                      u32            height )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = spitch;
++     task->c64x_arg[4] = width;
++     task->c64x_arg[5] = height;
++
++     task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks,
++                            unsigned long     dest,
++                            u32               dpitch,
++                            unsigned long     src,
++                            u32               spitch,
++                            u32               dw,
++                            u32               dh,
++                            u32               sw,
++                            u32               sh,
++                            const DFBRegion  *clip )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = src;
++     task->c64x_arg[2] = dpitch   | (spitch   << 16);
++     task->c64x_arg[3] = dh       | (dw       << 16);
++     task->c64x_arg[4] = sh       | (sw       << 16);
++     task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
++     task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
++
++     if (sw > dw && sh > dh)
++          task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
++     else
++          task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_stretch_32( DavinciC64x     *c64x,
++                         unsigned long    dest,
++                         u32              dpitch,
++                         unsigned long    src,
++                         u32              spitch,
++                         u32              dw,
++                         u32              dh,
++                         u32              sw,
++                         u32              sh,
++                         const DFBRegion *clip )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = src;
++     task->c64x_arg[2] = dpitch   | (spitch   << 16);
++     task->c64x_arg[3] = dh       | (dw       << 16);
++     task->c64x_arg[4] = sh       | (sw       << 16);
++     task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
++     task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
++
++     if (sw > dw && sh > dh)
++          task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
++     else
++          task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks,
++                               u32               sub_func,
++                               unsigned long     dest,
++                               u32               dpitch,
++                               unsigned long     src,
++                               u32               spitch,
++                               u32               width,
++                               u32               height,
++                               u32               argb,
++                               u8                alpha )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = spitch;
++     task->c64x_arg[4] = width | (height << 16);
++     task->c64x_arg[5] = argb;
++     task->c64x_arg[6] = alpha;
++
++     task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_blit_blend_32( DavinciC64x   *c64x,
++                            u32            sub_func,
++                            unsigned long  dest,
++                            u32            dpitch,
++                            unsigned long  src,
++                            u32            spitch,
++                            u32            width,
++                            u32            height,
++                            u32            argb,
++                            u8             alpha )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = dpitch;
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = spitch;
++     task->c64x_arg[4] = width | (height << 16);
++     task->c64x_arg[5] = argb;
++     task->c64x_arg[6] = alpha;
++
++     task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks,
++                               unsigned long     dest,
++                               u32               dpitch,
++                               unsigned long     src,
++                               u32               spitch,
++                               u32               width,
++                               u32               height,
++                               u32               key,
++                               u32               mask )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = width;
++     task->c64x_arg[4] = height;
++     task->c64x_arg[5] = key;
++     task->c64x_arg[6] = mask;
++
++     task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_blit_keyed_16( DavinciC64x   *c64x,
++                            unsigned long  dest,
++                            u32            dpitch,
++                            unsigned long  src,
++                            u32            spitch,
++                            u32            width,
++                            u32            height,
++                            u32            key,
++                            u32            mask )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = width;
++     task->c64x_arg[4] = height;
++     task->c64x_arg[5] = key;
++     task->c64x_arg[6] = mask;
++
++     task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++static inline void
++davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks,
++                               unsigned long     dest,
++                               u32               dpitch,
++                               unsigned long     src,
++                               u32               spitch,
++                               u32               width,
++                               u32               height,
++                               u32               key,
++                               u32               mask )
++{
++     c64xTask *task = &tasks->tasks[tasks->num_tasks];
++
++     D_ASSERT( tasks->num_tasks < tasks->max_tasks );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = width;
++     task->c64x_arg[4] = height;
++     task->c64x_arg[5] = key;
++     task->c64x_arg[6] = mask;
++
++     task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
++
++     tasks->num_tasks++;
++}
++
++static inline void
++davinci_c64x_blit_keyed_32( DavinciC64x   *c64x,
++                            unsigned long  dest,
++                            u32            dpitch,
++                            unsigned long  src,
++                            u32            spitch,
++                            u32            width,
++                            u32            height,
++                            u32            key,
++                            u32            mask )
++{
++     c64xTask *task = c64x_get_task( c64x );
++
++     task->c64x_arg[0] = dest;
++     task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
++     task->c64x_arg[2] = src;
++     task->c64x_arg[3] = width;
++     task->c64x_arg[4] = height;
++     task->c64x_arg[5] = key;
++     task->c64x_arg[6] = mask;
++
++     task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
++
++     c64x_submit_task( c64x, task );
++}
++
++#endif
++
+diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h directfb-1.6.3/gfxdrivers/davinci/davincifb.h
+--- directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h	1970-01-01 01:00:00.000000000 +0100
++++ directfb-1.6.3/gfxdrivers/davinci/davincifb.h	2013-04-07 21:33:21.488622184 +0200
+@@ -0,0 +1,581 @@
++/* 
++ * Copyright (C) 2006 Texas Instruments Inc
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option)any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * File: davincifb.h	
++ */
++
++#ifndef DAVINVI_VPBE_H
++#define DAVINVI_VPBE_H
++
++/* include Linux files */
++#include <linux/fb.h>
++
++/* define the custom FBIO_WAITFORVSYNC ioctl */
++#define FBIO_WAITFORVSYNC	_IOW('F', 0x20, u_int32_t)
++#define FBIO_SETATTRIBUTE       _IOW('F', 0x21, struct fb_fillrect)
++
++/* Backported IOCTLS. */
++#define FBIO_SETPOSX                            _IOW('F', 0x22, u_int32_t)
++#define FBIO_SETPOSY                            _IOW('F', 0x23, u_int32_t)
++#define FBIO_SETZOOM            		_IOW('F', 0x24, struct zoom_params)
++#define FBIO_GETSTD                             _IOR('F', 0x25, u_int32_t)
++#define FBIO_RESIZER		                _IOW('F', 0x26, struct vpfe_resizer_params)
++#define FBIO_SYNC		                _IOW('F', 0x27, u_int32_t)
++
++typedef struct zoom_params {
++	u_int32_t window_id;
++	u_int32_t zoom_h;
++	u_int32_t zoom_v;
++} zoom_params_t;
++
++typedef struct vpfe_resizer_params
++{
++	u_int32_t rsz_cnt;	//busy-lock
++	u_int32_t out_size;	//busy-lock
++	u_int32_t in_start;	//busy-lock
++	u_int32_t in_size;	//busy-lock
++	u_int32_t sdr_inadd;	//shadowed
++	u_int32_t sdr_inoff;	//shadowed
++	u_int32_t sdr_outadd;	//shadowed
++	u_int32_t sdr_outoff;	//shadowed
++	u_int32_t hfilt[16];	//busy-lock
++	u_int32_t vfilt[16];	//busy-lock
++	u_int32_t yenh;		//busy-lock
++} vpfe_resizer_params_t;
++
++typedef struct fb_set_start {
++	int		offset;		/* offset from smem_start */
++	unsigned long	physical;	/* absolute physical address when offset < 0 */
++
++	u_int64_t	sync;		/* input:  target sync counter for change or 0 for no sync at all,
++					   output: sync counter of actual change or 0 if still pending */
++} fb_set_start_t;
++
++
++#ifdef _IOC_TYPECHECK
++#undef _IOC_TYPECHECK
++#define _IOC_TYPECHECK(x)     (sizeof(x))
++#endif
++
++#define	RAM_CLUT_SIZE	256*3
++#define FBIO_ENABLE_DISABLE_WIN		\
++	_IOW('F', 0x30, unsigned char)
++#define FBIO_SET_BITMAP_BLEND_FACTOR	\
++	_IOW('F', 0x31, vpbe_bitmap_blend_params_t)
++#define FBIO_SET_BITMAP_WIN_RAM_CLUT    \
++	_IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE)
++#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \
++	_IOW('F', 0x33, unsigned int)
++#define FBIO_GET_BLINK_INTERVAL		\
++	_IOR('F', 0x34, vpbe_blink_option_t)
++#define FBIO_SET_BLINK_INTERVAL         \
++	_IOW('F', 0x35, vpbe_blink_option_t)
++#define FBIO_GET_VIDEO_CONFIG_PARAMS    \
++	_IOR('F', 0x36, vpbe_video_config_params_t)
++#define FBIO_SET_VIDEO_CONFIG_PARAMS    \
++	_IOW('F', 0x37, vpbe_video_config_params_t)
++#define FBIO_GET_BITMAP_CONFIG_PARAMS   \
++	_IOR('F', 0x38, vpbe_bitmap_config_params_t)
++#define FBIO_SET_BITMAP_CONFIG_PARAMS   \
++	_IOW('F', 0x39, vpbe_bitmap_config_params_t)
++#define FBIO_SET_DCLK                   \
++	_IOW('F', 0x40, vpbe_dclk_t)
++#define FBIO_SET_INTERFACE		\
++	_IOW('F', 0x41, unsigned char)
++#define FBIO_GET_INTERFACE		\
++	_IOR('F', 0x42, unsigned char)
++#define FBIO_QUERY_TIMING		\
++	_IOWR('F', 0x43, struct vpbe_mode_info)
++#define FBIO_SET_TIMING			\
++	_IOW('F', 0x44, struct vpbe_fb_videomode)
++#define FBIO_GET_TIMING                 \
++	_IOR('F', 0x45, struct vpbe_fb_videomode)
++#define FBIO_SET_VENC_CLK_SOURCE	\
++	_IOW('F', 0x46, unsigned char)
++#define FBIO_SET_BACKG_COLOR            \
++	_IOW('F', 0x47, vpbe_backg_color_t)
++#define FBIO_ENABLE_DISPLAY		\
++	_IOW('F', 0x48, unsigned char)
++#define FBIO_SETPOS            		\
++	_IOW('F', 0x49, u_int32_t)
++#define FBIO_SET_CURSOR         	\
++	_IOW('F', 0x50, struct fb_cursor)
++#define FBIO_SET_START     		\
++	_IOW('F', 0x66, struct fb_set_start)
++
++/* 
++ * Defines and Constants
++ */
++#ifdef __KERNEL__
++#define DAVINCIFB_DEVICE "davincifb"
++#define DAVINCIFB_DRIVER "davincifb"
++
++#define MULTIPLE_BUFFERING      1
++
++#ifdef MULTIPLE_BUFFERING
++#define DOUBLE_BUF      2
++#define TRIPLE_BUF      3
++#else
++#define DOUBLE_BUF      1
++#define TRIPLE_BUF      1
++#endif
++
++/* usage:	if (is_win(info->fix.id, OSD0)) ... */
++#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0)
++
++/*
++ * display controller register I/O routines
++ */
++u32 dispc_reg_in(u32 offset);
++u32 dispc_reg_out(u32 offset, u32 val);
++u32 dispc_reg_merge(u32 offset, u32 val, u32 mask);
++
++#endif				/*__KERNEL__*/
++
++/*  Error return codes  */
++#define VPBE_INVALID_PARA_VALUE         700
++#define VPBE_WRONG_WINDOW_ID            701
++#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702
++#define VPBE_INSUFFICIENT_CLUT_VALUES   703
++#define VPBE_CLUT_WRITE_TIMEOUT         704
++#define VPBE_VID0_BUF_ADR_NULL          705
++#define VPBE_WINDOW_NOT_DISABLED        706
++#define VPBE_WINDOW_NOT_ENABLED         707
++
++#ifndef __KERNEL__
++/*  Window ID definations */
++#define OSD0      0
++#define VID0      1
++#define OSD1      2
++#define VID1      3
++#endif
++
++/* There are 4 framebuffers, each represented by an fb_info and
++ * a dm_win_info structure */
++#define OSD0_FBNAME "dm_osd0_fb"
++#define OSD1_FBNAME "dm_osd1_fb"
++#define VID0_FBNAME "dm_vid0_fb"
++#define VID1_FBNAME "dm_vid1_fb"
++
++/*  FIXME: Digital LCD RGB matrix coefficients */
++#define DLCD_DGY_VAL    0
++#define DLCD_DRV_VAL    0
++#define DLCD_DGU_VAL    0
++#define DLCD_DBU_VAL		0
++
++/* Defines for bitmap format */
++#define VPBE_BITMAP_BIT_1	1
++#define VPBE_BITMAP_BIT_2	2
++#define VPBE_BITMAP_BIT_4	4
++#define VPBE_BITMAP_BIT_8	8
++#define VPBE_BITMAP_RGB565	16
++#define VPBE_VIDEO_YUV422 	16
++#define VPBE_VIDEO_RGB888 	24
++
++/* Defines foe cursor parameter validation*/
++#define MAX_CURSOR_WIDTH	0x3FF
++#define MAX_CURSOR_HEIGHT	0x1FF
++#define MAX_CURSOR_LINEWIDTH    7
++
++#define BASEX		0x80
++#define BASEY		0x12
++#define BASEX_DLCD		0x59
++#define BASEY_DLCD		0x22
++
++/*
++ * Enumerations 
++ */
++/*  Enum for blending factor  */
++typedef enum vpbe_blend_factor {
++	OSD_CONTRIBUTION_ZERO = 0,
++	OSD_CONTRIBUTION_1_BY_8 = 1,
++	OSD_CONTRIBUTION_2_BY_8 = 2,
++	OSD_CONTRIBUTION_3_BY_8 = 3,
++	OSD_CONTRIBUTION_4_BY_8 = 4,
++	OSD_CONTRIBUTION_5_BY_8 = 5,
++	OSD_CONTRIBUTION_6_BY_8 = 6,
++	OSD_CONTRIBUTION_ONE = 7
++} vpbe_blend_factor_t;
++
++/*  Enum for Boolean variables  */
++typedef enum {
++	SET_0 = 0,
++	SET_1 = 1
++} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT;
++
++/*  Defines for Display Interface */
++#define  PRGB		0
++#define  COMPOSITE      1
++#define  SVIDEO    	2
++#define  COMPONENT 	3
++#define  RGB       	4
++#define  YCC16     	5
++#define  YCC8      	6
++#define  SRGB      	7
++#define  EPSON     	8
++#define  CASIO1G   	9
++#define  UDISP     	10
++#define  STN       	11
++#define VPBE_MAX_INTERFACES	12
++
++/*  Defines for Display Mode */
++#define  LCD    0
++#define  NTSC	1
++#define  PAL    2
++#define  P525   3
++#define  P625   4
++
++#define DEFAULT_MODE 0
++#define  P480   0
++#define  P400   1
++#define  P350   2
++#define NON_EXISTING_MODE 255
++/*  Enable/Disable enum */
++typedef enum {
++	VPBE_DISABLE = 0,
++	VPBE_ENABLE = 1
++} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING;
++
++typedef enum clk_source {
++	CLK_SOURCE_CLK27 = 0,
++	CLK_SOURCE_CLK54 = 1,
++	CLK_SOURCE_VPBECLK = 2
++} CLK_SOURCE;
++
++/*
++ * Structures and Union Definitions
++ */
++
++/*  Structure for transparency and the blending factor for the bitmap window  */
++typedef struct vpbe_bitmap_blend_params {
++	unsigned int colorkey;	/* color key to be blend */
++	unsigned int enable_colorkeying;	/* enable color keying */
++	unsigned int bf;	/* valid range from 0 to 7 only. */
++} vpbe_bitmap_blend_params_t;
++
++/*  Structure for window expansion  */
++typedef struct vpbe_win_expansion {
++	EXPANSION horizontal;
++	EXPANSION vertical;	/* 1: Enable 0:disable */
++} vpbe_win_expansion_t;
++
++/*  Structure for OSD window blinking options */
++typedef struct vpbe_blink_option {
++	BLINKING blinking;	/* 1: Enable blinking 0: Disable */
++	unsigned int interval;	/* Valid only if blinking is 1 */
++} vpbe_blink_option_t;
++
++/*  Structure for DCLK parameters */
++typedef struct vpbe_dclk {
++	unsigned char dclk_pattern_width;
++	unsigned int dclk_pattern0;
++	unsigned int dclk_pattern1;
++	unsigned int dclk_pattern2;
++	unsigned int dclk_pattern3;
++} vpbe_dclk_t;
++
++/*  Structure for display format  */
++typedef struct vpbe_display_format {
++	unsigned char interface;	/* Output interface type */
++	unsigned char mode;	/* output mode */
++} vpbe_display_format_t;
++
++/*  Structure for background color  */
++typedef struct vpbe_backg_color {
++	unsigned char clut_select;	/* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */
++	unsigned char color_offset;	/* index of color */
++} vpbe_backg_color_t;
++
++/*  Structure for Video window configurable parameters  */
++typedef struct vpbe_video_config_params {
++	CB_CR_ORDER cb_cr_order;	/*Cb/Cr order in input data for a pixel. */
++	/*    0: cb cr  1:  cr cb */
++	vpbe_win_expansion_t exp_info;	/* HZ/VT Expansion enable disable */
++} vpbe_video_config_params_t;
++
++/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/
++typedef union vpbe_clut_idx {
++	struct _for_4bit_bimap {
++		unsigned char bitmap_val_0;
++		unsigned char bitmap_val_1;
++		unsigned char bitmap_val_2;
++		unsigned char bitmap_val_3;
++		unsigned char bitmap_val_4;
++		unsigned char bitmap_val_5;
++		unsigned char bitmap_val_6;
++		unsigned char bitmap_val_7;
++		unsigned char bitmap_val_8;
++		unsigned char bitmap_val_9;
++		unsigned char bitmap_val_10;
++		unsigned char bitmap_val_11;
++		unsigned char bitmap_val_12;
++		unsigned char bitmap_val_13;
++		unsigned char bitmap_val_14;
++		unsigned char bitmap_val_15;
++	} for_4bit_bimap;
++	struct _for_2bit_bimap {
++		unsigned char bitmap_val_0;
++		unsigned char dummy0[4];
++		unsigned char bitmap_val_1;
++		unsigned char dummy1[4];
++		unsigned char bitmap_val_2;
++		unsigned char dummy2[4];
++		unsigned char bitmap_val_3;
++	} for_2bit_bimap;
++	struct _for_1bit_bimap {
++		unsigned char bitmap_val_0;
++		unsigned char dummy0[14];
++		unsigned char bitmap_val_1;
++	} for_1bit_bimap;
++} vpbe_clut_idx_t;
++
++/*  Structure for bitmap window configurable parameters */
++typedef struct vpbe_bitmap_config_params {
++	/* Only for bitmap width = 1,2,4 bits */
++	vpbe_clut_idx_t clut_idx;
++	/* Attenuation value for YUV o/p for bitmap window */
++	unsigned char attenuation_enable;
++	/* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */
++	unsigned char clut_select;
++} vpbe_bitmap_config_params_t;
++
++/*  Unioun for video/OSD configuration parameters  */
++typedef union vpbe_conf_params {
++
++	struct vpbe_video_params {
++		CB_CR_ORDER cb_cr_order;
++		/* HZ/VT Expansion enable disable */
++		vpbe_win_expansion_t exp_info;
++	} video_params;
++
++	struct vpbe_bitmap_params {
++		/* Attenuation value for YUV o/p */
++		ATTENUATION attenuation_enable;
++		/* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */
++		unsigned char clut_select;
++		/* Only for bitmap width = 1,2,4 bits */
++		vpbe_clut_idx_t clut_idx;
++		/* 0: OSD window is bitmap window */
++		/* 1: OSD window is attribute window */
++		ATTRIBUTE enable_attribute;
++		/* To hold bps value. 
++		   Used to switch back from attribute to bitmap. */
++		unsigned int stored_bits_per_pixel;
++		/* Blending information */
++		vpbe_bitmap_blend_params_t blend_info;
++		/* OSD Blinking information */
++		vpbe_blink_option_t blink_info;
++	} bitmap_params;
++
++} vpbe_conf_params_t;
++
++typedef struct vpbe_video_params vpbe_video_params_t;
++typedef struct vpbe_bitmap_params vpbe_bitmap_params_t;
++
++/* Structure to hold window position */
++typedef struct vpbe_window_position {
++	unsigned int xpos;	/* X position of the window */
++	unsigned int ypos;	/* Y position of the window */
++} vpbe_window_position_t;
++
++#ifdef __KERNEL__
++/*  Structure for each window */
++typedef struct vpbe_dm_win_info {
++	struct fb_info info;
++	vpbe_window_position_t win_pos;	/* X,Y position of window */
++	/* Size of window is already there in var_info structure. */
++
++	dma_addr_t fb_base_phys;	/*framebuffer area */
++	unsigned int fb_base;	/*window memory pointer */
++	unsigned int fb_size;	/*memory size */
++	unsigned int pseudo_palette[17];
++	int alloc_fb_mem;
++	/*flag to identify if framebuffer area is fixed or not */
++	unsigned long sdram_address;
++	struct vpbe_dm_info *dm;
++	unsigned char window_enable;	/*Additions for all windows */
++	zoom_params_t zoom;	/*Zooming parameters */
++	unsigned char field_frame_select;	/*To select Field or frame */
++	unsigned char numbufs;	/*Number of buffers valid 2 or 3 */
++	vpbe_conf_params_t conf_params;
++	/*window configuration parameter union pointer */
++} vpbe_dm_win_info_t;
++#endif				/*__KERNEL__*/
++
++/*
++ *  Videmode structure for display interface and mode settings
++ */
++typedef struct vpbe_fb_videomode {
++	unsigned char name[10];	/* Mode name ( NTSC , PAL) */
++	unsigned int vmode;	/* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */
++	unsigned int xres;	/* X Resolution of the display */
++	unsigned int yres;	/* Y Resolution of the display */
++	unsigned int fps;	/* frames per second */
++	/* Timing Parameters applicable for std = 0 only */
++	unsigned int left_margin;
++	unsigned int right_margin;
++	unsigned int upper_margin;
++	unsigned int lower_margin;
++	unsigned int hsync_len;
++	unsigned int vsync_len;
++	unsigned int sync;	/* 0: hsync -ve/vsync -ve */
++	/*1: hsync -ve/vsync +ve */
++	/*2: hsync +ve/vsync -ve */
++	/*3: hsync +ve/vsync +ve */
++	unsigned int basepx;	/* Display x,y start position */
++	unsigned int basepy;
++/*  1= Mode s available in modelist 0=Mode is not available in modelist */
++	unsigned int std;
++} vpbe_fb_videomode_t;
++
++/* Structure to interface videomode to application*/
++typedef struct vpbe_mode_info {
++	vpbe_fb_videomode_t vid_mode;
++	unsigned char interface;
++	unsigned char mode_idx;
++} vpbe_mode_info_t;
++
++#ifdef __KERNEL__
++/* 
++ * Structure for the driver holding information of windows, 
++ *  memory base addresses etc.
++ */
++typedef struct vpbe_dm_info {
++	vpbe_dm_win_info_t *osd0;
++	vpbe_dm_win_info_t *osd1;
++	vpbe_dm_win_info_t *vid0;
++	vpbe_dm_win_info_t *vid1;
++
++/* to map the registers */
++	dma_addr_t mmio_base_phys;
++	unsigned int mmio_base;
++	unsigned int mmio_size;
++
++	wait_queue_head_t vsync_wait;
++	unsigned int vsync_cnt;
++	int timeout;
++
++	/* this is the function that configures the output device (NTSC/PAL/LCD)
++	 * for the required output format (composite/s-video/component/rgb)
++	 */
++	void (*output_device_config) (void);
++
++	struct device *dev;
++
++	vpbe_backg_color_t backg;	/* background color */
++	vpbe_dclk_t dclk;	/*DCLK parameters */
++	vpbe_display_format_t display;	/*Display interface and mode */
++	vpbe_fb_videomode_t videomode;	/*Cuurent videomode */
++	char ram_clut[256][3];	/*RAM CLUT array */
++	struct fb_cursor cursor;	/* cursor config params from fb.h */
++/*Flag that indicates whether any of the display is enabled or not*/
++	int display_enable;
++} vpbe_dm_info_t;
++
++/*
++ * Functions Definitions for 'davincifb' module
++ */
++int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *);
++int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *);
++void init_display_function(vpbe_display_format_t *);
++int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **);
++void set_vid0_default_conf(void);
++void set_vid1_default_conf(void);
++void set_osd0_default_conf(void);
++void set_osd1_default_conf(void);
++void set_cursor_default_conf(void);
++void set_dm_default_conf(void);
++void set_win_enable(char *, unsigned int);
++int within_vid0_limits(u32, u32, u32, u32);
++void vpbe_set_display_default(void);
++#ifdef __KERNEL__
++void set_win_position(char *, u32, u32, u32, u32);
++void change_win_param(int);
++void set_interlaced(char *, unsigned int);
++#endif /* __KERNEL__ */
++
++/*
++ *	Function definations for 'osd' module
++ */
++
++int vpbe_enable_window(vpbe_dm_win_info_t *);
++int vpbe_disable_window(vpbe_dm_win_info_t *);
++int vpbe_vid_osd_select_field_frame(u8 *, u8);
++int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *);
++int vpbe_bitmap_set_ram_clut(void);
++int vpbe_enable_disable_attribute_window(u32);
++int vpbe_get_blinking(u8 *, vpbe_blink_option_t *);
++int vpbe_set_blinking(u8 *, vpbe_blink_option_t *);
++int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *);
++int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *);
++int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *);
++int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *);
++int vpbe_set_cursor_params(struct fb_cursor *);
++int vpbe_set_vid_expansion(vpbe_win_expansion_t *);
++int vpbe_set_dclk(vpbe_dclk_t *);
++int vpbe_set_display_format(vpbe_display_format_t *);
++int vpbe_set_backg_color(vpbe_backg_color_t *);
++int vpbe_set_interface(u8);
++int vpbe_query_mode(vpbe_mode_info_t *);
++int vpbe_set_mode(struct vpbe_fb_videomode *);
++int vpbe_set_venc_clk_source(u8);
++void set_vid0_default_conf(void);
++void set_osd0_default_conf(void);
++void set_vid1_default_conf(void);
++void set_osd1_default_conf(void);
++void set_cursor_default_conf(void);
++void set_dm_default_conf(void);
++/*
++ * Function definations for 'venc' module
++ */
++
++void davincifb_ntsc_composite_config(void);
++void davincifb_ntsc_svideo_config(void);
++void davincifb_ntsc_component_config(void);
++void davincifb_pal_composite_config(void);
++void davincifb_pal_svideo_config(void);
++void davincifb_pal_component_config(void);
++
++void vpbe_davincifb_ntsc_rgb_config(void);
++void vpbe_davincifb_pal_rgb_config(void);
++void vpbe_davincifb_525p_component_config(void);
++void vpbe_davincifb_625p_component_config(void);
++
++void vpbe_enable_venc(int);
++void vpbe_enable_dacs(int);
++/*
++ * Function definations for 'dlcd' module
++ */
++void vpbe_davincifb_480p_prgb_config(void);
++void vpbe_davincifb_400p_prgb_config(void);
++void vpbe_davincifb_350p_prgb_config(void);
++void vpbe_set_display_timing(struct vpbe_fb_videomode *);
++
++void vpbe_enable_lcd(int);
++/*
++ * Following functions are not implemented
++ */
++void vpbe_davincifb_default_ycc16_config(void);
++void vpbe_davincifb_default_ycc8_config(void);
++void vpbe_davincifb_default_srgb_config(void);
++void vpbe_davincifb_default_epson_config(void);
++void vpbe_davincifb_default_casio_config(void);
++void vpbe_davincifb_default_UDISP_config(void);
++void vpbe_davincifb_default_STN_config(void);
++#endif				/*__KERNEL__*/
++
++#endif				/* End of #ifndef DAVINCI_VPBE_H */
+diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h
+--- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h	1970-01-01 01:00:00.000000000 +0100
++++ directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h	2013-04-07 21:33:19.560662133 +0200
+@@ -0,0 +1,169 @@
++/*
++   TI Davinci driver - Graphics Driver
++
++   (c) Copyright 2007  Telio AG
++
++   Written by Denis Oliver Kropp <dok@directfb.org>
++
++   Code is derived from VMWare driver.
++
++   (c) Copyright 2001-2009  The world wide DirectFB Open Source Community (directfb.org)
++   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
++
++   All rights reserved.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#ifndef __DAVINCI_GFXDRIVER_H__
++#define __DAVINCI_GFXDRIVER_H__
++
++#include <sys/ioctl.h>
++#include <davincifb.h>
++
++#include <core/surface_buffer.h>
++
++#include "davincifb.h"
++
++#include "davinci_c64x.h"
++
++
++typedef struct {
++     /* validation flags */
++     int                       v_flags;
++
++     /* cached/computed values */
++     void                     *dst_addr;
++     unsigned long             dst_phys;
++     unsigned int              dst_size;
++     unsigned long             dst_pitch;
++     DFBSurfacePixelFormat     dst_format;
++     unsigned long             dst_bpp;
++
++     void                     *src_addr;
++     unsigned long             src_phys;
++     unsigned long             src_pitch;
++     DFBSurfacePixelFormat     src_format;
++     unsigned long             src_bpp;
++
++     unsigned long             source_mult;
++
++     unsigned long             fillcolor;
++
++     int                       blit_blend_sub_function;
++     int                       draw_blend_sub_function;
++
++     DFBColor                  color;
++     unsigned long             color_argb;
++     unsigned long             colorkey;
++
++     DFBSurfaceBlittingFlags   blitting_flags;
++
++     DFBRegion                 clip;
++
++     /** Add shared data here... **/
++     struct fb_fix_screeninfo  fix[4];
++
++     CoreSurfacePool          *osd_pool;
++     CoreSurfacePool          *video_pool;
++
++     bool                      synced;
++} DavinciDeviceData;
++
++
++typedef struct {
++     int                       num;
++     int                       fd;
++     void                     *mem;
++     int                       size;
++} DavinciFB;
++
++typedef struct {
++     DavinciDeviceData        *ddev;
++
++     CoreDFB                  *core;
++
++     CoreScreen               *screen;
++     CoreLayer                *osd;
++     CoreLayer                *video;
++
++     DavinciFB                 fb[4];
++
++     DavinciC64x               c64x;
++     bool                      c64x_present;
++
++     DavinciC64xTasks          tasks;
++} DavinciDriverData;
++
++
++static inline DFBResult
++davincifb_pan_display( const DavinciFB             *fb,
++                       struct fb_var_screeninfo    *var,
++                       const CoreSurfaceBufferLock *lock,
++                       DFBSurfaceFlipFlags          flags,
++                       int                          x,
++                       int                          y )
++{
++     int ret;
++
++     if (lock) {
++#ifdef FBIO_SET_START
++          CoreSurfaceBuffer   *buffer = lock->buffer;
++          struct fb_set_start  set_start;
++
++          /* physical mode */
++          set_start.offset   = -1;
++          set_start.sync     = (flags & DSFLIP_ONSYNC) ? 1 : 0;
++
++          /* life's so easy */
++          set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch;
++
++          ret = ioctl( fb->fd, FBIO_SET_START, &set_start );
++          if (ret < 0)
++               D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n",
++                         set_start.physical, set_start.sync );
++
++          if (ret == 0) {
++               if (flags & DSFLIP_WAIT)
++                    ioctl( fb->fd, FBIO_WAITFORVSYNC );
++
++               return DFB_OK;
++          }
++
++          /* fallback */
++#endif
++          var->xoffset = x;                  /* poor version */
++          var->yoffset = y + lock->offset / lock->pitch;
++     }
++     else {
++          var->xoffset = x;
++          var->yoffset = y;
++     }
++
++     var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW;
++
++     ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var );
++     if (ret)
++          D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n",
++                    fb->num, var->xoffset, var->yoffset );
++
++     if (flags & DSFLIP_WAIT)
++          ioctl( fb->fd, FBIO_WAITFORVSYNC );
++
++     return DFB_OK;
++}
++
++#endif
+diff -puNr -Naur directfb-1.6.3-orig/tests/voodoo/voodoo_test.h directfb-1.6.3/tests/voodoo/voodoo_test.h
+--- directfb-1.6.3-orig/tests/voodoo/voodoo_test.h	1970-01-01 01:00:00.000000000 +0100
++++ directfb-1.6.3/tests/voodoo/voodoo_test.h	2013-04-07 21:33:31.824408024 +0200
+@@ -0,0 +1,10 @@
++#ifndef __VOODOO_TEST_H__
++#define __VOODOO_TEST_H__
++
++typedef enum {
++     VOODOO_TEST_INCREASE,
++     VOODOO_TEST_QUERY
++} VoodooTestCall;
++
++#endif
++
diff --git a/package/directfb/directfb-imlib2-config.patch b/package/directfb/directfb-imlib2-config.patch
new file mode 100644
index 0000000000..1203475b30
--- /dev/null
+++ b/package/directfb/directfb-imlib2-config.patch
@@ -0,0 +1,21 @@
+Call the imlib2-conf variable that are set by ac_cv_path_IMLIB2_CONFIG
+with the absolute path because the imlib2-config file is not covered
+by the PATH variable.
+This is important for cross compiler that need to get the staging settings
+instead of the host settings.
+
+Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
+
+--- directfb-1.6.3/configure.orig	2013-03-31 13:18:22.837560379 +0200
++++ directfb-1.6.3/configure	2013-03-31 13:23:40.177541099 +0200
+@@ -19816,8 +19816,8 @@ fi
+ $as_echo "$as_me: WARNING: *** Imlib2 library not found, building without Imlib2 support ***" >&2;}
+     imlib2="no"
+   else
+-    IMLIB2_CFLAGS=`imlib2-config --cflags`
+-    IMLIB2_LIBS=`imlib2-config --libs`
++    IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags`
++    IMLIB2_LIBS=`$IMLIB2_CONFIG --libs`
+     imlib2="yes"
+   fi
+ fi
diff --git a/package/directfb/directfb-setregion-lock.patch b/package/directfb/directfb-setregion-lock.patch
new file mode 100644
index 0000000000..8a246ea057
--- /dev/null
+++ b/package/directfb/directfb-setregion-lock.patch
@@ -0,0 +1,92 @@
+This patch fixes builderrors while using '--with-gfxdrivers' and
+'--with-inputdrivers' with the current DirectFB version 1.6.3.
+
+Patch is taken from
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
+
+Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
+
+--- directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
++++ directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
+@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
+               CoreLayerRegionConfigFlags  updated,
+               CoreSurface                *surface,
+               CorePalette                *palette,
+-              CoreSurfaceBufferLock      *lock )
++              CoreSurfaceBufferLock      *left_lock,
++              CoreSurfaceBufferLock      *right_lock )
+ {
+      DFBResult ret;
+ 
+@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
+      ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
+                                       layer_data, region_data,
+                                       config, updated, surface,
+-                                      palette, lock );
++                                      palette, left_lock, right_lock );
+      if (ret)
+           return ret;
+ 
+--- directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
++++ directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
+@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
+                 CoreLayerRegionConfigFlags  updated,
+                 CoreSurface                *surface,
+                 CorePalette                *palette,
+-                CoreSurfaceBufferLock      *lock )
++                CoreSurfaceBufferLock      *left_lock,
++                CoreSurfaceBufferLock      *right_lock )
+ {
+      
+      if (updated & ~CLRCF_OPTIONS) {
+           return OldPrimaryLayerFuncs.SetRegion( layer,
+                                                  OldPrimaryLayerDriverData,
+                                                  layer_data, region_data,
+-                                                 config, updated, surface, palette, lock );
++                                                 config, updated, surface, palette, left_lock, right_lock );
+      }
+ 
+      return DFB_OK;
+--- directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
++++ directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
+@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
+               CoreLayerRegionConfigFlags  updated,
+               CoreSurface                *surface,
+               CorePalette                *palette,
+-              CoreSurfaceBufferLock      *lock )
++              CoreSurfaceBufferLock      *left_lock,
++              CoreSurfaceBufferLock      *right_lock )
+ {
+      DFBResult     ret;
+      UcDriverData *ucdrv = (UcDriverData*) driver_data;
+@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
+      ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
+                                         layer_data, region_data,
+                                         config, updated, surface,
+-                                        palette, lock );
++                                        palette, left_lock, right_lock );
+      if (ret)
+           return ret;
+ 
+--- directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
++++ directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
+@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
+               CoreLayerRegionConfigFlags  updated,
+               CoreSurface                *surface,
+               CorePalette                *palette,
+-              CoreSurfaceBufferLock      *lock )
++              CoreSurfaceBufferLock      *left_lock,
++              CoreSurfaceBufferLock      *right_lock )
+ {
+      DFBResult     ret;
+      UcDriverData *ucdrv = (UcDriverData*) driver_data;
+@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
+      ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
+                                         layer_data, region_data,
+                                         config, updated, surface,
+-                                        palette, lock );
++                                        palette, left_lock, right_lock );
+      if (ret)
+           return ret;
+ 
+

From 3d2c99565856fa96320019dfb7b81fd18e66311f Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Mon, 29 Apr 2013 23:08:08 +0000
Subject: [PATCH 4929/6849] rpi-firmware: Fixup config.txt

The default name of the kernel binary for the RaspberryPi is kernel.img,
it's only a zImage kernel renamed.  Since Buildroot will build a zImage, the
default config should use the zImage name instead of forcing the user to
rename a file.

This patch also remove the cmdline argument rootfstype. There is no point
forcing the user to use ext4 for its root partition.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/config.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/rpi-firmware/config.txt b/package/rpi-firmware/config.txt
index 2cabd683ca..a818762dff 100644
--- a/package/rpi-firmware/config.txt
+++ b/package/rpi-firmware/config.txt
@@ -6,9 +6,10 @@
 
 arm_freq=700
 core_freq=250
+kernel=zImage
 disable_overscan=1
 gpu_mem_256=100
 gpu_mem_512=100
 sdram_freq=400
 over_voltage=0
-cmdline="dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+cmdline="dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 rootwait"

From 2cd00fcf9c800b2a031fd21c13fbf5985be8fb97 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Tue, 30 Apr 2013 13:23:50 +0000
Subject: [PATCH 4930/6849] socketcand: needs toolchain with threads support

Fixes:
http://autobuild.buildroot.org/results/1d35f22a25e8641106f3c070f360cf4b4a02a461

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socketcand/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
index 0d1d983a59..d5d02de85c 100644
--- a/package/socketcand/Config.in
+++ b/package/socketcand/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_SOCKETCAND
 	bool "socketcand"
 	select BR2_PACKAGE_LIBCONFIG
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Socketcand is a daemon that provides access to CAN interfaces
 	  on a machine via a network interface.
 
 	  https://github.com/dschanoeh/socketcand
+
+comment "socketcand requires a toolchain with threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From e74edc6d9c38dc8685bee84d9bd70b64e1231b50 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 30 Apr 2013 21:08:54 +0000
Subject: [PATCH 4931/6849] gpsd: bump version to 3.9

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/gpsd-03-upstream-dbus.patch | 31 ------------------------
 package/gpsd/gpsd-04-upstream-udev.patch | 31 ------------------------
 package/gpsd/gpsd.mk                     |  2 +-
 3 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 package/gpsd/gpsd-03-upstream-dbus.patch
 delete mode 100644 package/gpsd/gpsd-04-upstream-udev.patch

diff --git a/package/gpsd/gpsd-03-upstream-dbus.patch b/package/gpsd/gpsd-03-upstream-dbus.patch
deleted file mode 100644
index 2345484c5f..0000000000
--- a/package/gpsd/gpsd-03-upstream-dbus.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-The current libgps.a logic doesn't pass down pkg-config output from
-dbus and such which breaks building when compiling:
-
-gcc -o libgps_dbus.o -c -D_GNU_SOURCE -Wextra -Wall -Wno-uninitialized \
-	-Wno-missing-field-initializers -Wcast-align -Wmissing-declarations \
-	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type \
-	-O2 libgps_dbus.c
-libgps_dbus.c:26:23: fatal error: dbus/dbus.h: No such file or directory
-compilation terminated.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
----
- SConstruct | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index e5d1f54..a56fa9b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -886,7 +886,9 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs + caplibs
- #          linking
- # The final executable will build but not be portable.
- 
--env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
-+env.StaticLibrary(target='libgps.a',
-+                  source=libgps_sources,
-+                  parse_flags=dbus_libs + rtlibs)
- 
- # Source groups
- 
diff --git a/package/gpsd/gpsd-04-upstream-udev.patch b/package/gpsd/gpsd-04-upstream-udev.patch
deleted file mode 100644
index 6de058d9cb..0000000000
--- a/package/gpsd/gpsd-04-upstream-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR
-logic when upgrading the udev path handling.
-
-It also slightly broke the mkdir setup by not creating the rules.d
-subdir under the udev path.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
----
- SConstruct | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index a56fa9b..1c187f3 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1662,10 +1662,10 @@ if env['python']:
- # is plugged in.
- 
- Utility('udev-install', 'install', [
--    'mkdir -p ' + env['udevdir'],
--    'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
--    'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
--    'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
-+    'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
-+    'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
-+    'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
-+    'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
-         ])
- 
- Utility('udev-uninstall', '', [
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index ccf99ca162..384726db98 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GPSD_VERSION = 3.8
+GPSD_VERSION = 3.9
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd/
 GPSD_LICENSE = BSD-3c
 GPSD_LICENSE_FILES = COPYING

From e97376a0fc018970f7a166f183d3817a6b1bfaf1 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Wed, 1 May 2013 17:15:26 +0000
Subject: [PATCH 4932/6849] Makefile: make skeleton rsync options consistent

Initially, a "cp" was used for the one-time target skeleton
installation, and an "rsync" was used for the every-time overlay
skeleton installations.  Then, the target skeleton install was
changed to also use rsync (1cd3f992fb3659aacbb0cdd3ed64347a37569891).
Now there are two rsyncs, but with different filter specs, which
seems odd.

This patch adds --excludes to both invocations of rsync to make them
consistent, and removes the -u option from the initial target skeleton
installation.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 97804ff78c..5b690f0177 100644
--- a/Makefile
+++ b/Makefile
@@ -429,7 +429,9 @@ endif
 
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
-	rsync -au --exclude=.empty --exclude=CVS --exclude=.svn --exclude='*~' \
+	rsync -a \
+		--exclude .empty --exclude .svn --exclude .git \
+		--exclude .hg --exclude=CVS --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	touch $@
@@ -505,7 +507,7 @@ endif
 		$(call MESSAGE,"Copying overlay $(d)"); \
 		rsync -a \
 			--exclude .empty --exclude .svn --exclude .git \
-			--exclude .hg --exclude '*~' \
+			--exclude .hg --exclude=CVS --exclude '*~' \
 			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \

From a17d8942a4b7247822421946a21584b460ac1650 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 7 Feb 2013 11:02:33 +0000
Subject: [PATCH 4933/6849] ffmpeg: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 2e88b6b87e..fd7a25677c 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -9,6 +9,13 @@ FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
 
+FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
+FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
+ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
+FFMPEG_LICENSE += and GPLv2+
+FFMPEG_LICENSE_FILES += COPYING.GPLv2
+endif
+
 FFMPEG_CONF_OPT = \
 	--prefix=/usr		\
 	--disable-avfilter	\

From 1bb2fe1a45f500a5cf1c66514344565f09400fa6 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 7 Feb 2013 11:02:34 +0000
Subject: [PATCH 4934/6849] omap-u-boot-utils: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/omap-u-boot-utils/omap-u-boot-utils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index bb894a5f08..8615fdb5f8 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -6,6 +6,8 @@
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852
 OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/master
+OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
+OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 
 define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)

From e98a621323b2c30804351f8999f0a6c5b4419cbe Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 7 Feb 2013 11:02:35 +0000
Subject: [PATCH 4935/6849] qt: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index bd3dd338ee..93d2ed0451 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -17,6 +17,12 @@ QT_SITE    = http://releases.qt-project.org/qt4/source
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 
+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
+ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
+QT_LICENSE += or Digia Qt Commercial license
+endif
+QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
+
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
 QT_CONFIGURE_OPTS += -opensource -confirm-license
 endif

From c5f8797b2cfeef0cb8c13a5ebace066813da2893 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 7 Feb 2013 11:02:36 +0000
Subject: [PATCH 4936/6849] ccache: define license

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccache/ccache.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 1cbad6e75c..faa7c9fcc6 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -7,6 +7,8 @@
 CCACHE_VERSION = 3.1.8
 CCACHE_SITE    = http://samba.org/ftp/ccache
 CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
+CCACHE_LICENSE = GPLv3+, others
+CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
 # When ccache is being built for the host, ccache is not yet
 # available, so we have to use the special C compiler without the

From 9aa7ecb7f7a2a65c2f05eb0c32fb929565a2fd2c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 May 2013 12:26:45 +0200
Subject: [PATCH 4937/6849] memtester: add license info

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/memtester/memtester.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index 8cca471cf5..461a9062b6 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -6,6 +6,8 @@
 MEMTESTER_VERSION = 4.3.0
 MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions/
+MEMTESTER_LICENSE = GPLv2
+MEMTESTER_LICENSE_FILES = COPYING
 
 MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr
 

From 841f7858580a805214f014c83bfae2fa7fce4ebf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 May 2013 12:35:18 +0200
Subject: [PATCH 4938/6849] mongoose: fix license info

License file is called LICENSE, not COPYING.

Fixes http://autobuild.buildroot.net/results/b45499489abad2a089b47d8470632b4152862c89/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mongoose/mongoose.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
index ac03bb6290..9905cf9c30 100644
--- a/package/mongoose/mongoose.mk
+++ b/package/mongoose/mongoose.mk
@@ -8,7 +8,7 @@ MONGOOSE_VERSION = 3.7
 MONGOOSE_SOURCE = mongoose-$(MONGOOSE_VERSION).tgz
 MONGOOSE_SITE = https://mongoose.googlecode.com/files
 MONGOOSE_LICENSE = MIT
-MONGOOSE_LICENSE_FILES = COPYING
+MONGOOSE_LICENSE_FILES = LICENSE
 
 MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS)
 

From b2c69fdfae21e60c007e303405733173afc588be Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 May 2013 12:46:03 +0200
Subject: [PATCH 4939/6849] libplayer: needs threads support in toolchain

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libplayer/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index 5391b8b67b..df32901162 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPLAYER
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	bool "libplayer"
 	help
 	  libplayer provides a generic A/V API that relies on various multimedia
@@ -31,5 +32,5 @@ config BR2_PACKAGE_LIBPLAYER_PYTHON
 	bool "Libplayer python bindings"
 endif
 
-comment "libplayer requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "libplayer requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From 97387cda09e234c6584f7edfd9ae4c504a0304b5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 May 2013 12:47:23 +0200
Subject: [PATCH 4940/6849] gstreamer: needs threads support in toolchain

Indirectly fixes http://autobuild.buildroot.net/results/453ac64daf384702512ac68f1779f375e337332d/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/Config.in | 5 +++--
 package/opencv/Config.in               | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 9a6748106b..4b4d80fce7 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GSTREAMER
 	bool "gstreamer"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GStreamer is an open source multimedia framework.
@@ -24,5 +25,5 @@ config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
 	  Enable support for the GStreamer plugin registry. This may increase
 	  the launch-time for a GStreamer application.
 
-comment "gstreamer requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "gstreamer requires a toolchain with WCHAR and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 3e9ead6256..55b86a07a3 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -140,6 +140,7 @@ comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
 	bool "gstreamer support"
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP

From 80e7419680d5eb57da0b0b34248e49dcd81619a8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 3 May 2013 13:10:23 +0200
Subject: [PATCH 4941/6849] libjson: ensure shared lib is built with -fPIC

Fixes http://autobuild.buildroot.net/results/72e6c260c9028dd636965b8bf76bb7ba216aa1a4/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libjson/libjson.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
index deca0f845d..9b1aca3bf7 100644
--- a/package/libjson/libjson.mk
+++ b/package/libjson/libjson.mk
@@ -11,8 +11,16 @@ LIBJSON_INSTALL_STAGING = YES
 LIBJSON_LICENSE = BSD-2c
 LIBJSON_LICENSE_FILES = License.txt
 
-LIBJSON_MAKE_OPT = BUILD_TYPE= SHARED=$(if $(BR2_PREFER_STATIC_LIB),0,1) \
-	CXXFLAGS="$(TARGET_CXXFLAGS) -DNDEBUG"
+LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+LIBJSON_MAKE_OPT += SHARED=0
+else
+LIBJSON_MAKE_OPT += SHARED=1
+LIBJSON_CXXFLAGS += -fPIC
+endif
+
+LIBJSON_MAKE_OPT += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
 
 define LIBJSON_EXTRACT_CMDS
 	unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)

From 12097e6e4e4f732d37203d7b025e599bfd930349 Mon Sep 17 00:00:00 2001
From: Avishay Orpaz <avishorp@gmail.com>
Date: Mon, 13 Aug 2012 04:19:37 +0000
Subject: [PATCH 4942/6849] Added support for hashlib in the target Python

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/Config.in | 6 ++++++
 package/python/python.mk | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/package/python/Config.in b/package/python/Config.in
index 4089ccefe6..cfe73db100 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -95,6 +95,12 @@ config BR2_PACKAGE_PYTHON_ZLIB
 	help
 	  zlib support in Python
 
+config BR2_PACKAGE_PYTHON_HASHLIB
+	bool "hashlib module"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  hashlib support in Python
+
 endmenu
 
 endif
diff --git a/package/python/python.mk b/package/python/python.mk
index 71591b7247..4876dd8b5b 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -108,6 +108,10 @@ else
 PYTHON_CONF_OPT += --disable-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
+PYTHON_DEPENDENCIES += openssl
+endif
+
 PYTHON_CONF_ENV += \
 	PYTHON_FOR_BUILD=$(HOST_PYTHON_DIR)/python \
 	PGEN_FOR_BUILD=$(HOST_PYTHON_DIR)/Parser/pgen \

From 92358271b9eede8cb284fb42ea24cff48ec9c322 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 04:35:39 +0000
Subject: [PATCH 4943/6849] diffutils: only needs gettext if locale is selected

Also add missing select in Config.in.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/diffutils/Config.in    | 1 +
 package/diffutils/diffutils.mk | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
index 86da5d3a4f..4cc16e2127 100644
--- a/package/diffutils/Config.in
+++ b/package/diffutils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DIFFUTILS
 	bool"diffutils"
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  GNU diff. Compare files per line.
 
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 168d040248..25307630a0 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -6,8 +6,7 @@
 
 DIFFUTILS_VERSION = 3.2
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
-DIFFUTILS_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext)
+DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox

From 7016cb04456a983ba3c64c311f73a179c8c1dab4 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:05 +0000
Subject: [PATCH 4944/6849] support: add kconfiglib python module

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr: rename readme so it is obvious it's about kconfiglib]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/kconfiglib.py     | 3772 +++++++++++++++++++++++++++++
 support/scripts/readme.kconfiglib |   30 +
 2 files changed, 3802 insertions(+)
 create mode 100644 support/scripts/kconfiglib.py
 create mode 100644 support/scripts/readme.kconfiglib

diff --git a/support/scripts/kconfiglib.py b/support/scripts/kconfiglib.py
new file mode 100644
index 0000000000..0704cc0573
--- /dev/null
+++ b/support/scripts/kconfiglib.py
@@ -0,0 +1,3772 @@
+# This is Kconfiglib, a Python library for scripting, debugging, and extracting
+# information from Kconfig-based configuration systems. To view the
+# documentation, run
+#
+#  $ pydoc kconfiglib
+#
+# or, if you prefer HTML,
+#
+#  $ pydoc -w kconfiglib
+#
+# The examples/ subdirectory contains examples, to be run with e.g.
+#
+#  $ make scriptconfig SCRIPT=Kconfiglib/examples/print_tree.py
+#
+# Look in testsuite.py for the test suite.
+
+"""
+Kconfiglib is a Python library for scripting and extracting information from
+Kconfig-based configuration systems. Features include the following:
+
+ - Symbol values and properties can be looked up and values assigned
+   programmatically.
+ - .config files can be read and written.
+ - Expressions can be evaluated in the context of a Kconfig configuration.
+ - Relations between symbols can be quickly determined, such as finding all
+   symbols that reference a particular symbol.
+ - Highly compatible with the scripts/kconfig/*conf utilities. The test suite
+   automatically compares outputs between Kconfiglib and the C implementation
+   for a large number of cases.
+
+For the Linux kernel, scripts are run using
+
+ $ make scriptconfig SCRIPT=<path to script> [SCRIPT_ARG=<arg>]
+
+Running scripts via the 'scriptconfig' target ensures that required environment
+variables (SRCARCH, ARCH, srctree, KERNELVERSION, etc.) are set up correctly.
+Alternative architectures can be specified like for other 'make *config'
+targets:
+
+ $ make scriptconfig ARCH=mips SCRIPT=<path to script> [SCRIPT_ARG=<arg>]
+
+The script will receive the name of the Kconfig file to load in sys.argv[1].
+(As of Linux 3.7.0-rc8 this is always "Kconfig" from the kernel top-level
+directory.) If an argument is provided with SCRIPT_ARG, it will appear in
+sys.argv[2].
+
+To get an interactive Python prompt with Kconfiglib preloaded and a Config
+object 'c' created, use
+
+ $ make iscriptconfig [ARCH=<architecture>]
+
+Kconfiglib requires Python 2. For (i)scriptconfig the command to run the Python
+interpreter can be passed in the environment variable PYTHONCMD (defaults to
+'python'; PyPy works too and is a bit faster).
+
+Look in the examples/ subdirectory for examples, which can be run with e.g.
+
+ $ make scriptconfig SCRIPT=Kconfiglib/examples/print_tree.py
+
+or
+
+ $ make scriptconfig SCRIPT=Kconfiglib/examples/help_grep.py SCRIPT_ARG="kernel"
+
+Look in testsuite.py for the test suite.
+
+Credits: Written by Ulf "Ulfalizer" Magnusson
+
+Send bug reports, suggestions and other feedback to kconfiglib@gmail.com .
+Don't wrestle with internal APIs. Tell me what you need and I might add it in a
+safe way as a client API instead."""
+
+# If you have Psyco installed (32-bit installations, Python <= 2.6 only),
+# setting this to True (right here, not at runtime) might give a nice speedup.
+# (22% faster for parsing arch/x86/Kconfig and 58% faster for evaluating all
+# symbols in it without a .config on my Core Duo.)
+use_psyco = False
+
+import os
+import re
+import string
+import sys
+
+class Config():
+
+    """Represents a Kconfig configuration, e.g. for i386 or ARM. This is the
+    set of symbols and other items appearing in the configuration together with
+    their values. Creating any number of Config objects -- including for
+    different architectures -- is safe; Kconfiglib has no global state."""
+
+    #
+    # Public interface
+    #
+
+    def __init__(self,
+                 filename = "Kconfig",
+                 base_dir = "$srctree",
+                 print_warnings = True,
+                 print_undef_assign = False):
+        """Creates a new Config object, representing a Kconfig configuration.
+        Raises Kconfig_Syntax_Error on syntax errors.
+
+        filename (default: "Kconfig") -- The base Kconfig file of the
+                 configuration. For the Linux kernel, this should usually be be
+                 "Kconfig" from the top-level directory, as environment
+                 variables will make sure the right Kconfig is included from
+                 there (usually arch/<architecture>/Kconfig). If you are using
+                 kconfiglib via 'make scriptconfig' the filename of the
+                 correct Kconfig will be in sys.argv[1].
+
+        base_dir (default: "$srctree") -- The base directory relative to which
+                'source' statements within Kconfig files will work. For the
+                Linux kernel this should be the top-level directory of the
+                kernel tree. $-references to environment variables will be
+                expanded.
+
+                The environment variable 'srctree' is set by the Linux makefiles
+                to the top-level kernel directory. A default of "." would not
+                work if an alternative build directory is used.
+
+        print_warnings (default: True) -- Set to True if warnings related to
+                       this configuration should be printed to stderr. This can
+                       be changed later with Config.set_print_warnings(). It is
+                       provided as a constructor argument since warnings might
+                       be generated during parsing.
+
+        print_undef_assign (default: False) -- Set to True if informational
+                           messages related to assignments to undefined symbols
+                           should be printed to stderr for this configuration.
+                           Can be changed later with
+                           Config.set_print_undef_assign()."""
+
+        # The set of all symbols, indexed by name (a string)
+        self.syms = {}
+
+        # The set of all defined symbols in the configuration in the order they
+        # appear in the Kconfig files. This excludes the special symbols n, m,
+        # and y as well as symbols that are referenced but never defined.
+        self.kconfig_syms = []
+
+        # The set of all named choices (yes, choices can have names), indexed
+        # by name (a string)
+        self.named_choices = {}
+
+        def register_special_symbol(type, name, value):
+            sym = Symbol()
+            sym.is_special_ = True
+            sym.is_defined_ = True
+            sym.config = self
+            sym.name = name
+            sym.type = type
+            sym.cached_value = value
+            self.syms[name] = sym
+            return sym
+
+        # The special symbols n, m and y, used as shorthand for "n", "m" and
+        # "y"
+        self.n = register_special_symbol(TRISTATE, "n", "n")
+        self.m = register_special_symbol(TRISTATE, "m", "m")
+        self.y = register_special_symbol(TRISTATE, "y", "y")
+
+        # DEFCONFIG_LIST uses this
+        register_special_symbol(STRING, "UNAME_RELEASE", os.uname()[2])
+
+        # The symbol with "option defconfig_list" set, containing a list of
+        # default .config files
+        self.defconfig_sym = None
+
+        # See Symbol.get_(src)arch()
+        self.arch    = os.environ.get("ARCH")
+        self.srcarch = os.environ.get("SRCARCH")
+
+        # See Config.__init__(). We need this for get_defconfig_filename().
+        self.srctree = os.environ.get("srctree")
+        if self.srctree is None:
+            self.srctree = "."
+
+        self.filename = filename
+        self.base_dir = _strip_trailing_slash(os.path.expandvars(base_dir))
+
+        # The 'mainmenu' text
+        self.mainmenu_text = None
+
+        # The filename of the most recently loaded .config file
+        self.config_filename = None
+
+        # The textual header of the most recently loaded .config, uncommented
+        self.config_header = None
+
+        self.print_warnings = print_warnings
+        self.print_undef_assign = print_undef_assign
+
+        # Lists containing all choices, menus and comments in the configuration
+
+        self.choices = []
+        self.menus = []
+        self.comments = []
+
+        # For parsing routines that stop when finding a line belonging to a
+        # different construct, these holds that line and the tokenized version
+        # of that line. The purpose is to avoid having to re-tokenize the line,
+        # which is inefficient and causes problems when recording references to
+        # symbols.
+        self.end_line = None
+        self.end_line_tokens = None
+
+        # See the comment in _parse_expr().
+        self.parse_expr_cur_sym_or_choice = None
+        self.parse_expr_line = None
+        self.parse_expr_filename = None
+        self.parse_expr_linenr = None
+        self.parse_expr_transform_m = None
+
+        # Parse the Kconfig files
+        self.top_block = self._parse_file(filename, None, None, None)
+
+        # Build Symbol.dep for all symbols
+        self._build_dep()
+
+    def load_config(self, filename, replace = True):
+        """Loads symbol values from a file in the familiar .config format.
+           Equivalent to calling Symbol.set_user_value() to set each of the
+           values.
+
+           filename -- The .config file to load. $-references to environment
+                       variables will be expanded. For scripts to work even
+                       when an alternative build directory is used with the
+                       Linux kernel, you need to refer to the top-level kernel
+                       directory with "$srctree".
+
+           replace (default: True) -- True if the configuration should replace
+                   the old configuration; False if it should add to it."""
+
+        def warn_override(filename, linenr, name, old_user_val, new_user_val):
+            self._warn("overriding the value of {0}. "
+                       'Old value: "{1}", new value: "{2}".'
+                        .format(name, old_user_val, new_user_val),
+                       filename,
+                       linenr)
+
+        filename = os.path.expandvars(filename)
+
+        # Put this first so that a missing file doesn't screw up our state
+        line_feeder = _FileFeed(_get_lines(filename), filename)
+
+        self.config_filename = filename
+
+        # Invalidate everything. This is usually faster than finding the
+        # minimal set of symbols that needs to be invalidated, as nearly all
+        # symbols will tend to be affected anyway.
+        if replace:
+            self.unset_user_values()
+        else:
+            self._invalidate_all()
+
+        # Read header
+
+        self.config_header = None
+
+        def is_header_line(line):
+            return line.startswith("#") and \
+                   not unset_re.match(line)
+
+        first_line = line_feeder.get_next()
+
+        if first_line is None:
+            return
+
+        if not is_header_line(first_line):
+            line_feeder.go_back()
+        else:
+            self.config_header = first_line[1:]
+
+            # Read remaining header lines
+            while 1:
+                line = line_feeder.get_next()
+
+                if line is None:
+                    break
+
+                if not is_header_line(line):
+                    line_feeder.go_back()
+                    break
+
+                self.config_header += line[1:]
+
+            # Remove trailing newline
+            if self.config_header.endswith("\n"):
+                self.config_header = self.config_header[:-1]
+
+        # Read assignments
+
+        filename = line_feeder.get_filename()
+
+        while 1:
+            line = line_feeder.get_next()
+            if line is None:
+                return
+
+            linenr = line_feeder.get_linenr()
+
+            line = line.strip()
+
+            set_re_match = set_re.match(line)
+            if set_re_match:
+                name, val = set_re_match.groups()
+                # The unescaping producedure below should be safe since " can
+                # only appear as \" inside the string
+                val = _strip_quotes(val, line, filename, linenr)\
+                      .replace('\\"', '"').replace("\\\\", "\\")
+                if name in self.syms:
+                    sym = self.syms[name]
+
+                    old_user_val = sym.user_val
+                    if old_user_val is not None:
+                        warn_override(filename, linenr, name, old_user_val, val)
+
+                    if sym.is_choice_symbol_:
+                        user_mode = sym.parent.user_mode
+                        if user_mode is not None and user_mode != val:
+                            self._warn("assignment to {0} changes mode of containing "
+                                       'choice from "{1}" to "{2}".'
+                                       .format(name, val, user_mode),
+                                       filename,
+                                       linenr)
+
+                    sym._set_user_value_no_invalidate(val, True)
+
+                else:
+                    self._undef_assign('attempt to assign the value "{0}" to the '
+                                       "undefined symbol {1}."
+                                       .format(val, name),
+                                       filename,
+                                       linenr)
+
+            else:
+                unset_re_match = unset_re.match(line)
+                if unset_re_match:
+                    name = unset_re_match.group(1)
+                    if name in self.syms:
+                        sym = self.syms[name]
+
+                        old_user_val = sym.user_val
+                        if old_user_val is not None:
+                            warn_override(filename, linenr, name, old_user_val, "n")
+
+                        sym._set_user_value_no_invalidate("n", True)
+
+    def write_config(self, filename, header = None):
+        """Writes out symbol values in the familiar .config format.
+
+           filename -- The filename under which to save the configuration.
+
+           header (default: None) -- A textual header that will appear at the
+                  beginning of the file, with each line commented out
+                  automatically. None means no header."""
+
+        # already_written is set when _make_conf() is called on a symbol, so
+        # that symbols defined in multiple locations only get one entry in the
+        # .config. We need to reset it prior to writing out a new .config.
+        for sym in self.syms.itervalues():
+            sym.already_written = False
+
+        with open(filename, "w") as f:
+            # Write header
+            if header is not None:
+                f.write(_comment(header))
+                f.write("\n")
+
+            # Write configuration.
+            # (You'd think passing a list around to all the nodes and appending
+            # to it to avoid copying would be faster, but it's actually a lot
+            # slower with PyPy, and about as fast with Python. Passing the file
+            # around is slower too.)
+            f.write("\n".join(self.top_block._make_conf()))
+            f.write("\n")
+
+    def get_kconfig_filename(self):
+        """Returns the name of the (base) kconfig file this configuration was
+        loaded from."""
+        return self.filename
+
+    def get_arch(self):
+        """Returns the value the environment variable ARCH had at the time the
+        Config instance was created, or None if ARCH was not set. For the
+        kernel, this corresponds to the architecture being built for, with
+        values such as "i386" or "mips"."""
+        return self.arch
+
+    def get_srcarch(self):
+        """Returns the value the environment variable SRCARCH had at the time
+        the Config instance was created, or None if SRCARCH was not set. For
+        the kernel, this corresponds to the arch/ subdirectory containing
+        architecture-specific source code."""
+        return self.srcarch
+
+    def get_srctree(self):
+        """Returns the value the environment variable srctree had at the time
+        the Config instance was created, or None if srctree was not defined.
+        This variable points to the source directory and is used when building
+        in a separate directory."""
+        return self.srctree
+
+    def get_config_filename(self):
+        """Returns the name of the most recently loaded configuration file, or
+        None if no configuration has been loaded."""
+        return self.config_filename
+
+    def get_mainmenu_text(self):
+        """Returns the text of the 'mainmenu' statement (with $-references to
+        symbols replaced by symbol values), or None if the configuration has no
+        'mainmenu' statement."""
+        return None if self.mainmenu_text is None else \
+          self._expand_sym_refs(self.mainmenu_text)
+
+    def get_defconfig_filename(self):
+        """Returns the name of the defconfig file, which is the first existing
+        file in the list given in a symbol having 'option defconfig_list' set.
+        $-references to symbols will be expanded ("$FOO bar" -> "foo bar" if
+        FOO has the value "foo"). Returns None in case of no defconfig file.
+        Setting 'option defconfig_list' on multiple symbols currently results
+        in undefined behavior.
+
+        If the environment variable 'srctree' was set when the Config was
+        created, get_defconfig_filename() will first look relative to that
+        directory before looking in the current directory; see
+        Config.__init__()."""
+
+        if self.defconfig_sym is None:
+            return None
+
+        for (filename, cond_expr) in self.defconfig_sym.def_exprs:
+            if self._eval_expr(cond_expr) == "y":
+                filename = self._expand_sym_refs(filename)
+
+                # We first look in $srctree. os.path.join() won't work here as
+                # an absolute path in filename would override $srctree.
+                srctree_filename = os.path.normpath(self.srctree + "/" + filename)
+                if os.path.exists(srctree_filename):
+                    return srctree_filename
+
+                if os.path.exists(filename):
+                    return filename
+
+        return None
+
+    def get_symbol(self, name):
+        """Returns the symbol with name 'name', or None if no such symbol
+        appears in the configuration. An alternative shorthand is conf[name],
+        where conf is a Config instance, though that will instead raise
+        KeyError if the symbol does not exist."""
+        return self.syms.get(name)
+
+    def get_top_level_items(self):
+        """Returns a list containing the items (symbols, menus, choice
+        statements and comments) at the top level of the configuration -- that
+        is, all items that do not appear within a menu or choice. The items
+        appear in the same order as within the configuration."""
+        return self.top_block.get_items()
+
+    def get_symbols(self, all_symbols = True):
+        """Returns a list of symbols from the configuration. An alternative for
+        iterating over all defined symbols (in the order of definition) is
+
+        for sym in config:
+            ...
+
+        which relies on Config implementing __iter__() and is equivalent to
+
+        for sym in config.get_symbols(False):
+            ...
+
+        all_symbols (default: True) -- If True, all symbols - including special
+                    and undefined symbols - will be included in the result, in
+                    an undefined order. If False, only symbols actually defined
+                    and not merely referred to in the configuration will be
+                    included in the result, and will appear in the order that
+                    they are defined within the Kconfig configuration files."""
+        return self.syms.values() if all_symbols else self.kconfig_syms
+
+    def get_choices(self):
+        """Returns a list containing all choice statements in the
+        configuration, in the order they appear in the Kconfig files."""
+        return self.choices
+
+    def get_menus(self):
+        """Returns a list containing all menus in the configuration, in the
+        order they appear in the Kconfig files."""
+        return self.menus
+
+    def get_comments(self):
+        """Returns a list containing all comments in the configuration, in the
+        order they appear in the Kconfig files."""
+        return self.comments
+
+    def eval(self, s):
+        """Returns the value of the expression 's' -- where 's' is represented
+        as a string -- in the context of the configuration. Raises
+        Kconfig_Syntax_Error if syntax errors are detected in 's'.
+
+        For example, if FOO and BAR are tristate symbols at least one of which
+        has the value "y", then config.eval("y && (FOO || BAR)") => "y"
+
+        This functions always yields a tristate value. To get the value of
+        non-bool, non-tristate symbols, use Symbol.get_value().
+
+        The result of this function is consistent with how evaluation works for
+        conditional expressions in the configuration as well as in the C
+        implementation. "m" and m are rewritten as '"m" && MODULES' and 'm &&
+        MODULES', respectively, and a result of "m" will get promoted to "y" if
+        we're running without modules."""
+        return self._eval_expr(self._parse_expr(self._tokenize(s, True), # Feed
+                                                None, # Current symbol or choice
+                                                s))   # line
+
+    def get_config_header(self):
+        """Returns the (uncommented) textual header of the .config file most
+        recently loaded with load_config(). Returns None if no .config file has
+        been loaded or if the most recently loaded .config file has no header.
+        The header comprises all lines up to but not including the first line
+        that either
+
+        1. Does not start with "#"
+        2. Has the form "# CONFIG_FOO is not set."
+        """
+        return self.config_header
+
+    def get_base_dir(self):
+        """Returns the base directory relative to which 'source' statements
+        will work, passed as an argument to Config.__init__()."""
+        return self.base_dir
+
+    def set_print_warnings(self, print_warnings):
+        """Determines whether warnings related to this configuration (for
+        things like attempting to assign illegal values to symbols with
+        Symbol.set_user_value()) should be printed to stderr.
+
+        print_warnings -- True if warnings should be
+                          printed, otherwise False."""
+        self.print_warnings = print_warnings
+
+    def set_print_undef_assign(self, print_undef_assign):
+        """Determines whether informational messages related to assignments to
+        undefined symbols should be printed to stderr for this configuration.
+
+        print_undef_assign -- If True, such messages will be printed."""
+        self.print_undef_assign = print_undef_assign
+
+    def __getitem__(self, key):
+        """Returns the symbol with name 'name'. Raises KeyError if the symbol
+        does not appear in the configuration."""
+        return self.syms[key]
+
+    def __iter__(self):
+        """Convenience function for iterating over the set of all defined
+        symbols in the configuration, used like
+
+        for sym in conf:
+            ...
+
+        The iteration happens in the order of definition within the Kconfig
+        configuration files. Symbols only referred to but not defined will not
+        be included, nor will the special symbols n, m, and y. If you want to
+        include such symbols as well, see config.get_symbols()."""
+        return iter(self.kconfig_syms)
+
+    def unset_user_values(self):
+        """Resets the values of all symbols, as if Config.load_config() or
+        Symbol.set_user_value() had never been called."""
+        for sym in self.syms.itervalues():
+            sym._unset_user_value_no_recursive_invalidate()
+
+    def __str__(self):
+        """Returns a string containing various information about the Config."""
+        return _sep_lines("Configuration",
+                          "File                                   : " + self.filename,
+                          "Base directory                         : " + self.base_dir,
+                          "Value of $ARCH at creation time        : " +
+                            ("(not set)" if self.arch is None else self.arch),
+                          "Value of $SRCARCH at creation time     : " +
+                            ("(not set)" if self.srcarch is None else self.srcarch),
+                          "Source tree (derived from $srctree;",
+                          "defaults to '.' if $srctree isn't set) : " + self.srctree,
+                          "Most recently loaded .config           : " +
+                            ("(no .config loaded)" if self.config_filename is None else
+                             self.config_filename),
+                          "Print warnings                         : " +
+                            bool_str[self.print_warnings],
+                          "Print assignments to undefined symbols : " +
+                            bool_str[self.print_undef_assign])
+
+
+    #
+    # Private methods
+    #
+
+    def _invalidate_all(self):
+        for sym in self.syms.itervalues():
+            sym._invalidate()
+
+    def _tokenize(self,
+                  s,
+                  for_eval = False,
+                  filename = None,
+                  linenr = None):
+        """Returns a _Feed instance containing tokens derived from the string
+        's'. Registers any new symbols encountered (via _sym_lookup()).
+
+        (I experimented with a pure regular expression implementation, but it
+        came out slower, less readable, and wouldn't have been as flexible.)
+
+        for_eval -- True when parsing an expression for a call to
+                    Config.eval(), in which case we should not treat the first
+                    token specially nor register new symbols."""
+        s = s.lstrip()
+        if s == "" or s[0] == "#":
+            return _Feed([])
+
+        if for_eval:
+            i = 0 # The current index in the string being tokenized
+            previous = None # The previous token seen
+            tokens = []
+        else:
+            # The initial word on a line is parsed specially. Let
+            # command_chars = [A-Za-z0-9_]. Then
+            #  - leading non-command_chars characters on the line are ignored, and
+            #  - the first token consists the following one or more command_chars
+            #    characters.
+            # This is why things like "----help--" are accepted.
+
+            initial_token_match = initial_token_re.match(s)
+            if initial_token_match is None:
+                return _Feed([])
+            # The current index in the string being tokenized
+            i = initial_token_match.end()
+
+            keyword = keywords.get(initial_token_match.group(1))
+            if keyword is None:
+                # We expect a keyword as the first token
+                _tokenization_error(s, len(s), filename, linenr)
+            if keyword == T_HELP:
+                # Avoid junk after "help", e.g. "---", being registered as a
+                # symbol
+                return _Feed([T_HELP])
+            tokens = [keyword]
+            previous = keyword
+
+        # _tokenize() is a hotspot during parsing, and this speeds things up a
+        # bit
+        strlen = len(s)
+        append = tokens.append
+
+        # Main tokenization loop. (Handles tokens past the first one.)
+        while i < strlen:
+            # Test for an identifier/keyword preceded by whitespace first; this
+            # is the most common case.
+            id_keyword_match = id_keyword_re.match(s, i)
+            if id_keyword_match:
+                # We have an identifier or keyword. The above also stripped any
+                # whitespace for us.
+                name = id_keyword_match.group(1)
+                # Jump past it
+                i = id_keyword_match.end()
+
+                # Keyword?
+                keyword = keywords.get(name)
+                if keyword is not None:
+                    append(keyword)
+                # What would ordinarily be considered a name is treated as a
+                # string after certain tokens.
+                elif previous in string_lex:
+                    append(name)
+                else:
+                    # We're dealing with a symbol. _sym_lookup() will take care
+                    # of allocating a new Symbol instance if it's the first
+                    # time we see it.
+                    sym = self._sym_lookup(name, not for_eval)
+
+                    if previous == T_CONFIG or previous == T_MENUCONFIG:
+                        # If the previous token is T_(MENU)CONFIG
+                        # ("(menu)config"), we're tokenizing the first line of
+                        # a symbol definition, and should remember this as a
+                        # location where the symbol is defined.
+                        sym.def_locations.append((filename, linenr))
+                    else:
+                        # Otherwise, it's a reference to the symbol
+                        sym.ref_locations.append((filename, linenr))
+
+                    append(sym)
+
+            else:
+                # This restrips whitespace that could have been stripped in the
+                # regex above, but it's worth it since identifiers/keywords are
+                # more common
+                s = s[i:].lstrip()
+                if s == "":
+                    break
+                strlen = len(s)
+                i = 0
+                c = s[0]
+
+                # String literal (constant symbol)
+                if c == '"' or c == "'":
+                    i += 1
+
+                    if "\\" in s:
+                        # Slow path: This could probably be sped up, but it's a
+                        # very unusual case anyway.
+                        quote = c
+                        value = ""
+                        while 1:
+                            if i >= strlen:
+                                _tokenization_error(s, strlen, filename,
+                                                    linenr)
+                            c = s[i]
+                            if c == quote:
+                                break
+                            if c == "\\":
+                                if i + 1 >= strlen:
+                                    _tokenization_error(s, strlen, filename,
+                                                        linenr)
+                                value += s[i + 1]
+                                i += 2
+                            else:
+                                value += c
+                                i += 1
+                        i += 1
+                        append(value)
+                    else:
+                        # Fast path: If the string contains no backslashes (almost
+                        # always) we can simply look for the matching quote.
+                        end = s.find(c, i)
+                        if end == -1:
+                            _tokenization_error(s, strlen, filename, linenr)
+                        append(s[i:end])
+                        i = end + 1
+
+                elif c == "&":
+                    if i + 1 >= strlen:
+                        # Invalid characters are ignored
+                        continue
+                    if s[i + 1] != "&":
+                        # Invalid characters are ignored
+                        i += 1
+                        continue
+                    append(T_AND)
+                    i += 2
+
+                elif c == "|":
+                    if i + 1 >= strlen:
+                        # Invalid characters are ignored
+                        continue
+                    if s[i + 1] != "|":
+                        # Invalid characters are ignored
+                        i += 1
+                        continue
+                    append(T_OR)
+                    i += 2
+
+                elif c == "!":
+                    if i + 1 >= strlen:
+                        _tokenization_error(s, strlen, filename, linenr)
+                    if s[i + 1] == "=":
+                        append(T_UNEQUAL)
+                        i += 2
+                    else:
+                        append(T_NOT)
+                        i += 1
+
+                elif c == "=":
+                    append(T_EQUAL)
+                    i += 1
+
+                elif c == "(":
+                    append(T_OPEN_PAREN)
+                    i += 1
+
+                elif c == ")":
+                    append(T_CLOSE_PAREN)
+                    i += 1
+
+                elif c == "#":
+                    break
+
+                else:
+                    # Invalid characters are ignored
+                    i += 1
+                    continue
+
+            previous = tokens[-1]
+
+        return _Feed(tokens)
+
+    #
+    # Parsing
+    #
+
+    # Expression grammar:
+    #
+    # <expr> -> <symbol>
+    #           <symbol> '=' <symbol>
+    #           <symbol> '!=' <symbol>
+    #           '(' <expr> ')'
+    #           '!' <expr>
+    #           <expr> '&&' <expr>
+    #           <expr> '||' <expr>
+
+    def _parse_expr(self,
+                    feed,
+                    cur_sym_or_choice,
+                    line,
+                    filename = None,
+                    linenr = None,
+                    transform_m = True):
+        """Parse an expression from the tokens in 'feed' using a simple
+        top-down approach. The result has the form (<operator>, <list
+        containing parsed operands>).
+
+        feed -- _Feed instance containing the tokens for the expression.
+
+        cur_sym_or_choice -- The symbol or choice currently being parsed, or
+                             None if we're not parsing a symbol or choice.
+                             Used for recording references to symbols.
+
+        line -- The line containing the expression being parsed.
+
+        filename (default: None) -- The file containing the expression.
+
+        linenr (default: None) -- The line number containing the expression.
+
+        transform_m (default: False) -- Determines if 'm' should be rewritten to
+                                        'm && MODULES' -- see
+                                        parse_val_and_cond()."""
+
+        # Use instance variables to avoid having to pass these as arguments
+        # through the top-down parser in _parse_expr_2(), which is tedious and
+        # obfuscates the code. A profiler run shows no noticeable performance
+        # difference.
+        self.parse_expr_cur_sym_or_choice = cur_sym_or_choice
+        self.parse_expr_line = line
+        self.parse_expr_filename = filename
+        self.parse_expr_linenr = linenr
+        self.parse_expr_transform_m = transform_m
+
+        return self._parse_expr_2(feed)
+
+    def _parse_expr_2(self, feed):
+        or_terms = [self._parse_or_term(feed)]
+        # Keep parsing additional terms while the lookahead is '||'
+        while feed.check(T_OR):
+            or_terms.append(self._parse_or_term(feed))
+
+        return or_terms[0] if len(or_terms) == 1 else (OR, or_terms)
+
+    def _parse_or_term(self, feed):
+        and_terms = [self._parse_factor(feed)]
+        # Keep parsing additional terms while the lookahead is '&&'
+        while feed.check(T_AND):
+            and_terms.append(self._parse_factor(feed))
+
+        return and_terms[0] if len(and_terms) == 1 else (AND, and_terms)
+
+    def _parse_factor(self, feed):
+        if feed.check(T_OPEN_PAREN):
+            expr_parse = self._parse_expr_2(feed)
+
+            if not feed.check(T_CLOSE_PAREN):
+                _parse_error(self.parse_expr_line,
+                             "missing end parenthesis.",
+                             self.parse_expr_filename,
+                             self.parse_expr_linenr)
+
+            return expr_parse
+
+        if feed.check(T_NOT):
+            return (NOT, self._parse_factor(feed))
+
+        sym_or_string = feed.get_next()
+
+        if not isinstance(sym_or_string, (Symbol, str)):
+            _parse_error(self.parse_expr_line,
+                         "malformed expression.",
+                         self.parse_expr_filename,
+                         self.parse_expr_linenr)
+
+        if self.parse_expr_cur_sym_or_choice is not None and \
+           isinstance(sym_or_string, Symbol):
+            self.parse_expr_cur_sym_or_choice.referenced_syms.add(sym_or_string)
+
+        next_token = feed.peek_next()
+
+        # For conditional expressions ('depends on <expr>', '... if <expr>',
+        # etc.), "m" and m are rewritten to "m" && MODULES.
+        if next_token != T_EQUAL and next_token != T_UNEQUAL:
+            if self.parse_expr_transform_m and (sym_or_string is self.m or
+                                                sym_or_string == "m"):
+                return (AND, ["m", self._sym_lookup("MODULES")])
+            return sym_or_string
+
+        relation = EQUAL if (feed.get_next() == T_EQUAL) else UNEQUAL
+        sym_or_string_2 = feed.get_next()
+
+        if self.parse_expr_cur_sym_or_choice is not None and \
+           isinstance(sym_or_string_2, Symbol):
+            self.parse_expr_cur_sym_or_choice.referenced_syms.add(sym_or_string_2)
+
+        if sym_or_string is self.m:
+            sym_or_string = "m"
+
+        if sym_or_string_2 is self.m:
+            sym_or_string_2 = "m"
+
+        return (relation, sym_or_string, sym_or_string_2)
+
+    def _parse_file(self, filename, parent, deps, visible_if_deps, res = None):
+        """Parse the Kconfig file 'filename'. The result is a _Block with all
+        items from the file. See _parse_block() for the meaning of the
+        parameters."""
+        line_feeder = _FileFeed(_get_lines(filename), filename)
+        return self._parse_block(line_feeder, None, parent, deps, visible_if_deps, res)
+
+    def _parse_block(self, line_feeder, end_marker, parent, deps,
+                     visible_if_deps = None, res = None):
+        """Parses a block, which is the contents of either a file or an if,
+        menu, or choice statement. The result is a _Block with the items from
+        the block.
+
+        end_marker -- The token that ends the block, e.g. T_ENDIF ("endif") for
+                      if's. None for files.
+
+        parent -- The enclosing menu, choice or if, or None if we're at the top
+                  level.
+
+        deps -- Dependencies from enclosing menus, choices and if's.
+
+        visible_if_deps (default: None) -- 'visible if' dependencies from
+                        enclosing menus.
+
+        res (default: None) -- The _Block to add items to. If None, a new
+                               _Block is created to hold the items."""
+
+        block = _Block() if res is None else res
+
+        filename = line_feeder.get_filename()
+
+        while 1:
+
+            # Do we already have a tokenized line that we determined wasn't
+            # part of whatever we were parsing earlier? See comment in
+            # Config.__init__().
+            if self.end_line is not None:
+                assert self.end_line_tokens is not None
+                tokens = self.end_line_tokens
+                tokens.go_to_start()
+
+                line = self.end_line
+                linenr = line_feeder.get_linenr()
+
+                self.end_line = None
+                self.end_line_tokens = None
+
+            else:
+                line = line_feeder.get_next()
+                if line is None:
+                    if end_marker is not None:
+                        raise Kconfig_Syntax_Error, (
+                                "Unexpected end of file {0}."
+                                .format(line_feeder.get_filename()))
+                    return block
+
+                linenr = line_feeder.get_linenr()
+
+                tokens = self._tokenize(line, False, filename, linenr)
+
+            if tokens.is_empty():
+                continue
+
+            t0 = tokens.get_next()
+
+            # Have we reached the end of the block?
+            if t0 == end_marker:
+                return block
+
+            if t0 == T_CONFIG or t0 == T_MENUCONFIG:
+                # The tokenizer will automatically allocate a new Symbol object
+                # for any new names it encounters, so we don't need to worry
+                # about that here.
+                sym = tokens.get_next()
+
+                # Symbols defined in multiple places get the parent of their
+                # first definition. However, for symbols whose parents are choice
+                # statements, the choice statement takes precedence.
+                if not sym.is_defined_ or isinstance(parent, Choice):
+                    sym.parent = parent
+
+                sym.is_defined_ = True
+
+                self.kconfig_syms.append(sym)
+                block.add_item(sym)
+
+                self._parse_properties(line_feeder, sym, deps, visible_if_deps)
+
+            elif t0 == T_MENU:
+                menu = Menu()
+                self.menus.append(menu)
+                menu.config = self
+                menu.parent = parent
+                menu.title = tokens.get_next()
+
+                menu.filename = filename
+                menu.linenr = linenr
+
+                # Parse properties and contents
+                self._parse_properties(line_feeder, menu, deps, visible_if_deps)
+                menu.block = self._parse_block(line_feeder,
+                                               T_ENDMENU,
+                                               menu,
+                                               menu.dep_expr,
+                                               _make_and(visible_if_deps,
+                                                         menu.visible_if_expr))
+
+                block.add_item(menu)
+
+            elif t0 == T_IF:
+                # If statements are treated as syntactic sugar for adding
+                # dependencies to enclosed items and do not have an explicit
+                # object representation.
+
+                dep_expr = self._parse_expr(tokens, None, line, filename, linenr)
+                self._parse_block(line_feeder,
+                                  T_ENDIF,
+                                  parent,
+                                  _make_and(dep_expr, deps),
+                                  visible_if_deps,
+                                  block) # Add items to the same block
+
+            elif t0 == T_CHOICE:
+                # We support named choices
+                already_defined = False
+                name = None
+                if len(tokens) > 1 and isinstance(tokens[1], str):
+                    name = tokens[1]
+                    already_defined = name in self.named_choices
+
+                if already_defined:
+                    choice = self.named_choices[name]
+                else:
+                    choice = Choice()
+                    self.choices.append(choice)
+                    if name is not None:
+                        choice.name = name
+                        self.named_choices[name] = choice
+
+                choice.config = self
+                choice.parent = parent
+
+                choice.def_locations.append((filename, linenr))
+
+                # Parse properties and contents
+                self._parse_properties(line_feeder, choice, deps, visible_if_deps)
+                choice.block = self._parse_block(line_feeder,
+                                                 T_ENDCHOICE,
+                                                 choice,
+                                                 None,
+                                                 visible_if_deps)
+
+                choice._determine_actual_symbols()
+
+                # If no type is set for the choice, its type is that of the first
+                # choice item
+                if choice.type == UNKNOWN:
+                    for item in choice.get_symbols():
+                        if item.type != UNKNOWN:
+                            choice.type = item.type
+                            break
+
+                # Each choice item of UNKNOWN type gets the type of the choice
+                for item in choice.get_symbols():
+                    if item.type == UNKNOWN:
+                        item.type = choice.type
+
+                # For named choices defined in multiple locations, only record
+                # at the first definition
+                if not already_defined:
+                    block.add_item(choice)
+
+            elif t0 == T_COMMENT:
+                comment = Comment()
+                comment.config = self
+                comment.parent = parent
+
+                comment.filename = filename
+                comment.linenr = linenr
+
+                comment.text = tokens.get_next()
+                self._parse_properties(line_feeder, comment, deps, visible_if_deps)
+
+                block.add_item(comment)
+                self.comments.append(comment)
+
+            elif t0 == T_SOURCE:
+                kconfig_file = tokens.get_next()
+                exp_kconfig_file = self._expand_sym_refs(kconfig_file)
+                f = os.path.join(self.base_dir, exp_kconfig_file)
+
+                if not os.path.exists(f):
+                    raise IOError, ('{0}:{1}: sourced file "{2}" (expands to\n'
+                                    '"{3}") not found. Perhaps base_dir\n'
+                                    '(argument to Config.__init__(), currently\n'
+                                    '"{4}") is set to the wrong value.'
+                                    .format(filename,
+                                            linenr,
+                                            kconfig_file,
+                                            exp_kconfig_file,
+                                            self.base_dir))
+
+                # Add items to the same block
+                self._parse_file(f, parent, deps, visible_if_deps, block)
+
+            elif t0 == T_MAINMENU:
+                text = tokens.get_next()
+
+                if self.mainmenu_text is not None:
+                    self._warn("overriding 'mainmenu' text. "
+                               'Old value: "{0}", new value: "{1}".'
+                                .format(self.mainmenu_text, text),
+                               filename,
+                               linenr)
+
+                self.mainmenu_text = text
+
+            else:
+                _parse_error(line, "unrecognized construct.", filename, linenr)
+
+    def _parse_properties(self, line_feeder, stmt, deps, visible_if_deps):
+        """Parsing of properties for symbols, menus, choices, and comments."""
+
+        def parse_val_and_cond(tokens, line, filename, linenr):
+            """Parses '<expr1> if <expr2>' constructs, where the 'if' part is
+            optional. Returns a tuple containing the parsed expressions, with
+            None as the second element if the 'if' part is missing."""
+            val = self._parse_expr(tokens, stmt, line, filename, linenr, False)
+
+            if tokens.check(T_IF):
+                return (val, self._parse_expr(tokens, stmt, line, filename, linenr))
+
+            return (val, None)
+
+        # In case the symbol is defined in multiple locations, we need to
+        # remember what prompts, defaults, and selects are new for this
+        # definition, as "depends on" should only apply to the local
+        # definition.
+        new_prompt = None
+        new_def_exprs = []
+        new_selects = []
+
+        # Dependencies from 'depends on' statements
+        depends_on_expr = None
+
+        while 1:
+            line = line_feeder.get_next()
+            if line is None:
+                break
+
+            filename = line_feeder.get_filename()
+            linenr = line_feeder.get_linenr()
+
+            tokens = self._tokenize(line, False, filename, linenr)
+
+            if tokens.is_empty():
+                continue
+
+            t0 = tokens.get_next()
+
+            if t0 == T_HELP:
+                # Find first non-empty line and get its indentation
+
+                line_feeder.remove_while(str.isspace)
+                line = line_feeder.get_next()
+
+                if line is None:
+                    stmt.help = ""
+                    break
+
+                indent = _indentation(line)
+
+                # If the first non-empty lines has zero indent, there is no
+                # help text
+                if indent == 0:
+                    stmt.help = ""
+                    line_feeder.go_back()
+                    break
+
+                help_lines = [_deindent(line, indent)]
+
+                # The help text goes on till the first non-empty line with less
+                # indent
+                while 1:
+                    line = line_feeder.get_next()
+                    if (line is None) or \
+                       (not line.isspace() and _indentation(line) < indent):
+                        stmt.help = "".join(help_lines)
+                        break
+
+                    help_lines.append(_deindent(line, indent))
+
+                if line is None:
+                    break
+
+                line_feeder.go_back()
+
+            elif t0 == T_PROMPT:
+                # 'prompt' properties override each other within a single
+                # definition of a symbol, but additional prompts can be added
+                # by defining the symbol multiple times; hence 'new_prompt'
+                # instead of 'prompt'.
+                new_prompt = parse_val_and_cond(tokens, line, filename, linenr)
+
+            elif t0 == T_DEFAULT:
+                new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr))
+
+            elif t0 == T_DEPENDS:
+                if not tokens.check(T_ON):
+                    _parse_error(line, 'expected "on" after "depends".', filename, linenr)
+
+                parsed_deps = self._parse_expr(tokens, stmt, line, filename, linenr)
+
+                if isinstance(stmt, (Menu, Comment)):
+                    stmt.dep_expr = _make_and(stmt.dep_expr, parsed_deps)
+                else:
+                    depends_on_expr = _make_and(depends_on_expr, parsed_deps)
+
+            elif t0 == T_VISIBLE:
+                if not tokens.check(T_IF):
+                    _parse_error(line, 'expected "if" after "visible".', filename, linenr)
+                if not isinstance(stmt, Menu):
+                    _parse_error(line,
+                                 "'visible if' is only valid for menus.",
+                                 filename,
+                                 linenr)
+
+                parsed_deps = self._parse_expr(tokens, stmt, line, filename, linenr)
+                stmt.visible_if_expr = _make_and(stmt.visible_if_expr, parsed_deps)
+
+            elif t0 == T_SELECT:
+                target = tokens.get_next()
+
+                stmt.referenced_syms.add(target)
+                stmt.selected_syms.add(target)
+
+                if tokens.check(T_IF):
+                    new_selects.append((target,
+                                        self._parse_expr(tokens, stmt, line, filename, linenr)))
+                else:
+                    new_selects.append((target, None))
+
+            elif t0 in (T_BOOL, T_TRISTATE, T_INT, T_HEX, T_STRING):
+                stmt.type = token_to_type[t0]
+
+                if len(tokens) > 1:
+                    new_prompt = parse_val_and_cond(tokens, line, filename, linenr)
+
+            elif t0 == T_RANGE:
+                lower = tokens.get_next()
+                upper = tokens.get_next()
+                stmt.referenced_syms.add(lower)
+                stmt.referenced_syms.add(upper)
+
+                if tokens.check(T_IF):
+                    stmt.ranges.append((lower, upper,
+                                        self._parse_expr(tokens, stmt, line, filename, linenr)))
+                else:
+                    stmt.ranges.append((lower, upper, None))
+
+            elif t0 == T_DEF_BOOL:
+                stmt.type = BOOL
+
+                if len(tokens) > 1:
+                    new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr))
+
+            elif t0 == T_DEF_TRISTATE:
+                stmt.type = TRISTATE
+
+                if len(tokens) > 1:
+                    new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr))
+
+            elif t0 == T_OPTIONAL:
+                if not isinstance(stmt, Choice):
+                    _parse_error(line,
+                                 '"optional" is only valid for choices.',
+                                 filename,
+                                 linenr)
+                stmt.optional = True
+
+            elif t0 == T_OPTION:
+                if tokens.check(T_ENV) and tokens.check(T_EQUAL):
+                    env_var = tokens.get_next()
+
+                    stmt.is_special_ = True
+                    stmt.is_from_env = True
+
+                    if env_var not in os.environ:
+                        self._warn("""
+The symbol {0} references the non-existent environment variable {1} and will
+get the empty string as its value.
+
+If you're using kconfiglib via 'make (i)scriptconfig' it should have set up the
+environment correctly for you. If you still got this message, that might be an
+error, and you should e-mail kconfiglib@gmail.com.
+."""                               .format(stmt.name, env_var),
+                                   filename,
+                                   linenr)
+
+                        stmt.cached_value = ""
+                    else:
+                        stmt.cached_value = os.environ[env_var]
+
+                elif tokens.check(T_DEFCONFIG_LIST):
+                    self.defconfig_sym = stmt
+
+                elif tokens.check(T_MODULES):
+                    self._warn("the 'modules' option is not supported. "
+                               "Let me know if this is a problem for you; "
+                               "it shouldn't be that hard to implement.",
+                               filename,
+                               linenr)
+
+                else:
+                    _parse_error(line, "unrecognized option.", filename, linenr)
+
+            else:
+                # See comment in Config.__init__()
+                self.end_line = line
+                self.end_line_tokens = tokens
+                break
+
+        # Propagate dependencies from enclosing menus and if's.
+
+        # For menus and comments..
+        if isinstance(stmt, (Menu, Comment)):
+            stmt.orig_deps = stmt.dep_expr
+            stmt.deps_from_containing = deps
+            stmt.dep_expr = _make_and(stmt.dep_expr, deps)
+
+            stmt.all_referenced_syms = \
+              stmt.referenced_syms | _get_expr_syms(deps)
+
+        # For symbols and choices..
+        else:
+
+            # See comment for 'menu_dep'
+            stmt.menu_dep = depends_on_expr
+
+            # Propagate dependencies specified with 'depends on' to any new
+            # default expressions, prompts, and selections. ("New" since a
+            # symbol might be defined in multiple places and the dependencies
+            # should only apply to the local definition.)
+
+            new_def_exprs = [(val_expr, _make_and(cond_expr, depends_on_expr))
+                             for (val_expr, cond_expr) in new_def_exprs]
+
+            new_selects = [(target, _make_and(cond_expr, depends_on_expr))
+                           for (target, cond_expr) in new_selects]
+
+            if new_prompt is not None:
+                prompt, cond_expr = new_prompt
+
+                # 'visible if' dependencies from enclosing menus get propagated
+                # to prompts
+                if visible_if_deps is not None:
+                    cond_expr = _make_and(cond_expr, visible_if_deps)
+
+                new_prompt = (prompt, _make_and(cond_expr, depends_on_expr))
+
+            # We save the original expressions -- before any menu and if
+            # conditions have been propagated -- so these can be retrieved
+            # later.
+
+            stmt.orig_def_exprs.extend(new_def_exprs)
+            if new_prompt is not None:
+                stmt.orig_prompts.append(new_prompt)
+
+            # Only symbols can select
+            if isinstance(stmt, Symbol):
+                stmt.orig_selects.extend(new_selects)
+
+            # Save dependencies from enclosing menus and if's
+            stmt.deps_from_containing = deps
+
+            # The set of symbols referenced directly by the symbol/choice plus
+            # all symbols referenced by enclosing menus and if's.
+            stmt.all_referenced_syms = \
+              stmt.referenced_syms | _get_expr_syms(deps)
+
+            # Propagate dependencies from enclosing menus and if's
+
+            stmt.def_exprs.extend([(val_expr, _make_and(cond_expr, deps))
+                                   for (val_expr, cond_expr) in new_def_exprs])
+
+            for (target, cond) in new_selects:
+                target.rev_dep = _make_or(target.rev_dep,
+                                          _make_and(stmt,
+                                                    _make_and(cond, deps)))
+
+            if new_prompt is not None:
+                prompt, cond_expr = new_prompt
+                stmt.prompts.append((prompt, _make_and(cond_expr, deps)))
+
+    #
+    # Symbol table manipulation
+    #
+
+    def _sym_lookup(self, name, add_sym_if_not_exists = True):
+        """Fetches the symbol 'name' from the symbol table, optionally adding
+        it if it does not exist (this is usually what we want)."""
+        if name in self.syms:
+            return self.syms[name]
+
+        new_sym = Symbol()
+        new_sym.config = self
+        new_sym.name = name
+
+        if add_sym_if_not_exists:
+            self.syms[name] = new_sym
+        else:
+            # This warning is generated while evaluating an expression
+            # containing undefined symbols using Config.eval()
+            self._warn("no symbol {0} in configuration".format(name))
+
+        return new_sym
+
+    #
+    # Evaluation of symbols and expressions
+    #
+
+    def _eval_expr(self, expr):
+        """Evaluates an expression and returns one of the tristate values "n",
+        "m" or "y"."""
+        res = self._eval_expr_2(expr)
+
+        # Promote "m" to "y" if we're running without modules. Internally, "m"
+        # is often rewritten to "m" && MODULES by both the C implementation and
+        # kconfiglib, which takes care of cases where "m" should be false if
+        # we're running without modules.
+        if res == "m" and not self._has_modules():
+            return "y"
+
+        return res
+
+    def _eval_expr_2(self, expr):
+        if expr is None:
+            return "y"
+
+        if isinstance(expr, Symbol):
+            # Non-bool/tristate symbols are always "n" in a tristate sense,
+            # regardless of their value
+            if expr.type != BOOL and expr.type != TRISTATE:
+                return "n"
+            return expr.get_value()
+
+        if isinstance(expr, str):
+            return expr if (expr == "y" or expr == "m") else "n"
+
+        first_expr = expr[0]
+
+        if first_expr == OR:
+            res = "n"
+
+            for subexpr in expr[1]:
+                ev = self._eval_expr_2(subexpr)
+
+                # Return immediately upon discovering a "y" term
+                if ev == "y":
+                    return "y"
+
+                if ev == "m":
+                    res = "m"
+
+            # 'res' is either "n" or "m" here; we already handled the
+            # short-circuiting "y" case in the loop.
+            return res
+
+        if first_expr == AND:
+            res = "y"
+
+            for subexpr in expr[1]:
+                ev = self._eval_expr_2(subexpr)
+
+                # Return immediately upon discovering an "n" term
+                if ev == "n":
+                    return "n"
+
+                if ev == "m":
+                    res = "m"
+
+            # 'res' is either "m" or "y" here; we already handled the
+            # short-circuiting "n" case in the loop.
+            return res
+
+        if first_expr == NOT:
+            ev = self._eval_expr_2(expr[1])
+
+            if ev == "y":
+                return "n"
+
+            return "y" if (ev == "n") else "m"
+
+        if first_expr == EQUAL:
+            return "y" if (self._get_str_value(expr[1]) ==
+                           self._get_str_value(expr[2])) else "n"
+
+        if first_expr == UNEQUAL:
+            return "y" if (self._get_str_value(expr[1]) !=
+                           self._get_str_value(expr[2])) else "n"
+
+        _internal_error("Internal error while evaluating expression: "
+                        "unknown operation {0}.".format(first_expr))
+
+    def _get_str_value(self, obj):
+        if isinstance(obj, str):
+            return obj
+        # obj is a Symbol
+        return obj.get_value()
+
+    def _eval_min(self, e1, e2):
+        e1_eval = self._eval_expr(e1)
+        e2_eval = self._eval_expr(e2)
+
+        return e1_eval if tri_less(e1_eval, e2_eval) else e2_eval
+
+    def _eval_max(self, e1, e2):
+        e1_eval = self._eval_expr(e1)
+        e2_eval = self._eval_expr(e2)
+
+        return e1_eval if tri_greater(e1_eval, e2_eval) else e2_eval
+
+    #
+    # Methods related to the MODULES symbol
+    #
+
+    def _has_modules(self):
+        modules_sym = self.syms.get("MODULES")
+        return (modules_sym is not None) and (modules_sym.get_value() == "y")
+
+    #
+    # Dependency tracking
+    #
+
+    def _build_dep(self):
+        """Populates the Symbol.dep sets, linking the symbol to the symbols
+        that immediately depend on it in the sense that changing the value of
+        the symbol might affect the values of those other symbols. This is used
+        for caching/invalidation purposes. The calculated sets might be larger
+        than necessary as we don't do any complicated analysis of the
+        expressions."""
+        for sym in self.syms.itervalues():
+            sym.dep = set()
+
+        # Adds 'sym' as a directly dependent symbol to all symbols that appear
+        # in the expression 'e'
+        def add_expr_deps(e, sym):
+            for s in _get_expr_syms(e):
+                s.dep.add(sym)
+
+        # The directly dependent symbols of a symbol are:
+        #  - Any symbols whose prompts, default values, rev_dep (select
+        #    condition), or ranges depend on the symbol
+        #  - Any symbols that belong to the same choice statement as the symbol
+        #    (these won't be included in 'dep' as that makes the dependency
+        #    graph unwieldy, but Symbol._get_dependent() will include them)
+        #  - Any symbols in a choice statement that depends on the symbol
+        for sym in self.syms.itervalues():
+            for (_, e) in sym.prompts:
+                add_expr_deps(e, sym)
+
+            for (v, e) in sym.def_exprs:
+                add_expr_deps(v, sym)
+                add_expr_deps(e, sym)
+
+            add_expr_deps(sym.rev_dep, sym)
+
+            for (l, u, e) in sym.ranges:
+                add_expr_deps(l, sym)
+                add_expr_deps(u, sym)
+                add_expr_deps(e, sym)
+
+            if sym.is_choice_symbol_:
+                choice = sym.parent
+
+                for (_, e) in choice.prompts:
+                    add_expr_deps(e, sym)
+
+                for (_, e) in choice.def_exprs:
+                    add_expr_deps(e, sym)
+
+    def _expr_val_str(self, expr, no_value_str = "(none)", get_val_instead_of_eval = False):
+        # Since values are valid expressions, _expr_to_str() will get a nice
+        # string representation for those as well.
+
+        if expr is None:
+            return no_value_str
+
+        if get_val_instead_of_eval:
+            if isinstance(expr, str):
+                return _expr_to_str(expr)
+            val = expr.get_value()
+        else:
+            val = self._eval_expr(expr)
+
+        return "{0} (value: {1})".format(_expr_to_str(expr), _expr_to_str(val))
+
+    def _expand_sym_refs(self, s):
+        """Expands $-references to symbols in 's' to symbol values, or to the
+        empty string for undefined symbols."""
+
+        while 1:
+            sym_ref_re_match = sym_ref_re.search(s)
+            if sym_ref_re_match is None:
+                return s
+
+            sym_name = sym_ref_re_match.group(0)[1:]
+            sym = self.syms.get(sym_name)
+            expansion = "" if sym is None else sym.get_value()
+
+            s = s[:sym_ref_re_match.start()] + \
+                expansion + \
+                s[sym_ref_re_match.end():]
+
+    def _get_sym_or_choice_str(self, sc):
+        """Symbols and choices have many properties in common, so we factor out
+        common __str__() stuff here. "sc" is short for "symbol or choice"."""
+
+        # As we deal a lot with string representations here, use some
+        # convenient shorthand:
+        s = _expr_to_str
+
+        #
+        # Common symbol/choice properties
+        #
+
+        user_value_str = "(no user value)" if sc.user_val is None else s(sc.user_val)
+
+        visibility_str = s(sc.get_visibility())
+
+        # Build prompts string
+        if sc.prompts == []:
+            prompts_str = " (no prompts)"
+        else:
+            prompts_str_rows = []
+
+            for (prompt, cond_expr) in sc.orig_prompts:
+                if cond_expr is None:
+                    prompts_str_rows.append(' "{0}"'.format(prompt))
+                else:
+                    prompts_str_rows.append(' "{0}" if '.format(prompt) +
+                                            self._expr_val_str(cond_expr))
+
+            prompts_str = "\n".join(prompts_str_rows)
+
+        # Build locations string
+        if sc.def_locations == []:
+            locations_str = "(no locations)"
+        else:
+            locations_str = " ".join(["{0}:{1}".format(filename, linenr) for
+                                      (filename, linenr) in sc.def_locations])
+
+        # Build additional-dependencies-from-menus-and-if's string
+        additional_deps_str = " " + self._expr_val_str(sc.deps_from_containing,
+                                                       "(no additional dependencies)")
+
+        #
+        # Symbol-specific stuff
+        #
+
+        if isinstance(sc, Symbol):
+
+            # Build value string
+            value_str = s(sc.get_value())
+
+            # Build ranges string
+            if isinstance(sc, Symbol):
+                if sc.ranges == []:
+                    ranges_str = " (no ranges)"
+                else:
+                    ranges_str_rows = []
+
+                    for (l, u, cond_expr) in sc.ranges:
+                        if cond_expr is None:
+                            ranges_str_rows.append(" [{0}, {1}]".format(s(l), s(u)))
+                        else:
+                            ranges_str_rows.append(" [{0}, {1}] if {2}"
+                                                   .format(s(l), s(u), self._expr_val_str(cond_expr)))
+
+                    ranges_str = "\n".join(ranges_str_rows)
+
+            # Build default values string
+            if sc.def_exprs == []:
+                defaults_str = " (no default values)"
+            else:
+                defaults_str_rows = []
+
+                for (val_expr, cond_expr) in sc.orig_def_exprs:
+                    row_str = " " + self._expr_val_str(val_expr, "(none)", sc.type == STRING)
+                    defaults_str_rows.append(row_str)
+                    defaults_str_rows.append("  Condition: " + self._expr_val_str(cond_expr))
+
+                defaults_str = "\n".join(defaults_str_rows)
+
+            # Build selects string
+            if sc.orig_selects == []:
+                selects_str = " (no selects)"
+            else:
+                selects_str_rows = []
+
+                for (target, cond_expr) in sc.orig_selects:
+                    if cond_expr is None:
+                        selects_str_rows.append(" {0}".format(target.name))
+                    else:
+                        selects_str_rows.append(" {0} if ".format(target.name) +
+                                                self._expr_val_str(cond_expr))
+
+                selects_str = "\n".join(selects_str_rows)
+
+            # Build reverse dependencies string
+            if sc.rev_dep == "n":
+                rev_dep_str = " (no reverse dependencies)"
+            else:
+                rev_dep_str = " " + self._expr_val_str(sc.rev_dep)
+
+            res = _sep_lines("Symbol " + (sc.name if sc.name is not None else "(no name)"),
+                             "Type           : " + typename[sc.type],
+                             "Value          : " + value_str,
+                             "User value     : " + user_value_str,
+                             "Visibility     : " + visibility_str,
+                             "Is choice item : " + bool_str[sc.is_choice_symbol_],
+                             "Is defined     : " + bool_str[sc.is_defined_],
+                             "Is from env.   : " + bool_str[sc.is_from_env],
+                             "Is special     : " + bool_str[sc.is_special_] + "\n")
+
+            if sc.ranges != []:
+                res += _sep_lines("Ranges:",
+                                  ranges_str + "\n")
+
+            res += _sep_lines("Prompts:",
+                              prompts_str,
+                              "Default values:",
+                              defaults_str,
+                              "Selects:",
+                              selects_str,
+                              "Reverse dependencies:",
+                              rev_dep_str,
+                              "Additional dependencies from enclosing menus and if's:",
+                              additional_deps_str,
+                              "Locations: " + locations_str)
+
+            return res
+
+        #
+        # Choice-specific stuff
+        #
+
+        # Build name string (for named choices)
+        if sc.name is None:
+            name_str = "(no name)"
+        else:
+            name_str = sc.name
+
+        # Build selected symbol string
+        sel = sc.get_selection()
+        if sel is None:
+            sel_str = "(no selection)"
+        else:
+            sel_str = sel.name
+
+        # Build mode string
+        mode_str = s(sc.get_mode())
+
+        # Build default values string
+        if sc.def_exprs == []:
+            defaults_str = " (no default values)"
+        else:
+            defaults_str_rows = []
+
+            for (sym, cond_expr) in sc.orig_def_exprs:
+                if cond_expr is None:
+                    defaults_str_rows.append(" {0}".format(sym.name))
+                else:
+                    defaults_str_rows.append(" {0} if ".format(sym.name) +
+                                             self._expr_val_str(cond_expr))
+
+            defaults_str = "\n".join(defaults_str_rows)
+
+        # Build contained symbols string
+        names = [sym.name for sym in sc.get_symbols()]
+
+        if names == []:
+            syms_string = "(empty)"
+        else:
+            syms_string = " ".join(names)
+
+        return _sep_lines("Choice",
+                          "Name (for named choices): " + name_str,
+                          "Type            : " + typename[sc.type],
+                          "Selected symbol : " + sel_str,
+                          "User value      : " + user_value_str,
+                          "Mode            : " + mode_str,
+                          "Visibility      : " + visibility_str,
+                          "Optional        : " + bool_str[sc.optional],
+                          "Prompts:",
+                          prompts_str,
+                          "Defaults:",
+                          defaults_str,
+                          "Choice symbols:",
+                          " " + syms_string,
+                          "Additional dependencies from enclosing menus and if's:",
+                          additional_deps_str,
+                          "Locations: " + locations_str)
+
+    def _expr_depends_on(self, expr, sym):
+        """Reimplementation of expr_depends_symbol() from mconf.c. Used to
+        determine if a submenu should be implicitly created, which influences what
+        items inside choice statements are considered choice items."""
+        if expr is None:
+            return False
+
+        def rec(expr):
+            if isinstance(expr, str):
+                return False
+
+            if isinstance(expr, Symbol):
+                return expr is sym
+
+            e0 = expr[0]
+
+            if e0 == EQUAL or e0 == UNEQUAL:
+                return self._eq_to_sym(expr) is sym
+
+            if e0 == AND:
+                for and_expr in expr[1]:
+                    if rec(and_expr):
+                        return True
+
+            return False
+
+        return rec(expr)
+
+    def _eq_to_sym(self, eq):
+        """_expr_depends_on() helper. For (in)equalities of the form sym = y/m
+        or sym != n, returns sym. For other (in)equalities, returns None."""
+        relation, left, right = eq
+
+        left  = self._transform_n_m_y(left)
+        right = self._transform_n_m_y(right)
+
+        # Make sure the symbol (if any) appears to the left
+        if not isinstance(left, Symbol):
+            left, right = right, left
+
+        if not isinstance(left, Symbol):
+            return None
+
+        if (relation == EQUAL   and (right == "m" or right == "y")) or \
+           (relation == UNEQUAL and right == "n"):
+            return left
+
+        return None
+
+    def _transform_n_m_y(self, item):
+        """_eq_to_sym() helper. Translates the symbols n, m, and y to their
+        string equivalents."""
+        if item is self.n:
+            return "n"
+        if item is self.m:
+            return "m"
+        if item is self.y:
+            return "y"
+        return item
+
+    def _warn(self, msg, filename = None, linenr = None):
+        """For printing warnings to stderr."""
+        if self.print_warnings:
+            self._warn_or_undef_assign(msg, WARNING, filename, linenr)
+
+    def _undef_assign(self, msg, filename = None, linenr = None):
+        """For printing informational messages related to assignments
+        to undefined variables to stderr."""
+        if self.print_undef_assign:
+            self._warn_or_undef_assign(msg, UNDEF_ASSIGN, filename, linenr)
+
+    def _warn_or_undef_assign(self, msg, msg_type, filename, linenr):
+        if filename is not None:
+            sys.stderr.write("{0}:".format(_clean_up_path(filename)))
+        if linenr is not None:
+            sys.stderr.write("{0}:".format(linenr))
+
+        if msg_type == WARNING:
+            sys.stderr.write("warning: ")
+        elif msg_type == UNDEF_ASSIGN:
+            sys.stderr.write("info: ")
+        else:
+            _internal_error('Internal error while printing warning: unknown warning type "{0}".'
+                            .format(msg_type))
+
+        sys.stderr.write(msg + "\n")
+
+def _get_expr_syms(expr):
+    """Returns the set() of symbols appearing in expr."""
+    res = set()
+    if expr is None:
+        return res
+
+    def rec(expr):
+        if isinstance(expr, Symbol):
+            res.add(expr)
+            return
+
+        if isinstance(expr, str):
+            return
+
+        e0 = expr[0]
+
+        if e0 == OR or e0 == AND:
+            for term in expr[1]:
+                rec(term)
+
+        elif e0 == NOT:
+            rec(expr[1])
+
+        elif e0 == EQUAL or e0 == UNEQUAL:
+            _, v1, v2 = expr
+
+            if isinstance(v1, Symbol):
+                res.add(v1)
+
+            if isinstance(v2, Symbol):
+                res.add(v2)
+
+        else:
+            _internal_error("Internal error while fetching symbols from an "
+                            "expression with token stream {0}.".format(expr))
+
+    rec(expr)
+    return res
+
+
+#
+# Construction of expressions
+#
+
+# These functions as well as the _eval_min/max() functions above equate
+# None with "y", which is usually what we want, but needs to be kept in
+# mind.
+
+def _make_or(e1, e2):
+    # Perform trivial simplification and avoid None's (which
+    # correspond to y's)
+    if e1 is None or e2 is None or \
+       e1 == "y" or e2 == "y":
+        return "y"
+
+    if e1 == "n":
+        return e2
+
+    if e2 == "n":
+        return e1
+
+    # Prefer to merge/update argument list if possible instead of creating
+    # a new OR node
+
+    if isinstance(e1, tuple) and e1[0] == OR:
+        if isinstance(e2, tuple) and e2[0] == OR:
+            return (OR, e1[1] + e2[1])
+        return (OR, e1[1] + [e2])
+
+    if isinstance(e2, tuple) and e2[0] == OR:
+        return (OR, e2[1] + [e1])
+
+    return (OR, [e1, e2])
+
+# Note: returns None if e1 == e2 == None
+
+def _make_and(e1, e2):
+    if e1 == "n" or e2 == "n":
+        return "n"
+
+    if e1 is None or e1 == "y":
+        return e2
+
+    if e2 is None or e2 == "y":
+        return e1
+
+    # Prefer to merge/update argument list if possible instead of creating
+    # a new AND node
+
+    if isinstance(e1, tuple) and e1[0] == AND:
+        if isinstance(e2, tuple) and e2[0] == AND:
+            return (AND, e1[1] + e2[1])
+        return (AND, e1[1] + [e2])
+
+    if isinstance(e2, tuple) and e2[0] == AND:
+        return (AND, e2[1] + [e1])
+
+    return (AND, [e1, e2])
+
+#
+# Constants and functions related to types, parsing, evaluation and printing,
+# put globally to unclutter the Config class a bit.
+#
+
+# Tokens
+(T_OR, T_AND, T_NOT,
+ T_OPEN_PAREN, T_CLOSE_PAREN,
+ T_EQUAL, T_UNEQUAL,
+ T_MAINMENU, T_MENU, T_ENDMENU,
+ T_SOURCE, T_CHOICE, T_ENDCHOICE,
+ T_COMMENT, T_CONFIG, T_MENUCONFIG,
+ T_HELP, T_IF, T_ENDIF, T_DEPENDS, T_ON,
+ T_OPTIONAL, T_PROMPT, T_DEFAULT,
+ T_BOOL, T_TRISTATE, T_HEX, T_INT, T_STRING,
+ T_DEF_BOOL, T_DEF_TRISTATE,
+ T_SELECT, T_RANGE, T_OPTION, T_ENV,
+ T_DEFCONFIG_LIST, T_MODULES, T_VISIBLE) = range(0, 38)
+
+# Keyword to token map
+keywords = {
+        "mainmenu"       : T_MAINMENU,
+        "menu"           : T_MENU,
+        "endmenu"        : T_ENDMENU,
+        "endif"          : T_ENDIF,
+        "endchoice"      : T_ENDCHOICE,
+        "source"         : T_SOURCE,
+        "choice"         : T_CHOICE,
+        "config"         : T_CONFIG,
+        "comment"        : T_COMMENT,
+        "menuconfig"     : T_MENUCONFIG,
+        "help"           : T_HELP,
+        "if"             : T_IF,
+        "depends"        : T_DEPENDS,
+        "on"             : T_ON,
+        "optional"       : T_OPTIONAL,
+        "prompt"         : T_PROMPT,
+        "default"        : T_DEFAULT,
+        "bool"           : T_BOOL,
+        "boolean"        : T_BOOL,
+        "tristate"       : T_TRISTATE,
+        "int"            : T_INT,
+        "hex"            : T_HEX,
+        "def_bool"       : T_DEF_BOOL,
+        "def_tristate"   : T_DEF_TRISTATE,
+        "string"         : T_STRING,
+        "select"         : T_SELECT,
+        "range"          : T_RANGE,
+        "option"         : T_OPTION,
+        "env"            : T_ENV,
+        "defconfig_list" : T_DEFCONFIG_LIST,
+        "modules"        : T_MODULES,
+        "visible"        : T_VISIBLE }
+
+# Strings to use for True and False
+bool_str = { False : "false", True : "true" }
+
+# Tokens after which identifier-like lexemes are treated as strings. T_CHOICE
+# is included to avoid symbols being registered for named choices.
+string_lex = frozenset((T_BOOL, T_TRISTATE, T_INT, T_HEX, T_STRING, T_CHOICE,
+                        T_PROMPT, T_MENU, T_COMMENT, T_SOURCE, T_MAINMENU))
+
+# Matches the initial token on a line; see _tokenize().
+initial_token_re = re.compile(r"[^\w]*(\w+)")
+
+# Matches an identifier/keyword optionally preceded by whitespace
+id_keyword_re = re.compile(r"\s*([\w./-]+)")
+
+# Regular expressions for parsing .config files
+set_re   = re.compile(r"CONFIG_(\w+)=(.*)")
+unset_re = re.compile(r"# CONFIG_(\w+) is not set")
+
+# Regular expression for finding $-references to symbols in strings
+sym_ref_re = re.compile(r"\$[A-Za-z_]+")
+
+# Integers representing symbol types
+UNKNOWN, BOOL, TRISTATE, STRING, HEX, INT = range(0, 6)
+
+# Strings to use for types
+typename = {
+        UNKNOWN  : "unknown",
+        BOOL     : "bool",
+        TRISTATE : "tristate",
+        STRING   : "string",
+        HEX      : "hex",
+        INT      : "int" }
+
+# Token to type mapping
+token_to_type = { T_BOOL     : BOOL,
+                  T_TRISTATE : TRISTATE,
+                  T_STRING   : STRING,
+                  T_INT      : INT,
+                  T_HEX      : HEX }
+
+# Default values for symbols of different types (the value the symbol gets if
+# it is not assigned a user value and none of its 'default' clauses kick in)
+default_value = { BOOL     : "n",
+                  TRISTATE : "n",
+                  STRING   : "",
+                  INT      : "",
+                  HEX      : "" }
+
+# Indicates that no item is selected in a choice statement
+NO_SELECTION = 0
+
+# Integers representing expression types
+OR, AND, NOT, EQUAL, UNEQUAL = range(0, 5)
+
+# Map from tristate values to integers
+tri_to_int = { "n" : 0, "m" : 1, "y" : 2 }
+
+# Printing-related stuff
+
+op_to_str = { AND     : " && ",
+              OR      : " || ",
+              EQUAL   : " = ",
+              UNEQUAL : " != " }
+
+precedence = { OR : 0, AND : 1, NOT : 2 }
+
+# Types of informational messages
+WARNING = 0
+UNDEF_ASSIGN = 1
+
+def _intersperse(lst, op):
+    """_expr_to_str() helper. Gets the string representation of each expression in lst
+    and produces a list where op has been inserted between the elements."""
+    if lst == []:
+        return ""
+
+    res = []
+
+    def handle_sub_expr(expr):
+        no_parens = isinstance(expr, (str, Symbol)) or \
+                    expr[0] in (EQUAL, UNEQUAL) or \
+                    precedence[op] <= precedence[expr[0]]
+        if not no_parens:
+            res.append("(")
+        res.extend(_expr_to_str_rec(expr))
+        if not no_parens:
+            res.append(")")
+
+    op_str = op_to_str[op]
+
+    handle_sub_expr(lst[0])
+    for expr in lst[1:]:
+        res.append(op_str)
+        handle_sub_expr(expr)
+
+    return res
+
+def _expr_to_str(expr):
+    s = "".join(_expr_to_str_rec(expr))
+    return s
+
+def _sym_str_string(sym_or_str):
+    if isinstance(sym_or_str, str):
+        return '"{0}"'.format(sym_or_str)
+    return sym_or_str.name
+
+def _expr_to_str_rec(expr):
+    if expr is None:
+        return [""]
+
+    if isinstance(expr, (Symbol, str)):
+        return [_sym_str_string(expr)]
+
+    e0 = expr[0]
+
+    if e0 == OR or e0 == AND:
+        return _intersperse(expr[1], expr[0])
+
+    if e0 == NOT:
+        need_parens = not isinstance(expr[1], (str, Symbol))
+
+        res = ["!"]
+        if need_parens:
+            res.append("(")
+        res.extend(_expr_to_str_rec(expr[1]))
+        if need_parens:
+            res.append(")")
+        return res
+
+    if e0 == EQUAL or e0 == UNEQUAL:
+        return [_sym_str_string(expr[1]),
+                op_to_str[expr[0]],
+                _sym_str_string(expr[2])]
+
+class _Block:
+
+    """Represents a list of items (symbols, menus, choice statements and
+    comments) appearing at the top-level of a file or witin a menu, choice or
+    if statement."""
+
+    def __init__(self):
+        self.items = []
+
+    def get_items(self):
+        return self.items
+
+    def add_item(self, item):
+        self.items.append(item)
+
+    def _make_conf(self):
+        # Collect the substrings in a list and later use join() instead of +=
+        # to build the final .config contents. With older Python versions, this
+        # yields linear instead of quadratic complexity.
+        strings = []
+        for item in self.items:
+            strings.extend(item._make_conf())
+
+        return strings
+
+    def add_depend_expr(self, expr):
+        for item in self.items:
+            item.add_depend_expr(expr)
+
+class Item():
+
+    """Base class for symbols and other Kconfig constructs. Subclasses are
+    Symbol, Choice, Menu, and Comment."""
+
+    def is_symbol(self):
+        """Returns True if the item is a symbol, otherwise False. Short for
+        isinstance(item, kconfiglib.Symbol)."""
+        return isinstance(self, Symbol)
+
+    def is_choice(self):
+        """Returns True if the item is a choice, otherwise False. Short for
+        isinstance(item, kconfiglib.Choice)."""
+        return isinstance(self, Choice)
+
+    def is_menu(self):
+        """Returns True if the item is a menu, otherwise False. Short for
+        isinstance(item, kconfiglib.Menu)."""
+        return isinstance(self, Menu)
+
+    def is_comment(self):
+        """Returns True if the item is a comment, otherwise False. Short for
+        isinstance(item, kconfiglib.Comment)."""
+        return isinstance(self, Comment)
+
+class _HasVisibility():
+
+    """Base class for elements that have a "visibility" that acts as an upper
+    limit on the values a user can set for them. Subclasses are Symbol and
+    Choice (which supply some of the attributes)."""
+
+    def __init__(self):
+        self.cached_visibility = None
+        self.prompts = []
+
+    def _invalidate(self):
+        self.cached_visibility = None
+
+    def _get_visibility(self):
+        if self.cached_visibility is None:
+            vis = "n"
+            for (prompt, cond_expr) in self.prompts:
+                vis = self.config._eval_max(vis, cond_expr)
+
+            if isinstance(self, Symbol) and self.is_choice_symbol_:
+                vis = self.config._eval_min(vis, self.parent._get_visibility())
+
+            # Promote "m" to "y" if we're dealing with a non-tristate
+            if vis == "m" and self.type != TRISTATE:
+                vis = "y"
+
+            self.cached_visibility = vis
+
+        return self.cached_visibility
+
+class Symbol(Item, _HasVisibility):
+
+    """Represents a configuration symbol - e.g. FOO for
+
+    config FOO
+        ..."""
+
+    #
+    # Public interface
+    #
+
+    def get_value(self):
+        """Calculate and return the value of the symbol. See also
+        Symbol.set_user_value()."""
+
+        if self.cached_value is not None:
+            return self.cached_value
+
+        self.write_to_conf = False
+
+        # As a quirk of Kconfig, undefined symbols get their name as their
+        # value. This is why things like "FOO = bar" work for seeing if FOO has
+        # the value "bar".
+        if self.type == UNKNOWN:
+            self.cached_value = self.name
+            return self.name
+
+        new_val = default_value[self.type]
+
+        vis = self._get_visibility()
+
+        if self.type == BOOL or self.type == TRISTATE:
+            # The visibility and mode (modules-only or single-selection) of
+            # choice items will be taken into account in self._get_visibility()
+
+            if self.is_choice_symbol_:
+                if vis != "n":
+                    choice = self.parent
+                    mode = choice.get_mode()
+
+                    self.write_to_conf = (mode != "n")
+
+                    if mode == "y":
+                        new_val = "y" if (choice.get_selection() is self) else "n"
+                    elif mode == "m":
+                        if self.user_val == "m" or self.user_val == "y":
+                            new_val = "m"
+
+            else:
+                use_defaults = True
+
+                if vis != "n":
+                    # If the symbol is visible and has a user value, use that.
+                    # Otherwise, look at defaults.
+                    self.write_to_conf = True
+
+                    if self.user_val is not None:
+                        new_val = self.config._eval_min(self.user_val, vis)
+                        use_defaults = False
+
+                if use_defaults:
+                    for (val_expr, cond_expr) in self.def_exprs:
+                        cond_eval = self.config._eval_expr(cond_expr)
+
+                        if cond_eval != "n":
+                            self.write_to_conf = True
+                            new_val = self.config._eval_min(val_expr, cond_eval)
+                            break
+
+                # Reverse dependencies take precedence
+                rev_dep_val = self.config._eval_expr(self.rev_dep)
+
+                if rev_dep_val != "n":
+                    self.write_to_conf = True
+                    new_val = self.config._eval_max(new_val, rev_dep_val)
+
+            # Promote "m" to "y" for booleans
+            if new_val == "m" and self.type == BOOL:
+                new_val = "y"
+
+        elif self.type == STRING:
+            use_defaults = True
+
+            if vis != "n":
+                self.write_to_conf = True
+                if self.user_val is not None:
+                    new_val = self.user_val
+                    use_defaults = False
+
+            if use_defaults:
+                for (val_expr, cond_expr) in self.def_exprs:
+                    if self.config._eval_expr(cond_expr) != "n":
+                        self.write_to_conf = True
+                        new_val = self.config._get_str_value(val_expr)
+                        break
+
+        elif self.type == HEX or self.type == INT:
+            has_active_range = False
+            low = None
+            high = None
+            use_defaults = True
+
+            base = 16 if self.type == HEX else 10
+
+            for(l, h, cond_expr) in self.ranges:
+                if self.config._eval_expr(cond_expr) != "n":
+                    has_active_range = True
+
+                    low_str = self.config._get_str_value(l)
+                    high_str = self.config._get_str_value(h)
+
+                    low = int(low_str, base) if \
+                      _is_base_n(low_str, base) else 0
+                    high = int(high_str, base) if \
+                      _is_base_n(high_str, base) else 0
+
+                    break
+
+            if vis != "n":
+                self.write_to_conf = True
+
+                if self.user_val is not None and \
+                   _is_base_n(self.user_val, base) and \
+                   (not has_active_range or
+                    low <= int(self.user_val, base) <= high):
+
+                    # If the user value is OK, it is stored in exactly the same
+                    # form as specified in the assignment (with or without
+                    # "0x", etc).
+
+                    use_defaults = False
+                    new_val = self.user_val
+
+            if use_defaults:
+                for (val_expr, cond_expr) in self.def_exprs:
+                    if self.config._eval_expr(cond_expr) != "n":
+                        self.write_to_conf = True
+
+                        # If the default value is OK, it is stored in exactly
+                        # the same form as specified. Otherwise, it is clamped
+                        # to the range, and the output has "0x" as appropriate
+                        # for the type.
+
+                        new_val = self.config._get_str_value(val_expr)
+
+                        if _is_base_n(new_val, base):
+                            new_val_num = int(new_val, base)
+                            if has_active_range:
+                                clamped_val = None
+
+                                if new_val_num < low:
+                                    clamped_val = low
+                                elif new_val_num > high:
+                                    clamped_val = high
+
+                                if clamped_val is not None:
+                                    new_val = (hex(clamped_val) if \
+                                      self.type == HEX else str(clamped_val))
+
+                            break
+                else: # For the for loop
+                    # If no user value or default kicks in but the hex/int has
+                    # an active range, then the low end of the range is used,
+                    # provided it's > 0, with "0x" prepended as appropriate.
+
+                    if has_active_range and low > 0:
+                        new_val = (hex(low) if self.type == HEX else str(low))
+
+        self.cached_value = new_val
+        return new_val
+
+    def set_user_value(self, v):
+        """Sets the user value of the symbol.
+
+        Equal in effect to assigning the value to the symbol within a .config
+        file. Use get_lower/upper_bound() or get_assignable_values() to find
+        the range of currently assignable values for bool and tristate symbols;
+        setting values outside this range will cause the user value to differ
+        from the result of Symbol.get_value() (be truncated). Values that are
+        invalid for the type (such as a_bool.set_user_value("foo")) are
+        ignored, and a warning is emitted if an attempt is made to assign such
+        a value.
+
+        For any type of symbol, is_modifiable() can be used to check if a user
+        value will currently have any effect on the symbol, as determined by
+        its visibility and range of assignable values. Any value that is valid
+        for the type (bool, tristate, etc.) will end up being reflected in
+        get_user_value() though, and might have an effect later if conditions
+        change. To get rid of the user value, use unset_user_value().
+
+        Any symbols dependent on the symbol are (recursively) invalidated, so
+        things will just work with regards to dependencies.
+
+        v -- The user value to give to the symbol."""
+        self._set_user_value_no_invalidate(v, False)
+
+        # There might be something more efficient you could do here, but play
+        # it safe.
+        if self.name == "MODULES":
+            self.config._invalidate_all()
+            return
+
+        self._invalidate()
+        self._invalidate_dependent()
+
+    def unset_user_value(self):
+        """Resets the user value of the symbol, as if the symbol had never
+        gotten a user value via Config.load_config() or
+        Symbol.set_user_value()."""
+        self._unset_user_value_no_recursive_invalidate()
+        self._invalidate_dependent()
+
+    def get_user_value(self):
+        """Returns the value assigned to the symbol in a .config or via
+        Symbol.set_user_value() (provided the value was valid for the type of the
+        symbol). Returns None in case of no user value."""
+        return self.user_val
+
+    def get_name(self):
+        """Returns the name of the symbol."""
+        return self.name
+
+    def get_upper_bound(self):
+        """For string/hex/int symbols and for bool and tristate symbols that
+        cannot be modified (see is_modifiable()), returns None.
+
+        Otherwise, returns the highest value the symbol can be set to with
+        Symbol.set_user_value() (that will not be truncated): one of "m" or "y",
+        arranged from lowest to highest. This corresponds to the highest value
+        the symbol could be given in e.g. the 'make menuconfig' interface.
+
+        See also the tri_less*() and tri_greater*() functions, which could come
+        in handy."""
+        if self.type != BOOL and self.type != TRISTATE:
+            return None
+        rev_dep = self.config._eval_expr(self.rev_dep)
+        # A bool selected to "m" gets promoted to "y"
+        if self.type == BOOL and rev_dep == "m":
+            rev_dep = "y"
+        vis = self._get_visibility()
+        if (tri_to_int[vis] - tri_to_int[rev_dep]) > 0:
+            return vis
+        return None
+
+    def get_lower_bound(self):
+        """For string/hex/int symbols and for bool and tristate symbols that
+        cannot be modified (see is_modifiable()), returns None.
+
+        Otherwise, returns the lowest value the symbol can be set to with
+        Symbol.set_user_value() (that will not be truncated): one of "n" or "m",
+        arranged from lowest to highest. This corresponds to the lowest value
+        the symbol could be given in e.g. the 'make menuconfig' interface.
+
+        See also the tri_less*() and tri_greater*() functions, which could come
+        in handy."""
+        if self.type != BOOL and self.type != TRISTATE:
+            return None
+        rev_dep = self.config._eval_expr(self.rev_dep)
+        # A bool selected to "m" gets promoted to "y"
+        if self.type == BOOL and rev_dep == "m":
+            rev_dep = "y"
+        if (tri_to_int[self._get_visibility()] - tri_to_int[rev_dep]) > 0:
+            return rev_dep
+        return None
+
+    def get_assignable_values(self):
+        """For string/hex/int symbols and for bool and tristate symbols that
+        cannot be modified (see is_modifiable()), returns the empty list.
+
+        Otherwise, returns a list containing the user values that can be
+        assigned to the symbol (that won't be truncated). Usage example:
+
+        if "m" in sym.get_assignable_values():
+            sym.set_user_value("m")
+
+        This is basically a more convenient interface to
+        get_lower/upper_bound() when wanting to test if a particular tristate
+        value can be assigned."""
+        if self.type != BOOL and self.type != TRISTATE:
+            return []
+        rev_dep = self.config._eval_expr(self.rev_dep)
+        # A bool selected to "m" gets promoted to "y"
+        if self.type == BOOL and rev_dep == "m":
+            rev_dep = "y"
+        res = ["n", "m", "y"][tri_to_int[rev_dep] :
+                              tri_to_int[self._get_visibility()] + 1]
+        return res if len(res) > 1 else []
+
+    def get_type(self):
+        """Returns the type of the symbol: one of UNKNOWN, BOOL, TRISTATE,
+        STRING, HEX, or INT. These are defined at the top level of the module,
+        so you'd do something like
+
+        if sym.get_type() == kconfiglib.STRING:
+            ..."""
+        return self.type
+
+    def get_visibility(self):
+        """Returns the visibility of the symbol: one of "n", "m" or "y". For
+        bool and tristate symbols, this is an upper bound on the value users
+        can set for the symbol. For other types of symbols, a visibility of "n"
+        means the user value will be ignored. A visibility of "n" corresponds
+        to not being visible in the 'make *config' interfaces.
+
+        Example (assuming we're running with modules enabled -- i.e., MODULES
+        set to 'y'):
+
+        # Assume this has been assigned 'n'
+        config N_SYM
+            tristate "N_SYM"
+
+        # Assume this has been assigned 'm'
+        config M_SYM
+            tristate "M_SYM"
+
+        # Has visibility 'n'
+        config A
+            tristate "A"
+            depends on N_SYM
+
+        # Has visibility 'm'
+        config B
+            tristate "B"
+            depends on M_SYM
+
+        # Has visibility 'y'
+        config C
+            tristate "C"
+
+        # Has no prompt, and hence visibility 'n'
+        config D
+            tristate
+
+        Having visibility be tri-valued ensures that e.g. a symbol cannot be
+        set to "y" by the user if it depends on a symbol with value "m", which
+        wouldn't be safe.
+
+        You should probably look at get_lower/upper_bound(),
+        get_assignable_values() and is_modifiable() before using this."""
+        return self._get_visibility()
+
+    def get_parent(self):
+        """Returns the menu or choice statement that contains the symbol, or
+        None if the symbol is at the top level. Note that if statements are
+        treated as syntactic and do not have an explicit class
+        representation."""
+        return self.parent
+
+    def get_referenced_symbols(self, refs_from_enclosing = False):
+        """Returns the set() of all symbols referenced by this symbol. For
+        example, the symbol defined by
+
+        config FOO
+            bool
+            prompt "foo" if A && B
+            default C if D
+            depends on E
+            select F if G
+
+        references the symbols A through G.
+
+        refs_from_enclosing (default: False) -- If True, the symbols
+                            referenced by enclosing menus and if's will be
+                            included in the result."""
+        return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms
+
+    def get_selected_symbols(self):
+        """Returns the set() of all symbols X for which this symbol has a
+        'select X' or 'select X if Y' (regardless of whether Y is satisfied or
+        not). This is a subset of the symbols returned by
+        get_referenced_symbols()."""
+        return self.selected_syms
+
+    def get_help(self):
+        """Returns the help text of the symbol, or None if the symbol has no
+        help text."""
+        return self.help
+
+    def get_config(self):
+        """Returns the Config instance this symbol is from."""
+        return self.config
+
+    def get_def_locations(self):
+        """Returns a list of (filename, linenr) tuples, where filename (string)
+        and linenr (int) represent a location where the symbol is defined. For
+        the vast majority of symbols this list will only contain one element.
+        For the following Kconfig, FOO would get two entries: the lines marked
+        with *.
+
+        config FOO *
+            bool "foo prompt 1"
+
+        config FOO *
+            bool "foo prompt 2"
+        """
+        return self.def_locations
+
+    def get_ref_locations(self):
+        """Returns a list of (filename, linenr) tuples, where filename (string)
+        and linenr (int) represent a location where the symbol is referenced in
+        the configuration. For example, the lines marked by * would be included
+        for FOO below:
+
+        config A
+            bool
+            default BAR || FOO *
+
+        config B
+            tristate
+            depends on FOO *
+            default m if FOO *
+
+        if FOO *
+            config A
+                bool "A"
+        endif
+
+        config FOO (definition not included)
+            bool
+        """
+        return self.ref_locations
+
+    def is_modifiable(self):
+        """Returns True if the value of the symbol could be modified by calling
+        Symbol.set_user_value() and False otherwise.
+
+        For bools and tristates, this corresponds to the symbol being visible
+        in the 'make menuconfig' interface and not already being pinned to a
+        specific value (e.g. because it is selected by another symbol).
+
+        For strings and numbers, this corresponds to just being visible. (See
+        Symbol.get_visibility().)"""
+        if self.is_special_:
+            return False
+        if self.type == BOOL or self.type == TRISTATE:
+            rev_dep = self.config._eval_expr(self.rev_dep)
+            # A bool selected to "m" gets promoted to "y"
+            if self.type == BOOL and rev_dep == "m":
+                rev_dep = "y"
+            return (tri_to_int[self._get_visibility()] -
+                    tri_to_int[rev_dep]) > 0
+        return self._get_visibility() != "n"
+
+    def is_defined(self):
+        """Returns False if the symbol is referred to in the Kconfig but never
+        actually defined, otherwise True."""
+        return self.is_defined_
+
+    def is_special(self):
+        """Returns True if the symbol is one of the special symbols n, m, y, or
+        UNAME_RELEASE, or gets its value from the environment. Otherwise,
+        returns False."""
+        return self.is_special_
+
+    def is_from_environment(self):
+        """Returns True if the symbol gets its value from the environment.
+        Otherwise, returns False."""
+        return self.is_from_env
+
+    def has_ranges(self):
+        """Returns True if the symbol is of type INT or HEX and has ranges that
+        limits what values it can take on, otherwise False."""
+        return self.ranges != []
+
+    def is_choice_symbol(self):
+        """Returns True if the symbol is in a choice statement and is an actual
+        choice symbol (see Choice.get_symbols()); otherwise, returns
+        False."""
+        return self.is_choice_symbol_
+
+    def is_choice_selection(self):
+        """Returns True if the symbol is contained in a choice statement and is
+        the selected item, otherwise False. Equivalent to 'sym.is_choice_symbol()
+        and sym.get_parent().get_selection() is sym'."""
+        return self.is_choice_symbol_ and self.parent.get_selection() is self
+
+    def __str__(self):
+        """Returns a string containing various information about the symbol."""
+        return self.config._get_sym_or_choice_str(self)
+
+    #
+    # Private methods
+    #
+
+    def __init__(self):
+        """Symbol constructor -- not intended to be called directly by
+        kconfiglib clients."""
+
+        # Set default values
+        _HasVisibility.__init__(self)
+
+        self.config = None
+
+        self.parent = None
+        self.name = None
+        self.type = UNKNOWN
+
+        self.def_exprs = []
+        self.ranges = []
+        self.rev_dep = "n"
+
+        # The prompt, default value and select conditions without any
+        # dependencies from menus or if's propagated to them
+
+        self.orig_prompts = []
+        self.orig_def_exprs = []
+        self.orig_selects = []
+
+        # Dependencies inherited from containing menus and if's
+        self.deps_from_containing = None
+
+        self.help = None
+
+        # The set of symbols referenced by this symbol (see
+        # get_referenced_symbols())
+        self.referenced_syms = set()
+
+        # The set of symbols selected by this symbol (see
+        # get_selected_symbols())
+        self.selected_syms = set()
+
+        # Like 'referenced_syms', but includes symbols from
+        # dependencies inherited from enclosing menus and if's
+        self.all_referenced_syms = set()
+
+        # This is set to True for "actual" choice symbols. See
+        # Choice._determine_actual_symbols(). The trailing underscore avoids a
+        # collision with is_choice_symbol().
+        self.is_choice_symbol_ = False
+
+        # This records only dependencies specified with 'depends on'. Needed
+        # when determining actual choice items (hrrrr...). See also
+        # Choice._determine_actual_symbols().
+        self.menu_dep = None
+
+        # See Symbol.get_ref/def_locations().
+        self.def_locations = []
+        self.ref_locations = []
+
+        self.user_val = None
+
+        # Flags
+
+        # Should the symbol get an entry in .config?
+        self.write_to_conf = False
+
+        # Caches the calculated value
+        self.cached_value = None
+
+        # Note: An instance variable 'self.dep' gets set on the Symbol in
+        # Config._build_dep(), linking the symbol to the symbols that
+        # immediately depend on it (in a caching/invalidation sense). The total
+        # set of dependent symbols for the symbol (the transitive closure) is
+        # calculated on an as-needed basis in _get_dependent().
+
+        # Caches the total list of dependent symbols. Calculated in
+        # _get_dependent().
+        self.cached_deps = None
+
+        # Does the symbol have an entry in the Kconfig file? The trailing
+        # underscore avoids a collision with is_defined().
+        self.is_defined_ = False
+
+        # Does the symbol get its value in some special way, e.g. from the
+        # environment or by being one of the special symbols n, m, and y? If
+        # so, the value is stored in self.cached_value, which is never
+        # invalidated. The trailing underscore avoids a collision with
+        # is_special().
+        self.is_special_ = False
+
+        # Does the symbol get its value from the environment?
+        self.is_from_env = False
+
+    def _invalidate(self):
+        if self.is_special_:
+            return
+
+        if self.is_choice_symbol_:
+            self.parent._invalidate()
+
+        _HasVisibility._invalidate(self)
+
+        self.write_to_conf = False
+        self.cached_value = None
+
+    def _invalidate_dependent(self):
+        for sym in self._get_dependent():
+            sym._invalidate()
+
+    def _set_user_value_no_invalidate(self, v, suppress_load_warnings):
+        """Like set_user_value(), but does not invalidate any symbols.
+
+        suppress_load_warnings --
+          some warnings are annoying when loading a .config that can be helpful
+          when manually invoking set_user_value(). This flag is set to True to
+          suppress such warnings.
+
+          Perhaps this could be made optional for load_config() instead."""
+
+        if self.is_special_:
+            if self.is_from_env:
+                self.config._warn('attempt to assign the value "{0}" to the '
+                                  'symbol {1}, which gets its value from the '
+                                  'environment. Assignment ignored.'
+                                  .format(v, self.name))
+            else:
+                self.config._warn('attempt to assign the value "{0}" to the '
+                                  'special symbol {1}. Assignment ignored.'
+                                  .format(v, self.name))
+
+            return
+
+
+        if not self.is_defined_:
+            filename, linenr = self.ref_locations[0]
+
+            self.config._undef_assign('attempt to assign the value "{0}" to {1}, '
+                                      "which is referenced at {2}:{3} but never "
+                                      "defined. Assignment ignored."
+                                      .format(v, self.name, filename, linenr))
+            return
+
+        # Check if the value is valid for our type
+
+        if not (( self.type == BOOL     and (v == "n" or v == "y")    ) or
+                ( self.type == TRISTATE and (v == "n" or v == "m" or
+                                             v == "y")                ) or
+                ( self.type == STRING                                 ) or
+                ( self.type == INT      and _is_base_n(v, 10)         ) or
+                ( self.type == HEX      and _is_base_n(v, 16)         )):
+
+            self.config._warn('the value "{0}" is invalid for {1}, which has type {2}. '
+                              "Assignment ignored."
+                              .format(v, self.name, typename[self.type]))
+            return
+
+        if self.prompts == [] and not suppress_load_warnings:
+            self.config._warn('assigning "{0}" to the symbol {1} which '
+                              'lacks prompts and thus has visibility "n". '
+                              'The assignment will have no effect.'
+                              .format(v, self.name))
+
+        self.user_val = v
+
+        if self.is_choice_symbol_ and (self.type == BOOL or
+                                       self.type == TRISTATE):
+            choice = self.parent
+            if v == "y":
+                choice.user_val = self
+                choice.user_mode = "y"
+            elif v == "m":
+                choice.user_val = None
+                choice.user_mode = "m"
+
+    def _unset_user_value_no_recursive_invalidate(self):
+        self._invalidate()
+        self.user_val = None
+
+        if self.is_choice_symbol_:
+            self.parent._unset_user_value()
+
+    def _make_conf(self):
+        if self.already_written:
+            return []
+
+        self.already_written = True
+
+        # Note: write_to_conf is determined in get_value()
+        val = self.get_value()
+        if not self.write_to_conf:
+            return []
+
+        if self.type == BOOL or self.type == TRISTATE:
+            if val == "m" or val == "y":
+                return ["CONFIG_{0}={1}".format(self.name, val)]
+            return ["# CONFIG_{0} is not set".format(self.name)]
+
+        elif self.type == STRING:
+            # Escape \ and "
+            return ['CONFIG_{0}="{1}"'
+                    .format(self.name,
+                            val.replace("\\", "\\\\").replace('"', '\\"'))]
+
+        elif self.type == INT or self.type == HEX:
+            return ["CONFIG_{0}={1}".format(self.name, val)]
+
+        else:
+            _internal_error('Internal error while creating .config: unknown type "{0}".'
+                            .format(self.type))
+
+    def _get_dependent(self):
+        """Returns the set of symbols that should be invalidated if the value
+        of the symbol changes, because they might be affected by the change.
+        Note that this is an internal API -- it's probably of limited
+        usefulness to clients."""
+        if self.cached_deps is not None:
+            return self.cached_deps
+
+        res = set()
+
+        self._add_dependent_ignore_siblings(res)
+        if self.is_choice_symbol_:
+            for s in self.parent.get_symbols():
+                if s is not self:
+                    res.add(s)
+                    s._add_dependent_ignore_siblings(res)
+
+        self.cached_deps = res
+        return res
+
+    def _add_dependent_ignore_siblings(self, to):
+        """Calculating dependencies gets a bit tricky for choice items as they
+        all depend on each other, potentially leading to infinite recursion.
+        This helper function calculates dependencies ignoring the other symbols
+        in the choice. It also works fine for symbols that are not choice
+        items."""
+        for s in self.dep:
+            to.add(s)
+            to |= s._get_dependent()
+
+    def _has_auto_menu_dep_on(self, on):
+        """See Choice._determine_actual_symbols()."""
+        if not isinstance(self.parent, Choice):
+            _internal_error("Attempt to determine auto menu dependency for symbol ouside of choice.")
+
+        if self.prompts == []:
+            # If we have no prompt, use the menu dependencies instead (what was
+            # specified with 'depends on')
+            return self.menu_dep is not None and \
+                   self.config._expr_depends_on(self.menu_dep, on)
+
+        for (_, cond_expr) in self.prompts:
+            if self.config._expr_depends_on(cond_expr, on):
+                return True
+
+        return False
+
+class Menu(Item):
+
+    """Represents a menu statement."""
+
+    #
+    # Public interface
+    #
+
+    def get_config(self):
+        """Return the Config instance this menu is from."""
+        return self.config
+
+    def get_visibility(self):
+        """Returns the visibility of the menu. This also affects the visibility
+        of subitems. See also Symbol.get_visibility()."""
+        return self.config._eval_expr(self.dep_expr)
+
+    def get_visible_if_visibility(self):
+        """Returns the visibility the menu gets from its 'visible if'
+        condition. "y" if the menu has no 'visible if' condition."""
+        return self.config._eval_expr(self.visible_if_expr)
+
+    def get_items(self, recursive = False):
+        """Returns a list containing the items (symbols, menus, choice
+        statements and comments) in in the menu, in the same order that the
+        items appear within the menu.
+
+        recursive (default: False) -- True if items contained in items within
+                                      the menu should be included
+                                      recursively (preorder)."""
+
+        if not recursive:
+            return self.block.get_items()
+
+        res = []
+        for item in self.block.get_items():
+            res.append(item)
+            if isinstance(item, Menu):
+                res.extend(item.get_items(True))
+            elif isinstance(item, Choice):
+                res.extend(item.get_items())
+        return res
+
+    def get_symbols(self, recursive = False):
+        """Returns a list containing the symbols in the menu, in the same order
+        that they appear within the menu.
+
+        recursive (default: False) -- True if symbols contained in items within
+                                      the menu should be included
+                                      recursively."""
+
+        return [item for item in self.get_items(recursive) if isinstance(item, Symbol)]
+
+    def get_title(self):
+        """Returns the title text of the menu."""
+        return self.title
+
+    def get_parent(self):
+        """Returns the menu or choice statement that contains the menu, or
+        None if the menu is at the top level. Note that if statements are
+        treated as syntactic sugar and do not have an explicit class
+        representation."""
+        return self.parent
+
+    def get_referenced_symbols(self, refs_from_enclosing = False):
+        """See Symbol.get_referenced_symbols()."""
+        return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms
+
+    def get_location(self):
+        """Returns the location of the menu as a (filename, linenr) tuple,
+        where filename is a string and linenr an int."""
+        return (self.filename, self.linenr)
+
+    def __str__(self):
+        """Returns a string containing various information about the menu."""
+        depends_on_str = self.config._expr_val_str(self.orig_deps,
+                                                   "(no dependencies)")
+        visible_if_str = self.config._expr_val_str(self.visible_if_expr,
+                                                   "(no dependencies)")
+
+        additional_deps_str = " " + self.config._expr_val_str(self.deps_from_containing,
+                                                              "(no additional dependencies)")
+
+        return _sep_lines("Menu",
+                          "Title                     : " + self.title,
+                          "'depends on' dependencies : " + depends_on_str,
+                          "'visible if' dependencies : " + visible_if_str,
+                          "Additional dependencies from enclosing menus and if's:",
+                          additional_deps_str,
+                          "Location: {0}:{1}".format(self.filename, self.linenr))
+
+    #
+    # Private methods
+    #
+
+    def __init__(self):
+        """Menu constructor -- not intended to be called directly by
+        kconfiglib clients."""
+
+        self.config = None
+
+        self.parent = None
+        self.title = None
+        self.block = None
+        self.dep_expr = None
+
+        # Dependency expression without dependencies from enclosing menus and
+        # if's propagated
+        self.orig_deps = None
+
+        # Dependencies inherited from containing menus and if's
+        self.deps_from_containing = None
+
+        # The 'visible if' expression
+        self.visible_if_expr = None
+
+        # The set of symbols referenced by this menu (see
+        # get_referenced_symbols())
+        self.referenced_syms = set()
+
+        # Like 'referenced_syms', but includes symbols from
+        # dependencies inherited from enclosing menus and if's
+        self.all_referenced_syms = None
+
+        self.filename = None
+        self.linenr = None
+
+    def _make_conf(self):
+        item_conf = self.block._make_conf()
+
+        if self.config._eval_expr(self.dep_expr) != "n" and \
+           self.config._eval_expr(self.visible_if_expr) != "n":
+            return ["\n#\n# {0}\n#".format(self.title)] + item_conf
+        return item_conf
+
+class Choice(Item, _HasVisibility):
+
+    """Represents a choice statement. A choice can be in one of three modes:
+
+    "n" - The choice is not visible and no symbols can be selected.
+
+    "m" - Any number of symbols can be set to "m". The rest will be "n". This
+          is safe since potentially conflicting options don't actually get
+          compiled into the kernel simultaneously with "m".
+
+    "y" - One symbol will be "y" while the rest are "n".
+
+    Only tristate choices can be in "m" mode, and the visibility of the choice
+    is an upper bound on the mode, so that e.g. a choice that depends on a
+    symbol with value "m" will be in "m" mode.
+
+    The mode changes automatically when a value is assigned to a symbol within
+    the choice.
+
+    See Symbol.get_visibility() too."""
+
+    #
+    # Public interface
+    #
+
+    def get_selection(self):
+        """Returns the symbol selected (either by the user or through
+        defaults), or None if either no symbol is selected or the mode is not
+        "y"."""
+        if self.cached_selection is not None:
+            if self.cached_selection == NO_SELECTION:
+                return None
+            return self.cached_selection
+
+        if self.get_mode() != "y":
+            return self._cache_ret(None)
+
+        # User choice available?
+        if self.user_val is not None and \
+           self.user_val._get_visibility() == "y":
+            return self._cache_ret(self.user_val)
+
+        if self.optional:
+            return self._cache_ret(None)
+
+        return self._cache_ret(self.get_selection_from_defaults())
+
+    def get_selection_from_defaults(self):
+        """Like Choice.get_selection(), but acts as if no symbol has been
+        selected by the user and no 'optional' flag is in effect."""
+
+        if self.actual_symbols == []:
+            return None
+
+        for (symbol, cond_expr) in self.def_exprs:
+            if self.config._eval_expr(cond_expr) != "n":
+                chosen_symbol = symbol
+                break
+        else:
+            chosen_symbol = self.actual_symbols[0]
+
+        # Is the chosen symbol visible?
+        if chosen_symbol._get_visibility() != "n":
+            return chosen_symbol
+        # Otherwise, pick the first visible symbol
+        for sym in self.actual_symbols:
+            if sym._get_visibility() != "n":
+                return sym
+        return None
+
+    def get_user_selection(self):
+        """If the choice is in "y" mode and has a user-selected symbol, returns
+        that symbol. Otherwise, returns None."""
+        return self.user_val
+
+    def get_config(self):
+        """Returns the Config instance this choice is from."""
+        return self.config
+
+    def get_name(self):
+        """For named choices, returns the name. Returns None for unnamed
+        choices. No named choices appear anywhere in the kernel Kconfig files
+        as of Linux 3.7.0-rc8."""
+        return self.name
+
+    def get_help(self):
+        """Returns the help text of the choice, or None if the choice has no
+        help text."""
+        return self.help
+
+    def get_type(self):
+        """Returns the type of the choice. See Symbol.get_type()."""
+        return self.type
+
+    def get_items(self):
+        """Gets all items contained in the choice in the same order as within
+        the configuration ("items" instead of "symbols" since choices and
+        comments might appear within choices. This only happens in one place as
+        of Linux 3.7.0-rc8, in drivers/usb/gadget/Kconfig)."""
+        return self.block.get_items()
+
+    def get_symbols(self):
+        """Returns a list containing the choice's symbols.
+
+        A quirk (perhaps a bug) of Kconfig is that you can put items within a
+        choice that will not be considered members of the choice insofar as
+        selection is concerned. This happens for example if one symbol within a
+        choice 'depends on' the symbol preceding it, or if you put non-symbol
+        items within choices.
+
+        As of Linux 3.7.0-rc8, this seems to be used intentionally in one
+        place: drivers/usb/gadget/Kconfig.
+
+        This function returns the "proper" symbols of the choice in the order
+        they appear in the choice, excluding such items. If you want all items
+        in the choice, use get_items()."""
+        return self.actual_symbols
+
+    def get_parent(self):
+        """Returns the menu or choice statement that contains the choice, or
+        None if the choice is at the top level. Note that if statements are
+        treated as syntactic sugar and do not have an explicit class
+        representation."""
+        return self.parent
+
+    def get_referenced_symbols(self, refs_from_enclosing = False):
+        """See Symbol.get_referenced_symbols()."""
+        return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms
+
+    def get_def_locations(self):
+        """Returns a list of (filename, linenr) tuples, where filename (string)
+        and linenr (int) represent a location where the choice is defined. For
+        the vast majority of choices (all of them as of Linux 3.7.0-rc8) this
+        list will only contain one element, but its possible for named choices
+        to be defined in multiple locations."""
+        return self.def_locations
+
+    def get_visibility(self):
+        """Returns the visibility of the choice statement: one of "n", "m" or
+        "y". This acts as an upper limit on the mode of the choice (though bool
+        choices can only have the mode "y"). See the class documentation for an
+        explanation of modes."""
+        return self._get_visibility()
+
+    def get_mode(self):
+        """Returns the mode of the choice. See the class documentation for
+        an explanation of modes."""
+        minimum_mode = "n" if self.optional else "m"
+        mode = self.user_mode if self.user_mode is not None else minimum_mode
+        mode = self.config._eval_min(mode, self._get_visibility())
+
+        # Promote "m" to "y" for boolean choices
+        if mode == "m" and self.type == BOOL:
+            return "y"
+
+        return mode
+
+    def is_optional(self):
+        """Returns True if the symbol has the optional flag set (and so will default
+        to "n" mode). Otherwise, returns False."""
+        return self.optional
+
+    def __str__(self):
+        """Returns a string containing various information about the choice
+        statement."""
+        return self.config._get_sym_or_choice_str(self)
+
+    #
+    # Private methods
+    #
+
+    def __init__(self):
+        """Choice constructor -- not intended to be called directly by
+        kconfiglib clients."""
+
+        _HasVisibility.__init__(self)
+
+        self.config = None
+
+        self.parent = None
+        self.name = None # Yes, choices can be named
+        self.type = UNKNOWN
+        self.def_exprs = []
+        self.help = None
+        self.optional = False
+        self.block = None
+
+        # The prompts and default values without any dependencies from
+        # enclosing menus or if's propagated
+
+        self.orig_prompts = []
+        self.orig_def_exprs = []
+
+        # Dependencies inherited from containing menus and if's
+        self.deps_from_containing = None
+
+        # We need to filter out symbols that appear within the choice block but
+        # are not considered choice items (see
+        # Choice._determine_actual_symbols()) This list holds the "actual" choice
+        # items.
+        self.actual_symbols = []
+
+        # The set of symbols referenced by this choice (see
+        # get_referenced_symbols())
+        self.referenced_syms = set()
+
+        # Like 'referenced_syms', but includes symbols from
+        # dependencies inherited from enclosing menus and if's
+        self.all_referenced_syms = set()
+
+        # See Choice.get_def_locations()
+        self.def_locations = []
+
+        self.user_val = None
+        self.user_mode = None
+
+        self.cached_selection = None
+
+    def _determine_actual_symbols(self):
+        """If a symbol's visibility depends on the preceding symbol within a
+        choice, it is no longer viewed as a choice item (quite possibly a bug,
+        but some things consciously use it.. ugh. It stems from automatic
+        submenu creation). In addition, it's possible to have choices and
+        comments within choices, and those shouldn't be considered as choice
+        items either. Only drivers/usb/gadget/Kconfig seems to depend on any of
+        this. This method computes the "actual" items in the choice and sets
+        the is_choice_symbol_ flag on them (retrieved via is_choice_symbol()).
+
+        Don't let this scare you: an earlier version simply checked for a
+        sequence of symbols where all symbols after the first appeared in the
+        'depends on' expression of the first, and that worked fine.  The added
+        complexity is to be future-proof in the event that
+        drivers/usb/gadget/Kconfig turns even more sinister. It might very well
+        be overkilling things (especially if that file is refactored ;)."""
+
+        items = self.block.get_items()
+
+        # Items might depend on each other in a tree structure, so we need a
+        # stack to keep track of the current tentative parent
+        stack = []
+
+        for item in items:
+            if not isinstance(item, Symbol):
+                stack = []
+                continue
+
+            while stack != []:
+                if item._has_auto_menu_dep_on(stack[-1]):
+                    # The item should not be viewed as a choice item, so don't
+                    # set item.is_choice_symbol_.
+                    stack.append(item)
+                    break
+                else:
+                    stack.pop()
+            else:
+                item.is_choice_symbol_ = True
+                self.actual_symbols.append(item)
+                stack.append(item)
+
+    def _cache_ret(self, selection):
+        # As None is used to indicate the lack of a cached value we can't use
+        # that to cache the fact that the choice has no selection. Instead, we
+        # use the symbolic constant NO_SELECTION.
+        if selection is None:
+            self.cached_selection = NO_SELECTION
+        else:
+            self.cached_selection = selection
+
+        return selection
+
+    def _invalidate(self):
+        _HasVisibility._invalidate(self)
+        self.cached_selection = None
+
+    def _unset_user_value(self):
+        self._invalidate()
+        self.user_val = None
+        self.user_mode = None
+
+    def _make_conf(self):
+        return self.block._make_conf()
+
+class Comment(Item):
+
+    """Represents a comment statement."""
+
+    #
+    # Public interface
+    #
+
+    def get_config(self):
+        """Returns the Config instance this comment is from."""
+        return self.config
+
+    def get_visibility(self):
+        """Returns the visibility of the comment. See also
+        Symbol.get_visibility()."""
+        return self.config._eval_expr(self.dep_expr)
+
+    def get_text(self):
+        """Returns the text of the comment."""
+        return self.text
+
+    def get_parent(self):
+        """Returns the menu or choice statement that contains the comment, or
+        None if the comment is at the top level. Note that if statements are
+        treated as syntactic sugar and do not have an explicit class
+        representation."""
+        return self.parent
+
+    def get_referenced_symbols(self, refs_from_enclosing = False):
+        """See Symbol.get_referenced_symbols()."""
+        return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms
+
+    def get_location(self):
+        """Returns the location of the comment as a (filename, linenr) tuple,
+        where filename is a string and linenr an int."""
+        return (self.filename, self.linenr)
+
+    def __str__(self):
+        """Returns a string containing various information about the comment."""
+        dep_str = self.config._expr_val_str(self.orig_deps, "(no dependencies)")
+
+        additional_deps_str = " " + self.config._expr_val_str(self.deps_from_containing,
+                                                              "(no additional dependencies)")
+
+        return _sep_lines("Comment",
+                          "Text: "         + str(self.text),
+                          "Dependencies: " + dep_str,
+                          "Additional dependencies from enclosing menus and if's:",
+                          additional_deps_str,
+                          "Location: {0}:{1}".format(self.filename, self.linenr))
+
+    #
+    # Private methods
+    #
+
+    def __init__(self):
+        """Comment constructor -- not intended to be called directly by
+        kconfiglib clients."""
+
+        self.config = None
+
+        self.parent = None
+        self.text = None
+        self.dep_expr = None
+
+        # Dependency expression without dependencies from enclosing menus and
+        # if's propagated
+        self.orig_deps = None
+
+        # Dependencies inherited from containing menus and if's
+        self.deps_from_containing = None
+
+        # The set of symbols referenced by this comment (see
+        # get_referenced_symbols())
+        self.referenced_syms = set()
+
+        # Like 'referenced_syms', but includes symbols from
+        # dependencies inherited from enclosing menus and if's
+        self.all_referenced_syms = None
+
+        self.filename = None
+        self.linenr = None
+
+    def _make_conf(self):
+        if self.config._eval_expr(self.dep_expr) != "n":
+            return ["\n#\n# {0}\n#".format(self.text)]
+        return []
+
+class _Feed:
+
+    """Class for working with sequences in a stream-like fashion; handy for tokens."""
+
+    def __init__(self, items):
+        self.items = items
+        self.length = len(self.items)
+        self.i = 0
+
+    def get_next(self):
+        if self.i >= self.length:
+            return None
+
+        item = self.items[self.i]
+        self.i += 1
+        return item
+
+    def peek_next(self):
+        return None if self.i >= self.length else self.items[self.i]
+
+    def go_to_start(self):
+        self.i = 0
+
+    def __getitem__(self, index):
+        return self.items[index]
+
+    def __len__(self):
+        return len(self.items)
+
+    def is_empty(self):
+        return self.items == []
+
+    def check(self, token):
+        """Check if the next token is 'token'. If so, remove it from the token
+        feed and return True. Otherwise, leave it in and return False."""
+        if self.i >= self.length:
+            return None
+
+        if self.items[self.i] == token:
+            self.i += 1
+            return True
+
+        return False
+
+    def remove_while(self, pred):
+        while self.i < self.length and pred(self.items[self.i]):
+            self.i += 1
+
+    def go_back(self):
+        if self.i <= 0:
+            _internal_error("Attempt to move back in Feed while already at the beginning.")
+        self.i -= 1
+
+class _FileFeed(_Feed):
+
+    """Feed subclass that keeps track of the current filename and line
+    number."""
+
+    def __init__(self, lines, filename):
+        self.filename = _clean_up_path(filename)
+        _Feed.__init__(self, lines)
+
+    def get_filename(self):
+        return self.filename
+
+    def get_linenr(self):
+        return self.i
+
+#
+# Misc. public global utility functions
+#
+
+def tri_less(v1, v2):
+    """Returns True if the tristate v1 is less than the tristate v2, where "n",
+    "m" and "y" are ordered from lowest to highest. Otherwise, returns
+    False."""
+    return tri_to_int[v1] < tri_to_int[v2]
+
+def tri_less_eq(v1, v2):
+    """Returns True if the tristate v1 is less than or equal to the tristate
+    v2, where "n", "m" and "y" are ordered from lowest to highest. Otherwise,
+    returns False."""
+    return tri_to_int[v1] <= tri_to_int[v2]
+
+def tri_greater(v1, v2):
+    """Returns True if the tristate v1 is greater than the tristate v2, where
+    "n", "m" and "y" are ordered from lowest to highest. Otherwise, returns
+    False."""
+    return tri_to_int[v1] > tri_to_int[v2]
+
+def tri_greater_eq(v1, v2):
+    """Returns True if the tristate v1 is greater than or equal to the tristate
+    v2, where "n", "m" and "y" are ordered from lowest to highest. Otherwise,
+    returns False."""
+    return tri_to_int[v1] >= tri_to_int[v2]
+
+#
+# Helper functions, mostly related to text processing
+#
+
+def _strip_quotes(s, line, filename, linenr):
+    """Removes any quotes surrounding 's' if it has them; otherwise returns 's'
+    unmodified."""
+    s = s.strip()
+    if not s:
+        return ""
+    if s[0] == '"' or s[0] == "'":
+        if len(s) < 2 or s[-1] != s[0]:
+            _parse_error(line,
+                         "malformed string literal",
+                         filename,
+                         linenr)
+        return s[1:-1]
+    return s
+
+def _indentation(line):
+    """Returns the indentation of the line, treating tab stops as being spaced
+    8 characters apart."""
+    if line.isspace():
+        _internal_error("Attempt to take indentation of blank line.")
+    indent = 0
+    for c in line:
+        if c == " ":
+            indent += 1
+        elif c == "\t":
+            # Go to the next tab stop
+            indent = (indent + 8) & ~7
+        else:
+            return indent
+
+def _deindent(line, indent):
+    """Deindent 'line' by 'indent' spaces."""
+    line = line.expandtabs()
+    if len(line) <= indent:
+        return line
+    return line[indent:]
+
+def _is_base_n(s, n):
+    try:
+        int(s, n)
+        return True
+    except ValueError:
+        return False
+
+def _sep_lines(*args):
+    """Returns a string comprised of all arguments, with newlines inserted
+    between them."""
+    return "\n".join(args)
+
+def _comment(s):
+    """Returns a new string with "#" inserted before each line in 's'."""
+    if not s:
+        return "#"
+    res = "".join(["#" + line for line in s.splitlines(True)])
+    if s.endswith("\n"):
+        return res + "#"
+    return res
+
+def _get_lines(filename):
+    """Returns a list of lines from 'filename', joining any line ending in \\
+    with the following line."""
+    with open(filename, "r") as f:
+        lines = []
+        accum = ""
+        while 1:
+            line = f.readline()
+
+            if line == "":
+                return lines
+
+            if line.endswith("\\\n"):
+                accum += line[:-2]
+            else:
+                accum += line
+                lines.append(accum)
+                accum = ""
+
+def _strip_trailing_slash(path):
+    """Removes any trailing slash from 'path'."""
+    return path[:-1] if path.endswith("/") else path
+
+def _clean_up_path(path):
+    """Strips any initial "./" and trailing slash from 'path'."""
+    if path.startswith("./"):
+        path = path[2:]
+    return _strip_trailing_slash(path)
+
+#
+# Error handling
+#
+
+class Kconfig_Syntax_Error(Exception):
+    """Exception raised for syntax errors."""
+    pass
+
+class Internal_Error(Exception):
+    """Exception raised for internal errors."""
+    pass
+
+def _tokenization_error(s, index, filename, linenr):
+    if filename is not None:
+        assert linenr is not None
+        sys.stderr.write("{0}:{1}:\n".format(filename, linenr))
+
+    if s.endswith("\n"):
+        s = s[:-1]
+
+    # Calculate the visual offset corresponding to index 'index' in 's'
+    # assuming tabstops are spaced 8 characters apart
+    vis_index = 0
+    for c in s[:index]:
+        if c == "\t":
+            vis_index = (vis_index + 8) & ~7
+        else:
+            vis_index += 1
+
+    # Don't output actual tabs to be independent of how the terminal renders
+    # them
+    s = s.expandtabs()
+
+    raise Kconfig_Syntax_Error, (
+        _sep_lines("Error during tokenization at location indicated by caret.\n",
+                   s,
+                   " " * vis_index + "^\n"))
+
+def _parse_error(s, msg, filename, linenr):
+    error_str = ""
+
+    if filename is not None:
+        assert linenr is not None
+        error_str += "{0}:{1}: ".format(filename, linenr)
+
+    if s.endswith("\n"):
+        s = s[:-1]
+
+    error_str += 'Error while parsing "{0}"'.format(s) + \
+      ("." if msg is None else ": " + msg)
+
+    raise Kconfig_Syntax_Error, error_str
+
+def _internal_error(msg):
+    msg += "\nSorry! You may want to send an email to kconfiglib@gmail.com " \
+           "to tell me about this. Include the message above and the stack " \
+           "trace and describe what you were doing."
+
+    raise Internal_Error, msg
+
+if use_psyco:
+    import psyco
+
+    Config._tokenize  = psyco.proxy(Config._tokenize)
+    Config._eval_expr = psyco.proxy(Config._eval_expr)
+
+    _indentation = psyco.proxy(_indentation)
+    _get_lines   = psyco.proxy(_get_lines)
diff --git a/support/scripts/readme.kconfiglib b/support/scripts/readme.kconfiglib
new file mode 100644
index 0000000000..5c82b6f71a
--- /dev/null
+++ b/support/scripts/readme.kconfiglib
@@ -0,0 +1,30 @@
+Readme
+======
+
+Kconfiglib
+----------
+
+This python module, developped by Ulf Magnusson and released under the ISC
+license, is fetched from:
+
+https://github.com/ulfalizer/Kconfiglib
+commit: 02103fba9ae32a78291af53e50ee5d4bb3f69c1e
+
+Kconfiglib license
+~~~~~~~~~~~~~~~~~~
+
+License (ISC)
+
+Copyright (c) 2011-2013, Ulf Magnusson <ulfalizer@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

From a10041ea9af0951870760daff5601163069f0d8d Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:06 +0000
Subject: [PATCH 4945/6849] support/scripts: add gen-manual-lists.py

Script generating the target and host package tables, and the deprecated
stuff list as well. These tables and lists are generated parsing the
Config.in files.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr: no leading dot, no menu path for host-utils]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/gen-manual-lists.py | 379 ++++++++++++++++++++++++++++
 1 file changed, 379 insertions(+)
 create mode 100755 support/scripts/gen-manual-lists.py

diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py
new file mode 100755
index 0000000000..ae1d4ff420
--- /dev/null
+++ b/support/scripts/gen-manual-lists.py
@@ -0,0 +1,379 @@
+#!/usr/bin/env python
+##
+## gen-manual-lists.py
+##
+## This script generates the following Buildroot manual appendices:
+##  - the package tables (one for the target, the other for host tools);
+##  - the deprecated items.
+##
+## Author(s):
+##  - Samuel Martin <s.martin49@gmail.com>
+##
+## Copyright (C) 2013 Samuel Martin
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+## Note about python2.
+##
+## This script can currently only be run using python2 interpreter due to
+## its kconfiglib dependency (which is not yet python3 friendly).
+
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import os
+import re
+import sys
+import datetime
+from argparse import ArgumentParser
+
+try:
+    import kconfiglib
+except ImportError:
+    message = """
+Could not find the module 'kconfiglib' in the PYTHONPATH:
+"""
+    message += "\n".join(["  {0}".format(path) for path in sys.path])
+    message += """
+
+Make sure the Kconfiglib directory is in the PYTHONPATH, then relaunch the
+script.
+
+You can get kconfiglib from:
+  https://github.com/ulfalizer/Kconfiglib
+
+
+"""
+    sys.stderr.write(message)
+    raise
+
+
+def get_symbol_subset(root, filter_func):
+    """ Return a generator of kconfig items.
+
+    :param root_item:   Root item of the generated subset of items
+    :param filter_func: Filter function
+
+    """
+    if hasattr(root, "get_items"):
+        get_items = root.get_items
+    elif hasattr(root, "get_top_level_items"):
+        get_items = root.get_top_level_items
+    else:
+        message = "The symbol does not contain any subset of symbols"
+        raise Exception(message)
+    for item in get_items():
+        if item.is_symbol():
+            if not item.prompts:
+                continue
+            if not filter_func(item):
+                continue
+            yield item
+        elif item.is_menu() or item.is_choice():
+            for i in get_symbol_subset(item, filter_func):
+                yield i
+
+
+def get_symbol_parents(item, root=None, enable_choice=False):
+    """ Return the list of the item's parents. The lasst item of the list is
+    the closest parent, the first the furthest.
+
+    :param item:          Item from which the the parent list is generated
+    :param root:          Root item stopping the search (not included in the
+                          parent list)
+    :param enable_choice: Flag enabling choices to appear in the parent list
+
+    """
+    parent = item.get_parent()
+    parents = []
+    while parent and parent != root:
+        if parent.is_menu():
+            parents.append(parent.get_title())
+        elif enable_choice and parent.is_choice():
+            parents.append(parent.prompts[0][0])
+        parent = parent.get_parent()
+    if isinstance(root, kconfiglib.Menu) or \
+            (enable_choice and isinstance(root, kconfiglib.Choice)):
+        parents.append("") # Dummy empty parrent to get a leading arrow ->
+    parents.reverse()
+    return parents
+
+
+def format_asciidoc_table(root, get_label_func, filter_func=lambda x: True,
+                          enable_choice=False, sorted=True, sub_menu=True,
+                          item_label=None):
+    """ Return the asciidoc formatted table of the items and their location.
+
+    :param root:           Root item of the item subset
+    :param get_label_func: Item's label getter function
+    :param filter_func:    Filter function to apply on the item subset
+    :param enable_choice:  Enable choices to appear as part of the item's
+                           location
+    :param sorted:         Flag to alphabetically sort the table
+    :param sub_menu:       Output the column with the sub-menu path
+
+    """
+    def _format_entry(label, parents, sub_menu):
+        """ Format an asciidoc table entry.
+
+        """
+        if sub_menu:
+            return "| {0:<40} <| {1}\n".format(label, " -> ".join(parents))
+        else:
+            return "| {0:<40}\n".format(label)
+
+    lines = []
+    for item in get_symbol_subset(root, filter_func):
+        if not item.is_symbol() or not item.prompts:
+            continue
+        loc = get_symbol_parents(item, root, enable_choice=enable_choice)
+        lines.append(_format_entry(get_label_func(item), loc, sub_menu))
+    if sorted:
+        lines.sort(key=lambda x: x.lower())
+    if hasattr(root, "get_title"):
+        loc_label = get_symbol_parents(root, None, enable_choice=enable_choice)
+        loc_label += [root.get_title(), "..."]
+    else:
+        loc_label = ["Location"]
+    if not item_label:
+        item_label = "Items"
+    table = ":halign: center\n\n"
+    if sub_menu:
+        width = "100%"
+        columns = "^1,4"
+    else:
+        width = "30%"
+        columns = "^1"
+    table = "[width=\"{0}\",cols=\"{1}\",options=\"header\"]\n".format(width, columns)
+    table += "|===================================================\n"
+    table += _format_entry(item_label, loc_label, sub_menu)
+    table += "\n" + "".join(lines) + "\n"
+    table += "|===================================================\n"
+    return table
+
+
+class Buildroot:
+    """ Buildroot configuration object.
+
+    """
+    root_config = "Config.in"
+    package_dirname = "package"
+    package_prefixes = ["BR2_PACKAGE_", "BR2_PACKAGE_HOST_"]
+    re_pkg_prefix = re.compile(r"^(" + "|".join(package_prefixes) + ").*")
+    deprecated_symbol = "BR2_DEPRECATED"
+    list_in = """\
+//
+// Automatically generated list for Buildroot manual.
+//
+
+{table}
+"""
+
+    list_info = {
+        'target-packages': {
+            'filename': "package-list",
+            'root_menu': "Package Selection for the target",
+            'filter': "_is_package",
+            'sorted': True,
+            'sub_menu': True,
+        },
+        'host-packages': {
+            'filename': "host-package-list",
+            'root_menu': "Host utilities",
+            'filter': "_is_package",
+            'sorted': True,
+            'sub_menu': False,
+        },
+        'deprecated': {
+            'filename': "deprecated-list",
+            'root_menu': None,
+            'filter': "_is_deprecated",
+            'sorted': False,
+            'sub_menu': True,
+        },
+    }
+
+    def __init__(self):
+        self.base_dir = os.environ.get("TOPDIR")
+        self.output_dir = os.environ.get("O")
+        self.package_dir = os.path.join(self.base_dir, self.package_dirname)
+        # The kconfiglib requires an environment variable named "srctree" to
+        # load the configuration, so set it.
+        os.environ.update({'srctree': self.base_dir})
+        self.config = kconfiglib.Config(os.path.join(self.base_dir,
+                                                     self.root_config))
+        self._deprecated = self.config.get_symbol(self.deprecated_symbol)
+
+        self.gen_date = datetime.datetime.utcnow()
+        self.br_version_full = os.environ.get("BR2_VERSION_FULL")
+        if self.br_version_full and self.br_version_full.endswith("-git"):
+            self.br_version_full = self.br_version_full[:-4]
+        if not self.br_version_full:
+            self.br_version_full = "undefined"
+
+    def _get_package_symbols(self, package_name):
+        """ Return a tuple containing the target and host package symbol.
+
+        """
+        symbols = re.sub("[-+.]", "_", package_name)
+        symbols = symbols.upper()
+        symbols = tuple([prefix + symbols for prefix in self.package_prefixes])
+        return symbols
+
+    def _is_deprecated(self, symbol):
+        """ Return True if the symbol is marked as deprecated, otherwise False.
+
+        """
+        return self._deprecated in symbol.get_referenced_symbols()
+
+    def _is_package(self, symbol):
+        """ Return True if the symbol is a package or a host package, otherwise
+        False.
+
+        """
+        if not self.re_pkg_prefix.match(symbol.get_name()):
+            return False
+        pkg_name = re.sub("BR2_PACKAGE_(HOST_)?(.*)", r"\2", symbol.get_name())
+
+        pattern = "^(HOST_)?" + pkg_name + "$"
+        pattern = re.sub("_", ".", pattern)
+        pattern = re.compile(pattern, re.IGNORECASE)
+        # Here, we cannot just check for the location of the Config.in because
+        # of the "virtual" package.
+        #
+        # So, to check that a symbol is a package (not a package option or
+        # anything else), we check for the existence of the package *.mk file.
+        #
+        # By the way, to actually check for a package, we should grep all *.mk
+        # files for the following regex:
+        # "\$\(eval \$\((host-)?(generic|autotools|cmake)-package\)\)"
+        #
+        # Implementation details:
+        #
+        # * The package list is generated from the *.mk file existence, the
+        #   first time this function is called. Despite the memory consumtion,
+        #   this list is stored because the execution time of this script is
+        #   noticebly shorter than re-scannig the package sub-tree for each
+        #   symbol.
+        if not hasattr(self, "_package_list"):
+            pkg_list = []
+            for _, _, files in os.walk(self.package_dir):
+                for file_ in (f for f in files if f.endswith(".mk")):
+                    pkg_list.append(re.sub(r"(.*?)\.mk", r"\1", file_))
+            setattr(self, "_package_list", pkg_list)
+        for pkg in getattr(self, "_package_list"):
+            if pattern.match(pkg):
+                return True
+        return False
+
+    def _get_symbol_label(self, symbol, mark_deprecated=True):
+        """ Return the label (a.k.a. prompt text) of the symbol.
+
+        :param symbol:          The symbol
+        :param mark_deprecated: Append a 'deprecated' to the label
+
+        """
+        label = symbol.prompts[0][0]
+        if self._is_deprecated(symbol) and mark_deprecated:
+            label += " *(deprecated)*"
+        return label
+
+    def print_list(self, list_type, enable_choice=True, enable_deprecated=True,
+                   dry_run=False, output=None):
+        """ Print the requested list. If not dry run, then the list is
+        automatically written in its own file.
+
+        :param list_type:         The list type to be generated
+        :param enable_choice:     Flag enabling choices to appear in the list
+        :param enable_deprecated: Flag enabling deprecated items to appear in
+                                  the package lists
+        :param dry_run:           Dry run (print the list in stdout instead of
+                                  writing the list file
+
+        """
+        def _get_menu(title):
+            """ Return the first symbol menu matching the given title.
+
+            """
+            menus = self.config.get_menus()
+            menu = [m for m in menus if m.get_title().lower() == title.lower()]
+            if not menu:
+                message = "No such menu: '{0}'".format(title)
+                raise Exception(message)
+            return menu[0]
+
+        list_config = self.list_info[list_type]
+        root_title = list_config.get('root_menu')
+        if root_title:
+            root_item = _get_menu(root_title)
+        else:
+            root_item = self.config
+        filter_ = getattr(self, list_config.get('filter'))
+        filter_func = lambda x: filter_(x)
+        if not enable_deprecated and list_type != "deprecated":
+            filter_func = lambda x: filter_(x) and not self._is_deprecated(x)
+        mark_depr = list_type != "deprecated"
+        get_label = lambda x: self._get_symbol_label(x, mark_depr)
+        item_label = "Features" if list_type == "deprecated" else "Packages"
+
+        table = format_asciidoc_table(root_item, get_label,
+                                      filter_func=filter_func,
+                                      enable_choice=enable_choice,
+                                      sorted=list_config.get('sorted'),
+                                      sub_menu=list_config.get('sub_menu'),
+                                      item_label=item_label)
+
+        content = self.list_in.format(table=table)
+
+        if dry_run:
+            print(content)
+            return
+
+        if not output:
+            output_dir = self.output_dir
+            if not output_dir:
+                print("Warning: Undefined output directory.")
+                print("\tUse source directory as output location.")
+                output_dir = self.base_dir
+            output = os.path.join(output_dir,
+                                  list_config.get('filename') + ".txt")
+        if not os.path.exists(os.path.dirname(output)):
+            os.makedirs(os.path.dirname(output))
+        print("Writing the {0} list in:\n\t{1}".format(list_type, output))
+        with open(output, 'w') as fout:
+            fout.write(content)
+
+
+if __name__ == '__main__':
+    list_types = ['target-packages', 'host-packages', 'deprecated']
+    parser = ArgumentParser()
+    parser.add_argument("list_type", nargs="?", choices=list_types,
+                        help="""\
+Generate the given list (generate all lists if unspecified)""")
+    parser.add_argument("-n", "--dry-run", dest="dry_run", action='store_true',
+                        help="Output the generated list to stdout")
+    parser.add_argument("--output-target", dest="output_target",
+                        help="Output target package file")
+    parser.add_argument("--output-host", dest="output_host",
+                        help="Output host package file")
+    parser.add_argument("--output-deprecated", dest="output_deprecated",
+                        help="Output deprecated file")
+    args = parser.parse_args()
+    lists = [args.list_type] if args.list_type else list_types
+    buildroot = Buildroot()
+    for list_name in lists:
+        output = getattr(args, "output_" + list_name.split("-", 1)[0])
+        buildroot.print_list(list_name, dry_run=args.dry_run, output=output)

From 88f2b4360ab4f98d16252f511eb305ca26c75189 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:07 +0000
Subject: [PATCH 4946/6849] manual: cleanup appendix.txt

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr: one more stuff->feature fixup]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/appendix.txt        | 29 ++++++++++++++++++++---------
 docs/manual/deprecated-list.txt |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index c48c3b1698..486d82fabd 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -7,15 +7,26 @@ Appendix
 include::makedev-syntax.txt[]
 include::makeusers-syntax.txt[]
 
+
+// Automatically generated lists:
+
 [[package-list]]
-Available packages
-------------------
-// docs/manaual/pkg-list.txt is generated using the following command:
-// $ git grep -E '\((autotools|cmake|generic)-package\)' package/ |  \
-//     cut -d':' -f1 | grep '\.mk$' | \
-//     sed -e 's;.*\?/\(.*\?\).mk;* \1;' | \
-//     sort > docs/manual/pkg-list.txt
-
-include::pkg-list.txt[]
+Package Selection for the target
+--------------------------------
+
+include::package-list.txt[]
+
+[[host-package-list]]
+Host utilities
+--------------
+
+include::host-package-list.txt[]
+
+[[deprecated-list]]
+Deprecated features
+-------------------
+
+The following features are marked as _deprecated_ in Buildroot due to
+their status either too old or unmaintained.
 
 include::deprecated-list.txt[]
diff --git a/docs/manual/deprecated-list.txt b/docs/manual/deprecated-list.txt
index 6dc87a4456..9c8f10531c 100644
--- a/docs/manual/deprecated-list.txt
+++ b/docs/manual/deprecated-list.txt
@@ -4,7 +4,7 @@
 Deprecated list
 ---------------
 
-The following stuff are marked as _deprecated_ in Buildroot due to
+The following features are marked as _deprecated_ in Buildroot due to
 their status either too old or unmaintained.
 
 // list generated using the followings command:

From 7be1eb447a208ae9268bb92bbf06f952a352d1df Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:08 +0000
Subject: [PATCH 4947/6849] manual: add a make target 'manual-update-lists'

The generated lists are automatically updated when building the manual.

[Peter: fix typos]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr: indentation, remove temp dir, intro to host utils]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/appendix.txt |  2 ++
 docs/manual/manual.mk    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index 486d82fabd..721c96c359 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -20,6 +20,8 @@ include::package-list.txt[]
 Host utilities
 --------------
 
+The following packages are all available in the menu +Host utilities+.
+
 include::host-package-list.txt[]
 
 [[deprecated-list]]
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index aa205341da..4906bc871f 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -1,3 +1,8 @@
+manual-update-lists:
+	$(Q)$(call MESSAGE,"Updating the manual lists...")
+	$(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(O)/docs/manual/.build \
+		$(TOPDIR)/support/scripts/gen-manual-lists.py
+
 ################################################################################
 # GENDOC -- generates the make targets needed to build a specific type of
 #           asciidoc documentation.
@@ -17,11 +22,15 @@ $(1): $(1)-$(3)
 .PHONY: $(1)-$(3)
 $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
 
-$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
-	@$(call MESSAGE,"Generating $(5) $(1)...")
-	$(Q)mkdir -p $$(@D)
+$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt \
+			   $$($(call UPPERCASE,$(1))_SOURCES) \
+			   manual-update-lists
+	$(Q)$(call MESSAGE,"Generating $(5) $(1)...")
+	$(Q)mkdir -p $$(@D)/.build
+	$(Q)rsync -au docs/$(1)/*.txt $$(@D)/.build
 	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
-	  -D $$(@D) $$<
+	        -D $$(@D) $$(@D)/.build/$(1).txt
+	-$(Q)rm -rf $$(@D)/.build
 endef
 
 ################################################################################
@@ -41,7 +50,7 @@ $(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
 clean: $(1)-clean
 $(1)-clean:
 	$(Q)$(RM) -rf $(O)/docs/$(1)
-.PHONY: $(1) $(1)-clean
+.PHONY: $(1) $(1)-clean manual-update-lists
 endef
 
 MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)

From 145508473c0e9884a9f9bb53455413ae815861ff Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:09 +0000
Subject: [PATCH 4948/6849] update gitignore

Do not track *.pyc files (from modules embedded in Buildroot source
tree).

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 685a9c27f3..bb02d9f572 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 *.orig
 *.rej
 *~
+*.pyc

From af1f14daa82867f6dd80d23ffcb4a9ca9ca00c80 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 25 Mar 2013 13:28:10 +0000
Subject: [PATCH 4949/6849] manual: do not track generated files

Since there is no need to edit the generated list, we don't need
to keep the files under git control, so remove the existing lists.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/deprecated-list.txt |  46 --
 docs/manual/pkg-list.txt        | 870 --------------------------------
 2 files changed, 916 deletions(-)
 delete mode 100644 docs/manual/deprecated-list.txt
 delete mode 100644 docs/manual/pkg-list.txt

diff --git a/docs/manual/deprecated-list.txt b/docs/manual/deprecated-list.txt
deleted file mode 100644
index 9c8f10531c..0000000000
--- a/docs/manual/deprecated-list.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- mode:doc -*- ;
-
-[[deprecated]]
-Deprecated list
----------------
-
-The following features are marked as _deprecated_ in Buildroot due to
-their status either too old or unmaintained.
-
-// list generated using the followings command:
-// $ git grep -EB4 'depends on BR2_DEPRECATED'
-// and
-// $ git grep -EB4 'depends on BR2_DEPRECATED' | \
-//     grep -Eo '(:|-).*?(config|comment) BR2_.*'
-//
-// Need manual checks and sorting.
-
-* Packages:
-
-** +busybox+ 1.18.x
-** +customize+
-** +lzma+
-** +microperl+
-** +netkitbase+
-** +netkittelnet+
-** +pkg-config+
-** +squashfs3+
-** +ttcp+
-
-* Toolchain:
-
-** +gdb+ 6.8
-** +gdb+ 7.0.1
-** +gdb+ 7.1
-** +kernel headers+ 2.6.37
-** +kernel headers+ 2.6.38
-** +kernel headers+ 2.6.39
-
-* Bootloaders:
-
-** +u-boot+ 2011-06
-** +u-boot+ 2011-09
-
-* Output images:
-
-** squashfs3 image
diff --git a/docs/manual/pkg-list.txt b/docs/manual/pkg-list.txt
deleted file mode 100644
index 5d9b54fd14..0000000000
--- a/docs/manual/pkg-list.txt
+++ /dev/null
@@ -1,870 +0,0 @@
-* acl
-* acpid
-* alsa-lib
-* alsamixergui
-* alsa-utils
-* apr
-* apr-util
-* argp-standalone
-* argus
-* arptables
-* at
-* atk
-* attr
-* audiofile
-* aumix
-* autoconf
-* automake
-* avahi
-* axel
-* bash
-* beecrypt
-* bellagio
-* berkeleydb
-* bind
-* binutils
-* bison
-* blackbox
-* bluez_utils
-* bmon
-* boa
-* bonnie
-* boost
-* bootutils
-* bridge-utils
-* bsdiff
-* busybox
-* bwm-ng
-* bzip2
-* cairo
-* can-utils
-* ccache
-* ccid
-* cdrkit
-* cgilua
-* cifs-utils
-* cjson
-* cloop
-* cmake
-* collectd
-* connman
-* conntrack-tools
-* copas
-* coreutils
-* coxpcall
-* cpanminus
-* cpuload
-* cramfs
-* ctorrent
-* cups
-* cvs
-* dash
-* dbus
-* dbus-glib
-* dbus-python
-* devmem2
-* dhcp
-* dhcpdump
-* dhrystone
-* dialog
-* diffutils
-* directfb
-* directfb-examples
-* distcc
-* divine
-* dmalloc
-* dmidecode
-* dmraid
-* dnsmasq
-* docker
-* doom-wad
-* dosfstools
-* dropbear
-* dsp-tools
-* dstat
-* e2fsprogs
-* ebtables
-* ed
-* eeprog
-* empty
-* enchant
-* erlang
-* ethtool
-* evtest
-* expat
-* expedite
-* explorercanvas
-* ezxml
-* faad2
-* fbdump
-* fbgrab
-* fbset
-* fbterm
-* fb-test-app
-* fbv
-* fconfig
-* feh
-* ffmpeg
-* fftw
-* file
-* findutils
-* fis
-* flac
-* flashrom
-* flex
-* flot
-* fltk
-* fluxbox
-* fmtools
-* fontconfig
-* freerdp
-* freetype
-* fxload
-* gadgetfs-test
-* gamin
-* gawk
-* gdbm
-* gdisk
-* gdk-pixbuf
-* genext2fs
-* genromfs
-* gettext
-* giblib
-* glib-networking
-* gmp
-* gmpc
-* gnuchess
-* gnupg
-* gnutls
-* gob2
-* googlefontdirectory
-* gperf
-* gpsd
-* gqview
-* grantlee
-* grep
-* gsl
-* gst-dsp
-* gst-ffmpeg
-* gst-omapfb
-* gst-plugins-bad
-* gst-plugins-base
-* gst-plugins-good
-* gst-plugins-ugly
-* gstreamer
-* gtk2-engines
-* gtk2-theme-hicolor
-* gtkperf
-* gvfs
-* gzip
-* haserl
-* hdparm
-* heirloom-mailx
-* hiawatha
-* hostapd
-* htop
-* hwdata
-* i2c-tools
-* icu
-* ifplugd
-* igh-ethercat
-* imagemagick
-* imlib2
-* inadyn
-* inotify-tools
-* input-event-daemon
-* input-tools
-* intltool
-* iostat
-* iperf
-* ipkg
-* iproute2
-* ipsec-tools
-* ipset
-* iptables
-* irda-utils
-* iw
-* jpeg
-* jquery
-* jquery-sparkline
-* jquery-validation
-* jsmin
-* json-c
-* kbd
-* kexec
-* kismet
-* kmod
-* lame
-* latencytop
-* lcdapi
-* lcdproc
-* leafpad
-* less
-* libaio
-* libao
-* libarchive
-* libargtable2
-* libart
-* libatomic_ops
-* libcap
-* libcap-ng
-* libcdaudio
-* libcgi
-* libcgicc
-* libconfig
-* libconfuse
-* libcue
-* libcuefile
-* libcurl
-* libdaemon
-* libdmtx
-* libdnet
-* libdrm
-* libdvdnav
-* libdvdread
-* libecore
-* libedbus
-* libedje
-* libeet
-* libefreet
-* libeina
-* libelementary
-* libelf
-* libembryo
-* liberation
-* libesmtp
-* libethumb
-* libev
-* libevas
-* libevent
-* libexif
-* libeXosip2
-* libfcgi
-* libffi
-* libfreefare
-* libftdi
-* libfuse
-* libgail
-* libgcrypt
-* libgeotiff
-* libglade
-* libglib2
-* libgpg-error
-* libgtk2
-* libhid
-* libical
-* libiconv
-* libid3tag
-* libidn
-* libiqrf
-* liblo
-* liblockfile
-* liblog4c-localtime
-* libmad
-* libmbus
-* libmicrohttpd
-* libmms
-* libmnl
-* libmodbus
-* libmpd
-* libmpeg2
-* libnetfilter-acct
-* libnetfilter-conntrack
-* libnetfilter-cthelper
-* libnetfilter-cttimeout
-* libnetfilter-log
-* libnetfilter-queue
-* libnfc
-* libnfc-llcp
-* libnfnetlink
-* libnl
-* libnspr
-* libnss
-* liboauth
-* libogg
-* liboping
-* libosip2
-* libpcap
-* libplayer
-* libpng
-* libraw
-* libraw1394
-* libreplaygain
-* libroxml
-* librsvg
-* librsync
-* libsamplerate
-* libsexy
-* libsigc
-* libsndfile
-* libsoup
-* libsvgtiny
-* libsysfs
-* libtheora
-* libtirpc
-* libtool
-* libtorrent
-* libtpl
-* libungif
-* libupnp
-* liburcu
-* libusb
-* libusb-compat
-* libv4l
-* libvncserver
-* libvorbis
-* libxcb
-* libxml2
-* libxml-parser-perl
-* libxslt
-* libyaml
-* lighttpd
-* links
-* linphone
-* linux-firmware
-* linux-fusion
-* linux-pam
-* lite
-* live555
-* lmbench
-* lm-sensors
-* lockfile-progs
-* logrotate
-* logsurfer
-* lrzsz
-* lshw
-* lsof
-* lsuio
-* ltp-testsuite
-* ltrace
-* lttng-babeltrace
-* lttng-libust
-* lttng-modules
-* lttng-tools
-* lua
-* luacjson
-* luaexpat
-* luafilesystem
-* luajit
-* luasocket
-* lvm2
-* lzma
-* lzo
-* lzop
-* m4
-* macchanger
-* madplay
-* make
-* makedevs
-* matchbox-common
-* matchbox-desktop
-* matchbox-fakekey
-* matchbox-keyboard
-* matchbox-lib
-* matchbox-panel
-* matchbox-startup-monitor
-* matchbox-wm
-* mcookie
-* mdadm
-* mediastreamer
-* memstat
-* memtester
-* mesa3d
-* metacity
-* microperl
-* midori
-* mii-diag
-* minicom
-* mobile_broadband_provider_info
-* module-init-tools
-* monit
-* mpc
-* mpd
-* mpfr
-* mpg123
-* mplayer
-* mrouted
-* msmtp
-* mtd
-* mtdev
-* mtdev2tuio
-* musepack
-* mutt
-* mxml
-* mysql_client
-* nano
-* nanocom
-* nasm
-* nbd
-* ncftp
-* ncurses
-* ndisc6
-* neon
-* netatalk
-* netcat
-* netkitbase
-* netkittelnet
-* netperf
-* netplug
-* netsnmp
-* netstat-nat
-* network-manager
-* newt
-* nfacct
-* nfs-utils
-* ngircd
-* ngrep
-* noip
-* nss-mdns
-* ntfs-3g
-* ntp
-* nuttcp
-* ocf-linux
-* ofono
-* olsr
-* open2300
-* opencv
-* openntpd
-* openocd
-* openssh
-* openssl
-* openswan
-* openvpn
-* opkg
-* oprofile
-* opus
-* opus-tools
-* orc
-* ortp
-* owl-linux
-* pango
-* parted
-* patch
-* pciutils
-* pcmanfm
-* pcre
-* pcsc-lite
-* perl
-* php
-* picocom
-* pixman
-* pkgconf
-* pkg-config
-* poco
-* polarssl
-* popt
-* portaudio
-* portmap
-* pppd
-* pptp-linux
-* prboom
-* procps
-* proftpd
-* protobuf
-* psmisc
-* pthread-stubs
-* pulseaudio
-* pv
-* python
-* python3
-* python-dpkt
-* python-id3
-* python-mad
-* python-meld3
-* python-netifaces
-* python-nfc
-* python-protobuf
-* python-pygame
-* python-serial
-* python-setuptools
-* qextserialport
-* qt
-* qtuio
-* quagga
-* quota
-* radvd
-* ramspeed
-* rdesktop
-* read-edid
-* readline
-* rings
-* rng-tools
-* rpcbind
-* rpm
-* rp-pppoe
-* rrdtool
-* rsh-redone
-* rsync
-* rsyslog
-* rtai
-* rtorrent
-* rt-tests
-* rubix
-* ruby
-* samba
-* sane-backends
-* sawman
-* schifra
-* sconeserver
-* screen
-* sdl
-* sdl_gfx
-* sdl_image
-* sdl_mixer
-* sdl_net
-* sdl_sound
-* sdl_ttf
-* sdparm
-* sed
-* ser2net
-* setserial
-* shared-mime-info
-* slang
-* smartmontools
-* socat
-* socketcand
-* sound-theme-borealis
-* sound-theme-freedesktop
-* spawn-fcgi
-* speex
-* sqlcipher
-* sqlite
-* squashfs
-* squashfs3
-* squid
-* sredird
-* sshfs
-* sstrip
-* startup-notification
-* statserial
-* strace
-* stress
-* stunnel
-* sudo
-* supervisor
-* sylpheed
-* synergy
-* sysklogd
-* sysprof
-* sysstat
-* systemd
-* sysvinit
-* taglib
-* tar
-* tcl
-* tcpdump
-* tcpreplay
-* tftpd
-* thttpd
-* tidsp-binaries
-* tiff
-* time
-* tinyhttpd
-* ti-utils
-* tn5250
-* torsmo
-* transmission
-* tremor
-* tslib
-* ttcp
-* uboot-tools
-* udev
-* udpcast
-* uemacs
-* ulogd
-* unionfs
-* usb_modeswitch
-* usb_modeswitch_data
-* usbmount
-* usbutils
-* ushare
-* util-linux
-* vala
-* valgrind
-* vim
-* vorbis-tools
-* vpnc
-* vsftpd
-* vtun
-* wavpack
-* webkit
-* webrtc-audio-processing
-* wget
-* whetstone
-* which
-* wipe
-* wireless_tools
-* wpa_supplicant
-* wsapi
-* x11vnc
-* xapp_appres
-* xapp_bdftopcf
-* xapp_beforelight
-* xapp_bitmap
-* xapp_editres
-* xapp_fonttosfnt
-* xapp_fslsfonts
-* xapp_fstobdf
-* xapp_iceauth
-* xapp_ico
-* xapp_listres
-* xapp_luit
-* xapp_mkfontdir
-* xapp_mkfontscale
-* xapp_oclock
-* xapp_rgb
-* xapp_rstart
-* xapp_scripts
-* xapp_sessreg
-* xapp_setxkbmap
-* xapp_showfont
-* xapp_smproxy
-* xapp_twm
-* xapp_viewres
-* xapp_x11perf
-* xapp_xauth
-* xapp_xbacklight
-* xapp_xbiff
-* xapp_xcalc
-* xapp_xclipboard
-* xapp_xclock
-* xapp_xcmsdb
-* xapp_xcursorgen
-* xapp_xdbedizzy
-* xapp_xditview
-* xapp_xdm
-* xapp_xdpyinfo
-* xapp_xdriinfo
-* xapp_xedit
-* xapp_xev
-* xapp_xeyes
-* xapp_xf86dga
-* xapp_xfd
-* xapp_xfontsel
-* xapp_xfs
-* xapp_xfsinfo
-* xapp_xgamma
-* xapp_xgc
-* xapp_xhost
-* xapp_xinit
-* xapp_xinput
-* xapp_xinput-calibrator
-* xapp_xkbcomp
-* xapp_xkbevd
-* xapp_xkbprint
-* xapp_xkbutils
-* xapp_xkill
-* xapp_xload
-* xapp_xlogo
-* xapp_xlsatoms
-* xapp_xlsclients
-* xapp_xlsfonts
-* xapp_xmag
-* xapp_xman
-* xapp_xmessage
-* xapp_xmh
-* xapp_xmodmap
-* xapp_xmore
-* xapp_xplsprinters
-* xapp_xpr
-* xapp_xprehashprinterlist
-* xapp_xprop
-* xapp_xrandr
-* xapp_xrdb
-* xapp_xrefresh
-* xapp_xset
-* xapp_xsetmode
-* xapp_xsetpointer
-* xapp_xsetroot
-* xapp_xsm
-* xapp_xstdcmap
-* xapp_xvidtune
-* xapp_xvinfo
-* xapp_xwd
-* xapp_xwininfo
-* xapp_xwud
-* xavante
-* xcb-proto
-* xcb-util
-* xdata_xbitmaps
-* xdata_xcursor-themes
-* xdriver_xf86-input-acecad
-* xdriver_xf86-input-aiptek
-* xdriver_xf86-input-evdev
-* xdriver_xf86-input-joystick
-* xdriver_xf86-input-keyboard
-* xdriver_xf86-input-mouse
-* xdriver_xf86-input-synaptics
-* xdriver_xf86-input-tslib
-* xdriver_xf86-input-vmmouse
-* xdriver_xf86-input-void
-* xdriver_xf86-video-apm
-* xdriver_xf86-video-ark
-* xdriver_xf86-video-ast
-* xdriver_xf86-video-ati
-* xdriver_xf86-video-chips
-* xdriver_xf86-video-cirrus
-* xdriver_xf86-video-dummy
-* xdriver_xf86-video-fbdev
-* xdriver_xf86-video-geode
-* xdriver_xf86-video-glide
-* xdriver_xf86-video-glint
-* xdriver_xf86-video-i128
-* xdriver_xf86-video-i740
-* xdriver_xf86-video-intel
-* xdriver_xf86-video-mach64
-* xdriver_xf86-video-mga
-* xdriver_xf86-video-neomagic
-* xdriver_xf86-video-newport
-* xdriver_xf86-video-nv
-* xdriver_xf86-video-openchrome
-* xdriver_xf86-video-r128
-* xdriver_xf86-video-rendition
-* xdriver_xf86-video-s3
-* xdriver_xf86-video-s3virge
-* xdriver_xf86-video-savage
-* xdriver_xf86-video-siliconmotion
-* xdriver_xf86-video-sis
-* xdriver_xf86-video-sisusb
-* xdriver_xf86-video-suncg14
-* xdriver_xf86-video-suncg3
-* xdriver_xf86-video-suncg6
-* xdriver_xf86-video-sunffb
-* xdriver_xf86-video-sunleo
-* xdriver_xf86-video-suntcx
-* xdriver_xf86-video-tdfx
-* xdriver_xf86-video-tga
-* xdriver_xf86-video-trident
-* xdriver_xf86-video-tseng
-* xdriver_xf86-video-v4l
-* xdriver_xf86-video-vesa
-* xdriver_xf86-video-vmware
-* xdriver_xf86-video-voodoo
-* xdriver_xf86-video-wsfb
-* xdriver_xf86-video-xgi
-* xdriver_xf86-video-xgixp
-* xenomai
-* xerces
-* xfont_encodings
-* xfont_font-adobe-100dpi
-* xfont_font-adobe-75dpi
-* xfont_font-adobe-utopia-100dpi
-* xfont_font-adobe-utopia-75dpi
-* xfont_font-adobe-utopia-type1
-* xfont_font-alias
-* xfont_font-arabic-misc
-* xfont_font-bh-100dpi
-* xfont_font-bh-75dpi
-* xfont_font-bh-lucidatypewriter-100dpi
-* xfont_font-bh-lucidatypewriter-75dpi
-* xfont_font-bh-ttf
-* xfont_font-bh-type1
-* xfont_font-bitstream-100dpi
-* xfont_font-bitstream-75dpi
-* xfont_font-bitstream-speedo
-* xfont_font-bitstream-type1
-* xfont_font-cronyx-cyrillic
-* xfont_font-cursor-misc
-* xfont_font-daewoo-misc
-* xfont_font-dec-misc
-* xfont_font-ibm-type1
-* xfont_font-isas-misc
-* xfont_font-jis-misc
-* xfont_font-micro-misc
-* xfont_font-misc-cyrillic
-* xfont_font-misc-ethiopic
-* xfont_font-misc-meltho
-* xfont_font-misc-misc
-* xfont_font-mutt-misc
-* xfont_font-schumacher-misc
-* xfont_font-screen-cyrillic
-* xfont_font-sony-misc
-* xfont_font-sun-misc
-* xfont_font-util
-* xfont_font-winitzki-cyrillic
-* xfont_font-xfree86-type1
-* xfsprogs
-* xinetd
-* xkeyboard-config
-* xl2tp
-* xlib_libdmx
-* xlib_libfontenc
-* xlib_libFS
-* xlib_libICE
-* xlib_liboldX
-* xlib_libpciaccess
-* xlib_libSM
-* xlib_libX11
-* xlib_libXau
-* xlib_libXaw
-* xlib_libXcomposite
-* xlib_libXcursor
-* xlib_libXdamage
-* xlib_libXdmcp
-* xlib_libXext
-* xlib_libXfixes
-* xlib_libXfont
-* xlib_libXfontcache
-* xlib_libXft
-* xlib_libXi
-* xlib_libXinerama
-* xlib_libxkbfile
-* xlib_libxkbui
-* xlib_libXmu
-* xlib_libXp
-* xlib_libXpm
-* xlib_libXprintAppUtil
-* xlib_libXprintUtil
-* xlib_libXrandr
-* xlib_libXrender
-* xlib_libXres
-* xlib_libXScrnSaver
-* xlib_libXt
-* xlib_libXtst
-* xlib_libXv
-* xlib_libXvMC
-* xlib_libXxf86dga
-* xlib_libXxf86vm
-* xlib_xtrans
-* xmlstarlet
-* xproto_applewmproto
-* xproto_bigreqsproto
-* xproto_compositeproto
-* xproto_damageproto
-* xproto_dmxproto
-* xproto_dri2proto
-* xproto_fixesproto
-* xproto_fontcacheproto
-* xproto_fontsproto
-* xproto_glproto
-* xproto_inputproto
-* xproto_kbproto
-* xproto_printproto
-* xproto_randrproto
-* xproto_recordproto
-* xproto_renderproto
-* xproto_resourceproto
-* xproto_scrnsaverproto
-* xproto_videoproto
-* xproto_windowswmproto
-* xproto_xcmiscproto
-* xproto_xextproto
-* xproto_xf86bigfontproto
-* xproto_xf86dgaproto
-* xproto_xf86driproto
-* xproto_xf86rushproto
-* xproto_xf86vidmodeproto
-* xproto_xineramaproto
-* xproto_xproto
-* xserver_xorg-server
-* xstroke
-* xterm
-* xutil_makedepend
-* xutil_util-macros
-* xvkbd
-* xz
-* yajl
-* yasm
-* zeromq
-* zlib
-* zxing

From 58a73c6ab55d9eadaecfda3ea0ed23d07bb7fca7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 3 May 2013 10:11:05 +0000
Subject: [PATCH 4950/6849] jquery-keyboard: new package

Add the jquery-keyboard package based on Simon Dawson's patch with a
newer version and improvements (license, select jquery, install
layouts).

[Peter: don't use install -D when destination is a directory]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/jquery-keyboard/Config.in          |  7 ++++++
 package/jquery-keyboard/jquery-keyboard.mk | 25 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 package/jquery-keyboard/Config.in
 create mode 100644 package/jquery-keyboard/jquery-keyboard.mk

diff --git a/package/Config.in b/package/Config.in
index 78c394f0ff..3537de185f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -484,6 +484,7 @@ menu "Javascript"
 source "package/explorercanvas/Config.in"
 source "package/flot/Config.in"
 source "package/jquery/Config.in"
+source "package/jquery-keyboard/Config.in"
 source "package/jquery-sparkline/Config.in"
 source "package/jquery-validation/Config.in"
 source "package/jsmin/Config.in"
diff --git a/package/jquery-keyboard/Config.in b/package/jquery-keyboard/Config.in
new file mode 100644
index 0000000000..ee976627e9
--- /dev/null
+++ b/package/jquery-keyboard/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_JQUERY_KEYBOARD
+	bool "jQuery keyboard"
+	select BR2_PACKAGE_JQUERY
+	help
+	  Virtual Keyboard using jQuery UI
+
+	  https://github.com/Mottie/Keyboard
diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
new file mode 100644
index 0000000000..22d1a00980
--- /dev/null
+++ b/package/jquery-keyboard/jquery-keyboard.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# jquery-keyboard
+#
+#############################################################
+
+JQUERY_KEYBOARD_VERSION = 1.17.4
+JQUERY_KEYBOARD_SITE = \
+	http://github.com/Mottie/Keyboard/tarball/v$(JQUERY_KEYBOARD_VERSION)
+JQUERY_KEYBOARD_LICENSE = MIT WTFPL
+JQUERY_KEYBOARD_LICENSE_FILES = README.markdown
+
+define JQUERY_KEYBOARD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/css/keyboard.css \
+		$(TARGET_DIR)/var/www/css/keyboard.css
+	$(INSTALL) -m 0644 $(@D)/js/jquery.keyboard*.js \
+		$(TARGET_DIR)/var/www
+	$(INSTALL) -m 0644 -D $(@D)/js/jquery.mousewheel.js \
+		$(TARGET_DIR)/var/www/jquery.mousewheel.js
+	$(INSTALL) -m 0755 -d $(TARGET_DIR)/var/www/layouts
+	$(INSTALL) -m 0644 $(@D)/layouts/*.js \
+		$(TARGET_DIR)/var/www/layouts
+endef
+
+$(eval $(call generic-package))

From ae47deffa16d5a78e790696a189bfb023c3754cb Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 3 May 2013 07:49:02 +0000
Subject: [PATCH 4951/6849] inotify-tools: install to staging

inotify-tools includes a shared library, which should be installed in the
staging directory

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/inotify-tools/inotify-tools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index deb8a8c0be..a5668a3d4e 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -3,9 +3,11 @@
 # inotify-utils
 #
 #############################################################
+
 INOTIFY_TOOLS_VERSION = 3.14
 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
 INOTIFY_TOOLS_LICENSE = GPL
 INOTIFY_TOOLS_LICENSE_FILES = COPYING
+INOTIFY_TOOLS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From e5627bd798a2291f36326558d7cbe1e8f6bb01e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 4 May 2013 02:06:45 +0000
Subject: [PATCH 4952/6849] samba: add option for built-in debug messages

This option allows users to specify the maximum level for compiled-in
debug messages with -1 being none.
In a typical scenario of nmbd+smbd+smbpasswd this can save a full
megabyte of target space.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/Config.in | 8 ++++++++
 package/samba/samba.mk  | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index fedbccdd63..0ab67edbbb 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -13,6 +13,14 @@ config BR2_PACKAGE_SAMBA
 
 if BR2_PACKAGE_SAMBA
 
+config BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL
+	int "Maximum level of compiled-in debug messages"
+	range -1 10000
+	default -1
+	help
+	  Define the level of compiled-in debug messages.
+	  This allows for big space savings, -1 being the lowest (none).
+
 config BR2_PACKAGE_SAMBA_LIBICONV
 	bool "extended encodings (libiconv)"
 	depends on !BR2_ENABLE_LOCALE
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 3a004e1d52..683c7b2e0f 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -158,6 +158,9 @@ else
 SAMBA_CONF_OPT += --with-libiconv=""
 endif
 
+# Compiled debug messages by level
+SAMBA_CONF_OPT += CFLAGS="$(TARGET_CFLAGS) -DMAX_DEBUG_LEVEL=$(BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL)"
+
 ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION

From d26b5a26b9cb8179df76c930130a165f4cc188b6 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Fri, 3 May 2013 02:35:22 +0000
Subject: [PATCH 4953/6849] add daemon mode support to pulseaudio
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pulseaudio documentation recommends not using the daemon mode unless you
are on a headless system, but since that is the common case for a
buildroot installation, install the related user and groups

[Peter: fix typos, ifeq check, unconditionally install into target]
Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/Config.in     |  8 +++++
 package/multimedia/pulseaudio/S50pulseaudio | 39 +++++++++++++++++++++
 package/multimedia/pulseaudio/pulseaudio.mk | 12 +++++++
 3 files changed, 59 insertions(+)
 create mode 100755 package/multimedia/pulseaudio/S50pulseaudio

diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index 03c26137e5..9a6911e0ed 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -19,5 +19,13 @@ config BR2_PACKAGE_PULSEAUDIO
 
 	  http://pulseaudio.org
 
+config BR2_PACKAGE_PULSEAUDIO_DAEMON
+	bool "start as a system daemon"
+	depends on BR2_PACKAGE_PULSEAUDIO
+	help
+	  PulseAudio can be started as a system daemon. This is not the
+	  recommended way of using PulseAudio unless you are building a
+	  headless system.
+
 comment "pulseaudio requires a toolchain with WCHAR, LARGEFILE and threads support"
 	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/multimedia/pulseaudio/S50pulseaudio b/package/multimedia/pulseaudio/S50pulseaudio
new file mode 100755
index 0000000000..4c6877eb16
--- /dev/null
+++ b/package/multimedia/pulseaudio/S50pulseaudio
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Starts pulseaudio.
+#
+
+
+start() {
+	echo -n "Starting pulseaudio: "
+	umask 077
+	/usr/bin/pulseaudio --system --daemonize
+	echo "OK"
+}
+stop() {
+	echo -n "Stopping pulseaudio: "
+	pulseaudio --kill
+	echo "OK"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
+
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index e78eb42ba6..16df855557 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -84,4 +84,16 @@ endef
 PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA
 endif
 
+ifeq ($(BR2_PACKAGE_PULSEAUDIO_DAEMON),y)
+define PULSEAUDIO_USERS
+	pulse -1 pulse -1 * /var/run/pulse - audio,pulse-access
+endef
+
+define PULSEAUDIO_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/multimedia/pulseaudio/S50pulseaudio \
+		$(TARGET_DIR)/etc/init.d/S50pulseaudio
+endef
+
+endif
+
 $(eval $(autotools-package))

From 93e5c7d9f2964dcee6acca94e17075f042ba1751 Mon Sep 17 00:00:00 2001
From: Reuben Dowle <reuben.dowle@4rf.com>
Date: Wed, 13 Feb 2013 15:12:02 +0000
Subject: [PATCH 4954/6849] dmalloc: Stop libdmalloc*.so files from being
 deleted from staging directory

Fix libdmalloc*.so files being deleted from the staging directory as the
package is installed into the target.

Signed-off-by: Reuben Dowle <reuben.dowle at 4rf.com>
---
 package/dmalloc/dmalloc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 86238291ca..fd4e976809 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -47,7 +47,7 @@ define DMALLOC_INSTALL_STAGING_CMDS
 endef
 
 define DMALLOC_INSTALL_TARGET_CMDS
-	mv $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/usr/bin/dmalloc
 endef
 

From 14f48861b5cf5c45d81e4dd1130267e8ec86e5f3 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:23 +0000
Subject: [PATCH 4955/6849] arc: Add ARC and ARC BE architecture

Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs that
can be used from deeply embedded to high performance host applications.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in     | 18 ++++++++++++++++++
 arch/Config.in.arc | 14 ++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 arch/Config.in.arc

diff --git a/arch/Config.in b/arch/Config.in
index 795f24f467..2006f1e0de 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -7,6 +7,20 @@ choice
 	help
 	  Select the target architecture family to build for.
 
+config BR2_arcle
+	bool "ARC (little endian)"
+	help
+	  Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs
+	  that can be used from deeply embedded to high performance host
+	  applications. Little endian.
+
+config BR2_arceb
+	bool "ARC (big endian)"
+	help
+	  Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs
+	  that can be used from deeply embedded to high performance host
+	  applications. Big endian.
+
 config BR2_arm
 	bool "ARM (little endian)"
 	help
@@ -175,6 +189,10 @@ config BR2_GCC_TARGET_ABI
 config BR2_GCC_TARGET_CPU
 	string
 
+if BR2_arcle || BR2_arceb
+source "arch/Config.in.arc"
+endif
+
 if BR2_arm || BR2_armeb
 source "arch/Config.in.arm"
 endif
diff --git a/arch/Config.in.arc b/arch/Config.in.arc
new file mode 100644
index 0000000000..60b59f0319
--- /dev/null
+++ b/arch/Config.in.arc
@@ -0,0 +1,14 @@
+config BR2_ARCH
+	default "arc"	if BR2_arcle
+	default "arceb"	if BR2_arceb
+
+config BR2_arc
+	bool
+	default y if BR2_arcle || BR2_arceb
+
+config BR2_ENDIAN
+	default "LITTLE" if BR2_arcle
+	default "BIG"	 if BR2_arceb
+
+config BR2_GCC_TARGET_CPU
+	default "arc700"

From 1445b7fd2e46db5d39ad5e2f5cc262574399f5f3 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:24 +0000
Subject: [PATCH 4956/6849] arc: Add option for ARC-specific download site

As ARC support is not yet in all upstream packages, a different location is
required to download the packages from. This adds an option to specify a
site for ARC-specific versions of packages such as binutils, gcc.

When ARC support has been upstreamed for all packages, this option can be
removed again.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/Config.in.arc b/arch/Config.in.arc
index 60b59f0319..9f68b46965 100644
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -12,3 +12,7 @@ config BR2_ENDIAN
 
 config BR2_GCC_TARGET_CPU
 	default "arc700"
+
+config BR2_ARC_SITE
+	string
+	default "http://www.synopsys.com/apps/arc-developer/"

From d81457eaed604b21dcfb85d167683f69cfb47c53 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:25 +0000
Subject: [PATCH 4957/6849] arc: Add support for ARC-specific binutils

ARC support is not upstream yet.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../2.19-arc/add-empty-info-files.patch       | 72 +++++++++++++++++++
 package/binutils/Config.in.host               |  2 +
 package/binutils/binutils.mk                  |  7 ++
 3 files changed, 81 insertions(+)
 create mode 100644 package/binutils/2.19-arc/add-empty-info-files.patch

diff --git a/package/binutils/2.19-arc/add-empty-info-files.patch b/package/binutils/2.19-arc/add-empty-info-files.patch
new file mode 100644
index 0000000000..90de429653
--- /dev/null
+++ b/package/binutils/2.19-arc/add-empty-info-files.patch
@@ -0,0 +1,72 @@
+binutils: add empty info files to remove makeinfo dependency
+
+Signed-off-by: Mischa jonker <mjonker@synopsys.com>
+---
+ bfd/doc/bfd.info           |    1 +
+ binutils/doc/binutils.info |    1 +
+ etc/configure.info         |    1 +
+ etc/standards.info         |    1 +
+ gas/doc/as.info            |    1 +
+ gprof/gprof.info           |    1 +
+ ld/ld.info                 |    1 +
+ 7 files changed, 7 insertions(+), 0 deletions(-)
+ create mode 100644 bfd/doc/bfd.info
+ create mode 100644 binutils/doc/binutils.info
+ create mode 100644 etc/configure.info
+ create mode 100644 etc/standards.info
+ create mode 100644 gas/doc/as.info
+ create mode 100644 gprof/gprof.info
+ create mode 100644 ld/ld.info
+
+diff --git a/bfd/doc/bfd.info b/bfd/doc/bfd.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/bfd/doc/bfd.info
+@@ -0,0 +1 @@
++
+diff --git a/binutils/doc/binutils.info b/binutils/doc/binutils.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/binutils/doc/binutils.info
+@@ -0,0 +1 @@
++
+diff --git a/etc/configure.info b/etc/configure.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/etc/configure.info
+@@ -0,0 +1 @@
++
+diff --git a/etc/standards.info b/etc/standards.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/etc/standards.info
+@@ -0,0 +1 @@
++
+diff --git a/gas/doc/as.info b/gas/doc/as.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/gas/doc/as.info
+@@ -0,0 +1 @@
++
+diff --git a/gprof/gprof.info b/gprof/gprof.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/gprof/gprof.info
+@@ -0,0 +1 @@
++
+diff --git a/ld/ld.info b/ld/ld.info
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/ld/ld.info
+@@ -0,0 +1 @@
++
+-- 
+1.7.0.4
+
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index a61a503533..d9bab441f0 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -2,6 +2,7 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
+	depends on !BR2_arc
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
 	default BR2_BINUTILS_VERSION_2_21_1 if (!BR2_UCLIBC_VERSION_0_9_31)
 	default BR2_BINUTILS_VERSION_2_21
@@ -41,6 +42,7 @@ endchoice
 config BR2_BINUTILS_VERSION
 	string
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
+	default "2.19-arc"	if BR2_arc
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 92e0a74836..081be6ad4b 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -26,6 +26,9 @@ BINUTILS_SITE = $(BR2_GNU_MIRROR)/binutils
 ifeq ($(ARCH),avr32)
 BINUTILS_SITE = ftp://www.at91.com/pub/buildroot
 endif
+ifeq ($(BR2_arc),y)
+BINUTILS_SITE = $(BR2_ARC_SITE)
+endif
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
 BINUTILS_INSTALL_STAGING = YES
 BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
@@ -52,7 +55,11 @@ HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			--with-sysroot=$(STAGING_DIR) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
+ifeq ($(BINUTILS_VERSION),2.19-arc)
+HOST_BINUTILS_DEPENDENCIES = host-flex host-bison
+else
 HOST_BINUTILS_DEPENDENCIES =
+endif
 
 # We just want libbfd and libiberty, not the full-blown binutils in staging
 define BINUTILS_INSTALL_STAGING_CMDS

From cb232b31ffc75b37465995ae9223fad09bda2489 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:26 +0000
Subject: [PATCH 4958/6849] arc: disable Crosstool-NG for ARC

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index fa78cf4da6..e6a3b259d8 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -22,7 +22,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
-	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa
+	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa && !BR2_arc
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	help
 	  Say 'y' if you want to generate the toolchain with crosstool-NG

From 1ef17030d0592007c6959ce91cfc2cd5080f7bb6 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:27 +0000
Subject: [PATCH 4959/6849] arc: add gcc for ARC

ARC needs a specific GCC for now, while we wait for ARC support to get
upstreamed.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../4.4.7-arc/fix_branch_out_of_range.patch   | 30 +++++++++++++++++++
 toolchain/gcc/Config.in                       | 22 +++++++++-----
 toolchain/gcc/gcc-uclibc-4.x.mk               |  2 ++
 3 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 toolchain/gcc/4.4.7-arc/fix_branch_out_of_range.patch

diff --git a/toolchain/gcc/4.4.7-arc/fix_branch_out_of_range.patch b/toolchain/gcc/4.4.7-arc/fix_branch_out_of_range.patch
new file mode 100644
index 0000000000..e39b1cc2db
--- /dev/null
+++ b/toolchain/gcc/4.4.7-arc/fix_branch_out_of_range.patch
@@ -0,0 +1,30 @@
+arc: Fix operand-out-of-range errors
+
+brcc_s instructions can generate operand-out-of-range errors. While a
+better solution is being discussed by the compiler team, this workaround
+ensures that the chances of running into this issue are low.
+
+Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
+
+diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
+index ff602c0..b3ca4c4 100644
+--- a/gcc/config/arc/arc.c
++++ b/gcc/config/arc/arc.c
+@@ -6565,7 +6565,7 @@ estimate required size increase).
+ 	      rtx *ccp = &XEXP (XVECEXP (pat, 0, 1), 0);
+ 
+ 	      offset = branch_dest (insn) - INSN_ADDRESSES (INSN_UID (insn));
+-	      if ((offset >= -140 && offset < 140)
++	      if ((offset >= -120 && offset < 120)
+ 		  && rtx_equal_p (XEXP (op, 1), const0_rtx)
+  		  && compact_register_operand (XEXP (op, 0), VOIDmode)
+ 		  && equality_comparison_operator (op, VOIDmode))
+@@ -6687,7 +6687,7 @@ estimate required size increase).
+ 
+ 		  if (op0 != cmp0)
+  		    cc_clob_rtx = gen_rtx_REG (CC_ZNmode, CC_REG);
+- 		  else if ((offset >= -140 && offset < 140)
++ 		  else if ((offset >= -120 && offset < 120)
+ 			   && rtx_equal_p (op1, const0_rtx)
+ 			   && compact_register_operand (op0, VOIDmode)
+ 			   && (GET_CODE (op) == EQ
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index aae422c757..f297e73871 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -9,44 +9,49 @@ choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
+	default BR2_GCC_VERSION_4_4_7_ARC if BR2_arc
 	default BR2_GCC_VERSION_4_7_X
 	help
 	  Select the version of gcc you wish to use.
 
+	config BR2_GCC_VERSION_4_4_7_ARC
+		depends on BR2_arc
+		bool "gcc 4.4.7-arc"
+
 	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	       depends on BR2_avr32
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
 
 	config BR2_GCC_VERSION_4_7_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.7.x"
 
 	config BR2_GCC_VERSION_4_8_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.8.x"
 
 	config BR2_GCC_VERSION_SNAP
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc snapshot"
 endchoice
@@ -74,6 +79,7 @@ config BR2_GCC_VERSION
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
+	default "4.4.7-arc" if BR2_GCC_VERSION_4_4_7_ARC
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
@@ -119,6 +125,6 @@ config BR2_GCC_ENABLE_TLS
 
 config BR2_GCC_ENABLE_OPENMP
 	bool "Enable compiler OpenMP support"
-	depends on !BR2_PTHREADS_NONE && !BR2_avr32
+	depends on !BR2_PTHREADS_NONE && !BR2_avr32 && !BR2_arc
 	help
 	  Enable OpenMP support for the compiler
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index fc11ad45be..4c77c5c524 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -29,6 +29,8 @@ ifneq ($(GCC_SNAP_DATE),)
  GCC_SITE:=ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
  GCC_SITE:=ftp://www.at91.com/pub/buildroot/
+else ifeq ($(findstring arc,$(GCC_VERSION)),arc)
+ GCC_SITE:=$(BR2_ARC_SITE)
 else
  GCC_SITE:=$(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
 endif

From 5de23bf875e34fd89eff5b9472ab501c2992b6b1 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:28 +0000
Subject: [PATCH 4960/6849] arc: Add support for ARC-specific uClibc

[Peter: fix whitespace]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in              | 10 ++++++++--
 toolchain/uClibc/uClibc-snapshot.config |  2 ++
 toolchain/uClibc/uclibc.mk              |  4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index b98e2e8682..94e8169f3c 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -16,11 +16,15 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
-		depends on !(BR2_avr32 || BR2_sh || BR2_xtensa)
+		depends on !(BR2_arc || BR2_avr32 || BR2_sh || BR2_xtensa)
 
 	config BR2_UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.x"
-		depends on !BR2_xtensa
+		depends on !(BR2_arc || BR2_xtensa)
+
+	config BR2_UCLIBC_VERSION_0_9_33_ARC
+		bool "uClibc 0.9.33.x-arc"
+		depends on BR2_arc
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"
@@ -39,6 +43,7 @@ config BR2_UCLIBC_VERSION_STRING
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
 	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
+	default 0.9.33-arc	if BR2_UCLIBC_VERSION_0_9_33_ARC
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
@@ -46,6 +51,7 @@ config BR2_UCLIBC_CONFIG
 	default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31
 	default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
 	default "toolchain/uClibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
+	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_0_9_33_ARC
 	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
 	help
 	  Some people may wish to use their own modified uClibc configuration
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config
index 71fa4720e5..cb6258d83d 100644
--- a/toolchain/uClibc/uClibc-snapshot.config
+++ b/toolchain/uClibc/uClibc-snapshot.config
@@ -4,6 +4,7 @@
 # Fri Jul  9 22:31:59 2010
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
@@ -16,6 +17,7 @@
 # TARGET_i960 is not set
 # TARGET_ia64 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
 # TARGET_nios is not set
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 2249651b74..1629e7625c 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -17,6 +17,9 @@ UCLIBC_VERSION:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
 UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc
+else ifeq ($(findstring arc,$(UCLIBC_VERSION)),arc)
+UCLIBC_SITE:=$(BR2_ARC_SITE)
+UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION)
 else
 UCLIBC_SITE:=http://www.uclibc.org/downloads
 UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION)
@@ -31,6 +34,7 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
 		-e 's/-.*//' \
 		-e 's/i.86/i386/' \
 		-e 's/sparc.*/sparc/' \
+		-e 's/arc.*/arc/g' \
 		-e 's/arm.*/arm/g' \
 		-e 's/m68k.*/m68k/' \
 		-e 's/ppc/powerpc/g' \

From a6e6bf3ef63781579784f6c31f6f5d8d374e0f64 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:29 +0000
Subject: [PATCH 4961/6849] arc: Make sure that libgcc doesn't get included
 when it doesn't exist yet

For ARC, libgcc is always included, even when -nostdlib is given. This is
related to some small pieces of code that are not always generated by the
compiler; a call to libgcc is used in those cases instead.

During the initial stages of building the toolchain, this is a problem, as
libgcc does not exist yet. The ARC compiler supports -really-nostdlib to
override the default behavior.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 1629e7625c..d4f1d4cdf6 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -404,6 +404,17 @@ ifeq ($(BR2_CCACHE),y)
 $(UCLIBC_DIR)/.config: | host-ccache
 endif
 
+# For ARC, libgcc is always included, even when -nostdlib is given. This
+# is related to some small pieces of code that are not always generated
+# by the compiler; a call to libgcc is used in those cases instead.
+#
+# During the initial stages of building the toolchain, this is a problem,
+# as libgcc does not exist yet. The ARC compiler supports -really-nostdlib
+# to override the default behavior.
+ifeq ($(BR2_arc),y)
+REALLY_NOSTDLIB=-really-nostdlib
+endif
+
 $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.config
 	$(Q)$(call MESSAGE,"Installing uClibc headers")
 	$(MAKE1) -C $(UCLIBC_DIR) \
@@ -422,8 +433,8 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 		cp -pLR $(LINUX_HEADERS_DIR)/include/* \
 			$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \
 	fi
-	$(TARGET_CROSS)gcc -nostdlib -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libc.so
-	$(TARGET_CROSS)gcc -nostdlib -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libm.so
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libc.so
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libm.so
 	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/
 	touch $@
 

From 8d929f4bb43ab972db9120f8c70fede7c207b85b Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:30 +0000
Subject: [PATCH 4962/6849] toolchain/gcc: Only enable --with-float when it
 makes sense

According to gcc/config.gcc, only ARM, MIPS and SPARC have the
"--with-float" option when configuring gcc.

[Peter: sort list]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 4c77c5c524..f1803cb665 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -65,7 +65,10 @@ endif
 
 # Determine soft-float options
 ifeq ($(BR2_SOFT_FLOAT),y)
+# only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float
+ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_sparc),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
+endif
 ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm
 TARGET_SOFT_FLOAT:=-mfloat-abi=soft
 else

From ddcfc493505b5b4f5739049e0b8f5853e8cd835c Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:31 +0000
Subject: [PATCH 4963/6849] toolchain/toolchain-buildroot: Disable NPTL for ARC

NPTL is not yet supported for ARC.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 7f19b09dfe..35d6db2be6 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -97,6 +97,7 @@ choice
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32
 		depends on !BR2_xtensa
+		depends on !BR2_arc
 endchoice
 
 config BR2_PTHREAD_DEBUG

From 297e4b510ef9ea93965e2c42bc05885e18bc70aa Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:32 +0000
Subject: [PATCH 4964/6849] arc: Add arc, arcbe to gnuconfig

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/gnuconfig/config.sub | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/gnuconfig/config.sub b/support/gnuconfig/config.sub
index 8509813dd6..b2958ad319 100755
--- a/support/gnuconfig/config.sub
+++ b/support/gnuconfig/config.sub
@@ -259,7 +259,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
@@ -372,7 +372,7 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \

From 40b17f808240cb05fe251026cc7c5abdc29e3ab7 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 2 May 2013 09:51:33 +0000
Subject: [PATCH 4965/6849] kernel-headers: Add support for ARC kernel headers

Also make sure that older kernels are not selected for ARC.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                           |  1 +
 toolchain/kernel-headers/Config.in | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 5b690f0177..1692a369c4 100644
--- a/Makefile
+++ b/Makefile
@@ -238,6 +238,7 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
 
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
+	-e s/arc.*/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64/arm64/ \
 	-e s/bfin/blackfin/ \
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 6ec39c00b3..a6135e3cae 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -17,35 +17,39 @@ choice
 
 	config BR2_KERNEL_HEADERS_3_0
 		bool "Linux 3.0.x kernel headers"
+		depends on !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_1
 		bool "Linux 3.1.x kernel headers"
-		depends on BR2_DEPRECATED
+		depends on BR2_DEPRECATED && !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_2
 		bool "Linux 3.2.x kernel headers"
+		depends on !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_3
 		bool "Linux 3.3.x kernel headers"
-		depends on BR2_DEPRECATED
+		depends on BR2_DEPRECATED && !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_4
 		bool "Linux 3.4.x kernel headers"
+		depends on !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_5
 		bool "Linux 3.5.x kernel headers"
-		depends on BR2_DEPRECATED
+		depends on BR2_DEPRECATED && !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_6
 		bool "Linux 3.6.x kernel headers"
-		depends on BR2_DEPRECATED
+		depends on BR2_DEPRECATED && !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_7
 		bool "Linux 3.7.x kernel headers"
-		depends on BR2_DEPRECATED
+		depends on BR2_DEPRECATED && !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_8
 		bool "Linux 3.8.x kernel headers"
+		depends on !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_9
 		bool "Linux 3.9.x kernel headers"

From 173315537ec97713f1c83a0b0f3eaf6a987e984a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 5 May 2013 02:34:38 +0000
Subject: [PATCH 4966/6849] ethtool: bump to version 3.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index b791ca79d7..12cc5244ee 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ETHTOOL_VERSION = 3.8
+ETHTOOL_VERSION = 3.9
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
 ETHTOOL_LICENSE_FILES = COPYING

From 59c360bdae993908ec1a2fa4a8a19c173aed8427 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 5 May 2013 02:35:08 +0000
Subject: [PATCH 4967/6849] nettle: fix ARM NEON breakage

Nettle's ARM NEON optimizations use some assembly constructs that aren't
friendly with binutils < 2.21, so just disable it for external
toolchains or internal with an unsupported version.
http://autobuild.buildroot.net/results/3c6f91379f90d438b4da3dd330cf89e1dd746aaf/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nettle/nettle.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index b3d273052b..131826e7de 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -10,8 +10,8 @@ ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(B
 NETTLE_CONF_OPT += --disable-assembler
 endif
 
-# ARM NEON
-ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+# ARM NEON, requires binutils 2.21+
+ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_BINUTILS_VERSION_2_20_1),yy)
 NETTLE_CONF_OPT += --enable-arm-neon
 else
 NETTLE_CONF_OPT += --disable-arm-neon

From b51099dc91b49e4a26cc616620974d0cd0fdd97d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 5 May 2013 03:14:35 +0000
Subject: [PATCH 4968/6849] ltp-testsuite: fix build breakage with libcap

ltp-testsuite needs libcap with file attributes which in turn needs
attr.
Only libcap is checked for so if it lacks file attr support it breaks.
Disable libcap support unless it's got attr support, fixes:
http://autobuild.buildroot.net/results/b16b20963c7cb17d8e220a5baa1356372ebf85a6/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltp-testsuite/ltp-testsuite.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index caed4b3ab9..093c2c35ca 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -3,10 +3,18 @@
 # ltp-testsuite
 #
 #############################################################
+
 LTP_TESTSUITE_VERSION = 20130109
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
 LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
 LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+
 LTP_TESTSUITE_LICENSE_FILES = COPYING
 
+# Needs libcap with file attrs which needs attr, so both required
+ifeq ($(BR2_PACKAGE_LIBCAP)$(BR2_PACKAGE_ATTR),yy)
+LTP_TESTSUITE_DEPENDENCIES += libcap
+else
+LTP_TESTSUITE_CONF_ENV += ac_cv_lib_cap_cap_compare=no
+endif
+
 $(eval $(autotools-package))

From 5ee57c60ce6547fcb0750080e80b2a145cf91b09 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 5 May 2013 03:51:17 +0000
Subject: [PATCH 4969/6849] audiofile: regenerate configure to fix issues

Audiofile's shipped configure script is outdated so regenerate to fix
issues like:
http://autobuild.buildroot.net/results/659fd28b0a3fa15ecd1b32e8a08dd441465459c1/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/audiofile/audiofile.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index 51173e6066..e49106e195 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -10,6 +10,8 @@ AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 AUDIOFILE_CONF_OPT = --disable-examples --disable-docs
 AUDIOFILE_DEPENDENCIES = host-pkgconf
+# configure is outdated and has old bugs because of it
+AUDIOFILE_AUTORECONF = YES
 AUDIOFILE_LICENSE = GPLv2+ LGPLv2.1+
 AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
 

From 1ed86a07910dbd969390a23625d064256c4a694f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 5 May 2013 05:04:25 +0000
Subject: [PATCH 4970/6849] aircrack-ng: fix build failure and install path

aircrack-ng doesn't account that openssl needs zlib so fix it.
Fixes:
http://autobuild.buildroot.net/results/97f4f90a7d60a0e3ea81c77f6986f1c1bae8d575/

Also fix the install prefix since it was getting installed to /usr/local

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aircrack-ng/aircrack-ng.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index 48897da7c2..c6574f1a55 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -21,18 +21,19 @@ else
 endif
 
 define AIRCRACK_NG_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)\
-		$(AIRCRACK_NG_MAKE_OPTS) all
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lz" \
+		-C $(@D) $(AIRCRACK_NG_MAKE_OPTS) all
 endef
 
 define AIRCRACK_NG_CLEAN_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)\
-		$(AIRCRACK_NG_MAKE_OPTS) clean
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
+		-C $(@D) $(AIRCRACK_NG_MAKE_OPTS) clean
 endef
 
 define AIRCRACK_NG_INSTALL_TARGET_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) \
-		$(AIRCRACK_NG_MAKE_OPTS) install
+		prefix=/usr $(AIRCRACK_NG_MAKE_OPTS) install
 endef
 
 define AIRCRACK_NG_UNINSTALL_TARGET_CMDS

From baebf863ea11dbbcfea55a5877f4be0e85c1f37b Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Mon, 25 Mar 2013 09:26:05 +0000
Subject: [PATCH 4971/6849] IOzone: new package

[Peter: lower case package name, strip trailing newline]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/iozone/Config.in | 12 ++++++++++++
 package/iozone/iozone.mk | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 package/iozone/Config.in
 create mode 100644 package/iozone/iozone.mk

diff --git a/package/Config.in b/package/Config.in
index 3537de185f..79b6b8f138 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -23,6 +23,7 @@ source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
 source "package/gdb/Config.in"
+source "package/iozone/Config.in"
 source "package/kexec/Config.in"
 source "package/latencytop/Config.in"
 source "package/lmbench/Config.in"
diff --git a/package/iozone/Config.in b/package/iozone/Config.in
new file mode 100644
index 0000000000..5481ca15e2
--- /dev/null
+++ b/package/iozone/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_IOZONE
+	bool "iozone"
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork()
+	help
+	  IOzone is a filesystem benchmark tool.
+	  The benchmark generates and measures a variety of file operations
+
+	  http://www.iozone.org/
+
+comment "IOzone requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk
new file mode 100644
index 0000000000..71c6840fef
--- /dev/null
+++ b/package/iozone/iozone.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# IOZONE
+#
+#############################################################
+
+IOZONE_VERSION = 3_414
+IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
+IOZONE_SITE = http://www.iozone.org/src/current
+IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
+# IOzone license details can be found at:
+# http://www.iozone.org/docs/Iozone_License.txt
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+# aio.h is not available on uClibc. Select "generic" target that does not use it.
+IOZONE_TARGET = generic
+else ifeq ($(BR2_powerpc),y)
+IOZONE_TARGET = linux-powerpc
+else ifeq ($(BR2_sparc),y)
+IOZONE_TARGET = linux-sparc
+else
+IOZONE_TARGET = linux
+endif
+
+define IOZONE_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(IOZONE_TARGET) -C $(@D)/src/current
+endef
+
+define IOZONE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/src/current/iozone \
+		$(TARGET_DIR)/usr/bin/iozone
+endef
+
+define IOZONE_CLEAN_CMDS
+       $(MAKE) -C $(@D)/src/current clean
+endef
+
+$(eval $(generic-package))

From eb3bff76eceeb5ee277d19f5e357b2b35e7922de Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 25 Jun 2012 04:43:17 +0000
Subject: [PATCH 4972/6849] json-javascript: new package

[Peter: update for generic-package, add license info]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/json-javascript/Config.in          |  6 ++++++
 package/json-javascript/json-javascript.mk | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/json-javascript/Config.in
 create mode 100644 package/json-javascript/json-javascript.mk

diff --git a/package/Config.in b/package/Config.in
index 79b6b8f138..e743dc8b21 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -489,6 +489,7 @@ source "package/jquery-keyboard/Config.in"
 source "package/jquery-sparkline/Config.in"
 source "package/jquery-validation/Config.in"
 source "package/jsmin/Config.in"
+source "package/json-javascript/Config.in"
 endmenu
 
 menu "Multimedia"
diff --git a/package/json-javascript/Config.in b/package/json-javascript/Config.in
new file mode 100644
index 0000000000..501c54f3d1
--- /dev/null
+++ b/package/json-javascript/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_JSON_JAVASCRIPT
+	bool "json-javascript"
+	help
+	  JSON in JavaScript
+
+	  https://github.com/douglascrockford/JSON-js/
diff --git a/package/json-javascript/json-javascript.mk b/package/json-javascript/json-javascript.mk
new file mode 100644
index 0000000000..a700e07d68
--- /dev/null
+++ b/package/json-javascript/json-javascript.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# json-javascript
+#
+#############################################################
+
+JSON_JAVASCRIPT_VERSION = 42c18c621a411c3f39a81bb0a387fc50dcd738d9
+JSON_JAVASCRIPT_SITE = git://github.com/douglascrockford/JSON-js.git
+JSON_JAVASCRIPT_LICENSE = Public Domain
+JSON_JAVASCRIPT_LICENSE_FILES = json2.js
+
+define JSON_JAVASCRIPT_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/json2.js $(TARGET_DIR)/var/www/json2.js
+endef
+
+define JSON_JAVASCRIPT_UNINSTALL_TARGET_CMDS
+	$(RM) $(TARGET_DIR)/var/www/json2.js
+endef
+
+$(eval $(generic-package))

From cc6de78a09f2f443dd5f3da03d01bfd7ae009bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Sun, 23 Dec 2012 03:43:18 +0000
Subject: [PATCH 4973/6849] xdriver_xf86-input-synaptics: bumped to 1.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-input-synaptics.mk                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 74a3f8698a..4c9f446020 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.6.1
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.6.2
 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev

From ee9e3af06f038d573f6fe2a0d3fa8a88d0962138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= <stefan.froberg@petroprogram.com>
Date: Sun, 23 Dec 2012 03:56:03 +0000
Subject: [PATCH 4974/6849] xdriver_xf86-video-mach64: bumped to 6.9.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 6e25cd1b0f..659c785047 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.1
+XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.3
 XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES

From 4d91863709c8667fe511b6ca2267787bcfa2911c Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 24 Jan 2013 18:35:53 +0000
Subject: [PATCH 4975/6849] webp: new package

[Peter: fix white space errors]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/webp/Config.in |  7 +++++++
 package/webp/webp.mk   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/webp/Config.in
 create mode 100644 package/webp/webp.mk

diff --git a/package/Config.in b/package/Config.in
index e743dc8b21..0f8fe7f3ee 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -452,6 +452,7 @@ source "package/poppler/Config.in"
 source "package/tiff/Config.in"
 source "package/wayland/Config.in"
 source "package/webkit/Config.in"
+source "package/webp/Config.in"
 source "package/zxing/Config.in"
 endmenu
 
diff --git a/package/webp/Config.in b/package/webp/Config.in
new file mode 100644
index 0000000000..e385b5ee4f
--- /dev/null
+++ b/package/webp/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_WEBP
+	bool "webp"
+	help
+	  WebP is a new image format that provides lossless and lossy
+	  compression for images on the web
+
+	  https://developers.google.com/speed/webp/
diff --git a/package/webp/webp.mk b/package/webp/webp.mk
new file mode 100644
index 0000000000..0099c3c5d5
--- /dev/null
+++ b/package/webp/webp.mk
@@ -0,0 +1,30 @@
+#####################################################################
+#
+# webp
+#
+#####################################################################
+
+WEBP_VERSION = 0.2.1
+WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
+WEBP_SITE = https://webp.googlecode.com/files
+WEBP_LICENSE = BSD-3c
+WEBP_LICENSE_FILES = COPYING
+WEBP_INSTALL_STAGING = YES
+
+WEBP_CONF_OPT += \
+	--with-jpegincludedir=$(STAGING_DIR)/usr/include \
+	--with-jpeglibdir=$(STAGING_DIR)/usr/lib \
+	--with-tiffincludedir=$(STAGING_DIR)/usr/include \
+	--with-tifflibdir=$(STAGING_DIR)/usr/lib
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+WEBP_DEPENDENCIES += libpng
+WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
+else
+WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=/bin/false
+endif
+
+WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
+WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff)
+
+$(eval $(autotools-package))

From f88188f09e10d93a5804ac0719d4a597f6d66c1d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 5 May 2013 22:41:33 +0200
Subject: [PATCH 4976/6849] webp: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webp/webp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/webp/webp.mk b/package/webp/webp.mk
index 0099c3c5d5..00743dd3c7 100644
--- a/package/webp/webp.mk
+++ b/package/webp/webp.mk
@@ -4,7 +4,7 @@
 #
 #####################################################################
 
-WEBP_VERSION = 0.2.1
+WEBP_VERSION = 0.3.0
 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
 WEBP_SITE = https://webp.googlecode.com/files
 WEBP_LICENSE = BSD-3c

From 57133825c930a193ce9223b4372b900c4c84c9b9 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Fri, 3 May 2013 00:39:34 +0000
Subject: [PATCH 4977/6849] arch: toolchain: Introduce binary formats BINFMT_*.

Just introduce the symbol and options in arch generic Config.in.
Append FLAT format link flags to external toolchain wrapper.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                              | 10 ++++++
 arch/Config.in                                | 34 +++++++++++++++++++
 arch/Config.in.bfin                           | 11 ------
 toolchain/toolchain-external/Config.in        | 12 +++----
 toolchain/toolchain-external/ext-tool.mk      |  4 +++
 .../ext-toolchain-wrapper.c                   |  3 ++
 6 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index fc9f68f248..7748ab390a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -172,4 +172,14 @@ config BR2_PACKAGE_INPUT_TOOLS_EVTEST
 	help
 	  The evtest program from input-tools is now a separate package.
 
+config BR2_BFIN_FDPIC
+	bool "BR2_BFIN_FDPIC is now BR2_BINFMT_FDPIC"
+	select BR2_BINFMT_FDPIC
+	select BR2_LEGACY
+
+config BR2_BFIN_FLAT
+	bool "BR2_BFIN_FLAT is now BR2_BINFMT_FLAT"
+	select BR2_BINFMT_FLAT
+	select BR2_LEGACY
+
 endmenu
diff --git a/arch/Config.in b/arch/Config.in
index 2006f1e0de..e32cfd9147 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -189,6 +189,40 @@ config BR2_GCC_TARGET_ABI
 config BR2_GCC_TARGET_CPU
 	string
 
+# Set up target binary format
+choice
+	prompt "Target Binary Format"
+	depends on BR2_bfin || BR2_m68k
+	default BR2_BINFMT_FDPIC
+
+config BR2_BINFMT_ELF
+	bool "ELF"
+	depends on !BR2_bfin && !BR2_m68k
+	help
+	  ELF (Executable and Linkable Format) is a format for libraries and
+	  executables used across different architectures and operating
+	  systems.
+
+config BR2_BINFMT_FDPIC
+	bool "FDPIC"
+	depends on BR2_bfin || BR2_m68k
+	help
+	  ELF FDPIC binaries are based on ELF, but allow the individual load
+	  segments of a binary to be located in memory independently of each
+	  other. This makes this format ideal for use in environments where no
+	  MMU is available.
+
+config BR2_BINFMT_FLAT
+	bool "FLAT"
+	depends on BR2_bfin || BR2_m68k
+	select BR2_PREFER_STATIC_LIB
+	help
+	  FLAT binary is a relatively simple and lightweight executable format
+	  based on the original a.out format. It is widely used in environment
+	  where no MMU is available.
+
+endchoice
+
 if BR2_arcle || BR2_arceb
 source "arch/Config.in.arc"
 endif
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index 0b137ae8e8..2a7ff547fe 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -1,14 +1,3 @@
-choice
-	prompt "Target ABI"
-	depends on BR2_bfin
-	default BR2_BFIN_FDPIC
-config BR2_BFIN_FDPIC
-	bool "FDPIC"
-config BR2_BFIN_FLAT
-	bool "FLAT"
-	select BR2_PREFER_STATIC_LIB
-endchoice
-
 config BR2_ARCH
 	default "bfin"
 
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index b1aab6a2ed..a93ada32ed 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -784,12 +784,12 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
-	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC
-	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BFIN_FDPIC
-	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && !BR2_BFIN_FDPIC
-	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BFIN_FDPIC
-	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && !BR2_BFIN_FDPIC
-	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BFIN_FDPIC
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FLAT
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FDPIC
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FLAT
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC
+	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT
+	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 616f4535be..dce0299bee 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -160,6 +160,10 @@ ifneq ($(CC_TARGET_ABI_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
 endif
+ifeq ($(BR2_BINFMT_FLAT),y)
+TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT
+endif
 
 ifneq ($(BR2_TARGET_OPTIMIZATION),)
 TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index a92badac0d..9a2fc70b02 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -47,6 +47,9 @@ static char *predef_args[] = {
 #ifdef BR_64
 	"-m64",
 #endif
+#ifdef BR_BINFMT_FLAT
+	"-Wl,-elf2flt",
+#endif
 #ifdef BR_ADDITIONAL_CFLAGS
 	BR_ADDITIONAL_CFLAGS
 #endif

From 371e6dc7801cbc52cba1e8501cde3c7cd308f28a Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Fri, 3 May 2013 00:39:35 +0000
Subject: [PATCH 4978/6849] arch: Add blackfin CPU choice

This patch adds a Target CPU configuration option and uses it to select
a -m option for gcc.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.bfin | 94 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index 2a7ff547fe..ac96620413 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -1,5 +1,99 @@
+choice
+	prompt "Target CPU"
+	depends on BR2_bfin
+	default BR2_bf609
+	help
+	  Specify target CPU
+config BR2_bf606
+	bool "bf606"
+config BR2_bf607
+	bool "bf607"
+config BR2_bf608
+	bool "bf608"
+config BR2_bf609
+	bool "bf609"
+config BR2_bf512
+	bool "bf512"
+config BR2_bf514
+	bool "bf514"
+config BR2_bf516
+	bool "bf516"
+config BR2_bf518
+	bool "bf518"
+config BR2_bf522
+	bool "bf522"
+config BR2_bf523
+	bool "bf523"
+config BR2_bf524
+	bool "bf524"
+config BR2_bf525
+	bool "bf525"
+config BR2_bf526
+	bool "bf526"
+config BR2_bf527
+	bool "bf527"
+config BR2_bf531
+	bool "bf531"
+config BR2_bf532
+	bool "bf532"
+config BR2_bf533
+	bool "bf533"
+config BR2_bf534
+	bool "bf534"
+config BR2_bf536
+	bool "bf536"
+config BR2_bf537
+	bool "bf537"
+config BR2_bf538
+	bool "bf538"
+config BR2_bf539
+	bool "bf539"
+config BR2_bf542
+	bool "bf542"
+config BR2_bf544
+	bool "bf544"
+config BR2_bf547
+	bool "bf547"
+config BR2_bf548
+	bool "bf548"
+config BR2_bf549
+	bool "bf549"
+config BR2_bf561
+	bool "bf561"
+endchoice
+
 config BR2_ARCH
 	default "bfin"
 
 config BR2_ENDIAN
         default "LITTLE"
+
+config BR2_GCC_TARGET_CPU
+	default bf606		if BR2_bf606
+	default bf607		if BR2_bf607
+	default bf608		if BR2_bf608
+	default bf609		if BR2_bf609
+	default bf512		if BR2_bf512
+	default bf514		if BR2_bf514
+	default bf516		if BR2_bf516
+	default bf518		if BR2_bf518
+	default bf522		if BR2_bf522
+	default bf523		if BR2_bf523
+	default bf524		if BR2_bf524
+	default bf525		if BR2_bf525
+	default bf526		if BR2_bf526
+	default bf527		if BR2_bf527
+	default bf531		if BR2_bf531
+	default bf532		if BR2_bf532
+	default bf533		if BR2_bf533
+	default bf534		if BR2_bf534
+	default bf536		if BR2_bf536
+	default bf537		if BR2_bf537
+	default bf538		if BR2_bf538
+	default bf539		if BR2_bf539
+	default bf542		if BR2_bf542
+	default bf544		if BR2_bf544
+	default bf547		if BR2_bf547
+	default bf548		if BR2_bf548
+	default bf549		if BR2_bf549
+	default bf561		if BR2_bf561

From 66d41890ec2b76189bcd427a0cc3966ff56f9712 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Fri, 3 May 2013 00:39:36 +0000
Subject: [PATCH 4979/6849] arch: toolchain: Introduce target CPU revision.

Adds the possibility to have a free-form CPU revision string and append it
to the target CPU. Only Blackfin actually uses this option.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in                           | 3 +++
 arch/Config.in.bfin                      | 8 ++++++++
 toolchain/gcc/gcc-uclibc-4.x.mk          | 6 +++++-
 toolchain/toolchain-external/ext-tool.mk | 4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/arch/Config.in b/arch/Config.in
index e32cfd9147..fa9dad3432 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -189,6 +189,9 @@ config BR2_GCC_TARGET_ABI
 config BR2_GCC_TARGET_CPU
 	string
 
+config BR2_GCC_TARGET_CPU_REVISION
+	string
+
 # Set up target binary format
 choice
 	prompt "Target Binary Format"
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index ac96620413..f755c8db0f 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -97,3 +97,11 @@ config BR2_GCC_TARGET_CPU
 	default bf548		if BR2_bf548
 	default bf549		if BR2_bf549
 	default bf561		if BR2_bf561
+
+config BR2_GCC_TARGET_CPU_REVISION
+	string "Target CPU revision"
+	help
+	  Specify a target CPU revision, which will be appended to the
+	  value of the -mcpu option. For example, if the selected CPU is
+	  bf609, and then selected CPU revision is "0.0", then gcc will
+	  receive the -mcpu=bf609-0.0 option.
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index f1803cb665..128b7abe66 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -90,7 +90,11 @@ ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
 GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
 endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
-GCC_WITH_CPU:=--with-cpu=$(BR2_GCC_TARGET_CPU)
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
+GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
+else
+GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
+endif
 endif
 
 # AVR32 GCC special configuration
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index dce0299bee..bf2bee8683 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -134,7 +134,11 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
 endif
 
 CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
 CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))
+else
+CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
+endif
 CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
 CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
 

From 57c05432917de3b9aec293d713acafde01ac9b07 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Fri, 3 May 2013 18:39:37 +0800
Subject: [PATCH 4980/6849] arch: toolchain: Introduce binary format FLAT
 types.

Just introduce the symbol and options in arch generic Config.in.
Add FLAT types specific compiling flags into package makefile.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in      | 26 ++++++++++++++++++++++++++
 package/Makefile.in | 11 +++++++++++
 2 files changed, 37 insertions(+)

diff --git a/arch/Config.in b/arch/Config.in
index fa9dad3432..5ca05cdde6 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -226,6 +226,32 @@ config BR2_BINFMT_FLAT
 
 endchoice
 
+# Set up flat binary type
+choice
+	prompt "FLAT Binary type"
+	depends on BR2_BINFMT_FLAT
+	default BR2_BINFMT_FLAT_ONE
+
+config BR2_BINFMT_FLAT_ONE
+	bool "One memory region"
+	help
+	  All segments are linked into one memory region.
+
+config BR2_BINFMT_FLAT_SEP_DATA
+	bool "Separate data and code region"
+	depends on BR2_bfin || BR2_m68k
+	help
+	  Allow for the data and text segments to be separated and placed in
+	  different regions of memory.
+
+config BR2_BINFMT_FLAT_SHARED
+	bool "Shared binary"
+	depends on BR2_bfin || BR2_m68k
+	help
+	  Allow to load and link indiviual FLAT binaries at run time.
+
+endchoice
+
 if BR2_arcle || BR2_arceb
 source "arch/Config.in.arc"
 endif
diff --git a/package/Makefile.in b/package/Makefile.in
index a8bf36b184..dd3bc7d1a5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -103,6 +103,17 @@ TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
+ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
+TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
+TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0
+TARGET_CXXFLAGS += -mid-shared-library -mshared-library-id=0
+endif
+ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
+TARGET_LDFLAGS += -msep-data
+TARGET_CFLAGS += -msep-data
+TARGET_CXXFLAGS += -msep-data
+endif
+
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
 else

From 9edf482d6b210d16a22fdf561da2a2f0fb84824d Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Fri, 3 May 2013 00:39:38 +0000
Subject: [PATCH 4981/6849] package: Introduce package-specific BINFMT_FLAT
 options.

Add new option <PKG>_FLAT_STACKSIZE. The document needs to be updated.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index dd3bc7d1a5..a449089c1f 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -103,6 +103,10 @@ TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
+ifeq ($(BR2_BINFMT_FLAT),y)
+TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE))
+endif
+
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
 TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
 TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0

From 80ebf12906afc3a1e5f4e5682d4c5dc0779a556a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 5 May 2013 10:54:11 +0000
Subject: [PATCH 4982/6849] bind: fix build failure for static+openssl

Bind just links to openssl libraries without checking it's dependencies.
This works when doing shared builds since the linker picks the deps up,
but fails badly on static builds.
So just define LIBS="-lz" when openssl is enabled. Fixes:
http://autobuild.buildroot.net/results/a9a166f932e0b6727ae8e470ce748418797875b9/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 8a66534ebc..f6895945a5 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -30,7 +30,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	BIND_DEPENDENCIES += openssl
-	BIND_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
+	BIND_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr LIBS="-lz"
 else
 	BIND_CONF_OPT += --with-openssl=no
 endif

From 20e1e84272701413574633dafe207b40c2a5d6dd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 10:09:44 +0000
Subject: [PATCH 4983/6849] ocf-linux: remove extension and build out of tree

Remove the OCF linux kernel extension instead opting to build ocf-linux
modules out of tree.
This is easier for users since no kernel config tweaking is required.
On the downside the OCF drivers can't be used, but then all of the
kernel crypto drivers are available to users via cryptosoft which is
preferred.
Also remove it from the menu to utilize a virtual.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in                           | 12 ------
 linux/linux-ext-ocf-linux.mk                  | 25 -----------
 package/Config.in                             |  1 -
 package/ocf-linux/Config.in                   | 12 ------
 .../ocf-linux-01-modules-cross.patch          | 42 +++++++++++++++++++
 package/ocf-linux/ocf-linux.mk                | 14 +++++--
 6 files changed, 52 insertions(+), 54 deletions(-)
 delete mode 100644 linux/linux-ext-ocf-linux.mk
 delete mode 100644 package/ocf-linux/Config.in
 create mode 100644 package/ocf-linux/ocf-linux-01-modules-cross.patch

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index a68cbe9214..172fa76c75 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -23,18 +23,6 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 	  Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
 	  and verify that your kernel version in buildroot matches.
 
-# ocf-linux
-config BR2_LINUX_KERNEL_EXT_OCF_LINUX
-	bool "Open Cryptographic Framework (OCF)"
-	select BR2_PACKAGE_OCF_LINUX
-	help
-	  OCF-Linux Kernel part.
-
-	  Select this option to patch your kernel with OCF for
-	  hardware-accelerated crypto support for available drivers.
-	  Some libraries need to also have OCF enabled for them,
-	  for example OpenSSL.
-
 # RTAI
 config BR2_LINUX_KERNEL_EXT_RTAI
        bool "RTAI Real-time patch"
diff --git a/linux/linux-ext-ocf-linux.mk b/linux/linux-ext-ocf-linux.mk
deleted file mode 100644
index 1a601d58cf..0000000000
--- a/linux/linux-ext-ocf-linux.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-##################################################
-# Linux OCF extension
-#
-# Patch the linux kernel with OCF
-##################################################
-
-ifeq ($(BR2_LINUX_KERNEL_EXT_OCF_LINUX),y)
-LINUX_DEPENDENCIES += ocf-linux
-
-# Prepare kernel patch
-# The linux-3.2.1.patch is just the main inclusion, most of the code
-# resides in the ocf/ subdir.
-# It works for older kernel versions.
-# Run tested from 2.6.38+ and build tested from 2.6.35+
-define OCF_LINUX_PREPARE_KERNEL
-	support/scripts/apply-patches.sh $(LINUX_DIR) \
-		$(OCF_LINUX_DIR)/patches/ linux-3.2.1-ocf.patch ; \
-	grep -q __mix_pool_bytes $(LINUX_DIR)/drivers/char/random.c && \
-	$(SED) 's:wordcount\*4:&, NULL:' $(LINUX_DIR)/drivers/char/random.c ; \
-	cp -rf $(OCF_LINUX_DIR)/ocf $(LINUX_DIR)/crypto/ocf ;
-endef
-
-LINUX_PRE_PATCH_HOOKS += OCF_LINUX_PREPARE_KERNEL
-
-endif #BR2_LINUX_EXT_OCF_LINUX
diff --git a/package/Config.in b/package/Config.in
index 0f8fe7f3ee..62a97b4265 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -394,7 +394,6 @@ source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
 source "package/libsha1/Config.in"
 source "package/nettle/Config.in"
-source "package/ocf-linux/Config.in"
 source "package/openssl/Config.in"
 source "package/polarssl/Config.in"
 endmenu
diff --git a/package/ocf-linux/Config.in b/package/ocf-linux/Config.in
deleted file mode 100644
index 9dc5766074..0000000000
--- a/package/ocf-linux/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_OCF_LINUX
-	bool "ocf-linux"
-	help
-	  OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
-	  Framework (OCF). This port aims to bring full asynchronous HW/SW
-	  crypto acceleration to the Linux kernel and applications
-	  running under Linux.
-
-	  You need to enable the OCF linux kernel extension or provide
-	  a prepatched kernel to make this option useful.
-
-	  http://ocf-linux.sourceforge.net/
diff --git a/package/ocf-linux/ocf-linux-01-modules-cross.patch b/package/ocf-linux/ocf-linux-01-modules-cross.patch
new file mode 100644
index 0000000000..f80ef062c8
--- /dev/null
+++ b/package/ocf-linux/ocf-linux-01-modules-cross.patch
@@ -0,0 +1,42 @@
+Remove the OCF linux kernel extension instead opting to build ocf-linux
+modules out of tree.
+This is easier for users since no kernel config tweaking is required.
+On the downside the OCF drivers can't be used, but then all of the
+kernel crypto drivers are available to users via cryptosoft which is
+preferred.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura ocf-linux-20120127.orig/ocf/Makefile ocf-linux-20120127/ocf/Makefile
+--- ocf-linux-20120127.orig/ocf/Makefile	2013-04-27 09:27:04.413911866 -0300
++++ ocf-linux-20120127/ocf/Makefile	2013-04-27 09:27:31.131775576 -0300
+@@ -2,6 +2,7 @@
+ -include $(ROOTDIR)/modules/.config
+
+ OCF_OBJS = crypto.o criov.o
++KDIR ?= /lib/modules/$(shell uname -r)/build
+
+ ifdef CONFIG_OCF_RANDOMHARVEST
+ 	OCF_OBJS += random.o
+@@ -78,20 +79,13 @@
+ #
+
+ ocf_make:
+-	make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m
+-	make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_CRYPTOSOFT=m
+-	-make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_BENCH=m
+-	-make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_OCFNULL=m
+-	-make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_HIFN=m
++	make -C $(KDIR) M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_CRYPTOSOFT=m CONFIG_OCF_BENCH=m CONFIG_OCF_OCFNULL=m
+
+ ocf_modules:
+ 	$(MAKE) ocf_make OCF_TARGET=modules
+
+ ocf_install:
+ 	$(MAKE) ocf_make OCF_TARGET="modules modules_install"
+-	depmod
+-	mkdir -p /usr/include/crypto
+-	cp cryptodev.h /usr/include/crypto/.
+
+ #
+ # generate full kernel patches for 2.4 and 2.6 kernels to make patching
diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk
index fb5f7e8ff0..1be3a3f4b8 100644
--- a/package/ocf-linux/ocf-linux.mk
+++ b/package/ocf-linux/ocf-linux.mk
@@ -6,16 +6,22 @@
 
 OCF_LINUX_VERSION = 20120127
 OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION)
+OCF_LINUX_DEPENDENCIES = linux
 OCF_LINUX_INSTALL_STAGING = YES
 
-define OCF_LINUX_INSTALL_STAGING_CMDS
-	$(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \
-		$(STAGING_DIR)/usr/include/crypto/cryptodev.h
+define OCF_LINUX_BUILD_CMDS
+	$(MAKE) -C $(@D)/ocf $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \
+		ocf_modules
 endef
 
 define OCF_LINUX_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/ocf $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \
+		ocf_install
+endef
+
+define OCF_LINUX_INSTALL_STAGING_CMDS
 	$(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \
-		$(TARGET_DIR)/usr/include/crypto/cryptodev.h
+		$(STAGING_DIR)/usr/include/crypto/cryptodev.h
 endef
 
 $(eval $(generic-package))

From 1c2d3183e2e75bd21bc4b7377e76be74ce6e1432 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 10:09:45 +0000
Subject: [PATCH 4984/6849] cryptodev-linux: new package

cryptodev-linux is an alternative implementation to ocf-linux.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cryptodev-linux/cryptodev-linux.mk | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/cryptodev-linux/cryptodev-linux.mk

diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk
new file mode 100644
index 0000000000..1a78228317
--- /dev/null
+++ b/package/cryptodev-linux/cryptodev-linux.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# cryptodev-linux
+#
+#############################################################
+
+CRYPTODEV_LINUX_VERSION = 1.6
+CRYPTODEV_LINUX_SITE = http://download.gna.org/cryptodev-linux
+CRYPTODEV_LINUX_DEPENDENCIES = linux
+CRYPTODEV_LINUX_INSTALL_STAGING = YES
+CRYPTODEV_LICENSE = GPLv2+
+CRYPTODEV_LICENSE_FILES = COPYING
+
+define CRYPTODEV_LINUX_BUILD_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_DIR=$(LINUX_DIR)
+endef
+
+define CRYPTODEV_LINUX_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_DIR=$(LINUX_DIR) \
+		PREFIX=$(TARGET_DIR) modules_install
+endef
+
+define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 644 $(@D)/crypto/cryptodev.h \
+		$(STAGING_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+$(eval $(generic-package))

From 6235f6822274fa1d7989de258587074b101cdafe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 10:09:46 +0000
Subject: [PATCH 4985/6849] cryptodev: add new virtual

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/cryptodev/Config.in    | 37 ++++++++++++++++++++++++++++++++++
 package/cryptodev/cryptodev.mk | 24 ++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/cryptodev/Config.in
 create mode 100644 package/cryptodev/cryptodev.mk

diff --git a/package/Config.in b/package/Config.in
index 62a97b4265..3c01ce8d27 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -386,6 +386,7 @@ endmenu
 
 menu "Crypto"
 source "package/beecrypt/Config.in"
+source "package/cryptodev/Config.in"
 source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
diff --git a/package/cryptodev/Config.in b/package/cryptodev/Config.in
new file mode 100644
index 0000000000..3f08e9e818
--- /dev/null
+++ b/package/cryptodev/Config.in
@@ -0,0 +1,37 @@
+config BR2_PACKAGE_CRYPTODEV
+	bool "cryptodev support"
+	depends on BR2_LINUX_KERNEL
+	help
+	  Select the desired cryptodev implementation.
+
+if BR2_PACKAGE_CRYPTODEV
+
+choice
+	prompt "cryptodev variant"
+	default BR2_PACKAGE_CRYPTODEV_LINUX if !BR2_microblaze
+	help
+	  Select the cryptodev implementation.
+
+config BR2_PACKAGE_CRYPTODEV_LINUX
+	bool "cryptodev-linux"
+	depends on !BR2_microblaze
+	help
+	  Cryptodev-linux is a device that allows access to Linux kernel
+	  cryptographic drivers; thus allowing userspace applications
+	  to take advantage of hardware accelerators.
+
+	  http://cryptodev-linux.org/index.html
+
+config BR2_PACKAGE_OCF_LINUX
+	bool "ocf-linux"
+	help
+	  OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
+	  Framework (OCF). This port aims to bring full asynchronous HW/SW
+	  crypto acceleration to the Linux kernel and applications
+	  running under Linux.
+
+	  http://ocf-linux.sourceforge.net/
+
+endchoice
+
+endif
diff --git a/package/cryptodev/cryptodev.mk b/package/cryptodev/cryptodev.mk
new file mode 100644
index 0000000000..b6f4a42d13
--- /dev/null
+++ b/package/cryptodev/cryptodev.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# Virtual cryptodev package
+#
+#############################################################
+
+CRYPTODEV_SOURCE =
+
+ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
+CRYPTODEV_DEPENDENCIES += cryptodev-linux
+endif
+
+ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
+CRYPTODEV_DEPENDENCIES += ocf-linux
+endif
+
+ifeq ($(CRYPTODEV_DEPENDENCIES),)
+define CRYPTODEV_CONFIGURE_CMDS
+	echo "No CRYPTODEV implementation defined. Configuration error"
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))

From c714dba57778d0d4129b5db755f1799233da698f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 10:09:47 +0000
Subject: [PATCH 4986/6849] openssl: integrate variable cryptodev support

Allow openssl to use cryptodev-linux hardware crypto support besides
OCF.
To do this we remove the OCF option from openssl and automatically use
any of the available implementations when available.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/Config.in  | 15 ---------------
 package/openssl/openssl.mk |  7 ++++++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 2187023e61..d1ed520278 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -23,18 +23,3 @@ config BR2_PACKAGE_OPENSSL_ENGINES
 	depends on BR2_PACKAGE_OPENSSL
 	help
 	  Install additional encryption engine libraries.
-
-config BR2_PACKAGE_OPENSSL_OCF
-	bool "openssl ocf support"
-	depends on BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_OCF_LINUX
-	help
-	  Enable openssl cryptodev (OCF) hardware acceleration support.
-	  This requires the ocf linux kernel extension or you to provide a
-	  pre-patched kernel that includes it.
-	  If kernel support isn't available it'll just make the libraries
-	  a tiny bit larger with a small CPU overhead when starting up and
-	  checking for the required kernel-side support, and then falling
-	  back to regular builtin support.
-
-	  http://ocf-linux.sourceforge.net/
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 8486c448b6..2e04789356 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -22,7 +22,12 @@ endif
 
 OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
 
-ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
+ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
+	OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
+	OPENSSL_DEPENDENCIES += cryptodev-linux
+endif
+
+ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
 	OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
 	OPENSSL_DEPENDENCIES += ocf-linux
 endif

From 1c15ed2daccbc02a7f677e5a70b0c307670b8bcc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 10:09:48 +0000
Subject: [PATCH 4987/6849] gnutls: enable cryptodev-linux support

Unfortunately because of header file differencies this can't be used for
OCF.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 21ace1c566..610a5a2dee 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -24,6 +24,11 @@ GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(
 GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
 GNUTLS_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBIDN),libidn)
 
+ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
+	GNUTLS_CONF_OPT += --enable-cryptodev
+	GNUTLS_DEPENDENCIES += cryptodev-linux
+endif
+
 # Some examples in doc/examples use wchar
 define GNUTLS_DISABLE_DOCS
 	$(SED) 's/ doc / /' $(@D)/Makefile.in

From ad099ccf67a094d057cb38be8132167fd50e15ac Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Apr 2013 10:09:49 +0000
Subject: [PATCH 4988/6849] openswan: fix OCF support detection

Now that the openssl OCFs option is gone we need to switch to the package
option.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openswan/openswan.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 153d6590f1..6b7dc0503f 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -22,7 +22,7 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	OPENSWAN_DEPENDENCIES += openssl
 	OPENSWAN_MAKE_OPT += HAVE_OPENSSL=true
-ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
+ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
 	OPENSWAN_MAKE_OPT += HAVE_OCF=true
 endif
 endif

From 05fb9ebcbd53fb8c9d250b93b4c71f077ae9a54b Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 5 May 2013 21:22:29 +0000
Subject: [PATCH 4989/6849] zeromq: bump version to 3.2.3

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/zeromq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index ba585d9660..bebba20b16 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ZEROMQ_VERSION = 3.2.2
+ZEROMQ_VERSION = 3.2.3
 ZEROMQ_SITE = http://download.zeromq.org/
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux

From 378ceef8c9ad36a93cc835e617ce3583affba06b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Apr 2013 06:56:49 +0000
Subject: [PATCH 4990/6849] python-bottle: bump version and fix shebang

Bump to version 0.11.6
Add the --executable shebang fixup option to the build phase so that the
script ends with a proper #!/usr/bin/python interpeter line set.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-bottle/python-bottle.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk
index 370b31be04..9df359f107 100644
--- a/package/python-bottle/python-bottle.mk
+++ b/package/python-bottle/python-bottle.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PYTHON_BOTTLE_VERSION = 0.11.4
+PYTHON_BOTTLE_VERSION = 0.11.6
 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz
 PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle
 PYTHON_BOTTLE_DEPENDENCIES = python
@@ -12,7 +12,7 @@ PYTHON_BOTTLE_LICENSE = MIT
 # README.rst refers to the file "LICENSE" but it's not included
 
 define PYTHON_BOTTLE_BUILD_CMDS
-	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build --executable=/usr/bin/python)
 endef
 
 define PYTHON_BOTTLE_INSTALL_TARGET_CMDS

From 2f40b6ae2b27486af2deb999385e3d7f034e4bd5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Apr 2013 06:56:50 +0000
Subject: [PATCH 4991/6849] python-serial: fix shebang

Add the --executable shebang fixup option to the build phase so that the
script ends with a proper #!/usr/bin/python interpeter line set.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-serial/python-serial.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index fb6b31c59a..4bfc355cb2 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -6,12 +6,12 @@
 
 PYTHON_SERIAL_VERSION = 2.6
 PYTHON_SERIAL_SOURCE  = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
-PYTHON_SERIAL_SITE    = http://pypi.python.org/packages/source/p/pyserial/
+PYTHON_SERIAL_SITE    = http://pypi.python.org/packages/source/p/pyserial
 
 PYTHON_SERIAL_DEPENDENCIES = python
 
 define PYTHON_SERIAL_BUILD_CMDS
-	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build --executable=/usr/bin/python)
 endef
 
 define PYTHON_SERIAL_INSTALL_TARGET_CMDS

From f59aeca6b48974c98fab28a300efb2980ac21154 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 6 May 2013 00:14:55 +0000
Subject: [PATCH 4992/6849] armv8: Fix defconfig build

Commit 14f48861 ("arc: Add ARC and ARC BE architecture") introduced a
sed match against arc* buildroot architecture to translate it to arc.

This causes a problem with armv8, which is called in buildroot aarch64,
which is also matching, resulting in a build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1692a369c4..9128c75796 100644
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,8 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
 
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
-	-e s/arc.*/arc/ \
+	-e s/arcle/arc/ \
+	-e s/arcbe/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64/arm64/ \
 	-e s/bfin/blackfin/ \

From d451f3c0bb9efd97263b7f5e49c2fb5fe62f41dc Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 6 May 2013 00:14:56 +0000
Subject: [PATCH 4993/6849] pandaboard: Fix defconfig build

Commit 75b7dc68 ("linux: default to 3.9, remove 3.8") made 3.9 the
default kernel version.

The omap kernel switched to multiplatform kernel during the 3.9 kernel
development cycle. Obviously, the uImage generation doesn't work anymore
with multiplatform kernels, since you have to provide the kernel load
address, resulting in a build error.

Lock down the kernel version to 3.8 to keep the old behaviour until
someone submits a patch to switch to multiplatform kernel.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/pandaboard_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig
index 9496b7f8ec..95cfdd6ea9 100644
--- a/configs/pandaboard_defconfig
+++ b/configs/pandaboard_defconfig
@@ -11,8 +11,13 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Lock to 3.8 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_8=y
+
 # Kernel
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.11"
 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 
 # GCC

From cccb01bf5947a7ea3a80cb14d680259e3a20d428 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 6 May 2013 00:14:57 +0000
Subject: [PATCH 4994/6849] toolchain/gcc: Enable --with-float for powerpc

Commit 8d929f4b ("toolchain/gcc: Only enable --with-float when it makes
sense") restricted the --with-float use to only MIPS, ARM and SPARC,
while it seems that powerpc needs it as well.

Fixes the qemu_ppc_virtex_ml507_defconfig build.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 128b7abe66..959568f7a5 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -66,7 +66,8 @@ endif
 # Determine soft-float options
 ifeq ($(BR2_SOFT_FLOAT),y)
 # only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float
-ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_sparc),y)
+# powerpc seems to be needing it as well
+ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
 endif
 ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm

From 44a2eff85bffa73be8cf9fe81859844d49bc6dce Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 24 Apr 2013 23:19:01 +0000
Subject: [PATCH 4995/6849] wvstreams: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/wvstreams/Config.in                   |  13 +
 ...s-0001-fix-uClibc-compile-getcontext.patch | 273 ++++++++++++++++++
 ...ix-uClibc-compile-execinfo-backtrace.patch |  31 ++
 ...streams-0003-fix-uClibc-compile-misc.patch |  16 +
 package/wvstreams/wvstreams.mk                |  51 ++++
 6 files changed, 385 insertions(+)
 create mode 100644 package/wvstreams/Config.in
 create mode 100644 package/wvstreams/wvstreams-0001-fix-uClibc-compile-getcontext.patch
 create mode 100644 package/wvstreams/wvstreams-0002-fix-uClibc-compile-execinfo-backtrace.patch
 create mode 100644 package/wvstreams/wvstreams-0003-fix-uClibc-compile-misc.patch
 create mode 100644 package/wvstreams/wvstreams.mk

diff --git a/package/Config.in b/package/Config.in
index 3c01ce8d27..426c833f71 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -554,6 +554,7 @@ source "package/openpgm/Config.in"
 source "package/ortp/Config.in"
 source "package/slirp/Config.in"
 source "package/usbredir/Config.in"
+source "package/wvstreams/Config.in"
 source "package/zeromq/Config.in"
 source "package/zmqpp/Config.in"
 source "package/zyre/Config.in"
diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in
new file mode 100644
index 0000000000..c39ec33a0a
--- /dev/null
+++ b/package/wvstreams/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_WVSTREAMS
+	bool "wvstreams"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_ZLIB
+	help
+	  C++ Network Programming Library.
+
+	  http://wvstreams.googlecode.com/
+
+comment "wvstreams requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/wvstreams/wvstreams-0001-fix-uClibc-compile-getcontext.patch b/package/wvstreams/wvstreams-0001-fix-uClibc-compile-getcontext.patch
new file mode 100644
index 0000000000..c78cc1893c
--- /dev/null
+++ b/package/wvstreams/wvstreams-0001-fix-uClibc-compile-getcontext.patch
@@ -0,0 +1,273 @@
+Fix wvstreams so that it builds with uClibc, which does not have the
+getcontext() and setcontext() functions.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/include/wvtask.h b/include/wvtask.h
+--- a/include/wvtask.h	2008-07-14 20:11:35.000000000 +0100
++++ b/include/wvtask.h	2012-07-28 12:29:53.559981240 +0100
+@@ -28,6 +28,13 @@
+ 
+ #define WVTASK_MAGIC 0x123678
+ 
++#undef HAVE_GETCONTEXT
++#ifdef HAVE_GETCONTEXT
++typedef ucontext_t TaskContext;
++#else
++typedef jmp_buf TaskContext;
++#endif
++
+ class WvTaskMan;
+ 
+ /** Represents a single thread of control. */
+@@ -54,8 +61,8 @@ class WvTask
+     bool running, recycled;
+     
+     WvTaskMan &man;
+-    ucontext_t mystate;	// used for resuming the task
+-    ucontext_t func_call, func_return;
++    TaskContext mystate;	// used for resuming the task
++    TaskContext func_call, func_return;
+     
+     TaskFunc *func;
+     void *userdata;
+@@ -94,13 +101,13 @@ class WvTaskMan
+     static void call_func(WvTask *task);
+ 
+     static char *stacktop;
+-    static ucontext_t stackmaster_task;
++    static TaskContext stackmaster_task;
+     
+     static WvTask *stack_target;
+-    static ucontext_t get_stack_return;
++    static TaskContext get_stack_return;
+     
+     static WvTask *current_task;
+-    static ucontext_t toplevel;
++    static TaskContext toplevel;
+     
+     WvTaskMan();
+     virtual ~WvTaskMan();
+diff -Nurp a/utils/wvtask.cc b/utils/wvtask.cc
+--- a/utils/wvtask.cc	2009-05-13 22:42:52.000000000 +0100
++++ b/utils/wvtask.cc	2012-07-28 12:32:23.855974538 +0100
+@@ -60,12 +60,14 @@ int WvTask::taskcount, WvTask::numtasks,
+ WvTaskMan *WvTaskMan::singleton;
+ int WvTaskMan::links, WvTaskMan::magic_number;
+ WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
+-ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
++TaskContext WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
+     WvTaskMan::toplevel;
+ WvTask *WvTaskMan::current_task, *WvTaskMan::stack_target;
+ char *WvTaskMan::stacktop;
+ 
++#ifdef HAVE_GETCONTEXT
+ static int context_return;
++#endif
+ 
+ 
+ static bool use_shared_stack()
+@@ -198,9 +200,13 @@ WvTaskMan::WvTaskMan()
+     
+     stacktop = (char *)alloca(0);
+     
++#ifdef HAVE_GETCONTEXT
+     context_return = 0;
+     assert(getcontext(&get_stack_return) == 0);
+     if (context_return == 0)
++#else
++    if (setjmp(get_stack_return) == 0)
++#endif
+     {
+ 	// initial setup - start the stackmaster() task (never returns!)
+ 	stackmaster();
+@@ -257,22 +263,30 @@ int WvTaskMan::run(WvTask &task, int val
+         
+     WvTask *old_task = current_task;
+     current_task = &task;
+-    ucontext_t *state;
++    TaskContext *state;
+     
+     if (!old_task)
+ 	state = &toplevel; // top-level call (not in an actual task yet)
+     else
+ 	state = &old_task->mystate;
+     
++#ifdef HAVE_GETCONTEXT
+     context_return = 0;
+     assert(getcontext(state) == 0);
+     int newval = context_return;
++#else
++    int newval = setjmp(*state);
++#endif
+     if (newval == 0)
+     {
+ 	// saved the state, now run the task.
++#ifdef HAVE_GETCONTEXT
+         context_return = val;
+         setcontext(&task.mystate);
+         return -1;
++#else
++        longjmp(task.mystate, val);
++#endif
+     }
+     else
+     {
+@@ -317,16 +331,24 @@ int WvTaskMan::yield(int val)
+                 (long)current_task->stacksize);
+     }
+ #endif
+-		
++
++#ifdef HAVE_GETCONTEXT		
+     context_return = 0;
+     assert(getcontext(&current_task->mystate) == 0);
+     int newval = context_return;
++#else
++    int newval = setjmp(current_task->mystate);
++#endif
+     if (newval == 0)
+     {
+ 	// saved the task state; now yield to the toplevel.
++#ifdef HAVE_GETCONTEXT
+         context_return = val;
+         setcontext(&toplevel);
+         return -1;
++#else
++        longjmp(toplevel, val);
++#endif
+     }
+     else
+     {
+@@ -340,9 +362,13 @@ int WvTaskMan::yield(int val)
+ 
+ void WvTaskMan::get_stack(WvTask &task, size_t size)
+ {
++#ifdef HAVE_GETCONTEXT
+     context_return = 0;
+     assert(getcontext(&get_stack_return) == 0);
+     if (context_return == 0)
++#else
++    if (setjmp(get_stack_return) == 0)
++#endif
+     {
+ 	assert(magic_number == -WVTASK_MAGIC);
+ 	assert(task.magic_number == WVTASK_MAGIC);
+@@ -358,6 +384,7 @@ void WvTaskMan::get_stack(WvTask &task,
+             static char *next_stack_addr = NULL;
+ #endif
+         
++#ifndef HAVE_GETCONTEXT
+             task.stack = mmap(next_stack_addr, task.stacksize,
+                 PROT_READ | PROT_WRITE,
+ #ifndef MACOS 
+@@ -366,12 +393,17 @@ void WvTaskMan::get_stack(WvTask &task,
+                 MAP_PRIVATE,
+ #endif
+                 -1, 0);
++#endif // !HAVE_GETCONTEXT
+         }
+ 	
+ 	// initial setup
+ 	stack_target = &task;
++#ifdef HAVE_GETCONTEXT
+ 	context_return = size/1024 + (size%1024 > 0);
+ 	setcontext(&stackmaster_task);
++#else
++	longjmp(stackmaster_task, size/1024 + (size%1024 > 0));
++#endif
+     }
+     else
+     {
+@@ -408,9 +440,13 @@ void WvTaskMan::_stackmaster()
+     {
+ 	assert(magic_number == -WVTASK_MAGIC);
+ 	
++#ifdef HAVE_GETCONTEXT
+         context_return = 0;
+         assert(getcontext(&stackmaster_task) == 0);
+         val = context_return;
++#else
++        val = setjmp(stackmaster_task);
++#endif
+ 	if (val == 0)
+ 	{
+ 	    assert(magic_number == -WVTASK_MAGIC);
+@@ -418,8 +454,12 @@ void WvTaskMan::_stackmaster()
+ 	    // just did setjmp; save stackmaster's current state (with
+ 	    // all current stack allocations) and go back to get_stack
+ 	    // (or the constructor, if that's what called us)
++#ifdef HAVE_GETCONTEXT
+             context_return = 1;
+             setcontext(&get_stack_return);
++#else
++            longjmp(get_stack_return, 1);
++#endif
+ 	}
+ 	else
+ 	{
+@@ -462,7 +502,9 @@ void WvTaskMan::call_func(WvTask *task)
+     task->func(task->userdata);
+     Dprintf("WvTaskMan: returning from task #%d (%s)\n",
+ 	    task->tid, (const char *)task->name);
++#ifdef HAVE_GETCONTEXT
+     context_return = 1;
++#endif
+ }
+ 
+ 
+@@ -473,9 +515,13 @@ void WvTaskMan::do_task()
+     assert(task->magic_number == WVTASK_MAGIC);
+ 	
+     // back here from longjmp; someone wants stack space.    
++#ifdef HAVE_GETCONTEXT
+     context_return = 0;
+     assert(getcontext(&task->mystate) == 0);
+     if (context_return == 0)
++#else
++    if (setjmp(task->mystate) == 0)
++#endif
+     {
+ 	// done the setjmp; that means the target task now has
+ 	// a working jmp_buf all set up.  Leave space on the stack
+@@ -510,6 +556,7 @@ void WvTaskMan::do_task()
+                 }
+                 else
+                 {
++#ifdef HAVE_GETCONTEXT
+                     assert(getcontext(&task->func_call) == 0);
+                     task->func_call.uc_stack.ss_size = task->stacksize;
+                     task->func_call.uc_stack.ss_sp = task->stack;
+@@ -519,11 +566,19 @@ void WvTaskMan::do_task()
+                             task->tid, (const char *)task->name);
+                     makecontext(&task->func_call,
+                             (void (*)(void))call_func, 1, task);
++#else
++                    assert(setjmp(task->func_call) == 0);
++#endif
+ 
++#ifdef HAVE_GETCONTEXT
+                     context_return = 0;
+                     assert(getcontext(&task->func_return) == 0);
+                     if (context_return == 0)
+                         setcontext(&task->func_call);
++#else
++                    if (setjmp(task->func_return) == 0)
++                        longjmp(task->func_call, 0);
++#endif
+                 }
+ 		
+ 		// the task's function terminated.
+@@ -544,8 +599,12 @@ const void *WvTaskMan::current_top_of_st
+     if (use_shared_stack() || current_task == NULL)
+         return __libc_stack_end;
+     else
++#ifdef HAVE_GETCONTEXT
+         return (const char *)current_task->stack + current_task->stacksize;
+ #else
++        return 0;
++#endif
++#else
+     return 0;
+ #endif
+ }
diff --git a/package/wvstreams/wvstreams-0002-fix-uClibc-compile-execinfo-backtrace.patch b/package/wvstreams/wvstreams-0002-fix-uClibc-compile-execinfo-backtrace.patch
new file mode 100644
index 0000000000..c6317da4dc
--- /dev/null
+++ b/package/wvstreams/wvstreams-0002-fix-uClibc-compile-execinfo-backtrace.patch
@@ -0,0 +1,31 @@
+Fix wvstreams so that it builds with uClibc: we don't have execinfo.h,
+so we can't do backtrace() stuff.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/utils/wvcrash.cc b/utils/wvcrash.cc
+--- a/utils/wvcrash.cc	2008-12-17 12:24:20.000000000 +0000
++++ b/utils/wvcrash.cc	2012-07-27 22:00:15.456502262 +0100
+@@ -28,7 +28,9 @@
+ // FIXME: this file mostly only works in Linux
+ #ifdef __linux
+ 
+-# include <execinfo.h>
++#ifdef HAVE_EXECINFO_H
++#include <execinfo.h>
++#endif
+ #include <unistd.h>
+ 
+ #ifdef __USE_GNU
+@@ -267,9 +269,11 @@ static void wvcrash_real(int sig, int fd
+ 	}
+     }
+ 
++#ifdef HAVE_EXECINFO_H
+     wr(fd, "\nBacktrace:\n");
+     backtrace_symbols_fd(trace,
+ 		 backtrace(trace, sizeof(trace)/sizeof(trace[0])), fd);
++#endif
+     
+     if (pid > 0)
+     {
diff --git a/package/wvstreams/wvstreams-0003-fix-uClibc-compile-misc.patch b/package/wvstreams/wvstreams-0003-fix-uClibc-compile-misc.patch
new file mode 100644
index 0000000000..690a961c12
--- /dev/null
+++ b/package/wvstreams/wvstreams-0003-fix-uClibc-compile-misc.patch
@@ -0,0 +1,16 @@
+Fix wvstreams so that it builds with uClibc: const cast problem.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/crypto/wvx509.cc b/crypto/wvx509.cc
+--- a/crypto/wvx509.cc	2008-10-23 21:23:49.000000000 +0100
++++ b/crypto/wvx509.cc	2012-06-15 18:45:06.605899292 +0100
+@@ -1157,7 +1157,7 @@ WvString WvX509::get_extension(int nid)
+         
+         if (ext)
+         {
+-            X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++          X509V3_EXT_METHOD *method = const_cast<X509V3_EXT_METHOD *>(X509V3_EXT_get(ext));
+             if (!method)
+             {
+                 WvDynBuf buf;
diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
new file mode 100644
index 0000000000..341fc095b4
--- /dev/null
+++ b/package/wvstreams/wvstreams.mk
@@ -0,0 +1,51 @@
+#############################################################
+#
+# wvstreams
+#
+#############################################################
+
+WVSTREAMS_VERSION = 4.6.1
+WVSTREAMS_SITE = http://wvstreams.googlecode.com/files
+WVSTREAMS_DEPENDENCIES = openssl zlib
+WVSTREAMS_INSTALL_STAGING = YES
+
+WVSTREAMS_LICENSE = LGPLv2+
+WVSTREAMS_LICENSE_FILES = LICENSE
+
+# N.B. parallel make fails
+WVSTREAMS_MAKE = $(MAKE1)
+
+# Needed to work around problem with wvassert.h
+WVSTREAMS_CONF_OPT += CPPFLAGS=-DNDEBUG
+
+WVSTREAMS_CONF_OPT += --with-openssl --with-zlib --without-pam
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+	WVSTREAMS_DEPENDENCIES += dbus
+	WVSTREAMS_CONF_OPT += --with-dbus
+else
+	WVSTREAMS_CONF_OPT += --without-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_TCL),y)
+	WVSTREAMS_DEPENDENCIES += tcl
+	WVSTREAMS_CONF_OPT += --with-tcl
+else
+	WVSTREAMS_CONF_OPT += --without-tcl
+endif
+
+ifeq ($(BR2_PACKAGE_QT),y)
+	WVSTREAMS_DEPENDENCIES += qt
+	WVSTREAMS_CONF_OPT += --with-qt
+else
+	WVSTREAMS_CONF_OPT += --without-qt
+endif
+
+ifeq ($(BR2_PACKAGE_VALGRIND),y)
+	WVSTREAMS_DEPENDENCIES += valgrind
+	WVSTREAMS_CONF_OPT += --with-valgrind
+else
+	WVSTREAMS_CONF_OPT += --without-valgrind
+endif
+
+$(eval $(autotools-package))

From 20d371fd12eb9c2cdcaa9b9c68873ac72d4ddbbc Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 25 Apr 2013 10:07:02 +0000
Subject: [PATCH 4996/6849] wvdial: new package

[Peter: adjust help text]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/wvdial/Config.in                      |  9 ++++
 .../wvdial/wvdial-0001-uClibc-scandir.patch   | 23 ++++++++++
 package/wvdial/wvdial.mk                      | 42 +++++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 package/wvdial/Config.in
 create mode 100644 package/wvdial/wvdial-0001-uClibc-scandir.patch
 create mode 100644 package/wvdial/wvdial.mk

diff --git a/package/Config.in b/package/Config.in
index 426c833f71..b7f2e4ba68 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -789,6 +789,7 @@ source "package/wireless-regdb/Config.in"
 source "package/wireless_tools/Config.in"
 source "package/wireshark/Config.in"
 source "package/wpa_supplicant/Config.in"
+source "package/wvdial/Config.in"
 source "package/xinetd/Config.in"
 source "package/xl2tp/Config.in"
 
diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in
new file mode 100644
index 0000000000..730d35a4bb
--- /dev/null
+++ b/package/wvdial/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_WVDIAL
+	bool "wvdial"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # wvstreams
+	select BR2_PACKAGE_WVSTREAMS
+	help
+	  wvdial is an intelligent Point-to-Point Protocol dialer
+
+	  http://wvdial.googlecode.com/
diff --git a/package/wvdial/wvdial-0001-uClibc-scandir.patch b/package/wvdial/wvdial-0001-uClibc-scandir.patch
new file mode 100644
index 0000000000..b611e94a0b
--- /dev/null
+++ b/package/wvdial/wvdial-0001-uClibc-scandir.patch
@@ -0,0 +1,23 @@
+Fix wvdial so that it works with scandir as defined in uClibc.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/wvmodemscan.cc b/wvmodemscan.cc
+--- a/wvmodemscan.cc	2009-09-29 18:27:28.000000000 +0100
++++ b/wvmodemscan.cc	2012-07-28 14:03:56.359729660 +0100
+@@ -495,13 +495,13 @@ static int fileselect(const struct diren
+ 	// (no internal ISDN support)   || !strncmp(e->d_name, "ttyI", 4);
+ }
+ 
+-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
++#if defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
+ static int filesort(const dirent **e1, const dirent **e2)
+ #else
+ static int filesort(const void *_e1, const void *_e2)
+ #endif
+ {
+-#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
++#if !(defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)))
+     dirent const * const *e1 = (dirent const * const *)_e1;
+     dirent const * const *e2 = (dirent const * const *)_e2;
+ #endif
diff --git a/package/wvdial/wvdial.mk b/package/wvdial/wvdial.mk
new file mode 100644
index 0000000000..89888d4f91
--- /dev/null
+++ b/package/wvdial/wvdial.mk
@@ -0,0 +1,42 @@
+#############################################################
+#
+# wvdial
+#
+#############################################################
+
+WVDIAL_VERSION = 1.61
+WVDIAL_SITE = http://wvdial.googlecode.com/files
+WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2
+WVDIAL_DEPENDENCIES = wvstreams
+
+WVDIAL_LICENSE = LGPLv2
+WVDIAL_LICENSE_FILES = COPYING.LIB
+
+# N.B. parallel make fails
+WVDIAL_MAKE = $(MAKE1)
+
+WVDIAL_MAKE_ENV += $(TARGET_CONFIGURE_OPTS) \
+	WVSTREAMS_INC="$(STAGING_DIR)/usr/include" \
+	WVSTREAMS_LIB="$(STAGING_DIR)/usr/lib"
+
+define WVDIAL_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) -C $(@D)
+endef
+
+define WVDIAL_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \
+		prefix="$(TARGET_DIR)/usr" PPPDIR="$(TARGET_DIR)/etc/ppp/peers" \
+		install -C $(@D)
+endef
+
+define WVDIAL_UNINSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \
+		prefix="$(TARGET_DIR)/usr" PPPDIR="$(TARGET_DIR)/etc/ppp/peers" \
+		uninstall -C $(@D)
+endef
+
+define WVDIAL_CLEAN_CMDS
+	$(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) clean -C $(@D)
+endef
+
+$(eval $(generic-package))

From b099bb199e5819c1b15b9a623a4e5d9d6423ada4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Apr 2013 08:57:48 +0000
Subject: [PATCH 4997/6849] python-m2crypto: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-m2crypto/python-m2crypto.mk | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/python-m2crypto/python-m2crypto.mk

diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk
new file mode 100644
index 0000000000..2429b24208
--- /dev/null
+++ b/package/python-m2crypto/python-m2crypto.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# python-m2crypto
+#
+#############################################################
+
+PYTHON_M2CRYPTO_VERSION = 0.21.1
+PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto
+PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz
+HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-python host-python-setuptools host-swig
+
+define HOST_PYTHON_M2CRYPTO_BUILD_CMDS
+	(cd $(@D); \
+	$(HOST_CONFIGURE_OPTS) \
+	PYTHONXCPREFIX="$(HOST_DIR)/usr/" \
+	LDFLAGS="-L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib" \
+	$(HOST_DIR)/usr/bin/python setup.py build_ext --openssl=$(HOST_DIR)/usr)
+endef
+
+define HOST_PYTHON_M2CRYPTO_INSTALL_CMDS
+	(cd $(@D); \
+	PYTHONPATH=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
+endef
+
+$(eval $(host-generic-package))

From 9a5820465e79497a1304dcbce9a835dfb1197e6c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Apr 2013 08:57:49 +0000
Subject: [PATCH 4998/6849] crda: new package

Based on the one from Dimitrios Siganos <dimitris@siganos.org> but with
a proper host-python-m2crypto instead of patching.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/crda/Config.in | 15 +++++++++++++++
 package/crda/crda.mk   | 23 +++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/crda/Config.in
 create mode 100644 package/crda/crda.mk

diff --git a/package/Config.in b/package/Config.in
index b7f2e4ba68..fe4f56b736 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -671,6 +671,7 @@ source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/can-utils/Config.in"
 source "package/connman/Config.in"
+source "package/crda/Config.in"
 source "package/ctorrent/Config.in"
 source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
diff --git a/package/crda/Config.in b/package/crda/Config.in
new file mode 100644
index 0000000000..66baf14e3a
--- /dev/null
+++ b/package/crda/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_CRDA
+	bool "crda"
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBNL
+	# regdb is a runtime dependency
+	select BR2_PACKAGE_WIRELESS_REGDB
+	help
+	  Central Regulatory Domain Agent.
+
+	  This package provides a Central Regulatory Domain Agent (CRDA)
+	  to be used by the Linux kernel cf80211 wireless subsystem to
+	  query and apply the regulatory domain settings wireless devices
+	  may operate within for a given location.
+
+	  http://linuxwireless.org/en/developers/Regulatory/CRDA
diff --git a/package/crda/crda.mk b/package/crda/crda.mk
new file mode 100644
index 0000000000..0c9391d510
--- /dev/null
+++ b/package/crda/crda.mk
@@ -0,0 +1,23 @@
+#############################################################
+#
+# crda
+#
+#############################################################
+
+CRDA_VERSION = 1.1.3
+CRDA_SOURCE = crda-$(CRDA_VERSION).tar.bz2
+CRDA_SITE = http://wireless.kernel.org/download/crda
+CRDA_DEPENDENCIES = host-pkgconf host-python-m2crypto \
+	libnl libgcrypt
+CRDA_LICENSE = ISC
+CRDA_LICENSE_FILES = LICENSE
+
+define CRDA_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) all_noverify -C $(@D)
+endef
+
+define CRDA_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR)
+endef
+
+$(eval $(generic-package))

From 88429e0a62d2bf28d61dc05c6b0fd6fb25488ba1 Mon Sep 17 00:00:00 2001
From: Alexander Khryukin <alexander@mezon.ru>
Date: Fri, 9 Nov 2012 02:40:03 +0000
Subject: [PATCH 4999/6849] make version update 3.82

Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/make/make.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/make/make.mk b/package/make/make.mk
index b67f9440cf..25bc5fac2f 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MAKE_VERSION = 3.81
+MAKE_VERSION = 3.82
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
 

From 9ae2f2c2853e8268254a816789c3888173617965 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 May 2013 13:57:45 +0200
Subject: [PATCH 5000/6849] make: add license info

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/make/make.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/make/make.mk b/package/make/make.mk
index 25bc5fac2f..a24a28e8bf 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -7,6 +7,8 @@
 MAKE_VERSION = 3.82
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
+MAKE_LICENSE = GPLv3+
+MAKE_LICENSE_FILES = COPYING
 
 MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 

From 0d2fbe9d75308571da3afc2a5d1f3586c0ca3bec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 01:55:42 +0000
Subject: [PATCH 5001/6849] python: remove smtpd.py

It's mostly sample code, normally not used, and has a bad shebang line.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/python/python.mk b/package/python/python.mk
index 4876dd8b5b..b942854994 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -142,6 +142,13 @@ endef
 
 PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_FIXUP_LIBDIR
 
+# Bad shebang, normally not used
+define PYTHON_REMOVE_SMTPD
+	rm -f $(TARGET_DIR)/usr/bin/smtpd.py
+endef
+
+PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD
+
 #
 # Development files removal
 #

From 05d7edbedc2664b4b1fd8d25c6e2f35620886b01 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 6 May 2013 04:10:53 +0000
Subject: [PATCH 5002/6849] barebox: add custom version option

Add custom version option as used in the linux kernel.
This way we can easily specify newer and older version.
Remove the list of the older versions because is obsoleted
by the new custom version option that is more flexible.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 581cc52615..47926cb731 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -8,22 +8,17 @@ config BR2_TARGET_BAREBOX
 if BR2_TARGET_BAREBOX
 choice
 	prompt "version"
-	default BR2_TARGET_BAREBOX_2013_04
 	help
 	  Select the specific Barebox version you want to use
 
-config BR2_TARGET_BAREBOX_2013_01
-	bool "2013.01.0"
-
-config BR2_TARGET_BAREBOX_2013_02
-	bool "2013.02.0"
-
-config BR2_TARGET_BAREBOX_2013_03
-	bool "2013.03.0"
-
-config BR2_TARGET_BAREBOX_2013_04
+config BR2_TARGET_BAREBOX_LATEST_VERSION
 	bool "2013.04.0"
 
+config BR2_TARGET_BAREBOX_CUSTOM_VERSION
+	bool "Custom version"
+	help
+	  This option allows to use a specific official versions
+
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	bool "Custom tarball"
 
@@ -32,6 +27,10 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT
 
 endchoice
 
+config BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE
+	string "Barebox version"
+	depends on BR2_TARGET_BAREBOX_CUSTOM_VERSION
+
 if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 
 config BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION
@@ -41,10 +40,8 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.01.0"	if BR2_TARGET_BAREBOX_2013_01
-	default "2013.02.0"	if BR2_TARGET_BAREBOX_2013_02
-	default "2013.03.0"	if BR2_TARGET_BAREBOX_2013_03
-	default "2013.04.0"	if BR2_TARGET_BAREBOX_2013_04
+	default "2013.04.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 

From 8a5f0008621919f632d677fc17da4268c6b55fc8 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 6 May 2013 04:10:54 +0000
Subject: [PATCH 5003/6849] barebox: bump version to 2013.05.0

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 47926cb731..21da3f9463 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.04.0"
+	bool "2013.05.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.04.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.05.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From c719ded2b94e2d53988d592c9229ad3544e5168e Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 6 May 2013 04:10:55 +0000
Subject: [PATCH 5004/6849] linux: use BR2_LINUX_KERNEL_LATEST_VERSION as
 option name

Use a option name that doesn't change for every new 3.x version.
It's easier to maintain and consistent with barebox.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 3ec687fc02..586db47dc8 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -20,7 +20,7 @@ if BR2_LINUX_KERNEL
 choice
 	prompt "Kernel version"
 
-config BR2_LINUX_KERNEL_3_9
+config BR2_LINUX_KERNEL_LATEST_VERSION
 	bool "3.9"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9" if BR2_LINUX_KERNEL_3_9
+	default "3.9" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 9e5a5451c7785214568f35e679be0a43ec48f4df Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 04:48:01 +0000
Subject: [PATCH 5005/6849] board/freescale: switch to u-boot 2013.04

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/freescale/mpc8315erdb/readme.txt  | 2 +-
 board/freescale/p1010rdb/readme.txt     | 2 +-
 configs/freescale_mpc8315erdb_defconfig | 2 +-
 configs/freescale_p1010rdb_defconfig    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/freescale/mpc8315erdb/readme.txt b/board/freescale/mpc8315erdb/readme.txt
index 91e58e4d4a..f7f9c94cfb 100644
--- a/board/freescale/mpc8315erdb/readme.txt
+++ b/board/freescale/mpc8315erdb/readme.txt
@@ -6,7 +6,7 @@ It won't work for NOR and will brick that bootloader!
 Also don't go playing around with different U-boot versions or flash targets
 unless you've got the necessary hardware and/or know-how to unbrick your kit.
 
-2012.10 is known good for NAND.
+2013.04 is known good for NAND.
 ******************** WARNING ********************
 
 You'll need to program the files created by buildroot into the flash.
diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt
index 96293b7f39..5b56873f83 100644
--- a/board/freescale/p1010rdb/readme.txt
+++ b/board/freescale/p1010rdb/readme.txt
@@ -6,7 +6,7 @@ It won't work for NAND or SPI and will brick those bootloaders!
 Also don't go playing around with different U-boot versions or flash targets
 unless you've got the necessary hardware and/or know-how to unbrick your kit.
 
-2012.10 is known good for NOR, but BAD for NAND and SPI.
+2013.04 is known good for NOR.
 ******************** WARNING ********************
 
 You'll need to program the files created by buildroot into the flash.
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
index 9f733fae35..88e0d8a078 100644
--- a/configs/freescale_mpc8315erdb_defconfig
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -30,4 +30,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
-BR2_TARGET_UBOOT_2012_10=y
+BR2_TARGET_UBOOT_2013_04=y
diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig
index a36f07c09b..88876362b7 100644
--- a/configs/freescale_p1010rdb_defconfig
+++ b/configs/freescale_p1010rdb_defconfig
@@ -29,4 +29,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR"
-BR2_TARGET_UBOOT_2012_10=y
+BR2_TARGET_UBOOT_2013_04=y

From 856727f4d0e5c8db9316c97cd2f4a51a643e373d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 14 Jun 2012 10:02:11 +0000
Subject: [PATCH 5006/6849] jquery-ui: new package

[Peter: select jquery, update for generic-package, drop _PATH options]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/jquery-ui/Config.in    | 10 ++++++++++
 package/jquery-ui/jquery-ui.mk | 35 ++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/jquery-ui/Config.in
 create mode 100644 package/jquery-ui/jquery-ui.mk

diff --git a/package/Config.in b/package/Config.in
index fe4f56b736..6dc00220cf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -488,6 +488,7 @@ source "package/flot/Config.in"
 source "package/jquery/Config.in"
 source "package/jquery-keyboard/Config.in"
 source "package/jquery-sparkline/Config.in"
+source "package/jquery-ui/Config.in"
 source "package/jquery-validation/Config.in"
 source "package/jsmin/Config.in"
 source "package/json-javascript/Config.in"
diff --git a/package/jquery-ui/Config.in b/package/jquery-ui/Config.in
new file mode 100644
index 0000000000..f1653d5ab8
--- /dev/null
+++ b/package/jquery-ui/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_JQUERY_UI
+	bool "jQuery UI"
+	select BR2_PACKAGE_JQUERY
+	help
+	  jQuery UI provides abstractions for low-level interaction and
+	  animation, advanced effects and high-level, themeable widgets,
+	  built on top of the jQuery JavaScript Library, that you can use
+	  to build highly interactive web applications.
+
+	  http://jqueryui.com/
diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk
new file mode 100644
index 0000000000..3fd9e4319d
--- /dev/null
+++ b/package/jquery-ui/jquery-ui.mk
@@ -0,0 +1,35 @@
+#############################################################
+#
+# jquery-ui
+#
+#############################################################
+
+JQUERY_UI_VERSION = 1.8.21
+JQUERY_UI_SITE = http://jquery-ui.googlecode.com/files
+JQUERY_UI_SOURCE = jquery-ui-$(JQUERY_UI_VERSION).zip
+
+define JQUERY_UI_EXTRACT_CMDS
+	unzip -d $(@D) $(DL_DIR)/$(JQUERY_UI_SOURCE)
+	mv $(@D)/jquery-ui-$(JQUERY_UI_VERSION)/* $(@D)
+	$(RM) -r $(@D)/jquery-ui-$(JQUERY_UI_VERSION)
+endef
+
+define JQUERY_UI_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/ui/minified/jquery-ui.min.js \
+		$(TARGET_DIR)/var/www/jquery-ui.js
+	$(INSTALL) -m 0644 -D $(@D)/ui/minified/i18n/jquery-ui-i18n.min.js \
+		$(TARGET_DIR)/var/www/jquery-ui-i18n.js
+	$(INSTALL) -m 0644 -D $(@D)/themes/base/minified/jquery-ui.min.css \
+		$(TARGET_DIR)/var/www/jquery-ui.css
+	$(INSTALL) -d $(TARGET_DIR)/var/www/images
+	cp -a $(@D)/themes/base/minified/images/*.png \
+		$(TARGET_DIR)/var/www/images
+	chmod 0644 $(TARGET_DIR)/var/www/images/*.png
+endef
+
+define JQUERY_UI_UNINSTALL_TARGET_CMDS
+	$(RM) $(addprefix $(TARGET_DIR)/var/www/,\
+		jquery-ui.js jquery-ui-i18n.js jquery-ui.css)
+endef
+
+$(eval $(generic-package))

From c85f2cb0843f569c16f8628dc401dcf84f5d175f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 May 2013 17:38:18 +0200
Subject: [PATCH 5007/6849] jquery-ui: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-ui/jquery-ui.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk
index 3fd9e4319d..9e19f1362c 100644
--- a/package/jquery-ui/jquery-ui.mk
+++ b/package/jquery-ui/jquery-ui.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-JQUERY_UI_VERSION = 1.8.21
-JQUERY_UI_SITE = http://jquery-ui.googlecode.com/files
+JQUERY_UI_VERSION = 1.10.3
+JQUERY_UI_SITE = http://jqueryui.com/resources/download
 JQUERY_UI_SOURCE = jquery-ui-$(JQUERY_UI_VERSION).zip
 
 define JQUERY_UI_EXTRACT_CMDS

From 0421f606f0f3479ea87a302ccc601627067282ba Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 May 2013 17:39:29 +0200
Subject: [PATCH 5008/6849] jquery-ui: add license info

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-ui/jquery-ui.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk
index 9e19f1362c..9375ec260d 100644
--- a/package/jquery-ui/jquery-ui.mk
+++ b/package/jquery-ui/jquery-ui.mk
@@ -7,6 +7,8 @@
 JQUERY_UI_VERSION = 1.10.3
 JQUERY_UI_SITE = http://jqueryui.com/resources/download
 JQUERY_UI_SOURCE = jquery-ui-$(JQUERY_UI_VERSION).zip
+JQUERY_UI_LICENSE = MIT
+JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt
 
 define JQUERY_UI_EXTRACT_CMDS
 	unzip -d $(@D) $(DL_DIR)/$(JQUERY_UI_SOURCE)

From 77572e6f9fa116562f050b3d1c255ba0010e8ff0 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 14 Jun 2012 10:02:12 +0000
Subject: [PATCH 5009/6849] jquery-ui-themes: new package

[Peter: drop CSS path option, depend on jquery-ui, misc cleanups]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/jquery-ui-themes/Config.in           | 14 +++++++++
 package/jquery-ui-themes/jquery-ui-themes.mk | 32 ++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 package/jquery-ui-themes/Config.in
 create mode 100644 package/jquery-ui-themes/jquery-ui-themes.mk

diff --git a/package/Config.in b/package/Config.in
index 6dc00220cf..6b38242139 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -489,6 +489,7 @@ source "package/jquery/Config.in"
 source "package/jquery-keyboard/Config.in"
 source "package/jquery-sparkline/Config.in"
 source "package/jquery-ui/Config.in"
+source "package/jquery-ui-themes/Config.in"
 source "package/jquery-validation/Config.in"
 source "package/jsmin/Config.in"
 source "package/json-javascript/Config.in"
diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
new file mode 100644
index 0000000000..dfde9c193e
--- /dev/null
+++ b/package/jquery-ui-themes/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_JQUERY_UI_THEMES
+	bool "jQuery UI themes"
+	depends on BR2_PACKAGE_JQUERY_UI
+	help
+	  Themes for jQuery UI.
+
+	  http://jqueryui.com/
+
+config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
+	string "theme to install"
+	default "base"
+	depends on BR2_PACKAGE_JQUERY_UI_THEMES
+	help
+	  Specify the name of the jQuery UI theme to install.
diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk
new file mode 100644
index 0000000000..ae50ad41b4
--- /dev/null
+++ b/package/jquery-ui-themes/jquery-ui-themes.mk
@@ -0,0 +1,32 @@
+#############################################################
+#
+# jquery-ui-themes
+#
+#############################################################
+
+JQUERY_UI_THEMES_VERSION = 1.8.21
+JQUERY_UI_THEMES_SITE = http://jquery-ui.googlecode.com/files
+JQUERY_UI_THEMES_SOURCE = jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION).zip
+JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui
+
+define JQUERY_UI_THEMES_EXTRACT_CMDS
+	unzip -d $(@D) $(DL_DIR)/$(JQUERY_UI_THEMES_SOURCE)
+	mv $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)/* $(@D)
+	$(RM) -r $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)
+endef
+
+define JQUERY_UI_THEMES_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D \
+		$(@D)/themes/$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME)/jquery-ui.css \
+		$(TARGET_DIR)/var/www/jquery-ui.css
+	$(INSTALL) -d $(TARGET_DIR)/var/www/images
+	cp -a $(@D)/themes/$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME)/images/*.png \
+		$(TARGET_DIR)/var/www/images
+	chmod 0644 $(TARGET_DIR)/var/www/images/*.png
+endef
+
+define JQUERY_UI_THEMES_UNINSTALL_TARGET_CMDS
+	$(RM) $(TARGET_DIR)/var/www/jquery-ui.css
+endef
+
+$(eval $(generic-package))

From 98328fd693fabeaf48e67e51a5b4ba2924992534 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 May 2013 23:47:58 +0200
Subject: [PATCH 5010/6849] jquery-ui-themes: add license info

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-ui-themes/jquery-ui-themes.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk
index ae50ad41b4..089d80883f 100644
--- a/package/jquery-ui-themes/jquery-ui-themes.mk
+++ b/package/jquery-ui-themes/jquery-ui-themes.mk
@@ -7,6 +7,8 @@
 JQUERY_UI_THEMES_VERSION = 1.8.21
 JQUERY_UI_THEMES_SITE = http://jquery-ui.googlecode.com/files
 JQUERY_UI_THEMES_SOURCE = jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION).zip
+JQUERY_UI_THEMES_LICENSE = MIT
+JQUERY_UI_THEMES_LICENSE_FILES = MIT-LICENSE.txt
 JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui
 
 define JQUERY_UI_THEMES_EXTRACT_CMDS

From ea1ece13e219a592e0ea3a4f9d7f1c6d1ef86fb0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 6 May 2013 23:52:41 +0200
Subject: [PATCH 5011/6849] jquery-ui-themes: bump version

The base theme is no longer available in the themes download (it is the
standard theme installed by jquery-ui), so default to ui-lightness instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-ui-themes/Config.in           | 2 +-
 package/jquery-ui-themes/jquery-ui-themes.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
index dfde9c193e..9a15140858 100644
--- a/package/jquery-ui-themes/Config.in
+++ b/package/jquery-ui-themes/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_JQUERY_UI_THEMES
 
 config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
 	string "theme to install"
-	default "base"
+	default "ui-lightness"
 	depends on BR2_PACKAGE_JQUERY_UI_THEMES
 	help
 	  Specify the name of the jQuery UI theme to install.
diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk
index 089d80883f..3c51b89566 100644
--- a/package/jquery-ui-themes/jquery-ui-themes.mk
+++ b/package/jquery-ui-themes/jquery-ui-themes.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-JQUERY_UI_THEMES_VERSION = 1.8.21
-JQUERY_UI_THEMES_SITE = http://jquery-ui.googlecode.com/files
+JQUERY_UI_THEMES_VERSION = 1.10.3
+JQUERY_UI_THEMES_SITE = http://jqueryui.com/resources/download
 JQUERY_UI_THEMES_SOURCE = jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION).zip
 JQUERY_UI_THEMES_LICENSE = MIT
 JQUERY_UI_THEMES_LICENSE_FILES = MIT-LICENSE.txt

From 9c177b2c107a59f1f457c2dce9c5276ed7e17b98 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 05:28:19 +0000
Subject: [PATCH 5012/6849] erlang: needs mmu

Fixes:
http://autobuild.buildroot.net/results/5b3411008ddf89aef55c8dd8682b894cf9860d13/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/erlang/Config.in b/package/erlang/Config.in
index 6dd5a39c3d..6920db689a 100644
--- a/package/erlang/Config.in
+++ b/package/erlang/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ERLANG
 	bool "erlang"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Erlang is a programming language used to build massively scalable
 	  soft real-time systems with requirements on high availability.

From 498ddd195a42978f25855f09525012c26101b711 Mon Sep 17 00:00:00 2001
From: "Michael J. Hammel" <buildroot@graphics-muse.org>
Date: Mon, 6 May 2013 06:19:39 +0000
Subject: [PATCH 5013/6849] Update webkit download URL

Signed-off-by: Michael J. Hammel <mjhammel@graphics-muse.org>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index d37601fb63..264bcad12e 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 WEBKIT_VERSION = 1.2.7
-WEBKIT_SITE = http://www.webkitgtk.org
+WEBKIT_SITE = http://www.webkitgtk.org/releases
 WEBKIT_INSTALL_STAGING = YES
 WEBKIT_DEPENDENCIES = host-flex host-bison host-gperf icu libcurl libxml2 \
 	libxslt libgtk2 sqlite enchant libsoup jpeg libgail

From 8ee4b6946ef87533ad29d1c2438b1d4ffbf8ca5c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 07:02:57 +0000
Subject: [PATCH 5014/6849] ebtables: fix static build

ebtables has a funky way of building the static version.
Fixes:
http://autobuild.buildroot.net/results/f5916d84194b6aa02d8eca7cbbb4e7867bb6afd4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ebtables/ebtables.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 3f667baf52..7ccdcb4c24 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -9,11 +9,19 @@ EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(EBTABLES_VERSION)
 EBTABLES_LICENSE = GPLv2
 EBTABLES_LICENSE_FILES = COPYING
+EBTABLES_STATIC = $(if $(BR2_PREFER_STATIC_LIB),static)
 
 define EBTABLES_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \
+		-C $(@D)
 endef
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define EBTABLES_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \
+		$(TARGET_DIR)/sbin/ebtables
+endef
+else
 define EBTABLES_INSTALL_TARGET_CMDS
 	for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \
 		$(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \
@@ -24,6 +32,7 @@ define EBTABLES_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
 		$(TARGET_DIR)/sbin/ebtables
 endef
+endif
 
 define EBTABLES_UNINSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/lib/ebtables

From b9da3bab1efc5bedc49f5d31f30d32237de05872 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 07:57:16 +0000
Subject: [PATCH 5015/6849] blackbox: needs mmu

Fixes:
http://autobuild.buildroot.net/results/644617ae64b39c57428c3e57115c3e6df5396d16/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/blackbox/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index 70f7eb4b57..c183133e99 100644
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_BLACKBOX
 	bool "blackbox"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_XLIB_LIBX11
 	help

From 619146d145813b5040960b6008e68e63a8943832 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 03:13:32 +0000
Subject: [PATCH 5016/6849] python-netifaces: use single version externally
 managed

We want --single-version-externally-managed (and --root=/) to make
python packages uncompressed (python eggs are zip files) since
compression should be a target filesystem responsibility.
And we don't need/want multiple versions of the same package in the
target since packages should be handled by buildroot on any sane
embedded system.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-netifaces/python-netifaces.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index 906f83d427..d742cbde98 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -18,8 +18,10 @@ define PYTHON_NETIFACES_BUILD_CMDS
 endef
 
 define PYTHON_NETIFACES_INSTALL_TARGET_CMDS
-	(cd $(@D); PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
-	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+	(cd $(@D); \
+	PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+	$(HOST_DIR)/usr/bin/python setup.py install \
+	--single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr)
 endef
 
 $(eval $(generic-package))

From 2ffad2a1f2f6abd60769bd7f2753ebe3d9ca0396 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 03:15:22 +0000
Subject: [PATCH 5017/6849] python-setuptools: forkbump and add workaround for
 shebangs

Switch to distribute fork since it's maintained and fixes a few issues
while bumping to version 0.6.36.
There's work upstream in re-merging with setuptools which is now
supposedly maintained, see
http://mail.python.org/pipermail/distutils-sig/2013-March/020126.html

Buildroot python packages should use --single-version-externally-managed
and --root=/ in the install phase even if they're not setuptools-based.
This is because the default is to build egg files (zip files) for
packages to support multiple target versions, and since the packages
should be handled by buildroot infrastructure that's not needed.
Also potentially doing double-compression is time-wasting (i.e. egg
file and target filesystem) when running on slow targets.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../python-setuptools-add-executable.patch    | 50 +++++++++++++++++++
 .../python-setuptools/python-setuptools.mk    | 25 +++++++---
 2 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 package/python-setuptools/python-setuptools-add-executable.patch

diff --git a/package/python-setuptools/python-setuptools-add-executable.patch b/package/python-setuptools/python-setuptools-add-executable.patch
new file mode 100644
index 0000000000..77127096bd
--- /dev/null
+++ b/package/python-setuptools/python-setuptools-add-executable.patch
@@ -0,0 +1,50 @@
+Add a new --executable option to distribute so that we can
+force the shebang line in installed python scripts.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura distribute-0.6.36.orig/setuptools/command/install.py distribute-0.6.36/setuptools/command/install.py
+--- distribute-0.6.36.orig/setuptools/command/install.py	2013-04-13 09:46:23.160823598 -0300
++++ distribute-0.6.36/setuptools/command/install.py	2013-04-13 11:17:28.418841986 -0300
+@@ -6,6 +6,7 @@
+     """Use easy_install to install the package, w/dependencies"""
+
+     user_options = _install.user_options + [
++        ('executable=', 'e', "specify final destination interpreter path"),
+         ('old-and-unmanageable', None, "Try not to use this!"),
+         ('single-version-externally-managed', None,
+             "used by system package builders to create 'flat' eggs"),
+@@ -21,6 +22,7 @@
+
+     def initialize_options(self):
+         _install.initialize_options(self)
++        self.executable = None
+         self.old_and_unmanageable = None
+         self.single_version_externally_managed = None
+         self.no_compile = None  # make DISTUTILS_DEBUG work right!
+diff -Nura distribute-0.6.36.orig/setuptools/command/install_scripts.py distribute-0.6.36/setuptools/command/install_scripts.py
+--- distribute-0.6.36.orig/setuptools/command/install_scripts.py	2013-04-13 09:46:23.160823598 -0300
++++ distribute-0.6.36/setuptools/command/install_scripts.py	2013-04-13 11:24:32.305416400 -0300
+@@ -10,6 +10,13 @@
+     def initialize_options(self):
+         _install_scripts.initialize_options(self)
+         self.no_ep = False
++        self.executable = None
++
++    def finalize_options(self):
++        _install_scripts.finalize_options(self)
++        self.set_undefined_options('install',
++          ('executable','executable')
++        )
+
+     def run(self):
+         from setuptools.command.easy_install import get_script_args
+@@ -31,6 +38,8 @@
+         )
+         bs_cmd = self.get_finalized_command('build_scripts')
+         executable = getattr(bs_cmd,'executable',sys_executable)
++        if self.executable is not None:
++          executable = self.executable
+         is_wininst = getattr(
+             self.get_finalized_command("bdist_wininst"), '_is_running', False
+         )
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 25fddb9fae..1ff9f897bf 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -4,9 +4,14 @@
 #
 #############################################################
 
-PYTHON_SETUPTOOLS_VERSION = 0.6c11
-PYTHON_SETUPTOOLS_SOURCE  = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
-PYTHON_SETUPTOOLS_SITE    = http://pypi.python.org/packages/source/s/setuptools
+# "distribute" is a fork of the unmaintained setuptools package. There
+# are plans to re-merge it into setuptools; if this happens, we can
+# switch back to it.
+# See http://pypi.python.org/packages/source/s/setuptools
+
+PYTHON_SETUPTOOLS_VERSION = 0.6.36
+PYTHON_SETUPTOOLS_SOURCE  = distribute-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
+PYTHON_SETUPTOOLS_SITE    = http://pypi.python.org/packages/source/d/distribute
 PYTHON_SETUPTOOLS_DEPENDENCIES = python
 
 define HOST_PYTHON_SETUPTOOLS_BUILD_CMDS
@@ -14,19 +19,23 @@ define HOST_PYTHON_SETUPTOOLS_BUILD_CMDS
 endef
 
 define PYTHON_SETUPTOOLS_BUILD_CMDS
-	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+	(cd $(@D); \
+	PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
+	$(HOST_DIR)/usr/bin/python setup.py build)
 endef
 
 define HOST_PYTHON_SETUPTOOLS_INSTALL_CMDS
-	(cd $(@D); PYTHONPATH="$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"\
+	(cd $(@D); \
+	PYTHONPATH="$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
 	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
 endef
 
 define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
-	(cd $(@D); PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"\
-	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+	(cd $(@D); \
+	PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
+	$(HOST_DIR)/usr/bin/python setup.py install --executable=/usr/bin/python \
+	--single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr)
 endef
 
 $(eval $(generic-package))
 $(eval $(host-generic-package))
-

From 8989ecda1bd8955b8a5dfebf0b28ddf1cb2e9058 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 04:35:44 +0000
Subject: [PATCH 5018/6849] flex: only needs gettext if locale is selected

Also add missing select in Config.in.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/Config.in | 1 +
 package/flex/flex.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/flex/Config.in b/package/flex/Config.in
index 90a75f4756..f74a0f0e8b 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FLEX
 	bool "flex"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A fast lexical analyser generator.  A tool for generating
 	  programs that perform pattern-matching on text.
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 59551f22b3..f7e319f1c4 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -10,7 +10,7 @@ FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
 FLEX_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) host-m4
+	$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES = host-m4
 

From 9a55068547c511d5c0750b8b558400601f3209f3 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 04:35:50 +0000
Subject: [PATCH 5019/6849] ndisc6: only needs gettext if locale is selected

Also add missing select in Config.in.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ndisc6/Config.in | 1 +
 package/ndisc6/ndisc6.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 126bfa2bb8..6abe4ce2ea 100644
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -4,6 +4,7 @@ comment "ndisc6 requires a toolchain with IPv6 support"
 config BR2_PACKAGE_NDISC6
 	bool "ndisc6 tools"
 	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  NDisc6 is a small collection of useful tools for IPv6 networking
 
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index f58cc13bea..1d3c0e7205 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -10,7 +10,7 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
 NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 NDISC6_DEPENDENCIES += gettext
 NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
 endif

From c260b94dd70c6a10938a7e8ad35b41631aad234a Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Tue, 30 Apr 2013 08:38:29 +0000
Subject: [PATCH 5020/6849] libnl: enable parallel make

Current versions of libnl (since 3.2.4, at least) do not appear to
require MAKE1.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnl/libnl.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 2a9f5a9a77..681d364e96 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -10,7 +10,6 @@ LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison host-flex
-LIBNL_MAKE = $(MAKE1)
 LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \
 	cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \
 	qdisc-list

From eecf7795c1440afdaf4d3a75e9dcd144db45db8d Mon Sep 17 00:00:00 2001
From: Vinicius Tinti <viniciustinti@gmail.com>
Date: Wed, 20 Mar 2013 23:59:20 +0000
Subject: [PATCH 5021/6849] python-thrift: new package

Add Python bindings for the Apache Thrift RPC.

Thrift is an interface definition language that is used to define and create
services for numerous languages using remote procedure calls (RPC).

This patch does not include the Thrift code generator. It only includes the
Thrift libraries used at runtime.

Signed-off-by: Tiago Maluta <tiagomaluta@gmail.com>
Signed-off-by: Vinicius Tinti <viniciustinti@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/python-thrift/Config.in        |  7 ++++++
 package/python-thrift/python-thrift.mk | 30 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/python-thrift/Config.in
 create mode 100644 package/python-thrift/python-thrift.mk

diff --git a/package/Config.in b/package/Config.in
index 6b38242139..81a3f76e18 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -341,6 +341,7 @@ source "package/python-pygame/Config.in"
 source "package/python-pyparsing/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
+source "package/python-thrift/Config.in"
 endmenu
 endif
 source "package/ruby/Config.in"
diff --git a/package/python-thrift/Config.in b/package/python-thrift/Config.in
new file mode 100644
index 0000000000..94a75900fe
--- /dev/null
+++ b/package/python-thrift/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_THRIFT
+	bool "python-thrift"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  python-thrift is a Python bindings for the Apache Thrift RPC system.
+
+	  http://thrift.apache.org/
diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk
new file mode 100644
index 0000000000..c2fc752642
--- /dev/null
+++ b/package/python-thrift/python-thrift.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# python-thrift
+#
+#############################################################
+
+PYTHON_THRIFT_VERSION = 0.9.0
+PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz
+PYTHON_THRIFT_SITE = http://pypi.python.org/packages/source/t/thrift
+PYTHON_THRIFT_LICENSE = Apache-2.0
+PYTHON_THRIFT_LICENSE_FILES = README
+
+PYTHON_THRIFT_DEPENDENCIES = python
+
+define PYTHON_THRIFT_BUILD_CMDS
+	(cd $(@D); \
+		PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		$(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+# host-distutilscross, if it has been installed before, will check that
+# the installation directory is in python's load path. For host-python,
+# it is not, so add it explicitly while installing to target.
+define PYTHON_THRIFT_INSTALL_TARGET_CMDS
+	(cd $(@D); PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+		$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From 9d240560eb21df15004683981ed364928effbf2e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 6 May 2013 14:31:26 +0000
Subject: [PATCH 5022/6849] libmicrohttpd: bump to version 0.9.27

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/libmicrohttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index b1bee53e82..2fb79c5e3c 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBMICROHTTPD_VERSION = 0.9.26
+LIBMICROHTTPD_VERSION = 0.9.27
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_INSTALL_STAGING = YES
 

From 0a93b81487ee4a3af0d5b5c0fc3eeb70d8a3c244 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 6 May 2013 21:07:46 +0000
Subject: [PATCH 5023/6849] uboot: add custom version option

Add custom version option as used in the linux kernel and barebox.
This way we can easily specify newer and older version.
Remove the list of the older versions because is obsoleted
by the new custom version option that is more flexible.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 2e95f7622d..a1874a1583 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -14,29 +14,16 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2013_04
 	help
 	  Select the specific U-Boot version you want to use
 
-config BR2_TARGET_UBOOT_2013_04
+config BR2_TARGET_UBOOT_LATEST_VERSION
 	bool "2013.04"
 
-config BR2_TARGET_UBOOT_2013_01
-	bool "2013.01.01"
-
-config BR2_TARGET_UBOOT_2012_10
-	bool "2012.10"
-
-config BR2_TARGET_UBOOT_2012_07
-	bool "2012.07"
-
-config BR2_TARGET_UBOOT_2012_04
-	bool "2012.04.01"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2011_12
-	bool "2011.12"
-	depends on BR2_DEPRECATED
+config BR2_TARGET_UBOOT_CUSTOM_VERSION
+       bool "Custom version"
+	help
+	  This option allows to use a specific official versions
 
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	bool "Custom tarball"
@@ -46,6 +33,10 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT
 
 endchoice
 
+config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
+	string "U-Boot version"
+	depends on BR2_TARGET_UBOOT_CUSTOM_VERSION
+
 if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
@@ -55,12 +46,8 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2013.04"	if BR2_TARGET_UBOOT_2013_04
-	default "2013.01.01"	if BR2_TARGET_UBOOT_2013_01
-	default "2012.10"	if BR2_TARGET_UBOOT_2012_10
-	default "2012.07"	if BR2_TARGET_UBOOT_2012_07
-	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04
-	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
+	default "2013.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 

From 5a6b7aa8d1f8765deb21ca01284029e33a7635cc Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 6 May 2013 21:07:47 +0000
Subject: [PATCH 5024/6849] configs: use new u-boot custom version option

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/beaglebone_defconfig            | 3 ++-
 configs/freescale_mpc8315erdb_defconfig | 3 ++-
 configs/freescale_p1010rdb_defconfig    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index 8eeed77dce..21770685e8 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -21,7 +21,8 @@ BR2_DEFAULT_KERNEL_VERSION="3.2.9"
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
-BR2_TARGET_UBOOT_2013_04=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
index 88e0d8a078..d32264ea90 100644
--- a/configs/freescale_mpc8315erdb_defconfig
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -30,4 +30,5 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
-BR2_TARGET_UBOOT_2013_04=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig
index 88876362b7..9ee541fb67 100644
--- a/configs/freescale_p1010rdb_defconfig
+++ b/configs/freescale_p1010rdb_defconfig
@@ -29,4 +29,5 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR"
-BR2_TARGET_UBOOT_2013_04=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"

From f273ae0406f6f309f4e750e680c936afc443ea2f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 7 May 2013 00:34:49 +0000
Subject: [PATCH 5025/6849] configs: update boards to u-boot custom version
 option

Some board configs where left out of the u-boot custom version
migration, so do it otherwise they'll just pull the latest version which
might not work and brick the device.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91rm9200df_defconfig | 3 ++-
 configs/atngw100_defconfig     | 3 ++-
 configs/atstk100x_defconfig    | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 74b5a6fd92..5994f43e99 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -18,7 +18,8 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.38.8"
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91rm9200ek"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.06"
 
 # Kernel
 BR2_LINUX_KERNEL=y
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 9ab6c037b8..4a779e1512 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -14,7 +14,8 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atngw100"
-BR2_TARGET_UBOOT_2010_09=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09"
 
 # Kernel
 BR2_LINUX_KERNEL=y
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 1af5001115..fe7e498f63 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -4,7 +4,8 @@ BR2_avr32=y
 # U-Boot
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atstk1002"
-BR2_TARGET_UBOOT_2010_09=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09"
 
 # Kernel
 BR2_LINUX_KERNEL=y
@@ -15,5 +16,3 @@ BR2_LINUX_KERNEL_DEFCONFIG="atstk1002"
 
 # Filesystem
 BR2_TARGET_ROOTFS_TAR=y
-
-

From b2c8569f04f36a545c9e63e1372495e8e502efa6 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 7 May 2013 00:09:16 +0000
Subject: [PATCH 5026/6849] jquery-ui-themes: strip theme name

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-ui-themes/jquery-ui-themes.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk
index 3c51b89566..c410b64568 100644
--- a/package/jquery-ui-themes/jquery-ui-themes.mk
+++ b/package/jquery-ui-themes/jquery-ui-themes.mk
@@ -19,10 +19,10 @@ endef
 
 define JQUERY_UI_THEMES_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0644 -D \
-		$(@D)/themes/$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME)/jquery-ui.css \
+		$(@D)/themes/$(call qstrip,$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME))/jquery-ui.css \
 		$(TARGET_DIR)/var/www/jquery-ui.css
 	$(INSTALL) -d $(TARGET_DIR)/var/www/images
-	cp -a $(@D)/themes/$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME)/images/*.png \
+	cp -a $(@D)/themes/$(call qstrip,$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME))/images/*.png \
 		$(TARGET_DIR)/var/www/images
 	chmod 0644 $(TARGET_DIR)/var/www/images/*.png
 endef

From 6a61ef8194bf9e4cf8428005cb02b436d2fb31aa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 May 2013 15:19:22 +0200
Subject: [PATCH 5027/6849] jquery-ui-themes: use a choice option for theme
 name

A bit more user friendly than asking people to figure out the available
themes manually.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-ui-themes/Config.in | 113 +++++++++++++++++++++++++++--
 1 file changed, 108 insertions(+), 5 deletions(-)

diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
index 9a15140858..5168f375be 100644
--- a/package/jquery-ui-themes/Config.in
+++ b/package/jquery-ui-themes/Config.in
@@ -6,9 +6,112 @@ config BR2_PACKAGE_JQUERY_UI_THEMES
 
 	  http://jqueryui.com/
 
-config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
-	string "theme to install"
-	default "ui-lightness"
-	depends on BR2_PACKAGE_JQUERY_UI_THEMES
+if BR2_PACKAGE_JQUERY_UI_THEMES
+
+choice
+	prompt "theme to install"
 	help
-	  Specify the name of the jQuery UI theme to install.
+	  Specify the jQuery UI theme to install.
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+	       bool "black-tie"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+	       bool "blitzer"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+	       bool "cupertino"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+	       bool "dark-hive"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+	       bool "dot-luv"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+	       bool "eggplant"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+	       bool "excite-bike"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+	       bool "flick"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+	       bool "hot-sneaks"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+	       bool "humanity"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+	       bool "le-frog"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+	       bool "mint-choc"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+	       bool "overcast"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+	       bool "pepper-grinder"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+	       bool "redmond"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+	       bool "smoothness"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+	       bool "south-street"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_START
+	       bool "start"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+	       bool "sunny"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+	       bool "swanky-purse"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+	       bool "trontastic"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+	       bool "ui-darkness"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+	       bool "ui-lightness"
+
+	config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+	       bool "vader"
+
+endchoice
+
+config BR2_PACKAGE_JQUERY_UI_THEMES_THEME
+	string
+	default "black-tie"		if BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+	default "blitzer"		if BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+	default "cupertino"		if BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+	default "dark-hive"		if BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+	default "dot-luv"		if BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+	default "eggplant"		if BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+	default "excite-bike"		if BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+	default "flick"			if BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+	default "hot-sneaks"		if BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+	default "humanity"		if BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+	default "le-frog"		if BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+	default "mint-choc"		if BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+	default "overcast"		if BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+	default "pepper-grinder"	if BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+	default "redmond"		if BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+	default "smoothness"		if BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+	default "south-street"		if BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+	default "start"			if BR2_PACKAGE_JQUERY_UI_THEME_START
+	default "sunny"			if BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+	default "swanky-purse"		if BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+	default "trontastic"		if BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+	default "ui-darkness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+	default "ui-lightness"		if BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+	default "vader"			if BR2_PACKAGE_JQUERY_UI_THEME_UI_VADER
+
+endif

From 494d5c9665fd707dc8586478158ed1814ade44c1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 7 May 2013 03:45:50 +0000
Subject: [PATCH 5028/6849] dropbear: disable standalone mode for nommu

dropbear for nommu targets must disable the standalone (non-inetd) mode
since the platform lacks fork(), fixes:
http://autobuild.buildroot.net/results/ecbdfab10f54bec75c112bbf005bba9ae2b18dc8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/dropbear.mk | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index d5dfe6dc84..e00890e2ad 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -39,6 +39,19 @@ define DROPBEAR_BUILD_FEATURED
 	$(SED) 's:.*\(#define DROPBEAR_SHA2_512_HMAC\).*:\1:' $(@D)/options.h
 endef
 
+define DROPBEAR_DISABLE_STANDALONE
+	$(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
+endef
+
+ifeq ($(BR2_USE_MMU),y)
+define DROPBEAR_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/dropbear/S50dropbear \
+		$(TARGET_DIR)/etc/init.d/S50dropbear
+endef
+else
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE
+endif
+
 ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS
 endif
@@ -64,15 +77,6 @@ define DROPBEAR_INSTALL_TARGET_CMDS
 	for f in $(DROPBEAR_TARGET_BINS); do \
 		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \
 	done
-	if [ ! -f $(TARGET_DIR)/etc/init.d/S50dropbear ]; then \
-		$(INSTALL) -m 0755 -D package/dropbear/S50dropbear $(TARGET_DIR)/etc/init.d/S50dropbear; \
-	fi
-endef
-
-define DROPBEAR_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/dropbear
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(DROPBEAR_TARGET_BINS))
-	rm -f $(TARGET_DIR)/etc/init.d/S50dropbear
 endef
 
 $(eval $(autotools-package))

From aec71d643784db991eb74086fc0352f788c86120 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 7 May 2013 23:00:39 +0200
Subject: [PATCH 5029/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4e327a88c6..ba91242406 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,121 @@
+2013.05, Not released yet:
+
+        Architectures: ARC support, Blackfin support, FLAT binary
+        format, ARM: Drop old CPU variants, add fa526/626, Marvell PJ4
+
+	Toolchains: Add new Microblaze external toolchains, Linaro
+	ARM/Aarch64 updates, GCC 4.6.4 / 4.7.3 / 4.8.0 added to
+	internal toolchain, default to GCC 4.7.x.
+
+	Defconfigs: Add Atmel at91sam9g45m10ek, freescale mpc8315erdb
+	& p1010rdb, Armadeus apf27 / apf28, Raspberry pi, gnublin
+	board.
+
+	FS: LZO and XZ compression methods, extra ubifs options,
+	ext2 rev 0/1 and ext3/4 support.
+
+	Patch handling: apply-patches now has .patch.xz support,
+	Patch logic reworked as discussed during Febrary dev days:
+	http://elinux.org/Buildroot:DeveloperDaysFOSDEM2013
+
+	<pkg>-rsync now excludes version control files.
+
+	linux: uImage load address for ARM multiplatform kernels
+
+	Infrastructure for multiple OpenGL / ES / EGL / OpenVG
+	providers, similar to how libjpeg / libjpeg-turbo is handled.
+
+	Infrastructure for packages to add system users.
+
+	kconfig: updated to 3.9-rc2, support make olddefconfig
+
+	Updated/fixed packages: alsa-lib, alsa-utils, apr, apr-util,
+	argp-standalone, at, at91bootstrap, audiofile, aumix, avahi,
+	bash, blackbox, bind, binutils, bison, boost, bridge-utils,
+	busybox, ccache, cifs-utils, cmake, collectd, connman,
+	conntrack-tools, cpanminus, crosstool-ng, diffutils, directfb,
+	directfb-examples, divine, dmalloc, dnsmasq, dosfstools,
+	dropbear, e2fsprogs, ebtables, eeprog, erlang, ethtool, fbset,
+	feh, ffmpeg, file, flex, flot, foomatic, gd, gdb, gdisk,
+	genimage, gettext, gmp, gnuchess, gnutls, gob2, gpsd,
+	gstreamer, haserl, hiawatha, htop, httping, icu,
+	inotify-tools, intltool, iproute2, ipset, iptables, iw, jpeg,
+	jquery, jquery-{sparkline,validation}, json-c, kbd, kexec,
+	kismet, kmod, lcdproc, libarchive, libcap, libconfig,
+	libconfuse, libcurl, libdrm, libeet, libev, libevas,
+	libeXosip2, libffi, libfribi, libfuse, libgcrypt, libglib2,
+	libgtk2, libid3tag, libmicrohttpd, libnetfilter_acct,
+	libnetfilter_conntrack, libnl, libpcap, libplayer, libsigc,
+	libv4l, libxcb, linenoise, linux-pam, lm_sensors,
+	ltp-testsuite, luajit, lzop, madplay, make, mdadm,
+	mediastreamer, memtester, mesa3d,
+	mobile-broadband-provider-info, monit, mpd, mpfr, mpg123,
+	mrouted, nbd, ncurses, ndisc6, neard, neardal, neon, netperf,
+	netsnmp, nettle, nfacct, ntfs-3g, ofono, olsr,
+	omap-u-boot-utils, openssh, openssl, openswan, openvpn,
+	oprofile, orc, pciutils, pcre, perl, php, poco, polarssl,
+	proftpd, psmisc, pulseaudio, python,
+	python-{bottle,netifaces,serial,setuptools}, qt, quagga,
+	quota, radvd, rpi-userland, rt-tests, sam-ba, samba, sawman,
+	sdl, ser2net, smartmontools, socat, socketcand, speex, squid,
+	stress, stunnel, sudo, syslinux, sysstat, sysvinit, tcl,
+	tcprelay, tinyhttpd, tslib, tvheadend, uboot-tools, ulogd,
+	util-linux, vala, vtun, webkit,
+	xapp_{iceauth,luit,makefontscale,sessreg,setxkbmap,smproxy},
+	xapp_{xauth,xcmsdb,xdpyinfo,xev,xgamma,xhost,xinput,xkbcomp},
+	xapp_{xkbevd,xlsatoms,xlsclients,xmodmap,xpr,xprop,xrandr,xrdb},
+	xapp_{xset,xwd,xwininfo}, xcb-{proto,util},
+	xdriver_xf86-input-{evdev,joystick,keyboard,mouse,synptics},
+	xdriver_xf86-input-{tslib,vmmouse,void},
+	xdriver_xf86-video-{ark,ast,ati,cirrus,dummy,geode,glide,glint},
+	xdriver_xf86-video-{i128,intel,mach64,mga,neomagic,newport},
+	xdriver_xf86-video-{openchrome,r128,savage,siliconmotion,sis},
+	xdriver_xf86-video-{tdfx,trident,vesa,vmware,wsfb}, xenomai,
+	xfont, xinetd, xkeyboard-config, xlib_lib{FS,ICE,SM,X11},
+	xlib_libX{scrnSaver,au,aw,cursor,dmcp,ext,fixes,font,ft,i},
+	xlib_libX{inerama,mu,pm,randr,res,tst,v,vMC,xf86dga,xf86vm},
+	xlib_lib{dmx,fontenc,pciaccess,xkbfile}, xlib_xtrans,
+	xproto_{applevm,bigreqs,dri2,fonts,gl,input,kbd,record}proto,
+	xproto_{resource,scrnsaver,xcmisc,xext,x}proto,
+	xserver_xorg-server, xutil_makedepend, xz, zeromq
+
+	New packages: aircrack-ng, bcusdk, crda, cryptodev-linux,
+	cppzmq, czmq, dtach, enscript, exfat, exfat-utils, f2fs-tools,
+	fan-ctrl, filemq, foomatic-filters, genimage, genpart, glibmm,
+	gnuplot, gtest, gutenprint, hplip, iozone, jansson, jhead,
+	jquery-keyboard, jquery-ui, jquery-ui-themes, json-glib,
+	json-javascript, lcms2, libpfm4, libpthsem, libserial,
+	libsigsegv, libtasn1, libwebsockets, libxkbcommon, libxml++,
+	linknx, log4cxx, mongoose, mongrel2, mtools, ne10, nmap,
+	nodejs, openobex, openpgm, poppler, protobuf-c,
+	python-m2crypto, python-thrift, qjson, qt5base,
+	qt5declarative, qt5graphicaleffects, qt5imageformats,
+	qt5jsbackend, qt5multimedia, qt5quick1, qt5script, qt5svg,
+	qt5webkit qt5xmlpatterns, rapidjson, redis, swig, texinfo,
+	tzdata, urg, ussp-push, wayland, webp, weston, wireless-regdb,
+	wireshark, wvdial, wvstreams, xcb-util-image, xcb-util-wm,
+	xcursor-transparent-theme, zic, zmqpp, zyre
+
+	Removed packages: microperl, ocf-linux, xapp_xinit,
+	xapp_xplsprinters, xapp_xprehashprinterlist,
+	xfont_font-bitstream-speedo,
+	xlib_lib{Xfontcache,XprintAppUtil,XprintUtil,Xp,oldX,xkbui},
+	xproto_{print,xf86rush}proto
+
+	Deprecated packages: vala
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#1291: Add support for Faraday 526 arm processor (fa526)
+	#2683: cups does not install correctly to target
+	#3313: mesa3d fails to build
+	#5186: initramfs/cpio should support lzo compression
+	#5636: agetty - cannot get controlling tty error - need updated...
+	#5906: collectd client headers not exported
+	#5966: bison unnecessarily required as build dependency
+	#6140: --enable-fileinfo not applied for php package
+	#6164: openvpn usage of ip tool from Busybox
+
 2013.02, Released February 28th, 2013:
 
 	Misc manual updates.

From 8fda9b78133ae97b373489c3d5fd088ae2b39484 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 6 May 2013 12:47:02 +0000
Subject: [PATCH 5030/6849] toolchain/crostool-NG: mark as deprecated

For the following reasons:
  - it used to be broken without anyone noticing for a long time,
  - it is still not fully integrated within the Buildroot set of options,
  - it has not gained much traction (not even I use it),
  - I've always argued that sustained development should use an external
    toolchain, and not rely on building one with Buildroot,
  - I did not submit any of the enhancements requested during the last
    developpers' day in Brussels,
  - I have neither the incentive nor the time to maintain and enhance it,

it is time to deprecate the crosstool-NG backend for the 2013.05 release.

Then, it will be entirely removed early in the 2013.08 cycle, to let some
time for those that rely on it to voice their opinions. ;-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index e6a3b259d8..665618c7b3 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -22,6 +22,7 @@ config BR2_TOOLCHAIN_EXTERNAL
 
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
+	depends on BR2_DEPRECATED
 	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa && !BR2_arc
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	help

From d189957b5d50b96a7257f97489a175749d0e6b25 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 7 May 2013 10:54:28 +0000
Subject: [PATCH 5031/6849] gperf: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gperf/gperf.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index 1254f0c915..59c5a0926f 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -6,6 +6,8 @@
 
 GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
+GPERF_LICENSE = GPLv3+
+GPERF_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From f183c7362cba836b1dbde37f77fbb6f3e0d7406b Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Tue, 7 May 2013 07:16:19 +0000
Subject: [PATCH 5032/6849] chrony: new package

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/chrony/Config.in |  8 +++++++
 package/chrony/chrony.mk | 46 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 package/chrony/Config.in
 create mode 100644 package/chrony/chrony.mk

diff --git a/package/Config.in b/package/Config.in
index 81a3f76e18..d98087128b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -673,6 +673,7 @@ source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/can-utils/Config.in"
+source "package/chrony/Config.in"
 source "package/connman/Config.in"
 source "package/crda/Config.in"
 source "package/ctorrent/Config.in"
diff --git a/package/chrony/Config.in b/package/chrony/Config.in
new file mode 100644
index 0000000000..05d6fc1a25
--- /dev/null
+++ b/package/chrony/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CHRONY
+	bool "chrony"
+	depends on BR2_USE_MMU # fork()
+	help
+	  Chrony is a pair of programs which are used to maintain the
+	  accuracy of the system clock.
+
+	  http://chrony.tuxfamily.org/
diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk
new file mode 100644
index 0000000000..1cf94a399a
--- /dev/null
+++ b/package/chrony/chrony.mk
@@ -0,0 +1,46 @@
+#############################################################
+#
+# chrony
+#
+#############################################################
+
+CHRONY_VERSION = 1.27
+CHRONY_SITE = http://download.tuxfamily.org/chrony/
+CHRONY_LICENSE = GPLv2
+CHRONY_LICENSE_FILES = COPYING
+
+CHRONY_CONF_OPT = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr
+
+ifeq ($(BR2_PACKAGE_LIBNSS),y)
+CHRONY_DEPENDENCIES += host-pkgconf libnss
+else
+CHRONY_CONF_OPT += --without-nss
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+CHRONY_DEPENDENCIES += readline
+else
+CHRONY_CONF_OPT += --disable-readline
+endif
+
+ifneq ($(BR2_INET_IPV6),y)
+CHRONY_CONF_OPT += --disable-ipv6
+endif
+
+define CHRONY_CONFIGURE_CMDS
+	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPT)
+endef
+
+define CHRONY_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define CHRONY_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+endef
+
+define CHRONY_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/bin/chronyc $(TARGET_DIR)/usr/sbin/chronyd
+endef
+
+$(eval $(generic-package))

From ea78a5f4de26dc3ab0b5c195e0cf5e47719d3c24 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Tue, 7 May 2013 11:29:21 +0000
Subject: [PATCH 5033/6849] msmtp: bump to version 1.4.31

Also added license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/msmtp/msmtp.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index 87a2fbbc22..e99ab3df85 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-MSMTP_VERSION = 1.4.27
+MSMTP_VERSION = 1.4.31
 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
 MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
+MSMTP_LICENSE = GPLv3+
+MSMTP_LICENSE_FILES = COPYING
 
 MSMTP_DEPENDENCIES += host-pkgconf
 

From 288b5493588ee82e65f277be03dd678806306ab5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 7 May 2013 23:40:07 +0000
Subject: [PATCH 5034/6849] patch: fix license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/patch/patch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index badc4310bf..5a421c7559 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -7,6 +7,6 @@
 PATCH_VERSION = 2.7.1
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
 PATCH_LICENSE = GPLv3+
-PATCH_LICENSE_FILE = COPYING
+PATCH_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 7953826e8dd1ea103630dac74cb2fc1537d66b55 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 8 May 2013 00:40:00 +0000
Subject: [PATCH 5035/6849] kernel-headers: bump 3.{0, 4, 8, 9}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.76-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index a6135e3cae..fd52e825e6 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.76"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.77"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.44"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.43"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.44"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.11"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9"		if BR2_KERNEL_HEADERS_3_9
+	default "3.8.12"	if BR2_KERNEL_HEADERS_3_8
+	default "3.9.1"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.76-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.76-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch

From 78ebe9cad85f862929f1b1f57feff715263991f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 8 May 2013 00:40:01 +0000
Subject: [PATCH 5036/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 586db47dc8..53adfcd4cf 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9"
+	bool "3.9.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.1" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From fa3463d64bd43895a8e9eec80d80dcc3e904c665 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 May 2013 13:21:16 +0200
Subject: [PATCH 5037/6849] CHANGES: update with recent changes

And also fixup tabs/spaces mix as pointed out by Thomas.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGES b/CHANGES
index ba91242406..6d1c21fa18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,12 @@
 2013.05, Not released yet:
 
-        Architectures: ARC support, Blackfin support, FLAT binary
-        format, ARM: Drop old CPU variants, add fa526/626, Marvell PJ4
+	Architectures: ARC support, Blackfin support, FLAT binary
+	format, ARM: Drop old CPU variants, add fa526/626, Marvell PJ4
 
 	Toolchains: Add new Microblaze external toolchains, Linaro
 	ARM/Aarch64 updates, GCC 4.6.4 / 4.7.3 / 4.8.0 added to
-	internal toolchain, default to GCC 4.7.x.
+	internal toolchain, default to GCC 4.7.x. Internal
+	Crosstool-ng backend deprecated.
 
 	Defconfigs: Add Atmel at91sam9g45m10ek, freescale mpc8315erdb
 	& p1010rdb, Armadeus apf27 / apf28, Raspberry pi, gnublin
@@ -37,7 +38,7 @@
 	directfb-examples, divine, dmalloc, dnsmasq, dosfstools,
 	dropbear, e2fsprogs, ebtables, eeprog, erlang, ethtool, fbset,
 	feh, ffmpeg, file, flex, flot, foomatic, gd, gdb, gdisk,
-	genimage, gettext, gmp, gnuchess, gnutls, gob2, gpsd,
+	genimage, gettext, gmp, gnuchess, gnutls, gob2, gperf, gpsd,
 	gstreamer, haserl, hiawatha, htop, httping, icu,
 	inotify-tools, intltool, iproute2, ipset, iptables, iw, jpeg,
 	jquery, jquery-{sparkline,validation}, json-c, kbd, kexec,
@@ -50,11 +51,11 @@
 	ltp-testsuite, luajit, lzop, madplay, make, mdadm,
 	mediastreamer, memtester, mesa3d,
 	mobile-broadband-provider-info, monit, mpd, mpfr, mpg123,
-	mrouted, nbd, ncurses, ndisc6, neard, neardal, neon, netperf,
-	netsnmp, nettle, nfacct, ntfs-3g, ofono, olsr,
+	mrouted, msmtp, nbd, ncurses, ndisc6, neard, neardal, neon,
+	netperf, netsnmp, nettle, nfacct, ntfs-3g, ofono, olsr,
 	omap-u-boot-utils, openssh, openssl, openswan, openvpn,
-	oprofile, orc, pciutils, pcre, perl, php, poco, polarssl,
-	proftpd, psmisc, pulseaudio, python,
+	oprofile, orc, patch, pciutils, pcre, perl, php, poco,
+	polarssl, proftpd, psmisc, pulseaudio, python,
 	python-{bottle,netifaces,serial,setuptools}, qt, quagga,
 	quota, radvd, rpi-userland, rt-tests, sam-ba, samba, sawman,
 	sdl, ser2net, smartmontools, socat, socketcand, speex, squid,
@@ -79,16 +80,16 @@
 	xproto_{resource,scrnsaver,xcmisc,xext,x}proto,
 	xserver_xorg-server, xutil_makedepend, xz, zeromq
 
-	New packages: aircrack-ng, bcusdk, crda, cryptodev-linux,
-	cppzmq, czmq, dtach, enscript, exfat, exfat-utils, f2fs-tools,
-	fan-ctrl, filemq, foomatic-filters, genimage, genpart, glibmm,
-	gnuplot, gtest, gutenprint, hplip, iozone, jansson, jhead,
-	jquery-keyboard, jquery-ui, jquery-ui-themes, json-glib,
-	json-javascript, lcms2, libpfm4, libpthsem, libserial,
-	libsigsegv, libtasn1, libwebsockets, libxkbcommon, libxml++,
-	linknx, log4cxx, mongoose, mongrel2, mtools, ne10, nmap,
-	nodejs, openobex, openpgm, poppler, protobuf-c,
-	python-m2crypto, python-thrift, qjson, qt5base,
+	New packages: aircrack-ng, bcusdk, chrony, crda,
+	cryptodev-linux, cppzmq, czmq, dtach, enscript, exfat,
+	exfat-utils, f2fs-tools, fan-ctrl, filemq, foomatic-filters,
+	genimage, genpart, glibmm, gnuplot, gtest, gutenprint, hplip,
+	iozone, jansson, jhead, jquery-keyboard, jquery-ui,
+	jquery-ui-themes, json-glib, json-javascript, lcms2, libpfm4,
+	libpthsem, libserial, libsigsegv, libtasn1, libwebsockets,
+	libxkbcommon, libxml++, linknx, log4cxx, mongoose, mongrel2,
+	mtools, ne10, nmap, nodejs, openobex, openpgm, poppler,
+	protobuf-c, python-m2crypto, python-thrift, qjson, qt5base,
 	qt5declarative, qt5graphicaleffects, qt5imageformats,
 	qt5jsbackend, qt5multimedia, qt5quick1, qt5script, qt5svg,
 	qt5webkit qt5xmlpatterns, rapidjson, redis, swig, texinfo,

From 8dee06013eb9b766add3c94be8a82c3dbe8576d5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 8 May 2013 01:34:21 +0000
Subject: [PATCH 5038/6849] various packages: fix license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb-examples/directfb-examples.mk | 2 +-
 package/divine/divine.mk                       | 2 +-
 package/fb-test-app/fb-test-app.mk             | 2 +-
 package/fxload/fxload.mk                       | 2 +-
 package/libatasmart/libatasmart.mk             | 2 +-
 package/libxmlpp/libxmlpp.mk                   | 2 +-
 package/rpi-firmware/rpi-firmware.mk           | 2 +-
 package/rpi-userland/rpi-userland.mk           | 2 +-
 package/tcl/tcl.mk                             | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 14e544c30d..bcd3c1c4f3 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -8,7 +8,7 @@ DIRECTFB_EXAMPLES_VERSION = 1.6.0
 DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
 DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz
 DIRECTFB_EXAMPLES_LICENSE = MIT
-DIRECTFB_EXAMPLES_LICENSE_FILE = COPYING
+DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING
 DIRECTFB_EXAMPLES_INSTALL_STAGING = YES
 DIRECTFB_EXAMPLES_DEPENDENCIES = directfb
 
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index 596debff8d..adbef37a0e 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -8,7 +8,7 @@
 DIVINE_VERSION = 83cafc257a42b9465cd9d6185bf66b8c1b7ed704
 DIVINE_SITE = git://git.directfb.org/git/directfb/extras/DiVine.git
 DIVINE_LICENSE = LGPLv2.1+
-DIVINE_LICENSE_FILE = COPYING
+DIVINE_LICENSE_FILES = COPYING
 DIVINE_INSTALL_STAGING = YES
 DIVINE_DEPENDENCIES = directfb
 DIVINE_CONFIG_SCRIPTS = divine-config
diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk
index 35e210bd91..7f1751277c 100644
--- a/package/fb-test-app/fb-test-app.mk
+++ b/package/fb-test-app/fb-test-app.mk
@@ -7,7 +7,7 @@
 FB_TEST_APP_VERSION = v1.0.0
 FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
 FB_TEST_APP_LICENSE = GPLv2
-FB_TEST_APP_LICENSE_FILE = COPYING
+FB_TEST_APP_LICENSE_FILES = COPYING
 
 define FB_TEST_APP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
diff --git a/package/fxload/fxload.mk b/package/fxload/fxload.mk
index 1b5e8c7482..8508084e06 100644
--- a/package/fxload/fxload.mk
+++ b/package/fxload/fxload.mk
@@ -6,7 +6,7 @@
 FXLOAD_VERSION = 2008_10_13
 FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION)
 FXLOAD_LICENSE = GPLv2+
-FXLOAD_LICENSE_FILE = COPYING
+FXLOAD_LICENSE_FILES = COPYING
 
 define FXLOAD_BUILD_CMDS
     $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
index 5dbdcc451e..1d96ac7d7b 100644
--- a/package/libatasmart/libatasmart.mk
+++ b/package/libatasmart/libatasmart.mk
@@ -7,7 +7,7 @@ LIBATASMART_VERSION = 0.19
 LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
 LIBATASMART_SITE    = http://0pointer.de/public
 LIBATASMART_LICENSE = LGPLv2.1
-LIBATASMART_LICENSE_FILE = LGPL
+LIBATASMART_LICENSE_FILES = LGPL
 LIBATASMART_INSTALL_STAGING = YES
 
 # package doesn't include configure script
diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk
index 1ed60de74a..41ae7f0958 100644
--- a/package/libxmlpp/libxmlpp.mk
+++ b/package/libxmlpp/libxmlpp.mk
@@ -8,7 +8,7 @@ LIBXMLPP_VERSION_MAJOR = 2.34
 LIBXMLPP_VERSION_MINOR = 2
 LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).$(LIBXMLPP_VERSION_MINOR)
 LIBXMLPP_LICENSE = LGPLv2.1 (library), LGPLv2+ (examples)
-LIBXMLPP_LICENSE_FILE = COPYING
+LIBXMLPP_LICENSE_FILES = COPYING
 LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz
 LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR)
 LIBXMLPP_INSTALL_STAGING = YES
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 5a65e34bee..dcda6b0d6e 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -7,7 +7,7 @@
 RPI_FIRMWARE_VERSION = 76d0ac38f16b6343c6155c80db1e4758b3a5838a
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/master
 RPI_FIRMWARE_LICENSE = BSD-3c
-RPI_FIRMWARE_LICENSE_FILE = boot/LICENCE.broadcom
+RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 
 define RPI_FIRMWARE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 522a97f852..6198671d0a 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -7,7 +7,7 @@
 RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
 RPI_USERLAND_LICENSE = BSD-3c
-RPI_USERLAND_LICENSE_FILE = LICENCE
+RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
 RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index ec089eed47..144fefe03d 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -9,7 +9,7 @@ TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_LICENSE = tcl license
-TCL_LICENSE_FILE = license.terms
+TCL_LICENSE_FILES = license.terms
 TCL_SUBDIR = unix
 TCL_CONF_OPT = \
 		--disable-symbols \

From 5696a87376928651762aea01cd32f3fb3ff2d8aa Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 8 May 2013 02:57:45 +0000
Subject: [PATCH 5039/6849] udev: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udev/udev.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index c55db71274..1c97288d3d 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,9 +3,12 @@
 # udev
 #
 #############################################################
+
 UDEV_VERSION = 182
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
+UDEV_LICENSE = GPLv2+
+UDEV_LICENSE_FILES = COPYING
 UDEV_INSTALL_STAGING = YES
 
 # mq_getattr is in librt

From 8ebfb350a4cca7fc74b8efbbc262fd7d48d09cb4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 May 2013 15:30:52 +0200
Subject: [PATCH 5040/6849] configs: add basic defconfig for openblocks a6

For details, see http://openblocks.plathome.com/products/a6/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/openblocks_a6_defconfig | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 configs/openblocks_a6_defconfig

diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
new file mode 100644
index 0000000000..98017ad1e8
--- /dev/null
+++ b/configs/openblocks_a6_defconfig
@@ -0,0 +1,20 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# system
+BR2_TARGET_GENERIC_HOSTNAME="openblocks-a6"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+
+# filesystem
+BR2_TARGET_ROOTFS_JFFS2=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
+BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="kirkwood-openblocks_a6"

From e7f4923e8efa047433fdda563b3bb7af8f17a9d5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 May 2013 15:49:08 +0200
Subject: [PATCH 5041/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6d1c21fa18..1b350178c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,8 +9,8 @@
 	Crosstool-ng backend deprecated.
 
 	Defconfigs: Add Atmel at91sam9g45m10ek, freescale mpc8315erdb
-	& p1010rdb, Armadeus apf27 / apf28, Raspberry pi, gnublin
-	board.
+	& p1010rdb, Armadeus apf27 / apf28, Openblocks A6, Raspberry
+	pi, gnublin board.
 
 	FS: LZO and XZ compression methods, extra ubifs options,
 	ext2 rev 0/1 and ext3/4 support.
@@ -36,19 +36,19 @@
 	busybox, ccache, cifs-utils, cmake, collectd, connman,
 	conntrack-tools, cpanminus, crosstool-ng, diffutils, directfb,
 	directfb-examples, divine, dmalloc, dnsmasq, dosfstools,
-	dropbear, e2fsprogs, ebtables, eeprog, erlang, ethtool, fbset,
-	feh, ffmpeg, file, flex, flot, foomatic, gd, gdb, gdisk,
-	genimage, gettext, gmp, gnuchess, gnutls, gob2, gperf, gpsd,
-	gstreamer, haserl, hiawatha, htop, httping, icu,
-	inotify-tools, intltool, iproute2, ipset, iptables, iw, jpeg,
-	jquery, jquery-{sparkline,validation}, json-c, kbd, kexec,
-	kismet, kmod, lcdproc, libarchive, libcap, libconfig,
-	libconfuse, libcurl, libdrm, libeet, libev, libevas,
-	libeXosip2, libffi, libfribi, libfuse, libgcrypt, libglib2,
-	libgtk2, libid3tag, libmicrohttpd, libnetfilter_acct,
-	libnetfilter_conntrack, libnl, libpcap, libplayer, libsigc,
-	libv4l, libxcb, linenoise, linux-pam, lm_sensors,
-	ltp-testsuite, luajit, lzop, madplay, make, mdadm,
+	dropbear, e2fsprogs, ebtables, eeprog, erlang, ethtool,
+	fb-test-app, fbset, feh, ffmpeg, file, flex, flot, foomatic,
+	fxload, gd, gdb, gdisk, genimage, gettext, gmp, gnuchess,
+	gnutls, gob2, gperf, gpsd, gstreamer, haserl, hiawatha, htop,
+	httping, icu, inotify-tools, intltool, iproute2, ipset,
+	iptables, iw, jpeg, jquery, jquery-{sparkline,validation},
+	json-c, kbd, kexec, kismet, kmod, lcdproc, libarchive,
+	libatasmart, libcap, libconfig, libconfuse, libcurl, libdrm,
+	libeet, libev, libevas, libeXosip2, libffi, libfribi, libfuse,
+	libgcrypt, libglib2, libgtk2, libid3tag, libmicrohttpd,
+	libnetfilter_acct, libnetfilter_conntrack, libnl, libpcap,
+	libplayer, libsigc, libv4l, libxcb, linenoise, linux-pam,
+	lm_sensors, ltp-testsuite, luajit, lzop, madplay, make, mdadm,
 	mediastreamer, memtester, mesa3d,
 	mobile-broadband-provider-info, monit, mpd, mpfr, mpg123,
 	mrouted, msmtp, nbd, ncurses, ndisc6, neard, neardal, neon,
@@ -57,11 +57,11 @@
 	oprofile, orc, patch, pciutils, pcre, perl, php, poco,
 	polarssl, proftpd, psmisc, pulseaudio, python,
 	python-{bottle,netifaces,serial,setuptools}, qt, quagga,
-	quota, radvd, rpi-userland, rt-tests, sam-ba, samba, sawman,
-	sdl, ser2net, smartmontools, socat, socketcand, speex, squid,
-	stress, stunnel, sudo, syslinux, sysstat, sysvinit, tcl,
-	tcprelay, tinyhttpd, tslib, tvheadend, uboot-tools, ulogd,
-	util-linux, vala, vtun, webkit,
+	quota, radvd, rpi-firmware, rpi-userland, rt-tests, sam-ba,
+	samba, sawman, sdl, ser2net, smartmontools, socat, socketcand,
+	speex, squid, stress, stunnel, sudo, syslinux, sysstat,
+	sysvinit, tcl, tcprelay, tinyhttpd, tslib, tvheadend,
+	uboot-tools, udev, ulogd, util-linux, vala, vtun, webkit,
 	xapp_{iceauth,luit,makefontscale,sessreg,setxkbmap,smproxy},
 	xapp_{xauth,xcmsdb,xdpyinfo,xev,xgamma,xhost,xinput,xkbcomp},
 	xapp_{xkbevd,xlsatoms,xlsclients,xmodmap,xpr,xprop,xrandr,xrdb},

From 92651931e72afad0f829d651ad3d0286b5a14e06 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 May 2013 15:51:45 +0200
Subject: [PATCH 5042/6849] Update for 2013.05-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1b350178c8..1686aa6a71 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.05, Not released yet:
+2013.05-rc1, Released May 8th, 2013:
 
 	Architectures: ARC support, Blackfin support, FLAT binary
 	format, ARM: Drop old CPU variants, add fa526/626, Marvell PJ4
diff --git a/Makefile b/Makefile
index 9128c75796..a57975e427 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.05-git
+export BR2_VERSION:=2013.05-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 10bf5d854e..d199fdfec7 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -12,16 +12,16 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2013.02.tar.gz">buildroot-2013.02.tar.gz</a>
 or
 <a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>.
-<!--
+
 <p>
-The latest release candidate is <b>2013.02-rc3</b>, which can be
+The latest release candidate is <b>2013.05-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.02-rc3.tar.gz">buildroot-2013.02-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2013.05-rc1.tar.gz">buildroot-2013.05-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.02-rc3.tar.bz2">buildroot-2013.02-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.05-rc1.tar.bz2">buildroot-2013.05-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index db203ac1af..665b3bfe26 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>8 May 2013 -- 2013.05-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.05_rc1">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.05-rc1.tar.bz2">2013.05-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>28 February 2013 -- 2013.02 released</b>
 
     <p>The stable 2013.02 release is out - Thanks to everyone

From f787cd2085daf9208e788813cb21da70d53e9c4d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 10 May 2013 00:14:40 +0000
Subject: [PATCH 5043/6849] hplip: needs threads

Hplip needs threads because libusb needs them. Fixes:
http://autobuild.buildroot.net/results/12fb9bb8c93c1cc1f93ba8e15558d1630f2e7c3d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/hplip/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/hplip/Config.in b/package/hplip/Config.in
index d8a1580e39..c67a8b24c9 100644
--- a/package/hplip/Config.in
+++ b/package/hplip/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_HPLIP
 	bool "hplip"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_CUPS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_JPEG
 	help
@@ -14,5 +15,5 @@ config BR2_PACKAGE_HPLIP
 
 	  http://hplipopensource.com/
 
-comment "hplip requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "hplip requires a toolchain with C++ and thread support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From ee377acd8713330e54ef62babbc0b4a5c040446a Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 9 May 2013 12:22:02 +0000
Subject: [PATCH 5044/6849] python-nfc: needs toolchain with threads support

python-nfc uses libusb that requires a toolchain with threads support

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-nfc/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in
index c928ba1f3b..dc46d6c6d1 100644
--- a/package/python-nfc/Config.in
+++ b/package/python-nfc/Config.in
@@ -1,9 +1,13 @@
 config BR2_PACKAGE_PYTHON_NFC
 	bool "python-nfc"
 	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
 	  Python module for near field communication.
 
 	  https://launchpad.net/nfcpy
+
+comment "python-nfc requires a toolchain with threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From ecd0f65af92c224d9d17450ffdef00bd929bcfdf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 07:14:24 +0000
Subject: [PATCH 5045/6849] json-c: bump to version 0.11

Bumping this package is needed, because json-c 0.10 has a major
defect: it installs a library named libjson.so, which conflicts with
the library installed by the libjson package.

This has been changed in the upstream json-c 0.11 version, which now
installs libjson-c and json-c.pc.

It allows to solve the Pulseaudio link problem, which wants to link
against json-c but happens to link against libjson when libjson has
been compiled and installed after json-c.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...dd-missing-file-to-installed-headers.patch | 43 -------------------
 package/json-c/json-c-no-reentrant.patch      | 25 ++++++++---
 package/json-c/json-c.mk                      |  6 ++-
 3 files changed, 23 insertions(+), 51 deletions(-)
 delete mode 100644 package/json-c/json-c-add-missing-file-to-installed-headers.patch

diff --git a/package/json-c/json-c-add-missing-file-to-installed-headers.patch b/package/json-c/json-c-add-missing-file-to-installed-headers.patch
deleted file mode 100644
index 12ef8558d1..0000000000
--- a/package/json-c/json-c-add-missing-file-to-installed-headers.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2ab6524ca0cfaab7feb42f7c328db8fca7b111fc Mon Sep 17 00:00:00 2001
-From: Gilles Talis <gilles.talis@gmail.com>
-Date: Tue, 5 Mar 2013 21:59:11 -0800
-Subject: [PATCH] Add json_object_iterator.h to installed headers
-
-Backported from: 4154c55edae6f6b34d6ef4fcc331055fdf8e1a23
-
-In addition to original patch, applied the same change to Makefile.in
-to avoid having the package to be autoreconfigured.
-
-Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
----
- Makefile.am |    1 +
- Makefile.in |    1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index d4a7bbb..8f09ca8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,6 +17,7 @@ libjsoninclude_HEADERS = \
- 	json_config.h \
- 	json_inttypes.h \
- 	json_object.h \
-+	json_object_iterator.h \
- 	json_object_private.h \
- 	json_tokener.h \
- 	json_util.h \
-diff --git a/Makefile.in b/Makefile.in
-index c06db3e..9d924cd 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -278,6 +278,7 @@ libjsoninclude_HEADERS = \
- 	json_config.h \
- 	json_inttypes.h \
- 	json_object.h \
-+	json_object_iterator.h \
- 	json_object_private.h \
- 	json_tokener.h \
- 	json_util.h \
--- 
-1.7.10.4
-
diff --git a/package/json-c/json-c-no-reentrant.patch b/package/json-c/json-c-no-reentrant.patch
index 31343c0a83..b8ae6bb249 100644
--- a/package/json-c/json-c-no-reentrant.patch
+++ b/package/json-c/json-c-no-reentrant.patch
@@ -13,19 +13,32 @@ Index: b/Makefile.am.inc
 --- a/Makefile.am.inc
 +++ b/Makefile.am.inc
 @@ -1,2 +1,2 @@
--AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-+AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
+-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE
  
 Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -263,7 +263,7 @@
+@@ -274,7 +274,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-+AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
+-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE
  EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
  SUBDIRS = . tests
- lib_LTLIBRARIES = libjson.la
+ lib_LTLIBRARIES = libjson-c.la $(am__append_1)
+Index: b/tests/Makefile.in
+===================================================================
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -228,7 +228,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE
+ LIBJSON_LA = $(top_builddir)/libjson-c.la
+ test1_LDADD = $(LIBJSON_LA)
+ test1Formatted_LDADD = $(LIBJSON_LA)
diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
index a0b5cae5a9..031b541995 100644
--- a/package/json-c/json-c.mk
+++ b/package/json-c/json-c.mk
@@ -4,8 +4,10 @@
 #
 ################################################################################
 
-JSON_C_VERSION = 0.10
-JSON_C_SITE = https://github.com/downloads/json-c/json-c
+JSON_C_VERSION = 0.11
+JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases/
 JSON_C_INSTALL_STAGING = YES
+JSON_C_MAKE = $(MAKE1)
+JSON_C_CONF_OPT = --disable-oldname-compat
 
 $(eval $(autotools-package))

From 2c1a1bb1cd9fd2bd46f2d32f98a8ffc6b536b983 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 07:14:25 +0000
Subject: [PATCH 5046/6849] pulseaudio: link against json-c

Add an upstream patch that makes Pulseaudio link against json-c
instead of json, so that it works with json-c 0.11, and doesn't cause
problems with libjson has been also installed in the system. Note that
this fix has been merged in Pulseaudio after the 3.0 release, so we
will have to keep this patch around when bumping to 3.0.

Fixes
http://autobuild.buildroot.org/results/91ffd3196092c48b88f59adb12741b3f93064dea/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../pulseaudio-compat-with-json-c-0.11.patch  | 26 +++++++++++++++++++
 package/multimedia/pulseaudio/pulseaudio.mk   |  6 +++++
 2 files changed, 32 insertions(+)
 create mode 100644 package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch

diff --git a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch
new file mode 100644
index 0000000000..86efdfdb3f
--- /dev/null
+++ b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch
@@ -0,0 +1,26 @@
+From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun.raghavan@collabora.co.uk>
+Date: Sat, 27 Apr 2013 03:27:05 +0000
+Subject: build-sys: json-c changed everything :(
+
+json-c 0.11 ships a pkg-config file with a different name, and changes
+the name of its library as well.
+---
+(limited to 'configure.ac')
+
+diff --git a/configure.ac b/configure.ac
+index c8161a4..b1bd21a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
+ 
+ #### json parsing ####
+ 
+-PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])
++PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [],
++		  [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])])
+ AC_SUBST(LIBJSON_CFLAGS)
+ AC_SUBST(LIBJSON_LIBS)
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 16df855557..aa67592d29 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -32,6 +32,12 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
+# One patch touches configure.ac. We unconditionnally need libglib2
+# because configure.ac uses AM_GLIB_GNU_GETTEXT. This unconditionnal
+# dependency can be removed once the patch is removed.
+PULSEAUDIO_AUTORECONF = YES
+PULSEAUDIO_DEPENDENCIES += libglib2
+
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 # The optional webrtc echo canceller is written in C++, causing auto* to want
 # to link module-echo-cancel.so with CXX even if webrtc ISN'T used.

From ff24e7f040b2d2b805699bc8ead7bf82f1d4f7dc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 02:28:37 +0000
Subject: [PATCH 5047/6849] wvstreams: fix build failures

Add a patch to fix wvstreams build failures such as
http://autobuild.buildroot.org/results/8cb2904113a5e63d6170c085f77a8040d50a0138/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../wvstreams-0004-build-fixes.patch          | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/wvstreams/wvstreams-0004-build-fixes.patch

diff --git a/package/wvstreams/wvstreams-0004-build-fixes.patch b/package/wvstreams/wvstreams-0004-build-fixes.patch
new file mode 100644
index 0000000000..21792d7422
--- /dev/null
+++ b/package/wvstreams/wvstreams-0004-build-fixes.patch
@@ -0,0 +1,40 @@
+Add missing includes for proper build on Linux/glibc
+
+The current wvstreams code doesn't build on Linux/glibc, with error
+about chmod() not being available (for wvunixdgsocket.cc) or umask()
+not being available (for wvatomicfile.cc). Those errors turn out to be
+missing includes. Those includes were in fact already done, but
+conditionally for MacOS. We make them unconditional (it probably
+breaks other platforms, but since Buildroot is Linux only, we don't
+care).
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/ipstreams/wvunixdgsocket.cc
+===================================================================
+--- a/ipstreams/wvunixdgsocket.cc
++++ b/ipstreams/wvunixdgsocket.cc
+@@ -1,8 +1,6 @@
+ #include "wvunixdgsocket.h"
+-#ifdef MACOS
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#endif
+ 
+ WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
+     : socketfile(filename)
+Index: b/streams/wvatomicfile.cc
+===================================================================
+--- a/streams/wvatomicfile.cc
++++ b/streams/wvatomicfile.cc
+@@ -10,10 +10,7 @@
+ #include "wvatomicfile.h"
+ #include "wvfileutils.h"
+ #include "wvstrutils.h"
+-
+-#ifdef MACOS
+ #include <sys/stat.h>
+-#endif
+ 
+ WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
+     : tmp_file(WvString::null)

From 9b34cc0bcd9f223ba836882c9d08e1a3f95560bc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 02:28:38 +0000
Subject: [PATCH 5048/6849] wvstreams: disable warnings

During the compilation of wvstreams, a number of strict aliasing
related warnings are shown, making the build quite noisy. Turn
warnings off using the --disable-warnings option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wvstreams/wvstreams.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index 341fc095b4..837c4495b3 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -18,7 +18,11 @@ WVSTREAMS_MAKE = $(MAKE1)
 # Needed to work around problem with wvassert.h
 WVSTREAMS_CONF_OPT += CPPFLAGS=-DNDEBUG
 
-WVSTREAMS_CONF_OPT += --with-openssl --with-zlib --without-pam
+WVSTREAMS_CONF_OPT += \
+	--with-openssl \
+	--with-zlib \
+	--without-pam \
+	--disable-warnings
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	WVSTREAMS_DEPENDENCIES += dbus

From 9988d3f7800097cd62439b380ccf039790712f58 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 8 May 2013 06:07:47 +0000
Subject: [PATCH 5049/6849] atk: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 2a85edde0e..f5b2e91b61 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -3,10 +3,13 @@
 # atk
 #
 #############################################################
+
 ATK_VERSION_MAJOR = 1.33
 ATK_VERSION = $(ATK_VERSION_MAJOR).6
 ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
+ATK_LICENSE = LGPLv2+
+ATK_LICENSE_FILES = COPYING
 ATK_INSTALL_STAGING = YES
 ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 

From 06e5c7a11136c7a2eaad458f8f1dcb77dddc1e22 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 8 May 2013 06:12:38 +0000
Subject: [PATCH 5050/6849] dbus: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index ec42874b62..3aa13458e5 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,8 +3,11 @@
 # dbus
 #
 #############################################################
+
 DBUS_VERSION = 1.4.24
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_LICENSE = AFLv2.1 GPLv2+
+DBUS_LICENSE_FILES = COPYING
 DBUS_INSTALL_STAGING = YES
 
 DBUS_DEPENDENCIES = host-pkgconf

From 88587d5b146cc644d8ef7135142dd6e107290ac0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 11 May 2013 12:39:57 +0200
Subject: [PATCH 5051/6849] qt5imageformats: needs gui support in qt5base

Fixes http://autobuild.buildroot.net/results/8843619e91958766c66c0955f363bbfc733b31e6/build-end.log

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5imageformats/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in
index d37e08f0cb..f976caff2a 100644
--- a/package/qt5/qt5imageformats/Config.in
+++ b/package/qt5/qt5imageformats/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_QT5IMAGEFORMATS
 	bool "qt5imageformats"
 	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.

From 2e040c6310eb0de6049d45563ba767c2c9b191d6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 May 2013 02:18:19 +0000
Subject: [PATCH 5052/6849] strace: unavailable for AArch64 and ARC

strace isn't available for the AArch64 and ARC architectures.
The patchset for AArch64 is somewhat big and complicated (needs updates
to other bits) so it'd probably be better to use a git version of strace
or wait for a new release.
http://autobuild.buildroot.net/results/506f4adec348f0b616ad09bddbcbc242e38253b8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/strace/Config.in b/package/strace/Config.in
index 4b203778ef..153bcf69a0 100644
--- a/package/strace/Config.in
+++ b/package/strace/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_STRACE
 	bool "strace"
-	depends on !BR2_xtensa
+	depends on !(BR2_xtensa || BR2_aarch64 || BR2_arc)
 	help
 	  A useful diagnostic, instructional, and debugging tool.
 	  Allows you to track what system calls a program makes

From 8c87152fe88fa3a30c93aec6b01574bf37e2b328 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 May 2013 02:21:25 +0000
Subject: [PATCH 5053/6849] ltrace: unavailable for ARC architecture

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index a56c55e783..4f1c42f7ac 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa || BR2_aarch64)
+	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa || BR2_aarch64 || BR2_arc)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.

From e074805b5c1c96788e001869936d8fcc8b9b9edb Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Sat, 11 May 2013 00:21:35 +0000
Subject: [PATCH 5054/6849] Disable building of cups driver in host-gutenprint

This should fix http://autobuild.buildroot.org/results/d2e386b50744aeda7257a0b78aafe90ba4da697c/
Because there is no host-cups package, host-gutenprint cant build the
host-cups drivers - missing includes and libs.  Host gutenprint only
built to get the xml. Thus not a loss.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gutenprint/gutenprint.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 0463771381..a598ea99e4 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -41,6 +41,13 @@ HOST_GUTENPRINT_DEPENDENCIES =
 # The host-gutenprint shall create the required header
 HOST_GUTENPRINT_MAKE_ENV =
 
+# Even with --without-cups, gutenprint will still add the output of
+# cups-config --cflags / --ldflags to it's compiler/linker flags if
+# available on host.
+# Notice: Because of the configure logic, it needs to be set to the
+# empty string to to disable this, not just to /bin/false like elsewhere.
+HOST_GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=''
+
 HOST_GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
                            --disable-samples \
                            --without-gimp2 \
@@ -51,7 +58,8 @@ HOST_GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
                            --without-foomatic3 \
                            --disable-escputil \
                            --disable-test \
-                           --disable-testpattern
+                           --disable-testpattern \
+                           --without-cups
 
 # Needed by autoreconf
 define GUTENPRINT_CREATE_M4_DIR

From e2e8bb3580bb9b3b93adae0521eea27861d4c6f4 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 11 May 2013 21:18:49 +0200
Subject: [PATCH 5055/6849] gutenprint: disable (doxygen) documentation
 generation

Just wastes build time, so disable it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gutenprint/gutenprint.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index a598ea99e4..b4698437c1 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -23,6 +23,7 @@ GUTENPRINT_DEPENDENCIES += host-gutenprint
 
 GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
                       --disable-samples \
+                      --without-doc \
                       --without-gimp2 \
                       --without-foomatic \
                       --without-foomatic3 \

From 0a442d05cf994cd3ad3b107964feec1ffccef0b8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 May 2013 03:58:25 +0000
Subject: [PATCH 5056/6849] libcurl: add security patch for CVE-2013-1944

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...9.patch => libcurl-01-CVE-2013-0249.patch} |  0
 .../libcurl/libcurl-02-CVE-2013-1944.patch    | 57 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 rename package/libcurl/{libcurl-cve-2013-0249.patch => libcurl-01-CVE-2013-0249.patch} (100%)
 create mode 100644 package/libcurl/libcurl-02-CVE-2013-1944.patch

diff --git a/package/libcurl/libcurl-cve-2013-0249.patch b/package/libcurl/libcurl-01-CVE-2013-0249.patch
similarity index 100%
rename from package/libcurl/libcurl-cve-2013-0249.patch
rename to package/libcurl/libcurl-01-CVE-2013-0249.patch
diff --git a/package/libcurl/libcurl-02-CVE-2013-1944.patch b/package/libcurl/libcurl-02-CVE-2013-1944.patch
new file mode 100644
index 0000000000..18d9c2d396
--- /dev/null
+++ b/package/libcurl/libcurl-02-CVE-2013-1944.patch
@@ -0,0 +1,57 @@
+From 3604fde3d3c9b0d0e389e079aecf470d123ba180 Mon Sep 17 00:00:00 2001
+From: YAMADA Yasuharu <yasuharu.yamada@access-company.com>
+Date: Thu, 11 Apr 2013 00:17:15 +0200
+Subject: [PATCH] cookie: fix tailmatching to prevent cross-domain leakage
+
+Cookies set for 'example.com' could accidentaly also be sent by libcurl
+to the 'bexample.com' (ie with a prefix to the first domain name).
+
+This is a security vulnerabilty, CVE-2013-1944.
+
+Bug: http://curl.haxx.se/docs/adv_20130412.html
+---
+ lib/cookie.c |   24 +++++++++++++++++++-----
+ 1 file changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/lib/cookie.c b/lib/cookie.c
+index 4b9ec0b..a67204e 100644
+--- a/lib/cookie.c
++++ b/lib/cookie.c
+@@ -118,15 +118,29 @@ static void freecookie(struct Cookie *co)
+   free(co);
+ }
+ 
+-static bool tailmatch(const char *little, const char *bigone)
++static bool tailmatch(const char *cooke_domain, const char *hostname)
+ {
+-  size_t littlelen = strlen(little);
+-  size_t biglen = strlen(bigone);
++  size_t cookie_domain_len = strlen(cooke_domain);
++  size_t hostname_len = strlen(hostname);
+ 
+-  if(littlelen > biglen)
++  if(hostname_len < cookie_domain_len)
+     return FALSE;
+ 
+-  return Curl_raw_equal(little, bigone+biglen-littlelen) ? TRUE : FALSE;
++  if(!Curl_raw_equal(cooke_domain, hostname+hostname_len-cookie_domain_len))
++    return FALSE;
++
++  /* A lead char of cookie_domain is not '.'.
++     RFC6265 4.1.2.3. The Domain Attribute says:
++       For example, if the value of the Domain attribute is
++       "example.com", the user agent will include the cookie in the Cookie
++       header when making HTTP requests to example.com, www.example.com, and
++       www.corp.example.com.
++   */
++  if(hostname_len == cookie_domain_len)
++    return TRUE;
++  if('.' == *(hostname + hostname_len - cookie_domain_len - 1))
++    return TRUE;
++  return FALSE;
+ }
+ 
+ /*
+-- 
+1.7.10.4
+

From 12fafd0c3116e328572c203edf96bcf5ffa7e456 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 May 2013 02:56:58 +0000
Subject: [PATCH 5057/6849] configs/qemu: bump relevant configs to kernel
 version 3.9.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_nuri_defconfig         | 2 +-
 configs/qemu_arm_versatile_defconfig    | 2 +-
 configs/qemu_arm_vexpress_defconfig     | 2 +-
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips64_malta_defconfig     | 2 +-
 configs/qemu_mips_malta_defconfig       | 2 +-
 configs/qemu_mipsel_malta_defconfig     | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 2 +-
 configs/qemu_ppc_virtex_ml507_defconfig | 2 +-
 configs/qemu_x86_64_defconfig           | 2 +-
 configs/qemu_x86_defconfig              | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index f83e53dc44..c7e0eed70b 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index dcfd0add3f..1c79daab85 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.9.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index d48c0aab06..0e2c176203 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index d79fc1deb2..f91e2f7393 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.9.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 9a250721a5..ed9c8764f3 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.9.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 751ce5bce4..554f0b4f00 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 7049de6580..4dc3683907 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 4936df1591..eae86ab065 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 044090460a..fdf6fb6f22 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 909448d8c7..5280cbb68d 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 0843062843..70322211c8 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.9.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 9c2f050241..919d875ff7 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.9.config"

From d131f75019ed770db7d010a9eefdf1696ad82718 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 11 May 2013 21:48:57 +0200
Subject: [PATCH 5058/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1686aa6a71..97f5a4d88a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+2013.05, Not released yet:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: dbus, gutenprint, hplip, json-c,
+	libcurl, pulseaudio, python-nfc, qt5imageformats, strace,
+	wvstreams
+
 2013.05-rc1, Released May 8th, 2013:
 
 	Architectures: ARC support, Blackfin support, FLAT binary

From 603293f5ff8e2aa95075f03f1044afb1a7c03919 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 May 2013 04:49:34 +0000
Subject: [PATCH 5059/6849] toolchain-external: fix bug #5054

The external toolchain logic checks (and finds) the proper ARCH_LIB_DIR
and forcibly copies it to */lib even if it's in */lib64
This is all well until the check is done for create_lib64_symlinks which
only verifies if ARCH_SYSROOT_DIR/lib64 is a symlink, which in some
toolchain it's a real directory (like sourcery x86_64 2012.09) and thus
doesn't make the symlink in the target.

Fix this by also checking for a real directory.

Easily reproducible by running "make qemu_x86_64_defconfig", switching
to an external toolchain before build, building and then trying to run
the resulting image.

Closes bug #5054

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES                                  | 4 ++++
 toolchain/toolchain-external/ext-tool.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 97f5a4d88a..04c1eeddd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 	libcurl, pulseaudio, python-nfc, qt5imageformats, strace,
 	wvstreams
 
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5054: amd64: cannot find init - due to missing /lib64 folder
+
 2013.05-rc1, Released May 8th, 2013:
 
 	Architectures: ARC support, Blackfin support, FLAT binary
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index bf2bee8683..a87bc3b5a6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -446,7 +446,7 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	fi ; \
 	$(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \
 	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
-	if [ -L $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
+	if [ -L $${ARCH_SYSROOT_DIR}/lib64 -o -d $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
 	fi ; \
 	if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \

From 7d6449bb165c8708652bbc3e0373cc6d70299afe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 7 May 2013 06:39:44 +0000
Subject: [PATCH 5060/6849] ptpd: new package

Add the new ptpd package, loosely based on the one from bug #2305.
This one handles the IEEE 1588-2002 spec.

[Peter: mark init script as executable]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/ptpd/Config.in |  7 +++++++
 package/ptpd/S65ptpd   | 29 +++++++++++++++++++++++++++++
 package/ptpd/ptpd.mk   | 25 +++++++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 package/ptpd/Config.in
 create mode 100755 package/ptpd/S65ptpd
 create mode 100644 package/ptpd/ptpd.mk

diff --git a/package/Config.in b/package/Config.in
index d98087128b..544a43125e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -751,6 +751,7 @@ source "package/pppd/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
 source "package/proxychains-ng/Config.in"
+source "package/ptpd/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
diff --git a/package/ptpd/Config.in b/package/ptpd/Config.in
new file mode 100644
index 0000000000..2d87ca31bb
--- /dev/null
+++ b/package/ptpd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PTPD
+	bool "ptpd"
+	help
+	  The PTP daemon (PTPd) implements the Precision Time protocol
+	  (PTP) as defined by the IEEE-1588-2002.
+
+	  http://ptpd.sourceforge.net/
diff --git a/package/ptpd/S65ptpd b/package/ptpd/S65ptpd
new file mode 100755
index 0000000000..4206c5e0c9
--- /dev/null
+++ b/package/ptpd/S65ptpd
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Start ptpd
+#
+
+case "$1" in
+  start)
+	echo -n "Starting ptpd: "
+	start-stop-daemon -S -q -x /usr/sbin/ptpd -- -S
+	if [ $? != 0 ]; then
+		echo "FAILED"
+		exit 1
+	else
+		echo "OK"
+	fi
+	;;
+  stop)
+	echo -n "Stopping ptpd: "
+	start-stop-daemon -K -q -x /usr/sbin/ptpd
+	echo "OK"
+	;;
+  restart|reload)
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/ptpd/ptpd.mk b/package/ptpd/ptpd.mk
new file mode 100644
index 0000000000..481a64eef0
--- /dev/null
+++ b/package/ptpd/ptpd.mk
@@ -0,0 +1,25 @@
+#############################################################
+#
+# ptpd
+#
+#############################################################
+
+PTPD_VERSION = 1.1.0
+PTPD_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD_VERSION)
+PTPD_LICENSE = BSD
+PTPD_LICENSE_FILES = COPYRIGHT
+
+define PTPD_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src
+endef
+
+define PTPD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/src/ptpd $(TARGET_DIR)/usr/sbin/ptpd
+endef
+
+define PTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 755 -D package/ptpd/S65ptpd \
+		$(TARGET_DIR)/etc/init.d/S65ptpd
+endef
+
+$(eval $(generic-package))

From 5b190e6b6d2f98dae54fb92191000fa9a66dd79e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 7 May 2013 06:39:45 +0000
Subject: [PATCH 5061/6849] ptpd2: new package

Add the ptpd2 package, handles the IEEE 1588-2008 spec which is not
backward compatible to IEEE 1588-2002.

[Peter: mark init script as executable]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/ptpd2/Config.in |  7 +++++++
 package/ptpd2/S65ptpd2  | 29 +++++++++++++++++++++++++++++
 package/ptpd2/ptpd2.mk  | 26 ++++++++++++++++++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 package/ptpd2/Config.in
 create mode 100755 package/ptpd2/S65ptpd2
 create mode 100644 package/ptpd2/ptpd2.mk

diff --git a/package/Config.in b/package/Config.in
index 544a43125e..bbacd5c546 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -752,6 +752,7 @@ source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
 source "package/proxychains-ng/Config.in"
 source "package/ptpd/Config.in"
+source "package/ptpd2/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
diff --git a/package/ptpd2/Config.in b/package/ptpd2/Config.in
new file mode 100644
index 0000000000..bf26453c52
--- /dev/null
+++ b/package/ptpd2/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PTPD2
+	bool "ptpd2"
+	help
+	  The PTP daemon (PTPd) implements the Precision Time protocol
+	  (PTP) as defined by the IEEE-1588-2008.
+
+	  http://ptpd.sourceforge.net/
diff --git a/package/ptpd2/S65ptpd2 b/package/ptpd2/S65ptpd2
new file mode 100755
index 0000000000..7d4ee7f4bf
--- /dev/null
+++ b/package/ptpd2/S65ptpd2
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Start ptpd2
+#
+
+case "$1" in
+  start)
+	echo -n "Starting ptpd2: "
+	start-stop-daemon -S -q -x /usr/sbin/ptpd2 -- -g
+	if [ $? != 0 ]; then
+		echo "FAILED"
+		exit 1
+	else
+		echo "OK"
+	fi
+	;;
+  stop)
+	echo -n "Stopping ptpd2: "
+	start-stop-daemon -K -q -x /usr/sbin/ptpd2
+	echo "OK"
+	;;
+  restart|reload)
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk
new file mode 100644
index 0000000000..04a0070dc7
--- /dev/null
+++ b/package/ptpd2/ptpd2.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# ptpd2
+#
+#############################################################
+
+PTPD2_VERSION = 2.2.2
+PTPD2_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD2_VERSION)
+PTPD2_SOURCE = ptpd-$(PTPD2_VERSION).tar.gz
+PTPD2_LICENSE = BSD-2c
+PTPD2_LICENSE_FILES = COPYRIGHT
+
+define PTPD2_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src
+endef
+
+define PTPD2_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/src/ptpd2 $(TARGET_DIR)/usr/sbin/ptpd2
+endef
+
+define PTPD2_INSTALL_INIT_SYSV
+	$(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \
+		$(TARGET_DIR)/etc/init.d/S65ptpd2
+endef
+
+$(eval $(generic-package))

From 3a19a70b2e11676a02adecd245ef5acc28de57c1 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 8 May 2013 22:45:05 +0000
Subject: [PATCH 5062/6849] luafilesystem: bump to version 1.6.2

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luafilesystem/luafilesystem.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index 8553212984..d23fbce47e 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUAFILESYSTEM_VERSION = 1.5.0
+LUAFILESYSTEM_VERSION = 1.6.2
 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem
 LUAFILESYSTEM_DEPENDENCIES = lua
 LUAFILESYSTEM_LICENSE = MIT

From 4fabcd28ca38482ccf92f4c0c9079ad109a9a106 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 10 May 2013 00:03:39 +0000
Subject: [PATCH 5063/6849] configs: add defconfig for Telit EVK-PRO3

For more info, please read board/telit/evk-pro3/readme.txt

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...0001-watchdog-add-keep-alive-support.patch |  88 +++++++
 ...tchdog-add-at91sam9-watchdog-support.patch | 228 ++++++++++++++++++
 ...at91sam9260-9g20-add-wathdog-support.patch |  40 +++
 ...at91sam9260-9g20-fix-wathdog-support.patch |  26 ++
 ....0-0005-watchdog-enable-for-evk-pro3.patch |  26 ++
 board/telit/evk-pro3/linux-3.9.config         | 201 +++++++++++++++
 board/telit/evk-pro3/readme.txt               |  28 +++
 configs/telit_evk_pro3_defconfig              |  33 +++
 8 files changed, 670 insertions(+)
 create mode 100644 board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch
 create mode 100644 board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch
 create mode 100644 board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch
 create mode 100644 board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch
 create mode 100644 board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch
 create mode 100644 board/telit/evk-pro3/linux-3.9.config
 create mode 100644 board/telit/evk-pro3/readme.txt
 create mode 100644 configs/telit_evk_pro3_defconfig

diff --git a/board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch b/board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch
new file mode 100644
index 0000000000..1551546031
--- /dev/null
+++ b/board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch
@@ -0,0 +1,88 @@
+From b5e57a9f158a293b1151638336478af8a5aad0f0 Mon Sep 17 00:00:00 2001
+From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date: Wed, 14 Nov 2012 19:16:35 +0800
+Subject: [PATCH 1/5] watchdog: add keep alive support
+
+this will allow to ping the watchdog via poller
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ drivers/watchdog/Kconfig   |  1 +
+ drivers/watchdog/wd_core.c | 21 +++++++++++++++++++++
+ include/watchdog.h         |  2 ++
+ 3 files changed, 24 insertions(+)
+
+diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
+index 2e2900c..0b4dc84 100644
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -4,6 +4,7 @@ config WATCHDOG_IMX_RESET_SOURCE
+ 
+ menuconfig WATCHDOG
+ 	bool "Watchdog support"
++	select GENERIC_POLLER
+ 	help
+ 	  Many platforms support a watchdog to keep track of a working machine.
+ 	  This framework provides routines to handle these watchdogs.
+diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
+index 3d0cfc6..a1b9e28 100644
+--- a/drivers/watchdog/wd_core.c
++++ b/drivers/watchdog/wd_core.c
+@@ -17,18 +17,39 @@
+ #include <errno.h>
+ #include <linux/ctype.h>
+ #include <watchdog.h>
++#include <poller.h>
+ 
+ /*
+  * Note: this simple framework supports one watchdog only.
+  */
+ static struct watchdog *watchdog;
+ 
++static void watchdog_poller_func(struct poller_struct *poller)
++{
++	watchdog->keep_alive(watchdog);
++}
++
++static struct poller_struct watchdog_poller = {
++	.func = watchdog_poller_func,
++};
++
+ int watchdog_register(struct watchdog *wd)
+ {
+ 	if (watchdog != NULL)
+ 		return -EBUSY;
+ 
+ 	watchdog = wd;
++
++	if (watchdog->keep_alive) {
++		int ret;
++
++		ret = poller_register(&watchdog_poller);
++		if (ret) {
++			watchdog = NULL;
++			return ret;
++		}
++	}
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(watchdog_register);
+diff --git a/include/watchdog.h b/include/watchdog.h
+index 3e2d08e..d5ecf2f 100644
+--- a/include/watchdog.h
++++ b/include/watchdog.h
+@@ -13,8 +13,10 @@
+ #ifndef INCLUDE_WATCHDOG_H
+ # define INCLUDE_WATCHDOG_H
+ 
++
+ struct watchdog {
+ 	int (*set_timeout)(struct watchdog *, unsigned);
++	void (*keep_alive)(struct watchdog *);
+ };
+ 
+ int watchdog_register(struct watchdog *);
+-- 
+1.8.1.4
+
diff --git a/board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch b/board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch
new file mode 100644
index 0000000000..1ca87695a4
--- /dev/null
+++ b/board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch
@@ -0,0 +1,228 @@
+From e1d54ffb987c346c45c20968be34c50c62a91c07 Mon Sep 17 00:00:00 2001
+From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date: Wed, 14 Nov 2012 19:17:47 +0800
+Subject: [PATCH 2/5] watchdog: add at91sam9 watchdog support
+
+with keep alive support
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ drivers/watchdog/Kconfig        |   7 +++
+ drivers/watchdog/Makefile       |   1 +
+ drivers/watchdog/at91sam9_wdt.c | 131 ++++++++++++++++++++++++++++++++++++++++
+ drivers/watchdog/at91sam9_wdt.h |  38 ++++++++++++
+ 4 files changed, 177 insertions(+)
+ create mode 100644 drivers/watchdog/at91sam9_wdt.c
+ create mode 100644 drivers/watchdog/at91sam9_wdt.h
+
+diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
+index 0b4dc84..98a21d7 100644
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -11,6 +11,13 @@ menuconfig WATCHDOG
+ 
+ if WATCHDOG
+ 
++config WATCHDOG_AT91SAM9X
++	tristate "AT91SAM9X / AT91CAP9 watchdog"
++	depends on ARCH_AT91
++	help
++	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
++	  reboot your system when the timeout is reached.
++
+ config WATCHDOG_MXS28
+ 	bool "i.MX28"
+ 	depends on ARCH_IMX28
+diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
+index f522b88..3d15d52 100644
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -1,3 +1,4 @@
+ obj-$(CONFIG_WATCHDOG) += wd_core.o
++obj-$(CONFIG_WATCHDOG_AT91SAM9X) += at91sam9_wdt.o
+ obj-$(CONFIG_WATCHDOG_MXS28) += im28wd.o
+ obj-$(CONFIG_WATCHDOG_IMX_RESET_SOURCE) += imxwd.o
+diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
+new file mode 100644
+index 0000000..203d83a
+--- /dev/null
++++ b/drivers/watchdog/at91sam9_wdt.c
+@@ -0,0 +1,131 @@
++/*
++ * (c) 2012 Juergen Beisert <kernel@pengutronix.de>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * Note: this driver works for the i.MX28 SoC. It might work for the
++ * i.MX23 Soc as well, but is not tested yet.
++ */
++
++#include <common.h>
++#include <init.h>
++#include <io.h>
++#include <errno.h>
++#include <malloc.h>
++#include <watchdog.h>
++
++#include "at91sam9_wdt.h"
++
++struct at91sam9_wdt {
++	struct watchdog wdt;
++	void __iomem *base;
++};
++
++#define to_at91sam9_wdt(h) container_of(h, struct at91sam9_wdt, wdt)
++
++#define wdt_read(at91wdt, field) \
++	__raw_readl(at91wdt->base + field)
++#define wdt_write(at91wdt, field, val) \
++	__raw_writel((val), at91wdt->base + field)
++
++static void at91sam9_wdt_keep_alive(struct watchdog *wdt)
++{
++	struct at91sam9_wdt *at91wdt = to_at91sam9_wdt(wdt);
++
++	wdt_write(at91wdt, AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
++}
++
++static int at91sam9_wdt_settimeout(struct watchdog *wdt, unsigned int timeout)
++{
++	struct at91sam9_wdt *at91wdt = to_at91sam9_wdt(wdt);
++	unsigned int reg;
++	unsigned int mr;
++
++	/* Check if disabled */
++	mr = wdt_read(at91wdt, AT91_WDT_MR);
++	if (mr & AT91_WDT_WDDIS) {
++		pr_err("sorry, watchdog is disabled\n");
++		return -EIO;
++	}
++
++	if (!timeout) {
++		wdt_write(at91wdt, AT91_WDT_MR, AT91_WDT_WDDIS);
++		return 0;
++	}
++
++	/*
++	 * All counting occurs at SLOW_CLOCK / 128 = 256 Hz
++	 *
++	 * Since WDV is a 12-bit counter, the maximum period is
++	 * 4096 / 256 = 16 seconds.
++	 */
++	reg = AT91_WDT_WDRSTEN	/* causes watchdog reset */
++		/* | AT91_WDT_WDRPROC	causes processor reset only */
++		| AT91_WDT_WDDBGHLT	/* disabled in debug mode */
++		| AT91_WDT_WDD		/* restart at any time */
++		| (timeout & AT91_WDT_WDV);  /* timer value */
++	wdt_write(at91wdt, AT91_WDT_MR, reg);
++
++	return 0;
++}
++
++static int at91sam9_wdt_probe(struct device_d *dev)
++{
++	struct at91sam9_wdt *priv;
++	struct watchdog *wdt;
++	int ret;
++	unsigned int mr;
++
++	priv = xzalloc(sizeof(struct at91sam9_wdt));
++	priv->base = dev_request_mem_region(dev, 0);
++	wdt = &priv->wdt;
++
++	wdt->set_timeout = at91sam9_wdt_settimeout;
++	wdt->keep_alive = at91sam9_wdt_keep_alive;
++
++	/* Check if disabled */
++	mr = wdt_read(priv, AT91_WDT_MR);
++	if (mr & AT91_WDT_WDDIS) {
++		dev_err(dev, "sorry, watchdog is disabled\n");
++		ret = -EIO;
++		goto err;
++	}
++
++	ret = watchdog_register(wdt);
++	if (ret != 0)
++		goto err;
++
++	dev->priv = priv;
++	return 0;
++
++err:
++	free(priv);
++	return ret;
++}
++
++static void at91sam9_wdt_remove(struct device_d *dev)
++{
++	struct at91sam9_wdt *priv= dev->priv;
++	watchdog_deregister(&priv->wdt);
++	free(priv);
++}
++
++static struct driver_d at91sam9_wdt_driver = {
++	.name	= "at91sam9_wdt",
++	.probe	= at91sam9_wdt_probe,
++	.remove = at91sam9_wdt_remove,
++};
++
++static int at91sam9_wdt_init(void)
++{
++	return platform_driver_register(&at91sam9_wdt_driver);
++}
++coredevice_initcall(at91sam9_wdt_init);
+diff --git a/drivers/watchdog/at91sam9_wdt.h b/drivers/watchdog/at91sam9_wdt.h
+new file mode 100644
+index 0000000..2b68c1a
+--- /dev/null
++++ b/drivers/watchdog/at91sam9_wdt.h
+@@ -0,0 +1,38 @@
++/*
++ * drivers/watchdog/at91sam9_wdt.h
++ *
++ * Copyright (C) 2007 Andrew Victor
++ * Copyright (C) 2007 Atmel Corporation.
++ *
++ * Watchdog Timer (WDT) - System peripherals regsters.
++ * Based on AT91SAM9261 datasheet revision D.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef AT91_WDT_H
++#define AT91_WDT_H
++
++#define AT91_WDT_CR		0x00			/* Watchdog Control Register */
++#define		AT91_WDT_WDRSTT		(1    << 0)		/* Restart */
++#define		AT91_WDT_KEY		(0xa5 << 24)		/* KEY Password */
++
++#define AT91_WDT_MR		0x04			/* Watchdog Mode Register */
++#define		AT91_WDT_WDV		(0xfff << 0)		/* Counter Value */
++#define		AT91_WDT_WDFIEN		(1     << 12)		/* Fault Interrupt Enable */
++#define		AT91_WDT_WDRSTEN	(1     << 13)		/* Reset Processor */
++#define		AT91_WDT_WDRPROC	(1     << 14)		/* Timer Restart */
++#define		AT91_WDT_WDDIS		(1     << 15)		/* Watchdog Disable */
++#define		AT91_WDT_WDD		(0xfff << 16)		/* Delta Value */
++#define		AT91_WDT_WDDBGHLT	(1     << 28)		/* Debug Halt */
++#define		AT91_WDT_WDIDLEHLT	(1     << 29)		/* Idle Halt */
++
++#define AT91_WDT_SR		0x08			/* Watchdog Status Register */
++#define		AT91_WDT_WDUNF		(1 << 0)		/* Watchdog Underflow */
++#define		AT91_WDT_WDERR		(1 << 1)		/* Watchdog Error */
++
++
++#endif
+-- 
+1.8.1.4
+
diff --git a/board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch b/board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch
new file mode 100644
index 0000000000..bf97200308
--- /dev/null
+++ b/board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch
@@ -0,0 +1,40 @@
+From 3338bcb05479f1149420d4a0ea3904cb9e42eef5 Mon Sep 17 00:00:00 2001
+From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date: Wed, 14 Nov 2012 19:18:22 +0800
+Subject: [PATCH 3/5] at91sam9260/9g20: add wathdog support
+
+Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+---
+ arch/arm/mach-at91/at91sam9260_devices.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
+index 1c375ee..5885f91 100644
+--- a/arch/arm/mach-at91/at91sam9260_devices.c
++++ b/arch/arm/mach-at91/at91sam9260_devices.c
+@@ -10,6 +10,7 @@
+  *
+  */
+ #include <common.h>
++#include <init.h>
+ #include <sizes.h>
+ #include <asm/armlinux.h>
+ #include <asm/hardware.h>
+@@ -397,3 +398,14 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
+ #else
+ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
+ #endif
++
++#ifdef CONFIG_WATCHDOG_AT91SAM9X
++static int at91_add_device_watchdog(void)
++{
++	add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL,
++		AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL);
++
++	return 0;
++}
++coredevice_initcall(at91_add_device_watchdog);
++#endif
+-- 
+1.8.1.4
+
diff --git a/board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch b/board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch
new file mode 100644
index 0000000000..cdfd026adf
--- /dev/null
+++ b/board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch
@@ -0,0 +1,26 @@
+From e03bf0e3ad24898019b89eb9a6935d159c60268f Mon Sep 17 00:00:00 2001
+From: Fabio Porcedda <fabio.porcedda@gmail.com>
+Date: Thu, 17 Jan 2013 11:32:35 +0100
+Subject: [PATCH 4/5] at91sam9260/9g20: fix wathdog support
+
+Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
+---
+ arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
+index 5885f91..df675d2 100644
+--- a/arch/arm/mach-at91/at91sam9260_devices.c
++++ b/arch/arm/mach-at91/at91sam9260_devices.c
+@@ -403,7 +403,7 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
+ static int at91_add_device_watchdog(void)
+ {
+ 	add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL,
+-		AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL);
++		AT91_BASE_WDT, 16, IORESOURCE_MEM, NULL);
+ 
+ 	return 0;
+ }
+-- 
+1.8.1.4
+
diff --git a/board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch b/board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch
new file mode 100644
index 0000000000..837e8c632a
--- /dev/null
+++ b/board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch
@@ -0,0 +1,26 @@
+From 98c96ea36a4b3bb9b92dde849db5e8d6918b5168 Mon Sep 17 00:00:00 2001
+From: Fabio Porcedda <fabio.porcedda@gmail.com>
+Date: Thu, 17 Jan 2013 11:32:59 +0100
+Subject: [PATCH 5/5] watchdog: enable for evk-pro3
+
+Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
+---
+ arch/arm/configs/telit_evk_pro3_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/configs/telit_evk_pro3_defconfig b/arch/arm/configs/telit_evk_pro3_defconfig
+index 050d176..436cecf 100644
+--- a/arch/arm/configs/telit_evk_pro3_defconfig
++++ b/arch/arm/configs/telit_evk_pro3_defconfig
+@@ -68,6 +68,8 @@ CONFIG_MCI_ATMEL=y
+ CONFIG_LED=y
+ CONFIG_LED_GPIO=y
+ CONFIG_LED_TRIGGERS=y
++CONFIG_WATCHDOG=y
++CONFIG_WATCHDOG_AT91SAM9X=y
+ CONFIG_FS_TFTP=y
+ CONFIG_FS_FAT=y
+ CONFIG_FS_FAT_LFN=y
+-- 
+1.8.1.4
+
diff --git a/board/telit/evk-pro3/linux-3.9.config b/board/telit/evk-pro3/linux-3.9.config
new file mode 100644
index 0000000000..99c2f2d2b6
--- /dev/null
+++ b/board/telit/evk-pro3/linux-3.9.config
@@ -0,0 +1,201 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_SOC_AT91SAM9260=y
+CONFIG_SOC_AT91SAM9263=y
+CONFIG_SOC_AT91SAM9G45=y
+CONFIG_SOC_AT91SAM9X5=y
+CONFIG_SOC_AT91SAM9N12=y
+CONFIG_MACH_AT91SAM_DT=y
+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
+CONFIG_AT91_TIMER_HZ=128
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
+CONFIG_KEXEC=y
+CONFIG_AUTO_ZRELADDR=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+CONFIG_IPV6_SIT_6RD=y
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_GLUEBI=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_ATMEL_PWM=y
+CONFIG_ATMEL_TCLIB=y
+CONFIG_EEPROM_93CX6=m
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_DAVICOM_PHY=y
+CONFIG_MICREL_PHY=y
+# CONFIG_WLAN is not set
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=4
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_GPIO=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+CONFIG_PINCTRL_AT91=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_AT91SAM9X_WATCHDOG=y
+CONFIG_SSB=m
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_ATMEL=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_ATMEL_LCDC=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_ACORN_8x8=y
+CONFIG_FONT_MINI_4x6=y
+CONFIG_LOGO=y
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_ACM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_AT91=m
+CONFIG_USB_ATMEL_USBA=m
+CONFIG_USB_ETH=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_MMC=y
+CONFIG_MMC_ATMELMCI=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AT91RM9200=y
+CONFIG_RTC_DRV_AT91SAM9=y
+CONFIG_DMADEVICES=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_USER=y
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC7=m
+CONFIG_AVERAGE=y
diff --git a/board/telit/evk-pro3/readme.txt b/board/telit/evk-pro3/readme.txt
new file mode 100644
index 0000000000..ace9dd4c17
--- /dev/null
+++ b/board/telit/evk-pro3/readme.txt
@@ -0,0 +1,28 @@
+Buildroot board support for Telit EVK-PRO3 with Telit GE863-PRO3
+
+Official site:
+  http://www.telit.com/en/products.php?p_id=3&p_ac=show&p=10
+
+Build images:
+    make telit_evk_pro3_defconfig
+    make
+
+  images built:
+  - output/images/barebox.bin
+  - output/images/zImage
+  - output/images/rootfs.ubi
+
+
+Flash built images:
+  The first time you need to bootstrap from Telit Official Release 221.07.1007,
+  at the U-Boot prompt type:
+    U-Boot> loadb
+  send buildroot/output/images/barebox.bin
+    U-Boot> go 0x20200000
+
+  flash updated images using barebox through tftp:
+    barebox:/ erase dev/self0; cp /mnt/tftp/barebox.bin /dev/self0
+    barebox:/ erase /dev/nand0.kernel.bb; cp /mnt/tftp/zImage /dev/nand0.kernel.bb
+    barebox:/ erase /dev/nand0.rootfs.bb; cp /mnt/tftp/rootfs.ubi /dev/nand0.rootfs.bb
+    barebox:/ erase dev/env0
+    barebox:/ reset
diff --git a/configs/telit_evk_pro3_defconfig b/configs/telit_evk_pro3_defconfig
new file mode 100644
index 0000000000..fa9f8980e5
--- /dev/null
+++ b/configs/telit_evk_pro3_defconfig
@@ -0,0 +1,33 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Toolchain
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.9.1"
+
+# System
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+
+# Watchdog is armed by the first stage bootloader
+BR2_PACKAGE_BUSYBOX_WATCHDOG=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBI=y
+
+# Bootloader
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2013.04.0"
+BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/telit/evk-pro3"
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="telit_evk_pro3"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/telit/evk-pro3/linux-3.9.config"
+BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="evk-pro3"

From 31002cb40323dcc2aa7b6a50b85e5a3c24b2a5d6 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 10 May 2013 00:03:40 +0000
Subject: [PATCH 5064/6849] configs: add defconfig for Atmel AT91SAM9260-EK
 Nand Flash Boot

This is a configuration that provides a basic setup for generating
bootable nandflash images:
- at91bootstrap
- barebox
- kernel
- rootfs

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/atmel/at91sam9260ek/linux-3.9.config | 98 ++++++++++++++++++++++
 configs/at91sam9260eknf_defconfig          | 32 +++++++
 2 files changed, 130 insertions(+)
 create mode 100644 board/atmel/at91sam9260ek/linux-3.9.config
 create mode 100644 configs/at91sam9260eknf_defconfig

diff --git a/board/atmel/at91sam9260ek/linux-3.9.config b/board/atmel/at91sam9260ek/linux-3.9.config
new file mode 100644
index 0000000000..48dc656f4a
--- /dev/null
+++ b/board/atmel/at91sam9260ek/linux-3.9.config
@@ -0,0 +1,98 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_ARCH_AT91SAM9260=y
+CONFIG_ARCH_AT91SAM9260_SAM9XE=y
+CONFIG_MACH_AT91SAM9260EK=y
+CONFIG_MACH_CAM60=y
+CONFIG_MACH_SAM9_L9260=y
+CONFIG_MACH_AFEB9260=y
+CONFIG_MACH_USB_A9260=y
+CONFIG_MACH_QIL_A9260=y
+CONFIG_MACH_CPU9260=y
+CONFIG_MACH_FLEXIBITY=y
+CONFIG_MACH_SNAPPER_9260=y
+CONFIG_MACH_AT91SAM_DT=y
+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_GPIO=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_AT91SAM9X_WATCHDOG=y
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AT91SAM9=y
+CONFIG_EXT2_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_CRAMFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig
new file mode 100644
index 0000000000..895add141a
--- /dev/null
+++ b/configs/at91sam9260eknf_defconfig
@@ -0,0 +1,32 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Toolchain
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.9.1"
+
+# System
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+
+# Packages
+BR2_PACKAGE_HOST_SAM_BA=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBI=y
+
+# Bootloaders
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
+BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="at91sam9260ek"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/atmel/at91sam9260ek/linux-3.9.config"
+BR2_LINUX_KERNEL_ZIMAGE=y

From c9a2aa3b3845ebdae5bc33ee7064062bb3477b25 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:23 +0000
Subject: [PATCH 5065/6849] libcgicc: handle cgicc-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcgicc/libcgicc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 80e921368a..4c5664fdf9 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -9,7 +9,7 @@ LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
 LIBCGICC_LICENSE=LGPLv3+
 LIBCGICC_INSTALL_STAGING=YES
 LIBCGICC_AUTORECONF=YES
-
+LIBCGICC_CONFIG_SCRIPTS = cgicc-config
 LIBCGICC_CONF_OPT = \
 	--disable-demos \
 	--disable-doc

From 7a47372789ee50b5edb7073fe88af1432701af8b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:24 +0000
Subject: [PATCH 5066/6849] fltk: handle fltk-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fltk/fltk.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 3f192cdb48..697eb91d2b 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -12,5 +12,6 @@ FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_CONF_OPT = --enable-threads --with-x
 FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
+FLTK_CONFIG_SCRIPTS = fltk-config
 
 $(eval $(autotools-package))

From 3a91b976b7c12a46536f12b430b3af4335556a09 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:25 +0000
Subject: [PATCH 5067/6849] gsl: handle gsl-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gsl/gsl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 65915916cd..ef426cff38 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -9,6 +9,7 @@ GSL_SITE = $(BR2_GNU_MIRROR)/gsl
 GSL_INSTALL_STAGING = YES
 GSL_LICENSE = GPLv3
 GSL_LICENSE_FILES = COPYING
+GSL_CONFIG_SCRIPTS = gsl-config
 
 # uClibc pretends to have fenv support as it installs <fenv.h>, but in
 # practice, it only implements it for i386. Problem reported upstream

From 24b950f76f5f88817991bb9238356325dc43bba6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:26 +0000
Subject: [PATCH 5068/6849] imlib2: handle imlib2-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imlib2/imlib2.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index c7029aeb6f..cec67066be 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -12,6 +12,7 @@ IMLIB2_LICENSE_FILES = COPYING
 IMLIB2_INSTALL_STAGING = YES
 IMLIB2_DEPENDENCIES = host-pkgconf freetype
 IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
+IMLIB2_CONFIG_SCRIPTS = imlib2-config
 
 ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
 	IMLIB2_CONF_OPT += --with-x
@@ -57,10 +58,7 @@ endif
 
 # drop -L<dir> from linker flags
 define IMLIB2_FIXUP_IMLIB2_CONFIG
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e  's/-L[^ ]*//g' \
-		$(STAGING_DIR)/usr/bin/imlib2-config
+	$(SED) 's/-L[^ ]*//g' $(STAGING_DIR)/usr/bin/imlib2-config
 endef
 
 IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG

From e62d01535ab78e8ff80b730e9b2df903f0747d0c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:27 +0000
Subject: [PATCH 5069/6849] libart: handle libart2-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libart/libart.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libart/libart.mk b/package/libart/libart.mk
index 0505ff5a07..822dbf1b53 100644
--- a/package/libart/libart.mk
+++ b/package/libart/libart.mk
@@ -9,5 +9,6 @@ LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz
 LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/
 LIBART_AUTORECONF = YES
 LIBART_INSTALL_STAGING = YES
+LIBART_CONFIG_SCRIPTS = libart2-config
 
 $(eval $(autotools-package))

From 7fb8e6a55636a2161dbf9a3fc41a0d0d24b74591 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:28 +0000
Subject: [PATCH 5070/6849] libcdaudio: handle libcdaudio-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcdaudio/libcdaudio.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index 203a8aa574..92efabcfd1 100644
--- a/package/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
@@ -10,5 +10,6 @@ LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio
 LIBCDAUDIO_AUTORECONF = YES
 LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
+LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config
 
 $(eval $(autotools-package))

From 52f00e24fedd44969a7681ae1aa68c75dd305310 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:29 +0000
Subject: [PATCH 5071/6849] libesmtp: handle libesmtp-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libesmtp/libesmtp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index 078a729a0d..baa0d6467c 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -7,7 +7,7 @@ LIBESMTP_VERSION = 1.0.6
 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
 LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
 LIBESMTP_INSTALL_STAGING = YES
-
+LIBESMTP_CONFIG_SCRIPTS = libesmtp-config
 LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
 
 $(eval $(autotools-package))

From 4cfe29abf8603798c5389aa6bdb5c9a41b55ff28 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:30 +0000
Subject: [PATCH 5072/6849] libftdi: handle libftdi-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libftdi/libftdi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index d0f5ef6aa9..c5590bade2 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -8,7 +8,7 @@ LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz
 LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download/
 LIBFTDI_DEPENDENCIES = libusb-compat libusb
 LIBFTDI_INSTALL_STAGING = YES
-
+LIBFTDI_CONFIG_SCRIPTS = libftdi-config
 LIBFTDI_AUTORECONF = YES
 
 LIBFDTI_CONF_OPT = --without-examples

From 726413103b8f5023b3035640f19fcdfc61f823c7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:31 +0000
Subject: [PATCH 5073/6849] libvncserver: handle libvncserver-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libvncserver/libvncserver.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index 550abc4738..a450632242 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -10,6 +10,7 @@ LIBVNCSERVER_SITE = http://downloads.sourceforge.net/project/libvncserver/libvnc
 LIBVNCSERVER_LICENSE = GPLv2+
 LIBVNCSERVER_LICENSE_FILES = COPYING
 LIBVNCSERVER_INSTALL_STAGING = YES
+LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
 
 # only used for examples
 LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false

From 4b0542d46254fd1c9966e783f5c56bd468f05e16 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:32 +0000
Subject: [PATCH 5074/6849] netatalk: handle netatalk-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/netatalk.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 243d3f721a..a366644a19 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -8,6 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_AUTORECONF = YES
+NETATALK_CONFIG_SCRIPTS = netatalk-config
 
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"

From 1deff2b17e30f4722c9e3a913d66ef403b816d6d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:33 +0000
Subject: [PATCH 5075/6849] netsnmp: handle net-snmp-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netsnmp/netsnmp.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index a6912e5c97..6a72da74d7 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -24,6 +24,8 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
 		--with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
 		--with-out-transports="Unix"
 NETSNMP_MAKE = $(MAKE1)
+NETSNMP_CONFIG_SCRIPTS = net-snmp-config
+
 NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
 
 ifeq ($(BR2_ENDIAN),"BIG")
@@ -81,9 +83,7 @@ define NETSNMP_UNINSTALL_TARGET_CMDS
 endef
 
 define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
+	$(SED) 	"s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
 		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
 		$(STAGING_DIR)/usr/bin/net-snmp-config
 endef

From f5058411423de4e250253809549e54151fdb6667 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:34 +0000
Subject: [PATCH 5076/6849] liblog4c-localtime: remove whitespace at beginning
 of lines

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../liblog4c-localtime/liblog4c-localtime.mk  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index 3b1642cf1d..492c6ef139 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -1,13 +1,13 @@
- #############################################################
- #
- # liblog4c
- #
- #############################################################
- LIBLOG4C_LOCALTIME_VERSION = 1.0
- LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
- LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
- LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
- LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
+#############################################################
+#
+# liblog4c
+#
+#############################################################
+LIBLOG4C_LOCALTIME_VERSION = 1.0
+LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
+LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
+LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
+LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
 
 define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
 	chmod +x $(@D)/configure

From 4af6818109bf94ea809c0cb7f39f86527bb907d7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:35 +0000
Subject: [PATCH 5077/6849] liblog4c-localtime: handle log4c-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liblog4c-localtime/liblog4c-localtime.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index 492c6ef139..3701cca656 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -8,6 +8,7 @@ LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarbal
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
+LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config
 
 define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
 	chmod +x $(@D)/configure

From 85c798b88b56dbf79caba55226e0ebf12817caf2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:36 +0000
Subject: [PATCH 5078/6849] python: remove stale python2-config symbolic link

We already remove python2.7-config and the symbolic link
python-config, but we forgot to remove the python2-config symbolic
link.

Note that we can't use the <pkg>_CONFIG_SCRIPTS mechanism here because
python2.7-config is written in... Python, and doesn't follow the usual
syntax of <pkg>-config scripts. It takes the paths directly from
distutils.sysconfig.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/python/python.mk b/package/python/python.mk
index b942854994..801c6692d3 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -154,6 +154,7 @@ PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD
 #
 define PYTHON_REMOVE_DEVFILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python2-config
 	rm -f $(TARGET_DIR)/usr/bin/python-config
 endef
 

From fd8f39653a9939a5d5e1043c874e4b26f412c388 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:37 +0000
Subject: [PATCH 5079/6849] python3: remove another config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python3/python3.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 7551a7b5a0..239ac8f630 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -130,6 +130,7 @@ PYTHON3_POST_INSTALL_STAGING_HOOKS += PYTHON3_FIXUP_LIBDIR
 #
 define PYTHON3_REMOVE_DEVFILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
 	rm -f $(TARGET_DIR)/usr/bin/python3-config
 endef
 

From 971d3f1fbc620277eb8a5108cd825b497bcd3870 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 10 May 2013 06:29:38 +0000
Subject: [PATCH 5080/6849] sane-backends: handle sane-config script

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sane-backends/sane-backends.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 496dca4dae..9022845095 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -6,6 +6,7 @@
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
 SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503
+SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb

From 98b5cc3eb4d4103b2149325b98a5e93e68c68dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20S=C3=A1nchez=20Siles?= <rasasi78@gmail.com>
Date: Sat, 11 May 2013 01:40:36 +0000
Subject: [PATCH 5081/6849] Choose xz compressed tarball for linux kernel.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prefer xz compressed tarball so some bandwidth is saved for kernel headers
and kernel itself downloads.

Signed-off-by: Raúl Sánchez Siles <rasasi78@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk                             | 2 +-
 toolchain/kernel-headers/kernel-headers.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index d375cf0328..31155642d1 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -16,7 +16,7 @@ else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
 LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
 LINUX_SITE_METHOD = git
 else
-LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2
+LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
 # to use the $(word) function. We support versions such as 3.1,
 # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index adf7bc45fd..b5ae3227e1 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -31,8 +31,8 @@ LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v2.6/
 else
 LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v3.x/
 endif
-LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2
-LINUX_HEADERS_CAT:=$(BZCAT)
+LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.xz
+LINUX_HEADERS_CAT:=$(XZCAT)
 LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION)
 LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux
 

From df8d52fb025b8f48bd34344e2987eba3757f966c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 10 May 2013 03:56:01 +0000
Subject: [PATCH 5082/6849] package-infra: limit the number of // jobs

The current code spawns as many jobs as up to twice the number of CPUs.

On small-class machines like laptops, with a limitted amount of memory,
but still a few CPUs (real or hyperthreads), the HDD becomes a bottleneck,
and it becomes almost impossible to do anythiong else while there is a
build in progress.

Limit the number of jobs to the number of CPUs plus one.

Even on fast machines with fast HDDs, this settings keeps the machine
fully busy (for those packages that can build in parallel, of course).

For example, building qemu or the linux kernel kept my hyperthreaded
hexa Core i7 with 18GiB of RAM, busy at 99% (I never ever managed to
get 100% even with more jobs, not even 200); while on my hyperthreaded
dual Core i5 with only 4GiB and a slow HDD, I still topped at 100% CPU,
while still able to do some work involving the HDD.

If the number of processors is not available, assume one.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Nathan Lynch <ntl@pobox.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index a449089c1f..9ba6e8cf4f 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -7,11 +7,12 @@ endif
 HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 
 # If BR2_LEVEL is 0, scale the maximum concurrency with the number of
-# CPUs.  A coefficient of 2 is used in order to keep processors busy
+# CPUs. An additional job is used in order to keep processors busy
 # while waiting on I/O.
+# If the number of processors is not available, assume one.
 ifeq ($(BR2_JLEVEL),0)
 PARALLEL_JOBS:=$(shell echo \
-	$$((2 * `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
+	$$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
 else
 PARALLEL_JOBS:=$(BR2_JLEVEL)
 endif

From e5ef6f7f71c0773af1f35b8a4e78669a8c3c8bf0 Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Fri, 10 May 2013 22:59:01 +0000
Subject: [PATCH 5083/6849] Unhide lttng-tools and lttng-modules

When using lttng-tools for userland tracing with lttng-libust lttng-modules
is not required, thus a dependency on building lttng-modules and a kernel is
overkill for lttng-tools.  It also hides it from a user not wanting to build
a kernel.  A comment has been added to lttng-modules to show a user that
lttng-modules is dependent on a kernel build.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-modules/Config.in | 3 +++
 package/lttng-tools/Config.in   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/lttng-modules/Config.in b/package/lttng-modules/Config.in
index 2a0f938b89..fb5947ff38 100644
--- a/package/lttng-modules/Config.in
+++ b/package/lttng-modules/Config.in
@@ -16,3 +16,6 @@ config BR2_PACKAGE_LTTNG_MODULES
 	  http://lttng.org/files/bundles/20111214/README.compatible.kernels.txt
 
 	  http://lttng.org
+
+comment "lttng-modules requires a linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index 3d95eeb3a8..4f86e77e76 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LTTNG_TOOLS
 	bool "lttng-tools"
-	depends on BR2_PACKAGE_LTTNG_MODULES
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_POPT
 	# liburcu only works on some architectures and requires thread support

From 13cdffe529684402dacd4c5438b5f46bba9cc170 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 11 May 2013 13:09:35 +0000
Subject: [PATCH 5084/6849] libnss/libnspr: unavailable comment should be OR
 and not AND

Otherwise the comment would only show up when both conditions are true
instead of any of them.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/Config.in | 2 +-
 package/libnss/Config.in  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index f4f24d46f7..f87b10c2dc 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -11,4 +11,4 @@ config BR2_PACKAGE_LIBNSPR
 	  http://www.mozilla.org/projects/nspr/
 
 comment "libnspr requires a toolchain with LARGEFILE and threads support"
-	depends on !BR2_LARGEFILE && !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index a070ffbdfe..e8eec772b7 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_LIBNSS
 	  http://www.mozilla.org/projects/security/pki/nss/
 
 comment "libnss requires a toolchain with LARGEFILE and thread support"
-	depends on !BR2_LARGEFILE && !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 

From e8008c961c8db3a8b3b922f7222072f3dad9587b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 May 2013 10:53:38 +0200
Subject: [PATCH 5085/6849] matchbox-lib: pango backend needs Xft support in
 pango

Fixes http://autobuild.buildroot.net/results/7f5e56790028b96626e6f0a69ddce08667b712eb/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/matchbox/matchbox-lib/matchbox-lib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index d18df6b604..9855c8ab3d 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -42,7 +42,7 @@ else
   MATCHBOX_LIB_CONF_OPT+=--disable-png
 endif
 
-ifeq ($(BR2_PACKAGE_PANGO),y)
+ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy)
   MATCHBOX_LIB_CONF_OPT+=--enable-pango
   MATCHBOX_LIB_DEPENDENCIES+=pango
 else

From c27b71bccb390b5bc8a1775516efa6628f1690b9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 May 2013 20:41:41 +0200
Subject: [PATCH 5086/6849] gutenprint: ensure staging version of cups-config
 is used

And not whatever is available on the host.

Fixes http://autobuild.buildroot.net/results/dd202d9be79e00ecab622bd7427542b16e962916/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gutenprint/gutenprint.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index b4698437c1..834d967859 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -21,6 +21,8 @@ GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
 # so we need to build both a host package and a target package
 GUTENPRINT_DEPENDENCIES += host-gutenprint
 
+GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config
+
 GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
                       --disable-samples \
                       --without-doc \

From 401a3d98e10f7a35614434758aac3115a30972f3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 May 2013 20:58:40 +0200
Subject: [PATCH 5087/6849] wvstreams: add missing includes for getuid()

Fixes http://autobuild.buildroot.net/results/2ad80b1ae823fbe196f8a65220d5d4a0dd202c4e/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wvstreams/wvstreams-0005-getuid.patch | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/wvstreams/wvstreams-0005-getuid.patch

diff --git a/package/wvstreams/wvstreams-0005-getuid.patch b/package/wvstreams/wvstreams-0005-getuid.patch
new file mode 100644
index 0000000000..60150665ce
--- /dev/null
+++ b/package/wvstreams/wvstreams-0005-getuid.patch
@@ -0,0 +1,25 @@
+[PATCH] wvuid.cc: getuid needs sys/types.h + unistd.h
+
+Otherwise the build fails with:
+
+utils/wvuid.cc: In function 'wvuid_t wvgetuid()':
+utils/wvuid.cc:63:19: error: 'getuid' was not declared in this scope
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ utils/wvuid.cc |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: wvstreams-4.6.1/utils/wvuid.cc
+===================================================================
+--- wvstreams-4.6.1.orig/utils/wvuid.cc
++++ wvstreams-4.6.1/utils/wvuid.cc
+@@ -33,6 +33,8 @@
+ 
+ #else // not WIN32
+ 
++#include <unistd.h>
++#include <sys/types.h>
+ 
+ WvString wv_username_from_uid(wvuid_t uid)
+ {

From d6fa07ffae88c284f41bd5948698a89484c53e10 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 07:40:13 +0000
Subject: [PATCH 5088/6849] linux-pam: fix missing includes

Two patches taken from upstream fix e.g.
http://autobuild.buildroot.org/results/fa31431066ce0f9c554bdb923e59aa0458508224

These patches are in linux-pam 1.1.6 already, but since I don't know
how to test it, I don't want to do a version bump.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...s-are-no-longer-defined-unless-you-e.patch | 28 ++++++++++++++
 ...nix-fix-build-in-enable-selinux-mode.patch | 37 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch
 create mode 100644 package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch

diff --git a/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch b/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch
new file mode 100644
index 0000000000..a73ada6bf6
--- /dev/null
+++ b/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch
@@ -0,0 +1,28 @@
+Date: Mon, 9 Jul 2012 09:43:11 +0200
+Subject: [PATCH] RLIMIT_* variables are no longer defined unless you
+ explicitly include sys/resource.h.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+
+modules/pam_unix/pam_unix_acct.c: Include sys/resource.h.
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+[This patch is in linux-pam 1.1.6]
+---
+ modules/pam_unix/pam_unix_acct.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c
+index 8e90cc9..4a362f8 100644
+--- a/modules/pam_unix/pam_unix_acct.c
++++ b/modules/pam_unix/pam_unix_acct.c
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <syslog.h>
+ #include <pwd.h>
+ #include <shadow.h>
+-- 
+1.8.2.1
+
diff --git a/package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch b/package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch
new file mode 100644
index 0000000000..550e02e487
--- /dev/null
+++ b/package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch
@@ -0,0 +1,37 @@
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 10 Oct 2012 18:13:07 +0000
+Subject: [PATCH] pam_unix: fix build in --enable-selinux mode
+
+glibc's <sys/wait.h> starting with commit
+http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=glibc-2.15-231-gd94a467
+does not include <sys/resource.h> for POSIX 2008 conformance reasons, so
+when pam is being built with SELinux support enabled, pam_unix_passwd.c
+uses getrlimit(2) and therefore should include <sys/resource.h> without
+relying on other headers.
+
+* modules/pam_unix/pam_unix_passwd.c: Include <sys/resource.h>.
+
+Reported-by: Guido Trentalancia <guido@trentalancia.com>
+Reported-by: "Jory A. Pratt" <anarchy@gentoo.org>
+Reported-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+[This patch is in linux-pam 1.1.6]
+---
+ modules/pam_unix/pam_unix_passwd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
+index 9e1302d..94bc3ec 100644
+--- a/modules/pam_unix/pam_unix_passwd.c
++++ b/modules/pam_unix/pam_unix_passwd.c
+@@ -58,6 +58,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>
+ 
+ #include <security/_pam_macros.h>
+ 
+-- 
+1.8.2.1
+

From 4624567df1c5e05963ecc0f2a36299a89068ca41 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 08:31:44 +0000
Subject: [PATCH 5089/6849] classpath: remove qt support

classpath doesn't work with Qt in buildroot. It assumes qt will run on X11,
but we don't have qt-x11 support on buildroot.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/classpath/classpath.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index 2d1255261a..61a1034571 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -8,6 +8,10 @@ CLASSPATH_CONF_OPT = \
 	--disable-gconf-peer \
 	--disable-tools
 
+# classpath assumes qt runs on top of X11, but we
+# don't support qt4 on X11
+CLASSPATH_CONF_OPT += --disable-qt-peer
+
 CLASSPATH_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
@@ -39,13 +43,6 @@ else
 CLASSPATH_CONF_OPT += --disable-gtk-peer --disable-gstreamer-peer
 endif
 
-ifeq ($(BR2_PACKAGE_QT),y)
-CLASSPATH_CONF_OPT += --enable-qt-peer
-CLASSPATH_DEPENDENCIES += qt
-else
-CLASSPATH_CONF_OPT += --disable-qt-peer
-endif
-
 ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
 CLASSPATH_CONF_OPT += --enable-xmlj
 CLASSPATH_DEPENDENCIES += libxml2 libxslt

From 6a77344162f952ae8c5a49f309a1f09a1761f2dc Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 08:56:15 +0000
Subject: [PATCH 5090/6849] openssl: fix host-openssl dependencies

Support for ocf-linux or cryptodev-linux added a dependency of host-openssl
on host-ocf-linux / host-cryptodev-linux, which we don't have and the
dependency is anyway not needed.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssl/openssl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 2e04789356..081fc90dad 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -10,6 +10,7 @@ OPENSSL_LICENSE = OpenSSL or SSLeay
 OPENSSL_LICENSE_FILES = LICENSE
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
+HOST_OPENSSL_DEPENDENCIES = host-zlib
 OPENSSL_TARGET_ARCH = generic32
 OPENSSL_CFLAGS = $(TARGET_CFLAGS)
 

From e5726eb4986f33a1c6af276973efeaa35980097c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 12 May 2013 21:26:44 +0200
Subject: [PATCH 5091/6849] lttng-tools: needs largefile support

Fixes http://autobuild.buildroot.net/results/ba2674c2f5bb33304dbbdf2f0ad0ca5ecfdc11aa/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-tools/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index 4f86e77e76..67734753c6 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	select BR2_PACKAGE_POPT
 	# liburcu only works on some architectures and requires thread support
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Userspace utilities for the LTTng 2.0 tracing
@@ -23,6 +24,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
 
 	  http://lttng.org
 
-comment "lttng-tools needs threads support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "lttng-tools needs LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 

From 92cd8a527373bf0c059f806761a851d2364d0246 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 09:15:52 +0000
Subject: [PATCH 5092/6849] czmq: disable asciidoc documentation generation

czmq uses asciidoc for its documentation. asciidoc uses python and import
the unicodedata module, which is not in host-python. So disable asciidoc
entirely.

This doesn't get hit by the autobuilders because they don't have asciidoc
installed in their chroot.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/czmq/czmq.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
index 2b34654faa..d63fb78479 100644
--- a/package/czmq/czmq.mk
+++ b/package/czmq/czmq.mk
@@ -14,6 +14,10 @@ CZMQ_DEPENDENCIES = zeromq
 CZMQ_LICENSE = LGPLv3+ with exceptions
 CZMQ_LICENSE_FILES = COPYING COPYING.LESSER
 
+# asciidoc is a python script that imports unicodedata, which is not in
+# host-python, so disable asciidoc entirely.
+CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no
+
 define CZMQ_CREATE_CONFIG_DIR
 	mkdir -p $(@D)/config
 endef

From fd234bebae9bd1aa2bf78eb1734a5c0af6a32023 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 09:23:57 +0000
Subject: [PATCH 5093/6849] f2fs-tools: fix version

The commit e3eadd doesn't (no longer?) exists in the upstream git, so
replace it with the latest commit to date.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/f2fs-tools/f2fs-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk
index f217bf4261..aa0c103590 100644
--- a/package/f2fs-tools/f2fs-tools.mk
+++ b/package/f2fs-tools/f2fs-tools.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-F2FS_TOOLS_VERSION = e3eadd686ed1da1828f32977a36b694bc0090f4e
+F2FS_TOOLS_VERSION = fef98ebdf3a7728017cb3d0ae4ffedc5405e531d
 F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
 F2FS_TOOLS_SITE_METHOD = git
 F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no

From cf82c300e0384a8e78e3b0a9f0370d36551540bf Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 09:25:01 +0000
Subject: [PATCH 5094/6849] filemq: disable asciidoc documentation generation

filemq uses asciidoc for its documentation. asciidoc uses python and import
the unicodedata module, which is not in host-python. So disable asciidoc
entirely.

This doesn't get hit by the autobuilders because they don't have asciidoc
installed in their chroot.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/filemq/filemq.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk
index 0ea7a9dc6e..c71529274e 100644
--- a/package/filemq/filemq.mk
+++ b/package/filemq/filemq.mk
@@ -8,6 +8,7 @@ FILEMQ_VERSION = 8fac5140dd
 FILEMQ_SITE = git://github.com/zeromq/filemq.git
 
 FILEMQ_AUTORECONF = YES
+FILEMQ_CONF_ENV = fmq_have_asciidoc=no
 FILEMQ_INSTALL_STAGING = YES
 FILEMQ_DEPENDENCIES = czmq openssl zeromq
 FILEMQ_LICENSE = LGPLv3+ with exceptions

From 2d1580cbe9c8e4238107fabc2ffe69956d191a27 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 03:53:49 +0000
Subject: [PATCH 5095/6849] samba: bump to version 3.6.15

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 683c7b2e0f..55fc94dc94 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.14
+SAMBA_VERSION = 3.6.15
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 2db1e84e28b308c85b0919bd015c36ed4fc3590d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 03:53:50 +0000
Subject: [PATCH 5096/6849] ipset: bump to version 6.19

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 50915ef497..daadc9eb94 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.18
+IPSET_VERSION = 6.19
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf

From 7893840d16419e5795bd6b8cbc3adf5a99d9298f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 03:53:51 +0000
Subject: [PATCH 5097/6849] fftw: bump to version 3.3.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fftw/fftw.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index 74a5e11fec..d0af752680 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -4,8 +4,10 @@
 #
 ################################################################################
 
-FFTW_VERSION = 3.3.2
+FFTW_VERSION = 3.3.3
 FFTW_SITE = http://www.fftw.org
 FFTW_INSTALL_STAGING = YES
+FFTW_LICENSE = GPLv2+
+FFTW_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From a2f30cacd95d7d850a22a6824ec748e448b1e772 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 03:53:52 +0000
Subject: [PATCH 5098/6849] httping: bump to version 2.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/httping/httping.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 2ebc75e614..8f7cb97ec6 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -4,13 +4,18 @@
 #
 #############################################################
 
-HTTPING_VERSION = 1.6
+HTTPING_VERSION = 2.2.1
 HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
 HTTPING_SITE = http://www.vanheusden.com/httping
 HTTPING_LICENSE = GPLv2
 HTTPING_LICENSE_FILES = license.txt
-HTTPING_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
+HTTPING_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
+	$(if $(BR2_PACKAGE_NCURSES),ncurses) \
+	$(if $(BR2_PACKAGE_FFTW),fftw)
 HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
+	FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
+	NC=$(if $(BR2_PACKAGE_NCURSES),yes,no) \
 	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
 	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
 

From 8f8d23f1918091a307ae957dd9f32d1596819a51 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 03:55:22 +0000
Subject: [PATCH 5099/6849] less: bump to version 458

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/less/less.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/less/less.mk b/package/less/less.mk
index 72449c3c11..f8117332a0 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LESS_VERSION = 451
+LESS_VERSION = 458
 LESS_SITE = http://www.greenwoodsoftware.com/less
 LESS_LICENSE = GPLv3+
 LESS_LICENSE_FILES = COPYING

From 87c6b15c7d354ab52cb1f7b785b233293800eca1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 03:55:23 +0000
Subject: [PATCH 5100/6849] dnsmasq: bump to version 2.66

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...asq-01-fix-wrong-size-in-memset-call.patch |  27 ++++
 ...er-zero-in-encapsulated-dhcp-options.patch | 143 ++++++++++++++++++
 package/dnsmasq/dnsmasq.mk                    |   2 +-
 3 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch
 create mode 100644 package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch

diff --git a/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch b/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch
new file mode 100644
index 0000000000..536552a600
--- /dev/null
+++ b/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch
@@ -0,0 +1,27 @@
+From 4582c0efe7d7af93517b1f3bcc7af67685ab3e5c Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d@falconindy.com>
+Date: Thu, 18 Apr 2013 09:47:49 +0100
+Subject: [PATCH] Fix wrong size in memset() call.
+
+Thanks to Dave Reisner.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index a34ed96..f175fa4 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
+       return -1;
+     }
+   
+-  memset(buffer, 0, sizeof(buffer));
++  memset(buffer, 0, BUFF_SZ);
+ 
+   nlh = (struct nlmsghdr *)buffer;
+   nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
+--
+1.8.1.5
diff --git a/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch b/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch
new file mode 100644
index 0000000000..79f57bf8ff
--- /dev/null
+++ b/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch
@@ -0,0 +1,143 @@
+From bd08ae67f9a0cae2ce15be885254cad9449d4551 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 19 Apr 2013 10:22:06 +0100
+Subject: [PATCH] Allow option number zero in encapsulated DHCP options.
+
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ src/dhcp-common.c |  6 +++---
+ src/dnsmasq.h     |  4 ++--
+ src/option.c      | 33 ++++++++++++++++++++-------------
+ 3 files changed, 25 insertions(+), 18 deletions(-)
+
+diff --git a/src/dhcp-common.c b/src/dhcp-common.c
+index f4fd088..8de4268 100644
+--- a/src/dhcp-common.c
++++ b/src/dhcp-common.c
+@@ -512,7 +512,7 @@ void display_opts6(void)
+ }
+ #endif
+ 
+-u16 lookup_dhcp_opt(int prot, char *name)
++int lookup_dhcp_opt(int prot, char *name)
+ {
+   const struct opttab_t *t;
+   int i;
+@@ -528,10 +528,10 @@ u16 lookup_dhcp_opt(int prot, char *name)
+     if (strcasecmp(t[i].name, name) == 0)
+       return t[i].val;
+   
+-  return 0;
++  return -1;
+ }
+ 
+-u16 lookup_dhcp_len(int prot, u16 val)
++int lookup_dhcp_len(int prot, int val)
+ {
+   const struct opttab_t *t;
+   int i;
+diff --git a/src/dnsmasq.h b/src/dnsmasq.h
+index 69ae7a7..41e2798 100644
+--- a/src/dnsmasq.h
++++ b/src/dnsmasq.h
+@@ -1216,8 +1216,8 @@ void log_tags(struct dhcp_netid *netid, u32 xid);
+ int match_bytes(struct dhcp_opt *o, unsigned char *p, int len);
+ void dhcp_update_configs(struct dhcp_config *configs);
+ void display_opts(void);
+-u16 lookup_dhcp_opt(int prot, char *name);
+-u16 lookup_dhcp_len(int prot, u16 val);
++int lookup_dhcp_opt(int prot, char *name);
++int lookup_dhcp_len(int prot, int val);
+ char *option_string(int prot, unsigned int opt, unsigned char *val, 
+ 		    int opt_len, char *buf, int buf_len);
+ #ifdef HAVE_LINUX_NETWORK
+diff --git a/src/option.c b/src/option.c
+index b2596ec..2a61017 100644
+--- a/src/option.c
++++ b/src/option.c
+@@ -750,6 +750,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
+   struct dhcp_netid *np = NULL;
+   u16 opt_len = 0;
+   int is6 = 0;
++  int option_ok = 0;
+ 
+   new->len = 0;
+   new->flags = flags;
+@@ -769,16 +770,19 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
+ 	{
+ 	  new->opt = atoi(arg);
+ 	  opt_len = 0;
++	  option_ok = 1;
+ 	  break;
+ 	}
+       
+       if (strstr(arg, "option:") == arg)
+ 	{
+-	  new->opt = lookup_dhcp_opt(AF_INET, arg+7);
+-	  opt_len = lookup_dhcp_len(AF_INET, new->opt);
+-	  /* option:<optname> must follow tag and vendor string. */
+-	  if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
+-	    new->opt = 0;
++	  if ((new->opt = lookup_dhcp_opt(AF_INET, arg+7)) != -1)
++	    {
++	      opt_len = lookup_dhcp_len(AF_INET, new->opt);
++	      /* option:<optname> must follow tag and vendor string. */
++	      if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
++		option_ok = 1;
++	    }
+ 	  break;
+ 	}
+ #ifdef HAVE_DHCP6
+@@ -792,13 +796,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
+ 	    {
+ 	      new->opt = atoi(arg+8);
+ 	      opt_len = 0;
++	      option_ok = 1;
+ 	    }
+ 	  else
+ 	    {
+-	      new->opt = lookup_dhcp_opt(AF_INET6, arg+8);
+-	      opt_len = lookup_dhcp_len(AF_INET6, new->opt);
+-	      if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
+-		new->opt = 0;
++	      if ((new->opt = lookup_dhcp_opt(AF_INET6, arg+8)) != -1)
++		{
++		  opt_len = lookup_dhcp_len(AF_INET6, new->opt);
++		  if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
++		    option_ok = 1;
++		}
+ 	    }
+ 	  /* option6:<opt>|<optname> must follow tag and vendor string. */
+ 	  is6 = 1;
+@@ -821,7 +828,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
+ 	  new->flags |= DHOPT_RFC3925;
+ 	  if (flags == DHOPT_MATCH)
+ 	    {
+-	      new->opt = 1; /* avoid error below */
++	      option_ok = 1;
+ 	      break;
+ 	    }
+ 	}
+@@ -848,16 +855,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
+       
+       if (opt_len == 0 &&
+ 	  !(new->flags & DHOPT_RFC3925))
+-	opt_len = lookup_dhcp_len(AF_INET6 ,new->opt);
++	opt_len = lookup_dhcp_len(AF_INET6, new->opt);
+     }
+   else
+ #endif
+     if (opt_len == 0 &&
+ 	!(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925)))
+-      opt_len = lookup_dhcp_len(AF_INET ,new->opt);
++      opt_len = lookup_dhcp_len(AF_INET, new->opt);
+   
+   /* option may be missing with rfc3925 match */
+-  if (new->opt == 0)
++  if (!option_ok)
+     ret_err(_("bad dhcp-option"));
+   
+   if (comma)
+--
+1.8.1.5
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 8fb1fb1949..04e3630c21 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.65
+DNSMASQ_VERSION = 2.66
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

From 6b7b2b617cc03159fca36f1bb01250fc430e086a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 04:01:41 +0000
Subject: [PATCH 5101/6849] gawk: bump to version 4.1.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gawk/Config.in                        |  2 ++
 ...ioned.patch => gawk-01-no-versioned.patch} |  0
 package/gawk/gawk.mk                          | 20 +++++++++----------
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename package/gawk/{gawk-no-versioned.patch => gawk-01-no-versioned.patch} (100%)

diff --git a/package/gawk/Config.in b/package/gawk/Config.in
index 82c970f1df..6889777c0d 100644
--- a/package/gawk/Config.in
+++ b/package/gawk/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_GAWK
 	bool "gawk"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  A special-purpose programming language which is data driven
 	  rather than procedural.  Allows for simple data-reformatting jobs
diff --git a/package/gawk/gawk-no-versioned.patch b/package/gawk/gawk-01-no-versioned.patch
similarity index 100%
rename from package/gawk/gawk-no-versioned.patch
rename to package/gawk/gawk-01-no-versioned.patch
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 366dea78fa..b26430e570 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-GAWK_VERSION = 4.0.1
+GAWK_VERSION = 4.1.0
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
-GAWK_TARGET_BINS = awk gawk igawk pgawk
-GAWK_LICENSE = GPLv3
+GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr)
+GAWK_LICENSE = GPLv3+
 GAWK_LICENSE_FILES = COPYING
 
 # Prefer full-blown gawk over busybox awk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
-# we don't have a host-busybox
+# We don't have a host-busybox
 HOST_GAWK_DEPENDENCIES =
 
 define GAWK_CREATE_SYMLINK
@@ -24,13 +24,13 @@ endef
 
 GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK
 
-define GAWK_UNINSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(GAWK_TARGET_BINS))
-	rm -f $(TARGET_DIR)/usr/share/info/gawk*.info
-	rm -f $(TARGET_DIR)/usr/share/man/man*/*gawk.1
-	rm -rf $(TARGET_DIR)/usr/libexec/awk
-	rm -rf $(TARGET_DIR)/usr/share/awk
+# Assume we support shared libs
+# The check isn't cross-compile friendly and it's mandatory anyway
+define GAWK_DISABLE_SHARED_CHECK
+	$(SED) 's/ check-for-shared-lib-support//' $(@D)/extension/Makefile.in
 endef
 
+GAWK_POST_PATCH_HOOKS += GAWK_DISABLE_SHARED_CHECK
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From e7dce165abf5b037058ab29f250b19587117fbc5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 02:26:30 +0000
Subject: [PATCH 5102/6849] kernel-headers: bump 3.{0, 4, 8, 9}.x stable
 version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                        | 8 ++++----
 ...rs_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.78-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index fd52e825e6..a54f9ce661 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.77"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.78"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.44"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.44"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.45"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
-	default "3.8.12"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.1"		if BR2_KERNEL_HEADERS_3_9
+	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
+	default "3.9.2"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.78-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.77-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.78-headers_install-fix-__packed-in-exported-kernel-head.patch

From cb97a23b5d7f633087613804959df88c31bf9ae5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 02:26:31 +0000
Subject: [PATCH 5103/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 53adfcd4cf..b2d7850bd1 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.1"
+	bool "3.9.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.1" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.2" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 40ccd2122e003d0c513c65eb389fe5a902ae9108 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 12 May 2013 02:26:32 +0000
Subject: [PATCH 5104/6849] configs/qemu: bump relevant config versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/qemu_arm_nuri_defconfig         | 2 +-
 configs/qemu_arm_versatile_defconfig    | 2 +-
 configs/qemu_arm_vexpress_defconfig     | 2 +-
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips64_malta_defconfig     | 2 +-
 configs/qemu_mips_malta_defconfig       | 2 +-
 configs/qemu_mipsel_malta_defconfig     | 2 +-
 configs/qemu_ppc_g3beige_defconfig      | 2 +-
 configs/qemu_ppc_mpc8544ds_defconfig    | 2 +-
 configs/qemu_ppc_virtex_ml507_defconfig | 2 +-
 configs/qemu_x86_64_defconfig           | 2 +-
 configs/qemu_x86_defconfig              | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index c7e0eed70b..27dac27173 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 1c79daab85..d0f59a2beb 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.9.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 0e2c176203..07b629e345 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index f91e2f7393..6bc4d0b610 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.9.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index ed9c8764f3..e82b3028a3 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.9.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 554f0b4f00..72c36cc62c 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 4dc3683907..245e36f09d 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index eae86ab065..80d1ecb494 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.9.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 884291d18b..4184bea1c4 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_8=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.13"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.8.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index fdf6fb6f22..bbb246bd71 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 5280cbb68d..8bd067ebff 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 70322211c8..1768eeea05 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.9.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 919d875ff7..244bd8ab1d 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_9=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.9.config"

From 0af22c755b45d8b04ca148ff0b58e460c835e337 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 9 May 2013 12:22:54 +0000
Subject: [PATCH 5105/6849] package/pmake: add host pmake

pmake is the make command used by the BSD.
It will used to build BSD-related packages, coming later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pmake/pmake.mk | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/pmake/pmake.mk

diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk
new file mode 100644
index 0000000000..7b2e5a6efa
--- /dev/null
+++ b/package/pmake/pmake.mk
@@ -0,0 +1,47 @@
+#############################################################
+#
+# pmake
+#
+##############################################################
+
+PMAKE_VERSION       = 1.111
+PMAKE_SOURCE        = pmake_$(PMAKE_VERSION).orig.tar.gz
+PMAKE_SITE          = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/p/pmake
+PMAKE_LICENSE       = BSD-3c BSD-4c
+# No license file. License texts are spread in the boilerplates
+# of each individual source files; some are BSD-3c, some BSD-4c.
+
+# Vampirise patches from Debian
+PMAKE_PATCH = pmake_1.111-3.2.debian.tar.gz
+
+# CFLAGS vampirised from Debian's rules, adapted to buildroot variables
+HOST_PMAKE_CFLAGS = -O2 -g -Wall -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I.    \
+                -DMACHINE=\\\"buildroot\\\"                                 \
+                -DMACHINE_ARCH=\\\"$(ARCH)\\\" -DMACHINE_MULTIARCH=\\\"\\\" \
+                -DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_STRFTIME \
+                -DHAVE_VSNPRINTF -D_GNU_SOURCE -Wno-unused
+
+define HOST_PMAKE_BUILD_CMDS
+	$(MAKE) -C $(@D) -f Makefile.boot CFLAGS="$(HOST_PMAKE_CFLAGS)"
+endef
+
+# The generated file is named bmake, but we want pmake; but:
+#  - pmake uses support files (in  mk/)
+#  - it's not possible to tell pmake, at build-time, where to expect
+#    these support files, and pmake expects them in /usr/share/mk/
+#  - but pmake has an option to override that search path at runtime
+#  - so we install bmake as bmake
+#  - and we install a wrapper named pmake that calls pmake with the
+#    appropriate search path
+define HOST_PMAKE_INSTALL_CMDS
+	$(INSTALL) -m 0755 $(@D)/bmake $(HOST_DIR)/usr/bin/bmake
+	$(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/pmake/mk
+	for mk in $(@D)/mk/*; do                                        \
+	    $(INSTALL) -m 0644 $${mk} $(HOST_DIR)/usr/share/pmake/mk;   \
+	done
+	printf '#!/bin/sh\nexec $${0%%/*}/bmake -m $${0%%/pmake}/../../usr/share/pmake/mk "$$@"\n'  \
+	       >$(HOST_DIR)/usr/bin/pmake
+	chmod 0755 $(HOST_DIR)/usr/bin/pmake
+endef
+
+$(eval $(host-generic-package))

From 4ae47d82649d38de6896270a6b6945d2467b7047 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 9 May 2013 12:22:55 +0000
Subject: [PATCH 5106/6849] package/libbsd: new package

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libbsd/Config.in | 10 ++++++++++
 package/libbsd/libbsd.mk | 21 +++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/libbsd/Config.in
 create mode 100644 package/libbsd/libbsd.mk

diff --git a/package/Config.in b/package/Config.in
index bbacd5c546..55a38b9bfe 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -578,6 +578,7 @@ source "package/gmp/Config.in"
 source "package/gsl/Config.in"
 source "package/gtest/Config.in"
 source "package/libatomic_ops/Config.in"
+source "package/libbsd/Config.in"
 source "package/libcap/Config.in"
 source "package/libcap-ng/Config.in"
 source "package/libdaemon/Config.in"
diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in
new file mode 100644
index 0000000000..0ed9dac9af
--- /dev/null
+++ b/package/libbsd/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBBSD
+	bool "libbsd"
+	help
+	  This library provides useful functions commonly found on BSD
+	  systems, and lacking on others like GNU systems, thus making
+	  it easier to port projects with strong BSD origins, without
+	  needing to embed the same code over and over again on each
+	  project.
+
+	  http://libbsd.freedesktop.org/
diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
new file mode 100644
index 0000000000..3af1002d64
--- /dev/null
+++ b/package/libbsd/libbsd.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# libbsd
+#
+#############################################################
+
+LIBBSD_VERSION         = 0.4.2
+LIBBSD_SOURCE          = libbsd-$(LIBBSD_VERSION).tar.gz
+LIBBSD_SITE            = http://libbsd.freedesktop.org/releases
+LIBBSD_LICENSE         = BSD-3c MIT
+LIBBSD_LICENSE_FILES   = LICENSE
+
+# man-pages are BSD-4c, so that license only matters
+# if doc is kept in the target rootfs
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+LIBBSD_LICENSE        += (libraries), BSD-4c (documentation)
+endif
+
+LIBBSD_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 1c0d1949c69f24518de63921b00130e9ae1082c0 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 10:05:22 +0000
Subject: [PATCH 5107/6849] pulseaudio: fix build with orc

The configure script gets orcc from pkg-config, which sets it to /usr/bin/orcc
instead of $(HOST_DIR)/usr/bin/orcc. So set the path explicitly instead of
relying on pkg-config.

While we're at it, also add an explicit enable/disable to configure.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index aa67592d29..b39d99e182 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -28,7 +28,6 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_UDEV),udev) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
-	$(if $(BR2_PACKAGE_ORC),orc) \
 	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
@@ -38,6 +37,14 @@ PULSEAUDIO_DEPENDENCIES = \
 PULSEAUDIO_AUTORECONF = YES
 PULSEAUDIO_DEPENDENCIES += libglib2
 
+ifeq ($(BR2_PACKAGE_ORC),y)
+PULSEAUDIO_DEPENDENCIES += orc
+PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc
+PULSEAUDIO_CONF_OPT += --enable-orc
+else
+PULSEAUDIO_CONF_OPT += --disable-orc
+endif
+
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 # The optional webrtc echo canceller is written in C++, causing auto* to want
 # to link module-echo-cancel.so with CXX even if webrtc ISN'T used.

From 5b0c6f024cc62d6d9a2fb18bb05d09ad71da1ed0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:50:56 +0000
Subject: [PATCH 5108/6849] package/x11r7: add license informations to xapp_*
 packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xapp_appres/xapp_appres.mk                       | 2 ++
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk                   | 2 ++
 package/x11r7/xapp_beforelight/xapp_beforelight.mk             | 2 ++
 package/x11r7/xapp_bitmap/xapp_bitmap.mk                       | 2 ++
 package/x11r7/xapp_editres/xapp_editres.mk                     | 2 ++
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk               | 2 ++
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk                 | 2 ++
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk                     | 2 ++
 package/x11r7/xapp_iceauth/xapp_iceauth.mk                     | 2 ++
 package/x11r7/xapp_ico/xapp_ico.mk                             | 2 ++
 package/x11r7/xapp_listres/xapp_listres.mk                     | 2 ++
 package/x11r7/xapp_luit/xapp_luit.mk                           | 2 ++
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk                 | 2 ++
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk             | 2 ++
 package/x11r7/xapp_oclock/xapp_oclock.mk                       | 2 ++
 package/x11r7/xapp_rgb/xapp_rgb.mk                             | 2 ++
 package/x11r7/xapp_rstart/xapp_rstart.mk                       | 2 ++
 package/x11r7/xapp_scripts/xapp_scripts.mk                     | 2 ++
 package/x11r7/xapp_sessreg/xapp_sessreg.mk                     | 2 ++
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk                 | 2 ++
 package/x11r7/xapp_showfont/xapp_showfont.mk                   | 2 ++
 package/x11r7/xapp_smproxy/xapp_smproxy.mk                     | 2 ++
 package/x11r7/xapp_twm/xapp_twm.mk                             | 2 ++
 package/x11r7/xapp_viewres/xapp_viewres.mk                     | 2 ++
 package/x11r7/xapp_x11perf/xapp_x11perf.mk                     | 2 ++
 package/x11r7/xapp_xauth/xapp_xauth.mk                         | 2 ++
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk               | 2 ++
 package/x11r7/xapp_xbiff/xapp_xbiff.mk                         | 2 ++
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                         | 2 ++
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk               | 2 ++
 package/x11r7/xapp_xclock/xapp_xclock.mk                       | 2 ++
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk                       | 2 ++
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk               | 2 ++
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk                 | 2 ++
 package/x11r7/xapp_xditview/xapp_xditview.mk                   | 2 ++
 package/x11r7/xapp_xdm/xapp_xdm.mk                             | 2 ++
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk                   | 2 ++
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk                   | 2 ++
 package/x11r7/xapp_xedit/xapp_xedit.mk                         | 2 ++
 package/x11r7/xapp_xev/xapp_xev.mk                             | 2 ++
 package/x11r7/xapp_xeyes/xapp_xeyes.mk                         | 2 ++
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk                     | 2 ++
 package/x11r7/xapp_xfd/xapp_xfd.mk                             | 2 ++
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk                   | 2 ++
 package/x11r7/xapp_xfs/xapp_xfs.mk                             | 2 ++
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk                     | 2 ++
 package/x11r7/xapp_xgamma/xapp_xgamma.mk                       | 2 ++
 package/x11r7/xapp_xgc/xapp_xgc.mk                             | 2 ++
 package/x11r7/xapp_xhost/xapp_xhost.mk                         | 2 ++
 package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk | 2 ++
 package/x11r7/xapp_xinput/xapp_xinput.mk                       | 2 ++
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk                     | 2 ++
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk                       | 2 ++
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk                   | 2 ++
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk                   | 2 ++
 package/x11r7/xapp_xkill/xapp_xkill.mk                         | 2 ++
 package/x11r7/xapp_xload/xapp_xload.mk                         | 2 ++
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                         | 2 ++
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk                   | 2 ++
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk               | 2 ++
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk                   | 2 ++
 package/x11r7/xapp_xmag/xapp_xmag.mk                           | 2 ++
 package/x11r7/xapp_xman/xapp_xman.mk                           | 2 ++
 package/x11r7/xapp_xmessage/xapp_xmessage.mk                   | 2 ++
 package/x11r7/xapp_xmh/xapp_xmh.mk                             | 2 ++
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk                     | 2 ++
 package/x11r7/xapp_xmore/xapp_xmore.mk                         | 2 ++
 package/x11r7/xapp_xpr/xapp_xpr.mk                             | 2 ++
 package/x11r7/xapp_xprop/xapp_xprop.mk                         | 2 ++
 package/x11r7/xapp_xrandr/xapp_xrandr.mk                       | 2 ++
 package/x11r7/xapp_xrdb/xapp_xrdb.mk                           | 2 ++
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk                   | 2 ++
 package/x11r7/xapp_xset/xapp_xset.mk                           | 2 ++
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk                   | 2 ++
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk             | 2 ++
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk                   | 2 ++
 package/x11r7/xapp_xsm/xapp_xsm.mk                             | 2 ++
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk                   | 2 ++
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk                   | 2 ++
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk                       | 2 ++
 package/x11r7/xapp_xwd/xapp_xwd.mk                             | 2 ++
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk                   | 2 ++
 package/x11r7/xapp_xwud/xapp_xwud.mk                           | 2 ++
 83 files changed, 166 insertions(+)

diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index 77b25463ee..c9d7fe9cdc 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -7,6 +7,8 @@
 XAPP_APPRES_VERSION = 1.0.1
 XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2
 XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_APPRES_LICENSE = MIT
+XAPP_APPRES_LICENSE_FILES = COPYING
 XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 739b4a9ca1..1e2f81a95f 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -7,6 +7,8 @@
 XAPP_BDFTOPCF_VERSION = 1.0.3
 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_BDFTOPCF_LICENSE = MIT
+XAPP_BDFTOPCF_LICENSE_FILES = COPYING
 XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index 835f7f3dab..e07696d7e9 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -7,6 +7,8 @@
 XAPP_BEFORELIGHT_VERSION = 1.0.2
 XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2
 XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_BEFORELIGHT_LICENSE = MIT
+XAPP_BEFORELIGHT_LICENSE_FILES = COPYING
 XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 1ce450a8b9..8c73fe2b30 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -7,6 +7,8 @@
 XAPP_BITMAP_VERSION = 1.0.6
 XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2
 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_BITMAP_LICENSE = MIT
+XAPP_BITMAP_LICENSE_FILES = COPYING
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index 440ce61135..a4807b8a67 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -7,6 +7,8 @@
 XAPP_EDITRES_VERSION = 1.0.5
 XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2
 XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_EDITRES_LICENSE = MIT
+XAPP_EDITRES_LICENSE_FILES = COPYING
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index b41f20193f..719077cbfc 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -7,6 +7,8 @@
 XAPP_FONTTOSFNT_VERSION = 1.0.3
 XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2
 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_FONTTOSFNT_LICENSE = MIT
+XAPP_FONTTOSFNT_LICENSE_FILES = COPYING
 XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index b92f9282ba..181577940a 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -7,6 +7,8 @@
 XAPP_FSLSFONTS_VERSION = 1.0.1
 XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2
 XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_FSLSFONTS_LICENSE = MIT
+XAPP_FSLSFONTS_LICENSE_FILES = COPYING
 XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index 8c37b99c38..2d00af0df9 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -7,6 +7,8 @@
 XAPP_FSTOBDF_VERSION = 1.0.2
 XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2
 XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_FSTOBDF_LICENSE = MIT
+XAPP_FSTOBDF_LICENSE_FILES = COPYING
 XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index a42e5bd1fb..bf0445e1b3 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -7,6 +7,8 @@
 XAPP_ICEAUTH_VERSION = 1.0.5
 XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_ICEAUTH_LICENSE = MIT
+XAPP_ICEAUTH_LICENSE_FILES = COPYING
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 80f4a8eff0..6628efe660 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -7,6 +7,8 @@
 XAPP_ICO_VERSION = 1.0.2
 XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2
 XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_ICO_LICENSE = MIT
+XAPP_ICO_LICENSE_FILES = COPYING
 XAPP_ICO_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index 1a3247b031..7b7e364a1c 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -7,6 +7,8 @@
 XAPP_LISTRES_VERSION = 1.0.3
 XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2
 XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_LISTRES_LICENSE = MIT
+XAPP_LISTRES_LICENSE_FILES = COPYING
 XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index ddb7883c59..2420897ea3 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -7,6 +7,8 @@
 XAPP_LUIT_VERSION = 1.1.1
 XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
 XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_LUIT_LICENSE = MIT
+XAPP_LUIT_LICENSE_FILES = COPYING
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index e32ed8574a..15e65c1a59 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -7,6 +7,8 @@
 XAPP_MKFONTDIR_VERSION = 1.0.7
 XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_MKFONTDIR_LICENSE = MIT
+XAPP_MKFONTDIR_LICENSE_FILES = COPYING
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 2f299a643c..b15fc56a81 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -7,6 +7,8 @@
 XAPP_MKFONTSCALE_VERSION = 1.1.0
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_MKFONTSCALE_LICENSE = MIT
+XAPP_MKFONTSCALE_LICENSE_FILES = COPYING
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 9f09c7f2fe..5d40ab9c30 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -7,6 +7,8 @@
 XAPP_OCLOCK_VERSION = 1.0.1
 XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2
 XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_OCLOCK_LICENSE = MIT
+XAPP_OCLOCK_LICENSE_FILES = COPYING
 XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index c9a8ad7d84..2fd8c171eb 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -7,6 +7,8 @@
 XAPP_RGB_VERSION = 1.0.1
 XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
 XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_RGB_LICENSE = MIT
+XAPP_RGB_LICENSE_FILES = COPYING
 XAPP_RGB_DEPENDENCIES = xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index cce5c03584..9f08f173f1 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -7,6 +7,8 @@
 XAPP_RSTART_VERSION = 1.0.2
 XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2
 XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_RSTART_LICENSE = MIT
+XAPP_RSTART_LICENSE_FILES = COPYING
 XAPP_RSTART_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index a50509893e..d444344469 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -7,6 +7,8 @@
 XAPP_SCRIPTS_VERSION = 1.0.1
 XAPP_SCRIPTS_SOURCE = scripts-$(XAPP_SCRIPTS_VERSION).tar.bz2
 XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SCRIPTS_LICENSE = MIT
+XAPP_SCRIPTS_LICENSE_FILES = COPYING
 XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 6f7fd887c1..c9de815d8a 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -7,6 +7,8 @@
 XAPP_SESSREG_VERSION = 1.0.7
 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
 XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SESSREG_LICENSE = MIT
+XAPP_SESSREG_LICENSE_FILES = COPYING
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index 1f1e5d3d89..77e271d89d 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -7,6 +7,8 @@
 XAPP_SETXKBMAP_VERSION = 1.3.0
 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
 XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SETXKBMAP_LICENSE = MIT
+XAPP_SETXKBMAP_LICENSE_FILES = COPYING
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index 54d4466194..b183e91dde 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -7,6 +7,8 @@
 XAPP_SHOWFONT_VERSION = 1.0.1
 XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2
 XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SHOWFONT_LICENSE = MIT
+XAPP_SHOWFONT_LICENSE_FILES = COPYING
 XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 11c470dc6d..8e822cff4c 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -7,6 +7,8 @@
 XAPP_SMPROXY_VERSION = 1.0.5
 XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
 XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SMPROXY_LICENSE = MIT
+XAPP_SMPROXY_LICENSE_FILES = COPYING
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index 9474ecac4d..6e348a9442 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -7,6 +7,8 @@
 XAPP_TWM_VERSION = 1.0.6
 XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
 XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_TWM_LICENSE = MIT
+XAPP_TWM_LICENSE_FILES = COPYING
 XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 04ba936bcc..8c8bdd1970 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -7,6 +7,8 @@
 XAPP_VIEWRES_VERSION = 1.0.3
 XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2
 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_VIEWRES_LICENSE = MIT
+XAPP_VIEWRES_LICENSE_FILES = COPYING
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index 33e8628d99..e1a50e617e 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -7,6 +7,8 @@
 XAPP_X11PERF_VERSION = 1.5.4
 XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_X11PERF_LICENSE = MIT
+XAPP_X11PERF_LICENSE_FILES = COPYING
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index a34ec00400..d7a871ce78 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -7,6 +7,8 @@
 XAPP_XAUTH_VERSION = 1.0.7
 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XAUTH_LICENSE = MIT
+XAPP_XAUTH_LICENSE_FILES = COPYING
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 52b0decaaf..33ae12ea19 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -7,6 +7,8 @@
 XAPP_XBACKLIGHT_VERSION = 1.1.2
 XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2
 XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XBACKLIGHT_LICENSE = MIT
+XAPP_XBACKLIGHT_LICENSE_FILES = COPYING
 XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index c6f2d70d6f..8192d6d2b5 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -7,6 +7,8 @@
 XAPP_XBIFF_VERSION = 1.0.3
 XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2
 XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XBIFF_LICENSE = MIT
+XAPP_XBIFF_LICENSE_FILES = COPYING
 XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index ec2e5ada37..ecadec70dd 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -7,6 +7,8 @@
 XAPP_XCALC_VERSION = 1.0.2
 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2
 XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCALC_LICENSE = MIT
+XAPP_XCALC_LICENSE_FILES = COPYING
 XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 1fb7ca4a54..8accd7eab1 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -7,6 +7,8 @@
 XAPP_XCLIPBOARD_VERSION = 1.1.2
 XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2
 XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCLIPBOARD_LICENSE = MIT
+XAPP_XCLIPBOARD_LICENSE_FILES = COPYING
 XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 6d7bf652d7..e8ca932ba5 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -7,6 +7,8 @@
 XAPP_XCLOCK_VERSION = 1.0.6
 XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2
 XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCLOCK_LICENSE = MIT
+XAPP_XCLOCK_LICENSE_FILES = COPYING
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 7b513a87b7..889e1eab12 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -7,6 +7,8 @@
 XAPP_XCMSDB_VERSION = 1.0.4
 XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
 XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCMSDB_LICENSE = MIT
+XAPP_XCMSDB_LICENSE_FILES = COPYING
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index c0dc8d147e..e4be4c64e7 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -7,6 +7,8 @@
 XAPP_XCURSORGEN_VERSION = 1.0.5
 XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCURSORGEN_LICENSE = MIT
+XAPP_XCURSORGEN_LICENSE_FILES = COPYING
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index f5925fc1f0..201990a7aa 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -7,6 +7,8 @@
 XAPP_XDBEDIZZY_VERSION = 1.0.2
 XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
 XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDBEDIZZY_LICENSE = MIT
+XAPP_XDBEDIZZY_LICENSE_FILES = COPYING
 XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 773ed21851..f228f0b2db 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -7,6 +7,8 @@
 XAPP_XDITVIEW_VERSION = 1.0.2
 XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2
 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDITVIEW_LICENSE = MIT
+XAPP_XDITVIEW_LICENSE_FILES = COPYING
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 1c74708697..c131d22d32 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -7,6 +7,8 @@
 XAPP_XDM_VERSION = 1.1.11
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDM_LICENSE = MIT
+XAPP_XDM_LICENSE_FILES = COPYING
 XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
 XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx \
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 0b724de76b..a47879adc8 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -7,6 +7,8 @@
 XAPP_XDPYINFO_VERSION = 1.3.0
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDPYINFO_LICENSE = MIT
+XAPP_XDPYINFO_LICENSE_FILES = COPYING
 XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index 67b006979c..e88e0bf5ce 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -7,6 +7,8 @@
 XAPP_XDRIINFO_VERSION = 1.0.4
 XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDRIINFO_LICENSE = MIT
+XAPP_XDRIINFO_LICENSE_FILES = COPYING
 XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index 3e26f367aa..4c70002c52 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -7,6 +7,8 @@
 XAPP_XEDIT_VERSION = 1.2.0
 XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
 XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XEDIT_LICENSE = MIT
+XAPP_XEDIT_LICENSE_FILES = COPYING
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw 
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index dd7c7981fd..7e7a1b51d6 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -7,6 +7,8 @@
 XAPP_XEV_VERSION = 1.2.0
 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XEV_LICENSE = MIT
+XAPP_XEV_LICENSE_FILES = COPYING
 XAPP_XEV_DEPENDENCIES = xlib_libX11 xlib_libXrandr
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 94bd390f88..3458c57473 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -7,6 +7,8 @@
 XAPP_XEYES_VERSION = 1.0.1
 XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2
 XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XEYES_LICENSE = MIT
+XAPP_XEYES_LICENSE_FILES = COPYING
 XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index ea00d9ce8b..e1854662d2 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -7,6 +7,8 @@
 XAPP_XF86DGA_VERSION = 1.0.2
 XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
 XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XF86DGA_LICENSE = MIT
+XAPP_XF86DGA_LICENSE_FILES = COPYING
 XAPP_XF86DGA_DEPENDENCIES = \
 	host-pkgconf \
 	xlib_libX11 \
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 72c1aca6a0..47a274ce31 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -7,6 +7,8 @@
 XAPP_XFD_VERSION = 1.1.1
 XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFD_LICENSE = MIT
+XAPP_XFD_LICENSE_FILES = COPYING
 XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index d4d9ca1854..6b685e8c28 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -7,6 +7,8 @@
 XAPP_XFONTSEL_VERSION = 1.0.4
 XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2
 XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFONTSEL_LICENSE = MIT
+XAPP_XFONTSEL_LICENSE_FILES = COPYING
 XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index b49b8ba6ab..83cb59ac64 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -7,6 +7,8 @@
 XAPP_XFS_VERSION = 1.0.5
 XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
 XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFS_LICENSE = MIT
+XAPP_XFS_LICENSE_FILES = COPYING
 XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index 94e7bed8a1..c45fa5276b 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -7,6 +7,8 @@
 XAPP_XFSINFO_VERSION = 1.0.1
 XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2
 XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFSINFO_LICENSE = MIT
+XAPP_XFSINFO_LICENSE_FILES = COPYING
 XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 6e2197dc05..73c842637b 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -7,6 +7,8 @@
 XAPP_XGAMMA_VERSION = 1.0.5
 XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
 XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XGAMMA_LICENSE = MIT
+XAPP_XGAMMA_LICENSE_FILES = COPYING
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index cfb3164d6f..400b1a7869 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -7,6 +7,8 @@
 XAPP_XGC_VERSION = 1.0.3
 XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2
 XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XGC_LICENSE = MIT
+XAPP_XGC_LICENSE_FILES = COPYING
 XAPP_XGC_DEPENDENCIES = xlib_libXaw
 XAPP_XGC_AUTORECONF = YES
 
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 2b72d81d6e..232a112339 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -7,6 +7,8 @@
 XAPP_XHOST_VERSION = 1.0.5
 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XHOST_LICENSE = MIT
+XAPP_XHOST_LICENSE_FILES = COPYING
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
index 659d62a318..974b83df2c 100644
--- a/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
+++ b/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
@@ -7,6 +7,8 @@
 XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5
 XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz
 XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator
+XAPP_XINPUT_CALIBRATOR_LICENSE = MIT
+XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING
 XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index fea939eb81..4206d210a8 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -7,6 +7,8 @@
 XAPP_XINPUT_VERSION = 1.6.0
 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XINPUT_LICENSE = MIT
+XAPP_XINPUT_LICENSE_FILES = COPYING
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi xlib_libXrandr xlib_libXinerama
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 095c047b67..86053ca27a 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -7,6 +7,8 @@
 XAPP_XKBCOMP_VERSION = 1.2.4
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBCOMP_LICENSE = MIT
+XAPP_XKBCOMP_LICENSE_FILES = COPYING
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 XAPP_XKBCOMP_CONF_ENV = ac_cv_file___xkbparse_c=yes
 
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 6327b20f35..1537b093c0 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -7,6 +7,8 @@
 XAPP_XKBEVD_VERSION = 1.1.3
 XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
 XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBEVD_LICENSE = MIT
+XAPP_XKBEVD_LICENSE_FILES = COPYING
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index 6c1e272775..fd3757e008 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -7,6 +7,8 @@
 XAPP_XKBPRINT_VERSION = 1.0.1
 XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2
 XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBPRINT_LICENSE = MIT
+XAPP_XKBPRINT_LICENSE_FILES = COPYING
 XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 632fcf30ed..64fe877243 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -7,6 +7,8 @@
 XAPP_XKBUTILS_VERSION = 1.0.3
 XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2
 XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBUTILS_LICENSE = MIT
+XAPP_XKBUTILS_LICENSE_FILES = COPYING
 XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index 0611b3f0e9..200d87a742 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -7,6 +7,8 @@
 XAPP_XKILL_VERSION = 1.0.3
 XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2
 XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKILL_LICENSE = MIT
+XAPP_XKILL_LICENSE_FILES = COPYING
 XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index 85803918ef..ef883332f4 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -7,6 +7,8 @@
 XAPP_XLOAD_VERSION = 1.1.1
 XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLOAD_LICENSE = MIT
+XAPP_XLOAD_LICENSE_FILES = COPYING
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index 73de828dc5..cee7487686 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -7,6 +7,8 @@
 XAPP_XLOGO_VERSION = 1.0.4
 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLOGO_LICENSE = MIT
+XAPP_XLOGO_LICENSE_FILES = COPYING
 XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXrender \
 			  xlib_libXft host-pkgconf
 
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index c10f5c22db..aa70b560bc 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -7,6 +7,8 @@
 XAPP_XLSATOMS_VERSION = 1.1.1
 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLSATOMS_LICENSE = MIT
+XAPP_XLSATOMS_LICENSE_FILES = COPYING
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index c8bf9309c6..d07fd33449 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -7,6 +7,8 @@
 XAPP_XLSCLIENTS_VERSION = 1.1.2
 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLSCLIENTS_LICENSE = MIT
+XAPP_XLSCLIENTS_LICENSE_FILES = COPYING
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 708a19bd61..93fd92655c 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -7,6 +7,8 @@
 XAPP_XLSFONTS_VERSION = 1.0.1
 XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2
 XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLSFONTS_LICENSE = MIT
+XAPP_XLSFONTS_LICENSE_FILES = COPYING
 XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index 0496c8a09e..b55f4f3197 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -7,6 +7,8 @@
 XAPP_XMAG_VERSION = 1.0.4
 XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2
 XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMAG_LICENSE = MIT
+XAPP_XMAG_LICENSE_FILES = COPYING
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 0c39aaf581..fef6a9f728 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -6,6 +6,8 @@
 XAPP_XMAN_VERSION = 1.0.3
 XAPP_XMAN_SOURCE = xman-$(XAPP_XMAN_VERSION).tar.bz2
 XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMAN_LICENSE = MIT
+XAPP_XMAN_LICENSE_FILES = COPYING
 XAPP_XMAN_DEPENDENCIES = xlib_libXaw
 
 XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 3a11bb40e0..34f5433148 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -7,6 +7,8 @@
 XAPP_XMESSAGE_VERSION = 1.0.2
 XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2
 XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMESSAGE_LICENSE = MIT
+XAPP_XMESSAGE_LICENSE_FILES = COPYING
 XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 920289e24b..3a77648075 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -7,6 +7,8 @@
 XAPP_XMH_VERSION = 1.0.2
 XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMH_LICENSE = MIT
+XAPP_XMH_LICENSE_FILES = COPYING
 XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index a1a1882cb7..3ffbb580bf 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -7,6 +7,8 @@
 XAPP_XMODMAP_VERSION = 1.0.7
 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMODMAP_LICENSE = MIT
+XAPP_XMODMAP_LICENSE_FILES = COPYING
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index e5c54b0695..c9a19844a9 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -7,6 +7,8 @@
 XAPP_XMORE_VERSION = 1.0.1
 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMORE_LICENSE = MIT
+XAPP_XMORE_LICENSE_FILES = COPYING
 XAPP_XMORE_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index c1220dccf9..2950afd646 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -7,6 +7,8 @@
 XAPP_XPR_VERSION = 1.0.4
 XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
 XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPR_LICENSE = MIT
+XAPP_XPR_LICENSE_FILES = COPYING
 XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index d442ce90b5..3f7b9e104c 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -7,6 +7,8 @@
 XAPP_XPROP_VERSION = 1.2.1
 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPROP_LICENSE = MIT
+XAPP_XPROP_LICENSE_FILES = COPYING
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 07c4c59044..3a1feedc07 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -7,6 +7,8 @@
 XAPP_XRANDR_VERSION = 1.3.5
 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
 XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XRANDR_LICENSE = MIT
+XAPP_XRANDR_LICENSE_FILES = COPYING
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
 XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
 
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 60908c7131..72ce0e18e4 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -7,6 +7,8 @@
 XAPP_XRDB_VERSION = 1.0.9
 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XRDB_LICENSE = MIT
+XAPP_XRDB_LICENSE_FILES = COPYING
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index 6146856d97..2b0fe29428 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -7,6 +7,8 @@
 XAPP_XREFRESH_VERSION = 1.0.4
 XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2
 XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XREFRESH_LICENSE = MIT
+XAPP_XREFRESH_LICENSE_FILES = COPYING
 XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index afa6b53de6..5a6679f66d 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -7,6 +7,8 @@
 XAPP_XSET_VERSION = 1.2.2
 XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSET_LICENSE = MIT
+XAPP_XSET_LICENSE_FILES = COPYING
 XAPP_XSET_DEPENDENCIES = xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index d795e791d4..9808aa0bf9 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -7,6 +7,8 @@
 XAPP_XSETMODE_VERSION = 1.0.0
 XAPP_XSETMODE_SOURCE = xsetmode-$(XAPP_XSETMODE_VERSION).tar.bz2
 XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSETMODE_LICENSE = MIT
+XAPP_XSETMODE_LICENSE_FILES = COPYING
 XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 7ef189e535..7707b6015f 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -7,6 +7,8 @@
 XAPP_XSETPOINTER_VERSION = 1.0.0
 XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
 XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSETPOINTER_LICENSE = MIT
+XAPP_XSETPOINTER_LICENSE_FILES = COPYING
 XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 82fdc4e256..b9bb7947bf 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -7,6 +7,8 @@
 XAPP_XSETROOT_VERSION = 1.1.0
 XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSETROOT_LICENSE = MIT
+XAPP_XSETROOT_LICENSE_FILES = COPYING
 XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index 75640a2100..cdc27a92f2 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -7,6 +7,8 @@
 XAPP_XSM_VERSION = 1.0.2
 XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2
 XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSM_LICENSE = MIT
+XAPP_XSM_LICENSE_FILES = COPYING
 XAPP_XSM_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index 5f32ea4de9..19c105e074 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -7,6 +7,8 @@
 XAPP_XSTDCMAP_VERSION = 1.0.1
 XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2
 XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSTDCMAP_LICENSE = MIT
+XAPP_XSTDCMAP_LICENSE_FILES = COPYING
 XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index eb1cac283a..3e3d50efd2 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -7,6 +7,8 @@
 XAPP_XVIDTUNE_VERSION = 1.0.2
 XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2
 XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XVIDTUNE_LICENSE = MIT
+XAPP_XVIDTUNE_LICENSE_FILES = COPYING
 XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index ed1127a6cc..28c2cdaf6c 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -7,6 +7,8 @@
 XAPP_XVINFO_VERSION = 1.1.1
 XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2
 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XVINFO_LICENSE = MIT
+XAPP_XVINFO_LICENSE_FILES = COPYING
 XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 17ad45232c..a98b132944 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -7,6 +7,8 @@
 XAPP_XWD_VERSION = 1.0.5
 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XWD_LICENSE = MIT
+XAPP_XWD_LICENSE_FILES = COPYING
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index b9f5f67434..acbd7b3655 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -7,6 +7,8 @@
 XAPP_XWININFO_VERSION = 1.1.2
 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XWININFO_LICENSE = MIT
+XAPP_XWININFO_LICENSE_FILES = COPYING
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index acf5cca313..911ac21327 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -7,6 +7,8 @@
 XAPP_XWUD_VERSION = 1.0.4
 XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XWUD_LICENSE = MIT
+XAPP_XWUD_LICENSE_FILES = COPYING
 XAPP_XWUD_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))

From 07a2ec3e0e332f8439c7c4f66133a704af7faff0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:50:57 +0000
Subject: [PATCH 5109/6849] package/x11r7: add license informations to xproto_*
 packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk        | 2 ++
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk        | 2 ++
 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk    | 2 ++
 package/x11r7/xproto_damageproto/xproto_damageproto.mk          | 2 ++
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk                | 2 ++
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk              | 2 ++
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk            | 2 ++
 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk    | 2 ++
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk            | 2 ++
 package/x11r7/xproto_glproto/xproto_glproto.mk                  | 2 ++
 package/x11r7/xproto_inputproto/xproto_inputproto.mk            | 2 ++
 package/x11r7/xproto_kbproto/xproto_kbproto.mk                  | 2 ++
 package/x11r7/xproto_randrproto/xproto_randrproto.mk            | 2 ++
 package/x11r7/xproto_recordproto/xproto_recordproto.mk          | 2 ++
 package/x11r7/xproto_renderproto/xproto_renderproto.mk          | 2 ++
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk      | 2 ++
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk    | 2 ++
 package/x11r7/xproto_videoproto/xproto_videoproto.mk            | 2 ++
 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk    | 2 ++
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk          | 2 ++
 package/x11r7/xproto_xextproto/xproto_xextproto.mk              | 2 ++
 .../x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk    | 2 ++
 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk        | 2 ++
 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk        | 2 ++
 .../x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk    | 2 ++
 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk      | 2 ++
 package/x11r7/xproto_xproto/xproto_xproto.mk                    | 2 ++
 27 files changed, 54 insertions(+)

diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index a860227e89..99f0839481 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -7,6 +7,8 @@
 XPROTO_APPLEWMPROTO_VERSION = 1.4.2
 XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2
 XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_APPLEWMPROTO_LICENSE = MIT
+XPROTO_APPLEWMPROTO_LICENSE_FILES = COPYING
 XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
 XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index 1cf4b5f0ce..958908c19d 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -7,6 +7,8 @@
 XPROTO_BIGREQSPROTO_VERSION = 1.1.2
 XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
 XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_BIGREQSPROTO_LICENSE = MIT
+XPROTO_BIGREQSPROTO_LICENSE_FILES = COPYING
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
 XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index 2d5f6ccdc3..4b5d1bb5af 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -7,6 +7,8 @@
 XPROTO_COMPOSITEPROTO_VERSION = 0.4.2
 XPROTO_COMPOSITEPROTO_SOURCE = compositeproto-$(XPROTO_COMPOSITEPROTO_VERSION).tar.bz2
 XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_COMPOSITEPROTO_LICENSE = MIT
+XPROTO_COMPOSITEPROTO_LICENSE_FILES = COPYING
 XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
 XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index 09fe866778..5c9782aa6c 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -7,6 +7,8 @@
 XPROTO_DAMAGEPROTO_VERSION = 1.2.1
 XPROTO_DAMAGEPROTO_SOURCE = damageproto-$(XPROTO_DAMAGEPROTO_VERSION).tar.bz2
 XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_DAMAGEPROTO_LICENSE = MIT
+XPROTO_DAMAGEPROTO_LICENSE_FILES = COPYING
 XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
 XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index 3277992d89..b551e0cbf9 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -7,6 +7,8 @@
 XPROTO_DMXPROTO_VERSION = 2.3.1
 XPROTO_DMXPROTO_SOURCE = dmxproto-$(XPROTO_DMXPROTO_VERSION).tar.bz2
 XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_DMXPROTO_LICENSE = MIT
+XPROTO_DMXPROTO_LICENSE_FILES = COPYING
 XPROTO_DMXPROTO_INSTALL_STAGING = YES
 XPROTO_DMXPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index f2f387544e..2d354c23b2 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -7,6 +7,8 @@
 XPROTO_DRI2PROTO_VERSION = 2.6
 XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2
 XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_DRI2PROTO_LICENSE = MIT
+XPROTO_DRI2PROTO_LICENSE_FILES = COPYING
 XPROTO_DRI2PROTO_INSTALL_STAGING = YES
 XPROTO_DRI2PROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index ae4d687da9..c02b6bdb26 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -7,6 +7,8 @@
 XPROTO_FIXESPROTO_VERSION = 5.0
 XPROTO_FIXESPROTO_SOURCE = fixesproto-$(XPROTO_FIXESPROTO_VERSION).tar.bz2
 XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_FIXESPROTO_LICENSE = MIT
+XPROTO_FIXESPROTO_LICENSE_FILES = COPYING
 XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 97af75af21..88c0e6706b 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -7,6 +7,8 @@
 XPROTO_FONTCACHEPROTO_VERSION = 0.1.3
 XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2
 XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_FONTCACHEPROTO_LICENSE = MIT
+XPROTO_FONTCACHEPROTO_LICENSE_FILES = COPYING
 XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
 XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index bb5efd3466..37dafea6da 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -7,6 +7,8 @@
 XPROTO_FONTSPROTO_VERSION = 2.1.2
 XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
 XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_FONTSPROTO_LICENSE = MIT
+XPROTO_FONTSPROTO_LICENSE_FILES = COPYING
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES
 XPROTO_FONTSPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index 38a9a65faa..78a38aac1b 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -7,6 +7,8 @@
 XPROTO_GLPROTO_VERSION = 1.4.15
 XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
 XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_GLPROTO_LICENSE = MIT
+XPROTO_GLPROTO_LICENSE_FILES = COPYING
 XPROTO_GLPROTO_INSTALL_STAGING = YES
 XPROTO_GLPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index a265d96979..83b9283c65 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -7,6 +7,8 @@
 XPROTO_INPUTPROTO_VERSION = 2.2
 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_INPUTPROTO_LICENSE = MIT
+XPROTO_INPUTPROTO_LICENSE_FILES = COPYING
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index 1c1973a6ee..a6facdfbb4 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -7,6 +7,8 @@
 XPROTO_KBPROTO_VERSION = 1.0.6
 XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
 XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_KBPROTO_LICENSE = MIT
+XPROTO_KBPROTO_LICENSE_FILES = COPYING
 XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index ecee64d90d..d8c61e6a63 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -7,6 +7,8 @@
 XPROTO_RANDRPROTO_VERSION = 1.3.2
 XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2
 XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RANDRPROTO_LICENSE = MIT
+XPROTO_RANDRPROTO_LICENSE_FILES = COPYING
 XPROTO_RANDRPROTO_INSTALL_STAGING = YES
 XPROTO_RANDRPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index e97ebef70c..0eef453381 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -7,6 +7,8 @@
 XPROTO_RECORDPROTO_VERSION = 1.14.2
 XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2
 XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RECORDPROTO_LICENSE = MIT
+XPROTO_RECORDPROTO_LICENSE_FILES = COPYING
 XPROTO_RECORDPROTO_INSTALL_STAGING = YES
 XPROTO_RECORDPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index 4ef04a2920..cc05f69155 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -7,6 +7,8 @@
 XPROTO_RENDERPROTO_VERSION = 0.11.1
 XPROTO_RENDERPROTO_SOURCE = renderproto-$(XPROTO_RENDERPROTO_VERSION).tar.bz2
 XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RENDERPROTO_LICENSE = MIT
+XPROTO_RENDERPROTO_LICENSE_FILES = COPYING
 XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index 4ff8736ced..bb25e063af 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -7,6 +7,8 @@
 XPROTO_RESOURCEPROTO_VERSION = 1.2.0
 XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
 XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RESOURCEPROTO_LICENSE = MIT
+XPROTO_RESOURCEPROTO_LICENSE_FILES = COPYING
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
 XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 34e708c33d..51e5a25d25 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -7,6 +7,8 @@
 XPROTO_SCRNSAVERPROTO_VERSION = 1.2.2
 XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
 XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_SCRNSAVERPROTO_LICENSE = MIT
+XPROTO_SCRNSAVERPROTO_LICENSE_FILES = COPYING
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
 XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 595997782a..19c3902e51 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -7,6 +7,8 @@
 XPROTO_VIDEOPROTO_VERSION = 2.3.1
 XPROTO_VIDEOPROTO_SOURCE = videoproto-$(XPROTO_VIDEOPROTO_VERSION).tar.bz2
 XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_VIDEOPROTO_LICENSE = MIT
+XPROTO_VIDEOPROTO_LICENSE_FILES = COPYING
 XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
 XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index 1a554fa88e..9282b4d7bf 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -7,6 +7,8 @@
 XPROTO_WINDOWSWMPROTO_VERSION = 1.0.4
 XPROTO_WINDOWSWMPROTO_SOURCE = windowswmproto-$(XPROTO_WINDOWSWMPROTO_VERSION).tar.bz2
 XPROTO_WINDOWSWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_WINDOWSWMPROTO_LICENSE = MIT
+XPROTO_WINDOWSWMPROTO_LICENSE_FILES = COPYING
 XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
 XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index d13a361e22..bafadec7aa 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XCMISCPROTO_VERSION = 1.2.2
 XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
 XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XCMISCPROTO_LICENSE = MIT
+XPROTO_XCMISCPROTO_LICENSE_FILES = COPYING
 XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-specs)
 HOST_XPROTO_XCMISCPROTO_CONF_OPT = --disable-specs
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index cf7bd21205..75a87d5afe 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XEXTPROTO_VERSION = 7.2.1
 XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
 XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XEXTPROTO_LICENSE = MIT
+XPROTO_XEXTPROTO_LICENSE_FILES = COPYING
 XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-specs)
 HOST_XPROTO_XEXTPROTO_CONF_OPT = --disable-specs
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index c7df12840f..5e802b03a3 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XF86BIGFONTPROTO_VERSION = 1.2.0
 XPROTO_XF86BIGFONTPROTO_SOURCE = xf86bigfontproto-$(XPROTO_XF86BIGFONTPROTO_VERSION).tar.bz2
 XPROTO_XF86BIGFONTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86BIGFONTPROTO_LICENSE = MIT
+XPROTO_XF86BIGFONTPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index 301894a51e..3cb69bc2ca 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XF86DGAPROTO_VERSION = 2.1
 XPROTO_XF86DGAPROTO_SOURCE = xf86dgaproto-$(XPROTO_XF86DGAPROTO_VERSION).tar.bz2
 XPROTO_XF86DGAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86DGAPROTO_LICENSE = MIT
+XPROTO_XF86DGAPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 21eb6de0a7..3663ff1e22 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XF86DRIPROTO_VERSION = 2.1.1
 XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2
 XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86DRIPROTO_LICENSE = MIT
+XPROTO_XF86DRIPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index ccdc5c2173..815e10d14d 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XF86VIDMODEPROTO_VERSION = 2.3.1
 XPROTO_XF86VIDMODEPROTO_SOURCE = xf86vidmodeproto-$(XPROTO_XF86VIDMODEPROTO_VERSION).tar.bz2
 XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86VIDMODEPROTO_LICENSE = MIT
+XPROTO_XF86VIDMODEPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
 XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index b9d65a4bd4..7136c9d8c9 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XINERAMAPROTO_VERSION = 1.2.1
 XPROTO_XINERAMAPROTO_SOURCE = xineramaproto-$(XPROTO_XINERAMAPROTO_VERSION).tar.bz2
 XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XINERAMAPROTO_LICENSE = MIT
+XPROTO_XINERAMAPROTO_LICENSE_FILES = COPYING
 XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
 XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
 
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index 25d1541588..a0a9d019a1 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -7,6 +7,8 @@
 XPROTO_XPROTO_VERSION = 7.0.23
 XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
 XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XPROTO_LICENSE = MIT
+XPROTO_XPROTO_LICENSE_FILES = COPYING
 XPROTO_XPROTO_INSTALL_STAGING = YES
 XPROTO_XPROTO_INSTALL_TARGET = NO
 

From 83944af154cfdb33073ebb3339a51fe2e572efb4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:50:58 +0000
Subject: [PATCH 5110/6849] package/x11r7: add license informations to
 xdriver_* packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk  | 2 ++
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk  | 2 ++
 .../xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk  | 2 ++
 .../x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk  | 2 ++
 .../xdriver_xf86-input-synaptics.mk                             | 2 ++
 .../x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk  | 2 ++
 .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk    | 2 ++
 .../x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk    | 2 ++
 package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk  | 2 ++
 package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk  | 2 ++
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk  | 2 ++
 .../xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk      | 2 ++
 .../x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk    | 2 ++
 .../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk  | 2 ++
 .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk      | 2 ++
 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk  | 2 ++
 .../xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk  | 2 ++
 .../xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk    | 2 ++
 package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk    | 2 ++
 .../xdriver_xf86-video-openchrome.mk                            | 2 ++
 .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk    | 2 ++
 .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk      | 2 ++
 .../xdriver_xf86-video-siliconmotion.mk                         | 2 ++
 package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk    | 2 ++
 package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk  | 2 ++
 .../xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk    | 2 ++
 package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk  | 2 ++
 .../x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk    | 2 ++
 .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk      | 2 ++
 .../xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk      | 2 ++
 .../x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk    | 2 ++
 37 files changed, 74 insertions(+)

diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index aca0373618..58aa6dbf8d 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.7.0
 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_EVDEV_LICENSE = MIT
+XDRIVER_XF86_INPUT_EVDEV_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto udev
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index e76ff9cf06..2c0e0259ac 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.1
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT
+XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index 5834b51891..c78273d048 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.6.1
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT
+XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 4d670bd267..35aad280ae 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.7.2
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT
+XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 4c9f446020..a6ec931e68 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.6.2
 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT
+XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
index e79796a952..43a5e8a36d 100644
--- a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
 XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.ptxdist.org/software/xf86-input-tslib/download
+XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT
+XDRIVER_XF86_INPUT_TSLIB_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \
 	xproto_inputproto \
 	xserver_xorg-server \
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 024ec01f0c..d07fc4c150 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.8.0
 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_VMMOUSE_LICENSE = MIT
+XDRIVER_XF86_INPUT_VMMOUSE_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index c1a8beb1ab..e04cb13883 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_INPUT_VOID_VERSION = 1.4.0
 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_VOID_LICENSE = MIT
+XDRIVER_XF86_INPUT_VOID_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 739a4d5ce0..9c7cc1e4d1 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.4
 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT
+XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index 6940a20432..83e2b1f36b 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -7,5 +7,7 @@
 XDRIVER_XF86_VIDEO_AST_VERSION = 0.93.10
 XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_AST_LICENSE = MIT
+XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 65ecffbc3c..06cd53bce0 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.4
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT
+XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 97f0257d13..5bc12ffdf3 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.4.0
 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_CIRRUS_LICENSE = MIT
+XDRIVER_XF86_VIDEO_CIRRUS_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 5c035854cc..9d6e61df5e 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.5
 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT
+XDRIVER_XF86_VIDEO_DUMMY_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 73aa99cf01..f5a478ef54 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.2
 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT
+XDRIVER_XF86_VIDEO_FBDEV_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index 2b963a447d..fee8b53c4f 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.13
 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT
+XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 2d4f80ff3b..21a6ebdc5a 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_GLIDE_LICENSE = MIT
+XDRIVER_XF86_VIDEO_GLIDE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 40a0716e4b..91176a9f57 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.7
 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT
+XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index d2f2cd526b..71b38589ac 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.5
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_I128_LICENSE = MIT
+XDRIVER_XF86_VIDEO_I128_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 3450ab8571..ef7f390ee2 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.19.0
 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
+XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = --enable-dri
 XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 659c785047..2957190915 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.3
 XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_MACH64_LICENSE = MIT
+XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 17e457908d..81f842b304 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_MGA_VERSION = 1.5.0
 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT
+XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 2690e3837f..33c360285b 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.6
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT
+XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index 9edac5f7e1..693303dbe2 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.4
 XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWPORT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NEWPORT_LICENSE = MIT
+XDRIVER_XF86_VIDEO_NEWPORT_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index d99e85c608..a17aaec8c2 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.18
 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NV_LICENSE = MIT
+XDRIVER_XF86_VIDEO_NV_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index e61a369d82..a42c234c17 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -6,6 +6,8 @@
 XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.906
 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://www.openchrome.org/releases
+XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT
+XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE_FILES = COPYING
 
 XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
 	xserver_xorg-server \
diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index a6603d77d1..ab1c6527cb 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_R128_VERSION = 6.8.2
 XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_R128_LICENSE = MIT
+XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 92d84b5769..8bc259a279 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.4
 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SAVAGE_LICENSE = MIT
+XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index d7db8cee67..86bc8b6677 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.6
 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE = MIT
+XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 762f6abaf5..7ca185d409 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.4
 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT
+XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index db3ba8cc77..f4ae85f8c4 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.4
 XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TDFX_LICENSE = MIT
+XDRIVER_XF86_VIDEO_TDFX_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index 05a412134d..c38c4ff9c6 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.1
 XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT
+XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 00e50a16ed..837279e992 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.5
 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT
+XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index 723cf6b707..f41822c47a 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0
 XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_V4L_LICENSE = MIT
+XDRIVER_XF86_VIDEO_V4L_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index fea23650e8..580b4f2b92 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.1
 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT
+XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index bd014a6568..15eaac6c22 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_VMWARE_VERSION = 12.0.2
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT
+XDRIVER_XF86_VIDEO_VMWARE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 49065c6c08..6c2555740f 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.4
 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VOODOO_LICENSE = MIT
+XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index c2948b2e3e..664ce2a04d 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.4.0
 XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_WSFB_LICENSE = MIT
+XDRIVER_XF86_VIDEO_WSFB_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(autotools-package))

From a8d55430c4fbeae42f4879ff3eff305b085d592b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:50:59 +0000
Subject: [PATCH 5111/6849] package/x11r7: add license informations to xlib_*
 packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libFS/xlib_libFS.mk                       | 2 ++
 package/x11r7/xlib_libICE/xlib_libICE.mk                     | 2 ++
 package/x11r7/xlib_libSM/xlib_libSM.mk                       | 2 ++
 package/x11r7/xlib_libX11/xlib_libX11.mk                     | 2 ++
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk       | 2 ++
 package/x11r7/xlib_libXau/xlib_libXau.mk                     | 2 ++
 package/x11r7/xlib_libXaw/xlib_libXaw.mk                     | 2 ++
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk       | 2 ++
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk             | 2 ++
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk             | 2 ++
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                 | 2 ++
 package/x11r7/xlib_libXext/xlib_libXext.mk                   | 2 ++
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk               | 2 ++
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                 | 2 ++
 package/x11r7/xlib_libXft/xlib_libXft.mk                     | 2 ++
 package/x11r7/xlib_libXi/xlib_libXi.mk                       | 2 ++
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk           | 2 ++
 package/x11r7/xlib_libXmu/xlib_libXmu.mk                     | 2 ++
 package/x11r7/xlib_libXpm/xlib_libXpm.mk                     | 2 ++
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk               | 2 ++
 package/x11r7/xlib_libXrender/xlib_libXrender.mk             | 2 ++
 package/x11r7/xlib_libXres/xlib_libXres.mk                   | 2 ++
 package/x11r7/xlib_libXt/xlib_libXt.mk                       | 2 ++
 package/x11r7/xlib_libXtst/xlib_libXtst.mk                   | 2 ++
 package/x11r7/xlib_libXv/xlib_libXv.mk                       | 2 ++
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                   | 2 ++
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk           | 2 ++
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk             | 2 ++
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                     | 2 ++
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk             | 2 ++
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk         | 2 ++
 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 2 ++
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk             | 2 ++
 package/x11r7/xlib_xtrans/xlib_xtrans.mk                     | 2 ++
 34 files changed, 68 insertions(+)

diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 58a87dd53c..884d68d1bb 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -7,6 +7,8 @@
 XLIB_LIBFS_VERSION = 1.0.4
 XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBFS_LICENSE = MIT
+XLIB_LIBFS_LICENSE_FILES = COPYING
 XLIB_LIBFS_INSTALL_STAGING = YES
 XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
 XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 77fc3103d9..a0f235773f 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -7,6 +7,8 @@
 XLIB_LIBICE_VERSION = 1.0.8
 XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
 XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBICE_LICENSE = MIT
+XLIB_LIBICE_LICENSE_FILES = COPYING
 XLIB_LIBICE_INSTALL_STAGING = YES
 XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
 
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index ee2d25f73b..ecc57c61e6 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -7,6 +7,8 @@
 XLIB_LIBSM_VERSION = 1.2.1
 XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
 XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBSM_LICENSE = MIT
+XLIB_LIBSM_LICENSE_FILES = COPYING
 XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 3b106cd999..2d68f9e2bc 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -7,6 +7,8 @@
 XLIB_LIBX11_VERSION = 1.5.0
 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBX11_LICENSE = MIT
+XLIB_LIBX11_LICENSE_FILES = COPYING
 XLIB_LIBX11_INSTALL_STAGING = YES
 XLIB_LIBX11_DEPENDENCIES = \
 	libxcb \
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 3885aa175b..2781a14dd9 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXSCRNSAVER_VERSION = 1.2.2
 XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
 XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXSCRNSAVER_LICENSE = MIT
+XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING
 XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
 XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
 XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index dc7f91e27e..1f838dee25 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXAU_VERSION = 1.0.7
 XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXAU_LICENSE = MIT
+XLIB_LIBXAU_LICENSE_FILES = COPYING
 XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
 
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 5e95ae07e0..c8be85ca00 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXAW_VERSION = 1.0.11
 XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXAW_LICENSE = MIT
+XLIB_LIBXAW_LICENSE_FILES = COPYING
 XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
 XLIB_LIBXAW_CONF_OPT = --disable-docs
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index a6e7c2232f..8e6c5e2563 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXCOMPOSITE_VERSION = 0.4.3
 XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2
 XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXCOMPOSITE_LICENSE = MIT
+XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
 XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
 
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 0b2c8aeacd..9a73f59a55 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXCURSOR_VERSION = 1.1.13
 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXCURSOR_LICENSE = MIT
+XLIB_LIBXCURSOR_LICENSE_FILES = COPYING
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index f4d266e39a..431248e4aa 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXDAMAGE_VERSION = 1.1.3
 XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2
 XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXDAMAGE_LICENSE = MIT
+XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
 XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
 
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 1437836a8d..fe6fb6c55d 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXDMCP_VERSION = 1.1.1
 XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXDMCP_LICENSE = MIT
+XLIB_LIBXDMCP_LICENSE_FILES = COPYING
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 390ed0cb3d..28150abbc2 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXEXT_VERSION = 1.3.1
 XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXEXT_LICENSE = MIT
+XLIB_LIBXEXT_LICENSE_FILES = COPYING
 XLIB_LIBXEXT_INSTALL_STAGING = YES
 XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 9b2a30905b..70abf9a107 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXFIXES_VERSION = 5.0
 XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFIXES_LICENSE = MIT
+XLIB_LIBXFIXES_LICENSE_FILES = COPYING
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 72f9416b5e..0d93468168 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXFONT_VERSION = 1.4.5
 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFONT_LICENSE = MIT
+XLIB_LIBXFONT_LICENSE_FILES = COPYING
 XLIB_LIBXFONT_AUTORECONF = YES
 XLIB_LIBXFONT_INSTALL_STAGING = YES
 XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 9bf10ef6d5..2c5281abfd 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXFT_VERSION = 2.3.1
 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFT_LICENSE = MIT
+XLIB_LIBXFT_LICENSE_FILES = COPYING
 XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index b258883fc5..193fb97c7c 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXI_VERSION = 1.6.1
 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXI_LICENSE = MIT
+XLIB_LIBXI_LICENSE_FILES = COPYING
 XLIB_LIBXI_INSTALL_STAGING = YES
 XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
 XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index ae3d41a07b..98ac136cef 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXINERAMA_VERSION = 1.1.2
 XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXINERAMA_LICENSE = MIT
+XLIB_LIBXINERAMA_LICENSE_FILES = COPYING
 XLIB_LIBXINERAMA_INSTALL_STAGING = YES
 XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
 XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index fd2a6791ff..b067f8deef 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXMU_VERSION = 1.1.1
 XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
 XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXMU_LICENSE = MIT
+XLIB_LIBXMU_LICENSE_FILES = COPYING
 XLIB_LIBXMU_INSTALL_STAGING = YES
 XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index bef2d0133e..1d1d017184 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXPM_VERSION = 3.5.10
 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXPM_LICENSE = MIT
+XLIB_LIBXPM_LICENSE_FILES = COPYING
 XLIB_LIBXPM_INSTALL_STAGING = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 6c3fdbf1a1..e5673c8cf2 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXRANDR_VERSION = 1.3.2
 XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXRANDR_LICENSE = MIT
+XLIB_LIBXRANDR_LICENSE_FILES = COPYING
 XLIB_LIBXRANDR_INSTALL_STAGING = YES
 XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
 XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index fbd5015367..4398af5326 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXRENDER_VERSION = 0.9.7
 XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXRENDER_LICENSE = MIT
+XLIB_LIBXRENDER_LICENSE_FILES = COPYING
 XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index d2d492fd76..a272841852 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXRES_VERSION = 1.0.6
 XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXRES_LICENSE = MIT
+XLIB_LIBXRES_LICENSE_FILES = COPYING
 XLIB_LIBXRES_INSTALL_STAGING = YES
 XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
 XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 9f9aaea818..76c04890e6 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXT_VERSION = 1.1.3
 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXT_LICENSE = MIT
+XLIB_LIBXT_LICENSE_FILES = COPYING
 XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
 XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index 8ca44b71cd..055b4c3ab7 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXTST_VERSION = 1.2.1
 XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2
 XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXTST_LICENSE = MIT
+XLIB_LIBXTST_LICENSE_FILES = COPYING
 XLIB_LIBXTST_INSTALL_STAGING = YES
 
 XLIB_LIBXTST_DEPENDENCIES = \
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 06c1145d47..a64d980e9e 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXV_VERSION = 1.0.7
 XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXV_LICENSE = MIT
+XLIB_LIBXV_LICENSE_FILES = COPYING
 XLIB_LIBXV_INSTALL_STAGING = YES
 XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
 XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 5b92612e67..18bfbef03d 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXVMC_VERSION = 1.0.7
 XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXVMC_LICENSE = MIT
+XLIB_LIBXVMC_LICENSE_FILES = COPYING
 XLIB_LIBXVMC_INSTALL_STAGING = YES
 XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
 XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index d57b7947a0..ba2aed46f7 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXXF86DGA_VERSION = 1.1.3
 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXXF86DGA_LICENSE = MIT
+XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING
 XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
 XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
 XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index f032b06567..2ed7eda27d 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXXF86VM_VERSION = 1.1.2
 XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXXF86VM_LICENSE = MIT
+XLIB_LIBXXF86VM_LICENSE_FILES = COPYING
 XLIB_LIBXXF86VM_INSTALL_STAGING = YES
 XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
 XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 0b21f8d3f1..71a49c91cd 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -7,6 +7,8 @@
 XLIB_LIBDMX_VERSION = 1.1.2
 XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBDMX_LICENSE = MIT
+XLIB_LIBDMX_LICENSE_FILES = COPYING
 XLIB_LIBDMX_INSTALL_STAGING = YES
 XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
 XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 191db88a97..4169e9010c 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -7,6 +7,8 @@
 XLIB_LIBFONTENC_VERSION = 1.1.1
 XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBFONTENC_LICENSE = MIT
+XLIB_LIBFONTENC_LICENSE_FILES = COPYING
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index f2a5d24380..64224b1ebc 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -7,6 +7,8 @@
 XLIB_LIBPCIACCESS_VERSION = 0.13.1
 XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBPCIACCESS_LICENSE = MIT
+XLIB_LIBPCIACCESS_LICENSE_FILES = COPYING
 XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
index 909253c11a..d48272a30e 100644
--- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
+++ b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
@@ -6,6 +6,8 @@
 XLIB_LIBPTHREAD_STUBS_VERSION = 0.3
 XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2
 XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
+XLIB_LIBPTHREAD_STUBS_LICENSE = MIT
+XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
 
 XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES
 
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index bd63961566..00395c5023 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -7,6 +7,8 @@
 XLIB_LIBXKBFILE_VERSION = 1.0.8
 XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
 XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXKBFILE_LICENSE = MIT
+XLIB_LIBXKBFILE_LICENSE_FILES = COPYING
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 1d2d68a192..7cb1a58ebd 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -7,6 +7,8 @@
 XLIB_XTRANS_VERSION = 1.2.7
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_XTRANS_LICENSE = MIT
+XLIB_XTRANS_LICENSE_FILES = COPYING
 XLIB_XTRANS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 0a7ea9465cd6a0a37e6ed924549c555ba8ed10b2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:00 +0000
Subject: [PATCH 5112/6849] package/x11r7: add license informations to xutil_*
 packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xutil_makedepend/xutil_makedepend.mk   | 2 ++
 package/x11r7/xutil_util-macros/xutil_util-macros.mk | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index ff4d9bd005..4f0e23f645 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -7,6 +7,8 @@
 XUTIL_MAKEDEPEND_VERSION = 1.0.4
 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2
 XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
+XUTIL_MAKEDEPEND_LICENSE = MIT
+XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING
 
 XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
 
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 6171c397d0..08b823a5a3 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -7,6 +7,9 @@
 XUTIL_UTIL_MACROS_VERSION = 1.17
 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
+XUTIL_UTIL_MACROS_LICENSE = MIT
+XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING
+
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 

From aed08f8bd96971b0e798a99604bd9a66fc5de7a8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:01 +0000
Subject: [PATCH 5113/6849] package/x11r7: add license informations to xfont_*
 packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xfont_encodings/xfont_encodings.mk               | 3 +++
 .../x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk   | 3 +++
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 3 +++
 .../xfont_font-adobe-utopia-100dpi.mk                          | 3 +++
 .../xfont_font-adobe-utopia-75dpi.mk                           | 3 +++
 .../xfont_font-adobe-utopia-type1.mk                           | 3 +++
 package/x11r7/xfont_font-alias/xfont_font-alias.mk             | 3 +++
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 3 +++
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk     | 3 +++
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk       | 3 +++
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                   | 3 +++
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                    | 3 +++
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk           | 3 +++
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk       | 3 +++
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 3 +++
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk   | 3 +++
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk   | 3 +++
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk   | 3 +++
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 3 +++
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 2 ++
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk       | 3 +++
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk     | 3 +++
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk     | 3 +++
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk       | 2 ++
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk   | 3 +++
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 3 +++
 .../x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 3 +++
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 3 +++
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk     | 3 +++
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk     | 3 +++
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk   | 3 +++
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk   | 3 +++
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk     | 3 +++
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk       | 3 +++
 package/x11r7/xfont_font-util/xfont_font-util.mk               | 3 +++
 .../xfont_font-winitzki-cyrillic.mk                            | 3 +++
 .../x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 3 +++
 37 files changed, 109 insertions(+)

diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 2113c07ec4..8c84ee51c3 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -7,6 +7,9 @@
 XFONT_ENCODINGS_VERSION = 1.0.4
 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_ENCODINGS_LICENSE = Public Domain
+XFONT_ENCODINGS_LICENSE_FILES = COPYING
+
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkgconf xutil_util-macros
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 70487dc5a9..370286c71d 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.3
 XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ADOBE_100DPI_LICENSE = MIT
+XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index fa1212ff53..fa0621ed47 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.3
 XFONT_FONT_ADOBE_75DPI_SOURCE = font-adobe-75dpi-$(XFONT_FONT_ADOBE_75DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ADOBE_75DPI_LICENSE = MIT
+XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index a8421686a3..a27bce3a69 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.4
 XFONT_FONT_ADOBE_UTOPIA_100DPI_SOURCE = font-adobe-utopia-100dpi-$(XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed)
+XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index 54b7607c2c..c7295fa536 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION = 1.0.4
 XFONT_FONT_ADOBE_UTOPIA_75DPI_SOURCE = font-adobe-utopia-75dpi-$(XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed)
+XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index e991aea326..977899b82c 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.4
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.bz2
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed)
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
+
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 05df9612c8..4a95dfbdb6 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ALIAS_VERSION = 1.0.3
 XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2
 XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ALIAS_LICENSE = MIT
+XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
+
 XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index 8802c5d3d7..efa24ece4f 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ARABIC_MISC_VERSION = 1.0.3
 XFONT_FONT_ARABIC_MISC_SOURCE = font-arabic-misc-$(XFONT_FONT_ARABIC_MISC_VERSION).tar.bz2
 XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ARABIC_MISC_LICENSE = MIT
+XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 2f435248df..6fae9e631f 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BH_100DPI_VERSION = 1.0.3
 XFONT_FONT_BH_100DPI_SOURCE = font-bh-100dpi-$(XFONT_FONT_BH_100DPI_VERSION).tar.bz2
 XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification)
+XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 37235c850c..68094bb64b 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BH_75DPI_VERSION = 1.0.3
 XFONT_FONT_BH_75DPI_SOURCE = font-bh-75dpi-$(XFONT_FONT_BH_75DPI_VERSION).tar.bz2
 XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification)
+XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index 8eac391475..5c3fb38537 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.3
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE = font-bh-lucidatypewriter-100dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION).tar.bz2
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification)
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 22bd15139b..54dff33e75 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.3
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE = font-bh-lucidatypewriter-75dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION).tar.bz2
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification)
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index 874e495fc9..8ff74810a0 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BH_TTF_VERSION = 1.0.3
 XFONT_FONT_BH_TTF_SOURCE = font-bh-ttf-$(XFONT_FONT_BH_TTF_VERSION).tar.bz2
 XFONT_FONT_BH_TTF_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification)
+XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
+
 XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 842f73f4e2..23f5739001 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BH_TYPE1_VERSION = 1.0.3
 XFONT_FONT_BH_TYPE1_SOURCE = font-bh-type1-$(XFONT_FONT_BH_TYPE1_VERSION).tar.bz2
 XFONT_FONT_BH_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification)
+XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
+
 XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index 702903683d..01b0e23e8a 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.3
 XFONT_FONT_BITSTREAM_100DPI_SOURCE = font-bitstream-100dpi-$(XFONT_FONT_BITSTREAM_100DPI_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT
+XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index e8d4211117..0b685e0ef6 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.3
 XFONT_FONT_BITSTREAM_75DPI_SOURCE = font-bitstream-75dpi-$(XFONT_FONT_BITSTREAM_75DPI_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT
+XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
+
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 25611415b4..3c91300fe2 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.3
 XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.bz2
 XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT
+XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
+
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 16468bebf1..f04dcb691f 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.3
 XFONT_FONT_CRONYX_CYRILLIC_SOURCE = font-cronyx-cyrillic-$(XFONT_FONT_CRONYX_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT
+XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
+
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index c193a4aab1..95a18c194c 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_CURSOR_MISC_VERSION = 1.0.3
 XFONT_FONT_CURSOR_MISC_SOURCE = font-cursor-misc-$(XFONT_FONT_CURSOR_MISC_VERSION).tar.bz2
 XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered
+XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index f0207c64c4..93b8af69ea 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -7,6 +7,8 @@
 XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.3
 XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSION).tar.bz2
 XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index 830e5cb3b2..17fce1ab70 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_DEC_MISC_VERSION = 1.0.3
 XFONT_FONT_DEC_MISC_SOURCE = font-dec-misc-$(XFONT_FONT_DEC_MISC_VERSION).tar.bz2
 XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_DEC_MISC_LICENSE = MIT
+XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 749d3557fa..d9b4b9d7ba 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_IBM_TYPE1_VERSION = 1.0.3
 XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.bz2
 XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification)
+XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
+
 XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 2e8e193b50..9534f1c681 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_ISAS_MISC_VERSION = 1.0.3
 XFONT_FONT_ISAS_MISC_SOURCE = font-isas-misc-$(XFONT_FONT_ISAS_MISC_VERSION).tar.bz2
 XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ISAS_MISC_LICENSE = MIT
+XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 3dda77c186..2b017c7e85 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -7,6 +7,8 @@
 XFONT_FONT_JIS_MISC_VERSION = 1.0.3
 XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz2
 XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index cdbaaebce6..8c11700b1f 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_MICRO_MISC_VERSION = 1.0.3
 XFONT_FONT_MICRO_MISC_SOURCE = font-micro-misc-$(XFONT_FONT_MICRO_MISC_VERSION).tar.bz2
 XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_MICRO_MISC_LICENSE = Public Domain
+XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index d45f223d43..8cec6960ab 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.3
 XFONT_FONT_MISC_CYRILLIC_SOURCE = font-misc-cyrillic-$(XFONT_FONT_MISC_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain
+XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
+
 XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index 09bafd91db..4275d088af 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.3
 XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2
 XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT
+XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
+
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index 310ba6400b..35d4a7257e 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_MISC_MELTHO_VERSION = 1.0.3
 XFONT_FONT_MISC_MELTHO_SOURCE = font-misc-meltho-$(XFONT_FONT_MISC_MELTHO_VERSION).tar.bz2
 XFONT_FONT_MISC_MELTHO_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License
+XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
+
 XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index e4714b04ab..12aabe1a88 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_MISC_MISC_VERSION = 1.1.2
 XFONT_FONT_MISC_MISC_SOURCE = font-misc-misc-$(XFONT_FONT_MISC_MISC_VERSION).tar.bz2
 XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_MISC_MISC_LICENSE = Public Domain
+XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 9a10b76201..fe7593ee09 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_MUTT_MISC_VERSION = 1.0.3
 XFONT_FONT_MUTT_MISC_SOURCE = font-mutt-misc-$(XFONT_FONT_MUTT_MISC_VERSION).tar.bz2
 XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_MUTT_MISC_LICENSE = MIT
+XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index aec3073aed..e310606021 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.2
 XFONT_FONT_SCHUMACHER_MISC_SOURCE = font-schumacher-misc-$(XFONT_FONT_SCHUMACHER_MISC_VERSION).tar.bz2
 XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT
+XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index db22b9b854..903a073114 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.4
 XFONT_FONT_SCREEN_CYRILLIC_SOURCE = font-screen-cyrillic-$(XFONT_FONT_SCREEN_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT
+XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
+
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index b3ad6da490..641f6505fa 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_SONY_MISC_VERSION = 1.0.3
 XFONT_FONT_SONY_MISC_SOURCE = font-sony-misc-$(XFONT_FONT_SONY_MISC_VERSION).tar.bz2
 XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_SONY_MISC_LICENSE = MIT
+XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 39a24373d4..7c038f369e 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_SUN_MISC_VERSION = 1.0.3
 XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.bz2
 XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_SUN_MISC_LICENSE = MIT
+XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
+
 XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index f318500ace..0b79d80ee3 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_UTIL_VERSION = 1.3.0
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_UTIL_LICENSE = MIT/BSD-2c
+XFONT_FONT_UTIL_LICENSE_FILES = COPYING
+
 XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
 XFONT_FONT_UTIL_INSTALL_STAGING = YES
 XFONT_FONT_UTIL_INSTALL_TARGET = NO
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 1153659ccd..7ca7201a23 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.3
 XFONT_FONT_WINITZKI_CYRILLIC_SOURCE = font-winitzki-cyrillic-$(XFONT_FONT_WINITZKI_CYRILLIC_VERSION).tar.bz2
 XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain
+XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
+
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index bb23be9fbd..4bd6bd4697 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -7,6 +7,9 @@
 XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.4
 XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2
 XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT
+XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
+
 XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf

From 0cc701cf735fb2fcfc9f4b682e8748ab3b5e8b25 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:02 +0000
Subject: [PATCH 5114/6849] package/x11r7: add license informations to misc
 other packages

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/libxcb/libxcb.mk                                | 2 ++
 package/x11r7/mcookie/mcookie.mk                              | 1 +
 package/x11r7/mesa3d/mesa3d.mk                                | 3 +++
 package/x11r7/xcb-proto/xcb-proto.mk                          | 2 ++
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk            | 4 ++++
 package/x11r7/xcb-util/xcb-util.mk                            | 4 ++++
 .../xcursor-transparent-theme/xcursor-transparent-theme.mk    | 2 ++
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk                | 3 +++
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk    | 3 +++
 9 files changed, 24 insertions(+)

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 0999dc4f09..97f6238365 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -6,6 +6,8 @@
 LIBXCB_VERSION = 1.8.1
 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
 LIBXCB_SITE = http://xcb.freedesktop.org/dist/
+LIBXCB_LICENSE = MIT
+LIBXCB_LICENSE_FILES = COPYING
 
 LIBXCB_INSTALL_STAGING = YES
 
diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk
index b7191a7730..cc83f46d7e 100644
--- a/package/x11r7/mcookie/mcookie.mk
+++ b/package/x11r7/mcookie/mcookie.mk
@@ -6,6 +6,7 @@
 
 # Source included in Buildroot
 MCOOKIE_SOURCE =
+MCOOKIE_LICENSE = Public Domain
 
 define MCOOKIE_EXTRACT_CMDS
 	cp package/x11r7/mcookie/mcookie.c $(@D)/
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 397dbb2911..84f7c3fb52 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -7,6 +7,9 @@
 MESA3D_VERSION = 7.10.3
 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
+MESA3D_LICENSE = MIT, SGI, Khronos
+MESA3D_LICENSE_FILES = docs/license.html
+
 MESA3D_AUTORECONF = YES
 MESA3D_INSTALL_STAGING = YES
 
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index e76f82907c..730feb595f 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -6,6 +6,8 @@
 XCB_PROTO_VERSION = 1.7.1
 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
 XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
+XCB_PROTO_LICENSE = MIT
+XCB_PROTO_LICENSE_FILES = COPYING
 
 XCB_PROTO_INSTALL_STAGING = YES
 
diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
index 18db52acf6..8960c77e3d 100644
--- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
+++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
@@ -6,6 +6,10 @@
 XCB_UTIL_KEYSYMS_VERSION = 0.3.9
 XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2
 XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist/
+
+# unfortunately, no license file
+XCB_UTIL_KEYSYMS_LICENSE = MIT
+
 XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index a1948e1c24..a16b1503f2 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -6,6 +6,10 @@
 XCB_UTIL_VERSION = 0.3.9
 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
+
+# unfortunately, no license file
+XCB_UTIL_LICENSE = MIT
+
 XCB_UTIL_INSTALL_STAGING = YES
 XCB_UTIL_DEPENDENCIES = host-gperf libxcb
 
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
index 3ad985bf6e..70f98870f1 100644
--- a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -7,6 +7,8 @@
 XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1
 XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils/
 XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
+XCURSOR_TRANSPARENT_THEME_LICENSE = GPLv2
+XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING
 
 define ICONS_DEFAULT_CONFIG_INSTALL
         $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index 1f267433d7..ae964b49ed 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -7,6 +7,9 @@
 XDATA_XBITMAPS_VERSION = 1.1.1
 XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
 XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
+XDATA_XBITMAPS_LICENSE = MIT
+XDATA_XBITMAPS_LICENSE_FILES = COPYING
+
 XDATA_XBITMAPS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index e46fbbc7c7..68c3ae2f58 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -7,6 +7,9 @@
 XDATA_XCURSOR_THEMES_VERSION = 1.0.3
 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2
 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data
+XDATA_XCURSOR_THEMES_LICENSE = MIT
+XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING
+
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
 XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
 

From 3dfbf657604ecf132b7b848d664c45dbac88a455 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:03 +0000
Subject: [PATCH 5115/6849] xserver_xorg-server: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 1c514560c7..a2bc05657e 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -7,6 +7,8 @@
 XSERVER_XORG_SERVER_VERSION = 1.12.4
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
+XSERVER_XORG_SERVER_LICENSE = MIT
+XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
 XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data

From a5d5b097a42afeda02ca93b7e83d17d4dbde02c3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:04 +0000
Subject: [PATCH 5116/6849] libatomic_ops: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libatomic_ops/libatomic_ops.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index 8f66f88ddd..10db2722e5 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -7,6 +7,16 @@
 LIBATOMIC_OPS_VERSION = 7.2
 LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
 LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
+
+# From doc/LICENSING.txt: "Our intent is to make it easy to use
+# libatomic_ops, in both free and proprietary software.  Hence most
+# code that we expect to be linked into a client application is
+# covered by an MIT-style license. A few library routines are covered
+# by the GNU General Public License. These are put into a separate
+# library, libatomic_ops_gpl.a."
+LIBATOMIC_OPS_LICENSE = MIT (main library) / GPLv2+ (gpl extension)
+LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt doc/COPYING
+
 LIBATOMIC_OPS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From d6ae18cccc82f04c8637d5acd6528e0753ab569e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:05 +0000
Subject: [PATCH 5117/6849] libdrm: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdrm/libdrm.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 5dd276f8ca..380bc1d222 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -3,9 +3,12 @@
 # libdrm
 #
 #############################################################
+
 LIBDRM_VERSION = 2.4.38
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
+LIBDRM_LICENSE = MIT
+
 LIBDRM_INSTALL_STAGING = YES
 
 LIBDRM_DEPENDENCIES = \

From 48ac24985c0dcf37c1951da9f7f4d4ae18ee1266 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:06 +0000
Subject: [PATCH 5118/6849] libsha1: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsha1/libsha1.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libsha1/libsha1.mk b/package/libsha1/libsha1.mk
index e9658af4ba..da6a7b2910 100644
--- a/package/libsha1/libsha1.mk
+++ b/package/libsha1/libsha1.mk
@@ -6,6 +6,9 @@
 
 LIBSHA1_VERSION = 0.3
 LIBSHA1_SITE = http://github.com/dottedmag/libsha1/tarball/$(LIBSHA1_VERSION)
+LIBSHA1_LICENSE = BSD-3c or GPL
+LIBSHA1_LICENSE_FILES = COPYING
+
 LIBSHA1_INSTALL_STAGING = YES
 
 # We're getting the source code from Github, so there is no generated

From 61232f80607edb09c04124b8bf6076555668b417 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:51:07 +0000
Subject: [PATCH 5119/6849] pixman: add license informations

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pixman/pixman.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 607f82ef1b..c2ee035ff6 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -5,6 +5,9 @@
 ################################################################################
 PIXMAN_VERSION = 0.28.2
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
+PIXMAN_LICENSE = MIT
+PIXMAN_LICENSE_FILES = COPYING
+
 PIXMAN_INSTALL_STAGING = YES
 PIXMAN_DEPENDENCIES = host-pkgconf
 # don't build gtk based demos

From 671bd0468516224bf8c1bb56e35bed9b3cb0c8d6 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <Mischa.Jonker@synopsys.com>
Date: Thu, 9 May 2013 05:53:04 +0000
Subject: [PATCH 5120/6849] toolchain/gcc: make sure to pass
 $(HOST_DIR)/usr/bin in the PATH

Since gcc doesn't use the package infrastructure, it doesn't get all
the good generic environment variables, and forgets to get
$(HOST_DIR)/usr/bin in its PATH. This prevents gcc from finding and
using host tools built by Buildroot.

This patch therefore ensures that $(HOST_MAKE_ENV) or
$(TARGET_MAKE_ENV) are passed at the appropriate locations. It will be
useful for a later patch that makes gcc depend on host-flex/host-bison
in some situations.

Original patch by Thomas Petazzoni.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 959568f7a5..8cacc32817 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -299,16 +299,16 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
 	$(Q)$(call MESSAGE,"Building gcc pass-1")
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
+	$(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
 else
-	$(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
+	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
 endif
 	touch $@
 
 gcc_initial=$(GCC_BUILD_DIR1)/.installed
 $(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
 	$(Q)$(call MESSAGE,"Installing gcc pass-1")
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
+	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
 	touch $(gcc_initial)
 
 gcc_initial: $(GCC_HOST_PREREQ) host-binutils $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
@@ -370,9 +370,9 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
 	$(Q)$(call MESSAGE,"Building gcc pass-2")
 	# gcc >= 4.3.0 have to also build all-target-libgcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc
+	$(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc
 else
-	$(MAKE) -C $(GCC_BUILD_DIR2) all-gcc
+	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc
 endif
 	touch $@
 
@@ -381,9 +381,9 @@ $(gcc_intermediate): $(GCC_BUILD_DIR2)/.compiled
 	$(Q)$(call MESSAGE,"Installing gcc pass-2")
 	# gcc >= 4.3.0 have to also install install-target-libgcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc
+	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc
 else
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc
+	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc
 endif
 	touch $(gcc_intermediate)
 
@@ -449,12 +449,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 
 $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
 	$(Q)$(call MESSAGE,"Building gcc final")
-	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all
+	$(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all
 	touch $@
 
 $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled
 	$(Q)$(call MESSAGE,"Installing gcc final")
-	PATH=$(TARGET_PATH) $(MAKE) \
+	$(HOST_MAKE_ENV) $(MAKE) \
 		-C $(GCC_BUILD_DIR3) install
 	if [ -d "$(STAGING_DIR)/lib64" ]; then \
 		if [ ! -e "$(STAGING_DIR)/lib" ]; then \
@@ -582,8 +582,8 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 
 $(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured
 	$(Q)$(call MESSAGE,"Building gcc on target")
-	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR4) all
+	$(TARGET_MAKE_ENV) \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR4) all
 	touch $@
 
 GCC_LIB_SUBDIR=lib/gcc/$(GNU_TARGET_NAME)/$(GCC_VERSION)
@@ -595,7 +595,7 @@ endif
 
 $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
 	$(Q)$(call MESSAGE,"Installing gcc on target")
-	PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \
+	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \
 		$(MAKE1) -C $(GCC_BUILD_DIR4) install
 	# Remove broken specs file (cross compile flag is set).
 	rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs

From 7c6232658a61c33d4746ace8f479916f957a5a6b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 9 May 2013 05:53:05 +0000
Subject: [PATCH 5121/6849] toolchain/gcc: the ARC version of gcc needs
 host-flex/host-bison

For some reason (probably because the ARC changes modify some lex/yacc
files without updating their pre-generated variants, or because the
date/time of the pre-generated files is not correct), building the ARC
gcc requires host-flex and host-bison.

We have tested 4.2 for AVR, 4.3 and 4.4 for ARM, and none of those
need host-flex or host-bison to be installed, so only the 4.4 for ARC
seems to be affected.

Fixes the build failure visible at
http://autobuild.buildroot.org/results/673c6262e3dde8ee8dd28204d814097e6ba8f8e9/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 8cacc32817..21679ef17f 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -180,6 +180,10 @@ endif
 GCC_HOST_PREREQ += host-mpc
 endif
 
+ifeq ($(BR2_GCC_VERSION_4_4_7_ARC),y)
+GCC_HOST_PREREQ += host-flex host-bison
+endif
+
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 GCC_SHARED_LIBGCC:=--enable-shared
 else

From 47f578e3c2db53caf51fad9ec24e71ff1606c862 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 9 May 2013 12:22:58 +0000
Subject: [PATCH 5122/6849] package/dtc: new package

dtc is the Device Tree Compiler, and manipulates device trees.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                          |  1 +
 package/dtc/Config.in                      |  9 ++++++
 package/dtc/dtc-extra_cflags.patch         | 28 ++++++++++++++++++
 package/dtc/dtc-separate-lib-install.patch | 28 ++++++++++++++++++
 package/dtc/dtc.mk                         | 33 ++++++++++++++++++++++
 5 files changed, 99 insertions(+)
 create mode 100644 package/dtc/Config.in
 create mode 100644 package/dtc/dtc-extra_cflags.patch
 create mode 100644 package/dtc/dtc-separate-lib-install.patch
 create mode 100644 package/dtc/dtc.mk

diff --git a/package/Config.in b/package/Config.in
index 55a38b9bfe..1dee2ab2ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -459,6 +459,7 @@ endmenu
 
 menu "Hardware handling"
 source "package/ccid/Config.in"
+source "package/dtc/Config.in"
 source "package/imx-lib/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
diff --git a/package/dtc/Config.in b/package/dtc/Config.in
new file mode 100644
index 0000000000..e1f6e86ded
--- /dev/null
+++ b/package/dtc/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_DTC
+	bool "dtc"
+	help
+	  The Device Tree Compiler, dtc, takes as input a device-tree in
+	  a given format and outputs a device-tree in another format.
+
+	  Note that only the library is installed for now.
+
+	  http://git.jdl.com/gitweb/?p=dtc.git  (no home page)
diff --git a/package/dtc/dtc-extra_cflags.patch b/package/dtc/dtc-extra_cflags.patch
new file mode 100644
index 0000000000..3ce699b5d8
--- /dev/null
+++ b/package/dtc/dtc-extra_cflags.patch
@@ -0,0 +1,28 @@
+Makefile: append the CFLAGS to existing ones
+
+Allow the user to pass custom CFLAGS (eg. optimisation flags).
+
+Do not use EXTRA_CFLAGS, append to existing CFLAGS with +=  (Arnout)
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Cc: Arnout Vandecappelle <arnout@mind.be>
+
+---
+Patch not sent upstream.
+
+Although not specific to buildroot, I am not sure this is the best
+way to handle user-supplied CFLAGS.
+
+diff -durN dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef.orig/Makefile dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef/Makefile
+--- dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef.orig/Makefile	2012-10-22 22:02:47.541240846 +0200
++++ dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef/Makefile	2012-10-22 22:03:21.151047833 +0200
+@@ -18,7 +18,8 @@
+ CPPFLAGS = -I libfdt -I .
+ WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
+ 	-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls
+-CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
++CFLAGS ?= -g -Os
++CFLAGS += -fPIC $(WARNINGS)
+ 
+ BISON = bison
+ LEX = flex
diff --git a/package/dtc/dtc-separate-lib-install.patch b/package/dtc/dtc-separate-lib-install.patch
new file mode 100644
index 0000000000..c86d587a1b
--- /dev/null
+++ b/package/dtc/dtc-separate-lib-install.patch
@@ -0,0 +1,28 @@
+Makefile: add a rule to only install libfdt
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch not sent upstream.
+
+It's really specific to buildroot, and is probably not
+good (aka generic) enough to be pushed upstream.
+
+diff --git a/Makefile b/Makefile
+index 1169e6c..39e7190 100644
+--- a/Makefile
++++ b/Makefile
+@@ -160,10 +160,12 @@ endif
+ # intermediate target and building them again "for real"
+ .SECONDARY: $(DTC_GEN_SRCS) $(CONVERT_GEN_SRCS)
+ 
+-install: all $(SCRIPTS)
++install: all $(SCRIPTS) libfdt_install
+ 	@$(VECHO) INSTALL
+ 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
++
++libfdt_install: libfdt
+ 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
+ 	ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
new file mode 100644
index 0000000000..f05b09de2a
--- /dev/null
+++ b/package/dtc/dtc.mk
@@ -0,0 +1,33 @@
+#############################################################
+#
+# dtc
+#
+#############################################################
+
+DTC_VERSION         = e4b497f367a3b2ae99cc52089a14a221b13a76ef
+DTC_SITE            = git://git.jdl.com/software/dtc.git
+DTC_LICENSE         = GPLv2+/BSD-2c
+DTC_LICENSE_FILES   = README.license GPL
+# Note: the dual-license only applies to the library.
+#       The DT compiler (dtc) is GPLv2+, but we do not install it.
+DTC_INSTALL_STAGING = YES
+
+define DTC_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS)    \
+	$(MAKE) -C $(@D) PREFIX=/usr libfdt
+endef
+
+# libfdt_install is our own install rule added by our patch
+define DTC_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr libfdt_install
+endef
+
+define DTC_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr libfdt_install
+endef
+
+define DTC_CLEAN_CMDS
+	$(MAKE) -C $(@D) libfdt_clean
+endef
+
+$(eval $(generic-package))

From 257e1f4f4388b9cdb734dc55b35e70ff731d0492 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 9 May 2013 12:22:59 +0000
Subject: [PATCH 5123/6849] package/dtc: add option to install programs

By default, we only install the libfdt library.

As suggested by Arnout, add an option that also
installs the few dtc programs.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dtc/Config.in | 28 ++++++++++++++++++++++++++--
 package/dtc/dtc.mk    | 35 +++++++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/package/dtc/Config.in b/package/dtc/Config.in
index e1f6e86ded..fac6ab2ea4 100644
--- a/package/dtc/Config.in
+++ b/package/dtc/Config.in
@@ -1,9 +1,33 @@
 config BR2_PACKAGE_DTC
-	bool "dtc"
+	bool "dtc (libfdt)"
 	help
 	  The Device Tree Compiler, dtc, takes as input a device-tree in
 	  a given format and outputs a device-tree in another format.
 
-	  Note that only the library is installed for now.
+	  Note that only the library is installed.
+	  If you want the programs, say 'y' here, and to "dtc programs", below.
 
 	  http://git.jdl.com/gitweb/?p=dtc.git  (no home page)
+
+if BR2_PACKAGE_DTC
+
+config BR2_PACKAGE_DTC_PROGRAMS
+	bool "dtc programs"
+	help
+	  Say 'y' here if you also want the programs on the target:
+	    - convert-dtsv0     convert from version 0 to version 1
+	    - dtc               the device tree compiler
+	    - dtdiff            compare two device trees (needs bash)
+	    - fdtdump           print a readable version of a flat device tree
+	    - fdtget            read values from device tree
+	    - fdtput            write a property value to a device tree
+
+	  Note: dtdiff requires bash, so if bash is not selected, dtdiff will
+	        be removed from the target file system. Enable bash if you
+	        need dtdiff on the target.
+
+comment "dtdiff will not be installed: it requires bash"
+	depends on BR2_PACKAGE_DTC_PROGRAMS
+	depends on !BR2_PACKAGE_BASH
+
+endif
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index f05b09de2a..76ff3617cf 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -8,26 +8,49 @@ DTC_VERSION         = e4b497f367a3b2ae99cc52089a14a221b13a76ef
 DTC_SITE            = git://git.jdl.com/software/dtc.git
 DTC_LICENSE         = GPLv2+/BSD-2c
 DTC_LICENSE_FILES   = README.license GPL
-# Note: the dual-license only applies to the library.
-#       The DT compiler (dtc) is GPLv2+, but we do not install it.
 DTC_INSTALL_STAGING = YES
 
+define DTC_POST_INSTALL_TARGET_RM_DTDIFF
+	rm -f $(TARGET_DIR)/usr/bin/dtdiff
+endef
+
+ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y)
+
+DTC_LICENSE        += (for the library), GPLv2+ (for the executables)
+# Use default goal to build everything
+DTC_BUILD_GOAL      =
+DTC_INSTALL_GOAL    = install
+DTC_CLEAN_GOAL      = clean
+ifeq ($(BR2_PACKAGE_BASH),)
+DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
+endif
+
+else # $(BR2_PACKAGE_DTC_PROGRAMS) != y
+
+DTC_BUILD_GOAL      = libfdt
+# libfdt_install is our own install rule added by our patch
+DTC_INSTALL_GOAL    = libfdt_install
+DTC_CLEAN_GOAL      = libfdt_clean
+
+endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
+
 define DTC_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS)    \
-	$(MAKE) -C $(@D) PREFIX=/usr libfdt
+	CFLAGS="$(TARGET_CFLAGS)"   \
+	$(MAKE) -C $(@D) PREFIX=/usr $(DTC_BUILD_GOAL)
 endef
 
-# libfdt_install is our own install rule added by our patch
+# For staging, only the library is needed
 define DTC_INSTALL_STAGING_CMDS
 	$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr libfdt_install
 endef
 
 define DTC_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr libfdt_install
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr $(DTC_INSTALL_GOAL)
 endef
 
 define DTC_CLEAN_CMDS
-	$(MAKE) -C $(@D) libfdt_clean
+	$(MAKE) -C $(@D) $(DTC_CLEAN_GOAL)
 endef
 
 $(eval $(generic-package))

From 7c58258e212c45fadf6d01ea969798210f767557 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 12:46:05 +0000
Subject: [PATCH 5124/6849] libsigsegv: fix build on x86_64 (probably others
 too)

The configure script doesn't detect that the target is posix-compliant
and tries to use a custom version of segfault analysis that actually
doesn't build. Most likely, it's because the configure script doesn't
support linux-3.x. Anyway, we can just tell configure that we're
posix-compliant.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsigsegv/libsigsegv.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk
index b8f84da8da..ac72c6dd2a 100644
--- a/package/libsigsegv/libsigsegv.mk
+++ b/package/libsigsegv/libsigsegv.mk
@@ -7,6 +7,7 @@
 LIBSIGSEGV_VERSION = 2.6
 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
 LIBSIGSEGV_INSTALL_STAGING = YES
+LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes
 LIBSIGSEGV_LICENSE = GPLv2+
 LIBSIGSEGV_LICENSE_FILES = COPYING
 

From 8e384dcb8fa13fc9ba7eed3417c1371392e3bec0 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 12 May 2013 12:43:07 +0000
Subject: [PATCH 5125/6849] gst-plugins-bad: fix build of directfb plugin

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...gst-plugins-bad-0002-fix-dfb-example.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch

diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch b/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
new file mode 100644
index 0000000000..b2057484cd
--- /dev/null
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
@@ -0,0 +1,22 @@
+Fix dfb-example
+
+Order of inclusion gives a strange effect on the definition of
+gst_debug_log. Swapping the include statements solve it.
+
+Not upstreamed since there will be no more updates to this version
+of gst-plugins-bad.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+diff -rup gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c
+--- gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c	2011-12-11 19:49:11.000000000 +0100
++++ gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c	2013-05-13 00:32:00.507469138 +0200
+@@ -1,7 +1,7 @@
+ 
+-#include <directfb.h>
+ #include <stdio.h>
+ #include <gst/gst.h>
++#include <directfb.h>
+ 
+ static IDirectFB *dfb = NULL;
+ static IDirectFBSurface *primary = NULL;

From 065183044758455044b593104393047a002fa7ee Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 00:52:29 +0000
Subject: [PATCH 5126/6849] linknx: fix dependencies

The mysql_client is set instead of added, thus eliminating libpthsem.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linknx/linknx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
index 54e04267cd..701eabf1a1 100644
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@@ -15,7 +15,7 @@ LINKNX_DEPENDENCIES = libpthsem
 
 ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
 LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
-LINKNX_DEPENDENCIES = mysql_client
+LINKNX_DEPENDENCIES += mysql_client
 else
 LINKNX_CONF_OPT += --without-mysql
 endif

From 13d91f18a3dc1692241fa41b0bab1b6d384e1d6c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 01:01:07 +0000
Subject: [PATCH 5127/6849] quota: fix dependencies

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quota/quota.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index c89ed9b867..9afc9e3ad5 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -14,7 +14,7 @@ QUOTA_CFLAGS = $(TARGET_CFLAGS)
 QUOTA_LDFLAGS = $(TARGET_LDFLAGS)
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-QUOTA_DEPENDENCIES = gettext
+QUOTA_DEPENDENCIES += gettext
 QUOTA_LDFLAGS += -lintl
 endif
 

From b1c2bed54717606e91518bb7562a47d4b4fbe769 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 03:01:26 +0000
Subject: [PATCH 5128/6849] curlftpfs: specify curl-config path

curlftpfs may pick up the distribution curl-config rather than the one
in the staging area thus failing to build.
Fix it by hardcoding the curl-config path.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/curlftpfs/curlftpfs.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/curlftpfs/curlftpfs.mk b/package/curlftpfs/curlftpfs.mk
index c7d04aeea9..ff70f3b408 100644
--- a/package/curlftpfs/curlftpfs.mk
+++ b/package/curlftpfs/curlftpfs.mk
@@ -6,6 +6,7 @@
 
 CURLFTPFS_VERSION = 0.9.2
 CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION)
+CURLFTPFS_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
 CURLFTPFS_DEPENDENCIES = \
 	libglib2 libfuse openssl libcurl \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \

From 9947ee9fbb94af800b8b054262734e0f81f32250 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 06:22:46 +0000
Subject: [PATCH 5129/6849] sylpheed: disable gpgme support

Fixes a build failure when the build host has gpgme installed.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sylpheed/sylpheed.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 12fc18b51e..1da63de71b 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -3,6 +3,7 @@
 # sylpheed
 #
 #############################################################
+
 SYLPHEED_VERSION_MAJOR = 3.2
 SYLPHEED_VERSION_MINOR = 0
 SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
@@ -10,9 +11,7 @@ SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)
 SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
-
-SYLPHEED_CONF_OPT = --disable-gtkspell
-
+SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
 SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
 
 # Remove the -I$(includedir) from the Makefiles

From 569144696126610d83237bcf63c90dbc49aee0ec Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 May 2013 12:34:20 +0200
Subject: [PATCH 5130/6849] fan-ctrl: needs MMU support

Fixes http://autobuild.buildroot.org/results/333/333b6caa6b8a9a04495d82d02b2c0fb7755667ed/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fan-ctrl/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/fan-ctrl/Config.in b/package/fan-ctrl/Config.in
index 392904c9f9..869631683b 100644
--- a/package/fan-ctrl/Config.in
+++ b/package/fan-ctrl/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FAN_CTRL
 	bool "fan-ctrl"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Fan-ctrl is a little daemon that controls the speed of one
 	  or more system or CPU fans. It does so by monitoring

From 8d34e073c00236ff41a6df8f0fdd6b0b25dc4ad1 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 14 May 2013 00:34:32 +0000
Subject: [PATCH 5131/6849] sconeserver: fix autobuild failures

Fix sconeserver autobuild failures such as the following.

  http://autobuild.buildroot.net/results/58e/58e4886a6ff41e49ac86cbf497bb509fd37f0d68/

The sconeserver version is bumped to a recent revision in which it is
possible to pass the paths to Magick++-config, mysql_config and xml2-config to
the configure script.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/sconeserver.mk | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index ab3d1fc99c..744f389303 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -3,25 +3,23 @@
 # sconeserver
 #
 #############################################################
+
 # Release 0.6.0 doesn't build cleanly, so use a recent
 # Subversion trunk snapshot.
-SCONESERVER_VERSION = 183
-SCONESERVER_SITE = \
-	https://sconeserver.svn.sourceforge.net/svnroot/sconeserver/trunk
+SCONESERVER_VERSION = 211
+SCONESERVER_SITE = svn://svn.code.sf.net/p/sconeserver/code/trunk
 SCONESERVER_SITE_METHOD = svn
-
 SCONESERVER_LICENSE = GPLv2+
 SCONESERVER_LICENSE_FILES = COPYING
 
+SCONESERVER_AUTORECONF = YES
 SCONESERVER_DEPENDENCIES += pcre
 SCONESERVER_CONF_OPT += --with-ip --with-local
 
-SCONESERVER_CONF_OPT += CXXFLAGS="$(TARGET_CXXFLAGS) $(SCONESERVER_CXXFLAGS)"
-SCONESERVER_CONF_OPT += LDFLAGS="$(TARGET_LDFLAGS) $(SCONESERVER_LDFLAGS)"
-
 # Sconeserver configure script fails to find the libxml2 headers.
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
-	SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/libxml2
+	SCONESERVER_CONF_OPT += \
+		--with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config"
 endif
 
 ifeq ($(BR2_INET_IPV6),y)
@@ -52,16 +50,17 @@ endif
 
 ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
 	SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf
-	SCONESERVER_CONF_OPT += --with-sconesite-image
+	SCONESERVER_CONF_OPT += \
+		--with-sconesite-image \
+		--with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config"
 else
 	SCONESERVER_CONF_OPT += --without-sconesite-image
 endif
 
 ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
 	SCONESERVER_DEPENDENCIES += mysql_client
-	SCONESERVER_CONF_OPT += --with-mysql
-	SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/mysql
-	SCONESERVER_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql
+	SCONESERVER_CONF_OPT += --with-mysql \
+		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config"
 else
 	SCONESERVER_CONF_OPT += --without-mysql
 endif

From 376c3aad61dbeb8e2126e13658fd150b70746afb Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 14 May 2013 02:46:03 +0000
Subject: [PATCH 5132/6849] legal-info: fail trying to copy a non-existent
 license file

If a package's _LICENSE_FILES contains the name of a non-existent file,
the make process would continue and return true, unless the
non-existent file is the last listed.

Fix this wrong beaviour by failing with an error when any of the listed
files is missing.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index b55b5f0b48..56fca6be85 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -508,9 +508,7 @@ ifeq ($(call qstrip,$$($(2)_LICENSE_FILES)),)
 	@$(call legal-license-nofiles,$$($(2)_RAWNAME))
 	@$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined))
 else
-	@for F in $$($(2)_LICENSE_FILES); do \
-		$(call legal-license-file,$$($(2)_RAWNAME),$$$${F},$$($(2)_DIR)/$$$${F}); \
-		done
+	@$(foreach F,$($(2)_LICENSE_FILES),$(call legal-license-file,$$($(2)_RAWNAME),$(F),$$($(2)_DIR)/$(F))$$(sep))
 endif
 ifeq ($$($(2)_REDISTRIBUTE),YES)
 # Copy the source tarball (just hardlink if possible)

From f8a6a1b94a22d3ed4ce450cfec9c40cce0a447c3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 14 May 2013 17:18:18 +0200
Subject: [PATCH 5133/6849] neon: fix license files

GPL license is under test/, not src/.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/neon.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 58e01e1ff4..3bff302007 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -6,7 +6,7 @@
 NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
 NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
-NEON_LICENSE_FILES = src/COPYING.LIB src/COPYING README
+NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPT = --without-gssapi --disable-rpath
 NEON_CONFIG_SCRIPTS = neon-config

From 32a2f502c6d3601cc51c76c6f5c4526ba10ff8d0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 12:20:42 +0000
Subject: [PATCH 5134/6849] busybox 1.21.0: update mdev patch and add ntfs
 volume patch

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/1.21.0/busybox-1.21.0-mdev.patch  | 118 +++++++++++++-----
 .../busybox/1.21.0/busybox-1.21.0-ntfs.patch  |  11 ++
 2 files changed, 99 insertions(+), 30 deletions(-)
 create mode 100644 package/busybox/1.21.0/busybox-1.21.0-ntfs.patch

diff --git a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch b/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
index 8f6c8d80e2..1481cb3885 100644
--- a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
+++ b/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
@@ -68,20 +68,24 @@
  } FIX_ALIASING;
  #define G (*(struct globals*)&bb_common_bufsiz1)
  #define INIT_G() do { \
-@@ -270,13 +298,6 @@ struct globals {
- /* We use additional 64+ bytes in make_device() */
- #define SCRATCH_SIZE 80
+@@ -267,15 +295,8 @@ struct globals {
+ /* Prevent infinite loops in /sys symlinks */
+ #define MAX_SYSFS_DEPTH 3
  
+-/* We use additional 64+ bytes in make_device() */
+-#define SCRATCH_SIZE 80
+-
 -#if 0
 -# define dbg(...) bb_error_msg(__VA_ARGS__)
 -#else
 -# define dbg(...) ((void)0)
 -#endif
 -
--
++/* We use additional bytes in make_device() */
++#define SCRATCH_SIZE 128
+ 
  #if ENABLE_FEATURE_MDEV_CONF
  
- static void make_default_cur_rule(void)
 @@ -288,14 +309,65 @@ static void make_default_cur_rule(void)
  
  static void clean_up_cur_rule(void)
@@ -233,37 +237,91 @@
  #else
  
  # define next_rule() (&G.cur_rule)
-@@ -479,9 +569,6 @@ static void make_device(char *device_nam
+@@ -468,7 +558,7 @@ static char *build_alias(char *alias, co
+ 
+ /* mknod in /dev based on a path like "/sys/block/hda/hda1"
+  * NB1: path parameter needs to have SCRATCH_SIZE scratch bytes
+- * after NUL, but we promise to not mangle (IOW: to restore if needed)
++ * after NUL, but we promise to not mangle (IOW: to restore NUL if needed)
+  * path string.
+  * NB2: "mdev -s" may call us many times, do not leak memory/fds!
+  *
+@@ -478,9 +568,7 @@ static char *build_alias(char *alias, co
+ static void make_device(char *device_name, char *path, int operation)
  {
  	int major, minor, type, len;
- 
+-
 -	if (G.verbose)
 -		bb_error_msg("device: %s, %s", device_name, path);
--
++	char *path_end = path + strlen(path);
+ 
  	/* Try to read major/minor string.  Note that the kernel puts \n after
  	 * the data, so we don't need to worry about null terminating the string
- 	 * because sscanf() will stop at the first nondigit, which \n is.
-@@ -500,8 +587,7 @@ static void make_device(char *device_nam
+@@ -489,29 +577,51 @@ static void make_device(char *device_nam
+ 	 */
+ 	major = -1;
+ 	if (operation == OP_add) {
+-		char *dev_maj_min = path + strlen(path);
+-
+-		strcpy(dev_maj_min, "/dev");
+-		len = open_read_close(path, dev_maj_min + 1, 64);
+-		*dev_maj_min = '\0';
++		strcpy(path_end, "/dev");
++		len = open_read_close(path, path_end + 1, SCRATCH_SIZE - 1);
++		*path_end = '\0';
+ 		if (len < 1) {
+ 			if (!ENABLE_FEATURE_MDEV_EXEC)
+ 				return;
  			/* no "dev" file, but we can still run scripts
  			 * based on device name */
- 		} else if (sscanf(++dev_maj_min, "%u:%u", &major, &minor) == 2) {
+-		} else if (sscanf(++dev_maj_min, "%u:%u", &major, &minor) == 2) {
 -			if (G.verbose)
 -				bb_error_msg("maj,min: %u,%u", major, minor);
++		} else if (sscanf(path_end + 1, "%u:%u", &major, &minor) == 2) {
 +			dbg1("dev %u,%u", major, minor);
  		} else {
  			major = -1;
  		}
-@@ -511,7 +597,8 @@ static void make_device(char *device_nam
- 	/* Determine device name, type, major and minor */
- 	if (!device_name)
- 		device_name = (char*) bb_basename(path);
+ 	}
+ 	/* else: for delete, -1 still deletes the node, but < -1 suppresses that */
+ 
+-	/* Determine device name, type, major and minor */
+-	if (!device_name)
+-		device_name = (char*) bb_basename(path);
 -	/* http://kernel.org/doc/pending/hotplug.txt says that only
++	/* Determine device name */
++	if (!device_name) {
++		/*
++		 * There was no $DEVNAME envvar (for example, mdev -s never has).
++		 * But it is very useful: it contains the *path*, not only basename,
++		 * Thankfully, uevent file has it.
++		 * Example of .../sound/card0/controlC0/uevent file on Linux-3.7.7:
++		 * MAJOR=116
++		 * MINOR=7
++		 * DEVNAME=snd/controlC0
++		 */
++		strcpy(path_end, "/uevent");
++		len = open_read_close(path, path_end + 1, SCRATCH_SIZE - 1);
++		if (len < 0)
++			len = 0;
++		*path_end = '\0';
++		path_end[1 + len] = '\0';
++		device_name = strstr(path_end + 1, "\nDEVNAME=");
++		if (device_name) {
++			device_name += sizeof("\nDEVNAME=")-1;
++			strchrnul(device_name, '\n')[0] = '\0';
++		} else {
++			/* Fall back to just basename */
++			device_name = (char*) bb_basename(path);
++		}
++	}
++	/* Determine device type */
 +	/*
 +	 * http://kernel.org/doc/pending/hotplug.txt says that only
  	 * "/sys/block/..." is for block devices. "/sys/bus" etc is not.
  	 * But since 2.6.25 block devices are also in /sys/class/block.
  	 * We use strstr("/block/") to forestall future surprises.
-@@ -537,6 +624,8 @@ static void make_device(char *device_nam
+@@ -537,6 +647,8 @@ static void make_device(char *device_nam
  		rule = next_rule();
  
  #if ENABLE_FEATURE_MDEV_CONF
@@ -272,7 +330,7 @@
  		if (rule->maj >= 0) {  /* @maj,min rule */
  			if (major != rule->maj)
  				continue;
-@@ -547,7 +636,7 @@ static void make_device(char *device_nam
+@@ -547,7 +659,7 @@ static void make_device(char *device_nam
  		}
  		if (rule->envvar) { /* $envvar=regex rule */
  			str_to_match = getenv(rule->envvar);
@@ -281,7 +339,7 @@
  			if (!str_to_match)
  				continue;
  		}
-@@ -555,7 +644,7 @@ static void make_device(char *device_nam
+@@ -555,7 +667,7 @@ static void make_device(char *device_nam
  
  		if (rule->regex_compiled) {
  			int regex_match = regexec(&rule->match, str_to_match, ARRAY_SIZE(off), off, 0);
@@ -290,7 +348,7 @@
  			//bb_error_msg("matches:");
  			//for (int i = 0; i < ARRAY_SIZE(off); i++) {
  			//	if (off[i].rm_so < 0) continue;
-@@ -574,9 +663,8 @@ static void make_device(char *device_nam
+@@ -574,9 +686,8 @@ static void make_device(char *device_nam
  		}
  		/* else: it's final implicit "match-all" rule */
   rule_matches:
@@ -301,7 +359,7 @@
  		/* Build alias name */
  		alias = NULL;
  		if (ENABLE_FEATURE_MDEV_RENAME && rule->ren_mov) {
-@@ -619,34 +707,30 @@ static void make_device(char *device_nam
+@@ -619,34 +730,30 @@ static void make_device(char *device_nam
  				}
  			}
  		}
@@ -344,7 +402,7 @@
  		}
  
  		if (operation == OP_add && major >= 0) {
-@@ -656,8 +740,17 @@ static void make_device(char *device_nam
+@@ -656,8 +763,17 @@ static void make_device(char *device_nam
  				mkdir_recursive(node_name);
  				*slash = '/';
  			}
@@ -364,7 +422,7 @@
  			if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
  				bb_perror_msg("can't create '%s'", node_name);
  			if (ENABLE_FEATURE_MDEV_CONF) {
-@@ -671,8 +764,7 @@ static void make_device(char *device_nam
+@@ -671,8 +787,7 @@ static void make_device(char *device_nam
  //TODO: on devtmpfs, device_name already exists and symlink() fails.
  //End result is that instead of symlink, we have two nodes.
  //What should be done?
@@ -374,7 +432,7 @@
  					symlink(node_name, device_name);
  				}
  			}
-@@ -681,27 +773,21 @@ static void make_device(char *device_nam
+@@ -681,27 +796,21 @@ static void make_device(char *device_nam
  		if (ENABLE_FEATURE_MDEV_EXEC && command) {
  			/* setenv will leak memory, use putenv/unsetenv/free */
  			char *s = xasprintf("%s=%s", "MDEV", node_name);
@@ -405,7 +463,7 @@
  			unlink(node_name);
  		}
  
-@@ -746,9 +832,16 @@ static int FAST_FUNC dirAction(const cha
+@@ -746,9 +855,16 @@ static int FAST_FUNC dirAction(const cha
  	 * under /sys/class/ */
  	if (1 == depth) {
  		free(G.subsystem);
@@ -423,7 +481,7 @@
  	}
  
  	return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
-@@ -813,12 +906,107 @@ static void load_firmware(const char *fi
+@@ -813,12 +929,107 @@ static void load_firmware(const char *fi
  		full_write(loading_fd, "-1", 2);
  
   out:
@@ -531,7 +589,7 @@
  int mdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int mdev_main(int argc UNUSED_PARAM, char **argv)
  {
-@@ -840,8 +1028,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
+@@ -840,8 +1051,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
  	xchdir("/dev");
  
  	if (argv[1] && strcmp(argv[1], "-s") == 0) {
@@ -542,7 +600,7 @@
  		 */
  		struct stat st;
  
-@@ -853,6 +1041,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
+@@ -853,6 +1064,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
  		G.root_major = major(st.st_dev);
  		G.root_minor = minor(st.st_dev);
  
@@ -551,7 +609,7 @@
  		/* ACTION_FOLLOWLINKS is needed since in newer kernels
  		 * /sys/block/loop* (for example) are symlinks to dirs,
  		 * not real directories.
-@@ -878,11 +1068,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
+@@ -878,11 +1091,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
  		char *action;
  		char *env_devname;
  		char *env_devpath;
@@ -566,7 +624,7 @@
  		 * DEVPATH is like "/block/sda" or "/class/input/mice"
  		 */
  		action = getenv("ACTION");
-@@ -893,39 +1085,20 @@ int mdev_main(int argc UNUSED_PARAM, cha
+@@ -893,39 +1108,20 @@ int mdev_main(int argc UNUSED_PARAM, cha
  		if (!action || !env_devpath /*|| !G.subsystem*/)
  			bb_show_usage();
  		fw = getenv("FIRMWARE");
@@ -618,7 +676,7 @@
  
  		snprintf(temp, PATH_MAX, "/sys%s", env_devpath);
  		if (op == OP_remove) {
-@@ -935,16 +1108,18 @@ int mdev_main(int argc UNUSED_PARAM, cha
+@@ -935,16 +1131,18 @@ int mdev_main(int argc UNUSED_PARAM, cha
  			if (!fw)
  				make_device(env_devname, temp, op);
  		}
diff --git a/package/busybox/1.21.0/busybox-1.21.0-ntfs.patch b/package/busybox/1.21.0/busybox-1.21.0-ntfs.patch
new file mode 100644
index 0000000000..e119280f97
--- /dev/null
+++ b/package/busybox/1.21.0/busybox-1.21.0-ntfs.patch
@@ -0,0 +1,11 @@
+--- busybox-1.21.0/util-linux/volume_id/ntfs.c
++++ busybox-1.21.0-ntfs/util-linux/volume_id/ntfs.c
+@@ -150,7 +150,7 @@ int FAST_FUNC volume_id_probe_ntfs(struc
+ 
+ 		attr = (struct file_attribute*) &buf[attr_off];
+ 		attr_type = le32_to_cpu(attr->type);
+-		attr_len = le16_to_cpu(attr->len);
++		attr_len = le32_to_cpu(attr->len);
+ 		val_off = le16_to_cpu(attr->value_offset);
+ 		val_len = le32_to_cpu(attr->value_len);
+ 		attr_off += attr_len;

From 9b273ea860504666cf204eb475421e21cbcac639 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Sun, 12 May 2013 21:58:40 +0000
Subject: [PATCH 5135/6849] linux: CONFIG_KERNEL_LZO option requires host-lzop

When the LZO compression mode is chosen the linux kernel requires
lzop host utility at build time.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index d375cf0328..3877c35d28 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -34,7 +34,7 @@ endif
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 
 LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES  += host-module-init-tools
+LINUX_DEPENDENCIES  += host-module-init-tools host-lzop
 
 ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
 	LINUX_DEPENDENCIES += host-uboot-tools

From 5fa49a6c0f916d0b98cfdc8c09db25982f34f373 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Tue, 14 May 2013 01:57:11 +0000
Subject: [PATCH 5136/6849] cairo: fix build when toolchain has no thread
 support

Fixes the build failure visible at
http://autobuild.buildroot.net/results/d49/d491de5a774592929a59f3bfd0b1fd8cbc089ac0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cairo/cairo.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 83c82c03c8..203dbbe805 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -36,6 +36,10 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no
 
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+	CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"
+endif
+
 CAIRO_CONF_OPT = \
 	--enable-trace=no \
 	--enable-interpreter=no

From 0012b7dcdb7f5cb5e6f22f08fcc6124979c1c9ea Mon Sep 17 00:00:00 2001
From: Anders Darander <anders@chargestorm.se>
Date: Tue, 14 May 2013 10:09:50 +0000
Subject: [PATCH 5137/6849] beaglebone: update to linux 3.8

As the beaglebone support is mainlined, there's no support for the old
board setup files, and the only supported run-time configuration is through
the device tree.

We're also setting the kernel headers to follow the 3.8 series.

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/beaglebone/linux-3.2.9.config | 252 ----------------------------
 board/beaglebone/linux-3.8.config   | 201 ++++++++++++++++++++++
 configs/beaglebone_defconfig        |  10 +-
 3 files changed, 207 insertions(+), 256 deletions(-)
 delete mode 100644 board/beaglebone/linux-3.2.9.config
 create mode 100644 board/beaglebone/linux-3.8.config

diff --git a/board/beaglebone/linux-3.2.9.config b/board/beaglebone/linux-3.2.9.config
deleted file mode 100644
index 4052f6e3a9..0000000000
--- a/board/beaglebone/linux-3.2.9.config
+++ /dev/null
@@ -1,252 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_DEFAULT_HOSTNAME="beaglebone"
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_FHANDLE=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_NAMESPACES=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_ARCH_OMAP=y
-CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_OMAP_MBOX_FWK=y
-# CONFIG_OMAP_32K_TIMER is not set
-# CONFIG_MACH_OMAP_GENERIC is not set
-# CONFIG_ARCH_OMAP2 is not set
-# CONFIG_ARCH_OMAP4 is not set
-# CONFIG_SOC_OMAP3430 is not set
-# CONFIG_MACH_OMAP3_BEAGLE is not set
-# CONFIG_MACH_DEVKIT8000 is not set
-# CONFIG_MACH_OMAP_LDP is not set
-# CONFIG_MACH_OMAP3530_LV_SOM is not set
-# CONFIG_MACH_OMAP3_TORPEDO is not set
-# CONFIG_MACH_ENCORE is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MACH_OMAP3EVM is not set
-# CONFIG_MACH_OMAP3517EVM is not set
-# CONFIG_MACH_OMAP3_PANDORA is not set
-# CONFIG_MACH_OMAP3_TOUCHBOOK is not set
-# CONFIG_MACH_OMAP_3430SDP is not set
-# CONFIG_MACH_NOKIA_RM680 is not set
-# CONFIG_MACH_NOKIA_RX51 is not set
-# CONFIG_MACH_OMAP_ZOOM2 is not set
-# CONFIG_MACH_OMAP_ZOOM3 is not set
-# CONFIG_MACH_CM_T35 is not set
-# CONFIG_MACH_CM_T3517 is not set
-# CONFIG_MACH_IGEP0020 is not set
-# CONFIG_MACH_IGEP0030 is not set
-# CONFIG_MACH_SBC3530 is not set
-# CONFIG_MACH_OMAP_3630SDP is not set
-# CONFIG_MACH_TI8168EVM is not set
-# CONFIG_MACH_TI8148EVM is not set
-# CONFIG_MACH_AM335XIAEVM is not set
-CONFIG_OMAP3_EDMA=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_THUMB2_KERNEL=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=" debug "
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_BINFMT_MISC=y
-# CONFIG_SUSPEND is not set
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_CONNECTOR=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=2
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_MISC_DEVICES=y
-CONFIG_BMP085=m
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_93CX6=m
-CONFIG_SENSORS_LIS3_I2C=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_TI_CPSW=y
-CONFIG_SMSC_PHY=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_TWL4030_PWRBUTTON=y
-CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_TWL6040_VIBRA=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_HW_RANDOM=y
-CONFIG_RAW_DRIVER=m
-CONFIG_I2C_CHARDEV=y
-CONFIG_SPI=y
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_OMAP24XX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_DEBUG_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_TWL4030=y
-CONFIG_GENERIC_PWM=y
-CONFIG_DAVINCI_EHRPWM=y
-CONFIG_ECAP_PWM=y
-CONFIG_POWER_SUPPLY=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_OMAP_WATCHDOG=y
-CONFIG_TWL4030_WATCHDOG=y
-CONFIG_MFD_TPS65217=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_REGULATOR_USERSPACE_CONSUMER=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_TWL4030=y
-CONFIG_REGULATOR_TPS65023=y
-CONFIG_REGULATOR_TPS6507X=y
-CONFIG_REGULATOR_TPS65217=y
-CONFIG_DISPLAY_SUPPORT=y
-CONFIG_HIDRAW=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_MUSB_TI81XX_GLUE=y
-CONFIG_USB_TI_CPPI41_DMA_HW=y
-CONFIG_USB_ACM=y
-CONFIG_USB_LIBUSUAL=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_HID=m
-CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_UIO=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_PRUSS=m
-CONFIG_STAGING=y
-CONFIG_IIO=y
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_SW_RING=y
-CONFIG_IIO_KFIFO_BUF=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_PM_DEVFREQ=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_FANOTIFY=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_JTAG_ENABLE=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/board/beaglebone/linux-3.8.config b/board/beaglebone/linux-3.8.config
new file mode 100644
index 0000000000..c083c7091b
--- /dev/null
+++ b/board/beaglebone/linux-3.8.config
@@ -0,0 +1,201 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_DEFAULT_HOSTNAME="beaglebone"
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_KPROBES=y
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_ARCH_OMAP=y
+CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_MUX_DEBUG=y
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
+CONFIG_KEXEC=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_NEON=y
+CONFIG_BINFMT_MISC=y
+CONFIG_PM_DEBUG=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_OMAP_OCP2SCP=y
+CONFIG_OMAP_INTERCONNECT=y
+CONFIG_CONNECTOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_EEPROM_93CX6=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_ATA=y
+# CONFIG_SATA_PMP is not set
+CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_ATA_SFF is not set
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_TI_CPSW=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_WLAN is not set
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI=y
+CONFIG_SPI_OMAP24XX=y
+CONFIG_DEBUG_PINCTRL=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_DEBUG_GPIO=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_W1=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_CPU_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_OMAP_WATCHDOG=y
+CONFIG_MFD_TPS65217=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_TPS65023=y
+CONFIG_REGULATOR_TPS6507X=y
+CONFIG_REGULATOR_TPS65217=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_SUSPEND=y
+CONFIG_USB_MON=y
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_AM35X=m
+CONFIG_USB_STORAGE=y
+CONFIG_USB_TEST=y
+CONFIG_OMAP_USB2=m
+CONFIG_OMAP_USB3=m
+CONFIG_OMAP_CONTROL_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DEBUG=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_DEBUG_FS=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_SDIO_UART=y
+CONFIG_MMC_OMAP=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_OMAP=y
+CONFIG_DMADEVICES=y
+CONFIG_TI_EDMA=y
+CONFIG_DMA_OMAP=y
+CONFIG_STAGING=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_EXT4_FS=y
+CONFIG_QUOTA=y
+CONFIG_QFMT_V2=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_PROVE_LOCKING=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC7=y
+CONFIG_LIBCRC32C=y
+CONFIG_AVERAGE=y
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index 21770685e8..38a63a17cc 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.2.9"
+BR2_DEFAULT_KERNEL_VERSION="3.8.12"
 
 # bootloader
 BR2_TARGET_UBOOT=y
@@ -30,7 +30,9 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/koenkooi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="linux-ti33x-psp-3.2-r5a+gitr09e9651bcf2ee8d86685f2a8075bc6557b1d3b91"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="935f6c2f82056d538b528272e2bdbb5c08d69a58"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.2.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.8.config"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone"

From 97fbd80efe6dd29b5d8d5393ea0a4cbc314dcfc6 Mon Sep 17 00:00:00 2001
From: Anders Darander <anders@chargestorm.se>
Date: Tue, 14 May 2013 10:09:51 +0000
Subject: [PATCH 5138/6849] am33x-cm3: add FW for suspend/resume

Without this firmware, the beaglebone won't be able to suspend/resume
correctly.

[Peter: tweak Config.in, rename init script, wrap long lines]
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/am33x-cm3/Config.in                   |  7 +++++
 package/am33x-cm3/S93-am335x-pm-firmware-load |  6 ++++
 package/am33x-cm3/am33x-cm3.mk                | 30 +++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 package/am33x-cm3/Config.in
 create mode 100755 package/am33x-cm3/S93-am335x-pm-firmware-load
 create mode 100644 package/am33x-cm3/am33x-cm3.mk

diff --git a/package/Config.in b/package/Config.in
index 1dee2ab2ea..6b6ce9d108 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -213,6 +213,7 @@ endmenu
 
 menu "Hardware handling"
 menu "Misc devices firmwares"
+source "package/am33x-cm3/Config.in"
 source "package/b43-firmware/Config.in"
 source "package/firmware-imx/Config.in"
 source "package/linux-firmware/Config.in"
diff --git a/package/am33x-cm3/Config.in b/package/am33x-cm3/Config.in
new file mode 100644
index 0000000000..060d0efc8d
--- /dev/null
+++ b/package/am33x-cm3/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_AM33X_CM3
+	bool "am33x-cm3"
+	depends on BR2_arm # only relevant for TI am335x
+	help
+	  Cortex-M3 binary blob for suspend-resume on am335x
+
+	  http://arago-project.org/git/projects/am33x-cm3.git
diff --git a/package/am33x-cm3/S93-am335x-pm-firmware-load b/package/am33x-cm3/S93-am335x-pm-firmware-load
new file mode 100755
index 0000000000..56c17b334d
--- /dev/null
+++ b/package/am33x-cm3/S93-am335x-pm-firmware-load
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Load the PM CM3 firmware
+echo 1 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
+cat /lib/firmware/am335x-pm-firmware.bin > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/data
+echo 0 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading
diff --git a/package/am33x-cm3/am33x-cm3.mk b/package/am33x-cm3/am33x-cm3.mk
new file mode 100644
index 0000000000..3805c80228
--- /dev/null
+++ b/package/am33x-cm3/am33x-cm3.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# am33x-cm3
+#
+#############################################################
+
+AM33X_CM3_VERSION = AM335xPSP_04.06.00.10-rc1
+AM33X_CM3_SITE = http://arago-project.org/git/projects/am33x-cm3.git
+AM33X_CM3_SITE_METHOD = git
+AM33X_CM3_LICENSE = TI Publicly Available Software License
+AM33X_CM3_LICENSE_FILES = License.txt
+
+# The build command below will use the standard cross-compiler (normally
+# build for Cortex-A8, to build the FW for the Cortex-M3.
+define AM33X_CM3_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
+endef
+
+# Not all of the firmware files are used
+define AM33X_CM3_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/bin/am335x-pm-firmware.bin \
+		$(TARGET_DIR)/lib/firmware/am335x-pm-firmware.bin
+endef
+
+define AM33X_CM3_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/am33x-cm3/S93-am335x-pm-firmware-load \
+		$(TARGET_DIR)/etc/init.d/S93-am335x-pm-firmware-load
+endef
+
+$(eval $(generic-package))

From 0399249b76bc02e4cb1cad2edc3812f4f992ce7a Mon Sep 17 00:00:00 2001
From: Anders Darander <anders@chargestorm.se>
Date: Tue, 14 May 2013 10:09:52 +0000
Subject: [PATCH 5139/6849] beaglebone: add am33x-cm3 to the build

Add the FW needed for the Cortex M3 on the beaglebone. This is required
for working power management.

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/beaglebone_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index 38a63a17cc..a141320254 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -11,6 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 
 # filesystem
+BR2_PACKAGE_AM33X_CM3=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 

From 594f07e85221fcf7bf7228804e9c7499a69fd5f0 Mon Sep 17 00:00:00 2001
From: Anders Darander <anders@chargestorm.se>
Date: Tue, 14 May 2013 10:09:53 +0000
Subject: [PATCH 5140/6849] beaglebone: enable NFS root support

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/beaglebone/linux-3.8.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/board/beaglebone/linux-3.8.config b/board/beaglebone/linux-3.8.config
index c083c7091b..42427716aa 100644
--- a/board/beaglebone/linux-3.8.config
+++ b/board/beaglebone/linux-3.8.config
@@ -179,6 +179,8 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y

From 90e7cdd28c82212a884902d46f13634f5509b3d3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 15 May 2013 14:54:27 +0200
Subject: [PATCH 5141/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 04c1eeddd1..3009071dcb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,54 @@
 
 	Fixes all over the tree.
 
-	Updated/fixed packages: dbus, gutenprint, hplip, json-c,
-	libcurl, pulseaudio, python-nfc, qt5imageformats, strace,
-	wvstreams
+	Default number of parallel jobs is now number of CPUs + 1.
+
+	Defconfigs: Add Telit EVK-PRO3, AT91SAM9260-EK Nand flash.
+
+	Updated/fixed packages: busybox, cairo, classpath, curlftpfs,
+	czmq, dbus, f2fs-tools, fan-ctrl, filemq, gst-plugin-bad,
+	gutenprint, hplip, json-c, libatomic_ops, libcurl, libdrm,
+	libnspr, libnss, libsha1, libsigsegv, libxcb, linknx,
+	linux-pam, lttng-modules, lttng-tools, matchbox-lib, mcookie,
+	mesa3d, neon, pixman, pulseaudio, python-nfc, qt5imageformats,
+	quota, openssl, sconeserver, strace, sylpheed, wvstreams,
+	xapp_{appres,bdftopcf,beforelight,bitmap,edires,fonttosfnt},
+	xapp_{fslsfonts,fstobdf,iceauth,ico,listres,luit,mkfontdir},
+	xapp_{mkfontscale,oclock,rgb,rstart,scripts,sessreg,setxkbmap},
+	xapp_{showfont,smproxy,twm,viewres,x11perf,xauth,xbacklight},
+	xapp_x{biff,calc,clipboard,clock,cmsdb,cursorgen,dbedizzy,ditview},
+	xapp_x{dm,dpyinfo,driinfo,edit,ev,eyes,f86dga,fd,fontsel,fs,fsinfo},
+	xapp_x{gamma,gc,host,input-calibrator,input,kbcomp,kbevd,kbprint},
+	xapp_x{kbutils,kill,load,logo,lsatoms,lsclients,lsfonts,mag,man},
+	xapp_x{message,mh,modmap,more,pr,prop,randr,rdb,refresh,set,setmode},
+	xapp_x{setpointer,setroot,sm,stdcmap,vidtune,vinfo,wd,wininfo,wud},
+	xcb-util, xcursor-transparent-theme, xdata_xbitmaps,
+	xdata_xcursor-themes,
+	xdriver_xf86-input-{evdev,joystick,keyboard,mouse,synaptics},
+	xdriver_xf86-input-{tslib,vmmouse,void},
+	xdriver_xf86-video-{ark,ast,ati,cirrus,dummy,fbdev,geode,glide},
+	xdriver_xf86-video-{glint,i128,intel,mach64,mga,neomagic,newport},
+	xdriver_xf86-video-{nv,openchrome,r128,savage,siliconmotion,sis},
+	xdriver_xf86-video-{tdfx,tga,trident,v4l,vesa,vmware,voodoo,wsfb},
+	xfont_encodings, xfont_font-adobe-{100,75}dpi,
+	xfont_font-utopia-{100dpi,75dpi,type1},
+	xfont_font-{alias,arabic-misc,bh-100dpi,bh-75dpi},
+	xfont_font-bh-lucidatypewriter-{100,75}dpi, xfont_font-bh-{ttf,type1},
+	xfont_font-bitstream-{100dpi,75dpi,type1}, xfont_font-cronyx-cyrillic,
+	xfont_font-{cursor,daewoo,dec,isas,jis,micro}-misc,
+	xfont_font-ibm-type1, xfont_font-misc-{cyrillic,ethiopic,meltho,misc},
+	xfont_font-{mutt,schumacher}-misc,
+	xfont_font-{screen-cyrillic,sony-misc,sun-misc,util},
+	xfont_font-winitzki-cyrillic, xfont_font-xfree86-type1,
+	xlib_lib{FS,ICE,SM,X11,XScrnSaver,Xau,Xaw,Xcomposite,Xcursor},
+	xlib_libX{damage,dmcp,ext,fixes,font,ft,i,inerama,mu,pm,randr},
+	xlib_libX{render,res,t,tst,v,vMC,xf86dga,xf86vm},
+	xlib_lib{dmx,fontenc,pciaccess,pthread-stubs,xkbfile}, xlib_xtrans,
+	xproto_{applewm,bigreqs,composite,damage,dmx,dri2,fixes}proto,
+	xproto_{fontcache,font,gl,input,kb,randr,record,render}proto,
+	xproto_{resource,scrnsaver,video,windowswm,xcmisc,xext}proto,
+	xproto_{xf86bigfont,xf86dga,xf86dri,xf86vidmode,xinerama,x}proto,
+	xserver_xorg-server, xutil_{makedepend,util-macros}
 
 	Issues resolved (http://bugs.uclibc.org):
 

From bed1490d0f58dc963d2144f2fe6b705f9f36d848 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Tue, 14 May 2013 22:26:50 +0000
Subject: [PATCH 5142/6849] aircrack-ng: fix statically linked build

Fixe the build failure visible at
http://autobuild.buildroot.net/results/2441d8b62323a00f32f2edb7cb781dda71ff7f68

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aircrack-ng/aircrack-ng.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index c6574f1a55..a36cf3444e 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -20,9 +20,12 @@ else
 	AIRCRACK_NG_MAKE_OPTS = sqlite=false
 endif
 
+AIRCRACK_NG_LDFLAGS = -lz \
+	$(if $(BR2_PREFER_STATIC_LIB),-ldl -lpthread)
+
 define AIRCRACK_NG_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -lz" \
+		LDFLAGS="$(AIRCRACK_NG_LDFLAGS)" \
 		-C $(@D) $(AIRCRACK_NG_MAKE_OPTS) all
 endef
 

From cf81029c01650bc00b713e06dc7581f3f43767a0 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Tue, 14 May 2013 22:26:49 +0000
Subject: [PATCH 5143/6849] libglib2: fix build when toolchain has no thread
 support

Fixes the build failure visible at
http://autobuild.buildroot.net/results/3d3/3d3f4f0044a4b58ce3d0a3449a5f012d953d59bb

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...004-fix-build-when-no-thread-support.patch | 28 +++++++++++++++++++
 package/libglib2/libglib2.mk                  |  3 ++
 2 files changed, 31 insertions(+)
 create mode 100644 package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch

diff --git a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
new file mode 100644
index 0000000000..55635446aa
--- /dev/null
+++ b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
@@ -0,0 +1,28 @@
+Fix gio/gcancellable.c build when thread support is disabled
+
+Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
+---
+--- a/gio/gcancellable.c	2013-05-14 23:08:25.514461348 +0200
++++ b/gio/gcancellable.c	2013-05-14 23:10:23.347789625 +0200
+@@ -270,8 +270,10 @@ g_cancellable_reset (GCancellable *cance
+   while (priv->cancelled_running)
+     {
+       priv->cancelled_running_waiting = TRUE;
++#if defined(G_THREADS_ENABLED)
+       g_cond_wait (cancellable_cond,
+                    g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
++#endif
+     }
+ 
+   if (priv->cancelled)
+@@ -619,8 +621,10 @@ g_cancellable_disconnect (GCancellable
+   while (priv->cancelled_running)
+     {
+       priv->cancelled_running_waiting = TRUE;
++#if defined(G_THREADS_ENABLED)
+       g_cond_wait (cancellable_cond,
+                    g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
++#endif
+     }
+ 
+   g_signal_handler_disconnect (cancellable, handler_id);
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index d78e8ec0fa..3ac78ba8f6 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -67,6 +67,9 @@ HOST_LIBGLIB2_CONF_OPT = \
 		--disable-tests
 
 LIBGLIB2_CONF_OPT += --disable-tests
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+	LIBGLIB2_CONF_OPT += --with-threads=none --disable-threads
+endif
 
 LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext
 

From b193c1264a27f67dffb2a16cef637777cfa1996e Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 14 May 2013 22:11:02 +0000
Subject: [PATCH 5144/6849] graph-depends: ignore the
 'target-generic-dont-remount-rw' target

The graph-depends script tries to call 'make target-generic-dont-remount-rw',
which doesn't exist since 'target-generic-dont-remount-rw' is not a package.

See also the comments for commit 72bd61e5b8c2094378.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 180c81d94c..8d81969dda 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -164,6 +164,7 @@ TARGET_EXCEPTIONS = [
     "target-generic-issue",
     "target-generic-getty-busybox",
     "target-generic-do-remount-rw",
+    "target-generic-dont-remount-rw",
     "target-finalize",
     "erase-fakeroots",
     "target-generic-hostname",

From 13c367f827566c91e4a85fb5d050424904f404ed Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Tue, 14 May 2013 22:11:03 +0000
Subject: [PATCH 5145/6849] graph-depends: fix program path in comment

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 8d81969dda..790e24e304 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Usage (the graphviz package must be installed in your distribution)
-#  ./scripts/graph-depends [package-name] > test.dot
+#  ./support/scripts/graph-depends [package-name] > test.dot
 #  dot -Tpdf test.dot -o test.pdf
 #
 # With no arguments, graph-depends will draw a complete graph of

From dc8b8c868aea425b431fa0de200c4b33d306e7e2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 09:07:19 +0000
Subject: [PATCH 5146/6849] xapp_xinit: revert removal

Even though xinit isn't included in the X11R7.7 release it is very
useful for debugging and quick tests.
Reinstante it without xdm requiring it though.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/Config.in                |  1 +
 package/x11r7/xapp_xinit/Config.in     | 10 ++++++++++
 package/x11r7/xapp_xinit/xapp_xinit.mk | 12 ++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/x11r7/xapp_xinit/Config.in
 create mode 100644 package/x11r7/xapp_xinit/xapp_xinit.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index f7487daab8..205079c856 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -103,6 +103,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xgamma/Config.in
 		source package/x11r7/xapp_xgc/Config.in
 		source package/x11r7/xapp_xhost/Config.in
+		source package/x11r7/xapp_xinit/Config.in
 		source package/x11r7/xapp_xinput/Config.in
 		source package/x11r7/xapp_xinput-calibrator/Config.in
 		source package/x11r7/xapp_xkbcomp/Config.in
diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in
new file mode 100644
index 0000000000..aede5d9691
--- /dev/null
+++ b/package/x11r7/xapp_xinit/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_XINIT
+	bool "xinit"
+	# Runtime dependency: can't start an X server unless there is one
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
+	# Runtime dependency; mcookie is also in util-linux
+	select BR2_PACKAGE_MCOOKIE if !BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_XAPP_XAUTH
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  X Window System initializer
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
new file mode 100644
index 0000000000..fc9218d0c3
--- /dev/null
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# xapp_xinit -- X Window System initializer
+#
+################################################################################
+
+XAPP_XINIT_VERSION = 1.3.2
+XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
+XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
+
+$(eval $(autotools-package))

From 867aa7f987c6f32d4b191bdeb73c44c693992acb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 15 May 2013 20:45:05 +0200
Subject: [PATCH 5147/6849] news.html: add 2013.05-rc1 annoucement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 665b3bfe26..c66757c3ac 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.05_rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-May/071737.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2013.05-rc1.tar.bz2">2013.05-rc1

From a517092fa3205af65935bb1c7b395b54778ee68f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 15 May 2013 20:48:41 +0200
Subject: [PATCH 5148/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3009071dcb..e2f3f3bf80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,13 +6,14 @@
 
 	Defconfigs: Add Telit EVK-PRO3, AT91SAM9260-EK Nand flash.
 
-	Updated/fixed packages: busybox, cairo, classpath, curlftpfs,
-	czmq, dbus, f2fs-tools, fan-ctrl, filemq, gst-plugin-bad,
-	gutenprint, hplip, json-c, libatomic_ops, libcurl, libdrm,
-	libnspr, libnss, libsha1, libsigsegv, libxcb, linknx,
-	linux-pam, lttng-modules, lttng-tools, matchbox-lib, mcookie,
-	mesa3d, neon, pixman, pulseaudio, python-nfc, qt5imageformats,
-	quota, openssl, sconeserver, strace, sylpheed, wvstreams,
+	Updated/fixed packages: aircrack-ng, busybox, cairo,
+	classpath, curlftpfs, czmq, dbus, f2fs-tools, fan-ctrl,
+	filemq, gst-plugin-bad, gutenprint, hplip, json-c,
+	libatomic_ops, libcurl, libdrm, libglib2, libnspr, libnss,
+	libsha1, libsigsegv, libxcb, linknx, linux-pam, lttng-modules,
+	lttng-tools, matchbox-lib, mcookie, mesa3d, neon, pixman,
+	pulseaudio, python-nfc, qt5imageformats, quota, openssl,
+	sconeserver, strace, sylpheed, wvstreams,
 	xapp_{appres,bdftopcf,beforelight,bitmap,edires,fonttosfnt},
 	xapp_{fslsfonts,fstobdf,iceauth,ico,listres,luit,mkfontdir},
 	xapp_{mkfontscale,oclock,rgb,rstart,scripts,sessreg,setxkbmap},
@@ -51,6 +52,8 @@
 	xproto_{xf86bigfont,xf86dga,xf86dri,xf86vidmode,xinerama,x}proto,
 	xserver_xorg-server, xutil_{makedepend,util-macros}
 
+	Readded Packages: xapp_xinit
+
 	Issues resolved (http://bugs.uclibc.org):
 
 	#5054: amd64: cannot find init - due to missing /lib64 folder

From cfcbfa2c60b7c7a0976632d3e6b8f54d61ba18f9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 15 May 2013 21:05:00 +0200
Subject: [PATCH 5149/6849] Update for 2013.05-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index e2f3f3bf80..fd2764ae1b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.05, Not released yet:
+2013.05-rc2, Released May 15th, 2013:
 
 	Fixes all over the tree.
 
diff --git a/Makefile b/Makefile
index a57975e427..5d2a7aed44 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.05-rc1
+export BR2_VERSION:=2013.05-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index d199fdfec7..9817dea057 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>.
 
 <p>
-The latest release candidate is <b>2013.05-rc1</b>, which can be
+The latest release candidate is <b>2013.05-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.05-rc1.tar.gz">buildroot-2013.05-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2013.05-rc2.tar.gz">buildroot-2013.05-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.05-rc1.tar.bz2">buildroot-2013.05-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.05-rc2.tar.bz2">buildroot-2013.05-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index c66757c3ac..848c409abc 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>15 May 2013 -- 2013.05-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.05_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.05-rc2.tar.bz2">2013.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>8 May 2013 -- 2013.05-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 6cdb6cc97637d2399d258f42b9f055f5674f2807 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 16 May 2013 09:21:08 +0200
Subject: [PATCH 5150/6849] aircrack-ng: don't drop TARGET_LDFLAGS

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aircrack-ng/aircrack-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index a36cf3444e..bac45d1b2f 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -20,7 +20,7 @@ else
 	AIRCRACK_NG_MAKE_OPTS = sqlite=false
 endif
 
-AIRCRACK_NG_LDFLAGS = -lz \
+AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) -lz \
 	$(if $(BR2_PREFER_STATIC_LIB),-ldl -lpthread)
 
 define AIRCRACK_NG_BUILD_CMDS

From f96a135667a65dea094fb9b4a8849892d4be9d4d Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 15 May 2013 11:47:31 +0000
Subject: [PATCH 5151/6849] libosip2: disable multi-thread support for
 toolchains without threads

Also added license information

Fixes:
http://autobuild.buildroot.org/results/dcf/dcfbdc1a1ee032881ad5e2f7ca6622d90fc7cb19

[Peter: License is LGPLv2.1+
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libosip2/libosip2.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 713851b8e1..182fa1812e 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -7,5 +7,10 @@
 LIBOSIP2_VERSION = 3.6.0
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
 LIBOSIP2_INSTALL_STAGING = YES
+LIBOSIP2_LICENSE = LGPLv2.1+
+LIBOSIP2_LICENSE_FILES = COPYING
+
+LIBOSIP2_CONF_OPT = \
+	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
 
 $(eval $(autotools-package))

From fb1ba5dff1748226c13cb92320f5171c026a47ca Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 15 May 2013 11:47:32 +0000
Subject: [PATCH 5152/6849] libeXosip2: disable multi-thread support for
 toolchains without threads

Also added license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/libeXosip2.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index d72ab6172c..7fef1a65ae 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -7,6 +7,8 @@
 LIBEXOSIP2_VERSION = 3.6.0
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
 LIBEXOSIP2_INSTALL_STAGING = YES
+LIBEXOSIP2_LICENSE = GPLv2+
+LIBEXOSIP2_LICENSE_FILES = COPYING
 
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 
@@ -17,4 +19,7 @@ else
 LIBEXOSIP2_CONF_OPT += --disable-openssl
 endif
 
+LIBEXOSIP2_CONF_OPT += \
+	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
+
 $(eval $(autotools-package))

From bfca77e7f7e21e1a624c32f0b1efdb52af34f1f2 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 16 May 2013 00:07:02 +0000
Subject: [PATCH 5153/6849] graph-depends: ignore the 'target-purgelocales'
 target

Otherwise, graph-depends tries to call 'make target-purgelocales-show-depends',
which does not exist, as 'target-purgelocales' is not an actual package.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 790e24e304..50b8670c10 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -170,6 +170,7 @@ TARGET_EXCEPTIONS = [
     "target-generic-hostname",
     "target-root-passwd",
     "target-post-image",
+    "target-purgelocales",
 ]
 
 # In full mode, start with the result of get_targets() to get the main

From 2a58963ab4a5d29ec75a557f9569a5ebd3f88671 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 16 May 2013 00:40:01 +0000
Subject: [PATCH 5154/6849] crda: needs threads

Because libnl needs threads, fixes:
http://autobuild.buildroot.net/results/8e32f222ddeba262ee2471d22e1c6a8afbf241c2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/crda/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/crda/Config.in b/package/crda/Config.in
index 66baf14e3a..539a5c7aee 100644
--- a/package/crda/Config.in
+++ b/package/crda/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CRDA
 	bool "crda"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBNL
 	# regdb is a runtime dependency
@@ -13,3 +14,6 @@ config BR2_PACKAGE_CRDA
 	  may operate within for a given location.
 
 	  http://linuxwireless.org/en/developers/Regulatory/CRDA
+
+comment "crda requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 0156825d116283109a44315430557cd11f028cef Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 17 May 2013 11:34:08 +0200
Subject: [PATCH 5155/6849] flot: add plugins missed from 0.8.0 bump

A number of plugins were not added when the flot version was bumped.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flot/Config.in | 26 ++++++++++++++++++++++++++
 package/flot/flot.mk   |  5 +++++
 2 files changed, 31 insertions(+)

diff --git a/package/flot/Config.in b/package/flot/Config.in
index 90a4278c00..4c0d3ec334 100644
--- a/package/flot/Config.in
+++ b/package/flot/Config.in
@@ -25,11 +25,32 @@ config BR2_PACKAGE_FLOT_CANVAS
 	help
 	  Flot plugin to render axis tick labels directly to the canvas
 
+config BR2_PACKAGE_FLOT_CATEGORIES
+	bool "categories"
+	help
+	  Flot plugin for plotting textual data or categories
+
+config BR2_PACKAGE_FLOT_CROSSHAIR
+	bool "crosshair"
+	help
+	  Flot plugin for showing crosshairs when the mouse hovers
+	  over the plot
+
+config BR2_PACKAGE_FLOT_ERRORBARS
+	bool "errorbars"
+	help
+	  Flot plugin for plotting error bars
+
 config BR2_PACKAGE_FLOT_FILLBETWEEN
 	bool "fillbetween"
 	help
 	  Flot plugin for computing bottoms for filled line and bar charts
 
+config BR2_PACKAGE_FLOT_IMAGE
+	bool "image"
+	help
+	  Flot plugin for plotting images
+
 config BR2_PACKAGE_FLOT_NAVIGATE
 	bool "navigate"
 	help
@@ -66,4 +87,9 @@ config BR2_PACKAGE_FLOT_THRESHOLD
 	help
 	  Flot plugin for thresholding data
 
+config BR2_PACKAGE_FLOT_TIME
+	bool "time"
+	help
+	  Flot plugin for handling time axes
+
 endif
diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index 97110bccfe..56cb22e3a2 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -4,7 +4,11 @@ FLOT_LICENSE = MIT
 FLOT_LICENSE_FILES = LICENSE.txt
 FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
 	$(if $(BR2_PACKAGE_FLOT_CANVAS),canvas) \
+	$(if $(BR2_PACKAGE_FLOT_CATEGORIES),categories) \
+	$(if $(BR2_PACKAGE_FLOT_CROSSHAIR),crosshair) \
+	$(if $(BR2_PACKAGE_FLOT_ERRORBARS),errorbars) \
 	$(if $(BR2_PACKAGE_FLOT_FILLBETWEEN),fillbetween) \
+	$(if $(BR2_PACKAGE_FLOT_IMAGE),image) \
 	$(if $(BR2_PACKAGE_FLOT_NAVIGATE),navigate) \
 	$(if $(BR2_PACKAGE_FLOT_PIE),pie) \
 	$(if $(BR2_PACKAGE_FLOT_RESIZE),resize) \
@@ -12,6 +16,7 @@ FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
 	$(if $(BR2_PACKAGE_FLOT_STACK),stack) \
 	$(if $(BR2_PACKAGE_FLOT_SYMBOL),symbol) \
 	$(if $(BR2_PACKAGE_FLOT_THRESHOLD),threshold) \
+	$(if $(BR2_PACKAGE_FLOT_TIME),time) \
 	)
 
 define FLOT_INSTALL_TARGET_CMDS

From 686d4f433b4acb7846cd8d881a03803b911d418c Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 15 May 2013 01:30:01 +0000
Subject: [PATCH 5156/6849] pixman: Version bump to 0.30.0

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pixman/pixman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 607f82ef1b..326f9ebb2f 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,7 +3,7 @@
 # pixman
 #
 ################################################################################
-PIXMAN_VERSION = 0.28.2
+PIXMAN_VERSION = 0.30.0
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_INSTALL_STAGING = YES
 PIXMAN_DEPENDENCIES = host-pkgconf

From e5b1da184625d25fe0618ab0a0d5549207f3a64c Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 15 May 2013 00:18:35 +0000
Subject: [PATCH 5157/6849] libxml2: depend on zlib and libiconv if appropriate

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/libxml2.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 6a974ef8b1..7800d946a7 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -34,6 +34,21 @@ else
 HOST_LIBXML2_CONF_OPT += --without-python
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBXML2_DEPENDENCIES += zlib
+LIBXML2_CONF_OPT += --with-zlib
+else
+LIBXML2_CONF_OPT += --without-zlib
+endif
+
+LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
+LIBXML2_CONF_OPT += --with-iconv
+else
+LIBXML2_CONF_OPT += --without-iconv
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 

From f4985ca55acc5452f4eee022d60b066da27a7866 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 16 May 2013 14:02:35 +0000
Subject: [PATCH 5158/6849] bellagio: needs toolchain with threads support

Fixes:
http://autobuild.buildroot.org/results/a4b/a4b7e19f4eee1de8d8722c2ade673fcb816a811e

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/bellagio/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/bellagio/Config.in b/package/multimedia/bellagio/Config.in
index 1458f63702..4be3aee5f7 100644
--- a/package/multimedia/bellagio/Config.in
+++ b/package/multimedia/bellagio/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BELLAGIO
 	bool "bellagio"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Bellagio is an opensource implementation of the
 	  OpenMAX IL API.
@@ -14,5 +15,5 @@ config BR2_PACKAGE_BELLAGIO
 
 	  http://omxil.sourceforge.net/
 
-comment "bellagio requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "bellagio requires a toolchain with C++ and threads support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From ce774eba9cff7b193a8d395c91b23c703088f159 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 16 May 2013 14:02:36 +0000
Subject: [PATCH 5159/6849] bellagio: add license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/bellagio/bellagio.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
index 6aadbbf647..c612b95ee9 100644
--- a/package/multimedia/bellagio/bellagio.mk
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -8,5 +8,7 @@ BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
 BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION)
 BELLAGIO_AUTORECONF = YES
 BELLAGIO_INSTALL_STAGING = YES
+BELLAGIO_LICENSE = LGPLv2.1+
+BELLAGIO_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 4344ffd28259dd67f030e4d13af1c13618442b11 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 23 May 2013 08:09:04 +0000
Subject: [PATCH 5160/6849] portaudio: add license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/portaudio/portaudio.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk
index 34b0bd9e98..0efec5c168 100644
--- a/package/portaudio/portaudio.mk
+++ b/package/portaudio/portaudio.mk
@@ -9,6 +9,8 @@ PORTAUDIO_SITE = http://www.portaudio.com/archives
 PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz
 PORTAUDIO_INSTALL_STAGING = YES
 PORTAUDIO_MAKE = $(MAKE1)
+PORTAUDIO_LICENSE = portaudio license (MIT-like plus special clause)
+PORTAUDIO_LICENSE_FILES = LICENSE.txt
 
 PORTAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)

From faefecd7f6f911b9ccd4ca54a94e9962262e4c7e Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 23 May 2013 06:28:01 +0000
Subject: [PATCH 5161/6849] mongrel2: Needs a {e, }glibc or a uClibc-0.9.34-git
 based toolchain

mongrel2 needs the {get,make,swap}context functions which are
present in {e,}glibc and in the uClibc's master branch.

Fixes:
http://autobuild.buildroot.net/results/8e132a2b03a7b5ae94199db7db86883c05dca700/build-end.log

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mongrel2/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index 05d10d7492..034dbf98a4 100644
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -6,6 +6,12 @@ config BR2_PACKAGE_MONGREL2
 	depends on BR2_INET_IPV6 # zeromq
 	depends on BR2_LARGEFILE # zeromq -> util-linux
 	depends on BR2_USE_WCHAR # zeromq -> util-linux
+	# {get,make,swap}context functions present in
+	# {e,}glibc and in uClibc's master branch.
+	depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
+		BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc
 	help
 	  Mongrel2 is an application, language, and network architecture
 	  agnostic web server that focuses on web applications using

From 0f4d9ce54bd3012e4f543058ed80182dce5a1522 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 23 May 2013 22:29:19 +0200
Subject: [PATCH 5162/6849] mongrel2: works on ARM with uClibc

Source code has workaround for missing {get,make,swap}context on ARM,
so mongrel2 doesn't need glibc/uclibc snapshot when built for ARM.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mongrel2/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index 034dbf98a4..cd9323639c 100644
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -7,11 +7,12 @@ config BR2_PACKAGE_MONGREL2
 	depends on BR2_LARGEFILE # zeromq -> util-linux
 	depends on BR2_USE_WCHAR # zeromq -> util-linux
 	# {get,make,swap}context functions present in
-	# {e,}glibc and in uClibc's master branch.
+	# {e,}glibc and in uClibc's master branch. Source has arm workaround
 	depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
 		BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
 		BR2_TOOLCHAIN_CTNG_eglibc || \
-		BR2_TOOLCHAIN_CTNG_glibc
+		BR2_TOOLCHAIN_CTNG_glibc || \
+		BR2_arm
 	help
 	  Mongrel2 is an application, language, and network architecture
 	  agnostic web server that focuses on web applications using

From 2da9dcc270a9052a19e8e6c720a9cf45c0a397e4 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 22 May 2013 14:24:03 +0000
Subject: [PATCH 5163/6849] dvb-apps utilities: needs threads

Fixes:
http://autobuild.buildroot.org/results/b62/b62289809221b6455fe3db501e869271a64ea454
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dvb-apps/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index 7f763307e4..a77064e14f 100644
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -8,12 +8,13 @@ config BR2_PACKAGE_DVB_APPS
 
 if BR2_PACKAGE_DVB_APPS
 
-comment "dvb-apps utils needs LARGEFILE support in the toolchain"
-	depends on !BR2_LARGEFILE
+comment "dvb-apps utils needs a toolchain with LARGEFILE and THREADS support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_DVB_APPS_UTILS
 	bool "dvb-apps utilities"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  A small number of DVB test and utility programs,

From f937306ead7605c1c8a9360503d1a5f92202c229 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 22 May 2013 14:24:04 +0000
Subject: [PATCH 5164/6849] tvheadend: needs threads

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 19ab27674d..7083b01a7d 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -1,9 +1,10 @@
-comment "tvheadend requires a toolchain with LARGEFILE and IPv6 support"
-    depends on !BR2_LARGEFILE || !BR2_INET_IPV6
+comment "tvheadend needs a toolchain with LARGEFILE, IPv6 and THREADS support"
+    depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
 	depends on BR2_LARGEFILE && BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# tvheadend requires an atomic_add operation. Either you have
 	# a gcc >= 4.3 toolchain and it uses the gcc intrinsics, or it
 	# has special code for x86, x86-64, PPC and ARM. So in the

From a45b0194ef4265adee5f2b26dbe2af38a020728a Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 22 May 2013 14:24:05 +0000
Subject: [PATCH 5165/6849] portaudio: needs threads

Fixes:
http://autobuild.buildroot.org/results/ba2/ba2d3832cb6838b2126e0f7db223305eab579d59

[Peter: move above so sub options gets properly indented]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/portaudio/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/portaudio/Config.in b/package/portaudio/Config.in
index df884a7f70..5a8f248ffc 100644
--- a/package/portaudio/Config.in
+++ b/package/portaudio/Config.in
@@ -1,5 +1,9 @@
+comment "portaudio needs a toolchain threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_PORTAUDIO
 	bool "portaudio"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  PortAudio is a free, cross-platform, open-source,
 	  audio I/O library.

From 666aa6287c39b32e77e24690bcb4f435ca59ac47 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 22 May 2013 14:24:07 +0000
Subject: [PATCH 5166/6849] libatomic_ops: fix build failure seen with
 toolchain without threads support

Fixes:
http://autobuild.buildroot.net/results/58c188ad59c62c7897381e110fe3518ccc17867e

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...tomic_ops-nothread-build-failure-fix.patch | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch

diff --git a/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch b/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch
new file mode 100644
index 0000000000..cc14b1e2e9
--- /dev/null
+++ b/package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch
@@ -0,0 +1,41 @@
+From 7e940ce34ff4de254d460344f1a1a486a14fb045 Mon Sep 17 00:00:00 2001
+From: Gilles Talis <gilles.talis@gmail.com>
+Date: Wed, 22 May 2013 16:21:26 -0700
+Subject: [PATCH] Fix build failure seen when using toolchain without threads support
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ src/atomic_ops.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/atomic_ops.c b/src/atomic_ops.c
+index b6731a2..5769643 100644
+--- a/src/atomic_ops.c
++++ b/src/atomic_ops.c
+@@ -48,7 +48,9 @@
+ 
+ #undef AO_REQUIRE_CAS
+ 
++#if defined(AO_USE_PTHREAD_DEFS)
+ #include <pthread.h>
++#endif
+ 
+ #ifndef AO_USE_NO_SIGNALS
+ # include <signal.h>
+@@ -72,11 +74,13 @@
+ # include "atomic_ops/sysdeps/standard_ao_double_t.h"
+ #endif
+ 
++#if defined(AO_USE_PTHREAD_DEFS)
+ /*
+  * Lock for pthreads-based implementation.
+  */
+ 
+ pthread_mutex_t AO_pt_lock = PTHREAD_MUTEX_INITIALIZER;
++#endif
+ 
+ /*
+  * Out of line compare-and-swap emulation based on test and set.
+-- 
+1.7.4.1
+

From d624203238b2565ba180d5bad45ecc86c3cac620 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Wed, 22 May 2013 13:33:00 +0100
Subject: [PATCH 5167/6849] boost: Limit architectures which can build boost
 context library

The boost context library needs porting to each new architecture
and only a limited number of ports are currently available.

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index e36e7d3955..5c65b2fbf4 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -23,6 +23,8 @@ config BR2_PACKAGE_BOOST_CHRONO
 
 config BR2_PACKAGE_BOOST_CONTEXT
 	bool "boost-context"
+	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel \
+			|| BR2_powerpc || BR2_sparc || BR2_x86_64)
 
 config BR2_PACKAGE_BOOST_DATE_TIME
 	bool "boost-date_time"

From 1287492fd7d4b4fc61678e684c2adddde93a1bbc Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Sun, 19 May 2013 23:37:00 +0000
Subject: [PATCH 5168/6849] pixman: Apply upstream patch to fix compilation on
 MIPS

Fixes:
http://autobuild.buildroot.net/results/38aa4f2a2269b80226b910c46e0c9abe7dc38ff8/

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pixman/pixman-loongson-cflags.patch | 38 +++++++++++++++++++++
 package/pixman/pixman.mk                    |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 package/pixman/pixman-loongson-cflags.patch

diff --git a/package/pixman/pixman-loongson-cflags.patch b/package/pixman/pixman-loongson-cflags.patch
new file mode 100644
index 0000000000..fc53be234e
--- /dev/null
+++ b/package/pixman/pixman-loongson-cflags.patch
@@ -0,0 +1,38 @@
+configure.ac: Verify that the Loongson MMI code can link
+
+The Loongson MMI code modifies -march and as a result it breaks linking
+when the rest of the code is built with a different -match/-mtune.
+This patch fixes the problem by trying to link the code instead of just
+compiling it. This patch is already committed upstream.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From d77d75cc6e5de14d027d22b70389a4d0c71048b9 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Wed, 15 May 2013 16:51:20 +0000
+Subject: Use AC_LINK_IFELSE to check if the Loongson MMI code can link
+
+The Loongson code is compiled with -march=loongson2f to enable the MMI
+instructions, but binutils refuses to link object code compiled with
+different -march settings, leading to link failures later in the
+compile. This avoids that problem by checking if we can link code
+compiled for Loongson.
+
+Reviewed-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+---
+diff --git a/configure.ac b/configure.ac
+index c43a0d2..221179f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -279,7 +279,7 @@ AC_MSG_CHECKING(whether to use Loongson MMI assembler)
+ 
+ xserver_save_CFLAGS=$CFLAGS
+ CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir"
+-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
++AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ #ifndef __mips_loongson_vector_rev
+ #error "Loongson Multimedia Instructions are only available on Loongson"
+ #endif
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 326f9ebb2f..8b35ef190a 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -7,6 +7,8 @@ PIXMAN_VERSION = 0.30.0
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_INSTALL_STAGING = YES
 PIXMAN_DEPENDENCIES = host-pkgconf
+PIXMAN_AUTORECONF = YES
+
 # don't build gtk based demos
 PIXMAN_CONF_OPT = --disable-gtk
 

From 1c3afe4bc14a55aa491be270c24f31d1c5d4d8f1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 16 May 2013 01:40:01 +0000
Subject: [PATCH 5169/6849] poco: not available for all architectures

Missing defines for:
aarch64, arc, blackfin, microblaze & xtensa.
Not properly supported: mips - only defines generic mips as BE, doesn't
know about mipsel (LE) thus assuming it's BE.
Fixes:
http://autobuild.buildroot.net/results/9847702b046bed59b07f0e075a58b1f31e9236ce/

This should be pretty straightforward to fix in
Foundation/include/Poco/Platform.h for interested parties since it only
cares about endianness.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index b8230717b4..402f96d3bf 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_POCO
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
@@ -61,3 +62,4 @@ endif # BR2_PACKAGE_POCO
 comment "poco requires a toolchain with WCHAR, threads, and C++ support"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)

From 8f2578d7b733301cfdd79af08d6b89f112c5ae66 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Fri, 24 May 2013 14:44:49 +0100
Subject: [PATCH 5170/6849] weston: Add make dependency on cairo

There's already a config dependency, make sure we build it too.

Signed-off-by: Will Newton <will.newton@linaro.org>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/weston/weston.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 4e7cada488..b6827db402 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -10,7 +10,8 @@ WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 
-WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng jpeg mtdev udev
+WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng \
+	jpeg mtdev udev cairo
 WESTON_CONF_OPT = \
 	--disable-egl \
 	--disable-xwayland \

From 97edb8f629085670a465cf8354575bb93b749b13 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 24 May 2013 13:43:01 +0000
Subject: [PATCH 5171/6849] pptp-linux: needs MMU

Fixes:
http://autobuild.buildroot.org/results/9b8/9b80537d0efb3fefab486abaecd128bd18e0efdb

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pptp-linux/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/pptp-linux/Config.in b/package/pptp-linux/Config.in
index 165f79bdc2..e03a906efd 100644
--- a/package/pptp-linux/Config.in
+++ b/package/pptp-linux/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PPTP_LINUX
 	bool "pptp-linux"
+	depends on BR2_USE_MMU # fork()
 	help
 	  An implementation of the Point-to-point protocol client.
 

From 9c1917ef5becad640c32fdbc0c795d30c9f13f6c Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 24 May 2013 13:43:02 +0000
Subject: [PATCH 5172/6849] pptp-linux: add license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pptp-linux/pptp-linux.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index ded2a19635..ef25c9a675 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -8,6 +8,8 @@ PPTP_LINUX_VERSION = 1.7.2
 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
 PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
 PPTP_LINUX_MAKE = $(MAKE1)
+PPTP_LINUX_LICENSE = GPLv2+
+PPTP_LINUX_LICENSE_FILES = COPYING
 
 define PPTP_LINUX_BUILD_CMDS
 	$(MAKE) -C $(@D) OPTIMIZE= DEBUG= \

From 5ef3a7a7c7ba52bb6819715da8e5967c7997823e Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Tue, 21 May 2013 21:27:43 +0100
Subject: [PATCH 5173/6849] urg: Add urg-select-h.patch.

This patch fixes a build failure on AArch64 (and potentially others).
Make sure sys/select.h is included before using select(2).

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/urg/urg-select-h.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/urg/urg-select-h.patch

diff --git a/package/urg/urg-select-h.patch b/package/urg/urg-select-h.patch
new file mode 100644
index 0000000000..09d1530443
--- /dev/null
+++ b/package/urg/urg-select-h.patch
@@ -0,0 +1,11 @@
+--- urg-0.8.18/src/c/connection/serial_ctrl_lin.c	2010-11-22 01:48:01.000000000 +0000
++++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c	2013-05-21 20:56:35.822025969 +0100
+@@ -17,7 +17,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+-
++#include <sys/select.h>
+ //#include <ctype.h>
+ 
+ enum {

From c17b0f0bda68b3adcc098d6b426e6448d0444c36 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 19 May 2013 13:47:27 +0000
Subject: [PATCH 5174/6849] wireshark: security bump to version 1.8.7

Fixes CVE-2013-2486, CVE-2013-2487 and several wnpa-sec (wireshark)
advisories.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireshark/Config.in                   |  1 +
 .../wireshark-dont-include-prefix.patch       | 41 -------------------
 package/wireshark/wireshark.mk                |  2 +-
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 package/wireshark/wireshark-dont-include-prefix.patch

diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index e6d4e72556..d4c8b43f45 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_WIRESHARK
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # glib2
 	help
 	  Network traffic sniffer and protocol decoder. Currently only tshark,
diff --git a/package/wireshark/wireshark-dont-include-prefix.patch b/package/wireshark/wireshark-dont-include-prefix.patch
deleted file mode 100644
index 567af9a0b6..0000000000
--- a/package/wireshark/wireshark-dont-include-prefix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-configure.in: don't add the build host's /usr/include and /usr/lib to the 
-search path of include files and libraries. This is not what you want when 
-cross compiling.
-
-Sent upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7926.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-diff -Nuar wireshark-1.8.3.orig/configure.in wireshark-1.8.3/configure.in
---- wireshark-1.8.3.orig/configure.in	2012-08-15 23:33:32.000000000 +0300
-+++ wireshark-1.8.3/configure.in	2012-10-28 10:07:54.864388531 +0200
-@@ -635,29 +635,6 @@
- AC_SUBST(CORESERVICES_FRAMEWORKS)
- AC_SUBST(LAUNCHSERVICES_FRAMEWORKS)
- 
--#
--# If using $prefix we add "$prefix/include" to the include search path
--# and "$prefix/lib" to the library search path.
--#
--if test "x$prefix" != "x" ; then
--	AC_MSG_CHECKING(whether to use $prefix for headers and libraries)
--	if test -d $prefix/include ; then
--		AC_MSG_RESULT(yes)
--		#
--		# Arrange that we search for header files in "$prefix/include", as
--		# various packages we use may have been installed under "$prefix/include".
--		#
--		CPPFLAGS="$CPPFLAGS -I$prefix/include"
--
--		#
--		# Arrange that we search for libraries in "$prefix/lib".
--		#
--		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
--	else
--		AC_MSG_RESULT(no)
--	fi
--fi
--
- dnl Look in /usr/local for header files and libraries ?
- dnl XXX FIXME don't include /usr/local if it is already in the system
- dnl search path as this causes gcc 3.2 on Linux to complain about a change
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 5a4d8b5788..34d270860e 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WIRESHARK_VERSION = 1.8.6
+WIRESHARK_VERSION = 1.8.7
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license

From c92a369fe6cd188e3a1f3cfa74d0179325bfff78 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 25 May 2013 22:23:57 +0200
Subject: [PATCH 5175/6849] Update for 2013.05-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  9 +++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index fd2764ae1b..9de20b2aea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+2013.05-rc3, Released May 25th, 2013:
+
+	Minor fixes.
+
+	Updated/fixed packages: aircrack-ng, bellagio, boost, crda,
+	dvb-apps, flot, libatomic_ops, libeXosip2, libosip2, libxml2,
+	mongrel2, poco, portaudio, pptp-linux, tvheadend, urg, weston,
+	wireshark
+
 2013.05-rc2, Released May 15th, 2013:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 5d2a7aed44..e8647d1f64 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.05-rc2
+export BR2_VERSION:=2013.05-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 9817dea057..7d881f78c5 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,12 +14,12 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>.
 
 <p>
-The latest release candidate is <b>2013.05-rc2</b>, which can be
+The latest release candidate is <b>2013.05-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.05-rc2.tar.gz">buildroot-2013.05-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2013.05-rc3.tar.gz">buildroot-2013.05-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.05-rc2.tar.bz2">buildroot-2013.05-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.05-rc3.tar.bz2">buildroot-2013.05-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 848c409abc..93554f0962 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>25 May 2013 -- 2013.05-rc3 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.05_rc3">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.05-rc3.tar.bz2">2013.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>15 May 2013 -- 2013.05-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From 1e7f40ebb5cfc58010faf5e8d751de9207dc6a5d Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 19 May 2013 20:27:27 +0000
Subject: [PATCH 5176/6849] Revert "dependencies: check that SSL certificates
 are installed"

This reverts commit d66cd067f3dc3d5e2479e1e8c05f24fd82329f7a.

SSL certificates are no always installed in /etc/ssl/certs. For example, on
CentOS 5.6 the default OpenSSL certificates directory is /etc/pki/tls/certs,
and wget can download using https without any problem.

Moreover, the existence of /etc/ssl/certs does not guarantee the presence of a
CA certificates bundle even on Debian. On my current Debian testing
installation the openssl package itself creates an empty /etc/ssl/certs
directory.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index ce4d9e17bc..0b44c5afb3 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -200,12 +200,3 @@ if ! perl  -e "require Data::Dumper" > /dev/null 2>&1 ; then
     /bin/echo -e "On Debian/Ubuntu distributions, install the 'perl' package."
     exit 1
 fi
-
-# Check that we have the SSL certificates to make https:// downloads
-# work.
-if ! test -d /etc/ssl/certs; then
-    /bin/echo -e "Your system lacks Common CA certificates for SSL."
-    /bin/echo -e "This prevents https:// downloads from succeeding."
-    /bin/echo -e "On Debian/Ubuntu distributions, install 'ca-certificates' package."
-    exit 1
-fi

From 67f4c10ce36b1a3e50d8ff8c83c72b87bd1ed683 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Thu, 23 May 2013 14:12:47 +0100
Subject: [PATCH 5177/6849] udpcast: Bump version to 20120424.

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udpcast/udpcast.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index f900b924ec..54051b942b 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-UDPCAST_VERSION = 20071228
+UDPCAST_VERSION = 20120424
 UDPCAST_SOURCE = udpcast-$(UDPCAST_VERSION).tar.gz
 UDPCAST_SITE = http://www.udpcast.linux.lu/download
 UDPCAST_CONF_ENV = $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)

From 0170b420c4d72daf6dc08b49b856bdb3e88e4a2a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 May 2013 21:00:40 +0200
Subject: [PATCH 5178/6849] udpcast: needs threads support in toolchain

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udpcast/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index d7ccfb4306..cb817a9140 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -1,14 +1,15 @@
 config BR2_PACKAGE_UDPCAST
 	bool "udpcast"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A multicast protocol implementation which happens to
 	  be very handy for imaging drives over the network.
 
 	  http://www.udpcast.linux.lu/
 
-comment "udpcast requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "udpcast requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 menu "udpcast tools selection"
 depends on BR2_PACKAGE_UDPCAST

From c096b5985ab5f29a051da3645eda5aa43231bdc0 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Thu, 23 May 2013 14:13:20 +0100
Subject: [PATCH 5179/6849] udpcast: Add udpcast-select-h.patch.

This patch fixes the build on AArch64 (and potentially others).
The patch has been submitted upstream.

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udpcast/udpcast-select-h.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/udpcast/udpcast-select-h.patch

diff --git a/package/udpcast/udpcast-select-h.patch b/package/udpcast/udpcast-select-h.patch
new file mode 100644
index 0000000000..9a8cfc9d5e
--- /dev/null
+++ b/package/udpcast/udpcast-select-h.patch
@@ -0,0 +1,11 @@
+--- udpcast-20120424/console.h	2005-12-22 22:59:18.000000000 +0000
++++ udpcast-20120424.mod/console.h	2013-05-22 22:22:19.835474140 +0100
+@@ -6,6 +6,8 @@
+ #include <winbase.h>
+ #endif /* __MINGW32__ */
+ 
++#include <sys/select.h>
++
+ #define prepareConsole udpc_prepareConsole
+ #define getConsoleFd udpc_getConsoleFd
+ #define restoreConsole udpc_restoreConsole

From b4e7acbfdfae3c454ab8f87e630fe19d591f8a45 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 21 May 2013 04:15:08 +0000
Subject: [PATCH 5180/6849] libsigsegv: Version bump to 2.10

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsigsegv/libsigsegv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk
index b8f84da8da..a4be0b6da1 100644
--- a/package/libsigsegv/libsigsegv.mk
+++ b/package/libsigsegv/libsigsegv.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBSIGSEGV_VERSION = 2.6
+LIBSIGSEGV_VERSION = 2.10
 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
 LIBSIGSEGV_INSTALL_STAGING = YES
 LIBSIGSEGV_LICENSE = GPLv2+

From 4cef036b20d10802fb939218532897195c1ad52e Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Tue, 21 May 2013 16:05:36 +0100
Subject: [PATCH 5181/6849] libnspr: Bump version to 4.9.6.

This fixes the build for aarch64.

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 5b1333dc8f..e934281a9b 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -3,7 +3,7 @@
 # libnspr
 #
 #############################################################
-LIBNSPR_VERSION = 4.9.2
+LIBNSPR_VERSION = 4.9.6
 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
 LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/
 LIBNSPR_SUBDIR = mozilla/nsprpub

From 2a37b625e2d89cf64674f320de39d743db080c03 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 20 May 2013 22:52:04 +0000
Subject: [PATCH 5182/6849] ed: Convert to generic package infrastructure

The package uses custom configure and Makefile files.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ed/ed.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 2bb8e0e28f..52ae1f0942 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -11,4 +11,20 @@ ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 ED_LICENSE = GPLv3+
 ED_LICENSE_FILES = COPYING
 
-$(eval $(autotools-package))
+define ED_CONFIGURE_CMDS
+	(cd $(@D); \
+		./configure \
+		--prefix=/usr \
+		$(TARGET_CONFIGURE_OPTS) \
+	)
+endef
+
+define ED_BUILD_CMDS
+	$(MAKE)	-C $(@D)
+endef
+
+define ED_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+endef
+
+$(eval $(generic-package))

From 14eb60e2912bc458c842d7d0110b05f0aacdc095 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 26 May 2013 22:12:03 +0200
Subject: [PATCH 5183/6849] libnspr: add license info

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnspr/libnspr.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index e934281a9b..71b64b94d9 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -9,6 +9,8 @@ LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_
 LIBNSPR_SUBDIR = mozilla/nsprpub
 LIBNSPR_INSTALL_STAGING = YES
 LIBNSPR_CONFIG_SCRIPTS = nspr-config
+LIBNSPR_LICENSE = MPLv2.0
+LIBNSPR_LICENSE_FILES = mozilla/nsprpub/LICENSE
 
 # Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly
 LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \

From 9d63d3dc3644ec65dbb0280af8d7a1854e5c4d33 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 13 May 2013 06:40:56 +0000
Subject: [PATCH 5184/6849] libnss: bump to version 3.14.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnss/libnss.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 96faf370b2..8bb46e2ff3 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -3,14 +3,17 @@
 # libnss
 #
 #############################################################
-LIBNSS_VERSION = 3.12.9
+
+LIBNSS_VERSION = 3.14.3
 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
 LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION))
-LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src/
+LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src
 LIBNSS_SUBDIR = mozilla/security
 LIBNSS_DISTDIR = mozilla/dist
 LIBNSS_INSTALL_STAGING = YES
 LIBNSS_DEPENDENCIES = libnspr sqlite zlib
+LIBNSS_LICENSE = MPLv2.0
+LIBNSS_LICENSE_FILES = mozilla/security/nss/COPYING
 
 LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
 		NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \

From a1b9256d376dd74ec7441d701510995cde3e0042 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Wed, 15 May 2013 00:43:51 +0000
Subject: [PATCH 5185/6849] aespipe: new package

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/aespipe/Config.in  |  9 +++++++++
 package/aespipe/aespipe.mk | 12 ++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/aespipe/Config.in
 create mode 100644 package/aespipe/aespipe.mk

diff --git a/package/Config.in b/package/Config.in
index 6b6ce9d108..de84d46cd0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -652,6 +652,7 @@ endmenu
 endmenu
 
 menu "Miscellaneous"
+source "package/aespipe/Config.in"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/googlefontdirectory/Config.in"
diff --git a/package/aespipe/Config.in b/package/aespipe/Config.in
new file mode 100644
index 0000000000..ccc94c2a0c
--- /dev/null
+++ b/package/aespipe/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_AESPIPE
+	bool "aespipe"
+	help
+	  aespipe program is AES encrypting or decrypting pipe. It reads from
+	  standard input and writes to standard output. It can be used to
+	  create and restore encrypted tar or cpio archives. It can be used to
+	  encrypt and decrypt loop-AES compatible encrypted disk images.
+
+	  http://koti.tnnet.fi/jari.ruusu/linux/
diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk
new file mode 100644
index 0000000000..c901708c46
--- /dev/null
+++ b/package/aespipe/aespipe.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# aespipe
+#
+#############################################################
+
+AESPIPE_VERSION = 2.4c
+AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2
+AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe/
+AESPIPE_LICENSE = GPL
+
+$(eval $(autotools-package))

From 8cb59e6585b6d1f87e3418418796f15dfdbdbce3 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 19 May 2013 09:58:12 +0000
Subject: [PATCH 5186/6849] Remove spurious POST_UNINSTALL hook usage

A couple of patches make use of XXX_POST_UNINSTALL_TARGET_HOOKS, which
is not a hook set that Buildroot actually supports.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccid/ccid.mk       |  7 -------
 package/xenomai/xenomai.mk | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index a9e58d17e5..51c3887fa9 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -19,11 +19,4 @@ endef
 CCID_POST_INSTALL_TARGET_HOOKS += CCID_INSTALL_UDEV_RULES
 endif
 
-define CCID_REMOVE_UDEV_RULES
-	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
-		rm -f $(TARGET_DIR)/etc/udev/rules.d/92_pcscd_ccid.rules ; \
-	fi;
-endef
-CCID_POST_UNINSTALL_TARGET_HOOKS += CCID_REMOVE_UDEV_RULES
-
 $(eval $(autotools-package))
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index fbf20b5a55..720b22d575 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -108,14 +108,4 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_INSTALL_UDEV_RULES
 endif # udev
 
-define XENOMAI_REMOVE_UDEV_RULES
-	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
-		for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \
-			rm -f $(TARGET_DIR)/etc/udev/rules.d/$$f ; \
-		done ; \
-	fi;
-endef
-
-XENOMAI_POST_UNINSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UDEV_RULES
-
 $(eval $(autotools-package))

From d67b3a54af65ab4818a891458d2d59f91f239f99 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <tjlee@ambarella.com>
Date: Sun, 26 May 2013 10:40:25 +0000
Subject: [PATCH 5187/6849] skeleton: add default login port to /etc/securetty

We ran into a "Login incorrect" problem when running the same rootfs
image across platforms with different loging ports ttyS0/1/2/3.

Simply assignning "console" to BR2_TARGET_GENERIC_GETTY_PORT, which in
turn modifies the /etc/inittab, is not enough because the "console" device
was missing in the /etc/securetty.

While current securetty has enumerated a lot of ttys, this patch should save
some efforts to enumerate more.

[Peter: guard with single quotes]
Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/graph-depends | 1 +
 system/system.mk              | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 180c81d94c..3bab725cda 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -161,6 +161,7 @@ def remove_redundant_deps(deps):
     return newdeps
 
 TARGET_EXCEPTIONS = [
+    "target-generic-securetty",
     "target-generic-issue",
     "target-generic-getty-busybox",
     "target-generic-do-remount-rw",
diff --git a/system/system.mk b/system/system.mk
index 44a33ae618..50c86ad607 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -9,6 +9,10 @@ TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
 TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
 TARGET_GENERIC_GETTY_TERM:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
 
+target-generic-securetty:
+	grep -q '^$(TARGET_GENERIC_GETTY)$$' $(TARGET_DIR)/etc/securetty || \
+		echo '$(TARGET_GENERIC_GETTY)' >> $(TARGET_DIR)/etc/securetty
+
 target-generic-hostname:
 	mkdir -p $(TARGET_DIR)/etc
 	echo "$(TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
@@ -40,6 +44,10 @@ target-generic-do-remount-rw:
 target-generic-dont-remount-rw:
 	$(SED) '/^[^#].*# REMOUNT_ROOTFS_RW$$/s~^~#~' $(TARGET_DIR)/etc/inittab
 
+ifneq ($(TARGET_GENERIC_GETTY),)
+TARGETS += target-generic-securetty
+endif
+
 ifneq ($(TARGET_GENERIC_HOSTNAME),)
 TARGETS += target-generic-hostname
 endif

From 6c183aed401f7228ba6667e170c0642d86706e0f Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Sun, 26 May 2013 09:38:32 +0000
Subject: [PATCH 5188/6849] git: new package

[Peter: needs largefile, fix license info]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |  1 +
 package/git/Config.in | 11 ++++++++
 package/git/git.mk    | 63 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 package/git/Config.in
 create mode 100644 package/git/git.mk

diff --git a/package/Config.in b/package/Config.in
index de84d46cd0..52a0735203 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -74,6 +74,7 @@ source "package/gawk/Config.in"
 endif
 source "toolchain/gcc/Config.in.2"
 source "package/gettext/Config.in"
+source "package/git/Config.in"
 source "package/gperf/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
diff --git a/package/git/Config.in b/package/git/Config.in
new file mode 100644
index 0000000000..31e5ffe5d9
--- /dev/null
+++ b/package/git/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_GIT
+	bool "git"
+	depends on BR2_LARGEFILE
+	help
+	  Git is a free and open source distributed version control system
+	  designed to handle everything from small to very large projects.
+
+	  http://git-scm.com
+
+comment "git requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/git/git.mk b/package/git/git.mk
new file mode 100644
index 0000000000..408456bc9d
--- /dev/null
+++ b/package/git/git.mk
@@ -0,0 +1,63 @@
+#############################################################
+#
+# git
+#
+#############################################################
+
+GIT_VERSION         = 1.8.3
+GIT_SITE            = http://git-core.googlecode.com/files/
+GIT_LICENSE         = GPLv2 LGPLv2.1+
+GIT_LICENSE_FILES   = COPYING LGPL-2.1
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+	GIT_DEPENDENCIES += zlib
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	GIT_DEPENDENCIES += openssl
+	GIT_CONF_OPT += --with-openssl
+else
+	GIT_CONF_OPT += --without-openssl
+endif
+
+ifeq ($(BR2_PACKAGE_PERL),y)
+	GIT_DEPENDENCIES += perl
+	GIT_CONF_OPT += --with-libpcre
+else
+	GIT_CONF_OPT += --without-libpcre
+endif
+
+ifeq ($(BR2_PACKAGE_CURL),y)
+	GIT_DEPENDENCIES += curl
+	GIT_CONF_OPT += --with-curl
+else
+	GIT_CONF_OPT += --without-curl
+endif
+
+ifeq ($(BR2_PACKAGE_EXPAT),y)
+	GIT_DEPENDENCIES += expat
+	GIT_CONF_OPT += --with-expat
+else
+	GIT_CONF_OPT += --without-expat
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+	GIT_DEPENDENCIES += libiconv
+	GIT_CONF_OPT += --with-iconv=/usr/lib
+else
+	GIT_CONF_OPT += --without-iconv
+endif
+
+ifeq ($(BR2_PACKAGE_TCL),y)
+	GIT_DEPENDENCIES += tcl
+	GIT_CONF_OPT += --with-tcltk
+else
+	GIT_CONF_OPT += --without-tcltk
+endif
+
+# assume yes for these tests, configure will bail out otherwise
+# saying error: cannot run test program while cross compiling
+GIT_CONF_ENV = 	ac_cv_fread_reads_directories=yes \
+	ac_cv_snprintf_returns_bogus=yes
+
+$(eval $(autotools-package))

From b05e74ff92b6728369e1540fc0a2bd60025f2146 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@imgtec.com>
Date: Sun, 26 May 2013 12:08:11 +0000
Subject: [PATCH 5189/6849] numactl: new package

[Thomas: updated to 2.0.8, restricted to supported architectures,
added licensing informations, updated to latest Buildroot package
infrastructure]

[Peter: Fix LICENSE_FILES typo, needs largefile support in toolchain]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/numactl/Config.in  | 16 ++++++++++++++++
 package/numactl/numactl.mk | 21 +++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 package/numactl/Config.in
 create mode 100644 package/numactl/numactl.mk

diff --git a/package/Config.in b/package/Config.in
index 52a0735203..8bf1652cb4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -859,6 +859,7 @@ source "package/module-init-tools/Config.in"
 endif
 source "package/monit/Config.in"
 source "package/ncdu/Config.in"
+source "package/numactl/Config.in"
 source "package/polkit/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
diff --git a/package/numactl/Config.in b/package/numactl/Config.in
new file mode 100644
index 0000000000..21e76fb99c
--- /dev/null
+++ b/package/numactl/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_NUMACTL
+	bool "numactl"
+	# numactl uses some system calls that are not available on all
+	# architectures.
+	depends on BR2_LARGEFILE
+	depends on BR2_i386 || BR2_mips || BR2_mipsel || \
+		   BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
+	help
+	  numactl allows you to run your application on specific cpus
+	  and memory nodes. It does this by supplying a NUMA memory
+	  policy to the operating system before running your program.
+
+	  http://oss.sgi.com/projects/libnuma/
+
+comment "numactl requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
new file mode 100644
index 0000000000..fe6f23f74a
--- /dev/null
+++ b/package/numactl/numactl.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# numactl
+#
+#############################################################
+
+NUMACTL_VERSION = 2.0.8
+NUMACTL_SOURCE = numactl-$(NUMACTL_VERSION).tar.gz
+NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download/
+NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
+NUMACTL_LICENSE_FILES = README
+
+define NUMACTL_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define NUMACTL_INSTALL_TARGET_CMDS
+	$(MAKE) prefix=$(TARGET_DIR) libdir=$(TARGET_DIR)/lib -C $(@D) install
+endef
+
+$(eval $(generic-package))

From a5ee03b252906f4a3533566dad170a16d9d6125f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:12 +0000
Subject: [PATCH 5190/6849] dropbear: factorize the 'depends on
 BR2_PACKAGE_DROPBEAR'

Enclose all dropbear sub-options into a 'if BR2_PACKAGE_DROPBEAR'
... 'endif' block rather than having 'depends on BR2_PACKAGE_DROPBEAR'
for each option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dropbear/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 0903ad1602..68c3b71aa9 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -6,9 +6,10 @@ config BR2_PACKAGE_DROPBEAR
 
 	  http://matt.ucc.asn.au/dropbear/dropbear.html
 
+if BR2_PACKAGE_DROPBEAR
+
 config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS
 	bool "disable reverse DNS lookups"
-	depends on BR2_PACKAGE_DROPBEAR
 	help
 	  Disable reverse DNS lookups on connection. This can be handy
 	  on systems without working DNS, as connections otherwise
@@ -17,7 +18,6 @@ config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS
 config BR2_PACKAGE_DROPBEAR_SMALL
 	bool "optimize for size"
 	default y
-	depends on BR2_PACKAGE_DROPBEAR
 	help
 	  Compile dropbear for the smallest possible binary size.
 
@@ -26,14 +26,14 @@ config BR2_PACKAGE_DROPBEAR_SMALL
 
 config BR2_PACKAGE_DROPBEAR_WTMP
 	bool "log dropbear access to wtmp"
-	depends on BR2_PACKAGE_DROPBEAR
 	help
 	  Enable logging of dropbear access to wtmp. Notice that
 	  Buildroot does not generate wtmp by default.
 
 config BR2_PACKAGE_DROPBEAR_LASTLOG
 	bool "log dropbear access to lastlog"
-	depends on BR2_PACKAGE_DROPBEAR
 	help
 	  Enable logging of dropbear access to lastlog. Notice that
 	  Buildroot does not generate lastlog by default.
+
+endif

From 85e3090a92e13b7afc426cb2d9189bbe8d2adaf4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:13 +0000
Subject: [PATCH 5191/6849] elf2flt: fix build when zlib is not installed on
 the host

For a reason that's fairly unclear to me, Peter added a '-lz' link
flag to the elf2flt.mk build in d5664ee99 ("elf2flt: fix link").

However, the zlib library may not necessarily be installed on the host
machine, so we should depend on host-zlib, and pass the appropriate
LDFLAGS. This is what this patch does.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/elf2flt/elf2flt.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 134034bf96..52e199cda3 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -19,7 +19,7 @@ $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
 
 $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
 	(cd $(ELF2FLT_DIR); rm -rf config.cache; \
-		LDFLAGS=-lz \
+		LDFLAGS="$(HOST_LDFLAGS) -lz" \
 		$(ELF2FLT_DIR)/configure $(QUIET) \
 		--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
 		--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
@@ -33,7 +33,7 @@ $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured
 	$(MAKE) -C $(ELF2FLT_DIR) all
 	$(MAKE) -C $(ELF2FLT_DIR) install
 
-elf2flt: uclibc_target uclibc-configured binutils gcc $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
+elf2flt: uclibc_target uclibc-configured binutils gcc host-zlib $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
 
 elf2flt-clean:
 	rm -rf $(ELF2FLT_SOURCE)

From 517de29c523cd3561e723228a50aa414d3dc3fe1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:14 +0000
Subject: [PATCH 5192/6849] gcc: fix gcc 4.8 build when thread support is
 disabled

When thread support is disabled, the libitm and libatomic libraries
from gcc should be disabled, otherwise, the build of gcc fails.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 21679ef17f..5be26c44c0 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -203,7 +203,7 @@ GCC_TLS:=--disable-tls
 endif
 
 ifeq ($(BR2_PTHREADS_NONE),y)
-THREADS:=--disable-threads
+THREADS:=--disable-threads --disable-libitm --disable-libatomic
 else
 THREADS:=--enable-threads
 endif

From f8a9c13252fb1034b74ca88ff0716678d5914c75 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Sun, 26 May 2013 12:08:15 +0000
Subject: [PATCH 5193/6849] toolchain: blackfin: Remove Blackfin toolchain
 2011R1 release.

ADI officially supports the buildroot and related GNU toolchain for
Blackfin since ADI's 2012R1 release only. In order to avoid confusion,
it is better to remove the 2011R1 GNU toolchain for Blackfin. In
addition, the 2011R1 GNU toolchain for Blackfin doesn't support the
BF60x processors.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 19 -------------------
 toolchain/toolchain-external/ext-tool.mk |  8 +-------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index a93ada32ed..02fb330670 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -614,23 +614,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	  Toolchain for the Blackfin architecture, from
 	  http://blackfin.uclinux.org.
 
-config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
-	bool "Blackfin.uclinux.org 2011R1-RC4"
-	depends on BR2_bfin
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_LARGEFILE
-	select BR2_INET_IPV6
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_USE_WCHAR
-	select BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	help
-	  Toolchain for the Blackfin architecture, from
-	  http://blackfin.uclinux.org.
-
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	bool "Xilinx Little Endian Microblaze GNU Tools"
 	depends on BR2_microblazeel
@@ -784,8 +767,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
-	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FLAT
-	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FLAT
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a87bc3b5a6..58e58f6944 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -248,12 +248,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
 TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
-TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9509/
-TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/531/9517/
-TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9858/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
@@ -305,7 +299,7 @@ endif
 # contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
 # which themselves contain the toolchain. This is why we strip more
 # components than usual.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
 	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 

From fe6a9e5e9d4046173a60235f8fd9a3b4746929c6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:17 +0000
Subject: [PATCH 5194/6849] flex: needs M4 at runtime

For proper runtime execution, flex requires m4 to be
installed. Passing a M4 variable at configure time is needed,
otherwise flex on the target will try to use a 'm4' binary with a
build machine path.

Fixes bug #4988.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/Config.in | 2 ++
 package/flex/flex.mk   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/package/flex/Config.in b/package/flex/Config.in
index f74a0f0e8b..1ecd0c3572 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -12,5 +12,7 @@ config BR2_PACKAGE_FLEX_BINARY
 	# needs fork()
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_FLEX
+	# runtime dependency
+	select BR2_PACKAGE_M4
 	help
 	  Install the flex binary tool in the target filesystem.
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index f7e319f1c4..748365b020 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -11,6 +11,7 @@ FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
 FLEX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
+FLEX_CONF_ENV = M4=/usr/bin/m4
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES = host-m4
 

From 32a596899975df230e2b9921835ccfb277755a63 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:18 +0000
Subject: [PATCH 5195/6849] Remove useless CVS related files

Fixes bug #5912.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/gnuconfig/.cvsignore             |  5 -----
 toolchain/elf2flt/elf2flt/.cvsignore     |  3 ---
 toolchain/elf2flt/elf2flt/CVS/Entries    | 17 -----------------
 toolchain/elf2flt/elf2flt/CVS/Repository |  1 -
 toolchain/elf2flt/elf2flt/CVS/Root       |  1 -
 5 files changed, 27 deletions(-)
 delete mode 100644 support/gnuconfig/.cvsignore
 delete mode 100644 toolchain/elf2flt/elf2flt/.cvsignore
 delete mode 100644 toolchain/elf2flt/elf2flt/CVS/Entries
 delete mode 100644 toolchain/elf2flt/elf2flt/CVS/Repository
 delete mode 100644 toolchain/elf2flt/elf2flt/CVS/Root

diff --git a/support/gnuconfig/.cvsignore b/support/gnuconfig/.cvsignore
deleted file mode 100644
index 669c89f536..0000000000
--- a/support/gnuconfig/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.cvsignore
-README.buildroot
-gnuconfig.mk
-patches
-.svn
diff --git a/toolchain/elf2flt/elf2flt/.cvsignore b/toolchain/elf2flt/elf2flt/.cvsignore
deleted file mode 100644
index 18cff9ae11..0000000000
--- a/toolchain/elf2flt/elf2flt/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cvsignore
-.svn
-maketarball.sh
diff --git a/toolchain/elf2flt/elf2flt/CVS/Entries b/toolchain/elf2flt/elf2flt/CVS/Entries
deleted file mode 100644
index 1b3750f10c..0000000000
--- a/toolchain/elf2flt/elf2flt/CVS/Entries
+++ /dev/null
@@ -1,17 +0,0 @@
-/LICENSE.TXT/1.1/Tue Jan 10 04:34:09 2006//
-/README/1.5/Tue Jan 10 04:34:09 2006/-ko/
-/config.guess/1.2/Tue Jan 10 04:34:08 2006/-ko/
-/e1-elf2flt.ld/1.1/Tue Jan 10 04:34:09 2006//
-/flat.h/1.6/Tue Jan 10 04:34:08 2006/-ko/
-/install-sh/1.1.1.1/Tue Jan 10 04:34:08 2006/-ko/
-/stubs.c/1.1/Tue Jan 10 04:34:08 2006//
-/config.sub/1.8/Wed Jan 11 13:36:39 2006/-ko/
-/cygwin-elf.h/1.4/Wed Jan 11 13:36:39 2006//
-/Makefile.in/1.17/Result of merge/-ko/
-/configure/1.12/Sun Jan 28 05:27:28 2007/-ko/
-/configure.in/1.10/Sun Jan 28 05:27:28 2007/-ko/
-/elf2flt.c/1.46/Result of merge/-ko/
-/elf2flt.ld/1.15/Sun Jan 28 05:27:28 2007/-ko/
-/flthdr.c/1.10/Sun Jan 28 05:27:28 2007/-ko/
-/ld-elf2flt.in/1.15/Sun Jan 28 05:27:28 2007//
-D
diff --git a/toolchain/elf2flt/elf2flt/CVS/Repository b/toolchain/elf2flt/elf2flt/CVS/Repository
deleted file mode 100644
index 61a695f7c2..0000000000
--- a/toolchain/elf2flt/elf2flt/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-elf2flt
diff --git a/toolchain/elf2flt/elf2flt/CVS/Root b/toolchain/elf2flt/elf2flt/CVS/Root
deleted file mode 100644
index 0b9f52725e..0000000000
--- a/toolchain/elf2flt/elf2flt/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@cvs.uclinux.org:/var/cvs

From 0ca9692ddee33ebb78c0054a5efff7e267aa5b3a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 27 May 2013 23:54:12 +0200
Subject: [PATCH 5196/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9de20b2aea..58142674ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+2013.05, Not yet released:
+
+	Minor fixes.
+
+	Updated/fixed packages: elf2flt, flex, udpcast
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4988: flex and m4 problems
+	#5912: obsolete CVS files
+
 2013.05-rc3, Released May 25th, 2013:
 
 	Minor fixes.

From 786700eebea40147b88a4d96bd56504bf51241b2 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Sun, 26 May 2013 12:08:19 +0000
Subject: [PATCH 5197/6849] toolchain-external: add support for 'Sourcery
 CodeBench ARM 2013.05'

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 25 ++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 28 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index a93ada32ed..5fdd27b7a7 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -64,6 +64,30 @@ comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
 	depends on BR2_arm
 	depends on !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
+	bool "Sourcery CodeBench ARM 2013.05"
+	depends on BR2_arm
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.7.3, binutils 2.23.52, glibc
+	  2.17 and gdb 7.4.50, kernel headers 3.8.2. It has support
+	  for the following variants:
+	    - ARMv5TE, little endian, soft-float, glibc
+	      Select ARM926T, ARM10T, XScale or another ARMv5 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv4T, little endian, soft-float, glibc
+	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
+	      Select BR2_SOFT_FLOAT
+	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
+	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
+	      Select BR2_SOFT_FLOAT
+	      Set BR2_TARGET_OPTIMIZATION to -mthumb
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
@@ -764,6 +788,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
+	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index bf2bee8683..b6532fcf56 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -200,6 +200,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE=arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01),y)
 TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2013.01/+download/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz2

From 9af20485d4f91263f2197fa9e3cac05d67ccdf92 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Sun, 26 May 2013 12:08:20 +0000
Subject: [PATCH 5198/6849] toolchain-external: remove support for 'Sourcery
 CodeBench ARM 2011.03'

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 25 ------------------------
 toolchain/toolchain-external/ext-tool.mk |  5 +----
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5fdd27b7a7..515c086748 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -276,30 +276,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 little endian soft float uclibc
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
-	bool "Sourcery CodeBench ARM 2011.03"
-	depends on BR2_arm
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	help
-	  Sourcery CodeBench toolchain for the ARM architecture, from
-	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
-	  2.13 and gdb 7.2.50, kernel headers 2.6.38. It has support
-	  for the following variants:
-	    - ARMv5TE, little endian, soft-float, glibc
-	      Select ARM926T, ARM10T, XScale or another ARMv5 core
-	      Select BR2_SOFT_FLOAT
-	    - ARMv4T, little endian, soft-float, glibc
-	      Select ARM720T, ARM920T, ARM922T or another ARMv4 core
-	      Select BR2_SOFT_FLOAT
-	    - ARMv7-A, Thumb 2, little endian, soft-float, glibc
-	      Select Cortex-A8, Cortex-A9 or another ARMv7-A core
-	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -mthumb
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	bool "Sourcery CodeBench MIPS 2011.09"
 	depends on BR2_mips || BR2_mipsel
@@ -785,7 +761,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
-	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b6532fcf56..b18f9adb57 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -191,10 +191,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)

From e76dadc86ef9b7c80ae763d26d62e0bd42a24bd2 Mon Sep 17 00:00:00 2001
From: Carlo Caione <carlo.caione@gmail.com>
Date: Sun, 26 May 2013 12:08:21 +0000
Subject: [PATCH 5199/6849] sunxi-tools: new host/target package

[Peter: Fix Config.in wordwrap and trailing lines]
Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/Config.in.host             |  1 +
 package/sunxi-tools/Config.in      |  9 ++++++++
 package/sunxi-tools/Config.in.host | 12 ++++++++++
 package/sunxi-tools/sunxi-tools.mk | 37 ++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 package/sunxi-tools/Config.in
 create mode 100644 package/sunxi-tools/Config.in.host
 create mode 100644 package/sunxi-tools/sunxi-tools.mk

diff --git a/package/Config.in b/package/Config.in
index 8bf1652cb4..28c2c5c9c4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -208,6 +208,7 @@ source "package/ntfs-3g/Config.in"
 source "package/squashfs/Config.in"
 source "package/squashfs3/Config.in"
 source "package/sshfs/Config.in"
+source "package/sunxi-tools/Config.in"
 source "package/unionfs/Config.in"
 source "package/xfsprogs/Config.in"
 endmenu
diff --git a/package/Config.in.host b/package/Config.in.host
index 7c0dd201fa..54178ea4ff 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -10,6 +10,7 @@ source "package/mtools/Config.in.host"
 source "package/omap-u-boot-utils/Config.in.host"
 source "package/openocd/Config.in.host"
 source "package/sam-ba/Config.in.host"
+source "package/sunxi-tools/Config.in.host"
 source "package/uboot-tools/Config.in.host"
 
 endmenu
diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in
new file mode 100644
index 0000000000..16bf2dc57b
--- /dev/null
+++ b/package/sunxi-tools/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SUNXI_TOOLS
+	bool "sunxi nand-part"
+	depends on BR2_arm
+	help
+	  nand-part is part of sunxi-tools for Allwinner A10 (aka sun4i) and
+	  A13 (aka sun5i) based devices. It is a tool to repartition the
+	  internal NAND on sunxi devices.
+
+	  http://linux-sunxi.org/Sunxi-tools
diff --git a/package/sunxi-tools/Config.in.host b/package/sunxi-tools/Config.in.host
new file mode 100644
index 0000000000..5fab5e6ff5
--- /dev/null
+++ b/package/sunxi-tools/Config.in.host
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_HOST_SUNXI_TOOLS
+	bool "host sunxi-tools"
+	depends on BR2_arm
+	help
+	  Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i)
+	  based devices. This includes fex2bin which can be used to
+	  compile .fex board definition files to the binary script.bin
+	  format required by the linux-sunxi kernel. These tools are
+	  specific for linux-sunxi kernel and do not apply to the
+	  mainline Linux kernel version.
+
+	  http://linux-sunxi.org/Sunxi-tools
diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk
new file mode 100644
index 0000000000..a97dfcbb0a
--- /dev/null
+++ b/package/sunxi-tools/sunxi-tools.mk
@@ -0,0 +1,37 @@
+#############################################################
+#
+# sunxi-tools
+#
+#############################################################
+
+SUNXI_TOOLS_VERSION = 3a94e721dd8d1e13d0b25da0a83463891e8e9ee0
+SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/master
+SUNXI_TOOLS_LICENSE = GPLv2+
+SUNXI_TOOLS_LICENSE_FILES = COPYING
+HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb
+FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin
+
+define HOST_SUNXI_TOOLS_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \
+		-C $(@D)
+endef
+
+define HOST_SUNXI_TOOLS_INSTALL_CMDS
+	for i in fexc bin2fex fex2bin bootinfo fel pio; do \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(HOST_DIR)/usr/bin/$$i ; \
+	done
+endef
+
+define SUNXI_TOOLS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \
+		-C $(@D) nand-part
+endef
+
+define SUNXI_TOOLS_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/nand-part $(TARGET_DIR)/usr/bin/nand-part
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))

From a9825c06b8fc6cb2e18f28dc2aca4a0281b0458f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 28 May 2013 00:33:35 +0000
Subject: [PATCH 5200/6849] fs/ext2: explicitly set a NULL UUID

"tune2fs -U clear" creates an invalid filesystem, that fsck.ext2
whines about later:

    $ make rootfs-ext2
    [--SNIP--]

    $ ./host/usr/sbin/fsck.ext4 images/rootfs.ext2
    e2fsck 1.42.7 (21-Jan-2013)
    Filesystem did not have a UUID; generating one.
    images/rootfs.ext2: clean, 4616/5120 files, 53171/131072 blocks

    $ ./host/usr/sbin/fsck.ext4 -f images/rootfs.ext2
    e2fsck 1.42.7 (21-Jan-2013)
    One or more block group descriptor checksums are invalid.  Fix<y>? yes
    Group descriptor 0 checksum is 0x4131, should be 0x8bdb.  FIXED.
    [--SNIP--]

So we set an explicitly NULL UUID instead.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/genext2fs.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/ext2/genext2fs.sh b/fs/ext2/genext2fs.sh
index f7f8d33ec4..7a6e2326f6 100755
--- a/fs/ext2/genext2fs.sh
+++ b/fs/ext2/genext2fs.sh
@@ -70,11 +70,14 @@ e2tunefsck() {
            "${IMG##*/}" "${GEN}"
 
     # e2fsck will force a *random* UUID, which is bad
-    # for reproducibility, so we do not want it.
+    # for reproducibility, so we do not want it. Asking
+    # tune2fs to 'clear' the UUID makes for an invalid
+    # fs, so we explicitly set a NULL UUID, which works.
     # Remove count- and time-based checks, they are not welcome
     # on embedded devices, where they can cause serious boot-time
     # issues by tremendously slowing down the boot.
-    tune2fs -U clear -c 0 -i 0 "${IMG}"
+    tune2fs -U 00000000-0000-0000-0000-000000000000 "${IMG}"
+    tune2fs -c 0 -i 0 "${IMG}"
 }
 
 # Check we know what generation to generate

From 240843cce36850de37719940e7578c2e3b7d041b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 01:05:47 +0000
Subject: [PATCH 5201/6849] flex: fix autobuilder failures

Since fe6a9e5e9d (flex: needs M4 at runtime), the autobuilders have
been producing a number of flex related build failures. They have been
hard to track down, because even on the same machine, with the same
Git commit ID and the same configuration, the failure could not be
reproduced.

However, a close inspection of flex's config.log file allowed to find
out what the problem was. In its configure script, flex uses the
host-flex to generate a minimal example, and find out the name of the
output file of flex.

When the M4 environment is passed when building the target flex, it
also affects the *execution* of the host-flex, which tries to use
/usr/bin/m4 (which doesn't exist in the autobuilder machines) instead
of the one built in $(HOST_DIR)/usr/bin/m4. So generating the minimal
example fails. And this is where what I could reproduce and what the
autobuilders script produce differ: in my case, even though host-flex
fails to run, it creates an empty lex.yy.c, which is enough to make
the configure script happy. In the context of the autobuild scripts,
this file is apparently not created at all, for an unknown reason, and
this leads to the configure script to abort.

The fix is to set ac_cv_path_M4. This will affect the default m4 used
by the target flex, but it will not affect the m4 used by the
host-flex. It allows the test made during the configure script to work
properly, and therefore should fix the issue seen in the autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/flex.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 748365b020..236153674e 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -11,7 +11,7 @@ FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
 FLEX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
-FLEX_CONF_ENV = M4=/usr/bin/m4
+FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES = host-m4
 

From 2296afed5bf433836b17491aca474622aa9f5420 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 28 May 2013 00:55:42 +0000
Subject: [PATCH 5202/6849] acl: bump to version 2.2.52

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/acl/acl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index e7a654c4df..f2b282892f 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ACL_VERSION = 2.2.51
+ACL_VERSION = 2.2.52
 ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz
 ACL_SITE = http://download.savannah.gnu.org/releases/acl
 ACL_INSTALL_STAGING = YES

From fee470d0d3e236b78f7cd0cfbccb40e4ab0e0a48 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 28 May 2013 02:01:18 +0000
Subject: [PATCH 5203/6849] attr: bump to version 2.4.47

The attr-0001-attr-Fix-static-build-installation.patch has been integrated
in the new upstream version.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...1-attr-Fix-static-build-installation.patch | 30 -------------------
 package/attr/attr.mk                          |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 package/attr/attr-0001-attr-Fix-static-build-installation.patch

diff --git a/package/attr/attr-0001-attr-Fix-static-build-installation.patch b/package/attr/attr-0001-attr-Fix-static-build-installation.patch
deleted file mode 100644
index ed51dbb4da..0000000000
--- a/package/attr/attr-0001-attr-Fix-static-build-installation.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1d510e6049e7c7cb7ed4e87780b2c1a997d47b64 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 17 Nov 2012 19:36:39 +0100
-Subject: [PATCH] attr: Fix static build installation
-
-When doing a static build the .lai file is not created, so do not try
-to install it.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- include/buildmacros |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/include/buildmacros b/include/buildmacros
-index ab89182..d81e62b 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -98,8 +98,7 @@ endif
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
--- 
-1.7.9.5
-
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 288052d353..2b670101d3 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ATTR_VERSION = 2.4.46
+ATTR_VERSION = 2.4.47
 ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
 ATTR_SITE = http://download.savannah.gnu.org/releases/attr
 ATTR_INSTALL_STAGING = YES

From 2c3b24797a1a369819ed21f8fffcb8e26c5c867d Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 28 May 2013 01:41:26 +0000
Subject: [PATCH 5204/6849] jamvm: Not available for all architectures

jamvm supports arm, armeb, powerpc, i386, x86_64 and mipsel.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jamvm/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 0287f80746..3a2bd20302 100644
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_JAMVM
 	bool "jamvm"
 	depends on BR2_INET_IPV6
+	depends on BR2_arm || BR2_armeb || BR2_i386 \
+		|| BR2_mipsel || BR2_powerpc || BR2_x86_64
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_CLASSPATH
 	help

From 78927d3f92f0a397e9551dee491e26602e63a30a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 May 2013 02:17:30 +0000
Subject: [PATCH 5205/6849] gmp: bump to version 5.1.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index e895a485f8..cf5c310a2a 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMP_VERSION = 5.1.1
+GMP_VERSION = 5.1.2
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES

From 609aa4156aa6fbda182856d3dab7df752c54eb78 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 May 2013 02:17:31 +0000
Subject: [PATCH 5206/6849] mpg123: bump to version 1.15.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index c65920fc75..8796392fda 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.15.3
+MPG123_VERSION = 1.15.4
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From ddddef3e6e52b4205306190e4a3830fad06d23aa Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 May 2013 02:17:32 +0000
Subject: [PATCH 5207/6849] sqlite: bump to version 3.7.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sqlite-dont-force-posix-fallocate.patch   | 23 +++++++++++++++++++
 package/sqlite/sqlite.mk                      |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 package/sqlite/sqlite-dont-force-posix-fallocate.patch

diff --git a/package/sqlite/sqlite-dont-force-posix-fallocate.patch b/package/sqlite/sqlite-dont-force-posix-fallocate.patch
new file mode 100644
index 0000000000..118001bfd0
--- /dev/null
+++ b/package/sqlite/sqlite-dont-force-posix-fallocate.patch
@@ -0,0 +1,23 @@
+This is checked by configure and passed as a define directive when building.
+There's no need to check again and potentially override a failed check
+(uClibc <= 0.9.33.2 for example lacks posix_fallocate).
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura sqlite-autoconf-3071700.orig/sqlite3.c sqlite-autoconf-3071700/sqlite3.c
+--- sqlite-autoconf-3071700.orig/sqlite3.c	2013-05-23 03:17:27.170459400 -0300
++++ sqlite-autoconf-3071700/sqlite3.c	2013-05-23 03:25:01.839227616 -0300
+@@ -22931,13 +22931,6 @@
+ */
+ #if SQLITE_OS_UNIX              /* This file is used on unix only */
+
+-/* Use posix_fallocate() if it is available
+-*/
+-#if !defined(HAVE_POSIX_FALLOCATE) \
+-      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
+-# define HAVE_POSIX_FALLOCATE 1
+-#endif
+-
+ /*
+ ** There are various methods for file locking used for concurrency
+ ** control:
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 8eb6b2f76c..39a39d0c54 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071401
+SQLITE_VERSION = 3071700
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = http://www.sqlite.org
+SQLITE_SITE = http://www.sqlite.org/2013
 SQLITE_LICENSE = Public domain
 SQLITE_INSTALL_STAGING = YES
 

From 9428d103621f12fa1fd51ebaeb782128c9fae014 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 28 May 2013 03:06:09 +0000
Subject: [PATCH 5208/6849] barebox: bump to version 2013.05.1

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 21da3f9463..09edecf7ea 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.05.0"
+	bool "2013.05.1"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.05.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.05.1"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From c95ba8a487ba751134f63e2bbf45c5a09ee870a3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 08:21:29 +0000
Subject: [PATCH 5209/6849] lttng-babeltrace: fix build failure on gcc14

The gcc14 machine has a moderately old host gcc, which was causing a
recurrent build failure of host-lttng-babeltrace:

 http://autobuild.buildroot.org/results/492/49216052c161874f41738e41e6e0c89a6dd04000/build-end.log

This commit adds a patch to fix this build failure, related to the
access of the ULLONG_MAX define on compilers that did not default to
the C99 variant of the C language.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ace-01-no-posix-fallocate-in-uclibc.patch} |  0
 ...abeltrace-02-fix-build-old-compilers.patch | 27 +++++++++++++++++++
 package/lttng-babeltrace/lttng-babeltrace.mk  |  4 +++
 3 files changed, 31 insertions(+)
 rename package/lttng-babeltrace/{lttng-babeltrace-no-posix-fallocate-in-uclibc.patch => lttng-babeltrace-01-no-posix-fallocate-in-uclibc.patch} (100%)
 create mode 100644 package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch

diff --git a/package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/lttng-babeltrace-01-no-posix-fallocate-in-uclibc.patch
similarity index 100%
rename from package/lttng-babeltrace/lttng-babeltrace-no-posix-fallocate-in-uclibc.patch
rename to package/lttng-babeltrace/lttng-babeltrace-01-no-posix-fallocate-in-uclibc.patch
diff --git a/package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch b/package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch
new file mode 100644
index 0000000000..b8f31be1e1
--- /dev/null
+++ b/package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch
@@ -0,0 +1,27 @@
+Support old compilers
+
+Some old compilers do not use C99 as their default C language variant,
+for example gcc 4.3.x, which is used on some old machines. When such a
+compiler is used, by default, ULLONG_MAX is not visible. Adding
+-std=gnu99 is needed to make this definition visible.
+
+In autoconf speak, this translates into the need of using
+AC_PROC_CC_STDC instead of AC_PROG_CC. See
+http://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/C-Compiler.html
+for more details.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@
+ AC_SYS_LARGEFILE
+ 
+ # Checks for programs.
+-AC_PROG_CC
++AC_PROG_CC_STDC
+ AC_PROG_MAKE_SET
+ LT_INIT
+ AC_PROG_YACC
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 82376a3fe5..d3bfc83d9f 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -4,5 +4,9 @@ LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
 
+# One patch touches configure.ac
+LTTNG_BABELTRACE_AUTORECONF = YES
+HOST_LTTNG_BABELTRACE_AUTORECONF = YES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From adaff0dfeac2964c8cc15d9d9b900d7f69abc23c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:03:45 +0000
Subject: [PATCH 5210/6849] gdb: apply post-patch hook on both the host and
 target builds

When a Xtensa specific patch needs to be applied, it should be applied
both when doing the target and the host build.

This change is part of the effort to remove the differences between
host and target post-extract and post-patch hooks, that are
problematic for the out-of-tree support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdb/gdb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 398ef7bbe8..5f4a7534f2 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -48,6 +48,7 @@ define GDB_XTENSA_PRE_PATCH
 	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
 		-C $(@D) --strip-components=1 gdb
 endef
+GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
 HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
 endif
 

From 28cae90247bb2ce164eda37cd5cef41dd9e80108 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:00:59 +0000
Subject: [PATCH 5211/6849] bzip2: improve the packaging

Instead of doing some nasty SED tricks, use a patch that modifies the
bzip2 build system to make it a little bit nicer. Those SEDs were made
differently for the host and target packages, which is contrary to the
logic of not having any difference in the source tree between the host
build and the target build.

This commit also makes sure that bzip2.mk behaves properly in a
BR2_PREFER_STATIC_LIB=y context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../bzip2/bzip2-improve-build-system.patch    | 84 +++++++++++++++++
 package/bzip2/bzip2.mk                        | 92 +++++++------------
 2 files changed, 115 insertions(+), 61 deletions(-)
 create mode 100644 package/bzip2/bzip2-improve-build-system.patch

diff --git a/package/bzip2/bzip2-improve-build-system.patch b/package/bzip2/bzip2-improve-build-system.patch
new file mode 100644
index 0000000000..90099aa288
--- /dev/null
+++ b/package/bzip2/bzip2-improve-build-system.patch
@@ -0,0 +1,84 @@
+Improve bzip2 build system
+
+This patch makes a number of improvements to the bzip2 build system:
+
+ * Remove the BIGFILE variable that was used to force largefile
+   support. Now, the user of the Makefile is supposed to pass
+   -D_FILE_OFFSET_BITS=64 when largefile support is desired.
+
+ * Use override CFLAGS += so that additional CFLAGS can be passed on
+   the command line.
+
+ * Removed "forced" CFLAGS -O2, -g and -Winline. We don't want them by
+   default, and want the build system to use its own ones.
+
+ * When creating the symbolic links bzegrep, bzfgrep, bzless and
+   bzcmp, don't link them to an absolute path, or they'll point to
+   some path on the build machine.
+
+ * Provide an install target for the shared library, which creates the
+   appropriate symbolic links.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,7 @@
+ RANLIB=ranlib
+ LDFLAGS=
+ 
+-BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++override CFLAGS += -Wall
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -90,14 +89,14 @@
+ 	cp -f libbz2.a $(PREFIX)/lib
+ 	chmod a+r $(PREFIX)/lib/libbz2.a
+ 	cp -f bzgrep $(PREFIX)/bin/bzgrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
++	ln -s -f bzgrep $(PREFIX)/bin/bzegrep
++	ln -s -f bzgrep $(PREFIX)/bin/bzfgrep
+ 	chmod a+x $(PREFIX)/bin/bzgrep
+ 	cp -f bzmore $(PREFIX)/bin/bzmore
+-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
++	ln -s -f bzmore $(PREFIX)/bin/bzless
+ 	chmod a+x $(PREFIX)/bin/bzmore
+ 	cp -f bzdiff $(PREFIX)/bin/bzdiff
+-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
++	ln -s -f bzdiff $(PREFIX)/bin/bzcmp
+ 	chmod a+x $(PREFIX)/bin/bzdiff
+ 	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+ 	chmod a+r $(PREFIX)/man/man1/bzgrep.1
+Index: b/Makefile-libbz2_so
+===================================================================
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -23,8 +23,7 @@
+ 
+ SHELL=/bin/sh
+ CC=gcc
+-BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++override CFLAGS += -fpic -fPIC -Wall
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -37,8 +36,11 @@
+ all: $(OBJS)
+ 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++
++install:
++	install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6
++	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
++	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index b3e4ad34a5..5f8c35ef31 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -10,67 +10,45 @@ BZIP2_INSTALL_STAGING = YES
 BZIP2_LICENSE = bzip2 license
 BZIP2_LICENSE_FILES = LICENSE
 
-define BZIP2_FIX_MAKEFILE
-	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION)) \
-	    libbz2.so,g" $(@D)/Makefile-libbz2_so
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define BZIP2_BUILD_SHARED_CMDS
+	$(TARGET_MAKE_ENV)
+		$(MAKE) -C $(@D) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS)
 endef
+endif
 
-BZIP2_POST_PATCH_HOOKS += BZIP2_FIX_MAKEFILE
-
-define BZIP2_NOLARGEFILE_FIX_MAKEFILE
-	$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile
-	$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile-libbz2_so
+define BZIP2_BUILD_CMDS
+	$(TARGET_MAKE_ENV)
+		$(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover $(TARGET_CONFIGURE_OPTS)
+	$(BZIP2_BUILD_SHARED_CMDS)
 endef
 
-ifneq ($(BR2_LARGEFILE),y)
-BZIP2_POST_PATCH_HOOKS += BZIP2_NOLARGEFILE_FIX_MAKEFILE
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define BZIP2_INSTALL_STAGING_SHARED_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		-f Makefile-libbz2_so PREFIX=$(STAGING_DIR)/usr -C $(@D) install
+endef
 endif
 
-define BZIP2_BUILD_CMDS
-	$(TARGET_MAKE_ENV) \
-	$(MAKE) -C $(@D) -f Makefile-libbz2_so \
-	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)"
-	$(TARGET_MAKE_ENV) \
-	$(MAKE) -C $(@D) \
-	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" \
-	libbz2.a bzip2 bzip2recover
+define BZIP2_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		PREFIX=$(STAGING_DIR)/usr -C $(@D) install
+	$(BZIP2_INSTALL_STAGING_SHARED_CMDS)
 endef
 
-define BZIP2_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install
-	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/lib
-	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
-	cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/
-	(cd $(STAGING_DIR)/usr/lib/; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
-	)
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define BZIP2_INSTALL_TARGET_SHARED_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		-f Makefile-libbz2_so PREFIX=$(TARGET_DIR)/usr -C $(@D) install
 endef
+endif
 
 # make sure busybox doesn't get overwritten by make install
 define BZIP2_INSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat)
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install
-	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/
-	(cd $(TARGET_DIR)/usr/lib; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
-	)
-	(cd $(TARGET_DIR)/usr/bin; \
-		ln -snf bzip2 bunzip2; \
-		ln -snf bzip2 bzcat; \
-		ln -snf bzdiff bzcmp; \
-		ln -snf bzmore bzless; \
-		ln -snf bzgrep bzegrep; \
-		ln -snf bzgrep bzfgrep; \
-	)
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		PREFIX=$(TARGET_DIR)/usr -C $(@D) install
+	$(BZIP2_INSTALL_TARGET_SHARED_CMDS)
 endef
 
 define BZIP2_CLEAN_CMDS
@@ -83,24 +61,16 @@ define BZIP2_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-define HOST_BZIP2_FIX_MAKEFILE
-	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
-	    libbz2.so,g" $(@D)/Makefile-libbz2_so
-	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile
-	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so
-endef
-
-HOST_BZIP2_POST_PATCH_HOOKS += HOST_BZIP2_FIX_MAKEFILE
-
 define HOST_BZIP2_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile-libbz2_so
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) -f Makefile-libbz2_so
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover
 endef
 
 define HOST_BZIP2_INSTALL_CMDS
 	$(HOST_MAKE_ENV) \
-	$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
+		$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
 endef
 
 $(eval $(generic-package))

From fc40219173997b87d46ef53f497f0496bbf60cac Mon Sep 17 00:00:00 2001
From: Carlo Caione <carlo.caione@gmail.com>
Date: Sun, 26 May 2013 12:08:22 +0000
Subject: [PATCH 5212/6849] sunxi-boards: new package

[Peter: depend on arm, wrap help, change to _FEX_FILE option, error on empty]
Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/sunxi-boards/Config.in       | 25 +++++++++++++++++++++++++
 package/sunxi-boards/sunxi-boards.mk | 28 ++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/sunxi-boards/Config.in
 create mode 100644 package/sunxi-boards/sunxi-boards.mk

diff --git a/package/Config.in b/package/Config.in
index 28c2c5c9c4..7bf7dd022f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -220,6 +220,7 @@ source "package/b43-firmware/Config.in"
 source "package/firmware-imx/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/rpi-firmware/Config.in"
+source "package/sunxi-boards/Config.in"
 source "package/ux500-firmware/Config.in"
 source "package/zd1211-firmware/Config.in"
 endmenu
diff --git a/package/sunxi-boards/Config.in b/package/sunxi-boards/Config.in
new file mode 100644
index 0000000000..d9fd8529f3
--- /dev/null
+++ b/package/sunxi-boards/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_SUNXI_BOARDS
+	bool "sunxi script.bin board file"
+	depends on BR2_arm
+	select BR2_PACKAGE_HOST_SUNXI_TOOLS
+	help
+	  Sunxi-boards requires a compiled .fex files for hardware
+	  description, used by the kernel during boot for hardware
+	  initialization. This package is specific for linux-sunxi
+	  kernel and it is useless for mainline kernel versions.
+
+	  https://github.com/linux-sunxi/sunxi-boards
+
+if BR2_PACKAGE_SUNXI_BOARDS
+config BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE
+	string ".fex file to compile"
+	help
+	  This field defines the name of the .fex file for which the
+	  .bin file should be generated.
+
+	  This should be the path of the .fex file relative to the
+	  sys_config/ directory, and including the .fex extension.
+
+	  See inside sys_config/ directory in sunxi-boards source code
+	  to see the list of valid .fex files.
+endif
diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk
new file mode 100644
index 0000000000..38fc3e1fbe
--- /dev/null
+++ b/package/sunxi-boards/sunxi-boards.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# sunxi-boards
+#
+#############################################################
+
+SUNXI_BOARDS_VERSION = 88d663db44f65b73ef65c4148a28c6fa3665d2b6
+SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/master
+SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools
+SUNXI_BOARDS_INSTALL_IMAGES = YES
+SUNXI_BOARDS_INSTALL_TARGET = NO
+SUNXI_BOARDS_FEX_FILE = $(call qstrip,$(BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE))
+
+define SUNXI_BOARDS_INSTALL_IMAGES_CMDS
+	$(FEX2BIN) $(@D)/sys_config/$(SUNXI_BOARDS_FEX_FILE) \
+		$(BINARIES_DIR)/script.bin
+endef
+
+ifeq ($(BR2_PACKAGE_SUNXI_BOARDS),y)
+# we NEED a board name
+ifeq ($(filter source,$(MAKECMDGOALS)),)
+ifeq ($(SUNXI_BOARDS_FEX_FILE),)
+$(error No sunxi .fex file specified. Check your BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE settings)
+endif
+endif
+endif
+
+$(eval $(generic-package))

From c50d85d7d44e7d46cc9280c9dc2aef8122463d2a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 May 2013 02:17:30 +0000
Subject: [PATCH 5213/6849] gmp: bump to version 5.1.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gmp/gmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index e895a485f8..cf5c310a2a 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMP_VERSION = 5.1.1
+GMP_VERSION = 5.1.2
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES

From 5a85d57f24bf42adea4b7d4431866709f6534df4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 May 2013 02:17:31 +0000
Subject: [PATCH 5214/6849] mpg123: bump to version 1.15.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index c65920fc75..8796392fda 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.15.3
+MPG123_VERSION = 1.15.4
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From 316f991729c423c9a49a955d3747ff31ad7a0068 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 28 May 2013 02:17:32 +0000
Subject: [PATCH 5215/6849] sqlite: bump to version 3.7.17

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sqlite-dont-force-posix-fallocate.patch   | 23 +++++++++++++++++++
 package/sqlite/sqlite.mk                      |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 package/sqlite/sqlite-dont-force-posix-fallocate.patch

diff --git a/package/sqlite/sqlite-dont-force-posix-fallocate.patch b/package/sqlite/sqlite-dont-force-posix-fallocate.patch
new file mode 100644
index 0000000000..118001bfd0
--- /dev/null
+++ b/package/sqlite/sqlite-dont-force-posix-fallocate.patch
@@ -0,0 +1,23 @@
+This is checked by configure and passed as a define directive when building.
+There's no need to check again and potentially override a failed check
+(uClibc <= 0.9.33.2 for example lacks posix_fallocate).
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura sqlite-autoconf-3071700.orig/sqlite3.c sqlite-autoconf-3071700/sqlite3.c
+--- sqlite-autoconf-3071700.orig/sqlite3.c	2013-05-23 03:17:27.170459400 -0300
++++ sqlite-autoconf-3071700/sqlite3.c	2013-05-23 03:25:01.839227616 -0300
+@@ -22931,13 +22931,6 @@
+ */
+ #if SQLITE_OS_UNIX              /* This file is used on unix only */
+
+-/* Use posix_fallocate() if it is available
+-*/
+-#if !defined(HAVE_POSIX_FALLOCATE) \
+-      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
+-# define HAVE_POSIX_FALLOCATE 1
+-#endif
+-
+ /*
+ ** There are various methods for file locking used for concurrency
+ ** control:
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 8eb6b2f76c..39a39d0c54 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071401
+SQLITE_VERSION = 3071700
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = http://www.sqlite.org
+SQLITE_SITE = http://www.sqlite.org/2013
 SQLITE_LICENSE = Public domain
 SQLITE_INSTALL_STAGING = YES
 

From d2d64f88f592010a5f45e4d55c5884110b9d6188 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 28 May 2013 23:27:37 +0200
Subject: [PATCH 5216/6849] Revert "gmp: bump to version 5.1.2"

This reverts commit 78927d3f92f0a397e9551dee491e26602e63a30a.

This was supposed to have been for next, not 2013.05.
---
 package/gmp/gmp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index cf5c310a2a..e895a485f8 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GMP_VERSION = 5.1.2
+GMP_VERSION = 5.1.1
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
 GMP_INSTALL_STAGING = YES

From b85f5e8b457ffa1aad6e8063b5c6bbf6ca475eac Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 28 May 2013 23:28:25 +0200
Subject: [PATCH 5217/6849] Revert "mpg123: bump to version 1.15.4"

This reverts commit 609aa4156aa6fbda182856d3dab7df752c54eb78.

This was supposed to have been for next, not 2013.05.
---
 package/multimedia/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 8796392fda..c65920fc75 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MPG123_VERSION = 1.15.4
+MPG123_VERSION = 1.15.3
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From 0d8d884e5d3b28000ea83b9b538900e476c21dd7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 28 May 2013 23:28:45 +0200
Subject: [PATCH 5218/6849] Revert "sqlite: bump to version 3.7.17"

This reverts commit ddddef3e6e52b4205306190e4a3830fad06d23aa.

This was supposed to have been for next, not 2013.05.
---
 .../sqlite-dont-force-posix-fallocate.patch   | 23 -------------------
 package/sqlite/sqlite.mk                      |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 package/sqlite/sqlite-dont-force-posix-fallocate.patch

diff --git a/package/sqlite/sqlite-dont-force-posix-fallocate.patch b/package/sqlite/sqlite-dont-force-posix-fallocate.patch
deleted file mode 100644
index 118001bfd0..0000000000
--- a/package/sqlite/sqlite-dont-force-posix-fallocate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This is checked by configure and passed as a define directive when building.
-There's no need to check again and potentially override a failed check
-(uClibc <= 0.9.33.2 for example lacks posix_fallocate).
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura sqlite-autoconf-3071700.orig/sqlite3.c sqlite-autoconf-3071700/sqlite3.c
---- sqlite-autoconf-3071700.orig/sqlite3.c	2013-05-23 03:17:27.170459400 -0300
-+++ sqlite-autoconf-3071700/sqlite3.c	2013-05-23 03:25:01.839227616 -0300
-@@ -22931,13 +22931,6 @@
- */
- #if SQLITE_OS_UNIX              /* This file is used on unix only */
-
--/* Use posix_fallocate() if it is available
--*/
--#if !defined(HAVE_POSIX_FALLOCATE) \
--      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
--# define HAVE_POSIX_FALLOCATE 1
--#endif
--
- /*
- ** There are various methods for file locking used for concurrency
- ** control:
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 39a39d0c54..8eb6b2f76c 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3071700
+SQLITE_VERSION = 3071401
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = http://www.sqlite.org/2013
+SQLITE_SITE = http://www.sqlite.org
 SQLITE_LICENSE = Public domain
 SQLITE_INSTALL_STAGING = YES
 

From a3029189aa45058dd864aac0425e5e1d682b0fad Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 11:17:20 +0000
Subject: [PATCH 5219/6849] wvstreams: need largefile support

Fixes:

  http://autobuild.buildroot.org/results/bc4/bc4c617a5d7740b6eedcfc0dd24aeed5bc888f6d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wvdial/Config.in    | 4 ++++
 package/wvstreams/Config.in | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in
index 730d35a4bb..42431ca934 100644
--- a/package/wvdial/Config.in
+++ b/package/wvdial/Config.in
@@ -1,9 +1,13 @@
 config BR2_PACKAGE_WVDIAL
 	bool "wvdial"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # wvstreams
 	select BR2_PACKAGE_WVSTREAMS
 	help
 	  wvdial is an intelligent Point-to-Point Protocol dialer
 
 	  http://wvdial.googlecode.com/
+
+comment "wvdial requires a toolchain with C++ and largefile support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in
index c39ec33a0a..11b8e44720 100644
--- a/package/wvstreams/Config.in
+++ b/package/wvstreams/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_WVSTREAMS
 	bool "wvstreams"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
@@ -9,5 +10,5 @@ config BR2_PACKAGE_WVSTREAMS
 
 	  http://wvstreams.googlecode.com/
 
-comment "wvstreams requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "wvstreams requires a toolchain with C++ and largefile support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE

From 3d96dc1a67569b4a2f67dbf9dee69dcdf1ce2200 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 11:17:48 +0000
Subject: [PATCH 5220/6849] acpid: fix obvious syntax error in addprefix call

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/acpid/acpid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index 4ad9f660b0..b55761731e 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -26,7 +26,7 @@ endef
 define ACPID_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/acpid
 	rm -f $(TARGET_DIR)/usr/bin/acpi_listen
-	rm -f $(addprefix )$(TARGET_DIR)/usr/share/man/man8/,acpid.8 acpi_listen.8)
+	rm -f $(addprefix $(TARGET_DIR)/usr/share/man/man8/,acpid.8 acpi_listen.8)
 endef
 
 define ACPID_CLEAN_CMDS

From eb71e79f410e9a9d391a8bd83046a4df50b2b1ab Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 11:21:58 +0000
Subject: [PATCH 5221/6849] libv4l: needs thread support

Fixes:

  http://autobuild.buildroot.org/results/c74/c741ca445a63ce9ab8b0e5b87f3126d7b6051009/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libv4l/Config.in | 5 +++--
 package/opencv/Config.in | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index cb0f43c5e5..70f20ac56d 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBV4L
 	bool "libv4l"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_JPEG
 	help
 	  libv4l is an accompanying collection of libraries that adds a thin
@@ -58,5 +59,5 @@ comment "v4l2-dbg requires a toolchain with C++ support enabled"
 
 endif
 
-comment "libv4l requires a toolchain with LARGEFILE support"
-        depends on !BR2_LARGEFILE
+comment "libv4l requires a toolchain with LARGEFILE and thread support"
+        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 55b86a07a3..6a47ac59cf 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -182,12 +182,13 @@ config BR2_PACKAGE_OPENCV_WITH_TIFF
 config BR2_PACKAGE_OPENCV_WITH_V4L
 	bool "v4l support"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBV4L
 	help
 	  Enable Video 4 Linux support.
 
-comment "v4l support requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "v4l support requires a toolchain with LARGEFILE and thread support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 comment "Install options"
 

From c0d30d4c94047ab29db021a921dc3762e81ac5e7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 11:27:00 +0000
Subject: [PATCH 5222/6849] flex: propagate m4 dependency on wchar

Commit fe6a9e5e9d4046173a60235f8fd9a3b4746929c6 missed the fact that
m4 has a dependency on wide char support, so this dependency should be
propagated to flex.

Fixes:

  http://autobuild.buildroot.org/results/495/49502b2e33a346b2fcebf5e2da00af2661b54d6e/build-end.log

[Peter: Note where wchar dep comes from, show comment if not available]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flex/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/flex/Config.in b/package/flex/Config.in
index 1ecd0c3572..4fbc56c0a9 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -14,5 +14,9 @@ config BR2_PACKAGE_FLEX_BINARY
 	depends on BR2_PACKAGE_FLEX
 	# runtime dependency
 	select BR2_PACKAGE_M4
+	depends on BR2_USE_WCHAR # m4
 	help
 	  Install the flex binary tool in the target filesystem.
+
+comment "flex binary requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

From fb1419bedd8b08770b27ca0223709ab75cfac9db Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 27 May 2013 01:43:35 +0000
Subject: [PATCH 5223/6849] kernel-headers: bump 3.{0, 4, 9}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.78-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index a54f9ce661..1bb9c0289b 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.78"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.80"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.44"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.45"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.47"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.2"		if BR2_KERNEL_HEADERS_3_9
+	default "3.9.4"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.78-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.78-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch

From 5b591b4052de5c650dcaa9033d77b739b82c132a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 27 May 2013 01:43:36 +0000
Subject: [PATCH 5224/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index b2d7850bd1..1bbb574bb5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.2"
+	bool "3.9.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.4" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 60474dcec67922782a244ca3fe30fe9c35a5c963 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 28 May 2013 12:11:37 +0000
Subject: [PATCH 5225/6849] fs/ext2: further fix to the UUID

Turned out that setting a nil-UUID is no better than clearing it.

What currently happens is as follows:
  - first, genext2fs does not generate a UUID
  - then we tune2fs to upgrade the filesystem
  - then we run fsck, which generates a random UUID
  - then we re-run tune2fs to set a nil-UUID

So, on the target, if the file system is improperly unmounted (eg.
with a power failure), on next boot, fsck may be run, and a new
random UUID will be generated.

*However*, fsck improperly updates the filesystem when it adds the
UUID, and there are a few group descriptor checksum errors.

Those errors will go undetected until the next fsck, which will then
block for user input (bad on embedded systems, bad).

Fix that by systematically generating a random UUID _before_ we call
to fsck.

A random UUID is not so bad, after all, since there are already so
many sources of unpredictability in the filesystem: files date and
ordering, files content (date, paths...) which renders a fixed UUID
unneeded.

And it is still possible to set the UUID in a post-image script if
needed, anyway.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/genext2fs.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fs/ext2/genext2fs.sh b/fs/ext2/genext2fs.sh
index 7a6e2326f6..a6cd7d22ba 100755
--- a/fs/ext2/genext2fs.sh
+++ b/fs/ext2/genext2fs.sh
@@ -49,6 +49,14 @@ e2tunefsck() {
         tune2fs "$@" "${IMG}"
     fi
 
+    # genext2fs does not generate a UUID, but fsck will whine if one is
+    # is missing, so we need to add a UUID.
+    # Of course, this has to happend _before_ we run fsck.
+    # Although a random UUID may seem bad for reproducibility, there
+    # already are so many things that are not reproducible in a
+    # filesystem: file dates, file ordering, content of the files...
+    tune2fs -U random "${IMG}"
+
     # After changing filesystem options, running fsck is required
     # (see: man tune2fs). Running e2fsck in other cases will ensure
     # coherency of the filesystem, although it is not required.
@@ -69,14 +77,9 @@ e2tunefsck() {
     printf "\ne2fsck was successfully run on '%s' (ext%d)\n\n"  \
            "${IMG##*/}" "${GEN}"
 
-    # e2fsck will force a *random* UUID, which is bad
-    # for reproducibility, so we do not want it. Asking
-    # tune2fs to 'clear' the UUID makes for an invalid
-    # fs, so we explicitly set a NULL UUID, which works.
     # Remove count- and time-based checks, they are not welcome
     # on embedded devices, where they can cause serious boot-time
     # issues by tremendously slowing down the boot.
-    tune2fs -U 00000000-0000-0000-0000-000000000000 "${IMG}"
     tune2fs -c 0 -i 0 "${IMG}"
 }
 

From 3ebb2e80844088de6ea8a923762ac2c47437d810 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 28 May 2013 22:36:37 +0000
Subject: [PATCH 5226/6849] at91bootstrap: Disable parallel build

The at91bootstrap build sometimes fail when doing parallel builds.
Build it without parallel build.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 67b68c00d6..0b1ee29980 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -31,7 +31,7 @@ AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
 endif
 
 define AT91BOOTSTRAP_BUILD_CMDS
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR)
+	$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR)
 endef
 
 define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS

From 3496b8b5c81ca2368520f48c58f55edde61ffa15 Mon Sep 17 00:00:00 2001
From: Carlo Caione <carlo.caione@gmail.com>
Date: Sun, 26 May 2013 12:08:23 +0000
Subject: [PATCH 5227/6849] cubieboard: add support

[Peter: adjust for _FEX_FILE]
Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/cubietech/cubieboard/boot.cmd       |   4 +
 board/cubietech/cubieboard/mkcubiecard.sh | 119 ++++++++++++++++++++++
 board/cubietech/cubieboard/post-build.sh  |  14 +++
 board/cubietech/cubieboard/readme.txt     |  59 +++++++++++
 configs/cubieboard_defconfig              |  39 +++++++
 5 files changed, 235 insertions(+)
 create mode 100644 board/cubietech/cubieboard/boot.cmd
 create mode 100755 board/cubietech/cubieboard/mkcubiecard.sh
 create mode 100755 board/cubietech/cubieboard/post-build.sh
 create mode 100644 board/cubietech/cubieboard/readme.txt
 create mode 100644 configs/cubieboard_defconfig

diff --git a/board/cubietech/cubieboard/boot.cmd b/board/cubietech/cubieboard/boot.cmd
new file mode 100644
index 0000000000..849ed00712
--- /dev/null
+++ b/board/cubietech/cubieboard/boot.cmd
@@ -0,0 +1,4 @@
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
+fatload mmc 0 0x43000000 script.bin
+fatload mmc 0 0x48000000 uImage
+bootm 0x48000000
diff --git a/board/cubietech/cubieboard/mkcubiecard.sh b/board/cubietech/cubieboard/mkcubiecard.sh
new file mode 100755
index 0000000000..4ffb22304b
--- /dev/null
+++ b/board/cubietech/cubieboard/mkcubiecard.sh
@@ -0,0 +1,119 @@
+#! /bin/sh
+# mkCubieCard.sh v0.1:
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+# heavely based on :
+# mkA10card.sh v0.1
+# 2012, Jason Plum <jplum@archlinuxarm.org>
+# loosely based on :
+# mkcard.sh v0.5
+# (c) Copyright 2009 Graeme Gregory <dp@xora.org.uk>
+# Licensed under terms of GPLv2
+#
+# Parts of the procudure base on the work of Denys Dmytriyenko
+# http://wiki.omap.com/index.php/MMC_Boot_Format
+
+IMAGES_DIR=$1
+SPL_IMG=$IMAGES_DIR/sunxi-spl.bin
+UBOOT_IMG=$IMAGES_DIR/u-boot.bin
+UIMAGE=$IMAGES_DIR/uImage
+BIN_BOARD_FILE=$IMAGES_DIR/script.bin
+ROOTFS=$IMAGES_DIR/rootfs.tar
+BOOT_CMD_H=$IMAGES_DIR/boot.scr
+
+export LC_ALL=C
+
+if [ $# -ne 2 ]; then
+	echo "Usage: $0 <images_dir> <drive>"
+	exit 1;
+fi
+
+if [ $EUID -ne 0 ]; then
+	echo "This script must be run as root" 1>&2
+	exit 1
+fi
+
+if [ ! -f $SPL_IMG ] ||
+   [ ! -f $UBOOT_IMG ] ||
+   [ ! -f $UIMAGE ] ||
+   [ ! -f $BIN_BOARD_FILE ] ||
+   [ ! -f $ROOTFS ] ||
+   [ ! -f $BOOT_CMD_H ]; then
+	echo "File(s) missing."
+	exit 1
+fi
+
+DRIVE=$2
+P1=`mktemp -d`
+P2=`mktemp -d`
+
+dd if=/dev/zero of=$DRIVE bs=1M count=3
+
+SIZE=`fdisk -l $DRIVE | grep Disk | grep bytes | awk '{print $5}'`
+
+echo DISK SIZE - $SIZE bytes
+
+
+# ~2048, 16MB, FAT, bootable
+# ~rest of drive, Ext4
+{
+echo 32,512,0x0C,*
+echo 544,,,-
+} | sfdisk -D $DRIVE
+
+sleep 1
+
+if [ -b ${DRIVE}1 ]; then
+	D1=${DRIVE}1
+	umount ${DRIVE}1
+	mkfs.vfat -n "boot" ${DRIVE}1
+else
+	if [ -b ${DRIVE}p1 ]; then
+		D1=${DRIVE}p1
+		umount ${DRIVE}p1
+		mkfs.vfat -n "boot" ${DRIVE}p1
+	else
+		echo "Cant find boot partition in /dev"
+		exit 1
+	fi
+fi
+
+
+if [ -b ${DRIVE}2 ]; then
+	D2=${DRIVE}2
+	umount ${DRIVE}2
+	mkfs.ext4 -L "Cubie" ${DRIVE}2
+else
+	if [ -b ${DRIVE}p2 ]; then
+		D2=${DRIVE}p2
+		umount ${DRIVE}p2
+		mkfs.ext4 -L "Cubie" ${DRIVE}p2
+	else
+		echo "Cant find rootfs partition in /dev"
+		exit 1
+	fi
+fi
+
+mount $D1 $P1
+mount $D2 $P2
+
+# write uImage
+cp $UIMAGE $P1
+# write board file
+cp $BIN_BOARD_FILE $P1
+# write u-boot script
+cp $BOOT_CMD_H $P1
+# write rootfs
+tar -C $P2 -xvf $ROOTFS
+
+sync
+
+umount $D1
+umount $D2
+
+rm -fr $P1
+rm -fr $P2
+
+# write SPL
+dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8
+# write mele u-boot
+dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32
diff --git a/board/cubietech/cubieboard/post-build.sh b/board/cubietech/cubieboard/post-build.sh
new file mode 100755
index 0000000000..1b0258c551
--- /dev/null
+++ b/board/cubietech/cubieboard/post-build.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# post-build.sh for CubieBoard
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
+BOOT_CMD=$BOARD_DIR/boot.cmd
+BOOT_CMD_H=$BINARIES_DIR/boot.scr
+
+# U-Boot script
+if [ -e $MKIMAGE -a -e $BOOT_CMD ];
+then
+	$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
+fi
diff --git a/board/cubietech/cubieboard/readme.txt b/board/cubietech/cubieboard/readme.txt
new file mode 100644
index 0000000000..1c47117675
--- /dev/null
+++ b/board/cubietech/cubieboard/readme.txt
@@ -0,0 +1,59 @@
+cubieboard
+
+-----
+Intro
+-----
+
+To be able to use your cubieboard board with the images generated by
+Buildroot you have to correctly setup the SD card.
+
+For more information, please see http://linux-sunxi.org/FirstSteps
+
+---------------
+How to build it
+---------------
+
+You need to use the cubieboard_defconfig, to do so:
+ * make cubieboard_defconfig
+
+And to compile:
+ * make
+
+-----------------
+What is generated
+-----------------
+
+After building, you should obtain this tree:
+
+    output/images/
+    +-- rootfs.tar
+    +-- boot.scr
+    +-- script.bin
+    +-- sunxi-spl.bin
+    +-- u-boot.bin
+    `-- uImage
+
+--------------------------
+How setting up the SD card
+--------------------------
+
+Depending on the rootfs size, you might want to use a 2GB or larger SD-card.
+The script mkcubiecard.sh will take care of partitioning and formatting
+the SD-card.
+
+BEWARE! This process will erase your SD card.
+
+Use dmesg to find out where the SD card is attached in the /dev tree
+(<device>) and then:
+
+# sudo ./mkcubiecard.sh <images_dir> <device>
+
+where:
+ - <images_dir> is the directory containing the generated files (usually
+   output/images)
+ - <device> is the device file of the SD card (usually /dev/sdX)
+
+
+
+--
+Carlo Caione <carlo.caione@gmail.com>
diff --git a/configs/cubieboard_defconfig b/configs/cubieboard_defconfig
new file mode 100644
index 0000000000..933c1a2eb9
--- /dev/null
+++ b/configs/cubieboard_defconfig
@@ -0,0 +1,39 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a8=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="Cubieboard"
+BR2_TARGET_GENERIC_ISSUE="Welcome to use Cubieboard!"
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard/post-build.sh"
+
+# Additional tools
+BR2_PACKAGE_HOST_SUNXI_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_SUNXI_TOOLS=y
+BR2_PACKAGE_SUNXI_BOARDS=y
+BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/cubieboard.fex"
+
+# Kernel headers
+BR2_KERNEL_HEADERS_3_4=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="274a66a7bfcbaabb88d63e4eba161965383cc416"
+BR2_LINUX_KERNEL_VERSION="sunxi-3.4"
+BR2_LINUX_KERNEL_DEFCONFIG="sun4i"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="cubieboard"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_VERSION="sunxi"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"

From e2e33e2cb56d7cdb04259366ba076cd168576cbe Mon Sep 17 00:00:00 2001
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Date: Sun, 26 May 2013 12:08:24 +0000
Subject: [PATCH 5228/6849] freescale-imx: new package directory

The freescale-imx directory is intended to contain all freescale
i.MXyy related packages, together with their download site and version
info

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/freescale-imx/Config.in        |  4 ++++
 package/freescale-imx/freescale-imx.mk | 13 +++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 package/freescale-imx/Config.in
 create mode 100644 package/freescale-imx/freescale-imx.mk

diff --git a/package/Config.in b/package/Config.in
index 7bf7dd022f..dee118074c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -224,6 +224,7 @@ source "package/sunxi-boards/Config.in"
 source "package/ux500-firmware/Config.in"
 source "package/zd1211-firmware/Config.in"
 endmenu
+source "package/freescale-imx/Config.in"
 source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
 source "package/dbus/Config.in"
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
new file mode 100644
index 0000000000..389bcc6b23
--- /dev/null
+++ b/package/freescale-imx/Config.in
@@ -0,0 +1,4 @@
+menu "Freescale i.MX libraries"
+	depends on BR2_arm
+
+endmenu
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
new file mode 100644
index 0000000000..0d5400b64b
--- /dev/null
+++ b/package/freescale-imx/freescale-imx.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# freescale-imx
+#
+#############################################################
+
+FREESCALE_IMX_VERSION = 12.09.01
+
+# No official download site from freescale, just this mirror
+FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
+
+include package/freescale-imx/*/*.mk
+

From d0fb7b8f817dc35359de011e72b8236ff349494a Mon Sep 17 00:00:00 2001
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Date: Sun, 26 May 2013 12:08:25 +0000
Subject: [PATCH 5229/6849] imx-lib: move to the freescale-imx directory

This commit moves the imx-lib package to the newly introduced
freescale-imx/ directory, and uses the new variables provided by
freescale-imx/freescale-imx.mk.

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                              | 1 -
 package/freescale-imx/Config.in                | 2 ++
 package/{ => freescale-imx}/imx-lib/Config.in  | 0
 package/{ => freescale-imx}/imx-lib/imx-lib.mk | 5 ++---
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename package/{ => freescale-imx}/imx-lib/Config.in (100%)
 rename package/{ => freescale-imx}/imx-lib/imx-lib.mk (86%)

diff --git a/package/Config.in b/package/Config.in
index dee118074c..6e7335b5b1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -465,7 +465,6 @@ endmenu
 menu "Hardware handling"
 source "package/ccid/Config.in"
 source "package/dtc/Config.in"
-source "package/imx-lib/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libatasmart/Config.in"
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 389bcc6b23..edc9ab53ff 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -1,4 +1,6 @@
 menu "Freescale i.MX libraries"
 	depends on BR2_arm
 
+source "package/freescale-imx/imx-lib/Config.in"
+
 endmenu
diff --git a/package/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in
similarity index 100%
rename from package/imx-lib/Config.in
rename to package/freescale-imx/imx-lib/Config.in
diff --git a/package/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
similarity index 86%
rename from package/imx-lib/imx-lib.mk
rename to package/freescale-imx/imx-lib/imx-lib.mk
index c168c80f0c..67e8db3e0e 100644
--- a/package/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -4,9 +4,8 @@
 #
 #############################################################
 
-IMX_LIB_VERSION = 12.09.01
-# No official download site from freescale, just this mirror
-IMX_LIB_SITE    = http://download.ossystems.com.br/bsp/freescale/source
+IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_LIB_SITE    = $(FREESCALE_IMX_MIRROR_SITE)
 IMX_LIB_LICENSE = LGPLv2.1+
 # No license file included
 

From 7aa425e9034069dfeb91361c90256b9cb831bc67 Mon Sep 17 00:00:00 2001
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Date: Sun, 26 May 2013 12:08:26 +0000
Subject: [PATCH 5230/6849] firmware-imx: move to the freescale-imx directory

This commit moves the firmware-imx package to the newly introduced
freescale-imx/ directory, and uses the new variables provided by
freescale-imx/freescale-imx.mk.

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                        | 1 -
 package/freescale-imx/Config.in                          | 1 +
 package/{ => freescale-imx}/firmware-imx/Config.in       | 0
 package/{ => freescale-imx}/firmware-imx/firmware-imx.mk | 7 +++----
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename package/{ => freescale-imx}/firmware-imx/Config.in (100%)
 rename package/{ => freescale-imx}/firmware-imx/firmware-imx.mk (85%)

diff --git a/package/Config.in b/package/Config.in
index 6e7335b5b1..ab6df09a95 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -217,7 +217,6 @@ menu "Hardware handling"
 menu "Misc devices firmwares"
 source "package/am33x-cm3/Config.in"
 source "package/b43-firmware/Config.in"
-source "package/firmware-imx/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/rpi-firmware/Config.in"
 source "package/sunxi-boards/Config.in"
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index edc9ab53ff..840b83b198 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -2,5 +2,6 @@ menu "Freescale i.MX libraries"
 	depends on BR2_arm
 
 source "package/freescale-imx/imx-lib/Config.in"
+source "package/freescale-imx/firmware-imx/Config.in"
 
 endmenu
diff --git a/package/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in
similarity index 100%
rename from package/firmware-imx/Config.in
rename to package/freescale-imx/firmware-imx/Config.in
diff --git a/package/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
similarity index 85%
rename from package/firmware-imx/firmware-imx.mk
rename to package/freescale-imx/firmware-imx/firmware-imx.mk
index 3b43bef5c6..85f8dc29da 100644
--- a/package/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -1,12 +1,11 @@
 #############################################################
 #
-# buildroot makefile for firmware-imx
+# firmware-imx
 #
 #############################################################
 
-FIRMWARE_IMX_VERSION = 12.09.01
-# No official download site from freescale, just this mirror
-FIRMWARE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source
+FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION)
+FIRMWARE_IMX_SITE = $(FREESCALE_IMX_MIRROR_SITE)
 FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
 FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
 	Atheros license (ath6k)

From 41a65bf5be0724e8d36832e330a18a01e3845658 Mon Sep 17 00:00:00 2001
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Date: Sun, 26 May 2013 12:08:27 +0000
Subject: [PATCH 5231/6849] freescale-imx: bump to 1.1.0

This commit bumps both imx-lib and firmware-imx to version 1.1.0.

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freescale-imx/freescale-imx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 0d5400b64b..2553f6720c 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-FREESCALE_IMX_VERSION = 12.09.01
+FREESCALE_IMX_VERSION = 1.1.0
 
 # No official download site from freescale, just this mirror
 FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source

From e1fc11b4fe637aa7ca029447d1963a318d159fb8 Mon Sep 17 00:00:00 2001
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Date: Sun, 26 May 2013 12:08:28 +0000
Subject: [PATCH 5232/6849] gpu-viv-bin-mx6q: new package

This patch adds a new package for the OpenGL, OpenVG and EGL
proprietary implementations specific to the Vivante GPU of i.MX6
processors.

[Peter: show comment on uClibc toolchains, tweak help text]
Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freescale-imx/Config.in               |  1 +
 .../freescale-imx/gpu-viv-bin-mx6q/Config.in  | 35 ++++++++
 ...iv-bin-mx6q-0001-correct-HAL-include.patch | 16 ++++
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk      | 79 +++++++++++++++++++
 4 files changed, 131 insertions(+)
 create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/Config.in
 create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch
 create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk

diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 840b83b198..7c22f79cf6 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -3,5 +3,6 @@ menu "Freescale i.MX libraries"
 
 source "package/freescale-imx/imx-lib/Config.in"
 source "package/freescale-imx/firmware-imx/Config.in"
+source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
 
 endmenu
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
new file mode 100644
index 0000000000..06544c4068
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -0,0 +1,35 @@
+comment "gpu-viv-bin-mx6q requires a glibc toolchain"
+	depends on !(BR2_TOOLCHAIN_CTNG_glibc || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_EXTERNAL_GLIBC)
+
+config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
+	bool "gpu-viv-bin-mx6q"
+	select BR2_PACKAGE_HAS_OPENGL_EGL
+	select BR2_PACKAGE_HAS_OPENGL_ES
+	depends on BR2_arm # Only relevant for i.MX6
+	 # Library binaries are linked against libc.so.6
+	depends on BR2_TOOLCHAIN_CTNG_glibc || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	help
+	  Userspace libraries for Vivante GPU on i.MX6 platforms
+
+	  It contains libraries and headers for GLES, OpenCL, and
+	  OpenVG.  It also contains a DRI plugin for X11. It also
+	  contains a plugin for DirectFB-1.4.0, but that doesn't work
+	  together with buildroot's DirectFB version.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
+
+if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
+
+config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES
+	bool "install examples"
+	help
+	  Copy the Vivante examples to the target.
+
+	  Warning: examples take approximately 150 MB of disk space.
+
+endif
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch
new file mode 100644
index 0000000000..c83cd559b1
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch
@@ -0,0 +1,16 @@
+Correct the directory path for gc_hal_eglplatform_type.h
+
+Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
+
+diff -rup gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
+--- gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h	2012-12-18 10:35:55.000000000 +0100
++++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h	2013-05-09 21:09:28.080138681 +0200
+@@ -39,7 +39,7 @@ extern "C" {
+ #endif
+ 
+ #include <EGL/egl.h>
+-#include "gc_hal_eglplatform_type.h"
++#include <HAL/gc_hal_eglplatform_type.h>
+ 
+ 
+ /*******************************************************************************
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
new file mode 100644
index 0000000000..f988d252a9
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -0,0 +1,79 @@
+#############################################################
+#
+# gpu-viv-bin-mx6q
+#
+#############################################################
+
+GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)
+GPU_VIV_BIN_MX6Q_SITE    = $(FREESCALE_IMX_MIRROR_SITE)
+GPU_VIV_BIN_MX6Q_SOURCE  = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
+
+GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
+
+GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement
+
+# No license file is included in the archive; we could extract it from
+# the self-extractor, but that's just too much effort.
+# This is a legal minefield: the EULA specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
+
+# DirectFB is not supported (wrong version)
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
+else
+GPU_VIV_BIN_MX6Q_LIB_TARGET = fb
+endif
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (gpu-viv-bin-mx6q-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info.
+define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS
+	(cd $(BUILD_DIR); \
+		sh $(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE) --force --auto-accept)
+endef
+
+# Instead of building, we fix up the inconsistencies that exist
+# in the upstream archive here.
+# Make sure these commands are idempotent.
+define GPU_VIV_BIN_MX6Q_BUILD_CMDS
+	$(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/usr/include/*/*.h
+	for lib in EGL GAL VIVANTE; do \
+		ln -sf lib$${lib}-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so \
+			$(@D)/usr/lib/lib$${lib}.so; \
+	done
+	ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1
+	ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so
+endef
+
+define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
+	cp -r $(@D)/usr/* $(STAGING_DIR)/usr
+endef
+
+ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y)
+define GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES
+	mkdir -p $(TARGET_DIR)/usr/share/examples/
+	cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/
+endef
+endif
+
+# On the target, remove the unused libraries.
+# Note that this is _required_, else ldconfig may create symlinks
+# to the wrong library
+define GPU_VIV_BIN_MX6Q_INSTALL_TARGET_CMDS
+	$(GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES)
+	cp -a $(@D)/usr/lib $(TARGET_DIR)/usr
+	for lib in EGL GAL VIVANTE; do \
+		for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
+			case $$f in \
+				*-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so) : ;; \
+				*) $(RM) $$f ;; \
+			esac; \
+		done; \
+	done
+endef
+
+$(eval $(generic-package))

From 2db98f63b0140a7dc7e9d9715c072e79cc68c4a0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:29 +0000
Subject: [PATCH 5233/6849] network-manager: use a <pkg>_VERSION_MAJOR variable

Just like we do for many other GNOME-hosted tarballs, use a
<pkg>_VERSION_MAJOR variable for network-manager.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/network-manager/network-manager.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index b3715d8df1..261f2d3abe 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -3,9 +3,11 @@
 # NetworkManager
 #
 #############################################################
-NETWORK_MANAGER_VERSION = 0.9.2.0
+
+NETWORK_MANAGER_VERSION_MAJOR = 0.9
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2.0
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
-NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
+NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES
 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
 	libgcrypt wireless_tools util-linux host-intltool

From 52c7f43fdefbe7b5fe65682e3a9618cf741a6787 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 26 May 2013 12:08:30 +0000
Subject: [PATCH 5234/6849] network-manager: bump to 0.9.8.0

This upstream version (the latest available at the time of this
writing) contains
http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f
which fixes a build issue of network-manager against recent kernel
headers.

We also remove our patch against network-manager, because it has been
merged upstream as commit cbf72aeb34a6f1fd1bcd7f78ae88985154dc85af.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../network-manager-execinfo.patch            | 31 -----------------
 package/network-manager/network-manager.mk    | 33 ++++++++-----------
 2 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 package/network-manager/network-manager-execinfo.patch

diff --git a/package/network-manager/network-manager-execinfo.patch b/package/network-manager/network-manager-execinfo.patch
deleted file mode 100644
index 8dc83f0bf2..0000000000
--- a/package/network-manager/network-manager-execinfo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ff9471b7d83545614100a270e2d85b7b272abe97 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 2 Jan 2012 14:45:16 +0100
-Subject: [PATCH] [PATCH] only include execinfo.h if crashtrace support is
- enabled
-
-On systems without backtrace suport (E.G. uClibc depending on config),
-execinfo.h might not be available, breaking the build.
-
-Fix it by only including it if enabled.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/logging/nm-logging.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
-index ca6a709..26c8670 100644
---- a/src/logging/nm-logging.c
-+++ b/src/logging/nm-logging.c
-@@ -23,7 +23,6 @@
- 
- #include <dlfcn.h>
- #include <syslog.h>
--#include <execinfo.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--- 
-1.7.7.1
-
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 261f2d3abe..9be624cb1b 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -5,49 +5,42 @@
 #############################################################
 
 NETWORK_MANAGER_VERSION_MAJOR = 0.9
-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2.0
-NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8.0
+NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES
 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
 	libgcrypt wireless_tools util-linux host-intltool
 
 NETWORK_MANAGER_CONF_ENV = \
-	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
+	ac_cv_file__etc_fedora_release=no \
+	ac_cv_file__etc_mandriva_release=no \
+	ac_cv_file__etc_debian_version=no \
+	ac_cv_file__etc_redhat_release=no \
+	ac_cv_file__etc_SuSE_release=no
+
 
 NETWORK_MANAGER_CONF_OPT = \
 		--mandir=$(STAGING_DIR)/usr/man/ \
-		--with-dbus-user=dbus \
 		--disable-tests \
 		--disable-more-warnings \
 		--without-docs \
 		--disable-gtk-doc \
-		--disable-asserts \
-		--enable-abstract-sockets \
-		--disable-selinux \
-		--disable-xml-docs \
-		--disable-doxygen-docs \
-		--disable-static \
-		--enable-dnotify \
 		--localstatedir=/var \
 		--with-crypto=gnutls \
-		--with-distro=arch \
 		--disable-ppp \
-		--with-iptables=/usr/sbin/iptables
+		--with-iptables=/usr/sbin/iptables \
+		--disable-ifupdown \
+		--disable-ifnet
 
 # uClibc by default doesn't have backtrace support, so don't use it
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
 NETWORK_MANAGER_CONF_OPT += --disable-crashtrace
 endif
 
-# The target was built for the archlinux distribution, so we need
-# to move around things after installation
-define NETWORK_MANAGER_INSTALL_INITSCRIPT
+define NETWORK_MANAGER_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager
-	rm -f $(TARGET_DIR)/etc/rc.d/networkmanager
-	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/rc.d
 endef
 
-NETWORK_MANAGER_POST_INSTALL_TARGET_HOOKS += NETWORK_MANAGER_INSTALL_INITSCRIPT
-
 $(eval $(autotools-package))

From 9fc981ab3ab04276371b4c4a0125f729323ba82f Mon Sep 17 00:00:00 2001
From: Arn R <arnerro@gmail.com>
Date: Wed, 29 May 2013 03:42:17 +0000
Subject: [PATCH 5235/6849] logrotate: Bump version to 3.8.4

The changelog for logrotate indicates some CVE's were fixed in 3.8.0.
(changelog at http://svn.fedorahosted.org/svn/logrotate/tags/r3-8-4/CHANGES)

Signed-off-by: Arne Rovet <arnerro@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/logrotate/logrotate.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index da8e4b3621..c920b46df0 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -3,7 +3,7 @@
 # logrotate
 #
 #############################################################
-LOGROTATE_VERSION = 3.7.9
+LOGROTATE_VERSION = 3.8.4
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
 LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/
 LOGROTATE_LICENSE = GPLv2+

From 1ca4ff63f295090eb68afcd4dc0a6d695a89b0a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 27 May 2013 06:41:58 +0000
Subject: [PATCH 5236/6849] configs: add sample for olimex mx233 olinuxino

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...mmc-mxs-mmc-add-cd-inverted-property.patch |  47 +++++
 ...c-mxs-mmc-add-non-removable-property.patch |  53 +++++
 ...3-mmc-mxs-mmc-add-broken-cd-property.patch |  50 +++++
 ...3-olinuxino-mark-sdcard-cd-as-broken.patch |  28 +++
 .../olimex/imx233_olinuxino/linux-3.9.config  | 188 ++++++++++++++++++
 .../mxs-bootlets-01-olinuxino.patch           | 122 ++++++++++++
 board/olimex/imx233_olinuxino/readme.txt      |  55 +++++
 configs/olimex_imx233_olinuxino_defconfig     |  33 +++
 8 files changed, 576 insertions(+)
 create mode 100644 board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
 create mode 100644 board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
 create mode 100644 board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
 create mode 100644 board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
 create mode 100644 board/olimex/imx233_olinuxino/linux-3.9.config
 create mode 100644 board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
 create mode 100644 board/olimex/imx233_olinuxino/readme.txt
 create mode 100644 configs/olimex_imx233_olinuxino_defconfig

diff --git a/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch b/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
new file mode 100644
index 0000000000..6e58c8cd70
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
@@ -0,0 +1,47 @@
+From 4c0c9be05004d1eb674b7586216b3d93cc04531c Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 10 Apr 2013 11:13:43 +0200
+Subject: [PATCH 1/3] mmc: mxs-mmc: add cd-inverted property
+
+The card-detect GPIO is inverted on some boards. Handle such case.
+
+Acked-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+---
+ drivers/mmc/host/mxs-mmc.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index 4efe302..0cdf1f6 100644
+--- a/drivers/mmc/host/mxs-mmc.c
++++ b/drivers/mmc/host/mxs-mmc.c
+@@ -72,6 +72,7 @@ struct mxs_mmc_host {
+ 	int				sdio_irq_en;
+ 	int				wp_gpio;
+ 	bool				wp_inverted;
++	bool				cd_inverted;
+ };
+
+ static int mxs_mmc_get_ro(struct mmc_host *mmc)
+@@ -96,7 +97,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+ 	struct mxs_ssp *ssp = &host->ssp;
+
+ 	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+-		 BM_SSP_STATUS_CARD_DETECT);
++		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;
+ }
+
+ static void mxs_mmc_reset(struct mxs_mmc_host *host)
+@@ -691,6 +692,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+ 	if (flags & OF_GPIO_ACTIVE_LOW)
+ 		host->wp_inverted = 1;
+
++	host->cd_inverted = of_property_read_bool(np, "cd-inverted");
++
+ 	mmc->f_min = 400000;
+ 	mmc->f_max = 288000000;
+ 	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+--
+1.8.1.5
+
diff --git a/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch b/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
new file mode 100644
index 0000000000..f7446cada7
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
@@ -0,0 +1,53 @@
+From 5086e5f41fd107539911edf62f2d202753ed1980 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 10 Apr 2013 11:13:44 +0200
+Subject: [PATCH 2/3] mmc: mxs-mmc: add non-removable property
+
+Some boards have non removable cards like eMMC. Handle such case.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Acked-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+---
+ drivers/mmc/host/mxs-mmc.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index 0cdf1f6..c231881 100644
+--- a/drivers/mmc/host/mxs-mmc.c
++++ b/drivers/mmc/host/mxs-mmc.c
+@@ -73,6 +73,7 @@ struct mxs_mmc_host {
+ 	int				wp_gpio;
+ 	bool				wp_inverted;
+ 	bool				cd_inverted;
++	bool				non_removable;
+ };
+
+ static int mxs_mmc_get_ro(struct mmc_host *mmc)
+@@ -96,8 +97,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+ 	struct mxs_mmc_host *host = mmc_priv(mmc);
+ 	struct mxs_ssp *ssp = &host->ssp;
+
+-	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+-		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;
++	return host->non_removable ||
++		!(readl(ssp->base + HW_SSP_STATUS(ssp)) &
++		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
+ }
+
+ static void mxs_mmc_reset(struct mxs_mmc_host *host)
+@@ -687,8 +689,10 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA;
+ 	else if (bus_width == 8)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
++	host->non_removable = of_property_read_bool(np, "non-removable");
++	if (host->non_removable)
++		mmc->caps |= MMC_CAP_NONREMOVABLE;
+ 	host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
+-
+ 	if (flags & OF_GPIO_ACTIVE_LOW)
+ 		host->wp_inverted = 1;
+
+--
+1.8.1.5
+
diff --git a/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch b/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
new file mode 100644
index 0000000000..b5ceb0343f
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
@@ -0,0 +1,50 @@
+From 1d53196a0d604fcf636203fac21e944b6a9cf275 Mon Sep 17 00:00:00 2001
+From: Hector Palacios <hector.palacios@digi.com>
+Date: Wed, 10 Apr 2013 11:13:45 +0200
+Subject: [PATCH 3/3] mmc: mxs-mmc: add broken-cd property
+
+According to bindings documentation for mmc, the property 'broken-cd'
+can be used to indicate card-detection is not available and polling
+must be used instead. This patch retrieves this property
+and sets a custom flag. On the get_cd() hook, it returns 1 if
+the flag is set, to always assume the card is present.
+
+Signed-off-by: Hector Palacios <hector.palacios@digi.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+---
+ drivers/mmc/host/mxs-mmc.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index c231881..146a53b 100644
+--- a/drivers/mmc/host/mxs-mmc.c
++++ b/drivers/mmc/host/mxs-mmc.c
+@@ -73,6 +73,7 @@ struct mxs_mmc_host {
+ 	int				wp_gpio;
+ 	bool				wp_inverted;
+ 	bool				cd_inverted;
++	bool				broken_cd;
+ 	bool				non_removable;
+ };
+
+@@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+ 	struct mxs_mmc_host *host = mmc_priv(mmc);
+ 	struct mxs_ssp *ssp = &host->ssp;
+
+-	return host->non_removable ||
++	return host->non_removable || host->broken_cd ||
+ 		!(readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ 		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
+ }
+@@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA;
+ 	else if (bus_width == 8)
+ 		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
++	host->broken_cd = of_property_read_bool(np, "broken-cd");
+ 	host->non_removable = of_property_read_bool(np, "non-removable");
+ 	if (host->non_removable)
+ 		mmc->caps |= MMC_CAP_NONREMOVABLE;
+--
+1.8.1.5
+
diff --git a/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch b/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
new file mode 100644
index 0000000000..7ce42b902e
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
@@ -0,0 +1,28 @@
+From 1897fda94190498573f9d1b72bc6b7b58c720957 Mon Sep 17 00:00:00 2001
+From: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
+Date: Sat, 6 Apr 2013 10:42:10 -0300
+Subject: [PATCH 1/1] ARM: dts: imx23-olinuxino: mark sdcard cd as broken
+
+The imx23-olinuxino sdcard doesn't have card detect.
+
+Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+---
+ arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
+index e7484e4..d107c4a 100644
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -29,6 +29,7 @@
+ 				pinctrl-names = "default";
+ 				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+ 				bus-width = <4>;
++				broken-cd;
+ 				status = "okay";
+ 			};
+
+--
+1.8.1.5
+
diff --git a/board/olimex/imx233_olinuxino/linux-3.9.config b/board/olimex/imx233_olinuxino/linux-3.9.config
new file mode 100644
index 0000000000..eceee98386
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/linux-3.9.config
@@ -0,0 +1,188 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_PERF_EVENTS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MXS=y
+CONFIG_MACH_MXS_DT=y
+CONFIG_ARM_THUMB=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_AEABI=y
+CONFIG_ATAGS=y
+CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+# CONFIG_M25PXX_USE_FAST_READ is not set
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_UBI=y
+# CONFIG_BLK_DEV is not set
+CONFIG_EEPROM_AT24=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_NETDEVICES=y
+CONFIG_ENC28J60=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_SMSC95XX=y
+CONFIG_SMSC_PHY=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_REALTEK_PHY=y
+CONFIG_MICREL_PHY=y
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_SERIO is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MXS_AUART=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MXS=y
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_MXS=y
+CONFIG_DEBUG_GPIO=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_FB=y
+CONFIG_FB_MXS=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_MXS_SOC=y
+CONFIG_SND_SOC_MXS_SGTL5000=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_MMC=y
+CONFIG_MMC_MXS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_STMP=y
+CONFIG_DMADEVICES=y
+CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_MXS_LRADC=y
+CONFIG_IIO_SYSFS_TRIGGER=y
+CONFIG_COMMON_CLK_DEBUG=y
+CONFIG_IIO=y
+CONFIG_PWM=y
+CONFIG_PWM_MXS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_PRINTK_TIME=y
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_TIMER_STATS=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_INFO=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_DEBUG_USER=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC7=m
diff --git a/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
new file mode 100644
index 0000000000..91b57c3d74
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
@@ -0,0 +1,122 @@
+Forward-ported patch from https://github.com/koliqi/imx23-olinuxino
+for mxs-bootlets-10.12.01
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura imx-bootlets-src-10.12.01/linux_prep/board/imx23_olinuxino_dev.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/board/imx23_olinuxino_dev.c
+--- imx-bootlets-src-10.12.01/linux_prep/board/imx23_olinuxino_dev.c	1969-12-31 21:00:00.000000000 -0300
++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/board/imx23_olinuxino_dev.c	2013-05-17 15:07:33.282961551 -0300
+@@ -0,0 +1,54 @@
++/*
++ * Platform specific data for the IMX23_OLINUXINO development board
++ *
++ * Fadil Berisha <fadil.r.berisha@gmail.com>
++ *
++ * Copyright 2008 SigmaTel, Inc
++ * Copyright 2008 Embedded Alley Solutions, Inc
++ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++#include <setup.h>
++#include <keys.h>
++#include <lradc_buttons.h>
++
++/************************************************
++ * LRADC keyboard data *
++ ************************************************/
++int lradc_keypad_ch = LRADC_CH0;
++int lradc_vddio_ch = LRADC_CH6;
++
++struct lradc_keycode lradc_keycodes[] = {
++ { 100, KEY4 },
++ { 306, KEY5 },
++ { 601, KEY6 },
++ { 932, KEY7 },
++ { 1260, KEY8 },
++ { 1424, KEY9 },
++ { 1707, KEY10 },
++ { 2207, KEY11 },
++ { 2525, KEY12 },
++ { 2831, KEY13 },
++ { 3134, KEY14 },
++ { -1, 0 },
++};
++
++/************************************************
++ * Magic key combinations for Armadillo *
++ ************************************************/
++u32 magic_keys[MAGIC_KEY_NR] = {
++ [MAGIC_KEY1] = KEY4,
++ [MAGIC_KEY2] = KEY6,
++ [MAGIC_KEY3] = KEY10,
++};
++
++/************************************************
++ * Default command line *
++ ************************************************/
++char cmdline_def[] = "console=ttyAMA0,115200";
+diff -Nura imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt
+--- imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt	1969-12-31 21:00:00.000000000 -0300
++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt	2013-05-17 15:07:49.663496106 -0300
+@@ -0,0 +1,3 @@
++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
+diff -Nura imx-bootlets-src-10.12.01/linux_prep/core/setup.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c
+--- imx-bootlets-src-10.12.01/linux_prep/core/setup.c	2010-11-04 04:35:38.000000000 -0300
++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c	2013-05-17 15:08:39.246114205 -0300
+@@ -84,6 +84,8 @@
+ #include "../../mach-mx28/includes/registers/regsrtc.h"
+ #elif defined(STMP378X)
+ #include "../../mach-mx23/includes/registers/regsrtc.h"
++#elif defined(IMX23_OLINUXINO)
++#include "../../mach-mx23/includes/registers/regsrtc.h"
+ #endif
+
+ #define NAND_SECONDARY_BOOT          0x00000002
+diff -Nura imx-bootlets-src-10.12.01/linux_prep/include/mx23/platform.h imx-bootlets-src-10.12.01-olinuxino/linux_prep/include/mx23/platform.h
+--- imx-bootlets-src-10.12.01/linux_prep/include/mx23/platform.h	2010-11-04 04:35:38.000000000 -0300
++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/include/mx23/platform.h	2013-05-17 15:09:21.006476997 -0300
+@@ -19,6 +19,8 @@
+
+ #if defined (BOARD_STMP378X_DEV)
+ #define	MACHINE_ID	0xa45
++#elif defined (BOARD_IMX23_OLINUXINO_DEV)
++#define MACHINE_ID	0x1009
+ #else
+ #error "Allocate a machine ID for your board"
+ #endif
+diff -Nura imx-bootlets-src-10.12.01/linux_prep/Makefile imx-bootlets-src-10.12.01-olinuxino/linux_prep/Makefile
+--- imx-bootlets-src-10.12.01/linux_prep/Makefile	2010-11-04 04:35:38.000000000 -0300
++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/Makefile	2013-05-17 15:09:53.554539143 -0300
+@@ -69,6 +69,11 @@
+ HW_OBJS = $(LRADC_OBJS)
+ CFLAGS += -DMX28 -DBOARD_MX28_EVK
+ endif
++ifeq ($(BOARD), imx23_olinuxino_dev)
++ARCH = mx23
++HW_OBJS = $(LRADC_OBJS)
++CFLAGS += -DIMX23_OLINUXINO -DBOARD_IMX23_OLINUXINO_DEV
++endif
+
+ # Generic code
+ CORE_OBJS = entry.o resume.o cmdlines.o setup.o keys.o
+diff -Nura imx-bootlets-src-10.12.01/Makefile imx-bootlets-src-10.12.01-olinuxino/Makefile
+--- imx-bootlets-src-10.12.01/Makefile	2010-11-04 04:35:38.000000000 -0300
++++ imx-bootlets-src-10.12.01-olinuxino/Makefile	2013-05-17 15:23:53.709956619 -0300
+@@ -16,6 +16,9 @@
+ ifeq ($(BOARD), iMX28_EVK)
+ ARCH = mx28
+ endif
++ifeq ($(BOARD), imx23_olinuxino_dev)
++ARCH = mx23
++endif
+
+ all: build_prep gen_bootstream
+
diff --git a/board/olimex/imx233_olinuxino/readme.txt b/board/olimex/imx233_olinuxino/readme.txt
new file mode 100644
index 0000000000..fa3f9e15cd
--- /dev/null
+++ b/board/olimex/imx233_olinuxino/readme.txt
@@ -0,0 +1,55 @@
+This configuration is intended as a base image, it doesn't have support
+for things like WiFi, either in the kernel or packages.
+
+It also pulls up the console on the serial port, not on TV output.
+
+You'll need a spare MicroSD card with Freescale's special partition layout.
+This is basically two partitions:
+
+1) Type 53, the bootstrap + bootloader/kernel partition, should be 16MB.
+2) Anything you like, for this example an ext2 partition, type 83 (linux).
+
+Assuming you see your MicroSD card as /dev/sdc you'd need to do, as root
+and from the buildroot project top level directory:
+(remember to replace /dev/sdc* with the appropiate device name!)
+
+***** WARNING: Double check that /dev/sdc is your MicroSD card *****
+*****      It might be /dev/sdb or some other device name      *****
+***** Failure to do so may result in you wiping your hard disk *****
+
+1. Unmount the filesystem(s) if they're already mounted, usually...
+
+   # for fs in `grep /dev/sdc /proc/mounts|cut -d ' ' -f 1`;do umount $fs;done
+
+   ...should work
+
+2. Blank the partition table out
+
+   # dd if=/dev/zero of=/dev/sdc bs=1024 count=1024
+
+3. Set up the partitions
+
+   # fdisk /dev/sdc
+   n
+   p
+   1
+   <ENTER>
+   +16MB
+   t
+   53
+   n
+   p
+   2
+   <ENTER>
+   <ENTER>
+   w
+
+4. Fill up the first (bootstrap + kernel) partition
+   # dd if=output/images/imx23_olinuxino_dev_linux.sb bs=512 of=/dev/sdc1 seek=4
+
+5. Fill up the second (filesystem) partition
+   # dd if=output/images/rootfs.ext2 of=/dev/sdc2 bs=512
+
+6. Remove the MicroSD card from your linux PC and put it into your olinuxino.
+
+7. Boot! You're done!
diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig
new file mode 100644
index 0000000000..206e468609
--- /dev/null
+++ b/configs/olimex_imx233_olinuxino_defconfig
@@ -0,0 +1,33 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Patches (mxs-bootlets)
+BR2_GLOBAL_PATCH_DIR="board/olimex/imx233_olinuxino"
+
+# System
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Lock to 3.9 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_3_9=y
+
+# Bootloader
+BR2_TARGET_MXS_BOOTLETS=y
+BR2_TARGET_MXS_BOOTLETS_CUSTOM_PATCH_DIR="board/olimex/imx233_olinuxino"
+BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y
+BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME="imx23_olinuxino_dev"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.4"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/imx233_olinuxino/linux-3.9.config"
+BR2_LINUX_KERNEL_PATCH="board/olimex/imx233_olinuxino"
+BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino"

From 200b2dfa6db19c5907eaabb13411505301e9757a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 09:45:34 +0000
Subject: [PATCH 5237/6849] czmq: prevent selection when ADI Blackfin external
 toolchains are used

czmq fails to build with the Blackfin external toolchains provided by
Analog Devices, because their uClibc configuration doesn't include
AI_ADDRCONFIG. In order to prevent such build failures to happen, we
simply prevent the selection of czmq or one of its reverse
dependencies when such toolchains are used.

This fixes:

  http://autobuild.buildroot.org/results/821/82140fac4c2a2cef3f38f06cada8f17fd7f0078b/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/czmq/Config.in   | 4 ++++
 package/filemq/Config.in | 4 ++++
 package/zyre/Config.in   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index 7e4205e87a..0f16c2e2f4 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -6,6 +6,10 @@ config BR2_PACKAGE_CZMQ
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
+	# support
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	help
 	  High-level C Binding for 0MQ
 
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index d25f03f4b8..6f9fdb0c94 100644
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -8,6 +8,10 @@ config BR2_PACKAGE_FILEMQ
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
+	# support, which is needed by czmq
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	help
 	  FileMQ is a publish-subscribe file service based on 0MQ.
 
diff --git a/package/zyre/Config.in b/package/zyre/Config.in
index f181ac85cd..0ae0eec148 100644
--- a/package/zyre/Config.in
+++ b/package/zyre/Config.in
@@ -5,6 +5,10 @@ config BR2_PACKAGE_ZYRE
 	depends on BR2_LARGEFILE # filemq
 	depends on BR2_USE_WCHAR # filemq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # filemq
+	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
+	# support, needed by filemq -> czmq
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	select BR2_PACKAGE_FILEMQ
 	help
 	  An open-source framework for proximity-based peer-to-peer

From c5f9a4fb91f7a19a9a507490a8f1d3d40ab708ba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 09:45:35 +0000
Subject: [PATCH 5238/6849] libtirpc: prevent selection when ADI Blackfin
 external toolchains are used

libtirpc fails to build with the Blackfin external toolchains provided
by Analog Devices, because their uClibc configuration doesn't include
AI_ADDRCONFIG. In order to prevent such build failures to happen, we
simply prevent libtirpc from being selected when such toolchains are
used. This is not a big problem, since they provide native RPC
support.

Also, since they provide native RPC, we don't have to propagate this
new dependency to the reverse dependencies of libtirpc, because they
all use native RPC when available. The exception to this rule is the
rpcbind package, which can only use the libtirpc implementation of
RPCs, and not the native one of C libraries. Therefore, the dependency
is propagated to the rpcbind package.

Fixes:

  http://autobuild.buildroot.org/results/58b/58b16449065c16afce11ba120db56839efb2b1ea/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtirpc/Config.in | 7 +++++++
 package/rpcbind/Config.in  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
index 7e891b494f..b9db5aa4c1 100644
--- a/package/libtirpc/Config.in
+++ b/package/libtirpc/Config.in
@@ -1,5 +1,12 @@
 config BR2_PACKAGE_LIBTIRPC
 	bool "libtirpc"
+	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
+	# support. Note that since they provide native RPC support, we
+	# don't need to propagate this dependency to reverse
+	# dependencies of libtirpc for which native RPC support can be
+	# used instead of libtirpc.
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	help
 	  Libtirpc is a port of Sun's Transport-Independent RPC
 	  library to Linux.
diff --git a/package/rpcbind/Config.in b/package/rpcbind/Config.in
index 1bdcd9ed4f..cbe53af3a2 100644
--- a/package/rpcbind/Config.in
+++ b/package/rpcbind/Config.in
@@ -3,6 +3,10 @@ config BR2_PACKAGE_RPCBIND
 	# We really need libtirpc and can't work with the native RPC
 	# implementation of toolchains.
 	select BR2_PACKAGE_LIBTIRPC
+	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
+	# support, needed for libtirpc
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	help
 	  The rpcbind utility is a server that converts RPC program numbers
 	  into universal addresses.

From 8762110c46084bf7e1ba302354e8325204c7d275 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 28 May 2013 10:27:06 +0000
Subject: [PATCH 5239/6849] qt5jsbackend: only available on ARM, x86, x86-64
 and mipsel

The v8 Javascript virtual machine that is the core of qt5jsbackend is
only available on certain architectures. At the moment, only ARM, x86,
x86-64 and mipsel are supported.

Fixes:

  http://autobuild.buildroot.org/results/a2e/a2e62e2deaa28ec9d4d957523a00ee0b7a634950/build-end.log

[Peter: also add dependency for qt5graphicaleffects]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5declarative/Config.in      | 4 +++-
 package/qt5/qt5graphicaleffects/Config.in | 5 ++++-
 package/qt5/qt5jsbackend/Config.in        | 7 +++++++
 package/qt5/qt5multimedia/Config.in       | 5 ++++-
 package/qt5/qt5quick1/Config.in           | 4 +++-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index f862b94bff..93328650d5 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5BASE_EGLFS
 	depends on BR2_PACKAGE_HAS_OPENGL_EGL
 	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -15,4 +16,5 @@ config BR2_PACKAGE_QT5DECLARATIVE
 	  http://qt-project.org
 
 comment "qt5declarative requires an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+	depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+		BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index 9a32bc72fc..ed0454ad6c 100644
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
 	bool "qt5graphicaleffects"
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5DECLARATIVE
+	# qt5declarative -> qt5jsbackend
+	depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
 	depends on BR2_PACKAGE_HAS_OPENGL_EGL
 	depends on BR2_PACKAGE_HAS_OPENGL_ES
 	help
@@ -13,4 +15,5 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
 	  http://qt-project.org
 
 comment "qt5graphicaleffects requires an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+	depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+		BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
diff --git a/package/qt5/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in
index 89d506771e..2f5ac1ff51 100644
--- a/package/qt5/qt5jsbackend/Config.in
+++ b/package/qt5/qt5jsbackend/Config.in
@@ -1,6 +1,13 @@
+config BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+	bool
+	# v8 is only available on certain architectures
+	depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+	default y
+
 config BR2_PACKAGE_QT5JSBACKEND
 	bool "qt5jsbackend"
 	select BR2_PACKAGE_QT5BASE
+	depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index fd36672f0f..080cba22c1 100644
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5MULTIMEDIA
 	select BR2_PACKAGE_QT5DECLARATIVE
 	depends on BR2_PACKAGE_HAS_OPENGL_EGL
 	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	# qt5declarative -> qt5jsbackend
+	depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -13,4 +15,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA
 	  http://qt-project.org
 
 comment "qt5multimedia requires an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+	depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+		BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index 99fd5a4d80..65b1f621a2 100644
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_QT5QUICK1
 	depends on !BR2_PREFER_STATIC_LIB
 	depends on BR2_PACKAGE_HAS_OPENGL_EGL
 	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -19,4 +20,5 @@ config BR2_PACKAGE_QT5QUICK1
 	  http://qt-project.org
 
 comment "qt5quick1 requires an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+	depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+		BR2_PACKAGE_QT5JSBACKEND_AVAILABLE

From 46da491ecdd0d1cb940d3b97899e5e4af34a40c6 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Tue, 28 May 2013 21:07:18 +0000
Subject: [PATCH 5240/6849] kmod : protect against architectures without
 __NR_finit_module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This bug caused udev to fail to load any module, crashing with Illegal
instruction.

The patch was taken from upstream and should be integrated in the next
version of kmod (version 14)

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod-001-no-syscall--1.patch | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/kmod/kmod-001-no-syscall--1.patch

diff --git a/package/kmod/kmod-001-no-syscall--1.patch b/package/kmod/kmod-001-no-syscall--1.patch
new file mode 100644
index 0000000000..e7a3a11690
--- /dev/null
+++ b/package/kmod/kmod-001-no-syscall--1.patch
@@ -0,0 +1,31 @@
+From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001
+From: Jan Luebbe <jlu@pengutronix.de>
+Date: Thu, 02 May 2013 14:47:12 +0000
+Subject: libkmod: Avoid calling syscall() with -1
+
+At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an
+illegal instruction error. Solve that by returning an error when
+__NR_finit_module is -1.
+---
+diff --git a/libkmod/missing.h b/libkmod/missing.h
+index edb88b9..b45bbe2 100644
+--- a/libkmod/missing.h
++++ b/libkmod/missing.h
+@@ -20,8 +20,15 @@
+ #endif
+ 
+ #ifndef HAVE_FINIT_MODULE
++#include <errno.h>
++
+ static inline int finit_module(int fd, const char *uargs, int flags)
+ {
++	if (__NR_finit_module == -1) {
++		errno = ENOSYS;
++		return -1;
++	}
++
+ 	return syscall(__NR_finit_module, fd, uargs, flags);
+ }
+ #endif
+--
+cgit v0.9.2

From d3bde0a64edb5a3392314d2cdd2c4e4057d15831 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Tue, 28 May 2013 21:11:58 +0000
Subject: [PATCH 5241/6849] pulseaudio : bump to version 3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index b39d99e182..529f5dd278 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -3,8 +3,7 @@
 # pulseaudio
 #
 ################################################################################
-
-PULSEAUDIO_VERSION = 2.1
+PULSEAUDIO_VERSION = 3.0
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_CONF_OPT = \
@@ -60,6 +59,7 @@ endef
 PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC
 endif
 
+PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no)
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa

From 95e54f65a23fc75864a1a29f7d9ff7b7ddfc3dcb Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 29 May 2013 23:27:17 +0000
Subject: [PATCH 5242/6849] libplayer: Remove unsupported QUIET variable

Fixes the following compilation problem when building with 'make -s'

Unknown option "-q".
See ./configure --help for available options.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libplayer/libplayer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
index 8f655aedd5..511c7f690f 100644
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -18,7 +18,7 @@ define LIBPLAYER_CONFIGURE_CMDS
 		--prefix=/usr \
 		--cross-compile \
 		$(SHARED_STATIC_LIBS_OPTS) \
-		$(QUIET) $(LIBPLAYER_CONF_OPT) \
+		$(LIBPLAYER_CONF_OPT) \
 	)
 endef
 

From 7183fc0f3fefc9722bcd1f1be6ca02cdbfe0eb57 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 30 May 2013 15:33:01 +0200
Subject: [PATCH 5243/6849] Revert "pulseaudio : bump to version 3.0"

This reverts commit d3bde0a64edb5a3392314d2cdd2c4e4057d15831.

This wasn't supposed to be applied to master.
---
 package/multimedia/pulseaudio/pulseaudio.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 529f5dd278..b39d99e182 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -3,7 +3,8 @@
 # pulseaudio
 #
 ################################################################################
-PULSEAUDIO_VERSION = 3.0
+
+PULSEAUDIO_VERSION = 2.1
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_CONF_OPT = \
@@ -59,7 +60,6 @@ endef
 PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC
 endif
 
-PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no)
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa

From 14470b325935ee8a0ef8b73b33827ab633c1366f Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Thu, 30 May 2013 14:08:05 +0100
Subject: [PATCH 5244/6849] opengl: correct detection of virtual packages
 having no dependencies

I believe the original intent was to make it that the configure step
for the opengl virtual packages fails if there is not at least one
dependency. This patch fixes the logic so that it actually fails if
dependency list is empty

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opengl/libegl/libegl.mk       | 2 +-
 package/opengl/libgles/libgles.mk     | 2 +-
 package/opengl/libopenvg/libopenvg.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index c4954963c8..8ff24e886a 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -10,7 +10,7 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBEGL_DEPENDENCIES += rpi-userland
 endif
 
-ifeq ($(LIBEGL_DEPENDENCIES),y)
+ifeq ($(LIBEGL_DEPENDENCIES),)
 define LIBEGL_CONFIGURE_CMDS
 	echo "No libEGL implementation selected. Configuration error."
 	exit 1
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index f0d0eec9c3..675d11fd35 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -10,7 +10,7 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBGLES_DEPENDENCIES += rpi-userland
 endif
 
-ifeq ($(LIBGLES_DEPENDENCIES),y)
+ifeq ($(LIBGLES_DEPENDENCIES),)
 define LIBGLES_CONFIGURE_CMDS
 	echo "No libGLES implementation selected. Configuration error."
 	exit 1
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
index 573fa786dd..746b52c9a9 100644
--- a/package/opengl/libopenvg/libopenvg.mk
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -10,7 +10,7 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBOPENVG_DEPENDENCIES += rpi-userland
 endif
 
-ifeq ($(LIBOPENVG_DEPENDENCIES),y)
+ifeq ($(LIBOPENVG_DEPENDENCIES),)
 define LIBOPENVG_CONFIGURE_CMDS
 	echo "No libOpenVG implementation selected. Configuration error."
 	exit 1

From 03bc3c3bdcffbef498b9072e9cd1c079fd0dd26a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 25 May 2013 10:33:32 +0000
Subject: [PATCH 5245/6849] system/device-table: do not set /home/default stgid

Currently, /home/default is mode 2755 which means it is setgid.
Since /home/default is not group-writable, it is useless.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/device_table.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/device_table.txt b/system/device_table.txt
index 421728b085..43c0cfa0b4 100644
--- a/system/device_table.txt
+++ b/system/device_table.txt
@@ -9,7 +9,7 @@
 /dev					d	755	0	0	-	-	-	-	-
 /tmp					d	1777	0	0	-	-	-	-	-
 /etc					d	755	0	0	-	-	-	-	-
-/home/default				d	2755	1000	1000	-	-	-	-	-
+/home/default				d	755	1000	1000	-	-	-	-	-
 /var/www				d	755	33	33	-	-	-	-	-
 /etc/shadow				f	600	0	0	-	-	-	-	-
 /etc/passwd				f	644	0	0	-	-	-	-	-

From 1460245354019df29ffc4c3d76ddd61cb14dfd04 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Sun, 26 May 2013 12:12:20 -0500
Subject: [PATCH 5246/6849] libvpx: new package libvpx

adds webm multimedia support and the VP8 encoder/decoder library.

http://www.webmproject.org/

[Peter: strip trailing spaces, wrap help text]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in        |  1 +
 package/multimedia/libvpx/Config.in |  7 ++++
 package/multimedia/libvpx/libvpx.mk | 53 +++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 package/multimedia/libvpx/Config.in
 create mode 100644 package/multimedia/libvpx/libvpx.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 931e6d39a2..dd74863fde 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -15,6 +15,7 @@ source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/lame/Config.in"
+source "package/multimedia/libvpx/Config.in"
 source "package/multimedia/madplay/Config.in"
 source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
diff --git a/package/multimedia/libvpx/Config.in b/package/multimedia/libvpx/Config.in
new file mode 100644
index 0000000000..1332c564a8
--- /dev/null
+++ b/package/multimedia/libvpx/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBVPX
+	bool "libvpx"
+	help
+	  A high-quality, open video format that's freely available to
+	  everyone.
+
+	  http://webmproject.org
diff --git a/package/multimedia/libvpx/libvpx.mk b/package/multimedia/libvpx/libvpx.mk
new file mode 100644
index 0000000000..131fd49fad
--- /dev/null
+++ b/package/multimedia/libvpx/libvpx.mk
@@ -0,0 +1,53 @@
+#############################################################
+#
+# libvpx
+#
+#############################################################
+
+LIBVPX_VERSION = v1.2.0
+LIBVPX_SITE = http://git.chromium.org/webm/libvpx.git
+LIBVPX_SITE_METHOD = git
+
+LIBVPX_LICENSE = BSD-3c
+LIBVPX_LICENSE_FILES = LICENSE PATENTS
+
+LIBVPX_INSTALL_STAGING = YES
+
+# ld is being used with cc options. therefore, pretend ld is cc.
+LIBVPX_CONF_ENV = \
+	LD="$(TARGET_CC)" \
+	CROSS=$(GNU_TARGET_NAME)
+
+LIBVPX_CONF_OPT = \
+	--disable-examples \
+	--disable-docs \
+	--disable-unit-tests
+
+# This is not a true autotools package.  It is based on the ffmpeg build system
+define LIBVPX_CONFIGURE_CMDS
+	(cd $(LIBVPX_SRCDIR) && rm -rf config.cache && \
+	$(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_CONFIGURE_ARGS) \
+	$(LIBVPX_CONF_ENV) \
+	./configure \
+		--target=generic-gnu \
+		--enable-pic \
+		--prefix=/usr \
+		$(SHARED_STATIC_LIBS_OPTS) \
+		$(LIBVPX_CONF_OPT) \
+	)
+endef
+
+define LIBVPX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) -C $(@D) all
+endef
+
+define LIBVPX_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install
+endef
+
+define LIBVPX_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
+endef
+
+$(eval $(generic-package))

From 37f6ecd4d02d1e0fdce70fe4a7b404a6e2d06426 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 30 May 2013 06:30:36 +0000
Subject: [PATCH 5247/6849] libopenmax: Add libopenmax virtual package

this adds the libopenmax virtual package for hardware based video acceleration

[Peter: fix openmax-without-any-backends check]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/bellagio/Config.in   |  1 +
 package/opengl/Config.in                |  3 +++
 package/opengl/libopenmax/libopenmax.mk | 24 ++++++++++++++++++++++++
 package/rpi-userland/Config.in          |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 package/opengl/libopenmax/libopenmax.mk

diff --git a/package/multimedia/bellagio/Config.in b/package/multimedia/bellagio/Config.in
index 1458f63702..d918f80ce3 100644
--- a/package/multimedia/bellagio/Config.in
+++ b/package/multimedia/bellagio/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BELLAGIO
 	bool "bellagio"
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_HAS_OPENMAX
 	help
 	  Bellagio is an opensource implementation of the
 	  OpenMAX IL API.
diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index 81616f99fb..1636807a84 100644
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -6,3 +6,6 @@ config BR2_PACKAGE_HAS_OPENGL_ES
 
 config BR2_PACKAGE_HAS_OPENVG
 	bool
+
+config BR2_PACKAGE_HAS_OPENMAX
+	bool
diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk
new file mode 100644
index 0000000000..430760208c
--- /dev/null
+++ b/package/opengl/libopenmax/libopenmax.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# Virtual package for libopenmax
+#
+#############################################################
+
+LIBOPENMAX_SOURCE =
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+LIBOPENMAX_DEPENDENCIES += rpi-userland
+endif
+
+ifeq ($(BR2_PACKAGE_BELLAGIO),y)
+LIBOPENMAX_DEPENDENCIES += bellagio
+endif
+
+ifeq ($(LIBOPENMAX_DEPENDENCIES),)
+define LIBOPENMAX_CONFIGURE_CMDS
+	echo "No libopenmax implementation selected. Configuration error."
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 2c35fb76c8..da5726f2e4 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_RPI_USERLAND
 	select BR2_PACKAGE_HAS_OPENGL_EGL
 	select BR2_PACKAGE_HAS_OPENGL_ES
 	select BR2_PACKAGE_HAS_OPENVG
+	select BR2_PACKAGE_HAS_OPENMAX
 	help
 	  Raspberry Pi Userland contains the necessary library to use the
 	  VideoCore driver.

From a94650c184f78620eb63d2d25065c4ea3ceec8d8 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 26 May 2013 23:16:55 +0000
Subject: [PATCH 5248/6849] neard: add init script

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neard/S53neard | 33 +++++++++++++++++++++++++++++++++
 package/neard/neard.mk |  9 +++++++++
 2 files changed, 42 insertions(+)
 create mode 100755 package/neard/S53neard

diff --git a/package/neard/S53neard b/package/neard/S53neard
new file mode 100755
index 0000000000..0a75941e27
--- /dev/null
+++ b/package/neard/S53neard
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Starts neard
+#
+
+NAME=neard
+DAEMON=/usr/libexec/nfc/$NAME
+
+# Exit gracefully if the package has been removed
+[ -x $DAEMON ] || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting $NAME: "
+    start-stop-daemon -S -q -p /var/run/${NAME}.pid -x $DAEMON -- -d '*'
+    echo "OK"
+    ;;
+  stop)
+    echo -n "Stopping $NAME: "
+    start-stop-daemon -K -q -p /var/run/${NAME}.pid
+    echo "OK"
+    ;;
+  restart|reload)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
+
+exit $?
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index cc6aeacae0..57a434dd58 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -17,4 +17,13 @@ ifeq ($(BR2_PACKAGE_NEARD_TOOLS),y)
 	NEARD_CONF_OPT += --enable-tools
 endif
 
+define NEARD_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/neard/S53neard \
+		$(TARGET_DIR)/etc/init.d/S53neard
+endef
+
+define NEARD_UNINSTALL_INIT_SYSV
+	$(RM) $(TARGET_DIR)/etc/init.d/S53neard
+endef
+
 $(eval $(autotools-package))

From 0d4133edfedd8ca641db39d3eec9dc7146c8fa4e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:01:00 +0000
Subject: [PATCH 5249/6849] gettext: don't patch different the host and target
 build

Until now, the gettext source code was being patched differently for
the host and the target build, which is going to be incompatible with
out-of-tree build. The difference is that the gettext tools could be
disabled in the target build, but are always enabled on the host
build.

Therefore, this commit switches the gettext package to using proper
patches against the relevant configure.ac and Makefile.am
files. gettext is now being autoreconfigured. Configuration options
are also passed for the host variant, in order to disable the build of
a large number of things we don't care about.

Finally, the two existing patches are renamed to include a number in
their filename.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ... => gettext-01-error_print_progname.patch} |  0
 ... => gettext-02-fix_rpl_gettimeofday.patch} |  0
 .../gettext-03-option-to-disable-tools.patch  | 42 +++++++++++++++++++
 .../gettext-04-remove-examples-tests.patch    | 20 +++++++++
 package/gettext/gettext-05-use-shell.patch    | 25 +++++++++++
 package/gettext/gettext.mk                    | 26 ++++++------
 6 files changed, 101 insertions(+), 12 deletions(-)
 rename package/gettext/{gettext-error_print_progname.patch => gettext-01-error_print_progname.patch} (100%)
 rename package/gettext/{gettext-fix_rpl_gettimeofday.patch => gettext-02-fix_rpl_gettimeofday.patch} (100%)
 create mode 100644 package/gettext/gettext-03-option-to-disable-tools.patch
 create mode 100644 package/gettext/gettext-04-remove-examples-tests.patch
 create mode 100644 package/gettext/gettext-05-use-shell.patch

diff --git a/package/gettext/gettext-error_print_progname.patch b/package/gettext/gettext-01-error_print_progname.patch
similarity index 100%
rename from package/gettext/gettext-error_print_progname.patch
rename to package/gettext/gettext-01-error_print_progname.patch
diff --git a/package/gettext/gettext-fix_rpl_gettimeofday.patch b/package/gettext/gettext-02-fix_rpl_gettimeofday.patch
similarity index 100%
rename from package/gettext/gettext-fix_rpl_gettimeofday.patch
rename to package/gettext/gettext-02-fix_rpl_gettimeofday.patch
diff --git a/package/gettext/gettext-03-option-to-disable-tools.patch b/package/gettext/gettext-03-option-to-disable-tools.patch
new file mode 100644
index 0000000000..24a99965bc
--- /dev/null
+++ b/package/gettext/gettext-03-option-to-disable-tools.patch
@@ -0,0 +1,42 @@
+Add a --disable-tools option
+
+This patch adds a --disable-tools option that allows to disable the
+compilation of the gettext tools, which may not be necessary on a
+small embedded Linux system.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,6 +37,10 @@
+ 
+ dnl Checks for library functions.
+ 
++AC_ARG_ENABLE([tools], [--disable-tools  do not build tools],
++		       [enable_tools=$enableval], [enable_tools=yes])
++AM_CONDITIONAL([ENABLE_TOOLS], [test "$enable_tools" = "yes"])
++
+ AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
+ 
+ dnl Ensure that "configure --help" lists all the command line options that
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,13 @@
+ ACLOCAL = build-aux/fixaclocal @ACLOCAL@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = gnulib-local gettext-runtime gettext-tools
++if ENABLE_TOOLS
++TOOLS_SUBDIR = gettext-tools
++else
++TOOLS_SUBDIR =
++endif
++
++SUBDIRS = gnulib-local gettext-runtime $(TOOLS_SUBDIR)
+ 
+ EXTRA_DIST = \
+   version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
diff --git a/package/gettext/gettext-04-remove-examples-tests.patch b/package/gettext/gettext-04-remove-examples-tests.patch
new file mode 100644
index 0000000000..f7d88d9804
--- /dev/null
+++ b/package/gettext/gettext-04-remove-examples-tests.patch
@@ -0,0 +1,20 @@
+Disable tests and examples
+
+This patch disables the gettext-tools tests and examples, which are
+generally not necessary.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/gettext-tools/Makefile.am
+===================================================================
+--- a/gettext-tools/Makefile.am
++++ b/gettext-tools/Makefile.am
+@@ -20,7 +20,7 @@
+ ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+ 
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
+ 
+ EXTRA_DIST = misc/DISCLAIM
+ MOSTLYCLEANFILES = core *.stackdump
diff --git a/package/gettext/gettext-05-use-shell.patch b/package/gettext/gettext-05-use-shell.patch
new file mode 100644
index 0000000000..5f6e2c268b
--- /dev/null
+++ b/package/gettext/gettext-05-use-shell.patch
@@ -0,0 +1,25 @@
+gettext-runtime: use @SHELL@ for the SHELL variable definition
+
+The gettext-runtime/Makefile.in uses an hardcoded SHELL = /bin/sh
+variable. This causes problems at build time, because libtool is then
+called with the 'sh' shell, which does not support the += construct
+that the libtool script is using.
+
+Instead, this Makefile.in should be definining SHELL = @SHELL@, just
+like all other Makefile.in of gettext.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/gettext-runtime/intl/Makefile.in
+===================================================================
+--- a/gettext-runtime/intl/Makefile.in
++++ b/gettext-runtime/intl/Makefile.in
+@@ -17,7 +17,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-SHELL = /bin/sh
++SHELL = @SHELL@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 8dc701e044..90619287b7 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -9,11 +9,25 @@ GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+
 GETTEXT_LICENSE_FILES = COPYING
+GETTEXT_AUTORECONF = YES
+HOST_GETTEXT_AUTORECONF = YES
 
 GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
 
 GETTEXT_CONF_OPT += \
+	--disable-libasprintf \
+	--disable-acl \
+	--disable-openmp \
+	--disable-rpath \
+	--disable-java \
+	--disable-native-java \
+	--disable-csharp \
+	--disable-relocatable \
+	--without-emacs \
+	--disable-tools
+
+HOST_GETTEXT_CONF_OPT = \
 	--disable-libasprintf \
 	--disable-acl \
 	--disable-openmp \
@@ -42,19 +56,7 @@ define GETTEXT_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
 endef
 endif
-# Ditch the tools since they're off and pull other dependencies
-define GETTEXT_DISABLE_TOOLS
-	$(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in
-endef
 endif # GETTEXT_TOOLS = n
 
-# The tools tests build fails with full toolchain without threads
-define GETTEXT_DISABLE_TESTS
-	$(SED) 's/m4 tests/m4/' $(@D)/gettext-tools/Makefile.in
-endef
-
-GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
-GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TESTS
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From dc3e6500577b18309699e957257f2d4966790c83 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:01:01 +0000
Subject: [PATCH 5250/6849] binutils: apply post-patch hook on both the host
 and target builds

When a Xtensa specific patch needs to be applied, it should be applied
both when doing the target and the host build.

This change is part of the effort to remove the differences between
host and target post-extract and post-patch hooks, that are
problematic for the out-of-tree support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/binutils.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 081be6ad4b..a2c4150c9b 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -81,6 +81,7 @@ define BINUTILS_XTENSA_PRE_PATCH
 	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
 		-C $(@D) --strip-components=1 binutils
 endef
+BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
 HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
 endif
 

From 4378648aaff35fffb04dc44b0cd5caf762c73737 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:01:03 +0000
Subject: [PATCH 5251/6849] libgtk2: remove useless post-patch hook

There used to be a post-patch hook to apply a patch only on the host
variant of libgtk2. However, after the reorganization of the patch
naming policy, this was no longer working properly, so
dd1848bc73ee9dfe211ca3ed3a233707e3bc5955 changed this by a patch that
works on both the target and host variants.

We can therefore get rid of the useless post-patch hook.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/libgtk2.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index b1ce99ae17..5881ea78ab 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -175,12 +175,6 @@ HOST_LIBGTK2_CONF_OPT = \
 		--disable-cups \
 		--disable-debug
 
-define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
- support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
-endef
-
-HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
-
 define HOST_LIBGTK2_BUILD_CMDS
  $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
 endef

From f0e3147ee52b274ad887e59450d8a20427ea75f6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:01:04 +0000
Subject: [PATCH 5252/6849] xlib_libX11: ensure target and host variant have
 the same patch hooks

In preparation for the out-of-tree support, it is important that all
packages have the same patch hooks for the host variant and the target
variant (because the source tree will be shared between host and
target variants when doing out-of-tree build).

In the case of the xlib_libX11 package, the post-patch hook removes
some flags from the build of the makekeys utility, so that when
xlib_libX11 is built for the target, the build of makekeys for the
host works properly. This modification can be applied to the host
variant of xlib_libX11 without any problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libX11/xlib_libX11.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 3b106cd999..f801673046 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -41,6 +41,7 @@ define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 endef
 
 XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
+HOST_XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 7b6c61d07f180805c1461754f685ecbd76efa3f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 27 May 2013 13:01:02 +0000
Subject: [PATCH 5253/6849] gutenprint: ensure target and host variant have the
 same patch hooks

In preparation for the out-of-tree support, it is important that all
packages have the same patch hooks for the host variant and the target
variant (because the source tree will be shared between host and
target variants when doing out-of-tree build).

In the case of gutenprint, the patch hook executed for the target just
creates one directory which is needed for autoreconf to work, and the
host variant is not autoreconf'ed. So there is no harm in also
applying this patch hook to the host variant.

[Peter: autoreconf for host as pointed out by Arnout]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gutenprint/gutenprint.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 0463771381..b5d350dfda 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -12,6 +12,7 @@ GUTENPRINT_LICENSE_FILES = COPYING
 
 # Needed, as we touch Makefile.am
 GUTENPRINT_AUTORECONF = YES
+HOST_GUTENPRINT_AUTORECONF = YES
 
 GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
@@ -58,6 +59,7 @@ define GUTENPRINT_CREATE_M4_DIR
 	mkdir -p $(@D)/m4local
 endef
 GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
+HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
 
 define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
 	cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include

From db3efd92adfc1c86811d8d664e8e979a82c49944 Mon Sep 17 00:00:00 2001
From: Wojciech Slenska <wojciech.slenska@gmail.com>
Date: Wed, 15 May 2013 10:34:44 +0000
Subject: [PATCH 5254/6849] qt5: add libQt5OpenGL.so library installation

When qt5 is built with EGLFS support, libQt5OpenGL library should be copied to
target.

Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index bfc6c911e8..7c6a093bc1 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -118,6 +118,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5OpenGL
 
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets

From 64e04fb27a9a0a4fcc519bcc7344a67009490a91 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Tue, 28 May 2013 21:11:57 +0000
Subject: [PATCH 5255/6849] libtool : bump to version 2.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtool/libtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 6f0b904646..25cd89dd81 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -3,7 +3,7 @@
 # libtool
 #
 #############################################################
-LIBTOOL_VERSION = 2.2.10
+LIBTOOL_VERSION = 2.4.2
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
 LIBTOOL_INSTALL_STAGING = YES

From ac23d50496d590026fe5ae140bc5e98e72f208e3 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Tue, 28 May 2013 21:11:58 +0000
Subject: [PATCH 5256/6849] pulseaudio : bump to version 3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 16df855557..f171fb986f 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -3,8 +3,7 @@
 # pulseaudio
 #
 ################################################################################
-
-PULSEAUDIO_VERSION = 2.1
+PULSEAUDIO_VERSION = 3.0
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_CONF_OPT = \
@@ -47,6 +46,7 @@ endef
 PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC
 endif
 
+PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no)
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa

From 3e037134a4d4e0429a413e80f345291118e8157d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 14 May 2013 11:45:57 +0000
Subject: [PATCH 5257/6849] package/pmake: force argv[0]=${0} in the pmake
 wrapper

This forces bmake to call the wrapper, not itself.
Also, use consistent "${0/*}" instead of "${0/pmake}".

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pmake/pmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk
index 7b2e5a6efa..50613e8d4d 100644
--- a/package/pmake/pmake.mk
+++ b/package/pmake/pmake.mk
@@ -39,7 +39,7 @@ define HOST_PMAKE_INSTALL_CMDS
 	for mk in $(@D)/mk/*; do                                        \
 	    $(INSTALL) -m 0644 $${mk} $(HOST_DIR)/usr/share/pmake/mk;   \
 	done
-	printf '#!/bin/sh\nexec $${0%%/*}/bmake -m $${0%%/pmake}/../../usr/share/pmake/mk "$$@"\n'  \
+	printf '#!/bin/bash\nexec -a "$${0}" $${0%%/*}/bmake -m $${0%%/*}/../../usr/share/pmake/mk "$$@"\n'  \
 	       >$(HOST_DIR)/usr/bin/pmake
 	chmod 0755 $(HOST_DIR)/usr/bin/pmake
 endef

From d39f6da03c7b2179d0218293f18a0b08693c3fc9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 14 May 2013 11:45:58 +0000
Subject: [PATCH 5258/6849] package/libedit: new package

[Peter: rename to libedit]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libedit/Config.in  |  9 +++++
 package/libedit/libedit.mk | 75 ++++++++++++++++++++++++++++++++++++++
 package/libedit/libedit.pc | 13 +++++++
 4 files changed, 98 insertions(+)
 create mode 100644 package/libedit/Config.in
 create mode 100644 package/libedit/libedit.mk
 create mode 100644 package/libedit/libedit.pc

diff --git a/package/Config.in b/package/Config.in
index ab6df09a95..428aabaaee 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -621,6 +621,7 @@ menu "Text and terminal handling"
 source "package/enchant/Config.in"
 source "package/libfribidi/Config.in"
 source "package/icu/Config.in"
+source "package/libedit/Config.in"
 source "package/libiconv/Config.in"
 source "package/linenoise/Config.in"
 source "package/ncurses/Config.in"
diff --git a/package/libedit/Config.in b/package/libedit/Config.in
new file mode 100644
index 0000000000..b49c23cadd
--- /dev/null
+++ b/package/libedit/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBEDIT
+	bool "libedit"
+	select BR2_PACKAGE_LIBBSD
+	select BR2_PACKAGE_NCURSES
+	help
+	  The editline library (from BSD) provides generic line editing
+	  and history functions. It slightly resembles GNU readline.
+
+	  http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/
diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
new file mode 100644
index 0000000000..575ca49408
--- /dev/null
+++ b/package/libedit/libedit.mk
@@ -0,0 +1,75 @@
+#############################################################
+#
+# libedit
+#
+#############################################################
+
+# Note: libedit does not have a regular homepage, and it seems
+# there is no place where to download a tarball from. That's
+# why we use the Debian way-back machine.
+LIBEDIT_VERSION_MAJOR   = 2
+LIBEDIT_VERSION_MINOR   = 11
+LIBEDIT_VERSION_EXTRA   = -20080614
+LIBEDIT_VERSION         = $(LIBEDIT_VERSION_MAJOR).$(LIBEDIT_VERSION_MINOR)
+LIBEDIT_SOURCE          = libedit_$(LIBEDIT_VERSION)$(LIBEDIT_VERSION_EXTRA).orig.tar.bz2
+LIBEDIT_SITE            = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/libe/libedit
+LIBEDIT_SUBDIR          = libedit
+LIBEDIT_PATCH           = libedit_2.11-20080614-5.debian.tar.bz2
+LIBEDIT_INSTALL_STAGING = YES
+LIBEDIT_DEPENDENCIES    = host-pmake libbsd ncurses
+
+define LIBEDIT_POST_PATCH_PERMISSIONS
+	chmod +x $(@D)/libedit/makelist
+endef
+
+LIBEDIT_POST_PATCH_HOOKS += LIBEDIT_POST_PATCH_PERMISSIONS
+
+define LIBEDIT_FIX_VIS_H_INCLUDE
+	$(SED) 's,^#include <vis\.h>$$,#include <bsd/vis\.h>,;' \
+	       $(@D)/libedit/filecomplete.c                     \
+	       $(@D)/libedit/history.c                          \
+	       $(@D)/libedit/readline.c
+endef
+LIBEDIT_POST_PATCH_HOOKS += LIBEDIT_FIX_VIS_H_INCLUDE
+
+LIBEDIT_PMAKE_OPTS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= NOGCCERROR=1         \
+                      SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${LIBEDIT_VERSION_MAJOR}"  \
+
+define LIBEDIT_BUILD_CMDS
+	cd $(@D)/$(LIBEDIT_SUBDIR); \
+	$(TARGET_CONFIGURE_OPTS) LDADD="-lbsd -lcurses" pmake $(LIBEDIT_PMAKE_OPTS)
+endef
+
+LIBEDIT_MAN_LINKS = el_init el_end el_reset el_gets el_getc el_push el_parse   \
+                     el_set el_get el_source el_resize el_line el_insertstr     \
+                     el_deletestr history_init history_end history
+
+# $1: DESTDIR to install into
+# Can't use pmake to install, it wants to be root. sigh... :-(
+# We need to create the .so links, otherwise we can't link; and waiting for
+# ldconfig is too late as it's done just before building the images.
+define LIBEDIT_INSTALL_CMDS
+	$(INSTALL) -D -m 0644 package/libedit/libedit.pc $(1)/usr/lib/pkgconfig/libedit.pc
+	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.a $(1)/usr/lib/libedit.a
+	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit_pic.a $(1)/usr/lib/libedit_pic.a
+	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.so.2.11 $(1)/usr/lib/libedit.so.2.11
+	$(INSTALL) -D -m 0644 $(@D)/libedit/histedit.h $(1)/usr/include/histedit.h
+	ln -sf libedit.so.$(LIBEDIT_VERSION) $(1)/usr/lib/libedit.so.$(LIBEDIT_VERSION_MAJOR)
+	ln -sf libedit.so.$(LIBEDIT_VERSION_MAJOR) $(1)/usr/lib/libedit.so
+	$(INSTALL) -D -m 0644 $(@D)/libedit/readline/readline.h $(1)/usr/include/editline/readline.h
+	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editline.3 $(1)/usr/share/man/man3/editline.3el
+	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editrc.5 $(1)/usr/share/man/man5/editrc.5el
+	for lnk in $(LIBEDIT_MAN_LINKS); do                            \
+	    ln -sfv editline.3el $(1)/usr/share/man/man3/$${lnk}.3el;   \
+	done
+endef
+
+define LIBEDIT_INSTALL_STAGING_CMDS
+	$(call LIBEDIT_INSTALL_CMDS,$(STAGING_DIR))
+endef
+
+define LIBEDIT_INSTALL_TARGET_CMDS
+	$(call LIBEDIT_INSTALL_CMDS,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/package/libedit/libedit.pc b/package/libedit/libedit.pc
new file mode 100644
index 0000000000..47ac871bc1
--- /dev/null
+++ b/package/libedit/libedit.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libedit
+Description: Not just a replacement library for libreadline and libhistory.
+Version: 2.11
+Requires: libbsd ncurses
+Requires.private:
+Libs: -L${libdir} -ledit
+Libs.private:
+Cflags: -I${includedir}

From 164b90649b4f34c3e7cd1b6ded46c921db4fc2f1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 14 May 2013 11:45:59 +0000
Subject: [PATCH 5259/6849] package/snappy: new package

[Peter: needs C++ support]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/snappy/Config.in | 13 +++++++++++++
 package/snappy/snappy.mk | 13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/snappy/Config.in
 create mode 100644 package/snappy/snappy.mk

diff --git a/package/Config.in b/package/Config.in
index 428aabaaee..4233ff23ba 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -386,6 +386,7 @@ endmenu
 menu "Compression and decompression"
 source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
+source "package/snappy/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
diff --git a/package/snappy/Config.in b/package/snappy/Config.in
new file mode 100644
index 0000000000..36093bc6ad
--- /dev/null
+++ b/package/snappy/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_SNAPPY
+	bool "snappy"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Snappy is a compression/decompression library. It does not aim for
+	  maximum compression, or compatibility with any other compression
+	  library; instead, it aims for very high speeds and reasonable
+	  compression.
+
+	  http://code.google.com/p/snappy/
+
+comment "snappy requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk
new file mode 100644
index 0000000000..2704b9764f
--- /dev/null
+++ b/package/snappy/snappy.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# snappy
+#
+#############################################################
+
+SNAPPY_VERSION		= 1.1.0
+SNAPPY_SITE		= http://snappy.googlecode.com/files/
+SNAPPY_LICENSE		= BSD-3c
+SNAPPY_LICENSE_FILES	= COPYING
+SNAPPY_INSTALL_STAGING	= YES
+
+$(eval $(autotools-package))

From 0b78baafbda4b97c96793231f559735139506ee1 Mon Sep 17 00:00:00 2001
From: Wojciech Slenska <wojciech.slenska@gmail.com>
Date: Tue, 28 May 2013 09:05:37 +0000
Subject: [PATCH 5260/6849] qt5: mysql and sqlite plugins

Added support for mysql and sqlite plugins. Configuration is based on qt package.

[Peter: strip trailing spaces]
Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/Config.in  | 36 ++++++++++++++++++++++++++++++++++
 package/qt5/qt5base/qt5base.mk | 15 ++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 7974357118..9c7fd15da0 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
 	help
 	  This options enables the Qt5Sql library.
 
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+	bool "MySQL Plugin"
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	depends on BR2_USE_MMU # mysql
+	help
+	  Build MySQL plugin
+	  If unsure, say n.
+choice
+	prompt "SQLite 3 support"
+	default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	help
+	  Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	bool "No sqlite support"
+	help
+	  Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+	bool "Qt SQLite"
+	help
+	  Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+	bool "System SQLite"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Use system SQLite.
+
+endchoice
+
+endif
+
 config BR2_PACKAGE_QT5BASE_TEST
 	bool "test module"
 	help
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 7c6a093bc1..cfa06ea1ec 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -60,6 +60,21 @@ QT5BASE_LICENSE = Commercial license
 QT5BASE_REDISTRIBUTE = NO
 endif
 
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
+QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
+QT5BASE_DEPENDENCIES   += mysql_client
+else
+QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
+endif
+
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
+endif
+
 # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
 # is to add a link against the "inuxfb" library.
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)

From ed09a3601dd0b594defb6406b5f5816511ad154a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 31 May 2013 13:56:59 +0200
Subject: [PATCH 5261/6849] gcc: bump 4.8.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/{4.8.0 => 4.8.1}/100-uclibc-conf.patch            | 0
 toolchain/gcc/{4.8.0 => 4.8.1}/301-missing-execinfo_h.patch     | 0
 toolchain/gcc/{4.8.0 => 4.8.1}/302-c99-snprintf.patch           | 0
 .../gcc/{4.8.0 => 4.8.1}/305-libmudflap-susv3-legacy.patch      | 0
 toolchain/gcc/{4.8.0 => 4.8.1}/810-arm-softfloat-libgcc.patch   | 0
 toolchain/gcc/{4.8.0 => 4.8.1}/830-arm_unbreak_armv4t.patch     | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 toolchain/gcc/Config.in                                         | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/100-uclibc-conf.patch (100%)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/301-missing-execinfo_h.patch (100%)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/302-c99-snprintf.patch (100%)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/305-libmudflap-susv3-legacy.patch (100%)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/810-arm-softfloat-libgcc.patch (100%)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/830-arm_unbreak_armv4t.patch (100%)
 rename toolchain/gcc/{4.8.0 => 4.8.1}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/toolchain/gcc/4.8.0/100-uclibc-conf.patch b/toolchain/gcc/4.8.1/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.8.0/100-uclibc-conf.patch
rename to toolchain/gcc/4.8.1/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.8.1/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.8.0/301-missing-execinfo_h.patch
rename to toolchain/gcc/4.8.1/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.8.0/302-c99-snprintf.patch b/toolchain/gcc/4.8.1/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.8.0/302-c99-snprintf.patch
rename to toolchain/gcc/4.8.1/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch
rename to toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch
rename to toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch
rename to toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional
rename to toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f297e73871..fdb19e1052 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -83,7 +83,7 @@ config BR2_GCC_VERSION
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
-	default "4.8.0"     if BR2_GCC_VERSION_4_8_X
+	default "4.8.1"     if BR2_GCC_VERSION_4_8_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

From fb2f3d58bde6aaac12b62eeb16492c93329b8713 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 31 May 2013 02:27:16 +0000
Subject: [PATCH 5262/6849] iptables: bump to version 1.4.19.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index ed11fdc040..5a21412c8a 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPTABLES_VERSION = 1.4.18
+IPTABLES_VERSION = 1.4.19.1
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES

From 74ae7af927da3e807e1e3b9a68a4bb1fed5243bb Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Tue, 28 May 2013 23:41:19 +0000
Subject: [PATCH 5263/6849] ext-toolchain-wrapper: fix paths if executable was
 resolved by PATH

If ext-toolchain-wrapper or any symbolic link to it was resolved by PATH,
the wrapper takes the working directory to calculate the relative paths.

Now '/proc/self/exe' is used to resolve the absolute path to the toolchain
directory if the wrapper was called neither with a relative nor an absolute
path.

[Peter: fix off-by-one, swap value == var checks around]
Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../toolchain-external/ext-toolchain-wrapper.c  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 9a2fc70b02..9d79d68adf 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 	char *relbasedir, *absbasedir;
 	char *progpath = argv[0];
 	char *basename;
-	int ret;
+	int ret, i, count = 0;
 
 	/* Calculate the relative paths */
 	basename = strrchr(progpath, '/');
@@ -77,7 +77,20 @@ int main(int argc, char **argv)
 		absbasedir = realpath(relbasedir, NULL);
 	} else {
 		basename = progpath;
-		absbasedir = realpath("../..", NULL);
+		absbasedir = malloc(PATH_MAX + 1);
+		ret = readlink("/proc/self/exe", absbasedir, PATH_MAX);
+		if (ret < 0) {
+			perror(__FILE__ ": readlink");
+			return 2;
+		}
+		absbasedir[ret] = '\0';
+		for (i = ret; i > 0; i--) {
+			if (absbasedir[i] == '/') {
+				absbasedir[i] = '\0';
+				if (++count == 3)
+					break;
+			}
+		}
 	}
 	if (absbasedir == NULL) {
 		perror(__FILE__ ": realpath");

From 93252e70cb5afeca1a8da1eaa8a578b80e5c1bbf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 31 May 2013 22:19:00 +0200
Subject: [PATCH 5264/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 58142674ca..4884a5972f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,16 @@
 
 	Minor fixes.
 
-	Updated/fixed packages: elf2flt, flex, udpcast
+	External toolchain wrapper fix for if host/usr/bin is placed
+	in the patch.
+
+	Updated/fixed packages: acpid, at91bootstrap, czmq, elf2flt,
+	flex, jamvm, kmod, libplayer, libtirpc, libv4,
+	lttng-babeltrace, opengl, qt5jsbackend, udpcast, wvstreams
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#4868: Buildroot compile failure for toolchain/gdb-7.4/intl/reloc...
 	#4988: flex and m4 problems
 	#5912: obsolete CVS files
 

From 26b11df79c59bb77599aeb84daf075ff3f2fc82a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 31 May 2013 22:24:52 +0200
Subject: [PATCH 5265/6849] Update copyright info for 2013

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile           | 2 +-
 docs/copyright.txt | 2 +-
 docs/footer.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e8647d1f64..d172bb478e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for buildroot2
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2006-2012 by the Buildroot developers <buildroot@uclibc.org>
+# Copyright (C) 2006-2013 by the Buildroot developers <buildroot@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/docs/copyright.txt b/docs/copyright.txt
index 3614616dbf..497d67b190 100644
--- a/docs/copyright.txt
+++ b/docs/copyright.txt
@@ -1,6 +1,6 @@
 
 The code and graphics on this website (and it's mirror sites, if any) are
-Copyright (c) 1999-2005 by Erik Andersen, 2006-2012 The Buildroot
+Copyright (c) 1999-2005 by Erik Andersen, 2006-2013 The Buildroot
 developers. All rights reserved.
 
 Documents on this Web site including their graphical elements, design, and
diff --git a/docs/footer.html b/docs/footer.html
index 2bfcf0aede..a5de2140d1 100644
--- a/docs/footer.html
+++ b/docs/footer.html
@@ -10,7 +10,7 @@
     <p>
     <font face="arial, helvetica, sans-serif" size="-1">
 	<a HREF="/copyright.txt">Copyright &copy; 1999-2005 Erik Andersen,
-	2006-2012 The Buildroot developers</a>
+	2006-2013 The Buildroot developers</a>
 	<br>
 	Mail all comments, insults, suggestions and bribes to
 	<br>

From 615fd9b0f37ee5479dd45ed8358cebdc8546cfab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 31 May 2013 22:29:04 +0200
Subject: [PATCH 5266/6849] Update for 2013.05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            | 2 +-
 Makefile           | 2 +-
 docs/download.html | 9 +++++----
 docs/news.html     | 9 +++++++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4884a5972f..910b94256c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.05, Not yet released:
+2013.05, Released May 31th, 2013:
 
 	Minor fixes.
 
diff --git a/Makefile b/Makefile
index d172bb478e..1d6b574813 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.05-rc3
+export BR2_VERSION:=2013.05
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 7d881f78c5..85aaa62a04 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,15 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2013.02</b>, which can be downloaded
+The latest stable release is <b>2013.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2013.02.tar.gz">buildroot-2013.02.tar.gz</a>
+<a href="/downloads/buildroot-2013.05.tar.gz">buildroot-2013.05.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.05.tar.bz2">buildroot-2013.05.tar.bz2</a>.
 
 <p>
+<!--
 The latest release candidate is <b>2013.05-rc3</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +22,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2013.05-rc3.tar.bz2">buildroot-2013.05-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 93554f0962..e537ed1c3f 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>31 May 2013 -- 2013.05 released</b>
+
+    <p>The stable 2013.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.05">CHANGES</a>
+    file for more details
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.05.tar.bz2">2013.05 release</a>.</p>
+
   <li><b>25 May 2013 -- 2013.05-rc3 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From 106e7f70b21672f104378e2d6c92ac4c2c916363 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Jun 2013 16:11:21 +0200
Subject: [PATCH 5267/6849] docs/news.html: add 2013.05 announcement link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index e537ed1c3f..f893807c2f 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>The stable 2013.05 release is out - Thanks to everyone
     contributing and testing the release candidates. See the
     <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.05">CHANGES</a>
-    file for more details
+    file for more details, read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-May/073121.html">announcement</a>
     and go to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2013.05.tar.bz2">2013.05 release</a>.</p>
 

From 0c94aa549cc8cf483bc8c3443a2b1f772d5d180b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Jun 2013 16:12:20 +0200
Subject: [PATCH 5268/6849] Makefile: kickoff 2013.08 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1d6b574813..d7437a74a8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.05
+export BR2_VERSION:=2013.08-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From 3e681d9465d6e77e119d9e0ba394a4608887518e Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Fri, 31 May 2013 06:31:08 +0000
Subject: [PATCH 5269/6849] Add support for the Calao-systems TNY-A9G20-LPW

[Peter: lock kernel/headers version to 3.9.4, use devtmpfs, add comments]
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../at91bootstrap-1.16-tny-a9g20-lpw.patch    | 551 ++++++++++++++++++
 board/calao/tny-a9g20-lpw/linux-3.9.config    | 187 ++++++
 configs/calao_tny_a9g20_lpw_defconfig         |  32 +
 3 files changed, 770 insertions(+)
 create mode 100644 board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch
 create mode 100644 board/calao/tny-a9g20-lpw/linux-3.9.config
 create mode 100644 configs/calao_tny_a9g20_lpw_defconfig

diff --git a/board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch b/board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch
new file mode 100644
index 0000000000..71746ce5ae
--- /dev/null
+++ b/board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch
@@ -0,0 +1,551 @@
+From 53bd82b122f4530a98cba45795832820bb1d0b45 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Mon, 13 Aug 2012 11:26:10 +0200
+Subject: [PATCH] Add support for the Calao-systems TNY-A9G20-LPW
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ board/tny_a9g20_lpw/nandflash/Makefile        |  121 ++++++++++++
+ board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h |  114 ++++++++++++
+ board/tny_a9g20_lpw/tny_a9g20_lpw.c           |  243 +++++++++++++++++++++++++
+ crt0_gnu.S                                    |    6 +
+ include/part.h                                |    6 +-
+ 5 files changed, 489 insertions(+), 1 deletion(-)
+ create mode 100644 board/tny_a9g20_lpw/nandflash/Makefile
+ create mode 100644 board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h
+ create mode 100644 board/tny_a9g20_lpw/tny_a9g20_lpw.c
+
+diff --git a/board/tny_a9g20_lpw/nandflash/Makefile b/board/tny_a9g20_lpw/nandflash/Makefile
+new file mode 100644
+index 0000000..7efbea7
+--- /dev/null
++++ b/board/tny_a9g20_lpw/nandflash/Makefile
+@@ -0,0 +1,121 @@
++# TODO: set this appropriately for your local toolchain
++ifndef ERASE_FCT
++ERASE_FCT=rm -f
++endif
++ifndef CROSS_COMPILE
++CROSS_COMPILE=arm-elf-
++endif
++
++TOOLCHAIN=gcc
++
++BOOTSTRAP_PATH=../../..
++
++# NandFlashBoot Configuration for AT91SAM9260EK
++
++# Target name (case sensitive!!!)
++TARGET=AT91SAM9G20
++# Board name (case sensitive!!!)
++BOARD=tny_a9g20_lpw
++# Link Address and Top_of_Memory
++LINK_ADDR=0x200000
++TOP_OF_MEMORY=0x301000
++# Name of current directory
++PROJECT=nandflash
++
++ifndef BOOT_NAME
++BOOT_NAME=$(PROJECT)_$(BOARD)
++endif
++
++INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
++
++ifeq ($(TOOLCHAIN), gcc)
++
++AS=$(CROSS_COMPILE)gcc
++CC=$(CROSS_COMPILE)gcc
++LD=$(CROSS_COMPILE)gcc
++NM= $(CROSS_COMPILE)nm
++SIZE=$(CROSS_COMPILE)size
++OBJCOPY=$(CROSS_COMPILE)objcopy
++OBJDUMP=$(CROSS_COMPILE)objdump
++CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
++ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
++
++# Linker flags.
++#  -Wl,...:     tell GCC to pass this to linker.
++#    -Map:      create map file
++#    --cref:    add cross reference to map file
++LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref
++LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
++OBJS=crt0_gnu.o
++
++endif
++
++OBJS+=\
++	$(BOARD).o \
++	main.o \
++	gpio.o \
++	pmc.o \
++	debug.o \
++	sdramc.o \
++	nandflash.o \
++	_udivsi3.o \
++	_umodsi3.o \
++	div0.o \
++	udiv.o \
++	string.o
++
++rebuild: clean all
++
++all: 	$(BOOT_NAME)
++
++ifeq ($(TOOLCHAIN), gcc)
++$(BOOT_NAME): $(OBJS)
++	$(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
++	$(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
++endif
++
++
++$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
++
++main.o: $(BOOTSTRAP_PATH)/main.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
++
++gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
++
++pmc.o:  $(BOOTSTRAP_PATH)/driver/pmc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
++
++debug.o: $(BOOTSTRAP_PATH)/driver/debug.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
++
++sdramc.o:  $(BOOTSTRAP_PATH)/driver/sdramc.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
++
++dataflash.o:  $(BOOTSTRAP_PATH)/driver/dataflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
++
++nandflash.o:  $(BOOTSTRAP_PATH)/driver/nandflash.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o
++
++crt0_gnu.o:  $(BOOTSTRAP_PATH)/crt0_gnu.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
++
++div0.o:  $(BOOTSTRAP_PATH)/lib/div0.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
++
++string.o:  $(BOOTSTRAP_PATH)/lib/string.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
++
++udiv.o:  $(BOOTSTRAP_PATH)/lib/udiv.c 
++	$(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
++
++_udivsi3.o:  $(BOOTSTRAP_PATH)/lib/_udivsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
++
++_umodsi3.o:  $(BOOTSTRAP_PATH)/lib/_umodsi3.S
++	$(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
++
++clean:
++	$(ERASE_FCT) *.o *.bin *.elf *.map
+diff --git a/board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h b/board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h
+new file mode 100644
+index 0000000..b1f8a1d
+--- /dev/null
++++ b/board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h
+@@ -0,0 +1,114 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2008, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : tny-a9g20-lpw.h
++ * Object              :
++ * Creation            : GH August 13th 2012
++ *-----------------------------------------------------------------------------
++ */
++#ifndef _TNY_A9G20_LPW_H
++#define _TNY_A9G20_LPW_H
++
++/* ******************************************************************* */
++/* PMC Settings                                                        */
++/*                                                                     */
++/* The main oscillator is enabled as soon as possible in the c_startup */
++/* and MCK is switched on the main oscillator.                         */
++/* PLL initialization is done later in the hw_init() function          */
++/* ******************************************************************* */
++#define MASTER_CLOCK		(100000000)
++#define PLL_LOCK_TIMEOUT	1000000
++
++/* set PLLA to 800Mhz from MAINCK= 12Mhz MULA=199 (0xC7+1= 200), DIVA=0x03 (Fplla=12Mhz x [(199+1)/3]=800Mhz) */
++#define PLLA_SETTINGS   0x20C73F03
++#define PLLB_SETTINGS   0x100F3F02
++
++/* Switch MCK on PLLA output PCK = PLLA/2 = 3 * MCK */
++/* LP-SDRAM (fmax=100Mhz) PDIV=0 => PRESCALER CLK=PCLK; */
++/* MDIV = 2 => PRESCALER CLK / 4 = MCLK=100Mhz */
++/* PRESCALER CLK = PLLA (800Mhz) / 2 (PRES=1) = 400Mhz */
++#define MCKR_SETTINGS           0x0204 
++#define MCKR_CSS_SETTINGS       (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
++
++/* ******************************************************************* */
++/* NandFlash Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define AT91C_SMARTMEDIA_BASE	0x40000000
++
++#define AT91_SMART_MEDIA_ALE    (1 << 21)	/* our ALE is AD21 */
++#define AT91_SMART_MEDIA_CLE    (1 << 22)	/* our CLE is AD22 */
++
++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0)
++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0)
++
++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13))
++
++
++/* ******************************************************************** */
++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 100000000.*/
++/* Please refer to SMC section in AT91SAM9 datasheet to learn how 	*/
++/* to generate these values. 						*/
++/* ******************************************************************** */
++#define AT91C_SM_NWE_SETUP	(1 << 0)
++#define AT91C_SM_NCS_WR_SETUP	(0 << 8)
++#define AT91C_SM_NRD_SETUP	(1 << 16)
++#define AT91C_SM_NCS_RD_SETUP	(0 << 24)
++  
++#define AT91C_SM_NWE_PULSE 	(3 << 0)
++#define AT91C_SM_NCS_WR_PULSE	(3 << 8)
++#define AT91C_SM_NRD_PULSE	(3 << 16)
++#define AT91C_SM_NCS_RD_PULSE	(3 << 24)
++  
++#define AT91C_SM_NWE_CYCLE 	(5 << 0)
++#define AT91C_SM_NRD_CYCLE	(5 << 16)
++
++#define AT91C_SM_TDF	        (2 << 16)
++
++/* ******************************************************************* */
++/* BootStrap Settings                                                  */
++/*                                                                     */
++/* ******************************************************************* */
++#define IMG_ADDRESS 		0x20000			/* Image Address in NandFlash */
++#define	IMG_SIZE		0x40000			/* Image Size in NandFlash */
++
++#define MACH_TYPE		0x80B			/* TNY-A9G20 */
++#define JUMP_ADDR		0x23F00000		/* Final Jump Address */
++
++/* ******************************************************************* */
++/* Application Settings                                                */
++/* ******************************************************************* */
++#undef CFG_DEBUG
++#undef CFG_DATAFLASH
++
++#define CFG_NANDFLASH
++#undef	NANDFLASH_SMALL_BLOCKS	/* NANDFLASH_LARGE_BLOCKS used instead */
++
++#define	CFG_SDRAM
++#define	CFG_HW_INIT
++
++#endif	/* _TNY_A9G20_LPW_H */
+diff --git a/board/tny_a9g20_lpw/tny_a9g20_lpw.c b/board/tny_a9g20_lpw/tny_a9g20_lpw.c
+new file mode 100644
+index 0000000..cef9055
+--- /dev/null
++++ b/board/tny_a9g20_lpw/tny_a9g20_lpw.c
+@@ -0,0 +1,243 @@
++/* ----------------------------------------------------------------------------
++ *         ATMEL Microcontroller Software Support  -  ROUSSET  -
++ * ----------------------------------------------------------------------------
++ * Copyright (c) 2008, Atmel Corporation
++
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * - Redistributions of source code must retain the above copyright notice,
++ * this list of conditions and the disclaimer below.
++ *
++ * Atmel's name may not be used to endorse or promote products derived from
++ * this software without specific prior written permission.
++ *
++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ----------------------------------------------------------------------------
++ * File Name           : tny_a9g20_lpw.c
++ * Object              :
++ * Creation            : GH August 13th 2012
++ *-----------------------------------------------------------------------------
++ */
++#include "../../include/part.h"
++#include "../../include/gpio.h"
++#include "../../include/pmc.h"
++#include "../../include/debug.h"
++#include "../../include/sdramc.h"
++#include "../../include/main.h"
++#ifdef CFG_NANDFLASH
++#include "../../include/nandflash.h"
++#endif
++
++static inline unsigned int get_cp15(void)
++{
++	unsigned int value;
++	__asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value));
++	return value;
++}
++
++static inline void set_cp15(unsigned int value)
++{
++	__asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value));
++}
++
++#ifdef CFG_HW_INIT
++/*----------------------------------------------------------------------------*/
++/* \fn    hw_init							      */
++/* \brief This function performs very low level HW initialization	      */
++/* This function is invoked as soon as possible during the c_startup	      */
++/* The bss segment must be initialized					      */
++/*----------------------------------------------------------------------------*/
++void hw_init(void)
++{
++	unsigned int cp15;
++	
++	/* Configure PIOs */
++	const struct pio_desc hw_pio[] = {
++#ifdef CFG_DEBUG
++		{"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A},
++#endif
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Disable watchdog */
++	writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR);
++
++	/* At this stage the main oscillator is supposed to be enabled
++	 * PCK = MCK = MOSC */
++	writel(0x00, AT91C_BASE_PMC + PMC_PLLICPR);
++
++	/* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
++	pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* PCK = PLLA/2 = 3 * MCK */
++	pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT);
++	/* Switch MCK on PLLA output */
++	pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure PLLB */
++	pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT);
++
++	/* Configure CP15 */
++	cp15 = get_cp15();
++	cp15 |= I_CACHE;
++	set_cp15(cp15);
++
++	/* Configure the PIO controller */
++	pio_setup(hw_pio);
++
++	/* Configure the EBI Slave Slot Cycle to 64 */
++	writel((readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3));
++
++#ifdef CFG_DEBUG
++	/* Enable Debug messages on the DBGU */
++	dbg_init(BAUDRATE(MASTER_CLOCK, 115200));
++
++	dbg_print("Start AT91Bootstrap...\n\r");
++#endif /* CFG_DEBUG */
++
++#ifdef CFG_SDRAM
++	/* Initialize the matrix (slow slew rate enabled and LPSDRAM memory voltage = 1.8V) */
++	writel(((readl(AT91C_BASE_CCFG + CCFG_EBICSA)) | AT91C_EBI_CS1A_SDRAMC | (1<<17)) & ~0x00010000, AT91C_BASE_CCFG + CCFG_EBICSA);
++
++	/* Configure SDRAM Controller */
++	sdram_init(	AT91C_SDRAMC_NC_9  |
++				AT91C_SDRAMC_NR_13 |
++				AT91C_SDRAMC_CAS_3 |
++				AT91C_SDRAMC_NB_4_BANKS |
++				AT91C_SDRAMC_DBW_32_BITS |
++				AT91C_SDRAMC_TWR_2 |
++				AT91C_SDRAMC_TRC_7 |
++				AT91C_SDRAMC_TRP_2 |
++				AT91C_SDRAMC_TRCD_2 |
++				AT91C_SDRAMC_TRAS_5 |
++				AT91C_SDRAMC_TXSR_8,		/* Control Register */
++				(MASTER_CLOCK * 7)/1000000,	/* Refresh Timer Register */
++                                AT91C_SDRAMC_MD_LOW_POWER_SDRAM); /* SDRAM (low power)   */
++
++#endif /* CFG_SDRAM */
++}
++#endif /* CFG_HW_INIT */
++
++#ifdef CFG_SDRAM
++/*------------------------------------------------------------------------------*/
++/* \fn    sdramc_hw_init							*/
++/* \brief This function performs SDRAMC HW initialization			*/
++/*------------------------------------------------------------------------------*/
++void sdramc_hw_init(void)
++{
++	/* Configure PIOs */
++/*	const struct pio_desc sdramc_pio[] = {
++		{"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++*/
++	/* Configure the SDRAMC PIO controller to output PCK0 */
++/*	pio_setup(sdramc_pio); */
++
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0));
++	writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0));
++
++}
++#endif /* CFG_SDRAM */
++
++#ifdef CFG_NANDFLASH
++/*------------------------------------------------------------------------------*/
++/* \fn    nand_recovery						*/
++/* \brief This function erases NandFlash Block 0 if BP4 is pressed 		*/
++/*        during boot sequence							*/
++/*------------------------------------------------------------------------------*/
++static void nand_recovery(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc bp4_pio[] = {
++		{"BP4", AT91C_PIN_PA(31), 0, PIO_PULLUP, PIO_INPUT},
++		{(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOA), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(bp4_pio);
++	
++	/* If BP4 is pressed during Boot sequence */
++	/* Erase NandFlash block 0*/
++	if (!pio_get_value(AT91C_PIN_PA(31)) )
++		AT91F_NandEraseBlock0();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_hw_init							*/
++/* \brief NandFlash HW init							*/
++/*------------------------------------------------------------------------------*/
++void nandflash_hw_init(void)
++{
++	/* Configure PIOs */
++	const struct pio_desc nand_pio[] = {
++		{"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT},
++		{"NANDCS",  AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT},
++		{(char *) 0, 0, 0,  PIO_DEFAULT, PIO_PERIPH_A},
++	};
++
++	/* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */
++	writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA);
++		    
++	/* Configure SMC CS3 */
++ 	writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3);
++  	writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3);
++	writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE)						, AT91C_BASE_SMC + SMC_CYCLE3);
++	writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | 
++  		AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF)						, AT91C_BASE_SMC + SMC_CTRL3);
++
++	/* Configure the PIO controller */
++	writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC);
++	pio_setup(nand_pio);
++	
++	nand_recovery();
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_16bits_dbw_init						*/
++/* \brief Configure SMC in 16 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_16bits_dbw_init(void)
++{
++	writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++/*------------------------------------------------------------------------------*/
++/* \fn    nandflash_cfg_8bits_dbw_init						*/
++/* \brief Configure SMC in 8 bits mode						*/
++/*------------------------------------------------------------------------------*/
++void nandflash_cfg_8bits_dbw_init(void)
++{
++	writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3);
++}
++
++#endif /* #ifdef CFG_NANDFLASH */
+diff --git a/crt0_gnu.S b/crt0_gnu.S
+index 042b617..c6cd49d 100644
+--- a/crt0_gnu.S
++++ b/crt0_gnu.S
+@@ -106,6 +106,12 @@ _relocate_to_sram:
+ #endif /* CFG_NORFLASH */
+ 
+ _setup_clocks:
++/* Test if main osc is bypassed */
++	ldr 	r0,=AT91C_PMC_MOR
++	ldr 	r1, [r0]
++	ldr 	r2,=AT91C_CKGR_OSCBYPASS 
++	ands 	r1, r1, r2
++	bne	_init_data	/* branch if OSCBYPASS=1 */
+ /* Test if main oscillator is enabled */
+ 	ldr 	r0,=AT91C_PMC_SR
+ 	ldr 	r1, [r0]
+diff --git a/include/part.h b/include/part.h
+index ba5985a..ab79af1 100644
+--- a/include/part.h
++++ b/include/part.h
+@@ -46,7 +46,11 @@
+ 
+ #ifdef AT91SAM9G20
+ #include "AT91SAM9260_inc.h"
+-#include "at91sam9g20ek.h"
++	#ifdef at91sam9g20ek
++	#include "at91sam9g20ek.h"
++	#elif tny_a9g20_lpw
++	#include "tny-a9g20-lpw.h"
++	#endif
+ #endif
+ 
+ #ifdef AT91SAM9261
+-- 
+1.7.9.5
+
diff --git a/board/calao/tny-a9g20-lpw/linux-3.9.config b/board/calao/tny-a9g20-lpw/linux-3.9.config
new file mode 100644
index 0000000000..797c15a4dd
--- /dev/null
+++ b/board/calao/tny-a9g20-lpw/linux-3.9.config
@@ -0,0 +1,187 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_AT91=y
+CONFIG_SOC_AT91SAM9260=y
+CONFIG_SOC_AT91SAM9263=y
+CONFIG_SOC_AT91SAM9G45=y
+CONFIG_SOC_AT91SAM9X5=y
+CONFIG_SOC_AT91SAM9N12=y
+CONFIG_MACH_AT91SAM_DT=y
+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
+CONFIG_AT91_TIMER_HZ=128
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
+CONFIG_KEXEC=y
+CONFIG_AUTO_ZRELADDR=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+CONFIG_IPV6_SIT_6RD=y
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_GLUEBI=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_ATMEL_PWM=y
+CONFIG_ATMEL_TCLIB=y
+CONFIG_EEPROM_93CX6=m
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_MACB=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_DAVICOM_PHY=y
+CONFIG_MICREL_PHY=y
+# CONFIG_WLAN is not set
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=4
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_GPIO=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_AT91SAM9X_WATCHDOG=y
+CONFIG_SSB=m
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_ATMEL=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_ATMEL_LCDC=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_ACORN_8x8=y
+CONFIG_FONT_MINI_4x6=y
+CONFIG_LOGO=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_ACM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_AT91=m
+CONFIG_USB_ETH=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_MMC=y
+CONFIG_MMC_ATMELMCI=y
+CONFIG_MMC_SPI=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AT91RM9200=y
+CONFIG_RTC_DRV_AT91SAM9=y
+CONFIG_DMADEVICES=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_USER=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_CCITT=m
+CONFIG_AVERAGE=y
diff --git a/configs/calao_tny_a9g20_lpw_defconfig b/configs/calao_tny_a9g20_lpw_defconfig
new file mode 100644
index 0000000000..c8c341a987
--- /dev/null
+++ b/configs/calao_tny_a9g20_lpw_defconfig
@@ -0,0 +1,32 @@
+# architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# system
+BR2_PACKAGE_HOST_SAM_BA=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+
+# filesystem
+BR2_TARGET_ROOTFS_UBIFS=y
+
+# lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.9.4"
+
+# bootloaders
+BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/tny-a9g20-lpw/"
+BR2_TARGET_AT91BOOTSTRAP_BOARD="tny_a9g20_lpw"
+BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
+BR2_TARGET_BAREBOX=y
+BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="tny_a9g20"
+
+# linux
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.4"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/tny-a9g20-lpw/linux-3.9.config"
+BR2_LINUX_KERNEL_ZIMAGE=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="tny_a9g20"

From e87a062e19d65d52af7f5b547e0068f09d7d33b5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 2 Jun 2013 23:16:32 +0200
Subject: [PATCH 5270/6849] intltool: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/intltool/intltool.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 1a32a79f4c..0bed3155d4 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-INTLTOOL_VERSION = 0.40.6
-INTLTOOL_SOURCE = intltool-$(INTLTOOL_VERSION).tar.bz2
-INTLTOOL_SITE = http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/
+INTLTOOL_VERSION = 0.50.2
+INTLTOOL_SOURCE = intltool-$(INTLTOOL_VERSION).tar.gz
+INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+download/
+INTLTOOL_LICENSE = GPLv2+
+INTLTOOL_LICENSE_FILES = COPYING
 
 HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl
 HOST_INTLTOOL_CONF_OPT = \

From be96c7a6617581fdb30078e1b24118651220d57e Mon Sep 17 00:00:00 2001
From: Marcin Bis <marcin@bis.org.pl>
Date: Fri, 31 May 2013 10:12:55 +0000
Subject: [PATCH 5271/6849] ecryptfs-utils: new package

The following patch adds support for ecryptfs-utils.
http://ecryptfs.org/

[Peter: needs host-intltool, fix typo in help text]
Signed-off-by: Marcin Bis <marcin@bis.org.pl>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                        |  1 +
 package/ecryptfs-utils/Config.in         | 22 +++++++++++++++++++
 package/ecryptfs-utils/ecryptfs-utils.mk | 28 ++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 package/ecryptfs-utils/Config.in
 create mode 100644 package/ecryptfs-utils/ecryptfs-utils.mk

diff --git a/package/Config.in b/package/Config.in
index 4233ff23ba..8a29c99aa5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -195,6 +195,7 @@ source "package/cramfs/Config.in"
 source "package/curlftpfs/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
+source "package/ecryptfs-utils/Config.in"
 source "package/exfat/Config.in"
 source "package/exfat-utils/Config.in"
 source "package/f2fs-tools/Config.in"
diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in
new file mode 100644
index 0000000000..c10659ac8b
--- /dev/null
+++ b/package/ecryptfs-utils/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_ECRYPTFS_UTILS
+	bool "ecryptfs-utils"
+	select BR2_PACKAGE_KEYUTILS
+	select BR2_PACKAGE_LIBNSS
+	depends on BR2_USE_MMU # keyutils
+	depends on !BR2_avr32 && !BR2_microblaze # keyutils
+	depends on BR2_LARGEFILE # libnss
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
+	help
+	  eCryptfs is a POSIX-compliant enterprise cryptographic
+	  filesystem for Linux. It is stacked on top of any other
+	  Linux filesystem, it stores cryptographic metadata in the header
+	  of each file written.
+
+	  The eCryptfs kernel module is available in all Linux kernels
+	  since version 2.6.19. This package provides userspace utilities
+	  needed to mount eCryptfs.
+
+	  Files are encrypted using a passphrase. Consider building openssl
+	  for another method.
+
+	  http://ecryptfs.org
diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
new file mode 100644
index 0000000000..226c9297f5
--- /dev/null
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# ecryptfs-utils
+#
+##############################################################
+
+ECRYPTFS_UTILS_VERSION         = 103
+ECRYPTFS_UTILS_SOURCE          = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
+ECRYPTFS_UTILS_SITE            = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
+ECRYPTFS_UTILS_LICENSE         = GPLv2+
+ECRYPTFS_UTILS_LICENSE_FILES   = COPYING
+
+ECRYPTFS_UTILS_DEPENDENCIES    = keyutils libnss host-intltool
+ECRYPTFS_UTILS_CONF_OPT        = --disable-pywrap --disable-pam
+
+#Needed for build system to find pk11func.h and libnss3.so
+ECRYPTFS_UTILS_CONF_ENV = \
+  NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \
+  NSS_LIBS="-lnss3"
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	ECRYPTFS_UTILS_CONF_OPT += --enable-openssl
+	ECRYPTFS_UTILS_DEPENDENCIES += openssl
+else
+	ECRYPTFS_UTILS_CONF_OPT += --disable-openssl
+endif
+
+$(eval $(autotools-package))

From a5b5cadc47fad2b9b4e6e2dbd25cd4cf1460ed39 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 2 Jun 2013 13:28:40 +0000
Subject: [PATCH 5272/6849] pcre: bump to version 8.33

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcre/pcre.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 745309fa88..066da6900b 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PCRE_VERSION = 8.32
+PCRE_VERSION = 8.33
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 PCRE_LICENSE = BSD-3c
 PCRE_LICENSE_FILES = LICENCE

From 85aa7c3a2d5b061c4787fcbf8b4b83fa56d2cc42 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 2 Jun 2013 13:28:41 +0000
Subject: [PATCH 5273/6849] lm_sensors: bump to version 3.3.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lm-sensors/lm-sensors.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index fcd278e6e9..b4339a31f3 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LM_SENSORS_VERSION = 3.3.3
+LM_SENSORS_VERSION = 3.3.4
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
 LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
 LM_SENSORS_INSTALL_STAGING = YES

From 7e50472ca8648b44cd334199831dc83f3d6184f8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 2 Jun 2013 13:29:04 +0000
Subject: [PATCH 5274/6849] php: bump to version 5.3.25

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 2a452d1401..8c4c2e1efb 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.24
+PHP_VERSION = 5.3.25
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From a0c5fb4fd1f1b5631109e63daa7d2070fa7a17d8 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 2 Jun 2013 20:57:24 +0000
Subject: [PATCH 5275/6849] sconeserver: requires thread support

Fixes autobuild failures such as the following.

  http://autobuild.buildroot.net/results/a290aa34bd44c0e08f7aa44a7c606420668eef6d/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index 0fc3a13efb..a467476233 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -1,6 +1,7 @@
 menuconfig BR2_PACKAGE_SCONESERVER
 	bool "sconeserver"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_PCRE
 	help
 	  Sconeserver is a modular, object-orientated and extremely versatile
@@ -90,5 +91,5 @@ comment "ui module requires X.org"
 
 endif # BR2_PACKAGE_SCONESERVER
 
-comment "sconeserver requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "sconeserver requires a toolchain with C++ and thread support enabled"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

From 62c139134a894619cb06a3bcee5660a5ee4b0f32 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 3 Jun 2013 01:52:50 +0000
Subject: [PATCH 5276/6849] barebox: bump to version 2013.06.0

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 09edecf7ea..9fa8c5da61 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.05.1"
+	bool "2013.06.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.05.1"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.06.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From 626f9e37492c7f9f5332df02c17e09349f54565b Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 3 Jun 2013 02:10:09 +0000
Subject: [PATCH 5277/6849] sconeserver: fix autouild failure

Fixes autobuild failures such as the following.

  http://autobuild.buildroot.net/results/1bdb5e014daf76b701afea5c82ac83ac4c97d4cb/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/sconeserver.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 744f389303..565d46782e 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -60,7 +60,8 @@ endif
 ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
 	SCONESERVER_DEPENDENCIES += mysql_client
 	SCONESERVER_CONF_OPT += --with-mysql \
-		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config"
+		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
 else
 	SCONESERVER_CONF_OPT += --without-mysql
 endif

From 5770b89b63cc7bb7f484b4a90d17e24623cbbc7c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Jun 2013 03:03:28 +0000
Subject: [PATCH 5278/6849] libbsd: correct license file reference

Fixes autobuilder error:
http://autobuild.buildroot.net/results/ccd/ccd2f3fe69a3e0321685daf95f85eca5ba2d64cf/

[Peter: use COPYING instead]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libbsd/libbsd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
index 3af1002d64..2466b01275 100644
--- a/package/libbsd/libbsd.mk
+++ b/package/libbsd/libbsd.mk
@@ -8,7 +8,7 @@ LIBBSD_VERSION         = 0.4.2
 LIBBSD_SOURCE          = libbsd-$(LIBBSD_VERSION).tar.gz
 LIBBSD_SITE            = http://libbsd.freedesktop.org/releases
 LIBBSD_LICENSE         = BSD-3c MIT
-LIBBSD_LICENSE_FILES   = LICENSE
+LIBBSD_LICENSE_FILES   = COPYING
 
 # man-pages are BSD-4c, so that license only matters
 # if doc is kept in the target rootfs

From 0e1ec378b32486c27bdd69589a493ed79dac2708 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Jun 2013 03:04:59 +0000
Subject: [PATCH 5279/6849] aespipe: needs mmu

Fixes:
http://autobuild.buildroot.net/results/9f3/9f3f85a024791cdc6b10e3e40cf41707eb074447/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aespipe/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/aespipe/Config.in b/package/aespipe/Config.in
index ccc94c2a0c..df99523be2 100644
--- a/package/aespipe/Config.in
+++ b/package/aespipe/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AESPIPE
 	bool "aespipe"
+	depends on BR2_USE_MMU # fork()
 	help
 	  aespipe program is AES encrypting or decrypting pipe. It reads from
 	  standard input and writes to standard output. It can be used to

From 0f0f72c8792ff416621cdd354aca084f1c0c4e02 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 2 Jun 2013 14:50:52 +0000
Subject: [PATCH 5280/6849] p11-kit: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/p11-kit/Config.in  | 15 +++++++++++++++
 package/p11-kit/p11-kit.mk | 15 +++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/p11-kit/Config.in
 create mode 100644 package/p11-kit/p11-kit.mk

diff --git a/package/Config.in b/package/Config.in
index 8a29c99aa5..0d4ed90e51 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -610,6 +610,7 @@ source "package/mpc/Config.in"
 source "package/mpfr/Config.in"
 source "package/mtdev2tuio/Config.in"
 source "package/orc/Config.in"
+source "package/p11-kit/Config.in"
 source "package/poco/Config.in"
 source "package/protobuf/Config.in"
 source "package/protobuf-c/Config.in"
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
new file mode 100644
index 0000000000..40a07d3673
--- /dev/null
+++ b/package/p11-kit/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_P11_KIT
+	bool "p11-kit"
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBTASN1
+	help
+	  Provides a way to load and enumerate PKCS#11 modules.
+	  Provides a standard configuration setup for installing PKCS#11
+	  modules in such a way that they're discoverable.
+
+	  http://p11-glue.freedesktop.org/p11-kit.html
+
+comment "p11-kit requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
new file mode 100644
index 0000000000..2ddb27c830
--- /dev/null
+++ b/package/p11-kit/p11-kit.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# p11-kit
+#
+#############################################################
+
+P11_KIT_VERSION = 0.18.1
+P11_KIT_SITE = http://p11-glue.freedesktop.org/releases
+P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
+P11_KIT_INSTALL_STAGING = YES
+P11_KIT_CONF_OPT = --disable-static
+P11_KIT_LICENSE = BSD-3c
+P11_KIT_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 7e9f3d015c98abfbaed2aad65fbe3331f4576273 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 2 Jun 2013 14:50:53 +0000
Subject: [PATCH 5281/6849] gnutls: bump to version 3.2.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/Config.in                      |  1 +
 ...s-correct_rpl_gettimeofday_signature.patch | 58 -------------------
 package/gnutls/gnutls.mk                      | 29 ++++++++--
 3 files changed, 24 insertions(+), 64 deletions(-)
 delete mode 100644 package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch

diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 038b3fb9b6..f699af784f 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
 	select BR2_PACKAGE_NETTLE
+	select BR2_PACKAGE_PCRE
 	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
diff --git a/package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch b/package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch
deleted file mode 100644
index 9188708aa1..0000000000
--- a/package/gnutls/gnutls-correct_rpl_gettimeofday_signature.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-[PATCH] fix build on uClibc
-
-Currently we fail on uclibc like below
-
-| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,
-|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
-|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
-|                  from ../../gl/signal.h:52,
-|                  from ../../gl/sys/select.h:58,
-|                  from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
-|                  from ../../gl/sys/types.h:28,
-|                  from ../../lib/includes/gnutls/gnutls.h:46,
-|                  from ex-cxx.cpp:3:
-| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
-| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
-| make[4]: *** [ex-cxx.o] Error 1
-| make[4]: *** Waiting for unfinished jobs....
-
-
-GCC detects that we call 'restrict' as param name in function
-signatures and complains since both params are called 'restrict'
-therefore we use __restrict to denote the C99 keywork
-
-This only happens of uclibc since this code is not excercised with
-eglibc otherwise we will have same issue there too
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-
-Index: gnutls-2.12.14/gl/sys_time.in.h
-===================================================================
---- gnutls-2.12.14.orig/gl/sys_time.in.h	2012-01-15 10:54:39.517285351 -0800
-+++ gnutls-2.12.14/gl/sys_time.in.h	2012-01-15 10:59:23.773299108 -0800
-@@ -82,20 +82,20 @@
- #    define gettimeofday rpl_gettimeofday
- #   endif
- _GL_FUNCDECL_RPL (gettimeofday, int,
--                  (struct timeval *restrict, void *restrict)
-+                  (struct timeval *__restrict, void *__restrict)
-                   _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (gettimeofday, int,
--                  (struct timeval *restrict, void *restrict));
-+                  (struct timeval *__restrict, void *__restrict));
- #  else
- #   if !@HAVE_GETTIMEOFDAY@
- _GL_FUNCDECL_SYS (gettimeofday, int,
--                  (struct timeval *restrict, void *restrict)
-+                  (struct timeval *__restrict, void *__restrict)
-                   _GL_ARG_NONNULL ((1)));
- #   endif
- /* Need to cast, because on glibc systems, by default, the second argument is
-                                                   struct timezone *.  */
- _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
--                       (struct timeval *restrict, void *restrict));
-+                       (struct timeval *__restrict, void *__restrict));
- #  endif
- _GL_CXXALIASWARN (gettimeofday);
- # elif defined GNULIB_POSIXCHECK
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 610a5a2dee..3089979a06 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,22 +4,39 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 3.1.9
+GNUTLS_VERSION = 3.2.1
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
-GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1
-GNUTLS_LICENSE = GPLv3+ LGPLv3
+GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2
+GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER
-GNUTLS_DEPENDENCIES = host-pkgconf nettle $(if $(BR2_PACKAGE_ZLIB),zlib)
-GNUTLS_CONF_OPT = --with-libnettle-prefix=$(STAGING_DIR)/usr --disable-rpath
+GNUTLS_DEPENDENCIES = host-pkgconf nettle pcre \
+	$(if $(BR2_PACKAGE_P11_KIT),p11-kit) \
+	$(if $(BR2_PACKAGE_LIBIDN),libidn) \
+	$(if $(BR2_PACKAGE_LIBTASN1),libtasn1) \
+	$(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_OPT = --with-libnettle-prefix=$(STAGING_DIR)/usr --disable-rpath \
+	--disable-doc --disable-guile
 GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \
 	ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \
 	gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \
-	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)
+	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no) \
+	gl_cv_func_gettimeofday_clobber=no
 GNUTLS_INSTALL_STAGING = YES
 
 # libpthread autodetection poisons the linkpath
 GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
 
+# gnutls needs libregex, but pcre can be used too
+# The check isn't cross-compile friendly
+define GNUTLS_LIBREGEX_CHECK_FIX
+	$(SED) 's/libopts_cv_with_libregex=no/libopts_cv_with_libregex=yes/g;'\
+		$(@D)/configure
+endef
+GNUTLS_PRE_CONFIGURE_HOOKS += GNUTLS_LIBREGEX_CHECK_FIX
+GNUTLS_CONF_OPT += --with-regex-header=pcreposix.h \
+	--with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
+	--with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
+
 # libidn support for nommu must exclude the crywrap wrapper (uses fork)
 GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
 GNUTLS_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBIDN),libidn)

From 7672b1235d8f786938af66068c1c1da8a766bb38 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Jun 2013 17:23:15 +0200
Subject: [PATCH 5282/6849] gnutls: wchar only needed for tools

And adjust reverse dependencies to match.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in       | 2 +-
 package/gnutls/Config.in        | 9 ++++++---
 package/libmicrohttpd/Config.in | 4 ----
 package/libsoup/Config.in       | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 93f9ab518f..4c9741b530 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
-	depends on BR2_USE_WCHAR # libglib2 and gnutls
+	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index f699af784f..a4eaa98e93 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -2,18 +2,21 @@ config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
 	select BR2_PACKAGE_NETTLE
 	select BR2_PACKAGE_PCRE
-	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
 
 	  http://www.gnutls.org
 
+if BR2_PACKAGE_GNUTLS
+
 config BR2_PACKAGE_GNUTLS_TOOLS
 	bool "install tools"
-	depends on BR2_PACKAGE_GNUTLS
+	depends on BR2_USE_WCHAR
 	help
 	  Install GnuTLS command line tools for various cryptographic tasks.
 
-comment "gnutls requires a toolchain with WCHAR support"
+comment "gnutls tools requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
+
+endif
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index 2e4de0f6a9..4e78a996c8 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -10,7 +10,6 @@ config BR2_PACKAGE_LIBMICROHTTPD
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
        bool "https support"
        depends on BR2_PACKAGE_LIBMICROHTTPD
-       depends on BR2_USE_WCHAR
        select BR2_PACKAGE_GNUTLS
        select BR2_PACKAGE_LIBGCRYPT
        help
@@ -18,6 +17,3 @@ config BR2_PACKAGE_LIBMICROHTTPD_SSL
 
 comment "libmicrohttpd needs a toolchain with thread support"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-comment "libmicrohttpd https support needs a toolchain with wchar support"
-	depends on BR2_PACKAGE_LIBMICROHTTPD && !BR2_USE_WCHAR
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 57b425f283..c3b4ceb181 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
-	depends on BR2_USE_WCHAR # glib2 and gnutls
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

From f7dbc3a50061249a14d04627b9659304ebd1ea8c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 3 Jun 2013 05:15:48 +0000
Subject: [PATCH 5283/6849] git: needs zlib and host-gettext

host-gettext fixes:
http://autobuild.buildroot.net/results/a5b/a5b1bb708d62a9e296f05899f0984087fcf9e2ce/

zlib fixes:
http://autobuild.buildroot.net/results/08f/08f5ed4dd35ad1ce06dda7577aae87b9aa7069b2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/git/Config.in | 1 +
 package/git/git.mk    | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/git/Config.in b/package/git/Config.in
index 31e5ffe5d9..dc342aa7bb 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GIT
 	bool "git"
 	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_ZLIB
 	help
 	  Git is a free and open source distributed version control system
 	  designed to handle everything from small to very large projects.
diff --git a/package/git/git.mk b/package/git/git.mk
index 408456bc9d..6bc9761493 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -8,10 +8,7 @@ GIT_VERSION         = 1.8.3
 GIT_SITE            = http://git-core.googlecode.com/files/
 GIT_LICENSE         = GPLv2 LGPLv2.1+
 GIT_LICENSE_FILES   = COPYING LGPL-2.1
-
-ifeq ($(BR2_PACKAGE_ZLIB),y)
-	GIT_DEPENDENCIES += zlib
-endif
+GIT_DEPENDENCIES    = zlib host-gettext
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	GIT_DEPENDENCIES += openssl

From 34dae9ac288031f869ae808ebd70b2d965b3df3d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Jun 2013 22:52:24 +0200
Subject: [PATCH 5284/6849] git: needs libiconv on toolchains without locale
 support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/git/Config.in | 1 +
 package/git/git.mk    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/git/Config.in b/package/git/Config.in
index dc342aa7bb..931d460d4f 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GIT
 	bool "git"
 	depends on BR2_LARGEFILE
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Git is a free and open source distributed version control system
 	  designed to handle everything from small to very large projects.
diff --git a/package/git/git.mk b/package/git/git.mk
index 6bc9761493..7e2f114be0 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -40,6 +40,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 	GIT_DEPENDENCIES += libiconv
+	GIT_CONF_ENV += LIBS=-liconv
 	GIT_CONF_OPT += --with-iconv=/usr/lib
 else
 	GIT_CONF_OPT += --without-iconv
@@ -54,7 +55,7 @@ endif
 
 # assume yes for these tests, configure will bail out otherwise
 # saying error: cannot run test program while cross compiling
-GIT_CONF_ENV = 	ac_cv_fread_reads_directories=yes \
+GIT_CONF_ENV += ac_cv_fread_reads_directories=yes \
 	ac_cv_snprintf_returns_bogus=yes
 
 $(eval $(autotools-package))

From a9a12f03e9a6a3182804bcd4b61d75ac698b2569 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 3 Jun 2013 10:15:47 +0000
Subject: [PATCH 5285/6849] package/tvheadend: update to a git snapshot

There are a buncha fixes that are not available in a release yet.

Needs refreshing our patches.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../tvheadend-001-no-auto-download-dvbscans.patch   | 13 ++++++-------
 .../tvheadend/tvheadend-002-no-check_config.patch   |  4 ++--
 package/tvheadend/tvheadend.mk                      |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
index cc25c564cc..b64627e5cf 100644
--- a/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
+++ b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch
@@ -11,13 +11,13 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
 --- tvheadend-v3.5.orig/configure	2013-02-15 14:41:26.000000000 +0100
 +++ tvheadend-v3.5/configure	2013-02-16 15:41:16.675556099 +0100
-@@ -178,15 +178,16 @@
+@@ -179,15 +179,16 @@
  #
  # DVB scan
  #
 -if enabled linuxdvb && enabled dvbscan; then
 -  printf "${TAB}" "fetching dvb-scan files ..."
--  ${ROOTDIR}/support/getmuxlist
+-  "${ROOTDIR}/support/getmuxlist"
 -  if [ $? -ne 0 ]; then
 -    echo "fail"
 -    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
@@ -27,7 +27,7 @@ diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
 +# For buildroot, we already installed those files via the dvb-apps package
 +#if enabled linuxdvb && enabled dvbscan; then
 +#  printf "${TAB}" "fetching dvb-scan files ..."
-+#  ${ROOTDIR}/support/getmuxlist
++#  "${ROOTDIR}/support/getmuxlist"
 +#  if [ $? -ne 0 ]; then
 +#    echo "fail"
 +#    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
@@ -37,11 +37,10 @@ diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
  
  # ###########################################################################
  # Write config
-Binary files tvheadend-v3.5.orig/.configure.swp and tvheadend-v3.5/.configure.swp differ
 diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
 --- tvheadend-v3.5.orig/Makefile	2013-02-15 14:41:26.000000000 +0100
 +++ tvheadend-v3.5/Makefile	2013-02-16 15:41:38.218821287 +0100
-@@ -207,7 +207,7 @@
+@@ -211,7 +211,7 @@
  SRCS-${CONFIG_BUNDLE}     += bundle.c
  BUNDLES-yes               += docs/html docs/docresources src/webui/static
  BUNDLES-yes               += data/conf
@@ -62,5 +61,5 @@ diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk
 +	ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan
 +
  uninstall:
- 	rm -f ${DESTDIR}${bindir)/tvheadend
- 	rm -f ${DESTDIR}${mandir)/tvheadend.1
+ 	rm -f ${DESTDIR}${bindir}/tvheadend
+ 	rm -f ${DESTDIR}${mandir}/tvheadend.1
diff --git a/package/tvheadend/tvheadend-002-no-check_config.patch b/package/tvheadend/tvheadend-002-no-check_config.patch
index a0edcdcfde..aad04e5011 100644
--- a/package/tvheadend/tvheadend-002-no-check_config.patch
+++ b/package/tvheadend/tvheadend-002-no-check_config.patch
@@ -12,8 +12,8 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
 --- tvheadend-v3.5.orig/Makefile	2013-02-17 15:15:03.228749505 +0100
 +++ tvheadend-v3.5/Makefile	2013-02-17 15:15:51.591923062 +0100
-@@ -246,7 +246,7 @@
- 	$(CURDIR)/configure $(CONFIGURE_ARGS)
+@@ -250,7 +250,7 @@
+ 	$(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary
 -${PROG}: check_config $(OBJS) $(ALLDEPS)
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 58965d6831..5ddcd75cf7 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,8 +4,8 @@
 #
 ##############################################################
 
-TVHEADEND_VERSION           = v3.5
-TVHEADEND_SITE              = http://github.com/tvheadend/tvheadend/tarball/$(TVHEADEND_VERSION)
+TVHEADEND_VERSION           = 5513b44
+TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE
 TVHEADEND_DEPENDENCIES      = host-pkgconf host-python openssl

From 3e650b8861542ba613bddad3d9b51d456bdeadc9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 3 Jun 2013 10:15:48 +0000
Subject: [PATCH 5286/6849] package/linux-firmware: bump version for new
 firmware

Bump version to get a few new firmware files for some WiFi adapters.

In the rtl81xx familly, it's hard to differentiate each members: I have
a USB stick that identifies itself as TRL8188CUS, but is handled by the
rtl8192ce driver. So I moved all of rtl81xx firmwares under the same
option to avoid confusion.

It will be the responsibility of the user to eventually get rid of
unwanted firmware files in a post-build script, if needed.

Ditto for rtl87xx.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 12 ++++++------
 package/linux-firmware/linux-firmware.mk | 15 +++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 9998f22667..d9bb095d1c 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -61,15 +61,15 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX
 	help
 	  Ralink rt27xx/rt28xx/rt30xx
 
-config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192
-	bool "Realtek 8192"
+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX
+	bool "Realtek 81xx"
 	help
-	  Realtek 8192
+	  Realtek 8188/8192
 
-config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
-	bool "Realtek 8712"
+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX
+	bool "Realtek 87xx"
 	help
-	  Realtek 8712
+	  Realtek 8712/8723
 
 config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X
 	bool "TI wl127X"
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 0cb08b4aa3..0ba2b82ad0 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LINUX_FIRMWARE_VERSION = 65a5163b8bb77bd7759efa3ca780867fcaed89b0
+LINUX_FIRMWARE_VERSION = 07ea598af5b9dde3acdf279846b062fa1b2987b8
 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
@@ -22,16 +22,19 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX) += \
 	rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin 	\
 	LICENCE.ralink-firmware.txt
 
-# rtl8192
-LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192) += \
+# rtl81xx
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX) += \
 	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin 		\
 	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin	\
 	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin		\
+	rtlwifi/rtl8188efw.bin					\
 	LICENCE.rtlwifi_firmware.txt
 
-# rtl8712
-LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712) += \
-	rtlwifi/rtl8712u.bin LICENCE.rtlwifi_firmware.txt
+# rtl87xx
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX) += \
+	rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin		\
+	rtlwifi/rtl8723fw_B.bin					\
+	LICENCE.rtlwifi_firmware.txt
 
 # ar7010
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010) += \

From d8286a993ac1738ef08a6b9aca03e629e5c9bb89 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 3 Jun 2013 10:15:49 +0000
Subject: [PATCH 5287/6849] package/genext2fs: add host variant

genext2fs is built only if the user selected an ext2 root filesystem.

However, some use-cases can't live with the full target/ dir on the
root filesystem, and requires separate partitions (eg. for /usr).
In this case, the user would not select an ext2 root fs in the
Buildrooot menu, and would only generate a tarball of the rootfs.
This tarball would then be used from a post-image script to build
the actual required FSes.

But then, genext2fs is not built, since the ext2 root FS was not
selected.

As for the other filesystem generators, provide a host variant of
genext2fs (genext2fs is already host-package aware, so only needs
adding a Kconfig entry).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ext2/Config.in                | 1 +
 package/Config.in.host           | 1 +
 package/genext2fs/Config.in.host | 9 +++++++++
 3 files changed, 11 insertions(+)
 create mode 100644 package/genext2fs/Config.in.host

diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index e75ef54b3a..c26482f1dd 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -1,5 +1,6 @@
 config BR2_TARGET_ROOTFS_EXT2
 	bool "ext2/3/4 root filesystem"
+	select BR2_PACKAGE_HOST_GENEXT2FS
 	select BR2_PACKAGE_HOST_E2FSPROGS
 	help
 	  Build an ext2/3/4 root filesystem
diff --git a/package/Config.in.host b/package/Config.in.host
index 54178ea4ff..5fd25703cb 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -3,6 +3,7 @@ menu "Host utilities"
 source "package/dfu-util/Config.in.host"
 source "package/dosfstools/Config.in.host"
 source "package/e2fsprogs/Config.in.host"
+source "package/genext2fs/Config.in.host"
 source "package/genimage/Config.in.host"
 source "package/genpart/Config.in.host"
 source "package/lpc3250loader/Config.in.host"
diff --git a/package/genext2fs/Config.in.host b/package/genext2fs/Config.in.host
new file mode 100644
index 0000000000..a03e16b2e2
--- /dev/null
+++ b/package/genext2fs/Config.in.host
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_GENEXT2FS
+	bool "host genext2fs"
+	help
+	  genext2fs generates an ext2 filesystem as a normal (non-root)
+	  user.  It does not require you to mount the image file to
+	  copy files on it, nor does it require that you become the
+	  superuser to make device nodes.
+
+	  http://genext2fs.sourceforge.net/

From c11c9e6ef249d4a6247d9439ce3ab090119268f5 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 3 Jun 2013 10:15:50 +0000
Subject: [PATCH 5288/6849] boards/rpi: bump kernel

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/rpi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 96f63ba128..e3d0a79ee1 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.6.11"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="e959a8e"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="5d5301e"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 4486455c5d31eaab6367160648f487b27f4c7621 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Jun 2013 23:17:02 +0200
Subject: [PATCH 5289/6849] logrotate: workaround wget issue with wildcard ssl
 certificates

Fixes http://autobuild.buildroot.net/results/815/815e2759f4961805d768efe79f0d83d13b16e706/build-end.log

Certain wget versions dislike downloading from fedorahosted.org which
provides a SSL certificate for *.fedorahosted.org. Work around it by
instead downloading from www.fedorahosted.org instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/logrotate/logrotate.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index c920b46df0..82dde390c5 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -5,7 +5,7 @@
 #############################################################
 LOGROTATE_VERSION = 3.8.4
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
-LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/
+LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate/
 LOGROTATE_LICENSE = GPLv2+
 LOGROTATE_LICENSE_FILES = COPYING
 

From 181768f00c316e13b4ae24c9361bf0aad3609a74 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:29 +0000
Subject: [PATCH 5290/6849] sdl: add license info

[Peter: License is LGPLv2.1+]
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 59576fbc42..fc60de68f3 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -7,6 +7,8 @@
 SDL_VERSION = 1.2.15
 SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz
 SDL_SITE = http://www.libsdl.org/release
+SDL_LICENSE = LGPLv2.1+
+SDL_LICENSE_FILES = COPYING
 SDL_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_SDL_FBCON),y)

From 69f323f562507c86d4d073086d1d9d6ff2c11e5d Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:30 +0000
Subject: [PATCH 5291/6849] tiff: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tiff/tiff.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index e881647b11..bcc55bea78 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -6,6 +6,8 @@
 
 TIFF_VERSION = 4.0.3
 TIFF_SITE = http://download.osgeo.org/libtiff
+TIFF_LICENSE = tiff license
+TIFF_LICENSE_FILES = COPYRIGHT
 TIFF_INSTALL_STAGING = YES
 TIFF_CONF_OPT = \
 	--disable-cxx \

From 33d03591f7d3b7d596f57ec51eeb3f32a6533f77 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:31 +0000
Subject: [PATCH 5292/6849] orc: add license info

[Peter: license is mix of BSD-2c and BSD-3c]
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/orc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 77cb29fa80..fef1117749 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -5,6 +5,8 @@
 #############################################################
 ORC_VERSION = 0.4.16
 ORC_SITE = http://code.entropywave.com/download/orc/
+ORC_LICENSE = BSD-2c, BSD-3c
+ORC_LICENSE_FILES = COPYING
 ORC_INSTALL_STAGING = YES
 ORC_DEPENDENCIES = host-orc
 

From 573af015bec8dfa89f11d3796bc8dc2df5d5817f Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:32 +0000
Subject: [PATCH 5293/6849] libmpeg2: add license info

Also, remove trailing slash from site.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmpeg2/libmpeg2.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
index dbb7114497..f3cf2456fd 100644
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -5,7 +5,9 @@
 #############################################################
 LIBMPEG2_VERSION = 0.5.1
 LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz
-LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files/
+LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files
+LIBMPEG2_LICENSE = GPLv2+
+LIBMPEG2_LICENSE_FILES = COPYING
 LIBMPEG2_INSTALL_STAGING = YES
 LIBMPEG2_AUTORECONF = YES
 LIBMPEG2_CONF_OPT = --without-x --disable-directx

From e8f0d6638ea8677ff1be57bbe16277a16c80ff2d Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:33 +0000
Subject: [PATCH 5294/6849] libglib2: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 3ac78ba8f6..194fa64829 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -8,6 +8,8 @@ LIBGLIB2_VERSION_MINOR = 3
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
+LIBGLIB2_LICENSE = LGPLv2+
+LIBGLIB2_LICENSE_FILES = COPYING
 
 LIBGLIB2_AUTORECONF = YES
 HOST_LIBGLIB2_AUTORECONF = YES

From 70f28576000c7ef1d60883c1a8a024c7958c9ea6 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:34 +0000
Subject: [PATCH 5295/6849] gdk-pixbuf: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdk-pixbuf/gdk-pixbuf.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 4e00c4097f..5abb39d88e 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -8,6 +8,8 @@ GDK_PIXBUF_MAJOR_VERSION = 2.24
 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).1
 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
 GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_MAJOR_VERSION)
+GDK_PIXBUF_LICENSE = LGPLv2+
+GDK_PIXBUF_LICENSE_FILES = COPYING
 GDK_PIXBUF_INSTALL_STAGING = YES
 
 GDK_PIXBUF_CONF_ENV = \

From a13afc11456e38ccbb49d3e70297118e8e9f8cae Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Mon, 3 Jun 2013 16:03:35 +0000
Subject: [PATCH 5296/6849] kmod: adjust license info based on kmod tools
 selection

The libkmod is licensed as LGPL, while the kmod tools are GPL.
We always install libkmod, but conditionally install the tools.
This patch adjusts the license variables accordingly.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 5c733b933d..2fe99427a6 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -7,11 +7,13 @@
 KMOD_VERSION = 13
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
-KMOD_LICENSE = GPLv2+ LGPLv2.1+
-KMOD_LICENSE_FILES = COPYING libkmod/COPYING
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
 
+# license info for libkmod only, conditionally add more below
+KMOD_LICENSE = LGPLv2.1+
+KMOD_LICENSE_FILES = libkmod/COPYING
+
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 KMOD_CONF_OPT += --disable-manpages
 endif
@@ -27,6 +29,11 @@ KMOD_CONF_OPT += --with-xz
 endif
 
 ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
+
+# add license info for kmod tools
+KMOD_LICENSE += GPLv2+
+KMOD_LICENSE_FILES += COPYING
+
 # take precedence over busybox / module-init-tools implementations
 KMOD_DEPENDENCIES += \
 	$(if $(BR2_PACKAGE_BUSYBOX),busybox) \

From 31aa4264d8839d05684e67a238837e8633d1e1bc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Jun 2013 10:52:18 +0200
Subject: [PATCH 5297/6849] pkg-utils.mk: legal-license-file: handle multiple
 license files with same name

Some packages (kmod, e2fsprogs, ..) contain multiple (different) license
files with the same file name, but in different directories.

These are currently all copied to the same filename in
output/legal-info/licenses/<pkg>, overwriting everything but the last file.

Fix it by recreating the same directory structure under legal-info.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-utils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 835c588af0..86d687fb99 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -106,6 +106,6 @@ define legal-license-file # pkg, filename, file-fullpath
 	$(call legal-license-header,$(1),$(2) file) && \
 	cat $(3) >>$(LEGAL_LICENSES_TXT) && \
 	echo >>$(LEGAL_LICENSES_TXT) && \
-	mkdir -p $(LICENSE_FILES_DIR)/$(1)/ && \
-	cp $(3) $(LICENSE_FILES_DIR)/$(1)/
+	mkdir -p $(LICENSE_FILES_DIR)/$(1)/$(dir $(2)) && \
+	cp $(3) $(LICENSE_FILES_DIR)/$(1)/$(2)
 endef

From 46ae86b3df6092cb29d647eaa6464400609d247b Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Mon, 3 Jun 2013 20:41:05 +0000
Subject: [PATCH 5298/6849] monit: needs threads support in toolchain

Fixes:
http://autobuild.buildroot.org/results/0b5/0b5838f3d11b45244f27bd2bcb092dd6a88fd39d

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/monit/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/monit/Config.in b/package/monit/Config.in
index 6933aafc86..3127da9218 100644
--- a/package/monit/Config.in
+++ b/package/monit/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MONIT
 	bool "monit"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Monit is a free open source utility for managing and
 	  monitoring, processes, programs, files, directories and
@@ -8,3 +9,6 @@ config BR2_PACKAGE_MONIT
 	  actions in error situations.
 
 	  http://mmonit.com/monit/
+
+comment "monit requires a toolchain with threads support"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

From 0b6af1af6fee511b5565dc3ca791e6ac9458ca15 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Jun 2013 01:58:06 +0000
Subject: [PATCH 5299/6849] bwm-ng: move to appropiate category

bwm-ng is a networking application, not a system one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 0d4ed90e51..f26b1aa85f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -682,6 +682,7 @@ source "package/boa/Config.in"
 source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
+source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/chrony/Config.in"
 source "package/connman/Config.in"
@@ -854,7 +855,6 @@ source "package/attr/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
-source "package/bwm-ng/Config.in"
 source "package/cpuload/Config.in"
 source "package/htop/Config.in"
 source "package/keyutils/Config.in"

From f26b054a326d1b7c12735fc03b6ea273de324884 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 4 Jun 2013 05:33:27 +0000
Subject: [PATCH 5300/6849] luajit: bump to version 2.0.2

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luajit/luajit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index bf9cfe8356..8078a51790 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUAJIT_VERSION = 2.0.1
+LUAJIT_VERSION = 2.0.2
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE    = http://luajit.org/download
 LUAJIT_LICENSE = MIT

From 860d37a27609a9d3040e19c82804ed506f41090b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 4 Jun 2013 11:49:53 +0000
Subject: [PATCH 5301/6849] legacy: add options for the legacy Realtek WiFi
 options in linux-firmware

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 7748ab390a..bb9c4a9c5e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -40,6 +40,24 @@ comment "As long as these options stay selected, the build   "
 comment "will fail.                                          "
 endif
 
+#
+# Legacy options since 2013.05
+#
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192
+	bool "Realtek 8192 replaced by Realtek 81xx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX
+	help
+	  Now covers the whole Realtek 81xx familly: 8188/8192.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
+	bool "Realtek 8712 replaced by Realtek 87xx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX
+	help
+	  Now covers the whole Realtek 87xx familly: 8712/8723.
+
 #
 # Legacy options since 2013.02
 #

From b713a39802fab4a8c983222273e6641db320a667 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 5 Jun 2013 20:53:19 +0200
Subject: [PATCH 5302/6849] libftdi: autoreconf should happen for host as well

Fixes http://autobuild.buildroot.net/results/d30/d3090804149654e099d3bc9953d48fd920812bf4/build-end.log

The same patches gets applied for target and host, so we should do
autoreconf for the host as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libftdi/libftdi.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index c5590bade2..06316fe2df 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -10,6 +10,7 @@ LIBFTDI_DEPENDENCIES = libusb-compat libusb
 LIBFTDI_INSTALL_STAGING = YES
 LIBFTDI_CONFIG_SCRIPTS = libftdi-config
 LIBFTDI_AUTORECONF = YES
+HOST_LIBFTDI_AUTORECONF = YES
 
 LIBFDTI_CONF_OPT = --without-examples
 

From 11e9c455be3a0587fa434647800e7a3ce1bb2bf1 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 5 Jun 2013 04:57:16 +0000
Subject: [PATCH 5303/6849] bzip2: Fix build system to build object files twice

Fixes build problems on MIPS

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bzip2/bzip2-build-objects-twice.patch | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/bzip2/bzip2-build-objects-twice.patch

diff --git a/package/bzip2/bzip2-build-objects-twice.patch b/package/bzip2/bzip2-build-objects-twice.patch
new file mode 100644
index 0000000000..9bde0f6488
--- /dev/null
+++ b/package/bzip2/bzip2-build-objects-twice.patch
@@ -0,0 +1,56 @@
+Build objects twice for shared and static libraries
+
+The existing Makefile causes problems on MIPS because the same object
+files (not compiled with -fPIC) are used in static and shared libraries.
+MIPS will refuce to link non-pic objects in shared libraries.
+We fix this problems by creating a new rule for the shared library
+and build the shared objects as *.sho instead of *.o.
+Then, we use these objects to create the shared library.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: bzip2-1.0.6/Makefile-libbz2_so
+===================================================================
+--- bzip2-1.0.6.orig/Makefile-libbz2_so
++++ bzip2-1.0.6/Makefile-libbz2_so
+@@ -25,13 +25,13 @@ SHELL=/bin/sh
+ CC=gcc
+ override CFLAGS += -fpic -fPIC -Wall
+ 
+-OBJS= blocksort.o  \
+-      huffman.o    \
+-      crctable.o   \
+-      randtable.o  \
+-      compress.o   \
+-      decompress.o \
+-      bzlib.o
++OBJS= blocksort.sho  \
++      huffman.sho    \
++      crctable.sho   \
++      randtable.sho  \
++      compress.sho   \
++      decompress.sho \
++      bzlib.sho
+ 
+ all: $(OBJS)
+ 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+@@ -45,17 +45,5 @@ install:
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+ 
+-blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++%.sho: %.c
++	$(CC) $(CFLAGS) -o $@ -c $<

From a7e8b6237458922f0a75103fb5c28e6fe713db7c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 5 Jun 2013 08:17:43 +0000
Subject: [PATCH 5304/6849] p11-kit: fix argp_standalone build error

When BR2_PACKAGE_ARGP_STANDALONE is enabled and built before p11-kit the
configure script detects it and a conflict arises because libc already
includes and defines program_invocation_short_name.
Avoid this by forcing the detection to true otherwise the configure
script tries to use argp-standalone and it clashes with libc. Fixes:
http://autobuild.buildroot.net/results/a39/a39fe81a356b922a891d4225a56ce2427ab5bca7/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/p11-kit/p11-kit.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index 2ddb27c830..89774dcdf6 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -9,6 +9,8 @@ P11_KIT_SITE = http://p11-glue.freedesktop.org/releases
 P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
 P11_KIT_INSTALL_STAGING = YES
 P11_KIT_CONF_OPT = --disable-static
+P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
+	ac_cv_have_decl___progname=yes
 P11_KIT_LICENSE = BSD-3c
 P11_KIT_LICENSE_FILES = COPYING
 

From 82d2a47478e436495e5fe3cd5aff308fe3f212d4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 5 Jun 2013 06:21:09 +0000
Subject: [PATCH 5305/6849] linux: qstrip the custom DTS path

This fixes a problem reported by wacha@mit.bme.hu, see
http://lists.busybox.net/pipermail/buildroot/2013-June/073312.html.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 11b32c3f60..177446db70 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -55,7 +55,7 @@ LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-
 ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
 KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
-KERNEL_DTS_NAME = $(basename $(notdir $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))
+KERNEL_DTS_NAME = $(basename $(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)

From 235b676a6670bfedc41a43543e0d34bc4dd85854 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 5 Jun 2013 04:58:17 +0000
Subject: [PATCH 5306/6849] gnutls: make crywrap a tools option

crywrap now needs wchar support so just build it when tools are enabled.
It's also a tool so it belongs there anyway.
Fixes:
http://autobuild.buildroot.net/results/418/418ce71eecc1db725e3b3f092131a01cb1666a60/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 3089979a06..43ec9777de 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -37,6 +37,11 @@ GNUTLS_CONF_OPT += --with-regex-header=pcreposix.h \
 	--with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
 	--with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
 
+# Consider crywrap as part of tools because it needs WCHAR, and it's so too
+ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),)
+	GNUTLS_CONF_OPT += --disable-crywrap
+endif
+
 # libidn support for nommu must exclude the crywrap wrapper (uses fork)
 GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
 GNUTLS_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBIDN),libidn)

From 96f522ee7bc94b1440c5d53d44d26a491ca8f9ab Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 5 Jun 2013 05:17:56 +0000
Subject: [PATCH 5307/6849] xapp_xmodmap: Fix build problems due to missing
 asprintf definition

Upstream Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48696

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xapp_xmodmap/xapp_xmodmap-asprintf.patch  | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 package/x11r7/xapp_xmodmap/xapp_xmodmap-asprintf.patch

diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap-asprintf.patch b/package/x11r7/xapp_xmodmap/xapp_xmodmap-asprintf.patch
new file mode 100644
index 0000000000..8eb2b9c452
--- /dev/null
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap-asprintf.patch
@@ -0,0 +1,69 @@
+Fixes build problems due to missing asprintf() definition
+
+Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=48696
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From dab3ce5b4b9d7078cd55515441b2ba244a32516a Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon, 23 Apr 2012 07:28:39 -0700
+Subject: [PATCH:xmodmap] include config.h before stdio.h & other system
+ headers
+
+Ensures definitions like _GNU_SOURCE are visible when needed.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ exec.c    |    4 ++++
+ pf.c      |    4 ++++
+ xmodmap.c |    4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/exec.c b/exec.c
+index dbcb669..419b10e 100644
+--- a/exec.c
++++ b/exec.c
+@@ -54,6 +54,10 @@ from The Open Group.
+  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+diff --git a/pf.c b/pf.c
+index 0eb0f55..3f0c3f4 100644
+--- a/pf.c
++++ b/pf.c
+@@ -26,6 +26,10 @@ from The Open Group.
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+diff --git a/xmodmap.c b/xmodmap.c
+index 58a8e70..0f89629 100644
+--- a/xmodmap.c
++++ b/xmodmap.c
+@@ -26,6 +26,10 @@ from The Open Group.
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+-- 
+1.7.9.2
+

From 99c016336e974727135a40b1ac86d8d14c4cdab6 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 5 Jun 2013 05:40:06 +0000
Subject: [PATCH 5308/6849] xapp_luit: Add patch to fix building with recent
 gcc versions

Upstream bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47792

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../xapp_luit/xapp_luit-posix-openpt.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/x11r7/xapp_luit/xapp_luit-posix-openpt.patch

diff --git a/package/x11r7/xapp_luit/xapp_luit-posix-openpt.patch b/package/x11r7/xapp_luit/xapp_luit-posix-openpt.patch
new file mode 100644
index 0000000000..c8ff8e4396
--- /dev/null
+++ b/package/x11r7/xapp_luit/xapp_luit-posix-openpt.patch
@@ -0,0 +1,19 @@
+Suggested workaround to build with recent gcc versions
+
+Upstream bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47792
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: xapp_luit-1.1.1/sys.c
+===================================================================
+--- xapp_luit-1.1.1.orig/sys.c
++++ xapp_luit-1.1.1/sys.c
+@@ -20,6 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
+ THE SOFTWARE.
+ */
+ 
++#define _XOPEN_SOURCE 600
++
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif

From 40d782cd0e3942c56fec6d136b6792d39cf00d85 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Jun 2013 00:51:36 +0000
Subject: [PATCH 5309/6849] dtc: needs host-bison and host-flex

Fixes:
http://autobuild.buildroot.net/results/000/000a042f6b485d90717d14b93efcf011841c33c3/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dtc/dtc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index 76ff3617cf..7dd4fe7f8d 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -9,6 +9,7 @@ DTC_SITE            = git://git.jdl.com/software/dtc.git
 DTC_LICENSE         = GPLv2+/BSD-2c
 DTC_LICENSE_FILES   = README.license GPL
 DTC_INSTALL_STAGING = YES
+DTC_DEPENDENCIES    = host-bison host-flex
 
 define DTC_POST_INSTALL_TARGET_RM_DTDIFF
 	rm -f $(TARGET_DIR)/usr/bin/dtdiff

From bf3e314efbf5535dc36ce41fc7370a17bed2707d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Jun 2013 00:49:26 +0000
Subject: [PATCH 5310/6849] udpcast: needs host-m4

Fixes:
http://autobuild.buildroot.net/results/28b/28bc8651ee798af150bba5997b66ec7bb450ecde/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udpcast/udpcast.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index 54051b942b..a6a2b8766e 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -8,6 +8,7 @@ UDPCAST_VERSION = 20120424
 UDPCAST_SOURCE = udpcast-$(UDPCAST_VERSION).tar.gz
 UDPCAST_SITE = http://www.udpcast.linux.lu/download
 UDPCAST_CONF_ENV = $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
+UDPCAST_DEPENDENCIES = host-m4
 
 define UDPCAST_REMOVE_UDP_SENDER
 	rm -f $(TARGET_DIR)/usr/sbin/udp-sender

From 88378877273829c387f48a6c96959712b892856f Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 20 May 2013 23:29:40 +0000
Subject: [PATCH 5311/6849] directfb: add optional imlib2 support

[Peter: drop default y]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/Config.in   | 4 ++++
 package/directfb/directfb.mk | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index b9ff5f9a08..4712db0be6 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -100,6 +100,10 @@ config BR2_PACKAGE_DIRECTFB_GIF
 	bool "enable GIF support"
 	default y
 
+config BR2_PACKAGE_DIRECTFB_IMLIB2
+	bool "enable IMLIB2 support"
+	select BR2_PACKAGE_IMLIB2
+
 config BR2_PACKAGE_DIRECTFB_JPEG
 	bool "enable JPEG support"
 	default y
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 5ead0846d3..e5a423d79b 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -108,6 +108,14 @@ else
 DIRECTFB_CONF_OPT += --disable-jpeg
 endif
 
+ifeq ($(BR2_PACKAGE_DIRECTFB_IMLIB2),y)
+DIRECTFB_CONF_OPT += --enable-imlib2
+DIRECTFB_DEPENDENCIES += imlib2
+DIRECTFB_CONF_ENV += ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config
+else
+DIRECTFB_CONF_OPT += --disable-imlib2
+endif
+
 ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y)
 DIRECTFB_CONF_OPT += --with-dither-rgb16=advanced
 else

From 29b071077f66de1d9a257e7c5c6983dcce1fc65d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 5 Jun 2013 21:07:55 +0000
Subject: [PATCH 5312/6849] package/libbsd: depends on architectures providing
 a.out.h

libbsd requires a.out.h, which is only available in a select subset
of the architectures Buildroot supports.

Propagate these new dependencies down to libedit.

Fixes:
    http://autobuild.buildroot.org/results/019/019091312ec547520370ffad967b53e23f54a14b
    http://autobuild.buildroot.org/results/87c/87c3a8bf2248606d80ddcfd96132de4c5fe869ed
    http://autobuild.buildroot.org/results/589/5891f539ce3f3ff2e3411228472c8833fdd0d7c0
    [...]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libbsd/Config.in  | 3 +++
 package/libedit/Config.in | 1 +
 2 files changed, 4 insertions(+)

diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in
index 0ed9dac9af..915a4bd98b 100644
--- a/package/libbsd/Config.in
+++ b/package/libbsd/Config.in
@@ -1,5 +1,8 @@
 config BR2_PACKAGE_LIBBSD
 	bool "libbsd"
+	# libbsd requires a.out.h, which is only available for those
+	# architectures: arm, m68k, x86 (and alpha, but we don't care.)
+	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
 	help
 	  This library provides useful functions commonly found on BSD
 	  systems, and lacking on others like GNU systems, thus making
diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index b49c23cadd..34160f4d2f 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBEDIT
 	bool "libedit"
+	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )  # libbsd
 	select BR2_PACKAGE_LIBBSD
 	select BR2_PACKAGE_NCURSES
 	help

From 669de89be785f83ae4840b0ba3983d044e374172 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Jun 2013 14:59:35 +0200
Subject: [PATCH 5313/6849] Revert "gnutls: wchar only needed for tools"

This reverts commit 7672b1235d8f786938af66068c1c1da8a766bb38.

It turns out that libgnutls.so ends up with a reference to wctomb() on
uClibc, as uClibc doesn't have vasnprintf so gnutls builds its internal
gnulib version of it, referencing wctomb().

Fix it by going back to requiring wchar for the base gnutls library as well.

Fixes http://autobuild.buildroot.net/results/780/780e825e56dc78f1ea347ca462e2e31044428775/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/connman/Config.in       | 2 +-
 package/gnutls/Config.in        | 9 +++------
 package/libmicrohttpd/Config.in | 4 ++++
 package/libsoup/Config.in       | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 4c9741b530..93f9ab518f 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
 	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
-	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index a4eaa98e93..f699af784f 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -2,21 +2,18 @@ config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
 	select BR2_PACKAGE_NETTLE
 	select BR2_PACKAGE_PCRE
+	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
 
 	  http://www.gnutls.org
 
-if BR2_PACKAGE_GNUTLS
-
 config BR2_PACKAGE_GNUTLS_TOOLS
 	bool "install tools"
-	depends on BR2_USE_WCHAR
+	depends on BR2_PACKAGE_GNUTLS
 	help
 	  Install GnuTLS command line tools for various cryptographic tasks.
 
-comment "gnutls tools requires a toolchain with WCHAR support"
+comment "gnutls requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
-
-endif
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index 4e78a996c8..2e4de0f6a9 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBMICROHTTPD
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
        bool "https support"
        depends on BR2_PACKAGE_LIBMICROHTTPD
+       depends on BR2_USE_WCHAR
        select BR2_PACKAGE_GNUTLS
        select BR2_PACKAGE_LIBGCRYPT
        help
@@ -17,3 +18,6 @@ config BR2_PACKAGE_LIBMICROHTTPD_SSL
 
 comment "libmicrohttpd needs a toolchain with thread support"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "libmicrohttpd https support needs a toolchain with wchar support"
+	depends on BR2_PACKAGE_LIBMICROHTTPD && !BR2_USE_WCHAR
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index c3b4ceb181..57b425f283 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
-	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_USE_WCHAR # glib2 and gnutls
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

From d8587c198b523f66668969b8cd555ba65938693c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Jun 2013 15:03:55 +0200
Subject: [PATCH 5314/6849] gnutls: drop double libidn dependency

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 43ec9777de..5d07ff9612 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -44,7 +44,6 @@ endif
 
 # libidn support for nommu must exclude the crywrap wrapper (uses fork)
 GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
-GNUTLS_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBIDN),libidn)
 
 ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
 	GNUTLS_CONF_OPT += --enable-cryptodev

From f7c5d92314061ff68c8f12d0788f65b1d979cf11 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Jun 2013 16:38:04 +0200
Subject: [PATCH 5315/6849] package: add tree

Tree is a recursive directory listing command that produces a depth
indented listing of files.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in      |  1 +
 package/tree/Config.in | 13 +++++++++++++
 package/tree/tree.mk   | 27 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/tree/Config.in
 create mode 100644 package/tree/tree.mk

diff --git a/package/Config.in b/package/Config.in
index f26b1aa85f..ce82e9964b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -95,6 +95,7 @@ source "package/sstrip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
 endif
+source "package/tree/Config.in"
 source "package/vala/Config.in"
 source "package/yasm/Config.in"
 endmenu
diff --git a/package/tree/Config.in b/package/tree/Config.in
new file mode 100644
index 0000000000..b6e21c87ce
--- /dev/null
+++ b/package/tree/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_TREE
+	bool "tree"
+	depends on BR2_USE_WCHAR
+	help
+	  Tree is a recursive directory listing command that produces
+	  a depth indented listing of files, which is colorized ala
+	  dircolors if the LS_COLORS environment variable is set and
+	  output is to tty.
+
+	  http://mama.indstate.edu/users/ice/tree/
+
+comment "tree requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/tree/tree.mk b/package/tree/tree.mk
new file mode 100644
index 0000000000..509ba45318
--- /dev/null
+++ b/package/tree/tree.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# tree
+#
+################################################################################
+
+TREE_VERSION = 1.6.0
+TREE_SOURCE = tree-$(TREE_VERSION).tgz
+TREE_SITE = http://mama.indstate.edu/users/ice/tree/src/
+TREE_LICENSE = GPLv2+
+TREE_LICENSE_FILES = LICENSE
+
+define TREE_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define TREE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/tree $(TARGET_DIR)/usr/bin/tree
+	$(INSTALL) -D -m 0644 $(@D)/doc/tree.1 \
+		$(TARGET_DIR)/usr/share/man/man1/tree.1
+endef
+
+define TREE_CLEAN_CMDS
+	-$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 9c778689c4d443705f69ab0477747adc54aa5dbc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 6 Jun 2013 04:42:18 +0000
Subject: [PATCH 5316/6849] p11-kit: fix __progname build failure

Even though we've got UCLIBC_HAS___PROGNAME=y in our internal toolchains
the build seems to fail under some circumstances.
Since program_invocation_short_name is equally as useful just disable
__progname usage. Fixes:
http://autobuild.buildroot.net/results/cc8/cc861f5a034a0922a90fb6f22835a1fe8205d497/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/p11-kit/p11-kit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index 89774dcdf6..6cb81ee6e0 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -10,7 +10,7 @@ P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
 P11_KIT_INSTALL_STAGING = YES
 P11_KIT_CONF_OPT = --disable-static
 P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
-	ac_cv_have_decl___progname=yes
+	ac_cv_have_decl___progname=no
 P11_KIT_LICENSE = BSD-3c
 P11_KIT_LICENSE_FILES = COPYING
 

From d0d8a53dda3a5a757ae892b803bf25647be10aae Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 6 Jun 2013 04:16:15 +0000
Subject: [PATCH 5317/6849] xfsprogs: Version bump to 3.1.11

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xfsprogs/xfsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 532e8c0a08..823bf39a35 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -3,7 +3,7 @@
 # xfsprogs
 #
 #############################################################
-XFSPROGS_VERSION = 3.1.8
+XFSPROGS_VERSION = 3.1.11
 XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
 
 XFSPROGS_DEPENDENCIES = util-linux

From f397d2ce9e42c7b37a5707057482fecf21aec13e Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:24 +0000
Subject: [PATCH 5318/6849] ccid: fix header line

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccid/ccid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 51c3887fa9..570b1e88cc 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -2,7 +2,7 @@
 #
 # CCID
 #
-# ########################################################
+##########################################################
 CCID_VERSION = 1.4.8
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
 CCID_SITE = http://alioth.debian.org/frs/download.php/3768

From 911a2081a3d2a0decd75ad46bdae3d22694a4a98 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:26 +0000
Subject: [PATCH 5319/6849] x-loader: remove useless comment

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/xloader/xloader.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index b15d9b9ad3..bb99259520 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -24,11 +24,6 @@ endef
 
 $(eval $(generic-package))
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
 ifeq ($(BR2_TARGET_XLOADER),y)
 # we NEED a board name unless we're at make source
 ifeq ($(filter source,$(MAKECMDGOALS)),)

From 702704014dafc2beae60bcd88abeae72f0ac4d87 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:25 +0000
Subject: [PATCH 5320/6849] Fix package headers to comply with coding style

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk                              | 1 +
 boot/at91bootstrap3/at91bootstrap3.mk                            | 1 +
 boot/uboot/uboot.mk                                              | 1 +
 boot/xloader/xloader.mk                                          | 1 +
 linux/linux.mk                                                   | 1 +
 package/acpid/acpid.mk                                           | 1 +
 package/alsamixergui/alsamixergui.mk                             | 1 +
 package/apr-util/apr-util.mk                                     | 1 +
 package/apr/apr.mk                                               | 1 +
 package/avahi/avahi.mk                                           | 1 +
 package/axel/axel.mk                                             | 1 +
 package/beecrypt/beecrypt.mk                                     | 1 +
 package/berkeleydb/berkeleydb.mk                                 | 1 +
 package/boa/boa.mk                                               | 1 +
 package/bootutils/bootutils.mk                                   | 1 +
 package/bsdiff/bsdiff.mk                                         | 1 +
 package/cairo/cairo.mk                                           | 1 +
 package/ccid/ccid.mk                                             | 1 +
 package/cjson/cjson.mk                                           | 1 +
 package/cvs/cvs.mk                                               | 1 +
 package/dbus-glib/dbus-glib.mk                                   | 1 +
 package/dbus-python/dbus-python.mk                               | 1 +
 package/dfu-util/dfu-util.mk                                     | 1 +
 package/directfb/directfb.mk                                     | 1 +
 package/docker/docker.mk                                         | 1 +
 package/elftosb/elftosb.mk                                       | 1 +
 package/elfutils/elfutils.mk                                     | 1 +
 package/empty/empty.mk                                           | 1 +
 package/enchant/enchant.mk                                       | 1 +
 package/ezxml/ezxml.mk                                           | 1 +
 package/fakeroot/fakeroot.mk                                     | 1 +
 package/fconfig/fconfig.mk                                       | 1 +
 package/flashrom/flashrom.mk                                     | 1 +
 package/fontconfig/fontconfig.mk                                 | 1 +
 package/fxload/fxload.mk                                         | 1 +
 package/gadgetfs-test/gadgetfs-test.mk                           | 1 +
 package/gamin/gamin.mk                                           | 1 +
 package/gdbm/gdbm.mk                                             | 1 +
 package/giblib/giblib.mk                                         | 1 +
 package/gqview/gqview.mk                                         | 1 +
 package/gsl/gsl.mk                                               | 1 +
 package/gtk2-engines/gtk2-engines.mk                             | 1 +
 package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk     | 1 +
 package/gvfs/gvfs.mk                                             | 1 +
 package/hwdata/hwdata.mk                                         | 1 +
 package/imlib2/imlib2.mk                                         | 1 +
 package/infozip/infozip.mk                                       | 1 +
 package/input-tools/input-tools.mk                               | 1 +
 package/iperf/iperf.mk                                           | 1 +
 package/lcdapi/lcdapi.mk                                         | 1 +
 package/lcdproc/lcdproc.mk                                       | 1 +
 package/leafpad/leafpad.mk                                       | 1 +
 package/libaio/libaio.mk                                         | 1 +
 package/libarchive/libarchive.mk                                 | 1 +
 package/libatasmart/libatasmart.mk                               | 1 +
 package/libcgicc/libcgicc.mk                                     | 1 +
 package/libconfuse/libconfuse.mk                                 | 1 +
 package/libelf/libelf.mk                                         | 1 +
 package/liberation/liberation.mk                                 | 1 +
 package/libesmtp/libesmtp.mk                                     | 1 +
 package/libev/libev.mk                                           | 1 +
 package/libevent/libevent.mk                                     | 1 +
 package/libfcgi/libfcgi.mk                                       | 1 +
 package/libfreefare/libfreefare.mk                               | 1 +
 package/libftdi/libftdi.mk                                       | 1 +
 package/libgail/libgail.mk                                       | 1 +
 package/libgeotiff/libgeotiff.mk                                 | 1 +
 package/libglade/libglade.mk                                     | 1 +
 package/libglib2/libglib2.mk                                     | 1 +
 package/libgtk2/libgtk2.mk                                       | 1 +
 package/libiconv/libiconv.mk                                     | 1 +
 package/liblo/liblo.mk                                           | 1 +
 package/liblog4c-localtime/liblog4c-localtime.mk                 | 1 +
 package/libmms/libmms.mk                                         | 1 +
 package/libmodbus/libmodbus.mk                                   | 1 +
 package/libmpeg2/libmpeg2.mk                                     | 1 +
 package/libnfc-llcp/libnfc-llcp.mk                               | 1 +
 package/libnfc/libnfc.mk                                         | 1 +
 package/libnspr/libnspr.mk                                       | 1 +
 package/liboauth/liboauth.mk                                     | 1 +
 package/libogg/libogg.mk                                         | 1 +
 package/libplayer/libplayer.mk                                   | 1 +
 package/libtheora/libtheora.mk                                   | 1 +
 package/libtool/libtool.mk                                       | 1 +
 package/libtpl/libtpl.mk                                         | 1 +
 package/liburcu/liburcu.mk                                       | 1 +
 package/libusb-compat/libusb-compat.mk                           | 1 +
 package/libusb/libusb.mk                                         | 1 +
 package/libv4l/libv4l.mk                                         | 1 +
 package/libyaml/libyaml.mk                                       | 1 +
 package/linenoise/linenoise.mk                                   | 1 +
 package/linux-fusion/linux-fusion.mk                             | 1 +
 package/lockfile-progs/lockfile-progs.mk                         | 1 +
 package/logrotate/logrotate.mk                                   | 1 +
 package/lttng-libust/lttng-libust.mk                             | 1 +
 package/lttng-modules/lttng-modules.mk                           | 1 +
 package/lttng-tools/lttng-tools.mk                               | 1 +
 package/lua-msgpack-native/lua-msgpack-native.mk                 | 1 +
 package/luacjson/luacjson.mk                                     | 1 +
 package/lvm2/lvm2.mk                                             | 1 +
 package/lzo/lzo.mk                                               | 1 +
 package/macchanger/macchanger.mk                                 | 1 +
 package/matchbox/matchbox-common/matchbox-common.mk              | 1 +
 package/matchbox/matchbox-panel/matchbox-panel.mk                | 1 +
 package/memtester/memtester.mk                                   | 1 +
 package/mii-diag/mii-diag.mk                                     | 1 +
 package/minicom/minicom.mk                                       | 1 +
 .../mobile_broadband_provider_info.mk                            | 1 +
 package/mtd/mtd.mk                                               | 1 +
 package/mtdev/mtdev.mk                                           | 1 +
 package/mtdev2tuio/mtdev2tuio.mk                                 | 1 +
 package/multimedia/bellagio/bellagio.mk                          | 1 +
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk            | 1 +
 package/multimedia/gst-plugins-base/gst-plugins-base.mk          | 1 +
 package/multimedia/gst-plugins-good/gst-plugins-good.mk          | 1 +
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk          | 1 +
 package/multimedia/gstreamer/gstreamer.mk                        | 1 +
 package/multimedia/mplayer/mplayer.mk                            | 1 +
 package/multimedia/pulseaudio/pulseaudio.mk                      | 1 +
 package/mxml/mxml.mk                                             | 1 +
 package/nanocom/nanocom.mk                                       | 1 +
 package/neon/neon.mk                                             | 1 +
 package/netatalk/netatalk.mk                                     | 1 +
 package/netkitbase/netkitbase.mk                                 | 1 +
 package/netkittelnet/netkittelnet.mk                             | 1 +
 package/netplug/netplug.mk                                       | 1 +
 package/newt/newt.mk                                             | 1 +
 package/nss-mdns/nss-mdns.mk                                     | 1 +
 package/opencv/opencv.mk                                         | 1 +
 package/orc/orc.mk                                               | 1 +
 package/owl-linux/owl-linux.mk                                   | 1 +
 package/pango/pango.mk                                           | 1 +
 package/pcmanfm/pcmanfm.mk                                       | 1 +
 package/pixman/pixman.mk                                         | 1 +
 package/poco/poco.mk                                             | 1 +
 package/popt/popt.mk                                             | 1 +
 package/prboom/prboom.mk                                         | 1 +
 package/protobuf/protobuf.mk                                     | 1 +
 package/python-nfc/python-nfc.mk                                 | 1 +
 package/python-pygame/python-pygame.mk                           | 1 +
 package/python/python.mk                                         | 1 +
 package/python3/python3.mk                                       | 1 +
 package/qtuio/qtuio.mk                                           | 1 +
 package/rpm/rpm.mk                                               | 1 +
 package/rsyslog/rsyslog.mk                                       | 1 +
 package/rubix/rubix.mk                                           | 1 +
 package/sane-backends/sane-backends.mk                           | 1 +
 package/sawman/sawman.mk                                         | 1 +
 package/schifra/schifra.mk                                       | 1 +
 package/sdl_net/sdl_net.mk                                       | 1 +
 package/sdl_sound/sdl_sound.mk                                   | 1 +
 package/setserial/setserial.mk                                   | 1 +
 package/shared-mime-info/shared-mime-info.mk                     | 1 +
 package/slang/slang.mk                                           | 1 +
 package/snowball-hdmiservice/snowball-hdmiservice.mk             | 1 +
 package/snowball-init/snowball-init.mk                           | 1 +
 package/socketcand/socketcand.mk                                 | 1 +
 package/sound-theme-borealis/sound-theme-borealis.mk             | 1 +
 package/sound-theme-freedesktop/sound-theme-freedesktop.mk       | 1 +
 package/speex/speex.mk                                           | 1 +
 package/sqlcipher/sqlcipher.mk                                   | 1 +
 package/startup-notification/startup-notification.mk             | 1 +
 package/statserial/statserial.mk                                 | 1 +
 package/sysklogd/sysklogd.mk                                     | 1 +
 package/systemd/systemd.mk                                       | 1 +
 package/sysvinit/sysvinit.mk                                     | 1 +
 package/tcl/tcl.mk                                               | 1 +
 package/tcllib/tcllib.mk                                         | 1 +
 package/thttpd/thttpd.mk                                         | 1 +
 package/tinyhttpd/tinyhttpd.mk                                   | 1 +
 package/torsmo/torsmo.mk                                         | 1 +
 package/transmission/transmission.mk                             | 1 +
 package/tslib/tslib.mk                                           | 1 +
 package/ttcp/ttcp.mk                                             | 1 +
 package/uboot-tools/uboot-tools.mk                               | 1 +
 package/usbmount/usbmount.mk                                     | 1 +
 package/ux500-firmware/ux500-firmware.mk                         | 1 +
 package/x11r7/libxcb/libxcb.mk                                   | 1 +
 package/x11r7/xapp_xman/xapp_xman.mk                             | 1 +
 package/x11r7/xcb-proto/xcb-proto.mk                             | 1 +
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk               | 1 +
 package/x11r7/xcb-util/xcb-util.mk                               | 1 +
 .../xdriver_xf86-video-openchrome.mk                             | 1 +
 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk     | 1 +
 package/x11vnc/x11vnc.mk                                         | 1 +
 package/xerces/xerces.mk                                         | 1 +
 package/xfsprogs/xfsprogs.mk                                     | 1 +
 package/xinetd/xinetd.mk                                         | 1 +
 package/xstroke/xstroke.mk                                       | 1 +
 package/xvkbd/xvkbd.mk                                           | 1 +
 package/yasm/yasm.mk                                             | 1 +
 package/zxing/zxing.mk                                           | 1 +
 192 files changed, 192 insertions(+)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 0b1ee29980..9d5c125c8c 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -3,6 +3,7 @@
 # at91bootstrap
 #
 #############################################################
+
 AT91BOOTSTRAP_VERSION = 1.16
 AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap/
 AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip
diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
index 74f08e8529..32486be31d 100644
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -3,6 +3,7 @@
 # at91bootstrap3
 #
 #############################################################
+
 AT91BOOTSTRAP3_VERSION = 3.2
 AT91BOOTSTRAP3_SITE = \
 	ftp://www.at91.com/pub/at91bootstrap/AT91Bootstrap$(AT91BOOTSTRAP3_VERSION)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 004bdf2bc4..1b708d570a 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -3,6 +3,7 @@
 # U-Boot
 #
 #############################################################
+
 UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index bb99259520..dae2039452 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -3,6 +3,7 @@
 # x-loader
 #
 #############################################################
+
 XLOADER_VERSION    = 6f3a26101303051e0f91b6213735b68ce804e94e
 XLOADER_SITE       = git://gitorious.org/x-loader/x-loader.git
 XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
diff --git a/linux/linux.mk b/linux/linux.mk
index 177446db70..57956dd131 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -3,6 +3,7 @@
 # Linux kernel target
 #
 ###############################################################################
+
 LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 LINUX_LICENSE = GPLv2
 LINUX_LICENSE_FILES = COPYING
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index b55761731e..b64fa7d3f6 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -3,6 +3,7 @@
 # acpid
 #
 #############################################################
+
 ACPID_VERSION = 2.0.11
 ACPID_SOURCE = acpid_$(ACPID_VERSION).orig.tar.gz
 ACPID_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index b59de59958..eca3dd0b02 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -3,6 +3,7 @@
 # alsamixergui
 #
 #############################################################
+
 ALSAMIXERGUI_VERSION = 0.9.0rc2-1
 ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
 ALSAMIXERGUI_SITE = http://snapshot.debian.org/archive/debian/20080319T000000Z/pool/main/a/alsamixergui/
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index cc90f9e49f..f7313b0f49 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -3,6 +3,7 @@
 # apr-util
 #
 #############################################################
+
 APR_UTIL_VERSION = 1.4.1
 APR_UTIL_SITE = http://archive.apache.org/dist/apr
 APR_UTIL_LICENSE = Apache-2.0
diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index a9dcb40203..ef5c486d3f 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -3,6 +3,7 @@
 # apr
 #
 #############################################################
+
 APR_VERSION = 1.4.6
 APR_SITE = http://archive.apache.org/dist/apr
 APR_LICENSE = Apache-2.0
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index e8ca5606e6..5240e2639a 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -3,6 +3,7 @@
 # avahi (zeroconf implementation)
 #
 #############################################################
+
 #
 # This program is free software; you can redistribute it
 # and/or modify it under the terms of the GNU Lesser General
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index f823b4aa32..58ce774ef3 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -3,6 +3,7 @@
 # axel
 #
 #############################################################
+
 AXEL_VERSION = 2.4
 AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
 AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index a9cf133e60..9f145b7cc3 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -3,6 +3,7 @@
 # beecrypt
 #
 #############################################################
+
 BEECRYPT_VERSION = 4.2.1
 BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
 BEECRYPT_AUTORECONF = YES
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 3037da6908..9a2e5f0357 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -3,6 +3,7 @@
 # berkeley db
 #
 #############################################################
+
 BERKELEYDB_VERSION = 5.3.21
 BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index 10998087b7..8789e8af02 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -3,6 +3,7 @@
 # boa
 #
 #############################################################
+
 BOA_VERSION = 0.94.14rc21
 BOA_SOURCE = boa-$(BOA_VERSION).tar.gz
 BOA_SITE = http://www.boa.org/
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
index 3f943a7b3c..7ac11fc021 100644
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -3,6 +3,7 @@
 # bootutils
 #
 #############################################################
+
 BOOTUTILS_VERSION = 1.0.0
 BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
 
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 1e05c83ac8..9a39ed5943 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -3,6 +3,7 @@
 # bsdiff
 #
 #############################################################
+
 BSDIFF_VERSION = 4.3
 BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz
 BSDIFF_SITE = http://www.daemonology.net/bsdiff
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 203dbbe805..445b5540ae 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,6 +3,7 @@
 # cairo
 #
 #############################################################
+
 CAIRO_VERSION = 1.12.10
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
 CAIRO_LICENSE = LGPLv2.1+
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 570b1e88cc..735e68923c 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -3,6 +3,7 @@
 # CCID
 #
 ##########################################################
+
 CCID_VERSION = 1.4.8
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
 CCID_SITE = http://alioth.debian.org/frs/download.php/3768
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 3722adbed7..fa815ed840 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -3,6 +3,7 @@
 # cjson
 #
 #############################################################
+
 CJSON_VERSION         = 42
 CJSON_SITE_METHOD     = svn
 CJSON_SITE            = https://cjson.svn.sourceforge.net/svnroot/cjson
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 2bc0af2331..d8eee422a1 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -3,6 +3,7 @@
 # cvs
 #
 #############################################################
+
 CVS_VERSION = 1.12.13
 CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz
 CVS_PATCH = cvs_$(CVS_VERSION)-12.diff.gz
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 6a4aab2e13..447fc0c564 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -3,6 +3,7 @@
 # dbus-glib
 #
 #############################################################
+
 DBUS_GLIB_VERSION = 0.98
 DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib/
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index c011642810..06a48e49b9 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -3,6 +3,7 @@
 # dbus-python
 #
 #############################################################
+
 DBUS_PYTHON_VERSION = 0.83.0
 DBUS_PYTHON_SOURCE = dbus-python-$(DBUS_PYTHON_VERSION).tar.gz
 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python/
diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
index 77470fa3fc..bc94264c9b 100644
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@@ -3,6 +3,7 @@
 # dfu-util
 #
 #############################################################
+
 DFU_UTIL_VERSION = 0.6
 DFU_UTIL_SOURCE = dfu-util-$(DFU_UTIL_VERSION).tar.gz
 DFU_UTIL_SITE = http://dfu-util.gnumonks.org/releases/
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index e5a423d79b..d6bbf5736b 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -3,6 +3,7 @@
 # directfb
 #
 #############################################################
+
 DIRECTFB_VERSION_MAJOR = 1.6
 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).3
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index b452386e6e..015cd366b8 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -3,6 +3,7 @@
 # docker
 #
 #############################################################
+
 DOCKER_VERSION = 1.5
 DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
 DOCKER_SITE = http://icculus.org/openbox/2/docker
diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
index 5803b75928..d540afb0ab 100644
--- a/package/elftosb/elftosb.mk
+++ b/package/elftosb/elftosb.mk
@@ -3,6 +3,7 @@
 # elftosb
 #
 #############################################################
+
 ELFTOSB_VERSION = 10.12.01
 ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
 ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 39407dbb7d..fbde905e6c 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -3,6 +3,7 @@
 # elfutils
 #
 #############################################################
+
 ELFUTILS_VERSION = 0.155
 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION)
diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index 005f880779..cf1e737828 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -3,6 +3,7 @@
 # empty
 #
 #############################################################
+
 EMPTY_VERSION = 0.6.18b
 EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
 EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 896dfc6c8c..3425c5669e 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -3,6 +3,7 @@
 # enchant
 #
 #############################################################
+
 ENCHANT_VERSION = 1.5.0
 ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 89e19574d4..2f6f793a39 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -3,6 +3,7 @@
 # ezxml
 #
 #############################################################
+
 EZXML_VERSION = 0.8.6
 EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz
 EZXML_SITE = http://downloads.sourceforge.net/project/ezxml/ezXML/ezXML%20$(EZXML_VERSION)
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 734b065933..0a36181929 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -3,6 +3,7 @@
 # fakeroot
 #
 #############################################################
+
 FAKEROOT_VERSION = 1.18.2
 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
 FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20111201T093630Z/pool/main/f/fakeroot/
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index 4eb7c9e1cb..e6ccb32fd6 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -3,6 +3,7 @@
 # fconfig
 #
 #############################################################
+
 FCONFIG_VERSION = 20080329
 FCONFIG_SOURCE = fconfig-$(FCONFIG_VERSION).tar.gz
 FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig/
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 675cc6ed0f..7689a8f9da 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -3,6 +3,7 @@
 # flashrom
 #
 #############################################################
+
 FLASHROM_VERSION = 0.9.6.1
 FLASHROM_SOURCE  = flashrom-$(FLASHROM_VERSION).tar.bz2
 FLASHROM_SITE    = http://download.flashrom.org/releases
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 67621261f7..299a86b82a 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -3,6 +3,7 @@
 # fontconfig
 #
 #############################################################
+
 FONTCONFIG_VERSION = 2.6.0
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SITE = http://fontconfig.org/release
diff --git a/package/fxload/fxload.mk b/package/fxload/fxload.mk
index 8508084e06..7df9da52ff 100644
--- a/package/fxload/fxload.mk
+++ b/package/fxload/fxload.mk
@@ -3,6 +3,7 @@
 # fxload
 #
 #############################################################
+
 FXLOAD_VERSION = 2008_10_13
 FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION)
 FXLOAD_LICENSE = GPLv2+
diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index 0fc82210d0..356c2cbf87 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -3,6 +3,7 @@
 # gadgetfs-test
 #
 #############################################################
+
 GADGETFS_TEST_SOURCE=gadgetfs-test.tar.bz2
 GADGETFS_TEST_SITE=http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest/
 
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index b13a9ac6d6..36e10d3f0c 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -3,6 +3,7 @@
 # gamin
 #
 #############################################################
+
 GAMIN_VERSION = 0.1.10
 GAMIN_SOURCE = gamin-$(GAMIN_VERSION).tar.gz
 GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk
index 4971b127d7..6aeffe3b38 100644
--- a/package/gdbm/gdbm.mk
+++ b/package/gdbm/gdbm.mk
@@ -3,6 +3,7 @@
 # gdbm
 #
 #############################################################
+
 GDBM_VERSION = 1.10
 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
 GDBM_LICENSE = GPLv3
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index ab2bbef745..5a901704b8 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -3,6 +3,7 @@
 # giblib
 #
 #############################################################
+
 GIBLIB_VERSION = 1.2.4
 GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz
 GIBLIB_SITE = http://linuxbrit.co.uk/downloads/
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 6f64175353..178f4ad2a5 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -3,6 +3,7 @@
 # gqview
 #
 #############################################################
+
 GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index ef426cff38..fafb49b112 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -3,6 +3,7 @@
 # gnu gsl
 #
 #############################################################
+
 GSL_VERSION = 1.15
 GSL_SOURCE = gsl-$(GSL_VERSION).tar.gz
 GSL_SITE = $(BR2_GNU_MIRROR)/gsl
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index 1551ad530d..a7e2a3f307 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -3,6 +3,7 @@
 # gtk2-engines.0
 #
 #############################################################
+
 GTK2_ENGINES_VERSION = 2.20.2
 GTK2_ENGINES_SOURCE  = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
 GTK2_ENGINES_SITE    = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.20
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index 3a26cfc8b5..fd55a376dd 100644
--- a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -3,6 +3,7 @@
 # GTK Theme - Hicolour
 #
 #############################################################
+
 GTK2_THEME_HICOLOR_VERSION = 0.10
 GTK2_THEME_HICOLOR_SOURCE = hicolor-icon-theme-$(GTK2_THEME_HICOLOR_VERSION).tar.gz
 GTK2_THEME_HICOLOR_SITE = http://icon-theme.freedesktop.org/releases/
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 1ae094f2a0..14f3104666 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -3,6 +3,7 @@
 # gvfs
 #
 #############################################################
+
 GVFS_VERSION_MAJOR = 1.8
 GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk
index c56dea4829..517ca5ff5f 100644
--- a/package/hwdata/hwdata.mk
+++ b/package/hwdata/hwdata.mk
@@ -3,6 +3,7 @@
 # hwdata
 #
 #############################################################
+
 HWDATA_VERSION = 0.230
 HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz
 HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index cec67066be..c051925b5a 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -3,6 +3,7 @@
 ## IMLIB2
 #
 ##############################################################
+
 IMLIB2_VERSION = 1.4.5
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
diff --git a/package/infozip/infozip.mk b/package/infozip/infozip.mk
index 84c4c80a05..2b8052e801 100644
--- a/package/infozip/infozip.mk
+++ b/package/infozip/infozip.mk
@@ -3,6 +3,7 @@
 # infozip
 #
 #############################################################
+
 INFOZIP_VERSION = 30
 INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
 INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index b1cb093354..6f15da60e9 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -3,6 +3,7 @@
 # input-tools
 #
 #############################################################
+
 INPUT_TOOLS_VERSION = 20051019
 INPUT_TOOLS_SOURCE  = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
 INPUT_TOOLS_PATCH   = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index b20080fce4..7cd4c631d5 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -3,6 +3,7 @@
 # iperf
 #
 #############################################################
+
 IPERF_VERSION = 2.0.5
 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
 IPERF_SITE = http://downloads.sourceforge.net/project/iperf
diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk
index b024252293..344225b061 100644
--- a/package/lcdapi/lcdapi.mk
+++ b/package/lcdapi/lcdapi.mk
@@ -3,6 +3,7 @@
 # lcdapi
 #
 #############################################################
+
 LCDAPI_VERSION = v0.4
 LCDAPI_SITE = http://github.com/spdawson/lcdapi/tarball/$(LCDAPI_VERSION)
 LCDAPI_LICENSE = LGPLv2.1+
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index fe88f46f0d..95c6fe57db 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -3,6 +3,7 @@
 # lcdproc
 #
 #############################################################
+
 LCDPROC_VERSION = 0.5.6
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index b06e655d60..e37f6c895e 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -3,6 +3,7 @@
 # leafpad
 #
 #############################################################
+
 LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 7bcdfa2a27..243c9759e1 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -3,6 +3,7 @@
 # libaio
 #
 #############################################################
+
 LIBAIO_VERSION = 0.3.109
 LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz
 LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20110227T085214Z/pool/main/liba/libaio/
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index c00bc7bd80..4c5bd9ebf3 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -3,6 +3,7 @@
 # libarchive (reusable C library for archive formats)
 #
 #############################################################
+
 LIBARCHIVE_VERSION = 3.0.4
 LIBARCHIVE_SITE = http://github.com/downloads/libarchive/libarchive
 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz
diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
index 1d96ac7d7b..a7c4e5db96 100644
--- a/package/libatasmart/libatasmart.mk
+++ b/package/libatasmart/libatasmart.mk
@@ -3,6 +3,7 @@
 # libatasmart
 #
 #############################################################
+
 LIBATASMART_VERSION = 0.19
 LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
 LIBATASMART_SITE    = http://0pointer.de/public
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 4c5664fdf9..ec8b6ee5aa 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -3,6 +3,7 @@
 # libcgicc
 #
 #############################################################
+
 LIBCGICC_VERSION=3.2.9
 LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc
 LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index d88a2096e7..5b64eb1e3c 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -3,6 +3,7 @@
 # libconfuse
 #
 #############################################################
+
 LIBCONFUSE_VERSION = 2.7
 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
 LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index b77b7b2ea5..c11045a4dd 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -3,6 +3,7 @@
 # libelf
 #
 #############################################################
+
 LIBELF_VERSION=0.8.12
 LIBELF_SOURCE=libelf-$(LIBELF_VERSION).tar.gz
 LIBELF_SITE=http://www.mr511.de/software/
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index 363d327e79..5464b66a74 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -3,6 +3,7 @@
 # liberation
 #
 #############################################################
+
 LIBERATION_VERSION = 1.06.0.20100721
 LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts
 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index baa0d6467c..3e62e9e9d5 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -3,6 +3,7 @@
 # libesmtp
 #
 #############################################################
+
 LIBESMTP_VERSION = 1.0.6
 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
 LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index 564db37493..e1063bd2eb 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -3,6 +3,7 @@
 # libev
 #
 #############################################################
+
 LIBEV_VERSION = 4.11
 LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
 LIBEV_SITE = http://dist.schmorp.de/libev/
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 5ce511f912..6b31b20ca6 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -3,6 +3,7 @@
 # libevent
 #
 #############################################################
+
 LIBEVENT_VERSION = 2.0.14
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
 LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk
index a4d18a4092..0568d45e0d 100644
--- a/package/libfcgi/libfcgi.mk
+++ b/package/libfcgi/libfcgi.mk
@@ -3,6 +3,7 @@
 # libfcgi
 #
 ##############################################################################
+
 LIBFCGI_VERSION = 2.4.0
 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
 LIBFCGI_SITE = http://www.fastcgi.com/dist
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 3c96839d31..4e0514b332 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -3,6 +3,7 @@
 # libfreefare
 #
 #############################################################
+
 LIBFREEFARE_VERSION = 0.3.4
 LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
 LIBFREEFARE_DEPENDENCIES = libnfc openssl
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index 06316fe2df..3c4dcbc07e 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -3,6 +3,7 @@
 # libftdi
 #
 #############################################################
+
 LIBFTDI_VERSION = 0.19
 LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz
 LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download/
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index e3ea9b9732..8db2476bfb 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -3,6 +3,7 @@
 # libgail
 #
 #############################################################
+
 LIBGAIL_VERSION_MAJOR = 1.22
 LIBGAIL_VERSION_MINOR = 3
 LIBGAIL_VERSION = $(LIBGAIL_VERSION_MAJOR).$(LIBGAIL_VERSION_MINOR)
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
index 3bf420600d..115256f600 100644
--- a/package/libgeotiff/libgeotiff.mk
+++ b/package/libgeotiff/libgeotiff.mk
@@ -3,6 +3,7 @@
 # libgeotiff
 #
 #############################################################
+
 LIBGEOTIFF_VERSION = 1.3.0
 LIBGEOTIFF_SOURCE = libgeotiff-$(LIBGEOTIFF_VERSION).tar.gz
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 6a6641cef6..3197d44052 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -3,6 +3,7 @@
 # libglade
 #
 #############################################################
+
 LIBGLADE_VERSION = 2.6.4
 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
 LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 194fa64829..2c16f6a656 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,6 +3,7 @@
 # libglib2
 #
 #############################################################
+
 LIBGLIB2_VERSION_MAJOR = 2.30
 LIBGLIB2_VERSION_MINOR = 3
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 5881ea78ab..ceafc50bad 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -3,6 +3,7 @@
 # libgtk2.0
 #
 #############################################################
+
 LIBGTK2_VERSION_MAJOR = 2.24
 LIBGTK2_VERSION_MINOR = 10
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index ce1d7e23a9..6f634693e7 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -3,6 +3,7 @@
 # libiconv
 #
 #############################################################
+
 LIBICONV_VERSION = 1.14
 LIBICONV_SOURCE = libiconv-$(LIBICONV_VERSION).tar.gz
 LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk
index 924c3a7e6a..584867fa55 100644
--- a/package/liblo/liblo.mk
+++ b/package/liblo/liblo.mk
@@ -3,6 +3,7 @@
 # liblo
 #
 #############################################################
+
 LIBLO_VERSION = 0.26
 LIBLO_SOURCE = liblo-$(LIBLO_VERSION).tar.gz
 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION)
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index 3701cca656..e879b4cd7c 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -3,6 +3,7 @@
 # liblog4c
 #
 #############################################################
+
 LIBLOG4C_LOCALTIME_VERSION = 1.0
 LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index 5ab4f37bdf..ffa695e539 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -3,6 +3,7 @@
 # libmms
 #
 #############################################################
+
 LIBMMS_VERSION = 0.6.2
 LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz
 LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION)
diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index a390655089..a2d719a51d 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -3,6 +3,7 @@
 # libmodbus
 #
 #############################################################
+
 LIBMODBUS_VERSION = 3.0.3
 LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
 LIBMODBUS_INSTALL_STAGING = YES
diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
index f3cf2456fd..32a3d06096 100644
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -3,6 +3,7 @@
 # libmpeg2
 #
 #############################################################
+
 LIBMPEG2_VERSION = 0.5.1
 LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files
diff --git a/package/libnfc-llcp/libnfc-llcp.mk b/package/libnfc-llcp/libnfc-llcp.mk
index 0bff089e23..6975e780ec 100644
--- a/package/libnfc-llcp/libnfc-llcp.mk
+++ b/package/libnfc-llcp/libnfc-llcp.mk
@@ -3,6 +3,7 @@
 # libnfc-llcp
 #
 #############################################################
+
 LIBNFC_LLCP_VERSION = 1103
 LIBNFC_LLCP_SITE = http://nfc-tools.googlecode.com/svn/trunk/libnfc-llcp/
 LIBNFC_LLCP_SITE_METHOD = svn
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index b9ff583cf4..df52fa3815 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -3,6 +3,7 @@
 # libnfc
 #
 #############################################################
+
 LIBNFC_VERSION = fda8d60ce062
 LIBNFC_SITE = http://libnfc.googlecode.com/git/
 LIBNFC_SITE_METHOD = git
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 71b64b94d9..d2db183681 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -3,6 +3,7 @@
 # libnspr
 #
 #############################################################
+
 LIBNSPR_VERSION = 4.9.6
 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
 LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
index 9eb0e7db14..b5fa68fa04 100644
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -3,6 +3,7 @@
 # liboauth
 #
 #############################################################
+
 LIBOAUTH_VERSION = 0.9.6
 LIBOAUTH_SOURCE = liboauth-$(LIBOAUTH_VERSION).tar.gz
 LIBOAUTH_SITE = http://liboauth.sourceforge.net/pool
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 606c004c2e..2d5f2c19e1 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -3,6 +3,7 @@
 # libogg
 #
 #############################################################
+
 LIBOGG_VERSION = 1.3.0
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 LIBOGG_LICENSE = BSD-3c
diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
index 511c7f690f..8e8e503bf7 100644
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -3,6 +3,7 @@
 # libplayer
 #
 #############################################################
+
 LIBPLAYER_VERSION = 2.0.1
 LIBPLAYER_SITE = http://libplayer.geexbox.org/releases/
 LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 1a19bcd5f4..37f839cf26 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -3,6 +3,7 @@
 # libtheora
 #
 #############################################################
+
 LIBTHEORA_VERSION = 1.1.1
 LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.bz2
 LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 25cd89dd81..1c31ee8f55 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -3,6 +3,7 @@
 # libtool
 #
 #############################################################
+
 LIBTOOL_VERSION = 2.4.2
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
index 3ef9cc3b82..c83286a728 100644
--- a/package/libtpl/libtpl.mk
+++ b/package/libtpl/libtpl.mk
@@ -3,6 +3,7 @@
 # libtpl
 #
 #############################################################
+
 LIBTPL_VERSION = 1.5
 LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
 LIBTPL_SITE = http://downloads.sourceforge.net/project/tpl/tpl/libtpl-$(LIBTPL_VERSION)
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index b4a4424cf8..32a7167b4d 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -3,6 +3,7 @@
 # liburc: userspace RCU (read-copy-update) library
 #
 #############################################################
+
 LIBURCU_VERSION = 0.7.6
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 9551dfe4e0..33f113e3db 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -3,6 +3,7 @@
 # libusb-compat
 #
 #############################################################
+
 LIBUSB_COMPAT_VERSION = 0.1.4
 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
 LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index fc2f10b558..806f2d316c 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -3,6 +3,7 @@
 # libusb
 #
 #############################################################
+
 LIBUSB_VERSION = 1.0.9
 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 0639505f4a..8ab99f8829 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -3,6 +3,7 @@
 # libv4l
 #
 #############################################################
+
 LIBV4L_VERSION = 0.8.9
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils/
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index f52a68f58d..c1b5bdd133 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -3,6 +3,7 @@
 # libyaml
 #
 #############################################################
+
 LIBYAML_VERSION = 0.1.4
 LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
 LIBYAML_SITE = http://pyyaml.org/download/libyaml/
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index fb739602a2..293208afb1 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -3,6 +3,7 @@
 # linenoise
 #
 #############################################################
+
 LINENOISE_VERSION = g27a3b4d
 LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
 LINENOISE_LICENSE = BSD-2c
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index a2340bd4b3..80b14ca50c 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,6 +3,7 @@
 # linux-fusion
 #
 #############################################################
+
 LINUX_FUSION_VERSION = 9.0.0
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 1c3cb51453..3d6e459197 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -3,6 +3,7 @@
 # lockfile-progs
 #
 #############################################################
+
 LOCKFILE_PROGS_VERSION = 0.1.15
 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
 LOCKFILE_PROGS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 82dde390c5..6d2d90afdd 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -3,6 +3,7 @@
 # logrotate
 #
 #############################################################
+
 LOGROTATE_VERSION = 3.8.4
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
 LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate/
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index e143118301..aab2dd6e8b 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -3,6 +3,7 @@
 # LTTng-UST: the userspace tracing library
 #
 #############################################################
+
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
 LTTNG_LIBUST_VERSION = 2.1.1
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index 54ae864141..80ac105dfd 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -3,6 +3,7 @@
 # LTTng-modules: the kernel modules (requires at least Linux 2.6.38)
 #
 #############################################################
+
 LTTNG_MODULES_VERSION = 2.1.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 5be3abb587..97df1cfc01 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -3,6 +3,7 @@
 # LTTng-Tools: the trace control client
 #
 #############################################################
+
 LTTNG_TOOLS_VERSION = 2.1.1
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 97ce83ce57..bde7708d11 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -3,6 +3,7 @@
 # lua-msgpack-native
 #
 #############################################################
+
 LUA_MSGPACK_NATIVE_VERSION = g41cce91
 LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/master
 LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk
index 1f79d5d219..dc70cee409 100644
--- a/package/luacjson/luacjson.mk
+++ b/package/luacjson/luacjson.mk
@@ -3,6 +3,7 @@
 # luacjson
 #
 #############################################################
+
 LUACJSON_VERSION       = 2.1.0
 LUACJSON_SOURCE        = lua-cjson-$(LUACJSON_VERSION).tar.gz
 LUACJSON_SITE          = http://www.kyne.com.au/~mark/software/download
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 49f135d56b..69df260d17 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -3,6 +3,7 @@
 # lvm2
 #
 #############################################################
+
 LVM2_VERSION = 2.02.79
 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
 LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 132140fcec..6809f302b8 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -3,6 +3,7 @@
 # lzo
 #
 #############################################################
+
 LZO_VERSION = 2.06
 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
 LZO_LICENSE = GPLv2+
diff --git a/package/macchanger/macchanger.mk b/package/macchanger/macchanger.mk
index 66ebb80fcc..93b55498a9 100644
--- a/package/macchanger/macchanger.mk
+++ b/package/macchanger/macchanger.mk
@@ -3,6 +3,7 @@
 # macchanger
 #
 #############################################################
+
 MACCHANGER_VERSION = 1.5.0
 MACCHANGER_SITE = $(BR2_GNU_MIRROR)/macchanger
 MACCHANGER_LICENSE = GPLv2
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 89c00c2ea8..61b9e956ec 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -3,6 +3,7 @@
 # MatchBox Common
 #
 #############################################################
+
 MATCHBOX_COMMON_VERSION_MAJOR = 0.9
 MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index c9ef3f47af..9b12c3da05 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -3,6 +3,7 @@
 # MatchBox Panel
 #
 #############################################################
+
 MATCHBOX_PANEL_VERSION_MAJOR = 0.9
 MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index 461a9062b6..a34330134b 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -3,6 +3,7 @@
 # memtester
 #
 #############################################################
+
 MEMTESTER_VERSION = 4.3.0
 MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions/
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index b9d763c85e..88187c6950 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -3,6 +3,7 @@
 # mii-diag
 #
 #############################################################
+
 MII_DIAG_VERSION = 2.11
 MII_DIAG_SOURCE  = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
 MII_DIAG_PATCH   = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 06b023eaba..1dfbde7edb 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -3,6 +3,7 @@
 # minicom
 #
 #############################################################
+
 MINICOM_VERSION = 2.6.1
 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
 MINICOM_SITE = http://alioth.debian.org/frs/download.php/3700/
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index e7c4510d09..5eff6d1abe 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -3,6 +3,7 @@
 # mobile broadband provider info
 #
 #############################################################
+
 MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20120614
 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
 MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index eafce45b99..5c5eadcdfa 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,6 +3,7 @@
 # mtd provides jffs2 utilities
 #
 #############################################################
+
 MTD_VERSION = 1.5.0
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
diff --git a/package/mtdev/mtdev.mk b/package/mtdev/mtdev.mk
index 09f76f24ee..d240b505a4 100644
--- a/package/mtdev/mtdev.mk
+++ b/package/mtdev/mtdev.mk
@@ -3,6 +3,7 @@
 # mtdev
 #
 #############################################################
+
 MTDEV_VERSION = 1.1.3
 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2
 MTDEV_SITE = http://bitmath.org/code/mtdev/
diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
index 930694696f..fcbe5a6562 100644
--- a/package/mtdev2tuio/mtdev2tuio.mk
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -3,6 +3,7 @@
 # mtdev2tuio
 #
 #############################################################
+
 MTDEV2TUIO_VERSION = e1e7378
 MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/master
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
index c612b95ee9..07004cedd3 100644
--- a/package/multimedia/bellagio/bellagio.mk
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -3,6 +3,7 @@
 # bellagio
 #
 #############################################################
+
 BELLAGIO_VERSION = 0.9.3
 BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
 BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION)
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 183de7ba08..1e8f54e381 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -3,6 +3,7 @@
 # gst-plugins-bad
 #
 #############################################################
+
 GST_PLUGINS_BAD_VERSION = 0.10.23
 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 02e7ca41c8..713aaae078 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -3,6 +3,7 @@
 # gst-plugins-base
 #
 #############################################################
+
 GST_PLUGINS_BASE_VERSION = 0.10.36
 GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 2ba3e20103..b61138dbc3 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -3,6 +3,7 @@
 # gst-plugins-good
 #
 #############################################################
+
 GST_PLUGINS_GOOD_VERSION = 0.10.31
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index e23d77448b..752f8e802e 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -3,6 +3,7 @@
 # gst-plugins-ugly
 #
 #############################################################
+
 GST_PLUGINS_UGLY_VERSION = 0.10.19
 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 5abce53970..3639a557bb 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -4,6 +4,7 @@
 # gstreamer
 #
 #############################################################
+
 GSTREAMER_VERSION = 0.10.36
 GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 4a1abf4957..6ddf002dd2 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -3,6 +3,7 @@
 # mplayer
 #
 #############################################################
+
 MPLAYER_VERSION = 1.1
 MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
 MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 529f5dd278..c789fc8bb2 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -3,6 +3,7 @@
 # pulseaudio
 #
 ################################################################################
+
 PULSEAUDIO_VERSION = 3.0
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index 03850d0f5d..5f03db893e 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -3,6 +3,7 @@
 # mxml
 #
 #############################################################
+
 MXML_VERSION = 2.7
 MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION)
 MXML_LICENSE = LGPLv2+ with exceptions
diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index de4cc5fd2e..a6cd7e1aa0 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -3,6 +3,7 @@
 # nanocom
 #
 #############################################################
+
 NANOCOM_VERSION = 2.6.1
 NANOCOM_SOURCE = nanocom.tar.gz
 NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v1.0
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 3bff302007..32d63adc1e 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -3,6 +3,7 @@
 # neon
 #
 #############################################################
+
 NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
 NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index a366644a19..2e0f978f74 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -3,6 +3,7 @@
 # netatalk
 #
 #############################################################
+
 NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 3899b78ab7..01f35be90a 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -3,6 +3,7 @@
 # netkitbase
 #
 #############################################################
+
 NETKITBASE_VERSION = 0.17
 NETKITBASE_SOURCE  = netkit-base-$(NETKITBASE_VERSION).tar.gz
 NETKITBASE_SITE    = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index a0f2786016..db6743e55a 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -3,6 +3,7 @@
 # netkittelnet
 #
 #############################################################
+
 NETKITTELNET_VERSION = 0.17
 NETKITTELNET_SOURCE  = netkit-telnet-$(NETKITTELNET_VERSION).tar.gz
 NETKITTELNET_SITE    = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index e42894f61e..0c723bffb9 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -3,6 +3,7 @@
 # netplug
 #
 #############################################################
+
 NETPLUG_VERSION=1.2.9.2
 NETPLUG_SOURCE=netplug-$(NETPLUG_VERSION).tar.bz2
 NETPLUG_SITE=http://www.red-bean.com/~bos/netplug
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index 8a0c647ada..754636ba43 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -3,6 +3,7 @@
 # newt
 #
 #############################################################
+
 NEWT_VERSION         = 0.51.0
 NEWT_SITE            = http://www.uclibc.org/
 NEWT_SOURCE          = newt-$(NEWT_VERSION).tar.bz2
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 4cea4ec966..250050e4f1 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -3,6 +3,7 @@
 # nss_mdns
 #
 #############################################################
+
 NSS_MDNS_VERSION=0.10
 NSS_MDNS_SITE=http://0pointer.de/lennart/projects/nss-mdns
 
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index bc71ead259..e42f654d77 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -3,6 +3,7 @@
 # OpenCV (Open Source Computer Vision)
 #
 #############################################################
+
 OPENCV_VERSION = 2.4.2
 OPENCV_SITE    = http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION)
 OPENCV_SOURCE  = OpenCV-$(OPENCV_VERSION).tar.bz2
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index fef1117749..18ce0fdc6b 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -3,6 +3,7 @@
 # orc
 #
 #############################################################
+
 ORC_VERSION = 0.4.16
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_LICENSE = BSD-2c, BSD-3c
diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk
index 832f6b154b..a54cc5df4c 100644
--- a/package/owl-linux/owl-linux.mk
+++ b/package/owl-linux/owl-linux.mk
@@ -3,6 +3,7 @@
 # owl-linux
 #
 #############################################################
+
 OWL_LINUX_VERSION = 1.0.7
 OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers
 OWL_LINUX_LICENSE = PROPRIETARY
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 8e0444ea38..75477d9f12 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -3,6 +3,7 @@
 # pango
 #
 #############################################################
+
 PANGO_VERSION_MAJOR = 1.28
 PANGO_VERSION_MINOR = 4
 PANGO_VERSION = $(PANGO_VERSION_MAJOR).$(PANGO_VERSION_MINOR)
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 392e3ad79a..4a2cdacc47 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -3,6 +3,7 @@
 # pcmanfm
 #
 #############################################################
+
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index a59568173e..4f70ce5e6b 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,6 +3,7 @@
 # pixman
 #
 ################################################################################
+
 PIXMAN_VERSION = 0.30.0
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_LICENSE = MIT
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 32a026be1e..1aa9bb49f7 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -3,6 +3,7 @@
 # poco
 #
 #############################################################
+
 POCO_VERSION_MAJOR = 1.4.6
 POCO_VERSION = $(POCO_VERSION_MAJOR)p1
 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index fb3a766720..9193553081 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -3,6 +3,7 @@
 # popt
 #
 #############################################################
+
 POPT_VERSION = 1.16
 # rpm5.org down
 POPT_SITE = http://anduin.linuxfromscratch.org/sources/BLFS/svn/p/
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
index 1f5c3ddc6d..48fe018b89 100644
--- a/package/prboom/prboom.mk
+++ b/package/prboom/prboom.mk
@@ -3,6 +3,7 @@
 # PrBoom
 #
 #############################################################
+
 PRBOOM_VERSION = 2.5.0
 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION)
 PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index 5032d709d3..519e568bf6 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -3,6 +3,7 @@
 # protobuf
 #
 #############################################################
+
 PROTOBUF_VERSION = 2.4.1
 PROTOBUF_SOURCE = protobuf-$(PROTOBUF_VERSION).tar.gz
 PROTOBUF_SITE = http://protobuf.googlecode.com/files/
diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk
index a053b2cb51..32c0a27de0 100644
--- a/package/python-nfc/python-nfc.mk
+++ b/package/python-nfc/python-nfc.mk
@@ -3,6 +3,7 @@
 # python-nfc
 #
 #############################################################
+
 PYTHON_NFC_VERSION = 142
 PYTHON_NFC_SITE = https://launchpad.net/nfcpy
 PYTHON_NFC_SITE_METHOD = bzr
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index f3426a407f..06159cc3de 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -3,6 +3,7 @@
 # Pygame
 #
 #############################################################
+
 # stable 1.9.1 release requires V4L which has been wiped out of recent Linux
 # kernels, so use latest mercurial revision until next stable release is out.
 PYTHON_PYGAME_VERSION = f0bb4a4b365d
diff --git a/package/python/python.mk b/package/python/python.mk
index 801c6692d3..6e95451453 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -3,6 +3,7 @@
 # python
 #
 #############################################################
+
 PYTHON_VERSION_MAJOR = 2.7
 PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).3
 PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 239ac8f630..f44ba130c0 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -3,6 +3,7 @@
 # python3
 #
 #############################################################
+
 PYTHON3_VERSION_MAJOR = 3.3
 PYTHON3_VERSION       = $(PYTHON3_VERSION_MAJOR).0
 PYTHON3_SOURCE        = Python-$(PYTHON3_VERSION).tar.bz2
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
index 0ac88746f2..8a9c7cbf4a 100644
--- a/package/qtuio/qtuio.mk
+++ b/package/qtuio/qtuio.mk
@@ -3,6 +3,7 @@
 # qTUIO
 #
 #############################################################
+
 QTUIO_VERSION = abe4973ff6
 QTUIO_SITE = git://github.com/x29a/qTUIO.git
 QTUIO_INSTALL_STAGING = YES
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 1a417eb803..0c408004e4 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -3,6 +3,7 @@
 # rpm
 #
 #############################################################
+
 RPM_VERSION = 5.2.0
 RPM_SITE = http://rpm5.org/files/rpm/rpm-5.2/
 RPM_DEPENDENCIES = zlib beecrypt neon popt
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 200175206a..2d3c27f289 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -3,6 +3,7 @@
 # rsyslog
 #
 #############################################################
+
 RSYSLOG_VERSION = 5.8.0
 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog/
 RSYSLOG_DEPENDENCIES = zlib
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
index 92703671b6..773e0bc26f 100644
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -3,6 +3,7 @@
 # rubix
 #
 #############################################################
+
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
 RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 9022845095..334cf9534e 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -3,6 +3,7 @@
 # sane-backends
 #
 #############################################################
+
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
 SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index b8c1121c62..4bf305234e 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -3,6 +3,7 @@
 # SAWMAN
 #
 #############################################################
+
 SAWMAN_VERSION = 1.6.3
 SAWMAN_SOURCE = SaWMan-$(SAWMAN_VERSION).tar.gz
 SAWMAN_SITE = http://www.directfb.org/downloads/Extras
diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
index 0285b628a7..7309b47f8e 100644
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -3,6 +3,7 @@
 # schifra
 #
 #############################################################
+
 SCHIFRA_VERSION = 0.0.1
 SCHIFRA_SITE = http://www.schifra.com/downloads
 SCHIFRA_SOURCE = schifra.tgz
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index bd511c6c0b..85a5ccb5cf 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -3,6 +3,7 @@
 # SDL_net: network addon for SDL
 #
 #############################################################
+
 SDL_NET_VERSION = 1.2.8
 SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
 SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 2f163a272d..e20a888088 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -3,6 +3,7 @@
 # sdl_sound addon for SDL
 #
 #############################################################
+
 SDL_SOUND_VERSION = 1.0.3
 SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz
 SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads/
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index fed52b254e..ed52245b8f 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -3,6 +3,7 @@
 # Setserial
 #
 #############################################################
+
 SETSERIAL_VERSION            = 2.17
 SETSERIAL_PATCH              = setserial_2.17-45.2.diff.gz
 SETSERIAL_SOURCE             = setserial_$(SETSERIAL_VERSION).orig.tar.gz
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 49a83233a3..1f32e51dd4 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -3,6 +3,7 @@
 # shared-mime-info
 #
 #############################################################
+
 SHARED_MIME_INFO_VERSION = 0.90
 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2
 SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index a2382ce804..bd4815ab46 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -3,6 +3,7 @@
 # slang
 #
 #############################################################
+
 SLANG_VERSION = 1.4.5
 SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
 SLANG_SITE = http://www.uclibc.org/
diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.mk b/package/snowball-hdmiservice/snowball-hdmiservice.mk
index ebd65dfba7..ceeecd693e 100644
--- a/package/snowball-hdmiservice/snowball-hdmiservice.mk
+++ b/package/snowball-hdmiservice/snowball-hdmiservice.mk
@@ -3,6 +3,7 @@
 # snowball-hdmiservice
 #
 #############################################################
+
 SNOWBALL_HDMISERVICE_VERSION = f75c99d1c52707240a78b4ba78e41d20d3aa3b08
 SNOWBALL_HDMISERVICE_SITE = git://igloocommunity.org/git/bsp/hdmiservice.git
 SNOWBALL_HDMISERVICE_LICENSE = MIT
diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk
index 278cacb2c4..d664b06deb 100644
--- a/package/snowball-init/snowball-init.mk
+++ b/package/snowball-init/snowball-init.mk
@@ -3,6 +3,7 @@
 # snowball-init
 #
 #############################################################
+
 SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7
 SNOWBALL_INIT_SITE = git://igloocommunity.org/git/bsp/snowball-init.git
 SNOWBALL_INIT_LICENSE = BSD-4c
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index efade31940..1771388acd 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -3,6 +3,7 @@
 # socketcand
 #
 #############################################################
+
 SOCKETCAND_VERSION = 7d06986
 SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/master
 SOCKETCAND_AUTORECONF = YES
diff --git a/package/sound-theme-borealis/sound-theme-borealis.mk b/package/sound-theme-borealis/sound-theme-borealis.mk
index afca72a103..8983bdf22b 100644
--- a/package/sound-theme-borealis/sound-theme-borealis.mk
+++ b/package/sound-theme-borealis/sound-theme-borealis.mk
@@ -3,6 +3,7 @@
 # sound-theme-borealis
 #
 #############################################################
+
 SOUND_THEME_BOREALIS_VERSION = 0.9a
 SOUND_THEME_BOREALIS_SITE = http://ico.bukvic.net/Linux/Borealis_soundtheme
 SOUND_THEME_BOREALIS_SOURCE = \
diff --git a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
index b7cf4c281a..ae30fe7133 100644
--- a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
+++ b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
@@ -3,6 +3,7 @@
 # sound-theme-freedesktop
 #
 #############################################################
+
 SOUND_THEME_FREEDESKTOP_VERSION = 0.7
 SOUND_THEME_FREEDESKTOP_SITE = \
 	http://people.freedesktop.org/~mccann/dist
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index 2fe179c6ba..28f2797e68 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -3,6 +3,7 @@
 # speex
 #
 #############################################################
+
 SPEEX_VERSION = 1.2rc1
 SPEEX_SITE = http://downloads.us.xiph.org/releases/speex
 SPEEX_LICENSE = BSD-3c
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index ab78f45a7f..f33528fb4d 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -4,6 +4,7 @@
 # http://sqlcipher.net
 #
 #############################################################
+
 SQLCIPHER_VERSION = 1.1.9
 SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index 54bfc2f173..50a5dd6711 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -3,6 +3,7 @@
 # startup-notification
 #
 #############################################################
+
 STARTUP_NOTIFICATION_VERSION = 0.9
 STARTUP_NOTIFICATION_SOURCE = startup-notification-$(STARTUP_NOTIFICATION_VERSION).tar.gz
 STARTUP_NOTIFICATION_SITE = http://freedesktop.org/software/startup-notification/releases
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
index 159812da6d..bacd0f023d 100644
--- a/package/statserial/statserial.mk
+++ b/package/statserial/statserial.mk
@@ -3,6 +3,7 @@
 # statserial
 #
 #############################################################
+
 STATSERIAL_VERSION = 1.1
 STATSERIAL_SOURCE = statserial-$(STATSERIAL_VERSION).tar.gz
 STATSERIAL_SITE = http://www.ibiblio.org/pub/Linux/system/serial/
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index a68adf228b..b2497f525b 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -3,6 +3,7 @@
 # sysklogd
 #
 #############################################################
+
 SYSKLOGD_VERSION = 1.5
 SYSKLOGD_SOURCE  = sysklogd_$(SYSKLOGD_VERSION).orig.tar.gz
 SYSKLOGD_PATCH   = sysklogd_$(SYSKLOGD_VERSION)-6.diff.gz
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index e85355ffba..8152f68514 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -3,6 +3,7 @@
 # systemd
 #
 #############################################################
+
 SYSTEMD_VERSION = 44
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
 SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 606c33ed31..ab42251273 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -3,6 +3,7 @@
 # sysvinit
 #
 #############################################################
+
 SYSVINIT_VERSION = 2.88
 SYSVINIT_SOURCE  = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
 SYSVINIT_PATCH   = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 144fefe03d..eb7c7f2aa3 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -3,6 +3,7 @@
 # TCL8.4
 #
 #############################################################
+
 TCL_VERSION_MAJOR = 8.4
 TCL_VERSION_MINOR = 19
 TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk
index 09d617f445..a91af27c66 100644
--- a/package/tcllib/tcllib.mk
+++ b/package/tcllib/tcllib.mk
@@ -3,6 +3,7 @@
 # tcllib
 #
 #############################################################
+
 TCLLIB_VERSION       = 1.13
 TCLLIB_SOURCE        = tcllib-$(TCLLIB_VERSION).tar.bz2
 TCLLIB_SITE          = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index dc7c285113..9bf68bd463 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -3,6 +3,7 @@
 # thttpd
 #
 #############################################################
+
 THTTPD_VERSION = 2.25b
 THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
 THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 3d1845dd42..ed4670dec7 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -3,6 +3,7 @@
 # tinyhttpd
 #
 #############################################################
+
 TINYHTTPD_VERSION = 0.1.0
 TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION)
 
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index eedb6f783f..c2388d4f38 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -3,6 +3,7 @@
 # torsmo
 #
 #############################################################
+
 TORSMO_VERSION = 0.18
 TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
 TORSMO_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 10315dc247..6187360d91 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -3,6 +3,7 @@
 # transmission
 #
 #############################################################
+
 TRANSMISSION_VERSION = 2.33
 TRANSMISSION_SITE = http://download.transmissionbt.com/files/
 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 2c072723e2..6d1abcba98 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -3,6 +3,7 @@
 # tslib
 #
 #############################################################
+
 TSLIB_VERSION = 158ee49b32f83cb7b02d5315f41c2e4cff38942d
 TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
 TSLIB_LICENSE = GPL, LGPL
diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index d8d03ec56d..52e3fdf745 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -3,6 +3,7 @@
 # ttcp
 #
 #############################################################
+
 #
 TTCP_VERSION =
 TTCP_SITE    = http://ftp.sunet.se/pub/network/monitoring/ttcp
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 410af1e7ce..76e727c507 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -3,6 +3,7 @@
 # uboot-tools
 #
 #############################################################
+
 UBOOT_TOOLS_VERSION = 2013.04
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 3596c9be2a..821b77e15e 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -3,6 +3,7 @@
 # usbmount
 #
 #############################################################
+
 USBMOUNT_VERSION = 0.0.22
 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
 USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount
diff --git a/package/ux500-firmware/ux500-firmware.mk b/package/ux500-firmware/ux500-firmware.mk
index d354468ab6..543698ac2c 100644
--- a/package/ux500-firmware/ux500-firmware.mk
+++ b/package/ux500-firmware/ux500-firmware.mk
@@ -3,6 +3,7 @@
 # ux500-firmware
 #
 #############################################################
+
 UX500_FIRMWARE_VERSION = 1.1.3-6
 UX500_FIRMWARE_SOURCE = ux500-firmware_$(UX500_FIRMWARE_VERSION)linaro1.tar.gz
 UX500_FIRMWARE_SITE = https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files/
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 97f6238365..9495ef00a6 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -3,6 +3,7 @@
 # libxcb
 #
 #############################################################
+
 LIBXCB_VERSION = 1.8.1
 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
 LIBXCB_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index fef6a9f728..634b9ea308 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -3,6 +3,7 @@
 # xapp_xman - Manual page display program for the X Window System
 #
 #############################################################
+
 XAPP_XMAN_VERSION = 1.0.3
 XAPP_XMAN_SOURCE = xman-$(XAPP_XMAN_VERSION).tar.bz2
 XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 730feb595f..115d6000ad 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -3,6 +3,7 @@
 # xcb-proto
 #
 #############################################################
+
 XCB_PROTO_VERSION = 1.7.1
 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
 XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
index 8960c77e3d..72077a2faa 100644
--- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
+++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
@@ -3,6 +3,7 @@
 # xcb-util-keysyms
 #
 #############################################################
+
 XCB_UTIL_KEYSYMS_VERSION = 0.3.9
 XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2
 XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index a16b1503f2..fd55fc9685 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -3,6 +3,7 @@
 # xcb-util
 #
 #############################################################
+
 XCB_UTIL_VERSION = 0.3.9
 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index a42c234c17..cd04a40281 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -3,6 +3,7 @@
 # openchrome
 #
 #############################################################
+
 XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.906
 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://www.openchrome.org/releases
diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
index d48272a30e..7e441dbae5 100644
--- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
+++ b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
@@ -3,6 +3,7 @@
 # xlib_libpthread-stubs
 #
 #############################################################
+
 XLIB_LIBPTHREAD_STUBS_VERSION = 0.3
 XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2
 XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 73da50e03a..d1ddf48e62 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -3,6 +3,7 @@
 # X11VNC
 #
 #############################################################
+
 X11VNC_VERSION = 0.9.13
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
 X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index bf90fd54ad..71a24a68b8 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -3,6 +3,7 @@
 # xerces
 #
 #############################################################
+
 XERCES_VERSION = 3.1.1
 XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.gz
 XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources/
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 823bf39a35..d47984c3c0 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -3,6 +3,7 @@
 # xfsprogs
 #
 #############################################################
+
 XFSPROGS_VERSION = 3.1.11
 XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
 
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index cb48145cf5..510e7a5848 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -3,6 +3,7 @@
 # xinetd
 #
 #############################################################
+
 XINETD_VERSION       = 2.3.15
 XINETD_SOURCE        = xinetd-$(XINETD_VERSION).tar.gz
 XINETD_SITE          = http://www.xinetd.org
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index 83f347d1a6..730312ecd5 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -3,6 +3,7 @@
 # xstroke
 #
 #############################################################
+
 XSTROKE_VERSION = 0.6
 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
 XSTROKE_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 59085bf73d..04ad2c9639 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -3,6 +3,7 @@
 # xvkbd
 #
 #############################################################
+
 XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index fafd1ec6dc..b8ec9a59f1 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -3,6 +3,7 @@
 # yasm
 #
 #############################################################
+
 YASM_VERSION = 1.2.0
 YASM_SOURCE = yasm-$(YASM_VERSION).tar.gz
 YASM_SITE = http://www.tortall.net/projects/yasm/releases/
diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index 851aef6d4b..d35f933c1f 100644
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -3,6 +3,7 @@
 # zxing
 #
 #############################################################
+
 ZXING_VERSION = 2.0
 ZXING_SITE = http://zxing.googlecode.com/files
 ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip

From 660444e19baf2cb7470925c16431f636edf4d9dc Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:27 +0000
Subject: [PATCH 5321/6849] imlib2: fix header

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imlib2/imlib2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index c051925b5a..6319508511 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-## IMLIB2
+# IMLIB2
 #
 ##############################################################
 

From 966e005d52f3c4e6ab632ab3fa5f8656d2893d72 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:28 +0000
Subject: [PATCH 5322/6849] Convert headers to lower case when relevant

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aircrack-ng/aircrack-ng.mk       | 2 +-
 package/boost/boost.mk                   | 2 +-
 package/cryptodev/cryptodev.mk           | 2 +-
 package/fluxbox/fluxbox.mk               | 2 +-
 package/imlib2/imlib2.mk                 | 2 +-
 package/iozone/iozone.mk                 | 2 +-
 package/jpeg/jpeg.mk                     | 2 +-
 package/libatomic_ops/libatomic_ops.mk   | 2 +-
 package/libeXosip2/libeXosip2.mk         | 2 +-
 package/mongrel2/mongrel2.mk             | 2 +-
 package/open2300/open2300.mk             | 2 +-
 package/openntpd/openntpd.mk             | 2 +-
 package/pciutils/pciutils.mk             | 2 +-
 package/pcre/pcre.mk                     | 2 +-
 package/pcsc-lite/pcsc-lite.mk           | 2 +-
 package/prboom/prboom.mk                 | 2 +-
 package/python-pygame/python-pygame.mk   | 2 +-
 package/qtuio/qtuio.mk                   | 2 +-
 package/quota/quota.mk                   | 2 +-
 package/sawman/sawman.mk                 | 2 +-
 package/setserial/setserial.mk           | 2 +-
 package/slirp/slirp.mk                   | 2 +-
 package/spice-protocol/spice-protocol.mk | 2 +-
 package/spice/spice.mk                   | 2 +-
 package/sqlcipher/sqlcipher.mk           | 2 +-
 package/tcl/tcl.mk                       | 2 +-
 package/x11vnc/x11vnc.mk                 | 2 +-
 package/xmlstarlet/xmlstarlet.mk         | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index bac45d1b2f..7543c6cac1 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Aircrack-ng
+# aircrack-ng
 #
 #############################################################
 
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index d11f378c14..b5b58691b0 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Boost
+# boost
 #
 #############################################################
 
diff --git a/package/cryptodev/cryptodev.mk b/package/cryptodev/cryptodev.mk
index b6f4a42d13..a367293a01 100644
--- a/package/cryptodev/cryptodev.mk
+++ b/package/cryptodev/cryptodev.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Virtual cryptodev package
+# virtual cryptodev package
 #
 #############################################################
 
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 52503af0dc..a0728fac1c 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# FLUXBOX
+# fluxbox
 #
 #############################################################
 
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index 6319508511..e69503bad9 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# IMLIB2
+# imlib2
 #
 ##############################################################
 
diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk
index 71c6840fef..a07571b85e 100644
--- a/package/iozone/iozone.mk
+++ b/package/iozone/iozone.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# IOZONE
+# iozone
 #
 #############################################################
 
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 962908df39..207edc8dd0 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Virtual jpeg package
+# virtual jpeg package
 #
 #############################################################
 
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index 10db2722e5..3216ddc44b 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Atomic_ops library
+# atomic_ops library
 #
 #############################################################
 
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 7fef1a65ae..c500da7d8a 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libeXosip2
+# libexosip2
 #
 #############################################################
 
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index c135437586..06ec6cdb83 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Mongrel2
+# mongrel2
 #
 #############################################################
 
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index 85e24514d1..5a129ec39b 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -1,6 +1,6 @@
 ############################################################
 #
-# Open2300
+# open2300
 #
 ############################################################
 
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index fab68b62ef..7419359c7a 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# OpenNTPD
+# openntpd
 #
 #############################################################
 
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index c1ae094378..d9265a398f 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# PCIUTILS
+# pciutils
 #
 #############################################################
 
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 066da6900b..62f22100e3 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# PCRE
+# pcre
 #
 #############################################################
 
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index e1def7c03f..b3bd34273f 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -1,6 +1,6 @@
 ##########################################################
 #
-# PCSC-Lite
+# pcsc-lite
 #
 #########################################################
 
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
index 48fe018b89..027e982661 100644
--- a/package/prboom/prboom.mk
+++ b/package/prboom/prboom.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# PrBoom
+# prboom
 #
 #############################################################
 
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index 06159cc3de..61af1af25c 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Pygame
+# pygame
 #
 #############################################################
 
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
index 8a9c7cbf4a..38644dded6 100644
--- a/package/qtuio/qtuio.mk
+++ b/package/qtuio/qtuio.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# qTUIO
+# qtuio
 #
 #############################################################
 
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 9afc9e3ad5..3087940157 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# QUOTA
+# quota
 #
 #############################################################
 
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index 4bf305234e..e6439d52c5 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# SAWMAN
+# sawman
 #
 #############################################################
 
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index ed52245b8f..215b5ee44d 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Setserial
+# setserial
 #
 #############################################################
 
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index b3f4bcdf10..5b608e0a7f 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Spice-slirp
+# spice-slirp
 #
 #############################################################
 
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
index dcfe50d248..0404377724 100644
--- a/package/spice-protocol/spice-protocol.mk
+++ b/package/spice-protocol/spice-protocol.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Spice-protocol
+# spice-protocol
 #
 #############################################################
 
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 78ca202b1e..291386acb2 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Spice
+# spice
 #
 #############################################################
 
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index f33528fb4d..510d4af9df 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Sqlcipher extension of sqlite
+# sqlcipher extension of sqlite
 # http://sqlcipher.net
 #
 #############################################################
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index eb7c7f2aa3..c4a1c3da00 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# TCL8.4
+# tcl8.4
 #
 #############################################################
 
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index d1ddf48e62..635b670ef2 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# X11VNC
+# x11vnc
 #
 #############################################################
 
diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 5919619ba1..2d2209180b 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# XMLstarlet
+# xmlstarlet
 #
 #############################################################
 

From 51dea66f96b5c00433070ef126d829292b3cad97 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed, 5 Jun 2013 22:47:30 +0000
Subject: [PATCH 5323/6849] doc: Add txt document for the new package-specific
 FLAT_STACKSIZE option.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index aa94b88691..0d7504241b 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -342,6 +342,12 @@ information is (assuming the package name is +libfoo+) :
   non-opensource packages: Buildroot will not save the source code for this
   package when collecting the +legal-info+.
 
+* +LIBFOO_FLAT_STACKSIZE+ defines the stack size of an application built into
+  the FLAT binary format. The application stack size on the NOMMU architecture
+  processors can't be enlarged at run time. The default stack size for the
+  FLAT binary format is only 4k bytes. If the application consumes more stack,
+  append the required number here.
+
 The recommended way to define these variables is to use the following
 syntax:
 

From f2c2f25cef00d153dd60e60a4c8def826567d0b6 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:29 +0000
Subject: [PATCH 5324/6849] Remove description and url from header

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk                                        | 2 +-
 package/berkeleydb/berkeleydb.mk                              | 2 +-
 package/connman/connman.mk                                    | 2 +-
 package/ctorrent/ctorrent.mk                                  | 2 +-
 package/gsl/gsl.mk                                            | 2 +-
 package/libarchive/libarchive.mk                              | 2 +-
 package/libdaemon/libdaemon.mk                                | 2 +-
 package/libfslcodec/libfslcodec.mk                            | 2 +-
 package/libfslparser/libfslparser.mk                          | 2 +-
 package/libfslvpuwrap/libfslvpuwrap.mk                        | 2 +-
 package/libiqrf/libiqrf.mk                                    | 2 +-
 package/libjpeg/libjpeg.mk                                    | 2 +-
 package/libpng/libpng.mk                                      | 2 +-
 package/liburcu/liburcu.mk                                    | 2 +-
 package/live555/live555.mk                                    | 2 +-
 package/lrzsz/lrzsz.mk                                        | 2 +-
 package/lttng-libust/lttng-libust.mk                          | 2 +-
 package/lttng-modules/lttng-modules.mk                        | 2 +-
 package/lttng-tools/lttng-tools.mk                            | 2 +-
 package/mtd/mtd.mk                                            | 2 +-
 package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk         | 2 +-
 package/ncftp/ncftp.mk                                        | 2 +-
 package/ncurses/Config.in                                     | 2 ++
 package/ncurses/ncurses.mk                                    | 1 -
 package/ngircd/ngircd.mk                                      | 2 +-
 package/opencv/opencv.mk                                      | 2 +-
 package/pv/pv.mk                                              | 2 +-
 package/quagga/quagga.mk                                      | 2 +-
 package/readline/readline.mk                                  | 2 +-
 package/sqlcipher/Config.in                                   | 1 +
 package/sqlcipher/sqlcipher.mk                                | 3 +--
 package/stress/stress.mk                                      | 4 +---
 package/tremor/tremor.mk                                      | 2 +-
 package/urg/urg.mk                                            | 2 +-
 package/vtun/Config.in                                        | 3 +++
 package/vtun/vtun.mk                                          | 3 ---
 package/x11r7/xapp_appres/xapp_appres.mk                      | 2 +-
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk                  | 2 +-
 package/x11r7/xapp_beforelight/xapp_beforelight.mk            | 2 +-
 package/x11r7/xapp_bitmap/xapp_bitmap.mk                      | 2 +-
 package/x11r7/xapp_editres/xapp_editres.mk                    | 2 +-
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk              | 2 +-
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk                | 2 +-
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk                    | 2 +-
 package/x11r7/xapp_iceauth/xapp_iceauth.mk                    | 2 +-
 package/x11r7/xapp_ico/xapp_ico.mk                            | 2 +-
 package/x11r7/xapp_listres/xapp_listres.mk                    | 2 +-
 package/x11r7/xapp_luit/xapp_luit.mk                          | 2 +-
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk                | 2 +-
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk            | 2 +-
 package/x11r7/xapp_oclock/xapp_oclock.mk                      | 2 +-
 package/x11r7/xapp_rgb/xapp_rgb.mk                            | 2 +-
 package/x11r7/xapp_rstart/xapp_rstart.mk                      | 2 +-
 package/x11r7/xapp_scripts/xapp_scripts.mk                    | 2 +-
 package/x11r7/xapp_sessreg/xapp_sessreg.mk                    | 2 +-
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk                | 2 +-
 package/x11r7/xapp_showfont/xapp_showfont.mk                  | 2 +-
 package/x11r7/xapp_smproxy/xapp_smproxy.mk                    | 2 +-
 package/x11r7/xapp_twm/xapp_twm.mk                            | 2 +-
 package/x11r7/xapp_viewres/xapp_viewres.mk                    | 2 +-
 package/x11r7/xapp_x11perf/xapp_x11perf.mk                    | 2 +-
 package/x11r7/xapp_xauth/xapp_xauth.mk                        | 2 +-
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk              | 2 +-
 package/x11r7/xapp_xbiff/xapp_xbiff.mk                        | 2 +-
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                        | 2 +-
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk              | 2 +-
 package/x11r7/xapp_xclock/xapp_xclock.mk                      | 2 +-
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk                      | 2 +-
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk              | 2 +-
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk                | 2 +-
 package/x11r7/xapp_xditview/xapp_xditview.mk                  | 2 +-
 package/x11r7/xapp_xdm/xapp_xdm.mk                            | 2 +-
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk                  | 2 +-
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk                  | 2 +-
 package/x11r7/xapp_xedit/xapp_xedit.mk                        | 2 +-
 package/x11r7/xapp_xev/xapp_xev.mk                            | 2 +-
 package/x11r7/xapp_xeyes/xapp_xeyes.mk                        | 2 +-
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk                    | 2 +-
 package/x11r7/xapp_xfd/xapp_xfd.mk                            | 2 +-
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk                  | 2 +-
 package/x11r7/xapp_xfs/xapp_xfs.mk                            | 2 +-
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk                    | 2 +-
 package/x11r7/xapp_xgamma/xapp_xgamma.mk                      | 2 +-
 package/x11r7/xapp_xgc/xapp_xgc.mk                            | 2 +-
 package/x11r7/xapp_xhost/xapp_xhost.mk                        | 2 +-
 package/x11r7/xapp_xinit/xapp_xinit.mk                        | 2 +-
 package/x11r7/xapp_xinput/xapp_xinput.mk                      | 2 +-
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk                    | 2 +-
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk                      | 2 +-
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk                  | 2 +-
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk                  | 2 +-
 package/x11r7/xapp_xkill/xapp_xkill.mk                        | 2 +-
 package/x11r7/xapp_xload/xapp_xload.mk                        | 2 +-
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                        | 2 +-
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk                  | 2 +-
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk              | 2 +-
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk                  | 2 +-
 package/x11r7/xapp_xmag/xapp_xmag.mk                          | 2 +-
 package/x11r7/xapp_xman/xapp_xman.mk                          | 2 +-
 package/x11r7/xapp_xmessage/xapp_xmessage.mk                  | 2 +-
 package/x11r7/xapp_xmh/xapp_xmh.mk                            | 2 +-
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk                    | 2 +-
 package/x11r7/xapp_xmore/xapp_xmore.mk                        | 2 +-
 package/x11r7/xapp_xpr/xapp_xpr.mk                            | 2 +-
 package/x11r7/xapp_xprop/xapp_xprop.mk                        | 2 +-
 package/x11r7/xapp_xrandr/xapp_xrandr.mk                      | 2 +-
 package/x11r7/xapp_xrdb/xapp_xrdb.mk                          | 2 +-
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk                  | 2 +-
 package/x11r7/xapp_xset/xapp_xset.mk                          | 2 +-
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk                  | 2 +-
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk            | 2 +-
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk                  | 2 +-
 package/x11r7/xapp_xsm/xapp_xsm.mk                            | 2 +-
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk                  | 2 +-
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk                  | 2 +-
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk                      | 2 +-
 package/x11r7/xapp_xwd/xapp_xwd.mk                            | 2 +-
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk                  | 2 +-
 package/x11r7/xapp_xwud/xapp_xwud.mk                          | 2 +-
 .../xcursor-transparent-theme/xcursor-transparent-theme.mk    | 2 +-
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk                | 2 +-
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk    | 2 +-
 .../xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk      | 2 +-
 .../xdriver_xf86-input-joystick.mk                            | 2 +-
 .../xdriver_xf86-input-keyboard.mk                            | 2 +-
 .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk      | 2 +-
 .../xdriver_xf86-input-synaptics.mk                           | 2 +-
 .../xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk      | 2 +-
 .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk  | 2 +-
 .../x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk    | 2 +-
 .../xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk    | 2 +-
 .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk      | 2 +-
 .../xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk      | 2 +-
 .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk      | 2 +-
 .../xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk      | 2 +-
 .../xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk      | 2 +-
 .../x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk  | 2 +-
 .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk      | 2 +-
 .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk    | 2 +-
 .../xdriver_xf86-video-neomagic.mk                            | 2 +-
 .../xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk  | 2 +-
 package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk  | 2 +-
 .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk    | 2 +-
 .../xdriver_xf86-video-siliconmotion.mk                       | 2 +-
 .../x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk    | 2 +-
 .../xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk  | 2 +-
 .../x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk  | 2 +-
 .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk    | 2 +-
 .../xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk    | 2 +-
 .../x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk  | 2 +-
 package/x11r7/xfont_encodings/xfont_encodings.mk              | 2 +-
 .../x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk  | 2 +-
 .../x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk    | 2 +-
 .../xfont_font-adobe-utopia-100dpi.mk                         | 2 +-
 .../xfont_font-adobe-utopia-75dpi.mk                          | 2 +-
 .../xfont_font-adobe-utopia-type1.mk                          | 2 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk            | 2 +-
 .../x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk    | 2 +-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk    | 2 +-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk      | 2 +-
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                  | 2 +-
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                   | 2 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk          | 2 +-
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk      | 2 +-
 .../xfont_font-bitstream-100dpi.mk                            | 2 +-
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk  | 2 +-
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk  | 2 +-
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk  | 2 +-
 .../x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk    | 2 +-
 .../x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk    | 2 +-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk      | 2 +-
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk    | 2 +-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk    | 2 +-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk      | 2 +-
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk  | 2 +-
 .../xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk      | 2 +-
 .../xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk      | 2 +-
 .../x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk    | 2 +-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk    | 2 +-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk    | 2 +-
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk  | 2 +-
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk  | 2 +-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk    | 2 +-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk      | 2 +-
 package/x11r7/xfont_font-util/xfont_font-util.mk              | 2 +-
 .../xfont_font-winitzki-cyrillic.mk                           | 2 +-
 .../xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk      | 2 +-
 package/x11r7/xlib_libFS/xlib_libFS.mk                        | 2 +-
 package/x11r7/xlib_libICE/xlib_libICE.mk                      | 2 +-
 package/x11r7/xlib_libSM/xlib_libSM.mk                        | 2 +-
 package/x11r7/xlib_libX11/xlib_libX11.mk                      | 2 +-
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk        | 2 +-
 package/x11r7/xlib_libXau/xlib_libXau.mk                      | 2 +-
 package/x11r7/xlib_libXaw/xlib_libXaw.mk                      | 2 +-
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk        | 2 +-
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk              | 2 +-
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk              | 2 +-
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                  | 2 +-
 package/x11r7/xlib_libXext/xlib_libXext.mk                    | 2 +-
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk                | 2 +-
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                  | 2 +-
 package/x11r7/xlib_libXft/xlib_libXft.mk                      | 2 +-
 package/x11r7/xlib_libXi/xlib_libXi.mk                        | 2 +-
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk            | 2 +-
 package/x11r7/xlib_libXmu/xlib_libXmu.mk                      | 2 +-
 package/x11r7/xlib_libXpm/xlib_libXpm.mk                      | 2 +-
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk                | 2 +-
 package/x11r7/xlib_libXrender/xlib_libXrender.mk              | 2 +-
 package/x11r7/xlib_libXres/xlib_libXres.mk                    | 2 +-
 package/x11r7/xlib_libXt/xlib_libXt.mk                        | 2 +-
 package/x11r7/xlib_libXtst/xlib_libXtst.mk                    | 2 +-
 package/x11r7/xlib_libXv/xlib_libXv.mk                        | 2 +-
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                    | 2 +-
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk            | 2 +-
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk              | 2 +-
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                      | 2 +-
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk              | 2 +-
 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk          | 2 +-
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk              | 2 +-
 package/x11r7/xlib_xtrans/xlib_xtrans.mk                      | 2 +-
 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk      | 2 +-
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk      | 2 +-
 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk  | 2 +-
 package/x11r7/xproto_damageproto/xproto_damageproto.mk        | 2 +-
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk              | 2 +-
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk            | 2 +-
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk          | 2 +-
 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk  | 2 +-
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk          | 2 +-
 package/x11r7/xproto_glproto/xproto_glproto.mk                | 2 +-
 package/x11r7/xproto_inputproto/xproto_inputproto.mk          | 2 +-
 package/x11r7/xproto_kbproto/xproto_kbproto.mk                | 2 +-
 package/x11r7/xproto_randrproto/xproto_randrproto.mk          | 2 +-
 package/x11r7/xproto_recordproto/xproto_recordproto.mk        | 2 +-
 package/x11r7/xproto_renderproto/xproto_renderproto.mk        | 2 +-
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk    | 2 +-
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk  | 2 +-
 package/x11r7/xproto_videoproto/xproto_videoproto.mk          | 2 +-
 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk  | 2 +-
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk        | 2 +-
 package/x11r7/xproto_xextproto/xproto_xextproto.mk            | 2 +-
 .../x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk  | 2 +-
 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk      | 2 +-
 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk      | 2 +-
 .../x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk  | 2 +-
 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk    | 2 +-
 package/x11r7/xproto_xproto/xproto_xproto.mk                  | 2 +-
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk      | 2 +-
 package/x11r7/xutil_makedepend/xutil_makedepend.mk            | 2 +-
 package/x11r7/xutil_util-macros/xutil_util-macros.mk          | 2 +-
 package/xenomai/xenomai.mk                                    | 3 +--
 259 files changed, 260 insertions(+), 262 deletions(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 5240e2639a..fac3be8e37 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# avahi (zeroconf implementation)
+# avahi
 #
 #############################################################
 
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 9a2e5f0357..e30343477f 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# berkeley db
+# berkeleydb
 #
 #############################################################
 
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index f29ff3b838..1b7548a08d 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -1,6 +1,6 @@
 #######################################################
 #
-# connman - open source connection manager
+# connman
 #
 #######################################################
 
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index e67fbe9119..216b142d31 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# enhanced ctorrent
+# ctorrent
 #
 #############################################################
 
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index fafb49b112..a63753d1f9 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# gnu gsl
+# gsl
 #
 #############################################################
 
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 4c5bd9ebf3..98dd486340 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libarchive (reusable C library for archive formats)
+# libarchive
 #
 #############################################################
 
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index eab9c342c8..419692a36a 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libdaemon (UNIX daemon library)
+# libdaemon
 #
 #############################################################
 
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
index a2b57b8b31..0ff0bc196f 100644
--- a/package/libfslcodec/libfslcodec.mk
+++ b/package/libfslcodec/libfslcodec.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# buildroot makefile for libfslcodec
+# libfslcodec
 #
 #############################################################
 
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
index 66f48cc133..de8383236e 100644
--- a/package/libfslparser/libfslparser.mk
+++ b/package/libfslparser/libfslparser.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# buildroot makefile for libfslparser
+# libfslparser
 #
 #############################################################
 
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
index 3ad33f9abc..d49cae43df 100644
--- a/package/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/libfslvpuwrap/libfslvpuwrap.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# buildroot makefile for libfslvpuwrap
+# libfslvpuwrap
 #
 #############################################################
 
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index d7603aed5b..0592762819 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libiqrf library
+# libiqrf
 #
 #############################################################
 
diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk
index 0df2b3a8b0..cee3408baf 100644
--- a/package/libjpeg/libjpeg.mk
+++ b/package/libjpeg/libjpeg.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libjpeg (libraries needed by some apps)
+# libjpeg
 #
 #############################################################
 
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 2c18fdec95..55567cbf59 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# libpng (Portable Network Graphic library)
+# libpng
 #
 #############################################################
 
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 32a7167b4d..b6bca65045 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# liburc: userspace RCU (read-copy-update) library
+# liburc
 #
 #############################################################
 
diff --git a/package/live555/live555.mk b/package/live555/live555.mk
index b727d94593..ecbac60f99 100644
--- a/package/live555/live555.mk
+++ b/package/live555/live555.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# live555 streaming media
+# live555
 #
 #############################################################
 
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 14545d1aa5..c5792158c9 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# lrzsz (provides zmodem)
+# lrzsz
 #
 #############################################################
 
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index aab2dd6e8b..59d3963a9a 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# LTTng-UST: the userspace tracing library
+# LTTng-UST
 #
 #############################################################
 
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index 80ac105dfd..f01d5290b9 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# LTTng-modules: the kernel modules (requires at least Linux 2.6.38)
+# LTTng-modules
 #
 #############################################################
 
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 97df1cfc01..6142666fa4 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# LTTng-Tools: the trace control client
+# LTTng-Tools
 #
 #############################################################
 
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 5c5eadcdfa..44115448ea 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# mtd provides jffs2 utilities
+# mtd
 #
 #############################################################
 
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
index 639fd52ae2..405374abd3 100644
--- a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# buildroot makefile for gst-fsl-plugins
+# gst-fsl-plugins
 #
 #############################################################
 
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 4056397cde..bfb878a33e 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# ncftp client
+# ncftp
 #
 #############################################################
 
diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
index d80f5733d4..613b5b5384 100644
--- a/package/ncurses/Config.in
+++ b/package/ncurses/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_NCURSES
 	  The Ncurses (new curses) library is a free software emulation of
 	  curses in System V Release 4.0, and more.
 
+	  This package installs only a few vital termcap entries
+
 	  http://www.gnu.org/software/ncurses/
 
 config BR2_PACKAGE_NCURSES_TARGET_PANEL
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index eb47c3695b..8d5463c2e5 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -1,7 +1,6 @@
 #############################################################
 #
 # ncurses
-# this installs only a few vital termcap entries
 #
 #############################################################
 
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 01217271c2..7300911b27 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# ngIRCd: Next Generation IRC Daemon
+# ngircd
 #
 #############################################################
 
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index e42f654d77..f9be0d7657 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# OpenCV (Open Source Computer Vision)
+# opencv
 #
 #############################################################
 
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 284b388286..a47d8d338a 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -1,6 +1,6 @@
 #######################
 #
-# pv - Pipe Viewer
+# pv
 #
 #######################
 
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 347ec4ddb5..25e17e3838 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# quagga suite
+# quagga
 #
 #############################################################
 
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 505f1e3415..4de1476f42 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# build GNU readline
+# readline
 #
 #############################################################
 
diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
index 8970115fa3..af41eb21c6 100644
--- a/package/sqlcipher/Config.in
+++ b/package/sqlcipher/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_SQLCIPHER
 	  SQLCipher is an SQLite extension that provides 256 bits AES
 	  encryption of database files.  Note that it is a fork of SQLite
 	  and they cannot be installed side-by-side.
+
 	  http://sqlcipher.net
 
 config BR2_PACKAGE_SQLCIPHER_READLINE
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 510d4af9df..033cd33453 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -1,7 +1,6 @@
 #############################################################
 #
-# sqlcipher extension of sqlite
-# http://sqlcipher.net
+# sqlcipher
 #
 #############################################################
 
diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index a20b0c6f65..fb6835c7e6 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -1,8 +1,6 @@
 #############################################################
 #
-# stress - a workload generator
-#
-# http://weather.ou.edu/~apw/projects/stress/
+# stress
 #
 #############################################################
 
diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index cd1d32363b..cb12ba03ce 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -1,6 +1,6 @@
 ############################################################
 #
-# Tremor (Integer decoder for Vorbis)
+# Tremor
 #
 ############################################################
 
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index 99f63a9cd0..18326f4fce 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# urg library
+# urg
 #
 #############################################################
 
diff --git a/package/vtun/Config.in b/package/vtun/Config.in
index fc352125ca..fe1f0d0c92 100644
--- a/package/vtun/Config.in
+++ b/package/vtun/Config.in
@@ -9,4 +9,7 @@ config BR2_PACKAGE_VTUN
 
 	  It supports IP, PPP, SLIP, Ethernet and other tunnel types.
 
+	  NOTE: It uses start-stop-daemon in init script, so be sure
+	  to enable that within busybox
+
 	  http://vtun.sourceforge.net/
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 6aeca65661..0f0b5ce623 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -2,9 +2,6 @@
 #
 # vtun
 #
-# NOTE: Uses start-stop-daemon in init script, so be sure
-# to enable that within busybox
-#
 #############################################################
 
 VTUN_VERSION = 3.0.3
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index c9d7fe9cdc..c2f8d994e6 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_appres -- list X application resource database
+# xapp_appres
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 1e2f81a95f..b03f80e38e 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_bdftopcf -- X.Org bdftopcf application
+# xapp_bdftopcf
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index e07696d7e9..e92f056b35 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_beforelight -- screen saver
+# xapp_beforelight
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 8c73fe2b30..bfe7246273 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_bitmap -- X.Org bitmap application
+# xapp_bitmap
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index a4807b8a67..fc439f5174 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_editres -- a dynamic resource editor for X Toolkit applications
+# xapp_editres
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index 719077cbfc..f935e542e4 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_fonttosfnt -- X.Org fonttosfnt application
+# xapp_fonttosfnt
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index 181577940a..14623c942f 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_fslsfonts -- list fonts served by X font server
+# xapp_fslsfonts
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index 2d00af0df9..b93f7ddbe4 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_fstobdf -- generate BDF font from X font server
+# xapp_fstobdf
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index bf0445e1b3..28b111d7de 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_iceauth -- ICE authority file utility
+# xapp_iceauth
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 6628efe660..aecd95adb9 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_ico -- animate an icosahedron or other polyhedron
+# xapp_ico
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index 7b7e364a1c..88cdd4f033 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_listres -- list resources in widgets
+# xapp_listres
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index 2420897ea3..d3217fe581 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_luit -- Locale and ISO 2022 support for Unicode terminals
+# xapp_luit
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 15e65c1a59..b74f9939ce 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_mkfontdir -- create an index of X font files in a directory
+# xapp_mkfontdir
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index b15fc56a81..067f380254 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_mkfontscale -- create an index of scalable font files for X
+# xapp_mkfontscale
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 5d40ab9c30..d3949de2c0 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_oclock -- round X clock
+# xapp_oclock
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 2fd8c171eb..f597c8c775 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_rgb -- uncompile an rgb color-name database
+# xapp_rgb
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index 9f08f173f1..aa6a4b3a71 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_rstart -- X.Org rstart application
+# xapp_rstart
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index d444344469..5146db5708 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_scripts -- start an X program on a remote machine
+# xapp_scripts
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index c9de815d8a..ba2a07b086 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_sessreg -- manage utmp/wtmp entries for non-init clients
+# xapp_sessreg
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index 77e271d89d..9ecf9533ad 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_setxkbmap -- Controls the keyboard layout of a running X server.
+# xapp_setxkbmap
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index b183e91dde..413786a8f7 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_showfont -- font dumper for X font server
+# xapp_showfont
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 8e822cff4c..863e4f62c5 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_smproxy -- Session Manager Proxy
+# xapp_smproxy
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index 6e348a9442..f566e104e3 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_twm -- No description available
+# xapp_twm
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 8c8bdd1970..6a7fe51eba 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_viewres -- graphical class browser for Xt
+# xapp_viewres
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index e1a50e617e..a871486422 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_x11perf -- summarize x11perf results
+# xapp_x11perf
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index d7a871ce78..0c13463f81 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xauth -- X authority file utility
+# xapp_xauth
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 33ae12ea19..96bffe7820 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_backlight -- xbacklight
+# xapp_backlight
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index 8192d6d2b5..73e0350afb 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xbiff -- mailbox flag for X
+# xapp_xbiff
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index ecadec70dd..b53684b2ff 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xcalc -- scientific calculator for X
+# xapp_xcalc
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 8accd7eab1..1d45970c37 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xclipboard -- interchange between cut buffer and selection
+# xapp_xclipboard
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index e8ca932ba5..5f4eb31fac 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xclock -- analog / digital clock for X
+# xapp_xclock
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 889e1eab12..d08dfaade4 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xcmsdb -- Device Color Characterization utility for X Color Management System
+# xapp_xcmsdb
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index e4be4c64e7..174fa17bbd 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xcursorgen -- create an X cursor file from a collection of PNG images
+# xapp_xcursorgen
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 201990a7aa..e732dc4124 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xdbedizzy -- X.Org xdbedizzy application
+# xapp_xdbedizzy
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index f228f0b2db..2ead9a5e47 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xditview -- display ditroff output
+# xapp_xditview
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index c131d22d32..42c93ddd93 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xdm -- X.Org xdm application
+# xapp_xdm
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index a47879adc8..21439884e5 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xdpyinfo -- display information utility for X
+# xapp_xdpyinfo
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index e88e0bf5ce..d37ec32ba3 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xdriinfo -- query configuration information of DRI drivers
+# xapp_xdriinfo
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index 4c70002c52..f180ad2c9d 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xedit -- simple text editor for X
+# xapp_xedit
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 7e7a1b51d6..f98868ccb9 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xev -- print contents of X events
+# xapp_xev
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 3458c57473..2bed751732 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xeyes -- X.Org xeyes application
+# xapp_xeyes
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index e1854662d2..07b6ac9d5b 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xf86dga -- test program for the XFree86-DGA extension
+# xapp_xf86dga
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 47a274ce31..5308a5c9f9 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xfd -- X.Org xfd application
+# xapp_xfd
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index 6b685e8c28..1a6476395f 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xfontsel -- point and click selection of X11 font names
+# xapp_xfontsel
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index 83cb59ac64..3c639061d3 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xfs -- X font server
+# xapp_xfs
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index c45fa5276b..738b28ad81 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xfsinfo -- X font server information utility
+# xapp_xfsinfo
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 73c842637b..bd87f52091 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xgamma -- Alter a monitor's gamma correction through the X server
+# xapp_xgamma
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index 400b1a7869..69c464f612 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xgc -- X graphics demo
+# xapp_xgc
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 232a112339..b81e1b9b03 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xhost -- Controls host and/or user access to a running X server.
+# xapp_xhost
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index fc9218d0c3..da167ec811 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xinit -- X Window System initializer
+# xapp_xinit
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 4206d210a8..790f2c0af8 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xinput -- xinput
+# xapp_xinput
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 86053ca27a..94fbd68de5 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xkbcomp -- compile XKB keyboard description
+# xapp_xkbcomp
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 1537b093c0..eb8a3876b9 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xkbevd -- XKB event daemon
+# xapp_xkbevd
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index fd3757e008..8d2efbcf39 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xkbprint -- print an XKB keyboard description
+# xapp_xkbprint
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 64fe877243..eaabea58ea 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xkbutils -- X.Org xkbutils application
+# xapp_xkbutils
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index 200d87a742..092c0d3259 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xkill -- kill a client by its X resource
+# xapp_xkill
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index ef883332f4..6b4207ac08 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xload -- system load average display for X
+# xapp_xload
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index cee7487686..af5b222f23 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xlogo -- X Window System logo
+# xapp_xlogo
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index aa70b560bc..13c93d5cc4 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xlsatoms -- list interned atoms defined on server
+# xapp_xlsatoms
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index d07fd33449..a5af935f09 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xlsclients -- X.Org xlsclients application
+# xapp_xlsclients
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 93fd92655c..619b7c5fe1 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xlsfonts -- X.Org xlsfonts application
+# xapp_xlsfonts
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index b55f4f3197..bd98695002 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xmag -- X.Org xmag application
+# xapp_xmag
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 634b9ea308..62a9782143 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# xapp_xman - Manual page display program for the X Window System
+# xapp_xman
 #
 #############################################################
 
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 34f5433148..61b8a0825b 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xmessage -- display a message or query in a window (X-based /bin/echo)
+# xapp_xmessage
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 3a77648075..ada1df550b 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xmh -- send and read mail with an X interface to MH
+# xapp_xmh
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index 3ffbb580bf..c5bce07559 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xmodmap -- utility for modifying keymaps and pointer button mappings in X
+# xapp_xmodmap
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index c9a19844a9..05dfdcec93 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xmore -- plain text display program for the X Window System
+# xapp_xmore
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 2950afd646..b2c4e040c3 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xpr -- X.Org xpr application
+# xapp_xpr
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 3f7b9e104c..956e4846cf 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xprop -- property displayer for X
+# xapp_xprop
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 3a1feedc07..9ba733244a 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xrandr -- primitive command line interface to RandR extension
+# xapp_xrandr
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 72ce0e18e4..4101d841ab 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xrdb -- X server resource database utility
+# xapp_xrdb
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index 2b0fe29428..5578e4610b 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xrefresh -- refresh all or part of an X screen
+# xapp_xrefresh
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 5a6679f66d..9a3758864a 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xset -- X.Org xset application
+# xapp_xset
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 9808aa0bf9..c4599a9be1 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xsetmode -- set the mode for an X Input device
+# xapp_xsetmode
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 7707b6015f..f56cdd58a1 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xsetpointer -- set an X Input device as the main pointer
+# xapp_xsetpointer
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index b9bb7947bf..0f2312837a 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xsetroot -- X.Org xsetroot application
+# xapp_xsetroot
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index cdc27a92f2..9229bbe89d 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xsm -- X Session Manager
+# xapp_xsm
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index 19c105e074..8a21080e90 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xstdcmap -- X standard colormap utility
+# xapp_xstdcmap
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 3e3d50efd2..41c9dfe9dc 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xvidtune -- video mode tuner for Xorg
+# xapp_xvidtune
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index 28c2cdaf6c..2db78400ab 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xvinfo -- Print out X-Video extension adaptor information
+# xapp_xvinfo
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index a98b132944..87cf256dce 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xwd -- dump an image of an X window
+# xapp_xwd
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index acbd7b3655..a6d7c46335 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xwininfo -- window information utility for X
+# xapp_xwininfo
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index 911ac21327..60afd86287 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_xwud -- image displayer for X
+# xapp_xwud
 #
 ################################################################################
 
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
index 70f98870f1..c3b1b9c3f8 100644
--- a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# xcursor-transparent-theme - No description available
+# xcursor-transparent-theme
 #
 #############################################################
 
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index ae964b49ed..9767f2c143 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdata_xbitmaps -- No description available
+# xdata_xbitmaps
 #
 ################################################################################
 
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 68c3ae2f58..5c86f50d06 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# xdata_xcursor-themes - No description available
+# xdata_xcursor-themes
 #
 #############################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 58aa6dbf8d..61f0ce74fe 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-evdev -- Generic Linux input driver
+# xdriver_xf86-input-evdev
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index 2c0e0259ac..9ab47cd9f0 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-joystick -- X.Org driver for joystick input devices
+# xdriver_xf86-input-joystick
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index c78273d048..f93652cb96 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-keyboard -- Keyboard input driver
+# xdriver_xf86-input-keyboard
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 35aad280ae..d9001f5084 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-mouse -- X.Org driver for mouse input devices
+# xdriver_xf86-input-mouse
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index a6ec931e68..af63036fe1 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-synaptics -- X.Org driver for synaptics input devices
+# xdriver_xf86-input-synaptics
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
index 43a5e8a36d..c9a1995e2d 100644
--- a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-tslib -- Touch screen library input driver
+# xdriver_xf86-input-tslib
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index d07fc4c150..05374ef779 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-vmmouse -- VMWare mouse input driver
+# xdriver_xf86-input-vmmouse
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index e04cb13883..cab37532aa 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-input-void -- null input driver
+# xdriver_xf86-input-void
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 9c7cc1e4d1..9b94b2a260 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-ark -- X.Org driver for ark cards
+# xdriver_xf86-video-ark
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index 83e2b1f36b..887dc912ef 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-ast -- No description available
+# xdriver_xf86-video-ast
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 06cd53bce0..b90f10ad64 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-ati -- ATI video driver
+# xdriver_xf86-video-ati
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 5bc12ffdf3..9e38115669 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-cirrus -- Cirrus Logic video driver
+# xdriver_xf86-video-cirrus
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 9d6e61df5e..ee2aedb418 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-dummy -- X.Org driver for dummy cards
+# xdriver_xf86-video-dummy
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index f5a478ef54..12eb315eeb 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-fbdev -- video driver for framebuffer device
+# xdriver_xf86-video-fbdev
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index fee8b53c4f..7c7feb23a3 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-geode -- video driver for geode device
+# xdriver_xf86-video-geode
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 21a6ebdc5a..c120aee486 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-glide -- video driver for glide device
+# xdriver_xf86-video-glide
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 91176a9f57..396a1627b3 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-glint -- GLINT/Permedia video driver
+# xdriver_xf86-video-glint
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 71b38589ac..d18beb3125 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-i128 -- Number 9 I128 video driver
+# xdriver_xf86-video-i128
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index ef7f390ee2..97fef99a78 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-intel -- Intel video driver
+# xdriver_xf86-video-intel
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 2957190915..7534d29e14 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-mach64 -- mach64 video driver
+# xdriver_xf86-video-mach64
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 81f842b304..916a0989fb 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-mga -- Matrox video driver
+# xdriver_xf86-video-mga
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 33c360285b..0c1ece46dd 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-neomagic -- Neomagic video driver
+# xdriver_xf86-video-neomagic
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index 693303dbe2..cacf39f5c0 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-newport -- Newport video driver
+# xdriver_xf86-video-newport
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index a17aaec8c2..8f9d6e87af 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-nv -- NVIDIA video driver
+# xdriver_xf86-video-nv
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index ab1c6527cb..d55d1a6efd 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-r128 -- R128 video driver
+# xdriver_xf86-video-r128
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 8bc259a279..e0faf07994 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-savage -- S3 Savage video driver
+# xdriver_xf86-video-savage
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 86bc8b6677..91c8453884 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-siliconmotion -- Silicon Motion video driver
+# xdriver_xf86-video-siliconmotion
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 7ca185d409..03276bb840 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-sis -- SiS and XGI video driver
+# xdriver_xf86-video-sis
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index f4ae85f8c4..7c06fb83a9 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-tdfx -- 3Dfx video driver
+# xdriver_xf86-video-tdfx
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index c38c4ff9c6..16423a2fdf 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-tga -- X.Org driver for tga cards
+# xdriver_xf86-video-tga
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 837279e992..ea73f1b763 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-trident -- Trident video driver
+# xdriver_xf86-video-trident
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index f41822c47a..607b605f80 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-v4l -- video4linux driver
+# xdriver_xf86-video-v4l
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index 580b4f2b92..3c69276fe7 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-vesa -- Generic VESA video driver
+# xdriver_xf86-video-vesa
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 15eaac6c22..53a87be6eb 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-vmware -- VMware SVGA video driver
+# xdriver_xf86-video-vmware
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 6c2555740f..d394403601 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-voodoo -- Voodoo video driver
+# xdriver_xf86-video-voodoo
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index 664ce2a04d..c2d7d4df3a 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xdriver_xf86-video-wsfb -- WSFB video driver
+# xdriver_xf86-video-wsfb
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 8c84ee51c3..568dbcbde8 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xfont_encodings -- No description available
+# xfont_encodings
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 370286c71d..58a9fd7fdb 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-100dpi -- No description available
+# font-adobe-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index fa0621ed47..02e6714f84 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-75dpi -- No description available
+# font-adobe-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index a27bce3a69..6692c24ea2 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-utopia-100dpi -- No description available
+# font-adobe-utopia-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index c7295fa536..7af3bd0abf 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-utopia-75dpi -- No description available
+# font-adobe-utopia-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 977899b82c..5826db84d9 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-utopia-type1 -- No description available
+# font-adobe-utopia-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 4a95dfbdb6..2e8792a17e 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-alias -- No description available
+# font-alias
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index efa24ece4f..e24c834002 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-arabic-misc -- No description available
+# font-arabic-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 6fae9e631f..8baa0cb718 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-100dpi -- No description available
+# font-bh-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 68094bb64b..ae55fd3173 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-75dpi -- No description available
+# font-bh-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index 5c3fb38537..b652a37591 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-lucidatypewriter-100dpi -- No description available
+# font-bh-lucidatypewriter-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 54dff33e75..12c71e101f 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-lucidatypewriter-75dpi -- No description available
+# font-bh-lucidatypewriter-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index 8ff74810a0..fac6434fdf 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-ttf -- No description available
+# font-bh-ttf
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 23f5739001..1244cc96e9 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-type1 -- No description available
+# font-bh-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index 01b0e23e8a..a1c89aa5f8 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bitstream-100dpi -- No description available
+# font-bitstream-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index 0b685e0ef6..335f6606b4 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bitstream-75dpi -- No description available
+# font-bitstream-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 3c91300fe2..c68db7ec85 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bitstream-type1 -- No description available
+# font-bitstream-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index f04dcb691f..c41f0dbc93 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-cronyx-cyrillic -- No description available
+# font-cronyx-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 95a18c194c..5cd312d035 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-cursor-misc -- No description available
+# font-cursor-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index 93b8af69ea..8c267bcbf8 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-daewoo-misc -- No description available
+# font-daewoo-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index 17fce1ab70..77242fe8f8 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-dec-misc -- No description available
+# font-dec-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index d9b4b9d7ba..094781ec54 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-ibm-type1 -- No description available
+# font-ibm-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 9534f1c681..967303d847 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-isas-misc -- No description available
+# font-isas-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 2b017c7e85..eabb969c3b 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-jis-misc -- No description available
+# font-jis-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 8c11700b1f..1f82f260b7 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-micro-misc -- No description available
+# font-micro-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index 8cec6960ab..464f0be161 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-cyrillic -- No description available
+# font-misc-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index 4275d088af..0378907725 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-ethiopic -- No description available
+# font-misc-ethiopic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index 35d4a7257e..acc4338c5f 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-meltho -- No description available
+# font-misc-meltho
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index 12aabe1a88..a249edf6e8 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-misc -- No description available
+# font-misc-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index fe7593ee09..f89a63d80b 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-mutt-misc -- No description available
+# font-mutt-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index e310606021..04b662c3a2 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-schumacher-misc -- No description available
+# font-schumacher-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index 903a073114..9196cd84a9 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-screen-cyrillic -- No description available
+# font-screen-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 641f6505fa..5a69dbc64d 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-sony-misc -- No description available
+# font-sony-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 7c038f369e..fb8ee4ac60 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-sun-misc -- No description available
+# font-sun-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 0b79d80ee3..b359f829c1 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-util -- No description available
+# font-util
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 7ca7201a23..aec5a90d77 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-winitzki-cyrillic -- No description available
+# font-winitzki-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 4bd6bd4697..88da7aa02f 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-xfree86-type1 -- No description available
+# font-xfree86-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 884d68d1bb..c8ca83ee06 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libFS -- X.Org FS library
+# xlib_libFS
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index a0f235773f..dd6814e4e3 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libICE -- X.Org ICE library
+# xlib_libICE
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index ecc57c61e6..ac3bd3774a 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libSM -- X.Org SM library
+# xlib_libSM
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 5d0607bb88..f8b19e43ac 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libX11 -- X.Org X11 library
+# xlib_libX11
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 2781a14dd9..2a648c9216 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXScrnSaver -- X.Org XScrnSaver library
+# xlib_libXScrnSaver
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 1f838dee25..83deb75242 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXau -- X.Org Xau library
+# xlib_libXau
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index c8be85ca00..fd4c5736da 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXaw -- X.Org Xaw library
+# xlib_libXaw
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index 8e6c5e2563..e097e3ca58 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXcomposite -- X.Org Xcomposite library
+# xlib_libXcomposite
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 9a73f59a55..37afa5d0a6 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXcursor -- X.Org Xcursor library
+# xlib_libXcursor
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 431248e4aa..69014f511d 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXdamage -- X.Org Xdamage library
+# xlib_libXdamage
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index fe6fb6c55d..866f10ba90 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXdmcp -- X.Org Xdmcp library
+# xlib_libXdmcp
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 28150abbc2..3fc19e2154 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXext -- X.Org Xext library
+# xlib_libXext
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 70abf9a107..7e956a6a64 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXfixes -- X.Org Xfixes library
+# xlib_libXfixes
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 0d93468168..cf27aad221 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXfont -- X.Org Xfont library
+# xlib_libXfont
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 2c5281abfd..37f4434072 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXft -- X.Org Xft library
+# xlib_libXft
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index 193fb97c7c..cac3787b7a 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXi -- X.Org Xi library
+# xlib_libXi
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index 98ac136cef..ce660ed098 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXinerama -- X.Org Xinerama library
+# xlib_libXinerama
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index b067f8deef..eda4151e48 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXmu -- X.Org Xmu library
+# xlib_libXmu
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 1d1d017184..6e72281504 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXpm -- X.Org Xpm library
+# xlib_libXpm
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index e5673c8cf2..7986611554 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXrandr -- X.Org Xrandr library
+# xlib_libXrandr
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 4398af5326..4515b82d92 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXrender -- X.Org Xrender library
+# xlib_libXrender
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index a272841852..8d5b79b0de 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXres -- X.Org XRes library
+# xlib_libXres
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 76c04890e6..f186df054f 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXt -- X.Org Xt library
+# xlib_libXt
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index 055b4c3ab7..46d58e2327 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXtst -- X.Org Xtst library
+# xlib_libXtst
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index a64d980e9e..8bf06c538d 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXv -- X.Org Xv library
+# xlib_libXv
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 18bfbef03d..2be5840e53 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXvMC -- X.Org XvMC library
+# xlib_libXvMC
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index ba2aed46f7..95e2d177ab 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXxf86dga -- X.Org Xxf86dga library
+# xlib_libXxf86dga
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index 2ed7eda27d..8ec1cf71df 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libXxf86vm -- X.Org Xxf86vm library
+# xlib_libXxf86vm
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 71a49c91cd..73c4b658da 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libdmx -- X.Org dmx library
+# xlib_libdmx
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 4169e9010c..d47a7d3852 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libfontenc -- X.Org fontenc library
+# xlib_libfontenc
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 64224b1ebc..9196e47491 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libpciaccess -- X.Org pciaccess library
+# xlib_libpciaccess
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 00395c5023..2d5e574681 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_libxkbfile -- X.Org xkbfile library
+# xlib_libxkbfile
 #
 ################################################################################
 
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 7cb1a58ebd..9e02d2113f 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xlib_xtrans -- X.Org xtrans library
+# xlib_xtrans
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index 99f0839481..998d0aa33b 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_applewmproto -- No description available
+# xproto_applewmproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index 958908c19d..bca5a3cdfd 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_bigreqsproto -- X.Org BigReqs protocol headers
+# xproto_bigreqsproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index 4b5d1bb5af..21613582ec 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_compositeproto -- X.Org Composite protocol headers
+# xproto_compositeproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index 5c9782aa6c..0311ea4901 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_damageproto -- X.Org Damage protocol headers
+# xproto_damageproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index b551e0cbf9..4cc795c212 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_dmxproto -- X.Org DMX protocol headers
+# xproto_dmxproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index 2d354c23b2..9b56bb1569 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_dri2proto -- X.Org DRI2 protocol headers
+# xproto_dri2proto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index c02b6bdb26..55212b2678 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_fixesproto -- X.Org Fixes protocol headers
+# xproto_fixesproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 88c0e6706b..0cb205ad59 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_fontcacheproto -- X.Org Fontcache protocol headers
+# xproto_fontcacheproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 37dafea6da..64d7bea3a8 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_fontsproto -- X.Org Fonts protocol headers
+# xproto_fontsproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index 78a38aac1b..7c4b13ac18 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_glproto -- X.Org GL protocol headers
+# xproto_glproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 83b9283c65..11316c3620 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_inputproto -- X.Org Input protocol headers
+# xproto_inputproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index a6facdfbb4..868e518119 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_kbproto -- X.Org KB protocol headers
+# xproto_kbproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index d8c61e6a63..b12653eb07 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_randrproto -- X.Org Randr protocol headers
+# xproto_randrproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 0eef453381..2d2cceac22 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_recordproto -- X.Org Record protocol headers
+# xproto_recordproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index cc05f69155..41a8445409 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_renderproto -- X.Org Render protocol headers
+# xproto_renderproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index bb25e063af..960ca13372 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_resourceproto -- X.Org Resource protocol headers
+# xproto_resourceproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 51e5a25d25..57047cf5a7 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_scrnsaverproto -- X.Org ScrnSaver protocol headers
+# xproto_scrnsaverproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 19c3902e51..2861c9190b 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_videoproto -- X.Org Video protocol headers
+# xproto_videoproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index 9282b4d7bf..067bccf01a 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_windowswmproto -- No description available
+# xproto_windowswmproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index bafadec7aa..fd3cb07fa3 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xcmiscproto -- X.Org XCMisc protocol headers
+# xproto_xcmiscproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 75a87d5afe..b78ba4a77a 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xextproto -- X.Org XExt protocol headers
+# xproto_xextproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index 5e802b03a3..f88f5ecace 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xf86bigfontproto -- X.Org XF86BigFont protocol headers
+# xproto_xf86bigfontproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index 3cb69bc2ca..d671bf0094 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xf86dgaproto -- X.Org XF86DGA protocol headers
+# xproto_xf86dgaproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 3663ff1e22..e6bb0f12f1 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xf86driproto -- X.Org XF86DRI protocol headers
+# xproto_xf86driproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index 815e10d14d..41637983a6 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xf86vidmodeproto -- X.Org XF86VidMode protocol headers
+# xproto_xf86vidmodeproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index 7136c9d8c9..4c9ae11d28 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xineramaproto -- X.Org Xinerama protocol headers
+# xproto_xineramaproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index a0a9d019a1..bfff3bea2f 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xproto_xproto -- X.Org xproto protocol headers
+# xproto_xproto
 #
 ################################################################################
 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index a2bc05657e..4089aab83c 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xserver_xorg-server -- No description available
+# xserver_xorg-server
 #
 ################################################################################
 
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 4f0e23f645..0a436d11ef 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xutil_makedepend -- No description available
+# xutil_makedepend
 #
 ################################################################################
 
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 08b823a5a3..f2656c270f 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xutil_util-macros -- No description available
+# xutil_util-macros
 #
 ################################################################################
 
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 720b22d575..b4231952d1 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -1,7 +1,6 @@
 #############################################################
+#
 # Xenomai
-# URL  : http://xenomai.org
-# NOTE : Real-Time Framework for Linux
 #
 #############################################################
 

From 8dfd59d1144b3a1a230da7a81743f145363e0708 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 5 Jun 2013 23:53:30 +0000
Subject: [PATCH 5325/6849] Normalize separator size to 80

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/acl/acl.mk                                        | 4 ++--
 package/acpid/acpid.mk                                    | 4 ++--
 package/aespipe/aespipe.mk                                | 4 ++--
 package/aircrack-ng/aircrack-ng.mk                        | 4 ++--
 package/alsa-lib/alsa-lib.mk                              | 4 ++--
 package/alsamixergui/alsamixergui.mk                      | 4 ++--
 package/am33x-cm3/am33x-cm3.mk                            | 4 ++--
 package/apr-util/apr-util.mk                              | 4 ++--
 package/apr/apr.mk                                        | 4 ++--
 package/argp-standalone/argp-standalone.mk                | 4 ++--
 package/argus/argus.mk                                    | 4 ++--
 package/arptables/arptables.mk                            | 4 ++--
 package/at/at.mk                                          | 4 ++--
 package/atk/atk.mk                                        | 4 ++--
 package/attr/attr.mk                                      | 4 ++--
 package/audiofile/audiofile.mk                            | 4 ++--
 package/autoconf/autoconf.mk                              | 4 ++--
 package/automake/automake.mk                              | 4 ++--
 package/avahi/avahi.mk                                    | 4 ++--
 package/axel/axel.mk                                      | 4 ++--
 package/b43-firmware/b43-firmware.mk                      | 4 ++--
 package/b43-fwcutter/b43-fwcutter.mk                      | 4 ++--
 package/bash/bash.mk                                      | 4 ++--
 package/bcusdk/bcusdk.mk                                  | 4 ++--
 package/beecrypt/beecrypt.mk                              | 4 ++--
 package/berkeleydb/berkeleydb.mk                          | 4 ++--
 package/bind/bind.mk                                      | 4 ++--
 package/binutils/binutils.mk                              | 4 ++--
 package/bison/bison.mk                                    | 4 ++--
 package/blackbox/blackbox.mk                              | 4 ++--
 package/bluez_utils/bluez_utils.mk                        | 4 ++--
 package/bmon/bmon.mk                                      | 4 ++--
 package/boa/boa.mk                                        | 4 ++--
 package/boost/boost.mk                                    | 4 ++--
 package/bootutils/bootutils.mk                            | 4 ++--
 package/bridge-utils/bridge-utils.mk                      | 4 ++--
 package/bsdiff/bsdiff.mk                                  | 4 ++--
 package/bustle/bustle.mk                                  | 4 ++--
 package/busybox/busybox.mk                                | 4 ++--
 package/bwm-ng/bwm-ng.mk                                  | 4 ++--
 package/bzip2/bzip2.mk                                    | 4 ++--
 package/cache-calibrator/cache-calibrator.mk              | 4 ++--
 package/cairo/cairo.mk                                    | 4 ++--
 package/can-utils/can-utils.mk                            | 4 ++--
 package/ccache/ccache.mk                                  | 4 ++--
 package/ccid/ccid.mk                                      | 4 ++--
 package/cdrkit/cdrkit.mk                                  | 4 ++--
 package/cegui06/cegui06.mk                                | 4 ++--
 package/celt051/celt.mk                                   | 4 ++--
 package/cgilua/cgilua.mk                                  | 4 ++--
 package/chrony/chrony.mk                                  | 4 ++--
 package/cjson/cjson.mk                                    | 4 ++--
 package/cmake/cmake.mk                                    | 4 ++--
 package/collectd/collectd.mk                              | 4 ++--
 package/connman/connman.mk                                | 4 ++--
 package/conntrack-tools/conntrack-tools.mk                | 4 ++--
 package/copas/copas.mk                                    | 4 ++--
 package/coreutils/coreutils.mk                            | 4 ++--
 package/coxpcall/coxpcall.mk                              | 4 ++--
 package/cpanminus/cpanminus.mk                            | 4 ++--
 package/cppzmq/cppzmq.mk                                  | 4 ++--
 package/cpuload/cpuload.mk                                | 4 ++--
 package/cramfs/cramfs.mk                                  | 4 ++--
 package/crda/crda.mk                                      | 4 ++--
 package/cryptodev-linux/cryptodev-linux.mk                | 4 ++--
 package/cryptodev/cryptodev.mk                            | 4 ++--
 package/ctorrent/ctorrent.mk                              | 4 ++--
 package/curlftpfs/curlftpfs.mk                            | 4 ++--
 package/cvs/cvs.mk                                        | 4 ++--
 package/czmq/czmq.mk                                      | 4 ++--
 package/dash/dash.mk                                      | 4 ++--
 package/dbus-glib/dbus-glib.mk                            | 4 ++--
 package/dbus-python/dbus-python.mk                        | 4 ++--
 package/dbus/dbus.mk                                      | 4 ++--
 package/devmem2/devmem2.mk                                | 4 ++--
 package/dfu-util/dfu-util.mk                              | 4 ++--
 package/dhcp/dhcp.mk                                      | 4 ++--
 package/dhcpdump/dhcpdump.mk                              | 4 ++--
 package/dhrystone/dhrystone.mk                            | 4 ++--
 package/dialog/dialog.mk                                  | 4 ++--
 package/diffutils/diffutils.mk                            | 4 ++--
 package/directfb-examples/directfb-examples.mk            | 4 ++--
 package/directfb/directfb.mk                              | 4 ++--
 package/distcc/distcc.mk                                  | 4 ++--
 package/divine/divine.mk                                  | 4 ++--
 package/dmalloc/dmalloc.mk                                | 4 ++--
 package/dmidecode/dmidecode.mk                            | 4 ++--
 package/dmraid/dmraid.mk                                  | 4 ++--
 package/dnsmasq/dnsmasq.mk                                | 4 ++--
 package/docker/docker.mk                                  | 4 ++--
 package/doom-wad/doom-wad.mk                              | 4 ++--
 package/dosfstools/dosfstools.mk                          | 4 ++--
 package/dropbear/dropbear.mk                              | 4 ++--
 package/dstat/dstat.mk                                    | 4 ++--
 package/dtach/dtach.mk                                    | 4 ++--
 package/dtc/dtc.mk                                        | 4 ++--
 package/dvb-apps/dvb-apps.mk                              | 4 ++--
 package/dvbsnoop/dvbsnoop.mk                              | 4 ++--
 package/e2fsprogs/e2fsprogs.mk                            | 4 ++--
 package/ebtables/ebtables.mk                              | 4 ++--
 package/ecryptfs-utils/ecryptfs-utils.mk                  | 4 ++--
 package/ed/ed.mk                                          | 4 ++--
 package/eeprog/eeprog.mk                                  | 4 ++--
 package/efl/expedite/expedite.mk                          | 4 ++--
 package/efl/libecore/libecore.mk                          | 4 ++--
 package/efl/libedbus/libedbus.mk                          | 4 ++--
 package/efl/libedje/libedje.mk                            | 4 ++--
 package/efl/libeet/libeet.mk                              | 4 ++--
 package/efl/libeina/libeina.mk                            | 4 ++--
 package/efl/libeio/libeio.mk                              | 4 ++--
 package/efl/libembryo/libembryo.mk                        | 4 ++--
 .../libevas-generic-loaders/libevas-generic-loaders.mk    | 4 ++--
 package/efl/libevas/libevas.mk                            | 4 ++--
 package/elftosb/elftosb.mk                                | 4 ++--
 package/elfutils/elfutils.mk                              | 4 ++--
 package/empty/empty.mk                                    | 4 ++--
 package/enchant/enchant.mk                                | 4 ++--
 package/enlightenment/enlightenment.mk                    | 4 ++--
 package/enscript/enscript.mk                              | 4 ++--
 package/erlang/erlang.mk                                  | 4 ++--
 package/ethtool/ethtool.mk                                | 4 ++--
 package/evtest/evtest.mk                                  | 4 ++--
 package/exfat-utils/exfat-utils.mk                        | 4 ++--
 package/exfat/exfat.mk                                    | 4 ++--
 package/expat/expat.mk                                    | 4 ++--
 package/ezxml/ezxml.mk                                    | 4 ++--
 package/f2fs-tools/f2fs-tools.mk                          | 4 ++--
 package/fakeroot/fakeroot.mk                              | 4 ++--
 package/fan-ctrl/fan-ctrl.mk                              | 4 ++--
 package/fb-test-app/fb-test-app.mk                        | 4 ++--
 package/fbdump/fbdump.mk                                  | 4 ++--
 package/fbset/fbset.mk                                    | 4 ++--
 package/fbterm/fbterm.mk                                  | 4 ++--
 package/fbv/fbv.mk                                        | 4 ++--
 package/fconfig/fconfig.mk                                | 4 ++--
 package/file/file.mk                                      | 4 ++--
 package/filemq/filemq.mk                                  | 4 ++--
 package/findutils/findutils.mk                            | 4 ++--
 package/fis/fis.mk                                        | 4 ++--
 package/flashbench/flashbench.mk                          | 4 ++--
 package/flashrom/flashrom.mk                              | 4 ++--
 package/flex/flex.mk                                      | 4 ++--
 package/fltk/fltk.mk                                      | 4 ++--
 package/fluxbox/fluxbox.mk                                | 4 ++--
 package/fmtools/fmtools.mk                                | 4 ++--
 package/fontconfig/fontconfig.mk                          | 4 ++--
 package/foomatic-filters/foomatic-filters.mk              | 4 ++--
 package/freerdp/freerdp.mk                                | 4 ++--
 package/freescale-imx/firmware-imx/firmware-imx.mk        | 4 ++--
 package/freescale-imx/freescale-imx.mk                    | 4 ++--
 .../freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk    | 4 ++--
 package/freescale-imx/imx-lib/imx-lib.mk                  | 4 ++--
 package/freetype/freetype.mk                              | 4 ++--
 package/fxload/fxload.mk                                  | 4 ++--
 package/gadgetfs-test/gadgetfs-test.mk                    | 4 ++--
 package/gamin/gamin.mk                                    | 4 ++--
 package/gawk/gawk.mk                                      | 4 ++--
 package/gdb/gdb.mk                                        | 4 ++--
 package/gdbm/gdbm.mk                                      | 4 ++--
 package/gdk-pixbuf/gdk-pixbuf.mk                          | 4 ++--
 package/genext2fs/genext2fs.mk                            | 4 ++--
 package/genimage/genimage.mk                              | 4 ++--
 package/genpart/genpart.mk                                | 4 ++--
 package/genromfs/genromfs.mk                              | 4 ++--
 package/gesftpserver/gesftpserver.mk                      | 4 ++--
 package/gettext/gettext.mk                                | 4 ++--
 package/giblib/giblib.mk                                  | 4 ++--
 package/git/git.mk                                        | 4 ++--
 package/glib-networking/glib-networking.mk                | 4 ++--
 package/glibmm/glibmm.mk                                  | 4 ++--
 package/gmp/gmp.mk                                        | 4 ++--
 package/gmpc/gmpc.mk                                      | 4 ++--
 package/gnuchess/gnuchess.mk                              | 4 ++--
 package/gnupg/gnupg.mk                                    | 4 ++--
 package/gnuplot/gnuplot.mk                                | 4 ++--
 package/gnutls/gnutls.mk                                  | 4 ++--
 package/gob2/gob2.mk                                      | 4 ++--
 package/googlefontdirectory/googlefontdirectory.mk        | 4 ++--
 package/gperf/gperf.mk                                    | 4 ++--
 package/gpsd/gpsd.mk                                      | 4 ++--
 package/gptfdisk/gptfdisk.mk                              | 4 ++--
 package/gqview/gqview.mk                                  | 4 ++--
 package/grantlee/grantlee.mk                              | 4 ++--
 package/grep/grep.mk                                      | 4 ++--
 package/gsl/gsl.mk                                        | 4 ++--
 package/gtest/gtest.mk                                    | 4 ++--
 package/gtk2-engines/gtk2-engines.mk                      | 4 ++--
 .../gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk  | 4 ++--
 package/gtkperf/gtkperf.mk                                | 4 ++--
 package/gutenprint/gutenprint.mk                          | 4 ++--
 package/gvfs/gvfs.mk                                      | 4 ++--
 package/gzip/gzip.mk                                      | 4 ++--
 package/haserl/haserl.mk                                  | 4 ++--
 package/hdparm/hdparm.mk                                  | 4 ++--
 package/heirloom-mailx/heirloom-mailx.mk                  | 4 ++--
 package/hostapd/hostapd.mk                                | 4 ++--
 package/hplip/hplip.mk                                    | 4 ++--
 package/htop/htop.mk                                      | 4 ++--
 package/httping/httping.mk                                | 4 ++--
 package/hwdata/hwdata.mk                                  | 4 ++--
 package/i2c-tools/i2c-tools.mk                            | 4 ++--
 package/icu/icu.mk                                        | 4 ++--
 package/ifplugd/ifplugd.mk                                | 4 ++--
 package/iftop/iftop.mk                                    | 4 ++--
 package/imagemagick/imagemagick.mk                        | 4 ++--
 package/imlib2/imlib2.mk                                  | 4 ++--
 package/inadyn/inadyn.mk                                  | 4 ++--
 package/infozip/infozip.mk                                | 4 ++--
 package/inotify-tools/inotify-tools.mk                    | 4 ++--
 package/input-event-daemon/input-event-daemon.mk          | 4 ++--
 package/input-tools/input-tools.mk                        | 4 ++--
 package/intltool/intltool.mk                              | 4 ++--
 package/iostat/iostat.mk                                  | 4 ++--
 package/iozone/iozone.mk                                  | 4 ++--
 package/iperf/iperf.mk                                    | 4 ++--
 package/ipkg/ipkg.mk                                      | 4 ++--
 package/iproute2/iproute2.mk                              | 4 ++--
 package/ipsec-tools/ipsec-tools.mk                        | 4 ++--
 package/ipset/ipset.mk                                    | 4 ++--
 package/iptables/iptables.mk                              | 4 ++--
 package/irda-utils/irda-utils.mk                          | 4 ++--
 package/iw/iw.mk                                          | 4 ++--
 package/jansson/jansson.mk                                | 4 ++--
 package/jhead/jhead.mk                                    | 4 ++--
 package/jpeg-turbo/jpeg-turbo.mk                          | 4 ++--
 package/jpeg/jpeg.mk                                      | 4 ++--
 package/jquery-keyboard/jquery-keyboard.mk                | 4 ++--
 package/jquery-ui-themes/jquery-ui-themes.mk              | 4 ++--
 package/jquery-ui/jquery-ui.mk                            | 4 ++--
 package/json-glib/json-glib.mk                            | 4 ++--
 package/json-javascript/json-javascript.mk                | 4 ++--
 package/kbd/kbd.mk                                        | 4 ++--
 package/kexec/kexec.mk                                    | 4 ++--
 package/keyutils/keyutils.mk                              | 4 ++--
 package/kismet/kismet.mk                                  | 4 ++--
 package/kmod/kmod.mk                                      | 4 ++--
 package/latencytop/latencytop.mk                          | 4 ++--
 package/lcdapi/lcdapi.mk                                  | 4 ++--
 package/lcdproc/lcdproc.mk                                | 4 ++--
 package/lcms2/lcms2.mk                                    | 4 ++--
 package/leafpad/leafpad.mk                                | 4 ++--
 package/less/less.mk                                      | 4 ++--
 package/libaio/libaio.mk                                  | 4 ++--
 package/libao/libao.mk                                    | 4 ++--
 package/libarchive/libarchive.mk                          | 4 ++--
 package/libargtable2/libargtable2.mk                      | 4 ++--
 package/libart/libart.mk                                  | 4 ++--
 package/libatasmart/libatasmart.mk                        | 4 ++--
 package/libatomic_ops/libatomic_ops.mk                    | 4 ++--
 package/libbsd/libbsd.mk                                  | 4 ++--
 package/libcap-ng/libcap-ng.mk                            | 4 ++--
 package/libcap/libcap.mk                                  | 4 ++--
 package/libcdaudio/libcdaudio.mk                          | 4 ++--
 package/libcgi/libcgi.mk                                  | 4 ++--
 package/libcgicc/libcgicc.mk                              | 4 ++--
 package/libcofi/libcofi.mk                                | 4 ++--
 package/libconfig/libconfig.mk                            | 4 ++--
 package/libconfuse/libconfuse.mk                          | 4 ++--
 package/libcurl/libcurl.mk                                | 4 ++--
 package/libdaemon/libdaemon.mk                            | 4 ++--
 package/libdmtx/libdmtx.mk                                | 4 ++--
 package/libdnet/libdnet.mk                                | 4 ++--
 package/libdrm/libdrm.mk                                  | 4 ++--
 package/libdvdnav/libdvdnav.mk                            | 4 ++--
 package/libdvdread/libdvdread.mk                          | 4 ++--
 package/libeXosip2/libeXosip2.mk                          | 4 ++--
 package/libebml/libebml.mk                                | 4 ++--
 package/libedit/libedit.mk                                | 4 ++--
 package/libelf/libelf.mk                                  | 4 ++--
 package/liberation/liberation.mk                          | 4 ++--
 package/libesmtp/libesmtp.mk                              | 4 ++--
 package/libev/libev.mk                                    | 4 ++--
 package/libevent/libevent.mk                              | 4 ++--
 package/libexif/libexif.mk                                | 4 ++--
 package/libfcgi/libfcgi.mk                                | 4 ++--
 package/libffi/libffi.mk                                  | 4 ++--
 package/libfreefare/libfreefare.mk                        | 4 ++--
 package/libfribidi/libfribidi.mk                          | 4 ++--
 package/libfslcodec/libfslcodec.mk                        | 4 ++--
 package/libfslparser/libfslparser.mk                      | 4 ++--
 package/libfslvpuwrap/libfslvpuwrap.mk                    | 4 ++--
 package/libftdi/libftdi.mk                                | 4 ++--
 package/libfuse/libfuse.mk                                | 4 ++--
 package/libgail/libgail.mk                                | 4 ++--
 package/libgcrypt/libgcrypt.mk                            | 4 ++--
 package/libgeotiff/libgeotiff.mk                          | 4 ++--
 package/libglade/libglade.mk                              | 4 ++--
 package/libglib2/libglib2.mk                              | 4 ++--
 package/libgpg-error/libgpg-error.mk                      | 4 ++--
 package/libgsasl/libgsasl.mk                              | 4 ++--
 package/libgtk2/libgtk2.mk                                | 4 ++--
 package/libhid/libhid.mk                                  | 4 ++--
 package/libical/libical.mk                                | 4 ++--
 package/libiconv/libiconv.mk                              | 4 ++--
 package/libid3tag/libid3tag.mk                            | 4 ++--
 package/libidn/libidn.mk                                  | 4 ++--
 package/libiqrf/libiqrf.mk                                | 4 ++--
 package/libiscsi/libiscsi.mk                              | 4 ++--
 package/libjpeg/libjpeg.mk                                | 4 ++--
 package/libjson/libjson.mk                                | 4 ++--
 package/liblo/liblo.mk                                    | 4 ++--
 package/liblockfile/liblockfile.mk                        | 4 ++--
 package/liblog4c-localtime/liblog4c-localtime.mk          | 4 ++--
 package/libmad/libmad.mk                                  | 4 ++--
 package/libmatroska/libmatroska.mk                        | 4 ++--
 package/libmbus/libmbus.mk                                | 4 ++--
 package/libmcrypt/libmcrypt.mk                            | 4 ++--
 package/libmhash/libmhash.mk                              | 4 ++--
 package/libmicrohttpd/libmicrohttpd.mk                    | 4 ++--
 package/libmms/libmms.mk                                  | 4 ++--
 package/libmnl/libmnl.mk                                  | 4 ++--
 package/libmodbus/libmodbus.mk                            | 4 ++--
 package/libmpd/libmpd.mk                                  | 4 ++--
 package/libmpeg2/libmpeg2.mk                              | 4 ++--
 package/libnetfilter_acct/libnetfilter-acct.mk            | 4 ++--
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk  | 4 ++--
 package/libnetfilter_cthelper/libnetfilter-cthelper.mk    | 4 ++--
 package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk  | 4 ++--
 package/libnetfilter_log/libnetfilter-log.mk              | 4 ++--
 package/libnetfilter_queue/libnetfilter-queue.mk          | 4 ++--
 package/libnfc-llcp/libnfc-llcp.mk                        | 4 ++--
 package/libnfc/libnfc.mk                                  | 4 ++--
 package/libnfnetlink/libnfnetlink.mk                      | 4 ++--
 package/libnl/libnl.mk                                    | 4 ++--
 package/libnspr/libnspr.mk                                | 4 ++--
 package/libnss/libnss.mk                                  | 4 ++--
 package/liboauth/liboauth.mk                              | 4 ++--
 package/libogg/libogg.mk                                  | 4 ++--
 package/liboping/liboping.mk                              | 4 ++--
 package/libosip2/libosip2.mk                              | 4 ++--
 package/libpcap/libpcap.mk                                | 4 ++--
 package/libpfm4/libpfm4.mk                                | 4 ++--
 package/libplayer/libplayer.mk                            | 4 ++--
 package/libpng/libpng.mk                                  | 4 ++--
 package/libpthsem/libpthsem.mk                            | 4 ++--
 package/libraw/libraw.mk                                  | 4 ++--
 package/libraw1394/libraw1394.mk                          | 4 ++--
 package/librsvg/librsvg.mk                                | 4 ++--
 package/librsync/librsync.mk                              | 4 ++--
 package/libseccomp/libseccomp.mk                          | 4 ++--
 package/libserial/libserial.mk                            | 4 ++--
 package/libsha1/libsha1.mk                                | 4 ++--
 package/libsigc/libsigc.mk                                | 4 ++--
 package/libsigsegv/libsigsegv.mk                          | 4 ++--
 package/libsndfile/libsndfile.mk                          | 4 ++--
 package/libsoup/libsoup.mk                                | 4 ++--
 package/libsvgtiny/libsvgtiny.mk                          | 4 ++--
 package/libsysfs/libsysfs.mk                              | 4 ++--
 package/libtasn1/libtasn1.mk                              | 4 ++--
 package/libtheora/libtheora.mk                            | 4 ++--
 package/libtirpc/libtirpc.mk                              | 4 ++--
 package/libtool/libtool.mk                                | 4 ++--
 package/libtorrent/libtorrent.mk                          | 4 ++--
 package/libtpl/libtpl.mk                                  | 4 ++--
 package/libungif/libungif.mk                              | 4 ++--
 package/libupnp/libupnp.mk                                | 4 ++--
 package/liburcu/liburcu.mk                                | 4 ++--
 package/libusb-compat/libusb-compat.mk                    | 4 ++--
 package/libusb/libusb.mk                                  | 4 ++--
 package/libv4l/libv4l.mk                                  | 4 ++--
 package/libvncserver/libvncserver.mk                      | 4 ++--
 package/libvorbis/libvorbis.mk                            | 4 ++--
 package/libxkbcommon/libxkbcommon.mk                      | 4 ++--
 package/libxml-parser-perl/libxml-parser-perl.mk          | 4 ++--
 package/libxml2/libxml2.mk                                | 4 ++--
 package/libxmlpp/libxmlpp.mk                              | 4 ++--
 package/libxslt/libxslt.mk                                | 4 ++--
 package/libyaml/libyaml.mk                                | 4 ++--
 package/lighttpd/lighttpd.mk                              | 4 ++--
 package/linenoise/linenoise.mk                            | 4 ++--
 package/linknx/linknx.mk                                  | 4 ++--
 package/links/links.mk                                    | 4 ++--
 package/linphone/linphone.mk                              | 4 ++--
 package/linux-firmware/linux-firmware.mk                  | 4 ++--
 package/linux-fusion/linux-fusion.mk                      | 4 ++--
 package/linux-pam/linux-pam.mk                            | 4 ++--
 package/lite/lite.mk                                      | 4 ++--
 package/live555/live555.mk                                | 4 ++--
 package/lm-sensors/lm-sensors.mk                          | 4 ++--
 package/lmbench/lmbench.mk                                | 4 ++--
 package/localedef/localedef.mk                            | 4 ++--
 package/lockfile-progs/lockfile-progs.mk                  | 4 ++--
 package/log4cxx/log4cxx.mk                                | 4 ++--
 package/logrotate/logrotate.mk                            | 4 ++--
 package/logsurfer/logsurfer.mk                            | 4 ++--
 package/lrzsz/lrzsz.mk                                    | 4 ++--
 package/lshw/lshw.mk                                      | 4 ++--
 package/lsof/lsof.mk                                      | 4 ++--
 package/lsuio/lsuio.mk                                    | 4 ++--
 package/ltp-testsuite/ltp-testsuite.mk                    | 4 ++--
 package/ltrace/ltrace.mk                                  | 4 ++--
 package/lttng-libust/lttng-libust.mk                      | 4 ++--
 package/lttng-modules/lttng-modules.mk                    | 4 ++--
 package/lttng-tools/lttng-tools.mk                        | 4 ++--
 package/lua-msgpack-native/lua-msgpack-native.mk          | 4 ++--
 package/lua/lua.mk                                        | 4 ++--
 package/luacjson/luacjson.mk                              | 4 ++--
 package/luaexpat/luaexpat.mk                              | 4 ++--
 package/luafilesystem/luafilesystem.mk                    | 4 ++--
 package/luajit/luajit.mk                                  | 4 ++--
 package/luasocket/luasocket.mk                            | 4 ++--
 package/lvm2/lvm2.mk                                      | 4 ++--
 package/lzma/lzma.mk                                      | 4 ++--
 package/lzo/lzo.mk                                        | 4 ++--
 package/lzop/lzop.mk                                      | 4 ++--
 package/m4/m4.mk                                          | 4 ++--
 package/macchanger/macchanger.mk                          | 4 ++--
 package/make/make.mk                                      | 4 ++--
 package/makedevs/makedevs.mk                              | 4 ++--
 package/matchbox/matchbox-common/matchbox-common.mk       | 6 +++---
 package/matchbox/matchbox-desktop/matchbox-desktop.mk     | 8 ++++----
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk     | 6 +++---
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk   | 8 ++++----
 package/matchbox/matchbox-lib/matchbox-lib.mk             | 8 ++++----
 package/matchbox/matchbox-panel/matchbox-panel.mk         | 8 ++++----
 .../matchbox-startup-monitor/matchbox-startup-monitor.mk  | 6 +++---
 package/matchbox/matchbox-wm/matchbox-wm.mk               | 8 ++++----
 package/mcrypt/mcrypt.mk                                  | 4 ++--
 package/mdadm/mdadm.mk                                    | 4 ++--
 package/media-ctl/media-ctl.mk                            | 4 ++--
 package/mediastreamer/mediastreamer.mk                    | 4 ++--
 package/memstat/memstat.mk                                | 4 ++--
 package/memtester/memtester.mk                            | 4 ++--
 package/metacity/metacity.mk                              | 4 ++--
 package/midori/midori.mk                                  | 4 ++--
 package/mii-diag/mii-diag.mk                              | 4 ++--
 package/minicom/minicom.mk                                | 4 ++--
 .../mobile_broadband_provider_info.mk                     | 4 ++--
 package/module-init-tools/module-init-tools.mk            | 4 ++--
 package/mongoose/mongoose.mk                              | 4 ++--
 package/mongrel2/mongrel2.mk                              | 4 ++--
 package/monit/monit.mk                                    | 4 ++--
 package/mpc/mpc.mk                                        | 4 ++--
 package/mpfr/mpfr.mk                                      | 4 ++--
 package/mrouted/mrouted.mk                                | 4 ++--
 package/msmtp/msmtp.mk                                    | 4 ++--
 package/mtd/mtd.mk                                        | 4 ++--
 package/mtdev/mtdev.mk                                    | 4 ++--
 package/mtdev2tuio/mtdev2tuio.mk                          | 4 ++--
 package/mtools/mtools.mk                                  | 4 ++--
 package/multimedia/alsa-utils/alsa-utils.mk               | 4 ++--
 package/multimedia/aumix/aumix.mk                         | 4 ++--
 package/multimedia/bellagio/bellagio.mk                   | 4 ++--
 package/multimedia/ffmpeg/ffmpeg.mk                       | 4 ++--
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk               | 4 ++--
 package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk     | 4 ++--
 package/multimedia/gst-plugins-bad/gst-plugins-bad.mk     | 4 ++--
 package/multimedia/gst-plugins-base/gst-plugins-base.mk   | 4 ++--
 package/multimedia/gst-plugins-good/gst-plugins-good.mk   | 4 ++--
 package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk   | 4 ++--
 package/multimedia/gstreamer/gstreamer.mk                 | 4 ++--
 package/multimedia/lame/lame.mk                           | 4 ++--
 package/multimedia/libvpx/libvpx.mk                       | 4 ++--
 package/multimedia/madplay/madplay.mk                     | 4 ++--
 package/multimedia/mpd/mpd.mk                             | 4 ++--
 package/multimedia/mpg123/mpg123.mk                       | 4 ++--
 package/multimedia/mplayer/mplayer.mk                     | 4 ++--
 package/multimedia/vorbis-tools/vorbis-tools.mk           | 4 ++--
 package/mutt/mutt.mk                                      | 4 ++--
 package/mxml/mxml.mk                                      | 4 ++--
 package/mysql_client/mysql_client.mk                      | 4 ++--
 package/nano/nano.mk                                      | 4 ++--
 package/nanocom/nanocom.mk                                | 4 ++--
 package/nasm/nasm.mk                                      | 4 ++--
 package/nbd/nbd.mk                                        | 4 ++--
 package/ncdu/ncdu.mk                                      | 4 ++--
 package/ncftp/ncftp.mk                                    | 4 ++--
 package/ncurses/ncurses.mk                                | 4 ++--
 package/ndisc6/ndisc6.mk                                  | 4 ++--
 package/ne10/ne10.mk                                      | 4 ++--
 package/neard/neard.mk                                    | 4 ++--
 package/neardal/neardal.mk                                | 4 ++--
 package/neon/neon.mk                                      | 4 ++--
 package/netatalk/netatalk.mk                              | 4 ++--
 package/netcat/netcat.mk                                  | 4 ++--
 package/netkitbase/netkitbase.mk                          | 4 ++--
 package/netkittelnet/netkittelnet.mk                      | 4 ++--
 package/netperf/netperf.mk                                | 4 ++--
 package/netplug/netplug.mk                                | 4 ++--
 package/netsnmp/netsnmp.mk                                | 4 ++--
 package/netstat-nat/netstat-nat.mk                        | 4 ++--
 package/network-manager/network-manager.mk                | 4 ++--
 package/newt/newt.mk                                      | 4 ++--
 package/nfacct/nfacct.mk                                  | 4 ++--
 package/nfs-utils/nfs-utils.mk                            | 4 ++--
 package/ngircd/ngircd.mk                                  | 4 ++--
 package/ngrep/ngrep.mk                                    | 4 ++--
 package/nmap/nmap.mk                                      | 4 ++--
 package/nodejs/nodejs.mk                                  | 4 ++--
 package/noip/noip.mk                                      | 4 ++--
 package/nss-mdns/nss-mdns.mk                              | 4 ++--
 package/ntfs-3g/ntfs-3g.mk                                | 4 ++--
 package/ntp/ntp.mk                                        | 4 ++--
 package/numactl/numactl.mk                                | 4 ++--
 package/nuttcp/nuttcp.mk                                  | 4 ++--
 package/ocf-linux/ocf-linux.mk                            | 4 ++--
 package/ofono/ofono.mk                                    | 4 ++--
 package/olsr/olsr.mk                                      | 4 ++--
 package/omap-u-boot-utils/omap-u-boot-utils.mk            | 4 ++--
 package/open2300/open2300.mk                              | 4 ++--
 package/opencv/opencv.mk                                  | 4 ++--
 package/opengl/libegl/libegl.mk                           | 4 ++--
 package/opengl/libgles/libgles.mk                         | 4 ++--
 package/opengl/libopenmax/libopenmax.mk                   | 4 ++--
 package/opengl/libopenvg/libopenvg.mk                     | 4 ++--
 package/openntpd/openntpd.mk                              | 4 ++--
 package/openobex/openobex.mk                              | 4 ++--
 package/openocd/openocd.mk                                | 4 ++--
 package/openpgm/openpgm.mk                                | 4 ++--
 package/openssh/openssh.mk                                | 4 ++--
 package/openssl/openssl.mk                                | 4 ++--
 package/openswan/openswan.mk                              | 4 ++--
 package/openvpn/openvpn.mk                                | 4 ++--
 package/opkg/opkg.mk                                      | 4 ++--
 package/oprofile/oprofile.mk                              | 4 ++--
 package/opus-tools/opus-tools.mk                          | 4 ++--
 package/opus/opus.mk                                      | 4 ++--
 package/orc/orc.mk                                        | 4 ++--
 package/owl-linux/owl-linux.mk                            | 4 ++--
 package/p11-kit/p11-kit.mk                                | 4 ++--
 package/pango/pango.mk                                    | 4 ++--
 package/parted/parted.mk                                  | 4 ++--
 package/patch/patch.mk                                    | 4 ++--
 package/pciutils/pciutils.mk                              | 4 ++--
 package/pcmanfm/pcmanfm.mk                                | 4 ++--
 package/pcre/pcre.mk                                      | 4 ++--
 package/pcsc-lite/pcsc-lite.mk                            | 4 ++--
 package/perf/perf.mk                                      | 4 ++--
 package/perl/perl.mk                                      | 4 ++--
 package/php/php.mk                                        | 4 ++--
 package/picocom/picocom.mk                                | 4 ++--
 package/pkg-config/pkg-config.mk                          | 4 ++--
 package/pkg-download.mk                                   | 4 ++--
 package/pkg-utils.mk                                      | 4 ++--
 package/pkgconf/pkgconf.mk                                | 4 ++--
 package/pmake/pmake.mk                                    | 4 ++--
 package/poco/poco.mk                                      | 4 ++--
 package/polkit/polkit.mk                                  | 4 ++--
 package/poppler/poppler.mk                                | 4 ++--
 package/popt/popt.mk                                      | 4 ++--
 package/portmap/portmap.mk                                | 4 ++--
 package/pppd/pppd.mk                                      | 4 ++--
 package/pptp-linux/pptp-linux.mk                          | 4 ++--
 package/prboom/prboom.mk                                  | 4 ++--
 package/procps/procps.mk                                  | 4 ++--
 package/proftpd/proftpd.mk                                | 4 ++--
 package/protobuf-c/protobuf-c.mk                          | 4 ++--
 package/protobuf/protobuf.mk                              | 4 ++--
 package/proxychains-ng/proxychains-ng.mk                  | 4 ++--
 package/psmisc/psmisc.mk                                  | 4 ++--
 package/ptpd/ptpd.mk                                      | 4 ++--
 package/ptpd2/ptpd2.mk                                    | 4 ++--
 package/pv/pv.mk                                          | 4 ++--
 package/python-bottle/python-bottle.mk                    | 4 ++--
 package/python-distutilscross/python-distutilscross.mk    | 4 ++--
 package/python-dpkt/python-dpkt.mk                        | 4 ++--
 package/python-id3/python-id3.mk                          | 4 ++--
 package/python-m2crypto/python-m2crypto.mk                | 4 ++--
 package/python-mad/python-mad.mk                          | 4 ++--
 package/python-meld3/python-meld3.mk                      | 4 ++--
 package/python-netifaces/python-netifaces.mk              | 4 ++--
 package/python-nfc/python-nfc.mk                          | 4 ++--
 package/python-protobuf/python-protobuf.mk                | 4 ++--
 package/python-pygame/python-pygame.mk                    | 4 ++--
 package/python-pyparsing/python-pyparsing.mk              | 4 ++--
 package/python-serial/python-serial.mk                    | 4 ++--
 package/python-setuptools/python-setuptools.mk            | 4 ++--
 package/python-thrift/python-thrift.mk                    | 4 ++--
 package/python/python.mk                                  | 4 ++--
 package/python3/python3.mk                                | 4 ++--
 package/qemu/qemu.mk                                      | 4 ++--
 package/qextserialport/qextserialport.mk                  | 4 ++--
 package/qjson/qjson.mk                                    | 4 ++--
 package/qt/qt.mk                                          | 4 ++--
 package/qt5/qt5base/qt5base.mk                            | 4 ++--
 package/qt5/qt5declarative/qt5declarative.mk              | 4 ++--
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk    | 4 ++--
 package/qt5/qt5imageformats/qt5imageformats.mk            | 4 ++--
 package/qt5/qt5jsbackend/qt5jsbackend.mk                  | 4 ++--
 package/qt5/qt5multimedia/qt5multimedia.mk                | 4 ++--
 package/qt5/qt5quick1/qt5quick1.mk                        | 4 ++--
 package/qt5/qt5script/qt5script.mk                        | 4 ++--
 package/qt5/qt5svg/qt5svg.mk                              | 4 ++--
 package/qt5/qt5webkit/qt5webkit.mk                        | 4 ++--
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk              | 4 ++--
 package/qtuio/qtuio.mk                                    | 4 ++--
 package/quagga/quagga.mk                                  | 4 ++--
 package/quota/quota.mk                                    | 4 ++--
 package/qwt/qwt.mk                                        | 4 ++--
 package/radvd/radvd.mk                                    | 4 ++--
 package/ramspeed/ramspeed.mk                              | 4 ++--
 package/rapidjson/rapidjson.mk                            | 4 ++--
 package/rdesktop/rdesktop.mk                              | 4 ++--
 package/read-edid/read-edid.mk                            | 4 ++--
 package/readline/readline.mk                              | 4 ++--
 package/redis/redis.mk                                    | 4 ++--
 package/rings/rings.mk                                    | 4 ++--
 package/rng-tools/rng-tools.mk                            | 4 ++--
 package/rp-pppoe/rp-pppoe.mk                              | 4 ++--
 package/rpcbind/rpcbind.mk                                | 4 ++--
 package/rpi-firmware/rpi-firmware.mk                      | 4 ++--
 package/rpi-userland/rpi-userland.mk                      | 4 ++--
 package/rpm/rpm.mk                                        | 4 ++--
 package/rrdtool/rrdtool.mk                                | 4 ++--
 package/rsh-redone/rsh-redone.mk                          | 4 ++--
 package/rsync/rsync.mk                                    | 4 ++--
 package/rsyslog/rsyslog.mk                                | 4 ++--
 package/rtorrent/rtorrent.mk                              | 4 ++--
 package/rubix/rubix.mk                                    | 4 ++--
 package/ruby/ruby.mk                                      | 4 ++--
 package/sam-ba/sam-ba.mk                                  | 4 ++--
 package/samba/samba.mk                                    | 4 ++--
 package/sane-backends/sane-backends.mk                    | 4 ++--
 package/sawman/sawman.mk                                  | 4 ++--
 package/schifra/schifra.mk                                | 4 ++--
 package/sconeserver/sconeserver.mk                        | 4 ++--
 package/screen/screen.mk                                  | 4 ++--
 package/sdl/sdl.mk                                        | 4 ++--
 package/sdl_gfx/sdl_gfx.mk                                | 4 ++--
 package/sdl_image/sdl_image.mk                            | 4 ++--
 package/sdl_mixer/sdl_mixer.mk                            | 4 ++--
 package/sdl_net/sdl_net.mk                                | 4 ++--
 package/sdl_sound/sdl_sound.mk                            | 4 ++--
 package/sdl_ttf/sdl_ttf.mk                                | 4 ++--
 package/sed/sed.mk                                        | 4 ++--
 package/ser2net/ser2net.mk                                | 4 ++--
 package/setserial/setserial.mk                            | 4 ++--
 package/sg3_utils/sg3_utils.mk                            | 4 ++--
 package/shared-mime-info/shared-mime-info.mk              | 4 ++--
 package/slang/slang.mk                                    | 4 ++--
 package/slirp/slirp.mk                                    | 4 ++--
 package/smartmontools/smartmontools.mk                    | 4 ++--
 package/snappy/snappy.mk                                  | 4 ++--
 package/snowball-hdmiservice/snowball-hdmiservice.mk      | 4 ++--
 package/snowball-init/snowball-init.mk                    | 4 ++--
 package/socat/socat.mk                                    | 4 ++--
 package/socketcand/socketcand.mk                          | 4 ++--
 package/sound-theme-borealis/sound-theme-borealis.mk      | 4 ++--
 .../sound-theme-freedesktop/sound-theme-freedesktop.mk    | 4 ++--
 package/spawn-fcgi/spawn-fcgi.mk                          | 4 ++--
 package/speex/speex.mk                                    | 4 ++--
 package/spice-protocol/spice-protocol.mk                  | 4 ++--
 package/spice/spice.mk                                    | 4 ++--
 package/sqlcipher/sqlcipher.mk                            | 4 ++--
 package/sqlite/sqlite.mk                                  | 4 ++--
 package/squid/squid.mk                                    | 4 ++--
 package/sredird/sredird.mk                                | 4 ++--
 package/sshfs/sshfs.mk                                    | 4 ++--
 package/sstrip/sstrip.mk                                  | 4 ++--
 package/startup-notification/startup-notification.mk      | 4 ++--
 package/statserial/statserial.mk                          | 4 ++--
 package/strace/strace.mk                                  | 4 ++--
 package/stress/stress.mk                                  | 4 ++--
 package/stunnel/stunnel.mk                                | 4 ++--
 package/sudo/sudo.mk                                      | 4 ++--
 package/sunxi-boards/sunxi-boards.mk                      | 4 ++--
 package/sunxi-tools/sunxi-tools.mk                        | 4 ++--
 package/supervisor/supervisor.mk                          | 4 ++--
 package/swig/swig.mk                                      | 4 ++--
 package/sylpheed/sylpheed.mk                              | 4 ++--
 package/synergy/synergy.mk                                | 4 ++--
 package/sysklogd/sysklogd.mk                              | 4 ++--
 package/sysprof/sysprof.mk                                | 4 ++--
 package/sysstat/sysstat.mk                                | 4 ++--
 package/systemd/systemd.mk                                | 4 ++--
 package/sysvinit/sysvinit.mk                              | 4 ++--
 package/taglib/taglib.mk                                  | 4 ++--
 package/tar/tar.mk                                        | 4 ++--
 package/tcl/tcl.mk                                        | 4 ++--
 package/tcllib/tcllib.mk                                  | 4 ++--
 package/tcpdump/tcpdump.mk                                | 4 ++--
 package/tcpreplay/tcpreplay.mk                            | 4 ++--
 package/texinfo/texinfo.mk                                | 4 ++--
 package/tftpd/tftpd.mk                                    | 4 ++--
 package/thttpd/thttpd.mk                                  | 4 ++--
 package/ti-utils/ti-utils.mk                              | 4 ++--
 package/tiff/tiff.mk                                      | 4 ++--
 package/time/time.mk                                      | 4 ++--
 package/tinyhttpd/tinyhttpd.mk                            | 4 ++--
 package/tn5250/tn5250.mk                                  | 4 ++--
 package/torsmo/torsmo.mk                                  | 4 ++--
 package/transmission/transmission.mk                      | 4 ++--
 package/tremor/tremor.mk                                  | 4 ++--
 package/tslib/tslib.mk                                    | 4 ++--
 package/ttcp/ttcp.mk                                      | 4 ++--
 package/tvheadend/tvheadend.mk                            | 4 ++--
 package/tzdata/tzdata.mk                                  | 4 ++--
 package/uboot-tools/uboot-tools.mk                        | 4 ++--
 package/udev/udev.mk                                      | 4 ++--
 package/udisks/udisks.mk                                  | 4 ++--
 package/udpcast/udpcast.mk                                | 4 ++--
 package/uemacs/uemacs.mk                                  | 4 ++--
 package/ulogd/ulogd.mk                                    | 4 ++--
 package/unionfs/unionfs.mk                                | 4 ++--
 package/urg/urg.mk                                        | 4 ++--
 package/usb_modeswitch/usb_modeswitch.mk                  | 4 ++--
 package/usb_modeswitch_data/usb_modeswitch_data.mk        | 4 ++--
 package/usbmount/usbmount.mk                              | 4 ++--
 package/usbredir/usbredir.mk                              | 4 ++--
 package/usbutils/usbutils.mk                              | 4 ++--
 package/ushare/ushare.mk                                  | 4 ++--
 package/ussp-push/ussp-push.mk                            | 4 ++--
 package/util-linux/util-linux.mk                          | 4 ++--
 package/ux500-firmware/ux500-firmware.mk                  | 4 ++--
 package/vala/vala.mk                                      | 4 ++--
 package/valgrind/valgrind.mk                              | 4 ++--
 package/vde2/vde2.mk                                      | 4 ++--
 package/vim/vim.mk                                        | 4 ++--
 package/vpnc/vpnc.mk                                      | 4 ++--
 package/vsftpd/vsftpd.mk                                  | 4 ++--
 package/vtun/vtun.mk                                      | 4 ++--
 package/wayland/wayland.mk                                | 4 ++--
 package/webkit/webkit.mk                                  | 4 ++--
 package/webp/webp.mk                                      | 4 ++--
 package/weston/weston.mk                                  | 4 ++--
 package/wget/wget.mk                                      | 4 ++--
 package/whetstone/whetstone.mk                            | 4 ++--
 package/which/which.mk                                    | 4 ++--
 package/wipe/wipe.mk                                      | 4 ++--
 package/wireless-regdb/wireless-regdb.mk                  | 4 ++--
 package/wireless_tools/wireless_tools.mk                  | 4 ++--
 package/wireshark/wireshark.mk                            | 4 ++--
 package/wpa_supplicant/wpa_supplicant.mk                  | 4 ++--
 package/wsapi/wsapi.mk                                    | 4 ++--
 package/wvdial/wvdial.mk                                  | 4 ++--
 package/wvstreams/wvstreams.mk                            | 4 ++--
 package/x11r7/libxcb/libxcb.mk                            | 4 ++--
 package/x11r7/mcookie/mcookie.mk                          | 4 ++--
 package/x11r7/mesa3d/mesa3d.mk                            | 4 ++--
 package/x11r7/xapp_xman/xapp_xman.mk                      | 4 ++--
 package/x11r7/xcb-proto/xcb-proto.mk                      | 4 ++--
 package/x11r7/xcb-util-image/xcb-util-image.mk            | 4 ++--
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk        | 4 ++--
 package/x11r7/xcb-util-wm/xcb-util-wm.mk                  | 4 ++--
 package/x11r7/xcb-util/xcb-util.mk                        | 4 ++--
 .../xcursor-transparent-theme.mk                          | 4 ++--
 .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk    | 4 ++--
 .../xdriver_xf86-video-openchrome.mk                      | 4 ++--
 package/x11r7/xkeyboard-config/xkeyboard-config.mk        | 4 ++--
 .../x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk  | 4 ++--
 package/x11vnc/x11vnc.mk                                  | 4 ++--
 package/xavante/xavante.mk                                | 4 ++--
 package/xenomai/xenomai.mk                                | 4 ++--
 package/xerces/xerces.mk                                  | 4 ++--
 package/xfsprogs/xfsprogs.mk                              | 4 ++--
 package/xinetd/xinetd.mk                                  | 4 ++--
 package/xl2tp/xl2tp.mk                                    | 4 ++--
 package/xmlstarlet/xmlstarlet.mk                          | 4 ++--
 package/xstroke/xstroke.mk                                | 4 ++--
 package/xterm/xterm.mk                                    | 4 ++--
 package/xvkbd/xvkbd.mk                                    | 4 ++--
 package/xz/xz.mk                                          | 4 ++--
 package/yasm/yasm.mk                                      | 4 ++--
 package/yavta/yavta.mk                                    | 4 ++--
 package/zd1211-firmware/zd1211-firmware.mk                | 4 ++--
 package/zeromq/zeromq.mk                                  | 4 ++--
 package/zic/zic.mk                                        | 4 ++--
 package/zlib/zlib.mk                                      | 4 ++--
 package/zmqpp/zmqpp.mk                                    | 4 ++--
 package/zxing/zxing.mk                                    | 4 ++--
 package/zyre/zyre.mk                                      | 4 ++--
 761 files changed, 1535 insertions(+), 1535 deletions(-)

diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index f2b282892f..130ad10258 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # acl
 #
-#############################################################
+################################################################################
 
 ACL_VERSION = 2.2.52
 ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index b64fa7d3f6..6a18f46ef9 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # acpid
 #
-#############################################################
+################################################################################
 
 ACPID_VERSION = 2.0.11
 ACPID_SOURCE = acpid_$(ACPID_VERSION).orig.tar.gz
diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk
index c901708c46..ed40568f73 100644
--- a/package/aespipe/aespipe.mk
+++ b/package/aespipe/aespipe.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # aespipe
 #
-#############################################################
+################################################################################
 
 AESPIPE_VERSION = 2.4c
 AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2
diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index 7543c6cac1..fbefd741eb 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # aircrack-ng
 #
-#############################################################
+################################################################################
 
 AIRCRACK_NG_VERSION = 1.1
 AIRCRACK_NG_SOURCE = aircrack-ng-$(AIRCRACK_NG_VERSION).tar.gz
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 2856407680..a7ffd775a4 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # alsa-lib
 #
-#############################################################
+################################################################################
 
 ALSA_LIB_VERSION = 1.0.26
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index eca3dd0b02..c61e902c10 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # alsamixergui
 #
-#############################################################
+################################################################################
 
 ALSAMIXERGUI_VERSION = 0.9.0rc2-1
 ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
diff --git a/package/am33x-cm3/am33x-cm3.mk b/package/am33x-cm3/am33x-cm3.mk
index 3805c80228..929c4a5cd9 100644
--- a/package/am33x-cm3/am33x-cm3.mk
+++ b/package/am33x-cm3/am33x-cm3.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # am33x-cm3
 #
-#############################################################
+################################################################################
 
 AM33X_CM3_VERSION = AM335xPSP_04.06.00.10-rc1
 AM33X_CM3_SITE = http://arago-project.org/git/projects/am33x-cm3.git
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index f7313b0f49..11551d693e 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # apr-util
 #
-#############################################################
+################################################################################
 
 APR_UTIL_VERSION = 1.4.1
 APR_UTIL_SITE = http://archive.apache.org/dist/apr
diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index ef5c486d3f..6394882ca9 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # apr
 #
-#############################################################
+################################################################################
 
 APR_VERSION = 1.4.6
 APR_SITE = http://archive.apache.org/dist/apr
diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk
index 4fc4321b42..b87b923f49 100644
--- a/package/argp-standalone/argp-standalone.mk
+++ b/package/argp-standalone/argp-standalone.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # argp-standalone
 #
-#############################################################
+################################################################################
 
 ARGP_STANDALONE_VERSION = 1.3
 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index ba69794b11..f169506fc9 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # argus
 #
-#############################################################
+################################################################################
 
 ARGUS_VERSION = 3.0.0.rc.34
 ARGUS_SOURCE = argus_$(ARGUS_VERSION).orig.tar.gz
diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
index bf6867061d..4f101c7b12 100644
--- a/package/arptables/arptables.mk
+++ b/package/arptables/arptables.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # arptables
 #
-#############################################################
+################################################################################
 
 ARPTABLES_VERSION = 0.0.4
 ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz
diff --git a/package/at/at.mk b/package/at/at.mk
index ad024e3a1c..3bed6d5c19 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # at
 #
-#############################################################
+################################################################################
 
 AT_VERSION = 3.1.13
 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index f5b2e91b61..91fe6a3e00 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # atk
 #
-#############################################################
+################################################################################
 
 ATK_VERSION_MAJOR = 1.33
 ATK_VERSION = $(ATK_VERSION_MAJOR).6
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 2b670101d3..f7179a26d0 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # attr
 #
-#############################################################
+################################################################################
 
 ATTR_VERSION = 2.4.47
 ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index e49106e195..cfd87dc8fc 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # audiofile
 #
-#############################################################
+################################################################################
 
 AUDIOFILE_VERSION = 0.3.6
 AUDIOFILE_SITE = http://audiofile.68k.org
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index daac1f2179..bc6f65fc95 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # autoconf
 #
-#############################################################
+################################################################################
 
 AUTOCONF_VERSION = 2.68
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index faa1b36c36..98e03363a3 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # automake
 #
-#############################################################
+################################################################################
 
 AUTOMAKE_VERSION = 1.11.6
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index fac3be8e37..89dfc33db7 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # avahi
 #
-#############################################################
+################################################################################
 
 #
 # This program is free software; you can redistribute it
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 58ce774ef3..e8fa756513 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # axel
 #
-#############################################################
+################################################################################
 
 AXEL_VERSION = 2.4
 AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
diff --git a/package/b43-firmware/b43-firmware.mk b/package/b43-firmware/b43-firmware.mk
index a4383e4ca4..5d036e0276 100644
--- a/package/b43-firmware/b43-firmware.mk
+++ b/package/b43-firmware/b43-firmware.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # b43-firmware
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2),y)
 B43_FIRMWARE_VERSION = 5.100.138
diff --git a/package/b43-fwcutter/b43-fwcutter.mk b/package/b43-fwcutter/b43-fwcutter.mk
index b48eb4571f..bc11c0b8a0 100644
--- a/package/b43-fwcutter/b43-fwcutter.mk
+++ b/package/b43-fwcutter/b43-fwcutter.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # b43-fwcutter
 #
-#############################################################
+################################################################################
 
 B43_FWCUTTER_VERSION = 015
 B43_FWCUTTER_SITE = http://bues.ch/b43/fwcutter/
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index fff06043ef..d51e2037dd 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bash
 #
-#############################################################
+################################################################################
 
 BASH_VERSION = 4.2
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
index 3e07143137..31cbf90558 100644
--- a/package/bcusdk/bcusdk.mk
+++ b/package/bcusdk/bcusdk.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bcusck
 #
-#############################################################
+################################################################################
 
 BCUSDK_VERSION = 0.0.5
 BCUSDK_SOURCE = bcusdk_$(BCUSDK_VERSION).tar.gz
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index 9f145b7cc3..5805bda5ae 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # beecrypt
 #
-#############################################################
+################################################################################
 
 BEECRYPT_VERSION = 4.2.1
 BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index e30343477f..5d0e7472c0 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # berkeleydb
 #
-#############################################################
+################################################################################
 
 BERKELEYDB_VERSION = 5.3.21
 BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index f6895945a5..973981a9b1 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bind
 #
-#############################################################
+################################################################################
 
 BIND_VERSION = 9.6-ESV-R8
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index a2c4150c9b..377bb79500 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # binutils
 #
-#############################################################
+################################################################################
 
 # Version is set when using buildroot toolchain.
 # If not, we do like other packages
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 24c257629c..1eb4fa5b63 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bison
 #
-#############################################################
+################################################################################
 
 BISON_VERSION = 2.7.1
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index 7e5c73af7f..09d15f1d3f 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # blackbox
 #
-#############################################################
+################################################################################
 
 BLACKBOX_VERSION = 0.70.1
 BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 89e88e7279..3c25042712 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bluez_utils
 #
-#############################################################
+################################################################################
 
 BLUEZ_UTILS_VERSION = 4.101
 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index 4ff2f1a5db..bb6f17e2da 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bmon
 #
-#############################################################
+################################################################################
 
 BMON_VERSION = 2.1.0
 BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index 8789e8af02..9308b549e5 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # boa
 #
-#############################################################
+################################################################################
 
 BOA_VERSION = 0.94.14rc21
 BOA_SOURCE = boa-$(BOA_VERSION).tar.gz
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index b5b58691b0..57d021ae4e 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # boost
 #
-#############################################################
+################################################################################
 
 BOOST_VERSION = 1.53.0
 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
index 7ac11fc021..caee2fd950 100644
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bootutils
 #
-#############################################################
+################################################################################
 
 BOOTUTILS_VERSION = 1.0.0
 BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index 685b65794e..b1744a4e67 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bridge-utils
 #
-#############################################################
+################################################################################
 
 BRIDGE_UTILS_VERSION = 1.5
 BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 9a39ed5943..13c7c16022 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bsdiff
 #
-#############################################################
+################################################################################
 
 BSDIFF_VERSION = 4.3
 BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz
diff --git a/package/bustle/bustle.mk b/package/bustle/bustle.mk
index 88d49b62e6..68b7b24418 100644
--- a/package/bustle/bustle.mk
+++ b/package/bustle/bustle.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bustle
 #
-#############################################################
+################################################################################
 
 BUSTLE_VERSION = 0.4.2
 BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION)/
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 985203c6e6..cfefdbb96e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # busybox
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
 BUSYBOX_VERSION = snapshot
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
index 7ec7d7f473..b7dc8b2a56 100644
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bwm-ng
 #
-#############################################################
+################################################################################
 
 BWM_NG_VERSION = 0.6
 BWM_NG_SITE = http://downloads.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 5f8c35ef31..45d5108fd2 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bzip2
 #
-#############################################################
+################################################################################
 
 BZIP2_VERSION = 1.0.6
 BZIP2_SITE = http://www.bzip.org/$(BZIP2_VERSION)
diff --git a/package/cache-calibrator/cache-calibrator.mk b/package/cache-calibrator/cache-calibrator.mk
index 35c9f94914..d0620655c7 100644
--- a/package/cache-calibrator/cache-calibrator.mk
+++ b/package/cache-calibrator/cache-calibrator.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cache-calibrator
 #
-#############################################################
+################################################################################
 
 CACHE_CALIBRATOR_SOURCE = calibrator.c
 CACHE_CALIBRATOR_SITE = http://homepages.cwi.nl/~manegold/Calibrator/src
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 445b5540ae..347bb75250 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cairo
 #
-#############################################################
+################################################################################
 
 CAIRO_VERSION = 1.12.10
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
index 321dc5231b..c4a777b2bb 100644
--- a/package/can-utils/can-utils.mk
+++ b/package/can-utils/can-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # can-utils
 #
-#############################################################
+################################################################################
 
 CAN_UTILS_VERSION = 836d3cc0122ce31a1b732d369cbd27b690c3110f
 CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index faa7c9fcc6..c5cb966458 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ccache
 #
-#############################################################
+################################################################################
 
 CCACHE_VERSION = 3.1.8
 CCACHE_SITE    = http://samba.org/ftp/ccache
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 735e68923c..d6c221336a 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -1,8 +1,8 @@
-##########################################################
+################################################################################
 #
 # CCID
 #
-##########################################################
+################################################################################
 
 CCID_VERSION = 1.4.8
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index bade956162..ee98013e22 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cdrkit
 #
-#############################################################
+################################################################################
 
 CDRKIT_VERSION = 1.1.11
 CDRKIT_SITE = http://www.cdrkit.org/releases
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
index 817254f443..d44b8c4c09 100644
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcegui
 #
-#############################################################
+################################################################################
 
 # Do not update the version, we need exactly that one for Spice.
 CEGUI06_VERSION_MAJOR   = 0.6.2
diff --git a/package/celt051/celt.mk b/package/celt051/celt.mk
index 9baaa82454..b2fa951f34 100644
--- a/package/celt051/celt.mk
+++ b/package/celt051/celt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # celt051
 #
-#############################################################
+################################################################################
 
 # Although version newer than 0.5.1.3 exists, we're
 # stuck with 0.5.1.3 for use by Spice (coming later)
diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
index 48ee005510..a9c8874cee 100644
--- a/package/cgilua/cgilua.mk
+++ b/package/cgilua/cgilua.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cgilua
 #
-#############################################################
+################################################################################
 
 CGILUA_VERSION = 5.1.4
 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk
index 1cf94a399a..59fd3cb8a5 100644
--- a/package/chrony/chrony.mk
+++ b/package/chrony/chrony.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # chrony
 #
-#############################################################
+################################################################################
 
 CHRONY_VERSION = 1.27
 CHRONY_SITE = http://download.tuxfamily.org/chrony/
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index fa815ed840..ec976db040 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cjson
 #
-#############################################################
+################################################################################
 
 CJSON_VERSION         = 42
 CJSON_SITE_METHOD     = svn
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 8e3e7518ae..fd1cdd287c 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cmake
 #
-#############################################################
+################################################################################
 
 CMAKE_VERSION = 2.8.10.2
 CMAKE_SITE = http://www.cmake.org/files/v2.8/
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 4dfa1d1b18..b63d430d52 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # collectd
 #
-#############################################################
+################################################################################
 
 COLLECTD_VERSION = 5.3.0
 COLLECTD_SITE = http://collectd.org/files
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 1b7548a08d..d88b3b6314 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -1,8 +1,8 @@
-#######################################################
+################################################################################
 #
 # connman
 #
-#######################################################
+################################################################################
 
 CONNMAN_VERSION = 1.12
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index bbf6eaed33..614bbd1e14 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # conntrack-tools
 #
-#############################################################
+################################################################################
 
 CONNTRACK_TOOLS_VERSION = 1.4.1
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
diff --git a/package/copas/copas.mk b/package/copas/copas.mk
index c84a6cc0b5..347b5755f1 100644
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # copas
 #
-#############################################################
+################################################################################
 
 COPAS_VERSION = 1.1.6
 COPAS_SITE = http://github.com/downloads/keplerproject/copas
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 079ec127e5..17c81f7541 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # coreutils
 #
-#############################################################
+################################################################################
 
 COREUTILS_VERSION = 8.18
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
index e7fb76dc5f..c3e4a7fcc0 100644
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # coxpcall
 #
-#############################################################
+################################################################################
 
 COXPCALL_VERSION = 1.13.0
 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index 7e7b47d7a3..a2cd44be32 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cpanminus
 #
-#############################################################
+################################################################################
 
 CPANMINUS_VERSION = 1.6002
 CPANMINUS_SOURCE = $(CPANMINUS_VERSION).tar.gz
diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk
index d4609bf234..267a5d8af9 100644
--- a/package/cppzmq/cppzmq.mk
+++ b/package/cppzmq/cppzmq.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cppzmq
 #
-#############################################################
+################################################################################
 
 CPPZMQ_VERSION = b232978
 CPPZMQ_SITE = git://github.com/zeromq/cppzmq.git
diff --git a/package/cpuload/cpuload.mk b/package/cpuload/cpuload.mk
index 494cbb1179..65be513fa3 100644
--- a/package/cpuload/cpuload.mk
+++ b/package/cpuload/cpuload.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cpuload
 #
-#############################################################
+################################################################################
 
 CPULOAD_VERSION = v0.3
 CPULOAD_SITE = http://github.com/kelvincheung/cpuload/tarball/$(CPULOAD_VERSION)
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 519a179030..19ecde4f3f 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cramfs
 #
-#############################################################
+################################################################################
 
 CRAMFS_VERSION=1.1
 CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz
diff --git a/package/crda/crda.mk b/package/crda/crda.mk
index 0c9391d510..44fd0f292d 100644
--- a/package/crda/crda.mk
+++ b/package/crda/crda.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # crda
 #
-#############################################################
+################################################################################
 
 CRDA_VERSION = 1.1.3
 CRDA_SOURCE = crda-$(CRDA_VERSION).tar.bz2
diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk
index 1a78228317..7ec327e74e 100644
--- a/package/cryptodev-linux/cryptodev-linux.mk
+++ b/package/cryptodev-linux/cryptodev-linux.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cryptodev-linux
 #
-#############################################################
+################################################################################
 
 CRYPTODEV_LINUX_VERSION = 1.6
 CRYPTODEV_LINUX_SITE = http://download.gna.org/cryptodev-linux
diff --git a/package/cryptodev/cryptodev.mk b/package/cryptodev/cryptodev.mk
index a367293a01..1e0cbdeebc 100644
--- a/package/cryptodev/cryptodev.mk
+++ b/package/cryptodev/cryptodev.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # virtual cryptodev package
 #
-#############################################################
+################################################################################
 
 CRYPTODEV_SOURCE =
 
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index 216b142d31..aebf123141 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ctorrent
 #
-#############################################################
+################################################################################
 
 CTORRENT_VERSION = dnh3.3.2
 CTORRENT_SOURCE = ctorrent-$(CTORRENT_VERSION).tar.gz
diff --git a/package/curlftpfs/curlftpfs.mk b/package/curlftpfs/curlftpfs.mk
index ff70f3b408..117e0414b6 100644
--- a/package/curlftpfs/curlftpfs.mk
+++ b/package/curlftpfs/curlftpfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # curlftpfs
 #
-#############################################################
+################################################################################
 
 CURLFTPFS_VERSION = 0.9.2
 CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION)
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index d8eee422a1..e48be417c1 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cvs
 #
-#############################################################
+################################################################################
 
 CVS_VERSION = 1.12.13
 CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz
diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
index d63fb78479..c0f97ba909 100644
--- a/package/czmq/czmq.mk
+++ b/package/czmq/czmq.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # czmq
 #
-#############################################################
+################################################################################
 
 CZMQ_VERSION = cb9839cf90
 CZMQ_SITE = git://github.com/zeromq/czmq.git
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 64f72e0bfe..2765ed4230 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dash
 #
-#############################################################
+################################################################################
 
 DASH_VERSION = 0.5.7
 DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 447fc0c564..d4685f6463 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dbus-glib
 #
-#############################################################
+################################################################################
 
 DBUS_GLIB_VERSION = 0.98
 DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index 06a48e49b9..6e260d0727 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dbus-python
 #
-#############################################################
+################################################################################
 
 DBUS_PYTHON_VERSION = 0.83.0
 DBUS_PYTHON_SOURCE = dbus-python-$(DBUS_PYTHON_VERSION).tar.gz
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 3aa13458e5..cb72f1fd6c 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dbus
 #
-#############################################################
+################################################################################
 
 DBUS_VERSION = 1.4.24
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk
index cc9b218b4c..3e55d6960d 100644
--- a/package/devmem2/devmem2.mk
+++ b/package/devmem2/devmem2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # devmem2
 #
-#############################################################
+################################################################################
 
 DEVMEM2_SITE = http://free-electrons.com/pub/mirror
 DEVMEM2_SOURCE = devmem2.c
diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
index bc94264c9b..2f596b13a6 100644
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dfu-util
 #
-#############################################################
+################################################################################
 
 DFU_UTIL_VERSION = 0.6
 DFU_UTIL_SOURCE = dfu-util-$(DFU_UTIL_VERSION).tar.gz
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 34c0afac65..ce0cf231da 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dhcp
 #
-#############################################################
+################################################################################
 
 DHCP_VERSION = 4.1-ESV-R8
 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
index 06ecec4c2c..0c47d06ac5 100644
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dhcpdump
 #
-#############################################################
+################################################################################
 
 DHCPDUMP_VERSION = 1.8
 DHCPDUMP_SITE    = http://www.mavetju.org/download/
diff --git a/package/dhrystone/dhrystone.mk b/package/dhrystone/dhrystone.mk
index 6d3ddfa339..47c2ef2a29 100644
--- a/package/dhrystone/dhrystone.mk
+++ b/package/dhrystone/dhrystone.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dhrystone
 #
-#############################################################
+################################################################################
 
 DHRYSTONE_VERSION = 2
 DHRYSTONE_SOURCE = dhry-c
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 6d46299f2a..c6ea023823 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dialog
 #
-#############################################################
+################################################################################
 
 DIALOG_VERSION = 1.1-20111020
 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 25307630a0..1de9db44ef 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # diffutils
 #
-#############################################################
+################################################################################
 
 DIFFUTILS_VERSION = 3.2
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index bcd3c1c4f3..c39d411436 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # directfb examples
 #
-#############################################################
+################################################################################
 
 DIRECTFB_EXAMPLES_VERSION = 1.6.0
 DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index d6bbf5736b..46f1eb903a 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # directfb
 #
-#############################################################
+################################################################################
 
 DIRECTFB_VERSION_MAJOR = 1.6
 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).3
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index 006c0aa8f3..9e1c669d53 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # distcc
 #
-#############################################################
+################################################################################
 
 DISTCC_VERSION = 2.18.3
 DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2
diff --git a/package/divine/divine.mk b/package/divine/divine.mk
index adbef37a0e..322e5fcc86 100644
--- a/package/divine/divine.mk
+++ b/package/divine/divine.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # divine
 #
-#############################################################
+################################################################################
 
 # tagged version 1.6.3, tarball is missing files
 DIVINE_VERSION = 83cafc257a42b9465cd9d6185bf66b8c1b7ed704
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index fd4e976809..1d23f66cc1 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dmalloc
 #
-#############################################################
+################################################################################
 
 DMALLOC_VERSION = 5.4.3
 DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
index 5d842945f0..86a3be5e9d 100644
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dmidecode
 #
-#############################################################
+################################################################################
 
 DMIDECODE_VERSION = 2.11
 DMIDECODE_SITE    = http://download.savannah.gnu.org/releases/dmidecode/
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 66a9d70028..3c84aa43bf 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dmraid
 #
-#############################################################
+################################################################################
 
 DMRAID_VERSION = 1.0.0.rc15
 DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 04e3630c21..765de7802b 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dnsmasq
 #
-#############################################################
+################################################################################
 
 DNSMASQ_VERSION = 2.66
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 015cd366b8..9c8ded4484 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # docker
 #
-#############################################################
+################################################################################
 
 DOCKER_VERSION = 1.5
 DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
diff --git a/package/doom-wad/doom-wad.mk b/package/doom-wad/doom-wad.mk
index ae5dcef3de..b21fed81c5 100644
--- a/package/doom-wad/doom-wad.mk
+++ b/package/doom-wad/doom-wad.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # doom-wad
 #
-#############################################################
+################################################################################
 
 DOOM_WAD_VERSION = 1.8
 DOOM_WAD_SOURCE = doom-$(DOOM_WAD_VERSION).wad.gz
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 79d1c7acf1..624198cf93 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dosfstools
 #
-#############################################################
+################################################################################
 
 DOSFSTOOLS_VERSION = 3.0.16
 DOSFSTOOLS_SITE = http://fossies.org/linux/misc
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index e00890e2ad..34dd79b5f3 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dropbear
 #
-#############################################################
+################################################################################
 
 DROPBEAR_VERSION = 2013.58
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk
index 67db63aff5..de0f0a80ec 100644
--- a/package/dstat/dstat.mk
+++ b/package/dstat/dstat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dstat
 #
-#############################################################
+################################################################################
 
 DSTAT_VERSION = 0.7.2
 DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2
diff --git a/package/dtach/dtach.mk b/package/dtach/dtach.mk
index 77ad7c0272..56ab175ef6 100644
--- a/package/dtach/dtach.mk
+++ b/package/dtach/dtach.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dtach
 #
-#############################################################
+################################################################################
 
 DTACH_VERSION = 0.8
 DTACH_SITE = http://downloads.sourceforge.net/project/dtach/dtach/$(DTACH_VERSION)
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index 7dd4fe7f8d..5e8965466f 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dtc
 #
-#############################################################
+################################################################################
 
 DTC_VERSION         = e4b497f367a3b2ae99cc52089a14a221b13a76ef
 DTC_SITE            = git://git.jdl.com/software/dtc.git
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index 31a4ff8f15..1e50aa4f30 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dvb-apps
 #
-#############################################################
+################################################################################
 
 DVB_APPS_VERSION        = 83c746462ccb
 DVB_APPS_SITE           = http://linuxtv.org/hg/dvb-apps
diff --git a/package/dvbsnoop/dvbsnoop.mk b/package/dvbsnoop/dvbsnoop.mk
index dd62e8c842..0b061282b3 100644
--- a/package/dvbsnoop/dvbsnoop.mk
+++ b/package/dvbsnoop/dvbsnoop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # dvbsnoop
 #
-#############################################################
+################################################################################
 
 DVBSNOOP_VERSION        = 1.4.50
 DVBSNOOP_SITE           = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index edc3e8ef0b..790cb43e79 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # e2fsprogs
 #
-#############################################################
+################################################################################
 
 E2FSPROGS_VERSION = 1.42.7
 E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 7ccdcb4c24..0b3fba663e 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ebtables
 #
-#############################################################
+################################################################################
 
 EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
index 226c9297f5..f3f46e1687 100644
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ecryptfs-utils
 #
-##############################################################
+################################################################################
 
 ECRYPTFS_UTILS_VERSION         = 103
 ECRYPTFS_UTILS_SOURCE          = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 52ae1f0942..306e9186f5 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ed
 #
-#############################################################
+################################################################################
 
 ED_VERSION = 1.7
 ED_SITE = $(BR2_GNU_MIRROR)/ed
diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk
index 3b1b3e9bf6..950cf80c42 100644
--- a/package/eeprog/eeprog.mk
+++ b/package/eeprog/eeprog.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # eeprog
 #
-#############################################################
+################################################################################
 
 EEPROG_VERSION = 0.7.6
 EEPROG_SITE = http://www.codesink.org/download
diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
index 4b245ec9be..68c7d34fcd 100644
--- a/package/efl/expedite/expedite.mk
+++ b/package/efl/expedite/expedite.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # expedite
 #
-#############################################################
+################################################################################
 
 EXPEDITE_VERSION = 1.7.4
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index dfc5750231..0943a2083e 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libecore
 #
-#############################################################
+################################################################################
 
 LIBECORE_VERSION = 1.7.4
 LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 9c62ead8f9..0d34fc0cb2 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libedbus
 #
-#############################################################
+################################################################################
 
 LIBEDBUS_VERSION = 1.7.4
 LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index a02eaa9a79..c2f05f02c7 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libedje
 #
-#############################################################
+################################################################################
 
 LIBEDJE_VERSION = 1.7.4
 LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index db3ec6e80c..e7edd9e093 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libeet
 #
-#############################################################
+################################################################################
 
 LIBEET_VERSION = 1.7.4
 LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index d99a237cc0..ee40c14e35 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libeina
 #
-#############################################################
+################################################################################
 
 LIBEINA_VERSION = 1.7.4
 LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
diff --git a/package/efl/libeio/libeio.mk b/package/efl/libeio/libeio.mk
index f5e08de5b1..ba908ea37b 100644
--- a/package/efl/libeio/libeio.mk
+++ b/package/efl/libeio/libeio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libeio
 #
-#############################################################
+################################################################################
 
 LIBEIO_VERSION = 1.7.4
 LIBEIO_SOURCE = eio-$(LIBEIO_VERSION).tar.bz2
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index ce5c96824b..298b9f78aa 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libembryo
 #
-#############################################################
+################################################################################
 
 LIBEMBRYO_VERSION = 1.7.4
 LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
index 76236b12ca..c010348bbf 100644
--- a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
+++ b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libevas-generic-loaders
 #
-#############################################################
+################################################################################
 
 LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.4
 LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 5bdcba53e9..34a839a1db 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libevas
 #
-#############################################################
+################################################################################
 
 LIBEVAS_VERSION = 1.7.4
 LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
index d540afb0ab..1e17c5b049 100644
--- a/package/elftosb/elftosb.mk
+++ b/package/elftosb/elftosb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # elftosb
 #
-#############################################################
+################################################################################
 
 ELFTOSB_VERSION = 10.12.01
 ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index fbde905e6c..2658786604 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # elfutils
 #
-#############################################################
+################################################################################
 
 ELFUTILS_VERSION = 0.155
 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index cf1e737828..4294777647 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # empty
 #
-#############################################################
+################################################################################
 
 EMPTY_VERSION = 0.6.18b
 EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 3425c5669e..50a8a6cbe8 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # enchant
 #
-#############################################################
+################################################################################
 
 ENCHANT_VERSION = 1.5.0
 ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 5d77869ffc..1163aa565c 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # enlightenment
 #
-#############################################################
+################################################################################
 
 ENLIGHTENMENT_VERSION = 0.17.0-omega
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/releases/
diff --git a/package/enscript/enscript.mk b/package/enscript/enscript.mk
index 93e4d6da65..3b15d558ee 100644
--- a/package/enscript/enscript.mk
+++ b/package/enscript/enscript.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # enscript
 #
-#############################################################
+################################################################################
 
 ENSCRIPT_VERSION = 1.6.6
 ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript/
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 6d51376c1d..3a5752ebcf 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # erlang
 #
-#############################################################
+################################################################################
 
 ERLANG_VERSION = R15B01
 ERLANG_SITE = http://www.erlang.org/download
diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 12cc5244ee..bb2dc9fea1 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ethtool
 #
-#############################################################
+################################################################################
 
 ETHTOOL_VERSION = 3.9
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk
index ffda1bfeaf..2a875539cb 100644
--- a/package/evtest/evtest.mk
+++ b/package/evtest/evtest.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # evtest
 #
-#############################################################
+################################################################################
 
 EVTEST_VERSION = 1.30
 EVTEST_SOURCE = evtest-$(EVTEST_VERSION).tar.bz2
diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk
index de66d55ff5..a3a80f242e 100644
--- a/package/exfat-utils/exfat-utils.mk
+++ b/package/exfat-utils/exfat-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # exfat-utils
 #
-#############################################################
+################################################################################
 
 EXFAT_UTILS_VERSION = 1.0.1
 EXFAT_UTILS_SITE = http://exfat.googlecode.com/files
diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk
index bc794a02c4..3c0dece20a 100644
--- a/package/exfat/exfat.mk
+++ b/package/exfat/exfat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # exfat
 #
-#############################################################
+################################################################################
 
 EXFAT_VERSION = 1.0.1
 EXFAT_SITE = http://exfat.googlecode.com/files
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index e650723e7e..4c37ba2f23 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # expat
 #
-#############################################################
+################################################################################
 
 EXPAT_VERSION = 2.1.0
 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 2f6f793a39..de863059a4 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ezxml
 #
-#############################################################
+################################################################################
 
 EZXML_VERSION = 0.8.6
 EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz
diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk
index aa0c103590..d8186a10b3 100644
--- a/package/f2fs-tools/f2fs-tools.mk
+++ b/package/f2fs-tools/f2fs-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # f2fs-tools
 #
-#############################################################
+################################################################################
 
 F2FS_TOOLS_VERSION = fef98ebdf3a7728017cb3d0ae4ffedc5405e531d
 F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 0a36181929..e655b8f713 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fakeroot
 #
-#############################################################
+################################################################################
 
 FAKEROOT_VERSION = 1.18.2
 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
diff --git a/package/fan-ctrl/fan-ctrl.mk b/package/fan-ctrl/fan-ctrl.mk
index b7bfa795f2..5f39813c04 100644
--- a/package/fan-ctrl/fan-ctrl.mk
+++ b/package/fan-ctrl/fan-ctrl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fan-ctrl
 #
-#############################################################
+################################################################################
 
 # no release, so grab .c file directly from viewvc
 FAN_CTRL_VERSION = 1.3
diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk
index 7f1751277c..a2183e0080 100644
--- a/package/fb-test-app/fb-test-app.mk
+++ b/package/fb-test-app/fb-test-app.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fb-test-app
 #
-#############################################################
+################################################################################
 
 FB_TEST_APP_VERSION = v1.0.0
 FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index f80cb1ba19..e9828dfa78 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fbdump
 #
-#############################################################
+################################################################################
 
 FBDUMP_VERSION = 0.4.2
 FBDUMP_SOURCE = fbdump-$(FBDUMP_VERSION).tar.gz
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 920ccc876a..59284ee6da 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fbset
 #
-#############################################################
+################################################################################
 
 FBSET_VERSION = 2.1
 FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
index fcb2570dd3..6fc4d7fa76 100644
--- a/package/fbterm/fbterm.mk
+++ b/package/fbterm/fbterm.mk
@@ -1,8 +1,8 @@
-############################################
+################################################################################
 #
 # fbterm
 #
-############################################
+################################################################################
 
 FBTERM_VERSION = 1.7.0
 FBTERM_SITE = http://fbterm.googlecode.com/files/
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 2a4029e241..010e79e748 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fbv
 #
-#############################################################
+################################################################################
 
 FBV_VERSION = 1.0b
 FBV_SOURCE = fbv-$(FBV_VERSION).tar.gz
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index e6ccb32fd6..45fd2a0648 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fconfig
 #
-#############################################################
+################################################################################
 
 FCONFIG_VERSION = 20080329
 FCONFIG_SOURCE = fconfig-$(FCONFIG_VERSION).tar.gz
diff --git a/package/file/file.mk b/package/file/file.mk
index 5422e2f984..d423d56d19 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # file
 #
-#############################################################
+################################################################################
 
 FILE_VERSION = 5.14
 FILE_SITE = ftp://ftp.astron.com/pub/file
diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk
index c71529274e..ace0ca4bd8 100644
--- a/package/filemq/filemq.mk
+++ b/package/filemq/filemq.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # filemq
 #
-#############################################################
+################################################################################
 
 FILEMQ_VERSION = 8fac5140dd
 FILEMQ_SITE = git://github.com/zeromq/filemq.git
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 43aef75a24..464f28b04a 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # findutils
 #
-#############################################################
+################################################################################
 
 FINDUTILS_VERSION = 4.4.2
 FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index 60c2ae895a..0e2d7d0752 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fis
 #
-#############################################################
+################################################################################
 
 FIS_SITE = http://svn.chezphil.org/utils/trunk
 FIS_SITE_METHOD = svn
diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk
index 45d054004d..6759338a2e 100644
--- a/package/flashbench/flashbench.mk
+++ b/package/flashbench/flashbench.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # flashbench
 #
-#############################################################
+################################################################################
 
 FLASHBENCH_VERSION = 2e30b1968a66147412f21002ea844122a0d5e2f0
 FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 7689a8f9da..bca800b0a4 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # flashrom
 #
-#############################################################
+################################################################################
 
 FLASHROM_VERSION = 0.9.6.1
 FLASHROM_SOURCE  = flashrom-$(FLASHROM_VERSION).tar.bz2
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 236153674e..17f651b802 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # flex
 #
-#############################################################
+################################################################################
 
 FLEX_VERSION = 2.5.37
 FLEX_SITE = http://download.sourceforge.net/project/flex
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 697eb91d2b..08781fbd36 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fltk
 #
-#############################################################
+################################################################################
 
 FLTK_VERSION = 1.1.7
 FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.bz2
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index a0728fac1c..262cb0deae 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fluxbox
 #
-#############################################################
+################################################################################
 
 FLUXBOX_VERSION = 1.3.2
 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
diff --git a/package/fmtools/fmtools.mk b/package/fmtools/fmtools.mk
index c79ecfe6d3..407b702d20 100644
--- a/package/fmtools/fmtools.mk
+++ b/package/fmtools/fmtools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fmtools
 #
-#############################################################
+################################################################################
 
 FMTOOLS_VERSION = 1.0.2
 FMTOOLS_SITE = http://www.stanford.edu/~blp/fmtools/
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 299a86b82a..0abf86597e 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fontconfig
 #
-#############################################################
+################################################################################
 
 FONTCONFIG_VERSION = 2.6.0
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
diff --git a/package/foomatic-filters/foomatic-filters.mk b/package/foomatic-filters/foomatic-filters.mk
index 6e13486010..80daea5a53 100644
--- a/package/foomatic-filters/foomatic-filters.mk
+++ b/package/foomatic-filters/foomatic-filters.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # foomatic_filters
 #
-#############################################################
+################################################################################
 
 FOOMATIC_FILTERS_VERSION = 4.0.17
 FOOMATIC_FILTERS_SITE = http://www.openprinting.org/download/foomatic
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index 79b2a23d5b..efb6fc9e23 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # FreeRDP
 #
-#############################################################
+################################################################################
 
 FREERDP_VERSION = 1.0.1
 FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index 85f8dc29da..d9fcb89628 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # firmware-imx
 #
-#############################################################
+################################################################################
 
 FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION)
 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_MIRROR_SITE)
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 2553f6720c..9f63ce3423 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # freescale-imx
 #
-#############################################################
+################################################################################
 
 FREESCALE_IMX_VERSION = 1.1.0
 
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index f988d252a9..0338e13c19 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gpu-viv-bin-mx6q
 #
-#############################################################
+################################################################################
 
 GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)
 GPU_VIV_BIN_MX6Q_SITE    = $(FREESCALE_IMX_MIRROR_SITE)
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
index 67e8db3e0e..bd7e174d19 100644
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # imx-lib
 #
-#############################################################
+################################################################################
 
 IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
 IMX_LIB_SITE    = $(FREESCALE_IMX_MIRROR_SITE)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index b08bbf7cbb..997f9060ce 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # freetype
 #
-#############################################################
+################################################################################
 
 FREETYPE_VERSION = 2.4.11
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
diff --git a/package/fxload/fxload.mk b/package/fxload/fxload.mk
index 7df9da52ff..26feec36c7 100644
--- a/package/fxload/fxload.mk
+++ b/package/fxload/fxload.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fxload
 #
-#############################################################
+################################################################################
 
 FXLOAD_VERSION = 2008_10_13
 FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION)
diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index 356c2cbf87..2ff50ca6e6 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gadgetfs-test
 #
-#############################################################
+################################################################################
 
 GADGETFS_TEST_SOURCE=gadgetfs-test.tar.bz2
 GADGETFS_TEST_SITE=http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest/
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index 36e10d3f0c..7939992b9d 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gamin
 #
-#############################################################
+################################################################################
 
 GAMIN_VERSION = 0.1.10
 GAMIN_SOURCE = gamin-$(GAMIN_VERSION).tar.gz
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index b26430e570..3f790400a5 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gawk
 #
-#############################################################
+################################################################################
 
 GAWK_VERSION = 4.1.0
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 5f4a7534f2..fbb2fae56d 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gdb
 #
-#############################################################
+################################################################################
 
 GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
 GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk
index 6aeffe3b38..60b46c7d3a 100644
--- a/package/gdbm/gdbm.mk
+++ b/package/gdbm/gdbm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gdbm
 #
-#############################################################
+################################################################################
 
 GDBM_VERSION = 1.10
 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 5abb39d88e..49d38402a0 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gdk-pixbuf
 #
-#############################################################
+################################################################################
 
 GDK_PIXBUF_MAJOR_VERSION = 2.24
 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).1
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 45e9695ad4..b2a301b4bf 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # genext2fs
 #
-#############################################################
+################################################################################
 
 GENEXT2FS_VERSION = 1.4.1
 GENEXT2FS_SOURCE = genext2fs-$(GENEXT2FS_VERSION).tar.gz
diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
index 2c45a8dcae..e9ad52e1da 100644
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # genimage
 #
-##############################################################
+################################################################################
 
 GENIMAGE_VERSION        = 4
 GENIMAGE_SOURCE         = genimage-$(GENIMAGE_VERSION).tar.xz
diff --git a/package/genpart/genpart.mk b/package/genpart/genpart.mk
index 7757ae484a..3c26af2b29 100644
--- a/package/genpart/genpart.mk
+++ b/package/genpart/genpart.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # genpart
 #
-#############################################################
+################################################################################
 
 GENPART_VERSION       = 1.0.2
 GENPART_SOURCE        = genpart-$(GENPART_VERSION).tar.bz2
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 3f5d44e2f9..119d6600a6 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # genromfs
 #
-#############################################################
+################################################################################
 
 GENROMFS_VERSION=0.5.2
 GENROMFS_SOURCE=genromfs-$(GENROMFS_VERSION).tar.gz
diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk
index 22035a8e0f..2a09927e2a 100644
--- a/package/gesftpserver/gesftpserver.mk
+++ b/package/gesftpserver/gesftpserver.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gesftpserver
 #
-#############################################################
+################################################################################
 
 GESFTPSERVER_VERSION = 0.1
 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 90619287b7..1c2a6ece58 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gettext
 #
-#############################################################
+################################################################################
 
 GETTEXT_VERSION = 0.18.2.1
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 5a901704b8..69100c0dce 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # giblib
 #
-#############################################################
+################################################################################
 
 GIBLIB_VERSION = 1.2.4
 GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz
diff --git a/package/git/git.mk b/package/git/git.mk
index 7e2f114be0..b8a762337f 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # git
 #
-#############################################################
+################################################################################
 
 GIT_VERSION         = 1.8.3
 GIT_SITE            = http://git-core.googlecode.com/files/
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 4812fd6c54..12eb344130 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # glib-networking
 #
-#############################################################
+################################################################################
 
 GLIB_NETWORKING_MAJOR_VERSION = 2.30
 GLIB_NETWORKING_MINOR_VERSION = 2
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index abd8b6cebd..a1bd8b52aa 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Glibmm
 #
-#############################################################
+################################################################################
 
 GLIBMM_VERSION_MAJOR = 2.30
 GLIBMM_VERSION_MINOR = 1
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index cf5c310a2a..439ad4dfec 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gmp
 #
-#############################################################
+################################################################################
 
 GMP_VERSION = 5.1.2
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 81e9f1ffc3..cf7deb6223 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gmpc
 #
-#############################################################
+################################################################################
 
 GMPC_VERSION = 11.8.16
 GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
index 90d2274a64..9d7dd79bef 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/gnuchess/gnuchess.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gnuchess
 #
-#############################################################
+################################################################################
 
 GNUCHESS_VERSION = 5.07
 GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index 7c25ad1c03..39088c3c8c 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gnupg
 #
-#############################################################
+################################################################################
 
 GNUPG_VERSION = 1.4.13
 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index 25ba90d8b5..d5fe01c8e2 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gnuplot
 #
-#############################################################
+################################################################################
 
 GNUPLOT_VERSION = 4.6.2
 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 5d07ff9612..ba38239c62 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gnutls
 #
-#############################################################
+################################################################################
 
 GNUTLS_VERSION = 3.2.1
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk
index c52f26c74d..9f6cc3ed58 100644
--- a/package/gob2/gob2.mk
+++ b/package/gob2/gob2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gob2
 #
-#############################################################
+################################################################################
 
 GOB2_VERSION = 2.0.18
 GOB2_SITE = http://ftp.5z.com/pub/gob
diff --git a/package/googlefontdirectory/googlefontdirectory.mk b/package/googlefontdirectory/googlefontdirectory.mk
index ddc832afee..65ad29fda7 100644
--- a/package/googlefontdirectory/googlefontdirectory.mk
+++ b/package/googlefontdirectory/googlefontdirectory.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # googlefontdirectory
 #
-#############################################################
+################################################################################
 
 GOOGLEFONTDIRECTORY_SITE = \
 	https://s3.amazonaws.com/joemaller_google_webfonts
diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index 59c5a0926f..8ce3c95ffb 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gperf
 #
-#############################################################
+################################################################################
 
 GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 384726db98..33aff5e238 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gpsd
 #
-#############################################################
+################################################################################
 
 GPSD_VERSION = 3.9
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd/
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 15ec842de6..7fad9838a2 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gptfdisk
 #
-#############################################################
+################################################################################
 
 GPTFDISK_VERSION = 0.8.6
 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 178f4ad2a5..c5131a4921 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gqview
 #
-#############################################################
+################################################################################
 
 GQVIEW_VERSION = 2.1.5
 GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk
index 10adfd9298..edaab2bc37 100644
--- a/package/grantlee/grantlee.mk
+++ b/package/grantlee/grantlee.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # grantlee
 #
-#############################################################
+################################################################################
 
 GRANTLEE_VERSION = 0.2.0
 GRANTLEE_SITE = http://downloads.grantlee.org
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 2636c83b78..2d815fea63 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # grep
 #
-#############################################################
+################################################################################
 
 GREP_VERSION = 2.14
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index a63753d1f9..68b9948cc2 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gsl
 #
-#############################################################
+################################################################################
 
 GSL_VERSION = 1.15
 GSL_SOURCE = gsl-$(GSL_VERSION).tar.gz
diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 6ede13776c..63a2360974 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # googletest
 #
-#############################################################
+################################################################################
 
 GTEST_VERSION = 1.6.0
 GTEST_SOURCE = gtest-$(GTEST_VERSION).zip
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index a7e2a3f307..ad48ddd42b 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gtk2-engines.0
 #
-#############################################################
+################################################################################
 
 GTK2_ENGINES_VERSION = 2.20.2
 GTK2_ENGINES_SOURCE  = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index fd55a376dd..a250d57e52 100644
--- a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # GTK Theme - Hicolour
 #
-#############################################################
+################################################################################
 
 GTK2_THEME_HICOLOR_VERSION = 0.10
 GTK2_THEME_HICOLOR_SOURCE = hicolor-icon-theme-$(GTK2_THEME_HICOLOR_VERSION).tar.gz
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index ac18f7bb41..a69fc7614a 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # GtkPerf
 #
-#############################################################
+################################################################################
 
 GTKPERF_VERSION = 0.40
 GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 84f5a6da5a..c9ac0467ea 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gutenprint
 #
-#############################################################
+################################################################################
 
 GUTENPRINT_VERSION = 5.2.9
 GUTENPRINT_SITE = http://downloads.sourceforge.net/gimp-print/gutenprint-5.2/$(GUTENPRINT_VERSION)
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 14f3104666..32d8b49f64 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gvfs
 #
-#############################################################
+################################################################################
 
 GVFS_VERSION_MAJOR = 1.8
 GVFS_VERSION_MINOR = 2
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 821f69409d..5ece73a29b 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gzip
 #
-#############################################################
+################################################################################
 
 GZIP_VERSION = 1.5
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index 762791719d..767ce24f30 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # haserl
 #
-#############################################################
+################################################################################
 
 HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel/$(HASERL_VERSION)
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index f70d2329ff..fc053ae57b 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # hdparm
 #
-#############################################################
+################################################################################
 
 HDPARM_VERSION = 9.43
 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
index f3779afdee..a4d94b6f71 100644
--- a/package/heirloom-mailx/heirloom-mailx.mk
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # heirloom-mailx
 #
-#############################################################
+################################################################################
 
 HEIRLOOM_MAILX_VERSION = 12.5
 HEIRLOOM_MAILX_SOURCE  = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index e00ad5aec2..4d31df54cf 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -1,8 +1,8 @@
-##############################################################
+################################################################################
 #
 # hostapd
 #
-#############################################################
+################################################################################
 
 HOSTAPD_VERSION = 2.0
 HOSTAPD_SITE = http://hostap.epitest.fi/releases
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index 6944f509dd..b3b798d88c 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # hplip
 #
-#############################################################
+################################################################################
 
 HPLIP_VERSION = 3.13.3
 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index fd78662bcf..fe9b302c92 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # htop
 #
-#############################################################
+################################################################################
 
 HTOP_VERSION = 1.0.2
 HTOP_SITE = http://downloads.sourceforge.net/project/htop/htop/$(HTOP_VERSION)
diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 8f7cb97ec6..12e2582073 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # httping
 #
-#############################################################
+################################################################################
 
 HTTPING_VERSION = 2.2.1
 HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk
index 517ca5ff5f..bcac8c9042 100644
--- a/package/hwdata/hwdata.mk
+++ b/package/hwdata/hwdata.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # hwdata
 #
-#############################################################
+################################################################################
 
 HWDATA_VERSION = 0.230
 HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 3e1d9eed60..1589d04d63 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # i2c-tools
 #
-#############################################################
+################################################################################
 
 I2C_TOOLS_VERSION = 3.1.0
 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.bz2
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 7658589e4e..00eacc7544 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # International Components for Unicode
 #
-#############################################################
+################################################################################
 
 ICU_VERSION = 4.8.1.1
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index d031a97512..ee5bd25ebe 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ifplugd
 #
-#############################################################
+################################################################################
 
 IFPLUGD_VERSION = 0.28
 IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
diff --git a/package/iftop/iftop.mk b/package/iftop/iftop.mk
index f6f2af27e2..de2f1b1856 100644
--- a/package/iftop/iftop.mk
+++ b/package/iftop/iftop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iftop
 #
-#############################################################
+################################################################################
 
 IFTOP_VERSION = 1.0pre2
 IFTOP_SITE = http://www.ex-parrot.com/pdw/iftop/download/
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index def7a5dd4b..e2259e6a01 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # imagemagick
 #
-#############################################################
+################################################################################
 
 IMAGEMAGICK_MAJOR = 6.7.8
 IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index e69503bad9..5b9d6b034e 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # imlib2
 #
-##############################################################
+################################################################################
 
 IMLIB2_VERSION = 1.4.5
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index ea25e01bab..221a3d1e09 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # inadyn
 #
-#############################################################
+################################################################################
 
 INADYN_VERSION = 1.98.1
 INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.bz2
diff --git a/package/infozip/infozip.mk b/package/infozip/infozip.mk
index 2b8052e801..d73edd40c5 100644
--- a/package/infozip/infozip.mk
+++ b/package/infozip/infozip.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # infozip
 #
-#############################################################
+################################################################################
 
 INFOZIP_VERSION = 30
 INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index a5668a3d4e..9d10b941c3 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # inotify-utils
 #
-#############################################################
+################################################################################
 
 INOTIFY_TOOLS_VERSION = 3.14
 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index fdff557cc3..762d3c2b5c 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # input-event-daemon
 #
-#############################################################
+################################################################################
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
 INPUT_EVENT_DAEMON_SITE = http://github.com/gandro/input-event-daemon/tarball/$(INPUT_EVENT_DAEMON_VERSION)
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 6f15da60e9..503f16abcb 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # input-tools
 #
-#############################################################
+################################################################################
 
 INPUT_TOOLS_VERSION = 20051019
 INPUT_TOOLS_SOURCE  = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 0bed3155d4..f3c1e67304 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # intltool
 #
-#############################################################
+################################################################################
 
 INTLTOOL_VERSION = 0.50.2
 INTLTOOL_SOURCE = intltool-$(INTLTOOL_VERSION).tar.gz
diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk
index 8d17af55b8..3297b3e172 100644
--- a/package/iostat/iostat.mk
+++ b/package/iostat/iostat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iostat
 #
-#############################################################
+################################################################################
 
 IOSTAT_VERSION = 2.2
 IOSTAT_SITE = http://www.linuxinsight.com/files
diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk
index a07571b85e..eb0a6d89d2 100644
--- a/package/iozone/iozone.mk
+++ b/package/iozone/iozone.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iozone
 #
-#############################################################
+################################################################################
 
 IOZONE_VERSION = 3_414
 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 7cd4c631d5..7fa7d3ebe0 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iperf
 #
-#############################################################
+################################################################################
 
 IPERF_VERSION = 2.0.5
 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
index c63f03f544..9572d54a3a 100644
--- a/package/ipkg/ipkg.mk
+++ b/package/ipkg/ipkg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ipkg
 #
-#############################################################
+################################################################################
 
 IPKG_VERSION = 0.99.163
 IPKG_SOURCE = ipkg-$(IPKG_VERSION).tar.gz
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index a83133b31b..cbbbc56998 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iproute2
 #
-#############################################################
+################################################################################
 
 IPROUTE2_VERSION = 3.7.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index ba9241034c..1458909f70 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ipsec-tools
 #
-#############################################################
+################################################################################
 
 IPSEC_TOOLS_VERSION = 0.8.0
 IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index daadc9eb94..c411a6e91f 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ipset
 #
-#############################################################
+################################################################################
 
 IPSET_VERSION = 6.19
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 5a21412c8a..cfb227ad91 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iptables
 #
-#############################################################
+################################################################################
 
 IPTABLES_VERSION = 1.4.19.1
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index 34612c2c27..333aa58a68 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # irda-utils
 #
-#############################################################
+################################################################################
 
 IRDA_UTILS_VERSION = 0.9.18
 IRDA_UTILS_SOURCE = irda-utils-$(IRDA_UTILS_VERSION).tar.gz
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 6078632ac5..c8d9561615 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # iw
 #
-#############################################################
+################################################################################
 
 IW_VERSION = 3.10
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk
index 9564fc0dce..49e8571686 100644
--- a/package/jansson/jansson.mk
+++ b/package/jansson/jansson.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # jansson
 #
-#############################################################
+################################################################################
 
 JANSSON_VERSION = 2.4
 JANSSON_SITE = http://www.digip.org/jansson/releases
diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk
index e9843ae3b6..27ac5f383f 100644
--- a/package/jhead/jhead.mk
+++ b/package/jhead/jhead.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # jhead
 #
-#############################################################
+################################################################################
 
 JHEAD_VERSION = 2.97
 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead
diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk
index 19a0292041..c19959c1ce 100644
--- a/package/jpeg-turbo/jpeg-turbo.mk
+++ b/package/jpeg-turbo/jpeg-turbo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # jpeg-turbo
 #
-#############################################################
+################################################################################
 
 JPEG_TURBO_VERSION = 1.2.1
 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 207edc8dd0..caea98c1b6 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # virtual jpeg package
 #
-#############################################################
+################################################################################
 
 JPEG_SOURCE =
 
diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
index 22d1a00980..769fdba846 100644
--- a/package/jquery-keyboard/jquery-keyboard.mk
+++ b/package/jquery-keyboard/jquery-keyboard.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # jquery-keyboard
 #
-#############################################################
+################################################################################
 
 JQUERY_KEYBOARD_VERSION = 1.17.4
 JQUERY_KEYBOARD_SITE = \
diff --git a/package/jquery-ui-themes/jquery-ui-themes.mk b/package/jquery-ui-themes/jquery-ui-themes.mk
index c410b64568..44fb7f7653 100644
--- a/package/jquery-ui-themes/jquery-ui-themes.mk
+++ b/package/jquery-ui-themes/jquery-ui-themes.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # jquery-ui-themes
 #
-#############################################################
+################################################################################
 
 JQUERY_UI_THEMES_VERSION = 1.10.3
 JQUERY_UI_THEMES_SITE = http://jqueryui.com/resources/download
diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk
index 9375ec260d..ece86086f9 100644
--- a/package/jquery-ui/jquery-ui.mk
+++ b/package/jquery-ui/jquery-ui.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # jquery-ui
 #
-#############################################################
+################################################################################
 
 JQUERY_UI_VERSION = 1.10.3
 JQUERY_UI_SITE = http://jqueryui.com/resources/download
diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk
index 4e3f987bc3..24cc9ab39b 100644
--- a/package/json-glib/json-glib.mk
+++ b/package/json-glib/json-glib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # json-glib
 #
-#############################################################
+################################################################################
 
 JSON_GLIB_MAJOR_VERSION = 0.14
 JSON_GLIB_MINOR_VERSION = 2
diff --git a/package/json-javascript/json-javascript.mk b/package/json-javascript/json-javascript.mk
index a700e07d68..b40d61b39d 100644
--- a/package/json-javascript/json-javascript.mk
+++ b/package/json-javascript/json-javascript.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # json-javascript
 #
-#############################################################
+################################################################################
 
 JSON_JAVASCRIPT_VERSION = 42c18c621a411c3f39a81bb0a387fc50dcd738d9
 JSON_JAVASCRIPT_SITE = git://github.com/douglascrockford/JSON-js.git
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index 08cb077603..2969f88eb3 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # kbd
 #
-#############################################################
+################################################################################
 
 KBD_VERSION = 1.15.2
 KBD_SOURCE = kbd-$(KBD_VERSION).tar.gz
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index 6510b172dc..6ddf435102 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # kexec
 #
-#############################################################
+################################################################################
 
 KEXEC_VERSION = 2.0.4
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
index 184b58d02b..7097529c3b 100644
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # keyutils
 #
-##############################################################
+################################################################################
 
 KEYUTILS_VERSION         = 1.5.5
 KEYUTILS_SOURCE          = keyutils-$(KEYUTILS_VERSION).tar.bz2
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 1fb3f5a29e..ceb9fcd28e 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # kismet
 #
-#############################################################
+################################################################################
 
 KISMET_VERSION = 2013-03-R1b
 KISMET_SITE = http://www.kismetwireless.net/code
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 2fe99427a6..6cd2a20a34 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # kmod
 #
-#############################################################
+################################################################################
 
 KMOD_VERSION = 13
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
diff --git a/package/latencytop/latencytop.mk b/package/latencytop/latencytop.mk
index 84e75db253..a19f48a1d6 100644
--- a/package/latencytop/latencytop.mk
+++ b/package/latencytop/latencytop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # latencytop
 #
-#############################################################
+################################################################################
 
 LATENCYTOP_VERSION = 0.5
 LATENCYTOP_SITE = http://www.latencytop.org/download/
diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk
index 344225b061..1b7ea43381 100644
--- a/package/lcdapi/lcdapi.mk
+++ b/package/lcdapi/lcdapi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lcdapi
 #
-#############################################################
+################################################################################
 
 LCDAPI_VERSION = v0.4
 LCDAPI_SITE = http://github.com/spdawson/lcdapi/tarball/$(LCDAPI_VERSION)
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 95c6fe57db..8fab97943c 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lcdproc
 #
-#############################################################
+################################################################################
 
 LCDPROC_VERSION = 0.5.6
 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk
index 0d222c0105..c997ac3e98 100644
--- a/package/lcms2/lcms2.mk
+++ b/package/lcms2/lcms2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lcms2
 #
-#############################################################
+################################################################################
 
 LCMS2_VERSION = 2.4
 LCMS2_SITE = http://downloads.sourceforge.net/lcms/lcms
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index e37f6c895e..a34a2d7fa9 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # leafpad
 #
-#############################################################
+################################################################################
 
 LEAFPAD_VERSION = 0.8.18
 LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
diff --git a/package/less/less.mk b/package/less/less.mk
index f8117332a0..4f92213ece 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # less
 #
-#############################################################
+################################################################################
 
 LESS_VERSION = 458
 LESS_SITE = http://www.greenwoodsoftware.com/less
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 243c9759e1..a046157b02 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libaio
 #
-#############################################################
+################################################################################
 
 LIBAIO_VERSION = 0.3.109
 LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index d0234d5b26..8e9ee35915 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libao
 #
-#############################################################
+################################################################################
 
 LIBAO_VERSION = 1.1.0
 LIBAO_SITE = http://downloads.xiph.org/releases/ao
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 98dd486340..1b25013efa 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libarchive
 #
-#############################################################
+################################################################################
 
 LIBARCHIVE_VERSION = 3.0.4
 LIBARCHIVE_SITE = http://github.com/downloads/libarchive/libarchive
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index 900a8b506e..da94824135 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libargtable2
 #
-#############################################################
+################################################################################
 
 LIBARGTABLE2_VERSION = 13
 LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
diff --git a/package/libart/libart.mk b/package/libart/libart.mk
index 822dbf1b53..53dfe5a95a 100644
--- a/package/libart/libart.mk
+++ b/package/libart/libart.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libart
 #
-#############################################################
+################################################################################
 
 LIBART_VERSION = 2.3.21
 LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz
diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
index a7c4e5db96..fbfad1cdb1 100644
--- a/package/libatasmart/libatasmart.mk
+++ b/package/libatasmart/libatasmart.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libatasmart
 #
-#############################################################
+################################################################################
 
 LIBATASMART_VERSION = 0.19
 LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index 3216ddc44b..d3e4f6694a 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # atomic_ops library
 #
-#############################################################
+################################################################################
 
 LIBATOMIC_OPS_VERSION = 7.2
 LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
index 2466b01275..dc4d88ffa1 100644
--- a/package/libbsd/libbsd.mk
+++ b/package/libbsd/libbsd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libbsd
 #
-#############################################################
+################################################################################
 
 LIBBSD_VERSION         = 0.4.2
 LIBBSD_SOURCE          = libbsd-$(LIBBSD_VERSION).tar.gz
diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index 7a1650cf26..d1c4462fd0 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcap-ng
 #
-#############################################################
+################################################################################
 
 LIBCAP_NG_VERSION = 0.6.6
 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng/
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 15a2cfbc7c..16afaef24a 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcap
 #
-#############################################################
+################################################################################
 
 LIBCAP_VERSION = 2.22
 # Until kernel.org is completely back up use debian mirror
diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index 92efabcfd1..151bb8cc66 100644
--- a/package/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcdaudio
 #
-#############################################################
+################################################################################
 
 LIBCDAUDIO_VERSION = 0.99.12p2
 LIBCDAUDIO_SOURCE = libcdaudio-$(LIBCDAUDIO_VERSION).tar.gz
diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk
index 286a8cd3bd..f027d31db3 100644
--- a/package/libcgi/libcgi.mk
+++ b/package/libcgi/libcgi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcgi
 #
-#############################################################
+################################################################################
 
 LIBCGI_VERSION = 1.0
 LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION)
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index ec8b6ee5aa..4d8ae37ac3 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcgicc
 #
-#############################################################
+################################################################################
 
 LIBCGICC_VERSION=3.2.9
 LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc
diff --git a/package/libcofi/libcofi.mk b/package/libcofi/libcofi.mk
index e2ce702479..6e9c564622 100644
--- a/package/libcofi/libcofi.mk
+++ b/package/libcofi/libcofi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcofi
 #
-#############################################################
+################################################################################
 
 LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
 LIBCOFI_SITE = http://github.com/simonjhall/copies-and-fills/tarball/master
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 6d0abbb1dd..7a80df3f1f 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libconfig
 #
-#############################################################
+################################################################################
 
 LIBCONFIG_VERSION = 1.4.9
 LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig/
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
index 5b64eb1e3c..66cabd30a7 100644
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libconfuse
 #
-#############################################################
+################################################################################
 
 LIBCONFUSE_VERSION = 2.7
 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index f0236d97fa..56f13ba821 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libcurl
 #
-#############################################################
+################################################################################
 
 LIBCURL_VERSION = 7.28.1
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 419692a36a..a45be4bcd1 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libdaemon
 #
-#############################################################
+################################################################################
 
 LIBDAEMON_VERSION = 0.14
 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon
diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk
index 7cea168ddb..a1e0c5b4ca 100644
--- a/package/libdmtx/libdmtx.mk
+++ b/package/libdmtx/libdmtx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libdmtx
 #
-#############################################################
+################################################################################
 
 LIBDMTX_VERSION = 0.7.4
 LIBDMTX_SOURCE = libdmtx-$(LIBDMTX_VERSION).tar.gz
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 03955a7842..78f0ae01fa 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libdnet
 #
-#############################################################
+################################################################################
 
 LIBDNET_VERSION = 1.11
 LIBDNET_SOURCE = libdnet-$(LIBDNET_VERSION).tar.gz
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 380bc1d222..d3d2b2d7ab 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libdrm
 #
-#############################################################
+################################################################################
 
 LIBDRM_VERSION = 2.4.38
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index e975313ca2..9a29d6d6c4 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libdvdnav
 #
-#############################################################
+################################################################################
 
 LIBDVDNAV_VERSION = 4.1.3
 LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
index 29c3472de9..f7c59af73c 100644
--- a/package/libdvdread/libdvdread.mk
+++ b/package/libdvdread/libdvdread.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libdvdread
 #
-#############################################################
+################################################################################
 
 LIBDVDREAD_VERSION = 4.1.3
 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index c500da7d8a..4be2f05a98 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libexosip2
 #
-#############################################################
+################################################################################
 
 LIBEXOSIP2_VERSION = 3.6.0
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk
index 0a04635e1e..9aeab77e8c 100644
--- a/package/libebml/libebml.mk
+++ b/package/libebml/libebml.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libebml
 #
-#############################################################
+################################################################################
 
 LIBEBML_VERSION = 1.2.2
 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.bz2
diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
index 575ca49408..c344b73a57 100644
--- a/package/libedit/libedit.mk
+++ b/package/libedit/libedit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libedit
 #
-#############################################################
+################################################################################
 
 # Note: libedit does not have a regular homepage, and it seems
 # there is no place where to download a tarball from. That's
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index c11045a4dd..725035f476 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libelf
 #
-#############################################################
+################################################################################
 
 LIBELF_VERSION=0.8.12
 LIBELF_SOURCE=libelf-$(LIBELF_VERSION).tar.gz
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index 5464b66a74..408fd70d02 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liberation
 #
-#############################################################
+################################################################################
 
 LIBERATION_VERSION = 1.06.0.20100721
 LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts
diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index 3e62e9e9d5..f3f56118c5 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libesmtp
 #
-#############################################################
+################################################################################
 
 LIBESMTP_VERSION = 1.0.6
 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index e1063bd2eb..0056501363 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libev
 #
-#############################################################
+################################################################################
 
 LIBEV_VERSION = 4.11
 LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 6b31b20ca6..94882b5494 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libevent
 #
-#############################################################
+################################################################################
 
 LIBEVENT_VERSION = 2.0.14
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index 1c515642dc..a1d4475021 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libexif
 #
-#############################################################
+################################################################################
 
 LIBEXIF_VERSION = 0.6.21
 LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk
index 0568d45e0d..ced850c153 100644
--- a/package/libfcgi/libfcgi.mk
+++ b/package/libfcgi/libfcgi.mk
@@ -1,8 +1,8 @@
-##############################################################################
+################################################################################
 #
 # libfcgi
 #
-##############################################################################
+################################################################################
 
 LIBFCGI_VERSION = 2.4.0
 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 791c464ffd..51cbbce8cd 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libffi
 #
-#############################################################
+################################################################################
 
 LIBFFI_VERSION = 3.0.13
 LIBFFI_SITE    = ftp://sourceware.org/pub/libffi/
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 4e0514b332..859b5e37d5 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libfreefare
 #
-#############################################################
+################################################################################
 
 LIBFREEFARE_VERSION = 0.3.4
 LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk
index 45568ca493..99005c2d8e 100644
--- a/package/libfribidi/libfribidi.mk
+++ b/package/libfribidi/libfribidi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libfribidi
 #
-#############################################################
+################################################################################
 
 LIBFRIBIDI_VERSION = 0.19.5
 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
index 0ff0bc196f..c18332aad7 100644
--- a/package/libfslcodec/libfslcodec.mk
+++ b/package/libfslcodec/libfslcodec.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libfslcodec
 #
-#############################################################
+################################################################################
 
 LIBFSLCODEC_VERSION = 3.0.1
 # No official download site from freescale, just this mirror
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
index de8383236e..3e27a6a6e4 100644
--- a/package/libfslparser/libfslparser.mk
+++ b/package/libfslparser/libfslparser.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libfslparser
 #
-#############################################################
+################################################################################
 
 LIBFSLPARSER_VERSION = 3.0.1
 # No official download site from freescale, just this mirror
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
index d49cae43df..1bc7129197 100644
--- a/package/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/libfslvpuwrap/libfslvpuwrap.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libfslvpuwrap
 #
-#############################################################
+################################################################################
 
 LIBFSLVPUWRAP_VERSION = 1.0.17
 # No official download site from freescale, just this mirror
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index 3c4dcbc07e..3cf11a2570 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libftdi
 #
-#############################################################
+################################################################################
 
 LIBFTDI_VERSION = 0.19
 LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index ccd49fedb9..d422504f19 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libfuse
 #
-#############################################################
+################################################################################
 
 LIBFUSE_VERSION = 2.9.2
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
index 8db2476bfb..4142c7fd5b 100644
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libgail
 #
-#############################################################
+################################################################################
 
 LIBGAIL_VERSION_MAJOR = 1.22
 LIBGAIL_VERSION_MINOR = 3
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index 6a3bc7c087..f8c0860037 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libgcrypt
 #
-#############################################################
+################################################################################
 
 LIBGCRYPT_VERSION = 1.5.2
 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
index 115256f600..bd953ef170 100644
--- a/package/libgeotiff/libgeotiff.mk
+++ b/package/libgeotiff/libgeotiff.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libgeotiff
 #
-#############################################################
+################################################################################
 
 LIBGEOTIFF_VERSION = 1.3.0
 LIBGEOTIFF_SOURCE = libgeotiff-$(LIBGEOTIFF_VERSION).tar.gz
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index 3197d44052..343ecc4d46 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libglade
 #
-#############################################################
+################################################################################
 
 LIBGLADE_VERSION = 2.6.4
 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 2c16f6a656..c7ffdce25e 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libglib2
 #
-#############################################################
+################################################################################
 
 LIBGLIB2_VERSION_MAJOR = 2.30
 LIBGLIB2_VERSION_MINOR = 3
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 4114310d59..04874a7dc1 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libgpg-error
 #
-#############################################################
+################################################################################
 
 LIBGPG_ERROR_VERSION = 1.10
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk
index 8f9a510571..ea634bc325 100644
--- a/package/libgsasl/libgsasl.mk
+++ b/package/libgsasl/libgsasl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libgsasl
 #
-#############################################################
+################################################################################
 
 LIBGSASL_VERSION = 1.8.0
 LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index ceafc50bad..81929587fb 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libgtk2.0
 #
-#############################################################
+################################################################################
 
 LIBGTK2_VERSION_MAJOR = 2.24
 LIBGTK2_VERSION_MINOR = 10
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 484cdcc5b9..530ef50f1e 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libhid
 #
-#############################################################
+################################################################################
 
 LIBHID_VERSION = 0.2.16
 LIBHID_SOURCE = libhid-$(LIBHID_VERSION).tar.gz
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index e95a702047..dd2fff7abf 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libical
 #
-#############################################################
+################################################################################
 
 LIBICAL_VERSION = 0.48
 LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index 6f634693e7..d6a1d6f498 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libiconv
 #
-#############################################################
+################################################################################
 
 LIBICONV_VERSION = 1.14
 LIBICONV_SOURCE = libiconv-$(LIBICONV_VERSION).tar.gz
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index fff8d8bd37..e67a46ebc8 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libid3tag
 #
-#############################################################
+################################################################################
 
 LIBID3TAG_VERSION = 0.15.1b
 LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VERSION).tar.gz
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 39f3973089..70cdcd0777 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libidn
 #
-#############################################################
+################################################################################
 
 LIBIDN_VERSION = 1.26
 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index 0592762819..f2d5b4c8c4 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libiqrf
 #
-#############################################################
+################################################################################
 
 LIBIQRF_VERSION = v0.1.0
 LIBIQRF_SITE = http://github.com/nandra/libiqrf/tarball/$(LIBIQRF_VERSION)
diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
index bfebd7e2d6..11b92ca2d1 100644
--- a/package/libiscsi/libiscsi.mk
+++ b/package/libiscsi/libiscsi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libiscsi
 #
-#############################################################
+################################################################################
 
 LIBISCSI_VERSION         = 1.6.0
 LIBISCSI_SOURCE          = libiscsi-$(LIBISCSI_VERSION).tar.gz
diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk
index cee3408baf..b0b02add3c 100644
--- a/package/libjpeg/libjpeg.mk
+++ b/package/libjpeg/libjpeg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libjpeg
 #
-#############################################################
+################################################################################
 
 LIBJPEG_VERSION = 8d
 LIBJPEG_SITE = http://www.ijg.org/files/
diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
index 9b1aca3bf7..73324ae375 100644
--- a/package/libjson/libjson.mk
+++ b/package/libjson/libjson.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libjson
 #
-#############################################################
+################################################################################
 
 LIBJSON_VERSION = 7.6.1
 LIBJSON_SITE = http://downloads.sourceforge.net/project/libjson
diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk
index 584867fa55..dcf72ff19c 100644
--- a/package/liblo/liblo.mk
+++ b/package/liblo/liblo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liblo
 #
-#############################################################
+################################################################################
 
 LIBLO_VERSION = 0.26
 LIBLO_SOURCE = liblo-$(LIBLO_VERSION).tar.gz
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 568d010d87..6e07704df3 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liblockfile
 #
-#############################################################
+################################################################################
 
 LIBLOCKFILE_VERSION = 1.08
 LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index e879b4cd7c..0b5bac2c30 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liblog4c
 #
-#############################################################
+################################################################################
 
 LIBLOG4C_LOCALTIME_VERSION = 1.0
 LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 09f3cdb764..56747490f7 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmad
 #
-#############################################################
+################################################################################
 
 LIBMAD_VERSION = 0.15.1b
 LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
diff --git a/package/libmatroska/libmatroska.mk b/package/libmatroska/libmatroska.mk
index 605a2fb03a..2833ea7aa7 100644
--- a/package/libmatroska/libmatroska.mk
+++ b/package/libmatroska/libmatroska.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmatroska
 #
-#############################################################
+################################################################################
 
 LIBMATROSKA_VERSION = 1.3.0
 LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
index b3cae97e8e..e1b02e001c 100644
--- a/package/libmbus/libmbus.mk
+++ b/package/libmbus/libmbus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmbus
 #
-#############################################################
+################################################################################
 
 LIBMBUS_VERSION = 0.8.0
 LIBMBUS_SITE = http://www.freescada.com/public-dist
diff --git a/package/libmcrypt/libmcrypt.mk b/package/libmcrypt/libmcrypt.mk
index b67b1c7750..1a2645bc14 100644
--- a/package/libmcrypt/libmcrypt.mk
+++ b/package/libmcrypt/libmcrypt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmcrypt
 #
-#############################################################
+################################################################################
 
 LIBMCRYPT_VERSION = 2.5.8
 LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION)
diff --git a/package/libmhash/libmhash.mk b/package/libmhash/libmhash.mk
index aa05f93dfa..f7b8e72997 100644
--- a/package/libmhash/libmhash.mk
+++ b/package/libmhash/libmhash.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmhash
 #
-#############################################################
+################################################################################
 
 LIBMHASH_VERSION = 0.9.9.9
 LIBMHASH_SITE = http://downloads.sourceforge.net/project/mhash/mhash/$(LIBMHASH_VERSION)
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index 2fb79c5e3c..697cbf50a0 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmicrohttpd
 #
-#############################################################
+################################################################################
 
 LIBMICROHTTPD_VERSION = 0.9.27
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index ffa695e539..37447be37a 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmms
 #
-#############################################################
+################################################################################
 
 LIBMMS_VERSION = 0.6.2
 LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 1f71347c66..c60c60c1db 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmnl
 #
-#############################################################
+################################################################################
 
 LIBMNL_VERSION = 1.0.3
 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index a2d719a51d..8f93c2bcd3 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmodbus
 #
-#############################################################
+################################################################################
 
 LIBMODBUS_VERSION = 3.0.3
 LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
diff --git a/package/libmpd/libmpd.mk b/package/libmpd/libmpd.mk
index 9b4a1edad7..b78a36f0fa 100644
--- a/package/libmpd/libmpd.mk
+++ b/package/libmpd/libmpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmpd
 #
-#############################################################
+################################################################################
 
 LIBMPD_VERSION = 11.8.17
 LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/11.8.16
diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
index 32a3d06096..e8d7192c9e 100644
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libmpeg2
 #
-#############################################################
+################################################################################
 
 LIBMPEG2_VERSION = 0.5.1
 LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz
diff --git a/package/libnetfilter_acct/libnetfilter-acct.mk b/package/libnetfilter_acct/libnetfilter-acct.mk
index f08fc44735..c89c5edf33 100644
--- a/package/libnetfilter_acct/libnetfilter-acct.mk
+++ b/package/libnetfilter_acct/libnetfilter-acct.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnetfilter-acct
 #
-#############################################################
+################################################################################
 
 LIBNETFILTER_ACCT_VERSION = 1.0.2
 LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index 989a34e19a..41b064002f 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnetfilter-conntrack
 #
-#############################################################
+################################################################################
 
 LIBNETFILTER_CONNTRACK_VERSION = 1.0.3
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
index 1414156662..11f7e694de 100644
--- a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
+++ b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnetfilter-cthelper
 #
-#############################################################
+################################################################################
 
 LIBNETFILTER_CTHELPER_VERSION = 1.0.0
 LIBNETFILTER_CTHELPER_SOURCE = libnetfilter_cthelper-$(LIBNETFILTER_CTHELPER_VERSION).tar.bz2
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index ff155eb812..d751c3b392 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnetfilter-cttimeout
 #
-#############################################################
+################################################################################
 
 LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0
 LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2
diff --git a/package/libnetfilter_log/libnetfilter-log.mk b/package/libnetfilter_log/libnetfilter-log.mk
index 0d98e128a0..74a32d7aeb 100644
--- a/package/libnetfilter_log/libnetfilter-log.mk
+++ b/package/libnetfilter_log/libnetfilter-log.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnetfilter-log
 #
-#############################################################
+################################################################################
 
 LIBNETFILTER_LOG_VERSION = 1.0.1
 LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2
diff --git a/package/libnetfilter_queue/libnetfilter-queue.mk b/package/libnetfilter_queue/libnetfilter-queue.mk
index 8f9ad5cb92..7cd2bb7973 100644
--- a/package/libnetfilter_queue/libnetfilter-queue.mk
+++ b/package/libnetfilter_queue/libnetfilter-queue.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnetfilter-queue
 #
-#############################################################
+################################################################################
 
 LIBNETFILTER_QUEUE_VERSION = 1.0.2
 LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar.bz2
diff --git a/package/libnfc-llcp/libnfc-llcp.mk b/package/libnfc-llcp/libnfc-llcp.mk
index 6975e780ec..d410b55a30 100644
--- a/package/libnfc-llcp/libnfc-llcp.mk
+++ b/package/libnfc-llcp/libnfc-llcp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnfc-llcp
 #
-#############################################################
+################################################################################
 
 LIBNFC_LLCP_VERSION = 1103
 LIBNFC_LLCP_SITE = http://nfc-tools.googlecode.com/svn/trunk/libnfc-llcp/
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index df52fa3815..25306680df 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnfc
 #
-#############################################################
+################################################################################
 
 LIBNFC_VERSION = fda8d60ce062
 LIBNFC_SITE = http://libnfc.googlecode.com/git/
diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
index 2d79cdb861..192fa8fc65 100644
--- a/package/libnfnetlink/libnfnetlink.mk
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnfnetlink
 #
-#############################################################
+################################################################################
 
 LIBNFNETLINK_VERSION = 1.0.1
 LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 681d364e96..5c884d79a9 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnl
 #
-#############################################################
+################################################################################
 
 LIBNL_VERSION = 3.2.21
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index d2db183681..5aa9bdceb4 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnspr
 #
-#############################################################
+################################################################################
 
 LIBNSPR_VERSION = 4.9.6
 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 8bb46e2ff3..9989b6d5bc 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libnss
 #
-#############################################################
+################################################################################
 
 LIBNSS_VERSION = 3.14.3
 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
index b5fa68fa04..330bec078c 100644
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liboauth
 #
-#############################################################
+################################################################################
 
 LIBOAUTH_VERSION = 0.9.6
 LIBOAUTH_SOURCE = liboauth-$(LIBOAUTH_VERSION).tar.gz
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 2d5f2c19e1..6e03f3add5 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libogg
 #
-#############################################################
+################################################################################
 
 LIBOGG_VERSION = 1.3.0
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
index 3198b710b6..dea41873a8 100644
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liboping
 #
-#############################################################
+################################################################################
 
 LIBOPING_VERSION = 1.6.2
 LIBOPING_SITE = http://verplant.org/liboping/files
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 182fa1812e..6ae8149a31 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libosip2
 #
-#############################################################
+################################################################################
 
 LIBOSIP2_VERSION = 3.6.0
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 5e077a271d..26f807b6c5 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libpcap
 #
-#############################################################
+################################################################################
 
 LIBPCAP_VERSION = 1.3.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk
index 8689bbe9ea..11106720aa 100644
--- a/package/libpfm4/libpfm4.mk
+++ b/package/libpfm4/libpfm4.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libpfm4
 #
-#############################################################
+################################################################################
 
 LIBPFM4_VERSION = 4.3.0
 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz
diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
index 8e8e503bf7..061c87ab09 100644
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libplayer
 #
-#############################################################
+################################################################################
 
 LIBPLAYER_VERSION = 2.0.1
 LIBPLAYER_SITE = http://libplayer.geexbox.org/releases/
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 55567cbf59..f5bf956ee8 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libpng
 #
-#############################################################
+################################################################################
 
 LIBPNG_VERSION = 1.4.12
 LIBPNG_SERIES = 14
diff --git a/package/libpthsem/libpthsem.mk b/package/libpthsem/libpthsem.mk
index 2c6e239c96..dbfab34263 100644
--- a/package/libpthsem/libpthsem.mk
+++ b/package/libpthsem/libpthsem.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libpthsem
 #
-#############################################################
+################################################################################
 
 LIBPTHSEM_VERSION = 2.0.8
 LIBPTHSEM_SOURCE = pthsem_$(LIBPTHSEM_VERSION).tar.gz
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index d0d1700855..bd52cc06d9 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libraw
 #
-#############################################################
+################################################################################
 
 LIBRAW_VERSION = 0.13.4
 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index fd255caeea..9a95265366 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libraw1394
 #
-#############################################################
+################################################################################
 
 LIBRAW1394_VERSION = 2.0.7
 LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index c574f5a602..8cf2823c04 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # librsvg
 #
-#############################################################
+################################################################################
 
 LIBRSVG_VERSION_MAJOR = 2.26
 LIBRSVG_VERSION_MINOR = 3
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index d80385c004..dca566732c 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # librsync
 #
-#############################################################
+################################################################################
 
 LIBRSYNC_VERSION = 0.9.7
 LIBRSYNC_SOURCE = librsync-$(LIBRSYNC_VERSION).tar.gz
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
index 73fe632b11..a69af97c6a 100644
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libseccomp
 #
-#############################################################
+################################################################################
 
 LIBSECCOMP_VERSION         = 1.0.0
 LIBSECCOMP_SOURCE          = libseccomp-$(LIBSECCOMP_VERSION).tar.gz
diff --git a/package/libserial/libserial.mk b/package/libserial/libserial.mk
index a835439075..c5142c5e8f 100644
--- a/package/libserial/libserial.mk
+++ b/package/libserial/libserial.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libserial
 #
-#############################################################
+################################################################################
 
 LIBSERIAL_VERSION = 0.6.0rc1
 LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
diff --git a/package/libsha1/libsha1.mk b/package/libsha1/libsha1.mk
index da6a7b2910..6976a8f269 100644
--- a/package/libsha1/libsha1.mk
+++ b/package/libsha1/libsha1.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libsha1
 #
-#############################################################
+################################################################################
 
 LIBSHA1_VERSION = 0.3
 LIBSHA1_SITE = http://github.com/dottedmag/libsha1/tarball/$(LIBSHA1_VERSION)
diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index c0a0835654..86a3a61de5 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libsigc++
 #
-#############################################################
+################################################################################
 
 LIBSIGC_VERSION = 2.2.11
 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk
index b71e572e73..2cc2544c01 100644
--- a/package/libsigsegv/libsigsegv.mk
+++ b/package/libsigsegv/libsigsegv.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libsigsegv
 #
-#############################################################
+################################################################################
 
 LIBSIGSEGV_VERSION = 2.10
 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk
index e5fbb5e447..97a8c17d8f 100644
--- a/package/libsndfile/libsndfile.mk
+++ b/package/libsndfile/libsndfile.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libsndfile
 #
-#############################################################
+################################################################################
 
 LIBSNDFILE_VERSION = 1.0.25
 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 2f173df0fc..2f7233aef1 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libsoup
 #
-#############################################################
+################################################################################
 
 LIBSOUP_MAJOR_VERSION = 2.36
 LIBSOUP_MINOR_VERSION = 1
diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index 076a783570..df85726b44 100644
--- a/package/libsvgtiny/libsvgtiny.mk
+++ b/package/libsvgtiny/libsvgtiny.mk
@@ -1,8 +1,8 @@
-############################################################
+################################################################################
 #
 # libsvgtiny
 #
-############################################################
+################################################################################
 
 LIBSVGTINY_SITE = svn://svn.netsurf-browser.org/trunk/libsvgtiny
 LIBSVGTINY_VERSION = 12121
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index da4db6f4ce..6bd3c5c6a6 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libsysfs
 #
-#############################################################
+################################################################################
 
 LIBSYSFS_VERSION = 2.1.0
 LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk
index d874b9a683..12c4e3b277 100644
--- a/package/libtasn1/libtasn1.mk
+++ b/package/libtasn1/libtasn1.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libtasn1
 #
-#############################################################
+################################################################################
 
 LIBTASN1_VERSION = 3.2
 LIBTASN1_SITE = http://ftp.gnu.org/gnu/libtasn1
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 37f839cf26..d31dac3546 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libtheora
 #
-#############################################################
+################################################################################
 
 LIBTHEORA_VERSION = 1.1.1
 LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.bz2
diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
index 5b3c728bb9..6b9a3d2325 100644
--- a/package/libtirpc/libtirpc.mk
+++ b/package/libtirpc/libtirpc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libtirpc
 #
-#############################################################
+################################################################################
 
 LIBTIRPC_VERSION = 0.2.2
 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 1c31ee8f55..f7e274fd9f 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libtool
 #
-#############################################################
+################################################################################
 
 LIBTOOL_VERSION = 2.4.2
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index e58de5d034..9d0f8f893f 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libtorrent
 #
-#############################################################
+################################################################################
 
 LIBTORRENT_VERSION = 0.13.3
 LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
index c83286a728..0016c31260 100644
--- a/package/libtpl/libtpl.mk
+++ b/package/libtpl/libtpl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libtpl
 #
-#############################################################
+################################################################################
 
 LIBTPL_VERSION = 1.5
 LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 5196ccd962..019a489737 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libungif
 #
-#############################################################
+################################################################################
 
 LIBUNGIF_VERSION = 4.1.4
 LIBUNGIF_SOURCE = libungif-$(LIBUNGIF_VERSION).tar.bz2
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 295dace395..d4777b53b1 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libupnp
 #
-#############################################################
+################################################################################
 
 LIBUPNP_VERSION = 1.6.18
 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index b6bca65045..3c684ea71c 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # liburc
 #
-#############################################################
+################################################################################
 
 LIBURCU_VERSION = 0.7.6
 LIBURCU_SITE    = http://lttng.org/files/urcu/
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 33f113e3db..8b4b0f6f35 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libusb-compat
 #
-#############################################################
+################################################################################
 
 LIBUSB_COMPAT_VERSION = 0.1.4
 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 806f2d316c..68e44ec211 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libusb
 #
-#############################################################
+################################################################################
 
 LIBUSB_VERSION = 1.0.9
 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 8ab99f8829..936240406b 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libv4l
 #
-#############################################################
+################################################################################
 
 LIBV4L_VERSION = 0.8.9
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index a450632242..fe48838fda 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libvncserver
 #
-#############################################################
+################################################################################
 
 LIBVNCSERVER_VERSION = 0.9.9
 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 5b9048eade..21564870c2 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libvorbis
 #
-#############################################################
+################################################################################
 
 LIBVORBIS_VERSION = 1.3.3
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk
index 6f668242d2..27c73aee81 100644
--- a/package/libxkbcommon/libxkbcommon.mk
+++ b/package/libxkbcommon/libxkbcommon.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libxkbcommon
 #
-#############################################################
+################################################################################
 
 LIBXKBCOMMON_VERSION = 0.3.0
 LIBXKBCOMMON_SITE = http://xkbcommon.org/download/
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 4454e57c62..a863f485e0 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libxml-parser-perl
 #
-#############################################################
+################################################################################
 
 LIBXML_PARSER_PERL_VERSION = 2.36
 LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 7800d946a7..b714234065 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libxml2
 #
-#############################################################
+################################################################################
 
 LIBXML2_VERSION = 2.9.0
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk
index 41ae7f0958..9194274684 100644
--- a/package/libxmlpp/libxmlpp.mk
+++ b/package/libxmlpp/libxmlpp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # LibXML++
 #
-#############################################################
+################################################################################
 
 LIBXMLPP_VERSION_MAJOR = 2.34
 LIBXMLPP_VERSION_MINOR = 2
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index b6c6aad8a1..9139c8e8ae 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libxslt
 #
-#############################################################
+################################################################################
 
 LIBXSLT_VERSION = 1.1.28
 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index c1b5bdd133..ef006dd270 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libyaml
 #
-#############################################################
+################################################################################
 
 LIBYAML_VERSION = 0.1.4
 LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 18ffbef3db..2b5949e3f8 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lighttpd
 #
-#############################################################
+################################################################################
 
 LIGHTTPD_VERSION = 1.4.32
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 293208afb1..0265e10af7 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # linenoise
 #
-#############################################################
+################################################################################
 
 LINENOISE_VERSION = g27a3b4d
 LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
index 701eabf1a1..68920047d0 100644
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # linknx
 #
-#############################################################
+################################################################################
 
 LINKNX_VERSION = 0.0.1.30
 LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
diff --git a/package/links/links.mk b/package/links/links.mk
index f7401bbd74..6e683dd094 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # links
 #
-#############################################################
+################################################################################
 
 LINKS_VERSION = 2.7
 LINKS_SITE = http://links.twibright.com/download
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index efe70a9dae..bbab1e55a9 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # linphone
 #
-#############################################################
+################################################################################
 
 LINPHONE_VERSION = 3.5.2
 LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 0ba2b82ad0..4ff0e0aa80 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # linux-firmware
 #
-#############################################################
+################################################################################
 
 LINUX_FIRMWARE_VERSION = 07ea598af5b9dde3acdf279846b062fa1b2987b8
 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 80b14ca50c..ff319341d7 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # linux-fusion
 #
-#############################################################
+################################################################################
 
 LINUX_FUSION_VERSION = 9.0.0
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index f5388c1721..aa9fa36434 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -1,8 +1,8 @@
-############################################
+################################################################################
 #
 # linux-pam
 # 
-############################################
+################################################################################
 
 LINUX_PAM_VERSION = 1.1.4
 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index 03d5eb6c24..262b2d45ba 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # LiTE
 #
-#############################################################
+################################################################################
 
 LITE_VERSION = 0.8.10
 LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz
diff --git a/package/live555/live555.mk b/package/live555/live555.mk
index ecbac60f99..83fe0e06fb 100644
--- a/package/live555/live555.mk
+++ b/package/live555/live555.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # live555
 #
-#############################################################
+################################################################################
 
 LIVE555_VERSION = 2011.06.16
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index b4339a31f3..1f752be8a7 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lm-sensors
 #
-#############################################################
+################################################################################
 
 LM_SENSORS_VERSION = 3.3.4
 LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index 65ef62b16c..3d3d68fb88 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lmbench
 #
-#############################################################
+################################################################################
 
 LMBENCH_VERSION = 3.0-a9
 LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
index ad1bcad65a..cc38559bed 100644
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # localedef
 #
-#############################################################
+################################################################################
 
 LOCALEDEF_VERSION = 2.14.1-r17443-ptx1
 LOCALEDEF_SOURCE  = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 3d6e459197..35bb881de3 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lockfile-progs
 #
-#############################################################
+################################################################################
 
 LOCKFILE_PROGS_VERSION = 0.1.15
 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk
index 83afded9cb..43859625cd 100644
--- a/package/log4cxx/log4cxx.mk
+++ b/package/log4cxx/log4cxx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # log4cxx
 #
-#############################################################
+################################################################################
 
 LOG4CXX_VERSION = 0.10.0
 LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 6d2d90afdd..f5ef0b916e 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # logrotate
 #
-#############################################################
+################################################################################
 
 LOGROTATE_VERSION = 3.8.4
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk
index 4d9a8d4226..c0daa24183 100644
--- a/package/logsurfer/logsurfer.mk
+++ b/package/logsurfer/logsurfer.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # logsurfer
 #
-#############################################################
+################################################################################
 
 LOGSURFER_VERSION = 1.8
 LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index c5792158c9..2ecd28050a 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lrzsz
 #
-#############################################################
+################################################################################
 
 LRZSZ_VERSION = 0.12.20
 LRZSZ_SITE = http://www.ohse.de/uwe/releases
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 68daa0d5f3..71f52a5812 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lshw
 #
-#############################################################
+################################################################################
 
 LSHW_VERSION = B.02.16
 LSHW_SITE = http://ezix.org/software/files
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index f74eca4941..f1c9474c61 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lsof
 #
-#############################################################
+################################################################################
 
 LSOF_VERSION = 4.85
 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
diff --git a/package/lsuio/lsuio.mk b/package/lsuio/lsuio.mk
index 4479bbc405..ae44a78ec4 100644
--- a/package/lsuio/lsuio.mk
+++ b/package/lsuio/lsuio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lsuio
 #
-#############################################################
+################################################################################
 
 LSUIO_VERSION = 0.2.0
 LSUIO_SOURCE = lsuio-$(LSUIO_VERSION).tar.gz
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 093c2c35ca..16d1fe8420 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ltp-testsuite
 #
-#############################################################
+################################################################################
 
 LTP_TESTSUITE_VERSION = 20130109
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 41d48ba10a..78b5a9ddb6 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ltrace
 #
-#############################################################
+################################################################################
 
 LTRACE_VERSION = 0.7.2
 LTRACE_SITE = http://alioth.debian.org/frs/download.php/3848
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 59d3963a9a..625475f1b8 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # LTTng-UST
 #
-#############################################################
+################################################################################
 
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
 LTTNG_LIBUST_VERSION = 2.1.1
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index f01d5290b9..c1dfff9f01 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # LTTng-modules
 #
-#############################################################
+################################################################################
 
 LTTNG_MODULES_VERSION = 2.1.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 6142666fa4..77bf7d62ab 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # LTTng-Tools
 #
-#############################################################
+################################################################################
 
 LTTNG_TOOLS_VERSION = 2.1.1
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index bde7708d11..4979a11f78 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lua-msgpack-native
 #
-#############################################################
+################################################################################
 
 LUA_MSGPACK_NATIVE_VERSION = g41cce91
 LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/master
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 32acc999d8..2098de23b7 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lua
 #
-#############################################################
+################################################################################
 
 LUA_VERSION = 5.1.5
 LUA_SITE = http://www.lua.org/ftp
diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk
index dc70cee409..f976ec6139 100644
--- a/package/luacjson/luacjson.mk
+++ b/package/luacjson/luacjson.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # luacjson
 #
-#############################################################
+################################################################################
 
 LUACJSON_VERSION       = 2.1.0
 LUACJSON_SOURCE        = lua-cjson-$(LUACJSON_VERSION).tar.gz
diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk
index 2d4c517c07..5c45f3424c 100644
--- a/package/luaexpat/luaexpat.mk
+++ b/package/luaexpat/luaexpat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # luaexpat
 #
-#############################################################
+################################################################################
 
 LUAEXPAT_VERSION      = 1.2.0
 LUAEXPAT_SITE         = http://matthewwild.co.uk/projects/luaexpat
diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index d23fbce47e..2f7b4d8a95 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # luafilesystem
 #
-#############################################################
+################################################################################
 
 LUAFILESYSTEM_VERSION = 1.6.2
 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 8078a51790..e4022a1dda 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # luajit
 #
-#############################################################
+################################################################################
 
 LUAJIT_VERSION = 2.0.2
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
index 45fb9a3afe..b0c0be5e09 100644
--- a/package/luasocket/luasocket.mk
+++ b/package/luasocket/luasocket.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # luasocket
 #
-#############################################################
+################################################################################
 
 LUASOCKET_VERSION = 2.0.2
 LUASOCKET_SITE = http://luaforge.net/frs/download.php/2664
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 69df260d17..873216c7c6 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lvm2
 #
-#############################################################
+################################################################################
 
 LVM2_VERSION = 2.02.79
 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 110437c101..648a579ebd 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lzma
 #
-#############################################################
+################################################################################
 
 LZMA_VERSION = 4.32.7
 LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.gz
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index 6809f302b8..10107fea3b 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lzo
 #
-#############################################################
+################################################################################
 
 LZO_VERSION = 2.06
 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 9803b3931f..1ac85eb9d4 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lzop
 #
-#############################################################
+################################################################################
 
 LZOP_VERSION = 1.03
 LZOP_SOURCE = lzop-$(LZOP_VERSION).tar.gz
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index f0d5019875..8e41627a32 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # m4
 #
-#############################################################
+################################################################################
 
 M4_VERSION = 1.4.16
 M4_SOURCE = m4-$(M4_VERSION).tar.bz2
diff --git a/package/macchanger/macchanger.mk b/package/macchanger/macchanger.mk
index 93b55498a9..865618369a 100644
--- a/package/macchanger/macchanger.mk
+++ b/package/macchanger/macchanger.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # macchanger
 #
-#############################################################
+################################################################################
 
 MACCHANGER_VERSION = 1.5.0
 MACCHANGER_SITE = $(BR2_GNU_MIRROR)/macchanger
diff --git a/package/make/make.mk b/package/make/make.mk
index a24a28e8bf..74726e21e9 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # make
 #
-#############################################################
+################################################################################
 
 MAKE_VERSION = 3.82
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index 5e984c65ff..a426e7d51e 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # makedevs
 #
-#############################################################
+################################################################################
 
 # source included in buildroot
 MAKEDEVS_SOURCE =
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 61b9e956ec..0a169d7495 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox Common
 #
-#############################################################
+################################################################################
 
 MATCHBOX_COMMON_VERSION_MAJOR = 0.9
 MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
@@ -16,6 +16,6 @@ ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
 	MATCHBOX_COMMON_CONF_OPT += --enable-pda-folders
 endif
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 13ea73074e..9e1e05551c 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox Desktop
 #
-#############################################################
+################################################################################
 
 MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
 MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
@@ -18,7 +18,7 @@ MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 # configure.ac/Makefile.am.
 MATCHBOX_DESKTOP_AUTORECONF = YES
 
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
   MATCHBOX_DESKTOP_CONF_OPT+=--enable-startup-notification
@@ -27,6 +27,6 @@ else
   MATCHBOX_DESKTOP_CONF_OPT+=--disable-startup-notification
 endif
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index c3165e0ea7..ebae9d2bae 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox Fakekey
 #
-#############################################################
+################################################################################
 
 MATCHBOX_FAKEKEY_VERSION = 0.1
 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
@@ -20,6 +20,6 @@ endef
 
 MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 97e3a36bec..94782dff05 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox Keyboard
 #
-#############################################################
+################################################################################
 
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
@@ -20,7 +20,7 @@ endef
 
 MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
 
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_PANGO),y)
   MATCHBOX_PKEYBOARD_CONF_OPT+=--enable-pango
@@ -28,6 +28,6 @@ else
   MATCHBOX_KEYBOARD_DEPENDENCIES+=xlib_libXft
 endif
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 9855c8ab3d..768f29ea0b 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox LIB
 #
-#############################################################
+################################################################################
 
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
@@ -20,7 +20,7 @@ endef
 
 MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
 
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
 ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
@@ -56,6 +56,6 @@ else
   MATCHBOX_LIB_CONF_OPT+=--disable-xft
 endif
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index 9b12c3da05..bf145d42c7 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox Panel
 #
-#############################################################
+################################################################################
 
 MATCHBOX_PANEL_VERSION_MAJOR = 0.9
 MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
@@ -13,7 +13,7 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPT = --enable-expat
 
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
   MATCHBOX_PANEL_CONF_OPT+=--enable-startup-notification
@@ -22,6 +22,6 @@ else
   MATCHBOX_PANEL_CONF_OPT+=--disable-startup-notification
 endif
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 18c3b13094..561cac9ea2 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox Applet Startup monitor
 #
-#############################################################
+################################################################################
 
 MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
 MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
@@ -12,6 +12,6 @@ MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING
 MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
 MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 4c556e51bc..3438d32d11 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MatchBox WM
 #
-#############################################################
+################################################################################
 
 MATCHBOX_WM_VERSION = 1.2
 MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
@@ -16,7 +16,7 @@ MATCHBOX_WM_CONF_OPT = --enable-expat
 # Workaround bug in configure script
 MATCHBOX_WM_CONF_ENV = expat=yes
 
-#############################################################
+################################################################################
 
 ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
 ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
@@ -40,6 +40,6 @@ else
   MATCHBOX_WM_CONF_OPT+=--disable-startup-notification
 endif
 
-#############################################################
+################################################################################
 
 $(eval $(autotools-package))
diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk
index 5bd5816776..f9bbdaa0ee 100644
--- a/package/mcrypt/mcrypt.mk
+++ b/package/mcrypt/mcrypt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mcrypt
 #
-#############################################################
+################################################################################
 
 MCRYPT_VERSION = 2.6.8
 MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VERSION)
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index e8cefda2b9..e21cb71aff 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mdadm
 #
-#############################################################
+################################################################################
 
 MDADM_VERSION = 3.2.6
 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
diff --git a/package/media-ctl/media-ctl.mk b/package/media-ctl/media-ctl.mk
index 065751e5c9..64a63aaabc 100644
--- a/package/media-ctl/media-ctl.mk
+++ b/package/media-ctl/media-ctl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # media-ctl
 #
-#############################################################
+################################################################################
 
 MEDIA_CTL_VERSION = ac40b79f002a2315f909548614ccd2d408da25b7
 MEDIA_CTL_SITE = git://git.ideasonboard.org/media-ctl.git
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 6a0664e2b3..5093df7912 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mediastreamer
 #
-#############################################################
+################################################################################
 
 MEDIASTREAMER_VERSION = 2.8.2
 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk
index 4adacd131b..e13d01306c 100644
--- a/package/memstat/memstat.mk
+++ b/package/memstat/memstat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # memstat
 #
-#############################################################
+################################################################################
 
 MEMSTAT_VERSION = 0.8
 MEMSTAT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/memstat
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index a34330134b..3e2092a4d1 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # memtester
 #
-#############################################################
+################################################################################
 
 MEMTESTER_VERSION = 4.3.0
 MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index aa78a7a574..9306b00207 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # metacity
 #
-#############################################################
+################################################################################
 
 # newer versions need libcanberra-gtk and gnome-doc-utils
 METACITY_VERSION_MAJOR = 2.25
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 8fac3d886b..8887e49491 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # midori
 #
-#############################################################
+################################################################################
 
 MIDORI_VERSION = 0.4.6
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 88187c6950..9443661ae8 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mii-diag
 #
-#############################################################
+################################################################################
 
 MII_DIAG_VERSION = 2.11
 MII_DIAG_SOURCE  = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 1dfbde7edb..25f266b979 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # minicom
 #
-#############################################################
+################################################################################
 
 MINICOM_VERSION = 2.6.1
 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index 5eff6d1abe..035b94833f 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mobile broadband provider info
 #
-#############################################################
+################################################################################
 
 MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20120614
 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 9d136b955d..88abec4d9f 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # module-init-tools
 #
-#############################################################
+################################################################################
 
 MODULE_INIT_TOOLS_VERSION = 3.15
 MODULE_INIT_TOOLS_SOURCE = module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
index 9905cf9c30..d928dd8077 100644
--- a/package/mongoose/mongoose.mk
+++ b/package/mongoose/mongoose.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mongoose
 #
-#############################################################
+################################################################################
 
 MONGOOSE_VERSION = 3.7
 MONGOOSE_SOURCE = mongoose-$(MONGOOSE_VERSION).tgz
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index 06ec6cdb83..c06810793b 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mongrel2
 #
-#############################################################
+################################################################################
 
 MONGREL2_VERSION = 1.8.0
 MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index 657f0f15cd..e2847fc2c1 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # monit
 #
-#############################################################
+################################################################################
 
 MONIT_VERSION = 5.4
 MONIT_SITE = http://mmonit.com/monit/dist/
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index a366db76fd..84e4ff370c 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mpc
 #
-#############################################################
+################################################################################
 
 MPC_VERSION = 1.0.1
 MPC_SITE = $(BR2_GNU_MIRROR)/mpc
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 7fa97fe614..6460844122 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mpfr
 #
-#############################################################
+################################################################################
 
 MPFR_VERSION = 3.1.2
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 56aa7e11d1..c0cc2aa8b8 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mrouted
 #
-#############################################################
+################################################################################
 
 MROUTED_VERSION = 3.9.6
 MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index e99ab3df85..95687bcfe7 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # msmtp
 #
-#############################################################
+################################################################################
 
 MSMTP_VERSION = 1.4.31
 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 44115448ea..994a73a222 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mtd
 #
-#############################################################
+################################################################################
 
 MTD_VERSION = 1.5.0
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
diff --git a/package/mtdev/mtdev.mk b/package/mtdev/mtdev.mk
index d240b505a4..5c943527dd 100644
--- a/package/mtdev/mtdev.mk
+++ b/package/mtdev/mtdev.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mtdev
 #
-#############################################################
+################################################################################
 
 MTDEV_VERSION = 1.1.3
 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2
diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
index fcbe5a6562..3f34702052 100644
--- a/package/mtdev2tuio/mtdev2tuio.mk
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mtdev2tuio
 #
-#############################################################
+################################################################################
 
 MTDEV2TUIO_VERSION = e1e7378
 MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/master
diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk
index a27c4fdda3..6751059d6e 100644
--- a/package/mtools/mtools.mk
+++ b/package/mtools/mtools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mtools
 #
-#############################################################
+################################################################################
 
 MTOOLS_VERSION       = 4.0.18
 MTOOLS_SOURCE        = mtools-$(MTOOLS_VERSION).tar.bz2
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 84082d18ff..b951112c58 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # alsa-utils
 #
-#############################################################
+################################################################################
 
 ALSA_UTILS_VERSION = 1.0.26
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index da42bba091..de0902a4ab 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # aumix
 #
-#############################################################
+################################################################################
 
 AUMIX_VERSION = 2.8
 AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
index 07004cedd3..993015cf2b 100644
--- a/package/multimedia/bellagio/bellagio.mk
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # bellagio
 #
-#############################################################
+################################################################################
 
 BELLAGIO_VERSION = 0.9.3
 BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index fd7a25677c..6223a79d4b 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ffmpeg
 #
-#############################################################
+################################################################################
 
 FFMPEG_VERSION = 0.8.12
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index ead490eb8e..fc59c3025b 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-ffmpeg
 #
-#############################################################
+################################################################################
 
 GST_FFMPEG_VERSION = 0.10.13
 GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
index 405374abd3..ccdb521284 100644
--- a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-fsl-plugins
 #
-#############################################################
+################################################################################
 
 GST_FSL_PLUGINS_VERSION = 3.0.1
 # No official download site from freescale, just this mirror
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 1e8f54e381..df90cf9b5b 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-plugins-bad
 #
-#############################################################
+################################################################################
 
 GST_PLUGINS_BAD_VERSION = 0.10.23
 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 713aaae078..c82aad0183 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-plugins-base
 #
-#############################################################
+################################################################################
 
 GST_PLUGINS_BASE_VERSION = 0.10.36
 GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index b61138dbc3..eba0571964 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-plugins-good
 #
-#############################################################
+################################################################################
 
 GST_PLUGINS_GOOD_VERSION = 0.10.31
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index 752f8e802e..009c168d92 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-plugins-ugly
 #
-#############################################################
+################################################################################
 
 GST_PLUGINS_UGLY_VERSION = 0.10.19
 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 3639a557bb..4453fc8956 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -1,9 +1,9 @@
 
-#############################################################
+################################################################################
 #
 # gstreamer
 #
-#############################################################
+################################################################################
 
 GSTREAMER_VERSION = 0.10.36
 GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk
index 09705926ac..38a39a3d0c 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/multimedia/lame/lame.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lame
 #
-#############################################################
+################################################################################
 
 LAME_VERSION_MAJOR = 3.99
 LAME_VERSION_MINOR = 5
diff --git a/package/multimedia/libvpx/libvpx.mk b/package/multimedia/libvpx/libvpx.mk
index 131fd49fad..480f1c4602 100644
--- a/package/multimedia/libvpx/libvpx.mk
+++ b/package/multimedia/libvpx/libvpx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libvpx
 #
-#############################################################
+################################################################################
 
 LIBVPX_VERSION = v1.2.0
 LIBVPX_SITE = http://git.chromium.org/webm/libvpx.git
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index d68c86b320..8dbb4c03e8 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # madplay
 #
-#############################################################
+################################################################################
 
 MADPLAY_VERSION = 0.15.2b
 MADPLAY_SOURCE = madplay-$(MADPLAY_VERSION).tar.gz
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index e098c3d754..4424b7e0a5 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mpd
 #
-#############################################################
+################################################################################
 
 MPD_VERSION = 0.17.4
 MPD_SITE = http://www.musicpd.org/download/mpd/stable
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index 8796392fda..f55404388c 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mpg123
 #
-#############################################################
+################################################################################
 
 MPG123_VERSION = 1.15.4
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 6ddf002dd2..a13efed76f 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mplayer
 #
-#############################################################
+################################################################################
 
 MPLAYER_VERSION = 1.1
 MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
diff --git a/package/multimedia/vorbis-tools/vorbis-tools.mk b/package/multimedia/vorbis-tools/vorbis-tools.mk
index c23648c385..56b1f944a9 100644
--- a/package/multimedia/vorbis-tools/vorbis-tools.mk
+++ b/package/multimedia/vorbis-tools/vorbis-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vorbis-tools
 #
-#############################################################
+################################################################################
 
 VORBIS_TOOLS_VERSION = 1.4.0
 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index ed5e86e026..59f65f61a1 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mutt
 #
-#############################################################
+################################################################################
 
 MUTT_VERSION = 1.5.21
 MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt-dev
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index 5f03db893e..778e9bfe13 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mxml
 #
-#############################################################
+################################################################################
 
 MXML_VERSION = 2.7
 MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION)
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 1477b66a66..ade4822f3b 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # MySQL 5.1 Client
 #
-#############################################################
+################################################################################
 
 MYSQL_CLIENT_VERSION = 5.1.67
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 61bf218b67..b1a8f444e6 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nano
 #
-#############################################################
+################################################################################
 
 NANO_VERSION = 2.3.1
 NANO_SITE = http://www.nano-editor.org/dist/v2.3
diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index a6cd7e1aa0..d97e26d30a 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nanocom
 #
-#############################################################
+################################################################################
 
 NANOCOM_VERSION = 2.6.1
 NANOCOM_SOURCE = nanocom.tar.gz
diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index 84663e565b..c762dcf03f 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -1,8 +1,8 @@
-############################################################
+################################################################################
 #
 # nasm
 #
-############################################################
+################################################################################
 
 NASM_VERSION = 2.10.01
 NASM_SOURCE  = nasm-$(NASM_VERSION).tar.bz2
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 708e567438..e790a345ba 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nbd
 #
-#############################################################
+################################################################################
 
 NBD_VERSION = 3.3
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk
index 06f5e714d9..a104285765 100644
--- a/package/ncdu/ncdu.mk
+++ b/package/ncdu/ncdu.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ncdu
 #
-#############################################################
+################################################################################
 
 NCDU_VERSION = 1.9
 NCDU_SITE = http://dev.yorhel.nl/download/
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index bfb878a33e..a51605e6dc 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ncftp
 #
-#############################################################
+################################################################################
 
 NCFTP_VERSION = 3.2.5
 NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.bz2
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 8d5463c2e5..5381bd18d6 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ncurses
 #
-#############################################################
+################################################################################
 
 NCURSES_VERSION = 5.9
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index 1d3c0e7205..719f85d5b2 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ndisc6
 #
-#############################################################
+################################################################################
 
 NDISC6_VERSION = 1.0.2
 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index 64cd1a936c..f5121ed744 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ne10
 #
-#############################################################
+################################################################################
 
 # We use a Git commit ID because the last tagged version is more than
 # one year old.
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 57a434dd58..0fa30ea095 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # neard
 #
-#############################################################
+################################################################################
 
 NEARD_VERSION = 0.11
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk
index b937acb814..7e085e4ab5 100644
--- a/package/neardal/neardal.mk
+++ b/package/neardal/neardal.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # neardal
 #
-#############################################################
+################################################################################
 
 NEARDAL_VERSION = 0.8
 NEARDAL_SITE = http://github.com/connectivity/neardal/tarball/$(NEARDAL_VERSION)
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 32d63adc1e..1915e6c2ee 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # neon
 #
-#############################################################
+################################################################################
 
 NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 2e0f978f74..684e790523 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netatalk
 #
-#############################################################
+################################################################################
 
 NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 5f6cc4db5e..594ef2f4c0 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netcat
 #
-#############################################################
+################################################################################
 
 NETCAT_VERSION = 0.7.1
 NETCAT_SOURCE = netcat-$(NETCAT_VERSION).tar.gz
diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 01f35be90a..b17ee996db 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netkitbase
 #
-#############################################################
+################################################################################
 
 NETKITBASE_VERSION = 0.17
 NETKITBASE_SOURCE  = netkit-base-$(NETKITBASE_VERSION).tar.gz
diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index db6743e55a..ca3b9300b8 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netkittelnet
 #
-#############################################################
+################################################################################
 
 NETKITTELNET_VERSION = 0.17
 NETKITTELNET_SOURCE  = netkit-telnet-$(NETKITTELNET_VERSION).tar.gz
diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index 653dc7a8c0..2bd11f386c 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netperf
 #
-#############################################################
+################################################################################
 
 NETPERF_VERSION = 2.6.0
 NETPERF_SITE = ftp://ftp.netperf.org/netperf
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index 0c723bffb9..7460b66618 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netplug
 #
-#############################################################
+################################################################################
 
 NETPLUG_VERSION=1.2.9.2
 NETPLUG_SOURCE=netplug-$(NETPLUG_VERSION).tar.bz2
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 6a72da74d7..806f7a6a25 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netsnmp
 #
-#############################################################
+################################################################################
 
 NETSNMP_VERSION = 5.7.2
 NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk
index a67b786f49..d94c6f02dc 100644
--- a/package/netstat-nat/netstat-nat.mk
+++ b/package/netstat-nat/netstat-nat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # netstat-nat
 #
-#############################################################
+################################################################################
 
 NETSTAT_NAT_VERSION = 1.4.10
 NETSTAT_NAT_SITE = http://tweegy.nl/download
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 9be624cb1b..9c143aae1e 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # NetworkManager
 #
-#############################################################
+################################################################################
 
 NETWORK_MANAGER_VERSION_MAJOR = 0.9
 NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8.0
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index 754636ba43..1d5e7d58e8 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # newt
 #
-#############################################################
+################################################################################
 
 NEWT_VERSION         = 0.51.0
 NEWT_SITE            = http://www.uclibc.org/
diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk
index cde9cada1f..48f73e910a 100644
--- a/package/nfacct/nfacct.mk
+++ b/package/nfacct/nfacct.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nfacct
 #
-#############################################################
+################################################################################
 
 NFACCT_VERSION = 1.0.1
 NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index e59619f7c9..76face5369 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nfs-utils
 #
-#############################################################
+################################################################################
 
 NFS_UTILS_VERSION = 1.2.6
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 7300911b27..41a5b49b2e 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ngircd
 #
-#############################################################
+################################################################################
 
 NGIRCD_VERSION = 17.1
 NGIRCD_SITE = ftp://ftp.berlios.de/pub/ngircd/
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index 274bbbd0d7..99b8f469d4 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ngrep
 #
-#############################################################
+################################################################################
 
 NGREP_VERSION = 1.45
 NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
index a5b085d7fd..47e4cfcb21 100644
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nmap
 #
-#############################################################
+################################################################################
 
 NMAP_VERSION = 6.01
 NMAP_SITE = http://nmap.org/dist
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index a77709d4f2..874c5f19d2 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nodejs
 #
-#############################################################
+################################################################################
 
 NODEJS_VERSION = 0.8.22
 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz
diff --git a/package/noip/noip.mk b/package/noip/noip.mk
index e90ff07be5..a3d5e3dc5d 100644
--- a/package/noip/noip.mk
+++ b/package/noip/noip.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # noip
 #
-#############################################################
+################################################################################
 
 NOIP_VERSION = 2.1.9
 NOIP_SITE = http://www.no-ip.com/client/linux
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 250050e4f1..ea53bc2861 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nss_mdns
 #
-#############################################################
+################################################################################
 
 NSS_MDNS_VERSION=0.10
 NSS_MDNS_SITE=http://0pointer.de/lennart/projects/nss-mdns
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index e9a91a4ddf..55a4d7bc88 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ntfs-3g
 #
-#############################################################
+################################################################################
 
 NTFS_3G_VERSION = 2013.1.13
 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index a9a7f10032..601fa97244 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ntp
 #
-#############################################################
+################################################################################
 
 NTP_VERSION = 4.2.6p5
 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
index fe6f23f74a..5b2b0221ed 100644
--- a/package/numactl/numactl.mk
+++ b/package/numactl/numactl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # numactl
 #
-#############################################################
+################################################################################
 
 NUMACTL_VERSION = 2.0.8
 NUMACTL_SOURCE = numactl-$(NUMACTL_VERSION).tar.gz
diff --git a/package/nuttcp/nuttcp.mk b/package/nuttcp/nuttcp.mk
index df03dcaddc..406219dd3c 100644
--- a/package/nuttcp/nuttcp.mk
+++ b/package/nuttcp/nuttcp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # nuttcp
 #
-#############################################################
+################################################################################
 
 NUTTCP_VERSION = 6.1.2
 NUTTCP_SITE = http://www.lcp.nrl.navy.mil/nuttcp/
diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk
index 1be3a3f4b8..8ca557840f 100644
--- a/package/ocf-linux/ocf-linux.mk
+++ b/package/ocf-linux/ocf-linux.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ocf-linux
 #
-#############################################################
+################################################################################
 
 OCF_LINUX_VERSION = 20120127
 OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION)
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 9b1181af4a..6031395eee 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ofono
 #
-#############################################################
+################################################################################
 
 OFONO_VERSION = 1.12
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index fff7b34335..9532612c40 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # olsr
 #
-#############################################################
+################################################################################
 
 OLSR_VERSION_MAJOR = 0.6
 OLSR_VERSION_MINOR = 4
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index 8615fdb5f8..77bb6a60bd 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # omap-u-boot-utils
 #
-#############################################################
+################################################################################
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852
 OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/master
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index 5a129ec39b..d083795798 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -1,8 +1,8 @@
-############################################################
+################################################################################
 #
 # open2300
 #
-############################################################
+################################################################################
 
 OPEN2300_SITE        = http://www.lavrsen.dk/svn/open2300/trunk/
 OPEN2300_SITE_METHOD = svn
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index f9be0d7657..3bf7ee9e22 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # opencv
 #
-#############################################################
+################################################################################
 
 OPENCV_VERSION = 2.4.2
 OPENCV_SITE    = http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION)
diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index 8ff24e886a..bd8040dade 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Virtual package for libEGL
 #
-#############################################################
+################################################################################
 
 LIBEGL_SOURCE =
 
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index 675d11fd35..a0048a7846 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Virtual package for libGLES
 #
-#############################################################
+################################################################################
 
 LIBGLES_SOURCE =
 
diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk
index 430760208c..9175c6e5c2 100644
--- a/package/opengl/libopenmax/libopenmax.mk
+++ b/package/opengl/libopenmax/libopenmax.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Virtual package for libopenmax
 #
-#############################################################
+################################################################################
 
 LIBOPENMAX_SOURCE =
 
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
index 746b52c9a9..03f59ba57f 100644
--- a/package/opengl/libopenvg/libopenvg.mk
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Virtual package for libOpenVG
 #
-#############################################################
+################################################################################
 
 LIBOPENVG_SOURCE =
 
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index 7419359c7a..cd9bab6519 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openntpd
 #
-#############################################################
+################################################################################
 
 OPENNTPD_VERSION = 3.9p1
 OPENNTPD_SITE = ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
index 0fb4f6572b..7195a264aa 100644
--- a/package/openobex/openobex.mk
+++ b/package/openobex/openobex.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openobex
 #
-#############################################################
+################################################################################
 
 OPENOBEX_VERSION = 1.5
 OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 05876dcc7f..ac3cd77c1e 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openocd
 #
-#############################################################
+################################################################################
 
 OPENOCD_VERSION = 0.5.0
 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
index c476014453..3ec5c77e28 100644
--- a/package/openpgm/openpgm.mk
+++ b/package/openpgm/openpgm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openpgm
 #
-#############################################################
+################################################################################
 
 OPENPGM_VERSION = 5.1.118~dfsg
 OPENPGM_SOURCE = libpgm-$(OPENPGM_VERSION).tar.gz
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index a56bb7538f..006d597f1d 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openssh
 #
-#############################################################
+################################################################################
 
 OPENSSH_VERSION = 6.2p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 081fc90dad..e16c91ff8d 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openssl
 #
-#############################################################
+################################################################################
 
 OPENSSL_VERSION = 1.0.1e
 OPENSSL_SITE = http://www.openssl.org/source
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 6b7dc0503f..b373e11a4f 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openswan
 #
-#############################################################
+################################################################################
 
 OPENSWAN_VERSION = 2.6.38
 OPENSWAN_SITE = http://download.openswan.org/openswan
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 7a4385b63d..db61c83eb0 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openvpn
 #
-#############################################################
+################################################################################
 
 OPENVPN_VERSION = 2.3.1
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index 9932d3f8bd..9e1c623754 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # opkg
 #
-#############################################################
+################################################################################
 
 OPKG_VERSION = 635
 OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 6c397020cd..abfb1cda85 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # oprofile
 #
-#############################################################
+################################################################################
 
 OPROFILE_VERSION = 0.9.8
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index 7ee708f9dc..66bd9f08fd 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # opus-tools
 #
-#############################################################
+################################################################################
 
 OPUS_TOOLS_VERSION = 0.1.6
 OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
diff --git a/package/opus/opus.mk b/package/opus/opus.mk
index adaebfbc0c..043d4b0ecd 100644
--- a/package/opus/opus.mk
+++ b/package/opus/opus.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # opus
 #
-#############################################################
+################################################################################
 
 OPUS_VERSION = 1.0.2
 OPUS_SITE = http://downloads.xiph.org/releases/opus
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 18ce0fdc6b..9d9921a26b 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # orc
 #
-#############################################################
+################################################################################
 
 ORC_VERSION = 0.4.16
 ORC_SITE = http://code.entropywave.com/download/orc/
diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk
index a54cc5df4c..371cc02722 100644
--- a/package/owl-linux/owl-linux.mk
+++ b/package/owl-linux/owl-linux.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # owl-linux
 #
-#############################################################
+################################################################################
 
 OWL_LINUX_VERSION = 1.0.7
 OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index 6cb81ee6e0..0db5ebfdec 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # p11-kit
 #
-#############################################################
+################################################################################
 
 P11_KIT_VERSION = 0.18.1
 P11_KIT_SITE = http://p11-glue.freedesktop.org/releases
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 75477d9f12..82ba542997 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pango
 #
-#############################################################
+################################################################################
 
 PANGO_VERSION_MAJOR = 1.28
 PANGO_VERSION_MINOR = 4
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index 2152ea6be8..78c755a329 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # parted
 #
-#############################################################
+################################################################################
 
 PARTED_VERSION = 3.1
 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index 5a421c7559..1605e31b04 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # patch
 #
-#############################################################
+################################################################################
 
 PATCH_VERSION = 2.7.1
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index d9265a398f..350ca0d352 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pciutils
 #
-#############################################################
+################################################################################
 
 PCIUTILS_VERSION = 3.2.0
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 4a2cdacc47..90b3959dc8 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pcmanfm
 #
-#############################################################
+################################################################################
 
 PCMANFM_VERSION = 0.3.5.9
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 62f22100e3..bf86a3daac 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pcre
 #
-#############################################################
+################################################################################
 
 PCRE_VERSION = 8.33
 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index b3bd34273f..5eab4e7167 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -1,8 +1,8 @@
-##########################################################
+################################################################################
 #
 # pcsc-lite
 #
-#########################################################
+################################################################################
 
 PCSC_LITE_VERSION = 1.8.6
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
diff --git a/package/perf/perf.mk b/package/perf/perf.mk
index 4356f5db5d..7787c787a1 100644
--- a/package/perf/perf.mk
+++ b/package/perf/perf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # perf
 #
-#############################################################
+################################################################################
 
 # Source taken from the Linux kernel tree
 PERF_SOURCE =
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 42512f8d05..cbd5453565 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # perl
 #
-#############################################################
+################################################################################
 
 PERL_VERSION_MAJOR = 16
 PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3
diff --git a/package/php/php.mk b/package/php/php.mk
index 8c4c2e1efb..ea148fbb1b 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # php
 #
-#############################################################
+################################################################################
 
 PHP_VERSION = 5.3.25
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index 4278ac097f..4298faa7d4 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # picocom
 #
-#############################################################
+################################################################################
 
 PICOCOM_VERSION = 1.6
 PICOCOM_SITE    = http://picocom.googlecode.com/files/
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 6c5e135d61..4a3d66dfc2 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pkgconfig
 #
-#############################################################
+################################################################################
 
 PKG_CONFIG_VERSION = 0.25
 PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 1705fcd8ed..8f6fe3dd82 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -1,11 +1,11 @@
-############################################################################
+################################################################################
 #
 # This file contains the download helpers for the various package
 # infrastructures. It is used to handle downloads from HTTP servers,
 # FTP servers, Git repositories, Subversion repositories, Mercurial
 # repositories, Bazaar repositories, and SCP servers.
 #
-############################################################################
+################################################################################
 
 # Download method commands
 WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 86d687fb99..15db0969e3 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -1,9 +1,9 @@
-############################################################################
+################################################################################
 #
 # This file contains various utility functions used by the package
 # infrastructure, or by the packages themselves.
 #
-############################################################################
+################################################################################
 
 # UPPERCASE Macro -- transform its argument to uppercase and replace dots and
 # hyphens to underscores
diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
index 4b00ad3108..b489699071 100644
--- a/package/pkgconf/pkgconf.mk
+++ b/package/pkgconf/pkgconf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pkgconf
 #
-#############################################################
+################################################################################
 
 PKGCONF_VERSION = 0.8.9
 PKGCONF_SITE = http://tortois.es/~nenolod/distfiles
diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk
index 50613e8d4d..83ee12ec57 100644
--- a/package/pmake/pmake.mk
+++ b/package/pmake/pmake.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pmake
 #
-##############################################################
+################################################################################
 
 PMAKE_VERSION       = 1.111
 PMAKE_SOURCE        = pmake_$(PMAKE_VERSION).orig.tar.gz
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 1aa9bb49f7..a18f209c1f 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # poco
 #
-#############################################################
+################################################################################
 
 POCO_VERSION_MAJOR = 1.4.6
 POCO_VERSION = $(POCO_VERSION_MAJOR)p1
diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk
index 54782dd6bf..5ff530b8ec 100644
--- a/package/polkit/polkit.mk
+++ b/package/polkit/polkit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # polkit
 #
-#############################################################
+################################################################################
 
 POLKIT_VERSION = 0.103
 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases/
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 1ce7d1ed0c..81bdbbb639 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # poppler
 #
-#############################################################
+################################################################################
 
 POPPLER_VERSION = 0.22.3
 POPPLER_SITE = http://poppler.freedesktop.org
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index 9193553081..180972a293 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # popt
 #
-#############################################################
+################################################################################
 
 POPT_VERSION = 1.16
 # rpm5.org down
diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk
index 639a72e116..a43fc1fc8e 100644
--- a/package/portmap/portmap.mk
+++ b/package/portmap/portmap.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # portmap
 #
-#############################################################
+################################################################################
 
 PORTMAP_VERSION = 6.0
 PORTMAP_SOURCE = portmap-$(PORTMAP_VERSION).tgz
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index b13dbabab2..b2ced29739 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pppd
 #
-#############################################################
+################################################################################
 
 PPPD_VERSION = 2.4.5
 PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index ef25c9a675..ee0fab6cfe 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pptp-linux
 #
-#############################################################
+################################################################################
 
 PPTP_LINUX_VERSION = 1.7.2
 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
index 027e982661..1da08ceb98 100644
--- a/package/prboom/prboom.mk
+++ b/package/prboom/prboom.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # prboom
 #
-#############################################################
+################################################################################
 
 PRBOOM_VERSION = 2.5.0
 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION)
diff --git a/package/procps/procps.mk b/package/procps/procps.mk
index 189da1fc82..dc2b8413b6 100644
--- a/package/procps/procps.mk
+++ b/package/procps/procps.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # procps
 #
-#############################################################
+################################################################################
 
 PROCPS_VERSION = 3.2.8
 PROCPS_SITE = http://procps.sourceforge.net/
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 92644a80ae..a8d0e59cf5 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # proftpd
 #
-#############################################################
+################################################################################
 
 PROFTPD_VERSION = 1.3.3g
 PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2
diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk
index eb0047af96..31fb5932ba 100644
--- a/package/protobuf-c/protobuf-c.mk
+++ b/package/protobuf-c/protobuf-c.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # protobuf-c
 #
-#############################################################
+################################################################################
 
 PROTOBUF_C_VERSION = 0.15
 PROTOBUF_C_SITE = http://protobuf-c.googlecode.com/files
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index 519e568bf6..278ed29ba6 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # protobuf
 #
-#############################################################
+################################################################################
 
 PROTOBUF_VERSION = 2.4.1
 PROTOBUF_SOURCE = protobuf-$(PROTOBUF_VERSION).tar.gz
diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk
index 2020e3f9ec..cc3e3575e8 100644
--- a/package/proxychains-ng/proxychains-ng.mk
+++ b/package/proxychains-ng/proxychains-ng.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # proxychains-ng
 #
-#############################################################
+################################################################################
 
 PROXYCHAINS_NG_VERSION = 4.4
 PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index f251c17310..1340ee6a03 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # psmisc
 #
-#############################################################
+################################################################################
 
 PSMISC_VERSION = 22.20
 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
diff --git a/package/ptpd/ptpd.mk b/package/ptpd/ptpd.mk
index 481a64eef0..ac9ab985ca 100644
--- a/package/ptpd/ptpd.mk
+++ b/package/ptpd/ptpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ptpd
 #
-#############################################################
+################################################################################
 
 PTPD_VERSION = 1.1.0
 PTPD_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD_VERSION)
diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk
index 04a0070dc7..0428c80fd8 100644
--- a/package/ptpd2/ptpd2.mk
+++ b/package/ptpd2/ptpd2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ptpd2
 #
-#############################################################
+################################################################################
 
 PTPD2_VERSION = 2.2.2
 PTPD2_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD2_VERSION)
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index a47d8d338a..1aa95f6b6b 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -1,8 +1,8 @@
-#######################
+################################################################################
 #
 # pv
 #
-#######################
+################################################################################
 
 PV_VERSION = 1.2.0
 PV_SOURCE = pv-$(PV_VERSION).tar.bz2
diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk
index 9df359f107..db71512ec4 100644
--- a/package/python-bottle/python-bottle.mk
+++ b/package/python-bottle/python-bottle.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-bottle
 #
-#############################################################
+################################################################################
 
 PYTHON_BOTTLE_VERSION = 0.11.6
 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz
diff --git a/package/python-distutilscross/python-distutilscross.mk b/package/python-distutilscross/python-distutilscross.mk
index ab6c0be72e..df12f97f22 100644
--- a/package/python-distutilscross/python-distutilscross.mk
+++ b/package/python-distutilscross/python-distutilscross.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-distutilscross
 #
-#############################################################
+################################################################################
 
 PYTHON_DISTUTILSCROSS_VERSION = 0.1
 PYTHON_DISTUTILSCROSS_SOURCE  = distutilscross-$(PYTHON_DISTUTILSCROSS_VERSION).tar.gz
diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk
index 7312a78321..7518ee0cc4 100644
--- a/package/python-dpkt/python-dpkt.mk
+++ b/package/python-dpkt/python-dpkt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-dpkt
 #
-#############################################################
+################################################################################
 
 PYTHON_DPKT_VERSION = 1.7
 PYTHON_DPKT_SOURCE  = dpkt-$(PYTHON_DPKT_VERSION).tar.gz
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
index c6420722fd..9328a0f40a 100644
--- a/package/python-id3/python-id3.mk
+++ b/package/python-id3/python-id3.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-id3
 #
-#############################################################
+################################################################################
 
 PYTHON_ID3_VERSION = 1.2
 PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk
index 2429b24208..1c0efbdbb4 100644
--- a/package/python-m2crypto/python-m2crypto.mk
+++ b/package/python-m2crypto/python-m2crypto.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-m2crypto
 #
-#############################################################
+################################################################################
 
 PYTHON_M2CRYPTO_VERSION = 0.21.1
 PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto
diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk
index 6ce6cf82e7..eaa1fae6e3 100644
--- a/package/python-mad/python-mad.mk
+++ b/package/python-mad/python-mad.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-mad
 #
-#############################################################
+################################################################################
 
 PYTHON_MAD_VERSION = 0.6
 PYTHON_MAD_SOURCE  = pymad-$(PYTHON_MAD_VERSION).tar.gz
diff --git a/package/python-meld3/python-meld3.mk b/package/python-meld3/python-meld3.mk
index de83b28504..27da9c8358 100644
--- a/package/python-meld3/python-meld3.mk
+++ b/package/python-meld3/python-meld3.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-meld3
 #
-#############################################################
+################################################################################
 
 PYTHON_MELD3_VERSION = 0.6.8
 PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index d742cbde98..1570fd1c48 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-netifaces
 #
-#############################################################
+################################################################################
 
 PYTHON_NETIFACES_VERSION = 0.7
 PYTHON_NETIFACES_SOURCE  = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk
index 32c0a27de0..63a502b179 100644
--- a/package/python-nfc/python-nfc.mk
+++ b/package/python-nfc/python-nfc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-nfc
 #
-#############################################################
+################################################################################
 
 PYTHON_NFC_VERSION = 142
 PYTHON_NFC_SITE = https://launchpad.net/nfcpy
diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
index d853deee47..dcf67c25ce 100644
--- a/package/python-protobuf/python-protobuf.mk
+++ b/package/python-protobuf/python-protobuf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-protobuf
 #
-#############################################################
+################################################################################
 
 PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
 PYTHON_PROTOBUF_SOURCE  = $(PROTOBUF_SOURCE)
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index 61af1af25c..4a87db73ea 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # pygame
 #
-#############################################################
+################################################################################
 
 # stable 1.9.1 release requires V4L which has been wiped out of recent Linux
 # kernels, so use latest mercurial revision until next stable release is out.
diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk
index 246df4db0a..7814ce3392 100644
--- a/package/python-pyparsing/python-pyparsing.mk
+++ b/package/python-pyparsing/python-pyparsing.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-pyparsing
 #
-#############################################################
+################################################################################
 
 PYTHON_PYPARSING_VERSION         = 1.5.6
 PYTHON_PYPARSING_SOURCE          = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index 4bfc355cb2..e00577ba1b 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-serial
 #
-#############################################################
+################################################################################
 
 PYTHON_SERIAL_VERSION = 2.6
 PYTHON_SERIAL_SOURCE  = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 1ff9f897bf..cd5ee4d043 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-setuptools
 #
-#############################################################
+################################################################################
 
 # "distribute" is a fork of the unmaintained setuptools package. There
 # are plans to re-merge it into setuptools; if this happens, we can
diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk
index c2fc752642..4cd35e5c08 100644
--- a/package/python-thrift/python-thrift.mk
+++ b/package/python-thrift/python-thrift.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-thrift
 #
-#############################################################
+################################################################################
 
 PYTHON_THRIFT_VERSION = 0.9.0
 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz
diff --git a/package/python/python.mk b/package/python/python.mk
index 6e95451453..363513dc3e 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python
 #
-#############################################################
+################################################################################
 
 PYTHON_VERSION_MAJOR = 2.7
 PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).3
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index f44ba130c0..11ffe61b84 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python3
 #
-#############################################################
+################################################################################
 
 PYTHON3_VERSION_MAJOR = 3.3
 PYTHON3_VERSION       = $(PYTHON3_VERSION_MAJOR).0
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 806ffd88da..f177fd5ae6 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qemu
 #
-#############################################################
+################################################################################
 
 QEMU_VERSION = 1.3.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index efbfae729b..373cd690c3 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qextserialport
 #
-#############################################################
+################################################################################
 
 QEXTSERIALPORT_VERSION     = 6c47244de4ce6db
 QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git/
diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk
index d203cd579e..29b8c31aac 100644
--- a/package/qjson/qjson.mk
+++ b/package/qjson/qjson.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qjson
 #
-#############################################################
+################################################################################
 
 QJSON_VERSION = 0.8.1
 
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 93d2ed0451..71b9e4ce97 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -1,4 +1,4 @@
-######################################################################
+################################################################################
 #
 # Qt Embedded for Linux
 #
@@ -9,7 +9,7 @@
 # the kernels FPU emulation so it's better to choose soft float in the
 # buildroot config (and uClibc.config of course, if you have your own.)
 #
-######################################################################
+################################################################################
 
 QT_VERSION = 4.8.4
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index cfa06ea1ec..1686dad69a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5base
 #
-#############################################################
+################################################################################
 
 QT5BASE_VERSION = $(QT5_VERSION)
 QT5BASE_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index e4dd74283d..83810ada2d 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5declarative
 #
-#############################################################
+################################################################################
 
 QT5DECLARATIVE_VERSION = $(QT5_VERSION)
 QT5DECLARATIVE_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 93aef534cb..fc9a2ecb26 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5graphicaleffects
 #
-#############################################################
+################################################################################
 
 QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION)
 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 77dfa8fefb..8aa412da42 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5imageformats
 #
-#############################################################
+################################################################################
 
 QT5IMAGEFORMATS_VERSION = $(QT5_VERSION)
 QT5IMAGEFORMATS_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
index 3c3c2c28c6..9134579979 100644
--- a/package/qt5/qt5jsbackend/qt5jsbackend.mk
+++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5jsbackend
 #
-#############################################################
+################################################################################
 
 QT5JSBACKEND_VERSION = $(QT5_VERSION)
 QT5JSBACKEND_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index b08a9ab7a3..8f62274f35 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5multimedia
 #
-#############################################################
+################################################################################
 
 QT5MULTIMEDIA_VERSION = $(QT5_VERSION)
 QT5MULTIMEDIA_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 371eb621f2..0b7f9eab7f 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5quick1
 #
-#############################################################
+################################################################################
 
 QT5QUICK1_VERSION = $(QT5_VERSION)
 QT5QUICK1_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index a090fda430..8687f49a71 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5script
 #
-#############################################################
+################################################################################
 
 QT5SCRIPT_VERSION = $(QT5_VERSION)
 QT5SCRIPT_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index fdcbfde30d..8a31ac8341 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5svg
 #
-#############################################################
+################################################################################
 
 QT5SVG_VERSION = $(QT5_VERSION)
 QT5SVG_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 7366a30d2e..b51f5c5eed 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5webkit
 #
-#############################################################
+################################################################################
 
 QT5WEBKIT_VERSION = $(QT5_VERSION)
 QT5WEBKIT_SITE = $(QT5_SITE)
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 7e2d671ff3..f92f853a98 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qt5xmlpatterns
 #
-#############################################################
+################################################################################
 
 QT5XMLPATTERNS_VERSION = $(QT5_VERSION)
 QT5XMLPATTERNS_SITE = $(QT5_SITE)
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
index 38644dded6..b2c93068e0 100644
--- a/package/qtuio/qtuio.mk
+++ b/package/qtuio/qtuio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qtuio
 #
-#############################################################
+################################################################################
 
 QTUIO_VERSION = abe4973ff6
 QTUIO_SITE = git://github.com/x29a/qTUIO.git
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 25e17e3838..56b3dcb07a 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # quagga
 #
-#############################################################
+################################################################################
 
 QUAGGA_VERSION = 0.99.22.1
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 3087940157..7bec9a28c9 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # quota
 #
-#############################################################
+################################################################################
 
 QUOTA_VERSION = 4.00
 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index e35833d54d..aa5ec9bea9 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # qwt
 #
-#############################################################
+################################################################################
 
 QWT_VERSION = 6.0.2
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 6c39fe2751..aed6f0105a 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # radvd
 #
-#############################################################
+################################################################################
 
 RADVD_VERSION = 1.9.3
 RADVD_SITE = http://www.litech.org/radvd/dist
diff --git a/package/ramspeed/ramspeed.mk b/package/ramspeed/ramspeed.mk
index d19571cab1..f87f8bc237 100644
--- a/package/ramspeed/ramspeed.mk
+++ b/package/ramspeed/ramspeed.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ramspeed
 #
-#############################################################
+################################################################################
 
 RAMSPEED_VERSION = 2.6.0
 RAMSPEED_SITE = http://www.alasir.com/software/ramspeed
diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk
index cc260e9863..6fc1dd3cab 100644
--- a/package/rapidjson/rapidjson.mk
+++ b/package/rapidjson/rapidjson.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rapidjson
 #
-#############################################################
+################################################################################
 
 RAPIDJSON_VERSION = 0.11
 RAPIDJSON_SOURCE = rapidjson-$(RAPIDJSON_VERSION).zip
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index b39b29beac..fa7359c5cc 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rdesktop
 #
-#############################################################
+################################################################################
 
 RDESKTOP_VERSION = 1.5.0
 RDESKTOP_SOURCE = rdesktop-$(RDESKTOP_VERSION).tar.gz
diff --git a/package/read-edid/read-edid.mk b/package/read-edid/read-edid.mk
index 371801eefa..02d80d0fdd 100644
--- a/package/read-edid/read-edid.mk
+++ b/package/read-edid/read-edid.mk
@@ -1,8 +1,8 @@
-############################################
+################################################################################
 #
 # read-edid
 #
-############################################
+################################################################################
 
 READ_EDID_VERSION = 1.4.2
 READ_EDID_SITE = http://www.polypux.org/projects/read-edid/
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 4de1476f42..0c883bcf92 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # readline
 #
-#############################################################
+################################################################################
 
 READLINE_VERSION = 6.2
 READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
diff --git a/package/redis/redis.mk b/package/redis/redis.mk
index fc7d23fec0..8b4e900f07 100644
--- a/package/redis/redis.mk
+++ b/package/redis/redis.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # redis
 #
-#############################################################
+################################################################################
 
 REDIS_VERSION = 2.6.11
 REDIS_SITE = http://redis.googlecode.com/files
diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index e2a2bd7415..610ded0343 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rings
 #
-#############################################################
+################################################################################
 
 RINGS_VERSION = 1.2.3
 RINGS_SITE = http://github.com/downloads/keplerproject/rings
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index e997b151c0..ae0bf14ed2 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rng-tools
 #
-#############################################################
+################################################################################
 
 RNG_TOOLS_VERSION = 4
 RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION)
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index 106d3106a3..ff57dc6654 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rp-pppoe
 #
-#############################################################
+################################################################################
 
 RP_PPPOE_VERSION = 3.11
 RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
index 382e53bf9e..19bdace87f 100644
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rpcbind
 #
-#############################################################
+################################################################################
 
 RPCBIND_VERSION = 0.2.0
 RPCBIND_SITE    = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index dcda6b0d6e..11dffe61cd 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rpi-firmware
 #
-#############################################################
+################################################################################
 
 RPI_FIRMWARE_VERSION = 76d0ac38f16b6343c6155c80db1e4758b3a5838a
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/master
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 6198671d0a..cdf0bf97e0 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rpi-userland
 #
-#############################################################
+################################################################################
 
 RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 0c408004e4..32a949f29f 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rpm
 #
-#############################################################
+################################################################################
 
 RPM_VERSION = 5.2.0
 RPM_SITE = http://rpm5.org/files/rpm/rpm-5.2/
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index d3b63ea8a9..354cff65c4 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rrdtool
 #
-#############################################################
+################################################################################
 
 RRDTOOL_VERSION = 1.2.30
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
diff --git a/package/rsh-redone/rsh-redone.mk b/package/rsh-redone/rsh-redone.mk
index 55966f33ed..4a7469f970 100644
--- a/package/rsh-redone/rsh-redone.mk
+++ b/package/rsh-redone/rsh-redone.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rsh-redone
 #
-#############################################################
+################################################################################
 
 RSH_REDONE_VERSION = 85
 RSH_REDONE_SOURCE = rsh-redone_$(RSH_REDONE_VERSION).orig.tar.gz
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 3963547db2..94c2e75c6b 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rsync
 #
-#############################################################
+################################################################################
 
 RSYNC_VERSION = 3.0.9
 RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 2d3c27f289..daae0109f3 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rsyslog
 #
-#############################################################
+################################################################################
 
 RSYSLOG_VERSION = 5.8.0
 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog/
diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
index c9cf8ff1c8..77f0e858f6 100644
--- a/package/rtorrent/rtorrent.mk
+++ b/package/rtorrent/rtorrent.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rtorrent
 #
-#############################################################
+################################################################################
 
 RTORRENT_VERSION = 0.9.3
 RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
index 773e0bc26f..1e10c64036 100644
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rubix
 #
-#############################################################
+################################################################################
 
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 692e2652a2..e708262b36 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ruby
 #
-#############################################################
+################################################################################
 
 RUBY_VERSION = 1.9.3-p392
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index dba653edf7..e425503f8f 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sam-ba
 #
-#############################################################
+################################################################################
 
 SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents/
 SAM_BA_VERSION = 2.12
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 55fc94dc94..528e29c81a 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # samba
 #
-#############################################################
+################################################################################
 
 SAMBA_VERSION = 3.6.15
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 334cf9534e..96a6100cfd 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sane-backends
 #
-#############################################################
+################################################################################
 
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index e6439d52c5..d807bb48fa 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sawman
 #
-#############################################################
+################################################################################
 
 SAWMAN_VERSION = 1.6.3
 SAWMAN_SOURCE = SaWMan-$(SAWMAN_VERSION).tar.gz
diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
index 7309b47f8e..730bd06ea3 100644
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # schifra
 #
-#############################################################
+################################################################################
 
 SCHIFRA_VERSION = 0.0.1
 SCHIFRA_SITE = http://www.schifra.com/downloads
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 565d46782e..ff6eada2c4 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sconeserver
 #
-#############################################################
+################################################################################
 
 # Release 0.6.0 doesn't build cleanly, so use a recent
 # Subversion trunk snapshot.
diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index dd8a732b2e..9fd04c7948 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # screen
 #
-#############################################################
+################################################################################
 
 SCREEN_VERSION = 4.0.3
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index fc60de68f3..76cc413a00 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # SDL
 #
-#############################################################
+################################################################################
 
 SDL_VERSION = 1.2.15
 SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index 8acc5c5e53..04f1d8b708 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # SDL_gfx addon for SDL
 #
-#############################################################
+################################################################################
 
 SDL_GFX_VERSION = 2.0.23
 SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 46d56791b9..de72a04841 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # SDL_image addon for SDL
 #
-#############################################################
+################################################################################
 
 SDL_IMAGE_VERSION = 1.2.6
 SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index a062c35cc1..73743eb85f 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # SDL_mixer
 #
-#############################################################
+################################################################################
 
 SDL_MIXER_VERSION = 1.2.12
 SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index 85a5ccb5cf..de1dc5986a 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # SDL_net: network addon for SDL
 #
-#############################################################
+################################################################################
 
 SDL_NET_VERSION = 1.2.8
 SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index e20a888088..ae449aea51 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sdl_sound addon for SDL
 #
-#############################################################
+################################################################################
 
 SDL_SOUND_VERSION = 1.0.3
 SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index e9bc537187..1310287301 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # SDL_ttf
 #
-#############################################################
+################################################################################
 
 SDL_TTF_VERSION = 2.0.11
 SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 5535754967..9f17ad3806 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sed
 #
-#############################################################
+################################################################################
 
 SED_VERSION = 4.2.2
 SED_SITE = $(BR2_GNU_MIRROR)/sed
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 378dc068b4..588571c691 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ser2net
 #
-#############################################################
+################################################################################
 
 SER2NET_VERSION = 2.8
 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index 215b5ee44d..e6846b20ce 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # setserial
 #
-#############################################################
+################################################################################
 
 SETSERIAL_VERSION            = 2.17
 SETSERIAL_PATCH              = setserial_2.17-45.2.diff.gz
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
index 9015b2aab3..42ed2e0ff2 100644
--- a/package/sg3_utils/sg3_utils.mk
+++ b/package/sg3_utils/sg3_utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sg3_utils
 #
-#############################################################
+################################################################################
 
 SG3_UTILS_VERSION = 1.34
 SG3_UTILS_SITE    = http://sg.danny.cz/sg/p/
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 1f32e51dd4..d147bb70a7 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # shared-mime-info
 #
-#############################################################
+################################################################################
 
 SHARED_MIME_INFO_VERSION = 0.90
 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index bd4815ab46..2fb9692bb7 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # slang
 #
-#############################################################
+################################################################################
 
 SLANG_VERSION = 1.4.5
 SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index 5b608e0a7f..9ed3424d62 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # spice-slirp
 #
-#############################################################
+################################################################################
 
 # There's no tarball releases of slirp, so we use the git repo
 # Also, there's no tag, so we use a random SHA1 (master's HEAD
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index 850001a365..fb9fb3cde0 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # smartmontools
 #
-#############################################################
+################################################################################
 
 SMARTMONTOOLS_VERSION = 6.1
 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk
index 2704b9764f..d8ec2390b9 100644
--- a/package/snappy/snappy.mk
+++ b/package/snappy/snappy.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # snappy
 #
-#############################################################
+################################################################################
 
 SNAPPY_VERSION		= 1.1.0
 SNAPPY_SITE		= http://snappy.googlecode.com/files/
diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.mk b/package/snowball-hdmiservice/snowball-hdmiservice.mk
index ceeecd693e..d7bfd5a7fe 100644
--- a/package/snowball-hdmiservice/snowball-hdmiservice.mk
+++ b/package/snowball-hdmiservice/snowball-hdmiservice.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # snowball-hdmiservice
 #
-#############################################################
+################################################################################
 
 SNOWBALL_HDMISERVICE_VERSION = f75c99d1c52707240a78b4ba78e41d20d3aa3b08
 SNOWBALL_HDMISERVICE_SITE = git://igloocommunity.org/git/bsp/hdmiservice.git
diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk
index d664b06deb..7cc204857f 100644
--- a/package/snowball-init/snowball-init.mk
+++ b/package/snowball-init/snowball-init.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # snowball-init
 #
-#############################################################
+################################################################################
 
 SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7
 SNOWBALL_INIT_SITE = git://igloocommunity.org/git/bsp/snowball-init.git
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index f10a83688e..8ba399b2e4 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # socat
 #
-#############################################################
+################################################################################
 
 SOCAT_VERSION = 2.0.0-b5
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index 1771388acd..5c10115cc5 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # socketcand
 #
-#############################################################
+################################################################################
 
 SOCKETCAND_VERSION = 7d06986
 SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/master
diff --git a/package/sound-theme-borealis/sound-theme-borealis.mk b/package/sound-theme-borealis/sound-theme-borealis.mk
index 8983bdf22b..7cde12dd5c 100644
--- a/package/sound-theme-borealis/sound-theme-borealis.mk
+++ b/package/sound-theme-borealis/sound-theme-borealis.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sound-theme-borealis
 #
-#############################################################
+################################################################################
 
 SOUND_THEME_BOREALIS_VERSION = 0.9a
 SOUND_THEME_BOREALIS_SITE = http://ico.bukvic.net/Linux/Borealis_soundtheme
diff --git a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
index ae30fe7133..ea4c8536c7 100644
--- a/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
+++ b/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sound-theme-freedesktop
 #
-#############################################################
+################################################################################
 
 SOUND_THEME_FREEDESKTOP_VERSION = 0.7
 SOUND_THEME_FREEDESKTOP_SITE = \
diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index 7c234217f0..670daf7625 100644
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # spawn-fcgi
 #
-#############################################################
+################################################################################
 
 SPAWN_FCGI_VERSION = 1.6.3
 SPAWN_FCGI_SITE = http://www.lighttpd.net/download
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index 28f2797e68..6eb7e90dbb 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # speex
 #
-#############################################################
+################################################################################
 
 SPEEX_VERSION = 1.2rc1
 SPEEX_SITE = http://downloads.us.xiph.org/releases/speex
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
index 0404377724..62a028de8d 100644
--- a/package/spice-protocol/spice-protocol.mk
+++ b/package/spice-protocol/spice-protocol.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # spice-protocol
 #
-#############################################################
+################################################################################
 
 SPICE_PROTOCOL_VERSION         = 0.12.2
 SPICE_PROTOCOL_SOURCE          = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 291386acb2..a016da6dd9 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # spice
 #
-#############################################################
+################################################################################
 
 SPICE_VERSION         = 0.12.0
 SPICE_SOURCE          = spice-$(SPICE_VERSION).tar.bz2
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 033cd33453..0b2581b407 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sqlcipher
 #
-#############################################################
+################################################################################
 
 SQLCIPHER_VERSION = 1.1.9
 SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 39a39d0c54..d474619def 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sqlite
 #
-#############################################################
+################################################################################
 
 SQLITE_VERSION = 3071700
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 45a0b2ceaa..934277e781 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # squid
 #
-#############################################################
+################################################################################
 
 SQUID_VERSION = 3.3.4
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
diff --git a/package/sredird/sredird.mk b/package/sredird/sredird.mk
index 4e2c48111a..b9c90d6cc3 100644
--- a/package/sredird/sredird.mk
+++ b/package/sredird/sredird.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sredird
 #
-#############################################################
+################################################################################
 
 SREDIRD_VERSION = 2.2.1-1.1
 SREDIRD_SOURCE = sredird_$(SREDIRD_VERSION).tar.gz
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index f3c86cf570..de9b094db9 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sshfs
 #
-#############################################################
+################################################################################
 
 SSHFS_VERSION = 2.4
 SSHFS_SITE = http://downloads.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION)
diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
index e078b2cd71..be8c563f0a 100644
--- a/package/sstrip/sstrip.mk
+++ b/package/sstrip/sstrip.mk
@@ -1,8 +1,8 @@
-############################################################
+################################################################################
 #
 # sstrip
 #
-############################################################
+################################################################################
 
 SSTRIP_SITE = svn://dev.openwrt.org/openwrt/trunk/tools/sstrip
 SSTRIP_VERSION = 20154
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index 50a5dd6711..1ce607f5d2 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # startup-notification
 #
-#############################################################
+################################################################################
 
 STARTUP_NOTIFICATION_VERSION = 0.9
 STARTUP_NOTIFICATION_SOURCE = startup-notification-$(STARTUP_NOTIFICATION_VERSION).tar.gz
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
index bacd0f023d..22dc8c6610 100644
--- a/package/statserial/statserial.mk
+++ b/package/statserial/statserial.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # statserial
 #
-#############################################################
+################################################################################
 
 STATSERIAL_VERSION = 1.1
 STATSERIAL_SOURCE = statserial-$(STATSERIAL_VERSION).tar.gz
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 349dc2c418..b172a2005b 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # strace
 #
-#############################################################
+################################################################################
 
 STRACE_VERSION = 4.7
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index fb6835c7e6..df9065aaaa 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # stress
 #
-#############################################################
+################################################################################
 
 STRESS_VERSION = 1.0.4
 STRESS_SITE    = http://weather.ou.edu/~apw/projects/stress
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 92344d116f..bfe96c3112 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # stunnel
 #
-#############################################################
+################################################################################
 
 STUNNEL_VERSION = 4.55
 STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 5fd3c61a29..661d858b11 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sudo
 #
-#############################################################
+################################################################################
 
 SUDO_VERSION = 1.8.6p7
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk
index 38fc3e1fbe..8ad99cb6da 100644
--- a/package/sunxi-boards/sunxi-boards.mk
+++ b/package/sunxi-boards/sunxi-boards.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sunxi-boards
 #
-#############################################################
+################################################################################
 
 SUNXI_BOARDS_VERSION = 88d663db44f65b73ef65c4148a28c6fa3665d2b6
 SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/master
diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk
index a97dfcbb0a..8f1ae28542 100644
--- a/package/sunxi-tools/sunxi-tools.mk
+++ b/package/sunxi-tools/sunxi-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sunxi-tools
 #
-#############################################################
+################################################################################
 
 SUNXI_TOOLS_VERSION = 3a94e721dd8d1e13d0b25da0a83463891e8e9ee0
 SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/master
diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk
index 26afff35f0..edd2efde29 100644
--- a/package/supervisor/supervisor.mk
+++ b/package/supervisor/supervisor.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-supervisor
 #
-#############################################################
+################################################################################
 
 SUPERVISOR_VERSION = 3.0a12
 SUPERVISOR_SOURCE = supervisor-$(SUPERVISOR_VERSION).tar.gz
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 6aaf9698ff..4cc883c22b 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # swig
 #
-#############################################################
+################################################################################
 
 SWIG_VERSION = 2.0.9
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 1da63de71b..cc79eebadc 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sylpheed
 #
-#############################################################
+################################################################################
 
 SYLPHEED_VERSION_MAJOR = 3.2
 SYLPHEED_VERSION_MINOR = 0
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index 240f83cdbf..c6119b504b 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # synergy
 #
-#############################################################
+################################################################################
 
 SYNERGY_VERSION = 1.3.1
 SYNERGY_SOURCE = synergy-$(SYNERGY_VERSION).tar.gz
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index b2497f525b..8ffdc0f774 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sysklogd
 #
-#############################################################
+################################################################################
 
 SYSKLOGD_VERSION = 1.5
 SYSKLOGD_SOURCE  = sysklogd_$(SYSKLOGD_VERSION).orig.tar.gz
diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk
index 03355d83e8..f288aaf7cc 100644
--- a/package/sysprof/sysprof.mk
+++ b/package/sysprof/sysprof.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sysprof
 #
-#############################################################
+################################################################################
 
 SYSPROF_VERSION = 1.1.8
 SYSPROF_SITE = http://sysprof.com
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index d211f9c89b..73e20d3aa1 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sysstat
 #
-#############################################################
+################################################################################
 
 SYSSTAT_VERSION = 10.0.3
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 8152f68514..1bb429cf05 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # systemd
 #
-#############################################################
+################################################################################
 
 SYSTEMD_VERSION = 44
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index ab42251273..bf05d73b01 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # sysvinit
 #
-#############################################################
+################################################################################
 
 SYSVINIT_VERSION = 2.88
 SYSVINIT_SOURCE  = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index e1e16947f8..82602933c9 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # taglib
 #
-#############################################################
+################################################################################
 
 TAGLIB_VERSION = 1.8
 TAGLIB_SITE = http://github.com/downloads/taglib/taglib
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index e465bfad9f..3ffeaf083f 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tar
 #
-#############################################################
+################################################################################
 
 TAR_VERSION = 1.26
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index c4a1c3da00..0c8fa339c5 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tcl8.4
 #
-#############################################################
+################################################################################
 
 TCL_VERSION_MAJOR = 8.4
 TCL_VERSION_MINOR = 19
diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk
index a91af27c66..f2aca364db 100644
--- a/package/tcllib/tcllib.mk
+++ b/package/tcllib/tcllib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tcllib
 #
-#############################################################
+################################################################################
 
 TCLLIB_VERSION       = 1.13
 TCLLIB_SOURCE        = tcllib-$(TCLLIB_VERSION).tar.bz2
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 7ca3770654..6b95ba708b 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tcpdump
 #
-#############################################################
+################################################################################
 
 TCPDUMP_VERSION = 4.3.0
 TCPDUMP_SITE = http://www.tcpdump.org/release
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 2662a7d89b..f74b9f459a 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tcpreplay
 #
-#############################################################
+################################################################################
 
 TCPREPLAY_VERSION = 3.4.3
 TCPREPLAY_SITE = http://downloads.sourceforge.net/project/tcpreplay/tcpreplay/$(TCPREPLAY_VERSION)
diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk
index 54d18b68ab..7064e12c1f 100644
--- a/package/texinfo/texinfo.mk
+++ b/package/texinfo/texinfo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # texinfo
 #
-#############################################################
+################################################################################
 
 # We are intentionally not using the latest version 5.x, because it
 # causes issues with the documentation building process when creating
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 537dfb12e2..145d9fdb9b 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tftpd
 #
-#############################################################
+################################################################################
 
 TFTPD_VERSION  = 5.2
 TFTPD_SOURCE   = tftp-hpa-$(TFTPD_VERSION).tar.bz2
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index 9bf68bd463..7431cbc022 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # thttpd
 #
-#############################################################
+################################################################################
 
 THTTPD_VERSION = 2.25b
 THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index 956daf4577..d739f3c917 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ti-utils
 #
-#############################################################
+################################################################################
 
 TI_UTILS_VERSION = 06dbdb2
 TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/master
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index bcc55bea78..8d2e087b41 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tiff
 #
-#############################################################
+################################################################################
 
 TIFF_VERSION = 4.0.3
 TIFF_SITE = http://download.osgeo.org/libtiff
diff --git a/package/time/time.mk b/package/time/time.mk
index 7b53286def..b7ee40c6ad 100644
--- a/package/time/time.mk
+++ b/package/time/time.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # time
 #
-#############################################################
+################################################################################
 
 TIME_VERSION = 1.7
 TIME_SITE = $(BR2_GNU_MIRROR)/time
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index ed4670dec7..05546ab104 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tinyhttpd
 #
-#############################################################
+################################################################################
 
 TINYHTTPD_VERSION = 0.1.0
 TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION)
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 7b16eb1448..4890f35d35 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tn5250
 #
-#############################################################
+################################################################################
 
 TN5250_VERSION = 0.17.4
 TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index c2388d4f38..505ae096bd 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # torsmo
 #
-#############################################################
+################################################################################
 
 TORSMO_VERSION = 0.18
 TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 6187360d91..5661c78472 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # transmission
 #
-#############################################################
+################################################################################
 
 TRANSMISSION_VERSION = 2.33
 TRANSMISSION_SITE = http://download.transmissionbt.com/files/
diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index cb12ba03ce..c0ce5efc51 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -1,8 +1,8 @@
-############################################################
+################################################################################
 #
 # Tremor
 #
-############################################################
+################################################################################
 
 TREMOR_SITE = http://svn.xiph.org/trunk/Tremor/
 TREMOR_SITE_METHOD = svn
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 6d1abcba98..575626a13e 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tslib
 #
-#############################################################
+################################################################################
 
 TSLIB_VERSION = 158ee49b32f83cb7b02d5315f41c2e4cff38942d
 TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index 52e3fdf745..b65949de56 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ttcp
 #
-#############################################################
+################################################################################
 
 #
 TTCP_VERSION =
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 5ddcd75cf7..81cb062a24 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tvheadend
 #
-##############################################################
+################################################################################
 
 TVHEADEND_VERSION           = 5513b44
 TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
index 04d9b27690..4a9affe022 100644
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tzdata
 #
-#############################################################
+################################################################################
 
 TZDATA_VERSION = 2012j
 TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 76e727c507..ceda3c5460 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # uboot-tools
 #
-#############################################################
+################################################################################
 
 UBOOT_TOOLS_VERSION = 2013.04
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 1c97288d3d..69f011fc80 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # udev
 #
-#############################################################
+################################################################################
 
 UDEV_VERSION = 182
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index 844dfcd5d2..5d3368d422 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # udisks
 #
-#############################################################
+################################################################################
 
 UDISKS_VERSION = 1.0.4
 UDISKS_SITE    = http://hal.freedesktop.org/releases/
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index a6a2b8766e..e391cf9361 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # udpcast
 #
-#############################################################
+################################################################################
 
 UDPCAST_VERSION = 20120424
 UDPCAST_SOURCE = udpcast-$(UDPCAST_VERSION).tar.gz
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 0cbcc0b664..94520621db 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # uemacs
 #
-#############################################################
+################################################################################
 
 UEMACS_VERSION = 4.0.15-lt
 UEMACS_SOURCE = em-$(UEMACS_VERSION).tar.bz2
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
index 9425ac59d0..11780ace4c 100644
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ulogd
 #
-#############################################################
+################################################################################
 
 ULOGD_VERSION = 2.0.2
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index 89729fe9d1..e5c5993b3e 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # unionfs
 #
-#############################################################
+################################################################################
 
 UNIONFS_VERSION = 0.26
 UNIONFS_SITE = http://podgorny.cz/unionfs-fuse/releases
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index 18326f4fce..e16393a5f9 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # urg
 #
-#############################################################
+################################################################################
 
 URG_VERSION = 0.8.18
 URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 653109dbea..92ca163da7 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # usb_modeswitch
 #
-#############################################################
+################################################################################
 
 USB_MODESWITCH_VERSION = 1.2.5
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
index 479137ca4a..cb9754fa15 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # usb_modeswitch_data
 #
-#############################################################
+################################################################################
 
 USB_MODESWITCH_DATA_VERSION = 20121109
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 821b77e15e..69262a640f 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # usbmount
 #
-#############################################################
+################################################################################
 
 USBMOUNT_VERSION = 0.0.22
 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
index efdb1be1ad..ad593a4d92 100644
--- a/package/usbredir/usbredir.mk
+++ b/package/usbredir/usbredir.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # usbredir
 #
-#############################################################
+################################################################################
 
 USBREDIR_VERSION         = 0.6
 USBREDIR_SOURCE          = usbredir-$(USBREDIR_VERSION).tar.bz2
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 05573ed727..e679b26abb 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # usbutils
 #
-#############################################################
+################################################################################
 
 USBUTILS_VERSION = 006
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 8f690fcefd..5cdc931251 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ushare
 #
-#############################################################
+################################################################################
 
 USHARE_VERSION = 1.1a
 USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
index c1095542cb..c3d11f97bf 100644
--- a/package/ussp-push/ussp-push.mk
+++ b/package/ussp-push/ussp-push.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ussp-push
 #
-#############################################################
+################################################################################
 
 USSP_PUSH_VERSION = 0.11
 USSP_PUSH_SITE = http://www.xmailserver.org
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index b562206488..d8a4e6f3f0 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # util-linux
 #
-#############################################################
+################################################################################
 
 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
 UTIL_LINUX_VERSION_MAJOR = 2.22
diff --git a/package/ux500-firmware/ux500-firmware.mk b/package/ux500-firmware/ux500-firmware.mk
index 543698ac2c..14b4a8e190 100644
--- a/package/ux500-firmware/ux500-firmware.mk
+++ b/package/ux500-firmware/ux500-firmware.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ux500-firmware
 #
-#############################################################
+################################################################################
 
 UX500_FIRMWARE_VERSION = 1.1.3-6
 UX500_FIRMWARE_SOURCE = ux500-firmware_$(UX500_FIRMWARE_VERSION)linaro1.tar.gz
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 8cf616fccd..aed02fa4a4 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vala
 #
-#############################################################
+################################################################################
 
 VALA_VERSION_MAJOR = 0.18
 VALA_VERSION_MINOR = 1
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index ff35e6c8e4..f40784e1f2 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # valgrind
 #
-#############################################################
+################################################################################
 
 VALGRIND_VERSION = 3.8.1
 VALGRIND_SITE    = http://valgrind.org/downloads/
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
index cb85f57dea..1b1ecd554c 100644
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vde2
 #
-#############################################################
+################################################################################
 
 VDE2_VERSION         = 2.3.2
 VDE2_SOURCE          = vde2-$(VDE2_VERSION).tar.bz2
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index cb08cd9c0b..ca8131c622 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vim
 #
-#############################################################
+################################################################################
 
 VIM_SITE = https://vim.googlecode.com/hg
 VIM_SITE_METHOD = hg
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index 8d03300485..4d3e7b68a3 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vpnc
 #
-#############################################################
+################################################################################
 
 VPNC_VERSION       = 0.5.3
 VPNC_SITE          = http://www.unix-ag.uni-kl.de/~massar/vpnc
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 36f2645893..c54499654d 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vsftpd
 #
-#############################################################
+################################################################################
 
 VSFTPD_VERSION = 3.0.2
 VSFTPD_SITE = https://security.appspot.com/downloads
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 0f0b5ce623..b0c0db307f 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # vtun
 #
-#############################################################
+################################################################################
 
 VTUN_VERSION = 3.0.3
 VTUN_SOURCE = vtun-$(VTUN_VERSION).tar.gz
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index a0fadc2324..b5fe94d5e8 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wayland
 #
-#############################################################
+################################################################################
 
 WAYLAND_VERSION = 1.1.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases/
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 264bcad12e..c0a14c15fc 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # webkit
 #
-#############################################################
+################################################################################
 
 WEBKIT_VERSION = 1.2.7
 WEBKIT_SITE = http://www.webkitgtk.org/releases
diff --git a/package/webp/webp.mk b/package/webp/webp.mk
index 00743dd3c7..9f2acf9288 100644
--- a/package/webp/webp.mk
+++ b/package/webp/webp.mk
@@ -1,8 +1,8 @@
-#####################################################################
+################################################################################
 #
 # webp
 #
-#####################################################################
+################################################################################
 
 WEBP_VERSION = 0.3.0
 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index b6827db402..3e9f3c946f 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # weston
 #
-#############################################################
+################################################################################
 
 WESTON_VERSION = 1.1.0
 WESTON_SITE = http://wayland.freedesktop.org/releases/
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 01ebcb625c..0b213eb319 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wget
 #
-#############################################################
+################################################################################
 
 WGET_VERSION = 1.14
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
diff --git a/package/whetstone/whetstone.mk b/package/whetstone/whetstone.mk
index 4a234858df..f9318d8404 100644
--- a/package/whetstone/whetstone.mk
+++ b/package/whetstone/whetstone.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # whetstone
 #
-#############################################################
+################################################################################
 
 WHETSTONE_VERSION = 1.2
 WHETSTONE_SOURCE = whetstone.c
diff --git a/package/which/which.mk b/package/which/which.mk
index 6e2dce6e8e..019c479164 100644
--- a/package/which/which.mk
+++ b/package/which/which.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # which
 #
-#############################################################
+################################################################################
 
 WHICH_VERSION = 2.20
 WHICH_SITE = http://carlo17.home.xs4all.nl/which
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index eed90beb81..c3d4f67303 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wipe
 #
-#############################################################
+################################################################################
 
 WIPE_VERSION = 2.3.1
 WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION)
diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
index 2d5b86a2a5..3e392848dd 100644
--- a/package/wireless-regdb/wireless-regdb.mk
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wireless-regdb
 #
-#############################################################
+################################################################################
 
 WIRELESS_REGDB_VERSION = 2013.02.13
 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.bz2
diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
index 4dd4084e94..e614ec4bc2 100644
--- a/package/wireless_tools/wireless_tools.mk
+++ b/package/wireless_tools/wireless_tools.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wireless_tools
 #
-#############################################################
+################################################################################
 
 WIRELESS_TOOLS_VERSION = 29
 WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 34d270860e..2d4ea101ec 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wireshark
 #
-#############################################################
+################################################################################
 
 WIRESHARK_VERSION = 1.8.7
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 762ceaf884..450e10f540 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wpa_supplicant
 #
-#############################################################
+################################################################################
 
 WPA_SUPPLICANT_VERSION = 2.0
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
index eb2b51c3de..4a64b943f6 100644
--- a/package/wsapi/wsapi.mk
+++ b/package/wsapi/wsapi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wsapi
 #
-#############################################################
+################################################################################
 
 WSAPI_VERSION = 1.5
 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
diff --git a/package/wvdial/wvdial.mk b/package/wvdial/wvdial.mk
index 89888d4f91..58d8173192 100644
--- a/package/wvdial/wvdial.mk
+++ b/package/wvdial/wvdial.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wvdial
 #
-#############################################################
+################################################################################
 
 WVDIAL_VERSION = 1.61
 WVDIAL_SITE = http://wvdial.googlecode.com/files
diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index 837c4495b3..13982c4236 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # wvstreams
 #
-#############################################################
+################################################################################
 
 WVSTREAMS_VERSION = 4.6.1
 WVSTREAMS_SITE = http://wvstreams.googlecode.com/files
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 9495ef00a6..0f87ba993a 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # libxcb
 #
-#############################################################
+################################################################################
 
 LIBXCB_VERSION = 1.8.1
 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk
index cc83f46d7e..87a236fb18 100644
--- a/package/x11r7/mcookie/mcookie.mk
+++ b/package/x11r7/mcookie/mcookie.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mcookie
 #
-#############################################################
+################################################################################
 
 # Source included in Buildroot
 MCOOKIE_SOURCE =
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 84f7c3fb52..f9d35a92b5 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mesa3d
 #
-#############################################################
+################################################################################
 
 MESA3D_VERSION = 7.10.3
 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 62a9782143..28288053fc 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xapp_xman
 #
-#############################################################
+################################################################################
 
 XAPP_XMAN_VERSION = 1.0.3
 XAPP_XMAN_SOURCE = xman-$(XAPP_XMAN_VERSION).tar.bz2
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 115d6000ad..782238f031 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xcb-proto
 #
-#############################################################
+################################################################################
 
 XCB_PROTO_VERSION = 1.7.1
 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
diff --git a/package/x11r7/xcb-util-image/xcb-util-image.mk b/package/x11r7/xcb-util-image/xcb-util-image.mk
index 0309f3b009..7933b74873 100644
--- a/package/x11r7/xcb-util-image/xcb-util-image.mk
+++ b/package/x11r7/xcb-util-image/xcb-util-image.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xcb-util-image
 #
-#############################################################
+################################################################################
 
 XCB_UTIL_IMAGE_VERSION = 0.3.9
 XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
index 72077a2faa..45a4c68101 100644
--- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
+++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xcb-util-keysyms
 #
-#############################################################
+################################################################################
 
 XCB_UTIL_KEYSYMS_VERSION = 0.3.9
 XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2
diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/package/x11r7/xcb-util-wm/xcb-util-wm.mk
index 0338b8535b..622f295ecb 100644
--- a/package/x11r7/xcb-util-wm/xcb-util-wm.mk
+++ b/package/x11r7/xcb-util-wm/xcb-util-wm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xcb-util-wm
 #
-#############################################################
+################################################################################
 
 XCB_UTIL_WM_VERSION = 0.3.9
 XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index fd55fc9685..29fa0132c3 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xcb-util
 #
-#############################################################
+################################################################################
 
 XCB_UTIL_VERSION = 0.3.9
 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
index c3b1b9c3f8..f2bccb032b 100644
--- a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xcursor-transparent-theme
 #
-#############################################################
+################################################################################
 
 XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1
 XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils/
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 5c86f50d06..8f3e6817ec 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xdata_xcursor-themes
 #
-#############################################################
+################################################################################
 
 XDATA_XCURSOR_THEMES_VERSION = 1.0.3
 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index cd04a40281..7104719f44 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # openchrome
 #
-#############################################################
+################################################################################
 
 XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.906
 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 275ceef49f..0451d154d8 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xkeyboard-config
 #
-#############################################################
+################################################################################
 
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
index 7e441dbae5..082cc4d95f 100644
--- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
+++ b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xlib_libpthread-stubs
 #
-#############################################################
+################################################################################
 
 XLIB_LIBPTHREAD_STUBS_VERSION = 0.3
 XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 635b670ef2..bf9b96e94c 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # x11vnc
 #
-#############################################################
+################################################################################
 
 X11VNC_VERSION = 0.9.13
 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index 0c1c6f1ac3..7c7fddeb9c 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xavante
 #
-#############################################################
+################################################################################
 
 XAVANTE_VERSION = 2.2.1
 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index b4231952d1..14c616e82d 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Xenomai
 #
-#############################################################
+################################################################################
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
 ifeq ($(XENOMAI_VERSION),)
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 71a24a68b8..7bd7070e11 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xerces
 #
-#############################################################
+################################################################################
 
 XERCES_VERSION = 3.1.1
 XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.gz
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index d47984c3c0..132b8d5ab2 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xfsprogs
 #
-#############################################################
+################################################################################
 
 XFSPROGS_VERSION = 3.1.11
 XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index 510e7a5848..32cdf28a20 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xinetd
 #
-#############################################################
+################################################################################
 
 XINETD_VERSION       = 2.3.15
 XINETD_SOURCE        = xinetd-$(XINETD_VERSION).tar.gz
diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk
index cf0576de64..7b0a228ae6 100644
--- a/package/xl2tp/xl2tp.mk
+++ b/package/xl2tp/xl2tp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xl2tp
 #
-#############################################################
+################################################################################
 
 XL2TP_VERSION = v1.3.1
 XL2TP_SITE = http://github.com/xelerance/xl2tpd/tarball/$(XL2TP_VERSION)
diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 2d2209180b..f0a26c2117 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xmlstarlet
 #
-#############################################################
+################################################################################
 
 XMLSTARLET_VERSION = 1.3.0
 XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index 730312ecd5..a4b04ac0e7 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xstroke
 #
-#############################################################
+################################################################################
 
 XSTROKE_VERSION = 0.6
 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index 08e3303260..ec8251fa47 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xterm
 #
-#############################################################
+################################################################################
 
 XTERM_VERSION = 278
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 04ad2c9639..a28751bc51 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xvkbd
 #
-#############################################################
+################################################################################
 
 XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 877c6313f5..de746ada8b 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # xz-utils
 #
-#############################################################
+################################################################################
 
 XZ_VERSION = 5.0.4
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index b8ec9a59f1..26324da489 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # yasm
 #
-#############################################################
+################################################################################
 
 YASM_VERSION = 1.2.0
 YASM_SOURCE = yasm-$(YASM_VERSION).tar.gz
diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk
index b8a72de982..04af2a63c1 100644
--- a/package/yavta/yavta.mk
+++ b/package/yavta/yavta.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # yavta
 #
-#############################################################
+################################################################################
 
 YAVTA_VERSION = 82ff2efdb9787737b9f21b6f4759f077c827b238
 YAVTA_SITE = git://git.ideasonboard.org/yavta.git
diff --git a/package/zd1211-firmware/zd1211-firmware.mk b/package/zd1211-firmware/zd1211-firmware.mk
index afea0e9413..59ea2199c4 100644
--- a/package/zd1211-firmware/zd1211-firmware.mk
+++ b/package/zd1211-firmware/zd1211-firmware.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zd1211-firmware
 #
-#############################################################
+################################################################################
 
 ZD1211_FIRMWARE_VERSION = 1.4
 ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION)
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index bebba20b16..4847ed822b 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zeromq
 #
-#############################################################
+################################################################################
 
 ZEROMQ_VERSION = 3.2.3
 ZEROMQ_SITE = http://download.zeromq.org/
diff --git a/package/zic/zic.mk b/package/zic/zic.mk
index 3dec6af73d..7a06a58d88 100644
--- a/package/zic/zic.mk
+++ b/package/zic/zic.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zic
 #
-#############################################################
+################################################################################
 
 ZIC_VERSION = 2012j
 ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 3723839422..25d40a5348 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zlib
 #
-#############################################################
+################################################################################
 
 ZLIB_VERSION = 1.2.7
 ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
index c64b256127..ee0b9cb07c 100644
--- a/package/zmqpp/zmqpp.mk
+++ b/package/zmqpp/zmqpp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zmqpp
 #
-#############################################################
+################################################################################
 
 ZMQPP_VERSION = 31220ca
 ZMQPP_SITE = git://github.com/benjamg/zmqpp.git
diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index d35f933c1f..73fc34935b 100644
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zxing
 #
-#############################################################
+################################################################################
 
 ZXING_VERSION = 2.0
 ZXING_SITE = http://zxing.googlecode.com/files
diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk
index 5b4fadb00c..a9d2eaed5d 100644
--- a/package/zyre/zyre.mk
+++ b/package/zyre/zyre.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # zyre
 #
-#############################################################
+################################################################################
 
 ZYRE_VERSION = 44a57a449a
 ZYRE_SITE = git://github.com/zeromq/zyre.git

From f0f124f36a8616a1e0895b2eb9411a8459daa3c9 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:16 +0000
Subject: [PATCH 5326/6849] jsmin: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jsmin/jsmin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index 0e82008b60..bb65c6c6ae 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -1,5 +1,5 @@
 JSMIN_VERSION = a9b4755
-JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/master
+JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/$(JSMIN_VERSION)
 
 define JSMIN_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin

From 9bb2757c461271f4458294d417f440f839513e33 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:17 +0000
Subject: [PATCH 5327/6849] libcofi: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcofi/libcofi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcofi/libcofi.mk b/package/libcofi/libcofi.mk
index 6e9c564622..88d51d3fde 100644
--- a/package/libcofi/libcofi.mk
+++ b/package/libcofi/libcofi.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
-LIBCOFI_SITE = http://github.com/simonjhall/copies-and-fills/tarball/master
+LIBCOFI_SITE = http://github.com/simonjhall/copies-and-fills/tarball/$(LIBCOFI_VERSION)
 LIBCOFI_LICENSE = LGPLv2.1
 LIBCOFI_LICENSE_FILES = README.md
 

From b89e8141e3247e28387e14a2959d3ec8ea11f12c Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:18 +0000
Subject: [PATCH 5328/6849] linenoise: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linenoise/linenoise.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 0265e10af7..01bfa0cf68 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LINENOISE_VERSION = g27a3b4d
-LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
+LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/$(LINENOISE_VERSION)
 LINENOISE_LICENSE = BSD-2c
 LINENOISE_INSTALL_STAGING = YES
 

From 55c90b10b3c73ff0708ceb73645c51658f4821aa Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:19 +0000
Subject: [PATCH 5329/6849] lua-msgpack-native: fix github tarball to use
 commit id

[Peter: fix {/( mixup as pointed out by Yann]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua-msgpack-native/lua-msgpack-native.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 4979a11f78..03ea5f8465 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUA_MSGPACK_NATIVE_VERSION = g41cce91
-LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/master
+LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/$(LUA_MSGPACK_NATIVE_VERSION)
 LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
 LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0
 LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt

From e9c9bd2d62a1d09f2f54b55f05301be0e06981df Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:20 +0000
Subject: [PATCH 5330/6849] mtdev2tuio: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mtdev2tuio/mtdev2tuio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
index 3f34702052..c78e373a94 100644
--- a/package/mtdev2tuio/mtdev2tuio.mk
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 MTDEV2TUIO_VERSION = e1e7378
-MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/master
+MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/$(MTDEV2TUIO_VERSION)
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
 MTDEV2TUIO_LICENSE = GPLv3+
 MTDEV2TUIO_LICENSE_FILES = COPYING

From c2b205c038bc0dba3960917f2eb1bd30fbc24b03 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:21 +0000
Subject: [PATCH 5331/6849] ne10: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ne10/ne10.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index f5121ed744..9c78c451ed 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -7,7 +7,7 @@
 # We use a Git commit ID because the last tagged version is more than
 # one year old.
 NE10_VERSION = 88c18f0
-NE10_SITE = http://github.com/projectNe10/Ne10/tarball/master
+NE10_SITE = http://github.com/projectNe10/Ne10/tarball/$(NE10_VERSION)
 NE10_LICENSE = BSD-3c or Apache 2.0
 NE10_LICENSE_FILES = doc/LICENSE
 

From ae5be552b6435437db42b168b61aa15b8bed2fbc Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:22 +0000
Subject: [PATCH 5332/6849] omap-u-boot-utils: fix github tarball to use commit
 id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/omap-u-boot-utils/omap-u-boot-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index 77bb6a60bd..7039d07abe 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852
-OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/master
+OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/$(OMAP_U_BOOT_UTILS_VERSION)
 OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
 OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 

From 6b16001d4f026fd08f14a4b2043710531b50a0ad Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:23 +0000
Subject: [PATCH 5333/6849] rpi-firmware: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 11dffe61cd..ba0e04ad75 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 RPI_FIRMWARE_VERSION = 76d0ac38f16b6343c6155c80db1e4758b3a5838a
-RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/master
+RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 

From 8645437c0cc0fffa6962030ddd90698ab917891e Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:24 +0000
Subject: [PATCH 5334/6849] rpi-userland: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index cdf0bf97e0..45ad64bad2 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
-RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
+RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES

From fe64434df6c8a5f3516f92caf9c04d6dedda444b Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:25 +0000
Subject: [PATCH 5335/6849] socketcand: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socketcand/socketcand.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index 5c10115cc5..d85eb1a904 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SOCKETCAND_VERSION = 7d06986
-SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/master
+SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/$(SOCKETCAND_VERSION)
 SOCKETCAND_AUTORECONF = YES
 SOCKETCAND_DEPENDENCIES = libconfig
 

From 8ad0ab6e16e67a1d1269aec7ddc1b70d10d86e82 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:26 +0000
Subject: [PATCH 5336/6849] sunxi-boards: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sunxi-boards/sunxi-boards.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk
index 8ad99cb6da..6c28e42b0d 100644
--- a/package/sunxi-boards/sunxi-boards.mk
+++ b/package/sunxi-boards/sunxi-boards.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_BOARDS_VERSION = 88d663db44f65b73ef65c4148a28c6fa3665d2b6
-SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/master
+SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/$(SUNXI_BOARDS_VERSION)
 SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools
 SUNXI_BOARDS_INSTALL_IMAGES = YES
 SUNXI_BOARDS_INSTALL_TARGET = NO

From 63c39b52ce3cfacf12071e8d76a5a30c57fe54d6 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:27 +0000
Subject: [PATCH 5337/6849] sunxi-tools: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sunxi-tools/sunxi-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk
index 8f1ae28542..d47574c886 100644
--- a/package/sunxi-tools/sunxi-tools.mk
+++ b/package/sunxi-tools/sunxi-tools.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SUNXI_TOOLS_VERSION = 3a94e721dd8d1e13d0b25da0a83463891e8e9ee0
-SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/master
+SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/$(SUNXI_TOOLS_VERSION)
 SUNXI_TOOLS_LICENSE = GPLv2+
 SUNXI_TOOLS_LICENSE_FILES = COPYING
 HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb

From 7869f83bda815279f8245913d33062e525d4efe1 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:28 +0000
Subject: [PATCH 5338/6849] ti-utils: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ti-utils/ti-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index d739f3c917..a76fde1b57 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 TI_UTILS_VERSION = 06dbdb2
-TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/master
+TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/$(TI_UTILS_VERSION)
 TI_UTILS_DEPENDENCIES = libnl
 
 define TI_UTILS_BUILD_CMDS

From 013365238f0b00f01dcc173edf2f3b6e37f7beb1 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 06:47:29 +0000
Subject: [PATCH 5339/6849] tslib: fix github tarball to use commit id

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 575626a13e..7f5aa21f08 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 TSLIB_VERSION = 158ee49b32f83cb7b02d5315f41c2e4cff38942d
-TSLIB_SITE = http://github.com/kergoth/tslib/tarball/master
+TSLIB_SITE = http://github.com/kergoth/tslib/tarball/$(TSLIB_VERSION)
 TSLIB_LICENSE = GPL, LGPL
 TSLIB_LICENSE_FILES = COPYING
 

From 484b6dd8a3abccf0be34d1bed3761a8809ba23be Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 6 Jun 2013 14:03:26 +0000
Subject: [PATCH 5340/6849] manual: correct error in github tarball information

Updates to manual for bug 6302

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-tips.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 21e520bcde..f435add02d 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -58,7 +58,7 @@ enough):
 
 ------------------------
 FOO_VERSION = 1234567
-FOO_SITE = http://github.com/<user>/<package>/tarball/<branch>
+FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
 ------------------------
 
 Note that the name of the tarball is the default +foo-1234567.tar.gz+

From 86bfe7cca9bca292f00f7a41221ae5879f4a5769 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 7 Jun 2013 10:48:45 +0200
Subject: [PATCH 5341/6849] manual: github: merge tag/commit ID examples

And reword as suggested by Samuel.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-tips.txt | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index f435add02d..8b27c619a2 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -43,23 +43,15 @@ Packages on github often don't have a download area with release tarballs.
 However, it is possible to download tarballs directly from the repository
 on github.
 
-If the package version matches a tag, then this tag should be used to
-identify the version:
-
-------------------------
-FOO_VERSION = v1.0
-FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
-------------------------
-
-If the package has no release version, or its version cannot be
-identified using tag, then the SHA1 of the particular commit should be
-used to identify the version (the first 7 characters of the SHA1 are
-enough):
-
 ------------------------
-FOO_VERSION = 1234567
+FOO_VERSION = v1.0 # tag or (abbreviated) commit ID
 FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
 ------------------------
 
-Note that the name of the tarball is the default +foo-1234567.tar.gz+
-so it is not necessary to specify it in the +.mk+ file.
+.Notes
+- The FOO_VERSION can either be a tag or a commit ID.
+- The tarball name generated by github matches the default one from
+  Buildroot (e.g.: +foo-1234567.tar.gz+),
+  so it is not necessary to specify it in the +.mk+ file.
+- When using a commit ID as version, usually the first 7 characters of
+  the SHA1 are enough.

From 35c5c6f6c712374bf5ad02152f0eff473e919bb8 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 6 Jun 2013 21:54:10 +0000
Subject: [PATCH 5342/6849] Fix package headers

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bonnie/bonnie.mk                  | 2 ++
 package/libroxml/libroxml.mk              | 2 ++
 package/multimedia/gstreamer/gstreamer.mk | 1 -
 toolchain/gcc/gcc-uclibc-4.x.mk           | 4 ++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
index 6d82b8ac0c..a9019869c6 100644
--- a/package/bonnie/bonnie.mk
+++ b/package/bonnie/bonnie.mk
@@ -1,6 +1,8 @@
+################################################################################
 #
 # bonnie++
 #
+################################################################################
 
 BONNIE_VERSION = 1.03e
 BONNIE_SOURCE = bonnie++-$(BONNIE_VERSION).tgz
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 6e690aa539..98b97409fe 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -1,6 +1,8 @@
+################################################################################
 #
 # libroxml
 #
+################################################################################
 
 LIBROXML_VERSION = 2.2.1
 LIBROXML_SITE = http://libroxml.googlecode.com/files
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index 4453fc8956..f0fdea4524 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -1,4 +1,3 @@
-
 ################################################################################
 #
 # gstreamer
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 5be26c44c0..7ebcbaca2a 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -1,3 +1,5 @@
+################################################################################
+#
 # Makefile for to build a gcc/uClibc toolchain
 #
 # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
@@ -16,6 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+################################################################################
 
 GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
 

From 834de0ac1316e8f8cbaf8f75712a7476526995a6 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 6 Jun 2013 21:54:11 +0000
Subject: [PATCH 5343/6849] Fix package headers to comply with coding style

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/cramfs/cramfs.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index 6549f39ead..4f737ddb22 100644
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -3,6 +3,7 @@
 # Build the cramfs root filesystem image
 #
 #############################################################
+
 ifeq ($(BR2_ENDIAN),"BIG")
 CRAMFS_OPTS=-b
 else

From f9e76bb253435d527126cb17ef572ea805b9e8ed Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 6 Jun 2013 21:54:12 +0000
Subject: [PATCH 5344/6849] Convert headers to lower case when relevant

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91dataflashboot/at91dataflashboot.mk | 2 +-
 boot/barebox/barebox.mk                     | 2 +-
 boot/lpc32xxcdl/lpc32xxcdl.mk               | 2 +-
 boot/uboot/uboot.mk                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 10f54a1e54..d224a4fb66 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# DataFlashBoot
+# at91dataflashboot
 #
 #############################################################
 
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 5ec47f64f4..113110ec82 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# Barebox
+# barebox
 #
 #############################################################
 
diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index c4e8d2dc1b..6e49a42bdc 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# LPC32XX CDL
+# lpc32xxcdl
 #
 #############################################################
 
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 1b708d570a..f8e4aa9e18 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# U-Boot
+# uboot
 #
 #############################################################
 

From 086f333f39cdbc0762917272e4c9bb87344fb51a Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 6 Jun 2013 21:54:13 +0000
Subject: [PATCH 5345/6849] Normalize separator size to 80

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/at91bootstrap/at91bootstrap.mk               | 4 ++--
 boot/at91bootstrap3/at91bootstrap3.mk             | 4 ++--
 boot/at91dataflashboot/at91dataflashboot.mk       | 4 ++--
 boot/barebox/barebox.mk                           | 4 ++--
 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 4 ++--
 boot/grub/grub.mk                                 | 4 ++--
 boot/lpc32xxcdl/lpc32xxcdl.mk                     | 4 ++--
 boot/mxs-bootlets/mxs-bootlets.mk                 | 4 ++--
 boot/syslinux/syslinux.mk                         | 4 ++--
 boot/uboot/uboot.mk                               | 4 ++--
 boot/xloader/xloader.mk                           | 4 ++--
 fs/cloop/cloop.mk                                 | 4 ++--
 fs/cpio/cpio.mk                                   | 4 ++--
 fs/cramfs/cramfs.mk                               | 4 ++--
 fs/ext2/ext2.mk                                   | 4 ++--
 fs/initramfs/initramfs.mk                         | 4 ++--
 fs/iso9660/iso9660.mk                             | 4 ++--
 fs/jffs2/jffs2.mk                                 | 4 ++--
 fs/romfs/romfs.mk                                 | 4 ++--
 fs/squashfs/squashfs.mk                           | 4 ++--
 fs/tar/tar.mk                                     | 4 ++--
 fs/ubifs/ubi.mk                                   | 4 ++--
 fs/ubifs/ubifs.mk                                 | 4 ++--
 toolchain/elf2flt/elf2flt.mk                      | 4 ++--
 toolchain/kernel-headers/kernel-headers.mk        | 4 ++--
 toolchain/uClibc/uclibc.mk                        | 4 ++--
 26 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 9d5c125c8c..c5fd0999f9 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # at91bootstrap
 #
-#############################################################
+################################################################################
 
 AT91BOOTSTRAP_VERSION = 1.16
 AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap/
diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
index 32486be31d..4f74b1d982 100644
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # at91bootstrap3
 #
-#############################################################
+################################################################################
 
 AT91BOOTSTRAP3_VERSION = 3.2
 AT91BOOTSTRAP3_SITE = \
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index d224a4fb66..2c2b4d9ca7 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # at91dataflashboot
 #
-#############################################################
+################################################################################
 
 AT91DATAFLASHBOOT_VERSION = 1.05
 AT91DATAFLASHBOOT_SOURCE = DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).tar.bz2
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 113110ec82..9324c25c8f 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # barebox
 #
-#############################################################
+################################################################################
 
 BAREBOX_VERSION    = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION))
 
diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
index 25c6bed76b..d9ddf4877f 100644
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # boot-wrapper-aarch64
 #
-#############################################################
+################################################################################
 
 BOOT_WRAPPER_AARCH64_VERSION        = 26b62f586020fd998c6efd43db657eaafeec14da
 BOOT_WRAPPER_AARCH64_SITE           = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 4a094bc47d..fd27620fa6 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # grub
 #
-#############################################################
+################################################################################
 
 GRUB_VERSION = 0.97
 GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index 6e49a42bdc..04c1c7f060 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # lpc32xxcdl
 #
-#############################################################
+################################################################################
 
 LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11
 LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git
diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
index f93ff81790..6b81030c18 100644
--- a/boot/mxs-bootlets/mxs-bootlets.mk
+++ b/boot/mxs-bootlets/mxs-bootlets.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # mxs-bootlets
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y)
 	MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL))
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 046bdc352f..1b0ef4ebdd 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # syslinux to make target msdos/iso9660 filesystems bootable
 #
-#############################################################
+################################################################################
 
 SYSLINUX_VERSION = 4.06
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index f8e4aa9e18..3e188ee8ab 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # uboot
 #
-#############################################################
+################################################################################
 
 UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index dae2039452..00c63b1efb 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # x-loader
 #
-#############################################################
+################################################################################
 
 XLOADER_VERSION    = 6f3a26101303051e0f91b6213735b68ce804e94e
 XLOADER_SITE       = git://gitorious.org/x-loader/x-loader.git
diff --git a/fs/cloop/cloop.mk b/fs/cloop/cloop.mk
index c918684073..f783adeb00 100644
--- a/fs/cloop/cloop.mk
+++ b/fs/cloop/cloop.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the compressed loop root filesystem image
 #
-#############################################################
+################################################################################
 
 ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
 
diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index 5bcec13908..0df23785bf 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # cpio to archive target filesystem
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
 
diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index 4f737ddb22..402d19ffb1 100644
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the cramfs root filesystem image
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_ENDIAN),"BIG")
 CRAMFS_OPTS=-b
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index d74f31e28a..cad5b42d6e 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the ext2 root filesystem image
 #
-#############################################################
+################################################################################
 
 EXT2_OPTS :=
 
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index f1eb8b6e68..fe426cc3d8 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -1,9 +1,9 @@
-#############################################################
+################################################################################
 #
 # Build a kernel with an integrated initial ramdisk
 # filesystem based on cpio.
 #
-#############################################################
+################################################################################
 
 ROOTFS_INITRAMFS_DEPENDENCIES += rootfs-cpio
 
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 029c0dd94a..0a10512d93 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -1,11 +1,11 @@
-#############################################################
+################################################################################
 #
 # Build the iso96600 root filesystem image
 #
 # Cannot be converted to the ROOTFS_TARGET infrastructure, because of
 # the temporary construction in ISO9660_TARGET_DIR.
 #
-#############################################################
+################################################################################
 
 ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660
 ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk
index b5423a8cb2..0232199be5 100644
--- a/fs/jffs2/jffs2.mk
+++ b/fs/jffs2/jffs2.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the jffs2 root filesystem image
 #
-#############################################################
+################################################################################
 
 JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE)
 SUMTOOL_OPTS := $(JFFS2_OPTS)
diff --git a/fs/romfs/romfs.mk b/fs/romfs/romfs.mk
index 1a9f49927e..63eb99448f 100644
--- a/fs/romfs/romfs.mk
+++ b/fs/romfs/romfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the romfs root filesystem image
 #
-#############################################################
+################################################################################
 
 ROMFS_TARGET=$(IMAGE).romfs
 
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index d4b56f4958..ae5182a1a0 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the squashfs root filesystem image
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y)
 ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
index 1d327fa868..9fecf7392f 100644
--- a/fs/tar/tar.mk
+++ b/fs/tar/tar.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # tar to archive target filesystem
 #
-#############################################################
+################################################################################
 
 TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS)
 
diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk
index e9033e8741..08c952c296 100644
--- a/fs/ubifs/ubi.mk
+++ b/fs/ubifs/ubi.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Embed the ubifs image into an ubi one
 #
-#############################################################
+################################################################################
 
 UBI_UBINIZE_OPTS := -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
 UBI_UBINIZE_OPTS += -p $(BR2_TARGET_ROOTFS_UBI_PEBSIZE)
diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk
index dca2e04fb8..f1e4126e86 100644
--- a/fs/ubifs/ubifs.mk
+++ b/fs/ubifs/ubifs.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # Build the ubifs root filesystem image
 #
-#############################################################
+################################################################################
 
 UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
 
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 52e199cda3..14622273dd 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # elf2flt
 #
-#############################################################
+################################################################################
 
 # we keep a local checkout of uClinux CVS
 ELF2FLT_SOURCE:=$(ELF2FLT_DIR)/elf2flt
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index b5ae3227e1..a04395b41a 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -1,11 +1,11 @@
-#############################################################
+################################################################################
 #
 # Setup the kernel headers. I include a generic package of
 # kernel headers here, so you shouldn't need to include your
 # own. Be aware these kernel headers _will_ get blown away
 # by a 'make clean' so don't put anything sacred in here...
 #
-#############################################################
+################################################################################
 
 DEFAULT_KERNEL_HEADERS:=$(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))
 
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index d4f1d4cdf6..44079e791e 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # uClibc (the C library)
 #
-#############################################################
+################################################################################
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 

From e22f57d41ba9ca334b227051963fd37edbf9aeb8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 6 Jun 2013 12:23:05 +0000
Subject: [PATCH 5346/6849] package/rpi-firmware: update

Updating brings in a new bootloader that enables more free codecs:
    MJPEG, VP6, VP8, Ogg Theora and Ogg Vorbis

Also, the command-line definition has moved to its own file, now.
Although the legacy 'cmdline' variable seems to still be supported
for a little while, better switch now than forget when we upgrade
later.

Update the RPi board readme accordingly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/cmdline.txt     | 1 +
 package/rpi-firmware/config.txt      | 1 -
 package/rpi-firmware/rpi-firmware.mk | 5 ++++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 package/rpi-firmware/cmdline.txt

diff --git a/package/rpi-firmware/cmdline.txt b/package/rpi-firmware/cmdline.txt
new file mode 100644
index 0000000000..061e54b9e0
--- /dev/null
+++ b/package/rpi-firmware/cmdline.txt
@@ -0,0 +1 @@
+dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 rootwait
diff --git a/package/rpi-firmware/config.txt b/package/rpi-firmware/config.txt
index a818762dff..994972b0fd 100644
--- a/package/rpi-firmware/config.txt
+++ b/package/rpi-firmware/config.txt
@@ -12,4 +12,3 @@ gpu_mem_256=100
 gpu_mem_512=100
 sdram_freq=400
 over_voltage=0
-cmdline="dwc_otg.fiq_fix_enable=1 sdhci-bcm2708.sync_after_dma=0 dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 rootwait"
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index ba0e04ad75..391a418344 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 76d0ac38f16b6343c6155c80db1e4758b3a5838a
+RPI_FIRMWARE_VERSION = 06f6c909e285beceeb7e51f71ba6ffe754f073e8
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
@@ -13,9 +13,12 @@ define RPI_FIRMWARE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin
 	$(INSTALL) -D -m 0644 $(@D)/boot/start.elf $(BINARIES_DIR)/rpi-firmware/start.elf
 	$(INSTALL) -D -m 0644 $(@D)/boot/start_cd.elf $(BINARIES_DIR)/rpi-firmware/start_cd.elf
+	$(INSTALL) -D -m 0644 $(@D)/boot/start_x.elf $(BINARIES_DIR)/rpi-firmware/start_x.elf
 	$(INSTALL) -D -m 0644 $(@D)/boot/fixup.dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
 	$(INSTALL) -D -m 0644 $(@D)/boot/fixup_cd.dat $(BINARIES_DIR)/rpi-firmware/fixup_cd.dat
+	$(INSTALL) -D -m 0644 $(@D)/boot/fixup_x.dat $(BINARIES_DIR)/rpi-firmware/fixup_x.dat
 	$(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
+	$(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
 endef
 
 $(eval $(generic-package))

From 28ab11d7855a1b85e4be15cd9c86ad0838fa1cb1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 6 Jun 2013 12:23:06 +0000
Subject: [PATCH 5347/6849] package/rpi-userland: bump version

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 45ad64bad2..55d7b09bc1 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
+RPI_USERLAND_VERSION = 986774edf7c91a8a91d59abadbdb0b34b5a387dc
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 41190ef0f1ffb68675bfe77205e9207363546377 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 8 Jun 2013 12:12:21 +0200
Subject: [PATCH 5348/6849] linenoise: fix git commit id

Somehow a 'g' had sneaked in before the commit id.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linenoise/linenoise.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 01bfa0cf68..14e0f09322 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINENOISE_VERSION = g27a3b4d
+LINENOISE_VERSION = 27a3b4d5
 LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/$(LINENOISE_VERSION)
 LINENOISE_LICENSE = BSD-2c
 LINENOISE_INSTALL_STAGING = YES

From 8d4c3a7eefa26e804ec93f1a16e27cc7696c7213 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 8 Jun 2013 03:52:59 +0000
Subject: [PATCH 5349/6849] libpcap: bump to version 1.4.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libpcap-canusb-requires-pthread.patch     | 29 -------------------
 package/libpcap/libpcap.mk                    | 16 ++--------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/libpcap/libpcap-canusb-requires-pthread.patch

diff --git a/package/libpcap/libpcap-canusb-requires-pthread.patch b/package/libpcap/libpcap-canusb-requires-pthread.patch
deleted file mode 100644
index ed3bc1a8d7..0000000000
--- a/package/libpcap/libpcap-canusb-requires-pthread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-canusb uses pthreads, but -lpthread is never added to LIBS hence missing
-from pcap-config, causing build failures. Fix this.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura libpcap-1.3.0.orig//configure libpcap-1.3.0/configure
---- libpcap-1.3.0.orig//configure	2012-06-26 09:42:06.072155279 -0300
-+++ libpcap-1.3.0/configure	2012-06-26 09:42:12.617196326 -0300
-@@ -7607,7 +7607,7 @@
- $as_echo "#define PCAP_SUPPORT_CANUSB 1" >>confdefs.h
- 
- 		    CANUSB_SRC=pcap-canusb-linux.c
--		    LIBS="-lusb-1.0 $LIBS"
-+		    LIBS="-lusb-1.0 -lpthread $LIBS"
- 		    { $as_echo "$as_me:${as_lineno-$LINENO}: canusb sniffing is supported" >&5
- $as_echo "$as_me: canusb sniffing is supported" >&6;}
- 
-diff -Nura libpcap-1.3.0.orig//configure.in libpcap-1.3.0/configure.in
---- libpcap-1.3.0.orig//configure.in	2012-06-26 09:42:06.067155242 -0300
-+++ libpcap-1.3.0/configure.in	2012-06-26 09:42:22.267256741 -0300
-@@ -1406,7 +1406,7 @@
- 		[
- 		    AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb])
- 		    CANUSB_SRC=pcap-canusb-linux.c
--		    LIBS="-lusb-1.0 $LIBS"
-+		    LIBS="-lusb-1.0 -lpthread $LIBS"
- 		    AC_MSG_NOTICE(canusb sniffing is supported)
- 		],
- 		AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it)
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 26f807b6c5..bbbecdc0d0 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -4,23 +4,13 @@
 #
 ################################################################################
 
-LIBPCAP_VERSION = 1.3.0
+LIBPCAP_VERSION = 1.4.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_LICENSE = BSD-3c
 LIBPCAP_LICENSE_FILES = LICENSE
 LIBPCAP_INSTALL_STAGING = YES
-
-# The configure.in file contains the necessary code to handle
-# --enable-shared/--disable-shared properly, but the configure script
-# bundled with the libpcap tarball is not up-to-date with the
-# configure.in file. In order to get proper handling of
-# --enable-shared/--disable-shared, which is needed when doing a
-# static library build, we autoreconfigure this package. This can be
-# removed when bumping libpcap, after checking that the bundled
-# configure script correctly handles --enable-shared/--disable-shared.
-LIBPCAP_AUTORECONF = YES
-
-LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
+LIBPCAP_DEPENDENCIES = zlib host-flex host-bison \
+	$(if $(BR2_PACKAGE_LIBNL),libnl)
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		ac_cv_header_linux_wireless_h=yes # configure misdetects this
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux

From 540e67b03996e7b5c90454dfa2d577bf2ece7f36 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 8 Jun 2013 03:53:00 +0000
Subject: [PATCH 5350/6849] tcpdump: bump to version 4.4.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcpdump/tcpdump.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 6b95ba708b..a865e81e0f 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-TCPDUMP_VERSION = 4.3.0
+TCPDUMP_VERSION = 4.4.0
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_LICENSE = BSD-3c
 TCPDUMP_LICENSE_FILES = LICENSE
-
 TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
 TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)

From b0e0ec04d57c9cd555f41742226d4257447369b6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 8 Jun 2013 02:11:56 +0000
Subject: [PATCH 5351/6849] kernel-headers: bump 3.{0, 2, 4, 9}.x stable
 version

And mark 3.8.x series as deprecated to match upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                     | 10 +++++-----
 ...install-fix-__packed-in-exported-kernel-head.patch} |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.81-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 1bb9c0289b..77da947f33 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -49,7 +49,7 @@ choice
 
 	config BR2_KERNEL_HEADERS_3_8
 		bool "Linux 3.8.x kernel headers"
-		depends on !BR2_arc
+		depends on BR2_DEPRECATED && !BR2_arc
 
 	config BR2_KERNEL_HEADERS_3_9
 		bool "Linux 3.9.x kernel headers"
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.80"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.81"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.44"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.45"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.47"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.48"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.4"		if BR2_KERNEL_HEADERS_3_9
+	default "3.9.5"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.81-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.80-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.81-headers_install-fix-__packed-in-exported-kernel-head.patch

From 4f7bf81e9ba7f8f5e5bb9faf1d23f0e01e70155e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 8 Jun 2013 02:11:57 +0000
Subject: [PATCH 5352/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 1bbb574bb5..a49ff8a83b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.4"
+	bool "3.9.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.4" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.5" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 424d19a1680a4bcd7781752b6af3bdaf14ec5276 Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Fri, 7 Jun 2013 13:02:56 +0000
Subject: [PATCH 5353/6849] libroxml: bump version to 2.2.2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libroxml/libroxml.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 98b97409fe..76ffa14b8c 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBROXML_VERSION = 2.2.1
+LIBROXML_VERSION = 2.2.2
 LIBROXML_SITE = http://libroxml.googlecode.com/files
 LIBROXML_INSTALL_STAGING = YES
 

From 0b8ed5b53d066f86f09e01d02a5e0bd715c17b70 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Fri, 7 Jun 2013 13:46:10 +0000
Subject: [PATCH 5354/6849] lua-msgpack-native: fix git hash tag

Remove initial g from hash tag to fix downloads from github.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua-msgpack-native/lua-msgpack-native.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 03ea5f8465..6ec923ce2c 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_MSGPACK_NATIVE_VERSION = g41cce91
+LUA_MSGPACK_NATIVE_VERSION = 41cce91
 LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/$(LUA_MSGPACK_NATIVE_VERSION)
 LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
 LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0

From 1232fe4d22e15a31385c69f02570f036b738b6b2 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 7 Jun 2013 13:18:46 +0000
Subject: [PATCH 5355/6849] libglib2: Bump libglib2 to 2.36.1

This patch bumps libglib2 to version 2.36.1. In addition this bumps glibmm
and glib-networking to 2.36.1.

Signed-off-by: Spenser Gilliland <spenser at gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/glib-networking/glib-networking.mk    |   4 +-
 package/glibmm/glibmm.mk                      |   2 +-
 ...004-fix-build-when-no-thread-support.patch |  18 +-
 ...ke-codegen-python2-python3-compliant.patch | 192 ------------------
 package/libglib2/libglib2-no-tests.patch      | 117 -----------
 package/libglib2/libglib2.mk                  |  10 +-
 6 files changed, 19 insertions(+), 324 deletions(-)
 delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
 delete mode 100644 package/libglib2/libglib2-no-tests.patch

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 12eb344130..168e5eab0b 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GLIB_NETWORKING_MAJOR_VERSION = 2.30
-GLIB_NETWORKING_MINOR_VERSION = 2
+GLIB_NETWORKING_MAJOR_VERSION = 2.36
+GLIB_NETWORKING_MINOR_VERSION = 1
 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION)
 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION)
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index a1bd8b52aa..d1619a1b2d 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GLIBMM_VERSION_MAJOR = 2.30
+GLIBMM_VERSION_MAJOR = 2.36
 GLIBMM_VERSION_MINOR = 1
 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).$(GLIBMM_VERSION_MINOR)
 GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
diff --git a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
index 55635446aa..43c7e16092 100644
--- a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
+++ b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
@@ -1,27 +1,29 @@
 Fix gio/gcancellable.c build when thread support is disabled
 
+Changes:
+	Updated for 2.36.1
+
 Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
+Signed-off-by: "Spenser Gilliland" <spenser@gillilanding.com>
 ---
---- a/gio/gcancellable.c	2013-05-14 23:08:25.514461348 +0200
-+++ b/gio/gcancellable.c	2013-05-14 23:10:23.347789625 +0200
-@@ -270,8 +270,10 @@ g_cancellable_reset (GCancellable *cance
+--- libglib2-2.36.1.orig/gio/gcancellable.c	2013-03-13 08:39:09.000000000 -0500
++++ libglib2-2.36.1/gio/gcancellable.c	2013-05-26 10:49:32.366019891 -0500
+@@ -267,7 +267,9 @@
    while (priv->cancelled_running)
      {
        priv->cancelled_running_waiting = TRUE;
 +#if defined(G_THREADS_ENABLED)
-       g_cond_wait (cancellable_cond,
-                    g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
+       g_cond_wait (&cancellable_cond, &cancellable_mutex);
 +#endif
      }
  
    if (priv->cancelled)
-@@ -619,8 +621,10 @@ g_cancellable_disconnect (GCancellable
+@@ -620,7 +622,9 @@
    while (priv->cancelled_running)
      {
        priv->cancelled_running_waiting = TRUE;
 +#if defined(G_THREADS_ENABLED)
-       g_cond_wait (cancellable_cond,
-                    g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
+       g_cond_wait (&cancellable_cond, &cancellable_mutex);
 +#endif
      }
  
diff --git a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
deleted file mode 100644
index b4838270ba..0000000000
--- a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Fetch from http://git.gnome.org/browse/glib/patch/?id=03611f7c0670ea14eedbc121972aed7ce60bb9ee
-
-This patch is already included upstream, from the glib-2.32.4 release. 
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
-From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001
-From: Simon Feltman <s.feltman@gmail.com>
-Date: Thu, 14 Jun 2012 06:20:17 +0000
-Subject: Updated codegen to work with python3.
-
-Most changes were just replacing usage of "has_key" with "in".
-Also updated the sorting function which was simplified and
-changed to a "key" function instead of "cmp" (which is no longer
-supported in python3. Verified everything builds with
-python 2.7 and 3.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678066
----
-diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
-index 41ea8fa..bca3490 100644
---- a/gio/gdbus-2.0/codegen/codegen.py
-+++ b/gio/gdbus-2.0/codegen/codegen.py
-@@ -304,11 +304,8 @@ class CodeGenerator:
-             #
-             # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5
-             # for discussion
--            keys = function_pointers.keys()
--            if len(keys) > 0:
--                keys.sort(cmp=utils.my_version_cmp)
--                for key in keys:
--                    self.h.write('%s'%function_pointers[key])
-+            for key in sorted(function_pointers.keys(), key=utils.version_cmp_key):
-+                self.h.write('%s'%function_pointers[key])
- 
-             self.h.write('};\n')
-             self.h.write('\n')
-@@ -1022,11 +1019,9 @@ class CodeGenerator:
-                 value  = '@get_%s: '%(p.name_lower)
-                 value += 'Getter for the #%s:%s property.'%(i.camel_name, p.name_hyphen)
-                 doc_bits[key] = value
--        keys = doc_bits.keys()
--        if len(keys) > 0:
--            keys.sort(cmp=utils.my_version_cmp)
--            for key in keys:
--                self.c.write(' * %s\n'%doc_bits[key])
-+        for key in sorted(doc_bits.keys(), key=utils.version_cmp_key):
-+            self.c.write(' * %s\n'%doc_bits[key])
-+
-         self.c.write(self.docbook_gen.expand(
-                 ' *\n'
-                 ' * Virtual table for the D-Bus interface #%s.\n'
-diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py
-index 4ceef57..00581f1 100644
---- a/gio/gdbus-2.0/codegen/codegen_docbook.py
-+++ b/gio/gdbus-2.0/codegen/codegen_docbook.py
-@@ -259,14 +259,12 @@ class DocbookCodeGenerator:
-                 self.expand_member_dict[key] = value
-         # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
-         # is evaluated before #org.foo.Iface:Media ...
--        self.expand_member_dict_keys = self.expand_member_dict.keys()
--        self.expand_member_dict_keys.sort(reverse=True)
--        self.expand_iface_dict_keys = self.expand_iface_dict.keys()
--        self.expand_iface_dict_keys.sort(reverse=True)
-+        self.expand_member_dict_keys = sorted(self.expand_member_dict.keys(), reverse=True)
-+        self.expand_iface_dict_keys = sorted(self.expand_iface_dict.keys(), reverse=True)
- 
-     def generate(self):
-         for i in self.ifaces:
--            self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w')
-+            self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w')
-             self.out.write(''%())
-             self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%())
-             self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%())
-diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
-index 76c838c..735cc1f 100755
---- a/gio/gdbus-2.0/codegen/codegen_main.py
-+++ b/gio/gdbus-2.0/codegen/codegen_main.py
-@@ -184,8 +184,8 @@ def codegen_main():
- 
-     c_code = opts.generate_c_code
-     if c_code:
--        h = file(c_code + '.h', 'w')
--        c = file(c_code + '.c', 'w')
-+        h = open(c_code + '.h', 'w')
-+        c = open(c_code + '.c', 'w')
-         gen = codegen.CodeGenerator(all_ifaces,
-                                     opts.c_namespace,
-                                     opts.interface_prefix,
-diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py
-index 5fabd44..7b9d216 100644
---- a/gio/gdbus-2.0/codegen/parser.py
-+++ b/gio/gdbus-2.0/codegen/parser.py
-@@ -152,12 +152,12 @@ class DBusXMLParser:
-                 self.state = DBusXMLParser.STATE_IGNORED
- 
-             # assign docs, if any
--            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-+            if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
-                 self._cur_object.doc_string = self.doc_comment_body
--                if self.doc_comment_params.has_key('short_description'):
-+                if 'short_description' in self.doc_comment_params:
-                     short_description = self.doc_comment_params['short_description']
-                     self._cur_object.doc_string_brief = short_description
--                if self.doc_comment_params.has_key('since'):
-+                if 'since' in self.doc_comment_params:
-                     self._cur_object.since = self.doc_comment_params['since']
- 
-         elif self.state == DBusXMLParser.STATE_INTERFACE:
-@@ -185,16 +185,16 @@ class DBusXMLParser:
-                 self.state = DBusXMLParser.STATE_IGNORED
- 
-             # assign docs, if any
--            if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-+            if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
-                 self._cur_object.doc_string = self.doc_comment_body
--                if self.doc_comment_params.has_key('since'):
-+                if 'since' in self.doc_comment_params:
-                     self._cur_object.since = self.doc_comment_params['since']
- 
-         elif self.state == DBusXMLParser.STATE_METHOD:
-             if name == DBusXMLParser.STATE_ARG:
-                 self.state = DBusXMLParser.STATE_ARG
-                 arg_name = None
--                if attrs.has_key('name'):
-+                if 'name' in attrs:
-                     arg_name = attrs['name']
-                 arg = dbustypes.Arg(arg_name, attrs['type'])
-                 direction = attrs['direction']
-@@ -215,18 +215,18 @@ class DBusXMLParser:
- 
-             # assign docs, if any
-             if self.doc_comment_last_symbol == old_cur_object.name:
--                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-+                if 'name' in attrs and attrs['name'] in self.doc_comment_params:
-                     doc_string = self.doc_comment_params[attrs['name']]
-                     if doc_string != None:
-                         self._cur_object.doc_string = doc_string
--                    if self.doc_comment_params.has_key('since'):
-+                    if 'since' in self.doc_comment_params:
-                         self._cur_object.since = self.doc_comment_params['since']
- 
-         elif self.state == DBusXMLParser.STATE_SIGNAL:
-             if name == DBusXMLParser.STATE_ARG:
-                 self.state = DBusXMLParser.STATE_ARG
-                 arg_name = None
--                if attrs.has_key('name'):
-+                if 'name' in attrs:
-                     arg_name = attrs['name']
-                 arg = dbustypes.Arg(arg_name, attrs['type'])
-                 self._cur_object.args.append(arg)
-@@ -241,11 +241,11 @@ class DBusXMLParser:
- 
-             # assign docs, if any
-             if self.doc_comment_last_symbol == old_cur_object.name:
--                if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-+                if 'name' in attrs and attrs['name'] in self.doc_comment_params:
-                     doc_string = self.doc_comment_params[attrs['name']]
-                     if doc_string != None:
-                         self._cur_object.doc_string = doc_string
--                    if self.doc_comment_params.has_key('since'):
-+                    if 'since' in self.doc_comment_params:
-                         self._cur_object.since = self.doc_comment_params['since']
- 
-         elif self.state == DBusXMLParser.STATE_PROPERTY:
-diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
-index 94bd05c..239b64e 100644
---- a/gio/gdbus-2.0/codegen/utils.py
-+++ b/gio/gdbus-2.0/codegen/utils.py
-@@ -97,15 +97,8 @@ def lookup_brief_docs(annotations):
-     else:
-         return s
- 
--# I'm sure this could be a lot more elegant if I was
--# more fluent in python...
--def my_version_cmp(a, b):
--    if len(a[0]) > 0 and len(b[0]) > 0:
--        va = distutils.version.LooseVersion(a[0])
--        vb = distutils.version.LooseVersion(b[0])
--        ret = va.__cmp__(vb)
--    else:
--        ret = cmp(a[0], b[0])
--    if ret != 0:
--        return ret
--    return cmp(a[1], b[1])
-+def version_cmp_key(key):
-+    # If the 'since' version is empty put a 0 in its place as this will
-+    # allow LooseVersion to work and will always compare lower.
-+    v = key[0] if key[0] else '0'
-+    return (distutils.version.LooseVersion(v), key[1])
---
-cgit v0.9.0.2
diff --git a/package/libglib2/libglib2-no-tests.patch b/package/libglib2/libglib2-no-tests.patch
deleted file mode 100644
index 81b5af2d1b..0000000000
--- a/package/libglib2/libglib2-no-tests.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Add a --disable-tests option to the configure script
-
-Disabling the build of tests has two benefits:
- * Prevents the build of a lot of code that doesn't build on noMMU
-   platforms.
- * Reduces the build time.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: libglib2-2.30.3/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/Makefile.am	2012-03-11 22:43:28.000000000 +0100
-+++ libglib2-2.30.3/Makefile.am	2013-03-09 17:32:01.000000000 +0100
-@@ -6,7 +6,11 @@
- 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
- 
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio $(TEST_SUBDIR) po docs
- DIST_SUBDIRS = $(SUBDIRS) build
- 
- bin_SCRIPTS = glib-gettextize
-Index: libglib2-2.30.3/gio/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/gio/Makefile.am	2012-03-11 22:44:19.000000000 +0100
-+++ libglib2-2.30.3/gio/Makefile.am	2013-03-09 17:32:38.000000000 +0100
-@@ -282,7 +282,11 @@
- 
- endif
- 
--SUBDIRS += tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS += $(TEST_SUBDIR)
- 
- libgio_2_0_la_SOURCES =		\
- 	gappinfo.c 		\
-Index: libglib2-2.30.3/configure.ac
-===================================================================
---- libglib2-2.30.3.orig/configure.ac	2013-03-09 17:30:55.000000000 +0100
-+++ libglib2-2.30.3/configure.ac	2013-03-09 17:37:27.000000000 +0100
-@@ -234,11 +234,18 @@
-               [AC_HELP_STRING([--disable-rebuilds],
-                               [disable all source autogeneration rules])],,
-               [enable_rebuilds=yes])
-+AC_ARG_ENABLE(tests,
-+		[AC_HELP_STRING([--disable-tests],
-+				[disable all tests])],
-+		enable_tests=${enableval},
-+		enable_tests=yes)
- 
- if test "x$enable_threads" != "xyes"; then
-   enable_threads=no
- fi
- 
-+AM_CONDITIONAL(BUILD_TESTS, [test x$enable_tests = xyes])
-+
- AC_MSG_CHECKING([whether to enable garbage collector friendliness])
- if test "x$enable_gc_friendly" = "xyes"; then
-   AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default])
-Index: libglib2-2.30.3/glib/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/glib/Makefile.am	2012-03-11 22:43:28.000000000 +0100
-+++ libglib2-2.30.3/glib/Makefile.am	2013-03-09 18:02:59.000000000 +0100
-@@ -42,7 +42,11 @@
- gregex_h =
- endif
- 
--SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . $(TEST_SUBDIR)
- 
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
- 
-Index: libglib2-2.30.3/gobject/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/gobject/Makefile.am	2012-03-11 22:43:29.000000000 +0100
-+++ libglib2-2.30.3/gobject/Makefile.am	2013-03-09 18:03:40.000000000 +0100
-@@ -4,7 +4,11 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
- 
--SUBDIRS = . tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = . $(TEST_SUBDIR)
- 
- BUILT_SOURCES=
- CLEANFILES=
-Index: libglib2-2.30.3/gthread/Makefile.am
-===================================================================
---- libglib2-2.30.3.orig/gthread/Makefile.am	2012-03-11 22:43:29.000000000 +0100
-+++ libglib2-2.30.3/gthread/Makefile.am	2013-03-09 18:04:16.000000000 +0100
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
- 
--SUBDIRS = . tests
-+if BUILD_TESTS
-+TEST_SUBDIR = tests
-+endif
-+
-+SUBDIRS = . $(TEST_SUBDIR)
- DIST_SUBDIRS = tests
- 
- AM_CPPFLAGS = 				\
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c7ffdce25e..8a63bd9492 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.30
-LIBGLIB2_VERSION_MINOR = 3
+LIBGLIB2_VERSION_MAJOR = 2.36
+LIBGLIB2_VERSION_MINOR = 1
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
@@ -47,6 +47,8 @@ LIBGLIB2_CONF_ENV = \
 		ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
 		ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \
 		ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \
+		ac_cv_func_newlocale=no ac_cv_func_uselocale=no \
+		ac_cv_func_strtod_l=no ac_cv_func_strtoll_l=no ac_cv_func_strtoull_l=no \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r
@@ -67,9 +69,9 @@ HOST_LIBGLIB2_CONF_OPT = \
 		--disable-dtrace \
 		--disable-systemtap \
 		--disable-gcov \
-		--disable-tests
+		--disable-modular-tests
 
-LIBGLIB2_CONF_OPT += --disable-tests
+LIBGLIB2_CONF_OPT += --disable-modular-tests
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 	LIBGLIB2_CONF_OPT += --with-threads=none --disable-threads
 endif

From 003a000d629fcd06b759e0c3528fe7697a942708 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 7 Jun 2013 13:18:47 +0000
Subject: [PATCH 5356/6849] gdk-pixbuf: bump to version 2.28.1

Signed-off-by: Spenser Gilliland <spenser at gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 49d38402a0..87775bba1a 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GDK_PIXBUF_MAJOR_VERSION = 2.24
+GDK_PIXBUF_MAJOR_VERSION = 2.28
 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).1
 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
 GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_MAJOR_VERSION)

From 4b3d949b8af240bda451b0a4e57d60153188c2e4 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 7 Jun 2013 13:18:48 +0000
Subject: [PATCH 5357/6849] libgtk2: bump to version 2.24.18 and drop DirectFB

* Drop DirectFB support from libgtk2
* bump libgtk2 to version 2.24.18

[Peter: fixup patch whitespace changes]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libgtk2/Config.in                     | 13 +++----
 .../libgtk2/libgtk2-reduce-dependencies.patch | 36 +++++++++----------
 package/libgtk2/libgtk2.mk                    | 27 +++++---------
 3 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 88f4cc195b..462b0b6239 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -8,11 +8,11 @@ config BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_GDK_PIXBUF
-	select BR2_PACKAGE_FONTCONFIG if BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	help
@@ -29,6 +29,3 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 
 comment "libgtk2 requires a toolchain with WCHAR and C++ support"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
-
-comment "WARNING: Libgtk2 directfb backend is deprecated"
-	depends on BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_XORG7
diff --git a/package/libgtk2/libgtk2-reduce-dependencies.patch b/package/libgtk2/libgtk2-reduce-dependencies.patch
index 5bb9db9a06..3250cae4b0 100644
--- a/package/libgtk2/libgtk2-reduce-dependencies.patch
+++ b/package/libgtk2/libgtk2-reduce-dependencies.patch
@@ -3,16 +3,17 @@ dependencies on graphic backends such as X.org or DirectFB. Gtk does
 not fully build in this mode, but it builds sufficiently to build the
 host tools that are needed to build the target Gtk.
 
+Changes:
+	Ported to 2.24.18
+
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
 ---
- configure.in |   34 +++++++++++++++++++++++++++-------
- 1 file changed, 27 insertions(+), 7 deletions(-)
-
-Index: b/configure.in
+Index: libgtk2-2.24.18/configure.ac
 ===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -259,12 +259,12 @@
+--- libgtk2-2.24.18.orig/configure.ac	2013-05-13 07:02:44.000000000 -0500
++++ libgtk2-2.24.18/configure.ac	2013-05-27 02:12:09.947030335 -0500
+@@ -258,12 +258,12 @@
    gdktarget=x11
  fi
  
@@ -27,7 +28,7 @@ Index: b/configure.in
    *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
  esac
  
-@@ -374,11 +374,15 @@
+@@ -372,11 +373,15 @@
  ## annoying to construct
  PKG_CHECK_MODULES(BASE_DEPENDENCIES,
    [glib-2.0 >= glib_required_version dnl
@@ -46,7 +47,7 @@ Index: b/configure.in
  ## In addition to checking that cairo is present, we also need to
  ## check that the correct cairo backend is there. E.g. if the GDK
  ## target is win32 we need the cairo-win32 backend and so on.
-@@ -389,8 +393,11 @@
+@@ -387,8 +392,11 @@
  if test "x$cairo_backend" = "xx11"; then
     cairo_backend=xlib
  fi
@@ -60,7 +61,7 @@ Index: b/configure.in
  
  PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
  
-@@ -1281,6 +1288,7 @@
+@@ -1279,6 +1287,7 @@
    AM_CONDITIONAL(USE_DIRECTFB, false)
  fi
  
@@ -68,7 +69,7 @@ Index: b/configure.in
  
  # Check for Pango flags
  
-@@ -1326,6 +1334,8 @@
+@@ -1324,6 +1333,8 @@
    GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
  fi
  
@@ -77,16 +78,15 @@ Index: b/configure.in
  GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
  GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
  #
-@@ -1344,6 +1354,8 @@
+@@ -1341,6 +1352,7 @@
+ AC_SUBST(GDK_DEP_LIBS)
  AC_SUBST(GDK_DEP_CFLAGS)
  
- 
 +if test "x$gdktarget" != "xnone"; then
-+
+ 
  ########################################
  # Check for Accessibility Toolkit flags
- ########################################
-@@ -1374,6 +1386,10 @@
+@@ -1372,6 +1384,10 @@
  fi
  
  GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
@@ -97,7 +97,7 @@ Index: b/configure.in
  if test "x$gdktarget" = "xx11"; then
    GTK_PACKAGES="$GTK_PACKAGES pangoft2"
  fi
-@@ -1529,6 +1545,8 @@
+@@ -1533,6 +1549,8 @@
  gtk_save_cppflags="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
  
@@ -106,7 +106,7 @@ Index: b/configure.in
  AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
  *** Can't find cairo-pdf.h. You must build Cairo with the pdf
  *** backend enabled.]))
-@@ -1543,6 +1561,8 @@
+@@ -1547,6 +1565,8 @@
  *** svg backend enabled.]))
  fi   
  
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 81929587fb..8ac455b4aa 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGTK2_VERSION_MAJOR = 2.24
-LIBGTK2_VERSION_MINOR = 10
+LIBGTK2_VERSION_MINOR = 18
 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
 
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
@@ -74,19 +74,14 @@ LIBGTK2_CONF_OPT = --disable-glibtest \
 
 LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
 
-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-	LIBGTK2_CONF_OPT += --with-gdktarget=directfb
-	LIBGTK2_DEPENDENCIES += directfb
-endif
-
-ifeq ($(BR2_PACKAGE_XORG7),y)
-	LIBGTK2_CONF_OPT += \
-		--with-x \
-		--x-includes=$(STAGING_DIR)/usr/include/X11 \
-		--x-libraries=$(STAGING_DIR)/usr/lib \
-		--with-gdktarget=x11
-	LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
-		xlib_libXext xlib_libXrender
+# Xorg dependencies
+LIBGTK2_CONF_OPT += \
+	--with-x \
+	--x-includes=$(STAGING_DIR)/usr/include/X11 \
+	--x-libraries=$(STAGING_DIR)/usr/lib \
+	--with-gdktarget=x11
+LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \
+	xlib_libXext xlib_libXrender
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
 	LIBGTK2_CONF_OPT += --enable-xinerama
@@ -122,10 +117,6 @@ ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
 	LIBGTK2_DEPENDENCIES += xlib_libXdamage
 endif
 
-else
-	LIBGTK2_CONF_OPT += --without-x
-endif
-
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 LIBGTK2_DEPENDENCIES += libpng
 else

From dca8781610115458f76589e6fd9a19c5ed5971b0 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 7 Jun 2013 13:18:49 +0000
Subject: [PATCH 5358/6849] libsoup: bump to version 2.43.1

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoup/Config.in  | 1 +
 package/libsoup/libsoup.mk | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 57b425f283..2ed08d9335 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	select BR2_PACKAGE_SQLITE
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
 	  and the GLib main loop, to integrate well with GNOME
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 2f7233aef1..c9d90e83bf 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBSOUP_MAJOR_VERSION = 2.36
+LIBSOUP_MAJOR_VERSION = 2.43
 LIBSOUP_MINOR_VERSION = 1
 LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION)
-LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2
+LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
 LIBSOUP_INSTALL_STAGING = YES
 
@@ -19,7 +19,7 @@ endif
 
 LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2 sqlite
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking

From 69e3d032ed0da9f246d39c5e04b63102004810f2 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 7 Jun 2013 13:18:50 +0000
Subject: [PATCH 5359/6849] webkit: bump to version 1.9.6

Remove bison-2.6-compat patch as it has been incorporated upstream.
Remove fix build issue with old gtk as gtk has been bumped to a newer
version.
Remove fix-build-with-gcc-4-6 as it has incorporated upstream.
Remove directfb patches due to depreciation
Remove pool patch as it is no longer required
Remove pthread_getattr_np as webkit no longer uses this function.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit-bison-2-6-compat.patch  | 672 ------------------
 package/webkit/webkit-disable-docrebase.patch |  26 +
 package/webkit/webkit-disable-tests.patch     |  80 +++
 package/webkit/webkit-execinfo_h.patch        |  28 +
 .../webkit-fix-build-issue-with-old-gtk.patch |  22 -
 .../webkit-fix-build-with-gcc-4-6.patch       |  45 --
 ...webkit-fix-compilation-on-DirectFB-2.patch |  33 -
 .../webkit-fix-compilation-on-DirectFB.patch  | 144 ----
 package/webkit/webkit-fix-pool.patch          |  67 --
 .../webkit/webkit-pthread_getattr_np.patch    |  80 ---
 package/webkit/webkit.mk                      |  31 +-
 11 files changed, 153 insertions(+), 1075 deletions(-)
 delete mode 100644 package/webkit/webkit-bison-2-6-compat.patch
 create mode 100644 package/webkit/webkit-disable-docrebase.patch
 create mode 100644 package/webkit/webkit-disable-tests.patch
 create mode 100644 package/webkit/webkit-execinfo_h.patch
 delete mode 100644 package/webkit/webkit-fix-build-issue-with-old-gtk.patch
 delete mode 100644 package/webkit/webkit-fix-build-with-gcc-4-6.patch
 delete mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
 delete mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB.patch
 delete mode 100644 package/webkit/webkit-fix-pool.patch
 delete mode 100644 package/webkit/webkit-pthread_getattr_np.patch

diff --git a/package/webkit/webkit-bison-2-6-compat.patch b/package/webkit/webkit-bison-2-6-compat.patch
deleted file mode 100644
index 7a94164fe6..0000000000
--- a/package/webkit/webkit-bison-2-6-compat.patch
+++ /dev/null
@@ -1,672 +0,0 @@
-Bison 2.6 compatibility fix
-
-Taken from upstream at http://trac.webkit.org/changeset/124099, with
-minor adaptations.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: webkit-1.2.7/WebCore/ChangeLog
-===================================================================
---- webkit-1.2.7.orig/WebCore/ChangeLog	2010-12-28 13:27:37.000000000 +0100
-+++ webkit-1.2.7/WebCore/ChangeLog	2012-12-15 15:48:40.000000000 +0100
-@@ -1,3 +1,28 @@
-+2012-07-30  Alexis Menard  <alexis.menard@openbossa.org>
-+
-+        Build fix with newer bison 2.6.
-+        https://bugs.webkit.org/show_bug.cgi?id=92264
-+
-+        Reviewed by Adam Barth.
-+
-+        As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
-+        YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
-+        version I had access to as well as recent Linux runs at least version 2.3 so it's safe
-+        to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
-+        As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
-+        of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
-+
-+        No new tests : build fix and the patch should not trigger any regressions
-+
-+        * css/CSSGrammar.y:
-+        * css/CSSParser.cpp:
-+        * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
-+        * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
-+        therefore including this file within the namespace {} declarations leads to xpathyyparse being
-+        defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
-+        (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 
-+        to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
-+
- 2010-06-21  Philippe Normand  <pnormand@igalia.com>
- 
-         Reviewed by Xan Lopez.
-Index: webkit-1.2.7/WebCore/css/CSSParser.cpp
-===================================================================
---- webkit-1.2.7.orig/WebCore/css/CSSParser.cpp	2010-12-28 13:24:33.000000000 +0100
-+++ webkit-1.2.7/WebCore/css/CSSParser.cpp	2012-12-15 17:29:57.000000000 +0100
-@@ -81,7 +81,7 @@
- extern int cssyydebug;
- #endif
- 
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
- 
- using namespace std;
- using namespace WTF;
-@@ -226,7 +226,7 @@
-     m_defaultNamespace = starAtom; // Reset the default namespace.
-     
-     setupParser("", string, "");
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     m_rule = 0;
- }
- 
-@@ -235,7 +235,7 @@
-     m_styleSheet = sheet;
-     m_allowNamespaceDeclarations = false;
-     setupParser("@-webkit-rule{", string, "} ");
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     return m_rule.release();
- }
- 
-@@ -243,7 +243,7 @@
- {
-     m_styleSheet = sheet;
-     setupParser("@-webkit-keyframe-rule{ ", string, "} ");
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     return m_keyframe.release();
- }
- 
-@@ -257,7 +257,7 @@
-     m_id = id;
-     m_important = important;
-     
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     
-     m_rule = 0;
- 
-@@ -304,7 +304,7 @@
-     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
- 
-     setupParser("@-webkit-decls{color:", string, "} ");
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     m_rule = 0;
- 
-     return (m_numParsedProperties && m_parsedProperties[0]->m_id == CSSPropertyColor);
-@@ -319,7 +319,7 @@
- 
-     setupParser("@-webkit-selector{", string, "}");
- 
--    cssyyparse(this);
-+    ::cssyyparse(this);
- 
-     m_selectorListForParseSelector = 0;
- }
-@@ -330,7 +330,7 @@
-     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
- 
-     setupParser("@-webkit-decls{", string, "} ");
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     m_rule = 0;
- 
-     bool ok = false;
-@@ -354,7 +354,7 @@
-     // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.
-     // instead insert one " " (which is WHITESPACE in CSSGrammar.y)
-     setupParser("@-webkit-mediaquery ", string, "} ");
--    cssyyparse(this);
-+    ::cssyyparse(this);
- 
-     bool ok = false;
-     if (m_mediaQuery) {
-@@ -5191,7 +5191,7 @@
-     nameValuePair += variableValue;
- 
-     setupParser("@-webkit-variables-decls{", nameValuePair, "} ");
--    cssyyparse(this);
-+    ::cssyyparse(this);
-     m_rule = 0;
- 
-     bool ok = false;
-Index: webkit-1.2.7/WebCore/css/CSSGrammar.y
-===================================================================
---- webkit-1.2.7.orig/WebCore/css/CSSGrammar.y	2010-09-10 15:20:33.000000000 +0200
-+++ webkit-1.2.7/WebCore/css/CSSGrammar.y	2012-12-15 15:48:40.000000000 +0100
-@@ -51,14 +51,13 @@
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
- 
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
- 
- %pure_parser
- 
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
-     bool boolean;
-     char character;
-@@ -85,7 +84,7 @@
- 
- %{
- 
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
- }
-Index: webkit-1.2.7/WebCore/xml/XPathParser.cpp
-===================================================================
---- webkit-1.2.7.orig/WebCore/xml/XPathParser.cpp	2010-09-10 15:20:33.000000000 +0200
-+++ webkit-1.2.7/WebCore/xml/XPathParser.cpp	2012-12-15 15:56:37.000000000 +0100
-@@ -35,20 +35,18 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
- 
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
-+using namespace XPath;
- 
--#include "XPathGrammar.h"    
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
-     
-@@ -630,7 +628,5 @@
-     delete t;
- }
- 
--}
--}
- 
- #endif // ENABLE(XPATH)
-Index: webkit-1.2.7/WebCore/xml/XPathGrammar.y
-===================================================================
---- webkit-1.2.7.orig/WebCore/xml/XPathGrammar.y	2010-02-05 17:26:58.000000000 +0100
-+++ webkit-1.2.7/WebCore/xml/XPathGrammar.y	2012-12-15 15:48:40.000000000 +0100
-@@ -36,6 +36,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
- 
-@@ -46,8 +47,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
- using namespace XPath;
-@@ -55,6 +54,7 @@
- %}
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
- {
-@@ -73,7 +73,7 @@
- %{
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
- 
-@@ -120,7 +120,7 @@
- Expr:
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
- 
-@@ -140,7 +140,7 @@
-     '/'
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     '/' RelativeLocationPath
-@@ -152,7 +152,7 @@
-     {
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
- 
-@@ -161,22 +161,22 @@
-     {
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     RelativeLocationPath '/' Step
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-     RelativeLocationPath DescendantOrSelf Step
-     {
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -185,58 +185,58 @@
-     {
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-         
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NodeTest OptionalPredicateList
-     {
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
- 
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AbbreviatedStep
-@@ -261,23 +261,23 @@
-         else if (*$1 == "comment")
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' LITERAL ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
- 
-@@ -295,14 +295,14 @@
-     {
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-     PredicateList Predicate
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
- 
-@@ -317,7 +317,7 @@
-     SLASHSLASH
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -325,13 +325,13 @@
-     '.'
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     DOTDOT
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -339,8 +339,8 @@
-     VARIABLEREFERENCE
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     '(' Expr ')'
-@@ -351,15 +351,15 @@
-     LITERAL
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NUMBER
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FunctionCall
-@@ -371,8 +371,8 @@
-         $$ = createFunction(*$1);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FUNCTIONNAME '(' ArgumentList ')'
-@@ -380,9 +380,9 @@
-         $$ = createFunction(*$1, *$3);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -391,14 +391,14 @@
-     {
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-     ArgumentList ',' Argument
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -414,9 +414,9 @@
-         $$ = new Union;
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -432,9 +432,9 @@
-     {
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -442,10 +442,10 @@
-         $3->insertFirstStep($2);
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -455,9 +455,9 @@
-     PrimaryExpr PredicateList
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -467,9 +467,9 @@
-     OrExpr OR AndExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -479,9 +479,9 @@
-     AndExpr AND EqualityExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -491,9 +491,9 @@
-     EqualityExpr EQOP RelationalExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -503,9 +503,9 @@
-     RelationalExpr RELOP AdditiveExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -515,17 +515,17 @@
-     AdditiveExpr PLUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     AdditiveExpr MINUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -535,9 +535,9 @@
-     MultiplicativeExpr MULOP UnaryExpr
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -548,8 +548,8 @@
-     {
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
diff --git a/package/webkit/webkit-disable-docrebase.patch b/package/webkit/webkit-disable-docrebase.patch
new file mode 100644
index 0000000000..77b9d1cce5
--- /dev/null
+++ b/package/webkit/webkit-disable-docrebase.patch
@@ -0,0 +1,26 @@
+This patch prevents documentation from being rebased or installed. This
+prevents an error when gtk-doc --rebase is called.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: webkit-1.9.6/Tools/GNUmakefile.am
+===================================================================
+--- webkit-1.9.6.orig/Tools/GNUmakefile.am	2012-08-06 07:34:49.000000000 -0500
++++ webkit-1.9.6/Tools/GNUmakefile.am	2013-05-28 21:29:54.135112927 -0500
+@@ -262,6 +262,8 @@
+ 	Tools/Scripts/webkit-build-directory \
+ 	Tools/Scripts/webkitdirs.pm
+ 
++if ENABLE_GTK_DOC
++
+ docs: docs-build.stamp
+ .PHONY : docs
+ DISTCLEANFILES += docs-build.stamp
+@@ -362,7 +364,6 @@
+ 	rm -rf $${installdir}
+ endif
+ 
+-if ENABLE_GTK_DOC
+ all: docs-build.stamp
+ endif
+ 
diff --git a/package/webkit/webkit-disable-tests.patch b/package/webkit/webkit-disable-tests.patch
new file mode 100644
index 0000000000..6fa6daae6b
--- /dev/null
+++ b/package/webkit/webkit-disable-tests.patch
@@ -0,0 +1,80 @@
+This prevents the Webkit test suites from being built.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: webkit-1.9.6/GNUmakefile.am
+===================================================================
+--- webkit-1.9.6.orig/GNUmakefile.am	2012-08-06 03:17:24.000000000 -0500
++++ webkit-1.9.6/GNUmakefile.am	2013-05-28 10:08:53.645129501 -0500
+@@ -282,11 +282,14 @@
+ include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
+ 
+ include Source/WebKit2/GNUmakefile.am
+-include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+ include Tools/MiniBrowser/gtk/GNUmakefile.am
++
++if ENABLE_TESTS
++include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+ include Tools/WebKitTestRunner/GNUmakefile.am
+ include Source/ThirdParty/gtest/GNUmakefile.am
+ include Tools/TestWebKitAPI/GNUmakefile.am
++endif # ENABLE_TESTS
+ # [GTK] Refactor the translations now that we have webkit2
+ # https://bugs.webkit.org/show_bug.cgi?id=55153
+ 
+Index: webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am
+===================================================================
+--- webkit-1.9.6.orig/Source/WebKit/gtk/GNUmakefile.am	2012-07-19 05:02:29.000000000 -0500
++++ webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am	2013-05-28 10:09:49.277130516 -0500
+@@ -413,6 +413,7 @@
+ dist_resources_DATA = \
+ 	$(shell ls $(srcdir)/Source/WebKit/gtk/resources/*.html)
+ 
++if ENABLE_TESTS
+ # Build unit tests
+ webkit_tests_cflags = \
+ 	-fno-strict-aliasing \
+@@ -613,6 +614,8 @@
+ Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
+ Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
+ 
++endif # ENABLE_TESTS
++
+ # Project-wide clean rules
+ # Files that will be cleaned
+ CLEANFILES += \
+Index: webkit-1.9.6/configure.ac
+===================================================================
+--- webkit-1.9.6.orig/configure.ac	2012-08-06 08:45:10.000000000 -0500
++++ webkit-1.9.6/configure.ac	2013-05-28 10:07:55.817128445 -0500
+@@ -516,6 +516,14 @@
+ AC_SUBST(CAIRO_CFLAGS)
+ AC_SUBST(CAIRO_LIBS)
+ 
++# check wheter to build tests
++AC_MSG_CHECKING([wheter to build tests])
++AC_ARG_ENABLE(tests,
++              AC_HELP_STRING([--enable-tests],
++                             [turn on tests [default=no]]),
++              [],[enable_debug="no"])
++AC_MSG_RESULT([$enable_tests])
++
+ # check whether to build with debugging enabled
+ AC_MSG_CHECKING([whether to do a debug build])
+ AC_ARG_ENABLE(debug,
+@@ -1423,6 +1431,7 @@
+ AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
+ 
+ # WebKit feature conditionals
++AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"])
+ AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
+ AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"])
+ AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
+@@ -1534,6 +1543,7 @@
+ WebKit was configured with the following options:
+ 
+ Build configuration:
++ Enable tests (slow)                                      : $enable_tests
+  Enable debugging (slow)                                  : $enable_debug
+  Compile with debug symbols (slow)                        : $enable_debug_symbols
+  Enable debug features (slow)                             : $enable_debug_features
diff --git a/package/webkit/webkit-execinfo_h.patch b/package/webkit/webkit-execinfo_h.patch
new file mode 100644
index 0000000000..404986b207
--- /dev/null
+++ b/package/webkit/webkit-execinfo_h.patch
@@ -0,0 +1,28 @@
+Fixes uclibc build as uclibc does not include backtrace functionality
+
+Signed-of-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
+===================================================================
+--- webkit-1.9.6.orig/Source/WTF/wtf/Assertions.cpp
++++ webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
+@@ -61,8 +61,10 @@
+ #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
++#if !defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
++#endif
+ 
+ #if OS(ANDROID)
+ #include "android/log.h"
+@@ -268,7 +270,7 @@ void WTFReportArgumentAssertionFailure(c
+ 
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
++#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) && !defined(__UCLIBC__)
+     *size = backtrace(stack, *size);
+ #elif OS(WINDOWS) && !OS(WINCE)
+     // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/package/webkit/webkit-fix-build-issue-with-old-gtk.patch b/package/webkit/webkit-fix-build-issue-with-old-gtk.patch
deleted file mode 100644
index 2b20bae6dd..0000000000
--- a/package/webkit/webkit-fix-build-issue-with-old-gtk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-The WebKit code conditionally calls getRootCoords() when the Gtk
-version is old (i.e < 2.17.3), but fails to declare the prototype of
-this function (which is implemented after its call site). This build
-failure has probably been missed due to the fact that not many people
-try to compile recent WebKit versions with old Gtk.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
-===================================================================
---- webkit-1.2.3.orig/WebKitTools/DumpRenderTree/gtk/EventSender.cpp	2010-07-19 20:42:27.000000000 +0200
-+++ webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp	2010-07-19 20:42:57.000000000 +0200
-@@ -86,6 +86,9 @@
- static void sendOrQueueEvent(GdkEvent event);
- static void dispatchEvent(GdkEvent event);
- static guint getStateFlags();
-+#if !GTK_CHECK_VERSION(2,17,3)
-+static void getRootCoords(GtkWidget* view, int* rootX, int* rootY);
-+#endif
- 
- static JSValueRef getDragModeCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
- {
diff --git a/package/webkit/webkit-fix-build-with-gcc-4-6.patch b/package/webkit/webkit-fix-build-with-gcc-4-6.patch
deleted file mode 100644
index 181c7f52fc..0000000000
--- a/package/webkit/webkit-fix-build-with-gcc-4-6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe:
-Removed the ChangeLog part.
-
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Mon, 18 Apr 2011 06:53:23 +0000
-Subject: [PATCH] 2011-04-17  Thierry Reding 
- <thierry.reding@avionic-design.de>
-
-        Reviewed by Adam Barth.
-
-        Fix build with GCC 4.6.
-
-        * dom/make_names.pl: Execute preprocessor without the -P option. The
-        preprocessor in GCC 4.6 eats empty lines, effectively breaking the
-        parsing performed by this script. Dropping the -P option when invoking
-        the preprocessor keeps the empty lines but as a side-effect also adds
-        additional linemarkers.
-
-        From the cpp manpage:
-
-          -P  Inhibit generation of linemarkers in the output from the
-              preprocessor. This might be useful when running the preprocessor
-              on something that is not C code, and will be sent to a program
-              which might be confused by the linemarkers.
-
-        The linemarkers are not problematic, however, because the script
-        properly handles them by ignoring all lines starting with a #.
-
-diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl
-index 836137e..50386e0 100755
---- a/WebCore/dom/make_names.pl
-+++ b/WebCore/dom/make_names.pl
-@@ -54,7 +54,7 @@ if ($ENV{CC}) {
- } else {
-     $gccLocation = "/usr/bin/gcc";
- }
--my $preprocessor = $gccLocation . " -E -P -x c++";
-+my $preprocessor = $gccLocation . " -E -x c++";
- 
- GetOptions(
-     'tags=s' => \$tagsFile, 
--- 
-1.7.11.4
-
diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
deleted file mode 100644
index a15226e1bf..0000000000
--- a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001
-From: Stephan Hoffmann <sho@relinux.de>
-Date: Thu, 27 Dec 2012 18:08:29 +0100
-Subject: [PATCH] Fix test for presence of X11
-
-The test in GNUmakefile.in checking for presence of X11 and
-enabling the XP_UNIX define succeeds even when X11 is not
-present and Webkit is built for DirectFB.
-
-Because of this X11-headers are included and the build fails.
-
-Signed-off-by: Stephan Hoffmann <sho@relinux.de>
----
- GNUmakefile.in |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index f14f27b..3ac811f 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -88,7 +88,8 @@ noinst_PROGRAMS = Programs/minidom$(EXEEXT) \
- 	$(am__EXEEXT_1)
- 
- # For the Gtk port we want to use XP_UNIX both in X11 and Mac
--@TARGET_WIN32_FALSE@am__append_1 = -DXP_UNIX
-+@TARGET_X11_TRUE@am__append_1 = -DXP_UNIX
-+@TARGET_QUARTZ_TRUE@am__append_1 = -DXP_UNIX
- @USE_ICU_UNICODE_TRUE@am__append_2 = \
- @USE_ICU_UNICODE_TRUE@	-DWTF_USE_ICU_UNICODE=1
- 
--- 
-1.7.0.4
-
diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB.patch b/package/webkit/webkit-fix-compilation-on-DirectFB.patch
deleted file mode 100644
index 256f8a1700..0000000000
--- a/package/webkit/webkit-fix-compilation-on-DirectFB.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 91a2bf4c3a21720a27223ba293ba90f58c349959 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <llandwerlin@gmail.com>
-Date: Sun, 11 Apr 2010 14:38:57 +0200
-Subject: [PATCH] Fix compilation with DirectFB
-
-Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
----
- GNUmakefile.am                        |    2 ++
- WebCore/plugins/PluginView.h          |    6 +++---
- WebCore/plugins/gtk/PluginViewGtk.cpp |   17 ++++++++---------
- 3 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/GNUmakefile.am b/GNUmakefile.am
-index 3bdfe53..8626bbb 100644
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -122,8 +122,10 @@ corekit_cppflags += \
- 
- # For the Gtk port we want to use XP_UNIX both in X11 and Mac
- if !TARGET_WIN32
-+if !TARGET_DIRECTFB
- corekit_cppflags += -DXP_UNIX
- endif
-+endif
- 
- # Default compiler flags
- global_cflags += \
-diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
-index 21a25f6..8116864 100644
---- a/WebCore/plugins/PluginView.h
-+++ b/WebCore/plugins/PluginView.h
-@@ -22,7 +22,7 @@
-  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- #ifndef PluginView_h
-@@ -312,7 +312,7 @@ namespace WebCore {
-         bool m_haveInitialized;
-         bool m_isWaitingToStart;
- 
--#if defined(XP_UNIX)
-+#if defined(XP_UNIX) || PLATFORM(DIRECTFB)
-         bool m_needsXEmbed;
- #endif
- 
-@@ -340,7 +340,7 @@ public:
- 
- private:
- 
--#if defined(XP_UNIX) || OS(SYMBIAN)
-+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(DIRECTFB)
-         void setNPWindowIfNeeded();
- #elif defined(XP_MACOSX)
-         NP_CGContext m_npCgContext;
-diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
-index 8de63e0..039a845 100644
---- a/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -23,7 +23,7 @@
-  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- #include "config.h"
-@@ -45,6 +45,7 @@
- #include "Image.h"
- #include "KeyboardEvent.h"
- #include "MouseEvent.h"
-+#include "NotImplemented.h"
- #include "Page.h"
- #include "PlatformKeyboardEvent.h"
- #include "PlatformMouseEvent.h"
-@@ -137,7 +138,7 @@ void PluginView::updatePluginWidget()
-     if (!m_isWindowed) {
-         if (m_drawable)
-             XFreePixmap(GDK_DISPLAY(), m_drawable);
--            
-+
-         m_drawable = XCreatePixmap(GDK_DISPLAY(), getRootWindow(m_parentFrame.get()),
-                                    m_windowRect.width(), m_windowRect.height(),
-                                    ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth);
-@@ -571,7 +572,7 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
- 
-     //FIXME - read the file data into buffer
-     FILE* fileHandle = fopen((filename.utf8()).data(), "r");
--    
-+
-     if (fileHandle == 0)
-         return NPERR_FILE_NOT_FOUND;
- 
-@@ -706,6 +707,7 @@ void PluginView::forceRedraw()
-         gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
- }
- 
-+#if defined(XP_UNIX)
- static Display* getPluginDisplay()
- {
-     // The plugin toolkit might have a different X connection open.  Since we're
-@@ -713,14 +715,9 @@ static Display* getPluginDisplay()
-     // plugins, so we can return that.  We might want to add other implementations here
-     // later.
- 
--#if defined(XP_UNIX)
-     return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
--#else
--    return 0;
--#endif
- }
- 
--#if defined(XP_UNIX)
- static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
- {
-     *visual = 0;
-@@ -794,9 +791,9 @@ bool PluginView::platformStart()
-     }
- 
-     if (m_isWindowed) {
--#if defined(XP_UNIX)
-         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
- 
-+#if defined(XP_UNIX)
-         if (m_needsXEmbed) {
-             // If our parent is not anchored the startup process will
-             // fail miserably for XEmbed plugins a bit later on when
-@@ -817,7 +814,9 @@ bool PluginView::platformStart()
- #endif
-     } else {
-         setPlatformWidget(0);
-+#if defined(XP_UNIX)
-         m_pluginDisplay = getPluginDisplay();
-+#endif
-     }
- 
-     show();
--- 
-1.7.0.4
-
diff --git a/package/webkit/webkit-fix-pool.patch b/package/webkit/webkit-fix-pool.patch
deleted file mode 100644
index 5a66a82296..0000000000
--- a/package/webkit/webkit-fix-pool.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Fixup pool and add sparc support
-Nixed from gentoo
-
---- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
-+++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
-             : m_freeList(pool())
-             , m_isDoneWithInitialFreeList(false)
-         { 
--            memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+            memset(m_pool, 0, sizeof(m_pool));
-         }
- 
-         Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
-         }
- 
-     private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
-         Node* pastPool() { return pool() + m_poolSize; }
- 
-         bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
-         Node* m_freeList;
-         bool m_isDoneWithInitialFreeList;
-         static const size_t m_poolSize = 256;
--        union {
--            char pool[sizeof(Node) * m_poolSize];
--            double forAlignment;
--        } m_pool;
-+        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
-     };
- 
-     template<typename ValueArg> struct ListHashSetNode {
---- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp
-+++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
-@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
-     if (string->length() != length)
-         return false;
- 
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
---- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
-+++ webkit-1.2.1/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@ namespace WebCore {
- 
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
--            for (unsigned i = 0; i != aLength; ++i) {
-+            for (unsigned i = 0; i != aLength; ++i)
-                 if (*aChars++ != *bChars++)
-                     return false;
--            }
-+
-             return true;
- #else
-             /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/package/webkit/webkit-pthread_getattr_np.patch b/package/webkit/webkit-pthread_getattr_np.patch
deleted file mode 100644
index 8027e37060..0000000000
--- a/package/webkit/webkit-pthread_getattr_np.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Patch WebKit because pthread_getattr_np is not implemented in uClibc
-
-Define UCLIBC_USE_PROC_SELF_MAPS etc. as a workaround for uClibc. This
-code was in the qtoipa webkit but appears to have been removed from
-more recent versions of webkit.
-
-See: http://bugreports.qt.nokia.com/browse/QTBUG-6551
-Credit for fix: http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&p=545066#545066
-
-Signed-off-by: Paul Jones <paul@pauljones.id.au>
-
-Index: webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp
-===================================================================
---- webkit-1.2.3.orig/JavaScriptCore/runtime/Collector.cpp	2010-07-22 17:16:19.000000000 +0200
-+++ webkit-1.2.3/JavaScriptCore/runtime/Collector.cpp	2010-07-22 17:25:02.000000000 +0200
-@@ -75,6 +75,19 @@
- #endif
- #include <unistd.h>
- 
-+#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have
-+// pthread_getattr_np or pthread_attr_getstack.
-+#if __UCLIBC_MAJOR__ == 0 &&					\
-+  (__UCLIBC_MINOR__ < 9 ||					\
-+   (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) &&	\
-+   defined(__LINUXTHREADS_OLD__)
-+#define UCLIBC_USE_PROC_SELF_MAPS 1
-+#include <stdio_ext.h>
-+extern int *__libc_stack_end;
-+#endif
-+#endif
-+
- #if OS(SOLARIS)
- #include <thread.h>
- #else
-@@ -610,6 +622,36 @@
-     get_thread_info(find_thread(NULL), &threadInfo);
-     return threadInfo.stack_end;
- #elif OS(UNIX)
-+#ifdef UCLIBC_USE_PROC_SELF_MAPS
-+    // Read /proc/self/maps and locate the line whose address
-+    // range contains __libc_stack_end.
-+    FILE *file = fopen("/proc/self/maps", "r");
-+    if (!file)
-+      return 0;
-+    __fsetlocking(file, FSETLOCKING_BYCALLER);
-+    char *line = NULL;
-+    size_t lineLen = 0;
-+    while (!feof_unlocked(file)) {
-+      if (getdelim(&line, &lineLen, '\n', file) <= 0)
-+	break;
-+      long from;
-+      long to;
-+      if (sscanf (line, "%lx-%lx", &from, &to) != 2)
-+	continue;
-+      if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
-+	fclose(file);
-+	free(line);
-+#ifdef _STACK_GROWS_UP
-+	return (void *)from;
-+#else
-+	return (void *)to;
-+#endif
-+      }
-+    }
-+    fclose(file);
-+    free(line);
-+    return 0;
-+#else 
-     static void* stackBase = 0;
-     static size_t stackSize = 0;
-     static pthread_t stackThread;
-@@ -631,6 +673,7 @@
-         stackThread = thread;
-     }
-     return static_cast<char*>(stackBase) + stackSize;
-+#endif
- #elif OS(WINCE)
-     if (g_stackBase)
-         return g_stackBase;
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index c0a14c15fc..9aa8390bf1 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -4,27 +4,34 @@
 #
 ################################################################################
 
-WEBKIT_VERSION = 1.2.7
+WEBKIT_VERSION = 1.9.6
 WEBKIT_SITE = http://www.webkitgtk.org/releases
+WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.xz
 WEBKIT_INSTALL_STAGING = YES
 WEBKIT_DEPENDENCIES = host-flex host-bison host-gperf icu libcurl libxml2 \
 	libxslt libgtk2 sqlite enchant libsoup jpeg libgail
 
+# webkit-disable-tests.patch changes configure.ac therefore autoreconf required
+WEBKIT_AUTORECONF = YES
+WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
+
 # Give explicit path to icu-config, and silence gazillions of warnings
 # with recent gcc versions.
 WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config \
-	CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align" \
-	CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align"
-
+	CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align -Wno-sign-compare" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align -Wno-sign-compare"
 
-ifeq ($(BR2_PACKAGE_XORG7),y)
-	WEBKIT_CONF_OPT += --with-target=x11
-	WEBKIT_DEPENDENCIES += xlib_libXt
-else
-	WEBKIT_CONF_OPT += --with-target=directfb
-	WEBKIT_DEPENDENCIES += directfb
-endif
+WEBKIT_CONF_OPT += \
+	--with-gtk=2.0 \
+	--disable-geolocation \
+	--disable-webkit2 \
+	--disable-glibtest \
+	--disable-video \
+	--disable-gtk-doc-html \
+	--disable-tests
 
-WEBKIT_CONF_OPT += --disable-video
+# Xorg Dependencies
+WEBKIT_CONF_OPT += --with-target=x11
+WEBKIT_DEPENDENCIES += xlib_libXt
 
 $(eval $(autotools-package))

From 205643a3454fee967bd7fbc8e1668f6d18a83ce3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 23:45:36 +0000
Subject: [PATCH 5360/6849] libpcap: fix build failure related to libnl3

When libpcap detects that libnl3 is available, it hardcodes the fact
of using -I/usr/include/libnl3, which is completely wrong in
cross-compilation.

This commit fixes that, by removing this hardcoded include path, and
by passing an appropriate -I option from libpcap.mk.

The original issue has been reported upstream at
https://github.com/the-tcpdump-group/libpcap/issues/305.

Fixes:

  http://autobuild.buildroot.net/results/b65/b6585bf2985a188e797e5a6b71a35c461421e3b4/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libpcap-remove-libnl-include-path.patch   | 16 ++++++++++++++++
 package/libpcap/libpcap.mk                    | 19 +++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 package/libpcap/libpcap-remove-libnl-include-path.patch

diff --git a/package/libpcap/libpcap-remove-libnl-include-path.patch b/package/libpcap/libpcap-remove-libnl-include-path.patch
new file mode 100644
index 0000000000..7b7106b53d
--- /dev/null
+++ b/package/libpcap/libpcap-remove-libnl-include-path.patch
@@ -0,0 +1,16 @@
+Remove hardcoded path to libnl3 include directory
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -445,7 +445,6 @@
+ 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
+ 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
+ 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
+-			V_INCLS="$V_INCLS -I/usr/include/libnl3"
+ 			have_any_nl="yes"
+ 		])
+ 
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index bbbecdc0d0..ec4d346efb 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -9,10 +9,14 @@ LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_LICENSE = BSD-3c
 LIBPCAP_LICENSE_FILES = LICENSE
 LIBPCAP_INSTALL_STAGING = YES
-LIBPCAP_DEPENDENCIES = zlib host-flex host-bison \
-	$(if $(BR2_PACKAGE_LIBNL),libnl)
+LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
+
+# We're patching configure.in
+LIBPCAP_AUTORECONF = YES
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
-		ac_cv_header_linux_wireless_h=yes # configure misdetects this
+		ac_cv_header_linux_wireless_h=yes \
+		CFLAGS="$(LIBPCAP_CFLAGS)"
+LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 LIBPCAP_CONFIG_SCRIPTS = pcap-config
 
@@ -23,9 +27,16 @@ else
 LIBPCAP_CONF_OPT += --disable-canusb
 endif
 
+ifeq ($(BR2_PACKAGE_LIBNL),y)
+LIBPCAP_DEPENDENCIES += libnl
+LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3"
+else
+LIBPCAP_CONF_OPT += --without-libnl
+endif
+
 # microblaze needs -fPIC instead of -fpic
 ifeq ($(BR2_microblaze),y)
-LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
+LIBPCAP_CFLAGS += -fPIC
 endif
 
 $(eval $(autotools-package))

From a3bd97f6b6ccad3c2ebf992a7761570527aad4ba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 23:58:15 +0000
Subject: [PATCH 5361/6849] libsoup: add missing dependency on host-intltool

Fixes:

  http://autobuild.buildroot.net/results/e24/e240828ed2fdeb98f36818c0ef19b15dadc2e59f/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoup/libsoup.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index c9d90e83bf..252214fbe5 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,7 +19,8 @@ endif
 
 LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 libglib2 libxml2 sqlite
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 \
+       libglib2 libxml2 sqlite host-intltool
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking

From 1d0f68f4767df9bc79c206ec03314e60ffa4e7eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Jun 2013 00:36:39 +0000
Subject: [PATCH 5362/6849] gvfs: bump to 1.16.2

Following the libglib2 bump, gvfs must be updated. We don't bump to
the latest 1.17.1, because it requires libglib2 2.37, and we have only
libglib2 2.36.x at this point.

Fixes:

   http://autobuild.buildroot.net/results/d02/d026f3e697d60a3730f89acab18515eb568c4d0e/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gvfs/gvfs.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 32d8b49f64..d99c7843e7 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GVFS_VERSION_MAJOR = 1.8
+GVFS_VERSION_MAJOR = 1.16
 GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
-GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
+GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
 GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info

From c73c5fc90d0d40c86ea7690e23fa34409c39f4bf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Jun 2013 00:57:38 +0000
Subject: [PATCH 5363/6849] am33x-cm3: Enforce correct -march option

Buildroot uses a normal ARM compiler to build the AM33X CM3 firmware
(which runs on a Cortex-M3 processor), but Buildroot will have a
default -march value that doesn't necessarily match the one needed for
Cortex-M3, leading to build failures (gcc complains that the
-mcpu=cortex-m3 option being passed is not compatible with the
selected -march).

Fix this by explicitly indicating -march=armv7-m.

Fixes:

   http://autobuild.buildroot.net/results/db1/db13623b1701bfe678c302e8f88c7473cb2345f9/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../am33x-cm3-0001-fix-makefile.patch         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/am33x-cm3/am33x-cm3-0001-fix-makefile.patch

diff --git a/package/am33x-cm3/am33x-cm3-0001-fix-makefile.patch b/package/am33x-cm3/am33x-cm3-0001-fix-makefile.patch
new file mode 100644
index 0000000000..77ba11c778
--- /dev/null
+++ b/package/am33x-cm3/am33x-cm3-0001-fix-makefile.patch
@@ -0,0 +1,26 @@
+Enforce correct -march option
+
+Buildroot uses a normal ARM compiler to build the AM33X CM3 firmware
+(which runs on a Cortex-M3 processor), but Buildroot will have a
+default -march value that doesn't necessarily match the one needed for
+Cortex-M3, leading to build failures (gcc complains that the
+-mcpu=cortex-m3 option being passed is not compatible with the
+selected -march).
+
+Fix this by explicitly indicating -march=armv7-m.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@
+ BINDIR = bin
+ 
+ INCLUDES = $(SRCDIR)/include
+-CFLAGS =-mcpu=cortex-m3 -mthumb -nostdlib -Wall -g -I$(INCLUDES)
++CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -g -I$(INCLUDES)
+ LDFLAGS =-nostartfiles -fno-exceptions -Tfirmware.ld
+ 
+ EXECUTABLE=am335x-pm-firmware.elf

From 06938c3a9e3b3d41606e5d08256671d0d48fbfa8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Jun 2013 02:37:14 +0000
Subject: [PATCH 5364/6849] dosfstools: upstream tarball site changed

Upstream changed their distribution tarball site.
Thanks go to Andrew Scheller from bug #6308 for noticing and reporting.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 624198cf93..7482bc870e 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 DOSFSTOOLS_VERSION = 3.0.16
-DOSFSTOOLS_SITE = http://fossies.org/linux/misc
+DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
 DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)

From f0deded91247e079d84542a89a9b2a2280827181 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Jun 2013 02:46:38 +0000
Subject: [PATCH 5365/6849] samba: needs threads

As pointed by Thomas on IRC. Fixes:
http://autobuild.buildroot.net/results/24f/24fe95a7775af10c6ed7514cbc72a2189e57bc25/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/Config.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index 0ab67edbbb..a3218b53ed 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SAMBA
 	bool "samba"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_POPT
 	help
 	  Provides print services to all manner of SMB/CIFS clients,
@@ -11,6 +12,9 @@ config BR2_PACKAGE_SAMBA
 	  NOTE: A complete Samba install takes over 50MB of space,
 		so choose only the components you need.
 
+comment "samba needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 if BR2_PACKAGE_SAMBA
 
 config BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL
@@ -240,14 +244,13 @@ config BR2_PACKAGE_SAMBA_AVAHI
 	bool "support avahi"
 	default y
 	depends on BR2_PACKAGE_AVAHI_DAEMON
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	help
 	  Include support for avahi
 
-comment "support avahi - disabled (requires avahi-daemon and thread support in toolchain)"
-	depends on !BR2_PACKAGE_AVAHI_DAEMON || !BR2_TOOLCHAIN_HAS_THREADS
+comment "support avahi - disabled (requires avahi-daemon)"
+	depends on !BR2_PACKAGE_AVAHI_DAEMON
 
 config BR2_PACKAGE_SAMBA_GAMIN
 	bool "support gamin"

From dbf426da06e034d1109897f557445b192cb6a128 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 9 Jun 2013 02:49:53 +0000
Subject: [PATCH 5366/6849] squid: bump to version 3.3.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../squid-01-assume-get-certificate-ok.patch     | 16 ++++++++++++++++
 package/squid/squid.mk                           |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 package/squid/squid-01-assume-get-certificate-ok.patch

diff --git a/package/squid/squid-01-assume-get-certificate-ok.patch b/package/squid/squid-01-assume-get-certificate-ok.patch
new file mode 100644
index 0000000000..e7d4515cd3
--- /dev/null
+++ b/package/squid/squid-01-assume-get-certificate-ok.patch
@@ -0,0 +1,16 @@
+The openssl get_certificate working test isn't cross compile friendly.
+Just assume it works ok since we're using a modern OpenSSL version.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura squid-3.3.5.orig/configure.ac squid-3.3.5/configure.ac
+--- squid-3.3.5.orig/configure.ac	2013-06-03 09:37:44.016398185 -0300
++++ squid-3.3.5/configure.ac	2013-06-03 09:37:55.926784556 -0300
+@@ -1261,7 +1261,6 @@
+ AC_SUBST(SSLLIB)
+
+ if test "x$with_openssl" = "xyes"; then
+-SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
+ SQUID_CHECK_OPENSSL_TXTDB
+ fi
+
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 934277e781..4dd14042e4 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-SQUID_VERSION = 3.3.4
+SQUID_VERSION = 3.3.5
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING
+SQUID_AUTORECONF = YES
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \

From f8634af6912fe1bdc408ffa99c9c175b0f9156ab Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Jun 2013 12:22:27 +0200
Subject: [PATCH 5367/6849] libglib2: renumber patches

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...lib2-optional-ipv6.patch => libglib2-0001-optional-ipv6.patch} | 0
 ...patch => libglib2-0002-fix-build-when-no-thread-support.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/libglib2/{libglib2-optional-ipv6.patch => libglib2-0001-optional-ipv6.patch} (100%)
 rename package/libglib2/{libglib2-0004-fix-build-when-no-thread-support.patch => libglib2-0002-fix-build-when-no-thread-support.patch} (100%)

diff --git a/package/libglib2/libglib2-optional-ipv6.patch b/package/libglib2/libglib2-0001-optional-ipv6.patch
similarity index 100%
rename from package/libglib2/libglib2-optional-ipv6.patch
rename to package/libglib2/libglib2-0001-optional-ipv6.patch
diff --git a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch
similarity index 100%
rename from package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
rename to package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch

From 99328951a3d624938562c64d58b8d130b7b05fbc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 9 Jun 2013 00:22:28 +0000
Subject: [PATCH 5368/6849] libglib2: update no IPv6 patch to libglib2 2.36

Fixes:

   http://autobuild.buildroot.net/results/dec/dece077c2cc831332badefb46c386a762ffcad55/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libglib2-0001-optional-ipv6.patch         | 154 +++++++++++++++++-
 1 file changed, 148 insertions(+), 6 deletions(-)

diff --git a/package/libglib2/libglib2-0001-optional-ipv6.patch b/package/libglib2/libglib2-0001-optional-ipv6.patch
index 8e7b418a04..cbab1f1df8 100644
--- a/package/libglib2/libglib2-0001-optional-ipv6.patch
+++ b/package/libglib2/libglib2-0001-optional-ipv6.patch
@@ -1,14 +1,17 @@
 [PATCH]: fix build on uClibc without IPv6 support
 
+Updated to glib 2.36 by Thomas Petazzoni.
+
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
  gio/ginetaddress.c |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-Index: glib-2.26.0/gio/ginetaddress.c
+Index: b/gio/ginetaddress.c
 ===================================================================
---- glib-2.26.0.orig/gio/ginetaddress.c
-+++ glib-2.26.0/gio/ginetaddress.c
+--- a/gio/ginetaddress.c
++++ b/gio/ginetaddress.c
 @@ -21,6 +21,7 @@
   *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
   */
@@ -17,7 +20,7 @@ Index: glib-2.26.0/gio/ginetaddress.c
  #include <config.h>
  
  #include <string.h>
-@@ -434,7 +435,11 @@
+@@ -423,7 +424,11 @@
    return NULL;
  }
  
@@ -29,7 +32,7 @@ Index: glib-2.26.0/gio/ginetaddress.c
  
  /**
   * g_inet_address_new_from_bytes:
-@@ -483,8 +488,10 @@
+@@ -472,8 +477,10 @@
  
        return g_inet_address_new_from_bytes (addr, family);
      }
@@ -40,7 +43,7 @@ Index: glib-2.26.0/gio/ginetaddress.c
  }
  
  /**
-@@ -510,8 +517,10 @@
+@@ -499,8 +506,10 @@
  
        return g_inet_address_new_from_bytes (addr, family);
      }
@@ -51,3 +54,142 @@ Index: glib-2.26.0/gio/ginetaddress.c
  }
  
  
+Index: b/gio/gsocket.c
+===================================================================
+--- a/gio/gsocket.c
++++ b/gio/gsocket.c
+@@ -425,7 +425,9 @@
+   switch (family)
+     {
+      case G_SOCKET_FAMILY_IPV4:
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+      case G_SOCKET_FAMILY_IPV6:
++#endif
+        socket->priv->family = address.ss_family;
+        switch (socket->priv->type)
+ 	 {
+@@ -1321,11 +1323,13 @@
+       g_socket_get_option (socket, IPPROTO_IP, IP_TTL,
+ 			   &value, &error);
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+     {
+       g_socket_get_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
+ 			   &value, &error);
+     }
++#endif
+   else
+     g_return_val_if_reached (0);
+ 
+@@ -1362,6 +1366,7 @@
+       g_socket_set_option (socket, IPPROTO_IP, IP_TTL,
+ 			   ttl, &error);
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+     {
+       g_socket_set_option (socket, IPPROTO_IP, IP_TTL,
+@@ -1369,6 +1374,7 @@
+       g_socket_set_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
+ 			   ttl, &error);
+     }
++#endif
+   else
+     g_return_if_reached ();
+ 
+@@ -1470,11 +1476,13 @@
+       g_socket_get_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
+ 			   &value, &error);
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+     {
+       g_socket_get_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
+ 			   &value, &error);
+     }
++#endif
+   else
+     g_return_val_if_reached (FALSE);
+ 
+@@ -1515,6 +1523,7 @@
+       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
+ 			   loopback, &error);
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+     {
+       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
+@@ -1522,6 +1531,7 @@
+       g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
+ 			   loopback, &error);
+     }
++#endif
+   else
+     g_return_if_reached ();
+ 
+@@ -1559,11 +1569,13 @@
+       g_socket_get_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
+ 			   &value, &error);
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+     {
+       g_socket_get_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
+ 			   &value, &error);
+     }
++#endif
+   else
+     g_return_val_if_reached (FALSE);
+ 
+@@ -1601,6 +1613,7 @@
+       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
+ 			   ttl, &error);
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+     {
+       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
+@@ -1608,6 +1621,7 @@
+       g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
+ 			   ttl, &error);
+     }
++#endif
+   else
+     g_return_if_reached ();
+ 
+@@ -1965,6 +1979,7 @@
+       result = setsockopt (socket->priv->fd, IPPROTO_IP, optname,
+ 			   &mc_req, sizeof (mc_req));
+     }
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
+   else if (g_inet_address_get_family (group) == G_SOCKET_FAMILY_IPV6)
+     {
+       struct ipv6_mreq mc_req_ipv6;
+@@ -1982,6 +1997,7 @@
+       result = setsockopt (socket->priv->fd, IPPROTO_IPV6, optname,
+ 			   &mc_req_ipv6, sizeof (mc_req_ipv6));
+     }
++#endif
+   else
+     g_return_val_if_reached (FALSE);
+ 
+@@ -2089,8 +2105,8 @@
+     case G_SOCKET_FAMILY_IPV4:
+       return TRUE;
+ 
+-    case G_SOCKET_FAMILY_IPV6:
+ #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
++    case G_SOCKET_FAMILY_IPV6:
+       {
+         gint v6_only;
+ 
+@@ -2101,8 +2117,6 @@
+ 
+         return !v6_only;
+       }
+-#else
+-      return FALSE;
+ #endif
+ 
+     default:

From 258bb8e1610e13d2d5dfaeb39fe8291fcabb3558 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 7 Jun 2013 05:04:30 +0000
Subject: [PATCH 5369/6849] linphone: Disable building with -Werror

Pass --disable-strict to avoid having -Werror in CFLAGS.
Having -Werror in CFLAGS can lead to build problems depending
on the gcc version that is being used and it should not be used
in released code.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linphone/linphone.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index bbab1e55a9..2ff678b8ed 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -8,7 +8,8 @@ LINPHONE_VERSION = 3.5.2
 LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
 LINPHONE_CONF_OPT = \
 	--enable-external-ortp \
-	--enable-external-mediastreamer
+	--enable-external-mediastreamer \
+	--disable-strict
 
 LINPHONE_DEPENDENCIES = host-pkgconf ortp mediastreamer libeXosip2 speex
 

From 2228c15e4161881fd77c3134f73bb5f913d4971a Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Sun, 26 May 2013 12:08:16 +0000
Subject: [PATCH 5370/6849] poco: Add upstream patch to add support for
 aarch64.

Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/poco/Config.in          |  4 ++--
 package/poco/poco-aarch64.patch | 39 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 package/poco/poco-aarch64.patch

diff --git a/package/poco/Config.in b/package/poco/Config.in
index 402f96d3bf..47ca83dbe9 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_POCO
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
+	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
@@ -62,4 +62,4 @@ endif # BR2_PACKAGE_POCO
 comment "poco requires a toolchain with WCHAR, threads, and C++ support"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS
-	depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
+	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
diff --git a/package/poco/poco-aarch64.patch b/package/poco/poco-aarch64.patch
new file mode 100644
index 0000000000..f629f7ba92
--- /dev/null
+++ b/package/poco/poco-aarch64.patch
@@ -0,0 +1,39 @@
+From 37899eda9563d9134cb5864751b6432cabfaac3e Mon Sep 17 00:00:00 2001
+From: Will Newton <will.newton@linaro.org>
+Date: Tue, 21 May 2013 22:11:05 +0100
+Subject: [PATCH] Foundation/include/Poco/Platform.h: Add support for AArch64.
+
+Add support for big and little endian AArch64 preprocessor defines.
+---
+ Foundation/include/Poco/Platform.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
+index f34f277..8ddb4cb 100644
+--- a/Foundation/include/Poco/Platform.h
++++ b/Foundation/include/Poco/Platform.h
+@@ -145,6 +145,7 @@
+ #define POCO_ARCH_S390    0x0c
+ #define POCO_ARCH_SH      0x0d
+ #define POCO_ARCH_NIOS2   0x0e
++#define POCO_ARCH_AARCH64 0x0f
+ 
+ 
+ #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
+@@ -207,7 +208,12 @@
+ 	#else
+ 		#define POCO_ARCH_BIG_ENDIAN 1
+ 	#endif
+-
++#elif defined(__AARCH64EL__)
++	#define POCO_ARCH POCO_ARCH_AARCH64
++	#define POCO_ARCH_LITTLE_ENDIAN 1
++#elif defined(__AARCH64EB__)
++	#define POCO_ARCH POCO_ARCH_AARCH64
++	#define POCO_ARCH_BIG_ENDIAN 1
+ #endif
+ 
+ 
+-- 
+1.8.1.4
+

From 45ef34d5cf28b4a96fcaea7aacae309ac3b4c51b Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Sun, 9 Jun 2013 14:35:44 -0700
Subject: [PATCH 5371/6849] strace: upgrade to 4.8, supporting now aarch64, and
 xtensa

Remove 'strace-fix-arm-bad-syscall.patch'. This patch had been integrated
in v4.6 (commit: 9bc6340d2) and was later replaced with a generic solution
in v.7 (commit: 2ce12ed31c2).

Strace still cannot handle non-LFS environments, so a modified version of
strace-fix-disabled-largefile-syscalls.patch remains. The 64-bit syscalls
(sys_truncate64, etc.) are references in the sysent structure but the
functinon definitions are commented out becuase of the missing LFS support.

The workaround for the 'forced lfs mode' doesn't seem to be necessary anymore.

Build tested on arm w and w/o LFS support.

[Peter: arc still not supported]
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/Config.in                       |  2 +-
 .../strace/strace-fix-arm-bad-syscall.patch    | 18 ------------------
 ...trace-fix-disabled-largefile-syscalls.patch |  6 +++---
 package/strace/strace.mk                       |  9 +--------
 4 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 package/strace/strace-fix-arm-bad-syscall.patch

diff --git a/package/strace/Config.in b/package/strace/Config.in
index 153bcf69a0..0959ec535b 100644
--- a/package/strace/Config.in
+++ b/package/strace/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_STRACE
 	bool "strace"
-	depends on !(BR2_xtensa || BR2_aarch64 || BR2_arc)
+	depends on !BR2_arc
 	help
 	  A useful diagnostic, instructional, and debugging tool.
 	  Allows you to track what system calls a program makes
diff --git a/package/strace/strace-fix-arm-bad-syscall.patch b/package/strace/strace-fix-arm-bad-syscall.patch
deleted file mode 100644
index 3f3144e92a..0000000000
--- a/package/strace/strace-fix-arm-bad-syscall.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/syscall.c
-+++ b/syscall.c
-@@ -1016,6 +1016,15 @@ struct tcb *tcp;
- 		/*
- 		 * Note: we only deal with only 32-bit CPUs here.
- 		 */
-+
-+		if (!(tcp->flags & TCB_INSYSCALL) &&
-+		    (tcp->flags & TCB_WAITEXECVE)) {
-+			/* caught a fake syscall from the execve's exit */
-+			tcp->flags &= ~TCB_WAITEXECVE;
-+			return 0;
-+		}
-+ 
-+
- 		if (regs.ARM_cpsr & 0x20) {
- 			/*
- 			 * Get the Thumb-mode system call number
diff --git a/package/strace/strace-fix-disabled-largefile-syscalls.patch b/package/strace/strace-fix-disabled-largefile-syscalls.patch
index f6bcf96cf5..2117a0e407 100644
--- a/package/strace/strace-fix-disabled-largefile-syscalls.patch
+++ b/package/strace/strace-fix-disabled-largefile-syscalls.patch
@@ -1,8 +1,8 @@
 --- a/syscall.c
 +++ b/syscall.c
 @@ -125,6 +125,18 @@
- #define TP TRACE_PROCESS
- #define TS TRACE_SIGNAL
+ #define NF SYSCALL_NEVER_FAILS
+ #define MA MAX_ARGS
  
 +#ifndef HAVE_STATFS64
 +/*
@@ -16,6 +16,6 @@
 +#define sys_fstatfs64   sys_fstatfs
 +#endif
 +
- static const struct sysent sysent0[] = {
+ const struct_sysent sysent0[] = {
  #include "syscallent.h"
  };
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index b172a2005b..0dce096729 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRACE_VERSION = 4.7
+STRACE_VERSION = 4.8
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 STRACE_LICENSE = BSD-3c
@@ -13,13 +13,6 @@ STRACE_LICENSE_FILES = COPYRIGHT
 STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
 		  ac_cv_header_linux_netlink_h=yes
 
-ifeq ($(BR2_LARGEFILE),y)
-# strace gets confused when lfs mode is forced, so don't
-STRACE_CONF_ENV += \
-	CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
-	CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
-endif
-
 define STRACE_REMOVE_STRACE_GRAPH
 	rm -f $(TARGET_DIR)/usr/bin/strace-graph
 endef

From 8332ffab07456bd3969b6c4bff2d0c9d3e1e51e5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 10 Jun 2013 14:04:03 +0200
Subject: [PATCH 5372/6849] Makefile: Fix KERNEL_ARCH for big endian ARC

Big endian ARC is called arceb, not arcbe.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d7437a74a8..c514e4f260 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,7 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
 	-e s/arcle/arc/ \
-	-e s/arcbe/arc/ \
+	-e s/arceb/arc/ \
 	-e s/arm.*/arm/ -e s/sa110/arm/ \
 	-e s/aarch64/arm64/ \
 	-e s/bfin/blackfin/ \

From ec6bd7cdee887e0534f06b60990a8bcd33f6289c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 08:13:25 -0300
Subject: [PATCH 5373/6849] php: security bump to version 5.3.26

Fixes CVE-2013-2110.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index ea148fbb1b..07f396eed5 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 5.3.25
+PHP_VERSION = 5.3.26
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From 0df82bc193b40b70194fb7a10b34797eab8b942a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 08:13:26 -0300
Subject: [PATCH 5374/6849] wireshark: security bump to version 1.8.8

Fixes wnpa-sec-2013-32, wnpa-sec-2013-33, wnpa-sec-2013-34,
wnpa-sec-2013-35, wnpa-sec-2013-36, wnpa-sec-2013-37, wnpa-sec-2013-38,
wnpa-sec-2013-39, wnpa-sec-2013-40 and wnpa-sec-2013-41.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 2d4ea101ec..a61e01725c 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRESHARK_VERSION = 1.8.7
+WIRESHARK_VERSION = 1.8.8
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license

From a9bd6a4e8cd0152abd65aca0e1c46d917cf0fde7 Mon Sep 17 00:00:00 2001
From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Mon, 10 Jun 2013 09:56:14 +0200
Subject: [PATCH 5375/6849] pulseaudio : bump to version 4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

removes a patch that was integrated upstream

Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../pulseaudio-compat-with-json-c-0.11.patch  | 26 -------------------
 package/multimedia/pulseaudio/pulseaudio.mk   | 15 +++--------
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch

diff --git a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch
deleted file mode 100644
index 86efdfdb3f..0000000000
--- a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <arun.raghavan@collabora.co.uk>
-Date: Sat, 27 Apr 2013 03:27:05 +0000
-Subject: build-sys: json-c changed everything :(
-
-json-c 0.11 ships a pkg-config file with a different name, and changes
-the name of its library as well.
----
-(limited to 'configure.ac')
-
-diff --git a/configure.ac b/configure.ac
-index c8161a4..b1bd21a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
- 
- #### json parsing ####
- 
--PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])
-+PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [],
-+		  [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])])
- AC_SUBST(LIBJSON_CFLAGS)
- AC_SUBST(LIBJSON_LIBS)
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index c789fc8bb2..b90017420c 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-PULSEAUDIO_VERSION = 3.0
+PULSEAUDIO_VERSION = 4.0
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
+PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
+PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL
 PULSEAUDIO_CONF_OPT = \
 	--localstatedir=/var \
 	--disable-default-build-tests \
@@ -21,7 +23,6 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
 	$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
 	$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
-	$(if $(BR2_PACKAGE_LIBGTK2),libgtk2) \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \
 	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
@@ -31,11 +32,6 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
-# One patch touches configure.ac. We unconditionnally need libglib2
-# because configure.ac uses AM_GLIB_GNU_GETTEXT. This unconditionnal
-# dependency can be removed once the patch is removed.
-PULSEAUDIO_AUTORECONF = YES
-PULSEAUDIO_DEPENDENCIES += libglib2
 
 ifeq ($(BR2_PACKAGE_ORC),y)
 PULSEAUDIO_DEPENDENCIES += orc
@@ -66,11 +62,6 @@ ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa
 endif
 
-# gtk support needs x backend
-ifneq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG),yy)
-PULSEAUDIO_CONF_OPT += --disable-gtk2
-endif
-
 ifeq ($(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_XLIB_LIBSM)$(BR2_PACKAGE_XLIB_LIBXTST),yyy)
 PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst
 

From 20b52856efdec59f6d2cac94b224fe6b2e5b9246 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 11:05:10 -0300
Subject: [PATCH 5376/6849] openswan: security bump to version 2.6.39

Fixes CVE-2013-2054.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openswan/openswan.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index b373e11a4f..8a857d4fa2 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENSWAN_VERSION = 2.6.38
+OPENSWAN_VERSION = 2.6.39
 OPENSWAN_SITE = http://download.openswan.org/openswan
 OPENSWAN_LICENSE = GPLv2+, BSD-3c
 OPENSWAN_LICENSE_FILES = COPYING LICENSE

From c6e4fcb11ff07e4e1f46e54a0bcffc47739b4a67 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 11:14:31 -0300
Subject: [PATCH 5377/6849] dosfstools: bump to version 3.0.18

And update Config.in & Config.in.legacy entries to reflect upstream
changes to tool naming.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                  | 25 +++++++++++++++++++++++++
 package/dosfstools/Config.in      | 25 +++++++++++++------------
 package/dosfstools/Config.in.host |  2 +-
 package/dosfstools/dosfstools.mk  | 23 ++++++++++++-----------
 4 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index bb9c4a9c5e..cd23492fff 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -40,6 +40,31 @@ comment "As long as these options stay selected, the build   "
 comment "will fail.                                          "
 endif
 
+#
+# Legacy options since 2013.08
+#
+
+config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK
+	bool "dosfstools dosfsck renamed to fsck.fat"
+	select BR2_LEGACY
+	select BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT
+	help
+	  dosfsck was renamed upstream to fsck.fat for consistency.
+
+config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL
+	bool "dosfstools dosfslabel renamed to fatlabel"
+	select BR2_LEGACY
+	select BR2_PACKAGE_DOSFSTOOLS_FATLABEL
+	help
+	  doslabel was renamed upstream to fatlabel for consistency.
+
+config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS
+	bool "dosfstools mkdosfs renamed to mkfs.fat"
+	select BR2_LEGACY
+	select BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT
+	help
+	  mkdosfs was renamed upstream to mkfs.fat for consistency.
+
 #
 # Legacy options since 2013.05
 #
diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in
index 2156a0418d..ec2f89169d 100644
--- a/package/dosfstools/Config.in
+++ b/package/dosfstools/Config.in
@@ -8,23 +8,24 @@ config BR2_PACKAGE_DOSFSTOOLS
 
 	  http://www.daniel-baumann.ch/software/dosfstools/
 
-config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS
-	bool "mkdosfs"
-	depends on BR2_PACKAGE_DOSFSTOOLS
+if BR2_PACKAGE_DOSFSTOOLS
+
+config BR2_PACKAGE_DOSFSTOOLS_FATLABEL
+	bool "fatlabel"
 	help
-	  Creates a DOS FAT filesystem on a device.
+	  Get or set the DOS FAT filesystem label.
 
-config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK
-	bool "dosfsck"
-	depends on BR2_PACKAGE_DOSFSTOOLS
+config BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT
+	bool "fsck.fat"
 	help
-	  Checks a DOS FAT filesystem.
+	  Check a DOS FAT filesystem.
 
-config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL
-	bool "dosfslabel"
-	depends on BR2_PACKAGE_DOSFSTOOLS
+config BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT
+	bool "mkfs.fat"
 	help
-	  Get or set the DOS FAT filesystem label.
+	  Creates a DOS FAT filesystem on a device.
+
+endif
 
 comment "dosfstools requires a toolchain with LARGEFILE and WCHAR support"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/dosfstools/Config.in.host b/package/dosfstools/Config.in.host
index 9f9ceabbe6..6156c5a3cf 100644
--- a/package/dosfstools/Config.in.host
+++ b/package/dosfstools/Config.in.host
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HOST_DOSFSTOOLS
 	bool "host dosfstools"
 	help
 	  Tools for creating and checking DOS FAT filesystems.
-	  
+
 	  http://www.daniel-baumann.ch/software/dosfstools/
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 7482bc870e..4664faa6c6 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOSFSTOOLS_VERSION = 3.0.16
+DOSFSTOOLS_VERSION = 3.0.18
 DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
@@ -18,28 +18,29 @@ DOSFSTOOLS_DEPENDENCIES += libiconv
 DOSFSTOOLS_LDFLAGS += -liconv
 endif
 
-MKDOSFS_BINARY = mkdosfs
-DOSFSCK_BINARY = dosfsck
-DOSFSLABEL_BINARY = dosfslabel
+FATLABEL_BINARY = fatlabel
+FSCK_FAT_BINARY = fsck.fat
+MKFS_FAT_BINARY = mkfs.fat
 
 define DOSFSTOOLS_BUILD_CMDS
 	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \
 		LDFLAGS="$(DOSFSTOOLS_LDFLAGS)" -C $(@D)
 endef
 
-DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS)+=$(MKDOSFS_BINARY)
-DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK)+=$(DOSFSCK_BINARY)
-DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL)+=$(DOSFSLABEL_BINARY)
+DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_FATLABEL)+=$(FATLABEL_BINARY)
+DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT)+=$(FSCK_FAT_BINARY)
+DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT)+=$(MKFS_FAT_BINARY)
 
 define DOSFSTOOLS_INSTALL_TARGET_CMDS
 	test -z "$(DOSFSTOOLS_INSTALL_BIN_FILES_y)" || \
-	install -m 755 $(addprefix $(@D)/,$(DOSFSTOOLS_INSTALL_BIN_FILES_y)) $(TARGET_DIR)/sbin/
+	$(INSTALL) -m 755 $(addprefix $(@D)/,$(DOSFSTOOLS_INSTALL_BIN_FILES_y)) \
+		$(TARGET_DIR)/sbin/
 endef
 
 define DOSFSTOOLS_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/sbin/$(MKDOSFS_BINARY)
-	rm -f $(TARGET_DIR)/sbin/$(DOSFSCK_BINARY)
-	rm -f $(TARGET_DIR)/sbin/$(DOSFSLABEL_BINARY)
+	rm -f $(TARGET_DIR)/sbin/$(FATLABEL_BINARY)
+	rm -f $(TARGET_DIR)/sbin/$(FSCK_FAT_BINARY)
+	rm -f $(TARGET_DIR)/sbin/$(MKFS_FAT_BINARY)
 endef
 
 define DOSFSTOOLS_CLEAN_CMDS

From 205f06c615d70a877ab3c96dd2f1b5bdb01f678f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 13:26:58 -0300
Subject: [PATCH 5378/6849] strace: fix legal info

The license file changed from COPYRIGHT->COPYING. Fixes:
http://autobuild.buildroot.net/results/b61/b61e1775cd1eec83470424e88ced5bd49e0cd469/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strace/strace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 0dce096729..9addbb6cfc 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -8,7 +8,7 @@ STRACE_VERSION = 4.8
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 STRACE_LICENSE = BSD-3c
-STRACE_LICENSE_FILES = COPYRIGHT
+STRACE_LICENSE_FILES = COPYING
 
 STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
 		  ac_cv_header_linux_netlink_h=yes

From 01e9002ada3e7d2c7d1559ddec029d79b4f55f51 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 13:22:59 -0300
Subject: [PATCH 5379/6849] webkit: needs host-ruby

Fixes:
http://autobuild.buildroot.net/results/13a/13a4ad4622be0c9f395e8c81db2a842b71962f61/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 9aa8390bf1..116a5e79a7 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -8,8 +8,8 @@ WEBKIT_VERSION = 1.9.6
 WEBKIT_SITE = http://www.webkitgtk.org/releases
 WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.xz
 WEBKIT_INSTALL_STAGING = YES
-WEBKIT_DEPENDENCIES = host-flex host-bison host-gperf icu libcurl libxml2 \
-	libxslt libgtk2 sqlite enchant libsoup jpeg libgail
+WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf icu libcurl \
+	libxml2 libxslt libgtk2 sqlite enchant libsoup jpeg libgail
 
 # webkit-disable-tests.patch changes configure.ac therefore autoreconf required
 WEBKIT_AUTORECONF = YES

From 7a041c1339d6e3de7a3f3aec8a89f3ed1a3c5fef Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 14:09:47 -0300
Subject: [PATCH 5380/6849] ntfs-3g: fix typo in license info files

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ntfs-3g/ntfs-3g.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 55a4d7bc88..5c6f4d9de1 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -11,7 +11,7 @@ NTFS_3G_CONF_OPT = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
 NTFS_3G_DEPENDENCIES = host-pkgconf
 NTFS_3G_LICENSE = GPLv2+ LGPLv2+
-NTSF_3G_LICENSE_FILES = COPYING COPYING.LIB
+NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB
 
 ifeq ($(BR2_PACKAGE_LIBFUSE),y)
 	NTFS_3G_CONF_OPT += --with-fuse=external

From 4d34fb7c6208423243e0123600fca3e11723705d Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Sat, 8 Jun 2013 11:14:14 +0200
Subject: [PATCH 5381/6849] toolchain-external: Version bump to 2013.05 release
 for MIPS

Remove old 2011.09 release. Allow MIPS64 cores on
2013.05 release since they are supported by the toolchain.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 42 ++++++++++++------------
 toolchain/toolchain-external/ext-tool.mk |  6 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 47b2bf5526..37c5648582 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -136,9 +136,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
-	bool "Sourcery CodeBench MIPS 2012.09"
-	depends on BR2_mips || BR2_mipsel
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
+	bool "Sourcery CodeBench MIPS 2013.05"
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -146,14 +146,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
-	  Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, glibc
-	  2.16, uClibc 0.9.30 and gdb 7.4.50, kernel headers
-	  3.5.4. It has support for the following variants:
+	  Mentor Graphics. It uses gcc 4.7.3, binutils 2.23.52, glibc
+	  2.17, uClibc 0.9.30 and gdb 7.4.50, kernel headers
+	  3.8.2. It has support for the following variants:
 	    - MIPS32 O32 big endian glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
 	    - MIPS64 big endian glibc
-	      Select a MIPS generic core
+	      Select a MIPS64 generic core
 	      Select the n64 ABI
 	      Disable BR2_SOFT_FLOAT
 	    - MIPS32 O32 little endian glibc
@@ -161,7 +161,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	      Disable BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian glibc
-	      Select a MIPS generic core
+	      Select a MIPS64 generic core
 	      Select the n64 ABI
 	      Disable BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -EL
@@ -169,7 +169,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
 	    - MIPS64 big endian soft float glibc
-	      Select a MIPS generic core
+	      Select a MIPS64 generic core
 	      Select the n64 ABI
 	      Select BR2_SOFT_FLOAT
 	    - MIPS32 little endian soft float glibc
@@ -177,7 +177,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian soft float glibc
-	      Select a MIPS generic core
+	      Select a MIPS64 generic core
 	      Select the n64 ABI
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -EL
@@ -206,8 +206,8 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	    - MIPS32 little endian soft float uclibc
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
-	bool "Sourcery CodeBench MIPS 2012.03"
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
+	bool "Sourcery CodeBench MIPS 2012.09"
 	depends on BR2_mips || BR2_mipsel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -216,9 +216,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
-	  Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
-	  2.15, uClibc 0.9.30 and gdb 7.2.50, kernel headers
-	  3.2.10. It has support for the following variants:
+	  Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, glibc
+	  2.16, uClibc 0.9.30 and gdb 7.4.50, kernel headers
+	  3.5.4. It has support for the following variants:
 	    - MIPS32 O32 big endian glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
@@ -276,8 +276,8 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 little endian soft float uclibc
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
-	bool "Sourcery CodeBench MIPS 2011.09"
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
+	bool "Sourcery CodeBench MIPS 2012.03"
 	depends on BR2_mips || BR2_mipsel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -286,9 +286,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Sourcery CodeBench toolchain for the MIPS architecture, from
-	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.21.53, glibc
-	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
-	  3.0.1. It has support for the following variants:
+	  Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
+	  2.15, uClibc 0.9.30 and gdb 7.2.50, kernel headers
+	  3.2.10. It has support for the following variants:
 	    - MIPS32 O32 big endian glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
@@ -754,9 +754,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
-	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
+	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 93b3b15137..218ef07496 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -209,15 +209,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.02-01-20130221
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.09-75-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2013.05-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From ea25177384368531ed269033984a2925b54f4e79 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 11:14:15 +0200
Subject: [PATCH 5382/6849] toolchain-external: bump Linaro ARM toolchains to
 2013.04 and 2013.05

We add support for Linaro 2013.04 and Linaro 2013.05 and remove
support for Linaro 2013.01 and Linaro 2013.02.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 24 ++++++++++++------------
 toolchain/toolchain-external/ext-tool.mk | 12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 37c5648582..6a58e0f216 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,8 +3,8 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
-	bool "Linaro 2013.03"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
+	bool "Linaro 2013.05"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -14,16 +14,16 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.03 (based on gcc 4.7), Linaro GDB 2012.12 (based on
-	  GDB 7.5), eglibc 2.15. It generates code that runs on all
+	  GCC 2013.05 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GDB 7.6), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
 	  calling convention, and uses the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
-	bool "Linaro 2013.02"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
+	bool "Linaro 2013.04"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -33,7 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.02 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GCC 2013.04 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -41,8 +41,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
-	bool "Linaro 2013.01"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
+	bool "Linaro 2013.03"
 	depends on BR2_arm
 	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -52,7 +52,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.01 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GCC 2013.03 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -741,9 +741,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 218ef07496..93aec83cc5 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -200,15 +200,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01),y)
-TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2013.01/+download/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.02/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.02-01-20130221_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.04/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.05/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.8-2013.05_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 405127d7c9a41c84f9be5e10edeff15dafef212c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 11:14:16 +0200
Subject: [PATCH 5383/6849] toolchain-external: bump Linaro AArch64 toolchains
 to 2013.04 and 2013.05

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ++++++++++--------
 toolchain/toolchain-external/ext-tool.mk | 14 +++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 6a58e0f216..f87b6ac5d8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -658,30 +658,32 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
-	bool "Linaro AArch64 13.03"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
+	bool "Linaro AArch64 13.05"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02
-	bool "Linaro AArch64 13.02"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
+	bool "Linaro AArch64 13.04"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
-	bool "Linaro AArch64 13.01"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
+	bool "Linaro AArch64 13.03"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -747,9 +749,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 93aec83cc5..0f8ede0855 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -272,15 +272,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01),y)
-TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/13.01/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.01-20130125_linux.tar.xz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.02/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.02-01-20130221_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/13.03/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.03-20130313_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.04/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.05/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.8-2013.05_linux.tar.xz
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From 93d2b247f969bda955ff0b2470c3536cef8d29c0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 11:14:17 +0200
Subject: [PATCH 5384/6849] toolchain-external: add support for Arago 2011.09
 ARMv7A

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 18 ++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  8 ++++++++
 2 files changed, 26 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f87b6ac5d8..3ce58ac681 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -136,6 +136,23 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
+config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
+	bool "Arago ARMv7 2011.09"
+	depends on BR2_arm
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Texas Instruments Arago 2011.09 toolchain, with gcc 4.5.3,
+	  binutils 2.20.1, glibc 2.12, gdb 7.2.
+
+	  This toolchain uses -mfloat-abi=softfp (i.e use FPU
+	  instructions, but pass floating point function arguments in
+	  non-floating point registers).
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	bool "Sourcery CodeBench MIPS 2013.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
@@ -749,6 +766,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
+	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 0f8ede0855..0d29d36c89 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -200,6 +200,13 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gn
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE=arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109),y)
+TOOLCHAIN_EXTERNAL_SITE=http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
+TOOLCHAIN_EXTERNAL_SOURCE=arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2
+define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
+	mv $(@D)/arago-2011.09/armv7a/* $(@D)/
+	rm -rf $(@D)/arago-2011.09/
+endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2
@@ -333,6 +340,7 @@ $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 	mkdir -p $(@D)
 	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
+	$(TOOLCHAIN_EXTERNAL_FIXUP_CMDS)
 	$(Q)touch $@
 endif
 

From 2592f256a13865a5c3c3e9f2cfcec240840bd97c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 11:14:18 +0200
Subject: [PATCH 5385/6849] toolchain-external: add support for Arago 2011.09
 ARMv5

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 3ce58ac681..2fc18cc2d1 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -153,6 +153,20 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	  instructions, but pass floating point function arguments in
 	  non-floating point registers).
 
+config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
+	bool "Arago ARMv5 2011.09"
+	depends on BR2_arm
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Texas Instruments Arago ARMv5 2011.09 toolchain, with gcc
+	  4.5.3, binutils 2.20.1, glibc 2.12, gdb 7.2.
+
+	  This toolchain uses software-floating point.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	bool "Sourcery CodeBench MIPS 2013.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
@@ -767,6 +781,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
+	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 0d29d36c89..30a49533a4 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -207,6 +207,13 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
 	mv $(@D)/arago-2011.09/armv7a/* $(@D)/
 	rm -rf $(@D)/arago-2011.09/
 endef
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109),y)
+TOOLCHAIN_EXTERNAL_SITE=http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
+TOOLCHAIN_EXTERNAL_SOURCE=arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2
+define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
+	mv $(@D)/arago-2011.09/armv5te/* $(@D)/
+	rm -rf $(@D)/arago-2011.09/
+endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2

From c5f87f72f5c300423469ad2dfad284b1481a70f8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 11:14:19 +0200
Subject: [PATCH 5386/6849] toolchain-external: use BR2_GCC_TARGET_ARCH for
 toolchain conditionals

Instead of a long list of the ARMv7-A Cortex-A, use a conditional
based on BR2_GCC_TARGET_ARCH to hide/show toolchains that are only
usable on ARMv7-A.

However, in the comment related to Linaro toolchains, we keep
mentioning Cortex-A{5,8,9,15} because that's what users see when they
select their architecture variant.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2fc18cc2d1..9798840f96 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -6,7 +6,7 @@ choice
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 	bool "Linaro 2013.05"
 	depends on BR2_arm
-	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -25,7 +25,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 	bool "Linaro 2013.04"
 	depends on BR2_arm
-	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -44,7 +44,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
 	bool "Linaro 2013.03"
 	depends on BR2_arm
-	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -62,7 +62,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
 
 comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
 	depends on BR2_arm
-	depends on !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15
+	depends on BR2_GCC_TARGET_ARCH != "armv7-a"
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	bool "Sourcery CodeBench ARM 2013.05"
@@ -140,7 +140,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	bool "Arago ARMv7 2011.09"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP

From f3d6e6cfd7c024d16fb3d21f47e5b9aa241bfefa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Jun 2013 11:14:20 +0200
Subject: [PATCH 5387/6849] toolchain-external: add arch conditionals on Arago
 ARMv5TE toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9798840f96..4dc45cd1b7 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -157,6 +157,9 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
 	bool "Arago ARMv5 2011.09"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_GCC_TARGET_ARCH != "armv4t" && \
+		BR2_GCC_TARGET_ARCH != "armv4" && \
+		BR2_GCC_TARGET_ARCH != "armv5t"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP

From 9d5e6fa2fd4e48bdc0235f6bb902329b804b312d Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Sat, 8 Jun 2013 11:14:21 +0200
Subject: [PATCH 5388/6849] ext-toolchain-wrapper: force hash-style to 'both'

If ext-toolchain-wrapper was built with a gcc that uses hash-style 'gnu' by
default, the resulting binary might be unusable on other systems. The error
in this case is "Floating point exception".
Using hash-style 'both' solves this issue.

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 30a49533a4..430b2bc57d 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -491,7 +491,9 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
 			;; \
 		esac; \
 	done ;
-	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s \
+	# We use --hash-style=both to increase the compatibility of
+	# the generated binary with older platforms
+	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s -Wl,--hash-style=both \
 		toolchain/toolchain-external/ext-toolchain-wrapper.c -o $@
 
 # 'uclibc' is the target to provide toolchain / staging dir

From 8b4ade86aaaea826006199d83c004713eb817f73 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Sat, 8 Jun 2013 11:14:22 +0200
Subject: [PATCH 5389/6849] toolchain-external: Install blackfin FDPIC and FLAT
 libraries

For certain situations, users may want to install shared FLAT
libraries to the target filesystem even if FDPIC is used as the
primary binary format, or symmetrically users may want to install FDPIC
libraries to the target filesystem even if shared FLAT is used as the
primary binary format.

This commit allows that by:

 * Offering additional Kconfig options to install shared FLAT or FDPIC
   libraries even when those libraries are not selected as the primary
   binary format.

 * Preserving all Blackfin toolchain folders under the
   TOOLCHAIN_EXTERNAL_DIR, instead of keeping only the one related to
   the selected binary format.

 * Adding some additional install targets that do the installation of
   either the shared FLAT or FDPIC libraries when requested.

[Thomas: refactored code, adjusted commit log]
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 27 ++++++++++
 toolchain/toolchain-external/ext-tool.mk | 67 +++++++++++++++++++-----
 2 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 4dc45cd1b7..94b8158a93 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -939,5 +939,32 @@ config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
 	  Copy the gdbserver provided by the external toolchain to the
 	  target.
 
+# When the FDPIC shared binary format is used, the corresponding libraries are
+# always installed. When a different binary format is used, we offer the option
+# of installing the FDPIC shared libraries.
+config BR2_BFIN_INSTALL_FDPIC_SHARED
+       bool "Install FDPIC shared libraries"
+       depends on BR2_bfin && !BR2_BINFMT_FDPIC
+       help
+         The Linux kernel supports running both FDPIC and FLAT applications
+         concurrently if the binary format specific libraries are installed
+         properly. This option allows developer to install FDPIC libraries
+         into a buildroot rootfs image built with binary format that is not
+         FDPIC.
+
+# When the FLAT shared binary format is used, we force the installation
+# of the corresponding libraries. When a different binary format is
+# used, we offer the option of installing the FLAT shared libraries.
+config BR2_BFIN_INSTALL_FLAT_SHARED
+       bool "Install FLAT shared libraries" if !BR2_BINFMT_FLAT_SHARED
+       depends on BR2_bfin
+       default y if BR2_BINFMT_FLAT_SHARED
+       help
+         The Linux kernel supports running both FDPIC and FLAT applications
+         concurrently if the binary format specific libraries are installed
+         properly. This option allows developer to install FLAT libraries
+         into a buildroot rootfs image built with binary format that is not
+         shared FLAT.
+
 endif # BR2_TOOLCHAIN_EXTERNAL
 
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 430b2bc57d..e5dc8ed410 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -115,8 +115,12 @@ ifeq ($(TOOLCHAIN_EXTERNAL_DIR),)
 # if no path set, figure it out from path
 TOOLCHAIN_EXTERNAL_BIN:=$(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
 else
+ifeq ($(BR2_bfin),y)
+TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin
+else
 TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/bin
 endif
+endif
 
 TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
@@ -326,17 +330,6 @@ $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
 	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_2))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2) | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
-ifeq ($(TOOLCHAIN_EXTERNAL_PREFIX),bfin-uclinux)
-	rm -rf $(TOOLCHAIN_EXTERNAL_DIR)/bfin-linux-uclibc
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/bfin-uclinux $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/tmp/* $(TOOLCHAIN_EXTERNAL_DIR)/
-	rmdir $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-else
-	rm -rf $(TOOLCHAIN_EXTERNAL_DIR)/bfin-uclinux
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/bfin-linux-uclibc $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/tmp/* $(TOOLCHAIN_EXTERNAL_DIR)/
-	rmdir $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-endif
 	$(Q)touch $@
 else
 # Download and extraction of a toolchain
@@ -475,9 +468,59 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	fi ; \
 	touch $@
 
+# Special installation target used on the Blackfin architecture when
+# FDPIC is not the primary binary format being used, but the user has
+# nonetheless requested the installation of the FDPIC libraries to the
+# target filesystem.
+$(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed: $(STAMP_DIR)/ext-toolchain-checked
+	$(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
+	FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
+	FDPIC_LIBC_A_LOCATION=`readlink -f $$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
+	FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
+	FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+	FDPIC_SUPPORT_LIB_DIR="" ; \
+	if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
+	        FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
+	        if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \
+	                FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
+	        fi ; \
+	fi ; \
+	for libs in $(LIB_EXTERNAL_LIBS); do \
+	        $(call copy_toolchain_lib_root,$${FDPIC_SYSROOT_DIR},$${FDPIC_SUPPORT_LIB_DIR},$${FDPIC_LIB_DIR},$$libs,/lib); \
+	done ; \
+	for libs in $(USR_LIB_EXTERNAL_LIBS); do \
+	        $(call copy_toolchain_lib_root,$${FDPIC_SYSROOT_DIR},$${FDPIC_SUPPORT_LIB_DIR},$${FDPIC_LIB_DIR},$$libs,/usr/lib); \
+	done ; \
+	touch $@
+
+# Special installation target used on the Blackfin architecture when
+# shared FLAT is not the primary format being used, but the user has
+# nonetheless requested the installation of the shared FLAT libraries
+# to the target filesystem. The flat libraries are found and linked
+# according to the index in name "libN.so". Index 1 is reserved for
+# the standard C library. Customer libraries can use 4 and above.
+$(STAMP_DIR)/ext-toolchain-bfin-shared-flat-installed: $(STAMP_DIR)/ext-toolchain-checked
+	$(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") ; \
+	FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \
+	FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \
+	if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \
+	        $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \
+	fi ; \
+	touch $@
+
+TOOLCHAIN_EXTERNAL_INSTALL = $(STAMP_DIR)/ext-toolchain-installed
+
+ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y)
+TOOLCHAIN_EXTERNAL_INSTALL += $(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed
+endif
+
+ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y)
+TOOLCHAIN_EXTERNAL_INSTALL += $(STAMP_DIR)/ext-toolchain-bfin-shared-flat-installed
+endif
+
 # Build toolchain wrapper for preprocessor, C and C++ compiler, and setup
 # symlinks for everything else
-$(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed
+$(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL)
 	$(Q)$(call MESSAGE,"Building ext-toolchain wrapper")
 	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
 	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \

From c6bccfa880a9b82c071303c87fe0779ac621329d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Jun 2013 20:55:30 -0300
Subject: [PATCH 5390/6849] ruby: security bump to version 1.9.3-p429

Fixes CVE-2013-2065.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index e708262b36..020cd76258 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUBY_VERSION = 1.9.3-p392
+RUBY_VERSION = 1.9.3-p429
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_DEPENDENCIES = host-pkgconf host-ruby
 HOST_RUBY_DEPENDENCIES = host-pkgconf

From e2f28217816174550dc5858fbb4f1d68ee5f0c20 Mon Sep 17 00:00:00 2001
From: Will Wagner <will_wagner@carallon.com>
Date: Tue, 11 Jun 2013 08:30:03 +0100
Subject: [PATCH 5391/6849] boost: only the iostreams library requires bzip2
 and zlib

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boost/Config.in | 4 ++--
 package/boost/boost.mk  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 5c65b2fbf4..912717ad3b 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -9,8 +9,6 @@ config BR2_PACKAGE_BOOST
 	# that unfortunately doesn't work. Until someone fixes that,
 	# let's depend on threads.
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_BZIP2
-	select BR2_PACKAGE_ZLIB
 	help
 	  A general purpose C++ library
 
@@ -43,6 +41,8 @@ config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
 
 config BR2_PACKAGE_BOOST_IOSTREAMS
 	bool "boost-iostreams"
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_ZLIB
 
 config BR2_PACKAGE_BOOST_LOCALE
 	depends on BR2_USE_WCHAR
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 57d021ae4e..ce729901a4 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -12,7 +12,7 @@ BOOST_INSTALL_STAGING = YES
 
 TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
 
-BOOST_DEPENDENCIES = bzip2 zlib
+BOOST_DEPENDENCIES =
 
 BOOST_FLAGS =
 
@@ -48,6 +48,10 @@ else
 BOOST_FLAGS += --without-icu
 endif
 
+ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y)
+BOOST_DEPENDENCIES += bzip2 zlib
+endif
+
 BOOST_OPT += toolset=gcc \
 	     threading=multi \
 	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \

From 9dee63bf4dfc56d43dc8e29e0185382ca21651c4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Jun 2013 07:52:00 -0300
Subject: [PATCH 5392/6849] openswan: fix older gcc build failure

Older gcc versions (< 4.4) don't accept cpp as -Werror / -Wno-error
parameters.
Disable it since it's not yet a default with any version and we don't do
-Werror by default. Fixes:
http://autobuild.buildroot.net/results/977/9779215c4dfb68dc105f27097246a97851b1f6c2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openswan/openswan-wno-error-cpp.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/openswan/openswan-wno-error-cpp.patch

diff --git a/package/openswan/openswan-wno-error-cpp.patch b/package/openswan/openswan-wno-error-cpp.patch
new file mode 100644
index 0000000000..8e79ae9daa
--- /dev/null
+++ b/package/openswan/openswan-wno-error-cpp.patch
@@ -0,0 +1,29 @@
+Kill -Wno-error=cpp, old(ish) gcc versions (< 4.4) don't like it and we still
+got 4.3.x available for internal toolchains.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura openswan-2.6.39.orig/lib/libopenswan/Makefile openswan-2.6.39/lib/libopenswan/Makefile
+--- openswan-2.6.39.orig/lib/libopenswan/Makefile	2013-06-11 07:22:50.228520267 -0300
++++ openswan-2.6.39/lib/libopenswan/Makefile	2013-06-11 07:27:40.087849447 -0300
+@@ -86,7 +86,7 @@
+ CFLAGS+= -Wno-error=cast-qual
+
+ # some junk left in alg_info.c
+-CFLAGS+= -Wno-error=cpp
++#CFLAGS+= -Wno-error=cpp
+
+ #CFLAGS+= -Wmissing-declarations
+ CFLAGS+= -Wstrict-prototypes
+diff -Nura openswan-2.6.39.orig/programs/pluto/Makefile openswan-2.6.39/programs/pluto/Makefile
+--- openswan-2.6.39.orig/programs/pluto/Makefile	2013-06-11 07:22:49.753504978 -0300
++++ openswan-2.6.39/programs/pluto/Makefile	2013-06-11 07:27:53.020265681 -0300
+@@ -47,7 +47,7 @@
+
+ # must turn this off due to myid.c
+ CFLAGS+= -Wno-error=cast-qual
+-CFLAGS+= -Wno-error=cpp
++#CFLAGS+= -Wno-error=cpp
+
+ ifeq ($(HAVE_BROKEN_POPEN),true)
+ CFLAGS+=-DHAVE_BROKEN_POPEN

From 31e75f2213637948b512512ca2725fd67de65be1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Jun 2013 08:57:17 -0300
Subject: [PATCH 5393/6849] mutt: needs mmu

Fixes:
http://autobuild.buildroot.net/results/8ce/8ceec55fa8358d8821f2deaf3440f5b06270db6a/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mutt/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/mutt/Config.in b/package/mutt/Config.in
index 754979a6a0..bb97cb08fa 100644
--- a/package/mutt/Config.in
+++ b/package/mutt/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MUTT
 	bool "mutt"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
 	  Mutt is a sophisticated text-based Mail User Agent (MUA)

From 26994e916afcc9e9e123788de7019a7ff1a604d0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 11:14:25 -0300
Subject: [PATCH 5394/6849] libidn: bump to version 1.27

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libidn/libidn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 70cdcd0777..44311eb514 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBIDN_VERSION = 1.26
+LIBIDN_VERSION = 1.27
 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"

From c6842cb415d3428432152e6480b7aa840bb591f3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 11:14:26 -0300
Subject: [PATCH 5395/6849] openvpn: bump to version 2.3.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/openvpn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index db61c83eb0..0756ec4be1 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENVPN_VERSION = 2.3.1
+OPENVPN_VERSION = 2.3.2
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkgconf
 OPENVPN_CONF_OPT = --disable-plugin-auth-pam --enable-iproute2

From 0396ef14403ca5ef25de42da6ac99470cbdefc27 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 11:14:27 -0300
Subject: [PATCH 5396/6849] gzip: bump to version 1.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gzip/gzip.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 5ece73a29b..fd06bbc929 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GZIP_VERSION = 1.5
+GZIP_VERSION = 1.6
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 GZIP_LICENSE = GPLv3+
 GZIP_LICENSE_FILES = COPYING

From df13ceb90c59f6bbe13c9f5fda5725a627dde941 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 11:14:28 -0300
Subject: [PATCH 5397/6849] sdparm: bump to version 1.08

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdparm/sdparm.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index ef30887156..1b3ec4b0d0 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -1,6 +1,12 @@
-SDPARM_VERSION = 1.07
+################################################################################
+#
+# sdparm
+#
+################################################################################
+
+SDPARM_VERSION = 1.08
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
-SDPARM_SITE = http://sg.danny.cz/sg/p/
+SDPARM_SITE = http://sg.danny.cz/sg/p
 SDPARM_LICENSE = BSD-3c
 SDPARM_LICENSE_FILES = COPYING
 

From 449cab549c9a3926d65a4d05433d4d80a59d9dd2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 11:14:29 -0300
Subject: [PATCH 5398/6849] freetype: bump to version 2.4.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 997f9060ce..16f00fe64c 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREETYPE_VERSION = 2.4.11
+FREETYPE_VERSION = 2.4.12
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES

From c5f138192db56e8779b6815d3166d8259205a770 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 15:57:01 -0300
Subject: [PATCH 5399/6849] jquery: bump to version 1.10.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery/jquery.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index 4df280159f..98b325b9bb 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -1,4 +1,4 @@
-JQUERY_VERSION = 1.9.1
+JQUERY_VERSION = 1.10.1
 JQUERY_SITE = http://code.jquery.com
 JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js
 JQUERY_LICENSE = MIT

From 31655888bcdb240768dd79dee97ea00b777e5972 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 15:57:02 -0300
Subject: [PATCH 5400/6849] flot: bump to version 0.8.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/flot/flot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index 56cb22e3a2..a0ba6c20bd 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -1,4 +1,4 @@
-FLOT_VERSION = 0.8.0
+FLOT_VERSION = 0.8.1
 FLOT_SITE = http://www.flotcharts.org/downloads
 FLOT_LICENSE = MIT
 FLOT_LICENSE_FILES = LICENSE.txt

From 9e25d8a1818b4089f9242cb253b0db931f43b3cc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 15:57:03 -0300
Subject: [PATCH 5401/6849] jquery-keyboard: bump to version 1.17.7

And select/install jquery-ui since it's almost mandatory.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-keyboard/Config.in          | 1 +
 package/jquery-keyboard/jquery-keyboard.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/jquery-keyboard/Config.in b/package/jquery-keyboard/Config.in
index ee976627e9..e44193ed64 100644
--- a/package/jquery-keyboard/Config.in
+++ b/package/jquery-keyboard/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_JQUERY_KEYBOARD
 	bool "jQuery keyboard"
 	select BR2_PACKAGE_JQUERY
+	select BR2_PACKAGE_JQUERY_UI
 	help
 	  Virtual Keyboard using jQuery UI
 
diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
index 769fdba846..0d9b69b590 100644
--- a/package/jquery-keyboard/jquery-keyboard.mk
+++ b/package/jquery-keyboard/jquery-keyboard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JQUERY_KEYBOARD_VERSION = 1.17.4
+JQUERY_KEYBOARD_VERSION = 1.17.7
 JQUERY_KEYBOARD_SITE = \
 	http://github.com/Mottie/Keyboard/tarball/v$(JQUERY_KEYBOARD_VERSION)
 JQUERY_KEYBOARD_LICENSE = MIT WTFPL

From b26883c9882d633995bd09b91106b88fe4f52709 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 12 Jun 2013 18:52:35 +0100
Subject: [PATCH 5402/6849] gpsd: install udev rules, if appropriate

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gpsd/gpsd.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 33aff5e238..be2e681c42 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -222,4 +222,17 @@ define GPSD_INSTALL_STAGING_CMDS
 		install)
 endef
 
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y)
+define GPSD_INSTALL_UDEV_RULES
+	(cd $(@D); \
+		$(GPSD_SCONS_ENV) \
+		DESTDIR=$(TARGET_DIR) \
+		$(SCONS) \
+		$(GPSD_SCONS_OPTS) \
+		udev-install)
+endef
+
+GPSD_POST_INSTALL_TARGET_HOOKS += GPSD_INSTALL_UDEV_RULES
+endif
+
 $(eval $(generic-package))

From 8abb5b33c1aae035cf48b1c81104b433ff884c64 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 12 Jun 2013 15:46:33 -0300
Subject: [PATCH 5403/6849] toolchain/uClibc: remove deprecated version 0.9.31

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/Config.in                    |    7 -
 ...-0.9.31.1-add-bsd-endian-conversions.patch |   64 -
 .../uClibc-0.9.31.1-add-inotify-init1.patch   |   64 -
 .../uClibc-0.9.31.1-add-sock-cloexec.patch    |   43 -
 .../uClibc-0.9.31.1-export-strverscmp.patch   |   30 -
 ....1-fix-daylight-saving-time-handling.patch |   36 -
 ...libc-0.9.31.1-fix-error-locale-utf-8.patch |   17 -
 ....31.1-fix-fcntl64-for-64-bit-targets.patch |   34 -
 ...libc-0.9.31.1-linuxthreads-errno-fix.patch |   98 -
 ....9.31.1-more-workarounds-GCC-PR32219.patch |   40 -
 .../uClibc-0.9.31.1-powerpc-ptrace-fix.patch  |   62 -
 .../uClibc-0.9.31.1-quad-routines.patch       | 7393 -----------------
 .../uClibc-0.9.31.1-sparc-errno-fix.patch     |   11 -
 .../uClibc/uClibc-0.9.31.1-unshare.patch      |   74 -
 ...libc-0.9.31.1-workaround-GCC-PR32219.patch |   57 -
 toolchain/uClibc/uClibc-0.9.31.config         |  259 -
 16 files changed, 8289 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-unshare.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch
 delete mode 100644 toolchain/uClibc/uClibc-0.9.31.config

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 94e8169f3c..ab1f600c61 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -9,11 +9,6 @@ choice
 	help
 	  Select the version of uClibc you wish to use.
 
-	config BR2_UCLIBC_VERSION_0_9_31
-		bool "uClibc 0.9.31.x"
-		depends on BR2_DEPRECATED
-		depends on !BR2_xtensa
-
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
 		depends on !(BR2_arc || BR2_avr32 || BR2_sh || BR2_xtensa)
@@ -40,7 +35,6 @@ config BR2_USE_UCLIBC_SNAPSHOT
 
 config BR2_UCLIBC_VERSION_STRING
 	string
-	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
 	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
 	default 0.9.33-arc	if BR2_UCLIBC_VERSION_0_9_33_ARC
@@ -48,7 +42,6 @@ config BR2_UCLIBC_VERSION_STRING
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
-	default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31
 	default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
 	default "toolchain/uClibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
 	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_0_9_33_ARC
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch
deleted file mode 100644
index 652d7c9f10..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c6d6237819037168a6923ac080e348e54615422c Mon Sep 17 00:00:00 2001
-From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
-Date: Tue, 1 Jun 2010 23:22:57 +0400
-Subject: [PATCH] endian.h: add BSD convertions between big/little-endian byte order
-
-This patch adds support for convertion of values between host and
-big-/little-endian byte order.
-
-Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- include/endian.h |   38 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 38 insertions(+), 0 deletions(-)
-
-diff --git a/include/endian.h b/include/endian.h
-index 2f7bce1..0ba7384 100644
---- a/include/endian.h
-+++ b/include/endian.h
-@@ -55,4 +55,42 @@
- # define __LONG_LONG_PAIR(HI, LO) HI, LO
- #endif
- 
-+
-+#ifdef __USE_BSD
-+/* Conversion interfaces.  */
-+# include <byteswap.h>
-+
-+# if __BYTE_ORDER == __LITTLE_ENDIAN
-+#  define htobe16(x) __bswap_16 (x)
-+#  define htole16(x) (x)
-+#  define be16toh(x) __bswap_16 (x)
-+#  define le16toh(x) (x)
-+
-+#  define htobe32(x) __bswap_32 (x)
-+#  define htole32(x) (x)
-+#  define be32toh(x) __bswap_32 (x)
-+#  define le32toh(x) (x)
-+
-+#  define htobe64(x) __bswap_64 (x)
-+#  define htole64(x) (x)
-+#  define be64toh(x) __bswap_64 (x)
-+#  define le64toh(x) (x)
-+# else
-+#  define htobe16(x) (x)
-+#  define htole16(x) __bswap_16 (x)
-+#  define be16toh(x) (x)
-+#  define le16toh(x) __bswap_16 (x)
-+
-+#  define htobe32(x) (x)
-+#  define htole32(x) __bswap_32 (x)
-+#  define be32toh(x) (x)
-+#  define le32toh(x) __bswap_32 (x)
-+
-+#  define htobe64(x) (x)
-+#  define htole64(x) __bswap_64 (x)
-+#  define be64toh(x) (x)
-+#  define le64toh(x) __bswap_64 (x)
-+# endif
-+#endif
-+
- #endif	/* endian.h */
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch
deleted file mode 100644
index cbec426238..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a2e5630af426f85fdd8721b2820786d9bd2aa695 Mon Sep 17 00:00:00 2001
-From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
-Date: Tue, 1 Jun 2010 20:02:54 +0400
-Subject: [PATCH] inotify: add inotify_init1 system call support
-
-This patch introduces support for inotify_init1 system call, found
-since Linux 2.6.27.
-
-Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libc/sysdeps/linux/common/inotify.c     |    4 ++++
- libc/sysdeps/linux/common/sys/inotify.h |   13 +++++++++++++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c
-index e5a6120..e35f043 100644
---- a/libc/sysdeps/linux/common/inotify.c
-+++ b/libc/sysdeps/linux/common/inotify.c
-@@ -15,6 +15,10 @@
- _syscall0(int, inotify_init)
- #endif
- 
-+#ifdef __NR_inotify_init1
-+_syscall1(int, inotify_init1, int, flags)
-+#endif
-+
- #ifdef __NR_inotify_add_watch
- _syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask)
- #endif
-diff --git a/libc/sysdeps/linux/common/sys/inotify.h b/libc/sysdeps/linux/common/sys/inotify.h
-index 0131db9..dc4e19d 100644
---- a/libc/sysdeps/linux/common/sys/inotify.h
-+++ b/libc/sysdeps/linux/common/sys/inotify.h
-@@ -22,6 +22,16 @@
- #include <stdint.h>
- 
- 
-+/* Flags for the parameter of inotify_init1.  */
-+enum
-+  {
-+    IN_CLOEXEC = 02000000,
-+#define IN_CLOEXEC IN_CLOEXEC
-+    IN_NONBLOCK = 04000
-+#define IN_NONBLOCK IN_NONBLOCK
-+  };
-+
-+
- /* Structure describing an inotify event.  */
- struct inotify_event
- {
-@@ -79,6 +89,9 @@ __BEGIN_DECLS
- /* Create and initialize inotify instance.  */
- extern int inotify_init (void) __THROW;
- 
-+/* Create and initialize inotify instance.  */
-+extern int inotify_init1 (int __flags) __THROW;
-+
- /* Add watch of object NAME to inotify instance FD.  Notify about
-    events specified by MASK.  */
- extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch
deleted file mode 100644
index a7089a98ac..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 83333e9c873e4eca6b2c945f7770b1f5373b0427 Mon Sep 17 00:00:00 2001
-From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
-Date: Tue, 1 Jun 2010 20:02:39 +0400
-Subject: [PATCH] bits/socket.h: add SOCK_CLOEXEC and SOCK_NONBLOCK support
-
-This patch adds support for SOCK_CLOEXEC and SOCK_NONBLOCK socket
-descriptor flags, which are introduced since Linux 2.6.27
-
-Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libc/sysdeps/linux/common/bits/socket.h |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
-index ac5a433..11f6e97 100644
---- a/libc/sysdeps/linux/common/bits/socket.h
-+++ b/libc/sysdeps/linux/common/bits/socket.h
-@@ -53,10 +53,20 @@ enum __socket_type
-   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
- 				   datagrams of fixed maximum length.  */
- #define SOCK_SEQPACKET SOCK_SEQPACKET
--  SOCK_PACKET = 10		/* Linux specific way of getting packets
-+  SOCK_PACKET = 10,		/* Linux specific way of getting packets
- 				   at the dev level.  For writing rarp and
- 				   other similar things on the user level. */
- #define SOCK_PACKET SOCK_PACKET
-+
-+  /* Flags to be ORed into the type parameter of socket and socketpair and
-+     used for the flags parameter of paccept.  */
-+
-+  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
-+				   new descriptor(s).  */
-+#define SOCK_CLOEXEC SOCK_CLOEXEC
-+  SOCK_NONBLOCK = 04000		/* Atomically mark descriptor(s) as
-+				   non-blocking.  */
-+#define SOCK_NONBLOCK SOCK_NONBLOCK
- };
- 
- /* Protocol families.  */
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch b/toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch
deleted file mode 100644
index 19bc021b88..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-export-strverscmp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 139b8f0c673fed465d27f99c98568e5d5e1b9b72 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Fri, 4 Jun 2010 13:36:30 +0200
-Subject: [PATCH] strverscmp: I forgot to export it
-
-Result was:
-
-strverscmp.o:
-000000ec T __GI_strverscmp
-
-i.e. no plain "strverscmp"!
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- libc/string/strverscmp.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libc/string/strverscmp.c b/libc/string/strverscmp.c
-index 74ae4c6..b19e8f0 100644
---- a/libc/string/strverscmp.c
-+++ b/libc/string/strverscmp.c
-@@ -115,3 +115,4 @@ int strverscmp (const char *s1, const char *s2)
-       return state;
-   }
- }
-+libc_hidden_def(strverscmp)
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch
deleted file mode 100644
index 5a96113877..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-fix-daylight-saving-time-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 47f3da1cf49377c25772bb54d07db55225bbb142 Mon Sep 17 00:00:00 2001
-From: Guillaume Bourcier <guillaumebourcier@free.fr>
-Date: Tue, 11 Oct 2011 13:45:33 +0200
-Subject: [PATCH] libc: fix daylight saving time handling
-
-The algorithm computing daylight saving time incorrectly adds a day for
-each month after January for leap years. The clock shift from/to DST can
-be delayed if the last Sunday of a transition month is exactly seven
-days before the first of the following month.
-
-This change adds a day for the February month only.
-
-Signed-off-by: Guillaume Bourcier <guillaumebourcier@free.fr>
-Signed-off-by: Richard Braun <rbraun@sceen.net>
-Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- libc/misc/time/time.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
-index 19d68e1..8e2ebf1 100644
---- a/libc/misc/time/time.c
-+++ b/libc/misc/time/time.c
-@@ -689,7 +689,7 @@ static int tm_isdst(register const struct tm *__restrict ptm,
- 					++day;
- 				}
- 				monlen = 31 + day_cor[r->month -1] - day_cor[r->month];
--				if (isleap && (r->month > 1)) {
-+				if (isleap && (r->month == 2)) {
- 					++monlen;
- 				}
- 				/* Wweekday (0 is Sunday) of 1st of the month
--- 
-1.7.3.4
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch
deleted file mode 100644
index 1305add50a..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- extra/locale/gen_wc8bit.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: uClibc-0.9.31/extra/locale/gen_wc8bit.c
-===================================================================
---- uClibc-0.9.31.orig/extra/locale/gen_wc8bit.c
-+++ uClibc-0.9.31/extra/locale/gen_wc8bit.c
-@@ -120,7 +120,7 @@
- 		}
- 
-  locale_failure:
--		printf("could not find a UTF8 locale ... please enable en_US.UTF-8\n");
-+		fprintf(stderr, "could not find a UTF8 locale ... please enable en_US.UTF-8\n");
- 		return EXIT_FAILURE;
-  locale_success:
- 		pclose(fp);
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch
deleted file mode 100644
index 763bfd39d7..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6f1daaaf2d94c1e6184add44eda38b0781b88cf0 Mon Sep 17 00:00:00 2001
-From: Rob Landley <rob@landley.net>
-Date: Sun, 16 May 2010 21:41:36 +0000
-Subject: Fix fcntl64 for 64 bit targets.
-
-64 bit targets often don't have a separate fcntl64() system call, because they don't need one.
-
-Signed-off-by: Rob Landley <rob@landley.net>
-Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
----
-diff --git a/include/fcntl.h b/include/fcntl.h
-index e37073f..3cfb25f 100644
---- a/include/fcntl.h
-+++ b/include/fcntl.h
-@@ -73,7 +73,7 @@ __BEGIN_DECLS
- 
-    This function is a cancellation point and therefore not marked with
-    __THROW.  */
--#ifndef __USE_FILE_OFFSET64
-+#if !defined(__USE_FILE_OFFSET64) || defined(__LP64__)
- extern int fcntl (int __fd, int __cmd, ...);
- libc_hidden_proto(fcntl)
- #else
-@@ -83,7 +83,7 @@ extern int __REDIRECT (fcntl, (int __fd, int __cmd, ...), fcntl64);
- #  define fcntl fcntl64
- # endif
- #endif
--#ifdef __USE_LARGEFILE64
-+#if defined(__USE_LARGEFILE64) && !defined(__LP64__)
- extern int fcntl64 (int __fd, int __cmd, ...);
- libc_hidden_proto(fcntl64)
- #endif
---
-cgit v0.8.2.1
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch
deleted file mode 100644
index c49821bde7..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 5 Jul 2010 14:08:17 +0200
-Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
-
-Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
-
-__errno_location / __h_errno_location access has to go through the PLT
-like malloc/free, so the linuxthread variants gets used instead when
-compiling with -pthread.
-
-Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/netdb.h                               |    1 -
- libc/misc/internals/__errno_location.c        |    3 ---
- libc/misc/internals/__h_errno_location.c      |    1 -
- libc/misc/internals/__uClibc_main.c           |    2 --
- libc/sysdeps/linux/common/bits/errno.h        |    1 -
- libc/sysdeps/linux/common/bits/uClibc_errno.h |    3 ---
- 6 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/include/netdb.h b/include/netdb.h
-index 9d3807d..ac411ab 100644
---- a/include/netdb.h
-+++ b/include/netdb.h
-@@ -59,7 +59,6 @@ __BEGIN_DECLS
- 
- /* Function to get address of global `h_errno' variable.  */
- extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__h_errno_location)
- 
- /* Macros for accessing h_errno from inside libc.  */
- #ifdef _LIBC
-diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
-index 487a9c2..0620860 100644
---- a/libc/misc/internals/__errno_location.c
-+++ b/libc/misc/internals/__errno_location.c
-@@ -11,6 +11,3 @@ int * weak_const_function __errno_location (void)
- {
-     return &errno;
- }
--#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
--libc_hidden_weak(__errno_location)
--#endif
-diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
-index 213d398..235df4e 100644
---- a/libc/misc/internals/__h_errno_location.c
-+++ b/libc/misc/internals/__h_errno_location.c
-@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
- {
-     return &h_errno;
- }
--libc_hidden_weak(__h_errno_location)
-diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
-index 6e520fa..f4a9ebb 100644
---- a/libc/misc/internals/__uClibc_main.c
-+++ b/libc/misc/internals/__uClibc_main.c
-@@ -64,9 +64,7 @@ void internal_function _dl_aux_init (ElfW(auxv_t) *av);
-  * Prototypes.
-  */
- extern int *weak_const_function __errno_location(void);
--libc_hidden_proto(__errno_location)
- extern int *weak_const_function __h_errno_location(void);
--libc_hidden_proto(__h_errno_location)
- 
- extern void weak_function _stdio_init(void) attribute_hidden;
- #ifdef __UCLIBC_HAS_LOCALE__
-diff --git a/libc/sysdeps/linux/common/bits/errno.h b/libc/sysdeps/linux/common/bits/errno.h
-index 0bf6354..de9688a 100644
---- a/libc/sysdeps/linux/common/bits/errno.h
-+++ b/libc/sysdeps/linux/common/bits/errno.h
-@@ -43,7 +43,6 @@
- # ifndef __ASSEMBLER__
- /* Function to get address of global `errno' variable.  */
- extern int *__errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__errno_location)
- 
- #  ifdef __UCLIBC_HAS_THREADS__
- /* When using threads, errno is a per-thread value.  */
-diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
-index 9c15618..79eb7e6 100644
---- a/libc/sysdeps/linux/common/bits/uClibc_errno.h
-+++ b/libc/sysdeps/linux/common/bits/uClibc_errno.h
-@@ -33,9 +33,6 @@ extern int *__errno_location (void) __THROW __attribute__ ((__const__))
- ;
- # if defined __UCLIBC_HAS_THREADS__
- #  include <tls.h>
--#  if defined USE___THREAD && USE___THREAD
--libc_hidden_proto(__errno_location)
--#  endif
- # endif
- 
- #endif /* !__ASSEMBLER__ */
--- 
-1.7.1
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch b/toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch
deleted file mode 100644
index 9e6953224c..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From aa67771881d65373da448ad5f7a8393f3a1d9469 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 30 Jun 2010 14:46:37 +0300
-Subject: [PATCH] more workarounds for GCC PR32219
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 2e53dd645d5348f207cec7f8595969dc566c5a55 workarounds GCC
-bug when accessing _locale_init and _stdio_init. We need the same
-fix for __errno_location and __h_errno_location otherwise we crash
-calling null with static and non-threaded builds.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/misc/internals/__uClibc_main.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
-index 3f09ad2..58f6643 100644
---- a/libc/misc/internals/__uClibc_main.c
-+++ b/libc/misc/internals/__uClibc_main.c
-@@ -447,11 +447,11 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
-      * have resulted in errno being set nonzero, so set it to 0 before
-      * we call main.
-      */
--    if (likely(__errno_location!=NULL))
-+    if (likely(not_null_ptr(__errno_location)))
- 	*(__errno_location()) = 0;
- 
-     /* Set h_errno to 0 as well */
--    if (likely(__h_errno_location!=NULL))
-+    if (likely(not_null_ptr(__h_errno_location)))
- 	*(__h_errno_location()) = 0;
- 
- #if defined HAVE_CLEANUP_JMP_BUF && defined __UCLIBC_HAS_THREADS_NATIVE__
--- 
-1.7.1
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch
deleted file mode 100644
index a5ccecaa3f..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-[PATCH] powerpc: add PTRACE_EVENT_ defines needed by ltrace
-
-Equivalent to the common version and kernel headers.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- libc/sysdeps/linux/powerpc/sys/ptrace.h |   41 +++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
-Index: uClibc-0.9.31/libc/sysdeps/linux/powerpc/sys/ptrace.h
-===================================================================
---- uClibc-0.9.31.orig/libc/sysdeps/linux/powerpc/sys/ptrace.h
-+++ uClibc-0.9.31/libc/sysdeps/linux/powerpc/sys/ptrace.h
-@@ -79,8 +79,47 @@ enum __ptrace_request
- #define PT_DETACH PTRACE_DETACH
- 
-   /* Continue and stop at the next (return from) syscall.  */
--  PTRACE_SYSCALL = 24
-+  PTRACE_SYSCALL = 24,
- #define PT_SYSCALL PTRACE_SYSCALL
-+
-+  /* Set ptrace filter options.  */
-+  PTRACE_SETOPTIONS = 0x4200,
-+#define PT_SETOPTIONS PTRACE_SETOPTIONS
-+
-+  /* Get last ptrace message.  */
-+  PTRACE_GETEVENTMSG = 0x4201,
-+#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
-+
-+  /* Get siginfo for process.  */
-+  PTRACE_GETSIGINFO = 0x4202,
-+#define PT_GETSIGINFO PTRACE_GETSIGINFO
-+
-+  /* Set new siginfo for process.  */
-+  PTRACE_SETSIGINFO = 0x4203
-+#define PT_SETSIGINFO PTRACE_SETSIGINFO
-+};
-+
-+
-+/* Options set using PTRACE_SETOPTIONS.  */
-+enum __ptrace_setoptions {
-+  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-+  PTRACE_O_TRACEFORK	= 0x00000002,
-+  PTRACE_O_TRACEVFORK   = 0x00000004,
-+  PTRACE_O_TRACECLONE	= 0x00000008,
-+  PTRACE_O_TRACEEXEC	= 0x00000010,
-+  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-+  PTRACE_O_TRACEEXIT	= 0x00000040,
-+  PTRACE_O_MASK		= 0x0000007f
-+};
-+
-+/* Wait extended result codes for the above trace options.  */
-+enum __ptrace_eventcodes {
-+  PTRACE_EVENT_FORK	= 1,
-+  PTRACE_EVENT_VFORK	= 2,
-+  PTRACE_EVENT_CLONE	= 3,
-+  PTRACE_EVENT_EXEC	= 4,
-+  PTRACE_EVENT_VFORK_DONE = 5,
-+  PTRACE_EVENT_EXIT	= 6
- };
- 
- /* Perform process tracing functions.  REQUEST is one of the values
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch b/toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch
deleted file mode 100644
index de37c30370..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch
+++ /dev/null
@@ -1,7393 +0,0 @@
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/Makefile.arch uClibc-0.9.31/libc/sysdeps/linux/sparc/Makefile.arch
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/Makefile.arch	2010-10-14 14:03:46.000000000 +0200
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/Makefile.arch	2010-10-14 14:36:34.000000000 +0200
-@@ -5,8 +5,15 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- #
- 
--CSRC := brk.c __syscall_error.c qp_ops.c sigaction.c
-+CSRC := brk.c __syscall_error.c sigaction.c
- 
- SSRC := \
- 	__longjmp.S fork.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \
- 	syscall.S urem.S udiv.S umul.S sdiv.S rem.S pipe.S
-+
-+CSRC += $(foreach f, \
-+	q_div.c   q_fle.c    q_mul.c   q_qtoll.c   q_stoq.c    \
-+	mp_clz_tab.c  q_dtoq.c  q_flt.c    q_neg.c   q_qtos.c    q_sub.c    \
-+	q_add.c      q_feq.c   q_fne.c    q_qtod.c  q_qtou.c    q_ulltoq.c  \
-+	q_cmp.c      q_fge.c   q_itoq.c   q_qtoull.c  q_util.c    \
-+	q_cmpe.c     q_fgt.c   q_lltoq.c  q_qtoi.c  q_sqrt.c    q_utoq.c, soft-fp/$(f))
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/double.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/double.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/double.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/double.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,264 @@
-+/* Software floating-point emulation.
-+   Definitions for IEEE Double Precision
-+   Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#if _FP_W_TYPE_SIZE < 32
-+#error "Here's a nickel kid.  Go buy yourself a real computer."
-+#endif
-+
-+#if _FP_W_TYPE_SIZE < 64
-+#define _FP_FRACTBITS_D		(2 * _FP_W_TYPE_SIZE)
-+#else
-+#define _FP_FRACTBITS_D		_FP_W_TYPE_SIZE
-+#endif
-+
-+#define _FP_FRACBITS_D		53
-+#define _FP_FRACXBITS_D		(_FP_FRACTBITS_D - _FP_FRACBITS_D)
-+#define _FP_WFRACBITS_D		(_FP_WORKBITS + _FP_FRACBITS_D)
-+#define _FP_WFRACXBITS_D	(_FP_FRACTBITS_D - _FP_WFRACBITS_D)
-+#define _FP_EXPBITS_D		11
-+#define _FP_EXPBIAS_D		1023
-+#define _FP_EXPMAX_D		2047
-+
-+#define _FP_QNANBIT_D		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_D-2) % _FP_W_TYPE_SIZE)
-+#define _FP_QNANBIT_SH_D		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_D-2+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
-+#define _FP_IMPLBIT_D		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_D-1) % _FP_W_TYPE_SIZE)
-+#define _FP_IMPLBIT_SH_D		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_D-1+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
-+#define _FP_OVERFLOW_D		\
-+	((_FP_W_TYPE)1 << _FP_WFRACBITS_D % _FP_W_TYPE_SIZE)
-+
-+typedef float DFtype __attribute__((mode(DF)));
-+
-+#if _FP_W_TYPE_SIZE < 64
-+
-+union _FP_UNION_D
-+{
-+  DFtype flt;
-+  struct {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+    unsigned sign  : 1;
-+    unsigned exp   : _FP_EXPBITS_D;
-+    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;
-+    unsigned frac0 : _FP_W_TYPE_SIZE;
-+#else
-+    unsigned frac0 : _FP_W_TYPE_SIZE;
-+    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;
-+    unsigned exp   : _FP_EXPBITS_D;
-+    unsigned sign  : 1;
-+#endif
-+  } bits __attribute__((packed));
-+};
-+
-+#define FP_DECL_D(X)		_FP_DECL(2,X)
-+#define FP_UNPACK_RAW_D(X,val)	_FP_UNPACK_RAW_2(D,X,val)
-+#define FP_UNPACK_RAW_DP(X,val)	_FP_UNPACK_RAW_2_P(D,X,val)
-+#define FP_PACK_RAW_D(val,X)	_FP_PACK_RAW_2(D,val,X)
-+#define FP_PACK_RAW_DP(val,X)		\
-+  do {					\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_2_P(D,val,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_D(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_2(D,X,val);		\
-+    _FP_UNPACK_CANONICAL(D,2,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_DP(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_2_P(D,X,val);	\
-+    _FP_UNPACK_CANONICAL(D,2,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_D(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_2(D,X,val);		\
-+    _FP_UNPACK_SEMIRAW(D,2,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_DP(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_2_P(D,X,val);	\
-+    _FP_UNPACK_SEMIRAW(D,2,X);		\
-+  } while (0)
-+
-+#define FP_PACK_D(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(D,2,X);		\
-+    _FP_PACK_RAW_2(D,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_DP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(D,2,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_2_P(D,val,X);	\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_D(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(D,2,X);		\
-+    _FP_PACK_RAW_2(D,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_DP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(D,2,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_2_P(D,val,X);	\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_D(X)		_FP_ISSIGNAN(D,2,X)
-+#define FP_NEG_D(R,X)			_FP_NEG(D,2,R,X)
-+#define FP_ADD_D(R,X,Y)			_FP_ADD(D,2,R,X,Y)
-+#define FP_SUB_D(R,X,Y)			_FP_SUB(D,2,R,X,Y)
-+#define FP_MUL_D(R,X,Y)			_FP_MUL(D,2,R,X,Y)
-+#define FP_DIV_D(R,X,Y)			_FP_DIV(D,2,R,X,Y)
-+#define FP_SQRT_D(R,X)			_FP_SQRT(D,2,R,X)
-+#define _FP_SQRT_MEAT_D(R,S,T,X,Q)	_FP_SQRT_MEAT_2(R,S,T,X,Q)
-+
-+#define FP_CMP_D(r,X,Y,un)	_FP_CMP(D,2,r,X,Y,un)
-+#define FP_CMP_EQ_D(r,X,Y)	_FP_CMP_EQ(D,2,r,X,Y)
-+#define FP_CMP_UNORD_D(r,X,Y)	_FP_CMP_UNORD(D,2,r,X,Y)
-+
-+#define FP_TO_INT_D(r,X,rsz,rsg)	_FP_TO_INT(D,2,r,X,rsz,rsg)
-+#define FP_FROM_INT_D(X,r,rs,rt)	_FP_FROM_INT(D,2,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_D(X)	_FP_FRAC_HIGH_2(X)
-+#define _FP_FRAC_HIGH_RAW_D(X)	_FP_FRAC_HIGH_2(X)
-+
-+#else
-+
-+union _FP_UNION_D
-+{
-+  DFtype flt;
-+  struct {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+    unsigned sign   : 1;
-+    unsigned exp    : _FP_EXPBITS_D;
-+    _FP_W_TYPE frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-+#else
-+    _FP_W_TYPE frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-+    unsigned exp    : _FP_EXPBITS_D;
-+    unsigned sign   : 1;
-+#endif
-+  } bits __attribute__((packed));
-+};
-+
-+#define FP_DECL_D(X)		_FP_DECL(1,X)
-+#define FP_UNPACK_RAW_D(X,val)	_FP_UNPACK_RAW_1(D,X,val)
-+#define FP_UNPACK_RAW_DP(X,val)	_FP_UNPACK_RAW_1_P(D,X,val)
-+#define FP_PACK_RAW_D(val,X)	_FP_PACK_RAW_1(D,val,X)
-+#define FP_PACK_RAW_DP(val,X)		\
-+  do {					\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_1_P(D,val,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_D(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_1(D,X,val);		\
-+    _FP_UNPACK_CANONICAL(D,1,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_DP(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_1_P(D,X,val);	\
-+    _FP_UNPACK_CANONICAL(D,1,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_D(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_2(1,X,val);		\
-+    _FP_UNPACK_SEMIRAW(D,1,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_DP(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_2_P(1,X,val);	\
-+    _FP_UNPACK_SEMIRAW(D,1,X);		\
-+  } while (0)
-+
-+#define FP_PACK_D(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(D,1,X);		\
-+    _FP_PACK_RAW_1(D,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_DP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(D,1,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_1_P(D,val,X);	\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_D(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(D,1,X);		\
-+    _FP_PACK_RAW_1(D,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_DP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(D,1,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_1_P(D,val,X);	\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_D(X)		_FP_ISSIGNAN(D,1,X)
-+#define FP_NEG_D(R,X)			_FP_NEG(D,1,R,X)
-+#define FP_ADD_D(R,X,Y)			_FP_ADD(D,1,R,X,Y)
-+#define FP_SUB_D(R,X,Y)			_FP_SUB(D,1,R,X,Y)
-+#define FP_MUL_D(R,X,Y)			_FP_MUL(D,1,R,X,Y)
-+#define FP_DIV_D(R,X,Y)			_FP_DIV(D,1,R,X,Y)
-+#define FP_SQRT_D(R,X)			_FP_SQRT(D,1,R,X)
-+#define _FP_SQRT_MEAT_D(R,S,T,X,Q)	_FP_SQRT_MEAT_1(R,S,T,X,Q)
-+
-+/* The implementation of _FP_MUL_D and _FP_DIV_D should be chosen by
-+   the target machine.  */
-+
-+#define FP_CMP_D(r,X,Y,un)	_FP_CMP(D,1,r,X,Y,un)
-+#define FP_CMP_EQ_D(r,X,Y)	_FP_CMP_EQ(D,1,r,X,Y)
-+#define FP_CMP_UNORD_D(r,X,Y)	_FP_CMP_UNORD(D,1,r,X,Y)
-+
-+#define FP_TO_INT_D(r,X,rsz,rsg)	_FP_TO_INT(D,1,r,X,rsz,rsg)
-+#define FP_FROM_INT_D(X,r,rs,rt)	_FP_FROM_INT(D,1,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_D(X)	_FP_FRAC_HIGH_1(X)
-+#define _FP_FRAC_HIGH_RAW_D(X)	_FP_FRAC_HIGH_1(X)
-+
-+#endif /* W_TYPE_SIZE < 64 */
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/extended.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/extended.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/extended.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/extended.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,431 @@
-+/* Software floating-point emulation.
-+   Definitions for IEEE Extended Precision.
-+   Copyright (C) 1999,2006,2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#if _FP_W_TYPE_SIZE < 32
-+#error "Here's a nickel, kid. Go buy yourself a real computer."
-+#endif
-+
-+#if _FP_W_TYPE_SIZE < 64
-+#define _FP_FRACTBITS_E         (4*_FP_W_TYPE_SIZE)
-+#else
-+#define _FP_FRACTBITS_E		(2*_FP_W_TYPE_SIZE)
-+#endif
-+
-+#define _FP_FRACBITS_E		64
-+#define _FP_FRACXBITS_E		(_FP_FRACTBITS_E - _FP_FRACBITS_E)
-+#define _FP_WFRACBITS_E		(_FP_WORKBITS + _FP_FRACBITS_E)
-+#define _FP_WFRACXBITS_E	(_FP_FRACTBITS_E - _FP_WFRACBITS_E)
-+#define _FP_EXPBITS_E		15
-+#define _FP_EXPBIAS_E		16383
-+#define _FP_EXPMAX_E		32767
-+
-+#define _FP_QNANBIT_E		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_E-2) % _FP_W_TYPE_SIZE)
-+#define _FP_QNANBIT_SH_E		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_E-2+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
-+#define _FP_IMPLBIT_E		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_E-1) % _FP_W_TYPE_SIZE)
-+#define _FP_IMPLBIT_SH_E		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_E-1+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
-+#define _FP_OVERFLOW_E		\
-+	((_FP_W_TYPE)1 << (_FP_WFRACBITS_E % _FP_W_TYPE_SIZE))
-+
-+typedef float XFtype __attribute__((mode(XF)));
-+
-+#if _FP_W_TYPE_SIZE < 64
-+
-+union _FP_UNION_E
-+{
-+   XFtype flt;
-+   struct 
-+   {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+      unsigned long pad1 : _FP_W_TYPE_SIZE;
-+      unsigned long pad2 : (_FP_W_TYPE_SIZE - 1 - _FP_EXPBITS_E);
-+      unsigned long sign : 1;
-+      unsigned long exp : _FP_EXPBITS_E;
-+      unsigned long frac1 : _FP_W_TYPE_SIZE;
-+      unsigned long frac0 : _FP_W_TYPE_SIZE;
-+#else
-+      unsigned long frac0 : _FP_W_TYPE_SIZE;
-+      unsigned long frac1 : _FP_W_TYPE_SIZE;
-+      unsigned exp : _FP_EXPBITS_E;
-+      unsigned sign : 1;
-+#endif /* not bigendian */
-+   } bits __attribute__((packed));
-+};
-+
-+
-+#define FP_DECL_E(X)		_FP_DECL(4,X)
-+
-+#define FP_UNPACK_RAW_E(X, val)				\
-+  do {							\
-+    union _FP_UNION_E _flo; _flo.flt = (val);		\
-+							\
-+    X##_f[2] = 0; X##_f[3] = 0;				\
-+    X##_f[0] = _flo.bits.frac0;				\
-+    X##_f[1] = _flo.bits.frac1;				\
-+    X##_e  = _flo.bits.exp;				\
-+    X##_s  = _flo.bits.sign;				\
-+  } while (0)
-+
-+#define FP_UNPACK_RAW_EP(X, val)			\
-+  do {							\
-+    union _FP_UNION_E *_flo =				\
-+    (union _FP_UNION_E *)(val);				\
-+							\
-+    X##_f[2] = 0; X##_f[3] = 0;				\
-+    X##_f[0] = _flo->bits.frac0;			\
-+    X##_f[1] = _flo->bits.frac1;			\
-+    X##_e  = _flo->bits.exp;				\
-+    X##_s  = _flo->bits.sign;				\
-+  } while (0)
-+
-+#define FP_PACK_RAW_E(val, X)				\
-+  do {							\
-+    union _FP_UNION_E _flo;				\
-+							\
-+    if (X##_e) X##_f[1] |= _FP_IMPLBIT_E;		\
-+    else X##_f[1] &= ~(_FP_IMPLBIT_E);			\
-+    _flo.bits.frac0 = X##_f[0];				\
-+    _flo.bits.frac1 = X##_f[1];				\
-+    _flo.bits.exp   = X##_e;				\
-+    _flo.bits.sign  = X##_s;				\
-+							\
-+    (val) = _flo.flt;					\
-+  } while (0)
-+
-+#define FP_PACK_RAW_EP(val, X)				\
-+  do {							\
-+    if (!FP_INHIBIT_RESULTS)				\
-+      {							\
-+	union _FP_UNION_E *_flo =			\
-+	  (union _FP_UNION_E *)(val);			\
-+							\
-+	if (X##_e) X##_f[1] |= _FP_IMPLBIT_E;		\
-+	else X##_f[1] &= ~(_FP_IMPLBIT_E);		\
-+	_flo->bits.frac0 = X##_f[0];			\
-+	_flo->bits.frac1 = X##_f[1];			\
-+	_flo->bits.exp   = X##_e;			\
-+	_flo->bits.sign  = X##_s;			\
-+      }							\
-+  } while (0)
-+
-+#define FP_UNPACK_E(X,val)		\
-+  do {					\
-+    FP_UNPACK_RAW_E(X,val);		\
-+    _FP_UNPACK_CANONICAL(E,4,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_EP(X,val)		\
-+  do {					\
-+    FP_UNPACK_RAW_EP(X,val);		\
-+    _FP_UNPACK_CANONICAL(E,4,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_E(X,val)	\
-+  do {					\
-+    FP_UNPACK_RAW_E(X,val);		\
-+    _FP_UNPACK_SEMIRAW(E,4,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_EP(X,val)	\
-+  do {					\
-+    FP_UNPACK_RAW_EP(X,val);		\
-+    _FP_UNPACK_SEMIRAW(E,4,X);		\
-+  } while (0)
-+
-+#define FP_PACK_E(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(E,4,X);		\
-+    FP_PACK_RAW_E(val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_EP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(E,4,X);		\
-+    FP_PACK_RAW_EP(val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_E(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(E,4,X);		\
-+    FP_PACK_RAW_E(val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_EP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(E,4,X);		\
-+    FP_PACK_RAW_EP(val,X);		\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_E(X)	_FP_ISSIGNAN(E,4,X)
-+#define FP_NEG_E(R,X)		_FP_NEG(E,4,R,X)
-+#define FP_ADD_E(R,X,Y)		_FP_ADD(E,4,R,X,Y)
-+#define FP_SUB_E(R,X,Y)		_FP_SUB(E,4,R,X,Y)
-+#define FP_MUL_E(R,X,Y)		_FP_MUL(E,4,R,X,Y)
-+#define FP_DIV_E(R,X,Y)		_FP_DIV(E,4,R,X,Y)
-+#define FP_SQRT_E(R,X)		_FP_SQRT(E,4,R,X)
-+
-+/*
-+ * Square root algorithms:
-+ * We have just one right now, maybe Newton approximation
-+ * should be added for those machines where division is fast.
-+ * This has special _E version because standard _4 square
-+ * root would not work (it has to start normally with the
-+ * second word and not the first), but as we have to do it
-+ * anyway, we optimize it by doing most of the calculations
-+ * in two UWtype registers instead of four.
-+ */
-+ 
-+#define _FP_SQRT_MEAT_E(R, S, T, X, q)			\
-+  do {							\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);		\
-+    _FP_FRAC_SRL_4(X, (_FP_WORKBITS));			\
-+    while (q)						\
-+      {							\
-+	T##_f[1] = S##_f[1] + q;			\
-+	if (T##_f[1] <= X##_f[1])			\
-+	  {						\
-+	    S##_f[1] = T##_f[1] + q;			\
-+	    X##_f[1] -= T##_f[1];			\
-+	    R##_f[1] += q;				\
-+	  }						\
-+	_FP_FRAC_SLL_2(X, 1);				\
-+	q >>= 1;					\
-+      }							\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);		\
-+    while (q)						\
-+      {							\
-+	T##_f[0] = S##_f[0] + q;			\
-+	T##_f[1] = S##_f[1];				\
-+	if (T##_f[1] < X##_f[1] || 			\
-+	    (T##_f[1] == X##_f[1] &&			\
-+	     T##_f[0] <= X##_f[0]))			\
-+	  {						\
-+	    S##_f[0] = T##_f[0] + q;			\
-+	    S##_f[1] += (T##_f[0] > S##_f[0]);		\
-+	    _FP_FRAC_DEC_2(X, T);			\
-+	    R##_f[0] += q;				\
-+	  }						\
-+	_FP_FRAC_SLL_2(X, 1);				\
-+	q >>= 1;					\
-+      }							\
-+    _FP_FRAC_SLL_4(R, (_FP_WORKBITS));			\
-+    if (X##_f[0] | X##_f[1])				\
-+      {							\
-+	if (S##_f[1] < X##_f[1] || 			\
-+	    (S##_f[1] == X##_f[1] &&			\
-+	     S##_f[0] < X##_f[0]))			\
-+	  R##_f[0] |= _FP_WORK_ROUND;			\
-+	R##_f[0] |= _FP_WORK_STICKY;			\
-+      }							\
-+  } while (0)
-+
-+#define FP_CMP_E(r,X,Y,un)	_FP_CMP(E,4,r,X,Y,un)
-+#define FP_CMP_EQ_E(r,X,Y)	_FP_CMP_EQ(E,4,r,X,Y)
-+#define FP_CMP_UNORD_E(r,X,Y)	_FP_CMP_UNORD(E,4,r,X,Y)
-+
-+#define FP_TO_INT_E(r,X,rsz,rsg)	_FP_TO_INT(E,4,r,X,rsz,rsg)
-+#define FP_FROM_INT_E(X,r,rs,rt)	_FP_FROM_INT(E,4,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_E(X)	(X##_f[2])
-+#define _FP_FRAC_HIGH_RAW_E(X)	(X##_f[1])
-+
-+#else   /* not _FP_W_TYPE_SIZE < 64 */
-+union _FP_UNION_E
-+{
-+  XFtype flt;
-+  struct {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+    _FP_W_TYPE pad  : (_FP_W_TYPE_SIZE - 1 - _FP_EXPBITS_E);
-+    unsigned sign   : 1;
-+    unsigned exp    : _FP_EXPBITS_E;
-+    _FP_W_TYPE frac : _FP_W_TYPE_SIZE;
-+#else
-+    _FP_W_TYPE frac : _FP_W_TYPE_SIZE;
-+    unsigned exp    : _FP_EXPBITS_E;
-+    unsigned sign   : 1;
-+#endif
-+  } bits;
-+};
-+
-+#define FP_DECL_E(X)		_FP_DECL(2,X)
-+
-+#define FP_UNPACK_RAW_E(X, val)					\
-+  do {								\
-+    union _FP_UNION_E _flo; _flo.flt = (val);			\
-+								\
-+    X##_f0 = _flo.bits.frac;					\
-+    X##_f1 = 0;							\
-+    X##_e = _flo.bits.exp;					\
-+    X##_s = _flo.bits.sign;					\
-+  } while (0)
-+
-+#define FP_UNPACK_RAW_EP(X, val)				\
-+  do {								\
-+    union _FP_UNION_E *_flo =					\
-+      (union _FP_UNION_E *)(val);				\
-+								\
-+    X##_f0 = _flo->bits.frac;					\
-+    X##_f1 = 0;							\
-+    X##_e = _flo->bits.exp;					\
-+    X##_s = _flo->bits.sign;					\
-+  } while (0)
-+
-+#define FP_PACK_RAW_E(val, X)					\
-+  do {								\
-+    union _FP_UNION_E _flo;					\
-+								\
-+    if (X##_e) X##_f0 |= _FP_IMPLBIT_E;				\
-+    else X##_f0 &= ~(_FP_IMPLBIT_E);				\
-+    _flo.bits.frac = X##_f0;					\
-+    _flo.bits.exp  = X##_e;					\
-+    _flo.bits.sign = X##_s;					\
-+								\
-+    (val) = _flo.flt;						\
-+  } while (0)
-+
-+#define FP_PACK_RAW_EP(fs, val, X)				\
-+  do {								\
-+    if (!FP_INHIBIT_RESULTS)					\
-+      {								\
-+	union _FP_UNION_E *_flo =				\
-+	  (union _FP_UNION_E *)(val);				\
-+								\
-+	if (X##_e) X##_f0 |= _FP_IMPLBIT_E;			\
-+	else X##_f0 &= ~(_FP_IMPLBIT_E);			\
-+	_flo->bits.frac = X##_f0;				\
-+	_flo->bits.exp  = X##_e;				\
-+	_flo->bits.sign = X##_s;				\
-+      }								\
-+  } while (0)
-+
-+
-+#define FP_UNPACK_E(X,val)		\
-+  do {					\
-+    FP_UNPACK_RAW_E(X,val);		\
-+    _FP_UNPACK_CANONICAL(E,2,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_EP(X,val)		\
-+  do {					\
-+    FP_UNPACK_RAW_EP(X,val);		\
-+    _FP_UNPACK_CANONICAL(E,2,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_E(X,val)	\
-+  do {					\
-+    FP_UNPACK_RAW_E(X,val);		\
-+    _FP_UNPACK_SEMIRAW(E,2,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_EP(X,val)	\
-+  do {					\
-+    FP_UNPACK_RAW_EP(X,val);		\
-+    _FP_UNPACK_SEMIRAW(E,2,X);		\
-+  } while (0)
-+
-+#define FP_PACK_E(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(E,2,X);		\
-+    FP_PACK_RAW_E(val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_EP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(E,2,X);		\
-+    FP_PACK_RAW_EP(val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_E(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(E,2,X);		\
-+    FP_PACK_RAW_E(val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_EP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(E,2,X);		\
-+    FP_PACK_RAW_EP(val,X);		\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_E(X)	_FP_ISSIGNAN(E,2,X)
-+#define FP_NEG_E(R,X)		_FP_NEG(E,2,R,X)
-+#define FP_ADD_E(R,X,Y)		_FP_ADD(E,2,R,X,Y)
-+#define FP_SUB_E(R,X,Y)		_FP_SUB(E,2,R,X,Y)
-+#define FP_MUL_E(R,X,Y)		_FP_MUL(E,2,R,X,Y)
-+#define FP_DIV_E(R,X,Y)		_FP_DIV(E,2,R,X,Y)
-+#define FP_SQRT_E(R,X)		_FP_SQRT(E,2,R,X)
-+
-+/*
-+ * Square root algorithms:
-+ * We have just one right now, maybe Newton approximation
-+ * should be added for those machines where division is fast.
-+ * We optimize it by doing most of the calculations
-+ * in one UWtype registers instead of two, although we don't
-+ * have to.
-+ */
-+#define _FP_SQRT_MEAT_E(R, S, T, X, q)			\
-+  do {							\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);		\
-+    _FP_FRAC_SRL_2(X, (_FP_WORKBITS));			\
-+    while (q)						\
-+      {							\
-+        T##_f0 = S##_f0 + q;				\
-+        if (T##_f0 <= X##_f0)				\
-+          {						\
-+            S##_f0 = T##_f0 + q;			\
-+            X##_f0 -= T##_f0;				\
-+            R##_f0 += q;				\
-+          }						\
-+        _FP_FRAC_SLL_1(X, 1);				\
-+        q >>= 1;					\
-+      }							\
-+    _FP_FRAC_SLL_2(R, (_FP_WORKBITS));			\
-+    if (X##_f0)						\
-+      {							\
-+	if (S##_f0 < X##_f0)				\
-+	  R##_f0 |= _FP_WORK_ROUND;			\
-+	R##_f0 |= _FP_WORK_STICKY;			\
-+      }							\
-+  } while (0)
-+ 
-+#define FP_CMP_E(r,X,Y,un)	_FP_CMP(E,2,r,X,Y,un)
-+#define FP_CMP_EQ_E(r,X,Y)	_FP_CMP_EQ(E,2,r,X,Y)
-+#define FP_CMP_UNORD_E(r,X,Y)	_FP_CMP_UNORD(E,2,r,X,Y)
-+
-+#define FP_TO_INT_E(r,X,rsz,rsg)	_FP_TO_INT(E,2,r,X,rsz,rsg)
-+#define FP_FROM_INT_E(X,r,rs,rt)	_FP_FROM_INT(E,2,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_E(X)	(X##_f1)
-+#define _FP_FRAC_HIGH_RAW_E(X)	(X##_f0)
-+
-+#endif /* not _FP_W_TYPE_SIZE < 64 */
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/longlong.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/longlong.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/longlong.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/longlong.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,1461 @@
-+/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
-+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* You have to define the following before including this file:
-+
-+   UWtype -- An unsigned type, default type for operations (typically a "word")
-+   UHWtype -- An unsigned type, at least half the size of UWtype.
-+   UDWtype -- An unsigned type, at least twice as large a UWtype
-+   W_TYPE_SIZE -- size in bits of UWtype
-+
-+   UQItype -- Unsigned 8 bit type.
-+   SItype, USItype -- Signed and unsigned 32 bit types.
-+   DItype, UDItype -- Signed and unsigned 64 bit types.
-+
-+   On a 32 bit machine UWtype should typically be USItype;
-+   on a 64 bit machine, UWtype should typically be UDItype.  */
-+
-+#define __BITS4 (W_TYPE_SIZE / 4)
-+#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
-+#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
-+#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
-+
-+#ifndef W_TYPE_SIZE
-+#define W_TYPE_SIZE	32
-+#define UWtype		USItype
-+#define UHWtype		USItype
-+#define UDWtype		UDItype
-+#endif
-+
-+extern const UQItype __clz_tab[256] attribute_hidden;
-+
-+/* Define auxiliary asm macros.
-+
-+   1) umul_ppmm(high_prod, low_prod, multiplier, multiplicand) multiplies two
-+   UWtype integers MULTIPLIER and MULTIPLICAND, and generates a two UWtype
-+   word product in HIGH_PROD and LOW_PROD.
-+
-+   2) __umulsidi3(a,b) multiplies two UWtype integers A and B, and returns a
-+   UDWtype product.  This is just a variant of umul_ppmm.
-+
-+   3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-+   denominator) divides a UDWtype, composed by the UWtype integers
-+   HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient
-+   in QUOTIENT and the remainder in REMAINDER.  HIGH_NUMERATOR must be less
-+   than DENOMINATOR for correct operation.  If, in addition, the most
-+   significant bit of DENOMINATOR must be 1, then the pre-processor symbol
-+   UDIV_NEEDS_NORMALIZATION is defined to 1.
-+
-+   4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-+   denominator).  Like udiv_qrnnd but the numbers are signed.  The quotient
-+   is rounded towards 0.
-+
-+   5) count_leading_zeros(count, x) counts the number of zero-bits from the
-+   msb to the first nonzero bit in the UWtype X.  This is the number of
-+   steps X needs to be shifted left to set the msb.  Undefined for X == 0,
-+   unless the symbol COUNT_LEADING_ZEROS_0 is defined to some value.
-+
-+   6) count_trailing_zeros(count, x) like count_leading_zeros, but counts
-+   from the least significant end.
-+
-+   7) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
-+   high_addend_2, low_addend_2) adds two UWtype integers, composed by
-+   HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2
-+   respectively.  The result is placed in HIGH_SUM and LOW_SUM.  Overflow
-+   (i.e. carry out) is not stored anywhere, and is lost.
-+
-+   8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend,
-+   high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers,
-+   composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and
-+   LOW_SUBTRAHEND_2 respectively.  The result is placed in HIGH_DIFFERENCE
-+   and LOW_DIFFERENCE.  Overflow (i.e. carry out) is not stored anywhere,
-+   and is lost.
-+
-+   If any of these macros are left undefined for a particular CPU,
-+   C macros are used.  */
-+
-+/* The CPUs come in alphabetical order below.
-+
-+   Please add support for more CPUs here, or improve the current support
-+   for the CPUs below!
-+   (E.g. WE32100, IBM360.)  */
-+
-+#if defined (__GNUC__) && !defined (NO_ASM)
-+
-+/* We sometimes need to clobber "cc" with gcc2, but that would not be
-+   understood by gcc1.  Use cpp to avoid major code duplication.  */
-+#if __GNUC__ < 2
-+#define __CLOBBER_CC
-+#define __AND_CLOBBER_CC
-+#else /* __GNUC__ >= 2 */
-+#define __CLOBBER_CC : "cc"
-+#define __AND_CLOBBER_CC , "cc"
-+#endif /* __GNUC__ < 2 */
-+
-+#if defined (__alpha) && W_TYPE_SIZE == 64
-+#define umul_ppmm(ph, pl, m0, m1) \
-+  do {									\
-+    UDItype __m0 = (m0), __m1 = (m1);					\
-+    (ph) = __builtin_alpha_umulh (__m0, __m1);				\
-+    (pl) = __m0 * __m1;							\
-+  } while (0)
-+#define UMUL_TIME 46
-+#ifndef LONGLONG_STANDALONE
-+#define udiv_qrnnd(q, r, n1, n0, d) \
-+  do { UDItype __r;							\
-+    (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));				\
-+    (r) = __r;								\
-+  } while (0)
-+extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype);
-+#define UDIV_TIME 220
-+#endif /* LONGLONG_STANDALONE */
-+#ifdef __alpha_cix__
-+#define count_leading_zeros(COUNT,X)	((COUNT) = __builtin_clzl (X))
-+#define count_trailing_zeros(COUNT,X)	((COUNT) = __builtin_ctzl (X))
-+#define COUNT_LEADING_ZEROS_0 64
-+#else
-+#define count_leading_zeros(COUNT,X) \
-+  do {									\
-+    UDItype __xr = (X), __t, __a;					\
-+    __t = __builtin_alpha_cmpbge (0, __xr);				\
-+    __a = __clz_tab[__t ^ 0xff] - 1;					\
-+    __t = __builtin_alpha_extbl (__xr, __a);				\
-+    (COUNT) = 64 - (__clz_tab[__t] + __a*8);				\
-+  } while (0)
-+#define count_trailing_zeros(COUNT,X) \
-+  do {									\
-+    UDItype __xr = (X), __t, __a;					\
-+    __t = __builtin_alpha_cmpbge (0, __xr);				\
-+    __t = ~__t & -~__t;							\
-+    __a = ((__t & 0xCC) != 0) * 2;					\
-+    __a += ((__t & 0xF0) != 0) * 4;					\
-+    __a += ((__t & 0xAA) != 0);						\
-+    __t = __builtin_alpha_extbl (__xr, __a);				\
-+    __a <<= 3;								\
-+    __t &= -__t;							\
-+    __a += ((__t & 0xCC) != 0) * 2;					\
-+    __a += ((__t & 0xF0) != 0) * 4;					\
-+    __a += ((__t & 0xAA) != 0);						\
-+    (COUNT) = __a;							\
-+  } while (0)
-+#endif /* __alpha_cix__ */
-+#endif /* __alpha */
-+
-+#if defined (__arc__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add.f	%1, %4, %5\n\tadc	%0, %2, %3"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%r" ((USItype) (ah)),					\
-+	     "rIJ" ((USItype) (bh)),					\
-+	     "%r" ((USItype) (al)),					\
-+	     "rIJ" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub.f	%1, %4, %5\n\tsbc	%0, %2, %3"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "r" ((USItype) (ah)),					\
-+	     "rIJ" ((USItype) (bh)),					\
-+	     "r" ((USItype) (al)),					\
-+	     "rIJ" ((USItype) (bl)))
-+/* Call libgcc routine.  */
-+#define umul_ppmm(w1, w0, u, v) \
-+do {									\
-+  DWunion __w;								\
-+  __w.ll = __umulsidi3 (u, v);						\
-+  w1 = __w.s.high;							\
-+  w0 = __w.s.low;							\
-+} while (0)
-+#define __umulsidi3 __umulsidi3
-+UDItype __umulsidi3 (USItype, USItype);
-+#endif
-+
-+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("adds	%1, %4, %5\n\tadc	%0, %2, %3"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%r" ((USItype) (ah)),					\
-+	     "rI" ((USItype) (bh)),					\
-+	     "%r" ((USItype) (al)),					\
-+	     "rI" ((USItype) (bl)) __CLOBBER_CC)
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("subs	%1, %4, %5\n\tsbc	%0, %2, %3"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "r" ((USItype) (ah)),					\
-+	     "rI" ((USItype) (bh)),					\
-+	     "r" ((USItype) (al)),					\
-+	     "rI" ((USItype) (bl)) __CLOBBER_CC)
-+#define umul_ppmm(xh, xl, a, b) \
-+{register USItype __t0, __t1, __t2;					\
-+  __asm__ ("%@ Inlined umul_ppmm\n"					\
-+	   "	mov	%2, %5, lsr #16\n"				\
-+	   "	mov	%0, %6, lsr #16\n"				\
-+	   "	bic	%3, %5, %2, lsl #16\n"				\
-+	   "	bic	%4, %6, %0, lsl #16\n"				\
-+	   "	mul	%1, %3, %4\n"					\
-+	   "	mul	%4, %2, %4\n"					\
-+	   "	mul	%3, %0, %3\n"					\
-+	   "	mul	%0, %2, %0\n"					\
-+	   "	adds	%3, %4, %3\n"					\
-+	   "	addcs	%0, %0, #65536\n"				\
-+	   "	adds	%1, %1, %3, lsl #16\n"				\
-+	   "	adc	%0, %0, %3, lsr #16"				\
-+	   : "=&r" ((USItype) (xh)),					\
-+	     "=r" ((USItype) (xl)),					\
-+	     "=&r" (__t0), "=&r" (__t1), "=r" (__t2)			\
-+	   : "r" ((USItype) (a)),					\
-+	     "r" ((USItype) (b)) __CLOBBER_CC );}
-+#define UMUL_TIME 20
-+#define UDIV_TIME 100
-+#endif /* __arm__ */
-+
-+#if defined(__arm__)
-+/* Let gcc decide how best to implement count_leading_zeros.  */
-+#define count_leading_zeros(COUNT,X)	((COUNT) = __builtin_clz (X))
-+#define COUNT_LEADING_ZEROS_0 32
-+#endif
-+
-+#if defined (__CRIS__) && __CRIS_arch_version >= 3
-+#define count_leading_zeros(COUNT, X) ((COUNT) = __builtin_clz (X))
-+#if __CRIS_arch_version >= 8
-+#define count_trailing_zeros(COUNT, X) ((COUNT) = __builtin_ctz (X))
-+#endif
-+#endif /* __CRIS__ */
-+
-+#if defined (__hppa) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add %4,%5,%1\n\taddc %2,%3,%0"				\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%rM" ((USItype) (ah)),					\
-+	     "rM" ((USItype) (bh)),					\
-+	     "%rM" ((USItype) (al)),					\
-+	     "rM" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub %4,%5,%1\n\tsubb %2,%3,%0"				\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "rM" ((USItype) (ah)),					\
-+	     "rM" ((USItype) (bh)),					\
-+	     "rM" ((USItype) (al)),					\
-+	     "rM" ((USItype) (bl)))
-+#if defined (_PA_RISC1_1)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    union								\
-+      {									\
-+	UDItype __f;							\
-+	struct {USItype __w1, __w0;} __w1w0;				\
-+      } __t;								\
-+    __asm__ ("xmpyu %1,%2,%0"						\
-+	     : "=x" (__t.__f)						\
-+	     : "x" ((USItype) (u)),					\
-+	       "x" ((USItype) (v)));					\
-+    (w1) = __t.__w1w0.__w1;						\
-+    (w0) = __t.__w1w0.__w0;						\
-+     } while (0)
-+#define UMUL_TIME 8
-+#else
-+#define UMUL_TIME 30
-+#endif
-+#define UDIV_TIME 40
-+#define count_leading_zeros(count, x) \
-+  do {									\
-+    USItype __tmp;							\
-+    __asm__ (								\
-+       "ldi		1,%0\n"						\
-+"	extru,=		%1,15,16,%%r0		; Bits 31..16 zero?\n"	\
-+"	extru,tr	%1,15,16,%1		; No.  Shift down, skip add.\n"\
-+"	ldo		16(%0),%0		; Yes.  Perform add.\n"	\
-+"	extru,=		%1,23,8,%%r0		; Bits 15..8 zero?\n"	\
-+"	extru,tr	%1,23,8,%1		; No.  Shift down, skip add.\n"\
-+"	ldo		8(%0),%0		; Yes.  Perform add.\n"	\
-+"	extru,=		%1,27,4,%%r0		; Bits 7..4 zero?\n"	\
-+"	extru,tr	%1,27,4,%1		; No.  Shift down, skip add.\n"\
-+"	ldo		4(%0),%0		; Yes.  Perform add.\n"	\
-+"	extru,=		%1,29,2,%%r0		; Bits 3..2 zero?\n"	\
-+"	extru,tr	%1,29,2,%1		; No.  Shift down, skip add.\n"\
-+"	ldo		2(%0),%0		; Yes.  Perform add.\n"	\
-+"	extru		%1,30,1,%1		; Extract bit 1.\n"	\
-+"	sub		%0,%1,%0		; Subtract it.\n"	\
-+	: "=r" (count), "=r" (__tmp) : "1" (x));			\
-+  } while (0)
-+#endif
-+
-+#if (defined (__i370__) || defined (__s390__) || defined (__mvs__)) && W_TYPE_SIZE == 32
-+#define smul_ppmm(xh, xl, m0, m1) \
-+  do {									\
-+    union {DItype __ll;							\
-+	   struct {USItype __h, __l;} __i;				\
-+	  } __x;							\
-+    __asm__ ("lr %N0,%1\n\tmr %0,%2"					\
-+	     : "=&r" (__x.__ll)						\
-+	     : "r" (m0), "r" (m1));					\
-+    (xh) = __x.__i.__h; (xl) = __x.__i.__l;				\
-+  } while (0)
-+#define sdiv_qrnnd(q, r, n1, n0, d) \
-+  do {									\
-+    union {DItype __ll;							\
-+	   struct {USItype __h, __l;} __i;				\
-+	  } __x;							\
-+    __x.__i.__h = n1; __x.__i.__l = n0;					\
-+    __asm__ ("dr %0,%2"							\
-+	     : "=r" (__x.__ll)						\
-+	     : "0" (__x.__ll), "r" (d));				\
-+    (q) = __x.__i.__l; (r) = __x.__i.__h;				\
-+  } while (0)
-+#endif
-+
-+#if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add{l} {%5,%1|%1,%5}\n\tadc{l} {%3,%0|%0,%3}"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%0" ((USItype) (ah)),					\
-+	     "g" ((USItype) (bh)),					\
-+	     "%1" ((USItype) (al)),					\
-+	     "g" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub{l} {%5,%1|%1,%5}\n\tsbb{l} {%3,%0|%0,%3}"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "0" ((USItype) (ah)),					\
-+	     "g" ((USItype) (bh)),					\
-+	     "1" ((USItype) (al)),					\
-+	     "g" ((USItype) (bl)))
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ ("mul{l} %3"							\
-+	   : "=a" ((USItype) (w0)),					\
-+	     "=d" ((USItype) (w1))					\
-+	   : "%0" ((USItype) (u)),					\
-+	     "rm" ((USItype) (v)))
-+#define udiv_qrnnd(q, r, n1, n0, dv) \
-+  __asm__ ("div{l} %4"							\
-+	   : "=a" ((USItype) (q)),					\
-+	     "=d" ((USItype) (r))					\
-+	   : "0" ((USItype) (n0)),					\
-+	     "1" ((USItype) (n1)),					\
-+	     "rm" ((USItype) (dv)))
-+#define count_leading_zeros(count, x)	((count) = __builtin_clz (x))
-+#define count_trailing_zeros(count, x)	((count) = __builtin_ctz (x))
-+#define UMUL_TIME 40
-+#define UDIV_TIME 40
-+#endif /* 80x86 */
-+
-+#if (defined (__x86_64__) || defined (__i386__)) && W_TYPE_SIZE == 64
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add{q} {%5,%1|%1,%5}\n\tadc{q} {%3,%0|%0,%3}"		\
-+	   : "=r" ((UDItype) (sh)),					\
-+	     "=&r" ((UDItype) (sl))					\
-+	   : "%0" ((UDItype) (ah)),					\
-+	     "rme" ((UDItype) (bh)),					\
-+	     "%1" ((UDItype) (al)),					\
-+	     "rme" ((UDItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub{q} {%5,%1|%1,%5}\n\tsbb{q} {%3,%0|%0,%3}"		\
-+	   : "=r" ((UDItype) (sh)),					\
-+	     "=&r" ((UDItype) (sl))					\
-+	   : "0" ((UDItype) (ah)),					\
-+	     "rme" ((UDItype) (bh)),					\
-+	     "1" ((UDItype) (al)),					\
-+	     "rme" ((UDItype) (bl)))
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ ("mul{q} %3"							\
-+	   : "=a" ((UDItype) (w0)),					\
-+	     "=d" ((UDItype) (w1))					\
-+	   : "%0" ((UDItype) (u)),					\
-+	     "rm" ((UDItype) (v)))
-+#define udiv_qrnnd(q, r, n1, n0, dv) \
-+  __asm__ ("div{q} %4"							\
-+	   : "=a" ((UDItype) (q)),					\
-+	     "=d" ((UDItype) (r))					\
-+	   : "0" ((UDItype) (n0)),					\
-+	     "1" ((UDItype) (n1)),					\
-+	     "rm" ((UDItype) (dv)))
-+#define count_leading_zeros(count, x)	((count) = __builtin_clzl (x))
-+#define count_trailing_zeros(count, x)	((count) = __builtin_ctzl (x))
-+#define UMUL_TIME 40
-+#define UDIV_TIME 40
-+#endif /* x86_64 */
-+
-+#if defined (__i960__) && W_TYPE_SIZE == 32
-+#define umul_ppmm(w1, w0, u, v) \
-+  ({union {UDItype __ll;						\
-+	   struct {USItype __l, __h;} __i;				\
-+	  } __xx;							\
-+  __asm__ ("emul	%2,%1,%0"					\
-+	   : "=d" (__xx.__ll)						\
-+	   : "%dI" ((USItype) (u)),					\
-+	     "dI" ((USItype) (v)));					\
-+  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-+#define __umulsidi3(u, v) \
-+  ({UDItype __w;							\
-+    __asm__ ("emul	%2,%1,%0"					\
-+	     : "=d" (__w)						\
-+	     : "%dI" ((USItype) (u)),					\
-+	       "dI" ((USItype) (v)));					\
-+    __w; })
-+#endif /* __i960__ */
-+
-+#if defined (__M32R__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  /* The cmp clears the condition bit.  */ \
-+  __asm__ ("cmp %0,%0\n\taddx %1,%5\n\taddx %0,%3"			\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "0" ((USItype) (ah)),					\
-+	     "r" ((USItype) (bh)),					\
-+	     "1" ((USItype) (al)),					\
-+	     "r" ((USItype) (bl))					\
-+	   : "cbit")
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  /* The cmp clears the condition bit.  */ \
-+  __asm__ ("cmp %0,%0\n\tsubx %1,%5\n\tsubx %0,%3"			\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "0" ((USItype) (ah)),					\
-+	     "r" ((USItype) (bh)),					\
-+	     "1" ((USItype) (al)),					\
-+	     "r" ((USItype) (bl))					\
-+	   : "cbit")
-+#endif /* __M32R__ */
-+
-+#if defined (__mc68000__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add%.l %5,%1\n\taddx%.l %3,%0"				\
-+	   : "=d" ((USItype) (sh)),					\
-+	     "=&d" ((USItype) (sl))					\
-+	   : "%0" ((USItype) (ah)),					\
-+	     "d" ((USItype) (bh)),					\
-+	     "%1" ((USItype) (al)),					\
-+	     "g" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub%.l %5,%1\n\tsubx%.l %3,%0"				\
-+	   : "=d" ((USItype) (sh)),					\
-+	     "=&d" ((USItype) (sl))					\
-+	   : "0" ((USItype) (ah)),					\
-+	     "d" ((USItype) (bh)),					\
-+	     "1" ((USItype) (al)),					\
-+	     "g" ((USItype) (bl)))
-+
-+/* The '020, '030, '040, '060 and CPU32 have 32x32->64 and 64/32->32q-32r.  */
-+#if (defined (__mc68020__) && !defined (__mc68060__))
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ ("mulu%.l %3,%1:%0"						\
-+	   : "=d" ((USItype) (w0)),					\
-+	     "=d" ((USItype) (w1))					\
-+	   : "%0" ((USItype) (u)),					\
-+	     "dmi" ((USItype) (v)))
-+#define UMUL_TIME 45
-+#define udiv_qrnnd(q, r, n1, n0, d) \
-+  __asm__ ("divu%.l %4,%1:%0"						\
-+	   : "=d" ((USItype) (q)),					\
-+	     "=d" ((USItype) (r))					\
-+	   : "0" ((USItype) (n0)),					\
-+	     "1" ((USItype) (n1)),					\
-+	     "dmi" ((USItype) (d)))
-+#define UDIV_TIME 90
-+#define sdiv_qrnnd(q, r, n1, n0, d) \
-+  __asm__ ("divs%.l %4,%1:%0"						\
-+	   : "=d" ((USItype) (q)),					\
-+	     "=d" ((USItype) (r))					\
-+	   : "0" ((USItype) (n0)),					\
-+	     "1" ((USItype) (n1)),					\
-+	     "dmi" ((USItype) (d)))
-+
-+#elif defined (__mcoldfire__) /* not mc68020 */
-+
-+#define umul_ppmm(xh, xl, a, b) \
-+  __asm__ ("| Inlined umul_ppmm\n"					\
-+	   "	move%.l	%2,%/d0\n"					\
-+	   "	move%.l	%3,%/d1\n"					\
-+	   "	move%.l	%/d0,%/d2\n"					\
-+	   "	swap	%/d0\n"						\
-+	   "	move%.l	%/d1,%/d3\n"					\
-+	   "	swap	%/d1\n"						\
-+	   "	move%.w	%/d2,%/d4\n"					\
-+	   "	mulu	%/d3,%/d4\n"					\
-+	   "	mulu	%/d1,%/d2\n"					\
-+	   "	mulu	%/d0,%/d3\n"					\
-+	   "	mulu	%/d0,%/d1\n"					\
-+	   "	move%.l	%/d4,%/d0\n"					\
-+	   "	clr%.w	%/d0\n"						\
-+	   "	swap	%/d0\n"						\
-+	   "	add%.l	%/d0,%/d2\n"					\
-+	   "	add%.l	%/d3,%/d2\n"					\
-+	   "	jcc	1f\n"						\
-+	   "	add%.l	%#65536,%/d1\n"					\
-+	   "1:	swap	%/d2\n"						\
-+	   "	moveq	%#0,%/d0\n"					\
-+	   "	move%.w	%/d2,%/d0\n"					\
-+	   "	move%.w	%/d4,%/d2\n"					\
-+	   "	move%.l	%/d2,%1\n"					\
-+	   "	add%.l	%/d1,%/d0\n"					\
-+	   "	move%.l	%/d0,%0"					\
-+	   : "=g" ((USItype) (xh)),					\
-+	     "=g" ((USItype) (xl))					\
-+	   : "g" ((USItype) (a)),					\
-+	     "g" ((USItype) (b))					\
-+	   : "d0", "d1", "d2", "d3", "d4")
-+#define UMUL_TIME 100
-+#define UDIV_TIME 400
-+#else /* not ColdFire */
-+/* %/ inserts REGISTER_PREFIX, %# inserts IMMEDIATE_PREFIX.  */
-+#define umul_ppmm(xh, xl, a, b) \
-+  __asm__ ("| Inlined umul_ppmm\n"					\
-+	   "	move%.l	%2,%/d0\n"					\
-+	   "	move%.l	%3,%/d1\n"					\
-+	   "	move%.l	%/d0,%/d2\n"					\
-+	   "	swap	%/d0\n"						\
-+	   "	move%.l	%/d1,%/d3\n"					\
-+	   "	swap	%/d1\n"						\
-+	   "	move%.w	%/d2,%/d4\n"					\
-+	   "	mulu	%/d3,%/d4\n"					\
-+	   "	mulu	%/d1,%/d2\n"					\
-+	   "	mulu	%/d0,%/d3\n"					\
-+	   "	mulu	%/d0,%/d1\n"					\
-+	   "	move%.l	%/d4,%/d0\n"					\
-+	   "	eor%.w	%/d0,%/d0\n"					\
-+	   "	swap	%/d0\n"						\
-+	   "	add%.l	%/d0,%/d2\n"					\
-+	   "	add%.l	%/d3,%/d2\n"					\
-+	   "	jcc	1f\n"						\
-+	   "	add%.l	%#65536,%/d1\n"					\
-+	   "1:	swap	%/d2\n"						\
-+	   "	moveq	%#0,%/d0\n"					\
-+	   "	move%.w	%/d2,%/d0\n"					\
-+	   "	move%.w	%/d4,%/d2\n"					\
-+	   "	move%.l	%/d2,%1\n"					\
-+	   "	add%.l	%/d1,%/d0\n"					\
-+	   "	move%.l	%/d0,%0"					\
-+	   : "=g" ((USItype) (xh)),					\
-+	     "=g" ((USItype) (xl))					\
-+	   : "g" ((USItype) (a)),					\
-+	     "g" ((USItype) (b))					\
-+	   : "d0", "d1", "d2", "d3", "d4")
-+#define UMUL_TIME 100
-+#define UDIV_TIME 400
-+
-+#endif /* not mc68020 */
-+
-+/* The '020, '030, '040 and '060 have bitfield insns.
-+   cpu32 disguises as a 68020, but lacks them.  */
-+#if defined (__mc68020__) && !defined (__mcpu32__)
-+#define count_leading_zeros(count, x) \
-+  __asm__ ("bfffo %1{%b2:%b2},%0"					\
-+	   : "=d" ((USItype) (count))					\
-+	   : "od" ((USItype) (x)), "n" (0))
-+/* Some ColdFire architectures have a ff1 instruction supported via
-+   __builtin_clz. */
-+#elif defined (__mcfisaaplus__) || defined (__mcfisac__)
-+#define count_leading_zeros(count,x) ((count) = __builtin_clz (x))
-+#define COUNT_LEADING_ZEROS_0 32
-+#endif
-+#endif /* mc68000 */
-+
-+#if defined (__m88000__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("addu.co %1,%r4,%r5\n\taddu.ci %0,%r2,%r3"			\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%rJ" ((USItype) (ah)),					\
-+	     "rJ" ((USItype) (bh)),					\
-+	     "%rJ" ((USItype) (al)),					\
-+	     "rJ" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("subu.co %1,%r4,%r5\n\tsubu.ci %0,%r2,%r3"			\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "rJ" ((USItype) (ah)),					\
-+	     "rJ" ((USItype) (bh)),					\
-+	     "rJ" ((USItype) (al)),					\
-+	     "rJ" ((USItype) (bl)))
-+#define count_leading_zeros(count, x) \
-+  do {									\
-+    USItype __cbtmp;							\
-+    __asm__ ("ff1 %0,%1"						\
-+	     : "=r" (__cbtmp)						\
-+	     : "r" ((USItype) (x)));					\
-+    (count) = __cbtmp ^ 31;						\
-+  } while (0)
-+#define COUNT_LEADING_ZEROS_0 63 /* sic */
-+#if defined (__mc88110__)
-+#define umul_ppmm(wh, wl, u, v) \
-+  do {									\
-+    union {UDItype __ll;						\
-+	   struct {USItype __h, __l;} __i;				\
-+	  } __xx;							\
-+    __asm__ ("mulu.d	%0,%1,%2"					\
-+	     : "=r" (__xx.__ll)						\
-+	     : "r" ((USItype) (u)),					\
-+	       "r" ((USItype) (v)));					\
-+    (wh) = __xx.__i.__h;						\
-+    (wl) = __xx.__i.__l;						\
-+  } while (0)
-+#define udiv_qrnnd(q, r, n1, n0, d) \
-+  ({union {UDItype __ll;						\
-+	   struct {USItype __h, __l;} __i;				\
-+	  } __xx;							\
-+  USItype __q;								\
-+  __xx.__i.__h = (n1); __xx.__i.__l = (n0);				\
-+  __asm__ ("divu.d %0,%1,%2"						\
-+	   : "=r" (__q)							\
-+	   : "r" (__xx.__ll),						\
-+	     "r" ((USItype) (d)));					\
-+  (r) = (n0) - __q * (d); (q) = __q; })
-+#define UMUL_TIME 5
-+#define UDIV_TIME 25
-+#else
-+#define UMUL_TIME 17
-+#define UDIV_TIME 150
-+#endif /* __mc88110__ */
-+#endif /* __m88000__ */
-+
-+#if defined (__mips__) && W_TYPE_SIZE == 32
-+#define umul_ppmm(w1, w0, u, v)						\
-+  do {									\
-+    UDItype __x = (UDItype) (USItype) (u) * (USItype) (v);		\
-+    (w1) = (USItype) (__x >> 32);					\
-+    (w0) = (USItype) (__x);						\
-+  } while (0)
-+#define UMUL_TIME 10
-+#define UDIV_TIME 100
-+
-+#if (__mips == 32 || __mips == 64) && ! __mips16
-+#define count_leading_zeros(COUNT,X)	((COUNT) = __builtin_clz (X))
-+#define COUNT_LEADING_ZEROS_0 32
-+#endif
-+#endif /* __mips__ */
-+
-+#if defined (__ns32000__) && W_TYPE_SIZE == 32
-+#define umul_ppmm(w1, w0, u, v) \
-+  ({union {UDItype __ll;						\
-+	   struct {USItype __l, __h;} __i;				\
-+	  } __xx;							\
-+  __asm__ ("meid %2,%0"							\
-+	   : "=g" (__xx.__ll)						\
-+	   : "%0" ((USItype) (u)),					\
-+	     "g" ((USItype) (v)));					\
-+  (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;})
-+#define __umulsidi3(u, v) \
-+  ({UDItype __w;							\
-+    __asm__ ("meid %2,%0"						\
-+	     : "=g" (__w)						\
-+	     : "%0" ((USItype) (u)),					\
-+	       "g" ((USItype) (v)));					\
-+    __w; })
-+#define udiv_qrnnd(q, r, n1, n0, d) \
-+  ({union {UDItype __ll;						\
-+	   struct {USItype __l, __h;} __i;				\
-+	  } __xx;							\
-+  __xx.__i.__h = (n1); __xx.__i.__l = (n0);				\
-+  __asm__ ("deid %2,%0"							\
-+	   : "=g" (__xx.__ll)						\
-+	   : "0" (__xx.__ll),						\
-+	     "g" ((USItype) (d)));					\
-+  (r) = __xx.__i.__l; (q) = __xx.__i.__h; })
-+#define count_trailing_zeros(count,x) \
-+  do {									\
-+    __asm__ ("ffsd     %2,%0"						\
-+            : "=r" ((USItype) (count))					\
-+            : "0" ((USItype) 0),					\
-+              "r" ((USItype) (x)));					\
-+  } while (0)
-+#endif /* __ns32000__ */
-+
-+/* FIXME: We should test _IBMR2 here when we add assembly support for the
-+   system vendor compilers.
-+   FIXME: What's needed for gcc PowerPC VxWorks?  __vxworks__ is not good
-+   enough, since that hits ARM and m68k too.  */
-+#if (defined (_ARCH_PPC)	/* AIX */				\
-+     || defined (_ARCH_PWR)	/* AIX */				\
-+     || defined (_ARCH_COM)	/* AIX */				\
-+     || defined (__powerpc__)	/* gcc */				\
-+     || defined (__POWERPC__)	/* BEOS */				\
-+     || defined (__ppc__)	/* Darwin */				\
-+     || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */    \
-+     || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */               \
-+         && CPU_FAMILY == PPC)                                                \
-+     ) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  do {									\
-+    if (__builtin_constant_p (bh) && (bh) == 0)				\
-+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"		\
-+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
-+    else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0)		\
-+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"		\
-+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
-+    else								\
-+      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"		\
-+	     : "=r" (sh), "=&r" (sl)					\
-+	     : "%r" (ah), "r" (bh), "%r" (al), "rI" (bl));		\
-+  } while (0)
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  do {									\
-+    if (__builtin_constant_p (ah) && (ah) == 0)				\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"	\
-+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
-+    else if (__builtin_constant_p (ah) && (ah) == ~(USItype) 0)		\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"	\
-+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
-+    else if (__builtin_constant_p (bh) && (bh) == 0)			\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"		\
-+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
-+    else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0)		\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"		\
-+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
-+    else								\
-+      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"	\
-+	       : "=r" (sh), "=&r" (sl)					\
-+	       : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		\
-+  } while (0)
-+#define count_leading_zeros(count, x) \
-+  __asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x))
-+#define COUNT_LEADING_ZEROS_0 32
-+#if defined (_ARCH_PPC) || defined (__powerpc__) || defined (__POWERPC__) \
-+  || defined (__ppc__)                                                    \
-+  || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */       \
-+  || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */                  \
-+         && CPU_FAMILY == PPC)
-+#define umul_ppmm(ph, pl, m0, m1) \
-+  do {									\
-+    USItype __m0 = (m0), __m1 = (m1);					\
-+    __asm__ ("mulhwu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
-+    (pl) = __m0 * __m1;							\
-+  } while (0)
-+#define UMUL_TIME 15
-+#define smul_ppmm(ph, pl, m0, m1) \
-+  do {									\
-+    SItype __m0 = (m0), __m1 = (m1);					\
-+    __asm__ ("mulhw %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
-+    (pl) = __m0 * __m1;							\
-+  } while (0)
-+#define SMUL_TIME 14
-+#define UDIV_TIME 120
-+#elif defined (_ARCH_PWR)
-+#define UMUL_TIME 8
-+#define smul_ppmm(xh, xl, m0, m1) \
-+  __asm__ ("mul %0,%2,%3" : "=r" (xh), "=q" (xl) : "r" (m0), "r" (m1))
-+#define SMUL_TIME 4
-+#define sdiv_qrnnd(q, r, nh, nl, d) \
-+  __asm__ ("div %0,%2,%4" : "=r" (q), "=q" (r) : "r" (nh), "1" (nl), "r" (d))
-+#define UDIV_TIME 100
-+#endif
-+#endif /* 32-bit POWER architecture variants.  */
-+
-+/* We should test _IBMR2 here when we add assembly support for the system
-+   vendor compilers.  */
-+#if (defined (_ARCH_PPC64) || defined (__powerpc64__)) && W_TYPE_SIZE == 64
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  do {									\
-+    if (__builtin_constant_p (bh) && (bh) == 0)				\
-+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2"		\
-+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
-+    else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)		\
-+      __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2"		\
-+	     : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\
-+    else								\
-+      __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3"		\
-+	     : "=r" (sh), "=&r" (sl)					\
-+	     : "%r" (ah), "r" (bh), "%r" (al), "rI" (bl));		\
-+  } while (0)
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  do {									\
-+    if (__builtin_constant_p (ah) && (ah) == 0)				\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2"	\
-+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
-+    else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0)		\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2"	\
-+	       : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\
-+    else if (__builtin_constant_p (bh) && (bh) == 0)			\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2"		\
-+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
-+    else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0)		\
-+      __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2"		\
-+	       : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\
-+    else								\
-+      __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2"	\
-+	       : "=r" (sh), "=&r" (sl)					\
-+	       : "r" (ah), "r" (bh), "rI" (al), "r" (bl));		\
-+  } while (0)
-+#define count_leading_zeros(count, x) \
-+  __asm__ ("cntlzd %0,%1" : "=r" (count) : "r" (x))
-+#define COUNT_LEADING_ZEROS_0 64
-+#define umul_ppmm(ph, pl, m0, m1) \
-+  do {									\
-+    UDItype __m0 = (m0), __m1 = (m1);					\
-+    __asm__ ("mulhdu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
-+    (pl) = __m0 * __m1;							\
-+  } while (0)
-+#define UMUL_TIME 15
-+#define smul_ppmm(ph, pl, m0, m1) \
-+  do {									\
-+    DItype __m0 = (m0), __m1 = (m1);					\
-+    __asm__ ("mulhd %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1));	\
-+    (pl) = __m0 * __m1;							\
-+  } while (0)
-+#define SMUL_TIME 14  /* ??? */
-+#define UDIV_TIME 120 /* ??? */
-+#endif /* 64-bit PowerPC.  */
-+
-+#if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("a %1,%5\n\tae %0,%3"					\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%0" ((USItype) (ah)),					\
-+	     "r" ((USItype) (bh)),					\
-+	     "%1" ((USItype) (al)),					\
-+	     "r" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("s %1,%5\n\tse %0,%3"					\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "0" ((USItype) (ah)),					\
-+	     "r" ((USItype) (bh)),					\
-+	     "1" ((USItype) (al)),					\
-+	     "r" ((USItype) (bl)))
-+#define umul_ppmm(ph, pl, m0, m1) \
-+  do {									\
-+    USItype __m0 = (m0), __m1 = (m1);					\
-+    __asm__ (								\
-+       "s	r2,r2\n"						\
-+"	mts	r10,%2\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	m	r2,%3\n"						\
-+"	cas	%0,r2,r0\n"						\
-+"	mfs	r10,%1"							\
-+	     : "=r" ((USItype) (ph)),					\
-+	       "=r" ((USItype) (pl))					\
-+	     : "%r" (__m0),						\
-+		"r" (__m1)						\
-+	     : "r2");							\
-+    (ph) += ((((SItype) __m0 >> 31) & __m1)				\
-+	     + (((SItype) __m1 >> 31) & __m0));				\
-+  } while (0)
-+#define UMUL_TIME 20
-+#define UDIV_TIME 200
-+#define count_leading_zeros(count, x) \
-+  do {									\
-+    if ((x) >= 0x10000)							\
-+      __asm__ ("clz	%0,%1"						\
-+	       : "=r" ((USItype) (count))				\
-+	       : "r" ((USItype) (x) >> 16));				\
-+    else								\
-+      {									\
-+	__asm__ ("clz	%0,%1"						\
-+		 : "=r" ((USItype) (count))				\
-+		 : "r" ((USItype) (x)));					\
-+	(count) += 16;							\
-+      }									\
-+  } while (0)
-+#endif
-+
-+#if defined(__sh__) && !__SHMEDIA__ && W_TYPE_SIZE == 32
-+#ifndef __sh1__
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ (								\
-+       "dmulu.l	%2,%3\n\tsts%M1	macl,%1\n\tsts%M0	mach,%0"	\
-+	   : "=r<" ((USItype)(w1)),					\
-+	     "=r<" ((USItype)(w0))					\
-+	   : "r" ((USItype)(u)),					\
-+	     "r" ((USItype)(v))						\
-+	   : "macl", "mach")
-+#define UMUL_TIME 5
-+#endif
-+
-+/* This is the same algorithm as __udiv_qrnnd_c.  */
-+#define UDIV_NEEDS_NORMALIZATION 1
-+
-+#define udiv_qrnnd(q, r, n1, n0, d) \
-+  do {									\
-+    extern UWtype __udiv_qrnnd_16 (UWtype, UWtype)			\
-+                        __attribute__ ((visibility ("hidden")));	\
-+    /* r0: rn r1: qn */ /* r0: n1 r4: n0 r5: d r6: d1 */ /* r2: __m */	\
-+    __asm__ (								\
-+	"mov%M4 %4,r5\n"						\
-+"	swap.w %3,r4\n"							\
-+"	swap.w r5,r6\n"							\
-+"	jsr @%5\n"							\
-+"	shll16 r6\n"							\
-+"	swap.w r4,r4\n"							\
-+"	jsr @%5\n"							\
-+"	swap.w r1,%0\n"							\
-+"	or r1,%0"							\
-+	: "=r" (q), "=&z" (r)						\
-+	: "1" (n1), "r" (n0), "rm" (d), "r" (&__udiv_qrnnd_16)		\
-+	: "r1", "r2", "r4", "r5", "r6", "pr");				\
-+  } while (0)
-+
-+#define UDIV_TIME 80
-+
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl)				\
-+  __asm__ ("clrt;subc %5,%1; subc %4,%0"				\
-+	   : "=r" (sh), "=r" (sl)					\
-+	   : "0" (ah), "1" (al), "r" (bh), "r" (bl))
-+
-+#endif /* __sh__ */
-+
-+#if defined (__SH5__) && __SHMEDIA__ && W_TYPE_SIZE == 32
-+#define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v)
-+#define count_leading_zeros(count, x) \
-+  do									\
-+    {									\
-+      UDItype x_ = (USItype)(x);					\
-+      SItype c_;							\
-+									\
-+      __asm__ ("nsb %1, %0" : "=r" (c_) : "r" (x_));			\
-+      (count) = c_ - 31;						\
-+    }									\
-+  while (0)
-+#define COUNT_LEADING_ZEROS_0 32
-+#endif
-+
-+#if defined (__sparc__) && !defined (__arch64__) && !defined (__sparcv9) \
-+    && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("addcc %r4,%5,%1\n\taddx %r2,%3,%0"				\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "%rJ" ((USItype) (ah)),					\
-+	     "rI" ((USItype) (bh)),					\
-+	     "%rJ" ((USItype) (al)),					\
-+	     "rI" ((USItype) (bl))					\
-+	   __CLOBBER_CC)
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("subcc %r4,%5,%1\n\tsubx %r2,%3,%0"				\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "rJ" ((USItype) (ah)),					\
-+	     "rI" ((USItype) (bh)),					\
-+	     "rJ" ((USItype) (al)),					\
-+	     "rI" ((USItype) (bl))					\
-+	   __CLOBBER_CC)
-+#if defined (__sparc_v8__)
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ ("umul %2,%3,%1;rd %%y,%0"					\
-+	   : "=r" ((USItype) (w1)),					\
-+	     "=r" ((USItype) (w0))					\
-+	   : "r" ((USItype) (u)),					\
-+	     "r" ((USItype) (v)))
-+#define udiv_qrnnd(__q, __r, __n1, __n0, __d) \
-+  __asm__ ("mov %2,%%y;nop;nop;nop;udiv %3,%4,%0;umul %0,%4,%1;sub %3,%1,%1"\
-+	   : "=&r" ((USItype) (__q)),					\
-+	     "=&r" ((USItype) (__r))					\
-+	   : "r" ((USItype) (__n1)),					\
-+	     "r" ((USItype) (__n0)),					\
-+	     "r" ((USItype) (__d)))
-+#else
-+#if defined (__sparclite__)
-+/* This has hardware multiply but not divide.  It also has two additional
-+   instructions scan (ffs from high bit) and divscc.  */
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ ("umul %2,%3,%1;rd %%y,%0"					\
-+	   : "=r" ((USItype) (w1)),					\
-+	     "=r" ((USItype) (w0))					\
-+	   : "r" ((USItype) (u)),					\
-+	     "r" ((USItype) (v)))
-+#define udiv_qrnnd(q, r, n1, n0, d) \
-+  __asm__ ("! Inlined udiv_qrnnd\n"					\
-+"	wr	%%g0,%2,%%y	! Not a delayed write for sparclite\n"	\
-+"	tst	%%g0\n"							\
-+"	divscc	%3,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%%g1\n"						\
-+"	divscc	%%g1,%4,%0\n"						\
-+"	rd	%%y,%1\n"						\
-+"	bl,a 1f\n"							\
-+"	add	%1,%4,%1\n"						\
-+"1:	! End of inline udiv_qrnnd"					\
-+	   : "=r" ((USItype) (q)),					\
-+	     "=r" ((USItype) (r))					\
-+	   : "r" ((USItype) (n1)),					\
-+	     "r" ((USItype) (n0)),					\
-+	     "rI" ((USItype) (d))					\
-+	   : "g1" __AND_CLOBBER_CC)
-+#define UDIV_TIME 37
-+#define count_leading_zeros(count, x) \
-+  do {                                                                  \
-+  __asm__ ("scan %1,1,%0"                                               \
-+           : "=r" ((USItype) (count))                                   \
-+           : "r" ((USItype) (x)));					\
-+  } while (0)
-+/* Early sparclites return 63 for an argument of 0, but they warn that future
-+   implementations might change this.  Therefore, leave COUNT_LEADING_ZEROS_0
-+   undefined.  */
-+#else
-+/* SPARC without integer multiplication and divide instructions.
-+   (i.e. at least Sun4/20,40,60,65,75,110,260,280,330,360,380,470,490) */
-+#define umul_ppmm(w1, w0, u, v) \
-+  __asm__ ("! Inlined umul_ppmm\n"					\
-+"	wr	%%g0,%2,%%y	! SPARC has 0-3 delay insn after a wr\n"\
-+"	sra	%3,31,%%o5	! Don't move this insn\n"		\
-+"	and	%2,%%o5,%%o5	! Don't move this insn\n"		\
-+"	andcc	%%g0,0,%%g1	! Don't move this insn\n"		\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,%3,%%g1\n"						\
-+"	mulscc	%%g1,0,%%g1\n"						\
-+"	add	%%g1,%%o5,%0\n"						\
-+"	rd	%%y,%1"							\
-+	   : "=r" ((USItype) (w1)),					\
-+	     "=r" ((USItype) (w0))					\
-+	   : "%rI" ((USItype) (u)),					\
-+	     "r" ((USItype) (v))						\
-+	   : "g1", "o5" __AND_CLOBBER_CC)
-+#define UMUL_TIME 39		/* 39 instructions */
-+/* It's quite necessary to add this much assembler for the sparc.
-+   The default udiv_qrnnd (in C) is more than 10 times slower!  */
-+#define udiv_qrnnd(__q, __r, __n1, __n0, __d) \
-+  __asm__ ("! Inlined udiv_qrnnd\n"					\
-+"	mov	32,%%g1\n"						\
-+"	subcc	%1,%2,%%g0\n"						\
-+"1:	bcs	5f\n"							\
-+"	 addxcc %0,%0,%0	! shift n1n0 and a q-bit in lsb\n"	\
-+"	sub	%1,%2,%1	! this kills msb of n\n"		\
-+"	addx	%1,%1,%1	! so this can't give carry\n"		\
-+"	subcc	%%g1,1,%%g1\n"						\
-+"2:	bne	1b\n"							\
-+"	 subcc	%1,%2,%%g0\n"						\
-+"	bcs	3f\n"							\
-+"	 addxcc %0,%0,%0	! shift n1n0 and a q-bit in lsb\n"	\
-+"	b	3f\n"							\
-+"	 sub	%1,%2,%1	! this kills msb of n\n"		\
-+"4:	sub	%1,%2,%1\n"						\
-+"5:	addxcc	%1,%1,%1\n"						\
-+"	bcc	2b\n"							\
-+"	 subcc	%%g1,1,%%g1\n"						\
-+"! Got carry from n.  Subtract next step to cancel this carry.\n"	\
-+"	bne	4b\n"							\
-+"	 addcc	%0,%0,%0	! shift n1n0 and a 0-bit in lsb\n"	\
-+"	sub	%1,%2,%1\n"						\
-+"3:	xnor	%0,0,%0\n"						\
-+"	! End of inline udiv_qrnnd"					\
-+	   : "=&r" ((USItype) (__q)),					\
-+	     "=&r" ((USItype) (__r))					\
-+	   : "r" ((USItype) (__d)),					\
-+	     "1" ((USItype) (__n1)),					\
-+	     "0" ((USItype) (__n0)) : "g1" __AND_CLOBBER_CC)
-+#define UDIV_TIME (3+7*32)	/* 7 instructions/iteration. 32 iterations.  */
-+#endif /* __sparclite__ */
-+#endif /* __sparc_v8__ */
-+#endif /* sparc32 */
-+
-+#if ((defined (__sparc__) && defined (__arch64__)) || defined (__sparcv9)) \
-+    && W_TYPE_SIZE == 64
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl)				\
-+  __asm__ ("addcc %r4,%5,%1\n\t"					\
-+   	   "add %r2,%3,%0\n\t"						\
-+   	   "bcs,a,pn %%xcc, 1f\n\t"					\
-+   	   "add %0, 1, %0\n"						\
-+	   "1:"								\
-+	   : "=r" ((UDItype)(sh)),				      	\
-+	     "=&r" ((UDItype)(sl))				      	\
-+	   : "%rJ" ((UDItype)(ah)),				     	\
-+	     "rI" ((UDItype)(bh)),				      	\
-+	     "%rJ" ((UDItype)(al)),				     	\
-+	     "rI" ((UDItype)(bl))				       	\
-+	   __CLOBBER_CC)
-+
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) 				\
-+  __asm__ ("subcc %r4,%5,%1\n\t"					\
-+   	   "sub %r2,%3,%0\n\t"						\
-+   	   "bcs,a,pn %%xcc, 1f\n\t"					\
-+   	   "sub %0, 1, %0\n\t"						\
-+	   "1:"								\
-+	   : "=r" ((UDItype)(sh)),				      	\
-+	     "=&r" ((UDItype)(sl))				      	\
-+	   : "rJ" ((UDItype)(ah)),				     	\
-+	     "rI" ((UDItype)(bh)),				      	\
-+	     "rJ" ((UDItype)(al)),				     	\
-+	     "rI" ((UDItype)(bl))				       	\
-+	   __CLOBBER_CC)
-+
-+#define umul_ppmm(wh, wl, u, v)						\
-+  do {									\
-+	  UDItype tmp1, tmp2, tmp3, tmp4;				\
-+	  __asm__ __volatile__ (					\
-+		   "srl %7,0,%3\n\t"					\
-+		   "mulx %3,%6,%1\n\t"					\
-+		   "srlx %6,32,%2\n\t"					\
-+		   "mulx %2,%3,%4\n\t"					\
-+		   "sllx %4,32,%5\n\t"					\
-+		   "srl %6,0,%3\n\t"					\
-+		   "sub %1,%5,%5\n\t"					\
-+		   "srlx %5,32,%5\n\t"					\
-+		   "addcc %4,%5,%4\n\t"					\
-+		   "srlx %7,32,%5\n\t"					\
-+		   "mulx %3,%5,%3\n\t"					\
-+		   "mulx %2,%5,%5\n\t"					\
-+		   "sethi %%hi(0x80000000),%2\n\t"			\
-+		   "addcc %4,%3,%4\n\t"					\
-+		   "srlx %4,32,%4\n\t"					\
-+		   "add %2,%2,%2\n\t"					\
-+		   "movcc %%xcc,%%g0,%2\n\t"				\
-+		   "addcc %5,%4,%5\n\t"					\
-+		   "sllx %3,32,%3\n\t"					\
-+		   "add %1,%3,%1\n\t"					\
-+		   "add %5,%2,%0"					\
-+	   : "=r" ((UDItype)(wh)),					\
-+	     "=&r" ((UDItype)(wl)),					\
-+	     "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4)	\
-+	   : "r" ((UDItype)(u)),					\
-+	     "r" ((UDItype)(v))						\
-+	   __CLOBBER_CC);						\
-+  } while (0)
-+#define UMUL_TIME 96
-+#define UDIV_TIME 230
-+#endif /* sparc64 */
-+
-+#if defined (__vax__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("addl2 %5,%1\n\tadwc %3,%0"					\
-+	   : "=g" ((USItype) (sh)),					\
-+	     "=&g" ((USItype) (sl))					\
-+	   : "%0" ((USItype) (ah)),					\
-+	     "g" ((USItype) (bh)),					\
-+	     "%1" ((USItype) (al)),					\
-+	     "g" ((USItype) (bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("subl2 %5,%1\n\tsbwc %3,%0"					\
-+	   : "=g" ((USItype) (sh)),					\
-+	     "=&g" ((USItype) (sl))					\
-+	   : "0" ((USItype) (ah)),					\
-+	     "g" ((USItype) (bh)),					\
-+	     "1" ((USItype) (al)),					\
-+	     "g" ((USItype) (bl)))
-+#define umul_ppmm(xh, xl, m0, m1) \
-+  do {									\
-+    union {								\
-+	UDItype __ll;							\
-+	struct {USItype __l, __h;} __i;					\
-+      } __xx;								\
-+    USItype __m0 = (m0), __m1 = (m1);					\
-+    __asm__ ("emul %1,%2,$0,%0"						\
-+	     : "=r" (__xx.__ll)						\
-+	     : "g" (__m0),						\
-+	       "g" (__m1));						\
-+    (xh) = __xx.__i.__h;						\
-+    (xl) = __xx.__i.__l;						\
-+    (xh) += ((((SItype) __m0 >> 31) & __m1)				\
-+	     + (((SItype) __m1 >> 31) & __m0));				\
-+  } while (0)
-+#define sdiv_qrnnd(q, r, n1, n0, d) \
-+  do {									\
-+    union {DItype __ll;							\
-+	   struct {SItype __l, __h;} __i;				\
-+	  } __xx;							\
-+    __xx.__i.__h = n1; __xx.__i.__l = n0;				\
-+    __asm__ ("ediv %3,%2,%0,%1"						\
-+	     : "=g" (q), "=g" (r)					\
-+	     : "g" (__xx.__ll), "g" (d));				\
-+  } while (0)
-+#endif /* __vax__ */
-+
-+#if defined (__xtensa__) && W_TYPE_SIZE == 32
-+/* This code is not Xtensa-configuration-specific, so rely on the compiler
-+   to expand builtin functions depending on what configuration features
-+   are available.  This avoids library calls when the operation can be
-+   performed in-line.  */
-+#define umul_ppmm(w1, w0, u, v)						\
-+  do {									\
-+    DWunion __w;							\
-+    __w.ll = __builtin_umulsidi3 (u, v);				\
-+    w1 = __w.s.high;							\
-+    w0 = __w.s.low;							\
-+  } while (0)
-+#define __umulsidi3(u, v)		__builtin_umulsidi3 (u, v)
-+#define count_leading_zeros(COUNT, X)	((COUNT) = __builtin_clz (X))
-+#define count_trailing_zeros(COUNT, X)	((COUNT) = __builtin_ctz (X))
-+#endif /* __xtensa__ */
-+
-+#if defined (__z8000__) && W_TYPE_SIZE == 16
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add	%H1,%H5\n\tadc	%H0,%H3"				\
-+	   : "=r" ((unsigned int)(sh)),					\
-+	     "=&r" ((unsigned int)(sl))					\
-+	   : "%0" ((unsigned int)(ah)),					\
-+	     "r" ((unsigned int)(bh)),					\
-+	     "%1" ((unsigned int)(al)),					\
-+	     "rQR" ((unsigned int)(bl)))
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub	%H1,%H5\n\tsbc	%H0,%H3"				\
-+	   : "=r" ((unsigned int)(sh)),					\
-+	     "=&r" ((unsigned int)(sl))					\
-+	   : "0" ((unsigned int)(ah)),					\
-+	     "r" ((unsigned int)(bh)),					\
-+	     "1" ((unsigned int)(al)),					\
-+	     "rQR" ((unsigned int)(bl)))
-+#define umul_ppmm(xh, xl, m0, m1) \
-+  do {									\
-+    union {long int __ll;						\
-+	   struct {unsigned int __h, __l;} __i;				\
-+	  } __xx;							\
-+    unsigned int __m0 = (m0), __m1 = (m1);				\
-+    __asm__ ("mult	%S0,%H3"					\
-+	     : "=r" (__xx.__i.__h),					\
-+	       "=r" (__xx.__i.__l)					\
-+	     : "%1" (__m0),						\
-+	       "rQR" (__m1));						\
-+    (xh) = __xx.__i.__h; (xl) = __xx.__i.__l;				\
-+    (xh) += ((((signed int) __m0 >> 15) & __m1)				\
-+	     + (((signed int) __m1 >> 15) & __m0));			\
-+  } while (0)
-+#endif /* __z8000__ */
-+
-+#endif /* __GNUC__ */
-+
-+/* If this machine has no inline assembler, use C macros.  */
-+
-+#if !defined (add_ssaaaa)
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  do {									\
-+    UWtype __x;								\
-+    __x = (al) + (bl);							\
-+    (sh) = (ah) + (bh) + (__x < (al));					\
-+    (sl) = __x;								\
-+  } while (0)
-+#endif
-+
-+#if !defined (sub_ddmmss)
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  do {									\
-+    UWtype __x;								\
-+    __x = (al) - (bl);							\
-+    (sh) = (ah) - (bh) - (__x > (al));					\
-+    (sl) = __x;								\
-+  } while (0)
-+#endif
-+
-+/* If we lack umul_ppmm but have smul_ppmm, define umul_ppmm in terms of
-+   smul_ppmm.  */
-+#if !defined (umul_ppmm) && defined (smul_ppmm)
-+#define umul_ppmm(w1, w0, u, v)						\
-+  do {									\
-+    UWtype __w1;							\
-+    UWtype __xm0 = (u), __xm1 = (v);					\
-+    smul_ppmm (__w1, w0, __xm0, __xm1);					\
-+    (w1) = __w1 + (-(__xm0 >> (W_TYPE_SIZE - 1)) & __xm1)		\
-+		+ (-(__xm1 >> (W_TYPE_SIZE - 1)) & __xm0);		\
-+  } while (0)
-+#endif
-+
-+/* If we still don't have umul_ppmm, define it using plain C.  */
-+#if !defined (umul_ppmm)
-+#define umul_ppmm(w1, w0, u, v)						\
-+  do {									\
-+    UWtype __x0, __x1, __x2, __x3;					\
-+    UHWtype __ul, __vl, __uh, __vh;					\
-+									\
-+    __ul = __ll_lowpart (u);						\
-+    __uh = __ll_highpart (u);						\
-+    __vl = __ll_lowpart (v);						\
-+    __vh = __ll_highpart (v);						\
-+									\
-+    __x0 = (UWtype) __ul * __vl;					\
-+    __x1 = (UWtype) __ul * __vh;					\
-+    __x2 = (UWtype) __uh * __vl;					\
-+    __x3 = (UWtype) __uh * __vh;					\
-+									\
-+    __x1 += __ll_highpart (__x0);/* this can't give carry */		\
-+    __x1 += __x2;		/* but this indeed can */		\
-+    if (__x1 < __x2)		/* did we get it? */			\
-+      __x3 += __ll_B;		/* yes, add it in the proper pos.  */	\
-+									\
-+    (w1) = __x3 + __ll_highpart (__x1);					\
-+    (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);		\
-+  } while (0)
-+#endif
-+
-+#if !defined (__umulsidi3)
-+#define __umulsidi3(u, v) \
-+  ({DWunion __w;							\
-+    umul_ppmm (__w.s.high, __w.s.low, u, v);				\
-+    __w.ll; })
-+#endif
-+
-+/* Define this unconditionally, so it can be used for debugging.  */
-+#define __udiv_qrnnd_c(q, r, n1, n0, d) \
-+  do {									\
-+    UWtype __d1, __d0, __q1, __q0;					\
-+    UWtype __r1, __r0, __m;						\
-+    __d1 = __ll_highpart (d);						\
-+    __d0 = __ll_lowpart (d);						\
-+									\
-+    __r1 = (n1) % __d1;							\
-+    __q1 = (n1) / __d1;							\
-+    __m = (UWtype) __q1 * __d0;						\
-+    __r1 = __r1 * __ll_B | __ll_highpart (n0);				\
-+    if (__r1 < __m)							\
-+      {									\
-+	__q1--, __r1 += (d);						\
-+	if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
-+	  if (__r1 < __m)						\
-+	    __q1--, __r1 += (d);					\
-+      }									\
-+    __r1 -= __m;							\
-+									\
-+    __r0 = __r1 % __d1;							\
-+    __q0 = __r1 / __d1;							\
-+    __m = (UWtype) __q0 * __d0;						\
-+    __r0 = __r0 * __ll_B | __ll_lowpart (n0);				\
-+    if (__r0 < __m)							\
-+      {									\
-+	__q0--, __r0 += (d);						\
-+	if (__r0 >= (d))						\
-+	  if (__r0 < __m)						\
-+	    __q0--, __r0 += (d);					\
-+      }									\
-+    __r0 -= __m;							\
-+									\
-+    (q) = (UWtype) __q1 * __ll_B | __q0;				\
-+    (r) = __r0;								\
-+  } while (0)
-+
-+/* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through
-+   __udiv_w_sdiv (defined in libgcc or elsewhere).  */
-+#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd)
-+#define udiv_qrnnd(q, r, nh, nl, d) \
-+  do {									\
-+    USItype __r;							\
-+    (q) = __udiv_w_sdiv (&__r, nh, nl, d);				\
-+    (r) = __r;								\
-+  } while (0)
-+#endif
-+
-+/* If udiv_qrnnd was not defined for this processor, use __udiv_qrnnd_c.  */
-+#if !defined (udiv_qrnnd)
-+#define UDIV_NEEDS_NORMALIZATION 1
-+#define udiv_qrnnd __udiv_qrnnd_c
-+#endif
-+
-+#if !defined (count_leading_zeros)
-+#define count_leading_zeros(count, x) \
-+  do {									\
-+    UWtype __xr = (x);							\
-+    UWtype __a;								\
-+									\
-+    if (W_TYPE_SIZE <= 32)						\
-+      {									\
-+	__a = __xr < ((UWtype)1<<2*__BITS4)				\
-+	  ? (__xr < ((UWtype)1<<__BITS4) ? 0 : __BITS4)			\
-+	  : (__xr < ((UWtype)1<<3*__BITS4) ?  2*__BITS4 : 3*__BITS4);	\
-+      }									\
-+    else								\
-+      {									\
-+	for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8)			\
-+	  if (((__xr >> __a) & 0xff) != 0)				\
-+	    break;							\
-+      }									\
-+									\
-+    (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a);		\
-+  } while (0)
-+#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE
-+#endif
-+
-+#if !defined (count_trailing_zeros)
-+/* Define count_trailing_zeros using count_leading_zeros.  The latter might be
-+   defined in asm, but if it is not, the C version above is good enough.  */
-+#define count_trailing_zeros(count, x) \
-+  do {									\
-+    UWtype __ctz_x = (x);						\
-+    UWtype __ctz_c;							\
-+    count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x);			\
-+    (count) = W_TYPE_SIZE - 1 - __ctz_c;				\
-+  } while (0)
-+#endif
-+
-+#ifndef UDIV_NEEDS_NORMALIZATION
-+#define UDIV_NEEDS_NORMALIZATION 0
-+#endif
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/mp_clz_tab.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/mp_clz_tab.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/mp_clz_tab.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/mp_clz_tab.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,37 @@
-+/* __clz_tab -- support for longlong.h
-+   Copyright (C) 1991, 1993, 1994, 1997 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.  Its master source is NOT part of
-+   the C library, however.  The master source lives in the GNU MP Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#if 0
-+#include <gmp.h>
-+#include "gmp-impl.h"
-+#endif
-+
-+const
-+unsigned char __clz_tab[] =
-+{
-+  0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-+  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+};
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-1.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-1.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-1.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-1.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,302 @@
-+/* Software floating-point emulation.
-+   Basic one-word fraction declaration and manipulation.
-+   Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#define _FP_FRAC_DECL_1(X)	_FP_W_TYPE X##_f
-+#define _FP_FRAC_COPY_1(D,S)	(D##_f = S##_f)
-+#define _FP_FRAC_SET_1(X,I)	(X##_f = I)
-+#define _FP_FRAC_HIGH_1(X)	(X##_f)
-+#define _FP_FRAC_LOW_1(X)	(X##_f)
-+#define _FP_FRAC_WORD_1(X,w)	(X##_f)
-+
-+#define _FP_FRAC_ADDI_1(X,I)	(X##_f += I)
-+#define _FP_FRAC_SLL_1(X,N)			\
-+  do {						\
-+    if (__builtin_constant_p(N) && (N) == 1)	\
-+      X##_f += X##_f;				\
-+    else					\
-+      X##_f <<= (N);				\
-+  } while (0)
-+#define _FP_FRAC_SRL_1(X,N)	(X##_f >>= N)
-+
-+/* Right shift with sticky-lsb.  */
-+#define _FP_FRAC_SRST_1(X,S,N,sz)	__FP_FRAC_SRST_1(X##_f, S, N, sz)
-+#define _FP_FRAC_SRS_1(X,N,sz)	__FP_FRAC_SRS_1(X##_f, N, sz)
-+
-+#define __FP_FRAC_SRST_1(X,S,N,sz)			\
-+do {							\
-+  S = (__builtin_constant_p(N) && (N) == 1		\
-+       ? X & 1 : (X << (_FP_W_TYPE_SIZE - (N))) != 0);	\
-+  X = X >> (N);						\
-+} while (0)
-+
-+#define __FP_FRAC_SRS_1(X,N,sz)						\
-+   (X = (X >> (N) | (__builtin_constant_p(N) && (N) == 1		\
-+		     ? X & 1 : (X << (_FP_W_TYPE_SIZE - (N))) != 0)))
-+
-+#define _FP_FRAC_ADD_1(R,X,Y)	(R##_f = X##_f + Y##_f)
-+#define _FP_FRAC_SUB_1(R,X,Y)	(R##_f = X##_f - Y##_f)
-+#define _FP_FRAC_DEC_1(X,Y)	(X##_f -= Y##_f)
-+#define _FP_FRAC_CLZ_1(z, X)	__FP_CLZ(z, X##_f)
-+
-+/* Predicates */
-+#define _FP_FRAC_NEGP_1(X)	((_FP_WS_TYPE)X##_f < 0)
-+#define _FP_FRAC_ZEROP_1(X)	(X##_f == 0)
-+#define _FP_FRAC_OVERP_1(fs,X)	(X##_f & _FP_OVERFLOW_##fs)
-+#define _FP_FRAC_CLEAR_OVERP_1(fs,X)	(X##_f &= ~_FP_OVERFLOW_##fs)
-+#define _FP_FRAC_EQ_1(X, Y)	(X##_f == Y##_f)
-+#define _FP_FRAC_GE_1(X, Y)	(X##_f >= Y##_f)
-+#define _FP_FRAC_GT_1(X, Y)	(X##_f > Y##_f)
-+
-+#define _FP_ZEROFRAC_1		0
-+#define _FP_MINFRAC_1		1
-+#define _FP_MAXFRAC_1		(~(_FP_WS_TYPE)0)
-+
-+/*
-+ * Unpack the raw bits of a native fp value.  Do not classify or
-+ * normalize the data.
-+ */
-+
-+#define _FP_UNPACK_RAW_1(fs, X, val)				\
-+  do {								\
-+    union _FP_UNION_##fs _flo; _flo.flt = (val);		\
-+								\
-+    X##_f = _flo.bits.frac;					\
-+    X##_e = _flo.bits.exp;					\
-+    X##_s = _flo.bits.sign;					\
-+  } while (0)
-+
-+#define _FP_UNPACK_RAW_1_P(fs, X, val)				\
-+  do {								\
-+    union _FP_UNION_##fs *_flo =				\
-+      (union _FP_UNION_##fs *)(val);				\
-+								\
-+    X##_f = _flo->bits.frac;					\
-+    X##_e = _flo->bits.exp;					\
-+    X##_s = _flo->bits.sign;					\
-+  } while (0)
-+
-+/*
-+ * Repack the raw bits of a native fp value.
-+ */
-+
-+#define _FP_PACK_RAW_1(fs, val, X)				\
-+  do {								\
-+    union _FP_UNION_##fs _flo;					\
-+								\
-+    _flo.bits.frac = X##_f;					\
-+    _flo.bits.exp  = X##_e;					\
-+    _flo.bits.sign = X##_s;					\
-+								\
-+    (val) = _flo.flt;						\
-+  } while (0)
-+
-+#define _FP_PACK_RAW_1_P(fs, val, X)				\
-+  do {								\
-+    union _FP_UNION_##fs *_flo =				\
-+      (union _FP_UNION_##fs *)(val);				\
-+								\
-+    _flo->bits.frac = X##_f;					\
-+    _flo->bits.exp  = X##_e;					\
-+    _flo->bits.sign = X##_s;					\
-+  } while (0)
-+
-+
-+/*
-+ * Multiplication algorithms:
-+ */
-+
-+/* Basic.  Assuming the host word size is >= 2*FRACBITS, we can do the
-+   multiplication immediately.  */
-+
-+#define _FP_MUL_MEAT_1_imm(wfracbits, R, X, Y)				\
-+  do {									\
-+    R##_f = X##_f * Y##_f;						\
-+    /* Normalize since we know where the msb of the multiplicands	\
-+       were (bit B), we know that the msb of the of the product is	\
-+       at either 2B or 2B-1.  */					\
-+    _FP_FRAC_SRS_1(R, wfracbits-1, 2*wfracbits);			\
-+  } while (0)
-+
-+/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-+
-+#define _FP_MUL_MEAT_1_wide(wfracbits, R, X, Y, doit)			\
-+  do {									\
-+    _FP_W_TYPE _Z_f0, _Z_f1;						\
-+    doit(_Z_f1, _Z_f0, X##_f, Y##_f);					\
-+    /* Normalize since we know where the msb of the multiplicands	\
-+       were (bit B), we know that the msb of the of the product is	\
-+       at either 2B or 2B-1.  */					\
-+    _FP_FRAC_SRS_2(_Z, wfracbits-1, 2*wfracbits);			\
-+    R##_f = _Z_f0;							\
-+  } while (0)
-+
-+/* Finally, a simple widening multiply algorithm.  What fun!  */
-+
-+#define _FP_MUL_MEAT_1_hard(wfracbits, R, X, Y)				\
-+  do {									\
-+    _FP_W_TYPE _xh, _xl, _yh, _yl, _z_f0, _z_f1, _a_f0, _a_f1;		\
-+									\
-+    /* split the words in half */					\
-+    _xh = X##_f >> (_FP_W_TYPE_SIZE/2);					\
-+    _xl = X##_f & (((_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2)) - 1);		\
-+    _yh = Y##_f >> (_FP_W_TYPE_SIZE/2);					\
-+    _yl = Y##_f & (((_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2)) - 1);		\
-+									\
-+    /* multiply the pieces */						\
-+    _z_f0 = _xl * _yl;							\
-+    _a_f0 = _xh * _yl;							\
-+    _a_f1 = _xl * _yh;							\
-+    _z_f1 = _xh * _yh;							\
-+									\
-+    /* reassemble into two full words */				\
-+    if ((_a_f0 += _a_f1) < _a_f1)					\
-+      _z_f1 += (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2);			\
-+    _a_f1 = _a_f0 >> (_FP_W_TYPE_SIZE/2);				\
-+    _a_f0 = _a_f0 << (_FP_W_TYPE_SIZE/2);				\
-+    _FP_FRAC_ADD_2(_z, _z, _a);						\
-+									\
-+    /* normalize */							\
-+    _FP_FRAC_SRS_2(_z, wfracbits - 1, 2*wfracbits);			\
-+    R##_f = _z_f0;							\
-+  } while (0)
-+
-+
-+/*
-+ * Division algorithms:
-+ */
-+
-+/* Basic.  Assuming the host word size is >= 2*FRACBITS, we can do the
-+   division immediately.  Give this macro either _FP_DIV_HELP_imm for
-+   C primitives or _FP_DIV_HELP_ldiv for the ISO function.  Which you
-+   choose will depend on what the compiler does with divrem4.  */
-+
-+#define _FP_DIV_MEAT_1_imm(fs, R, X, Y, doit)		\
-+  do {							\
-+    _FP_W_TYPE _q, _r;					\
-+    X##_f <<= (X##_f < Y##_f				\
-+	       ? R##_e--, _FP_WFRACBITS_##fs		\
-+	       : _FP_WFRACBITS_##fs - 1);		\
-+    doit(_q, _r, X##_f, Y##_f);				\
-+    R##_f = _q | (_r != 0);				\
-+  } while (0)
-+
-+/* GCC's longlong.h defines a 2W / 1W => (1W,1W) primitive udiv_qrnnd
-+   that may be useful in this situation.  This first is for a primitive
-+   that requires normalization, the second for one that does not.  Look
-+   for UDIV_NEEDS_NORMALIZATION to tell which your machine needs.  */
-+
-+#define _FP_DIV_MEAT_1_udiv_norm(fs, R, X, Y)				\
-+  do {									\
-+    _FP_W_TYPE _nh, _nl, _q, _r, _y;					\
-+									\
-+    /* Normalize Y -- i.e. make the most significant bit set.  */	\
-+    _y = Y##_f << _FP_WFRACXBITS_##fs;					\
-+									\
-+    /* Shift X op correspondingly high, that is, up one full word.  */	\
-+    if (X##_f < Y##_f)							\
-+      {									\
-+	R##_e--;							\
-+	_nl = 0;							\
-+	_nh = X##_f;							\
-+      }									\
-+    else								\
-+      {									\
-+	_nl = X##_f << (_FP_W_TYPE_SIZE - 1);				\
-+	_nh = X##_f >> 1;						\
-+      }									\
-+    									\
-+    udiv_qrnnd(_q, _r, _nh, _nl, _y);					\
-+    R##_f = _q | (_r != 0);						\
-+  } while (0)
-+
-+#define _FP_DIV_MEAT_1_udiv(fs, R, X, Y)		\
-+  do {							\
-+    _FP_W_TYPE _nh, _nl, _q, _r;			\
-+    if (X##_f < Y##_f)					\
-+      {							\
-+	R##_e--;					\
-+	_nl = X##_f << _FP_WFRACBITS_##fs;		\
-+	_nh = X##_f >> _FP_WFRACXBITS_##fs;		\
-+      }							\
-+    else						\
-+      {							\
-+	_nl = X##_f << (_FP_WFRACBITS_##fs - 1);	\
-+	_nh = X##_f >> (_FP_WFRACXBITS_##fs + 1);	\
-+      }							\
-+    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);		\
-+    R##_f = _q | (_r != 0);				\
-+  } while (0)
-+  
-+  
-+/*
-+ * Square root algorithms:
-+ * We have just one right now, maybe Newton approximation
-+ * should be added for those machines where division is fast.
-+ */
-+ 
-+#define _FP_SQRT_MEAT_1(R, S, T, X, q)			\
-+  do {							\
-+    while (q != _FP_WORK_ROUND)				\
-+      {							\
-+        T##_f = S##_f + q;				\
-+        if (T##_f <= X##_f)				\
-+          {						\
-+            S##_f = T##_f + q;				\
-+            X##_f -= T##_f;				\
-+            R##_f += q;					\
-+          }						\
-+        _FP_FRAC_SLL_1(X, 1);				\
-+        q >>= 1;					\
-+      }							\
-+    if (X##_f)						\
-+      {							\
-+	if (S##_f < X##_f)				\
-+	  R##_f |= _FP_WORK_ROUND;			\
-+	R##_f |= _FP_WORK_STICKY;			\
-+      }							\
-+  } while (0)
-+
-+/*
-+ * Assembly/disassembly for converting to/from integral types.  
-+ * No shifting or overflow handled here.
-+ */
-+
-+#define _FP_FRAC_ASSEMBLE_1(r, X, rsize)	(r = X##_f)
-+#define _FP_FRAC_DISASSEMBLE_1(X, r, rsize)	(X##_f = r)
-+
-+
-+/*
-+ * Convert FP values between word sizes
-+ */
-+
-+#define _FP_FRAC_COPY_1_1(D, S)		(D##_f = S##_f)
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-2.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-2.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-2.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-2.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,617 @@
-+/* Software floating-point emulation.
-+   Basic two-word fraction declaration and manipulation.
-+   Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#define _FP_FRAC_DECL_2(X)	_FP_W_TYPE X##_f0, X##_f1
-+#define _FP_FRAC_COPY_2(D,S)	(D##_f0 = S##_f0, D##_f1 = S##_f1)
-+#define _FP_FRAC_SET_2(X,I)	__FP_FRAC_SET_2(X, I)
-+#define _FP_FRAC_HIGH_2(X)	(X##_f1)
-+#define _FP_FRAC_LOW_2(X)	(X##_f0)
-+#define _FP_FRAC_WORD_2(X,w)	(X##_f##w)
-+
-+#define _FP_FRAC_SLL_2(X,N)						    \
-+(void)(((N) < _FP_W_TYPE_SIZE)						    \
-+       ? ({								    \
-+	    if (__builtin_constant_p(N) && (N) == 1)			    \
-+	      {								    \
-+		X##_f1 = X##_f1 + X##_f1 + (((_FP_WS_TYPE)(X##_f0)) < 0);   \
-+		X##_f0 += X##_f0;					    \
-+	      }								    \
-+	    else							    \
-+	      {								    \
-+		X##_f1 = X##_f1 << (N) | X##_f0 >> (_FP_W_TYPE_SIZE - (N)); \
-+		X##_f0 <<= (N);						    \
-+	      }								    \
-+	    0;								    \
-+	  })								    \
-+       : ({								    \
-+	    X##_f1 = X##_f0 << ((N) - _FP_W_TYPE_SIZE);			    \
-+	    X##_f0 = 0;							    \
-+	  }))
-+
-+
-+#define _FP_FRAC_SRL_2(X,N)						\
-+(void)(((N) < _FP_W_TYPE_SIZE)						\
-+       ? ({								\
-+	    X##_f0 = X##_f0 >> (N) | X##_f1 << (_FP_W_TYPE_SIZE - (N));	\
-+	    X##_f1 >>= (N);						\
-+	  })								\
-+       : ({								\
-+	    X##_f0 = X##_f1 >> ((N) - _FP_W_TYPE_SIZE);			\
-+	    X##_f1 = 0;							\
-+	  }))
-+
-+/* Right shift with sticky-lsb.  */
-+#define _FP_FRAC_SRST_2(X,S, N,sz)					  \
-+(void)(((N) < _FP_W_TYPE_SIZE)						  \
-+       ? ({								  \
-+	    S = (__builtin_constant_p(N) && (N) == 1			  \
-+		 ? X##_f0 & 1						  \
-+		 : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0);		  \
-+	    X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N)); \
-+	    X##_f1 >>= (N);						  \
-+	  })								  \
-+       : ({								  \
-+	    S = ((((N) == _FP_W_TYPE_SIZE				  \
-+		   ? 0							  \
-+		   : (X##_f1 << (2*_FP_W_TYPE_SIZE - (N))))		  \
-+		  | X##_f0) != 0);					  \
-+	    X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE));		  \
-+	    X##_f1 = 0;							  \
-+	  }))
-+
-+#define _FP_FRAC_SRS_2(X,N,sz)						  \
-+(void)(((N) < _FP_W_TYPE_SIZE)						  \
-+       ? ({								  \
-+	    X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N) | \
-+		      (__builtin_constant_p(N) && (N) == 1		  \
-+		       ? X##_f0 & 1					  \
-+		       : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0));	  \
-+	    X##_f1 >>= (N);						  \
-+	  })								  \
-+       : ({								  \
-+	    X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) |		  \
-+		      ((((N) == _FP_W_TYPE_SIZE				  \
-+			 ? 0						  \
-+			 : (X##_f1 << (2*_FP_W_TYPE_SIZE - (N))))	  \
-+			| X##_f0) != 0));				  \
-+	    X##_f1 = 0;							  \
-+	  }))
-+
-+#define _FP_FRAC_ADDI_2(X,I)	\
-+  __FP_FRAC_ADDI_2(X##_f1, X##_f0, I)
-+
-+#define _FP_FRAC_ADD_2(R,X,Y)	\
-+  __FP_FRAC_ADD_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)
-+
-+#define _FP_FRAC_SUB_2(R,X,Y)	\
-+  __FP_FRAC_SUB_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)
-+
-+#define _FP_FRAC_DEC_2(X,Y)	\
-+  __FP_FRAC_DEC_2(X##_f1, X##_f0, Y##_f1, Y##_f0)
-+
-+#define _FP_FRAC_CLZ_2(R,X)	\
-+  do {				\
-+    if (X##_f1)			\
-+      __FP_CLZ(R,X##_f1);	\
-+    else 			\
-+    {				\
-+      __FP_CLZ(R,X##_f0);	\
-+      R += _FP_W_TYPE_SIZE;	\
-+    }				\
-+  } while(0)
-+
-+/* Predicates */
-+#define _FP_FRAC_NEGP_2(X)	((_FP_WS_TYPE)X##_f1 < 0)
-+#define _FP_FRAC_ZEROP_2(X)	((X##_f1 | X##_f0) == 0)
-+#define _FP_FRAC_OVERP_2(fs,X)	(_FP_FRAC_HIGH_##fs(X) & _FP_OVERFLOW_##fs)
-+#define _FP_FRAC_CLEAR_OVERP_2(fs,X)	(_FP_FRAC_HIGH_##fs(X) &= ~_FP_OVERFLOW_##fs)
-+#define _FP_FRAC_EQ_2(X, Y)	(X##_f1 == Y##_f1 && X##_f0 == Y##_f0)
-+#define _FP_FRAC_GT_2(X, Y)	\
-+  (X##_f1 > Y##_f1 || (X##_f1 == Y##_f1 && X##_f0 > Y##_f0))
-+#define _FP_FRAC_GE_2(X, Y)	\
-+  (X##_f1 > Y##_f1 || (X##_f1 == Y##_f1 && X##_f0 >= Y##_f0))
-+
-+#define _FP_ZEROFRAC_2		0, 0
-+#define _FP_MINFRAC_2		0, 1
-+#define _FP_MAXFRAC_2		(~(_FP_WS_TYPE)0), (~(_FP_WS_TYPE)0)
-+
-+/*
-+ * Internals 
-+ */
-+
-+#define __FP_FRAC_SET_2(X,I1,I0)	(X##_f0 = I0, X##_f1 = I1)
-+
-+#define __FP_CLZ_2(R, xh, xl)	\
-+  do {				\
-+    if (xh)			\
-+      __FP_CLZ(R,xh);		\
-+    else 			\
-+    {				\
-+      __FP_CLZ(R,xl);		\
-+      R += _FP_W_TYPE_SIZE;	\
-+    }				\
-+  } while(0)
-+
-+#if 0
-+
-+#ifndef __FP_FRAC_ADDI_2
-+#define __FP_FRAC_ADDI_2(xh, xl, i)	\
-+  (xh += ((xl += i) < i))
-+#endif
-+#ifndef __FP_FRAC_ADD_2
-+#define __FP_FRAC_ADD_2(rh, rl, xh, xl, yh, yl)	\
-+  (rh = xh + yh + ((rl = xl + yl) < xl))
-+#endif
-+#ifndef __FP_FRAC_SUB_2
-+#define __FP_FRAC_SUB_2(rh, rl, xh, xl, yh, yl)	\
-+  (rh = xh - yh - ((rl = xl - yl) > xl))
-+#endif
-+#ifndef __FP_FRAC_DEC_2
-+#define __FP_FRAC_DEC_2(xh, xl, yh, yl)	\
-+  do {					\
-+    UWtype _t = xl;			\
-+    xh -= yh + ((xl -= yl) > _t);	\
-+  } while (0)
-+#endif
-+
-+#else
-+
-+#undef __FP_FRAC_ADDI_2
-+#define __FP_FRAC_ADDI_2(xh, xl, i)	add_ssaaaa(xh, xl, xh, xl, 0, i)
-+#undef __FP_FRAC_ADD_2
-+#define __FP_FRAC_ADD_2			add_ssaaaa
-+#undef __FP_FRAC_SUB_2
-+#define __FP_FRAC_SUB_2			sub_ddmmss
-+#undef __FP_FRAC_DEC_2
-+#define __FP_FRAC_DEC_2(xh, xl, yh, yl)	sub_ddmmss(xh, xl, xh, xl, yh, yl)
-+
-+#endif
-+
-+/*
-+ * Unpack the raw bits of a native fp value.  Do not classify or
-+ * normalize the data.
-+ */
-+
-+#define _FP_UNPACK_RAW_2(fs, X, val)			\
-+  do {							\
-+    union _FP_UNION_##fs _flo; _flo.flt = (val);	\
-+							\
-+    X##_f0 = _flo.bits.frac0;				\
-+    X##_f1 = _flo.bits.frac1;				\
-+    X##_e  = _flo.bits.exp;				\
-+    X##_s  = _flo.bits.sign;				\
-+  } while (0)
-+
-+#define _FP_UNPACK_RAW_2_P(fs, X, val)			\
-+  do {							\
-+    union _FP_UNION_##fs *_flo =			\
-+      (union _FP_UNION_##fs *)(val);			\
-+							\
-+    X##_f0 = _flo->bits.frac0;				\
-+    X##_f1 = _flo->bits.frac1;				\
-+    X##_e  = _flo->bits.exp;				\
-+    X##_s  = _flo->bits.sign;				\
-+  } while (0)
-+
-+
-+/*
-+ * Repack the raw bits of a native fp value.
-+ */
-+
-+#define _FP_PACK_RAW_2(fs, val, X)			\
-+  do {							\
-+    union _FP_UNION_##fs _flo;				\
-+							\
-+    _flo.bits.frac0 = X##_f0;				\
-+    _flo.bits.frac1 = X##_f1;				\
-+    _flo.bits.exp   = X##_e;				\
-+    _flo.bits.sign  = X##_s;				\
-+							\
-+    (val) = _flo.flt;					\
-+  } while (0)
-+
-+#define _FP_PACK_RAW_2_P(fs, val, X)			\
-+  do {							\
-+    union _FP_UNION_##fs *_flo =			\
-+      (union _FP_UNION_##fs *)(val);			\
-+							\
-+    _flo->bits.frac0 = X##_f0;				\
-+    _flo->bits.frac1 = X##_f1;				\
-+    _flo->bits.exp   = X##_e;				\
-+    _flo->bits.sign  = X##_s;				\
-+  } while (0)
-+
-+
-+/*
-+ * Multiplication algorithms:
-+ */
-+
-+/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-+
-+#define _FP_MUL_MEAT_2_wide(wfracbits, R, X, Y, doit)			\
-+  do {									\
-+    _FP_FRAC_DECL_4(_z); _FP_FRAC_DECL_2(_b); _FP_FRAC_DECL_2(_c);	\
-+									\
-+    doit(_FP_FRAC_WORD_4(_z,1), _FP_FRAC_WORD_4(_z,0), X##_f0, Y##_f0);	\
-+    doit(_b_f1, _b_f0, X##_f0, Y##_f1);					\
-+    doit(_c_f1, _c_f0, X##_f1, Y##_f0);					\
-+    doit(_FP_FRAC_WORD_4(_z,3), _FP_FRAC_WORD_4(_z,2), X##_f1, Y##_f1);	\
-+									\
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1), 0, _b_f1, _b_f0,		\
-+		    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1));				\
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1), 0, _c_f1, _c_f0,		\
-+		    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1));				\
-+									\
-+    /* Normalize since we know where the msb of the multiplicands	\
-+       were (bit B), we know that the msb of the of the product is	\
-+       at either 2B or 2B-1.  */					\
-+    _FP_FRAC_SRS_4(_z, wfracbits-1, 2*wfracbits);			\
-+    R##_f0 = _FP_FRAC_WORD_4(_z,0);					\
-+    R##_f1 = _FP_FRAC_WORD_4(_z,1);					\
-+  } while (0)
-+
-+/* Given a 1W * 1W => 2W primitive, do the extended multiplication.
-+   Do only 3 multiplications instead of four. This one is for machines
-+   where multiplication is much more expensive than subtraction.  */
-+
-+#define _FP_MUL_MEAT_2_wide_3mul(wfracbits, R, X, Y, doit)		\
-+  do {									\
-+    _FP_FRAC_DECL_4(_z); _FP_FRAC_DECL_2(_b); _FP_FRAC_DECL_2(_c);	\
-+    _FP_W_TYPE _d;							\
-+    int _c1, _c2;							\
-+									\
-+    _b_f0 = X##_f0 + X##_f1;						\
-+    _c1 = _b_f0 < X##_f0;						\
-+    _b_f1 = Y##_f0 + Y##_f1;						\
-+    _c2 = _b_f1 < Y##_f0;						\
-+    doit(_d, _FP_FRAC_WORD_4(_z,0), X##_f0, Y##_f0);			\
-+    doit(_FP_FRAC_WORD_4(_z,2), _FP_FRAC_WORD_4(_z,1), _b_f0, _b_f1);	\
-+    doit(_c_f1, _c_f0, X##_f1, Y##_f1);					\
-+									\
-+    _b_f0 &= -_c2;							\
-+    _b_f1 &= -_c1;							\
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1), (_c1 & _c2), 0, _d,		\
-+		    0, _FP_FRAC_WORD_4(_z,2), _FP_FRAC_WORD_4(_z,1));	\
-+    __FP_FRAC_ADDI_2(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		     _b_f0);						\
-+    __FP_FRAC_ADDI_2(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		     _b_f1);						\
-+    __FP_FRAC_DEC_3(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1),				\
-+		    0, _d, _FP_FRAC_WORD_4(_z,0));			\
-+    __FP_FRAC_DEC_3(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),	\
-+		    _FP_FRAC_WORD_4(_z,1), 0, _c_f1, _c_f0);		\
-+    __FP_FRAC_ADD_2(_FP_FRAC_WORD_4(_z,3), _FP_FRAC_WORD_4(_z,2),	\
-+		    _c_f1, _c_f0,					\
-+		    _FP_FRAC_WORD_4(_z,3), _FP_FRAC_WORD_4(_z,2));	\
-+									\
-+    /* Normalize since we know where the msb of the multiplicands	\
-+       were (bit B), we know that the msb of the of the product is	\
-+       at either 2B or 2B-1.  */					\
-+    _FP_FRAC_SRS_4(_z, wfracbits-1, 2*wfracbits);			\
-+    R##_f0 = _FP_FRAC_WORD_4(_z,0);					\
-+    R##_f1 = _FP_FRAC_WORD_4(_z,1);					\
-+  } while (0)
-+
-+#define _FP_MUL_MEAT_2_gmp(wfracbits, R, X, Y)				\
-+  do {									\
-+    _FP_FRAC_DECL_4(_z);						\
-+    _FP_W_TYPE _x[2], _y[2];						\
-+    _x[0] = X##_f0; _x[1] = X##_f1;					\
-+    _y[0] = Y##_f0; _y[1] = Y##_f1;					\
-+									\
-+    mpn_mul_n(_z_f, _x, _y, 2);						\
-+									\
-+    /* Normalize since we know where the msb of the multiplicands	\
-+       were (bit B), we know that the msb of the of the product is	\
-+       at either 2B or 2B-1.  */					\
-+    _FP_FRAC_SRS_4(_z, wfracbits-1, 2*wfracbits);			\
-+    R##_f0 = _z_f[0];							\
-+    R##_f1 = _z_f[1];							\
-+  } while (0)
-+
-+/* Do at most 120x120=240 bits multiplication using double floating
-+   point multiplication.  This is useful if floating point
-+   multiplication has much bigger throughput than integer multiply.
-+   It is supposed to work for _FP_W_TYPE_SIZE 64 and wfracbits
-+   between 106 and 120 only.  
-+   Caller guarantees that X and Y has (1LLL << (wfracbits - 1)) set.
-+   SETFETZ is a macro which will disable all FPU exceptions and set rounding
-+   towards zero,  RESETFE should optionally reset it back.  */
-+
-+#define _FP_MUL_MEAT_2_120_240_double(wfracbits, R, X, Y, setfetz, resetfe)	\
-+  do {										\
-+    static const double _const[] = {						\
-+      /* 2^-24 */ 5.9604644775390625e-08,					\
-+      /* 2^-48 */ 3.5527136788005009e-15,					\
-+      /* 2^-72 */ 2.1175823681357508e-22,					\
-+      /* 2^-96 */ 1.2621774483536189e-29,					\
-+      /* 2^28 */ 2.68435456e+08,						\
-+      /* 2^4 */ 1.600000e+01,							\
-+      /* 2^-20 */ 9.5367431640625e-07,						\
-+      /* 2^-44 */ 5.6843418860808015e-14,					\
-+      /* 2^-68 */ 3.3881317890172014e-21,					\
-+      /* 2^-92 */ 2.0194839173657902e-28,					\
-+      /* 2^-116 */ 1.2037062152420224e-35};					\
-+    double _a240, _b240, _c240, _d240, _e240, _f240, 				\
-+	   _g240, _h240, _i240, _j240, _k240;					\
-+    union { double d; UDItype i; } _l240, _m240, _n240, _o240,			\
-+				   _p240, _q240, _r240, _s240;			\
-+    UDItype _t240, _u240, _v240, _w240, _x240, _y240 = 0;			\
-+										\
-+    if (wfracbits < 106 || wfracbits > 120)					\
-+      abort();									\
-+										\
-+    setfetz;									\
-+										\
-+    _e240 = (double)(long)(X##_f0 & 0xffffff);					\
-+    _j240 = (double)(long)(Y##_f0 & 0xffffff);					\
-+    _d240 = (double)(long)((X##_f0 >> 24) & 0xffffff);				\
-+    _i240 = (double)(long)((Y##_f0 >> 24) & 0xffffff);				\
-+    _c240 = (double)(long)(((X##_f1 << 16) & 0xffffff) | (X##_f0 >> 48));	\
-+    _h240 = (double)(long)(((Y##_f1 << 16) & 0xffffff) | (Y##_f0 >> 48));	\
-+    _b240 = (double)(long)((X##_f1 >> 8) & 0xffffff);				\
-+    _g240 = (double)(long)((Y##_f1 >> 8) & 0xffffff);				\
-+    _a240 = (double)(long)(X##_f1 >> 32);					\
-+    _f240 = (double)(long)(Y##_f1 >> 32);					\
-+    _e240 *= _const[3];								\
-+    _j240 *= _const[3];								\
-+    _d240 *= _const[2];								\
-+    _i240 *= _const[2];								\
-+    _c240 *= _const[1];								\
-+    _h240 *= _const[1];								\
-+    _b240 *= _const[0];								\
-+    _g240 *= _const[0];								\
-+    _s240.d =							      _e240*_j240;\
-+    _r240.d =						_d240*_j240 + _e240*_i240;\
-+    _q240.d =				  _c240*_j240 + _d240*_i240 + _e240*_h240;\
-+    _p240.d =		    _b240*_j240 + _c240*_i240 + _d240*_h240 + _e240*_g240;\
-+    _o240.d = _a240*_j240 + _b240*_i240 + _c240*_h240 + _d240*_g240 + _e240*_f240;\
-+    _n240.d = _a240*_i240 + _b240*_h240 + _c240*_g240 + _d240*_f240;		\
-+    _m240.d = _a240*_h240 + _b240*_g240 + _c240*_f240;				\
-+    _l240.d = _a240*_g240 + _b240*_f240;					\
-+    _k240 =   _a240*_f240;							\
-+    _r240.d += _s240.d;								\
-+    _q240.d += _r240.d;								\
-+    _p240.d += _q240.d;								\
-+    _o240.d += _p240.d;								\
-+    _n240.d += _o240.d;								\
-+    _m240.d += _n240.d;								\
-+    _l240.d += _m240.d;								\
-+    _k240 += _l240.d;								\
-+    _s240.d -= ((_const[10]+_s240.d)-_const[10]);				\
-+    _r240.d -= ((_const[9]+_r240.d)-_const[9]);					\
-+    _q240.d -= ((_const[8]+_q240.d)-_const[8]);					\
-+    _p240.d -= ((_const[7]+_p240.d)-_const[7]);					\
-+    _o240.d += _const[7];							\
-+    _n240.d += _const[6];							\
-+    _m240.d += _const[5];							\
-+    _l240.d += _const[4];							\
-+    if (_s240.d != 0.0) _y240 = 1;						\
-+    if (_r240.d != 0.0) _y240 = 1;						\
-+    if (_q240.d != 0.0) _y240 = 1;						\
-+    if (_p240.d != 0.0) _y240 = 1;						\
-+    _t240 = (DItype)_k240;							\
-+    _u240 = _l240.i;								\
-+    _v240 = _m240.i;								\
-+    _w240 = _n240.i;								\
-+    _x240 = _o240.i;								\
-+    R##_f1 = (_t240 << (128 - (wfracbits - 1)))					\
-+	     | ((_u240 & 0xffffff) >> ((wfracbits - 1) - 104));			\
-+    R##_f0 = ((_u240 & 0xffffff) << (168 - (wfracbits - 1)))			\
-+    	     | ((_v240 & 0xffffff) << (144 - (wfracbits - 1)))			\
-+    	     | ((_w240 & 0xffffff) << (120 - (wfracbits - 1)))			\
-+    	     | ((_x240 & 0xffffff) >> ((wfracbits - 1) - 96))			\
-+    	     | _y240;								\
-+    resetfe;									\
-+  } while (0)
-+
-+/*
-+ * Division algorithms:
-+ */
-+
-+#define _FP_DIV_MEAT_2_udiv(fs, R, X, Y)				\
-+  do {									\
-+    _FP_W_TYPE _n_f2, _n_f1, _n_f0, _r_f1, _r_f0, _m_f1, _m_f0;		\
-+    if (_FP_FRAC_GT_2(X, Y))						\
-+      {									\
-+	_n_f2 = X##_f1 >> 1;						\
-+	_n_f1 = X##_f1 << (_FP_W_TYPE_SIZE - 1) | X##_f0 >> 1;		\
-+	_n_f0 = X##_f0 << (_FP_W_TYPE_SIZE - 1);			\
-+      }									\
-+    else								\
-+      {									\
-+	R##_e--;							\
-+	_n_f2 = X##_f1;							\
-+	_n_f1 = X##_f0;							\
-+	_n_f0 = 0;							\
-+      }									\
-+									\
-+    /* Normalize, i.e. make the most significant bit of the 		\
-+       denominator set. */						\
-+    _FP_FRAC_SLL_2(Y, _FP_WFRACXBITS_##fs);				\
-+									\
-+    udiv_qrnnd(R##_f1, _r_f1, _n_f2, _n_f1, Y##_f1);			\
-+    umul_ppmm(_m_f1, _m_f0, R##_f1, Y##_f0);				\
-+    _r_f0 = _n_f0;							\
-+    if (_FP_FRAC_GT_2(_m, _r))						\
-+      {									\
-+	R##_f1--;							\
-+	_FP_FRAC_ADD_2(_r, Y, _r);					\
-+	if (_FP_FRAC_GE_2(_r, Y) && _FP_FRAC_GT_2(_m, _r))		\
-+	  {								\
-+	    R##_f1--;							\
-+	    _FP_FRAC_ADD_2(_r, Y, _r);					\
-+	  }								\
-+      }									\
-+    _FP_FRAC_DEC_2(_r, _m);						\
-+									\
-+    if (_r_f1 == Y##_f1)						\
-+      {									\
-+	/* This is a special case, not an optimization			\
-+	   (_r/Y##_f1 would not fit into UWtype).			\
-+	   As _r is guaranteed to be < Y,  R##_f0 can be either		\
-+	   (UWtype)-1 or (UWtype)-2.  But as we know what kind		\
-+	   of bits it is (sticky, guard, round),  we don't care.	\
-+	   We also don't care what the reminder is,  because the	\
-+	   guard bit will be set anyway.  -jj */			\
-+	R##_f0 = -1;							\
-+      }									\
-+    else								\
-+      {									\
-+	udiv_qrnnd(R##_f0, _r_f1, _r_f1, _r_f0, Y##_f1);		\
-+	umul_ppmm(_m_f1, _m_f0, R##_f0, Y##_f0);			\
-+	_r_f0 = 0;							\
-+	if (_FP_FRAC_GT_2(_m, _r))					\
-+	  {								\
-+	    R##_f0--;							\
-+	    _FP_FRAC_ADD_2(_r, Y, _r);					\
-+	    if (_FP_FRAC_GE_2(_r, Y) && _FP_FRAC_GT_2(_m, _r))		\
-+	      {								\
-+		R##_f0--;						\
-+		_FP_FRAC_ADD_2(_r, Y, _r);				\
-+	      }								\
-+	  }								\
-+	if (!_FP_FRAC_EQ_2(_r, _m))					\
-+	  R##_f0 |= _FP_WORK_STICKY;					\
-+      }									\
-+  } while (0)
-+
-+
-+#define _FP_DIV_MEAT_2_gmp(fs, R, X, Y)					\
-+  do {									\
-+    _FP_W_TYPE _x[4], _y[2], _z[4];					\
-+    _y[0] = Y##_f0; _y[1] = Y##_f1;					\
-+    _x[0] = _x[3] = 0;							\
-+    if (_FP_FRAC_GT_2(X, Y))						\
-+      {									\
-+	R##_e++;							\
-+	_x[1] = (X##_f0 << (_FP_WFRACBITS_##fs-1 - _FP_W_TYPE_SIZE) |	\
-+		 X##_f1 >> (_FP_W_TYPE_SIZE -				\
-+			    (_FP_WFRACBITS_##fs-1 - _FP_W_TYPE_SIZE)));	\
-+	_x[2] = X##_f1 << (_FP_WFRACBITS_##fs-1 - _FP_W_TYPE_SIZE);	\
-+      }									\
-+    else								\
-+      {									\
-+	_x[1] = (X##_f0 << (_FP_WFRACBITS_##fs - _FP_W_TYPE_SIZE) |	\
-+		 X##_f1 >> (_FP_W_TYPE_SIZE -				\
-+			    (_FP_WFRACBITS_##fs - _FP_W_TYPE_SIZE)));	\
-+	_x[2] = X##_f1 << (_FP_WFRACBITS_##fs - _FP_W_TYPE_SIZE);	\
-+      }									\
-+									\
-+    (void) mpn_divrem (_z, 0, _x, 4, _y, 2);				\
-+    R##_f1 = _z[1];							\
-+    R##_f0 = _z[0] | ((_x[0] | _x[1]) != 0);				\
-+  } while (0)
-+
-+
-+/*
-+ * Square root algorithms:
-+ * We have just one right now, maybe Newton approximation
-+ * should be added for those machines where division is fast.
-+ */
-+ 
-+#define _FP_SQRT_MEAT_2(R, S, T, X, q)			\
-+  do {							\
-+    while (q)						\
-+      {							\
-+	T##_f1 = S##_f1 + q;				\
-+	if (T##_f1 <= X##_f1)				\
-+	  {						\
-+	    S##_f1 = T##_f1 + q;			\
-+	    X##_f1 -= T##_f1;				\
-+	    R##_f1 += q;				\
-+	  }						\
-+	_FP_FRAC_SLL_2(X, 1);				\
-+	q >>= 1;					\
-+      }							\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);		\
-+    while (q != _FP_WORK_ROUND)				\
-+      {							\
-+	T##_f0 = S##_f0 + q;				\
-+	T##_f1 = S##_f1;				\
-+	if (T##_f1 < X##_f1 || 				\
-+	    (T##_f1 == X##_f1 && T##_f0 <= X##_f0))	\
-+	  {						\
-+	    S##_f0 = T##_f0 + q;			\
-+	    S##_f1 += (T##_f0 > S##_f0);		\
-+	    _FP_FRAC_DEC_2(X, T);			\
-+	    R##_f0 += q;				\
-+	  }						\
-+	_FP_FRAC_SLL_2(X, 1);				\
-+	q >>= 1;					\
-+      }							\
-+    if (X##_f0 | X##_f1)				\
-+      {							\
-+	if (S##_f1 < X##_f1 || 				\
-+	    (S##_f1 == X##_f1 && S##_f0 < X##_f0))	\
-+	  R##_f0 |= _FP_WORK_ROUND;			\
-+	R##_f0 |= _FP_WORK_STICKY;			\
-+      }							\
-+  } while (0)
-+
-+
-+/*
-+ * Assembly/disassembly for converting to/from integral types.  
-+ * No shifting or overflow handled here.
-+ */
-+
-+#define _FP_FRAC_ASSEMBLE_2(r, X, rsize)	\
-+(void)((rsize <= _FP_W_TYPE_SIZE)		\
-+       ? ({ r = X##_f0; })			\
-+       : ({					\
-+	    r = X##_f1;				\
-+	    r <<= _FP_W_TYPE_SIZE;		\
-+	    r += X##_f0;			\
-+	  }))
-+
-+#define _FP_FRAC_DISASSEMBLE_2(X, r, rsize)				\
-+  do {									\
-+    X##_f0 = r;								\
-+    X##_f1 = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE);	\
-+  } while (0)
-+
-+/*
-+ * Convert FP values between word sizes
-+ */
-+
-+#define _FP_FRAC_COPY_1_2(D, S)		(D##_f = S##_f0)
-+
-+#define _FP_FRAC_COPY_2_1(D, S)		((D##_f0 = S##_f), (D##_f1 = 0))
-+
-+#define _FP_FRAC_COPY_2_2(D,S)		_FP_FRAC_COPY_2(D,S)
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-4.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-4.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-4.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-4.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,688 @@
-+/* Software floating-point emulation.
-+   Basic four-word fraction declaration and manipulation.
-+   Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#define _FP_FRAC_DECL_4(X)	_FP_W_TYPE X##_f[4]
-+#define _FP_FRAC_COPY_4(D,S)			\
-+  (D##_f[0] = S##_f[0], D##_f[1] = S##_f[1],	\
-+   D##_f[2] = S##_f[2], D##_f[3] = S##_f[3])
-+#define _FP_FRAC_SET_4(X,I)	__FP_FRAC_SET_4(X, I)
-+#define _FP_FRAC_HIGH_4(X)	(X##_f[3])
-+#define _FP_FRAC_LOW_4(X)	(X##_f[0])
-+#define _FP_FRAC_WORD_4(X,w)	(X##_f[w])
-+
-+#define _FP_FRAC_SLL_4(X,N)						\
-+  do {									\
-+    _FP_I_TYPE _up, _down, _skip, _i;					\
-+    _skip = (N) / _FP_W_TYPE_SIZE;					\
-+    _up = (N) % _FP_W_TYPE_SIZE;					\
-+    _down = _FP_W_TYPE_SIZE - _up;					\
-+    if (!_up)								\
-+      for (_i = 3; _i >= _skip; --_i)					\
-+	X##_f[_i] = X##_f[_i-_skip];					\
-+    else								\
-+      {									\
-+	for (_i = 3; _i > _skip; --_i)					\
-+	  X##_f[_i] = X##_f[_i-_skip] << _up				\
-+		      | X##_f[_i-_skip-1] >> _down;			\
-+	X##_f[_i--] = X##_f[0] << _up; 					\
-+      }									\
-+    for (; _i >= 0; --_i)						\
-+      X##_f[_i] = 0;							\
-+  } while (0)
-+
-+/* This one was broken too */
-+#define _FP_FRAC_SRL_4(X,N)						\
-+  do {									\
-+    _FP_I_TYPE _up, _down, _skip, _i;					\
-+    _skip = (N) / _FP_W_TYPE_SIZE;					\
-+    _down = (N) % _FP_W_TYPE_SIZE;					\
-+    _up = _FP_W_TYPE_SIZE - _down;					\
-+    if (!_down)								\
-+      for (_i = 0; _i <= 3-_skip; ++_i)					\
-+	X##_f[_i] = X##_f[_i+_skip];					\
-+    else								\
-+      {									\
-+	for (_i = 0; _i < 3-_skip; ++_i)				\
-+	  X##_f[_i] = X##_f[_i+_skip] >> _down				\
-+		      | X##_f[_i+_skip+1] << _up;			\
-+	X##_f[_i++] = X##_f[3] >> _down;				\
-+      }									\
-+    for (; _i < 4; ++_i)						\
-+      X##_f[_i] = 0;							\
-+  } while (0)
-+
-+
-+/* Right shift with sticky-lsb. 
-+ * What this actually means is that we do a standard right-shift,
-+ * but that if any of the bits that fall off the right hand side
-+ * were one then we always set the LSbit.
-+ */
-+#define _FP_FRAC_SRST_4(X,S,N,size)			\
-+  do {							\
-+    _FP_I_TYPE _up, _down, _skip, _i;			\
-+    _FP_W_TYPE _s;					\
-+    _skip = (N) / _FP_W_TYPE_SIZE;			\
-+    _down = (N) % _FP_W_TYPE_SIZE;			\
-+    _up = _FP_W_TYPE_SIZE - _down;			\
-+    for (_s = _i = 0; _i < _skip; ++_i)			\
-+      _s |= X##_f[_i];					\
-+    if (!_down)						\
-+      for (_i = 0; _i <= 3-_skip; ++_i)			\
-+	X##_f[_i] = X##_f[_i+_skip];			\
-+    else						\
-+      {							\
-+	_s |= X##_f[_i] << _up;				\
-+	for (_i = 0; _i < 3-_skip; ++_i)		\
-+	  X##_f[_i] = X##_f[_i+_skip] >> _down		\
-+		      | X##_f[_i+_skip+1] << _up;	\
-+	X##_f[_i++] = X##_f[3] >> _down;		\
-+      }							\
-+    for (; _i < 4; ++_i)				\
-+      X##_f[_i] = 0;					\
-+    S = (_s != 0);					\
-+  } while (0)
-+
-+#define _FP_FRAC_SRS_4(X,N,size)		\
-+  do {						\
-+    int _sticky;				\
-+    _FP_FRAC_SRST_4(X, _sticky, N, size);	\
-+    X##_f[0] |= _sticky;			\
-+  } while (0)
-+
-+#define _FP_FRAC_ADD_4(R,X,Y)						\
-+  __FP_FRAC_ADD_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],		\
-+		  X##_f[3], X##_f[2], X##_f[1], X##_f[0],		\
-+		  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-+
-+#define _FP_FRAC_SUB_4(R,X,Y)						\
-+  __FP_FRAC_SUB_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],		\
-+		  X##_f[3], X##_f[2], X##_f[1], X##_f[0],		\
-+		  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-+
-+#define _FP_FRAC_DEC_4(X,Y)						\
-+  __FP_FRAC_DEC_4(X##_f[3], X##_f[2], X##_f[1], X##_f[0],		\
-+		  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-+
-+#define _FP_FRAC_ADDI_4(X,I)						\
-+  __FP_FRAC_ADDI_4(X##_f[3], X##_f[2], X##_f[1], X##_f[0], I)
-+
-+#define _FP_ZEROFRAC_4  0,0,0,0
-+#define _FP_MINFRAC_4   0,0,0,1
-+#define _FP_MAXFRAC_4	(~(_FP_WS_TYPE)0), (~(_FP_WS_TYPE)0), (~(_FP_WS_TYPE)0), (~(_FP_WS_TYPE)0)
-+
-+#define _FP_FRAC_ZEROP_4(X)     ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]) == 0)
-+#define _FP_FRAC_NEGP_4(X)      ((_FP_WS_TYPE)X##_f[3] < 0)
-+#define _FP_FRAC_OVERP_4(fs,X)  (_FP_FRAC_HIGH_##fs(X) & _FP_OVERFLOW_##fs)
-+#define _FP_FRAC_CLEAR_OVERP_4(fs,X)  (_FP_FRAC_HIGH_##fs(X) &= ~_FP_OVERFLOW_##fs)
-+
-+#define _FP_FRAC_EQ_4(X,Y)				\
-+ (X##_f[0] == Y##_f[0] && X##_f[1] == Y##_f[1]		\
-+  && X##_f[2] == Y##_f[2] && X##_f[3] == Y##_f[3])
-+
-+#define _FP_FRAC_GT_4(X,Y)				\
-+ (X##_f[3] > Y##_f[3] ||				\
-+  (X##_f[3] == Y##_f[3] && (X##_f[2] > Y##_f[2] ||	\
-+   (X##_f[2] == Y##_f[2] && (X##_f[1] > Y##_f[1] ||	\
-+    (X##_f[1] == Y##_f[1] && X##_f[0] > Y##_f[0])	\
-+   ))							\
-+  ))							\
-+ )
-+
-+#define _FP_FRAC_GE_4(X,Y)				\
-+ (X##_f[3] > Y##_f[3] ||				\
-+  (X##_f[3] == Y##_f[3] && (X##_f[2] > Y##_f[2] ||	\
-+   (X##_f[2] == Y##_f[2] && (X##_f[1] > Y##_f[1] ||	\
-+    (X##_f[1] == Y##_f[1] && X##_f[0] >= Y##_f[0])	\
-+   ))							\
-+  ))							\
-+ )
-+
-+
-+#define _FP_FRAC_CLZ_4(R,X)		\
-+  do {					\
-+    if (X##_f[3])			\
-+    {					\
-+	__FP_CLZ(R,X##_f[3]);		\
-+    }					\
-+    else if (X##_f[2])			\
-+    {					\
-+	__FP_CLZ(R,X##_f[2]);		\
-+	R += _FP_W_TYPE_SIZE;		\
-+    }					\
-+    else if (X##_f[1])			\
-+    {					\
-+	__FP_CLZ(R,X##_f[1]);		\
-+	R += _FP_W_TYPE_SIZE*2;		\
-+    }					\
-+    else				\
-+    {					\
-+	__FP_CLZ(R,X##_f[0]);		\
-+	R += _FP_W_TYPE_SIZE*3;		\
-+    }					\
-+  } while(0)
-+
-+
-+#define _FP_UNPACK_RAW_4(fs, X, val)				\
-+  do {								\
-+    union _FP_UNION_##fs _flo; _flo.flt = (val);		\
-+    X##_f[0] = _flo.bits.frac0;					\
-+    X##_f[1] = _flo.bits.frac1;					\
-+    X##_f[2] = _flo.bits.frac2;					\
-+    X##_f[3] = _flo.bits.frac3;					\
-+    X##_e  = _flo.bits.exp;					\
-+    X##_s  = _flo.bits.sign;					\
-+  } while (0)
-+
-+#define _FP_UNPACK_RAW_4_P(fs, X, val)				\
-+  do {								\
-+    union _FP_UNION_##fs *_flo =				\
-+      (union _FP_UNION_##fs *)(val);				\
-+								\
-+    X##_f[0] = _flo->bits.frac0;				\
-+    X##_f[1] = _flo->bits.frac1;				\
-+    X##_f[2] = _flo->bits.frac2;				\
-+    X##_f[3] = _flo->bits.frac3;				\
-+    X##_e  = _flo->bits.exp;					\
-+    X##_s  = _flo->bits.sign;					\
-+  } while (0)
-+
-+#define _FP_PACK_RAW_4(fs, val, X)				\
-+  do {								\
-+    union _FP_UNION_##fs _flo;					\
-+    _flo.bits.frac0 = X##_f[0];					\
-+    _flo.bits.frac1 = X##_f[1];					\
-+    _flo.bits.frac2 = X##_f[2];					\
-+    _flo.bits.frac3 = X##_f[3];					\
-+    _flo.bits.exp   = X##_e;					\
-+    _flo.bits.sign  = X##_s;					\
-+    (val) = _flo.flt;				   		\
-+  } while (0)
-+
-+#define _FP_PACK_RAW_4_P(fs, val, X)				\
-+  do {								\
-+    union _FP_UNION_##fs *_flo =				\
-+      (union _FP_UNION_##fs *)(val);				\
-+								\
-+    _flo->bits.frac0 = X##_f[0];				\
-+    _flo->bits.frac1 = X##_f[1];				\
-+    _flo->bits.frac2 = X##_f[2];				\
-+    _flo->bits.frac3 = X##_f[3];				\
-+    _flo->bits.exp   = X##_e;					\
-+    _flo->bits.sign  = X##_s;					\
-+  } while (0)
-+
-+/*
-+ * Multiplication algorithms:
-+ */
-+
-+/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-+
-+#define _FP_MUL_MEAT_4_wide(wfracbits, R, X, Y, doit)			    \
-+  do {									    \
-+    _FP_FRAC_DECL_8(_z); _FP_FRAC_DECL_2(_b); _FP_FRAC_DECL_2(_c);	    \
-+    _FP_FRAC_DECL_2(_d); _FP_FRAC_DECL_2(_e); _FP_FRAC_DECL_2(_f);	    \
-+									    \
-+    doit(_FP_FRAC_WORD_8(_z,1), _FP_FRAC_WORD_8(_z,0), X##_f[0], Y##_f[0]); \
-+    doit(_b_f1, _b_f0, X##_f[0], Y##_f[1]);				    \
-+    doit(_c_f1, _c_f0, X##_f[1], Y##_f[0]);				    \
-+    doit(_d_f1, _d_f0, X##_f[1], Y##_f[1]);				    \
-+    doit(_e_f1, _e_f0, X##_f[0], Y##_f[2]);				    \
-+    doit(_f_f1, _f_f0, X##_f[2], Y##_f[0]);				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,3),_FP_FRAC_WORD_8(_z,2),	    \
-+		    _FP_FRAC_WORD_8(_z,1), 0,_b_f1,_b_f0,		    \
-+		    0,0,_FP_FRAC_WORD_8(_z,1));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,3),_FP_FRAC_WORD_8(_z,2),	    \
-+		    _FP_FRAC_WORD_8(_z,1), 0,_c_f1,_c_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,3),_FP_FRAC_WORD_8(_z,2),	    \
-+		    _FP_FRAC_WORD_8(_z,1));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,4),_FP_FRAC_WORD_8(_z,3),	    \
-+		    _FP_FRAC_WORD_8(_z,2), 0,_d_f1,_d_f0,		    \
-+		    0,_FP_FRAC_WORD_8(_z,3),_FP_FRAC_WORD_8(_z,2));	    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,4),_FP_FRAC_WORD_8(_z,3),	    \
-+		    _FP_FRAC_WORD_8(_z,2), 0,_e_f1,_e_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,4),_FP_FRAC_WORD_8(_z,3),	    \
-+		    _FP_FRAC_WORD_8(_z,2));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,4),_FP_FRAC_WORD_8(_z,3),	    \
-+		    _FP_FRAC_WORD_8(_z,2), 0,_f_f1,_f_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,4),_FP_FRAC_WORD_8(_z,3),	    \
-+		    _FP_FRAC_WORD_8(_z,2));				    \
-+    doit(_b_f1, _b_f0, X##_f[0], Y##_f[3]);				    \
-+    doit(_c_f1, _c_f0, X##_f[3], Y##_f[0]);				    \
-+    doit(_d_f1, _d_f0, X##_f[1], Y##_f[2]);				    \
-+    doit(_e_f1, _e_f0, X##_f[2], Y##_f[1]);				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3), 0,_b_f1,_b_f0,		    \
-+		    0,_FP_FRAC_WORD_8(_z,4),_FP_FRAC_WORD_8(_z,3));	    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3), 0,_c_f1,_c_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3), 0,_d_f1,_d_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3), 0,_e_f1,_e_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4),	    \
-+		    _FP_FRAC_WORD_8(_z,3));				    \
-+    doit(_b_f1, _b_f0, X##_f[2], Y##_f[2]);				    \
-+    doit(_c_f1, _c_f0, X##_f[1], Y##_f[3]);				    \
-+    doit(_d_f1, _d_f0, X##_f[3], Y##_f[1]);				    \
-+    doit(_e_f1, _e_f0, X##_f[2], Y##_f[3]);				    \
-+    doit(_f_f1, _f_f0, X##_f[3], Y##_f[2]);				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,6),_FP_FRAC_WORD_8(_z,5),	    \
-+		    _FP_FRAC_WORD_8(_z,4), 0,_b_f1,_b_f0,		    \
-+		    0,_FP_FRAC_WORD_8(_z,5),_FP_FRAC_WORD_8(_z,4));	    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,6),_FP_FRAC_WORD_8(_z,5),	    \
-+		    _FP_FRAC_WORD_8(_z,4), 0,_c_f1,_c_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,6),_FP_FRAC_WORD_8(_z,5),	    \
-+		    _FP_FRAC_WORD_8(_z,4));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,6),_FP_FRAC_WORD_8(_z,5),	    \
-+		    _FP_FRAC_WORD_8(_z,4), 0,_d_f1,_d_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,6),_FP_FRAC_WORD_8(_z,5),	    \
-+		    _FP_FRAC_WORD_8(_z,4));				    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,7),_FP_FRAC_WORD_8(_z,6),	    \
-+		    _FP_FRAC_WORD_8(_z,5), 0,_e_f1,_e_f0,		    \
-+		    0,_FP_FRAC_WORD_8(_z,6),_FP_FRAC_WORD_8(_z,5));	    \
-+    __FP_FRAC_ADD_3(_FP_FRAC_WORD_8(_z,7),_FP_FRAC_WORD_8(_z,6),	    \
-+		    _FP_FRAC_WORD_8(_z,5), 0,_f_f1,_f_f0,		    \
-+		    _FP_FRAC_WORD_8(_z,7),_FP_FRAC_WORD_8(_z,6),	    \
-+		    _FP_FRAC_WORD_8(_z,5));				    \
-+    doit(_b_f1, _b_f0, X##_f[3], Y##_f[3]);				    \
-+    __FP_FRAC_ADD_2(_FP_FRAC_WORD_8(_z,7),_FP_FRAC_WORD_8(_z,6),	    \
-+		    _b_f1,_b_f0,					    \
-+		    _FP_FRAC_WORD_8(_z,7),_FP_FRAC_WORD_8(_z,6));	    \
-+									    \
-+    /* Normalize since we know where the msb of the multiplicands	    \
-+       were (bit B), we know that the msb of the of the product is	    \
-+       at either 2B or 2B-1.  */					    \
-+    _FP_FRAC_SRS_8(_z, wfracbits-1, 2*wfracbits);			    \
-+    __FP_FRAC_SET_4(R, _FP_FRAC_WORD_8(_z,3), _FP_FRAC_WORD_8(_z,2),	    \
-+		    _FP_FRAC_WORD_8(_z,1), _FP_FRAC_WORD_8(_z,0));	    \
-+  } while (0)
-+
-+#define _FP_MUL_MEAT_4_gmp(wfracbits, R, X, Y)				    \
-+  do {									    \
-+    _FP_FRAC_DECL_8(_z);						    \
-+									    \
-+    mpn_mul_n(_z_f, _x_f, _y_f, 4);					    \
-+									    \
-+    /* Normalize since we know where the msb of the multiplicands	    \
-+       were (bit B), we know that the msb of the of the product is	    \
-+       at either 2B or 2B-1.  */					    \
-+    _FP_FRAC_SRS_8(_z, wfracbits-1, 2*wfracbits);	 		    \
-+    __FP_FRAC_SET_4(R, _FP_FRAC_WORD_8(_z,3), _FP_FRAC_WORD_8(_z,2),	    \
-+		    _FP_FRAC_WORD_8(_z,1), _FP_FRAC_WORD_8(_z,0));	    \
-+  } while (0)
-+
-+/*
-+ * Helper utility for _FP_DIV_MEAT_4_udiv:
-+ * pppp = m * nnn
-+ */
-+#define umul_ppppmnnn(p3,p2,p1,p0,m,n2,n1,n0)				    \
-+  do {									    \
-+    UWtype _t;								    \
-+    umul_ppmm(p1,p0,m,n0);						    \
-+    umul_ppmm(p2,_t,m,n1);						    \
-+    __FP_FRAC_ADDI_2(p2,p1,_t);						    \
-+    umul_ppmm(p3,_t,m,n2);						    \
-+    __FP_FRAC_ADDI_2(p3,p2,_t);						    \
-+  } while (0)
-+
-+/*
-+ * Division algorithms:
-+ */
-+
-+#define _FP_DIV_MEAT_4_udiv(fs, R, X, Y)				    \
-+  do {									    \
-+    int _i;								    \
-+    _FP_FRAC_DECL_4(_n); _FP_FRAC_DECL_4(_m);				    \
-+    _FP_FRAC_SET_4(_n, _FP_ZEROFRAC_4);					    \
-+    if (_FP_FRAC_GT_4(X, Y))						    \
-+      {									    \
-+	_n_f[3] = X##_f[0] << (_FP_W_TYPE_SIZE - 1);			    \
-+	_FP_FRAC_SRL_4(X, 1);						    \
-+      }									    \
-+    else								    \
-+      R##_e--;								    \
-+									    \
-+    /* Normalize, i.e. make the most significant bit of the 		    \
-+       denominator set. */						    \
-+    _FP_FRAC_SLL_4(Y, _FP_WFRACXBITS_##fs);				    \
-+									    \
-+    for (_i = 3; ; _i--)						    \
-+      {									    \
-+        if (X##_f[3] == Y##_f[3])					    \
-+          {								    \
-+            /* This is a special case, not an optimization		    \
-+               (X##_f[3]/Y##_f[3] would not fit into UWtype).		    \
-+               As X## is guaranteed to be < Y,  R##_f[_i] can be either	    \
-+               (UWtype)-1 or (UWtype)-2.  */				    \
-+            R##_f[_i] = -1;						    \
-+            if (!_i)							    \
-+	      break;							    \
-+            __FP_FRAC_SUB_4(X##_f[3], X##_f[2], X##_f[1], X##_f[0],	    \
-+			    Y##_f[2], Y##_f[1], Y##_f[0], 0,		    \
-+			    X##_f[2], X##_f[1], X##_f[0], _n_f[_i]);	    \
-+            _FP_FRAC_SUB_4(X, Y, X);					    \
-+            if (X##_f[3] > Y##_f[3])					    \
-+              {								    \
-+                R##_f[_i] = -2;						    \
-+                _FP_FRAC_ADD_4(X, Y, X);				    \
-+              }								    \
-+          }								    \
-+        else								    \
-+          {								    \
-+            udiv_qrnnd(R##_f[_i], X##_f[3], X##_f[3], X##_f[2], Y##_f[3]);  \
-+            umul_ppppmnnn(_m_f[3], _m_f[2], _m_f[1], _m_f[0],		    \
-+			  R##_f[_i], Y##_f[2], Y##_f[1], Y##_f[0]);	    \
-+            X##_f[2] = X##_f[1];					    \
-+            X##_f[1] = X##_f[0];					    \
-+            X##_f[0] = _n_f[_i];					    \
-+            if (_FP_FRAC_GT_4(_m, X))					    \
-+              {								    \
-+                R##_f[_i]--;						    \
-+                _FP_FRAC_ADD_4(X, Y, X);				    \
-+                if (_FP_FRAC_GE_4(X, Y) && _FP_FRAC_GT_4(_m, X))	    \
-+                  {							    \
-+		    R##_f[_i]--;					    \
-+		    _FP_FRAC_ADD_4(X, Y, X);				    \
-+                  }							    \
-+              }								    \
-+            _FP_FRAC_DEC_4(X, _m);					    \
-+            if (!_i)							    \
-+	      {								    \
-+		if (!_FP_FRAC_EQ_4(X, _m))				    \
-+		  R##_f[0] |= _FP_WORK_STICKY;				    \
-+		break;							    \
-+	      }								    \
-+          }								    \
-+      }									    \
-+  } while (0)
-+
-+
-+/*
-+ * Square root algorithms:
-+ * We have just one right now, maybe Newton approximation
-+ * should be added for those machines where division is fast.
-+ */
-+ 
-+#define _FP_SQRT_MEAT_4(R, S, T, X, q)				\
-+  do {								\
-+    while (q)							\
-+      {								\
-+	T##_f[3] = S##_f[3] + q;				\
-+	if (T##_f[3] <= X##_f[3])				\
-+	  {							\
-+	    S##_f[3] = T##_f[3] + q;				\
-+	    X##_f[3] -= T##_f[3];				\
-+	    R##_f[3] += q;					\
-+	  }							\
-+	_FP_FRAC_SLL_4(X, 1);					\
-+	q >>= 1;						\
-+      }								\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);			\
-+    while (q)							\
-+      {								\
-+	T##_f[2] = S##_f[2] + q;				\
-+	T##_f[3] = S##_f[3];					\
-+	if (T##_f[3] < X##_f[3] || 				\
-+	    (T##_f[3] == X##_f[3] && T##_f[2] <= X##_f[2]))	\
-+	  {							\
-+	    S##_f[2] = T##_f[2] + q;				\
-+	    S##_f[3] += (T##_f[2] > S##_f[2]);			\
-+	    __FP_FRAC_DEC_2(X##_f[3], X##_f[2],			\
-+			    T##_f[3], T##_f[2]);		\
-+	    R##_f[2] += q;					\
-+	  }							\
-+	_FP_FRAC_SLL_4(X, 1);					\
-+	q >>= 1;						\
-+      }								\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);			\
-+    while (q)							\
-+      {								\
-+	T##_f[1] = S##_f[1] + q;				\
-+	T##_f[2] = S##_f[2];					\
-+	T##_f[3] = S##_f[3];					\
-+	if (T##_f[3] < X##_f[3] || 				\
-+	    (T##_f[3] == X##_f[3] && (T##_f[2] < X##_f[2] ||	\
-+	     (T##_f[2] == X##_f[2] && T##_f[1] <= X##_f[1]))))	\
-+	  {							\
-+	    S##_f[1] = T##_f[1] + q;				\
-+	    S##_f[2] += (T##_f[1] > S##_f[1]);			\
-+	    S##_f[3] += (T##_f[2] > S##_f[2]);			\
-+	    __FP_FRAC_DEC_3(X##_f[3], X##_f[2], X##_f[1],	\
-+	    		    T##_f[3], T##_f[2], T##_f[1]);	\
-+	    R##_f[1] += q;					\
-+	  }							\
-+	_FP_FRAC_SLL_4(X, 1);					\
-+	q >>= 1;						\
-+      }								\
-+    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);			\
-+    while (q != _FP_WORK_ROUND)					\
-+      {								\
-+	T##_f[0] = S##_f[0] + q;				\
-+	T##_f[1] = S##_f[1];					\
-+	T##_f[2] = S##_f[2];					\
-+	T##_f[3] = S##_f[3];					\
-+	if (_FP_FRAC_GE_4(X,T))					\
-+	  {							\
-+	    S##_f[0] = T##_f[0] + q;				\
-+	    S##_f[1] += (T##_f[0] > S##_f[0]);			\
-+	    S##_f[2] += (T##_f[1] > S##_f[1]);			\
-+	    S##_f[3] += (T##_f[2] > S##_f[2]);			\
-+	    _FP_FRAC_DEC_4(X, T);				\
-+	    R##_f[0] += q;					\
-+	  }							\
-+	_FP_FRAC_SLL_4(X, 1);					\
-+	q >>= 1;						\
-+      }								\
-+    if (!_FP_FRAC_ZEROP_4(X))					\
-+      {								\
-+	if (_FP_FRAC_GT_4(X,S))					\
-+	  R##_f[0] |= _FP_WORK_ROUND;				\
-+	R##_f[0] |= _FP_WORK_STICKY;				\
-+      }								\
-+  } while (0)
-+
-+
-+/*
-+ * Internals 
-+ */
-+
-+#define __FP_FRAC_SET_4(X,I3,I2,I1,I0)					\
-+  (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
-+
-+#ifndef __FP_FRAC_ADD_3
-+#define __FP_FRAC_ADD_3(r2,r1,r0,x2,x1,x0,y2,y1,y0)		\
-+  do {								\
-+    _FP_W_TYPE _c1, _c2;					\
-+    r0 = x0 + y0;						\
-+    _c1 = r0 < x0;						\
-+    r1 = x1 + y1;						\
-+    _c2 = r1 < x1;						\
-+    r1 += _c1;							\
-+    _c2 |= r1 < _c1;						\
-+    r2 = x2 + y2 + _c2;						\
-+  } while (0)
-+#endif
-+
-+#ifndef __FP_FRAC_ADD_4
-+#define __FP_FRAC_ADD_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)	\
-+  do {								\
-+    _FP_W_TYPE _c1, _c2, _c3;					\
-+    r0 = x0 + y0;						\
-+    _c1 = r0 < x0;						\
-+    r1 = x1 + y1;						\
-+    _c2 = r1 < x1;						\
-+    r1 += _c1;							\
-+    _c2 |= r1 < _c1;						\
-+    r2 = x2 + y2;						\
-+    _c3 = r2 < x2;						\
-+    r2 += _c2;							\
-+    _c3 |= r2 < _c2;						\
-+    r3 = x3 + y3 + _c3;						\
-+  } while (0)
-+#endif
-+
-+#ifndef __FP_FRAC_SUB_3
-+#define __FP_FRAC_SUB_3(r2,r1,r0,x2,x1,x0,y2,y1,y0)		\
-+  do {								\
-+    _FP_W_TYPE _c1, _c2;					\
-+    r0 = x0 - y0;						\
-+    _c1 = r0 > x0;						\
-+    r1 = x1 - y1;						\
-+    _c2 = r1 > x1;						\
-+    r1 -= _c1;							\
-+    _c2 |= _c1 && (y1 == x1);					\
-+    r2 = x2 - y2 - _c2;						\
-+  } while (0)
-+#endif
-+
-+#ifndef __FP_FRAC_SUB_4
-+#define __FP_FRAC_SUB_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)	\
-+  do {								\
-+    _FP_W_TYPE _c1, _c2, _c3;					\
-+    r0 = x0 - y0;						\
-+    _c1 = r0 > x0;						\
-+    r1 = x1 - y1;						\
-+    _c2 = r1 > x1;						\
-+    r1 -= _c1;							\
-+    _c2 |= _c1 && (y1 == x1);					\
-+    r2 = x2 - y2;						\
-+    _c3 = r2 > x2;						\
-+    r2 -= _c2;							\
-+    _c3 |= _c2 && (y2 == x2);					\
-+    r3 = x3 - y3 - _c3;						\
-+  } while (0)
-+#endif
-+
-+#ifndef __FP_FRAC_DEC_3
-+#define __FP_FRAC_DEC_3(x2,x1,x0,y2,y1,y0)				\
-+  do {									\
-+    UWtype _t0, _t1, _t2;						\
-+    _t0 = x0, _t1 = x1, _t2 = x2;					\
-+    __FP_FRAC_SUB_3 (x2, x1, x0, _t2, _t1, _t0, y2, y1, y0);		\
-+  } while (0)
-+#endif
-+
-+#ifndef __FP_FRAC_DEC_4
-+#define __FP_FRAC_DEC_4(x3,x2,x1,x0,y3,y2,y1,y0)			\
-+  do {									\
-+    UWtype _t0, _t1, _t2, _t3;						\
-+    _t0 = x0, _t1 = x1, _t2 = x2, _t3 = x3;				\
-+    __FP_FRAC_SUB_4 (x3,x2,x1,x0,_t3,_t2,_t1,_t0, y3,y2,y1,y0);		\
-+  } while (0)
-+#endif
-+
-+#ifndef __FP_FRAC_ADDI_4
-+#define __FP_FRAC_ADDI_4(x3,x2,x1,x0,i)					\
-+  do {									\
-+    UWtype _t;								\
-+    _t = ((x0 += i) < i);						\
-+    x1 += _t; _t = (x1 < _t);						\
-+    x2 += _t; _t = (x2 < _t);						\
-+    x3 += _t;								\
-+  } while (0)
-+#endif
-+
-+/* Convert FP values between word sizes. This appears to be more
-+ * complicated than I'd have expected it to be, so these might be
-+ * wrong... These macros are in any case somewhat bogus because they
-+ * use information about what various FRAC_n variables look like 
-+ * internally [eg, that 2 word vars are X_f0 and x_f1]. But so do
-+ * the ones in op-2.h and op-1.h. 
-+ */
-+#define _FP_FRAC_COPY_1_4(D, S)		(D##_f = S##_f[0])
-+
-+#define _FP_FRAC_COPY_2_4(D, S)			\
-+do {						\
-+  D##_f0 = S##_f[0];				\
-+  D##_f1 = S##_f[1];				\
-+} while (0)
-+
-+/* Assembly/disassembly for converting to/from integral types.  
-+ * No shifting or overflow handled here.
-+ */
-+/* Put the FP value X into r, which is an integer of size rsize. */
-+#define _FP_FRAC_ASSEMBLE_4(r, X, rsize)				\
-+  do {									\
-+    if (rsize <= _FP_W_TYPE_SIZE)					\
-+      r = X##_f[0];							\
-+    else if (rsize <= 2*_FP_W_TYPE_SIZE)				\
-+    {									\
-+      r = X##_f[1];							\
-+      r <<= _FP_W_TYPE_SIZE;						\
-+      r += X##_f[0];							\
-+    }									\
-+    else								\
-+    {									\
-+      /* I'm feeling lazy so we deal with int == 3words (implausible)*/	\
-+      /* and int == 4words as a single case.			 */	\
-+      r = X##_f[3];							\
-+      r <<= _FP_W_TYPE_SIZE;						\
-+      r += X##_f[2];							\
-+      r <<= _FP_W_TYPE_SIZE;						\
-+      r += X##_f[1];							\
-+      r <<= _FP_W_TYPE_SIZE;						\
-+      r += X##_f[0];							\
-+    }									\
-+  } while (0)
-+
-+/* "No disassemble Number Five!" */
-+/* move an integer of size rsize into X's fractional part. We rely on
-+ * the _f[] array consisting of words of size _FP_W_TYPE_SIZE to avoid
-+ * having to mask the values we store into it.
-+ */
-+#define _FP_FRAC_DISASSEMBLE_4(X, r, rsize)				\
-+  do {									\
-+    X##_f[0] = r;							\
-+    X##_f[1] = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE);	\
-+    X##_f[2] = (rsize <= 2*_FP_W_TYPE_SIZE ? 0 : r >> 2*_FP_W_TYPE_SIZE); \
-+    X##_f[3] = (rsize <= 3*_FP_W_TYPE_SIZE ? 0 : r >> 3*_FP_W_TYPE_SIZE); \
-+  } while (0);
-+
-+#define _FP_FRAC_COPY_4_1(D, S)			\
-+do {						\
-+  D##_f[0] = S##_f;				\
-+  D##_f[1] = D##_f[2] = D##_f[3] = 0;		\
-+} while (0)
-+
-+#define _FP_FRAC_COPY_4_2(D, S)			\
-+do {						\
-+  D##_f[0] = S##_f0;				\
-+  D##_f[1] = S##_f1;				\
-+  D##_f[2] = D##_f[3] = 0;			\
-+} while (0)
-+
-+#define _FP_FRAC_COPY_4_4(D,S)	_FP_FRAC_COPY_4(D,S)
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-8.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-8.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-8.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-8.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,111 @@
-+/* Software floating-point emulation.
-+   Basic eight-word fraction declaration and manipulation.
-+   Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+/* We need just a few things from here for op-4, if we ever need some
-+   other macros, they can be added. */
-+#define _FP_FRAC_DECL_8(X)	_FP_W_TYPE X##_f[8]
-+#define _FP_FRAC_HIGH_8(X)	(X##_f[7])
-+#define _FP_FRAC_LOW_8(X)	(X##_f[0])
-+#define _FP_FRAC_WORD_8(X,w)	(X##_f[w])
-+
-+#define _FP_FRAC_SLL_8(X,N)						\
-+  do {									\
-+    _FP_I_TYPE _up, _down, _skip, _i;					\
-+    _skip = (N) / _FP_W_TYPE_SIZE;					\
-+    _up = (N) % _FP_W_TYPE_SIZE;					\
-+    _down = _FP_W_TYPE_SIZE - _up;					\
-+    if (!_up)								\
-+      for (_i = 7; _i >= _skip; --_i)					\
-+	X##_f[_i] = X##_f[_i-_skip];					\
-+    else								\
-+      {									\
-+	for (_i = 7; _i > _skip; --_i)					\
-+	  X##_f[_i] = X##_f[_i-_skip] << _up				\
-+		      | X##_f[_i-_skip-1] >> _down;			\
-+	X##_f[_i--] = X##_f[0] << _up; 					\
-+      }									\
-+    for (; _i >= 0; --_i)						\
-+      X##_f[_i] = 0;							\
-+  } while (0)
-+
-+#define _FP_FRAC_SRL_8(X,N)						\
-+  do {									\
-+    _FP_I_TYPE _up, _down, _skip, _i;					\
-+    _skip = (N) / _FP_W_TYPE_SIZE;					\
-+    _down = (N) % _FP_W_TYPE_SIZE;					\
-+    _up = _FP_W_TYPE_SIZE - _down;					\
-+    if (!_down)								\
-+      for (_i = 0; _i <= 7-_skip; ++_i)					\
-+	X##_f[_i] = X##_f[_i+_skip];					\
-+    else								\
-+      {									\
-+	for (_i = 0; _i < 7-_skip; ++_i)				\
-+	  X##_f[_i] = X##_f[_i+_skip] >> _down				\
-+		      | X##_f[_i+_skip+1] << _up;			\
-+	X##_f[_i++] = X##_f[7] >> _down;				\
-+      }									\
-+    for (; _i < 8; ++_i)						\
-+      X##_f[_i] = 0;							\
-+  } while (0)
-+
-+
-+/* Right shift with sticky-lsb. 
-+ * What this actually means is that we do a standard right-shift,
-+ * but that if any of the bits that fall off the right hand side
-+ * were one then we always set the LSbit.
-+ */
-+#define _FP_FRAC_SRS_8(X,N,size)					\
-+  do {									\
-+    _FP_I_TYPE _up, _down, _skip, _i;					\
-+    _FP_W_TYPE _s;							\
-+    _skip = (N) / _FP_W_TYPE_SIZE;					\
-+    _down = (N) % _FP_W_TYPE_SIZE;					\
-+    _up = _FP_W_TYPE_SIZE - _down;					\
-+    for (_s = _i = 0; _i < _skip; ++_i)					\
-+      _s |= X##_f[_i];							\
-+    if (!_down)								\
-+      for (_i = 0; _i <= 7-_skip; ++_i)					\
-+	X##_f[_i] = X##_f[_i+_skip];					\
-+    else								\
-+      {									\
-+	_s |= X##_f[_i] << _up;						\
-+	for (_i = 0; _i < 7-_skip; ++_i)				\
-+	  X##_f[_i] = X##_f[_i+_skip] >> _down				\
-+		      | X##_f[_i+_skip+1] << _up;			\
-+	X##_f[_i++] = X##_f[7] >> _down;				\
-+      }									\
-+    for (; _i < 8; ++_i)						\
-+      X##_f[_i] = 0;							\
-+    /* don't fix the LSB until the very end when we're sure f[0] is stable */	\
-+    X##_f[0] |= (_s != 0);						\
-+  } while (0)
-+
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-common.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-common.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/op-common.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/op-common.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,1359 @@
-+/* Software floating-point emulation. Common operations.
-+   Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#define _FP_DECL(wc, X)						\
-+  _FP_I_TYPE X##_c __attribute__((unused)), X##_s, X##_e;	\
-+  _FP_FRAC_DECL_##wc(X)
-+
-+/*
-+ * Finish truely unpacking a native fp value by classifying the kind
-+ * of fp value and normalizing both the exponent and the fraction.
-+ */
-+
-+#define _FP_UNPACK_CANONICAL(fs, wc, X)					\
-+do {									\
-+  switch (X##_e)							\
-+  {									\
-+  default:								\
-+    _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_IMPLBIT_##fs;			\
-+    _FP_FRAC_SLL_##wc(X, _FP_WORKBITS);					\
-+    X##_e -= _FP_EXPBIAS_##fs;						\
-+    X##_c = FP_CLS_NORMAL;						\
-+    break;								\
-+									\
-+  case 0:								\
-+    if (_FP_FRAC_ZEROP_##wc(X))						\
-+      X##_c = FP_CLS_ZERO;						\
-+    else								\
-+      {									\
-+	/* a denormalized number */					\
-+	_FP_I_TYPE _shift;						\
-+	_FP_FRAC_CLZ_##wc(_shift, X);					\
-+	_shift -= _FP_FRACXBITS_##fs;					\
-+	_FP_FRAC_SLL_##wc(X, (_shift+_FP_WORKBITS));			\
-+	X##_e -= _FP_EXPBIAS_##fs - 1 + _shift;				\
-+	X##_c = FP_CLS_NORMAL;						\
-+	FP_SET_EXCEPTION(FP_EX_DENORM);					\
-+      }									\
-+    break;								\
-+									\
-+  case _FP_EXPMAX_##fs:							\
-+    if (_FP_FRAC_ZEROP_##wc(X))						\
-+      X##_c = FP_CLS_INF;						\
-+    else								\
-+      {									\
-+	X##_c = FP_CLS_NAN;						\
-+	/* Check for signaling NaN */					\
-+	if (!(_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs))		\
-+	  FP_SET_EXCEPTION(FP_EX_INVALID);				\
-+      }									\
-+    break;								\
-+  }									\
-+} while (0)
-+
-+/* Finish unpacking an fp value in semi-raw mode: the mantissa is
-+   shifted by _FP_WORKBITS but the implicit MSB is not inserted and
-+   other classification is not done.  */
-+#define _FP_UNPACK_SEMIRAW(fs, wc, X)	_FP_FRAC_SLL_##wc(X, _FP_WORKBITS)
-+
-+/* A semi-raw value has overflowed to infinity.  Adjust the mantissa
-+   and exponent appropriately.  */
-+#define _FP_OVERFLOW_SEMIRAW(fs, wc, X)			\
-+do {							\
-+  if (FP_ROUNDMODE == FP_RND_NEAREST			\
-+      || (FP_ROUNDMODE == FP_RND_PINF && !X##_s)	\
-+      || (FP_ROUNDMODE == FP_RND_MINF && X##_s))	\
-+    {							\
-+      X##_e = _FP_EXPMAX_##fs;				\
-+      _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);		\
-+    }							\
-+  else							\
-+    {							\
-+      X##_e = _FP_EXPMAX_##fs - 1;			\
-+      _FP_FRAC_SET_##wc(X, _FP_MAXFRAC_##wc);		\
-+    }							\
-+    FP_SET_EXCEPTION(FP_EX_INEXACT);			\
-+    FP_SET_EXCEPTION(FP_EX_OVERFLOW);			\
-+} while (0)
-+
-+/* Check for a semi-raw value being a signaling NaN and raise the
-+   invalid exception if so.  */
-+#define _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X)			\
-+do {								\
-+  if (X##_e == _FP_EXPMAX_##fs					\
-+      && !_FP_FRAC_ZEROP_##wc(X)				\
-+      && !(_FP_FRAC_HIGH_##fs(X) & _FP_QNANBIT_SH_##fs))	\
-+    FP_SET_EXCEPTION(FP_EX_INVALID);				\
-+} while (0)
-+
-+/* Choose a NaN result from an operation on two semi-raw NaN
-+   values.  */
-+#define _FP_CHOOSENAN_SEMIRAW(fs, wc, R, X, Y, OP)			\
-+do {									\
-+  /* _FP_CHOOSENAN expects raw values, so shift as required.  */	\
-+  _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);					\
-+  _FP_FRAC_SRL_##wc(Y, _FP_WORKBITS);					\
-+  _FP_CHOOSENAN(fs, wc, R, X, Y, OP);					\
-+  _FP_FRAC_SLL_##wc(R, _FP_WORKBITS);					\
-+} while (0)
-+
-+/* Test whether a biased exponent is normal (not zero or maximum).  */
-+#define _FP_EXP_NORMAL(fs, wc, X)	(((X##_e + 1) & _FP_EXPMAX_##fs) > 1)
-+
-+/* Prepare to pack an fp value in semi-raw mode: the mantissa is
-+   rounded and shifted right, with the rounding possibly increasing
-+   the exponent (including changing a finite value to infinity).  */
-+#define _FP_PACK_SEMIRAW(fs, wc, X)				\
-+do {								\
-+  _FP_ROUND(wc, X);						\
-+  if (_FP_FRAC_HIGH_##fs(X)					\
-+      & (_FP_OVERFLOW_##fs >> 1))				\
-+    {								\
-+      _FP_FRAC_HIGH_##fs(X) &= ~(_FP_OVERFLOW_##fs >> 1);	\
-+      X##_e++;							\
-+      if (X##_e == _FP_EXPMAX_##fs)				\
-+	_FP_OVERFLOW_SEMIRAW(fs, wc, X);			\
-+    }								\
-+  _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);				\
-+  if (!_FP_EXP_NORMAL(fs, wc, X) && !_FP_FRAC_ZEROP_##wc(X))	\
-+    {								\
-+      if (X##_e == 0)						\
-+	FP_SET_EXCEPTION(FP_EX_UNDERFLOW);			\
-+      else							\
-+	{							\
-+	  if (!_FP_KEEPNANFRACP)				\
-+	    {							\
-+	      _FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs);		\
-+	      X##_s = _FP_NANSIGN_##fs;				\
-+	    }							\
-+	  else							\
-+	    _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_QNANBIT_##fs;	\
-+	}							\
-+    }								\
-+} while (0)
-+
-+/*
-+ * Before packing the bits back into the native fp result, take care
-+ * of such mundane things as rounding and overflow.  Also, for some
-+ * kinds of fp values, the original parts may not have been fully
-+ * extracted -- but that is ok, we can regenerate them now.
-+ */
-+
-+#define _FP_PACK_CANONICAL(fs, wc, X)				\
-+do {								\
-+  switch (X##_c)						\
-+  {								\
-+  case FP_CLS_NORMAL:						\
-+    X##_e += _FP_EXPBIAS_##fs;					\
-+    if (X##_e > 0)						\
-+      {								\
-+	_FP_ROUND(wc, X);					\
-+	if (_FP_FRAC_OVERP_##wc(fs, X))				\
-+	  {							\
-+	    _FP_FRAC_CLEAR_OVERP_##wc(fs, X);			\
-+	    X##_e++;						\
-+	  }							\
-+	_FP_FRAC_SRL_##wc(X, _FP_WORKBITS);			\
-+	if (X##_e >= _FP_EXPMAX_##fs)				\
-+	  {							\
-+	    /* overflow */					\
-+	    switch (FP_ROUNDMODE)				\
-+	      {							\
-+	      case FP_RND_NEAREST:				\
-+		X##_c = FP_CLS_INF;				\
-+		break;						\
-+	      case FP_RND_PINF:					\
-+		if (!X##_s) X##_c = FP_CLS_INF;			\
-+		break;						\
-+	      case FP_RND_MINF:					\
-+		if (X##_s) X##_c = FP_CLS_INF;			\
-+		break;						\
-+	      }							\
-+	    if (X##_c == FP_CLS_INF)				\
-+	      {							\
-+		/* Overflow to infinity */			\
-+		X##_e = _FP_EXPMAX_##fs;			\
-+		_FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);	\
-+	      }							\
-+	    else						\
-+	      {							\
-+		/* Overflow to maximum normal */		\
-+		X##_e = _FP_EXPMAX_##fs - 1;			\
-+		_FP_FRAC_SET_##wc(X, _FP_MAXFRAC_##wc);		\
-+	      }							\
-+	    FP_SET_EXCEPTION(FP_EX_OVERFLOW);			\
-+            FP_SET_EXCEPTION(FP_EX_INEXACT);			\
-+	  }							\
-+      }								\
-+    else							\
-+      {								\
-+	/* we've got a denormalized number */			\
-+	X##_e = -X##_e + 1;					\
-+	if (X##_e <= _FP_WFRACBITS_##fs)			\
-+	  {							\
-+	    _FP_FRAC_SRS_##wc(X, X##_e, _FP_WFRACBITS_##fs);	\
-+	    _FP_ROUND(wc, X);					\
-+	    if (_FP_FRAC_HIGH_##fs(X)				\
-+		& (_FP_OVERFLOW_##fs >> 1))			\
-+	      {							\
-+	        X##_e = 1;					\
-+	        _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);	\
-+	      }							\
-+	    else						\
-+	      {							\
-+		X##_e = 0;					\
-+		_FP_FRAC_SRL_##wc(X, _FP_WORKBITS);		\
-+		FP_SET_EXCEPTION(FP_EX_UNDERFLOW);		\
-+	      }							\
-+	  }							\
-+	else							\
-+	  {							\
-+	    /* underflow to zero */				\
-+	    X##_e = 0;						\
-+	    if (!_FP_FRAC_ZEROP_##wc(X))			\
-+	      {							\
-+	        _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc);		\
-+	        _FP_ROUND(wc, X);				\
-+	        _FP_FRAC_LOW_##wc(X) >>= (_FP_WORKBITS);	\
-+	      }							\
-+	    FP_SET_EXCEPTION(FP_EX_UNDERFLOW);			\
-+	  }							\
-+      }								\
-+    break;							\
-+								\
-+  case FP_CLS_ZERO:						\
-+    X##_e = 0;							\
-+    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			\
-+    break;							\
-+								\
-+  case FP_CLS_INF:						\
-+    X##_e = _FP_EXPMAX_##fs;					\
-+    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			\
-+    break;							\
-+								\
-+  case FP_CLS_NAN:						\
-+    X##_e = _FP_EXPMAX_##fs;					\
-+    if (!_FP_KEEPNANFRACP)					\
-+      {								\
-+	_FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs);			\
-+	X##_s = _FP_NANSIGN_##fs;				\
-+      }								\
-+    else							\
-+      _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_QNANBIT_##fs;		\
-+    break;							\
-+  }								\
-+} while (0)
-+
-+/* This one accepts raw argument and not cooked,  returns
-+ * 1 if X is a signaling NaN.
-+ */
-+#define _FP_ISSIGNAN(fs, wc, X)					\
-+({								\
-+  int __ret = 0;						\
-+  if (X##_e == _FP_EXPMAX_##fs)					\
-+    {								\
-+      if (!_FP_FRAC_ZEROP_##wc(X)				\
-+	  && !(_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs))	\
-+	__ret = 1;						\
-+    }								\
-+  __ret;							\
-+})
-+
-+
-+
-+
-+
-+/* Addition on semi-raw values.  */
-+#define _FP_ADD_INTERNAL(fs, wc, R, X, Y, OP)				 \
-+do {									 \
-+  if (X##_s == Y##_s)							 \
-+    {									 \
-+      /* Addition.  */							 \
-+      R##_s = X##_s;							 \
-+      int ediff = X##_e - Y##_e;					 \
-+      if (ediff > 0)							 \
-+	{								 \
-+	  R##_e = X##_e;						 \
-+	  if (Y##_e == 0)						 \
-+	    {								 \
-+	      /* Y is zero or denormalized.  */				 \
-+	      if (_FP_FRAC_ZEROP_##wc(Y))				 \
-+		{							 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);			 \
-+		  _FP_FRAC_COPY_##wc(R, X);				 \
-+		  goto add_done;					 \
-+		}							 \
-+	      else							 \
-+		{							 \
-+		  FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		  ediff--;						 \
-+		  if (ediff == 0)					 \
-+		    {							 \
-+		      _FP_FRAC_ADD_##wc(R, X, Y);			 \
-+		      goto add3;					 \
-+		    }							 \
-+		  if (X##_e == _FP_EXPMAX_##fs)				 \
-+		    {							 \
-+		      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);		 \
-+		      _FP_FRAC_COPY_##wc(R, X);				 \
-+		      goto add_done;					 \
-+		    }							 \
-+		  goto add1;						 \
-+		}							 \
-+	    }								 \
-+	  else if (X##_e == _FP_EXPMAX_##fs)				 \
-+	    {								 \
-+	      /* X is NaN or Inf, Y is normal.  */			 \
-+	      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);			 \
-+	      _FP_FRAC_COPY_##wc(R, X);					 \
-+	      goto add_done;						 \
-+	    }								 \
-+									 \
-+	  /* Insert implicit MSB of Y.  */				 \
-+	  _FP_FRAC_HIGH_##fs(Y) |= _FP_IMPLBIT_SH_##fs;			 \
-+									 \
-+	add1:								 \
-+	  /* Shift the mantissa of Y to the right EDIFF steps;		 \
-+	     remember to account later for the implicit MSB of X.  */	 \
-+	  if (ediff <= _FP_WFRACBITS_##fs)				 \
-+	    _FP_FRAC_SRS_##wc(Y, ediff, _FP_WFRACBITS_##fs);		 \
-+	  else if (!_FP_FRAC_ZEROP_##wc(Y))				 \
-+	    _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc);			 \
-+	  _FP_FRAC_ADD_##wc(R, X, Y);					 \
-+	}								 \
-+      else if (ediff < 0)						 \
-+	{								 \
-+	  ediff = -ediff;						 \
-+	  R##_e = Y##_e;						 \
-+	  if (X##_e == 0)						 \
-+	    {								 \
-+	      /* X is zero or denormalized.  */				 \
-+	      if (_FP_FRAC_ZEROP_##wc(X))				 \
-+		{							 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);			 \
-+		  _FP_FRAC_COPY_##wc(R, Y);				 \
-+		  goto add_done;					 \
-+		}							 \
-+	      else							 \
-+		{							 \
-+		  FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		  ediff--;						 \
-+		  if (ediff == 0)					 \
-+		    {							 \
-+		      _FP_FRAC_ADD_##wc(R, Y, X);			 \
-+		      goto add3;					 \
-+		    }							 \
-+		  if (Y##_e == _FP_EXPMAX_##fs)				 \
-+		    {							 \
-+		      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);		 \
-+		      _FP_FRAC_COPY_##wc(R, Y);				 \
-+		      goto add_done;					 \
-+		    }							 \
-+		  goto add2;						 \
-+		}							 \
-+	    }								 \
-+	  else if (Y##_e == _FP_EXPMAX_##fs)				 \
-+	    {								 \
-+	      /* Y is NaN or Inf, X is normal.  */			 \
-+	      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);			 \
-+	      _FP_FRAC_COPY_##wc(R, Y);					 \
-+	      goto add_done;						 \
-+	    }								 \
-+									 \
-+	  /* Insert implicit MSB of X.  */				 \
-+	  _FP_FRAC_HIGH_##fs(X) |= _FP_IMPLBIT_SH_##fs;			 \
-+									 \
-+	add2:								 \
-+	  /* Shift the mantissa of X to the right EDIFF steps;		 \
-+	     remember to account later for the implicit MSB of Y.  */	 \
-+	  if (ediff <= _FP_WFRACBITS_##fs)				 \
-+	    _FP_FRAC_SRS_##wc(X, ediff, _FP_WFRACBITS_##fs);		 \
-+	  else if (!_FP_FRAC_ZEROP_##wc(X))				 \
-+	    _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc);			 \
-+	  _FP_FRAC_ADD_##wc(R, Y, X);					 \
-+	}								 \
-+      else								 \
-+	{								 \
-+	  /* ediff == 0.  */						 \
-+	  if (!_FP_EXP_NORMAL(fs, wc, X))				 \
-+	    {								 \
-+	      if (X##_e == 0)						 \
-+		{							 \
-+		  /* X and Y are zero or denormalized.  */		 \
-+		  R##_e = 0;						 \
-+		  if (_FP_FRAC_ZEROP_##wc(X))				 \
-+		    {							 \
-+		      if (!_FP_FRAC_ZEROP_##wc(Y))			 \
-+			FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		      _FP_FRAC_COPY_##wc(R, Y);				 \
-+		      goto add_done;					 \
-+		    }							 \
-+		  else if (_FP_FRAC_ZEROP_##wc(Y))			 \
-+		    {							 \
-+		      FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		      _FP_FRAC_COPY_##wc(R, X);				 \
-+		      goto add_done;					 \
-+		    }							 \
-+		  else							 \
-+		    {							 \
-+		      FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		      _FP_FRAC_ADD_##wc(R, X, Y);			 \
-+		      if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs)	 \
-+			{						 \
-+			  /* Normalized result.  */			 \
-+			  _FP_FRAC_HIGH_##fs(R)				 \
-+			    &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs;	 \
-+			  R##_e = 1;					 \
-+			}						 \
-+		      goto add_done;					 \
-+		    }							 \
-+		}							 \
-+	      else							 \
-+		{							 \
-+		  /* X and Y are NaN or Inf.  */			 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);			 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);			 \
-+		  R##_e = _FP_EXPMAX_##fs;				 \
-+		  if (_FP_FRAC_ZEROP_##wc(X))				 \
-+		    _FP_FRAC_COPY_##wc(R, Y);				 \
-+		  else if (_FP_FRAC_ZEROP_##wc(Y))			 \
-+		    _FP_FRAC_COPY_##wc(R, X);				 \
-+		  else							 \
-+		    _FP_CHOOSENAN_SEMIRAW(fs, wc, R, X, Y, OP);		 \
-+		  goto add_done;					 \
-+		}							 \
-+	    }								 \
-+	  /* The exponents of X and Y, both normal, are equal.  The	 \
-+	     implicit MSBs will always add to increase the		 \
-+	     exponent.  */						 \
-+	  _FP_FRAC_ADD_##wc(R, X, Y);					 \
-+	  R##_e = X##_e + 1;						 \
-+	  _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);			 \
-+	  if (R##_e == _FP_EXPMAX_##fs)					 \
-+	    /* Overflow to infinity (depending on rounding mode).  */	 \
-+	    _FP_OVERFLOW_SEMIRAW(fs, wc, R);				 \
-+	  goto add_done;						 \
-+	}								 \
-+    add3:								 \
-+      if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs)			 \
-+	{								 \
-+	  /* Overflow.  */						 \
-+	  _FP_FRAC_HIGH_##fs(R) &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs;	 \
-+	  R##_e++;							 \
-+	  _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);			 \
-+	  if (R##_e == _FP_EXPMAX_##fs)					 \
-+	    /* Overflow to infinity (depending on rounding mode).  */	 \
-+	    _FP_OVERFLOW_SEMIRAW(fs, wc, R);				 \
-+	}								 \
-+    add_done: ;								 \
-+    }									 \
-+  else									 \
-+    {									 \
-+      /* Subtraction.  */						 \
-+      int ediff = X##_e - Y##_e;					 \
-+      if (ediff > 0)							 \
-+	{								 \
-+	  R##_e = X##_e;						 \
-+	  R##_s = X##_s;						 \
-+	  if (Y##_e == 0)						 \
-+	    {								 \
-+	      /* Y is zero or denormalized.  */				 \
-+	      if (_FP_FRAC_ZEROP_##wc(Y))				 \
-+		{							 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);			 \
-+		  _FP_FRAC_COPY_##wc(R, X);				 \
-+		  goto sub_done;					 \
-+		}							 \
-+	      else							 \
-+		{							 \
-+		  FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		  ediff--;						 \
-+		  if (ediff == 0)					 \
-+		    {							 \
-+		      _FP_FRAC_SUB_##wc(R, X, Y);			 \
-+		      goto sub3;					 \
-+		    }							 \
-+		  if (X##_e == _FP_EXPMAX_##fs)				 \
-+		    {							 \
-+		      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);		 \
-+		      _FP_FRAC_COPY_##wc(R, X);				 \
-+		      goto sub_done;					 \
-+		    }							 \
-+		  goto sub1;						 \
-+		}							 \
-+	    }								 \
-+	  else if (X##_e == _FP_EXPMAX_##fs)				 \
-+	    {								 \
-+	      /* X is NaN or Inf, Y is normal.  */			 \
-+	      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);			 \
-+	      _FP_FRAC_COPY_##wc(R, X);					 \
-+	      goto sub_done;						 \
-+	    }								 \
-+									 \
-+	  /* Insert implicit MSB of Y.  */				 \
-+	  _FP_FRAC_HIGH_##fs(Y) |= _FP_IMPLBIT_SH_##fs;			 \
-+									 \
-+	sub1:								 \
-+	  /* Shift the mantissa of Y to the right EDIFF steps;		 \
-+	     remember to account later for the implicit MSB of X.  */	 \
-+	  if (ediff <= _FP_WFRACBITS_##fs)				 \
-+	    _FP_FRAC_SRS_##wc(Y, ediff, _FP_WFRACBITS_##fs);		 \
-+	  else if (!_FP_FRAC_ZEROP_##wc(Y))				 \
-+	    _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc);			 \
-+	  _FP_FRAC_SUB_##wc(R, X, Y);					 \
-+	}								 \
-+      else if (ediff < 0)						 \
-+	{								 \
-+	  ediff = -ediff;						 \
-+	  R##_e = Y##_e;						 \
-+	  R##_s = Y##_s;						 \
-+	  if (X##_e == 0)						 \
-+	    {								 \
-+	      /* X is zero or denormalized.  */				 \
-+	      if (_FP_FRAC_ZEROP_##wc(X))				 \
-+		{							 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);			 \
-+		  _FP_FRAC_COPY_##wc(R, Y);				 \
-+		  goto sub_done;					 \
-+		}							 \
-+	      else							 \
-+		{							 \
-+		  FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		  ediff--;						 \
-+		  if (ediff == 0)					 \
-+		    {							 \
-+		      _FP_FRAC_SUB_##wc(R, Y, X);			 \
-+		      goto sub3;					 \
-+		    }							 \
-+		  if (Y##_e == _FP_EXPMAX_##fs)				 \
-+		    {							 \
-+		      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);		 \
-+		      _FP_FRAC_COPY_##wc(R, Y);				 \
-+		      goto sub_done;					 \
-+		    }							 \
-+		  goto sub2;						 \
-+		}							 \
-+	    }								 \
-+	  else if (Y##_e == _FP_EXPMAX_##fs)				 \
-+	    {								 \
-+	      /* Y is NaN or Inf, X is normal.  */			 \
-+	      _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);			 \
-+	      _FP_FRAC_COPY_##wc(R, Y);					 \
-+	      goto sub_done;						 \
-+	    }								 \
-+									 \
-+	  /* Insert implicit MSB of X.  */				 \
-+	  _FP_FRAC_HIGH_##fs(X) |= _FP_IMPLBIT_SH_##fs;			 \
-+									 \
-+	sub2:								 \
-+	  /* Shift the mantissa of X to the right EDIFF steps;		 \
-+	     remember to account later for the implicit MSB of Y.  */	 \
-+	  if (ediff <= _FP_WFRACBITS_##fs)				 \
-+	    _FP_FRAC_SRS_##wc(X, ediff, _FP_WFRACBITS_##fs);		 \
-+	  else if (!_FP_FRAC_ZEROP_##wc(X))				 \
-+	    _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc);			 \
-+	  _FP_FRAC_SUB_##wc(R, Y, X);					 \
-+	}								 \
-+      else								 \
-+	{								 \
-+	  /* ediff == 0.  */						 \
-+	  if (!_FP_EXP_NORMAL(fs, wc, X))				 \
-+	    {								 \
-+	      if (X##_e == 0)						 \
-+		{							 \
-+		  /* X and Y are zero or denormalized.  */		 \
-+		  R##_e = 0;						 \
-+		  if (_FP_FRAC_ZEROP_##wc(X))				 \
-+		    {							 \
-+		      _FP_FRAC_COPY_##wc(R, Y);				 \
-+		      if (_FP_FRAC_ZEROP_##wc(Y))			 \
-+			R##_s = (FP_ROUNDMODE == FP_RND_MINF);		 \
-+		      else						 \
-+			{						 \
-+			  FP_SET_EXCEPTION(FP_EX_DENORM);		 \
-+			  R##_s = Y##_s;				 \
-+			}						 \
-+		      goto sub_done;					 \
-+		    }							 \
-+		  else if (_FP_FRAC_ZEROP_##wc(Y))			 \
-+		    {							 \
-+		      FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		      _FP_FRAC_COPY_##wc(R, X);				 \
-+		      R##_s = X##_s;					 \
-+		      goto sub_done;					 \
-+		    }							 \
-+		  else							 \
-+		    {							 \
-+		      FP_SET_EXCEPTION(FP_EX_DENORM);			 \
-+		      _FP_FRAC_SUB_##wc(R, X, Y);			 \
-+		      R##_s = X##_s;					 \
-+		      if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs)	 \
-+			{						 \
-+			  /* |X| < |Y|, negate result.  */		 \
-+			  _FP_FRAC_SUB_##wc(R, Y, X);			 \
-+			  R##_s = Y##_s;				 \
-+			}						 \
-+		      else if (_FP_FRAC_ZEROP_##wc(R))			 \
-+			R##_s = (FP_ROUNDMODE == FP_RND_MINF);		 \
-+		      goto sub_done;					 \
-+		    }							 \
-+		}							 \
-+	      else							 \
-+		{							 \
-+		  /* X and Y are NaN or Inf, of opposite signs.  */	 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X);			 \
-+		  _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y);			 \
-+		  R##_e = _FP_EXPMAX_##fs;				 \
-+		  if (_FP_FRAC_ZEROP_##wc(X))				 \
-+		    {							 \
-+		      if (_FP_FRAC_ZEROP_##wc(Y))			 \
-+			{						 \
-+			  /* Inf - Inf.  */				 \
-+			  R##_s = _FP_NANSIGN_##fs;			 \
-+			  _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);	 \
-+			  _FP_FRAC_SLL_##wc(R, _FP_WORKBITS);		 \
-+			  FP_SET_EXCEPTION(FP_EX_INVALID);		 \
-+			}						 \
-+		      else						 \
-+			{						 \
-+			  /* Inf - NaN.  */				 \
-+			  R##_s = Y##_s;				 \
-+			  _FP_FRAC_COPY_##wc(R, Y);			 \
-+			}						 \
-+		    }							 \
-+		  else							 \
-+		    {							 \
-+		      if (_FP_FRAC_ZEROP_##wc(Y))			 \
-+			{						 \
-+			  /* NaN - Inf.  */				 \
-+			  R##_s = X##_s;				 \
-+			  _FP_FRAC_COPY_##wc(R, X);			 \
-+			}						 \
-+		      else						 \
-+			{						 \
-+			  /* NaN - NaN.  */				 \
-+			  _FP_CHOOSENAN_SEMIRAW(fs, wc, R, X, Y, OP);	 \
-+			}						 \
-+		    }							 \
-+		  goto sub_done;					 \
-+		}							 \
-+	    }								 \
-+	  /* The exponents of X and Y, both normal, are equal.  The	 \
-+	     implicit MSBs cancel.  */					 \
-+	  R##_e = X##_e;						 \
-+	  _FP_FRAC_SUB_##wc(R, X, Y);					 \
-+	  R##_s = X##_s;						 \
-+	  if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs)		 \
-+	    {								 \
-+	      /* |X| < |Y|, negate result.  */				 \
-+	      _FP_FRAC_SUB_##wc(R, Y, X);				 \
-+	      R##_s = Y##_s;						 \
-+	    }								 \
-+	  else if (_FP_FRAC_ZEROP_##wc(R))				 \
-+	    {								 \
-+	      R##_e = 0;						 \
-+	      R##_s = (FP_ROUNDMODE == FP_RND_MINF);			 \
-+	      goto sub_done;						 \
-+	    }								 \
-+	  goto norm;							 \
-+	}								 \
-+    sub3:								 \
-+      if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs)			 \
-+	{								 \
-+	  int diff;							 \
-+	  /* Carry into most significant bit of larger one of X and Y,	 \
-+	     canceling it; renormalize.  */				 \
-+	  _FP_FRAC_HIGH_##fs(R) &= _FP_IMPLBIT_SH_##fs - 1;		 \
-+	norm:								 \
-+	  _FP_FRAC_CLZ_##wc(diff, R);					 \
-+	  diff -= _FP_WFRACXBITS_##fs;					 \
-+	  _FP_FRAC_SLL_##wc(R, diff);					 \
-+	  if (R##_e <= diff)						 \
-+	    {								 \
-+	      /* R is denormalized.  */					 \
-+	      diff = diff - R##_e + 1;					 \
-+	      _FP_FRAC_SRS_##wc(R, diff, _FP_WFRACBITS_##fs);		 \
-+	      R##_e = 0;						 \
-+	    }								 \
-+	  else								 \
-+	    {								 \
-+	      R##_e -= diff;						 \
-+	      _FP_FRAC_HIGH_##fs(R) &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs; \
-+	    }								 \
-+	}								 \
-+    sub_done: ;								 \
-+    }									 \
-+} while (0)
-+
-+#define _FP_ADD(fs, wc, R, X, Y) _FP_ADD_INTERNAL(fs, wc, R, X, Y, '+')
-+#define _FP_SUB(fs, wc, R, X, Y)					    \
-+  do {									    \
-+    if (!(Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y))) Y##_s ^= 1; \
-+    _FP_ADD_INTERNAL(fs, wc, R, X, Y, '-');				    \
-+  } while (0)
-+
-+
-+/*
-+ * Main negation routine.  FIXME -- when we care about setting exception
-+ * bits reliably, this will not do.  We should examine all of the fp classes.
-+ */
-+
-+#define _FP_NEG(fs, wc, R, X)		\
-+  do {					\
-+    _FP_FRAC_COPY_##wc(R, X);		\
-+    R##_c = X##_c;			\
-+    R##_e = X##_e;			\
-+    R##_s = 1 ^ X##_s;			\
-+  } while (0)
-+
-+
-+/*
-+ * Main multiplication routine.  The input values should be cooked.
-+ */
-+
-+#define _FP_MUL(fs, wc, R, X, Y)			\
-+do {							\
-+  R##_s = X##_s ^ Y##_s;				\
-+  switch (_FP_CLS_COMBINE(X##_c, Y##_c))		\
-+  {							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):	\
-+    R##_c = FP_CLS_NORMAL;				\
-+    R##_e = X##_e + Y##_e + 1;				\
-+							\
-+    _FP_MUL_MEAT_##fs(R,X,Y);				\
-+							\
-+    if (_FP_FRAC_OVERP_##wc(fs, R))			\
-+      _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);	\
-+    else						\
-+      R##_e--;						\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):		\
-+    _FP_CHOOSENAN(fs, wc, R, X, Y, '*');		\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):	\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):		\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):		\
-+    R##_s = X##_s;					\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):		\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):	\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):	\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):	\
-+    _FP_FRAC_COPY_##wc(R, X);				\
-+    R##_c = X##_c;					\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):	\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):		\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):		\
-+    R##_s = Y##_s;					\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):	\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):	\
-+    _FP_FRAC_COPY_##wc(R, Y);				\
-+    R##_c = Y##_c;					\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):		\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):		\
-+    R##_s = _FP_NANSIGN_##fs;				\
-+    R##_c = FP_CLS_NAN;					\
-+    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);		\
-+    FP_SET_EXCEPTION(FP_EX_INVALID);			\
-+    break;						\
-+							\
-+  default:						\
-+    abort();						\
-+  }							\
-+} while (0)
-+
-+
-+/*
-+ * Main division routine.  The input values should be cooked.
-+ */
-+
-+#define _FP_DIV(fs, wc, R, X, Y)			\
-+do {							\
-+  R##_s = X##_s ^ Y##_s;				\
-+  switch (_FP_CLS_COMBINE(X##_c, Y##_c))		\
-+  {							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):	\
-+    R##_c = FP_CLS_NORMAL;				\
-+    R##_e = X##_e - Y##_e;				\
-+							\
-+    _FP_DIV_MEAT_##fs(R,X,Y);				\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):		\
-+    _FP_CHOOSENAN(fs, wc, R, X, Y, '/');		\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):	\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):		\
-+  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):		\
-+    R##_s = X##_s;					\
-+    _FP_FRAC_COPY_##wc(R, X);				\
-+    R##_c = X##_c;					\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):	\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):		\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):		\
-+    R##_s = Y##_s;					\
-+    _FP_FRAC_COPY_##wc(R, Y);				\
-+    R##_c = Y##_c;					\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):	\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):		\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):	\
-+    R##_c = FP_CLS_ZERO;				\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):	\
-+    FP_SET_EXCEPTION(FP_EX_DIVZERO);			\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):		\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):	\
-+    R##_c = FP_CLS_INF;					\
-+    break;						\
-+							\
-+  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):		\
-+  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):	\
-+    R##_s = _FP_NANSIGN_##fs;				\
-+    R##_c = FP_CLS_NAN;					\
-+    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);		\
-+    FP_SET_EXCEPTION(FP_EX_INVALID);			\
-+    break;						\
-+							\
-+  default:						\
-+    abort();						\
-+  }							\
-+} while (0)
-+
-+
-+/*
-+ * Main differential comparison routine.  The inputs should be raw not
-+ * cooked.  The return is -1,0,1 for normal values, 2 otherwise.
-+ */
-+
-+#define _FP_CMP(fs, wc, ret, X, Y, un)					\
-+  do {									\
-+    /* NANs are unordered */						\
-+    if ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))		\
-+	|| (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)))	\
-+      {									\
-+	ret = un;							\
-+      }									\
-+    else								\
-+      {									\
-+	int __is_zero_x;						\
-+	int __is_zero_y;						\
-+									\
-+	__is_zero_x = (!X##_e && _FP_FRAC_ZEROP_##wc(X)) ? 1 : 0;	\
-+	__is_zero_y = (!Y##_e && _FP_FRAC_ZEROP_##wc(Y)) ? 1 : 0;	\
-+									\
-+	if (__is_zero_x && __is_zero_y)					\
-+		ret = 0;						\
-+	else if (__is_zero_x)						\
-+		ret = Y##_s ? 1 : -1;					\
-+	else if (__is_zero_y)						\
-+		ret = X##_s ? -1 : 1;					\
-+	else if (X##_s != Y##_s)					\
-+	  ret = X##_s ? -1 : 1;						\
-+	else if (X##_e > Y##_e)						\
-+	  ret = X##_s ? -1 : 1;						\
-+	else if (X##_e < Y##_e)						\
-+	  ret = X##_s ? 1 : -1;						\
-+	else if (_FP_FRAC_GT_##wc(X, Y))				\
-+	  ret = X##_s ? -1 : 1;						\
-+	else if (_FP_FRAC_GT_##wc(Y, X))				\
-+	  ret = X##_s ? 1 : -1;						\
-+	else								\
-+	  ret = 0;							\
-+      }									\
-+  } while (0)
-+
-+
-+/* Simplification for strict equality.  */
-+
-+#define _FP_CMP_EQ(fs, wc, ret, X, Y)					    \
-+  do {									    \
-+    /* NANs are unordered */						    \
-+    if ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))		    \
-+	|| (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)))	    \
-+      {									    \
-+	ret = 1;							    \
-+      }									    \
-+    else								    \
-+      {									    \
-+	ret = !(X##_e == Y##_e						    \
-+		&& _FP_FRAC_EQ_##wc(X, Y)				    \
-+		&& (X##_s == Y##_s || (!X##_e && _FP_FRAC_ZEROP_##wc(X)))); \
-+      }									    \
-+  } while (0)
-+
-+/* Version to test unordered.  */
-+
-+#define _FP_CMP_UNORD(fs, wc, ret, X, Y)				\
-+  do {									\
-+    ret = ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))	\
-+	   || (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)));	\
-+  } while (0)
-+
-+/*
-+ * Main square root routine.  The input value should be cooked.
-+ */
-+
-+#define _FP_SQRT(fs, wc, R, X)						\
-+do {									\
-+    _FP_FRAC_DECL_##wc(T); _FP_FRAC_DECL_##wc(S);			\
-+    _FP_W_TYPE q;							\
-+    switch (X##_c)							\
-+    {									\
-+    case FP_CLS_NAN:							\
-+	_FP_FRAC_COPY_##wc(R, X);					\
-+	R##_s = X##_s;							\
-+    	R##_c = FP_CLS_NAN;						\
-+    	break;								\
-+    case FP_CLS_INF:							\
-+    	if (X##_s)							\
-+    	  {								\
-+    	    R##_s = _FP_NANSIGN_##fs;					\
-+	    R##_c = FP_CLS_NAN; /* NAN */				\
-+	    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);			\
-+	    FP_SET_EXCEPTION(FP_EX_INVALID);				\
-+    	  }								\
-+    	else								\
-+    	  {								\
-+    	    R##_s = 0;							\
-+    	    R##_c = FP_CLS_INF; /* sqrt(+inf) = +inf */			\
-+    	  }								\
-+    	break;								\
-+    case FP_CLS_ZERO:							\
-+	R##_s = X##_s;							\
-+	R##_c = FP_CLS_ZERO; /* sqrt(+-0) = +-0 */			\
-+	break;								\
-+    case FP_CLS_NORMAL:							\
-+    	R##_s = 0;							\
-+        if (X##_s)							\
-+          {								\
-+	    R##_c = FP_CLS_NAN; /* sNAN */				\
-+	    R##_s = _FP_NANSIGN_##fs;					\
-+	    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);			\
-+	    FP_SET_EXCEPTION(FP_EX_INVALID);				\
-+	    break;							\
-+          }								\
-+    	R##_c = FP_CLS_NORMAL;						\
-+        if (X##_e & 1)							\
-+          _FP_FRAC_SLL_##wc(X, 1);					\
-+        R##_e = X##_e >> 1;						\
-+        _FP_FRAC_SET_##wc(S, _FP_ZEROFRAC_##wc);			\
-+        _FP_FRAC_SET_##wc(R, _FP_ZEROFRAC_##wc);			\
-+        q = _FP_OVERFLOW_##fs >> 1;					\
-+        _FP_SQRT_MEAT_##wc(R, S, T, X, q);				\
-+    }									\
-+  } while (0)
-+
-+/*
-+ * Convert from FP to integer.  Input is raw.
-+ */
-+
-+/* RSIGNED can have following values:
-+ * 0:  the number is required to be 0..(2^rsize)-1, if not, NV is set plus
-+ *     the result is either 0 or (2^rsize)-1 depending on the sign in such
-+ *     case.
-+ * 1:  the number is required to be -(2^(rsize-1))..(2^(rsize-1))-1, if not,
-+ *     NV is set plus the result is either -(2^(rsize-1)) or (2^(rsize-1))-1
-+ *     depending on the sign in such case.
-+ * -1: the number is required to be -(2^(rsize-1))..(2^rsize)-1, if not, NV is
-+ *     set plus the result is either -(2^(rsize-1)) or (2^(rsize-1))-1
-+ *     depending on the sign in such case.
-+ */
-+#define _FP_TO_INT(fs, wc, r, X, rsize, rsigned)			\
-+do {									\
-+  if (X##_e < _FP_EXPBIAS_##fs)						\
-+    {									\
-+      r = 0;								\
-+      if (X##_e == 0)							\
-+	{								\
-+	  if (!_FP_FRAC_ZEROP_##wc(X))					\
-+	    {								\
-+	      FP_SET_EXCEPTION(FP_EX_INEXACT);				\
-+	      FP_SET_EXCEPTION(FP_EX_DENORM);				\
-+	    }								\
-+	}								\
-+      else								\
-+	FP_SET_EXCEPTION(FP_EX_INEXACT);				\
-+    }									\
-+  else if (X##_e >= _FP_EXPBIAS_##fs + rsize - (rsigned > 0 || X##_s)	\
-+	   || (!rsigned && X##_s))					\
-+    {									\
-+      /* Overflow or converting to the most negative integer.  */	\
-+      if (rsigned)							\
-+	{								\
-+	  r = 1;							\
-+	  r <<= rsize - 1;						\
-+	  r -= 1 - X##_s;						\
-+	} else {							\
-+	  r = 0;							\
-+	  if (X##_s)							\
-+	    r = ~r;							\
-+	}								\
-+									\
-+      if (rsigned && X##_s && X##_e == _FP_EXPBIAS_##fs + rsize - 1)	\
-+	{								\
-+	  /* Possibly converting to most negative integer; check the	\
-+	     mantissa.  */						\
-+	  int inexact = 0;						\
-+	  (void)((_FP_FRACBITS_##fs > rsize)				\
-+		 ? ({ _FP_FRAC_SRST_##wc(X, inexact,			\
-+					 _FP_FRACBITS_##fs - rsize,	\
-+					 _FP_FRACBITS_##fs); 0; })	\
-+		 : 0);							\
-+	  if (!_FP_FRAC_ZEROP_##wc(X))					\
-+	    FP_SET_EXCEPTION(FP_EX_INVALID);				\
-+	  else if (inexact)						\
-+	    FP_SET_EXCEPTION(FP_EX_INEXACT);				\
-+	}								\
-+      else								\
-+	FP_SET_EXCEPTION(FP_EX_INVALID);				\
-+    }									\
-+  else									\
-+    {									\
-+      _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_IMPLBIT_##fs;			\
-+      if (X##_e >= _FP_EXPBIAS_##fs + _FP_FRACBITS_##fs - 1)		\
-+	{								\
-+	  _FP_FRAC_ASSEMBLE_##wc(r, X, rsize);				\
-+	  r <<= X##_e - _FP_EXPBIAS_##fs - _FP_FRACBITS_##fs + 1;	\
-+	}								\
-+      else								\
-+	{								\
-+	  int inexact;							\
-+	  _FP_FRAC_SRST_##wc(X, inexact,				\
-+			    (_FP_FRACBITS_##fs + _FP_EXPBIAS_##fs - 1	\
-+			     - X##_e),					\
-+			    _FP_FRACBITS_##fs);				\
-+	  if (inexact)							\
-+	    FP_SET_EXCEPTION(FP_EX_INEXACT);				\
-+	  _FP_FRAC_ASSEMBLE_##wc(r, X, rsize);				\
-+	}								\
-+      if (rsigned && X##_s)						\
-+	r = -r;								\
-+    }									\
-+} while (0)
-+
-+/* Convert integer to fp.  Output is raw.  RTYPE is unsigned even if
-+   input is signed.  */
-+#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype)			     \
-+  do {									     \
-+    if (r)								     \
-+      {									     \
-+	rtype ur_;							     \
-+									     \
-+	if ((X##_s = (r < 0)))						     \
-+	  r = -(rtype)r;						     \
-+									     \
-+	ur_ = (rtype) r;						     \
-+	(void)((rsize <= _FP_W_TYPE_SIZE)				     \
-+	       ? ({							     \
-+		    int lz_;						     \
-+		    __FP_CLZ(lz_, (_FP_W_TYPE)ur_);			     \
-+		    X##_e = _FP_EXPBIAS_##fs + _FP_W_TYPE_SIZE - 1 - lz_;    \
-+		  })							     \
-+	       : ((rsize <= 2 * _FP_W_TYPE_SIZE)			     \
-+		  ? ({							     \
-+		       int lz_;						     \
-+		       __FP_CLZ_2(lz_, (_FP_W_TYPE)(ur_ >> _FP_W_TYPE_SIZE), \
-+				  (_FP_W_TYPE)ur_);			     \
-+		       X##_e = (_FP_EXPBIAS_##fs + 2 * _FP_W_TYPE_SIZE - 1   \
-+				- lz_);					     \
-+		     })							     \
-+		  : (abort(), 0)));					     \
-+									     \
-+	if (rsize - 1 + _FP_EXPBIAS_##fs >= _FP_EXPMAX_##fs		     \
-+	    && X##_e >= _FP_EXPMAX_##fs)				     \
-+	  {								     \
-+	    /* Exponent too big; overflow to infinity.  (May also	     \
-+	       happen after rounding below.)  */			     \
-+	    _FP_OVERFLOW_SEMIRAW(fs, wc, X);				     \
-+	    goto pack_semiraw;						     \
-+	  }								     \
-+									     \
-+	if (rsize <= _FP_FRACBITS_##fs					     \
-+	    || X##_e < _FP_EXPBIAS_##fs + _FP_FRACBITS_##fs)		     \
-+	  {								     \
-+	    /* Exactly representable; shift left.  */			     \
-+	    _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize);			     \
-+	    _FP_FRAC_SLL_##wc(X, (_FP_EXPBIAS_##fs			     \
-+				  + _FP_FRACBITS_##fs - 1 - X##_e));	     \
-+	  }								     \
-+	else								     \
-+	  {								     \
-+	    /* More bits in integer than in floating type; need to	     \
-+	       round.  */						     \
-+	    if (_FP_EXPBIAS_##fs + _FP_WFRACBITS_##fs - 1 < X##_e)	     \
-+	      ur_ = ((ur_ >> (X##_e - _FP_EXPBIAS_##fs			     \
-+			      - _FP_WFRACBITS_##fs + 1))		     \
-+		     | ((ur_ << (rsize - (X##_e - _FP_EXPBIAS_##fs	     \
-+					  - _FP_WFRACBITS_##fs + 1)))	     \
-+			!= 0));						     \
-+	    _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize);			     \
-+	    if ((_FP_EXPBIAS_##fs + _FP_WFRACBITS_##fs - 1 - X##_e) > 0)     \
-+	      _FP_FRAC_SLL_##wc(X, (_FP_EXPBIAS_##fs			     \
-+				    + _FP_WFRACBITS_##fs - 1 - X##_e));	     \
-+	    _FP_FRAC_HIGH_##fs(X) &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs;	     \
-+	  pack_semiraw:							     \
-+	    _FP_PACK_SEMIRAW(fs, wc, X);				     \
-+	  }								     \
-+      }									     \
-+    else								     \
-+      {									     \
-+	X##_s = 0;							     \
-+	X##_e = 0;							     \
-+	_FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);			     \
-+      }									     \
-+  } while (0)
-+
-+
-+/* Extend from a narrower floating-point format to a wider one.  Input
-+   and output are raw.  */
-+#define FP_EXTEND(dfs,sfs,dwc,swc,D,S)					 \
-+do {									 \
-+  if (_FP_FRACBITS_##dfs < _FP_FRACBITS_##sfs				 \
-+      || (_FP_EXPMAX_##dfs - _FP_EXPBIAS_##dfs				 \
-+	  < _FP_EXPMAX_##sfs - _FP_EXPBIAS_##sfs)			 \
-+      || (_FP_EXPBIAS_##dfs < _FP_EXPBIAS_##sfs + _FP_FRACBITS_##sfs - 1 \
-+	  && _FP_EXPBIAS_##dfs != _FP_EXPBIAS_##sfs))			 \
-+    abort();								 \
-+  D##_s = S##_s;							 \
-+  _FP_FRAC_COPY_##dwc##_##swc(D, S);					 \
-+  if (_FP_EXP_NORMAL(sfs, swc, S))					 \
-+    {									 \
-+      D##_e = S##_e + _FP_EXPBIAS_##dfs - _FP_EXPBIAS_##sfs;		 \
-+      _FP_FRAC_SLL_##dwc(D, (_FP_FRACBITS_##dfs - _FP_FRACBITS_##sfs));	 \
-+    }									 \
-+  else									 \
-+    {									 \
-+      if (S##_e == 0)							 \
-+	{								 \
-+	  if (_FP_FRAC_ZEROP_##swc(S))					 \
-+	    D##_e = 0;							 \
-+	  else if (_FP_EXPBIAS_##dfs					 \
-+		   < _FP_EXPBIAS_##sfs + _FP_FRACBITS_##sfs - 1)	 \
-+	    {								 \
-+	      FP_SET_EXCEPTION(FP_EX_DENORM);				 \
-+	      _FP_FRAC_SLL_##dwc(D, (_FP_FRACBITS_##dfs			 \
-+				     - _FP_FRACBITS_##sfs));		 \
-+	      D##_e = 0;						 \
-+	    }								 \
-+	  else								 \
-+	    {								 \
-+	      int _lz;							 \
-+	      FP_SET_EXCEPTION(FP_EX_DENORM);				 \
-+	      _FP_FRAC_CLZ_##swc(_lz, S);				 \
-+	      _FP_FRAC_SLL_##dwc(D,					 \
-+				 _lz + _FP_FRACBITS_##dfs		 \
-+				 - _FP_FRACTBITS_##sfs);		 \
-+	      D##_e = (_FP_EXPBIAS_##dfs - _FP_EXPBIAS_##sfs + 1	 \
-+		       + _FP_FRACXBITS_##sfs - _lz);			 \
-+	    }								 \
-+	}								 \
-+      else								 \
-+	{								 \
-+	  D##_e = _FP_EXPMAX_##dfs;					 \
-+	  if (!_FP_FRAC_ZEROP_##swc(S))					 \
-+	    {								 \
-+	      if (!(_FP_FRAC_HIGH_RAW_##sfs(S) & _FP_QNANBIT_##sfs))	 \
-+		FP_SET_EXCEPTION(FP_EX_INVALID);			 \
-+	      _FP_FRAC_SLL_##dwc(D, (_FP_FRACBITS_##dfs			 \
-+				     - _FP_FRACBITS_##sfs));		 \
-+	    }								 \
-+	}								 \
-+    }									 \
-+} while (0)
-+
-+/* Truncate from a wider floating-point format to a narrower one.
-+   Input and output are semi-raw.  */
-+#define FP_TRUNC(dfs,sfs,dwc,swc,D,S)					     \
-+do {									     \
-+  if (_FP_FRACBITS_##sfs < _FP_FRACBITS_##dfs				     \
-+      || (_FP_EXPBIAS_##sfs < _FP_EXPBIAS_##dfs + _FP_FRACBITS_##dfs - 1     \
-+	  && _FP_EXPBIAS_##sfs != _FP_EXPBIAS_##dfs))			     \
-+    abort();								     \
-+  D##_s = S##_s;							     \
-+  if (_FP_EXP_NORMAL(sfs, swc, S))					     \
-+    {									     \
-+      D##_e = S##_e + _FP_EXPBIAS_##dfs - _FP_EXPBIAS_##sfs;		     \
-+      if (D##_e >= _FP_EXPMAX_##dfs)					     \
-+	_FP_OVERFLOW_SEMIRAW(dfs, dwc, D);				     \
-+      else								     \
-+	{								     \
-+	  if (D##_e <= 0)						     \
-+	    {								     \
-+	      if (D##_e < 1 - _FP_FRACBITS_##dfs)			     \
-+		{							     \
-+		  _FP_FRAC_SET_##swc(S, _FP_ZEROFRAC_##swc);		     \
-+		  _FP_FRAC_LOW_##swc(S) |= 1;				     \
-+		}							     \
-+	      else							     \
-+		{							     \
-+		  _FP_FRAC_HIGH_##sfs(S) |= _FP_IMPLBIT_SH_##sfs;	     \
-+		  _FP_FRAC_SRS_##swc(S, (_FP_WFRACBITS_##sfs		     \
-+					 - _FP_WFRACBITS_##dfs + 1 - D##_e), \
-+				     _FP_WFRACBITS_##sfs);		     \
-+		}							     \
-+	      D##_e = 0;						     \
-+	    }								     \
-+	  else								     \
-+	    _FP_FRAC_SRS_##swc(S, (_FP_WFRACBITS_##sfs			     \
-+				   - _FP_WFRACBITS_##dfs),		     \
-+			       _FP_WFRACBITS_##sfs);			     \
-+	  _FP_FRAC_COPY_##dwc##_##swc(D, S);				     \
-+	}								     \
-+    }									     \
-+  else									     \
-+    {									     \
-+      if (S##_e == 0)							     \
-+	{								     \
-+	  D##_e = 0;							     \
-+	  if (_FP_FRAC_ZEROP_##swc(S))					     \
-+	    _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc);			     \
-+	  else								     \
-+	    {								     \
-+	      FP_SET_EXCEPTION(FP_EX_DENORM);				     \
-+	      if (_FP_EXPBIAS_##sfs					     \
-+		  < _FP_EXPBIAS_##dfs + _FP_FRACBITS_##dfs - 1)		     \
-+		{							     \
-+		  _FP_FRAC_SRS_##swc(S, (_FP_WFRACBITS_##sfs		     \
-+					 - _FP_WFRACBITS_##dfs),	     \
-+				     _FP_WFRACBITS_##sfs);		     \
-+		  _FP_FRAC_COPY_##dwc##_##swc(D, S);			     \
-+		}							     \
-+	      else							     \
-+		{							     \
-+		  _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc);		     \
-+		  _FP_FRAC_LOW_##dwc(D) |= 1;				     \
-+		}							     \
-+	    }								     \
-+	}								     \
-+      else								     \
-+	{								     \
-+	  D##_e = _FP_EXPMAX_##dfs;					     \
-+	  if (_FP_FRAC_ZEROP_##swc(S))					     \
-+	    _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc);			     \
-+	  else								     \
-+	    {								     \
-+	      _FP_CHECK_SIGNAN_SEMIRAW(sfs, swc, S);			     \
-+	      _FP_FRAC_SRL_##swc(S, (_FP_WFRACBITS_##sfs		     \
-+				     - _FP_WFRACBITS_##dfs));		     \
-+	      _FP_FRAC_COPY_##dwc##_##swc(D, S);			     \
-+	      /* Semi-raw NaN must have all workbits cleared.  */	     \
-+	      _FP_FRAC_LOW_##dwc(D)					     \
-+		&= ~(_FP_W_TYPE) ((1 << _FP_WORKBITS) - 1);		     \
-+	      _FP_FRAC_HIGH_##dfs(D) |= _FP_QNANBIT_SH_##dfs;		     \
-+	    }								     \
-+	}								     \
-+    }									     \
-+} while (0)
-+
-+/*
-+ * Helper primitives.
-+ */
-+
-+/* Count leading zeros in a word.  */
-+
-+#ifndef __FP_CLZ
-+/* GCC 3.4 and later provide the builtins for us.  */
-+#define __FP_CLZ(r, x)							      \
-+  do {									      \
-+    if (sizeof (_FP_W_TYPE) == sizeof (unsigned int))			      \
-+      r = __builtin_clz (x);						      \
-+    else if (sizeof (_FP_W_TYPE) == sizeof (unsigned long))		      \
-+      r = __builtin_clzl (x);						      \
-+    else if (sizeof (_FP_W_TYPE) == sizeof (unsigned long long))	      \
-+      r = __builtin_clzll (x);						      \
-+    else								      \
-+      abort ();								      \
-+  } while (0)
-+#endif /* ndef __FP_CLZ */
-+
-+#define _FP_DIV_HELP_imm(q, r, n, d)		\
-+  do {						\
-+    q = n / d, r = n % d;			\
-+  } while (0)
-+
-+
-+/* A restoring bit-by-bit division primitive.  */
-+
-+#define _FP_DIV_MEAT_N_loop(fs, wc, R, X, Y)				\
-+  do {									\
-+    int count = _FP_WFRACBITS_##fs;					\
-+    _FP_FRAC_DECL_##wc (u);						\
-+    _FP_FRAC_DECL_##wc (v);						\
-+    _FP_FRAC_COPY_##wc (u, X);						\
-+    _FP_FRAC_COPY_##wc (v, Y);						\
-+    _FP_FRAC_SET_##wc (R, _FP_ZEROFRAC_##wc);				\
-+    /* Normalize U and V.  */						\
-+    _FP_FRAC_SLL_##wc (u, _FP_WFRACXBITS_##fs);				\
-+    _FP_FRAC_SLL_##wc (v, _FP_WFRACXBITS_##fs);				\
-+    /* First round.  Since the operands are normalized, either the	\
-+       first or second bit will be set in the fraction.  Produce a	\
-+       normalized result by checking which and adjusting the loop	\
-+       count and exponent accordingly.  */				\
-+    if (_FP_FRAC_GE_1 (u, v))						\
-+      {									\
-+	_FP_FRAC_SUB_##wc (u, u, v);					\
-+	_FP_FRAC_LOW_##wc (R) |= 1;					\
-+	count--;							\
-+      }									\
-+    else								\
-+      R##_e--;								\
-+    /* Subsequent rounds.  */						\
-+    do {								\
-+      int msb = (_FP_WS_TYPE) _FP_FRAC_HIGH_##wc (u) < 0;		\
-+      _FP_FRAC_SLL_##wc (u, 1);						\
-+      _FP_FRAC_SLL_##wc (R, 1);						\
-+      if (msb || _FP_FRAC_GE_1 (u, v))					\
-+	{								\
-+	  _FP_FRAC_SUB_##wc (u, u, v);					\
-+	  _FP_FRAC_LOW_##wc (R) |= 1;					\
-+	}								\
-+    } while (--count > 0);						\
-+    /* If there's anything left in U, the result is inexact.  */	\
-+    _FP_FRAC_LOW_##wc (R) |= !_FP_FRAC_ZEROP_##wc (u);			\
-+  } while (0)
-+
-+#define _FP_DIV_MEAT_1_loop(fs, R, X, Y)  _FP_DIV_MEAT_N_loop (fs, 1, R, X, Y)
-+#define _FP_DIV_MEAT_2_loop(fs, R, X, Y)  _FP_DIV_MEAT_N_loop (fs, 2, R, X, Y)
-+#define _FP_DIV_MEAT_4_loop(fs, R, X, Y)  _FP_DIV_MEAT_N_loop (fs, 4, R, X, Y)
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_add.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_add.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_add.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_add.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,39 @@
-+/* Software floating-point emulation.
-+   Return a + b
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_add(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_SEMIRAW_Q(A, a);
-+  FP_UNPACK_SEMIRAW_Q(B, b);
-+  FP_ADD_Q(C, A, B);
-+  FP_PACK_SEMIRAW_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_cmp.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_cmp.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_cmp.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_cmp.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,41 @@
-+/* Software floating-point emulation.
-+   Compare a and b, return float condition code.
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_cmp(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_Q(r, B, A, 3);
-+  if (r == -1) r = 2;
-+  if (r == 3 && (FP_ISSIGNAN_Q(A) || FP_ISSIGNAN_Q(B)))
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_cmpe.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_cmpe.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_cmpe.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_cmpe.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,42 @@
-+/* Software floating-point emulation.
-+   Compare a and b, return float condition code.
-+   Signal exception (unless masked) if unordered.
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_cmpe(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_Q(r, B, A, 3);
-+  if (r == -1) r = 2;
-+  if (r == 3)
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_div.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_div.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_div.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_div.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,39 @@
-+/* Software floating-point emulation.
-+   Return a / b
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_div(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_Q(A, a);
-+  FP_UNPACK_Q(B, b);
-+  FP_DIV_Q(C, A, B);
-+  FP_PACK_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_dtoq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_dtoq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_dtoq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_dtoq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,44 @@
-+/* Software floating-point emulation.
-+   Return (long double)(a)
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "double.h"
-+#include "quad.h"
-+
-+long double _Q_dtoq(const double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_D(A);
-+  FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_RAW_D(A, a);
-+#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
-+  FP_EXTEND(Q,D,4,2,C,A);
-+#else
-+  FP_EXTEND(Q,D,2,1,C,A);
-+#endif
-+  FP_PACK_RAW_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_feq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_feq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_feq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_feq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,40 @@
-+/* Software floating-point emulation.
-+   Return 1 if a == b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_feq(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_EQ_Q(r, A, B);
-+  if (r && (FP_ISSIGNAN_Q(A) || FP_ISSIGNAN_Q(B)))
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return !r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fge.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fge.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fge.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fge.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,40 @@
-+/* Software floating-point emulation.
-+   Return 1 if a >= b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_fge(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_Q(r, B, A, 3);
-+  if (r == 3)
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return (r <= 0);
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fgt.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fgt.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fgt.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fgt.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,40 @@
-+/* Software floating-point emulation.
-+   Return 1 if a > b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_fgt(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_Q(r, B, A, 3);
-+  if (r == 3)
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return (r == -1);
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fle.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fle.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fle.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fle.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,40 @@
-+/* Software floating-point emulation.
-+   Return 1 if a <= b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_fle(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_Q(r, B, A, -2);
-+  if (r == -2)
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return (r >= 0);
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_flt.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_flt.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_flt.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_flt.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,40 @@
-+/* Software floating-point emulation.
-+   Return 1 if a < b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_flt(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_Q(r, B, A, 3);
-+  if (r == 3)
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return (r == 1);
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fne.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fne.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_fne.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_fne.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,40 @@
-+/* Software floating-point emulation.
-+   Return 1 if a != b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_fne(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B);
-+  int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_UNPACK_RAW_Q(B, b);
-+  FP_CMP_EQ_Q(r, A, B);
-+  if (r && (FP_ISSIGNAN_Q(A) || FP_ISSIGNAN_Q(B)))
-+    FP_SET_EXCEPTION(FP_EX_INVALID);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_itoq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_itoq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_itoq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_itoq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (long double)(a)
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_itoq(const int a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(C);
-+  int b = a;
-+  long double c;
-+
-+  FP_FROM_INT_Q(C, b, 32, unsigned int);
-+  FP_PACK_RAW_Q(c, C);
-+  FP_CLEAR_EXCEPTIONS;
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_lltoq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_lltoq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_lltoq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_lltoq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (long double)a
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_lltoq(const long long a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(C);
-+  long double c;
-+  long long b = a;
-+
-+  FP_FROM_INT_Q(C, b, 64, unsigned long long);
-+  FP_PACK_RAW_Q(c, C);
-+  FP_CLEAR_EXCEPTIONS;
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_mul.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_mul.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_mul.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_mul.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,39 @@
-+/* Software floating-point emulation.
-+   Return a * b
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_mul(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_Q(A, a);
-+  FP_UNPACK_Q(B, b);
-+  FP_MUL_Q(C, A, B);
-+  FP_PACK_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_neg.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_neg.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_neg.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_neg.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,47 @@
-+/* Software floating-point emulation.
-+   Return !a
-+   Copyright (C) 1997,1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_neg(const long double a)
-+{
-+  FP_DECL_EX;
-+  long double c = a;
-+  
-+#if (__BYTE_ORDER == __BIG_ENDIAN)
-+  ((UWtype *)&c)[0] ^= (((UWtype)1) << (W_TYPE_SIZE - 1));
-+#elif (__BYTE_ORDER == __LITTLE_ENDIAN) && (W_TYPE_SIZE == 64)
-+  ((UWtype *)&c)[1] ^= (((UWtype)1) << (W_TYPE_SIZE - 1));
-+#elif (__BYTE_ORDER == __LITTLE_ENDIAN) && (W_TYPE_SIZE == 32)
-+  ((UWtype *)&c)[3] ^= (((UWtype)1) << (W_TYPE_SIZE - 1));
-+#else
-+  FP_DECL_Q(A); FP_DECL_Q(C);
-+
-+  FP_UNPACK_Q(A, a);
-+  FP_NEG_Q(C, A);
-+  FP_PACK_Q(c, C);
-+#endif
-+  FP_CLEAR_EXCEPTIONS;
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtod.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtod.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtod.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtod.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,45 @@
-+/* Software floating-point emulation.
-+   Return (double)a
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "double.h"
-+#include "quad.h"
-+
-+double _Q_qtod(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A);
-+  FP_DECL_D(R);
-+  double r;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_SEMIRAW_Q(A, a);
-+#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
-+  FP_TRUNC(D,Q,2,4,R,A);
-+#else
-+  FP_TRUNC(D,Q,1,2,R,A);
-+#endif
-+  FP_PACK_SEMIRAW_D(r, R);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtoi.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtoi.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtoi.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtoi.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (int)a
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#define FP_ROUNDMODE FP_RND_ZERO
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+int _Q_qtoi(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A);
-+  unsigned int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_TO_INT_Q(r, A, 32, 1);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtoll.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtoll.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtoll.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtoll.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (long long)a
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#define FP_ROUNDMODE FP_RND_ZERO
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long long _Q_qtoll(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A);
-+  unsigned long long r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_TO_INT_Q(r, A, 64, 1);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtos.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtos.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtos.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtos.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,45 @@
-+/* Software floating-point emulation.
-+   Return (float)a
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "single.h"
-+#include "quad.h"
-+
-+float _Q_qtos(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A);
-+  FP_DECL_S(R);
-+  float r;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_SEMIRAW_Q(A, a);
-+#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
-+  FP_TRUNC(S,Q,1,4,R,A);
-+#else
-+  FP_TRUNC(S,Q,1,2,R,A);
-+#endif
-+  FP_PACK_SEMIRAW_S(r, R);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtou.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtou.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtou.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtou.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (unsigned int)a
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#define FP_ROUNDMODE FP_RND_ZERO
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+unsigned int _Q_qtou(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A);
-+  unsigned int r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_TO_INT_Q(r, A, 32, -1);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtoull.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtoull.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_qtoull.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_qtoull.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (unsigned long long)a
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#define FP_ROUNDMODE FP_RND_ZERO
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+unsigned long long _Q_qtoull(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A);
-+  unsigned long long r;
-+
-+  FP_UNPACK_RAW_Q(A, a);
-+  FP_TO_INT_Q(r, A, 64, -1);
-+  FP_HANDLE_EXCEPTIONS;
-+
-+  return r;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_sqrt.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_sqrt.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_sqrt.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_sqrt.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,39 @@
-+/* Software floating-point emulation.
-+   Return sqrtl(a)
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_sqrt(const long double a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_Q(A, a);
-+  FP_SQRT_Q(C, A);
-+  FP_PACK_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-+strong_alias (_Q_sqrt, __ieee754_sqrtl);
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_stoq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_stoq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_stoq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_stoq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,43 @@
-+/* Software floating-point emulation.
-+   c = (long double)(a)
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "single.h"
-+#include "quad.h"
-+
-+long double _Q_stoq(const float a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_S(A);
-+  FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_UNPACK_RAW_S(A, a);
-+#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
-+  FP_EXTEND(Q,S,4,1,C,A);
-+#else
-+  FP_EXTEND(Q,S,2,1,C,A);
-+#endif
-+  FP_PACK_RAW_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_sub.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_sub.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_sub.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_sub.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,39 @@
-+/* Software floating-point emulation.
-+   c = a - b
-+   Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_sub(const long double a, const long double b)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
-+  long double c;
-+
-+  FP_INIT_ROUNDMODE;
-+  FP_UNPACK_SEMIRAW_Q(A, a);
-+  FP_UNPACK_SEMIRAW_Q(B, b);
-+  FP_SUB_Q(C, A, B);
-+  FP_PACK_SEMIRAW_Q(c, C);
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_ulltoq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_ulltoq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_ulltoq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_ulltoq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   Return (long double)(a)
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_ulltoq(const unsigned long long a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(C);
-+  long double c;
-+  unsigned long long b = a;
-+
-+  FP_FROM_INT_Q(C, b, 64, unsigned long long);
-+  FP_PACK_RAW_Q(c, C);
-+  FP_CLEAR_EXCEPTIONS;
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_util.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_util.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_util.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,57 @@
-+/* Software floating-point emulation.
-+   Helper routine for _Q_* routines.
-+   Simulate exceptions using double arithmetics.
-+   Copyright (C) 1999 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+
-+unsigned long long ___Q_numbers [] = {
-+0x0000000000000000ULL, /* Zero */
-+0x0010100000000000ULL, /* Very tiny number */
-+0x0010000000000000ULL, /* Minimum normalized number */
-+0x7fef000000000000ULL, /* A huge double number */
-+};
-+
-+double ___Q_simulate_exceptions(int exceptions)
-+{
-+  double d, *p = (double *)___Q_numbers;
-+  if (exceptions & FP_EX_INVALID)
-+    d = p[0]/p[0];
-+  if (exceptions & FP_EX_OVERFLOW)
-+    {
-+      d = p[3] + p[3];
-+      exceptions &= ~FP_EX_INEXACT;
-+    }
-+  if (exceptions & FP_EX_UNDERFLOW)
-+    {
-+      if (exceptions & FP_EX_INEXACT)
-+        {
-+	  d = p[2] * p[2];
-+	  exceptions &= ~FP_EX_INEXACT;
-+	}
-+      else
-+	d = p[1] - p[2];
-+    }
-+  if (exceptions & FP_EX_DIVZERO)
-+    d = 1.0/p[0];
-+  if (exceptions & FP_EX_INEXACT)
-+    d = p[3] - p[2];
-+  return d;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_utoq.c uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_utoq.c
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/q_utoq.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/q_utoq.c	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,38 @@
-+/* Software floating-point emulation.
-+   c = (long double)(a)
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com) and
-+		  Jakub Jelinek (jj@ultra.linux.cz).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "soft-fp.h"
-+#include "quad.h"
-+
-+long double _Q_utoq(const unsigned int a)
-+{
-+  FP_DECL_EX;
-+  FP_DECL_Q(C);
-+  long double c;
-+  unsigned int b = a;
-+
-+  FP_FROM_INT_Q(C, b, 32, unsigned int);
-+  FP_PACK_RAW_Q(c, C);
-+  FP_CLEAR_EXCEPTIONS;
-+  FP_HANDLE_EXCEPTIONS;
-+  return c;
-+}
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/quad.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/quad.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/quad.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/quad.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,271 @@
-+/* Software floating-point emulation.
-+   Definitions for IEEE Quad Precision.
-+   Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#if _FP_W_TYPE_SIZE < 32
-+#error "Here's a nickel, kid. Go buy yourself a real computer."
-+#endif
-+
-+#if _FP_W_TYPE_SIZE < 64
-+#define _FP_FRACTBITS_Q         (4*_FP_W_TYPE_SIZE)
-+#else
-+#define _FP_FRACTBITS_Q		(2*_FP_W_TYPE_SIZE)
-+#endif
-+
-+#define _FP_FRACBITS_Q		113
-+#define _FP_FRACXBITS_Q		(_FP_FRACTBITS_Q - _FP_FRACBITS_Q)
-+#define _FP_WFRACBITS_Q		(_FP_WORKBITS + _FP_FRACBITS_Q)
-+#define _FP_WFRACXBITS_Q	(_FP_FRACTBITS_Q - _FP_WFRACBITS_Q)
-+#define _FP_EXPBITS_Q		15
-+#define _FP_EXPBIAS_Q		16383
-+#define _FP_EXPMAX_Q		32767
-+
-+#define _FP_QNANBIT_Q		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-2) % _FP_W_TYPE_SIZE)
-+#define _FP_QNANBIT_SH_Q		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-2+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
-+#define _FP_IMPLBIT_Q		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-1) % _FP_W_TYPE_SIZE)
-+#define _FP_IMPLBIT_SH_Q		\
-+	((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-1+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
-+#define _FP_OVERFLOW_Q		\
-+	((_FP_W_TYPE)1 << (_FP_WFRACBITS_Q % _FP_W_TYPE_SIZE))
-+
-+typedef float TFtype __attribute__((mode(TF)));
-+
-+#if _FP_W_TYPE_SIZE < 64
-+
-+union _FP_UNION_Q
-+{
-+   TFtype flt;
-+   struct 
-+   {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+      unsigned sign : 1;
-+      unsigned exp : _FP_EXPBITS_Q;
-+      unsigned long frac3 : _FP_FRACBITS_Q - (_FP_IMPLBIT_Q != 0)-(_FP_W_TYPE_SIZE * 3);
-+      unsigned long frac2 : _FP_W_TYPE_SIZE;
-+      unsigned long frac1 : _FP_W_TYPE_SIZE;
-+      unsigned long frac0 : _FP_W_TYPE_SIZE;
-+#else
-+      unsigned long frac0 : _FP_W_TYPE_SIZE;
-+      unsigned long frac1 : _FP_W_TYPE_SIZE;
-+      unsigned long frac2 : _FP_W_TYPE_SIZE;
-+      unsigned long frac3 : _FP_FRACBITS_Q - (_FP_IMPLBIT_Q != 0)-(_FP_W_TYPE_SIZE * 3);
-+      unsigned exp : _FP_EXPBITS_Q;
-+      unsigned sign : 1;
-+#endif /* not bigendian */
-+   } bits __attribute__((packed));
-+};
-+
-+
-+#define FP_DECL_Q(X)		_FP_DECL(4,X)
-+#define FP_UNPACK_RAW_Q(X,val)	_FP_UNPACK_RAW_4(Q,X,val)
-+#define FP_UNPACK_RAW_QP(X,val)	_FP_UNPACK_RAW_4_P(Q,X,val)
-+#define FP_PACK_RAW_Q(val,X)	_FP_PACK_RAW_4(Q,val,X)
-+#define FP_PACK_RAW_QP(val,X)		\
-+  do {					\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_4_P(Q,val,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_Q(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_4(Q,X,val);		\
-+    _FP_UNPACK_CANONICAL(Q,4,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_QP(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_4_P(Q,X,val);	\
-+    _FP_UNPACK_CANONICAL(Q,4,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_Q(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_4(Q,X,val);		\
-+    _FP_UNPACK_SEMIRAW(Q,4,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_QP(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_4_P(Q,X,val);	\
-+    _FP_UNPACK_SEMIRAW(Q,4,X);		\
-+  } while (0)
-+
-+#define FP_PACK_Q(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(Q,4,X);		\
-+    _FP_PACK_RAW_4(Q,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_QP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(Q,4,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_4_P(Q,val,X);	\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_Q(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(Q,4,X);		\
-+    _FP_PACK_RAW_4(Q,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_QP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(Q,4,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_4_P(Q,val,X);	\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_Q(X)		_FP_ISSIGNAN(Q,4,X)
-+#define FP_NEG_Q(R,X)			_FP_NEG(Q,4,R,X)
-+#define FP_ADD_Q(R,X,Y)			_FP_ADD(Q,4,R,X,Y)
-+#define FP_SUB_Q(R,X,Y)			_FP_SUB(Q,4,R,X,Y)
-+#define FP_MUL_Q(R,X,Y)			_FP_MUL(Q,4,R,X,Y)
-+#define FP_DIV_Q(R,X,Y)			_FP_DIV(Q,4,R,X,Y)
-+#define FP_SQRT_Q(R,X)			_FP_SQRT(Q,4,R,X)
-+#define _FP_SQRT_MEAT_Q(R,S,T,X,Q)	_FP_SQRT_MEAT_4(R,S,T,X,Q)
-+
-+#define FP_CMP_Q(r,X,Y,un)	_FP_CMP(Q,4,r,X,Y,un)
-+#define FP_CMP_EQ_Q(r,X,Y)	_FP_CMP_EQ(Q,4,r,X,Y)
-+#define FP_CMP_UNORD_Q(r,X,Y)	_FP_CMP_UNORD(Q,4,r,X,Y)
-+
-+#define FP_TO_INT_Q(r,X,rsz,rsg)	_FP_TO_INT(Q,4,r,X,rsz,rsg)
-+#define FP_FROM_INT_Q(X,r,rs,rt)	_FP_FROM_INT(Q,4,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_Q(X)	_FP_FRAC_HIGH_4(X)
-+#define _FP_FRAC_HIGH_RAW_Q(X)	_FP_FRAC_HIGH_4(X)
-+
-+#else   /* not _FP_W_TYPE_SIZE < 64 */
-+union _FP_UNION_Q
-+{
-+  TFtype flt /* __attribute__((mode(TF))) */ ;
-+  struct {
-+    _FP_W_TYPE a, b;
-+  } longs;
-+  struct {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+    unsigned sign    : 1;
-+    unsigned exp     : _FP_EXPBITS_Q;
-+    _FP_W_TYPE frac1 : _FP_FRACBITS_Q - (_FP_IMPLBIT_Q != 0) - _FP_W_TYPE_SIZE;
-+    _FP_W_TYPE frac0 : _FP_W_TYPE_SIZE;
-+#else
-+    _FP_W_TYPE frac0 : _FP_W_TYPE_SIZE;
-+    _FP_W_TYPE frac1 : _FP_FRACBITS_Q - (_FP_IMPLBIT_Q != 0) - _FP_W_TYPE_SIZE;
-+    unsigned exp     : _FP_EXPBITS_Q;
-+    unsigned sign    : 1;
-+#endif
-+  } bits;
-+};
-+
-+#define FP_DECL_Q(X)		_FP_DECL(2,X)
-+#define FP_UNPACK_RAW_Q(X,val)	_FP_UNPACK_RAW_2(Q,X,val)
-+#define FP_UNPACK_RAW_QP(X,val)	_FP_UNPACK_RAW_2_P(Q,X,val)
-+#define FP_PACK_RAW_Q(val,X)	_FP_PACK_RAW_2(Q,val,X)
-+#define FP_PACK_RAW_QP(val,X)		\
-+  do {					\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_2_P(Q,val,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_Q(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_2(Q,X,val);		\
-+    _FP_UNPACK_CANONICAL(Q,2,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_QP(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_2_P(Q,X,val);	\
-+    _FP_UNPACK_CANONICAL(Q,2,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_Q(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_2(Q,X,val);		\
-+    _FP_UNPACK_SEMIRAW(Q,2,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_QP(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_2_P(Q,X,val);	\
-+    _FP_UNPACK_SEMIRAW(Q,2,X);		\
-+  } while (0)
-+
-+#define FP_PACK_Q(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(Q,2,X);		\
-+    _FP_PACK_RAW_2(Q,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_QP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(Q,2,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_2_P(Q,val,X);	\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_Q(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(Q,2,X);		\
-+    _FP_PACK_RAW_2(Q,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_QP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(Q,2,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_2_P(Q,val,X);	\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_Q(X)		_FP_ISSIGNAN(Q,2,X)
-+#define FP_NEG_Q(R,X)			_FP_NEG(Q,2,R,X)
-+#define FP_ADD_Q(R,X,Y)			_FP_ADD(Q,2,R,X,Y)
-+#define FP_SUB_Q(R,X,Y)			_FP_SUB(Q,2,R,X,Y)
-+#define FP_MUL_Q(R,X,Y)			_FP_MUL(Q,2,R,X,Y)
-+#define FP_DIV_Q(R,X,Y)			_FP_DIV(Q,2,R,X,Y)
-+#define FP_SQRT_Q(R,X)			_FP_SQRT(Q,2,R,X)
-+#define _FP_SQRT_MEAT_Q(R,S,T,X,Q)	_FP_SQRT_MEAT_2(R,S,T,X,Q)
-+
-+#define FP_CMP_Q(r,X,Y,un)	_FP_CMP(Q,2,r,X,Y,un)
-+#define FP_CMP_EQ_Q(r,X,Y)	_FP_CMP_EQ(Q,2,r,X,Y)
-+#define FP_CMP_UNORD_Q(r,X,Y)	_FP_CMP_UNORD(Q,2,r,X,Y)
-+
-+#define FP_TO_INT_Q(r,X,rsz,rsg)	_FP_TO_INT(Q,2,r,X,rsz,rsg)
-+#define FP_FROM_INT_Q(X,r,rs,rt)	_FP_FROM_INT(Q,2,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_Q(X)	_FP_FRAC_HIGH_2(X)
-+#define _FP_FRAC_HIGH_RAW_Q(X)	_FP_FRAC_HIGH_2(X)
-+
-+#endif /* not _FP_W_TYPE_SIZE < 64 */
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/sfp-machine.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/sfp-machine.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/sfp-machine.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/sfp-machine.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,213 @@
-+/* Machine-dependent software floating-point definitions.
-+   Sparc userland (_Q_*) version.
-+   Copyright (C) 1997,1998,1999, 2002, 2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz) and
-+		  David S. Miller (davem@redhat.com).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <fpu_control.h>
-+#include <stdlib.h>
-+
-+#define _FP_W_TYPE_SIZE		32
-+#define _FP_W_TYPE		unsigned long
-+#define _FP_WS_TYPE		signed long
-+#define _FP_I_TYPE		long
-+
-+#define _FP_MUL_MEAT_S(R,X,Y)				\
-+  _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
-+#define _FP_MUL_MEAT_D(R,X,Y)				\
-+  _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)
-+#define _FP_MUL_MEAT_Q(R,X,Y)				\
-+  _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm)
-+
-+#define _FP_DIV_MEAT_S(R,X,Y)	_FP_DIV_MEAT_1_udiv(S,R,X,Y)
-+#define _FP_DIV_MEAT_D(R,X,Y)	_FP_DIV_MEAT_2_udiv(D,R,X,Y)
-+#define _FP_DIV_MEAT_Q(R,X,Y)	_FP_DIV_MEAT_4_udiv(Q,R,X,Y)
-+
-+#define _FP_NANFRAC_S		((_FP_QNANBIT_S << 1) - 1)
-+#define _FP_NANFRAC_D		((_FP_QNANBIT_D << 1) - 1), -1
-+#define _FP_NANFRAC_Q		((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1
-+#define _FP_NANSIGN_S		0
-+#define _FP_NANSIGN_D		0
-+#define _FP_NANSIGN_Q		0
-+
-+#define _FP_KEEPNANFRACP 1
-+
-+/* If one NaN is signaling and the other is not,
-+ * we choose that one, otherwise we choose X.
-+ */
-+/* For _Qp_* and _Q_*, this should prefer X, for
-+ * CPU instruction emulation this should prefer Y.
-+ * (see SPAMv9 B.2.2 section).
-+ */
-+#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)			\
-+  do {								\
-+    if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs)		\
-+	&& !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs))	\
-+      {								\
-+	R##_s = Y##_s;						\
-+	_FP_FRAC_COPY_##wc(R,Y);				\
-+      }								\
-+    else							\
-+      {								\
-+	R##_s = X##_s;						\
-+	_FP_FRAC_COPY_##wc(R,X);				\
-+      }								\
-+    R##_c = FP_CLS_NAN;						\
-+  } while (0)
-+
-+/* Some assembly to speed things up. */
-+#define __FP_FRAC_ADD_3(r2,r1,r0,x2,x1,x0,y2,y1,y0)			\
-+  __asm__ ("addcc %r7,%8,%2\n\
-+	    addxcc %r5,%6,%1\n\
-+	    addx %r3,%4,%0"						\
-+	   : "=r" ((USItype)(r2)),					\
-+	     "=&r" ((USItype)(r1)),					\
-+	     "=&r" ((USItype)(r0))					\
-+	   : "%rJ" ((USItype)(x2)),					\
-+	     "rI" ((USItype)(y2)),					\
-+	     "%rJ" ((USItype)(x1)),					\
-+	     "rI" ((USItype)(y1)),					\
-+	     "%rJ" ((USItype)(x0)),					\
-+	     "rI" ((USItype)(y0))					\
-+	   : "cc")
-+
-+#define __FP_FRAC_SUB_3(r2,r1,r0,x2,x1,x0,y2,y1,y0)			\
-+  __asm__ ("subcc %r7,%8,%2\n\
-+	    subxcc %r5,%6,%1\n\
-+	    subx %r3,%4,%0"						\
-+	   : "=r" ((USItype)(r2)),					\
-+	     "=&r" ((USItype)(r1)),					\
-+	     "=&r" ((USItype)(r0))					\
-+	   : "%rJ" ((USItype)(x2)),					\
-+	     "rI" ((USItype)(y2)),					\
-+	     "%rJ" ((USItype)(x1)),					\
-+	     "rI" ((USItype)(y1)),					\
-+	     "%rJ" ((USItype)(x0)),					\
-+	     "rI" ((USItype)(y0))					\
-+	   : "cc")
-+
-+#define __FP_FRAC_ADD_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)		\
-+  do {									\
-+    /* We need to fool gcc,  as we need to pass more than 10		\
-+       input/outputs.  */						\
-+    register USItype _t1 __asm__ ("g1"), _t2 __asm__ ("g2");		\
-+    __asm__ __volatile__ ("\
-+	    addcc %r8,%9,%1\n\
-+	    addxcc %r6,%7,%0\n\
-+	    addxcc %r4,%5,%%g2\n\
-+	    addx %r2,%3,%%g1"						\
-+	   : "=&r" ((USItype)(r1)),					\
-+	     "=&r" ((USItype)(r0))					\
-+	   : "%rJ" ((USItype)(x3)),					\
-+	     "rI" ((USItype)(y3)),					\
-+	     "%rJ" ((USItype)(x2)),					\
-+	     "rI" ((USItype)(y2)),					\
-+	     "%rJ" ((USItype)(x1)),					\
-+	     "rI" ((USItype)(y1)),					\
-+	     "%rJ" ((USItype)(x0)),					\
-+	     "rI" ((USItype)(y0))					\
-+	   : "cc", "g1", "g2");						\
-+    __asm__ __volatile__ ("" : "=r" (_t1), "=r" (_t2));			\
-+    r3 = _t1; r2 = _t2;							\
-+  } while (0)
-+
-+#define __FP_FRAC_SUB_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)		\
-+  do {									\
-+    /* We need to fool gcc,  as we need to pass more than 10		\
-+       input/outputs.  */						\
-+    register USItype _t1 __asm__ ("g1"), _t2 __asm__ ("g2");		\
-+    __asm__ __volatile__ ("\
-+	    subcc %r8,%9,%1\n\
-+	    subxcc %r6,%7,%0\n\
-+	    subxcc %r4,%5,%%g2\n\
-+	    subx %r2,%3,%%g1"						\
-+	   : "=&r" ((USItype)(r1)),					\
-+	     "=&r" ((USItype)(r0))					\
-+	   : "%rJ" ((USItype)(x3)),					\
-+	     "rI" ((USItype)(y3)),					\
-+	     "%rJ" ((USItype)(x2)),					\
-+	     "rI" ((USItype)(y2)),					\
-+	     "%rJ" ((USItype)(x1)),					\
-+	     "rI" ((USItype)(y1)),					\
-+	     "%rJ" ((USItype)(x0)),					\
-+	     "rI" ((USItype)(y0))					\
-+	   : "cc", "g1", "g2");						\
-+    __asm__ __volatile__ ("" : "=r" (_t1), "=r" (_t2));			\
-+    r3 = _t1; r2 = _t2;							\
-+  } while (0)
-+
-+#define __FP_FRAC_DEC_3(x2,x1,x0,y2,y1,y0) __FP_FRAC_SUB_3(x2,x1,x0,x2,x1,x0,y2,y1,y0)
-+
-+#define __FP_FRAC_DEC_4(x3,x2,x1,x0,y3,y2,y1,y0) __FP_FRAC_SUB_4(x3,x2,x1,x0,x3,x2,x1,x0,y3,y2,y1,y0)
-+
-+#define __FP_FRAC_ADDI_4(x3,x2,x1,x0,i)					\
-+  __asm__ ("addcc %3,%4,%3\n\
-+	    addxcc %2,%%g0,%2\n\
-+	    addxcc %1,%%g0,%1\n\
-+	    addx %0,%%g0,%0"						\
-+	   : "=&r" ((USItype)(x3)),					\
-+	     "=&r" ((USItype)(x2)),					\
-+	     "=&r" ((USItype)(x1)),					\
-+	     "=&r" ((USItype)(x0))					\
-+	   : "rI" ((USItype)(i)),					\
-+	     "0" ((USItype)(x3)),					\
-+	     "1" ((USItype)(x2)),					\
-+	     "2" ((USItype)(x1)),					\
-+	     "3" ((USItype)(x0))					\
-+	   : "cc")
-+
-+/* Obtain the current rounding mode. */
-+#ifndef FP_ROUNDMODE
-+#define FP_ROUNDMODE	((_fcw >> 30) & 0x3)
-+#endif
-+
-+/* Exception flags. */
-+#define FP_EX_INVALID		(1 << 4)
-+#define FP_EX_OVERFLOW		(1 << 3)
-+#define FP_EX_UNDERFLOW		(1 << 2)
-+#define FP_EX_DIVZERO		(1 << 1)
-+#define FP_EX_INEXACT		(1 << 0)
-+
-+#define _FP_DECL_EX	fpu_control_t _fcw
-+
-+#define FP_INIT_ROUNDMODE					\
-+do {								\
-+  _FPU_GETCW(_fcw);						\
-+} while (0)
-+
-+/* Simulate exceptions using double arithmetics. */
-+extern double ___Q_simulate_exceptions(int exc);
-+
-+#define FP_HANDLE_EXCEPTIONS					\
-+do {								\
-+  if (!_fex)							\
-+    {								\
-+      /* This is the common case, so we do it inline.		\
-+       * We need to clear cexc bits if any.			\
-+       */							\
-+      extern unsigned long long ___Q_numbers[];			\
-+      __asm__ __volatile__("\
-+      	ldd [%0], %%f30\n\
-+      	faddd %%f30, %%f30, %%f30\
-+      	" : : "r" (___Q_numbers) : "f30");			\
-+    }								\
-+  else								\
-+    ___Q_simulate_exceptions (_fex);			        \
-+} while (0)
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/single.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/single.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/single.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/single.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,151 @@
-+/* Software floating-point emulation.
-+   Definitions for IEEE Single Precision.
-+   Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#if _FP_W_TYPE_SIZE < 32
-+#error "Here's a nickel kid.  Go buy yourself a real computer."
-+#endif
-+
-+#define _FP_FRACTBITS_S		_FP_W_TYPE_SIZE
-+
-+#define _FP_FRACBITS_S		24
-+#define _FP_FRACXBITS_S		(_FP_FRACTBITS_S - _FP_FRACBITS_S)
-+#define _FP_WFRACBITS_S		(_FP_WORKBITS + _FP_FRACBITS_S)
-+#define _FP_WFRACXBITS_S	(_FP_FRACTBITS_S - _FP_WFRACBITS_S)
-+#define _FP_EXPBITS_S		8
-+#define _FP_EXPBIAS_S		127
-+#define _FP_EXPMAX_S		255
-+#define _FP_QNANBIT_S		((_FP_W_TYPE)1 << (_FP_FRACBITS_S-2))
-+#define _FP_QNANBIT_SH_S	((_FP_W_TYPE)1 << (_FP_FRACBITS_S-2+_FP_WORKBITS))
-+#define _FP_IMPLBIT_S		((_FP_W_TYPE)1 << (_FP_FRACBITS_S-1))
-+#define _FP_IMPLBIT_SH_S	((_FP_W_TYPE)1 << (_FP_FRACBITS_S-1+_FP_WORKBITS))
-+#define _FP_OVERFLOW_S		((_FP_W_TYPE)1 << (_FP_WFRACBITS_S))
-+
-+/* The implementation of _FP_MUL_MEAT_S and _FP_DIV_MEAT_S should be
-+   chosen by the target machine.  */
-+
-+typedef float SFtype __attribute__((mode(SF)));
-+
-+union _FP_UNION_S
-+{
-+  SFtype flt;
-+  struct {
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+    unsigned sign : 1;
-+    unsigned exp  : _FP_EXPBITS_S;
-+    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);
-+#else
-+    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);
-+    unsigned exp  : _FP_EXPBITS_S;
-+    unsigned sign : 1;
-+#endif
-+  } bits __attribute__((packed));
-+};
-+
-+#define FP_DECL_S(X)		_FP_DECL(1,X)
-+#define FP_UNPACK_RAW_S(X,val)	_FP_UNPACK_RAW_1(S,X,val)
-+#define FP_UNPACK_RAW_SP(X,val)	_FP_UNPACK_RAW_1_P(S,X,val)
-+#define FP_PACK_RAW_S(val,X)	_FP_PACK_RAW_1(S,val,X)
-+#define FP_PACK_RAW_SP(val,X)		\
-+  do {					\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_1_P(S,val,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_S(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_1(S,X,val);		\
-+    _FP_UNPACK_CANONICAL(S,1,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SP(X,val)		\
-+  do {					\
-+    _FP_UNPACK_RAW_1_P(S,X,val);	\
-+    _FP_UNPACK_CANONICAL(S,1,X);	\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_S(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_1(S,X,val);		\
-+    _FP_UNPACK_SEMIRAW(S,1,X);		\
-+  } while (0)
-+
-+#define FP_UNPACK_SEMIRAW_SP(X,val)	\
-+  do {					\
-+    _FP_UNPACK_RAW_1_P(S,X,val);	\
-+    _FP_UNPACK_SEMIRAW(S,1,X);		\
-+  } while (0)
-+
-+#define FP_PACK_S(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(S,1,X);		\
-+    _FP_PACK_RAW_1(S,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SP(val,X)		\
-+  do {					\
-+    _FP_PACK_CANONICAL(S,1,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_1_P(S,val,X);	\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_S(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(S,1,X);		\
-+    _FP_PACK_RAW_1(S,val,X);		\
-+  } while (0)
-+
-+#define FP_PACK_SEMIRAW_SP(val,X)	\
-+  do {					\
-+    _FP_PACK_SEMIRAW(S,1,X);		\
-+    if (!FP_INHIBIT_RESULTS)		\
-+      _FP_PACK_RAW_1_P(S,val,X);	\
-+  } while (0)
-+
-+#define FP_ISSIGNAN_S(X)		_FP_ISSIGNAN(S,1,X)
-+#define FP_NEG_S(R,X)			_FP_NEG(S,1,R,X)
-+#define FP_ADD_S(R,X,Y)			_FP_ADD(S,1,R,X,Y)
-+#define FP_SUB_S(R,X,Y)			_FP_SUB(S,1,R,X,Y)
-+#define FP_MUL_S(R,X,Y)			_FP_MUL(S,1,R,X,Y)
-+#define FP_DIV_S(R,X,Y)			_FP_DIV(S,1,R,X,Y)
-+#define FP_SQRT_S(R,X)			_FP_SQRT(S,1,R,X)
-+#define _FP_SQRT_MEAT_S(R,S,T,X,Q)	_FP_SQRT_MEAT_1(R,S,T,X,Q)
-+
-+#define FP_CMP_S(r,X,Y,un)	_FP_CMP(S,1,r,X,Y,un)
-+#define FP_CMP_EQ_S(r,X,Y)	_FP_CMP_EQ(S,1,r,X,Y)
-+#define FP_CMP_UNORD_S(r,X,Y)	_FP_CMP_UNORD(S,1,r,X,Y)
-+
-+#define FP_TO_INT_S(r,X,rsz,rsg)	_FP_TO_INT(S,1,r,X,rsz,rsg)
-+#define FP_FROM_INT_S(X,r,rs,rt)	_FP_FROM_INT(S,1,X,r,rs,rt)
-+
-+#define _FP_FRAC_HIGH_S(X)	_FP_FRAC_HIGH_1(X)
-+#define _FP_FRAC_HIGH_RAW_S(X)	_FP_FRAC_HIGH_1(X)
-diff -Naur uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/soft-fp.h uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/soft-fp.h
---- uClibc-0.9.31.ori/libc/sysdeps/linux/sparc/soft-fp/soft-fp.h	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.31/libc/sysdeps/linux/sparc/soft-fp/soft-fp.h	2010-10-14 14:05:37.000000000 +0200
-@@ -0,0 +1,205 @@
-+/* Software floating-point emulation.
-+   Copyright (C) 1997,1998,1999,2000,2002,2003,2005,2006,2007
-+	Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Richard Henderson (rth@cygnus.com),
-+		  Jakub Jelinek (jj@ultra.linux.cz),
-+		  David S. Miller (davem@redhat.com) and
-+		  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file into
-+   combinations with other programs, and to distribute those
-+   combinations without any restriction coming from the use of this
-+   file.  (The Lesser General Public License restrictions do apply in
-+   other respects; for example, they cover modification of the file,
-+   and distribution when not linked into a combine executable.)
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+   MA 02110-1301, USA.  */
-+
-+#ifndef SOFT_FP_H
-+#define SOFT_FP_H
-+
-+#include "sfp-machine.h"
-+
-+/* Allow sfp-machine to have its own byte order definitions. */
-+#ifndef __BYTE_ORDER
-+#ifdef _LIBC
-+#include <endian.h>
-+#else
-+#error "endianness not defined by sfp-machine.h"
-+#endif
-+#endif
-+
-+#define _FP_WORKBITS		3
-+#define _FP_WORK_LSB		((_FP_W_TYPE)1 << 3)
-+#define _FP_WORK_ROUND		((_FP_W_TYPE)1 << 2)
-+#define _FP_WORK_GUARD		((_FP_W_TYPE)1 << 1)
-+#define _FP_WORK_STICKY		((_FP_W_TYPE)1 << 0)
-+
-+#ifndef FP_RND_NEAREST
-+# define FP_RND_NEAREST		0
-+# define FP_RND_ZERO		1
-+# define FP_RND_PINF		2
-+# define FP_RND_MINF		3
-+#endif
-+#ifndef FP_ROUNDMODE
-+# define FP_ROUNDMODE		FP_RND_NEAREST
-+#endif
-+
-+/* By default don't care about exceptions. */
-+#ifndef FP_EX_INVALID
-+#define FP_EX_INVALID		0
-+#endif
-+#ifndef FP_EX_OVERFLOW
-+#define FP_EX_OVERFLOW		0
-+#endif
-+#ifndef FP_EX_UNDERFLOW
-+#define FP_EX_UNDERFLOW		0
-+#endif
-+#ifndef FP_EX_DIVZERO
-+#define FP_EX_DIVZERO		0
-+#endif
-+#ifndef FP_EX_INEXACT
-+#define FP_EX_INEXACT		0
-+#endif
-+#ifndef FP_EX_DENORM
-+#define FP_EX_DENORM		0
-+#endif
-+
-+#ifdef _FP_DECL_EX
-+#define FP_DECL_EX					\
-+  int _fex = 0;						\
-+  _FP_DECL_EX
-+#else
-+#define FP_DECL_EX int _fex = 0
-+#endif
-+
-+#ifndef FP_INIT_ROUNDMODE
-+#define FP_INIT_ROUNDMODE do {} while (0)
-+#endif
-+
-+#ifndef FP_HANDLE_EXCEPTIONS
-+#define FP_HANDLE_EXCEPTIONS do {} while (0)
-+#endif
-+
-+#ifndef FP_INHIBIT_RESULTS
-+/* By default we write the results always.
-+ * sfp-machine may override this and e.g.
-+ * check if some exceptions are unmasked
-+ * and inhibit it in such a case.
-+ */
-+#define FP_INHIBIT_RESULTS 0
-+#endif
-+
-+#define FP_SET_EXCEPTION(ex)				\
-+  _fex |= (ex)
-+
-+#define FP_UNSET_EXCEPTION(ex)				\
-+  _fex &= ~(ex)
-+
-+#define FP_CLEAR_EXCEPTIONS				\
-+  _fex = 0
-+
-+#define _FP_ROUND_NEAREST(wc, X)			\
-+do {							\
-+    if ((_FP_FRAC_LOW_##wc(X) & 15) != _FP_WORK_ROUND)	\
-+      _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);		\
-+} while (0)
-+
-+#define _FP_ROUND_ZERO(wc, X)		(void)0
-+
-+#define _FP_ROUND_PINF(wc, X)				\
-+do {							\
-+    if (!X##_s && (_FP_FRAC_LOW_##wc(X) & 7))		\
-+      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);		\
-+} while (0)
-+
-+#define _FP_ROUND_MINF(wc, X)				\
-+do {							\
-+    if (X##_s && (_FP_FRAC_LOW_##wc(X) & 7))		\
-+      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);		\
-+} while (0)
-+
-+#define _FP_ROUND(wc, X)			\
-+do {						\
-+	if (_FP_FRAC_LOW_##wc(X) & 7)		\
-+	  FP_SET_EXCEPTION(FP_EX_INEXACT);	\
-+	switch (FP_ROUNDMODE)			\
-+	{					\
-+	  case FP_RND_NEAREST:			\
-+	    _FP_ROUND_NEAREST(wc,X);		\
-+	    break;				\
-+	  case FP_RND_ZERO:			\
-+	    _FP_ROUND_ZERO(wc,X);		\
-+	    break;				\
-+	  case FP_RND_PINF:			\
-+	    _FP_ROUND_PINF(wc,X);		\
-+	    break;				\
-+	  case FP_RND_MINF:			\
-+	    _FP_ROUND_MINF(wc,X);		\
-+	    break;				\
-+	}					\
-+} while (0)
-+
-+#define FP_CLS_NORMAL		0
-+#define FP_CLS_ZERO		1
-+#define FP_CLS_INF		2
-+#define FP_CLS_NAN		3
-+
-+#define _FP_CLS_COMBINE(x,y)	(((x) << 2) | (y))
-+
-+#include "op-1.h"
-+#include "op-2.h"
-+#include "op-4.h"
-+#include "op-8.h"
-+#include "op-common.h"
-+
-+/* Sigh.  Silly things longlong.h needs.  */
-+#define UWtype		_FP_W_TYPE
-+#define W_TYPE_SIZE	_FP_W_TYPE_SIZE
-+
-+typedef int QItype __attribute__((mode(QI)));
-+typedef int SItype __attribute__((mode(SI)));
-+typedef int DItype __attribute__((mode(DI)));
-+typedef unsigned int UQItype __attribute__((mode(QI)));
-+typedef unsigned int USItype __attribute__((mode(SI)));
-+typedef unsigned int UDItype __attribute__((mode(DI)));
-+#if _FP_W_TYPE_SIZE == 32
-+typedef unsigned int UHWtype __attribute__((mode(HI)));
-+#elif _FP_W_TYPE_SIZE == 64
-+typedef USItype UHWtype;
-+#endif
-+
-+#ifndef CMPtype
-+#define CMPtype		int
-+#endif
-+
-+#define SI_BITS		(__CHAR_BIT__ * (int)sizeof(SItype))
-+#define DI_BITS		(__CHAR_BIT__ * (int)sizeof(DItype))
-+
-+#ifndef umul_ppmm
-+#include "longlong.h"
-+#endif
-+
-+#ifdef _LIBC
-+#include <stdlib.h>
-+#else
-+extern void abort (void);
-+#endif
-+
-+#endif
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
deleted file mode 100644
index 44d06cb62f..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-sparc-errno-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uClibc-0.9.32.ori/libc/sysdeps/linux/sparc/pipe.S	2011-06-08 21:35:20.000000000 +0200
-+++ uClibc-0.9.32/libc/sysdeps/linux/sparc/pipe.S	2011-11-11 15:57:25.000000000 +0100
-@@ -52,7 +52,7 @@
- 	 restore %g0,%g0,%o0
- 
- .Lerror:
--	call	HIDDEN_JUMPTARGET(__errno_location)
-+	call	__errno_location
- 	 or	%g0,EINVAL,%i0
- 	st	%i0,[%o0]
- 	ret
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-unshare.patch b/toolchain/uClibc/uClibc-0.9.31.1-unshare.patch
deleted file mode 100644
index ad440d9dc2..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-unshare.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Backport of unshare() syscall.
-From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
-diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h
---- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h	2011-06-08 15:58:40.000000000 -0300
-+++ uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h	2011-12-05 08:10:02.491978849 -0300
-@@ -58,7 +58,13 @@
- 				      force CLONE_PTRACE on this clone.  */
- # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
- 					  the child.  */
--# define CLONE_STOPPED	0x02000000 /* Start in stopped state.  */
-+# define CLONE_STOPPED 0x02000000 /* Start in stopped state.  */
-+# define CLONE_NEWUTS  0x04000000      /* New utsname group.  */
-+# define CLONE_NEWIPC  0x08000000      /* New ipcs.  */
-+# define CLONE_NEWUSER 0x10000000      /* New user namespace.  */
-+# define CLONE_NEWPID  0x20000000      /* New pid namespace.  */
-+# define CLONE_NEWNET  0x40000000      /* New network namespace.  */
-+# define CLONE_IO      0x80000000      /* Clone I/O context.  */
- #endif
- 
- /* The official definition.  */
-@@ -74,11 +80,9 @@
- extern int clone (int (*__fn) (void *__arg), void *__child_stack,
- 		  int __flags, void *__arg, ...) __THROW;
- 
--#if 0
- /* Unshare the specified resources.  */
- extern int unshare (int __flags) __THROW;
- #endif
--#endif
- 
- __END_DECLS
- 
-diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in
---- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in	2011-06-08 15:58:40.000000000 -0300
-+++ uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in	2011-12-05 08:23:28.353757602 -0300
-@@ -31,7 +31,8 @@
- 	remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
- 	sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
- 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
--	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC))
-+	sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \
-+	vhangup.c,$(CSRC))
- endif
- 
- ifneq ($(UCLIBC_BSD_SPECIFIC),y)
-diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c
---- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c	1969-12-31 21:00:00.000000000 -0300
-+++ uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c	2011-12-05 08:22:45.954453512 -0300
-@@ -0,0 +1,21 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * unshare() for uClibc
-+ *
-+ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <sched.h>
-+
-+#if defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__
-+_syscall1(int, unshare, int, flags)
-+#else
-+int unshare(int flags) 
-+{   
-+    __set_errno(ENOSYS);
-+    return -1;
-+}
-+#endif
diff --git a/toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch b/toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch
deleted file mode 100644
index 242a5264b8..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2e53dd645d5348f207cec7f8595969dc566c5a55 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Mon, 17 May 2010 15:56:19 +0200
-Subject: [PATCH] workaround GCC PR32219
-
-we ended up calling 0
-Fixes bug #1033
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/misc/internals/__uClibc_main.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
-index f9e1244..4ee4443 100644
---- a/libc/misc/internals/__uClibc_main.c
-+++ b/libc/misc/internals/__uClibc_main.c
-@@ -105,6 +105,17 @@ _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer,
- 
- #endif /* !SHARED */
- 
-+/* Defeat compiler optimization which assumes function addresses are never NULL */
-+static __always_inline int not_null_ptr(const void *p)
-+{
-+	const void *q;
-+	__asm__ (""
-+		: "=r" (q) /* output */
-+		: "0" (p) /* input */
-+	);
-+	return q != 0;
-+}
-+
- /*
-  * Prototypes.
-  */
-@@ -254,7 +265,7 @@ void __uClibc_init(void)
- 
- #ifdef __UCLIBC_HAS_LOCALE__
-     /* Initialize the global locale structure. */
--    if (likely(_locale_init!=NULL))
-+    if (likely(not_null_ptr(_locale_init)))
- 	_locale_init();
- #endif
- 
-@@ -264,7 +275,7 @@ void __uClibc_init(void)
-      * Thus we get a nice size savings because the stdio functions
-      * won't be pulled into the final static binary unless used.
-      */
--    if (likely(_stdio_init != NULL))
-+    if (likely(not_null_ptr(_stdio_init)))
- 	_stdio_init();
- 
- }
--- 
-1.7.1
-
diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
deleted file mode 100644
index e990178df5..0000000000
--- a/toolchain/uClibc/uClibc-0.9.31.config
+++ /dev/null
@@ -1,259 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.31
-# Sun Apr  4 10:43:39 2010
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="none"
-FORCE_OPTIONS_FOR_ARCH=y
-# ARCH_LITTLE_ENDIAN is not set
-# ARCH_BIG_ENDIAN is not set
-# ARCH_WANTS_LITTLE_ENDIAN is not set
-# ARCH_WANTS_BIG_ENDIAN is not set
-TARGET_SUBARCH=""
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# DO_XSI_MATH is not set
-# UCLIBC_HAS_FENV is not set
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/src/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-# LDSO_CACHE_SUPPORT is not set
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-UCLIBC_SUSV3_LEGACY=y
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_24=y
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-UCLIBC_SV4_DEPRECATED=y
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
-# UCLIBC_HAS_RPC is not set
-# UCLIBC_HAS_FULL_RPC is not set
-# UCLIBC_HAS_REENTRANT_RPC is not set
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# String and Stdio Support
-#
-# UCLIBC_HAS_STRING_GENERIC_OPT is not set
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-# UCLIBC_HAS_STDIO_GETC_MACRO is not set
-# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-# UCLIBC_HAS_GNU_GETSUBOPT is not set
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-# UCLIBC_HAS_WORDEXP is not set
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
-# SSP_QUICK_CANARY is not set
-PROPOLICE_BLOCK_ABRT=y
-# PROPOLICE_BLOCK_SEGV is not set
-# UCLIBC_BUILD_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
-
-USE_BX=y
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_CORTEX_M3 is not set
-# CONFIG_ARM_CORTEX_M1 is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set

From 4eb64b232c6d211edf35fc7f8a2e8bb578bbb960 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Tue, 11 Jun 2013 17:21:49 +0200
Subject: [PATCH 5404/6849] usb_modeswitch_data: bump to version 20130610

Remove 'usb_modeswitch_data-fix-parallel-install.patch' because it was merged
upstream.

Remove dependency on Tcl because the dispatcher script has been moved to
usb_modeswitch package.

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usb_modeswitch_data/Config.in           |  3 ---
 ...b_modeswitch_data-fix-parallel-install.patch | 17 -----------------
 .../usb_modeswitch_data-makefile.patch          | 17 +++++++++--------
 .../usb_modeswitch_data/usb_modeswitch_data.mk  |  2 +-
 4 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch

diff --git a/package/usb_modeswitch_data/Config.in b/package/usb_modeswitch_data/Config.in
index 8698bb606c..6df408f02a 100644
--- a/package/usb_modeswitch_data/Config.in
+++ b/package/usb_modeswitch_data/Config.in
@@ -1,9 +1,6 @@
 config BR2_PACKAGE_USB_MODESWITCH_DATA
 	bool "usb_modeswitch_data"
 	select BR2_PACKAGE_USB_MODESWITCH
-	# tcl is a runtime dependency
-	select BR2_PACKAGE_TCL
-	select BR2_PACKAGE_TCL_TCLSH
 	help
 	  USB mode switch data
 	  Contains udev rules and events to allow usb_modeswitch to
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch b/package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch
deleted file mode 100644
index ba30499569..0000000000
--- a/package/usb_modeswitch_data/usb_modeswitch_data-fix-parallel-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Properly create the directory before creating it so that parallel
-install work fine.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -22,6 +22,7 @@
- 	install -D --mode=644 40-usb_modeswitch.rules $(RULESDIR)/40-usb_modeswitch.rules
- 
- db-install:
-+	install -d $(PREFIX)/share/usb_modeswitch
- 	install --mode=644 -t $(PREFIX)/share/usb_modeswitch ./usb_modeswitch.d/*
- 
- db-install-packed:
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch b/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch
index 769e514533..28441fe003 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch
+++ b/package/usb_modeswitch_data/usb_modeswitch_data-makefile.patch
@@ -2,21 +2,22 @@ Fixed Makefile install sections to not reload udev rules. In a
 cross-compiler environment, it is not wanted to reload the host udev rules.
 
 Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
---- usb_modeswitch_data-20120120.orig/Makefile	2012-01-20 17:25:32.000000000 -0500
-+++ usb_modeswitch_data-20120120/Makefile	2012-02-06 14:20:47.000000000 -0500
-@@ -12,9 +12,9 @@
- 
+Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
+--- a/Makefile	2013-06-10 22:32:53.000000000 +0200
++++ b/Makefile	2013-06-11 10:38:03.181161401 +0200
+@@ -13,9 +13,9 @@
  clean:
+ 	$(RM) 40-usb_modeswitch.rules
  
--install: files-install db-install rules-reload
-+install: files-install db-install
+-install: all files-install db-install rules-reload
++install: all files-install db-install
  
 -install-packed: files-install db-install-packed rules-reload
 +install-packed: files-install db-install-packed
  
- files-install:
+ files-install: 
  	install -d $(PREFIX)/share/usb_modeswitch
-@@ -50,7 +50,7 @@
+@@ -54,7 +54,7 @@
  		fi \
  	fi
  
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
index cb9754fa15..a9ce006ae3 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-USB_MODESWITCH_DATA_VERSION = 20121109
+USB_MODESWITCH_DATA_VERSION = 20130610
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch

From d3e4db4e34927bff16c2ef06033304a068f46292 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Tue, 11 Jun 2013 17:22:20 +0200
Subject: [PATCH 5405/6849] usb_modeswitch: bump to version 1.2.6

Remove 'usb_modeswitch-makefile.patch' because it was merged upstream.

This package contains a dispatcher (wrapper) that can be installed as Tcl
script or as binary without further dependency.  If Tcl is selected and the
binary interpreter is installed (BR2_PACKAGE_TCL &&
!BR2_PACKAGE_TCL_SHLIB_ONLY) the dispatcher will be installed as Tcl script
otherwise as binary.

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../usb_modeswitch-makefile.patch             | 31 -------------------
 package/usb_modeswitch/usb_modeswitch.mk      | 26 ++++++++++------
 2 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 package/usb_modeswitch/usb_modeswitch-makefile.patch

diff --git a/package/usb_modeswitch/usb_modeswitch-makefile.patch b/package/usb_modeswitch/usb_modeswitch-makefile.patch
deleted file mode 100644
index b79274179e..0000000000
--- a/package/usb_modeswitch/usb_modeswitch-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Removed the -s from the install command. Without this, usb_modeswitch would
-fail to install.
-
-Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -46,7 +46,7 @@
- 	cd jim && $(MAKE) distclean
- 
- install-common: all
--	install -D -s --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
-+	install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
- 	install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
- 	install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
- 	install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
-@@ -67,10 +67,10 @@
- install: install-common install-script
- 
- install-shared: dispatcher-dynamic install-common
--	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
-+	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- 
- install-static: dispatcher-static install-common
--	install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
-+	install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- 
- uninstall:
- 	$(RM) $(SBINDIR)/usb_modeswitch
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 92ca163da7..fe54b50826 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -4,19 +4,32 @@
 #
 ################################################################################
 
-USB_MODESWITCH_VERSION = 1.2.5
+USB_MODESWITCH_VERSION = 1.2.6
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb-compat
 USB_MODESWITCH_LICENSE = GPLv2+
 USB_MODESWITCH_LICENSE_FILES = COPYING
 
+USB_MODESWITCH_BUILD_TARGETS = static
+USB_MODESWITCH_INSTALL_TARGETS = install-static
+
+ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
+	USB_MODESWITCH_DEPENDENCIES += tcl
+	USB_MODESWITCH_BUILD_TARGETS = script
+	USB_MODESWITCH_INSTALL_TARGETS = install-script
+endif
+
 define USB_MODESWITCH_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \
+		-C $(@D) $(USB_MODESWITCH_BUILD_TARGETS)
 endef
 
 define USB_MODESWITCH_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		DESTDIR=$(TARGET_DIR) \
+		-C $(@D) $(USB_MODESWITCH_INSTALL_TARGETS)
 endef
 
 
@@ -25,12 +38,7 @@ define USB_MODESWITCH_CLEAN_CMDS
 endef
 
 define USB_MODESWITCH_UNINSTALL_CMDS
-	$(RM) -f $(TARGET_DIR)/usr/sbin/usb_modeswitch
-	$(RM) -f $(TARGET_DIR)/lib/udev/usb_modeswitch
-	$(RM) -f $(TARGET_DIR)/etc/usb_modeswitch.setup
-	$(RM) -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1
-	$(RM) -rf $(TARGET_DIR)/var/lib/usb_modeswitch
-	$(RM) -f $(TARGET_DIR)/usr/sbin/usb_modeswitch_dispatcher
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) uninstall
 endef
 
 $(eval $(generic-package))

From 15ceab14b4967711119587f0e7c3b324ce11fea8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 12 Jun 2013 23:01:46 +0200
Subject: [PATCH 5406/6849] apply-patches.sh: ensure a fixed (and simple)
 sorting order is used

So we always apply patches in the samme order.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 7d5856c65d..2995ea9972 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -34,6 +34,9 @@ patchdir=${2-../kernel-patches}
 shift 2
 patchpattern=${@-*}
 
+# use a well defined sorting order
+export LC_COLLATE=C
+
 if [ ! -d "${builddir}" ] ; then
     echo "Aborting.  '${builddir}' is not a directory."
     exit 1

From ca0b3486e1e0ab96e73a29c53bfb326e92151333 Mon Sep 17 00:00:00 2001
From: Jelle Sels <jellesels@gmail.com>
Date: Tue, 11 Jun 2013 20:39:40 +0200
Subject: [PATCH 5407/6849] cups: fix upstream URL

Signed-off-by: Jelle Sels <jellesels@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index f8ace71f94..9b8d7c5d1f 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -6,7 +6,7 @@
 
 CUPS_VERSION = 1.3.11
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
-CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
+CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install

From c3f42284904346ba991e87961cfeb4fdd6b98436 Mon Sep 17 00:00:00 2001
From: Julien Boibessot <julien.boibessot@armadeus.com>
Date: Thu, 13 Jun 2013 14:59:57 +0200
Subject: [PATCH 5408/6849] ltrace: fix download URL

Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/ltrace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 78b5a9ddb6..7b8d859b0e 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTRACE_VERSION = 0.7.2
-LTRACE_SITE = http://alioth.debian.org/frs/download.php/3848
+LTRACE_SITE = http://alioth.debian.org/frs/download.php/file/3848
 LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
 LTRACE_DEPENDENCIES = libelf
 LTRACE_AUTORECONF = YES

From 11be54149cfca42226b51b7dc045e8da26b72cfe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 13 Jun 2013 10:00:23 -0300
Subject: [PATCH 5409/6849] freetype: fixup config file

Fix freetype-config's includedir and libdir since they're expanded from
configure values since bumping to version 2.4.12

Fixes:
http://autobuild.buildroot.net/results/1c7/1c70ce0ff350623cc38baf4b8b61c8a7a8586aba/
...and many others.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freetype/freetype.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 16f00fe64c..177adf50ac 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -18,5 +18,13 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 
+# Extra fixing since includedir and libdir are expanded from configure values
+define FREETYPE_FIX_CONFIG_FILE
+	$(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \
+		-e 's:^libdir=.*:libdir="$${exec_prefix}/lib":' \
+		$(STAGING_DIR)/usr/bin/freetype-config
+endef
+FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 48c86a40e0cb79024253a98e763b3002d1686051 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 14 Jun 2013 08:59:04 +0200
Subject: [PATCH 5410/6849] package/dosfstools: bump version for bug fixes

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 4664faa6c6..3f70238206 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOSFSTOOLS_VERSION = 3.0.18
+DOSFSTOOLS_VERSION = 3.0.20
 DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING

From 42aba9658d7bff3e60900b42b14ad6b8122fad0c Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 12 Jun 2013 14:42:46 -0700
Subject: [PATCH 5411/6849] sdl_image: bump to version 1.2.12

Also added:
- WEBP file format support
- License information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_image/Config.in    | 4 ++++
 package/sdl_image/sdl_image.mk | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/package/sdl_image/Config.in b/package/sdl_image/Config.in
index 36aa4a82c5..be0321ab5f 100644
--- a/package/sdl_image/Config.in
+++ b/package/sdl_image/Config.in
@@ -42,6 +42,10 @@ config BR2_PACKAGE_SDL_IMAGE_TIFF
 	bool "enable TIFF file format support"
 	select BR2_PACKAGE_TIFF
 
+config BR2_PACKAGE_SDL_IMAGE_WEBP
+	bool "enable WEBP file format support"
+	select BR2_PACKAGE_WEBP
+
 config BR2_PACKAGE_SDL_IMAGE_XCF
 	bool "enable XCF file format support"
 
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index de72a04841..3945505130 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-SDL_IMAGE_VERSION = 1.2.6
+SDL_IMAGE_VERSION = 1.2.12
 SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
 SDL_IMAGE_INSTALL_STAGING = YES
+SDL_IMAGE_LICENSE = zlib
+SDL_IMAGE_LICENSE_FILES = COPYING
 
 SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
@@ -25,6 +27,7 @@ SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \
 		--enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \
 		--enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \
+		--enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \
 		--enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \
 		--enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
 		--enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
@@ -32,6 +35,7 @@ SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 SDL_IMAGE_DEPENDENCIES = sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \
-	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff)
+	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \
+	$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
 
 $(eval $(autotools-package))

From 4aa71bba79483b69f001a810a6cd3f4739daade5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 14 Jun 2013 08:10:38 -0300
Subject: [PATCH 5412/6849] kernel-headers: bump 3.{0, 4, 9}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.81-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.82-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 77da947f33..b25e0abe94 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.81"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.82"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.45"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.48"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.49"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.5"		if BR2_KERNEL_HEADERS_3_9
+	default "3.9.6"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.81-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.82-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.81-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.82-headers_install-fix-__packed-in-exported-kernel-head.patch

From 63b4df42f4e6a7965b14595af69f3d1e822d463b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 14 Jun 2013 08:10:39 -0300
Subject: [PATCH 5413/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index a49ff8a83b..cfad172394 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.5"
+	bool "3.9.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.5" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f72467e754cc4896adabf07f9e6fabcf10653192 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 14 Jun 2013 15:14:46 -0300
Subject: [PATCH 5414/6849] iozone: fixup build system

Fixup iozone's build system to make it somewhat more flexible.
First make our own linux targets for non-AIO toolchains (uClibc) and
non-threading.
And second, just ditch forced largefile support and expect it from
CFLAGS.
Otherwise using the generic target caused issues like:
http://autobuild.buildroot.net/results/19f606f2978dc3c8039b1bccfcc562b4050083c7/
...which is fixed by this.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iozone/Config.in            |  4 --
 package/iozone/iozone-targets.patch | 92 +++++++++++++++++++++++++++++
 package/iozone/iozone.mk            | 13 ++--
 3 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 package/iozone/iozone-targets.patch

diff --git a/package/iozone/Config.in b/package/iozone/Config.in
index 5481ca15e2..26d4daafe0 100644
--- a/package/iozone/Config.in
+++ b/package/iozone/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_IOZONE
 	bool "iozone"
-	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # fork()
 	help
 	  IOzone is a filesystem benchmark tool.
 	  The benchmark generates and measures a variety of file operations
 
 	  http://www.iozone.org/
-
-comment "IOzone requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
diff --git a/package/iozone/iozone-targets.patch b/package/iozone/iozone-targets.patch
new file mode 100644
index 0000000000..258b960928
--- /dev/null
+++ b/package/iozone/iozone-targets.patch
@@ -0,0 +1,92 @@
+Add new targets for iozone:
+
+linux-noaio is for linux targets without AIO (use case: uClibc)
+linux-noth is for linux target without threads or AIO
+
+And make largefile support optional via CFLAGS.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura iozone3_414.orig/src/current/makefile iozone3_414/src/current/makefile
+--- iozone3_414.orig/src/current/makefile	2013-06-11 09:48:18.257837091 -0300
++++ iozone3_414/src/current/makefile	2013-06-11 13:05:56.338162144 -0300
+@@ -166,10 +166,28 @@
+ # GNU 'C' compiler Linux build with threads, largefiles, async I/O 
+ #
+ linux:	iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
+-	$(CC)  -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \
++	$(CC)  $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \
++		-lpthread -lrt -o iozone
++	$(CC)  $(CFLAGS) -Dlinux fileop_linux.o -o fileop
++	$(CC)  $(CFLAGS) -Dlinux pit_server.o -o pit_server
++
++#
++# GNU 'C' compiler Linux build with threads, largefiles
++#
++linux-noaio: iozone_linux-noaio.o libbif.o fileop_linux.o pit_server.o
++	$(CC)  $(CFLAGS) $(LDFLAGS) iozone_linux-noaio.o libbif.o \
++		-lpthread -lrt -o iozone
++	$(CC)  $(CFLAGS) -Dlinux fileop_linux.o -o fileop
++	$(CC)  $(CFLAGS) -Dlinux pit_server.o -o pit_server
++
++#
++# GNU 'C' compiler Linux build with largefiles
++#
++linux-noth: iozone_linux-noth.o libbif.o fileop_linux.o pit_server.o
++	$(CC)  $(CFLAGS) $(LDFLAGS) iozone_linux-noth.o libbif.o \
+ 		-lrt -o iozone
+-	$(CC)  -O3 -Dlinux fileop_linux.o -o fileop
+-	$(CC)  -O3 -Dlinux pit_server.o -o pit_server
++	$(CC)  $(CFLAGS) -Dlinux fileop_linux.o -o fileop
++	$(CC)  $(CFLAGS) -Dlinux pit_server.o -o pit_server
+ 
+ #
+ # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O 
+@@ -795,13 +813,33 @@
+ 	@echo ""
+ 	@echo "Building iozone for Linux"
+ 	@echo ""
+-	$(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \
+-		-DSHARED_MEM -Dlinux -D_LARGEFILE64_SOURCE $(CFLAGS) iozone.c \
++	$(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \
++		-DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \
+ 		-DNAME='"linux"' -o iozone_linux.o
+-	$(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \
++	$(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \
++		-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o
++	$(CC) -Wall -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
++		$(CFLAGS) libasync.c  -o libasync.o 
++
++iozone_linux-noaio.o: iozone.c libbif.c
++	@echo ""
++	@echo "Building iozone for Linux no AIO"
++	@echo ""
++	$(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \
++		-DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \
++		-DNAME='"linux"' -o iozone_linux-noaio.o
++	$(CC) -Wall -c -Dunix -DHAVE_ANSIC_C \
++		-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o
++
++iozone_linux-noth.o: iozone.c libbif.c
++	@echo ""
++	@echo "Building iozone for Linux with no threads"
++	@echo ""
++	$(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \
++		-DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \
++		-DNAME='"linux"' -o iozone_linux-noth.o
++	$(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS \
+ 		-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o
+-	$(CC) -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
+-		-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c  -o libasync.o 
+ 
+ fileop_AIX.o:	fileop.c
+ 	@echo ""
+@@ -893,7 +931,7 @@
+ 	@echo ""
+ 	@echo "Building fileop for Linux"
+ 	@echo ""
+-	$(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o
++	$(CC) -Wall -c $(CFLAGS) fileop.c -o fileop_linux.o
+ 
+ fileop_openbsd.o:	fileop.c
+ 	@echo ""
diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk
index eb0a6d89d2..970e50982d 100644
--- a/package/iozone/iozone.mk
+++ b/package/iozone/iozone.mk
@@ -11,13 +11,12 @@ IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
 # IOzone license details can be found at:
 # http://www.iozone.org/docs/Iozone_License.txt
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
-# aio.h is not available on uClibc. Select "generic" target that does not use it.
-IOZONE_TARGET = generic
-else ifeq ($(BR2_powerpc),y)
-IOZONE_TARGET = linux-powerpc
-else ifeq ($(BR2_sparc),y)
-IOZONE_TARGET = linux-sparc
+# No threading target is non-AIO as well
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+IOZONE_TARGET = linux-noth
+# AIO support not available on uClibc, use the linux (non-aio) target.
+else ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+IOZONE_TARGET = linux-noaio
 else
 IOZONE_TARGET = linux
 endif

From f5eb71790ad69460df8496e808ff12ab505b5c89 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil@zankapfel.net>
Date: Fri, 14 Jun 2013 10:47:46 +0200
Subject: [PATCH 5415/6849] New package: libqrencode

[Peter: move to libraries, fix Config.in, install into STAGING_DIR]
Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/libqrencode/Config.in      | 20 ++++++++++++++++++++
 package/libqrencode/libqrencode.mk | 21 +++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 package/libqrencode/Config.in
 create mode 100644 package/libqrencode/libqrencode.mk

diff --git a/package/Config.in b/package/Config.in
index ce82e9964b..b23da75886 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -448,6 +448,7 @@ source "package/libglade/Config.in"
 source "package/gdk-pixbuf/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
+source "package/libqrencode/Config.in"
 source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
 source "package/libsvgtiny/Config.in"
diff --git a/package/libqrencode/Config.in b/package/libqrencode/Config.in
new file mode 100644
index 0000000000..e8fc1d420d
--- /dev/null
+++ b/package/libqrencode/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_LIBQRENCODE
+	bool "libqrencode"
+	select BR2_PACKAGE_LIBPNG
+	help
+	  libqrencode is a C library for encoding data in a QR Code
+	  symbol, a kind of 2D symbology that can be scanned by handy
+	  terminals such as a mobile phone with CCD. The capacity of
+	  QR Code is up to 7000 digits or 4000 characters, and is
+	  highly robust.
+
+	  http://fukuchi.org/works/qrencode/index.html
+
+if BR2_PACKAGE_LIBQRENCODE
+
+config BR2_PACKAGE_LIBQRENCODE_TOOLS
+	bool "libqrencode tools"
+	help
+	  Build command-line tools
+
+endif #BR2_PACKAGE_LIBQRENCODE
diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk
new file mode 100644
index 0000000000..e1f236240b
--- /dev/null
+++ b/package/libqrencode/libqrencode.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# libqrencode
+#
+################################################################################
+
+LIBQRENCODE_VERSION = 3.4.2
+LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz
+LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode
+LIBQRENCODE_DEPENDENCIES = libpng
+LIBQRENCODE_INSTALL_STAGING = YES
+LIBQRENCODE_LICENSE = LGPLv2.1+
+LIBQRENCODE_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_LIBQRENCODE_TOOLS),y)
+        LIBQRENCODE_CONF_OPT += --with-tools=yes
+else
+        LIBQRENCODE_CONF_OPT += --with-tools=no
+endif
+
+$(eval $(autotools-package))

From 82fddc399e7e9dc302d6172edd2bcbdf5feca091 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Tue, 11 Jun 2013 12:18:39 +0200
Subject: [PATCH 5416/6849] Add on2-8170 kernel modules

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                            |  1 +
 package/on2-8170-modules/Config.in           | 11 ++++++++++
 package/on2-8170-modules/on2-8170-modules.mk | 23 ++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/on2-8170-modules/Config.in
 create mode 100644 package/on2-8170-modules/on2-8170-modules.mk

diff --git a/package/Config.in b/package/Config.in
index b23da75886..fa64426785 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -272,6 +272,7 @@ source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
 source "package/ofono/Config.in"
+source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
 source "package/owl-linux/Config.in"
diff --git a/package/on2-8170-modules/Config.in b/package/on2-8170-modules/Config.in
new file mode 100644
index 0000000000..18c066e996
--- /dev/null
+++ b/package/on2-8170-modules/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_ON2_8170_MODULES
+	bool "on2-8170 modules"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm926t
+	help
+	  Kernel modules for Hantro x170 hardware video decompression support.
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
+comment "on2-8170 modules requires a linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/package/on2-8170-modules/on2-8170-modules.mk b/package/on2-8170-modules/on2-8170-modules.mk
new file mode 100644
index 0000000000..800abc7742
--- /dev/null
+++ b/package/on2-8170-modules/on2-8170-modules.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# on2-8170-modules
+#
+################################################################################
+
+ON2_8170_MODULES_VERSION = 73b0806
+ON2_8170_MODULES_SITE    = http://github.com/alexandrebelloni/on2-8170-modules/tarball/$(ON2_8170_MODULES_VERSION)
+
+ON2_8170_MODULES_DEPENDENCIES = linux
+
+ON2_8170_MODULES_LICENSE = GPLv2+
+#There is no license file
+
+define ON2_8170_MODULES_BUILD_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M=$(@D)
+endef
+
+define ON2_8170_MODULES_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M=$(@D) modules_install
+endef
+
+$(eval $(generic-package))

From b31ec9d641e772c90dc646b8feba01fc4129dc88 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Tue, 11 Jun 2013 12:18:40 +0200
Subject: [PATCH 5417/6849] Add proprietary libraries for Hantro x170 HW
 decoding

[Peter: select on2-8170-modules, ensure dest dirs exist]
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |  1 +
 package/multimedia/on2-8170-libs/Config.in    | 16 ++++++++++++
 .../multimedia/on2-8170-libs/on2-8170-libs.mk | 26 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/multimedia/on2-8170-libs/Config.in
 create mode 100644 package/multimedia/on2-8170-libs/on2-8170-libs.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index dd74863fde..4cb81bf980 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -21,6 +21,7 @@ source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
+source "package/multimedia/on2-8170-libs/Config.in"
 source "package/opus-tools/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in
new file mode 100644
index 0000000000..0cf05add9f
--- /dev/null
+++ b/package/multimedia/on2-8170-libs/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_ON2_8170_LIBS
+	#This is a binary only package which has been compiled for glibc
+	depends on BR2_arm926t
+	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc)
+	depends on BR2_LINUX_KERNEL # on2-8170-modules
+	select BR2_PACKAGE_ON2_8170_MODULES # runtime
+	bool "on2-8170-libs"
+	help
+	  Libraries for Hantro X170 video decoder
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
+comment "on2-8170 libs requires a linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/package/multimedia/on2-8170-libs/on2-8170-libs.mk b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
new file mode 100644
index 0000000000..7cdb9918af
--- /dev/null
+++ b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# on2-8170-libs
+#
+################################################################################
+
+ON2_8170_LIBS_VERSION = 1.0
+ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
+
+ON2_8170_LICENSE = PROPRIETARY
+# No license file is included in the archive
+
+ON2_8170_LIBS_INSTALL_STAGING = YES
+
+define ON2_8170_LIBS_INSTALL_STAGING_CMDS
+	mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include
+	cp -dpf $(@D)/*.a $(@D)/*.so $(STAGING_DIR)/usr/lib
+	cp -dpf $(@D)/*.h $(STAGING_DIR)/usr/include
+endef
+
+define ON2_8170_LIBS_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/lib
+	cp -dpf $(@D)/*.so $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))

From 7c6a2995ddb045e5c0617997a9f1fe1f4b382571 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Tue, 11 Jun 2013 12:18:41 +0200
Subject: [PATCH 5418/6849] Add gstreamer plugin for Hantro x170

[Peter: Config.in: add comment about glibc dependency]
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |  1 +
 package/multimedia/gst-plugin-x170/Config.in  | 13 +++++++++
 .../gst-plugin-x170-01-correct-CFLAGS.patch   | 28 +++++++++++++++++++
 .../gst-plugin-x170/gst-plugin-x170.mk        | 18 ++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 package/multimedia/gst-plugin-x170/Config.in
 create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
 create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 4cb81bf980..77c0a22e0c 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -14,6 +14,7 @@ source "package/multimedia/gst-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
+source "package/multimedia/gst-plugin-x170/Config.in"
 source "package/multimedia/lame/Config.in"
 source "package/multimedia/libvpx/Config.in"
 source "package/multimedia/madplay/Config.in"
diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in
new file mode 100644
index 0000000000..fd93947608
--- /dev/null
+++ b/package/multimedia/gst-plugin-x170/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_GST_PLUGIN_X170
+	bool "gst-plugin-x170"
+	depends on BR2_PACKAGE_GSTREAMER
+	depends on BR2_arm926t
+	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc) # on2-8170-libs
+	select BR2_PACKAGE_ON2_8170_LIBS
+	help
+	  GStreamer plug-in to use the Hantro X170 video decoder present on
+	  ATMEL AT91SAM9M10 SoC.
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch b/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
new file mode 100644
index 0000000000..9c32e46cce
--- /dev/null
+++ b/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
@@ -0,0 +1,28 @@
+The configure script is correctly getting the CFLAGS needed to compile a plugin
+for gstreamer and storing them in GST_BASE_CFLAGS but the Makefiles are never
+making use of those.
+
+We actually have to use AM_CPPFLAGS as AM_CFLAGS is used everywhere but on the
+real compiling rule...
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+---
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8cb51d1..6af5d91 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,6 +5,8 @@
+ ##############################################################################
+ plugin_LTLIBRARIES = libgstx170.la
+ 
++AM_CPPFLAGS = @GST_BASE_CFLAGS@
++
+ ##############################################################################
+ # for the next set of variables, rename the prefix if you renamed the .la,   #
+ #  e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES                 #
+-- 
+1.8.1.2
+
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk b/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
new file mode 100644
index 0000000000..a6143ed512
--- /dev/null
+++ b/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# gst-plugins-x170
+#
+################################################################################
+
+GST_PLUGIN_X170_VERSION = 1.0
+GST_PLUGIN_X170_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
+
+GST_PLUGIN_X170_LICENSE = BSD-1c
+#A license file is included but it is just a placeholder
+
+# There is no generated configure script in the tarball.
+GST_PLUGIN_X170_AUTORECONF = YES
+GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/
+GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs
+
+$(eval $(autotools-package))

From 4d27205ab1c140f9d81fa200f36d118a3dbdad33 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <Spenser309@gmail.com>
Date: Wed, 15 May 2013 18:12:02 -0500
Subject: [PATCH 5419/6849] uboot: Add ELF target

adds ELF image option to uboot

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 3 +++
 boot/uboot/uboot.mk  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index a1874a1583..aadf75707b 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -98,6 +98,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 	depends on BR2_bfin
 	bool "u-boot.ldr"
 
+config BR2_TARGET_UBOOT_FORMAT_ELF
+	bool "u-boot.elf"
+
 endchoice
 
 config BR2_TARGET_UBOOT_OMAP_IFT
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 3e188ee8ab..b357e0f06b 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -26,7 +26,9 @@ UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_SOURCE  = u-boot-$(UBOOT_VERSION).tar.bz2
 endif
 
-ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
+ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
+UBOOT_BIN          = u-boot
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
 UBOOT_BIN          = u-boot.kwb
 UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)

From 3874b0d978b8f15d3f7769a309d1a27735788559 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 16 Jun 2013 18:51:54 +0200
Subject: [PATCH 5420/6849] sconeserver: add patch to fix build issue

Fixes:

  http://autobuild.buildroot.org/results/f28/f2856c00d99fbf9ce882442ab7b868ccc4966388/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sconeserver-fix-configure-operators.patch | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 package/sconeserver/sconeserver-fix-configure-operators.patch

diff --git a/package/sconeserver/sconeserver-fix-configure-operators.patch b/package/sconeserver/sconeserver-fix-configure-operators.patch
new file mode 100644
index 0000000000..504be455e1
--- /dev/null
+++ b/package/sconeserver/sconeserver-fix-configure-operators.patch
@@ -0,0 +1,93 @@
+configure: use the proper '=' POSIX shell operator
+
+The '==' shell operator doesn't work in POSIX shells, so when sh is
+symlinked to a POSIX shell such as dash and not a bash shell, the
+configure tests that use this operator fail to work.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: sconeserver-211/configure.in
+===================================================================
+--- sconeserver-211.orig/configure.in	2013-05-14 12:00:19.000000000 +0200
++++ sconeserver-211/configure.in	2013-06-16 18:47:31.000000000 +0200
+@@ -121,7 +121,7 @@
+   [SSL="$withval"],
+   [AC_CHECK_HEADER([openssl/ssl.h],[SSL="yes"],[SSL="no"])]
+ )
+-if test "x$SSL" == "xyes"; then
++if test "x$SSL" = "xyes"; then
+   AC_CHECK_HEADER([openssl/ssl.h],,
+     [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL, use --with-openssl-path=PATH])]
+   )
+@@ -179,7 +179,7 @@
+ )
+ 
+ # Check we have libxml2 if Sconesite is enabled
+-if test "x$SCONESITE" == "xyes"; then
++if test "x$SCONESITE" = "xyes"; then
+   if test "x$ac_cv_lib_xml2_xmlNewDoc" != "xyes"; then
+     AC_MSG_ERROR([library 'libxml2' is required for Sconesite])
+   fi
+@@ -195,7 +195,7 @@
+   [MAGICK_CONFIG="Magick++-config"]
+ )
+ AC_CHECK_PROG([MAGICK], ["$MAGICK_CONFIG"], [yes], [no])
+-if test "x$MAGICK" == "xyes"; then
++if test "x$MAGICK" = "xyes"; then
+   MAGICK_CFLAGS=`$MAGICK_CONFIG --cppflags`
+   MAGICK_LDFLAGS=`$MAGICK_CONFIG --ldflags`
+   MAGICK_LIBS=`$MAGICK_CONFIG --libs`
+@@ -209,7 +209,7 @@
+ )
+ 
+ # Need ImageMagick for image
+-if test "x$IMAGE" == "xyes"; then
++if test "x$IMAGE" = "xyes"; then
+   if test "x$MAGICK" != "xyes"; then
+     AC_MSG_ERROR([library 'Magick++' is required for image])
+   fi
+@@ -227,7 +227,7 @@
+   [RSS="yes"]
+ )
+ # Need libxml2 library for rss
+-if test "x$RSS" == "xyes"; then
++if test "x$RSS" = "xyes"; then
+   if test "x$ac_cv_lib_xml2_xmlNewDoc" != "xyes"; then
+     AC_MSG_ERROR([library 'libxml2' is required for the rss module])
+   fi
+@@ -249,7 +249,7 @@
+   [AC_CHECK_HEADER([mysql/mysql.h],[MYSQL="yes"],[MYSQL="no"])]
+ )
+ # Need mysqlclient library for mysql
+-if test "x$MYSQL" == "xyes"; then
++if test "x$MYSQL" = "xyes"; then
+   AC_CHECK_LIB([mysqlclient],[mysql_init],
+     [CXXFLAGS="$CXXFLAGS `$MYSQL_CONFIG --cflags`"
+      MYSQL_LIBADD=`$MYSQL_CONFIG --libs`
+@@ -266,7 +266,7 @@
+   [AC_CHECK_HEADER([sqlite3.h],[SQLITE="yes"],[SQLITE="no"])]
+ )
+ # Need sqlite3 library for sqlite
+-if test "x$SQLITE" == "xyes"; then
++if test "x$SQLITE" = "xyes"; then
+   AC_CHECK_LIB([sqlite3],[sqlite3_open_v2],
+     [SQLITE_LIBADD="-lsqlite3"
+      AC_SUBST(SQLITE_LIBADD)],
+@@ -283,7 +283,7 @@
+   [AC_CHECK_HEADER([mpfr.h],[MATHS="yes"],[MATHS="no"])]
+ )
+ # Need libgmp and libmpfr library for maths
+-if test "x$MATHS" == "xyes"; then
++if test "x$MATHS" = "xyes"; then
+   AC_CHECK_LIB([mpfr],[mpfr_init],
+     [MATHS_LIBADD="-lgmp -lmpfr"
+      AC_SUBST(MATHS_LIBADD)],
+@@ -300,7 +300,7 @@
+   [AC_CHECK_HEADER([X11/Xlib.h],[UI="yes"],[UI="no"])]
+ )
+ # Need libX11 library for ui
+-if test "x$UI" == "xyes"; then
++if test "x$UI" = "xyes"; then
+   AC_CHECK_LIB([X11],[XOpenDisplay],
+     [UI_LIBADD="-lX11"
+      AC_SUBST(UI_LIBADD)],

From 9d191513512a4ff811508dd387928e00831a878d Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Sun, 9 Jun 2013 10:53:50 +0800
Subject: [PATCH 5421/6849] arm: update processor types

Update arm architecture variant: add the cortex A7.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm      | 5 +++++
 toolchain/gcc/Config.in | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 2f4c0c8778..983cac48f2 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -36,6 +36,9 @@ config BR2_arm1176jzf_s
 config BR2_cortex_a5
 	bool "cortex-A5"
 	select BR2_ARM_CPU_MAYBE_HAS_NEON
+config BR2_cortex_a7
+	bool "cortex-A7"
+	select BR2_ARM_CPU_HAS_NEON
 config BR2_cortex_a8
 	bool "cortex-A8"
 	select BR2_ARM_CPU_HAS_NEON
@@ -113,6 +116,7 @@ config BR2_GCC_TARGET_TUNE
 	default "arm1176jz-s"	if BR2_arm1176jz_s
 	default "arm1176jzf-s"	if BR2_arm1176jzf_s
 	default "cortex-a5"	if BR2_cortex_a5
+	default "cortex-a7"	if BR2_cortex_a7
 	default "cortex-a8"	if BR2_cortex_a8
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a15"	if BR2_cortex_a15
@@ -134,6 +138,7 @@ config BR2_GCC_TARGET_ARCH
 	default "armv6zk"	if BR2_arm1176jz_s
 	default "armv6zk"	if BR2_arm1176jzf_s
 	default "armv7-a"	if BR2_cortex_a5
+	default "armv7-a"	if BR2_cortex_a7
 	default "armv7-a"	if BR2_cortex_a8
 	default "armv7-a"	if BR2_cortex_a9
 	default "armv7-a"	if BR2_cortex_a15
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index fdb19e1052..7830241b90 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -23,20 +23,20 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
 

From 07278078a65559400458d7ad07f18f93f5e20ebf Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Sat, 8 Jun 2013 00:34:38 +0200
Subject: [PATCH 5422/6849] Add documentation for the header style

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt |  4 ++--
 docs/manual/adding-packages-cmake.txt     |  4 ++--
 docs/manual/adding-packages-generic.txt   |  4 ++--
 docs/manual/writing-rules.txt             | 12 ++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 1d5f30bc3c..1e7b058860 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -13,11 +13,11 @@ First, let's see how to write a +.mk+ file for an autotools-based
 package, with an example :
 
 ------------------------
-01: #############################################################
+01: ################################################################################
 02: #
 03: # libfoo
 04: #
-05: #############################################################
+05: ################################################################################
 06:
 07: LIBFOO_VERSION = 1.0
 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index 6ac073c359..b7388c81da 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -13,11 +13,11 @@ First, let's see how to write a +.mk+ file for a CMake-based package,
 with an example :
 
 ------------------------
-01: #############################################################
+01: ################################################################################
 02: #
 03: # libfoo
 04: #
-05: #############################################################
+05: ################################################################################
 06:
 07: LIBFOO_VERSION = 1.0
 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 0d7504241b..faf70b1d89 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -15,11 +15,11 @@ system is based on hand-written Makefiles or shell scripts.
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ------------------------------
-01: #############################################################
+01: ################################################################################
 02: #
 03: # libfoo
 04: #
-05: #############################################################
+05: ################################################################################
 06:
 07: LIBFOO_VERSION = 1.0
 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index c9816a4402..b649c9fd8b 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -52,6 +52,18 @@ http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[].
 The +.mk+ file
 ~~~~~~~~~~~~~~
 
+* Header: The file starts with a header. It contains the module name,
+preferably in lowercase, enclosed between separators made of 80 hashes. A
+blank line is mandatory after the header:
++
+---------------------
+################################################################################
+#
+# libfoo
+#
+################################################################################
+---------------------
++
 * Assignment: use +=+ preceded and followed by one space:
 +
 ---------------------

From 5b81dd47703fd099e2b257ed0680ddc39524ace5 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 20 May 2013 15:56:38 +0300
Subject: [PATCH 5423/6849] luabitop: New package

Lua library for binary operations

[Peter: fix header, use TARGET_CONFIGURE_OPTS]
Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/luabitop/Config.in   |  7 +++++++
 package/luabitop/luabitop.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/luabitop/Config.in
 create mode 100644 package/luabitop/luabitop.mk

diff --git a/package/Config.in b/package/Config.in
index fa64426785..f218f65e5d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -314,6 +314,7 @@ menu "LUA libraries/modules"
 source "package/cgilua/Config.in"
 source "package/copas/Config.in"
 source "package/coxpcall/Config.in"
+source "package/luabitop/Config.in"
 source "package/luacjson/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
diff --git a/package/luabitop/Config.in b/package/luabitop/Config.in
new file mode 100644
index 0000000000..83a85b16cd
--- /dev/null
+++ b/package/luabitop/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUABITOP
+	bool "luabitop"
+	help
+	  Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise
+	  operations on numbers.
+
+	  http://bitop.luajit.org
diff --git a/package/luabitop/luabitop.mk b/package/luabitop/luabitop.mk
new file mode 100644
index 0000000000..c61e826c02
--- /dev/null
+++ b/package/luabitop/luabitop.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# luabitop
+#
+################################################################################
+
+LUABITOP_VERSION = 1.0.2
+LUABITOP_SOURCE = LuaBitOp-$(LUABITOP_VERSION).tar.gz
+LUABITOP_SITE = http://bitop.luajit.org/download
+LUABITOP_LICENSE = MIT
+LUABITOP_LICENSE_FILES = README
+LUABITOP_DEPENDENCIES = lua
+
+define LUABITOP_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define LUABITOP_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/lib/lua
+	$(INSTALL) -p $(@D)/bit.so $(TARGET_DIR)/usr/lib/lua
+endef
+
+define LUABITOP_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 25c3160092d7e542f77bf496af5ca7f0dc677aeb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 17 Jun 2013 08:06:48 -0300
Subject: [PATCH 5424/6849] uClibc 0.9.31: remove stray kludges/conditions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host           | 11 +++++------
 package/connman/Config.in                 |  4 ++--
 package/libglib2/libglib2.mk              |  2 +-
 toolchain/toolchain-buildroot/Config.in.2 | 11 +----------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index d9bab441f0..3d687fe745 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -4,8 +4,7 @@ choice
 	prompt "Binutils Version"
 	depends on !BR2_arc
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
-	default BR2_BINUTILS_VERSION_2_21_1 if (!BR2_UCLIBC_VERSION_0_9_31)
-	default BR2_BINUTILS_VERSION_2_21
+	default BR2_BINUTILS_VERSION_2_21_1
 	help
 	  Select the version of binutils you wish to use.
 
@@ -22,19 +21,19 @@ choice
 		bool "binutils 2.21"
 
 	config BR2_BINUTILS_VERSION_2_21_1
-		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		depends on !BR2_avr32
 		bool "binutils 2.21.1"
 
 	config BR2_BINUTILS_VERSION_2_22
-		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		depends on !BR2_avr32
 		bool "binutils 2.22"
 
 	config BR2_BINUTILS_VERSION_2_23_1
-		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		depends on !BR2_avr32
 		bool "binutils 2.23.1"
 
 	config BR2_BINUTILS_VERSION_2_23_2
-		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		depends on !BR2_avr32
 		bool "binutils 2.23.2"
 
 endchoice
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 93f9ab518f..e0505b3125 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
-	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
+	depends on !BR2_UCLIBC_VERSION_0_9_32
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
@@ -50,5 +50,5 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 endif # BR2_PACKAGE_CONNMAN
 
 comment "connman needs a toolchain with IPv6, WCHAR, thread and resolver support"
-	depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || \
+	depends on BR2_UCLIBC_VERSION_0_9_32 || \
 		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 8a63bd9492..4821a765f9 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -52,7 +52,7 @@ LIBGLIB2_CONF_ENV = \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r
-ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+ifeq ($(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 else
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 35d6db2be6..f58a4f78d9 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -44,19 +44,11 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE
 config BR2_TOOLCHAIN_BUILDROOT_CXX
 	bool "Enable C++ support"
 	select BR2_INSTALL_LIBSTDCPP
-	depends on !(! BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && \
-		       BR2_TOOLCHAIN_BUILDROOT_LOCALE    && \
-		       BR2_UCLIBC_VERSION_0_9_31)
 	help
 	  Enable this option if you want your toolchain to support the
 	  C++ language and you want C++ libraries to be installed on
 	  your target system.
 
-comment "C++ support broken in uClibc 0.9.31 with locale enabled with gcc 4.2"
-	depends on !BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && \
-		    BR2_TOOLCHAIN_BUILDROOT_LOCALE    && \
-		    BR2_UCLIBC_VERSION_0_9_31
-
 config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 	bool "Enable stack protection support"
 	help
@@ -68,7 +60,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
+	default BR2_PTHREADS_NATIVE if !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -92,7 +84,6 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 	        select BR2_TOOLCHAIN_HAS_THREADS
-		depends on !BR2_UCLIBC_VERSION_0_9_31
 		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32

From a28ec29a9ed80b36c41dc6c549191e6f2453fe7b Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 17 Jun 2013 08:28:09 +0300
Subject: [PATCH 5425/6849] lbase64: New package

This package adds base64 encode/decode functionality for Lua

[Peter: fix file header, use TARGET_CONFIGURE_OPTS, drop quotes around paths]
Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/lbase64/Config.in  |  6 ++++++
 package/lbase64/lbase64.mk | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 package/lbase64/Config.in
 create mode 100644 package/lbase64/lbase64.mk

diff --git a/package/Config.in b/package/Config.in
index f218f65e5d..2d32a9ff16 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -314,6 +314,7 @@ menu "LUA libraries/modules"
 source "package/cgilua/Config.in"
 source "package/copas/Config.in"
 source "package/coxpcall/Config.in"
+source "package/lbase64/Config.in"
 source "package/luabitop/Config.in"
 source "package/luacjson/Config.in"
 source "package/luaexpat/Config.in"
diff --git a/package/lbase64/Config.in b/package/lbase64/Config.in
new file mode 100644
index 0000000000..bd8503a168
--- /dev/null
+++ b/package/lbase64/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LBASE64
+	bool "lbase64"
+	help
+	  A base64 library for Lua
+
+	  http://luaforge.net/projects/lbase64/
diff --git a/package/lbase64/lbase64.mk b/package/lbase64/lbase64.mk
new file mode 100644
index 0000000000..87dda403f2
--- /dev/null
+++ b/package/lbase64/lbase64.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# lbase64
+#
+################################################################################
+
+LBASE64_VERSION = 20100323
+LBASE64_SITE = http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1
+LBASE64_SOURCE = lbase64.tar.gz
+LBASE64_LICENSE = Public domain
+LBASE64_LICENSE_FILES = README
+LBASE64_DEPENDENCIES = lua
+
+define LBASE64_BUILD_CMDS
+       $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" so
+endef
+
+define LBASE64_INSTALL_TARGET_CMDS
+       $(INSTALL) -D -m 0755 $(@D)/base64.so \
+		$(TARGET_DIR)/usr/lib/lua/base64.so
+endef
+
+define LBASE64_UNINSTALL_TARGET_CMDS
+       rm -f $(TARGET_DIR)/usr/lib/lua/base64.so
+endef
+
+define LBASE64_CLEAN_CMDS
+       $(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 1286135afce5aa02e5794d7f036462d8396a8e42 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 17 Jun 2013 08:55:48 +0300
Subject: [PATCH 5426/6849] lua-ev: New package

Lua bindings for libev

[Peter: fix file header]
Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/lua-ev/Config.in |  7 +++++++
 package/lua-ev/lua-ev.mk | 14 ++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/lua-ev/Config.in
 create mode 100644 package/lua-ev/lua-ev.mk

diff --git a/package/Config.in b/package/Config.in
index 2d32a9ff16..92927e398c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -320,6 +320,7 @@ source "package/luacjson/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
+source "package/lua-ev/Config.in"
 source "package/lua-msgpack-native/Config.in"
 source "package/rings/Config.in"
 source "package/wsapi/Config.in"
diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in
new file mode 100644
index 0000000000..1e89c270a0
--- /dev/null
+++ b/package/lua-ev/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_EV
+	bool "lua-ev"
+	select BR2_PACKAGE_LIBEV
+	help
+	  Get access to the libev library from Lua.
+
+	  https://github.com/brimworks/lua-ev
diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk
new file mode 100644
index 0000000000..2b03936c2d
--- /dev/null
+++ b/package/lua-ev/lua-ev.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-ev
+#
+################################################################################
+
+LUA_EV_VERSION = 458165b
+LUA_EV_SITE = http://github.com/brimworks/lua-ev/tarball/$(LUA_EV_VERSION)
+LUA_EV_DEPENDENCIES = lua libev
+LUA_EV_LICENSE = MIT
+LUA_EV_LICENSE_FILES = README
+LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua"
+
+$(eval $(cmake-package))

From 4630a6a8472a0f9f30fbacbefde7c45d6507156a Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 17 Jun 2013 09:16:25 +0300
Subject: [PATCH 5427/6849] luacrypto: New package

LuaCrypto provides a Lua frontend to the OpenSSL cryptographic library.

[Peter: fix file header]
Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/luacrypto/Config.in    | 12 ++++++++++++
 package/luacrypto/luacrypto.mk | 14 ++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/luacrypto/Config.in
 create mode 100644 package/luacrypto/luacrypto.mk

diff --git a/package/Config.in b/package/Config.in
index 92927e398c..bcc3470b75 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -317,6 +317,7 @@ source "package/coxpcall/Config.in"
 source "package/lbase64/Config.in"
 source "package/luabitop/Config.in"
 source "package/luacjson/Config.in"
+source "package/luacrypto/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
diff --git a/package/luacrypto/Config.in b/package/luacrypto/Config.in
new file mode 100644
index 0000000000..f4587c30f7
--- /dev/null
+++ b/package/luacrypto/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LUACRYPTO
+	bool "luacrypto"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LUASOCKET
+	help
+	  LuaCrypto provides a Lua frontend to the OpenSSL cryptographic
+	  library.
+	  The OpenSSL features that are currently exposed are digests (MD5,
+	  SHA-1, HMAC, and more) and crypto-grade random number generators
+	  communication.
+
+	  http://luacrypto.luaforge.net
diff --git a/package/luacrypto/luacrypto.mk b/package/luacrypto/luacrypto.mk
new file mode 100644
index 0000000000..ca57c65857
--- /dev/null
+++ b/package/luacrypto/luacrypto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# luacrypto
+#
+################################################################################
+
+LUACRYPTO_VERSION = 0.3.2
+LUACRYPTO_SITE = http://github.com/mkottman/luacrypto/tarball/$(LUACRYPTO_VERSION)
+LUACRYPTO_LICENSE = MIT
+LUACRYPTO_LICENSE_FILES = COPYING
+LUACRYPTO_DEPENDENCIES = lua openssl
+LUACRYPTO_CONF_OPT = "-DLUA_LIBRARIES=\"$(STAGING_DIR)/usr/lib/liblua.so\""
+
+$(eval $(cmake-package))

From 69a0a1e1d369fc2312b741f009bcecaf1ee33798 Mon Sep 17 00:00:00 2001
From: John Stile <johns@msli.com>
Date: Sun, 10 Mar 2013 18:23:14 -0700
Subject: [PATCH 5428/6849] dhcpcd: new package

Dhcpcd is an RFC2131 compliant DHCP client.

[Peter: needs ipv6, fix whitespace/file header]
Signed-off-by: John Stile <john@stilen.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/dhcpcd/Config.in | 10 ++++++++++
 package/dhcpcd/dhcpcd.mk | 42 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 package/dhcpcd/Config.in
 create mode 100644 package/dhcpcd/dhcpcd.mk

diff --git a/package/Config.in b/package/Config.in
index bcc3470b75..5b066dc35b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -703,6 +703,7 @@ source "package/hplip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
+source "package/dhcpcd/Config.in"
 source "package/dhcpdump/Config.in"
 source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
new file mode 100644
index 0000000000..a06a9730e5
--- /dev/null
+++ b/package/dhcpcd/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_DHCPCD
+	depends on BR2_INET_IPV6
+	bool "dhcpcd"
+	help
+	  An RFC2131 compliant DHCP client
+
+	  http://roy.marples.name/downloads/dhcpcd
+
+comment "dhcpcd requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
new file mode 100644
index 0000000000..9d4a72beb4
--- /dev/null
+++ b/package/dhcpcd/dhcpcd.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# dhcpcd
+#
+################################################################################
+
+DHCPCD_VERSION = 5.6.7
+DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2
+DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd/
+DHCPCD_LICENSE = BSD-2c
+
+ifeq ($(BR2_USE_MMU),)
+	DHCPCD_CONFIG_OPT += --disable-fork
+endif
+
+define DHCPCD_CONFIGURE_CMDS
+	(cd $(@D); \
+	./configure \
+		--target=$(BR2_GCC_TARGET_ARCH) \
+		--os=linux \
+		$(DHCPCD_CONFIG_OPT) )
+endef
+
+define DHCPCD_BUILD_CMDS
+	$(MAKE) \
+		$(TARGET_CONFIGURE_OPTS) \
+		-C $(@D) all
+endef
+
+define DHCPCD_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/dhcpcd \
+		$(TARGET_DIR)/usr/bin/dhcpcd
+	$(INSTALL) -D -m 0644 $(@D)/dhcpcd.conf \
+		$(TARGET_DIR)/etc/dhcpcd.conf
+	$(INSTALL) -D -m 0755 $(@D)/dhcpcd-run-hooks \
+		$(TARGET_DIR)/libexec/dhcpcd-run-hooks
+endef
+
+# NOTE: Even though this package has a configure script, it is not generated
+# using the autotools, so we have to use the generic package infrastructure.
+
+$(eval $(call generic-package))

From 21736a695335aa76da606659c6db7b0bcb25dade Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 18 Jun 2013 12:40:05 +0100
Subject: [PATCH 5429/6849] sconeserver: bump version

A patch from Thomas Petazzoni has been upstreamed in sconeserver; bump version
and remove the patch from Buildroot.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../sconeserver-fix-configure-operators.patch | 93 -------------------
 package/sconeserver/sconeserver.mk            |  2 +-
 2 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 package/sconeserver/sconeserver-fix-configure-operators.patch

diff --git a/package/sconeserver/sconeserver-fix-configure-operators.patch b/package/sconeserver/sconeserver-fix-configure-operators.patch
deleted file mode 100644
index 504be455e1..0000000000
--- a/package/sconeserver/sconeserver-fix-configure-operators.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-configure: use the proper '=' POSIX shell operator
-
-The '==' shell operator doesn't work in POSIX shells, so when sh is
-symlinked to a POSIX shell such as dash and not a bash shell, the
-configure tests that use this operator fail to work.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: sconeserver-211/configure.in
-===================================================================
---- sconeserver-211.orig/configure.in	2013-05-14 12:00:19.000000000 +0200
-+++ sconeserver-211/configure.in	2013-06-16 18:47:31.000000000 +0200
-@@ -121,7 +121,7 @@
-   [SSL="$withval"],
-   [AC_CHECK_HEADER([openssl/ssl.h],[SSL="yes"],[SSL="no"])]
- )
--if test "x$SSL" == "xyes"; then
-+if test "x$SSL" = "xyes"; then
-   AC_CHECK_HEADER([openssl/ssl.h],,
-     [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL, use --with-openssl-path=PATH])]
-   )
-@@ -179,7 +179,7 @@
- )
- 
- # Check we have libxml2 if Sconesite is enabled
--if test "x$SCONESITE" == "xyes"; then
-+if test "x$SCONESITE" = "xyes"; then
-   if test "x$ac_cv_lib_xml2_xmlNewDoc" != "xyes"; then
-     AC_MSG_ERROR([library 'libxml2' is required for Sconesite])
-   fi
-@@ -195,7 +195,7 @@
-   [MAGICK_CONFIG="Magick++-config"]
- )
- AC_CHECK_PROG([MAGICK], ["$MAGICK_CONFIG"], [yes], [no])
--if test "x$MAGICK" == "xyes"; then
-+if test "x$MAGICK" = "xyes"; then
-   MAGICK_CFLAGS=`$MAGICK_CONFIG --cppflags`
-   MAGICK_LDFLAGS=`$MAGICK_CONFIG --ldflags`
-   MAGICK_LIBS=`$MAGICK_CONFIG --libs`
-@@ -209,7 +209,7 @@
- )
- 
- # Need ImageMagick for image
--if test "x$IMAGE" == "xyes"; then
-+if test "x$IMAGE" = "xyes"; then
-   if test "x$MAGICK" != "xyes"; then
-     AC_MSG_ERROR([library 'Magick++' is required for image])
-   fi
-@@ -227,7 +227,7 @@
-   [RSS="yes"]
- )
- # Need libxml2 library for rss
--if test "x$RSS" == "xyes"; then
-+if test "x$RSS" = "xyes"; then
-   if test "x$ac_cv_lib_xml2_xmlNewDoc" != "xyes"; then
-     AC_MSG_ERROR([library 'libxml2' is required for the rss module])
-   fi
-@@ -249,7 +249,7 @@
-   [AC_CHECK_HEADER([mysql/mysql.h],[MYSQL="yes"],[MYSQL="no"])]
- )
- # Need mysqlclient library for mysql
--if test "x$MYSQL" == "xyes"; then
-+if test "x$MYSQL" = "xyes"; then
-   AC_CHECK_LIB([mysqlclient],[mysql_init],
-     [CXXFLAGS="$CXXFLAGS `$MYSQL_CONFIG --cflags`"
-      MYSQL_LIBADD=`$MYSQL_CONFIG --libs`
-@@ -266,7 +266,7 @@
-   [AC_CHECK_HEADER([sqlite3.h],[SQLITE="yes"],[SQLITE="no"])]
- )
- # Need sqlite3 library for sqlite
--if test "x$SQLITE" == "xyes"; then
-+if test "x$SQLITE" = "xyes"; then
-   AC_CHECK_LIB([sqlite3],[sqlite3_open_v2],
-     [SQLITE_LIBADD="-lsqlite3"
-      AC_SUBST(SQLITE_LIBADD)],
-@@ -283,7 +283,7 @@
-   [AC_CHECK_HEADER([mpfr.h],[MATHS="yes"],[MATHS="no"])]
- )
- # Need libgmp and libmpfr library for maths
--if test "x$MATHS" == "xyes"; then
-+if test "x$MATHS" = "xyes"; then
-   AC_CHECK_LIB([mpfr],[mpfr_init],
-     [MATHS_LIBADD="-lgmp -lmpfr"
-      AC_SUBST(MATHS_LIBADD)],
-@@ -300,7 +300,7 @@
-   [AC_CHECK_HEADER([X11/Xlib.h],[UI="yes"],[UI="no"])]
- )
- # Need libX11 library for ui
--if test "x$UI" == "xyes"; then
-+if test "x$UI" = "xyes"; then
-   AC_CHECK_LIB([X11],[XOpenDisplay],
-     [UI_LIBADD="-lX11"
-      AC_SUBST(UI_LIBADD)],
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index ff6eada2c4..62cc0ee7a0 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -6,7 +6,7 @@
 
 # Release 0.6.0 doesn't build cleanly, so use a recent
 # Subversion trunk snapshot.
-SCONESERVER_VERSION = 211
+SCONESERVER_VERSION = 212
 SCONESERVER_SITE = svn://svn.code.sf.net/p/sconeserver/code/trunk
 SCONESERVER_SITE_METHOD = svn
 SCONESERVER_LICENSE = GPLv2+

From 1c9c40d53b1268ccf35044ceb56431a92164e3a6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 19 Jun 2013 20:23:09 +0200
Subject: [PATCH 5430/6849] kernel-headers: bump 3.2.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index b25e0abe94..5667efb225 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -72,7 +72,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "3.0.82"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.45"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.47"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.49"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5

From 9dab397a4fa019b6b0825809d13f93214212284b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 19 Jun 2013 20:27:01 +0200
Subject: [PATCH 5431/6849] system/skeleton: remove /etc/hostname

We already provide BR2_TARGET_GENERIC_HOSTNAME to set /etc/hostname,
so a default /etc/hostname file isn't needed.

More importantly, if the user has explictly set BR2_TARGET_GENERIC_HOSTNAME
to the empty string, we would still end up with a /etc/hostname containing
'buildroot' which is unlikely to be what the user wanted.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/skeleton/etc/hostname | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 system/skeleton/etc/hostname

diff --git a/system/skeleton/etc/hostname b/system/skeleton/etc/hostname
deleted file mode 100644
index 5b26b355e3..0000000000
--- a/system/skeleton/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-buildroot

From 53e498da2f2ebfc87c3de0fe18bc9132e94b4fcb Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Tue, 18 Jun 2013 14:22:34 -0700
Subject: [PATCH 5432/6849] socketcand: bump to version 0.3.1

Since version 0.3.0, libconfig has been made optional

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socketcand/Config.in     | 1 -
 package/socketcand/socketcand.mk | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
index d5d02de85c..72315c0d44 100644
--- a/package/socketcand/Config.in
+++ b/package/socketcand/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SOCKETCAND
 	bool "socketcand"
-	select BR2_PACKAGE_LIBCONFIG
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Socketcand is a daemon that provides access to CAN interfaces
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index d85eb1a904..8e4269807a 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
-SOCKETCAND_VERSION = 7d06986
+SOCKETCAND_VERSION = dc3437ab
 SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/$(SOCKETCAND_VERSION)
 SOCKETCAND_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
 SOCKETCAND_DEPENDENCIES = libconfig
+else
+SOCKETCAND_CONF_OPT = --without-config
+endif
 
 $(eval $(autotools-package))

From e26267ef2e4f4d2548d081fb85428fa45f9c6276 Mon Sep 17 00:00:00 2001
From: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed, 19 Jun 2013 17:56:28 +0200
Subject: [PATCH 5433/6849] usbmount: stop using blkid, use udev environment
 variables instead

The blkid binary is not any longer installed when libblkid from
util-linux is selected. udev has a builtin blkid command though
and already detects all values that we are interested in. Change
the usbmount script to use the environment variables set by udev
instead of calling blkid directly.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbmount/Config.in                    |  8 +--
 ...se-udev-environment-instead-of-blkid.patch | 71 +++++++++++++++++++
 package/usbmount/usbmount.mk                  |  2 +-
 3 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch

diff --git a/package/usbmount/Config.in b/package/usbmount/Config.in
index 30c7b5a5ca..2583e7cc7c 100644
--- a/package/usbmount/Config.in
+++ b/package/usbmount/Config.in
@@ -1,16 +1,12 @@
 config BR2_PACKAGE_USBMOUNT
 	bool "usbmount"
-	depends on BR2_LARGEFILE # util-linux
-	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_LOCKFILE_PROGS
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	help
 	  The usbmount package automatically mounts USB mass storage devices
 	  when they are plugged in, and unmounts them when they are removed.
 
 	  http://usbmount.alioth.debian.org/
 
-comment "usbmount requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) && BR2_PACKAGE_UDEV
+comment "usbmount requires udev to be enabled"
+	depends on !BR2_PACKAGE_UDEV
diff --git a/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch b/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch
new file mode 100644
index 0000000000..27928b5d54
--- /dev/null
+++ b/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch
@@ -0,0 +1,71 @@
+udev can provide all the values that usbmount determined using the
+blkid binary. This patch drops use of blkid in favor of using the
+environment variables set by udev. Thus it removes the dependency
+on blkid from usbmount.
+
+Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
+--- usbmount-0.0.22/usbmount.orig	2013-06-18 14:44:40.143096147 +0200
++++ usbmount-0.0.22/usbmount	2013-06-19 16:13:09.882434896 +0200
+@@ -59,11 +59,6 @@
+     exit 0
+ fi
+ 
+-if [ ! -x /sbin/blkid ]; then
+-    log err "cannot execute /sbin/blkid"
+-    exit 1
+-fi
+-
+ # Per Policy 9.3.2, directories under /var/run have to be created
+ # after every reboot.
+ if [ ! -e /var/run/usbmount ]; then
+@@ -83,15 +78,7 @@
+     trap '( lockfile-remove /var/run/usbmount/.mount )' 0
+     log debug "acquired lock /var/run/usbmount/.mount.lock"
+ 
+-    # Grab device information from device and "divide it"
+-    #   FIXME: improvement: implement mounting by label (notice that labels
+-    #   can contain spaces, which makes things a little bit less comfortable).
+-    DEVINFO=$(/sbin/blkid -p $DEVNAME)
+-    FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+-    UUID=$(echo "$DEVINFO"   | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+-    USAGE=$(echo "$DEVINFO"  | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+-
+-    if ! echo $USAGE | egrep -q "(filesystem|disklabel)"; then
++    if ! echo $ID_FS_USAGE | egrep -q "(filesystem|disklabel)"; then
+ 	log info "$DEVNAME does not contain a filesystem or disklabel"
+ 	exit 1
+     fi
+@@ -101,14 +88,14 @@
+ 	log info "executing command: mount $DEVNAME"
+ 	mount $DEVNAME || log err "mount by DEVNAME with $DEVNAME wasn't successful; return code $?"
+ 
+-    elif grep -q "^[[:blank:]]*UUID=$UUID" /etc/fstab; then
+-        log info "executing command: mount -U $UUID"
+-	mount -U $UUID || log err "mount by UUID with $UUID wasn't successful; return code $?"
++    elif grep -q "^[[:blank:]]*UUID=$ID_FS_UUID" /etc/fstab; then
++        log info "executing command: mount -U $ID_FS_UUID"
++	mount -U $ID_FS_UUID || log err "mount by UUID with $ID_FS_UUID wasn't successful; return code $?"
+ 
+     else
+-	log debug "$DEVNAME contains filesystem type $FSTYPE"
++	log debug "$DEVNAME contains filesystem type $ID_FS_TYPE"
+ 
+-	fstype=$FSTYPE
++	fstype=$ID_FS_TYPE
+ 	# Test if the filesystem type is in the list of filesystem
+ 	# types to mount.
+ 	if in_list "$fstype" "$FILESYSTEMS"; then
+@@ -176,11 +163,13 @@
+ 
+ 		# Run hook scripts; ignore errors.
+ 		export UM_DEVICE="$DEVNAME"
++		export UM_UUID="$ID_FS_UUID"
+ 		export UM_MOUNTPOINT="$mountpoint"
+ 		export UM_FILESYSTEM="$fstype"
+ 		export UM_MOUNTOPTIONS="$options"
+ 		export UM_VENDOR="$vendor"
+ 		export UM_MODEL="$model"
++		export UM_LABEL="$ID_FS_LABEL"
+ 		log info "executing command: run-parts /etc/usbmount/mount.d"
+ 		run-parts /etc/usbmount/mount.d || :
+ 	    else
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 69262a640f..de87009966 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -7,7 +7,7 @@
 USBMOUNT_VERSION = 0.0.22
 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
 USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount
-USBMOUNT_DEPENDENCIES = udev lockfile-progs util-linux
+USBMOUNT_DEPENDENCIES = udev lockfile-progs
 
 define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount

From 211a5df280ac463da4c8f3ad0539455f206aa04d Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date: Tue, 18 Jun 2013 16:19:51 +0200
Subject: [PATCH 5434/6849] libqmi: new package

libqmi is a glib-based library for talking to WWAN modems and devices which
speak the Qualcomm MSM Interface (QMI) protocol.

Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libqmi/Config.in |  9 +++++++++
 package/libqmi/libqmi.mk | 16 ++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/libqmi/Config.in
 create mode 100644 package/libqmi/libqmi.mk

diff --git a/package/Config.in b/package/Config.in
index 5b066dc35b..426004bc38 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -484,6 +484,7 @@ source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libnfc/Config.in"
 source "package/libnfc-llcp/Config.in"
+source "package/libqmi/Config.in"
 source "package/libserial/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in
new file mode 100644
index 0000000000..c5e8a5c37e
--- /dev/null
+++ b/package/libqmi/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBQMI
+	bool "libqmi"
+	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # libglib2
+	help
+	  libqmi is a glib-based library for talking to WWAN modems and devices
+	  which speak the Qualcomm MSM Interface (QMI) protocol.
+
+	  http://www.freedesktop.org/wiki/Software/libqmi/
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
new file mode 100644
index 0000000000..911b1a7957
--- /dev/null
+++ b/package/libqmi/libqmi.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libqmi
+#
+################################################################################
+
+LIBQMI_VERSION = 1.4.0
+LIBQMI_SITE    = http://www.freedesktop.org/software/libqmi/
+LIBQMI_SOURCE  = libqmi-$(LIBQMI_VERSION).tar.xz
+LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
+LIBQMI_LICENSE_FILES = COPYING
+LIBQMI_INSTALL_STAGING = YES
+
+LIBQMI_DEPENDENCIES = libglib2
+
+$(eval $(autotools-package))

From 0b20c1aa33638bdf6cbcddd7a01ce6a78e25a382 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 20 May 2013 15:56:40 +0300
Subject: [PATCH 5435/6849] luaexpatutils: New package

lxp.doc is a module that provides useful features for working with XML
formats in LOM format as used by the LuaExpat project from Kepler.

[Peter: use fixed git revision, github tarball, install -D]
Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                      |  1 +
 package/luaexpatutils/Config.in        |  8 ++++++++
 package/luaexpatutils/luaexpatutils.mk | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/luaexpatutils/Config.in
 create mode 100644 package/luaexpatutils/luaexpatutils.mk

diff --git a/package/Config.in b/package/Config.in
index 426004bc38..2d8c936934 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -319,6 +319,7 @@ source "package/luabitop/Config.in"
 source "package/luacjson/Config.in"
 source "package/luacrypto/Config.in"
 source "package/luaexpat/Config.in"
+source "package/luaexpatutils/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
 source "package/lua-ev/Config.in"
diff --git a/package/luaexpatutils/Config.in b/package/luaexpatutils/Config.in
new file mode 100644
index 0000000000..cb2887acaa
--- /dev/null
+++ b/package/luaexpatutils/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LUAEXPATUTILS
+	bool "luaexpatutils"
+	select BR2_PACKAGE_LUAEXPAT
+	help
+	  lxp.doc is a module that provides useful features for working with
+	  XML formats in LOM format as used by the LuaExpat project from Kepler.
+
+	  https://github.com/stevedonovan/LuaExpatUtils
diff --git a/package/luaexpatutils/luaexpatutils.mk b/package/luaexpatutils/luaexpatutils.mk
new file mode 100644
index 0000000000..79578c0842
--- /dev/null
+++ b/package/luaexpatutils/luaexpatutils.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# luaexpatutils
+#
+#############################################################
+
+LUAEXPATUTILS_VERSION = 88c228365b
+LUAEXPATUTILS_SITE = http://github.com/stevedonovan/LuaExpatUtils/tarball/$(LUAEXPATUTILS_VERSION)
+LUAEXPATUTILS_LICENSE = Public Domain
+LUAEXPATUTILS_DEPENDENCIES = luaexpat
+
+define LUAEXPATUTILS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/lua/doc.lua \
+		$(TARGET_DIR)/usr/share/lua/lxp/doc.lua
+endef
+
+define LUAEXPATUTILS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/share/lua/lxp/doc.lua
+endef
+
+$(eval $(generic-package))

From f17ccaf9c8e768d413352d8a6613e592dcb542f8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 19 Jun 2013 23:34:31 +0200
Subject: [PATCH 5436/6849] luaexpatutils: fix file header

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luaexpatutils/luaexpatutils.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/luaexpatutils/luaexpatutils.mk b/package/luaexpatutils/luaexpatutils.mk
index 79578c0842..7ce7fc5d70 100644
--- a/package/luaexpatutils/luaexpatutils.mk
+++ b/package/luaexpatutils/luaexpatutils.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # luaexpatutils
 #
-#############################################################
+################################################################################
 
 LUAEXPATUTILS_VERSION = 88c228365b
 LUAEXPATUTILS_SITE = http://github.com/stevedonovan/LuaExpatUtils/tarball/$(LUAEXPATUTILS_VERSION)

From b03e04f3df86e1f2e6e136c5a536c516e2374807 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 19 Jun 2013 23:54:18 +0200
Subject: [PATCH 5437/6849] wvstreams: needs host-pkgconf

The wvstreams configure script uses pkg-config, so we need to build
host-pkgconf before.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wvstreams/wvstreams.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index 13982c4236..d363f4c1d8 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -6,7 +6,7 @@
 
 WVSTREAMS_VERSION = 4.6.1
 WVSTREAMS_SITE = http://wvstreams.googlecode.com/files
-WVSTREAMS_DEPENDENCIES = openssl zlib
+WVSTREAMS_DEPENDENCIES = openssl zlib host-pkgconf
 WVSTREAMS_INSTALL_STAGING = YES
 
 WVSTREAMS_LICENSE = LGPLv2+

From aa60e76c02f21edb461f16ae4a7f62ea3b2c1d0b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 19 Jun 2013 23:55:29 +0200
Subject: [PATCH 5438/6849] wvstreams: fix openssl detection when statically
 linking

The openssl tests need to link against libz as libcrypto references it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wvstreams/wvstreams.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index d363f4c1d8..65f48d4037 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -24,6 +24,9 @@ WVSTREAMS_CONF_OPT += \
 	--without-pam \
 	--disable-warnings
 
+# needed for openssl detection when statically linking (as ssl needs lz)
+WVSTREAMS_CONF_ENV += LIBS=-lz
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	WVSTREAMS_DEPENDENCIES += dbus
 	WVSTREAMS_CONF_OPT += --with-dbus

From a869bf8c84cda6d7b21950a6653ad9a80b90be4f Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Thu, 20 Jun 2013 10:33:47 +0300
Subject: [PATCH 5439/6849] lua: Added missing HOST_LDFLAGS

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lua/lua.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 2098de23b7..ac75fe6d56 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -44,6 +44,7 @@ endef
 define HOST_LUA_BUILD_CMDS
 	$(MAKE) \
 	CFLAGS="$(HOST_LUA_CFLAGS)" \
+	MYLDFLAGS="$(HOST_LDFLAGS)" \
 	MYLIBS="$(HOST_LUA_MYLIBS)" \
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef

From 6618ab94361a978dbbf0545c2ac5cac5be8f64ac Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Thu, 20 Jun 2013 07:40:50 +0300
Subject: [PATCH 5440/6849] luaposix: New package

Luaposix is a Lua frontend to posix functions.

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                                |  1 +
 package/luaposix/Config.in                       | 11 +++++++++++
 .../luaposix-remove-lua-header-check.patch       | 16 ++++++++++++++++
 package/luaposix/luaposix.mk                     | 15 +++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 package/luaposix/Config.in
 create mode 100644 package/luaposix/luaposix-remove-lua-header-check.patch
 create mode 100644 package/luaposix/luaposix.mk

diff --git a/package/Config.in b/package/Config.in
index 2d8c936934..0eb6a9cdb1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -321,6 +321,7 @@ source "package/luacrypto/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luaexpatutils/Config.in"
 source "package/luafilesystem/Config.in"
+source "package/luaposix/Config.in"
 source "package/luasocket/Config.in"
 source "package/lua-ev/Config.in"
 source "package/lua-msgpack-native/Config.in"
diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
new file mode 100644
index 0000000000..412e07f138
--- /dev/null
+++ b/package/luaposix/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LUAPOSIX
+	bool "luaposix"
+	help
+	  luaposix is a POSIX binding, including curses, for Lua 5.1
+	  and 5.2; Like most libraries it simply binds to C APIs on
+	  the underlying system, so it won't work on a non-POSIX
+	  system. However, it does try to detect the level of POSIX
+	  conformance of the underlying system and bind only available
+	  APIs
+
+	  https://github.com/luaposix/luaposix
diff --git a/package/luaposix/luaposix-remove-lua-header-check.patch b/package/luaposix/luaposix-remove-lua-header-check.patch
new file mode 100644
index 0000000000..7909b9175b
--- /dev/null
+++ b/package/luaposix/luaposix-remove-lua-header-check.patch
@@ -0,0 +1,16 @@
+Checking the Lua version inside the headers requires compiling a small
+C program. However, autoconf will raise an error when attempting to do so
+while cross-compiling. Hence, this specific test is removed.
+
+Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
+--- a/configure.ac	2013-06-20 07:23:27.943091833 +0300
++++ b/configure.ac	2013-06-20 07:23:30.644441710 +0300
+@@ -105,7 +105,7 @@
+ 
+ dnl Lua 5.1 or 5.2
+ AX_PROG_LUA(501, 503)
+ AX_LUA_HEADERS
+-AX_LUA_HEADERS_VERSION(501, 503)
++#AX_LUA_HEADERS_VERSION(501, 503)
+ AC_SUBST(LUA)
+ AC_SUBST(LUA_INCLUDE)
diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
new file mode 100644
index 0000000000..1d1ee6a746
--- /dev/null
+++ b/package/luaposix/luaposix.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# luaposix
+#
+################################################################################
+
+LUAPOSIX_VERSION = 5.1.20
+LUAPOSIX_SITE = https://github.com/downloads/luaposix/luaposix
+LUAPOSIX_LICENSE = MIT
+LUAPOSIX_LICENSE_FILES = COPYING
+LUAPOSIX_DEPENDENCIES = lua host-lua
+LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua" --datarootdir="/usr/share/lua"
+LUAPOSIX_AUTORECONF = YES
+
+$(eval $(autotools-package))

From b4c20a0353acf0440ab6c8e9f6a5d765a61a585e Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Wed, 19 Jun 2013 23:14:01 -0500
Subject: [PATCH 5441/6849] gstreamer: update for gstreamer1

[Peter: fix long line, trailing space, Gstreamer/GStreamer]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 4b4d80fce7..d2f99da91e 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -6,6 +6,9 @@ config BR2_PACKAGE_GSTREAMER
 	help
 	  GStreamer is an open source multimedia framework.
 
+	  This 0.10.x version of GStreamer is incompatible with
+	  GStreamer 1.X.
+
 	  http://gstreamer.freedesktop.org/
 
 config BR2_PACKAGE_GSTREAMER_GST_DEBUG

From 31d72937cf17e9e476e956986030e93f8fd2ce56 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 20 Jun 2013 15:14:10 +0100
Subject: [PATCH 5442/6849] wvstreams: Pass -fPIC to CFLAGS when building PIC
 objects

The argp bundled dependency which is linked to the libwvutils.so
shared library, wasn't built with -fPIC.
MIPS will refuce to link a non-PIC library with a shared one.

We fix this problem by appending -fPIC to CFLAGS and build all the
shared objects with -fPIC.

[Peter: use +=]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/wvstreams/wvstreams.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index 65f48d4037..b4f7d89297 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -27,6 +27,10 @@ WVSTREAMS_CONF_OPT += \
 # needed for openssl detection when statically linking (as ssl needs lz)
 WVSTREAMS_CONF_ENV += LIBS=-lz
 
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+	WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
+endif
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	WVSTREAMS_DEPENDENCIES += dbus
 	WVSTREAMS_CONF_OPT += --with-dbus

From 95442bb324bee72c5b1f20a7a06705c9731c21ce Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Fri, 7 Jun 2013 12:13:46 +0200
Subject: [PATCH 5443/6849] Normalize separator size to 80 in remaining
 makefiles

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                             | 20 ++++++++++----------
 fs/iso9660/iso9660.mk                |  4 ++--
 linux/linux-ext-rtai.mk              |  4 ++--
 linux/linux-ext-xenomai.mk           |  4 ++--
 linux/linux.mk                       |  4 ++--
 package/Makefile.in                  |  4 ++--
 support/dependencies/dependencies.mk |  8 ++++----
 toolchain/gcc/gcc-uclibc-4.x.mk      | 20 ++++++++++----------
 toolchain/uClibc/uclibc.mk           |  4 ++--
 9 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index c514e4f260..509eab6c8c 100644
--- a/Makefile
+++ b/Makefile
@@ -193,11 +193,11 @@ BUILD_DIR:=$(BASE_DIR)/build
 
 ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
-#############################################################
+################################################################################
 #
 # Hide troublesome environment variables from sub processes
 #
-#############################################################
+################################################################################
 unexport CROSS_COMPILE
 unexport ARCH
 unexport CC
@@ -212,12 +212,12 @@ unexport TERMINFO
 
 GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 
-##############################################################
+################################################################################
 #
 # The list of stuff to build for the target toolchain
 # along with the packages to build for the target.
 #
-##############################################################
+################################################################################
 
 ifeq ($(BR2_CCACHE),y)
 BASE_TARGETS += host-ccache
@@ -296,12 +296,12 @@ export HOST_DIR
 export BINARIES_DIR
 export BASE_DIR
 
-#############################################################
+################################################################################
 #
 # You should probably leave this stuff alone unless you know
 # what you are doing.
 #
-#############################################################
+################################################################################
 
 all: world
 
@@ -408,12 +408,12 @@ world: toolchain $(TARGETS_ALL)
 	$(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
-#############################################################
+################################################################################
 #
 # staging and target directories do NOT list these as
 # dependencies anywhere else
 #
-#############################################################
+################################################################################
 $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
 	@mkdir -p $@
 
@@ -716,11 +716,11 @@ source-check:
 
 .PHONY: defconfig savedefconfig
 
-#############################################################
+################################################################################
 #
 # Cleanup and misc junk
 #
-#############################################################
+################################################################################
 
 # outputmakefile generates a Makefile in the output directory, if using a
 # separate output directory. This allows convenient use of make in the
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 0a10512d93..36e63886fc 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -36,11 +36,11 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 
 rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
 
-#############################################################
+################################################################################
 #
 # Toplevel Makefile options
 #
-#############################################################
+################################################################################
 ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
 TARGETS+=rootfs-iso9660
 endif
diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index 78488afd94..dcfab49831 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -1,8 +1,8 @@
-##################################################
+################################################################################
 # Linux RTAI extensions
 #
 # Patch the linux kernel with RTAI extension
-##################################################
+################################################################################
 
 ifeq ($(BR2_LINUX_KERNEL_EXT_RTAI),y)
 # Add dependency to RTAI (user-space) which provide kernel patches
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index 9b6772e238..115d4a844f 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -1,8 +1,8 @@
-##################################################
+################################################################################
 # Linux Adeos/Xenomai extensions
 #
 # Patch the linux kernel with xenomai extension
-##################################################
+################################################################################
 
 ifeq ($(BR2_LINUX_KERNEL_EXT_XENOMAI),y)
 # Add dependency to xenomai (user-space) which provide ksrc part
diff --git a/linux/linux.mk b/linux/linux.mk
index 57956dd131..befef1658b 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -1,8 +1,8 @@
-###############################################################################
+################################################################################
 #
 # Linux kernel target
 #
-###############################################################################
+################################################################################
 
 LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 LINUX_LICENSE = GPLv2
diff --git a/package/Makefile.in b/package/Makefile.in
index 9ba6e8cf4f..6835de3961 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -258,7 +258,7 @@ HOST_MAKE_ENV=PATH=$(HOST_PATH) \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
 
-#######################################################################
+################################################################################
 # settings we need to pass to configure
 
 # does unaligned access trap?
@@ -294,7 +294,7 @@ TARGET_CONFIGURE_ARGS= \
 	lt_cv_sys_lib_search_path_spec="" \
 	$(BR2_AC_CV_C_BIGENDIAN)
 
-#######################################################################
+################################################################################
 
 ifeq ($(BR2_ENABLE_LOCALE),y)
 DISABLE_NLS:=
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index ebe743a658..c93dcb4206 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -1,9 +1,9 @@
-######################################################################
+################################################################################
 #
 # Check buildroot dependencies and bail out if the user's
 # system is judged to be lacking....
 #
-######################################################################
+################################################################################
 
 DEPENDENCIES_HOST_PREREQ:=
 
@@ -35,10 +35,10 @@ dependencies-clean:
 dependencies-dirclean:
 	true
 
-#############################################################
+################################################################################
 #
 # Toplevel Makefile options
 #
-#############################################################
+################################################################################
 .PHONY: dependencies core-dependencies
 
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 7ebcbaca2a..92361e56eb 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -133,11 +133,11 @@ EXTRA_GCC_CONFIG_OPTIONS += \
 EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
 	$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
 
-#############################################################
+################################################################################
 #
 # Setup some initial stuff
 #
-#############################################################
+################################################################################
 
 GCC_STAGING_PREREQ+=$(STAGING_DIR)/usr/lib/libc.a
 
@@ -260,11 +260,11 @@ endif
 endif
 	touch $@
 
-#############################################################
+################################################################################
 #
 # build the first pass gcc compiler
 #
-#############################################################
+################################################################################
 GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial
 
 $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
@@ -327,11 +327,11 @@ gcc_initial-clean:
 gcc_initial-dirclean:
 	rm -rf $(GCC_BUILD_DIR1) $(GCC_DIR)
 
-#############################################################
+################################################################################
 #
 # build the second pass gcc compiler
 #
-#############################################################
+################################################################################
 GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-intermediate
 
 # The --without-headers option stopped working with gcc 3.0 and has never been
@@ -403,12 +403,12 @@ gcc_intermediate-clean:
 gcc_intermediate-dirclean:
 	rm -rf $(GCC_BUILD_DIR2) $(GCC_DIR)
 
-#############################################################
+################################################################################
 #
 # third pass compiler build. Build the compiler targeting
 # the newly built shared uClibc library.
 #
-#############################################################
+################################################################################
 #
 # Sigh... I had to rework things because using --with-gxx-include-dir
 # causes issues with include dir search order for g++. This seems to
@@ -538,11 +538,11 @@ gcc-clean:
 gcc-dirclean: gcc_initial-dirclean
 	rm -rf $(GCC_BUILD_DIR3)
 
-#############################################################
+################################################################################
 #
 # Next build target gcc compiler
 #
-#############################################################
+################################################################################
 GCC_BUILD_DIR4:=$(BUILD_DIR)/gcc-$(GCC_VERSION)-target
 
 $(GCC_BUILD_DIR4)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 44079e791e..da1830ff56 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -576,12 +576,12 @@ uclibc-test-clean:
 uclibc-test-dirclean:
 	rm -rf $(TARGET_DIR)/root/uClibc
 
-#############################################################
+################################################################################
 #
 # uClibc for the target just needs its header files
 # and whatnot installed.
 #
-#############################################################
+################################################################################
 
 $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a
 	$(Q)$(call MESSAGE,"Installing uClibc development files to target dir")

From 23ac7255c89a67d171a16f3ee1d4d160a43a305f Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Fri, 21 Jun 2013 00:17:14 +0200
Subject: [PATCH 5444/6849] Add header to packages where missing

Reported-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk                           | 6 ++++++
 package/classpath/classpath.mk                             | 6 ++++++
 package/cloop/cloop.mk                                     | 6 ++++++
 package/crosstool-ng/crosstool-ng.mk                       | 6 ++++++
 package/dsp-tools/dsp-tools.mk                             | 6 ++++++
 package/explorercanvas/explorercanvas.mk                   | 6 ++++++
 package/fbgrab/fbgrab.mk                                   | 6 ++++++
 package/feh/feh.mk                                         | 6 ++++++
 package/flot/flot.mk                                       | 6 ++++++
 package/hiawatha/hiawatha.mk                               | 6 ++++++
 package/igh-ethercat/igh-ethercat.mk                       | 6 ++++++
 package/jamvm/jamvm.mk                                     | 6 ++++++
 package/jquery-sparkline/jquery-sparkline.mk               | 6 ++++++
 package/jquery-validation/jquery-validation.mk             | 6 ++++++
 package/jquery/jquery.mk                                   | 6 ++++++
 package/jsmin/jsmin.mk                                     | 6 ++++++
 package/lpc3250loader/lpc3250loader.mk                     | 6 ++++++
 package/lttng-babeltrace/lttng-babeltrace.mk               | 6 ++++++
 package/multimedia/gst-dsp/gst-dsp.mk                      | 6 ++++++
 package/multimedia/gst-omapfb/gst-omapfb.mk                | 6 ++++++
 package/multimedia/tidsp-binaries/tidsp-binaries.mk        | 6 ++++++
 package/nettle/nettle.mk                                   | 6 ++++++
 package/ortp/ortp.mk                                       | 6 ++++++
 package/polarssl/polarssl.mk                               | 6 ++++++
 package/rt-tests/rt-tests.mk                               | 6 ++++++
 package/rtai/rtai.mk                                       | 6 ++++++
 package/scons/scons.mk                                     | 6 ++++++
 package/squashfs/squashfs.mk                               | 6 ++++++
 package/squashfs3/squashfs3.mk                             | 6 ++++++
 package/webrtc-audio-processing/webrtc-audio-processing.mk | 6 ++++++
 30 files changed, 180 insertions(+)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index 3e221e8338..6f8d6519d5 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# cifs-utils
+#
+################################################################################
+
 CIFS_UTILS_VERSION = 6.0
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index 61a1034571..62167aace5 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# classpath
+#
+################################################################################
+
 CLASSPATH_VERSION = 0.98
 CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
 CLASSPATH_CONF_OPT = \
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index 809e531aea..1e9b72358c 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# cloop
+#
+################################################################################
+
 CLOOP_VERSION=2.634-1
 CLOOP_SOURCE=cloop_$(CLOOP_VERSION).tar.gz
 CLOOP_SITE=http://debian-knoppix.alioth.debian.org/packages/sources/cloop
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index b5333969a8..d3ee5f8c9b 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# crosstool-ng
+#
+################################################################################
+
 CROSSTOOL_NG_VERSION           = 1.18.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
diff --git a/package/dsp-tools/dsp-tools.mk b/package/dsp-tools/dsp-tools.mk
index 42aac05edf..e91c7bc48b 100644
--- a/package/dsp-tools/dsp-tools.mk
+++ b/package/dsp-tools/dsp-tools.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# dsp-tools
+#
+################################################################################
+
 DSP_TOOLS_VERSION = 2.0
 DSP_TOOLS_SOURCE = dsp-tools-$(DSP_TOOLS_VERSION).tar.gz
 DSP_TOOLS_SITE = http://gst-dsp.googlecode.com/files/
diff --git a/package/explorercanvas/explorercanvas.mk b/package/explorercanvas/explorercanvas.mk
index 968843c315..976082abd3 100644
--- a/package/explorercanvas/explorercanvas.mk
+++ b/package/explorercanvas/explorercanvas.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# explorercanvas
+#
+################################################################################
+
 EXPLORERCANVAS_VERSION = r3
 EXPLORERCANVAS_SITE = http://explorercanvas.googlecode.com/files/
 EXPLORERCANVAS_SOURCE = excanvas_$(EXPLORERCANVAS_VERSION).zip
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index b0b46cbc60..7645a6b0f8 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# fbgrab
+#
+################################################################################
+
 FBGRAB_VERSION = 1.0
 FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz
 FBGRAB_SITE = http://hem.bredband.net/gmogmo/fbgrab
diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 97a272d557..360d03af13 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# feh
+#
+################################################################################
+
 FEH_VERSION = 2.9.1
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
diff --git a/package/flot/flot.mk b/package/flot/flot.mk
index a0ba6c20bd..dfa6c55a32 100644
--- a/package/flot/flot.mk
+++ b/package/flot/flot.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# flot
+#
+################################################################################
+
 FLOT_VERSION = 0.8.1
 FLOT_SITE = http://www.flotcharts.org/downloads
 FLOT_LICENSE = MIT
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 3348d534de..1ecb0e8a98 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# hiawatha
+#
+################################################################################
+
 HIAWATHA_VERSION = 9.1
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index a531cab2e4..63bda2ff83 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# igh-ethercat
+#
+################################################################################
+
 IGH_ETHERCAT_VERSION = 1.5.1
 IGH_ETHERCAT_SITE    = http://etherlab.org/download/ethercat/
 IGH_ETHERCAT_SOURCE  = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk
index 3f05361362..34f1b9f0a4 100644
--- a/package/jamvm/jamvm.mk
+++ b/package/jamvm/jamvm.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# jamvm
+#
+################################################################################
+
 JAMVM_VERSION = 1.5.4
 JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION)
 JAMVM_DEPENDENCIES = zlib classpath
diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index aa6395c7d9..af05045476 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# jquery-sparkline
+#
+################################################################################
+
 JQUERY_SPARKLINE_VERSION = 2.1.1
 JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
 JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk
index 423d7f1a46..71acaff47e 100644
--- a/package/jquery-validation/jquery-validation.mk
+++ b/package/jquery-validation/jquery-validation.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# jquery-validation
+#
+################################################################################
+
 JQUERY_VALIDATION_VERSION = 1.11.1
 JQUERY_VALIDATION_SITE = http://jquery.bassistance.de/validate
 JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip
diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index 98b325b9bb..44c444b885 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# jquery
+#
+################################################################################
+
 JQUERY_VERSION = 1.10.1
 JQUERY_SITE = http://code.jquery.com
 JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js
diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index bb65c6c6ae..d51191111a 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# jsmin
+#
+################################################################################
+
 JSMIN_VERSION = a9b4755
 JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/$(JSMIN_VERSION)
 
diff --git a/package/lpc3250loader/lpc3250loader.mk b/package/lpc3250loader/lpc3250loader.mk
index 2b9af88da2..42beb7bc84 100644
--- a/package/lpc3250loader/lpc3250loader.mk
+++ b/package/lpc3250loader/lpc3250loader.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# lpc3250loader
+#
+################################################################################
+
 HOST_LPC3250LOADER_SITE = git://gitorious.org/lpc3250loader/lpc3250loader.git
 HOST_LPC3250LOADER_VERSION = 1.0
 
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index d3bfc83d9f..2947c35672 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# lttng-babeltrace
+#
+################################################################################
+
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
 LTTNG_BABELTRACE_VERSION = 1.0.2
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
index 74b4c98e9a..1fd6976074 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/multimedia/gst-dsp/gst-dsp.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# gst-dsp
+#
+################################################################################
+
 GST_DSP_VERSION = 0.10.2
 GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
 
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/multimedia/gst-omapfb/gst-omapfb.mk
index f23bc868b1..7b8b128c5c 100644
--- a/package/multimedia/gst-omapfb/gst-omapfb.mk
+++ b/package/multimedia/gst-omapfb/gst-omapfb.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# gst-omapfb
+#
+################################################################################
+
 GST_OMAPFB_VERSION=1.0
 GST_OMAPFB_SOURCE=gst-omapfb-$(GST_OMAPFB_VERSION).tar.gz
 GST_OMAPFB_SITE=http://gst-dsp.googlecode.com/files/
diff --git a/package/multimedia/tidsp-binaries/tidsp-binaries.mk b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
index 356baf4104..fd799fb68a 100644
--- a/package/multimedia/tidsp-binaries/tidsp-binaries.mk
+++ b/package/multimedia/tidsp-binaries/tidsp-binaries.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# tidsp-binaries
+#
+################################################################################
+
 TIDSP_BINARIES_VERSION = 23.i3.8
 TIDSP_BINARIES_SOURCE = tidsp-binaries-$(TIDSP_BINARIES_VERSION).tar.gz
 TIDSP_BINARIES_SITE = http://gst-dsp.googlecode.com/files/
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index 131826e7de..b772d3ac2a 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# nettle
+#
+################################################################################
+
 NETTLE_VERSION = 2.7
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index c4c900a314..8983df7c1c 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# ortp
+#
+################################################################################
+
 ORTP_VERSION = 0.20.0
 ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
 ORTP_CONF_OPT = --disable-strict
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 7d7fe3eb8f..0b44dc9e26 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# polarssl
+#
+################################################################################
+
 POLARSSL_SITE = https://polarssl.org/download
 POLARSSL_VERSION = 1.2.7
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 60f63b5bdd..f574d3a8ed 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# rt-tests
+#
+################################################################################
+
 RT_TESTS_SITE    = http://snapshot.debian.org/archive/debian/20111202T222101Z/pool/main/r/rt-tests/
 RT_TESTS_VERSION = 0.83
 RT_TESTS_SOURCE  = rt-tests_$(RT_TESTS_VERSION).orig.tar.gz
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
index be5abb1df4..c24fa41631 100644
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# rtai
+#
+################################################################################
+
 RTAI_VERSION = 3.8.1
 RTAI_SOURCE  = rtai-$(RTAI_VERSION).tar.bz2
 RTAI_SITE    = http://www.rtai.org/RTAI/
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 79fd6b198b..c256d5fc17 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# scons
+#
+################################################################################
+
 SCONS_VERSION = 2.2.0
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index c0485a3022..13414025df 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# squashfs
+#
+################################################################################
+
 SQUASHFS_VERSION=4.2
 SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
 SQUASHFS_SITE=http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index e121c51b07..956dbd6baa 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# squashfs3
+#
+################################################################################
+
 SQUASHFS3_VERSION=3.4
 SQUASHFS3_SOURCE=squashfs$(SQUASHFS3_VERSION).tar.gz
 SQUASHFS3_SITE=http://downloads.sourceforge.net/project/squashfs/squashfs/$(SQUASHFS3_VERSION)
diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk
index 4fbf8f6601..9f76cba5e8 100644
--- a/package/webrtc-audio-processing/webrtc-audio-processing.mk
+++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# webrtc-audio-processing
+#
+################################################################################
+
 WEBRTC_AUDIO_PROCESSING_VERSION = 0.1
 WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz
 WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/

From a12c94b06c628f28ade7f6dfb4f80de64b783903 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:36 -0500
Subject: [PATCH 5445/6849] gstreamer1: Add gstreamer version 1.0.7 package

This patch adds the gstreamer version 1.x series to buildroot.

[Peter: strip trailing newlines in Config.in]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                |  1 +
 package/multimedia/gstreamer1/Config.in     | 53 +++++++++++++++++++++
 package/multimedia/gstreamer1/gstreamer1.mk | 40 ++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 package/multimedia/gstreamer1/Config.in
 create mode 100644 package/multimedia/gstreamer1/gstreamer1.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 77c0a22e0c..1427a27ef3 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -6,6 +6,7 @@ source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
 source "package/multimedia/ffmpeg/Config.in"
 source "package/multimedia/gstreamer/Config.in"
+source "package/multimedia/gstreamer1/Config.in"
 source "package/multimedia/gst-ffmpeg/Config.in"
 source "package/multimedia/gst-dsp/Config.in"
 source "package/multimedia/gst-fsl-plugins/Config.in"
diff --git a/package/multimedia/gstreamer1/Config.in b/package/multimedia/gstreamer1/Config.in
new file mode 100644
index 0000000000..627814c72c
--- /dev/null
+++ b/package/multimedia/gstreamer1/Config.in
@@ -0,0 +1,53 @@
+config BR2_PACKAGE_GSTREAMER1
+	bool "gstreamer1"
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  GStreamer is an open source multimedia framework. This 1.x version of
+	  Gstreamer is incompatible with Gstreamer 0.10.x.
+
+	  http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GSTREAMER1
+
+config BR2_PACKAGE_GSTREAMER1_PARSE
+	bool "enable command-line parser"
+	default y
+	help
+	  Enable command line parser for gstreamer. This may incrase the CPu
+	  overhead by a small amount.
+
+config BR2_PACKAGE_GSTREAMER1_TRACE
+	bool "enable tracing subsystem"
+	default y
+	help
+	  Enable the tracing subsystem within gstreamer.  This may increase CPU
+	  overhead by a small amount.
+
+config BR2_PACKAGE_GSTREAMER1_GST_DEBUG
+	bool "enable gst-debug trace support"
+	default y
+	help
+	  Enable support for the gst-debug tracing functionality in gstreamer.
+	  This has limited CPU overhead, but does increase the rootfs size
+	  somewhat.
+
+config BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY
+	bool "enable plugin registry"
+	default y
+	help
+	  Enable support for the GStreamer plugin registry. This may increase
+	  the launch-time for a GStreamer application.
+
+config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
+	bool "install gst-launch & gst-inspect"
+	default y
+	help
+	  Install the gst-launch and gst-inspect tools. This will take up
+	  additional space on the target.
+
+endif
+
+comment "gstreamer1 requires a toolchain with WCHAR and threads support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
new file mode 100644
index 0000000000..71ad08b29d
--- /dev/null
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# gstreamer1
+#
+#############################################################
+
+GSTREAMER1_VERSION = 1.0.7
+GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
+GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
+GSTREAMER1_INSTALL_STAGING = YES
+GSTREAMER1_LICENSE_FILES = COPYING
+GSTREAMER1_LICENSE = LGPLv2+ LGPLv2.1+
+
+# Checking if unaligned memory access works correctly cannot be done when cross
+# compiling. For the following architectures there is no information available
+# in the configure script.
+ifeq ($(BR2_avr32),y)
+GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no
+endif
+ifeq ($(BR2_aarch64),y)
+GSTREAMER1_CONF_ENV = as_cv_unaligned_access=yes
+endif
+
+GSTREAMER1_CONF_OPT = \
+	--disable-examples \
+	--disable-tests \
+	--disable-failing-tests \
+	--disable-debug \
+	--disable-valgrind \
+	--disable-benchmarks \
+	--disable-check \
+	$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \
+	$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \
+	$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \
+	$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \
+	$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools)
+
+GSTREAMER1_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex
+
+$(eval $(autotools-package))

From f8e7fdcd36d56fd772a0d48df2a778e831233ac7 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:38 -0500
Subject: [PATCH 5446/6849] gst1-plugins-base: add gstreamer1 base plugins

Adds gstreamer 1.X base plugins.

[Peter: strip trailing newlines in Config.in]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |   1 +
 .../multimedia/gst1-plugins-base/Config.in    | 152 +++++++++++++
 .../gst1-plugins-base/gst1-plugins-base.mk    | 206 ++++++++++++++++++
 3 files changed, 359 insertions(+)
 create mode 100644 package/multimedia/gst1-plugins-base/Config.in
 create mode 100644 package/multimedia/gst1-plugins-base/gst1-plugins-base.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 1427a27ef3..6e21fc67d5 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -12,6 +12,7 @@ source "package/multimedia/gst-dsp/Config.in"
 source "package/multimedia/gst-fsl-plugins/Config.in"
 source "package/multimedia/gst-omapfb/Config.in"
 source "package/multimedia/gst-plugins-base/Config.in"
+source "package/multimedia/gst1-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/multimedia/gst1-plugins-base/Config.in
new file mode 100644
index 0000000000..10561c13a7
--- /dev/null
+++ b/package/multimedia/gst1-plugins-base/Config.in
@@ -0,0 +1,152 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE
+	bool "gst1-plugins-base"
+	depends on BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7
+	help
+	  A basic set of well-supported plug-ins for GStreamer.
+
+	  http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_BASE
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER
+	bool "adder"
+	help
+	  Adds multiple streams
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
+	bool "app"
+	help
+	  Elements used to communicate with applications
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
+	bool "audioconvert (mandatory for audio playback)"
+	default y
+	help
+	  Convert audio to different formats
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE
+	bool "audiorate"
+	help
+	  Adjusts audio frames
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC
+	bool "audiotestsrc"
+	help
+	  Creates audio test signals of given frequency and volume
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING
+	bool "encoding"
+	help
+	  various encoding-related elements
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
+	bool "videoconvert"
+	help
+	  Colorspace conversion
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO
+	bool "gio"
+	help
+	  GIO elements
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
+	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND
+	bool "playback"
+	default y
+	help
+	  various playback elements
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
+	bool "audioresample (mandatory for audio playback)"
+	default y
+	help
+	  Resamples audio
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE
+	bool "subparse"
+	help
+	  Subtitle parsing
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP
+	bool "tcp"
+	help
+	  transfer data over the network via TCP
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND
+	bool "typefind"
+	default y
+	help
+	  default typefind functions
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC
+	bool "videotestsrc"
+	help
+	  Creates a test video stream
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE
+	bool "videorate"
+	help
+	  Adjusts video frames
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE
+	bool "videoscale (mandatory for video playback)"
+	default y
+	help
+	  Resizes video
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
+	bool "volume (mandatory for audio playback)"
+	default y
+	help
+	  plugin for controlling audio volume
+
+comment "plugins with external dependencies"
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
+	bool "alsa (mandatory for audio playback)"
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	help
+	  ALSA plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR
+	bool "tremor"
+	select BR2_PACKAGE_TREMOR
+	help
+	  Vorbis Tremor decoder
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG
+	bool "ogg (*.ogg audio/video)"
+	select BR2_PACKAGE_LIBOGG
+	help
+	  ogg stream manipulation (info about ogg: http://xiph.org)
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO
+	bool "pango font renderer"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_PANGO
+	help
+	  Pango-based text rendering and overlay
+
+comment "pango plugin requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA
+	bool "theora (*.ogg video)"
+	select BR2_PACKAGE_LIBTHEORA
+	help
+	  Theora plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS
+	bool "vorbis (*.ogg audio)"
+	select BR2_PACKAGE_LIBVORBIS
+	help
+	  Vorbis plugin library
+
+endif
diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
new file mode 100644
index 0000000000..1ab6f1ea4b
--- /dev/null
+++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
@@ -0,0 +1,206 @@
+################################################################################
+#
+# gst1-plugins-base
+#
+################################################################################
+
+GST1_PLUGINS_BASE_VERSION = 1.0.7
+GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
+GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
+GST1_PLUGINS_BASE_INSTALL_STAGING = YES
+GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
+GST1_PLUGINS_BASE_LICENSE = LGPLv2+ LGPLv2.1+
+
+# freetype is only used by examples, but if it is not found
+# and the host has a freetype-config script, then the host
+# include dirs are added to the search path causing trouble
+GST1_PLUGINS_BASE_CONF_ENV =
+	FT2_CONFIG=/bin/false \
+	ac_cv_header_stdint_t="stdint.h"
+
+GST1_PLUGINS_BASE_CONF_OPT = \
+	--disable-examples \
+	--disable-oggtest \
+	--disable-vorbistest \
+	--disable-freetypetest \
+	--disable-valgrind \
+	--disable-debug
+
+# Options which require currently unpackaged libraries
+GST1_PLUGINS_BASE_CONF_OPT += \
+	--disable-cdparanoia \
+	--disable-libvisual \
+	--disable-iso-codes
+
+GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1
+
+# These plugins are liste in the order from ./configure --help
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_BASE_DEPENDENCIES += orc
+GST1_PLUGINS_BASE_CONF_OPT += --enable-orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-adder
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-adder
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-app
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-app
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-audioconvert
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-audioconvert
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-audiorate
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-audiorate
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-audiotestsrc
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-encoding
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-encoding
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-videoconvert
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-videoconvert
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-gio
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-gio
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-playback
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-playback
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-audioresample
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-audioresample
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-subparse
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-subparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-tcp
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-tcp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-typefind
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-typefind
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-videotestsrc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-videorate
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-videorate
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-videoscale
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-videoscale
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-volume
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-volume
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+GST1_PLUGINS_BASE_DEPENDENCIES += zlib
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
+GST1_PLUGINS_BASE_CONF_OPT += \
+	--enable-x \
+	--enable-xshm \
+	--enable-xvideo
+else
+GST1_PLUGINS_BASE_CONF_OPT += \
+	--disable-x \
+	--disable-xshm \
+	--disable-xvideo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA),y)
+GST1_PLUGINS_BASE_DEPENDENCIES += alsa-lib
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-alsa
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST1_PLUGINS_BASE_DEPENDENCIES += tremor
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-ogg
+GST1_PLUGINS_BASE_DEPENDENCIES += libogg
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-ogg
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-pango
+GST1_PLUGINS_BASE_DEPENDENCIES += pango
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-pango
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-theora
+GST1_PLUGINS_BASE_DEPENDENCIES += libtheora
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-theora
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS),y)
+GST1_PLUGINS_BASE_CONF_OPT += --enable-vorbis
+GST1_PLUGINS_BASE_DEPENDENCIES += libvorbis
+else
+GST1_PLUGINS_BASE_CONF_OPT += --disable-vorbis
+endif
+
+$(eval $(autotools-package))

From 0c54fefe44be5e2e9cd4be0a767366fb7dc0d3a6 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:39 -0500
Subject: [PATCH 5447/6849] gst1-plugins-good: add gstreamer1 good plugins

Adds gstreamer 1.X good plugins.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |   1 +
 .../multimedia/gst1-plugins-good/Config.in    | 326 ++++++++++++++
 .../gst1-plugins-good/gst1-plugins-good.mk    | 404 ++++++++++++++++++
 3 files changed, 731 insertions(+)
 create mode 100644 package/multimedia/gst1-plugins-good/Config.in
 create mode 100644 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 6e21fc67d5..935fde83cc 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -14,6 +14,7 @@ source "package/multimedia/gst-omapfb/Config.in"
 source "package/multimedia/gst-plugins-base/Config.in"
 source "package/multimedia/gst1-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
+source "package/multimedia/gst1-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/gst-plugin-x170/Config.in"
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
new file mode 100644
index 0000000000..9b7eba0f06
--- /dev/null
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -0,0 +1,326 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD
+	bool "gst1-plugins-good"
+	depends on BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	help
+	  A set of well-supported plug-ins for GStreamer under the preferred
+	  license.
+
+	  http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_GOOD
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG
+	bool "jpeg (JPEG support)"
+	select BR2_PACKAGE_JPEG
+	help
+	  JPeg plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG
+	bool "png (PNG support)"
+	select BR2_PACKAGE_LIBPNG
+	help
+	  PNG plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2
+	bool "bz2 support"
+	depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
+	select BR2_PACKAGE_BZIP2
+	help
+	  Enable bz2 support for the following plugins:
+	  matroska
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB
+	bool "zlib support"
+	depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QTDEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
+	select BR2_PACKAGE_ZLIB
+	help
+	  Enable zlib support for the following plugins:
+	  id3demux, qtdemux, matroska
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA
+	bool "alpha"
+	help
+	  adds an alpha channel to video - constant or via chroma-keying
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG
+	bool "apetag"
+	help
+	  APEv1/2 tag reader
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX
+	bool "audiofx"
+	help
+	  Audio effects plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS
+	bool "audioparsers"
+	help
+	  Parsers for various audio formats
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE
+	bool "auparse"
+	help
+	  parses au streams
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT
+	bool "autodetect"
+	help
+	  Plugin contains auto-detection plugins for video/audio in- and outputs
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI
+	bool "avi (*.avi video)"
+	default y
+	help
+	  AVI stream handling
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER
+	bool "cutter"
+	help
+	  Audio Cutter to split audio into non-silent bits
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS
+	bool "debugutils"
+	help
+	  elements for testing and debugging
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE
+	bool "deinterlace"
+	help
+	  Deinterlacer
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV
+	bool "effectv"
+	help
+	  effect plugins from the effectv project
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER
+	bool "equalizer"
+	help
+	  GStreamer audio equalizers
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV
+	bool "flv"
+	help
+	  FLV muxing and demuxing plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX
+	bool "flx"
+	help
+	  FLC/FLI/FLX video decoder
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM
+	bool "goom"
+	help
+	  GOOM visualization filter
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1
+	bool "goom2k1"
+	help
+	  GOOM 2k1 visualization filter
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX
+	bool "icydemux"
+	help
+	  Demux ICY tags from a stream
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX
+	bool "id3demux (*.mp3 audio)"
+	help
+	  Demux ID3v1 and ID3v2 tags from a file
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE
+	bool "imagefreeze"
+	help
+	  Still frame stream generator
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE
+	bool "interleave"
+	help
+	  Audio interleaver/deinterleaver
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4
+	bool "isomp4"
+	default y
+	help
+	  ISO base media file format support (mp4, 3gpp, qt, mj2)
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW
+	bool "law"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL
+	bool "level"
+	help
+	  Audio level plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
+	bool "matroska"
+	help
+	  Matroska and WebM stream handling
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE
+	bool "monoscope"
+	help
+	  Monoscope visualization
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE
+	bool "multifile"
+	help
+	  Reads/Writes buffers from/to sequentially named files
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART
+	bool "multipart"
+	help
+	  multipart stream manipulation
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN
+	bool "replaygain"
+	help
+	  ReplayGain volume normalization
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP
+	bool "rtp"
+	help
+	  Real-time protocol plugins
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER
+	bool "rtpmanager"
+	help
+	  RTP session management plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
+	bool "rtsp"
+	help
+	  transfer data via RTSP
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE
+	bool "shapewipe"
+	help
+	  Shape Wipe transition filter
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE
+	bool "smpte"
+	help
+	  Apply the standard SMPTE transitions on video images
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM
+	bool "spectrum"
+	help
+	  Run an FFT on the audio signal, output spectrum data
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP
+	depends on BR2_INET_IPV6
+	bool "udp"
+	help
+	  transfer data via UDP
+
+comment "udp requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX
+	bool "videobox"
+	help
+	  resizes a video by adding borders or cropping
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP
+	bool "videocrop"
+	help
+	  Crops video into a user-defined region
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER
+	bool "videofilter"
+	help
+	  Video filters plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER
+	bool "videomixer"
+	help
+	  Video mixer
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC
+	bool "wavenc"
+	help
+	  Encode raw audio into WAV
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE
+	bool "wavparse (*.wav audio)"
+	default y
+	help
+	  Parse a .wav file into raw audio
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M
+	bool "y4m"
+	help
+	  Encodes a YUV frame into the yuv4mpeg format (mjpegtools)
+
+comment "plugins with external dependencies"
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS
+	bool "ossaudio (OSS audio)"
+	help
+	  OSS (Open Sound System) support for GStreamer
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4
+	bool "oss4 (Open Sound System 4)"
+	help
+	  Open Sound System (OSS) version 4 support for GStreamer
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2
+	bool "v4l2"
+	help
+	  elements for Video 4 Linux
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO
+	bool "cairo"
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_PNG
+	help
+	  Cairo-based elements
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC
+	bool "flac (libFLAC)"
+	select BR2_PACKAGE_FLAC
+	help
+	  The FLAC Lossless compressor Codec
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
+	bool "gdkpixbuf"
+	select BR2_PACKAGE_GDK_PIXBUF
+	help
+	  GdkPixbuf-based image decoder, overlay and sink
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
+	depends on BR2_LARGEFILE # pulseaudio -> libsndfile
+	select BR2_PACKAGE_PULSEAUDIO
+	bool "pulseaudio"
+	help
+	  PulseAudio plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
+	bool "souphttpsrc (http client)"
+	select BR2_PACKAGE_LIBSOUP
+	help
+	  libsoup HTTP client src/sink
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
+	bool "speex"
+	select BR2_PACKAGE_SPEEX
+	help
+	  Speex plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
+	bool "vpx (webm)"
+	select BR2_PACKAGE_LIBVPX
+	help
+	  VP8 plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK
+	bool "wavpack (*.wv audio)"
+	select BR2_PACKAGE_WAVPACK
+	help
+	  Wavpack lossless/lossy audio format handling
+
+endif
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
new file mode 100644
index 0000000000..f177ed1b4c
--- /dev/null
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -0,0 +1,404 @@
+###############################################################################
+#
+# gst1-plugins-good
+#
+###############################################################################
+
+GST1_PLUGINS_GOOD_VERSION = 1.0.7
+GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
+GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
+GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
+GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+
+
+GST1_PLUGINS_GOOD_CONF_OPT = \
+	--disable-debug \
+	--disable-valgrind \
+	--disable-examples \
+	--disable-directsound \
+	--disable-waveform \
+	--disable-sunaudio \
+	--disable-osx_audio \
+	--disable-osx_video \
+	--disable-aalib \
+	--disable-aalibtest \
+	--disable-libcaca \
+	--disable-esd \
+	--disable-esdtest
+
+
+# Options which require currently unpackaged libraries
+GST1_PLUGINS_GOOD_CONF_OPT += \
+	--disable-jack \
+	--disable-libdv \
+	--disable-dv1394 \
+	--disable-shout2 \
+	--disable-taglib
+
+GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-orc
+GST1_PLUGINS_GOOD_DEPENDENCIES += orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-alpha
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-alpha
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-apetag
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-apetag
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-audiofx
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-audiofx
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-audioparsers
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-audioparsers
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-auparse
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-auparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-autodetect
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-autodetect
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-avi
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-avi
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-cutter
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-cutter
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-debugutils
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-debugutils
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-deinterlace
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-deinterlace
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-effectv
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-effectv
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-equalizer
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-equalizer
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-flv
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-flv
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-flx
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-flx
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-goom
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-goom
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-icydemux
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-id3demux
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-id3demux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-interleave
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-interleave
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-isomp4
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-isomp4
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-law
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-law
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-level
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-level
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-matroska
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-matroska
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-monoscope
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-monoscope
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-multifile
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-multifile
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-multipart
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-multipart
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-replaygain
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-replaygain
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtp
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtpmanager
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtpmanager
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtsp
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-smpte
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-smpte
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-spectrum
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-spectrum
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-udp
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-udp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videobox
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videobox
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videocrop
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videocrop
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-videomixer
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-videomixer
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavenc
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-y4m
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-y4m
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-oss
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-oss
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-gst_v4l2
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-gst_v4l2
+endif
+
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
+GST1_PLUGINS_GOOD_CONF_OPT += \
+	--enable-x \
+	--enable-xshm \
+	--enable-xvideo
+else
+GST1_PLUGINS_GOOD_CONF_OPT += \
+	--disable-x \
+	--disable-xshm \
+	--disable-xvideo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-cairo
+GST1_PLUGINS_GOOD_DEPENDENCIES += cairo
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-cairo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-flac
+GST1_PLUGINS_GOOD_DEPENDENCIES += flac
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-flac
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST1_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
+GST1_PLUGINS_GOOD_DEPENDENCIES += jpeg
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-libpng
+GST1_PLUGINS_GOOD_DEPENDENCIES += libpng
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-libpng
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-pulse
+GST1_PLUGINS_GOOD_DEPENDENCIES += pulseaudio
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-pulse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-soup
+GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-soup
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-speex
+GST1_PLUGINS_GOOD_DEPENDENCIES += speex
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-speex
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-zlib
+GST1_PLUGINS_GOOD_DEPENDENCIES += zlib
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-bz2
+GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-bz2
+endif
+
+$(eval $(autotools-package))

From 6afdb607cd3741bd4fa6fa0e859f763feccdf28d Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:40 -0500
Subject: [PATCH 5448/6849] gst1-plugins-bad: add gstreamer1 bad plugins

Adds gstreamer 1.X bad plugins

[Peter: strip trailing newlines in Config.in]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |   1 +
 package/multimedia/gst1-plugins-bad/Config.in | 446 ++++++++++++
 .../gst1-plugins-bad-use-gettext-0.18.patch   |  17 +
 .../gst1-plugins-bad/gst1-plugins-bad.mk      | 678 ++++++++++++++++++
 4 files changed, 1142 insertions(+)
 create mode 100644 package/multimedia/gst1-plugins-bad/Config.in
 create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
 create mode 100644 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 935fde83cc..318dd74d41 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -16,6 +16,7 @@ source "package/multimedia/gst1-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst1-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
+source "package/multimedia/gst1-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/gst-plugin-x170/Config.in"
 source "package/multimedia/lame/Config.in"
diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
new file mode 100644
index 0000000000..7eb531abd3
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -0,0 +1,446 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
+	bool "gst1-plugins-bad"
+	depends on BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	help
+	  A set of plug-ins for GStreamer that may be of poor quality or
+	  lacking some features.
+
+	  http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_BAD
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC
+	bool "adpcmdec"
+	help
+	  ADPCM decoder
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC
+	bool "adpcmenc"
+	help
+	  ADPCM encoder
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF
+	bool "aiff"
+	help
+	  Create and parse Audio interchange File Format (AIFF) files
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX
+	bool "asfmux"
+	help
+	  ASF Muxer Plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS
+	bool "audiovisualizers"
+	help
+	  Creates video visualizations of audio input
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT
+	bool "autoconvert"
+	help
+	  Selects convertor element based on caps
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER
+	bool "bayer"
+	help
+	  Elements to convert Bayer images
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2
+	bool "camerabin2"
+	help
+	  Take image snapshots and record movies from camera
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE
+	bool "cdxaparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS
+	bool "coloreffects"
+	help
+	  Color Look-up Table filters
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC
+	bool "dataurisrc"
+	help
+	  data: URI source
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP
+	bool "dccp"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
+	bool "debugutils"
+	help
+	  Collection of elements that may or may not be useful for debugging
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTMF
+	bool "dtmf"
+	help
+	  DTMF plugins
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
+	bool "dvdsuboverlay"
+	help
+	  DTMF plugins
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU
+	bool "dvdspu"
+	help
+	  DVD Sub-picture Overlay element
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY
+	bool "faceoverlay"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL
+	bool "festival"
+	help
+	  Synthesizes plain text into audio
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
+	bool "fieldanalysis"
+	help
+	  Video field analysis
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB
+	bool "freeverb"
+	help
+	  Reverberation/room effect
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R
+	bool "frei0r"
+	help
+	  frei0r plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS
+	bool "gaudieffects"
+	help
+	  Gaudi video effects
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM
+	bool "geometrictransform"
+	help
+	  Various geometric image transform elements
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP
+	bool "gdp"
+	help
+	  Payload/depayload GDP packets
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE
+	bool "hdvparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
+	bool "hls"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG
+	bool "id3tag"
+	help
+	  ID3 v1 and v2 muxing plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER
+	bool "inter"
+	help
+	  plugin for inter-pipeline communication
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE
+	bool "interlace"
+	help
+	  Create an interlaced video stream
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE
+	bool "ivfparse"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR
+	bool "jp2kdecimator"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT
+	bool "jpegformat"
+	help
+	  JPEG interchange format plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB
+	bool "librfb"
+	help
+	  Connects to a VNC server and decodes RFB stream
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
+	bool "liveadder"
+	help
+	  Adds multiple live discontinuous streams
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX
+	bool "mpegdemux"
+	help
+	  MPEG-PS demuxer
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
+	bool "mpegtsdemux"
+	help
+	  MPEG TS demuxer
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX
+	bool "mpegtsmux"
+	help
+	  MPEG-TS muxer
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX
+	bool "mpegpsmux"
+	help
+	  MPEG-PS muxer
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE
+	bool "mve"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF
+	bool "mxf"
+	help
+	  MXF plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX
+	bool "nuvdemux"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT
+	bool "patchdetect"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE
+	bool "pcapparse"
+	help
+	  Element parsing raw pcap streams
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM
+	bool "pnm"
+	help
+	  PNM plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE
+	bool "rawparse"
+	help
+	  Parses byte streams into raw frames
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL
+	bool "real"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE
+	bool "removesilence"
+	help
+	  Removes silence from an audio stream
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPMUX
+	bool "rtpmux"
+	help
+	  RTP Muxer plugins
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPVP8
+	bool "rtpvp8"
+	help
+	  rtpvp8
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCALETEMPO
+	bool "scaletempo"
+	help
+	  Scale audio tempo in sync with playback rate
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI
+	bool "sdi"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP
+	bool "sdp"
+	help
+	  configure streaming sessions using SDP
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP
+	bool "segmentclip"
+	help
+	  Segment clip elements
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN
+	bool "siren"
+	help
+	  Siren encoder/decoder/payloader/depayloader plugins
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH
+	bool "smooth"
+	help
+	  Apply a smooth filter to an image
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED
+	bool "speed"
+	help
+	  Set speed/pitch on audio/raw streams (resampler)
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC
+	bool "subenc"
+	help
+	  subtitle encoders
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO
+	bool "stereo"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA
+	bool "tta"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS
+	bool "videofilters"
+	help
+	  Video filters in gst-plugins-bad
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
+	bool "videomeasure"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS
+	bool "videoparsers"
+	help
+	  videoparsers
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
+	bool "videosignal"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC
+	bool "vmnc"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M
+	bool "y4m"
+	help
+	  Demuxes/decodes YUV4MPEG streams
+
+comment "plugins with external dependencies"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM
+	bool "shm"
+	help
+	  shared memory sink source
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD
+	bool "vcd"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK
+	bool "apexsink"
+	select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
+	bool "bz2"
+	select BR2_PACKAGE_BZIP2
+	help
+	  Compress or decompress streams
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO
+	bool "cdaudio"
+	select BR2_PACKAGE_LIBCDAUDIO
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CELT
+	bool "celt"
+	select BR2_PACKAGE_CELT051
+	help
+	  CELT plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL
+	bool "curl"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  libcurl-based elements
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
+	depends on BR2_INSTALL_LIBSTDCPP
+	bool "decklink"
+	help
+	  Blackmagic Decklink plugin
+
+comment "decklink requires a toolchain with C++ support enabled"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
+	bool "directfb"
+	select BR2_PACKAGE_DIRECTFB
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
+	bool "wayland"
+	select BR2_PACKAGE_WAYLAND
+	help
+	  Wayland Video Sink
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD
+	bool "faad"
+	select BR2_PACKAGE_FAAD2
+	help
+	  Free AAC Decoder (FAAD)
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
+	bool "fbdev"
+	help
+	  Linux framebuffer video sink
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
+	bool "libmms"
+	select BR2_PACKAGE_LIBMMS
+	help
+	  Microsoft Multi Media Server streaming protocol support
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
+	bool "mpeg2enc"
+	select BR2_PACKAGE_LIBMPEG2
+	help
+	  High-quality MPEG-1/2 video encoder
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123
+	bool "mpg123"
+	select BR2_PACKAGE_MPG123
+	help
+	  mp3 decoding based on the mpg123 library
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK
+	bool "musepack"
+	select BR2_PACKAGE_MUSEPACK
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON
+	bool "neon"
+	select BR2_PACKAGE_NEON
+	help
+	  lib neon http client src
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
+	bool "opencv"
+	select BR2_PACKAGE_OPENCV
+	help
+	  GStreamer OpenCV Plugins
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
+	bool "opus"
+	select BR2_PACKAGE_OPUS
+	help
+	  OPUS plugin library
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
+	bool "rsvg"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBRSVG
+	help
+	  RSVG plugin library
+
+comment "rsvg plugin requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES
+	bool "eglgles"
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  EGL/GLES sink
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL
+	bool "sdl"
+	select BR2_PACKAGE_SDL
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE
+	bool "sndfile"
+	select BR2_PACKAGE_LIBSNDFILE
+	depends on BR2_LARGEFILE
+
+comment "gst-plugins-bad-plugin-sndfile requires a toolchain with LARGEFILE support"
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
+	bool "dvb"
+	select BR2_PACKAGE_DVB_APPS
+	help
+	  DVB elements
+
+endif
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
new file mode 100644
index 0000000000..ebf4567b00
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
@@ -0,0 +1,17 @@
+Use newer version of gettext to match current buildroot gettext.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: gst1-plugins-bad-1.1.1/po/Makefile.in.in
+===================================================================
+--- gst1-plugins-bad-1.1.1.orig/po/Makefile.in.in
++++ gst1-plugins-bad-1.1.1/po/Makefile.in.in
+@@ -9,7 +9,7 @@
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
new file mode 100644
index 0000000000..1e61bd2fc4
--- /dev/null
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -0,0 +1,678 @@
+###############################################################################
+#
+# gst1-plugins-bad
+#
+###############################################################################
+
+GST1_PLUGINS_BAD_VERSION = 1.0.7
+GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
+GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
+GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
+# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
+# enabled.
+GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
+
+GST1_PLUGINS_BAD_AUTORECONF = YES
+GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4
+
+GST1_PLUGINS_BAD_CONF_OPT = \
+	--disable-examples \
+	--disable-debug \
+	--disable-valgrind \
+	--disable-directsound \
+	--disable-wsapi \
+	--disable-direct3d \
+	--disable-directdraw \
+	--disable-direct3d9 \
+	--disable-directshow \
+	--disable-android_media \
+	--disable-apple_media \
+	--disable-osx_video \
+	--disable-sdltest \
+	--disable-wininet \
+	--disable-acm
+
+# Options which require currently unpackaged libraries
+GST1_PLUGINS_BAD_CONF_OPT += \
+	--disable-avc \
+	--disable-quicktime \
+	--disable-mfc \
+	--disable-opensles \
+	--disable-uvch264 \
+	--disable-assrender \
+	--disable-voamrwbenc \
+	--disable-voaacenc \
+	--disable-chromaprint \
+	--disable-dash \
+	--disable-dc1394 \
+	--disable-dts \
+	--disable-resindvd \
+	--disable-faac \
+	--disable-flite \
+	--disable-gsm \
+	--disable-fluidsynth \
+	--disable-kate \
+	--disable-ladspa \
+	--disable-lv2 \
+	--disable-strp \
+	--disable-linsys \
+	--disable-modplug \
+	--disable-mimic \
+	--disable-mplex \
+	--disable-mythtv \
+	--disable-nas \
+	--disable-ofa \
+	--disable-openal \
+	--disable-openjpeg \
+	--disable-pvr \
+	--disable-timidity \
+	--disable-teletextdec \
+	--disable-wildmidi \
+	--disable-smoothstreaming \
+	--disable-soundtouch \
+	--disable-spc \
+	--disable-gme \
+	--disable-xvid \
+	--disable-vdpau \
+	--disable-sbc \
+	--disable-schro \
+	--disable-zbar \
+	--disable-rtmp \
+	--disable-spandsp \
+	--disable-gsettings \
+	--disable-sndio \
+	--disable-hls
+
+GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_BAD_DEPENDENCIES += orc
+GST1_PLUGINS_BAD_CONF_OPT += --enable-orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-adpcmdec
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmenc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-adpcmenc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-aiff
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-aiff
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-asfmux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-asfmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-audiovisualizers
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-autoconvert
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-bayer
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-bayer
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-camerabin2
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-cdxaparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-cdxaparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dataurisrc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dataurisrc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dccp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dccp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-debugutils
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-debugutils
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTMF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dtmf
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dtmf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dvbsuboverlay
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dvdspu
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dvdspu
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-faceoverlay
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-faceoverlay
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-festival
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-festival
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-fieldanalysis
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-freeverb
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-freeverb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-frei0r
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-frei0r
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-gaudieffects
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-gaudieffects
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-geometrictransform
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-geometrictransform
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-gdp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-gdp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-hdvparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-hls
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-hls
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-id3tag
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-id3tag
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-inter
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-inter
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-interlace
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-interlace
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-ivfparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-jp2kdecimator
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-jpegformat
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-librfb
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-librfb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-liveadder
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-liveadder
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegdemux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegtsdemux
+GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegtsdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegtsmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegpsmux
+GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mve
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mve
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mxf
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mxf
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-nuvdemux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-nuvdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-patchdetect
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-patchdetect
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-pcapparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-pcapparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-pnm
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-pnm
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rawparse
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rawparse
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-real
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-real
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-removesilence
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-removesilence
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPMUX),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rtpmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPVP8),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rtpvp8
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rtpvp8
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCALETEMPO),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-scaletempo
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-scaletempo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sdi
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sdi
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sdp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sdp
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-segmentclip
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-segmentclip
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-siren
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-siren
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-smooth
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-smooth
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-speed
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-speed
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-subenc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-subenc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-stereo
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-stereo
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-tta
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-tta
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videofilters
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videofilters
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videomeasure
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videoparsers
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videoparsers
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-videosignal
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-videosignal
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-vmnc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-vmnc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-y4m
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-y4m
+endif
+
+# Plugins with dependencies
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-shm
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-shm
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-vcd
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-vcd
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-apexsink
+GST1_PLUGINS_BAD_DEPENDENCIES += openssl
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-apexsink
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-bz2
+GST1_PLUGINS_BAD_DEPENDENCIES += bzip2
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-bz2
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
+GST1_PLUGINS_BAD_DEPENDENCIES += libcdaudio
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CELT),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-celt
+GST1_PLUGINS_BAD_DEPENDENCIES += celt051
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-celt
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-curl
+GST1_PLUGINS_BAD_DEPENDENCIES += libcurl
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-curl
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-decklink
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-decklink
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-directfb
+GST1_PLUGINS_BAD_DEPENDENCIES += directfb
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-directfb
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-wayland
+GST1_PLUGINS_BAD_DEPENDENCIES += wayland
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-wayland
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST1_PLUGINS_BAD_DEPENDENCIES += faad2
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-faad
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-fbdev
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-fbdev
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-libmms
+GST1_PLUGINS_BAD_DEPENDENCIES += libmms
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-libmms
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpeg2enc
+GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpeg2enc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-mpg123
+GST1_PLUGINS_BAD_DEPENDENCIES += mpg123
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-mpg123
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-musepack
+GST1_PLUGINS_BAD_DEPENDENCIES += musepack
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-musepack
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-neon
+GST1_PLUGINS_BAD_DEPENDENCIES += neon
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-neon
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-opencv
+GST1_PLUGINS_BAD_DEPENDENCIES += opencv
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-opencv
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-opus
+GST1_PLUGINS_BAD_DEPENDENCIES += opus
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-opus
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-rsvg
+GST1_PLUGINS_BAD_DEPENDENCIES += librsvg
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-rsvg
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-eglgles
+GST1_PLUGINS_BAD_DEPENDENCIES += libegl libgles
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+# RPI has odd locations for several required headers.
+GST1_PLUGINS_BAD_CONF_OPT += --with-egl-window-system=rpi
+GST1_PLUGINS_BAD_CONF_ENV += \
+	CFLAGS="$(TARGET_CFLAGS) \
+	-I$(STAGING_DIR)/usr/include/IL \
+	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
+	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
+endif
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-eglgles
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y)
+GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sdl
+GST1_PLUGINS_BAD_DEPENDENCIES += sdl
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-sndfile
+GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-sndfile
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dvb
+GST1_PLUGINS_BAD_DEPENDENCIES += dvb-apps
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dvb
+endif
+
+# Add GPL license if GPL licensed plugins enabled.
+ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
+GST1_PLUGINS_BAD_LICENSE += GPL
+endif
+
+# Add Unknown license if Unknown licensed plugins enabled.
+ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y)
+GST1_PLUGINS_BAD_LICENSE += UNKNOWN
+endif
+
+# Use the following command to extract license info for plugins.
+# # find . -name 'plugin-*.xml' | xargs grep license
+
+$(eval $(autotools-package))

From 09ed859d5e61f0ac1812340dc471a4dfab8819be Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:41 -0500
Subject: [PATCH 5449/6849] gst1-plugins-ugly: add gstreamer1 ugly plugins

Adds gstreamer 1.X ugly plugins

[Peter: fix Config.in typo]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |   1 +
 .../multimedia/gst1-plugins-ugly/Config.in    |  69 ++++++++++++
 .../gst1-plugins-ugly/gst1-plugins-ugly.mk    | 104 ++++++++++++++++++
 3 files changed, 174 insertions(+)
 create mode 100644 package/multimedia/gst1-plugins-ugly/Config.in
 create mode 100644 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 318dd74d41..c87abea7a3 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -18,6 +18,7 @@ source "package/multimedia/gst1-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst1-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
+source "package/multimedia/gst1-plugins-ugly/Config.in"
 source "package/multimedia/gst-plugin-x170/Config.in"
 source "package/multimedia/lame/Config.in"
 source "package/multimedia/libvpx/Config.in"
diff --git a/package/multimedia/gst1-plugins-ugly/Config.in b/package/multimedia/gst1-plugins-ugly/Config.in
new file mode 100644
index 0000000000..a6ca387c66
--- /dev/null
+++ b/package/multimedia/gst1-plugins-ugly/Config.in
@@ -0,0 +1,69 @@
+menuconfig BR2_PACKAGE_GST1_PLUGINS_UGLY
+	bool "gst1-plugins-ugly"
+	depends on BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	help
+	  A set of well-supported plug-ins for GStreamer, but might pose
+	  problems for distributors.
+
+	  http://gstreamer.freedesktop.org/
+
+if BR2_PACKAGE_GST1_PLUGINS_UGLY
+
+comment "dependency-less plugins"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX
+	bool "asfdemux"
+	help
+	  Demuxes and muxes audio and video in Microsofts ASF format
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC
+	bool "dvdlpcmdec"
+	help
+	  Decode DVD LPCM frames into standard PCM
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB
+	bool "dvdsub"
+	help
+	  DVD subtitle parser and decoder
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX
+	bool "xingmux"
+	help
+	  Add XING tags to mpeg audio files
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA
+	bool "realmedia"
+	help
+	  RealMedia support plugins
+
+comment "plugins with external dependencies (there may be more available)"
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD
+	bool "dvdread"
+	select BR2_PACKAGE_LIBDVDREAD
+	help
+	  Access a DVD with dvdread
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
+	bool "lame (*.mp3 audio encoder)"
+	select BR2_PACKAGE_LAME
+	help
+	  Encode MP3s with LAME
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD
+	bool "mad (*.mp3 audio)"
+	select BR2_PACKAGE_LIBID3TAG
+	select BR2_PACKAGE_LIBMAD
+	help
+	  mp3 decoding based on the mad library
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC
+	bool "mpeg2dec"
+	select BR2_PACKAGE_LIBMPEG2
+	help
+	  LibMpeg2 decoder
+
+# Note: to get descriptions use the following.
+# # find . -name 'plugin-*.xml' | xargs grep -m 1 description
+endif
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
new file mode 100644
index 0000000000..67761b5d80
--- /dev/null
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -0,0 +1,104 @@
+###############################################################################
+#
+# gst1-plugins-ugly
+#
+###############################################################################
+
+GST1_PLUGINS_UGLY_VERSION = 1.0.7
+GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
+GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
+GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
+# GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled.
+GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+
+
+GST1_PLUGINS_UGLY_CONF_OPT = \
+	--disable-examples \
+	--disable-debug \
+	--disable-valgrind
+
+GST_PLUGINS_BAD1_CONF_OPT += \
+	--disable-a52dec \
+	--disable-amrnb \
+	--disable-amrwb \
+	--disable-cdio \
+	--disable-sidplay \
+	--disable-twolame \
+	--disable-x264
+
+GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-orc
+GST1_PLUGINS_UGLY_DEPENDENCIES += orc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-asfdemux
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-asfdemux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdlpcmdec
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdlpcmdec
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdsub
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdsub
+endif
+
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGL1_PLUGIN_XINGMUX),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-xingmux
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-xingmux
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-realmedia
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-realmedia
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdread
+GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread
+GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdread
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-lame
+GST1_PLUGINS_UGLY_DEPENDENCIES += lame
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-lame
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-mad
+GST1_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
+GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-mad
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
+GST1_PLUGINS_UGLY_CONF_OPT += --enable-mpeg2dec
+GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
+GST1_PLUGINS_ULGY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
+endif
+
+# Add GPL license if GPL plugins enabled.
+ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y)
+GST1_PLUGINS_UGLY_LICENSE += GPLv2
+endif
+
+# Use the following command to extract license info for plugins.
+# # find . -name 'plugin-*.xml' | xargs grep license
+
+$(eval $(autotools-package))

From 302c7539c97ff4fe68a39d46996abfaa0a45f310 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:42 -0500
Subject: [PATCH 5450/6849] gst1-plugins-good: add libvpx support

adds libvpx support to gst1-plugins-good

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-good/Config.in            | 4 ++++
 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
index 9b7eba0f06..e579539483 100644
--- a/package/multimedia/gst1-plugins-good/Config.in
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -317,6 +317,10 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	help
 	  VP8 plugin
 
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
+	bool "vpx (webm)"
+	select BR2_PACKAGE_LIBVPX
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK
 	bool "wavpack (*.wv audio)"
 	select BR2_PACKAGE_WAVPACK
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index f177ed1b4c..1e6d39b304 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -380,6 +380,13 @@ else
 GST1_PLUGINS_GOOD_CONF_OPT += --disable-speex
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-vpx
+GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-vpx
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
 GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
 GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack

From a82f18ad8e7e167ecaffe9493a0bd823eabd1782 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:43 -0500
Subject: [PATCH 5451/6849] gst-omx: add gst-omx package

gst-omx enables OpenMAX based accelerated video decode.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in                  |   1 +
 package/multimedia/gst-omx/Config.in          |  11 ++
 .../gst-omx/gst-omx-config-files.patch        | 127 ++++++++++++++++++
 package/multimedia/gst-omx/gst-omx.mk         |  37 +++++
 4 files changed, 176 insertions(+)
 create mode 100644 package/multimedia/gst-omx/Config.in
 create mode 100644 package/multimedia/gst-omx/gst-omx-config-files.patch
 create mode 100644 package/multimedia/gst-omx/gst-omx.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index c87abea7a3..e0d5f6a437 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -11,6 +11,7 @@ source "package/multimedia/gst-ffmpeg/Config.in"
 source "package/multimedia/gst-dsp/Config.in"
 source "package/multimedia/gst-fsl-plugins/Config.in"
 source "package/multimedia/gst-omapfb/Config.in"
+source "package/multimedia/gst-omx/Config.in"
 source "package/multimedia/gst-plugins-base/Config.in"
 source "package/multimedia/gst1-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
diff --git a/package/multimedia/gst-omx/Config.in b/package/multimedia/gst-omx/Config.in
new file mode 100644
index 0000000000..b6ea116c66
--- /dev/null
+++ b/package/multimedia/gst-omx/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_GST_OMX
+	bool "gst-omx"
+	depends on BR2_PACKAGE_GSTREAMER1 && BR2_PACKAGE_HAS_OPENMAX
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	help
+	  GStreamer plug-in to use OpenMAX API.
+
+	  http://cgit.freedesktop.org/gstreamer/gst-omx
+
+comment "gst-omx requires a OpenMAX implementation"
+	depends on BR2_PACKAGE_GSTREAMER1 && !BR2_PACKAGE_HAS_OPENMAX
diff --git a/package/multimedia/gst-omx/gst-omx-config-files.patch b/package/multimedia/gst-omx/gst-omx-config-files.patch
new file mode 100644
index 0000000000..f4845217ec
--- /dev/null
+++ b/package/multimedia/gst-omx/gst-omx-config-files.patch
@@ -0,0 +1,127 @@
+Change config files to match default buildroot install
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+---
+Index: gst-omx-1.0.0/config/bellagio/gstomx.conf
+===================================================================
+--- gst-omx-1.0.0.orig/config/bellagio/gstomx.conf	2013-03-12 04:12:09.000000000 -0500
++++ gst-omx-1.0.0/config/bellagio/gstomx.conf	2013-05-21 17:50:14.545692908 -0500
+@@ -1,6 +1,6 @@
+ [omxmpeg4videodec]
+ type-name=GstOMXMPEG4VideoDec
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.video_decoder.mpeg4
+ rank=256
+ in-port-index=0
+@@ -9,7 +9,7 @@
+ 
+ [omxh264dec]
+ type-name=GstOMXH264Dec
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.video_decoder.avc
+ rank=256
+ in-port-index=0
+@@ -18,7 +18,7 @@
+ 
+ [omxmpeg4videoenc]
+ type-name=GstOMXMPEG4VideoEnc
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.video_encoder.mpeg4
+ rank=0
+ in-port-index=0
+@@ -27,7 +27,7 @@
+ 
+ [omxaacenc]
+ type-name=GstOMXAACEnc
+-core-name=/usr/local/lib/libomxil-bellagio.so.0
++core-name=/usr/lib/libomxil-bellagio.so.0
+ component-name=OMX.st.audio_encoder.aac
+ rank=0
+ in-port-index=0
+Index: gst-omx-1.0.0/config/rpi/gstomx.conf
+===================================================================
+--- gst-omx-1.0.0.orig/config/rpi/gstomx.conf	2013-05-21 17:51:39.965693635 -0500
++++ gst-omx-1.0.0/config/rpi/gstomx.conf	2013-05-21 17:52:07.781693871 -0500
+@@ -1,6 +1,6 @@
+ [omxmpeg2videodec]
+ type-name=GstOMXMPEG2VideoDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -9,7 +9,7 @@
+ 
+ [omxmpeg4videodec]
+ type-name=GstOMXMPEG4VideoDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -18,7 +18,7 @@
+ 
+ [omxh263dec]
+ type-name=GstOMXH263Dec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -27,7 +27,7 @@
+ 
+ [omxh264dec]
+ type-name=GstOMXH264Dec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -36,7 +36,7 @@
+ 
+ [omxtheoradec]
+ type-name=GstOMXTheoraDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -45,7 +45,7 @@
+ 
+ [omxvp8dec]
+ type-name=GstOMXVP8Dec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -54,7 +54,7 @@
+ 
+ [omxmjpegdec]
+ type-name=GstOMXMJPEGDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_decode
+ rank=256
+ in-port-index=130
+@@ -63,7 +63,7 @@
+ 
+ [omxvc1dec]
+ type-name=GstOMXWMVDec
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_encode
+ rank=256
+ in-port-index=130
+@@ -73,7 +73,7 @@
+ 
+ [omxh264enc]
+ type-name=GstOMXH264Enc
+-core-name=/opt/vc/lib/libopenmaxil.so
++core-name=/usr/lib/libopenmaxil.so
+ component-name=OMX.broadcom.video_encode
+ rank=256
+ in-port-index=200
diff --git a/package/multimedia/gst-omx/gst-omx.mk b/package/multimedia/gst-omx/gst-omx.mk
new file mode 100644
index 0000000000..00abecb6d7
--- /dev/null
+++ b/package/multimedia/gst-omx/gst-omx.mk
@@ -0,0 +1,37 @@
+#############################################################
+#
+# gst-omx
+#
+#############################################################
+
+GST_OMX_VERSION = 1.0.0
+GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
+GST_OMX_SITE = http://gstreamer.freedesktop.org/src/gst-omx/
+
+GST_OMX_LICENSE = LGPLv2.1
+GST_OMX_LICENSE_FILE = COPYING
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+GST_OMX_CONF_OPT = \
+	--with-omx-target=rpi
+GST_OMX_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) \
+		-I$(STAGING_DIR)/usr/include/IL \
+		-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
+		-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
+endif
+
+ifeq ($(BR2_PACKAGE_BELLAGIO),y)
+GST_OMX_CONF_OPT = \
+	--with-omx-target=bellagio
+GST_OMX_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) \
+		-DOMX_VERSION_MAJOR=1 \
+		-DOMX_VERSION_MINOR=1 \
+		-DOMX_VERSION_REVISION=2 \
+		-DOMX_VERSION_STEP=0"
+endif
+
+GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax
+
+$(eval $(autotools-package))

From 674c931dec1efec19530a2d46e0c936c5ba42aba Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 20 Jun 2013 17:07:44 -0500
Subject: [PATCH 5452/6849] multimedia: reorganize for gst1

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/Config.in | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index e0d5f6a437..925051e947 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -5,22 +5,27 @@ source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
 source "package/multimedia/ffmpeg/Config.in"
+
+# Gstreamer 0.10.x & Plugins
 source "package/multimedia/gstreamer/Config.in"
-source "package/multimedia/gstreamer1/Config.in"
+source "package/multimedia/gst-plugins-base/Config.in"
+source "package/multimedia/gst-plugins-good/Config.in"
+source "package/multimedia/gst-plugins-bad/Config.in"
+source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/gst-ffmpeg/Config.in"
 source "package/multimedia/gst-dsp/Config.in"
 source "package/multimedia/gst-fsl-plugins/Config.in"
 source "package/multimedia/gst-omapfb/Config.in"
-source "package/multimedia/gst-omx/Config.in"
-source "package/multimedia/gst-plugins-base/Config.in"
+source "package/multimedia/gst-plugin-x170/Config.in"
+
+# Gstreamer 1.x & Plugins
+source "package/multimedia/gstreamer1/Config.in"
 source "package/multimedia/gst1-plugins-base/Config.in"
-source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst1-plugins-good/Config.in"
-source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst1-plugins-bad/Config.in"
-source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/gst1-plugins-ugly/Config.in"
-source "package/multimedia/gst-plugin-x170/Config.in"
+source "package/multimedia/gst-omx/Config.in"
+
 source "package/multimedia/lame/Config.in"
 source "package/multimedia/libvpx/Config.in"
 source "package/multimedia/madplay/Config.in"

From 6e9686419f9cc78705f84588a8737491c9df450e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 20 Jun 2013 22:22:16 -0300
Subject: [PATCH 5453/6849] kernel-headers: bump 3.{0, 4, 9}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.82-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.83-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 5667efb225..de0c70344c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.82"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.83"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.47"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.49"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.50"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.6"		if BR2_KERNEL_HEADERS_3_9
+	default "3.9.7"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.82-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.83-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.82-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.83-headers_install-fix-__packed-in-exported-kernel-head.patch

From e7c042588793844e251ef0936306b90268b4b155 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 20 Jun 2013 22:22:17 -0300
Subject: [PATCH 5454/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index cfad172394..0912965cfb 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.6"
+	bool "3.9.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.7" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 2e0aff3b5cf2f83a3ddd31dfd572b29a8288f6be Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Fri, 21 Jun 2013 12:53:30 +0200
Subject: [PATCH 5455/6849] libserial: prevent documentation from being build

If docbook2pdf is present on the host, the documentation is built, no
matter all the --disable-doc*
But forcing ac_cv_prog_DOCBOOK2PDF to no tells configure that
docbook2pdf is absent, and thus the documentation is not built.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libserial/libserial.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libserial/libserial.mk b/package/libserial/libserial.mk
index c5142c5e8f..d2c928bb3e 100644
--- a/package/libserial/libserial.mk
+++ b/package/libserial/libserial.mk
@@ -10,4 +10,6 @@ LIBSERIAL_INSTALL_STAGING = YES
 LIBSERIAL_LICENSE = GPLv2+
 LIBSERIAL_LICENSE_FILES = COPYING
 
+LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no
+
 $(eval $(autotools-package))

From 953430bc4dcf7e8691252b3a60d10d6ff72db5c9 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 21 Jun 2013 15:41:31 +0100
Subject: [PATCH 5456/6849] gvfs: Depend on libgcrypt if it is selected

gvfs can make optional use of libgcrypt so it needs to depend on
it if it is selected. It's also necessary to set the
ac_cv_path_LIBGCRYPT_CONFIG variable to a known value in order
to prevent the AM_PATH_LIBGCRYPT macro from searching the host
paths for the libgcrypt-config script.

Fixes the following build problem when libgcrypt is installed on the
host system but the package is not selected in buildroot:

gvfsbackendafpbrowse.c:31:20: fatal error: gcrypt.h: No such file or directory

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gvfs/gvfs.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index d99c7843e7..6e88f6eea1 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -12,6 +12,10 @@ GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
 GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
 
+# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent
+# build system from searching the host paths.
+GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+
 GVFS_CONF_OPT = \
 	--disable-gconf			\
 	--disable-cdda			\
@@ -42,6 +46,10 @@ else
 GVFS_CONF_OPT += --disable-fuse
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+GVFS_DEPENDENCIES += libgcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSOUP),y)
 GVFS_DEPENDENCIES += libsoup
 GVFS_CONF_OPT += --enable-http

From c3cf32ebf55c203ec4d3fcd566ca64bf173b9079 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 21 Jun 2013 10:59:44 -0700
Subject: [PATCH 5457/6849] tinyhttpd: do not link against pthread

Original patch for tinyhttpd disables pthread support from the code
but does not disable it from makefile.
This patch disables pthread support altogether

Fixes:
http://autobuild.buildroot.net/results/2e61a80fcbddd62c76e0406c34ab44d14a4b5c79

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tinyhttpd/tinyhttpd.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tinyhttpd/tinyhttpd.patch b/package/tinyhttpd/tinyhttpd.patch
index 02eb189af0..05d6e50a70 100644
--- a/package/tinyhttpd/tinyhttpd.patch
+++ b/package/tinyhttpd/tinyhttpd.patch
@@ -73,7 +73,7 @@ diff -ur tinyhttpd-0.1.0/Makefile tinyhttpd-0.1.0-patched/Makefile
  
  httpd: httpd.c
 -	gcc -W -Wall -lsocket -lpthread -o httpd httpd.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -W -Wall -lpthread -o httpd httpd.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -W -Wall -o httpd httpd.c
  
  clean:
 -	rm httpd

From 2f2bf6a800d585ea381e09eec148844a7135ac53 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 23 Jun 2013 00:22:32 +0200
Subject: [PATCH 5458/6849] system/permissions: make /root group+others
 non-writable

Upon logging, dropbear whines if /root is group- or others-writable, and
key-based authentication is attempted, reverting to password-based
authentication:
    dropbear[149]: /root must be owned by user or root, and not writable by others
    dropbear[149]: Password auth succeeded for 'root' from 192.168.127.35:41566

On my system, /root was 770. Changing to 700 fixed the issue.

Having /root 700 is a good idea, anyway.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/device_table.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/device_table.txt b/system/device_table.txt
index 43c0cfa0b4..7ae4b071b9 100644
--- a/system/device_table.txt
+++ b/system/device_table.txt
@@ -9,6 +9,7 @@
 /dev					d	755	0	0	-	-	-	-	-
 /tmp					d	1777	0	0	-	-	-	-	-
 /etc					d	755	0	0	-	-	-	-	-
+/root					d	700	0	0	-	-	-	-	-
 /home/default				d	755	1000	1000	-	-	-	-	-
 /var/www				d	755	33	33	-	-	-	-	-
 /etc/shadow				f	600	0	0	-	-	-	-	-

From 88d9d17d975e97edde093f441b42d35f8a178aca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 23 Jun 2013 16:20:02 +0200
Subject: [PATCH 5459/6849] toolchain-external: bump to Linaro ARM 2013.06

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 22 +++++++++++-----------
 toolchain/toolchain-external/ext-tool.mk |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 94b8158a93..ebe9fcd308 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,8 +3,8 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
-	bool "Linaro 2013.05"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
+	bool "Linaro 2013.06"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -14,7 +14,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.05 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GCC 2013.06 (based on gcc 4.8), Linaro GDB 2013.06 (based on
 	  GDB 7.6), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -22,8 +22,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
-	bool "Linaro 2013.04"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
+	bool "Linaro 2013.05"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -33,16 +33,16 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.04 (based on gcc 4.7), Linaro GDB 2012.12 (based on
-	  GDB 7.5), eglibc 2.15. It generates code that runs on all
+	  GCC 2013.05 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GDB 7.6), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
 	  calling convention, and uses the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
-	bool "Linaro 2013.03"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
+	bool "Linaro 2013.04"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -52,7 +52,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.03 (based on gcc 4.7), Linaro GDB 2012.12 (based on
+	  GCC 2013.04 (based on gcc 4.7), Linaro GDB 2012.12 (based on
 	  GDB 7.5), eglibc 2.15. It generates code that runs on all
 	  Cortex-A profile devices, but tuned for the Cortex-A9. The
 	  code generated is Thumb 2, with the hard floating point
@@ -777,9 +777,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index e5dc8ed410..2b0b23ec84 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -218,15 +218,15 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
 	mv $(@D)/arago-2011.09/armv5te/* $(@D)/
 	rm -rf $(@D)/arago-2011.09/
 endef
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.03/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.04/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.05/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.8-2013.05_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.06/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.8-2013.06_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 164f9fef0f80a7a38221787be8bf8a6d1684a107 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 23 Jun 2013 16:20:03 +0200
Subject: [PATCH 5460/6849] toolchain-external: bump to Linaro AArch64 2013.06

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 15 ++++++++-------
 toolchain/toolchain-external/ext-tool.mk |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ebe9fcd308..2c1c99b789 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -692,8 +692,8 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
-	bool "Linaro AArch64 13.05"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
+	bool "Linaro AArch64 13.06"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -704,8 +704,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
-	bool "Linaro AArch64 13.04"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
+	bool "Linaro AArch64 13.05"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -716,13 +716,14 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
-	bool "Linaro AArch64 13.03"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
+	bool "Linaro AArch64 13.04"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
@@ -785,9 +786,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2b0b23ec84..1d76a66b4b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -290,15 +290,15 @@ TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03),y)
-TOOLCHAIN_EXTERNAL_SITE=http://releases.linaro.org/13.03/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.03-20130313_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.04/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05),y)
 TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.05/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.8-2013.05_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06),y)
+TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.06/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.8-2013.06_linux.tar.xz
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From 0fcef3c9fe343ac2b54c07b0711210a96d993762 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 23 Jun 2013 15:58:08 +0200
Subject: [PATCH 5461/6849] lttng: bump the various LTTng components

This commit bumps the various LTTng components to their latest stable
version: 0.7.7 for liburcu, 1.1.1 for babeltrace, 2.1.3 for libust and
2.1.2 for lttng-modules.

For babeltrace, the patch
lttng-babeltrace-02-fix-build-old-compilers.patch has been removed
because it has been merged upstream as of version 1.1.1. This is also
the reason why the package no longer needs to be autoreconfigured.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liburcu/liburcu.mk                    |  2 +-
 ...abeltrace-02-fix-build-old-compilers.patch | 27 -------------------
 package/lttng-babeltrace/lttng-babeltrace.mk  |  6 +----
 package/lttng-libust/lttng-libust.mk          |  2 +-
 package/lttng-modules/lttng-modules.mk        |  2 +-
 5 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch

diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 3c684ea71c..35f09f7381 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBURCU_VERSION = 0.7.6
+LIBURCU_VERSION = 0.7.7
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 
diff --git a/package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch b/package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch
deleted file mode 100644
index b8f31be1e1..0000000000
--- a/package/lttng-babeltrace/lttng-babeltrace-02-fix-build-old-compilers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Support old compilers
-
-Some old compilers do not use C99 as their default C language variant,
-for example gcc 4.3.x, which is used on some old machines. When such a
-compiler is used, by default, ULLONG_MAX is not visible. Adding
--std=gnu99 is needed to make this definition visible.
-
-In autoconf speak, this translates into the need of using
-AC_PROC_CC_STDC instead of AC_PROG_CC. See
-http://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/C-Compiler.html
-for more details.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@
- AC_SYS_LARGEFILE
- 
- # Checks for programs.
--AC_PROG_CC
-+AC_PROG_CC_STDC
- AC_PROG_MAKE_SET
- LT_INIT
- AC_PROG_YACC
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 2947c35672..96d3a31f24 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -5,14 +5,10 @@
 ################################################################################
 
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
-LTTNG_BABELTRACE_VERSION = 1.0.2
+LTTNG_BABELTRACE_VERSION = 1.1.1
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
 
-# One patch touches configure.ac
-LTTNG_BABELTRACE_AUTORECONF = YES
-HOST_LTTNG_BABELTRACE_AUTORECONF = YES
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 625475f1b8..c295046cb6 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.1.1
+LTTNG_LIBUST_VERSION = 2.1.3
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index c1dfff9f01..85ccaf36df 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.1.0
+LTTNG_MODULES_VERSION = 2.1.2
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 

From 2be905282af5c1b049eab778c0b9cb76e3c1d4db Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Sat, 22 Jun 2013 23:39:42 -0700
Subject: [PATCH 5462/6849] dash: needs mmu

Fixes:
http://autobuild.buildroot.org/results/9ff/9ffde0aaa717efb6a5c0ef1e4e7f2cdd0621c150/

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dash/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dash/Config.in b/package/dash/Config.in
index 20970aa03b..e06087e117 100644
--- a/package/dash/Config.in
+++ b/package/dash/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DASH
 	bool "dash"
+	depends on BR2_USE_MMU # fork()
 	help
 	  The Debian/Linux port of the NetBSD version of
 	  ash (the Almquist SHell).

From cdc2892c6cb3eda99f00cc39632ef2a00d3e0be0 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Sat, 22 Jun 2013 23:39:43 -0700
Subject: [PATCH 5463/6849] dash: add license information

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dash/dash.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 2765ed4230..c6a8b11076 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -8,6 +8,8 @@ DASH_VERSION = 0.5.7
 DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
 DASH_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash
 DASH_PATCH = dash_$(DASH_VERSION)-2.diff.gz
+DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c)
+DASH_LICENSE_FILES = COPYING
 
 define DASH_INSTALL_TARGET_CMDS
 	cp -a $(@D)/src/dash $(TARGET_DIR)/bin/dash

From 6772d5f2f5c2c819149e1bfd9f339ad9afabbeb8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 24 Jun 2013 20:12:54 -0300
Subject: [PATCH 5464/6849] curl: add security patch for CVE-2013-2174

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libcurl/libcurl-03-CVE-2013-2174.patch    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/libcurl/libcurl-03-CVE-2013-2174.patch

diff --git a/package/libcurl/libcurl-03-CVE-2013-2174.patch b/package/libcurl/libcurl-03-CVE-2013-2174.patch
new file mode 100644
index 0000000000..673431f172
--- /dev/null
+++ b/package/libcurl/libcurl-03-CVE-2013-2174.patch
@@ -0,0 +1,38 @@
+From 6032f0ff672f09babf69d9d42bcde6eb9eeb5bea Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Sun, 19 May 2013 23:24:29 +0200
+Subject: [PATCH] Curl_urldecode: no peeking beyond end of input buffer
+
+Security problem: CVE-2013-2174
+
+If a program would give a string like "%" to curl_easy_unescape(), it
+would still consider the % as start of an encoded character. The
+function then not only read beyond the buffer but it would also deduct
+the *unsigned* counter variable for how many more bytes there's left to
+read in the buffer by two, making the counter wrap. Continuing this, the
+function would go on reading beyond the buffer and soon writing beyond
+the allocated target buffer...
+
+Bug: http://curl.haxx.se/docs/adv_20130622.html
+Reported-by: Timo Sirainen
+---
+ lib/escape.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/escape.c b/lib/escape.c
+index 6a26cf8..aa7db2c 100644
+--- a/lib/escape.c
++++ b/lib/escape.c
+@@ -159,7 +159,8 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
+ 
+   while(--alloc > 0) {
+     in = *string;
+-    if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
++    if(('%' == in) && (alloc > 2) &&
++       ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
+       /* this is two hexadecimal digits following a '%' */
+       char hexstr[3];
+       char *ptr;
+-- 
+1.7.10.4
+

From dc6d9070b2141afc057ef92253cfbd8199876527 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 25 Jun 2013 07:15:46 +0200
Subject: [PATCH 5465/6849] mxml: fix site url

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mxml/mxml.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index 778e9bfe13..020cde26a8 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 MXML_VERSION = 2.7
-MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION)
+MXML_SITE = http://www.msweet.org/files/project3
 MXML_LICENSE = LGPLv2+ with exceptions
 MXML_LICENSE_FILES = COPYING
 MXML_INSTALL_STAGING = YES

From 0c229f70ea270069e981bfb59e3aea80b21bbcfb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Jun 2013 14:22:13 +0200
Subject: [PATCH 5466/6849] busybox: use a single udhcpc script, with or
 without avahi-autoipd

We're currently using two different udhcpc scripts, one in the busybox
package and another in the avahi one, which calls avahi-autoipd on
dhcp failures.

The avahi one actually only does something differently from the default
if avahi-autoipd is available, so let's just always use this one instead
of the complicated logic about writing the file if not present /
overwriting it afterwards.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/avahi/avahi.mk                      |  2 -
 package/avahi/busybox-udhcpc-default.script | 58 ---------------------
 package/busybox/udhcpc.script               | 21 +++++++-
 3 files changed, 20 insertions(+), 61 deletions(-)
 delete mode 100755 package/avahi/busybox-udhcpc-default.script

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 89dfc33db7..028f3aeee4 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -147,8 +147,6 @@ endef
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT
 
 define AVAHI_INSTALL_AUTOIPD
-	rm -rf $(TARGET_DIR)/etc/dhcp3/
-	$(INSTALL) -D -m 0755 package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
 	$(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
 	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib
diff --git a/package/avahi/busybox-udhcpc-default.script b/package/avahi/busybox-udhcpc-default.script
deleted file mode 100755
index 0bb3dea03c..0000000000
--- a/package/avahi/busybox-udhcpc-default.script
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
-
-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
-
-RESOLV_CONF="/etc/resolv.conf"
-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
-[ -n "$subnet" ] && NETMASK="netmask $subnet"
-
-case "$1" in
-	deconfig)
-		grep -q -v ip= /proc/cmdline
-		if [ $? -eq 0 ]; then
-			/sbin/ifconfig $interface up
-		fi
-		grep -q -v nfsroot= /proc/cmdline
-		if [ $? -eq 0 ]; then
-			/sbin/ifconfig $interface 0.0.0.0
-		fi
-		if [ -x /usr/sbin/avahi-autoipd ]; then
-			/usr/sbin/avahi-autoipd -k $interface
-		fi
-		;;
-
-	leasefail|nak)
-		if [ -x /usr/sbin/avahi-autoipd ]; then
-			/usr/sbin/avahi-autoipd -wD $interface --no-chroot
-		fi
-		;;
-
-	renew|bound)
-		if [ -x /usr/sbin/avahi-autoipd ]; then
-			/usr/sbin/avahi-autoipd -k $interface
-		fi
-		/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
-
-		if [ -n "$router" ] ; then
-			echo "deleting routers"
-			while route del default gw 0.0.0.0 dev $interface ; do
-				:
-			done
-
-			for i in $router ; do
-				route add default gw $i dev $interface
-			done
-		fi
-
-		echo -n > $RESOLV_CONF
-		[ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
-		for i in $dns ; do
-			echo adding dns $i
-			echo nameserver $i >> $RESOLV_CONF
-		done
-		;;
-esac
-
-exit 0
diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script
index a52a7f8122..0bb3dea03c 100755
--- a/package/busybox/udhcpc.script
+++ b/package/busybox/udhcpc.script
@@ -10,10 +10,29 @@ RESOLV_CONF="/etc/resolv.conf"
 
 case "$1" in
 	deconfig)
-		/sbin/ifconfig $interface 0.0.0.0
+		grep -q -v ip= /proc/cmdline
+		if [ $? -eq 0 ]; then
+			/sbin/ifconfig $interface up
+		fi
+		grep -q -v nfsroot= /proc/cmdline
+		if [ $? -eq 0 ]; then
+			/sbin/ifconfig $interface 0.0.0.0
+		fi
+		if [ -x /usr/sbin/avahi-autoipd ]; then
+			/usr/sbin/avahi-autoipd -k $interface
+		fi
+		;;
+
+	leasefail|nak)
+		if [ -x /usr/sbin/avahi-autoipd ]; then
+			/usr/sbin/avahi-autoipd -wD $interface --no-chroot
+		fi
 		;;
 
 	renew|bound)
+		if [ -x /usr/sbin/avahi-autoipd ]; then
+			/usr/sbin/avahi-autoipd -k $interface
+		fi
 		/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
 
 		if [ -n "$router" ] ; then

From 8432d81a849efca1d95ab0bd1324afd96bbdd804 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Jun 2013 14:29:19 +0200
Subject: [PATCH 5467/6849] busybox: udhcpc.script: cleanup

ifconfig up is a no-op if the device is already running, so let's just
do that unconditionally.

Systems might have multiple network devices, and perhaps run udhcpc on
another interface even when booted over nfs, so don't disable the
per-interface deconfig based on the global nfsroot= setting on the kernel
command line.

If you don't want udhcpc to mess with kernel level IP autoconfiguration
(E.G. for nfs boot), you should instead ensure udhcpc/ifup/ifplugd isn't
started for that interface.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/udhcpc.script | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script
index 0bb3dea03c..f7beb56a08 100755
--- a/package/busybox/udhcpc.script
+++ b/package/busybox/udhcpc.script
@@ -10,14 +10,9 @@ RESOLV_CONF="/etc/resolv.conf"
 
 case "$1" in
 	deconfig)
-		grep -q -v ip= /proc/cmdline
-		if [ $? -eq 0 ]; then
-			/sbin/ifconfig $interface up
-		fi
-		grep -q -v nfsroot= /proc/cmdline
-		if [ $? -eq 0 ]; then
-			/sbin/ifconfig $interface 0.0.0.0
-		fi
+		/sbin/ifconfig $interface up
+		/sbin/ifconfig $interface 0.0.0.0
+
 		if [ -x /usr/sbin/avahi-autoipd ]; then
 			/usr/sbin/avahi-autoipd -k $interface
 		fi

From 584f418ec1ae3f0b5e09c10133c82578d78a3e03 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 26 Jun 2013 15:01:46 +0200
Subject: [PATCH 5468/6849] busybox: udhcpc.script: fix resolv.conf handling
 with multiple interfaces

When udhcpc is used on multiple network devices at the same time (or a mix
of dhcp and fixed configuration), /etc/resolv.conf should contain the
union of information from all the interfaces.

Currently that's not the case. The udhcpc script simply overwrites
resolv.conf with the information from the specific interface on each dhcp
bound/renew event.

Fix it by tagging lines with the interface they came from when added,
and drop the affected lines on deconfig/renew. As /etc/resolv.conf is
often a symlink to /tmp (and rootfs might be read only), special care
has to be taken when it is updated.

Notice that I'm not really aware of any official documentation requiring
that '#' comments in /etc/resolv.conf must be supported, but atleast
glibc and uClibc do.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/udhcpc.script | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script
index f7beb56a08..43742fbd53 100755
--- a/package/busybox/udhcpc.script
+++ b/package/busybox/udhcpc.script
@@ -13,6 +13,13 @@ case "$1" in
 		/sbin/ifconfig $interface up
 		/sbin/ifconfig $interface 0.0.0.0
 
+		# drop info from this interface
+		# resolv.conf may be a symlink to /tmp/, so take care
+		TMPFILE=$(mktemp)
+		grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
+		cat $TMPFILE > $RESOLV_CONF
+		rm -f $TMPFILE
+
 		if [ -x /usr/sbin/avahi-autoipd ]; then
 			/usr/sbin/avahi-autoipd -k $interface
 		fi
@@ -41,11 +48,17 @@ case "$1" in
 			done
 		fi
 
-		echo -n > $RESOLV_CONF
-		[ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
+		# drop info from this interface
+		# resolv.conf may be a symlink to /tmp/, so take care
+		TMPFILE=$(mktemp)
+		grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
+		cat $TMPFILE > $RESOLV_CONF
+		rm -f $TMPFILE
+
+		[ -n "$domain" ] && echo "search $domain # $interface" >> $RESOLV_CONF
 		for i in $dns ; do
 			echo adding dns $i
-			echo nameserver $i >> $RESOLV_CONF
+			echo "nameserver $i # $interface" >> $RESOLV_CONF
 		done
 		;;
 esac

From 4e6093b60ed7794b53e8e60ccba62c0345e6303a Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Wed, 26 Jun 2013 20:49:40 +0200
Subject: [PATCH 5469/6849] package/libmicrohttpd: minor fixes and additions

Correcting the indentation inside Config.in. Also adding the missed
license information.

Note: libmicrohttpd is partialy dual licensed, if you don't need or want
to use the HTTPS option you can choose between LPGLv2.1+ and the eCos
license (http://ecos.sourceware.org/license-overview.html).
If you use the HTTPS option you have to agree to the LGPLv2.1+!

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/Config.in        | 14 +++++++-------
 package/libmicrohttpd/libmicrohttpd.mk |  5 ++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index 2e4de0f6a9..5c20ba602e 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -8,13 +8,13 @@ config BR2_PACKAGE_LIBMICROHTTPD
 	  http://www.gnu.org/software/libmicrohttpd/
 
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
-       bool "https support"
-       depends on BR2_PACKAGE_LIBMICROHTTPD
-       depends on BR2_USE_WCHAR
-       select BR2_PACKAGE_GNUTLS
-       select BR2_PACKAGE_LIBGCRYPT
-       help
-         Enable HTTPS (SSL) support.
+	bool "https support"
+	depends on BR2_PACKAGE_LIBMICROHTTPD
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_LIBGCRYPT
+	help
+	  Enable HTTPS (SSL) support.
 
 comment "libmicrohttpd needs a toolchain with thread support"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index 697cbf50a0..a383667492 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -6,13 +6,16 @@
 
 LIBMICROHTTPD_VERSION = 0.9.27
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
+LIBMICROHTTPD_LICENSE_FILE = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
+LIBMICROHTTPD_LICENSE = LGPLv2.1+
 LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
 LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
-			  --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
+LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
 LIBMICROHTTPD_CONF_OPT += --disable-https
 endif
 

From a1f483b2c3efe483a058c34ff2b68335f98af3bc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Jun 2013 10:47:44 +0200
Subject: [PATCH 5470/6849] minicom: fix download URL

Closes #6338

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/minicom/minicom.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 25f266b979..f967d8741a 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -6,7 +6,7 @@
 
 MINICOM_VERSION = 2.6.1
 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
-MINICOM_SITE = http://alioth.debian.org/frs/download.php/3700/
+MINICOM_SITE = http://alioth.debian.org/frs/download.php/file/3700/
 MINICOM_LICENSE = GPLv2+
 MINICOM_LICENSE_FILES = COPYING
 

From 6b7e53d3616bcceb6c298d954b811e82d30481e6 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Wed, 26 Jun 2013 21:50:28 +0200
Subject: [PATCH 5471/6849] pv: bump to version 1.4.6

[Peter: drop patch and instead pass LD= on the make cmdline]
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pv/pv-1.2.0-fixld.patch | 21 ---------------------
 package/pv/pv.mk                |  5 +++--
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 package/pv/pv-1.2.0-fixld.patch

diff --git a/package/pv/pv-1.2.0-fixld.patch b/package/pv/pv-1.2.0-fixld.patch
deleted file mode 100644
index 9df279de52..0000000000
--- a/package/pv/pv-1.2.0-fixld.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-[PATCH] fix linker variable
-
-The linker variable LD was always set to 'ld' instead of the value from
-the environment. This breaks any linking, especially when dealing with
-a cross-compiler toolchain.
-The fix takes the CC variable and changes the 'gcc' extension to 'ld'.
-
-Signed-off-by: Roeland Van Praet <roelvp@mind.be>
----
-diff -ruN a/autoconf/make/vars.mk b/autoconf/make/vars.mk
---- a/autoconf/make/vars.mk	2010-03-11 00:43:19.000000000 +0100
-+++ b/autoconf/make/vars.mk	2011-10-06 15:47:18.000000000 +0200
-@@ -30,7 +30,7 @@
- @SET_MAKE@
- SHELL = /bin/sh
- CC = @CC@
--LD = ld
-+LD = $(CC:gcc=ld)
- DO_GZIP = @DO_GZIP@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 1aa95f6b6b..261f2139cf 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-PV_VERSION = 1.2.0
+PV_VERSION = 1.4.6
 PV_SOURCE = pv-$(PV_VERSION).tar.bz2
-PV_SITE = http://pipeviewer.googlecode.com/files
+PV_SITE = http://www.ivarch.com/programs/sources
+PV_MAKE_OPT = LD=$(TARGET_LD) # otherwise 'ld' is used
 
 $(eval $(autotools-package))

From 3ba9f8231d3dd71303b0218679d6c384be76fc6e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Jun 2013 11:29:06 +0200
Subject: [PATCH 5472/6849] pv: add license info

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pv/pv.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 261f2139cf..c2dca2a63b 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -7,6 +7,8 @@
 PV_VERSION = 1.4.6
 PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://www.ivarch.com/programs/sources
+PV_LICENSE = Artistic-2.0
+PV_LICENSE_FILES = doc/COPYING
 PV_MAKE_OPT = LD=$(TARGET_LD) # otherwise 'ld' is used
 
 $(eval $(autotools-package))

From 30c315d6423470eb2ce2ce968facb21410a22bdd Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Jun 2013 13:40:27 +0200
Subject: [PATCH 5473/6849] libmicrohttpd: fix license file setting

The variable is called <pkg>_LICENSE_FILES, not just _FILE.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/libmicrohttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index a383667492..e29e9563f5 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -6,7 +6,7 @@
 
 LIBMICROHTTPD_VERSION = 0.9.27
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
-LIBMICROHTTPD_LICENSE_FILE = COPYING
+LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)

From 4e0676c4848c03c7a25a99699d1c0390387d9d1b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Jun 2013 13:55:27 +0200
Subject: [PATCH 5474/6849] package: add tinymembench

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/tinymembench/Config.in       | 11 +++++++++++
 package/tinymembench/tinymembench.mk | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 package/tinymembench/Config.in
 create mode 100644 package/tinymembench/tinymembench.mk

diff --git a/package/Config.in b/package/Config.in
index 0eb6a9cdb1..81b26be925 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -44,6 +44,7 @@ source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
 source "package/stress/Config.in"
 source "package/sysprof/Config.in"
+source "package/tinymembench/Config.in"
 source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
 source "package/pv/Config.in"
diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in
new file mode 100644
index 0000000000..0d45532e26
--- /dev/null
+++ b/package/tinymembench/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_TINYMEMBENCH
+	bool "tinymembench"
+	help
+	  Tinymembench is a simple memory benchmark program, which
+	  tries to measure the peak bandwidth of sequential memory
+	  accesses and the latency of random memory accesses.
+	  Bandwidth is measured by running different assembly code for
+	  the aligned memory blocks and attempting different prefetch
+	  strategies.
+
+	  https://github.com/ssvb/tinymembench
diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk
new file mode 100644
index 0000000000..285d1fdbeb
--- /dev/null
+++ b/package/tinymembench/tinymembench.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# tinymembench
+#
+################################################################################
+
+TINYMEMBENCH_VERSION = v0.2
+TINYMEMBENCH_SITE = http://github.com/ssvb/tinymembench/tarball/$(TINYMEMBENCH_VERSION)
+TINYMEMBENCH_LICENSE = MIT
+TINYMEMBENCH_LICENSE_FILES = main.c
+
+define TINYMEMBENCH_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define TINYMEMBENCH_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/tinymembench \
+		$(TARGET_DIR)/usr/bin/tinymembench
+endef
+
+$(eval $(generic-package))
+

From 67d8798c189a3ddf7cbd89e4730c0bd4dcb21d2a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Jun 2013 10:50:24 -0300
Subject: [PATCH 5475/6849] dbus: security bump to version 1.4.26

Fixes CVE-2013-2168.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index cb72f1fd6c..a855f059a7 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DBUS_VERSION = 1.4.24
-DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_VERSION = 1.4.26
+DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
 DBUS_LICENSE = AFLv2.1 GPLv2+
 DBUS_LICENSE_FILES = COPYING
 DBUS_INSTALL_STAGING = YES

From 464b525757602e37df641e7eb912baf7282b23fb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Jun 2013 15:42:19 -0300
Subject: [PATCH 5476/6849] openssh: bump to version 6.2p2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 006d597f1d..4a5b125de7 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENSSH_VERSION = 6.2p1
+OPENSSH_VERSION = 6.2p2
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \

From 97c0a64aa3dbf4a5e68f35fcf7c08fa571c28d15 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Jun 2013 15:42:20 -0300
Subject: [PATCH 5477/6849] samba: bump to version 3.6.16

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba-fix-smbd-libs-avahi.patch | 14 ++++++++------
 package/samba/samba.mk                        |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package/samba/samba-fix-smbd-libs-avahi.patch b/package/samba/samba-fix-smbd-libs-avahi.patch
index d6423def9a..6624f57f6c 100644
--- a/package/samba/samba-fix-smbd-libs-avahi.patch
+++ b/package/samba/samba-fix-smbd-libs-avahi.patch
@@ -2,14 +2,16 @@ Expliticly link with -lpthread if smbd is compiled with
 avahi support. Otherwise the binary will fail to run.
 
 Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---- samba-3.5.6-orig/source3/Makefile.in	2010-10-07 18:41:16.000000000 +0200
-+++ samba-3.5.6/source3/Makefile.in	2010-10-27 14:52:40.000000000 +0200
-@@ -1552,7 +1552,7 @@
+
+diff -Nura samba-3.6.16.orig/source3/Makefile.in samba-3.6.16/source3/Makefile.in
+--- samba-3.6.16.orig/source3/Makefile.in	2013-06-21 08:12:39.995871935 -0300
++++ samba-3.6.16/source3/Makefile.in	2013-06-21 08:13:17.778103805 -0300
+@@ -1783,7 +1783,7 @@
  		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
  		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
- 		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ 		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \
 -		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 +		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS)
- 
- bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+
+ bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT)
  	@echo Linking $@
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 528e29c81a..fd90d96d90 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA_VERSION = 3.6.15
+SAMBA_VERSION = 3.6.16
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 296c1b84d52e93dd195e0df76dfe77325d6b19c2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 23 Jun 2013 23:19:02 -0300
Subject: [PATCH 5478/6849] polarssl: bump to version 1.2.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 4 ++--
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 554eda60f4..f376c1e9ff 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.7]
+[Gustavo: update for polarssl 1.2.8]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.7 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.8 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 0b44dc9e26..39de3e3897 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.7
+POLARSSL_VERSION = 1.2.8
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From 2e076eae55be5566dfdaca4971682b472a564b43 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 23 Jun 2013 23:19:03 -0300
Subject: [PATCH 5479/6849] hiawatha: bump to version 9.2

Patch dropped since the polarssl external library option is now
upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...awatha-support-for-external-polarssl.patch | 61 -------------------
 package/hiawatha/hiawatha.mk                  |  6 +-
 2 files changed, 4 insertions(+), 63 deletions(-)
 delete mode 100644 package/hiawatha/hiawatha-support-for-external-polarssl.patch

diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch
deleted file mode 100644
index 5441a524a9..0000000000
--- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Enable linking against an external PolarSSL
-
-Hiawatha contains its own copy of the PolarSSL source code, and its
-build system builds this private copy of PolarSSL and links to it. In
-the context of Buildroot, we prefer to link against the PolarSSL built
-externally by the polarssl package.
-
-This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in
-addition to ENABLE_SSL, tells Hiawatha's build system to link against
-the already existing PolarSSL library instead of building its own.
-
-[Gustavo]: Update for version 8.5
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura hiawatha-8.5.orig/CMakeLists.txt hiawatha-8.5/CMakeLists.txt
---- hiawatha-8.5.orig/CMakeLists.txt	2012-09-12 09:29:34.347994799 -0300
-+++ hiawatha-8.5/CMakeLists.txt	2012-09-12 09:33:15.983118183 -0300
-@@ -9,6 +9,7 @@
- option(ENABLE_MONITOR  "Enable support for the Hiawatha Monitor." off)
- option(ENABLE_RPROXY   "Enable reverse proxy support in Hiawatha." on)
- option(ENABLE_SSL      "Enable SSL (PolarSSL) support in Hiawatha." on)
-+option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off)
- option(ENABLE_TOMAHAWK "Enable Tomahawk in Hiawatha" off)
- option(ENABLE_TOOLKIT  "Enable the URL toolkit in Hiawatha" on)
- option(ENABLE_XSLT     "Enable XSLT support in Hiawatha." on)
-@@ -88,19 +89,23 @@
- 
- # PolarSSL
- if(ENABLE_SSL)
-+ if(NOT ENABLE_SSL_EXTERNAL)
- 	option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." ON)
- 	set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
- 	set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/hiawatha)
-+	include_directories(polarssl/include)
- 	add_subdirectory(polarssl)
-+ endif()
- 	set(POLARSSL_LIBRARY "polarssl")
- endif()
- 
- # Hiawatha
--include_directories(${CMAKE_CURRENT_BINARY_DIR} polarssl/include)
- if(ENABLE_XSLT)
- 	include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR})
- endif()
- 
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-+
- # Configure files
- configure_file(config.h.in config.h)
- foreach (configfile ${config_files_in})
-@@ -121,7 +126,9 @@
- target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
- if(ENABLE_SSL)
- 	target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
-+ if(NOT ENABLE_SSL_EXTERNAL)
- 	set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
-+ endif()
- endif()
- if(ENABLE_XSLT)
- 	target_link_libraries(hiawatha ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES})
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 1ecb0e8a98..4be81490f9 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -4,14 +4,16 @@
 #
 ################################################################################
 
-HIAWATHA_VERSION = 9.1
+HIAWATHA_VERSION = 9.2
 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
 HIAWATHA_LICENSE = GPLv2
 HIAWATHA_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
-HIAWATHA_CONF_OPT += -DENABLE_SSL_EXTERNAL=ON -DENABLE_SSL=ON
+HIAWATHA_CONF_OPT += -DUSE_SYSTEM_POLARSSL=ON
 HIAWATHA_DEPENDENCIES += polarssl
+else
+HIAWATHA_CONF_OPT += -DENABLE_SSL=OFF
 endif
 
 HIAWATHA_CONF_OPT += \

From e003d66f855b4523685a4a58fb7f84106f683a9e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 23 Jun 2013 22:40:52 +0200
Subject: [PATCH 5480/6849] package/rpi-firmware: version bump for HDMI and
 audio fixes

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 391a418344..b490296606 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 06f6c909e285beceeb7e51f71ba6ffe754f073e8
+RPI_FIRMWARE_VERSION = a0c98fa6bc0f93bad8cbfcf749f7be7dc2276192
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From 35bda5d79175be53d15273a3bc848e14599533e8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 23 Jun 2013 22:40:53 +0200
Subject: [PATCH 5481/6849] configs: bump kernel in rpi_defconfig for misc
 fixes

Fixes in GPIOs, I2C and DMA.

And since the RPi git tree fork has a non-upstream driver
for rtl8192c WiFi USB stick, there's a fix for that, too.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/rpi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index e3d0a79ee1..40fd333e9d 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.6.11"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="5d5301e"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="5516fc2"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 44d5038fa36c5f6ee6998070c16c0c78c2992a37 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 23 Jun 2013 22:40:54 +0200
Subject: [PATCH 5482/6849] package/tvheadend: bump version for libav fixes

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/tvheadend.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 81cb062a24..4f9a148053 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION           = 5513b44
+TVHEADEND_VERSION           = 6cb8eaa
 TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE

From 8db7962b1fc08b359fdffa84a8a0223873371a36 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 23 Jun 2013 22:40:55 +0200
Subject: [PATCH 5483/6849] package/w_scan: new package

[Peter: needs libiconv if !locale]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/w_scan/Config.in | 10 ++++++++++
 package/w_scan/w_scan.mk | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/w_scan/Config.in
 create mode 100644 package/w_scan/w_scan.mk

diff --git a/package/Config.in b/package/Config.in
index 81b26be925..eefa2ad703 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -301,6 +301,7 @@ source "package/usb_modeswitch_data/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
 source "package/wipe/Config.in"
+source "package/w_scan/Config.in"
 endmenu
 
 menu "Interpreter languages and scripting"
diff --git a/package/w_scan/Config.in b/package/w_scan/Config.in
new file mode 100644
index 0000000000..4487b0a869
--- /dev/null
+++ b/package/w_scan/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_W_SCAN
+	bool "w_scan"
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  w_scan is a small command line utility used to perform frequency
+	  scans for DVB and ATSC transmissions. It is capable of creating
+	  channels.conf files (in different output formats !) as well as
+	  initial tuning data for scan.
+
+	  http://wirbel.htpc-forum.de/w_scan/index_en.html
diff --git a/package/w_scan/w_scan.mk b/package/w_scan/w_scan.mk
new file mode 100644
index 0000000000..d2f3e4a2a3
--- /dev/null
+++ b/package/w_scan/w_scan.mk
@@ -0,0 +1,18 @@
+###############################################################################
+#
+# w_scan
+#
+###############################################################################
+
+W_SCAN_VERSION              = 20130331
+W_SCAN_SOURCE               = w_scan-$(W_SCAN_VERSION).tar.bz2
+W_SCAN_SITE                 = http://wirbel.htpc-forum.de/w_scan
+W_SCAN_LICENSE              = GPLv2+
+W_SCAN_LICENSE_FILES        = COPYING
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+W_SCAN_DEPENDENCIES        += libiconv
+W_SCAN_CONF_ENV            += LIBS=-liconv
+endif
+
+$(eval $(autotools-package))

From 4788dddc39a12b6064ee6e1dfd0a999e5c981f83 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 10:53:17 -0300
Subject: [PATCH 5484/6849] libbsd: needs threads

Fixes:
http://autobuild.buildroot.net/results/397/39728c5eeb6c4e213cd96cb6639bc28f337bf214/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libbsd/Config.in  | 5 +++++
 package/libedit/Config.in | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in
index 915a4bd98b..1fa94978b2 100644
--- a/package/libbsd/Config.in
+++ b/package/libbsd/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBBSD
 	# libbsd requires a.out.h, which is only available for those
 	# architectures: arm, m68k, x86 (and alpha, but we don't care.)
 	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  This library provides useful functions commonly found on BSD
 	  systems, and lacking on others like GNU systems, thus making
@@ -11,3 +12,7 @@ config BR2_PACKAGE_LIBBSD
 	  project.
 
 	  http://libbsd.freedesktop.org/
+
+comment "libbsd requires a toolchain with thread support"
+	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index 34160f4d2f..7a515db346 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBEDIT
 	bool "libedit"
 	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )  # libbsd
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd
 	select BR2_PACKAGE_LIBBSD
 	select BR2_PACKAGE_NCURSES
 	help
@@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBEDIT
 	  and history functions. It slightly resembles GNU readline.
 
 	  http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/
+
+comment "libedit requires a toolchain with thread support"
+	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 ) # libbsd
+	depends on !BR2_TOOLCHAIN_HAS_THREADS # libbsd

From f1e957ce41d472301f6f0f21d7740d6df8524cbd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 11:03:11 -0300
Subject: [PATCH 5485/6849] sconeserver/libedbus: fix missing avr32 arch
 exclusions

Fix missing avr32 arch exclusions regarding bluez_utils being
unavailable. Fixes:
http://autobuild.buildroot.net/results/789/78901c36517b1d897a1200ccddd79afec8a605de/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libedbus/Config.in | 1 +
 package/sconeserver/Config.in  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 9b57592f24..64b001e9b2 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -16,6 +16,7 @@ if BR2_PACKAGE_LIBEDBUS
 
 config BR2_PACKAGE_LIBEDBUS_BLUEZ
 	bool "bluez support"
+	depends on !BR2_avr32 # bluez_utils
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
 	  Bluetooth support.
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index a467476233..60ae2ae738 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -43,6 +43,7 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
 	depends on BR2_USE_WCHAR # bluez->libglib2
 	depends on BR2_USE_MMU # bluez->dbus
 	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus
+	depends on !BR2_avr32 # bluez_utils
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
 	  Bluetooth module for Sconeserver

From 416a405d60bf1278126452ac3d226218cbced9b0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 11:14:12 -0300
Subject: [PATCH 5486/6849] qt: broken on avr32

Qt is broken for the avr32 architecture since it lacks TLS support.
Fixes:
http://autobuild.buildroot.net/results/56d/56d1d8f12a847f1ba49547a51d7a3605755a0bb8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opencv/Config.in | 1 +
 package/qt/Config.in     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 6a47ac59cf..26bf5e79c3 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -167,6 +167,7 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
 config BR2_PACKAGE_OPENCV_WITH_QT
 	bool "qt backend support"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_avr32 # qt
 	select BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_STL
 	default y
diff --git a/package/qt/Config.in b/package/qt/Config.in
index fdbb598172..9f6e54dff3 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -3,6 +3,7 @@ comment "qt requires a toolchain with C++ support enabled"
 
 menuconfig BR2_PACKAGE_QT
 	bool "Qt"
+	depends on !BR2_avr32 # lacks TLS
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Qt is a cross-platform application and UI framework for

From 79c55aadd54d098696644d77f9e60cd200e08753 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 11:49:14 -0300
Subject: [PATCH 5487/6849] xlib_libXpm: needs host-gettext

Fixes:
http://autobuild.buildroot.net/results/00b/00b5c7745df5359908f6c77f90c1598b71638081/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libXpm/xlib_libXpm.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 6e72281504..e0b4f2f7bf 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -10,6 +10,7 @@ XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPM_LICENSE = MIT
 XLIB_LIBXPM_LICENSE_FILES = COPYING
 XLIB_LIBXPM_INSTALL_STAGING = YES
-XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
+XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
+	host-gettext
 
 $(eval $(autotools-package))

From 6e8efc0ed409d7211a81d5370e088aa438990607 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 25 Jun 2013 16:14:36 +0100
Subject: [PATCH 5488/6849] openswan: Restore -fPIE to USERCOMPILE flags

The default USERCOMPILE variable uses -fPIE so we bring this back.
This also fixes linking problems for MIPS when non-PIC objects
are used to form a PIC one.

Fixes the following linking problem on MIPS:
connections.o: relocation R_MIPS_HI16 against `__gnu_local_gp'
can not be used when making a shared object; recompile with -fPIC

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openswan/openswan.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 8a857d4fa2..0b8e7d3a69 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -11,7 +11,7 @@ OPENSWAN_LICENSE_FILES = COPYING LICENSE
 
 OPENSWAN_DEPENDENCIES = host-bison gmp iproute2
 OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
-	USERCOMPILE="$(TARGET_CFLAGS)" INC_USRLOCAL=/usr \
+	USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \
 	USE_KLIPS=false USE_MAST=false USE_NM=false
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)

From 241a6c9bcf75753338cb017fcac4e2d8bc9d90d7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 25 Jun 2013 17:41:07 -0300
Subject: [PATCH 5489/6849] pax-utils: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/pax-utils/Config.in    |  7 +++++
 package/pax-utils/pax-utils.mk | 55 ++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 package/pax-utils/Config.in
 create mode 100644 package/pax-utils/pax-utils.mk

diff --git a/package/Config.in b/package/Config.in
index eefa2ad703..5ab85a3ff3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -38,6 +38,7 @@ source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
 source "package/oprofile/Config.in"
+source "package/pax-utils/Config.in"
 source "package/perf/Config.in"
 source "package/ramspeed/Config.in"
 source "package/rt-tests/Config.in"
diff --git a/package/pax-utils/Config.in b/package/pax-utils/Config.in
new file mode 100644
index 0000000000..58100e482a
--- /dev/null
+++ b/package/pax-utils/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PAX_UTILS
+	bool "pax-utils"
+	help
+	  ELF related utils for ELF 32/64 binaries that can check files
+	  for security relevant properties.
+
+	  http://www.gentoo.org/proj/en/hardened/pax-utils.xml
diff --git a/package/pax-utils/pax-utils.mk b/package/pax-utils/pax-utils.mk
new file mode 100644
index 0000000000..69198c278a
--- /dev/null
+++ b/package/pax-utils/pax-utils.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# pax-utils
+#
+################################################################################
+
+PAX_UTILS_VERSION = 0.7
+PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles
+PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz
+PAX_UTILS_LICENSE = GPLv2
+PAX_UTILS_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+PAX_UTILS_DEPENDENCIES += libcap
+PAX_UTILS_USE_CAP = USE_CAP=yes
+endif
+
+# libcap is only useful for pspax (a running system)
+HOST_PAX_UTILS_DEPENDENCIES =
+
+# lddtree and symtree need bash
+ifeq ($(BR2_PACKAGE_BASH),)
+define PAX_UTILS_REMOVE_BASH_TOOLS
+	rm -f $(TARGET_DIR)/usr/bin/{lddtree,symtree}
+endef
+endif
+PAX_UTILS_POST_INSTALL_TARGET_HOOKS += PAX_UTILS_REMOVE_BASH_TOOLS
+
+define HOST_PAX_UTILS_BUILD_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define PAX_UTILS_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(PAX_UTILS_USE_CAP) -C $(@D)
+endef
+
+define HOST_PAX_UTILS_CLEAN_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) clean
+endef
+
+define PAX_UTILS_CLEAN_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) clean
+endef
+
+define HOST_PAX_UTILS_INSTALL_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) DESTDIR="$(HOST_DIR)" install
+endef
+
+define PAX_UTILS_INSTALL_TARGET_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" install
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))

From 84f2dece13cbadd6f87c6223c1f452b5446633a4 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sun, 23 Jun 2013 17:30:33 +0200
Subject: [PATCH 5490/6849] package/libdvbsi: new package

libdvbsi++ is a C++ library for parsing DVB SI sections and providing
the output in C++ objects. It's usefull in any case you need prepared
and preselected DVB SI data from the raw stream.

[Peter: fix _LICENSE_FILES tag]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/libdvbsi/Config.in   | 14 ++++++++++++++
 package/libdvbsi/libdvbsi.mk | 17 +++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/libdvbsi/Config.in
 create mode 100644 package/libdvbsi/libdvbsi.mk

diff --git a/package/Config.in b/package/Config.in
index 5ab85a3ff3..ebeabeb1a7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -516,6 +516,7 @@ source "package/json-javascript/Config.in"
 endmenu
 
 menu "Multimedia"
+source "package/libdvbsi/Config.in"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
 source "package/libebml/Config.in"
diff --git a/package/libdvbsi/Config.in b/package/libdvbsi/Config.in
new file mode 100644
index 0000000000..0d3143fce4
--- /dev/null
+++ b/package/libdvbsi/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LIBDVBSI
+	bool "libdvbsi"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  C++ parsing library for Service Information (SI) in DVB systems.
+	  With libdvbsi++ you can convert raw DVB service information to
+	  a set of C++ objects, removing the need to parse data manually.
+
+	  http://www.saftware.de/
+
+comment "libdvbsi++ requires a toolchain with C++, WCHAR and threads support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libdvbsi/libdvbsi.mk b/package/libdvbsi/libdvbsi.mk
new file mode 100644
index 0000000000..3e991776bb
--- /dev/null
+++ b/package/libdvbsi/libdvbsi.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libdvbsi++
+#
+################################################################################
+
+LIBDVBSI_VERSION = 0.3.6
+LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2
+LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++
+LIBDVBSI_INSTALL_STAGING = YES
+LIBDVBSI_LICENSE = LGPLv2.1
+LIBDVBSI_LICENSE_FILES = COPYING
+
+# sometimes no Makefile is in the archive, just (re)generate
+LIBDVBSI_AUTORECONF=YES
+
+$(eval $(autotools-package))

From 6940ade836c1355bcb99ebc1762902936b8ac464 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Jun 2013 21:33:50 +0200
Subject: [PATCH 5491/6849] gst-omx: fix _LICENSE_FILES tag

It is <pkg>_LICENSE_FILES, not <pkg>_LICENSE_FILE.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst-omx/gst-omx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst-omx/gst-omx.mk b/package/multimedia/gst-omx/gst-omx.mk
index 00abecb6d7..1127ed8835 100644
--- a/package/multimedia/gst-omx/gst-omx.mk
+++ b/package/multimedia/gst-omx/gst-omx.mk
@@ -9,7 +9,7 @@ GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
 GST_OMX_SITE = http://gstreamer.freedesktop.org/src/gst-omx/
 
 GST_OMX_LICENSE = LGPLv2.1
-GST_OMX_LICENSE_FILE = COPYING
+GST_OMX_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 GST_OMX_CONF_OPT = \

From 0056b811f7c94ea8f31e138bf827c5ce90ea5b66 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 21 Jun 2013 11:06:58 -0300
Subject: [PATCH 5492/6849] toolchain/uClibc: properly honor DEBUG and STRIP
 options

The default uClibc configurations strip the resulting binaries/libraries
and don't add debug symbols which is a problem when wanting to debug
issues.
Bind the buildroot BR2_STRIP_* option to uClibc .config DO_STRIP and
BR2_ENABLE_DEBUG to uClibc DO_DEBUG.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index da1830ff56..2036dab143 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -287,6 +287,18 @@ endif
 	$(SED) '/LINUXTHREADS_OLD/d' $(UCLIBC_DIR)/.oldconfig
 	$(SED) '/PTHREADS_DEBUG_SUPPORT/d' $(UCLIBC_DIR)/.oldconfig
 	$(SED) '/UCLIBC_HAS_THREADS_NATIVE/d' $(UCLIBC_DIR)/.oldconfig
+	$(SED) '/DODEBUG /d' $(UCLIBC_DIR)/.oldconfig
+	$(SED) '/DOSTRIP/d' $(UCLIBC_DIR)/.oldconfig
+ifeq ($(BR2_STRIP_none),y)
+	echo "# DOSTRIP is not set" >> $(UCLIBC_DIR)/.oldconfig
+else
+	echo "DOSTRIP=y" >> $(UCLIBC_DIR)/.oldconfig
+endif
+ifeq ($(BR2_ENABLE_DEBUG),y)
+	echo "DODEBUG=y" >> $(UCLIBC_DIR)/.oldconfig
+else
+	echo "# DODEBUG is not set" >> $(UCLIBC_DIR)/.oldconfig
+endif
 ifeq ($(BR2_PTHREADS_NONE),y)
 	echo "# UCLIBC_HAS_THREADS is not set" >> $(UCLIBC_DIR)/.oldconfig
 else

From 3c9b59ab2b363efa057468a388ef1d999bf7636b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Jun 2013 22:42:08 +0200
Subject: [PATCH 5493/6849] qt5declarative: eglfs depends on gui support, so
 select that as well

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5declarative/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 93328650d5..c9a673658a 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5XMLPATTERNS
 	select BR2_PACKAGE_QT5JSBACKEND
 	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_EGLFS
 	depends on BR2_PACKAGE_HAS_OPENGL_EGL
 	depends on BR2_PACKAGE_HAS_OPENGL_ES

From 04ac296a3b7230c23afbed2c8db9309ed91366ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 17:51:50 -0300
Subject: [PATCH 5494/6849] polarssl: fix download URL

Switch to a non-redirect download URL to fix:
http://autobuild.buildroot.net/results/ec3/ec340fffa6eebb18a0746097419359b44c557a90/
Thanks go to Paul Bakker for the quick response!

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/polarssl/polarssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 39de3e3897..f3bc421ccd 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POLARSSL_SITE = https://polarssl.org/download
+POLARSSL_SITE = https://polarssl.org/code/releases
 POLARSSL_VERSION = 1.2.8
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \

From f1bbd809f64869c43c37873abfd8f5ec3b71b443 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Jun 2013 11:13:02 +0200
Subject: [PATCH 5495/6849] qt5quick1: needs widgets support in qt5base

Which in turn needs gui support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5quick1/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index 65b1f621a2..dc3f621087 100644
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_QT5QUICK1
 	bool "qt5quick1"
 	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS
 	select BR2_PACKAGE_QT5SCRIPT
 	select BR2_PACKAGE_QT5XMLPATTERNS
 	select BR2_PACKAGE_QT5DECLARATIVE

From 4e365f02f37bcb7ed8eeb320c574ab146e0402c7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Jun 2013 11:15:40 +0200
Subject: [PATCH 5496/6849] qt5quick1: doesn't require qt5webkit

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5quick1/Config.in    | 1 -
 package/qt5/qt5quick1/qt5quick1.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index dc3f621087..9cb97a6fc8 100644
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_QT5QUICK1
 	select BR2_PACKAGE_QT5XMLPATTERNS
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5JSBACKEND
-	select BR2_PACKAGE_QT5WEBKIT
 	# This module does not support static linking
 	depends on !BR2_PREFER_STATIC_LIB
 	depends on BR2_PACKAGE_HAS_OPENGL_EGL
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 0b7f9eab7f..8d11e67093 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -7,7 +7,7 @@
 QT5QUICK1_VERSION = $(QT5_VERSION)
 QT5QUICK1_SITE = $(QT5_SITE)
 QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz
-QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend qt5webkit
+QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend
 QT5QUICK1_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

From e5e695ec48d62be230574049d7b0f47c08a7d594 Mon Sep 17 00:00:00 2001
From: Naumann Andreas <ANaumann@ultratronik.de>
Date: Fri, 21 Jun 2013 11:02:00 +0200
Subject: [PATCH 5497/6849] qt5/qt5quick1: Drop qmlviewer from install since
 its no longer provided.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5quick1/qt5quick1.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 8d11e67093..fc3738809d 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -38,7 +38,6 @@ define QT5QUICK1_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
 	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
-	cp -dpf $(STAGING_DIR)/usr/bin/qmlviewer $(TARGET_DIR)/usr/bin
 	cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr
 endef
 

From 5e6e92bc6b900f64f47cd7266aef9cfca3d3f339 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 18:57:39 -0300
Subject: [PATCH 5498/6849] kernel-headers: bump 3.{0, 4, 9}.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.83-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.84-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index de0c70344c..ce812af620 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.83"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.84"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.47"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.50"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.51"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.7"		if BR2_KERNEL_HEADERS_3_9
+	default "3.9.8"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.83-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.84-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.83-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.84-headers_install-fix-__packed-in-exported-kernel-head.patch

From 5cdb43203edef7211b9651a6ff531fc45f8dbe95 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 27 Jun 2013 18:57:40 -0300
Subject: [PATCH 5499/6849] linux: bump 3.9.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 0912965cfb..f58e714bdf 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.7"
+	bool "3.9.8"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.7" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From e3f983c851a0f2b13f47850276f5e4ce0f984403 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Jun 2013 12:41:11 +0200
Subject: [PATCH 5500/6849] qt5quick1: ensure optional qt5webkit support is
 enabled if present

qt5quick1 has optional qt5webkit support, so ensure it is built after
qt5webkit if enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5quick1/qt5quick1.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index fc3738809d..83e11c475e 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -7,7 +7,8 @@
 QT5QUICK1_VERSION = $(QT5_VERSION)
 QT5QUICK1_SITE = $(QT5_SITE)
 QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz
-QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend
+QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsbackend \
+	$(if $(BR2_PACKAGE_QT5WEBKIT),qt5webkit)
 QT5QUICK1_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

From 6488d59a884ff75623f6eec75708980675336fd3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Jun 2013 14:34:18 +0200
Subject: [PATCH 5501/6849] qt5: add _LICENSE_FILES where applicable

Some (but not all) of the qt5 module tarballs contain license files, so
let's reference them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5declarative/qt5declarative.mk   | 4 +---
 package/qt5/qt5imageformats/qt5imageformats.mk | 3 +--
 package/qt5/qt5jsbackend/qt5jsbackend.mk       | 4 +---
 package/qt5/qt5quick1/qt5quick1.mk             | 4 +---
 package/qt5/qt5script/qt5script.mk             | 4 +---
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk   | 4 +---
 6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 83810ada2d..603c0e722c 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -13,9 +13,7 @@ QT5DECLARATIVE_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5DECLARATIVE_CONFIGURE_OPTS += -opensource -confirm-license
 QT5DECLARATIVE_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5DECLARATIVE_LICENSE = Commercial license
 QT5DECLARATIVE_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 8aa412da42..10d744b1f5 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -13,8 +13,7 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5IMAGEFORMATS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for qt5svg.
+QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5IMAGEFORMATS_LICENSE = Commercial license
 QT5IMAGEFORMATS_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
index 9134579979..d065f0baba 100644
--- a/package/qt5/qt5jsbackend/qt5jsbackend.mk
+++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk
@@ -13,9 +13,7 @@ QT5JSBACKEND_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5JSBACKEND_CONFIGURE_OPTS += -opensource -confirm-license
 QT5JSBACKEND_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5JSBACKEND_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5JSBACKEND_LICENSE = Commercial license
 QT5JSBACKEND_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 83e11c475e..9bd36dbb98 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -14,9 +14,7 @@ QT5QUICK1_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
 QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5QUICK1_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5QUICK1_LICENSE = Commercial license
 QT5QUICK1_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 8687f49a71..e4364740c8 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -13,9 +13,7 @@ QT5SCRIPT_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5SCRIPT_CONFIGURE_OPTS += -opensource -confirm-license
 QT5SCRIPT_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5SCRIPT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5SCRIPT_LICENSE = Commercial license
 QT5SCRIPT_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index f92f853a98..322fd70a15 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -13,9 +13,7 @@ QT5XMLPATTERNS_INSTALL_STAGING = YES
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5XMLPATTERNS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5XMLPATTERNS_LICENSE = LGPLv2.1 or GPLv3.0
-# Here we would like to get license files from qt5base, but qt5base
-# may not be extracted at the time we get the legal-info for
-# qt5script.
+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
 QT5XMLPATTERNS_LICENSE = Commercial license
 QT5XMLPATTERNS_REDISTRIBUTE = NO

From a2d06655e5684c10f6a02cc065aaf481f56a8c64 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 28 Jun 2013 10:36:11 +0100
Subject: [PATCH 5502/6849] neard: bump version to 0.12

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neard/neard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 0fa30ea095..56730b28cb 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NEARD_VERSION = 0.11
+NEARD_VERSION = 0.12
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
 NEARD_LICENSE = GPLv2
 NEARD_LICENSE_FILES = COPYING

From e8df32e59a70928a036216d9722f66410f6f4c6a Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Fri, 28 Jun 2013 20:52:34 +0200
Subject: [PATCH 5503/6849] package/libxml2: bumping version to 2.9.1

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libxml2/libxml2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index b714234065..7116b82cb9 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXML2_VERSION = 2.9.0
+LIBXML2_VERSION = 2.9.1
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
 LIBXML2_AUTORECONF = YES

From 2699d4f315247dd395f40397e9a0e3b5d19180c7 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Fri, 28 Jun 2013 20:52:37 +0200
Subject: [PATCH 5504/6849] package/directfb: fixing typo in DIRECTFB_CONF_OPT

The DIRECTFB_CONF_OPT variable was missspelled for disabling the X11
support.

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 46f1eb903a..c065eef851 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -44,7 +44,7 @@ endif
 ifeq ($(BR2_PACKAGE_XSERVER),y)
 DIRECTFB_CONF_OPT += --enable-x11
 else
-DIRECTFB_CONF_OPT += -disable-x11
+DIRECTFB_CONF_OPT += --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)

From 048b39db8234ac334478db6c8e9073f2f736a967 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 13:46:34 -0300
Subject: [PATCH 5505/6849] gutenprint: forcibly disable ijs-config

ijs-config (ghostscript) is looked up in /usr/bin, if you've got a host
that has ghostscript with development headers installed then the build
fails when trying to link to the host libijs.
Forcibly disable ghostscript support since we lack a package.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gutenprint/gutenprint.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index c9ac0467ea..978675fe4b 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -22,7 +22,8 @@ GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
 # so we need to build both a host package and a target package
 GUTENPRINT_DEPENDENCIES += host-gutenprint
 
-GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config
+GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \
+	ac_cv_path_IJS_CONFIG=""
 
 GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
                       --disable-samples \

From 734c124e97815ac1d2bb62c9d7cc6336974791c7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:40:58 -0300
Subject: [PATCH 5506/6849] boa: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/boa/boa.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index 9308b549e5..d6a8e23deb 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -5,8 +5,9 @@
 ################################################################################
 
 BOA_VERSION = 0.94.14rc21
-BOA_SOURCE = boa-$(BOA_VERSION).tar.gz
 BOA_SITE = http://www.boa.org/
+BOA_LICENSE = GPLv2+
+BOA_LICENSE_FILES = COPYING
 
 define BOA_INSTALL_TARGET_CMDS
 	install -D -m 755 $(@D)/src/boa $(TARGET_DIR)/usr/sbin/boa

From 046c6209b03412972f6184c14098e4ece4bd0a2d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:40:59 -0300
Subject: [PATCH 5507/6849] bridge-utils: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bridge-utils/bridge-utils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index b1744a4e67..6c1975f8cf 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -9,6 +9,8 @@ BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz
 BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge
 BRIDGE_UTILS_AUTORECONF = YES
 BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
+BRIDGE_UTILS_LICENSE = GPLv2+
+BRIDGE_UTILS_LICENSE_FILES = COPYING
 
 define BRIDGE_UTILS_UNINSTALL_TARGET_CMDS
 	rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \

From d8945ba9814a6378e0b575bc867a6e12be6ac1eb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:00 -0300
Subject: [PATCH 5508/6849] ctorrent: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ctorrent/ctorrent.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index aebf123141..65e327eb88 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -7,6 +7,8 @@
 CTORRENT_VERSION = dnh3.3.2
 CTORRENT_SOURCE = ctorrent-$(CTORRENT_VERSION).tar.gz
 CTORRENT_SITE = http://www.rahul.net/dholmes/ctorrent/
+CTORRENT_LICENSE = GPLv2
+CTORRENT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 CTORRENT_CONF_OPT+=--with-ssl=yes

From 50fa1d7c9345c857408fb79389df5ff2d80a52ed Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:01 -0300
Subject: [PATCH 5509/6849] cups: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cups/cups.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 9b8d7c5d1f..8a761a32a9 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -7,6 +7,8 @@
 CUPS_VERSION = 1.3.11
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
 CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
+CUPS_LICENSE = GPLv2 LGPLv2
+CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install

From 054ff5c71ed78f70072ea7a2f2abe757b507b6af Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:02 -0300
Subject: [PATCH 5510/6849] curlftpfs: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/curlftpfs/curlftpfs.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/curlftpfs/curlftpfs.mk b/package/curlftpfs/curlftpfs.mk
index 117e0414b6..8ec3e4c536 100644
--- a/package/curlftpfs/curlftpfs.mk
+++ b/package/curlftpfs/curlftpfs.mk
@@ -7,6 +7,8 @@
 CURLFTPFS_VERSION = 0.9.2
 CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION)
 CURLFTPFS_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
+CURLFTPFS_LICENSE = GPLv2
+CURLFTPFS_LICENSE_FILES = COPYING
 CURLFTPFS_DEPENDENCIES = \
 	libglib2 libfuse openssl libcurl \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \

From ba26a928ac44e5401a573d0117a8adf3ee5040c3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:03 -0300
Subject: [PATCH 5511/6849] diffutils: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/diffutils/diffutils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 1de9db44ef..bd46ec2981 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -7,6 +7,8 @@
 DIFFUTILS_VERSION = 3.2
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+DIFFUTILS_LICENSE = GPLv3+
+DIFFUTILS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox

From db8b9f3c0853fe0020f79facab401560a2aa2235 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:04 -0300
Subject: [PATCH 5512/6849] dstat: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dstat/dstat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk
index de0f0a80ec..e71b0cccd2 100644
--- a/package/dstat/dstat.mk
+++ b/package/dstat/dstat.mk
@@ -7,6 +7,8 @@
 DSTAT_VERSION = 0.7.2
 DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2
 DSTAT_SITE = http://dag.wieers.com/home-made/dstat
+DSTAT_LICENSE = GPLv2
+DSTAT_LICENSE_FILES = COPYING
 
 define DSTAT_INSTALL_TARGET_CMDS
        $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install

From 303f4707d2d413176069d59a72d401b73094feb0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:05 -0300
Subject: [PATCH 5513/6849] enchant: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/enchant/enchant.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 50a8a6cbe8..8a76c6b67a 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -9,5 +9,7 @@ ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
 ENCHANT_INSTALL_STAGING = YES
 ENCHANT_DEPENDENCIES = libglib2 host-pkgconf
+ENCHANT_LICENSE = LGPLv2.1+
+ENCHANT_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))

From 6a354f8a5959b23caf0ac4dacc900187ffda779c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:06 -0300
Subject: [PATCH 5514/6849] fbgrab: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbgrab/fbgrab.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index 7645a6b0f8..62539a8922 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -8,6 +8,8 @@ FBGRAB_VERSION = 1.0
 FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz
 FBGRAB_SITE = http://hem.bredband.net/gmogmo/fbgrab
 FBGRAB_DEPENDENCIES = libpng
+FBGRAB_LICENSE = GPLv2
+FBGRAB_LICENSE_FILES = COPYING
 
 define FBGRAB_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)

From 38f96a6ce2786d2429ffe0ec23c1e6be46024311 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:07 -0300
Subject: [PATCH 5515/6849] fbterm: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbterm/fbterm.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
index 6fc4d7fa76..7e9d32441c 100644
--- a/package/fbterm/fbterm.mk
+++ b/package/fbterm/fbterm.mk
@@ -5,8 +5,9 @@
 ################################################################################
 
 FBTERM_VERSION = 1.7.0
-FBTERM_SITE = http://fbterm.googlecode.com/files/
-
+FBTERM_SITE = http://fbterm.googlecode.com/files
+FBTERM_LICENSE = GPLv2+
+FBTERM_LICENSE_FILES = COPYING
 FBTERM_DEPENDENCIES = fontconfig liberation
 
 $(eval $(autotools-package))

From 781771cf1e0f1599f648cc1cc2fb7d3f778535c7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:08 -0300
Subject: [PATCH 5516/6849] findutils: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/findutils/findutils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 464f28b04a..d9b6050963 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -6,6 +6,8 @@
 
 FINDUTILS_VERSION = 4.4.2
 FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
+FINDUTILS_LICENSE = GPLv3+
+FINDUTILS_LICENSE_FILES = COPYING
 FINDUTILS_CONF_ENV = gl_cv_func_stdin=yes \
 			gl_cv_func_wcwidth_works=yes
 

From cc6c2babb9a2edc087c6fee790702a06ff377c1f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:09 -0300
Subject: [PATCH 5517/6849] gamin: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gamin/gamin.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index 7939992b9d..c7ec531a8f 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -9,7 +9,8 @@ GAMIN_SOURCE = gamin-$(GAMIN_VERSION).tar.gz
 GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
 GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
-
+GAMIN_LICENSE = LGPLv2+
+GAMIN_LICENSE_FILES = COPYING
 GAMIN_CONF_OPT = --disable-debug
 
 # python support broken

From c211a53d3fc4b19a527c632091534ef822696228 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:10 -0300
Subject: [PATCH 5518/6849] libcap-ng: define license

[Peter: license is LGPLv2.1+]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap-ng/libcap-ng.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index d1c4462fd0..97eb219eaa 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -10,5 +10,7 @@ LIBCAP_NG_SOURCE = libcap-ng-$(LIBCAP_NG_VERSION).tar.gz
 LIBCAP_NG_INSTALL_STAGING = YES
 LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
 LIBCAP_NG_CONF_OPT = --without-python
+LIBCAP_NG_LICENSE = GPLv2+ LGPLv2.1+
+LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
 
 $(eval $(autotools-package))

From 1e1ac8931c077c3eb45a0353ac7565cf4c2a0d9f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:11 -0300
Subject: [PATCH 5519/6849] sysstat: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sysstat/sysstat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 73e20d3aa1..02e4c88503 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -9,6 +9,8 @@ SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
 SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors
 SYSSTAT_DEPENDENCIES = host-gettext
+SYSSTAT_LICENSE = GPLv2+
+SYSSTAT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 SYSSTAT_DEPENDENCIES += gettext

From 9c3b56fb8de761abced19de129ba971dc1378965 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:12 -0300
Subject: [PATCH 5520/6849] rdesktop: define license

[Peter: license has an openssl exception]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rdesktop/rdesktop.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index fa7359c5cc..ea2ca0a094 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -9,5 +9,7 @@ RDESKTOP_SOURCE = rdesktop-$(RDESKTOP_VERSION).tar.gz
 RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION)
 RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
 RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
+RDESKTOP_LICENSE = GPLv2+ with exceptions
+RDESKTOP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From f3a24abef62e0bcb1047e78feb179582baf3f3bf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:13 -0300
Subject: [PATCH 5521/6849] proftpd: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proftpd/proftpd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index a8d0e59cf5..78f952fe04 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -7,6 +7,8 @@
 PROFTPD_VERSION = 1.3.3g
 PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2
 PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source/
+PROFTPD_LICENSE = GPLv2+
+PROFTPD_LICENSE_FILES = COPYING
 
 PROFTPD_CONF_ENV = ac_cv_func_setpgrp_void=yes \
 		ac_cv_func_setgrent_void=yes

From e1b1e5f5b36ed9b39f46a80c333a42386088a57c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:14 -0300
Subject: [PATCH 5522/6849] parted: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/parted/parted.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index 78c755a329..773e332edc 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -9,5 +9,7 @@ PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
 PARTED_SITE = $(BR2_GNU_MIRROR)/parted
 PARTED_DEPENDENCIES = readline util-linux lvm2
 PARTED_INSTALL_STAGING = YES
+PARTED_LICENSE = GPLv3+
+PARTED_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 75cfdb1fd7db85f96dae9886c92ab60d30bf3f66 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:15 -0300
Subject: [PATCH 5523/6849] ortp: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ortp/ortp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index 8983df7c1c..5ccc5ff0f1 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -8,5 +8,7 @@ ORTP_VERSION = 0.20.0
 ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
 ORTP_CONF_OPT = --disable-strict
 ORTP_INSTALL_STAGING = YES
+ORTP_LICENSE = LGPLv2.1+
+ORTP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From fc034397fc5c85115a7cc29b8dcc6738a1f8cdc3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 10:41:16 -0300
Subject: [PATCH 5524/6849] openvpn: define license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openvpn/openvpn.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 0756ec4be1..92f6f1807c 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -7,6 +7,8 @@
 OPENVPN_VERSION = 2.3.2
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkgconf
+OPENVPN_LICENSE = GPLv2
+OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
 OPENVPN_CONF_OPT = --disable-plugin-auth-pam --enable-iproute2
 OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
 	NETSTAT=/bin/netstat \

From f1c092da8ba4d03125387a337ab45c9b5a1315dc Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 29 May 2013 10:36:57 +0200
Subject: [PATCH 5525/6849] python3: Port python2 patches to reduce the
 interpreter size

Some of the python2 patches were left behind when doing the python3
package. This was because the python build system can now autodetect
what packages can be built in the system.

However, some of these patches are actually useful to reduce drastically
the size of the interpreter.

This patch ports the relevant patches to the python3 package, and adds a
new patch to remove the idle3 IDE as well from the interpreter.

Fixes #5696

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python3/Config.in                     |  11 ++
 ...-000-generate-sysconfigdata-buildir.patch} |   0
 ...ch => python3-001-support-for-build.patch} |   0
 ...=> python3-002-no-host-headers-libs.patch} |   0
 ... => python3-003-staging-header-libs.patch} |   0
 ...-004-no-import-when-cross-compiling.patch} |   0
 ...thon3-005-do-not-generate-pyo-files.patch} |   0
 ...h => python3-006-reread-environment.patch} |   0
 ...hon3-007-change-pyconfig-h-location.patch} |   0
 ...rpath.patch => python3-008-no-rpath.patch} |   0
 ...=> python3-009-verbose-module-build.patch} |   0
 ...distutils-cross-compilation-support.patch} |   0
 ...thon3-011-cross-compile-getaddrinfo.patch} |   0
 .../python3-012-disable-extensions.patch      |  98 ++++++++++++++++
 .../python3-100-optional-test-modules.patch   | 102 ++++++++++++++++
 .../python3/python3-101-optional-pydoc.patch  |  91 ++++++++++++++
 .../python3/python3-102-optional-2to3.patch   | 111 ++++++++++++++++++
 .../python3/python3-103-optional-sqlite.patch |  64 ++++++++++
 package/python3/python3-104-optional-tk.patch |  69 +++++++++++
 .../python3/python3-105-optional-curses.patch |  54 +++++++++
 .../python3/python3-106-optional-expat.patch  |  85 ++++++++++++++
 .../python3-107-optional-codecs-cjk.patch     |  25 ++++
 .../python3/python3-108-optional-nis.patch    |  28 +++++
 .../python3-109-optional-unicodedata.patch    |  25 ++++
 .../python3/python3-110-optional-idle.patch   |  83 +++++++++++++
 package/python3/python3.mk                    |  25 ++--
 26 files changed, 862 insertions(+), 9 deletions(-)
 rename package/python3/{python3-3.3-000-generate-sysconfigdata-buildir.patch => python3-000-generate-sysconfigdata-buildir.patch} (100%)
 rename package/python3/{python3-3.3-001-support-for-build.patch => python3-001-support-for-build.patch} (100%)
 rename package/python3/{python3-3.3-002-no-host-headers-libs.patch => python3-002-no-host-headers-libs.patch} (100%)
 rename package/python3/{python3-3.3-003-staging-header-libs.patch => python3-003-staging-header-libs.patch} (100%)
 rename package/python3/{python3-3.3-004-no-import-when-cross-compiling.patch => python3-004-no-import-when-cross-compiling.patch} (100%)
 rename package/python3/{python3-3.3-005-do-not-generate-pyo-files.patch => python3-005-do-not-generate-pyo-files.patch} (100%)
 rename package/python3/{python3-3.3-006-reread-environment.patch => python3-006-reread-environment.patch} (100%)
 rename package/python3/{python3-3.3-007-change-pyconfig-h-location.patch => python3-007-change-pyconfig-h-location.patch} (100%)
 rename package/python3/{python3-3.3-008-no-rpath.patch => python3-008-no-rpath.patch} (100%)
 rename package/python3/{python3-3.3-009-verbose-module-build.patch => python3-009-verbose-module-build.patch} (100%)
 rename package/python3/{python3-3.3-010-distutils-cross-compilation-support.patch => python3-010-distutils-cross-compilation-support.patch} (100%)
 rename package/python3/{python3-3.3-011-cross-compile-getaddrinfo.patch => python3-011-cross-compile-getaddrinfo.patch} (100%)
 create mode 100644 package/python3/python3-012-disable-extensions.patch
 create mode 100644 package/python3/python3-100-optional-test-modules.patch
 create mode 100644 package/python3/python3-101-optional-pydoc.patch
 create mode 100644 package/python3/python3-102-optional-2to3.patch
 create mode 100644 package/python3/python3-103-optional-sqlite.patch
 create mode 100644 package/python3/python3-104-optional-tk.patch
 create mode 100644 package/python3/python3-105-optional-curses.patch
 create mode 100644 package/python3/python3-106-optional-expat.patch
 create mode 100644 package/python3/python3-107-optional-codecs-cjk.patch
 create mode 100644 package/python3/python3-108-optional-nis.patch
 create mode 100644 package/python3/python3-109-optional-unicodedata.patch
 create mode 100644 package/python3/python3-110-optional-idle.patch

diff --git a/package/python3/Config.in b/package/python3/Config.in
index 5959d31c6c..4a70b5e5c3 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -41,6 +41,11 @@ config BR2_PACKAGE_PYTHON3_BZIP2
 	help
 	  bzip2 module for Python3
 
+config BR2_PACKAGE_PYTHON3_CODECSCJK
+	bool "codecscjk module"
+	help
+	  Chinese/Japanese/Korean codecs module for Python (large).
+
 config BR2_PACKAGE_PYTHON3_CURSES
 	select BR2_PACKAGE_NCURSES
 	bool "curses module"
@@ -66,6 +71,12 @@ config BR2_PACKAGE_PYTHON3_SSL
 	help
 	  _ssl module for Python3 (required for https in urllib etc).
 
+config BR2_PACKAGE_PYTHON3_UNICODEDATA
+	bool "unicodedata module"
+	default y
+	help
+	  Unicode character database (used by stringprep module) (large).
+
 config BR2_PACKAGE_PYTHON3_SQLITE
 	bool "sqlite module"
 	select BR2_PACKAGE_SQLITE
diff --git a/package/python3/python3-3.3-000-generate-sysconfigdata-buildir.patch b/package/python3/python3-000-generate-sysconfigdata-buildir.patch
similarity index 100%
rename from package/python3/python3-3.3-000-generate-sysconfigdata-buildir.patch
rename to package/python3/python3-000-generate-sysconfigdata-buildir.patch
diff --git a/package/python3/python3-3.3-001-support-for-build.patch b/package/python3/python3-001-support-for-build.patch
similarity index 100%
rename from package/python3/python3-3.3-001-support-for-build.patch
rename to package/python3/python3-001-support-for-build.patch
diff --git a/package/python3/python3-3.3-002-no-host-headers-libs.patch b/package/python3/python3-002-no-host-headers-libs.patch
similarity index 100%
rename from package/python3/python3-3.3-002-no-host-headers-libs.patch
rename to package/python3/python3-002-no-host-headers-libs.patch
diff --git a/package/python3/python3-3.3-003-staging-header-libs.patch b/package/python3/python3-003-staging-header-libs.patch
similarity index 100%
rename from package/python3/python3-3.3-003-staging-header-libs.patch
rename to package/python3/python3-003-staging-header-libs.patch
diff --git a/package/python3/python3-3.3-004-no-import-when-cross-compiling.patch b/package/python3/python3-004-no-import-when-cross-compiling.patch
similarity index 100%
rename from package/python3/python3-3.3-004-no-import-when-cross-compiling.patch
rename to package/python3/python3-004-no-import-when-cross-compiling.patch
diff --git a/package/python3/python3-3.3-005-do-not-generate-pyo-files.patch b/package/python3/python3-005-do-not-generate-pyo-files.patch
similarity index 100%
rename from package/python3/python3-3.3-005-do-not-generate-pyo-files.patch
rename to package/python3/python3-005-do-not-generate-pyo-files.patch
diff --git a/package/python3/python3-3.3-006-reread-environment.patch b/package/python3/python3-006-reread-environment.patch
similarity index 100%
rename from package/python3/python3-3.3-006-reread-environment.patch
rename to package/python3/python3-006-reread-environment.patch
diff --git a/package/python3/python3-3.3-007-change-pyconfig-h-location.patch b/package/python3/python3-007-change-pyconfig-h-location.patch
similarity index 100%
rename from package/python3/python3-3.3-007-change-pyconfig-h-location.patch
rename to package/python3/python3-007-change-pyconfig-h-location.patch
diff --git a/package/python3/python3-3.3-008-no-rpath.patch b/package/python3/python3-008-no-rpath.patch
similarity index 100%
rename from package/python3/python3-3.3-008-no-rpath.patch
rename to package/python3/python3-008-no-rpath.patch
diff --git a/package/python3/python3-3.3-009-verbose-module-build.patch b/package/python3/python3-009-verbose-module-build.patch
similarity index 100%
rename from package/python3/python3-3.3-009-verbose-module-build.patch
rename to package/python3/python3-009-verbose-module-build.patch
diff --git a/package/python3/python3-3.3-010-distutils-cross-compilation-support.patch b/package/python3/python3-010-distutils-cross-compilation-support.patch
similarity index 100%
rename from package/python3/python3-3.3-010-distutils-cross-compilation-support.patch
rename to package/python3/python3-010-distutils-cross-compilation-support.patch
diff --git a/package/python3/python3-3.3-011-cross-compile-getaddrinfo.patch b/package/python3/python3-011-cross-compile-getaddrinfo.patch
similarity index 100%
rename from package/python3/python3-3.3-011-cross-compile-getaddrinfo.patch
rename to package/python3/python3-011-cross-compile-getaddrinfo.patch
diff --git a/package/python3/python3-012-disable-extensions.patch b/package/python3/python3-012-disable-extensions.patch
new file mode 100644
index 0000000000..ed1d1e2d93
--- /dev/null
+++ b/package/python3/python3-012-disable-extensions.patch
@@ -0,0 +1,98 @@
+Add infrastructure to disable the build of certain extensions
+
+Some of the extensions part of the Python core have dependencies on
+external libraries (sqlite, tk, etc.) or are relatively big and not
+necessarly always useful (CJK codecs for example). By extensions, we
+mean part of Python modules that are written in C and therefore
+compiled to binary code.
+
+Therefore, we introduce a small infrastructure that allows to disable
+some of those extensions. This can be done inside the configure.ac by
+adding values to the DISABLED_EXTENSIONS variable (which is a
+word-separated list of extensions).
+
+The implementation works as follow :
+
+ * configure.ac defines a DISABLED_EXTENSIONS variable, which is
+   substituted (so that when Makefile.pre is generated from
+   Makefile.pre.in, the value of the variable is substituted). For
+   now, this DISABLED_EXTENSIONS variable is empty, later patches will
+   use it.
+
+ * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the
+   variables passed in the environment when calling the setup.py
+   script that actually builds and installs those extensions.
+
+ * setup.py is modified so that the existing "disabled_module_list" is
+   filled with those pre-disabled extensions listed in
+   DISABLED_EXTENSIONS.
+
+Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>, and
+then extended by Thomas Petazzoni
+<thomas.petazzoni@free-electrons.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.pre.in |    4 ++++
+ configure.ac    |    2 ++
+ setup.py        |    5 ++++-
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -155,6 +155,8 @@
+ # configure script arguments
+ CONFIG_ARGS=	@CONFIG_ARGS@
+ 
++# disabled extensions
++DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
+ 
+ # Subdirectories with code
+ SRCDIRS= 	@SRCDIRS@
+@@ -478,6 +480,7 @@
+ sharedmods: $(BUILDPYTHON) pybuilddir.txt
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		CONFIG_ARGS="$(CONFIG_ARGS)" \
++		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
+ 
+ # Build static library
+@@ -1185,6 +1188,7 @@
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+ 	$(RUNSHARED) CONFIG_ARGS="$(CONFIG_ARGS)" \
++		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2175,6 +2175,8 @@
+ 
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ 
++AC_SUBST(DISABLED_EXTENSIONS)
++
+ # Check for use of the system expat library
+ AC_MSG_CHECKING(for --with-system-expat)
+ AC_ARG_WITH(system_expat,
+Index: cpython/setup.py
+===================================================================
+--- cpython.orig/setup.py
++++ cpython/setup.py
+@@ -34,7 +34,10 @@
+ sysconfig._CONFIG_VARS.update(os.environ)
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++try:
++    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
++except KeyError:
++    disabled_module_list = list()
+ 
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (after any relative
diff --git a/package/python3/python3-100-optional-test-modules.patch b/package/python3/python3-100-optional-test-modules.patch
new file mode 100644
index 0000000000..13e73a7ed9
--- /dev/null
+++ b/package/python3/python3-100-optional-test-modules.patch
@@ -0,0 +1,102 @@
+Add an option to disable installation of test modules
+
+The Python standard distribution comes with many test modules, that
+are not necessarly useful on embedded targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |   50 ++++++++++++++++++++++++++++++++------------------
+ configure.ac    |    6 ++++++
+ 2 files changed, 38 insertions(+), 18 deletions(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -976,8 +976,26 @@
+ EXTRAPLATDIR= @EXTRAPLATDIR@
+ MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
+ XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
+-LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
+-		tkinter/test/test_ttk site-packages test \
++LIBSUBDIRS=	tkinter \
++		site-packages \
++		collections concurrent concurrent/futures encodings \
++		email email/mime \
++		html json http dbm xmlrpc \
++		sqlite3 \
++		logging csv wsgiref urllib \
++		lib2to3 lib2to3/fixes lib2to3/pgen2 \
++		ctypes ctypes/macholib idlelib idlelib/Icons \
++		distutils distutils/command $(XMLLIBSUBDIRS) \
++		importlib \
++		turtledemo \
++		multiprocessing multiprocessing/dummy \
++		unittest \
++		venv venv/scripts venv/scripts/posix \
++		curses pydoc_data $(MACHDEPS)
++
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += tkinter/test tkinter/test/test_tkinter \
++		tkinter/test/test_ttk test \
+ 		test/capath test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata \
+ 		test/subprocessdata test/sndhdrdata \
+@@ -1000,26 +1018,22 @@
+ 		test/namespace_pkgs/project3 \
+ 		test/namespace_pkgs/project3/parent \
+ 		test/namespace_pkgs/project3/parent/child \
+-                test/namespace_pkgs/module_and_namespace_package \
+-                test/namespace_pkgs/module_and_namespace_package/a_test \
+-		collections concurrent concurrent/futures encodings \
+-		email email/mime test/test_email test/test_email/data \
+-		html json test/json_tests http dbm xmlrpc \
+-		sqlite3 sqlite3/test \
+-		logging csv wsgiref urllib \
+-		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
++		test/namespace_pkgs/module_and_namespace_package \
++		test/namespace_pkgs/module_and_namespace_package/a_test \
++		test/test_email test/test_email/data \
++		test/json_tests \
++		sqlite3/test \
++		lib2to3/tests \
+ 		lib2to3/tests/data lib2to3/tests/data/fixers \
+ 		lib2to3/tests/data/fixers/myfixes \
+-		ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
+-		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
+-		importlib test/test_importlib test/test_importlib/builtin \
++		ctypes/test \
++		distutils/tests \
++		test/test_importlib test/test_importlib/builtin \
+ 		test/test_importlib/extension test/test_importlib/frozen \
+ 		test/test_importlib/import_ test/test_importlib/source \
+-		turtledemo \
+-		multiprocessing multiprocessing/dummy \
+-		unittest unittest/test unittest/test/testmock \
+-		venv venv/scripts venv/scripts/posix \
+-		curses pydoc_data $(MACHDEPS)
++		unittest unittest/test unittest/test/testmock
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2449,6 +2449,12 @@
+ fi
+ 
+ 
++AC_SUBST(TEST_MODULES)
++
++AC_ARG_ENABLE(test-modules,
++	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
++	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/python3-101-optional-pydoc.patch
new file mode 100644
index 0000000000..ac50ac39ea
--- /dev/null
+++ b/package/python3/python3-101-optional-pydoc.patch
@@ -0,0 +1,91 @@
+Add an option to disable pydoc
+
+It removes 0.5 MB of data from the target plus the pydoc script
+itself.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |    8 +++++++-
+ configure.ac    |    5 +++++
+ setup.py        |    9 +++++++--
+ 3 files changed, 19 insertions(+), 3 deletions(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -952,7 +952,9 @@
+ 	-rm -f $(DESTDIR)$(BINDIR)/idle3
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
+ 	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
++ifeq (@PYDOC@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
++endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/2to3
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
+ 	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
+@@ -991,7 +993,7 @@
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+ 		venv venv/scripts venv/scripts/posix \
+-		curses pydoc_data $(MACHDEPS)
++		curses $(MACHDEPS)
+ 
+ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+@@ -1034,6 +1036,10 @@
+ 		unittest unittest/test unittest/test/testmock
+ endif
+ 
++ifeq (@PYDOC@,yes)
++LIBSUBDIRS += pydoc_data
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2448,6 +2448,11 @@
+         esac])
+ fi
+ 
++AC_SUBST(PYDOC)
++
++AC_ARG_ENABLE(pydoc,
++	AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
++	[ PYDOC="${enableval}" ], [ PYDOC=yes ])
+ 
+ AC_SUBST(TEST_MODULES)
+ 
+Index: cpython/setup.py
+===================================================================
+--- cpython.orig/setup.py
++++ cpython/setup.py
+@@ -2123,6 +2123,12 @@
+     # turn off warnings when deprecated modules are imported
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
++
++    scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
++               'Lib/smtpd.py']
++    if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/pydoc3' ]
++
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+           version = sys.version.split()[0],
+@@ -2147,8 +2153,7 @@
+           # If you change the scripts installed here, you also need to
+           # check the PyBuildScripts command above, and change the links
+           # created by the bininstall target in Makefile.pre.in
+-          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
+-                     "Tools/scripts/2to3", "Tools/scripts/pyvenv"]
++          scripts = scripts,
+         )
+ 
+ # --install-platlib
diff --git a/package/python3/python3-102-optional-2to3.patch b/package/python3/python3-102-optional-2to3.patch
new file mode 100644
index 0000000000..f5e821ae6b
--- /dev/null
+++ b/package/python3/python3-102-optional-2to3.patch
@@ -0,0 +1,111 @@
+Add an option to disable lib2to3
+
+lib2to3 is a library to convert Python 2.x code to Python 3.x. As
+such, it is probably not very useful on embedded system targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |   18 ++++++++++++++----
+ configure.ac    |    6 ++++++
+ setup.py        |    5 +++--
+ 3 files changed, 23 insertions(+), 6 deletions(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -956,7 +956,9 @@
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
+ endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/2to3
++ifeq (@LIB2TO3@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
++endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
+ 
+@@ -985,7 +987,6 @@
+ 		html json http dbm xmlrpc \
+ 		sqlite3 \
+ 		logging csv wsgiref urllib \
+-		lib2to3 lib2to3/fixes lib2to3/pgen2 \
+ 		ctypes ctypes/macholib idlelib idlelib/Icons \
+ 		distutils distutils/command $(XMLLIBSUBDIRS) \
+ 		importlib \
+@@ -1025,9 +1026,6 @@
+ 		test/test_email test/test_email/data \
+ 		test/json_tests \
+ 		sqlite3/test \
+-		lib2to3/tests \
+-		lib2to3/tests/data lib2to3/tests/data/fixers \
+-		lib2to3/tests/data/fixers/myfixes \
+ 		ctypes/test \
+ 		distutils/tests \
+ 		test/test_importlib test/test_importlib/builtin \
+@@ -1040,6 +1038,16 @@
+ LIBSUBDIRS += pydoc_data
+ endif
+ 
++ifeq (@LIB2TO3@,yes)
++LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += 	lib2to3/tests				\
++		lib2to3/tests/data			\
++		lib2to3/tests/data/fixers		\
++		lib2to3/tests/data/fixers/myfixes
++endif
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+@@ -1109,10 +1117,12 @@
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
++ifeq (@LIB2TO3@,yes)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
++endif
+ 
+ # Create the PLATDIR source directory, if one wasn't distributed..
+ $(srcdir)/Lib/$(PLATDIR):
+Index: cpython/setup.py
+===================================================================
+--- cpython.orig/setup.py
++++ cpython/setup.py
+@@ -2124,10 +2124,11 @@
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
+-               'Lib/smtpd.py']
++    scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc3' ]
++    if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/2to3' ]
+ 
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2460,6 +2460,12 @@
+ 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
+ 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
+ 
++AC_SUBST(LIB2TO3)
++
++AC_ARG_ENABLE(lib2to3,
++	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
++	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
diff --git a/package/python3/python3-103-optional-sqlite.patch b/package/python3/python3-103-optional-sqlite.patch
new file mode 100644
index 0000000000..e3a63c3e02
--- /dev/null
+++ b/package/python3/python3-103-optional-sqlite.patch
@@ -0,0 +1,64 @@
+Add option to disable the sqlite3 module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |    9 +++++++--
+ configure.ac    |    9 +++++++++
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2448,6 +2448,15 @@
+         esac])
+ fi
+ 
++AC_SUBST(SQLITE3)
++AC_ARG_ENABLE(sqlite3,
++	AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
++	[ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
++
++if test "$SQLITE3" = "no" ; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -985,7 +985,6 @@
+ 		collections concurrent concurrent/futures encodings \
+ 		email email/mime \
+ 		html json http dbm xmlrpc \
+-		sqlite3 \
+ 		logging csv wsgiref urllib \
+ 		ctypes ctypes/macholib idlelib idlelib/Icons \
+ 		distutils distutils/command $(XMLLIBSUBDIRS) \
+@@ -1025,7 +1024,6 @@
+ 		test/namespace_pkgs/module_and_namespace_package/a_test \
+ 		test/test_email test/test_email/data \
+ 		test/json_tests \
+-		sqlite3/test \
+ 		ctypes/test \
+ 		distutils/tests \
+ 		test/test_importlib test/test_importlib/builtin \
+@@ -1048,6 +1046,13 @@
+ endif
+ endif
+ 
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += sqlite3/test
++endif
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
diff --git a/package/python3/python3-104-optional-tk.patch b/package/python3/python3-104-optional-tk.patch
new file mode 100644
index 0000000000..2f89fe014f
--- /dev/null
+++ b/package/python3/python3-104-optional-tk.patch
@@ -0,0 +1,69 @@
+Add an option to disable the tk module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |   14 +++++++++++---
+ configure.ac    |    9 +++++++++
+ 2 files changed, 20 insertions(+), 3 deletions(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -980,7 +980,7 @@
+ EXTRAPLATDIR= @EXTRAPLATDIR@
+ MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
+ XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
+-LIBSUBDIRS=	tkinter \
++LIBSUBDIRS=	\
+ 		site-packages \
+ 		collections concurrent concurrent/futures encodings \
+ 		email email/mime \
+@@ -996,8 +996,7 @@
+ 		curses $(MACHDEPS)
+ 
+ ifeq (@TEST_MODULES@,yes)
+-LIBSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+-		tkinter/test/test_ttk test \
++LIBSUBDIRS += 	test \
+ 		test/capath test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata \
+ 		test/subprocessdata test/sndhdrdata \
+@@ -1053,6 +1052,15 @@
+ endif
+ endif
+ 
++ifeq (@TK@,yes)
++LIBSUBDIRS += tkinter
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += 	\
++		tkinter/test tkinter/test/test_tkinter \
++		tkinter/test/test_ttk
++endif
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2457,6 +2457,15 @@
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+ fi
+ 
++AC_SUBST(TK)
++AC_ARG_ENABLE(tk,
++	AS_HELP_STRING([--disable-tk], [disable tk]),
++	[ TK="${enableval}" ], [ TK=yes ])
++
++if test "$TK" = "no"; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
diff --git a/package/python3/python3-105-optional-curses.patch b/package/python3/python3-105-optional-curses.patch
new file mode 100644
index 0000000000..adb31836fd
--- /dev/null
+++ b/package/python3/python3-105-optional-curses.patch
@@ -0,0 +1,54 @@
+Add an option to disable the curses module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |    6 +++++-
+ configure.ac    |    9 +++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -993,7 +993,7 @@
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+ 		venv venv/scripts venv/scripts/posix \
+-		curses $(MACHDEPS)
++		$(MACHDEPS)
+ 
+ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += 	test \
+@@ -1061,6 +1061,10 @@
+ endif
+ endif
+ 
++ifeq (@CURSES@,yes)
++LIBSUBDIRS += curses
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2466,6 +2466,15 @@
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
+ fi
+ 
++AC_SUBST(CURSES)
++AC_ARG_ENABLE(curses,
++	AS_HELP_STRING([--disable-curses], [disable curses]),
++	[ CURSES="${enableval}" ], [ CURSES=yes ])
++
++if test "$CURSES" = "no"; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
diff --git a/package/python3/python3-106-optional-expat.patch b/package/python3/python3-106-optional-expat.patch
new file mode 100644
index 0000000000..d171b79ef7
--- /dev/null
+++ b/package/python3/python3-106-optional-expat.patch
@@ -0,0 +1,85 @@
+Add an option to disable expat
+
+This patch replaces the existing --with-system-expat option with a
+--with-expat={system,builtin,none} option, which allows to tell Python
+whether we want to use the system expat (already installed), the expat
+builtin the Python sources, or no expat at all (which disables the
+installation of XML modules).
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+ Makefile.pre.in |    6 +++++-
+ configure.ac    |   18 +++++++++++++-----
+ setup.py        |    2 +-
+ 3 files changed, 19 insertions(+), 7 deletions(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -987,7 +987,7 @@
+ 		html json http dbm xmlrpc \
+ 		logging csv wsgiref urllib \
+ 		ctypes ctypes/macholib idlelib idlelib/Icons \
+-		distutils distutils/command $(XMLLIBSUBDIRS) \
++		distutils distutils/command \
+ 		importlib \
+ 		turtledemo \
+ 		multiprocessing multiprocessing/dummy \
+@@ -1065,6 +1065,10 @@
+ LIBSUBDIRS += curses
+ endif
+ 
++ifeq (@EXPAT@,yes)
++LIBSUBDIRS += $(XMLLIBSUBDIRS)
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2178,13 +2178,21 @@
+ AC_SUBST(DISABLED_EXTENSIONS)
+ 
+ # Check for use of the system expat library
+-AC_MSG_CHECKING(for --with-system-expat)
+-AC_ARG_WITH(system_expat,
+-            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
++AC_MSG_CHECKING(for --with-expat)
++AC_ARG_WITH(expat,
++            AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
+             [],
+-            [with_system_expat="no"])
++            [with_expat="builtin"])
+ 
+-AC_MSG_RESULT($with_system_expat)
++AC_MSG_RESULT($with_expat)
++
++if test "$with_expat" != "none"; then
++   EXPAT=yes
++else
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
++   EXPAT=no
++fi
++AC_SUBST(EXPAT)
+ 
+ # Check for use of the system libffi library
+ AC_MSG_CHECKING(for --with-system-ffi)
+Index: cpython/setup.py
+===================================================================
+--- cpython.orig/setup.py
++++ cpython/setup.py
+@@ -1404,7 +1404,7 @@
+         #
+         # More information on Expat can be found at www.libexpat.org.
+         #
+-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
++        if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
+             expat_inc = []
+             define_macros = []
+             expat_lib = ['expat']
diff --git a/package/python3/python3-107-optional-codecs-cjk.patch b/package/python3/python3-107-optional-codecs-cjk.patch
new file mode 100644
index 0000000000..de7f9109a4
--- /dev/null
+++ b/package/python3/python3-107-optional-codecs-cjk.patch
@@ -0,0 +1,25 @@
+Add an option to disable CJK codecs
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+---
+ configure.ac |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2465,6 +2465,12 @@
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+ fi
+ 
++AC_ARG_ENABLE(codecs-cjk,
++	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
++	[ if test "$enableval" = "no"; then
++		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
++	fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/package/python3/python3-108-optional-nis.patch b/package/python3/python3-108-optional-nis.patch
new file mode 100644
index 0000000000..3c9149769c
--- /dev/null
+++ b/package/python3/python3-108-optional-nis.patch
@@ -0,0 +1,28 @@
+Add an option to disable NIS
+
+NIS is not necessarily available in uClibc, so we need an option to
+not compile support for it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+---
+ configure.ac |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2471,6 +2471,12 @@
+ 		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
+ 	fi])
+ 
++AC_ARG_ENABLE(nis,
++	AS_HELP_STRING([--disable-nis], [disable NIS]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/package/python3/python3-109-optional-unicodedata.patch b/package/python3/python3-109-optional-unicodedata.patch
new file mode 100644
index 0000000000..c75ee27c74
--- /dev/null
+++ b/package/python3/python3-109-optional-unicodedata.patch
@@ -0,0 +1,25 @@
+Add an option to disable unicodedata
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+---
+ configure.ac |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2477,6 +2477,12 @@
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+   	  fi])
+ 
++AC_ARG_ENABLE(unicodedata,
++	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/package/python3/python3-110-optional-idle.patch b/package/python3/python3-110-optional-idle.patch
new file mode 100644
index 0000000000..1a7fa65623
--- /dev/null
+++ b/package/python3/python3-110-optional-idle.patch
@@ -0,0 +1,83 @@
+Add an option to disable IDLE
+
+IDLE is an IDE embedded into python, written using Tk, so it doesn't make
+much sense to have it into our build.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+
+---
+ Makefile.pre.in |    8 +++++++-
+ configure.ac    |    6 ++++++
+ setup.py        |    4 +++-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+Index: cpython/Makefile.pre.in
+===================================================================
+--- cpython.orig/Makefile.pre.in
++++ cpython/Makefile.pre.in
+@@ -950,7 +950,9 @@
+ 	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
+ 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
+ 	-rm -f $(DESTDIR)$(BINDIR)/idle3
++ifeq (@IDLE@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
++endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
+ ifeq (@PYDOC@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
+@@ -986,7 +988,7 @@
+ 		email email/mime \
+ 		html json http dbm xmlrpc \
+ 		logging csv wsgiref urllib \
+-		ctypes ctypes/macholib idlelib idlelib/Icons \
++		ctypes ctypes/macholib \
+ 		distutils distutils/command \
+ 		importlib \
+ 		turtledemo \
+@@ -1069,6 +1071,10 @@
+ LIBSUBDIRS += $(XMLLIBSUBDIRS)
+ endif
+ 
++ifeq (@IDLE@,yes)
++LIBSUBDIRS += idlelib idlelib/Icons
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+Index: cpython/configure.ac
+===================================================================
+--- cpython.orig/configure.ac
++++ cpython/configure.ac
+@@ -2519,6 +2519,12 @@
+ 	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
+ 	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
+ 
++AC_SUBST(IDLE)
++
++AC_ARG_ENABLE(idle3,
++	AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]),
++	[ IDLE="${enableval}" ], [ IDLE=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
+Index: cpython/setup.py
+===================================================================
+--- cpython.orig/setup.py
++++ cpython/setup.py
+@@ -2124,11 +2124,13 @@
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py']
++    scripts = ['Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc3' ]
+     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/2to3' ]
++    if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/idle3' ]
+ 
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 11ffe61b84..39202ff1b7 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -24,12 +24,8 @@ HOST_PYTHON3_CONF_OPT += 	\
 	--disable-codecs-cjk	\
 	--disable-nis		\
 	--disable-unicodedata	\
-	--disable-dbm		\
-	--disable-gdbm		\
-	--disable-bsddb		\
 	--disable-test-modules	\
-	--disable-bz2		\
-	--disable-ssl
+	--disable-idle3
 
 HOST_PYTHON3_MAKE_ENV = \
 	PYTHON_MODULES_INCLUDE=$(HOST_DIR)/usr/include \
@@ -62,6 +58,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y)
 PYTHON3_DEPENDENCIES += ncurses
+else
+PYTHON3_CONF_OPT += --disable-curses
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y)
@@ -77,14 +75,24 @@ endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y)
 PYTHON3_DEPENDENCIES += sqlite
+else
+PYTHON3_CONF_OPT += --disable-sqlite3
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y)
-PYTHON_DEPENDENCIES += openssl
+PYTHON3_DEPENDENCIES += openssl
+endif
+
+ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y)
+PYTHON3_CONF_OPT += --disable-codecs-cjk
+endif
+
+ifneq ($(BR2_PACKAGE_PYTHON3_UNICODEDATA),y)
+PYTHON3_CONF_OPT += --disable-unicodedata
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y)
-PYTHON_DEPENDENCIES += bzip2
+PYTHON3_DEPENDENCIES += bzip2
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y)
@@ -106,10 +114,9 @@ PYTHON3_CONF_OPT += \
 	--disable-pydoc		\
 	--disable-test-modules	\
 	--disable-lib2to3	\
-	--disable-gdbm		\
 	--disable-tk		\
 	--disable-nis		\
-	--disable-dbm
+	--disable-idle3
 
 PYTHON3_MAKE_ENV = \
 	_PROJECT_BASE=$(PYTHON3_DIR) \

From 72da1a34648fad260fbdd73aa54e576cdb12acc2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Jun 2013 15:31:08 -0300
Subject: [PATCH 5526/6849] busybox: bump 1.21.x series to 1.21.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../busybox/1.21.0/busybox-1.21.0-mdev.patch  | 701 ------------------
 .../busybox/1.21.0/busybox-1.21.0-ntfs.patch  |  11 -
 .../1.21.0/busybox-1.21.0-platform.patch      |  24 -
 .../busybox/1.21.0/busybox-1.21.0-xz.patch    |  84 ---
 package/busybox/Config.in                     |   2 +-
 5 files changed, 1 insertion(+), 821 deletions(-)
 delete mode 100644 package/busybox/1.21.0/busybox-1.21.0-mdev.patch
 delete mode 100644 package/busybox/1.21.0/busybox-1.21.0-ntfs.patch
 delete mode 100644 package/busybox/1.21.0/busybox-1.21.0-platform.patch
 delete mode 100644 package/busybox/1.21.0/busybox-1.21.0-xz.patch

diff --git a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch b/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
deleted file mode 100644
index 1481cb3885..0000000000
--- a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch
+++ /dev/null
@@ -1,701 +0,0 @@
---- busybox-1.21.0/util-linux/mdev.c
-+++ busybox-1.21.0-mdev/util-linux/mdev.c
-@@ -80,7 +80,7 @@
- //usage:	IF_FEATURE_MDEV_CONF(
- //usage:       "\n"
- //usage:       "It uses /etc/mdev.conf with lines\n"
--//usage:       "	[-]DEVNAME UID:GID PERM"
-+//usage:       "	[-][ENV=regex;]...DEVNAME UID:GID PERM"
- //usage:			IF_FEATURE_MDEV_RENAME(" [>|=PATH]|[!]")
- //usage:			IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]")
- //usage:       "\n"
-@@ -230,9 +230,34 @@
-  * SUBSYSTEM=block
-  */
- 
--static const char keywords[] ALIGN1 = "add\0remove\0change\0";
-+#define DEBUG_LVL 2
-+
-+#if DEBUG_LVL >= 1
-+# define dbg1(...) do { if (G.verbose) bb_error_msg(__VA_ARGS__); } while(0)
-+#else
-+# define dbg1(...) ((void)0)
-+#endif
-+#if DEBUG_LVL >= 2
-+# define dbg2(...) do { if (G.verbose >= 2) bb_error_msg(__VA_ARGS__); } while(0)
-+#else
-+# define dbg2(...) ((void)0)
-+#endif
-+#if DEBUG_LVL >= 3
-+# define dbg3(...) do { if (G.verbose >= 3) bb_error_msg(__VA_ARGS__); } while(0)
-+#else
-+# define dbg3(...) ((void)0)
-+#endif
-+
-+
-+static const char keywords[] ALIGN1 = "add\0remove\0"; // "change\0"
- enum { OP_add, OP_remove };
- 
-+struct envmatch {
-+	struct envmatch *next;
-+	char *envname;
-+	regex_t match;
-+};
-+
- struct rule {
- 	bool keep_matching;
- 	bool regex_compiled;
-@@ -243,12 +268,14 @@ struct rule {
- 	char *ren_mov;
- 	IF_FEATURE_MDEV_EXEC(char *r_cmd;)
- 	regex_t match;
-+	struct envmatch *envmatch;
- };
- 
- struct globals {
- 	int root_major, root_minor;
- 	smallint verbose;
- 	char *subsystem;
-+	char *subsys_env; /* for putenv("SUBSYSTEM=subsystem") */
- #if ENABLE_FEATURE_MDEV_CONF
- 	const char *filename;
- 	parser_t *parser;
-@@ -256,6 +283,7 @@ struct globals {
- 	unsigned rule_idx;
- #endif
- 	struct rule cur_rule;
-+	char timestr[sizeof("60.123456")];
- } FIX_ALIASING;
- #define G (*(struct globals*)&bb_common_bufsiz1)
- #define INIT_G() do { \
-@@ -267,15 +295,8 @@ struct globals {
- /* Prevent infinite loops in /sys symlinks */
- #define MAX_SYSFS_DEPTH 3
- 
--/* We use additional 64+ bytes in make_device() */
--#define SCRATCH_SIZE 80
--
--#if 0
--# define dbg(...) bb_error_msg(__VA_ARGS__)
--#else
--# define dbg(...) ((void)0)
--#endif
--
-+/* We use additional bytes in make_device() */
-+#define SCRATCH_SIZE 128
- 
- #if ENABLE_FEATURE_MDEV_CONF
- 
-@@ -288,14 +309,65 @@ static void make_default_cur_rule(void)
- 
- static void clean_up_cur_rule(void)
- {
-+	struct envmatch *e;
-+
- 	free(G.cur_rule.envvar);
-+	free(G.cur_rule.ren_mov);
- 	if (G.cur_rule.regex_compiled)
- 		regfree(&G.cur_rule.match);
--	free(G.cur_rule.ren_mov);
- 	IF_FEATURE_MDEV_EXEC(free(G.cur_rule.r_cmd);)
-+	e = G.cur_rule.envmatch;
-+	while (e) {
-+		free(e->envname);
-+		regfree(&e->match);
-+		e = e->next;
-+	}
- 	make_default_cur_rule();
- }
- 
-+/* In later versions, endofname is in libbb */
-+#define endofname mdev_endofname
-+static
-+const char* FAST_FUNC
-+endofname(const char *name)
-+{
-+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-+	if (!is_name(*name))
-+		return name;
-+	while (*++name) {
-+		if (!is_in_name(*name))
-+			break;
-+	}
-+	return name;
-+}
-+
-+static char *parse_envmatch_pfx(char *val)
-+{
-+	struct envmatch **nextp = &G.cur_rule.envmatch;
-+
-+	for (;;) {
-+		struct envmatch *e;
-+		char *semicolon;
-+		char *eq = strchr(val, '=');
-+		if (!eq /* || eq == val? */)
-+			return val;
-+		if (endofname(val) != eq)
-+			return val;
-+		semicolon = strchr(eq, ';');
-+		if (!semicolon)
-+			return val;
-+		/* ENVVAR=regex;... */
-+		*nextp = e = xzalloc(sizeof(*e));
-+		nextp = &e->next;
-+		e->envname = xstrndup(val, eq - val);
-+		*semicolon = '\0';
-+		xregcomp(&e->match, eq + 1, REG_EXTENDED);
-+		*semicolon = ';';
-+		val = semicolon + 1;
-+	}
-+}
-+
- static void parse_next_rule(void)
- {
- 	/* Note: on entry, G.cur_rule is set to default */
-@@ -308,12 +380,13 @@ static void parse_next_rule(void)
- 			break;
- 
- 		/* Fields: [-]regex uid:gid mode [alias] [cmd] */
--		dbg("token1:'%s'", tokens[1]);
-+		dbg3("token1:'%s'", tokens[1]);
- 
- 		/* 1st field */
- 		val = tokens[0];
- 		G.cur_rule.keep_matching = ('-' == val[0]);
- 		val += G.cur_rule.keep_matching; /* swallow leading dash */
-+		val = parse_envmatch_pfx(val);
- 		if (val[0] == '@') {
- 			/* @major,minor[-minor2] */
- 			/* (useful when name is ambiguous:
-@@ -328,8 +401,10 @@ static void parse_next_rule(void)
- 			if (sc == 2)
- 				G.cur_rule.min1 = G.cur_rule.min0;
- 		} else {
-+			char *eq = strchr(val, '=');
- 			if (val[0] == '$') {
--				char *eq = strchr(++val, '=');
-+				/* $ENVVAR=regex ... */
-+				val++;
- 				if (!eq) {
- 					bb_error_msg("bad $envvar=regex on line %d", G.parser->lineno);
- 					goto next_rule;
-@@ -373,7 +448,7 @@ static void parse_next_rule(void)
- 		clean_up_cur_rule();
- 	} /* while (config_read) */
- 
--	dbg("config_close(G.parser)");
-+	dbg3("config_close(G.parser)");
- 	config_close(G.parser);
- 	G.parser = NULL;
- 
-@@ -390,7 +465,7 @@ static const struct rule *next_rule(void
- 
- 	/* Open conf file if we didn't do it yet */
- 	if (!G.parser && G.filename) {
--		dbg("config_open('%s')", G.filename);
-+		dbg3("config_open('%s')", G.filename);
- 		G.parser = config_open2(G.filename, fopen_for_read);
- 		G.filename = NULL;
- 	}
-@@ -399,7 +474,7 @@ static const struct rule *next_rule(void
- 		/* mdev -s */
- 		/* Do we have rule parsed already? */
- 		if (G.rule_vec[G.rule_idx]) {
--			dbg("< G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
-+			dbg3("< G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
- 			return G.rule_vec[G.rule_idx++];
- 		}
- 		make_default_cur_rule();
-@@ -416,13 +491,28 @@ static const struct rule *next_rule(void
- 			rule = memcpy(xmalloc(sizeof(G.cur_rule)), &G.cur_rule, sizeof(G.cur_rule));
- 			G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx);
- 			G.rule_vec[G.rule_idx++] = rule;
--			dbg("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
-+			dbg3("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]);
- 		}
- 	}
- 
- 	return rule;
- }
- 
-+static int env_matches(struct envmatch *e)
-+{
-+	while (e) {
-+		int r;
-+		char *val = getenv(e->envname);
-+		if (!val)
-+			return 0;
-+		r = regexec(&e->match, val, /*size*/ 0, /*range[]*/ NULL, /*eflags*/ 0);
-+		if (r != 0) /* no match */
-+			return 0;
-+		e = e->next;
-+	}
-+	return 1;
-+}
-+
- #else
- 
- # define next_rule() (&G.cur_rule)
-@@ -468,7 +558,7 @@ static char *build_alias(char *alias, co
- 
- /* mknod in /dev based on a path like "/sys/block/hda/hda1"
-  * NB1: path parameter needs to have SCRATCH_SIZE scratch bytes
-- * after NUL, but we promise to not mangle (IOW: to restore if needed)
-+ * after NUL, but we promise to not mangle (IOW: to restore NUL if needed)
-  * path string.
-  * NB2: "mdev -s" may call us many times, do not leak memory/fds!
-  *
-@@ -478,9 +568,7 @@ static char *build_alias(char *alias, co
- static void make_device(char *device_name, char *path, int operation)
- {
- 	int major, minor, type, len;
--
--	if (G.verbose)
--		bb_error_msg("device: %s, %s", device_name, path);
-+	char *path_end = path + strlen(path);
- 
- 	/* Try to read major/minor string.  Note that the kernel puts \n after
- 	 * the data, so we don't need to worry about null terminating the string
-@@ -489,29 +577,51 @@ static void make_device(char *device_nam
- 	 */
- 	major = -1;
- 	if (operation == OP_add) {
--		char *dev_maj_min = path + strlen(path);
--
--		strcpy(dev_maj_min, "/dev");
--		len = open_read_close(path, dev_maj_min + 1, 64);
--		*dev_maj_min = '\0';
-+		strcpy(path_end, "/dev");
-+		len = open_read_close(path, path_end + 1, SCRATCH_SIZE - 1);
-+		*path_end = '\0';
- 		if (len < 1) {
- 			if (!ENABLE_FEATURE_MDEV_EXEC)
- 				return;
- 			/* no "dev" file, but we can still run scripts
- 			 * based on device name */
--		} else if (sscanf(++dev_maj_min, "%u:%u", &major, &minor) == 2) {
--			if (G.verbose)
--				bb_error_msg("maj,min: %u,%u", major, minor);
-+		} else if (sscanf(path_end + 1, "%u:%u", &major, &minor) == 2) {
-+			dbg1("dev %u,%u", major, minor);
- 		} else {
- 			major = -1;
- 		}
- 	}
- 	/* else: for delete, -1 still deletes the node, but < -1 suppresses that */
- 
--	/* Determine device name, type, major and minor */
--	if (!device_name)
--		device_name = (char*) bb_basename(path);
--	/* http://kernel.org/doc/pending/hotplug.txt says that only
-+	/* Determine device name */
-+	if (!device_name) {
-+		/*
-+		 * There was no $DEVNAME envvar (for example, mdev -s never has).
-+		 * But it is very useful: it contains the *path*, not only basename,
-+		 * Thankfully, uevent file has it.
-+		 * Example of .../sound/card0/controlC0/uevent file on Linux-3.7.7:
-+		 * MAJOR=116
-+		 * MINOR=7
-+		 * DEVNAME=snd/controlC0
-+		 */
-+		strcpy(path_end, "/uevent");
-+		len = open_read_close(path, path_end + 1, SCRATCH_SIZE - 1);
-+		if (len < 0)
-+			len = 0;
-+		*path_end = '\0';
-+		path_end[1 + len] = '\0';
-+		device_name = strstr(path_end + 1, "\nDEVNAME=");
-+		if (device_name) {
-+			device_name += sizeof("\nDEVNAME=")-1;
-+			strchrnul(device_name, '\n')[0] = '\0';
-+		} else {
-+			/* Fall back to just basename */
-+			device_name = (char*) bb_basename(path);
-+		}
-+	}
-+	/* Determine device type */
-+	/*
-+	 * http://kernel.org/doc/pending/hotplug.txt says that only
- 	 * "/sys/block/..." is for block devices. "/sys/bus" etc is not.
- 	 * But since 2.6.25 block devices are also in /sys/class/block.
- 	 * We use strstr("/block/") to forestall future surprises.
-@@ -537,6 +647,8 @@ static void make_device(char *device_nam
- 		rule = next_rule();
- 
- #if ENABLE_FEATURE_MDEV_CONF
-+		if (!env_matches(rule->envmatch))
-+			continue;
- 		if (rule->maj >= 0) {  /* @maj,min rule */
- 			if (major != rule->maj)
- 				continue;
-@@ -547,7 +659,7 @@ static void make_device(char *device_nam
- 		}
- 		if (rule->envvar) { /* $envvar=regex rule */
- 			str_to_match = getenv(rule->envvar);
--			dbg("getenv('%s'):'%s'", rule->envvar, str_to_match);
-+			dbg3("getenv('%s'):'%s'", rule->envvar, str_to_match);
- 			if (!str_to_match)
- 				continue;
- 		}
-@@ -555,7 +667,7 @@ static void make_device(char *device_nam
- 
- 		if (rule->regex_compiled) {
- 			int regex_match = regexec(&rule->match, str_to_match, ARRAY_SIZE(off), off, 0);
--			dbg("regex_match for '%s':%d", str_to_match, regex_match);
-+			dbg3("regex_match for '%s':%d", str_to_match, regex_match);
- 			//bb_error_msg("matches:");
- 			//for (int i = 0; i < ARRAY_SIZE(off); i++) {
- 			//	if (off[i].rm_so < 0) continue;
-@@ -574,9 +686,8 @@ static void make_device(char *device_nam
- 		}
- 		/* else: it's final implicit "match-all" rule */
-  rule_matches:
-+		dbg2("rule matched, line %d", G.parser ? G.parser->lineno : -1);
- #endif
--		dbg("rule matched");
--
- 		/* Build alias name */
- 		alias = NULL;
- 		if (ENABLE_FEATURE_MDEV_RENAME && rule->ren_mov) {
-@@ -619,34 +730,30 @@ static void make_device(char *device_nam
- 				}
- 			}
- 		}
--		dbg("alias:'%s'", alias);
-+		dbg3("alias:'%s'", alias);
- 
- 		command = NULL;
- 		IF_FEATURE_MDEV_EXEC(command = rule->r_cmd;)
- 		if (command) {
--			const char *s = "$@*";
--			const char *s2 = strchr(s, command[0]);
--
- 			/* Are we running this command now?
--			 * Run $cmd on delete, @cmd on create, *cmd on both
-+			 * Run @cmd on create, $cmd on delete, *cmd on any
- 			 */
--			if (s2 - s != (operation == OP_remove) || *s2 == '*') {
--				/* We are here if: '*',
--				 * or: '@' and delete = 0,
--				 * or: '$' and delete = 1
--				 */
-+			if ((command[0] == '@' && operation == OP_add)
-+			 || (command[0] == '$' && operation == OP_remove)
-+			 || (command[0] == '*')
-+			) {
- 				command++;
- 			} else {
- 				command = NULL;
- 			}
- 		}
--		dbg("command:'%s'", command);
-+		dbg3("command:'%s'", command);
- 
- 		/* "Execute" the line we found */
- 		node_name = device_name;
- 		if (ENABLE_FEATURE_MDEV_RENAME && alias) {
- 			node_name = alias = build_alias(alias, device_name);
--			dbg("alias2:'%s'", alias);
-+			dbg3("alias2:'%s'", alias);
- 		}
- 
- 		if (operation == OP_add && major >= 0) {
-@@ -656,8 +763,17 @@ static void make_device(char *device_nam
- 				mkdir_recursive(node_name);
- 				*slash = '/';
- 			}
--			if (G.verbose)
--				bb_error_msg("mknod: %s (%d,%d) %o", node_name, major, minor, rule->mode | type);
-+			if (ENABLE_FEATURE_MDEV_CONF) {
-+				dbg1("mknod %s (%d,%d) %o"
-+					" %u:%u",
-+					node_name, major, minor, rule->mode | type,
-+					rule->ugid.uid, rule->ugid.gid
-+				);
-+			} else {
-+				dbg1("mknod %s (%d,%d) %o",
-+					node_name, major, minor, rule->mode | type
-+				);
-+			}
- 			if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
- 				bb_perror_msg("can't create '%s'", node_name);
- 			if (ENABLE_FEATURE_MDEV_CONF) {
-@@ -671,8 +787,7 @@ static void make_device(char *device_nam
- //TODO: on devtmpfs, device_name already exists and symlink() fails.
- //End result is that instead of symlink, we have two nodes.
- //What should be done?
--					if (G.verbose)
--						bb_error_msg("symlink: %s", device_name);
-+					dbg1("symlink: %s", device_name);
- 					symlink(node_name, device_name);
- 				}
- 			}
-@@ -681,27 +796,21 @@ static void make_device(char *device_nam
- 		if (ENABLE_FEATURE_MDEV_EXEC && command) {
- 			/* setenv will leak memory, use putenv/unsetenv/free */
- 			char *s = xasprintf("%s=%s", "MDEV", node_name);
--			char *s1 = xasprintf("%s=%s", "SUBSYSTEM", G.subsystem);
- 			putenv(s);
--			putenv(s1);
--			if (G.verbose)
--				bb_error_msg("running: %s", command);
-+			dbg1("running: %s", command);
- 			if (system(command) == -1)
- 				bb_perror_msg("can't run '%s'", command);
--			bb_unsetenv_and_free(s1);
- 			bb_unsetenv_and_free(s);
- 		}
- 
- 		if (operation == OP_remove && major >= -1) {
- 			if (ENABLE_FEATURE_MDEV_RENAME && alias) {
- 				if (aliaslink == '>') {
--					if (G.verbose)
--						bb_error_msg("unlink: %s", device_name);
-+					dbg1("unlink: %s", device_name);
- 					unlink(device_name);
- 				}
- 			}
--			if (G.verbose)
--				bb_error_msg("unlink: %s", node_name);
-+			dbg1("unlink: %s", node_name);
- 			unlink(node_name);
- 		}
- 
-@@ -746,9 +855,16 @@ static int FAST_FUNC dirAction(const cha
- 	 * under /sys/class/ */
- 	if (1 == depth) {
- 		free(G.subsystem);
-+		if (G.subsys_env) {
-+			bb_unsetenv_and_free(G.subsys_env);
-+			G.subsys_env = NULL;
-+		}
- 		G.subsystem = strrchr(fileName, '/');
--		if (G.subsystem)
-+		if (G.subsystem) {
- 			G.subsystem = xstrdup(G.subsystem + 1);
-+			G.subsys_env = xasprintf("%s=%s", "SUBSYSTEM", G.subsystem);
-+			putenv(G.subsys_env);
-+		}
- 	}
- 
- 	return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
-@@ -813,12 +929,107 @@ static void load_firmware(const char *fi
- 		full_write(loading_fd, "-1", 2);
- 
-  out:
-+	xchdir("/dev");
- 	if (ENABLE_FEATURE_CLEAN_UP) {
- 		close(firmware_fd);
- 		close(loading_fd);
- 	}
- }
- 
-+static char *curtime(void)
-+{
-+	struct timeval tv;
-+	gettimeofday(&tv, NULL);
-+	sprintf(G.timestr, "%u.%06u", (unsigned)tv.tv_sec % 60, (unsigned)tv.tv_usec);
-+	return G.timestr;
-+}
-+
-+static void open_mdev_log(const char *seq, unsigned my_pid)
-+{
-+	int logfd = open("mdev.log", O_WRONLY | O_APPEND);
-+	if (logfd >= 0) {
-+		xmove_fd(logfd, STDERR_FILENO);
-+		G.verbose = 2;
-+		applet_name = xasprintf("%s[%s]", applet_name, seq ? seq : utoa(my_pid));
-+	}
-+}
-+
-+/* If it exists, does /dev/mdev.seq match $SEQNUM?
-+ * If it does not match, earlier mdev is running
-+ * in parallel, and we need to wait.
-+ * Active mdev pokes us with SIGCHLD to check the new file.
-+ */
-+static int
-+wait_for_seqfile(const char *seq)
-+{
-+	/* We time out after 2 sec */
-+	static const struct timespec ts = { 0, 32*1000*1000 };
-+	int timeout = 2000 / 32;
-+	int seq_fd = -1;
-+	int do_once = 1;
-+	sigset_t set_CHLD;
-+
-+	sigemptyset(&set_CHLD);
-+	sigaddset(&set_CHLD, SIGCHLD);
-+	sigprocmask(SIG_BLOCK, &set_CHLD, NULL);
-+
-+	for (;;) {
-+		int seqlen;
-+		char seqbuf[sizeof(int)*3 + 2];
-+
-+		if (seq_fd < 0) {
-+			seq_fd = open("mdev.seq", O_RDWR);
-+			if (seq_fd < 0)
-+				break;
-+		}
-+		seqlen = pread(seq_fd, seqbuf, sizeof(seqbuf) - 1, 0);
-+		if (seqlen < 0) {
-+			close(seq_fd);
-+			seq_fd = -1;
-+			break;
-+		}
-+		seqbuf[seqlen] = '\0';
-+		if (seqbuf[0] == '\n') {
-+			/* seed file: write out seq ASAP */
-+			xwrite_str(seq_fd, seq);
-+			xlseek(seq_fd, 0, SEEK_SET);
-+			dbg2("first seq written");
-+			break;
-+		}
-+		if (strcmp(seq, seqbuf) == 0) {
-+			/* correct idx */
-+			break;
-+		}
-+		if (do_once) {
-+			dbg2("%s waiting for '%s'", curtime(), seqbuf);
-+			do_once = 0;
-+		}
-+		if (sigtimedwait(&set_CHLD, NULL, &ts) >= 0) {
-+			dbg3("woken up");
-+			continue; /* don't decrement timeout! */
-+		}
-+		if (--timeout == 0) {
-+			dbg1("%s waiting for '%s'", "timed out", seqbuf);
-+			break;
-+		}
-+	}
-+	sigprocmask(SIG_UNBLOCK, &set_CHLD, NULL);
-+	return seq_fd;
-+}
-+
-+static void signal_mdevs(unsigned my_pid)
-+{
-+	procps_status_t* p = NULL;
-+	while ((p = procps_scan(p, PSSCAN_ARGV0)) != NULL) {
-+		if (p->pid != my_pid
-+		 && p->argv0
-+		 && strcmp(bb_basename(p->argv0), "mdev") == 0
-+		) {
-+			kill(p->pid, SIGCHLD);
-+		}
-+	}
-+}
-+
- int mdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int mdev_main(int argc UNUSED_PARAM, char **argv)
- {
-@@ -840,8 +1051,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 	xchdir("/dev");
- 
- 	if (argv[1] && strcmp(argv[1], "-s") == 0) {
--		/* Scan:
--		 * mdev -s
-+		/*
-+		 * Scan: mdev -s
- 		 */
- 		struct stat st;
- 
-@@ -853,6 +1064,8 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 		G.root_major = major(st.st_dev);
- 		G.root_minor = minor(st.st_dev);
- 
-+		putenv((char*)"ACTION=add");
-+
- 		/* ACTION_FOLLOWLINKS is needed since in newer kernels
- 		 * /sys/block/loop* (for example) are symlinks to dirs,
- 		 * not real directories.
-@@ -878,11 +1091,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 		char *action;
- 		char *env_devname;
- 		char *env_devpath;
-+		unsigned my_pid;
-+		int seq_fd;
- 		smalluint op;
- 
- 		/* Hotplug:
- 		 * env ACTION=... DEVPATH=... SUBSYSTEM=... [SEQNUM=...] mdev
--		 * ACTION can be "add" or "remove"
-+		 * ACTION can be "add", "remove", "change"
- 		 * DEVPATH is like "/block/sda" or "/class/input/mice"
- 		 */
- 		action = getenv("ACTION");
-@@ -893,39 +1108,20 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 		if (!action || !env_devpath /*|| !G.subsystem*/)
- 			bb_show_usage();
- 		fw = getenv("FIRMWARE");
--		/* If it exists, does /dev/mdev.seq match $SEQNUM?
--		 * If it does not match, earlier mdev is running
--		 * in parallel, and we need to wait */
- 		seq = getenv("SEQNUM");
--		if (seq) {
--			int timeout = 2000 / 32; /* 2000 msec */
--			do {
--				int seqlen;
--				char seqbuf[sizeof(int)*3 + 2];
--
--				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
--				if (seqlen < 0) {
--					seq = NULL;
--					break;
--				}
--				seqbuf[seqlen] = '\0';
--				if (seqbuf[0] == '\n' /* seed file? */
--				 || strcmp(seq, seqbuf) == 0 /* correct idx? */
--				) {
--					break;
--				}
--				usleep(32*1000);
--			} while (--timeout);
--		}
- 
--		{
--			int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND);
--			if (logfd >= 0) {
--				xmove_fd(logfd, STDERR_FILENO);
--				G.verbose = 1;
--				bb_error_msg("seq: %s action: %s", seq, action);
--			}
--		}
-+		my_pid = getpid();
-+		open_mdev_log(seq, my_pid);
-+
-+		seq_fd = seq ? wait_for_seqfile(seq) : -1;
-+
-+		dbg1("%s "
-+			"ACTION:%s SUBSYSTEM:%s DEVNAME:%s DEVPATH:%s"
-+			"%s%s",
-+			curtime(),
-+			action, G.subsystem, env_devname, env_devpath,
-+			fw ? " FW:" : "", fw ? fw : ""
-+		);
- 
- 		snprintf(temp, PATH_MAX, "/sys%s", env_devpath);
- 		if (op == OP_remove) {
-@@ -935,16 +1131,18 @@ int mdev_main(int argc UNUSED_PARAM, cha
- 			if (!fw)
- 				make_device(env_devname, temp, op);
- 		}
--		else if (op == OP_add) {
-+		else {
- 			make_device(env_devname, temp, op);
- 			if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
--				if (fw)
-+				if (op == OP_add && fw)
- 					load_firmware(fw, temp);
- 			}
- 		}
- 
--		if (seq) {
--			xopen_xwrite_close("mdev.seq", utoa(xatou(seq) + 1));
-+		dbg1("%s exiting", curtime());
-+		if (seq_fd >= 0) {
-+			xwrite_str(seq_fd, utoa(xatou(seq) + 1));
-+			signal_mdevs(my_pid);
- 		}
- 	}
- 
diff --git a/package/busybox/1.21.0/busybox-1.21.0-ntfs.patch b/package/busybox/1.21.0/busybox-1.21.0-ntfs.patch
deleted file mode 100644
index e119280f97..0000000000
--- a/package/busybox/1.21.0/busybox-1.21.0-ntfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.21.0/util-linux/volume_id/ntfs.c
-+++ busybox-1.21.0-ntfs/util-linux/volume_id/ntfs.c
-@@ -150,7 +150,7 @@ int FAST_FUNC volume_id_probe_ntfs(struc
- 
- 		attr = (struct file_attribute*) &buf[attr_off];
- 		attr_type = le32_to_cpu(attr->type);
--		attr_len = le16_to_cpu(attr->len);
-+		attr_len = le32_to_cpu(attr->len);
- 		val_off = le16_to_cpu(attr->value_offset);
- 		val_len = le32_to_cpu(attr->value_len);
- 		attr_off += attr_len;
diff --git a/package/busybox/1.21.0/busybox-1.21.0-platform.patch b/package/busybox/1.21.0/busybox-1.21.0-platform.patch
deleted file mode 100644
index 9be6cb8f21..0000000000
--- a/package/busybox/1.21.0/busybox-1.21.0-platform.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- busybox-1.21.0/archival/libarchive/decompress_unxz.c
-+++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c
-@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *
- /* We use arch-optimized unaligned accessors */
- #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
- #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
--#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
--#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
-+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
-+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
- 
- #include "unxz/xz_dec_bcj.c"
- #include "unxz/xz_dec_lzma2.c"
---- busybox-1.21.0/include/platform.h
-+++ busybox-1.21.0-platform/include/platform.h
-@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI
- # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
- # define move_to_unaligned16(u16p, v) do { \
- 	uint16_t __t = (v); \
--	memcpy((u16p), &__t, 4); \
-+	memcpy((u16p), &__t, 2); \
- } while (0)
- # define move_to_unaligned32(u32p, v) do { \
- 	uint32_t __t = (v); \
diff --git a/package/busybox/1.21.0/busybox-1.21.0-xz.patch b/package/busybox/1.21.0/busybox-1.21.0-xz.patch
deleted file mode 100644
index 56ba1a2731..0000000000
--- a/package/busybox/1.21.0/busybox-1.21.0-xz.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- busybox-1.21.0/archival/libarchive/decompress_unxz.c
-+++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c
-@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *
- IF_DESKTOP(long long) int FAST_FUNC
- unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
- {
-+	enum xz_ret xz_result;
- 	struct xz_buf iobuf;
- 	struct xz_dec *state;
- 	unsigned char *membuf;
-@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t
- 	/* Limit memory usage to about 64 MiB. */
- 	state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
- 
-+	xz_result = X_OK;
- 	while (1) {
--		enum xz_ret r;
--
- 		if (iobuf.in_pos == iobuf.in_size) {
- 			int rd = safe_read(src_fd, membuf, BUFSIZ);
- 			if (rd < 0) {
-@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t
- 				total = -1;
- 				break;
- 			}
-+			if (rd == 0 && xz_result == XZ_STREAM_END)
-+				break;
- 			iobuf.in_size = rd;
- 			iobuf.in_pos = 0;
- 		}
-+		if (xz_result == XZ_STREAM_END) {
-+			/*
-+			 * Try to start decoding next concatenated stream.
-+			 * Stream padding must always be a multiple of four
-+			 * bytes to preserve four-byte alignment. To keep the
-+			 * code slightly smaller, we aren't as strict here as
-+			 * the .xz spec requires. We just skip all zero-bytes
-+			 * without checking the alignment and thus can accept
-+			 * files that aren't valid, e.g. the XZ utils test
-+			 * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
-+			 */
-+			do {
-+				if (membuf[iobuf.in_pos] != 0) {
-+					xz_dec_reset(state);
-+					goto do_run;
-+				}
-+				iobuf.in_pos++;
-+			} while (iobuf.in_pos < iobuf.in_size);
-+		}
-+ do_run:
- //		bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
- //				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
--		r = xz_dec_run(state, &iobuf);
-+		xz_result = xz_dec_run(state, &iobuf);
- //		bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
--//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
-+//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
- 		if (iobuf.out_pos) {
- 			xwrite(dst_fd, iobuf.out, iobuf.out_pos);
- 			IF_DESKTOP(total += iobuf.out_pos;)
- 			iobuf.out_pos = 0;
- 		}
--		if (r == XZ_STREAM_END) {
--			break;
-+		if (xz_result == XZ_STREAM_END) {
-+			/*
-+			 * Can just "break;" here, if not for concatenated
-+			 * .xz streams.
-+			 * Checking for padding may require buffer
-+			 * replenishment. Can't do it here.
-+			 */
-+			continue;
- 		}
--		if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
-+		if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
- 			bb_error_msg("corrupted data");
- 			total = -1;
- 			break;
- 		}
- 	}
-+
- 	xz_dec_end(state);
- 	free(membuf);
- 
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 4d9899dbff..ba521e1e0e 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -35,7 +35,7 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X
 	default "1.20.2"	if BR2_BUSYBOX_VERSION_1_20_X
-	default "1.21.0"	if BR2_BUSYBOX_VERSION_1_21_X
+	default "1.21.1"	if BR2_BUSYBOX_VERSION_1_21_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"

From 0cf8595f2996b46143c1a95d3bd6f4e131a94b94 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 29 Jun 2013 09:27:04 -0400
Subject: [PATCH 5527/6849] dbus: ensure directory exists before installing
 symlink

If you use a custom target skeleton with no /var/lib directory,
then the symlink installation in dbus.mk will fail.  This patch
fixes this issue by creating /var/lib before creating a symlink
there.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dbus/dbus.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index a855f059a7..57274a0cd9 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -66,6 +66,7 @@ DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES
 endif
 
 define DBUS_INSTALL_TARGET_FIXUP
+	mkdir -p $(TARGET_DIR)/var/lib
 	rm -rf $(TARGET_DIR)/var/lib/dbus
 	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
 	$(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus

From 6e01ba1dc2ce282f9af2d859e37b88e674070b91 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 28 Jun 2013 21:09:10 -0300
Subject: [PATCH 5528/6849] tzdata/zic: bump to version 2013c and switch SITE

Bump to version 2013c and switch to the FTP site since the HTTP one is
unfortunately serving .tar.gz files that are just plain tar files
(uncompressed).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tzdata/tzdata.mk | 4 ++--
 package/zic/zic.mk       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
index 4a9affe022..26f623d626 100644
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TZDATA_VERSION = 2012j
+TZDATA_VERSION = 2013c
 TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
-TZDATA_SITE = http://www.iana.org/time-zones/repository/releases
+TZDATA_SITE = ftp://ftp.iana.org/tz/releases
 TZDATA_DEPENDENCIES = host-zic
 TZDATA_LICENSE = Public domain
 
diff --git a/package/zic/zic.mk b/package/zic/zic.mk
index 7a06a58d88..3d56df1c7c 100644
--- a/package/zic/zic.mk
+++ b/package/zic/zic.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-ZIC_VERSION = 2012j
+ZIC_VERSION = 2013c
 ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz
-ZIC_SITE = http://www.iana.org/time-zones/repository/releases
+ZIC_SITE = ftp://ftp.iana.org/tz/releases
 ZIC_LICENSE = Public domain
 
 # Don't strip any path components during extraction.

From 56c982d10744f91be6b2312f1e04e62c64fc954d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Jun 2013 08:06:45 -0300
Subject: [PATCH 5529/6849] autoconf: bump to version 2.69

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../autoconf-dont-add-dirty-to-version.patch  | 30 +++++++++----------
 package/autoconf/autoconf.mk                  |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/package/autoconf/autoconf-dont-add-dirty-to-version.patch b/package/autoconf/autoconf-dont-add-dirty-to-version.patch
index 38ac16382f..e8d9f6a29d 100644
--- a/package/autoconf/autoconf-dont-add-dirty-to-version.patch
+++ b/package/autoconf/autoconf-dont-add-dirty-to-version.patch
@@ -10,21 +10,19 @@ commonly done in buildroot).
 The affect is that autoconf gets built as being version 2.65-dirty, which
 breaks programs (like Python) which explicitly checks for autoconf-2.65.
 
+[Gustavo: update for autoconf 2.69]
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- build-aux/git-version-gen |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-Index: autoconf-2.65/build-aux/git-version-gen
-===================================================================
---- autoconf-2.65.orig/build-aux/git-version-gen
-+++ autoconf-2.65/build-aux/git-version-gen
-@@ -135,7 +135,7 @@ case "$dirty" in
-     *) # Append the suffix only if there isn't one already.
- 	case $v in
- 	  *-dirty) ;;
--	  *) v="$v-dirty" ;;
-+	  #*) v="$v-dirty" ;;
- 	esac ;;
- esac
- 
+diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen
+--- autoconf-2.69.orig/build-aux/git-version-gen	2013-06-27 11:31:02.340200154 -0300
++++ autoconf-2.69/build-aux/git-version-gen	2013-06-27 11:31:13.734577033 -0300
+@@ -203,7 +203,7 @@
+       *) # Append the suffix only if there isn't one already.
+           case $v in
+             *-dirty) ;;
+-            *) v="$v-dirty" ;;
++            #*) v="$v-dirty" ;;
+           esac ;;
+   esac
+ fi
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index bc6f65fc95..2482552561 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUTOCONF_VERSION = 2.68
+AUTOCONF_VERSION = 2.69
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
 AUTOCONF_LICENSE = GPLv3+ with exceptions

From a8db50a7ab75ddb9b90195fbfaa3c46bd6673fd1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 29 Jun 2013 08:06:46 -0300
Subject: [PATCH 5530/6849] imagemagick: bump to version 6.8.6-2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/imagemagick/imagemagick.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index e2259e6a01..12b9f4b253 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-IMAGEMAGICK_MAJOR = 6.7.8
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8
+IMAGEMAGICK_MAJOR = 6.8.6
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-2
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
 # The official ImageMagick site only keeps the latest versions
 # available, which is annoying. Use an alternate site that keeps all

From daee3e30baa60dcb84d5b3ac44c32d8adea94a11 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 10:19:39 +0200
Subject: [PATCH 5531/6849] haserl: fix download URLs

The 0.8.0 version is at /projects/haserl/haserl/0.8.0, and 0.9.x versions
at /projects/haserl/haserl-devel/.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/haserl/haserl.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index 767ce24f30..56240c7f81 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -5,7 +5,11 @@
 ################################################################################
 
 HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel/$(HASERL_VERSION)
+ifeq ($(BR2_PACKAGE_HASERL_VERSION_0_8_X),y)
+HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl/$(HASERL_VERSION)
+else
+HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel
+endif
 HASERL_LICENSE = GPLv2
 HASERL_LICENSE_FILES = COPYING
 

From 7b2ae7feb1900e456757ad6b55fc9314927e87a9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 10:17:43 +0200
Subject: [PATCH 5532/6849] haserl: bump 0.9.x version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../haserl-add-haserl_lualib.inc.patch}                         | 0
 package/haserl/Config.in                                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/haserl/{0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch => 0.9.30/haserl-add-haserl_lualib.inc.patch} (100%)

diff --git a/package/haserl/0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch b/package/haserl/0.9.30/haserl-add-haserl_lualib.inc.patch
similarity index 100%
rename from package/haserl/0.9.29/haserl-0.9.29-add-haserl_lualib.inc.patch
rename to package/haserl/0.9.30/haserl-add-haserl_lualib.inc.patch
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 36bfca75c5..2d5cacfeb5 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -39,4 +39,4 @@ endchoice
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.29"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.30"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

From 3911e67151bfa5885e6e4c7a93e02c89ccac069f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 30 Jun 2013 00:23:26 -0300
Subject: [PATCH 5533/6849] icu: security bump to version 51.2

Fixes CVE-2011-4599, CVE 2013-0900, CVE-2013-1569, CVE-2013-2383,
CVE-2013-2384, CVE-2013-2419.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../icu/icu-workaround-toolchain-bugs.patch   | 32 +++++++++----------
 package/icu/icu.mk                            |  5 +--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/package/icu/icu-workaround-toolchain-bugs.patch b/package/icu/icu-workaround-toolchain-bugs.patch
index df9d5283ff..64d67a0c3b 100644
--- a/package/icu/icu-workaround-toolchain-bugs.patch
+++ b/package/icu/icu-workaround-toolchain-bugs.patch
@@ -10,27 +10,27 @@ is trivial in this case. So it will avoid our users falling into this
 internal compiler error, and allow our autobuilders to test more
 packages using this Sourcery CodeBench toolchain.qq
 
+[Gustavo: update for ICU4C 51.2]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/source/configure
-===================================================================
---- a/source/configure
-+++ b/source/configure
-@@ -4320,7 +4320,7 @@
-                 echo "# Note: We are not using '-ansi' with HP/UX GCC because int64_t broke, see <http://bugs.icu-project.org/trac/ticket/8493>"
-                 CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
-             *)
--                CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
-+                CFLAGS="$CFLAGS -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
-             esac
+diff -Nura icu.orig/source/configure icu/source/configure
+--- icu.orig/source/configure	2013-05-23 17:06:32.000000000 -0300
++++ icu/source/configure	2013-06-29 15:43:04.202320953 -0300
+@@ -4066,7 +4066,7 @@
+         then
+             # Do not use -ansi. It limits us to C90, and it breaks some platforms.
+             # We use -std=c99 to disable the gnu99 defaults and its associated warnings
+-            CFLAGS="$CFLAGS -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
++            CFLAGS="$CFLAGS -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
          else
              case "${host}" in
-@@ -4333,7 +4333,7 @@
+             *-*-cygwin)
+@@ -4078,7 +4078,7 @@
          fi
          if test "$GXX" = yes
          then
--            CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
-+            CXXFLAGS="$CXXFLAGS -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+-            CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
++            CXXFLAGS="$CXXFLAGS -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+         else
              case "${host}" in
-             *-*-solaris*)
-                 CXXFLAGS="$CXXFLAGS -D__STDC__=0";;
+             *-*-cygwin)
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 00eacc7544..7954eb094f 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ICU_VERSION = 4.8.1.1
+ICU_VERSION = 51.2
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_LICENSE = ICU License
@@ -20,7 +20,8 @@ HOST_ICU_CONF_OPT = \
 	--disable-tests \
 	--disable-extras \
 	--disable-icuio \
-	--disable-layout
+	--disable-layout \
+	--disable-renaming
 ICU_MAKE = $(MAKE1)
 ICU_SUBDIR = source
 HOST_ICU_SUBDIR = source

From 17c956b9882a6bc407298ff7a7e8ec88b8ea74fa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 10:30:37 +0200
Subject: [PATCH 5534/6849] pcsc-lite: fix download URL

Fixes http://autobuild.buildroot.net/results/832/832cb2f814fcdd30387b76622a75d4e6addbdc47/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pcsc-lite/pcsc-lite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 5eab4e7167..c126b3f906 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -6,7 +6,7 @@
 
 PCSC_LITE_VERSION = 1.8.6
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
-PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/3757
+PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/3757
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
 PCSC_LITE_LICENSE = BSD-3c

From 2d78b4dc89ebe4047d63402cb347218ac754a34d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 10:31:31 +0200
Subject: [PATCH 5535/6849] ccid: fix download URL

Fixes http://autobuild.buildroot.net/results/ded/ded58e623bb2d1c95a7b46fc85d5aacdac5da01c/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ccid/ccid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index d6c221336a..6604bc1c3e 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -6,7 +6,7 @@
 
 CCID_VERSION = 1.4.8
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
-CCID_SITE = http://alioth.debian.org/frs/download.php/3768
+CCID_SITE = http://alioth.debian.org/frs/download.php/file/3768
 CCID_INSTALL_STAGING = YES
 CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
 

From df91b9eb6e8d6181d9c49834a1444344f8814e53 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 10:32:37 +0200
Subject: [PATCH 5536/6849] libhid: fix download URL

Fixes http://autobuild.buildroot.net/results/c65/c652df3854dec40e6420cba8a6d48c8ddc9b1ecd/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libhid/libhid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 530ef50f1e..4cecd34233 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -6,7 +6,7 @@
 
 LIBHID_VERSION = 0.2.16
 LIBHID_SOURCE = libhid-$(LIBHID_VERSION).tar.gz
-LIBHID_SITE = http://alioth.debian.org/frs/download.php/1958
+LIBHID_SITE = http://alioth.debian.org/frs/download.php/file/1958
 LIBHID_DEPENDENCIES = libusb-compat libusb
 LIBHID_INSTALL_STAGING = YES
 LIBHID_AUTORECONF = YES

From 27215647240731757342930bb177461438b06c53 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 13:50:36 +0200
Subject: [PATCH 5537/6849] gst1-plugins-ugly: libdvdread needs largefile
 support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-ugly/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/multimedia/gst1-plugins-ugly/Config.in b/package/multimedia/gst1-plugins-ugly/Config.in
index a6ca387c66..0fb3e9213e 100644
--- a/package/multimedia/gst1-plugins-ugly/Config.in
+++ b/package/multimedia/gst1-plugins-ugly/Config.in
@@ -41,10 +41,14 @@ comment "plugins with external dependencies (there may be more available)"
 
 config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD
 	bool "dvdread"
+	depends on BR2_LARGEFILE # libdvdread
 	select BR2_PACKAGE_LIBDVDREAD
 	help
 	  Access a DVD with dvdread
 
+comment "dvdread requires a toolchain with largefile support"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
 	bool "lame (*.mp3 audio encoder)"
 	select BR2_PACKAGE_LAME

From 9ad42a480126a4cc466940318c600548bf854e9d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 15:28:31 +0200
Subject: [PATCH 5538/6849] sane-backends: fix download URL

Fixes http://autobuild.buildroot.net/results/134/134d081dfb514d3bc20ef68f4ebec7d7e4bba8dc/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sane-backends/sane-backends.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 96a6100cfd..3b7076e2ee 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -6,7 +6,7 @@
 
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
-SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503
+SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/3503
 SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)

From 695bd9efe1a10ddb7d963713a26bafcd7ebe9ddf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 30 Jun 2013 18:04:21 +0200
Subject: [PATCH 5539/6849] axel: fix download URL

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/axel/axel.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index e8fa756513..e8be1a6249 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -6,7 +6,7 @@
 
 AXEL_VERSION = 2.4
 AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
-AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
+AXEL_SITE = https://alioth.debian.org/frs/download.php/file/3015
 AXEL_LICENSE = GPLv2+
 AXEL_LICENSE_FILES = COPYING
 

From 65012b3b1efb201df5997ef672963cd1488ffc63 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 30 Jun 2013 09:32:20 -0300
Subject: [PATCH 5540/6849] e2fsprogs: bump to version 1.42.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 790cb43e79..0670c747cd 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-E2FSPROGS_VERSION = 1.42.7
+E2FSPROGS_VERSION = 1.42.8
 E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
 E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h

From 67eaf7057d2b4ab90885ee013a29eaa40682f93a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 30 Jun 2013 00:38:12 +0200
Subject: [PATCH 5541/6849] legacy: print removal date in menuconfig

Show the user how old the legacy options are, as a
subtle suggestion for him to update mopre often. ;-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index cd23492fff..1252d160cb 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -40,9 +40,8 @@ comment "As long as these options stay selected, the build   "
 comment "will fail.                                          "
 endif
 
-#
-# Legacy options since 2013.08
-#
+###############################################################################
+comment "Legacy options removed in 2013.08"
 
 config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK
 	bool "dosfstools dosfsck renamed to fsck.fat"
@@ -65,9 +64,8 @@ config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS
 	help
 	  mkdosfs was renamed upstream to mkfs.fat for consistency.
 
-#
-# Legacy options since 2013.05
-#
+###############################################################################
+comment "Legacy options removed in 2013.05"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8192
 	bool "Realtek 8192 replaced by Realtek 81xx"
@@ -83,9 +81,8 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
 	help
 	  Now covers the whole Realtek 87xx familly: 8712/8723.
 
-#
-# Legacy options since 2013.02
-#
+###############################################################################
+comment "Legacy options removed in 2013.02"
 
 config BR2_sa110
 	bool "sa110 ARM target switched to strongarm"
@@ -151,9 +148,9 @@ config BR2_PACKAGE_DIRECTB_TESTS
 	  The option has been renamed
 	  BR2_PACKAGE_DIRECTFB_TESTS.
 
-#
-# Legacy options since 2012.11
-#
+###############################################################################
+comment "Legacy options removed in 2012.11"
+
 config BR2_PACKAGE_CUSTOMIZE
 	bool "customize package has been removed"
 	select BR2_LEGACY
@@ -188,10 +185,8 @@ config BR2_PACKAGE_PTHREAD_STUBS
 	  For consistency reason, the pthread-stubs package has been
 	  renamed to xlib_libpthread-stubs.
 
-
-#
-# Legacy options since 2012.08
-#
+###############################################################################
+comment "Legacy options removed in 2012.08"
 
 config BR2_PACKAGE_GETTEXT_STATIC
 	bool "libgettext.a is now selected by BR2_PREFER_STATIC_LIB"

From d2e706c3bba623d82bbc1f76d5b0c02efb2bd0fe Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 30 Jun 2013 00:38:13 +0200
Subject: [PATCH 5542/6849] legacy: make it clear legacy options will be
 removed at some point

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 1252d160cb..921a0eb955 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -38,6 +38,10 @@ comment "Please look at the options which have been selected "
 comment "and read their help text.                           "
 comment "As long as these options stay selected, the build   "
 comment "will fail.                                          "
+comment "Note: at some point in the future, the oldest legacy"
+comment "options will be removed, and configuration files    "
+comment "that still have those options set, will fail to     "
+comment "build, or run, in unpredictable ways.               "
 endif
 
 ###############################################################################

From ed692e2dbbf8d4751d39a636dd1119e829bd0f99 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:02 +0200
Subject: [PATCH 5543/6849] lttng-tools: bump version to 2.2.0

Remove lttng-tools-no-sync-file-range-in-uclibc.patch because it got
merged upstream.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...g-tools-no-sync-file-range-in-uclibc.patch | 51 -------------------
 package/lttng-tools/lttng-tools.mk            |  2 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch

diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
deleted file mode 100644
index fcaaa3e32d..0000000000
--- a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Make sync_file_range() usage optional
-
-Under uClibc, sync_file_range() is not available under all
-architectures, so we fall back to fdatasync() in this case.
-
-Inspired by the patch done by Thomas Petazzoni for the
-2.0-pre25 version.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- configure.ac              |    2 +-
- src/common/compat/fcntl.h |    5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5808c79..065b9cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
- 	)
- ])
- AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
--AC_CHECK_FUNCS([sched_getcpu sysconf])
-+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
- 
- # check for dlopen
- AC_CHECK_LIB([dl], [dlopen],
-@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[
- ])
- 
- AS_ECHO()
--
-diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c
-index 5a1c757..7ff63a3 100644
---- a/src/common/compat/compat-fcntl.c
-+++ b/src/common/compat/compat-fcntl.c
-@@ -23,7 +23,11 @@
- int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
- 		unsigned int flags)
- {
-+#ifdef HAVE_SYNC_FILE_RANGE
- 	return sync_file_range(fd, offset, nbytes, flags);
-+#else
-+	return fdatasync(fd);
-+#endif
- }
- 
- #endif /* __linux__ */
--- 
-1.8.0.3
-
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 77bf7d62ab..992ecadd3c 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.1.1
+LTTNG_TOOLS_VERSION = 2.2.0
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 

From 018f03b0310aefd8635f1a3dba8bfd4e00b6f779 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:03 +0200
Subject: [PATCH 5544/6849] lttng-modules: bump version to 2.2.0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-modules/lttng-modules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index 85ccaf36df..a0f6c8f000 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.1.2
+LTTNG_MODULES_VERSION = 2.2.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 

From 18876407b36aa2112531191739cc610f3e316163 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:04 +0200
Subject: [PATCH 5545/6849] lttng-libust: bump version to 2.2.0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-libust/lttng-libust.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index c295046cb6..35d9eef83f 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.1.3
+LTTNG_LIBUST_VERSION = 2.2.0
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES

From 327748e9e83fc8a5f4101624c96faaf5221f50db Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:05 +0200
Subject: [PATCH 5546/6849] liburcu: define license

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/liburcu/liburcu.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 35f09f7381..7a32e7fbe6 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -7,6 +7,8 @@
 LIBURCU_VERSION = 0.7.7
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
+LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE
+LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt LICENSE
 
 LIBURCU_INSTALL_STAGING = YES
 

From f0a5318865f567211711a162558298cb7689260a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:06 +0200
Subject: [PATCH 5547/6849] lttng-babeltrace: define license

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-babeltrace/lttng-babeltrace.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 96d3a31f24..044dac0df7 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -7,6 +7,8 @@
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace/
 LTTNG_BABELTRACE_VERSION = 1.1.1
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
+LTTNG_BABELTRACE_LICENSE = MIT; LGPLv2 for include/babeltrace/list.h; GPLv3+ for formats/ctf/metadata/ctf-parser.h
+LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt LICENSE
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
 

From 0d55b0f04c4ddb1d0e48b4cefebe95d3d23798e2 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:07 +0200
Subject: [PATCH 5548/6849] lttng-libust: define license

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-libust/lttng-libust.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 35d9eef83f..c3137aa277 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -7,6 +7,8 @@
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
 LTTNG_LIBUST_VERSION = 2.2.0
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
+LTTNG_LIBUST_LICENSE = LGPLv2.1; GPLv2 for lttng-gen-tp and ust-ctl
+LTTNG_LIBUST_LICENSE_FILES = COPYING
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux

From a4c1447d9016aef76b90a82f59a9cfa841115274 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:08 +0200
Subject: [PATCH 5549/6849] lttng-modules: define license

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-modules/lttng-modules.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index a0f6c8f000..66faa1ff45 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -7,6 +7,8 @@
 LTTNG_MODULES_VERSION = 2.2.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
+LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
+LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
 
 LTTNG_MODULES_DEPENDENCIES = linux
 

From d6e251d07c57c07f6bae0b7f40b9eedf49bb4f4a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 30 Jun 2013 17:01:09 +0200
Subject: [PATCH 5550/6849] lttng-tools: define license

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-tools/lttng-tools.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 992ecadd3c..2e9f936132 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -7,6 +7,9 @@
 LTTNG_TOOLS_VERSION = 2.2.0
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
+LTTNG_TOOLS_LICENSE = GPLv2; LGPLv2.1 for include/lttng/* and src/lib/lttng-ctl/*
+# gpl-2.0.txt and lgpl-2.1.txt files are missing from the sources
+LTTNG_TOOLS_LICENSE_FILES = LICENSE
 
 # The host-lttng-babeltrace technically isn't a required build
 # dependency. However, having the babeltrace utilities built for the

From b767aee44395fe5dae4d0b05a67810c7cce855b5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 1 Jul 2013 23:34:34 +0200
Subject: [PATCH 5551/6849] gst1-plugins-bad: add missing depends on C++ for
 the OpenCV plugin

OpenCV requires C++ support, so we shouldn't select it without
depending on C++ support.

Fixes:
http://autobuild.buildroot.org/results/71f/71f2d8a267a0d159521407a9a2330e68d756c4b3/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-bad/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
index 7eb531abd3..98550e081c 100644
--- a/package/multimedia/gst1-plugins-bad/Config.in
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -400,10 +400,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
 	bool "opencv"
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_OPENCV
 	help
 	  GStreamer OpenCV Plugins
 
+comment "opencv plugin requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
 	bool "opus"
 	select BR2_PACKAGE_OPUS

From a213dc6d53aef7076942c29a1338d0c9fb78ca64 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 21 Jun 2013 16:59:03 -0700
Subject: [PATCH 5552/6849] libevent: disable building test programs

Libevent test programs use fork(), function
that is not available on MMU-less architecture.

This patch prevents compiling libevent test programs
so that library can successfully build on architectures
like blackfin

Fixes:
http://autobuild.buildroot.org/results/2e0/2e0422f1042d0cb00f5bab0dc190930581ed4ef2/

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...event-disable-building-test-programs.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libevent/libevent-disable-building-test-programs.patch

diff --git a/package/libevent/libevent-disable-building-test-programs.patch b/package/libevent/libevent-disable-building-test-programs.patch
new file mode 100644
index 0000000000..4b0f0d9b08
--- /dev/null
+++ b/package/libevent/libevent-disable-building-test-programs.patch
@@ -0,0 +1,30 @@
+From e932c8864e1bb8b6a7901d4b049a1100c4becba5 Mon Sep 17 00:00:00 2001
+From: Gilles Talis <gilles.talis@gmail.com>
+Date: Fri, 21 Jun 2013 15:25:11 -0700
+Subject: [PATCH] Disable building test programs
+
+We are not really interested in building test programs.
+Moreover, these programs use fork() function that is
+not available on MMU-less architectures.
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2ebefa2..4fba1ff 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -487,7 +487,7 @@ LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la \
+ @INSTALL_LIBEVENT_TRUE@lib_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
+ @INSTALL_LIBEVENT_TRUE@pkgconfig_DATA = $(LIBEVENT_PKGCONFIG)
+ @INSTALL_LIBEVENT_FALSE@noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
+-SUBDIRS = . include sample test
++SUBDIRS = . include sample
+ @BUILD_WIN32_FALSE@SYS_LIBS = 
+ @BUILD_WIN32_TRUE@SYS_LIBS = -lws2_32 -lshell32 -ladvapi32
+ @BUILD_WIN32_FALSE@SYS_SRC = $(am__append_5) $(am__append_6) \
+-- 
+1.7.4.1
+

From 217438db67f6a1f02e1624038e65190c48f67087 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Mon, 1 Jul 2013 21:20:01 +0200
Subject: [PATCH 5553/6849] package/libsvg: new package

Libsvg provides a library for parsing SVG content in files or buffers.
Libsvg does not do any rendering, but instead provides a function-based
interface that can be used by various rendering engines.

[Peter: drop libxml2 conditional]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/libsvg/Config.in                      | 12 +++++++
 .../libsvg-fix-expat-static-declaration.patch | 33 +++++++++++++++++++
 package/libsvg/libsvg.mk                      | 23 +++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 package/libsvg/Config.in
 create mode 100644 package/libsvg/libsvg-fix-expat-static-declaration.patch
 create mode 100644 package/libsvg/libsvg.mk

diff --git a/package/Config.in b/package/Config.in
index ebeabeb1a7..7f5714d7d6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -461,6 +461,7 @@ source "package/libpng/Config.in"
 source "package/libqrencode/Config.in"
 source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
+source "package/libsvg/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
 source "package/opencv/Config.in"
diff --git a/package/libsvg/Config.in b/package/libsvg/Config.in
new file mode 100644
index 0000000000..e3a5e729d0
--- /dev/null
+++ b/package/libsvg/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBSVG
+	bool "libsvg"
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_LIBJPEG
+	select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT
+	help
+	  Libsvg provides a parser for SVG content in files or buffers.
+	  Libsvg does not do any rendering, but instead provides a
+	  function-based interface that can be used by various rendering
+	  engines.
+
+	  http://cairographics.org/snapshots/
diff --git a/package/libsvg/libsvg-fix-expat-static-declaration.patch b/package/libsvg/libsvg-fix-expat-static-declaration.patch
new file mode 100644
index 0000000000..58ef286729
--- /dev/null
+++ b/package/libsvg/libsvg-fix-expat-static-declaration.patch
@@ -0,0 +1,33 @@
+Newer expat versions use different declarations of the following functions:
+
+static void _svg_parser_sax_start_element ();
+static void _svg_parser_sax_end_element ();
+static void _svg_parser_sax_characters ();
+
+We need to patch the libsvg source to not follow into a build error like
+   "static declaration of 'foo' follows non-static declaration"
+and use the functions from the expat library instead from the libsvg source.
+
+Patch based on
+http://oe-lite.org/redmine/projects/xorg/repository/revisions/c4df7951e846e1be718f37f2455696a1d0861f3d/entry/recipes/cairo/libsvg-0.1.4/gcc4_and_expat.patch
+
+Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
+
+diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c
+--- libsvg-0.1.4~orig/src/svg_parser_expat.c	2005-02-14 11:26:26.000000000 -0600
++++ libsvg-0.1.4/src/svg_parser_expat.c	2006-02-10 21:58:20.000000000 -0600
+@@ -30,6 +30,7 @@
+ #include "svgint.h"
+ #include "svg_hash.h"
+ 
++#ifndef LIBSVG_EXPAT
+ static void
+ _svg_parser_sax_start_element (void		*closure,
+ 			       const XML_Char	*name,
+@@ -43,6 +44,7 @@
+ _svg_parser_sax_characters (void		*closure,
+ 			    const XML_Char	*ch,
+ 			    int			len);
++#endif
+ 
+ static void
diff --git a/package/libsvg/libsvg.mk b/package/libsvg/libsvg.mk
new file mode 100644
index 0000000000..70696478c9
--- /dev/null
+++ b/package/libsvg/libsvg.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# libsvg
+#
+################################################################################
+
+LIBSVG_VERSION         = 0.1.4
+LIBSVG_SITE            = http://cairographics.org/snapshots/
+LIBSVG_DEPENDENCIES    = host-pkgconf libpng libjpeg
+LIBSVG_INSTALL_STAGING = YES
+LIBSVG_LICENSE         = LGPLv2+
+LIBSVG_LICENSE_FILES   = COPYING
+
+# libsvg needs at last a XML parser
+ifeq ($(BR2_PACKAGE_EXPAT),y)
+LIBSVG_CONF_OPT += --with-expat
+LIBSVG_DEPENDENCIES += expat
+else
+LIBSVG_CONF_OPT += --with-libxml2
+LIBSVG_DEPENDENCIES += libxml2
+endif
+
+$(eval $(autotools-package))

From a20fc5ae2b416067afc64ccb9b99a27266f9b13a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 30 Jun 2013 20:16:57 +0100
Subject: [PATCH 5554/6849] msgpack: new package

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/msgpack/Config.in  | 13 +++++++++++++
 package/msgpack/msgpack.mk | 12 ++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/msgpack/Config.in
 create mode 100644 package/msgpack/msgpack.mk

diff --git a/package/Config.in b/package/Config.in
index 7f5714d7d6..5f2d31bf83 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -623,6 +623,7 @@ source "package/log4cxx/Config.in"
 source "package/lttng-libust/Config.in"
 source "package/mpc/Config.in"
 source "package/mpfr/Config.in"
+source "package/msgpack/Config.in"
 source "package/mtdev2tuio/Config.in"
 source "package/orc/Config.in"
 source "package/p11-kit/Config.in"
diff --git a/package/msgpack/Config.in b/package/msgpack/Config.in
new file mode 100644
index 0000000000..7f28eafb23
--- /dev/null
+++ b/package/msgpack/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_MSGPACK
+	bool "msgpack"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  MessagePack is an efficient binary serialization format.
+
+	  It lets you exchange data among multiple languages like JSON but
+	  it's faster and smaller.
+
+	  http://msgpack.org/
+
+comment "msgpack requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/msgpack/msgpack.mk b/package/msgpack/msgpack.mk
new file mode 100644
index 0000000000..c77729f2f4
--- /dev/null
+++ b/package/msgpack/msgpack.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# msgpack
+#
+################################################################################
+
+MSGPACK_VERSION = 0.5.4
+MSGPACK_SITE = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp/
+MSGPACK_LICENSE = Apache-2.0
+MSGPACK_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 423006bb48786aa528954e63805e6ff0b4a14799 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <elezegarcia@gmail.com>
Date: Fri, 28 Jun 2013 11:32:24 -0300
Subject: [PATCH 5555/6849] jimtcl: New package

Add new jimtcl package - a lightweight tclsh alternative.
Useful for a lighter footprint usb_modeswitch installation.
tclsh size is ~700kB for ARM compared to ~200kB for jimtcl.

[Peter: wrap help text, fix file header]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/jimtcl/Config.in | 10 +++++++
 package/jimtcl/jimtcl.mk | 62 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 package/jimtcl/Config.in
 create mode 100644 package/jimtcl/jimtcl.mk

diff --git a/package/Config.in b/package/Config.in
index 5f2d31bf83..575d9866ce 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -310,6 +310,7 @@ source "package/erlang/Config.in"
 source "package/enscript/Config.in"
 source "package/haserl/Config.in"
 source "package/jamvm/Config.in"
+source "package/jimtcl/Config.in"
 source "package/lua/Config.in"
 source "package/luajit/Config.in"
 if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT
diff --git a/package/jimtcl/Config.in b/package/jimtcl/Config.in
new file mode 100644
index 0000000000..1324590447
--- /dev/null
+++ b/package/jimtcl/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_JIMTCL
+	bool "jimtcl"
+	help
+	  Jim Tcl is a small footprint reimplementation of the Tcl
+	  scripting language.  The core language engine is compatible
+	  with Tcl 8.5+, while implementing a significant subset of
+	  the Tcl 8.6 command set, plus additional features available
+	  only in Jim Tcl.
+
+	  http://jim.tcl.tk
diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk
new file mode 100644
index 0000000000..5c5cdb3710
--- /dev/null
+++ b/package/jimtcl/jimtcl.mk
@@ -0,0 +1,62 @@
+################################################################################
+#
+# jimtcl
+#
+################################################################################
+
+JIMTCL_VERSION = 0.73
+JIMTCL_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/j/jimtcl
+JIMTCL_SOURCE = jimtcl_$(JIMTCL_VERSION).orig.tar.bz2
+JIMTCL_INSTALL_STAGING = YES
+
+JIMTCL_HEADERS_TO_INSTALL = \
+	jim.h \
+	jim-eventloop.h \
+	jim-signal.h \
+	jim-subcmd.h \
+	jim-win32compat.h \
+	jim-config.h \
+
+ifeq ($(BR2_PACKAGE_TCL),)
+define JIMTCL_LINK_TCLSH
+	ln -sf jimsh $(TARGET_DIR)/usr/bin/tclsh
+endef
+endif
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+JIMTCL_SHARED =
+JIMTCL_LIB = a
+JIMTCL_INSTALL_LIB =
+else
+JIMTCL_SHARED = --shared
+JIMTCL_LIB = so
+JIMTCL_INSTALL_LIB = $(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) \
+		     $(TARGET_DIR)/usr/lib/libjim.$(JIMTCL_LIB)
+endif
+
+define JIMTCL_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure --prefix=/usr \
+		$(JIMTCL_SHARED) \
+	)
+endef
+
+define JIMTCL_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define JIMTCL_INSTALL_STAGING_CMDS
+	for i in $(JIMTCL_HEADERS_TO_INSTALL); do \
+		cp -a $(@D)/$$i $(STAGING_DIR)/usr/include/ ; \
+	done; \
+	$(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) $(STAGING_DIR)/usr/lib/libjim.$(JIMTCL_LIB)
+endef
+
+define JIMTCL_INSTALL_TARGET_CMDS
+	$(INSTALL) -D $(@D)/jimsh $(TARGET_DIR)/usr/bin/jimsh
+	$(JIMTCL_INSTALL_LIB)
+	$(JIMTCL_LINK_TCLSH)
+endef
+
+$(eval $(generic-package))

From 751c2d20d786f5ed05a27bdfddf00473efba1fac Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 29 Jun 2013 13:10:23 +0100
Subject: [PATCH 5556/6849] libtpl: bump version

Note that libtpl has moved from sourceforge to github, and there is no longer
a version-specific tarball available.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtpl/Config.in |  2 +-
 package/libtpl/libtpl.mk | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/package/libtpl/Config.in b/package/libtpl/Config.in
index a2c2c2de32..0286e033d6 100644
--- a/package/libtpl/Config.in
+++ b/package/libtpl/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_LIBTPL
 	help
 	  Easily store and retrieve binary data in C
 
-	  http://tpl.sourceforge.net/
+	  http://troydhanson.github.io/tpl/
diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk
index 0016c31260..478b2989c0 100644
--- a/package/libtpl/libtpl.mk
+++ b/package/libtpl/libtpl.mk
@@ -4,11 +4,18 @@
 #
 ################################################################################
 
-LIBTPL_VERSION = 1.5
-LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2
-LIBTPL_SITE = http://downloads.sourceforge.net/project/tpl/tpl/libtpl-$(LIBTPL_VERSION)
+LIBTPL_VERSION = 445b4e9f236a48e274eaace31acf56d700da142a
+LIBTPL_SITE = http://github.com/troydhanson/tpl/tarball/$(LIBTPL_VERSION)
 LIBTPL_INSTALL_STAGING = YES
 LIBTPL_LICENSE = BSD-like
 LIBTPL_LICENSE_FILES = LICENSE
 
+LIBTPL_AUTORECONF = YES
+LIBTPL_AUTORECONF_OPT = --install --force
+
+define LIBTPL_CREATE_MISSING_FILES
+	touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/ChangeLog $(@D)/COPYING
+endef
+LIBTPL_POST_EXTRACT_HOOKS += LIBTPL_CREATE_MISSING_FILES
+
 $(eval $(autotools-package))

From 755775333411baa2cea2569b49ac5b9eaab491ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:51 +0200
Subject: [PATCH 5557/6849] uClibc: KERNEL_SOURCE no longer exists

The KERNEL_SOURCE configuration option no longer exists in uClibc, so
there's no point in setting it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 2036dab143..0e01d94b75 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -98,7 +98,6 @@ $(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.patched $(UCLIBC_CONFIG_FILE)
 	$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
 		-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
 		-e 's,^TARGET_ARCH=".*",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \
-		-e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
 		-e 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \
 		-e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
 		-e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \

From 17733c2e1461eaec41692a22b714c91b6bd0c340 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:52 +0200
Subject: [PATCH 5558/6849] busybox: don't use kernel headers directly

The kernel headers are part of the staging directory, so there is no
reason to point the Busybox CFLAGS directly to them.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/busybox/busybox.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index cfefdbb96e..acc9008a34 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -16,8 +16,7 @@ BUSYBOX_LICENSE = GPLv2
 BUSYBOX_LICENSE_FILES = LICENSE
 
 BUSYBOX_CFLAGS = \
-	$(TARGET_CFLAGS) \
-	-I$(LINUX_HEADERS_DIR)/include
+	$(TARGET_CFLAGS)
 
 BUSYBOX_LDFLAGS = \
 	$(TARGET_LDFLAGS)

From 598ade90a8a4eb6036499d8d81589aadd69d9f43 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:53 +0200
Subject: [PATCH 5559/6849] package: allow to override the make install target
 for host packages

In order to convert gcc to the package infrastructure, we need a way
of overriding the name of the make target used for the installation of
host packages, just like we have for target packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-autotools.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index d8d7e6d470..09deef2f36 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -76,6 +76,7 @@ $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_AUTORECONF			?= NO
 $(2)_AUTORECONF_OPT		?=
+$(2)_INSTALL_OPT                ?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
 $(2)_CLEAN_OPT			?= clean
@@ -232,7 +233,7 @@ endif
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -C $$($$(PKG)_SRCDIR) install
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 

From 1f6d92d2ce2fee794080505e0c6536b78cf252ea Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:54 +0200
Subject: [PATCH 5560/6849] toolchain/gcc: remove dead code related to host
 binary stripping

The GCC_STRIP_HOST_BINARIES variable was always defined to 'nope',
which means that the host binaries were never stripped. Get rid of the
corresponding code, which is not in use.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 92361e56eb..79a01250eb 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -43,7 +43,6 @@ GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
 GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
 GCC_CAT:=$(BZCAT)
-GCC_STRIP_HOST_BINARIES:=nope
 GCC_SRC_DIR:=$(GCC_DIR)
 
 # Branding works on >= 4.3
@@ -472,10 +471,6 @@ $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled
 		rmdir "$(STAGING_DIR)/lib64"; \
 		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
 	fi
-	# Strip the host binaries
-ifeq ($(GCC_STRIP_HOST_BINARIES),true)
-	strip --strip-all -R .note -R .comment $(filter-out %-gccbug %-embedspu,$(wildcard $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-*))
-endif
 	# Make sure we have 'cc'.
 	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
 		ln -snf $(GNU_TARGET_NAME)-gcc \

From 6d22f56ed8999501c54d102e338aaee80b6f9d16 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:55 +0200
Subject: [PATCH 5561/6849] toolchain: remove references to LIBFLOAT_TARGET

The libfloat package was removed in
accbd71154b8815678baa12f21f853ed8478f400, and therefore since this
commit, the LIBFLOAT_TARGET variable is always empty. We get rid of
the stale references to this variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 2 +-
 toolchain/uClibc/uclibc.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 79a01250eb..0dc82004b3 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -518,7 +518,7 @@ endif
 
 cross_compiler:=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
 cross_compiler gcc: gcc_intermediate \
-	$(LIBFLOAT_TARGET) uclibc $(GCC_BUILD_DIR3)/.installed \
+	uclibc $(GCC_BUILD_DIR3)/.installed \
 	$(STAMP_DIR)/gcc_libs_target_installed \
 	$(GCC_TARGETS)
 
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 0e01d94b75..f042c639f9 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -449,7 +449,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/
 	touch $@
 
-$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate) $(LIBFLOAT_TARGET)
+$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate)
 	$(Q)$(call MESSAGE,"Building uClibc")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \

From 39a38a554cb8add070e6fa14b73898a6579d7aad Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:56 +0200
Subject: [PATCH 5562/6849] toolchain/gcc: get rid of stale variable reference

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/gcc/gcc-uclibc-4.x.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 0dc82004b3..b1484ebdba 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -519,8 +519,7 @@ endif
 cross_compiler:=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
 cross_compiler gcc: gcc_intermediate \
 	uclibc $(GCC_BUILD_DIR3)/.installed \
-	$(STAMP_DIR)/gcc_libs_target_installed \
-	$(GCC_TARGETS)
+	$(STAMP_DIR)/gcc_libs_target_installed
 
 gcc-source: $(DL_DIR)/$(GCC_SOURCE)
 

From ed6697339721e85a8f59feab0e4deaab8447a9bf Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 3 Jul 2013 16:18:01 +0200
Subject: [PATCH 5563/6849] python: rename old-stdlib-cache patch to match
 naming convention

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...-old-stdlib-cache.patch => python3-112-old-stdlib-cache.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/python3/{python3-3.3-012-old-stdlib-cache.patch => python3-112-old-stdlib-cache.patch} (100%)

diff --git a/package/python3/python3-3.3-012-old-stdlib-cache.patch b/package/python3/python3-112-old-stdlib-cache.patch
similarity index 100%
rename from package/python3/python3-3.3-012-old-stdlib-cache.patch
rename to package/python3/python3-112-old-stdlib-cache.patch

From 8a0d1fd1932ebe48b19e327e2441e518252af12d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 3 Jul 2013 16:58:41 +0200
Subject: [PATCH 5564/6849] qt: bump version

For details, see http://blog.qt.digia.com/blog/2013/07/02/qt-4-8-5-released/

Also move to the (current?) official download location, as the previous
location doesn't have 4.8.5.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 71b9e4ce97..9325b566f9 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -11,9 +11,9 @@
 #
 ################################################################################
 
-QT_VERSION = 4.8.4
+QT_VERSION = 4.8.5
 QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE    = http://releases.qt-project.org/qt4/source
+QT_SITE    = http://download.qt-project.org/official_releases/qt/4.8/$(QT_VERSION)
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 

From 8a3992e897bde8649f922e2b15ca5225490e1166 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 3 Jul 2013 21:08:21 +0200
Subject: [PATCH 5565/6849] kernel-headers: bump 3.0.x / 3.4.x / 3.9.x stable
 versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/kernel-headers/Config.in                          | 6 +++---
 ...ders_install-fix-__packed-in-exported-kernel-head.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchain/kernel-headers/{linux-3.0.84-headers_install-fix-__packed-in-exported-kernel-head.patch => linux-3.0.85-headers_install-fix-__packed-in-exported-kernel-head.patch} (100%)

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index ce812af620..b10900fab0 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -70,15 +70,15 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.84"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.85"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.47"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.51"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.52"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.8"		if BR2_KERNEL_HEADERS_3_9
+	default "3.9.9"		if BR2_KERNEL_HEADERS_3_9
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-3.0.84-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.85-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.84-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to toolchain/kernel-headers/linux-3.0.85-headers_install-fix-__packed-in-exported-kernel-head.patch

From 666caf601ad41e2eaa583b0fe8113dfd0cfc567b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 3 Jul 2013 21:29:37 +0200
Subject: [PATCH 5566/6849] libglib2: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libglib2/libglib2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 4821a765f9..178d137807 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGLIB2_VERSION_MAJOR = 2.36
-LIBGLIB2_VERSION_MINOR = 1
+LIBGLIB2_VERSION_MINOR = 3
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)

From 3c3211ccde7fc37aaf9192e83cb55d7159001c17 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 3 Jul 2013 21:40:53 +0200
Subject: [PATCH 5567/6849] kmod: bump version

syscall patch is now upstream and static linking is no longer supported.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod-001-no-syscall--1.patch | 31 -----------------------
 package/kmod/kmod.mk                      |  6 ++++-
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 package/kmod/kmod-001-no-syscall--1.patch

diff --git a/package/kmod/kmod-001-no-syscall--1.patch b/package/kmod/kmod-001-no-syscall--1.patch
deleted file mode 100644
index e7a3a11690..0000000000
--- a/package/kmod/kmod-001-no-syscall--1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001
-From: Jan Luebbe <jlu@pengutronix.de>
-Date: Thu, 02 May 2013 14:47:12 +0000
-Subject: libkmod: Avoid calling syscall() with -1
-
-At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an
-illegal instruction error. Solve that by returning an error when
-__NR_finit_module is -1.
----
-diff --git a/libkmod/missing.h b/libkmod/missing.h
-index edb88b9..b45bbe2 100644
---- a/libkmod/missing.h
-+++ b/libkmod/missing.h
-@@ -20,8 +20,15 @@
- #endif
- 
- #ifndef HAVE_FINIT_MODULE
-+#include <errno.h>
-+
- static inline int finit_module(int fd, const char *uargs, int flags)
- {
-+	if (__NR_finit_module == -1) {
-+		errno = ENOSYS;
-+		return -1;
-+	}
-+
- 	return syscall(__NR_finit_module, fd, uargs, flags);
- }
- #endif
---
-cgit v0.9.2
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 6cd2a20a34..72a24afb36 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KMOD_VERSION = 13
+KMOD_VERSION = 14
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
@@ -14,6 +14,10 @@ KMOD_DEPENDENCIES = host-pkgconf
 KMOD_LICENSE = LGPLv2.1+
 KMOD_LICENSE_FILES = libkmod/COPYING
 
+# static linking not supported, see
+# https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8
+KMOD_CONF_OPT = --disable-static --enable-shared
+
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 KMOD_CONF_OPT += --disable-manpages
 endif

From e21db000267cfbff000f1fc8c8e3329c5473ce1e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:57 +0200
Subject: [PATCH 5568/6849] elf2flt: convert to the package infrastructure

[Peter: Correct legacy position]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                              |  8 ++++
 .../elf2flt/Config.in.host                    |  2 +-
 package/elf2flt/elf2flt.mk                    | 28 +++++++++++
 .../elf2flt/src}/LICENSE.TXT                  |  0
 .../elf2flt/src}/Makefile.in                  |  0
 .../elf2flt => package/elf2flt/src}/README    |  0
 .../elf2flt/src}/config.guess                 |  0
 .../elf2flt/src}/config.sub                   |  0
 .../elf2flt => package/elf2flt/src}/configure |  0
 .../elf2flt/src}/configure.in                 |  0
 .../elf2flt/src}/cygwin-elf.h                 |  0
 .../elf2flt/src}/e1-elf2flt.ld                |  0
 .../elf2flt => package/elf2flt/src}/elf2flt.c |  0
 .../elf2flt/src}/elf2flt.ld                   |  0
 .../elf2flt => package/elf2flt/src}/flat.h    |  0
 .../elf2flt => package/elf2flt/src}/flthdr.c  |  0
 .../elf2flt/src}/install-sh                   |  0
 .../elf2flt/src}/ld-elf2flt.in                |  0
 .../elf2flt/src}/maketarball.sh               |  0
 .../elf2flt => package/elf2flt/src}/stubs.c   |  0
 toolchain/elf2flt/elf2flt.mk                  | 46 -------------------
 toolchain/toolchain-buildroot.mk              |  1 -
 toolchain/toolchain-buildroot/Config.in.2     |  2 +-
 toolchain/toolchain-crosstool-ng.mk           |  1 -
 toolchain/toolchain-external.mk               |  1 -
 25 files changed, 38 insertions(+), 51 deletions(-)
 rename toolchain/elf2flt/Config.in => package/elf2flt/Config.in.host (91%)
 create mode 100644 package/elf2flt/elf2flt.mk
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/LICENSE.TXT (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/Makefile.in (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/README (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/config.guess (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/config.sub (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/configure (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/configure.in (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/cygwin-elf.h (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/e1-elf2flt.ld (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/elf2flt.c (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/elf2flt.ld (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/flat.h (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/flthdr.c (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/install-sh (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/ld-elf2flt.in (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/maketarball.sh (100%)
 rename {toolchain/elf2flt/elf2flt => package/elf2flt/src}/stubs.c (100%)
 delete mode 100644 toolchain/elf2flt/elf2flt.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 921a0eb955..01bf90063e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -68,6 +68,14 @@ config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS
 	help
 	  mkdosfs was renamed upstream to mkfs.fat for consistency.
 
+config BR2_ELF2FLT
+	bool "the elf2flt option has been renamed"
+	select BR2_LEGACY
+	help
+	  The BR2_ELF2FLT option has been renamed to
+	  BR2_PACKAGE_HOST_ELF2FLT due to the conversion of elf2flt to
+	  the package infrastructure.
+
 ###############################################################################
 comment "Legacy options removed in 2013.05"
 
diff --git a/toolchain/elf2flt/Config.in b/package/elf2flt/Config.in.host
similarity index 91%
rename from toolchain/elf2flt/Config.in
rename to package/elf2flt/Config.in.host
index b4e450a646..31a6c7fc06 100644
--- a/toolchain/elf2flt/Config.in
+++ b/package/elf2flt/Config.in.host
@@ -1,4 +1,4 @@
-config BR2_ELF2FLT
+config BR2_PACKAGE_HOST_ELF2FLT
 	bool "Enable elf2flt support?"
 	depends on BR2_arm || BR2_sh || BR2_sparc
 	help
diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
new file mode 100644
index 0000000000..5afa5ca447
--- /dev/null
+++ b/package/elf2flt/elf2flt.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# elf2flt
+#
+#############################################################
+
+ELF2FLT_SOURCE =
+HOST_ELF2FLT_SOURCE =
+ELF2FLT_VERSION = cvs
+ELF2FLT_LICENSE = GPLv2+
+ELF2FLT_LICENSE_FILES = LICENSE.TXT
+
+HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
+
+# It is not exactly a host variant, but more a cross variant, which is
+# why we pass a special --target option.
+HOST_ELF2FLT_CONF_OPT = \
+	--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
+	--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
+	--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
+	--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
+	--target=$(GNU_TARGET_NAME)
+
+define HOST_ELF2FLT_EXTRACT_CMDS
+	cp -r package/elf2flt/src/* $(@D)
+endef
+
+$(eval $(host-autotools-package))
diff --git a/toolchain/elf2flt/elf2flt/LICENSE.TXT b/package/elf2flt/src/LICENSE.TXT
similarity index 100%
rename from toolchain/elf2flt/elf2flt/LICENSE.TXT
rename to package/elf2flt/src/LICENSE.TXT
diff --git a/toolchain/elf2flt/elf2flt/Makefile.in b/package/elf2flt/src/Makefile.in
similarity index 100%
rename from toolchain/elf2flt/elf2flt/Makefile.in
rename to package/elf2flt/src/Makefile.in
diff --git a/toolchain/elf2flt/elf2flt/README b/package/elf2flt/src/README
similarity index 100%
rename from toolchain/elf2flt/elf2flt/README
rename to package/elf2flt/src/README
diff --git a/toolchain/elf2flt/elf2flt/config.guess b/package/elf2flt/src/config.guess
similarity index 100%
rename from toolchain/elf2flt/elf2flt/config.guess
rename to package/elf2flt/src/config.guess
diff --git a/toolchain/elf2flt/elf2flt/config.sub b/package/elf2flt/src/config.sub
similarity index 100%
rename from toolchain/elf2flt/elf2flt/config.sub
rename to package/elf2flt/src/config.sub
diff --git a/toolchain/elf2flt/elf2flt/configure b/package/elf2flt/src/configure
similarity index 100%
rename from toolchain/elf2flt/elf2flt/configure
rename to package/elf2flt/src/configure
diff --git a/toolchain/elf2flt/elf2flt/configure.in b/package/elf2flt/src/configure.in
similarity index 100%
rename from toolchain/elf2flt/elf2flt/configure.in
rename to package/elf2flt/src/configure.in
diff --git a/toolchain/elf2flt/elf2flt/cygwin-elf.h b/package/elf2flt/src/cygwin-elf.h
similarity index 100%
rename from toolchain/elf2flt/elf2flt/cygwin-elf.h
rename to package/elf2flt/src/cygwin-elf.h
diff --git a/toolchain/elf2flt/elf2flt/e1-elf2flt.ld b/package/elf2flt/src/e1-elf2flt.ld
similarity index 100%
rename from toolchain/elf2flt/elf2flt/e1-elf2flt.ld
rename to package/elf2flt/src/e1-elf2flt.ld
diff --git a/toolchain/elf2flt/elf2flt/elf2flt.c b/package/elf2flt/src/elf2flt.c
similarity index 100%
rename from toolchain/elf2flt/elf2flt/elf2flt.c
rename to package/elf2flt/src/elf2flt.c
diff --git a/toolchain/elf2flt/elf2flt/elf2flt.ld b/package/elf2flt/src/elf2flt.ld
similarity index 100%
rename from toolchain/elf2flt/elf2flt/elf2flt.ld
rename to package/elf2flt/src/elf2flt.ld
diff --git a/toolchain/elf2flt/elf2flt/flat.h b/package/elf2flt/src/flat.h
similarity index 100%
rename from toolchain/elf2flt/elf2flt/flat.h
rename to package/elf2flt/src/flat.h
diff --git a/toolchain/elf2flt/elf2flt/flthdr.c b/package/elf2flt/src/flthdr.c
similarity index 100%
rename from toolchain/elf2flt/elf2flt/flthdr.c
rename to package/elf2flt/src/flthdr.c
diff --git a/toolchain/elf2flt/elf2flt/install-sh b/package/elf2flt/src/install-sh
similarity index 100%
rename from toolchain/elf2flt/elf2flt/install-sh
rename to package/elf2flt/src/install-sh
diff --git a/toolchain/elf2flt/elf2flt/ld-elf2flt.in b/package/elf2flt/src/ld-elf2flt.in
similarity index 100%
rename from toolchain/elf2flt/elf2flt/ld-elf2flt.in
rename to package/elf2flt/src/ld-elf2flt.in
diff --git a/toolchain/elf2flt/elf2flt/maketarball.sh b/package/elf2flt/src/maketarball.sh
similarity index 100%
rename from toolchain/elf2flt/elf2flt/maketarball.sh
rename to package/elf2flt/src/maketarball.sh
diff --git a/toolchain/elf2flt/elf2flt/stubs.c b/package/elf2flt/src/stubs.c
similarity index 100%
rename from toolchain/elf2flt/elf2flt/stubs.c
rename to package/elf2flt/src/stubs.c
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
deleted file mode 100644
index 14622273dd..0000000000
--- a/toolchain/elf2flt/elf2flt.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-################################################################################
-#
-# elf2flt
-#
-################################################################################
-
-# we keep a local checkout of uClinux CVS
-ELF2FLT_SOURCE:=$(ELF2FLT_DIR)/elf2flt
-ELF2FLT_DIR:=$(TOOLCHAIN_DIR)/elf2flt
-ELF2FLT_BINARY:=elf2flt
-
-$(ELF2FLT_DIR)/.unpacked:
-	cp -r toolchain/elf2flt/elf2flt "$(TOOLCHAIN_DIR)/elf2flt"
-	touch $@
-
-$(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
-	$(call CONFIG_UPDATE,$(@D))
-	touch $@
-
-$(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
-	(cd $(ELF2FLT_DIR); rm -rf config.cache; \
-		LDFLAGS="$(HOST_LDFLAGS) -lz" \
-		$(ELF2FLT_DIR)/configure $(QUIET) \
-		--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
-		--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
-		--target=$(GNU_TARGET_NAME) \
-		--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
-		--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
-		--prefix=$(HOST_DIR)/usr)
-	touch $@
-
-$(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured
-	$(MAKE) -C $(ELF2FLT_DIR) all
-	$(MAKE) -C $(ELF2FLT_DIR) install
-
-elf2flt: uclibc_target uclibc-configured binutils gcc host-zlib $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
-
-elf2flt-clean:
-	rm -rf $(ELF2FLT_SOURCE)
-
-elf2flt-dirclean:
-	rm -rf $(ELF2FLT_SOURCE)
-
-ifeq ($(BR2_ELF2FLT),y)
-TARGETS+=elf2flt
-endif
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index 5493177536..5b89d561ee 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -1,6 +1,5 @@
 # Include files required for the internal toolchain backend
 
-include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index f58a4f78d9..422602e61f 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -98,7 +98,7 @@ config BR2_PTHREAD_DEBUG
 	help
 	  Build the thread library with debugging enabled.
 
-source "toolchain/elf2flt/Config.in"
+source "package/elf2flt/Config.in.host"
 
 config BR2_VFP_FLOAT
 	bool "Use ARM Vector Floating Point unit"
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index d1e755244e..4f9c29c19a 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -2,7 +2,6 @@
 
 # Explicit ordering:
 include toolchain/helpers.mk
-include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index 9999aa21b2..2aa01413bd 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -1,7 +1,6 @@
 # Required includes for the external toolchain backend
 
 include toolchain/helpers.mk
-include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/toolchain-external/ext-tool.mk

From 7f240d984b721c104fec6aee5710277c6955206b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:58 +0200
Subject: [PATCH 5569/6849] kernel-headers: migrate to the package
 infrastructure

[Peter: fix file header]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...fix-__packed-in-exported-kernel-head.patch |  0
 .../3.3.8/linux-fix-umode_t.patch             |  0
 .../linux-headers/Config.in.host              |  5 +-
 package/linux-headers/linux-headers.mk        | 31 +++++++
 toolchain/kernel-headers/kernel-headers.mk    | 87 -------------------
 toolchain/toolchain-buildroot.mk              |  1 -
 toolchain/toolchain-buildroot/Config.in       |  2 +-
 toolchain/toolchain-external.mk               |  1 -
 toolchain/uClibc/uclibc.mk                    | 13 +--
 9 files changed, 38 insertions(+), 102 deletions(-)
 rename toolchain/kernel-headers/linux-3.0.85-headers_install-fix-__packed-in-exported-kernel-head.patch => package/linux-headers/3.0.85/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)
 rename toolchain/kernel-headers/linux-3.3.8-fix-umode_t.patch => package/linux-headers/3.3.8/linux-fix-umode_t.patch (100%)
 rename toolchain/kernel-headers/Config.in => package/linux-headers/Config.in.host (94%)
 create mode 100644 package/linux-headers/linux-headers.mk
 delete mode 100644 toolchain/kernel-headers/kernel-headers.mk

diff --git a/toolchain/kernel-headers/linux-3.0.85-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.85/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.0.85-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.85/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/toolchain/kernel-headers/linux-3.3.8-fix-umode_t.patch b/package/linux-headers/3.3.8/linux-fix-umode_t.patch
similarity index 100%
rename from toolchain/kernel-headers/linux-3.3.8-fix-umode_t.patch
rename to package/linux-headers/3.3.8/linux-fix-umode_t.patch
diff --git a/toolchain/kernel-headers/Config.in b/package/linux-headers/Config.in.host
similarity index 94%
rename from toolchain/kernel-headers/Config.in
rename to package/linux-headers/Config.in.host
index b10900fab0..495552416a 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/package/linux-headers/Config.in.host
@@ -1,6 +1,5 @@
-# Choose the kernel headers to use for kernel-headers target. This is
-# ignored if you are building your own kernel or using the system kernel.
-#
+config BR2_PACKAGE_HOST_LINUX_HEADERS
+	bool
 
 comment "Kernel Header Options"
 
diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
new file mode 100644
index 0000000000..9d7a683bc9
--- /dev/null
+++ b/package/linux-headers/linux-headers.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# linux-headers
+#
+################################################################################
+
+# This package is used to provide Linux kernel headers for the
+# internal toolchain backend.
+
+LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))
+ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.)
+LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+else
+LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
+endif
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.bz2
+
+LINUX_HEADERS_INSTALL_STAGING = YES
+
+define LINUX_HEADERS_INSTALL_STAGING_CMDS
+	(cd $(@D); \
+		$(TARGET_MAKE_ENV) $(MAKE) \
+			ARCH=$(KERNEL_ARCH) \
+			HOSTCC="$(HOSTCC)" \
+			HOSTCFLAGS="$(HOSTCFLAGS)" \
+			HOSTCXX="$(HOSTCXX)" \
+			INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
+			headers_install)
+endef
+
+$(eval $(generic-package))
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
deleted file mode 100644
index a04395b41a..0000000000
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-################################################################################
-#
-# Setup the kernel headers. I include a generic package of
-# kernel headers here, so you shouldn't need to include your
-# own. Be aware these kernel headers _will_ get blown away
-# by a 'make clean' so don't put anything sacred in here...
-#
-################################################################################
-
-DEFAULT_KERNEL_HEADERS:=$(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))
-
-LINUX_HEADERS_SITE:=127.0.0.1
-LINUX_HEADERS_SOURCE:=unspecified-kernel-headers
-LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-libc-headers-null
-
-# parse linux version string
-LNXVER:=$(subst ., , $(strip $(DEFAULT_KERNEL_HEADERS)))
-VERSION:=$(word 1, $(LNXVER))
-PATCHLEVEL:=$(word 2, $(LNXVER))
-SUBLEVEL:=$(word 3, $(LNXVER))
-EXTRAVERSION:=$(word 4, $(LNXVER))
-LOCALVERSION:=
-
-# should contain prepended dot
-SUBLEVEL:=$(if $(SUBLEVEL),.$(SUBLEVEL),)
-EXTRAVERSION:=$(if $(EXTRAVERSION),.$(EXTRAVERSION),)
-
-LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL)$(SUBLEVEL)$(EXTRAVERSION)
-ifeq ($(findstring x2.6.,x$(DEFAULT_KERNEL_HEADERS)),x2.6.)
-LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v2.6/
-else
-LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v3.x/
-endif
-LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.xz
-LINUX_HEADERS_CAT:=$(XZCAT)
-LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION)
-LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux
-
-LINUX_HEADERS_DEPENDS:=
-
-$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
-	$(Q)$(call MESSAGE,"Extracting kernel headers")
-	rm -rf $(LINUX_HEADERS_DIR)
-	$(INSTALL) -d $(@D)
-	$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | \
-	tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-	touch $@
-
-$(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
-	$(Q)$(call MESSAGE,"Patching kernel headers")
-	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
-		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
-ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
-	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
-		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
-endif
-	touch $@
-
-$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_UNPACK_DIR)/.patched
-	$(Q)$(call MESSAGE,"Installing kernel headers")
-	(cd $(LINUX_HEADERS_UNPACK_DIR); \
-	 $(MAKE) ARCH=$(KERNEL_ARCH) \
-		HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
-		HOSTCXX="$(HOSTCXX)" \
-		INSTALL_HDR_PATH=$(LINUX_HEADERS_DIR) headers_install; \
-	)
-	touch $@
-
-$(DL_DIR)/$(LINUX_HEADERS_SOURCE):
-ifeq ($(BR2_KERNEL_HEADERS_SNAP),y)
-	$(error No local $@ found, cannot continue. Are you sure you wanted to enable BR2_KERNEL_HEADERS_SNAP?)
-endif
-	$(Q)$(call MESSAGE,"Downloading kernel headers")
-	$(call DOWNLOAD,$(LINUX_HEADERS_SITE:/=)/$(LINUX_HEADERS_SOURCE))
-
-kernel-headers: $(LINUX_HEADERS_DIR)/.configured
-
-kernel-headers-source: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
-
-kernel-headers-clean: clean
-	rm -rf $(LINUX_HEADERS_DIR)
-
-kernel-headers-dirclean:
-	rm -rf $(LINUX_HEADERS_DIR)
-	rm -rf $(LINUX_HEADERS_UNPACK_DIR)
-
-.PHONY: kernel-headers
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index 5b89d561ee..a8dd58b314 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -1,5 +1,4 @@
 # Include files required for the internal toolchain backend
 
 include toolchain/gcc/gcc-uclibc-4.x.mk
-include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 38948904fe..3d70fa19aa 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -1,7 +1,7 @@
 # Config entries for internal toolchain backend
 
 if BR2_TOOLCHAIN_BUILDROOT
-source "toolchain/kernel-headers/Config.in"
+source "package/linux-headers/Config.in.host"
 source "toolchain/uClibc/Config.in"
 source "package/binutils/Config.in.host"
 source "toolchain/gcc/Config.in"
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index 2aa01413bd..40fc633138 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -2,6 +2,5 @@
 
 include toolchain/helpers.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
-include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/toolchain-external/ext-tool.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index f042c639f9..e06fafc85d 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -98,7 +98,7 @@ $(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.patched $(UCLIBC_CONFIG_FILE)
 	$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
 		-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
 		-e 's,^TARGET_ARCH=".*",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \
-		-e 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \
+		-e 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(STAGING_DIR)/usr/include\",g' \
 		-e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
 		-e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
 		-e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
@@ -426,7 +426,7 @@ ifeq ($(BR2_arc),y)
 REALLY_NOSTDLIB=-really-nostdlib
 endif
 
-$(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.config
+$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config
 	$(Q)$(call MESSAGE,"Installing uClibc headers")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
@@ -441,7 +441,7 @@ $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.confi
 	# Install the kernel headers to the first stage gcc include dir
 	# if necessary
 	if [ ! -f $(TOOLCHAIN_DIR)/uClibc_dev/usr/include/linux/version.h ]; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/* \
+		cp -pLR $(STAGING_DIR)/usr/include/* \
 			$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \
 	fi
 	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libc.so
@@ -485,11 +485,6 @@ $(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		install_runtime install_dev
-	# Install the kernel headers to the staging dir if necessary
-	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/* \
-			$(STAGING_DIR)/usr/include/; \
-	fi
 	# Build the host utils. Need to add an install target...
 	$(MAKE1) -C $(UCLIBC_DIR)/utils \
 		PREFIX=$(HOST_DIR) \
@@ -548,7 +543,7 @@ uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
 uclibc-update-config: uclibc-config
 	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
-uclibc-configured: gcc_initial kernel-headers $(UCLIBC_DIR)/.configured
+uclibc-configured: gcc_initial linux-headers $(UCLIBC_DIR)/.configured
 
 uclibc-configured-source: uclibc-source
 

From f198318fa564bead33bb0e389ddae1f5cbec0b6c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:28:59 +0200
Subject: [PATCH 5570/6849] gcc: common definitions

[Peter: tweak file header]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host | 128 +++++++++++++++++++++++++++++
 package/gcc/gcc.mk         | 162 +++++++++++++++++++++++++++++++++++++
 2 files changed, 290 insertions(+)
 create mode 100644 package/gcc/Config.in.host
 create mode 100644 package/gcc/gcc.mk

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
new file mode 100644
index 0000000000..7ecf2fb117
--- /dev/null
+++ b/package/gcc/Config.in.host
@@ -0,0 +1,128 @@
+comment "GCC Options"
+
+config BR2_GCC_NEEDS_MPC
+	bool
+
+choice
+	prompt "GCC compiler Version"
+	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
+	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr3
+	default BR2_GCC_VERSION_4_4_7_ARC if BR2_arc
+	default BR2_GCC_VERSION_4_7_X
+	help
+	  Select the version of gcc you wish to use.
+
+	config BR2_GCC_VERSION_4_4_7_ARC
+		depends on BR2_arc
+		bool "gcc 4.4.7-arc"
+
+	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+		depends on BR2_avr32
+		bool "gcc 4.2.2-avr32-2.1.5"
+
+	config BR2_GCC_VERSION_4_3_X
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		bool "gcc 4.3.x"
+
+	config BR2_GCC_VERSION_4_4_X
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		bool "gcc 4.4.x"
+
+	config BR2_GCC_VERSION_4_5_X
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
+		select BR2_GCC_NEEDS_MPC
+		bool "gcc 4.5.x"
+
+	config BR2_GCC_VERSION_4_6_X
+		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		select BR2_GCC_NEEDS_MPC
+		bool "gcc 4.6.x"
+
+	config BR2_GCC_VERSION_4_7_X
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		select BR2_GCC_NEEDS_MPC
+		bool "gcc 4.7.x"
+
+	config BR2_GCC_VERSION_4_8_X
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
+		bool "gcc 4.8.x"
+
+	config BR2_GCC_VERSION_SNAP
+		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		select BR2_GCC_NEEDS_MPC
+		bool "gcc snapshot"
+endchoice
+
+config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
+	bool
+	default y if !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+
+config BR2_GCC_SNAP_DATE
+	string "GCC snapshot date"
+	default "4.8-20120429"
+	depends on BR2_GCC_VERSION_SNAP
+	help
+	  Enter snapshot date to use for gcc.
+	  Format is: A.B-YYYYMMDD
+
+	  A is GCC major version, for example 4.
+	  B is GCC minor version, for example 7.
+	  YYYYMMDD is snapshot date, for example 20110430.
+
+	  This way we'd get version 4.7-20110430
+
+config BR2_GCC_VERSION
+	string
+	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
+	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
+	default "4.4.7-arc" if BR2_GCC_VERSION_4_4_7_ARC
+	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
+	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
+	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
+	default "4.8.1"     if BR2_GCC_VERSION_4_8_X
+	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
+
+config BR2_EXTRA_GCC_CONFIG_OPTIONS
+	string "Additional gcc options"
+	default ""
+	help
+	  Any additional gcc configure options you may want to include....
+
+config BR2_INSTALL_OBJC
+	bool "Build/install Objective-C compiler and runtime?"
+	depends on !BR2_avr32
+	help
+	  Build/install Objective-C compiler and runtime?
+
+config BR2_INSTALL_FORTRAN
+	bool "Build/install Fortran compiler and runtime?"
+	depends on !BR2_avr32
+	select BR2_PACKAGE_LIBMPFR
+	help
+	  Build/install Fortran compiler and runtime?
+	  Note that it is highly recommended NOT to use gfortran
+	  from gcc older than 4.2.0
+
+config BR2_GCC_SHARED_LIBGCC
+	bool "Build/install a shared libgcc?"
+	depends on !BR2_PREFER_STATIC_LIB
+	default y
+	depends on !BR2_sparc
+	help
+	  Build/install a shared libgcc library
+
+config BR2_GCC_ENABLE_TLS
+	bool "Enable compiler tls support"
+	default y
+	depends on BR2_PTHREADS_NATIVE
+	help
+	  Enable the compiler to generate code for accessing
+	  thread local storage variables
+
+config BR2_GCC_ENABLE_OPENMP
+	bool "Enable compiler OpenMP support"
+	depends on !BR2_PTHREADS_NONE && !BR2_avr32 && !BR2_arc
+	help
+	  Enable OpenMP support for the compiler
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
new file mode 100644
index 0000000000..3b61ffd454
--- /dev/null
+++ b/package/gcc/gcc.mk
@@ -0,0 +1,162 @@
+################################################################################
+#
+# Common variables for the gcc-initial, gcc-intermediate and gcc-final
+# packages.
+#
+################################################################################
+
+#
+# Version, site and source
+#
+
+GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION))
+
+ifeq ($(BR2_GCC_VERSION_SNAP),y)
+GCC_SNAP_DATE = $(call qstrip,$(BR2_GCC_SNAP_DATE))
+endif
+
+ifneq ($(GCC_SNAP_DATE),)
+GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
+else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
+GCC_SITE = ftp://www.at91.com/pub/buildroot/
+else
+GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
+endif
+
+GCC_SOURCE = gcc-$(GCC_VERSION).tar.bz2
+
+#
+# Xtensa special hook
+#
+
+define HOST_GCC_XTENSA_OVERLAY_EXTRACT
+        tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
+                $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
+endef
+
+#
+# Apply patches
+#
+
+define HOST_GCC_APPLY_PATCHES
+	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch
+endef
+
+#
+# Create 'build' directory and configure symlink
+#
+
+define HOST_GCC_CONFIGURE_SYMLINK
+	mkdir -p $(@D)/build
+	ln -s ../configure $(@D)/build/configure
+endef
+
+#
+# Common configuration options
+#
+
+HOST_GCC_COMMON_DEPENDENCIES = \
+	host-binutils \
+	host-gmp \
+	host-mpfr
+
+HOST_GCC_COMMON_CONF_OPT = \
+	--target=$(GNU_TARGET_NAME) \
+	--with-sysroot=$(STAGING_DIR) \
+	--disable-__cxa_atexit \
+	--with-gnu-ld \
+	--disable-libssp \
+	--disable-multilib \
+	--with-gmp=$(HOST_DIR)/usr \
+	--with-mpfr=$(HOST_DIR)/usr \
+
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43810
+# Workaround until it's fixed in 4.5.4 or later
+ifeq ($(ARCH),powerpc)
+ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
+HOST_GCC_COMMON_CONF_OPT += --disable-target-optspace
+endif
+else
+HOST_GCC_COMMON_CONF_OPT += --enable-target-optspace
+endif
+
+# gcc 4.6.x quadmath requires wchar
+ifneq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
+HOST_GCC_COMMON_CONF_OPT += --disable-libquadmath
+endif
+
+ifeq ($(BR2_GCC_ENABLE_TLS),y)
+HOST_GCC_COMMON_CONF_OPT += --enable-tls
+else
+HOST_GCC_COMMON_CONF_OPT += --disable-tls
+endif
+
+ifeq ($(BR2_PTHREADS_NONE),y)
+HOST_GCC_COMMON_CONF_OPT += \
+	--disable-threads \
+	--disable-libitm \
+	--disable-libatomic
+else
+HOST_GCC_COMMON_CONF_OPT += --enable-threads
+endif
+
+ifeq ($(BR2_GCC_NEEDS_MPC),y)
+HOST_GCC_COMMON_DEPENDENCIES += host-mpc
+HOST_GCC_COMMON_CONF_OPT += --with-mpc=$(HOST_DIR)/usr
+endif
+
+ifeq ($(BR2_GCC_VERSION_4_4_7_ARC),y)
+HOST_GCC_COMMON_DEPENDENCIES += host-flex host-bison
+endif
+
+ifeq ($(BR2_SOFT_FLOAT),y)
+# only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float
+# powerpc seems to be needing it as well
+ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
+HOST_GCC_COMMON_CONF_OPT += --with-float=soft
+endif
+endif
+
+ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
+HOST_GCC_COMMON_CONF_OPT += --disable-decimal-float
+endif
+
+# Determine arch/tune/abi/cpu options
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
+HOST_GCC_COMMON_CONF_OPT += --with-arch=$(BR2_GCC_TARGET_ARCH)
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
+HOST_GCC_COMMON_CONF_OPT += --with-tune=$(BR2_GCC_TARGET_TUNE)
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
+HOST_GCC_COMMON_CONF_OPT += --with-abi=$(BR2_GCC_TARGET_ABI)
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
+HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
+else
+HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
+endif
+endif
+
+# Branding works on >= 4.3
+ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)
+HOST_GCC_COMMON_CONF_OPT += \
+	--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
+	--with-bugurl="http://bugs.buildroot.net/"
+endif
+
+# AVR32 GCC special configuration
+ifeq ($(BR2_avr32),y)
+HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
+endif
+
+# Disable mudflap and enable proper double/long double for SPE ABI
+ifeq ($(BR2_powerpc_SPE),y)
+HOST_GCC_COMMON_CONF_OPT += \
+	--disable-libmudflap \
+	--enable-e500_double \
+	--with-long-double-128
+endif
+
+include package/gcc/*/*.mk

From 3d616718b14efc032d572585d3441e007a3c64e3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:00 +0200
Subject: [PATCH 5571/6849] gcc-initial: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-initial/gcc-initial.mk | 37 ++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/gcc/gcc-initial/gcc-initial.mk

diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
new file mode 100644
index 0000000000..e07783e592
--- /dev/null
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# gcc-initial
+#
+################################################################################
+
+GCC_INITIAL_VERSION = $(GCC_VERSION)
+GCC_INITIAL_SITE    = $(GCC_SITE)
+GCC_INITIAL_SOURCE  = $(GCC_SOURCE)
+
+HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
+
+ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+HOST_GCC_INITIAL_POST_EXTRACT_CMDS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
+endif
+
+HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
+
+# gcc doesn't support in-tree build, so we create a 'build'
+# subdirectory in the gcc sources, and build from there.
+HOST_GCC_INITIAL_SUBDIR = build
+
+HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
+
+HOST_GCC_INITIAL_CONF_OPT = \
+	$(HOST_GCC_COMMON_CONF_OPT) \
+	--enable-languages=c \
+	--disable-shared \
+	--without-headers \
+	--with-newlib \
+	--disable-largefile \
+	--disable-nls
+
+HOST_GCC_INITIAL_MAKE_OPT = all-gcc
+HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
+
+$(eval $(host-autotools-package))

From 9342f478d90b88096d561eee1f24281d1cd538c5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:01 +0200
Subject: [PATCH 5572/6849] gcc-intermediate: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gcc/gcc-intermediate/gcc-intermediate.mk  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/gcc/gcc-intermediate/gcc-intermediate.mk

diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
new file mode 100644
index 0000000000..0c062a7564
--- /dev/null
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -0,0 +1,43 @@
+################################################################################
+#
+# gcc-intermediate
+#
+################################################################################
+
+GCC_INTERMEDIATE_VERSION = $(GCC_VERSION)
+GCC_INTERMEDIATE_SITE    = $(GCC_SITE)
+GCC_INTERMEDIATE_SOURCE  = $(GCC_SOURCE)
+
+HOST_GCC_INTERMEDIATE_DEPENDENCIES = \
+	$(HOST_GCC_COMMON_DEPENDENCIES) \
+	uclibc-configured
+
+ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+HOST_GCC_INTERMEDIATE_POST_EXTRACT_CMDS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
+endif
+
+HOST_GCC_INTERMEDIATE_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
+
+# gcc doesn't support in-tree build, so we create a 'build'
+# subdirectory in the gcc sources, and build from there.
+HOST_GCC_INTERMEDIATE_SUBDIR = build
+
+HOST_GCC_INTERMEDIATE_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
+
+HOST_GCC_INTERMEDIATE_CONF_OPT = \
+	$(HOST_GCC_COMMON_CONF_OPT) \
+	--enable-languages=c \
+	--disable-largefile \
+	--disable-nls
+
+HOST_GCC_INTERMEDIATE_MAKE_OPT = all-gcc
+ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
+HOST_GCC_INTERMEDIATE_MAKE_OPT += all-target-libgcc
+endif
+
+HOST_GCC_INTERMEDIATE_INSTALL_OPT = install-gcc
+ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
+HOST_GCC_INTERMEDIATE_INSTALL_OPT += install-target-libgcc
+endif
+
+$(eval $(host-autotools-package))

From 4d7c13dd5382a56045e54389550b08c32fa94550 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:02 +0200
Subject: [PATCH 5573/6849] gcc-final: new package

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-final/gcc-final.mk | 135 +++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 package/gcc/gcc-final/gcc-final.mk

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
new file mode 100644
index 0000000000..1767bbbdf2
--- /dev/null
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -0,0 +1,135 @@
+################################################################################
+#
+# gcc-final
+#
+################################################################################
+
+GCC_FINAL_VERSION = $(GCC_VERSION)
+GCC_FINAL_SITE    = $(GCC_SITE)
+GCC_FINAL_SOURCE  = $(GCC_SOURCE)
+
+HOST_GCC_FINAL_DEPENDENCIES = \
+	$(HOST_GCC_COMMON_DEPENDENCIES) \
+	uclibc
+
+ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+HOST_GCC_FINAL_POST_EXTRACT_CMDS += HOST_GCC_FINAL_XTENSA_OVERLAY_EXTRACT
+endif
+
+HOST_GCC_FINAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
+
+# gcc doesn't support in-tree build, so we create a 'build'
+# subdirectory in the gcc sources, and build from there.
+HOST_GCC_FINAL_SUBDIR = build
+
+define HOST_GCC_FINAL_CONFIGURE_SYMLINK
+	mkdir -p $(@D)/build
+	ln -s ../configure $(@D)/build/configure
+endef
+
+HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_FINAL_CONFIGURE_SYMLINK
+
+# Languages supported by the cross-compiler
+GCC_FINAL_CROSS_LANGUAGES-y = c
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_GCC_CROSS_FORTRAN) += fortran
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_GCC_CROSS_OBJC)    += objc
+GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
+
+HOST_GCC_FINAL_CONF_OPT = \
+	$(HOST_GCC_COMMON_CONF_OPT) \
+	--enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \
+	--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin
+
+ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
+HOST_GCC_FINAL_CONF_OPT += --enable-libgomp
+else
+HOST_GCC_FINAL_CONF_OPT += --disable-libgomp
+endif
+
+ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
+HOST_GCC_FINAL_CONF_OPT += --enable-shared
+else
+HOST_GCC_FINAL_CONF_OPT += --disable-shared
+endif
+
+# End with user-provided options, so that they can override previously
+# defined options.
+HOST_GCC_FINAL_CONF_OPT += \
+	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
+
+# Handle lib64
+define HOST_GCC_FINAL_HANDLE_LIB64
+	if [ -d "$(STAGING_DIR)/lib64" ]; then \
+		if [ ! -e "$(STAGING_DIR)/lib" ]; then \
+			mkdir -p "$(STAGING_DIR)/lib"; \
+		fi; \
+		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
+		rmdir "$(STAGING_DIR)/lib64"; \
+		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
+	fi
+endef
+
+HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_HANDLE_LIB64
+
+# Make sure we have 'cc'
+define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
+	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
+		ln -snf $(GNU_TARGET_NAME)-gcc \
+			$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc; \
+	fi
+	if [ ! -e $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc ]; then \
+		ln -snf gcc $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc; \
+	fi
+endef
+
+HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_CC_SYMLINKS
+
+# Create <arch>-linux-<tool> symlinks
+define HOST_GCC_FINAL_CREATE_SIMPLE_SYMLINKS
+	(cd $(HOST_DIR)/usr/bin; for i in $(GNU_TARGET_NAME)-*; do \
+		ln -snf $$i $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \
+	done)
+endef
+
+HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_SIMPLE_SYMLINKS
+
+# Cannot use the HOST_GCC_FINAL_USR_LIBS mechanism below, because we want
+# libgcc_s to be installed in /lib and not /usr/lib. We add +x on
+# libgcc_s to ensure it will be stripped.
+ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
+define HOST_GCC_FINAL_INSTALL_LIBGCC
+	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
+		$(STAGING_DIR)/lib/
+	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
+		$(TARGET_DIR)/lib/
+	-chmod +x $(TARGET_DIR)/lib/libgcc_s.so.1
+endef
+
+HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBGCC
+endif
+
+# Handle the installation of libraries in /usr/lib
+HOST_GCC_FINAL_USR_LIBS =
+
+ifeq ($(BR2_GCC_SHARED_LIBGCC)$(BR2_INSTALL_LIBSTDCPP),yy)
+HOST_GCC_FINAL_USR_LIBS += libstdc++
+endif
+
+ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
+HOST_GCC_FINAL_USR_LIBS += libgomp
+endif
+
+ifneq ($(HOST_GCC_FINAL_USR_LIBS),)
+define HOST_GCC_FINAL_INSTALL_USR_LIBS
+	for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \
+		cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/$${i}.so* \
+			$(STAGING_DIR)/usr/lib/ ; \
+		cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/$${i}.so* \
+			$(TARGET_DIR)/usr/lib/ ; \
+	done
+endef
+HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_USR_LIBS
+endif
+
+$(eval $(host-autotools-package))

From e236fe481e5f8c4cd4984f39dc37dbf19c8d8eda Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:03 +0200
Subject: [PATCH 5574/6849] toolchain: switch to using gcc through package
 infrastructure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                      |   2 +-
 package/Config.in                             |   1 -
 .../1001-gcc-4.2.x-inhibit-libc.patch         |   0
 ...removal-of-redundant-cast-operations.patch |   0
 ...tional-insn-which-clobbers-cc_status.patch |   0
 ...ovh-to-move-immediates-into-register.patch |   0
 .../gcc/4.3.6/100-uclibc-conf.patch           |   0
 .../gcc/4.3.6/104-gnuhurd-uclibc-conf.patch   |   0
 .../gcc/4.3.6/301-missing-execinfo_h.patch    |   0
 .../gcc/4.3.6/302-c99-snprintf.patch          |   0
 .../4.3.6/305-libmudflap-susv3-legacy.patch   |   0
 .../gcc/4.3.6/810-arm-softfloat-libgcc.patch  |   0
 .../993-arm_insn-opinit-RTX_CODE-fixup.patch  |   0
 .../4.3.6/998-gcc-4.3.0-fix-header.00.patch   |   0
 .../4.3.6/999-4.3.2-armeabi-aapcs-linux.patch |   0
 .../999-4.3.3-arm-fix-for-bug-37436.patch     |   0
 ....3.0-cris-pragma-pack-warning-remove.patch |   0
 .../gcc/4.3.6/gcc-43-pr39429.patch            |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 .../4.4.7-arc/fix_branch_out_of_range.patch   |   0
 .../gcc/4.4.7/100-uclibc-conf.patch           |   0
 .../gcc/4.4.7/301-missing-execinfo_h.patch    |   0
 .../gcc/4.4.7/302-c99-snprintf.patch          |   0
 .../4.4.7/305-libmudflap-susv3-legacy.patch   |   0
 .../gcc/4.4.7/810-arm-softfloat-libgcc.patch  |   0
 .../gcc/4.4.7/950-sparc-leon.patch            |   0
 .../gcc/4.4.7/gcc-44-pr39429.patch            |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 .../gcc/4.5.4/100-uclibc-conf.patch           |   0
 .../gcc/4.5.4/301-missing-execinfo_h.patch    |   0
 .../gcc/4.5.4/302-c99-snprintf.patch          |   0
 .../4.5.4/305-libmudflap-susv3-legacy.patch   |   0
 .../gcc/4.5.4/810-arm-softfloat-libgcc.patch  |   0
 .../gcc/4.5.4/820-arm-unbreak-armv4t.patch    |   0
 .../gcc/4.5.4/830-arm-pr43440.patch           |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 .../gcc/4.6.4/100-uclibc-conf.patch           |   0
 .../gcc/4.6.4/301-missing-execinfo_h.patch    |   0
 .../gcc/4.6.4/302-c99-snprintf.patch          |   0
 .../4.6.4/305-libmudflap-susv3-legacy.patch   |   0
 .../gcc/4.6.4/810-arm-softfloat-libgcc.patch  |   0
 .../gcc/4.6.4/820-arm-unbreak-armv4t.patch    |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 .../gcc/4.7.3/100-uclibc-conf.patch           |   0
 .../gcc/4.7.3/301-missing-execinfo_h.patch    |   0
 .../gcc/4.7.3/302-c99-snprintf.patch          |   0
 .../4.7.3/305-libmudflap-susv3-legacy.patch   |   0
 .../gcc/4.7.3/810-arm-softfloat-libgcc.patch  |   0
 .../gcc/4.7.3/830-arm_unbreak_armv4t.patch    |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 .../gcc/4.8.1/100-uclibc-conf.patch           |   0
 .../gcc/4.8.1/301-missing-execinfo_h.patch    |   0
 .../gcc/4.8.1/302-c99-snprintf.patch          |   0
 .../4.8.1/305-libmudflap-susv3-legacy.patch   |   0
 .../gcc/4.8.1/810-arm-softfloat-libgcc.patch  |   0
 .../gcc/4.8.1/830-arm_unbreak_armv4t.patch    |   0
 ...werpc-link-with-math-lib.patch.conditional |   0
 toolchain/gcc/Config.in                       | 130 ----
 toolchain/gcc/Config.in.2                     |  34 -
 toolchain/gcc/gcc-uclibc-4.x.mk               | 640 ------------------
 toolchain/toolchain-buildroot.mk              |   7 +-
 toolchain/toolchain-buildroot/Config.in       |   2 +-
 toolchain/toolchain-crosstool-ng.mk           |   1 -
 toolchain/toolchain-external.mk               |   1 -
 toolchain/uClibc/uclibc.mk                    |  36 +-
 65 files changed, 23 insertions(+), 831 deletions(-)
 rename {toolchain => package}/gcc/4.2.2-avr32-2.1.5/1001-gcc-4.2.x-inhibit-libc.patch (100%)
 rename {toolchain => package}/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch (100%)
 rename {toolchain => package}/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch (100%)
 rename {toolchain => package}/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/301-missing-execinfo_h.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/302-c99-snprintf.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/305-libmudflap-susv3-legacy.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/810-arm-softfloat-libgcc.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/gcc-43-pr39429.patch (100%)
 rename {toolchain => package}/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional (100%)
 rename {toolchain => package}/gcc/4.4.7-arc/fix_branch_out_of_range.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/301-missing-execinfo_h.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/302-c99-snprintf.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/305-libmudflap-susv3-legacy.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/810-arm-softfloat-libgcc.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/950-sparc-leon.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/gcc-44-pr39429.patch (100%)
 rename {toolchain => package}/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional (100%)
 rename {toolchain => package}/gcc/4.5.4/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/301-missing-execinfo_h.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/302-c99-snprintf.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/305-libmudflap-susv3-legacy.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/810-arm-softfloat-libgcc.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/820-arm-unbreak-armv4t.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/830-arm-pr43440.patch (100%)
 rename {toolchain => package}/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional (100%)
 rename {toolchain => package}/gcc/4.6.4/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.6.4/301-missing-execinfo_h.patch (100%)
 rename {toolchain => package}/gcc/4.6.4/302-c99-snprintf.patch (100%)
 rename {toolchain => package}/gcc/4.6.4/305-libmudflap-susv3-legacy.patch (100%)
 rename {toolchain => package}/gcc/4.6.4/810-arm-softfloat-libgcc.patch (100%)
 rename {toolchain => package}/gcc/4.6.4/820-arm-unbreak-armv4t.patch (100%)
 rename {toolchain => package}/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional (100%)
 rename {toolchain => package}/gcc/4.7.3/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.7.3/301-missing-execinfo_h.patch (100%)
 rename {toolchain => package}/gcc/4.7.3/302-c99-snprintf.patch (100%)
 rename {toolchain => package}/gcc/4.7.3/305-libmudflap-susv3-legacy.patch (100%)
 rename {toolchain => package}/gcc/4.7.3/810-arm-softfloat-libgcc.patch (100%)
 rename {toolchain => package}/gcc/4.7.3/830-arm_unbreak_armv4t.patch (100%)
 rename {toolchain => package}/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional (100%)
 rename {toolchain => package}/gcc/4.8.1/100-uclibc-conf.patch (100%)
 rename {toolchain => package}/gcc/4.8.1/301-missing-execinfo_h.patch (100%)
 rename {toolchain => package}/gcc/4.8.1/302-c99-snprintf.patch (100%)
 rename {toolchain => package}/gcc/4.8.1/305-libmudflap-susv3-legacy.patch (100%)
 rename {toolchain => package}/gcc/4.8.1/810-arm-softfloat-libgcc.patch (100%)
 rename {toolchain => package}/gcc/4.8.1/830-arm_unbreak_armv4t.patch (100%)
 rename {toolchain => package}/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional (100%)
 delete mode 100644 toolchain/gcc/Config.in
 delete mode 100644 toolchain/gcc/Config.in.2
 delete mode 100644 toolchain/gcc/gcc-uclibc-4.x.mk

diff --git a/Makefile b/Makefile
index 509eab6c8c..189a1dbbc2 100644
--- a/Makefile
+++ b/Makefile
@@ -224,7 +224,7 @@ BASE_TARGETS += host-ccache
 endif
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-BASE_TARGETS += uclibc-configured host-binutils cross_compiler uclibc-target-utils kernel-headers
+BASE_TARGETS += toolchain-buildroot
 else
 BASE_TARGETS += uclibc
 endif
diff --git a/package/Config.in b/package/Config.in
index 575d9866ce..7c24dab470 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -74,7 +74,6 @@ source "package/flex/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gawk/Config.in"
 endif
-source "toolchain/gcc/Config.in.2"
 source "package/gettext/Config.in"
 source "package/git/Config.in"
 source "package/gperf/Config.in"
diff --git a/toolchain/gcc/4.2.2-avr32-2.1.5/1001-gcc-4.2.x-inhibit-libc.patch b/package/gcc/4.2.2-avr32-2.1.5/1001-gcc-4.2.x-inhibit-libc.patch
similarity index 100%
rename from toolchain/gcc/4.2.2-avr32-2.1.5/1001-gcc-4.2.x-inhibit-libc.patch
rename to package/gcc/4.2.2-avr32-2.1.5/1001-gcc-4.2.x-inhibit-libc.patch
diff --git a/toolchain/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch b/package/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch
similarity index 100%
rename from toolchain/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch
rename to package/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch
diff --git a/toolchain/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch b/package/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch
similarity index 100%
rename from toolchain/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch
rename to package/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch
diff --git a/toolchain/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch b/package/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch
similarity index 100%
rename from toolchain/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch
rename to package/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch
diff --git a/toolchain/gcc/4.3.6/100-uclibc-conf.patch b/package/gcc/4.3.6/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/100-uclibc-conf.patch
rename to package/gcc/4.3.6/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch b/package/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch
rename to package/gcc/4.3.6/104-gnuhurd-uclibc-conf.patch
diff --git a/toolchain/gcc/4.3.6/301-missing-execinfo_h.patch b/package/gcc/4.3.6/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/301-missing-execinfo_h.patch
rename to package/gcc/4.3.6/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.3.6/302-c99-snprintf.patch b/package/gcc/4.3.6/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/302-c99-snprintf.patch
rename to package/gcc/4.3.6/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.3.6/305-libmudflap-susv3-legacy.patch b/package/gcc/4.3.6/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.3.6/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.3.6/810-arm-softfloat-libgcc.patch b/package/gcc/4.3.6/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.3.6/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch b/package/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch
rename to package/gcc/4.3.6/993-arm_insn-opinit-RTX_CODE-fixup.patch
diff --git a/toolchain/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch b/package/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch
rename to package/gcc/4.3.6/998-gcc-4.3.0-fix-header.00.patch
diff --git a/toolchain/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch b/package/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch
rename to package/gcc/4.3.6/999-4.3.2-armeabi-aapcs-linux.patch
diff --git a/toolchain/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch b/package/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch
rename to package/gcc/4.3.6/999-4.3.3-arm-fix-for-bug-37436.patch
diff --git a/toolchain/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch b/package/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch
rename to package/gcc/4.3.6/999-gcc-4.3.0-cris-pragma-pack-warning-remove.patch
diff --git a/toolchain/gcc/4.3.6/gcc-43-pr39429.patch b/package/gcc/4.3.6/gcc-43-pr39429.patch
similarity index 100%
rename from toolchain/gcc/4.3.6/gcc-43-pr39429.patch
rename to package/gcc/4.3.6/gcc-43-pr39429.patch
diff --git a/toolchain/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.3.6/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/4.4.7-arc/fix_branch_out_of_range.patch b/package/gcc/4.4.7-arc/fix_branch_out_of_range.patch
similarity index 100%
rename from toolchain/gcc/4.4.7-arc/fix_branch_out_of_range.patch
rename to package/gcc/4.4.7-arc/fix_branch_out_of_range.patch
diff --git a/toolchain/gcc/4.4.7/100-uclibc-conf.patch b/package/gcc/4.4.7/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/100-uclibc-conf.patch
rename to package/gcc/4.4.7/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.4.7/301-missing-execinfo_h.patch b/package/gcc/4.4.7/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/301-missing-execinfo_h.patch
rename to package/gcc/4.4.7/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.4.7/302-c99-snprintf.patch b/package/gcc/4.4.7/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/302-c99-snprintf.patch
rename to package/gcc/4.4.7/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.4.7/305-libmudflap-susv3-legacy.patch b/package/gcc/4.4.7/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.4.7/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.4.7/810-arm-softfloat-libgcc.patch b/package/gcc/4.4.7/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.4.7/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.4.7/950-sparc-leon.patch b/package/gcc/4.4.7/950-sparc-leon.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/950-sparc-leon.patch
rename to package/gcc/4.4.7/950-sparc-leon.patch
diff --git a/toolchain/gcc/4.4.7/gcc-44-pr39429.patch b/package/gcc/4.4.7/gcc-44-pr39429.patch
similarity index 100%
rename from toolchain/gcc/4.4.7/gcc-44-pr39429.patch
rename to package/gcc/4.4.7/gcc-44-pr39429.patch
diff --git a/toolchain/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.4.7/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/4.5.4/100-uclibc-conf.patch b/package/gcc/4.5.4/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/100-uclibc-conf.patch
rename to package/gcc/4.5.4/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.5.4/301-missing-execinfo_h.patch b/package/gcc/4.5.4/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/301-missing-execinfo_h.patch
rename to package/gcc/4.5.4/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.5.4/302-c99-snprintf.patch b/package/gcc/4.5.4/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/302-c99-snprintf.patch
rename to package/gcc/4.5.4/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.5.4/305-libmudflap-susv3-legacy.patch b/package/gcc/4.5.4/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.5.4/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.5.4/810-arm-softfloat-libgcc.patch b/package/gcc/4.5.4/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.5.4/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.5.4/820-arm-unbreak-armv4t.patch b/package/gcc/4.5.4/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/820-arm-unbreak-armv4t.patch
rename to package/gcc/4.5.4/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.5.4/830-arm-pr43440.patch b/package/gcc/4.5.4/830-arm-pr43440.patch
similarity index 100%
rename from toolchain/gcc/4.5.4/830-arm-pr43440.patch
rename to package/gcc/4.5.4/830-arm-pr43440.patch
diff --git a/toolchain/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.5.4/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/4.6.4/100-uclibc-conf.patch b/package/gcc/4.6.4/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.6.4/100-uclibc-conf.patch
rename to package/gcc/4.6.4/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.6.4/301-missing-execinfo_h.patch b/package/gcc/4.6.4/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.6.4/301-missing-execinfo_h.patch
rename to package/gcc/4.6.4/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.6.4/302-c99-snprintf.patch b/package/gcc/4.6.4/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.6.4/302-c99-snprintf.patch
rename to package/gcc/4.6.4/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.6.4/305-libmudflap-susv3-legacy.patch b/package/gcc/4.6.4/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.6.4/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.6.4/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.6.4/810-arm-softfloat-libgcc.patch b/package/gcc/4.6.4/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.6.4/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.6.4/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.6.4/820-arm-unbreak-armv4t.patch b/package/gcc/4.6.4/820-arm-unbreak-armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.6.4/820-arm-unbreak-armv4t.patch
rename to package/gcc/4.6.4/820-arm-unbreak-armv4t.patch
diff --git a/toolchain/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.6.4/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/4.7.3/100-uclibc-conf.patch b/package/gcc/4.7.3/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.7.3/100-uclibc-conf.patch
rename to package/gcc/4.7.3/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.7.3/301-missing-execinfo_h.patch b/package/gcc/4.7.3/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.7.3/301-missing-execinfo_h.patch
rename to package/gcc/4.7.3/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.7.3/302-c99-snprintf.patch b/package/gcc/4.7.3/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.7.3/302-c99-snprintf.patch
rename to package/gcc/4.7.3/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.7.3/305-libmudflap-susv3-legacy.patch b/package/gcc/4.7.3/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.7.3/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.7.3/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.7.3/810-arm-softfloat-libgcc.patch b/package/gcc/4.7.3/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.7.3/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.7.3/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.7.3/830-arm_unbreak_armv4t.patch b/package/gcc/4.7.3/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.7.3/830-arm_unbreak_armv4t.patch
rename to package/gcc/4.7.3/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.7.3/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/4.8.1/100-uclibc-conf.patch b/package/gcc/4.8.1/100-uclibc-conf.patch
similarity index 100%
rename from toolchain/gcc/4.8.1/100-uclibc-conf.patch
rename to package/gcc/4.8.1/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.8.1/301-missing-execinfo_h.patch b/package/gcc/4.8.1/301-missing-execinfo_h.patch
similarity index 100%
rename from toolchain/gcc/4.8.1/301-missing-execinfo_h.patch
rename to package/gcc/4.8.1/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.8.1/302-c99-snprintf.patch b/package/gcc/4.8.1/302-c99-snprintf.patch
similarity index 100%
rename from toolchain/gcc/4.8.1/302-c99-snprintf.patch
rename to package/gcc/4.8.1/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch b/package/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
diff --git a/toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch b/package/gcc/4.8.1/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.8.1/810-arm-softfloat-libgcc.patch
diff --git a/toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch b/package/gcc/4.8.1/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch
rename to package/gcc/4.8.1/830-arm_unbreak_armv4t.patch
diff --git a/toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
deleted file mode 100644
index 7830241b90..0000000000
--- a/toolchain/gcc/Config.in
+++ /dev/null
@@ -1,130 +0,0 @@
-# Choose gcc version.
-
-comment "GCC Options"
-
-config BR2_GCC_NEEDS_MPC
-	bool
-
-choice
-	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
-	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
-	default BR2_GCC_VERSION_4_4_7_ARC if BR2_arc
-	default BR2_GCC_VERSION_4_7_X
-	help
-	  Select the version of gcc you wish to use.
-
-	config BR2_GCC_VERSION_4_4_7_ARC
-		depends on BR2_arc
-		bool "gcc 4.4.7-arc"
-
-	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
-	       depends on BR2_avr32
-	       bool "gcc 4.2.2-avr32-2.1.5"
-
-	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
-		bool "gcc 4.3.x"
-
-	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
-		bool "gcc 4.4.x"
-
-	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
-		select BR2_GCC_NEEDS_MPC
-		bool "gcc 4.5.x"
-
-	config BR2_GCC_VERSION_4_6_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
-		select BR2_GCC_NEEDS_MPC
-		bool "gcc 4.6.x"
-
-	config BR2_GCC_VERSION_4_7_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
-		select BR2_GCC_NEEDS_MPC
-		bool "gcc 4.7.x"
-
-	config BR2_GCC_VERSION_4_8_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
-		select BR2_GCC_NEEDS_MPC
-		bool "gcc 4.8.x"
-
-	config BR2_GCC_VERSION_SNAP
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
-		select BR2_GCC_NEEDS_MPC
-		bool "gcc snapshot"
-endchoice
-
-config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
-	bool
-	default y if !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
-
-config BR2_GCC_SNAP_DATE
-	string "GCC snapshot date"
-	default "4.8-20120429"
-	depends on BR2_GCC_VERSION_SNAP
-	help
-	  Enter snapshot date to use for gcc.
-	  Format is: A.B-YYYYMMDD
-
-	  A is GCC major version, for example 4.
-	  B is GCC minor version, for example 7.
-	  YYYYMMDD is snapshot date, for example 20110430.
-
-	  This way we'd get version 4.7-20110430
-
-config BR2_GCC_VERSION
-	string
-	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
-	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
-	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
-	default "4.4.7-arc" if BR2_GCC_VERSION_4_4_7_ARC
-	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
-	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
-	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
-	default "4.8.1"     if BR2_GCC_VERSION_4_8_X
-	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
-
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
-	string "Additional gcc options"
-	default ""
-	help
-	  Any additional gcc configure options you may want to include....
-
-config BR2_INSTALL_OBJC
-	bool "Build/install Objective-C compiler and runtime?"
-	depends on !BR2_avr32
-	help
-	  Build/install Objective-C compiler and runtime?
-
-config BR2_INSTALL_FORTRAN
-	bool "Build/install Fortran compiler and runtime?"
-	depends on !BR2_avr32
-	select BR2_PACKAGE_LIBMPFR
-	help
-	  Build/install Fortran compiler and runtime?
-	  Note that it is highly recommended NOT to use gfortran
-	  from gcc older than 4.2.0
-
-config BR2_GCC_SHARED_LIBGCC
-	bool "Build/install a shared libgcc?"
-	depends on !BR2_PREFER_STATIC_LIB
-	default y
-	depends on !BR2_sparc
-	help
-	  Build/install a shared libgcc library
-
-config BR2_GCC_ENABLE_TLS
-	bool "Enable compiler tls support"
-	default y
-	depends on BR2_PTHREADS_NATIVE
-	help
-	  Enable the compiler to generate code for accessing
-	  thread local storage variables
-
-config BR2_GCC_ENABLE_OPENMP
-	bool "Enable compiler OpenMP support"
-	depends on !BR2_PTHREADS_NONE && !BR2_avr32 && !BR2_arc
-	help
-	  Enable OpenMP support for the compiler
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
deleted file mode 100644
index c8a8cf63a7..0000000000
--- a/toolchain/gcc/Config.in.2
+++ /dev/null
@@ -1,34 +0,0 @@
-config BR2_PACKAGE_GCC_TARGET
-	bool "gcc"
-	# We no longer want to support a toolchain on the target
-	depends on BR2_DEPRECATED
-	depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
-	select BR2_PACKAGE_BINUTILS
-	select BR2_PACKAGE_BINUTILS_TARGET
-	select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X || BR2_GCC_VERSION_4_7_X || BR2_GCC_VERSION_SNAP)
-	select BR2_PACKAGE_MPFR
-	select BR2_PACKAGE_GMP
-	help
-	  If you want the target system to be able to run
-	  binutils/gcc and compile native code, say Y here.
-
-config BR2_GCC_CROSS_FORTRAN
-	bool "fortran support"
-	depends on !BR2_avr32 && BR2_PACKAGE_GCC_TARGET
-	help
-	  Build a Fortran compiler
-
-config BR2_GCC_CROSS_OBJC
-	bool "objective-c support"
-	depends on !BR2_avr32 && BR2_PACKAGE_GCC_TARGET
-	help
-	  Build an Objective-C compiler
-
-config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
-	string "Additional target gcc options"
-	default ""
-	depends on BR2_PACKAGE_GCC_TARGET
-	help
-	  Any additional target gcc options you may want to include....
-	  Including, but not limited to --disable-checking etc.
-	  Refer to */configure in your gcc sources.
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
deleted file mode 100644
index b1484ebdba..0000000000
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ /dev/null
@@ -1,640 +0,0 @@
-################################################################################
-#
-# Makefile for to build a gcc/uClibc toolchain
-#
-# Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
-# Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-################################################################################
-
-GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
-
-ifeq ($(BR2_GCC_VERSION_SNAP),y)
-GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
-else
-GCC_SNAP_DATE:=
-endif
-
-ifneq ($(GCC_SNAP_DATE),)
- GCC_SITE:=ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
-else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
- GCC_SITE:=ftp://www.at91.com/pub/buildroot/
-else ifeq ($(findstring arc,$(GCC_VERSION)),arc)
- GCC_SITE:=$(BR2_ARC_SITE)
-else
- GCC_SITE:=$(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
-endif
-
-GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
-GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
-GCC_CAT:=$(BZCAT)
-GCC_SRC_DIR:=$(GCC_DIR)
-
-# Branding works on >= 4.3
-ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)
-EXTRA_GCC_CONFIG_OPTIONS+=--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
-	--with-bugurl="http://bugs.buildroot.net/"
-endif
-
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43810
-# Workaround until it's fixed in 4.5.4 or later
-ifeq ($(ARCH),powerpc)
-ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
-GCC_OPTSPACE=--disable-target-optspace
-endif
-else
-GCC_OPTSPACE=--enable-target-optspace
-endif
-
-# gcc 4.6.x quadmath requires wchar
-ifneq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
-GCC_QUADMATH=--disable-libquadmath
-endif
-
-# Determine soft-float options
-ifeq ($(BR2_SOFT_FLOAT),y)
-# only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float
-# powerpc seems to be needing it as well
-ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
-SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
-endif
-ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm
-TARGET_SOFT_FLOAT:=-mfloat-abi=soft
-else
-TARGET_SOFT_FLOAT:=-msoft-float
-endif
-else # no softfloat support
-SOFT_FLOAT_CONFIG_OPTION:=
-TARGET_SOFT_FLOAT:=
-endif
-
-# Determine arch/tune/abi/cpu options
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
-GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH)
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
-GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE)
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
-GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
-GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
-else
-GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
-endif
-endif
-
-# AVR32 GCC special configuration
-ifeq ($(BR2_avr32),y)
-# For the cross-compiler
-EXTRA_GCC_CONFIG_OPTIONS += \
-	--disable-libmudflap
-SOFT_FLOAT_CONFIG_OPTION:=
-
-# For the target compiler
-EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
-	--disable-libmudflap
-EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
-	--with-build-time-tools=$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin
-EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
-	--with-as=$(TARGET_CROSS)as
-endif
-
-# Disable mudflap and enable proper double/long double for SPE ABI
-ifeq ($(BR2_powerpc_SPE),y)
-EXTRA_GCC_CONFIG_OPTIONS +=  \
-	--disable-libmudflap \
-	--enable-e500_double \
-	--with-long-double-128
-endif
-
-# End with user-provided options, so that they can override previously
-# defined options.
-EXTRA_GCC_CONFIG_OPTIONS += \
-	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
-EXTRA_TARGET_GCC_CONFIG_OPTIONS += \
-	$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
-
-################################################################################
-#
-# Setup some initial stuff
-#
-################################################################################
-
-GCC_STAGING_PREREQ+=$(STAGING_DIR)/usr/lib/libc.a
-
-GCC_TARGET_LANGUAGES:=c
-
-GCC_CROSS_LANGUAGES:=c
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),c++
-endif
-ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
-GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran
-endif
-ifeq ($(BR2_GCC_CROSS_OBJC),y)
-GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
-endif
-
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),c++
-endif
-
-ifeq ($(BR2_INSTALL_OBJC),y)
-GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc
-endif
-
-ifeq ($(BR2_INSTALL_FORTRAN),y)
-GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran
-endif
-
-# GCC 4.x prerequisites
-GCC_WITH_HOST_GMP = --with-gmp=$(HOST_DIR)/usr
-GCC_WITH_HOST_MPFR = --with-mpfr=$(HOST_DIR)/usr
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE += host-gmp-source host-mpfr-source
-endif
-GCC_HOST_PREREQ = host-gmp host-mpfr
-GCC_TARGET_PREREQ += mpfr gmp
-
-ifeq ($(BR2_GCC_NEEDS_MPC),y)
-GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
-GCC_TARGET_PREREQ += mpc
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE += host-mpc-source
-endif
-GCC_HOST_PREREQ += host-mpc
-endif
-
-ifeq ($(BR2_GCC_VERSION_4_4_7_ARC),y)
-GCC_HOST_PREREQ += host-flex host-bison
-endif
-
-ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
-GCC_SHARED_LIBGCC:=--enable-shared
-else
-GCC_SHARED_LIBGCC:=--disable-shared
-endif
-
-ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
-GCC_ENABLE_OPENMP:=--enable-libgomp
-else
-GCC_ENABLE_OPENMP:=--disable-libgomp
-endif
-
-ifeq ($(BR2_GCC_ENABLE_TLS),y)
-GCC_TLS:=--enable-tls
-else
-GCC_TLS:=--disable-tls
-endif
-
-ifeq ($(BR2_PTHREADS_NONE),y)
-THREADS:=--disable-threads --disable-libitm --disable-libatomic
-else
-THREADS:=--enable-threads
-endif
-
-ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-GCC_DECIMAL_FLOAT:=--disable-decimal-float
-endif
-
-# gcc version < 4.2.0 don't have -Wno-overlength-strings and the configure
-# script has problems detecting it, so help it
-ifeq ($(shell test $(HOSTCC_VERSION) -lt 420 && echo OLD),OLD)
-GCC_CONF_ENV:=acx_cv_prog_cc_pedantic__Wno_long_long__Wno_variadic_macros_____________Wno_overlength_strings=no \
-	acx_cv_prog_cc_warning__Wno_overlength_strings=no
-endif
-
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-HOST_SOURCE+=gcc-source
-endif
-
-$(DL_DIR)/$(GCC_SOURCE):
-	mkdir -p $(DL_DIR)
-	$(Q)$(call MESSAGE,"Downloading gcc")
-	$(call DOWNLOAD,$(GCC_SITE:/=)/$(GCC_SOURCE))
-
-gcc-unpacked: $(GCC_DIR)/.patched
-$(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
-	$(Q)$(call MESSAGE,"Extracting gcc")
-	mkdir -p $(TOOLCHAIN_DIR)
-	rm -rf $(GCC_DIR)
-	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-	$(call CONFIG_UPDATE,$(@D))
-ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
-	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
-		$(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
-endif
-	touch $@
-
-gcc-patched: $(GCC_DIR)/.patched
-$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
-	$(Q)$(call MESSAGE,"Patching gcc")
-	# Apply any files named gcc-*.patch from the source directory to gcc
-ifneq ($(wildcard $(GCC_PATCH_DIR)),)
-	support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch
-endif
-
-ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
-ifneq ($(BR2_SOFT_FLOAT),)
-	support/scripts/apply-patches.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
-endif
-endif
-	touch $@
-
-################################################################################
-#
-# build the first pass gcc compiler
-#
-################################################################################
-GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial
-
-$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
-	$(Q)$(call MESSAGE,"Configuring gcc pass-1")
-	mkdir -p $(GCC_BUILD_DIR1)
-	(cd $(GCC_BUILD_DIR1); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		MAKEINFO=missing \
-		$(GCC_DIR)/configure $(QUIET) \
-		--prefix=$(HOST_DIR)/usr \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		--enable-languages=c \
-		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
-		--disable-__cxa_atexit \
-		$(GCC_OPTSPACE) \
-		$(GCC_QUADMATH) \
-		$(GCC_ENABLE_OPENMP) \
-		--with-gnu-ld \
-		--disable-shared \
-		--disable-libssp \
-		--without-headers \
-		--with-newlib \
-		--disable-multilib \
-		$(GCC_TLS) \
-		$(GCC_WITH_HOST_GMP) \
-		$(GCC_WITH_HOST_MPFR) \
-		$(GCC_WITH_HOST_MPC) \
-		$(DISABLE_NLS) \
-		$(THREADS) \
-		$(GCC_DECIMAL_FLOAT) \
-		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
-		$(DISABLE_LARGEFILE) \
-		$(EXTRA_GCC_CONFIG_OPTIONS) \
-	)
-	touch $@
-
-$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
-	$(Q)$(call MESSAGE,"Building gcc pass-1")
-ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-	$(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
-else
-	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
-endif
-	touch $@
-
-gcc_initial=$(GCC_BUILD_DIR1)/.installed
-$(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
-	$(Q)$(call MESSAGE,"Installing gcc pass-1")
-	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
-	touch $(gcc_initial)
-
-gcc_initial: $(GCC_HOST_PREREQ) host-binutils $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
-
-gcc_initial-clean:
-	rm -rf $(GCC_BUILD_DIR1)
-
-gcc_initial-dirclean:
-	rm -rf $(GCC_BUILD_DIR1) $(GCC_DIR)
-
-################################################################################
-#
-# build the second pass gcc compiler
-#
-################################################################################
-GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-intermediate
-
-# The --without-headers option stopped working with gcc 3.0 and has never been
-# fixed, so we need to actually have working C library header files prior to
-# the step or libgcc will not build...
-
-$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
-	$(Q)$(call MESSAGE,"Configuring gcc pass-2")
-	mkdir -p $(GCC_BUILD_DIR2)
-	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		MAKEINFO=missing \
-		$(GCC_DIR)/configure $(QUIET) \
-		--prefix=$(HOST_DIR)/usr \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		--enable-languages=c \
-		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
-		--disable-__cxa_atexit \
-		$(GCC_OPTSPACE) \
-		$(GCC_QUADMATH) \
-		$(GCC_ENABLE_OPENMP) \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-libssp \
-		--disable-multilib \
-		$(GCC_TLS) \
-		$(GCC_WITH_HOST_GMP) \
-		$(GCC_WITH_HOST_MPFR) \
-		$(GCC_WITH_HOST_MPC) \
-		$(DISABLE_NLS) \
-		$(THREADS) \
-		$(MULTILIB) \
-		$(GCC_DECIMAL_FLOAT) \
-		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
-		$(DISABLE_LARGEFILE) \
-		$(EXTRA_GCC_CONFIG_OPTIONS) \
-	)
-	touch $@
-
-$(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
-	$(Q)$(call MESSAGE,"Building gcc pass-2")
-	# gcc >= 4.3.0 have to also build all-target-libgcc
-ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-	$(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc
-else
-	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc
-endif
-	touch $@
-
-gcc_intermediate=$(GCC_BUILD_DIR2)/.installed
-$(gcc_intermediate): $(GCC_BUILD_DIR2)/.compiled
-	$(Q)$(call MESSAGE,"Installing gcc pass-2")
-	# gcc >= 4.3.0 have to also install install-target-libgcc
-ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc
-else
-	$(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc
-endif
-	touch $(gcc_intermediate)
-
-gcc_intermediate: uclibc-configured $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
-
-gcc_intermediate-clean:
-	rm -rf $(GCC_BUILD_DIR2)
-
-gcc_intermediate-dirclean:
-	rm -rf $(GCC_BUILD_DIR2) $(GCC_DIR)
-
-################################################################################
-#
-# third pass compiler build. Build the compiler targeting
-# the newly built shared uClibc library.
-#
-################################################################################
-#
-# Sigh... I had to rework things because using --with-gxx-include-dir
-# causes issues with include dir search order for g++. This seems to
-# have something to do with "path translations" and possibly doesn't
-# affect gcc-target. However, I haven't tested gcc-target yet so no
-# guarantees. mjn3
-
-GCC_BUILD_DIR3:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final
-$(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
-	$(Q)$(call MESSAGE,"Configuring gcc final")
-	mkdir -p $(GCC_BUILD_DIR3)
-	# Important! Required for limits.h to be fixed.
-	ln -snf ../include/ $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sys-include
-	(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		MAKEINFO=missing \
-		$(GCC_SRC_DIR)/configure $(QUIET) \
-		--prefix=$(HOST_DIR)/usr \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		--enable-languages=$(GCC_CROSS_LANGUAGES) \
-		--with-sysroot=$(STAGING_DIR) \
-		--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin \
-		--disable-__cxa_atexit \
-		$(GCC_OPTSPACE) \
-		$(GCC_QUADMATH) \
-		$(GCC_ENABLE_OPENMP) \
-		--with-gnu-ld \
-		--disable-libssp \
-		--disable-multilib \
-		$(GCC_TLS) \
-		$(GCC_SHARED_LIBGCC) \
-		$(GCC_WITH_HOST_GMP) \
-		$(GCC_WITH_HOST_MPFR) \
-		$(GCC_WITH_HOST_MPC) \
-		$(DISABLE_NLS) \
-		$(THREADS) \
-		$(GCC_DECIMAL_FLOAT) \
-		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
-		$(DISABLE_LARGEFILE) \
-		$(EXTRA_GCC_CONFIG_OPTIONS) \
-	)
-	touch $@
-
-$(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
-	$(Q)$(call MESSAGE,"Building gcc final")
-	$(GCC_CONF_ENV) $(HOST_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all
-	touch $@
-
-$(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled
-	$(Q)$(call MESSAGE,"Installing gcc final")
-	$(HOST_MAKE_ENV) $(MAKE) \
-		-C $(GCC_BUILD_DIR3) install
-	if [ -d "$(STAGING_DIR)/lib64" ]; then \
-		if [ ! -e "$(STAGING_DIR)/lib" ]; then \
-			mkdir -p "$(STAGING_DIR)/lib"; \
-		fi; \
-		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
-		rmdir "$(STAGING_DIR)/lib64"; \
-		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
-	fi
-	# Make sure we have 'cc'.
-	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
-		ln -snf $(GNU_TARGET_NAME)-gcc \
-			$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc; \
-	fi
-	if [ ! -e $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc ]; then \
-		ln -snf gcc $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin/cc; \
-	fi
-	# arch-linux-* symlinks
-	cd $(HOST_DIR)/usr/bin; for i in $(GNU_TARGET_NAME)-*; do \
-		ln -snf $$i $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \
-	done
-
-	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
-	touch $@
-
-$(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed
-	$(Q)$(call MESSAGE,"Installing gcc final libraries to staging and target")
-ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
-	# These go in /lib, so...
-	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
-	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
-		$(STAGING_DIR)/lib/
-	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
-		$(TARGET_DIR)/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s*
-endif
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
-	mkdir -p $(TARGET_DIR)/usr/lib
-	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libstdc++.so* \
-		$(STAGING_DIR)/usr/lib/
-	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libstdc++.so* \
-		$(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so*
-endif
-endif
-ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
-	cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgomp.so* $(STAGING_DIR)/usr/lib/
-	cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgomp.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgomp.so*
-endif
-	mkdir -p $(@D)
-	touch $@
-
-cross_compiler:=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc
-cross_compiler gcc: gcc_intermediate \
-	uclibc $(GCC_BUILD_DIR3)/.installed \
-	$(STAMP_DIR)/gcc_libs_target_installed
-
-gcc-source: $(DL_DIR)/$(GCC_SOURCE)
-
-gcc-clean:
-	rm -rf $(GCC_BUILD_DIR3)
-	for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \
-		rm -f $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \
-	done
-
-gcc-dirclean: gcc_initial-dirclean
-	rm -rf $(GCC_BUILD_DIR3)
-
-################################################################################
-#
-# Next build target gcc compiler
-#
-################################################################################
-GCC_BUILD_DIR4:=$(BUILD_DIR)/gcc-$(GCC_VERSION)-target
-
-$(GCC_BUILD_DIR4)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed
-	mkdir -p $(GCC_BUILD_DIR4)
-	touch $@
-
-$(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
-	$(Q)$(call MESSAGE,"Configuring gcc on target")
-	(cd $(GCC_BUILD_DIR4); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
-		CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
-		CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
-		BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
-		GCC_FOR_TARGET="$(TARGET_CC)" \
-		CC_FOR_TARGET="$(TARGET_CC)" \
-		CXX_FOR_TARGET="$(TARGET_CXX)" \
-		$(GCC_SRC_DIR)/configure $(QUIET) \
-		--prefix=/usr \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--target=$(GNU_TARGET_NAME) \
-		--enable-languages=$(GCC_TARGET_LANGUAGES) \
-		--with-gxx-include-dir=/usr/include/c++ \
-		--disable-__cxa_atexit \
-		$(GCC_OPTSPACE) \
-		$(GCC_QUADMATH) \
-		$(GCC_ENABLE_OPENMP) \
-		--with-gnu-ld \
-		--disable-libssp \
-		--disable-multilib \
-		$(GCC_TLS) \
-		$(GCC_SHARED_LIBGCC) \
-		$(DISABLE_NLS) \
-		$(THREADS) \
-		$(GCC_DECIMAL_FLOAT) \
-		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
-		$(DISABLE_LARGEFILE) \
-		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \
-	)
-	touch $@
-
-$(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured
-	$(Q)$(call MESSAGE,"Building gcc on target")
-	$(TARGET_MAKE_ENV) \
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(GCC_BUILD_DIR4) all
-	touch $@
-
-GCC_LIB_SUBDIR=lib/gcc/$(GNU_TARGET_NAME)/$(GCC_VERSION)
-ifeq ($(findstring x4.2,x$(GCC_VERSION)),x4.2)
-GCC_INCLUDE_DIR:=include
-else
-GCC_INCLUDE_DIR:=include-fixed
-endif
-
-$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
-	$(Q)$(call MESSAGE,"Installing gcc on target")
-	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \
-		$(MAKE1) -C $(GCC_BUILD_DIR4) install
-	# Remove broken specs file (cross compile flag is set).
-	rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs
-
-	# Remove useless copies of gcc, c++, g++
-	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc*
-	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-g++*
-	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-c++*
-
-	# Work around problem of missing syslimits.h
-	if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \
-		echo "warning: working around missing syslimits.h"; \
-		cp -f $(HOST_DIR)/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h \
-			$(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/; \
-	fi
-
-	# Make sure we have 'cc'.
-	if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \
-		ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \
-	fi
-
-	# Copy C runtime initialization object files
-	cp -f $(STAGING_DIR)/usr/lib/*crt*.o $(TARGET_DIR)/usr/lib
-
-	# These are in /lib, so...
-	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
-	touch -c $@
-
-gcc_target: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc
-
-gcc_target-clean:
-	rm -rf $(GCC_BUILD_DIR4)
-	rm -f $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)*
-
-gcc_target-dirclean:
-	rm -rf $(GCC_BUILD_DIR4)
-
-ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
-TARGETS+=gcc_target
-endif
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index a8dd58b314..b2eb9deb22 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -1,4 +1,9 @@
 # Include files required for the internal toolchain backend
 
-include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/uClibc/uclibc.mk
+
+# Triggerring the build of the host-gcc-final will automaticaly do the
+# build of binutils, uClibc, kernel headers and all the intermediate
+# gcc steps.
+
+toolchain-buildroot: host-gcc-final
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 3d70fa19aa..4ad0603a2c 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -4,5 +4,5 @@ if BR2_TOOLCHAIN_BUILDROOT
 source "package/linux-headers/Config.in.host"
 source "toolchain/uClibc/Config.in"
 source "package/binutils/Config.in.host"
-source "toolchain/gcc/Config.in"
+source "package/gcc/Config.in.host"
 endif
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index 4f9c29c19a..6ef73bb98d 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -2,6 +2,5 @@
 
 # Explicit ordering:
 include toolchain/helpers.mk
-include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index 40fc633138..1198a57d9e 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -1,6 +1,5 @@
 # Required includes for the external toolchain backend
 
 include toolchain/helpers.mk
-include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/toolchain-external/ext-tool.mk
 include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index e06fafc85d..06f5b2300d 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -394,14 +394,14 @@ endif
 $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 	$(Q)$(call MESSAGE,"Configuring uClibc")
 	cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config
-	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/usr/include
-	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib
-	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/lib
+	mkdir -p $(STAGING_DIR)/usr/include
+	mkdir -p $(STAGING_DIR)/usr/lib
+	mkdir -p $(STAGING_DIR)/lib
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		RUNTIME_PREFIX=$(STAGING_DIR) \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
@@ -430,26 +430,20 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config
 	$(Q)$(call MESSAGE,"Installing uClibc headers")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		RUNTIME_PREFIX=$(STAGING_DIR) \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" headers \
 		lib/crt1.o lib/crti.o lib/crtn.o \
 		install_headers
-	# Install the kernel headers to the first stage gcc include dir
-	# if necessary
-	if [ ! -f $(TOOLCHAIN_DIR)/uClibc_dev/usr/include/linux/version.h ]; then \
-		cp -pLR $(STAGING_DIR)/usr/include/* \
-			$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \
-	fi
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libc.so
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/libm.so
-	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib/
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libm.so
+	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(STAGING_DIR)/usr/lib/
 	touch $@
 
-$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate)
+$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(HOST_GCC_INTERMEDIATE_TARGET_INSTALL_HOST)
 	$(Q)$(call MESSAGE,"Building uClibc")
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
@@ -465,9 +459,9 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_intermediate)
 uclibc-menuconfig: dirs $(UCLIBC_DIR)/.config
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
+		RUNTIME_PREFIX=$(STAGING_DIR) \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 		HOSTCC="$(HOSTCC)" \
@@ -530,7 +524,7 @@ UCLIBC_TARGETS+=uclibc-test
 endif
 endif
 
-uclibc: $(gcc_intermediate) $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS)
+uclibc: host-gcc-intermediate $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 
@@ -543,7 +537,7 @@ uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
 uclibc-update-config: uclibc-config
 	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
-uclibc-configured: gcc_initial linux-headers $(UCLIBC_DIR)/.configured
+uclibc-configured: host-gcc-initial linux-headers $(UCLIBC_DIR)/.configured
 
 uclibc-configured-source: uclibc-source
 

From 00e9b1e4f78633d5667b187332f36972a94b9f8b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:04 +0200
Subject: [PATCH 5575/6849] gcc-initial, gcc-intermediate, gcc-final: optimize
 extraction

Several sub-directories of the gcc code base are in fact not needed
for the Buildroot build: libjava/, libgo/ and gcc/testsuite/ being the
biggest ones. Avoiding their extraction saves quite a bit of disk
space, and compensates a bit the fact that we now extract three times
the gcc source code.

This requires changing the 100-uclibc-conf.patch to no longer patch
files from the libjava/ directory, since this directory is no longer
extracted.

[Peter: add comment about why this is done]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/4.3.6/100-uclibc-conf.patch       | 20 -----------------
 package/gcc/4.4.7/100-uclibc-conf.patch       | 20 -----------------
 package/gcc/4.5.4/100-uclibc-conf.patch       | 20 -----------------
 package/gcc/4.6.4/100-uclibc-conf.patch       | 20 -----------------
 package/gcc/4.7.3/100-uclibc-conf.patch       | 20 -----------------
 package/gcc/4.8.1/100-uclibc-conf.patch       | 22 -------------------
 package/gcc/gcc-final/gcc-final.mk            |  2 ++
 package/gcc/gcc-initial/gcc-initial.mk        |  2 ++
 .../gcc/gcc-intermediate/gcc-intermediate.mk  |  2 ++
 package/gcc/gcc.mk                            | 17 ++++++++++++++
 10 files changed, 23 insertions(+), 122 deletions(-)

diff --git a/package/gcc/4.3.6/100-uclibc-conf.patch b/package/gcc/4.3.6/100-uclibc-conf.patch
index cca8c82292..6bad179e62 100644
--- a/package/gcc/4.3.6/100-uclibc-conf.patch
+++ b/package/gcc/4.3.6/100-uclibc-conf.patch
@@ -11,23 +11,3 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/package/gcc/4.4.7/100-uclibc-conf.patch b/package/gcc/4.4.7/100-uclibc-conf.patch
index cca8c82292..6bad179e62 100644
--- a/package/gcc/4.4.7/100-uclibc-conf.patch
+++ b/package/gcc/4.4.7/100-uclibc-conf.patch
@@ -11,23 +11,3 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/package/gcc/4.5.4/100-uclibc-conf.patch b/package/gcc/4.5.4/100-uclibc-conf.patch
index cca8c82292..6bad179e62 100644
--- a/package/gcc/4.5.4/100-uclibc-conf.patch
+++ b/package/gcc/4.5.4/100-uclibc-conf.patch
@@ -11,23 +11,3 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/package/gcc/4.6.4/100-uclibc-conf.patch b/package/gcc/4.6.4/100-uclibc-conf.patch
index cca8c82292..6bad179e62 100644
--- a/package/gcc/4.6.4/100-uclibc-conf.patch
+++ b/package/gcc/4.6.4/100-uclibc-conf.patch
@@ -11,23 +11,3 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/package/gcc/4.7.3/100-uclibc-conf.patch b/package/gcc/4.7.3/100-uclibc-conf.patch
index cca8c82292..6bad179e62 100644
--- a/package/gcc/4.7.3/100-uclibc-conf.patch
+++ b/package/gcc/4.7.3/100-uclibc-conf.patch
@@ -11,23 +11,3 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/package/gcc/4.8.1/100-uclibc-conf.patch b/package/gcc/4.8.1/100-uclibc-conf.patch
index d855b30ee8..d56bf0a194 100644
--- a/package/gcc/4.8.1/100-uclibc-conf.patch
+++ b/package/gcc/4.8.1/100-uclibc-conf.patch
@@ -13,25 +13,3 @@ Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
-Index: gcc-4.8.0/libjava/classpath/ltconfig
-===================================================================
---- gcc-4.8.0.orig/libjava/classpath/ltconfig	2011-02-13 12:45:53.000000000 +0100
-+++ gcc-4.8.0/libjava/classpath/ltconfig	2013-03-23 17:39:04.000000000 +0100
-@@ -603,7 +603,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1247,7 +1247,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 1767bbbdf2..998c928f61 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -12,6 +12,8 @@ HOST_GCC_FINAL_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
 	uclibc
 
+HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
+
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
 HOST_GCC_FINAL_POST_EXTRACT_CMDS += HOST_GCC_FINAL_XTENSA_OVERLAY_EXTRACT
 endif
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index e07783e592..05c956abcb 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -10,6 +10,8 @@ GCC_INITIAL_SOURCE  = $(GCC_SOURCE)
 
 HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
 
+HOST_GCC_INITIAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
+
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
 HOST_GCC_INITIAL_POST_EXTRACT_CMDS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
 endif
diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
index 0c062a7564..6b6b57e1f7 100644
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -12,6 +12,8 @@ HOST_GCC_INTERMEDIATE_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
 	uclibc-configured
 
+HOST_GCC_INTERMEDIATE_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
+
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
 HOST_GCC_INTERMEDIATE_POST_EXTRACT_CMDS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
 endif
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 3b61ffd454..790762da72 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -42,6 +42,23 @@ define HOST_GCC_APPLY_PATCHES
 	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch
 endef
 
+#
+# Custom extract command to save disk space
+#
+
+define HOST_GCC_EXTRACT_CMDS
+	$(BZCAT) $(DL_DIR)/$(GCC_SOURCE) | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) \
+		--exclude='libjava/*' \
+		--exclude='libgo/*' \
+		--exclude='gcc/testsuite/*' \
+		--exclude='libstdc++-v3/testsuite/*' \
+		$(TAR_OPTIONS) -
+	mkdir -p $(@D)/libstdc++-v3/testsuite/
+	echo "all:" > $(@D)/libstdc++-v3/testsuite/Makefile.in
+	echo "install:" >> $(@D)/libstdc++-v3/testsuite/Makefile.in
+endef
+
 #
 # Create 'build' directory and configure symlink
 #

From a5e92d92e7ee413157aae7cecf1f354e718731e1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:05 +0200
Subject: [PATCH 5576/6849] uclibc: convert to the package infrastructure

[Peter: update manual to match]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-uclibc-config.txt       |   4 +-
 .../gcc/gcc-intermediate/gcc-intermediate.mk  |   2 +-
 ...c_epoll_pwait-compile-failure-on-x86.patch |   0
 ...0-__fe_nomask_env-use-of-__set_errno.patch |   0
 .../uclibc-linuxthreads-errno-fix.patch       |   0
 .../0.9.32.1/uclibc-sparc-errno-fix.patch     |   0
 .../uclibc/0.9.32.1/uclibc-unshare.patch      |   0
 .../uclibc-OpenWRT-140-avr32_atomic_fix.patch |   0
 ...ibc-bits-time.h-sync-with-glibc-2.16.patch |   0
 .../uclibc-define-MSG_CMSG_CLOEXEC.patch      |   0
 .../uclibc/0.9.33.2/uclibc-dup3.patch         |   0
 package/uclibc/Config.in                      | 166 +++++
 .../uclibc}/uClibc-0.9.32.config              |   0
 .../uclibc}/uClibc-0.9.33.config              |   0
 .../uclibc}/uClibc-snapshot.config            |   0
 package/uclibc/uclibc.mk                      | 484 ++++++++++++++
 toolchain/toolchain-buildroot.mk              |   4 -
 toolchain/toolchain-buildroot/Config.in       |   2 +-
 toolchain/toolchain-crosstool-ng.mk           |   1 -
 .../toolchain-crosstool-ng/crosstool-ng.mk    |   2 +-
 toolchain/toolchain-external.mk               |   1 -
 toolchain/uClibc/Config.in                    |  97 ---
 toolchain/uClibc/uclibc.mk                    | 610 ------------------
 23 files changed, 655 insertions(+), 718 deletions(-)
 rename toolchain/uClibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch => package/uclibc/0.9.32.1/uclibc-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch => package/uclibc/0.9.32.1/uclibc-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch => package/uclibc/0.9.32.1/uclibc-linuxthreads-errno-fix.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.32.1-sparc-errno-fix.patch => package/uclibc/0.9.32.1/uclibc-sparc-errno-fix.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.32.1-unshare.patch => package/uclibc/0.9.32.1/uclibc-unshare.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch => package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch => package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch => package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch (100%)
 rename toolchain/uClibc/uClibc-0.9.33.2-dup3.patch => package/uclibc/0.9.33.2/uclibc-dup3.patch (100%)
 create mode 100644 package/uclibc/Config.in
 rename {toolchain/uClibc => package/uclibc}/uClibc-0.9.32.config (100%)
 rename {toolchain/uClibc => package/uclibc}/uClibc-0.9.33.config (100%)
 rename {toolchain/uClibc => package/uclibc}/uClibc-snapshot.config (100%)
 create mode 100644 package/uclibc/uclibc.mk
 delete mode 100644 toolchain/uClibc/Config.in
 delete mode 100644 toolchain/uClibc/uclibc.mk

diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt
index 7fd20f706b..53dea92db3 100644
--- a/docs/manual/customize-uclibc-config.txt
+++ b/docs/manual/customize-uclibc-config.txt
@@ -19,14 +19,14 @@ follow these steps:
   similar to the one used in the Linux kernel or Buildroot,
   appears. Make your configuration changes as appropriate.
 
-* Copy the +$(O)/toolchain/uClibc-VERSION/.config+ file to a different
+* Copy the +$(O)/build/uClibc-VERSION/.config+ file to a different
   place (e.g. +board/MANUFACTURER/BOARDNAME/uClibc.config+) and adjust
   the uClibc configuration file option +BR2_UCLIBC_CONFIG+ to refer to this
   configuration instead of the default one.
 
 * Run the compilation of Buildroot again.
 
-Otherwise, you can simply change +toolchain/uClibc/uClibc-VERSION.config+,
+Otherwise, you can simply change +package/uclibc/uClibc-VERSION.config+,
 without running the configuration assistant.
 
 If you want to use an existing config file for uClibc, then see
diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
index 6b6b57e1f7..3a71671961 100644
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -10,7 +10,7 @@ GCC_INTERMEDIATE_SOURCE  = $(GCC_SOURCE)
 
 HOST_GCC_INTERMEDIATE_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
-	uclibc-configured
+	uclibc-configure
 
 HOST_GCC_INTERMEDIATE_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
 
diff --git a/toolchain/uClibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/package/uclibc/0.9.32.1/uclibc-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32.1-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
rename to package/uclibc/0.9.32.1/uclibc-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch b/package/uclibc/0.9.32.1/uclibc-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32.1-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
rename to package/uclibc/0.9.32.1/uclibc-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch b/package/uclibc/0.9.32.1/uclibc-linuxthreads-errno-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32.1-linuxthreads-errno-fix.patch
rename to package/uclibc/0.9.32.1/uclibc-linuxthreads-errno-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32.1-sparc-errno-fix.patch b/package/uclibc/0.9.32.1/uclibc-sparc-errno-fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32.1-sparc-errno-fix.patch
rename to package/uclibc/0.9.32.1/uclibc-sparc-errno-fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.32.1-unshare.patch b/package/uclibc/0.9.32.1/uclibc-unshare.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32.1-unshare.patch
rename to package/uclibc/0.9.32.1/uclibc-unshare.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch b/package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch
rename to package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch b/package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch
rename to package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch b/package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch
rename to package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch
diff --git a/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch b/package/uclibc/0.9.33.2/uclibc-dup3.patch
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
rename to package/uclibc/0.9.33.2/uclibc-dup3.patch
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
new file mode 100644
index 0000000000..22c70a2b48
--- /dev/null
+++ b/package/uclibc/Config.in
@@ -0,0 +1,166 @@
+comment "uClibc Options"
+
+choice
+	prompt "uClibc C library Version"
+	default BR2_UCLIBC_VERSION_0_9_33
+	help
+	  Select the version of uClibc you wish to use.
+
+	config BR2_UCLIBC_VERSION_0_9_32
+		bool "uClibc 0.9.32.x"
+		depends on !(BR2_arc || BR2_avr32 || BR2_sh || BR2_xtensa)
+
+	config BR2_UCLIBC_VERSION_0_9_33
+		bool "uClibc 0.9.33.x"
+		depends on !(BR2_arc || BR2_xtensa)
+
+	config BR2_UCLIBC_VERSION_0_9_33_ARC
+		bool "uClibc 0.9.33.x-arc"
+		depends on BR2_arc
+
+	config BR2_UCLIBC_VERSION_SNAPSHOT
+		bool "daily snapshot"
+
+endchoice
+
+config BR2_USE_UCLIBC_SNAPSHOT
+	string "Date (yyyymmdd) of snapshot or 'snapshot' for latest"
+	default "snapshot"
+	depends on BR2_UCLIBC_VERSION_SNAPSHOT
+	help
+	    Use latest snapshot or one from a specific date?
+
+config BR2_UCLIBC_VERSION_STRING
+	string
+	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
+	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
+	default 0.9.33-arc	if BR2_UCLIBC_VERSION_0_9_33_ARC
+	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
+
+config BR2_UCLIBC_CONFIG
+	string "uClibc configuration file to use?"
+	default "package/uclibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
+	default "package/uclibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
+	default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_0_9_33_ARC
+	default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
+	help
+	  Some people may wish to use their own modified uClibc configuration
+	  file and will specify their config file location with this option.
+	  See also docs/README in this package.
+	  If unsure, use the default.
+
+config BR2_UCLIBC_INSTALL_TEST_SUITE
+	bool "Compile and install uClibc tests"
+	select BR2_PACKAGE_MAKE
+	help
+	  Enabling this option will compile and install the uClibc test suite.
+	  This is useful if you want to check if the uClibc library is working
+	  for your architecture and/or help developing uClibc.
+
+	  The test suite will be installed into /root/uClibc directory. To run
+	  the test suite enter the /root/uClibc/test directory and type
+	  "make UCLIBC_ONLY=1 CC=/bin/true check".
+
+	  See the /root/uClibc/test/README for additional information.
+
+	  This is not needed at all for normal builds, so you can safely say no
+	  if you do not plan to dig into your C library.
+
+# Mapping from the Buildroot architecture configuration options to the
+# uClibc architecture names.
+config BR2_UCLIBC_TARGET_ARCH
+	string
+	default arc	   if BR2_arcle || BR2_arceb
+	default arm	   if BR2_arm	|| BR2_armeb
+	default avr32	   if BR2_avr32
+	default bfin	   if BR2_bfin
+	default m68k	   if BR2_m68k
+	default mips	   if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default powerpc	   if BR2_powerpc
+	default sh	   if BR2_sh
+	default sparc	   if BR2_sparc
+	default xtensa	   if BR2_xtensa
+	default i386	   if BR2_i386
+	default x86_64	   if BR2_x86_64
+
+# This is only useful for uClibc <= 0.9.32. It can be removed once
+# Buildroot will support only uClibc >= 0.9.33 on ARM.
+config BR2_UCLIBC_ARM_TYPE
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
+	default GENERIC_ARM	if BR2_fa526
+	default ARM7TDMI	if BR2_arm7tdmi
+	default ARM720T		if BR2_arm720t
+	default ARM920T		if BR2_arm920t
+	default ARM922T		if BR2_arm922t
+	default ARM926T		if BR2_arm926t
+	default ARM10T		if BR2_arm10t
+	default ARM1136JF_S	if BR2_arm1136jf_s
+	default ARM1176JZ_S	if BR2_arm1176jz_s
+	default ARM1176JZF_S	if BR2_arm1176jzf_s
+	default ARM_SA1100	if BR2_strongarm
+	default ARM_XSCALE	if BR2_xscale
+	default ARM_IWMMXT	if BR2_iwmmxt
+	default ARM_CORTEXA8	if BR2_cortex_a8
+	default ARM_CORTEXA9	if BR2_cortex_a9
+
+config BR2_UCLIBC_ARM_ABI
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
+	default OABI if BR2_ARM_OABI
+	default EABI if BR2_ARM_EABI
+
+config BR2_UCLIBC_ARM_BX
+	bool
+	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
+	default y if !BR2_fa265 && !BR2_strongarm
+
+config BR2_UCLIBC_MIPS_ABI
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "mips"
+	default O32 if BR2_MIPS_OABI32
+	default N32 if BR2_MIPS_NABI32
+	default N64 if BR2_MIPS_NABI64
+
+config BR2_UCLIBC_MIPS_ISA
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "mips"
+	default 1 if BR2_mips_1
+	default 2 if BR2_mips_2
+	default 3 if BR2_mips_3
+	default 4 if BR2_mips_4
+	default mips32 if BR2_mips_32
+	default mips32r2 if BR2_mips_32r2
+	default mips64 if BR2_mips_64
+
+config BR2_UCLIBC_SH_TYPE
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "sh"
+	default SHA2 if BR2_sh2
+	default SH3  if BR2_sh3 || BR2_sh3eb
+	default SH4  if BR2_sh4 || BR2_sh4eb
+
+config BR2_UCLIBC_SPARC_TYPE
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "sparc"
+	default V7	if BR2_sparc_v7 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
+	default V8	if BR2_sparc_v8 || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
+
+config BR2_UCLIBC_POWERPC_TYPE
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "powerpc"
+	default CLASSIC if !BR2_powerpc_8540 && !BR2_powerpc_8548 && !BR2_powerpc_e500mc
+	default E500    if BR2_powerpc_8540 || BR2_powerpc_8548 || BR2_powerpc_e500mc
+
+config BR2_UCLIBC_X86_TYPE
+	string
+	depends on BR2_UCLIBC_TARGET_ARCH = "i386"
+	default 386     if BR2_x86_i386
+	default 486	if BR2_x86_i486
+	default 586	if BR2_x86_i586
+	default 586MMX	if BR2_x86_pentium_mmx
+	default 686	if BR2_x86_i686 || BR2_x86_pentiumpro
+	default PENTIUMII  if BR2_x86_pentium2
+	default PENTIUMIII if BR2_x86_pentium3
+	default PENTIUM4   if BR2_x86_pentium4 || BR2_x86_pentium_m || \
+			      BR2_x86_nocona || BR2_x86_core2
diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/package/uclibc/uClibc-0.9.32.config
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.32.config
rename to package/uclibc/uClibc-0.9.32.config
diff --git a/toolchain/uClibc/uClibc-0.9.33.config b/package/uclibc/uClibc-0.9.33.config
similarity index 100%
rename from toolchain/uClibc/uClibc-0.9.33.config
rename to package/uclibc/uClibc-0.9.33.config
diff --git a/toolchain/uClibc/uClibc-snapshot.config b/package/uclibc/uClibc-snapshot.config
similarity index 100%
rename from toolchain/uClibc/uClibc-snapshot.config
rename to package/uclibc/uClibc-snapshot.config
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
new file mode 100644
index 0000000000..1c5340c85a
--- /dev/null
+++ b/package/uclibc/uclibc.mk
@@ -0,0 +1,484 @@
+################################################################################
+#
+# uclibc
+#
+################################################################################
+
+UCLIBC_VERSION = $(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
+UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.xz
+
+ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
+UCLIBC_SITE = http://www.uclibc.org/downloads/snapshots
+else ifeq ($(findstring arc,$(UCLIBC_VERSION)),arc)
+UCLIBC_SITE = $(BR2_ARC_SITE)
+UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.bz2
+else
+UCLIBC_SITE = http://www.uclibc.org/downloads
+endif
+
+UCLIBC_INSTALL_STAGING = YES
+
+# Before uClibc is configured, we must have the first stage
+# cross-compiler and the kernel headers
+UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers
+
+# Before uClibc is built, we must have the second stage cross-compiler
+uclibc-build: host-gcc-intermediate
+
+# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
+# setting.
+ifndef UCLIBC_CONFIG_FILE
+UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG))
+endif
+
+UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))
+
+ifeq ($(GENERATE_LOCALE),)
+# We need at least one locale
+UCLIBC_LOCALES = en_US
+else
+# Strip out the encoding part of locale names, if any
+UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\
+		   $(firstword $(subst .,$(space),$(locale))))
+endif
+
+#
+# Utility functions to manipulation the uClibc configuration file
+#
+
+define UCLIBC_OPT_SET
+	$(SED) '/$(1)/d' $(3)/.config
+	echo '$(1)=$(2)' >> $(3)/.config
+endef
+
+define UCLIBC_OPT_UNSET
+	$(SED) '/$(1)/d' $(2)/.config
+	echo '# $(1) is not set' >> $(2)/.config
+endef
+
+#
+# ARM definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),arm)
+UCLIBC_ARM_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_ARM_TYPE))
+
+define UCLIBC_ARM_TYPE_CONFIG
+	$(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
+		$(@D)/.config
+	$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_TYPE),y,$(@D))
+endef
+
+UCLIBC_ARM_ABI = CONFIG_ARM_$(call qstrip,$(BR2_UCLIBC_ARM_ABI))
+
+define UCLIBC_ARM_ABI_CONFIG
+	$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
+	$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_ABI),y,$(@D))
+endef
+
+ifeq ($(BR2_UCLIBC_ARM_BX),y)
+define UCLIBC_ARM_BX_CONFIG
+	$(call UCLIBC_OPT_SET,USE_BX,y,$(@D))
+endef
+else
+define UCLIBC_ARM_BX_CONFIG
+	$(call UCLIBC_OPT_UNSET,USE_BX,y,$(@D))
+endef
+endif
+
+endif # arm
+
+#
+# MIPS definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),mips)
+UCLIBC_MIPS_ABI = CONFIG_MIPS_$(call qstrip,$(BR2_UCLIBC_MIPS_ABI))_ABI
+define UCLIBC_MIPS_ABI_CONFIG
+	$(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config
+	$(call UCLIBC_OPT_SET,$(UCLIBC_MIPS_ABI),y,$(@D))
+endef
+
+UCLIBC_MIPS_ISA = CONFIG_MIPS_ISA_$(call qstrip,$(BR2_UCLIBC_MIPS_ISA))
+define UCLIBC_MIPS_ISA_CONFIG
+	$(SED) '/CONFIG_MIPS_ISA_.*/d' $(@D)/.config
+	$(call UCLIBC_OPT_SET,$(UCLIBC_MIPS_ISA),y,$(@D))
+endef
+endif # mips
+
+#
+# SH definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),sh)
+UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE))
+define UCLIBC_SH_TYPE_CONFIG
+	$(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
+	$(call UCLIBC_OPT_SET,$(UCLIBC_SH_TYPE),y,$(@�))
+endef
+endif # sh
+
+#
+# SPARC definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),sparc)
+UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
+define UCLIBC_SPARC_TYPE_CONFIG
+	$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
+		 $(@�)/.config
+	$(call UCLIBC_OPT_SET,$(UCLIBC_SPARC_TYPE),y,$(@D))
+endef
+endif # sparc
+
+#
+# PowerPC definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),powerpc)
+UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE))
+define UCLIBC_POWERPC_TYPE_CONFIG
+	$(call UCLIBC_OPT_UNSET,CONFIG_GENERIC,$(@D))
+	$(call UCLIBC_OPT_UNSET,CONFIG_E500,$(@D))
+	$(call UCLIBC_OPT_SET,$(UCLIBC_POWERPC_TYPE),y,$(@�))
+endef
+endif # powerpc
+
+#
+# AVR32 definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),avr32)
+define UCLIBC_AVR32_CONFIG
+	$(call UCLIBC_OPT_SET,LINKRELAX,y,$(@D))
+endef
+endif # avr32
+
+#
+# x86 definitions
+#
+ifeq ($(UCLIBC_TARGET_ARCH),i386)
+UCLIBC_X86_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_X86_TYPE))
+define UCLIBC_X86_TYPE_CONFIG
+	$(call UCLIBC_OPT_SET,$(UCLIBC_X86_TYPE),y,$(@D))
+endef
+endif
+
+#
+# ARC definitions
+#
+ifeq ($(UCLIBC_TARGET_ARCH),arc)
+REALLY_NOSTDLIB = -really-nostdlib
+endif
+
+#
+# Endianess
+#
+
+ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG)
+define UCLIBC_ENDIAN_CONFIG
+	$(call UCLIBC_OPT_SET,ARCH_BIG_ENDIAN,y,$(@D))
+	$(call UCLIBC_OPT_SET,ARCH_WANTS_BIG_ENDIAN,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,ARCH_LITTLE_ENDIAN,$(@D))
+	$(call UCLIBC_OPT_UNSET,ARCH_WANTS_LITTLE_ENDIAN,$(@D))
+endef
+else
+define UCLIBC_ENDIAN_CONFIG
+	$(call UCLIBC_OPT_SET,ARCH_LITTLE_ENDIAN,y,$(@D))
+	$(call UCLIBC_OPT_SET,ARCH_WANTS_LITTLE_ENDIAN,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,ARCH_BIG_ENDIAN,$(@D))
+	$(call UCLIBC_OPT_UNSET,ARCH_WANTS_BIG_ENDIAN,$(@D))
+endef
+endif
+
+#
+# Largefile
+#
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LARGEFILE),y)
+define UCLIBC_LARGEFILE_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_LFS,y,$(@D))
+endef
+else
+define UCLIBC_LARGEFILE_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_LFS,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_FOPEN_LARGEFILE_MODE,$(@D))
+endef
+endif
+
+#
+# IPv6
+#
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y)
+UCLIBC_IPV6_CONFIG = $(call UCLIBC_OPT_SET,UCLIBC_HAS_IPV6,y,$(@D))
+else
+UCLIBC_IPV6_CONFIG = $(call UCLIBC_OPT_UNSET,UCLIBC_HAS_IPV6,$(@D))
+endif
+
+#
+# RPC
+#
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
+define UCLIBC_RPC_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_RPC,y,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FULL_RPC,y,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_REENTRANT_RPC,y,$(@D))
+endef
+else
+define UCLIBC_RPC_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_RPC,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_FULL_RPC,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_REENTRANT_RPC,$(@D))
+endef
+endif
+
+#
+# soft-float
+#
+
+ifeq ($(BR2_SOFT_FLOAT),y)
+define UCLIBC_FLOAT_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_FPU,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FLOATS,y,$(@D))
+	$(call UCLIBC_OPT_SET,DO_C99_MATH,y,$(@D))
+endef
+else
+define UCLIBC_FLOAT_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FPU,y,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FLOATS,y,$(@D))
+endef
+endif
+
+#
+# SSP
+#
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
+UCLIBC_SSP_CONFIG = $(call UCLIBC_OPT_SET,UCLIBC_HAS_SSP,y,$(@D))
+else
+UCLIBC_SSP_CONFIG = $(call UCLIBC_OPT_UNSET,UCLIBC_HAS_SSP,$(@D))
+endif
+
+#
+# Threads
+#
+ifeq ($(BR2_PTHREADS_NONE),y)
+define UCLIBC_THREAD_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS,$(@D))
+	$(call UCLIBC_OPT_UNSET,LINUXTHREADS,$(@D))
+	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_OLD,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS_NATIVE,$(@D))
+endef
+else ifeq ($(BR2_PTHREADS),y)
+define UCLIBC_THREAD_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS,y,$(@D))
+	$(call UCLIBC_OPT_SET,LINUXTHREADS_NEW,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_OLD,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS_NATIVE,$(@D))
+endef
+else ifeq ($(BR2_PTHREADS_OLD),y)
+define UCLIBC_THREAD_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_NEW,$(@D))
+	$(call UCLIBC_OPT_SET,LINUXTHREADS_OLD,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS_NATIVE,$(@D))
+endef
+else ifeq ($(BR2_PTHREADS_NATIVE),y)
+define UCLIBC_THREAD_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_NEW,$(@D))
+	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_OLD,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS_NATIVE,y,$(@D))
+endef
+endif
+
+#
+# Thread debug
+#
+
+ifeq ($(BR2_PTHREAD_DEBUG),y)
+UCLIBC_THREAD_DEBUG_CONFIG = $(call UCLIBC_OPT_SET,PTHREADS_DEBUG_SUPPORT,y,$(@D))
+else
+UCLIBC_THREAD_DEBUG_CONFIG = $(call UCLIBC_OPT_UNSET,PTHREADS_DEBUG_SUPPORT,$(@D))
+endif
+
+#
+# Locale
+#
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y)
+define UCLIBC_LOCALE_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_LOCALE,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_BUILD_ALL_LOCALE,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_BUILD_MINIMAL_LOCALE,y,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D))
+	$(call UCLIBC_OPT_UNSET,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_XLOCALE,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D))
+endef
+else
+define UCLIBC_LOCALE_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_LOCALE,$(@D))
+endef
+endif
+
+#
+# wchar
+#
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
+UCLIBC_WCHAR_CONFIG = $(call UCLIBC_OPT_SET,UCLIBC_HAS_WCHAR,y,$(@D))
+else
+UCLIBC_WCHAR_CONFIG = $(call UCLIBC_OPT_UNSET,UCLIBC_HAS_WCHAR,$(@D))
+endif
+
+#
+# debug
+#
+
+ifeq ($(BR2_ENABLE_DEBUG),y)
+UCLIBC_DEBUG_CONFIG = $(call UCLIBC_OPT_SET,DODEBUG,y,$(@D))
+endif
+
+#
+# strip
+#
+
+ifeq ($(BR2_STRIP_none),y)
+UCLIBC_STRIP_CONFIG = $(call UCLIBC_OPT_SET,DOSTRIP,y,$(@D))
+endif
+
+#
+# Commands
+#
+
+UCLIBC_MAKE_FLAGS = \
+	ARCH="$(UCLIBC_TARGET_ARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
+	HOSTCC="$(HOSTCC)"
+
+define UCLIBC_CONFIGURE_CMDS
+	cp -f $(UCLIBC_CONFIG_FILE) $(@D)/.config
+	$(call UCLIBC_OPT_SET,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D))
+	$(call UCLIBC_OPT_SET,TARGET_$(UCLIBC_TARGET_ARCH),y,$(@D))
+	$(call UCLIBC_OPT_SET,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D))
+	$(call UCLIBC_OPT_SET,KERNEL_HEADERS,"$(STAGING_DIR)/usr/include",$(@D))
+	$(call UCLIBC_OPT_SET,RUNTIME_PREFIX,"/",$(@D))
+	$(call UCLIBC_OPT_SET,DEVEL_PREFIX,"/usr",$(@D))
+	$(call UCLIBC_OPT_SET,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D))
+	$(UCLIBC_ARM_TYPE_CONFIG)
+	$(UCLIBC_ARM_ABI_CONFIG)
+	$(UCLIBC_ARM_BX_CONFIG)
+	$(UCLIBC_MIPS_ABI_CONFIG)
+	$(UCLIBC_MIPS_ISA_CONFIG)
+	$(UCLIBC_SH_TYPE_CONFIG)
+	$(UCLIBC_SPARC_TYPE_CONFIG)
+	$(UCLIBC_POWERPC_TYPE_CONFIG)
+	$(UCLIBC_AVR32_CONFIG)
+	$(UCLIBC_X86_TYPE_CONFIG)
+	$(UCLIBC_ENDIAN_CONFIG)
+	$(UCLIBC_LARGEFILE_CONFIG)
+	$(UCLIBC_IPV6_CONFIG)
+	$(UCLIBC_RPC_CONFIG)
+	$(UCLIBC_FLOAT_CONFIG)
+	$(UCLIBC_SSP_CONFIG)
+	$(UCLIBC_THREAD_CONFIG)
+	$(UCLIBC_THREAD_DEBUG_CONFIG)
+	$(UCLIBC_LOCALE_CONFIG)
+	$(UCLIBC_WCHAR_CONFIG)
+	$(UCLIBC_STRIP_CONFIG)
+	$(UCLIBC_DEBUG_CONFIG)
+	yes "" | $(MAKE1) -C $(@D) \
+		$(UCLIBC_MAKE_FLAGS) \
+		PREFIX=$(STAGING_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=$(STAGING_DIR) \
+		oldconfig
+	$(MAKE1) -C $(UCLIBC_DIR) \
+		$(UCLIBC_MAKE_FLAGS) \
+		PREFIX=$(STAGING_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=$(STAGING_DIR) \
+		headers lib/crt1.o lib/crti.o lib/crtn.o \
+		install_headers
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) \
+		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) \
+		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libm.so
+	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(STAGING_DIR)/usr/lib/
+endef
+
+ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
+define UCLIBC_BUILD_TEST_SUITE
+	$(MAKE1) -C $(@D)/test \
+		$(UCLIBC_MAKE_FLAGS) \
+		ARCH_CFLAGS=-I$(STAGING_DIR)/usr/include \
+		UCLIBC_ONLY=1 \
+		TEST_INSTALLED_UCLIBC=1 \
+		compile
+endef
+endif
+
+define UCLIBC_BUILD_CMDS
+	$(MAKE1) -C $(@D) \
+		$(UCLIBC_MAKE_FLAGS) \
+		PREFIX= \
+		DEVEL_PREFIX=/ \
+		RUNTIME_PREFIX=/ \
+		all
+	$(MAKE1) -C $(@D)/utils \
+		PREFIX=$(HOST_DIR) \
+		HOSTCC="$(HOSTCC)" hostutils
+	$(UCLIBC_BUILD_TEST_SUITE)
+endef
+
+ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
+define UCLIBC_INSTALL_TEST_SUITE
+	mkdir -p $(TARGET_DIR)/root/uClibc
+	cp -rdpf $(@D)/test $(TARGET_DIR)/root/uClibc
+	$(INSTALL) -D -m 0644 $(@D)/Rules.mak $(TARGET_DIR)/root/uClibc/Rules.mak
+	$(INSTALL) -D -m 0644 $(@D)/.config $(TARGET_DIR)/root/uClibc/.config
+endef
+endif
+
+define UCLIBC_INSTALL_TARGET_CMDS
+	$(MAKE1) -C $(@D) \
+		$(UCLIBC_MAKE_FLAGS) \
+		PREFIX=$(TARGET_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=/ \
+		install_runtime
+	$(MAKE1) -C $(@D) \
+		CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \
+		ARCH="$(UCLIBC_TARGET_ARCH)" \
+		PREFIX=$(TARGET_DIR) \
+		utils install_utils
+	$(UCLIBC_INSTALL_TEST_SUITE)
+endef
+
+define UCLIBC_INSTALL_STAGING_CMDS
+	$(MAKE1) -C $(@D) \
+		$(UCLIBC_MAKE_FLAGS) \
+		PREFIX=$(STAGING_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=/ \
+		install_runtime install_dev
+	install -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
+	ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
+	install -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
+	ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
+endef
+
+uclibc-menuconfig: dirs uclibc-configure
+	$(MAKE1) -C $(UCLIBC_DIR) \
+		$(UCLIBC_MAKE_FLAGS) \
+		PREFIX=$(STAGING_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=$(STAGING_DIR)/ \
+		menuconfig
+	rm -f $(UCLIBC_DIR)/.stamp_{built,target_installed,staging_installed}
+
+$(eval $(generic-package))
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index b2eb9deb22..e7241bfcf4 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -1,7 +1,3 @@
-# Include files required for the internal toolchain backend
-
-include toolchain/uClibc/uclibc.mk
-
 # Triggerring the build of the host-gcc-final will automaticaly do the
 # build of binutils, uClibc, kernel headers and all the intermediate
 # gcc steps.
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 4ad0603a2c..416695b1a7 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -2,7 +2,7 @@
 
 if BR2_TOOLCHAIN_BUILDROOT
 source "package/linux-headers/Config.in.host"
-source "toolchain/uClibc/Config.in"
+source "package/uclibc/Config.in"
 source "package/binutils/Config.in.host"
 source "package/gcc/Config.in.host"
 endif
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
index 6ef73bb98d..9e666a0429 100644
--- a/toolchain/toolchain-crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng.mk
@@ -3,4 +3,3 @@
 # Explicit ordering:
 include toolchain/helpers.mk
 include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
-include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 59f18c793d..79ad7e14e9 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -10,7 +10,7 @@
 
 CTNG_DIR := $(BUILD_DIR)/build-toolchain
 
-CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/uClibc/uClibc-0.9.33.config
+CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/package/uclibc/uClibc-0.9.33.config
 CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 
 # Hack! ct-ng is in fact a Makefile script. As such, it accepts all
diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
index 1198a57d9e..2f43db7c99 100644
--- a/toolchain/toolchain-external.mk
+++ b/toolchain/toolchain-external.mk
@@ -2,4 +2,3 @@
 
 include toolchain/helpers.mk
 include toolchain/toolchain-external/ext-tool.mk
-include toolchain/uClibc/uclibc.mk
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
deleted file mode 100644
index ab1f600c61..0000000000
--- a/toolchain/uClibc/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-# Choose uClibc options
-#
-
-comment "uClibc Options"
-
-choice
-	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_0_9_33
-	help
-	  Select the version of uClibc you wish to use.
-
-	config BR2_UCLIBC_VERSION_0_9_32
-		bool "uClibc 0.9.32.x"
-		depends on !(BR2_arc || BR2_avr32 || BR2_sh || BR2_xtensa)
-
-	config BR2_UCLIBC_VERSION_0_9_33
-		bool "uClibc 0.9.33.x"
-		depends on !(BR2_arc || BR2_xtensa)
-
-	config BR2_UCLIBC_VERSION_0_9_33_ARC
-		bool "uClibc 0.9.33.x-arc"
-		depends on BR2_arc
-
-	config BR2_UCLIBC_VERSION_SNAPSHOT
-		bool "daily snapshot"
-
-endchoice
-
-config BR2_USE_UCLIBC_SNAPSHOT
-	string "Date (yyyymmdd) of snapshot or 'snapshot' for latest"
-	default "snapshot"
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT
-	help
-	    Use latest snapshot or one from a specific date?
-
-config BR2_UCLIBC_VERSION_STRING
-	string
-	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
-	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
-	default 0.9.33-arc	if BR2_UCLIBC_VERSION_0_9_33_ARC
-	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
-
-config BR2_UCLIBC_CONFIG
-	string "uClibc configuration file to use?"
-	default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
-	default "toolchain/uClibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
-	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_0_9_33_ARC
-	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
-	help
-	  Some people may wish to use their own modified uClibc configuration
-	  file and will specify their config file location with this option.
-	  See also docs/README in this package.
-	  If unsure, use the default.
-
-config BR2_UCLIBC_INSTALL_TEST_SUITE
-	bool "Compile and install uClibc tests"
-	select BR2_PACKAGE_MAKE
-	help
-	  Enabling this option will compile and install the uClibc test suite.
-	  This is useful if you want to check if the uClibc library is working
-	  for your architecture and/or help developing uClibc.
-
-	  The test suite will be installed into /root/uClibc directory. To run
-	  the test suite enter the /root/uClibc/test directory and type
-	  "make UCLIBC_ONLY=1 CC=/bin/true check".
-
-	  See the /root/uClibc/test/README for additional information.
-
-	  This is not needed at all for normal builds, so you can safely say no
-	  if you do not plan to dig into your C library.
-
-# This is only useful for uClibc <= 0.9.32. It can be removed once
-# Buildroot will support only uClibc >= 0.9.33 on ARM.
-config BR2_UCLIBC_ARM_TYPE
-	string
-	depends on BR2_arm || BR2_armeb
-	default GENERIC_ARM	if BR2_fa526
-	default ARM7TDMI	if BR2_arm7tdmi
-	default ARM720T		if BR2_arm720t
-	default ARM920T		if BR2_arm920t
-	default ARM922T		if BR2_arm922t
-	default ARM926T		if BR2_arm926t
-	default ARM10T		if BR2_arm10t
-	default ARM1136JF_S	if BR2_arm1136jf_s
-	default ARM1176JZ_S	if BR2_arm1176jz_s
-	default ARM1176JZF_S	if BR2_arm1176jzf_s
-	default ARM_SA1100	if BR2_strongarm
-	default ARM_XSCALE	if BR2_xscale
-	default ARM_IWMMXT	if BR2_iwmmxt
-	default ARM_CORTEXA8	if BR2_cortex_a8
-	default ARM_CORTEXA9	if BR2_cortex_a9
-
-config BR2_UCLIBC_SPARC_TYPE
-	string
-	depends on BR2_sparc
-	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
-	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
deleted file mode 100644
index 06f5b2300d..0000000000
--- a/toolchain/uClibc/uclibc.mk
+++ /dev/null
@@ -1,610 +0,0 @@
-################################################################################
-#
-# uClibc (the C library)
-#
-################################################################################
-
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-
-# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
-# setting.
-ifndef UCLIBC_CONFIG_FILE
-UCLIBC_CONFIG_FILE=$(call qstrip,$(BR2_UCLIBC_CONFIG))
-endif
-
-UCLIBC_VERSION:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
-
-ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
-UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc
-else ifeq ($(findstring arc,$(UCLIBC_VERSION)),arc)
-UCLIBC_SITE:=$(BR2_ARC_SITE)
-UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION)
-else
-UCLIBC_SITE:=http://www.uclibc.org/downloads
-UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION)
-endif
-
-UCLIBC_PATCH_DIR:=toolchain/uClibc/
-UCLIBC_SOURCE:=uClibc-$(UCLIBC_VERSION).tar.bz2
-
-UCLIBC_CAT:=$(BZCAT)
-
-UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
-		-e 's/-.*//' \
-		-e 's/i.86/i386/' \
-		-e 's/sparc.*/sparc/' \
-		-e 's/arc.*/arc/g' \
-		-e 's/arm.*/arm/g' \
-		-e 's/m68k.*/m68k/' \
-		-e 's/ppc/powerpc/g' \
-		-e 's/v850.*/v850/g' \
-		-e 's/sh[234].*/sh/' \
-		-e 's/mips.*/mips/' \
-		-e 's/cris.*/cris/' \
-		-e 's/xtensa.*/xtensa/' \
-")
-
-UCLIBC_TARGET_ENDIAN:=$(call qstrip,$(BR2_ENDIAN))
-
-ifeq ($(UCLIBC_TARGET_ENDIAN),LITTLE)
-UCLIBC_NOT_TARGET_ENDIAN:=BIG
-else
-UCLIBC_NOT_TARGET_ENDIAN:=LITTLE
-endif
-
-UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_UCLIBC_ARM_TYPE))
-UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
-
-ifeq ($(GENERATE_LOCALE),)
-# We need at least one locale
-UCLIBC_LOCALES = en_US
-else
-# Strip out the encoding part of locale names, if any
-UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\
-		   $(firstword $(subst .,$(space),$(locale))))
-endif
-
-$(DL_DIR)/$(UCLIBC_SOURCE):
-	$(Q)$(call MESSAGE,"Downloading uClibc")
-	$(call DOWNLOAD,$(UCLIBC_SITE:/=)/$(UCLIBC_SOURCE))
-
-uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
-	$(Q)$(call MESSAGE,"Extracting uClibc")
-	mkdir -p $(TOOLCHAIN_DIR)
-	rm -rf $(UCLIBC_DIR)
-	$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-uclibc-patched: $(UCLIBC_DIR)/.patched
-$(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
-	$(Q)$(call MESSAGE,"Patching uClibc")
-ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
-		uClibc-$(UCLIBC_VERSION)-\*.patch \
-		uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH)
-else
-	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
-		uClibc.\*.patch uClibc.\*.patch.$(ARCH)
-endif
-	touch $@
-
-
-# Some targets may wish to provide their own UCLIBC_CONFIG_FILE...
-$(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.patched $(UCLIBC_CONFIG_FILE)
-	$(Q)$(call MESSAGE,"Pre-configuring uClibc")
-	cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
-		-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
-		-e 's,^TARGET_ARCH=".*",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \
-		-e 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(STAGING_DIR)/usr/include\",g' \
-		-e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
-		-e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
-		-e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
-		$(UCLIBC_DIR)/.oldconfig
-ifeq ($(UCLIBC_TARGET_ARCH),arm)
-	(/bin/echo "# CONFIG_GENERIC_ARM is not set"; \
-	 /bin/echo "# CONFIG_ARM610 is not set"; \
-	 /bin/echo "# CONFIG_ARM710 is not set"; \
-	 /bin/echo "# CONFIG_ARM7TDMI is not set"; \
-	 /bin/echo "# CONFIG_ARM720T is not set"; \
-	 /bin/echo "# CONFIG_ARM920T is not set"; \
-	 /bin/echo "# CONFIG_ARM922T is not set"; \
-	 /bin/echo "# CONFIG_ARM926T is not set"; \
-	 /bin/echo "# CONFIG_ARM10T is not set"; \
-	 /bin/echo "# CONFIG_ARM1136JF_S is not set"; \
-	 /bin/echo "# CONFIG_ARM1176JZ_S is not set"; \
-	 /bin/echo "# CONFIG_ARM1176JZF_S is not set"; \
-	 /bin/echo "# CONFIG_ARM_SA110 is not set"; \
-	 /bin/echo "# CONFIG_ARM_SA1100 is not set"; \
-	 /bin/echo "# CONFIG_ARM_XSCALE is not set"; \
-	 /bin/echo "# CONFIG_ARM_IWMMXT is not set"; \
-	) >> $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
-		 $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/CONFIG_ARM_.ABI/d' $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_ARM_EABI),y)
-	/bin/echo "# CONFIG_ARM_OABI is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "CONFIG_ARM_EABI=y" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_ARM_OABI),y)
-	/bin/echo "CONFIG_ARM_OABI=y" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_fa526)$(BR2_strongarm),y)
-	$(SED) 's,USE_BX=y,# USE_BX is not set,' $(UCLIBC_DIR)/.oldconfig
-endif
-endif
-ifeq ($(UCLIBC_TARGET_ARCH),mips)
-	$(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/CONFIG_MIPS_ISA_.*/d' $(UCLIBC_DIR)/.oldconfig
-	(/bin/echo "# CONFIG_MIPS_O32_ABI is not set"; \
-	 /bin/echo "# CONFIG_MIPS_N32_ABI is not set"; \
-	 /bin/echo "# CONFIG_MIPS_N64_ABI is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_1 is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_2 is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_3 is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_4 is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_MIPS32 is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_MIPS32R2 is not set"; \
-	 /bin/echo "# CONFIG_MIPS_ISA_MIPS64 is not set"; \
-	) >> $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_MIPS_OABI32),y)
-	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_MIPS_NABI32),y)
-	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_MIPS_NABI64),y)
-	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_1),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_1\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_2),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_2\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_3),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_3\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_4),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_4\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_32),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\)[^R].*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_32r2),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32R2\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_mips_64),y)
-	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
-endif
-endif
-ifeq ($(UCLIBC_TARGET_ARCH),sh)
-	/bin/echo "# CONFIG_SH2A is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_SH2 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_SH3 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_SH4 is not set" >> $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_sh2a),y)
-	$(SED) 's,# CONFIG_SH2A is not set,CONFIG_SH2A=y,g' $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_FLAT_SEP_DATA is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_SHARED_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_sh2),y)
-	$(SED) 's,# CONFIG_SH2 is not set,CONFIG_SH2=y,g' $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_FLAT_SEP_DATA is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# UCLIBC_FORMAT_SHARED_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_sh3eb),y)
-	$(SED) 's,# CONFIG_SH3 is not set,CONFIG_SH3=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_sh3),y)
-	$(SED) 's,# CONFIG_SH3 is not set,CONFIG_SH3=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_sh4eb),y)
-	$(SED) 's,# CONFIG_SH4 is not set,CONFIG_SH4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_sh4),y)
-	$(SED) 's,# CONFIG_SH4 is not set,CONFIG_SH4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-endif
-ifeq ($(UCLIBC_TARGET_ARCH),sparc)
-	$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
-		 $(UCLIBC_DIR)/.oldconfig
-	for i in V7 V8 V9 V9B; do echo "# CONFIG_SPARC_$$i is not set"; done \
-		>> $(UCLIBC_DIR)/.oldconfig
-	$(SED) 's/^.*$(UCLIBC_SPARC_TYPE)[^B].*/$(UCLIBC_SPARC_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(UCLIBC_TARGET_ARCH),powerpc)
-ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_8548)$(BR2_powerpc_e500mc),y)
-	/bin/echo "# CONFIG_CLASSIC is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "CONFIG_E500=y" >> $(UCLIBC_DIR)/.oldconfig
-else
-	/bin/echo "CONFIG_CLASSIC=y" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_E500 is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-endif
-ifeq ($(UCLIBC_TARGET_ARCH),avr32)
-	/bin/echo "LINKRELAX=y" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifneq ($(UCLIBC_TARGET_ENDIAN),)
-	# The above doesn't work for me, so redo
-	$(SED) 's/.*\(ARCH_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN\).*/# \1 is not set/g' \
-		-e 's/.*\(ARCH_WANTS_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN\).*/# \1 is not set/g' \
-		-e 's/.*\(ARCH_$(UCLIBC_TARGET_ENDIAN)_ENDIAN\).*/\1=y/g' \
-		-e 's/.*\(ARCH_WANTS_$(UCLIBC_TARGET_ENDIAN)_ENDIAN\).*/\1=y/g' \
-		$(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LARGEFILE),y)
-	$(SED) 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/.*UCLIBC_HAS_FOPEN_LARGEFILE_MODE.*/d' $(UCLIBC_DIR)/.oldconfig
-	echo "# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y)
-	$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=n,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
-	$(SED) 's,^.*UCLIBC_HAS_RPC.*,UCLIBC_HAS_RPC=y,g' \
-		-e 's,^.*UCLIBC_HAS_FULL_RPC.*,UCLIBC_HAS_FULL_RPC=y,g' \
-		-e 's,^.*UCLIBC_HAS_REENTRANT_RPC.*,UCLIBC_HAS_REENTRANT_RPC=y,g' \
-		$(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,^.*UCLIBC_HAS_RPC.*,UCLIBC_HAS_RPC=n,g' \
-		-e 's,^.*UCLIBC_HAS_FULL_RPC.*,UCLIBC_HAS_FULL_RPC=n,g' \
-		-e 's,^.*UCLIBC_HAS_REENTRANT_RPC.*,UCLIBC_HAS_REENTRANT_RPC=n,g' \
-		$(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_SOFT_FLOAT),y)
-	$(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=n,g' \
-		-e 's,^[^_]*HAS_FPU.*,HAS_FPU=n,g' \
-		-e 's,.*UCLIBC_HAS_FLOATS.*,UCLIBC_HAS_FLOATS=y,g' \
-		-e 's,.*DO_C99_MATH.*,DO_C99_MATH=y,g' \
-		$(UCLIBC_DIR)/.oldconfig
-	#$(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=n\nHAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) '/UCLIBC_HAS_FLOATS/d' \
-		-e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=y\nHAS_FPU=y\nUCLIBC_HAS_FLOATS=y\n,g' \
-		$(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
-	$(SED) 's,^.*UCLIBC_HAS_SSP[^_].*,UCLIBC_HAS_SSP=y,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,^.*UCLIBC_HAS_SSP[^_].*,UCLIBC_HAS_SSP=n,g' $(UCLIBC_DIR)/.oldconfig
-endif
-	$(SED) '/UCLIBC_HAS_THREADS/d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/LINUXTHREADS/d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/LINUXTHREADS_OLD/d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/PTHREADS_DEBUG_SUPPORT/d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/UCLIBC_HAS_THREADS_NATIVE/d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/DODEBUG /d' $(UCLIBC_DIR)/.oldconfig
-	$(SED) '/DOSTRIP/d' $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_STRIP_none),y)
-	echo "# DOSTRIP is not set" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "DOSTRIP=y" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_ENABLE_DEBUG),y)
-	echo "DODEBUG=y" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "# DODEBUG is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_PTHREADS_NONE),y)
-	echo "# UCLIBC_HAS_THREADS is not set" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "UCLIBC_HAS_THREADS=y" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_PTHREADS),y)
-	echo "LINUXTHREADS=y" >> $(UCLIBC_DIR)/.oldconfig
-	echo "LINUXTHREADS_NEW=y" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "# LINUXTHREADS is not set" >> $(UCLIBC_DIR)/.oldconfig
-	echo "# LINUXTHREADS_NEW is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_PTHREADS_OLD),y)
-	echo "LINUXTHREADS_OLD=y" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "# LINUXTHREADS_OLD is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_PTHREADS_NATIVE),y)
-	echo "UCLIBC_HAS_THREADS_NATIVE=y" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "# UCLIBC_HAS_THREADS_NATIVE is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_PTHREAD_DEBUG),y)
-	echo "PTHREADS_DEBUG_SUPPORT=y" >> $(UCLIBC_DIR)/.oldconfig
-else
-	echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y)
-	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\n# UCLIBC_BUILD_ALL_LOCALE is not set\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="$(UCLIBC_LOCALES)"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
-	$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.oldconfig
-else
-	$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ("$(KERNEL_ARCH)","i386")
-	/bin/echo "# CONFIG_GENERIC_386 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_386 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_486 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_586 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_586MMX is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_686 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_PENTIUMII is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_PENTIUMIII is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_PENTIUM4 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_K6 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_K7 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_ELAN is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_CRUSOE is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_WINCHIPC6 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_WINCHIP2 is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_CYRIXIII is not set" >> $(UCLIBC_DIR)/.oldconfig
-	/bin/echo "# CONFIG_NEHEMIAH is not set" >> $(UCLIBC_DIR)/.oldconfig
-ifeq ($(BR2_x86_i386),y)
-	$(SED) 's,# CONFIG_386 is not set,CONFIG_386=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_i486),y)
-	$(SED) 's,# CONFIG_486 is not set,CONFIG_486=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_i586),y)
-	$(SED) 's,# CONFIG_586 is not set,CONFIG_586=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_pentium_mmx),y)
-	$(SED) 's,# CONFIG_586MMX is not set,CONFIG_586MMX=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_i686),y)
-	$(SED) 's,# CONFIG_686 is not set,CONFIG_686=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_pentiumpro),y)
-	$(SED) 's,# CONFIG_686 is not set,CONFIG_686=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_pentium2),y)
-	$(SED) 's,# CONFIG_PENTIUMII is not set,CONFIG_PENTIUMII=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_pentium3),y)
-	$(SED) 's,# CONFIG_PENTIUMIII is not set,CONFIG_PENTIUMIII=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_pentium4),y)
-	$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_pentium_m),y)
-	$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_nocona),y)
-	$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-ifeq ($(BR2_x86_core2),y)
-	$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
-endif
-
-$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
-	$(Q)$(call MESSAGE,"Configuring uClibc")
-	cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config
-	mkdir -p $(STAGING_DIR)/usr/include
-	mkdir -p $(STAGING_DIR)/usr/lib
-	mkdir -p $(STAGING_DIR)/lib
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(STAGING_DIR) \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(STAGING_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
-		HOSTCC="$(HOSTCC)" \
-		oldconfig
-	touch $@
-
-ifeq ($(BR2_CCACHE),y)
-# we'll need ccache for the host built before make oldconfig
-# if configured, otherwise uclibc-menuconfig will fail.
-# Use order-only dependency as host-ccache is a virtual target
-$(UCLIBC_DIR)/.config: | host-ccache
-endif
-
-# For ARC, libgcc is always included, even when -nostdlib is given. This
-# is related to some small pieces of code that are not always generated
-# by the compiler; a call to libgcc is used in those cases instead.
-#
-# During the initial stages of building the toolchain, this is a problem,
-# as libgcc does not exist yet. The ARC compiler supports -really-nostdlib
-# to override the default behavior.
-ifeq ($(BR2_arc),y)
-REALLY_NOSTDLIB=-really-nostdlib
-endif
-
-$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config
-	$(Q)$(call MESSAGE,"Installing uClibc headers")
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(STAGING_DIR) \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(STAGING_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
-		HOSTCC="$(HOSTCC)" headers \
-		lib/crt1.o lib/crti.o lib/crtn.o \
-		install_headers
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) -nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libm.so
-	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(STAGING_DIR)/usr/lib/
-	touch $@
-
-$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(HOST_GCC_INTERMEDIATE_TARGET_INSTALL_HOST)
-	$(Q)$(call MESSAGE,"Building uClibc")
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX= \
-		DEVEL_PREFIX=/ \
-		RUNTIME_PREFIX=/ \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
-		HOSTCC="$(HOSTCC)" \
-		all
-	touch -c $@
-
-uclibc-menuconfig: dirs $(UCLIBC_DIR)/.config
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(STAGING_DIR) \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(STAGING_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
-		HOSTCC="$(HOSTCC)" \
-		menuconfig && \
-	touch -c $(UCLIBC_DIR)/.config
-
-
-$(STAGING_DIR)/usr/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
-	$(Q)$(call MESSAGE,"Installing uClibc to staging dir")
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(STAGING_DIR) \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=/ \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
-		install_runtime install_dev
-	# Build the host utils. Need to add an install target...
-	$(MAKE1) -C $(UCLIBC_DIR)/utils \
-		PREFIX=$(HOST_DIR) \
-		HOSTCC="$(HOSTCC)" \
-		hostutils
-	if [ -f $(UCLIBC_DIR)/utils/ldd.host ]; then \
-		install -D $(UCLIBC_DIR)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd; \
-		ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd; \
-	fi
-	if [ -f $(UCLIBC_DIR)/utils/ldconfig.host ]; then \
-		install -D $(UCLIBC_DIR)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig; \
-		ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig; \
-	fi
-	touch -c $@
-
-ifneq ($(TARGET_DIR),)
-$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
-	$(Q)$(call MESSAGE,"Installing uClibc runtime to target dir")
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TARGET_DIR) \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=/ \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
-		install_runtime
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
-	$(Q)$(call MESSAGE,"Installing uClibc utils to target dir")
-	$(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \
-		CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TARGET_DIR) utils install_utils
-	touch -c $@
-
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
-UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0
-endif
-
-ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
-UCLIBC_TARGETS+=uclibc-test
-endif
-endif
-
-uclibc: host-gcc-intermediate $(STAGING_DIR)/usr/lib/libc.a $(UCLIBC_TARGETS)
-
-uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
-
-uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-
-uclibc-config: $(UCLIBC_DIR)/.config
-
-uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
-
-uclibc-update-config: uclibc-config
-	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
-
-uclibc-configured: host-gcc-initial linux-headers $(UCLIBC_DIR)/.configured
-
-uclibc-configured-source: uclibc-source
-
-uclibc-clean: uclibc-test-clean
-	-$(MAKE1) -C $(UCLIBC_DIR) ARCH="$(UCLIBC_TARGET_ARCH)" clean
-	rm -f $(UCLIBC_DIR)/.config
-
-uclibc-dirclean: uclibc-test-dirclean
-	rm -rf $(UCLIBC_DIR)
-
-uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
-
-uclibc-target-utils-source: $(DL_DIR)/$(UCLIBC_SOURCE)
-
-$(UCLIBC_DIR)/test/unistd/errno:
-	$(Q)$(call MESSAGE,"Building uClibc test suite")
-	$(MAKE) -C $(UCLIBC_DIR)/test \
-	ARCH_CFLAGS=-I$(STAGING_DIR)/usr/include \
-	UCLIBC_ONLY=1 TEST_INSTALLED_UCLIBC=1 compile
-
-$(TARGET_DIR)/root/uClibc/test/unistd/errno: $(UCLIBC_DIR)/test/unistd/errno
-	$(Q)$(call MESSAGE,"Installing uClibc test suite to target dir")
-	mkdir -p $(TARGET_DIR)/root/uClibc
-	cp -rdpf $(UCLIBC_DIR)/test $(TARGET_DIR)/root/uClibc
-	$(INSTALL) $(UCLIBC_DIR)/Rules.mak $(TARGET_DIR)/root/uClibc
-	$(INSTALL) $(UCLIBC_DIR)/.config $(TARGET_DIR)/root/uClibc
-
-uclibc-test: $(STAGING_DIR)/usr/lib/libc.a $(TARGET_DIR)/root/uClibc/test/unistd/errno
-
-uclibc-test-source: uclibc-source
-
-uclibc-test-clean:
-	-$(MAKE) -C $(UCLIBC_DIR)/test clean
-	rm -rf $(TARGET_DIR)/root/uClibc
-
-uclibc-test-dirclean:
-	rm -rf $(TARGET_DIR)/root/uClibc
-
-################################################################################
-#
-# uClibc for the target just needs its header files
-# and whatnot installed.
-#
-################################################################################
-
-$(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a
-	$(Q)$(call MESSAGE,"Installing uClibc development files to target dir")
-	$(MAKE1) -C $(UCLIBC_DIR) \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TARGET_DIR) \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=/ \
-		install_dev
-	# Install the kernel headers to the target dir if necessary
-	if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ]; then \
-		cp -pLR $(LINUX_HEADERS_DIR)/include/* \
-			$(TARGET_DIR)/usr/include/; \
-	fi
-	touch -c $@
-
-uclibc_target: cross_compiler uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd
-
-uclibc_target-clean: uclibc-test-clean
-	rm -rf $(TARGET_DIR)/usr/include \
-		$(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd
-
-uclibc_target-dirclean: uclibc-test-dirclean
-	rm -rf $(TARGET_DIR)/usr/include
-
-endif

From d21a176bd517a788e19fce95f3fbd5cb0bd14e58 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:06 +0200
Subject: [PATCH 5577/6849] Remove TOOLCHAIN_DIR

The $(O)/toolchain directory, also called $(TOOLCHAIN_DIR) is no
longer needed, as all packages are now built in $(O)/build/, including
gcc and uClibc.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 189a1dbbc2..e3e275003b 100644
--- a/Makefile
+++ b/Makefile
@@ -264,7 +264,6 @@ STAMP_DIR:=$(BASE_DIR)/stamps
 
 BINARIES_DIR:=$(BASE_DIR)/images
 TARGET_DIR:=$(BASE_DIR)/target
-TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_SKELETON=$(TOPDIR)/system/skeleton
 
 LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
@@ -387,7 +386,7 @@ TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\
 # all targets depend on the crosscompiler and it's prerequisites
 $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
-dirs: $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 $(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
@@ -405,7 +404,7 @@ world: toolchain $(TARGETS_ALL)
 	legal-info legal-info-prepare legal-info-clean \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
-	$(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 ################################################################################
@@ -414,7 +413,7 @@ world: toolchain $(TARGETS_ALL)
 # dependencies anywhere else
 #
 ################################################################################
-$(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
+$(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
 	@mkdir -p $@
 
 $(STAGING_DIR):
@@ -732,7 +731,7 @@ endif
 
 clean:
 	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
-		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR) $(BASE_DIR)/staging \
+		$(STAMP_DIR) $(BUILD_DIR) $(BASE_DIR)/staging \
 		$(LEGAL_INFO_DIR)
 
 distclean: clean

From e57e4b96bf33b5a498608204913d6731a6856b5e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:07 +0200
Subject: [PATCH 5578/6849] Use more sensible names for the external/ctng
 targets

Instead of using the 'uclibc' target for all toolchain backends,
introduce more sensible target names for the external toolchain and
Crosstool-NG toolchain backend make targets.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                         |  7 +++++--
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 16 +++++++---------
 toolchain/toolchain-external/ext-tool.mk         |  5 ++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index e3e275003b..7a4602c7d9 100644
--- a/Makefile
+++ b/Makefile
@@ -225,9 +225,12 @@ endif
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 BASE_TARGETS += toolchain-buildroot
-else
-BASE_TARGETS += uclibc
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+BASE_TARGETS += toolchain-external
+else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
+BASE_TARGETS += toolchain-crosstool-ng
 endif
+
 TARGETS:=
 
 # silent mode requested?
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 79ad7e14e9..71305364e4 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -22,15 +22,13 @@ PATH=$(HOST_PATH) ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
 endef
 
 #-----------------------------------------------------------------------------
-# 'uclibc' is the target to depend on to get the toolchain and prepare
-# the staging directory and co.
-uclibc: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
-
-# 'uclibc-source' is the target used by the infra structure to mean
-# "we just want to download the toolchain's sources, not build it"
-# For crosstool-NG, we need it to be configured before we can download;
-# then we have to override a config option to just do the download
-uclibc-source: $(CTNG_DIR)/.config
+toolchain-crosstool-ng: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
+
+# The target used by the infra structure to mean "we just want to
+# download the toolchain's sources, not build it" For crosstool-NG, we
+# need it to be configured before we can download; then we have to
+# override a config option to just do the download
+toolchain-crosstool-ng-source: $(CTNG_DIR)/.config
 	$(Q)$(call ctng,build CT_ONLY_DOWNLOAD=y)
 
 #-----------------------------------------------------------------------------
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 1d76a66b4b..b8d77ad0b5 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -539,10 +539,9 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL)
 	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s -Wl,--hash-style=both \
 		toolchain/toolchain-external/ext-toolchain-wrapper.c -o $@
 
-# 'uclibc' is the target to provide toolchain / staging dir
-uclibc: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
+toolchain-external: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 # download ext toolchain if so configured
-uclibc-source: $(addprefix $(DL_DIR)/,$(TOOLCHAIN_EXTERNAL_SOURCE))
+toolchain-external-source: $(addprefix $(DL_DIR)/,$(TOOLCHAIN_EXTERNAL_SOURCE))
 endif

From 12d1aa4b69614f6499847758294f8a40f1611710 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:08 +0200
Subject: [PATCH 5579/6849] Remove BR2_HAVE_DEVFILES

This finally removes the BR2_HAVE_DEVFILES option, that was used to
install/keep development files on target. With the recent migration of
the internal backend to the package infrastructure, we had anyway lost
the ability to build gcc for the target, and install the uClibc
development files on the target.

[Peter: also remove support/scripts/copy.sh]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                           |  8 --------
 Makefile                            |  4 ----
 package/dbus/dbus.mk                |  2 --
 package/libdnet/libdnet.mk          |  2 --
 package/libglib2/libglib2.mk        |  2 --
 package/lua/lua.mk                  | 13 -------------
 package/multimedia/mpg123/mpg123.mk |  3 +--
 package/ncurses/ncurses.mk          | 20 --------------------
 package/opencv/opencv.mk            |  2 --
 package/openssl/openssl.mk          | 12 ------------
 package/orc/orc.mk                  |  3 ---
 package/pkg-generic.mk              |  2 --
 package/python/python.mk            | 16 +++-------------
 package/python3/python3.mk          | 16 +++-------------
 package/sdl_sound/sdl_sound.mk      |  2 +-
 package/taglib/taglib.mk            |  2 --
 package/usbutils/usbutils.mk        |  2 --
 package/xenomai/xenomai.mk          |  2 --
 support/scripts/copy.sh             | 20 --------------------
 19 files changed, 8 insertions(+), 125 deletions(-)
 delete mode 100755 support/scripts/copy.sh

diff --git a/Config.in b/Config.in
index bbb9885ef3..78dea3be02 100644
--- a/Config.in
+++ b/Config.in
@@ -419,14 +419,6 @@ config BR2_HAVE_DOCUMENTATION
 	  If you say n here, your target will not contain any
 	  documentation.
 
-config BR2_HAVE_DEVFILES
-	bool "development files in target filesystem"
-	# We no longer want to support a toolchain on the target
-	depends on BR2_DEPRECATED
-	help
-	  Install headers and static libraries in the
-	  target filesystem
-
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
 	default "$(TOPDIR)/local.mk"
diff --git a/Makefile b/Makefile
index 7a4602c7d9..fe9bde7291 100644
--- a/Makefile
+++ b/Makefile
@@ -450,16 +450,12 @@ STRIP_FIND_CMD += -type f -perm +111
 STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
 
 target-finalize:
-ifeq ($(BR2_HAVE_DEVFILES),y)
-	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
-else
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
 		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
 		$(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
 	find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f
 	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
-endif
 ifneq ($(BR2_PACKAGE_GDB),y)
 	rm -rf $(TARGET_DIR)/usr/share/gdb
 endif
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 57274a0cd9..7fbfb4c179 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -61,9 +61,7 @@ define DBUS_REMOVE_DEVFILES
 	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES
-endif
 
 define DBUS_INSTALL_TARGET_FIXUP
 	mkdir -p $(TARGET_DIR)/var/lib
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 78f0ae01fa..ea10251044 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -34,8 +34,6 @@ define LIBDNET_REMOVE_CONFIG_SCRIPT
 	$(RM) -f $(TARGET_DIR)/usr/bin/dnet-config
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT
-endif
 
 $(eval $(autotools-package))
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 178d137807..b07b2c6877 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -103,9 +103,7 @@ define LIBGLIB2_REMOVE_DEV_FILES
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,glib-genmarshal glib-gettextize glib-mkenums gobject-query gtester gtester-report)
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES
-endif
 
 define LIBGLIB2_REMOVE_GDB_FILES
 	rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gdb
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index ac75fe6d56..904ca523bc 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -64,18 +64,6 @@ define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
 endef
 
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define LUA_INSTALL_DEVFILES
-	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
-		$(TARGET_DIR)/usr/lib/pkgconfig/lua.pc
-	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(TARGET_DIR)/usr/include/lua.h
-	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(TARGET_DIR)/usr/include/luaconf.h
-	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(TARGET_DIR)/usr/include/lualib.h
-	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(TARGET_DIR)/usr/include/lauxlib.h
-endef
-endif
-
-
 define LUA_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
 	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
@@ -83,7 +71,6 @@ define LUA_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
 	ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
 	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-	$(LUA_INSTALL_DEVFILES)
 endef
 
 define HOST_LUA_INSTALL_CMDS
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index f55404388c..e9d074fc75 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -61,8 +61,7 @@ MPG123_CONF_OPT += --with-audio=$(shell echo $(MPG123_AUDIO) | tr ' ' ,)
 
 ifeq ($(BR2_PACKAGE_LIBTOOL),y)
 MPG123_DEPENDENCIES += libtool
-# .la files gets stripped unless HAVE_DEVFILES is enabled, so directly
-# load .so files rather than .la
+# .la files gets stripped , so directly load .so files rather than .la
 MPG123_CONF_OPT += --with-modules --with-module-suffix=.so
 endif
 
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 5381bd18d6..dbb514e78c 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -38,25 +38,6 @@ define NCURSES_BUILD_CMDS
 	$(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR)
 endef
 
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define NCURSES_INSTALL_TARGET_DEVFILES
-	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
-	cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
-	(cd $(TARGET_DIR)/usr/lib; \
-	 ln -fs libncurses.a libcurses.a; \
-	 ln -fs libncurses.a libtermcap.a; \
-	)
-	(cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
-	rm -f $(TARGET_DIR)/usr/lib/libncurses.so
-	(cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
-endef
-endif
-
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
@@ -101,7 +82,6 @@ define NCURSES_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
 	mkdir -p $(TARGET_DIR)/usr/share/terminfo/s
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/s/screen $(TARGET_DIR)/usr/share/terminfo/s
-	$(NCURSES_INSTALL_TARGET_DEVFILES)
 endef # NCURSES_INSTALL_TARGET_CMDS
 
 #
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 3bf7ee9e22..b9ed8cbc86 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -169,12 +169,10 @@ endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC
 endif
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 define OPENCV_CLEAN_INSTALL_CMAKE
 	$(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake
 endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE
-endif
 
 ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y)
 define OPENCV_CLEAN_INSTALL_DATA
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index e16c91ff8d..a0e103b3ac 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -105,22 +105,10 @@ endef
 
 define OPENSSL_INSTALL_TARGET_CMDS
 	$(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
-endef
-
-define OPENSSL_REMOVE_DEV_FILES
 	rm -rf $(TARGET_DIR)/usr/lib/ssl
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_DEV_FILES
-endif
-
-define OPENSSL_INSTALL_FIXUPS
 	rm -f $(TARGET_DIR)/usr/bin/c_rehash
 endef
 
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS
-
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 
 # libraries gets installed read only, so strip fails
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 9d9921a26b..dc93882ab3 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -20,10 +20,7 @@ define ORC_REMOVE_DEVFILES
 endef
 
 ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_BUGREPORT
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
 ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
-endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 56fca6be85..668f011b37 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -153,11 +153,9 @@ $(BUILD_DIR)/%/.stamp_target_installed:
 		$($(PKG)_INSTALL_INIT_SYSV))
 	$($(PKG)_INSTALL_TARGET_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
-ifeq ($(BR2_HAVE_DEVFILES),)
 	$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
 		$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
 	fi
-endif
 	$(Q)touch $@
 
 # Clean package
diff --git a/package/python/python.mk b/package/python/python.mk
index 363513dc3e..975d6f40c0 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -150,24 +150,14 @@ endef
 
 PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD
 
-#
-# Development files removal
-#
-define PYTHON_REMOVE_DEVFILES
-	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
-	rm -f $(TARGET_DIR)/usr/bin/python2-config
-	rm -f $(TARGET_DIR)/usr/bin/python-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_DEVFILES
-endif
-
 #
 # Remove useless files. In the config/ directory, only the Makefile
 # and the pyconfig.h files are needed at runtime.
 #
 define PYTHON_REMOVE_USELESS_FILES
+	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python2-config
+	rm -f $(TARGET_DIR)/usr/bin/python-config
 	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \
 		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
 		rm -f $$i ; \
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 39202ff1b7..ed79f8e3ea 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -133,24 +133,14 @@ endef
 
 PYTHON3_POST_INSTALL_STAGING_HOOKS += PYTHON3_FIXUP_LIBDIR
 
-#
-# Development files removal
-#
-define PYTHON3_REMOVE_DEVFILES
-	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
-	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
-	rm -f $(TARGET_DIR)/usr/bin/python3-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_DEVFILES
-endif
-
 #
 # Remove useless files. In the config/ directory, only the Makefile
 # and the pyconfig.h files are needed at runtime.
 #
 define PYTHON3_REMOVE_USELESS_FILES
+	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
+	rm -f $(TARGET_DIR)/usr/bin/python3-config
 	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-3.3m/ \
 		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
 		rm -f $$i ; \
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index ae449aea51..cd1ed3e998 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -48,7 +48,7 @@ SDL_SOUND_POST_INSTALL_TARGET_HOOKS += SDL_SOUND_REMOVE_PLAYSOUND
 endif
 
 # target shared libs doesn't get removed by make uninstall if the .la
-# files are removed (E.G. if BR2_HAVE_DEVFILES isn't set)
+# files are removed
 define SDL_SOUND_UNINSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) uninstall -C $(@D)
 	rm -f $(TARGET_DIR)/usr/lib/libSDL_sound*so*
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 82602933c9..75e8e679f0 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -22,8 +22,6 @@ define TAGLIB_REMOVE_DEVFILE
 	rm -f $(TARGET_DIR)/usr/bin/taglib-config
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
-endif
 
 $(eval $(cmake-package))
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index e679b26abb..c56702b600 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -51,8 +51,6 @@ define USBUTILS_REMOVE_DEVFILES
 	rm -f $(TARGET_DIR)/usr/bin/libusb-config
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_DEVFILES
-endif
 
 $(eval $(autotools-package))
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 14c616e82d..859895319f 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -19,7 +19,6 @@ XENOMAI_INSTALL_STAGING = YES
 
 XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
 
-ifeq ($(BR2_HAVE_DEVFILES),)
 define XENOMAI_REMOVE_DEVFILES
 	for i in xeno-config xeno-info wrap-link.sh ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
@@ -27,7 +26,6 @@ define XENOMAI_REMOVE_DEVFILES
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
-endif
 
 ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
 define XENOMAI_REMOVE_TESTSUITE
diff --git a/support/scripts/copy.sh b/support/scripts/copy.sh
deleted file mode 100755
index 508ed56afe..0000000000
--- a/support/scripts/copy.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-STAGING_DIR=$1
-TARGET_DIR=$2
-
-echo "Copying development files to target..."
-
-cp -af ${STAGING_DIR}/usr/include ${TARGET_DIR}/usr
-
-for LIBSDIR in /lib /usr/lib; do
-	for WILDCARD in *.a *.la; do
-		for FILE_PATH in `find ${STAGING_DIR}${LIBSDIR} -name ${WILDCARD}`; do
-			STAGING_STRIPPED=${FILE_PATH##${STAGING_DIR}}
-			EXTENDED_DIR=${STAGING_STRIPPED%/${WILDCARD}}
-			mkdir -p ${TARGET_DIR}${EXTENDED_DIR}
-			cp -fa ${FILE_PATH} ${TARGET_DIR}${STAGING_STRIPPED}
-			#echo ${TARGET_DIR}${STAGING_STRIPPED}
-		done
-	done
-done

From 381616e77ae7610f8fe07b9e0eb193d613fb3bf7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:09 +0200
Subject: [PATCH 5580/6849] Introduce BR2_TOOLCHAIN_USES_{UCLIBC, GLIBC}

Currently, when we need to do a conditional on the type of C library
used, we need to take into account the three toolchain backends. As we
are going to add eglibc support to the Buildroot toolchain backend, it
would become even uglier, so this patch introduces two new hidden
options: BR2_TOOLCHAIN_USES_UCLIBC and BR2_TOOLCHAIN_USES_GLIBC, that
exist regardless of the toolchain backend. The entire Buildroot code
base is converted to use those options.

Note that we have intentionally created only one option
(BR2_TOOLCHAIN_USES_GLIBC) for both glibc and eglibc, since they are
essentially the same, as far as Buildroot is concerned.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                         |  2 +-
 package/Makefile.in                              |  2 +-
 package/boost/boost.mk                           |  2 +-
 package/elfutils/Config.in                       |  9 ++-------
 package/elfutils/elfutils.mk                     |  2 +-
 package/freescale-imx/gpu-viv-bin-mx6q/Config.in |  8 ++------
 package/gpsd/Config.in                           |  4 ++--
 package/gsl/gsl.mk                               |  2 +-
 package/iozone/iozone.mk                         |  2 +-
 package/libv4l/Config.in                         |  8 ++++----
 package/ltp-testsuite/Config.in                  |  2 +-
 package/mongrel2/Config.in                       |  4 +---
 package/multimedia/gst-plugin-x170/Config.in     |  4 +---
 package/multimedia/on2-8170-libs/Config.in       |  4 +---
 package/nbd/nbd.mk                               |  2 +-
 package/network-manager/network-manager.mk       |  2 +-
 package/nss-mdns/Config.in                       |  2 +-
 package/php/php.mk                               |  2 +-
 package/squid/squid.mk                           |  2 +-
 package/tzdata/Config.in                         |  2 +-
 toolchain/Config.in                              | 16 ++++++++++++++++
 toolchain/toolchain-common.in                    |  8 ++------
 toolchain/toolchain-crosstool-ng/Config.in       | 11 +++--------
 toolchain/toolchain-external/Config.in           |  9 ++-------
 24 files changed, 49 insertions(+), 62 deletions(-)

diff --git a/Makefile b/Makefile
index fe9bde7291..955e68482e 100644
--- a/Makefile
+++ b/Makefile
@@ -346,7 +346,7 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 TARGETS+=target-purgelocales
 endif
 
-ifneq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_CTNG_eglibc)$(BR2_TOOLCHAIN_CTNG_glibc),)
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 ifneq ($(GENERATE_LOCALE),)
 TARGETS+=target-generatelocales
 endif
diff --git a/package/Makefile.in b/package/Makefile.in
index 6835de3961..405b3e4378 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -23,7 +23,7 @@ MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS)
 # Compute GNU_TARGET_NAME
 GNU_TARGET_NAME=$(ARCH)-buildroot-linux-$(LIBC)$(ABI)
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 LIBC=uclibc
 else
 LIBC=gnu
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index ce729901a4..160a9f1fe8 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -59,7 +59,7 @@ BOOST_OPT += toolset=gcc \
 	     runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared)
 
 ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 # posix backend needs monetary.h which isn't available on uClibc
 BOOST_OPT += boost.locale.posix=off
 endif
diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 914eec6e52..c6a2b84852 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -3,10 +3,7 @@ comment "elfutils requires a toolchain with LARGEFILE and WCHAR support"
 
 config BR2_PACKAGE_ELFUTILS
 	bool "elfutils"
-	select BR2_PACKAGE_ARGP_STANDALONE if \
-	       BR2_TOOLCHAIN_BUILDROOT   || \
-	       BR2_TOOLCHAIN_CTNG_uClibc || \
-	       BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
@@ -23,9 +20,7 @@ if BR2_PACKAGE_ELFUTILS
 
 config BR2_PACKAGE_ELFUTILS_PROGS
 	bool "Install programs"
-	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		   BR2_TOOLCHAIN_CTNG_glibc     || \
-		   BR2_TOOLCHAIN_CTNG_eglibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  This option tells elfutils to not only install the libelf
 	  libraries, but also the elfutils programs.
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 2658786604..696b5667a2 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -37,7 +37,7 @@ endif
 ELFUTILS_CONF_ENV += \
 	LDFLAGS="$(ELFUTILS_LDFLAGS)"
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
  ELFUTILS_DEPENDENCIES += argp-standalone
 endif
 
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 06544c4068..e80eae4348 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -1,7 +1,5 @@
 comment "gpu-viv-bin-mx6q requires a glibc toolchain"
-	depends on !(BR2_TOOLCHAIN_CTNG_glibc || \
-		BR2_TOOLCHAIN_CTNG_eglibc || \
-		BR2_TOOLCHAIN_EXTERNAL_GLIBC)
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	bool "gpu-viv-bin-mx6q"
@@ -9,9 +7,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	select BR2_PACKAGE_HAS_OPENGL_ES
 	depends on BR2_arm # Only relevant for i.MX6
 	 # Library binaries are linked against libc.so.6
-	depends on BR2_TOOLCHAIN_CTNG_glibc || \
-		BR2_TOOLCHAIN_CTNG_eglibc || \
-		BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Userspace libraries for Vivante GPU on i.MX6 platforms
 
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 337f8e7319..70c8cbf252 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -32,10 +32,10 @@ config BR2_PACKAGE_GPSD_OLDSTYLE
 
 config BR2_PACKAGE_GPSD_PROFILING
 	bool "profiling support"
-	depends on !BR2_TOOLCHAIN_BUILDROOT && !BR2_TOOLCHAIN_CTNG_uClibc && !BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 
 comment "profiling support not available with uClibc-based toolchain"
-	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_CTNG_uClibc || BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_GPSD_NTP_SHM
 	bool "NTP time hinting support"
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 68b9948cc2..c32a0ebfa2 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -17,7 +17,7 @@ GSL_CONFIG_SCRIPTS = gsl-config
 # at: http://lists.busybox.net/pipermail/uclibc/2012-October/047067.html.
 # So we tell gsl that fenv related functions are not available in this
 # case.
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 ifneq ($(BR2_i386),y)
 GSL_CONF_ENV = \
        ac_cv_have_decl_feenableexcept=no \
diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk
index 970e50982d..328a5269d4 100644
--- a/package/iozone/iozone.mk
+++ b/package/iozone/iozone.mk
@@ -15,7 +15,7 @@ IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 IOZONE_TARGET = linux-noth
 # AIO support not available on uClibc, use the linux (non-aio) target.
-else ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+else ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 IOZONE_TARGET = linux-noaio
 else
 IOZONE_TARGET = linux
diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index 70f20ac56d..de4af302be 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -13,21 +13,21 @@ if BR2_PACKAGE_LIBV4L
 
 config BR2_PACKAGE_LIBV4L_DECODE_TM6000
 	bool "decode_tm6000"
-	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Tool to decode tm6000 proprietary format streams
 
 comment "decode_tm6000 requires a GLIBC based toolchain"
-	depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc)
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
 	bool "ir-keytable"
-	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Tool to alter keymaps of Remote Controller devices
 
 comment "ir-keytable requires a GLIBC based toolchain"
-	depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc)
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
 	bool "v4l2-compliance"
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 46e7380d81..75b029ffca 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -1,6 +1,6 @@
 comment "ltp-testsuite needs specific uClibc options, see help"
 	depends on BR2_PACKAGE_LTP_TESTSUITE
-	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_UCLIBC || BR2_TOOLCHAIN_CTNG_uClibc
+	depends on BR2_TOOLCHAIN_USES_UCLIBC
 
 config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index cd9323639c..ca7e6093d0 100644
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -9,9 +9,7 @@ config BR2_PACKAGE_MONGREL2
 	# {get,make,swap}context functions present in
 	# {e,}glibc and in uClibc's master branch. Source has arm workaround
 	depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
-		BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		BR2_TOOLCHAIN_CTNG_eglibc || \
-		BR2_TOOLCHAIN_CTNG_glibc || \
+		BR2_TOOLCHAIN_USES_GLIBC || \
 		BR2_arm
 	help
 	  Mongrel2 is an application, language, and network architecture
diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in
index fd93947608..9a1ae639c7 100644
--- a/package/multimedia/gst-plugin-x170/Config.in
+++ b/package/multimedia/gst-plugin-x170/Config.in
@@ -2,9 +2,7 @@ config BR2_PACKAGE_GST_PLUGIN_X170
 	bool "gst-plugin-x170"
 	depends on BR2_PACKAGE_GSTREAMER
 	depends on BR2_arm926t
-	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		BR2_TOOLCHAIN_CTNG_eglibc || \
-		BR2_TOOLCHAIN_CTNG_glibc) # on2-8170-libs
+	depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs
 	select BR2_PACKAGE_ON2_8170_LIBS
 	help
 	  GStreamer plug-in to use the Hantro X170 video decoder present on
diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in
index 0cf05add9f..8c2d963810 100644
--- a/package/multimedia/on2-8170-libs/Config.in
+++ b/package/multimedia/on2-8170-libs/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_ON2_8170_LIBS
 	#This is a binary only package which has been compiled for glibc
 	depends on BR2_arm926t
-	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		BR2_TOOLCHAIN_CTNG_eglibc || \
-		BR2_TOOLCHAIN_CTNG_glibc)
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_LINUX_KERNEL # on2-8170-modules
 	select BR2_PACKAGE_ON2_8170_MODULES # runtime
 	bool "on2-8170-libs"
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index e790a345ba..e5b50232fa 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -11,7 +11,7 @@ NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
 NBD_DEPENDENCIES = libglib2
 NBD_LICENSE = GPLv2
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 # We have linux/falloc.h
 # but uClibc lacks fallocate(2) which is a glibc-ism
 NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 9c143aae1e..b4d34088d6 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -35,7 +35,7 @@ NETWORK_MANAGER_CONF_OPT = \
 		--disable-ifnet
 
 # uClibc by default doesn't have backtrace support, so don't use it
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 NETWORK_MANAGER_CONF_OPT += --disable-crashtrace
 endif
 
diff --git a/package/nss-mdns/Config.in b/package/nss-mdns/Config.in
index 1df0ce4b3a..b537fa576f 100644
--- a/package/nss-mdns/Config.in
+++ b/package/nss-mdns/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_NSS_MDNS
 	bool "nss-mdns"
 	# libdaemon->avahi uses fork()
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_PACKAGE_AVAHI_DAEMON
 	help
 	  nss-mdns is a plugin for the GNU Name Service Switch (NSS)
diff --git a/package/php/php.mk b/package/php/php.mk
index 07f396eed5..299395f9f9 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -24,7 +24,7 @@ PHP_CONFIG_SCRIPTS = php-config
 PHP_CFLAGS = $(TARGET_CFLAGS)
 
 # Workaround for non-IPv6 uClibc toolchain
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 ifneq ($(BR2_INET_IPV6),y)
 	PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS
 endif
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 4dd14042e4..e3daa3200a 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -26,7 +26,7 @@ SQUID_CONF_OPT =	--enable-async-io=8 --enable-linux-netfilter \
 			--enable-external-acl-helpers="ip_user"
 
 # On uClibc librt needs libpthread
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),yy)
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
 	SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
 endif
 
diff --git a/package/tzdata/Config.in b/package/tzdata/Config.in
index 4e68a97b52..dec5f86c27 100644
--- a/package/tzdata/Config.in
+++ b/package/tzdata/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_TZDATA
 	bool "tzdata"
-	depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Time zone database
 
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 665618c7b3..448bccc796 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,4 +1,19 @@
 menu "Toolchain"
+
+# Should be selected for glibc or eglibc
+config BR2_TOOLCHAIN_USES_GLIBC
+	bool
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_USE_WCHAR
+	select BR2_ENABLE_LOCALE
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+
+config BR2_TOOLCHAIN_USES_UCLIBC
+	bool
+
 choice
 	prompt "Toolchain type"
 	help
@@ -12,6 +27,7 @@ config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
 	depends on !BR2_microblaze && !BR2_aarch64
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	select BR2_TOOLCHAIN_USES_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 208ccac86a..7c9b842cca 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -62,9 +62,7 @@ config BR2_GENERATE_LOCALE
 	# build time.
 	depends on \
 		BR2_TOOLCHAIN_BUILDROOT      || \
-		BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
-		BR2_TOOLCHAIN_CTNG_eglibc    || \
-		BR2_TOOLCHAIN_CTNG_glibc
+		BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Generate support for a list of locales. Locales can be
 	  specified with or without encoding, when no encoding is
@@ -79,9 +77,7 @@ config BR2_GENERATE_LOCALE
 
 config BR2_NEEDS_GETTEXT
 	bool
-	default y if BR2_TOOLCHAIN_BUILDROOT
-	default y if BR2_TOOLCHAIN_EXTERNAL_UCLIBC
-	default y if BR2_TOOLCHAIN_CTNG_uClibc
+	default y if BR2_TOOLCHAIN_USES_UCLIBC
 
 config BR2_NEEDS_GETTEXT_IF_LOCALE
 	bool
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 93c12e9c9f..7cfd8c27b5 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -7,27 +7,22 @@ choice
 
 config BR2_TOOLCHAIN_CTNG_uClibc
 	bool "uClibc"
+	select BR2_TOOLCHAIN_USES_UCLIBC
 
 # Although eglibc can be configured to opt-out some features,
 # let's not deal with that for the time being, it's complex...
 config BR2_TOOLCHAIN_CTNG_eglibc
 	bool "eglibc"
-	select BR2_LARGEFILE
-	select BR2_INET_IPV6
 	# Our default ct-ng configuration uses eglibc 2.12, which has
 	# native RPC support
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_ENABLE_LOCALE
-	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_TOOLCHAIN_CTNG_glibc
 	bool "glibc"
-	select BR2_LARGEFILE
-	select BR2_INET_IPV6
 	# Our default ct-ng configuration uses glibc 2.14.1, which
 	# does not have native RPC support
-	select BR2_ENABLE_LOCALE
-	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_USES_GLIBC
 
 endchoice # C library
 
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2c1c99b789..946063f953 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -815,16 +815,11 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	bool
-	select BR2_LARGEFILE
-	select BR2_INET_IPV6
-	select BR2_USE_WCHAR
-	select BR2_ENABLE_LOCALE
-	select BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	select BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	bool
+	select BR2_TOOLCHAIN_USES_UCLIBC
 
 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 

From 095fa7d8754cdf354475c804e330c86054109274 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:10 +0200
Subject: [PATCH 5581/6849] uclibc: move configuration options into the package

In preparation for the introduction of the eglibc library to the
internal toolchain backend, the options that allow to enable/disable C
library features such as largefile, IPv6, RPC and so on now belong to
the uClibc package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/Config.in                  | 77 +++++++++++++++++++++++
 toolchain/toolchain-buildroot/Config.in.2 | 77 -----------------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 22c70a2b48..410326bf5d 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -49,6 +49,83 @@ config BR2_UCLIBC_CONFIG
 	  See also docs/README in this package.
 	  If unsure, use the default.
 
+config BR2_TOOLCHAIN_BUILDROOT_LARGEFILE
+	bool "Enable large file (files > 2 GB) support"
+	select BR2_LARGEFILE
+	help
+	  Enable this option if you want your toolchain to support
+	  files bigger than 2 GB.
+
+config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
+	bool "Enable IPv6 support"
+	select BR2_INET_IPV6
+	help
+	  Enable this option if you want your toolchain to support
+	  IPv6.
+
+config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
+	bool "Enable RPC support"
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	help
+	  Enable this option if you want your toolchain to support
+	  RPC (needed for NFS, for example).
+
+config BR2_TOOLCHAIN_BUILDROOT_WCHAR
+	bool "Enable WCHAR support"
+	select BR2_USE_WCHAR
+	help
+	  Enable this option if you want your toolchain to support
+	  wide characters (i.e characters longer than 8 bits, needed
+	  for locale support).
+
+config BR2_TOOLCHAIN_BUILDROOT_LOCALE
+	bool "Enable toolchain locale/i18n support"
+	select BR2_TOOLCHAIN_BUILDROOT_WCHAR
+	select BR2_ENABLE_LOCALE
+	help
+	  Enable this option if you want your toolchain to support
+	  localization and internationalization.
+
+choice
+	prompt "Thread library implementation"
+	default BR2_PTHREADS_NATIVE if !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
+	default BR2_PTHREADS_OLD
+	help
+	  Use this option to select the thread library implementation
+	  that should be used in your toolchain. Not all thread
+	  variants work with all versions of uClibc, the "linuxthreads
+	  (stable/old)" may be a working fallback if you need
+	  threading at all.
+
+	config BR2_PTHREADS_NONE
+		bool "none"
+
+	config BR2_PTHREADS
+		bool "linuxthreads"
+		depends on !BR2_xtensa
+	        select BR2_TOOLCHAIN_HAS_THREADS
+
+	config BR2_PTHREADS_OLD
+		bool "linuxthreads (stable/old)"
+	        select BR2_TOOLCHAIN_HAS_THREADS
+
+	config BR2_PTHREADS_NATIVE
+		bool "Native POSIX Threading (NPTL)"
+	        select BR2_TOOLCHAIN_HAS_THREADS
+		depends on !BR2_ARM_OABI
+		depends on !BR2_x86_i386
+		depends on !BR2_avr32
+		depends on !BR2_xtensa
+		depends on !BR2_arc
+endchoice
+
+config BR2_PTHREAD_DEBUG
+	bool "Thread library debugging"
+	depends on BR2_PTHREADS || BR2_PTHREADS_OLD || BR2_PTHREADS_NATIVE
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	help
+	  Build the thread library with debugging enabled.
+
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "Compile and install uClibc tests"
 	select BR2_PACKAGE_MAKE
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 422602e61f..9bbf016962 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -4,43 +4,6 @@ if BR2_TOOLCHAIN_BUILDROOT
 
 comment "Toolchain Options"
 
-config BR2_TOOLCHAIN_BUILDROOT_LARGEFILE
-	bool "Enable large file (files > 2 GB) support"
-	select BR2_LARGEFILE
-	help
-	  Enable this option if you want your toolchain to support
-	  files bigger than 2 GB.
-
-config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
-	bool "Enable IPv6 support"
-	select BR2_INET_IPV6
-	help
-	  Enable this option if you want your toolchain to support
-	  IPv6.
-
-config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
-	bool "Enable RPC support"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	help
-	  Enable this option if you want your toolchain to support
-	  RPC (needed for NFS, for example).
-
-config BR2_TOOLCHAIN_BUILDROOT_WCHAR
-	bool "Enable WCHAR support"
-	select BR2_USE_WCHAR
-	help
-	  Enable this option if you want your toolchain to support
-	  wide characters (i.e characters longer than 8 bits, needed
-	  for locale support).
-
-config BR2_TOOLCHAIN_BUILDROOT_LOCALE
-	bool "Enable toolchain locale/i18n support"
-	select BR2_TOOLCHAIN_BUILDROOT_WCHAR
-	select BR2_ENABLE_LOCALE
-	help
-	  Enable this option if you want your toolchain to support
-	  localization and internationalization.
-
 config BR2_TOOLCHAIN_BUILDROOT_CXX
 	bool "Enable C++ support"
 	select BR2_INSTALL_LIBSTDCPP
@@ -58,46 +21,6 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
 	  for details.
 
-choice
-	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
-	default BR2_PTHREADS_OLD
-	help
-	  Use this option to select the thread library implementation
-	  that should be used in your toolchain. Not all thread
-	  variants work with all versions of uClibc, the "linuxthreads
-	  (stable/old)" may be a working fallback if you need
-	  threading at all.
-
-	config BR2_PTHREADS_NONE
-		bool "none"
-
-	config BR2_PTHREADS
-		bool "linuxthreads"
-		depends on !BR2_xtensa
-	        select BR2_TOOLCHAIN_HAS_THREADS
-
-	config BR2_PTHREADS_OLD
-		bool "linuxthreads (stable/old)"
-	        select BR2_TOOLCHAIN_HAS_THREADS
-
-	config BR2_PTHREADS_NATIVE
-		bool "Native POSIX Threading (NPTL)"
-	        select BR2_TOOLCHAIN_HAS_THREADS
-		depends on !BR2_ARM_OABI
-		depends on !BR2_x86_i386
-		depends on !BR2_avr32
-		depends on !BR2_xtensa
-		depends on !BR2_arc
-endchoice
-
-config BR2_PTHREAD_DEBUG
-	bool "Thread library debugging"
-	depends on BR2_PTHREADS || BR2_PTHREADS_OLD || BR2_PTHREADS_NATIVE
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	help
-	  Build the thread library with debugging enabled.
-
 source "package/elf2flt/Config.in.host"
 
 config BR2_VFP_FLOAT

From 413ecfa80faf29b55a94b666c97efea0dc8162d9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:11 +0200
Subject: [PATCH 5582/6849] eglibc: new package

This commit adds a target 'eglibc' package. For now, there is no way
to build this package, the next commit will add the integration of
eglibc into the Buildroot toolchain backend.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk | 94 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 package/eglibc/eglibc.mk

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
new file mode 100644
index 0000000000..ec80d5e929
--- /dev/null
+++ b/package/eglibc/eglibc.mk
@@ -0,0 +1,94 @@
+################################################################################
+#
+# eglibc
+#
+################################################################################
+
+EGLIBC_VERSION = 2.17-svnr22064
+EGLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
+EGLIBC_SOURCE = eglibc-$(EGLIBC_VERSION).tar.bz2
+
+# Before eglibc is configured, we must have the first stage
+# cross-compiler and the kernel headers
+EGLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk
+
+# Before eglibc is built, we must have the second stage cross-compiler
+eglibc-build: host-gcc-intermediate
+
+EGLIBC_SUBDIR = build
+
+EGLIBC_INSTALL_STAGING = YES
+
++EGLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
+
+# Even though we use the autotools-package infrastructure, we have to
+# override the default configure commands for several reasons:
+#
+#  1. We have to build out-of-tree, but we can't use the same
+#     'symbolic link to configure' used with the gcc packages.
+#
+#  2. We have to execute the configure script with bash and not sh.
+#
+define EGLIBC_CONFIGURE_CMDS
+	mkdir -p $(@D)/build
+	# Do the configuration
+	(cd $(@D)/build; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="-O2" CPPFLAGS="" CXXFLAGS="-O2" \
+		$(SHELL) $(@D)/libc/configure \
+		ac_cv_path_BASH_SHELL=/bin/bash \
+		libc_cv_forced_unwind=yes \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--enable-shared \
+		$(if $(BR2_SOFT_FLOAT),--without-fp,--with-fp) \
+		--with-pkgversion="Buildroot" \
+		--without-cvs \
+		--disable-profile \
+		--without-gd \
+		--enable-obsolete-rpc \
+		--with-headers=$(STAGING_DIR)/usr/include)
+	# Install headers and start files
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build \
+		install_root=$(STAGING_DIR) \
+		install-bootstrap-headers=yes \
+		install-headers
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build csu/subdir_lib
+	cp $(@D)/build/csu/crt1.o $(STAGING_DIR)/usr/lib/
+	cp $(@D)/build/csu/crti.o $(STAGING_DIR)/usr/lib/
+	cp $(@D)/build/csu/crtn.o $(STAGING_DIR)/usr/lib/
+	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) \
+		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
+endef
+
+
+#
+# We also override the install to target commands since we only want
+# to install the libraries, and nothing more.
+#
+
+EGLIBC_LIBS_LIB = \
+	ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so	   \
+	libnsl.so libpthread.so libresolv.so librt.so libutil.so   \
+	libnss_files.so libnss_dns.so
+
+ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+EGLIBC_LIBS_LIB += libthread_db.so
+endif
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+EGLIBC_LIBS_USR_LIB += libstdc++.so
+endif
+
+define EGLIBC_INSTALL_TARGET_CMDS
+	for libs in $(EGLIBC_LIBS_LIB); do \
+		$(call copy_toolchain_lib_root,$(STAGING_DIR)/,,lib,$$libs,/lib) ; \
+	done
+	for libs in $(EGLIBC_LIBS_USR_LIB); do \
+		$(call copy_toolchain_lib_root,$(STAGING_DIR)/,,lib,$$libs,/usr/lib) ; \
+	done
+endef
+
+$(eval $(autotools-package))

From 8d29893893fe25461abef645bfd38bf2f49c59a4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:12 +0200
Subject: [PATCH 5583/6849] eglibc: enable support in the Buildroot toolchain
 backend

Using the newly introduced 'eglibc' package, this commit enables the
option of building a toolchain using the eglibc C library in the
Buildroot toolchain backend.

In details, this commit:

 * Creates a choice to select uClibc or eglibc in the Buildroot
   toolchain backend (in toolchain/toolchain-buildroot/Config.in), and
   removes the fact that the Buildroot toolchain backend forcefully
   enables uClibc (toolchain/Config.in).

 * Creates a BUILDROOT_LIBC variables, which points to the package
   implementing the C library (i.e either 'uclibc' or 'eglibc').

 * Modifies the gcc-final and gcc-intermediate makefiles to use the
   BUILDROOT_LIBC variable instead of hardcoding the use of uclibc.

 * Ensures that TLS support is always enabled when building eglibc.

[Peter: fix commit text to refer to BUILDROOT_LIBC]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host                    |  4 +-
 package/gcc/gcc-final/gcc-final.mk            |  2 +-
 .../gcc/gcc-intermediate/gcc-intermediate.mk  |  2 +-
 package/uclibc/Config.in                      |  4 ++
 toolchain/Config.in                           |  1 -
 toolchain/toolchain-buildroot.mk              |  4 ++
 toolchain/toolchain-buildroot/Config.in       | 40 +++++++++++++++++++
 7 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 7ecf2fb117..0e26a80182 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -114,9 +114,9 @@ config BR2_GCC_SHARED_LIBGCC
 	  Build/install a shared libgcc library
 
 config BR2_GCC_ENABLE_TLS
-	bool "Enable compiler tls support"
+	bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	default y
-	depends on BR2_PTHREADS_NATIVE
+	depends on BR2_PTHREADS_NATIVE || BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 	help
 	  Enable the compiler to generate code for accessing
 	  thread local storage variables
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 998c928f61..f99f1a3789 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -10,7 +10,7 @@ GCC_FINAL_SOURCE  = $(GCC_SOURCE)
 
 HOST_GCC_FINAL_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
-	uclibc
+	$(BUILDROOT_LIBC)
 
 HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
 
diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
index 3a71671961..5460000976 100644
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -10,7 +10,7 @@ GCC_INTERMEDIATE_SOURCE  = $(GCC_SOURCE)
 
 HOST_GCC_INTERMEDIATE_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
-	uclibc-configure
+	$(BUILDROOT_LIBC)-configure
 
 HOST_GCC_INTERMEDIATE_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
 
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 410326bf5d..f309243c09 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -1,3 +1,5 @@
+if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
+
 comment "uClibc Options"
 
 choice
@@ -241,3 +243,5 @@ config BR2_UCLIBC_X86_TYPE
 	default PENTIUMIII if BR2_x86_pentium3
 	default PENTIUM4   if BR2_x86_pentium4 || BR2_x86_pentium_m || \
 			      BR2_x86_nocona || BR2_x86_core2
+
+endif # BR2_TOOLCHAIN_BUILDROOT_UCLIBC
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 448bccc796..53d25736c2 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -27,7 +27,6 @@ config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
 	depends on !BR2_microblaze && !BR2_aarch64
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
-	select BR2_TOOLCHAIN_USES_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
index e7241bfcf4..3a0580066e 100644
--- a/toolchain/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot.mk
@@ -2,4 +2,8 @@
 # build of binutils, uClibc, kernel headers and all the intermediate
 # gcc steps.
 
+include toolchain/helpers.mk
+
+BUILDROOT_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))
+
 toolchain-buildroot: host-gcc-final
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 416695b1a7..396a434ac0 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -2,7 +2,47 @@
 
 if BR2_TOOLCHAIN_BUILDROOT
 source "package/linux-headers/Config.in.host"
+
+choice
+	prompt "C library"
+
+config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
+	bool "uClibc"
+	select BR2_TOOLCHAIN_USES_UCLIBC
+	help
+	  This option selects uClibc as the C library for the
+	  cross-compilation toolchain.
+
+	  http://uclibc.org
+
+config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
+	bool "eglibc (experimental)"
+	depends on BR2_arm    || BR2_armeb    || BR2_aarch64 || \
+		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
+		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
+		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
+		   BR2_x86_64
+	select BR2_TOOLCHAIN_USES_GLIBC
+	# our eglibc.mk enables RPC support
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	help
+	  This option selects eglibc as the C library for the
+	  cross-compilation toolchain.
+
+	  The eglibc support in the Buildroot toolchain backend is
+	  very recent, and therefore marked experimental.
+
+	  http://eglibc.org
+
+endchoice
+
+config BR2_TOOLCHAIN_BUILDROOT_LIBC
+	string
+	default "uclibc" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
+	default "eglibc" if BR2_TOOLCHAIN_BUILDROOT_EGLIBC
+
 source "package/uclibc/Config.in"
+
 source "package/binutils/Config.in.host"
 source "package/gcc/Config.in.host"
 endif

From 30224b8ee221e273ca0a0128c5f487df23167b51 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Jun 2013 21:29:13 +0200
Subject: [PATCH 5584/6849] docs/manual: update to mention eglibc support in
 Buildroot toolchain backend

[Peter: minor tweak]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/configure.txt | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index 4f9a6bbcf3..56b04696d2 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -72,11 +72,12 @@ The _internal toolchain backend_ is the backend where Buildroot builds
 by itself a cross-compilation toolchain, before building the userspace
 applications and libraries for your target embedded system.
 
-This backend is the historical backend of Buildroot, and is limited to
-the usage of the http://www.uclibc.org[uClibc C library] (i.e, the
-_glibc_ and _eglibc_ C libraries are not supported by this backend,
-see the _External toolchain backend_ and _Crosstool-NG toolchain
-backend_ for solutions to use either _glibc_ or _eglibc_).
+This backend is the historical backend of Buildroot, and has been
+limited for a long time to the usage of the
+http://www.uclibc.org[uClibc C library]. Support for the _eglibc_ C
+library has been added in 2013 and is at this point considered
+experimental. See the _External toolchain backend_ and _Crosstool-NG
+toolchain backend_ for other solutions to use _glibc_ or _eglibc_.
 
 Once you have selected this backend, a number of options appear. The
 most important ones allow to:
@@ -99,29 +100,29 @@ most important ones allow to:
    the C library might be using interfaces that are not provided by
    your Linux kernel.
 
- * Change the version and the configuration of the uClibc C
-   library. The default options are usually fine. However, if you
-   really need to specifically customize the configuration of your
-   uClibc C library, you can pass a specific configuration file
-   here. Or alternatively, you can run the +make uclibc-menuconfig+
-   command to get access to uClibc's configuration interface. Note
-   that all packages in Buildroot are tested against the default
-   uClibc configuration bundled in Buildroot: if you deviate from this
-   configuration by removing features from uClibc, some packages may
-   no longer build.
+ * Change the version and the configuration of the uClibc C library
+   (if uClibc is selected). The default options are usually
+   fine. However, if you really need to specifically customize the
+   configuration of your uClibc C library, you can pass a specific
+   configuration file here. Or alternatively, you can run the +make
+   uclibc-menuconfig+ command to get access to uClibc's configuration
+   interface. Note that all packages in Buildroot are tested against
+   the default uClibc configuration bundled in Buildroot: if you
+   deviate from this configuration by removing features from uClibc,
+   some packages may no longer build.
 
  * Change the version of the GCC compiler and binutils.
 
- * Select a number of toolchain options: whether the toolchain should
-   have largefile support (i.e support for files larger than 2 GB on
-   32 bits systems), IPv6 support, RPC support (used mainly for NFS),
-   wide-char support, locale support (for internationalization), C++
-   support, thread support. Depending on which options you choose, the
-   number of userspace applications and libraries visible in Buildroot
-   menus will change: many applications and libraries require certain
-   toolchain options to be enabled. Most packages show a comment when
-   a certain toolchain option is required to be able to enable those
-   packages.
+ * Select a number of toolchain options (uClibc only): whether the
+   toolchain should have largefile support (i.e support for files
+   larger than 2 GB on 32 bits systems), IPv6 support, RPC support
+   (used mainly for NFS), wide-char support, locale support (for
+   internationalization), C++ support, thread support. Depending on
+   which options you choose, the number of userspace applications and
+   libraries visible in Buildroot menus will change: many applications
+   and libraries require certain toolchain options to be enabled. Most
+   packages show a comment when a certain toolchain option is required
+   to be able to enable those packages.
 
 It is worth noting that whenever one of those options is modified,
 then the entire toolchain and system must be rebuilt. See
@@ -137,7 +138,6 @@ Drawbacks of this backend:
 * Rebuilding the toolchain is needed when doing +make clean+, which
   takes time. If you're trying to reduce your build time, consider
   using the _External toolchain backend_.
-* Limited to the _uClibc_ C library.
 
 [[external-toolchain-backend]]
 External toolchain backend

From 9e6c4fbaca806671687c460763c79e452f039d57 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Jul 2013 00:04:48 +0200
Subject: [PATCH 5585/6849] lttng-tools: add missing dependency on util-linux
 for libuuid

Fixes:
http://autobuild.buildroot.org/results/76a/76a91bd139a93f63e17732c9a933664e8e5d3fe1/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-tools/Config.in      | 9 ++++++---
 package/lttng-tools/lttng-tools.mk | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index 67734753c6..c196e4b637 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -2,9 +2,12 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	bool "lttng-tools"
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	# liburcu only works on some architectures and requires thread support
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Userspace utilities for the LTTng 2.0 tracing
@@ -24,6 +27,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
 
 	  http://lttng.org
 
-comment "lttng-tools needs LARGEFILE and threads support"
-	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
-
+comment "lttng-tools needs LARGEFILE, threads and wchar support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_USE_WCHAR
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 2e9f936132..d48bc0a905 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -18,7 +18,7 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE
 # Since the 2.1.0 release, lttng-tools depends on flex and bison,
 # but they are not added to the dependency list since they are
 # already Buildroot dependencies.
-LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace
+LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace util-linux
 
 LTTNG_AUTORECONF = YES
 

From 7f5177d3fdb2a3401c390e7ad69db373a5823c37 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Jul 2013 00:04:49 +0200
Subject: [PATCH 5586/6849] lttng-tools: remove bogus comment

lttng-tools doesn't require bison or flex, it contains pre-generated
versions of the lexer and parser, so it can build perfectly fine
without bison and flex. We have removed both of these tools from our
mandatory dependencies since a bit of time, the Free Electrons
autobuilders don't have them installed, and the build succeeds.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lttng-tools/lttng-tools.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index d48bc0a905..0eb5fdc1b3 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -15,9 +15,6 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE
 # dependency. However, having the babeltrace utilities built for the
 # host is very useful, since those tools allow to convert the binary
 # trace format into an human readable format.
-# Since the 2.1.0 release, lttng-tools depends on flex and bison,
-# but they are not added to the dependency list since they are
-# already Buildroot dependencies.
 LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace util-linux
 
 LTTNG_AUTORECONF = YES

From 8916f9d80eb2c6a089ba4c9250656f47b5d6de77 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 3 Jul 2013 17:34:35 -0700
Subject: [PATCH 5587/6849] fbgrab: bump to version 1.1

[Peter: also update URL in Config.in]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/fbgrab/Config.in                      |  2 +-
 ...-proper-Makefile-for-cross-compiling.patch | 39 +++++++++++++++++++
 package/fbgrab/fbgrab-proper_makefile.patch   | 23 -----------
 package/fbgrab/fbgrab.mk                      |  4 +-
 4 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch
 delete mode 100644 package/fbgrab/fbgrab-proper_makefile.patch

diff --git a/package/fbgrab/Config.in b/package/fbgrab/Config.in
index ca6c6b7112..f3b29d9f99 100644
--- a/package/fbgrab/Config.in
+++ b/package/fbgrab/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_FBGRAB
 	  FBGrab is a framebuffer screenshot program, capturing the linux
 	  frambuffer and converting it to a png-picture.
 
-	  http://hem.bredband.net/gmogmo/fbgrab
+	  http://fbgrab.monells.se/
diff --git a/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch b/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch
new file mode 100644
index 0000000000..a211774db9
--- /dev/null
+++ b/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch
@@ -0,0 +1,39 @@
+From 2283817b9aed0b6228d0255d5aba7968379c9854 Mon Sep 17 00:00:00 2001
+From: Gilles Talis <gilles.talis@gmail.com>
+Date: Wed, 3 Jul 2013 11:40:36 -0700
+Subject: [PATCH] fbgrab: A proper Makefile for cross compiling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Respect to the CC, CFLAGS and LDFLAGS is required for cross compiling in
+Buildroot. And there's no need to run the source through splint.
+
+Reworked original patch from: Daniel Nyström <daniel.nystrom@timeterminal.se>
+
+Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ Makefile |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index aae16e6..2d6b6fc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,10 @@
+ ### modular. So this is a simple gnu Makefile...
+ ###
+ 
+-fbgrab: fbgrab.c
+-	gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
++LDFLAGS += -lpng -lz
++
++fbgrab: fbgrab.o
++	$(CC) $(LDFLAGS) fbgrab.o -o $@
+ 
+ install:
+ 	install fbgrab /usr/bin/fbgrab
+-- 
+1.7.4.1
+
diff --git a/package/fbgrab/fbgrab-proper_makefile.patch b/package/fbgrab/fbgrab-proper_makefile.patch
deleted file mode 100644
index e907ed7d86..0000000000
--- a/package/fbgrab/fbgrab-proper_makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-[PATCH] fbgrab: A proper Makefile for cross compiling
-
-Respect to the CC, CFLAGS and LDFLAGS is required for cross compiling in
-Buildroot. And there's no need to run the source through splint.
-
-Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
-
---- fbgrab-1.0.orig/Makefile	2010-12-07 22:57:24.000000000 +0100
-+++ fbgrab-1.0/Makefile	2010-12-07 22:58:36.000000000 +0100
-@@ -3,9 +3,10 @@
- ### modular. So this is a simple gnu Makefile...
- ###
- 
--fbgrab: fbgrab.c
--	splint +posixlib fbgrab.c
--	gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+LDFLAGS += -lpng -lz
-+
-+fbgrab: fbgrab.o
-+	$(CC) $(LDFLAGS) fbgrab.o -o $@
- 
- install:
- 	strip fbgrab
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index 62539a8922..b404c69359 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-FBGRAB_VERSION = 1.0
+FBGRAB_VERSION = 1.1
 FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz
-FBGRAB_SITE = http://hem.bredband.net/gmogmo/fbgrab
+FBGRAB_SITE = http://fbgrab.monells.se
 FBGRAB_DEPENDENCIES = libpng
 FBGRAB_LICENSE = GPLv2
 FBGRAB_LICENSE_FILES = COPYING

From 963065ed0821770b10694ce9f4cfdb69ef6f95cf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 4 Jul 2013 12:09:34 +0200
Subject: [PATCH 5588/6849] uclibc: fix PowerPC build problem

A stupid Unicode character was inserted instead of 'D'.

Fixes:
http://autobuild.buildroot.org/results/7a4/7a45fb1379307a788047ec859a4ce2c42d6eb077/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/uclibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 1c5340c85a..f8495bad0c 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -140,7 +140,7 @@ UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE))
 define UCLIBC_POWERPC_TYPE_CONFIG
 	$(call UCLIBC_OPT_UNSET,CONFIG_GENERIC,$(@D))
 	$(call UCLIBC_OPT_UNSET,CONFIG_E500,$(@D))
-	$(call UCLIBC_OPT_SET,$(UCLIBC_POWERPC_TYPE),y,$(@�))
+	$(call UCLIBC_OPT_SET,$(UCLIBC_POWERPC_TYPE),y,$(@D))
 endef
 endif # powerpc
 

From c39a2e1d6cfa62a8e68f8b10a7d61ccb6e493959 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 07:50:38 -0300
Subject: [PATCH 5589/6849] linux-headers: switch to xz format

The headers and kernels where changed to XZ format on commit
98b5cc3eb4d4103b2149325b98a5e93e68c68dd8, but the headers reverted back
to bz2 on the packaging of the toolchain.
This causes double kernel downloads when the versions match, so switch
back the headers to XZ.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-headers/linux-headers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
index 9d7a683bc9..30d3076592 100644
--- a/package/linux-headers/linux-headers.mk
+++ b/package/linux-headers/linux-headers.mk
@@ -13,7 +13,7 @@ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
 else
 LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
 endif
-LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.bz2
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
 
 LINUX_HEADERS_INSTALL_STAGING = YES
 

From 1aced6c48dfed999594737c0c1ecc20892239ed9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 10:22:25 -0300
Subject: [PATCH 5590/6849] uclibc: snapshots are bz2

Snapshot tarballs are only in bz2 format, fixes:
http://autobuild.buildroot.net/results/b02/b021b296309d01405ad45344055863a5761abd70/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/uclibc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index f8495bad0c..5cbc011ded 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -5,15 +5,15 @@
 ################################################################################
 
 UCLIBC_VERSION = $(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
-UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.xz
+UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.bz2
 
 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 UCLIBC_SITE = http://www.uclibc.org/downloads/snapshots
 else ifeq ($(findstring arc,$(UCLIBC_VERSION)),arc)
 UCLIBC_SITE = $(BR2_ARC_SITE)
-UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.bz2
 else
 UCLIBC_SITE = http://www.uclibc.org/downloads
+UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.xz
 endif
 
 UCLIBC_INSTALL_STAGING = YES

From c7528e5d0b7f1241fa4b3a4f94ca3d9e52a349ab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 5 Jul 2013 09:12:02 +0200
Subject: [PATCH 5591/6849] uclibc: fixup more unicode madness

This should be @D, and not some kind of funky unicode character.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/uclibc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 5cbc011ded..421e323035 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -114,7 +114,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh)
 UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE))
 define UCLIBC_SH_TYPE_CONFIG
 	$(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_SH_TYPE),y,$(@�))
+	$(call UCLIBC_OPT_SET,$(UCLIBC_SH_TYPE),y,$(@D))
 endef
 endif # sh
 
@@ -126,7 +126,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sparc)
 UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
 define UCLIBC_SPARC_TYPE_CONFIG
 	$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
-		 $(@�)/.config
+		 $(@D)/.config
 	$(call UCLIBC_OPT_SET,$(UCLIBC_SPARC_TYPE),y,$(@D))
 endef
 endif # sparc

From 820e8c3f81a0f932369b5815309ead3127e38fa7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 5 Jul 2013 09:15:02 +0200
Subject: [PATCH 5592/6849] gcc: fix avr32 typo

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 0e26a80182..1b191282d0 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -6,7 +6,7 @@ config BR2_GCC_NEEDS_MPC
 choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
-	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr3
+	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
 	default BR2_GCC_VERSION_4_4_7_ARC if BR2_arc
 	default BR2_GCC_VERSION_4_7_X
 	help

From 27838bcd7a0e84ac96c2d24d9cfedff3e1498512 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 5 Jul 2013 10:23:53 +0200
Subject: [PATCH 5593/6849] eglibc: fix typo

For some reason, a '+' sign was left at the beginning of a line in
eglibc.mk. Noticed by Gustavo Zacarias.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index ec80d5e929..bb81757470 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -19,7 +19,7 @@ EGLIBC_SUBDIR = build
 
 EGLIBC_INSTALL_STAGING = YES
 
-+EGLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
+EGLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
 
 # Even though we use the autotools-package infrastructure, we have to
 # override the default configure commands for several reasons:

From 885449e4b9171283a8106957db5cf6139ef2273a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 5 Jul 2013 10:27:46 +0200
Subject: [PATCH 5594/6849] eglibc: add license details

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index bb81757470..ccdc2109d3 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -7,6 +7,8 @@
 EGLIBC_VERSION = 2.17-svnr22064
 EGLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
 EGLIBC_SOURCE = eglibc-$(EGLIBC_VERSION).tar.bz2
+EGLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
+EGLIBC_LICENSE_FILES = libc/COPYING libc/COPYING.LIB libc/LICENSES
 
 # Before eglibc is configured, we must have the first stage
 # cross-compiler and the kernel headers

From 197006a41c1a0450bf6350d5742e186b5b0c69de Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 5 Jul 2013 10:40:52 +0200
Subject: [PATCH 5595/6849] gcc: apply PowerPC patch when needed

When converting gcc to the package infrastructure, a specific thing
for PowerPC was forgotten: applying the conditional patch
powerpc-link-with-math-lib.patch.conditional. This breaks the build of
some PowerPC toolchains, with failures such as:

<http://jenkins.free-electrons.com/job/buildroot/./config=qemu_ppc_virtex_ml507_defconfig/ws/output/host/usr/lib/gcc/powerpc-buildroot-linux-uclibc/4.7.3/../../../../powerpc-buildroot-linux-uclibc/lib/libgcc_s.so.1>: undefined reference to `copysignl'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 790762da72..968354b418 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -38,8 +38,17 @@ endef
 # Apply patches
 #
 
+ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
+ifneq ($(BR2_SOFT_FLOAT),)
+define HOST_GCC_APPLY_POWERPC_PATCH
+	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
+endef
+endif
+endif
+
 define HOST_GCC_APPLY_PATCHES
 	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch
+	$(HOST_GCC_APPLY_POWERPC_PATCH)
 endef
 
 #

From 7cbebbc48c26ddfb18da23ffba356744a5592ea6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 5 Jul 2013 10:48:09 +0200
Subject: [PATCH 5596/6849] Add 'bc' in the mandatory dependencies

Since a few kernel releases, having 'bc' installed is mandatory to
build the kernel. See commit
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=70730bca1331fc50c3caacaea00439de1325bd6e
of the kernel.

Since this tool is generally available by default in distributions,
and we're unlikely to see version-specific problems with it, we
just check for it to be installed in
support/dependencies/dependencies.sh.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/dependencies/dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 0b44c5afb3..61a4140abe 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -132,7 +132,7 @@ fi;
 
 # Check that a few mandatory programs are installed
 missing_progs="no"
-for prog in patch perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
+for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
 	/bin/echo -e "You must install '$prog' on your build machine";
 	missing_progs="yes"

From f384f6f3e5e45518557e51f4ca2fce738a54ce96 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 5 Jul 2013 12:09:42 -0300
Subject: [PATCH 5597/6849] docs: linuxdevices is dead, switch to linuxgizmos

linuxdevices.com has been dead for some time now when it was bought out.
Switch to linuxgizmos.com which is the new page of the author.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/header.html b/docs/header.html
index aa16d540ef..a7160cd1a3 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -65,7 +65,7 @@
     <br><a href="http://www.scratchbox.org/">Scratchbox</a>
     <br><a href="http://openembedded.org/">OpenEmbedded</a>
     <br><a href="http://www.ucdot.org/">uCdot</a>
-    <br><a href="http://www.linuxdevices.com/">LinuxDevices</a>
+    <br><a href="http://linuxgizmos.com/">LinuxGizmos</a>
     <br><a href="http://slashdot.org/">Slashdot</a>
     <br><a href="http://freecode.com/">Freecode</a>
     <br><a href="http://linuxtoday.com/">Linux Today</a>

From fbca9aa24ede06dd1bcdff630d1a7cb61266ef22 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 5 Jul 2013 17:31:50 -0700
Subject: [PATCH 5598/6849] ethtool: bump to version 3.10

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index bb2dc9fea1..66f8ffa268 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ETHTOOL_VERSION = 3.9
+ETHTOOL_VERSION = 3.10
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
 ETHTOOL_LICENSE_FILES = COPYING

From 8508dbb6d279800f0a5d6a1d320171db2a7d545c Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Sat, 6 Jul 2013 23:35:31 +1000
Subject: [PATCH 5599/6849] qt: add patch for QTBUG-31579 to fix polyline
 drawing

Upstream bug: https://bugreports.qt-project.org/browse/QTBUG-31579

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt-fix-polyline-drawing.patch | 145 +++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 package/qt/qt-fix-polyline-drawing.patch

diff --git a/package/qt/qt-fix-polyline-drawing.patch b/package/qt/qt-fix-polyline-drawing.patch
new file mode 100644
index 0000000000..d0c3d07375
--- /dev/null
+++ b/package/qt/qt-fix-polyline-drawing.patch
@@ -0,0 +1,145 @@
+From b7029fbd12c32e851ed7d81b692197176eb71d9e Mon Sep 17 00:00:00 2001
+From: Gunnar Sletta <gunnar.sletta@digia.com>
+Date: Thu, 4 Jul 2013 16:20:40 +1000
+Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
+
+This was broken by a previous fix which aimed to fix gaps in
+polylines with tiny line segments. The result was that we
+skipped updating the origin point when stroke() didn't produce
+pixels which accidentally included the case of the line
+being completely outside the deviceRect. I fixed this
+by returning the value of clipLine in drawLine to the caller
+so we could still update the origin for this case.
+
+Task-number: QTBUG-31579
+Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
+(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
+---
+ src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++++-------------
+ src/gui/painting/qcosmeticstroker_p.h |  2 +-
+ 2 files changed, 27 insertions(+), 17 deletions(-)
+
+diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
+index 0061ecb..4413170 100644
+--- a/src/gui/painting/qcosmeticstroker.cpp
++++ b/src/gui/painting/qcosmeticstroker.cpp
+@@ -133,10 +133,15 @@ struct NoDasher {
+ 
+ };
+ 
++/*
++ * The return value is the result of the clipLine() call performed at the start
++ * of each of the two functions, aka "false" means completely outside the devices
++ * rect.
++ */
+ template<DrawPixel drawPixel, class Dasher>
+-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
++static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
+ template<DrawPixel drawPixel, class Dasher>
+-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
++static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
+ 
+ inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage)
+ {
+@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
+                 caps |= CapEnd;
+ 
+             QCosmeticStroker::Point last = this->lastPixel;
+-            stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
++            bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
+ 
+             /* fix for gaps in polylines with fastpen and aliased in a sequence
+                of points with small distances: if current point p2 has been dropped
+-               out, keep last non dropped point p. */
+-            if (fastPenAliased) {
+-                if (last.x != lastPixel.x || last.y != lastPixel.y ||
+-                    points == begin + 2 || points == end - 2 ) {
+-                    {
+-                        p = p2;
+-                    }
++               out, keep last non dropped point p.
++
++               However, if the line was completely outside the devicerect, we
++               still need to update p to avoid drawing the line after this one from
++               a bad starting position.
++            */
++            if (fastPenAliased && unclipped) {
++                if (last.x != lastPixel.x || last.y != lastPixel.y
++                    || points == begin + 2 || points == end - 2) {
++                    p = p2;
+                 }
+             } else {
+                 p = p2;
+@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc)
+   the drawing shifts from horizontal to vertical or back.
+   */
+ template<DrawPixel drawPixel, class Dasher>
+-static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
++static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
+ {
+     if (stroker->clipLine(rx1, ry1, rx2, ry2))
+-        return;
++        return false;
+ 
+     static const int half = 31;
+     int x1 = toF26Dot6(rx1) + half;
+@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
+     } else {
+         // horizontal
+         if (!dx)
+-            return;
++            return true;
+ 
+         QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
+ 
+@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
+         }
+     }
+     stroker->lastPixel = last;
++    return true;
+ }
+ 
+ 
+ template<DrawPixel drawPixel, class Dasher>
+-static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
++static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
+ {
+     if (stroker->clipLine(rx1, ry1, rx2, ry2))
+-        return;
++        return false;
+ 
+     int x1 = toF26Dot6(rx1);
+     int y1 = toF26Dot6(ry1);
+@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
+     } else {
+         // horizontal
+         if (!dx)
+-            return;
++            return true;
+ 
+         int yinc = F16Dot16FixedDiv(dy, dx);
+ 
+@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
+             drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6);
+         }
+     }
++    return true;
+ }
+ 
+ QT_END_NAMESPACE
+diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
+index 870738b..3216856 100644
+--- a/src/gui/painting/qcosmeticstroker_p.h
++++ b/src/gui/painting/qcosmeticstroker_p.h
+@@ -56,7 +56,7 @@ QT_MODULE(Gui)
+ class QCosmeticStroker;
+ 
+ 
+-typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
++typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
+ 
+ class QCosmeticStroker
+ {
+-- 
+1.8.3.2
+

From 478f826518e1cf769abfb69da9361d931be15f8c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 6 Jul 2013 17:18:50 +0200
Subject: [PATCH 5600/6849] iptables: fix build after linux-headers changes

As reported by 'scanf' on IRC, the iptables now fails to build because
of a missing <asm/cache.h> header in the kernel headers. The package
directly uses $(LINUX_HEADERS_DIR), which is not correct: this is the
source directory of the kernel, not where they are installed, and in
addition, this directory is empty/does not exist when using external
toolchains.

Instead, we use $(STAGING_DIR)/usr, which contains the kernel headers,
as part of the toolchain headers.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iptables/iptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index cfb227ad91..f548cb9f4b 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -12,7 +12,7 @@ IPTABLES_DEPENDENCIES = host-pkgconf
 IPTABLES_LICENSE = GPLv2
 IPTABLES_LICENSE_FILES = COPYING
 
-IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR)
+IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr
 
 define IPTABLES_TARGET_SYMLINK_CREATE
 	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables

From 7ca310b0a0a38f193f573aac65628adac57ebf49 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 7 Jul 2013 15:13:24 +0200
Subject: [PATCH 5601/6849] package/rpi-firmware: bump version

Fixes for:
  - sound volume
  - GL deadlock
  - ressources leak
  - compressed audio streams
  - audio sampling up to 192kHz
  - display scaling
  - cache flush for mailbox

Switch to using a 7-char cset, instead of the long one.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index b490296606..6ea621f825 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = a0c98fa6bc0f93bad8cbfcf749f7be7dc2276192
+RPI_FIRMWARE_VERSION = 320084a
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From 04388c40c50c24b87df7f5bd920ee023ece5d33f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 7 Jul 2013 15:13:25 +0200
Subject: [PATCH 5602/6849] config/rpi: bump kernel

Misc fixes and enhancements:
  - faster image blitting in framebuffer
  - USB fixes, and use of FIQ instead of plain IRQ
  - generic ARM fixes for memset
  - BT l2cap fix

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/rpi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 40fd333e9d..3df440fa65 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.6.11"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="5516fc2"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="53f7e0b"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 14c9ef95a4db03d89f9683812173878807fcb0c1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 7 Jul 2013 15:13:26 +0200
Subject: [PATCH 5603/6849] package/rpi-userland: bump version

Misc fixes for audio and raspi-cam.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 55d7b09bc1..fca0e25a42 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 986774edf7c91a8a91d59abadbdb0b34b5a387dc
+RPI_USERLAND_VERSION = 8b271ac
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 4753416d1d9cd72a7bbc55d4257fe739c77522f1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Jul 2013 17:07:22 +0200
Subject: [PATCH 5604/6849] efl: factorize version number as EFL_VERSION

All the EFL components are released simultaneously, with an identical
version number, just like all Qt5 components for example. So it makes
sense to have a single EFL_VERSION variable in package/efl/efl.mk that
is used by all the packages in package/efl/*/*.mk.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/efl.mk                                             | 2 ++
 package/efl/expedite/expedite.mk                               | 2 +-
 package/efl/libecore/libecore.mk                               | 2 +-
 package/efl/libedbus/libedbus.mk                               | 2 +-
 package/efl/libedje/libedje.mk                                 | 2 +-
 package/efl/libeet/libeet.mk                                   | 2 +-
 package/efl/libefreet/libefreet.mk                             | 2 +-
 package/efl/libeina/libeina.mk                                 | 2 +-
 package/efl/libeio/libeio.mk                                   | 2 +-
 package/efl/libelementary/libelementary.mk                     | 2 +-
 package/efl/libembryo/libembryo.mk                             | 2 +-
 package/efl/libethumb/libethumb.mk                             | 2 +-
 package/efl/libevas-generic-loaders/libevas-generic-loaders.mk | 2 +-
 package/efl/libevas/libevas.mk                                 | 2 +-
 14 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index d8d53cf396..b7462f135b 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -1 +1,3 @@
+EFL_VERSION = 1.7.4
+
 include package/efl/*/*.mk
diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
index 68c7d34fcd..dfd3a4af26 100644
--- a/package/efl/expedite/expedite.mk
+++ b/package/efl/expedite/expedite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EXPEDITE_VERSION = 1.7.4
+EXPEDITE_VERSION = $(EFL_VERSION)
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
 EXPEDITE_LICENSE = BSD-2c
 EXPEDITE_LICENSE_FILES = COPYING
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 0943a2083e..98496ac17b 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBECORE_VERSION = 1.7.4
+LIBECORE_VERSION = $(EFL_VERSION)
 LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
 LIBECORE_SITE = http://download.enlightenment.org/releases/
 LIBECORE_LICENSE = BSD-2c
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 0d34fc0cb2..e6f9b0885e 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEDBUS_VERSION = 1.7.4
+LIBEDBUS_VERSION = $(EFL_VERSION)
 LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
 LIBEDBUS_SITE = http://download.enlightenment.org/releases/
 LIBEDBUS_LICENSE = BSD-2c
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index c2f05f02c7..12d1999a42 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEDJE_VERSION = 1.7.4
+LIBEDJE_VERSION = $(EFL_VERSION)
 LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
 LIBEDJE_SITE =  http://download.enlightenment.org/releases/
 LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index e7edd9e093..ee33a0ded9 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEET_VERSION = 1.7.4
+LIBEET_VERSION = $(EFL_VERSION)
 LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
 LIBEET_SITE = http://download.enlightenment.org/releases/
 LIBEET_LICENSE = BSD-2c
diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
index b23a5a507e..27b8fa280a 100644
--- a/package/efl/libefreet/libefreet.mk
+++ b/package/efl/libefreet/libefreet.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEFREET_VERSION = 1.7.4
+LIBEFREET_VERSION = $(EFL_VERSION)
 LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
 LIBEFREET_SITE = http://download.enlightenment.org/releases/
 LIBEFREET_LICENSE = BSD-2c
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index ee40c14e35..1a11ae00c2 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEINA_VERSION = 1.7.4
+LIBEINA_VERSION = $(EFL_VERSION)
 LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
 LIBEINA_SITE = http://download.enlightenment.org/releases/
 LIBEINA_LICENSE = LGPLv2.1+
diff --git a/package/efl/libeio/libeio.mk b/package/efl/libeio/libeio.mk
index ba908ea37b..65d2a32307 100644
--- a/package/efl/libeio/libeio.mk
+++ b/package/efl/libeio/libeio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEIO_VERSION = 1.7.4
+LIBEIO_VERSION = $(EFL_VERSION)
 LIBEIO_SOURCE = eio-$(LIBEIO_VERSION).tar.bz2
 LIBEIO_SITE = http://download.enlightenment.org/releases/
 LIBEIO_LICENSE = LGPLv2.1
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index f20a35d155..82a8c1c90a 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBELEMENTARY_VERSION = 1.7.4
+LIBELEMENTARY_VERSION = $(EFL_VERSION)
 LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
 LIBELEMENTARY_SITE = http://download.enlightenment.org/releases/
 LIBELEMENTARY_LICENSE = LGPLv2.1
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index 298b9f78aa..727c424233 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEMBRYO_VERSION = 1.7.4
+LIBEMBRYO_VERSION = $(EFL_VERSION)
 LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
 LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
 LIBEMBRYO_LICENSE = BSD-2c, Embryo license
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
index eb098eaef5..62ce752d94 100644
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBETHUMB_VERSION = 1.7.4
+LIBETHUMB_VERSION = $(EFL_VERSION)
 LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
 LIBETHUMB_SITE = http://download.enlightenment.org/releases/
 LIBETHUMB_LICENSE = LGPLv2.1+
diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
index c010348bbf..6de7d64371 100644
--- a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
+++ b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.4
+LIBEVAS_GENERIC_LOADERS_VERSION = $(EFL_VERSION)
 LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
 LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases/
 LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 34a839a1db..41ceb49cc9 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEVAS_VERSION = 1.7.4
+LIBEVAS_VERSION = $(EFL_VERSION)
 LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
 LIBEVAS_SITE = http://download.enlightenment.org/releases/
 LIBEVAS_LICENSE = BSD-2c

From 338721636a21352b92a8da4ac8d4c6e6e7c01ff9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Jul 2013 17:07:23 +0200
Subject: [PATCH 5605/6849] efl: bump to version 1.7.7

The package/efl/libevas/libevas-fix-xcb-backend-typo.patch patch is
removed, as it has been merged upstream.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/efl.mk                            |  2 +-
 .../libevas-fix-xcb-backend-typo.patch        | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 package/efl/libevas/libevas-fix-xcb-backend-typo.patch

diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index b7462f135b..f284c93be7 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -1,3 +1,3 @@
-EFL_VERSION = 1.7.4
+EFL_VERSION = 1.7.7
 
 include package/efl/*/*.mk
diff --git a/package/efl/libevas/libevas-fix-xcb-backend-typo.patch b/package/efl/libevas/libevas-fix-xcb-backend-typo.patch
deleted file mode 100644
index 2531e75eee..0000000000
--- a/package/efl/libevas/libevas-fix-xcb-backend-typo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix typo in the Evas XCB backend
-
-This typo prevents the XCB backend from building.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/src/modules/engines/software_x11/evas_xcb_outbuf.c
-===================================================================
---- a/src/modules/engines/software_x11/evas_xcb_outbuf.c
-+++ b/src/modules/engines/software_x11/evas_xcb_outbuf.c
-@@ -871,7 +871,7 @@
-           }
-         else
-           {
--             int pixelb = evas_software_xcb_output_buffer_depth(obr->xob) / 8;
-+             int pixelb = evas_software_xcb_output_buffer_depth(obr->xcbob) / 8;
-              int run;
-              int dstjump;
-              

From d4c476f8c523db9dd303bf3dfd1ef3db87254d6c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 7 Jul 2013 17:07:24 +0200
Subject: [PATCH 5606/6849] enlightenment: bump to 0.17.3

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../enlightenment-no-execinfo.patch           | 27 -------------------
 package/enlightenment/enlightenment.mk        |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/enlightenment/enlightenment-no-execinfo.patch

diff --git a/package/enlightenment/enlightenment-no-execinfo.patch b/package/enlightenment/enlightenment-no-execinfo.patch
deleted file mode 100644
index 81fbe17f78..0000000000
--- a/package/enlightenment/enlightenment-no-execinfo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Do not include <execinfo.h> when not available
-
-On uClibc, <execinfo.h> is not necessarily installed, depending on the
-configuration. Enlightenment properly makes <execinfo.h> optional, but
-uses __GLIBC__ to check if it is available or not. Unfortunately,
-uClibc defines __GLIBC__, so it is not the right way to decide if
-<execinfo.h> is available.
-
-Instead, Enlightenment already has a configure.ac check for
-execinfo.h, so we simply use the result of this configure.ac check to
-decide whether execinfo.h is to be included or not.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/src/bin/e.h
-===================================================================
---- a/src/bin/e.h
-+++ b/src/bin/e.h
-@@ -92,7 +92,7 @@
- #  include <memcheck.h>
- # endif
- 
--# ifdef __GLIBC__
-+# ifdef HAVE_EXECINFO_H
- #  include <execinfo.h>
- # endif
- 
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 1163aa565c..b4154864c0 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.17.0-omega
+ENLIGHTENMENT_VERSION = 0.17.3
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/releases/
 ENLIGHTENMENT_LICENSE = BSD-2c
 ENLIGHTENMENT_LICENSE_FILES = COPYING

From 8507f38e88f651d91ad31d4403b7437b856bce0f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 7 Jul 2013 18:13:53 +0200
Subject: [PATCH 5607/6849] package/tvheadend: bump version

... for a truck-load of memory-leak and other various fixes.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/tvheadend.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 4f9a148053..2a09263411 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION           = 6cb8eaa
+TVHEADEND_VERSION           = 5956233
 TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE

From a74eed067593aa3c7726e23f1f85f527b7195f76 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 7 Jul 2013 22:47:04 +0200
Subject: [PATCH 5608/6849] gcc: re-add upstream URL for arc specific gcc
 variant

Got dropped in the gcc -> packages work.

Fixes http://autobuild.buildroot.net/results/08e/08e8149c9889141d644896e1fd3e0d2f14299033/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 968354b418..d38629d15e 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -19,6 +19,8 @@ ifneq ($(GCC_SNAP_DATE),)
 GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
 GCC_SITE = ftp://www.at91.com/pub/buildroot/
+else ifeq ($(findstring arc,$(GCC_VERSION)),arc)
+GCC_SITE = $(BR2_ARC_SITE)
 else
 GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
 endif

From 3a622ef307e3e3048c60d474865498fd8d18e717 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 15:31:34 -0300
Subject: [PATCH 5609/6849] uclibc: add upstream patch for 3.10+ headers

Add uClibc upstream patch to support __kernel_long and __kernel_ulong
datatypes as used by kernel headers 3.10+

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...add-__kernel_long-and-__kernel_ulong.patch | 392 ++++++++++++++++++
 ...add-__kernel_long-and-__kernel_ulong.patch | 392 ++++++++++++++++++
 2 files changed, 784 insertions(+)
 create mode 100644 package/uclibc/0.9.32.1/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch

diff --git a/package/uclibc/0.9.32.1/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.32.1/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
new file mode 100644
index 0000000000..4ba60e93fc
--- /dev/null
+++ b/package/uclibc/0.9.32.1/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
@@ -0,0 +1,392 @@
+From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Mon, 1 Oct 2012 18:12:54 +1300
+Subject: [PATCH] libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
+exported header files were updated to use these new types. Add the
+definitions for __kernel_long_t and __kernel_ulong_t to the relevant
+kernel_types.h headers.
+
+This change was automated with the following scriptlet
+
+  git grep --name-only 'typedef.*__kernel_old_dev_t' \
+    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
+  typedef long\t\t__kernel_long_t;\
+  typedef unsigned long\t__kernel_ulong_t;'
+
+Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+--
+Here's a cleaned up patch which should get the whitespace right. I'm a
+bit iffy about the sparc changes they make sense to me but it's not a
+platform I have access to.
+
+I can break this up per arch or per maintainer if requested.
+
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
+ 22 files changed, 50 insertions(+)
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
+ 22 files changed, 50 insertions(+)
+
+diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+index d5574c9..cd59b9d 100644
+--- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
++++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
+ typedef __kernel_uid_t __kernel_uid32_t;
+ typedef __kernel_gid_t __kernel_gid32_t;
+ typedef __kernel_dev_t __kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ 	int val[2];
+diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
+index 766a306..6b36f32 100644
+--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
++++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef long long		__kernel_loff_t;
+ typedef __kernel_dev_t		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+index f7d8b52..c551d57 100644
+--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef unsigned short		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long		__kernel_loff_t;
+diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+index d69a875..9fec595 100644
+--- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
++++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+index 7557309..2c363a8 100644
+--- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
++++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef unsigned int	__kernel_size_t;
+ typedef int		__kernel_ssize_t;
+ typedef int		__kernel_ptrdiff_t;
+diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
+index f122c7f..5d31f7b 100644
+--- a/libc/sysdeps/linux/cris/bits/kernel_types.h
++++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
+@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long	__kernel_loff_t;
+diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
+index 8017d85..f55a129 100644
+--- a/libc/sysdeps/linux/e1/bits/kernel_types.h
++++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ /*
+diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+index 0570675..4cfd1bf 100644
+--- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
++++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+index 4441f9b..6b2e794 100644
+--- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
+ typedef unsigned long long	__kernel_ino64_t;
+ 
+ typedef unsigned int		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
+index 9c07c72..59044b8 100644
+--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+index c8ef86d..e31dc65 100644
+--- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
+ 
+ typedef unsigned int	__kernel_dev_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #endif /* _ASM_IA64_POSIX_TYPES_H */
+diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+index 0a77a8f..176b968 100644
+--- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
++++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+index 2a70575..a9f736b 100644
+--- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
++++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long	__kernel_loff_t;
+diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
+index 9fc3b96..97faeac 100644
+--- a/libc/sysdeps/linux/mips/bits/kernel_types.h
++++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
+ typedef __kernel_uid_t	__kernel_old_uid_t;
+ typedef __kernel_gid_t	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #else
+ typedef unsigned int	__kernel_dev_t;
+@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
+ typedef __kernel_uid_t	__kernel_old_uid_t;
+ typedef __kernel_gid_t	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+index 8b86d79..3c030e7 100644
+--- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
++++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef unsigned short	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+index 3f3b933..1167de2 100644
+--- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ #else
+ typedef unsigned int	__kernel_dev_t;
+ typedef unsigned int	__kernel_ino_t;
+@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
+index f96e9fa..ac97261 100644
+--- a/libc/sysdeps/linux/sh/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+index 671cc83..8cc6c61 100644
+--- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long       __kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+index 0cc4bc2..a10e075 100644
+--- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_gid16_t;
+ typedef __kernel_uid_t 	       __kernel_old_uid_t;
+ typedef __kernel_gid_t         __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef __kernel_uid_t	       __kernel_uid32_t;
+ typedef __kernel_gid_t	       __kernel_gid32_t;
+ typedef int		       __kernel_suseconds_t;
+@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid32_t;
+ typedef unsigned short	       __kernel_old_uid_t;
+ typedef unsigned short	       __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef long long              __kernel_loff_t;
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
+index 3e851ab..780aa8a 100644
+--- a/libc/sysdeps/linux/v850/bits/kernel_types.h
++++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
+@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+index de800d7..0cae08c 100644
+--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+index 44f1075..ed38f2e 100644
+--- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef unsigned short	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ /* Beginning in 2.6 kernels, which is the first version that includes the
+-- 
+1.8.1.5
+
diff --git a/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
new file mode 100644
index 0000000000..4ba60e93fc
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
@@ -0,0 +1,392 @@
+From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Mon, 1 Oct 2012 18:12:54 +1300
+Subject: [PATCH] libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
+exported header files were updated to use these new types. Add the
+definitions for __kernel_long_t and __kernel_ulong_t to the relevant
+kernel_types.h headers.
+
+This change was automated with the following scriptlet
+
+  git grep --name-only 'typedef.*__kernel_old_dev_t' \
+    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
+  typedef long\t\t__kernel_long_t;\
+  typedef unsigned long\t__kernel_ulong_t;'
+
+Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+--
+Here's a cleaned up patch which should get the whitespace right. I'm a
+bit iffy about the sparc changes they make sense to me but it's not a
+platform I have access to.
+
+I can break this up per arch or per maintainer if requested.
+
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
+ 22 files changed, 50 insertions(+)
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
+ 22 files changed, 50 insertions(+)
+
+diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+index d5574c9..cd59b9d 100644
+--- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
++++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
+ typedef __kernel_uid_t __kernel_uid32_t;
+ typedef __kernel_gid_t __kernel_gid32_t;
+ typedef __kernel_dev_t __kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ 	int val[2];
+diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
+index 766a306..6b36f32 100644
+--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
++++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef long long		__kernel_loff_t;
+ typedef __kernel_dev_t		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+index f7d8b52..c551d57 100644
+--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef unsigned short		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long		__kernel_loff_t;
+diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+index d69a875..9fec595 100644
+--- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
++++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+index 7557309..2c363a8 100644
+--- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
++++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef unsigned int	__kernel_size_t;
+ typedef int		__kernel_ssize_t;
+ typedef int		__kernel_ptrdiff_t;
+diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
+index f122c7f..5d31f7b 100644
+--- a/libc/sysdeps/linux/cris/bits/kernel_types.h
++++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
+@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long	__kernel_loff_t;
+diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
+index 8017d85..f55a129 100644
+--- a/libc/sysdeps/linux/e1/bits/kernel_types.h
++++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ /*
+diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+index 0570675..4cfd1bf 100644
+--- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
++++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+index 4441f9b..6b2e794 100644
+--- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
+ typedef unsigned long long	__kernel_ino64_t;
+ 
+ typedef unsigned int		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
+index 9c07c72..59044b8 100644
+--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+index c8ef86d..e31dc65 100644
+--- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
+ 
+ typedef unsigned int	__kernel_dev_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #endif /* _ASM_IA64_POSIX_TYPES_H */
+diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+index 0a77a8f..176b968 100644
+--- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
++++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+index 2a70575..a9f736b 100644
+--- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
++++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long	__kernel_loff_t;
+diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
+index 9fc3b96..97faeac 100644
+--- a/libc/sysdeps/linux/mips/bits/kernel_types.h
++++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
+ typedef __kernel_uid_t	__kernel_old_uid_t;
+ typedef __kernel_gid_t	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #else
+ typedef unsigned int	__kernel_dev_t;
+@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
+ typedef __kernel_uid_t	__kernel_old_uid_t;
+ typedef __kernel_gid_t	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+index 8b86d79..3c030e7 100644
+--- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
++++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef unsigned short	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+index 3f3b933..1167de2 100644
+--- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ #else
+ typedef unsigned int	__kernel_dev_t;
+ typedef unsigned int	__kernel_ino_t;
+@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
+index f96e9fa..ac97261 100644
+--- a/libc/sysdeps/linux/sh/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+index 671cc83..8cc6c61 100644
+--- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long       __kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+index 0cc4bc2..a10e075 100644
+--- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_gid16_t;
+ typedef __kernel_uid_t 	       __kernel_old_uid_t;
+ typedef __kernel_gid_t         __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef __kernel_uid_t	       __kernel_uid32_t;
+ typedef __kernel_gid_t	       __kernel_gid32_t;
+ typedef int		       __kernel_suseconds_t;
+@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid32_t;
+ typedef unsigned short	       __kernel_old_uid_t;
+ typedef unsigned short	       __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef long long              __kernel_loff_t;
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
+index 3e851ab..780aa8a 100644
+--- a/libc/sysdeps/linux/v850/bits/kernel_types.h
++++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
+@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+index de800d7..0cae08c 100644
+--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+index 44f1075..ed38f2e 100644
+--- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef unsigned short	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ /* Beginning in 2.6 kernels, which is the first version that includes the
+-- 
+1.8.1.5
+

From eaf446e751d41d68c069edfe3732ff74cf083c7b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 15:31:35 -0300
Subject: [PATCH 5610/6849] linux-headers: add 3.10.x series

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-headers/Config.in.host | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 495552416a..8431b2da0b 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -5,7 +5,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_9
+	default BR2_KERNEL_HEADERS_3_10
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -53,6 +53,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_9
 		bool "Linux 3.9.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_10
+		bool "Linux 3.10.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Manually specified Linux version"
 
@@ -79,5 +82,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.9"		if BR2_KERNEL_HEADERS_3_9
+	default "3.10"		if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 57a0b924c66bbc373f05c27e54f61c4a28cff136 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 15:31:36 -0300
Subject: [PATCH 5611/6849] linux: default to version 3.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index f58e714bdf..421f855532 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.9.8"
+	bool "3.10"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 9cb3d08194942aad04ab9a07d85762a726ad1956 Mon Sep 17 00:00:00 2001
From: Gregory Hermant <gregory.hermant@calao-systems.com>
Date: Thu, 4 Jul 2013 14:47:16 +0200
Subject: [PATCH 5612/6849] snowball: fix download URL

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_snowball_defconfig                     | 4 ++--
 package/snowball-hdmiservice/snowball-hdmiservice.mk | 2 +-
 package/snowball-init/snowball-init.mk               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/calao_snowball_defconfig b/configs/calao_snowball_defconfig
index 360ed5129a..0631b52a21 100644
--- a/configs/calao_snowball_defconfig
+++ b/configs/calao_snowball_defconfig
@@ -1,6 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
-BR2_GCC_VERSION_4_7_X=y
+BR2_KERNEL_HEADERS_3_4=y
 # BR2_SOFT_FLOAT is not set
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -17,7 +17,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="snowball"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://igloocommunity.org/git/kernel/igloo-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/igloocommunity/igloo-kernel"
 BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"
 BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"
 BR2_LINUX_KERNEL_DEFCONFIG="u8500"
diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.mk b/package/snowball-hdmiservice/snowball-hdmiservice.mk
index d7bfd5a7fe..bbe673b647 100644
--- a/package/snowball-hdmiservice/snowball-hdmiservice.mk
+++ b/package/snowball-hdmiservice/snowball-hdmiservice.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SNOWBALL_HDMISERVICE_VERSION = f75c99d1c52707240a78b4ba78e41d20d3aa3b08
-SNOWBALL_HDMISERVICE_SITE = git://igloocommunity.org/git/bsp/hdmiservice.git
+SNOWBALL_HDMISERVICE_SITE = https://github.com/igloocommunity/hdmiservice
 SNOWBALL_HDMISERVICE_LICENSE = MIT
 SNOWBALL_HDMISERVICE_LICENSE_FILES = debian/copyright
 SNOWBALL_HDMISERVICE_INSTALL_STAGING = YES
diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk
index 7cc204857f..d71f347095 100644
--- a/package/snowball-init/snowball-init.mk
+++ b/package/snowball-init/snowball-init.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7
-SNOWBALL_INIT_SITE = git://igloocommunity.org/git/bsp/snowball-init.git
+SNOWBALL_INIT_SITE = https://github.com/igloocommunity/snowball-init
 SNOWBALL_INIT_LICENSE = BSD-4c
 SNOWBALL_INIT_LICENSE_FILES = debian/copyright
 

From 44b16fb3972757e8936f753bca8c8bf621b5ef2b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 12:59:31 -0300
Subject: [PATCH 5613/6849] classpath: fix build errors with gmp support

gmp support has a hardcoded /usr/include include PATH which causes
breakage when there is a distribution gmp with development headers
installed. Fixes:
http://autobuild.buildroot.net/results/849/8497648c0b21390782eecc5b4aa91281bcf58ad6/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../classpath-01-fix-gmp-include.patch        | 46 +++++++++++++++++++
 package/classpath/classpath.mk                |  6 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 package/classpath/classpath-01-fix-gmp-include.patch

diff --git a/package/classpath/classpath-01-fix-gmp-include.patch b/package/classpath/classpath-01-fix-gmp-include.patch
new file mode 100644
index 0000000000..f7a392093f
--- /dev/null
+++ b/package/classpath/classpath-01-fix-gmp-include.patch
@@ -0,0 +1,46 @@
+The GMP include is hardcoded to /usr/include causing obvious problems.
+
+From classpath CVS:
+http://cvs.savannah.gnu.org/viewvc/classpath/configure.ac?root=classpath&r1=1.245&r2=1.246
+
+[Gustavo: ditch -L or libtool complains loudly]
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/configure.ac	2010/01/30 01:33:50	1.245
++++ b/configure.ac	2010/05/04 12:29:23	1.246
+@@ -752,10 +752,32 @@
+   dnl __gmpz_mul_si for earlier versions (>= 3.1).
+   dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to
+   dnl change the name of the corresponding ac_ variable on lines 860...
++  AC_ARG_WITH(gmp, [  --with-gmp=PATH         specify prefix directory for the installed GMP package.
++                          Equivalent to --with-gmp-include=PATH/include
++                          plus --with-gmp-lib=PATH/lib])
++  AC_ARG_WITH(gmp_include, [  --with-gmp-include=PATH specify directory for installed GMP include files])
++  AC_ARG_WITH(gmp_lib, [  --with-gmp-lib=PATH     specify directory for the installed GMP library])
++
+   if test "x${COMPILE_GMP}" = xyes; then
++    AC_MSG_CHECKING([for GMP directories])
++    if test "x$with_gmp" != x; then
++       gmplibs="-lgmp"
++       gmpinc="-I$with_gmp/include"
++       if test "x$with_gmp_include" != x; then
++       	  gmpinc="-I$with_gmp_include $gmpinc"
++       fi
++       if test "x$with_gmp_lib" != x; then
++       	  gmplibs="$gmplibs"
++       fi
++    else
++        with_gmp="/usr"
++	gmplibs="-lgmp"
++    	gmpinc="-I/usr/include"
++    fi
++    AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc])
+     AC_CHECK_LIB(gmp, __gmpz_mul_si,
+-      [GMP_CFLAGS=-I/usr/include
+-       GMP_LIBS=-lgmp ],
++      [GMP_CFLAGS="$gmpinc"
++       GMP_LIBS="$gmplibs" ],
+       [GMP_CFLAGS=
+        GMP_LIBS= ])
+     AC_SUBST(GMP_CFLAGS)
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index 62167aace5..c3051785e2 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -17,8 +17,10 @@ CLASSPATH_CONF_OPT = \
 # classpath assumes qt runs on top of X11, but we
 # don't support qt4 on X11
 CLASSPATH_CONF_OPT += --disable-qt-peer
-
 CLASSPATH_DEPENDENCIES = host-pkgconf
+CLASSPATH_AUTORECONF = YES
+CLASSPATH_LICENSE = GPLv2+ with exception
+CLASSPATH_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 CLASSPATH_CONF_OPT += --enable-alsa
@@ -28,7 +30,7 @@ CLASSPATH_CONF_OPT += --disable-alsa
 endif
 
 ifeq ($(BR2_PACKAGE_GMP),y)
-CLASSPATH_CONF_OPT += --enable-gmp
+CLASSPATH_CONF_OPT += --enable-gmp --with-gmp="$(STAGING_DIR)/usr"
 CLASSPATH_DEPENDENCIES += gmp
 else
 CLASSPATH_CONF_OPT += --disable-gmp

From bf62ec1c4e6fc098dcd9b963a94a2a41c381f145 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 13:18:32 -0300
Subject: [PATCH 5614/6849] classpath: fix alsa-related build failure

Classpath requires sequencer support besides pcm support. Fixes:
http://autobuild.buildroot.org/results/2bd/2bd39ffa821bc02d64998bc9e8fe178d3741a1d8/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/classpath/classpath.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index c3051785e2..fbf80f0ced 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -22,7 +22,9 @@ CLASSPATH_AUTORECONF = YES
 CLASSPATH_LICENSE = GPLv2+ with exception
 CLASSPATH_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+# Needs ALSA pcm and sequencer (midi) support
+# pcm is always on for alsa-lib
+ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
 CLASSPATH_CONF_OPT += --enable-alsa
 CLASSPATH_DEPENDENCIES += alsa-lib
 else

From 0fbee81a64c7f0d572e2084212b9db7cef2a6def Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 8 Jul 2013 08:14:53 +0200
Subject: [PATCH 5615/6849] elf2flt: needs to link with zlib

Got dropped by the move to packages/.

Fixes http://autobuild.buildroot.net/results/bb7/bb7b2c0bb23e0ab6e148a1e690b2c0827135ff55/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elf2flt/elf2flt.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
index 5afa5ca447..cd1c21db40 100644
--- a/package/elf2flt/elf2flt.mk
+++ b/package/elf2flt/elf2flt.mk
@@ -21,6 +21,8 @@ HOST_ELF2FLT_CONF_OPT = \
 	--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
 	--target=$(GNU_TARGET_NAME)
 
+HOST_ELF2FLT_CONF_ENV = LIBS=-lz
+
 define HOST_ELF2FLT_EXTRACT_CMDS
 	cp -r package/elf2flt/src/* $(@D)
 endef

From 332687c8fdf9720dd7ccfe188a38a353def88c0b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 7 Jul 2013 19:34:07 -0300
Subject: [PATCH 5616/6849] configs/qemu: bump relevant config versions

While at it add the missing network interfaces to configurations that
support it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/qemu/arm-nuri/readme.txt                           | 2 +-
 .../{linux-3.9.config => linux-3.10.config}              | 0
 board/qemu/arm-versatile/readme.txt                      | 2 +-
 board/qemu/arm-vexpress/readme.txt                       | 2 +-
 .../{linux-3.9.config => linux-3.10.config}              | 0
 board/qemu/microblazebe-mmu/readme.txt                   | 2 +-
 .../{linux-3.9.config => linux-3.10.config}              | 0
 board/qemu/microblazeel-mmu/readme.txt                   | 2 +-
 .../mips-malta/{linux-3.9.config => linux-3.10.config}   | 0
 board/qemu/mips-malta/readme.txt                         | 4 ++--
 .../mips64-malta/{linux-3.9.config => linux-3.10.config} | 0
 board/qemu/mips64-malta/readme.txt                       | 2 +-
 .../mipsel-malta/{linux-3.9.config => linux-3.10.config} | 0
 board/qemu/mipsel-malta/readme.txt                       | 4 ++--
 .../{linux-3.8.config => linux-3.10.config}              | 0
 board/qemu/powerpc-g3beige/readme.txt                    | 4 ++--
 board/qemu/powerpc-mpc8544ds/readme.txt                  | 4 ++--
 board/qemu/powerpc-virtex-ml507/readme.txt               | 2 +-
 board/qemu/sh4-r2d/readme.txt                            | 4 ++--
 board/qemu/sparc-ss10/readme.txt                         | 4 ++--
 board/qemu/x86/{linux-3.9.config => linux-3.10.config}   | 0
 board/qemu/x86/readme.txt                                | 4 ++--
 .../qemu/x86_64/{linux-3.9.config => linux-3.10.config}  | 0
 board/qemu/x86_64/readme.txt                             | 4 ++--
 configs/qemu_arm_nuri_defconfig                          | 7 ++++---
 configs/qemu_arm_versatile_defconfig                     | 9 +++++----
 configs/qemu_arm_vexpress_defconfig                      | 7 ++++---
 configs/qemu_microblazebe_mmu_defconfig                  | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                  | 4 ++--
 configs/qemu_mips64_malta_defconfig                      | 9 +++++----
 configs/qemu_mips_malta_defconfig                        | 9 +++++----
 configs/qemu_mipsel_malta_defconfig                      | 9 +++++----
 configs/qemu_ppc_g3beige_defconfig                       | 9 +++++----
 configs/qemu_ppc_mpc8544ds_defconfig                     | 7 ++++---
 configs/qemu_ppc_virtex_ml507_defconfig                  | 7 ++++---
 configs/qemu_sh4_r2d_defconfig                           | 7 ++++---
 configs/qemu_sparc_ss10_defconfig                        | 5 +++--
 configs/qemu_x86_64_defconfig                            | 9 +++++----
 configs/qemu_x86_defconfig                               | 9 +++++----
 39 files changed, 85 insertions(+), 72 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/mips-malta/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/mips64-malta/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.8.config => linux-3.10.config} (100%)
 rename board/qemu/x86/{linux-3.9.config => linux-3.10.config} (100%)
 rename board/qemu/x86_64/{linux-3.9.config => linux-3.10.config} (100%)

diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
index dc97c20436..6d7685164f 100644
--- a/board/qemu/arm-nuri/readme.txt
+++ b/board/qemu/arm-nuri/readme.txt
@@ -7,4 +7,4 @@ graphical window is the framebuffer.
 
 Startup time is slow because of the SMP CPU emulation so be patient.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/arm-versatile/linux-3.9.config b/board/qemu/arm-versatile/linux-3.10.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.9.config
rename to board/qemu/arm-versatile/linux-3.10.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 3801f4870f..31972fa7f3 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index 26657a53f2..82898e12b8 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/microblazebe-mmu/linux-3.9.config b/board/qemu/microblazebe-mmu/linux-3.10.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.9.config
rename to board/qemu/microblazebe-mmu/linux-3.10.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 36adbd3dd6..20f1b70101 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/microblazeel-mmu/linux-3.9.config b/board/qemu/microblazeel-mmu/linux-3.10.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.9.config
rename to board/qemu/microblazeel-mmu/linux-3.10.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 585c35d6b7..c8532452b1 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/mips-malta/linux-3.9.config b/board/qemu/mips-malta/linux-3.10.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.9.config
rename to board/qemu/mips-malta/linux-3.10.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index 21d44e7328..a7709a8f78 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -1,9 +1,9 @@
 Run the emulation with:
 
- qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
+ qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda" -net nic,model=pcnet -net user
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/mips64-malta/linux-3.9.config b/board/qemu/mips64-malta/linux-3.10.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.9.config
rename to board/qemu/mips64-malta/linux-3.10.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 332b09e283..923ead53dc 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/mipsel-malta/linux-3.9.config b/board/qemu/mipsel-malta/linux-3.10.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.9.config
rename to board/qemu/mipsel-malta/linux-3.10.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 54a2c58c0a..fd2c1a4b8a 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -1,9 +1,9 @@
 Run the emulation with:
 
- qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"
+ qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda" -net nic,model=pcnet -net user
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/powerpc-g3beige/linux-3.8.config b/board/qemu/powerpc-g3beige/linux-3.10.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.8.config
rename to board/qemu/powerpc-g3beige/linux-3.10.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index 1efbdf08d7..ae7b5e3956 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -1,8 +1,8 @@
 Run the emulation with:
 
-  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio -net nic,model=rtl8139 -net user
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index 00603fe97b..3ee7bc5ce5 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:
 
- qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio
+ qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index f59f9c1172..cbee8ae411 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 5760f78f83..4a95d042c6 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -1,8 +1,8 @@
 Run the emulation with:
 
-  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio
+  qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio -net nic,model=rtl8139 -net user
 
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 3f70a0364d..b177c44595 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -1,8 +1,8 @@
 Run the emulation with:
 
-  qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append "root=/dev/sda console=ttyS0,115200" -serial stdio
+  qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append "root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user
 
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/x86/linux-3.9.config b/board/qemu/x86/linux-3.10.config
similarity index 100%
rename from board/qemu/x86/linux-3.9.config
rename to board/qemu/x86/linux-3.10.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 7ada1be04b..b228b412bb 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:
 
-  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda -net nic,model=rtl8139 -net user
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/board/qemu/x86_64/linux-3.9.config b/board/qemu/x86_64/linux-3.10.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.9.config
rename to board/qemu/x86_64/linux-3.10.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index 6c81853218..f5a3a127b8 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:
 
-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda -net nic,model=rtl8139 -net user
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.4.0
+Tested with QEMU 1.4.2
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 27dac27173..26eb81555e 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -14,12 +14,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySAC1"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index d0f59a2beb..9d5d6fb2ce 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,13 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.10.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 07b629e345..12d1d0b475 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -14,12 +14,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 6bc4d0b610..d3bbdc6210 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.10.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index e82b3028a3..05c91e82e1 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.10.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 72c36cc62c..314d968c92 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,15 +10,16 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 245e36f09d..c98473a981 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,15 +6,16 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 80d1ecb494..88377b3721 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,15 +6,16 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 4184bea1c4..cf77eed1fc 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,15 +6,16 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index bbb246bd71..b6a2d0d45f 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,13 +6,14 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 8bd067ebff..f5d50baa26 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -6,8 +6,9 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -15,7 +16,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 469ab28aaf..7fc649b217 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -10,8 +10,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Avoid 3.3+ headers
-BR2_KERNEL_HEADERS_3_2=y
+# Lock to 3.2 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.2.47"
 
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
@@ -20,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.44"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.47"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 7e58a0f456..33f0b213b1 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,8 +6,9 @@ BR2_sparc_v8=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.4 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_4=y
+# Lock to 3.7 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.7.10"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 1768eeea05..c2d56ab847 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,12 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.10.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 244bd8ab1d..d7731c697b 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,12 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock to 3.10 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.10.config"

From 5c7fb70a496fa86bdb7bd62f522d0d8dab4d6189 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 8 Jul 2013 09:34:22 -0300
Subject: [PATCH 5617/6849] website: remove dead udhcp link

The udhcp.busybox.net site is gone, it's now pointing to bugzilla.
udhcp has been a part of busybox for some time now.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/header.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/header.html b/docs/header.html
index a7160cd1a3..12716d0b4a 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -61,7 +61,6 @@
     <br><a href="http://busybox.net/">BusyBox</a>
     <br><a href="http://uclibc.org/">uClibc.org</a>
     <br><a href="http://cxx.uclibc.org/">uClibc++</a>
-    <br><a href="http://udhcp.busybox.net/">udhcp</a>
     <br><a href="http://www.scratchbox.org/">Scratchbox</a>
     <br><a href="http://openembedded.org/">OpenEmbedded</a>
     <br><a href="http://www.ucdot.org/">uCdot</a>

From 391c82efa14d6db253f42616d970dacbe826b7d5 Mon Sep 17 00:00:00 2001
From: Valentine Barshak <gvaxon@gmail.com>
Date: Wed, 10 Oct 2012 03:34:56 +0400
Subject: [PATCH 5618/6849] linux: Do not force GZIP initramfs compression

Initramfs compression does not make much sense for the architectures
that support compressed kernel images because in this case the data
would be compressed twice. This will eventually result in a bigger
kernel image and time overhead when uncompressing it.
The only reason to use compressed initramfs is to reduce memory
usage when the kernel prepares rootfs, and both the unpacked
filesystem and initramfs.cpio are present in the memory.

Buildroot attempts to force GZIP compression for initramfs,
however it doesn't always work because initramfs compression mode
depends on RAM disk compression supported by the kernel.
Thus, CONFIG_INITRAMFS_COMPRESSION_GZIP depends on CONFIG_RD_GZIP.
If CONFIG_RD_GZIP is not set, setting GZIP initramfs compression
will have no effect.

Besides, the kernel also supports other compression methods,
like BZIP2, LZMA, XZ and LZO. Forcing the good old GZIP does not
really make much sense any more.

This removes initramfs compression settings from Buildroot,
so that the default value preset in the kernel config is used,
which is CONFIG_INITRAMFS_COMPRESSION_NONE.

If initramfs compression is still needed, it can be set
in the kernel config (using make linux-menuconfig)

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/initramfs/Config.in | 4 ++--
 linux/linux.mk         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index 22066eef96..ac45030512 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -9,8 +9,8 @@ config BR2_TARGET_ROOTFS_INITRAMFS
 
 	  A rootfs.cpio file will be generated in the images/ directory.
 	  This is the archive that will be included in the kernel image.
-	  The rootfs in the kernel will always be gzip'ed, regardless
-	  of how buildroot's cpio archive is configured.
+	  The default rootfs compression set in the kernel configuration
+	  is used, regardless of how buildroot's cpio archive is configured.
 
 	  Note that enabling initramfs together with another filesystem
 	  formats doesn't make sense: you would end up having two
diff --git a/linux/linux.mk b/linux/linux.mk
index befef1658b..dfc948ca51 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -182,9 +182,7 @@ define LINUX_CONFIGURE_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
 		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
 		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
-		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
-		$(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config))
+		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config))
 	$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
 		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))

From a4d9191a49349548b47f1a1a01705bca14e97e66 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Fri, 28 Jun 2013 18:40:26 +0800
Subject: [PATCH 5619/6849] ramspeed/smp: new package

Add new package: ramspeed/smp

RAMspeed/SMP, a cache and memory benchmarking tool
(for multiprocessor machines running UNIX-like operating systems)

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/ramsmp/Config.in |  7 +++++++
 package/ramsmp/Makefile  | 14 ++++++++++++++
 package/ramsmp/ramsmp.mk | 20 ++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 package/ramsmp/Config.in
 create mode 100644 package/ramsmp/Makefile
 create mode 100644 package/ramsmp/ramsmp.mk

diff --git a/package/Config.in b/package/Config.in
index 7c24dab470..ca698bd5e6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -41,6 +41,7 @@ source "package/oprofile/Config.in"
 source "package/pax-utils/Config.in"
 source "package/perf/Config.in"
 source "package/ramspeed/Config.in"
+source "package/ramsmp/Config.in"
 source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
 source "package/stress/Config.in"
diff --git a/package/ramsmp/Config.in b/package/ramsmp/Config.in
new file mode 100644
index 0000000000..c379bb17ac
--- /dev/null
+++ b/package/ramsmp/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_RAMSMP
+	bool "ramspeed/smp"
+	help
+	  RAMspeed/SMP is a free open source command line utility
+	  to measure cache and memory performance of multiprocessor machines.
+
+	  http://alasir.com/software/ramspeed/
diff --git a/package/ramsmp/Makefile b/package/ramsmp/Makefile
new file mode 100644
index 0000000000..5cd76e09d9
--- /dev/null
+++ b/package/ramsmp/Makefile
@@ -0,0 +1,14 @@
+
+all: generic
+
+generic: ramsmp.c fltmem.c fltmark.c intmem.c intmark.c
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o ramsmp
+
+i386: ramsmp.c i386/*.s i386/cpuinfo/*.s
+	$(CC) $(CFLAGS) -DI386_ASM $(LDFLAGS) $^ -o ramsmp
+
+x86_64: ramsmp.c amd64/*.s
+	$(CC) $(CFLAGS) -DAMD64_ASM $(LDFLAGS) $^ -o ramsmp
+
+clean:
+	rm -f *.o ramsmp
diff --git a/package/ramsmp/ramsmp.mk b/package/ramsmp/ramsmp.mk
new file mode 100644
index 0000000000..1b44402379
--- /dev/null
+++ b/package/ramsmp/ramsmp.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# ramsmp
+#
+#############################################################
+
+RAMSMP_VERSION = 3.5.0
+RAMSMP_SITE = http://www.alasir.com/software/ramspeed
+RAMSMP_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64)
+
+define RAMSMP_BUILD_CMDS
+	cp -f package/ramsmp/Makefile $(@D)
+	$(TARGET_CONFIGURE_OPTS) make -C $(@D) $(RAMSMP_ARCH)
+endef
+
+define RAMSMP_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/ramsmp $(TARGET_DIR)/usr/bin/ramsmp
+endef
+
+$(eval $(generic-package))

From f594e946327cc742ac5517815e9b52bbcd3048fc Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 4 Jul 2013 17:45:12 +0100
Subject: [PATCH 5620/6849] sconeserver: upstream has moved to GitHub

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sconeserver/sconeserver.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 62cc0ee7a0..be5fab7275 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -5,10 +5,9 @@
 ################################################################################
 
 # Release 0.6.0 doesn't build cleanly, so use a recent
-# Subversion trunk snapshot.
-SCONESERVER_VERSION = 212
-SCONESERVER_SITE = svn://svn.code.sf.net/p/sconeserver/code/trunk
-SCONESERVER_SITE_METHOD = svn
+# Git commit.
+SCONESERVER_VERSION = d58f2de88c681939554089f786e360042a30c8f8
+SCONESERVER_SITE = git://github.com/sconemad/sconeserver.git
 SCONESERVER_LICENSE = GPLv2+
 SCONESERVER_LICENSE_FILES = COPYING
 

From 87165354216ebd8a377ec083072c97bd0f83296e Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 4 Jul 2013 19:18:00 -0700
Subject: [PATCH 5621/6849] ocrad: new package

GNU Ocrad is an OCR (Optical Character Recognition) program
based on a feature extraction method.
It reads images in pbm (bitmap), pgm (greyscale) or ppm (color) formats
and produces text in byte (8-bit) or UTF-8 formats.

[Peter: fixup whitespace, install into STAGING_DIR, use make install, BR2_GNU_MIRROR]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/ocrad/Config.in | 14 ++++++++++++++
 package/ocrad/ocrad.mk  | 31 +++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/ocrad/Config.in
 create mode 100644 package/ocrad/ocrad.mk

diff --git a/package/Config.in b/package/Config.in
index ca698bd5e6..3186bb783c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -132,6 +132,7 @@ source "package/fb-test-app/Config.in"
 source "package/imagemagick/Config.in"
 source "package/linux-fusion/Config.in"
 source "package/lite/Config.in"
+source "package/ocrad/Config.in"
 source "package/sawman/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in
new file mode 100644
index 0000000000..0fa5660add
--- /dev/null
+++ b/package/ocrad/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_OCRAD
+	bool "ocrad"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  GNU Ocrad is an OCR (Optical Character Recognition) program
+	  based on a feature extraction method.
+	  It reads images in pbm (bitmap), pgm (greyscale) or
+	  ppm (color) formats and produces text in byte (8-bit) or
+	  UTF-8 formats.
+
+	  http://www.gnu.org/software/ocrad/
+
+comment "ocrad needs a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk
new file mode 100644
index 0000000000..8a038e2ca2
--- /dev/null
+++ b/package/ocrad/ocrad.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# ocrad
+#
+################################################################################
+
+OCRAD_VERSION = 0.21
+OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
+OCRAD_LICENSE = GPLv3+
+OCRAD_LICENSE_FILES = COPYING
+OCRAD_INSTALL_STAGING = YES
+
+# This is not a true autotools package.
+define OCRAD_CONFIGURE_CMDS
+	cd $(@D) && \
+	./configure --prefix=/usr --sysconfdir=/etc $(TARGET_CONFIGURE_OPTS)
+endef
+
+define OCRAD_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define OCRAD_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+define OCRAD_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))

From cd3444683558e162361632dcd967509c0372b3d2 Mon Sep 17 00:00:00 2001
From: Jan Viktorin <xvikto03@stud.fit.vutbr.cz>
Date: Mon, 8 Jul 2013 16:08:18 +0200
Subject: [PATCH 5622/6849] Make the microblaze toolchains easily
 distinguishable

It was confusing to have two different toolchains with the
same label.

Signed-off-by: Jan Viktorin <xvikto03@stud.fit.vutbr.cz>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 946063f953..130b705b65 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -649,7 +649,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	  http://blackfin.uclinux.org.
 
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
-	bool "Xilinx Little Endian Microblaze GNU Tools"
+	bool "Xilinx Little Endian Microblaze GNU Tools 14.3"
 	depends on BR2_microblazeel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -661,7 +661,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	  uses gcc 4.6.2, binutils 2.21.53, glibc 2.14 and gdb 7.4.50.
 
 config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
-	bool "Xilinx Little Endian Microblaze GNU Tools"
+	bool "Xilinx Little Endian Microblaze GNU Tools v2"
 	depends on BR2_microblazeel
 	depends on BR2_HOSTARCH = "x86_64"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC

From 748b45ab5740d9e5e4791e298a5f7ba3699932d5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 8 Jul 2013 17:59:53 +0200
Subject: [PATCH 5623/6849] toolchain: disable C++ support on AVR32 gcc 4.2
 with uClibc

In 25c3160092d7 ("uClibc 0.9.31: remove stray kludges/conditions"), a
conditional that prevents the combination gcc 4.2-avr / C++ / locale
with uClibc 0.9.31 was removed. However, it turns out that the same
problem is affecting uClibc 0.9.33, described at
http://comments.gmane.org/gmane.comp.lib.uclibc.buildroot/24260.

Therefore, we prevent the combination of gcc 4.2-avr / C++ / locale to
happen.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-buildroot/Config.in.2 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 9bbf016962..e223d9d40e 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -7,11 +7,16 @@ comment "Toolchain Options"
 config BR2_TOOLCHAIN_BUILDROOT_CXX
 	bool "Enable C++ support"
 	select BR2_INSTALL_LIBSTDCPP
+	depends on !(BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && \
+		     BR2_TOOLCHAIN_BUILDROOT_LOCALE)
 	help
 	  Enable this option if you want your toolchain to support the
 	  C++ language and you want C++ libraries to be installed on
 	  your target system.
 
+comment "C++ support broken in uClibc with locale enabled with gcc 4.2"
+	depends on BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && BR2_TOOLCHAIN_BUILDROOT_LOCALE
+
 config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 	bool "Enable stack protection support"
 	help

From 1f3dabf1f0888163dd44a2a6689939387088c72b Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Tue, 9 Jul 2013 10:19:54 +0200
Subject: [PATCH 5624/6849] barebox: bump to version 2013.07.0

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 9fa8c5da61..156cd73efc 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.06.0"
+	bool "2013.07.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.06.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.07.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From ce4a6ced942355eedc4ffae7c27cbab057b95ceb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 9 Jul 2013 23:22:08 +0200
Subject: [PATCH 5625/6849] gst-plugins-good: fix v4l2 related build error with
 new (3.9+) kernel headers

Fix from gstreamer git.

Fixes http://autobuild.buildroot.net/results/e2b/e2b1c5219676c7d033353b7bd8273440c40dcf49/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ilation-against-newer-kernel-headers.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch

diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch b/package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
new file mode 100644
index 0000000000..62c3bb24e6
--- /dev/null
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
@@ -0,0 +1,30 @@
+From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 18 Mar 2013 14:59:35 +0000
+Subject: [PATCH] v4l2: fix compilation against newer kernel headers as on
+ FC19
+
+---
+ sys/v4l2/v4l2_calls.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
+index 07d390a..4c10f4f 100644
+--- a/sys/v4l2/v4l2_calls.c
++++ b/sys/v4l2/v4l2_calls.c
+@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
+         break;
+       case V4L2_CID_HFLIP:
+       case V4L2_CID_VFLIP:
++#ifndef V4L2_CID_PAN_RESET
+       case V4L2_CID_HCENTER:
++#endif
++#ifndef V4L2_CID_TILT_RESET
+       case V4L2_CID_VCENTER:
++#endif
+ #ifdef V4L2_CID_PAN_RESET
+       case V4L2_CID_PAN_RESET:
+ #endif
+-- 
+1.7.10.4
+

From 575dac6922e9a20153a4f3526929618271b226c8 Mon Sep 17 00:00:00 2001
From: Gilles Talis <gilles.talis@gmail.com>
Date: Tue, 9 Jul 2013 19:38:08 -0700
Subject: [PATCH 5626/6849] mongrel2: needs threads

mongrel2 uses zeromq that needs threads

Fixes: http://autobuild.buildroot.org/results/93d/93da58453e1ca0cc491170976cfbdeb8bee5c648

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
---
 package/mongrel2/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index ca7e6093d0..435d97eaff 100644
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_MONGREL2
 	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on BR2_LARGEFILE # zeromq -> util-linux
 	depends on BR2_USE_WCHAR # zeromq -> util-linux
 	# {get,make,swap}context functions present in

From f1f97b3a0587df7a44249ccf3e47c6d0d3087fa0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 10 Jul 2013 00:00:31 +0200
Subject: [PATCH 5627/6849] system: add option to pass extra args to post-build
 and post-image scripts

It can be useful to have different configuration use the same post-build
and/or post-image scripts as they share a common infrastructure, but yet
have minor differentiation.

This option allows passing zero or more additional arguments to each
post-build or post-image script.

The same set of extra arguments are passed to all scripts, it is not
possible to pass different arguments to each script.

[Peter: fix help text, post-image gets called with the images dir]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                         |  4 ++--
 docs/manual/customize-rootfs.txt | 19 ++++++++++++-------
 system/Config.in                 | 26 +++++++++++++++++++++-----
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 955e68482e..f6e9965948 100644
--- a/Makefile
+++ b/Makefile
@@ -512,7 +512,7 @@ endif
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 		$(call MESSAGE,"Executing post-build script $(s)"); \
-		$(s) $(TARGET_DIR)$(sep))
+		$(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
 
 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
@@ -558,7 +558,7 @@ endif
 target-post-image:
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
-		$(s) $(BINARIES_DIR)$(sep))
+		$(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
 
 toolchain-eclipse-register:
 	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 7ff8d8b1e9..49a6b4b442 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -69,15 +69,20 @@ specify a space-separated list of scripts in the
 found in the +System configuration+ menu as well.
 
 Each of those scripts will be called with the path to the +images+
-output directory as first and unique argument, and will be executed
-with the main Buildroot source directory as the current
-directory. Those scripts will be executed as the user that executes
-Buildroot, which should normally not be the root user. Therefore, any
-action requiring root permissions in one of these _post-image scripts_
-will require special handling (usage of fakeroot or sudo), which is
-left to the script developer.
+output directory as first argument, and will be executed with the main
+Buildroot source directory as the current directory. Those scripts will
+be executed as the user that executes Buildroot, which should normally
+not be the root user. Therefore, any action requiring root permissions
+in one of these _post-image scripts_ will require special handling
+(usage of fakeroot or sudo), which is left to the script developer.
 
 Just like for the _post-build scripts_ mentioned above, you also have
 access to the following environment variables from your _post-image
 scripts_: +BUILDROOT_CONFIG+, +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+,
 +BINARIES_DIR+ and +BASE_DIR+.
+
+Additionally, each of the +BR2_ROOTFS_POST_BUILD_SCRIPT+ and
++BR2_ROOTFS_POST_IMAGE_SCRIPT+ scripts will be passed the arguments
+specified in +BR2_ROOTFS_POST_SCRIPT_ARGS+ (if that is not empty).
+All the scripts will be passed the exact same set of arguments, it
+is not possible to pass different sets of arguments to each script.
diff --git a/system/Config.in b/system/Config.in
index c0e4f4a825..d41f184758 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -272,9 +272,9 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
 	  add-ons and the like, so the generated files can be used directly
 	  without further processing.
 
-	  These scripts are called with the target directory name as first and
-	  only argument. Make sure the exit code of those scripts are 0,
-	  otherwise make will stop after calling them.
+	  These scripts are called with the target directory name as first
+	  argument. Make sure the exit code of those scripts are 0, otherwise
+	  make will stop after calling them.
 
 config BR2_ROOTFS_POST_IMAGE_SCRIPT
 	string "Custom scripts to run after creating filesystem images"
@@ -291,7 +291,23 @@ config BR2_ROOTFS_POST_IMAGE_SCRIPT
 	  action.
 
 	  These scripts are called with the images directory name as
-	  first and only argument. The script is executed from the
-	  main Buildroot source directory as the current directory.
+	  first argument. The script is executed from the main Buildroot
+	  source directory as the current directory.
+
+config BR2_ROOTFS_POST_SCRIPT_ARGS
+	string "Extra post-{build,image} arguments"
+	depends on BR2_ROOTFS_POST_BUILD_SCRIPT != "" || BR2_ROOTFS_POST_IMAGE_SCRIPT != ""
+	help
+	  Pass these aditional arguments to each post-build or post-image
+	  scripts.
+
+	  Note that all the post-build and post-image scripts will be passed
+	  the same set of arguments, you can not pass different arguments to
+	  each script.
+
+	  Note also, as stated in their respective help text, that the first
+	  argument to each post-build or post-image script is the target
+	  directory / images directory. The arguments in this option will be
+	  passed *after* those.
 
 endmenu

From cca5538556e854516a85b28ae56c06ed66427b71 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Wed, 10 Jul 2013 11:25:51 +0200
Subject: [PATCH 5628/6849] uclibc: arc: add patch that adds __kernel_(u)long

This adds a patch that adds the __kernel_long and __kernel_ulong types to
uClibc. This fixes the build failure with Linux 3.10 headers.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uclibc-arc-add-__kernel_long.patch        | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch

diff --git a/package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch b/package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch
new file mode 100644
index 0000000000..caebac145a
--- /dev/null
+++ b/package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch
@@ -0,0 +1,29 @@
+From 5164fb28e9205626211d0436933e6eb4960be582 Mon Sep 17 00:00:00 2001
+From: Mischa Jonker <mjonker@synopsys.com>
+Date: Wed, 10 Jul 2013 09:05:25 +0200
+Subject: [PATCH] ARC: libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added these two types and updated various exported header
+files to use them. While other architectures were updated before,
+this was not the case for ARC.
+
+This fixes the build failure with Linux 3.10 headers.
+
+Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
+---
+ libc/sysdeps/linux/arc/bits/kernel_types.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libc/sysdeps/linux/arc/bits/kernel_types.h b/libc/sysdeps/linux/arc/bits/kernel_types.h
+index fd52e1c..fc28fa1 100755
+--- a/libc/sysdeps/linux/arc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/arc/bits/kernel_types.h
+@@ -39,6 +39,8 @@ typedef	__kernel_uid_t		__kernel_old_uid_t;
+ typedef __kernel_gid_t		__kernel_old_gid_t;
+ typedef long long		__kernel_loff_t;
+ typedef unsigned int		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+
+ typedef struct {
+ #ifdef __USE_ALL

From 21d77aa3fedbfcc08421d41c8393611ebe7e0e39 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Jul 2013 15:39:16 -0300
Subject: [PATCH 5629/6849] python external modules: reorder menu entry

Reorder the external python modules menu entry so that it belongs under
python(2) and not under python3 to avoid confusion.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index 3186bb783c..803983477e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -344,7 +344,6 @@ endmenu
 endif
 source "package/php/Config.in"
 source "package/python/Config.in"
-source "package/python3/Config.in"
 if BR2_PACKAGE_PYTHON
 menu "external python modules"
 source "package/python-bottle/Config.in"
@@ -362,6 +361,7 @@ source "package/python-setuptools/Config.in"
 source "package/python-thrift/Config.in"
 endmenu
 endif
+source "package/python3/Config.in"
 source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 if BR2_PACKAGE_TCL

From 371c395b60d854a9b2f9e99f5d3243a6a8deeb41 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Jul 2013 15:39:17 -0300
Subject: [PATCH 5630/6849] python: remove idle sample

Also move smtpd.py removal to the global remove useless files define.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python/python.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/package/python/python.mk b/package/python/python.mk
index 975d6f40c0..ecea638d43 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -143,21 +143,18 @@ endef
 
 PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_FIXUP_LIBDIR
 
-# Bad shebang, normally not used
-define PYTHON_REMOVE_SMTPD
-	rm -f $(TARGET_DIR)/usr/bin/smtpd.py
-endef
-
-PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD
-
 #
 # Remove useless files. In the config/ directory, only the Makefile
 # and the pyconfig.h files are needed at runtime.
 #
+# idle & smtpd.py have bad shebangs and are mostly samples
+#
 define PYTHON_REMOVE_USELESS_FILES
+	rm -f $(TARGET_DIR)/usr/bin/idle
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
 	rm -f $(TARGET_DIR)/usr/bin/python2-config
 	rm -f $(TARGET_DIR)/usr/bin/python-config
+	rm -f $(TARGET_DIR)/usr/bin/smtpd.py
 	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \
 		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
 		rm -f $$i ; \

From c492a9a24af66e641d8e718620b00318fac89590 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Jul 2013 15:39:18 -0300
Subject: [PATCH 5631/6849] python3: remove smtpd.py.3 sample

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python3/python3.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index ed79f8e3ea..036d1acf02 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -141,6 +141,7 @@ define PYTHON3_REMOVE_USELESS_FILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
 	rm -f $(TARGET_DIR)/usr/bin/python3-config
+	rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3
 	for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-3.3m/ \
 		-type f -not -name pyconfig.h -a -not -name Makefile` ; do \
 		rm -f $$i ; \

From d43c0b4495dcb5f7971f7ffac4d92539abcf39f3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 10 Jul 2013 09:53:12 -0300
Subject: [PATCH 5632/6849] classpath: add config.rpath

Add config.rpath from upstream CVS to avoid autoreconf errors. Fixes:
http://autobuild.buildroot.net/results/e88/e88b77b28e9a0f1d2960aaa782ec0cbfd4e5e451/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../classpath-02-add-config-rpath.patch       | 680 ++++++++++++++++++
 1 file changed, 680 insertions(+)
 create mode 100644 package/classpath/classpath-02-add-config-rpath.patch

diff --git a/package/classpath/classpath-02-add-config-rpath.patch b/package/classpath/classpath-02-add-config-rpath.patch
new file mode 100644
index 0000000000..3a8a7d0952
--- /dev/null
+++ b/package/classpath/classpath-02-add-config-rpath.patch
@@ -0,0 +1,680 @@
+Add config.rpath from upstream CVS to avoid (re)autoconfiguring errors.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura classpath-0.98.orig/config.rpath classpath-0.98/config.rpath
+--- classpath-0.98.orig/config.rpath	1969-12-31 21:00:00.000000000 -0300
++++ classpath-0.98/config.rpath	2013-07-10 09:36:51.894281025 -0300
+@@ -0,0 +1,672 @@
++#! /bin/sh
++# Output a system dependent set of variables, describing how to set the
++# run time search path of shared libraries in an executable.
++#
++#   Copyright 1996-2010 Free Software Foundation, Inc.
++#   Taken from GNU libtool, 2001
++#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++#   This file is free software; the Free Software Foundation gives
++#   unlimited permission to copy and/or distribute it, with or without
++#   modifications, as long as this notice is preserved.
++#
++# The first argument passed to this file is the canonical host specification,
++#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
++# or
++#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
++# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
++# should be set by the caller.
++#
++# The set of defined variables is at the end of this script.
++
++# Known limitations:
++# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
++#   than 256 bytes, otherwise the compiler driver will dump core. The only
++#   known workaround is to choose shorter directory names for the build
++#   directory and/or the installation directory.
++
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++shrext=.so
++
++host="$1"
++host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++# Code taken from libtool.m4's _LT_CC_BASENAME.
++
++for cc_temp in $CC""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
++
++# Code taken from libtool.m4's _LT_COMPILER_PIC.
++
++wl=
++if test "$GCC" = yes; then
++  wl='-Wl,'
++else
++  case "$host_os" in
++    aix*)
++      wl='-Wl,'
++      ;;
++    darwin*)
++      case $cc_basename in
++        xlc*)
++          wl='-Wl,'
++          ;;
++      esac
++      ;;
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      ;;
++    hpux9* | hpux10* | hpux11*)
++      wl='-Wl,'
++      ;;
++    irix5* | irix6* | nonstopux*)
++      wl='-Wl,'
++      ;;
++    newsos6)
++      ;;
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++        ecc*)
++          wl='-Wl,'
++          ;;
++        icc* | ifort*)
++          wl='-Wl,'
++          ;;
++        lf95*)
++          wl='-Wl,'
++          ;;
++        pgcc | pgf77 | pgf90)
++          wl='-Wl,'
++          ;;
++        ccc*)
++          wl='-Wl,'
++          ;;
++        como)
++          wl='-lopt='
++          ;;
++        *)
++          case `$CC -V 2>&1 | sed 5q` in
++            *Sun\ C*)
++              wl='-Wl,'
++              ;;
++          esac
++          ;;
++      esac
++      ;;
++    osf3* | osf4* | osf5*)
++      wl='-Wl,'
++      ;;
++    rdos*)
++      ;;
++    solaris*)
++      wl='-Wl,'
++      ;;
++    sunos4*)
++      wl='-Qoption ld '
++      ;;
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      wl='-Wl,'
++      ;;
++    sysv4*MP*)
++      ;;
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      wl='-Wl,'
++      ;;
++    unicos*)
++      wl='-Wl,'
++      ;;
++    uts4*)
++      ;;
++  esac
++fi
++
++# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
++
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++
++case "$host_os" in
++  cygwin* | mingw* | pw32* | cegcc*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # Set some defaults for GNU ld with shared library support. These
++  # are reset later if shared libraries are not supported. Putting them
++  # here allows them to be overridden if necessary.
++  # Unlike libtool, we use -rpath here, not --rpath, since the documented
++  # option of GNU ld is called -rpath, not --rpath.
++  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++  case "$host_os" in
++    aix[3-9]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++        ld_shlibs=no
++      fi
++      ;;
++    amigaos*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we cannot use
++      # them.
++      ld_shlibs=no
++      ;;
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    cygwin* | mingw* | pw32* | cegcc*)
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    interix[3-9]*)
++      hardcode_direct=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      ;;
++    gnu* | linux* | k*bsd*-gnu)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    netbsd*)
++      ;;
++    solaris*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++        ld_shlibs=no
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++          ld_shlibs=no
++          ;;
++        *)
++          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++          else
++            ld_shlibs=no
++          fi
++          ;;
++      esac
++      ;;
++    sunos4*)
++      hardcode_direct=yes
++      ;;
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++  esac
++  if test "$ld_shlibs" = no; then
++    hardcode_libdir_flag_spec=
++  fi
++else
++  case "$host_os" in
++    aix3*)
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes; then
++        # Neither direct hardcoding nor static linking is supported with a
++        # broken collect2.
++        hardcode_direct=unsupported
++      fi
++      ;;
++    aix[4-9]*)
++      if test "$host_cpu" = ia64; then
++        # On IA64, the linker does run time linking by default, so we don't
++        # have to do anything special.
++        aix_use_runtimelinking=no
++      else
++        aix_use_runtimelinking=no
++        # Test if we are trying to use run time linking or normal
++        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++        # need to do runtime linking.
++        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
++          for ld_flag in $LDFLAGS; do
++            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++              aix_use_runtimelinking=yes
++              break
++            fi
++          done
++          ;;
++        esac
++      fi
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      if test "$GCC" = yes; then
++        case $host_os in aix4.[012]|aix4.[012].*)
++          collect2name=`${CC} -print-prog-name=collect2`
++          if test -f "$collect2name" && \
++            strings "$collect2name" | grep resolve_lib_name >/dev/null
++          then
++            # We have reworked collect2
++            :
++          else
++            # We have old collect2
++            hardcode_direct=unsupported
++            hardcode_minus_L=yes
++            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_libdir_separator=
++          fi
++          ;;
++        esac
++      fi
++      # Begin _LT_AC_SYS_LIBPATH_AIX.
++      echo 'int main () { return 0; }' > conftest.c
++      ${CC} ${LDFLAGS} conftest.c -o conftest
++      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++      if test -z "$aix_libpath"; then
++        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++      fi
++      if test -z "$aix_libpath"; then
++        aix_libpath="/usr/lib:/lib"
++      fi
++      rm -f conftest.c conftest
++      # End _LT_AC_SYS_LIBPATH_AIX.
++      if test "$aix_use_runtimelinking" = yes; then
++        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++      else
++        if test "$host_cpu" = ia64; then
++          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++        else
++          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++        fi
++      fi
++      ;;
++    amigaos*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
++    bsdi[45]*)
++      ;;
++    cygwin* | mingw* | pw32* | cegcc*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
++      libext=lib
++      ;;
++    darwin* | rhapsody*)
++      hardcode_direct=no
++      if test "$GCC" = yes ; then
++        :
++      else
++        case $cc_basename in
++          xlc*)
++            ;;
++          *)
++            ld_shlibs=no
++            ;;
++        esac
++      fi
++      ;;
++    dgux*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      ;;
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++    freebsd2.2*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      ;;
++    freebsd2*)
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      ;;
++    freebsd* | dragonfly*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      ;;
++    hpux9*)
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      ;;
++    hpux10*)
++      if test "$with_gnu_ld" = no; then
++        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++        hardcode_libdir_separator=:
++        hardcode_direct=yes
++        # hardcode_minus_L: Not really in the search PATH,
++        # but as the default location of the library.
++        hardcode_minus_L=yes
++      fi
++      ;;
++    hpux11*)
++      if test "$with_gnu_ld" = no; then
++        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++        hardcode_libdir_separator=:
++        case $host_cpu in
++          hppa*64*|ia64*)
++            hardcode_direct=no
++            ;;
++          *)
++            hardcode_direct=yes
++            # hardcode_minus_L: Not really in the search PATH,
++            # but as the default location of the library.
++            hardcode_minus_L=yes
++            ;;
++        esac
++      fi
++      ;;
++    irix5* | irix6* | nonstopux*)
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++    netbsd*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      ;;
++    newsos6)
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++        hardcode_direct=yes
++        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        else
++          case "$host_os" in
++            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++              hardcode_libdir_flag_spec='-R$libdir'
++              ;;
++            *)
++              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++              ;;
++          esac
++        fi
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      ;;
++    osf3*)
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++    osf4* | osf5*)
++      if test "$GCC" = yes; then
++        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++        # Both cc and cxx compiler support -rpath directly
++        hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
++    solaris*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++    sunos4*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      ;;
++    sysv4)
++      case $host_vendor in
++        sni)
++          hardcode_direct=yes # is this really true???
++          ;;
++        siemens)
++          hardcode_direct=no
++          ;;
++        motorola)
++          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++          ;;
++      esac
++      ;;
++    sysv4.3*)
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++        ld_shlibs=yes
++      fi
++      ;;
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++      ;;
++    sysv5* | sco3.2v5* | sco5v6*)
++      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator=':'
++      ;;
++    uts4*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      ;;
++    *)
++      ld_shlibs=no
++      ;;
++  esac
++fi
++
++# Check dynamic linker characteristics
++# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
++# Unlike libtool.m4, here we don't care about _all_ names of the library, but
++# only about the one the linker finds when passed -lNAME. This is the last
++# element of library_names_spec in libtool.m4, or possibly two of them if the
++# linker has special search rules.
++library_names_spec=      # the last element of library_names_spec in libtool.m4
++libname_spec='lib$name'
++case "$host_os" in
++  aix3*)
++    library_names_spec='$libname.a'
++    ;;
++  aix[4-9]*)
++    library_names_spec='$libname$shrext'
++    ;;
++  amigaos*)
++    library_names_spec='$libname.a'
++    ;;
++  beos*)
++    library_names_spec='$libname$shrext'
++    ;;
++  bsdi[45]*)
++    library_names_spec='$libname$shrext'
++    ;;
++  cygwin* | mingw* | pw32* | cegcc*)
++    shrext=.dll
++    library_names_spec='$libname.dll.a $libname.lib'
++    ;;
++  darwin* | rhapsody*)
++    shrext=.dylib
++    library_names_spec='$libname$shrext'
++    ;;
++  dgux*)
++    library_names_spec='$libname$shrext'
++    ;;
++  freebsd1*)
++    ;;
++  freebsd* | dragonfly*)
++    case "$host_os" in
++      freebsd[123]*)
++        library_names_spec='$libname$shrext$versuffix' ;;
++      *)
++        library_names_spec='$libname$shrext' ;;
++    esac
++    ;;
++  gnu*)
++    library_names_spec='$libname$shrext'
++    ;;
++  hpux9* | hpux10* | hpux11*)
++    case $host_cpu in
++      ia64*)
++        shrext=.so
++        ;;
++      hppa*64*)
++        shrext=.sl
++        ;;
++      *)
++        shrext=.sl
++        ;;
++    esac
++    library_names_spec='$libname$shrext'
++    ;;
++  interix[3-9]*)
++    library_names_spec='$libname$shrext'
++    ;;
++  irix5* | irix6* | nonstopux*)
++    library_names_spec='$libname$shrext'
++    case "$host_os" in
++      irix5* | nonstopux*)
++        libsuff= shlibsuff=
++        ;;
++      *)
++        case $LD in
++          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
++          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
++          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
++          *) libsuff= shlibsuff= ;;
++        esac
++        ;;
++    esac
++    ;;
++  linux*oldld* | linux*aout* | linux*coff*)
++    ;;
++  linux* | k*bsd*-gnu)
++    library_names_spec='$libname$shrext'
++    ;;
++  knetbsd*-gnu)
++    library_names_spec='$libname$shrext'
++    ;;
++  netbsd*)
++    library_names_spec='$libname$shrext'
++    ;;
++  newsos6)
++    library_names_spec='$libname$shrext'
++    ;;
++  nto-qnx*)
++    library_names_spec='$libname$shrext'
++    ;;
++  openbsd*)
++    library_names_spec='$libname$shrext$versuffix'
++    ;;
++  os2*)
++    libname_spec='$name'
++    shrext=.dll
++    library_names_spec='$libname.a'
++    ;;
++  osf3* | osf4* | osf5*)
++    library_names_spec='$libname$shrext'
++    ;;
++  rdos*)
++    ;;
++  solaris*)
++    library_names_spec='$libname$shrext'
++    ;;
++  sunos4*)
++    library_names_spec='$libname$shrext$versuffix'
++    ;;
++  sysv4 | sysv4.3*)
++    library_names_spec='$libname$shrext'
++    ;;
++  sysv4*MP*)
++    library_names_spec='$libname$shrext'
++    ;;
++  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++    library_names_spec='$libname$shrext'
++    ;;
++  uts4*)
++    library_names_spec='$libname$shrext'
++    ;;
++esac
++
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
++shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
++escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++
++LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
++
++# How to pass a linker flag through the compiler.
++wl="$escaped_wl"
++
++# Static library suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally "so").
++shlibext="$shlibext"
++
++# Format of library name prefix.
++libname_spec="$escaped_libname_spec"
++
++# Library names that the linker finds when passed -lNAME.
++library_names_spec="$escaped_library_names_spec"
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator="$hardcode_libdir_separator"
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct="$hardcode_direct"
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L="$hardcode_minus_L"
++
++EOF

From 0e4f6dcb04819ca0dd2b1ebdb77a158488d92de8 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:40 -0700
Subject: [PATCH 5633/6849] jimtcl: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jimtcl/jimtcl.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk
index 5c5cdb3710..53cddf9455 100644
--- a/package/jimtcl/jimtcl.mk
+++ b/package/jimtcl/jimtcl.mk
@@ -8,6 +8,8 @@ JIMTCL_VERSION = 0.73
 JIMTCL_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/j/jimtcl
 JIMTCL_SOURCE = jimtcl_$(JIMTCL_VERSION).orig.tar.bz2
 JIMTCL_INSTALL_STAGING = YES
+JIMTCL_LICENSE = BSD-2c
+JIMTCL_LICENSE_FILES = LICENSE
 
 JIMTCL_HEADERS_TO_INSTALL = \
 	jim.h \

From 0b7e6fdbc706b946b32fb91e146344e1c10f5483 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:41 -0700
Subject: [PATCH 5634/6849] json-c: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/json-c/json-c.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
index 031b541995..0a2f70e16d 100644
--- a/package/json-c/json-c.mk
+++ b/package/json-c/json-c.mk
@@ -9,5 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases/
 JSON_C_INSTALL_STAGING = YES
 JSON_C_MAKE = $(MAKE1)
 JSON_C_CONF_OPT = --disable-oldname-compat
+JSON_C_LICENSE = MIT
+JSON_C_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 94ca0b3d4223320998c692d307d9f26bd22b6f3c Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:42 -0700
Subject: [PATCH 5635/6849] libelf: define license

[Peter: license is LGPLv2+]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libelf/libelf.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 725035f476..5f788b241c 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -10,6 +10,8 @@ LIBELF_SITE=http://www.mr511.de/software/
 LIBELF_INSTALL_STAGING = YES
 LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install
 LIBELF_INSTALL_TARGET_OPT = instroot=$(TARGET_DIR) install
+LIBELF_LICENSE = LGPLv2+
+LIBELF_LICENSE_FILES = COPYING.LIB
 
 LIBELF_CONF_ENV = libelf_cv_working_memmove=yes \
 		mr_cv_target_elf=yes \

From abd4201ff02db2f09e29e4dd3b9f4317089592a9 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:43 -0700
Subject: [PATCH 5636/6849] libtheora: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libtheora/libtheora.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index d31dac3546..4ba342be10 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -8,6 +8,8 @@ LIBTHEORA_VERSION = 1.1.1
 LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.bz2
 LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
 LIBTHEORA_INSTALL_STAGING = YES
+LIBTHEORA_LICENSE = BSD-3c
+LIBTHEORA_LICENSE_FILES = COPYING LICENSE
 
 LIBTHEORA_CONF_OPT = \
 		--disable-oggtest \

From 5a16b31845365edf9c7cb359e4d3a4986c2cb907 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:44 -0700
Subject: [PATCH 5637/6849] libupnp: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libupnp/libupnp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index d4777b53b1..b98b9f439b 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -9,5 +9,7 @@ LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
 LIBUPNP_INSTALL_STAGING = YES
+LIBUPNP_LICENSE = BSD-3c
+LIBUPNP_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))

From 326915e43dc3a9f26d47fdb24200899d1822cd61 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:45 -0700
Subject: [PATCH 5638/6849] libusb-compat: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libusb-compat/libusb-compat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 8b4b0f6f35..8f2726ef13 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -10,6 +10,8 @@ LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-comp
 LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
 LIBUSB_COMPAT_INSTALL_STAGING = YES
 LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config
+LIBUSB_COMPAT_LICENSE = LGPLv2.1+
+LIBUSB_COMPAT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From ff35cddc63be5ac0d8ed6acc98e601c388245ba4 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:46 -0700
Subject: [PATCH 5639/6849] ramsmp: define license

[Peter: fix license file name]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ramsmp/ramsmp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ramsmp/ramsmp.mk b/package/ramsmp/ramsmp.mk
index 1b44402379..7d4eee75a2 100644
--- a/package/ramsmp/ramsmp.mk
+++ b/package/ramsmp/ramsmp.mk
@@ -7,6 +7,8 @@
 RAMSMP_VERSION = 3.5.0
 RAMSMP_SITE = http://www.alasir.com/software/ramspeed
 RAMSMP_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64)
+RAMSMP_LICENSE = Alasir License
+RAMSMP_LICENSE_FILES = LICENCE
 
 define RAMSMP_BUILD_CMDS
 	cp -f package/ramsmp/Makefile $(@D)

From 1c82ea0bca8cc527057c8d6687013d9c2a454857 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:47 -0700
Subject: [PATCH 5640/6849] ramspeed: define license

[Peter: fix license file name]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ramspeed/ramspeed.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ramspeed/ramspeed.mk b/package/ramspeed/ramspeed.mk
index f87f8bc237..7dc4faae7c 100644
--- a/package/ramspeed/ramspeed.mk
+++ b/package/ramspeed/ramspeed.mk
@@ -7,6 +7,8 @@
 RAMSPEED_VERSION = 2.6.0
 RAMSPEED_SITE = http://www.alasir.com/software/ramspeed
 RAMSPEED_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64)
+RAMSPEED_LICENSE = Alasir License
+RAMSPEED_LICENSE_FILES = LICENCE
 
 define RAMSPEED_BUILD_CMDS
 	cp -f package/ramspeed/Makefile $(@D)

From f62b07fe1c3a61043a91352ba4bcd6ac542eea56 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:48 -0700
Subject: [PATCH 5641/6849] sdl_net: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl_net/sdl_net.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index de1dc5986a..8039da44f0 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -7,6 +7,8 @@
 SDL_NET_VERSION = 1.2.8
 SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
 SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
+SDL_NET_LICENSE = zlib
+SDL_NET_LICENSE_FILES = COPYING
 
 SDL_NET_CONF_OPT = --localstatedir=/var \
 		--with-sdl-prefix=$(STAGING_DIR)/usr \

From 1c9578712794db59dc1448dffa982119e5ccd25b Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:49 -0700
Subject: [PATCH 5642/6849] ushare: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ushare/ushare.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 5cdc931251..25f880c35f 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -8,6 +8,8 @@ USHARE_VERSION = 1.1a
 USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
 USHARE_SITE = http://ushare.geexbox.org/releases
 USHARE_DEPENDENCIES = host-pkgconf libupnp
+USHARE_LICENSE = GPLv2+
+USHARE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 USHARE_DEPENDENCIES += gettext

From 2ea220d53a491220c0ac299f2f15c7c64028617a Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Wed, 10 Jul 2013 10:25:50 -0700
Subject: [PATCH 5643/6849] inadyn: define license

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/inadyn/inadyn.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index 221a3d1e09..12f8acca28 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -7,6 +7,8 @@
 INADYN_VERSION = 1.98.1
 INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.bz2
 INADYN_SITE = https://github.com/downloads/troglobit/inadyn
+INADYN_LICENSE = GPLv2+
+INADYN_LICENSE_FILES = COPYING LICENSE
 
 define INADYN_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)

From 7bf659ab111b91384af30cd219b539e2f5080ae1 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 6 May 2013 08:13:10 +0100
Subject: [PATCH 5644/6849] minidlna: new package

[Peter: license is GPLv2, fix license file, drop unneeded standard include]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/minidlna/Config.in                    | 21 ++++
 .../minidlna-0001-fix-genconfig-script.patch  | 95 +++++++++++++++++++
 .../minidlna/minidlna-0002-fix-Makefile.patch | 20 ++++
 .../minidlna-0003-fix-missing-include.patch   | 19 ++++
 .../minidlna-0004-fix-libavformat-use.patch   | 20 ++++
 package/minidlna/minidlna.mk                  | 43 +++++++++
 7 files changed, 219 insertions(+)
 create mode 100644 package/minidlna/Config.in
 create mode 100644 package/minidlna/minidlna-0001-fix-genconfig-script.patch
 create mode 100644 package/minidlna/minidlna-0002-fix-Makefile.patch
 create mode 100644 package/minidlna/minidlna-0003-fix-missing-include.patch
 create mode 100644 package/minidlna/minidlna-0004-fix-libavformat-use.patch
 create mode 100644 package/minidlna/minidlna.mk

diff --git a/package/Config.in b/package/Config.in
index 803983477e..b588a0c226 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -745,6 +745,7 @@ source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
+source "package/minidlna/Config.in"
 source "package/mongoose/Config.in"
 source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
new file mode 100644
index 0000000000..c73c00142c
--- /dev/null
+++ b/package/minidlna/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_MINIDLNA
+	bool "minidlna"
+	depends on BR2_LARGEFILE # ffmpeg
+	depends on BR2_INET_IPV6 # ffmpeg
+	depends on BR2_USE_MMU # fork
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_FLAC
+	select BR2_PACKAGE_LIBVORBIS # selects libogg
+	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBID3TAG # selects zlib
+	select BR2_PACKAGE_LIBEXIF
+	select BR2_PACKAGE_LIBJPEG
+	select BR2_PACKAGE_SQLITE
+	help
+	  MiniDLNA (aka ReadyDLNA) is server software with the aim of being
+	  fully compliant with DLNA/UPnP-AV clients.
+
+	  http://minidlna.sourceforge.net/
+
+comment "minidlna requires a toolchain with LARGEFILE and IPV6 support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/minidlna/minidlna-0001-fix-genconfig-script.patch b/package/minidlna/minidlna-0001-fix-genconfig-script.patch
new file mode 100644
index 0000000000..9a7b4e0384
--- /dev/null
+++ b/package/minidlna/minidlna-0001-fix-genconfig-script.patch
@@ -0,0 +1,95 @@
+Fix the genconfig.sh script, which has a hard-coded host prefix.
+
+N.B. The upstream CVS HEAD has been converted to GNU autotools, but a
+tarball has not yet been released. When the next release tarball is made
+available, this patch can be removed.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/genconfig.sh b/genconfig.sh
+--- a/genconfig.sh	2012-01-21 00:34:13.000000000 +0000
++++ b/genconfig.sh	2013-05-04 21:05:12.025002800 +0100
+@@ -27,6 +27,8 @@ CONFIGMACRO="__CONFIG_H__"
+ DB_PATH="/tmp/minidlna"
+ # Log path
+ LOG_PATH="${DB_PATH}"
++# Host prefix
++PREFIX=${PREFIX:-/usr}
+ 
+ # detecting the OS name and version
+ OS_NAME=`uname -s`
+@@ -40,22 +42,22 @@ ${RM} ${CONFIGFILE}
+ 
+ # Detect if there are missing headers
+ # NOTE: This check only works with a normal distro
+-[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
+-[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
+-[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
+-[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
+-[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
+-[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
+-[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
+-[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
+-  ! -e "/usr/include/libavutil/avutil.h" -a \
+-  ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
+-[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
+-  ! -e "/usr/include/libavformat/avformat.h" -a \
+-  ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
+-[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
+-  ! -e "/usr/include/libavcodec/avcodec.h" -a \
+-  ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
++[ ! -e "$PREFIX/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
++[ ! -e "$PREFIX/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
++[ ! -e "$PREFIX/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
++[ ! -e "$PREFIX/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
++[ ! -e "$PREFIX/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
++[ ! -e "$PREFIX/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
++[ ! -e "$PREFIX/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
++[ ! -e "$PREFIX/include/ffmpeg/avutil.h" -a \
++  ! -e "$PREFIX/include/libavutil/avutil.h" -a \
++  ! -e "$PREFIX/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
++[ ! -e "$PREFIX/include/ffmpeg/avformat.h" -a \
++  ! -e "$PREFIX/include/libavformat/avformat.h" -a \
++  ! -e "$PREFIX/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
++[ ! -e "$PREFIX/include/ffmpeg/avcodec.h" -a \
++  ! -e "$PREFIX/include/libavcodec/avcodec.h" -a \
++  ! -e "$PREFIX/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
+ if [ -n "$MISSING" ]; then
+ 	echo -e "\nERROR!  Cannot continue."
+ 	echo -e "The following required libraries are either missing, or are missing development headers:\n"
+@@ -88,7 +90,7 @@ case $OS_NAME in
+ 		OS_URL=http://www.openbsd.org/
+ 		;;
+ 	FreeBSD)
+-		VER=`grep '#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`
++		VER=`grep '#define __FreeBSD_version' $PREFIX/include/sys/param.h | awk '{print $3}'`
+ 		if [ $VER -ge 700049 ]; then
+ 			echo "#define PFRULE_INOUT_COUNTS" >> ${CONFIGFILE}
+ 		fi
+@@ -175,7 +177,7 @@ echo "#define USE_DAEMON" >> ${CONFIGFIL
+ echo "" >> ${CONFIGFILE}
+ 
+ echo "/* Enable if the system inotify.h exists.  Otherwise our own inotify.h will be used. */" >> ${CONFIGFILE}
+-if [ -f /usr/include/sys/inotify.h ]; then
++if [ -f $PREFIX/include/sys/inotify.h ]; then
+ echo "#define HAVE_INOTIFY_H" >> ${CONFIGFILE}
+ else
+ echo "/*#define HAVE_INOTIFY_H*/" >> ${CONFIGFILE}
+@@ -183,7 +185,7 @@ fi
+ echo "" >> ${CONFIGFILE}
+ 
+ echo "/* Enable if the system iconv.h exists.  ID3 tag reading in various character sets will not work properly otherwise. */" >> ${CONFIGFILE}
+-if [ -f /usr/include/iconv.h ]; then
++if [ -f $PREFIX/include/iconv.h ]; then
+ echo "#define HAVE_ICONV_H" >> ${CONFIGFILE}
+ else
+ echo -e "\nWARNING!!  Iconv support not found.  ID3 tag reading may not work."
+@@ -192,7 +194,7 @@ fi
+ echo "" >> ${CONFIGFILE}
+ 
+ echo "/* Enable if the system libintl.h exists for NLS support. */" >> ${CONFIGFILE}
+-if [ -f /usr/include/libintl.h ]; then
++if [ -f $PREFIX/include/libintl.h ]; then
+ echo "#define ENABLE_NLS" >> ${CONFIGFILE}
+ else
+ echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE}
diff --git a/package/minidlna/minidlna-0002-fix-Makefile.patch b/package/minidlna/minidlna-0002-fix-Makefile.patch
new file mode 100644
index 0000000000..7d9867ddbe
--- /dev/null
+++ b/package/minidlna/minidlna-0002-fix-Makefile.patch
@@ -0,0 +1,20 @@
+Fix the Makefile.
+
+N.B. The upstream CVS HEAD has been converted to GNU autotools, but a
+tarball has not yet been released. When the next release tarball is made
+available, this patch can be removed.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/Makefile b/Makefile
+--- a/Makefile	2012-01-17 22:49:01.000000000 +0000
++++ b/Makefile	2013-05-04 22:29:19.947073948 +0100
+@@ -64,7 +64,7 @@ install-conf:
+ 	$(INSTALL) -d $(ETCINSTALLDIR)
+ 	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
+ 
+-minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
++minidlna:	$(BASEOBJS) $(LNXOBJS)
+ 	@echo Linking $@
+ 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
+ 
diff --git a/package/minidlna/minidlna-0003-fix-missing-include.patch b/package/minidlna/minidlna-0003-fix-missing-include.patch
new file mode 100644
index 0000000000..124b0da1bf
--- /dev/null
+++ b/package/minidlna/minidlna-0003-fix-missing-include.patch
@@ -0,0 +1,19 @@
+Fix a missing header include, required for S_ISVTX et al.
+
+N.B. This change is in the upstream CVS HEAD, but is not in the latest
+released tarball. When the next release tarball is made available, this
+patch can be removed.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/minidlna.c b/minidlna.c
+--- a/minidlna.c	2012-05-08 01:10:42.000000000 +0100
++++ b/minidlna.c	2013-05-04 21:28:35.372717737 +0100
+@@ -57,6 +57,7 @@
+ #include <arpa/inet.h>
+ #include <fcntl.h>
+ #include <sys/file.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <time.h>
+ #include <signal.h>
diff --git a/package/minidlna/minidlna-0004-fix-libavformat-use.patch b/package/minidlna/minidlna-0004-fix-libavformat-use.patch
new file mode 100644
index 0000000000..a51262d319
--- /dev/null
+++ b/package/minidlna/minidlna-0004-fix-libavformat-use.patch
@@ -0,0 +1,20 @@
+Work around a broken test for libavformat version.
+
+N.B. This change is in the upstream CVS HEAD, but is not in the latest
+released tarball. When the next release tarball is made available, this
+patch can be removed.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/metadata.c b/metadata.c
+--- a/metadata.c	2012-06-29 22:11:29.000000000 +0100
++++ b/metadata.c	2013-05-04 22:22:47.128202396 +0100
+@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch
+ static inline void
+ lav_close(AVFormatContext *ctx)
+ {
+-#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0)
++#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
+ 	avformat_close_input(&ctx);
+ #else
+ 	av_close_input_file(ctx);
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
new file mode 100644
index 0000000000..1dd65fa809
--- /dev/null
+++ b/package/minidlna/minidlna.mk
@@ -0,0 +1,43 @@
+################################################################################
+#
+# minidlna
+#
+################################################################################
+
+MINIDLNA_VERSION = 1.0.25
+MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
+MINIDLNA_SOURCE = minidlna_$(MINIDLNA_VERSION)_src.tar.gz
+MINIDLNA_LICENSE = GPLv2 BSD-3c
+MINIDLNA_LICENSE_FILES = LICENCE LICENCE.miniupnpd
+
+MINIDLNA_DEPENDENCIES = \
+	ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \
+	host-xutil_makedepend
+
+MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \
+	-I"$(STAGING_DIR)/usr/include/libavutil" \
+	-I"$(STAGING_DIR)/usr/include/libavcodec" \
+	-I"$(STAGING_DIR)/usr/include/libavformat"
+
+define MINIDLNA_BUILD_CMDS
+	PREFIX=$(STAGING_DIR)/usr \
+		$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(MINIDLNA_CFLAGS)" -C $(@D) depend
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(MINIDLNA_CFLAGS)" -C $(@D) all
+endef
+
+define MINIDLNA_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		-C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define MINIDLNA_UNINSTALL_TARGET_CMDS
+	$(RM) $(TARGET_DIR)/usr/sbin/minidlna
+endef
+
+define MINIDLNA_CLEAN_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) clean
+endef
+
+$(eval $(generic-package))

From 24262cd5614345675640f64908bac10a97e72259 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 10 Jul 2013 23:29:19 +0200
Subject: [PATCH 5645/6849] toolchain-external: fix bfin external toolchain
 download

Fixes http://autobuild.buildroot.org/results/7d0/7d0eee796407880a4554474e5affbe98b8caa271/

Commit 1cbffbd (eliminate double slashes caused by FOO_SITE ending in
a slash) added a double replacement for the special bfin external
toolchain download, breaking it.

Fix it by removing the 2nd replacement.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b8d77ad0b5..8d9f458883 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -319,10 +319,10 @@ endif
 # components than usual.
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
 
 $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
+	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
 	mkdir -p $(@D)

From ca6fbbe1ba290b88dabfac49a6623644fba6b878 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Jul 2013 07:40:24 -0300
Subject: [PATCH 5646/6849] jquery: bump to version 1.10.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery/jquery.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk
index 44c444b885..e76754fbb0 100644
--- a/package/jquery/jquery.mk
+++ b/package/jquery/jquery.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JQUERY_VERSION = 1.10.1
+JQUERY_VERSION = 1.10.2
 JQUERY_SITE = http://code.jquery.com
 JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js
 JQUERY_LICENSE = MIT

From c6c6dd25c98a4a7bd5e5791a1d1d7dc65cf7b4e9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Jul 2013 07:40:25 -0300
Subject: [PATCH 5647/6849] jquery-sparkline: bump to version 2.1.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/jquery-sparkline/jquery-sparkline.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index af05045476..a81ce014ad 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JQUERY_SPARKLINE_VERSION = 2.1.1
+JQUERY_SPARKLINE_VERSION = 2.1.2
 JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
 JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
 JQUERY_SPARKLINE_LICENSE = BSD-3c

From 2b10ef9f09220b6cea3fb53acb3f61c66a58b6cb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 11 Jul 2013 15:09:08 +0200
Subject: [PATCH 5648/6849] minidlna: fix linking with libintl if present

Fixes http://autobuild.buildroot.net/results/3b7/3b71243716dc193a11508a69265cdd0120bd13ed

There's unfortunately not any easy way of adding extra libraries to LIBS,
so we need to list them all here.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/minidlna/minidlna.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
index 1dd65fa809..10e3b33b67 100644
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -19,12 +19,18 @@ MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \
 	-I"$(STAGING_DIR)/usr/include/libavcodec" \
 	-I"$(STAGING_DIR)/usr/include/libavformat"
 
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+MINIDLNA_DEPENDENCIES += gettext
+# we need to link with libintl
+MINIDLNA_MAKE_OPTS += LIBS='-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -lintl'
+endif
+
 define MINIDLNA_BUILD_CMDS
 	PREFIX=$(STAGING_DIR)/usr \
 		$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(MINIDLNA_CFLAGS)" -C $(@D) depend
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(MINIDLNA_CFLAGS)" -C $(@D) all
+		CFLAGS="$(MINIDLNA_CFLAGS)" $(MINIDLNA_MAKE_OPTS) -C $(@D) all
 endef
 
 define MINIDLNA_INSTALL_TARGET_CMDS

From f03a9be4c323d0d305c7d55effe997dd1f2e6f48 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 8 Jul 2013 17:59:45 +0200
Subject: [PATCH 5649/6849] gcc: remove BR2_GCC_SHARED_LIBGCC option

Commit 6b48b4803450 ("add a know to enable/disable building a shared
libgcc"), from october 2006, isn't really as to why a
BR2_GCC_SHARED_LIBGCC option was needed. However, now that gcc has
been converted to the package infrastructure, it causes problems
because the host packages are always being passed --enable-shared
--disable-static, so re-adding --disable-shared on top of that break
things.

Moreover, our tests indicate that both a shared *and* a static version
of libgcc are built, and that linking dynamically and statically a
program that uses libgcc_s gives correct results: dynamically linked
against libgcc_s in the first case, statically linked in the second
case.

Therefore, it appears that this option is no longer necessary, and
removing it has the advantage of fixing the builds of
qemu_mips64_malta_defconfig and qemu_sparc_ss10_defconfig, both of
which had BR2_GCC_SHARED_LIBGCC not enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host         |  8 --------
 package/gcc/gcc-final/gcc-final.mk | 10 +---------
 package/gcc/gcc.mk                 |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 1b191282d0..0836f9f640 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -105,14 +105,6 @@ config BR2_INSTALL_FORTRAN
 	  Note that it is highly recommended NOT to use gfortran
 	  from gcc older than 4.2.0
 
-config BR2_GCC_SHARED_LIBGCC
-	bool "Build/install a shared libgcc?"
-	depends on !BR2_PREFER_STATIC_LIB
-	default y
-	depends on !BR2_sparc
-	help
-	  Build/install a shared libgcc library
-
 config BR2_GCC_ENABLE_TLS
 	bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	default y
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index f99f1a3789..0db2eaa6dd 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -49,12 +49,6 @@ else
 HOST_GCC_FINAL_CONF_OPT += --disable-libgomp
 endif
 
-ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
-HOST_GCC_FINAL_CONF_OPT += --enable-shared
-else
-HOST_GCC_FINAL_CONF_OPT += --disable-shared
-endif
-
 # End with user-provided options, so that they can override previously
 # defined options.
 HOST_GCC_FINAL_CONF_OPT += \
@@ -99,7 +93,6 @@ HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_SIMPLE_SYMLINKS
 # Cannot use the HOST_GCC_FINAL_USR_LIBS mechanism below, because we want
 # libgcc_s to be installed in /lib and not /usr/lib. We add +x on
 # libgcc_s to ensure it will be stripped.
-ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 define HOST_GCC_FINAL_INSTALL_LIBGCC
 	-cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \
 		$(STAGING_DIR)/lib/
@@ -109,12 +102,11 @@ define HOST_GCC_FINAL_INSTALL_LIBGCC
 endef
 
 HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBGCC
-endif
 
 # Handle the installation of libraries in /usr/lib
 HOST_GCC_FINAL_USR_LIBS =
 
-ifeq ($(BR2_GCC_SHARED_LIBGCC)$(BR2_INSTALL_LIBSTDCPP),yy)
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 HOST_GCC_FINAL_USR_LIBS += libstdc++
 endif
 
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index d38629d15e..8bd65fcd58 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -40,7 +40,7 @@ endef
 # Apply patches
 #
 
-ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
+ifeq ($(ARCH),powerpc)
 ifneq ($(BR2_SOFT_FLOAT),)
 define HOST_GCC_APPLY_POWERPC_PATCH
 	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional

From d3235d7a968ee6719a279b7ee6086b372d2832be Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 12 Jul 2013 10:25:37 +0200
Subject: [PATCH 5650/6849] erlang: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/erlang.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 3a5752ebcf..9f47b84bec 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_VERSION = R15B01
+ERLANG_VERSION = R15B03-1
 ERLANG_SITE = http://www.erlang.org/download
 ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
 ERLANG_DEPENDENCIES = host-erlang

From 5d09b72d608fe91e8305f1c12df42cd68f79c500 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 12 Jul 2013 10:26:11 +0200
Subject: [PATCH 5651/6849] erlang: add upstream URL

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/erlang/Config.in b/package/erlang/Config.in
index 6920db689a..27206f3067 100644
--- a/package/erlang/Config.in
+++ b/package/erlang/Config.in
@@ -8,6 +8,8 @@ config BR2_PACKAGE_ERLANG
 	  telephony and instant messaging. Erlang's runtime system has
 	  built-in support for concurrency, distribution and fault tolerance.
 
+	  http://www.erlang.org
+
 config BR2_PACKAGE_ERLANG_MEGACO
 	bool "install megaco application"
 	depends on BR2_PACKAGE_ERLANG

From bed61a7be37cd95b05b8fa9c48cab77e81c93efd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Jul 2013 11:37:33 -0300
Subject: [PATCH 5652/6849] Makefile: unexport RUBYOPT

On Gentoo systems with ruby installed RUBYOPT is set and causes build
breakage for some packages that needs host-ruby (example: webkit).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index f6e9965948..f477124935 100644
--- a/Makefile
+++ b/Makefile
@@ -180,6 +180,9 @@ unexport PKG_CONFIG_SYSROOT_DIR
 # steps of some packages.
 unexport DESTDIR
 
+# Causes breakage with packages that needs host-ruby
+unexport RUBYOPT
+
 # bash prints the name of the directory on 'cd <dir>' if CDPATH is
 # set, so unset it here to not cause problems. Notice that the export
 # line doesn't affect the environment of $(shell ..) calls, so

From b62e9cde8812b2fa145b9c4cd01e4a05e73fbfe1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Jul 2013 12:40:15 -0300
Subject: [PATCH 5653/6849] cifs-utils: bump to version 6.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cifs-utils/cifs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index 6f8d6519d5..ae80531f55 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CIFS_UTILS_VERSION = 6.0
+CIFS_UTILS_VERSION = 6.1
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
 CIFS_UTILS_LICENSE = GPLv3

From bef0f4c818f4dcef2589e034ad02ffeec3cab1d3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Jul 2013 15:28:10 -0300
Subject: [PATCH 5654/6849] php: security bump to version 5.3.27

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 299395f9f9..5b71535554 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 5.3.26
+PHP_VERSION = 5.3.27
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES

From 8da92a1c35c7327c49b2a96dc04d7fe80ae9bac6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 11 Jul 2013 21:58:55 -0300
Subject: [PATCH 5655/6849] nodejs: not supported on old ARM cores

nodejs needs the ARM blx instruction which is only supported in v5t+
cores (v5 ISA with thumb instructions).
Disable it for lower cores. Fixes:
http://autobuild.buildroot.net/results/89e/89ee5ba047a26a8c7a612d0285b08780b70efbd4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nodejs/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index aa65c6f42e..fea34802fc 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_NODEJS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_arm || BR2_i386 || BR2_x86_64
+	# ARM needs BLX, so v5t+
+	depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
 	# uses fork()
 	depends on BR2_USE_MMU
 	help

From 4ddff0099fa0619cfd1bcf5afa96f56a703de385 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Thu, 11 Jul 2013 16:46:10 -0700
Subject: [PATCH 5656/6849] fdk-aac: new package

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/fdk-aac/Config.in  | 17 +++++++++++++++++
 package/fdk-aac/fdk-aac.mk | 14 ++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/fdk-aac/Config.in
 create mode 100644 package/fdk-aac/fdk-aac.mk

diff --git a/package/Config.in b/package/Config.in
index b588a0c226..6d5ff0130a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -377,6 +377,7 @@ menu "Audio/Sound"
 source "package/alsa-lib/Config.in"
 source "package/audiofile/Config.in"
 source "package/celt051/Config.in"
+source "package/fdk-aac/Config.in"
 source "package/libao/Config.in"
 source "package/libcdaudio/Config.in"
 source "package/libcue/Config.in"
diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in
new file mode 100644
index 0000000000..dfc8cc43cb
--- /dev/null
+++ b/package/fdk-aac/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_FDK_AAC
+	bool "fdk-aac"
+	depends on BR2_INSTALL_LIBSTDCPP
+	# These are the architectures supported by FDK AAC
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
+		   BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+		   BR2_powerpc || BR2_sh || BR2_sh64
+
+	help
+	  The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec")
+	  is software that implements the MPEG Advanced Audio Coding ("AAC")
+	  encoding and decoding scheme for digital audio
+
+	  http://sourceforge.net/projects/opencore-amr/files/fdk-aac/
+
+comment "fdk-aac requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk
new file mode 100644
index 0000000000..325267a8d3
--- /dev/null
+++ b/package/fdk-aac/fdk-aac.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# fdk-aac
+#
+################################################################################
+
+FDK_AAC_VERSION = 0.1.1
+FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac
+FDK_AAC_LICENSE = fdk-aac license
+FDK_AAC_LICENSE_FILES = NOTICE
+
+FDK_AAC_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

From 36db329ede5bd83661dbcd6a69a95442296c1f93 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 13 Jul 2013 21:34:47 +0200
Subject: [PATCH 5657/6849] opus: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opus/opus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/opus/opus.mk b/package/opus/opus.mk
index 043d4b0ecd..96688545b9 100644
--- a/package/opus/opus.mk
+++ b/package/opus/opus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPUS_VERSION = 1.0.2
+OPUS_VERSION = 1.0.3
 OPUS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_INSTALL_STAGING = YES
 OPUS_CONF_OPT = --disable-doc

From 9d1478267580d5110a1958d9f1b09b68091ffede Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 12 Jul 2013 08:34:45 -0300
Subject: [PATCH 5658/6849] usbutils: bump to version 007

[Peter: move entire USBUTILS_REMOVE_PYTHON handling inside conditional]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usbutils/usbutils.mk | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index c56702b600..00904cb150 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,13 +4,10 @@
 #
 ################################################################################
 
-USBUTILS_VERSION = 006
-USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/
-USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.gz
+USBUTILS_VERSION = 007
+USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkgconf libusb
 USBUTILS_INSTALL_STAGING = YES
-# no configure in tarball
-USBUTILS_AUTORECONF = YES
 USBUTILS_LICENSE = GPLv2+
 USBUTILS_LICENSE_FILES = COPYING
 
@@ -25,6 +22,15 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 	USBUTILS_DEPENDENCIES += busybox
 endif
 
+# Nice lsusb.py script only if there's python
+ifeq ($(BR2_PACKAGE_PYTHON),)
+define USBUTILS_REMOVE_PYTHON
+	rm -f $(TARGET_DIR)/usr/bin/lsusb.py
+endef
+
+USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON
+endif
+
 define USBUTILS_TARGET_CLEANUP
 	rm -f $(TARGET_DIR)/usr/bin/usb-devices
 	rm -f $(TARGET_DIR)/usr/sbin/update-usbids.sh

From bee9b328812a37ed8fe1552f70ceb0910ff72532 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Jul 2013 22:23:50 -0300
Subject: [PATCH 5659/6849] linux-headers: bump 3.{0, 2, 4, 9, 10}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ..._install-fix-__packed-in-exported-kernel-head.patch |  0
 package/linux-headers/Config.in.host                   | 10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename package/linux-headers/{3.0.85 => 3.0.86}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.85/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.86/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.85/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.86/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 8431b2da0b..a872445c12 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.85"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.86"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.47"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.48"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.52"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.53"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.9"		if BR2_KERNEL_HEADERS_3_9
-	default "3.10"		if BR2_KERNEL_HEADERS_3_10
+	default "3.9.10"	if BR2_KERNEL_HEADERS_3_9
+	default "3.10.1"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 4ff9da07c846aaf1e368cb637c1755b4eb4869d0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 13 Jul 2013 22:23:51 -0300
Subject: [PATCH 5660/6849] linux: bump 3.10.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 421f855532..3936493a5c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10"
+	bool "3.10.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.1" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From c327bdc4e9a9341956a35065c770e401aa484b79 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 14 Jul 2013 21:47:33 +0200
Subject: [PATCH 5661/6849] gstreamer1/gst1-*: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk   | 2 +-
 package/multimedia/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk | 2 +-
 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
 package/multimedia/gstreamer1/gstreamer1.mk               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
index 1e61bd2fc4..ac773920c6 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,7 +4,7 @@
 #
 ###############################################################################
 
-GST1_PLUGINS_BAD_VERSION = 1.0.7
+GST1_PLUGINS_BAD_VERSION = 1.0.8
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
index 1ab6f1ea4b..1e32867efb 100644
--- a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BASE_VERSION = 1.0.7
+GST1_PLUGINS_BASE_VERSION = 1.0.8
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index 1e6d39b304..23fbd80c28 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,7 +4,7 @@
 #
 ###############################################################################
 
-GST1_PLUGINS_GOOD_VERSION = 1.0.7
+GST1_PLUGINS_GOOD_VERSION = 1.0.8
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 67761b5d80..4fcc3d4f5c 100644
--- a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,7 +4,7 @@
 #
 ###############################################################################
 
-GST1_PLUGINS_UGLY_VERSION = 1.0.7
+GST1_PLUGINS_UGLY_VERSION = 1.0.8
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
index 71ad08b29d..1e1564f87e 100644
--- a/package/multimedia/gstreamer1/gstreamer1.mk
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GSTREAMER1_VERSION = 1.0.7
+GSTREAMER1_VERSION = 1.0.8
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES

From 63c8887501daf28a4fb82094892444a62a35323e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Jul 2013 00:27:24 +0200
Subject: [PATCH 5662/6849] gcc: use BR2_EXTRA_GCC_CONFIG_OPTIONS in
 gcc-initial and gcc-intermediate

When refactoring the internal toolchain backend logic, the code was
changed to pass the custom configure options given through
BR2_EXTRA_GCC_CONFIG_OPTIONS only for the gcc final pass, with the
idea that we're only interested by user customization for the final
compiler.

However, the beaglebone_defconfig was passing --with-float=hard
--with-fpu=vfpv3-d16 as BR2_EXTRA_GCC_CONFIG_OPTIONS, and since the
refactoring, it was causing build failures of the beaglebone_defconfig
(with messages saying that Busybox is built to use VFP arguments, but
libc/libm are not). This is due to the fact that the gcc intermediate,
which is used to build the C library, wasn't built to generate hard
float, while the final compiler was generating hard float.

So, we get back to the original situation where the options in
BR2_EXTRA_GCC_CONFIG_OPTIONS are passed to all of the compiler
passes. Of course, the specific case of hard float will be fixed by
following patches in this area, but the idea still remains: the three
gcc should have the same options, if those options affected the ABI of
the generated code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host                       | 4 +++-
 package/gcc/gcc-initial/gcc-initial.mk           | 3 ++-
 package/gcc/gcc-intermediate/gcc-intermediate.mk | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 0836f9f640..a529d14c2c 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -88,7 +88,9 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "Additional gcc options"
 	default ""
 	help
-	  Any additional gcc configure options you may want to include....
+	  Any additional gcc configure options you may want to
+	  include. Those options are applied for all of the gcc
+	  initial, gcc intermediate and gcc final passes.
 
 config BR2_INSTALL_OBJC
 	bool "Build/install Objective-C compiler and runtime?"
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 05c956abcb..e468419452 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -31,7 +31,8 @@ HOST_GCC_INITIAL_CONF_OPT = \
 	--without-headers \
 	--with-newlib \
 	--disable-largefile \
-	--disable-nls
+	--disable-nls \
+	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
 HOST_GCC_INITIAL_MAKE_OPT = all-gcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
index 5460000976..a6660256d7 100644
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -30,7 +30,8 @@ HOST_GCC_INTERMEDIATE_CONF_OPT = \
 	$(HOST_GCC_COMMON_CONF_OPT) \
 	--enable-languages=c \
 	--disable-largefile \
-	--disable-nls
+	--disable-nls \
+	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
 HOST_GCC_INTERMEDIATE_MAKE_OPT = all-gcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)

From 7f4cb885f31296db6eac4f4c93761a39eb3d1433 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:25 +0200
Subject: [PATCH 5663/6849] package/uclibc: fix indentation (use tabs, not
 spaces)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index f309243c09..e50834233c 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -113,7 +113,7 @@ choice
 
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
-	        select BR2_TOOLCHAIN_HAS_THREADS
+		select BR2_TOOLCHAIN_HAS_THREADS
 		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32

From adf9646229fc5ede51297e2dc703926e1127aa6f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:26 +0200
Subject: [PATCH 5664/6849] arch/arm: remove OABI option

OABI is more than legacy, it's dead.

New developments should go with EABI, since it so much better.
>From the Debian EABI page [0] :
  - floating point performance, with or without an FPU is very much faster
  - mixing soft and hardfloat code is possible
  - structure packing is not as painful as it used to be
  - a more efficient syscall convention
  - more compatibility with various tools

[0] http://wiki.debian.org/ArmEabiPort

[Thomas: keep the ABI choice, as we are going to introduce EABIhf later].
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 983cac48f2..4daa91f8e2 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -72,19 +72,12 @@ choice
 	help
 	  Application Binary Interface to use
 
-	  Note:
-	    Using OABI is discouraged.
-
 config BR2_ARM_EABI_CHOICE
 	bool "EABI"
-config BR2_ARM_OABI
-	bool "OABI"
-	depends on !BR2_GCC_VERSION_4_7_X
 endchoice
 
 config BR2_ARM_EABI
 	def_bool y
-	depends on !BR2_ARM_OABI
 
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"

From de1b4f99aefcd5d82e470b737172eb63998aa16e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:27 +0200
Subject: [PATCH 5665/6849] arch/arm: remove setting gcc's apcs-gnu ABI (aka
 OABI)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 4daa91f8e2..027dac2d9d 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -142,5 +142,4 @@ config BR2_GCC_TARGET_ARCH
 	default "iwmmxt"	if BR2_iwmmxt
 
 config BR2_GCC_TARGET_ABI
-	default "apcs-gnu"	if BR2_ARM_OABI
-	default "aapcs-linux"	if BR2_ARM_EABI
+	default "aapcs-linux"

From d854bd531e67b37929203c4a33acf907c9b88eb1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:28 +0200
Subject: [PATCH 5666/6849] package/uclibc: ARM OABI is no longer supported

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index e50834233c..b9917a76f5 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -90,7 +90,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
+	default BR2_PTHREADS_NATIVE if !(BR2_avr32 || BR2_xtensa)
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -114,7 +114,6 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32
 		depends on !BR2_xtensa
@@ -186,7 +185,6 @@ config BR2_UCLIBC_ARM_TYPE
 config BR2_UCLIBC_ARM_ABI
 	string
 	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
-	default OABI if BR2_ARM_OABI
 	default EABI if BR2_ARM_EABI
 
 config BR2_UCLIBC_ARM_BX

From e3923dd1bfe854afc010636ee2aada0161ed97a0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:29 +0200
Subject: [PATCH 5667/6849] toolchain/helpers: ARM OABI is no longer supported

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 1509ff8b79..0398b63cf0 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -285,10 +285,6 @@ check_arm_abi = \
 	else \
 		EXT_TOOLCHAIN_ABI="oabi" ; \
 	fi ; \
-	if [ x$(BR2_ARM_OABI) = x"y" -a $${EXT_TOOLCHAIN_ABI} = "eabi" ] ; then \
-		echo "Incorrect ABI setting" ; \
-		exit 1 ; \
-	fi ; \
 	if [ x$(BR2_ARM_EABI) = x"y" -a $${EXT_TOOLCHAIN_ABI} = "oabi" ] ; then \
 		echo "Incorrect ABI setting" ; \
 		exit 1 ; \

From 72189e5b10cb6b54dd21c498f21464e57e9d8516 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:30 +0200
Subject: [PATCH 5668/6849] linux: remove EABI conditional

We're only EABI now, so we want to always build an EABI kernel
when we're building for ARM.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index dfc948ca51..2ab437dd3f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -170,9 +170,8 @@ define LINUX_CONFIGURE_CMDS
 	cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-	$(if $(BR2_ARM_EABI),
-		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
-		$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
+	$(if $(BR2_arm)$(BR2_armeb),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config))
 	# As the kernel gets compiled before root filesystems are
 	# built, we create a fake cpio file. It'll be
 	# replaced later by the real cpio archive, and the kernel will be

From b6a9829ebec9b32463e68c9f18cea60d04a5451e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:31 +0200
Subject: [PATCH 5669/6849] pkg-infra: dump all ARM OABI references when
 setting ABI

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 405b3e4378..06db122e47 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -30,11 +30,10 @@ LIBC=gnu
 endif
 
 # The ABI suffix is a bit special on ARM, as it needs to be
-# -uclibcgnueabi for uClibc EABI, -uclibc for uClibc OABI, -gnueabi
-# for glibc EABI and -gnu for glibc OABI. This means that the LIBC and
-# ABI aren't strictly orthogonal, which explains why we need the test
-# on LIBC below.
-ifeq ($(BR2_ARM_EABI),y)
+# -uclibcgnueabi for uClibc EABI, and -gnueabi for glibc EABI.
+# This means that the LIBC and ABI aren't strictly orthogonal,
+# which explains why we need the test on LIBC below.
+ifeq ($(BR2_arm)$(BR2_armeb),y)
 ifeq ($(LIBC),uclibc)
 ABI=gnueabi
 else

From 95bfc99fb1b1c2b50b2b4bb8e6bbf6fa22c8abe7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:32 +0200
Subject: [PATCH 5670/6849] toolchain/helpers: only check for an EABI toolchain

... since we only support EABI now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 0398b63cf0..95217e7b29 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -280,13 +280,8 @@ check_uclibc = \
 check_arm_abi = \
 	__CROSS_CC=$(strip $1) ; \
 	EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \
-	if echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
-		EXT_TOOLCHAIN_ABI="eabi" ; \
-	else \
-		EXT_TOOLCHAIN_ABI="oabi" ; \
-	fi ; \
-	if [ x$(BR2_ARM_EABI) = x"y" -a $${EXT_TOOLCHAIN_ABI} = "oabi" ] ; then \
-		echo "Incorrect ABI setting" ; \
+	if ! echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
+		echo "External toolchain uses the unsuported OABI" ; \
 		exit 1 ; \
 	fi
 

From 171df5276f837c177f94e9f70aa89224cc0c104e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:33 +0200
Subject: [PATCH 5671/6849] package/owl-linux: drop check for EABI

... since we only support EABI now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/owl-linux/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
index 1dcf5f1930..9b14027d57 100644
--- a/package/owl-linux/Config.in
+++ b/package/owl-linux/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_OWL_LINUX
 	bool "owl-linux"
 	depends on BR2_LINUX_KERNEL
 	depends on (BR2_arm920t || BR2_arm922t || BR2_arm926t)
-	depends on BR2_ARM_EABI
 	help
 	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
 
@@ -14,6 +13,6 @@ comment "owl-linux requires a Linux kernel"
 	depends on !BR2_LINUX_KERNEL
 	depends on BR2_arm || BR2_armeb
 
-comment "owl-linux is only supported on ARM9 architecture with EABI"
-	depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t) || !BR2_ARM_EABI
+comment "owl-linux is only supported on ARM9 architecture"
+	depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t)
 	depends on BR2_arm || BR2_armeb

From d8dad05fbb9b16af94c38669e39388f3a9e823e9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 14 Jul 2013 00:27:34 +0200
Subject: [PATCH 5672/6849] package/uClibc: drop ARM EABI conditions

... since we now only support EABI for ARM, we only need to
force EABI unconditionally.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/Config.in | 5 -----
 package/uclibc/uclibc.mk | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index b9917a76f5..8d16e8c2f5 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -182,11 +182,6 @@ config BR2_UCLIBC_ARM_TYPE
 	default ARM_CORTEXA8	if BR2_cortex_a8
 	default ARM_CORTEXA9	if BR2_cortex_a9
 
-config BR2_UCLIBC_ARM_ABI
-	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
-	default EABI if BR2_ARM_EABI
-
 config BR2_UCLIBC_ARM_BX
 	bool
 	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 421e323035..8eca5feee8 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -69,11 +69,9 @@ define UCLIBC_ARM_TYPE_CONFIG
 	$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_TYPE),y,$(@D))
 endef
 
-UCLIBC_ARM_ABI = CONFIG_ARM_$(call qstrip,$(BR2_UCLIBC_ARM_ABI))
-
 define UCLIBC_ARM_ABI_CONFIG
 	$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_ABI),y,$(@D))
+	$(call UCLIBC_OPT_SET,CONFIG_ARM_EABI,y,$(@D))
 endef
 
 ifeq ($(BR2_UCLIBC_ARM_BX),y)

From fd9c3e2bdaaea7bc54b2ea2c979a2ae061ed5149 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Mon, 15 Jul 2013 13:48:11 +0200
Subject: [PATCH 5673/6849] uclibc: arc: add patch to fix strcmp/index susv3
 legacy

This fixes build errors for 'keyutils'

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uclibc/0.9.33-arc/fix-susv3-legacy.patch  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/uclibc/0.9.33-arc/fix-susv3-legacy.patch

diff --git a/package/uclibc/0.9.33-arc/fix-susv3-legacy.patch b/package/uclibc/0.9.33-arc/fix-susv3-legacy.patch
new file mode 100644
index 0000000000..a768024dc7
--- /dev/null
+++ b/package/uclibc/0.9.33-arc/fix-susv3-legacy.patch
@@ -0,0 +1,36 @@
+From 3124ace804337d32974392e0a73a09cdc0d60fc8 Mon Sep 17 00:00:00 2001
+From: Mischa Jonker <mjonker@synopsys.com>
+Date: Mon, 15 Jul 2013 13:06:11 +0200
+Subject: [PATCH] ARC: Add alias 'index' to strcmp for susv3 legacy
+ compatibility
+
+This fixes build errors for 'keyutils'
+
+Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
+---
+ libc/string/arc/strchr.S |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libc/string/arc/strchr.S b/libc/string/arc/strchr.S
+index b9f28c0..8d51aa4 100644
+--- a/libc/string/arc/strchr.S
++++ b/libc/string/arc/strchr.S
+@@ -1,6 +1,7 @@
+ /* Copyright (C) 2007 ARC International (UK) LTD */
+ 
+ #include <bits/asm.h>
++#include <features.h>
+ 
+ /* ARC700 has a relatively long pipeline and branch prediction, so we want
+    to avoid branches that are hard to predict.  On the other hand, the
+@@ -115,3 +116,7 @@ ENTRY(strchr)
+ 	mov.mi	r0,0
+ #endif /* ENDIAN */
+ ENDFUNC(strchr)
++
++#ifdef __UCLIBC_SUSV3_LEGACY__
++strong_alias(strchr,index)
++#endif
+-- 
+1.7.9.5
+

From 821a6d6338451d76d6856ab9c0bfe1a709543b4b Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Mon, 15 Jul 2013 14:39:22 +0200
Subject: [PATCH 5674/6849] libosip2: arc: Undefine __arc__ when building for
 ARC processors

libosip2 appears to have support for the "ARC standard" (Advanced
RISC Computing), which is unrelated to Synopsys DesignWare ARC
processors. The check for this involves verifying the existence of
the "__arc__" macro. Unfortunately, this macro is also present
as a predefined built-in for the ARC processors, resulting into
build failures.

[Peter: add short comment in .mk files as well]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libeXosip2/libeXosip2.mk | 5 +++++
 package/libosip2/libosip2.mk     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 4be2f05a98..6abdaab8a0 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -12,6 +12,11 @@ LIBEXOSIP2_LICENSE_FILES = COPYING
 
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 
+ifeq ($(BR2_arc),y)
+# toolchain __arc__ define conflicts with libeXosip2 source
+LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBEXOSIP2_DEPENDENCIES += openssl
 LIBEXOSIP2_CONF_OPT += --enable-openssl
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 6ae8149a31..0b672d86d2 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -10,6 +10,11 @@ LIBOSIP2_INSTALL_STAGING = YES
 LIBOSIP2_LICENSE = LGPLv2.1+
 LIBOSIP2_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_arc),y)
+# toolchain __arc__ define conflicts with libosip2 source
+LIBOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
+endif
+
 LIBOSIP2_CONF_OPT = \
 	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
 

From b2b0274a17195d642ca7c69659ad279dcbe8b10c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:11 -0300
Subject: [PATCH 5675/6849] squid: bump to version 3.3.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index e3daa3200a..f6be405075 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SQUID_VERSION = 3.3.5
+SQUID_VERSION = 3.3.6
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From df2d502a24900ae9814e34ce4b4e015e0ec65721 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:12 -0300
Subject: [PATCH 5676/6849] gettext: bump to version 0.18.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../gettext-02-fix_rpl_gettimeofday.patch     | 282 ------------------
 package/gettext/gettext-05-use-shell.patch    |  25 --
 package/gettext/gettext.mk                    |   2 +-
 3 files changed, 1 insertion(+), 308 deletions(-)
 delete mode 100644 package/gettext/gettext-02-fix_rpl_gettimeofday.patch
 delete mode 100644 package/gettext/gettext-05-use-shell.patch

diff --git a/package/gettext/gettext-02-fix_rpl_gettimeofday.patch b/package/gettext/gettext-02-fix_rpl_gettimeofday.patch
deleted file mode 100644
index e97ceb248c..0000000000
--- a/package/gettext/gettext-02-fix_rpl_gettimeofday.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-Newer sys_time.in.h from gnulib breaks on uClibc with C++ so roll back
-to a previous version that's known to work.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h
---- gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h	2013-03-12 09:17:10.530475932 -0300
-+++ gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h	2013-03-19 12:00:17.557958255 -0300
-@@ -1,6 +1,6 @@
- /* Provide a more complete sys/time.h.
- 
--   Copyright (C) 2007-2013 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -17,34 +17,37 @@
- 
- /* Written by Paul Eggert.  */
- 
--#ifndef _@GUARD_PREFIX@_SYS_TIME_H
--
- #if __GNUC__ >= 3
- @PRAGMA_SYSTEM_HEADER@
- #endif
- @PRAGMA_COLUMNS@
- 
--/* The include_next requires a split double-inclusion guard.  */
--#if @HAVE_SYS_TIME_H@
--# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
--#endif
-+#if defined _@GUARD_PREFIX@_SYS_TIME_H
- 
--#ifndef _@GUARD_PREFIX@_SYS_TIME_H
--#define _@GUARD_PREFIX@_SYS_TIME_H
-+/* Simply delegate to the system's header, without adding anything.  */
-+# if @HAVE_SYS_TIME_H@
-+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-+# endif
- 
--#if ! @HAVE_SYS_TIME_H@
--# include <time.h>
--#endif
-+#else
-+
-+# define _@GUARD_PREFIX@_SYS_TIME_H
-+
-+# if @HAVE_SYS_TIME_H@
-+#  @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
-+# else
-+#  include <time.h>
-+# endif
- 
- /* On native Windows with MSVC, get the 'struct timeval' type.
-    Also, on native Windows with a 64-bit time_t, where we are overriding the
-    'struct timeval' type, get all declarations of system functions whose
-    signature contains 'struct timeval'.  */
--#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
--# define _GL_INCLUDING_WINSOCK2_H
--# include <winsock2.h>
--# undef _GL_INCLUDING_WINSOCK2_H
--#endif
-+# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
-+#  define _GL_INCLUDING_WINSOCK2_H
-+#  include <winsock2.h>
-+#  undef _GL_INCLUDING_WINSOCK2_H
-+# endif
- 
- /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
- 
-@@ -52,112 +55,112 @@
- 
- /* The definition of _GL_WARN_ON_USE is copied here.  */
- 
--#ifdef __cplusplus
-+# ifdef __cplusplus
- extern "C" {
--#endif
-+# endif
- 
--#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
-+# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
- 
--# if @REPLACE_STRUCT_TIMEVAL@
--#  define timeval rpl_timeval
--# endif
-+#  if @REPLACE_STRUCT_TIMEVAL@
-+#   define timeval rpl_timeval
-+#  endif
- 
--# if !GNULIB_defined_struct_timeval
-+#  if !GNULIB_defined_struct_timeval
- struct timeval
- {
-   time_t tv_sec;
-   long int tv_usec;
- };
--#  define GNULIB_defined_struct_timeval 1
--# endif
-+#   define GNULIB_defined_struct_timeval 1
-+#  endif
- 
--#endif
-+# endif
- 
--#ifdef __cplusplus
-+# ifdef __cplusplus
- }
--#endif
-+# endif
- 
--#if @GNULIB_GETTIMEOFDAY@
--# if @REPLACE_GETTIMEOFDAY@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gettimeofday
--#   define gettimeofday rpl_gettimeofday
--#  endif
-+# if @GNULIB_GETTIMEOFDAY@
-+#  if @REPLACE_GETTIMEOFDAY@
-+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#    undef gettimeofday
-+#    define gettimeofday rpl_gettimeofday
-+#   endif
- _GL_FUNCDECL_RPL (gettimeofday, int,
--                  (struct timeval *restrict, void *restrict)
-+                  (struct timeval *__restrict, void *__restrict)
-                   _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (gettimeofday, int,
--                  (struct timeval *restrict, void *restrict));
--# else
--#  if !@HAVE_GETTIMEOFDAY@
-+                  (struct timeval *__restrict, void *__restrict));
-+#  else
-+#   if !@HAVE_GETTIMEOFDAY@
- _GL_FUNCDECL_SYS (gettimeofday, int,
--                  (struct timeval *restrict, void *restrict)
-+                  (struct timeval *__restrict, void *__restrict)
-                   _GL_ARG_NONNULL ((1)));
--#  endif
-+#   endif
- /* Need to cast, because on glibc systems, by default, the second argument is
-                                                   struct timezone *.  */
- _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
--                       (struct timeval *restrict, void *restrict));
--# endif
-+                       (struct timeval *__restrict, void *__restrict));
-+#  endif
- _GL_CXXALIASWARN (gettimeofday);
--#elif defined GNULIB_POSIXCHECK
--# undef gettimeofday
--# if HAVE_RAW_DECL_GETTIMEOFDAY
-+# elif defined GNULIB_POSIXCHECK
-+#  undef gettimeofday
-+#  if HAVE_RAW_DECL_GETTIMEOFDAY
- _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
-                  "use gnulib module gettimeofday for portability");
-+#  endif
- # endif
--#endif
- 
- /* Hide some function declarations from <winsock2.h>.  */
- 
--#if defined _MSC_VER && @HAVE_WINSOCK2_H@
--# if !defined _@GUARD_PREFIX@_UNISTD_H
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef close
--#   define close close_used_without_including_unistd_h
--#  else
-+# if defined _MSC_VER && @HAVE_WINSOCK2_H@
-+#  if !defined _@GUARD_PREFIX@_UNISTD_H
-+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#    undef close
-+#    define close close_used_without_including_unistd_h
-+#   else
-      _GL_WARN_ON_USE (close,
-                       "close() used without including <unistd.h>");
--#  endif
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gethostname
--#   define gethostname gethostname_used_without_including_unistd_h
--#  else
-+#   endif
-+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#    undef gethostname
-+#    define gethostname gethostname_used_without_including_unistd_h
-+#   else
-      _GL_WARN_ON_USE (gethostname,
-                       "gethostname() used without including <unistd.h>");
-+#   endif
- #  endif
--# endif
--# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef socket
--#   define socket              socket_used_without_including_sys_socket_h
--#   undef connect
--#   define connect             connect_used_without_including_sys_socket_h
--#   undef accept
--#   define accept              accept_used_without_including_sys_socket_h
--#   undef bind
--#   define bind                bind_used_without_including_sys_socket_h
--#   undef getpeername
--#   define getpeername         getpeername_used_without_including_sys_socket_h
--#   undef getsockname
--#   define getsockname         getsockname_used_without_including_sys_socket_h
--#   undef getsockopt
--#   define getsockopt          getsockopt_used_without_including_sys_socket_h
--#   undef listen
--#   define listen              listen_used_without_including_sys_socket_h
--#   undef recv
--#   define recv                recv_used_without_including_sys_socket_h
--#   undef send
--#   define send                send_used_without_including_sys_socket_h
--#   undef recvfrom
--#   define recvfrom            recvfrom_used_without_including_sys_socket_h
--#   undef sendto
--#   define sendto              sendto_used_without_including_sys_socket_h
--#   undef setsockopt
--#   define setsockopt          setsockopt_used_without_including_sys_socket_h
--#   undef shutdown
--#   define shutdown            shutdown_used_without_including_sys_socket_h
--#  else
-+#  if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
-+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#    undef socket
-+#    define socket              socket_used_without_including_sys_socket_h
-+#    undef connect
-+#    define connect             connect_used_without_including_sys_socket_h
-+#    undef accept
-+#    define accept              accept_used_without_including_sys_socket_h
-+#    undef bind
-+#    define bind                bind_used_without_including_sys_socket_h
-+#    undef getpeername
-+#    define getpeername         getpeername_used_without_including_sys_socket_h
-+#    undef getsockname
-+#    define getsockname         getsockname_used_without_including_sys_socket_h
-+#    undef getsockopt
-+#    define getsockopt          getsockopt_used_without_including_sys_socket_h
-+#    undef listen
-+#    define listen              listen_used_without_including_sys_socket_h
-+#    undef recv
-+#    define recv                recv_used_without_including_sys_socket_h
-+#    undef send
-+#    define send                send_used_without_including_sys_socket_h
-+#    undef recvfrom
-+#    define recvfrom            recvfrom_used_without_including_sys_socket_h
-+#    undef sendto
-+#    define sendto              sendto_used_without_including_sys_socket_h
-+#    undef setsockopt
-+#    define setsockopt          setsockopt_used_without_including_sys_socket_h
-+#    undef shutdown
-+#    define shutdown            shutdown_used_without_including_sys_socket_h
-+#   else
-      _GL_WARN_ON_USE (socket,
-                       "socket() used without including <sys/socket.h>");
-      _GL_WARN_ON_USE (connect,
-@@ -186,18 +189,17 @@
-                       "setsockopt() used without including <sys/socket.h>");
-      _GL_WARN_ON_USE (shutdown,
-                       "shutdown() used without including <sys/socket.h>");
-+#   endif
- #  endif
--# endif
--# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef select
--#   define select select_used_without_including_sys_select_h
--#  else
-+#  if !defined _@GUARD_PREFIX@_SYS_SELECT_H
-+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#    undef select
-+#    define select select_used_without_including_sys_select_h
-+#   else
-      _GL_WARN_ON_USE (select,
-                       "select() used without including <sys/select.h>");
-+#   endif
- #  endif
- # endif
--#endif
- 
- #endif /* _@GUARD_PREFIX@_SYS_TIME_H */
--#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff --git a/package/gettext/gettext-05-use-shell.patch b/package/gettext/gettext-05-use-shell.patch
deleted file mode 100644
index 5f6e2c268b..0000000000
--- a/package/gettext/gettext-05-use-shell.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-gettext-runtime: use @SHELL@ for the SHELL variable definition
-
-The gettext-runtime/Makefile.in uses an hardcoded SHELL = /bin/sh
-variable. This causes problems at build time, because libtool is then
-called with the 'sh' shell, which does not support the += construct
-that the libtool script is using.
-
-Instead, this Makefile.in should be definining SHELL = @SHELL@, just
-like all other Makefile.in of gettext.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/gettext-runtime/intl/Makefile.in
-===================================================================
---- a/gettext-runtime/intl/Makefile.in
-+++ b/gettext-runtime/intl/Makefile.in
-@@ -17,7 +17,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
--SHELL = /bin/sh
-+SHELL = @SHELL@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 1c2a6ece58..65ab9e82d0 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GETTEXT_VERSION = 0.18.2.1
+GETTEXT_VERSION = 0.18.3
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+

From c86e6e71114734bf13b325f3f5ae9b2faf7cc31a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:13 -0300
Subject: [PATCH 5677/6849] libidn: bump to version 1.28

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libidn/libidn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 44311eb514..b2c33538c8 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBIDN_VERSION = 1.27
+LIBIDN_VERSION = 1.28
 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"

From 865891f1c482ff11017ee7c34e17870b57786997 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:14 -0300
Subject: [PATCH 5678/6849] collectd: bump to version 5.3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/collectd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index b63d430d52..bead4d4308 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COLLECTD_VERSION = 5.3.0
+COLLECTD_VERSION = 5.3.1
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes

From 02695c0cbbbbe4dbc544f76b4b6e9972cd174678 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:15 -0300
Subject: [PATCH 5679/6849] nettle: bump to version 2.7.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nettle/nettle.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index b772d3ac2a..e86d3e83b2 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETTLE_VERSION = 2.7
+NETTLE_VERSION = 2.7.1
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES

From 42fb7c58bb7c44c00a04f0d60bf44c1f6eddcdf2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:16 -0300
Subject: [PATCH 5680/6849] gnutls: bump to version 3.2.2

Closes bug #6374

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index ba38239c62..6562d8e732 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUTLS_VERSION = 3.2.1
+GNUTLS_VERSION = 3.2.2
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+

From 659a1f727922dea4691b4353df77458bc427970e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 15 Jul 2013 11:19:17 -0300
Subject: [PATCH 5681/6849] ed: bump to version 1.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ed/ed.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 306e9186f5..17de543c07 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ED_VERSION = 1.7
+ED_VERSION = 1.9
 ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"

From dba2bef10a9f4bf666d9053f6b3e0d0ecec752c1 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Mon, 15 Jul 2013 21:52:38 +0200
Subject: [PATCH 5682/6849] package/libsvg-cairo: new package

Libsvg-cairo provides the ability to render SVG content from files or
buffers. All rendering is performed using the cairo rendering library.

[Peter: license is LGPLv2.1+]
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/libsvg-cairo/Config.in       | 11 +++++++++++
 package/libsvg-cairo/libsvg-cairo.mk | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/libsvg-cairo/Config.in
 create mode 100644 package/libsvg-cairo/libsvg-cairo.mk

diff --git a/package/Config.in b/package/Config.in
index 6d5ff0130a..aac31bf45b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -465,6 +465,7 @@ source "package/libqrencode/Config.in"
 source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
 source "package/libsvg/Config.in"
+source "package/libsvg-cairo/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
 source "package/opencv/Config.in"
diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in
new file mode 100644
index 0000000000..9577c69bf0
--- /dev/null
+++ b/package/libsvg-cairo/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBSVG_CAIRO
+	bool "libsvg-cairo"
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_SVG
+	select BR2_PACKAGE_LIBSVG
+	help
+	  Libsvg-cairo provides the ability to render SVG content from
+	  files or buffers. All rendering is performed using the cairo
+	  rendering library.
+
+	  http://cairographics.org
diff --git a/package/libsvg-cairo/libsvg-cairo.mk b/package/libsvg-cairo/libsvg-cairo.mk
new file mode 100644
index 0000000000..a1681800ec
--- /dev/null
+++ b/package/libsvg-cairo/libsvg-cairo.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libsvg-cairo
+#
+################################################################################
+
+LIBSVG_CAIRO_VERSION         = 0.1.6
+LIBSVG_CAIRO_SITE            = http://cairographics.org/snapshots/
+LIBSVG_CAIRO_DEPENDENCIES    = cairo libsvg
+LIBSVG_CAIRO_INSTALL_STAGING = YES
+LIBSVG_CAIRO_LICENSE         = LGPLv2.1+
+LIBSVG_CAIRO_LICENSE_FILES   = COPYING
+
+$(eval $(autotools-package))

From 61900d9245806ce1387fac730a5fd926bf032443 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Mon, 15 Jul 2013 16:44:18 -0500
Subject: [PATCH 5683/6849] powervr: add powervr virtual package

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sundareson, Prabindh <prabu@ti.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Sinan Akpolat <sinan@linkas.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/powervr/Config.in  |  2 ++
 package/powervr/powervr.mk | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/powervr/Config.in
 create mode 100644 package/powervr/powervr.mk

diff --git a/package/Config.in b/package/Config.in
index aac31bf45b..0ecd270fdd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -473,6 +473,7 @@ source "package/opengl/Config.in"
 source "package/pango/Config.in"
 source "package/pixman/Config.in"
 source "package/poppler/Config.in"
+source "package/powervr/Config.in"
 source "package/tiff/Config.in"
 source "package/wayland/Config.in"
 source "package/webkit/Config.in"
diff --git a/package/powervr/Config.in b/package/powervr/Config.in
new file mode 100644
index 0000000000..d09ce74d6a
--- /dev/null
+++ b/package/powervr/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_HAS_POWERVR
+	bool
diff --git a/package/powervr/powervr.mk b/package/powervr/powervr.mk
new file mode 100644
index 0000000000..b63b0e66e8
--- /dev/null
+++ b/package/powervr/powervr.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# Virtual package for PowerVR driver
+#
+################################################################################
+
+POWERVR_SOURCE =
+
+ifeq ($(BR2_PACKAGE_TI_GFX),y)
+POWERVR_DEPENDENCIES += ti-gfx
+endif
+
+ifeq ($(POWERVR_DEPENDENCIES),)
+define POWERVR_CONFIGURE_CMDS
+	echo "No PowerVR implementation selected. Configuration error."
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))

From 7fdcf8e897c5b095eda10cbae6def00dd27f3666 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Mon, 15 Jul 2013 16:44:19 -0500
Subject: [PATCH 5684/6849] ti-gfx: add new package

adds accelerated GPU support for the OMAP35xx, AM35xx, AM37xx, DM37xx,
AM387x, DM814x, AM389x, DM816x, and AM335x platforms.

[Peter: fix .pc files install]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sundareson, Prabindh <prabu@ti.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Sinan Akpolat <sinan@linkas.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/opengl/libegl/libegl.mk               |   4 +
 package/opengl/libgles/libgles.mk             |   4 +
 package/ti-gfx/Config.in                      |  69 ++++++
 package/ti-gfx/S80ti-gfx                      |  53 +++++
 package/ti-gfx/egl.pc                         |  11 +
 package/ti-gfx/esrev.sh                       |  59 ++++++
 package/ti-gfx/glesv2.pc                      |  11 +
 package/ti-gfx/powervr.ini                    |   2 +
 .../ti-gfx/ti-gfx-km_install_modules.patch    |  19 ++
 package/ti-gfx/ti-gfx-newclkapi.patch         | 143 +++++++++++++
 package/ti-gfx/ti-gfx.mk                      | 199 ++++++++++++++++++
 12 files changed, 575 insertions(+)
 create mode 100644 package/ti-gfx/Config.in
 create mode 100644 package/ti-gfx/S80ti-gfx
 create mode 100644 package/ti-gfx/egl.pc
 create mode 100644 package/ti-gfx/esrev.sh
 create mode 100644 package/ti-gfx/glesv2.pc
 create mode 100644 package/ti-gfx/powervr.ini
 create mode 100644 package/ti-gfx/ti-gfx-km_install_modules.patch
 create mode 100644 package/ti-gfx/ti-gfx-newclkapi.patch
 create mode 100644 package/ti-gfx/ti-gfx.mk

diff --git a/package/Config.in b/package/Config.in
index 0ecd270fdd..286a605645 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -294,6 +294,7 @@ source "package/snowball-hdmiservice/Config.in"
 source "package/sredird/Config.in"
 source "package/statserial/Config.in"
 source "package/sysstat/Config.in"
+source "package/ti-gfx/Config.in"
 source "package/ti-utils/Config.in"
 source "package/uboot-tools/Config.in"
 source "package/udev/Config.in"
diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index bd8040dade..00e1f19445 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -10,6 +10,10 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBEGL_DEPENDENCIES += rpi-userland
 endif
 
+ifeq ($(BR2_PACKAGE_TI_GFX),y)
+LIBEGL_DEPENDENCIES += ti-gfx
+endif
+
 ifeq ($(LIBEGL_DEPENDENCIES),)
 define LIBEGL_CONFIGURE_CMDS
 	echo "No libEGL implementation selected. Configuration error."
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index a0048a7846..d2fe11b976 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -10,6 +10,10 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBGLES_DEPENDENCIES += rpi-userland
 endif
 
+ifeq ($(BR2_PACKAGE_TI_GFX),y)
+LIBGLES_DEPENDENCIES += ti-gfx
+endif
+
 ifeq ($(LIBGLES_DEPENDENCIES),)
 define LIBGLES_CONFIGURE_CMDS
 	echo "No libGLES implementation selected. Configuration error."
diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
new file mode 100644
index 0000000000..a37705c131
--- /dev/null
+++ b/package/ti-gfx/Config.in
@@ -0,0 +1,69 @@
+config BR2_PACKAGE_TI_GFX
+	bool "ti-gfx"
+	select BR2_PACKAGE_HAS_OPENGL_EGL
+	select BR2_PACKAGE_HAS_OPENGL_ES
+	select BR2_PACKAGE_HAS_POWERVR
+	depends on BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
+	help
+	  Graphics libraries for TI boards.
+
+	  http://downloads.ti.com/dsps/dsps_public_sw/gfxsdk/
+
+if BR2_PACKAGE_TI_GFX
+
+config BR2_PACKAGE_TI_GFX_DEBUG
+	bool "enable debug support"
+	help
+	  Turns on debugging in the kernel module, install libraries built with
+	  debugging enabled, installs various tests and installs esrev script.
+
+config BR2_PACKAGE_TI_GFX_DEMOS
+	bool "install demos"
+	default y
+	help
+	  Install the OGLES2ChameleonMan and OGLES2MagicLantern demos
+
+config BR2_PACKAGE_TI_GFX_EGLIMAGE
+	bool "install eglimage version of libraries"
+	help
+	  Installs OpenGL libaries which support the eglimage api.
+
+config BR2_PACKAGE_TI_GFX_HARD_FLOAT
+	bool "use hard float binaries"
+	help
+	  Install hard float binaries (required if using a hard float toolchain)
+
+choice
+	prompt "Target"
+	default BR2_PACKAGE_TI_GFX_ES3
+	help
+	  Select the SOC for which you would like to install drivers. Please use the
+	  chart at
+	  http://processors.wiki.ti.com/index.php/OMAP35x_Graphics_SDK_Getting_Started_Guide
+
+config BR2_PACKAGE_TI_GFX_ES3
+	bool "es3.x (OMAP35xx, AM35xx Rev 3.1+)"
+	help
+	 OMAP35xx, AM35xx Rev 3.1+
+
+config BR2_PACKAGE_TI_GFX_ES5
+	bool "es5.x (AM37xx, DM37xx)"
+	help
+	  AM37xx, DM37xx
+
+config BR2_PACKAGE_TI_GFX_ES6
+	bool "es6.x (AM387x, DMA814x, AM389x, DM816x)"
+	help
+	  AM387x, DM814x, AM389x, DM816x
+
+config BR2_PACKAGE_TI_GFX_ES8
+	bool "es8.x (AM335x)"
+	help
+	  AM335x
+
+endchoice
+
+endif
+
+comment "ti-gfx requires an eglibc/glibc based toolchain and the linux kernel"
+	depends on !(BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC) && BR2_arm
diff --git a/package/ti-gfx/S80ti-gfx b/package/ti-gfx/S80ti-gfx
new file mode 100644
index 0000000000..fc5999a86d
--- /dev/null
+++ b/package/ti-gfx/S80ti-gfx
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+start() {
+	echo "ti-gfx: starting pvr driver"
+
+	BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')"
+	YRES="$(fbset | awk '/geom/ {print $3}')"
+	# Set RGBA ordering to something the drivers like
+	if [ "$BITSPERPIXEL" = "32" ] ; then
+		fbset -rgba 8/16,8/8,8/0,8/24
+	fi
+	# Try to enable triple buffering when there's enough VRAM
+	fbset -vyres $(( YRES*3 ))
+
+	modprobe pvrsrvkm
+	modprobe omaplfb
+	modprobe bufferclass_ti
+
+	pvr_maj=$(awk '$2=="pvrsrvkm" { print $1; }' /proc/devices)
+	rm -f /dev/pvrsrvkm
+
+	mknod /dev/pvrsrvkm c $pvr_maj 0
+	chmod 600 /dev/pvrsrvkm
+
+	if ! /usr/bin/pvrsrvctl --start --no-module; then
+		echo "ti-gfx: unable to start server"
+	fi
+}
+
+stop() {
+	echo "ti-gfx: stopping pvr driver"
+
+	rmmod bufferclass_ti
+	rmmod omaplfb
+	rmmod pvrsrvkm
+}
+
+case "$1" in
+start)
+	start
+;;
+stop)
+	stop
+;;
+restart)
+	stop
+	start
+;;
+*)
+	echo "ti-gfx: Please use start, stop, or restart."
+	exit 1
+;;
+esac
diff --git a/package/ti-gfx/egl.pc b/package/ti-gfx/egl.pc
new file mode 100644
index 0000000000..5ae5a9de39
--- /dev/null
+++ b/package/ti-gfx/egl.pc
@@ -0,0 +1,11 @@
+prefix=/usr/
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: TI Graphics SDK implementation of EGL
+Version: 1.9.2188537
+Requires:
+Libs: -L${libdir} -lEGL -lGLESv2 -lIMGegl
+Cflags: -I{includedir}/EGL/ -I${includedir}
diff --git a/package/ti-gfx/esrev.sh b/package/ti-gfx/esrev.sh
new file mode 100644
index 0000000000..6220d4477d
--- /dev/null
+++ b/package/ti-gfx/esrev.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+# Debug script to determine proper ES revision for the current board. The
+# pvrsrvkm module must be insmoded before attempting to get the es rev.
+
+machine_id() { # return the machine ID
+	awk 'BEGIN { FS=": " } /Hardware/ \
+		{ gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
+}
+
+if [ "$(machine_id)" = "ti8168evm" ] ; then
+	CPUTYPE=TI816x
+elif [ "$(machine_id)" = "am335xevm" ] ; then
+	CPUTYPE=TI33XX
+else
+	CPUTYPE=$(devmem 0x4800244c | sed -e 's/0x00005C00/OMAP3503/' \
+	                                  -e 's/0x00001C00/OMAP3515/' \
+	                                  -e 's/0x00004C00/OMAP3525/' \
+	                                  -e 's/0x00000C00/OMAP3530/' \
+	                                  -e 's/0x00005E00/OMAP3503/' \
+	                                  -e 's/0x00001E00/OMAP3515/' \
+	                                  -e 's/0x00004E00/OMAP3525/' \
+	                                  -e 's/0x00000E00/OMAP3530/' \
+	                                  -e 's/0x00000CC0/OMAP3530/' )
+	if [[ "$(echo $CPUTYPE | grep OMAP)" == "" ]]; then
+		echo "Unable to determine CPU type"
+		exit 1
+	fi
+fi
+
+case $CPUTYPE in
+"OMAP3530")
+	devmem 0x48004B48 w 0x2
+	devmem 0x48004B10 w 0x1
+	devmem 0x48004B00 w 0x2
+
+	ES_REVISION="$(devmem 0x50000014 | sed -e s:0x00010205:5: \
+		-e s:0x00010201:3: -e s:0x00010003:2:)"
+	;;
+"TI33XX")
+	devmem 0x44e01104 w 0x0
+	devmem 0x44e00904 w 0x2
+
+	ES_REVISION="$(devmem 0x56000014 | sed -e s:0x00010205:8:)"
+	;;
+"TI816x")
+	devmem 0x48180F04 w 0x0
+	devmem 0x48180900 w 0x2
+	devmem 0x48180920 w 0x2
+
+	ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
+	;;
+*)
+	echo Unable to determine SGX hardware
+	exit 2
+	;;
+esac
+
+echo $ES_REVISION
diff --git a/package/ti-gfx/glesv2.pc b/package/ti-gfx/glesv2.pc
new file mode 100644
index 0000000000..4c70aec9a5
--- /dev/null
+++ b/package/ti-gfx/glesv2.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: TI Graphics SDK implementation of OpenGL ESv2
+Version: 1.9.2188537
+Requires:
+Libs: -L${libdir} -lGLESv2 -lGLES_CM -lsrv_um -lusc -lEGL -lIMGegl
+Cflags: -I${includedir}/GLES2
diff --git a/package/ti-gfx/powervr.ini b/package/ti-gfx/powervr.ini
new file mode 100644
index 0000000000..8d2d853664
--- /dev/null
+++ b/package/ti-gfx/powervr.ini
@@ -0,0 +1,2 @@
+[default]
+WindowSystem=libpvrPVR2D_FRONTWSEGL.so
diff --git a/package/ti-gfx/ti-gfx-km_install_modules.patch b/package/ti-gfx/ti-gfx-km_install_modules.patch
new file mode 100644
index 0000000000..2cf6e81557
--- /dev/null
+++ b/package/ti-gfx/ti-gfx-km_install_modules.patch
@@ -0,0 +1,19 @@
+Patch to add modules_install target to the modules makefile.  This makes
+installation a little easier.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: ti-gfx-4_09_00_01/GFX_Linux_KM/Makefile
+===================================================================
+--- ti-gfx-4_09_00_01.orig/GFX_Linux_KM/Makefile	2013-03-07 11:00:11.000000000 -0600
++++ ti-gfx-4_09_00_01/GFX_Linux_KM/Makefile	2013-05-23 01:36:29.356676281 -0500
+@@ -479,6 +479,9 @@
+ all:
+ 	$(MAKE) -C $(KERNELDIR) M=`pwd` $*
+ 
++install:
++	$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install
++
+ clean:
+ 	@find . -name "*.o" -exec rm -r {} \;
+ 	@find . -name "*.ko" -exec rm -r {} \;
diff --git a/package/ti-gfx/ti-gfx-newclkapi.patch b/package/ti-gfx/ti-gfx-newclkapi.patch
new file mode 100644
index 0000000000..8f50c7ee12
--- /dev/null
+++ b/package/ti-gfx/ti-gfx-newclkapi.patch
@@ -0,0 +1,143 @@
+This patch adjusts the omap3630 portion of the powervr driver to use the new
+clk kernel api.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+----
+Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
+===================================================================
+--- ti-gfx-4_09_00_01.orig/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c	2013-06-28 13:44:06.352701522 -0500
++++ ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c	2013-06-28 13:45:12.364702727 -0500
+@@ -153,6 +153,49 @@
+ 	psTimingInfo->ui32ActivePowManLatencyms = SYS_SGX_ACTIVE_POWER_LATENCY_MS;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
++int clk_disable_unprepare(struct clk *clk)
++{
++	return clk_disable(clk);
++}
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
++int clk_disable_unprepare(struct clk *clk)
++{
++	res = clk_disable(clk);
++	if (res < 0)
++		return res;
++
++	res = clk_unprepare(clk);
++	if (ret < 0)
++		return res;
++
++	return 0;
++}
++#endif
++
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
++int clk_prepare_enable(struct clk *clk)
++{
++	return clk_enable(clk);
++}
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
++int clk_prepare_enable(struct clk *clk)
++{
++	res = clk_prepare(clk);
++	if (ret < 0)
++		return res;
++
++	res = clk_enable(clk);
++	if (res < 0) {
++		clk_unprepare(clk);
++		return res;
++	}
++
++	return 0;
++}
++#endif
++
+ PVRSRV_ERROR EnableSGXClocks(SYS_DATA *psSysData)
+ {
+ #if !defined(NO_HARDWARE)
+@@ -167,19 +210,19 @@
+ 
+ 	PVR_DPF((PVR_DBG_MESSAGE, "EnableSGXClocks: Enabling SGX Clocks"));
+ 	
+-	res=clk_enable(psSysSpecData->psSGX_FCK);
++	res=clk_prepare_enable(psSysSpecData->psSGX_FCK);
+ 	if (res < 0)
+         {
+                 PVR_DPF((PVR_DBG_ERROR, "EnableSGXClocks: Couldn't enable SGX functional clock (%d)", res));
+                 return PVRSRV_ERROR_UNABLE_TO_ENABLE_CLOCK;
+         }
+ 
+-	res=clk_enable(psSysSpecData->psSGX_ICK);
++	res=clk_prepare_enable(psSysSpecData->psSGX_ICK);
+         if (res < 0)
+         {
+                 PVR_DPF((PVR_DBG_ERROR, "EnableSGXClocks: Couldn't enable SGX interface clock (%d)", res));
+ 
+-                clk_disable(psSysSpecData->psSGX_FCK);
++                clk_disable_unprepare(psSysSpecData->psSGX_FCK);
+                 return PVRSRV_ERROR_UNABLE_TO_ENABLE_CLOCK;
+         }
+ 
+@@ -233,7 +276,6 @@
+ 	return PVRSRV_OK;
+ }
+ 
+-
+ IMG_VOID DisableSGXClocks(SYS_DATA *psSysData)
+ {
+ #if !defined(NO_HARDWARE)
+@@ -246,9 +288,9 @@
+ 	
+ 	PVR_DPF((PVR_DBG_MESSAGE, "DisableSGXClocks: Disabling SGX Clocks"));
+ 	
+-	clk_disable(psSysSpecData->psSGX_FCK);
++	clk_disable_unprepare(psSysSpecData->psSGX_FCK);
+ 
+-	clk_disable(psSysSpecData->psSGX_ICK);
++	clk_disable_unprepare(psSysSpecData->psSGX_ICK);
+ 
+ //	SysDisableSGXInterrupts(psSysData);
+ 
+@@ -374,14 +416,14 @@
+ 	rate = clk_get_rate(psSysSpecData->psGPT11_FCK);
+ 	PVR_TRACE(("GPTIMER11 clock is %dMHz", HZ_TO_MHZ(rate)));
+ 
+-	res = clk_enable(psSysSpecData->psGPT11_FCK);
++	res = clk_prepare_enable(psSysSpecData->psGPT11_FCK);
+ 	if (res < 0)
+ 	{
+ 		PVR_DPF((PVR_DBG_ERROR, "EnableSystemClocks: Couldn't enable GPTIMER11 functional clock (%d)", res));
+ 		goto ExitError;
+ 	}
+ 
+-	res = clk_enable(psSysSpecData->psGPT11_ICK);
++	res = clk_prepare_enable(psSysSpecData->psGPT11_ICK);
+ 	if (res < 0)
+ 	{
+ 		PVR_DPF((PVR_DBG_ERROR, "EnableSystemClocks: Couldn't enable GPTIMER11 interface clock (%d)", res));
+@@ -444,9 +486,9 @@
+ 
+ ExitDisableGPT11ICK:
+ #if defined(PVR_OMAP3_TIMING_PRCM)
+-	clk_disable(psSysSpecData->psGPT11_ICK);
++	clk_disable_unprepare(psSysSpecData->psGPT11_ICK);
+ ExitDisableGPT11FCK:
+-	clk_disable(psSysSpecData->psGPT11_FCK);
++	clk_disable_unprepare(psSysSpecData->psGPT11_FCK);
+ ExitError:
+ #endif	
+ 	eError = PVRSRV_ERROR_CLOCK_REQUEST_FAILED;
+@@ -490,9 +532,9 @@
+ #endif
+ 
+ #if defined(PVR_OMAP3_TIMING_PRCM)
+-	clk_disable(psSysSpecData->psGPT11_ICK);
++	clk_disable_unprepare(psSysSpecData->psGPT11_ICK);
+ 
+-	clk_disable(psSysSpecData->psGPT11_FCK);
++	clk_disable_unprepare(psSysSpecData->psGPT11_FCK);
+ #endif	
+ }
+ #endif	
diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk
new file mode 100644
index 0000000000..0838bde18e
--- /dev/null
+++ b/package/ti-gfx/ti-gfx.mk
@@ -0,0 +1,199 @@
+###############################################################################
+#
+# ti-gfx
+#
+###############################################################################
+
+TI_GFX_VERSION = 4_09_00_01
+TI_GFX_SO_VERSION = 1.9.2188537
+
+ifeq ($(BR2_PACKAGE_TI_GFX_HARD_FLOAT),y)
+TI_GFX_SOURCE = Graphics_SDK_setuplinux_$(TI_GFX_VERSION)_hardfp_minimal_demos.bin
+else
+TI_GFX_SOURCE = Graphics_SDK_setuplinux_$(TI_GFX_VERSION)_minimal_demos.bin
+endif
+
+TI_GFX_SITE = http://downloads.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/$(TI_GFX_VERSION)/exports/
+TI_GFX_LICENSE = Technology / Software Publicly Available
+TI_GFX_LICENSE_FILES = TSPA.txt
+TI_GFX_INSTALL_STAGING = YES
+
+TI_GFX_DEPENDENCIES = linux
+
+ifeq ($(BR2_PACKAGE_TI_GFX_ES3),y)
+TI_GFX_OMAPES = 3.x
+TI_GFX_PLATFORM = omap3
+endif
+ifeq ($(BR2_PACKAGE_TI_GFX_ES5),y)
+TI_GFX_OMAPES = 5.x
+TI_GFX_PLATFORM = omap3630
+endif
+ifeq ($(BR2_PACKAGE_TI_GFX_ES6),y)
+TI_GFX_OMPAES = 6.x
+TI_GFX_PLATFORM = ti81xx
+endif
+ifeq ($(BR2_PACKAGE_TI_GFX_ES8),y)
+TI_GFX_OMAPES = 8.x
+TI_GFX_PLATFORM = ti335x
+endif
+
+ifeq ($(BR2_PACKAGE_TI_GFX_DEBUG),y)
+TI_GFX_DEBUG_LIB = dbg
+TI_GFX_DEBUG_KM = debug
+else
+TI_GFX_DEBUG_LIB = rel
+TI_GFX_DEBUG_KM = release
+endif
+
+TI_GFX_BIN_PATH = gfx_$(TI_GFX_DEBUG_LIB)_es$(TI_GFX_OMAPES)
+
+TI_GFX_KM_MAKE_OPTS = \
+	$(LINUX_MAKE_FLAGS) \
+	BUILD=$(TI_GFX_DEBUG_KM) \
+	TI_PLATFORM=$(TI_GFX_PLATFORM) \
+	OMAPES=$(TI_GFX_OMAPES) \
+	SUPPORT_XORG=0 \
+	KERNELDIR=$(LINUX_DIR)
+
+TI_GFX_DEMO_MAKE_OPTS = \
+	PLATFORM=LinuxARMV7 \
+	X11BUILD=0 \
+	PLAT_CC="$(TARGET_CC)" \
+	PLAT_CPP="$(TARGET_CXX)" \
+	PLAT_AR="$(TARGET_AR)"
+
+# The only required binary is pvrsrvctl all others are optional
+TI_GFX_BIN = pvrsrvctl
+
+ifeq ($(BR2_PACKAGE_TI_GFX_DEBUG),y)
+TI_GFX_BIN += \
+	eglinfo ews_server ews_server_es2 ews_test_gles1 ews_test_gles2 \
+	ews_test_swrender gles1test1 gles2test1 pvr2d_test services_test \
+	sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test \
+	sgx_render_flip_test xeglinfo xgles1test1 xgles2test1 xmultiegltest
+endif
+
+TI_GFX_LIBS = \
+	libews libpvr2d libpvrEWS_WSEGL libpvrPVR2D_BLITWSEGL libpvrPVR2D_DRIWSEGL \
+	libpvrPVR2D_FLIPWSEGL libpvrPVR2D_FRONTWSEGL libpvrPVR2D_LINUXFBWSEGL \
+	libPVRScopeServices libsrv_init libsrv_um libusc pvr_drv
+
+TI_GFX_EGLIMAGE_LIBS = \
+	libEGL libGLES_CM libGLESv2 libglslcompiler libIMGegl
+
+TI_GFX_DEMOS = ChameleonMan MagicLantern
+TI_GFX_DEMOS_LOC = GFX_Linux_SDK/OGLES2/SDKPackage/Demos
+TI_GFX_DEMOS_MAKE_LOC = OGLES2/Build/LinuxGeneric
+TI_GFX_DEMOS_BIN_LOC = OGLES2/Build/LinuxARMV7/ReleaseRaw/
+
+TI_GFX_HDR_DIRS = OGLES2/EGL OGLES2/EWS OGLES2/GLES2 OGLES2/KHR \
+	OGLES/GLES bufferclass_ti/ pvr2d/ wsegl/
+
+define TI_GFX_EXTRACT_CMDS
+	$(RM) -rf $(TI_GFX_DIR)
+	chmod +x $(DL_DIR)/$(TI_GFX_SOURCE)
+	printf "Y\nY\n qY\n\n" | $(DL_DIR)/$(TI_GFX_SOURCE) \
+		--prefix $(@D) \
+		--mode console
+endef
+
+define TI_GFX_BUILD_KM_CMDS
+	$(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM all
+endef
+
+ifeq ($(BR2_PACKAGE_TI_GFX_DEMOS),y)
+define TI_GFX_BUILD_DEMO_CMDS
+	$(foreach demo, $(TI_GFX_DEMOS), \
+		$(TARGET_MAKE_ENV) $(MAKE1) -C \
+			$(@D)/$(TI_GFX_DEMOS_LOC)/$(demo)/$(TI_GFX_DEMOS_MAKE_LOC) \
+			$(TI_GFX_DEMO_MAKE_OPTS) all
+	)
+endef
+endif
+
+define TI_GFX_BUILD_CMDS
+	$(TI_GFX_BUILD_KM_CMDS)
+	$(TI_GFX_BUILD_DEMO_CMDS)
+endef
+
+# Install libs
+# argument 1 is the location to install to (e.g. STAGING_DIR, TARGET_DIR)
+define TI_GFX_INSTALL_LIBS
+	$(foreach lib,$(TI_GFX_LIBS),
+		$(INSTALL) -D -m 0644 $(@D)/$(TI_GFX_BIN_PATH)/$(lib).so \
+			$(1)/usr/lib/$(lib).so.$(TI_GFX_SO_VERSION); \
+		ln -sf $(lib).so.$(TI_GFX_SO_VERSION) \
+			$(1)/usr/lib/$(lib).so
+	)
+	$(foreach lib,$(TI_GFX_EGLIMAGE_LIBS),
+		$(if $(BR2_PACKAGE_TI_GFX_EGLIMAGE),
+			$(INSTALL) -D -m 0644 $(@D)/$(TI_GFX_BIN_PATH)/$(lib)_eglimage.so \
+				$(1)/usr/lib/$(lib).so.$(TI_GFX_SO_VERSION);
+		,
+			$(INSTALL) -D -m 0644 $(@D)/$(TI_GFX_BIN_PATH)/$(lib).so \
+				$(1)/usr/lib/$(lib).so.$(TI_GFX_SO_VERSION);
+		)
+		ln -sf $(lib).so.$(TI_GFX_SO_VERSION) \
+			$(1)/usr/lib/$(lib).so
+	)
+endef
+
+define TI_GFX_INSTALL_STAGING_CMDS
+	$(foreach incdir,$(TI_GFX_HDR_DIRS),
+		$(INSTALL) -d $(STAGING_DIR)/usr/include/$(notdir $(incdir)); \
+		$(INSTALL) -D -m 0644 $(@D)/include/$(incdir)/*.h \
+			$(STAGING_DIR)/usr/include/$(notdir $(incdir))/
+	)
+	$(call TI_GFX_INSTALL_LIBS,$(STAGING_DIR))
+
+	$(INSTALL) -D -m 0644 package/ti-gfx/egl.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
+	$(INSTALL) -D -m 0644 package/ti-gfx/glesv2.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc
+endef
+
+define TI_GFX_INSTALL_KM_CMDS
+	$(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM install
+endef
+
+define TI_GFX_INSTALL_BINS_CMDS
+	$(foreach bin,$(TI_GFX_BIN),
+		$(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/$(bin) \
+			$(TARGET_DIR)/usr/bin/$(bin)
+	)
+	$(if $(BR2_PACKAGE_TI_GFX_DEBUG),
+		$(INSTALL) -D -m 0755 package/ti-gfx/esrev.sh \
+			$(TARGET_DIR)/usr/sbin/esrev
+	)
+endef
+
+define TI_GFX_INSTALL_CONF_CMDS
+	# libs use the following file for configuration.
+	$(INSTALL) -D -m 0644 package/ti-gfx/powervr.ini \
+		$(TARGET_DIR)/etc/powervr.ini
+endef
+
+ifeq ($(BR2_PACKAGE_TI_GFX_DEMOS),y)
+define TI_GFX_INSTALL_DEMOS_CMDS
+	$(foreach demo,$(TI_GFX_DEMOS),
+		$(INSTALL) -D -m 0755 \
+		$(@D)/$(TI_GFX_DEMOS_LOC)/$(demo)/$(TI_GFX_DEMOS_BIN_LOC)/OGLES2$(demo) \
+		$(TARGET_DIR)/usr/bin/OGLES2$(demo)
+	)
+endef
+endif
+
+define TI_GFX_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/ti-gfx/S80ti-gfx \
+		$(TARGET_DIR)/etc/init.d/S80ti-gfx
+endef
+
+define TI_GFX_INSTALL_TARGET_CMDS
+	$(TI_GFX_INSTALL_KM_CMDS)
+	$(TI_GFX_INSTALL_BINS_CMDS)
+	$(call TI_GFX_INSTALL_LIBS,$(TARGET_DIR))
+	$(TI_GFX_INSTALL_CONF_CMDS)
+	$(TI_GFX_INSTALL_DEMOS_CMDS)
+endef
+
+$(eval $(generic-package))

From 3c71b90ce3fb5782a36bcca28f7cffae670352ed Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Mon, 15 Jul 2013 16:44:20 -0500
Subject: [PATCH 5685/6849] qt: add powervr and opengl

Use the following to test:
/usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sundareson, Prabindh <prabu@ti.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Sinan Akpolat <sinan@linkas.com.tr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.gfx.in                |   5 +
 package/qt/Config.in                    |   8 +
 package/qt/powervr.ini                  |   2 +
 package/qt/qt-eglwsegl-use-system.patch | 802 ++++++++++++++++++++++++
 package/qt/qt.mk                        |  29 +-
 5 files changed, 845 insertions(+), 1 deletion(-)
 create mode 100644 package/qt/powervr.ini
 create mode 100644 package/qt/qt-eglwsegl-use-system.patch

diff --git a/package/qt/Config.gfx.in b/package/qt/Config.gfx.in
index dc706657dd..70adeef2ff 100644
--- a/package/qt/Config.gfx.in
+++ b/package/qt/Config.gfx.in
@@ -23,4 +23,9 @@ config BR2_PACKAGE_QT_GFX_DIRECTFB
 	depends on BR2_PACKAGE_DIRECTFB
 	bool "directFB"
 
+config BR2_PACKAGE_QT_GFX_POWERVR
+	depends on BR2_PACKAGE_QT_OPENGL_ES
+	depends on BR2_PACKAGE_HAS_POWERVR
+	bool "powervr"
+
 endmenu
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 9f6e54dff3..35e8208b5c 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -281,6 +281,14 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 	help
 	  Build the platform Phonon plugin.
 	  If unsure, say n.
+
+config BR2_PACKAGE_QT_OPENGL_ES
+	bool "OpenGL ES v2.x support"
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	help
+	  Enable the OpenGL ES v2.x support.
+
 endif
 
 config BR2_PACKAGE_QT_DBUS
diff --git a/package/qt/powervr.ini b/package/qt/powervr.ini
new file mode 100644
index 0000000000..57863ebc44
--- /dev/null
+++ b/package/qt/powervr.ini
@@ -0,0 +1,2 @@
+[default]
+WindowSystem=libpvrQWSWSEGL.so.1
diff --git a/package/qt/qt-eglwsegl-use-system.patch b/package/qt/qt-eglwsegl-use-system.patch
new file mode 100644
index 0000000000..cb3038138f
--- /dev/null
+++ b/package/qt/qt-eglwsegl-use-system.patch
@@ -0,0 +1,802 @@
+Patch to remove obsolete powervr headers and instead use the headers provided
+on the system.
+
+Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
+---
+Index: qt-4.8.5/src/3rdparty/powervr/pvr2d.h
+===================================================================
+--- qt-4.8.5.orig/src/3rdparty/powervr/pvr2d.h	2013-07-08 11:24:33.010516867 -0500
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,502 +0,0 @@
+-/*!****************************************************************************
+-@File          pvr2d.h
+-@Title         PVR2D external header file
+-@Author        Imagination Technologies
+-@Copyright     Copyright (c) by Imagination Technologies Limited.
+-				This specification is protected by copyright laws and contains
+-				material proprietary to Imagination Technologies Limited.
+-				You may use and distribute this specification free of charge for implementing
+-				the functionality therein, without altering or removing any trademark, copyright,
+-				or other notice from the specification.
+-@Platform      Generic
+-@Description   PVR2D definitions for PVR2D clients
+-******************************************************************************/
+-
+-
+-/******************************************************************************
+-Modifications :-
+-$Log: pvr2d.h $
+-******************************************************************************/
+-
+-#ifndef _PVR2D_H_
+-#define _PVR2D_H_
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/* PVR2D Platform-specific definitions */
+-#define PVR2D_EXPORT
+-#define PVR2D_IMPORT
+-
+-
+-#define PVR2D_REV_MAJOR		2
+-#define PVR2D_REV_MINOR		1
+-
+-typedef enum
+-{
+-	PVR2D_FALSE = 0,
+-	PVR2D_TRUE
+-} PVR2D_BOOL;
+-
+-
+-/* error codes */
+-typedef enum
+-{
+-	PVR2D_OK = 0,
+-	PVR2DERROR_INVALID_PARAMETER = -1,
+-	PVR2DERROR_DEVICE_UNAVAILABLE = -2,
+-	PVR2DERROR_INVALID_CONTEXT = -3,
+-	PVR2DERROR_MEMORY_UNAVAILABLE = -4,
+-	PVR2DERROR_DEVICE_NOT_PRESENT = -5,
+-	PVR2DERROR_IOCTL_ERROR = -6,
+-	PVR2DERROR_GENERIC_ERROR = -7,
+-	PVR2DERROR_BLT_NOTCOMPLETE = -8,
+-	PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9,
+-	PVR2DERROR_NOT_YET_IMPLEMENTED = -10,
+-	PVR2DERROR_MAPPING_FAILED = -11
+-}PVR2DERROR;
+-
+-
+-/* pixel formats */
+-typedef enum
+-{
+-	PVR2D_1BPP = 0,
+-	PVR2D_RGB565,
+-	PVR2D_ARGB4444,
+-	PVR2D_RGB888,
+-	PVR2D_ARGB8888,
+-	PVR2D_ARGB1555,
+-	PVR2D_ALPHA8,
+-	PVR2D_ALPHA4,
+-	PVR2D_PAL2,
+-	PVR2D_PAL4,
+-	PVR2D_PAL8,
+-	PVR2D_VGAEMU
+-
+-}PVR2DFORMAT;
+-
+-
+-/* wrap surface type */
+-typedef enum
+-{
+-	PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,
+-	PVR2D_WRAPFLAG_CONTIGUOUS = 1,
+-
+-}PVR2DWRAPFLAGS;
+-
+-/* flags for control information of additional blits */
+-typedef enum
+-{
+-	PVR2D_BLIT_DISABLE_ALL					= 0x0000,	/* disable all additional controls */
+-	PVR2D_BLIT_CK_ENABLE					= 0x0001,	/* enable colour key */
+-	PVR2D_BLIT_GLOBAL_ALPHA_ENABLE			= 0x0002,	/* enable standard global alpha */
+-	PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE	= 0x0004,	/* enable per-pixel alpha bleding */
+-	PVR2D_BLIT_PAT_SURFACE_ENABLE			= 0x0008,	/* enable pattern surf (disable fill) */
+-	PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE	= 0x0010,	/* enable fully specified alpha */
+-	PVR2D_BLIT_ROT_90						= 0x0020,	/* apply 90 degree rotation to the blt */
+-	PVR2D_BLIT_ROT_180						= 0x0040,	/* apply 180 degree rotation to the blt */
+-	PVR2D_BLIT_ROT_270						= 0x0080,	/* apply 270 degree rotation to the blt */
+-	PVR2D_BLIT_COPYORDER_TL2BR				= 0x0100,	/* copy order overrides */
+-	PVR2D_BLIT_COPYORDER_BR2TL				= 0x0200,
+-	PVR2D_BLIT_COPYORDER_TR2BL				= 0x0400,
+-	PVR2D_BLIT_COPYORDER_BL2TR				= 0x0800,
+-	PVR2D_BLIT_COLKEY_SOURCE				= 0x1000,	/* Key colour is on the source surface */
+-	PVR2D_BLIT_COLKEY_DEST					= 0x2000	/* Key colour is on the destination surface */
+-
+-} PVR2DBLITFLAGS;
+-
+-/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */
+-typedef enum
+-{
+-	PVR2D_ALPHA_OP_SRC_DSTINV = 1,	/* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */
+-	PVR2D_ALPHA_OP_SRCP_DSTINV = 2	/* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */
+-} PVR2D_ALPHABLENDFUNC;
+-
+-/* blend ops for fully specified alpha */
+-typedef enum
+-{
+-	PVR2D_BLEND_OP_ZERO = 0,
+-	PVR2D_BLEND_OP_ONE = 1,
+-	PVR2D_BLEND_OP_SRC = 2,
+-	PVR2D_BLEND_OP_DST = 3,
+-	PVR2D_BLEND_OP_GLOBAL = 4,
+-	PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5,
+-	PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6
+-}PVR2D_BLEND_OP;
+-
+-
+-typedef void* PVR2D_HANDLE;
+-
+-
+-/* Fully specified alpha blend :	pAlpha field of PVR2DBLTINFO structure					*/
+-/* a fully specified Alpha Blend operation is defined as									*/
+-/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA))							*/
+-/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB))								*/
+-/* if the pre-multiplication stage is enabled then the equations become the following:		*/
+-/* PRE_MUL     = ((SRC(A)) * (Global Alpha Value))											*/
+-/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA))							*/
+-/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB))								*/
+-/* if the transparent source alpha stage is enabled then a source alpha of zero forces the	*/
+-/* source to be transparent for that pixel regardless of the blend equation being used.		*/
+-typedef struct _PVR2D_ALPHABLT
+-{
+-	PVR2D_BLEND_OP	eAlpha1;
+-	PVR2D_BOOL		bAlpha1Invert;
+-	PVR2D_BLEND_OP	eAlpha2;
+-	PVR2D_BOOL		bAlpha2Invert;
+-	PVR2D_BLEND_OP	eAlpha3;
+-	PVR2D_BOOL		bAlpha3Invert;
+-	PVR2D_BLEND_OP	eAlpha4;
+-	PVR2D_BOOL		bAlpha4Invert;
+-	PVR2D_BOOL		bPremulAlpha;			/* enable pre-multiplication stage */
+-	PVR2D_BOOL		bTransAlpha;			/* enable transparent source alpha stage */
+-	PVR2D_BOOL		bUpdateAlphaLookup;		/* enable and update the 1555-Lookup alpha table */
+-	unsigned char	uAlphaLookup0;			/* 8 bit alpha when A=0 in a 1555-Lookup surface */
+-	unsigned char	uAlphaLookup1;			/* 8 bit alpha when A=1 in a 1555-Lookup surface */
+-	unsigned char	uGlobalRGB;				/* Global Alpha Value for RGB, 0=transparent 255=opaque */
+-	unsigned char	uGlobalA;				/* Global Alpha Value for Alpha */
+-
+-} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT;
+-
+-
+-/* surface memory info structure */
+-typedef struct _PVR2DMEMINFO
+-{
+-	void				*pBase;
+-	unsigned long		ui32MemSize;
+-	unsigned long		ui32DevAddr;
+-	unsigned long		ulFlags;
+-	void				*hPrivateData;
+-	void				*hPrivateMapData;
+-
+-}PVR2DMEMINFO, *PPVR2DMEMINFO;
+-
+-
+-#define PVR2D_MAX_DEVICE_NAME 20
+-
+-typedef struct _PVR2DDEVICEINFO
+-{
+-	unsigned long	ulDevID;
+-	char			szDeviceName[PVR2D_MAX_DEVICE_NAME];
+-}PVR2DDEVICEINFO;
+-
+-
+-typedef struct _PVR2DISPLAYINFO
+-{
+-	unsigned long	ulMaxFlipChains;
+-	unsigned long	ulMaxBuffersInChain;
+-	PVR2DFORMAT		eFormat;
+-	unsigned long	ulWidth;
+-	unsigned long	ulHeight;
+-	long			lStride;
+-	unsigned long	ulMinFlipInterval;
+-	unsigned long	ulMaxFlipInterval;
+-
+-}PVR2DDISPLAYINFO;
+-
+-
+-typedef struct _PVR2DBLTINFO
+-{
+-	unsigned long	CopyCode;			/* rop code  */
+-	unsigned long	Colour;				/* fill colour */
+-	unsigned long	ColourKey;			/* colour key */
+-	unsigned char	GlobalAlphaValue;	/* global alpha blending */
+-	unsigned char	AlphaBlendingFunc;	/* per-pixel alpha-blending function */
+-
+-	PVR2DBLITFLAGS	BlitFlags;			/* additional blit control information */
+-
+-	PVR2DMEMINFO	*pDstMemInfo;		/* destination memory */
+-	unsigned long	DstOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */
+-	long			DstStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
+-	long			DstX, DstY;			/* pixel offset from start of dest surface to start of blt rectangle */
+-	long			DSizeX,DSizeY;		/* blt size */
+-	PVR2DFORMAT		DstFormat;			/* dest format */
+-	unsigned long	DstSurfWidth;		/* size of dest surface in pixels */
+-	unsigned long	DstSurfHeight;		/* size of dest surface in pixels */
+-
+-	PVR2DMEMINFO	*pSrcMemInfo;		/* source mem, (source fields are also used for patterns) */
+-	unsigned long	SrcOffset;			/* byte offset from start of allocation to src/pat surface pixel 0,0 */
+-	long			SrcStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
+-	long			SrcX, SrcY;			/* pixel offset from start of surface to start of source rectangle */
+-										/* for patterns this is the start offset within the pattern */
+-	long			SizeX,SizeY;		/* source rectangle size or pattern size in pixels */
+-	PVR2DFORMAT		SrcFormat;			/* source/pattern format */
+-	PVR2DMEMINFO	*pPalMemInfo;		/* source/pattern palette memory containing argb8888 colour table */
+-	unsigned long	PalOffset;			/* byte offset from start of allocation to start of palette */
+-	unsigned long	SrcSurfWidth;		/* size of source surface in pixels */
+-	unsigned long	SrcSurfHeight;		/* size of source surface in pixels */
+-
+-	PVR2DMEMINFO	*pMaskMemInfo;		/* mask memory, 1bpp format implied */
+-	unsigned long	MaskOffset;			/* byte offset from start of allocation to mask surface pixel 0,0 */
+-	long			MaskStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
+-	long			MaskX, MaskY;		/* mask rect top left (mask size = blt size) */
+-	unsigned long	MaskSurfWidth;		/* size of mask surface in pixels */
+-	unsigned long	MaskSurfHeight;		/* size of mask surface in pixels */
+-	
+-	PPVR2D_ALPHABLT pAlpha;				/* fully specified alpha blend */
+-
+-}PVR2DBLTINFO, *PPVR2DBLTINFO;
+-
+-typedef struct _PVR2DRECT
+-{
+-	long left, top;
+-	long right, bottom;
+-} PVR2DRECT;
+-
+-typedef struct
+-{
+-	PVR2DMEMINFO	*pSurfMemInfo;		/* surface memory */
+-	unsigned long	SurfOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */
+-	long			Stride;				/* signed stride */
+-	PVR2DFORMAT		Format;
+-	unsigned long	SurfWidth;			/* surface size in pixels */
+-	unsigned long	SurfHeight;
+-
+-} PVR2D_SURFACE, *PPVR2D_SURFACE;
+-
+-typedef struct
+-{
+-	unsigned long	*pUseCode;					/* USSE code */
+-	unsigned long	UseCodeSize;				/* usse code size in bytes */
+-
+-} PVR2D_USECODE, *PPVR2D_USECODE;
+-
+-typedef struct
+-{
+-	PVR2D_SURFACE			sDst;				/* destination surface */
+-	PVR2D_SURFACE			sSrc;				/* source surface */
+-	PVR2DRECT				rcDest;				/* destination rectangle */
+-	PVR2DRECT				rcSource;			/* source rectangle */
+-	PVR2D_HANDLE			hUseCode;			/* custom USE code (NULL implies source copy) */
+-	unsigned long			UseParams[2];		/* per-blt params for use code */
+-
+-} PVR2D_3DBLT, *PPVR2D_3DBLT;
+-
+-
+-#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz)
+-
+-typedef void* PVR2DCONTEXTHANDLE;
+-typedef void* PVR2DFLIPCHAINHANDLE;
+-
+-
+-// CopyCode field of PVR2DBLTINFO structure:
+-// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code.
+-// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern
+-// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask
+-// common rop3 codes are defined below
+-// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0
+-// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour.
+-// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used.
+-// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs.
+-// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3
+-// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's
+-// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0
+-#define PVR2DROP4(rop3b, rop3a)			((rop3b<<8)|rop3a)
+-
+-/* common rop codes */
+-#define PVR2DROPclear				0x00       /* 0 (whiteness) */
+-#define PVR2DROPset					0xFF       /* 1 (blackness) */
+-#define PVR2DROPnoop				0xAA       /* dst (used for masked blts) */
+-
+-/* source and  dest rop codes */
+-#define PVR2DROPand					0x88       /* src AND dst */
+-#define PVR2DROPandReverse			0x44       /* src AND NOT dst */
+-#define PVR2DROPcopy				0xCC       /* src (used for source copy and alpha blts) */
+-#define PVR2DROPandInverted			0x22       /* NOT src AND dst */
+-#define PVR2DROPxor					0x66       /* src XOR dst */
+-#define PVR2DROPor					0xEE       /* src OR dst */
+-#define PVR2DROPnor					0x11       /* NOT src AND NOT dst */
+-#define PVR2DROPequiv				0x99       /* NOT src XOR dst */
+-#define PVR2DROPinvert				0x55       /* NOT dst */
+-#define PVR2DROPorReverse			0xDD       /* src OR NOT dst */
+-#define PVR2DROPcopyInverted		0x33       /* NOT src */
+-#define PVR2DROPorInverted			0xBB       /* NOT src OR dst */
+-#define PVR2DROPnand				0x77       /* NOT src OR NOT dst */
+-
+-/* pattern rop codes */
+-#define PVR2DPATROPand				0xA0       /* pat AND dst */
+-#define PVR2DPATROPandReverse		0x50       /* pat AND NOT dst */
+-#define PVR2DPATROPcopy				0xF0       /* pat (used for solid color fills and pattern blts) */
+-#define PVR2DPATROPandInverted		0x0A       /* NOT pat AND dst */
+-#define PVR2DPATROPxor				0x5A       /* pat XOR dst */
+-#define PVR2DPATROPor				0xFA       /* pat OR dst */
+-#define PVR2DPATROPnor				0x05       /* NOT pat AND NOT dst */
+-#define PVR2DPATROPequiv			0xA5       /* NOT pat XOR dst */
+-#define PVR2DPATROPinvert			0x55       /* NOT dst */
+-#define PVR2DPATROPorReverse		0xF5       /* pat OR NOT dst */
+-#define PVR2DPATROPcopyInverted		0x0F       /* NOT pat */
+-#define PVR2DPATROPorInverted		0xAF       /* NOT pat OR dst */
+-#define PVR2DPATROPnand				0x5F       /* NOT pat OR NOT dst */
+-
+-/* common rop4 codes */
+-#define PVR2DROP4MaskedCopy              PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy)		/* masked source copy blt (used for rounded window corners etc) */
+-#define PVR2DROP4MaskedFill              PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy)	/* masked colour fill blt (used for text) */
+-
+-/* Legacy support */
+-#define PVR2DROP3_PATMASK			PVR2DPATROPcopy
+-#define PVR2DROP3_SRCMASK			PVR2DROPcopy
+-
+-/* pixmap memory alignment */
+-#define PVR2D_ALIGNMENT_4			4			/* DWORD alignment */
+-#define PVR2D_ALIGNMENT_ANY			0			/* no alignment    */
+-#define PVR2D_ALIGNMENT_PALETTE		16			/* 16 byte alignment is required for palettes */
+-
+-/* Heap number for PVR2DGetFrameBuffer */
+-#define PVR2D_FB_PRIMARY_SURFACE 0
+-
+-#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE	(1 << 0)
+-#define PVR2D_PRESENT_PROPERTY_DSTSIZE		(1 << 1)
+-#define PVR2D_PRESENT_PROPERTY_DSTPOS		(1 << 2)
+-#define PVR2D_PRESENT_PROPERTY_CLIPRECTS	(1 << 3)
+-#define PVR2D_PRESENT_PROPERTY_INTERVAL		(1 << 4)
+-
+-
+-#define PVR2D_CREATE_FLIPCHAIN_SHARED		(1 << 0)
+-#define PVR2D_CREATE_FLIPCHAIN_QUERY		(1 << 1)
+-
+-/* Functions that the library exports */
+-
+-PVR2D_IMPORT
+-int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DCreateDeviceContext(unsigned long ulDevID,
+-									PVR2DCONTEXTHANDLE* phContext,
+-									unsigned long ulFlags);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext,
+-							  PVR2DDISPLAYINFO *pDisplayInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext,
+-							  PVR2DFORMAT *pFormat,
+-							  long *plWidth,
+-							  long *plHeight,
+-							  long *plStride,
+-							  int *piRefreshRate);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext,
+-							   int nHeap,
+-							   PVR2DMEMINFO **ppsMemInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext,
+-						 unsigned long ulBytes,
+-						 unsigned long ulAlign,
+-						 unsigned long ulFlags,
+-						 PVR2DMEMINFO **ppsMemInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext,
+-						void *pMem,
+-						unsigned long ulFlags,
+-						unsigned long ulBytes,
+-						unsigned long alPageAddress[],
+-						PVR2DMEMINFO **ppsMemInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext,
+-						unsigned long ulFlags,
+-						void *hPrivateMapData,
+-						PVR2DMEMINFO **ppsDstMem);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext,
+-						PVR2DMEMINFO *psMemInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext,
+-					PVR2DBLTINFO *pBltInfo);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext,
+-						   PVR2DBLTINFO *pBltInfo,
+-						   unsigned long ulNumClipRects,
+-						   PVR2DRECT *pClipRects);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext,
+-								   PVR2DMEMINFO *pMemInfo,
+-								   unsigned int uiWaitForComplete);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext,
+-										unsigned long ulPropertyMask,
+-										long lSrcStride,
+-										unsigned long ulDstWidth,
+-										unsigned long ulDstHeight,
+-										long lDstXPos,
+-										long lDstYPos,
+-										unsigned long ulNumClipRects,
+-										PVR2DRECT *pClipRects,
+-										unsigned long ulSwapInterval);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext,
+-						   PVR2DMEMINFO *pMemInfo,
+-						   long lRenderID);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext,
+-								unsigned long ulFlags,
+-								unsigned long ulNumBuffers,
+-								unsigned long ulWidth,
+-								unsigned long ulHeight,
+-								PVR2DFORMAT eFormat,
+-								long *plStride,
+-								unsigned long *pulFlipChainID,
+-								PVR2DFLIPCHAINHANDLE *phFlipChain);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext,
+-								 PVR2DFLIPCHAINHANDLE hFlipChain);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext,
+-									PVR2DFLIPCHAINHANDLE hFlipChain,
+-									unsigned long *pulNumBuffers,
+-									PVR2DMEMINFO *psMemInfo[]);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,
+-										 PVR2DFLIPCHAINHANDLE hFlipChain,
+-										 unsigned long ulPropertyMask,
+-										 long lDstXPos,
+-										 long lDstYPos,
+-										 unsigned long ulNumClipRects,
+-										 PVR2DRECT *pClipRects,
+-										 unsigned long ulSwapInterval);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext,
+-							PVR2DFLIPCHAINHANDLE hFlipChain,
+-							PVR2DMEMINFO *psMemInfo,
+-							long lRenderID);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DGetAPIRev(long *lRevMajor, long *lRevMinor);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const unsigned char	*pUseCode,
+-									const unsigned long UseCodeSize, PVR2D_HANDLE *pUseCodeHandle);
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle);
+-
+-PVR2D_IMPORT
+-PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D);
+-
+-#ifdef __cplusplus
+-}
+-#endif 
+-
+-#endif /* _PVR2D_H_ */
+-
+-/******************************************************************************
+- End of file (pvr2d.h)
+-******************************************************************************/
+Index: qt-4.8.5/src/3rdparty/powervr/wsegl.h
+===================================================================
+--- qt-4.8.5.orig/src/3rdparty/powervr/wsegl.h	2013-07-08 11:24:33.010516867 -0500
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,240 +0,0 @@
+-/******************************************************************************
+- Name         : wsegl.h
+- Copyright    :	Copyright (c) Imagination Technologies Limited.
+-				This specification is protected by copyright laws and contains
+-				material proprietary to Imagination Technologies Limited.
+-				You may use and distribute this specification free of charge for implementing
+-				the functionality therein, without altering or removing any trademark, copyright,
+-				or other notice from the specification.
+- Platform     : ANSI
+-*****************************************************************************/
+-
+-
+-#if !defined(__WSEGL_H__)
+-#define __WSEGL_H__
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif 
+-
+-/*
+-// WSEGL Platform-specific definitions
+-*/
+-#define WSEGL_EXPORT
+-#define WSEGL_IMPORT
+-
+-/*
+-// WSEGL API Version Number
+-*/
+-
+-#define WSEGL_VERSION 1
+-#define WSEGL_DEFAULT_DISPLAY 0
+-#define WSEGL_DEFAULT_NATIVE_ENGINE 0
+-
+-#define WSEGL_FALSE		0
+-#define WSEGL_TRUE		1
+-#define WSEGL_NULL		0
+-
+-#define	WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param)
+-
+-/*
+-// WSEGL handles
+-*/
+-typedef void *WSEGLDisplayHandle;
+-typedef void *WSEGLDrawableHandle;
+-
+-/*
+-// Display capability type
+-*/
+-typedef enum WSEGLCapsType_TAG
+-{
+-	WSEGL_NO_CAPS = 0,
+-	WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */
+-	WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */
+-	WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */
+-	WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */
+-
+-} WSEGLCapsType;
+-
+-/*
+-// Display capability
+-*/
+-typedef struct WSEGLCaps_TAG
+-{
+-	WSEGLCapsType eCapsType;
+-	unsigned long ui32CapsValue;
+-
+-} WSEGLCaps;
+-
+-/*
+-// Drawable type
+-*/
+-#define WSEGL_NO_DRAWABLE			0x0
+-#define WSEGL_DRAWABLE_WINDOW		0x1
+-#define WSEGL_DRAWABLE_PIXMAP		0x2
+-
+-
+-/*
+-// Pixel format of display/drawable
+-*/
+-typedef enum WSEGLPixelFormat_TAG
+-{
+-	WSEGL_PIXELFORMAT_565 = 0,
+-	WSEGL_PIXELFORMAT_4444 = 1,
+-	WSEGL_PIXELFORMAT_8888 = 2,
+-	WSEGL_PIXELFORMAT_1555 = 3
+-
+-} WSEGLPixelFormat;
+-
+-/*
+-// Transparent of display/drawable
+-*/
+-typedef enum WSEGLTransparentType_TAG
+-{
+-	WSEGL_OPAQUE = 0,
+-	WSEGL_COLOR_KEY = 1,
+-
+-} WSEGLTransparentType;
+-
+-/*
+-// Display/drawable configuration
+-*/
+-typedef struct WSEGLConfig_TAG
+-{
+-	/*
+-	// Type of drawables this configuration applies to -
+-	// OR'd values of drawable types. 
+-	*/
+-	unsigned long ui32DrawableType;
+-
+-	/* Pixel format */
+-	WSEGLPixelFormat ePixelFormat;
+-
+-	/* Native Renderable  - set to WSEGL_TRUE if native renderable */
+-	unsigned long ulNativeRenderable;
+-
+-	/* FrameBuffer Level Parameter */
+-	unsigned long ulFrameBufferLevel;
+-
+-	/* Native Visual ID */
+-	unsigned long ulNativeVisualID;
+-
+-	/* Native Visual */
+-	void *hNativeVisual;
+-
+-	/* Transparent Type */
+-	WSEGLTransparentType eTransparentType;
+-
+-	/* Transparent Color - only used if transparent type is COLOR_KEY */
+-	unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
+-
+-
+-} WSEGLConfig;
+-
+-/*
+-// WSEGL errors
+-*/
+-typedef enum WSEGLError_TAG
+-{
+-	WSEGL_SUCCESS = 0,
+-	WSEGL_CANNOT_INITIALISE = 1,
+-	WSEGL_BAD_NATIVE_DISPLAY = 2,
+-	WSEGL_BAD_NATIVE_WINDOW = 3,
+-	WSEGL_BAD_NATIVE_PIXMAP = 4,
+-	WSEGL_BAD_NATIVE_ENGINE = 5,
+-	WSEGL_BAD_DRAWABLE = 6,
+-	WSEGL_BAD_CONFIG = 7,
+-	WSEGL_OUT_OF_MEMORY = 8
+-
+-} WSEGLError; 
+-
+-/*
+-// Drawable orientation (in degrees anti-clockwise)
+-*/
+-typedef enum WSEGLRotationAngle_TAG
+-{
+-	WSEGL_ROTATE_0 = 0,
+-	WSEGL_ROTATE_90 = 1,
+-	WSEGL_ROTATE_180 = 2,
+-	WSEGL_ROTATE_270 = 3
+-
+-} WSEGLRotationAngle; 
+-
+-/*
+-// Drawable information required by OpenGL-ES driver
+-*/
+-typedef struct WSEGLDrawableParams_TAG
+-{
+-	/* Width in pixels of the drawable */
+-	unsigned long	ui32Width;
+-
+-	/* Height in pixels of the drawable */
+-	unsigned long	ui32Height;
+-
+-	/* Stride in pixels of the drawable */
+-	unsigned long	ui32Stride;
+-
+-	/* Pixel format of the drawable */
+-	WSEGLPixelFormat	ePixelFormat;
+-
+-	/* User space cpu virtual address of the drawable */
+-	void   			*pvLinearAddress;
+-
+-	/* HW address of the drawable */
+-	unsigned long	ui32HWAddress;
+-
+-	/* Private data for the drawable */
+-	void			*hPrivateData;
+-
+-} WSEGLDrawableParams;
+-
+-
+-/*
+-// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer()
+-//
+-// The first entry in the table is the version number of the wsegl.h header file that
+-// the module has been written against, and should therefore be set to WSEGL_VERSION
+-*/
+-typedef struct WSEGL_FunctionTable_TAG
+-{
+-	unsigned long ui32WSEGLVersion;
+-
+-	WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType);
+-
+-	WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **);
+-
+-	WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle);
+-
+-	WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *);
+-
+-	WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *);
+-
+-	WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle);
+-
+-	WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long);
+-
+-	WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long);
+-
+-	WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long);
+-
+-	WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType);
+-
+-	WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);
+-
+-	WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);
+-
+-
+-} WSEGL_FunctionTable;
+-
+-
+-WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);
+-
+-#ifdef __cplusplus
+-}
+-#endif 
+-
+-#endif /* __WSEGL_H__ */
+-
+-/******************************************************************************
+- End of file (wsegl.h)
+-******************************************************************************/
+Index: qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
+===================================================================
+--- qt-4.8.5.orig/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	2013-07-08 11:24:33.010516867 -0500
++++ qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	2013-07-08 11:28:26.142521123 -0500
+@@ -39,7 +39,7 @@
+ **
+ ****************************************************************************/
+ 
+-#include <GLES/eglplatform.h>
++#include <EGL/eglplatform.h>
+ #include <wsegl.h>
+ #include <pvr2d.h>
+ #include <string.h>
+@@ -379,6 +379,20 @@
+     return WSEGL_SUCCESS;
+ }
+ 
++/* Function stub for ConnectDrawable() */
++static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable)
++{
++    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
++    return WSEGL_SUCCESS;
++}
++
++/* Function stub for DisconnectDrawable() */
++static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable)
++{
++    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
++    return WSEGL_SUCCESS;
++}
++
+ static WSEGL_FunctionTable const wseglFunctions = {
+     WSEGL_VERSION,
+     wseglIsDisplayValid,
+@@ -392,7 +406,9 @@
+     wseglWaitNative,
+     wseglCopyFromDrawable,
+     wseglCopyFromPBuffer,
+-    wseglGetDrawableParameters
++    wseglGetDrawableParameters,
++    wseglConnectDrawable,
++    wseglDisconnectDrawable
+ };
+ 
+ /* Return the table of WSEGL functions to the EGL implementation */
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 9325b566f9..daade3c30c 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -136,7 +136,11 @@ QT_DEPENDENCIES += directfb
 else
 QT_CONFIGURE_OPTS += -no-gfx-directfb
 endif
-
+ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
+QT_CONFIGURE_OPTS += \
+	-plugin-gfx-powervr -D QT_NO_QWS_CURSOR -D QT_QWS_CLIENTBLIT
+QT_DEPENDENCIES += powervr
+endif
 
 ### Mouse drivers
 ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
@@ -313,6 +317,13 @@ else
 QT_CONFIGURE_OPTS += -no-openssl
 endif
 
+ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
+QT_CONFIGURE_OPTS += -opengl es2 -egl
+QT_DEPENDENCIES   += libgles libegl
+else
+QT_CONFIGURE_OPTS += -no-opengl
+endif
+
 # Qt SQL Drivers
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
 ifeq ($(BR2_PACKAGE_QT_IBASE),y)
@@ -564,6 +575,12 @@ endif
 ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
 QT_INSTALL_LIBS    += Qt3Support
 endif
+ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
+QT_INSTALL_LIBS    += QtOpenGL
+endif
+ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
+QT_INSTALL_LIBS    += pvrQWSWSEGL
+endif
 
 QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
 
@@ -640,12 +657,22 @@ define QT_INSTALL_TARGET_FONTS_TTF
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
+define QT_INSTALL_TARGET_POWERVR
+	# Note: this overwrites the default powervr.ini provided by the ti-gfx
+	# package.
+	$(INSTALL) -D -m 0644 package/qt/powervr.ini \
+		$(TARGET_DIR)/etc/powervr.ini
+endef
+endif
+
 define QT_INSTALL_TARGET_CMDS
 	$(QT_INSTALL_TARGET_LIBS)
 	$(QT_INSTALL_TARGET_PLUGINS)
 	$(QT_INSTALL_TARGET_IMPORTS)
 	$(QT_INSTALL_TARGET_FONTS)
 	$(QT_INSTALL_TARGET_FONTS_TTF)
+	$(QT_INSTALL_TARGET_POWERVR)
 endef
 
 define QT_CLEAN_CMDS

From d774551787fc737823fe645bb3efd758619690a2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:12 +0200
Subject: [PATCH 5686/6849] arch: introduce BR2_GCC_TARGET_{FPU, FLOAT_ABI}

Buildroot already has the BR2_GCC_TARGET_{TUNE,ARCH,ABI,CPU} hidden
kconfig strings that allow per-architecture Config.in files to feed
the appropriate values of --with-{tune,arch,abi-cpu} when building
gcc, or the appropriate flags for the external toolchain wrapper.

This commit has two additional options:
BR2_GCC_TARGET_{FPU,FLOAT_ABI}, that allows to define the
--with-{fpu,float} gcc configure options for the internal backend, or
the -m{fpu,float-abi} options for the flags of the external toolchain
wrapper.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in                                       | 12 ++++++++++++
 package/gcc/gcc.mk                                   | 10 ++++++++++
 toolchain/toolchain-external/ext-tool.mk             | 10 ++++++++++
 toolchain/toolchain-external/ext-toolchain-wrapper.c |  6 ++++++
 4 files changed, 38 insertions(+)

diff --git a/arch/Config.in b/arch/Config.in
index 5ca05cdde6..5bb96c5275 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -192,6 +192,18 @@ config BR2_GCC_TARGET_CPU
 config BR2_GCC_TARGET_CPU_REVISION
 	string
 
+# The value of this option will be passed as --with-fpu=<value> when
+# building gcc (internal backend) or -mfpu=<value> in the toolchain
+# wrapper (external toolchain)
+config BR2_GCC_TARGET_FPU
+	string
+
+# The value of this option will be passed as --with-float=<value> when
+# building gcc (internal backend) or -mfloat-abi=<value> in the toolchain
+# wrapper (external toolchain)
+config BR2_GCC_TARGET_FLOAT_ABI
+	string
+
 # Set up target binary format
 choice
 	prompt "Target Binary Format"
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 8bd65fcd58..bfc41a4c6e 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -167,6 +167,16 @@ HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
 endif
 endif
 
+GCC_TARGET_FPU = $(call qstrip,$(BR2_GCC_TARGET_FPU))
+ifneq ($(GCC_TARGET_FPU),)
+HOST_GCC_COMMON_CONF_OPT += --with-fpu=$(GCC_TARGET_FPU)
+endif
+
+GCC_TARGET_FLOAT_ABI = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
+ifneq ($(GCC_TARGET_FLOAT_ABI),)
+HOST_GCC_COMMON_CONF_OPT += --with-float=$(GCC_TARGET_FLOAT_ABI)
+endif
+
 # Branding works on >= 4.3
 ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)
 HOST_GCC_COMMON_CONF_OPT += \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 8d9f458883..9d3dec4179 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -145,6 +145,8 @@ CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISIO
 endif
 CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
 CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
+CC_TARGET_FPU_:=$(call qstrip,$(BR2_GCC_TARGET_FPU))
+CC_TARGET_FLOAT_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
 
 # march/mtune/floating point mode needs to be passed to the external toolchain
 # to select the right multilib variant
@@ -168,6 +170,14 @@ ifneq ($(CC_TARGET_ABI_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
 endif
+ifneq ($(CC_TARGET_FPU_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"'
+endif
+ifneq ($(CC_TARGET_FLOAT_ABI_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mfloat-abi=$(CC_TARGET_FLOAT_ABI_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(CC_TARGET_FLOAT_ABI_)"'
+endif
 ifeq ($(BR2_BINFMT_FLAT),y)
 TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 9d79d68adf..f81aed4935 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -38,6 +38,12 @@ static char *predef_args[] = {
 #ifdef BR_ABI
 	"-mabi=" BR_ABI,
 #endif
+#ifdef BR_FLOAT_ABI
+	"-mfloat-abi=" BR_FLOAT_ABI,
+#endif
+#ifdef BR2_FPU
+	"-mfpu=" BR_FPU,
+#endif
 #ifdef BR_SOFTFLOAT
 	"-msoft-float",
 #endif /* BR_SOFTFLOAT */

From 9b3e72b4fd51b63227adad5dbcae8f68333903df Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:13 +0200
Subject: [PATCH 5687/6849] arch: Refactor BR2_SOFT_FLOAT into per-architecture
 options

As we are going to introduced a more advanced support of floating
point options for the ARM architecture, we need to adjust how the
soft-float option is handled. We replace the current hidden option
BR2_PREFER_SOFT_FLOAT option and the visible BR2_SOFT_FLOAT option by:

 * A global hidden BR2_SOFT_FLOAT option, defined in arch/Config.in,
   that tells whether the architecture-specific code is using software
   emulated floating point. This hidden option can be used throughout
   Buildroot to determine whether soft float is used or not.

 * Per-architecture visible BR2_<arch>_SOFT_FLOAT options, for the
   architecture for which it makes sense, which allows users to select
   soft float emulation when needed.

This change will allow each architecture to have a different way of
presenting its floating point capabilities.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in                |  3 +++
 arch/Config.in.arm            | 10 ++++++++++
 arch/Config.in.mips           | 10 ++++++++++
 arch/Config.in.powerpc        |  9 +++++++++
 toolchain/toolchain-common.in | 21 ---------------------
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/arch/Config.in b/arch/Config.in
index 5bb96c5275..c2dc9e809c 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -1,6 +1,9 @@
 config BR2_ARCH_IS_64
        bool
 
+config BR2_SOFT_FLOAT
+	bool
+
 choice
 	prompt "Target Architecture"
 	default BR2_i386
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 027dac2d9d..29b2b45a79 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -79,6 +79,16 @@ endchoice
 config BR2_ARM_EABI
 	def_bool y
 
+config BR2_ARM_SOFT_FLOAT
+	bool "Use soft-float"
+	default y
+	select BR2_SOFT_FLOAT
+	help
+	  If your target CPU does not have a Floating Point Unit (FPU)
+	  or a kernel FPU emulator, but you still wish to support
+	  floating point functions, then everything will need to be
+	  compiled with soft floating point support (-msoft-float).
+
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"
 	depends on BR2_ARM_CPU_MAYBE_HAS_NEON
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 1454fb4419..6242bcc747 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -52,6 +52,16 @@ config BR2_MIPS_NABI64
 	depends on BR2_ARCH_IS_64
 endchoice
 
+config BR2_MIPS_SOFT_FLOAT
+	bool "Use soft-float"
+	default y
+	select BR2_SOFT_FLOAT
+	help
+	  If your target CPU does not have a Floating Point Unit (FPU)
+	  or a kernel FPU emulator, but you still wish to support
+	  floating point functions, then everything will need to be
+	  compiled with soft floating point support (-msoft-float).
+
 config BR2_ARCH
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 8643efcd72..ae70a8aa80 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -88,6 +88,15 @@ config BR2_powerpc_SPE
 	depends on BR2_powerpc_8540 || BR2_powerpc_8548
 endchoice
 
+config BR2_POWERPC_SOFT_FLOAT
+	bool "Use soft-float"
+	select BR2_SOFT_FLOAT
+	help
+	  If your target CPU does not have a Floating Point Unit (FPU)
+	  or a kernel FPU emulator, but you still wish to support
+	  floating point functions, then everything will need to be
+	  compiled with soft floating point support (-msoft-float).
+
 config BR2_ARCH
 	default "powerpc"	if BR2_powerpc
 
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 7c9b842cca..dc3bd2a914 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -90,27 +90,6 @@ config BR2_USE_MMU
 	  If your target has a MMU, you should say Y here.  If you
 	  are unsure, just say Y.
 
-config BR2_PREFER_SOFT_FLOAT
-	bool
-	default y if BR2_arm
-	default y if BR2_armeb
-	default y if BR2_avr32
-	default y if BR2_mips
-	default y if BR2_mipsel
-
-config BR2_SOFT_FLOAT
-	bool "Use software floating point by default"
-	depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_powerpc
-	# External toolchains will automatically do soft float or hard
-	# float depending on their configuration
-	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_CTNG
-	default $(BR2_PREFER_SOFT_FLOAT)
-	help
-	  If your target CPU does not have a Floating Point Unit (FPU) or a
-	  kernel FPU emulator, but you still wish to support floating point
-	  functions, then everything will need to be compiled with soft
-	  floating point support (-msoft-float).
-
 config BR2_TARGET_OPTIMIZATION
 	string "Target Optimizations"
 	default "-pipe"

From 5f959a1c615841e077aaf0a4e4efe6988f092fbe Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:14 +0200
Subject: [PATCH 5688/6849] arch: improve ARM floating point support and add
 support for EABIhf

This commit introduces the support for the EABIhf ABI, next to the
existing support we have for EABI and OABI (even though OABI support
is deprecated). EABIhf allows to improve performance of floating point
workload by using floating point registers to transfer floating point
arguments when calling functions, instead of using integer registers
to do, as is done in the 'softfp' floating point model of EABI.

In addition to this, this commit introduces a list of options for the
floating point support:
 * Software floating point
 * VFP
 * VFPv3
 * VFPv3-D16
 * VFPv4
 * VFPv4-D16

and it introduces some logic to make sure the options are only visible
when it makes sense, depending on the ARM core being selected. This is
however made complicated by the fact that certain VFP capabilities are
mandatory on some cores, but optional on some other cores. The kconfig
logic tries to achieve the following goals:

 * Hide options that are definitely not possible.

 * Use safe default values (i.e for Cortex-A5 and A7, the presence of
   the VFPv4 unit is optional, so we default on software floating
   point on these cores)..

 * Show the available possibilities, even if some of them are not
   necessarily working on a particular core (again, for the Cortex-A5
   and A7 cores, there is no way of knowing whether the particular
   variant used by the user has VFPv4 or not, so we select software
   floating point by default, but still show VFP/VFPv3/VFPv4 options).

It is worth noting that this commit doesn't add support for all
possible -mfpu= values on ARM. We haven't added support for fpa, fpe2,
fpe3, maverick (those four are only used on very old ARM cores), for
vfpv3-fp16, vfpv3-d16-fp16, vfpv3xd, vfpv3xd-fp16, neon-fp16,
vfpv4-sp-d16. They can be added quite easily if needed thanks to the
new organization of the Config.in options.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm  | 219 +++++++++++++++++++++++++++++++++++++++++---
 package/Makefile.in |   6 ++
 2 files changed, 211 insertions(+), 14 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 29b2b45a79..2b493c0933 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -6,6 +6,31 @@ config BR2_ARM_CPU_HAS_NEON
 config BR2_ARM_CPU_MAYBE_HAS_NEON
 	bool
 
+# for some cores, VFPv2 is optional
+config BR2_ARM_CPU_MAYBE_HAS_VFPV2
+	bool
+
+config BR2_ARM_CPU_HAS_VFPV2
+	bool
+
+# for some cores, VFPv3 is optional
+config BR2_ARM_CPU_MAYBE_HAS_VFPV3
+	bool
+	select BR2_ARM_CPU_MAYBE_HAS_VFPV2
+
+config BR2_ARM_CPU_HAS_VFPV3
+	bool
+	select BR2_ARM_CPU_HAS_VFPV2
+
+# for some cores, VFPv4 is optional
+config BR2_ARM_CPU_MAYBE_HAS_VFPV4
+	bool
+	select BR2_ARM_CPU_MAYBE_HAS_VFPV3
+
+config BR2_ARM_CPU_HAS_VFPV4
+	bool
+	select BR2_ARM_CPU_HAS_VFPV3
+
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_arm || BR2_armeb
@@ -27,31 +52,40 @@ config BR2_arm10t
 	bool "arm10t"
 config BR2_arm1136jf_s_r0
 	bool "arm1136jf_s rev0"
+	select BR2_ARM_CPU_HAS_VFPV2
 config BR2_arm1136jf_s_r1
 	bool "arm1136jf_s rev1"
+	select BR2_ARM_CPU_HAS_VFPV2
 config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
+	select BR2_ARM_CPU_HAS_VFPV2
 config BR2_cortex_a5
 	bool "cortex-A5"
 	select BR2_ARM_CPU_MAYBE_HAS_NEON
+	select BR2_ARM_CPU_MAYBE_HAS_VFPV4
 config BR2_cortex_a7
 	bool "cortex-A7"
 	select BR2_ARM_CPU_HAS_NEON
+	select BR2_ARM_CPU_HAS_VFPV4
 config BR2_cortex_a8
 	bool "cortex-A8"
 	select BR2_ARM_CPU_HAS_NEON
+	select BR2_ARM_CPU_HAS_VFPV3
 config BR2_cortex_a9
 	bool "cortex-A9"
 	select BR2_ARM_CPU_MAYBE_HAS_NEON
+	select BR2_ARM_CPU_MAYBE_HAS_VFPV3
 config BR2_cortex_a15
 	bool "cortex-A15"
 	select BR2_ARM_CPU_HAS_NEON
+	select BR2_ARM_CPU_HAS_VFPV4
 config BR2_fa526
 	bool "fa526/626"
 config BR2_pj4
 	bool "pj4"
+	select BR2_ARM_CPU_HAS_VFPV3
 config BR2_strongarm
 	bool "strongarm sa110/sa1100"
 config BR2_xscale
@@ -67,27 +101,56 @@ config BR2_arm1136jf_s
 choice
 	prompt "Target ABI"
 	depends on BR2_arm || BR2_armeb
-	depends on BR2_DEPRECATED
 	default BR2_ARM_EABI
 	help
-	  Application Binary Interface to use
+	  Application Binary Interface to use. The Application Binary
+	  Interface describes the calling conventions (how arguments
+	  are passed to functions, how the return value is passed, how
+	  system calls are made, etc.).
 
-config BR2_ARM_EABI_CHOICE
+config BR2_ARM_EABI
 	bool "EABI"
-endchoice
+	help
+	  The EABI is currently the standard ARM ABI, which is used in
+	  most projects. It supports both the 'soft' floating point
+	  model (in which floating point instructions are emulated in
+	  software) and the 'softfp' floating point model (in which
+	  floating point instructions are executed using an hardware
+	  floating point unit, but floating point arguments to
+	  functions are passed in integer registers).
 
-config BR2_ARM_EABI
-	def_bool y
+	  The 'softfp' floating point model is link-compatible with
+	  the 'soft' floating point model, i.e you can link a library
+	  built 'soft' with some other code built 'softfp'.
 
-config BR2_ARM_SOFT_FLOAT
-	bool "Use soft-float"
-	default y
-	select BR2_SOFT_FLOAT
+	  However, passing the floating point arguments in integer
+	  registers is a bit inefficient, so if your ARM processor has
+	  a floating point unit, and you don't have pre-compiled
+	  'soft' or 'softfp' code, using the EABIhf ABI will provide
+	  better floating point performances.
+
+	  If your processor does not have a floating point unit, then
+	  you must use this ABI.
+
+config BR2_ARM_EABIHF
+	bool "EABIhf"
+	depends on BR2_ARM_CPU_MAYBE_HAS_VFPV2 || BR2_ARM_CPU_HAS_VFPV2
 	help
-	  If your target CPU does not have a Floating Point Unit (FPU)
-	  or a kernel FPU emulator, but you still wish to support
-	  floating point functions, then everything will need to be
-	  compiled with soft floating point support (-msoft-float).
+	  The EABIhf is an extension of EABI which supports the 'hard'
+	  floating point model. This model uses the floating point
+	  unit to execute floating point instructions, and passes
+	  floating point arguments in floating point registers.
+
+	  It is more efficient than EABI for floating point related
+	  workload. However, it does not allow to link against code
+	  that has been pre-built for the 'soft' or 'softfp' floating
+	  point models.
+
+	  If your processor has a floating point unit, and you don't
+	  depend on existing pre-compiled code, this option is most
+	  likely the best choice.
+
+endchoice
 
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"
@@ -98,6 +161,120 @@ config BR2_ARM_ENABLE_NEON
 	  Select this option if you are certain your particular
 	  implementation has NEON support and you want to use it.
 
+choice
+	prompt "Floating point strategy"
+	depends on BR2_ARM_EABI || BR2_ARM_EABIHF
+	default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4
+	default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3
+	default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2
+	default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_VFPV2
+
+config BR2_ARM_SOFT_FLOAT
+	bool "Soft float"
+	depends on BR2_ARM_EABI
+	select BR2_SOFT_FLOAT
+	help
+	  This option allows to use software emulated floating
+	  point. It should be used for ARM cores that do not include a
+	  Vector Floating Point unit, such as ARMv5 cores (ARM926 for
+	  example) or certain ARMv6 cores.
+
+config BR2_ARM_FPU_VFPV2
+	bool "VFPv2"
+	depends on BR2_ARM_CPU_HAS_VFPV2 || BR2_ARM_CPU_MAYBE_HAS_VFPV2
+	help
+	  This option allows to use the VFPv2 floating point unit, as
+	  available in some ARMv6 processors (ARM1136JF-S,
+	  ARM1176JZF-S and ARM11 MPCore).
+
+	  Note that this option is also safe to use for newer cores
+	  such as Cortex-A, because the VFPv3 and VFPv4 units are
+	  backward compatible with VFPv2.
+
+config BR2_ARM_FPU_VFPV3
+	bool "VFPv3"
+	depends on BR2_ARM_CPU_HAS_VFPV3 || BR2_ARM_CPU_MAYBE_HAS_VFPV3
+	help
+	  This option allows to use the VFPv3 floating point unit, as
+	  available in some ARMv7 processors (Cortex-A{8, 9}). This
+	  option requires a VFPv3 unit that has 32 double-precision
+	  registers, which is not necessarily the case in all SOCs
+	  based on Cortex-A{8, 9}. If you're unsure, use VFPv3-D16
+	  instead, which is guaranteed to work on all Cortex-A{8, 9}.
+
+	  Note that this option is also safe to use for newer cores
+	  that have a VFPv4 unit, because VFPv4 is backward compatible
+	  with VFPv3. They must of course also have 32
+	  double-precision registers.
+
+config BR2_ARM_FPU_VFPV3D16
+	bool "VFPv3-D16"
+	depends on BR2_ARM_CPU_HAS_VFPV3 || BR2_ARM_CPU_MAYBE_HAS_VFPV3
+	help
+	  This option allows to use the VFPv3 floating point unit, as
+	  available in some ARMv7 processors (Cortex-A{8, 9}). This
+	  option requires a VFPv3 unit that has 16 double-precision
+	  registers, which is generally the case in all SOCs based on
+	  Cortex-A{8, 9}, even though VFPv3 is technically optional on
+	  Cortex-A9. This is the safest option for those cores.
+
+	  Note that this option is also safe to use for newer cores
+	  such that have a VFPv4 unit, because the VFPv4 is backward
+	  compatible with VFPv3.
+
+config BR2_ARM_FPU_VFPV4
+	bool "VFPv4"
+	depends on BR2_ARM_CPU_HAS_VFPV4 || BR2_ARM_CPU_MAYBE_HAS_VFPV4
+	help
+	  This option allows to use the VFPv4 floating point unit, as
+	  available in some ARMv7 processors (Cortex-A{5, 7, 12,
+	  15}). This option requires a VFPv4 unit that has 32
+	  double-precision registers, which is not necessarily the
+	  case in all SOCs based on Cortex-A{5, 7, 12, 15}. If you're
+	  unsure, you should probably use VFPv4-D16 instead.
+
+	  Note that if you want binary code that works on all ARMv7
+	  cores, including the earlier Cortex-A{8, 9}, you should
+	  instead select VFPv3.
+
+config BR2_ARM_FPU_VFPV4D16
+	bool "VFPv4-D16"
+	depends on BR2_ARM_CPU_HAS_VFPV4 || BR2_ARM_CPU_MAYBE_HAS_VFPV4
+	help
+	  This option allows to use the VFPv4 floating point unit, as
+	  available in some ARMv7 processors (Cortex-A{5, 7, 12,
+	  15}). This option requires a VFPv4 unit that has 16
+	  double-precision registers, which is always available on
+	  Cortex-A12 and Cortex-A15, but optional on Cortex-A5 and
+	  Cortex-A7.
+
+	  Note that if you want binary code that works on all ARMv7
+	  cores, including the earlier Cortex-A{8, 9}, you should
+	  instead select VFPv3-D16.
+
+config BR2_ARM_FPU_NEON
+	bool "NEON"
+	depends on BR2_ARM_CPU_HAS_NEON
+	help
+	  This option allows to use the NEON SIMD unit, as available
+	  in some ARMv7 processors, as a floating-point unit. It
+	  should however be noted that using NEON for floating point
+	  operations doesn't provide a complete compatibility with the
+	  IEEE 754.
+
+config BR2_ARM_FPU_NEON_VFPV4
+	bool "NEON/VFPv4"
+	depends on BR2_ARM_CPU_HAS_VFPV4 || BR2_ARM_CPU_MAYBE_HAS_VFPV4
+	depends on BR2_ARM_CPU_HAS_NEON
+	help
+	  This option allows to use both the VFPv4 and the NEON SIMD
+	  units for floating point operations. Note that some ARMv7
+	  cores do not necessarily have VFPv4 and/or NEON support, for
+	  example on Cortex-A5 and Cortex-A7, support for VFPv4 and
+	  NEON is optional.
+
+endchoice
+
 config BR2_ARCH
 	default "arm"	if BR2_arm
 	default "armeb"	if BR2_armeb
@@ -153,3 +330,17 @@ config BR2_GCC_TARGET_ARCH
 
 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"
+
+config BR2_GCC_TARGET_FPU
+	default "vfp"		if BR2_ARM_FPU_VFPV2
+	default "vfpv3"		if BR2_ARM_FPU_VFPV3
+	default "vfpv3-d16" 	if BR2_ARM_FPU_VFPV3D16
+	default "vfpv4" 	if BR2_ARM_FPU_VFPV4
+	default "vfpv4-d16" 	if BR2_ARM_FPU_VFPV4D16
+	default "neon" 		if BR2_ARM_FPU_NEON
+	default "neon-vfpv4" 	if BR2_ARM_FPU_NEON_VFPV4
+
+config BR2_GCC_TARGET_FLOAT_ABI
+	default "soft"		if BR2_ARM_SOFT_FLOAT
+	default "softfp"	if !BR2_ARM_SOFT_FLOAT && BR2_ARM_EABI
+	default "hard"		if !BR2_ARM_SOFT_FLOAT && BR2_ARM_EABIHF
diff --git a/package/Makefile.in b/package/Makefile.in
index 06db122e47..a597290c23 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -39,6 +39,12 @@ ABI=gnueabi
 else
 ABI=eabi
 endif
+else ifeq ($(BR2_ARM_EABIHF),y)
+ifeq ($(LIBC),uclibc)
+ABI=gnueabihf
+else
+ABI=eabihf
+endif
 endif
 
 # For FSL PowerPC there's SPE

From ff71f8f8e1f2bff5e26d08b5cb4483507eed8edd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:15 +0200
Subject: [PATCH 5689/6849] binutils: exclude binutils versions that don't
 support EABIhf

The ARM EABIhf support was introduced in Binutils 2.22, so earlier
versions should not be selected when EABIhf is used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/binutils/Config.in.host | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 3d687fe745..9ddaed7dd8 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -14,14 +14,17 @@ choice
 
 	config BR2_BINUTILS_VERSION_2_20_1
 		depends on !BR2_avr32
+		depends on !BR2_ARM_EABIHF
 		bool "binutils 2.20.1"
 
 	config BR2_BINUTILS_VERSION_2_21
 		depends on !BR2_avr32
+		depends on !BR2_ARM_EABIHF
 		bool "binutils 2.21"
 
 	config BR2_BINUTILS_VERSION_2_21_1
 		depends on !BR2_avr32
+		depends on !BR2_ARM_EABIHF
 		bool "binutils 2.21.1"
 
 	config BR2_BINUTILS_VERSION_2_22

From 92cc924f2ebdfc9bc3d107400d7b3540801d90f6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:16 +0200
Subject: [PATCH 5690/6849] gcc: take into account ARM floating point
 capabilities

The ARM EABIhf support was introduced in gcc 4.6.x, so versions
earlier than this one should not be used when EABIhf is selected.

The ARM VFPv4 support was introduced in gcc 4.5.x, so versions earlier
than this one should not be used when VFPv4 is used.

[Peter: drop OABI dependencies]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index a529d14c2c..972f81fdb1 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -22,15 +22,22 @@ choice
 
 	config BR2_GCC_VERSION_4_3_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
+		depends on !BR2_ARM_EABIHF
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.4.x"
+		# ARM EABIhf support appeared in gcc 4.6
+		depends on !BR2_ARM_EABIHF
+		# VFPv4 support appeared in gcc 4.5
+		depends on !BR2_ARM_FPU_VFPV4 && !BR2_ARM_FPU_VFPV4D16
 
 	config BR2_GCC_VERSION_4_5_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
+		# ARM EABIhf support appeared in gcc 4.6
+		depends on !BR2_ARM_EABIHF
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X

From d806005b08ec3228a252af4d2f038844a4d6fed2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:17 +0200
Subject: [PATCH 5691/6849] toolchain: remove the old BR2_VFP_FLOAT option

Now that we have a much better way of selecting between the various
VFP versions and capabilities, the BR2_VFP_FLOAT version no longer
makes sense. This commit gets rid of it, and adds the appropriate
Config.in.legacy code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                                     |  9 +++++++++
 toolchain/toolchain-buildroot/Config.in.2            | 12 ------------
 toolchain/toolchain-external/ext-tool.mk             |  5 -----
 toolchain/toolchain-external/ext-toolchain-wrapper.c |  3 ---
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 01bf90063e..b92b656fc5 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -76,6 +76,15 @@ config BR2_ELF2FLT
 	  BR2_PACKAGE_HOST_ELF2FLT due to the conversion of elf2flt to
 	  the package infrastructure.
 
+config BR2_VFP_FLOAT
+	bool "the ARM VFP floating point option has been renamed"
+	select BR2_LEGACY
+	help
+	  Due to a major refactoring of the floating-point handling of
+	  the ARM architecture support, the BR2_VFP_FLOAT option has
+	  been replaced with a choice of options that allows to select
+	  between various VFP versions/capabilities.
+
 ###############################################################################
 comment "Legacy options removed in 2013.05"
 
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index e223d9d40e..a9c102f7f8 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -28,16 +28,4 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 
 source "package/elf2flt/Config.in.host"
 
-config BR2_VFP_FLOAT
-	bool "Use ARM Vector Floating Point unit"
-	depends on !BR2_SOFT_FLOAT
-	depends on BR2_arm || BR2_armeb
-	help
-	  Setting this option will enable the "-mfpu=vfp" option.
-	  If your ARM CPU has a Vector Floating Point Unit (VFP)
-	  and the toolchain supports the option, then the
-	  code can be optimized.
-
-	  Most people will answer N.
-
 endif
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 9d3dec4179..67fc40d095 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -196,11 +196,6 @@ TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
 endif
 
-ifeq ($(BR2_VFP_FLOAT),y)
-TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=vfp
-TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_VFPFLOAT=1
-endif
-
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
 TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index f81aed4935..afca6fab20 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -47,9 +47,6 @@ static char *predef_args[] = {
 #ifdef BR_SOFTFLOAT
 	"-msoft-float",
 #endif /* BR_SOFTFLOAT */
-#ifdef BR_VFPFLOAT
-	"-mfpu=vfp",
-#endif /* BR_VFPFLOAT */
 #ifdef BR_64
 	"-m64",
 #endif

From 379d4aeab5004c5c462f8caa4f4974e4789ecafd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:18 +0200
Subject: [PATCH 5692/6849] configs: update defconfigs after VFP option changes

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_snowball_defconfig    | 3 +--
 configs/mx53loco_defconfig          | 3 +--
 configs/qemu_arm_nuri_defconfig     | 3 +--
 configs/qemu_arm_vexpress_defconfig | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configs/calao_snowball_defconfig b/configs/calao_snowball_defconfig
index 0631b52a21..90421a4b67 100644
--- a/configs/calao_snowball_defconfig
+++ b/configs/calao_snowball_defconfig
@@ -1,10 +1,9 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_KERNEL_HEADERS_3_4=y
-# BR2_SOFT_FLOAT is not set
+BR2_ARM_FPU_VFPV3D16=y
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_VFP_FLOAT=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA2"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index ff3948b277..08de3daa6c 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -1,8 +1,7 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a8=y
-# BR2_SOFT_FLOAT is not set
-BR2_VFP_FLOAT=y
+BR2_ARM_FPU_VFPV3D16=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 26eb81555e..1e435a6211 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -2,8 +2,7 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
-BR2_VFP_FLOAT=y
-# BR2_SOFT_FLOAT is not set
+BR2_ARM_FPU_VFPV3D16=y
 
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 12d1d0b475..2cc6db95f1 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -2,8 +2,7 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
-BR2_VFP_FLOAT=y
-# BR2_SOFT_FLOAT is not set
+BR2_ARM_FPU_VFPV3D16=y
 
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y

From ea6b277539bc5eebef64767dae3499b4209cd563 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:20 +0200
Subject: [PATCH 5693/6849] toolchain-external: update config options after
 EABIhf introduction

The introduction of the EABIhf ABI requires a few updates to the
configuration options for external toolchains, in order to ensure that
the user doesn't do any invalid selection. In detail:

 * The Linaro ARM toolchains now depend on BR2_ARM_EABIHF, because
   that's the ABI they use, and it is incompatible with EABI. The
   comment about the availability of Linaro toolchains is updated to
   inform users selecting EABI that they should select EABIhf if they
   want to see Linaro toolchains.

 * The Sourcery CodeBench toolchains now depend on BR2_ARM_EABI,
   because that's the ABI they use. A comment is added to inform users
   that have selected EABIhf that Sourcery CodeBench are only
   available when EABI is used.

 * The Arago toolchains now depend on BR2_ARM_EABI, because that's the
   ABI they use. The description of the ARMv7 Arago toolchain is also
   slightly improved.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 130b705b65..324401f4f5 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -8,6 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_ARM_EABIHF
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -27,6 +28,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_ARM_EABIHF
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -46,6 +48,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_ARM_EABIHF
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -60,14 +63,16 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 
 	  To use this toolchain, you must disable soft float usage.
 
-comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
+comment "Linaro toolchains available for Cortex-A{5,7,8,9,15} and the EABIhf ABI"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH != "armv7-a"
+	depends on !BR2_ARM_EABIHF
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	bool "Sourcery CodeBench ARM 2013.05"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_ARM_EABI
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -92,6 +97,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	bool "Sourcery CodeBench ARM 2012.03"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_ARM_EABI
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -116,6 +122,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	bool "Sourcery CodeBench ARM 2011.09"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_ARM_EABI
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -136,11 +143,17 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	      Select BR2_SOFT_FLOAT
 	      Set BR2_TARGET_OPTIMIZATION to -mthumb
 
+comment "Sourcery CodeBench toolchains available for the EABI ABI"
+	depends on BR2_arm
+	depends on !BR2_ARM_EABI
+
 config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	bool "Arago ARMv7 2011.09"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
+	depends on BR2_ARM_EABI
+	depends on BR2_ARM_CPU_HAS_VFPV3 || BR2_ARM_CPU_MAYBE_HAS_VFPV3
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -149,9 +162,11 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	  Texas Instruments Arago 2011.09 toolchain, with gcc 4.5.3,
 	  binutils 2.20.1, glibc 2.12, gdb 7.2.
 
-	  This toolchain uses -mfloat-abi=softfp (i.e use FPU
-	  instructions, but pass floating point function arguments in
-	  non-floating point registers).
+	  This toolchain uses -mfloat-abi=softfp (i.e can use FPU
+	  instructions, but passes floating point function arguments
+	  in integer registers), and requires a VFPv3 floating point
+	  unit to work properly. This unit is available on most
+	  Cortex-A ARM processors, but not all.
 
 config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
 	bool "Arago ARMv5 2011.09"
@@ -160,6 +175,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
 	depends on BR2_GCC_TARGET_ARCH != "armv4t" && \
 		BR2_GCC_TARGET_ARCH != "armv4" && \
 		BR2_GCC_TARGET_ARCH != "armv5t"
+	depends on BR2_ARM_EABI
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP

From d2e3cc389d47f3f1f3aa5e92e2e00deb9f2f27ba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:21 +0200
Subject: [PATCH 5694/6849] gcc: create symbolic link to ld-linux in EABIhf/gcc
 4.7/eglibc

When using eglibc, the ld-linux loader is installed as
ld-linux-armhf.so.3, but gcc 4.7.x was not yet updated, and generates
binaries that reference ld-linux.so.3. This was fixed starting with
gcc 4.8.x. In order to be able to use gcc 4.7, we create the
appropriate symbolic link.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-final/gcc-final.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 0db2eaa6dd..b89b2b72b6 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -90,6 +90,18 @@ endef
 
 HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_SIMPLE_SYMLINKS
 
+# In gcc 4.7.x, the ARM EABIhf library loader path for eglibc was not
+# correct, so we create a symbolic link to make things work
+# properly. eglibc installs the library loader as ld-linux-armhf.so.3,
+# but gcc creates binaries that reference ld-linux.so.3.
+ifeq ($(BR2_arm)$(BR2_ARM_EABIHF)$(BR2_GCC_VERSION_4_7_X)$(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),yyyy)
+define HOST_GCC_FINAL_LD_LINUX_LINK
+	ln -sf ld-linux-armhf.so.3 $(TARGET_DIR)/lib/ld-linux.so.3
+	ln -sf ld-linux-armhf.so.3 $(STAGING_DIR)/lib/ld-linux.so.3
+endef
+HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_LD_LINUX_LINK
+endif
+
 # Cannot use the HOST_GCC_FINAL_USR_LIBS mechanism below, because we want
 # libgcc_s to be installed in /lib and not /usr/lib. We add +x on
 # libgcc_s to ensure it will be stripped.

From 85d0769ac5cb50527c5bbab4417262064971073f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:22 +0200
Subject: [PATCH 5695/6849] arch/arm: add support for Thumb2

Until now, we were using the default ARM instruction set, as used by
the toolchain: the 32 bits ARM instruction set for the internal
backend, and for external toolchain, whatever default was chosen when
the toolchain was generated.

This commit adds support for the Thumb2 instruction set. To do so, it:

 * provides a menuconfig choice between ARM and Thumb2. The choice is
   only shown when Thumb2 is supported, i.e on ARMv7-A CPUs.

 * passes the --with-mode={arm,thumb} option when building gcc in the
   internal backend. This tells the compiler which type of
   instructions it should generate.

 * passes the m{arm,thumb} option in the external toolchain
   wrapper. ARM and Thumb2 code can freely be mixed together, so the
   fact that the C library has been built either ARM or Thumb2 and
   that the rest of the code is built Thumb2 or ARM is not a problem.

[Peter: fix empty BR2_GCC_TARGET_MODE check]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in                                |  6 ++++
 arch/Config.in.arm                            | 36 +++++++++++++++++++
 package/gcc/gcc.mk                            |  5 +++
 toolchain/toolchain-external/ext-tool.mk      |  5 +++
 .../ext-toolchain-wrapper.c                   |  3 ++
 5 files changed, 55 insertions(+)

diff --git a/arch/Config.in b/arch/Config.in
index c2dc9e809c..c2147a4049 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -207,6 +207,12 @@ config BR2_GCC_TARGET_FPU
 config BR2_GCC_TARGET_FLOAT_ABI
 	string
 
+# The value of this option will be passed as --with-mode=<value> when
+# building gcc (internal backend) or -m<value> in the toolchain
+# wrapper (external toolchain)
+config BR2_GCC_TARGET_MODE
+	string
+
 # Set up target binary format
 choice
 	prompt "Target Binary Format"
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 2b493c0933..94c32c9672 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -31,6 +31,9 @@ config BR2_ARM_CPU_HAS_VFPV4
 	bool
 	select BR2_ARM_CPU_HAS_VFPV3
 
+config BR2_ARM_CPU_HAS_THUMB2
+	bool
+
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_arm || BR2_armeb
@@ -65,22 +68,27 @@ config BR2_cortex_a5
 	bool "cortex-A5"
 	select BR2_ARM_CPU_MAYBE_HAS_NEON
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV4
+	select BR2_ARM_CPU_HAS_THUMB2
 config BR2_cortex_a7
 	bool "cortex-A7"
 	select BR2_ARM_CPU_HAS_NEON
 	select BR2_ARM_CPU_HAS_VFPV4
+	select BR2_ARM_CPU_HAS_THUMB2
 config BR2_cortex_a8
 	bool "cortex-A8"
 	select BR2_ARM_CPU_HAS_NEON
 	select BR2_ARM_CPU_HAS_VFPV3
+	select BR2_ARM_CPU_HAS_THUMB2
 config BR2_cortex_a9
 	bool "cortex-A9"
 	select BR2_ARM_CPU_MAYBE_HAS_NEON
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV3
+	select BR2_ARM_CPU_HAS_THUMB2
 config BR2_cortex_a15
 	bool "cortex-A15"
 	select BR2_ARM_CPU_HAS_NEON
 	select BR2_ARM_CPU_HAS_VFPV4
+	select BR2_ARM_CPU_HAS_THUMB2
 config BR2_fa526
 	bool "fa526/626"
 config BR2_pj4
@@ -275,6 +283,30 @@ config BR2_ARM_FPU_NEON_VFPV4
 
 endchoice
 
+choice
+	prompt "ARM instruction set"
+	depends on BR2_ARM_CPU_HAS_THUMB2
+
+config BR2_ARM_INSTRUCTIONS_ARM_CHOICE
+	bool "ARM"
+	help
+	  This option instructs the compiler to generate regular ARM
+	  instructions, that are all 32 bits wide.
+
+config BR2_ARM_INSTRUCTIONS_THUMB2
+	bool "Thumb2"
+	help
+	  This option instructions the compiler to generate Thumb2
+	  instructions, which allows to mix 16 bits instructions and
+	  32 bits instructions. This generally provides a much smaller
+	  compiled binary size.
+
+endchoice
+
+config BR2_ARM_INSTRUCTIONS_ARM
+	def_bool y
+	depends on !BR2_ARM_INSTRUCTIONS_THUMB2
+
 config BR2_ARCH
 	default "arm"	if BR2_arm
 	default "armeb"	if BR2_armeb
@@ -344,3 +376,7 @@ config BR2_GCC_TARGET_FLOAT_ABI
 	default "soft"		if BR2_ARM_SOFT_FLOAT
 	default "softfp"	if !BR2_ARM_SOFT_FLOAT && BR2_ARM_EABI
 	default "hard"		if !BR2_ARM_SOFT_FLOAT && BR2_ARM_EABIHF
+
+config BR2_GCC_TARGET_MODE
+	default "arm"		if BR2_ARM_INSTRUCTIONS_ARM
+	default "thumb"		if BR2_ARM_INSTRUCTIONS_THUMB2
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index bfc41a4c6e..ae2a363510 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -177,6 +177,11 @@ ifneq ($(GCC_TARGET_FLOAT_ABI),)
 HOST_GCC_COMMON_CONF_OPT += --with-float=$(GCC_TARGET_FLOAT_ABI)
 endif
 
+GCC_TARGET_MODE = $(call qstrip,$(BR2_GCC_TARGET_MODE))
+ifneq ($(GCC_TARGET_MODE),)
+HOST_GCC_COMMON_CONF_OPT += --with-mode=$(GCC_TARGET_MODE)
+endif
+
 # Branding works on >= 4.3
 ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)
 HOST_GCC_COMMON_CONF_OPT += \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 67fc40d095..b9ae68f0a3 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -147,6 +147,7 @@ CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
 CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
 CC_TARGET_FPU_:=$(call qstrip,$(BR2_GCC_TARGET_FPU))
 CC_TARGET_FLOAT_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
+CC_TARGET_MODE_:=$(call qstrip,$(BR2_GCC_TARGET_MODE))
 
 # march/mtune/floating point mode needs to be passed to the external toolchain
 # to select the right multilib variant
@@ -178,6 +179,10 @@ ifneq ($(CC_TARGET_FLOAT_ABI_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mfloat-abi=$(CC_TARGET_FLOAT_ABI_)
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(CC_TARGET_FLOAT_ABI_)"'
 endif
+ifneq ($(CC_TARGET_MODE_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -m$(CC_TARGET_MODE_)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_MODE='"$(CC_TARGET_MODE_)"'
+endif
 ifeq ($(BR2_BINFMT_FLAT),y)
 TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index afca6fab20..460f255ee5 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -47,6 +47,9 @@ static char *predef_args[] = {
 #ifdef BR_SOFTFLOAT
 	"-msoft-float",
 #endif /* BR_SOFTFLOAT */
+#ifdef BR_MODE
+	"-m" BR_MODE,
+#endif
 #ifdef BR_64
 	"-m64",
 #endif

From 808fe4af777332b822cc492516bb844e6ad9bb18 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:23 +0200
Subject: [PATCH 5696/6849] uclibc: use numbered patches for 0.9.33.2

In preparation to the addition of more patches that require a correct
ordering, rename uClibc 0.9.33.2 patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...01-bits-time.h-sync-with-glibc-2.16.patch} |  9 ++++----
 ...-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch} | 23 ++++++++++++++-----
 ...tch => uclibc-0003-Add-dup3-syscall.patch} | 22 ++++++++----------
 ...dd-__kernel_long-and-__kernel_ulong.patch} |  7 +++---
 ...c-0005-Patch-from-OpenWRT-for-avr32.patch} | 14 ++++++++++-
 5 files changed, 49 insertions(+), 26 deletions(-)
 rename package/uclibc/0.9.33.2/{uclibc-bits-time.h-sync-with-glibc-2.16.patch => uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch} (82%)
 rename package/uclibc/0.9.33.2/{uclibc-define-MSG_CMSG_CLOEXEC.patch => uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch} (54%)
 rename package/uclibc/0.9.33.2/{uclibc-dup3.patch => uclibc-0003-Add-dup3-syscall.patch} (73%)
 rename package/uclibc/0.9.33.2/{uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch => uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch} (98%)
 rename package/uclibc/0.9.33.2/{uclibc-OpenWRT-140-avr32_atomic_fix.patch => uclibc-0005-Patch-from-OpenWRT-for-avr32.patch} (50%)

diff --git a/package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch b/package/uclibc/0.9.33.2/uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch
similarity index 82%
rename from package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch
rename to package/uclibc/0.9.33.2/uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch
index 2ad00328d2..d93df6d748 100644
--- a/package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch
+++ b/package/uclibc/0.9.33.2/uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch
@@ -1,7 +1,7 @@
-From 3d1b82c7d9dce11c733fe23a85df7f975c7e2486 Mon Sep 17 00:00:00 2001
+From bb08cd16cb0353b3d4116ca8959dbecd2e78f545 Mon Sep 17 00:00:00 2001
 From: Peter Korsgaard <jacmet@sunsite.dk>
 Date: Tue, 3 Jul 2012 15:54:57 +0200
-Subject: [PATCH] bits/time.h: sync with glibc 2.16
+Subject: [PATCH 1/8] bits/time.h: sync with glibc 2.16
 
 CLOCK_MONOTONIC_RAW is available since 2.6.28
 (2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and
@@ -10,8 +10,9 @@ CLOCK_REALTIME_COARSE).
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libc/sysdeps/linux/common/bits/time.h |    6 ++++++
+ libc/sysdeps/linux/common/bits/time.h | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
@@ -32,5 +33,5 @@ index 7ed54bf..c871223 100644
  /* Flag to indicate time is absolute.  */
  #   define TIMER_ABSTIME		1
 -- 
-1.7.10.4
+1.8.1.2
 
diff --git a/package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch b/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
similarity index 54%
rename from package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch
rename to package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
index c699b6b11f..9353e5bb43 100644
--- a/package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch
+++ b/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
@@ -1,15 +1,23 @@
-Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
+From e95694dfd24779acaab0bb1500f182e46f8a518d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 13 Jul 2013 17:13:55 +0200
+Subject: [PATCH 2/8] Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
 
 From yocto:
 http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
 
 Upstream-Status: Pending
 
-Index: git/libc/sysdeps/linux/common/bits/socket.h
-===================================================================
---- git.orig/libc/sysdeps/linux/common/bits/socket.h	2012-01-26 23:23:21.537456132 -0800
-+++ git/libc/sysdeps/linux/common/bits/socket.h	2012-01-26 23:25:10.125461388 -0800
-@@ -235,8 +235,15 @@
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/common/bits/socket.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
+index 7e12733..338fd92 100644
+--- a/libc/sysdeps/linux/common/bits/socket.h
++++ b/libc/sysdeps/linux/common/bits/socket.h
+@@ -235,8 +235,15 @@ enum
  #define	MSG_ERRQUEUE	MSG_ERRQUEUE
      MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
  #define	MSG_NOSIGNAL	MSG_NOSIGNAL
@@ -26,3 +34,6 @@ Index: git/libc/sysdeps/linux/common/bits/socket.h
    };
  
  
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-dup3.patch b/package/uclibc/0.9.33.2/uclibc-0003-Add-dup3-syscall.patch
similarity index 73%
rename from package/uclibc/0.9.33.2/uclibc-dup3.patch
rename to package/uclibc/0.9.33.2/uclibc-0003-Add-dup3-syscall.patch
index 87fe2a679f..663b0e1bca 100644
--- a/package/uclibc/0.9.33.2/uclibc-dup3.patch
+++ b/package/uclibc/0.9.33.2/uclibc-0003-Add-dup3-syscall.patch
@@ -1,16 +1,18 @@
+From 518bc50ae42540574bba360225c8a65b56b79148 Mon Sep 17 00:00:00 2001
 From: Jonas Bonn <jonas@southpole.se>
-Subject: [RFC PATCH 16/38] Add dup3 syscall
-Date: Tue,  6 Sep 2011 10:30:40 +0200
+Date: Tue, 6 Sep 2011 10:30:40 +0200
+Subject: [PATCH 3/8] Add dup3 syscall
 
 Signed-off-by: Jonas Bonn <jonas@southpole.se>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- include/unistd.h                 |    4 ++++
- libc/sysdeps/linux/common/dup3.c |   15 +++++++++++++++
- 2 files changed, 19 insertions(+), 0 deletions(-)
+ include/unistd.h                 |  4 ++++
+ libc/sysdeps/linux/common/dup3.c | 17 +++++++++++++++++
+ 2 files changed, 21 insertions(+)
  create mode 100644 libc/sysdeps/linux/common/dup3.c
 
 diff --git a/include/unistd.h b/include/unistd.h
-index 9568790..7c2fa4a 100644
+index 1b2fd4d..f7d070b 100644
 --- a/include/unistd.h
 +++ b/include/unistd.h
 @@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur;
@@ -26,7 +28,7 @@ index 9568790..7c2fa4a 100644
  #ifdef __USE_GNU
 diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c
 new file mode 100644
-index 0000000..5fdab2e
+index 0000000..7b57438
 --- /dev/null
 +++ b/libc/sysdeps/linux/common/dup3.c
 @@ -0,0 +1,17 @@
@@ -48,9 +50,5 @@ index 0000000..5fdab2e
 +libc_hidden_def(dup3)
 +#endif
 -- 
-1.7.5.4
+1.8.1.2
 
-_______________________________________________
-uClibc mailing list
-uClibc@uclibc.org
-http://lists.busybox.net/mailman/listinfo/uclibc
diff --git a/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.33.2/uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
similarity index 98%
rename from package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
rename to package/uclibc/0.9.33.2/uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
index 4ba60e93fc..0381ba8013 100644
--- a/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
+++ b/package/uclibc/0.9.33.2/uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
@@ -1,7 +1,7 @@
-From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
+From 7fef6b983456e4c529a5239ea90715050e6f4452 Mon Sep 17 00:00:00 2001
 From: Chris Packham <chris.packham@alliedtelesis.co.nz>
 Date: Mon, 1 Oct 2012 18:12:54 +1300
-Subject: [PATCH] libc/sysdeps: add __kernel_long and __kernel_ulong
+Subject: [PATCH 4/8] libc/sysdeps: add __kernel_long and __kernel_ulong
 
 Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
 exported header files were updated to use these new types. Add the
@@ -50,6 +50,7 @@ I can break this up per arch or per maintainer if requested.
  22 files changed, 50 insertions(+)
 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
  libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
  libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
@@ -388,5 +389,5 @@ index 44f1075..ed38f2e 100644
  
  /* Beginning in 2.6 kernels, which is the first version that includes the
 -- 
-1.8.1.5
+1.8.1.2
 
diff --git a/package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch b/package/uclibc/0.9.33.2/uclibc-0005-Patch-from-OpenWRT-for-avr32.patch
similarity index 50%
rename from package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch
rename to package/uclibc/0.9.33.2/uclibc-0005-Patch-from-OpenWRT-for-avr32.patch
index e28b6d25d9..9b6be2b78e 100644
--- a/package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch
+++ b/package/uclibc/0.9.33.2/uclibc-0005-Patch-from-OpenWRT-for-avr32.patch
@@ -1,9 +1,18 @@
-Patch from OpenWRT for avr32.
+From b0bbb35065e1c8fdd308573f38eed35c30760d87 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 13 Jul 2013 17:14:49 +0200
+Subject: [PATCH 5/8] Patch from OpenWRT for avr32.
 
 https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
 
 Signed-off-by: Simon Dawson <spdawson@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/avr32/bits/atomic.h | 1 +
+ 1 file changed, 1 insertion(+)
 
+diff --git a/libc/sysdeps/linux/avr32/bits/atomic.h b/libc/sysdeps/linux/avr32/bits/atomic.h
+index e6be41f..3bc2aee 100644
 --- a/libc/sysdeps/linux/avr32/bits/atomic.h
 +++ b/libc/sysdeps/linux/avr32/bits/atomic.h
 @@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
@@ -14,3 +23,6 @@ Signed-off-by: Simon Dawson <spdawson@gmail.com>
  		__typeof__(*(mem)) __prev;				\
  		__asm__ __volatile__(					\
  			"/* __arch_compare_and_exchange_val_32_acq */\n" \
+-- 
+1.8.1.2
+

From fee632bab2075fc0a2508c691cffa6c53cd8823c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:24 +0200
Subject: [PATCH 5697/6849] uclibc: add Thumb2 fixes

This commit adds three patches to uClibc that are needed to make
Thumb2 support work properly:

 uclibc-0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch
 uclibc-0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch
 uclibc-0008-arm-move-check-for-BX-to-its-own-header.patch

The first one is a necessary dependency of the second one. Both of
those patches have already been merged upstream, after 0.9.33.2. The
third one hasn't been merged upstream yet, but it has already been
submitted a while ago by Yann E. Morin, without receiving attention
from upstream.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...e-stack-pointer-just-after-return-fr.patch |  42 +++
 ...dd-missing-IT-instruction-for-Thumb2.patch |  29 ++
 ...-move-check-for-BX-to-its-own-header.patch | 257 ++++++++++++++++++
 3 files changed, 328 insertions(+)
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0008-arm-move-check-for-BX-to-its-own-header.patch

diff --git a/package/uclibc/0.9.33.2/uclibc-0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch b/package/uclibc/0.9.33.2/uclibc-0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch
new file mode 100644
index 0000000000..de97850826
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch
@@ -0,0 +1,42 @@
+From 963671276c0ef14458e0a7990107bcd2c075f3cd Mon Sep 17 00:00:00 2001
+From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Date: Mon, 10 Dec 2012 09:50:52 +0100
+Subject: [PATCH 6/8] arm: clone: restore stack pointer just after return from
+ syscall
+
+If the syscall returns with an error the stack pointer and r4 register
+are not restored because the instruction 'ldmnefd sp!, {r4}' is executed
+after branching to '__error' label.
+This bug has been spotted out by running './utstest clone 5' from LTP
+built with -fstack-protector-all compiler flag as log below:
+
+root@cortex-a9:/usr/tests/ltp/testcases/bin# ./utstest clone 5
+stack smashing detected: ./utstest terminated()
+
+Regression introduced by commit e58798e107d652644629a1daaa95d76430808d53
+
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Giuseppe Di Giore <giuseppe.di-giore@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/arm/clone.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S
+index fdc05b8..e4101ba 100644
+--- a/libc/sysdeps/linux/arm/clone.S
++++ b/libc/sysdeps/linux/arm/clone.S
+@@ -111,8 +111,8 @@ __clone:
+ 	ldr	r4, [sp, #12]
+ 	DO_CALL (clone)
+ 	movs	a1, a1
+-	blt	__error
+ 	ldmnefd	sp!, {r4}
++	blt	__error
+ 	IT(t, ne)
+ #if defined(__USE_BX__)
+ 	bxne	lr
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch b/package/uclibc/0.9.33.2/uclibc-0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch
new file mode 100644
index 0000000000..f4097e98ca
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch
@@ -0,0 +1,29 @@
+From c12211a2f1832169e31063512b3e2081e503e856 Mon Sep 17 00:00:00 2001
+From: Will Newton <will.newton@linaro.org>
+Date: Tue, 2 Apr 2013 13:53:35 +0100
+Subject: [PATCH 7/8] arm/clone.S: Add missing IT instruction for Thumb2.
+
+The conditional load needs to be made part of an IT block on Thumb2
+cores.
+
+Signed-off-by: Will Newton <will.newton@linaro.org>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/arm/clone.S | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S
+index e4101ba..1f7f09d 100644
+--- a/libc/sysdeps/linux/arm/clone.S
++++ b/libc/sysdeps/linux/arm/clone.S
+@@ -111,6 +111,7 @@ __clone:
+ 	ldr	r4, [sp, #12]
+ 	DO_CALL (clone)
+ 	movs	a1, a1
++	IT(t, ne)
+ 	ldmnefd	sp!, {r4}
+ 	blt	__error
+ 	IT(t, ne)
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0008-arm-move-check-for-BX-to-its-own-header.patch b/package/uclibc/0.9.33.2/uclibc-0008-arm-move-check-for-BX-to-its-own-header.patch
new file mode 100644
index 0000000000..c3031b418b
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0008-arm-move-check-for-BX-to-its-own-header.patch
@@ -0,0 +1,257 @@
+From 06827e81c976d16aa5861a40ac0d780b63a4d470 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Thu, 11 Apr 2013 23:02:03 +0200
+Subject: [PATCH 8/8] arm: move check for BX to its own header
+
+As Will noticed, the header this check is currently done in
+is asm-only, and is not meant to be included from C code.
+This breaks compilation when compiled for a Thumb2-aware CPU.
+
+Move the BX check to its own header, and revert 7a246fd.
+
+Reported-by: Will Newton <will.newton@gmail.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Cc: Will Newton <will.newton@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ ldso/ldso/arm/dl-startup.h            |  2 +-
+ ldso/ldso/arm/resolve.S               |  1 +
+ libc/string/arm/_memcpy.S             |  1 +
+ libc/string/arm/memcmp.S              |  1 +
+ libc/string/arm/memset.S              |  1 +
+ libc/string/arm/strcmp.S              |  1 +
+ libc/string/arm/strlen.S              |  1 +
+ libc/sysdeps/linux/arm/__longjmp.S    |  2 +-
+ libc/sysdeps/linux/arm/bits/arm_asm.h |  8 --------
+ libc/sysdeps/linux/arm/bits/arm_bx.h  | 34 ++++++++++++++++++++++++++++++++++
+ libc/sysdeps/linux/arm/clone.S        |  1 +
+ libc/sysdeps/linux/arm/mmap64.S       |  1 +
+ libc/sysdeps/linux/arm/syscall-eabi.S |  1 +
+ libc/sysdeps/linux/arm/sysdep.h       |  2 +-
+ libc/sysdeps/linux/arm/vfork.S        |  1 +
+ 15 files changed, 47 insertions(+), 11 deletions(-)
+ create mode 100644 libc/sysdeps/linux/arm/bits/arm_bx.h
+
+diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h
+index f7d6052..8d6122b 100644
+--- a/ldso/ldso/arm/dl-startup.h
++++ b/ldso/ldso/arm/dl-startup.h
+@@ -7,7 +7,7 @@
+  */
+ 
+ #include <features.h>
+-#include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #if !defined(__thumb__)
+ __asm__(
+diff --git a/ldso/ldso/arm/resolve.S b/ldso/ldso/arm/resolve.S
+index 08889d0..600d3af 100644
+--- a/ldso/ldso/arm/resolve.S
++++ b/ldso/ldso/arm/resolve.S
+@@ -92,6 +92,7 @@
+ 
+ #include <sys/syscall.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #include <features.h>
+ 
+diff --git a/libc/string/arm/_memcpy.S b/libc/string/arm/_memcpy.S
+index b26080d..c59f5b8 100644
+--- a/libc/string/arm/_memcpy.S
++++ b/libc/string/arm/_memcpy.S
+@@ -40,6 +40,7 @@
+ #include <features.h>
+ #include <endian.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #if !defined(THUMB1_ONLY)
+ /*
+diff --git a/libc/string/arm/memcmp.S b/libc/string/arm/memcmp.S
+index 65409f4..9f78415 100644
+--- a/libc/string/arm/memcmp.S
++++ b/libc/string/arm/memcmp.S
+@@ -31,6 +31,7 @@
+ 
+ #include <features.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ .text
+ .global memcmp
+diff --git a/libc/string/arm/memset.S b/libc/string/arm/memset.S
+index 66aa603..6f78128 100644
+--- a/libc/string/arm/memset.S
++++ b/libc/string/arm/memset.S
+@@ -20,6 +20,7 @@
+ #include <features.h>
+ #include <sys/syscall.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ .text
+ .global memset
+diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S
+index 97363c1..8b77ab0 100644
+--- a/libc/string/arm/strcmp.S
++++ b/libc/string/arm/strcmp.S
+@@ -31,6 +31,7 @@
+ 
+ #include <features.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ .text
+ .global strcmp
+diff --git a/libc/string/arm/strlen.S b/libc/string/arm/strlen.S
+index 949e918..141f849 100644
+--- a/libc/string/arm/strlen.S
++++ b/libc/string/arm/strlen.S
+@@ -21,6 +21,7 @@
+ #include <endian.h>
+ #include <sys/syscall.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ /* size_t strlen(const char *S)
+  * entry: r0 -> string
+diff --git a/libc/sysdeps/linux/arm/__longjmp.S b/libc/sysdeps/linux/arm/__longjmp.S
+index 5faf4ec..7418dc2 100644
+--- a/libc/sysdeps/linux/arm/__longjmp.S
++++ b/libc/sysdeps/linux/arm/__longjmp.S
+@@ -19,11 +19,11 @@
+ 
+ #include <features.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ #define _SETJMP_H
+ #define _ASM
+ #include <bits/setjmp.h>
+ 
+-
+ .global __longjmp
+ .type __longjmp,%function
+ .align 2
+diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h
+index 921c9a3..ff8ea92 100644
+--- a/libc/sysdeps/linux/arm/bits/arm_asm.h
++++ b/libc/sysdeps/linux/arm/bits/arm_asm.h
+@@ -24,12 +24,4 @@
+ #define THUMB1_ONLY 1
+ #endif
+ 
+-#if defined(__USE_BX__)
+-# if (   defined (__ARM_ARCH_2__)  || defined (__ARM_ARCH_3__) \
+-      || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
+-     )
+-#  error Use of BX was requested, but is not available on the target processor.
+-# endif /* ARCH level */
+-#endif /* __USE_BX__ */
+-
+ #endif /* _ARM_ASM_H */
+diff --git a/libc/sysdeps/linux/arm/bits/arm_bx.h b/libc/sysdeps/linux/arm/bits/arm_bx.h
+new file mode 100644
+index 0000000..321490e
+--- /dev/null
++++ b/libc/sysdeps/linux/arm/bits/arm_bx.h
+@@ -0,0 +1,34 @@
++/* Copyright (C) 2013 Yann E. MORIN <yann.morin.1998@free.fr>
++ *
++ * This file is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as
++ * published by the Free Software Foundation; either version 2.1 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with the GNU C Library; if not, see
++ * <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef _ARM_BX_H
++#define _ARM_BX_H
++
++/* We need features.h first */
++#if !defined _FEATURES_H
++#error Please include features.h first
++#endif /* features.h not yet included */
++
++#if defined(__USE_BX__)
++# if (   defined (__ARM_ARCH_2__)  || defined (__ARM_ARCH_3__) \
++      || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
++     )
++#  error Use of BX was requested, but is not available on the target processor.
++# endif /* ARCH level */
++#endif /* __USE_BX__ */
++
++#endif /* _ARM_BX_H */
+diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S
+index 1f7f09d..4d646be 100644
+--- a/libc/sysdeps/linux/arm/clone.S
++++ b/libc/sysdeps/linux/arm/clone.S
+@@ -25,6 +25,7 @@
+ #include <bits/errno.h>
+ #include <sys/syscall.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #if defined(__NR_clone)
+ /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
+diff --git a/libc/sysdeps/linux/arm/mmap64.S b/libc/sysdeps/linux/arm/mmap64.S
+index 7071541..bd2cfb8 100644
+--- a/libc/sysdeps/linux/arm/mmap64.S
++++ b/libc/sysdeps/linux/arm/mmap64.S
+@@ -21,6 +21,7 @@
+ #include <bits/errno.h>
+ #include <sys/syscall.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #if defined __UCLIBC_HAS_LFS__ && defined __NR_mmap2
+ 
+diff --git a/libc/sysdeps/linux/arm/syscall-eabi.S b/libc/sysdeps/linux/arm/syscall-eabi.S
+index b931882..019f701 100644
+--- a/libc/sysdeps/linux/arm/syscall-eabi.S
++++ b/libc/sysdeps/linux/arm/syscall-eabi.S
+@@ -18,6 +18,7 @@
+ 
+ #include <sys/syscall.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ /* In the EABI syscall interface, we don't need a special syscall to
+    implement syscall().  It won't work reliably with 64-bit arguments
+diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h
+index e498695..9c1dbca 100644
+--- a/libc/sysdeps/linux/arm/sysdep.h
++++ b/libc/sysdeps/linux/arm/sysdep.h
+@@ -21,7 +21,7 @@
+ #define _LINUX_ARM_SYSDEP_H 1
+ 
+ #include <common/sysdep.h>
+-#include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #include <sys/syscall.h>
+ /* For Linux we can use the system call table in the header file
+diff --git a/libc/sysdeps/linux/arm/vfork.S b/libc/sysdeps/linux/arm/vfork.S
+index 17d6a4d..6c55d71 100644
+--- a/libc/sysdeps/linux/arm/vfork.S
++++ b/libc/sysdeps/linux/arm/vfork.S
+@@ -7,6 +7,7 @@
+ 
+ #include <features.h>
+ #include <bits/arm_asm.h>
++#include <bits/arm_bx.h>
+ 
+ #define _ERRNO_H
+ #include <bits/errno.h>
+-- 
+1.8.1.2
+

From 8211ee3c596fe6f8338110b1d94e600b67ce5e17 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:25 +0200
Subject: [PATCH 5698/6849] arch: use tabs instead of spaces in Config.in files

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in       | 2 +-
 arch/Config.in.avr32 | 4 ++--
 arch/Config.in.bfin  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/Config.in b/arch/Config.in
index c2147a4049..0b5b2187bc 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -1,5 +1,5 @@
 config BR2_ARCH_IS_64
-       bool
+	bool
 
 config BR2_SOFT_FLOAT
 	bool
diff --git a/arch/Config.in.avr32 b/arch/Config.in.avr32
index ebf8454150..199c150781 100644
--- a/arch/Config.in.avr32
+++ b/arch/Config.in.avr32
@@ -1,5 +1,5 @@
 config BR2_ARCH
-       default "avr32"
+	default "avr32"
 
 config BR2_ENDIAN
-       default "BIG"
+	default "BIG"
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index f755c8db0f..415fc890d8 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -66,7 +66,7 @@ config BR2_ARCH
 	default "bfin"
 
 config BR2_ENDIAN
-        default "LITTLE"
+	default "LITTLE"
 
 config BR2_GCC_TARGET_CPU
 	default bf606		if BR2_bf606

From d2dc7be318557412a553fae6647495de66dd0e66 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Jul 2013 10:03:19 +0200
Subject: [PATCH 5699/6849] configs: use new EABIhf option for
 beaglebone_defconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/beaglebone_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index a141320254..d6b5c31802 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -1,8 +1,7 @@
 # architecture
 BR2_arm=y
 BR2_cortex_a8=y
-BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-fpu=vfpv3 --with-float=hard"
-# BR2_SOFT_FLOAT is not set
+BR2_ARM_EABIHF=y
 
 # system
 BR2_TARGET_GENERIC_HOSTNAME="beaglebone"

From 6b3a0417c468617e7619b244e9d29d06224249ad Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 16 Jul 2013 21:32:45 -0300
Subject: [PATCH 5700/6849] arch/arm: arm926 may have VFP

The VFP9-S FPU (VFPv2) is optional for ARM926EJ-S, see:
http://www.arm.com/products/processors/classic/arm9/arm926.php?tab=Specifications+
Real silicon:
http://www.nxp.com/documents/data_sheet/LPC3180.pdf

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 94c32c9672..b2fe2576b2 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -51,6 +51,7 @@ config BR2_arm922t
 	bool "arm922t"
 config BR2_arm926t
 	bool "arm926t"
+	select BR2_ARM_CPU_MAYBE_HAS_VFPV2
 config BR2_arm10t
 	bool "arm10t"
 config BR2_arm1136jf_s_r0

From fedf4815ba8fd7e600e9894ad321eb99049f9223 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 17 Jul 2013 09:31:06 +0200
Subject: [PATCH 5701/6849] gcc-final: ensure TARGET_DIR/usr/lib exists before
 copying to it

Got dropped in the toolchain/gcc -> package/gcc conversion.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-final/gcc-final.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index b89b2b72b6..0d9d581ac7 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -128,6 +128,7 @@ endif
 
 ifneq ($(HOST_GCC_FINAL_USR_LIBS),)
 define HOST_GCC_FINAL_INSTALL_USR_LIBS
+	mkdir -p $(TARGET_DIR)/usr/lib
 	for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \
 		cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/$${i}.so* \
 			$(STAGING_DIR)/usr/lib/ ; \

From 9f5a9deb8cd02697c542422616e0c1879a943861 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 17 Jul 2013 09:37:36 +0200
Subject: [PATCH 5702/6849] pkg-autotools.mk: also use QUIET for host configure
 runs

Similar to how we do it for target configure runs. For make -s invocations.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-autotools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 09deef2f36..b0edddebc7 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -136,7 +136,7 @@ define $(2)_CONFIGURE_CMDS
 		--disable-documentation \
 		--with-xmlto=no \
 		--with-fop=no \
-		$$($$(PKG)_CONF_OPT) \
+		$$(QUIET) $$($$(PKG)_CONF_OPT) \
 	)
 endef
 endif

From 0bbbcb96db1628d083f39818faa4b3eb74835180 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Jul 2013 22:30:47 +0200
Subject: [PATCH 5703/6849] toolchain/helpers: don't use the x$(...) = x"value"
 syntax

As noted by Yann E. Morin, the x$(...) = x"value" syntax is old and
ugly, and the easier to read "$(...)" = "value" can now be used
without problems.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 95217e7b29..764c795d85 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -181,7 +181,7 @@ create_lib64_symlinks = \
 # $2: feature description
 #
 check_glibc_feature = \
-	if [ x$($(1)) != x"y" ] ; then \
+	if [ "$($(1))" != "y" ] ; then \
 		echo "$(2) available in C library, please enable $(1)" ; \
 		exit 1 ; \
 	fi
@@ -236,11 +236,11 @@ check_glibc = \
 #
 check_uclibc_feature = \
 	IS_IN_LIBC=`grep -q "\#define $(1) 1" $(3) && echo y` ; \
-	if [ x$($(2)) != x"y" -a x$${IS_IN_LIBC} = x"y" ] ; then \
+	if [ "$($(2))" != "y" -a "$${IS_IN_LIBC}" = "y" ] ; then \
 		echo "$(4) available in C library, please enable $(2)" ; \
 		exit 1 ; \
 	fi ; \
-	if [ x$($(2)) = x"y" -a x$${IS_IN_LIBC} != x"y" ] ; then \
+	if [ "$($(2))" = "y" -a "$${IS_IN_LIBC}" != "y" ] ; then \
 		echo "$(4) not available in C library, please disable $(2)" ; \
 		exit 1 ; \
 	fi

From b2e88073dbf05faa47475bf96d5ccf8a45906a3c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Jul 2013 22:30:48 +0200
Subject: [PATCH 5704/6849] toolchain: check ARM EABI vs. EABIhf for external
 toolchains

Following the introduction of the support of EABIhf as a second ARM
ABI, it is important to check whether the external toolchain provided
by the user actually uses the ABI that has been selected in the
Buildroot configuration. This commit introduces such a check by
looking at the 'Tag_ABI_VFP_args' tag of the architecture-specific
section of the ELF headers. This assumes that ELF is the binary format
used on ARM, which may not be the case on ARM noMMU systems (they use
the FLAT binary format), but Buildroot doesn't have support for such
systems at the moment.

Also ensure the correct CFLAGS are passed to the cross compiler for the
test, so the correct variant is used in case the toolchain is multilib.

[Peter: mention CFLAGS change]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/helpers.mk                     | 15 +++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 764c795d85..4c988a5c9a 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -279,10 +279,25 @@ check_uclibc = \
 #
 check_arm_abi = \
 	__CROSS_CC=$(strip $1) ; \
+	__CROSS_READELF=$(strip $2) ; \
 	EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \
 	if ! echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
 		echo "External toolchain uses the unsuported OABI" ; \
 		exit 1 ; \
+	fi ; \
+	EXT_TOOLCHAIN_CRT1=`LANG=C $${__CROSS_CC} -print-file-name=crt1.o` ; \
+	if $${__CROSS_READELF} -A $${EXT_TOOLCHAIN_CRT1} | grep -q "Tag_ABI_VFP_args:" ; then \
+		EXT_TOOLCHAIN_ABI="eabihf" ; \
+	else \
+		EXT_TOOLCHAIN_ABI="eabi" ; \
+	fi ; \
+	if [ "$(BR2_ARM_EABI)" = "y" -a "$${EXT_TOOLCHAIN_ABI}" = "eabihf" ] ; then \
+		echo "Incorrect ABI setting: EABI selected, but toolchain uses EABIhf" ; \
+		exit 1 ; \
+	fi ; \
+	if [ "$(BR2_ARM_EABIHF)" = "y" -a "$${EXT_TOOLCHAIN_ABI}" = "eabi" ] ; then \
+		echo "Incorrect ABI setting: EABIhf selected, but toolchain uses EABI" ; \
+		exit 1 ; \
 	fi
 
 #
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b9ae68f0a3..80e03b9808 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -125,6 +125,7 @@ endif
 TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
 TOOLCHAIN_EXTERNAL_CXX=$(TOOLCHAIN_EXTERNAL_CROSS)g++
+TOOLCHAIN_EXTERNAL_READELF=$(TOOLCHAIN_EXTERNAL_CROSS)readelf
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = -DBR_SYSROOT='"$(STAGING_SUBDIR)"'
 
 ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),)
@@ -368,7 +369,9 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 		exit 1 ; \
 	fi ; \
 	if test x$(BR2_arm) == x"y" ; then \
-		$(call check_arm_abi,$(TOOLCHAIN_EXTERNAL_CC)) ; \
+		$(call check_arm_abi,\
+			"$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS)",\
+			$(TOOLCHAIN_EXTERNAL_READELF)) ; \
 	fi ; \
 	if test x$(BR2_INSTALL_LIBSTDCPP) == x"y" ; then \
 		$(call check_cplusplus,$(TOOLCHAIN_EXTERNAL_CXX)) ; \

From f50eff3401e5f41f68bd08d92d9886eecf23926f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Jul 2013 22:30:49 +0200
Subject: [PATCH 5705/6849] toolchain/toolchain-external: don't use x$(...)
 construct or ==

With modern shells, we can simply do test using the "$(...)" = "value"
form. This commit gets rid of the x$(...) = x"value" constructs and
replaces == by =, which is the correct operator to test the equality
of two strings with the test program.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 80e03b9808..8aac50e2b8 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -368,15 +368,15 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
-	if test x$(BR2_arm) == x"y" ; then \
+	if test "$(BR2_arm)" = "y" ; then \
 		$(call check_arm_abi,\
 			"$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS)",\
 			$(TOOLCHAIN_EXTERNAL_READELF)) ; \
 	fi ; \
-	if test x$(BR2_INSTALL_LIBSTDCPP) == x"y" ; then \
+	if test "$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \
 		$(call check_cplusplus,$(TOOLCHAIN_EXTERNAL_CXX)) ; \
 	fi ; \
-	if test x$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC) == x"y" ; then \
+	if test "$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \
 		$(call check_uclibc,$${SYSROOT_DIR}) ; \
 	else \
 		$(call check_glibc,$${SYSROOT_DIR}) ; \
@@ -464,7 +464,7 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	if [ -L $${ARCH_SYSROOT_DIR}/lib64 -o -d $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
 		$(call create_lib64_symlinks) ; \
 	fi ; \
-	if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \
+	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
 		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \

From 8316801f3404aee87b74d2a7fae17861bd165167 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Jul 2013 22:30:50 +0200
Subject: [PATCH 5706/6849] arch/arm: update VFPv2 comment to mention ARMv5

Commit 6b3a0417c4 ('arch/arm: arm926 may have VFP') forgot to update
the help text of the VFPv2 option to mention ARMv5. This commit fixes
that.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index b2fe2576b2..2a0cf45752 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -193,8 +193,9 @@ config BR2_ARM_FPU_VFPV2
 	depends on BR2_ARM_CPU_HAS_VFPV2 || BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	help
 	  This option allows to use the VFPv2 floating point unit, as
-	  available in some ARMv6 processors (ARM1136JF-S,
-	  ARM1176JZF-S and ARM11 MPCore).
+	  available in some ARMv5 processors (ARM926EJ-S) and some
+	  ARMv6 processors (ARM1136JF-S, ARM1176JZF-S and ARM11
+	  MPCore).
 
 	  Note that this option is also safe to use for newer cores
 	  such as Cortex-A, because the VFPv3 and VFPv4 units are

From 79310d327586619866a672fbaecc5682a33a0937 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 17 Jul 2013 12:39:15 -0300
Subject: [PATCH 5707/6849] arch/arm: add support for thumb(1) mode

[Peter: also adjust BR2_GCC_TARGET_MODE]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in.arm | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 2a0cf45752..c0fabb7ca4 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -31,6 +31,9 @@ config BR2_ARM_CPU_HAS_VFPV4
 	bool
 	select BR2_ARM_CPU_HAS_VFPV3
 
+config BR2_ARM_CPU_HAS_THUMB
+	bool
+
 config BR2_ARM_CPU_HAS_THUMB2
 	bool
 
@@ -43,28 +46,38 @@ choice
 
 config BR2_arm7tdmi
 	bool "arm7tdmi"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm720t
 	bool "arm720t"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm920t
 	bool "arm920t"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm922t
 	bool "arm922t"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm926t
 	bool "arm926t"
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV2
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm10t
 	bool "arm10t"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm1136jf_s_r0
 	bool "arm1136jf_s rev0"
 	select BR2_ARM_CPU_HAS_VFPV2
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm1136jf_s_r1
 	bool "arm1136jf_s rev1"
 	select BR2_ARM_CPU_HAS_VFPV2
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm1176jz_s
 	bool "arm1176jz-s"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
 	select BR2_ARM_CPU_HAS_VFPV2
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_cortex_a5
 	bool "cortex-A5"
 	select BR2_ARM_CPU_MAYBE_HAS_NEON
@@ -99,6 +112,7 @@ config BR2_strongarm
 	bool "strongarm sa110/sa1100"
 config BR2_xscale
 	bool "xscale"
+	select BR2_ARM_CPU_HAS_THUMB
 config BR2_iwmmxt
 	bool "iwmmxt"
 endchoice
@@ -287,7 +301,7 @@ endchoice
 
 choice
 	prompt "ARM instruction set"
-	depends on BR2_ARM_CPU_HAS_THUMB2
+	depends on BR2_ARM_CPU_HAS_THUMB || BR2_ARM_CPU_HAS_THUMB2
 
 config BR2_ARM_INSTRUCTIONS_ARM_CHOICE
 	bool "ARM"
@@ -295,8 +309,18 @@ config BR2_ARM_INSTRUCTIONS_ARM_CHOICE
 	  This option instructs the compiler to generate regular ARM
 	  instructions, that are all 32 bits wide.
 
+config BR2_ARM_INSTRUCTIONS_THUMB
+	bool "Thumb"
+	depends on BR2_ARM_CPU_HAS_THUMB
+	help
+	  This option instructions the compiler to generate Thumb
+	  instructions, which allows to mix 16 bits instructions and
+	  32 bits instructions. This generally provides a much smaller
+	  compiled binary size.
+
 config BR2_ARM_INSTRUCTIONS_THUMB2
 	bool "Thumb2"
+	depends on BR2_ARM_CPU_HAS_THUMB2
 	help
 	  This option instructions the compiler to generate Thumb2
 	  instructions, which allows to mix 16 bits instructions and
@@ -307,7 +331,7 @@ endchoice
 
 config BR2_ARM_INSTRUCTIONS_ARM
 	def_bool y
-	depends on !BR2_ARM_INSTRUCTIONS_THUMB2
+	depends on !(BR2_ARM_INSTRUCTIONS_THUMB || BR2_ARM_INSTRUCTIONS_THUMB2)
 
 config BR2_ARCH
 	default "arm"	if BR2_arm
@@ -381,4 +405,4 @@ config BR2_GCC_TARGET_FLOAT_ABI
 
 config BR2_GCC_TARGET_MODE
 	default "arm"		if BR2_ARM_INSTRUCTIONS_ARM
-	default "thumb"		if BR2_ARM_INSTRUCTIONS_THUMB2
+	default "thumb"		if BR2_ARM_INSTRUCTIONS_THUMB || BR2_ARM_INSTRUCTIONS_THUMB2

From e1ba6ef59579d28be7bbef030cfe138011135d13 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 18 Jul 2013 11:25:49 +0200
Subject: [PATCH 5708/6849] uclibc: uclibc-menuconfig: don't depend on
 gcc/binutils

With the move of uclibc to package/uclibc, the uclibc-menuconfig target now
depends on uclibc-configure, which brings in the build of
binutils/gcc-initial/mpfr/gmp, causing it to take ages with a clean tree.

Fix it by moving the basic .config mangling to the patch step, and depend
on that for menuconfig instead.

Notice that this is broken for _OVERRIDE_SRCDIR users, just like for
busybox, but as that is presumably a small subset of the buildroot
user base (and these advanced users can just run menuconfig in their
local uClibc tree), so this is considered the lesser evil of the two.

The proposed out-of-tree build series will also cause problems with
this.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/uclibc.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 8eca5feee8..f775b15601 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -358,7 +358,7 @@ UCLIBC_MAKE_FLAGS = \
 	UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 	HOSTCC="$(HOSTCC)"
 
-define UCLIBC_CONFIGURE_CMDS
+define UCLIBC_SETUP_DOT_CONFIG
 	cp -f $(UCLIBC_CONFIG_FILE) $(@D)/.config
 	$(call UCLIBC_OPT_SET,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D))
 	$(call UCLIBC_OPT_SET,TARGET_$(UCLIBC_TARGET_ARCH),y,$(@D))
@@ -395,6 +395,11 @@ define UCLIBC_CONFIGURE_CMDS
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_DIR) \
 		oldconfig
+endef
+
+UCLIBC_POST_PATCH_HOOKS += UCLIBC_SETUP_DOT_CONFIG
+
+define UCLIBC_CONFIGURE_CMDS
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \
@@ -470,13 +475,13 @@ define UCLIBC_INSTALL_STAGING_CMDS
 	ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
 endef
 
-uclibc-menuconfig: dirs uclibc-configure
+uclibc-menuconfig: dirs uclibc-patch
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_DIR)/ \
 		menuconfig
-	rm -f $(UCLIBC_DIR)/.stamp_{built,target_installed,staging_installed}
+	rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
 
 $(eval $(generic-package))

From c34cd9e2dab7c37bb0bdea6f43e57addf2b710e2 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 18 Jul 2013 01:50:34 -0500
Subject: [PATCH 5709/6849] ti-gfx: use BR2_ARM_EABIHF

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ti-gfx/Config.in | 5 -----
 package/ti-gfx/ti-gfx.mk | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
index a37705c131..f336c52aad 100644
--- a/package/ti-gfx/Config.in
+++ b/package/ti-gfx/Config.in
@@ -28,11 +28,6 @@ config BR2_PACKAGE_TI_GFX_EGLIMAGE
 	help
 	  Installs OpenGL libaries which support the eglimage api.
 
-config BR2_PACKAGE_TI_GFX_HARD_FLOAT
-	bool "use hard float binaries"
-	help
-	  Install hard float binaries (required if using a hard float toolchain)
-
 choice
 	prompt "Target"
 	default BR2_PACKAGE_TI_GFX_ES3
diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk
index 0838bde18e..771399095a 100644
--- a/package/ti-gfx/ti-gfx.mk
+++ b/package/ti-gfx/ti-gfx.mk
@@ -7,7 +7,7 @@
 TI_GFX_VERSION = 4_09_00_01
 TI_GFX_SO_VERSION = 1.9.2188537
 
-ifeq ($(BR2_PACKAGE_TI_GFX_HARD_FLOAT),y)
+ifeq ($(BR2_ARM_EABIHF),y)
 TI_GFX_SOURCE = Graphics_SDK_setuplinux_$(TI_GFX_VERSION)_hardfp_minimal_demos.bin
 else
 TI_GFX_SOURCE = Graphics_SDK_setuplinux_$(TI_GFX_VERSION)_minimal_demos.bin

From 4e0ddff690080f5bac47aedebc9c48b9cd74bd49 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 18 Jul 2013 23:56:23 +0200
Subject: [PATCH 5710/6849] xenomai: requires thread support

Fixes
http://autobuild.buildroot.org/results/c99/c9912b2c21594350945c8a64528bb6a9b34d6292/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.ext.in       | 4 ++++
 package/xenomai/Config.in | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 172fa76c75..70f3e32d7f 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -3,6 +3,7 @@ menu "Linux Kernel Extensions"
 # Xenomai
 config BR2_LINUX_KERNEL_EXT_XENOMAI
 	bool "Adeos/Xenomai Real-time patch"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
 		   BR2_bfin || BR2_powerpc || BR2_sh4
 	select BR2_PACKAGE_XENOMAI
@@ -15,6 +16,9 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
 	  ARM, 2.6.35.9, 2.6.37.6, 2.6.38.8, on NIOS2, 2.6.35, on
 	  PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8.
 
+comment "xenomai requires thread support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 	depends on BR2_LINUX_KERNEL_EXT_XENOMAI
 	string "Path for Adeos patch file"
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 767f6229db..f9de36bf22 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -1,5 +1,9 @@
+comment "xenomai requires thread support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_XENOMAI
 	bool "Xenomai Userspace"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
 		   BR2_bfin || BR2_powerpc || BR2_sh4
 	help

From a03386fba330bc1c4efce56723a2dcec80739f37 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 18 Jul 2013 23:24:12 +0200
Subject: [PATCH 5711/6849] defconfig/rpi: bump kernel for misc fixes

Bump for a few fixes:
  - fix for slow SDcards
  - fix for USB interrupts
  - fix for tracing functions

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/rpi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 3df440fa65..9d608f1466 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.6.11"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="53f7e0b"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="0006326"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_ZIMAGE=y

From a8a7960c3184bb97a8a60704cd4ba9b2c523188c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 18 Jul 2013 23:24:13 +0200
Subject: [PATCH 5712/6849] package/nss-mdns: fix avahi socket location

In buildroot, the avahi socket is located in /var/run/avahi-daemon,
not in /usr/var/run/avahi-daemon/socket.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nss-mdns/nss-mdns.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index ea53bc2861..4d366335e2 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -7,6 +7,8 @@
 NSS_MDNS_VERSION=0.10
 NSS_MDNS_SITE=http://0pointer.de/lennart/projects/nss-mdns
 
+NSS_MDNS_CONF_OPT += --localstatedir=/var
+
 define NSS_MDNS_INSTALL_CONFIG
 	$(INSTALL) -D -m 0664 package/nss-mdns/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf
 endef

From f2e610da5a8dfd37ec4a963f0c99496a304d0b26 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 18 Jul 2013 23:24:14 +0200
Subject: [PATCH 5713/6849] package/nss-mdns: do not overwrite user's
 nsswitch.conf

Instead of over-writing the nsswitch.conf file (which may already contain
user's specific configuration if it comes from a custom skeleton), just
replace the 'hosts' line.

Remove now-useless custom nsswitch.conf file.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nss-mdns/nss-mdns.mk   |  3 ++-
 package/nss-mdns/nsswitch.conf | 15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 package/nss-mdns/nsswitch.conf

diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 4d366335e2..83d9a2a951 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -10,7 +10,8 @@ NSS_MDNS_SITE=http://0pointer.de/lennart/projects/nss-mdns
 NSS_MDNS_CONF_OPT += --localstatedir=/var
 
 define NSS_MDNS_INSTALL_CONFIG
-	$(INSTALL) -D -m 0664 package/nss-mdns/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf
+	sed -r -i -e 's/^(hosts:[[:space:]]+).*/\1files mdns4_minimal [NOTFOUND=return] dns mdns4/' \
+	    $(TARGET_DIR)/etc/nsswitch.conf
 endef
 
 NSS_MDNS_POST_INSTALL_TARGET_HOOKS += NSS_MDNS_INSTALL_CONFIG
diff --git a/package/nss-mdns/nsswitch.conf b/package/nss-mdns/nsswitch.conf
deleted file mode 100644
index 94174e03e3..0000000000
--- a/package/nss-mdns/nsswitch.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/nsswitch.conf
-
-passwd:         compat
-group:          compat
-shadow:         compat
-
-hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
-networks:       files
-
-protocols:      db files
-services:       db files
-ethers:         db files
-rpc:            db files
-
-netgroup:       nis

From aaa06aaa82787b77ea56a7664cb4b0a22eca5c31 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 18 Jul 2013 23:54:50 +0200
Subject: [PATCH 5714/6849] toolchain: instrument external toolchain wrapper

If BR_DEBUG_WRAPPER is set in the envirnment, dump the actual command
being exec()uted, to ease debugging issues with the wrapper.

[Peter: adjust code style and output format to be cut'n'paste compatible]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-toolchain-wrapper.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 460f255ee5..befd735f11 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -136,6 +136,15 @@ int main(int argc, char **argv)
 	/* finish with NULL termination */
 	*cur = NULL;
 
+	if (getenv("BR_DEBUG_WRAPPER")) {
+		fprintf(stderr, "Executing");
+
+		for (i = 0; args[i]; i++)
+			fprintf(stderr, " %s", args[i]);
+
+		fprintf(stderr, "\n");
+	}
+
 	if (execv(path, args))
 		perror(path);
 

From 39ed0d29990fda16bbc55e54183ea1331b72be0f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 18 Jul 2013 21:42:19 +0200
Subject: [PATCH 5715/6849] linux-firmware: add support for b43xx firmwares

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-firmware/Config.in         | 5 +++++
 package/linux-firmware/linux-firmware.mk | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index d9bb095d1c..01fe90fa62 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -20,6 +20,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
 	help
 	  Firmware files for the Atheros 9271 module
 
+config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX
+	bool "Broadcom BRCM bcm43xx"
+	help
+	  Firmware files for the Broadcom BRCM bcm43xx
+
 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
 	bool "Intel iwlwifi 5000"
 	help
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 4ff0e0aa80..a88bc4cb99 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -112,6 +112,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_DIB0700) += \
 LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_H5_DRXK) += \
 	dvb-usb-terratec-h5-drxk.fw
 
+# brcm
+LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX) += \
+	brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw
 
 ifneq ($(LINUX_FIRMWARE_FILES_y),)
 

From 983dd6426e7ed0df54c1e38d74bd6578b80d8e7b Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 18 Jul 2013 23:47:51 +0200
Subject: [PATCH 5716/6849] arc: binutils: Go from 2.19-arc to 2.23.2-arc

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../2.19-arc/add-empty-info-files.patch       | 72 -------------------
 package/binutils/Config.in.host               |  2 +-
 package/binutils/binutils.mk                  |  4 --
 3 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 package/binutils/2.19-arc/add-empty-info-files.patch

diff --git a/package/binutils/2.19-arc/add-empty-info-files.patch b/package/binutils/2.19-arc/add-empty-info-files.patch
deleted file mode 100644
index 90de429653..0000000000
--- a/package/binutils/2.19-arc/add-empty-info-files.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-binutils: add empty info files to remove makeinfo dependency
-
-Signed-off-by: Mischa jonker <mjonker@synopsys.com>
----
- bfd/doc/bfd.info           |    1 +
- binutils/doc/binutils.info |    1 +
- etc/configure.info         |    1 +
- etc/standards.info         |    1 +
- gas/doc/as.info            |    1 +
- gprof/gprof.info           |    1 +
- ld/ld.info                 |    1 +
- 7 files changed, 7 insertions(+), 0 deletions(-)
- create mode 100644 bfd/doc/bfd.info
- create mode 100644 binutils/doc/binutils.info
- create mode 100644 etc/configure.info
- create mode 100644 etc/standards.info
- create mode 100644 gas/doc/as.info
- create mode 100644 gprof/gprof.info
- create mode 100644 ld/ld.info
-
-diff --git a/bfd/doc/bfd.info b/bfd/doc/bfd.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/bfd/doc/bfd.info
-@@ -0,0 +1 @@
-+
-diff --git a/binutils/doc/binutils.info b/binutils/doc/binutils.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/binutils/doc/binutils.info
-@@ -0,0 +1 @@
-+
-diff --git a/etc/configure.info b/etc/configure.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/etc/configure.info
-@@ -0,0 +1 @@
-+
-diff --git a/etc/standards.info b/etc/standards.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/etc/standards.info
-@@ -0,0 +1 @@
-+
-diff --git a/gas/doc/as.info b/gas/doc/as.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/gas/doc/as.info
-@@ -0,0 +1 @@
-+
-diff --git a/gprof/gprof.info b/gprof/gprof.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/gprof/gprof.info
-@@ -0,0 +1 @@
-+
-diff --git a/ld/ld.info b/ld/ld.info
-new file mode 100644
-index 0000000..8b13789
---- /dev/null
-+++ b/ld/ld.info
-@@ -0,0 +1 @@
-+
--- 
-1.7.0.4
-
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 9ddaed7dd8..c2d2495362 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -44,7 +44,7 @@ endchoice
 config BR2_BINUTILS_VERSION
 	string
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "2.19-arc"	if BR2_arc
+	default "2.23.2-arc"	if BR2_arc
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 377bb79500..f1723b2148 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -55,11 +55,7 @@ HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			--with-sysroot=$(STAGING_DIR) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
-ifeq ($(BINUTILS_VERSION),2.19-arc)
-HOST_BINUTILS_DEPENDENCIES = host-flex host-bison
-else
 HOST_BINUTILS_DEPENDENCIES =
-endif
 
 # We just want libbfd and libiberty, not the full-blown binutils in staging
 define BINUTILS_INSTALL_STAGING_CMDS

From 381654d8a84072baf6742dd8697d65e3a55a5ef5 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 18 Jul 2013 23:47:52 +0200
Subject: [PATCH 5717/6849] arc: gcc: Go from 4.4.7 to 4.8 for ARC

This fixes multiple issues, including:
 - 'operand out of range' errors (due to defaulting to
   medium calls instead of short calls)
 - library dependencies that were not being found

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/4.8-arc/100-uclibc-conf.patch     |  15 ++
 .../gcc/4.8-arc/301-missing-execinfo_h.patch  |  13 ++
 package/gcc/4.8-arc/302-c99-snprintf.patch    |  13 ++
 .../4.8-arc/305-libmudflap-susv3-legacy.patch |  49 ++++++
 package/gcc/4.8-arc/disable_gc_sections.patch | 145 ++++++++++++++++++
 .../fix_branch_out_of_range.patch             |   2 +-
 package/gcc/Config.in.host                    |  13 +-
 package/gcc/gcc.mk                            |   2 +-
 8 files changed, 244 insertions(+), 8 deletions(-)
 create mode 100644 package/gcc/4.8-arc/100-uclibc-conf.patch
 create mode 100644 package/gcc/4.8-arc/301-missing-execinfo_h.patch
 create mode 100644 package/gcc/4.8-arc/302-c99-snprintf.patch
 create mode 100644 package/gcc/4.8-arc/305-libmudflap-susv3-legacy.patch
 create mode 100644 package/gcc/4.8-arc/disable_gc_sections.patch
 rename package/gcc/{4.4.7-arc => 4.8-arc}/fix_branch_out_of_range.patch (96%)

diff --git a/package/gcc/4.8-arc/100-uclibc-conf.patch b/package/gcc/4.8-arc/100-uclibc-conf.patch
new file mode 100644
index 0000000000..d56bf0a194
--- /dev/null
+++ b/package/gcc/4.8-arc/100-uclibc-conf.patch
@@ -0,0 +1,15 @@
+Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
+===================================================================
+--- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
++++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/package/gcc/4.8-arc/301-missing-execinfo_h.patch b/package/gcc/4.8-arc/301-missing-execinfo_h.patch
new file mode 100644
index 0000000000..00efda24aa
--- /dev/null
+++ b/package/gcc/4.8-arc/301-missing-execinfo_h.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.8.0/boehm-gc/include/gc.h
+===================================================================
+--- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
++++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/package/gcc/4.8-arc/302-c99-snprintf.patch b/package/gcc/4.8-arc/302-c99-snprintf.patch
new file mode 100644
index 0000000000..cd4d2ccfb6
--- /dev/null
+++ b/package/gcc/4.8-arc/302-c99-snprintf.patch
@@ -0,0 +1,13 @@
+Index: gcc-4.8.0/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- gcc-4.8.0.orig/libstdc++-v3/include/c_global/cstdio	2013-02-03 18:54:05.000000000 +0100
++++ gcc-4.8.0/libstdc++-v3/include/c_global/cstdio	2013-03-23 17:39:32.000000000 +0100
+@@ -138,7 +138,7 @@
+   using ::vsprintf;
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/package/gcc/4.8-arc/305-libmudflap-susv3-legacy.patch b/package/gcc/4.8-arc/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 0000000000..35d5f50207
--- /dev/null
+++ b/package/gcc/4.8-arc/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,49 @@
+Index: gcc-4.8.0/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
++++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
+@@ -424,7 +424,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -434,7 +434,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -444,7 +444,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -453,7 +453,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -462,7 +462,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/package/gcc/4.8-arc/disable_gc_sections.patch b/package/gcc/4.8-arc/disable_gc_sections.patch
new file mode 100644
index 0000000000..46a3a2697b
--- /dev/null
+++ b/package/gcc/4.8-arc/disable_gc_sections.patch
@@ -0,0 +1,145 @@
+From be904b178fc0858ad41a3c2fbc13b388bd1ff465 Mon Sep 17 00:00:00 2001
+From: Mischa Jonker <mjonker@synopsys.com>
+Date: Mon, 15 Jul 2013 11:50:20 +0200
+Subject: [PATCH] libstdc++: Disable gc-sections to work around binutils bug
+
+This is to work around the following error message:
+BFD (GNU Binutils) 2.23.2 assertion fail elf32-arc.c:2140
+
+Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
+---
+ libstdc++-v3/acinclude.m4 |    3 ---
+ libstdc++-v3/configure    |   33 ---------------------------------
+ 2 files changed, 36 deletions(-)
+
+diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
+index e131214..aa2e375 100644
+--- a/libstdc++-v3/acinclude.m4
++++ b/libstdc++-v3/acinclude.m4
+@@ -296,9 +296,6 @@ AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     AC_MSG_RESULT($ac_gcsections)
+ 
+     if test "$ac_test_CFLAGS" = set; then
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index ed049cf..d325e3e 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -20653,9 +20653,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -27688,9 +27685,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -33619,9 +33613,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -45496,9 +45487,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -45710,9 +45698,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -46185,9 +46170,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -52470,9 +52452,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -58386,9 +58365,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -58553,9 +58529,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -58781,9 +58754,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+@@ -64697,9 +64667,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       fi
+       rm -f conftest.c conftest.o conftest
+     fi
+-    if test "$ac_gcsections" = "yes"; then
+-      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-    fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
+ $as_echo "$ac_gcsections" >&6; }
+ 
+-- 
+1.7.9.5
+
diff --git a/package/gcc/4.4.7-arc/fix_branch_out_of_range.patch b/package/gcc/4.8-arc/fix_branch_out_of_range.patch
similarity index 96%
rename from package/gcc/4.4.7-arc/fix_branch_out_of_range.patch
rename to package/gcc/4.8-arc/fix_branch_out_of_range.patch
index e39b1cc2db..5340a3b691 100644
--- a/package/gcc/4.4.7-arc/fix_branch_out_of_range.patch
+++ b/package/gcc/4.8-arc/fix_branch_out_of_range.patch
@@ -24,7 +24,7 @@ index ff602c0..b3ca4c4 100644
  		  if (op0 != cmp0)
   		    cc_clob_rtx = gen_rtx_REG (CC_ZNmode, CC_REG);
 - 		  else if ((offset >= -140 && offset < 140)
-+ 		  else if ((offset >= -120 && offset < 120)
++		  else if ((offset >= -120 && offset < 120)
  			   && rtx_equal_p (op1, const0_rtx)
  			   && compact_register_operand (op0, VOIDmode)
  			   && (GET_CODE (op) == EQ
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 972f81fdb1..c49b8ed0e4 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -7,15 +7,11 @@ choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
-	default BR2_GCC_VERSION_4_4_7_ARC if BR2_arc
+	default BR2_GCC_VERSION_4_8_ARC if BR2_arc
 	default BR2_GCC_VERSION_4_7_X
 	help
 	  Select the version of gcc you wish to use.
 
-	config BR2_GCC_VERSION_4_4_7_ARC
-		depends on BR2_arc
-		bool "gcc 4.4.7-arc"
-
 	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 		depends on BR2_avr32
 		bool "gcc 4.2.2-avr32-2.1.5"
@@ -55,6 +51,11 @@ choice
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.8.x"
 
+	config BR2_GCC_VERSION_4_8_ARC
+		depends on BR2_arc
+		select BR2_GCC_NEEDS_MPC
+		bool "gcc 4.8-arc"
+
 	config BR2_GCC_VERSION_SNAP
 		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		select BR2_GCC_NEEDS_MPC
@@ -84,11 +85,11 @@ config BR2_GCC_VERSION
 	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.3.6"     if BR2_GCC_VERSION_4_3_X
 	default "4.4.7"     if BR2_GCC_VERSION_4_4_X
-	default "4.4.7-arc" if BR2_GCC_VERSION_4_4_7_ARC
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
 	default "4.8.1"     if BR2_GCC_VERSION_4_8_X
+	default "4.8-arc"   if BR2_GCC_VERSION_4_8_ARC
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index ae2a363510..c0d821be59 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -133,7 +133,7 @@ HOST_GCC_COMMON_DEPENDENCIES += host-mpc
 HOST_GCC_COMMON_CONF_OPT += --with-mpc=$(HOST_DIR)/usr
 endif
 
-ifeq ($(BR2_GCC_VERSION_4_4_7_ARC),y)
+ifeq ($(BR2_arc),y)
 HOST_GCC_COMMON_DEPENDENCIES += host-flex host-bison
 endif
 

From cdba648ec750ef49fffe31fe3de06b28ba39e130 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Thu, 18 Jul 2013 23:47:50 +0200
Subject: [PATCH 5718/6849] uclibc, eglibc: remove REALLY_NOSTDLIB references

These were required with ARC gcc 4.4.7; ARC gcc 4.8 has been changed
to behave the same as other architectures with -nostdlib, making this
option obsolete.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk |  2 +-
 package/uclibc/uclibc.mk | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index ccdc2109d3..5431ac574c 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -61,7 +61,7 @@ define EGLIBC_CONFIGURE_CMDS
 	cp $(@D)/build/csu/crt1.o $(STAGING_DIR)/usr/lib/
 	cp $(@D)/build/csu/crti.o $(STAGING_DIR)/usr/lib/
 	cp $(@D)/build/csu/crtn.o $(STAGING_DIR)/usr/lib/
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) \
+	$(TARGET_CROSS)gcc -nostdlib \
 		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
 endef
 
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index f775b15601..d5ea7a4b76 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -162,13 +162,6 @@ define UCLIBC_X86_TYPE_CONFIG
 endef
 endif
 
-#
-# ARC definitions
-#
-ifeq ($(UCLIBC_TARGET_ARCH),arc)
-REALLY_NOSTDLIB = -really-nostdlib
-endif
-
 #
 # Endianess
 #
@@ -407,9 +400,9 @@ define UCLIBC_CONFIGURE_CMDS
 		RUNTIME_PREFIX=$(STAGING_DIR) \
 		headers lib/crt1.o lib/crti.o lib/crtn.o \
 		install_headers
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) \
+	$(TARGET_CROSS)gcc -nostdlib \
 		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
-	$(TARGET_CROSS)gcc -nostdlib $(REALLY_NOSTDLIB) \
+	$(TARGET_CROSS)gcc -nostdlib \
 		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libm.so
 	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(STAGING_DIR)/usr/lib/
 endef

From 717ac057500fb149dcff2d9d8216e75000b7661b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 19 Jul 2013 21:12:43 +0200
Subject: [PATCH 5719/6849] gst1-plugins-good: unbreak (dyn|multi)udpsink for
 systems without IPv6 support

Patch from upstream git.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...k-unbreak-on-IPv6-systems-after-1302.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch

diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch b/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
new file mode 100644
index 0000000000..68a996940d
--- /dev/null
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
@@ -0,0 +1,44 @@
+From 118876702467d6063e9c9745b7d093682ad16472 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Fri, 19 Jul 2013 15:24:08 +0200
+Subject: [PATCH] (dyn|multi)udpsink: unbreak on !IPv6 systems after 130268bc
+ (Bind socket before using it)
+
+The g_socket functions only touch the error argument on errors, so clear
+err back to NULL in case g_socket_new (G_SOCKET_FAMILY_IPV6) failed, as
+we check for err != NULL later on to know if g_socket_bind() failed,
+otherwise we errously fail on systems without IPv6 support.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=704553
+---
+ gst/udp/gstdynudpsink.c   |    1 +
+ gst/udp/gstmultiudpsink.c |    1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
+index 4690bde..fadbd7f 100644
+--- a/gst/udp/gstdynudpsink.c
++++ b/gst/udp/gstdynudpsink.c
+@@ -316,6 +316,7 @@ gst_dynudpsink_start (GstBaseSink * bsink)
+     if ((udpsink->used_socket =
+             g_socket_new (G_SOCKET_FAMILY_IPV6,
+                 G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
++      g_clear_error (&err);
+       udpsink->family = G_SOCKET_FAMILY_IPV4;
+       if ((udpsink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
+                   G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
+diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
+index 92d1bac..69011c7 100644
+--- a/gst/udp/gstmultiudpsink.c
++++ b/gst/udp/gstmultiudpsink.c
+@@ -868,6 +868,7 @@ gst_multiudpsink_start (GstBaseSink * bsink)
+     if (sink->force_ipv4 || (sink->used_socket =
+             g_socket_new (G_SOCKET_FAMILY_IPV6,
+                 G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
++      g_clear_error (&err);
+       if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
+                   G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
+         goto no_socket;
+-- 
+1.7.10.4
+

From 98463e6f87ee6a8369accd0ab4c34d70afe422c4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Jul 2013 16:41:20 -0300
Subject: [PATCH 5720/6849] bind: security bump to version 9.6-ESV-R9-P1

Fixes CVE-2013-3919

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bind/{bind.sysvinit => S81named}         |  2 +-
 package/bind/bind-01-disable-tests.patch         | 16 ++++++++++++++++
 .../{bind-cross.patch => bind-02-cross.patch}    | 10 +++++++---
 package/bind/bind-susv3-legacy.patch             | 12 ------------
 package/bind/bind.mk                             | 12 ++++++++----
 5 files changed, 32 insertions(+), 20 deletions(-)
 rename package/bind/{bind.sysvinit => S81named} (99%)
 create mode 100644 package/bind/bind-01-disable-tests.patch
 rename package/bind/{bind-cross.patch => bind-02-cross.patch} (81%)
 delete mode 100644 package/bind/bind-susv3-legacy.patch

diff --git a/package/bind/bind.sysvinit b/package/bind/S81named
similarity index 99%
rename from package/bind/bind.sysvinit
rename to package/bind/S81named
index 171d3208aa..0160c11440 100644
--- a/package/bind/bind.sysvinit
+++ b/package/bind/S81named
@@ -50,7 +50,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $0 {start|stop|restart|reload|force-reload}"
-		exit 1 
+		exit 1
 esac
 
 exit 0
diff --git a/package/bind/bind-01-disable-tests.patch b/package/bind/bind-01-disable-tests.patch
new file mode 100644
index 0000000000..9c3d52ed7d
--- /dev/null
+++ b/package/bind/bind-01-disable-tests.patch
@@ -0,0 +1,16 @@
+Disable tests to avoid cross-compilation issues (tries to run genrandom).
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura bind-9.6-ESV-R9-P1.orig/bin/Makefile.in bind-9.6-ESV-R9-P1/bin/Makefile.in
+--- bind-9.6-ESV-R9-P1.orig/bin/Makefile.in	2013-06-04 15:30:48.000000000 -0300
++++ bind-9.6-ESV-R9-P1/bin/Makefile.in	2013-07-19 15:32:19.018287733 -0300
+@@ -19,7 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+
+-SUBDIRS =	named rndc dig dnssec tests nsupdate check
++SUBDIRS =	named rndc dig dnssec nsupdate check
+ TARGETS =
+
+ @BIND9_MAKE_RULES@
diff --git a/package/bind/bind-cross.patch b/package/bind/bind-02-cross.patch
similarity index 81%
rename from package/bind/bind-cross.patch
rename to package/bind/bind-02-cross.patch
index cdbf4cb899..5b4b1cd836 100644
--- a/package/bind/bind-cross.patch
+++ b/package/bind/bind-02-cross.patch
@@ -1,14 +1,18 @@
+Use host compiler to build 'gen' since it's run when building.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
 diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
 --- bind-9.5.1-P1/lib/dns/Makefile.in	2007-09-11 22:09:08.000000000 -0300
 +++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in	2009-03-04 16:35:23.000000000 -0200
 @@ -160,8 +160,8 @@
  	./gen -s ${srcdir} > code.h
- 
+
  gen: gen.c
 -	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
 -	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
 +	${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
 +	${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
- 
+
  rbtdb64.@O@: rbtdb.c
- 
+
diff --git a/package/bind/bind-susv3-legacy.patch b/package/bind/bind-susv3-legacy.patch
deleted file mode 100644
index 99be15c6f6..0000000000
--- a/package/bind/bind-susv3-legacy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura bind-9.5.2-P1/lib/isc/unix/ifiter_ioctl.c bind-9.5.2-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c
---- bind-9.5.2-P1/lib/isc/unix/ifiter_ioctl.c	2009-02-15 22:53:58.000000000 -0200
-+++ bind-9.5.2-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c	2009-12-03 13:12:56.000000000 -0300
-@@ -17,6 +17,8 @@
- 
- /* $Id: ifiter_ioctl.c,v 1.58.90.3 2009/02/16 00:53:58 marka Exp $ */
- 
-+#include <string.h>
-+
- /*! \file
-  * \brief
-  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 973981a9b1..4137093c62 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -1,10 +1,10 @@
-################################################################################
+###############################################################################
 #
 # bind
 #
 ################################################################################
 
-BIND_VERSION = 9.6-ESV-R8
+BIND_VERSION = 9.6-ESV-R9-P1
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_LICENSE = ISC
@@ -35,9 +35,13 @@ else
 	BIND_CONF_OPT += --with-openssl=no
 endif
 
+define BIND_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/bind/S81named \
+		$(TARGET_DIR)/etc/init.d/S81named
+endef
+
 define BIND_TARGET_INSTALL_FIXES
 	rm -f $(TARGET_DIR)/usr/bin/isc-config.sh
-	$(INSTALL) -m 0755 -D package/bind/bind.sysvinit $(TARGET_DIR)/etc/init.d/S81named
 endef
 
 BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_INSTALL_FIXES
@@ -61,8 +65,8 @@ endif
 define BIND_UNINSTALL_TARGET_CMDS
 	$(BIND_TARGET_REMOVE_SERVER)
 	$(BIND_TARGET_REMOVE_TOOLS)
-	rm -rf $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))
 	rm -f $(TARGET_DIR)/etc/init.d/S81named
+	rm -rf $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))
 endef
 
 $(eval $(autotools-package))

From fb354d5faaa9b912e3d868b92622c11323d6ae9f Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 19 Jul 2013 16:57:43 +0100
Subject: [PATCH 5721/6849] uClibc: Add uClibc patch to fix MIPS64/n64
 interpreter

uClibc picks the wrong interpreter for MIPS64/n64.
This patch fixes this problem by checking the selected
MIPS ABI instead of the MIPS variant.

The patch has been committed upstream:
http://git.uclibc.org/uClibc/commit/?id=603af30d6992e94ac30a66b953264076f4f2fd71

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../uclibc-0009-mips64-fix-n64-interp.patch   | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch

diff --git a/package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch b/package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch
new file mode 100644
index 0000000000..7efef7891d
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0009-mips64-fix-n64-interp.patch
@@ -0,0 +1,51 @@
+From 603af30d6992e94ac30a66b953264076f4f2fd71 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Thu, 11 Jul 2013 16:59:16 +0000
+Subject: Rules.mak: MIPS64: Select correct interpreter
+
+gcc (eg 4.7.3) hardcodes the MIPS64 interpreters like this:
+(see gcc/config/linux.h and gcc/config/mips/linux64.h)
+
+o32: UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+n32: UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+n64: UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+
+The existing check for MIPS64 in uClibc is wrong because it does
+not respect the selected ABI
+
+We fix this by explicitely checking the selected ABI instead of the
+selected MIPS variant.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Cc: Anthony G. Basile <blueness@gentoo.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+diff --git a/Rules.mak b/Rules.mak
+index 792b794..889108e 100644
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -138,13 +138,19 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL
+ LIBC := libc
+ SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
+ UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
+-ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
++
++UCLIBC_LDSO_NAME := ld-uClibc
++ARCH_NATIVE_BIT := 32
++ifneq ($(findstring $(TARGET_ARCH),hppa64 ia64 powerpc64 s390x sparc64 x86_64),)
+ UCLIBC_LDSO_NAME := ld64-uClibc
+ ARCH_NATIVE_BIT := 64
+ else
+-UCLIBC_LDSO_NAME := ld-uClibc
+-ARCH_NATIVE_BIT := 32
++ifeq ($(CONFIG_MIPS_N64_ABI),y)
++UCLIBC_LDSO_NAME := ld64-uClibc
++ARCH_NATIVE_BIT := 64
+ endif
++endif
++
+ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION)
+ NONSHARED_LIBNAME := uclibc_nonshared.a
+ libc := $(top_builddir)lib/$(SHARED_LIBNAME)
+--
+cgit v0.9.1

From 4db37c663cc0988cf5993d14ee5fdb7976f45694 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 19 Jul 2013 14:46:37 +0200
Subject: [PATCH 5722/6849] dhcp: add config option for delayed-ack feature of
 dhcp server

This patch creates a config option for the ISC DHCP server to allow passing
--enable-delayed-ack to its configure script.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcp/Config.in | 5 +++++
 package/dhcp/dhcp.mk   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 38cf00796b..e341485b16 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -13,6 +13,11 @@ config BR2_PACKAGE_DHCP_SERVER
 	help
 	  DHCP server from the ISC DHCP distribution.
 
+config BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK
+	bool "Enable delayed ACK feature"
+	depends on BR2_PACKAGE_DHCP_SERVER
+	help
+	  Enable delayed ACK feature in the ISC DHCP server.
 
 config BR2_PACKAGE_DHCP_RELAY
 	bool "dhcp relay"
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index ce0cf231da..3baeb23842 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -17,6 +17,10 @@ DHCP_CONF_OPT = \
 	--with-cli-pid-file=/var/run/dhclient.pid \
 	--with-relay-pid-file=/var/run/dhcrelay.pid
 
+ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
+        DHCP_CONF_OPT += --enable-delayed-ack
+endif
+
 ifneq ($(BR2_INET_IPV6),y)
         DHCP_CONF_OPT += --disable-dhcpv6
 endif

From 53f74fb5229e52f0939c9624fd17f5ef5f7a1e75 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 19 Jul 2013 14:01:32 +0200
Subject: [PATCH 5723/6849] trivial: add space in 'bool"package"' construct in
 Config.in

In early buildroot, it apparently was customary to have following style in
Config.in files:
    bool"expat"

Nowadays, only two packages remain with this style: diffutils and expat.
This trivial patch lines them up with the style:
    bool "expat"

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/diffutils/Config.in | 2 +-
 package/expat/Config.in     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
index 4cc16e2127..7b2c9f909b 100644
--- a/package/diffutils/Config.in
+++ b/package/diffutils/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_DIFFUTILS
-	bool"diffutils"
+	bool "diffutils"
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
diff --git a/package/expat/Config.in b/package/expat/Config.in
index 3988c9041f..758fb7d516 100644
--- a/package/expat/Config.in
+++ b/package/expat/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_EXPAT
-	bool"expat"
+	bool "expat"
 	help
 	  The Expat XML Parser.
 

From b9053e0685fcb86269e4daa821868709fa34cf4e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Jul 2013 10:06:31 -0300
Subject: [PATCH 5724/6849] gcc/arm: disable mudflap for thumb(1)

libmudflap doesn't build for a thumb(1) toolchain so disable it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index c0d821be59..85cd7d429a 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -194,6 +194,11 @@ ifeq ($(BR2_avr32),y)
 HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
 endif
 
+# ARM Thumb and mudflap aren't friends
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
+HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
+endif
+
 # Disable mudflap and enable proper double/long double for SPE ABI
 ifeq ($(BR2_powerpc_SPE),y)
 HOST_GCC_COMMON_CONF_OPT += \

From 103045534abe3a58bcec67fa4cf604f25ad88b38 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Jul 2013 10:06:32 -0300
Subject: [PATCH 5725/6849] eglibc/arm: doesn't build in thumb(1) mode

It runs out of registers, so build it in ARM mode, EABI mandates
interworking so this isn't an issue.
Tested in an arm920t board.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index 5431ac574c..253dabd4f0 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -23,6 +23,11 @@ EGLIBC_INSTALL_STAGING = YES
 
 EGLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
 
+# Thumb build is broken, build in ARM mode
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
+EGLIBC_EXTRA_CFLAGS += -marm
+endif
+
 # Even though we use the autotools-package infrastructure, we have to
 # override the default configure commands for several reasons:
 #
@@ -36,7 +41,8 @@ define EGLIBC_CONFIGURE_CMDS
 	# Do the configuration
 	(cd $(@D)/build; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="-O2" CPPFLAGS="" CXXFLAGS="-O2" \
+		CFLAGS="-O2 $(EGLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
+		CXXFLAGS="-O2 $(EGLIBC_EXTRA_CFLAGS)" \
 		$(SHELL) $(@D)/libc/configure \
 		ac_cv_path_BASH_SHELL=/bin/bash \
 		libc_cv_forced_unwind=yes \

From d244782caadd17849910451e707366fcbec68cca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 19 Jul 2013 10:06:33 -0300
Subject: [PATCH 5726/6849] uclibc/arm: doesn't build in thumb(1) mode with
 threads

It runs out of registers, it fails even in official form
(COMPILE_IN_THUMB_MODE=y) so just build it in ARM mode since EABI
mandates interworking.
Tested in an arm920t board.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/Config.in | 2 +-
 package/uclibc/uclibc.mk | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 8d16e8c2f5..90aae907ba 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -185,7 +185,7 @@ config BR2_UCLIBC_ARM_TYPE
 config BR2_UCLIBC_ARM_BX
 	bool
 	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
-	default y if !BR2_fa265 && !BR2_strongarm
+	default y if (BR2_ARM_CPU_HAS_THUMB || BR2_ARM_CPU_HAS_THUMB2)
 
 config BR2_UCLIBC_MIPS_ABI
 	string
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index d5ea7a4b76..044de21d96 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -74,6 +74,11 @@ define UCLIBC_ARM_ABI_CONFIG
 	$(call UCLIBC_OPT_SET,CONFIG_ARM_EABI,y,$(@D))
 endef
 
+# Thumb build is broken with threads, build in ARM mode
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
+UCLIBC_EXTRA_CFLAGS += -marm
+endif
+
 ifeq ($(BR2_UCLIBC_ARM_BX),y)
 define UCLIBC_ARM_BX_CONFIG
 	$(call UCLIBC_OPT_SET,USE_BX,y,$(@D))
@@ -348,7 +353,7 @@ endif
 UCLIBC_MAKE_FLAGS = \
 	ARCH="$(UCLIBC_TARGET_ARCH)" \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
-	UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
+	UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \
 	HOSTCC="$(HOSTCC)"
 
 define UCLIBC_SETUP_DOT_CONFIG

From 75ae8a40129b03ca329e49b091f827348bf01ce2 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sat, 20 Jul 2013 11:24:48 +0200
Subject: [PATCH 5727/6849] ebtables: fix download url

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ebtables/ebtables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 0b3fba663e..ddc1f45aab 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -6,7 +6,7 @@
 
 EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
-EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(EBTABLES_VERSION)
+EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION))
 EBTABLES_LICENSE = GPLv2
 EBTABLES_LICENSE_FILES = COPYING
 EBTABLES_STATIC = $(if $(BR2_PREFER_STATIC_LIB),static)

From 4b23af70216b24be35378d9aee7c271790525728 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sat, 20 Jul 2013 11:47:23 +0200
Subject: [PATCH 5728/6849] zlib: bump to version 1.2.8

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zlib/zlib.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 25d40a5348..f26fe4af2c 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-ZLIB_VERSION = 1.2.7
-ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
+ZLIB_VERSION = 1.2.8
+ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz
 ZLIB_SITE = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION)
 ZLIB_LICENSE = zlib license
 ZLIB_LICENSE_FILES = README

From e0d9d33cc220159bd238bdbab1f32fca1e842e05 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sat, 20 Jul 2013 08:52:43 +0200
Subject: [PATCH 5729/6849] fix white spaces

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/iso9660/iso9660.mk                         |   4 +-
 fs/tar/tar.mk                                 |   2 +-
 linux/linux.mk                                |   2 +-
 package/cloop/cloop.mk                        |   6 +-
 package/cramfs/cramfs.mk                      |   6 +-
 package/ctorrent/ctorrent.mk                  |   6 +-
 package/cvs/cvs.mk                            |   8 +-
 package/dialog/dialog.mk                      |   2 +-
 package/ezxml/ezxml.mk                        |   2 +-
 package/gadgetfs-test/gadgetfs-test.mk        |   4 +-
 package/genromfs/genromfs.mk                  |   6 +-
 package/ipsec-tools/ipsec-tools.mk            |  28 ++--
 package/libargtable2/libargtable2.mk          |   2 +-
 package/libcgicc/libcgicc.mk                  |  12 +-
 package/libdvbsi/libdvbsi.mk                  |   2 +-
 package/libelf/libelf.mk                      |   6 +-
 package/libfuse/libfuse.mk                    |   2 +-
 .../matchbox-desktop/matchbox-desktop.mk      |   6 +-
 .../matchbox-keyboard/matchbox-keyboard.mk    |   4 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk |  26 ++--
 .../matchbox/matchbox-panel/matchbox-panel.mk |   6 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk   |  18 +--
 package/multimedia/gst-omapfb/gst-omapfb.mk   |   6 +-
 package/multimedia/madplay/madplay.mk         |   4 +-
 package/netplug/netplug.mk                    |   6 +-
 package/nss-mdns/nss-mdns.mk                  |   4 +-
 package/pkg-download.mk                       |  24 ++--
 package/rpm/rpm.mk                            |   8 +-
 package/sdl/sdl.mk                            |  18 +--
 package/squashfs/squashfs.mk                  |   6 +-
 package/squashfs3/squashfs3.mk                |   6 +-
 package/xfsprogs/xfsprogs.mk                  |   2 +-
 support/dependencies/dependencies.mk          |   2 +-
 system/system.mk                              |  16 +--
 .../toolchain-crosstool-ng/crosstool-ng.mk    |   2 +-
 toolchain/toolchain-external/ext-tool.mk      | 124 +++++++++---------
 36 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 36e63886fc..317314a2c1 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -7,8 +7,8 @@
 #
 ################################################################################
 
-ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660
-ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
+ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660
+ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 
 ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_GZIP)  = .gz
 ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_BZIP2) = .bz2
diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
index 9fecf7392f..c93888cd56 100644
--- a/fs/tar/tar.mk
+++ b/fs/tar/tar.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS)
+TAR_OPTS := $(BR2_TARGET_ROOTFS_TAR_OPTIONS)
 
 define ROOTFS_TAR_CMD
  tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
diff --git a/linux/linux.mk b/linux/linux.mk
index 2ab437dd3f..17e9838692 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINUX_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+LINUX_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 LINUX_LICENSE = GPLv2
 LINUX_LICENSE_FILES = COPYING
 
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index 1e9b72358c..adbd69a777 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CLOOP_VERSION=2.634-1
-CLOOP_SOURCE=cloop_$(CLOOP_VERSION).tar.gz
-CLOOP_SITE=http://debian-knoppix.alioth.debian.org/packages/sources/cloop
+CLOOP_VERSION = 2.634-1
+CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.gz
+CLOOP_SITE = http://debian-knoppix.alioth.debian.org/packages/sources/cloop
 
 HOST_CLOOP_DEPENDENCIES = host-zlib
 
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 19ecde4f3f..f38ac1aa12 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CRAMFS_VERSION=1.1
-CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz
-CRAMFS_SITE=http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION)
+CRAMFS_VERSION = 1.1
+CRAMFS_SOURCE = cramfs-$(CRAMFS_VERSION).tar.gz
+CRAMFS_SITE = http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION)
 
 CRAMFS_DEPENDENCIES = zlib
 
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index 65e327eb88..d4f6b983f2 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -11,10 +11,10 @@ CTORRENT_LICENSE = GPLv2
 CTORRENT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-CTORRENT_CONF_OPT+=--with-ssl=yes
-CTORRENT_DEPENDENCIES+=openssl
+CTORRENT_CONF_OPT += --with-ssl=yes
+CTORRENT_DEPENDENCIES += openssl
 else
-CTORRENT_CONF_OPT+=--with-ssl=no
+CTORRENT_CONF_OPT += --with-ssl=no
 endif
 
 $(eval $(autotools-package))
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index e48be417c1..7371644a07 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -12,14 +12,14 @@ CVS_DEPENDENCIES = ncurses
 
 CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes
 
-CVS_CONFIGURE_ARGS=--disable-old-info-format-support
+CVS_CONFIGURE_ARGS = --disable-old-info-format-support
 ifeq ($(BR2_PACKAGE_CVS_SERVER),y)
-CVS_CONFIGURE_ARGS+=--enable-server
+CVS_CONFIGURE_ARGS += --enable-server
 else
-CVS_CONFIGURE_ARGS+=--disable-server
+CVS_CONFIGURE_ARGS += --disable-server
 endif
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-CVS_CONFIGURE_ARGS+=--with-external-zlib
+CVS_CONFIGURE_ARGS += --with-external-zlib
 endif
 
 CVS_CONF_OPT = $(CVS_CONFIGURE_ARGS)
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index c6ea023823..06379f2c50 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -14,7 +14,7 @@ DIALOG_LICENSE = LGPLv2.1
 DIALOG_LICENSE_FILES = COPYING
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
-DIALOG_DEPENDENCIES+=libiconv
+DIALOG_DEPENDENCIES += libiconv
 endif
 
 define DIALOG_INSTALL_TARGET_CMDS
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index de863059a4..83a4fa996a 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -7,7 +7,7 @@
 EZXML_VERSION = 0.8.6
 EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz
 EZXML_SITE = http://downloads.sourceforge.net/project/ezxml/ezXML/ezXML%20$(EZXML_VERSION)
-EZXML_INSTALL_STAGING=YES
+EZXML_INSTALL_STAGING = YES
 
 define EZXML_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" AR=$(TARGET_AR) \
diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index 2ff50ca6e6..341ce67035 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GADGETFS_TEST_SOURCE=gadgetfs-test.tar.bz2
-GADGETFS_TEST_SITE=http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest/
+GADGETFS_TEST_SOURCE = gadgetfs-test.tar.bz2
+GADGETFS_TEST_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest/
 
 GADGETFS_TEST_MAKEOPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
 
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 119d6600a6..9e7c2ff3c5 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GENROMFS_VERSION=0.5.2
-GENROMFS_SOURCE=genromfs-$(GENROMFS_VERSION).tar.gz
-GENROMFS_SITE=http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION)
+GENROMFS_VERSION = 0.5.2
+GENROMFS_SOURCE = genromfs-$(GENROMFS_VERSION).tar.gz
+GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION)
 
 define GENROMFS_BUILD_CMDS
  $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 1458909f70..8eeef1b6c6 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -21,49 +21,49 @@ IPSEC_TOOLS_CONF_OPT = \
 	  --with-kernel-headers=$(STAGING_DIR)/usr/include
 
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
-IPSEC_TOOLS_CONF_OPT+= --enable-adminport
+IPSEC_TOOLS_CONF_OPT += --enable-adminport
 else
-IPSEC_TOOLS_CONF_OPT+= --disable-adminport
+IPSEC_TOOLS_CONF_OPT += --disable-adminport
 endif
 
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT), y)
-IPSEC_TOOLS_CONF_OPT+= --enable-natt
+IPSEC_TOOLS_CONF_OPT += --enable-natt
 else
-IPSEC_TOOLS_CONF_OPT+= --disable-natt
+IPSEC_TOOLS_CONF_OPT += --disable-natt
 endif
 
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG), y)
-IPSEC_TOOLS_CONF_OPT+= --enable-frag
+IPSEC_TOOLS_CONF_OPT += --enable-frag
 else
-IPSEC_TOOLS_CONF_OPT+= --disable-frag
+IPSEC_TOOLS_CONF_OPT += --disable-frag
 endif
 
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_DPD), y)
-IPSEC_TOOLS_CONF_OPT+= --enable-dpd
+IPSEC_TOOLS_CONF_OPT += --enable-dpd
 else
-IPSEC_TOOLS_CONF_OPT+= --disable-dpd
+IPSEC_TOOLS_CONF_OPT += --disable-dpd
 endif
 
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y)
-IPSEC_TOOLS_CONF_OPT+= --enable-stats
+IPSEC_TOOLS_CONF_OPT += --enable-stats
 else
-IPSEC_TOOLS_CONF_OPT+= --disable-stats
+IPSEC_TOOLS_CONF_OPT += --disable-stats
 endif
 
 ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y)
-IPSEC_TOOLS_CONF_OPT+= --without-readline
+IPSEC_TOOLS_CONF_OPT += --without-readline
 else
 IPSEC_DEPENDENCIES += readline
 endif
 
 ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
-IPSEC_TOOLS_CONF_OPT+= --enable-security-context=no
+IPSEC_TOOLS_CONF_OPT += --enable-security-context=no
 endif
 ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
-IPSEC_TOOLS_CONF_OPT+= --enable-security-context=yes
+IPSEC_TOOLS_CONF_OPT += --enable-security-context=yes
 endif
 ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
-IPSEC_TOOLS_CONF_OPT+= --enable-security-context=kernel
+IPSEC_TOOLS_CONF_OPT += --enable-security-context=kernel
 endif
 
 $(eval $(autotools-package))
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index da94824135..cdd62369a0 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -9,7 +9,7 @@ LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
 LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13
 
 LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPT= --disable-example \
+LIBARGTABLE2_CONF_OPT = --disable-example \
 		--disable-kernel-module \
 		--enable-lib \
 		--enable-util
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 4d8ae37ac3..a3c64d26f8 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBCGICC_VERSION=3.2.9
-LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc
-LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
-LIBCGICC_LICENSE=LGPLv3+
-LIBCGICC_INSTALL_STAGING=YES
-LIBCGICC_AUTORECONF=YES
+LIBCGICC_VERSION = 3.2.9
+LIBCGICC_SITE = $(BR2_GNU_MIRROR)/cgicc
+LIBCGICC_SOURCE = cgicc-$(LIBCGICC_VERSION).tar.gz
+LIBCGICC_LICENSE = LGPLv3+
+LIBCGICC_INSTALL_STAGING = YES
+LIBCGICC_AUTORECONF = YES
 LIBCGICC_CONFIG_SCRIPTS = cgicc-config
 LIBCGICC_CONF_OPT = \
 	--disable-demos \
diff --git a/package/libdvbsi/libdvbsi.mk b/package/libdvbsi/libdvbsi.mk
index 3e991776bb..2151691dda 100644
--- a/package/libdvbsi/libdvbsi.mk
+++ b/package/libdvbsi/libdvbsi.mk
@@ -12,6 +12,6 @@ LIBDVBSI_LICENSE = LGPLv2.1
 LIBDVBSI_LICENSE_FILES = COPYING
 
 # sometimes no Makefile is in the archive, just (re)generate
-LIBDVBSI_AUTORECONF=YES
+LIBDVBSI_AUTORECONF = YES
 
 $(eval $(autotools-package))
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 5f788b241c..b5aff564f0 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBELF_VERSION=0.8.12
-LIBELF_SOURCE=libelf-$(LIBELF_VERSION).tar.gz
-LIBELF_SITE=http://www.mr511.de/software/
+LIBELF_VERSION = 0.8.12
+LIBELF_SOURCE = libelf-$(LIBELF_VERSION).tar.gz
+LIBELF_SITE = http://www.mr511.de/software/
 LIBELF_INSTALL_STAGING = YES
 LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install
 LIBELF_INSTALL_TARGET_OPT = instroot=$(TARGET_DIR) install
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index d422504f19..6057077837 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -11,7 +11,7 @@ LIBFUSE_LICENSE = GPLv2 LGPLv2.1
 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBFUSE_CONF_OPT= --disable-nls \
+LIBFUSE_CONF_OPT = --disable-nls \
 		--disable-example \
 		--disable-kernel-module \
 		--enable-lib \
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 9e1e05551c..7780bb64e6 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -21,10 +21,10 @@ MATCHBOX_DESKTOP_AUTORECONF = YES
 ################################################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
-  MATCHBOX_DESKTOP_CONF_OPT+=--enable-startup-notification
-  MATCHBOX_DESKTOP_DEPENDENCIES+=startup-notification
+  MATCHBOX_DESKTOP_CONF_OPT += --enable-startup-notification
+  MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification
 else
-  MATCHBOX_DESKTOP_CONF_OPT+=--disable-startup-notification
+  MATCHBOX_DESKTOP_CONF_OPT += --disable-startup-notification
 endif
 
 ################################################################################
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 94782dff05..5b0f691973 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -23,9 +23,9 @@ MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FI
 ################################################################################
 
 ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT+=--enable-pango
+  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
 else
-  MATCHBOX_KEYBOARD_DEPENDENCIES+=xlib_libXft
+  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
 endif
 
 ################################################################################
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 768f29ea0b..b4c378caf7 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -24,36 +24,36 @@ MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
 
 ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
 ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
-  MATCHBOX_LIB_DEPENDENCIES+=xlib_libXpm
+  MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_JPEG),y)
-  MATCHBOX_LIB_CONF_OPT+=--enable-jpeg
-  MATCHBOX_LIB_DEPENDENCIES+=jpeg
+  MATCHBOX_LIB_CONF_OPT += --enable-jpeg
+  MATCHBOX_LIB_DEPENDENCIES += jpeg
 else
-  MATCHBOX_LIB_CONF_OPT+=--disable-jpeg
+  MATCHBOX_LIB_CONF_OPT += --disable-jpeg
 endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
-  MATCHBOX_LIB_CONF_OPT+=--enable-png
-  MATCHBOX_LIB_DEPENDENCIES+=libpng
+  MATCHBOX_LIB_CONF_OPT += --enable-png
+  MATCHBOX_LIB_DEPENDENCIES += libpng
 else
-  MATCHBOX_LIB_CONF_OPT+=--disable-png
+  MATCHBOX_LIB_CONF_OPT += --disable-png
 endif
 
 ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy)
-  MATCHBOX_LIB_CONF_OPT+=--enable-pango
-  MATCHBOX_LIB_DEPENDENCIES+=pango
+  MATCHBOX_LIB_CONF_OPT += --enable-pango
+  MATCHBOX_LIB_DEPENDENCIES += pango
 else
-  MATCHBOX_LIB_CONF_OPT+=--disable-pango
+  MATCHBOX_LIB_CONF_OPT += --disable-pango
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
-  MATCHBOX_LIB_CONF_OPT+=--enable-xft
-  MATCHBOX_LIB_DEPENDENCIES+=xlib_libXft
+  MATCHBOX_LIB_CONF_OPT += --enable-xft
+  MATCHBOX_LIB_DEPENDENCIES += xlib_libXft
 else
-  MATCHBOX_LIB_CONF_OPT+=--disable-xft
+  MATCHBOX_LIB_CONF_OPT += --disable-xft
 endif
 
 ################################################################################
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index bf145d42c7..655b20f6ca 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -16,10 +16,10 @@ MATCHBOX_PANEL_CONF_OPT = --enable-expat
 ################################################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
-  MATCHBOX_PANEL_CONF_OPT+=--enable-startup-notification
-  MATCHBOX_PANEL_DEPENDENCIES+=startup-notification matchbox-startup-monitor
+  MATCHBOX_PANEL_CONF_OPT += --enable-startup-notification
+  MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
 else
-  MATCHBOX_PANEL_CONF_OPT+=--disable-startup-notification
+  MATCHBOX_PANEL_CONF_OPT += --disable-startup-notification
 endif
 
 ################################################################################
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 3438d32d11..0f10c896f2 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -20,24 +20,24 @@ MATCHBOX_WM_CONF_ENV = expat=yes
 
 ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
 ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
-  MATCHBOX_WM_CONF_OPT+=--enable-composite
-  MATCHBOX_WM_DEPENDENCIES+=xlib_libXcomposite
-  MATCHBOX_WM_DEPENDENCIES+=xlib_libXpm
+  MATCHBOX_WM_CONF_OPT += --enable-composite
+  MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
+  MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
-  #MATCHBOX_WM_OPTS+=--enable-standalone-xft
-  MATCHBOX_WM_DEPENDENCIES+=xlib_libXft
+  #MATCHBOX_WM_OPTS += --enable-standalone-xft
+  MATCHBOX_WM_DEPENDENCIES += xlib_libXft
 else
-  #MATCHBOX_WM_OPTS+=--disable-standalone-xft
+  #MATCHBOX_WM_OPTS += --disable-standalone-xft
 endif
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
-  MATCHBOX_WM_CONF_OPT+=--enable-startup-notification
-  MATCHBOX_WM_DEPENDENCIES+=startup-notification
+  MATCHBOX_WM_CONF_OPT += --enable-startup-notification
+  MATCHBOX_WM_DEPENDENCIES += startup-notification
 else
-  MATCHBOX_WM_CONF_OPT+=--disable-startup-notification
+  MATCHBOX_WM_CONF_OPT += --disable-startup-notification
 endif
 
 ################################################################################
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/multimedia/gst-omapfb/gst-omapfb.mk
index 7b8b128c5c..bfcaa5d2ef 100644
--- a/package/multimedia/gst-omapfb/gst-omapfb.mk
+++ b/package/multimedia/gst-omapfb/gst-omapfb.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GST_OMAPFB_VERSION=1.0
-GST_OMAPFB_SOURCE=gst-omapfb-$(GST_OMAPFB_VERSION).tar.gz
-GST_OMAPFB_SITE=http://gst-dsp.googlecode.com/files/
+GST_OMAPFB_VERSION = 1.0
+GST_OMAPFB_SOURCE = gst-omapfb-$(GST_OMAPFB_VERSION).tar.gz
+GST_OMAPFB_SITE = http://gst-dsp.googlecode.com/files/
 
 define GST_OMAPFB_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index 8dbb4c03e8..19ab13f69d 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -15,8 +15,8 @@ MADPLAY_DEPENDENCIES = libmad libid3tag
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
 ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
-MADPLAY_CONF_OPT+=--with-alsa
-MADPLAY_DEPENDENCIES+=alsa-lib
+MADPLAY_CONF_OPT += --with-alsa
+MADPLAY_DEPENDENCIES += alsa-lib
 endif
 
 $(eval $(autotools-package))
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index 7460b66618..fbc7a2d982 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NETPLUG_VERSION=1.2.9.2
-NETPLUG_SOURCE=netplug-$(NETPLUG_VERSION).tar.bz2
-NETPLUG_SITE=http://www.red-bean.com/~bos/netplug
+NETPLUG_VERSION = 1.2.9.2
+NETPLUG_SOURCE = netplug-$(NETPLUG_VERSION).tar.bz2
+NETPLUG_SITE = http://www.red-bean.com/~bos/netplug
 
 define NETPLUG_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 83d9a2a951..9887256327 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NSS_MDNS_VERSION=0.10
-NSS_MDNS_SITE=http://0pointer.de/lennart/projects/nss-mdns
+NSS_MDNS_VERSION = 0.10
+NSS_MDNS_SITE = http://0pointer.de/lennart/projects/nss-mdns
 
 NSS_MDNS_CONF_OPT += --localstatedir=/var
 
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 8f6fe3dd82..97c9226f1f 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -8,14 +8,14 @@
 ################################################################################
 
 # Download method commands
-WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
-SVN:=$(call qstrip,$(BR2_SVN))
-BZR:=$(call qstrip,$(BR2_BZR))
-GIT:=$(call qstrip,$(BR2_GIT))
-HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
-SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
-SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
-LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
+WGET := $(call qstrip,$(BR2_WGET)) $(QUIET)
+SVN := $(call qstrip,$(BR2_SVN))
+BZR := $(call qstrip,$(BR2_BZR))
+GIT := $(call qstrip,$(BR2_GIT))
+HG := $(call qstrip,$(BR2_HG)) $(QUIET)
+SCP := $(call qstrip,$(BR2_SCP)) $(QUIET)
+SSH := $(call qstrip,$(BR2_SSH)) $(QUIET)
+LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
 
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
 # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
@@ -24,17 +24,17 @@ DL_MODE=DOWNLOAD
 
 # Override BR2_DL_DIR if shell variable defined
 ifneq ($(BUILDROOT_DL_DIR),)
-DL_DIR:=$(BUILDROOT_DL_DIR)
+DL_DIR := $(BUILDROOT_DL_DIR)
 else
-DL_DIR:=$(call qstrip,$(BR2_DL_DIR))
+DL_DIR := $(call qstrip,$(BR2_DL_DIR))
 endif
 
 ifeq ($(DL_DIR),)
-DL_DIR:=$(TOPDIR)/dl
+DL_DIR := $(TOPDIR)/dl
 endif
 
 # ensure it exists and a absolute path
-DL_DIR:=$(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd)
+DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd)
 
 #
 # URI scheme helper functions
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 32a949f29f..89ce70eed4 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -34,16 +34,16 @@ RPM_CONF_OPT += --with-file=no
 endif
 
 ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
-RPM_CONF_OPT+=--with-xz
+RPM_CONF_OPT += --with-xz
 endif
 
 ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
-RPM_CONF_OPT+=--with-bzip2
-RPM_DEPENDENCIES+=bzip2
+RPM_CONF_OPT += --with-bzip2
+RPM_DEPENDENCIES += bzip2
 endif
 
 RPM_MAKE = $(MAKE1)
 
-RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install
+RPM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) program_transform_name= install
 
 $(eval $(autotools-package))
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 76cc413a00..716bb6259e 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -12,33 +12,33 @@ SDL_LICENSE_FILES = COPYING
 SDL_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
-SDL_CONF_OPT+=--enable-video-fbcon=yes
+SDL_CONF_OPT += --enable-video-fbcon=yes
 else
-SDL_CONF_OPT+=--enable-video-fbcon=no
+SDL_CONF_OPT += --enable-video-fbcon=no
 endif
 
 ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
 SDL_DEPENDENCIES += directfb
-SDL_CONF_OPT+=--enable-video-directfb=yes
+SDL_CONF_OPT += --enable-video-directfb=yes
 SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
 else
-SDL_CONF_OPT=--enable-video-directfb=no
+SDL_CONF_OPT = --enable-video-directfb=no
 endif
 
 ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
-SDL_CONF_OPT+=--enable-video-qtopia=yes
+SDL_CONF_OPT += --enable-video-qtopia=yes
 SDL_DEPENDENCIES += qt
 else
-SDL_CONF_OPT+=--enable-video-qtopia=no
+SDL_CONF_OPT += --enable-video-qtopia=no
 endif
 
 ifeq ($(BR2_PACKAGE_SDL_X11),y)
-SDL_CONF_OPT+=--enable-video-x11=yes
+SDL_CONF_OPT += --enable-video-x11=yes
 SDL_DEPENDENCIES += xlib_libX11 xlib_libXext \
 	$(if $(BR2_PACKAGE_XLIB_LIBXRENDER), xlib_libXrender) \
 	$(if $(BR2_PACKAGE_XLIB_LIBXRANDR), xlib_libXrandr)
 else
-SDL_CONF_OPT+=--enable-video-x11=no
+SDL_CONF_OPT += --enable-video-x11=no
 endif
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
@@ -67,6 +67,6 @@ define SDL_FIXUP_SDL_CONFIG
 		$(STAGING_DIR)/usr/bin/sdl-config
 endef
 
-SDL_POST_INSTALL_STAGING_HOOKS+=SDL_FIXUP_SDL_CONFIG
+SDL_POST_INSTALL_STAGING_HOOKS += SDL_FIXUP_SDL_CONFIG
 
 $(eval $(autotools-package))
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 13414025df..04a26c6de6 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SQUASHFS_VERSION=4.2
-SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
-SQUASHFS_SITE=http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
+SQUASHFS_VERSION = 4.2
+SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
+SQUASHFS_SITE = http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
 
 # no libattr in BR
 SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 956dbd6baa..4df1af6085 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SQUASHFS3_VERSION=3.4
-SQUASHFS3_SOURCE=squashfs$(SQUASHFS3_VERSION).tar.gz
-SQUASHFS3_SITE=http://downloads.sourceforge.net/project/squashfs/squashfs/$(SQUASHFS3_VERSION)
+SQUASHFS3_VERSION = 3.4
+SQUASHFS3_SOURCE = squashfs$(SQUASHFS3_VERSION).tar.gz
+SQUASHFS3_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/$(SQUASHFS3_VERSION)
 
 SQUASHFS3_DEPENDENCIES = zlib
 
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 132b8d5ab2..4437e38a43 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 XFSPROGS_VERSION = 3.1.11
-XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars
+XFSPROGS_SITE = ftp://oss.sgi.com/projects/xfs/cmd_tars
 
 XFSPROGS_DEPENDENCIES = util-linux
 
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index c93dcb4206..a2d229c957 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -5,7 +5,7 @@
 #
 ################################################################################
 
-DEPENDENCIES_HOST_PREREQ:=
+DEPENDENCIES_HOST_PREREQ := 
 
 # suitable-host-pkg: calls check-host-$(1).sh shell script. Parameter (2)
 # can be the candidate to be checked. If not present, the check-host-$(1).sh
diff --git a/system/system.mk b/system/system.mk
index 50c86ad607..df8c802d84 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -1,13 +1,13 @@
-TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
-TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
-TARGET_GENERIC_ROOT_PASSWD:=$(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
-TARGET_GENERIC_PASSWD_METHOD:=$(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
+TARGET_GENERIC_HOSTNAME := $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
+TARGET_GENERIC_ISSUE := $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
+TARGET_GENERIC_ROOT_PASSWD := $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
+TARGET_GENERIC_PASSWD_METHOD := $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
 ifneq ($(TARGET_GENERIC_ROOT_PASSWD),)
-TARGET_GENERIC_ROOT_PASSWD_HASH=$(shell mkpasswd -m "$(TARGET_GENERIC_PASSWD_METHOD)" "$(TARGET_GENERIC_ROOT_PASSWD)")
+TARGET_GENERIC_ROOT_PASSWD_HASH = $(shell mkpasswd -m "$(TARGET_GENERIC_PASSWD_METHOD)" "$(TARGET_GENERIC_ROOT_PASSWD)")
 endif
-TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
-TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
-TARGET_GENERIC_GETTY_TERM:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
+TARGET_GENERIC_GETTY := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
+TARGET_GENERIC_GETTY_BAUDRATE := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
+TARGET_GENERIC_GETTY_TERM := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
 
 target-generic-securetty:
 	grep -q '^$(TARGET_GENERIC_GETTY)$$' $(TARGET_DIR)/etc/securetty || \
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 71305364e4..19e87610fa 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -11,7 +11,7 @@
 CTNG_DIR := $(BUILD_DIR)/build-toolchain
 
 CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/package/uclibc/uClibc-0.9.33.config
-CTNG_CONFIG_FILE:=$(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
+CTNG_CONFIG_FILE := $(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
 
 # Hack! ct-ng is in fact a Makefile script. As such, it accepts all
 # make options, such as -C, which makes it uneeded to chdir prior
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 8aac50e2b8..07dda0a2ce 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -113,12 +113,12 @@ endif
 
 ifeq ($(TOOLCHAIN_EXTERNAL_DIR),)
 # if no path set, figure it out from path
-TOOLCHAIN_EXTERNAL_BIN:=$(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
+TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
 else
 ifeq ($(BR2_bfin),y)
-TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin
+TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin
 else
-TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/bin
+TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_DIR)/bin
 endif
 endif
 
@@ -207,76 +207,76 @@ TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE = arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE = arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
-TOOLCHAIN_EXTERNAL_SOURCE=arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
+TOOLCHAIN_EXTERNAL_SOURCE = arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109),y)
-TOOLCHAIN_EXTERNAL_SITE=http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
-TOOLCHAIN_EXTERNAL_SOURCE=arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
+TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2
 define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
 	mv $(@D)/arago-2011.09/armv7a/* $(@D)/
 	rm -rf $(@D)/arago-2011.09/
 endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109),y)
-TOOLCHAIN_EXTERNAL_SITE=http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
-TOOLCHAIN_EXTERNAL_SOURCE=arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
+TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2
 define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
 	mv $(@D)/arago-2011.09/armv5te/* $(@D)/
 	rm -rf $(@D)/arago-2011.09/
 endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.04/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.04/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.05/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.8-2013.05_linux.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.05/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.05_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.06/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.8-2013.06_linux.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.06_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2013.05-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = mips-2013.05-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=freescale-2011.03-38-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = freescale-2011.03-38-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.03-35-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = renesas-2012.03-35-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-uclinux/
-TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SOURCE = renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/sh-uclinux/
-TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SOURCE = renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
-TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9858/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
@@ -290,36 +290,36 @@ TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease
 TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
-TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
+TOOLCHAIN_EXTERNAL_SOURCE = lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
-TOOLCHAIN_EXTERNAL_SOURCE=microblazeel-unknown-linux-gnu.tgz
+TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
+TOOLCHAIN_EXTERNAL_SOURCE = microblazeel-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
-TOOLCHAIN_EXTERNAL_SOURCE=lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
+TOOLCHAIN_EXTERNAL_SOURCE = lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sources.buildroot.net/
-TOOLCHAIN_EXTERNAL_SOURCE=microblaze-unknown-linux-gnu.tgz
+TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
+TOOLCHAIN_EXTERNAL_SOURCE = microblaze-unknown-linux-gnu.tgz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.04/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.04/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.05/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.8-2013.05_linux.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.05/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.05_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06),y)
-TOOLCHAIN_EXTERNAL_SITE=https://releases.linaro.org/13.06/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-aarch64-linux-gnu-4.8-2013.06_linux.tar.xz
+TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.06_linux.tar.xz
 else
 # Custom toolchain
-TOOLCHAIN_EXTERNAL_SITE=$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
-TOOLCHAIN_EXTERNAL_SOURCE=$(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
+TOOLCHAIN_EXTERNAL_SITE = $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
+TOOLCHAIN_EXTERNAL_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
 
 # A value must be set (even if unused), otherwise the
 # $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main
 # $(DL_DIR) rule
 ifeq (,$(TOOLCHAIN_EXTERNAL_SOURCE))
-TOOLCHAIN_EXTERNAL_SOURCE=none
+TOOLCHAIN_EXTERNAL_SOURCE = none
 endif
 endif
 

From 27c9370344692b7605072f51eaf0275654faa093 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 19 Jul 2013 18:31:57 -0500
Subject: [PATCH 5730/6849] ext-toolchain-wrapper: fix typo on
 s/BR2_FPU/BR_FPU/

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-toolchain-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index befd735f11..247df6da87 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -41,7 +41,7 @@ static char *predef_args[] = {
 #ifdef BR_FLOAT_ABI
 	"-mfloat-abi=" BR_FLOAT_ABI,
 #endif
-#ifdef BR2_FPU
+#ifdef BR_FPU
 	"-mfpu=" BR_FPU,
 #endif
 #ifdef BR_SOFTFLOAT

From aa86b52ca35b6bd9ebf352c55d4fb3c940c44527 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 19 Jul 2013 18:31:58 -0500
Subject: [PATCH 5731/6849] ext-toolchain-wrapper: fix uboot/linux with hardfp

The linux kernel and uboot specify -msoft-float in order to prevent floating
point code from being generated.  This causes a conflict when -mfloat-abi=hard
or -mfloat-abi options are specified in the wrapper. This patch removes the
-mfloat-abi option from the options generated by the wrapper only when
-msoft-float, -mhard-float or -mfloat-abi are specified by the user.

[Peter: fix !BR_FLOAT_ABI case, simplify]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../ext-toolchain-wrapper.c                   | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 247df6da87..565e36bfd1 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -8,6 +8,7 @@
  * (C) 2011 Peter Korsgaard <jacmet@sunsite.dk>
  * (C) 2011 Daniel Nyström <daniel.nystrom@timeterminal.se>
  * (C) 2012 Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+ * (C) 2013 Spenser Gilliland <spenser@gillilanding.com>
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
@@ -23,6 +24,15 @@
 static char path[PATH_MAX];
 static char sysroot[PATH_MAX];
 
+/**
+ * GCC errors out with certain combinations of arguments (examples are
+ * -mabi-float={hard|soft} and -m{little|big}-endian), so we have to ensure
+ * that we only pass the predefined one to the real compiler if the inverse
+ * option isn't in the argument list.
+ * This specifies the worst case number of extra arguments we might pass
+ */
+#define EXCLUSIVE_ARGS	1
+
 static char *predef_args[] = {
 	path,
 	"--sysroot", sysroot,
@@ -38,9 +48,6 @@ static char *predef_args[] = {
 #ifdef BR_ABI
 	"-mabi=" BR_ABI,
 #endif
-#ifdef BR_FLOAT_ABI
-	"-mfloat-abi=" BR_FLOAT_ABI,
-#endif
 #ifdef BR_FPU
 	"-mfpu=" BR_FPU,
 #endif
@@ -119,7 +126,8 @@ int main(int argc, char **argv)
 		return 3;
 	}
 
-	cur = args = malloc(sizeof(predef_args) + (sizeof(char *) * argc));
+	cur = args = malloc(sizeof(predef_args) +
+			    (sizeof(char *) * (argc + EXCLUSIVE_ARGS)));
 	if (args == NULL) {
 		perror(__FILE__ ": malloc");
 		return 2;
@@ -129,6 +137,19 @@ int main(int argc, char **argv)
 	memcpy(cur, predef_args, sizeof(predef_args));
 	cur += sizeof(predef_args) / sizeof(predef_args[0]);
 
+#ifdef BR_FLOAT_ABI
+	/* add float abi if not overridden in args */
+	for (i = 1; i < argc; i++) {
+		if (!strncmp(argv[i], "-mfloat-abi=", strlen("-mfloat-abi=")) ||
+		    !strcmp(argv[i], "-msoft-float") ||
+		    !strcmp(argv[i], "-mhard-float"))
+			break;
+	}
+
+	if (i == argc)
+		*cur++ = "-mfloat-abi=" BR_FLOAT_ABI;
+#endif
+
 	/* append forward args */
 	memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));
 	cur += argc - 1;

From 720ca65ce801d8a67f0aca98434b0e514e0c5a6d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 19 Jul 2013 14:13:43 +0200
Subject: [PATCH 5732/6849] trivial: use geturischeme helper function where
 possible

pkg-download.mk contains some helper functions to obtain subparts of URLs,
like the URI scheme. In pkg-generic.mk, there is still one opportunity to use
that helper function, instead of hardcoding it.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 668f011b37..b8eaa98bbb 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -269,7 +269,7 @@ ifndef $(2)_SITE_METHOD
   $(2)_SITE_METHOD = $($(3)_SITE_METHOD)
  else
 	# Try automatic detection using the scheme part of the URI
-	$(2)_SITE_METHOD = $(firstword $(subst ://, ,$(call qstrip,$($(2)_SITE))))
+	$(2)_SITE_METHOD = $(call geturischeme,$($(2)_SITE))
  endif
 endif
 

From 8d228d30105079a91fed16097193601713c02198 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <roylee17@gmail.com>
Date: Sat, 20 Jul 2013 09:34:09 +0800
Subject: [PATCH 5733/6849] dropwatch: new package

Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                           |  1 +
 package/dropwatch/Config.in                 |  7 +++++
 package/dropwatch/dropwatch-1.4-build.patch | 27 +++++++++++++++++++
 package/dropwatch/dropwatch.mk              | 30 +++++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 package/dropwatch/Config.in
 create mode 100644 package/dropwatch/dropwatch-1.4-build.patch
 create mode 100644 package/dropwatch/dropwatch.mk

diff --git a/package/Config.in b/package/Config.in
index 286a605645..77303172b0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -22,6 +22,7 @@ source "package/cache-calibrator/Config.in"
 source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
+source "package/dropwatch/Config.in"
 source "package/gdb/Config.in"
 source "package/iozone/Config.in"
 source "package/kexec/Config.in"
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
new file mode 100644
index 0000000000..69d7cd570b
--- /dev/null
+++ b/package/dropwatch/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_DROPWATCH
+	bool "dropwatch"
+	help
+	  Dropwatch is a project I am tinkering with to improve the visibility
+	  developers and sysadmins have into the Linux networking stack.
+
+	  https://git.fedorahosted.org/git/dropwatch.git
diff --git a/package/dropwatch/dropwatch-1.4-build.patch b/package/dropwatch/dropwatch-1.4-build.patch
new file mode 100644
index 0000000000..eed43e8dd7
--- /dev/null
+++ b/package/dropwatch/dropwatch-1.4-build.patch
@@ -0,0 +1,27 @@
+From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001
+From: Tzu-Jung Lee <tjlee@ambarella.com>
+Date: Fri, 12 Jul 2013 20:00:57 +0800
+Subject: [PATCH] build: modify hardcoded gcc to support buildroot
+
+Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
+
+diff --git a/src/Makefile b/src/Makefile
+index 026b6ba..b87ae9f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,10 +5,10 @@ OBJFILES := main.o lookup.o\
+ 	 lookup_bfd.o lookup_kas.o
+ 
+ dropwatch: $(OBJFILES) 
+-	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
++	$(CC) -g -o dropwatch $(OBJFILES) $(LDFLAGS)
+ 
+ %.o: %.c
+-	gcc $(CFLAGS) $<
++	$(CC) $(CFLAGS) $<
+ clean:
+ 	rm -f dropwatch *.o
+ 
+-- 
+1.8.3.2
+
diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
new file mode 100644
index 0000000000..b9676cbea3
--- /dev/null
+++ b/package/dropwatch/dropwatch.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# dropwatch
+#
+#############################################################
+
+DROPWATCH_VERSION = 1.4
+DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.bz2
+DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot/
+DROPWATCH_DEPENDENCIES = readline libnl binutils
+DROPWATCH_LICENSE = GPLv2+
+DROPWATCH_LICENSE_FILE = COPYING
+
+define DROPWATCH_INSTALL_TARGET_CMDS
+  cp $(@D)/src/dropwatch $(TARGET_DIR)/usr/bin
+endef
+
+define DROPWATCH_BUILD_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) build
+endef
+
+define DROPWATCH_CLEAN_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
+endef
+
+define DROPWATCH_UNINSTALL_CMDS
+  rm -f $(TARGET_DIR)/usr/bin/dropwatch
+endef
+
+$(eval $(generic-package))

From 956fa6741021cf952aefa9ddf821b9aa14be8fab Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 22 Jul 2013 00:36:53 +0200
Subject: [PATCH 5734/6849] Revert "dropwatch: new package"

This reverts commit 8d228d30105079a91fed16097193601713c02198.

Was not supposed to have been pushed (yet).
---
 package/Config.in                           |  1 -
 package/dropwatch/Config.in                 |  7 -----
 package/dropwatch/dropwatch-1.4-build.patch | 27 -------------------
 package/dropwatch/dropwatch.mk              | 30 ---------------------
 4 files changed, 65 deletions(-)
 delete mode 100644 package/dropwatch/Config.in
 delete mode 100644 package/dropwatch/dropwatch-1.4-build.patch
 delete mode 100644 package/dropwatch/dropwatch.mk

diff --git a/package/Config.in b/package/Config.in
index 77303172b0..286a605645 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -22,7 +22,6 @@ source "package/cache-calibrator/Config.in"
 source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
-source "package/dropwatch/Config.in"
 source "package/gdb/Config.in"
 source "package/iozone/Config.in"
 source "package/kexec/Config.in"
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
deleted file mode 100644
index 69d7cd570b..0000000000
--- a/package/dropwatch/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_DROPWATCH
-	bool "dropwatch"
-	help
-	  Dropwatch is a project I am tinkering with to improve the visibility
-	  developers and sysadmins have into the Linux networking stack.
-
-	  https://git.fedorahosted.org/git/dropwatch.git
diff --git a/package/dropwatch/dropwatch-1.4-build.patch b/package/dropwatch/dropwatch-1.4-build.patch
deleted file mode 100644
index eed43e8dd7..0000000000
--- a/package/dropwatch/dropwatch-1.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001
-From: Tzu-Jung Lee <tjlee@ambarella.com>
-Date: Fri, 12 Jul 2013 20:00:57 +0800
-Subject: [PATCH] build: modify hardcoded gcc to support buildroot
-
-Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
-
-diff --git a/src/Makefile b/src/Makefile
-index 026b6ba..b87ae9f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -5,10 +5,10 @@ OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
-+	$(CC) -g -o dropwatch $(OBJFILES) $(LDFLAGS)
- 
- %.o: %.c
--	gcc $(CFLAGS) $<
-+	$(CC) $(CFLAGS) $<
- clean:
- 	rm -f dropwatch *.o
- 
--- 
-1.8.3.2
-
diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
deleted file mode 100644
index b9676cbea3..0000000000
--- a/package/dropwatch/dropwatch.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#############################################################
-#
-# dropwatch
-#
-#############################################################
-
-DROPWATCH_VERSION = 1.4
-DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.bz2
-DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot/
-DROPWATCH_DEPENDENCIES = readline libnl binutils
-DROPWATCH_LICENSE = GPLv2+
-DROPWATCH_LICENSE_FILE = COPYING
-
-define DROPWATCH_INSTALL_TARGET_CMDS
-  cp $(@D)/src/dropwatch $(TARGET_DIR)/usr/bin
-endef
-
-define DROPWATCH_BUILD_CMDS
-  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) build
-endef
-
-define DROPWATCH_CLEAN_CMDS
-  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
-endef
-
-define DROPWATCH_UNINSTALL_CMDS
-  rm -f $(TARGET_DIR)/usr/bin/dropwatch
-endef
-
-$(eval $(generic-package))

From 9466ca1dde97c85996d9aa1c54ff8fbae366bebe Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Mon, 22 Jul 2013 07:20:36 +0200
Subject: [PATCH 5735/6849] udisks: fix typos in license info

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/udisks/udisks.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index 5d3368d422..28855dd003 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -6,8 +6,8 @@
 
 UDISKS_VERSION = 1.0.4
 UDISKS_SITE    = http://hal.freedesktop.org/releases/
-UDISKS_LICENCE = GPLv2+
-UDISKS_LICENCE_FILES = COPYING
+UDISKS_LICENSE = GPLv2+
+UDISKS_LICENSE_FILES = COPYING
 
 UDISKS_DEPENDENCIES = 	\
 	sg3_utils	\

From 9237f501d1fe859ae6ce5724992dd8146745ea11 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <roylee17@gmail.com>
Date: Mon, 22 Jul 2013 08:09:23 +0800
Subject: [PATCH 5736/6849] dropwatch: new package

[Peter: fix help text & license, needs host-pkgconf]
Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                           |  1 +
 package/dropwatch/Config.in                 | 10 +++++++
 package/dropwatch/dropwatch-1.4-build.patch | 27 +++++++++++++++++++
 package/dropwatch/dropwatch.mk              | 30 +++++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 package/dropwatch/Config.in
 create mode 100644 package/dropwatch/dropwatch-1.4-build.patch
 create mode 100644 package/dropwatch/dropwatch.mk

diff --git a/package/Config.in b/package/Config.in
index 286a605645..77303172b0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -22,6 +22,7 @@ source "package/cache-calibrator/Config.in"
 source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
+source "package/dropwatch/Config.in"
 source "package/gdb/Config.in"
 source "package/iozone/Config.in"
 source "package/kexec/Config.in"
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
new file mode 100644
index 0000000000..4c0857e0ed
--- /dev/null
+++ b/package/dropwatch/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_DROPWATCH
+	bool "dropwatch"
+	select BR2_PACKAGE_BINUTILS
+	select BR2_PACKAGE_READLINE
+	select BR2_PACKAGE_LIBNL
+	help
+	  Dropwatch is an interactive utility for monitoring and
+	  recording packets that are dropped by the kernel
+
+	  https://fedorahosted.org/dropwatch/
diff --git a/package/dropwatch/dropwatch-1.4-build.patch b/package/dropwatch/dropwatch-1.4-build.patch
new file mode 100644
index 0000000000..eed43e8dd7
--- /dev/null
+++ b/package/dropwatch/dropwatch-1.4-build.patch
@@ -0,0 +1,27 @@
+From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001
+From: Tzu-Jung Lee <tjlee@ambarella.com>
+Date: Fri, 12 Jul 2013 20:00:57 +0800
+Subject: [PATCH] build: modify hardcoded gcc to support buildroot
+
+Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
+
+diff --git a/src/Makefile b/src/Makefile
+index 026b6ba..b87ae9f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,10 +5,10 @@ OBJFILES := main.o lookup.o\
+ 	 lookup_bfd.o lookup_kas.o
+ 
+ dropwatch: $(OBJFILES) 
+-	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
++	$(CC) -g -o dropwatch $(OBJFILES) $(LDFLAGS)
+ 
+ %.o: %.c
+-	gcc $(CFLAGS) $<
++	$(CC) $(CFLAGS) $<
+ clean:
+ 	rm -f dropwatch *.o
+ 
+-- 
+1.8.3.2
+
diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
new file mode 100644
index 0000000000..6c3dc754c8
--- /dev/null
+++ b/package/dropwatch/dropwatch.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# dropwatch
+#
+################################################################################
+
+DROPWATCH_VERSION = 1.4
+DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.bz2
+DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot/
+DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf
+DROPWATCH_LICENSE = GPLv2
+DROPWATCH_LICENSE_FILES = COPYING
+
+define DROPWATCH_BUILD_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) build
+endef
+
+define DROPWATCH_CLEAN_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
+endef
+
+define DROPWATCH_INSTALL_TARGET_CMDS
+  $(INSTALL) -D -m 0755 $(@D)/src/dropwatch $(TARGET_DIR)/usr/bin/dropwatch
+endef
+
+define DROPWATCH_UNINSTALL_CMDS
+  rm -f $(TARGET_DIR)/usr/bin/dropwatch
+endef
+
+$(eval $(generic-package))

From c38ecc65f465d4a3bf8dcece621b8013949041af Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Jul 2013 07:57:42 -0300
Subject: [PATCH 5737/6849] linux-headers: bump 3.{0, 4, 9, 10}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.86 => 3.0.87}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.86/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.87/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.86/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.87/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index a872445c12..7a5decdde3 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.86"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.87"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.48"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.53"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.54"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
-	default "3.9.10"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.1"	if BR2_KERNEL_HEADERS_3_10
+	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
+	default "3.10.2"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 28226d6e30c9c5005a1f3642b53252638cde968a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 22 Jul 2013 07:57:43 -0300
Subject: [PATCH 5738/6849] linux: bump 3.10.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 3936493a5c..87a764dc6f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.1"
+	bool "3.10.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.1" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.2" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 79309d94423738e6832f08cafab0cd71f65af355 Mon Sep 17 00:00:00 2001
From: Fabien Marteau <fabien.marteau@armadeus.com>
Date: Mon, 22 Jul 2013 09:55:27 +0200
Subject: [PATCH 5739/6849] package/python-pyro: adding Pyro 3.14

[Peter: fix LICENSE_FILES tag, adjust upstream URL]
Signed-off-by: Fabien Marteau <fabien.marteau@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                  |  1 +
 package/python-pyro/Config.in      |  9 +++++++++
 package/python-pyro/python-pyro.mk | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/python-pyro/Config.in
 create mode 100644 package/python-pyro/python-pyro.mk

diff --git a/package/Config.in b/package/Config.in
index 77303172b0..9e1c0aee57 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -358,6 +358,7 @@ source "package/python-nfc/Config.in"
 source "package/python-protobuf/Config.in"
 source "package/python-pygame/Config.in"
 source "package/python-pyparsing/Config.in"
+source "package/python-pyro/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
 source "package/python-thrift/Config.in"
diff --git a/package/python-pyro/Config.in b/package/python-pyro/Config.in
new file mode 100644
index 0000000000..eb998c3970
--- /dev/null
+++ b/package/python-pyro/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_PYRO
+	bool "python-pyro"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  python-pyro is a Python library stands for PYthon Remote Objects.
+	  It is an advanced and powerful Distributed Object Technology system
+	  written entirely in Python, that is designed to be very easy to use..
+
+	  https://pypi.python.org/pypi/Pyro/
diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk
new file mode 100644
index 0000000000..67aabc6ba4
--- /dev/null
+++ b/package/python-pyro/python-pyro.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# python-pyro
+#
+################################################################################
+
+PYTHON_PYRO_VERSION = 3.14
+PYTHON_PYRO_SOURCE  = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
+PYTHON_PYRO_SITE    = https://pypi.python.org/packages/source/P/Pyro/
+PYTHON_PYRO_LICENSE = MIT
+PYTHON_PYRO_LICENSE_FILES = LICENSE
+PYTHON_PYRO_DEPENDENCIES = python
+
+define PYTHON_PYRO_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From 2abba11fc359f3db1aad4f709fa0ef8112e57733 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 25 Jul 2013 17:42:31 +0200
Subject: [PATCH 5740/6849] perl-cross: bump to version 0.7.2

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/perl/perl.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index cbd5453565..5afaaafbd6 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -12,8 +12,8 @@ PERL_LICENSE = Artistic
 PERL_LICENSE_FILES = Artistic
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 0.7
-PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
+PERL_CROSS_VERSION = 0.7.2
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).3
 PERL_CROSS_SITE    = http://download.berlios.de/perlcross
 PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod

From ca574ced3bfd1a874d5f9e90f0f85ed703559c78 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 25 Jul 2013 17:42:32 +0200
Subject: [PATCH 5741/6849] cpanminus: bump to version 1.6109

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cpanminus/cpanminus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index a2cd44be32..60a72ee593 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CPANMINUS_VERSION = 1.6002
+CPANMINUS_VERSION = 1.6109
 CPANMINUS_SOURCE = $(CPANMINUS_VERSION).tar.gz
 CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/archive
 CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))

From 6bd2fe479fa8643234e76efdda900f90cb151888 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 24 Jul 2013 12:44:09 -0300
Subject: [PATCH 5742/6849] package/uclibc: fix big oops from fb354d5f

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...Rules.mak-fix-breakage-from-603af30d.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0010-Rules.mak-fix-breakage-from-603af30d.patch

diff --git a/package/uclibc/0.9.33.2/uclibc-0010-Rules.mak-fix-breakage-from-603af30d.patch b/package/uclibc/0.9.33.2/uclibc-0010-Rules.mak-fix-breakage-from-603af30d.patch
new file mode 100644
index 0000000000..61ed439cdb
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0010-Rules.mak-fix-breakage-from-603af30d.patch
@@ -0,0 +1,31 @@
+From f5017653dc63d62c94cc2884ed3a50a4f93001cd Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 24 Jul 2013 12:28:19 -0300
+Subject: [PATCHv2] Rules.mak: fix breakage from 603af30d
+
+Removing the whitespace from findstring for 64 bit architectures has
+bad consequences since powerpc would be a match in powerpc64 and sparc
+would also be a match in sparc64.
+That doesn't make them 64 bits in reality causing general breakage.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ Rules.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Rules.mak b/Rules.mak
+index 889108e..be53d81 100644
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -141,7 +141,7 @@ UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
+ 
+ UCLIBC_LDSO_NAME := ld-uClibc
+ ARCH_NATIVE_BIT := 32
+-ifneq ($(findstring $(TARGET_ARCH),hppa64 ia64 powerpc64 s390x sparc64 x86_64),)
++ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
+ UCLIBC_LDSO_NAME := ld64-uClibc
+ ARCH_NATIVE_BIT := 64
+ else
+-- 
+1.8.1.5
+

From ab25903bd7d3f1aa58f96867304114cbd7a6fbad Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 24 Jul 2013 11:50:14 +0200
Subject: [PATCH 5743/6849] u-boot: support custom u-boot.bin name

On some platforms, the standard U-Boot binary is not called u-boot.bin,
but u-boot<something>.bin. This is for example the case on the
Cavium-provided u-boot, where the output file is called
u-boot_<boardname>.bin.

This patch adds a 'custom format' choice in the existing u-boot binary
format selection, where this name can be put. In the Cavium example, this
option could be set to:
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-$(BR2_TARGET_UBOOT_BOARDNAME).bin"

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/uboot/Config.in | 16 ++++++++++++++++
 boot/uboot/uboot.mk  |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index aadf75707b..f5806e7de0 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -101,8 +101,24 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 config BR2_TARGET_UBOOT_FORMAT_ELF
 	bool "u-boot.elf"
 
+config BR2_TARGET_UBOOT_FORMAT_CUSTOM
+	bool "Custom (specify below)"
+	help
+	  On some platforms, the standard U-Boot binary is not called
+	  u-boot.bin, but u-boot<something>.bin. If this is your case,
+	  you should select this option and specify the correct name
+	  in BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME.
+
 endchoice
 
+config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
+	string "U-Boot binary format: custom name"
+	depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
+	help
+	  Specify the correct name of the output binary created by
+	  U-Boot, if it is not one of the default names. For example:
+	  u-boot_magic.bin
+
 config BR2_TARGET_UBOOT_OMAP_IFT
 	depends on BR2_TARGET_UBOOT_FORMAT_BIN
 	depends on BR2_arm || BR2_armeb
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index b357e0f06b..3904b8bd4f 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -40,6 +40,8 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BIN          = u-boot-nand.bin
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
 UBOOT_BIN          = u-boot.img
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
+UBOOT_BIN          = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
 else
 UBOOT_BIN          = u-boot.bin
 UBOOT_BIN_IFT      = $(UBOOT_BIN).ift

From fb3d0e177f40e9cbb54827d565e778eda2c5a58d Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Tue, 23 Jul 2013 18:28:08 +0200
Subject: [PATCH 5744/6849] uclibc: arc: fix fstat for big-endian

Fixes "Value too large for defined data type" messages caused by fstat
syscall wrapper returning -EOVERFLOW.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../uclibc/0.9.33-arc/fix-fstat-for-be.patch  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/uclibc/0.9.33-arc/fix-fstat-for-be.patch

diff --git a/package/uclibc/0.9.33-arc/fix-fstat-for-be.patch b/package/uclibc/0.9.33-arc/fix-fstat-for-be.patch
new file mode 100644
index 0000000000..2cdb517b68
--- /dev/null
+++ b/package/uclibc/0.9.33-arc/fix-fstat-for-be.patch
@@ -0,0 +1,32 @@
+From f394d65c74631a0e715bac582b09c302ee84114f Mon Sep 17 00:00:00 2001
+From: Mischa Jonker <mjonker@synopsys.com>
+Date: Tue, 23 Jul 2013 17:59:04 +0200
+Subject: [PATCH] libc/sysdeps: Fix common-generic stat.h for BE part 2
+
+Previous patch only fixed the build. This patch fixes the behavior at
+run-time as well.
+
+It fixes "Value too large for defined data type" messages caused by
+fstat syscall wrapper returning -EOVERFLOW.
+
+Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
+---
+ libc/sysdeps/linux/common-generic/bits/stat.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common-generic/bits/stat.h b/libc/sysdeps/linux/common-generic/bits/stat.h
+index 07716ab..945c408 100644
+--- a/libc/sysdeps/linux/common-generic/bits/stat.h
++++ b/libc/sysdeps/linux/common-generic/bits/stat.h
+@@ -63,8 +63,8 @@ struct stat
+     unsigned long long __pad4;
+     long __pad5;
+     long st_size;				/* Size of file, in bytes. */
+-    int __pad6;
+     int st_blksize;				/* Optimal block size for I/O. */
++    int __pad6;
+     long __pad7;
+     long st_blocks;				/* Number 512-byte blocks allocated */
+ # endif /* __LITTLE_ENDIAN */
+--
+1.7.9.5

From a8b0a3f87022c1723238f307ad9dddbeaf834d08 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Tue, 23 Jul 2013 16:33:58 +0100
Subject: [PATCH 5745/6849] directfb-examples: install rose.png for df_dok

The directfb example program df_dok now requires rose.png to be
installed, otherwise it gives the following error:

(#) DirectFBError [dfb->CreateImageProvider( dfb, DATADIR"/rose.png", &provider )]: A general or unknown error occured

Therefore add rose.png to the list of data files if df_dok is enabled.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/directfb-examples/directfb-examples.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index c39d411436..26408bfbc2 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -58,6 +58,7 @@ DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directf
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/intro.png
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/fish.png
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/swirl.png
+DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK) += usr/share/directfb-examples/rose.png
 
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST) += usr/share/directfb-examples/pngtest.png
 DIRECTFB_EXAMPLES_DATA_$(BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST) += usr/share/directfb-examples/testmask.png

From 808cc0a5e17af2c9cd2210cdcbf0d98e79b6e157 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 4 Jul 2013 15:30:26 -0300
Subject: [PATCH 5746/6849] toolchain/buildroot: properly handle SSP

The current SSP handling is incomplete.

First we need to build uClibc with SSP support for a complete
"experience".

Second, it doesn't hurt to add -fstack-protector-all to the
CFLAGS/CXXFLAGS since most users would expect buildroot to do this
rather than adding the flags themselves.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Makefile.in                       |  5 +++++
 package/uclibc/uclibc.mk                  | 10 ++++++++--
 toolchain/toolchain-buildroot/Config.in.2 |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index a597290c23..95eec52dcc 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -124,6 +124,11 @@ TARGET_CFLAGS += -msep-data
 TARGET_CXXFLAGS += -msep-data
 endif
 
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
+TARGET_CFLAGS += -fstack-protector-all
+TARGET_CXXFLAGS += -fstack-protector-all
+endif
+
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
 else
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 044de21d96..cf53280c9b 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -251,9 +251,15 @@ endif
 # SSP
 #
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
-UCLIBC_SSP_CONFIG = $(call UCLIBC_OPT_SET,UCLIBC_HAS_SSP,y,$(@D))
+define UCLIBC_SSP_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_HAS_SSP,y,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_BUILD_SSP,y,$(@D))
+endef
 else
-UCLIBC_SSP_CONFIG = $(call UCLIBC_OPT_UNSET,UCLIBC_HAS_SSP,$(@D))
+define UCLIBC_SSP_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_SSP,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_BUILD_SSP,$(@D))
+endef
 endif
 
 #
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index a9c102f7f8..bf27e6b73d 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -21,7 +21,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 	bool "Enable stack protection support"
 	help
 	  Enable stack smashing protection support using GCCs
-	  -fstack-protector[-all] option.
+	  -fstack-protector-all option.
 
 	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
 	  for details.

From d8966bab7a49426d06029de9d12299bd32aff990 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 24 Jul 2013 12:34:31 +0200
Subject: [PATCH 5747/6849] bind: install to staging

Install bind to staging so other applications can use its include files
and libraries.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bind/bind.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 4137093c62..93fc9fb401 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -7,6 +7,7 @@
 BIND_VERSION = 9.6-ESV-R9-P1
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
+BIND_INSTALL_STAGING = YES
 BIND_LICENSE = ISC
 BIND_LICENSE_FILES = COPYRIGHT
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

From b8891dedb09a47a2cfd056fa81f8f945ac73cf08 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 24 Jul 2013 12:34:32 +0200
Subject: [PATCH 5748/6849] dhcp: install to staging

Install dhcp to staging so other applications can use its include files
and libraries.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/dhcp/dhcp.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 3baeb23842..3885bba7bf 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -6,6 +6,7 @@
 
 DHCP_VERSION = 4.1-ESV-R8
 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
+DHCP_INSTALL_STAGING = YES
 DHCP_LICENSE = ISC
 DHCP_LICENSE_FILES = LICENSE
 DHCP_CONF_ENV = ac_cv_file__dev_random=yes

From 84779fd22a9b7cb76689b6453cee4b8b05a03b5f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 27 Jul 2013 09:13:06 -0300
Subject: [PATCH 5749/6849] squid: bump to version 3.3.8

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../squid/squid-01-assume-get-certificate-ok.patch   | 12 ++++++------
 package/squid/squid.mk                               |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/squid/squid-01-assume-get-certificate-ok.patch b/package/squid/squid-01-assume-get-certificate-ok.patch
index e7d4515cd3..0f8d93ea22 100644
--- a/package/squid/squid-01-assume-get-certificate-ok.patch
+++ b/package/squid/squid-01-assume-get-certificate-ok.patch
@@ -3,14 +3,14 @@ Just assume it works ok since we're using a modern OpenSSL version.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura squid-3.3.5.orig/configure.ac squid-3.3.5/configure.ac
---- squid-3.3.5.orig/configure.ac	2013-06-03 09:37:44.016398185 -0300
-+++ squid-3.3.5/configure.ac	2013-06-03 09:37:55.926784556 -0300
-@@ -1261,7 +1261,6 @@
+diff -Nura squid-3.3.8.orig/configure.ac squid-3.3.8/configure.ac
+--- squid-3.3.8.orig/configure.ac	2013-07-26 08:57:50.177259534 -0300
++++ squid-3.3.8/configure.ac	2013-07-26 08:57:55.997448040 -0300
+@@ -1265,7 +1265,6 @@
  AC_SUBST(SSLLIB)
-
+ 
  if test "x$with_openssl" = "xyes"; then
 -SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
+ SQUID_CHECK_OPENSSL_CONST_SSL_METHOD
  SQUID_CHECK_OPENSSL_TXTDB
  fi
-
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index f6be405075..f7d39874ed 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SQUID_VERSION = 3.3.6
+SQUID_VERSION = 3.3.8
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING

From 5a57148657bbfa565afb700fc5d6912dd8d8b8a5 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Mon, 22 Jul 2013 07:30:22 +0200
Subject: [PATCH 5750/6849] fix header package name

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bcusdk/bcusdk.mk                                        | 2 +-
 package/bonnie/bonnie.mk                                        | 2 +-
 package/ccid/ccid.mk                                            | 2 +-
 package/cegui06/cegui06.mk                                      | 2 +-
 package/celt051/celt.mk                                         | 2 +-
 package/cryptodev/cryptodev.mk                                  | 2 +-
 package/directfb-examples/directfb-examples.mk                  | 2 +-
 package/foomatic-filters/foomatic-filters.mk                    | 2 +-
 package/freerdp/freerdp.mk                                      | 2 +-
 package/glibmm/glibmm.mk                                        | 2 +-
 package/gtest/gtest.mk                                          | 2 +-
 package/gtk2-engines/gtk2-engines.mk                            | 2 +-
 package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk    | 2 +-
 package/gtkperf/gtkperf.mk                                      | 2 +-
 package/icu/icu.mk                                              | 2 +-
 package/inotify-tools/inotify-tools.mk                          | 2 +-
 package/jpeg/jpeg.mk                                            | 2 +-
 package/libatomic_ops/libatomic_ops.mk                          | 2 +-
 package/libdvbsi/libdvbsi.mk                                    | 2 +-
 package/libgtk2/libgtk2.mk                                      | 2 +-
 package/liblog4c-localtime/liblog4c-localtime.mk                | 2 +-
 package/libsigc/libsigc.mk                                      | 2 +-
 package/liburcu/liburcu.mk                                      | 2 +-
 package/libxmlpp/libxmlpp.mk                                    | 2 +-
 package/lite/lite.mk                                            | 2 +-
 package/lttng-libust/lttng-libust.mk                            | 2 +-
 package/lttng-modules/lttng-modules.mk                          | 2 +-
 package/lttng-tools/lttng-tools.mk                              | 2 +-
 package/matchbox/matchbox-common/matchbox-common.mk             | 2 +-
 package/matchbox/matchbox-desktop/matchbox-desktop.mk           | 2 +-
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk           | 2 +-
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk         | 2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk                   | 2 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk               | 2 +-
 .../matchbox-startup-monitor/matchbox-startup-monitor.mk        | 2 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk                     | 2 +-
 .../mobile_broadband_provider_info.mk                           | 2 +-
 package/multimedia/gst-plugin-x170/gst-plugin-x170.mk           | 2 +-
 package/mysql_client/mysql_client.mk                            | 2 +-
 package/network-manager/network-manager.mk                      | 2 +-
 package/nss-mdns/nss-mdns.mk                                    | 2 +-
 package/opengl/libegl/libegl.mk                                 | 2 +-
 package/opengl/libgles/libgles.mk                               | 2 +-
 package/opengl/libopenmax/libopenmax.mk                         | 2 +-
 package/opengl/libopenvg/libopenvg.mk                           | 2 +-
 package/pkg-config/pkg-config.mk                                | 2 +-
 package/powervr/powervr.mk                                      | 2 +-
 package/python-pygame/python-pygame.mk                          | 2 +-
 package/sdl/sdl.mk                                              | 2 +-
 package/sdl_gfx/sdl_gfx.mk                                      | 2 +-
 package/sdl_image/sdl_image.mk                                  | 2 +-
 package/sdl_mixer/sdl_mixer.mk                                  | 2 +-
 package/sdl_net/sdl_net.mk                                      | 2 +-
 package/sdl_sound/sdl_sound.mk                                  | 2 +-
 package/sdl_ttf/sdl_ttf.mk                                      | 2 +-
 package/slirp/slirp.mk                                          | 2 +-
 package/supervisor/supervisor.mk                                | 2 +-
 package/tcl/tcl.mk                                              | 2 +-
 package/tremor/tremor.mk                                        | 2 +-
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk                | 2 +-
 .../xdriver_xf86-video-openchrome.mk                            | 2 +-
 .../x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk    | 2 +-
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk  | 2 +-
 .../xfont_font-adobe-utopia-100dpi.mk                           | 2 +-
 .../xfont_font-adobe-utopia-75dpi.mk                            | 2 +-
 .../xfont_font-adobe-utopia-type1.mk                            | 2 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk              | 2 +-
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk  | 2 +-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk      | 2 +-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk        | 2 +-
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                    | 2 +-
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                     | 2 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk            | 2 +-
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk        | 2 +-
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk  | 2 +-
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk    | 2 +-
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk    | 2 +-
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk    | 2 +-
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk  | 2 +-
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk  | 2 +-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk        | 2 +-
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk      | 2 +-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk      | 2 +-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk        | 2 +-
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk    | 2 +-
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk  | 2 +-
 .../x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk  | 2 +-
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk  | 2 +-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk      | 2 +-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk      | 2 +-
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk    | 2 +-
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk    | 2 +-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk      | 2 +-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk        | 2 +-
 package/x11r7/xfont_font-util/xfont_font-util.mk                | 2 +-
 .../xfont_font-winitzki-cyrillic.mk                             | 2 +-
 .../x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk  | 2 +-
 package/xenomai/xenomai.mk                                      | 2 +-
 package/xz/xz.mk                                                | 2 +-
 99 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
index 31cbf90558..880b7d9746 100644
--- a/package/bcusdk/bcusdk.mk
+++ b/package/bcusdk/bcusdk.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# bcusck
+# bcusdk
 #
 ################################################################################
 
diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
index a9019869c6..75cb15574b 100644
--- a/package/bonnie/bonnie.mk
+++ b/package/bonnie/bonnie.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# bonnie++
+# bonnie
 #
 ################################################################################
 
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 6604bc1c3e..a246ddd291 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# CCID
+# ccid
 #
 ################################################################################
 
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
index d44b8c4c09..8dd1a37a4a 100644
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# libcegui
+# cegui06
 #
 ################################################################################
 
diff --git a/package/celt051/celt.mk b/package/celt051/celt.mk
index b2fa951f34..528dfcecf2 100644
--- a/package/celt051/celt.mk
+++ b/package/celt051/celt.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# celt051
+# celt
 #
 ################################################################################
 
diff --git a/package/cryptodev/cryptodev.mk b/package/cryptodev/cryptodev.mk
index 1e0cbdeebc..ad5adf0cfb 100644
--- a/package/cryptodev/cryptodev.mk
+++ b/package/cryptodev/cryptodev.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# virtual cryptodev package
+# cryptodev
 #
 ################################################################################
 
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 26408bfbc2..0a2138ed7f 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# directfb examples
+# directfb-examples
 #
 ################################################################################
 
diff --git a/package/foomatic-filters/foomatic-filters.mk b/package/foomatic-filters/foomatic-filters.mk
index 80daea5a53..950f2f94ce 100644
--- a/package/foomatic-filters/foomatic-filters.mk
+++ b/package/foomatic-filters/foomatic-filters.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# foomatic_filters
+# foomatic-filters
 #
 ################################################################################
 
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index efb6fc9e23..c06aac9f4e 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# FreeRDP
+# freerdp
 #
 ################################################################################
 
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index d1619a1b2d..9eaa19785f 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Glibmm
+# glibmm
 #
 ################################################################################
 
diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 63a2360974..52028f5294 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# googletest
+# gtest
 #
 ################################################################################
 
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index ad48ddd42b..402b3c967b 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# gtk2-engines.0
+# gtk2-engines
 #
 ################################################################################
 
diff --git a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
index a250d57e52..ae677f74ed 100644
--- a/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
+++ b/package/gtk2-themes/gtk2-theme-hicolor/gtk2-theme-hicolor.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# GTK Theme - Hicolour
+# gtk2-theme-hicolor
 #
 ################################################################################
 
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index a69fc7614a..27403abbfc 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# GtkPerf
+# gtkperf
 #
 ################################################################################
 
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 7954eb094f..f93eab1476 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# International Components for Unicode
+# icu
 #
 ################################################################################
 
diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk
index 9d10b941c3..1a988a3008 100644
--- a/package/inotify-tools/inotify-tools.mk
+++ b/package/inotify-tools/inotify-tools.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# inotify-utils
+# inotify-tools
 #
 ################################################################################
 
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index caea98c1b6..eaa23944c1 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# virtual jpeg package
+# jpeg
 #
 ################################################################################
 
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index d3e4f6694a..cf2146eaa5 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# atomic_ops library
+# libatomic_ops
 #
 ################################################################################
 
diff --git a/package/libdvbsi/libdvbsi.mk b/package/libdvbsi/libdvbsi.mk
index 2151691dda..c67bdbdce8 100644
--- a/package/libdvbsi/libdvbsi.mk
+++ b/package/libdvbsi/libdvbsi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# libdvbsi++
+# libdvbsi
 #
 ################################################################################
 
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 8ac455b4aa..94cfd4c94b 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# libgtk2.0
+# libgtk2
 #
 ################################################################################
 
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index 0b5bac2c30..f68fb53687 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# liblog4c
+# liblog4c-localtime
 #
 ################################################################################
 
diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 86a3a61de5..d3e0135d03 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# libsigc++
+# libsigc
 #
 ################################################################################
 
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 7a32e7fbe6..a586382cf6 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# liburc
+# liburcu
 #
 ################################################################################
 
diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk
index 9194274684..cc26d9489c 100644
--- a/package/libxmlpp/libxmlpp.mk
+++ b/package/libxmlpp/libxmlpp.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# LibXML++
+# libxmlpp
 #
 ################################################################################
 
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index 262b2d45ba..1784d1fed9 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# LiTE
+# lite
 #
 ################################################################################
 
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index c3137aa277..b0ebd3f906 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# LTTng-UST
+# lttng-libust
 #
 ################################################################################
 
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index 66faa1ff45..baa421e202 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# LTTng-modules
+# lttng-modules
 #
 ################################################################################
 
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 0eb5fdc1b3..f6eff96d90 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# LTTng-Tools
+# lttng-tools
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 0a169d7495..730635fc79 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox Common
+# matchbox-common
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 7780bb64e6..9989e148af 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox Desktop
+# matchbox-desktop
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index ebae9d2bae..47de4a0703 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox Fakekey
+# matchbox-fakekey
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 5b0f691973..ff853701b7 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox Keyboard
+# matchbox-keyboard
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index b4c378caf7..a04b971079 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox LIB
+# matchbox-lib
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index 655b20f6ca..7579d49150 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox Panel
+# matchbox-panel
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 561cac9ea2..316893e35d 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox Applet Startup monitor
+# matchbox-startup-monitor
 #
 ################################################################################
 
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 0f10c896f2..696e9ccead 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MatchBox WM
+# matchbox-wm
 #
 ################################################################################
 
diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index 035b94833f..77f8cbaa5d 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# mobile broadband provider info
+# mobile_broadband_provider_info
 #
 ################################################################################
 
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk b/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
index a6143ed512..e14d460a41 100644
--- a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
+++ b/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# gst-plugins-x170
+# gst-plugin-x170
 #
 ################################################################################
 
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index ade4822f3b..00c72b7a4f 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# MySQL 5.1 Client
+# mysql_client
 #
 ################################################################################
 
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index b4d34088d6..7c9cc88225 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# NetworkManager
+# network-manager
 #
 ################################################################################
 
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 9887256327..30a0a73652 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# nss_mdns
+# nss-mdns
 #
 ################################################################################
 
diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index 00e1f19445..84ee28c969 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Virtual package for libEGL
+# libegl
 #
 ################################################################################
 
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index d2fe11b976..1b62a196af 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Virtual package for libGLES
+# libgles
 #
 ################################################################################
 
diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk
index 9175c6e5c2..9e6f89aaa6 100644
--- a/package/opengl/libopenmax/libopenmax.mk
+++ b/package/opengl/libopenmax/libopenmax.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Virtual package for libopenmax
+# libopenmax
 #
 ################################################################################
 
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
index 03f59ba57f..3296f63915 100644
--- a/package/opengl/libopenvg/libopenvg.mk
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Virtual package for libOpenVG
+# libopenvg
 #
 ################################################################################
 
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 4a3d66dfc2..1f859b55a3 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# pkgconfig
+# pkg-config
 #
 ################################################################################
 
diff --git a/package/powervr/powervr.mk b/package/powervr/powervr.mk
index b63b0e66e8..83392fde36 100644
--- a/package/powervr/powervr.mk
+++ b/package/powervr/powervr.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Virtual package for PowerVR driver
+# powervr
 #
 ################################################################################
 
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index 4a87db73ea..739ba45e71 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# pygame
+# python-pygame
 #
 ################################################################################
 
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 716bb6259e..ef723ddab5 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# SDL
+# sdl
 #
 ################################################################################
 
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index 04f1d8b708..c6b94510ee 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# SDL_gfx addon for SDL
+# sdl_gfx
 #
 ################################################################################
 
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 3945505130..ba9751de60 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# SDL_image addon for SDL
+# sdl_image
 #
 ################################################################################
 
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 73743eb85f..a192b5a3db 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# SDL_mixer
+# sdl_mixer
 #
 ################################################################################
 
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index 8039da44f0..dc8f25fb61 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# SDL_net: network addon for SDL
+# sdl_net
 #
 ################################################################################
 
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index cd1ed3e998..ae351dc32c 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# sdl_sound addon for SDL
+# sdl_sound
 #
 ################################################################################
 
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index 1310287301..23fb335154 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# SDL_ttf
+# sdl_ttf
 #
 ################################################################################
 
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index 9ed3424d62..0e208434db 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# spice-slirp
+# slirp
 #
 ################################################################################
 
diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk
index edd2efde29..516065b6e5 100644
--- a/package/supervisor/supervisor.mk
+++ b/package/supervisor/supervisor.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# python-supervisor
+# supervisor
 #
 ################################################################################
 
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 0c8fa339c5..4528d545bb 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# tcl8.4
+# tcl
 #
 ################################################################################
 
diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index c0ce5efc51..291a413c58 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Tremor
+# tremor
 #
 ################################################################################
 
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 96bffe7820..d4325aa084 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xapp_backlight
+# xapp_xbacklight
 #
 ################################################################################
 
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 7104719f44..dda18fcc28 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# openchrome
+# xdriver_xf86-video-openchrome
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 58a9fd7fdb..2bc2c7983e 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-100dpi
+# xfont_font-adobe-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index 02e6714f84..15d0b6b154 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-75dpi
+# xfont_font-adobe-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index 6692c24ea2..ec14c5397e 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-utopia-100dpi
+# xfont_font-adobe-utopia-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index 7af3bd0abf..ce190dbc65 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-utopia-75dpi
+# xfont_font-adobe-utopia-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 5826db84d9..a356f03f07 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-adobe-utopia-type1
+# xfont_font-adobe-utopia-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 2e8792a17e..ad048822bd 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-alias
+# xfont_font-alias
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index e24c834002..7c296b6282 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-arabic-misc
+# xfont_font-arabic-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 8baa0cb718..37a9af3118 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-100dpi
+# xfont_font-bh-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index ae55fd3173..e525ce9124 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-75dpi
+# xfont_font-bh-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index b652a37591..1b3b66f854 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-lucidatypewriter-100dpi
+# xfont_font-bh-lucidatypewriter-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 12c71e101f..390f1f2b0a 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-lucidatypewriter-75dpi
+# xfont_font-bh-lucidatypewriter-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index fac6434fdf..7213ebceaa 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-ttf
+# xfont_font-bh-ttf
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 1244cc96e9..dc5829b25c 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bh-type1
+# xfont_font-bh-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index a1c89aa5f8..c6c08c5837 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bitstream-100dpi
+# xfont_font-bitstream-100dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index 335f6606b4..d6c2ee37e9 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bitstream-75dpi
+# xfont_font-bitstream-75dpi
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index c68db7ec85..5bcc31a968 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-bitstream-type1
+# xfont_font-bitstream-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index c41f0dbc93..93bdafe9e4 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-cronyx-cyrillic
+# xfont_font-cronyx-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 5cd312d035..efce6bdd4a 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-cursor-misc
+# xfont_font-cursor-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index 8c267bcbf8..fc6ecbf904 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-daewoo-misc
+# xfont_font-daewoo-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index 77242fe8f8..f2f71f166a 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-dec-misc
+# xfont_font-dec-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 094781ec54..42df33a189 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-ibm-type1
+# xfont_font-ibm-type1
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 967303d847..84dbf7d690 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-isas-misc
+# xfont_font-isas-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index eabb969c3b..a65990b3ce 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-jis-misc
+# xfont_font-jis-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 1f82f260b7..2ea5dd32ce 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-micro-misc
+# xfont_font-micro-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index 464f0be161..ae54a8b9ea 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-cyrillic
+# xfont_font-misc-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index 0378907725..b05b572ec4 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-ethiopic
+# xfont_font-misc-ethiopic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index acc4338c5f..b71275d313 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-meltho
+# xfont_font-misc-meltho
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index a249edf6e8..81cf3203f1 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-misc-misc
+# xfont_font-misc-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index f89a63d80b..2333f769ac 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-mutt-misc
+# xfont_font-mutt-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 04b662c3a2..45cc24975b 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-schumacher-misc
+# xfont_font-schumacher-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index 9196cd84a9..91cc3a0c52 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-screen-cyrillic
+# xfont_font-screen-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 5a69dbc64d..db7155d729 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-sony-misc
+# xfont_font-sony-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index fb8ee4ac60..09e17c3dbe 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-sun-misc
+# xfont_font-sun-misc
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index b359f829c1..946bb0261d 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-util
+# xfont_font-util
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index aec5a90d77..c214446dfa 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-winitzki-cyrillic
+# xfont_font-winitzki-cyrillic
 #
 ################################################################################
 
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 88da7aa02f..4a9fea047f 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# font-xfree86-type1
+# xfont_font-xfree86-type1
 #
 ################################################################################
 
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 859895319f..f10dec0c93 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Xenomai
+# xenomai
 #
 ################################################################################
 
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index de746ada8b..98fca3a2ff 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# xz-utils
+# xz
 #
 ################################################################################
 

From 03882d45b2dbf1ed0be759284d812d5f3cf3e917 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Mon, 22 Jul 2013 07:56:13 +0200
Subject: [PATCH 5751/6849] normalize separator size to 80

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bind/bind.mk                                      | 2 +-
 package/elf2flt/elf2flt.mk                                | 4 ++--
 package/multimedia/gst-omx/gst-omx.mk                     | 4 ++--
 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk   | 4 ++--
 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk | 4 ++--
 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk | 4 ++--
 package/multimedia/gstreamer1/gstreamer1.mk               | 4 ++--
 package/ramsmp/ramsmp.mk                                  | 4 ++--
 package/ti-gfx/ti-gfx.mk                                  | 4 ++--
 package/w_scan/w_scan.mk                                  | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 93fc9fb401..306284b0ad 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -1,4 +1,4 @@
-###############################################################################
+################################################################################
 #
 # bind
 #
diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
index cd1c21db40..27dd807a77 100644
--- a/package/elf2flt/elf2flt.mk
+++ b/package/elf2flt/elf2flt.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # elf2flt
 #
-#############################################################
+################################################################################
 
 ELF2FLT_SOURCE =
 HOST_ELF2FLT_SOURCE =
diff --git a/package/multimedia/gst-omx/gst-omx.mk b/package/multimedia/gst-omx/gst-omx.mk
index 1127ed8835..4b92584534 100644
--- a/package/multimedia/gst-omx/gst-omx.mk
+++ b/package/multimedia/gst-omx/gst-omx.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gst-omx
 #
-#############################################################
+################################################################################
 
 GST_OMX_VERSION = 1.0.0
 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
index ac773920c6..732cddf993 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -1,8 +1,8 @@
-###############################################################################
+################################################################################
 #
 # gst1-plugins-bad
 #
-###############################################################################
+################################################################################
 
 GST1_PLUGINS_BAD_VERSION = 1.0.8
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index 23fbd80c28..614a006ac7 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -1,8 +1,8 @@
-###############################################################################
+################################################################################
 #
 # gst1-plugins-good
 #
-###############################################################################
+################################################################################
 
 GST1_PLUGINS_GOOD_VERSION = 1.0.8
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 4fcc3d4f5c..c6c927bf9e 100644
--- a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -1,8 +1,8 @@
-###############################################################################
+################################################################################
 #
 # gst1-plugins-ugly
 #
-###############################################################################
+################################################################################
 
 GST1_PLUGINS_UGLY_VERSION = 1.0.8
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
index 1e1564f87e..d3db119d31 100644
--- a/package/multimedia/gstreamer1/gstreamer1.mk
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # gstreamer1
 #
-#############################################################
+################################################################################
 
 GSTREAMER1_VERSION = 1.0.8
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
diff --git a/package/ramsmp/ramsmp.mk b/package/ramsmp/ramsmp.mk
index 7d4eee75a2..6098376da5 100644
--- a/package/ramsmp/ramsmp.mk
+++ b/package/ramsmp/ramsmp.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # ramsmp
 #
-#############################################################
+################################################################################
 
 RAMSMP_VERSION = 3.5.0
 RAMSMP_SITE = http://www.alasir.com/software/ramspeed
diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk
index 771399095a..44a3c1d8f5 100644
--- a/package/ti-gfx/ti-gfx.mk
+++ b/package/ti-gfx/ti-gfx.mk
@@ -1,8 +1,8 @@
-###############################################################################
+################################################################################
 #
 # ti-gfx
 #
-###############################################################################
+################################################################################
 
 TI_GFX_VERSION = 4_09_00_01
 TI_GFX_SO_VERSION = 1.9.2188537
diff --git a/package/w_scan/w_scan.mk b/package/w_scan/w_scan.mk
index d2f3e4a2a3..5ca02b8f23 100644
--- a/package/w_scan/w_scan.mk
+++ b/package/w_scan/w_scan.mk
@@ -1,8 +1,8 @@
-###############################################################################
+################################################################################
 #
 # w_scan
 #
-###############################################################################
+################################################################################
 
 W_SCAN_VERSION              = 20130331
 W_SCAN_SOURCE               = w_scan-$(W_SCAN_VERSION).tar.bz2

From 396e92ed2e2aad55fbb2c0592c7e3f0063e0e065 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <roylee17@gmail.com>
Date: Sat, 20 Jul 2013 20:52:19 +0800
Subject: [PATCH 5752/6849] tstools: new package

[Thomas: properly indent help text, add largefile dependency, remove
unneeded libpcap dependency, remove unneeded CLEAN_CMDS, reorder build
and install commands, remove uneeded <pkg>_INSTALL_STAGING,
<pkg>_INSTALL_TARGET and <pkg>_INSTALL_IMAGES variables, move from
package/multimedia/ to package/, add license details, rename patch to
remove version number in the patch filename.]

Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/Config.in                  |  1 +
 package/tstools/Config.in                     | 17 ++++++++
 ...tools-build-get-along-with-buildroot.patch | 40 +++++++++++++++++++
 package/tstools/tstools.mk                    | 21 ++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 package/tstools/Config.in
 create mode 100644 package/tstools/tstools-build-get-along-with-buildroot.patch
 create mode 100644 package/tstools/tstools.mk

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 925051e947..2fcac56599 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -37,6 +37,7 @@ source "package/multimedia/on2-8170-libs/Config.in"
 source "package/opus-tools/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
+source "package/tstools/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
 source "package/multimedia/wavpack/Config.in"
 source "package/yavta/Config.in"
diff --git a/package/tstools/Config.in b/package/tstools/Config.in
new file mode 100644
index 0000000000..58f3df1ef8
--- /dev/null
+++ b/package/tstools/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_TSTOOLS
+	bool "tstools"
+	depends on BR2_LARGEFILE
+	help
+	  This is a set of cross-platform command line tools for
+	  working with MPEG data
+
+	  The emphasis is on relatively simple tools which concentrate
+	  on MPEG (H.264 and H.262) data packaged according to H.222
+	  (i.e., TS or PS), with a particular interest in checking for
+	  conformance.
+
+	  Transport Stream (TS) is typically used for distribution of
+	  cable and satellite data. Program Stream (PS) is typically
+	  used to store data on DVDs.
+
+	  http://tstools.berlios.de/
diff --git a/package/tstools/tstools-build-get-along-with-buildroot.patch b/package/tstools/tstools-build-get-along-with-buildroot.patch
new file mode 100644
index 0000000000..1e7a748262
--- /dev/null
+++ b/package/tstools/tstools-build-get-along-with-buildroot.patch
@@ -0,0 +1,40 @@
+From 44f80bce0914d4d9c5e7486c7cdb521ba637b324 Mon Sep 17 00:00:00 2001
+From: Tzu-Jung Lee <tjlee@ambarella.com>
+Date: Fri, 19 Jul 2013 22:45:18 +0800
+Subject: [PATCH] build: get along with buildroot
+
+Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
+---
+ Makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2c3568e..98bb994 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,12 +34,6 @@ SHELL = /bin/sh
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
+-ifdef CROSS_COMPILE
+-CC = $(CROSS_COMPILE)gcc
+-else
+-CC = gcc
+-endif
+-
+ # Use WARN=1 periodically to get too many warnings...
+ ifdef WARN
+ WARNING_FLAGS = -Wall -W -Wfloat-equal -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wmissing-prototypes -Wmissing-declarations -Wunreachable-code -Winline
+@@ -452,3 +446,9 @@ test_lists:	$(BINDIR)/test_nal_unit_list  $(BINDIR)/test_es_unit_list
+ 	@echo +++ Testing ES unit lists
+ 	$(BINDIR)/test_es_unit_list
+ 	@echo +++ Test succeeded
++
++.PHONY: install
++install:
++	@for i in $(PROGS); do \
++		cp -f $$i $(DESTDIR)/usr/bin/; \
++	done
+-- 
+1.8.3.2
+
diff --git a/package/tstools/tstools.mk b/package/tstools/tstools.mk
new file mode 100644
index 0000000000..377cc34f91
--- /dev/null
+++ b/package/tstools/tstools.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# tstools
+#
+################################################################################
+
+TSTOOLS_VERSION = 1_11
+TSTOOLS_SITE    = https://tstools.googlecode.com/files/
+TSTOOLS_SOURCE  = tstools-$(TSTOOLS_VERSION).tgz
+TSTOOLS_LICENSE = MPL v1.1
+
+define TSTOOLS_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define TSTOOLS_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))

From 111ced757eece3172daad8a39d884aa274edba2b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:07 -0300
Subject: [PATCH 5753/6849] gcc/bfin: doesn't support --with-cpu defaults

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gcc/gcc.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 85cd7d429a..cbeaa6c581 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -159,6 +159,8 @@ endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
 HOST_GCC_COMMON_CONF_OPT += --with-abi=$(BR2_GCC_TARGET_ABI)
 endif
+# GCC doesn't support --with-cpu for bfin
+ifeq ($(BR2_bfin),)
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
 HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
@@ -166,6 +168,7 @@ else
 HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
 endif
 endif
+endif
 
 GCC_TARGET_FPU = $(call qstrip,$(BR2_GCC_TARGET_FPU))
 ifneq ($(GCC_TARGET_FPU),)

From 04f0d1379c11a98dc43df4ab70a87c0651c75310 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:08 -0300
Subject: [PATCH 5754/6849] uclibc/bfin: only supports linuxthreads.old

[Thomas: do not reorder options, as this is a separate change]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 90aae907ba..094ea113db 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -104,6 +104,7 @@ choice
 
 	config BR2_PTHREADS
 		bool "linuxthreads"
+		depends on !BR2_bfin
 		depends on !BR2_xtensa
 	        select BR2_TOOLCHAIN_HAS_THREADS
 
@@ -116,6 +117,7 @@ choice
 		select BR2_TOOLCHAIN_HAS_THREADS
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32
+		depends on !BR2_bfin
 		depends on !BR2_xtensa
 		depends on !BR2_arc
 endchoice

From dbee13b527d342ecb3cdd86d093ed40f1f03995d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 27 Jul 2013 15:33:20 +0200
Subject: [PATCH 5755/6849] uclibc: reorder list of dependencies for NPTL
 option

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 094ea113db..17176f69e9 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -115,11 +115,11 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on !BR2_x86_i386
+		depends on !BR2_arc
 		depends on !BR2_avr32
 		depends on !BR2_bfin
 		depends on !BR2_xtensa
-		depends on !BR2_arc
+		depends on !BR2_x86_i386
 endchoice
 
 config BR2_PTHREAD_DEBUG

From d1f24b9dc1ecc42c8f747430b94e42d6e6826b83 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:09 -0300
Subject: [PATCH 5756/6849] uclibc: make target utils optional

These are broken for blackfin unfortunately so they're disabled.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/Config.in | 11 +++++++++++
 package/uclibc/uclibc.mk | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 17176f69e9..92e04e9d61 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -129,6 +129,17 @@ config BR2_PTHREAD_DEBUG
 	help
 	  Build the thread library with debugging enabled.
 
+config BR2_UCLIBC_INSTALL_UTILS
+	bool "Compile and install uClibc utilities"
+	depends on !BR2_bfin
+	default y
+	help
+	  Enabling this option will compile and install the getconf,
+	  ldconfig and ldd uClibc utilities for the target.
+
+	  You can save ~32 KiB in target space by disabling them since
+	  they're normally not needed.
+
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "Compile and install uClibc tests"
 	select BR2_PACKAGE_MAKE
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index cf53280c9b..4a37fa0bad 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -451,6 +451,16 @@ define UCLIBC_INSTALL_TEST_SUITE
 endef
 endif
 
+ifeq ($(BR2_UCLIBC_INSTALL_UTILS),y)
+define UCLIBC_INSTALL_UTILS_TARGET
+	$(MAKE1) -C $(@D) \
+		CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \
+		ARCH="$(UCLIBC_TARGET_ARCH)" \
+		PREFIX=$(TARGET_DIR) \
+		utils install_utils
+endef
+endif
+
 define UCLIBC_INSTALL_TARGET_CMDS
 	$(MAKE1) -C $(@D) \
 		$(UCLIBC_MAKE_FLAGS) \
@@ -458,11 +468,7 @@ define UCLIBC_INSTALL_TARGET_CMDS
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		install_runtime
-	$(MAKE1) -C $(@D) \
-		CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \
-		ARCH="$(UCLIBC_TARGET_ARCH)" \
-		PREFIX=$(TARGET_DIR) \
-		utils install_utils
+	$(UCLIBC_INSTALL_UTILS_TARGET)
 	$(UCLIBC_INSTALL_TEST_SUITE)
 endef
 

From cc9f07776de22c72432722932c6e24df908b0efe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:10 -0300
Subject: [PATCH 5757/6849] gcc/bfin: 4.{6,7,8}.x are broken

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gcc/Config.in.host | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index c49b8ed0e4..a6acaa25c6 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -8,6 +8,7 @@ choice
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
 	default BR2_GCC_VERSION_4_8_ARC if BR2_arc
+	default BR2_GCC_VERSION_4_5_X if BR2_bfin
 	default BR2_GCC_VERSION_4_7_X
 	help
 	  Select the version of gcc you wish to use.
@@ -37,17 +38,17 @@ choice
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_4_6_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
 
 	config BR2_GCC_VERSION_4_7_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
+		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.7.x"
 
 	config BR2_GCC_VERSION_4_8_X
-		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.8.x"
 

From f7c246f64d96b257ec21efe0825235c2cd3e4937 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:11 -0300
Subject: [PATCH 5758/6849] uclibc: use builtin startfiles target

Now that we've dropped 0.9.31.x we can use the startfiles /
install_startfiles targets instead of building and installing them by
hand.
Fixes internal blackfin toolchain build errors regarding crtreloc.o

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/uclibc.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 4a37fa0bad..efe00a6dd8 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -409,13 +409,12 @@ define UCLIBC_CONFIGURE_CMDS
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_DIR) \
-		headers lib/crt1.o lib/crti.o lib/crtn.o \
-		install_headers
+		headers startfiles \
+		install_headers install_startfiles
 	$(TARGET_CROSS)gcc -nostdlib \
 		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
 	$(TARGET_CROSS)gcc -nostdlib \
 		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libm.so
-	cp -pLR $(UCLIBC_DIR)/lib/crt[1in].o $(STAGING_DIR)/usr/lib/
 endef
 
 ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)

From 806714a5d1701edf4040cb218ff82cd7d61b4b64 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:12 -0300
Subject: [PATCH 5759/6849] uclibc/bfin: set the appropiate binfmt in the
 configuration

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/uclibc.mk | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index efe00a6dd8..cbc2e56634 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -147,6 +147,45 @@ define UCLIBC_POWERPC_TYPE_CONFIG
 endef
 endif # powerpc
 
+#
+# Blackfin definitions
+#
+
+ifeq ($(UCLIBC_TARGET_ARCH),bfin)
+ifeq ($(BR2_BINFMT_FDPIC),y)
+define UCLIBC_BFIN_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_SHARED_FLAT,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_FDPIC_ELF,y,$(@D))
+endef
+endif
+ifeq ($(BR2_BINFMT_FLAT_ONE),y)
+define UCLIBC_BFIN_CONFIG
+	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_FLAT,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_SHARED_FLAT,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FDPIC_ELF,$(@D))
+endef
+endif
+ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
+define UCLIBC_BFIN_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_FLAT_SEP_DATA,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_SHARED_FLAT,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FDPIC_ELF,$(@D))
+endef
+endif
+ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
+define UCLIBC_BFIN_CONFIG
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D))
+	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_SHARED_FLAT,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FDPIC_ELF,$(@D))
+endef
+endif
+endif # bfin
+
 #
 # AVR32 definitions
 #
@@ -380,6 +419,7 @@ define UCLIBC_SETUP_DOT_CONFIG
 	$(UCLIBC_SPARC_TYPE_CONFIG)
 	$(UCLIBC_POWERPC_TYPE_CONFIG)
 	$(UCLIBC_AVR32_CONFIG)
+	$(UCLIBC_BFIN_CONFIG)
 	$(UCLIBC_X86_TYPE_CONFIG)
 	$(UCLIBC_ENDIAN_CONFIG)
 	$(UCLIBC_LARGEFILE_CONFIG)

From cd6c7bc29a072d65d384e47dfa9df4a8362e8143 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:13 -0300
Subject: [PATCH 5760/6849] uclibc/bfin: don't install host utils if not FDPIC

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/uclibc.mk | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index cbc2e56634..644c531b56 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -511,6 +511,16 @@ define UCLIBC_INSTALL_TARGET_CMDS
 	$(UCLIBC_INSTALL_TEST_SUITE)
 endef
 
+# For FLAT binfmts (static) there are no host utils
+ifeq ($(BR2_BINFMT_FLAT),)
+define UCLIBC_INSTALL_UTILS_STAGING
+	$(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
+	ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
+	$(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
+	ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
+endef
+endif
+
 define UCLIBC_INSTALL_STAGING_CMDS
 	$(MAKE1) -C $(@D) \
 		$(UCLIBC_MAKE_FLAGS) \
@@ -518,10 +528,7 @@ define UCLIBC_INSTALL_STAGING_CMDS
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		install_runtime install_dev
-	install -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
-	ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
-	install -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
-	ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
+	$(UCLIBC_INSTALL_UTILS_STAGING)
 endef
 
 uclibc-menuconfig: dirs uclibc-patch

From b32f186cfd2590da133c21dc32842c6bbc681e03 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:14 -0300
Subject: [PATCH 5761/6849] blackfin: set GNU_TARGET_NAME accordingly

Blackfin for FDPIC targets uses *-linux-*, however for FLAT targets it
needs *-uclinux-* in order for gcc to build properly.

[Thomas: use a TARGET_OS variable instead of redefining
GNU_TARGET_NAME completely]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Makefile.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 95eec52dcc..aed28d5a27 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -21,7 +21,14 @@ MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS)
 
 # Compute GNU_TARGET_NAME
-GNU_TARGET_NAME=$(ARCH)-buildroot-linux-$(LIBC)$(ABI)
+GNU_TARGET_NAME=$(ARCH)-buildroot-$(TARGET_OS)-$(LIBC)$(ABI)
+
+# Blackfin FLAT needs uclinux
+ifeq ($(BR2_bfin)$(BR2_BINFMT_FLAT),yy)
+TARGET_OS=uclinux
+else
+TARGET_OS=linux
+endif
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 LIBC=uclibc

From 9e928ecac241b495c89aa5eb8208476494c04df5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 20 Jul 2013 09:52:15 -0300
Subject: [PATCH 5762/6849] gcc/mudflap: disable for blackfin, it doesn't build

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gcc/gcc.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index cbeaa6c581..cd6efed60d 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -202,6 +202,11 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
 HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
 endif
 
+# Blackfin doesn't do mudflap
+ifeq ($(BR2_bfin),y)
+HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
+endif
+
 # Disable mudflap and enable proper double/long double for SPE ABI
 ifeq ($(BR2_powerpc_SPE),y)
 HOST_GCC_COMMON_CONF_OPT += \

From 519f7fbb1e1fb6bf8d59b6ec544bf1f19cf57dcf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 27 Jul 2013 16:20:33 +0200
Subject: [PATCH 5763/6849] tstools: add missing comment when !BR2_LARGEFILE

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tstools/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/tstools/Config.in b/package/tstools/Config.in
index 58f3df1ef8..1ca67bfe23 100644
--- a/package/tstools/Config.in
+++ b/package/tstools/Config.in
@@ -15,3 +15,6 @@ config BR2_PACKAGE_TSTOOLS
 	  used to store data on DVDs.
 
 	  http://tstools.berlios.de/
+
+comment "tstools needs largefile support in toolchain"
+	depends on !BR2_LARGEFILE

From 650106b52ed217e075310570e8057edc692a8bfe Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 19 Jul 2013 14:25:18 +0200
Subject: [PATCH 5764/6849] toolchain-external: support toolchains with lib32
 directories

Some toolchains, like the Cavium Networks' one, have lib32/ and lib64/
directories, while the standard lib/ is empty. To find libc.a, buildroot
currently only looks in lib/ and lib64/. This patch extends the search
to lib32/ as well.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 07dda0a2ce..a3c40c873b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -363,7 +363,7 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 	@$(call MESSAGE,"Checking external toolchain settings")
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
@@ -397,7 +397,7 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 #
 #  SYSROOT_DIR:         the main sysroot directory, deduced from
 #                       LIBC_A_LOCATION by removing the
-#                       usr/lib[64]/libc.a part of the path.
+#                       usr/lib[32|64]/libc.a part of the path.
 #                       Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/
 #
 # ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected
@@ -408,11 +408,11 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 #
 # ARCH_SYSROOT_DIR:     the sysroot of the selected multilib variant,
 #                       deduced from ARCH_LIBC_A_LOCATION by removing
-#                       usr/lib[64]/libc.a at the end of the path.
+#                       usr/lib[32|64]/libc.a at the end of the path.
 #                       Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/
 #
-# ARCH_LIB_DIR:         'lib' or 'lib64' depending on where libraries are
-#                       stored. Deduced from ARCH_LIBC_A_LOCATION by
+# ARCH_LIB_DIR:         'lib', 'lib32' or 'lib64' depending on where libraries
+#                       are stored. Deduced from ARCH_LIBC_A_LOCATION by
 #                       looking at usr/lib??/libc.a.
 #                       Ex: lib
 #
@@ -433,14 +433,14 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 
 $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
-	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
+	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(32|64)?)/(.*/)?libc.a:\1:'` ; \
 	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
 		LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
@@ -489,8 +489,8 @@ $(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed: $(STAMP_DIR)/ext-toolcha
 	$(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
 	FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
 	FDPIC_LIBC_A_LOCATION=`readlink -f $$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
-	FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+	FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
+	FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(32|64)?)/(.*/)?libc.a:\1:'` ; \
 	FDPIC_SUPPORT_LIB_DIR="" ; \
 	if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
 	        FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \

From 3fed58bd509b8dbb1ea5fe088fe92eb8cd86a410 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Mon, 15 Jul 2013 14:46:48 -0500
Subject: [PATCH 5765/6849] avahi: minor cleanup

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
---
 package/avahi/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 60fd50f7c1..c6af67e525 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -10,10 +10,11 @@ config BR2_PACKAGE_AVAHI
 
 	  http://www.avahi.org/
 
+if BR2_PACKAGE_AVAHI
+
 config BR2_PACKAGE_AVAHI_AUTOIPD
 	bool "IPv4LL network address configuration daemon"
 	default y
-	depends on BR2_PACKAGE_AVAHI
 	select BR2_PACKAGE_LIBDAEMON
 	help
 	  Avahi-autoipd implements IPv4LL, "Dynamic Configuration of
@@ -25,7 +26,6 @@ config BR2_PACKAGE_AVAHI_AUTOIPD
 
 config BR2_PACKAGE_AVAHI_DAEMON
 	bool "mDNS/DNS-SD daemon"
-	depends on BR2_PACKAGE_AVAHI
 	select BR2_PACKAGE_LIBDAEMON
 	select BR2_PACKAGE_EXPAT
 	help
@@ -34,5 +34,7 @@ config BR2_PACKAGE_AVAHI_DAEMON
 	  The daemon registers local IP addresses and services using
 	  mDNS/DNS-SD.
 
+endif
+
 comment "avahi requires a toolchain with thread support"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 51788521b7467942a550cb1d077e6550a7472498 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Mon, 15 Jul 2013 14:47:50 -0500
Subject: [PATCH 5766/6849] libglib2: needs threads

This commit adds a dependency of the libglib2 package on thread
support in the toolchain, since upstream libglib2 doesn't build
without thread support. The commit is rather large as it involves
propagating the dependency on thread support to all reverse
dependencies of the libglib2 package.

[Thomas: squash all patches into one, make a few minor fixes, the most
important one being to not add comments about MMU requirement when a
package doesn't work on !MMU platforms.]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
---
 package/atk/Config.in                         |  5 ++--
 package/bluez_utils/Config.in                 |  4 +--
 package/bustle/Config.in                      |  5 ++--
 package/connman/Config.in                     |  4 +--
 package/curlftpfs/Config.in                   |  4 +--
 package/dbus-glib/Config.in                   |  6 ++--
 package/dbus-python/Config.in                 |  6 ++--
 package/docker/Config.in                      |  6 ++--
 package/efl/libedbus/Config.in                |  5 ++++
 package/efl/libevas-generic-loaders/Config.in |  5 ++--
 package/enchant/Config.in                     |  6 ++--
 package/enlightenment/Config.in               |  1 +
 package/gamin/Config.in                       |  5 ++--
 package/gdk-pixbuf/Config.in                  |  4 +++
 package/glib-networking/Config.in             |  5 ++--
 package/glibmm/Config.in                      |  8 +++--
 package/gmpc/Config.in                        |  6 ++--
 package/gob2/Config.in                        |  3 +-
 package/gvfs/Config.in                        |  6 ++--
 package/json-glib/Config.in                   |  5 ++--
 package/latencytop/Config.in                  |  7 +++--
 package/libgail/Config.in                     |  6 ++++
 package/libglade/Config.in                    |  6 ++--
 package/libglib2/Config.in                    |  5 ++--
 ...002-fix-build-when-no-thread-support.patch | 30 -------------------
 package/libgtk2/Config.in                     | 11 +++++--
 package/libmms/Config.in                      |  5 ++--
 package/libmpd/Config.in                      |  5 ++--
 package/libplayer/Config.in                   |  5 ++--
 package/libqmi/Config.in                      |  4 +++
 package/librsvg/Config.in                     |  5 ++--
 package/libsoup/Config.in                     | 10 +++++--
 package/libxmlpp/Config.in                    |  8 +++--
 package/lttng-babeltrace/Config.in            | 10 ++++---
 package/midori/Config.in                      |  6 ++--
 package/multimedia/gst-plugin-x170/Config.in  |  4 +++
 package/multimedia/gst-plugins-bad/Config.in  | 12 ++++++--
 package/multimedia/gst-plugins-base/Config.in |  7 +++--
 package/multimedia/gst-plugins-good/Config.in | 10 +++++++
 package/multimedia/gst1-plugins-bad/Config.in | 12 ++++++--
 .../multimedia/gst1-plugins-base/Config.in    |  7 +++--
 .../multimedia/gst1-plugins-good/Config.in    | 10 +++++++
 package/multimedia/gstreamer/Config.in        |  2 +-
 package/multimedia/gstreamer1/Config.in       |  4 +--
 package/multimedia/mpd/Config.in              |  8 +++--
 package/nbd/Config.in                         |  7 +++--
 package/neard/Config.in                       |  7 +++--
 package/neardal/Config.in                     |  9 ++++--
 package/network-manager/Config.in             |  2 +-
 package/ofono/Config.in                       |  7 ++---
 package/opencv/Config.in                      | 10 +++++--
 package/openobex/Config.in                    | 18 +++++------
 package/pango/Config.in                       |  6 ++--
 package/pcmanfm/Config.in                     |  6 ++--
 package/pkg-config/Config.in                  |  5 ++--
 package/polkit/Config.in                      |  5 ++--
 package/sconeserver/Config.in                 |  2 +-
 package/shared-mime-info/Config.in            |  5 ++--
 package/snowball-init/Config.in               |  5 +++-
 package/sshfs/Config.in                       |  2 +-
 package/sysprof/Config.in                     | 10 +++++--
 package/udev/Config.in                        |  5 ++++
 package/udisks/Config.in                      | 13 +++++---
 package/ussp-push/Config.in                   |  2 +-
 package/vala/Config.in                        |  5 ++--
 package/webkit/Config.in                      |  8 +++--
 package/wireshark/Config.in                   |  5 ++--
 67 files changed, 280 insertions(+), 162 deletions(-)
 delete mode 100644 package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch

diff --git a/package/atk/Config.in b/package/atk/Config.in
index 928fae7463..7dec8b89fe 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_ATK
 	bool "atk"
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
 
-comment "atk requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "atk requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 72b900c38e..570ba75255 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BLUEZ_UTILS
 	bool "bluez-utils"
 	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
@@ -38,5 +38,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
 
 endif
 
-comment "bluez-utils require a toolchain with WCHAR and thread support"
+comment "bluez-utils require a toolchain with WCHAR and threading support"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
index 2a2a2c1d68..704165ddfa 100644
--- a/package/bustle/Config.in
+++ b/package/bustle/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_BUSTLE
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_PACKAGE_DBUS # runtime
 	help
 	  Bustle is a better dbus-monitor! It records and draws
@@ -18,5 +19,5 @@ config BR2_PACKAGE_BUSTLE
 
 	  http://www.willthompson.co.uk/bustle/
 
-comment "bustle requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "bustle requires a toolchain with WCHAR support and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/connman/Config.in b/package/connman/Config.in
index e0505b3125..0853941d4d 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_CONNMAN
 	depends on !BR2_UCLIBC_VERSION_0_9_32
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
@@ -49,6 +49,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain with IPv6, WCHAR, thread and resolver support"
+comment "connman needs a toolchain with IPv6, WCHAR, threading and resolver support"
 	depends on BR2_UCLIBC_VERSION_0_9_32 || \
 		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index 0d8e715a5e..ac527da213 100644
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_CURLFTPFS
 	select BR2_PACKAGE_LIBCURL
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
 	depends on BR2_USE_MMU # libfuse
 	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
@@ -17,5 +17,5 @@ config BR2_PACKAGE_CURLFTPFS
 
 	  http://curlftpfs.sourceforge.net/
 
-comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR, threading and dynamic library support"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index f1dab43924..b019b34383 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -2,11 +2,13 @@ config BR2_PACKAGE_DBUS_GLIB
 	bool "dbus-glib"
 	depends on BR2_PACKAGE_DBUS
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GLib bindings for D-Bus.
 
 	  http://www.freedesktop.org/software/dbus
 
-comment "dbus-glib requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_DBUS && !BR2_USE_WCHAR
+comment "dbus-glib requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_DBUS && \
+		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 91c127d05f..61e81e7fde 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DBUS_PYTHON
 	bool "dbus-python"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_PACKAGE_DBUS
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_DBUS_GLIB
@@ -9,5 +10,6 @@ config BR2_PACKAGE_DBUS_PYTHON
 
 	  http://dbus.freedesktop.org/doc/dbus-python/
 
-comment "dbus-python requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && !BR2_USE_WCHAR
+comment "dbus-python requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && \
+		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/docker/Config.in b/package/docker/Config.in
index f07739a21a..866ffcf829 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DOCKER
 	bool "docker"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_XLIB_LIBX11
 	help
@@ -9,5 +10,6 @@ config BR2_PACKAGE_DOCKER
 
 	  http://icculus.org/openbox/2/docker
 
-comment "docker requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR
+comment "docker requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_XORG7 && \
+		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 64b001e9b2..31a3b03740 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -17,10 +17,15 @@ if BR2_PACKAGE_LIBEDBUS
 config BR2_PACKAGE_LIBEDBUS_BLUEZ
 	bool "bluez support"
 	depends on !BR2_avr32 # bluez_utils
+	depends on BR2_USE_WCHAR # bluez_utils -> glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
 	  Bluetooth support.
 
+comment "bluez support requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
 	bool "connman support"
 	depends on BR2_PACKAGE_CONNMAN
diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
index bfa6097622..53637944bc 100644
--- a/package/efl/libevas-generic-loaders/Config.in
+++ b/package/efl/libevas-generic-loaders/Config.in
@@ -15,11 +15,12 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 	select BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_CAIRO
 	depends on BR2_USE_WCHAR # librsvg -> glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
 	depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
 	help
 	  This option enables the Evas generic SVG loader
 
-comment "SVG loader requires a toolchain with WCHAR and C++ support"
-	depends on !BR2_USE_WCHAR && !BR2_INSTALL_LIBSTDCPP
+comment "SVG loader requires a toolchain with WCHAR, threading and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 endif
diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 33f36db41b..783c73ea0d 100644
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_ENCHANT
 	bool "enchant"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enchant is a spell-checking library that provides a consistent
@@ -9,5 +10,6 @@ config BR2_PACKAGE_ENCHANT
 
 	  http://www.abisource.com/projects/enchant/
 
-comment "enchant requires a toolchain with C++ and WCHAR support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "enchant requires a toolchain with C++, threading and WCHAR support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 357c72b9dc..f86f271a8c 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -21,6 +21,7 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	depends on BR2_USE_WCHAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	# libedbus -> dbus
+	# libedbus -> glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# libedbus -> dbus
 	depends on BR2_USE_MMU
diff --git a/package/gamin/Config.in b/package/gamin/Config.in
index 3ede2e4d76..369c10e6f1 100644
--- a/package/gamin/Config.in
+++ b/package/gamin/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_GAMIN
 	bool "gamin"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  the File Alteration Monitor
 
 	  http://www.gnome.org/~veillard/gamin/sources
 
-comment "gamin requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "gamin requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 33b5f7c862..05de93416f 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GDK_PIXBUF
 	bool "gdk-pixbuf"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -9,3 +10,6 @@ config BR2_PACKAGE_GDK_PIXBUF
 	  and the GLib, to integrate well with GNOME applications.
 
 	  http://www.gtk.org/
+
+comment "gdk-pixbuf depends on toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index dab35eaba2..8d106f5632 100644
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_GLIB_NETWORKING
 	bool "glib-networking"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  Network-related GIO modules for glib.
 
-comment "glib-networking requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "glib-networking requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in
index cd4ac01fa1..fddd5e4258 100644
--- a/package/glibmm/Config.in
+++ b/package/glibmm/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_GLIBMM
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBSIGC
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	help
 	  The GLibmm package is a set of C++ bindings for GLib.
 
 	  http://www.gtkmm.org/
 
-comment "glibmm requires a toolchain with C++ & WCHAR support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "glibmm requires a toolchain with C++, WCHAR, and threading support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 9b38d1a4f0..96dc58f786 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GMPC
 	bool "gmpc"
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -19,5 +20,6 @@ config BR2_PACKAGE_GMPC
 
 	  http://gmpcwiki.sarine.nl/index.php?title=GMPC
 
-comment "gmpc requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR
+comment "gmpc requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index 4a09c41917..d795335eb1 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GOB2
 	bool "gob2"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	# m4 uses fork(), so does bison then
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBGLIB2
@@ -13,4 +14,4 @@ config BR2_PACKAGE_GOB2
 	  http://www.jirka.org/gob.html
 
 comment "gob2 requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index e0a945e7f5..63c4996c6c 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GVFS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_USE_MMU # dbus
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_SHARED_MIME_INFO
@@ -16,5 +16,5 @@ config BR2_PACKAGE_GVFS
 
 	  http://en.wikipedia.org/wiki/GVFS
 
-comment "gvfs requires a toolchain with LARGEFILE and WCHAR support"
-	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+comment "gvfs requires a toolchain with LARGEFILE, WCHAR and threading support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/json-glib/Config.in b/package/json-glib/Config.in
index 3ebc76db27..db2538616a 100644
--- a/package/json-glib/Config.in
+++ b/package/json-glib/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_JSON_GLIB
 	bool "json-glib"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_JSON_GLIB
 
 	  https://live.gnome.org/JsonGlib/
 
-comment "json-glib requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "json-glib requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in
index 12176c0cb5..23e4c63bb6 100644
--- a/package/latencytop/Config.in
+++ b/package/latencytop/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LATENCYTOP
 	bool "latencytop"
-	depends on BR2_USE_WCHAR
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBGLIB2
 	help
@@ -19,5 +20,5 @@ config BR2_PACKAGE_LATENCYTOP
 
 	  http://www.latencytop.org
 
-comment "latencytop requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "latencytop requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libgail/Config.in b/package/libgail/Config.in
index ba747953b4..3e1af628a7 100644
--- a/package/libgail/Config.in
+++ b/package/libgail/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBGAIL
 	bool "libgail"
+	depends on BR2_USE_WCHAR # pango -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
 	depends on BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_PANGO
 	help
@@ -16,3 +18,7 @@ config BR2_PACKAGE_LIBGAIL
 	  program.
 
 	  http://developer.gnome.org/projects/gap
+
+comment "libgail requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_LIBGTK2 && \
+		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index f7a9a1ce09..d0425170e7 100644
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGLADE
 	bool "libglade"
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_ATK
 	select BR2_PACKAGE_LIBXML2
@@ -12,5 +13,6 @@ config BR2_PACKAGE_LIBGLADE
 
 	  http://ftp.gnome.org/pub/GNOME/sources/libglade/
 
-comment "libglade requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR
+comment "libglade requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_LIBGTK2 && \
+		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 5282885b8b..806dbbefbe 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -5,10 +5,11 @@ config BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBFFI
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_USE_WCHAR # gettext
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Low-level core library that forms the basis of GTK+ and GNOME.
 
 	  http://www.gtk.org/
 
-comment "libglib2 requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "libglib2 requires a toolchain with WCHAR support and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch
deleted file mode 100644
index 43c7e16092..0000000000
--- a/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix gio/gcancellable.c build when thread support is disabled
-
-Changes:
-	Updated for 2.36.1
-
-Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
-Signed-off-by: "Spenser Gilliland" <spenser@gillilanding.com>
----
---- libglib2-2.36.1.orig/gio/gcancellable.c	2013-03-13 08:39:09.000000000 -0500
-+++ libglib2-2.36.1/gio/gcancellable.c	2013-05-26 10:49:32.366019891 -0500
-@@ -267,7 +267,9 @@
-   while (priv->cancelled_running)
-     {
-       priv->cancelled_running_waiting = TRUE;
-+#if defined(G_THREADS_ENABLED)
-       g_cond_wait (&cancellable_cond, &cancellable_mutex);
-+#endif
-     }
- 
-   if (priv->cancelled)
-@@ -620,7 +622,9 @@
-   while (priv->cancelled_running)
-     {
-       priv->cancelled_running_waiting = TRUE;
-+#if defined(G_THREADS_ENABLED)
-       g_cond_wait (&cancellable_cond, &cancellable_mutex);
-+#endif
-     }
- 
-   g_signal_handler_disconnect (cancellable, handler_id);
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 462b0b6239..c280c6afa4 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -14,18 +14,23 @@ config BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	help
 	  The GTK+ version 2 graphical user interface library
 
 	  http://www.gtk.org/
 
+if BR2_PACKAGE_LIBGTK2
+
 config BR2_PACKAGE_LIBGTK2_DEMO
 	bool "Install libgtk2 demo program"
-	depends on BR2_PACKAGE_LIBGTK2
 	help
 	  The GTK+ source base contains a gtk-demo program. This
 	  option allows to install this program to the target.
 
-comment "libgtk2 requires a toolchain with WCHAR and C++ support"
-	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+endif
+
+comment "libgtk2 requires a toolchain with WCHAR, threading and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmms/Config.in b/package/libmms/Config.in
index 17cb406a62..3cabbc7714 100644
--- a/package/libmms/Config.in
+++ b/package/libmms/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBMMS
 	bool "libmms"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
           LibMMS is a common library for parsing mms:// and mmsh://
@@ -11,5 +12,5 @@ config BR2_PACKAGE_LIBMMS
 
 	  http://launchpad.net/libmms
 
-comment "libmms requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "libmms requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmpd/Config.in b/package/libmpd/Config.in
index 9259c19ee9..7617e88633 100644
--- a/package/libmpd/Config.in
+++ b/package/libmpd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBMPD
 	bool "libmpd"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_LIBMPD
 
 	  http://gmpcwiki.sarine.nl/index.php?title=Libmpd
 
-comment "libmpd requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "libmpd requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index df32901162..c7de7ba383 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -21,10 +21,11 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER
 config BR2_PACKAGE_LIBPLAYER_GSTREAMER
 	bool "gstreamer backend"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_GSTREAMER
 
-comment "gstreamer backend requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "gstreamer backend requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_LIBPLAYER_PYTHON
 	depends on BR2_PACKAGE_PYTHON
diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in
index c5e8a5c37e..84842505dc 100644
--- a/package/libqmi/Config.in
+++ b/package/libqmi/Config.in
@@ -2,8 +2,12 @@ config BR2_PACKAGE_LIBQMI
 	bool "libqmi"
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	help
 	  libqmi is a glib-based library for talking to WWAN modems and devices
 	  which speak the Qualcomm MSM Interface (QMI) protocol.
 
 	  http://www.freedesktop.org/wiki/Software/libqmi/
+
+comment "libqmi requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index b2ef6adf47..ce711f7df5 100644
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	help
 	  The rsvg library is an efficient renderer for Scalable
@@ -14,5 +15,5 @@ config BR2_PACKAGE_LIBRSVG
 
 	  http://librsvg.sourceforge.net/
 
-comment "librsvg requires a toolchain with WCHAR and C++ support"
-	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+comment "librsvg requires a toolchain with WCHAR, threading and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 2ed08d9335..b80cb6384e 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
 	depends on BR2_USE_WCHAR # glib2 and gnutls
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
@@ -12,13 +13,16 @@ config BR2_PACKAGE_LIBSOUP
 
 	  http://live.gnome.org/LibSoup
 
+if BR2_PACKAGE_LIBSOUP
+
 config BR2_PACKAGE_LIBSOUP_SSL
 	bool "https support"
 	select BR2_PACKAGE_GLIB_NETWORKING
 	select BR2_PACKAGE_GNUTLS
-	depends on BR2_PACKAGE_LIBSOUP
 	help
 	  Enable HTTPS (SSL) support.
 
-comment "libsoup requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+endif
+
+comment "libsoup requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libxmlpp/Config.in b/package/libxmlpp/Config.in
index cf29c2c5c4..2448bfd9e9 100644
--- a/package/libxmlpp/Config.in
+++ b/package/libxmlpp/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_LIBXMLPP
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_GLIBMM
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR
+	depends on BR2_USE_WCHAR # glibmm -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glibmm -> libglib2
 	help
 	  libxml++ is a C++ wrapper for the libxml XML parser library.
 
 	  http://libxmlplusplus.sourceforge.net/
 
-comment "libxml++ requires a toolchain with C++ & WCHAR support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "libxml++ requires a toolchain with C++, WCHAR and threading support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+	!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 6f47304c15..4f14477ba8 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -4,9 +4,10 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_LIBGLIB2
-	# libglib2 needs gettext which needs wchar support, and we
-	# also depends on util-linux which needs wchar
+	# libglib2 needs thread support and gettext which needs wchar support, and 
+	# we also depends on util-linux which needs wchar
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# util-linux depends on largefile support
 	depends on BR2_LARGEFILE
 	help
@@ -26,5 +27,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 	  http://lttng.org
 
-comment "lttng-babeltrace needs WCHAR and LARGEFILE support"
-	depends on BR2_PACKAGE_LTTNG_TOOLS && !(BR2_USE_WCHAR || BR2_LARGEFILE)
+comment "lttng-babeltrace needs WCHAR, threading and LARGEFILE support"
+	depends on BR2_PACKAGE_LTTNG_TOOLS && \
+		(!BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 41f451588d..d35874097f 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -6,11 +6,13 @@ config BR2_PACKAGE_MIDORI
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_INSTALL_LIBSTDCPP # webkit
+	depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2
 	depends on BR2_USE_WCHAR	 # webkit
 	help
 	  Midori is a lightweight web browser based on WebKit
 
 	  http://software.twotoasts.de/?page=midori
 
-comment "midori requires C++, WCHAR in toolchain and libgtk2"
-        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+comment "midori requires C++, WCHAR, threading in toolchain and libgtk2"
+        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2
diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in
index 9a1ae639c7..142367b128 100644
--- a/package/multimedia/gst-plugin-x170/Config.in
+++ b/package/multimedia/gst-plugin-x170/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GST_PLUGIN_X170
 	bool "gst-plugin-x170"
 	depends on BR2_PACKAGE_GSTREAMER
 	depends on BR2_arm926t
+	# glibc toolchain includes WCHAR and threading for libglib2
 	depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs
 	select BR2_PACKAGE_ON2_8170_LIBS
 	help
@@ -9,3 +10,6 @@ config BR2_PACKAGE_GST_PLUGIN_X170
 	  ATMEL AT91SAM9M10 SoC.
 
 	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
+comment "gst-plugin-x170 requires a toolchain which uses eglibc/glibc"
+	depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t && !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 2271036c84..3c5c16198b 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -277,8 +277,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "libmms"
+	depends on BR2_USE_WCHAR # libmms -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
 	select BR2_PACKAGE_LIBMMS
 
+comment "libmms requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
 	bool "musepack"
 	select BR2_PACKAGE_MUSEPACK
@@ -294,10 +299,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
 	bool "rsvg"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # librsvg -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> libglib2
 	select BR2_PACKAGE_LIBRSVG
 
-comment "rsvg plugin requires a toolchain with C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "rsvg plugin requires a toolchain with C++, WCHAR, and threading support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index af4fe8c1e0..7370bd6b0e 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -86,10 +86,13 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
 	bool "pango font renderer"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # pango -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
 	select BR2_PACKAGE_PANGO
 
-comment "pango plugin requires a toolchain with C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "pango plugin requires a toolchain with C++, WCHAR and threading support "
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
 	bool "theora (*.ogg video)"
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 978aa0b328..c604a41a02 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -188,8 +188,13 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 	bool "gdkpixbuf"
+	depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
 	select BR2_PACKAGE_GDK_PIXBUF
 
+comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
 	bool "ossaudio (OSS audio)"
 
@@ -204,8 +209,13 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
+	depends on BR2_USE_WCHAR # libsoup -> glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
 	select BR2_PACKAGE_LIBSOUP
 
+comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
 	bool "speex"
 	select BR2_PACKAGE_SPEEX
diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
index 98550e081c..878bf53991 100644
--- a/package/multimedia/gst1-plugins-bad/Config.in
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -372,10 +372,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "libmms"
+	depends on BR2_USE_WCHAR # libmms -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
 	select BR2_PACKAGE_LIBMMS
 	help
 	  Microsoft Multi Media Server streaming protocol support
 
+comment "libmms requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
 	bool "mpeg2enc"
 	select BR2_PACKAGE_LIBMPEG2
@@ -417,12 +422,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
 	bool "rsvg"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # librsvg -> glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
 	select BR2_PACKAGE_LIBRSVG
 	help
 	  RSVG plugin library
 
-comment "rsvg plugin requires a toolchain with C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "rsvg plugin requires a toolchain with C++, WCHAR and threading support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES
 	bool "eglgles"
diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/multimedia/gst1-plugins-base/Config.in
index 10561c13a7..e02d23ac8b 100644
--- a/package/multimedia/gst1-plugins-base/Config.in
+++ b/package/multimedia/gst1-plugins-base/Config.in
@@ -130,12 +130,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO
 	bool "pango font renderer"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # pango -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
 	select BR2_PACKAGE_PANGO
 	help
 	  Pango-based text rendering and overlay
 
-comment "pango plugin requires a toolchain with C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "pango plugin requires a toolchain with C++, WCHAR and threading support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA
 	bool "theora (*.ogg video)"
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
index e579539483..8031a6354b 100644
--- a/package/multimedia/gst1-plugins-good/Config.in
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -288,9 +288,14 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 	bool "gdkpixbuf"
 	select BR2_PACKAGE_GDK_PIXBUF
+	depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
 	help
 	  GdkPixbuf-based image decoder, overlay and sink
 
+comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	depends on BR2_LARGEFILE # pulseaudio -> libsndfile
@@ -301,10 +306,15 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
+	depends on BR2_USE_WCHAR # libsoup -> glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
 	select BR2_PACKAGE_LIBSOUP
 	help
 	  libsoup HTTP client src/sink
 
+comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
 	bool "speex"
 	select BR2_PACKAGE_SPEEX
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index d2f99da91e..5188b8fdb7 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GSTREAMER
 	bool "gstreamer"
 	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GStreamer is an open source multimedia framework.
diff --git a/package/multimedia/gstreamer1/Config.in b/package/multimedia/gstreamer1/Config.in
index 627814c72c..69a87f3394 100644
--- a/package/multimedia/gstreamer1/Config.in
+++ b/package/multimedia/gstreamer1/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GSTREAMER1
 	bool "gstreamer1"
 	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GStreamer is an open source multimedia framework. This 1.x version of
@@ -49,5 +49,5 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
 
 endif
 
-comment "gstreamer1 requires a toolchain with WCHAR and threads support"
+comment "gstreamer1 requires a toolchain with WCHAR and threading support"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 6e5c6900bb..2ca55cc3cf 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -1,7 +1,8 @@
 menuconfig BR2_PACKAGE_MPD
 	bool "mpd"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
@@ -181,5 +182,6 @@ config BR2_PACKAGE_MPD_WAVPACK
 
 endif
 
-comment "mpd requires a toolchain with C++ and WCHAR support"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "mpd requires a toolchain with C++, threading and WCHAR support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index 79b34deb2a..0a0c7bda43 100644
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NBD
 	bool "nbd"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  NBD is a set of utilities to configure network block devices,
@@ -8,9 +9,6 @@ config BR2_PACKAGE_NBD
 
 	  http://nbd.sf.net/
 
-comment "nbd requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
-
 if BR2_PACKAGE_NBD
 
 config BR2_NBD_CLIENT
@@ -25,3 +23,6 @@ config BR2_NBD_SERVER
 	  the server part of NBD.
 
 endif
+
+comment "nbd requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neard/Config.in b/package/neard/Config.in
index ec1fcb3023..97966da2a9 100644
--- a/package/neard/Config.in
+++ b/package/neard/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_NEARD
 	bool "neard"
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl / dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl, dbus, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
@@ -14,11 +14,14 @@ config BR2_PACKAGE_NEARD
 
 	  https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
 
+if BR2_PACKAGE_NEARD
+
 config BR2_PACKAGE_NEARD_TOOLS
 	bool "neard tools"
-	depends on BR2_PACKAGE_NEARD
 	help
 	  Build and install neard tools.
 
+endif
+
 comment "neard requires a toolchain with WCHAR and threads support"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neardal/Config.in b/package/neardal/Config.in
index 76b5ffa50a..3841cac6e4 100644
--- a/package/neardal/Config.in
+++ b/package/neardal/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_NEARDAL
 	bool "neardal"
 	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
@@ -11,11 +11,14 @@ config BR2_PACKAGE_NEARDAL
 
 	  https://github.com/connectivity/neardal
 
+if BR2_PACKAGE_NEARDAL
+
 config BR2_PACKAGE_NEARDAL_NCL
 	bool "ncl tool"
-	depends on BR2_PACKAGE_NEARDAL
 	help
 	  Build and install neardal ncl command line interpreter tool.
 
-comment "neardal requires a toolchain with WCHAR and threads support"
+endif
+
+comment "neardal requires a toolchain with WCHAR and threading support"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index cc33a1dad5..50a3e744b6 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE # acl
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_UDEV
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index 6248544052..5d82170e06 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_OFONO
 	bool "ofono"
-	depends on BR2_USE_WCHAR # gettext/libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+	depends on BR2_USE_WCHAR # gettext, libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_LIBCAP_NG
 	select BR2_PACKAGE_DBUS
@@ -15,5 +15,4 @@ config BR2_PACKAGE_OFONO
 	  http://ofono.org/
 
 comment "ofono requires a toolchain with WCHAR and thread support"
-	depends on !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 26bf5e79c3..c6ec3fed23 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -139,16 +139,20 @@ comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
 
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
 	bool "gstreamer support"
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_WCHAR # gstreamer -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2
 	select BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
 
+comment "gstreamer support requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_OPENCV_WITH_GTK
 	bool "gtk support"
 	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
-	depends on BR2_USE_WCHAR
+	depends on BR2_USE_WCHAR # libgtk2 -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBGTK2
 
diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index 6494b2952d..c8e1f65878 100644
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -1,6 +1,3 @@
-comment "openobex requires a toolchain with IPV6 support"
-	depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_OPENOBEX
 	bool "openobex"
 	depends on BR2_INET_IPV6
@@ -12,25 +9,25 @@ config BR2_PACKAGE_OPENOBEX
 
 if BR2_PACKAGE_OPENOBEX
 
-comment "bluez support require a toolchain with WCHAR and thread support"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_OPENOBEX_BLUEZ
 	bool "enable bluez support"
 	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_BLUEZ_UTILS
 
-comment "libusb support require a toolchain with thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "bluez support require a toolchain with WCHAR and thread support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENOBEX_LIBUSB
 	bool "enable libusb support"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBUSB
 
+comment "libusb support require a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_OPENOBEX_APPS
 	bool "install test applications"
 	help
@@ -43,3 +40,6 @@ config BR2_PACKAGE_OPENOBEX_DUMP
 	bool "enable protocol dumping for debugging"
 
 endif
+
+comment "openobex requires a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 6c8a16024e..845ea98ead 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PANGO
 	bool "pango"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # freetype support
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT
@@ -18,5 +19,6 @@ config BR2_PACKAGE_PANGO
 
 	  http://www.pango.org/
 
-comment "pango requires a toolchain with WCHAR and C++ support"
-	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+comment "pango requires a toolchain with WCHAR, threading and C++ support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_INSTALL_LIBSTDCPP
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index 484192b1b8..5c80c10c0a 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PCMANFM
 	bool "pcmanfm"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_GAMIN
 	select BR2_PACKAGE_STARTUP_NOTIFICATION
 	select BR2_PACKAGE_XLIB_LIBX11
@@ -12,5 +13,6 @@ config BR2_PACKAGE_PCMANFM
 
 	  http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 
-comment "pcmanfm requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR
+comment "pcmanfm requires a toolchain with WCHAR and threading support"
+	depends on BR2_PACKAGE_XORG7 && \
+	(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index 7f96d9b675..bf702d0396 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PKG_CONFIG
 	bool "pkg-config"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_LIBGLIB2
 	help
@@ -11,5 +12,5 @@ config BR2_PACKAGE_PKG_CONFIG
 
 	  http://www.freedesktop.org/software/pkgconfig/
 
-comment "pkg-config requires a toolchain with WCHAR support"
-	depends on BR2_DEPRECATED && !BR2_USE_WCHAR
+comment "pkg-config requires a toolchain with WCHAR and threading support"
+	depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/polkit/Config.in b/package/polkit/Config.in
index b47022a026..df6c7679a7 100644
--- a/package/polkit/Config.in
+++ b/package/polkit/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_POLKIT
 	bool "polkit"
 	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT
 	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_POLKIT
 
 	  http://www.freedesktop.org/wiki/Software/polkit
 
-comment "polkit requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "polkit requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index 60ae2ae738..e9b51c0163 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -42,7 +42,7 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
 	bool "bluetooth"
 	depends on BR2_USE_WCHAR # bluez->libglib2
 	depends on BR2_USE_MMU # bluez->dbus
-	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus
+	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2
 	depends on !BR2_avr32 # bluez_utils
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in
index b08c1fdaa6..ee635accc8 100644
--- a/package/shared-mime-info/Config.in
+++ b/package/shared-mime-info/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SHARED_MIME_INFO
 	bool "shared-mime-info"
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBXML2
 	help
@@ -10,5 +11,5 @@ config BR2_PACKAGE_SHARED_MIME_INFO
 
 	  http://freedesktop.org/wiki/Software/shared-mime-info
 
-comment "shared-mime-info requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "shared-mime-info requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
index 99abb350fa..71b60e622f 100644
--- a/package/snowball-init/Config.in
+++ b/package/snowball-init/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_SNOWBALL_INIT
 	select BR2_PACKAGE_BLUEZ_UTILS
 	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_UX500_FIRMWARE
 	help
@@ -12,3 +12,6 @@ config BR2_PACKAGE_SNOWBALL_INIT
 
 	  http://www.igloocommunity.org
 
+comment "snowball-init requires a toolchain with WCHAR and threading support"
+	depends on !BR2_avr32 && \
+		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index b6d5aa6d2f..3e7ed15a71 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_SSHFS
 	select BR2_PACKAGE_OPENSSH
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
 	depends on BR2_USE_MMU # libfuse
 	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in
index 513a32cd59..d78062aebc 100644
--- a/package/sysprof/Config.in
+++ b/package/sysprof/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_SYSPROF
 	bool "sysprof"
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	# In its util.h file, sysprof contains architecture-specific
 	# code
 	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
@@ -11,14 +12,17 @@ config BR2_PACKAGE_SYSPROF
 
 	  http://sysprof.com
 
+if BR2_PACKAGE_SYSPROF
+
 config BR2_PACKAGE_SYSPROF_GUI
 	bool "sysprof GUI"
-	depends on BR2_PACKAGE_SYSPROF
 	depends on BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_LIBGLADE
 	select BR2_PACKAGE_GDK_PIXBUF
 	help
 	  GUI for the sysprof system-wide statistical profiler.
 
-comment "sysprof requires a toolchain with WCHAR support"
-        depends on !BR2_USE_WCHAR
+endif
+
+comment "sysprof requires a toolchain with WCHAR and threading support"
+        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/udev/Config.in b/package/udev/Config.in
index d3244d1a96..ed32c8975e 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -25,10 +25,15 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	select BR2_PACKAGE_ACL
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	help
 	  Enable all extras with external dependencies like
 	  libacl, hwdata and libglib2
 
+comment "enabling all extras requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_USE_THREADS
+
 endif
 
 comment "udev requires /dev mgmnt set to udev under System configuration"
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a50b3ea335..dca23ea4fe 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -1,12 +1,13 @@
 config BR2_PACKAGE_UDISKS
 	bool "udisks"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2
 	depends on BR2_USE_MMU # lvm2
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_ALL_EXTRAS
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
+	depends on BR2_USE_WCHAR # dbus-glib -> glib2
 	select BR2_PACKAGE_SG3_UTILS
 	select BR2_PACKAGE_POLKIT
 	select BR2_PACKAGE_PARTED
@@ -24,12 +25,16 @@ config BR2_PACKAGE_UDISKS
 
 	  http://www.freedesktop.org/wiki/Software/udisks
 
+if BR2_PACKAGE_UDISKS
+
 config BR2_PACKAGE_UDISKS_LVM2
 	bool "lvm2 support"
-	depends on BR2_PACKAGE_UDISKS
 	select BR2_PACKAGE_LVM2_APP_LIBRARY
 	help
 	  Enable LVM2 support
 
-comment "udisks requires /dev mgmnt set to udev under System configuration"
-	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+endif
+
+comment "udisks requires /dev mgmnt set to udev under System configuration and a toolchain with WCHAR and threading support"
+	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
+		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index 716ce34a88..27c5a4370e 100644
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_USSP_PUSH
 	depends on BR2_INET_IPV6
 	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_OPENOBEX
 	select BR2_PACKAGE_OPENOBEX_BLUEZ
diff --git a/package/vala/Config.in b/package/vala/Config.in
index 805c7707cf..35c02574f4 100644
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_VALA
 	# We no longer support a toolchain on the target
 	depends on BR2_DEPRECATED
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -11,5 +12,5 @@ config BR2_PACKAGE_VALA
 
 	  http://live.gnome.org/Vala
 
-comment "vala requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "vala requires a toolchain with WCHAR and threading support"
+	depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index c6711b8d48..92cbc62ecd 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_WEBKIT
 	bool "webkit"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR
+	depends on BR2_USE_WCHAR # enchant -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2
 	depends on BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_LIBCURL
@@ -22,5 +23,6 @@ config BR2_PACKAGE_WEBKIT
 
 	  http://webkit.org/
 
-comment "webkit requires C++, WCHAR in toolchain and libgtk2"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+comment "webkit requires libgtk2 and a toolchain with C++, WCHAR, threading support"
+	depends on BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index d4c8b43f45..111dd4835c 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -5,11 +5,12 @@ config BR2_PACKAGE_WIRESHARK
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	help
 	  Network traffic sniffer and protocol decoder. Currently only tshark,
 	  the console interface, is enabled.
 
 	  http://www.wireshark.org
 
-comment "wireshark requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "wireshark requires a toolchain with WCHAR and threading support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

From af1528af6385e19d0c351172701f3adb017c06f2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 27 Jul 2013 17:15:53 +0200
Subject: [PATCH 5767/6849] usb_modeswitch_data: requires thread support

usb_modeswitch_data unconditionally selects usb_modeswitch, but
usb_modeswitch depends on thread support. This commit has the thread
support dependency to usb_modeswitch_data.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/usb_modeswitch_data/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/usb_modeswitch_data/Config.in b/package/usb_modeswitch_data/Config.in
index 6df408f02a..e0e8f4cfda 100644
--- a/package/usb_modeswitch_data/Config.in
+++ b/package/usb_modeswitch_data/Config.in
@@ -1,9 +1,13 @@
 config BR2_PACKAGE_USB_MODESWITCH_DATA
 	bool "usb_modeswitch_data"
 	select BR2_PACKAGE_USB_MODESWITCH
+	depends on BR2_TOOLCHAIN_HAS_THREADS # usb_modeswitch -> libusb
 	help
 	  USB mode switch data
 	  Contains udev rules and events to allow usb_modeswitch to
 	  function automatically
 
 	  http://www.draisberghof.de/usb_modeswitch/
+
+comment "usb_modeswitch_data needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From dad93df6e83d5f463567ced4fb4d3738a5a6ce73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 27 Jul 2013 17:18:01 +0200
Subject: [PATCH 5768/6849] dropwatch: add missing dependencies

dropwatch requires thread support because it selects libnl that
depends on thread support. Also dropwatch cannot build on AArch64,
because it selects the target binutils package which isn't (yet)
available on AArch64.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/dropwatch/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
index 4c0857e0ed..ef9a20d046 100644
--- a/package/dropwatch/Config.in
+++ b/package/dropwatch/Config.in
@@ -1,10 +1,15 @@
 config BR2_PACKAGE_DROPWATCH
 	bool "dropwatch"
 	select BR2_PACKAGE_BINUTILS
+	depends on !BR2_aarch64 # binutils
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_LIBNL
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	help
 	  Dropwatch is an interactive utility for monitoring and
 	  recording packets that are dropped by the kernel
 
 	  https://fedorahosted.org/dropwatch/
+
+comment "dropwatch requires threading support in toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 88418bd2de3e2161fc5085a68c5e558a95644a07 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <roylee17@gmail.com>
Date: Wed, 19 Jun 2013 17:24:50 +0800
Subject: [PATCH 5769/6849] build: use find -perm /mode, instead of -perm +mode
 STRIP_FIND_CMD

The -perm +mode is deprecated, and sometimes yields suprising results.
It can be confused with permission in symbolic mode, for example '+u+g',
as POSIX spec suggests.

Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f477124935..0cd7f5541f 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,7 @@ STRIP_FIND_CMD = find $(TARGET_DIR)
 ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)))
 STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o
 endif
-STRIP_FIND_CMD += -type f -perm +111
+STRIP_FIND_CMD += -type f -perm /111
 STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
 
 target-finalize:

From aef9be3eb38ece0169ab1e70c45ea07ff0588288 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Wed, 3 Jul 2013 22:51:20 +0200
Subject: [PATCH 5770/6849] libiqrf: Bump to v0.1.2 + update build system.

v0.1.2 update build system from autotools to cmake.

[Thomas: add patch to ensure the CMake build system only checks for a
C compiler and not a C++ compiler]

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../libiqrf/libiqrf-use-only-c-language.patch | 29 +++++++++++++++++++
 package/libiqrf/libiqrf.mk                    |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 package/libiqrf/libiqrf-use-only-c-language.patch

diff --git a/package/libiqrf/libiqrf-use-only-c-language.patch b/package/libiqrf/libiqrf-use-only-c-language.patch
new file mode 100644
index 0000000000..2f1c23c28b
--- /dev/null
+++ b/package/libiqrf/libiqrf-use-only-c-language.patch
@@ -0,0 +1,29 @@
+Use only the C language
+
+libirqf is written completely in C, but by default, CMake assumes that
+both C and C++ are used, and therefore verifies that a C++ compiler is
+installed. This may not necessarily be the case for a C-only package
+in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/CMakeLists.txt
+===================================================================
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-project(iqrf)
+-
+ set (iqrf_version_major 0)
+ set (iqrf_version_minor 1)
+ set (iqrf_version_patch 2)
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,5 @@
++project(iqrf C)
++
+ cmake_minimum_required(VERSION 2.8.1)
+ enable_testing()
+ 
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index f2d5b4c8c4..df4bb421d8 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LIBIQRF_VERSION = v0.1.0
+LIBIQRF_VERSION = v0.1.2
 LIBIQRF_SITE = http://github.com/nandra/libiqrf/tarball/$(LIBIQRF_VERSION)
 LIBIQRF_INSTALL_STAGING = YES
 
 LIBIQRF_DEPENDENCIES = libusb
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))
 

From 224187cc7c03edc0018d250e7ac5dbb694f4bd89 Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Mon, 24 Jun 2013 10:40:52 +0200
Subject: [PATCH 5771/6849] tcl: use make conditions

As suggested by Thomas Petazzoni, make conditions should be used rather
than shell condition in Makefiles.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tcl/tcl.mk | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 4528d545bb..7c08ee6469 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -24,15 +24,22 @@ HOST_TCL_CONF_OPT = \
 
 define TCL_POST_INSTALL_CLEANUP
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
-	-if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
-	rm -Rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*; \
-	fi
-	-if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" = "y" ]; then \
-	rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR); \
-	fi
 endef
-
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
 
+ifeq ($(BR2_PACKAGE_TCL_DEL_ENCODINGS),y)
+define TCL_REMOVE_ENCODINGS
+	rm -rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_ENCODINGS
+endif
+
+ifeq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
+define TCL_REMOVE_TCLSH
+	rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_TCLSH
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 06bbffb5f2f6fb66007306282890621d9ed94677 Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Mon, 24 Jun 2013 10:40:53 +0200
Subject: [PATCH 5772/6849] tcl: remove strip command

Stripping is done at the end of the buildroot process, for all files at
once.
There's no need to do it here.
(Suggested by Thomas Petazzoni)

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tcl/tcl.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 7c08ee6469..564d5bca80 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -22,11 +22,6 @@ HOST_TCL_CONF_OPT = \
 		--disable-langinfo \
 		--disable-framework
 
-define TCL_POST_INSTALL_CLEANUP
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
-endef
-TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
-
 ifeq ($(BR2_PACKAGE_TCL_DEL_ENCODINGS),y)
 define TCL_REMOVE_ENCODINGS
 	rm -rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*

From 0b59411c759c8fe97e4edf78a7cd489d5c86ad66 Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Mon, 24 Jun 2013 10:40:54 +0200
Subject: [PATCH 5773/6849] tcl: install the libtcl into staging

The tcl package contains a lib, so it should go into staging.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tcl/tcl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 564d5bca80..cc0565c0da 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -12,6 +12,7 @@ TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION_MAJOR)
 TCL_LICENSE = tcl license
 TCL_LICENSE_FILES = license.terms
 TCL_SUBDIR = unix
+TCL_INSTALL_STAGING = YES
 TCL_CONF_OPT = \
 		--disable-symbols \
 		--disable-langinfo \

From 8d0413fd370f47014287976f195dc745b95e49d3 Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Mon, 24 Jun 2013 10:40:55 +0200
Subject: [PATCH 5774/6849] tcl: add a tclsh symlink

tclsh is installed with its version number (tclshx.y) but scripts (like
usb_modeswitch_dispatcher) are calling tclsh, not tclshx.y.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tcl/tcl.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index cc0565c0da..c145f57c23 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -35,6 +35,11 @@ define TCL_REMOVE_TCLSH
 	rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
 endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_TCLSH
+else
+define TCL_SYMLINK_TCLSH
+	ln -s tclsh$(TCL_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/tclsh
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH
 endif
 
 $(eval $(autotools-package))

From 9444180c15ed7c6f302f1e9361f589c28189816c Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Mon, 24 Jun 2013 10:40:56 +0200
Subject: [PATCH 5775/6849] tcl: make the libtcl writable in order to be
 stripped

The libtcl is installed with 0555 and that prevents it from being
stripped.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/tcl/tcl.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index c145f57c23..f1193d3ca0 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -42,5 +42,12 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH
 endif
 
+# library get installed read only, so strip fails
+define TCL_FIXUP_RO_LIB
+	chmod +w $(TARGET_DIR)/usr/lib/libtcl*
+endef
+
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_FIXUP_RO_LIB
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From d0c0635fe2b50d8baff95f62b857e12a2cbb4167 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 28 Jul 2013 14:13:08 +0200
Subject: [PATCH 5776/6849] ser2net: bump to 2.9

SER2NET_AUTORECONF is needed because of libtool version mismatch.
See error message bellow:

/bin/bash ./libtool --tag=CC   --mode=link gcc -Wall -g -O2   -o
ser2net controller.o dataxfer.o devcfg.o readconfig.o selector.o
ser2net.o utils.o telnet.o buffer.o  -lnsl
libtool: Version mismatch error.  This is libtool 2.4.2
Debian-2.4.2-1ubuntu1, but the
libtool: definition of this LT_INIT comes from libtool 2.2.6b.
libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
Debian-2.4.2-1ubuntu1
libtool: and run autoconf again.
make: *** [ser2net] Error 63

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ser2net/ser2net.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 588571c691..23ae48a152 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -4,8 +4,10 @@
 #
 ################################################################################
 
-SER2NET_VERSION = 2.8
+SER2NET_VERSION = 2.9
 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
+# shipped configure script is broken (libtool version error)
+SER2NET_AUTORECONF = YES
 SER2NET_LICENSE = GPLv2+
 SER2NET_LICENSE_FILES = COPYING
 

From caae7fa1d737c550b4a2f557d6e1761b93934340 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 28 Jul 2013 11:15:52 -0300
Subject: [PATCH 5777/6849] busybox: register mdev as hotplug helper when
 selected

It's also done in the kernel configuration, however users may be using
some other pre-built kernel and miss functionality like firmware
loading.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/busybox/S10mdev | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/busybox/S10mdev b/package/busybox/S10mdev
index c06aa20b5b..d386d420b5 100644
--- a/package/busybox/S10mdev
+++ b/package/busybox/S10mdev
@@ -6,6 +6,7 @@
 case "$1" in
   start)
 	echo "Starting mdev..."
+	echo /sbin/mdev >/proc/sys/kernel/hotplug
 	/sbin/mdev -s
 	;;
   stop)

From 41c11d34d06d3deaffdf1fdc52e0d0dbe4b3a24f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 28 Jul 2013 11:18:09 -0300
Subject: [PATCH 5778/6849] linux-headers: bump 3.{2, 10}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/linux-headers/Config.in.host | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 7a5decdde3..7a61b55ecf 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -74,7 +74,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "3.0.87"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.48"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.49"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
 	default "3.4.54"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
@@ -82,6 +82,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.2"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.3"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 51468a3c5971ee5e43deccbe269e124c3faf2252 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 28 Jul 2013 11:18:10 -0300
Subject: [PATCH 5779/6849] linux: bump 3.10.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 87a764dc6f..dee91e79e3 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.2"
+	bool "3.10.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.3" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 0e8cbd5902e471df7b9804bc1328d9134094f1a1 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <roylee17@gmail.com>
Date: Sun, 28 Jul 2013 19:59:40 +0800
Subject: [PATCH 5780/6849] tstools: fix build failure in parallel (-j) build

This patch fixes the nightly build failure caused by tstools.  It is
back ported from recent upstream commit
0e8463ea1dc55f566a88bb3df29cf3d5f23cc326.

Once the upstream update the download page with more recent source
tarball, this will no longer be needed.

Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...-001-build-get-along-with-buildroot.patch} |   0
 ...002-build-fix-parallel-build-failure.patch | 331 ++++++++++++++++++
 2 files changed, 331 insertions(+)
 rename package/tstools/{tstools-build-get-along-with-buildroot.patch => tstools-001-build-get-along-with-buildroot.patch} (100%)
 create mode 100644 package/tstools/tstools-002-build-fix-parallel-build-failure.patch

diff --git a/package/tstools/tstools-build-get-along-with-buildroot.patch b/package/tstools/tstools-001-build-get-along-with-buildroot.patch
similarity index 100%
rename from package/tstools/tstools-build-get-along-with-buildroot.patch
rename to package/tstools/tstools-001-build-get-along-with-buildroot.patch
diff --git a/package/tstools/tstools-002-build-fix-parallel-build-failure.patch b/package/tstools/tstools-002-build-fix-parallel-build-failure.patch
new file mode 100644
index 0000000000..df507474d0
--- /dev/null
+++ b/package/tstools/tstools-002-build-fix-parallel-build-failure.patch
@@ -0,0 +1,331 @@
+From 2fe4faa9d8eab6068976c7981bc166f576869b36 Mon Sep 17 00:00:00 2001
+From: Tzu-Jung Lee <tjlee@ambarella.com>
+Date: Sun, 28 Jul 2013 19:40:27 +0800
+Subject: [PATCH 1/1] build: fix parallel build failure
+
+This is back ported from recent upstream commit
+
+  0e8463ea1dc55f566a88bb3df29cf3d5f23cc326
+
+Once the upstream update the download page with more
+recent source tarball, this will no longer be needed.
+
+Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
+---
+ Makefile | 222 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 115 insertions(+), 107 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b79a573..ad7f163 100644
+--- a/Makefile
++++ b/Makefile
+@@ -67,67 +67,49 @@ LFS_FLAGS = -D_FILE_OFFSET_BITS=64
+ # sort of thing (presumably Linux or BSD)
+ ifeq ($(shell uname -s), Darwin)
+ 	SYSTEM = "macosx"
+-	ARCH_FLAGS = -arch ppc -arch i386
++	ARCH_FLAGS =
++	# If you're still building on a version of Mac OS X that supports powerpc,
++	# then you may want to uncomment the next line. Obviously, this no longer
++	# works in Lion, which doesn't support powerpc machines any more.
++	#ARCH_FLAGS = -arch ppc -arch i386
+ else
+ 	SYSTEM = "other"
+-	ARCH_FLAGS =
++	ARCH_FLAGS = -fPIC
+ endif
+ 
+ CFLAGS = $(WARNING_FLAGS) $(OPTIMISE_FLAGS) $(LFS_FLAGS) -I. $(PROFILE_FLAGS) $(ARCH_FLAGS)
+-LDFLAGS = -g -lm $(PROFILE_FLAGS) $(ARCH_FLAGS)
++LDFLAGS = -g $(PROFILE_FLAGS) $(ARCH_FLAGS) -lm
+ 
+ # Target directories
+ OBJDIR = obj
+ LIBDIR = lib
+ BINDIR = bin
+ 
+-# All of our non-program source files
+-SRCS = \
+- accessunit.c \
+- ac3.c \
+- adts.c \
+- avs.c \
+- bitdata.c \
+- es.c \
+- fmtx.c \
+- h222.c \
+- h262.c \
+- audio.c \
+- l2audio.c \
+- misc.c \
+- nalunit.c \
+- ps.c \
+- pes.c \
+- pidint.c \
+- ts.c \
+- tswrite.c \
+- pcap.c 
+-
+ # All of our non-program object modules
+ OBJS = \
+- accessunit.o \
+- avs.o \
+- ac3.o \
+- adts.o \
+- bitdata.o \
+- es.o \
+- filter.o \
+- fmtx.o \
+- h222.o \
+- h262.o \
+- audio.o \
+- l2audio.o \
+- misc.o \
+- nalunit.o \
+- ps.o \
+- pes.o \
+- pidint.o \
+- reverse.o \
+- ts.o \
+- tswrite.o \
+- pcap.o \
+- ethernet.o \
+- ipv4.o
++ $(OBJDIR)/accessunit.o \
++ $(OBJDIR)/avs.o \
++ $(OBJDIR)/ac3.o \
++ $(OBJDIR)/adts.o \
++ $(OBJDIR)/bitdata.o \
++ $(OBJDIR)/es.o \
++ $(OBJDIR)/filter.o \
++ $(OBJDIR)/fmtx.o \
++ $(OBJDIR)/h222.o \
++ $(OBJDIR)/h262.o \
++ $(OBJDIR)/audio.o \
++ $(OBJDIR)/l2audio.o \
++ $(OBJDIR)/misc.o \
++ $(OBJDIR)/nalunit.o \
++ $(OBJDIR)/ps.o \
++ $(OBJDIR)/pes.o \
++ $(OBJDIR)/pidint.o \
++ $(OBJDIR)/reverse.o \
++ $(OBJDIR)/ts.o \
++ $(OBJDIR)/tswrite.o \
++ $(OBJDIR)/pcap.o \
++ $(OBJDIR)/ethernet.o \
++ $(OBJDIR)/ipv4.o
+ 
+ # Our program object modules
+ PROG_OBJS = \
+@@ -161,9 +143,14 @@ TEST_OBJS = \
+   $(OBJDIR)/test_es_unit_list.o
+ 
+ # Our library
+-LIB = $(LIBDIR)/libtstools.a
+-LIBOPTS = -L$(LIBDIR) -ltstools $(ARCH_FLAGS)
++STATIC_LIB = $(LIBDIR)/libtstools.a
++LIBOPTS = $(ARCH_FLAGS) $(STATIC_LIB)
+ 
++ifeq ($(shell uname -s), Darwin)
++SHARED_LIB = $(LIBDIR)/libtstools.xxx
++else
++SHARED_LIB = $(LIBDIR)/libtstools.so
++endif
+ # All of our programs (except the testing ones)
+ PROGS = \
+   $(BINDIR)/esfilter \
+@@ -197,7 +184,7 @@ TEST_PES_PROG = $(BINDIR)/test_pes
+ TEST_PROGS = test_nal_unit_list test_es_unit_list
+ 
+ # ------------------------------------------------------------
+-all:	$(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS)
++all:	$(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS) $(SHARED_LIB)
+ 
+ # ts2ps is not yet an offical program, so for the moment build
+ # it separately
+@@ -205,82 +192,97 @@ all:	$(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS)
+ ts2ps:	$(TS2PS_PROG)
+ 
+ ifeq ($(shell uname -s), Darwin)
+-# Try getting a library containing universal objects on Mac
+-$(LIB): $(OBJS)
+-	libtool -static $(OBJS) -o $(LIB)
++# Make libraries containing universal objects on Mac
++$(STATIC_LIB): $(OBJS)
++	libtool -static $(OBJS) -o $(STATIC_LIB)
++$(SHARED_LIB): $(OBJS)
++	libtool -dynamic $(OBJS) -o $(SHARED_LIB)
+ else
+-$(LIB): $(LIB)($(OBJS))
++$(STATIC_LIB): $(OBJS)
++	rm -f $(STATIC_LIB)
++	ar rc $(STATIC_LIB) $(OBJS)
++
++$(SHARED_LIB): $(OBJS)
++	$(LD) -shared -o $(SHARED_LIB) $(OBJS) -lc
+ endif
+ 
+-$(BINDIR)/esfilter:	$(OBJDIR)/esfilter.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/esfilter $(LDFLAGS) $(LIBOPTS)
++# Build all of the utilities with the static library, so that they can
++# be copied around, shared, etc., without having to think about it
++
++$(BINDIR)/esfilter:	$(OBJDIR)/esfilter.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/esfilter $(LIBOPTS) $(LDFLAGS)
++
++$(BINDIR)/ts2es:		$(OBJDIR)/ts2es.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/ts2es $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/ts2es:		$(OBJDIR)/ts2es.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/ts2es $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/es2ts:		$(OBJDIR)/es2ts.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/es2ts $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/es2ts:		$(OBJDIR)/es2ts.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/es2ts $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/esdots:		$(OBJDIR)/esdots.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/esdots $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/esdots:		$(OBJDIR)/esdots.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/esdots $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/esmerge:	$(OBJDIR)/esmerge.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/esmerge $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/esmerge:	$(OBJDIR)/esmerge.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/esmerge $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/esreport:	$(OBJDIR)/esreport.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/esreport $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/esreport:	$(OBJDIR)/esreport.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/esreport $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/esreverse:	$(OBJDIR)/esreverse.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/esreverse $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/esreverse:	$(OBJDIR)/esreverse.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/esreverse $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/stream_type:	$(OBJDIR)/stream_type.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/stream_type $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/stream_type:	$(OBJDIR)/stream_type.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/stream_type $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/psreport:	$(OBJDIR)/psreport.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/psreport $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/psreport:	$(OBJDIR)/psreport.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/psreport $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/psdots:	$(OBJDIR)/psdots.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/psdots $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/psdots:	$(OBJDIR)/psdots.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/psdots $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/ps2ts:		$(OBJDIR)/ps2ts.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/ps2ts $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/ps2ts:		$(OBJDIR)/ps2ts.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/ps2ts $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/tsinfo:		$(OBJDIR)/tsinfo.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/tsinfo $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/tsinfo:		$(OBJDIR)/tsinfo.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/tsinfo $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/tsreport:	$(OBJDIR)/tsreport.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/tsreport $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/tsreport:	$(OBJDIR)/tsreport.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/tsreport $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/tsserve:	$(OBJDIR)/tsserve.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/tsserve $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/tsserve:	$(OBJDIR)/tsserve.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/tsserve $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/tsplay:	$(OBJDIR)/tsplay.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/tsplay $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/tsplay:		$(OBJDIR)/tsplay.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/tsplay $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/test_ps:	$(OBJDIR)/test_ps.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/test_ps $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/test_ps:	$(OBJDIR)/test_ps.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/test_ps $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/ts2ps:		$(OBJDIR)/ts2ps.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/ts2ps $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/ts2ps:		$(OBJDIR)/ts2ps.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/ts2ps $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/ts_packet_insert:	$(OBJDIR)/ts_packet_insert.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/ts_packet_insert $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/ts_packet_insert:	$(OBJDIR)/ts_packet_insert.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/ts_packet_insert $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/m2ts2ts:		$(OBJDIR)/m2ts2ts.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/m2ts2ts $(LIBOPTS) $(LDFLAGS)
++$(BINDIR)/pcapreport:	$(OBJDIR)/pcapreport.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/pcapreport $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/m2ts2ts:		$(OBJDIR)/m2ts2ts.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/m2ts2ts $(LDFLAGS) $(LIBOPTS)
+-$(BINDIR)/pcapreport:	$(OBJDIR)/pcapreport.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/pcapreport $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/tsfilter:	$(OBJDIR)/tsfilter.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/tsfilter $(LIBOPTS) $(LDFLAGS)
++$(BINDIR)/tsdvbsub:	$(OBJDIR)/tsdvbsub.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/tsdvbsub $(LIBOPTS) $(LDFLAGS)
+ 
+ 
+ 
+ 
+-$(BINDIR)/test_pes:	$(OBJDIR)/test_pes.o $(LIB)
+-		$(CC) $< -o $(BINDIR)/test_pes $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/test_pes:	$(OBJDIR)/test_pes.o $(STATIC_LIB)
++		$(CC) $< -o $(BINDIR)/test_pes $(LIBOPTS) $(LDFLAGS)
+ 
+-$(BINDIR)/test_nal_unit_list: 	$(OBJDIR)/test_nal_unit_list.o $(LIB)
+-			$(CC) $< -o $(BINDIR)/test_nal_unit_list $(LDFLAGS) $(LIBOPTS)
+-$(BINDIR)/test_es_unit_list:  	$(OBJDIR)/test_es_unit_list.o $(LIB)
+-			$(CC) $< -o $(BINDIR)/test_es_unit_list $(LDFLAGS) $(LIBOPTS)
++$(BINDIR)/test_nal_unit_list: 	$(OBJDIR)/test_nal_unit_list.o $(STATIC_LIB)
++			$(CC) $< -o $(BINDIR)/test_nal_unit_list $(LIBOPTS) $(LDFLAGS)
++$(BINDIR)/test_es_unit_list:  	$(OBJDIR)/test_es_unit_list.o $(STATIC_LIB)
++			$(CC) $< -o $(BINDIR)/test_es_unit_list $(LIBOPTS) $(LDFLAGS)
+ 
+ # Some header files depend upon others, so including one requires
+ # the others as well
+@@ -299,14 +301,19 @@ REVERSE_H = reverse_fns.h reverse_defns.h
+ FILTER_H = filter_fns.h filter_defns.h $(REVERSE_H)
+ AUDIO_H = adts_fns.h l2audio_fns.h ac3_fns.h audio_fns.h audio_defns.h adts_defns.h
+ 
+-# Everyone depends upon the basic configuration file
+-$(LIB)($(OBJS)) $(TEST_OBJS) $(PROG_OBJS): compat.h
++# Everyone depends upon the basic configuration file, and I assert they all
++# want (or may want) printing...
++$(OBJS) $(TEST_OBJS) $(PROG_OBJS): compat.h
+ 
+ # Which library modules depend on which header files is complex, so
+ # lets just be simple
+-$(LIB)($(OBJS)): $(ACCESSUNIT_H) $(NALUNIT_H) $(TS_H) $(ES_H) $(PES_H) \
+-                 misc_fns.h $(PS_H) $(H262_H) $(TSWRITE_H) $(AVS_H) \
+-                 $(REVERSE_H) $(FILTER_H) $(AUDIO_H)
++$(OBJS): \
++                 $(ACCESSUNIT_H) $(NALUNIT_H) $(TS_H) $(ES_H) $(PES_H) \
++                 misc_fns.h $(PS_H) $(H262_H) \
++                 $(TSWRITE_H) $(AVS_H) $(REVERSE_H) $(FILTER_H) $(AUDIO_H)
++
++$(OBJDIR)/%.o: %.c
++	$(CC) -c $< -o $@ $(CFLAGS)
+ 
+ $(OBJDIR)/es2ts.o:        es2ts.c $(ES_H) $(TS_H) misc_fns.h version.h
+ 	$(CC) -c $< -o $@ $(CFLAGS)
+@@ -389,7 +396,8 @@ objclean:
+ .PHONY: clean
+ clean: objclean
+ 	-rm -f $(PROGS)
+-	-rm -f $(LIB)
++	-rm -f $(STATIC_LIB)
++	-rm -f $(SHARED_LIB)
+ 	-rm -f $(PROG_OBJS)
+ 
+ .PHONY: distclean
+-- 
+1.8.3.2
+

From a51b43a68d8e4f4db50bcb1a778d1abd71c121e0 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 19 Jul 2013 18:37:51 -0500
Subject: [PATCH 5781/6849] a10disp: new package

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in          |  1 +
 package/a10disp/Config.in  | 12 ++++++++++++
 package/a10disp/a10disp.mk | 22 ++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/a10disp/Config.in
 create mode 100644 package/a10disp/a10disp.mk

diff --git a/package/Config.in b/package/Config.in
index 9e1c0aee57..155119ffa0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -230,6 +230,7 @@ source "package/ux500-firmware/Config.in"
 source "package/zd1211-firmware/Config.in"
 endmenu
 source "package/freescale-imx/Config.in"
+source "package/a10disp/Config.in"
 source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
 source "package/dbus/Config.in"
diff --git a/package/a10disp/Config.in b/package/a10disp/Config.in
new file mode 100644
index 0000000000..b4edf31508
--- /dev/null
+++ b/package/a10disp/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_A10DISP
+	bool "a10disp"
+	depends on BR2_arm
+	depends on BR2_LINUX_KERNEL
+	help
+	  Program to change the display mode of Allwinner ARM SOCs running
+	  the linux-sunxi kernel (and not the mainline kernel.)
+
+	  http://github.com/hglm/a10disp
+
+comment "a10disp requires the linux kernel"
+	depends on BR2_arm && !BR2_LINUX_KERNEL
diff --git a/package/a10disp/a10disp.mk b/package/a10disp/a10disp.mk
new file mode 100644
index 0000000000..fee4ac7a92
--- /dev/null
+++ b/package/a10disp/a10disp.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# a10disp
+#
+################################################################################
+
+A10DISP_VERSION = a899cc6dcf
+A10DISP_SITE = http://github.com/hglm/a10disp/tarball/$(A10DISP_VERSION)
+A10DISP_LICENSE = MIT
+
+A10DISP_DEPENDENCIES = linux
+
+define A10DISP_BUILD_CMDS
+	cp -f $(LINUX_DIR)/include/video/sunxi_disp_ioctl.h $(@D)/
+	$(TARGET_CC) $(TARGET_CFLAGS) $(@D)/a10disp.c -o $(@D)/a10disp
+endef
+
+define A10DISP_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/a10disp $(TARGET_DIR)/usr/bin/a10disp
+endef
+
+$(eval $(generic-package))

From 45b7846b788fc8d0067c72b0679789b18649b4f1 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 19 Jul 2013 18:37:52 -0500
Subject: [PATCH 5782/6849] sunxi-mali: new package

[Thomas: remove trailing whitespace, install libraries with execution
permissions so that they get stripped by Buildroot, r2p4 is only
available on EABI toolchains, r3p0 on EABIhf toolchains.]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                          |  2 +
 package/sunxi-mali-prop/Config.in          |  4 ++
 package/sunxi-mali-prop/sunxi-mali-prop.mk | 10 +++
 package/sunxi-mali/Config.in               | 61 ++++++++++++++++
 package/sunxi-mali/S80mali                 | 54 ++++++++++++++
 package/sunxi-mali/egl.pc                  | 12 ++++
 package/sunxi-mali/glesv2.pc               | 12 ++++
 package/sunxi-mali/sunxi-mali.mk           | 84 ++++++++++++++++++++++
 8 files changed, 239 insertions(+)
 create mode 100644 package/sunxi-mali-prop/Config.in
 create mode 100644 package/sunxi-mali-prop/sunxi-mali-prop.mk
 create mode 100644 package/sunxi-mali/Config.in
 create mode 100644 package/sunxi-mali/S80mali
 create mode 100644 package/sunxi-mali/egl.pc
 create mode 100644 package/sunxi-mali/glesv2.pc
 create mode 100644 package/sunxi-mali/sunxi-mali.mk

diff --git a/package/Config.in b/package/Config.in
index 155119ffa0..d347709f6f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -295,6 +295,8 @@ source "package/smartmontools/Config.in"
 source "package/snowball-hdmiservice/Config.in"
 source "package/sredird/Config.in"
 source "package/statserial/Config.in"
+source "package/sunxi-mali/Config.in"
+source "package/sunxi-mali-prop/Config.in"
 source "package/sysstat/Config.in"
 source "package/ti-gfx/Config.in"
 source "package/ti-utils/Config.in"
diff --git a/package/sunxi-mali-prop/Config.in b/package/sunxi-mali-prop/Config.in
new file mode 100644
index 0000000000..b9efb4e351
--- /dev/null
+++ b/package/sunxi-mali-prop/Config.in
@@ -0,0 +1,4 @@
+# Sunxi-mali-prop is a git submodule of sunxi-mali. To use this package
+# select the sunxi-mali option.
+config BR2_PACKAGE_SUNXI_MALI_PROP
+	bool
diff --git a/package/sunxi-mali-prop/sunxi-mali-prop.mk b/package/sunxi-mali-prop/sunxi-mali-prop.mk
new file mode 100644
index 0000000000..21960e6b66
--- /dev/null
+++ b/package/sunxi-mali-prop/sunxi-mali-prop.mk
@@ -0,0 +1,10 @@
+################################################################################
+#
+# sunxi-mali-prop
+#
+################################################################################
+
+SUNXI_MALI_PROP_VERSION = e4ced47
+SUNXI_MALI_PROP_SITE = http://github.com/linux-sunxi/sunxi-mali-proprietary/tarball/$(SUNXI_MALI_PROP_VERSION)
+
+$(eval $(generic-package))
diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in
new file mode 100644
index 0000000000..c479cf4be8
--- /dev/null
+++ b/package/sunxi-mali/Config.in
@@ -0,0 +1,61 @@
+config BR2_PACKAGE_SUNXI_MALI
+	bool "sunxi-mali"
+	select BR2_PACKAGE_HAS_OPENGL_EGL
+	select BR2_PACKAGE_HAS_OPENGL_ES
+	# The egl/gles mali libraries are provided as a git submodule of the
+	# sunxi-mali repo and are downloaded by the sunxi-mali-prop package.
+	select BR2_PACKAGE_SUNXI_MALI_PROP
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_arm
+	help
+	  Install the ARM Mali drivers for sunxi based systems (i.e
+	  systems based on ARM Allwinner SoCs). This driver requires
+	  either the sunxi-kernel with the ARM Mali driver enabled or
+	  the installation of the ARM Mali drivers as an external
+	  module.
+
+	  http://github.com/linux-sunxi/sunxi-mali
+
+if BR2_PACKAGE_SUNXI_MALI
+
+config BR2_PACKAGE_SUNXI_MALI_DBG
+	bool "install malitest and maliver tools"
+	help
+	  Install 3D triangle demo malitest application and the maliver application
+	  which describes the kernel module version.
+
+choice
+	prompt "Version"
+	default BR2_PACKAGE_SUNXI_MALI_R3P0
+	help
+	  Select the version of the kernel module.  For the sunxi-kernel, the
+	  appropriate version number is r3p0. For other kernels, use the maliver
+	  application to determine the appropriate version.
+
+config BR2_PACKAGE_SUNXI_MALI_R2P4
+	bool "r2p4"
+	depends on BR2_ARM_EABI
+
+comment "r2p4 requires an EABI toolchain"
+	depends on !BR2_ARM_EABI
+
+config BR2_PACKAGE_SUNXI_MALI_R3P0
+	bool "r3p0"
+	depends on BR2_ARM_EABIHF
+
+comment "r3p0 requires an EABIhf toolchain"
+	depends on !BR2_ARM_EABIHF
+
+config BR2_PACKAGE_SUNXI_MALI_R3P1
+	depends on BR2_ARM_EABIHF
+	bool "r3p1"
+
+comment "r3p1 requires an EABIhf toolchain"
+	depends on !BR2_ARM_EABIHF
+
+endchoice
+
+endif
+
+comment "sunxi-mali requires an eglibc/glibc based toolchain"
+	depends on BR2_arm && !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/sunxi-mali/S80mali b/package/sunxi-mali/S80mali
new file mode 100644
index 0000000000..6f51cc4745
--- /dev/null
+++ b/package/sunxi-mali/S80mali
@@ -0,0 +1,54 @@
+#!/bin/sh -e
+
+install_driver() {
+	DRIVER=$1
+	OPTS=$2
+
+	modprobe $DRIVER $OPTS
+	maj=$(awk "$$2==\"${DRIVER}\" { print $$1; }" /proc/devices)
+
+	rm -f /dev/${DRIVER}
+
+	mknod /dev/${DRIVER} c $maj 0
+	chmod 600 /dev/${DRIVER}
+}
+
+start() {
+	echo "mali: starting driver"
+
+	BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')"
+	YRES="$(fbset | awk '/geom/ {print $3}')"
+	# Set RGBA ordering to something the drivers like
+	if [ "$BITSPERPIXEL" = "32" ] ; then
+		fbset -rgba 8/16,8/8,8/0,8/24
+	fi
+	# Try to enable triple buffering when there's enough VRAM
+	fbset -vyres $(( YRES*3 ))
+
+	install_driver mali
+	install_driver ump
+}
+
+stop() {
+	echo "mali: stopping driver"
+
+	rmmod ump
+	rmmod mali
+}
+
+case "$1" in
+start)
+	start
+;;
+stop)
+	stop
+;;
+restart)
+	stop
+	start
+;;
+*)
+	echo "mali: Please use start, stop, or restart."
+	exit 1
+;;
+esac
diff --git a/package/sunxi-mali/egl.pc b/package/sunxi-mali/egl.pc
new file mode 100644
index 0000000000..56e3990c65
--- /dev/null
+++ b/package/sunxi-mali/egl.pc
@@ -0,0 +1,12 @@
+prefix=/usr/
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: ARM Mali implementation of EGL
+Version: 1.4
+Requires:
+Libs: -L${libdir} -lEGL -lGLESv2 -lUMP
+Cflags: -I{includedir}/EGL/ -I${includedir}
+
diff --git a/package/sunxi-mali/glesv2.pc b/package/sunxi-mali/glesv2.pc
new file mode 100644
index 0000000000..4e112eeafb
--- /dev/null
+++ b/package/sunxi-mali/glesv2.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: ARM Mali implementation of OpenGL ESv2
+Version: 2.0
+Requires:
+Libs: -L${libdir} -lGLESv2 -lGLES_CM -lUMP
+Cflags: -I${includedir}/GLES2
+
diff --git a/package/sunxi-mali/sunxi-mali.mk b/package/sunxi-mali/sunxi-mali.mk
new file mode 100644
index 0000000000..826583d88b
--- /dev/null
+++ b/package/sunxi-mali/sunxi-mali.mk
@@ -0,0 +1,84 @@
+################################################################################
+#
+# sunxi-mali
+#
+################################################################################
+
+SUNXI_MALI_VERSION = c2491fe952
+SUNXI_MALI_SITE = http://github.com/linux-sunxi/sunxi-mali/tarball/$(SUNXI_MALI_VERSION)
+
+SUNXI_MALI_INSTALL_STAGING = YES
+SUNXI_MALI_DEPENDENCIES = sunxi-mali-prop
+
+# The options below must be provided in the environment.  Providing these
+# through options overrides the value and prevents the makefiles from
+# appending to these variables.  This is used throughout the sunxi-mali build
+# system.
+#
+# Furthermore, the -lm -dl -lpthread options are included due to a possible bug
+# in the way the linaro 2013.06 toolchain handles shared libraries.
+SUNXI_MALI_MAKE_ENV = \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \
+	$(TARGET_MAKE_ENV)
+
+ifeq ($(BR2_ARM_EABIHF),y)
+SUNXI_MALI_MAKE_OPTS += ABI=armhf
+else
+SUNXI_MALI_MAKE_OPTS += ABI=armel
+endif
+
+SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer
+
+ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y)
+SUNXI_MALI_MAKE_OPTS += VERSION=r2p4
+endif
+ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y)
+SUNXI_MALI_MAKE_OPTS += VERSION=r3p0
+endif
+ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P1),y)
+SUNXI_MALI_MAKE_OPTS += VERSION=r3p1
+endif
+
+define SUNXI_MALI_GIT_SUBMODULE_FIXUP
+	rm -rf $(@D)/lib/mali
+	cp -rf $(SUNXI_MALI_PROP_SRCDIR) $(@D)/lib/mali
+endef
+
+SUNXI_MALI_PRE_CONFIGURE_HOOKS += SUNXI_MALI_GIT_SUBMODULE_FIXUP
+
+define SUNXI_MALI_BUILD_CMDS
+	$(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) all
+	$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/version/version \
+		$(@D)/version/version.c
+endef
+
+define SUNXI_MALI_INSTALL_STAGING_CMDS
+	$(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
+	# test must be built after install because it depends on headers that are
+	# generated during the install above.
+	$(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) test
+	$(INSTALL) -D -m 0644 package/sunxi-mali/egl.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
+	$(INSTALL) -D -m 0644 package/sunxi-mali/glesv2.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc
+endef
+
+define SUNXI_MALI_INSTALL_TARGET_CMDS
+	$(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D)/lib \
+		$(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+	# add execution permissions so that libraries are properly stripped
+	chmod +x $(addprefix $(TARGET_DIR)/usr/lib/lib,EGL.so GLESv1_CM.so GLESv2.so Mali.so UMP.so*)
+	$(if $(BR2_PACKAGE_SUNXI_MALI_DBG),
+		$(INSTALL) -m 755 $(@D)/version/version $(TARGET_DIR)/usr/bin/maliver; \
+		$(INSTALL) -m 755 $(@D)/test/test $(TARGET_DIR)/usr/bin/malitest
+	)
+endef
+
+define SUNXI_MALI_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/sunxi-mali/S80mali \
+		$(TARGET_DIR)/etc/init.d/S80mali
+endef
+
+$(eval $(generic-package))

From 2f08cad9a33c2c4549562d195d9925d97df26179 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 19 Jul 2013 18:37:53 -0500
Subject: [PATCH 5783/6849] opengl: add sunxi-mali as possible egl/gles
 provider

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/opengl/libegl/libegl.mk   | 4 ++++
 package/opengl/libgles/libgles.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index 84ee28c969..97a4b85b57 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -14,6 +14,10 @@ ifeq ($(BR2_PACKAGE_TI_GFX),y)
 LIBEGL_DEPENDENCIES += ti-gfx
 endif
 
+ifeq ($(BR2_PACKAGE_SUNXI_MALI),y)
+LIBEGL_DEPENDENCIES += sunxi-mali
+endif
+
 ifeq ($(LIBEGL_DEPENDENCIES),)
 define LIBEGL_CONFIGURE_CMDS
 	echo "No libEGL implementation selected. Configuration error."
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index 1b62a196af..2945496492 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -14,6 +14,10 @@ ifeq ($(BR2_PACKAGE_TI_GFX),y)
 LIBGLES_DEPENDENCIES += ti-gfx
 endif
 
+ifeq ($(BR2_PACKAGE_SUNXI_MALI),y)
+LIBGLES_DEPENDENCIES += sunxi-mali
+endif
+
 ifeq ($(LIBGLES_DEPENDENCIES),)
 define LIBGLES_CONFIGURE_CMDS
 	echo "No libGLES implementation selected. Configuration error."

From e7481560127a894325a4fabd5c6938637c670724 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 19 Jul 2013 18:37:54 -0500
Subject: [PATCH 5784/6849] sunxi-cedarx: add CedarX hardware video decoding
 library

[Thomas: rename package to sunxi-cedarx, improve help text
description, install libraries with executable permissions to make
sure they get stripped at the end of the build.]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                    |  1 +
 package/sunxi-cedarx/Config.in       | 14 ++++++++
 package/sunxi-cedarx/sunxi-cedarx.mk | 49 ++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 package/sunxi-cedarx/Config.in
 create mode 100644 package/sunxi-cedarx/sunxi-cedarx.mk

diff --git a/package/Config.in b/package/Config.in
index d347709f6f..ac7b16dee9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -295,6 +295,7 @@ source "package/smartmontools/Config.in"
 source "package/snowball-hdmiservice/Config.in"
 source "package/sredird/Config.in"
 source "package/statserial/Config.in"
+source "package/sunxi-cedarx/Config.in"
 source "package/sunxi-mali/Config.in"
 source "package/sunxi-mali-prop/Config.in"
 source "package/sysstat/Config.in"
diff --git a/package/sunxi-cedarx/Config.in b/package/sunxi-cedarx/Config.in
new file mode 100644
index 0000000000..b280db0658
--- /dev/null
+++ b/package/sunxi-cedarx/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_SUNXI_CEDARX
+	bool "sunxi-cedarx"
+	depends on BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
+	help
+	  Sunxi CedarX decoder libraries. CedarX is Allwinner's
+	  multimedia co-processing technology for hardware accelerated
+	  video and image decoding, as used inside their A10 SoC's and
+	  others.
+
+	  http://github.com/linux-sunxi/cedarx-libs
+	  http://linux-sunxi.org/CedarX
+
+comment "sunxi-cedarx requires an eglibc/glibc based toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
diff --git a/package/sunxi-cedarx/sunxi-cedarx.mk b/package/sunxi-cedarx/sunxi-cedarx.mk
new file mode 100644
index 0000000000..b1c37175c5
--- /dev/null
+++ b/package/sunxi-cedarx/sunxi-cedarx.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# sunxi-cedarx
+#
+################################################################################
+
+SUNXI_CEDARX_VERSION = 74923e55fc
+SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CEDARX_VERSION)
+
+SUNXI_CEDARX_INSTALL_STAGING = YES
+
+ifeq ($(BR2_ARM_EABIHF),y)
+SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf
+else
+SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel
+endif
+
+define SUNXI_CEDARX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR)
+	$(TARGET_CC) $(TARGET_CFLAGS) \
+		-c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \
+		-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o \
+		-I $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap \
+		-I $(SUNXI_CEDARX_BIN_DIR)/
+	$(TARGET_CC) -shared -L./ -Wl,-soname,libavheap.so \
+		-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
+		$(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o
+endef
+
+define SUNXI_CEDARX_INSTALL_STAGING_CMDS
+	$(INSTALL) -d -m 755 $(STAGING_DIR)/usr/include/libvecore
+	$(INSTALL) -m 664 $(SUNXI_CEDARX_BIN_DIR)/libvecore/*.h \
+		$(STAGING_DIR)/usr/include/libvecore
+	$(INSTALL) -m 644 $(SUNXI_CEDARX_BIN_DIR)/*.h \
+		$(STAGING_DIR)/usr/include/
+	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \
+		$(STAGING_DIR)/usr/lib/libvecore.so
+	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
+		$(STAGING_DIR)/usr/lib/libavheap.so
+endef
+
+define SUNXI_CEDARX_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \
+		$(TARGET_DIR)/usr/lib/libvecore.so
+	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
+		$(TARGET_DIR)/usr/lib/libavheap.so
+endef
+
+$(eval $(generic-package))

From 56a5e5a1486c46f44418acce5aa53e8a4822bc87 Mon Sep 17 00:00:00 2001
From: ANDY KENNEDY <ANDY.KENNEDY@adtran.com>
Date: Tue, 25 Jun 2013 21:41:44 +0000
Subject: [PATCH 5785/6849] libunwind: new package

[Thomas: added patch to disable build of tests that fail on uClibc,
added dependencies for architectures that are supported.]

Signed-off-by: Andy Kennedy <andy.kennedy@adtran.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/libunwind/Config.in                   |  8 +++++
 .../libunwind/libunwind-disable-tests.patch   | 32 +++++++++++++++++++
 package/libunwind/libunwind.mk                | 13 ++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 package/libunwind/Config.in
 create mode 100644 package/libunwind/libunwind-disable-tests.patch
 create mode 100644 package/libunwind/libunwind.mk

diff --git a/package/Config.in b/package/Config.in
index ac7b16dee9..ed373def7f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -629,6 +629,7 @@ source "package/libsigsegv/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
 source "package/libseccomp/Config.in"
+source "package/libunwind/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
 source "package/log4cxx/Config.in"
diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in
new file mode 100644
index 0000000000..4f130f041c
--- /dev/null
+++ b/package/libunwind/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBUNWIND
+	bool "libunwind"
+	depends on BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
+		BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64
+	help
+	  C API to determine the call-chain of a program.
+
+	  http://www.nongnu.org/libunwind/index.html
diff --git a/package/libunwind/libunwind-disable-tests.patch b/package/libunwind/libunwind-disable-tests.patch
new file mode 100644
index 0000000000..05475a5d6c
--- /dev/null
+++ b/package/libunwind/libunwind-disable-tests.patch
@@ -0,0 +1,32 @@
+Disable building of tests
+
+libunwind tests do not build with uClibc, so we disable them.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,7 +36,7 @@
+ 
+ nodist_include_HEADERS = include/libunwind-common.h
+ 
+-SUBDIRS = src tests doc
++SUBDIRS = src doc
+ 
+ noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h	\
+ 	include/compiler.h include/libunwind_i.h include/mempool.h	\
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -313,7 +313,7 @@
+ 	$(am__append_7) $(am__append_8) $(am__append_9) \
+ 	$(am__append_10)
+ nodist_include_HEADERS = include/libunwind-common.h
+-SUBDIRS = src tests doc
++SUBDIRS = src doc
+ noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h	\
+ 	include/compiler.h include/libunwind_i.h include/mempool.h	\
+ 	include/remote.h						\
diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk
new file mode 100644
index 0000000000..f573722f90
--- /dev/null
+++ b/package/libunwind/libunwind.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libunwind
+#
+################################################################################
+
+LIBUNWIND_VERSION = 1.1
+LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind
+LIBUNWIND_INSTALL_STAGING = YES
+LIBUNWIND_LICENSE_FILES = COPYING
+LIBUNWIND_LICENSE = MIT
+
+$(eval $(autotools-package))

From b50e0fa113bf641a3764ae99b94bb7ba4e1e8f85 Mon Sep 17 00:00:00 2001
From: "Paul B. Henson" <henson@acm.org>
Date: Sun, 28 Jul 2013 19:11:50 -0700
Subject: [PATCH 5786/6849] mtd: add option to build mkfs.ubifs for target

[Thomas: implement simplifications suggested by Thomas De
Schampheleire, add missing 'depends' on required toolchain features.]

Signed-off-by: Paul B. Henson <henson@acm.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/mtd/Config.in | 12 ++++++++++++
 package/mtd/mtd.mk    |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index ddc3737dcf..d3da41344e 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -54,6 +54,18 @@ config BR2_PACKAGE_MTD_MKFSJFFS2
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LZO
 
+config BR2_PACKAGE_MTD_MKFSUBIFS
+	bool "mkfs.ubifs"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LZO
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+
+comment "mkfs.ubifs requires largefile and wchar support in toolchain"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+
 config BR2_PACKAGE_MTD_MTD_DEBUG
 	bool "mtd_debug"
 	default y
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 994a73a222..6b2af0dc9f 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -14,6 +14,10 @@ ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 MTD_DEPENDENCIES = zlib lzo
 endif
 
+ifeq ($(BR2_PACKAGE_MTD_MKFSUBIFS),y)
+MTD_DEPENDENCIES += util-linux zlib lzo
+endif
+
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 MTD_DEPENDENCIES += busybox
 endif
@@ -72,6 +76,7 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL)	+= ubirsvol
 MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
 
 MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs
 
 # only call make if atleast a single tool is enabled
 ifneq ($(MTD_TARGETS_y),)

From 51fc2776b7f4efbd6c221f48690b568d143db8e3 Mon Sep 17 00:00:00 2001
From: Gary Coulbourne <bear@bears.org>
Date: Wed, 5 Dec 2012 11:48:27 -0500
Subject: [PATCH 5787/6849] uboot: add support for Freescale .sb format to
 uboot

[Thomas: update to recent Buildroot, add missing dependency on
host-elftosb.]

Signed-off-by: Gary Coulbourne <bear@bears.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/uboot/Config.in | 4 ++++
 boot/uboot/uboot.mk  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index f5806e7de0..2e37856d56 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -101,6 +101,10 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
 config BR2_TARGET_UBOOT_FORMAT_ELF
 	bool "u-boot.elf"
 
+config BR2_TARGET_UBOOT_FORMAT_SB
+	depends on BR2_arm
+	bool "u-boot.sb"
+
 config BR2_TARGET_UBOOT_FORMAT_CUSTOM
 	bool "Custom (specify below)"
 	help
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 3904b8bd4f..631da6b6fd 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -40,6 +40,10 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BIN          = u-boot-nand.bin
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
 UBOOT_BIN          = u-boot.img
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
+UBOOT_BIN          = u-boot.sb
+UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
+UBOOT_DEPENDENCIES += host-elftosb
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
 UBOOT_BIN          = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
 else

From f2a007480cab92c359432b9fa307eb48c5510086 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Wed, 8 May 2013 13:55:26 -0500
Subject: [PATCH 5788/6849] lockdev: add lockdev

Add lockdev a package for locking devices.

[Thomas: change location in menuconfig, reformat header in .mk file.]

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in          |  1 +
 package/lockdev/Config.in  |  6 ++++++
 package/lockdev/lockdev.mk | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 package/lockdev/Config.in
 create mode 100644 package/lockdev/lockdev.mk

diff --git a/package/Config.in b/package/Config.in
index ed373def7f..5189b23eba 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -443,6 +443,7 @@ source "package/libconfuse/Config.in"
 source "package/libfuse/Config.in"
 source "package/liblockfile/Config.in"
 source "package/libsysfs/Config.in"
+source "package/lockdev/Config.in"
 endmenu
 
 menu "Graphics"
diff --git a/package/lockdev/Config.in b/package/lockdev/Config.in
new file mode 100644
index 0000000000..4b386f4ab0
--- /dev/null
+++ b/package/lockdev/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LOCKDEV
+	bool "lockdev"
+	help
+	  Library for locking devices.
+
+	  No upstream site, primary site is Debian.
diff --git a/package/lockdev/lockdev.mk b/package/lockdev/lockdev.mk
new file mode 100644
index 0000000000..004b637b69
--- /dev/null
+++ b/package/lockdev/lockdev.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# lockdev
+#
+################################################################################
+
+LOCKDEV_VERSION = 1.0.3
+LOCKDEV_SOURCE = lockdev_$(LOCKDEV_VERSION).orig.tar.gz
+LOCKDEV_SITE = http://snapshot.debian.org/archive/debian/20130508T154517Z/pool/main/l/lockdev/
+LOCKDEV_LICENSE = LGPLv2.1
+LOCKDEV_LICENSE_FILES = LICENSE
+LOCKDEV_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define LOCKDEV_BUILD_CMDS
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) static
+endef
+
+define LOCKDEV_INSTALL_STAGING_CMDS
+	$(MAKE1) basedir=$(STAGING_DIR)/usr -C $(@D) install_dev
+endef
+
+else # BR2_PREFER_STATIC_LIB
+
+define LOCKDEV_BUILD_CMDS
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) static shared
+endef
+
+define LOCKDEV_INSTALL_STAGING_CMDS
+	$(MAKE1) basedir=$(STAGING_DIR)/usr -C $(@D) install_dev install_run
+	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so
+	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so.1
+endef
+
+define LOCKDEV_INSTALL_TARGET_CMDS
+	$(MAKE1) basedir=$(TARGET_DIR)/usr -C $(@D) install_run
+	ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so.1
+endef
+endif # BR2_PREFER_STATIC_LIB
+
+$(eval $(generic-package))

From 50695daad6bd76f43cacf9bbaa753bcebd84a38b Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Wed, 8 May 2013 13:55:27 -0500
Subject: [PATCH 5789/6849] libcec: add libcec for HDMI device Control

This patch adds libcec for HDMI device control.  It enables Raspberry Pi
support if the rpi-userland package is installed.

[Thomas: add C++ dependency, reformat .mk header.]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in        |  1 +
 package/libcec/Config.in | 12 ++++++++++++
 package/libcec/libcec.mk | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/libcec/Config.in
 create mode 100644 package/libcec/libcec.mk

diff --git a/package/Config.in b/package/Config.in
index 5189b23eba..6dfab7bdd8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -495,6 +495,7 @@ source "package/dtc/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libatasmart/Config.in"
+source "package/libcec/Config.in"
 source "package/libraw1394/Config.in"
 source "package/tslib/Config.in"
 source "package/libfreefare/Config.in"
diff --git a/package/libcec/Config.in b/package/libcec/Config.in
new file mode 100644
index 0000000000..b1fa03b057
--- /dev/null
+++ b/package/libcec/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBCEC
+	bool "libcec"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  libcec allows you in combination with the right hardware to
+	  control your home theater devices with your TV remote
+	  control utilizing existing HDMI cabling.
+
+	  http://libcec.pulse-eight.com
+
+comment "libcec requires C++ support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
new file mode 100644
index 0000000000..49fa067dda
--- /dev/null
+++ b/package/libcec/libcec.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# libcec
+#
+################################################################################
+
+LIBCEC_VERSION = libcec-2.1.1
+LIBCEC_SITE = http://github.com/Pulse-Eight/libcec/tarball/$(LIBCEC_VERSION)
+LIBCEC_LICENSE = GPLv2+
+LIBCEC_LICENSE_FILE = COPYING
+
+# Autoreconf required due to being a dev tarball and not a release tarball.
+LIBCEC_AUTORECONF = YES
+LIBCEC_INSTALL_STAGING = YES
+LIBCEC_DEPENDENCIES = host-pkgconf
+
+ifeq ($(BR2_PACKAGE_LOCKDEV),y)
+LIBCEC_DEPENDENCIES += lockdev
+endif
+
+ifeq ($(BR2_PACKAGE_UDEV),y)
+LIBCEC_DEPENDENCIES += udev
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+LIBCEC_CONF_OPT = --enable-rpi \
+   --with-rpi-include-path=$(STAGING_DIR)/usr/include
+LIBCEC_DEPENDENCIES += rpi-userland
+else
+LIBCEC_CONF_OPT = --disable-rpi
+endif
+
+$(eval $(autotools-package))

From 89719fce718091d18a6f30b051ab0bd08e89ce89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Mon, 13 May 2013 17:15:22 +0200
Subject: [PATCH 5790/6849] strongswan: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

strongSwan is an OpenSource IPsec implementation for the Linux
operating system. It is based on the discontinued FreeS/WAN project
and the X.509 patch.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                |   1 +
 package/strongswan/Config.in     | 115 +++++++++++++++++++++++++++++++
 package/strongswan/strongswan.mk |  68 ++++++++++++++++++
 3 files changed, 184 insertions(+)
 create mode 100644 package/strongswan/Config.in
 create mode 100644 package/strongswan/strongswan.mk

diff --git a/package/Config.in b/package/Config.in
index 6dfab7bdd8..a653809bb6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -813,6 +813,7 @@ source "package/spawn-fcgi/Config.in"
 source "package/spice-protocol/Config.in"
 source "package/spice/Config.in"
 source "package/squid/Config.in"
+source "package/strongswan/Config.in"
 source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
 source "package/tcpreplay/Config.in"
diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in
new file mode 100644
index 0000000000..98f8da2195
--- /dev/null
+++ b/package/strongswan/Config.in
@@ -0,0 +1,115 @@
+menuconfig BR2_PACKAGE_STRONGSWAN
+	bool "strongswan"
+	depends on BR2_USE_MMU # fork()
+	help
+	  strongSwan is an OpenSource IPsec implementation for the
+	  Linux operating system. It is based on the discontinued
+	  FreeS/WAN project and the X.509 patch.
+
+	  The focus is on:
+	     - simplicity of configuration
+	     - strong encryption and authentication methods
+	     - powerful IPsec policies supporting large and complex VPN networks
+
+	  strongSwan provide many plugins. Only a few are presented here.
+
+	  http://www.strongswan.org/
+
+if BR2_PACKAGE_STRONGSWAN
+
+comment "kernel-netlink and socket-default options require a toolchain with IPV6 support"
+	depends on !BR2_INET_IPV6
+
+choice
+	prompt "Cryptographic backend"
+	default BR2_PACKAGE_STRONGSWAN_GMP
+
+config BR2_PACKAGE_STRONGSWAN_OPENSSL
+	bool "OpenSSL"
+	select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_STRONGSWAN_GCRYPT
+	bool "libgcrypt"
+	select BR2_PACKAGE_LIBGCRYPT
+
+config BR2_PACKAGE_STRONGSWAN_GMP
+	bool "GNU MP (libgmp)"
+	select BR2_PACKAGE_GMP
+
+endchoice
+
+config BR2_PACKAGE_STRONGSWAN_AF_ALG
+	bool "Enable AF_ALG crypto interface to Linux Crypto API"
+
+config BR2_PACKAGE_STRONGSWAN_CURL
+	bool "Enable CURL fetcher plugin to fetch files via libcurl"
+	select BR2_PACKAGE_LIBCURL
+
+config BR2_PACKAGE_STRONGSWAN_CHARON
+	bool "Enable the IKEv1/IKEv2 keying daemon charon"
+	default y
+
+if BR2_PACKAGE_STRONGSWAN_CHARON
+
+config BR2_PACKAGE_STRONGSWAN_TNCCS_11
+	bool "Enable TNCCS 1.1 protocol module"
+	select BR2_PACKAGE_LIBXML2
+
+config BR2_PACKAGE_STRONGSWAN_TNCCS_20
+	bool "Enable TNCCS 2.0 protocol module"
+
+config BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC
+	bool "Enable dynamic TNCCS protocol discovery module"
+
+config BR2_PACKAGE_STRONGSWAN_EAP
+	bool "Enable EAP protocols"
+	help
+	  Enable various EAP protocols:
+	    - mschapv2
+	    - tls
+	    - ttls
+	    - peap
+	    - sim
+	    - sim-file
+	    - aka
+	    - aka-3gpp2
+	    - simaka-sql
+	    - simaka-pseudonym
+	    - simaka-reauth
+	    - identity
+	    - md5
+	    - gtc
+	    - tnc
+	    - dynamic
+	    - radius
+
+if BR2_PACKAGE_STRONGSWAN_EAP
+
+config BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC
+	bool "Enable EAP-SIM smart card backend"
+	select BR2_PACKAGE_PCSC_LITE
+
+endif
+
+config BR2_PACKAGE_STRONGSWAN_UNITY
+	bool "Enables Cisco Unity extension plugin"
+
+config BR2_PACKAGE_STRONGSWAN_STROKE
+	bool "Enable charons stroke configuration backend"
+	default y
+
+config BR2_PACKAGE_STRONGSWAN_SQL
+	bool "Enable SQL database configuration backend"
+	depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL_CLIENT
+
+endif
+
+config BR2_PACKAGE_STRONGSWAN_TOOLS
+	bool "Enable additional utilities (openac, scepclient and pki)"
+	default y
+
+config BR2_PACKAGE_STRONGSWAN_SCRIPTS
+	bool "Enable additional utilities (found in directory scripts)"
+	default y
+
+endif
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
new file mode 100644
index 0000000000..88d6f943ef
--- /dev/null
+++ b/package/strongswan/strongswan.mk
@@ -0,0 +1,68 @@
+################################################################################
+#
+# strongswan
+#
+################################################################################
+
+STRONGSWAN_VERSION = 5.0.2
+STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
+STRONGSWAN_SITE = http://download.strongswan.org
+STRONGSWAN_LICENSE = GPLv2+
+STRONGSWAN_LICENSE_FILES = COPYING LICENSE
+STRONGSWAN_CONF_OPT +=                                                             \
+      --enable-pkcs11=yes                                                          \
+      --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no)                        \
+      --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no)                        \
+      --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no)              \
+      --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no)                \
+      --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no)                      \
+      --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no)                \
+      --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no)                    \
+      --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no)                \
+      --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no)            \
+      --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no)            \
+      --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no)  \
+      --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no)    \
+      --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no)                  \
+      --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no)                \
+      --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no)                      \
+      --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no)                  \
+      --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
+
+ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
+STRONGSWAN_CONF_OPT +=              \
+      --enable-eap-sim              \
+      --enable-eap-sim-file         \
+      --enable-eap-aka              \
+      --enable-eap-aka-3gpp2        \
+      --enable-eap-simaka-sql       \
+      --enable-eap-simaka-pseudonym \
+      --enable-eap-simaka-reauth    \
+      --enable-eap-identity         \
+      --enable-eap-md5              \
+      --enable-eap-gtc              \
+      --enable-eap-mschapv2         \
+      --enable-eap-tls              \
+      --enable-eap-ttls             \
+      --enable-eap-peap             \
+      --enable-eap-tnc              \
+      --enable-eap-dynamic          \
+      --enable-eap-radius
+STRONGSWAN_DEPENDENCIES += gmp
+endif
+
+STRONGSWAN_DEPENDENCIES +=                               \
+      $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl)    \
+      $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt)   \
+      $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp)            \
+      $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl)       \
+      $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2)   \
+      $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
+
+ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
+STRONGSWAN_DEPENDENCIES +=                               \
+      $(if $(BR2_PACKAGE_SQLITE),sqlite)                 \
+      $(if $(BR2_PACKAGE_MYSQL_CLIENT),mysql_client)
+endif
+
+$(eval $(autotools-package))

From 2b0b5859b782e7a17fe1d86d77e33783156d70f0 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Tue, 30 Jul 2013 11:37:13 +0200
Subject: [PATCH 5791/6849] gdb: Add support for ARC-specific gdb

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gdb/Config.in.host | 2 ++
 package/gdb/gdb.mk         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index a791f09e50..128aed9e6c 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -15,6 +15,7 @@ if BR2_PACKAGE_HOST_GDB
 
 choice
 	prompt "GDB debugger Version"
+	depends on !BR2_arc
 	default BR2_GDB_VERSION_6_6 if BR2_bfin
 	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
 	default BR2_GDB_VERSION_7_5
@@ -57,5 +58,6 @@ config BR2_GDB_VERSION
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
 	default "7.4.1"    if BR2_GDB_VERSION_7_4
 	default "7.5.1"    if BR2_GDB_VERSION_7_5
+	default "7.5.1-arc" if BR2_arc
 
 endif
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index fbb2fae56d..9cf90e32bb 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -21,6 +21,10 @@ GDB_VERSION = 7.5.1
 endif
 endif
 
+ifeq ($(BR2_arc),y)
+GDB_SITE = $(BR2_ARC_SITE)
+endif
+
 ifeq ($(GDB_VERSION),6.7.1-avr32-2.1.5)
 GDB_SITE = ftp://www.at91.com/pub/buildroot/
 endif

From dc2a13a2aa30b0fd9006c2a7c2103f5af2bf00a7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 29 Jul 2013 18:44:17 +0200
Subject: [PATCH 5792/6849] package/libedit: switch to alternate URL for proper
 packaging

Upstream libedit does not have a proper homepage, and does not provide
any sort of packaging whatsoever. So far, we used Debian's wayback
machine to get a tarball of a rather oldish libedit.

As Thomas pointed out, someone has been maintaining a proper autotools
based, up-to-date package for a while.

While Debian is stuck to 2.11 (5 years old now), we bump to 3.1 as a bonus.

Remove our libedit.pc, it's now bundled with the package.

Reported-by: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libedit/Config.in                     | 11 ++-
 ...it-000-check-bsd-functions-in-libbsd.patch | 18 ++++
 package/libedit/libedit.mk                    | 90 +++++--------------
 package/libedit/libedit.pc                    | 13 ---
 4 files changed, 45 insertions(+), 87 deletions(-)
 create mode 100644 package/libedit/libedit-000-check-bsd-functions-in-libbsd.patch
 delete mode 100644 package/libedit/libedit.pc

diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index 7a515db346..4747a38ae0 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -1,15 +1,14 @@
 config BR2_PACKAGE_LIBEDIT
 	bool "libedit"
-	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )  # libbsd
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd
-	select BR2_PACKAGE_LIBBSD
 	select BR2_PACKAGE_NCURSES
 	help
 	  The editline library (from BSD) provides generic line editing
 	  and history functions. It slightly resembles GNU readline.
 
+	  The official homepage is at:
 	  http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/
 
-comment "libedit requires a toolchain with thread support"
-	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 ) # libbsd
-	depends on !BR2_TOOLCHAIN_HAS_THREADS # libbsd
+	  Jess Thrysoee maintains an autotoolified packaged, which we use
+	  in Buildroot as it makes it much simpler than using the upstream
+	  sources which require pmake:
+	  http://www.thrysoee.dk/editline/
diff --git a/package/libedit/libedit-000-check-bsd-functions-in-libbsd.patch b/package/libedit/libedit-000-check-bsd-functions-in-libbsd.patch
new file mode 100644
index 0000000000..21c57f8f11
--- /dev/null
+++ b/package/libedit/libedit-000-check-bsd-functions-in-libbsd.patch
@@ -0,0 +1,18 @@
+configure: on Linux, the BSD functions require linking against libbsd
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure.ac
+--- libedit-20130712-3.1.orig/configure.ac	2013-07-12 20:39:22.000000000 +0200
++++ libedit-20130712-3.1/configure.ac	2013-07-28 23:35:35.012676469 +0200
+@@ -108,6 +108,10 @@
+ #AC_FUNC_REALLOC
+ AC_TYPE_SIGNAL
+ AC_FUNC_STAT
++
++# Search for libbsd for *vis functions
++AC_CHECK_LIB([bsd], [vis])
++
+ AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat fgetln vis strvis strunvis __secure_getenv secure_getenv])
+ 
+ # strlcpy
diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
index c344b73a57..6769fdc2a8 100644
--- a/package/libedit/libedit.mk
+++ b/package/libedit/libedit.mk
@@ -4,72 +4,26 @@
 #
 ################################################################################
 
-# Note: libedit does not have a regular homepage, and it seems
-# there is no place where to download a tarball from. That's
-# why we use the Debian way-back machine.
-LIBEDIT_VERSION_MAJOR   = 2
-LIBEDIT_VERSION_MINOR   = 11
-LIBEDIT_VERSION_EXTRA   = -20080614
-LIBEDIT_VERSION         = $(LIBEDIT_VERSION_MAJOR).$(LIBEDIT_VERSION_MINOR)
-LIBEDIT_SOURCE          = libedit_$(LIBEDIT_VERSION)$(LIBEDIT_VERSION_EXTRA).orig.tar.bz2
-LIBEDIT_SITE            = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/libe/libedit
-LIBEDIT_SUBDIR          = libedit
-LIBEDIT_PATCH           = libedit_2.11-20080614-5.debian.tar.bz2
+LIBEDIT_VERSION         = 20130712-3.1
+LIBEDIT_SITE            = http://www.thrysoee.dk/editline/
 LIBEDIT_INSTALL_STAGING = YES
-LIBEDIT_DEPENDENCIES    = host-pmake libbsd ncurses
-
-define LIBEDIT_POST_PATCH_PERMISSIONS
-	chmod +x $(@D)/libedit/makelist
-endef
-
-LIBEDIT_POST_PATCH_HOOKS += LIBEDIT_POST_PATCH_PERMISSIONS
-
-define LIBEDIT_FIX_VIS_H_INCLUDE
-	$(SED) 's,^#include <vis\.h>$$,#include <bsd/vis\.h>,;' \
-	       $(@D)/libedit/filecomplete.c                     \
-	       $(@D)/libedit/history.c                          \
-	       $(@D)/libedit/readline.c
-endef
-LIBEDIT_POST_PATCH_HOOKS += LIBEDIT_FIX_VIS_H_INCLUDE
-
-LIBEDIT_PMAKE_OPTS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= NOGCCERROR=1         \
-                      SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${LIBEDIT_VERSION_MAJOR}"  \
-
-define LIBEDIT_BUILD_CMDS
-	cd $(@D)/$(LIBEDIT_SUBDIR); \
-	$(TARGET_CONFIGURE_OPTS) LDADD="-lbsd -lcurses" pmake $(LIBEDIT_PMAKE_OPTS)
-endef
-
-LIBEDIT_MAN_LINKS = el_init el_end el_reset el_gets el_getc el_push el_parse   \
-                     el_set el_get el_source el_resize el_line el_insertstr     \
-                     el_deletestr history_init history_end history
-
-# $1: DESTDIR to install into
-# Can't use pmake to install, it wants to be root. sigh... :-(
-# We need to create the .so links, otherwise we can't link; and waiting for
-# ldconfig is too late as it's done just before building the images.
-define LIBEDIT_INSTALL_CMDS
-	$(INSTALL) -D -m 0644 package/libedit/libedit.pc $(1)/usr/lib/pkgconfig/libedit.pc
-	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.a $(1)/usr/lib/libedit.a
-	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit_pic.a $(1)/usr/lib/libedit_pic.a
-	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.so.2.11 $(1)/usr/lib/libedit.so.2.11
-	$(INSTALL) -D -m 0644 $(@D)/libedit/histedit.h $(1)/usr/include/histedit.h
-	ln -sf libedit.so.$(LIBEDIT_VERSION) $(1)/usr/lib/libedit.so.$(LIBEDIT_VERSION_MAJOR)
-	ln -sf libedit.so.$(LIBEDIT_VERSION_MAJOR) $(1)/usr/lib/libedit.so
-	$(INSTALL) -D -m 0644 $(@D)/libedit/readline/readline.h $(1)/usr/include/editline/readline.h
-	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editline.3 $(1)/usr/share/man/man3/editline.3el
-	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editrc.5 $(1)/usr/share/man/man5/editrc.5el
-	for lnk in $(LIBEDIT_MAN_LINKS); do                            \
-	    ln -sfv editline.3el $(1)/usr/share/man/man3/$${lnk}.3el;   \
-	done
-endef
-
-define LIBEDIT_INSTALL_STAGING_CMDS
-	$(call LIBEDIT_INSTALL_CMDS,$(STAGING_DIR))
-endef
-
-define LIBEDIT_INSTALL_TARGET_CMDS
-	$(call LIBEDIT_INSTALL_CMDS,$(TARGET_DIR))
-endef
-
-$(eval $(generic-package))
+LIBEDIT_DEPENDENCIES    = ncurses
+
+# We're patching configure.ac
+LIBEDIT_AUTORECONF      = YES
+
+# Note: libbsd required for *vis functions, but works only with a toolchain
+# with __progname; otherwise, some features are disabled, as if libbsd was
+# missing entirely.
+ifeq ($(BR2_PACKAGE_LIBBSD),y)
+LIBEDIT_DEPENDENCIES   += libbsd
+endif
+
+# Wide-char support is not autodetected by configure, we have to help a bit.
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_WCHAR),y)
+LIBEDIT_CONF_OPT       += --enable-widec
+else
+LIBEDIT_CONF_OPT       += --disable-widec
+endif
+
+$(eval $(autotools-package))
diff --git a/package/libedit/libedit.pc b/package/libedit/libedit.pc
deleted file mode 100644
index 47ac871bc1..0000000000
--- a/package/libedit/libedit.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libedit
-Description: Not just a replacement library for libreadline and libhistory.
-Version: 2.11
-Requires: libbsd ncurses
-Requires.private:
-Libs: -L${libdir} -ledit
-Libs.private:
-Cflags: -I${includedir}

From ccb9d44e02708689a690ed91fb520bac36079bfb Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 30 Jul 2013 19:24:59 +0200
Subject: [PATCH 5793/6849] package/pmake: remove

Packaging pmake was required when we used the upstream libedit.
Since we have switched to using the autotools-based libedit,
pmake is no longer needed.

Because pmake is quite ugly, let's just drop it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pmake/pmake.mk | 47 ------------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 package/pmake/pmake.mk

diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk
deleted file mode 100644
index 83ee12ec57..0000000000
--- a/package/pmake/pmake.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-################################################################################
-#
-# pmake
-#
-################################################################################
-
-PMAKE_VERSION       = 1.111
-PMAKE_SOURCE        = pmake_$(PMAKE_VERSION).orig.tar.gz
-PMAKE_SITE          = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/p/pmake
-PMAKE_LICENSE       = BSD-3c BSD-4c
-# No license file. License texts are spread in the boilerplates
-# of each individual source files; some are BSD-3c, some BSD-4c.
-
-# Vampirise patches from Debian
-PMAKE_PATCH = pmake_1.111-3.2.debian.tar.gz
-
-# CFLAGS vampirised from Debian's rules, adapted to buildroot variables
-HOST_PMAKE_CFLAGS = -O2 -g -Wall -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I.    \
-                -DMACHINE=\\\"buildroot\\\"                                 \
-                -DMACHINE_ARCH=\\\"$(ARCH)\\\" -DMACHINE_MULTIARCH=\\\"\\\" \
-                -DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_STRFTIME \
-                -DHAVE_VSNPRINTF -D_GNU_SOURCE -Wno-unused
-
-define HOST_PMAKE_BUILD_CMDS
-	$(MAKE) -C $(@D) -f Makefile.boot CFLAGS="$(HOST_PMAKE_CFLAGS)"
-endef
-
-# The generated file is named bmake, but we want pmake; but:
-#  - pmake uses support files (in  mk/)
-#  - it's not possible to tell pmake, at build-time, where to expect
-#    these support files, and pmake expects them in /usr/share/mk/
-#  - but pmake has an option to override that search path at runtime
-#  - so we install bmake as bmake
-#  - and we install a wrapper named pmake that calls pmake with the
-#    appropriate search path
-define HOST_PMAKE_INSTALL_CMDS
-	$(INSTALL) -m 0755 $(@D)/bmake $(HOST_DIR)/usr/bin/bmake
-	$(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/pmake/mk
-	for mk in $(@D)/mk/*; do                                        \
-	    $(INSTALL) -m 0644 $${mk} $(HOST_DIR)/usr/share/pmake/mk;   \
-	done
-	printf '#!/bin/bash\nexec -a "$${0}" $${0%%/*}/bmake -m $${0%%/*}/../../usr/share/pmake/mk "$$@"\n'  \
-	       >$(HOST_DIR)/usr/bin/pmake
-	chmod 0755 $(HOST_DIR)/usr/bin/pmake
-endef
-
-$(eval $(host-generic-package))

From b70b927391071f835433e802b269259fa3652269 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 30 Jul 2013 18:33:01 +0200
Subject: [PATCH 5794/6849] libfuse: remove unused configure options

Current versions of libfuse do not recognize configure options
--disable-nls and --disable-kernel-module. Remove them.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libfuse/libfuse.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 6057077837..84ca9221e0 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -11,9 +11,8 @@ LIBFUSE_LICENSE = GPLv2 LGPLv2.1
 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBFUSE_CONF_OPT = --disable-nls \
+LIBFUSE_CONF_OPT = \
 		--disable-example \
-		--disable-kernel-module \
 		--enable-lib \
 		--enable-util
 

From 2b3673e66d9b91ba8bc7e8596c1673cf603c6339 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 30 Jul 2013 09:08:58 -0300
Subject: [PATCH 5795/6849] gnutls: bump to version 3.2.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 6562d8e732..86cc833eec 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUTLS_VERSION = 3.2.2
+GNUTLS_VERSION = 3.2.3
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+

From e51810d8b0a02ea9c3df06ce8e469bc2f45b874e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Jul 2013 16:21:49 -0300
Subject: [PATCH 5796/6849] linux-headers: bump 3.{0, 4, 10}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...aders_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                        | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename package/linux-headers/{3.0.87 => 3.0.88}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.87/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.88/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.87/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.88/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 7a61b55ecf..4380e2d291 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.87"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.88"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.49"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.54"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.55"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.3"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.4"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 365f06fb50a9cdb93d9092b490dc2de3ae9af0d7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Jul 2013 16:21:50 -0300
Subject: [PATCH 5797/6849] linux: bump 3.10.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index dee91e79e3..db5e795f74 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.3"
+	bool "3.10.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.3" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.4" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 309290e1fa299355fbfc0265aed7536b028a6c5a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 29 Jul 2013 16:21:51 -0300
Subject: [PATCH 5798/6849] configs/qemu: bump relevant config versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/qemu/arm-nuri/readme.txt             | 2 +-
 board/qemu/arm-versatile/readme.txt        | 2 +-
 board/qemu/arm-vexpress/readme.txt         | 2 +-
 board/qemu/microblazebe-mmu/readme.txt     | 2 +-
 board/qemu/microblazeel-mmu/readme.txt     | 2 +-
 board/qemu/mips-malta/readme.txt           | 2 +-
 board/qemu/mips64-malta/readme.txt         | 2 +-
 board/qemu/mipsel-malta/readme.txt         | 2 +-
 board/qemu/powerpc-g3beige/readme.txt      | 2 +-
 board/qemu/powerpc-mpc8544ds/readme.txt    | 2 +-
 board/qemu/powerpc-virtex-ml507/readme.txt | 2 +-
 board/qemu/sh4-r2d/readme.txt              | 2 +-
 board/qemu/sparc-ss10/readme.txt           | 2 +-
 board/qemu/x86/readme.txt                  | 2 +-
 board/qemu/x86_64/readme.txt               | 2 +-
 configs/qemu_arm_nuri_defconfig            | 4 ++--
 configs/qemu_arm_versatile_defconfig       | 4 ++--
 configs/qemu_arm_vexpress_defconfig        | 4 ++--
 configs/qemu_microblazebe_mmu_defconfig    | 2 +-
 configs/qemu_microblazeel_mmu_defconfig    | 2 +-
 configs/qemu_mips64_malta_defconfig        | 4 ++--
 configs/qemu_mips_malta_defconfig          | 4 ++--
 configs/qemu_mipsel_malta_defconfig        | 4 ++--
 configs/qemu_ppc_g3beige_defconfig         | 4 ++--
 configs/qemu_ppc_mpc8544ds_defconfig       | 4 ++--
 configs/qemu_ppc_virtex_ml507_defconfig    | 4 ++--
 configs/qemu_sh4_r2d_defconfig             | 4 ++--
 configs/qemu_x86_64_defconfig              | 4 ++--
 configs/qemu_x86_defconfig                 | 4 ++--
 29 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
index 6d7685164f..0c64492dab 100644
--- a/board/qemu/arm-nuri/readme.txt
+++ b/board/qemu/arm-nuri/readme.txt
@@ -7,4 +7,4 @@ graphical window is the framebuffer.
 
 Startup time is slow because of the SMP CPU emulation so be patient.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 31972fa7f3..e734d5602b 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index 82898e12b8..bde90ef4e8 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 20f1b70101..7d172d1870 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index c8532452b1..9728a45ddf 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index a7709a8f78..ccdcc841e0 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 923ead53dc..73617227a3 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index fd2c1a4b8a..52d424d01b 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index ae7b5e3956..b5c73a4d0e 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index 3ee7bc5ce5..dfe1ac2591 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index cbee8ae411..f4bc5d5519 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 4a95d042c6..34f4857e11 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index b177c44595..8f4b5bec76 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index b228b412bb..7bc3a1c317 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index f5a3a127b8..b6f4659a6c 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.4.2
+Tested with QEMU 1.5.2
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 1e435a6211..ce6f72d91e 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 9d5d6fb2ce..3a965ccc4c 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.10.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 2cc6db95f1..674fb72dee 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index d3bbdc6210..d30678ca3a 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.10.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 05c91e82e1..7cbbc7c4ea 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.10.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 314d968c92..7dd9e1cb30 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index c98473a981..5df3f5a370 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 88377b3721..d568f3e424 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index cf77eed1fc..00e4000d45 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index b6a2d0d45f..d30c6b9216 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index f5d50baa26..0a3f5a1994 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -8,7 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 7fc649b217..9293859828 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -12,7 +12,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.2 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.2.47"
+BR2_DEFAULT_KERNEL_VERSION="3.2.49"
 
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
@@ -21,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.47"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.49"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index c2d56ab847..67b40a5a4f 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -11,11 +11,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.10.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index d7731c697b..c19a51615c 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -12,11 +12,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10"
+BR2_DEFAULT_KERNEL_VERSION="3.10.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.10.config"

From 1c834dd1ce5d8b6eedb36126c878dd3f9dbbdb55 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 3 Jul 2013 12:00:27 +0100
Subject: [PATCH 5799/6849] uClibc: Add uClibc patch to fix MIPS64/n64
 interpreter

uClibc picks the wrong interpreter for MIPS64/n64.
This patch fixes this problem by checking the selected
MIPS ABI instead of the MIPS variant.

This patch was sent upstream:
http://lists.uclibc.org/pipermail/uclibc/2013-July/047838.html

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../uClibc/uClibc-0.9.33.2-mips64n64.patch    | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch b/toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch
new file mode 100644
index 0000000000..6eb3ab94ea
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch
@@ -0,0 +1,52 @@
+From b598215c00a1f9df5d47ce2a730399787351b782 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Mon, 1 Jul 2013 09:59:40 +0100
+Subject: [PATCH uClibc] Rules.mak: MIPS64: Select correct interpreter
+
+gcc (eg 4.7.3) hardcodes the MIPS64 interpreters like this:
+(see gcc/config/linux.h and gcc/config/mips/linux64.h)
+
+o32: UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+n32: UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+n64: UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+
+The existing check for MIPS64 in uClibc is wrong because it does
+not respect the selected ABI
+
+We fix this by explicitely checking the selected ABI instead of the
+selected MIPS variant.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+---
+ Rules.mak | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/Rules.mak b/Rules.mak
+index 792b794..87eb5ae 100644
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -138,13 +138,17 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL
+ LIBC := libc
+ SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
+ UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
+-ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
+-UCLIBC_LDSO_NAME := ld64-uClibc
+-ARCH_NATIVE_BIT := 64
+-else
++
+ UCLIBC_LDSO_NAME := ld-uClibc
+ ARCH_NATIVE_BIT := 32
++ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
++UCLIBC_LDSO_NAME := ld64-uClibc
++ARCH_NATIVE_BIT := 64
++else ifeq ($(CONFIG_MIPS_N64_ABI),y)
++UCLIBC_LDSO_NAME := ld64-uClibc
++ARCH_NATIVE_BIT := 64
+ endif
++
+ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION)
+ NONSHARED_LIBNAME := uclibc_nonshared.a
+ libc := $(top_builddir)lib/$(SHARED_LIBNAME)
+-- 
+1.8.2.1
+

From da8860e4da533bbe3d684354b37174adb0e23b98 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 15:35:55 +0100
Subject: [PATCH 5800/6849] util-linux: only needs gettext if locale is
 selected

Also add missing select in Config.in.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/util-linux/Config.in     | 1 +
 package/util-linux/util-linux.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 799833e9b9..e63814f716 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_UTIL_LINUX
 	bool "util-linux"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Various useful/essential linux libraries and utilities.
 
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index d8a4e6f3f0..c6c8467eef 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -35,7 +35,7 @@ else
 UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 UTIL_LINUX_DEPENDENCIES += gettext
 UTIL_LINUX_MAKE_OPT += LIBS=-lintl
 endif

From cdc2420b4c332a0d69b8198c756bb054386c912a Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 15:36:00 +0100
Subject: [PATCH 5801/6849] lshw: fix build with no LOCALE support

lshw doesn't need libintl if -DNONLS is defined.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/lshw/Config.in |  2 +-
 package/lshw/lshw.mk   | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/lshw/Config.in b/package/lshw/Config.in
index 98beacd797..afefa6c467 100644
--- a/package/lshw/Config.in
+++ b/package/lshw/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LSHW
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  lshw (Hardware Lister) is a small tool to provide
 	  detailed information on the hardware configuration of the machine.
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 71f52a5812..cc003473ea 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -6,10 +6,16 @@
 
 LSHW_VERSION = B.02.16
 LSHW_SITE = http://ezix.org/software/files
+
+LSHW_CFLAGS = $(TARGET_CFLAGS)
+ifeq ($(BR2_ENABLE_LOCALE),)
+LSHW_CFLAGS += -DNONLS
+endif
+
 LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
-	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
-LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)"
-LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext)
+	RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
+LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 define LSHW_BUILD_CMDS
 	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)

From 0c2de8da28b859d0ace26743095fb73ae1a94940 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 15:36:05 +0100
Subject: [PATCH 5802/6849] avahi: remove double dependency on gettext

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/avahi/avahi.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 028f3aeee4..eb76d795f9 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -135,10 +135,7 @@ else
 AVAHI_CONF_OPT += --disable-python
 endif
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-AVAHI_DEPENDENCIES += gettext
-AVAHI_MAKE_OPT = LIBS=-lintl
-endif
+AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 define AVAHI_REMOVE_INITSCRIPT
 	rm -rf $(TARGET_DIR)/etc/init.d/avahi-*

From 3cb28e173ca15a7ae9e7b741464f6e3e6936165f Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 15:36:10 +0100
Subject: [PATCH 5803/6849] pulseaudio: remove dependency on gettext

The dependency on gettext is only due to libglib2, not due to
pulseaudio itself.  It works fine without gettext if libglib2 is
not selected.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/pulseaudio/Config.in     | 1 -
 package/multimedia/pulseaudio/pulseaudio.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index 9a6911e0ed..bd0ec5f201 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_PULSEAUDIO
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_LIBSNDFILE
 	select BR2_PACKAGE_SPEEX
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_LARGEFILE
 	help
 	  PulseAudio is a sound system for POSIX OSes, meaning that it
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index b90017420c..910e4a7fe8 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -18,7 +18,6 @@ PULSEAUDIO_CONF_OPT = \
 
 PULSEAUDIO_DEPENDENCIES = \
 	host-pkgconf libtool json-c libsndfile speex host-intltool \
-	$(if $(BR2_NEEDS_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
 	$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \

From de1932aaff2d0662b268a4ad71905f987155f0bf Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 15:36:16 +0100
Subject: [PATCH 5804/6849] gdk-pixbuf: remove dependency on gettext

The dependency on gettext comes from libglib2, not from gdk-pixbuf
itself.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gdk-pixbuf/Config.in     | 1 -
 package/gdk-pixbuf/gdk-pixbuf.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 05de93416f..aaabae179f 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Gdk-Pixbuf is an image loader and scaler. It uses GObject
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 87775bba1a..8bfb35ddda 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -42,7 +42,6 @@ GDK_PIXBUF_DEPENDENCIES += xlib_libX11
 endif
 
 GDK_PIXBUF_DEPENDENCIES += \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
 	host-pkgconf libglib2
 

From 09704e7ee8a6e49d68359df7b4ebffb4d7819965 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 1 Nov 2012 15:36:21 +0100
Subject: [PATCH 5805/6849] libsoup: Remove redundant dependency on gettext

libsoup doesn't use intl stuff directly, but uses gi18n.  libglib2
already has all required dependencies on gettext.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libsoup/Config.in  | 1 -
 package/libsoup/libsoup.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index b80cb6384e..7116b71de9 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBSOUP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_SQLITE
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 252214fbe5..d57960c274 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,7 +19,7 @@ endif
 
 LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf host-libglib2 \
+LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
        libglib2 libxml2 sqlite host-intltool
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)

From 43cea81de39dc21b8f1d559b59f6842e365c02ff Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 15 Apr 2013 08:35:03 +0100
Subject: [PATCH 5806/6849] mobile-broadband-provider-info: add license
 information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../mobile_broadband_provider_info.mk                           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
index 77f8cbaa5d..431e172470 100644
--- a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
+++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk
@@ -7,6 +7,8 @@
 MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20120614
 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
 MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz
+MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain
+MOBILE_BROADBAND_PROVIDER_INFO_LICENSE_FILES = COPYING
 MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
 MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf
 

From 266d50245af003e316d5a74a1b0362bcc2c06be0 Mon Sep 17 00:00:00 2001
From: Philipp Claves <claves@budelmann-elektronik.com>
Date: Fri, 1 Mar 2013 14:38:27 +0100
Subject: [PATCH 5807/6849] libassuan: new package

[Thomas: bump version, adjust license informations, add
--with-gpg-error-prefix option.]

Signed-off-by: Philipp Claves <claves@budelmann-elektronik.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in              |  1 +
 package/libassuan/Config.in    | 12 ++++++++++++
 package/libassuan/libassuan.mk | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/libassuan/Config.in
 create mode 100644 package/libassuan/libassuan.mk

diff --git a/package/Config.in b/package/Config.in
index a653809bb6..b6d6020ffd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -418,6 +418,7 @@ source "package/cryptodev/Config.in"
 source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/libassuan/Config.in"
 source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
diff --git a/package/libassuan/Config.in b/package/libassuan/Config.in
new file mode 100644
index 0000000000..e97ebdcdde
--- /dev/null
+++ b/package/libassuan/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBASSUAN
+	bool "libassuan"
+	select BR2_PACKAGE_LIBGPG_ERROR
+	help
+	  Libassuan is a small library implementing the so-called
+	  Assuan protocol.
+
+	  This protocol is used for IPC between most newer GnuPG
+	  components.  Both, server and client side functions are
+	  provided.
+
+	  http://www.gnupg.org/related_software/libassuan/
diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
new file mode 100644
index 0000000000..6d4f7e5e8d
--- /dev/null
+++ b/package/libassuan/libassuan.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libassuan
+#
+################################################################################
+
+LIBASSUAN_VERSION = 2.1.1
+LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan/
+LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
+LIBASSUAN_LICENSE = LGPLv2.1+
+LIBASSUAN_LICENSE_FILES = COPYING.LIB
+LIBASSUAN_INSTALL_STAGING = YES
+LIBASSUAN_DEPENDENCIES = libgpg-error
+LIBASSUAN_CONF_OPT = \
+	--with-gpg-error-prefix=$(STAGING_DIR)/usr
+
+$(eval $(autotools-package))

From fc8b560d8a6948553aa6396b8f0b784809b2df3d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Jul 2013 13:48:17 +0200
Subject: [PATCH 5808/6849] merge assuan

---
 package/libassuan/libassuan.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
index 6d4f7e5e8d..5f5378b54b 100644
--- a/package/libassuan/libassuan.mk
+++ b/package/libassuan/libassuan.mk
@@ -7,8 +7,8 @@
 LIBASSUAN_VERSION = 2.1.1
 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan/
 LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
-LIBASSUAN_LICENSE = LGPLv2.1+
-LIBASSUAN_LICENSE_FILES = COPYING.LIB
+LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPLv3 (tests, doc)
+LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
 LIBASSUAN_INSTALL_STAGING = YES
 LIBASSUAN_DEPENDENCIES = libgpg-error
 LIBASSUAN_CONF_OPT = \

From 61861a2ffbcc04bc641d0e42c659bcc810eee226 Mon Sep 17 00:00:00 2001
From: Philipp Claves <claves@budelmann-elektronik.com>
Date: Fri, 1 Mar 2013 14:38:28 +0100
Subject: [PATCH 5809/6849] libgpgme: new package

[Thomas: bump version, add --with-gpg-error-prefix and
--with-libassuan-prefix options.]

Signed-off-by: Philipp Claves <claves@budelmann-elektronik.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in            |  1 +
 package/libgpgme/Config.in   | 11 +++++++++++
 package/libgpgme/libgpgme.mk | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/libgpgme/Config.in
 create mode 100644 package/libgpgme/libgpgme.mk

diff --git a/package/Config.in b/package/Config.in
index b6d6020ffd..61716937f7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -418,6 +418,7 @@ source "package/cryptodev/Config.in"
 source "package/gnutls/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/libgpgme/Config.in"
 source "package/libassuan/Config.in"
 source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in
new file mode 100644
index 0000000000..f97a3fe892
--- /dev/null
+++ b/package/libgpgme/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBGPGME
+	bool "libgpgme"
+	#gnupg is not needed to build, but at runtime.
+	select BR2_PACKAGE_GNUPG
+	select BR2_PACKAGE_LIBGPG_ERROR
+	select BR2_PACKAGE_LIBASSUAN
+	help
+	  GnuPG Made Easy (GPGME) is a library designed to make access
+	  to GnuPG easier for applications.
+
+	  http://www.gnupg.org/related_software/gpgme/
diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk
new file mode 100644
index 0000000000..ee983df0f2
--- /dev/null
+++ b/package/libgpgme/libgpgme.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# libgpgme
+#
+################################################################################
+
+LIBGPGME_VERSION = 1.4.2
+LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme/
+LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2
+LIBGPGME_LICENSE = LGPLv2.1+
+LIBGPGME_LICENSE_FILES = COPYING.LESSER
+LIBGPGME_INSTALL_STAGING = YES
+
+# libgpgme, needs to know the gpg binary path on the target.
+LIBGPGME_CONF_OPT = --with-gpg=/usr/bin/gpg \
+	--with-gpg-error-prefix=$(STAGING_DIR)/usr \
+	--with-libassuan-prefix=$(STAGING_DIR)/usr \
+	--without-gpgsm \
+	--without-gpgconf \
+	--without-g13
+LIBGPGME_DEPENDENCIES = libassuan libgpg-error
+
+$(eval $(autotools-package))

From d31db334c3ad219c5a55aece8602880c7eb732ef Mon Sep 17 00:00:00 2001
From: Philipp Claves <claves@budelmann-elektronik.com>
Date: Fri, 1 Mar 2013 14:38:29 +0100
Subject: [PATCH 5810/6849] opkg: Add gnupg signature checking support.

[Thomas: add ac_cv_path_GPGME_CONFIG in the configure environment to
help opkg find libgpgme.]

Signed-off-by: Philipp Claves <claves@budelmann-elektronik.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/opkg/Config.in | 10 ++++++++++
 package/opkg/opkg.mk   | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package/opkg/Config.in b/package/opkg/Config.in
index eb997a7d4b..5906210e86 100644
--- a/package/opkg/Config.in
+++ b/package/opkg/Config.in
@@ -11,3 +11,13 @@ config BR2_PACKAGE_OPKG
 
 	  http://code.google.com/p/opkg/
 
+if BR2_PACKAGE_OPKG
+
+config BR2_PACKAGE_OPKG_GPG_SIGN
+	bool "gnupg support"
+	select BR2_PACKAGE_LIBGPGME
+	help
+	  Enable opkg package signature checking support using
+	  gnupg/libgpgme.
+
+endif
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index 9e1c623754..5846433caa 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -9,7 +9,7 @@ OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
 OPKG_SITE = http://opkg.googlecode.com/svn/trunk/
 OPKG_SITE_METHOD = svn
 OPKG_INSTALL_STAGING = YES
-OPKG_CONF_OPT = --disable-curl --disable-gpg
+OPKG_CONF_OPT = --disable-curl
 OPKG_AUTORECONF = YES
 # Uses PKG_CHECK_MODULES() in configure.ac
 OPKG_DEPENDENCIES = host-pkgconf
@@ -19,6 +19,14 @@ define OPKG_CREATE_LOCKDIR
 	mkdir -p $(TARGET_DIR)/usr/lib/opkg
 endef
 
+ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y)
+OPKG_CONF_OPT += --enable-gpg
+OPKG_CONF_ENV = ac_cv_path_GPGME_CONFIG=$(STAGING_DIR)/usr/bin/gpgme-config
+OPKG_DEPENDENCIES += libgpgme
+else
+OPKG_CONF_OPT += --disable-gpg
+endif
+
 OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
 
 $(eval $(autotools-package))

From 0f3a6bf8c4b4488764fe19fc9ba84834a9508d64 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 31 Jul 2013 14:10:34 +0200
Subject: [PATCH 5811/6849] Revert "uClibc: Add uClibc patch to fix MIPS64/n64
 interpreter"

This reverts commit 1c834dd1ce5d8b6eedb36126c878dd3f9dbbdb55.

This patch has been mistakenly applied, while a new version of it had
already been merged. Thanks Gustavo for noticing.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../uClibc/uClibc-0.9.33.2-mips64n64.patch    | 52 -------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch b/toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch
deleted file mode 100644
index 6eb3ab94ea..0000000000
--- a/toolchain/uClibc/uClibc-0.9.33.2-mips64n64.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b598215c00a1f9df5d47ce2a730399787351b782 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <markos.chandras@imgtec.com>
-Date: Mon, 1 Jul 2013 09:59:40 +0100
-Subject: [PATCH uClibc] Rules.mak: MIPS64: Select correct interpreter
-
-gcc (eg 4.7.3) hardcodes the MIPS64 interpreters like this:
-(see gcc/config/linux.h and gcc/config/mips/linux64.h)
-
-o32: UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-n32: UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-n64: UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-
-The existing check for MIPS64 in uClibc is wrong because it does
-not respect the selected ABI
-
-We fix this by explicitely checking the selected ABI instead of the
-selected MIPS variant.
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
----
- Rules.mak | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/Rules.mak b/Rules.mak
-index 792b794..87eb5ae 100644
---- a/Rules.mak
-+++ b/Rules.mak
-@@ -138,13 +138,17 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL
- LIBC := libc
- SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
- UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
--ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
--UCLIBC_LDSO_NAME := ld64-uClibc
--ARCH_NATIVE_BIT := 64
--else
-+
- UCLIBC_LDSO_NAME := ld-uClibc
- ARCH_NATIVE_BIT := 32
-+ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
-+UCLIBC_LDSO_NAME := ld64-uClibc
-+ARCH_NATIVE_BIT := 64
-+else ifeq ($(CONFIG_MIPS_N64_ABI),y)
-+UCLIBC_LDSO_NAME := ld64-uClibc
-+ARCH_NATIVE_BIT := 64
- endif
-+
- UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION)
- NONSHARED_LIBNAME := uclibc_nonshared.a
- libc := $(top_builddir)lib/$(SHARED_LIBNAME)
--- 
-1.8.2.1
-

From 5adb0f46a26099dbbbf4d9904d391962f5de8f85 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 08:06:36 -0300
Subject: [PATCH 5812/6849] u-boot: remove stale patches and bump to 2013.07

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/uboot/Config.in                          |   4 +-
 ...2-change-kernel-address-in-dataflash.patch | 195 ------------------
 ...4-change-kernel-address-in-dataflash.patch | 195 ------------------
 3 files changed, 2 insertions(+), 392 deletions(-)
 delete mode 100644 boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
 delete mode 100644 boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 2e37856d56..1b98339582 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -18,7 +18,7 @@ choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2013.04"
+	bool "2013.07"
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION
        bool "Custom version"
@@ -46,7 +46,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2013.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2013.07"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
diff --git a/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
deleted file mode 100644
index c7d9a7e916..0000000000
--- a/boot/uboot/uboot-2011.12/uboot-2011.12-change-kernel-address-in-dataflash.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From e139cb31d32a4f39241bfd83bf622a97d08f6c9d Mon Sep 17 00:00:00 2001
-From: Alexandre Belloni <alexandre.belloni@piout.net>
-Date: Mon, 2 Jul 2012 04:26:58 +0000
-Subject: [PATCH] AT91SAM9*: Change kernel address in dataflash to
- match u-boot's size
-
-
-On at91sam platforms, u-boot grew larger than the allocated size in
-dataflash, the layout was:
-bootstrap  0x00000000
-ubootenv   0x00004200
-uboot      0x00008400
-kernel     0x00042000
-fs         0x00252000
-
-u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
-0x39C00 bytes anymore.
-
-Now, the layout is:
-bootstrap  0x00000000
-ubootenv   0x00004200
-uboot      0x00008400
-kernel     0x00084000
-fs         0x00294000
-
-Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
-Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
----
- board/atmel/at91sam9260ek/partition.c |    6 +++---
- board/atmel/at91sam9261ek/partition.c |    6 +++---
- board/atmel/at91sam9263ek/partition.c |    6 +++---
- board/atmel/at91sam9rlek/partition.c  |    6 +++---
- include/configs/at91sam9260ek.h       |    5 +++--
- include/configs/at91sam9261ek.h       |    5 +++--
- include/configs/at91sam9263ek.h       |    2 +-
- include/configs/at91sam9rlek.h        |    3 ++-
- 8 files changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c
-index 2629c67..9ec054f 100644
---- a/board/atmel/at91sam9260ek/partition.c
-+++ b/board/atmel/at91sam9260ek/partition.c
-@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
-index c739b11..51cac77 100644
---- a/board/atmel/at91sam9261ek/partition.c
-+++ b/board/atmel/at91sam9261ek/partition.c
-@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c
-index 7e1d46f..d48fab7 100644
---- a/board/atmel/at91sam9263ek/partition.c
-+++ b/board/atmel/at91sam9263ek/partition.c
-@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c
-index 7e1d46f..d48fab7 100644
---- a/board/atmel/at91sam9rlek/partition.c
-+++ b/board/atmel/at91sam9rlek/partition.c
-@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
-index 07b1968..ef25fa5 100644
---- a/include/configs/at91sam9260ek.h
-+++ b/include/configs/at91sam9260ek.h
-@@ -187,7 +187,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -201,7 +201,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -230,6 +230,7 @@
- #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- #define CONFIG_SYS_LONGHELP		1
- #define CONFIG_CMDLINE_EDITING	1
-+#define CONFIG_AUTO_COMPLETE
- 
- /*
-  * Size of malloc() pool
-diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
-index 6fd0b83..014437b 100644
---- a/include/configs/at91sam9261ek.h
-+++ b/include/configs/at91sam9261ek.h
-@@ -189,7 +189,7 @@
- #define CONFIG_ENV_OFFSET	0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -203,7 +203,7 @@
- #define CONFIG_ENV_OFFSET	0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -232,6 +232,7 @@
- #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- #define CONFIG_SYS_LONGHELP
- #define CONFIG_CMDLINE_EDITING
-+#define CONFIG_AUTO_COMPLETE
- 
- /*
-  * Size of malloc() pool
-diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
-index f2163f1..4309f71 100644
---- a/include/configs/at91sam9263ek.h
-+++ b/include/configs/at91sam9263ek.h
-@@ -318,7 +318,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
- 				"root=/dev/mtdblock0 " \
- 				"mtdparts=atmel_nand:-(root) "\
-diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
-index 45f8baf..c5952e9 100644
---- a/include/configs/at91sam9rlek.h
-+++ b/include/configs/at91sam9rlek.h
-@@ -155,7 +155,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
- 				"root=/dev/mtdblock0 " \
- 				"mtdparts=atmel_nand:-(root) "\
-@@ -182,6 +182,7 @@
- #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- #define CONFIG_SYS_LONGHELP		1
- #define CONFIG_CMDLINE_EDITING		1
-+#define CONFIG_AUTO_COMPLETE
- 
- /*
-  * Size of malloc() pool
--- 
-1.7.9.5
-
diff --git a/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
deleted file mode 100644
index c7d9a7e916..0000000000
--- a/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From e139cb31d32a4f39241bfd83bf622a97d08f6c9d Mon Sep 17 00:00:00 2001
-From: Alexandre Belloni <alexandre.belloni@piout.net>
-Date: Mon, 2 Jul 2012 04:26:58 +0000
-Subject: [PATCH] AT91SAM9*: Change kernel address in dataflash to
- match u-boot's size
-
-
-On at91sam platforms, u-boot grew larger than the allocated size in
-dataflash, the layout was:
-bootstrap  0x00000000
-ubootenv   0x00004200
-uboot      0x00008400
-kernel     0x00042000
-fs         0x00252000
-
-u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 =
-0x39C00 bytes anymore.
-
-Now, the layout is:
-bootstrap  0x00000000
-ubootenv   0x00004200
-uboot      0x00008400
-kernel     0x00084000
-fs         0x00294000
-
-Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
-Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
----
- board/atmel/at91sam9260ek/partition.c |    6 +++---
- board/atmel/at91sam9261ek/partition.c |    6 +++---
- board/atmel/at91sam9263ek/partition.c |    6 +++---
- board/atmel/at91sam9rlek/partition.c  |    6 +++---
- include/configs/at91sam9260ek.h       |    5 +++--
- include/configs/at91sam9261ek.h       |    5 +++--
- include/configs/at91sam9263ek.h       |    2 +-
- include/configs/at91sam9rlek.h        |    3 ++-
- 8 files changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/board/atmel/at91sam9260ek/partition.c b/board/atmel/at91sam9260ek/partition.c
-index 2629c67..9ec054f 100644
---- a/board/atmel/at91sam9260ek/partition.c
-+++ b/board/atmel/at91sam9260ek/partition.c
-@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
-index c739b11..51cac77 100644
---- a/board/atmel/at91sam9261ek/partition.c
-+++ b/board/atmel/at91sam9261ek/partition.c
-@@ -34,7 +34,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/board/atmel/at91sam9263ek/partition.c b/board/atmel/at91sam9263ek/partition.c
-index 7e1d46f..d48fab7 100644
---- a/board/atmel/at91sam9263ek/partition.c
-+++ b/board/atmel/at91sam9263ek/partition.c
-@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c
-index 7e1d46f..d48fab7 100644
---- a/board/atmel/at91sam9rlek/partition.c
-+++ b/board/atmel/at91sam9rlek/partition.c
-@@ -33,7 +33,7 @@ struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
- dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- 	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
- 	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
--	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
--	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
--	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+	{0x00008400, 0x00083FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00084000, 0x00293FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00294000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
- };
-diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
-index 07b1968..ef25fa5 100644
---- a/include/configs/at91sam9260ek.h
-+++ b/include/configs/at91sam9260ek.h
-@@ -187,7 +187,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -201,7 +201,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -230,6 +230,7 @@
- #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- #define CONFIG_SYS_LONGHELP		1
- #define CONFIG_CMDLINE_EDITING	1
-+#define CONFIG_AUTO_COMPLETE
- 
- /*
-  * Size of malloc() pool
-diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
-index 6fd0b83..014437b 100644
---- a/include/configs/at91sam9261ek.h
-+++ b/include/configs/at91sam9261ek.h
-@@ -189,7 +189,7 @@
- #define CONFIG_ENV_OFFSET	0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -203,7 +203,7 @@
- #define CONFIG_ENV_OFFSET	0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
- 				"root=/dev/mtdblock0 "			\
- 				"mtdparts=atmel_nand:-(root) "		\
-@@ -232,6 +232,7 @@
- #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- #define CONFIG_SYS_LONGHELP
- #define CONFIG_CMDLINE_EDITING
-+#define CONFIG_AUTO_COMPLETE
- 
- /*
-  * Size of malloc() pool
-diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
-index f2163f1..4309f71 100644
---- a/include/configs/at91sam9263ek.h
-+++ b/include/configs/at91sam9263ek.h
-@@ -318,7 +318,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
- 				"root=/dev/mtdblock0 " \
- 				"mtdparts=atmel_nand:-(root) "\
-diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
-index 45f8baf..c5952e9 100644
---- a/include/configs/at91sam9rlek.h
-+++ b/include/configs/at91sam9rlek.h
-@@ -155,7 +155,7 @@
- #define CONFIG_ENV_OFFSET		0x4200
- #define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
- #define CONFIG_ENV_SIZE		0x4200
--#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0084000 0x22000000 0x210000; bootm"
- #define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
- 				"root=/dev/mtdblock0 " \
- 				"mtdparts=atmel_nand:-(root) "\
-@@ -182,6 +182,7 @@
- #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- #define CONFIG_SYS_LONGHELP		1
- #define CONFIG_CMDLINE_EDITING		1
-+#define CONFIG_AUTO_COMPLETE
- 
- /*
-  * Size of malloc() pool
--- 
-1.7.9.5
-

From 0a7a850ca5142170c427d2234064558551a327c3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 08:06:37 -0300
Subject: [PATCH 5813/6849] uboot-tools: bump to version 2013.07

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...tools.patch => uboot-tools-01-drop-configh-from-tools.patch} | 0
 ...e-fix.patch => uboot-tools-02-hostcflags-override-fix.patch} | 0
 package/uboot-tools/uboot-tools.mk                              | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename package/uboot-tools/{uboot-tools-drop-configh-from-tools.patch => uboot-tools-01-drop-configh-from-tools.patch} (100%)
 rename package/uboot-tools/{uboot-tools-hostcflags-override-fix.patch => uboot-tools-02-hostcflags-override-fix.patch} (100%)

diff --git a/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-01-drop-configh-from-tools.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-drop-configh-from-tools.patch
rename to package/uboot-tools/uboot-tools-01-drop-configh-from-tools.patch
diff --git a/package/uboot-tools/uboot-tools-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-02-hostcflags-override-fix.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-hostcflags-override-fix.patch
rename to package/uboot-tools/uboot-tools-02-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index ceda3c5460..f8935afcb4 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UBOOT_TOOLS_VERSION = 2013.04
+UBOOT_TOOLS_VERSION = 2013.07
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+

From 6213bab936c8b8911f0e826aca70e5c491659345 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 10:03:37 -0300
Subject: [PATCH 5814/6849] package/uclibc: number patches for 0.9.32.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...uclibc-0001-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch} | 0
 ...libc-0002-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch} | 0
 ...-0003-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch} | 0
 ...bc-sparc-errno-fix.patch => uclibc-0004-sparc-errno-fix.patch} | 0
 .../0.9.32.1/{uclibc-unshare.patch => uclibc-0005-unshare.patch}  | 0
 ...s-errno-fix.patch => uclibc-0006-linuxthreads-errno-fix.patch} | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename package/uclibc/0.9.32.1/{uclibc-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch => uclibc-0001-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch} (100%)
 rename package/uclibc/0.9.32.1/{uclibc-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch => uclibc-0002-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch} (100%)
 rename package/uclibc/0.9.32.1/{uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch => uclibc-0003-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch} (100%)
 rename package/uclibc/0.9.32.1/{uclibc-sparc-errno-fix.patch => uclibc-0004-sparc-errno-fix.patch} (100%)
 rename package/uclibc/0.9.32.1/{uclibc-unshare.patch => uclibc-0005-unshare.patch} (100%)
 rename package/uclibc/0.9.32.1/{uclibc-linuxthreads-errno-fix.patch => uclibc-0006-linuxthreads-errno-fix.patch} (100%)

diff --git a/package/uclibc/0.9.32.1/uclibc-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch b/package/uclibc/0.9.32.1/uclibc-0001-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
similarity index 100%
rename from package/uclibc/0.9.32.1/uclibc-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
rename to package/uclibc/0.9.32.1/uclibc-0001-Fix-e500-__fe_nomask_env-use-of-__set_errno.patch
diff --git a/package/uclibc/0.9.32.1/uclibc-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/package/uclibc/0.9.32.1/uclibc-0002-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
similarity index 100%
rename from package/uclibc/0.9.32.1/uclibc-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
rename to package/uclibc/0.9.32.1/uclibc-0002-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
diff --git a/package/uclibc/0.9.32.1/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.32.1/uclibc-0003-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
similarity index 100%
rename from package/uclibc/0.9.32.1/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
rename to package/uclibc/0.9.32.1/uclibc-0003-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
diff --git a/package/uclibc/0.9.32.1/uclibc-sparc-errno-fix.patch b/package/uclibc/0.9.32.1/uclibc-0004-sparc-errno-fix.patch
similarity index 100%
rename from package/uclibc/0.9.32.1/uclibc-sparc-errno-fix.patch
rename to package/uclibc/0.9.32.1/uclibc-0004-sparc-errno-fix.patch
diff --git a/package/uclibc/0.9.32.1/uclibc-unshare.patch b/package/uclibc/0.9.32.1/uclibc-0005-unshare.patch
similarity index 100%
rename from package/uclibc/0.9.32.1/uclibc-unshare.patch
rename to package/uclibc/0.9.32.1/uclibc-0005-unshare.patch
diff --git a/package/uclibc/0.9.32.1/uclibc-linuxthreads-errno-fix.patch b/package/uclibc/0.9.32.1/uclibc-0006-linuxthreads-errno-fix.patch
similarity index 100%
rename from package/uclibc/0.9.32.1/uclibc-linuxthreads-errno-fix.patch
rename to package/uclibc/0.9.32.1/uclibc-0006-linuxthreads-errno-fix.patch

From a3b9f7fe8a9a40f8a6b17d71aa1cc7c751d5fc5e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 10:03:38 -0300
Subject: [PATCH 5815/6849] package/uclibc: add execvpe() backport

Needed for modern versions of systemd and udev.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...bc-add-non-standard-execvpe-function.patch | 163 ++++++++++++++++++
 ...bc-add-non-standard-execvpe-function.patch | 163 ++++++++++++++++++
 2 files changed, 326 insertions(+)
 create mode 100644 package/uclibc/0.9.32.1/uclibc-0007-libc-add-non-standard-execvpe-function.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0011-libc-add-non-standard-execvpe-function.patch

diff --git a/package/uclibc/0.9.32.1/uclibc-0007-libc-add-non-standard-execvpe-function.patch b/package/uclibc/0.9.32.1/uclibc-0007-libc-add-non-standard-execvpe-function.patch
new file mode 100644
index 0000000000..81413338c0
--- /dev/null
+++ b/package/uclibc/0.9.32.1/uclibc-0007-libc-add-non-standard-execvpe-function.patch
@@ -0,0 +1,163 @@
+From 0eb30761a26c46aaf555464114851202ae9c27bd Mon Sep 17 00:00:00 2001
+From: Henning Heinold <heinold@inf.fu-berlin.de>
+Date: Sat, 4 Jun 2011 21:23:15 +0200
+Subject: [PATCH] libc: add non standard execvpe function
+
+[Gustavo]: Drop TODO modification to make it compatible
+Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/unistd.h      |  8 ++++++++
+ libc/unistd/exec.c    | 38 +++++++++++++++++++++++++++++++++-----
+ libc/unistd/execvpe.c |  7 +++++++
+ 4 files changed, 52 insertions(+), 5 deletions(-)
+ create mode 100644 libc/unistd/execvpe.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index feadf93..9479554 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -619,6 +619,14 @@ extern int execlp (const char *__file, const char *__arg, ...)
+      __THROW __nonnull ((1));
+ libc_hidden_proto(execlp)
+ 
++#ifdef __USE_GNU
++/* Execute FILE, searching in the `PATH' environment variable if it contains
++   no slashes, with arguments ARGV and environment from a pointer */
++extern int execvpe (__const char *__file, char *__const __argv[], char *__const __envp[])
++     __THROW __nonnull ((1));
++libc_hidden_proto(execvpe)
++#endif
++
+ 
+ #if defined __USE_MISC || defined __USE_XOPEN
+ /* Add INC to priority of the current process.  */
+diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
+index ba92989..8fa42e5 100644
+--- a/libc/unistd/exec.c
++++ b/libc/unistd/exec.c
+@@ -32,6 +32,8 @@
+ /**********************************************************************/
+ #define EXEC_FUNC_COMMON 0
+ #define EXEC_FUNC_EXECVP 1
++#define EXEC_FUNC_EXECVPE 2
++
+ #if defined(__ARCH_USE_MMU__)
+ 
+ /* We have an MMU, so use alloca() to grab space for buffers and arg lists. */
+@@ -58,6 +60,7 @@
+  *  execle(a) -> execve(-)
+  *  execv(-)  -> execve(-)
+  *  execvp(a) -> execve(-)
++ *  execvpe(a) -> execve(-)
+  */
+ 
+ # define EXEC_ALLOC_SIZE(VAR)      /* nothing to do */
+@@ -219,15 +222,18 @@ libc_hidden_def(execlp)
+ 
+ #endif
+ /**********************************************************************/
+-#ifdef L_execvp
++#if defined (L_execvp) || defined(L_execvpe)
+ 
+ 
+ /* Use a default path that matches glibc behavior, since SUSv3 says
+  * this is implementation-defined.  The default is current working dir,
+  * /bin, and then /usr/bin. */
+ static const char default_path[] = ":/bin:/usr/bin";
+-
++#if defined (L_execvp)
+ int execvp(const char *path, char *const argv[])
++#elif defined (L_execvpe)
++int execvpe(const char *path, char *const argv[], char *const envp[])
++#endif
+ {
+ 	char *buf = NULL;
+ 	char *p;
+@@ -245,7 +251,11 @@ int execvp(const char *path, char *const argv[])
+ 	}
+ 
+ 	if (strchr(path, '/')) {
++#if defined (L_execvp)
+ 		execve(path, argv, __environ);
++#elif defined (L_execvpe)
++		execve(path, argv, envp);
++#endif
+ 		if (errno == ENOEXEC) {
+ 			char **nargv;
+ 			EXEC_ALLOC_SIZE(size2) /* Do NOT add a semicolon! */
+@@ -254,11 +264,19 @@ int execvp(const char *path, char *const argv[])
+ 			/* Need the dimension - 1.  We omit counting the trailing
+ 			 * NULL but we actually omit the first entry. */
+ 			for (n=0 ; argv[n] ; n++) {}
++#if defined (L_execvp)
+ 			nargv = (char **) EXEC_ALLOC((n+2) * sizeof(char *), size2, EXEC_FUNC_EXECVP);
++#elif defined (L_execvpe)
++			nargv = (char **) EXEC_ALLOC((n+2) * sizeof(char *), size2, EXEC_FUNC_EXECVPE);
++#endif
+ 			nargv[0] = argv[0];
+ 			nargv[1] = (char *)path;
+ 			memcpy(nargv+2, argv+1, n*sizeof(char *));
++#if defined (L_execvp)
+ 			execve("/bin/sh", nargv, __environ);
++#elif defined (L_execvpe)
++			execve("/bin/sh", nargv, envp);
++#endif
+ 			EXEC_FREE(nargv, size2);
+ 		}
+ 	} else {
+@@ -277,8 +295,11 @@ int execvp(const char *path, char *const argv[])
+ 			return -1;
+ 		}
+ 		len = (FILENAME_MAX - 1) - plen;
+-
++#if defined (L_execvp)
+ 		buf = EXEC_ALLOC(FILENAME_MAX, size, EXEC_FUNC_EXECVP);
++#elif defined (L_execvpe)
++		buf = EXEC_ALLOC(FILENAME_MAX, size, EXEC_FUNC_EXECVPE);
++#endif
+ 		{
+ 			int seen_small = 0;
+ 			s0 = buf + len;
+@@ -300,8 +321,11 @@ int execvp(const char *path, char *const argv[])
+ 					s[plen-1] = '/';
+ 				}
+ 
++#if defined (L_execvp)
+ 				execve(s, argv, __environ);
+-
++#elif defined (L_execvpe)
++				execve(s, argv, envp);
++#endif
+ 				seen_small = 1;
+ 
+ 				if (errno == ENOEXEC) {
+@@ -325,7 +349,11 @@ int execvp(const char *path, char *const argv[])
+ 
+ 	return -1;
+ }
++#if defined (L_execvp)
+ libc_hidden_def(execvp)
+-
++#elif defined (L_execvpe)
++libc_hidden_def(execvpe)
+ #endif
++
++#endif /* #if defined (L_execvp) || defined(L_execvpe) */
+ /**********************************************************************/
+diff --git a/libc/unistd/execvpe.c b/libc/unistd/execvpe.c
+new file mode 100644
+index 0000000..c3c1e43
+--- /dev/null
++++ b/libc/unistd/execvpe.c
+@@ -0,0 +1,7 @@
++/* Copyright (C) 2011-2013 Hennning Heinold <heinold@inf.fu-berlin.de>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#define L_execvpe
++#include "exec.c"
+-- 
+1.8.1.5
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0011-libc-add-non-standard-execvpe-function.patch b/package/uclibc/0.9.33.2/uclibc-0011-libc-add-non-standard-execvpe-function.patch
new file mode 100644
index 0000000000..81413338c0
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0011-libc-add-non-standard-execvpe-function.patch
@@ -0,0 +1,163 @@
+From 0eb30761a26c46aaf555464114851202ae9c27bd Mon Sep 17 00:00:00 2001
+From: Henning Heinold <heinold@inf.fu-berlin.de>
+Date: Sat, 4 Jun 2011 21:23:15 +0200
+Subject: [PATCH] libc: add non standard execvpe function
+
+[Gustavo]: Drop TODO modification to make it compatible
+Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/unistd.h      |  8 ++++++++
+ libc/unistd/exec.c    | 38 +++++++++++++++++++++++++++++++++-----
+ libc/unistd/execvpe.c |  7 +++++++
+ 4 files changed, 52 insertions(+), 5 deletions(-)
+ create mode 100644 libc/unistd/execvpe.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index feadf93..9479554 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -619,6 +619,14 @@ extern int execlp (const char *__file, const char *__arg, ...)
+      __THROW __nonnull ((1));
+ libc_hidden_proto(execlp)
+ 
++#ifdef __USE_GNU
++/* Execute FILE, searching in the `PATH' environment variable if it contains
++   no slashes, with arguments ARGV and environment from a pointer */
++extern int execvpe (__const char *__file, char *__const __argv[], char *__const __envp[])
++     __THROW __nonnull ((1));
++libc_hidden_proto(execvpe)
++#endif
++
+ 
+ #if defined __USE_MISC || defined __USE_XOPEN
+ /* Add INC to priority of the current process.  */
+diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
+index ba92989..8fa42e5 100644
+--- a/libc/unistd/exec.c
++++ b/libc/unistd/exec.c
+@@ -32,6 +32,8 @@
+ /**********************************************************************/
+ #define EXEC_FUNC_COMMON 0
+ #define EXEC_FUNC_EXECVP 1
++#define EXEC_FUNC_EXECVPE 2
++
+ #if defined(__ARCH_USE_MMU__)
+ 
+ /* We have an MMU, so use alloca() to grab space for buffers and arg lists. */
+@@ -58,6 +60,7 @@
+  *  execle(a) -> execve(-)
+  *  execv(-)  -> execve(-)
+  *  execvp(a) -> execve(-)
++ *  execvpe(a) -> execve(-)
+  */
+ 
+ # define EXEC_ALLOC_SIZE(VAR)      /* nothing to do */
+@@ -219,15 +222,18 @@ libc_hidden_def(execlp)
+ 
+ #endif
+ /**********************************************************************/
+-#ifdef L_execvp
++#if defined (L_execvp) || defined(L_execvpe)
+ 
+ 
+ /* Use a default path that matches glibc behavior, since SUSv3 says
+  * this is implementation-defined.  The default is current working dir,
+  * /bin, and then /usr/bin. */
+ static const char default_path[] = ":/bin:/usr/bin";
+-
++#if defined (L_execvp)
+ int execvp(const char *path, char *const argv[])
++#elif defined (L_execvpe)
++int execvpe(const char *path, char *const argv[], char *const envp[])
++#endif
+ {
+ 	char *buf = NULL;
+ 	char *p;
+@@ -245,7 +251,11 @@ int execvp(const char *path, char *const argv[])
+ 	}
+ 
+ 	if (strchr(path, '/')) {
++#if defined (L_execvp)
+ 		execve(path, argv, __environ);
++#elif defined (L_execvpe)
++		execve(path, argv, envp);
++#endif
+ 		if (errno == ENOEXEC) {
+ 			char **nargv;
+ 			EXEC_ALLOC_SIZE(size2) /* Do NOT add a semicolon! */
+@@ -254,11 +264,19 @@ int execvp(const char *path, char *const argv[])
+ 			/* Need the dimension - 1.  We omit counting the trailing
+ 			 * NULL but we actually omit the first entry. */
+ 			for (n=0 ; argv[n] ; n++) {}
++#if defined (L_execvp)
+ 			nargv = (char **) EXEC_ALLOC((n+2) * sizeof(char *), size2, EXEC_FUNC_EXECVP);
++#elif defined (L_execvpe)
++			nargv = (char **) EXEC_ALLOC((n+2) * sizeof(char *), size2, EXEC_FUNC_EXECVPE);
++#endif
+ 			nargv[0] = argv[0];
+ 			nargv[1] = (char *)path;
+ 			memcpy(nargv+2, argv+1, n*sizeof(char *));
++#if defined (L_execvp)
+ 			execve("/bin/sh", nargv, __environ);
++#elif defined (L_execvpe)
++			execve("/bin/sh", nargv, envp);
++#endif
+ 			EXEC_FREE(nargv, size2);
+ 		}
+ 	} else {
+@@ -277,8 +295,11 @@ int execvp(const char *path, char *const argv[])
+ 			return -1;
+ 		}
+ 		len = (FILENAME_MAX - 1) - plen;
+-
++#if defined (L_execvp)
+ 		buf = EXEC_ALLOC(FILENAME_MAX, size, EXEC_FUNC_EXECVP);
++#elif defined (L_execvpe)
++		buf = EXEC_ALLOC(FILENAME_MAX, size, EXEC_FUNC_EXECVPE);
++#endif
+ 		{
+ 			int seen_small = 0;
+ 			s0 = buf + len;
+@@ -300,8 +321,11 @@ int execvp(const char *path, char *const argv[])
+ 					s[plen-1] = '/';
+ 				}
+ 
++#if defined (L_execvp)
+ 				execve(s, argv, __environ);
+-
++#elif defined (L_execvpe)
++				execve(s, argv, envp);
++#endif
+ 				seen_small = 1;
+ 
+ 				if (errno == ENOEXEC) {
+@@ -325,7 +349,11 @@ int execvp(const char *path, char *const argv[])
+ 
+ 	return -1;
+ }
++#if defined (L_execvp)
+ libc_hidden_def(execvp)
+-
++#elif defined (L_execvpe)
++libc_hidden_def(execvpe)
+ #endif
++
++#endif /* #if defined (L_execvp) || defined(L_execvpe) */
+ /**********************************************************************/
+diff --git a/libc/unistd/execvpe.c b/libc/unistd/execvpe.c
+new file mode 100644
+index 0000000..c3c1e43
+--- /dev/null
++++ b/libc/unistd/execvpe.c
+@@ -0,0 +1,7 @@
++/* Copyright (C) 2011-2013 Hennning Heinold <heinold@inf.fu-berlin.de>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#define L_execvpe
++#include "exec.c"
+-- 
+1.8.1.5
+

From d951e7749a9c9452adf26fd0065f5009087961ea Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 10:03:39 -0300
Subject: [PATCH 5816/6849] package/uclibc: add mkostemp() backport

Needed for modern versions of systemd and udev.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...008-libc-stdlib-add-mkostemp-helpers.patch | 155 ++++++++++++++++++
 ...012-libc-stdlib-add-mkostemp-helpers.patch | 155 ++++++++++++++++++
 2 files changed, 310 insertions(+)
 create mode 100644 package/uclibc/0.9.32.1/uclibc-0008-libc-stdlib-add-mkostemp-helpers.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0012-libc-stdlib-add-mkostemp-helpers.patch

diff --git a/package/uclibc/0.9.32.1/uclibc-0008-libc-stdlib-add-mkostemp-helpers.patch b/package/uclibc/0.9.32.1/uclibc-0008-libc-stdlib-add-mkostemp-helpers.patch
new file mode 100644
index 0000000000..80022408aa
--- /dev/null
+++ b/package/uclibc/0.9.32.1/uclibc-0008-libc-stdlib-add-mkostemp-helpers.patch
@@ -0,0 +1,155 @@
+From 42d1b23fc0f3748b8bf474e456d6c44aa7e563fd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 14 Nov 2012 00:30:54 -0500
+Subject: [PATCH] libc/stdlib: add mkostemp helpers
+
+Some projects (like udev) are starting to use this.
+
+Imported from glibc.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/stdlib.h         | 23 +++++++++++++++++++++++
+ libc/stdlib/Makefile.in  |  4 ++--
+ libc/stdlib/mkostemp.c   | 32 ++++++++++++++++++++++++++++++++
+ libc/stdlib/mkostemp64.c | 33 +++++++++++++++++++++++++++++++++
+ 4 files changed, 90 insertions(+), 2 deletions(-)
+ create mode 100644 libc/stdlib/mkostemp.c
+ create mode 100644 libc/stdlib/mkostemp64.c
+
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 354fc66..79ccc55 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -652,6 +652,29 @@ extern int mkstemp64 (char *__template) __nonnull ((1)) __wur;
+ extern char *mkdtemp (char *__template) __THROW __nonnull ((1)) __wur;
+ #endif
+ 
++#ifdef __USE_GNU
++/* Generate a unique temporary file name from TEMPLATE similar to
++   mkstemp.  But allow the caller to pass additional flags which are
++   used in the open call to create the file..
++
++   This function is a possible cancellation point and therefore not
++   marked with __THROW.  */
++# ifndef __USE_FILE_OFFSET64
++extern int mkostemp (char *__template, int __flags) __nonnull ((1)) __wur;
++# else
++#  ifdef __REDIRECT
++extern int __REDIRECT (mkostemp, (char *__template, int __flags), mkostemp64)
++     __nonnull ((1)) __wur;
++#  else
++#   define mkostemp mkostemp64
++#  endif
++# endif
++# ifdef __USE_LARGEFILE64
++extern int mkostemp64 (char *__template, int __flags) __nonnull ((1)) __wur;
++# endif
++
++#endif
++
+ 
+ __BEGIN_NAMESPACE_STD
+ /* Execute the given line as a shell command.
+diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
+index 3166b8e..b92f7ce 100644
+--- a/libc/stdlib/Makefile.in
++++ b/libc/stdlib/Makefile.in
+@@ -12,7 +12,7 @@ include $(top_srcdir)libc/stdlib/malloc-simple/Makefile.in
+ include $(top_srcdir)libc/stdlib/malloc-standard/Makefile.in
+ 
+ CSRC-y := \
+-	abort.c getenv.c mkdtemp.c realpath.c canonicalize.c mkstemp.c \
++	abort.c getenv.c mkdtemp.c realpath.c canonicalize.c mkstemp.c mkostemp.c \
+ 	rand.c random.c random_r.c setenv.c div.c ldiv.c lldiv.c \
+ 	getpt.c drand48-iter.c jrand48.c \
+ 	jrand48_r.c lcong48.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \
+@@ -21,7 +21,7 @@ CSRC-y := \
+ CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_memalign.c
+ CSRC-$(UCLIBC_HAS_PTY) += grantpt.c unlockpt.c ptsname.c
+ CSRC-$(UCLIBC_HAS_ARC4RANDOM) += arc4random.c
+-CSRC-$(UCLIBC_HAS_LFS) += mkstemp64.c
++CSRC-$(UCLIBC_HAS_LFS) += mkstemp64.c mkostemp64.c
+ CSRC-$(UCLIBC_HAS_FLOATS) += drand48.c drand48_r.c erand48.c erand48_r.c
+ CSRC-$(if $(findstring yy,$(UCLIBC_HAS_FLOATS)$(UCLIBC_SUSV3_LEGACY)),y) += \
+ 	gcvt.c
+diff --git a/libc/stdlib/mkostemp.c b/libc/stdlib/mkostemp.c
+new file mode 100644
+index 0000000..93b50fc
+--- /dev/null
++++ b/libc/stdlib/mkostemp.c
+@@ -0,0 +1,32 @@
++/* Copyright (C) 1998-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include "../misc/internals/tempname.h"
++
++/* Generate a unique temporary file name from TEMPLATE.
++   The last six characters of TEMPLATE must be "XXXXXX";
++   they are replaced with a string that makes the filename unique.
++   Then open the file and return a fd. */
++int
++mkostemp (template, flags)
++     char *template;
++     int flags;
++{
++  return __gen_tempname (template, __GT_FILE, flags);
++}
+diff --git a/libc/stdlib/mkostemp64.c b/libc/stdlib/mkostemp64.c
+new file mode 100644
+index 0000000..5509d8c
+--- /dev/null
++++ b/libc/stdlib/mkostemp64.c
+@@ -0,0 +1,33 @@
++/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <fcntl.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include "../misc/internals/tempname.h"
++
++/* Generate a unique temporary file name from TEMPLATE.
++   The last six characters of TEMPLATE must be "XXXXXX";
++   they are replaced with a string that makes the filename unique.
++   Then open the file and return a fd. */
++int
++mkostemp64 (template, flags)
++     char *template;
++     int flags;
++{
++  return __gen_tempname (template, __GT_BIGFILE, flags | O_LARGEFILE);
++}
+-- 
+1.8.1.5
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0012-libc-stdlib-add-mkostemp-helpers.patch b/package/uclibc/0.9.33.2/uclibc-0012-libc-stdlib-add-mkostemp-helpers.patch
new file mode 100644
index 0000000000..80022408aa
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0012-libc-stdlib-add-mkostemp-helpers.patch
@@ -0,0 +1,155 @@
+From 42d1b23fc0f3748b8bf474e456d6c44aa7e563fd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 14 Nov 2012 00:30:54 -0500
+Subject: [PATCH] libc/stdlib: add mkostemp helpers
+
+Some projects (like udev) are starting to use this.
+
+Imported from glibc.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/stdlib.h         | 23 +++++++++++++++++++++++
+ libc/stdlib/Makefile.in  |  4 ++--
+ libc/stdlib/mkostemp.c   | 32 ++++++++++++++++++++++++++++++++
+ libc/stdlib/mkostemp64.c | 33 +++++++++++++++++++++++++++++++++
+ 4 files changed, 90 insertions(+), 2 deletions(-)
+ create mode 100644 libc/stdlib/mkostemp.c
+ create mode 100644 libc/stdlib/mkostemp64.c
+
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 354fc66..79ccc55 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -652,6 +652,29 @@ extern int mkstemp64 (char *__template) __nonnull ((1)) __wur;
+ extern char *mkdtemp (char *__template) __THROW __nonnull ((1)) __wur;
+ #endif
+ 
++#ifdef __USE_GNU
++/* Generate a unique temporary file name from TEMPLATE similar to
++   mkstemp.  But allow the caller to pass additional flags which are
++   used in the open call to create the file..
++
++   This function is a possible cancellation point and therefore not
++   marked with __THROW.  */
++# ifndef __USE_FILE_OFFSET64
++extern int mkostemp (char *__template, int __flags) __nonnull ((1)) __wur;
++# else
++#  ifdef __REDIRECT
++extern int __REDIRECT (mkostemp, (char *__template, int __flags), mkostemp64)
++     __nonnull ((1)) __wur;
++#  else
++#   define mkostemp mkostemp64
++#  endif
++# endif
++# ifdef __USE_LARGEFILE64
++extern int mkostemp64 (char *__template, int __flags) __nonnull ((1)) __wur;
++# endif
++
++#endif
++
+ 
+ __BEGIN_NAMESPACE_STD
+ /* Execute the given line as a shell command.
+diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
+index 3166b8e..b92f7ce 100644
+--- a/libc/stdlib/Makefile.in
++++ b/libc/stdlib/Makefile.in
+@@ -12,7 +12,7 @@ include $(top_srcdir)libc/stdlib/malloc-simple/Makefile.in
+ include $(top_srcdir)libc/stdlib/malloc-standard/Makefile.in
+ 
+ CSRC-y := \
+-	abort.c getenv.c mkdtemp.c realpath.c canonicalize.c mkstemp.c \
++	abort.c getenv.c mkdtemp.c realpath.c canonicalize.c mkstemp.c mkostemp.c \
+ 	rand.c random.c random_r.c setenv.c div.c ldiv.c lldiv.c \
+ 	getpt.c drand48-iter.c jrand48.c \
+ 	jrand48_r.c lcong48.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \
+@@ -21,7 +21,7 @@ CSRC-y := \
+ CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_memalign.c
+ CSRC-$(UCLIBC_HAS_PTY) += grantpt.c unlockpt.c ptsname.c
+ CSRC-$(UCLIBC_HAS_ARC4RANDOM) += arc4random.c
+-CSRC-$(UCLIBC_HAS_LFS) += mkstemp64.c
++CSRC-$(UCLIBC_HAS_LFS) += mkstemp64.c mkostemp64.c
+ CSRC-$(UCLIBC_HAS_FLOATS) += drand48.c drand48_r.c erand48.c erand48_r.c
+ CSRC-$(if $(findstring yy,$(UCLIBC_HAS_FLOATS)$(UCLIBC_SUSV3_LEGACY)),y) += \
+ 	gcvt.c
+diff --git a/libc/stdlib/mkostemp.c b/libc/stdlib/mkostemp.c
+new file mode 100644
+index 0000000..93b50fc
+--- /dev/null
++++ b/libc/stdlib/mkostemp.c
+@@ -0,0 +1,32 @@
++/* Copyright (C) 1998-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include "../misc/internals/tempname.h"
++
++/* Generate a unique temporary file name from TEMPLATE.
++   The last six characters of TEMPLATE must be "XXXXXX";
++   they are replaced with a string that makes the filename unique.
++   Then open the file and return a fd. */
++int
++mkostemp (template, flags)
++     char *template;
++     int flags;
++{
++  return __gen_tempname (template, __GT_FILE, flags);
++}
+diff --git a/libc/stdlib/mkostemp64.c b/libc/stdlib/mkostemp64.c
+new file mode 100644
+index 0000000..5509d8c
+--- /dev/null
++++ b/libc/stdlib/mkostemp64.c
+@@ -0,0 +1,33 @@
++/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <fcntl.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include "../misc/internals/tempname.h"
++
++/* Generate a unique temporary file name from TEMPLATE.
++   The last six characters of TEMPLATE must be "XXXXXX";
++   they are replaced with a string that makes the filename unique.
++   Then open the file and return a fd. */
++int
++mkostemp64 (template, flags)
++     char *template;
++     int flags;
++{
++  return __gen_tempname (template, __GT_BIGFILE, flags | O_LARGEFILE);
++}
+-- 
+1.8.1.5
+

From ddbae621247ace20d8db168b3e9faba53322f0dd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 10:31:46 -0300
Subject: [PATCH 5817/6849] strongswan: security bump to version 5.0.4

Fixes CVE-2013-2944.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/strongswan/strongswan.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index 88d6f943ef..b75c70dbdd 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRONGSWAN_VERSION = 5.0.2
+STRONGSWAN_VERSION = 5.0.4
 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
 STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPLv2+

From e4cdd6c3c2737baf67c21180d79283606a633fe9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 10:31:47 -0300
Subject: [PATCH 5818/6849] strongswan: scripts need charon or tools

Fixes:
http://autobuild.buildroot.net/results/007/007e75362cbe4693e36d5a7ab96c539d1f3b00fc/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/strongswan/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in
index 98f8da2195..e8cd1c4afe 100644
--- a/package/strongswan/Config.in
+++ b/package/strongswan/Config.in
@@ -110,6 +110,7 @@ config BR2_PACKAGE_STRONGSWAN_TOOLS
 
 config BR2_PACKAGE_STRONGSWAN_SCRIPTS
 	bool "Enable additional utilities (found in directory scripts)"
+	depends on BR2_PACKAGE_STRONGSWAN_CHARON || BR2_PACKAGE_STRONGSWAN_TOOLS
 	default y
 
 endif

From d1a16db85d5f3dd49ec23a3f95dac429850c6f62 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Wed, 31 Jul 2013 17:26:59 +0200
Subject: [PATCH 5819/6849] libnspr: Add dependency on !BR2_arc

ARC is not supported yet in libnspr.

v2: Propagate to ecryptfs-utils as well

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ecryptfs-utils/Config.in | 1 +
 package/libnspr/Config.in        | 1 +
 package/libnss/Config.in         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in
index c10659ac8b..480aeddc9b 100644
--- a/package/ecryptfs-utils/Config.in
+++ b/package/ecryptfs-utils/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on !BR2_avr32 && !BR2_microblaze # keyutils
 	depends on BR2_LARGEFILE # libnss
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
+	depends on !BR2_arc # libnss -> libnspr
 	help
 	  eCryptfs is a POSIX-compliant enterprise cryptographic
 	  filesystem for Linux. It is stacked on top of any other
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index f87b10c2dc..ee7902becc 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBNSPR
 	bool "libnspr"
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_arc
 	help
 	  NSPR is the Netscape Portable Runtime library which provides
 	  a platform-neutral API for system level and libc like
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index e8eec772b7..b5f3a01656 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBNSS
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
+	depends on !BR2_arc # libnspr
 	help
 	  Network Security Services (NSS) is a set of libraries designed
 	  to support development of security-enabled client and server

From c1765637172d31eee63ad955055786d75d8cb4ca Mon Sep 17 00:00:00 2001
From: nmenegale <nicolas.menegale@openwide.fr>
Date: Thu, 11 Jul 2013 13:42:48 +0200
Subject: [PATCH 5820/6849] cppcms: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Thomas: reformat header and Config.in help text, add dependency on
glibc since cppcms uses <monetary.h> functions that aren't available
in uClibc.]

Signed-off-by: Nicolas Ménégale <nicolas.menegale@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in        |  1 +
 package/cppcms/Config.in | 32 ++++++++++++++++++++++++++++++++
 package/cppcms/cppcms.mk | 29 +++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/cppcms/Config.in
 create mode 100644 package/cppcms/cppcms.mk

diff --git a/package/Config.in b/package/Config.in
index 61716937f7..7069d778e7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -605,6 +605,7 @@ source "package/apr/Config.in"
 source "package/apr-util/Config.in"
 source "package/libcofi/Config.in"
 source "package/classpath/Config.in"
+source "package/cppcms/Config.in"
 source "package/elfutils/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
new file mode 100644
index 0000000000..14fd974103
--- /dev/null
+++ b/package/cppcms/Config.in
@@ -0,0 +1,32 @@
+config BR2_PACKAGE_CPPCMS
+	bool "cppcms"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_LIBGCRYPT
+	depends on BR2_INSTALL_LIBSTDCPP
+	# cppcms uses <monetary.h> which doesn't exist in uClibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	help
+	  CppCMS is a Free High Performance Web Development Framework
+	  (not a CMS) aimed for Rapid Web Application Development. It
+	  differs from most of other web development frameworks like:
+	  Python Django or Java Servlets on  the following aspects:
+
+           - It is designed and tuned to handle extremely high loads.
+	   - It uses modern C++ as primary development language in
+	     order to achieve the above goal.
+           - It is aimed on development of both Web Sites and Web
+             Services.
+
+	  http://cppcms.com
+
+config BR2_PACKAGE_CPPCMS_ICU
+	bool "enable icu support"
+	depends on BR2_PACKAGE_CPPCMS
+	select BR2_PACKAGE_ICU
+	help
+	  Using ICU allows advanced localization features into CppCMS,
+	  in another hand ICU is heavier than iconv.
+
+comment "cppcms requires a glibc toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
new file mode 100644
index 0000000000..d2b11096e7
--- /dev/null
+++ b/package/cppcms/cppcms.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# cppcms
+#
+################################################################################
+
+CPPCMS_VERSION = 1.0.3
+CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
+CPPCMS_LICENSE = LGPLv3
+CPPCMS_LICENSE_FILE = COPYING.TXT
+CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
+CPPCMS_INSTALL_STAGING = YES
+
+CPPCMS_DEPENDENCIES = zlib pcre libgcrypt
+
+ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
+CPPCMS_CONF_OPT += -DDISABLE_ICONV=ON
+CPPCMS_DEPENDENCIES += icu
+endif
+
+# We copy cppcms_tmpl_cc from staging to host because this file can be
+# needed for compiling packages using cppcms. And it is not worth
+# creating a host package just for a python script.
+define CPPCMS_INSTALL_HOST_TOOLS
+	cp $(STAGING_DIR)/usr/bin/cppcms_tmpl_cc $(HOST_DIR)/usr/bin/cppcms_tmpl_cc
+endef
+CPPCMS_POST_INSTALL_STAGING_HOOKS += CPPCMS_INSTALL_HOST_TOOLS
+
+$(eval $(cmake-package))

From 2eac7aea23f2377c63a11d0c432ebdcaaccc40f1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 13:27:01 -0300
Subject: [PATCH 5821/6849] qt5jsbackend: needs ARM v5+

Just like nodejs and other v8-based javascript engines for ARM interwork
it needs the BLX instruction which is only available on V5+ cores.
Fixes:
http://autobuild.buildroot.net/results/853/853cd29bf427902b2cb82a101964a4e45714cb86/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt5/qt5jsbackend/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/qt5/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in
index 2f5ac1ff51..d9301d0976 100644
--- a/package/qt5/qt5jsbackend/Config.in
+++ b/package/qt5/qt5jsbackend/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
 	bool
 	# v8 is only available on certain architectures
 	depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+	# ARM needs BLX, so v5t+
+	depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
 	default y
 
 config BR2_PACKAGE_QT5JSBACKEND

From 07398f7b43af41a2af5e1b843415d0c9550d32c1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 14:02:01 -0300
Subject: [PATCH 5822/6849] readline: make description more enlightening and
 fix indentation

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/readline/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/readline/Config.in b/package/readline/Config.in
index 305955a63d..fbebf18a8a 100644
--- a/package/readline/Config.in
+++ b/package/readline/Config.in
@@ -2,4 +2,6 @@ config BR2_PACKAGE_READLINE
 	bool "readline"
 	select BR2_PACKAGE_NCURSES
 	help
-	    Enable GNU readline support?
+	  The GNU Readline library provides a set of functions for use
+	  by applications that allow users to edit command lines
+	  as they are typed in.

From a3e7fc8e6592eb6b24adaad1f4c1dfdd28cd729d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 14:12:35 -0300
Subject: [PATCH 5823/6849] libedit: really needs wchar support

wctype.h is always included, even in configure tests.
Fixes:
http://autobuild.buildroot.net/results/ed8/ed85b9d688ad8389895e3ecd7a6a18151efc328d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libedit/Config.in  |  4 ++++
 package/libedit/libedit.mk | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index 4747a38ae0..72b0cf107b 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBEDIT
 	bool "libedit"
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_NCURSES
 	help
 	  The editline library (from BSD) provides generic line editing
@@ -12,3 +13,6 @@ config BR2_PACKAGE_LIBEDIT
 	  in Buildroot as it makes it much simpler than using the upstream
 	  sources which require pmake:
 	  http://www.thrysoee.dk/editline/
+
+comment "libedit requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
index 6769fdc2a8..0ff418ac7c 100644
--- a/package/libedit/libedit.mk
+++ b/package/libedit/libedit.mk
@@ -12,6 +12,9 @@ LIBEDIT_DEPENDENCIES    = ncurses
 # We're patching configure.ac
 LIBEDIT_AUTORECONF      = YES
 
+# Doesn't really support !wchar, but support is disabled otherwise
+LIBEDIT_CONF_OPT += --enable-widec
+
 # Note: libbsd required for *vis functions, but works only with a toolchain
 # with __progname; otherwise, some features are disabled, as if libbsd was
 # missing entirely.
@@ -19,11 +22,4 @@ ifeq ($(BR2_PACKAGE_LIBBSD),y)
 LIBEDIT_DEPENDENCIES   += libbsd
 endif
 
-# Wide-char support is not autodetected by configure, we have to help a bit.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_WCHAR),y)
-LIBEDIT_CONF_OPT       += --enable-widec
-else
-LIBEDIT_CONF_OPT       += --disable-widec
-endif
-
 $(eval $(autotools-package))

From 98b616d7610e315e4270000fa34d35b875790b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89meric=20Vigier?= <emeric.vigier@savoirfairelinux.com>
Date: Wed, 29 May 2013 00:41:11 +0200
Subject: [PATCH 5824/6849] Makefile: add variable print capabilities

Add a new goal that dumps all of our variables.

Taken from http://www.cmcrossroads.com/ask-mr-make/6521-dumping-every-makefile-variable

Signed-off-by: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
[yann.morin.1998@free.fr: drop per-variable print; refresh patch]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0cd7f5541f..5a0c64a52a 100644
--- a/Makefile
+++ b/Makefile
@@ -407,7 +407,7 @@ toolchain: prepare dirs dependencies $(BASE_TARGETS)
 world: toolchain $(TARGETS_ALL)
 
 .PHONY: all world toolchain dirs clean distclean source outputmakefile \
-	legal-info legal-info-prepare legal-info-clean \
+	legal-info legal-info-prepare legal-info-clean printvars \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \
 	$(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
@@ -731,6 +731,14 @@ ifeq ($(NEED_WRAPPER),y)
 	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif
 
+# printvars prints all the variables currently defined in our Makefiles
+printvars:
+	@$(foreach V, \
+		$(sort $(.VARIABLES)), \
+		$(if $(filter-out environment% default automatic, \
+				$(origin $V)), \
+		$(info $V=$($V) ($(value $V)))))
+
 clean:
 	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
 		$(STAMP_DIR) $(BUILD_DIR) $(BASE_DIR)/staging \

From 3e56504d9f5eec801154664f985b4c189340e99d Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sat, 10 Nov 2012 22:08:35 -0500
Subject: [PATCH 5825/6849] group file: define groups expected by udev

udev-182 requires several groups to be resolvable at udev startup,
including disk, cdrom, floppy, tape, audio, video, lp, tty, dialout,
and kmem.  Only some of these are in the default skeleton's group
file, So let's add the missing groups, and plugdev too.

This avoids getting these logs in /var/logs/messages:

Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'dialout' unknown
Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'kmem' unknown
Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'video' unknown
Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'lp' unknown
Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'floppy' unknown
Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'cdrom' unknown
Jan  1 00:00:08 buildroot daemon.err udevd[37]: specified group 'tape' unknown

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 system/skeleton/etc/group | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/skeleton/etc/group b/system/skeleton/etc/group
index 8fc486d1a6..864d1dbd03 100644
--- a/system/skeleton/etc/group
+++ b/system/skeleton/etc/group
@@ -5,10 +5,18 @@ sys:x:3:
 adm:x:4:
 tty:x:5:
 disk:x:6:
+lp:x:7:
+kmem:x:9:
 wheel:x:10:root
+cdrom:x:11:
+dialout:x:18:
+floppy:x:19:
+video:x:28:
 audio:x:29:
+tape:x:32:
 www-data:x:33:
 utmp:x:43:
+plugdev:x:46:
 staff:x:50:
 lock:x:54:
 haldaemon:x:68:

From 5fb26d1bca4cffb207d10a452f1a4b590cc41543 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 15:59:46 -0300
Subject: [PATCH 5826/6849] libgpgme: handle argp-standalone

libgpgme has an internal implementation of argp parsing for when the
libc lacks such an implementation (i.e. uClibc).
However if it detects argp.h the internal implementation is disabled and
for a uClibc-based toolchain that breaks the build.
This happens when argp-standalone is installed since libgpgme never
tries to link to libargp.

Make it link against libargp, which also saves some target size. Fixes:
http://autobuild.buildroot.net/results/33c/33c5776d2b3f7fa276a27f7602eb71c4d77c7b62/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgpgme/libgpgme.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk
index ee983df0f2..9995d913d5 100644
--- a/package/libgpgme/libgpgme.mk
+++ b/package/libgpgme/libgpgme.mk
@@ -10,6 +10,7 @@ LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2
 LIBGPGME_LICENSE = LGPLv2.1+
 LIBGPGME_LICENSE_FILES = COPYING.LESSER
 LIBGPGME_INSTALL_STAGING = YES
+LIBGPGME_DEPENDENCIES = libassuan libgpg-error
 
 # libgpgme, needs to know the gpg binary path on the target.
 LIBGPGME_CONF_OPT = --with-gpg=/usr/bin/gpg \
@@ -18,6 +19,11 @@ LIBGPGME_CONF_OPT = --with-gpg=/usr/bin/gpg \
 	--without-gpgsm \
 	--without-gpgconf \
 	--without-g13
-LIBGPGME_DEPENDENCIES = libassuan libgpg-error
+
+# Handle argp-standalone or it errors out during build
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
+LIBGPGME_CONF_ENV += LIBS="-largp"
+LIBGPGME_DEPENDENCIES += argp-standalone
+endif
 
 $(eval $(autotools-package))

From a8dd2241e615dd590fb1b96f816b8ad9e2f7a080 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 16:26:40 -0300
Subject: [PATCH 5827/6849] dropwatch: fix build failure with binutils 2.23.1+

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...4-build.patch => dropwatch-01-build.patch} |  0
 .../dropwatch-02-binutils-2.23.1.patch        | 74 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 rename package/dropwatch/{dropwatch-1.4-build.patch => dropwatch-01-build.patch} (100%)
 create mode 100644 package/dropwatch/dropwatch-02-binutils-2.23.1.patch

diff --git a/package/dropwatch/dropwatch-1.4-build.patch b/package/dropwatch/dropwatch-01-build.patch
similarity index 100%
rename from package/dropwatch/dropwatch-1.4-build.patch
rename to package/dropwatch/dropwatch-01-build.patch
diff --git a/package/dropwatch/dropwatch-02-binutils-2.23.1.patch b/package/dropwatch/dropwatch-02-binutils-2.23.1.patch
new file mode 100644
index 0000000000..4d43356a6a
--- /dev/null
+++ b/package/dropwatch/dropwatch-02-binutils-2.23.1.patch
@@ -0,0 +1,74 @@
+libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf.
+Patch from https://fedorahosted.org/dropwatch/ticket/5
+Upstream status: new.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -aurd src.orig/lookup.c src/lookup.c
+--- a/src/lookup.c	2011-10-03 22:51:38.000000000 +0400
++++ b/src/lookup.c	2013-02-18 09:13:56.683214438 +0400
+@@ -27,13 +27,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+ #include "lookup.h"
++#include <bfd.h>
+
+ extern struct lookup_methods bfd_methods;
+ extern struct lookup_methods kallsym_methods;
+diff -aurd src.orig/lookup.h src/lookup.h
+--- a/src/lookup.h	2011-10-03 22:51:38.000000000 +0400
++++ b/src/lookup.h	2013-02-18 09:11:00.506895026 +0400
+@@ -28,6 +28,9 @@
+ #include <stdlib.h>
+ #include <asm/types.h>
+
++// satisfy PR 14072 in bfd.h
++#define PACKAGE 1
++#define PACKAGE_VERSION 1
+
+ /*
+  * Initalization routine
+diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c
+--- a/src/lookup_bfd.c	2012-01-16 22:34:11.000000000 +0400
++++ b/src/lookup_bfd.c	2013-02-18 09:14:02.472984310 +0400
+@@ -25,13 +25,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+ #include "lookup.h"
++#include <bfd.h>
+
+
+ static int lookup_bfd_init(void)
+diff -aurd src.orig/lookup_kas.c src/lookup_kas.c
+--- a/src/lookup_kas.c	2012-05-31 02:43:23.000000000 +0400
++++ b/src/lookup_kas.c	2013-02-18 09:14:07.906101713 +0400
+@@ -25,7 +25,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -33,6 +32,7 @@
+ #include <sys/queue.h>
+
+ #include "lookup.h"
++#include <bfd.h>
+
+ struct symbol_entry {
+ 	char *sym_name;

From 0e45583106bb7dcbf7b28624432899bee69f71cf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 31 Jul 2013 16:26:41 -0300
Subject: [PATCH 5828/6849] dropwatch: link with libintl if present

binutils libbfd links to libintl if present, so dropwatch needs it too.
Ugly hardcoded LDFLAGS, but then that's what the dropwatch Makefile
does. Fixes:
http://autobuild.buildroot.net/results/549/54917e7943143e47263b60b4eee3dfc6f0801407/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/dropwatch/dropwatch.mk | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
index 6c3dc754c8..09dff6b911 100644
--- a/package/dropwatch/dropwatch.mk
+++ b/package/dropwatch/dropwatch.mk
@@ -11,20 +11,28 @@ DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf
 DROPWATCH_LICENSE = GPLv2
 DROPWATCH_LICENSE_FILES = COPYING
 
+# libbfd may be linked to libintl
+# Ugly... but LDFLAGS are hardcoded anyway
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -lreadline -lnl-3 -lnl-genl-3"
+endif
+
 define DROPWATCH_BUILD_CMDS
-  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) build
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(DROPWATCH_LDFLAGS) build
 endef
 
 define DROPWATCH_CLEAN_CMDS
-  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
 endef
 
 define DROPWATCH_INSTALL_TARGET_CMDS
-  $(INSTALL) -D -m 0755 $(@D)/src/dropwatch $(TARGET_DIR)/usr/bin/dropwatch
+	$(INSTALL) -D -m 0755 $(@D)/src/dropwatch \
+		$(TARGET_DIR)/usr/bin/dropwatch
 endef
 
 define DROPWATCH_UNINSTALL_CMDS
-  rm -f $(TARGET_DIR)/usr/bin/dropwatch
+	rm -f $(TARGET_DIR)/usr/bin/dropwatch
 endef
 
 $(eval $(generic-package))

From ae86a3c5331f47c4a5093a5ea8f7e53408a6ea98 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 7 Jun 2013 15:21:43 +0200
Subject: [PATCH 5829/6849] linux: Fix uImage with appended DTs generation

Fixes bug #5516 - appended device tree blobs on uImage fails

Before version 3.7 of the kernel, building the zImage and then the
uImage will rewrite the zImage in the process, removing the device tree
we just appended.

Use mkimage to append the device tree to the uImage and rebuild the
headers directly.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 17e9838692..780d6d5e61 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -106,12 +106,6 @@ ifneq ($(LINUX_KERNEL_UIMAGE_LOADADDR),)
 LINUX_MAKE_FLAGS+=LOADADDR="$(LINUX_KERNEL_UIMAGE_LOADADDR)"
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
-LINUX_IMAGE_TARGET=zImage
-else
-LINUX_IMAGE_TARGET=$(LINUX_IMAGE_NAME)
-endif
-
 # Compute the arch path, since i386 and x86_64 are in arch/x86 and not
 # in arch/$(KERNEL_ARCH). Even if the kernel creates symbolic links
 # for bzImage, arch/i386 and arch/x86_64 do not exist when copying the
@@ -226,9 +220,16 @@ define LINUX_APPEND_DTB
 	fi >> $(KERNEL_ARCH_PATH)/boot/zImage
 endef
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
-# We need to generate the uImage here after that so that the uImage is
-# generated with the right image size.
-LINUX_APPEND_DTB += $(sep)$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) uImage
+# We need to generate a new u-boot image that takes into
+# account the extra-size added by the device tree at the end
+# of the image. To do so, we first need to retrieve both load
+# address and entry point for the kernel from the already
+# generate uboot image before using mkimage -l.
+LINUX_APPEND_DTB += $(sep) MKIMAGE_ARGS=`$(HOST_DIR)/usr/bin/mkimage -l $(LINUX_IMAGE_PATH) |\
+        sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
+        $(HOST_DIR)/usr/bin/mkimage -A $(KERNEL_ARCH) -O linux \
+        -T kernel -C none $${MKIMAGE_ARGS} \
+        -d $(KERNEL_ARCH_PATH)/boot/zImage $(LINUX_IMAGE_PATH);
 endif
 endif
 
@@ -237,7 +238,7 @@ endif
 define LINUX_BUILD_CMDS
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
 		cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/)
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_TARGET)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi

From 1ac04c321f892f6b93c0fb548b34be85f8426dc8 Mon Sep 17 00:00:00 2001
From: Nathan Ford <nford@westpond.com>
Date: Wed, 31 Jul 2013 11:47:36 -0400
Subject: [PATCH 5830/6849] Fix building initramfs kernel with appended dtb

The target for building the kernel with a cpio initramfs is not
calling the append dtb commands, creating a final kernel image
without an appended dtb. Instead it needs to call kernel make on
the intermediate target, then call the append dtb commands
to produce the final image as the primary kernel build target
does.

Signed-off-by: Nathan Ford <nford@westpond.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index 780d6d5e61..fc379ec499 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -313,6 +313,7 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
 	# Build the kernel.
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+	$(LINUX_APPEND_DTB)
 	# Copy the kernel image to its final destination
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 	# If there is a .ub file copy it to the final destination

From 235535405cd076b31eb9d355a0e00ba663eca705 Mon Sep 17 00:00:00 2001
From: Reuben Dowle <reuben.dowle@4rf.com>
Date: Wed, 27 Mar 2013 23:01:15 +0000
Subject: [PATCH 5831/6849] Install DTB as part of images install command

When installing DTB to the images directory, do this as part of the image
install commands rather than the target install commands.

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com.az>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index fc379ec499..578d535c3c 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -265,11 +265,11 @@ endef
 
 define LINUX_INSTALL_IMAGES_CMDS
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
+	$(LINUX_INSTALL_DTB)
 endef
 
 define LINUX_INSTALL_TARGET_CMDS
 	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
-	$(LINUX_INSTALL_DTB)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\

From e2a5288552ca0ac70a08f998ddcf74270f94d219 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 1 Aug 2013 18:07:14 +0200
Subject: [PATCH 5832/6849] linux: update help text of
 BR2_LINUX_KERNEL_INSTALL_TARGET

The BR2_LINUX_KERNEL_INSTALL_TARGET option not only copies the kernel
image to /boot, but also the DTBs, if such DTBs are generated by the
build process. It makes sense to mention that in the help text of this
option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/linux/Config.in b/linux/Config.in
index db5e795f74..7274481b7b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -297,6 +297,9 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
 	  /boot in the target root filesystem, as is typically done on
 	  x86/x86_64 systems.
 
+	  Note that this option also installs the Device Tree Blobs to
+	  /boot if DTBs have been generated by the kernel build
+	  process.
 
 # Linux extensions
 source "linux/Config.ext.in"

From 36c966ef07fc10abab7e133915c7411ae52558cf Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 1 Aug 2013 17:57:59 +0200
Subject: [PATCH 5833/6849] CHANGES: update for 2013.08-rc1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/CHANGES b/CHANGES
index 910b94256c..dc1ff14c5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,101 @@
+2013.08-rc1, Released August 5th, 2013:
+
+	Architectures:
+	 - improved support for floating point on ARM and Thumb/Thumb2
+	 - support for ARM OABI removed
+
+	Toolchains:
+         - support added for Sourcery CodeBench ARM and MIPS 2013.05
+         - Linaro ARM and Aarch64 toolchains updated
+	 - support added for the Arago ARMv5 and ARMv7 toolchains
+	 - gcc 4.8.x version bumped
+	 - support for installing both FDPIC and FLAT libraries on
+	   Blackfin
+	 - support for uClibc 0.9.31 removed,
+	 - convert the internal toolchain backend to use the package
+	   infrastructure
+	 - support added for eglibc in the internal toolchain backend
+	 - toolchain components for the ARC architecture updated and
+           gdb for ARC added.
+	 - support for Blackfin in the internal toolchain fixed
+
+	Defconfigs: beaglebone_defconfig updated, new defconfig for
+	CubieBoard, for Olimex mx233 Olinuxino, for Calao Systems
+	TNY-A9G20-LPW.
+
+	A number of packages have been fixed to use the
+	<pkg>_CONFIG_SCRIPTS mechanism to get their <pkg>-config shell
+	script installed and modified properly. Licensing informations
+	has been added to a number of packages.
+
+	Use XZ tarballs for a number of packages.
+
+	Noticeable package changes/additions:
+         - The glib2/libgtk2/webkit stack has been updated to recent
+           versions.
+	 - Support for Gstreamer 1.x has been added.
+	 - OpenGL support for TI OMAP platforms has been added.
+	 - OpenGL support for Allwinner platforms has been added.
+	 - OpenMAX support for RasberryPi has been added.
+
+	Updated/fixed packages: acl, attr, autoconf, avahi, barebox,
+	bind, binutils, busybox, bwm-ng, bzip2, cifs-utils, colletctd,
+	cpanminus, cups, curl, dash, dbus, dhcp, directfb,
+	directfb-examples, dnsmasq, dosfstools, dropbear, dtc,
+	e2fsprogs, ed, efl, enlightenment, erlang, ethtool, fbgrab,
+	fftw, firmware-imx, flot, fltk, freetype, gawk, gdk-pixbuf,
+	gettext, gmp, gnutls, gsl, gutenprint, gvfs, gzip, haserl,
+	hiawatha, httping, icu, imagemagick, imlib2, imx-lib,
+	intltool, iozone, ipset, iptables, jquery, jquery-keyboard,
+	jquery-sparkline, kmod, less, libart, libcdaudio, libcgicc,
+	libesmtp, libftdi, libfuse, libglib2, libgtk, libgtk2, libidn,
+	libiqrf, liblog4c-localtime, libnspr, libnss, libpcap,
+	libroxml, libserial, libsigsev, libsoup, libtool, libtpl,
+	libvncserver, libxml2, linphone, lm_sensors, logrotate,
+	ltrace, lttng, luafilesystem, luajit, minicom, monit, mpg123,
+	mtd, mutt, mxml, neard, netatask, netsnmp, nettle,
+	network-manager, nodejs, nss-mdns, openssh, openswan, openvpn,
+	opkg, opus, pcre, perl-cross, php, pixman, poco, polarssl,
+	pulseaudio, pv, python, python3, qt, qt5, qt5declarative,
+	qt5jsbackend, qt5quick1, readline, rpi-firmware, ruby, samba,
+	sane-backends, sconeserver, sdl_image, sdparm, ser2net,
+	socketcand, sqlite, squid, strace, tcl, tcpdump, tinyhttpd,
+	tvheadend, tzdata, uboot, udpcast, usb_modeswitch,
+	usb_modeswitch_data, usbutils, webkit, wireshark, wvstreams,
+	xapp_luit, xapp_xmodmap, xenomai, xfsprogs, xlib_libX11, zic,
+	zlib.
+
+	New packages: a10disp, aespipe, am33x-cm3, cppcms, dhcpcd,
+	dropwatch, dtc, ecryptfs-utils, eglibc, elf2flt, fdk-aac,
+	gcc-final, gcc-initial, gcc-intermediate, git,
+	gpu-viv-bin-mx6q, gst1-plugins-bad, gst1-plugins-base,
+	gst1-plugins-good, gst1-plugins-ugly, gst-omx,
+	gst-plugin-x170, gstreamer1, jimtcl, lbase64, libassuan,
+	libbsd, libcec, libdvbsi, libedit, libgpgme, libqmi,
+	libqrencode, libsvg, libsvg-cairo, libunwind, libvpx,
+	linux-headers, lockdev, luabitop, luacrypto, lua-ev,
+	luaexpatutils, msgpack, ocrad, on2-8170-libs,
+	on2-8170-modules, p11-kit, pax-utils, ptpd, ptpd2,
+	python-pyro, ramspeed/smp, snappy, strongswan, sunxi-boards,
+	sunxi-cedarx, sunxi-mali, sunxi-tools, ti-gfx, tinymembench,
+	tree, tstools, uclibc, w_scan.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#4718: python (built for powerpc) distutils has paths to host
+               compiler toolchain
+	#5516: appended device tree blobs on uImage fails
+	#6302: Versions of packages retrieved from github.com are wrong
+	#6308: dosfstools download link is wrong
+	#6326: Dropbear: Add options to allow better config for
+               different target devices (e.g. routers)
+	#6338: Wrong download link for minicom package
+	#6344: Wrong handling of license text files with same name and
+               different directory
+	#6374: gnutls package broken if linux cryptodev module
+               selected
+	#6410: omap3_beagle has uimage error load address error
+
 2013.05, Released May 31th, 2013:
 
 	Minor fixes.

From a7d58609acb76d420b38e62e810094617a7a60eb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 5 Aug 2013 11:37:42 +0200
Subject: [PATCH 5834/6849] Prepare for 2013.08-rc1

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 5a0c64a52a..fcfc0be7ce 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.08-git
+export BR2_VERSION:=2013.08-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 85aaa62a04..6c9060bad1 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,15 +14,15 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2013.05.tar.bz2">buildroot-2013.05.tar.bz2</a>.
 
 <p>
-<!--
-The latest release candidate is <b>2013.05-rc3</b>, which can be
+
+The latest release candidate is <b>2013.08-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.05-rc3.tar.gz">buildroot-2013.05-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2013.08-rc1.tar.gz">buildroot-2013.08-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.05-rc3.tar.bz2">buildroot-2013.05-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.08-rc1.tar.bz2">buildroot-2013.08-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index f893807c2f..beb2a40253 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>5 August 2013 -- 2013.08-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see
+    the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08_rc1">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.08-rc1.tar.bz2">2013.08-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>31 May 2013 -- 2013.05 released</b>
 
     <p>The stable 2013.05 release is out - Thanks to everyone

From e0d640232e0ac4f091e06834b4688537bf138136 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 5 Aug 2013 14:41:58 +0200
Subject: [PATCH 5835/6849] Open 2013.11 development cycle

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fcfc0be7ce..caa1e38f81 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.08-rc1
+export BR2_VERSION:=2013.11-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From f23b168cd9b3215c8e83bb64308f93dab085e054 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 5 Aug 2013 15:32:52 +0200
Subject: [PATCH 5836/6849] zeromq: fix build on some compilers due to missing
 newline

Fixes http://autobuild.buildroot.net/results/645b357d470b75baa9a93eb5be4f1dc5c8c337fa/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...romq-0001-test-collect-delay-end-of-line.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch

diff --git a/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch b/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch
new file mode 100644
index 0000000000..6a1a6551df
--- /dev/null
+++ b/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch
@@ -0,0 +1,15 @@
+test_connect_delay: add missing newline at end of file
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+Backported-from: https://github.com/zeromq/zeromq3-x/commit/143ae519b4a325bb68d29e6f7e00cb98a440dd12
+
+diff --git a/tests/test_connect_delay.cpp b/tests/test_connect_delay.cpp
+--- a/tests/test_connect_delay.cpp
++++ b/tests/test_connect_delay.cpp
+@@ -257,4 +257,4 @@ int main (void)
+     
+     rc = zmq_ctx_destroy(context2);
+     assert (rc == 0);
+-}
+\ No newline at end of file
++}

From a785a55e3594f7e0cb265d681aa33dc53c9fe0ee Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Aug 2013 13:21:11 -0300
Subject: [PATCH 5837/6849] samba: security bump to version 3.6.17

Fixes CVE-2013-4124.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index fd90d96d90..71fba08aeb 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA_VERSION = 3.6.16
+SAMBA_VERSION = 3.6.17
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From fb6058356808d515bfa81aae908fd2943953d290 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Aug 2013 13:21:12 -0300
Subject: [PATCH 5838/6849] libgcrypt: security bump to version 1.5.3

Fixes CVE-2013-4242.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libgcrypt/libgcrypt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index f8c0860037..82a824fc8d 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGCRYPT_VERSION = 1.5.2
+LIBGCRYPT_VERSION = 1.5.3
 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
 LIBGCRYPT_LICENSE = LGPLv2.1+
 LIBGCRYPT_LICENSE_FILES = COPYING.LIB

From 5c5e63d319f5c9e89464b3f10348b76c56521650 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 5 Aug 2013 13:21:13 -0300
Subject: [PATCH 5839/6849] gnupg: security bump to version 1.4.14

Fixes CVE-2013-4242.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gnupg/gnupg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index 39088c3c8c..f0c4b034c6 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUPG_VERSION = 1.4.13
+GNUPG_VERSION = 1.4.14
 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
 GNUPG_LICENSE = GPLv3+

From 07203d78c24df74a77d73b17437d37dce41d232e Mon Sep 17 00:00:00 2001
From: Pierre Floury <pierre.floury@gmail.com>
Date: Fri, 2 Aug 2013 14:01:11 +0200
Subject: [PATCH 5840/6849] trace-cmd: new package

This commit adds a new package for the trace-cmd tool.  This tool is a
command line front end of ftrace.  It collects traces on your target.
You can analyse these traces on the target or on the host via the gui
"kernel shark".

[Thomas: use TARGET_CONFIGURE_OPTS, define _GNU_SOURCE to get
O_CLOEXEC definition on uClibc, add thread and largefile
dependencies.]

Signed-off-by: Pierre Floury <pierre.floury@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in              |  1 +
 package/trace-cmd/Config.in    | 16 ++++++++++++++++
 package/trace-cmd/trace-cmd.mk | 26 ++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/trace-cmd/Config.in
 create mode 100644 package/trace-cmd/trace-cmd.mk

diff --git a/package/Config.in b/package/Config.in
index 7069d778e7..f5b14f6084 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -48,6 +48,7 @@ source "package/strace/Config.in"
 source "package/stress/Config.in"
 source "package/sysprof/Config.in"
 source "package/tinymembench/Config.in"
+source "package/trace-cmd/Config.in"
 source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
 source "package/pv/Config.in"
diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in
new file mode 100644
index 0000000000..8d793046a0
--- /dev/null
+++ b/package/trace-cmd/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_TRACE_CMD
+	bool "trace-cmd"
+	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Command line reader for ftrace.
+
+	  To use this profiling tool, you should enable ftrace in your kernel
+	  configuration. This command collect traces on your target.
+	  You can analyse these traces on the target or on the host via the gui
+	  "kernel shark"
+
+	  http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
+
+comment "trace-cmd needs a toolchain with largefile and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
new file mode 100644
index 0000000000..ada0306e3e
--- /dev/null
+++ b/package/trace-cmd/trace-cmd.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# trace-cmd
+#
+################################################################################
+
+TRACE_CMD_VERSION = trace-cmd-v2.2.1
+TRACE_CMD_SITE = http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
+TRACE_CMD_SITE_METHOD = git
+TRACE_CMD_INSTALL_STAGING = YES
+TRACE_CMD_LICENSE = GPLv2 LGPLv2.1
+TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
+
+define TRACE_CMD_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
+		-C $(@D) all
+endef
+
+define TRACE_CMD_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/trace-cmd $(TARGET_DIR)/usr/bin/trace-cmd
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/trace-cmd/plugins
+	$(INSTALL) -D -m 0755 $(@D)/plugin_*.so $(TARGET_DIR)/usr/lib/trace-cmd/plugins
+endef
+
+$(eval $(generic-package))

From d3e45e3f1f5127083fc1252b4b9ac9ca62693696 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 6 Aug 2013 10:54:19 +0200
Subject: [PATCH 5841/6849] opengl: libgles and libegl also provided by
 gpu-viv-bin-mx6q

The gpu-viv-bin-mx6q package selects BR2_PACKAGE_HAS_OPENGL_EGL and
BR2_PACKAGE_HAS_OPENGL_ES, so when it is enabled, Buildroot believes
that OpenGL and EGL support is available.

However, both libgles.mk and libegl.mk do not add the dependency on
gpu-viv-bin-mx6q, so when pulling the libgles or libegl dependencies,
the build fails due to the absence of an OpenGL implementation. This
commit fixes that.

Fixes the build failure at
http://autobuild.buildroot.org/results/dbd/dbd938914883a9e205f967f7b4b4a8a7dc7be117/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/opengl/libegl/libegl.mk   | 4 ++++
 package/opengl/libgles/libgles.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index 97a4b85b57..c194b02764 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_SUNXI_MALI),y)
 LIBEGL_DEPENDENCIES += sunxi-mali
 endif
 
+ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
+LIBEGL_DEPENDENCIES += gpu-viv-bin-mx6q
+endif
+
 ifeq ($(LIBEGL_DEPENDENCIES),)
 define LIBEGL_CONFIGURE_CMDS
 	echo "No libEGL implementation selected. Configuration error."
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index 2945496492..ec157ac506 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_SUNXI_MALI),y)
 LIBGLES_DEPENDENCIES += sunxi-mali
 endif
 
+ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
+LIBGLES_DEPENDENCIES += gpu-viv-bin-mx6q
+endif
+
 ifeq ($(LIBGLES_DEPENDENCIES),)
 define LIBGLES_CONFIGURE_CMDS
 	echo "No libGLES implementation selected. Configuration error."

From f443c8317bfadfdfdfe38a1731dcfbdba3a6d0ae Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 6 Aug 2013 12:46:14 +0200
Subject: [PATCH 5842/6849] eglibc: add comment explaining why we pass -O2

While reviewing the eglibc package, Peter mentionned that it would be
good to add a comment that explains why we explicitly build eglibc
with -O2 instead of using the user selected optimization level. This
commit add such a comment.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/eglibc/eglibc.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index 253dabd4f0..8873a06fee 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -36,6 +36,9 @@ endif
 #
 #  2. We have to execute the configure script with bash and not sh.
 #
+# Note that as mentionned in
+# http://patches.openembedded.org/patch/38849/, eglibc must be built
+# with -O2, so we pass our own CFLAGS and CXXFLAGS below.
 define EGLIBC_CONFIGURE_CMDS
 	mkdir -p $(@D)/build
 	# Do the configuration

From c3c950d0d5d5e8d1382610e259a79d5ddf831941 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 6 Aug 2013 23:59:42 +0200
Subject: [PATCH 5843/6849] git: needs MMU support

Fixes
http://autobuild.buildroot.org/results/b5454e62c6ea18a9d30148c704927e820f29a7d4/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/git/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/git/Config.in b/package/git/Config.in
index 931d460d4f..854c0d4ebf 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GIT
 	bool "git"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # uses fork()
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help

From 3d36ae7e8d70c987aa2e959c1c776542ce05d175 Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Tue, 6 Aug 2013 23:36:20 +0200
Subject: [PATCH 5844/6849] manual: mention LIBFOO_EXTRACT_CMDS

[Samuel: add precision about non-tar archive]
[Thomas: reword with more details. Fix commit title]
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-generic.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index faf70b1d89..fdca612fc8 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -358,6 +358,13 @@ LIBFOO_VERSION = 2.32
 Now, the variables that define what should be performed at the
 different steps of the build process.
 
+* +LIBFOO_EXTRACT_CMDS+ lists the actions to be performed to extract
+  the package. This is generally not needed as tarballs are
+  automatically handled by Buildroot. However, if the package uses a
+  non-standard archive format, such as a ZIP or RAR file, or has a
+  tarball with a non-standard organization, this variable allows to
+  override the package infrastructure default behavior.
+
 * +LIBFOO_CONFIGURE_CMDS+ lists the actions to be performed to
   configure the package before its compilation.
 

From 1430ed1bcc2be51547d86c1cb8e4a68810fb602f Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 6 Aug 2013 10:52:02 +0200
Subject: [PATCH 5845/6849] boost: fix 64-bit build due to ambiguous format
 call

This commit adds a patch imported from the upstream bug tracker, fixing a
problem with boost builds failing for 64-bit, like in autobuild [1].
Refer to [2] for the actual autobuild error.

Upstream did not yet accept this patch, because it is not portable enough
(not OK for Windows builds) [3], but this should not withhold us from fixing
the error in buildroot.

[1] http://autobuild.buildroot.net/results/0f6c2f99b05f57adb557c2ddd686b5072f5e9ecf/
[2] http://lists.busybox.net/pipermail/buildroot/2013-August/076222.html
[3] https://svn.boost.org/trac/boost/ticket/6851

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...mbiguous-format-call-on-64bit-builds.patch | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch

diff --git a/package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch b/package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch
new file mode 100644
index 0000000000..e8972fd726
--- /dev/null
+++ b/package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch
@@ -0,0 +1,27 @@
+boost: fix ambiguous format call on 64-bit builds
+
+Fixes problem:
+
+libs/locale/src/icu/formatter.cpp: In member function
+'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format<CharType>::format(boost::int64_t, size_t&) const':
+libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous
+/ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const
+/ec/include/unicode/numfmt.h:330: note:                 icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const
+/ec/include/unicode/numfmt.h:343: note:                 icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+Backported-from: https://svn.boost.org/trac/boost/ticket/6851
+
+
+diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp
+--- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100
++++ boost_1_49_0/libs/locale/src/icu/formatter.cpp      2012-05-01 14:27:54.000000000 +0100
+@@ -58,7 +58,7 @@
+             virtual string_type format(int64_t value,size_t &code_points) const
+             {
+                 icu::UnicodeString tmp;
+-                icu_fmt_->format(value,tmp);
++                icu_fmt_->format(::int64_t(value),tmp);
+                 code_points=tmp.countChar32();
+                 return cvt_.std(tmp);
+             }

From d372d0b6777f52cd493dc0a892593d4390536ec5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 6 Aug 2013 10:47:24 +0200
Subject: [PATCH 5846/6849] cairo: add patch to fix Blackfin build failure

Fixes
http://autobuild.buildroot.org/results/1b1/1b1e4ad2f00de1e0d1cc9045822751c3882c7493/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../cairo/cairo-001-blackfin-build-fix.patch  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/cairo/cairo-001-blackfin-build-fix.patch

diff --git a/package/cairo/cairo-001-blackfin-build-fix.patch b/package/cairo/cairo-001-blackfin-build-fix.patch
new file mode 100644
index 0000000000..94dff6bb0f
--- /dev/null
+++ b/package/cairo/cairo-001-blackfin-build-fix.patch
@@ -0,0 +1,36 @@
+Fix build on platforms where __USER_LABEL_PREFIX__ is not empty
+
+On most platforms, a C language symbol and its assembly equivalent are
+identical. However, on the Blackfin architecture, this isn't the case,
+the corresponding C language symbol in assembly is prepended with a
+"_". Blackfin therefore has __USER_LABEL_PREFIX__ defined to "_".
+
+Cairo already has some code to cope with __USER_LABEL_PREFIX__, but
+this code isn't completely correct: it prepends both assembly symbols
+and C symbols with __USER_LABEL_PREFIX__, which cannot work.
+
+This patch fixes that by using the existing slim_hidden_asmname() to
+define assembly symbols, and introduce a new slim_hidden_realname()
+for C symbols.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/cairo-compiler-private.h
+===================================================================
+--- a/src/cairo-compiler-private.h
++++ b/src/cairo-compiler-private.h
+@@ -93,12 +93,13 @@
+ 	__asm__ (slim_hidden_asmname (internal))
+ # define slim_hidden_def1(name, internal)				\
+   extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
+-	__attribute__((__alias__(slim_hidden_asmname(internal))))
++	__attribute__((__alias__(slim_hidden_realname(internal))))
+ # define slim_hidden_ulp		slim_hidden_ulp1(__USER_LABEL_PREFIX__)
+ # define slim_hidden_ulp1(x)		slim_hidden_ulp2(x)
+ # define slim_hidden_ulp2(x)		#x
+ # define slim_hidden_asmname(name)	slim_hidden_asmname1(name)
+ # define slim_hidden_asmname1(name)	slim_hidden_ulp #name
++# define slim_hidden_realname(name)     #name
+ #else
+ # define slim_hidden_proto(name)		int _cairo_dummy_prototype(void)
+ # define slim_hidden_proto_no_warn(name)	int _cairo_dummy_prototype(void)

From 6cabf13b2677bb760cbece8c914a6db8d0815637 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 2 Aug 2013 10:57:31 +0200
Subject: [PATCH 5847/6849] cppcms, libcec: fix license typo

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cppcms/cppcms.mk | 2 +-
 package/libcec/libcec.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index d2b11096e7..8d4a519c1d 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -7,7 +7,7 @@
 CPPCMS_VERSION = 1.0.3
 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
 CPPCMS_LICENSE = LGPLv3
-CPPCMS_LICENSE_FILE = COPYING.TXT
+CPPCMS_LICENSE_FILES = COPYING.TXT
 CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
 CPPCMS_INSTALL_STAGING = YES
 
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index 49fa067dda..8a58e1ec5f 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -7,7 +7,7 @@
 LIBCEC_VERSION = libcec-2.1.1
 LIBCEC_SITE = http://github.com/Pulse-Eight/libcec/tarball/$(LIBCEC_VERSION)
 LIBCEC_LICENSE = GPLv2+
-LIBCEC_LICENSE_FILE = COPYING
+LIBCEC_LICENSE_FILES = COPYING
 
 # Autoreconf required due to being a dev tarball and not a release tarball.
 LIBCEC_AUTORECONF = YES

From 8ffc999d851a590091bad44d623364f4c9105989 Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard10@gmail.com>
Date: Tue, 6 Aug 2013 15:53:58 -0700
Subject: [PATCH 5848/6849] Fix ARM uclibc build with !BR2_UCLIBC_ARM_BX.

When BR2_UCLIBC_ARM_BX is not set, UCLIBC_OPT_UNSET gets called with an extra
argument.  Remove it.

Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/uclibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 644c531b56..36a5001d94 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -85,7 +85,7 @@ define UCLIBC_ARM_BX_CONFIG
 endef
 else
 define UCLIBC_ARM_BX_CONFIG
-	$(call UCLIBC_OPT_UNSET,USE_BX,y,$(@D))
+	$(call UCLIBC_OPT_UNSET,USE_BX,$(@D))
 endef
 endif
 

From ae6130953d68406611c5459c513b0d78dfc2f40e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 7 Aug 2013 11:54:14 +0200
Subject: [PATCH 5849/6849] configs: lock kernel version for atngw100_defconfig

The 3.10.x kernels fail to build with the following message:

vsprintf.c:(.text+0x17e0): relocation truncated to fit: R_AVR32_16N_PCREL against symbol `_ctype' defined in .text section in lib/lib.a(ctype.o)

While this is most likely a toolchain issue, but since AVR32 isn't a
well-maintained architecture, there's not much we can do.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 configs/atngw100_defconfig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 4a779e1512..492891590b 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -1,6 +1,10 @@
 # Architecture
 BR2_avr32=y
 
+# Lock down kernel headers version, to match the kernel version used
+# below.
+BR2_KERNEL_HEADERS_3_9=y
+
 # Filesystems
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
@@ -17,6 +21,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09"
 
-# Kernel
+# Kernel. Locked to 3.9.x, because 3.10.x fails to build with
+# relocation truncated to fit: R_AVR32_16N_PCREL against symbol
+# `_ctype'
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11"
 BR2_LINUX_KERNEL_DEFCONFIG="atngw100"

From 7fc685c9e0c9479365ca44158c1e928e57e391a4 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 7 Aug 2013 13:39:55 +0200
Subject: [PATCH 5850/6849] gcc: fix !BR2_LARGEFILE builds

see http://lists.busybox.net/pipermail/buildroot/2013-August/076278.html

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gcc/gcc-final/gcc-final.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 0d9d581ac7..9f54c68420 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -41,6 +41,7 @@ GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGE
 HOST_GCC_FINAL_CONF_OPT = \
 	$(HOST_GCC_COMMON_CONF_OPT) \
 	--enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \
+	$(DISABLE_LARGEFILE) \
 	--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin
 
 ifeq ($(BR2_GCC_ENABLE_OPENMP),y)

From 129233fed6295d154acc2c84b5d51236be4e61d6 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Tue, 6 Aug 2013 17:06:47 -0500
Subject: [PATCH 5851/6849] sunxi-cedarx: fix armel and internal toolchain
 build issues

Fixes autobuilder issues
http://autobuild.buildroot.org/results/a06/a06fe1f2fa2cb57d57524eff5f7b88fe36fdbf68
http://autobuild.buildroot.org/results/328/328b36c3cbf952cccabf16a25fc13f0c3515e8bd

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sunxi-cedarx/sunxi-cedarx.mk | 30 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/package/sunxi-cedarx/sunxi-cedarx.mk b/package/sunxi-cedarx/sunxi-cedarx.mk
index b1c37175c5..07c85d457a 100644
--- a/package/sunxi-cedarx/sunxi-cedarx.mk
+++ b/package/sunxi-cedarx/sunxi-cedarx.mk
@@ -9,14 +9,13 @@ SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CE
 
 SUNXI_CEDARX_INSTALL_STAGING = YES
 
+SUNXI_CEDARX_CONFIGURE_OPTS = \
+	CROSS_COMPILE=$(TARGET_CROSS)
+
 ifeq ($(BR2_ARM_EABIHF),y)
 SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf
-else
-SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel
-endif
-
-define SUNXI_CEDARX_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR)
+# libavheap.so is only available on EABIHF
+define SUNXI_CEDARX_BUILD_AVHEAP
 	$(TARGET_CC) $(TARGET_CFLAGS) \
 		-c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \
 		-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o \
@@ -26,6 +25,19 @@ define SUNXI_CEDARX_BUILD_CMDS
 		-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
 		$(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o
 endef
+define SUNXI_CEDARX_INSTALL_AVHEAP
+	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
+		$(1)/usr/lib/libavheap.so
+endef
+else
+SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel
+endif
+
+define SUNXI_CEDARX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) \
+		$(SUNXI_CEDARX_CONFIGURE_OPTS)
+	$(SUNXI_CEDARX_BUILD_AVHEAP)
+endef
 
 define SUNXI_CEDARX_INSTALL_STAGING_CMDS
 	$(INSTALL) -d -m 755 $(STAGING_DIR)/usr/include/libvecore
@@ -35,15 +47,13 @@ define SUNXI_CEDARX_INSTALL_STAGING_CMDS
 		$(STAGING_DIR)/usr/include/
 	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \
 		$(STAGING_DIR)/usr/lib/libvecore.so
-	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
-		$(STAGING_DIR)/usr/lib/libavheap.so
+	$(call SUNXI_CEDARX_INSTALL_AVHEAP, $(STAGING_DIR))
 endef
 
 define SUNXI_CEDARX_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \
 		$(TARGET_DIR)/usr/lib/libvecore.so
-	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
-		$(TARGET_DIR)/usr/lib/libavheap.so
+	$(call SUNXI_CEDARX_INSTALL_AVHEAP, $(TARGET_DIR))
 endef
 
 $(eval $(generic-package))

From f4ea3fb9587cf626507dc6ba6d07775eed920347 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Tue, 6 Aug 2013 16:47:38 +0200
Subject: [PATCH 5852/6849] barebox: bump to version 2013.08.0

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 156cd73efc..04929ea7be 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.07.0"
+	bool "2013.08.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.07.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.08.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From 98204e8feaaccfdf3a56192aa1f7a24fccafd5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Fri, 9 Aug 2013 09:34:30 +0200
Subject: [PATCH 5853/6849] libffi: Add -mno-compact-eh when compiling for Mips
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix compilation on Mips. Resolve issues detected here:
    http://autobuild.buildroot.net/results/f0c9db496233f53c26e92294d7305aa4511ec7b3/
    http://autobuild.buildroot.net/results/8968690c248df86b040218867f92b573721e872c/
    http://autobuild.buildroot.net/results/a35db8e6a49d022133b486b12f6a8e40b3c95b6e/

Also remove previous special case handling defined in libffi.mk.

[Thomas: add Signed-off-by from Jérôme inside the patch itself.]
Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...Fix-use-of-compact-eh-frames-on-MIPS.patch | 27 +++++++++++++++++++
 package/libffi/libffi.mk                      |  6 -----
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch

diff --git a/package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch
new file mode 100644
index 0000000000..15d1c96ea7
--- /dev/null
+++ b/package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch
@@ -0,0 +1,27 @@
+Newer MIPS toolchains use a different (compact) eh_frame format.
+libffi don't like them, so we have to switch to the older format.
+
+This patch add -mno-compact-eh to CFLAGS when compiling for
+Mips and compiler support it.
+
+Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
+
+--- a/configure.ac	2013-08-08 14:53:11.884267155 +0200
++++ b/configure.ac	2013-08-08 14:54:14.437493244 +0200
+@@ -430,6 +430,16 @@
+ AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1)
+ AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE)
+ 
++if test x$TARGET = xMIPS; then
++    save_CFLAGS="$CFLAGS"
++    CFLAGS=-mno-compact-eh
++    AC_MSG_CHECKING([whether the C compiler needs -mno-compact-eh])
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
++                      [AC_MSG_RESULT([yes])]; [save_CFLAGS="$save_CFLAGS -mno-compact-eh"],
++                      [AC_MSG_RESULT([no])])
++    CFLAGS="$save_CFLAGS"
++fi
++
+ if test x$TARGET = xX86_64; then
+     AC_CACHE_CHECK([assembler supports unwind section type],
+ 	libffi_cv_as_x86_64_unwind_section_type, [
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 51cbbce8cd..0ad5c84ec0 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -11,12 +11,6 @@ LIBFFI_LICENSE_FILES = LICENSE
 LIBFFI_INSTALL_STAGING = YES
 LIBFFI_AUTORECONF = YES
 
-# Newer CS MIPS toolchains use a different (compact) eh_frame format
-# libffi don't like them, just switch to the older format
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209)$(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
-LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
-endif
-
 # Move the headers to the usual location, and adjust the .pc file
 # accordingly.
 define LIBFFI_MOVE_STAGING_HEADERS

From 14d9fc4c746aa7f1c78fe85ce58ccebd2047107c Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 7 Aug 2013 19:34:16 +0200
Subject: [PATCH 5854/6849] strongswan: needs host-pkgconf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/strongswan/strongswan.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index b75c70dbdd..cac68f8a11 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -9,6 +9,7 @@ STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
 STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_LICENSE = GPLv2+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
+STRONGSWAN_DEPENDENCIES = host-pkgconf
 STRONGSWAN_CONF_OPT +=                                                             \
       --enable-pkcs11=yes                                                          \
       --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no)                        \

From e7c8b81b8cd039f0f9899208c069dae37e94cea8 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 7 Aug 2013 19:34:17 +0200
Subject: [PATCH 5855/6849] strongswan: fix build error 'no rule to make target
 libtls.la'

In some strongswan configurations, an implicit dependency could be missing.
This commit patches strongswan to force this dependency when needed.

Fixes several autobuild failures, like:
http://autobuild.buildroot.net/results/643f5b33973d5b12ffe6d84254bf3be9ed81d0ad/
http://autobuild.buildroot.net/results/24bcdcb83119e416c92458fa9ff2f5269957a743/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...trongswan-0001-force-tls-when-needed.patch | 72 +++++++++++++++++++
 package/strongswan/strongswan.mk              |  8 +++
 2 files changed, 80 insertions(+)
 create mode 100644 package/strongswan/strongswan-0001-force-tls-when-needed.patch

diff --git a/package/strongswan/strongswan-0001-force-tls-when-needed.patch b/package/strongswan/strongswan-0001-force-tls-when-needed.patch
new file mode 100644
index 0000000000..8949f62278
--- /dev/null
+++ b/package/strongswan/strongswan-0001-force-tls-when-needed.patch
@@ -0,0 +1,72 @@
+Force libtls when libpttls is enabled
+
+The libpttls library expects libtls.la to be present:
+libpttls_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
+but there is no expressed dependency between them. Therefore, it is possible to
+create a configuration where libpttls is enabled and libtls is not, causing a
+build failure:
+
+make[4]: *** No rule to make target `../../src/libtls/libtls.la', needed by `libpttls.la'.  Stop.
+
+libpttls is enabled through USE_PTTLS, set when tnc_tnccs == true.
+  tnc_tnccs is true when any of tnc-imc, tnc_imv, tnccs_11, tnccs_dynamic or eap_tnc is true.
+
+libtls is enabled through USE_TLS, set when tls == true.
+  tls is true when any of eap_tls, eap_ttls or eap_peap is true.
+
+This patch forces tls to true, when tnc_tnccs is true, so that the required libtls.la dependency
+is built before it is used by libpttls.
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+Upstream-status: will be submitted
+
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -15900,10 +15900,6 @@ if test x$eap_sim = xtrue; then
+ 	simaka=true;
+ fi
+ 
+-if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue; then
+-	tls=true;
+-fi
+-
+ if test x$eap_radius = xtrue -o x$radattr = xtrue -o x$tnc_pdp = xtrue; then
+ 	radius=true;
+ fi
+@@ -15912,6 +15908,10 @@ if test x$tnc_imc = xtrue -o x$tnc_imv =
+ 	tnc_tnccs=true;
+ fi
+ 
++if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue -o x$tnc_tnccs = xtrue; then
++	tls=true;
++fi
++
+ if test x$imc_test = xtrue -o x$imv_test = xtrue -o x$imc_scanner = xtrue -o x$imv_scanner = xtrue -o x$imc_os = xtrue -o x$imv_os = xtrue -o x$imc_attestation = xtrue -o x$imv_attestation = xtrue; then
+ 	imcv=true;
+ fi
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -313,10 +313,6 @@ if test x$eap_sim = xtrue; then
+ 	simaka=true;
+ fi
+ 
+-if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue; then
+-	tls=true;
+-fi
+-
+ if test x$eap_radius = xtrue -o x$radattr = xtrue -o x$tnc_pdp = xtrue; then
+ 	radius=true;
+ fi
+@@ -325,6 +321,10 @@ if test x$tnc_imc = xtrue -o x$tnc_imv =
+ 	tnc_tnccs=true;
+ fi
+ 
++if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue -o x$tnc_tnccs = xtrue; then
++	tls=true;
++fi
++
+ if test x$imc_test = xtrue -o x$imv_test = xtrue -o x$imc_scanner = xtrue -o x$imv_scanner = xtrue -o x$imc_os = xtrue -o x$imv_os = xtrue -o x$imc_attestation = xtrue -o x$imv_attestation = xtrue; then
+ 	imcv=true;
+ fi
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index cac68f8a11..3444f9281b 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -66,4 +66,12 @@ STRONGSWAN_DEPENDENCIES +=                               \
       $(if $(BR2_PACKAGE_MYSQL_CLIENT),mysql_client)
 endif
 
+# Strongswan uses AC_LIB_PREFIX, which is relatively new.
+# Avoid make to try reconfiguring due to timestamp changes,
+# after patching configure{,.in}.
+define STRONGSWAN_AVOID_RECONF_HOOK
+	touch $(@D)/aclocal.m4
+endef
+STRONGSWAN_POST_PATCH_HOOKS += STRONGSWAN_AVOID_RECONF_HOOK
+
 $(eval $(autotools-package))

From 9cbeb341060f0598ba2617006f22cf33b5e943e6 Mon Sep 17 00:00:00 2001
From: Vinicius Tinti <viniciustinti@gmail.com>
Date: Fri, 9 Aug 2013 12:16:46 +0200
Subject: [PATCH 5856/6849] manual: contribute.txt: add patch revision section

Improve the contribute manual section by adding an explanation about patch
review and version.

The section now provides advices in how to respond maintainers requests and how
to proceed on replying them.

[Thomas: further small modifications.]
Signed-off-by: Vinicius Tinti <viniciustinti@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/contribute.txt | 75 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 4 deletions(-)

diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 0106df0a84..f4e1a0ea5d 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -42,10 +42,6 @@ To generate it, run:
 This will generate patch files in the +outgoing+ subdirectory,
 automatically adding the +signed-off-by+ line.
 
-If you want to present the whole patch set in a separate mail, add
-+--cover-letter+ to the previous command line (+man git-format-patch+
-for further information).
-
 Once patch files are generated, you can review/edit the commit message
 before submitting them using your favorite text editor.
 
@@ -62,6 +58,77 @@ Make sure posted *patches are not line-wrapped*, otherwise they cannot
 easily be applied. In such a case, fix your e-mail client, or better,
 use +git send-email+ to send your patches.
 
+Cover letter
+~~~~~~~~~~~~
+
+If you want to present the whole patch set in a separate mail, add
++--cover-letter+ to the +git format-patch+ command (see +man
+git-format-patch+ for further information). This will generate a
+template for an introduction e-mail to your patch series.
+
+A 'cover letter' may be useful to introduce the changes you propose
+in the following cases:
+
+* large number of commits in the series;
+
+* deep impact of the changes in the rest of the project;
+
+* RFC footnote:[RFC: (Request for comments) change proposal];
+
+* whenever you feel it will help presenting your work, your choices,
+  the review process, etc.
+
+Patch revision changelog
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+When improvements are requested, the new revision of each commit
+should include a changelog of the modifications between each
+submission. Note that when your patch series is introduced by a cover
+letter, the changelog may be added in the cover letter rather than in
+the individual commits.
+
+When added to the individual commits, this changelog is added when
+editing the commit message.  Below the +Signed-off-by+ section, add
++---+ and your changelog.
+
+Although the changelog will be visible for the reviewers in the mail
+thread, as well as in http://patchwork.buildroot.org[patchwork], +git+
+will automatically ignores lines below +---+ when the patch will be
+merged. This is the intended behavior: the changelog is not meant to
+be preserved forever in the +git+ history of the project.
+
+Hereafter the recommended layout:
+
+---------------
+Patch title less than 80-character length
+
+Some more paragraph giving some more details.
+
+And yet another paragraph giving more details.
+
+Signed-off-by John Doe <john.doe@noname.org>
+---
+Changes v2 -> v3:
+  - foo bar  (suggested by Jane)
+  - bar buz
+
+Changes v1 -> v2:
+  - alpha bravo  (suggested by John)
+  - charly delta
+---------------
+
+Any patch revision should include the version number. The version number
+is simply composed of the letter +v+ followed by an +integer+ greater or
+equal to two (i.e. "PATCH v2", "PATCH v3" ...).
+
+This can be easily handled with +git format-patch+ by using the option
++--subject-prefix+:
+
+---------------------
+$ git format-patch --subject-prefix "PATCH v4" \
+    -M -o outgoing origin/master
+---------------------
+
 Reviewing/Testing patches
 -------------------------
 

From d2a50dda7d7619b3e061009cc11791052de06cc4 Mon Sep 17 00:00:00 2001
From: "A.R.D" <contact@team-ard.com>
Date: Fri, 9 Aug 2013 12:16:47 +0200
Subject: [PATCH 5857/6849] manual: tips: document how to build the manual

Signed-off-by: A.R.D. <contact@team-ard.com>
Cc: Willy Lambert <lambert.willy@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/make-tips.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index b4a9c123da..e87bbf798e 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -54,6 +54,23 @@ and target trees, the images and the toolchain):
  $ make clean
 --------------------
 
+.Generating the manual:
+
+The present manual sources are located in the 'docs/manual' directory.
+To generate the manual:
+
+---------------------------------
+ $ make manual-clean
+ $ make manual
+---------------------------------
+
+The manual outputs will be generated in 'output/docs/manual'.
+
+.Notes
+- +asciidoc+ is required to build the documentation (see:
+  xref:requirement-optional[]).
+- There is a known issue that you can't build it under Debian Squeeze.
+
 To delete all build products as well as the configuration:
 
 --------------------

From 5664c4af5c79394d36b5d46e4c553f035342c174 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 9 Aug 2013 12:16:48 +0200
Subject: [PATCH 5858/6849] manual: minor typos and formating fixes

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-generic.txt | 16 +++++++++++-----
 docs/manual/contribute.txt              |  8 ++++----
 docs/manual/make-tips.txt               |  8 +++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index fdca612fc8..4e50f8f689 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -99,24 +99,30 @@ of the shell script(s) needing fixing. All these names are relative to
 In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed
 from +$(TARGET_DIR)/usr/bin+, since they are not needed on the target.
 
-Example 1:
-
+.Config script: 'divine' package
+================================
 Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'.
 
-So it's fixup would be:
+So its fixup would be:
 
+--------------------------------
 DIVINE_CONFIG_SCRIPTS = divine-config
+--------------------------------
+================================
 
-Example 2:
-
+.Config script: 'imagemagick' package:
+================================
 Package imagemagick installs the following scripts:
 '$(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config'
 
 So it's fixup would be:
 
+--------------------------------
 IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config
+--------------------------------
+================================
 
 On line 14, we specify the list of dependencies this package relies
 on. These dependencies are listed in terms of lower-case package names,
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index f4e1a0ea5d..3736d61248 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -27,8 +27,8 @@ _rebase_ your development branch on top of the upstream tree before
 generating the patch set. To do so, run:
 
 ---------------------
- $ git fetch --all --tags
- $ git rebase origin/master
+$ git fetch --all --tags
+$ git rebase origin/master
 ---------------------
 
 Here, you are ready to generate then submit your patch set.
@@ -36,7 +36,7 @@ Here, you are ready to generate then submit your patch set.
 To generate it, run:
 
 ---------------------
- $ git format-patch -M -n -s -o outgoing origin/master
+$ git format-patch -M -n -s -o outgoing origin/master
 ---------------------
 
 This will generate patch files in the +outgoing+ subdirectory,
@@ -48,7 +48,7 @@ before submitting them using your favorite text editor.
 Lastly, send/submit your patch set to the Buildroot mailing list:
 
 ---------------------
- $ git send-email --to buildroot@busybox.net outgoing/*
+$ git send-email --to buildroot@busybox.net outgoing/*
 ---------------------
 
 Note that +git+ should be configured to use your mail account.
diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index e87bbf798e..c3fd155721 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -29,8 +29,7 @@ The result of the search shows the help message of the matching items.
  $ make help
 --------------------
 
-.Not all targets are always available,
-
+Not all targets are always available,
 some settings in the +.config+ file may hide some targets:
 
 * +linux-menuconfig+ and +linux-savedefconfig+ only work when
@@ -71,12 +70,15 @@ The manual outputs will be generated in 'output/docs/manual'.
   xref:requirement-optional[]).
 - There is a known issue that you can't build it under Debian Squeeze.
 
+.Reseting Buildroot for a new target:
+
 To delete all build products as well as the configuration:
 
 --------------------
  $ make distclean
 --------------------
 
-Note that if +ccache+ is enabled, running +make clean+ or +distclean+ does
+.Notes
+If +ccache+ is enabled, running +make clean+ or +distclean+ does
 not empty the compiler cache used by Buildroot. To delete it, refer
 to xref:ccache[].

From a768080186ef66684498f33ac0506085fdb9ce50 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Fri, 9 Aug 2013 11:57:28 -0500
Subject: [PATCH 5859/6849] udev:
 s/BR2_TOOLCHAIN_USE_THREADS/BR2_TOOLCHAIN_HAS_THREADS/

Bug fix.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/udev/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/udev/Config.in b/package/udev/Config.in
index ed32c8975e..dd5ad7bd2c 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -32,7 +32,7 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	  libacl, hwdata and libglib2
 
 comment "enabling all extras requires a toolchain with WCHAR and threading support"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_USE_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 endif
 

From 149e4f89604880c355eb8af968b78647ab47fac9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Aug 2013 16:23:39 -0300
Subject: [PATCH 5860/6849] busybox: set/unset CONFIG_NOMMU

Set busybox .config CONFIG_NOMMU appropiately and streamline this new
setting with the previous BUSYBOX_DISABLE_MMU_APPLETS in a single
BUSYBOX_SET_MMU definition (since it's not just applets now).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/busybox/busybox.mk | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index acc9008a34..ad8bdaf702 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -75,6 +75,19 @@ define BUSYBOX_SET_MDEV
 endef
 endif
 
+ifeq ($(BR2_USE_MMU),y)
+define BUSYBOX_SET_MMU
+	$(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG))
+endef
+else
+define BUSYBOX_SET_MMU
+	$(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
 ifeq ($(BR2_LARGEFILE),y)
 define BUSYBOX_SET_LARGEFILE
 	$(call KCONFIG_ENABLE_OPT,CONFIG_LFS,$(BUSYBOX_BUILD_CONFIG))
@@ -133,14 +146,6 @@ define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
 endef
 endif
 
-ifeq ($(BR2_USE_MMU),)
-define BUSYBOX_DISABLE_MMU_APPLETS
-	$(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
-
 ifeq ($(BR2_INIT_BUSYBOX),y)
 define BUSYBOX_SET_INIT
 	$(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
@@ -172,6 +177,7 @@ endif
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
 define BUSYBOX_CONFIGURE_CMDS
+	$(BUSYBOX_SET_MMU)
 	$(BUSYBOX_SET_LARGEFILE)
 	$(BUSYBOX_SET_IPV6)
 	$(BUSYBOX_PREFER_STATIC)
@@ -179,7 +185,6 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_NETKITBASE)
 	$(BUSYBOX_NETKITTELNET)
 	$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
-	$(BUSYBOX_DISABLE_MMU_APPLETS)
 	$(BUSYBOX_SET_INIT)
 	$(BUSYBOX_SET_WATCHDOG)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \

From c798bec25b0f70061dcdb154708e41b962e6b74f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Aug 2013 16:23:40 -0300
Subject: [PATCH 5861/6849] uclibc: set MMU usage accordingly

On architectures that lack a MMU (like blackfin) uclibc just undefined
ARCH_HAS_MMU which disabled ARCH_USE_MMU.
But for other architectures which may or may not have one like ARM we
need to set this according to user choice.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/uclibc.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 644c531b56..e3681c7689 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -241,6 +241,20 @@ define UCLIBC_LARGEFILE_CONFIG
 endef
 endif
 
+#
+# MMU
+#
+
+ifeq ($(BR2_USE_MMU),y)
+define UCLIBC_MMU_CONFIG
+	$(call UCLIBC_OPT_SET,ARCH_USE_MMU,y,$(@D))
+endef
+else
+define UCLIBC_MMU_CONFIG
+	$(call UCLIBC_OPT_UNSET,ARCH_USE_MMU,$(@D))
+endef
+endif
+
 #
 # IPv6
 #

From eeaf658c980d43c6a531614545334ab98d14bbe0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 9 Aug 2013 16:23:41 -0300
Subject: [PATCH 5862/6849] eglibc: needs MMU

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-buildroot/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 396a434ac0..7a26441a05 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -22,6 +22,7 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
 		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
 		   BR2_x86_64
+	depends on BR2_USE_MMU
 	select BR2_TOOLCHAIN_USES_GLIBC
 	# our eglibc.mk enables RPC support
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC

From d1808f90378360850831eb9291ef1d799bd41c6a Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Wed, 7 Aug 2013 18:42:11 +0200
Subject: [PATCH 5863/6849] perl-cross: bump to version 0.7.4

since 0.7.3: install paths adjusted to match mainline perl

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cpanminus/cpanminus.mk | 12 ++++++------
 package/perl/perl.mk           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index 60a72ee593..52921b55b9 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -11,9 +11,9 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA
 
 CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
 CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
-CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl
-CPANMINUS_PERL_SITELIB  = $(TARGET_DIR)/usr/lib/perl
-CPANMINUS_PERL_ARCHLIB  = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
+CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl5
+CPANMINUS_PERL_SITELIB  = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
+CPANMINUS_PERL_ARCHLIB  = $(CPANMINUS_PERL_LIB)/$(PERL_VERSION)/$(CPANMINUS_ARCHNAME)
 CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
 CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
 ifneq ($(BR2_PACKAGE_CPANMINUS_MIRROR),"")
@@ -27,8 +27,8 @@ define CPANMINUS_INSTALL_TARGET_CMDS
 	echo "PERL5LIB=$(CPANMINUS_PERL5LIB) $(CPANMINUS_RUN_PERL) \"\$$@\""    >>$(@D)/run_perl
 	chmod +x $(@D)/run_perl
 	PERL5LIB=$(CPANMINUS_PERL5LIB) \
-	PERL_MM_OPT="DESTDIR=$(CPANMINUS_PERL_SITELIB) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
-	PERL_MB_OPT="--destdir $(CPANMINUS_PERL_SITELIB)" \
+	PERL_MM_OPT="DESTDIR=$(TARGET_DIR) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
+	PERL_MB_OPT="--destdir $(TARGET_DIR)" \
 	RUN_PERL="$(@D)/run_perl" \
 	$(CPANMINUS_RUN_PERL) $(@D)/cpanm \
 		--perl=$(@D)/run_perl \
@@ -36,7 +36,7 @@ define CPANMINUS_INSTALL_TARGET_CMDS
 		--no-man-pages \
 		$(CPANMINUS_MIRROR) \
 		$(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
-	-find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
+	-find $(CPANMINUS_PERL_SITELIB) -type f -name *.bs -exec rm -f {} \;
 endef
 else
 define CPANMINUS_INSTALL_TARGET_CMDS
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 5afaaafbd6..37a38f70a2 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -12,7 +12,7 @@ PERL_LICENSE = Artistic
 PERL_LICENSE_FILES = Artistic
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 0.7.2
+PERL_CROSS_VERSION = 0.7.4
 PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).3
 PERL_CROSS_SITE    = http://download.berlios.de/perlcross
 PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz

From 1f3078b1cccdc0b60e6eac616c25af7957246694 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Aug 2013 19:20:01 +0200
Subject: [PATCH 5864/6849] legacy: add a legacy option for BR2_ARM_OABI

As Arnout noted, we removed the BR2_ARM_OABI option without adding the
corresponding option in Config.in.legacy, so users upgrading to
Buildroot 2013.08 with an OABI configuration would get migrated
automatically to EABI without any warning.

This commit introduces such a legacy option, so that such users would
be explicitly warned about the removal of OABI support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Config.in.legacy | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index b92b656fc5..763f16cb53 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -47,6 +47,17 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2013.08"
 
+config BR2_ARM_OABI
+	bool "ARM OABI support has been removed"
+	select BR2_LEGACY
+	help
+	  The support for the ARM OABI was deprecated since a while,
+	  and has been removed completely from Buildroot. It is also
+	  deprecated in upstream gcc, since gcc 4.7. People should
+	  switch to EABI instead, which should not be a problem as
+	  long as you don't have pre-built OABI binaries in your
+	  system that you can't recompile.
+
 config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK
 	bool "dosfstools dosfsck renamed to fsck.fat"
 	select BR2_LEGACY

From 59e0692095078ec94d85f58e90aee981b5225306 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 7 Aug 2013 20:01:51 +0200
Subject: [PATCH 5865/6849] host-mkpasswd: new package

Since the addition of root password setting support in buildroot, there have
been a few bug reports in this area ([1], [2]). In these cases, the system
mkpasswd did either not work, or did not provide the options we expect, like
-m <method>.

This patch adds a mkpasswd host package, based on the sources from whois. When
a non-empty root password is set, this package is used as a dependency.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

[1] http://lists.busybox.net/pipermail/buildroot/2013-July/075771.html
[2] http://lists.busybox.net/pipermail/buildroot/2013-July/075869.html

[Thomas P: use $(INSTALL) instead of install, put -lcrypt at the end
of build command line to allow gcc to find the crypt() function in
lcrypt.]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/mkpasswd/config.h            |  95 ++++++
 package/mkpasswd/mkpasswd.c          | 456 +++++++++++++++++++++++++++
 package/mkpasswd/mkpasswd.mk         |  25 ++
 package/mkpasswd/utils.c             |  96 ++++++
 package/mkpasswd/utils.h             |  56 ++++
 support/dependencies/dependencies.sh |   8 -
 system/system.mk                     |  10 +-
 7 files changed, 734 insertions(+), 12 deletions(-)
 create mode 100644 package/mkpasswd/config.h
 create mode 100644 package/mkpasswd/mkpasswd.c
 create mode 100644 package/mkpasswd/mkpasswd.mk
 create mode 100644 package/mkpasswd/utils.c
 create mode 100644 package/mkpasswd/utils.h

diff --git a/package/mkpasswd/config.h b/package/mkpasswd/config.h
new file mode 100644
index 0000000000..f345074121
--- /dev/null
+++ b/package/mkpasswd/config.h
@@ -0,0 +1,95 @@
+/* Program version */
+#define VERSION "5.0.26"
+
+/* Configurable features */
+
+/* Always hide legal disclaimers */
+#undef ALWAYS_HIDE_DISCL
+
+/* Default server */
+#define DEFAULTSERVER   "whois.arin.net"
+
+/* Configuration file */
+/*
+#define CONFIG_FILE "/etc/whois.conf"
+*/
+
+
+/* autoconf in cpp macros */
+#ifdef linux
+# define ENABLE_NLS
+#endif
+
+#ifdef __FreeBSD__
+/* which versions? */
+# define HAVE_GETOPT_LONG
+# define HAVE_GETADDRINFO
+# define ENABLE_NLS
+# ifndef LOCALEDIR
+#  define LOCALEDIR "/usr/local/share/locale"
+# endif
+#endif
+
+/* needs unistd.h */
+#if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 200112L
+# define HAVE_GETADDRINFO
+# define HAVE_REGEXEC
+#endif
+
+#if defined __APPLE__ && defined __MACH__
+# define HAVE_GETOPT_LONG
+# define HAVE_GETADDRINFO
+#endif
+
+#if defined __GLIBC__
+# define HAVE_GETOPT_LONG
+# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+#  define HAVE_GETADDRINFO
+# endif
+# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 7
+#  define HAVE_SHA_CRYPT
+# endif
+#endif
+
+/* Unknown versions of Solaris */
+#if defined __SVR4 && defined __sun
+# define HAVE_SHA_CRYPT
+# define HAVE_SOLARIS_CRYPT_GENSALT
+#endif
+
+/* FIXME: which systems lack this? */
+#define HAVE_GETTIMEOFDAY
+/* FIXME: disabled because it does not parse addresses with a netmask length.
+ * The code using it needs to be either fixed or removed.
+#define HAVE_INET_PTON
+*/
+
+/*
+ * Please send patches to correctly ignore old releases which lack a RNG
+ * and add more systems which have one.
+ */
+#ifdef RANDOM_DEVICE
+#elif defined __GLIBC__ \
+	|| defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ \
+	/* AIX >= 5.2? */ \
+	|| defined _AIX52 \
+	/* HP-UX >= B.11.11.09? */ \
+	|| defined  __hpux \
+	/* OS X: */ \
+	|| (defined __APPLE__ && defined __MACH__) \
+	/* Solaris >= 9 (this is >= 7): */ \
+	|| (defined __SVR4 && defined __sun && defined SUSv2) \
+	/* Tru64 UNIX >= 5.1B? */ \
+	|| defined __osf
+# define RANDOM_DEVICE "/dev/urandom"
+#endif
+
+#ifdef ENABLE_NLS
+# ifndef NLS_CAT_NAME
+#  define NLS_CAT_NAME   "whois"
+# endif
+# ifndef LOCALEDIR
+#  define LOCALEDIR     "/usr/share/locale"
+# endif
+#endif
+
diff --git a/package/mkpasswd/mkpasswd.c b/package/mkpasswd/mkpasswd.c
new file mode 100644
index 0000000000..5820f32501
--- /dev/null
+++ b/package/mkpasswd/mkpasswd.c
@@ -0,0 +1,456 @@
+/*
+ * Copyright (C) 2001-2008  Marco d'Itri
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* for crypt, snprintf and strcasecmp */
+#define _XOPEN_SOURCE
+#define _BSD_SOURCE
+
+/* System library */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "config.h"
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#endif
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#ifdef HAVE_XCRYPT
+#include <xcrypt.h>
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_LINUX_CRYPT_GENSALT
+#define _OW_SOURCE
+#include <crypt.h>
+#endif
+#ifdef HAVE_GETTIMEOFDAY
+#include <sys/time.h>
+#endif
+
+/* Application-specific */
+#include "utils.h"
+
+/* Global variables */
+#ifdef HAVE_GETOPT_LONG
+static const struct option longopts[] = {
+    {"method",		optional_argument,	NULL, 'm'},
+    /* for backward compatibility with versions < 4.7.25 (< 20080321): */
+    {"hash",		optional_argument,	NULL, 'H'},
+    {"help",		no_argument,		NULL, 'h'},
+    {"password-fd",	required_argument,	NULL, 'P'},
+    {"stdin",		no_argument,		NULL, 's'},
+    {"salt",		required_argument,	NULL, 'S'},
+    {"rounds",		required_argument,	NULL, 'R'},
+    {"version",		no_argument,		NULL, 'V'},
+    {NULL,		0,			NULL, 0  }
+};
+#else
+extern char *optarg;
+extern int optind;
+#endif
+
+static const char valid_salts[] = "abcdefghijklmnopqrstuvwxyz"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
+
+struct crypt_method {
+    const char *method;		/* short name used by the command line option */
+    const char *prefix;		/* salt prefix */
+    const unsigned int minlen;	/* minimum salt length */
+    const unsigned int maxlen;	/* maximum salt length */
+    const unsigned int rounds;	/* supports a variable number of rounds */
+    const char *desc;		/* long description for the methods list */
+};
+
+static const struct crypt_method methods[] = {
+    /* method		prefix	minlen,	maxlen	rounds description */
+    { "des",		"",	2,	2,	0,
+	N_("standard 56 bit DES-based crypt(3)") },
+    { "md5",		"$1$",	8,	8,	0, "MD5" },
+#if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun)
+    { "bf",		"$2a$", 22,	22,	1, "Blowfish" },
+#endif
+#if defined HAVE_LINUX_CRYPT_GENSALT
+    { "bf",		"$2a$", 22,	22,	1, "Blowfish, system-specific on 8-bit chars" },
+    /* algorithm 2y fixes CVE-2011-2483 */
+    { "bfy",		"$2y$", 22,	22,	1, "Blowfish, correct handling of 8-bit chars" },
+#endif
+#if defined FreeBSD
+    { "nt",		"$3$",  0,	0,	0, "NT-Hash" },
+#endif
+#if defined HAVE_SHA_CRYPT
+    /* http://people.redhat.com/drepper/SHA-crypt.txt */
+    { "sha-256",	"$5$",	8,	16,	1, "SHA-256" },
+    { "sha-512",	"$6$",	8,	16,	1, "SHA-512" },
+#endif
+    /* http://www.crypticide.com/dropsafe/article/1389 */
+    /*
+     * Actually the maximum salt length is arbitrary, but Solaris by default
+     * always uses 8 characters:
+     * http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/ \
+     *   usr/src/lib/crypt_modules/sunmd5/sunmd5.c#crypt_gensalt_impl
+     */
+#if defined __SVR4 && defined __sun
+    { "sunmd5",		"$md5$", 8,	8,	1, "SunMD5" },
+#endif
+    { NULL,		NULL,	0,	0,	0, NULL }
+};
+
+void generate_salt(char *const buf, const unsigned int len);
+void *get_random_bytes(const int len);
+void display_help(int error);
+void display_version(void);
+void display_methods(void);
+
+int main(int argc, char *argv[])
+{
+    int ch, i;
+    int password_fd = -1;
+    unsigned int salt_minlen = 0;
+    unsigned int salt_maxlen = 0;
+    unsigned int rounds_support = 0;
+    const char *salt_prefix = NULL;
+    const char *salt_arg = NULL;
+    unsigned int rounds = 0;
+    char *salt = NULL;
+    char rounds_str[30];
+    char *password = NULL;
+
+#ifdef ENABLE_NLS
+    setlocale(LC_ALL, "");
+    bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
+    textdomain(NLS_CAT_NAME);
+#endif
+
+    /* prepend options from environment */
+    argv = merge_args(getenv("MKPASSWD_OPTIONS"), argv, &argc);
+
+    while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:5P:R:sS:V", longopts, 0))
+	    > 0) {
+	switch (ch) {
+	case '5':
+	    optarg = (char *) "md5";
+	    /* fall through */
+	case 'm':
+	case 'H':
+	    if (!optarg || strcaseeq("help", optarg)) {
+		display_methods();
+		exit(0);
+	    }
+	    for (i = 0; methods[i].method != NULL; i++)
+		if (strcaseeq(methods[i].method, optarg)) {
+		    salt_prefix = methods[i].prefix;
+		    salt_minlen = methods[i].minlen;
+		    salt_maxlen = methods[i].maxlen;
+		    rounds_support = methods[i].rounds;
+		    break;
+		}
+	    if (!salt_prefix) {
+		fprintf(stderr, _("Invalid method '%s'.\n"), optarg);
+		exit(1);
+	    }
+	    break;
+	case 'P':
+	    {
+		char *p;
+		password_fd = strtol(optarg, &p, 10);
+		if (p == NULL || *p != '\0' || password_fd < 0) {
+		    fprintf(stderr, _("Invalid number '%s'.\n"), optarg);
+		    exit(1);
+		}
+	    }
+	    break;
+	case 'R':
+	    {
+		char *p;
+		rounds = strtol(optarg, &p, 10);
+		if (p == NULL || *p != '\0' || rounds < 0) {
+		    fprintf(stderr, _("Invalid number '%s'.\n"), optarg);
+		    exit(1);
+		}
+	    }
+	    break;
+	case 's':
+	    password_fd = 0;
+	    break;
+	case 'S':
+	    salt_arg = optarg;
+	    break;
+	case 'V':
+	    display_version();
+	    exit(0);
+	case 'h':
+	    display_help(EXIT_SUCCESS);
+	default:
+	    fprintf(stderr, _("Try '%s --help' for more information.\n"),
+		    argv[0]);
+	    exit(1);
+	}
+    }
+    argc -= optind;
+    argv += optind;
+
+    if (argc == 2 && !salt_arg) {
+	password = argv[0];
+	salt_arg = argv[1];
+    } else if (argc == 1) {
+	password = argv[0];
+    } else if (argc == 0) {
+    } else {
+	display_help(EXIT_FAILURE);
+    }
+
+    /* default: DES password */
+    if (!salt_prefix) {
+	salt_minlen = methods[0].minlen;
+	salt_maxlen = methods[0].maxlen;
+	salt_prefix = methods[0].prefix;
+    }
+
+    if (streq(salt_prefix, "$2a$") || streq(salt_prefix, "$2y$")) {
+	/* OpenBSD Blowfish and derivatives */
+	if (rounds <= 5)
+	    rounds = 5;
+	/* actually for 2a/2y it is the logarithm of the number of rounds */
+	snprintf(rounds_str, sizeof(rounds_str), "%02u$", rounds);
+    } else if (rounds_support && rounds)
+	snprintf(rounds_str, sizeof(rounds_str), "rounds=%u$", rounds);
+    else
+	rounds_str[0] = '\0';
+
+    if (salt_arg) {
+	unsigned int c = strlen(salt_arg);
+	if (c < salt_minlen || c > salt_maxlen) {
+	    if (salt_minlen == salt_maxlen)
+		fprintf(stderr, ngettext(
+			"Wrong salt length: %d byte when %d expected.\n",
+			"Wrong salt length: %d bytes when %d expected.\n", c),
+			c, salt_maxlen);
+	    else
+		fprintf(stderr, ngettext(
+			"Wrong salt length: %d byte when %d <= n <= %d"
+			" expected.\n",
+			"Wrong salt length: %d bytes when %d <= n <= %d"
+			" expected.\n", c),
+			c, salt_minlen, salt_maxlen);
+	    exit(1);
+	}
+	while (c-- > 0) {
+	    if (strchr(valid_salts, salt_arg[c]) == NULL) {
+		fprintf(stderr, _("Illegal salt character '%c'.\n"),
+			salt_arg[c]);
+		exit(1);
+	    }
+	}
+
+	salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
+		+ strlen(salt_arg) + 1));
+	*salt = '\0';
+	strcat(salt, salt_prefix);
+	strcat(salt, rounds_str);
+	strcat(salt, salt_arg);
+    } else {
+#ifdef HAVE_SOLARIS_CRYPT_GENSALT
+#error "This code path is untested on Solaris. Please send a patch."
+	salt = crypt_gensalt(salt_prefix, NULL);
+	if (!salt)
+		perror(stderr, "crypt_gensalt");
+#elif defined HAVE_LINUX_CRYPT_GENSALT
+	void *entropy = get_random_bytes(64);
+
+	salt = crypt_gensalt(salt_prefix, rounds, entropy, 64);
+	if (!salt) {
+		fprintf(stderr, "crypt_gensalt failed.\n");
+		exit(2);
+	}
+	free(entropy);
+#else
+	unsigned int salt_len = salt_maxlen;
+
+	if (salt_minlen != salt_maxlen) { /* salt length can vary */
+	    srand(time(NULL) + getpid());
+	    salt_len = rand() % (salt_maxlen - salt_minlen + 1) + salt_minlen;
+	}
+
+	salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
+		+ salt_len + 1));
+	*salt = '\0';
+	strcat(salt, salt_prefix);
+	strcat(salt, rounds_str);
+	generate_salt(salt + strlen(salt), salt_len);
+#endif
+    }
+
+    if (password) {
+    } else if (password_fd != -1) {
+	FILE *fp;
+	char *p;
+
+	if (isatty(password_fd))
+	    fprintf(stderr, _("Password: "));
+	password = NOFAIL(malloc(128));
+	fp = fdopen(password_fd, "r");
+	if (!fp) {
+	    perror("fdopen");
+	    exit(2);
+	}
+	if (!fgets(password, 128, fp)) {
+	    perror("fgets");
+	    exit(2);
+	}
+
+	p = strpbrk(password, "\n\r");
+	if (p)
+	    *p = '\0';
+    } else {
+	password = getpass(_("Password: "));
+	if (!password) {
+	    perror("getpass");
+	    exit(2);
+	}
+    }
+
+    {
+	const char *result;
+	result = crypt(password, salt);
+	/* xcrypt returns "*0" on errors */
+	if (!result || result[0] == '*') {
+	    fprintf(stderr, "crypt failed.\n");
+	    exit(2);
+	}
+	/* yes, using strlen(salt_prefix) on salt. It's not
+	 * documented whether crypt_gensalt may change the prefix */
+	if (!strneq(result, salt, strlen(salt_prefix))) {
+	    fprintf(stderr, _("Method not supported by crypt(3).\n"));
+	    exit(2);
+	}
+	printf("%s\n", result);
+    }
+
+    exit(0);
+}
+
+#ifdef RANDOM_DEVICE
+void* get_random_bytes(const int count)
+{
+    char *buf;
+    int fd;
+
+    buf = NOFAIL(malloc(count));
+    fd = open(RANDOM_DEVICE, O_RDONLY);
+    if (fd < 0) {
+	perror("open(" RANDOM_DEVICE ")");
+	exit(2);
+    }
+    if (read(fd, buf, count) != count) {
+	if (count < 0)
+	    perror("read(" RANDOM_DEVICE ")");
+	else
+	    fprintf(stderr, "Short read of %s.\n", RANDOM_DEVICE);
+	exit(2);
+    }
+    close(fd);
+
+    return buf;
+}
+#endif
+
+#ifdef RANDOM_DEVICE
+
+void generate_salt(char *const buf, const unsigned int len)
+{
+    unsigned int i;
+
+    unsigned char *entropy = get_random_bytes(len * sizeof(unsigned char));
+    for (i = 0; i < len; i++)
+	buf[i] = valid_salts[entropy[i] % (sizeof valid_salts - 1)];
+    buf[i] = '\0';
+}
+
+#else /* RANDOM_DEVICE */
+
+void generate_salt(char *const buf, const unsigned int len)
+{
+    unsigned int i;
+
+# ifdef HAVE_GETTIMEOFDAY
+    struct timeval tv;
+
+    gettimeofday(&tv, NULL);
+    srand(tv.tv_sec ^ tv.tv_usec);
+
+# else /* HAVE_GETTIMEOFDAY */
+#  warning "This system lacks a strong enough random numbers generator!"
+
+    /*
+     * The possible values of time over one year are 31536000, which is
+     * two orders of magnitude less than the allowed entropy range (2^32).
+     */
+    srand(time(NULL) + getpid());
+
+# endif /* HAVE_GETTIMEOFDAY */
+
+    for (i = 0; i < len; i++)
+	buf[i] = valid_salts[rand() % (sizeof valid_salts - 1)];
+    buf[i] = '\0';
+}
+
+#endif /* RANDOM_DEVICE */
+
+void display_help(int error)
+{
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr,
+	    _("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+	    "Crypts the PASSWORD using crypt(3).\n\n"));
+    fprintf(stderr, _(
+"      -m, --method=TYPE     select method TYPE\n"
+"      -5                    like --method=md5\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
+"      -P, --password-fd=NUM read the password from file descriptor NUM\n"
+"                            instead of /dev/tty\n"
+"      -s, --stdin           like --password-fd=0\n"
+"      -h, --help            display this help and exit\n"
+"      -V, --version         output version information and exit\n"
+"\n"
+"If PASSWORD is missing then it is asked interactively.\n"
+"If no SALT is specified, a random one is generated.\n"
+"If TYPE is 'help', available methods are printed.\n"
+"\n"
+"Report bugs to %s.\n"), "<md+whois@linux.it>");
+    exit(error);
+}
+
+void display_version(void)
+{
+    printf("mkpasswd %s\n\n", VERSION);
+    puts("Copyright (C) 2001-2008 Marco d'Itri\n"
+"This is free software; see the source for copying conditions.  There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
+}
+
+void display_methods(void)
+{
+    unsigned int i;
+
+    printf(_("Available methods:\n"));
+    for (i = 0; methods[i].method != NULL; i++)
+	printf("%s\t%s\n", methods[i].method, methods[i].desc);
+}
+
diff --git a/package/mkpasswd/mkpasswd.mk b/package/mkpasswd/mkpasswd.mk
new file mode 100644
index 0000000000..dc6de19bc2
--- /dev/null
+++ b/package/mkpasswd/mkpasswd.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# mkpasswd
+#
+################################################################################
+
+# source included in buildroot, taken from
+# https://github.com/rfc1036/whois/blob/master/
+# at revision 5a0f08500fa51608b6d3b73ee338be38c692eadb
+HOST_MKPASSWD_SOURCE =
+HOST_MKPASSWD_LICENSE = GPLv2+
+
+define HOST_MKPASSWD_BUILD_CMDS
+	$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+		package/mkpasswd/mkpasswd.c package/mkpasswd/utils.c \
+		-o $(@D)/mkpasswd -lcrypt
+endef
+
+define HOST_MKPASSWD_INSTALL_CMDS
+	$(INSTALL) -D -m 755 $(@D)/mkpasswd $(HOST_DIR)/usr/bin/mkpasswd
+endef
+
+$(eval $(host-generic-package))
+
+MKPASSWD = $(HOST_DIR)/usr/bin/mkpasswd
diff --git a/package/mkpasswd/utils.c b/package/mkpasswd/utils.c
new file mode 100644
index 0000000000..254bf2ac68
--- /dev/null
+++ b/package/mkpasswd/utils.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright 1999-2008 by Marco d'Itri <md@linux.it>.
+ *
+ * do_nofail and merge_args come from the module-init-tools package.
+ * Copyright 2001 by Rusty Russell.
+ * Copyright 2002, 2003 by Rusty Russell, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* for strdup */
+#define _XOPEN_SOURCE 500
+
+/* System library */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+
+/* Application-specific */
+#include "utils.h"
+
+void *do_nofail(void *ptr, const char *file, const int line)
+{
+    if (ptr)
+	return ptr;
+
+    err_quit("Memory allocation failure at %s:%d.", file, line);
+}
+
+/* Prepend options from a string. */
+char **merge_args(char *args, char *argv[], int *argc)
+{
+    char *arg, *argstring;
+    char **newargs = NULL;
+    unsigned int i, num_env = 0;
+
+    if (!args)
+	return argv;
+
+    argstring = NOFAIL(strdup(args));
+    for (arg = strtok(argstring, " "); arg; arg = strtok(NULL, " ")) {
+	num_env++;
+	newargs = NOFAIL(realloc(newargs,
+		    sizeof(newargs[0]) * (num_env + *argc + 1)));
+	newargs[num_env] = arg;
+    }
+
+    if (!newargs)
+	return argv;
+
+    /* Append commandline args */
+    newargs[0] = argv[0];
+    for (i = 1; i <= *argc; i++)
+	newargs[num_env + i] = argv[i];
+
+    *argc += num_env;
+    return newargs;
+}
+
+/* Error routines */
+void err_sys(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    fprintf(stderr, ": %s\n", strerror(errno));
+    va_end(ap);
+    exit(2);
+}
+
+void err_quit(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    fputs("\n", stderr);
+    va_end(ap);
+    exit(2);
+}
+
diff --git a/package/mkpasswd/utils.h b/package/mkpasswd/utils.h
new file mode 100644
index 0000000000..0f226aee2f
--- /dev/null
+++ b/package/mkpasswd/utils.h
@@ -0,0 +1,56 @@
+#ifndef WHOIS_UTILS_H
+#define WHOIS_UTILS_H
+
+/* Convenience macros */
+#define streq(a, b) (strcmp(a, b) == 0)
+#define strcaseeq(a, b) (strcasecmp(a, b) == 0)
+#define strneq(a, b, n) (strncmp(a, b, n) == 0)
+#define strncaseeq(a, b, n) (strncasecmp(a, b, n) == 0)
+
+#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__)
+
+/* Portability macros */
+#ifdef __GNUC__
+# define NORETURN __attribute__((noreturn))
+#else
+# define NORETURN
+#endif
+
+#ifndef AI_IDN
+# define AI_IDN 0
+#endif
+
+#ifndef AI_ADDRCONFIG
+# define AI_ADDRCONFIG 0
+#endif
+
+#ifdef HAVE_GETOPT_LONG
+# define GETOPT_LONGISH(c, v, o, l, i) getopt_long(c, v, o, l, i)
+#else
+# define GETOPT_LONGISH(c, v, o, l, i) getopt(c, v, o)
+#endif
+
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# include <locale.h>
+# define _(a) (gettext(a))
+# ifdef gettext_noop
+#  define N_(a) gettext_noop(a)
+# else
+#  define N_(a) (a)
+# endif
+#else
+# define _(a) (a)
+# define N_(a) (a)
+# define ngettext(a, b, c) ((c==1) ? (a) : (b))
+#endif
+
+
+/* Prototypes */
+void *do_nofail(void *ptr, const char *file, const int line);
+char **merge_args(char *args, char *argv[], int *argc);
+
+void err_quit(const char *fmt, ...) NORETURN;
+void err_sys(const char *fmt, ...) NORETURN;
+
+#endif
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 61a4140abe..bce5cc6663 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -173,14 +173,6 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then
     done
 fi
 
-if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $BUILDROOT_CONFIG > /dev/null 2>&1; then
-    if ! which mkpasswd > /dev/null 2>&1; then
-        /bin/echo -e "\nYou need the 'mkpasswd' utility to set the root password\n"
-        /bin/echo -e "(in Debian/ubuntu, 'mkpasswd' provided by the whois package)\n"
-        exit 1
-    fi
-fi
-
 if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then
     if test ! -f /lib/ld-linux.so.2 ; then
 	/bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture,"
diff --git a/system/system.mk b/system/system.mk
index df8c802d84..b4ddc3e6e1 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -2,9 +2,6 @@ TARGET_GENERIC_HOSTNAME := $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
 TARGET_GENERIC_ISSUE := $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
 TARGET_GENERIC_ROOT_PASSWD := $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
 TARGET_GENERIC_PASSWD_METHOD := $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
-ifneq ($(TARGET_GENERIC_ROOT_PASSWD),)
-TARGET_GENERIC_ROOT_PASSWD_HASH = $(shell mkpasswd -m "$(TARGET_GENERIC_PASSWD_METHOD)" "$(TARGET_GENERIC_ROOT_PASSWD)")
-endif
 TARGET_GENERIC_GETTY := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
 TARGET_GENERIC_GETTY_BAUDRATE := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
 TARGET_GENERIC_GETTY_TERM := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
@@ -23,8 +20,13 @@ target-generic-issue:
 	mkdir -p $(TARGET_DIR)/etc
 	echo "$(TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue
 
+ifneq ($(TARGET_GENERIC_ROOT_PASSWD),)
+target-root-passwd: host-mkpasswd
+endif
 target-root-passwd:
-	$(SED) 's,^root:[^:]*:,root:$(TARGET_GENERIC_ROOT_PASSWD_HASH):,' $(TARGET_DIR)/etc/shadow
+	[ -n "$(TARGET_GENERIC_ROOT_PASSWD)" ] && \
+		TARGET_GENERIC_ROOT_PASSWD_HASH=$$($(MKPASSWD) -m "$(TARGET_GENERIC_PASSWD_METHOD)" "$(TARGET_GENERIC_ROOT_PASSWD)"); \
+	$(SED) "s,^root:[^:]*:,root:$$TARGET_GENERIC_ROOT_PASSWD_HASH:," $(TARGET_DIR)/etc/shadow
 
 target-generic-getty-busybox:
 	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \

From 97565866e8a1da66d86d36b9cbd28fb1ffb8c2b2 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Tue, 30 Jul 2013 18:32:30 +0200
Subject: [PATCH 5866/6849] toolchain-external: don't create gdb symlink when
 building host-gdb

The external-toolchain infrastructure creates symbolic links for all
tools in the host directory. However, when buildroot builds its own
version of a cross debugger (BR2_PACKAGE_HOST_GDB), and the toolchain
also provides a cross debugger, there would be two symbolic links for
gdb in the host directory, which is confusing.
An example use case is where the external toolchain only provides a
64-bit gdbserver (e.g. Cavium Networks SDK) but the target is completely
32-bit (e.g. n32 ABI). In this case, using gdbserver on target requires
copying a bunch of 64-bit libraries to the target as well, just for gdb.
In this case, one can let buildroot build both gdbserver as cross-gdb
(both in 32-bit).

This patch modifies the symlink creation so that no gdb (or gdbtui)
symlink is created if buildroot is going to build a cross-gdb.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a3c40c873b..01be85c672 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -531,8 +531,9 @@ ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y)
 TOOLCHAIN_EXTERNAL_INSTALL += $(STAMP_DIR)/ext-toolchain-bfin-shared-flat-installed
 endif
 
-# Build toolchain wrapper for preprocessor, C and C++ compiler, and setup
-# symlinks for everything else
+# Build toolchain wrapper for preprocessor, C and C++ compiler and setup
+# symlinks for everything else. Skip gdb symlink when we are building our
+# own gdb to prevent two gdb's in output/host/usr/bin.
 $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL)
 	$(Q)$(call MESSAGE,"Building ext-toolchain wrapper")
 	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
@@ -542,6 +543,11 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL)
 		*cc|*cc-*|*++|*++-*|*cpp) \
 			ln -sf $(@F) $$base; \
 			;; \
+		*gdb|*gdbtui) \
+			if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \
+				ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
+			fi \
+			;; \
 		*) \
 			ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
 			;; \

From b40ad28a54e17333fa380cf133e7f0ffc9834a46 Mon Sep 17 00:00:00 2001
From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Date: Thu, 8 Aug 2013 16:08:05 +0530
Subject: [PATCH 5867/6849] uclibc: arc: Add susv3 legacy alias bcmp

This fixes the building of screen package for ARC

Reported-by: Mischa Jonker <mjonker@synopsys.com>
Cc: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../0.9.33-arc/fix-susv3-legacy-bcmp.patch    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch

diff --git a/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch b/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch
new file mode 100644
index 0000000000..e0884ea7bc
--- /dev/null
+++ b/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch
@@ -0,0 +1,37 @@
+From 0594ba53b9b8d9a1ac409fd187e4d1ba8f2e7f2a Mon Sep 17 00:00:00 2001
+From: Vineet Gupta <vgupta@synopsys.com>
+Date: Thu, 8 Aug 2013 15:41:51 +0530
+Subject: [PATCH] ARC: SuSv3 legacy support: Add "bcmp" alias for memcmp
+
+Although uClibc provides this already as UCLIBC_SUSV3_LEGACY_MACROS,
+that however requires UCLIBC_SUSV3_LEGACY to be switched off, causing a
+bunch of other things to be not available (usleep)
+
+Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
+---
+ libc/string/arc/memcmp.S | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libc/string/arc/memcmp.S b/libc/string/arc/memcmp.S
+index 0c7c345..cb25990 100644
+--- a/libc/string/arc/memcmp.S
++++ b/libc/string/arc/memcmp.S
+@@ -1,6 +1,7 @@
+ /* Copyright (C) 2007 ARC International (UK) LTD */
+ 
+ #include <bits/asm.h>
++#include <features.h>
+ 
+ #ifdef __LITTLE_ENDIAN__
+ #define WORD2 r2
+@@ -115,3 +116,7 @@ ENTRY(memcmp)
+ 	j_s.d	[blink]
+ 	mov	r0,0
+ ENDFUNC(memcmp)
++
++#ifdef __UCLIBC_SUSV3_LEGACY__
++strong_alias(memcmp,bcmp)
++#endif
+-- 
+1.8.1.2
+

From 2ba1014009b4b2b2db298e8a5615c8d8e92ef641 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 2 Aug 2013 09:33:53 +0200
Subject: [PATCH 5868/6849] dependencies: build without ccache

This patch forces the plain host compiler to be used during the building of
dependencies, without ccache as it is not yet built.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/dependencies/dependencies.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index a2d229c957..934da40bba 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -25,6 +25,8 @@ core-dependencies:
 		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
 		$(TOPDIR)/support/dependencies/dependencies.sh
 
+dependencies: HOSTCC=$(HOSTCC_NOCCACHE)
+dependencies: HOSTCXX=$(HOSTCXX_NOCCACHE)
 dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
 
 dependencies-source:

From db443f263a6d51ce6da6557d825a453676f6c664 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 2 Aug 2013 09:33:54 +0200
Subject: [PATCH 5869/6849] host-ccache: turn into a proper dependency

This patch moves the host-ccache build target from BASE_TARGETS in Makefile
to an actual host prerequisite in support/dependencies. This causes
host-ccache to be built as part of the dependencies, before any real package
is built.
Since the dependencies are built without ccache anyway, there is no need to
set HOST_CCACHE_CONF_ENV anymore.

Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile                             | 4 ----
 package/ccache/ccache.mk             | 6 ------
 support/dependencies/dependencies.mk | 4 ++++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index caa1e38f81..65127b2482 100644
--- a/Makefile
+++ b/Makefile
@@ -222,10 +222,6 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 #
 ################################################################################
 
-ifeq ($(BR2_CCACHE),y)
-BASE_TARGETS += host-ccache
-endif
-
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 BASE_TARGETS += toolchain-buildroot
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index c5cb966458..bead908c3c 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -10,12 +10,6 @@ CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
 CCACHE_LICENSE = GPLv3+, others
 CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
-# When ccache is being built for the host, ccache is not yet
-# available, so we have to use the special C compiler without the
-# cache.
-HOST_CCACHE_CONF_ENV = \
-	CC="$(HOSTCC_NOCCACHE)"
-
 # Force ccache to use its internal zlib. The problem is that without
 # this, ccache would link against the zlib of the build system, but we
 # might build and install a different version of zlib in $(O)/host
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index 934da40bba..4a220e0e02 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -20,6 +20,10 @@ ifeq ($(BR2_STRIP_sstrip),y)
 DEPENDENCIES_HOST_PREREQ+=host-sstrip
 endif
 
+ifeq ($(BR2_CCACHE),y)
+DEPENDENCIES_HOST_PREREQ += host-ccache
+endif
+
 core-dependencies:
 	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
 		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \

From f1db8f21461646b4a1ba63c0227732f569834ba3 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 2 Aug 2013 09:33:55 +0200
Subject: [PATCH 5870/6849] crosstool-ng: remove unneed explicit ccache
 dependency

This ccache dependency was here to enforce build order.
It is not needed anymore.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/crosstool-ng/crosstool-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index d3ee5f8c9b..8d98db4c18 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -11,7 +11,7 @@ CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
 
 HOST_CROSSTOOL_NG_DEPENDENCIES = \
-	$(if $(BR2_CCACHE),host-ccache) host-gawk \
+	host-gawk \
 	host-automake host-gperf host-bison host-flex \
 	host-texinfo
 

From de5a08f5b5a8afc0d5ef68307a8fb5cbce810d16 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 2 Aug 2013 09:33:56 +0200
Subject: [PATCH 5871/6849] sstrip: remove unneed explicit ccache dependency

This ccache dependency was here to enforce the build order.
It is not needed anymore.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sstrip/sstrip.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
index be8c563f0a..c79a501135 100644
--- a/package/sstrip/sstrip.mk
+++ b/package/sstrip/sstrip.mk
@@ -8,11 +8,6 @@ SSTRIP_SITE = svn://dev.openwrt.org/openwrt/trunk/tools/sstrip
 SSTRIP_VERSION = 20154
 HOST_SSTRIP_BINARY = $(GNU_TARGET_NAME)-sstrip
 
-# This is a kludge to get host-ccache built before us or it fails
-ifeq ($(BR2_CCACHE),y)
-HOST_SSTRIP_DEPENDENCIES = host-ccache
-endif
-
 define SSTRIP_BUILD_CMDS
 	cd $(@D) ; \
 	$(TARGET_CC) $(TARGET_CFLAGS) -include endian.h -include byteswap.h \

From b6fb2f5018fe0ae9bba275991efc502236422924 Mon Sep 17 00:00:00 2001
From: "Paul B. Henson" <henson@acm.org>
Date: Sun, 28 Jul 2013 20:14:14 -0700
Subject: [PATCH 5872/6849] kobs-ng: new package

[Thomas: change license to GPLv2+, slightly reword Config.in
description, add a BR2_arm dependency.]

Signed-off-by: Paul B. Henson <henson@acm.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/kobs-ng/Config.in                     |  9 +++
 package/kobs-ng/kobs-ng-fix-mtd-defines.patch | 73 +++++++++++++++++++
 package/kobs-ng/kobs-ng.mk                    | 13 ++++
 4 files changed, 96 insertions(+)
 create mode 100644 package/kobs-ng/Config.in
 create mode 100644 package/kobs-ng/kobs-ng-fix-mtd-defines.patch
 create mode 100644 package/kobs-ng/kobs-ng.mk

diff --git a/package/Config.in b/package/Config.in
index f5b14f6084..7199a361e2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -208,6 +208,7 @@ source "package/f2fs-tools/Config.in"
 source "package/flashbench/Config.in"
 source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
+source "package/kobs-ng/Config.in"
 source "package/makedevs/Config.in"
 source "package/mtd/Config.in"
 source "package/nfs-utils/Config.in"
diff --git a/package/kobs-ng/Config.in b/package/kobs-ng/Config.in
new file mode 100644
index 0000000000..1f6b2d16cc
--- /dev/null
+++ b/package/kobs-ng/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_KOBS_NG
+	bool "kobs-ng"
+	depends on BR2_arm
+	help
+	  The kobs-ng tool is used for writing images to NAND on i.MX
+	  platforms.
+
+	  This utility is provided by Freescale as-is and doesn't have an
+	  upstream.
diff --git a/package/kobs-ng/kobs-ng-fix-mtd-defines.patch b/package/kobs-ng/kobs-ng-fix-mtd-defines.patch
new file mode 100644
index 0000000000..39d7474a1e
--- /dev/null
+++ b/package/kobs-ng/kobs-ng-fix-mtd-defines.patch
@@ -0,0 +1,73 @@
+Newer kernel headers renamed mtd mode defines and no longer support
+MEMSETOOBSEL. Allow code to work with both older and newer kernel
+versions.
+
+Signed-off-by: Paul B. Henson <henson@acm.org>
+
+diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c
+--- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c	2012-12-17 22:37:40.000000000 -0800
++++ kobs-ng-3.0.35-4.0.0/src/mtd.c	2013-07-28 19:39:59.000000000 -0700
+@@ -852,8 +852,11 @@
+ 		mp = &md->part[i];
+ 
+ 		if (mp->fd != -1) {
++/* Newer kernels dropped MEMSETOOBSEL */
++#ifdef MEMSETOOBSEL
+ 			(void)ioctl(mp->fd, MEMSETOOBSEL,
+ 					&mp->old_oobinfo);
++#endif
+ 			close(mp->fd);
+ 		}
+ 
+@@ -896,6 +899,8 @@
+ 				continue;
+ 			}
+ 
++/* Newer kernels dropped MEMSETOOBSEL */
++#ifdef MEMSETOOBSEL
+ 			if (r == -ENOTTY) {
+ 				r = ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo);
+ 				if (r != 0) {
+@@ -904,6 +909,7 @@
+ 				}
+ 				mp->oobinfochanged = 0;
+ 			}
++#endif
+ 		} else {
+ 			r = ioctl(mp->fd, MTDFILEMODE, (void *)MTD_MODE_RAW);
+ 			if (r != 0 && r != -ENOTTY) {
+@@ -911,6 +917,8 @@
+ 				continue;
+ 			}
+ 
++/* Newer kernels dropped MEMSETOOBSEL */
++#ifdef MEMSETOOBSEL
+ 			if (r == -ENOTTY) {
+ 				r = ioctl(mp->fd, MEMSETOOBSEL, &none_oobinfo);
+ 				if (r != 0) {
+@@ -920,6 +928,7 @@
+ 				mp->oobinfochanged = 1;
+ 			} else
+ 				mp->oobinfochanged = 2;
++#endif
+ 		}
+ 
+ 		mp->ecc = ecc;
+diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h
+--- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h	2012-12-17 22:37:40.000000000 -0800
++++ kobs-ng-3.0.35-4.0.0/src/mtd.h	2013-07-28 19:33:57.000000000 -0700
+@@ -31,6 +31,14 @@
+ #include "BootControlBlocks.h"
+ #include "rom_nand_hamming_code_ecc.h"
+ 
++// Newer kernel headers renamed define
++#ifndef MTD_MODE_NORMAL
++#define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
++#endif
++#ifndef MTD_MODE_RAW
++#define MTD_MODE_RAW MTD_FILE_MODE_RAW
++#endif
++
+ //------------------------------------------------------------------------------
+ // Re-definitions of true and false, because the standard ones aren't good
+ // enough?
diff --git a/package/kobs-ng/kobs-ng.mk b/package/kobs-ng/kobs-ng.mk
new file mode 100644
index 0000000000..f7e65e7dd2
--- /dev/null
+++ b/package/kobs-ng/kobs-ng.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kobs-ng
+#
+################################################################################
+
+# kobs-ng versions have never made much sense :(
+KOBS_NG_VERSION = 3.0.35-4.0.0
+KOBS_NG_SITE = http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-$(KOBS_NG_VERSION)/
+KOBS_NG_LICENSE = GPLv2+
+KOBS_NG_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 21028166a5a9d09063eec916e4ad60c964cff27d Mon Sep 17 00:00:00 2001
From: Martin Hicks <mort@bork.org>
Date: Thu, 8 Aug 2013 13:50:27 -0400
Subject: [PATCH 5873/6849] cryptsetup: new package package

[Thomas P: add license informations, fix header, adjust dependencies
in Config.in file on toolchain options.]

Signed-off-by: Martin Hicks <mort@bork.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                |  1 +
 package/cryptsetup/Config.in     | 17 +++++++++++++++++
 package/cryptsetup/cryptsetup.mk | 15 +++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 package/cryptsetup/Config.in
 create mode 100644 package/cryptsetup/cryptsetup.mk

diff --git a/package/Config.in b/package/Config.in
index 7199a361e2..f27ba2bc2a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -235,6 +235,7 @@ source "package/freescale-imx/Config.in"
 source "package/a10disp/Config.in"
 source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
+source "package/cryptsetup/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/dbus-python/Config.in"
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
new file mode 100644
index 0000000000..a8dffc6d46
--- /dev/null
+++ b/package/cryptsetup/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_CRYPTSETUP
+	bool "cryptsetup"
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_E2FSPROGS
+	depends on BR2_LARGEFILE # lvm2, util-linux
+	depends on BR2_USE_MMU # lvm2
+	depends on BR2_USE_WCHAR # util-linux
+	help
+	  This tool helps manipulate dm-crypt and luks partitions for
+	  on-disk encryption.
+
+	  https://code.google.com/p/cryptsetup/
+
+comment "cryptsetup needs largefile and wchar support in toolchain"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
new file mode 100644
index 0000000000..48d37f64bb
--- /dev/null
+++ b/package/cryptsetup/cryptsetup.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# cryptsetup
+#
+################################################################################
+
+CRYPTSETUP_VERSION = 1.6.2
+CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.bz2
+CRYPTSETUP_SITE = http://cryptsetup.googlecode.com/files
+CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs libgcrypt host-pkgconf
+CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
+
+$(eval $(autotools-package))

From 61cdd3c7600876d87e7b3c7e943a99bb3dfef172 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 20 May 2013 15:56:42 +0300
Subject: [PATCH 5874/6849] luasec: New package

LuaSec is a Lua binding for OpenSSL library to provide TLS/SSL
communication.

[Thomas: adjust header in .mk file, add missing 'mkdir -p' before
installation, remove useless quotes.]

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in        |  1 +
 package/luasec/Config.in |  9 +++++++++
 package/luasec/luasec.mk | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/luasec/Config.in
 create mode 100644 package/luasec/luasec.mk

diff --git a/package/Config.in b/package/Config.in
index f27ba2bc2a..d5453fe749 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -336,6 +336,7 @@ source "package/luaexpat/Config.in"
 source "package/luaexpatutils/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luaposix/Config.in"
+source "package/luasec/Config.in"
 source "package/luasocket/Config.in"
 source "package/lua-ev/Config.in"
 source "package/lua-msgpack-native/Config.in"
diff --git a/package/luasec/Config.in b/package/luasec/Config.in
new file mode 100644
index 0000000000..2d303c184b
--- /dev/null
+++ b/package/luasec/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LUASEC
+	bool "luasec"
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LUASOCKET
+	help
+	  LuaSec is a binding for OpenSSL library to provide TLS/SSL
+	  communication.
+
+	  http://www.inf.puc-rio.br/~brunoos/luasec/
diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk
new file mode 100644
index 0000000000..053309f8b3
--- /dev/null
+++ b/package/luasec/luasec.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# luasec
+#
+################################################################################
+
+LUASEC_VERSION = 0.4.1
+LUASEC_SITE = http://www.inf.puc-rio.br/~brunoos/luasec/download/
+LUASEC_LICENSE = MIT
+LUASEC_LICENSE_FILES = LICENSE
+LUASEC_DEPENDENCIES = lua openssl
+
+define LUASEC_BUILD_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
+		LDFLAGS="$(TARGET_LDFLAGS) -shared" linux
+endef
+
+define LUASEC_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/lua
+	mkdir -p $(TARGET_DIR)/usr/lib/lua
+	$(MAKE) -C $(@D) \
+		LUAPATH="$(TARGET_DIR)/usr/share/lua" \
+		LUACPATH="$(TARGET_DIR)/usr/lib/lua" install
+endef
+
+define LUASEC_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/lua/ssl.so
+	rm -rf $(TARGET_DIR)/usr/share/lua/ssl
+	rm -f $(TARGET_DIR)/usr/share/lua/ssl.lua
+endef
+
+$(eval $(generic-package))

From f608c7705fba9a7f83aef28afe5a841fafe527e9 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 20 May 2013 15:56:43 +0300
Subject: [PATCH 5875/6849] luasql: New package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Luasql is a uniform frontend for multiple DB backends.

[Thomas P: update version to 2.3.0 available from Github, as suggested
by François Perrad. Fix .mk header. Use a LUASQL_MAKE_FLAGS variable,
which is more commonly used.]

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in        |  1 +
 package/luasql/Config.in | 21 +++++++++++++++++++++
 package/luasql/luasql.mk | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 package/luasql/Config.in
 create mode 100644 package/luasql/luasql.mk

diff --git a/package/Config.in b/package/Config.in
index d5453fe749..27a0d558b0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -338,6 +338,7 @@ source "package/luafilesystem/Config.in"
 source "package/luaposix/Config.in"
 source "package/luasec/Config.in"
 source "package/luasocket/Config.in"
+source "package/luasql/Config.in"
 source "package/lua-ev/Config.in"
 source "package/lua-msgpack-native/Config.in"
 source "package/rings/Config.in"
diff --git a/package/luasql/Config.in b/package/luasql/Config.in
new file mode 100644
index 0000000000..4dd011a2aa
--- /dev/null
+++ b/package/luasql/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_LUASQL
+	bool "luasql"
+	help
+	  LuaSQL is a simple interface from Lua to a DBMS.
+
+	  http://www.keplerproject.org/luasql
+
+if BR2_PACKAGE_LUASQL
+choice
+	prompt "LuaSQL Driver"
+	help
+	  Select backend driver for LuaSQL.
+
+config BR2_PACKAGE_LUASQL_DRIVER_SQLITE3
+	bool "SQLite3"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Select if you wish to use the SQLite3 LuaSQL driver.
+
+endchoice
+endif
diff --git a/package/luasql/luasql.mk b/package/luasql/luasql.mk
new file mode 100644
index 0000000000..6fbdccc9be
--- /dev/null
+++ b/package/luasql/luasql.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# luasql
+#
+################################################################################
+
+LUASQL_VERSION = v2.3.0
+LUASQL_SITE = https://github.com/keplerproject/luasql/tarball/$(LUASQL_VERSION)
+LUASQL_LICENSE = MIT
+LUASQL_LICENSE_FILES = README
+LUASQL_DEPENDENCIES = lua
+
+LUASQL_MAKE_FLAGS = \
+	CC="$(TARGET_CC)" \
+	LD="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS) -fPIC"
+
+ifeq ($(BR2_PACKAGE_LUASQL_DRIVER_SQLITE3),y)
+LUASQL_DEPENDENCIES += sqlite
+LUASQL_MAKE_FLAGS += \
+	T="sqlite3" \
+	DRIVER_LIBS="-L$(STAGING_DIR)/usr/lib -lsqlite3"
+endif
+
+define LUASQL_BUILD_CMDS
+	$(MAKE) -C $(@D) $(LUASQL_MAKE_FLAGS)
+endef
+
+define LUASQL_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(LUASQL_MAKE_FLAGS) PREFIX=/usr \
+		LUA_DIR="$(TARGET_DIR)/usr/share/lua" \
+		LUA_LIBDIR="$(TARGET_DIR)/usr/lib/lua" install
+endef
+
+define LUASQL_UNINSTALL_TARGET_CMDS
+	rm -rf $(TARGET_DIR)/usr/lib/lua/luasql
+endef
+
+$(eval $(generic-package))

From b339bb5641c59ad2e19aeb95c1387584c7c2aeab Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 09:06:58 -0300
Subject: [PATCH 5876/6849] imagemagick: fix magick++-config fixup error

Magic++ bindings are built only with C++ and WCHAR toolchains.
Add a WCHAR toolchain check for the magick++ config fixup.
Looking into the future the fixup shouldn't bail on a missing file so we
can avoid awkward kludges for packages that have many options and config
files.
Fixes:
http://autobuild.buildroot.net/results/33a/33ac4b17866a64379b7bab3c0549f6e075c98dde/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/imagemagick/imagemagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 12b9f4b253..21495749d0 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -19,7 +19,7 @@ IMAGEMAGICK_AUTORECONF = YES
 IMAGEMAGICK_CONFIG_SCRIPTS = \
 	$(addsuffix -config,Magick MagickCore MagickWand Wand)
 
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy)
 IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config
 endif
 

From 4807cdf8a950fda60f32b16caf996d02a3c2273e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 09:12:03 -0300
Subject: [PATCH 5877/6849] opencv: gtk support doesn't work with directfb

This was dropped on 4b3d949b8af240bda451b0a4e57d60153188c2e4 when
libgkt2 was updated. Fixes:
http://autobuild.buildroot.net/results/817/8173b7fd3d6af79a7f2c04bf36059a4429127516/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/opencv/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index c6ec3fed23..e98ba8ab9d 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -150,7 +150,7 @@ comment "gstreamer support requires a toolchain with WCHAR and threading support
 
 config BR2_PACKAGE_OPENCV_WITH_GTK
 	bool "gtk support"
-	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
+	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # libgtk2 -> libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2
 	depends on BR2_INSTALL_LIBSTDCPP

From 9e0f48c83158655ae737c89df618c5c79294f682 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 10:15:45 -0300
Subject: [PATCH 5878/6849] bash: fix static build

The static build needs some trickery, so make it happen. Fixes:
http://autobuild.buildroot.net/results/2b12868f8297a96d7abf7fcf526ca5eace73d66d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/bash/bash.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index d51e2037dd..efd2334ad0 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -16,6 +16,11 @@ BASH_CONF_ENV +=                       \
    bash_cv_func_sigsetjmp=present      \
    bash_cv_printf_a_format=yes
 
+# The static build needs some trickery
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+BASH_CONF_OPT += --enable-static-link --without-bash-malloc
+endif
+
 # Make sure we build after busybox so that /bin/sh links to bash
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 BASH_DEPENDENCIES += busybox

From c1a6bcece5e5832cc8897b5b600dfb958cab88f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 10:37:46 -0300
Subject: [PATCH 5879/6849] readline: use normal/default install target

Since the custom INSTALL_TARGET doesn't consider static builds it breaks
horribly and there's no need with the current version since it works
just fine with a little varnish to remove samples. Fixes:
http://autobuild.buildroot.net/results/5a6/5a62c38ec621d49230d76981db6024035e88804a/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/readline/readline.mk | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 0c883bcf92..ff5519924c 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -13,14 +13,10 @@ READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes
 READLINE_LICENSE = GPLv3+
 READLINE_LICENSE_FILES = COPYING
 
-define READLINE_INSTALL_TARGET_CMDS
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) install-shared uninstall-doc
-	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \
-		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
-		$(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \
-		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
+define READLINE_PURGE_EXAMPLES
+	rm -rf $(TARGET_DIR)/usr/share/readline
 endef
 
+READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES
+
 $(eval $(autotools-package))

From 1141d99aae9e1b139509ad71c969e6705417a48b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 12 Aug 2013 15:50:09 +0200
Subject: [PATCH 5880/6849] aircrack-ng: fix static build

When static build and sqlite3 support are enabled together,
link flags needs to be defined in the right order.

Fixes http://autobuild.buildroot.org/results/a74/a74ced69052c1d0a91dbe32483fd0612d1bf24a

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/aircrack-ng/aircrack-ng.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index fbefd741eb..00f4bac436 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -13,7 +13,8 @@ AIRCRACK_NG_DEPENDENCIES = openssl
 
 ifeq ($(BR2_PACKAGE_SQLITE),y)
 	AIRCRACK_NG_MAKE_OPTS = sqlite=true
-	AIRCRACK_NG_MAKE_OPTS += LIBSQL="-lsqlite3"
+	AIRCRACK_NG_MAKE_OPTS += \
+		LIBSQL="-lsqlite3$(if $(BR2_PREFER_STATIC_LIB), -ldl -lpthread)"
 
 	AIRCRACK_NG_DEPENDENCIES += sqlite
 else

From 4c5b04f009e8182d6bb2313a39abf75a9128ec6f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 14:08:33 -0300
Subject: [PATCH 5881/6849] libcec: needs threads

Fixes:
http://autobuild.buildroot.net/results/16a/16ad8b64e68477dcd663d07c600fd1be3164df81/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libcec/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libcec/Config.in b/package/libcec/Config.in
index b1fa03b057..7a67952144 100644
--- a/package/libcec/Config.in
+++ b/package/libcec/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBCEC
 	bool "libcec"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  libcec allows you in combination with the right hardware to
 	  control your home theater devices with your TV remote
@@ -8,5 +9,5 @@ config BR2_PACKAGE_LIBCEC
 
 	  http://libcec.pulse-eight.com
 
-comment "libcec requires C++ support in toolchain"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "libcec requires C++ and threading support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From 038227a9552a402f55b559b770e2ba9c0f3e0ec7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 14:34:37 -0300
Subject: [PATCH 5882/6849] wayland: needs threads

Fixes:
http://autobuild.buildroot.net/results/383/383c6ac297250f87db9d03afa38d45b2c1adcb47/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/gst1-plugins-bad/Config.in | 1 +
 package/wayland/Config.in                     | 4 ++++
 package/weston/Config.in                      | 1 +
 3 files changed, 6 insertions(+)

diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
index 878bf53991..f30f2b395e 100644
--- a/package/multimedia/gst1-plugins-bad/Config.in
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -355,6 +355,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	bool "wayland"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	select BR2_PACKAGE_WAYLAND
 	help
 	  Wayland Video Sink
diff --git a/package/wayland/Config.in b/package/wayland/Config.in
index e5d26493e1..591e0f08f7 100644
--- a/package/wayland/Config.in
+++ b/package/wayland/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WAYLAND
 	bool "wayland"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBFFI
 	select BR2_PACKAGE_EXPAT
 	help
@@ -8,3 +9,6 @@ config BR2_PACKAGE_WAYLAND
 	  of the protocol.
 
 	  http://wayland.freedesktop.org/
+
+comment "wayland requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/weston/Config.in b/package/weston/Config.in
index 8871ce56d1..56eb135686 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -11,6 +11,7 @@ config BR2_PACKAGE_WESTON
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_MTDEV
 	depends on BR2_PACKAGE_UDEV
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
 	# Make sure at least one backend is selected

From 8a14dab8bdad1d819924d6039b16061fccef3df2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 15:02:42 -0300
Subject: [PATCH 5883/6849] ltrace: disable libunwind for uClibc toolchains

ltrace requires that libunwind is built with backtrace() support.
For the internal uClibc toolchain we don't enable it, and for external
uClibc toolchains we can't know.
It's also unavailable for static uClibc toolchains.
So just disable libunwind support for uClibc toolchains in general.
Fixes:
http://autobuild.buildroot.net/results/ee0/ee037a19590fb85c64f97f78f74bcfd4d7766706/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ltrace/ltrace.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 7b8d859b0e..55930b8c1f 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -13,4 +13,15 @@ LTRACE_CONF_OPT = --disable-werror
 LTRACE_LICENSE = GPLv2
 LTRACE_LICENSE_FILES = COPYING
 
+# ltrace can use libunwind only if libc has backtrace() support
+# We don't normally do so for uClibc and we can't know if it's external
+ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),)
+LTRACE_CONF_OPT += --with-libunwind=yes
+LTRACE_DEPENDENCIES += libunwind
+else
+LTRACE_CONF_OPT += --with-libunwind=no
+endif
+endif
+
 $(eval $(autotools-package))

From 02e4326fe7f1912a6f12bdef54c7295f9188dd38 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Mon, 20 May 2013 15:56:44 +0300
Subject: [PATCH 5884/6849] orbit: New package

An MVC web framework for Lua

[Thomas P: add patch to fix installation procedure, and use the
provided Makefile for installation. Remove build-time dependency on
wsapi since there's nothing to build in 'orbit'. Remove run-time
dependency on 'rings', since it's not clear why Orbit would depend on
that.]

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/orbit/Config.in                       | 10 +++++++
 package/orbit/orbit-01-fix-installation.patch | 26 +++++++++++++++++++
 package/orbit/orbit.mk                        | 19 ++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 package/orbit/Config.in
 create mode 100644 package/orbit/orbit-01-fix-installation.patch
 create mode 100644 package/orbit/orbit.mk

diff --git a/package/Config.in b/package/Config.in
index 27a0d558b0..4fcff65360 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -341,6 +341,7 @@ source "package/luasocket/Config.in"
 source "package/luasql/Config.in"
 source "package/lua-ev/Config.in"
 source "package/lua-msgpack-native/Config.in"
+source "package/orbit/Config.in"
 source "package/rings/Config.in"
 source "package/wsapi/Config.in"
 source "package/xavante/Config.in"
diff --git a/package/orbit/Config.in b/package/orbit/Config.in
new file mode 100644
index 0000000000..556c46eaa3
--- /dev/null
+++ b/package/orbit/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_ORBIT
+	bool "orbit"
+	# These are runtime dependencies
+	select BR2_PACKAGE_WSAPI
+	select BR2_PACKAGE_LUAFILESYSTEM
+	help
+	  An MVC web framework for Lua. The design is inspired by lightweight
+	  Ruby frameworks such as Camping
+
+	  http://keplerproject.github.com/orbit
diff --git a/package/orbit/orbit-01-fix-installation.patch b/package/orbit/orbit-01-fix-installation.patch
new file mode 100644
index 0000000000..ae50ad9fe5
--- /dev/null
+++ b/package/orbit/orbit-01-fix-installation.patch
@@ -0,0 +1,26 @@
+Fix installation commands
+
+The installation commands did not match the location of the source
+files within the Orbit source tree.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -11,12 +11,9 @@
+ 	mkdir -p $(LUA_DIR)
+ 	cp src/orbit.lua $(LUA_DIR)
+ 	mkdir -p $(LUA_DIR)/orbit
+-	cp src/model.lua $(LUA_DIR)/orbit
+-	cp src/cache.lua $(LUA_DIR)/orbit
+-	cp src/pages.lua $(LUA_DIR)/orbit
+-	cp src/ophandler.lua $(LUA_DIR)/orbit
++	cp src/orbit/*.lua $(LUA_DIR)/orbit
+ 	mkdir -p $(BIN_DIR)
+-	cp src/orbit $(BIN_DIR)
++	cp src/launchers/* $(BIN_DIR)
+ 	if [ -f ./wsapi/Makefile ]; then \
+ 	  cd wsapi && make install; \
+ 	fi
diff --git a/package/orbit/orbit.mk b/package/orbit/orbit.mk
new file mode 100644
index 0000000000..af5f0af94d
--- /dev/null
+++ b/package/orbit/orbit.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# orbit
+#
+################################################################################
+
+ORBIT_VERSION = 2.2.0
+ORBIT_SITE = http://github.com/downloads/keplerproject/orbit
+ORBIT_LICENSE = MIT
+ORBIT_LICENSE_FILES = COPYRIGHT
+
+define ORBIT_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) \
+		LUA_DIR=$(TARGET_DIR)/usr/share/lua/ \
+		BIN_DIR=$(TARGET_DIR)/usr/bin \
+		install
+endef
+
+$(eval $(generic-package))

From dbb28f71d704ca5abd6ea8636ba7cafdb904b5ac Mon Sep 17 00:00:00 2001
From: Ryan Coe <bluemrp9@gmail.com>
Date: Tue, 13 Aug 2013 11:54:11 +0200
Subject: [PATCH 5885/6849] ffmpeg: fix typo in BR2_arm1176jzf_s

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/ffmpeg/ffmpeg.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 6223a79d4b..b102af12c2 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -146,12 +146,12 @@ endif
 ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
 FFMPEG_CONF_OPT += --disable-armv5te
 endif
-ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)
+ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
 FFMPEG_CONF_OPT += --enable-armv6
 else
 FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2
 endif
-ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
+ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
 FFMPEG_CONF_OPT += --enable-armvfp
 else
 FFMPEG_CONF_OPT += --disable-armvfp

From 6f70ba3bedbdcd5962d632689ded68a66e06dc23 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 13 Aug 2013 09:45:44 +0100
Subject: [PATCH 5886/6849] toolchain-external: Restrict Sourcery CodeBench
 toolchains for MIPS/n32

n32 is not supported in Sourcery CodeBench toolchains.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 324401f4f5..ad1f203139 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -190,6 +190,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	bool "Sourcery CodeBench MIPS 2013.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_MIPS_NABI32
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -260,6 +261,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	bool "Sourcery CodeBench MIPS 2012.09"
 	depends on BR2_mips || BR2_mipsel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_MIPS_NABI32
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -330,6 +332,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	bool "Sourcery CodeBench MIPS 2012.03"
 	depends on BR2_mips || BR2_mipsel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_MIPS_NABI32
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -396,6 +399,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 little endian soft float uclibc
 	      Not usable in Buildroot yet.
 
+comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64"
+	depends on BR2_MIPS_NABI32
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc

From f974bfc2094d39c128025109f3130e858fbdbfa3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 07:24:17 -0300
Subject: [PATCH 5887/6849] linux-headers: bump 3.{0, 2, 4, 10}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.88 => 3.0.90}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.88/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.90/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.88/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.90/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 4380e2d291..79108193b9 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.88"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.90"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.49"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.50"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.55"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.57"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.4"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.6"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 5053786f9f4b799b97672dbb8cfadf4ceb8ccece Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 12 Aug 2013 07:24:18 -0300
Subject: [PATCH 5888/6849] linux: bump 3.10.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 7274481b7b..065696a9ba 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.4"
+	bool "3.10.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.4" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.6" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 3a7a0a707be0f0a4b115990ce704a730b85ee3e4 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 24 Jul 2013 09:22:59 +0200
Subject: [PATCH 5889/6849] linux: don't take HEAD as default for git
 repositories

Specifying a floating tag like HEAD for a repository version is bad practice,
as it results in non-reproducible builds. This patch removes the default
assignment of HEAD as version when a custom git repository is used for the
Linux kernel.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linux/Config.in b/linux/Config.in
index 065696a9ba..f6acddf29e 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -68,7 +68,6 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 	string "Custom Git version"
-	default "HEAD"
 	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
 	help
 	  Git revision to use in the format used by git rev-parse,

From 7a1aa342357decd4e21f34d2b54d58df20d1fc0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Mon, 13 May 2013 17:25:41 +0200
Subject: [PATCH 5890/6849] package: make *-rebuild and *-reconfigure only
 rebuild the given package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally, the <pkg>-rebuild and <pkg>-reconfigure targets were meant
to restart the build of the package from a given step (build for
<pkg>-rebuild and configure for <pkg>-reconfigure) and then re-create
the entire root filesystem.

However, further discussion from the community has shown that this is
not really the desired behavior: we instead want <pkg>-rebuild and
<pkg>-reconfigure to only take care of rebuilding the given package,
and not the entire root filesystem.

People willing to rebuild this package and the root filesystem can do:

       make <pkg>-rebuild all

[Thomas P: rewrite commit log, since it's not fixing a bug, but
instead changing what was an intended behavior. ]

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/pkg-generic.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index b8eaa98bbb..2e2e66f283 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -435,12 +435,12 @@ endif
 			rm -f $$($(2)_TARGET_INSTALL_IMAGES)
 			rm -f $$($(2)_TARGET_INSTALL_HOST)
 
-$(1)-rebuild:		$(1)-clean-for-rebuild all
+$(1)-rebuild:		$(1)-clean-for-rebuild $(1)
 
 $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild
 			rm -f $$($(2)_TARGET_CONFIGURE)
 
-$(1)-reconfigure:	$(1)-clean-for-reconfigure all
+$(1)-reconfigure:	$(1)-clean-for-reconfigure $(1)
 
 # define the PKG variable for all targets, containing the
 # uppercase package variable prefix

From bda69bf4e4b642ab199ffa13c7356709885f129d Mon Sep 17 00:00:00 2001
From: Reuben Dowle <reuben.dowle@4rf.com>
Date: Thu, 14 Feb 2013 23:05:53 +0000
Subject: [PATCH 5891/6849] package: add the duma memory debugging library

Add the duma memory debugging library. This is based on an earlier
patch by Baruch Siach, with minor changes to build for latest
buildroot sources.

[Thomas P: misc cleanups, drop non-C++ support as it wasn't compiling,
added thread dependency.]

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                             |  1 +
 package/duma/Config.in                        | 20 ++++++++++
 .../duma/duma-01-fix-cross-compilation.patch  | 37 +++++++++++++++++++
 package/duma/duma.mk                          | 34 +++++++++++++++++
 4 files changed, 92 insertions(+)
 create mode 100644 package/duma/Config.in
 create mode 100644 package/duma/duma-01-fix-cross-compilation.patch
 create mode 100644 package/duma/duma.mk

diff --git a/package/Config.in b/package/Config.in
index 4fcff65360..2ee843ed5e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -23,6 +23,7 @@ source "package/dhrystone/Config.in"
 source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
 source "package/dropwatch/Config.in"
+source "package/duma/Config.in"
 source "package/gdb/Config.in"
 source "package/iozone/Config.in"
 source "package/kexec/Config.in"
diff --git a/package/duma/Config.in b/package/duma/Config.in
new file mode 100644
index 0000000000..d233062b0a
--- /dev/null
+++ b/package/duma/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_DUMA
+	bool "duma"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  D.U.M.A. - Detect Unintended Memory Access. A fork of the
+	  Electric Fence library. Detects buffer overflow and
+	  underflow, and also memory leaks.
+
+	  http://duma.sourceforge.net
+
+if BR2_PACKAGE_DUMA
+
+config BR2_PACKAGE_DUMA_NO_LEAKDETECTION
+	bool "disable memory leak detection"
+
+endif # BR2_PACKAGE_DUMA
+
+comment "duma requires C++ and thread support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/duma/duma-01-fix-cross-compilation.patch b/package/duma/duma-01-fix-cross-compilation.patch
new file mode 100644
index 0000000000..eceaf06bec
--- /dev/null
+++ b/package/duma/duma-01-fix-cross-compilation.patch
@@ -0,0 +1,37 @@
+Allow cross compilation. Adapted from crosstool-ng.
+
+Signed-off-by: Baruch Siach <baruch at tkos.co.il>
+
+Index: b/GNUmakefile
+===================================================================
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -93,10 +93,6 @@
+ # also define 'WIN32'
+ 
+ # some defaults:
+-CC=gcc
+-CXX=g++
+-AR=ar
+-RANLIB=ranlib
+ INSTALL=install
+ RM=rm
+ RMFORCE=rm -f
+@@ -471,7 +467,7 @@
+ 
+ createconf$(EXEPOSTFIX): createconf.o
+ 	- $(RMFORCE) createconf$(EXEPOSTFIX)
+-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
++	$(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
+ 
+ tstheap$(EXEPOSTFIX): libduma.a tstheap.o
+ 	- $(RMFORCE) tstheap$(EXEPOSTFIX)
+@@ -532,7 +528,7 @@
+ # define rules how to build objects for createconf
+ #
+ createconf.o:
+-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
++	$(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
+ 
+ 
+ #
diff --git a/package/duma/duma.mk b/package/duma/duma.mk
new file mode 100644
index 0000000000..93ae16e48e
--- /dev/null
+++ b/package/duma/duma.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# duma
+#
+################################################################################
+
+DUMA_VERSION = 2_5_15
+DUMA_SOURCE = duma_$(DUMA_VERSION).tar.gz
+DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15
+DUMA_LICENSE = GPLv2+ LGPLv2.1+
+DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL
+
+DUMA_INSTALL_STAGING = YES
+
+DUMA_OPTIONS = \
+	$(if $(BR2_PACKAGE_DUMA_NO_LEAKDETECTION),-DDUMA_LIB_NO_LEAKDETECTION)
+
+# The dependency of some source files in duma_config.h, which is generated at
+# build time, is not specified in the Makefile. Force non-parallel build.
+define DUMA_BUILD_CMDS
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS)       \
+		DUMA_OPTIONS="$(DUMA_OPTIONS)"   \
+		$(DUMA_CPP) -C $(@D)
+endef
+
+define DUMA_INSTALL_STAGING_CMDS
+	$(MAKE) prefix=$(STAGING_DIR)/usr install -C $(@D)
+endef
+
+define DUMA_INSTALL_TARGET_CMDS
+	$(MAKE) prefix=$(TARGET_DIR)/usr install -C $(@D)
+endef
+
+$(eval $(generic-package))

From f62a006639bb4222027415bee7193061ca1c514c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Tue, 12 Feb 2013 12:21:26 +0100
Subject: [PATCH 5892/6849] lxc: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Linux Containers (LXC), provides the ability to group and isolate
of a set of processes in a jail by virtualizing and accounting the
kernel resources. It is similar to Linux-Vserver or Openvz.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in     |  1 +
 package/lxc/Config.in | 14 ++++++++++++++
 package/lxc/lxc.mk    | 14 ++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/lxc/Config.in
 create mode 100644 package/lxc/lxc.mk

diff --git a/package/Config.in b/package/Config.in
index 2ee843ed5e..23472297eb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -903,6 +903,7 @@ source "package/cpuload/Config.in"
 source "package/htop/Config.in"
 source "package/keyutils/Config.in"
 source "package/kmod/Config.in"
+source "package/lxc/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 endif
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
new file mode 100644
index 0000000000..5e6e20815e
--- /dev/null
+++ b/package/lxc/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LXC
+	bool "lxc"
+	select BR2_PACKAGE_LIBCAP
+	depends on BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Linux Containers (LXC), provides the ability to group and isolate
+	  of a set of processes in a jail by virtualizing and accounting the
+	  kernel resources. It is similar to Linux-Vserver or Openvz.
+
+	  http://lxc.sourceforge.net/
+
+comment "lxc requires a toolchain with IPv6 and thread support"
+	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
new file mode 100644
index 0000000000..4e069029d5
--- /dev/null
+++ b/package/lxc/lxc.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lxc
+#
+################################################################################
+
+LXC_VERSION = 0.9.0
+LXC_SITE = http://downloads.sourceforge.net/project/lxc/lxc/lxc-$(LXC_VERSION)
+LXC_LICENSE = LGPLv2.1+
+LXC_LICENSE_FILES = COPYING
+LXC_DEPENDENCIES = libcap
+LXC_CONF_OPT = --disable-apparmor
+
+$(eval $(autotools-package))

From 96a1cf3838634737c60fc1d9c0e6577fee992175 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 7 Mar 2013 08:17:20 +0100
Subject: [PATCH 5893/6849] lua: remove built dependencies

runtime dependencies are handled in Config.in

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cgilua/Config.in     | 1 +
 package/cgilua/cgilua.mk     | 1 -
 package/copas/Config.in      | 1 +
 package/copas/copas.mk       | 1 -
 package/coxpcall/coxpcall.mk | 1 -
 package/wsapi/Config.in      | 1 +
 package/wsapi/wsapi.mk       | 1 -
 package/xavante/Config.in    | 1 +
 package/xavante/xavante.mk   | 1 -
 9 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/cgilua/Config.in b/package/cgilua/Config.in
index 01928f005b..d1e7fbf0e8 100644
--- a/package/cgilua/Config.in
+++ b/package/cgilua/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CGILUA
 	bool "cgilua"
+	# Runtime dependency only
 	select BR2_PACKAGE_LUAFILESYSTEM
 	help
 	  CGILua is a tool for creating dynamic HTML pages
diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
index a9c8874cee..e327fed212 100644
--- a/package/cgilua/cgilua.mk
+++ b/package/cgilua/cgilua.mk
@@ -6,7 +6,6 @@
 
 CGILUA_VERSION = 5.1.4
 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
-CGILUA_DEPENDENCIES = luafilesystem
 CGILUA_LICENSE = MIT
 
 define CGILUA_INSTALL_TARGET_CMDS
diff --git a/package/copas/Config.in b/package/copas/Config.in
index 9969c8f9a4..21dd0eb883 100644
--- a/package/copas/Config.in
+++ b/package/copas/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_COPAS
 	bool "copas"
+	# Runtime dependency only
 	select BR2_PACKAGE_COXPCALL
 	select BR2_PACKAGE_LUASOCKET
 	help
diff --git a/package/copas/copas.mk b/package/copas/copas.mk
index 347b5755f1..e100f49f25 100644
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -6,7 +6,6 @@
 
 COPAS_VERSION = 1.1.6
 COPAS_SITE = http://github.com/downloads/keplerproject/copas
-COPAS_DEPENDENCIES = lua coxpcall luasocket
 COPAS_LICENSE = MIT
 
 define COPAS_INSTALL_TARGET_CMDS
diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
index c3e4a7fcc0..275dcde316 100644
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -6,7 +6,6 @@
 
 COXPCALL_VERSION = 1.13.0
 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406
-COXPCALL_DEPENDENCIES = lua
 COXPCALL_LICENSE = MIT
 
 define COXPCALL_INSTALL_TARGET_CMDS
diff --git a/package/wsapi/Config.in b/package/wsapi/Config.in
index 3621648484..348a0404b6 100644
--- a/package/wsapi/Config.in
+++ b/package/wsapi/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WSAPI
 	bool "wsapi"
+	# Runtime dependency only
 	select BR2_PACKAGE_COXPCALL
 	select BR2_PACKAGE_LUAFILESYSTEM
 	select BR2_PACKAGE_RINGS
diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
index 4a64b943f6..c70502b7e8 100644
--- a/package/wsapi/wsapi.mk
+++ b/package/wsapi/wsapi.mk
@@ -6,7 +6,6 @@
 
 WSAPI_VERSION = 1.5
 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
-WSAPI_DEPENDENCIES = coxpcall luafilesystem rings
 WSAPI_LICENSE = MIT
 
 define WSAPI_INSTALL_TARGET_CMDS
diff --git a/package/xavante/Config.in b/package/xavante/Config.in
index db34d66ec1..be8e6d905d 100644
--- a/package/xavante/Config.in
+++ b/package/xavante/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XAVANTE
 	bool "xavante"
+	# Runtime dependency only
 	select BR2_PACKAGE_CGILUA
 	select BR2_PACKAGE_COPAS
 	select BR2_PACKAGE_COXPCALL
diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index 7c7fddeb9c..dd2a707d90 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -6,7 +6,6 @@
 
 XAVANTE_VERSION = 2.2.1
 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
-XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
 XAVANTE_LICENSE = MIT
 
 define XAVANTE_INSTALL_TARGET_CMDS

From a87a6ca27d935df4a30b3df8fb04793d5ebec33f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 14 Aug 2013 10:32:15 -0300
Subject: [PATCH 5894/6849] netatalk: requires threads

Fixes:
http://autobuild.buildroot.net/results/e19/e191a9e0768b632b84c3a8a8201538bd5fbe3708/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/netatalk/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
index 26f14c3d48..e3deaefba4 100644
--- a/package/netatalk/Config.in
+++ b/package/netatalk/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETATALK
 	bool "netatalk"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_BERKELEYDB
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBGCRYPT
@@ -9,3 +10,6 @@ config BR2_PACKAGE_NETATALK
 	  high-performance and reliable file server for Macintosh computers.
 
 	  http://netatalk.sourceforge.net/
+
+comment "netatalk requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From b678b2a4225da854e35f6538ddb8a5beca9d49ee Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 14 Aug 2013 13:20:09 +0100
Subject: [PATCH 5895/6849] webkit: Restrict supported architectures

See Source/WTF/wtf/Platform.h. Webkit is only supported for
arm, armeb, i386, mips, mipsel, powerpc, sh, sparc, x86_64.

[Thomas P: propagate dependency to the midori package.]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/midori/Config.in | 2 ++
 package/webkit/Config.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/package/midori/Config.in b/package/midori/Config.in
index d35874097f..66279f96e6 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -8,6 +8,8 @@ config BR2_PACKAGE_MIDORI
 	depends on BR2_INSTALL_LIBSTDCPP # webkit
 	depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2
 	depends on BR2_USE_WCHAR	 # webkit
+	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
+		    BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64) # webkit
 	help
 	  Midori is a lightweight web browser based on WebKit
 
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 92cbc62ecd..789e427f31 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_WEBKIT
 	depends on BR2_USE_WCHAR # enchant -> libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2
 	depends on BR2_PACKAGE_LIBGTK2
+	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
+		    BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBXML2

From bdb0498b2cbbbda180f144bc6431cadaed3c870d Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 15 Aug 2013 14:39:06 +0100
Subject: [PATCH 5896/6849] webkit: Fix comment dependency for
 BR2_PACKAGE_LIBGTK2

The comment should only be displayed if BR2_PACKAGE_LIBGTK2
is not selected.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/webkit/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 789e427f31..44a208a411 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -26,5 +26,5 @@ config BR2_PACKAGE_WEBKIT
 	  http://webkit.org/
 
 comment "webkit requires libgtk2 and a toolchain with C++, WCHAR, threading support"
-	depends on BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
+	depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

From ab575325fe6f1a0e42aeda302fa1b7d452470620 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Aug 2013 20:56:35 -0300
Subject: [PATCH 5897/6849] linux-headers: bump 3.{0, 4, 10}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...aders_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                        | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename package/linux-headers/{3.0.90 => 3.0.91}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.90/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.91/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.90/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.91/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 79108193b9..8facdf0384 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.90"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.91"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.50"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.57"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.58"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.6"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.7"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 0144429863c8ebd85820cdd48f2952c3f00ada28 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Aug 2013 20:56:36 -0300
Subject: [PATCH 5898/6849] linux: bump 3.10.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index f6acddf29e..12e4cd8886 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.6"
+	bool "3.10.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.6" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.7" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 1bb4e14a3eac8de27497ece96ba04ff32127a4a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 15 Aug 2013 20:56:37 -0300
Subject: [PATCH 5899/6849] configs/qemu: bump relevant config versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 configs/qemu_arm_nuri_defconfig         | 4 ++--
 configs/qemu_arm_versatile_defconfig    | 4 ++--
 configs/qemu_arm_vexpress_defconfig     | 4 ++--
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips64_malta_defconfig     | 4 ++--
 configs/qemu_mips_malta_defconfig       | 4 ++--
 configs/qemu_mipsel_malta_defconfig     | 4 ++--
 configs/qemu_ppc_g3beige_defconfig      | 4 ++--
 configs/qemu_ppc_mpc8544ds_defconfig    | 4 ++--
 configs/qemu_ppc_virtex_ml507_defconfig | 4 ++--
 configs/qemu_sh4_r2d_defconfig          | 4 ++--
 configs/qemu_x86_64_defconfig           | 4 ++--
 configs/qemu_x86_defconfig              | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index ce6f72d91e..c44e8fff69 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 3a965ccc4c..ef710617f6 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.10.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 674fb72dee..3f970e961c 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index d30678ca3a..15f36a7cff 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.10.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 7cbbc7c4ea..d313866094 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.10.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 7dd9e1cb30..61abdcf47d 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 5df3f5a370..34e19e4e93 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index d568f3e424..72304f0596 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 00e4000d45..e8f0ecc891 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.10.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index d30c6b9216..a4c29b3034 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 0a3f5a1994..e4e3a34a16 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -8,7 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 9293859828..8636857911 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -12,7 +12,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.2 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.2.49"
+BR2_DEFAULT_KERNEL_VERSION="3.2.50"
 
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
@@ -21,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.49"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.50"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 67b40a5a4f..e09b37b207 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -11,11 +11,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.10.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index c19a51615c..d451d2a94f 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -12,11 +12,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.4"
+BR2_DEFAULT_KERNEL_VERSION="3.10.7"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.10.config"

From c08b78d1868989ef63cb79b6f8de77365fe87948 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Aug 2013 13:06:15 +0200
Subject: [PATCH 5900/6849] CHANGES: update for 2013.08-rc2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 CHANGES | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGES b/CHANGES
index dc1ff14c5e..2fc965e02c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+2013.08-rc2, Released August 16th 2013:
+
+	Documentation improvements.
+
+	External toolchains fixes.
+
+	Updated/fixed packages: aircrack-ng, bash, boost, cairo,
+	cppcms, eglibc, ffmpeg, gcc, git, gnupg, imagemagick, libcec,
+	libffi, libgcrypt, linux, linux-headers, ltrace, netatalk,
+	opencv, opengl, readline, samba, strongswan, sunxi-cedarx,
+	uclibc, udev, wayland, webkit, zeromq.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#6440: typo in ffmpeg makefile
+
 2013.08-rc1, Released August 5th, 2013:
 
 	Architectures:

From 7120319a51c004793ff924b55c478867560b86fd Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 16 Aug 2013 13:10:30 +0200
Subject: [PATCH 5901/6849] Prepare for 2013.08-rc2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index fcfc0be7ce..794d217ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.08-rc1
+export BR2_VERSION:=2013.08-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 6c9060bad1..66a9c720b5 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -15,12 +15,12 @@ <h3>Download</h3>
 
 <p>
 
-The latest release candidate is <b>2013.08-rc1</b>, which can be
+The latest release candidate is <b>2013.08-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.08-rc1.tar.gz">buildroot-2013.08-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2013.08-rc2.tar.gz">buildroot-2013.08-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.08-rc1.tar.bz2">buildroot-2013.08-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.08-rc2.tar.bz2">buildroot-2013.08-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index beb2a40253..f233a35e6b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>16 August 2013 -- 2013.08-rc2 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see
+    the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.08-rc2.tar.bz2">2013.08-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>5 August 2013 -- 2013.08-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 4ed05f0ff666f5be9b485ccc91b29825326fcd37 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 18 Aug 2013 19:49:43 +0200
Subject: [PATCH 5902/6849] qt5: change upstream URL

The Qt5 upstream URL has changed, which leads to build failures in the
autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt5/qt5.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index c96cdf5c7f..9e71c83ce3 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,5 +1,5 @@
 QT5_VERSION = 5.0.2
-QT5_SITE = http://releases.qt-project.org/qt5/$(QT5_VERSION)/submodules/
+QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/
 include package/qt5/*/*.mk
 
 define QT5_LA_PRL_FILES_FIXUP

From f01809d2b73d596c15d99a6188a4ee713da8a49b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 20 Aug 2013 00:35:33 +0200
Subject: [PATCH 5903/6849] package/libbsd: further reduce the set of supported
 archs

Support for a,out on ARM will be dropped in Linux 3.11 (and is already
missing in the -rc).

m68k is marked BROKEN in Buildroot, so it is never ever tested.

The x86 familly is the only one left with support for a.out, now.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libbsd/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in
index 1fa94978b2..bae5700ae1 100644
--- a/package/libbsd/Config.in
+++ b/package/libbsd/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBBSD
 	bool "libbsd"
 	# libbsd requires a.out.h, which is only available for those
 	# architectures: arm, m68k, x86 (and alpha, but we don't care.)
-	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
+	depends on ( BR2_i386 || BR2_x86_64 )
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  This library provides useful functions commonly found on BSD
@@ -14,5 +14,5 @@ config BR2_PACKAGE_LIBBSD
 	  http://libbsd.freedesktop.org/
 
 comment "libbsd requires a toolchain with thread support"
-	depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
+	depends on ( BR2_i386 || BR2_x86_64 )
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

From a737dfccd5a05114b03a8a0b127a20a88c8540d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Mon, 19 Aug 2013 12:24:03 +0200
Subject: [PATCH 5904/6849] strongswan: fix typo in tnccs_20 dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It looks like there is a typing error in dependencies of tnccs_20 in strongswan
configure script. Add a patch to solve it.

Resolve issues detected here:
    http://autobuild.buildroot.net/results/b069e304c42660e7f7eba0b358f95dbaf879df64
    http://autobuild.buildroot.net/results/7355ddbaa213f4fcfd1b6d37b25bed1aab525723

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...swan-0002-fix-dependency-to-libtnccs.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch

diff --git a/package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch b/package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch
new file mode 100644
index 0000000000..059fc424c2
--- /dev/null
+++ b/package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch
@@ -0,0 +1,26 @@
+It looks like there is a typing error in dependencies of tnccs_20.
+
+Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
+
+--- a/configure	2013-08-19 12:09:33.934651935 +0200
++++ b/configure	2013-08-19 11:50:34.465118187 +0200
+@@ -15897,7 +15897,7 @@
+ 	radius=true;
+ fi
+ 
+-if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
++if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_20 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
+ 	tnc_tnccs=true;
+ fi
+ 
+--- a/configure.in	2013-08-19 12:08:41.762913778 +0200
++++ b/configure.in	2013-08-19 11:50:22.222886206 +0200
+@@ -317,7 +317,7 @@
+ 	radius=true;
+ fi
+ 
+-if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
++if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_20 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
+ 	tnc_tnccs=true;
+ fi
+ 

From 8e2696eab6a781727c09408528678d4d29edd7a3 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 22 Aug 2013 07:43:58 +0200
Subject: [PATCH 5905/6849] generatelocales: fix 'cut' invocation

'cut' needs to be invoked with the -s option to make sure it doesn't
print anything when the delimiter isn't found. This is particularly
important for the charmap detection, because UTF-8 is appended if
the charmap is empty. But without -s, it will never be empty.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 794d217ff5..6018d63f69 100644
--- a/Makefile
+++ b/Makefile
@@ -543,8 +543,8 @@ ifneq ($(GENERATE_LOCALE),)
 target-generatelocales: host-localedef
 	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
 	$(Q)for locale in $(GENERATE_LOCALE) ; do \
-		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
-		charmap=`echo $${locale} | cut -f2 -d'.'` ; \
+		inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \
+		charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
 		if test -z "$${charmap}" ; then \
 			charmap="UTF-8" ; \
 		fi ; \

From 24c5dbcef21d61bc4482587eb8821159f69b245d Mon Sep 17 00:00:00 2001
From: Alexander Lukichev <alexander.lukichev@gmail.com>
Date: Fri, 9 Aug 2013 08:16:10 +0300
Subject: [PATCH 5906/6849] gcc: fix libstdc++_pic for AVR32

It is not clear why 300-libstdc++-pic.patch pre-applied to
gcc-4.2.2-avr32-2.1.5 seems to have come from some older version
of gcc (as early as 4.0.3). This older patch incorrectly refers to
object files to be included in the library libstdc++_pic.a as *.o,
while their location seems to be in .libs/*.o (see the contents at
e.g. https://github.com/ZigFisher/Midge/blob/master/toolchain/gcc/4.0.3/300-libstdc%2B%2B-pic.patch ).
The same patch for gcc 4.1.0 refers to the files as .libs/*.o (see
https://github.com/ZigFisher/Midge/blob/master/toolchain/gcc/4.1.0/300-libstdc%2B%2B-pic.patch ).
This patch corrects rules in Makefile.in.

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../990-fix-300-libstdc++-pic.patch           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch

diff --git a/package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch b/package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch
new file mode 100644
index 0000000000..a63b3ad233
--- /dev/null
+++ b/package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch
@@ -0,0 +1,20 @@
+libstdc++-v3: fix the effects of pre-applied 300-libstdc++-pic.patch
+
+This version of GCC comes with a number of pre-applied patches, among which is
+300-libstdc++-pic.patch that makes a PIC version of libstdc++. The resulting
+Makefile.in incorrectly refers to object files that should be insde the library.
+
+Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
+
+diff -uNrp host-gcc-final-4.2.2-avr32-2.1.5.orig/libstdc++-v3/src/Makefile.in host-gcc-final-4.2.2-avr32-2.1.5/libstdc++-v3/src/Makefile.in
+--- host-gcc-final-4.2.2-avr32-2.1.5.orig/libstdc++-v3/src/Makefile.in	2008-07-04 00:18:42.000000000 +0300
++++ host-gcc-final-4.2.2-avr32-2.1.5/libstdc++-v3/src/Makefile.in	2013-08-08 16:15:56.201258882 +0300
+@@ -804,7 +804,7 @@ install_debug:
+ 
+ install-exec-local:
+ ifeq ($(enable_shared),yes)
+-	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
++	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
+ 	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
+ endif
+ 

From fd4a399e4d4fad4c9985d7a3bbdca0f23da5a3da Mon Sep 17 00:00:00 2001
From: Stephan Hoffmann <sho@relinux.de>
Date: Sun, 18 Aug 2013 19:48:06 +0200
Subject: [PATCH 5907/6849] board: add support for the i.MX6 Wandboard platform

Wandboard is a low cost iMX6 system consiting of an EDM standard
processor module and a small base board.

http://www.wandboard.org

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/wandboard/readme.txt    | 37 +++++++++++++++++++++++++++++++++++
 board/wandboard/uboot-env.txt | 20 +++++++++++++++++++
 configs/wandboard_defconfig   | 22 +++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 board/wandboard/readme.txt
 create mode 100644 board/wandboard/uboot-env.txt
 create mode 100644 configs/wandboard_defconfig

diff --git a/board/wandboard/readme.txt b/board/wandboard/readme.txt
new file mode 100644
index 0000000000..4dd9c2c7f0
--- /dev/null
+++ b/board/wandboard/readme.txt
@@ -0,0 +1,37 @@
+Minimal board support for the Wandboard
+
+Wandboard's homepage is here: http://www.wandboard.org/
+
+This config is only tested with the dual core wandboard.
+
+Installing:
+
+You need a micro SD card and a slot/adapter for your development machine.
+
+Partition the SD card leaving at least 1 MB in front of the first partition.
+
+Partition layout (example):
+
+Disk /dev/sdi: 3965 MB, 3965190144 bytes
+255 heads, 63 sectors/track, 482 cylinders
+Units = cylinders of 16065 * 512 = 8225280 bytes
+Sector size (logical/physical): 512 bytes / 512 bytes
+I/O size (minimum/optimal): 512 bytes / 512 bytes
+Disk identifier: 0x77b47445
+
+   Device Boot      Start         End      Blocks   Id  System
+/dev/sdi1               2         482     3863632+  83  Linux
+
+Copy u-boot and its environment to the SD card:
+sudo dd if=output/images/u-boot.imx bs=512 seek=2 of=/dev/sd<x>
+sudo dd if=output/images/uboot-env.bin bs=512 seek=768 of=/dev/sd<x>
+
+Copy the root filesystem:
+sudo dd if=output/images/rootfs.ext2 of=/dev/sd<x>1
+
+Alternative commands to copy root filesystem:
+sudo mkfs.ext4 /dev/sd<x>1
+sudo mount /dev/sd<x>1 /mnt
+sudo tar xf output/images/rootfs.tar -C /mnt
+sudo umount /mnt
+
diff --git a/board/wandboard/uboot-env.txt b/board/wandboard/uboot-env.txt
new file mode 100644
index 0000000000..7ca2b1a85c
--- /dev/null
+++ b/board/wandboard/uboot-env.txt
@@ -0,0 +1,20 @@
+baudrate=115200
+bootcmd=mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loaduimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi
+bootdelay=3
+bootscript=echo Running bootscript from mmc ...; source
+console=ttymxc0
+ethact=FEC
+ethaddr=00:1f:7b:b2:05:ee
+ethprime=FEC
+loadaddr=0x12000000
+loadbootscript=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};
+loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}
+mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}
+mmcboot=echo Booting from mmc ...; run mmcargs;  bootm; 
+mmcdev=0
+mmcpart=1
+mmcroot=/dev/mmcblk0p1 rootwait rw
+netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp
+netboot=echo Booting from net ...; run netargs; if test ${ip_dyn} = yes; then setenv get_cmd dhcp; else setenv get_cmd tftp; fi; ${get_cmd} ${uimage}; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if ${get_cmd} ${fdt_addr} ${fdt_file}; then bootm ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootm; else echo WARN: Cannot load the DT; fi; fi; else bootm; fi;
+script=boot/boot.scr
+uimage=boot/uImage
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
new file mode 100644
index 0000000000..ca4ce8711a
--- /dev/null
+++ b/configs/wandboard_defconfig
@@ -0,0 +1,22 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_KERNEL_HEADERS_3_0=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="wandboard_dl"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.denx.de/u-boot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="326ea986ac150acdc7656d57fca647db80b50158"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.imx"
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/wandboard/uboot-env.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://repo.or.cz/wandboard.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="86429847b5152f040f190015faedcac49b243328"
+BR2_LINUX_KERNEL_DEFCONFIG="wandboard"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y

From cd2cac813e8f2cc9a2d6c1f3632ecb248de39feb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Aug 2013 13:03:00 +0200
Subject: [PATCH 5908/6849] attr: add patch to fix static installation

When attr is built static-only, it forgets to install its libattr.a
file, which leads to the build failure of packages such as 'acl' that
rely on attr.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../attr-01-support-static-installation.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/attr/attr-01-support-static-installation.patch

diff --git a/package/attr/attr-01-support-static-installation.patch b/package/attr/attr-01-support-static-installation.patch
new file mode 100644
index 0000000000..87858ac75e
--- /dev/null
+++ b/package/attr/attr-01-support-static-installation.patch
@@ -0,0 +1,29 @@
+Support installation of .a file when doing static linking
+
+When doing static linking (i.e ENABLE_SHARED != yes), the attr build
+logic wasn't installing any library at all, not even the .a file which
+is needed for static linking. This patch fixes that.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/include/buildmacros
+===================================================================
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -97,7 +97,15 @@
+ 
+ INSTALL_LTLIB_STATIC = \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
++	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
++	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
++	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
++	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
++	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
++	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
++	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
++	fi
+ 
+ INSTALL_MAN = \
+ 	@for d in $(MAN_PAGES); do \

From 8484ed9c075666d9a6f7090e51e291e57c433c84 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Aug 2013 13:03:01 +0200
Subject: [PATCH 5909/6849] acl: add patch to fix static installation

Just like 'attr', 'acl' doesn't use automake to control the
build/installation of its components, and the static-only installation
process was not installing libacl.a. We add a patch that fixes this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../acl-01-support-static-installation.patch  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/acl/acl-01-support-static-installation.patch

diff --git a/package/acl/acl-01-support-static-installation.patch b/package/acl/acl-01-support-static-installation.patch
new file mode 100644
index 0000000000..4cb473ffc2
--- /dev/null
+++ b/package/acl/acl-01-support-static-installation.patch
@@ -0,0 +1,29 @@
+Support installation of .a file when doing static linking
+
+When doing static linking (i.e ENABLE_SHARED != yes), the acl build
+logic wasn't installing any library at all, not even the .a file which
+is needed for static linking. This patch fixes that.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/include/buildmacros
+===================================================================
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -97,7 +97,15 @@
+ 
+ INSTALL_LTLIB_STATIC = \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
++	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
++	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
++	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
++	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
++	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
++	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
++	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
++	fi
+ 
+ INSTALL_MAN = \
+ 	@for d in $(MAN_PAGES); do \

From 467b8d1f694531d77f1c3ce808a424cb8bd0cffe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 23 Aug 2013 11:02:24 -0300
Subject: [PATCH 5910/6849] openssl: don't build tests

These require shared libraries and we save a tiny amount of build time.
Fixes:
http://autobuild.buildroot.net/results/88e/88e5e07e94e49879907186ff35ce66944f867ec2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/openssl/openssl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index a0e103b3ac..4b8b0a4a1b 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -85,6 +85,7 @@ define OPENSSL_CONFIGURE_CMDS
 	)
 	$(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile
 	$(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile
+	$(SED) "s: build_tests::" $(@D)/Makefile
 endef
 
 define HOST_OPENSSL_BUILD_CMDS

From fde2605765fd99565ebcde48c5411a69646c2cce Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Aug 2013 13:03:02 +0200
Subject: [PATCH 5911/6849] Makefile: test before search for kernel modules

The 'find $(TARGET_DIR)/lib/modules' used to find and strip kernel
modules fails when no kernel modules have been installed. While the
'|| true' prevents the entire build from failing, there are still some
error messages displayed, which is not nice.

Instead, test if the directory exists before doing the find. We also
remove the '|| true' in order to really abort the build if a
problematic error occurs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6018d63f69..9f0164ed6c 100644
--- a/Makefile
+++ b/Makefile
@@ -476,8 +476,9 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
 	find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f
 endif
 	$(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true
-	find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
-		xargs -r $(KSTRIPCMD) || true
+	test -d $(TARGET_DIR)/lib/modules && \
+		find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
+		xargs -r $(KSTRIPCMD)
 
 # See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
 # besides the one in which crash occurred; or SIGTRAP kills my program when

From f627ebeb79930e00b25eb376554ff2b68cd077c5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 26 Aug 2013 00:34:45 +0200
Subject: [PATCH 5912/6849] Makefile: fix kernel modules test

Commit fde2605765f (Makefile: test before search for kernel modules)
changed the way we strip kernel modules, but it fails when modules aren't
available (as test -d returns with a non zero exit code).

Fix it by including the test -d call in a proper shell conditional.

Reported-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9f0164ed6c..ca7b039b6d 100644
--- a/Makefile
+++ b/Makefile
@@ -476,9 +476,9 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
 	find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f
 endif
 	$(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true
-	test -d $(TARGET_DIR)/lib/modules && \
+	if test -d $(TARGET_DIR)/lib/modules; then \
 		find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
-		xargs -r $(KSTRIPCMD)
+		xargs -r $(KSTRIPCMD); fi
 
 # See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
 # besides the one in which crash occurred; or SIGTRAP kills my program when

From 5043efe521176d091b6a7eff53b8a9e3cd2317f2 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Sun, 25 Aug 2013 18:06:27 -0400
Subject: [PATCH 5913/6849] cjson: bump to version 58

Also: update download site, and add new license file.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cjson/cjson.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index ec976db040..7e1d72df8c 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-CJSON_VERSION         = 42
+CJSON_VERSION         = 58
 CJSON_SITE_METHOD     = svn
-CJSON_SITE            = https://cjson.svn.sourceforge.net/svnroot/cjson
+CJSON_SITE            = http://svn.code.sf.net/p/cjson/code
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE         = MIT
+CJSON_LICENSE_FILES   = LICENSE
 
 define CJSON_BUILD_CMDS
 	cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so

From e9ad50c0d49a3881c44d9f22d94f2c4d3301d5ea Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Aug 2013 20:44:10 +0200
Subject: [PATCH 5914/6849] orc: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orc/orc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index dc93882ab3..8db58e9c36 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ORC_VERSION = 0.4.16
+ORC_VERSION = 0.4.18
 ORC_SITE = http://code.entropywave.com/download/orc/
 ORC_LICENSE = BSD-2c, BSD-3c
 ORC_LICENSE_FILES = COPYING

From 2e77c837381f4c4a5952e573be3fafd855c68017 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Aug 2013 20:44:30 +0200
Subject: [PATCH 5915/6849] gstreamer1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer1/gstreamer1.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
index d3db119d31..c9808a7f13 100644
--- a/package/multimedia/gstreamer1/gstreamer1.mk
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GSTREAMER1_VERSION = 1.0.8
+GSTREAMER1_VERSION = 1.0.9
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES

From 1b7b56d2a15768f05828575d6b47ed99f594fb0f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Aug 2013 21:11:00 +0200
Subject: [PATCH 5916/6849] gst1-plugins-base: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
index 1e32867efb..4a9e2344c7 100644
--- a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BASE_VERSION = 1.0.8
+GST1_PLUGINS_BASE_VERSION = 1.0.9
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES

From df4269e6d615de0d85e64a37fbb0f800b02f8802 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Aug 2013 20:45:12 +0200
Subject: [PATCH 5917/6849] gst1-plugins-good: bump version

Patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...k-unbreak-on-IPv6-systems-after-1302.patch | 44 -------------------
 .../gst1-plugins-good/gst1-plugins-good.mk    |  2 +-
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch

diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch b/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
deleted file mode 100644
index 68a996940d..0000000000
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good-dyn-multi-udpsink-unbreak-on-IPv6-systems-after-1302.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 118876702467d6063e9c9745b7d093682ad16472 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 19 Jul 2013 15:24:08 +0200
-Subject: [PATCH] (dyn|multi)udpsink: unbreak on !IPv6 systems after 130268bc
- (Bind socket before using it)
-
-The g_socket functions only touch the error argument on errors, so clear
-err back to NULL in case g_socket_new (G_SOCKET_FAMILY_IPV6) failed, as
-we check for err != NULL later on to know if g_socket_bind() failed,
-otherwise we errously fail on systems without IPv6 support.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=704553
----
- gst/udp/gstdynudpsink.c   |    1 +
- gst/udp/gstmultiudpsink.c |    1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
-index 4690bde..fadbd7f 100644
---- a/gst/udp/gstdynudpsink.c
-+++ b/gst/udp/gstdynudpsink.c
-@@ -316,6 +316,7 @@ gst_dynudpsink_start (GstBaseSink * bsink)
-     if ((udpsink->used_socket =
-             g_socket_new (G_SOCKET_FAMILY_IPV6,
-                 G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
-+      g_clear_error (&err);
-       udpsink->family = G_SOCKET_FAMILY_IPV4;
-       if ((udpsink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
-                   G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
-diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
-index 92d1bac..69011c7 100644
---- a/gst/udp/gstmultiudpsink.c
-+++ b/gst/udp/gstmultiudpsink.c
-@@ -868,6 +868,7 @@ gst_multiudpsink_start (GstBaseSink * bsink)
-     if (sink->force_ipv4 || (sink->used_socket =
-             g_socket_new (G_SOCKET_FAMILY_IPV6,
-                 G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
-+      g_clear_error (&err);
-       if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
-                   G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
-         goto no_socket;
--- 
-1.7.10.4
-
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index 614a006ac7..4455d65e2c 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_GOOD_VERSION = 1.0.8
+GST1_PLUGINS_GOOD_VERSION = 1.0.9
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING

From f930018dbbcbf02fc099d5a5df3f12fc2cbcf56d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Aug 2013 21:11:24 +0200
Subject: [PATCH 5918/6849] gst1-plugins-bad: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
index 732cddf993..362aed6948 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BAD_VERSION = 1.0.8
+GST1_PLUGINS_BAD_VERSION = 1.0.9
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB

From 829d6c498fc0af243975ebe41932d3ec5d95a102 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 27 Aug 2013 21:11:44 +0200
Subject: [PATCH 5919/6849] gst1-plugins-ugly: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
index c6c927bf9e..493ee71085 100644
--- a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_UGLY_VERSION = 1.0.8
+GST1_PLUGINS_UGLY_VERSION = 1.0.9
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING

From 5d6f3137d395d2a311034df5709324fe9f90a000 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 19 Aug 2013 15:24:19 +0100
Subject: [PATCH 5920/6849] atk: Version bump to 2.9.3

Remove atk-glib-fix.patch which has been applied upstream.
https://bugzilla.gnome.org/show_bug.cgi?id=652205
https://git.gnome.org/browse/atk/commit/?id=2b6504ef3a8eb22b4d00c933e041fe2e1423142a

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk-glib-fix.patch | 681 ---------------------------------
 package/atk/atk.mk             |   6 +-
 2 files changed, 3 insertions(+), 684 deletions(-)
 delete mode 100644 package/atk/atk-glib-fix.patch

diff --git a/package/atk/atk-glib-fix.patch b/package/atk/atk-glib-fix.patch
deleted file mode 100644
index 3cbb47b070..0000000000
--- a/package/atk/atk-glib-fix.patch
+++ /dev/null
@@ -1,681 +0,0 @@
-[PATCH] Fix build with modern glib versions
-
-G_CONST_RETURN is deprecated, so replace with 'const' instead.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- atk/atkaction.c            |    8 ++++----
- atk/atkaction.h            |   16 ++++++++--------
- atk/atkdocument.c          |    6 +++---
- atk/atkdocument.h          |   12 ++++++------
- atk/atkimage.c             |    4 ++--
- atk/atkimage.h             |    8 ++++----
- atk/atkobject.c            |   18 +++++++++---------
- atk/atkobject.h            |   12 ++++++------
- atk/atkrelation.c          |    2 +-
- atk/atkrelation.h          |    2 +-
- atk/atkstate.c             |    2 +-
- atk/atkstate.h             |    2 +-
- atk/atkstreamablecontent.c |    2 +-
- atk/atkstreamablecontent.h |   10 +++++-----
- atk/atktable.c             |    4 ++--
- atk/atktable.h             |    8 ++++----
- atk/atktext.c              |    4 ++--
- atk/atktext.h              |    4 ++--
- atk/atkutil.c              |    6 +++---
- atk/atkutil.h              |   10 +++++-----
- tests/testrelation.c       |    6 +++---
- tests/teststateset.c       |    2 +-
- 22 files changed, 74 insertions(+), 74 deletions(-)
-
-Index: atk-1.33.6/atk/atkaction.c
-===================================================================
---- atk-1.33.6.orig/atk/atkaction.c
-+++ atk-1.33.6/atk/atkaction.c
-@@ -101,7 +101,7 @@
-  * Returns a description string, or %NULL
-  * if @action does not implement this interface.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_action_get_description (AtkAction *obj,
-                             gint      i)
- {
-@@ -140,7 +140,7 @@
-  * Returns a name string, or %NULL
-  * if @action does not implement this interface.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_action_get_name (AtkAction *obj,
-                      gint      i)
- {
-@@ -166,7 +166,7 @@
-  * Returns a name string, or %NULL
-  * if @action does not implement this interface.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_action_get_localized_name (AtkAction *obj,
-                                gint      i)
- {
-@@ -203,7 +203,7 @@
-  * if there is no keybinding for this action.
-  *
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_action_get_keybinding (AtkAction *obj,
-                            gint      i)
- {
-Index: atk-1.33.6/atk/atkaction.h
-===================================================================
---- atk-1.33.6.orig/atk/atkaction.h
-+++ atk-1.33.6/atk/atkaction.h
-@@ -55,16 +55,16 @@
-   gboolean                (*do_action)         (AtkAction         *action,
-                                                 gint              i);
-   gint                    (*get_n_actions)     (AtkAction         *action);
--  G_CONST_RETURN gchar*   (*get_description)   (AtkAction         *action,
-+  const gchar*   (*get_description)   (AtkAction         *action,
-                                                 gint              i);
--  G_CONST_RETURN gchar*   (*get_name)          (AtkAction         *action,
-+  const gchar*   (*get_name)          (AtkAction         *action,
-                                                 gint              i);
--  G_CONST_RETURN gchar*   (*get_keybinding)    (AtkAction         *action,
-+  const gchar*   (*get_keybinding)    (AtkAction         *action,
-                                                 gint              i);
-   gboolean                (*set_description)   (AtkAction         *action,
-                                                 gint              i,
-                                                 const gchar       *desc);
--  G_CONST_RETURN gchar*   (*get_localized_name)(AtkAction         *action,
-+  const gchar*   (*get_localized_name)(AtkAction         *action,
- 						gint              i);
-   AtkFunction             pad2;
- };
-@@ -85,11 +85,11 @@
- gboolean   atk_action_do_action                (AtkAction         *action,
-                                             gint              i);
- gint   atk_action_get_n_actions            (AtkAction *action);
--G_CONST_RETURN gchar* atk_action_get_description  (AtkAction         *action,
-+const gchar* atk_action_get_description  (AtkAction         *action,
-                                                    gint              i);
--G_CONST_RETURN gchar* atk_action_get_name         (AtkAction         *action,
-+const gchar* atk_action_get_name         (AtkAction         *action,
-                                                    gint              i);
--G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
-+const gchar* atk_action_get_keybinding   (AtkAction         *action,
-                                                    gint              i);
- gboolean              atk_action_set_description  (AtkAction         *action,
-                                                    gint              i,
-@@ -97,7 +97,7 @@
- 
- /* NEW in ATK 1.1: */
- 
--G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction       *action,
-+const gchar* atk_action_get_localized_name (AtkAction       *action,
- 						     gint            i);
- 
- /*
-Index: atk-1.33.6/atk/atkdocument.c
-===================================================================
---- atk-1.33.6.orig/atk/atkdocument.c
-+++ atk-1.33.6/atk/atkdocument.c
-@@ -93,7 +93,7 @@
-  *
-  * Returns: a string indicating the document type
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_document_get_document_type (AtkDocument *document)
- {
-   AtkDocumentIface *iface;
-@@ -155,7 +155,7 @@
-  *          locale of the document content as a whole, or NULL if
-  *          the document content does not specify a locale.
-  **/
--G_CONST_RETURN gchar *
-+const gchar *
- atk_document_get_locale (AtkDocument *document)
- {
-   AtkDocumentIface *iface;
-@@ -219,7 +219,7 @@
-  *    document, or NULL if a value for #attribute_name has not been specified
-  *    for this document.
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- atk_document_get_attribute_value (AtkDocument *document, 
- 				  const gchar *attribute_name)
- {
-Index: atk-1.33.6/atk/atkdocument.h
-===================================================================
---- atk-1.33.6.orig/atk/atkdocument.h
-+++ atk-1.33.6/atk/atkdocument.h
-@@ -49,12 +49,12 @@
- struct _AtkDocumentIface
- {
-   GTypeInterface parent;
--  G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument              *document);
-+  const gchar* ( *get_document_type) (AtkDocument              *document);
-   gpointer              ( *get_document)      (AtkDocument              *document);
- 
--  G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument              *document);
-+  const gchar* ( *get_document_locale) (AtkDocument              *document);
-   AtkAttributeSet *     ( *get_document_attributes) (AtkDocument        *document);
--  G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument   *document,
-+  const gchar* ( *get_document_attribute_value) (AtkDocument   *document,
-                                                           const gchar   *attribute_name);
-   gboolean              ( *set_document_attribute) (AtkDocument         *document,
-                                                     const gchar         *attribute_name,
-@@ -68,11 +68,11 @@
- 
- GType  atk_document_get_type             (void);
- 
--G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument   *document);
-+const gchar* atk_document_get_document_type (AtkDocument   *document);
- gpointer atk_document_get_document (AtkDocument   *document);
--G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
-+const gchar* atk_document_get_locale (AtkDocument *document);
- AtkAttributeSet*      atk_document_get_attributes (AtkDocument *document);
--G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document, 
-+const gchar* atk_document_get_attribute_value (AtkDocument *document, 
-                                                         const gchar *attribute_name);
- gboolean              atk_document_set_attribute_value (AtkDocument *document,
-                                                         const gchar *attribute_name,
-Index: atk-1.33.6/atk/atkimage.c
-===================================================================
---- atk-1.33.6.orig/atk/atkimage.c
-+++ atk-1.33.6/atk/atkimage.c
-@@ -46,7 +46,7 @@
-  *
-  * Returns: a string representing the image description
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_image_get_image_description (AtkImage *image)
- {
-   AtkImageIface *iface;
-@@ -192,7 +192,7 @@
-  * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale. 
-  *
-  */
--G_CONST_RETURN gchar* 
-+const gchar* 
- atk_image_get_image_locale (AtkImage   *image)
- {
- 	
-Index: atk-1.33.6/atk/atkimage.h
-===================================================================
---- atk-1.33.6.orig/atk/atkimage.h
-+++ atk-1.33.6/atk/atkimage.h
-@@ -53,13 +53,13 @@
-                                                    gint                  *x,
- 				                   gint	                 *y,
-     			                           AtkCoordType	         coord_type);
--  G_CONST_RETURN gchar* ( *get_image_description) (AtkImage              *image);
-+  const gchar* ( *get_image_description) (AtkImage              *image);
-   void                  ( *get_image_size)        (AtkImage              *image,
-                                                    gint                  *width,
-                                                    gint                  *height);
-   gboolean              ( *set_image_description) (AtkImage              *image,
-                                                    const gchar           *description);
--  G_CONST_RETURN gchar* ( *get_image_locale)      (AtkImage              *image);
-+  const gchar* ( *get_image_locale)      (AtkImage              *image);
- 
-   AtkFunction           pad1;
- 	
-@@ -67,7 +67,7 @@
- 
- GType  atk_image_get_type             (void);
- 
--G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage   *image);
-+const gchar* atk_image_get_image_description (AtkImage   *image);
- 
- void     atk_image_get_image_size        (AtkImage           *image,
-                                           gint               *width,
-@@ -80,7 +80,7 @@
- 					  gint	             *y,
-     					  AtkCoordType	     coord_type);
- 
--G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage   *image);
-+const gchar* atk_image_get_image_locale (AtkImage   *image);
- 
- G_END_DECLS
- 
-Index: atk-1.33.6/atk/atkobject.c
-===================================================================
---- atk-1.33.6.orig/atk/atkobject.c
-+++ atk-1.33.6/atk/atkobject.c
-@@ -285,9 +285,9 @@
-                                                      GValue          *value,
-                                                      GParamSpec      *pspec);
- static void            atk_object_finalize          (GObject         *object);
--static G_CONST_RETURN gchar*
-+static const gchar*
-                        atk_object_real_get_name     (AtkObject       *object);
--static G_CONST_RETURN gchar*
-+static const gchar*
-                        atk_object_real_get_description    
-                                                    (AtkObject       *object);
- static AtkObject*      atk_object_real_get_parent  (AtkObject       *object);
-@@ -692,7 +692,7 @@
-  *
-  * Returns: a character string representing the accessible name of the object.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_object_get_name (AtkObject *accessible)
- {
-   AtkObjectClass *klass;
-@@ -716,7 +716,7 @@
-  * of the accessible.
-  *
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_object_get_description (AtkObject *accessible)
- {
-   AtkObjectClass *klass;
-@@ -1125,7 +1125,7 @@
-                                 AtkState  state,
-                                 gboolean  value)
- {
--  G_CONST_RETURN gchar* name;
-+  const gchar* name;
- 
-   g_return_if_fail (ATK_IS_OBJECT (accessible));
- 
-@@ -1323,13 +1323,13 @@
-   G_OBJECT_CLASS (parent_class)->finalize (object);
- }
- 
--static G_CONST_RETURN gchar*
-+static const gchar*
- atk_object_real_get_name (AtkObject *object)
- {
-   return object->name;
- }
- 
--static G_CONST_RETURN gchar*
-+static const gchar*
- atk_object_real_get_description (AtkObject *object)
- {
-   return object->description;
-@@ -1491,7 +1491,7 @@
-  *
-  * Returns: the string describing the AtkRole
-  */
--G_CONST_RETURN gchar*
-+const gchar*
- atk_role_get_name (AtkRole role)
- {
-   if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
-@@ -1518,7 +1518,7 @@
-  *
-  * Returns: the localized string describing the AtkRole
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_role_get_localized_name (AtkRole role)
- {
-   gettext_initialization ();
-Index: atk-1.33.6/atk/atkobject.h
-===================================================================
---- atk-1.33.6.orig/atk/atkobject.h
-+++ atk-1.33.6/atk/atkobject.h
-@@ -381,11 +381,11 @@
-   /*
-    * Gets the accessible name of the object
-    */
--  G_CONST_RETURN gchar*    (* get_name)            (AtkObject                *accessible);
-+  const gchar*    (* get_name)            (AtkObject                *accessible);
-   /*
-    * Gets the accessible description of the object
-    */
--  G_CONST_RETURN gchar*    (* get_description)     (AtkObject                *accessible);
-+  const gchar*    (* get_description)     (AtkObject                *accessible);
-   /*
-    * Gets the accessible parent of the object
-    */
-@@ -535,8 +535,8 @@
-  * Properties directly supported by AtkObject
-  */
- 
--G_CONST_RETURN gchar*   atk_object_get_name                       (AtkObject *accessible);
--G_CONST_RETURN gchar*   atk_object_get_description                (AtkObject *accessible);
-+const gchar*   atk_object_get_name                       (AtkObject *accessible);
-+const gchar*   atk_object_get_description                (AtkObject *accessible);
- AtkObject*              atk_object_get_parent                     (AtkObject *accessible);
- gint                    atk_object_get_n_accessible_children      (AtkObject *accessible);
- AtkObject*              atk_object_ref_accessible_child           (AtkObject *accessible,
-@@ -571,7 +571,7 @@
- void                 atk_object_initialize                       (AtkObject                     *accessible,
-                                                                   gpointer                      data);
-                                     
--G_CONST_RETURN gchar* atk_role_get_name      (AtkRole         role);
-+const gchar* atk_role_get_name      (AtkRole         role);
- AtkRole               atk_role_for_name      (const gchar     *name);
- 
- 
-@@ -582,7 +582,7 @@
- gboolean              atk_object_remove_relationship           (AtkObject      *object,
- 								AtkRelationType relationship,
- 								AtkObject      *target);
--G_CONST_RETURN gchar* atk_role_get_localized_name              (AtkRole     role);
-+const gchar* atk_role_get_localized_name              (AtkRole     role);
- 
- /* */
- 
-Index: atk-1.33.6/atk/atkrelation.c
-===================================================================
---- atk-1.33.6.orig/atk/atkrelation.c
-+++ atk-1.33.6/atk/atkrelation.c
-@@ -130,7 +130,7 @@
-  *
-  * Returns: the string describing the AtkRelationType
-  */
--G_CONST_RETURN gchar*
-+const gchar*
- atk_relation_type_get_name (AtkRelationType type)
- {
-   GTypeClass *type_class;
-Index: atk-1.33.6/atk/atkrelation.h
-===================================================================
---- atk-1.33.6.orig/atk/atkrelation.h
-+++ atk-1.33.6/atk/atkrelation.h
-@@ -61,7 +61,7 @@
- GType atk_relation_get_type (void);
- 
- AtkRelationType       atk_relation_type_register      (const gchar     *name);
--G_CONST_RETURN gchar* atk_relation_type_get_name      (AtkRelationType type);
-+const gchar* atk_relation_type_get_name      (AtkRelationType type);
- AtkRelationType       atk_relation_type_for_name      (const gchar     *name);
- 
- /*
-Index: atk-1.33.6/atk/atkstate.c
-===================================================================
---- atk-1.33.6.orig/atk/atkstate.c
-+++ atk-1.33.6/atk/atkstate.c
-@@ -57,7 +57,7 @@
-  *
-  * Returns: the string describing the AtkStateType
-  */
--G_CONST_RETURN gchar*
-+const gchar*
- atk_state_type_get_name (AtkStateType type)
- {
-   GTypeClass *type_class;
-Index: atk-1.33.6/atk/atkstate.h
-===================================================================
---- atk-1.33.6.orig/atk/atkstate.h
-+++ atk-1.33.6/atk/atkstate.h
-@@ -170,7 +170,7 @@
- 
- AtkStateType atk_state_type_register            (const gchar *name);
- 
--G_CONST_RETURN gchar* atk_state_type_get_name   (AtkStateType type);
-+const gchar* atk_state_type_get_name   (AtkStateType type);
- AtkStateType          atk_state_type_for_name   (const gchar  *name);
- 
- G_END_DECLS
-Index: atk-1.33.6/atk/atkstreamablecontent.c
-===================================================================
---- atk-1.33.6.orig/atk/atkstreamablecontent.c
-+++ atk-1.33.6/atk/atkstreamablecontent.c
-@@ -73,7 +73,7 @@
-  * Returns : a gchar* representing the specified mime type; the caller
-  * should not free the character string.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
-                                       gint                 i)
- {
-Index: atk-1.33.6/atk/atkstreamablecontent.h
-===================================================================
---- atk-1.33.6.orig/atk/atkstreamablecontent.h
-+++ atk-1.33.6/atk/atkstreamablecontent.h
-@@ -54,11 +54,11 @@
-    * at index 0 should be considered the "default" data type for the stream.
-    *
-    * This assumes that the strings for the mime types are stored in the
--   * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
-+   * AtkStreamableContent. Alternatively the const could be removed
-    * and the caller would be responsible for calling g_free() on the
-    * returned value.
-    */
--  G_CONST_RETURN gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
-+  const gchar*     (* get_mime_type)     (AtkStreamableContent     *streamable,
-                                                    gint                     i);
-   /*
-    * One possible implementation for this method is that it constructs the
-@@ -80,7 +80,7 @@
-  * constructed.  Note that it is possible for get_uri to return NULL but for
-  * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
-  */
--    G_CONST_RETURN  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
-+    const  gchar*  (* get_uri)           (AtkStreamableContent     *streamable,
-                                                    const gchar              *mime_type);
- 
- 
-@@ -92,12 +92,12 @@
- 
- gint                   atk_streamable_content_get_n_mime_types (AtkStreamableContent     *streamable);
-                                                        
--G_CONST_RETURN gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
-+const gchar*  atk_streamable_content_get_mime_type    (AtkStreamableContent     *streamable,
-                                                                 gint                     i);
- GIOChannel*             atk_streamable_content_get_stream       (AtkStreamableContent     *streamable,
-                                                                  const gchar              *mime_type);
- 
--G_CONST_RETURN gchar*  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
-+const gchar*  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
-                                                                 const gchar              *mime_type);
- 
- G_END_DECLS
-Index: atk-1.33.6/atk/atktable.c
-===================================================================
---- atk-1.33.6.orig/atk/atktable.c
-+++ atk-1.33.6/atk/atktable.c
-@@ -301,7 +301,7 @@
-  * Returns: a gchar* representing the column description, or %NULL
-  * if value does not implement this interface.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_table_get_column_description (AtkTable *table,
-                                   gint     column)
- {
-@@ -405,7 +405,7 @@
-  * Returns: a gchar* representing the row description, or %NULL
-  * if value does not implement this interface.
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_table_get_row_description (AtkTable *table,
-                                gint      row)
- {
-Index: atk-1.33.6/atk/atktable.h
-===================================================================
---- atk-1.33.6.orig/atk/atktable.h
-+++ atk-1.33.6/atk/atktable.h
-@@ -69,12 +69,12 @@
-                                                   gint          column);
-   AtkObject*
-                     (* get_caption)              (AtkTable      *table);
--  G_CONST_RETURN gchar*
-+  const gchar*
-                     (* get_column_description)   (AtkTable      *table,
-                                                   gint          column);
-   AtkObject*        (* get_column_header)        (AtkTable      *table,
- 						  gint		column);
--  G_CONST_RETURN gchar*
-+  const gchar*
-                     (* get_row_description)      (AtkTable      *table,
-                                                   gint          row);
-   AtkObject*        (* get_row_header)           (AtkTable      *table,
-@@ -163,12 +163,12 @@
-                                                   gint             column);
- AtkObject*
-                   atk_table_get_caption          (AtkTable         *table);
--G_CONST_RETURN gchar*
-+const gchar*
-                   atk_table_get_column_description (AtkTable         *table,
-                                                   gint             column);
- AtkObject*        atk_table_get_column_header    (AtkTable         *table,
- 						  gint		   column);
--G_CONST_RETURN gchar*
-+const gchar*
-                   atk_table_get_row_description  (AtkTable         *table,
-                                                   gint             row);
- AtkObject*        atk_table_get_row_header       (AtkTable         *table,
-Index: atk-1.33.6/atk/atktext.c
-===================================================================
---- atk-1.33.6.orig/atk/atktext.c
-+++ atk-1.33.6/atk/atktext.c
-@@ -1054,7 +1054,7 @@
-  *
-  * Returns: a string containing the name; this string should not be freed
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_text_attribute_get_name (AtkTextAttribute attr)
- {
-   GTypeClass *type_class;
-@@ -1150,7 +1150,7 @@
-  * Returns: a string containing the value; this string should not be freed;
-  * NULL is returned if there are no values maintained for the attr value. 
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_text_attribute_get_value (AtkTextAttribute attr,
-                               gint             index)
- {
-Index: atk-1.33.6/atk/atktext.h
-===================================================================
---- atk-1.33.6.orig/atk/atktext.h
-+++ atk-1.33.6/atk/atktext.h
-@@ -355,9 +355,9 @@
-                                                            AtkTextClipType  y_clip_type);
- void          atk_text_free_ranges                        (AtkTextRange     **ranges);
- void 	      atk_attribute_set_free                      (AtkAttributeSet  *attrib_set);
--G_CONST_RETURN gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
-+const gchar*  atk_text_attribute_get_name        (AtkTextAttribute attr);
- AtkTextAttribute       atk_text_attribute_for_name        (const gchar      *name);
--G_CONST_RETURN gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
-+const gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
-                                                            gint             index_);
- 
- G_END_DECLS
-Index: atk-1.33.6/atk/atkutil.c
-===================================================================
---- atk-1.33.6.orig/atk/atkutil.c
-+++ atk-1.33.6/atk/atkutil.c
-@@ -342,7 +342,7 @@
-  *
-  * Returns: name string for the GUI toolkit implementing ATK for this application
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_get_toolkit_name (void)
- {
-   const gchar *retval;
-@@ -367,7 +367,7 @@
-  *
-  * Returns: version string for the GUI toolkit implementing ATK for this application
-  **/
--G_CONST_RETURN gchar*
-+const gchar*
- atk_get_toolkit_version (void)
- {
-   const gchar *retval;
-@@ -394,7 +394,7 @@
-  *
-  * Since: 1.20
-  */
--G_CONST_RETURN gchar *
-+const gchar *
- atk_get_version (void)
- {
-   return VERSION;
-Index: atk-1.33.6/atk/atkutil.h
-===================================================================
---- atk-1.33.6.orig/atk/atkutil.h
-+++ atk-1.33.6/atk/atkutil.h
-@@ -147,8 +147,8 @@
- 						  gpointer data);
-    void         (* remove_key_event_listener)    (guint               listener_id);
-    AtkObject*   (* get_root)                     (void);
--   G_CONST_RETURN gchar* (* get_toolkit_name)    (void);
--   G_CONST_RETURN gchar* (* get_toolkit_version) (void);
-+   const gchar* (* get_toolkit_name)    (void);
-+   const gchar* (* get_toolkit_version) (void);
- };
- GType atk_util_get_type (void);
- 
-@@ -229,17 +229,17 @@
- /*
-  * Returns name string for the GUI toolkit.
-  */
--G_CONST_RETURN gchar *atk_get_toolkit_name (void);
-+const gchar *atk_get_toolkit_name (void);
- 
- /*
-  * Returns version string for the GUI toolkit.
-  */
--G_CONST_RETURN gchar *atk_get_toolkit_version (void);
-+const gchar *atk_get_toolkit_version (void);
- 
- /*
-  * Gets the current version of ATK
-  */
--G_CONST_RETURN gchar *atk_get_version (void);
-+const gchar *atk_get_version (void);
- 
- /* --- GType boilerplate --- */
- /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
-Index: atk-1.33.6/tests/testrelation.c
-===================================================================
---- atk-1.33.6.orig/tests/testrelation.c
-+++ atk-1.33.6/tests/testrelation.c
-@@ -28,7 +28,7 @@
- test_relation (void)
- {
-   AtkRelationType type1, type2;
--  G_CONST_RETURN gchar *name;
-+  const gchar *name;
-   AtkObject *obj;
-   gboolean ret_value;
-   AtkRelationSet *set;
-@@ -169,7 +169,7 @@
- test_role (void)
- {
-   AtkRole role1, role2;
--  G_CONST_RETURN gchar *name;
-+  const gchar *name;
- 
-   name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
-   g_return_val_if_fail (name, FALSE);
-@@ -230,7 +230,7 @@
- test_text_attr (void)
- {
-   AtkTextAttribute attr1, attr2;
--  G_CONST_RETURN gchar *name;
-+  const gchar *name;
- 
-   name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
-   g_return_val_if_fail (name, FALSE);
-Index: atk-1.33.6/tests/teststateset.c
-===================================================================
---- atk-1.33.6.orig/tests/teststateset.c
-+++ atk-1.33.6/tests/teststateset.c
-@@ -208,7 +208,7 @@
- test_state (void)
- {
-   AtkStateType type1, type2;
--  G_CONST_RETURN gchar *name;
-+  const gchar *name;
- 
-   name = atk_state_type_get_name (ATK_STATE_VISIBLE);
-   g_return_val_if_fail (name, FALSE);
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 91fe6a3e00..ecfec5484b 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-ATK_VERSION_MAJOR = 1.33
-ATK_VERSION = $(ATK_VERSION_MAJOR).6
-ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
+ATK_VERSION_MAJOR = 2.9
+ATK_VERSION = $(ATK_VERSION_MAJOR).3
+ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
 ATK_LICENSE = LGPLv2+
 ATK_LICENSE_FILES = COPYING

From 941f60086d16ebcea062f723240be6667fdbb0a0 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 22 Aug 2013 22:32:44 +0100
Subject: [PATCH 5921/6849] harfbuzz: New package

HarfBuzz is an OpenType text shaping engine

http://www.freedesktop.org/wiki/Software/HarfBuzz/

[Peter: Move to libraries/graphics, needs C++ support]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/harfbuzz/Config.in   | 13 +++++++++++
 package/harfbuzz/harfbuzz.mk | 44 ++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 package/harfbuzz/Config.in
 create mode 100644 package/harfbuzz/harfbuzz.mk

diff --git a/package/Config.in b/package/Config.in
index 23472297eb..f7b0360b88 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -465,6 +465,7 @@ source "package/gd/Config.in"
 source "package/giblib/Config.in"
 source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
+source "package/harfbuzz/Config.in"
 source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
 source "package/lcms2/Config.in"
diff --git a/package/harfbuzz/Config.in b/package/harfbuzz/Config.in
new file mode 100644
index 0000000000..88e4740b14
--- /dev/null
+++ b/package/harfbuzz/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_HARFBUZZ
+	bool "harfbuzz"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  HarfBuzz is an OpenType text shaping engine
+
+	  http://www.freedesktop.org/wiki/Software/HarfBuzz/
+
+	  Harfbuzz can make optional use of cairo, freetype,
+	  glib2 and icu packages if they are selected.
+
+comment "harfbuzz requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk
new file mode 100644
index 0000000000..00651fd6c7
--- /dev/null
+++ b/package/harfbuzz/harfbuzz.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# harfbuzz
+#
+################################################################################
+
+HARFBUZZ_VERSION = 0.9.19
+HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release/
+HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
+HARFBUZZ_LICENSE = MIT, ISC (ucdn library), ICU License (icu support library)
+HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING src/hb-icu-le/COPYING
+HARFBUZZ_INSTALL_STAGING = YES
+
+HARFBUZZ_CONF_OPT = --without-coretext --without-uniscribe --without-graphite2
+
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+	HARFBUZZ_DEPENDENCIES += cairo
+	HARFBUZZ_CONF_OPT += --with-cairo=yes
+else
+	HARFBUZZ_CONF_OPT += --with-cairo=no
+endif
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+	HARFBUZZ_DEPENDENCIES += freetype
+	HARFBUZZ_CONF_OPT += --with-freetype=yes
+else
+	HARFBUZZ_CONF_OPT += --with-freetype=no
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+	HARFBUZZ_DEPENDENCIES += libglib2
+	HARFBUZZ_CONF_OPT += --with-glib=yes
+else
+	HARFBUZZ_CONF_OPT += --with-glib=no
+endif
+
+ifeq ($(BR2_PACKAGE_ICU),y)
+	HARFBUZZ_DEPENDENCIES += icu
+	HARFBUZZ_CONF_OPT += --with-icu=yes
+else
+	HARFBUZZ_CONF_OPT += --with-icu=no
+endif
+
+$(eval $(autotools-package))

From 5871b791995ebe295db7dca608afe3f293ce8953 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 22 Aug 2013 20:02:13 +0200
Subject: [PATCH 5922/6849] apply-patches: run patch in batch mode

If the file to be patched is missing, then `patch' will interactively
ask for a file to be patched. This is annoying in e.g. the autobuilders
because they have to wait for a timeout instead of failing.

Giving the '-t' (batch mode) option to patch fixes this: it will skip the
missing file, and return a non-zero exit code. So the build cleanly
fails.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 2995ea9972..e9c68695db 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -80,7 +80,7 @@ function apply_patch {
     echo ""
     echo "Applying $patch using ${type}: "
 	echo $patch >> ${builddir}/.applied_patches_list
-    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}"
+    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix ${patch}!"
 	exit 1

From 0b363ba5f389b3744937658f40f1e796e5447db3 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 22 Aug 2013 21:52:57 +0100
Subject: [PATCH 5923/6849] python-setuptools: Add missing $(TARGET_DIR) to
 PYTHONPATH

The $(TARGET_DIR) variable is required when building
python-setuptools for the target otherwise the build system detects
the host installation which leads to permission error problems
like these:

Setuptools installation detected at /usr/lib64/python2.7/site-packages
Renaming /usr/lib64/python2.7/site-packages/setuptools-0.9.8-py2.7.egg-info to
/usr/lib64/python2.7/site-packages/setuptools-0.9.8-py2.7.egg-info.OLD.1377005697.88
OSError: [Errno 13] Permission denied

Moreover, remove the PYTHONPATH variable for host variant since it's
not needed.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-setuptools/python-setuptools.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index cd5ee4d043..73c819f275 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -20,19 +20,18 @@ endef
 
 define PYTHON_SETUPTOOLS_BUILD_CMDS
 	(cd $(@D); \
-	PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
+	PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
 	$(HOST_DIR)/usr/bin/python setup.py build)
 endef
 
 define HOST_PYTHON_SETUPTOOLS_INSTALL_CMDS
 	(cd $(@D); \
-	PYTHONPATH="$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
 	$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
 endef
 
 define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
 	(cd $(@D); \
-	PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
+	PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
 	$(HOST_DIR)/usr/bin/python setup.py install --executable=/usr/bin/python \
 	--single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr)
 endef

From 282456212f2b3d232653844eebdd7c6e3be27506 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Wed, 21 Aug 2013 22:49:40 +0200
Subject: [PATCH 5924/6849] linux-fusion: bump version to 9.0.2

Fixes build with recent kernels.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-fusion/linux-fusion.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index ff319341d7..6f3d50adae 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINUX_FUSION_VERSION = 9.0.0
+LINUX_FUSION_VERSION = 9.0.2
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES

From 0be2fe9a8c07d1f58ca9eb288cb75aaae40550cd Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Tue, 20 Aug 2013 21:11:00 -0400
Subject: [PATCH 5925/6849] openssh: fix tab/spacing in init script

Several of the lines in S50sshd script have a strange mix of spaces
and tabs, that at least do not look consistent with neighboring lines.
This patch makes the spacing consistent, and also strips the trailing
spaces.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/openssh/S50sshd | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd
index 89f1b9a8d1..b65b3c8a70 100644
--- a/package/openssh/S50sshd
+++ b/package/openssh/S50sshd
@@ -23,7 +23,7 @@ if [ ! -f /etc/ssh_host_dsa_key ] ; then
 	echo Generating DSA Key...
 	echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
 	echo
-        /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
+	/usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
 fi
 
 # Check for the SSH2 ECDSA key
@@ -33,35 +33,35 @@ if [ ! -f /etc/ssh_host_ecdsa_key ]; then
 	echo
 	/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N ''
 fi
-                
+
 umask 077
 
 start() {
- 	echo -n "Starting sshd: "
+	echo -n "Starting sshd: "
 	/usr/sbin/sshd
 	touch /var/lock/sshd
 	echo "OK"
-}	
+}
 stop() {
 	echo -n "Stopping sshd: "
-        killall	sshd 
+	killall sshd
 	rm -f /var/lock/sshd
-	echo "OK" 
+	echo "OK"
 }
 restart() {
 	stop
 	start
-}	
+}
 
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart|reload)
-  	restart
+	restart
 	;;
   *)
 	echo "Usage: $0 {start|stop|restart}"

From be1a44df5a615e4fbb335582e620ebebe430a7e9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 16 Aug 2013 14:14:11 -0300
Subject: [PATCH 5926/6849] configs/p1010rdb: bump to the latest and greatest
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../p1010rdb/{linux-3.8.config => linux-3.10.config}        | 0
 configs/freescale_p1010rdb_defconfig                        | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename board/freescale/p1010rdb/{linux-3.8.config => linux-3.10.config} (100%)

diff --git a/board/freescale/p1010rdb/linux-3.8.config b/board/freescale/p1010rdb/linux-3.10.config
similarity index 100%
rename from board/freescale/p1010rdb/linux-3.8.config
rename to board/freescale/p1010rdb/linux-3.10.config
diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig
index 9ee541fb67..21554d57ff 100644
--- a/configs/freescale_p1010rdb_defconfig
+++ b/configs/freescale_p1010rdb_defconfig
@@ -15,9 +15,9 @@ BR2_KERNEL_HEADERS_3_8=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.10.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb"
@@ -30,4 +30,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07"

From 1e4068a3301b9bc1fbc43bfd12e5c5c4b22982ca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 16 Aug 2013 14:14:12 -0300
Subject: [PATCH 5927/6849] configs/mpc8315erdb: bump to the latest and
 greatest versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../mpc8315erdb/{linux-3.8.config => linux-3.10.config}     | 0
 configs/freescale_mpc8315erdb_defconfig                     | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename board/freescale/mpc8315erdb/{linux-3.8.config => linux-3.10.config} (100%)

diff --git a/board/freescale/mpc8315erdb/linux-3.8.config b/board/freescale/mpc8315erdb/linux-3.10.config
similarity index 100%
rename from board/freescale/mpc8315erdb/linux-3.8.config
rename to board/freescale/mpc8315erdb/linux-3.10.config
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
index d32264ea90..12bb70e09c 100644
--- a/configs/freescale_mpc8315erdb_defconfig
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -16,9 +16,9 @@ BR2_KERNEL_HEADERS_3_8=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.10.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
@@ -31,4 +31,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07"

From 796621c56aaed0a2b4c7c1fcec011f22501e94fc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 23 Aug 2013 20:40:16 +0200
Subject: [PATCH 5928/6849] package/Makefile.in: fix ABI name for EABIhf
 targets

The current code to set ABI on ARM does the following:

ifeq ($(BR2_arm)$(BR2_armeb),y)
... set ABI without 'hf' suffix ...
else ifeq ($(BR2_ARM_EABIHF),y)
... set ABI with 'hf' suffix ...
endif

But since $(BR2_arm)$(BR2_armeb) will always be 'y' in the cases where
BR2_ARM_EABIHF is 'y', it means that the 'else' part of the condition
will never be used.

Fix this by appending 'hf' to the ABI variable when BR2_ARM_EABIHF is
selected.

[Peter: put EABIhf handling under arm/armeb conditional for consistency]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index aed28d5a27..91ae1b9bc8 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -46,11 +46,9 @@ ABI=gnueabi
 else
 ABI=eabi
 endif
-else ifeq ($(BR2_ARM_EABIHF),y)
-ifeq ($(LIBC),uclibc)
-ABI=gnueabihf
-else
-ABI=eabihf
+
+ifeq ($(BR2_ARM_EABIHF),y)
+ABI:=$(ABI)hf
 endif
 endif
 

From f09636710b14f1493de7c8cd24aaf3a5d1322389 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 22 Aug 2013 23:01:32 +0200
Subject: [PATCH 5929/6849] pulseaudio: fix NEON usage

The NEON intrinsics used by Pulseaudio are only available in either
-mfloat-abi=softfp or -mfloat-abi=hard, not in
-mfloat-abi=soft. Therefore having NEON support in the processor is
not sufficient, we also should *not* be using soft-float.

Moreover, looking at BR2_ARM_ENABLE_NEON to know if the processor has
NEON support is incorrect. This option is only here to allow the user
to tell whether the processor has NEON support or not, for the ARM
cores that only have optional NEON support. Instead, the
BR2_ARM_CPU_HAS_NEON option really indicates whether NEON is available
or not (it is either set automatically by the ARM cores that always
have NEON support, or when BR2_ARM_ENABLE_NEON is enabled by the user
to confirm that his ARM processor has NEON support).

This fixes build failures such as
http://autobuild.buildroot.org/results/675/675c96059be348b594cc92980bef391126931c83/build-end.log

[Peter: add comment about reason for soft abi check]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/pulseaudio/pulseaudio.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 910e4a7fe8..195eb19e71 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -55,7 +55,19 @@ endef
 PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC
 endif
 
-PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no)
+# neon intrinsics not available with float-abi=soft
+ifeq ($(BR2_ARM_SOFT_FLOAT),)
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+PULSEAUDIO_USE_NEON = y
+endif
+endif
+
+ifeq ($(PULSEAUDIO_USE_NEON),y)
+PULSEAUDIO_CONF_OPT += --enable-neon-opt=yes
+else
+PULSEAUDIO_CONF_OPT += --enable-neon-opt=no
+endif
+
 # pulseaudio alsa backend needs pcm/mixer apis
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
 PULSEAUDIO_CONF_OPT += --disable-alsa

From 5628776c4a4d29d0715633ea463b64cc19e19c5a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 23 Aug 2013 00:59:35 +0200
Subject: [PATCH 5930/6849] toolchain-external: fix lib64 symlinks

* Always link lib64 or lib32 to lib
* Only copy the architecture's lib directory to staging
* Also cleanup a couple of mkdirs (concerning some 'lib' directories).

Before this patch:

$ ls -ld host/usr/x86_64-buildroot-linux-gnu/sysroot/{,usr/}lib* target/{usr/,}lib*
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:26 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:27 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib64/
drwxr-xr-x 5 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/
drwxr-xr-x 5 samuel users 4.0K Aug 12 22:27 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib64/
drwxr-xr-x 3 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/libexec/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:27 target/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:27 target/lib64 -> lib/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:27 target/usr/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:27 target/usr/lib64 -> lib/

$ find . -type l -xtype l # find broken symlinks
find: `./host/usr/x86_64-buildroot-linux-gnu/sysroot/lib64/lib': Too many levels of symbolic links
find: `./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib64/lib': Too many levels of symbolic links
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_files.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_nis.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_compat.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_nisplus.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libutil.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libthread_db.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libcidn.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libcrypt.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libm.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_hesiod.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnsl.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/librt.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_db.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libanl.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libBrokenLocale.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_dns.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libresolv.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libdl.so
./target/etc/resolv.conf
./target/dev/log

After this patch:
$ ls -ld host/usr/x86_64-buildroot-linux-gnu/sysroot/{,usr/}lib* target/{usr/,}lib*
drwxr-xr-x 2 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib/
lrwxrwxrwx 1 samuel users    5 Aug 12 22:36 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib64 -> lib/
drwxr-xr-x 5 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/
lrwxrwxrwx 1 samuel users    5 Aug 12 22:36 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib64 -> lib/
drwxr-xr-x 3 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/libexec/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:36 target/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:36 target/lib64 -> lib/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:36 target/usr/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:36 target/usr/lib64 -> lib/

$ find . -type l -xtype l # find broken symlinks
./target/etc/resolv.conf
./target/dev/log

Fixes http://autobuild.buildroot.net/results/23fb6b1479d2b5906b72c9437b06ab4700ff246d/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                 | 13 +++++++++++++
 toolchain/helpers.mk                     | 21 +++++----------------
 toolchain/toolchain-external/ext-tool.mk |  4 ----
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index ca7b039b6d..84d160a1ae 100644
--- a/Makefile
+++ b/Makefile
@@ -422,10 +422,20 @@ world: toolchain $(TARGETS_ALL)
 $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
 	@mkdir -p $@
 
+# We make a symlink lib32->lib or lib64->lib as appropriate
+# MIPS64/n32 requires lib32 even though it's a 64-bit arch.
+ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y)
+LIB_SYMLINK = lib64
+else
+LIB_SYMLINK = lib32
+endif
+
 $(STAGING_DIR):
 	@mkdir -p $(STAGING_DIR)/bin
 	@mkdir -p $(STAGING_DIR)/lib
+	@ln -snf lib $(STAGING_DIR)/$(LIB_SYMLINK)
 	@mkdir -p $(STAGING_DIR)/usr/lib
+	@ln -snf lib $(STAGING_DIR)/usr/$(LIB_SYMLINK)
 	@mkdir -p $(STAGING_DIR)/usr/include
 	@mkdir -p $(STAGING_DIR)/usr/bin
 	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
@@ -441,6 +451,9 @@ $(BUILD_DIR)/.root:
 		--exclude .hg --exclude=CVS --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
+	@ln -s lib $(TARGET_DIR)/$(LIB_SYMLINK)
+	@mkdir -p $(TARGET_DIR)/usr
+	@ln -s lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
 	touch $@
 
 $(TARGET_DIR): $(BUILD_DIR)/.root
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 4c988a5c9a..44b6018fd9 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -125,7 +125,7 @@ copy_toolchain_lib_root = \
 # $1: main sysroot directory of the toolchain
 # $2: arch specific sysroot directory of the toolchain
 # $3: arch specific subdirectory in the sysroot
-# $4: directory of libraries ('lib' or 'lib64')
+# $4: directory of libraries ('lib', 'lib32' or 'lib64')
 # $5: support lib directories (for toolchains storing libgcc_s,
 #     libstdc++ and other gcc support libraries outside of the
 #     sysroot)
@@ -135,9 +135,11 @@ copy_toolchain_sysroot = \
 	ARCH_SUBDIR="$(strip $3)"; \
 	ARCH_LIB_DIR="$(strip $4)" ; \
 	SUPPORT_LIB_DIR="$(strip $5)" ; \
-	for i in etc $${ARCH_LIB_DIR} sbin usr ; do \
+	for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR}; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
-			rsync -au --chmod=Du+w --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
+			rsync -au --chmod=Du+w --exclude 'usr/lib/locale' \
+				--exclude lib --exclude lib32 --exclude lib64 \
+				$${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \
 		fi ; \
 	done ; \
 	if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
@@ -158,19 +160,6 @@ copy_toolchain_sysroot = \
 	fi ; \
 	find $(STAGING_DIR) -type d | xargs chmod 755
 
-#
-# Create lib64 -> lib and usr/lib64 -> usr/lib symbolic links in the
-# target and staging directories. This is needed for some 64 bits
-# toolchains such as the Crosstool-NG toolchains, for which the path
-# to the dynamic loader and other libraries is /lib64, but the
-# libraries are stored in /lib.
-#
-create_lib64_symlinks = \
-	(cd $(TARGET_DIR) ;      ln -s lib lib64) ; \
-	(cd $(TARGET_DIR)/usr ;  ln -s lib lib64) ; \
-	(cd $(STAGING_DIR) ;     ln -s lib lib64) ; \
-	(cd $(STAGING_DIR)/usr ; ln -s lib lib64)
-
 #
 # Check the availability of a particular glibc feature. This function
 # is used to check toolchain options that are always supported by
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 01be85c672..38f6e22906 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -449,7 +449,6 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 		fi ; \
 	fi ; \
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
-	mkdir -p $(TARGET_DIR)/lib ; \
 	if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
 		$(call MESSAGE,"Copying external toolchain libraries to target...") ; \
 		for libs in $(LIB_EXTERNAL_LIBS); do \
@@ -461,9 +460,6 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	fi ; \
 	$(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \
 	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
-	if [ -L $${ARCH_SYSROOT_DIR}/lib64 -o -d $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
-		$(call create_lib64_symlinks) ; \
-	fi ; \
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \

From 86116e4f252d47fbbb71fb8d59591c2b87da3ba2 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 23 Aug 2013 18:26:34 +0100
Subject: [PATCH 5931/6849] minidlna: Fix automagic dependency to libiconv

minidlna will detect and use the libiconv library if
the package is selected. In that case, we need to link
against -liconv.

Fixes the following linking problem:

tagutils/tagutils.o: In function `do_iconv.constprop.6':
tagutils.c:(.text+0x4d5c): undefined reference to `libiconv_open'
tagutils.c:(.text+0x4da0): undefined reference to `libiconv'
tagutils.c:(.text+0x4e08): undefined reference to `libiconv_close'

[Peter: wrap COMMON_LIBS line]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/minidlna/minidlna.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
index 10e3b33b67..077e2572c0 100644
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -19,12 +19,23 @@ MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \
 	-I"$(STAGING_DIR)/usr/include/libavcodec" \
 	-I"$(STAGING_DIR)/usr/include/libavformat"
 
+MINIDLNA_COMMON_LIBS = \
+	-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec \
+	-lid3tag -lFLAC -logg -lvorbis
+
 ifeq ($(BR2_PACKAGE_GETTEXT),y)
 MINIDLNA_DEPENDENCIES += gettext
 # we need to link with libintl
-MINIDLNA_MAKE_OPTS += LIBS='-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -lintl'
+MINIDLNA_COMMON_LIBS += -lintl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MINIDLNA_DEPENDENCIES += libiconv
+MINIDLNA_COMMON_LIBS += -liconv
 endif
 
+MINIDLNA_MAKE_OPTS += LIBS='$(MINIDLNA_COMMON_LIBS)'
+
 define MINIDLNA_BUILD_CMDS
 	PREFIX=$(STAGING_DIR)/usr \
 		$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

From f6d97131220bc3bc4b604af4ee8a79fc7e8cab73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Aug 2013 19:08:03 +0200
Subject: [PATCH 5932/6849] neon: factorize 'depends on BR2_PACKAGE_NEON'

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/Config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/neon/Config.in b/package/neon/Config.in
index f972dbbd01..54b51c8ffd 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -5,23 +5,22 @@ config BR2_PACKAGE_NEON
 
 	  http://www.webdav.org/neon/
 
+if BR2_PACKAGE_NEON
+
 config BR2_PACKAGE_NEON_ZLIB
 	bool "ZLIB support"
-	depends on BR2_PACKAGE_NEON
 	select BR2_PACKAGE_ZLIB
 	help
 	  build with ZLIB support
 
 config BR2_PACKAGE_NEON_SSL
 	bool "SSL support"
-	depends on BR2_PACKAGE_NEON
 	select BR2_PACKAGE_OPENSSL
 	help
 	  build with SSL support
 
 choice
 	prompt "XML Support"
-	depends on BR2_PACKAGE_NEON
 	help
 	  Select which XML library to use...
 	  none       do not build with XML support
@@ -46,3 +45,5 @@ config BR2_PACKAGE_NEON_LIBXML2
 	  libxml2    use libxml2, a library to read, modify and
 	             write XML and HTML files.
 endchoice
+
+endif

From 9169810a9bd97c99d8b7a0e8aadabdcca3883e99 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Aug 2013 19:08:04 +0200
Subject: [PATCH 5933/6849] neon: replace 'choice' for XML library with two
 options

The NEON library can either be compiled without XML support, with XML
support provided by Expat, or with XML support provided by
libxml2. Until now, to represent this, a Kconfig 'choice..endchoice'
was used. Unfortunately, another package cannot 'select' one of the
possible choices. So for example, a package such as 'rpm', or the
to-be-added 'subversion' package could not select their dependencies,
they had to do a 'depends on !BR2_PACKAGE_NEON_NOXML', which is not
how Buildroot handles library dependencies in general.

So, this commit replaces the 'choice...endchoice' block with simply
two configuration options that are mutually exclusive. The option
names are not changed, so no Config.in.legacy addition is needed.

An hidden option BR2_PACKAGE_NEON_XML is provided, so that packages
that need XML support in NEON but don't care whether it's provided by
Expat or libxml2 can simply select BR2_PACKAGE_NEON_XML.

The rpm package is updated accordingly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/Config.in | 28 ++++++++++------------------
 package/rpm/Config.in  |  7 ++-----
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/package/neon/Config.in b/package/neon/Config.in
index 54b51c8ffd..e76278c37e 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -19,31 +19,23 @@ config BR2_PACKAGE_NEON_SSL
 	help
 	  build with SSL support
 
-choice
-	prompt "XML Support"
-	help
-	  Select which XML library to use...
-	  none       do not build with XML support
-	  expat      use expat
-	  libxml2    use libxml2
-
-config BR2_PACKAGE_NEON_NOXML
-	bool "none"
-	help
-	  none       do not build with XML support
+# This is an hidden symbol other packages can select to ensure that
+# Neon has XML support, either provided by Expat or libxml2.
+config BR2_PACKAGE_NEON_XML
+	bool
+	select BR2_PACKAGE_NEON_EXPAT if !BR2_PACKAGE_NEON_LIBXML2
 
 config BR2_PACKAGE_NEON_EXPAT
-	bool "expat"
+	bool "XML support with expat"
 	select BR2_PACKAGE_EXPAT
+	depends on !BR2_PACKAGE_NEON_LIBXML2
 	help
-	  expat      use expat, a library for parsing XML.
+	  Enable XML support in neon, using the Expat XML library.
 
 config BR2_PACKAGE_NEON_LIBXML2
-	bool "libxml2"
+	bool "XML support with libxml2"
 	select BR2_PACKAGE_LIBXML2
 	help
-	  libxml2    use libxml2, a library to read, modify and
-	             write XML and HTML files.
-endchoice
+	  Enable XML support in neon, using the libxml2 XML library.
 
 endif
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 14072c95f9..63e5367726 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,17 +1,14 @@
 comment "rpm requires a toolchain with thread support"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-comment "rpm requires libneon with SSL, XML and ZLIB support"
-	depends on !BR2_PACKAGE_NEON || BR2_PACKAGE_NEON_NOXML && BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_RPM
 	bool "rpm"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt
 	select BR2_PACKAGE_BEECRYPT
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_OPENSSL
-	depends on BR2_PACKAGE_NEON
-	depends on !BR2_PACKAGE_NEON_NOXML
+	select BR2_PACKAGE_NEON
+	select BR2_PACKAGE_NEON_XML
 	select BR2_PACKAGE_NEON_ZLIB
 	select BR2_PACKAGE_NEON_SSL
 	help

From 1eec0012200f4162722d5337b55b431e6acd8299 Mon Sep 17 00:00:00 2001
From: Rico Bachmann <bachmann@tofwerk.com>
Date: Tue, 27 Aug 2013 19:08:05 +0200
Subject: [PATCH 5934/6849] subversion: new package

[Thomas: added license informations, fixed dependencies, and several
cleanups.]

Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                |  1 +
 package/subversion/Config.in     | 11 +++++++++++
 package/subversion/subversion.mk | 28 ++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 package/subversion/Config.in
 create mode 100644 package/subversion/subversion.mk

diff --git a/package/Config.in b/package/Config.in
index f7b0360b88..53e401ba3c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -97,6 +97,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sed/Config.in"
 endif
 source "package/sstrip/Config.in"
+source "package/subversion/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
 endif
diff --git a/package/subversion/Config.in b/package/subversion/Config.in
new file mode 100644
index 0000000000..c1358fee78
--- /dev/null
+++ b/package/subversion/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SUBVERSION
+	bool "subversion"
+	select BR2_PACKAGE_APR_UTIL
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
+	select BR2_PACKAGE_NEON
+	select BR2_PACKAGE_NEON_XML
+	help
+	  Subversion is an open source version control system
+
+	  http://subversion.apache.org/
diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk
new file mode 100644
index 0000000000..de4db7c4e4
--- /dev/null
+++ b/package/subversion/subversion.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# subversion
+#
+################################################################################
+
+SUBVERSION_VERSION = 1.7.9
+SUBVERSION_SITE = http://archive.apache.org/dist/subversion
+SUBVERSION_LICENSE = Apache 2.0
+SUBVERSION_LICENSE_FILES = LICENSE
+
+SUBVERSION_DEPENDENCIES = apr apr-util expat neon zlib
+SUBVERSION_CONF_OPT = \
+	--with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \
+	--with-apr=$(STAGING_DIR)/usr \
+	--with-apr-util=$(STAGING_DIR)/usr \
+	--with-zlib=$(STAGING_DIR)/usr \
+	--with-neon=$(STAGING_DIR)/usr \
+	--without-gssapi \
+	--without-serf \
+	--without-apxs \
+	--without-berkeyley-db \
+	--without-sasl \
+	--without-gnome-keyring \
+	--without-ssl \
+	--without-libmagic
+
+$(eval $(autotools-package))

From 3e1f853211fe0c0da4d7c07b587b0f7cb2909fea Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Sat, 24 Aug 2013 14:41:57 -0500
Subject: [PATCH 5935/6849] sunxi-mali: bug fixes for pc and init script

fix bad escape sequences in init script and add correct lib for pc file.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sunxi-mali/S80mali   | 2 +-
 package/sunxi-mali/glesv2.pc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sunxi-mali/S80mali b/package/sunxi-mali/S80mali
index 6f51cc4745..ecfbab97b4 100644
--- a/package/sunxi-mali/S80mali
+++ b/package/sunxi-mali/S80mali
@@ -5,7 +5,7 @@ install_driver() {
 	OPTS=$2
 
 	modprobe $DRIVER $OPTS
-	maj=$(awk "$$2==\"${DRIVER}\" { print $$1; }" /proc/devices)
+	maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices)
 
 	rm -f /dev/${DRIVER}
 
diff --git a/package/sunxi-mali/glesv2.pc b/package/sunxi-mali/glesv2.pc
index 4e112eeafb..9273678093 100644
--- a/package/sunxi-mali/glesv2.pc
+++ b/package/sunxi-mali/glesv2.pc
@@ -7,6 +7,6 @@ Name: glesv2
 Description: ARM Mali implementation of OpenGL ESv2
 Version: 2.0
 Requires:
-Libs: -L${libdir} -lGLESv2 -lGLES_CM -lUMP
+Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP
 Cflags: -I${includedir}/GLES2
 

From ca47afb41e44df6f4d3526d839ffae50aadec5d3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 28 Aug 2013 14:13:00 +0200
Subject: [PATCH 5936/6849] qt5webkit: needs gui support in qt

Fixes http://autobuild.buildroot.net/results/439ce2c3c33a92966808071d4fc7231d50453c79/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5webkit/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
index 319d84a0d1..48b512504f 100644
--- a/package/qt5/qt5webkit/Config.in
+++ b/package/qt5/qt5webkit/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_QT5WEBKIT
 	bool "qt5webkit"
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_ICU
+	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_SQLITE
 	# This module does not support static linking
 	depends on !BR2_PREFER_STATIC_LIB

From 027ef3f2b272e5b2d5b258eb4d50e4be8cad0603 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 28 Aug 2013 11:56:18 +0100
Subject: [PATCH 5937/6849] gcc-final: Drop obsolete code for handling lib64

Since 5628776c4a4d29d0715633ea463b64cc19e19c5a
"toolchain-external: fix lib64 symlinks"

lib64 is a symlink to lib so there is no reason to copy the libraries
to lib64 anymore. This fixes multiple building problems
for buildroot toolchains:

[...]
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libuClibc-0.9.33.2.so'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libuClibc-0.9.33.2.so'
are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil-0.9.33.2.so'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil-0.9.33.2.so'
are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil.so.0'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil.so.0'
are the same file
rmdir: failed to remove
'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64': Not a directory
[...]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-final/gcc-final.mk | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 9f54c68420..b62dfe2df4 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -55,20 +55,6 @@ endif
 HOST_GCC_FINAL_CONF_OPT += \
 	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
-# Handle lib64
-define HOST_GCC_FINAL_HANDLE_LIB64
-	if [ -d "$(STAGING_DIR)/lib64" ]; then \
-		if [ ! -e "$(STAGING_DIR)/lib" ]; then \
-			mkdir -p "$(STAGING_DIR)/lib"; \
-		fi; \
-		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
-		rmdir "$(STAGING_DIR)/lib64"; \
-		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
-	fi
-endef
-
-HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_HANDLE_LIB64
-
 # Make sure we have 'cc'
 define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
 	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \

From e5088380d3aa475fe2457fc12a47353dd66c4c19 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Wed, 28 Aug 2013 15:40:25 +0200
Subject: [PATCH 5938/6849] redis: fix build with ccache enabled

Some parts of redis fail to build when ccache is enabled, due to one of our
own patches. The construct
    make CC=$(CC) target1 target2
would result in
    make CC=ccache <tuple>-gcc target1 target2

and here <tuple>-gcc would be treated as a target and the compiler used
would be just 'ccache'.

Reported-by: Johan Sagaert <sagaert.johan@skynet.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/redis/redis-001-uclibc.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch
index 8762ca2fb9..01657d0ea8 100644
--- a/package/redis/redis-001-uclibc.patch
+++ b/package/redis/redis-001-uclibc.patch
@@ -39,7 +39,7 @@ diff -ur old/src/Makefile new/src/Makefile
  	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
  	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
 -	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
-+	-(cd ../deps && $(MAKE) CC=$(CC) $(DEPENDENCY_TARGETS))
++	-(cd ../deps && $(MAKE) CC="$(CC)" $(DEPENDENCY_TARGETS))
  
  .PHONY: persist-settings
  

From 244038576b4d45363b328f437b772afc4cfbf9b2 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 17 Aug 2013 22:35:37 +0200
Subject: [PATCH 5939/6849] config: reorder top-level menu

Reorder the entries in the top-menu, in a more significant order.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in         | 6 +++---
 package/Config.in | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Config.in b/Config.in
index 78dea3be02..cb246a4ff3 100644
--- a/Config.in
+++ b/Config.in
@@ -450,14 +450,14 @@ source "toolchain/Config.in"
 
 source "system/Config.in"
 
-source "package/Config.in"
+source "linux/Config.in"
 
-source "package/Config.in.host"
+source "package/Config.in"
 
 source "fs/Config.in"
 
 source "boot/Config.in"
 
-source "linux/Config.in"
+source "package/Config.in.host"
 
 source "Config.in.legacy"
diff --git a/package/Config.in b/package/Config.in
index 7069d778e7..97cd7da55e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1,4 +1,4 @@
-menu "Package Selection for the target"
+menu "Target packages"
 
 source "package/busybox/Config.in"
 

From 339868d244dba9befe71b7bca2d70ce723b230b1 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Wed, 28 Aug 2013 23:29:35 +0200
Subject: [PATCH 5940/6849] bash: fails in parallel build

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bash/bash.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index efd2334ad0..0c8a954b20 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -16,6 +16,10 @@ BASH_CONF_ENV +=                       \
    bash_cv_func_sigsetjmp=present      \
    bash_cv_printf_a_format=yes
 
+# Parallel build sometimes fails because some of the generator tools
+# are built twice (i.e. while executing).
+BASH_MAKE = $(MAKE1)
+
 # The static build needs some trickery
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 BASH_CONF_OPT += --enable-static-link --without-bash-malloc

From 10f1903f4fe60a17944016b4f4fcb094e46c7a68 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 28 Aug 2013 18:10:32 +0200
Subject: [PATCH 5941/6849] kmod: fix build failure on gcc < 4.6 caused by
 _Static_assert()

This commit introduces a patch to kmod that ensures _Static_assert()
is only used if available. The patch has been submitted upstream.

Fixes:

  http://autobuild.buildroot.net/results/9daf0f46642020591731e20d3bf9041ff6259846/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...d-configure-check-for-_Static_assert.patch | 57 +++++++++++++++++++
 package/kmod/kmod.mk                          |  3 +
 2 files changed, 60 insertions(+)
 create mode 100644 package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch

diff --git a/package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch b/package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch
new file mode 100644
index 0000000000..2def358a6f
--- /dev/null
+++ b/package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch
@@ -0,0 +1,57 @@
+From d4a1e5daf0d50aa79ae0ed2f947f5657343cf2f7 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 28 Aug 2013 17:31:40 +0200
+Subject: [PATCH] Add configure check for _Static_assert()
+
+Commit 8efede20ef ("Use _Static_assert") introduced the usage of
+_Static_assert(). However, _Static_assert() is a fairly new thing,
+since it was introduced only in gcc 4.6. In order to support older
+compilers, this patch adds a configure.in test that checks whether
+_Static_assert() is usable or not, and adjust the behavior of the
+assert_cc() macro accordingly.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Upstream-status: submitted
+                 http://article.gmane.org/gmane.linux.kernel.modules/1136
+---
+ configure.ac    | 6 ++++++
+ libkmod/macro.h | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 40e54cf..cbe12f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,6 +52,12 @@ AC_CHECK_MEMBERS([struct stat.st_mtim], [], [], [#include <sys/stat.h>])
+ # Check kernel headers
+ AC_CHECK_HEADERS_ONCE([linux/module.h])
+ 
++AC_MSG_CHECKING([whether _Static_assert() is supported])
++AC_COMPILE_IFELSE(
++	[AC_LANG_SOURCE([[_Static_assert(1, "Test");]])],
++        [AC_DEFINE([HAVE_STATIC_ASSERT], [1], [Define is _Static_assert() is available])
++	 AC_MSG_RESULT([yes])],
++	[AC_MSG_RESULT([no])])
+ 
+ #####################################################################
+ # --with-
+diff --git a/libkmod/macro.h b/libkmod/macro.h
+index c6ba855..5992026 100644
+--- a/libkmod/macro.h
++++ b/libkmod/macro.h
+@@ -21,8 +21,12 @@
+ 
+ #include <stddef.h>
+ 
++#if defined(HAVE_STATIC_ASSERT)
+ #define assert_cc(expr) \
+ 	_Static_assert((expr), #expr)
++#else
++#define assert_cc(expr)
++#endif
+ 
+ #if HAVE_TYPEOF
+ #define check_types_match(expr1, expr2)		\
+-- 
+1.8.1.2
+
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 72a24afb36..c5826cff0a 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -10,6 +10,9 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
 
+# Some patches are touching configure.in
+KMOD_AUTORECONF = YES
+
 # license info for libkmod only, conditionally add more below
 KMOD_LICENSE = LGPLv2.1+
 KMOD_LICENSE_FILES = libkmod/COPYING

From a831a0e06521298eaea3d8862eebd022d7915de0 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Thu, 29 Aug 2013 11:29:33 +0200
Subject: [PATCH 5942/6849] mesa3d: fix download URL

The MesaLib 7.10.3 tarball has been moved on ftp.freedesktop.org from
pub/mesa/7.10.3/ to pub/mesa/old_versions/7.x/7.10.3/.
A bump to a newer release is only coming after Buildroot 2013.08, so for now
let us just change URL to let the download work properly.

Reported-by: Ryan Wilkins <ryan@deadfrog.net>
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/mesa3d/mesa3d.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index f9d35a92b5..d4080d47d0 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -6,7 +6,7 @@
 
 MESA3D_VERSION = 7.10.3
 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
-MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
+MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION)
 MESA3D_LICENSE = MIT, SGI, Khronos
 MESA3D_LICENSE_FILES = docs/license.html
 

From 313dd5d5f21790715182f4e797a32a10c932152e Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 29 Aug 2013 12:45:49 +0300
Subject: [PATCH 5943/6849] kexec: fix homepage URL

The old one gives 404 error.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kexec/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kexec/Config.in b/package/kexec/Config.in
index 886144f9c7..66bc343c9c 100644
--- a/package/kexec/Config.in
+++ b/package/kexec/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_KEXEC
 	  Kexec is a user space utiltity for loading another kernel
 	  and asking the currently running kernel to do something with it.
 
-	  http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+	  https://www.kernel.org/pub/linux/utils/kernel/kexec/
 
 config BR2_PACKAGE_KEXEC_ZLIB
 	bool "zlib support"

From 04fe6b134417c30cad90c663a870ed68b7dfc8ce Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 29 Aug 2013 21:56:16 +0200
Subject: [PATCH 5944/6849] dvb-apps: Fix generate-keynames.sh script for
 cross-compilation

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../dvb-apps-0001-Fix-generate-keynames.patch | 30 +++++++++++++++++++
 package/dvb-apps/dvb-apps.mk                  |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch

diff --git a/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch b/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch
new file mode 100644
index 0000000000..498607d97d
--- /dev/null
+++ b/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch
@@ -0,0 +1,30 @@
+Fix generate-keynames.sh script for cross-compilation
+
+generate-keynames.sh reads /usr/include/linux to find the keyname
+symbols. However, when cross-compiling, the include path points
+somewhere else. Allow the user to pass CROSS_ROOT to point to the
+root of the cross-compilation environment.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh
+--- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh	2012-12-06 10:38:07.000000000 +0100
++++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh	2013-08-29 21:47:09.717991439 +0200
+@@ -18,7 +18,7 @@ echo "};" >> $1
+ echo >> $1
+ echo >> $1
+ echo "static struct input_key_name key_name [] = {" >> $1
+-for x in $(cat /usr/include/linux/input.h input_fake.h | \
++for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
+            egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \
+            cut -f 1 | cut -f 2 -d " " | sort -u) ; do
+     echo "        { \"$(echo $x | cut -b 5-)\", $x }," >> $1
+@@ -26,7 +26,7 @@ done
+ echo "};" >> $1
+ echo >> $1
+ echo "static struct input_key_name btn_name [] = {" >> $1
+-for x in $(cat /usr/include/linux/input.h input_fake.h | \
++for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
+            egrep "#define[ \t]+BTN_" | \
+            cut -f 1 | cut -f 2 -d " " | sort -u) ; do
+      echo "        { \"$(echo $x | cut -b 5-)\", $x }," >> $1
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index 1e50aa4f30..8cf6a7958b 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -34,7 +34,8 @@ endif
 DVB_APPS_INSTALL_STAGING = YES
 
 define DVB_APPS_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" $(MAKE) -C $(@D) V=1
+	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" \
+		$(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) V=1
 endef
 
 define DVB_APPS_INSTALL_STAGING_CMDS

From 7e9264956bb5693bc49274ee0b42ffb4c869e23f Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 28 Aug 2013 14:09:51 +0100
Subject: [PATCH 5945/6849] directfb: Add patch to use 'gcc' for linking
 objects

Fixes
http://autobuild.buildroot.net/results/fab819eee4002a9c392c48c1ebaca5c5b6555567/

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/directfb/directfb-use-gcc-link.patch | 35 ++++++++++++++++++++
 package/directfb/directfb.mk                 |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 package/directfb/directfb-use-gcc-link.patch

diff --git a/package/directfb/directfb-use-gcc-link.patch b/package/directfb/directfb-use-gcc-link.patch
new file mode 100644
index 0000000000..ec6c0ea501
--- /dev/null
+++ b/package/directfb/directfb-use-gcc-link.patch
@@ -0,0 +1,35 @@
+Add patch to use 'gcc' instead of 'ld' for linking
+
+The patch has been sent upstream but it has not been merged yet
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Wed, 28 Aug 2013 10:56:32 +0100
+Subject: [PATCH] rules/libobject.make: Use gcc for linking
+
+Invoking 'ld' directly may miss some necessary linker flags which
+are usually passed by gcc. Therefore, use gcc for linking.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+---
+ rules/libobject.make | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rules/libobject.make b/rules/libobject.make
+index bc670da..2cba658 100644
+--- a/rules/libobject.make
++++ b/rules/libobject.make
+@@ -3,7 +3,7 @@
+ 	if test -d $<.tmp; then rmdir $<.tmp; fi
+ 	mkdir $<.tmp
+ 	(cd $<.tmp && $(AR) x ../../$<)
+-	$(LD) -o $@ -r $<.tmp/*.o
++	$(CC) -nostdlib -o $@ -r $<.tmp/*.o
+ 	rm -f $<.tmp/*.o && rmdir $<.tmp
+ 
+ .PHONY: $(LTLIBRARIES:%.la=.libs/%.a)
+-- 
+1.8.3.2
+
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index c065eef851..1d83a0b623 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -11,6 +11,8 @@ DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_LICENSE = LGPLv2.1+
 DIRECTFB_LICENSE_FILES = COPYING
 DIRECTFB_INSTALL_STAGING = YES
+DIRECTFB_AUTORECONF = YES
+
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \
 	--disable-explicit-deps \

From 1a074ba117938e17430a58ac57798c2f3ba05149 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:10:30 +0200
Subject: [PATCH 5946/6849] gstreamer1: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gstreamer1/gstreamer1.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/multimedia/gstreamer1/gstreamer1.mk
index c9808a7f13..79b2b560b0 100644
--- a/package/multimedia/gstreamer1/gstreamer1.mk
+++ b/package/multimedia/gstreamer1/gstreamer1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GSTREAMER1_VERSION = 1.0.9
+GSTREAMER1_VERSION = 1.0.10
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES

From f62c9f2c1bd3859665b2a85e2b1720572b04931f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:11:05 +0200
Subject: [PATCH 5947/6849] gst1-plugins-base: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
index 4a9e2344c7..d3aebdad84 100644
--- a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BASE_VERSION = 1.0.9
+GST1_PLUGINS_BASE_VERSION = 1.0.10
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES

From 4fd56accaed3ec94c82401777bc639356f3d154e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:11:34 +0200
Subject: [PATCH 5948/6849] gst1-plugins-good: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-good/gst1-plugins-good.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
index 4455d65e2c..29b89830db 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_GOOD_VERSION = 1.0.9
+GST1_PLUGINS_GOOD_VERSION = 1.0.10
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING

From c946b4f4ce2dca1f77dc90e77c1de0232df01c43 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:12:22 +0200
Subject: [PATCH 5949/6849] gst1-pugins-bad: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
index 362aed6948..385522ec07 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BAD_VERSION = 1.0.9
+GST1_PLUGINS_BAD_VERSION = 1.0.10
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB

From 90fb70b4c37ad3a3178b51c7941881aa8dfd8fa6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:12:48 +0200
Subject: [PATCH 5950/6849] gst1-plugins-ugly: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 493ee71085..e666d61138 100644
--- a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_UGLY_VERSION = 1.0.9
+GST1_PLUGINS_UGLY_VERSION = 1.0.10
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING

From 13ce6ddf5980819abdab21d6824a3e1c908872e8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:22:08 +0200
Subject: [PATCH 5951/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGES b/CHANGES
index 2fc965e02c..8c7c23acb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+2013.08, Not yet released:
+
+	Fixes all over the tree.
+
+	External toolchain lib32/lib64 handling, ABI name for EABIhf,
+	misc fixes for generatelocales, apply-patches and module
+	stripping.
+
+	Top level menu names reordered and renamed for clarity.
+
+	Updated/fixed packages: acl, attr, bash, directfb, dvb-apps,
+	kexec, kmod, libbsd, linux-fusion, mesa3d, minidlna, openssh,
+	openssl, pulseaudio, python-setuptools, qt5, qt5webkit, redis,
+	strongswan, sunxi-mali
+
 2013.08-rc2, Released August 16th 2013:
 
 	Documentation improvements.

From aab3a0ba792f33aae66757f0e5c3fc67e41104ec Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:30:55 +0200
Subject: [PATCH 5952/6849] dbus: launch helper should be setuid root

Closes #6464

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES              | 12 ++++++++----
 package/dbus/dbus.mk |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8c7c23acb4..4653e38450 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,10 +8,14 @@
 
 	Top level menu names reordered and renamed for clarity.
 
-	Updated/fixed packages: acl, attr, bash, directfb, dvb-apps,
-	kexec, kmod, libbsd, linux-fusion, mesa3d, minidlna, openssh,
-	openssl, pulseaudio, python-setuptools, qt5, qt5webkit, redis,
-	strongswan, sunxi-mali
+	Updated/fixed packages: acl, attr, bash, dbus, directfb,
+	dvb-apps, kexec, kmod, libbsd, linux-fusion, mesa3d, minidlna,
+	openssh, openssl, pulseaudio, python-setuptools, qt5,
+	qt5webkit, redis, strongswan, sunxi-mali
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#6464: dbus-daemon-launch-helper needs setuid
 
 2013.08-rc2, Released August 16th 2013:
 
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 7fbfb4c179..d50f6309cb 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -10,6 +10,10 @@ DBUS_LICENSE = AFLv2.1 GPLv2+
 DBUS_LICENSE_FILES = COPYING
 DBUS_INSTALL_STAGING = YES
 
+define DBUS_PERMISSIONS
+/usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - -
+endef
+
 DBUS_DEPENDENCIES = host-pkgconf
 
 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes

From 51a087fde3b77ff632e76395d3406596a4cf2b9f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:58:13 +0200
Subject: [PATCH 5953/6849] linux-headers: bump 3.{0,4,10}.x stable versions

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...aders_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                        | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename package/linux-headers/{3.0.91 => 3.0.94}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.91/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.94/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.91/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.94/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 8facdf0384..ef76733352 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.91"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.94"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.50"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.58"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.60"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.7"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.10"	if BR2_KERNEL_HEADERS_3_10
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 27df440b62042601a02071dac83f312d4692f03d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 29 Aug 2013 23:59:33 +0200
Subject: [PATCH 5954/6849] linux: bump 3.10.x stable version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 12e4cd8886..49c4b5cacb 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.7"
+	bool "3.10.10"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.7" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.10.10" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 4e4a0a347764935d044a5d782d86006964fc3830 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Aug 2013 00:03:48 +0200
Subject: [PATCH 5955/6849] Prepare for 2013.08-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4653e38450..80cd357e59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.08, Not yet released:
+2013.08-rc3, Released August 29th, 2013:
 
 	Fixes all over the tree.
 
diff --git a/Makefile b/Makefile
index 84d160a1ae..e7f822aed4 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.08-rc2
+export BR2_VERSION:=2013.08-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 66a9c720b5..79a9889073 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -15,12 +15,12 @@ <h3>Download</h3>
 
 <p>
 
-The latest release candidate is <b>2013.08-rc2</b>, which can be
+The latest release candidate is <b>2013.08-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.08-rc2.tar.gz">buildroot-2013.08-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2013.08-rc3.tar.gz">buildroot-2013.08-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.08-rc2.tar.bz2">buildroot-2013.08-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.08-rc3.tar.bz2">buildroot-2013.08-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index f233a35e6b..4888eff7ca 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>29 August 2013 -- 2013.08-rc3 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08_rc3">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.08-rc3.tar.bz2">2013.08-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>16 August 2013 -- 2013.08-rc2 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 13d917aaffadc991360992c86031f2da67e07553 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Aug 2013 00:29:27 +0200
Subject: [PATCH 5956/6849] gen-manual-lists.py: fixup after 2440385 (config:
 reorder top-level menu)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/gen-manual-lists.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py
index ae1d4ff420..35688430e6 100755
--- a/support/scripts/gen-manual-lists.py
+++ b/support/scripts/gen-manual-lists.py
@@ -185,7 +185,7 @@ class Buildroot:
     list_info = {
         'target-packages': {
             'filename': "package-list",
-            'root_menu': "Package Selection for the target",
+            'root_menu': "Target packages",
             'filter': "_is_package",
             'sorted': True,
             'sub_menu': True,

From 014dd9b15304923de9bd3a7aa0e4778b0fa11393 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 30 Aug 2013 11:17:23 +0100
Subject: [PATCH 5957/6849] ltrace: Add missing mips->mipsel symlink

Restore missing mips->mipsel symlink. It appears ltrace was
packaged incorrectly and the symlink got lost. See
http://lists.alioth.debian.org/pipermail/ltrace-devel/2013-August/000938.html

[Peter: add a comment explaining why]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/ltrace.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 55930b8c1f..0ea8ff3272 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -13,6 +13,13 @@ LTRACE_CONF_OPT = --disable-werror
 LTRACE_LICENSE = GPLv2
 LTRACE_LICENSE_FILES = COPYING
 
+# symlink missing from tarball
+define LTRACE_MIPS_SYMLINK
+	cd $(@D)/sysdeps/linux-gnu; ln -sf mipsel mips
+endef
+
+LTRACE_POST_EXTRACT_HOOKS += LTRACE_MIPS_SYMLINK
+
 # ltrace can use libunwind only if libc has backtrace() support
 # We don't normally do so for uClibc and we can't know if it's external
 ifeq ($(BR2_PACKAGE_LIBUNWIND),y)

From eb53a09fd51da80ef3f35cbbaf11a8068bbaf38f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 30 Aug 2013 13:08:38 +0200
Subject: [PATCH 5958/6849] strongswan: fix build failure when host == target
 architecture

The strongswan configure.in uses the AC_LIB_PREFIX macro, which adds
--with-lib-prefix and --without-lib-prefix options, and which, by
default assumes that adding ${prefix}/lib to LDFLAGS and
${prefix}/include to CPPFLAGS is a good idea. Obviously, when
cross-compiling, it is definitely not a good idea.

In the specific case of strongswan, the result is that when testing if
the backtrace() function was available, the small C program was being
built and linked with -L/usr/lib. So when the host architecture and
target architecture are identical, it may find the backtrace()
function in the host C library, without looking at the target C
library:

configure:16457: /home/test/outputs/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/output/host/usr/bin/x86_64-unknown-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -pipe -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -L/usr/lib conftest.c  >&5
/home/test/outputs/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-unknown-linux-uclibc/4.6.3/../../../../x86_64-unknown-linux-uclibc/bin/ld: warning: libc.so.0, needed by /home/test/outputs/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-unknown-linux-uclibc/4.6.3/../../../../x86_64-unknown-linux-uclibc/lib/../lib64/libgcc_s.so, may conflict with libc.so.6

Passing --without-lib-prefix prevents this default behavior from
happening, and no stupid value is added to CPPFLAGS or LDFLAGS.

Fixes:

  http://autobuild.buildroot.net/results/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/strongswan/strongswan.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index 3444f9281b..aa63d0d701 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -11,6 +11,7 @@ STRONGSWAN_LICENSE = GPLv2+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
 STRONGSWAN_CONF_OPT +=                                                             \
+      --without-lib-prefix                                                         \
       --enable-pkcs11=yes                                                          \
       --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no)                        \
       --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no)                        \

From 53d8d9c14a379ea15a84504e941b6b7ca78074f8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 31 Aug 2013 00:33:13 +0200
Subject: [PATCH 5959/6849] Update for 2013.08

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 CHANGES            |  8 ++++++++
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  9 +++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 80cd357e59..f1b01a3e88 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+2013.08, Released August 31th, 2013:
+
+	Minor fixes.
+
+	Documentation build fixed.
+
+	Updated/fixed packages: ltrace, strongswan
+
 2013.08-rc3, Released August 29th, 2013:
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index e7f822aed4..e2454a7347 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.08-rc3
+export BR2_VERSION:=2013.08
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 79a9889073..e2adcfcac6 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,15 +6,15 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2013.05</b>, which can be downloaded
+The latest stable release is <b>2013.08</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2013.05.tar.gz">buildroot-2013.05.tar.gz</a>
+<a href="/downloads/buildroot-2013.08.tar.gz">buildroot-2013.08.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.05.tar.bz2">buildroot-2013.05.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.08.tar.bz2">buildroot-2013.08.tar.bz2</a>.
 
 <p>
-
+<!--
 The latest release candidate is <b>2013.08-rc3</b>, which can be
 downloaded here:<p>
 
@@ -22,7 +22,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2013.08-rc3.tar.bz2">buildroot-2013.08-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 4888eff7ca..25a70f0f37 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>31 August 2013 -- 2013.08 released</b>
+
+    <p>The stable 2013.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08">CHANGES</a>
+    file for more details
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.08.tar.bz2">2013.08 release</a>.</p>
+
   <li><b>29 August 2013 -- 2013.08-rc3 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From 7b48cee91f9acdf46a27440ee2a44acf8fa63040 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 31 Aug 2013 23:32:02 +0200
Subject: [PATCH 5960/6849] Makefile: kickoff 2013.11 cycle

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e2454a7347..4aebfa2d2e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.08
+export BR2_VERSION:=2013.11-git
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81

From c22889cd67b647c15d55e46b273f1ebfb2d596b8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:59:56 -0300
Subject: [PATCH 5961/6849] netatalk: bump to version 3.0.5

Make it use external instead of bundled libevent - it's better for size
reasons (avoiding possible duplication) and security reasons (easier to
upgrade one global library than possibly two or more, and generally
upstream would probably be more responsive to those).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netatalk/Config.in   |  1 +
 package/netatalk/netatalk.mk | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
index e3deaefba4..5c676e99ba 100644
--- a/package/netatalk/Config.in
+++ b/package/netatalk/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_NETATALK
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_BERKELEYDB
 	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBEVENT
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 684e790523..37115ecd63 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -4,15 +4,17 @@
 #
 ################################################################################
 
-NETATALK_VERSION = 3.0
+NETATALK_VERSION = 3.0.5
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
-
 NETATALK_AUTORECONF = YES
 NETATALK_CONFIG_SCRIPTS = netatalk-config
+NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \
+	libevent
 
-NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
-NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
+# Don't run ldconfig!
+NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \
+	ac_cv_path_NETA_LDCONFIG=""
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \
 	--disable-zeroconf \
@@ -21,7 +23,8 @@ NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-shadow \
 	--disable-shell-check \
 	--without-kerberos \
-	--without-pam
+	--without-pam \
+	--with-libevent=no
 
 ifeq ($(BR2_PACKAGE_CUPS),y)
 	NETATALK_DEPENDENCIES += cups

From 8b55597d7e00078ef4cfb2d825b60acefd762264 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:58:43 -0300
Subject: [PATCH 5962/6849] collectd: bump to version 5.4.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in   | 11 +++++++++++
 package/collectd/collectd.mk | 13 ++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index a1d50a4928..43571e3596 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -105,6 +105,11 @@ config BR2_PACKAGE_COLLECTD_BIND
 	help
 	  Collects BIND DNS statistics.
 
+config BR2_PACKAGE_COLLECTD_CGROUPS
+	bool "cgroups"
+	help
+	  Collects CGroups CPU usage accounting.
+
 config BR2_PACKAGE_COLLECTD_CONNTRACK
 	bool "conntrack"
 	help
@@ -276,6 +281,11 @@ config BR2_PACKAGE_COLLECTD_SERIAL
 	help
 	  Collects the traffic on serial interfaces.
 
+config BR2_PACKAGE_COLLECTD_STATSD
+	bool "StatsD"
+	help
+	  StatsD network protocol to allow clients to report "events".
+
 config BR2_PACKAGE_COLLECTD_SNMP
 	bool "snmp"
 	select BR2_PACKAGE_NETSNMP
@@ -420,3 +430,4 @@ endif
 
 comment "collectd needs a toolchain with IPv6 and thread support"
         depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
+	depends on BR2_USE_MMU
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index bead4d4308..55a388ca53 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COLLECTD_VERSION = 5.3.1
+COLLECTD_VERSION = 5.4.0
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
@@ -13,13 +13,14 @@ COLLECTD_LICENSE = GPLv2 LGPLv2.1
 COLLECTD_LICENSE_FILES = COPYING
 
 # These require unmet dependencies, are fringe, pointless or deprecated
-COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
-		gmond hddtemp ipmi ipvs java libvirt lpar madwifi mbmon \
+COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \
+		gmond hddtemp ipmi ipvs java libvirt lpar lvm madwifi mbmon \
 		memcachec modbus multimeter netapp netlink nginx \
 		notify_desktop notify_email numa nut onewire oracle perl pf \
 		pinba postgresql powerdns python redis routeros rrdcached \
-		sensors tape target_v5upgrade teamspeak2 ted tokyotyrant \
-		uuid varnish vserver write_mongodb write_redis xmms zfs_arc
+		sensors sigrok tape target_v5upgrade teamspeak2 ted \
+		tokyotyrant uuid varnish vserver write_mongodb write_redis \
+		xmms zfs_arc
 
 COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	--localstatedir=/var --with-perl-bindings=no \
@@ -29,6 +30,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \
 	$(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \
 	$(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \
+	$(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \
 	$(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \
 	$(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \
 	$(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \
@@ -73,6 +75,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
 	$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
+	$(if $(BR2_PACKAGE_COLLECTD_STATSD),--enable-statsd,--disable-statsd) \
 	$(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \
 	$(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \
 	$(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \

From c82ca4fec6a26356d5424feecf65a077c297d171 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 1 Sep 2013 21:15:24 +0200
Subject: [PATCH 5963/6849] collectd: Config.in: fix space/tab mixup

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/collectd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 43571e3596..495711562e 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -429,5 +429,5 @@ endmenu
 endif
 
 comment "collectd needs a toolchain with IPv6 and thread support"
-        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
 	depends on BR2_USE_MMU

From b3a6918bef9917881a5fdc83e919954c18447059 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 19:00:27 -0300
Subject: [PATCH 5964/6849] samba: bump to version 3.6.18

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 71fba08aeb..cb80174b09 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA_VERSION = 3.6.17
+SAMBA_VERSION = 3.6.18
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 6f6c05b80d1cbe797da3b2e9b3b310ba15197335 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 19:00:47 -0300
Subject: [PATCH 5965/6849] gettext: bump to version 0.18.3.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 65ab9e82d0..baf42efabe 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GETTEXT_VERSION = 0.18.3
+GETTEXT_VERSION = 0.18.3.1
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+

From 7573464a9857c9480f7ee358ab6766f7349571ab Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 1 Sep 2013 15:54:51 +0200
Subject: [PATCH 5966/6849] neon: disable webdav when no XML support is
 available

Since 9169810a9bd97c99d8b7a0e8aadabdcca3883e99 ("neon: replace
'choice' for XML library with two options") the option
BR2_PACKAGE_NEON_NOXML no longer exists. However, it was not taken
into account properly within neon.mk, as this option was still used to
disable webdav support when no XML library has been selected.

Fixes:

  http://autobuild.buildroot.org/results/7ed/7ed657570d83b28389dd8c01ffdd895d2e8d145f/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neon/neon.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 1915e6c2ee..2edc6b280c 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -42,7 +42,7 @@ else
 NEON_CONF_OPT += --with-libxml2=no
 endif
 
-ifeq ($(BR2_PACKAGE_NEON_NOXML),y)
+ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),)
 # webdav needs xml support
 NEON_CONF_OPT += --disable-webdav
 endif

From 0279c7a1eb7038eb09aefcc146e224e415b03333 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 1 Sep 2013 16:01:43 +0200
Subject: [PATCH 5967/6849] orbit: fix ORBIT_LICENSE_FILES

Fixes:

  http://autobuild.buildroot.org/results/33e/33e4e65301679e46cd80a1a123f45647376e60ce/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/orbit/orbit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/orbit/orbit.mk b/package/orbit/orbit.mk
index af5f0af94d..ba1142fe35 100644
--- a/package/orbit/orbit.mk
+++ b/package/orbit/orbit.mk
@@ -7,7 +7,7 @@
 ORBIT_VERSION = 2.2.0
 ORBIT_SITE = http://github.com/downloads/keplerproject/orbit
 ORBIT_LICENSE = MIT
-ORBIT_LICENSE_FILES = COPYRIGHT
+ORBIT_LICENSE_FILES = doc/us/license.md
 
 define ORBIT_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) \

From a9806cfa304d1ed200b6d0750001b80446813a2c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:57:17 -0300
Subject: [PATCH 5968/6849] libnetfilter_conntrack: bump to version 1.0.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libnetfilter_conntrack/libnetfilter-conntrack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index 41b064002f..1db30a1489 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNETFILTER_CONNTRACK_VERSION = 1.0.3
+LIBNETFILTER_CONNTRACK_VERSION = 1.0.4
 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES

From 75cada461f1569eca6321ef56afe3c2b1f7db8e5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:57:18 -0300
Subject: [PATCH 5969/6849] conntrack-tools: bump to version 1.4.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/conntrack-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index 614bbd1e14..eb7654e44c 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONNTRACK_TOOLS_VERSION = 1.4.1
+CONNTRACK_TOOLS_VERSION = 1.4.2
 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \

From dbe6ad1dd162c1f694ed0fab696f0fd00a782a62 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:57:19 -0300
Subject: [PATCH 5970/6849] iproute2: bump to version 3.10.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2-optional-ipv6.patch | 57 +++++++++----------
 package/iproute2/iproute2.mk                  |  4 +-
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/package/iproute2/iproute2-optional-ipv6.patch b/package/iproute2/iproute2-optional-ipv6.patch
index ef22c22129..c51f6955b2 100644
--- a/package/iproute2/iproute2-optional-ipv6.patch
+++ b/package/iproute2/iproute2-optional-ipv6.patch
@@ -3,21 +3,17 @@
 Disable IPv6 support code when building with uClibc configured without IPv6
 support.
 
+[Gustavo: update for iproute2 3.10.0]
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- ip/ip6tunnel.c |    6 ++++++
- ip/ipprefix.c  |    8 ++++++++
- ip/iptunnel.c  |    6 ++++++
- 3 files changed, 20 insertions(+)
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-Index: iproute2-2.6.37-orig/ip/ip6tunnel.c
-===================================================================
---- iproute2-2.6.37-orig.orig/ip/ip6tunnel.c
-+++ iproute2-2.6.37-orig/ip/ip6tunnel.c
+diff -Nura iproute2-3.10.0.orig/ip/ip6tunnel.c iproute2-3.10.0/ip/ip6tunnel.c
+--- iproute2-3.10.0.orig/ip/ip6tunnel.c	2013-08-14 09:17:56.538089916 -0300
++++ iproute2-3.10.0/ip/ip6tunnel.c	2013-08-14 09:18:02.952298534 -0300
 @@ -20,6 +20,10 @@
   *	Masahide NAKAMURA @USAGI
   */
- 
+
 +#include <features.h>
 +#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
 +#else
@@ -25,36 +21,36 @@ Index: iproute2-2.6.37-orig/ip/ip6tunnel.c
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
-@@ -410,3 +414,5 @@ int do_ip6tunnel(int argc, char **argv)
+@@ -425,3 +429,5 @@
  	fprintf(stderr, "Command \"%s\" is unknown, try \"ip -f inet6 tunnel help\".\n", *argv);
  	exit(-1);
  }
 +
 +#endif /* no ipv6 */
-Index: iproute2-2.6.37-orig/ip/ipprefix.c
-===================================================================
---- iproute2-2.6.37-orig.orig/ip/ipprefix.c
-+++ iproute2-2.6.37-orig/ip/ipprefix.c
-@@ -22,11 +22,17 @@
-  * Authors:
+diff -Nura iproute2-3.10.0.orig/ip/ipprefix.c iproute2-3.10.0/ip/ipprefix.c
+--- iproute2-3.10.0.orig/ip/ipprefix.c	2013-08-14 09:17:56.539089949 -0300
++++ iproute2-3.10.0/ip/ipprefix.c	2013-08-14 09:19:29.065099291 -0300
+@@ -23,11 +23,18 @@
   *	Masahide NAKAMURA @USAGI
   */
+
 +#include <features.h>
 +#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
 +#define NO_IPV6
 +#endif
- 
++
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+ #include <sys/socket.h>
 +#ifndef NO_IPV6
  #include <netinet/icmp6.h>
 +#endif
+
  #include "utils.h"
- 
- /* prefix flags; see kernel's net/ipv6/addrconf.c and include/net/if_inet6.h */
-@@ -62,10 +68,12 @@ int print_prefix(const struct sockaddr_n
- 		fprintf(stderr, "wrong family %d\n", prefix->prefix_family);
+ #include "ip_common.h"
+@@ -65,10 +72,12 @@
+ 		fprintf(stderr, "incorrect protocol family: %d\n", prefix->prefix_family);
  		return 0;
  	}
 +#ifdef ND_OPT_PREFIX_INFORMATION
@@ -63,13 +59,12 @@ Index: iproute2-2.6.37-orig/ip/ipprefix.c
  		return 0;
  	}
 +#endif
- 
+
  	parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
- 
-Index: iproute2-2.6.37-orig/ip/iptunnel.c
-===================================================================
---- iproute2-2.6.37-orig.orig/ip/iptunnel.c
-+++ iproute2-2.6.37-orig/ip/iptunnel.c
+
+diff -Nura iproute2-3.10.0.orig/ip/iptunnel.c iproute2-3.10.0/ip/iptunnel.c
+--- iproute2-3.10.0.orig/ip/iptunnel.c	2013-08-14 09:17:56.538089916 -0300
++++ iproute2-3.10.0/ip/iptunnel.c	2013-08-14 09:18:02.953298566 -0300
 @@ -9,6 +9,10 @@
   * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
   *
@@ -78,10 +73,10 @@ Index: iproute2-2.6.37-orig/ip/iptunnel.c
 +#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
 +#define NO_IPV6
 +#endif
- 
+
  #include <stdio.h>
  #include <stdlib.h>
-@@ -601,8 +605,10 @@ int do_iptunnel(int argc, char **argv)
+@@ -634,8 +638,10 @@
  	 * protocol-independent because of unarranged structure between
  	 * IPv4 and IPv6.
  	 */
@@ -90,5 +85,5 @@ Index: iproute2-2.6.37-orig/ip/iptunnel.c
  		return do_ip6tunnel(argc, argv);
 +#endif
  	default:
- 		fprintf(stderr, "Unsupported family:%d\n", preferred_family);
+ 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
  		exit(-1);
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index cbbbc56998..a3eff3b97c 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,12 +4,11 @@
 #
 ################################################################################
 
-IPROUTE2_VERSION = 3.7.0
+IPROUTE2_VERSION = 3.10.0
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 IPROUTE2_LICENSE = GPLv2
 IPROUTE2_LICENSE_FILES = COPYING
-
 IPROUTE2_DEPENDENCIES += host-bison host-flex
 
 # If both iproute2 and busybox are selected, make certain we win
@@ -38,6 +37,7 @@ define IPROUTE2_CONFIGURE_CMDS
 	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
 	# arpd needs berkeleydb
 	$(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
+	$(SED) 's/-Werror//' $(IPROUTE2_DIR)/Makefile
 	echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config
 	$(IPROUTE2_WITH_IPTABLES)
 endef

From 24606a241660c4128fddceca88a17374d7f935c8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:57:20 -0300
Subject: [PATCH 5971/6849] iptables: bump to version 1.4.20

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../iptables-01-fix-static-link.patch         | 67 +++++++++++++++++++
 package/iptables/iptables.mk                  |  8 ++-
 2 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 package/iptables/iptables-01-fix-static-link.patch

diff --git a/package/iptables/iptables-01-fix-static-link.patch b/package/iptables/iptables-01-fix-static-link.patch
new file mode 100644
index 0000000000..d4bcfa6078
--- /dev/null
+++ b/package/iptables/iptables-01-fix-static-link.patch
@@ -0,0 +1,67 @@
+From 76e230e41947576efb96e86e605bb84015cdb287 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 13 Aug 2013 19:02:06 +0000
+Subject: iptables: link against libnetfilter_conntrack
+
+Linking currently fails in --enable-static case:
+
+../extensions/libext.a(libxt_connlabel.o): In function `connlabel_get_name':
+iptables/extensions/libxt_connlabel.c:57: undefined reference to `nfct_labelmap_get_name'
+[..]
+It's libxtables.la(libxt_connlabel.o) using libnetfilter_conntrack.
+
+If libnetfilter_conntrack is not found, @libnetfilter_conntrack_CFLAGS@
+and @libnetfilter_conntrack_LIBS@ (and their ${} ones) should be empty,
+therefore producing no harm to include unconditionally.
+
+Reported-and-tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+---
+diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
+index 14e7c57..780e715 100644
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -21,7 +21,7 @@ regular_CPPFLAGS   = @regular_CPPFLAGS@
+ kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
+ 
+ AM_CFLAGS       = ${regular_CFLAGS}
+-AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
++AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} @libnetfilter_conntrack_CFLAGS@
+ AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
+ AM_LDFLAGS      = @noundef_LDFLAGS@
+ 
+@@ -93,7 +93,7 @@ lib%.so: lib%.oo
+ 	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
+ 
+ lib%.oo: ${srcdir}/lib%.c
+-	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<;
++	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
+ 
+ libxt_NOTRACK.so: libxt_CT.so
+ 	ln -fs $< $@
+@@ -103,9 +103,7 @@ libxt_state.so: libxt_conntrack.so
+ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+ xt_RATEEST_LIBADD   = -lm
+ xt_statistic_LIBADD = -lm
+-@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@
+-
+-@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@
++xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@
+ 
+ #
+ #	Static bits
+diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am
+index c5795fe..4267cb5 100644
+--- a/libxtables/Makefile.am
++++ b/libxtables/Makefile.am
+@@ -10,7 +10,7 @@ libxtables_la_LIBADD  =
+ if ENABLE_STATIC
+ # With --enable-static, shipped extensions are linked into the main executable,
+ # so we need all the LIBADDs here too
+-libxtables_la_LIBADD += -lm
++libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS}
+ endif
+ if ENABLE_SHARED
+ libxtables_la_CFLAGS  = ${AM_CFLAGS}
+--
+cgit v0.9.2
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index f548cb9f4b..13ad0ca855 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,15 +4,17 @@
 #
 ################################################################################
 
-IPTABLES_VERSION = 1.4.19.1
+IPTABLES_VERSION = 1.4.20
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES
-IPTABLES_DEPENDENCIES = host-pkgconf
+IPTABLES_DEPENDENCIES = host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
 IPTABLES_LICENSE = GPLv2
 IPTABLES_LICENSE_FILES = COPYING
-
 IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr
+# Because of iptables-01-fix-static-link.patch
+IPTABLES_AUTORECONF = YES
 
 define IPTABLES_TARGET_SYMLINK_CREATE
 	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables

From bb7650c9be3300f93880d4ae4f78e4fe46c051e8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 30 Aug 2013 18:57:21 -0300
Subject: [PATCH 5972/6849] iw: bump to version 3.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iw/iw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index c8d9561615..566308cbe5 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IW_VERSION = 3.10
+IW_VERSION = 3.11
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw
 IW_LICENSE = iw license

From fa2174d3a388be2e0b01574ebdc9fa88347aec7f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 1 Sep 2013 16:54:37 -0300
Subject: [PATCH 5973/6849] libfuse: bump to version 2.9.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libfuse/libfuse.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 84ca9221e0..92203ef075 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFUSE_VERSION = 2.9.2
+LIBFUSE_VERSION = 2.9.3
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 LIBFUSE_LICENSE = GPLv2 LGPLv2.1

From bae078ba062b0e387e547e5ac8314426554ca376 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 1 Sep 2013 16:55:01 -0300
Subject: [PATCH 5974/6849] libmicrohttpd: bump to version 0.9.29

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmicrohttpd/libmicrohttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index e29e9563f5..31ef7fea97 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBMICROHTTPD_VERSION = 0.9.27
+LIBMICROHTTPD_VERSION = 0.9.29
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES

From ec80b7010f7b1ceb15189e529d94e1d9be52a049 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 1 Sep 2013 16:55:20 -0300
Subject: [PATCH 5975/6849] gnutls: bump to version 3.2.4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 86cc833eec..5a05f65185 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUTLS_VERSION = 3.2.3
+GNUTLS_VERSION = 3.2.4
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+

From 37dfcbabb9d64a453f8d248f6a2e9708728484da Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 2 Sep 2013 07:19:44 -0300
Subject: [PATCH 5976/6849] libmicrohttpd: disable spdy support

It requires OpenSSL and IPv6 support and it should probably be an
option since SSL support uses GnuTLS thus making a huge target
footprint with 2 SSL/TLS libraries for full support.
But most of all it's considered experimental.
Fixes:
http://autobuild.buildroot.net/results/836/836c39c11cecbcf9399675ba3ab01202417b9642/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libmicrohttpd-01-openssl-conditional.patch | 20 +++++++++++++++++++
 package/libmicrohttpd/libmicrohttpd.mk        |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch

diff --git a/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch b/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
new file mode 100644
index 0000000000..37d5e1e9d7
--- /dev/null
+++ b/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
@@ -0,0 +1,20 @@
+Subject: [PATCH] Fix configure failure for --disable-spdy
+
+The @HAVE_OPENSSL@ conditional is used in src/Makefile.in so when SPDY
+support is forcibly disabled the AM_CONDITIONAL is never executed, causing
+configure to bail out.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libmicrohttpd-0.9.29.orig/configure.ac libmicrohttpd-0.9.29/configure.ac
+--- libmicrohttpd-0.9.29.orig/configure.ac	2013-09-02 06:17:44.660620584 -0300
++++ libmicrohttpd-0.9.29/configure.ac	2013-09-02 06:36:44.598189751 -0300
+@@ -341,6 +341,8 @@
+                    enable_spdy="yes"], 
+                    [AM_CONDITIONAL(HAVE_OPENSSL, false)
+                    enable_spdy="no"])
++else
++ AM_CONDITIONAL(HAVE_OPENSSL, false)
+ fi
+ 
+ if test "$enable_spdy" = "yes"
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index 31ef7fea97..d0501ee536 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -8,6 +8,8 @@ LIBMICROHTTPD_VERSION = 0.9.29
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES
+LIBMICROHTTPD_CONF_OPT = --disable-spdy
+LIBMICROHTTPD_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
 LIBMICROHTTPD_LICENSE = LGPLv2.1+

From c6f2f8ed5c3ca58d43555ab1d38adbe794e95790 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Mon, 2 Sep 2013 10:40:49 +0200
Subject: [PATCH 5977/6849] atk: bump to version 2.9.4

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index ecfec5484b..433e1e3b78 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 ATK_VERSION_MAJOR = 2.9
-ATK_VERSION = $(ATK_VERSION_MAJOR).3
+ATK_VERSION = $(ATK_VERSION_MAJOR).4
 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
 ATK_LICENSE = LGPLv2+

From 4ee8047024d7edf4500eda57327d793c3f55bdd6 Mon Sep 17 00:00:00 2001
From: Martin Creutziger <buildroot@martin.creutziger.net>
Date: Mon, 2 Sep 2013 17:18:48 +0200
Subject: [PATCH 5978/6849] ti-gfx.mk: correct typo

There is a simple typo in package/ti-gfx/ti-gfx.mk, which the
following patch corrects.

Signed-off-by: Martin Creutziger <buildroot@martin.creutziger.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ti-gfx/ti-gfx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk
index 44a3c1d8f5..a94f00dc1f 100644
--- a/package/ti-gfx/ti-gfx.mk
+++ b/package/ti-gfx/ti-gfx.mk
@@ -29,7 +29,7 @@ TI_GFX_OMAPES = 5.x
 TI_GFX_PLATFORM = omap3630
 endif
 ifeq ($(BR2_PACKAGE_TI_GFX_ES6),y)
-TI_GFX_OMPAES = 6.x
+TI_GFX_OMAPES = 6.x
 TI_GFX_PLATFORM = ti81xx
 endif
 ifeq ($(BR2_PACKAGE_TI_GFX_ES8),y)

From 830205c0361c751c39fabeb1366100e2a94a27a4 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Date: Thu, 29 Aug 2013 19:10:40 -0300
Subject: [PATCH 5979/6849] nios2: Add new architecture

This commit adds very basic support to build for the Nios II
architecture. Toolchain support is still missing and instead
we need to use an external custom toolchain.

Notice that this architecture had been previously removed in
Buildroot 2010.05-rc1 release (as explained in the CHANGES file)
and this commit adds it back.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in       | 11 +++++++++++
 arch/Config.in.nios2 |  5 +++++
 toolchain/Config.in  |  5 +++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 arch/Config.in.nios2

diff --git a/arch/Config.in b/arch/Config.in
index 0b5b2187bc..14899ca068 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -124,6 +124,13 @@ config BR2_mips64el
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
+config BR2_nios2
+	bool "Nios II"
+	help
+	  Nios II is a soft core processor from Altera Corporation.
+	  http://www.altera.com/
+	  http://en.wikipedia.org/wiki/Nios_II
+
 config BR2_powerpc
 	bool "PowerPC"
 	help
@@ -305,6 +312,10 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
 source "arch/Config.in.mips"
 endif
 
+if BR2_nios2
+source "arch/Config.in.nios2"
+endif
+
 if BR2_powerpc
 source "arch/Config.in.powerpc"
 endif
diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2
new file mode 100644
index 0000000000..ed638981aa
--- /dev/null
+++ b/arch/Config.in.nios2
@@ -0,0 +1,5 @@
+config BR2_ARCH
+	default "nios2"
+
+config BR2_ENDIAN
+	default "LITTLE"
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 53d25736c2..9d1e68f8fc 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -25,7 +25,7 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
-	depends on !BR2_microblaze && !BR2_aarch64
+	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_nios2
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL
@@ -38,7 +38,8 @@ config BR2_TOOLCHAIN_EXTERNAL
 config BR2_TOOLCHAIN_CTNG
 	bool "Crosstool-NG toolchain"
 	depends on BR2_DEPRECATED
-	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa && !BR2_arc
+	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa && \
+		   !BR2_arc && !BR2_nios2
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	help
 	  Say 'y' if you want to generate the toolchain with crosstool-NG

From d1de1c0d1f207a695f4998f6873b7131ece25a65 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Date: Thu, 29 Aug 2013 19:10:41 -0300
Subject: [PATCH 5980/6849] toolchain-external: Add Sourcery CodeBench for
 Nios-II

This commit adds the pre-built Sourcery CodeBench toolchains
currently available for the Nios-II architecture.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 14 ++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ad1f203139..24f1f27159 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -402,6 +402,19 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64"
 	depends on BR2_MIPS_NABI32
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
+	bool "Sourcery CodeBench Nios-II 2013.05"
+	depends on BR2_nios2
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_INSTALL_LIBSTDCPP
+	select BR2_HOSTARCH_NEEDS_IA32_LIBS
+	help
+	  Sourcery CodeBench toolchain for the Nios-II architecture,
+	  from Mentor Graphics. It uses gcc 4.7.3, binutils 2.23.52,
+	  glibc 2.17, gdb 7.4.50 and kernel headers 3.7.0.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc
@@ -818,6 +831,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
+	default "nios2-linux-gnu"        if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 38f6e22906..e92afbd401 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -247,6 +247,9 @@ TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = mips-2013.05-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305),y)
+TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/nios2-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE = sourceryg++-2013.05-43-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 9093cc451c702c3b16fb704f524398abda85c2d2 Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Thu, 29 Aug 2013 17:41:08 -0500
Subject: [PATCH 5981/6849] libcurl: up revision to 7.32.0

Updating revision of libcurl to version 7.32.0

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libcurl/libcurl-01-CVE-2013-0249.patch    | 65 -------------------
 .../libcurl/libcurl-02-CVE-2013-1944.patch    | 57 ----------------
 .../libcurl/libcurl-03-CVE-2013-2174.patch    | 38 -----------
 package/libcurl/libcurl.mk                    |  4 +-
 4 files changed, 2 insertions(+), 162 deletions(-)
 delete mode 100644 package/libcurl/libcurl-01-CVE-2013-0249.patch
 delete mode 100644 package/libcurl/libcurl-02-CVE-2013-1944.patch
 delete mode 100644 package/libcurl/libcurl-03-CVE-2013-2174.patch

diff --git a/package/libcurl/libcurl-01-CVE-2013-0249.patch b/package/libcurl/libcurl-01-CVE-2013-0249.patch
deleted file mode 100644
index 7d2af2ac82..0000000000
--- a/package/libcurl/libcurl-01-CVE-2013-0249.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ee45a34907ffeb5fd95b0513040d8491d565b663 Mon Sep 17 00:00:00 2001
-From: Eldar Zaitov <kyprizel@volema.com>
-Date: Wed, 30 Jan 2013 23:22:27 +0100
-Subject: [PATCH] Curl_sasl_create_digest_md5_message: fix buffer overflow
-
-When negotiating SASL DIGEST-MD5 authentication, the function
-Curl_sasl_create_digest_md5_message() uses the data provided from the
-server without doing the proper length checks and that data is then
-appended to a local fixed-size buffer on the stack.
-
-This vulnerability can be exploited by someone who is in control of a
-server that a libcurl based program is accessing with POP3, SMTP or
-IMAP. For applications that accept user provided URLs, it is also
-thinkable that a malicious user would feed an application with a URL to
-a server hosting code targetting this flaw.
-
-Bug: http://curl.haxx.se/docs/adv_20130206.html
----
- lib/curl_sasl.c |   23 ++++++-----------------
- 1 file changed, 6 insertions(+), 17 deletions(-)
-
-diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
-index 57116b6..d07387d 100644
---- a/lib/curl_sasl.c
-+++ b/lib/curl_sasl.c
-@@ -346,9 +346,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
-     snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]);
- 
-   /* Prepare the URL string */
--  strcpy(uri, service);
--  strcat(uri, "/");
--  strcat(uri, realm);
-+  snprintf(uri, sizeof(uri), "%s/%s", service, realm);
- 
-   /* Calculate H(A2) */
-   ctxt = Curl_MD5_init(Curl_DIGEST_MD5);
-@@ -392,20 +390,11 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
-   for(i = 0; i < MD5_DIGEST_LEN; i++)
-     snprintf(&resp_hash_hex[2 * i], 3, "%02x", digest[i]);
- 
--  strcpy(response, "username=\"");
--  strcat(response, userp);
--  strcat(response, "\",realm=\"");
--  strcat(response, realm);
--  strcat(response, "\",nonce=\"");
--  strcat(response, nonce);
--  strcat(response, "\",cnonce=\"");
--  strcat(response, cnonce);
--  strcat(response, "\",nc=");
--  strcat(response, nonceCount);
--  strcat(response, ",digest-uri=\"");
--  strcat(response, uri);
--  strcat(response, "\",response=");
--  strcat(response, resp_hash_hex);
-+  snprintf(response, sizeof(response),
-+           "username=\"%s\",realm=\"%s\",nonce=\"%s\","
-+           "cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s",
-+           userp, realm, nonce,
-+           cnonce, nonceCount, uri, resp_hash_hex);
- 
-   /* Base64 encode the reply */
-   return Curl_base64_encode(data, response, 0, outptr, outlen);
--- 
-1.7.10.4
-
diff --git a/package/libcurl/libcurl-02-CVE-2013-1944.patch b/package/libcurl/libcurl-02-CVE-2013-1944.patch
deleted file mode 100644
index 18d9c2d396..0000000000
--- a/package/libcurl/libcurl-02-CVE-2013-1944.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3604fde3d3c9b0d0e389e079aecf470d123ba180 Mon Sep 17 00:00:00 2001
-From: YAMADA Yasuharu <yasuharu.yamada@access-company.com>
-Date: Thu, 11 Apr 2013 00:17:15 +0200
-Subject: [PATCH] cookie: fix tailmatching to prevent cross-domain leakage
-
-Cookies set for 'example.com' could accidentaly also be sent by libcurl
-to the 'bexample.com' (ie with a prefix to the first domain name).
-
-This is a security vulnerabilty, CVE-2013-1944.
-
-Bug: http://curl.haxx.se/docs/adv_20130412.html
----
- lib/cookie.c |   24 +++++++++++++++++++-----
- 1 file changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/lib/cookie.c b/lib/cookie.c
-index 4b9ec0b..a67204e 100644
---- a/lib/cookie.c
-+++ b/lib/cookie.c
-@@ -118,15 +118,29 @@ static void freecookie(struct Cookie *co)
-   free(co);
- }
- 
--static bool tailmatch(const char *little, const char *bigone)
-+static bool tailmatch(const char *cooke_domain, const char *hostname)
- {
--  size_t littlelen = strlen(little);
--  size_t biglen = strlen(bigone);
-+  size_t cookie_domain_len = strlen(cooke_domain);
-+  size_t hostname_len = strlen(hostname);
- 
--  if(littlelen > biglen)
-+  if(hostname_len < cookie_domain_len)
-     return FALSE;
- 
--  return Curl_raw_equal(little, bigone+biglen-littlelen) ? TRUE : FALSE;
-+  if(!Curl_raw_equal(cooke_domain, hostname+hostname_len-cookie_domain_len))
-+    return FALSE;
-+
-+  /* A lead char of cookie_domain is not '.'.
-+     RFC6265 4.1.2.3. The Domain Attribute says:
-+       For example, if the value of the Domain attribute is
-+       "example.com", the user agent will include the cookie in the Cookie
-+       header when making HTTP requests to example.com, www.example.com, and
-+       www.corp.example.com.
-+   */
-+  if(hostname_len == cookie_domain_len)
-+    return TRUE;
-+  if('.' == *(hostname + hostname_len - cookie_domain_len - 1))
-+    return TRUE;
-+  return FALSE;
- }
- 
- /*
--- 
-1.7.10.4
-
diff --git a/package/libcurl/libcurl-03-CVE-2013-2174.patch b/package/libcurl/libcurl-03-CVE-2013-2174.patch
deleted file mode 100644
index 673431f172..0000000000
--- a/package/libcurl/libcurl-03-CVE-2013-2174.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6032f0ff672f09babf69d9d42bcde6eb9eeb5bea Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Sun, 19 May 2013 23:24:29 +0200
-Subject: [PATCH] Curl_urldecode: no peeking beyond end of input buffer
-
-Security problem: CVE-2013-2174
-
-If a program would give a string like "%" to curl_easy_unescape(), it
-would still consider the % as start of an encoded character. The
-function then not only read beyond the buffer but it would also deduct
-the *unsigned* counter variable for how many more bytes there's left to
-read in the buffer by two, making the counter wrap. Continuing this, the
-function would go on reading beyond the buffer and soon writing beyond
-the allocated target buffer...
-
-Bug: http://curl.haxx.se/docs/adv_20130622.html
-Reported-by: Timo Sirainen
----
- lib/escape.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/lib/escape.c b/lib/escape.c
-index 6a26cf8..aa7db2c 100644
---- a/lib/escape.c
-+++ b/lib/escape.c
-@@ -159,7 +159,8 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
- 
-   while(--alloc > 0) {
-     in = *string;
--    if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-+    if(('%' == in) && (alloc > 2) &&
-+       ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
-       /* this is two hexadecimal digits following a '%' */
-       char hexstr[3];
-       char *ptr;
--- 
-1.7.10.4
-
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 56f13ba821..d5012b66c6 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCURL_VERSION = 7.28.1
+LIBCURL_VERSION = 7.32.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_LICENSE = ICS
@@ -27,7 +27,7 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
+LIBCURL_CONF_OPT += --with-ssl \
 	--with-random=/dev/urandom \
 	--with-ca-path=/etc/ssl/certs
 else

From f8a9126dedacbbd528ecd57329935ef8ea021af0 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 2 Sep 2013 10:18:49 +0200
Subject: [PATCH 5982/6849] perl: bump to version 5.18.1

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpanminus/cpanminus.mk | 4 ++--
 package/perl/perl.mk           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index 52921b55b9..b3153882f7 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -11,9 +11,9 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA
 
 CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
 CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
-CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl5
+CPANMINUS_PERL_LIB      = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)
 CPANMINUS_PERL_SITELIB  = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
-CPANMINUS_PERL_ARCHLIB  = $(CPANMINUS_PERL_LIB)/$(PERL_VERSION)/$(CPANMINUS_ARCHNAME)
+CPANMINUS_PERL_ARCHLIB  = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
 CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
 CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
 ifneq ($(BR2_PACKAGE_CPANMINUS_MIRROR),"")
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 37a38f70a2..25314f041e 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -4,16 +4,16 @@
 #
 ################################################################################
 
-PERL_VERSION_MAJOR = 16
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3
+PERL_VERSION_MAJOR = 18
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_LICENSE = Artistic
 PERL_LICENSE_FILES = Artistic
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 0.7.4
-PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).3
+PERL_CROSS_VERSION = 0.8
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
 PERL_CROSS_SITE    = http://download.berlios.de/perlcross
 PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod

From 3a6d38af1d47083f96b6886ee6b6ed2fb4f91d97 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 2 Sep 2013 10:18:50 +0200
Subject: [PATCH 5983/6849] qemu: bump to version 1.6.0

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index f177fd5ae6..a89bf7d20c 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QEMU_VERSION = 1.3.1
+QEMU_VERSION = 1.6.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c

From ba8f82b0cc25413aa1df93b5f2ba7ddb6bb07b03 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 30 Aug 2013 06:08:59 +0200
Subject: [PATCH 5984/6849] legacy: marked BR2_PACKAGE_GCC_TARGET and
 BR2_HAVE_DEVFILES as removed

These 2 symbols were removed when the gcc has been converted to the
Buildroot package infrastructures.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 763f16cb53..30a44c6a5f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -96,6 +96,23 @@ config BR2_VFP_FLOAT
 	  been replaced with a choice of options that allows to select
 	  between various VFP versions/capabilities.
 
+config BR2_PACKAGE_GCC_TARGET
+	bool "gcc on the target filesystem has been removed"
+	select BR2_LEGACY
+	help
+	  The support for gcc in the target filesystem was deprecated
+	  since a while, and has been removed completely from Buildroot.
+	  See Buildroot's documentation for more explanations.
+
+config BR2_HAVE_DEVFILES
+	bool "development files in target filesystem has been removed"
+	select BR2_LEGACY
+	help
+	  The installation of the development files in the target
+	  filesystem was deprecated since a while, and has been removed
+	  completely from Buildroot.
+	  See Buildroot's documentation for more explanations.
+
 ###############################################################################
 comment "Legacy options removed in 2013.05"
 

From 9b5528cd4add27aaf9400e47dc25e34e18a92588 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Thu, 29 Aug 2013 15:13:15 +0200
Subject: [PATCH 5985/6849] mysql_client : bump version to 5.1.70

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mysql_client/mysql_client.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 00c72b7a4f..fe24ae78ce 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MYSQL_CLIENT_VERSION = 5.1.67
+MYSQL_CLIENT_VERSION = 5.1.70
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-5.1
 MYSQL_CLIENT_INSTALL_STAGING = YES

From 58f6d0a285a085ce0299bf27ef50b6c51a6e3d1e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 28 Aug 2013 17:13:08 +0200
Subject: [PATCH 5986/6849] kmod: bump to version 15

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index c5826cff0a..aa197ddb21 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KMOD_VERSION = 14
+KMOD_VERSION = 15
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES

From 6492fb02423c091c1c2227a13dfa7e6ee4ba3e1e Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 28 Aug 2013 11:23:37 +0100
Subject: [PATCH 5987/6849] libsecret: New package

libsecret is a library for storing and retrieving passwords
and other secrets. It communicates with the "Secret Service"
using DBus. gnome-keyring and ksecretservice are both
implementations of a Secret Service.

libsecret replaces libgnome-keyring.

https://wiki.gnome.org/Libsecret

[Peter: also needs host-intltool]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/libsecret/Config.in    | 15 +++++++++++++++
 package/libsecret/libsecret.mk | 24 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 package/libsecret/Config.in
 create mode 100644 package/libsecret/libsecret.mk

diff --git a/package/Config.in b/package/Config.in
index 6306947379..9b8bc701d1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -431,6 +431,7 @@ source "package/libassuan/Config.in"
 source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
+source "package/libsecret/Config.in"
 source "package/libsha1/Config.in"
 source "package/nettle/Config.in"
 source "package/openssl/Config.in"
diff --git a/package/libsecret/Config.in b/package/libsecret/Config.in
new file mode 100644
index 0000000000..a15f995f40
--- /dev/null
+++ b/package/libsecret/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBSECRET
+	bool "libsecret"
+	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # gettext dep in libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	help
+	  libsecret is a library for storing and retrieving passwords and other
+	  secrets. It communicates with the "Secret Service" using DBus.
+	  gnome-keyring and ksecretservice are both implementations of a Secret
+	  Service.
+
+	  https://wiki.gnome.org/Libsecret
+
+comment "libsecret requires a toolchain with WCHAR and threading support."
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
new file mode 100644
index 0000000000..e445ea6f00
--- /dev/null
+++ b/package/libsecret/libsecret.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# libsecret
+#
+################################################################################
+
+LIBSECRET_VERSION = 0.15
+LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION)
+LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz
+LIBSECRET_LICENSE = LGPLv2.1+
+LIBSECRET_LICENSE_FILES = COPYING
+LIBSECRET_INSTALL_STAGING = YES
+
+LIBSECRET_DEPENDENCIES = libglib2 host-intltool
+LIBSECRET_CONF_OPT = --disable-manpages --disable-strict --disable-coverage --enable-vala=no
+
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+	LIBSECRET_DEPENDENCIES += libgcrypt
+	LIBSECRET_CONF_OPT += --enable-gcrypt
+else
+	LIBSECRET_CONF_OPT += --disable-gcrypt
+endif
+
+$(eval $(autotools-package))

From 7b5bd3a6ddd04cf32dce82485116f87c614a5ce4 Mon Sep 17 00:00:00 2001
From: nmenegale <nicolas.menegale@openwide.fr>
Date: Wed, 28 Aug 2013 11:48:59 +0200
Subject: [PATCH 5988/6849] libffi: minor corrections in post install hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to be sure that we just deal with the includes related with
the actual package described into libffi.mk it is better to explicitly
specify the version of the libffi we deal with into the post install
hook.
As dev files are deprecated in target rootfs target post install
hook was also deleted.

Signed-off-by: Nicolas Ménégale <nicolas.menegale@openwide.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libffi/libffi.mk | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 0ad5c84ec0..8c84924a25 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -14,7 +14,7 @@ LIBFFI_AUTORECONF = YES
 # Move the headers to the usual location, and adjust the .pc file
 # accordingly.
 define LIBFFI_MOVE_STAGING_HEADERS
-	mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/
+	mv $(STAGING_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(STAGING_DIR)/usr/include/
 	$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
 		$(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
@@ -22,15 +22,6 @@ endef
 
 LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
 
-# Similar for target headers
-define LIBFFI_MOVE_TARGET_HEADERS
-	install -d $(TARGET_DIR)/usr/include/
-	mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/
-	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
-endef
-
-LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
-
 HOST_LIBFFI_AUTORECONF = YES
 
 $(eval $(autotools-package))

From 528d15721b5e47f7aa8bdff588996c6a747e328a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Aug 2013 19:28:31 +0200
Subject: [PATCH 5989/6849] kmod: indent properly the KMOD_INSTALL_TOOLS macro

The KMOD_INSTALL_TOOLS macro uses a non-conventional indentation. This
commit fixes this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index aa197ddb21..06d8dc5470 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -47,8 +47,9 @@ KMOD_DEPENDENCIES += \
 	$(if $(BR2_PACKAGE_MODULE_INIT_TOOLS),module-init-tools)
 
 define KMOD_INSTALL_TOOLS
-	for i in depmod insmod lsmod modinfo modprobe rmmod; \
-	do ln -sf ../usr/bin/kmod $(TARGET_DIR)/sbin/$$i; done
+	for i in depmod insmod lsmod modinfo modprobe rmmod; do \
+		ln -sf ../usr/bin/kmod $(TARGET_DIR)/sbin/$$i; \
+	done
 endef
 
 KMOD_POST_INSTALL_TARGET_HOOKS += KMOD_INSTALL_TOOLS

From 00deac473c8ecba6d611b9ffbfaa55645036be46 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Aug 2013 19:28:32 +0200
Subject: [PATCH 5990/6849] kmod: allow to build a host variant

Since module-init-tools is deprecated, we now want to use kmod instead
for the installation of modules during the kernel build process. In
order to do this, we need to be able to build a host variant of kmod,
which is want this patch allows to do.

Note that only the depmod tool is installed on the host, since that's
the only one likely to be used on the host in a cross-compilation
context.

[Peter: needs AUTORECONF for the host as well. Fix comment while we're at it]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 06d8dc5470..649415fe21 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -10,8 +10,9 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
 
-# Some patches are touching configure.in
+# Some patches are touching configure.ac
 KMOD_AUTORECONF = YES
+HOST_KMOD_AUTORECONF = YES
 
 # license info for libkmod only, conditionally add more below
 KMOD_LICENSE = LGPLv2.1+
@@ -57,4 +58,14 @@ else
 KMOD_CONF_OPT += --disable-tools
 endif
 
+# We only install depmod, since that's the only tool used for the
+# host.
+define HOST_KMOD_INSTALL_TOOLS
+	mkdir -p $(HOST_DIR)/sbin/
+	ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/depmod
+endef
+
+HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

From b4837455d5c2ea9c164cd613394ffb4d3c741d6b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Aug 2013 19:28:33 +0200
Subject: [PATCH 5991/6849] linux: use kmod instead of module-init-tools

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 578d535c3c..025fd51aba 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -35,7 +35,7 @@ endif
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 
 LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES  += host-module-init-tools host-lzop
+LINUX_DEPENDENCIES  += host-kmod host-lzop
 
 ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
 	LINUX_DEPENDENCIES += host-uboot-tools

From 94c72087f386cbb11bbb9011849508628503f316 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 27 Aug 2013 19:28:34 +0200
Subject: [PATCH 5992/6849] module-init-tools: remove package

This commit removes the module-init-tools package and adds the
relevant Config.in.legacy entries to ease the migration for users.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in.legacy                              | 11 +++++
 package/Config.in                             |  3 --
 package/module-init-tools/Config.in           |  9 ----
 ...ools-3.15-add-manpages-config-option.patch | 47 -------------------
 .../module-init-tools/module-init-tools.mk    | 28 -----------
 5 files changed, 11 insertions(+), 87 deletions(-)
 delete mode 100644 package/module-init-tools/Config.in
 delete mode 100644 package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
 delete mode 100644 package/module-init-tools/module-init-tools.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 30a44c6a5f..4f30b2b1cb 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -44,6 +44,17 @@ comment "that still have those options set, will fail to     "
 comment "build, or run, in unpredictable ways.               "
 endif
 
+###############################################################################
+comment "Legacy options removed in 2013.11"
+
+config BR2_PACKAGE_MODULE_INIT_TOOLS
+	bool "module-init-tools replaced by kmod"
+	select BR2_PACKAGE_KMOD
+	select BR2_PACKAGE_KMOD_TOOLS
+	help
+	  The 'module-init-tools' package has been removed, since it
+	  has been depracated upstream and replaced by 'kmod'.
+
 ###############################################################################
 comment "Legacy options removed in 2013.08"
 
diff --git a/package/Config.in b/package/Config.in
index 9b8bc701d1..a94cb62efd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -907,9 +907,6 @@ source "package/htop/Config.in"
 source "package/keyutils/Config.in"
 source "package/kmod/Config.in"
 source "package/lxc/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/module-init-tools/Config.in"
-endif
 source "package/monit/Config.in"
 source "package/ncdu/Config.in"
 source "package/numactl/Config.in"
diff --git a/package/module-init-tools/Config.in b/package/module-init-tools/Config.in
deleted file mode 100644
index 77e3bce519..0000000000
--- a/package/module-init-tools/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_MODULE_INIT_TOOLS
-	bool "module-init-tools"
-	help
-	  The module-init-tools package contains a set of programs for
-	  loading, inserting, and removing kernel modules for Linux
-	  (versions 2.5.48 and above). It serves the same function that
-	  the "modutils" package serves for Linux 2.4.
-
-	  http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/
diff --git a/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
deleted file mode 100644
index 28f51de112..0000000000
--- a/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Disable manual pages generation when docbook2man is not available.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.am  |    7 ++++++-
- configure.ac |    7 +++----
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: module-init-tools-3.11/Makefile.am
-===================================================================
---- module-init-tools-3.11.orig/Makefile.am
-+++ module-init-tools-3.11/Makefile.am
-@@ -39,7 +39,12 @@
- MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
- MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
- SGML = $(addprefix doc/,  $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
--dist_man_MANS = $(MAN5) $(MAN8)
-+
-+if HAVE_DOCBOOKTOMAN
-+MANPAGES  = $(MAN5) $(MAN8)
-+endif
-+dist_man_MANS = $(MANPAGES)
-+
- # If they haven't overridden mandir, fix it (never /man!)
- mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
- 
-Index: module-init-tools-3.11/configure.ac
-===================================================================
---- module-init-tools-3.11.orig/configure.ac
-+++ module-init-tools-3.11/configure.ac
-@@ -29,13 +29,12 @@
- AC_PROG_CC
- AC_PROG_RANLIB
- 
--AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
--if test x"$DOCBOOKTOMAN" = xno
-+AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man)
-+if test x"$DOCBOOKTOMAN" = x
- then
- 	AC_MSG_WARN([docbook2man not found])
--	# fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile
--	DOCBOOKTOMAN=docbook2man
- fi
-+AM_CONDITIONAL([HAVE_DOCBOOKTOMAN], [test "x$DOCBOOKTOMAN" != "x"])
-  
- # Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
- # between a broken cc and a working cc but missing libz.a.
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
deleted file mode 100644
index 88abec4d9f..0000000000
--- a/package/module-init-tools/module-init-tools.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-#
-# module-init-tools
-#
-################################################################################
-
-MODULE_INIT_TOOLS_VERSION = 3.15
-MODULE_INIT_TOOLS_SOURCE = module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
-MODULE_INIT_TOOLS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
-MODULE_INIT_TOOLS_LICENSE = GPLv2+
-MODULE_INIT_TOOLS_LICENSE_FILES = COPYING
-
-MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
-MODULE_INIT_TOOLS_CONF_OPT = \
-	--disable-static-utils \
-	--disable-builddir \
-	--program-transform-name=''
-
-# module-init-tools-3.15-add-manpages-config-option.patch is modifying
-# configure.ac and Makefile.am
-MODULE_INIT_TOOLS_AUTORECONF = YES
-HOST_MODULE_INIT_TOOLS_AUTORECONF = YES
-HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
-HOST_MODULE_INIT_TOOLS_CONF_OPT = --disable-static-utils
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
-

From 4ce8af8632894db3e4ed25d9d3230359a2cc640c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 2 Sep 2013 23:01:01 +0200
Subject: [PATCH 5993/6849] Remove references to module-init-tools

Now that it is replaced by kmod.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/faq-troubleshooting.txt | 15 ---------------
 package/kmod/kmod.mk                |  6 ++----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt
index f91a8ef504..4e0612b8d7 100644
--- a/docs/manual/faq-troubleshooting.txt
+++ b/docs/manual/faq-troubleshooting.txt
@@ -27,21 +27,6 @@ configuration+, and modify +Port to run a getty (login prompt) on+ and
 +/etc/inittab+ file of the generated system so that a shell starts on
 the correct serial port.
 
-[[faq-module-init-tool-build-failure]]
-module-init-tools fails to build with 'cannot find -lc'
--------------------------------------------------------
-
-If the build of +module-init-tools+ for the host fails with:
-
-------------------------
-/usr/bin/ld: cannot find -lc
-------------------------
-
-then probably you are running a Fedora (or similar) distribution, and
-you should install the +glibc-static+ package. This is because the
-+module-init-tools+ build process wants to link statically against the
-C library.
-
 [[faq-no-compiler-on-target]]
 Why is there no compiler on the target?
 ---------------------------------------
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 649415fe21..9ac773103f 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -42,10 +42,8 @@ ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
 KMOD_LICENSE += GPLv2+
 KMOD_LICENSE_FILES += COPYING
 
-# take precedence over busybox / module-init-tools implementations
-KMOD_DEPENDENCIES += \
-	$(if $(BR2_PACKAGE_BUSYBOX),busybox) \
-	$(if $(BR2_PACKAGE_MODULE_INIT_TOOLS),module-init-tools)
+# take precedence over busybox implementation
+KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 
 define KMOD_INSTALL_TOOLS
 	for i in depmod insmod lsmod modinfo modprobe rmmod; do \

From 52e7073a58409ac09b79865a3ae4332cf01edb58 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Aug 2013 13:03:03 +0200
Subject: [PATCH 5994/6849] Makefile: do not try to strip inexisting file when
 stripping libpthread

libpthread.so has a special stripping condition to preserve parts of
it that are needed for debugging. However, due to the usage of 'xargs'
instead of 'xargs -r', the strip command is executed regardless of
whether a libpthread.so file is found or not. This leads to a big
error message being displayed in static-only builds, because strip is
executed without a file argument. Thanks to the '|| true', the build
continues, but still shows a big error message in the middle, which is
not nice.

By using 'xargs -r', we avoid the strip command from being executed
when 'find' doesn't find any match. We also remove the '|| true' to
catch other real errors.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3b5d921dd9..09faebaae0 100644
--- a/Makefile
+++ b/Makefile
@@ -494,7 +494,7 @@ endif
 # I set a breakpoint"
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 	find $(TARGET_DIR)/lib -type f -name 'libpthread*.so*' | \
-		xargs $(STRIPCMD) $(STRIP_STRIP_DEBUG) || true
+		xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG)
 endif
 
 	mkdir -p $(TARGET_DIR)/etc

From b7c0041c31754a5679eb0a3e4bcf41f80d473ae2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Aug 2013 13:03:04 +0200
Subject: [PATCH 5995/6849] kmod: does not support static builds

Since kmod 14, the support for building a static library has been
removed completely from kmod. Therefore, we mark kmod as
!BR2_PREFER_STATIC_LIB, as well as all its reverse dependencies, which
includes the option to use the "udev" /dev management method.

[Peter: show comment for udev when BR2_PREFER_STATIC_LIB is enabled]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/Config.in | 1 +
 package/udev/Config.in | 1 +
 system/Config.in       | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/package/kmod/Config.in b/package/kmod/Config.in
index 49652375e6..bd44316caf 100644
--- a/package/kmod/Config.in
+++ b/package/kmod/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD
 	bool "kmod"
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  handle kernel modules
 
diff --git a/package/udev/Config.in b/package/udev/Config.in
index dd5ad7bd2c..d4d97c1781 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_UDEV
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
+	depends on !BR2_PREFER_STATIC_LIB # kmod
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_KMOD
diff --git a/system/Config.in b/system/Config.in
index d41f184758..401285bb52 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -84,11 +84,15 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	bool "Dynamic using udev"
 	depends on BR2_LARGEFILE # udev
 	depends on BR2_USE_WCHAR # udev
+	depends on !BR2_PREFER_STATIC_LIB # udev -> kmod
 	select BR2_PACKAGE_UDEV
 
 comment "udev requires a toolchain with LARGEFILE + WCHAR support"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
+comment "udev doesn't work with 'prefer static libraries'"
+	depends on BR2_PREFER_STATIC_LIB
+
 endchoice
 
 choice

From 09b74417e3de932cdb5a1ab97101434bed9cc989 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 3 Sep 2013 15:22:17 +0200
Subject: [PATCH 5996/6849] gcc: re-disable info documentation

The documentation of older GCC versions (E.G. 4.3.x) contain constructs
that are no longer accepted by recent (5.x) versions of makeinfo, breaking
the build.

The documentation isn't really needed, and takes up extra space/build time,
so work around it by disabling documentation, like we had before the
conversion of the toolchain to the package infrastructure.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index cd6efed60d..782217fdd5 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -97,6 +97,7 @@ HOST_GCC_COMMON_CONF_OPT = \
 	--disable-multilib \
 	--with-gmp=$(HOST_DIR)/usr \
 	--with-mpfr=$(HOST_DIR)/usr \
+	MAKEINFO=missing
 
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43810
 # Workaround until it's fixed in 4.5.4 or later

From b189f2d327abfb2aafa4bb8bcf5a7a605b7381f7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 07:59:08 -0300
Subject: [PATCH 5997/6849] libmicrohttpd: bump to version 0.9.30

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...libmicrohttpd-01-openssl-conditional.patch | 20 -------------------
 package/libmicrohttpd/libmicrohttpd.mk        |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch

diff --git a/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch b/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
deleted file mode 100644
index 37d5e1e9d7..0000000000
--- a/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: [PATCH] Fix configure failure for --disable-spdy
-
-The @HAVE_OPENSSL@ conditional is used in src/Makefile.in so when SPDY
-support is forcibly disabled the AM_CONDITIONAL is never executed, causing
-configure to bail out.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura libmicrohttpd-0.9.29.orig/configure.ac libmicrohttpd-0.9.29/configure.ac
---- libmicrohttpd-0.9.29.orig/configure.ac	2013-09-02 06:17:44.660620584 -0300
-+++ libmicrohttpd-0.9.29/configure.ac	2013-09-02 06:36:44.598189751 -0300
-@@ -341,6 +341,8 @@
-                    enable_spdy="yes"], 
-                    [AM_CONDITIONAL(HAVE_OPENSSL, false)
-                    enable_spdy="no"])
-+else
-+ AM_CONDITIONAL(HAVE_OPENSSL, false)
- fi
- 
- if test "$enable_spdy" = "yes"
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index d0501ee536..48dace761b 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,12 +4,11 @@
 #
 ################################################################################
 
-LIBMICROHTTPD_VERSION = 0.9.29
+LIBMICROHTTPD_VERSION = 0.9.30
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES
 LIBMICROHTTPD_CONF_OPT = --disable-spdy
-LIBMICROHTTPD_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
 LIBMICROHTTPD_LICENSE = LGPLv2.1+

From 102e6c72f7212c581cdd1bd81e04b85fc7c904b2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 08:14:23 -0300
Subject: [PATCH 5998/6849] mpd: bump to version 0.17.5

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/multimedia/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 4424b7e0a5..95e18f7d53 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MPD_VERSION = 0.17.4
+MPD_VERSION = 0.17.5
 MPD_SITE = http://www.musicpd.org/download/mpd/stable
 MPD_DEPENDENCIES = host-pkgconf libglib2
 MPD_LICENSE = GPLv2

From c19bf136bdfcf943f2443c45e4452fba060d19d8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 10:27:21 -0300
Subject: [PATCH 5999/6849] libsecret: specify where libgcrypt lives

When libgcrypt support is enabled the configure script will try to
find libgcrypt-config in the PATH. If the host distribution has it then
brokeness ensues. Fixes:
http://autobuild.buildroot.net/results/eca/eca10b8360354e7e51406f7ac942d343987bde5e/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsecret/libsecret.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
index e445ea6f00..a0f39f8b0a 100644
--- a/package/libsecret/libsecret.mk
+++ b/package/libsecret/libsecret.mk
@@ -16,7 +16,8 @@ LIBSECRET_CONF_OPT = --disable-manpages --disable-strict --disable-coverage --en
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 	LIBSECRET_DEPENDENCIES += libgcrypt
-	LIBSECRET_CONF_OPT += --enable-gcrypt
+	LIBSECRET_CONF_OPT += --enable-gcrypt \
+		--with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
 	LIBSECRET_CONF_OPT += --disable-gcrypt
 endif

From 3d2001f2871a85891e216fbc9ad894f5c671c1c1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 10:51:35 -0300
Subject: [PATCH 6000/6849] libcec: needs wchar

Fixes:
http://autobuild.buildroot.net/results/dae/dae6ec4f75b2aeb793b88567f48d94b07a6a59da/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcec/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/libcec/Config.in b/package/libcec/Config.in
index 7a67952144..256c6d69b9 100644
--- a/package/libcec/Config.in
+++ b/package/libcec/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBCEC
 	bool "libcec"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_WCHAR
 	help
 	  libcec allows you in combination with the right hardware to
 	  control your home theater devices with your TV remote
@@ -9,5 +10,6 @@ config BR2_PACKAGE_LIBCEC
 
 	  http://libcec.pulse-eight.com
 
-comment "libcec requires C++ and threading support in toolchain"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "libcec requires C++, WCHAR and threading support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_USE_WCHAR

From e2b3d5909d909970c85cbc339e17dbfe09cb3197 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 11:33:15 -0300
Subject: [PATCH 6001/6849] pcre: fix C++ static build problem

PCRE C++ unit tests fails to build properly for static scenarios since
it's not taken account for properly in the build system.
Just disable them, they're never installed to the target.
Fixes:
http://autobuild.buildroot.net/results/970/97027b981659502ff12c345c3caef4933cddb354/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...o-compat.patch => pcre-01-no-compat.patch} |  0
 package/pcre/pcre-02-no-cpp-tests.patch       | 31 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 rename package/pcre/{pcre-no-compat.patch => pcre-01-no-compat.patch} (100%)
 create mode 100644 package/pcre/pcre-02-no-cpp-tests.patch

diff --git a/package/pcre/pcre-no-compat.patch b/package/pcre/pcre-01-no-compat.patch
similarity index 100%
rename from package/pcre/pcre-no-compat.patch
rename to package/pcre/pcre-01-no-compat.patch
diff --git a/package/pcre/pcre-02-no-cpp-tests.patch b/package/pcre/pcre-02-no-cpp-tests.patch
new file mode 100644
index 0000000000..0255028fb6
--- /dev/null
+++ b/package/pcre/pcre-02-no-cpp-tests.patch
@@ -0,0 +1,31 @@
+Disable PCRE C++ unit tests, they fail to build on static scenarios
+and they're not installed.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura pcre-8.33.orig/Makefile.in pcre-8.33/Makefile.in
+--- pcre-8.33.orig/Makefile.in	2013-05-28 06:09:27.000000000 -0300
++++ pcre-8.33/Makefile.in	2013-09-03 11:28:28.398198832 -0300
+@@ -123,12 +123,6 @@
+ @WITH_PCRE8_TRUE@am__append_20 = libpcreposix.la
+ @WITH_GCOV_TRUE@@WITH_PCRE8_TRUE@am__append_21 = $(GCOV_CFLAGS)
+ @WITH_PCRE_CPP_TRUE@am__append_22 = libpcrecpp.la
+-@WITH_PCRE_CPP_TRUE@am__append_23 = pcrecpp_unittest \
+-@WITH_PCRE_CPP_TRUE@	pcre_scanner_unittest \
+-@WITH_PCRE_CPP_TRUE@	pcre_stringpiece_unittest
+-@WITH_PCRE_CPP_TRUE@am__append_24 = pcrecpp_unittest \
+-@WITH_PCRE_CPP_TRUE@	pcre_scanner_unittest \
+-@WITH_PCRE_CPP_TRUE@	pcre_stringpiece_unittest
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_25 = $(GCOV_CXXFLAGS)
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_26 = $(GCOV_LIBS)
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_27 = $(GCOV_LIBS)
+@@ -360,9 +354,6 @@
+ @WITH_PCRE8_TRUE@am__EXEEXT_1 = pcregrep$(EXEEXT)
+ @WITH_REBUILD_CHARTABLES_TRUE@am__EXEEXT_2 = dftables$(EXEEXT)
+ @WITH_JIT_TRUE@am__EXEEXT_3 = pcre_jit_test$(EXEEXT)
+-@WITH_PCRE_CPP_TRUE@am__EXEEXT_4 = pcrecpp_unittest$(EXEEXT) \
+-@WITH_PCRE_CPP_TRUE@	pcre_scanner_unittest$(EXEEXT) \
+-@WITH_PCRE_CPP_TRUE@	pcre_stringpiece_unittest$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am__dftables_SOURCES_DIST = dftables.c
+ @WITH_REBUILD_CHARTABLES_TRUE@am_dftables_OBJECTS =  \

From 2e20d072ae2ceef8d5b54022616c8f6bcd194e7f Mon Sep 17 00:00:00 2001
From: Peter Sanford <psanford@nearbuysystems.com>
Date: Tue, 3 Sep 2013 10:22:54 -0700
Subject: [PATCH 6002/6849] netplug: properly install init.d script.

Looks like this was lost in 20d4792e.

[Peter: use _INSTALL_INIT_SYSV, explicitly delete script on uninstall]
Signed-off-by: Peter Sanford <psanford@nearbuysystems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netplug/netplug.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index fbc7a2d982..fdb1937b3a 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -16,10 +16,15 @@ define NETPLUG_INSTALL_TARGET_CMDS
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
+define NETPLUG_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/netplug/S29netplug \
+		$(TARGET_DIR)/etc/init.d/S29netplug
+endef
+
 define NETPLUG_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/sbin/netplugd
 	rm -rf $(TARGET_DIR)/etc/netplug*
-	rm -f $(TARGET_DIR)/etc/init.d/S*netplug
+	rm -f $(TARGET_DIR)/etc/init.d/S29netplug
 endef
 
 define NETPLUG_CLEAN_CMDS

From 866ba22b8644a3c96c4382801ae89c5c3058ac85 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 15:41:54 -0300
Subject: [PATCH 6003/6849] linux-headers: add 3.11.x series

And deprecate 3.9.x series to match upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-headers/Config.in.host | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index ef76733352..f05111bfc9 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -5,7 +5,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_10
+	default BR2_KERNEL_HEADERS_3_11
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -52,10 +52,14 @@ choice
 
 	config BR2_KERNEL_HEADERS_3_9
 		bool "Linux 3.9.x kernel headers"
+		depends on BR2_DEPRECATED
 
 	config BR2_KERNEL_HEADERS_3_10
 		bool "Linux 3.10.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_11
+		bool "Linux 3.11.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Manually specified Linux version"
 
@@ -83,5 +87,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
 	default "3.10.10"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11"		if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From dfb0fe48793a3cfdf3877083fecbd9e1b56b69c6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 15:41:55 -0300
Subject: [PATCH 6004/6849] linux: switch to 3.11.x series

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 49c4b5cacb..7864f6518c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.10.10"
+	bool "3.11"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.10.10" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From fac638d2ff0877b44720e72b0ace522280822982 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Sep 2013 10:54:20 +0200
Subject: [PATCH 6005/6849] kmod: explicitly define host-kmod dependencies

So we don't end up pulling in host-busybox (which doesn't exist) if
KMOD_TOOLS is enabled.

Reported-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/kmod/kmod.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 9ac773103f..169fca3a5c 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -9,6 +9,7 @@ KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
 KMOD_INSTALL_STAGING = YES
 KMOD_DEPENDENCIES = host-pkgconf
+HOST_KMOD_DEPENDENCIES = host-pkgconf
 
 # Some patches are touching configure.ac
 KMOD_AUTORECONF = YES

From 33699aac06334fe5b8c36fae3897ce16e9acd475 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Sep 2013 11:36:31 +0200
Subject: [PATCH 6006/6849] setlocalversion: sync with Linux kernel version
 (2.6.34)

Brings a number of fixes, and most importantly no longer tries to figure
out if the tree contains uncommitted changes when using svn, as that can
be very slow.

This only syncs with setlocalversion as of 2.6.34 as later kernel versions
aren't directly compatible with our use cases since 09155120c (kbuild:
Clean up and speed up the localversion logic).

We still have one delta from the kernel version (setlocalversion: fix i18n
issue with svn), as that has only later been fixed in the kernel version.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/setlocalversion | 40 ++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion
index a6edd7194c..adeeb781e7 100755
--- a/support/scripts/setlocalversion
+++ b/support/scripts/setlocalversion
@@ -1,5 +1,13 @@
 #!/bin/sh
-# Print additional version information for non-release trees.
+#
+# This scripts adds local version information from the version
+# control systems git, mercurial (hg) and subversion (svn).
+#
+# If something goes wrong, send a mail the kernel build mailinglist
+# (see MAINTAINERS) and CC Nico Schottelius
+# <nico-linuxsetlocalversion -at- schottelius.org>.
+#
+#
 
 usage() {
 	echo "Usage: $0 [srctree]" >&2
@@ -10,10 +18,17 @@ cd "${1:-.}" || usage
 
 # Check for git and a git repo.
 if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
-	# Do we have an untagged version?
-	if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-		if tag=`git describe 2>/dev/null`; then
-			echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+
+	# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it,
+	# because this version is defined in the top level Makefile.
+	if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
+
+		# If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),
+		# we pretty print it.
+		if atag="`git describe 2>/dev/null`"; then
+			echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+
+		# If we don't have a tag at all we print -g{commitish}.
 		else
 			printf '%s%s' -g $head
 		fi
@@ -24,8 +39,10 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 	        printf -- '-svn%s' "`git svn find-rev $head`"
 	fi
 
-	# Are there uncommitted changes?
-	git update-index --refresh --unmerged > /dev/null
+	# Update index only on r/w media
+	[ -w . ] && git update-index --refresh --unmerged > /dev/null
+
+	# Check for uncommitted changes
 	if git diff-index --name-only HEAD | grep -v "^scripts/package" \
 	    | read dummy; then
 		printf '%s' -dirty
@@ -58,14 +75,7 @@ fi
 # Check for svn and a svn repo.
 if rev=`LC_ALL=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
 	rev=`echo $rev | awk '{print $NF}'`
-	changes=`LC_ALL=C svn status 2>/dev/null | grep '^[AMD]' | wc -l`
-
-	# Are there uncommitted changes?
-	if [ $changes != 0 ]; then
-		printf -- '-svn%s%s' "$rev" -dirty
-	else
-		printf -- '-svn%s' "$rev"
-	fi
+	printf -- '-svn%s' "$rev"
 
 	# All done with svn
 	exit

From 24058f10a70812de695f6bf8be3f66f0abcc179c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Sep 2013 12:36:09 +0200
Subject: [PATCH 6007/6849] kmod: disable manpages for host-kmod

The manpages are not installed to HOST_DIR anyway, and it errors out if
xsltproc isn't available on the host.
---
 package/kmod/kmod.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index 169fca3a5c..a1ad7d6b53 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -23,6 +23,9 @@ KMOD_LICENSE_FILES = libkmod/COPYING
 # https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8
 KMOD_CONF_OPT = --disable-static --enable-shared
 
+# manpages not installed to host and needs xsltproc
+HOST_KMOD_CONF_OPT = --disable-manpages
+
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 KMOD_CONF_OPT += --disable-manpages
 endif

From b6d92bf415df33ac86487d68f5f8299f406859d2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Sep 2013 13:31:19 +0200
Subject: [PATCH 6008/6849] libevas: async image preload support needs threads
 support in toolchain

Fixes http://autobuild.buildroot.net/results/92b/92b3990e3a51c9e400cff31a1f0d23aeb5085a54/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/efl/libevas/libevas.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 41ceb49cc9..46de4cb4f7 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -203,6 +203,11 @@ else
 LIBEVAS_CONF_OPT += --disable-font-loader-eet
 endif
 
+# async image preload support needs threads support in toolchain
+ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+LIBEVAS_CONF_OPT += --disable-async-preload
+endif
+
 # libevas installs the source code of examples on the target, which
 # are generally not useful.
 define LIBEVAS_REMOVE_EXAMPLES

From 5128cc6602d56a2c3af4cf6a0fe072d39d6c1aca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Sep 2013 16:18:14 +0200
Subject: [PATCH 6009/6849] gcc: pass MAKEINFO=missing in the environment
 rather than as a ./configure arg

Fixes a build issue with the avr32 toolchain:

http://jenkins.free-electrons.com/job/buildroot/config=atngw100_defconfig/104/

Invalid configuration `MAKEINFO=missing': machine `MAKEINFO=missing' not
recognized

Instead pass it in the environment of ./configure, similar to how it was
done originally in 62322acb2ce (toolchain/gcc: disable makeinfo).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-final/gcc-final.mk               | 3 +++
 package/gcc/gcc-initial/gcc-initial.mk           | 3 +++
 package/gcc/gcc-intermediate/gcc-intermediate.mk | 3 +++
 package/gcc/gcc.mk                               | 6 +++++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index b62dfe2df4..328ad7b0a6 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -55,6 +55,9 @@ endif
 HOST_GCC_FINAL_CONF_OPT += \
 	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
+HOST_GCC_FINAL_CONF_ENV = \
+	$(HOST_GCC_COMMON_CONF_ENV)
+
 # Make sure we have 'cc'
 define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
 	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index e468419452..0eb492fa4d 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -34,6 +34,9 @@ HOST_GCC_INITIAL_CONF_OPT = \
 	--disable-nls \
 	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
+HOST_GCC_INITIAL_CONF_ENV = \
+	$(HOST_GCC_COMMON_CONF_ENV)
+
 HOST_GCC_INITIAL_MAKE_OPT = all-gcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
 
diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
index a6660256d7..f47e4be1ba 100644
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -33,6 +33,9 @@ HOST_GCC_INTERMEDIATE_CONF_OPT = \
 	--disable-nls \
 	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
+HOST_GCC_INTERMEDIATE_CONF_ENV = \
+	$(HOST_GCC_COMMON_CONF_ENV)
+
 HOST_GCC_INTERMEDIATE_MAKE_OPT = all-gcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
 HOST_GCC_INTERMEDIATE_MAKE_OPT += all-target-libgcc
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 782217fdd5..ccba5e1586 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -96,7 +96,11 @@ HOST_GCC_COMMON_CONF_OPT = \
 	--disable-libssp \
 	--disable-multilib \
 	--with-gmp=$(HOST_DIR)/usr \
-	--with-mpfr=$(HOST_DIR)/usr \
+	--with-mpfr=$(HOST_DIR)/usr
+
+# Don't build documentation. It takes up extra space / build time,
+# and sometimes needs specific makeinfo versions to work
+HOST_GCC_COMMON_CONF_ENV = \
 	MAKEINFO=missing
 
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43810

From 9834bf533e51ac60300ea57842bcc82a327a942e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 07:37:56 -0300
Subject: [PATCH 6010/6849] libcurl: extend package support

Add support for gnutls, nss and polarssl backends.
Add support for libidn and zlib.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index d5012b66c6..71f19f19c3 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -7,6 +7,9 @@
 LIBCURL_VERSION = 7.32.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
+LIBCURL_DEPENDENCIES = host-pkgconf \
+	$(if $(BR2_PACKAGE_ZLIB),zlib) \
+	$(if $(BR2_PACKAGE_LIBIDN),libidn)
 LIBCURL_LICENSE = ICS
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
@@ -15,8 +18,8 @@ LIBCURL_INSTALL_STAGING = YES
 # on non-MMU platforms. Moreover, this authentication method is
 # probably almost never used. See
 # http://curl.haxx.se/docs/manpage.html#--ntlm.
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual \
-	--enable-hidden-symbols --disable-ntlm-wb
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual --disable-ntlm-wb \
+	--enable-hidden-symbols --with-random=/dev/urandom
 LIBCURL_CONFIG_SCRIPTS = curl-config
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
@@ -27,11 +30,21 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl \
-	--with-random=/dev/urandom \
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
 	--with-ca-path=/etc/ssl/certs
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+LIBCURL_CONF_OPT += --with-gnutls=$(STAGING_DIR)/usr
+LIBCURL_DEPENDENCIES += gnutls
+else ifeq ($(BR2_PACKAGE_POLARSSL),y)
+LIBCURL_CONF_OPT += --with-polarssl=$(STAGING_DIR)/usr
+LIBCURL_DEPENDENCIES += polarssl
+else ifeq ($(BR2_PACKAGE_LIBNSS),y)
+LIBCURL_CONF_OPT += --with-nss=$(STAGING_DIR)/usr
+LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`"
+LIBCURL_DEPENDENCIES += libnss
 else
-LIBCURL_CONF_OPT += --without-ssl
+LIBCURL_CONF_OPT += --without-ssl --without-gnutls \
+	--without-polarssl --without-nss
 endif
 
 define LIBCURL_FIX_DOT_PC

From 3f0b9a683f3b003c7184564c1118639bf6ae9a43 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 3 Sep 2013 12:55:25 +0200
Subject: [PATCH 6011/6849] cppcms: bump to version 1.0.4

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cppcms/cppcms.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index 8d4a519c1d..4068df70a1 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CPPCMS_VERSION = 1.0.3
+CPPCMS_VERSION = 1.0.4
 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
 CPPCMS_LICENSE = LGPLv3
 CPPCMS_LICENSE_FILES = COPYING.TXT

From acdff25a9666380da014f6f3e304530d02d8d81f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Sep 2013 09:44:51 +0200
Subject: [PATCH 6012/6849] calao_usb_a9g20_lpw_defconfig: lock to kernel
 3.10.x

The calao defconfig fails to build with 3.11, so lock the kernel version
to the last version known to build.

For details, see:
http://jenkins.free-electrons.com/job/buildroot/config=calao_usb_a9g20_lpw_defconfig/105

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_usb_a9g20_lpw_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/calao_usb_a9g20_lpw_defconfig b/configs/calao_usb_a9g20_lpw_defconfig
index 4a644da599..cf114d9cd8 100644
--- a/configs/calao_usb_a9g20_lpw_defconfig
+++ b/configs/calao_usb_a9g20_lpw_defconfig
@@ -10,6 +10,8 @@ BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20"
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9g20-lpw/linux-3.4.4.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 7504705667a6a267f257baf70a1a945af8c68d80 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Sep 2013 10:47:55 +0200
Subject: [PATCH 6013/6849] at91sam9261ek_defconfig: fix linux defconfig name

The 9261 defconfig got renamed to at91sam9261_9g10_defconfig in kernel
3.11.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9261ek_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index c53e732d33..0824a00fac 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -16,4 +16,4 @@ BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek_dataflash_cs0"
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261_9g10"

From b64b7e58e97e979d6fbbc63c642be285bd804eed Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Sep 2013 10:51:19 +0200
Subject: [PATCH 6014/6849] at91sam9260dfc_defconfig: fix linux defconfig name

The 9260 defconfig got renamed to at91sam9260_9g20_defconfig in kernel
3.11.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/at91sam9260dfc_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 085997a0b0..20389f3ffb 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -16,4 +16,4 @@ BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek_dataflash_cs0"
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260"
+BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260_9g20"

From 3889c9078eea96e6652c9f7fbac350c74f3e7e36 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Sep 2013 10:52:57 +0200
Subject: [PATCH 6015/6849] calao_usb_a9260_defconfig: lock to kernel 3.10.x

The calao defconfig fails to build with 3.11, so lock the kernel version
to the last version known to build.

For details, see:
http://jenkins.free-electrons.com/job/buildroot/config=calao_usb_a9260_defconfig/105

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_usb_a9260_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/calao_usb_a9260_defconfig b/configs/calao_usb_a9260_defconfig
index d84f718333..304dc50237 100644
--- a/configs/calao_usb_a9260_defconfig
+++ b/configs/calao_usb_a9260_defconfig
@@ -10,6 +10,8 @@ BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9260"
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9260/linux-3.7.4.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 104b90c2fb33e4162c2613dc0ffae9663833f7a2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 5 Sep 2013 10:54:14 +0200
Subject: [PATCH 6016/6849] calao_usb_a9263_defconfig: lock to kernel 3.10.x

The calao defconfig fails to build with 3.11, so lock the kernel version
to the last version known to build.

For details, see:
http://jenkins.free-electrons.com/job/buildroot/config=calao_usb_a9263_defconfig/105

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/calao_usb_a9263_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/calao_usb_a9263_defconfig b/configs/calao_usb_a9263_defconfig
index 422f35ec2a..8dc948a1d7 100644
--- a/configs/calao_usb_a9263_defconfig
+++ b/configs/calao_usb_a9263_defconfig
@@ -9,6 +9,8 @@ BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9263"
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9263/linux-3.4.4.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 6cbdfb649f8d016ead6be1d03ba5d1bf81c63e26 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Thu, 5 Sep 2013 09:12:15 +0200
Subject: [PATCH 6017/6849] trivial: remove odd references to 'buildroot2'

In the past there may have been a very good reason to refer to 'buildroot2', but
these days it's just odd.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                                                | 2 +-
 support/kconfig/{README.buildroot2 => README.buildroot} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename support/kconfig/{README.buildroot2 => README.buildroot} (86%)

diff --git a/Makefile b/Makefile
index 09faebaae0..0d7476a4c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Makefile for buildroot2
+# Makefile for buildroot
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2006-2013 by the Buildroot developers <buildroot@uclibc.org>
diff --git a/support/kconfig/README.buildroot2 b/support/kconfig/README.buildroot
similarity index 86%
rename from support/kconfig/README.buildroot2
rename to support/kconfig/README.buildroot
index 7de485cd72..d3d8613219 100644
--- a/support/kconfig/README.buildroot2
+++ b/support/kconfig/README.buildroot
@@ -4,7 +4,7 @@ to suit Buildroot.
 To update:
 	cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
 	cd support/config.new
-	cp -a ../kconfig/patches ../kconfig/README.buildroot2 .
+	cp -a ../kconfig/patches ../kconfig/README.buildroot .
 	quilt push -a
 	# Fix any conflict
 	cd ..

From 10e10bbf54825b444b95a1a6f45435e32c994180 Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Wed, 4 Sep 2013 18:15:31 -0500
Subject: [PATCH 6018/6849] linux-pam: bump to version 1.1.6

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...s-are-no-longer-defined-unless-you-e.patch | 28 -------------------
 package/linux-pam/linux-pam-configure.patch   |  9 +++---
 .../linux-pam/linux-pam-doc-makefile-am.patch | 10 +++----
 package/linux-pam/linux-pam.mk                |  6 ++--
 4 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch

diff --git a/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch b/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch
deleted file mode 100644
index a73ada6bf6..0000000000
--- a/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Date: Mon, 9 Jul 2012 09:43:11 +0200
-Subject: [PATCH] RLIMIT_* variables are no longer defined unless you
- explicitly include sys/resource.h.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
-
-modules/pam_unix/pam_unix_acct.c: Include sys/resource.h.
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-[This patch is in linux-pam 1.1.6]
----
- modules/pam_unix/pam_unix_acct.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c
-index 8e90cc9..4a362f8 100644
---- a/modules/pam_unix/pam_unix_acct.c
-+++ b/modules/pam_unix/pam_unix_acct.c
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #include <syslog.h>
- #include <pwd.h>
- #include <shadow.h>
--- 
-1.8.2.1
-
diff --git a/package/linux-pam/linux-pam-configure.patch b/package/linux-pam/linux-pam-configure.patch
index 0b2326b1d6..d39261f74e 100644
--- a/package/linux-pam/linux-pam-configure.patch
+++ b/package/linux-pam/linux-pam-configure.patch
@@ -5,11 +5,10 @@ where needed.
 
 Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
 
-Index: linux-pam-1.1.4/configure.in
-============================================================================
---- linux-pam-1.1.4/configure.in	2011-06-24 06:46:33.000000000 -0400
-+++ linux-pam-1.1.4/configure.in	2012-08-09 21:14:11.000000000 -0400
-@@ -522,7 +522,7 @@
+diff -urN a/configure.in b/configure.in
+--- a/configure.in	2012-08-17 03:48:24.000000000 -0500
++++ b/configure.in	2013-07-17 09:49:23.760254684 -0500
+@@ -526,7 +526,7 @@
  AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
  AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
  AC_CHECK_FUNCS(getgrouplist getline getdelim)
diff --git a/package/linux-pam/linux-pam-doc-makefile-am.patch b/package/linux-pam/linux-pam-doc-makefile-am.patch
index f08d34916b..8fa2dda2fc 100644
--- a/package/linux-pam/linux-pam-doc-makefile-am.patch
+++ b/package/linux-pam/linux-pam-doc-makefile-am.patch
@@ -4,10 +4,9 @@ Generation of documentation is not necessary in Buildroot, disable it completely
 
 Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com>
 
-Index: linux-pam-1.1.4/doc/Makefile.am
-============================================================================
---- linux-pam-1.1.4/doc/Makefile.am	2011-06-21 05:04:56.000000000 -0400
-+++ linux-pam-1.1.4/doc/Makefile.am	2012-08-09 05:59:23.000000000 -0400
+diff -urN a/doc/Makefile.am b/doc/Makefile.am
+--- a/doc/Makefile.am	2012-08-15 06:08:43.000000000 -0500
++++ b/doc/Makefile.am	2013-07-17 09:54:53.000000000 -0500
 @@ -2,8 +2,6 @@
  # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
  #
@@ -17,7 +16,7 @@ Index: linux-pam-1.1.4/doc/Makefile.am
  CLEANFILES = *~
  
  dist_html_DATA = index.html
-@@ -11,12 +9,4 @@
+@@ -11,11 +9,4 @@
  #######################################################
  
  releasedocs: all
@@ -29,5 +28,4 @@ Index: linux-pam-1.1.4/doc/Makefile.am
 -	make -C sag releasedocs
 -	make -C adg releasedocs
 -	make -C mwg releasedocs
--	
 +	/bin/true
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index aa9fa36434..4472cd4311 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -4,7 +4,7 @@
 # 
 ################################################################################
 
-LINUX_PAM_VERSION = 1.1.4
+LINUX_PAM_VERSION = 1.1.6
 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
 LINUX_PAM_SITE = http://linux-pam.org/library/
 LINUX_PAM_INSTALL_STAGING = YES
@@ -16,13 +16,13 @@ LINUX_PAM_CONF_OPT = \
 	--disable-regenerate-docu \
 	--enable-securedir=/lib/security \
 	--libdir=/lib
-LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
-	flex host-flex
+LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf
 LINUX_PAM_AUTORECONF = YES
 LINUX_PAM_LICENSE = BSD-3c
 LINUX_PAM_LICENSE_FILES = Copyright
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+	LINUX_PAM_DEPENDENCIES += gettext
 	LINUX_PAM_MAKE_OPT += LIBS=-lintl
 endif
 

From b9260ebf765367498c6f03f4b84cdb25fe0419d8 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 4 Sep 2013 23:35:53 +0200
Subject: [PATCH 6019/6849] package/rpi-firmware: bump version

Fixes and improvements for USB, audio sync, camera support,
codecs, HDMI framerate and audio, and GPU freezes.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 6ea621f825..55c1ca4f61 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 320084a
+RPI_FIRMWARE_VERSION = d4f5315
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From a10d2c5c40f361eef777a1a7fa0fd88b67efa825 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 4 Sep 2013 23:35:54 +0200
Subject: [PATCH 6020/6849] configs: bump kernel use for RPi, use simpler
 defconfig

Bump for a slew of USB-related and other fixes.

The bcmrpi defconfig is a huge beast with lots of superfluous drivers.
The brcmrpi_quick defconfig is a stripped down minimalist defconfig with
all that is needed to bring up a RPi with complete HW support, and
nothing superfluous, which is what we need for a board's defconfig in
buildroot.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/rpi_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 9d608f1466..2b196736ef 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.6.11"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="0006326"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="1587f77"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
-BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi_quick"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 2b5650cf7ffb6800d56d620aca7377500cc26b37 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 4 Sep 2013 23:35:55 +0200
Subject: [PATCH 6021/6849] targets: move target options to their own sub-menu

Currently, all target options lie in the top-level menu.
This looks a bit clumsy, since all other options are neatly
folded into their own sematic sub-menus each.

Move the target option into their own sub-menu too.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/Config.in b/arch/Config.in
index 14899ca068..3fd8c1c790 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -1,3 +1,5 @@
+menu "Target options"
+
 config BR2_ARCH_IS_64
 	bool
 
@@ -335,3 +337,5 @@ endif
 if BR2_xtensa
 source "arch/Config.in.xtensa"
 endif
+
+endmenu # Target options

From 66c0d5d05c1a81a5b4b3d4d780af4229c9c79662 Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Thu, 5 Sep 2013 08:32:26 -0500
Subject: [PATCH 6022/6849] util-linux: bump version to 2.23

Removed patches that were are now in version 2.23 of util-linux along with
fixed up other patches so they apply cleanly.

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux-001-sscanf-no-ms-as.patch      | 186 ++++++++++--------
 .../util-linux-002-add-missing-rpmatch.patch  |  51 -----
 ...ux-003-program-invocation-short-name.patch |  29 ++-
 .../util-linux-004-xtensa-support.patch       |  16 --
 package/util-linux/util-linux.mk              |   2 +-
 5 files changed, 117 insertions(+), 167 deletions(-)
 delete mode 100644 package/util-linux/util-linux-002-add-missing-rpmatch.patch
 delete mode 100644 package/util-linux/util-linux-004-xtensa-support.patch

diff --git a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
index 6ba7bab511..5d08b9b6a0 100644
--- a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
+++ b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
@@ -1,13 +1,12 @@
 Fix libmount build under uClibc
 
 See https://bugs.gentoo.org/show_bug.cgi?id=406303
-Patch from http://repository.timesys.com/buildsources/u/util-linux/util-linux-2.21.2/util-linux-2.21.2-sscanf-no-ms-as.patch ported to util-linux-2.22.2
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.21.1-no-printf-alloc.patch?revision=1.2
+ported to util-linux-2.23.2
 
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura util-linux-2.22.2/configure.ac util-linux-2.22.2-sscanf-no-ms-as/configure.ac
---- util-linux-2.22.2/configure.ac	2012-12-13 08:16:02.973822890 -0300
-+++ util-linux-2.22.2-sscanf-no-ms-as/configure.ac	2013-03-07 14:50:39.975512873 -0300
+diff -Nura a/configure.ac b/configure.ac
+--- a/configure.ac	2012-12-13 08:16:02.973822890 -0300
++++ b/configure.ac	2013-03-07 14:50:39.975512873 -0300
 @@ -733,7 +733,6 @@
  UL_BUILD_INIT([libmount])
  UL_REQUIRES_LINUX([libmount])
@@ -16,99 +15,124 @@ diff -Nura util-linux-2.22.2/configure.ac util-linux-2.22.2-sscanf-no-ms-as/conf
  AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes)
  AM_CONDITIONAL(BUILD_LIBMOUNT_TESTS, test "x$build_libmount" = xyes -a "x$enable_static" = xyes)
 
-diff -Nura util-linux-2.22.2/libmount/src/tab_parse.c util-linux-2.22.2-sscanf-no-ms-as/libmount/src/tab_parse.c
---- util-linux-2.22.2/libmount/src/tab_parse.c	2012-12-12 17:04:47.906355128 -0300
-+++ util-linux-2.22.2-sscanf-no-ms-as/libmount/src/tab_parse.c	2013-03-07 15:08:29.589503961 -0300
-@@ -58,19 +58,21 @@
-  */
- static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
+diff -Nura a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
+--- a/libmount/src/tab_parse.c	2013-07-30 03:39:26.218738358 -0500
++++ b/libmount/src/tab_parse.c	2013-09-04 11:22:26.332917445 -0500
+@@ -22,6 +22,10 @@
+ #include "pathnames.h"
+ #include "strutils.h"
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
++# define UL_SCNsA "%s"
++#endif
++
+ static inline char *skip_spaces(char *s)
  {
--	int rc, n = 0, xrc;
--	char *src = NULL, *fstype = NULL, *optstr = NULL;
--
--	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
--			UL_SCNsA" "	/* (2) target */
--			UL_SCNsA" "	/* (3) FS type */
--			UL_SCNsA" "	/* (4) options */
-+	int rc, n = 0, len = strlen (s) + 1, xrc;
-+	char *src     = malloc (sizeof *src * len);
-+	char *fstype  = malloc (sizeof *fstype * len);
-+	char *optstr  = malloc (sizeof *optstr * len);
+ 	assert(s);
+@@ -61,16 +65,31 @@
+ 	int rc, n = 0, xrc;
+ 	char *src = NULL, *fstype = NULL, *optstr = NULL;
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
++	size_t len = strlen(s) + 1;
++	src = malloc(len);
++	fstype = malloc(len);
++	fs->target = malloc(len);
++	optstr = malloc(len);
++#endif
 +
-+	rc = sscanf(s,	"%s"" "	/* (1) source */
-+			"%s"" "	/* (2) target */
-+			"%s"" "	/* (3) FS type */
-+			"%s"" "	/* (4) options */
+ 	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
+ 			UL_SCNsA" "	/* (2) target */
+ 			UL_SCNsA" "	/* (3) FS type */
+ 			UL_SCNsA" "	/* (4) options */
  			"%n",		/* byte count */
  
--			&src,
--			&fs->target,
--			&fstype,
--			&optstr,
++#ifdef HAVE_SCANF_MS_MODIFIER
+ 			&src,
+ 			&fs->target,
+ 			&fstype,
+ 			&optstr,
++#else
 +			src,
 +			fs->target,
 +			fstype,
 +			optstr,
++#endif
  			&n);
-	xrc = rc;
+ 	xrc = rc;
  
-@@ -132,16 +134,20 @@
-  */
- static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
- {
--	int rc, end = 0;
-+	int rc, end = 0, len = strlen (s) + 1;
+@@ -136,6 +155,16 @@
  	unsigned int maj, min;
-	char *fstype = NULL, *src = NULL, *p;
+ 	char *fstype = NULL, *src = NULL, *p;
  
-+	fs->root        = malloc (sizeof *fs->root * len);
-+	fs->target      = malloc (sizeof *fs->target * len);
-+	fs->vfs_optstr  = malloc (sizeof *fs->vfs_optstr * len);
++#ifndef HAVE_SCANF_MS_MODIFIER
++	size_t len = strlen(s) + 1;
++	fs->root = malloc(len);
++	fs->target = malloc(len);
++	fs->vfs_optstr = malloc(len);
++	fs->fs_optstr = malloc(len);
++	fstype = malloc(len);
++	src = malloc(len);
++#endif
 +
  	rc = sscanf(s,	"%u "		/* (1) id */
  			"%u "		/* (2) parent */
  			"%u:%u "	/* (3) maj:min */
--			UL_SCNsA" "	/* (4) mountroot */
--			UL_SCNsA" "	/* (5) target */
--			UL_SCNsA	/* (6) vfs options (fs-independent) */
-+			"%s"" "	/* (4) mountroot */
-+			"%s"" "	/* (5) target */
-+			"%s"	/* (6) vfs options (fs-independent) */
- 			"%n",		/* number of read bytes */
- 
+@@ -147,9 +176,15 @@
  			&fs->id,
-@@ -163,9 +169,14 @@
- 	}
- 	s = p + 3;
+ 			&fs->parent,
+ 			&maj, &min,
++#ifdef HAVE_SCANF_MS_MODIFIER
+ 			&fs->root,
+ 			&fs->target,
+ 			&fs->vfs_optstr,
++#else
++			fs->root,
++			fs->target,
++			fs->vfs_optstr,
++#endif
+ 			&end);
  
--	rc += sscanf(s,	UL_SCNsA" "	/* (8) FS type */
--			UL_SCNsA" "	/* (9) source */
--			UL_SCNsA,	/* (10) fs options (fs specific) */
-+	len           = strlen (s) + 1;
-+	fstype        = malloc (sizeof *fstype * len);
-+	src           = malloc (sizeof *src * len);
-+	fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len);
-+
-+	rc += sscanf(s,	"%s"" "	/* (8) FS type */
-+			"%s"" "	/* (9) source */
-+			"%s",	/* (10) fs options (fs specific) */
+ 	if (rc >= 7 && end > 0)
+@@ -169,9 +204,15 @@
+ 			UL_SCNsA" "	/* (9) source */
+ 			UL_SCNsA,	/* (10) fs options (fs specific) */
  
++#ifdef HAVE_SCANF_MS_MODIFIER
  			&fstype,
  			&src,
-@@ -274,11 +285,12 @@
- static int mnt_parse_swaps_line(struct libmnt_fs *fs, char *s)
- {
-	uintmax_t fsz, usz;
--	int rc;
--	char *src = NULL;
-+	int rc, len = strlen (s) + 1;
-+	char *src = malloc (sizeof *src * len);
-+	fs->swaptype = malloc (sizeof *fs->swaptype * len);
-
--	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
--			UL_SCNsA" "	/* (2) type */
-+	rc = sscanf(s,	"%s"		/* (1) source */
-+			"%s"		/* (2) type */
-			"%jd"		/* (3) size */
-			"%jd"		/* (4) used */
-			"%d",		/* priority */
+ 			&fs->fs_optstr);
++#else
++			fstype,
++			src,
++			fs->fs_optstr);
++#endif
+ 
+ 	if (rc >= 10) {
+ 		fs->flags |= MNT_FS_KERNEL;
+@@ -279,14 +320,25 @@
+ 	int rc;
+ 	char *src = NULL;
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
++	size_t len = strlen(s) + 1;
++	src = malloc(len);
++	fs->swaptype = malloc(len);
++#endif
++
+ 	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
+ 			UL_SCNsA" "	/* (2) type */
+ 			"%jd"		/* (3) size */
+ 			"%jd"		/* (4) used */
+ 			"%d",		/* priority */
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
+ 			&src,
+ 			&fs->swaptype,
++#else
++			src,
++			fs->swaptype,
++#endif
+ 			&fsz,
+ 			&usz,
+ 			&fs->priority);
diff --git a/package/util-linux/util-linux-002-add-missing-rpmatch.patch b/package/util-linux/util-linux-002-add-missing-rpmatch.patch
deleted file mode 100644
index d311e3f5dc..0000000000
--- a/package/util-linux/util-linux-002-add-missing-rpmatch.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 51924a4ef0dd8f4906729cb6760d1929049c1983 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 20 Feb 2013 13:04:02 +0100
-Subject: [PATCH] add missing rpmatch.h everywhere it needs to be
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- disk-utils/fsck.minix.c | 1 +
- login-utils/vipw.c      | 1 +
- term-utils/mesg.c       | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
-index 1426950..3482200 100644
---- a/disk-utils/fsck.minix.c
-+++ b/disk-utils/fsck.minix.c
-@@ -111,6 +111,7 @@
- #include "ismounted.h"
- #include "all-io.h"
- #include "closestream.h"
-+#include "rpmatch.h"
-
- #define ROOT_INO 1
- #define YESNO_LENGTH 64
-diff --git a/login-utils/vipw.c b/login-utils/vipw.c
-index 20c05c2..8c47801 100644
---- a/login-utils/vipw.c
-+++ b/login-utils/vipw.c
-@@ -78,6 +78,7 @@
- #include "setpwnam.h"
- #include "strutils.h"
- #include "xalloc.h"
-+#include "rpmatch.h"
-
- #ifdef HAVE_LIBSELINUX
- # include <selinux/selinux.h>
-diff --git a/term-utils/mesg.c b/term-utils/mesg.c
-index 6ac5a2e..430236f 100644
---- a/term-utils/mesg.c
-+++ b/term-utils/mesg.c
-@@ -58,6 +58,7 @@
- #include "closestream.h"
- #include "nls.h"
- #include "c.h"
-+#include "rpmatch.h"
-
- /* exit codes */
-
---
-1.8.1.5
diff --git a/package/util-linux/util-linux-003-program-invocation-short-name.patch b/package/util-linux/util-linux-003-program-invocation-short-name.patch
index 2d2fa5de0f..5d04e35538 100644
--- a/package/util-linux/util-linux-003-program-invocation-short-name.patch
+++ b/package/util-linux/util-linux-003-program-invocation-short-name.patch
@@ -1,18 +1,11 @@
-uClibc build fix: program_invocation_short_name is defined in errno.h
-and not argp.h
-Update to util-linux-2.22.2 from a previous patch by Khem.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura util-linux-2.22.2.orig/configure.ac util-linux-2.22.2/configure.ac
---- util-linux-2.22.2.orig/configure.ac	2013-03-07 15:16:18.912418476 -0300
-+++ util-linux-2.22.2/configure.ac	2013-03-07 15:16:25.909640745 -0300
-@@ -372,7 +372,7 @@
-
-
- AC_MSG_CHECKING(whether program_invocation_short_name is defined)
--AC_TRY_COMPILE([#include <argp.h>],
-+AC_TRY_COMPILE([#include <errno.h>],
-	       [program_invocation_short_name = "test";],
-	       AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
-			 [Define if program_invocation_short_name is defined])
+--- a/configure.ac	2013-07-30 03:39:26.188738061 -0500
++++ b/configure.ac	2013-08-27 16:20:09.882953093 -0500
+@@ -386,7 +386,7 @@
+ 
+ AC_MSG_CHECKING([whether program_invocation_short_name is defined])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+-	#include <argp.h>
++	#include <errno.h>
+ ]], [[
+ 	program_invocation_short_name = "test";
+ ]])], [
diff --git a/package/util-linux/util-linux-004-xtensa-support.patch b/package/util-linux/util-linux-004-xtensa-support.patch
deleted file mode 100644
index abec5d9e30..0000000000
--- a/package/util-linux/util-linux-004-xtensa-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Forward-port of xtensa support patch to util-linux-2.22.2 by ??
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura util-linux-2.22.2/fdisks/fdiskbsdlabel.h util-linux-2.22.2.xtensa/fdisks/fdiskbsdlabel.h
---- util-linux-2.22.2/fdisks/fdiskbsdlabel.h	2012-12-12 17:04:47.898355058 -0300
-+++ util-linux-2.22.2.xtensa/fdisks/fdiskbsdlabel.h	2013-03-07 18:17:32.292723061 -0300
-@@ -48,7 +48,7 @@
-
- #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
-     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
--    defined (__aarch64__) || \
-+    defined (__aarch64__) || defined (__xtensa__) || \
-     defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
- #define BSD_LABELSECTOR   1
- #define BSD_LABELOFFSET   0
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index c6c8467eef..6f79e74587 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
-UTIL_LINUX_VERSION_MAJOR = 2.22
+UTIL_LINUX_VERSION_MAJOR = 2.23
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 

From 055f1c02d35068d0b089f3b29ffdd4fb2717bb5c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 6 Sep 2013 15:28:51 +0200
Subject: [PATCH 6023/6849] uclibc: add upstream 0.9.33 fixes

Upstream has a large number of patches lined up for the next 0.9.33.x bugfix
release;

http://git.uclibc.org/uClibc/log/?h=0.9.33

Add them here, as atleast some of them are quite critical (E.G. the eventfd
issue gets triggered by recent glib versions).

I've skipped the microblaze and xtensa fixes as we don't currently support
those with 0.9.33.2.

Drop uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CMSG_CLOEXE.patch
as that is a subset of uclibc-0035-socket.h-pull-socket_type.h-from-eglibc.patch

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...f-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch |   39 -
 ...d-Implement-eventfd2-and-fix-eventfd.patch |   64 +
 ...clibc-0014-pread-pwrite-backport-fix.patch |  219 +++
 .../uclibc-0015-add-posix_madvise.c.patch     |   61 +
 ...h-fix-race-condition-in-lll_wait_tid.patch |   38 +
 ...CANCEL-to-the-list-of-blocked-signal.patch |   37 +
 ...so-include-dlfcn.h-for-RTLD_NODELETE.patch |   52 +
 ...e-elf.h-update-for-ELFOSABI_-changes.patch |   34 +
 ...update-ptrace.h-to-latest-from-glibc.patch |  113 ++
 ...bc-0021-pread-pwrite-fix-for-threads.patch |   37 +
 ...hnone_marshal-in-multithreading-cont.patch |  128 ++
 ...yscall_error-callers-to-use-a0-for-a.patch |   57 +
 ...ead-of-v0-for-__syscall_error-argume.patch |   63 +
 ...rm-mode-for-resolver-unconditionally.patch |   29 +
 ...pid-behave-similar-to-the-common-one.patch |   53 +
 ...ls.h-allow-immediate-values-as-6th-s.patch |   33 +
 ...-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch |   57 +
 ...0029-inet-rpc-fix-build-in-NPTL-case.patch |   58 +
 ...nt-assignment-allocation-m-character.patch |  190 +++
 ...ys_mmap2-do-unsigned-shift-of-offset.patch |   35 +
 ...dle-renamed-syscalls-in-common-ppc-x.patch |  114 ++
 ...clibc-0033-rpmatch-backport-function.patch |   78 +
 .../uclibc-0034-statfs-support-f_frsize.patch |  189 +++
 ...ket.h-pull-socket_type.h-from-eglibc.patch | 1374 +++++++++++++++++
 .../0.9.33.2/uclibc-0036-mount.h-update.patch |   91 ++
 ...s_syscall_h-do-not-leave-undefined-S.patch |   38 +
 ...bc-sysdeps-sync-bits-in.h-with-glibc.patch |  117 ++
 ...e-free-slots-at-the-end-of-exit-func.patch |   43 +
 ...AP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch |  200 +++
 ...uclibc-0041-libc-add-posix_fallocate.patch |  337 ++++
 ...overflow-checking-in-int_add_no_wrap.patch |   44 +
 ...issing-SYMBOL_PREFIX-to-symbol-names.patch |   86 ++
 ...do-not-filter-responses-in-res_query.patch |   46 +
 ...ve-pragma-weak-for-undeclared-symbol.patch |   39 +
 ...-the-nameserver-from-_res-state-afte.patch |   34 +
 ...fputws_unlocked-S-F-instead-of-fputw.patch |   30 +
 ...x-a-problem-with-scanning-wide-chars.patch |   66 +
 ...ness-in-dlopen-do_dlopen-wrapper-wor.patch |   66 +
 ...-implementation-from-statically-link.patch |   60 +
 ...x-backtrace-for-statically-linked-ap.patch |  168 ++
 ...acktrace-fix-build-due-to-some-typos.patch |   39 +
 ...tly-include-uClibc_page.h-to-make-PA.patch |   30 +
 42 files changed, 4647 insertions(+), 39 deletions(-)
 delete mode 100644 package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0013-eventfd-Implement-eventfd2-and-fix-eventfd.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0014-pread-pwrite-backport-fix.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0015-add-posix_madvise.c.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0016-nptl-sh-fix-race-condition-in-lll_wait_tid.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0017-librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0019-include-elf.h-update-for-ELFOSABI_-changes.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0020-update-ptrace.h-to-latest-from-glibc.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0021-pread-pwrite-fix-for-threads.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0022-inet-rpc-fix-authnone_marshal-in-multithreading-cont.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0023-MIPS-Convert-__syscall_error-callers-to-use-a0-for-a.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0024-MIPS-Use-a0-instead-of-v0-for-__syscall_error-argume.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0025-ldso-use-.arm-mode-for-resolver-unconditionally.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0026-make-NPTL-s-getpid-behave-similar-to-the-common-one.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0027-i386-bits-syscalls.h-allow-immediate-values-as-6th-s.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0029-inet-rpc-fix-build-in-NPTL-case.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0030-stdio-implement-assignment-allocation-m-character.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0031-mmap-sys_mmap2-do-unsigned-shift-of-offset.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0032-pread-pwrite-handle-renamed-syscalls-in-common-ppc-x.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0033-rpmatch-backport-function.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0034-statfs-support-f_frsize.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0035-socket.h-pull-socket_type.h-from-eglibc.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0036-mount.h-update.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0037-buildsys-gen_bits_syscall_h-do-not-leave-undefined-S.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0038-libc-sysdeps-sync-bits-in.h-with-glibc.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0039-libc-atexit-reuse-free-slots-at-the-end-of-exit-func.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0040-mman-rename-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0041-libc-add-posix_fallocate.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0042-nice-fix-overflow-checking-in-int_add_no_wrap.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0044-inet-do-not-filter-responses-in-res_query.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0045-Remove-pragma-weak-for-undeclared-symbol.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0046-inet-fix-getting-the-nameserver-from-_res-state-afte.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0047-_vfprintf.c-use-fputws_unlocked-S-F-instead-of-fputw.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0048-Fix-a-problem-with-scanning-wide-chars.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0049-Fix-some-fragileness-in-dlopen-do_dlopen-wrapper-wor.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0050-libdl-fix-dlopen-implementation-from-statically-link.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0051-libubacktrace-fix-backtrace-for-statically-linked-ap.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0052-libubacktrace-fix-build-due-to-some-typos.patch
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0053-libc-elf-explicitly-include-uClibc_page.h-to-make-PA.patch

diff --git a/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch b/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
deleted file mode 100644
index 9353e5bb43..0000000000
--- a/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e95694dfd24779acaab0bb1500f182e46f8a518d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 13 Jul 2013 17:13:55 +0200
-Subject: [PATCH 2/8] Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
-
-From yocto:
-http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libc/sysdeps/linux/common/bits/socket.h | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
-index 7e12733..338fd92 100644
---- a/libc/sysdeps/linux/common/bits/socket.h
-+++ b/libc/sysdeps/linux/common/bits/socket.h
-@@ -235,8 +235,15 @@ enum
- #define	MSG_ERRQUEUE	MSG_ERRQUEUE
-     MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
- #define	MSG_NOSIGNAL	MSG_NOSIGNAL
--    MSG_MORE		= 0x8000  /* Sender will send more.  */
-+    MSG_MORE		= 0x8000,  /* Sender will send more.  */
- #define	MSG_MORE	MSG_MORE
-+    MSG_WAITFORONE      = 0x10000, /* Wait for at least one packet to return.*/
-+#define MSG_WAITFORONE  MSG_WAITFORONE
-+
-+    MSG_CMSG_CLOEXEC    = 0x40000000    /* Set close_on_exit for file
-+                                           descriptor received through
-+                                           SCM_RIGHTS.  */
-+#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
-   };
- 
- 
--- 
-1.8.1.2
-
diff --git a/package/uclibc/0.9.33.2/uclibc-0013-eventfd-Implement-eventfd2-and-fix-eventfd.patch b/package/uclibc/0.9.33.2/uclibc-0013-eventfd-Implement-eventfd2-and-fix-eventfd.patch
new file mode 100644
index 0000000000..fea8ccdd1b
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0013-eventfd-Implement-eventfd2-and-fix-eventfd.patch
@@ -0,0 +1,64 @@
+From 7810e4f8027b5c4c8ceec6fefec4eb779362ebb5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 10 Jun 2012 09:36:23 -0700
+Subject: [PATCH] eventfd: Implement eventfd2 and fix eventfd
+
+eventfd: evntfd assumes to take two arguments instead it
+should be one evntfd expects two therefore implement both syscalls with
+correct parameters
+
+Thanks Eugene Rudoy for reporting it and also providing the patch
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/eventfd.c |   16 ++++++++++++++--
+ libc/sysdeps/linux/common/stubs.c   |    2 +-
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c
+index cc3f3f0..96597ab 100644
+--- a/libc/sysdeps/linux/common/eventfd.c
++++ b/libc/sysdeps/linux/common/eventfd.c
+@@ -7,12 +7,24 @@
+  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+  */
+ 
++#include <errno.h>
+ #include <sys/syscall.h>
+ #include <sys/eventfd.h>
+ 
+ /*
+  * eventfd()
+  */
+-#ifdef __NR_eventfd
+-_syscall2(int, eventfd, int, count, int, flags)
++#if defined __NR_eventfd || defined __NR_eventfd2
++int eventfd (int count, int flags)
++{
++#if defined __NR_eventfd2
++  return INLINE_SYSCALL (eventfd2, 2, count, flags);
++#elif defined __NR_eventfd
++  if (flags != 0) {
++     __set_errno (EINVAL);
++    return -1;
++  }
++  return INLINE_SYSCALL (eventfd, 1, count);
++#endif
++}
+ #endif
+diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
+index 4d1e26c..7af14c1 100644
+--- a/libc/sysdeps/linux/common/stubs.c
++++ b/libc/sysdeps/linux/common/stubs.c
+@@ -93,7 +93,7 @@ make_stub(epoll_ctl)
+ make_stub(epoll_wait)
+ #endif
+ 
+-#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
++#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
+ make_stub(eventfd)
+ #endif
+ 
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0014-pread-pwrite-backport-fix.patch b/package/uclibc/0.9.33.2/uclibc-0014-pread-pwrite-backport-fix.patch
new file mode 100644
index 0000000000..e04607cff6
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0014-pread-pwrite-backport-fix.patch
@@ -0,0 +1,219 @@
+From 342a3d861fde5651ee53486addbacddcec6a0a58 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <natanael.copa@gmail.com>
+Date: Sat, 4 Aug 2012 19:32:45 +0200
+Subject: [PATCH] pread/pwrite: backport fix
+
+pread/pwrite syscalls has been renamed to pread64/pwrite in 2.6 kernel.
+
+There was a fallback function using lseek for kernels who did not have
+this syscall (pre 2.1.60). This is broken in many ways.
+
+uclibc have been using the broken fallback due to they forgot to rename
+pread syscall.
+
+This got detected with git-1.7.11 which introduced threaded index-pack
+which broke in similar ways a windows (msys).
+
+This issue in uclibc have been reported upstream and fixed in git master
+so this patch does not need to be upstreamed. It might be an idea to
+backport it properly for 0.9.33 branch though.
+
+Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/pread_write.c |  143 ++++---------------------------
+ 1 file changed, 19 insertions(+), 124 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
+index 88e6957..baf8691 100644
+--- a/libc/sysdeps/linux/common/pread_write.c
++++ b/libc/sysdeps/linux/common/pread_write.c
+@@ -17,6 +17,7 @@
+ #include <unistd.h>
+ #include <stdint.h>
+ #include <endian.h>
++#include <sysdep-cancel.h>
+ 
+ extern __typeof(pread) __libc_pread;
+ extern __typeof(pwrite) __libc_pwrite;
+@@ -27,15 +28,17 @@ extern __typeof(pwrite64) __libc_pwrite64;
+ 
+ #include <bits/kernel_types.h>
+ 
+-#ifdef __NR_pread
+-
+-# define __NR___syscall_pread __NR_pread
++# define __NR___syscall_pread __NR_pread64
+ static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
+ 		size_t, count, off_t, offset_hi, off_t, offset_lo)
+ 
+ ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
+ {
+-	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
++	int oldtype = LIBC_CANCEL_ASYNC ();
++	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
++	LIBC_CANCEL_RESET (oldtype);
++	return result;
++
+ }
+ weak_alias(__libc_pread,pread)
+ 
+@@ -44,22 +47,24 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
+ {
+ 	uint32_t low = offset & 0xffffffff;
+ 	uint32_t high = offset >> 32;
+-	return __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
++	int oldtype = LIBC_CANCEL_ASYNC ();
++	int result = __syscall_pread(fd, buf, count, __LONG_LONG_PAIR(high, low));
++	LIBC_CANCEL_RESET (oldtype);
++	return result;
+ }
+ weak_alias(__libc_pread64,pread64)
+ # endif /* __UCLIBC_HAS_LFS__  */
+ 
+-#endif /* __NR_pread */
+-
+-#ifdef __NR_pwrite
+-
+-# define __NR___syscall_pwrite __NR_pwrite
++# define __NR___syscall_pwrite __NR_pwrite64
+ static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
+ 		size_t, count, off_t, offset_hi, off_t, offset_lo)
+ 
+ ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
+ {
+-	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
++	int oldtype = LIBC_CANCEL_ASYNC ();
++	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(offset >> 31, offset));
++	LIBC_CANCEL_RESET (oldtype);
++	return result;
+ }
+ weak_alias(__libc_pwrite,pwrite)
+ 
+@@ -68,120 +73,10 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
+ {
+ 	uint32_t low = offset & 0xffffffff;
+ 	uint32_t high = offset >> 32;
+-	return __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
+-}
+-weak_alias(__libc_pwrite64,pwrite64)
+-# endif /* __UCLIBC_HAS_LFS__  */
+-#endif /* __NR_pwrite */
+-
+-#if ! defined __NR_pread || ! defined __NR_pwrite
+-
+-static ssize_t __fake_pread_write(int fd, void *buf,
+-		size_t count, off_t offset, int do_pwrite)
+-{
+-	int save_errno;
+-	ssize_t result;
+-	off_t old_offset;
+-
+-	/* Since we must not change the file pointer preserve the
+-	 * value so that we can restore it later.  */
+-	if ((old_offset=lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
+-		return -1;
+-
+-	/* Set to wanted position.  */
+-	if (lseek(fd, offset, SEEK_SET) == (off_t) -1)
+-		return -1;
+-
+-	if (do_pwrite == 1) {
+-		/* Write the data.  */
+-		result = write(fd, buf, count);
+-	} else {
+-		/* Read the data.  */
+-		result = read(fd, buf, count);
+-	}
+-
+-	/* Now we have to restore the position.  If this fails we
+-	 * have to return this as an error.  */
+-	save_errno = errno;
+-	if (lseek(fd, old_offset, SEEK_SET) == (off_t) -1)
+-	{
+-		if (result == -1)
+-			__set_errno(save_errno);
+-		return -1;
+-	}
+-	__set_errno(save_errno);
+-	return(result);
+-}
+-
+-# ifdef __UCLIBC_HAS_LFS__
+-
+-static ssize_t __fake_pread_write64(int fd, void *buf,
+-		size_t count, off64_t offset, int do_pwrite)
+-{
+-	int save_errno;
+-	ssize_t result;
+-	off64_t old_offset;
+-
+-	/* Since we must not change the file pointer preserve the
+-	 * value so that we can restore it later.  */
+-	if ((old_offset=lseek64(fd, 0, SEEK_CUR)) == (off64_t) -1)
+-		return -1;
+-
+-	/* Set to wanted position.  */
+-	if (lseek64(fd, offset, SEEK_SET) == (off64_t) -1)
+-		return -1;
+-
+-	if (do_pwrite == 1) {
+-		/* Write the data.  */
+-		result = write(fd, buf, count);
+-	} else {
+-		/* Read the data.  */
+-		result = read(fd, buf, count);
+-	}
+-
+-	/* Now we have to restore the position. */
+-	save_errno = errno;
+-	if (lseek64(fd, old_offset, SEEK_SET) == (off64_t) -1) {
+-		if (result == -1)
+-			__set_errno (save_errno);
+-		return -1;
+-	}
+-	__set_errno (save_errno);
++	int oldtype = LIBC_CANCEL_ASYNC ();
++	int result = __syscall_pwrite(fd, buf, count, __LONG_LONG_PAIR(high, low));
++	LIBC_CANCEL_RESET (oldtype);
+ 	return result;
+ }
+-# endif /* __UCLIBC_HAS_LFS__  */
+-#endif /*  ! defined __NR_pread || ! defined __NR_pwrite */
+-
+-#ifndef __NR_pread
+-ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)
+-{
+-	return __fake_pread_write(fd, buf, count, offset, 0);
+-}
+-weak_alias(__libc_pread,pread)
+-
+-# ifdef __UCLIBC_HAS_LFS__
+-ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
+-{
+-	return __fake_pread_write64(fd, buf, count, offset, 0);
+-}
+-weak_alias(__libc_pread64,pread64)
+-# endif /* __UCLIBC_HAS_LFS__  */
+-#endif /* ! __NR_pread */
+-
+-#ifndef __NR_pwrite
+-ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)
+-{
+-	/* we won't actually be modifying the buffer,
+-	 *just cast it to get rid of warnings */
+-	return __fake_pread_write(fd, (void*)buf, count, offset, 1);
+-}
+-weak_alias(__libc_pwrite,pwrite)
+-
+-# ifdef __UCLIBC_HAS_LFS__
+-ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)
+-{
+-	return __fake_pread_write64(fd, (void*)buf, count, offset, 1);
+-}
+ weak_alias(__libc_pwrite64,pwrite64)
+ # endif /* __UCLIBC_HAS_LFS__  */
+-#endif /* ! __NR_pwrite */
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0015-add-posix_madvise.c.patch b/package/uclibc/0.9.33.2/uclibc-0015-add-posix_madvise.c.patch
new file mode 100644
index 0000000000..097f8fcbc7
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0015-add-posix_madvise.c.patch
@@ -0,0 +1,61 @@
+From 93b8ce8886e30986be31c1403b606b6367dc258a Mon Sep 17 00:00:00 2001
+From: "Peter S. Mazinger" <ps.m@gmx.net>
+Date: Tue, 26 Apr 2011 23:03:44 +0200
+Subject: [PATCH] add posix_madvise.c
+
+Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libc/sysdeps/linux/common/Makefile.in     |    2 +-
+ libc/sysdeps/linux/common/posix_madvise.c |   25 +++++++++++++++++++++++++
+ 2 files changed, 26 insertions(+), 1 deletion(-)
+ create mode 100644 libc/sysdeps/linux/common/posix_madvise.c
+
+diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
+index 3b5763c..b39082b 100644
+--- a/libc/sysdeps/linux/common/Makefile.in
++++ b/libc/sysdeps/linux/common/Makefile.in
+@@ -81,7 +81,7 @@ CSRC-$(UCLIBC_HAS_REALTIME) += clock_getres.c clock_gettime.c clock_settime.c \
+ 	sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \
+ 	sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c
+ # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait
+-CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c
++CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c
+ CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c
+ CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c
+ CSRC-$(UCLIBC_HAS_XATTR) += xattr.c
+diff --git a/libc/sysdeps/linux/common/posix_madvise.c b/libc/sysdeps/linux/common/posix_madvise.c
+new file mode 100644
+index 0000000..2f95bcb
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_madvise.c
+@@ -0,0 +1,25 @@
++/* vi: set sw=4 ts=4: */
++/* Licensed under the LGPL v2.1, see the file LICENSE in this tarball. */
++
++#include <sys/mman.h>
++#include <sys/syscall.h>
++
++#if defined __NR_madvise && defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
++int posix_madvise(void *addr, size_t len, int advice)
++{
++	int result;
++	/* We have one problem: the kernel's MADV_DONTNEED does not
++	 * correspond to POSIX's POSIX_MADV_DONTNEED.  The former simply
++	 * discards changes made to the memory without writing it back to
++	 * disk, if this would be necessary.  The POSIX behaviour does not
++	 * allow this.  There is no functionality mapping for the POSIX
++	 * behaviour so far so we ignore that advice for now. */
++	if (advice == POSIX_MADV_DONTNEED)
++		return 0;
++
++	/* this part might use madvise function */
++	INTERNAL_SYSCALL_DECL (err);
++	result = INTERNAL_SYSCALL (madvise, err, 3, addr, len, advice);
++	return INTERNAL_SYSCALL_ERRNO (result, err);
++}
++#endif
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0016-nptl-sh-fix-race-condition-in-lll_wait_tid.patch b/package/uclibc/0.9.33.2/uclibc-0016-nptl-sh-fix-race-condition-in-lll_wait_tid.patch
new file mode 100644
index 0000000000..233f2bee0a
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0016-nptl-sh-fix-race-condition-in-lll_wait_tid.patch
@@ -0,0 +1,38 @@
+From ffd9e147b120e9c2bf30ba4861860f1bc59362c5 Mon Sep 17 00:00:00 2001
+From: Stas Sergeev <stsp@users.sourceforge.net>
+Date: Thu, 14 Jun 2012 01:00:02 +0200
+Subject: [PATCH] nptl: sh: fix race condition in lll_wait_tid
+
+Make a local copy of the tid value to avoid a race condition,
+as the value could have been changed to 0, thus using a pointer
+it would have been passed to the lll_futex_wait modified.
+
+Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit 0dcc13bf7a61b1d0708e5dd103d5515e0ffec79a)
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+index d10cd61..b83d863 100644
+--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
++++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+@@ -396,9 +396,9 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
+ 
+ #define lll_wait_tid(tid) \
+   do {									      \
+-    __typeof (tid) *__tid = &(tid);					      \
+-    while (*__tid != 0)							      \
+-      lll_futex_wait (__tid, *__tid, LLL_SHARED);			      \
++    __typeof (tid) __tid;						      \
++    while ((__tid = (tid)) != 0)						      \
++      lll_futex_wait (&(tid), __tid, LLL_SHARED);			      \
+   } while (0)
+ 
+ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0017-librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal.patch b/package/uclibc/0.9.33.2/uclibc-0017-librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal.patch
new file mode 100644
index 0000000000..9a263f8d79
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0017-librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal.patch
@@ -0,0 +1,37 @@
+From fec308fdfaf9f557ef5fb17c308c48259012b825 Mon Sep 17 00:00:00 2001
+From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Date: Thu, 12 Jul 2012 09:24:39 +0200
+Subject: [PATCH] librt: re-add SIGCANCEL to the list of blocked signal in
+ helper thread
+
+Indeed if the libpthread is before the libc in the library look up
+the SIGCANCEL is removed from the list of the blocked signal by
+sigfillset func, this can produce the handler not properly called.
+This commit revert what Denys modified in commit
+162cfaea20d807f0ae329efe39292a9b22593b41.
+
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit cb43f2afba0633400387fa7c55dda3396517f58a)
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
+index 4319d8d..2681961 100644
+--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
++++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
+@@ -175,7 +175,7 @@ __start_helper_thread (void)
+   sigset_t ss;
+   sigset_t oss;
+   sigfillset (&ss);
+-  /*__sigaddset (&ss, SIGCANCEL); - already done by sigfillset */
++  __sigaddset (&ss, SIGCANCEL);
+   INTERNAL_SYSCALL_DECL (err);
+   INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);
+ 
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch b/package/uclibc/0.9.33.2/uclibc-0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch
new file mode 100644
index 0000000000..37fb9132ef
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch
@@ -0,0 +1,52 @@
+From 2f09c67232cebca62f3afa4fc296c83aa813427c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 18 Nov 2012 04:41:06 -0500
+Subject: [PATCH] ldso: include dlfcn.h for RTLD_NODELETE
+
+Building with NPTL enabled and shared library support disabled we hit:
+In file included from libpthread/nptl/sysdeps/generic/dl-tls.c:30:0:
+./ldso/include/dl-elf.h: In function '__dl_parse_dynamic_info':
+./ldso/include/dl-elf.h:173:20: error: 'RTLD_NODELETE' undeclared (first use in this function)
+./ldso/include/dl-elf.h:173:20: note: each undeclared identifier is reported only once for each function it appears in
+make: *** [libpthread/nptl/sysdeps/generic/dl-tls.os] Error 1
+
+A previous commit (f26c5f6952ce9bf8edec9c1571c47addb1bcc442) touched
+on a similar issue, but added the include to the incorrect location.
+
+Reported-by: Christophe Lyon <christophe.lyon@st.com> [arm nommu]
+Reported-by: Daniel Beecham <daniel@lunix.se> [static x86_64]
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ ldso/include/dl-elf.h |    2 ++
+ ldso/include/ldso.h   |    1 -
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
+index 29d1a00..e1185f7 100644
+--- a/ldso/include/dl-elf.h
++++ b/ldso/include/dl-elf.h
+@@ -18,6 +18,8 @@ struct elf_resolve;
+ struct r_scope_elem;
+ 
+ #include <dl-defs.h>
++#include <dlfcn.h>
++
+ #ifdef __LDSO_CACHE_SUPPORT__
+ extern int _dl_map_cache(void);
+ extern int _dl_unmap_cache(void);
+diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
+index 6f3b728..e250e30 100644
+--- a/ldso/include/ldso.h
++++ b/ldso/include/ldso.h
+@@ -42,7 +42,6 @@
+ #ifndef __ARCH_HAS_NO_SHARED__
+ #include <dl-syscall.h>
+ #include <dl-string.h>
+-#include <dlfcn.h>
+ /* Now the ldso specific headers */
+ #include <dl-elf.h>
+ #ifdef __UCLIBC_HAS_TLS__
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0019-include-elf.h-update-for-ELFOSABI_-changes.patch b/package/uclibc/0.9.33.2/uclibc-0019-include-elf.h-update-for-ELFOSABI_-changes.patch
new file mode 100644
index 0000000000..b3507af78d
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0019-include-elf.h-update-for-ELFOSABI_-changes.patch
@@ -0,0 +1,34 @@
+From 788d9ca73b7ed1262c83580ccc62fb3625e603c3 Mon Sep 17 00:00:00 2001
+From: Thomas Schwinge <thomas@codesourcery.com>
+Date: Wed, 31 Oct 2012 20:41:50 +0100
+Subject: [PATCH] include/elf.h: update for ELFOSABI_* changes.
+
+ELFOSABI_GNU replaces ELFOSABI_LINUX, the latter is kept as a compatibility
+alias, and ELFOSABI_HURD is removed.  See the table on
+<http://www.sco.com/developers/gabi/latest/ch4.eheader.html#osabi> for
+reference.
+
+Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/elf.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/elf.h b/include/elf.h
+index ba3e804..470046e 100644
+--- a/include/elf.h
++++ b/include/elf.h
+@@ -148,8 +148,8 @@ typedef struct
+ #define ELFOSABI_SYSV		0	/* Alias.  */
+ #define ELFOSABI_HPUX		1	/* HP-UX */
+ #define ELFOSABI_NETBSD		2	/* NetBSD.  */
+-#define ELFOSABI_LINUX		3	/* Linux.  */
+-#define ELFOSABI_HURD		4	/* GNU/Hurd */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU	/* Compatibility alias.  */
+ #define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
+ #define ELFOSABI_AIX		7	/* IBM AIX.  */
+ #define ELFOSABI_IRIX		8	/* SGI Irix.  */
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0020-update-ptrace.h-to-latest-from-glibc.patch b/package/uclibc/0.9.33.2/uclibc-0020-update-ptrace.h-to-latest-from-glibc.patch
new file mode 100644
index 0000000000..a46af7e5f7
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0020-update-ptrace.h-to-latest-from-glibc.patch
@@ -0,0 +1,113 @@
+From 2d0c3a704afe6bdc7be129e9f9217ec1369c1bc8 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 30 Nov 2012 10:08:13 +0000
+Subject: [PATCH] update ptrace.h to latest from glibc
+
+Update libc/sysdeps/linux/common/sys/ptrace.h to latest from glibc's
+sysdeps/unix/sysv/linux/sys/ptrace.h.
+
+This adds definitions for operations:
+ - PTRACE_GETREGSET
+ - PTRACE_SETREGSET
+ - PTRACE_SEIZE
+ - PTRACE_INTERRUPT
+ - PTRACE_LISTEN
+
+And adds flags:
+ - PTRACE_SEIZE_DEVEL
+
+And adds event codes:
+ - PTRACE_EVENT_SECCOMP
+
+This is to allow access to the generic interface for accessing
+architecture specific regsets using the corresponding NT_* types,
+required for new Linux kernel architecture ports.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/sys/ptrace.h |   42 +++++++++++++++++++++++++++-----
+ 1 file changed, 36 insertions(+), 6 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/sys/ptrace.h b/libc/sysdeps/linux/common/sys/ptrace.h
+index 08658f9..95b3fdf 100644
+--- a/libc/sysdeps/linux/common/sys/ptrace.h
++++ b/libc/sysdeps/linux/common/sys/ptrace.h
+@@ -1,5 +1,5 @@
+ /* `ptrace' debugger support interface.  Linux version.
+-   Copyright (C) 1996-1999,2000,2006,2007 Free Software Foundation, Inc.
++   Copyright (C) 1996-2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -125,13 +125,40 @@ enum __ptrace_request
+ #define PT_GETSIGINFO PTRACE_GETSIGINFO
+ 
+   /* Set new siginfo for process.  */
+-  PTRACE_SETSIGINFO = 0x4203
++  PTRACE_SETSIGINFO = 0x4203,
+ #define PT_SETSIGINFO PTRACE_SETSIGINFO
++
++  /* Get register content.  */
++  PTRACE_GETREGSET = 0x4204,
++#define PTRACE_GETREGSET PTRACE_GETREGSET
++
++  /* Set register content.  */
++  PTRACE_SETREGSET = 0x4205,
++#define PTRACE_SETREGSET PTRACE_SETREGSET
++
++  /* Like PTRACE_ATTACH, but do not force tracee to trap and do not affect
++     signal or group stop state.  */
++  PTRACE_SEIZE = 0x4206,
++#define PTRACE_SEIZE PTRACE_SEIZE
++
++  /* Trap seized tracee.  */
++  PTRACE_INTERRUPT = 0x4207,
++#define PTRACE_INTERRUPT PTRACE_INTERRUPT
++
++  /* Wait for next group event.  */
++  PTRACE_LISTEN = 0x4208
+ };
+ 
+ 
++/* Flag for PTRACE_LISTEN.  */
++enum __ptrace_flags
++{
++  PTRACE_SEIZE_DEVEL = 0x80000000
++};
++
+ /* Options set using PTRACE_SETOPTIONS.  */
+-enum __ptrace_setoptions {
++enum __ptrace_setoptions
++{
+   PTRACE_O_TRACESYSGOOD	= 0x00000001,
+   PTRACE_O_TRACEFORK	= 0x00000002,
+   PTRACE_O_TRACEVFORK   = 0x00000004,
+@@ -139,17 +166,20 @@ enum __ptrace_setoptions {
+   PTRACE_O_TRACEEXEC	= 0x00000010,
+   PTRACE_O_TRACEVFORKDONE = 0x00000020,
+   PTRACE_O_TRACEEXIT	= 0x00000040,
+-  PTRACE_O_MASK		= 0x0000007f
++  PTRACE_O_TRACESECCOMP = 0x00000080,
++  PTRACE_O_MASK		= 0x000000ff
+ };
+ 
+ /* Wait extended result codes for the above trace options.  */
+-enum __ptrace_eventcodes {
++enum __ptrace_eventcodes
++{
+   PTRACE_EVENT_FORK	= 1,
+   PTRACE_EVENT_VFORK	= 2,
+   PTRACE_EVENT_CLONE	= 3,
+   PTRACE_EVENT_EXEC	= 4,
+   PTRACE_EVENT_VFORK_DONE = 5,
+-  PTRACE_EVENT_EXIT	= 6
++  PTRACE_EVENT_EXIT	= 6,
++  PTRAVE_EVENT_SECCOMP  = 7
+ };
+ 
+ /* Perform process tracing functions.  REQUEST is one of the values
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0021-pread-pwrite-fix-for-threads.patch b/package/uclibc/0.9.33.2/uclibc-0021-pread-pwrite-fix-for-threads.patch
new file mode 100644
index 0000000000..5b95dd8642
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0021-pread-pwrite-fix-for-threads.patch
@@ -0,0 +1,37 @@
+From b7cc54be07412f02ff464aa47a8871ba7a910e3e Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Tue, 8 Jan 2013 10:14:22 +0100
+Subject: [PATCH] pread/pwrite: fix for !threads
+
+This is done properly via cancel.h on master.
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/pread_write.c |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
+index baf8691..c142038 100644
+--- a/libc/sysdeps/linux/common/pread_write.c
++++ b/libc/sysdeps/linux/common/pread_write.c
+@@ -17,7 +17,16 @@
+ #include <unistd.h>
+ #include <stdint.h>
+ #include <endian.h>
+-#include <sysdep-cancel.h>
++#ifdef __UCLIBC_HAS_THREADS_NATIVE__
++#include "sysdep-cancel.h"
++#else
++/* No multi-thread handling enabled.  */
++#define SINGLE_THREAD_P (1)
++#define RTLD_SINGLE_THREAD_P (1)
++#define LIBC_CANCEL_ASYNC()	0 /* Just a dummy value.  */
++#define LIBC_CANCEL_RESET(val)	((void)(val)) /* Nothing, but evaluate it.  */
++#define LIBC_CANCEL_HANDLED()	/* Nothing.  */
++#endif
+ 
+ extern __typeof(pread) __libc_pread;
+ extern __typeof(pwrite) __libc_pwrite;
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0022-inet-rpc-fix-authnone_marshal-in-multithreading-cont.patch b/package/uclibc/0.9.33.2/uclibc-0022-inet-rpc-fix-authnone_marshal-in-multithreading-cont.patch
new file mode 100644
index 0000000000..6d8e2b21a6
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0022-inet-rpc-fix-authnone_marshal-in-multithreading-cont.patch
@@ -0,0 +1,128 @@
+From 5c797a24a7d6337b5e654079a8d815199b1e8364 Mon Sep 17 00:00:00 2001
+From: Carmelo Amoroso <carmelo.amoroso@st.com>
+Date: Thu, 2 Feb 2012 18:22:36 +0100
+Subject: [PATCH] inet:rpc: fix authnone_marshal in multithreading context
+
+This is a port of glibc's fix by Zack Weinberg as reported
+in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=142312,
+and discussed in http://sourceware.org/ml/libc-alpha/2002-04/msg00069.html
+and following.
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libc/inet/rpc/auth_none.c   |   59 +++++++++++++++++++++----------------------
+ libc/inet/rpc/rpc_private.h |    2 --
+ libc/inet/rpc/rpc_thread.c  |    1 -
+ 3 files changed, 29 insertions(+), 33 deletions(-)
+
+diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
+index c48bbfe..d066f6b 100644
+--- a/libc/inet/rpc/auth_none.c
++++ b/libc/inet/rpc/auth_none.c
+@@ -66,49 +66,48 @@ struct authnone_private_s {
+   char marshalled_client[MAX_MARSHAL_SIZE];
+   u_int mcnt;
+ };
+-#ifdef __UCLIBC_HAS_THREADS__
+-#define authnone_private (*(struct authnone_private_s **)&RPC_THREAD_VARIABLE(authnone_private_s))
+-#else
+-static struct authnone_private_s *authnone_private;
+-#endif
+ 
+-AUTH *
+-authnone_create (void)
++static struct authnone_private_s authnone_private;
++__libc_once_define(static, authnone_private_guard);
++
++static void authnone_create_once (void);
++
++static void
++authnone_create_once (void)
+ {
+   struct authnone_private_s *ap;
+   XDR xdr_stream;
+   XDR *xdrs;
+ 
+-  ap = (struct authnone_private_s *) authnone_private;
+-  if (ap == NULL)
+-    {
+-      ap = (struct authnone_private_s *) calloc (1, sizeof (*ap));
+-      if (ap == NULL)
+-	return NULL;
+-      authnone_private = ap;
+-    }
+-  if (!ap->mcnt)
+-    {
+-      ap->no_client.ah_cred = ap->no_client.ah_verf = _null_auth;
+-      ap->no_client.ah_ops = (struct auth_ops *)&ops;
+-      xdrs = &xdr_stream;
+-      xdrmem_create (xdrs, ap->marshalled_client, (u_int) MAX_MARSHAL_SIZE,
+-		     XDR_ENCODE);
+-      (void) xdr_opaque_auth (xdrs, &ap->no_client.ah_cred);
+-      (void) xdr_opaque_auth (xdrs, &ap->no_client.ah_verf);
+-      ap->mcnt = XDR_GETPOS (xdrs);
+-      XDR_DESTROY (xdrs);
+-    }
+-  return (&ap->no_client);
++  ap = &authnone_private;
++
++  ap->no_client.ah_cred = ap->no_client.ah_verf = _null_auth;
++  ap->no_client.ah_ops = (struct auth_ops *) &ops;
++  xdrs = &xdr_stream;
++  xdrmem_create(xdrs, ap->marshalled_client,
++			 (u_int) MAX_MARSHAL_SIZE, XDR_ENCODE);
++  (void) xdr_opaque_auth(xdrs, &ap->no_client.ah_cred);
++  (void) xdr_opaque_auth(xdrs, &ap->no_client.ah_verf);
++  ap->mcnt = XDR_GETPOS (xdrs);
++  XDR_DESTROY (xdrs);
++}
++
++AUTH *
++authnone_create (void)
++{
++  __libc_once (authnone_private_guard, authnone_create_once);
++  return &authnone_private.no_client;
+ }
+ libc_hidden_def(authnone_create)
+ 
+ static bool_t
+-authnone_marshal (AUTH *client attribute_unused, XDR *xdrs)
++authnone_marshal (AUTH *client, XDR *xdrs)
+ {
+   struct authnone_private_s *ap;
+ 
+-  ap = authnone_private;
++  /* authnone_create returned authnone_private->no_client, which is
++     the first field of struct authnone_private_s.  */
++  ap = (struct authnone_private_s *) client;
+   if (ap == NULL)
+     return FALSE;
+   return (*xdrs->x_ops->x_putbytes) (xdrs, ap->marshalled_client, ap->mcnt);
+diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h
+index ede3ddf..e1214d2 100644
+--- a/libc/inet/rpc/rpc_private.h
++++ b/libc/inet/rpc/rpc_private.h
+@@ -18,8 +18,6 @@ struct rpc_thread_variables {
+ 	struct pollfd	*svc_pollfd_s;		/* Global, rpc_common.c */
+ 	int		svc_max_pollfd_s;	/* Global, rpc_common.c */
+ 
+-	void		*authnone_private_s;	/* auth_none.c */
+-
+ 	void		*clnt_perr_buf_s;	/* clnt_perr.c */
+ 
+ 	void		*clntraw_private_s;	/* clnt_raw.c */
+diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c
+index 71303b2..3367659 100644
+--- a/libc/inet/rpc/rpc_thread.c
++++ b/libc/inet/rpc/rpc_thread.c
+@@ -32,7 +32,6 @@ __rpc_thread_destroy (void)
+ 		__rpc_thread_svc_cleanup ();
+ 		__rpc_thread_clnt_cleanup ();
+ 		/*__rpc_thread_key_cleanup (); */
+-		free (tvp->authnone_private_s);
+ 		free (tvp->clnt_perr_buf_s);
+ 		free (tvp->clntraw_private_s);
+ 		free (tvp->svcraw_private_s);
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0023-MIPS-Convert-__syscall_error-callers-to-use-a0-for-a.patch b/package/uclibc/0.9.33.2/uclibc-0023-MIPS-Convert-__syscall_error-callers-to-use-a0-for-a.patch
new file mode 100644
index 0000000000..7103f59dd9
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0023-MIPS-Convert-__syscall_error-callers-to-use-a0-for-a.patch
@@ -0,0 +1,57 @@
+From 6e2dbd7387bc2381e08aa85d6d33bb2d2d140843 Mon Sep 17 00:00:00 2001
+From: Kevin Cernekee <cernekee@gmail.com>
+Date: Tue, 5 Jun 2012 15:05:19 -0700
+Subject: [PATCH] MIPS: Convert __syscall_error() callers to use $a0 for
+ argument
+
+Some callers passed the first argument in $v0, while others used $a0.
+Change the callers to use $a0 consistently.
+
+Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/mips/vfork.S                                      |    1 +
+ .../linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h |    2 +-
+ libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S         |    1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/mips/vfork.S b/libc/sysdeps/linux/mips/vfork.S
+index b307447..00cc675 100644
+--- a/libc/sysdeps/linux/mips/vfork.S
++++ b/libc/sysdeps/linux/mips/vfork.S
+@@ -84,6 +84,7 @@ NESTED(__vfork,FRAMESZ,sp)
+ 
+ 	/* Something bad happened -- no child created.  */
+ L(error):
++	move	a0, v0
+ #ifdef __PIC__
+ 	PTR_LA		t9, __syscall_error
+ 	RESTORE_GP64
+diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+index fc51774..4d2c405 100644
+--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
++++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+@@ -31,7 +31,7 @@
+ # undef PSEUDO
+ # define PSEUDO(name, syscall_name, args)				      \
+   .align 2;								      \
+-  99:									      \
++  99: move a0, v0; 							      \
+   PTR_LA t9,__syscall_error;					 	      \
+   /* manual cpreturn.  */						      \
+   REG_L gp, STKOFF_GP(sp);						      \
+diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S
+index 7bbab5c..238d798 100644
+--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S
++++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S
+@@ -80,6 +80,7 @@ NESTED(__vfork,FRAMESZ,sp)
+ 
+ 	/* Something bad happened -- no child created.  */
+ L(error):
++	move		a0, v0
+ #ifdef __PIC__
+ 	PTR_LA		t9, __syscall_error
+ 	RESTORE_GP64
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0024-MIPS-Use-a0-instead-of-v0-for-__syscall_error-argume.patch b/package/uclibc/0.9.33.2/uclibc-0024-MIPS-Use-a0-instead-of-v0-for-__syscall_error-argume.patch
new file mode 100644
index 0000000000..f48b9aeb45
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0024-MIPS-Use-a0-instead-of-v0-for-__syscall_error-argume.patch
@@ -0,0 +1,63 @@
+From c8f9e946bc2a0a42e84b5f97f272932de6485b54 Mon Sep 17 00:00:00 2001
+From: Kevin Cernekee <cernekee@gmail.com>
+Date: Tue, 5 Jun 2012 15:05:20 -0700
+Subject: [PATCH] MIPS: Use $a0 instead of $v0 for __syscall_error() argument
+
+$a0 is saved across _dl_runtime_resolve(); $v0 is not.  Unfortunately,
+__syscall_error() uses $v0 for its argument, not $a0 as is the MIPS ABI
+standard.  This means that if lazy binding was used for __syscall_error(),
+the errno value in $v0 could get corrupted.
+
+The problem can be easily seen in testcases where syscalls in librt fail;
+when librt tries to call __syscall_error() in libc, the argument gets
+lost and errno gets set to a bogus value:
+
+    # ./tst-mqueue1 ; echo $?
+    mq_receive on O_WRONLY mqd_t did not fail with EBADF: Unknown error 2004684208
+    1
+    # ./tst-mqueue2 ; echo $?
+    mq_timedreceive with too small msg_len did not fail with EMSGSIZE: Unknown error 1997360560
+    1
+    # ./tst-mqueue4 ; echo $?
+    mq_timedsend did not fail with ETIMEDOUT: Unknown error 2008747440
+    1
+
+When _dl_runtime_resolve() was taken out of the equation, the same test
+cases passed:
+
+    # LD_BIND_NOW=y ./tst-mqueue1 ; echo $?
+    0
+    # LD_BIND_NOW=y ./tst-mqueue2 ; echo $?
+    0
+    # LD_BIND_NOW=y ./tst-mqueue4 ; echo $?
+    0
+
+Changing __syscall_error() to look at $a0 instead of $v0 fixed the
+problem.
+
+(Note that there is also a "__syscall_error.c" file which presumably
+uses the standard C calling conventions, but I do not think it is used
+on MIPS.)
+
+Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/mips/syscall_error.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/mips/syscall_error.S b/libc/sysdeps/linux/mips/syscall_error.S
+index 51a8efa..0cc20da 100644
+--- a/libc/sysdeps/linux/mips/syscall_error.S
++++ b/libc/sysdeps/linux/mips/syscall_error.S
+@@ -43,7 +43,7 @@ ENTRY(__syscall_error)
+ #ifdef __PIC__
+ 	SAVE_GP(GPOFF)
+ #endif
+-	REG_S	v0, V0OFF(sp)
++	REG_S	a0, V0OFF(sp)
+ 	REG_S	ra, RAOFF(sp)
+ 
+ 	/* Find our per-thread errno address  */
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0025-ldso-use-.arm-mode-for-resolver-unconditionally.patch b/package/uclibc/0.9.33.2/uclibc-0025-ldso-use-.arm-mode-for-resolver-unconditionally.patch
new file mode 100644
index 0000000000..d33a0cddcb
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0025-ldso-use-.arm-mode-for-resolver-unconditionally.patch
@@ -0,0 +1,29 @@
+From 753e4e4cd9177f25981e81f82cd9fe8612a95ba6 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Fri, 15 Jun 2012 13:44:35 +0200
+Subject: [PATCH] ldso: use .arm mode for resolver unconditionally
+
+as per comment in the file.
+Fixes runtime with __THUMB_INTERWORK__ enabled.
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ ldso/ldso/arm/resolve.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ldso/ldso/arm/resolve.S b/ldso/ldso/arm/resolve.S
+index 08889d0..b0907f7 100644
+--- a/ldso/ldso/arm/resolve.S
++++ b/ldso/ldso/arm/resolve.S
+@@ -101,7 +101,7 @@
+ 
+  .text
+  .align 4      @ 16 byte boundary and there are 32 bytes below (arm case)
+- #if !defined(__thumb__) || defined(__thumb2__)
++#if 1 /*(!defined(__thumb__) || defined __THUMB_INTERWORK__) || defined(__thumb2__)*/
+  .arm
+  .globl _dl_linux_resolve
+  .type _dl_linux_resolve,%function
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0026-make-NPTL-s-getpid-behave-similar-to-the-common-one.patch b/package/uclibc/0.9.33.2/uclibc-0026-make-NPTL-s-getpid-behave-similar-to-the-common-one.patch
new file mode 100644
index 0000000000..11f7e2e0fa
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0026-make-NPTL-s-getpid-behave-similar-to-the-common-one.patch
@@ -0,0 +1,53 @@
+From 8a2b550a510cf2a1a0989fc0a665a6a42c83efd4 Mon Sep 17 00:00:00 2001
+From: "Peter S. Mazinger" <ps.m@gmx.net>
+Date: Fri, 22 Apr 2011 00:52:22 +0200
+Subject: [PATCH] make NPTL's getpid behave similar to the common one
+
+make __getpid static
+provide getppid alias if needed
+remove unneeded libc_hidden_proto
+
+Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c b/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c
+index d4de3cd..d2b3384 100644
+--- a/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c
++++ b/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c
+@@ -21,6 +21,10 @@
+ #include <tls.h>
+ #include <sysdep.h>
+ 
++#ifdef __NR_getxpid
++# undef __NR_getpid
++# define __NR_getpid __NR_getxpid
++#endif
+ 
+ #ifndef NOT_IN_libc
+ static inline __attribute__((always_inline)) pid_t really_getpid (pid_t oldval);
+@@ -46,8 +50,7 @@ really_getpid (pid_t oldval)
+ }
+ #endif
+ 
+-extern __typeof(getpid) __getpid;
+-pid_t
++static pid_t
+ __getpid (void)
+ {
+ #ifdef NOT_IN_libc
+@@ -60,6 +63,8 @@ __getpid (void)
+ #endif
+   return result;
+ }
+-libc_hidden_proto(getpid)
+ weak_alias(__getpid, getpid)
+ libc_hidden_weak(getpid)
++#if !defined NOT_IN_libc && !defined __NR_getppid
++strong_alias(getpid,getppid)
++#endif
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0027-i386-bits-syscalls.h-allow-immediate-values-as-6th-s.patch b/package/uclibc/0.9.33.2/uclibc-0027-i386-bits-syscalls.h-allow-immediate-values-as-6th-s.patch
new file mode 100644
index 0000000000..5df42ea95d
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0027-i386-bits-syscalls.h-allow-immediate-values-as-6th-s.patch
@@ -0,0 +1,33 @@
+From 576983880a0ab5d27a4f530d2cef36239b617e78 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <natanael.copa@gmail.com>
+Date: Thu, 5 Jul 2012 11:55:19 +0000
+Subject: [PATCH] i386/bits/syscalls.h: allow immediate values as 6th syscall
+ arg
+
+Allow use of immedate values as the 6th syscall argument. Otherwise we must
+store the arg on memory. This gives gcc more options to optimize better.
+
+This also works around an issue with posix_fallocate.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/i386/bits/syscalls.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/i386/bits/syscalls.h b/libc/sysdeps/linux/i386/bits/syscalls.h
+index 9fb4f35..566b5ac 100644
+--- a/libc/sysdeps/linux/i386/bits/syscalls.h
++++ b/libc/sysdeps/linux/i386/bits/syscalls.h
+@@ -136,7 +136,7 @@ __asm__ (
+ #define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \
+ 	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5)
+ #define ASMFMT_6(arg1, arg2, arg3, arg4, arg5, arg6) \
+-	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5), "m" (arg6)
++	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5), "g" (arg6)
+ 
+ #else /* !PIC */
+ 
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch b/package/uclibc/0.9.33.2/uclibc-0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch
new file mode 100644
index 0000000000..374136757c
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch
@@ -0,0 +1,57 @@
+From f5108ce0c0f72a285e4cb198426e477295c84517 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 8 Jan 2013 11:55:26 +0200
+Subject: [PATCH] dl: fix dlsym lookups with RTLD_NEXT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The current code for dlsym() when invoked with RTLD_NEXT lookup
+searches for the module where it's being called from, and executes the
+_dl_find_hash only for the next module in the chain. However, if the
+looked symbol is not there, the rest of the modules are not checked.
+
+Generally this is not a problem as symbols are merged for the parent
+modules; so this affects only RTLD_NEXT.
+
+This patch adds a loop iterating through all the following modules.
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Reviewed-by: Filippo ARCIDIACONO <filippo.arcidiacono@st.com>
+Tested-by: Florian Fainelli <florian@openwrt.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ ldso/libdl/libdl.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
+index 51bcf7d..71ade1f 100644
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -671,7 +671,7 @@ static void *do_dlsym(void *vhandle, const char *name, void *caller_address)
+ {
+ 	struct elf_resolve *tpnt, *tfrom;
+ 	struct dyn_elf *handle;
+-	ElfW(Addr) from;
++	ElfW(Addr) from = 0;
+ 	struct dyn_elf *rpnt;
+ 	void *ret;
+ 	struct symbol_ref sym_ref = { NULL, NULL };
+@@ -729,7 +729,13 @@ static void *do_dlsym(void *vhandle, const char *name, void *caller_address)
+ 	tpnt = NULL;
+ 	if (handle == _dl_symbol_tables)
+ 		tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+-	ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++
++	do {
++		ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++		if (ret != NULL)
++			break;
++		handle = handle->next;
++	} while (from && handle);
+ 
+ #if defined(USE_TLS) && USE_TLS && defined SHARED
+ 	if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0029-inet-rpc-fix-build-in-NPTL-case.patch b/package/uclibc/0.9.33.2/uclibc-0029-inet-rpc-fix-build-in-NPTL-case.patch
new file mode 100644
index 0000000000..716052a15d
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0029-inet-rpc-fix-build-in-NPTL-case.patch
@@ -0,0 +1,58 @@
+From 3a732cacd650bd39d86ac13ba0f57eee0df82d5a Mon Sep 17 00:00:00 2001
+From: Carmelo Amoroso <carmelo.amoroso@st.com>
+Date: Wed, 14 Mar 2012 15:21:36 +0100
+Subject: [PATCH] inet:rpc: fix build in !NPTL case
+
+__libc_once is not available / needed when multithreading support
+is not enabled, so authnone_create() calls authnone_create_once()
+directly.
+When LT.{old,new} is used instead of NPTL, it needs to explicitly
+include <bits/libc-lock.h> to get __libc_once to be visible.
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libc/inet/rpc/auth_none.c   |    6 ++++++
+ libc/inet/rpc/rpc_private.h |    1 +
+ 2 files changed, 7 insertions(+)
+
+diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
+index d066f6b..70bee5b 100644
+--- a/libc/inet/rpc/auth_none.c
++++ b/libc/inet/rpc/auth_none.c
+@@ -68,7 +68,9 @@ struct authnone_private_s {
+ };
+ 
+ static struct authnone_private_s authnone_private;
++#ifdef __UCLIBC_HAS_THREADS__
+ __libc_once_define(static, authnone_private_guard);
++#endif
+ 
+ static void authnone_create_once (void);
+ 
+@@ -95,7 +97,11 @@ authnone_create_once (void)
+ AUTH *
+ authnone_create (void)
+ {
++#ifdef __UCLIBC_HAS_THREADS__
+   __libc_once (authnone_private_guard, authnone_create_once);
++#else
++  authnone_create_once();
++#endif
+   return &authnone_private.no_client;
+ }
+ libc_hidden_def(authnone_create)
+diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h
+index e1214d2..38ade1c 100644
+--- a/libc/inet/rpc/rpc_private.h
++++ b/libc/inet/rpc/rpc_private.h
+@@ -12,6 +12,7 @@ extern u_long _create_xid (void) attribute_hidden;
+  */
+ #ifdef __UCLIBC_HAS_THREADS__
+ #include <pthread.h>
++#include <bits/libc-lock.h>
+ struct rpc_thread_variables {
+ 	fd_set		svc_fdset_s;		/* Global, rpc_common.c */
+ 	struct rpc_createerr rpc_createerr_s;	/* Global, rpc_common.c */
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0030-stdio-implement-assignment-allocation-m-character.patch b/package/uclibc/0.9.33.2/uclibc-0030-stdio-implement-assignment-allocation-m-character.patch
new file mode 100644
index 0000000000..42a27372da
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0030-stdio-implement-assignment-allocation-m-character.patch
@@ -0,0 +1,190 @@
+From 050cd6971f92c2337bc506043dfcf1395dd5d622 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 6 May 2012 03:50:44 -0400
+Subject: [PATCH] stdio: implement assignment-allocation "m" character
+
+The latest POSIX spec introduces a "m" character to allocate buffers for
+the user when using scanf type functions.  This is like the old glibc "a"
+flag, but now standardized.  With packages starting to use these, we need
+to implement it.
+
+for example:
+	char *s;
+	sscanf("foo", "%ms", &s);
+	printf("%s\n", s);
+	free(s);
+This will automatically allocate storage for "s", read in "foo" to it,
+and then display it.
+
+I'm not terribly familiar with the stdio layer, so this could be wrong.
+But it seems to work for me.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ extra/Configs/Config.in |   13 ---------
+ libc/stdio/_scanf.c     |   68 +++++++++++++++++++++++++++--------------------
+ 2 files changed, 39 insertions(+), 42 deletions(-)
+
+diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
+index 1060729..c2f2fc7 100644
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -1590,19 +1590,6 @@ config UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS
+ 
+ 	  Most people will answer 9.
+ 
+-
+-config UCLIBC_HAS_SCANF_GLIBC_A_FLAG
+-	bool "Support glibc's 'a' flag for scanf string conversions (not implemented)"
+-	help
+-	  NOTE!!!  Currently Not Implemented!!! Just A Place Holder!!  NOTE!!!
+-	  NOTE!!!  Conflicts with an ANSI/ISO C99 scanf flag!!         NOTE!!!
+-
+-	  Answer Y to enable support for glibc's 'a' flag for the scanf string
+-	  conversions '%s', '%[', '%ls', '%l[', and '%S'.  This is used to
+-	  auto-allocate sufficient memory to hold the data retrieved.
+-
+-	  Most people will answer N.
+-
+ choice
+ 	prompt "Stdio buffer size"
+ 	default UCLIBC_HAS_STDIO_BUFSIZ_4096
+diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
+index f38e72b..952853c 100644
+--- a/libc/stdio/_scanf.c
++++ b/libc/stdio/_scanf.c
+@@ -77,14 +77,6 @@
+ #include <bits/uClibc_fpmax.h>
+ #endif /* __UCLIBC_HAS_FLOATS__ */
+ 
+-#ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#ifdef L_vfscanf
+-/* only emit this once */
+-#warning Forcing undef of __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__ until implemented!
+-#endif
+-#undef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#endif
+-
+ #undef __STDIO_HAS_VSSCANF
+ #if defined(__STDIO_BUFFERS) || !defined(__UCLIBC_HAS_WCHAR__) || defined(__UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__)
+ #define __STDIO_HAS_VSSCANF 1
+@@ -433,8 +425,9 @@ libc_hidden_def(vswscanf)
+ 
+ 
+ /* float layout          0123456789012345678901  repeat n for "l[" */
+-#define SPEC_CHARS		"npxXoudifFeEgGaACSncs["
+-/*                       npxXoudif eEgG  CS cs[ */
++#define SPEC_CHARS		"npxXoudifFeEgGaACSnmcs["
++/*                       npxXoudif eEgG  CS  cs[ */
++/* NOTE: the 'm' flag must come before any convs that support it */
+ 
+ /* NOTE: Ordering is important!  In particular, CONV_LEFTBRACKET
+  * must immediately precede CONV_c. */
+@@ -444,7 +437,7 @@ enum {
+ 	CONV_p,
+ 	CONV_x, CONV_X,	CONV_o,	CONV_u,	CONV_d,	CONV_i,
+ 	CONV_f, CONV_F, CONV_e, CONV_E, CONV_g, CONV_G, CONV_a, CONV_A,
+-	CONV_C, CONV_S, CONV_LEFTBRACKET, CONV_c, CONV_s, CONV_leftbracket,
++	CONV_C, CONV_S, CONV_LEFTBRACKET, CONV_m, CONV_c, CONV_s, CONV_leftbracket,
+ 	CONV_percent, CONV_whitespace /* not in SPEC_* and no flags */
+ };
+ 
+@@ -474,7 +467,7 @@ enum {
+ 	FLAG_SURPRESS   =   0x10,	/* MUST BE 1ST!!  See DO_FLAGS. */
+ 	FLAG_THOUSANDS	=	0x20,
+ 	FLAG_I18N		=	0x40,	/* only works for d, i, u */
+-	FLAG_MALLOC     =   0x80,	/* only works for s, S, and [ (and l[)*/
++	FLAG_MALLOC     =   0x80,	/* only works for c, s, S, and [ (and l[)*/
+ };
+ 
+ 
+@@ -491,7 +484,7 @@ enum {
+ 	/* fFeEgGaA */	(0x0c|FLAG_SURPRESS|FLAG_THOUSANDS|FLAG_I18N), \
+ 	/* C */			(   0|FLAG_SURPRESS), \
+ 	/* S and l[ */	(   0|FLAG_SURPRESS|FLAG_MALLOC), \
+-	/* c */			(0x04|FLAG_SURPRESS), \
++	/* c */			(0x04|FLAG_SURPRESS|FLAG_MALLOC), \
+ 	/* s and [ */	(0x04|FLAG_SURPRESS|FLAG_MALLOC), \
+ }
+ 
+@@ -904,17 +897,17 @@ int attribute_hidden __psfs_parse_spec(register psfs_t *psfs)
+ 		if (*psfs->fmt == *p) {
+ 			int p_m_spec_chars = p - spec_chars;
+ 
+-#ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#error implement gnu a flag
+-			if ((*p == 'a')
+-				&& ((psfs->fmt[1] == '[') || ((psfs->fmt[1]|0x20) == 's'))
+-				) {		/* Assumes ascii for 's' and 'S' test. */
+-				psfs->flags |= FLAG_MALLOC;
++			if (*p == 'm' &&
++				(psfs->fmt[1] == '[' || psfs->fmt[1] == 'c' ||
++				 /* Assumes ascii for 's' and 'S' test. */
++				 (psfs->fmt[1] | 0x20) == 's'))
++			{
++				if (psfs->store)
++					psfs->flags |= FLAG_MALLOC;
+ 				++psfs->fmt;
+ 				++p;
+-				continue; /* The related conversions follow 'a'. */
++				continue; /* The related conversions follow 'm'. */
+ 			}
+-#endif /* __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__ */
+ 
+ 			for (p = spec_ranges; p_m_spec_chars > *p ; ++p) {}
+ 			if (((psfs->dataargtype >> 8) | psfs->flags)
+@@ -1265,12 +1258,6 @@ int VFSCANF (FILE *__restrict fp, const Wchar *__restrict format, va_list arg)
+ 				while (*wf && __isascii(*wf) && (b < buf + sizeof(buf) - 1)) {
+ 					*b++ = *wf++;
+ 				}
+-#ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#error this is wrong... we need to ched in __psfs_parse_spec instead since this checks last char in buffer and conversion my have stopped before it.
+-				if ((*b == 'a') && ((*wf == '[') || ((*wf|0x20) == 's'))) {
+-					goto DONE;	/* Spec was excessively long. */
+-				}
+-#endif /* __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__ */
+ 				*b = 0;
+ 				if (b == buf) { /* Bad conversion specifier! */
+ 					goto DONE;
+@@ -1390,13 +1377,36 @@ int VFSCANF (FILE *__restrict fp, const Wchar *__restrict format, va_list arg)
+ 				}
+ 
+ 				if (psfs.conv_num == CONV_s) {
++					/* We might have to handle the allocation ourselves */
++					int len;
++					/* With 'm', we actually got a pointer to a pointer */
++					unsigned char **ptr = (void *)b;
++
++					i = 0;
++					if (psfs.flags & FLAG_MALLOC) {
++						len = 0;
++						b = NULL;
++					} else
++						len = -1;
++
+ 					/* Yes, believe it or not, a %s conversion can store nuls. */
+ 					while ((__scan_getc(&sc) >= 0) && !isspace(sc.cc)) {
+ 						zero_conversions = 0;
+-						*b = sc.cc;
+-						b += psfs.store;
++						if (i == len) {
++							/* Pick a size that won't trigger a lot of
++							 * mallocs early on ... */
++							len += 256;
++							b = realloc(b, len + 1);
++						}
++						b[i] = sc.cc;
++						i += psfs.store;
+ 						fail = 0;
+ 					}
++
++					if (psfs.flags & FLAG_MALLOC)
++						*ptr = b;
++					/* The code below takes care of terminating NUL */
++					b += i;
+ 				} else {
+ #ifdef __UCLIBC_HAS_WCHAR__
+ 					assert((psfs.conv_num == CONV_LEFTBRACKET) || \
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0031-mmap-sys_mmap2-do-unsigned-shift-of-offset.patch b/package/uclibc/0.9.33.2/uclibc-0031-mmap-sys_mmap2-do-unsigned-shift-of-offset.patch
new file mode 100644
index 0000000000..475dcfdea7
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0031-mmap-sys_mmap2-do-unsigned-shift-of-offset.patch
@@ -0,0 +1,35 @@
+From 569d1423ac2b585b5cb38bee545b5e0ae2bd7f67 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Thu, 17 May 2012 12:42:54 +0100
+Subject: [PATCH] mmap()->sys_mmap2: do unsigned shift of offset
+
+Fix the implementation of mmap based on the mmap2 system call, to
+construct pgoffset from offset with an unsigned shift rather than a
+signed (off_t) shift. The mmap2 test in the testsuite catches this case
+by mmap'ing with a large offset (with the sign bit set). The signed
+shift repeats the sign bit making the page shift way out of range. This
+is already fixed similarly in mmap64().
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libc/sysdeps/linux/common/mmap.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c
+index 8995898..d53eabb 100644
+--- a/libc/sysdeps/linux/common/mmap.c
++++ b/libc/sysdeps/linux/common/mmap.c
+@@ -63,7 +63,8 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offs
+ 		__set_errno(EINVAL);
+ 		return MAP_FAILED;
+ 	}
+-	return __syscall_mmap2(addr, len, prot, flags, fd, offset >> MMAP2_PAGE_SHIFT);
++	return __syscall_mmap2(addr, len, prot, flags,
++	                       fd, ((__u_long) offset >> MMAP2_PAGE_SHIFT));
+ }
+ 
+ libc_hidden_def(mmap)
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0032-pread-pwrite-handle-renamed-syscalls-in-common-ppc-x.patch b/package/uclibc/0.9.33.2/uclibc-0032-pread-pwrite-handle-renamed-syscalls-in-common-ppc-x.patch
new file mode 100644
index 0000000000..6e6d88131b
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0032-pread-pwrite-handle-renamed-syscalls-in-common-ppc-x.patch
@@ -0,0 +1,114 @@
+From 923e6f201b1d792cf069ca7f13c3715f4e9c9353 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 30 May 2012 01:15:03 -0400
+Subject: [PATCH] pread/pwrite: handle renamed syscalls in common/ppc/xtensa
+ code
+
+Some arches got this fix, but many did not.  So copy the ifdef logic to
+the ones that missed it to fix behavior in linux-2.6+.
+
+URL: https://bugs.busybox.net/show_bug.cgi?id=5258
+Reported-by: David Laight <david.laight@aculab.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libc/sysdeps/linux/common/pread_write.c  |   12 +++++++++++-
+ libc/sysdeps/linux/powerpc/pread_write.c |   13 +++++++++++++
+ libc/sysdeps/linux/xtensa/pread_write.c  |   14 ++++++++++++++
+ 3 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
+index c142038..b13de66 100644
+--- a/libc/sysdeps/linux/common/pread_write.c
++++ b/libc/sysdeps/linux/common/pread_write.c
+@@ -35,6 +35,11 @@ extern __typeof(pread64) __libc_pread64;
+ extern __typeof(pwrite64) __libc_pwrite64;
+ #endif
+ 
++#ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
++# undef __NR_pread
++# define __NR_pread __NR_pread64
++#endif
++
+ #include <bits/kernel_types.h>
+ 
+ # define __NR___syscall_pread __NR_pread64
+@@ -64,7 +69,12 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)
+ weak_alias(__libc_pread64,pread64)
+ # endif /* __UCLIBC_HAS_LFS__  */
+ 
+-# define __NR___syscall_pwrite __NR_pwrite64
++#ifdef __NR_pwrite64             /* Newer kernels renamed but it's the same.  */
++# undef __NR_pwrite
++# define __NR_pwrite __NR_pwrite64
++#endif
++
++# define __NR___syscall_pwrite __NR_pwrite
+ static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf,
+ 		size_t, count, off_t, offset_hi, off_t, offset_lo)
+ 
+diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c
+index 7f988d3..23f256f 100644
+--- a/libc/sysdeps/linux/powerpc/pread_write.c
++++ b/libc/sysdeps/linux/powerpc/pread_write.c
+@@ -20,6 +20,13 @@
+ # define off64_t off_t
+ #endif
+ 
++#ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
++# ifdef __NR_pread
++#  error "__NR_pread and __NR_pread64 both defined???"
++# endif
++# define __NR_pread __NR_pread64
++#endif
++
+ #ifdef __NR_pread
+ extern __typeof(pread) __libc_pread;
+ # define __NR___syscall_pread __NR_pread
+@@ -42,6 +49,12 @@ weak_alias(__libc_pread64,pread64)
+ # endif /* __UCLIBC_HAS_LFS__  */
+ #endif /* __NR_pread */
+ 
++#ifdef __NR_pwrite64            /* Newer kernels renamed but it's the same.  */
++# ifdef __NR_pwrite
++#  error "__NR_pwrite and __NR_pwrite64 both defined???"
++# endif
++# define __NR_pwrite __NR_pwrite64
++#endif
+ 
+ #ifdef __NR_pwrite
+ extern __typeof(pwrite) __libc_pwrite;
+diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c
+index 71ba22b..bcf7dee 100644
+--- a/libc/sysdeps/linux/xtensa/pread_write.c
++++ b/libc/sysdeps/linux/xtensa/pread_write.c
+@@ -27,6 +27,13 @@ extern __typeof(pwrite64) __libc_pwrite64;
+ 
+ #include <bits/kernel_types.h>
+ 
++#ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
++# ifdef __NR_pread
++#  error "__NR_pread and __NR_pread64 both defined???"
++# endif
++# define __NR_pread __NR_pread64
++#endif
++
+ #ifdef __NR_pread
+ 
+ # define __NR___syscall_pread __NR_pread
+@@ -52,6 +59,13 @@ weak_alias(__libc_pread64,pread64)
+ 
+ #endif /* __NR_pread */
+ 
++#ifdef __NR_pwrite64            /* Newer kernels renamed but it's the same.  */
++# ifdef __NR_pwrite
++#  error "__NR_pwrite and __NR_pwrite64 both defined???"
++# endif
++# define __NR_pwrite __NR_pwrite64
++#endif
++
+ #ifdef __NR_pwrite
+ 
+ # define __NR___syscall_pwrite __NR_pwrite
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0033-rpmatch-backport-function.patch b/package/uclibc/0.9.33.2/uclibc-0033-rpmatch-backport-function.patch
new file mode 100644
index 0000000000..6a74d78f68
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0033-rpmatch-backport-function.patch
@@ -0,0 +1,78 @@
+From 929b1a121c5ff0daa33b2107b4c1a68b650d93ee Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 30 Apr 2012 00:40:49 -0400
+Subject: [PATCH] rpmatch: backport function
+
+rpmatch will match ^[Yy] and ^[Nn] regardless of locale
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/stdlib.h        |    2 +-
+ libc/stdlib/Makefile.in |    2 +-
+ libc/stdlib/rpmatch.c   |    7 +++++++
+ libc/stdlib/stdlib.c    |    8 ++++++++
+ 4 files changed, 17 insertions(+), 2 deletions(-)
+ create mode 100644 libc/stdlib/rpmatch.c
+
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 4aa1227..42b585c 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -851,7 +851,7 @@ __END_NAMESPACE_STD
+ #endif /* __UCLIBC_HAS_WCHAR__ */
+ 
+ 
+-#if 0 /*def __USE_SVID*/
++#ifdef __USE_SVID
+ /* Determine whether the string value of RESPONSE matches the affirmation
+    or negative response expression as specified by the LC_MESSAGES category
+    in the program's current locale.  Returns 1 if affirmative, 0 if
+diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
+index f219d21..e802441 100644
+--- a/libc/stdlib/Makefile.in
++++ b/libc/stdlib/Makefile.in
+@@ -33,7 +33,7 @@ endif
+ 
+ # multi source stdlib.c
+ CSRC-y += abs.c labs.c atoi.c atol.c strtol.c strtoul.c _stdlib_strto_l.c \
+-	qsort.c qsort_r.c bsearch.c \
++	qsort.c qsort_r.c bsearch.c rpmatch.c \
+ 	llabs.c atoll.c strtoll.c strtoull.c _stdlib_strto_ll.c
+ # (aliases) strtoq.o strtouq.o
+ CSRC-$(UCLIBC_HAS_FLOATS) += atof.c
+diff --git a/libc/stdlib/rpmatch.c b/libc/stdlib/rpmatch.c
+new file mode 100644
+index 0000000..dce06b6
+--- /dev/null
++++ b/libc/stdlib/rpmatch.c
+@@ -0,0 +1,7 @@
++/* Copyright (C) 2012 Bernhard Reutner-Fischer <uclibc@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1+, see the file COPYING.LIB in this tarball.
++ */
++
++#define L_rpmatch
++#include "stdlib.c"
+diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
+index 9e8c347..de8f084 100644
+--- a/libc/stdlib/stdlib.c
++++ b/libc/stdlib/stdlib.c
+@@ -318,6 +318,14 @@ long long atoll(const char *nptr)
+ 
+ #endif
+ /**********************************************************************/
++#ifdef L_rpmatch
++int rpmatch (__const char *__response)
++{
++	return (__response[0] == 'y' || __response[0] == 'Y') ? 1 :
++		(__response[0] == 'n' || __response[0] == 'N') ? 0 : -1;
++}
++#endif
++/**********************************************************************/
+ #if defined(L_strtol) || defined(L_strtol_l)
+ 
+ libc_hidden_proto(__XL_NPP(strtol))
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0034-statfs-support-f_frsize.patch b/package/uclibc/0.9.33.2/uclibc-0034-statfs-support-f_frsize.patch
new file mode 100644
index 0000000000..102c5e815b
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0034-statfs-support-f_frsize.patch
@@ -0,0 +1,189 @@
+From 479f8407c4822d2b872afb8bb14e5ab596714744 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Thu, 17 Jan 2013 22:44:00 +0100
+Subject: [PATCH] statfs: support f_frsize
+
+closes bugzilla #5834
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/misc/statfs/fstatfs64.c        |    3 +++
+ libc/misc/statfs/internal_statvfs.c |    8 ++++++--
+ libc/misc/statfs/statfs64.c         |    3 +++
+ test/.gitignore                     |    3 +++
+ test/misc/Makefile.in               |    6 ++++++
+ test/misc/tst-statfs.c              |   33 +++++++++++++++++++++++++++++++++
+ test/misc/tst-statvfs.c             |   28 ++++++++++++++++++++++++++++
+ 7 files changed, 82 insertions(+), 2 deletions(-)
+ create mode 100644 test/misc/tst-statfs.c
+ create mode 100644 test/misc/tst-statvfs.c
+
+diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c
+index 27bb8d6..42df1ae 100644
+--- a/libc/misc/statfs/fstatfs64.c
++++ b/libc/misc/statfs/fstatfs64.c
+@@ -43,6 +43,9 @@ int fstatfs64 (int fd, struct statfs64 *buf)
+     buf->f_files = buf32.f_files;
+     buf->f_ffree = buf32.f_ffree;
+     buf->f_fsid = buf32.f_fsid;
++#ifdef _STATFS_F_FRSIZE
++    buf->f_frsize = buf32.f_frsize;
++#endif
+     buf->f_namelen = buf32.f_namelen;
+     memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
+ 
+diff --git a/libc/misc/statfs/internal_statvfs.c b/libc/misc/statfs/internal_statvfs.c
+index 6075e9c..c1862b5 100644
+--- a/libc/misc/statfs/internal_statvfs.c
++++ b/libc/misc/statfs/internal_statvfs.c
+@@ -19,8 +19,12 @@
+ 
+   /* Now fill in the fields we have information for.  */
+   buf->f_bsize = fsbuf.f_bsize;
+-  /* Linux does not support f_frsize, so set it to the full block size.  */
++#ifdef _STATFS_F_FRSIZE
++  buf->f_frsize = fsbuf.f_frsize;
++#else
++  /* No support for f_frsize so set it to the full block size.  */
+   buf->f_frsize = fsbuf.f_bsize;
++#endif
+   buf->f_blocks = fsbuf.f_blocks;
+   buf->f_bfree = fsbuf.f_bfree;
+   buf->f_bavail = fsbuf.f_bavail;
+@@ -39,7 +43,7 @@
+   buf->__f_unused = 0;
+ #endif
+   buf->f_namemax = fsbuf.f_namelen;
+-  memset (buf->__f_spare, '\0', 6 * sizeof (int));
++  memset (buf->__f_spare, '\0', sizeof(buf->__f_spare));
+ 
+   /* What remains to do is to fill the fields f_favail and f_flag.  */
+ 
+diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c
+index 0cc8595..35329bd 100644
+--- a/libc/misc/statfs/statfs64.c
++++ b/libc/misc/statfs/statfs64.c
+@@ -42,6 +42,9 @@ int statfs64 (const char *file, struct statfs64 *buf)
+     buf->f_ffree = buf32.f_ffree;
+     buf->f_fsid = buf32.f_fsid;
+     buf->f_namelen = buf32.f_namelen;
++#ifdef _STATFS_F_FRSIZE
++    buf->f_frsize = buf32.f_frsize;
++#endif
+     memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
+ 
+     return 0;
+diff --git a/test/.gitignore b/test/.gitignore
+index c892816..7234c48 100644
+--- a/test/.gitignore
++++ b/test/.gitignore
+@@ -148,6 +148,8 @@ misc/sem
+ misc/stdarg
+ misc/tst-scandir
+ misc/tst-seekdir
++misc/tst-statfs
++misc/tst-statvfs
+ misc/tst-utmp
+ mmap/mmap
+ mmap/mmap2
+@@ -254,6 +256,7 @@ stdio/64bit
+ stdio/fclose-loop
+ stdlib/ptytest
+ stdlib/qsort
++stdlib/testarc4random
+ stdlib/testatexit
+ stdlib/test-canon
+ stdlib/test-canon2
+diff --git a/test/misc/Makefile.in b/test/misc/Makefile.in
+index 2263211..9b74d22 100644
+--- a/test/misc/Makefile.in
++++ b/test/misc/Makefile.in
+@@ -9,6 +9,12 @@ CFLAGS_dirent64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS
+ 
+ DODIFF_dirent    := 1
+ DODIFF_dirent64  := 1
++DODIFF_tst-statfs := 1
++DODIFF_tst-statvfs := 1
+ 
+ OPTS_bug-glob1   := $(PWD)
+ OPTS_tst-fnmatch := < tst-fnmatch.input
++
++MNTENTS = $(shell mount | while read dev on mp rest; do echo $$mp; done)
++OPTS_tst-statfs := $(MNTENTS)
++OPTS_tst-statvfs := $(MNTENTS)
+diff --git a/test/misc/tst-statfs.c b/test/misc/tst-statfs.c
+new file mode 100644
+index 0000000..44ab3aa
+--- /dev/null
++++ b/test/misc/tst-statfs.c
+@@ -0,0 +1,33 @@
++#define _FILE_OFFSET_BITS 64
++
++#include <sys/vfs.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++int
++main(int argc, char* argv[])
++{
++	struct statfs s;
++	int ret = 0, i;
++
++	for (i = 1; i < argc; i++) {
++		if (statfs(argv[i], &s) != 0) {
++			fprintf(stderr, "%s: %s: statfs failed. %s\n",
++				*argv, argv[i], strerror(errno));
++			exit(EXIT_FAILURE);
++		}
++		++ret;
++		printf("statfs %s:\n\tblocks=%lld\n\tblkfree=%lld\n\tbsize=%d\n",
++			argv[i], s.f_blocks, s.f_bfree, s.f_bsize);
++#ifdef _STATFS_F_FRSIZE
++		printf("\tfrsize=%lld\n", s.f_frsize);
++#elif defined __mips__
++		printf("\tfrsize=mips, unsupported?\n");
++#else
++# error no _STATFS_F_FRSIZE
++#endif
++	}
++	exit(ret ? EXIT_SUCCESS : EXIT_FAILURE);
++}
+diff --git a/test/misc/tst-statvfs.c b/test/misc/tst-statvfs.c
+new file mode 100644
+index 0000000..c1e8fde
+--- /dev/null
++++ b/test/misc/tst-statvfs.c
+@@ -0,0 +1,28 @@
++#define _FILE_OFFSET_BITS 64
++
++#include <sys/statvfs.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++int
++main(int argc, char* argv[])
++{
++	struct statvfs s;
++	int i;
++
++	for (i = 1; i < argc; i++) {
++		if (statvfs(argv[i], &s) != 0) {
++			fprintf(stderr, "%s: %s: statvfs failed. %s\n",
++				*argv, argv[i], strerror(errno));
++			exit(EXIT_FAILURE);
++		}
++		printf("statvfs %s:\n\tblocks=%lld\n\tblkfree=%lld\n\tbsize=%d\n",
++			argv[i], s.f_blocks, s.f_bfree, s.f_bsize);
++#if 1 // def _STATFS_F_FRSIZE
++		printf("\tfrsize=%lld\n", s.f_frsize);
++#endif
++	}
++	exit(EXIT_SUCCESS);
++}
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0035-socket.h-pull-socket_type.h-from-eglibc.patch b/package/uclibc/0.9.33.2/uclibc-0035-socket.h-pull-socket_type.h-from-eglibc.patch
new file mode 100644
index 0000000000..1bea7fb259
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0035-socket.h-pull-socket_type.h-from-eglibc.patch
@@ -0,0 +1,1374 @@
+From 8eccce991d08960d135b97066621c8d3248a79b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Thu, 17 Jan 2013 19:29:22 +0100
+Subject: [PATCH] socket.h: pull socket_type.h from eglibc
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ Makefile.in                                      |    2 +-
+ libc/inet/opensock.c                             |    9 +-
+ libc/sysdeps/linux/alpha/bits/socket_type.h      |   54 ++++
+ libc/sysdeps/linux/common/bits/kernel-features.h |   10 +-
+ libc/sysdeps/linux/common/bits/socket.h          |  104 +++---
+ libc/sysdeps/linux/common/bits/socket_type.h     |   54 ++++
+ libc/sysdeps/linux/common/cmsg_nxthdr.c          |    1 +
+ libc/sysdeps/linux/hppa/bits/socket_type.h       |   54 ++++
+ libc/sysdeps/linux/mips/bits/socket.h            |  369 ---------------------
+ libc/sysdeps/linux/mips/bits/socket_type.h       |   55 ++++
+ libc/sysdeps/linux/sparc/bits/socket.h           |  376 ----------------------
+ libc/sysdeps/linux/sparc/bits/socket_type.h      |   54 ++++
+ 12 files changed, 325 insertions(+), 817 deletions(-)
+ create mode 100644 libc/sysdeps/linux/alpha/bits/socket_type.h
+ create mode 100644 libc/sysdeps/linux/common/bits/socket_type.h
+ create mode 100644 libc/sysdeps/linux/hppa/bits/socket_type.h
+ delete mode 100644 libc/sysdeps/linux/mips/bits/socket.h
+ create mode 100644 libc/sysdeps/linux/mips/bits/socket_type.h
+ delete mode 100644 libc/sysdeps/linux/sparc/bits/socket.h
+ create mode 100644 libc/sysdeps/linux/sparc/bits/socket_type.h
+
+diff --git a/Makefile.in b/Makefile.in
+index 87b8e4b..69abfaf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -255,7 +255,7 @@ HEADERS_RM-$(UCLIBC_HAS_REALTIME)            += mqueue.h bits/mqueue.h sched.h \
+ HEADERS_RM-$(UCLIBC_HAS_REGEX)               += regex.h regexp.h
+ HEADERS_RM-$(UCLIBC_HAS_RPC)                 += rpc
+ HEADERS_RM-$(UCLIBC_HAS_SHADOW)              += shadow.h
+-HEADERS_RM-$(UCLIBC_HAS_SOCKET)              += sys/socket.h bits/socket.h sys/socketvar.h
++HEADERS_RM-$(UCLIBC_HAS_SOCKET)              += sys/socket.h bits/socket.h sys/socketvar.h bits/socket_type.h
+ HEADERS_RM-$(UCLIBC_HAS_SYSLOG)              += syslog.h sys/syslog.h bits/syslog*.h
+ HEADERS_RM-$(UCLIBC_HAS_THREADS)             += *thread*.h semaphore.h \
+ 	bits/*thread*.h \
+diff --git a/libc/inet/opensock.c b/libc/inet/opensock.c
+index 86f8c59..da5858f 100644
+--- a/libc/inet/opensock.c
++++ b/libc/inet/opensock.c
+@@ -16,14 +16,11 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
+-#include <assert.h>
+-#include <errno.h>
+-#include <stdio.h>
+-#include <string.h>
+-#include <unistd.h>
+-#include <sys/socket.h>
++
+ #include <features.h>
+ #include <libc-internal.h>
++#include <sys/socket.h>
++#include <bits/kernel-features.h>
+ 
+ /* Return a socket of any type.  The socket can be used in subsequent
+    ioctl calls to talk to the kernel.  */
+diff --git a/libc/sysdeps/linux/alpha/bits/socket_type.h b/libc/sysdeps/linux/alpha/bits/socket_type.h
+new file mode 100644
+index 0000000..ee55d66
+--- /dev/null
++++ b/libc/sysdeps/linux/alpha/bits/socket_type.h
+@@ -0,0 +1,54 @@
++/* Define enum __socket_type for Linux/Alpha.
++   Copyright (C) 1991-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _SYS_SOCKET_H
++# error "Never include <bits/socket_type.h> directly; use <sys/socket.h> instead."
++#endif
++
++/* Types of sockets.  */
++enum __socket_type
++{
++  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
++				   byte streams.  */
++#define SOCK_STREAM SOCK_STREAM
++  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
++				   of fixed maximum length.  */
++#define SOCK_DGRAM SOCK_DGRAM
++  SOCK_RAW = 3,			/* Raw protocol interface.  */
++#define SOCK_RAW SOCK_RAW
++  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
++#define SOCK_RDM SOCK_RDM
++  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
++				   datagrams of fixed maximum length.  */
++#define SOCK_SEQPACKET SOCK_SEQPACKET
++  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
++#define SOCK_DCCP SOCK_DCCP
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
++				   at the dev level.  For writing rarp and
++				   other similar things on the user level. */
++#define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair.  */
++
++  SOCK_CLOEXEC = 010000000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 0x40000000	/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
++};
+diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
+index 5ea85d2..5665e24 100644
+--- a/libc/sysdeps/linux/common/bits/kernel-features.h
++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
+@@ -311,17 +311,19 @@
+ 
+ /* Support for various CLOEXEC and NONBLOCK flags was added for x86,
+  *    x86-64, PPC, IA-64, and SPARC in 2.6.27.  */
+-#if __LINUX_KERNEL_VERSION >= 0x02061b \
+-    && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
+-        || defined __ia64__ || defined __sparc__ || defined __s390__)
++#if (__LINUX_KERNEL_VERSION >= 0x02061b \
++     && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
++         || defined __ia64__ || defined __sparc__ || defined __s390__) \
++	) || (__LINUX_KERNEL_VERSION >= 0x020621 && defined __alpha__) \
++	|| defined __aarch64__ || defined __tile__
+ /* # define __ASSUME_SOCK_CLOEXEC  1 */
+ /* # define __ASSUME_IN_NONBLOCK   1 */
+ # define __ASSUME_PIPE2         1
+ /* # define __ASSUME_EVENTFD2      1 */
+ /* # define __ASSUME_SIGNALFD4     1 */
++/* # define __ASSUME_DUP3		1 */
+ #endif
+ 
+-
+ /* These features were surely available with 2.4.12.  */
+ #if __LINUX_KERNEL_VERSION >= 132108 && defined __mc68000__
+ # define __ASSUME_MMAP2_SYSCALL		1
+diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
+index 7e12733..6a89340 100644
+--- a/libc/sysdeps/linux/common/bits/socket.h
++++ b/libc/sysdeps/linux/common/bits/socket.h
+@@ -1,5 +1,6 @@
+ /* System-specific socket constants and types.  Linux version.
+-   Copyright (C) 1991,1992,1994-2001,2004,2006 Free Software Foundation, Inc.
++   Copyright (C) 1991,1992,1994-2001,2004,2006-2012
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,12 +21,11 @@
+ #ifndef __BITS_SOCKET_H
+ #define __BITS_SOCKET_H
+ 
+-#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H
++#ifndef _SYS_SOCKET_H
+ # error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
+ #endif
+ 
+ #define	__need_size_t
+-#define __need_NULL
+ #include <stddef.h>
+ 
+ #include <limits.h>
+@@ -37,37 +37,8 @@ typedef __socklen_t socklen_t;
+ # define __socklen_t_defined
+ #endif
+ 
+-/* Types of sockets.  */
+-enum __socket_type
+-{
+-  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
+-				   byte streams.  */
+-#define SOCK_STREAM SOCK_STREAM
+-  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
+-				   of fixed maximum length.  */
+-#define SOCK_DGRAM SOCK_DGRAM
+-  SOCK_RAW = 3,			/* Raw protocol interface.  */
+-#define SOCK_RAW SOCK_RAW
+-  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+-#define SOCK_RDM SOCK_RDM
+-  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
+-				   datagrams of fixed maximum length.  */
+-#define SOCK_SEQPACKET SOCK_SEQPACKET
+-  SOCK_PACKET = 10,		/* Linux specific way of getting packets
+-				   at the dev level.  For writing rarp and
+-				   other similar things on the user level. */
+-#define SOCK_PACKET SOCK_PACKET
+-
+-  /* Flags to be ORed into the type parameter of socket and socketpair and
+-     used for the flags parameter of paccept.  */
+-
+-  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
+-				   new descriptor(s).  */
+-#define SOCK_CLOEXEC SOCK_CLOEXEC
+-  SOCK_NONBLOCK = 04000		/* Atomically mark descriptor(s) as
+-				   non-blocking.  */
+-#define SOCK_NONBLOCK SOCK_NONBLOCK
+-};
++/* Get the architecture-dependent definition of enum __socket_type.  */
++#include <bits/socket_type.h>
+ 
+ /* Protocol families.  */
+ #define	PF_UNSPEC	0	/* Unspecified.  */
+@@ -94,22 +65,24 @@ enum __socket_type
+ #define	PF_ASH		18	/* Ash.  */
+ #define	PF_ECONET	19	/* Acorn Econet.  */
+ #define	PF_ATMSVC	20	/* ATM SVCs.  */
++#define PF_RDS		21	/* RDS sockets.  */
+ #define	PF_SNA		22	/* Linux SNA Project */
+ #define	PF_IRDA		23	/* IRDA sockets.  */
+ #define	PF_PPPOX	24	/* PPPoX sockets.  */
+ #define	PF_WANPIPE	25	/* Wanpipe API sockets.  */
+-#define	PF_LLC		26	/* Linux LLC.  */
+-#define	PF_CAN		29	/* Controller Area Network.  */
+-#define	PF_TIPC		30	/* TIPC sockets.  */
++#define PF_LLC		26	/* Linux LLC.  */
++#define PF_CAN		29	/* Controller Area Network.  */
++#define PF_TIPC		30	/* TIPC sockets.  */
+ #define	PF_BLUETOOTH	31	/* Bluetooth sockets.  */
+ #define	PF_IUCV		32	/* IUCV sockets.  */
+-#define	PF_RXRPC	33	/* RxRPC sockets.  */
+-#define	PF_ISDN		34	/* mISDN sockets.  */
+-#define	PF_PHONET	35	/* Phonet sockets.  */
+-#define	PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
+-#define	PF_CAIF		37	/* CAIF sockets.  */
+-#define	PF_ALG		38	/* Algorithm sockets.  */
+-#define	PF_MAX		39	/* For now..  */
++#define PF_RXRPC	33	/* RxRPC sockets.  */
++#define PF_ISDN		34	/* mISDN sockets.  */
++#define PF_PHONET	35	/* Phonet sockets.  */
++#define PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
++#define PF_CAIF		37	/* CAIF sockets.  */
++#define PF_ALG		38	/* Algorithm sockets.  */
++#define PF_NFC		39	/* NFC sockets.  */
++#define	PF_MAX		40	/* For now..  */
+ 
+ /* Address families.  */
+ #define	AF_UNSPEC	PF_UNSPEC
+@@ -136,21 +109,23 @@ enum __socket_type
+ #define	AF_ASH		PF_ASH
+ #define	AF_ECONET	PF_ECONET
+ #define	AF_ATMSVC	PF_ATMSVC
++#define AF_RDS		PF_RDS
+ #define	AF_SNA		PF_SNA
+ #define	AF_IRDA		PF_IRDA
+ #define	AF_PPPOX	PF_PPPOX
+ #define	AF_WANPIPE	PF_WANPIPE
+-#define	AF_LLC		PF_LLC
+-#define	AF_CAN		PF_CAN
+-#define	AF_TIPC		PF_TIPC
++#define AF_LLC		PF_LLC
++#define AF_CAN		PF_CAN
++#define AF_TIPC		PF_TIPC
+ #define	AF_BLUETOOTH	PF_BLUETOOTH
+-#define	AF_IUCV		PF_IUCV
+-#define	AF_RXRPC	PF_RXRPC
+-#define	AF_ISDN		PF_ISDN
+-#define	AF_PHONET	PF_PHONET
+-#define	AF_IEEE802154	PF_IEEE802154
+-#define	AF_CAIF		PF_CAIF
+-#define	AF_ALG		PF_ALG
++#define AF_IUCV		PF_IUCV
++#define AF_RXRPC	PF_RXRPC
++#define AF_ISDN		PF_ISDN
++#define AF_PHONET	PF_PHONET
++#define AF_IEEE802154	PF_IEEE802154
++#define AF_CAIF		PF_CAIF
++#define AF_ALG		PF_ALG
++#define AF_NFC		PF_NFC
+ #define	AF_MAX		PF_MAX
+ 
+ /* Socket level values.  Others are defined in the appropriate headers.
+@@ -235,8 +210,14 @@ enum
+ #define	MSG_ERRQUEUE	MSG_ERRQUEUE
+     MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
+ #define	MSG_NOSIGNAL	MSG_NOSIGNAL
+-    MSG_MORE		= 0x8000  /* Sender will send more.  */
++    MSG_MORE		= 0x8000,  /* Sender will send more.  */
+ #define	MSG_MORE	MSG_MORE
++    MSG_WAITFORONE	= 0x10000, /* Wait for at least one packet to return.*/
++#define MSG_WAITFORONE	MSG_WAITFORONE
++    MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
++					   descriptor received through
++					   SCM_RIGHTS.  */
++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
+   };
+ 
+ 
+@@ -290,7 +271,7 @@ struct cmsghdr
+ #define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
+ #define CMSG_FIRSTHDR(mhdr) \
+   ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
+-   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
++   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
+ #define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
+ 			 & (size_t) ~(sizeof (size_t) - 1))
+ #define CMSG_SPACE(len) (CMSG_ALIGN (len) \
+@@ -302,14 +283,14 @@ extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
+ libc_hidden_proto(__cmsg_nxthdr)
+ #ifdef __USE_EXTERN_INLINES
+ # ifndef _EXTERN_INLINE
+-#  define _EXTERN_INLINE extern __inline
++#  define _EXTERN_INLINE __extern_inline
+ # endif
+ _EXTERN_INLINE struct cmsghdr *
+ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
+ {
+   if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
+     /* The kernel header does this so there may be a reason.  */
+-    return 0;
++    return (struct cmsghdr *) 0;
+ 
+   __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+ 			       + CMSG_ALIGN (__cmsg->cmsg_len));
+@@ -318,7 +299,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
+       || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
+ 	  > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
+     /* No more entries.  */
+-    return 0;
++    return (struct cmsghdr *) 0;
+   return __cmsg;
+ }
+ #endif	/* Use `extern inline'.  */
+@@ -329,20 +310,21 @@ enum
+   {
+     SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
+ #define SCM_RIGHTS SCM_RIGHTS
+-#ifdef __USE_BSD
++#ifdef __USE_GNU
+     , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
+ # define SCM_CREDENTIALS SCM_CREDENTIALS
+ #endif
+   };
+ 
++#ifdef __USE_GNU
+ /* User visible structure for SCM_CREDENTIALS message */
+-
+ struct ucred
+ {
+   pid_t pid;			/* PID of sending process.  */
+   uid_t uid;			/* UID of sending process.  */
+   gid_t gid;			/* GID of sending process.  */
+ };
++#endif
+ 
+ /* Get socket manipulation related informations from kernel headers.  */
+ #ifndef __GLIBC__
+diff --git a/libc/sysdeps/linux/common/bits/socket_type.h b/libc/sysdeps/linux/common/bits/socket_type.h
+new file mode 100644
+index 0000000..65436b0
+--- /dev/null
++++ b/libc/sysdeps/linux/common/bits/socket_type.h
+@@ -0,0 +1,54 @@
++/* Define enum __socket_type for generic Linux.
++   Copyright (C) 1991-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _SYS_SOCKET_H
++# error "Never include <bits/socket_type.h> directly; use <sys/socket.h> instead."
++#endif
++
++/* Types of sockets.  */
++enum __socket_type
++{
++  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
++				   byte streams.  */
++#define SOCK_STREAM SOCK_STREAM
++  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
++				   of fixed maximum length.  */
++#define SOCK_DGRAM SOCK_DGRAM
++  SOCK_RAW = 3,			/* Raw protocol interface.  */
++#define SOCK_RAW SOCK_RAW
++  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
++#define SOCK_RDM SOCK_RDM
++  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
++				   datagrams of fixed maximum length.  */
++#define SOCK_SEQPACKET SOCK_SEQPACKET
++  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
++#define SOCK_DCCP SOCK_DCCP
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
++				   at the dev level.  For writing rarp and
++				   other similar things on the user level. */
++#define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair.  */
++
++  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 00004000	/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
++};
+diff --git a/libc/sysdeps/linux/common/cmsg_nxthdr.c b/libc/sysdeps/linux/common/cmsg_nxthdr.c
+index 0360b47..9c21190 100644
+--- a/libc/sysdeps/linux/common/cmsg_nxthdr.c
++++ b/libc/sysdeps/linux/common/cmsg_nxthdr.c
+@@ -19,6 +19,7 @@
+ 
+ #define __FORCE_GLIBC
+ #include <features.h>
++#include <stddef.h>
+ /* Prevent math.h from defining a colliding inline */
+ #undef __USE_EXTERN_INLINES
+ #include <sys/socket.h>
+diff --git a/libc/sysdeps/linux/hppa/bits/socket_type.h b/libc/sysdeps/linux/hppa/bits/socket_type.h
+new file mode 100644
+index 0000000..c6df6c3
+--- /dev/null
++++ b/libc/sysdeps/linux/hppa/bits/socket_type.h
+@@ -0,0 +1,54 @@
++/* Define enum __socket_type for Linux/HP-PARISC.
++   Copyright (C) 2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _SYS_SOCKET_H
++# error "Never include <bits/socket_type.h> directly; use <sys/socket.h> instead."
++#endif
++
++/* Types of sockets.  */
++enum __socket_type
++{
++  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
++				   byte streams.  */
++#define SOCK_STREAM SOCK_STREAM
++  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
++				   of fixed maximum length.  */
++#define SOCK_DGRAM SOCK_DGRAM
++  SOCK_RAW = 3,			/* Raw protocol interface.  */
++#define SOCK_RAW SOCK_RAW
++  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
++#define SOCK_RDM SOCK_RDM
++  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
++				   datagrams of fixed maximum length.  */
++#define SOCK_SEQPACKET SOCK_SEQPACKET
++  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
++#define SOCK_DCCP SOCK_DCCP
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
++				   at the dev level.  For writing rarp and
++				   other similar things on the user level. */
++#define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair.  */
++
++  SOCK_CLOEXEC = 010000000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 0x40000000	/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
++};
+diff --git a/libc/sysdeps/linux/mips/bits/socket.h b/libc/sysdeps/linux/mips/bits/socket.h
+deleted file mode 100644
+index 27ceafa..0000000
+--- a/libc/sysdeps/linux/mips/bits/socket.h
++++ /dev/null
+@@ -1,369 +0,0 @@
+-/* System-specific socket constants and types.  Linux/MIPS version.
+-   Copyright (C) 1991, 92, 1994-1999, 2000, 2001, 2004, 2005, 2006
+-   Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
+-
+-#ifndef __BITS_SOCKET_H
+-#define __BITS_SOCKET_H
+-
+-#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H
+-# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
+-#endif
+-
+-#define	__need_size_t
+-#define __need_NULL
+-#include <stddef.h>
+-
+-#include <limits.h>
+-#include <sys/types.h>
+-
+-/* Type for length arguments in socket calls.  */
+-#ifndef __socklen_t_defined
+-typedef __socklen_t socklen_t;
+-# define __socklen_t_defined
+-#endif
+-
+-/* Types of sockets.  */
+-enum __socket_type
+-{
+-  SOCK_DGRAM = 1,		/* Connectionless, unreliable datagrams
+-				   of fixed maximum length.  */
+-#define SOCK_DGRAM SOCK_DGRAM
+-  SOCK_STREAM = 2,		/* Sequenced, reliable, connection-based
+-				   byte streams.  */
+-#define SOCK_STREAM SOCK_STREAM
+-  SOCK_RAW = 3,			/* Raw protocol interface.  */
+-#define SOCK_RAW SOCK_RAW
+-  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+-#define SOCK_RDM SOCK_RDM
+-  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
+-				   datagrams of fixed maximum length.  */
+-#define SOCK_SEQPACKET SOCK_SEQPACKET
+-  SOCK_DCCP = 6,
+-#define SOCK_DCCP SOCK_DCCP	/* Datagram Congestion Control Protocol.  */
+-  SOCK_PACKET = 10,		/* Linux specific way of getting packets
+-				   at the dev level.  For writing rarp and
+-				   other similar things on the user level. */
+-#define SOCK_PACKET SOCK_PACKET
+-  /* Flags to be ORed into the type parameter of socket and socketpair and
+-     used for the flags parameter of paccept.  */
+-
+-  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
+-                                   new descriptor(s).  */
+-#define SOCK_CLOEXEC SOCK_CLOEXEC
+-  SOCK_NONBLOCK = 0200		/* Atomically mark descriptor(s) as
+-				   non-blocking.  */
+-#define SOCK_NONBLOCK SOCK_NONBLOCK
+-};
+-
+-/* Protocol families.  */
+-#define	PF_UNSPEC	0	/* Unspecified.  */
+-#define	PF_LOCAL	1	/* Local to host (pipes and file-domain).  */
+-#define	PF_UNIX		PF_LOCAL /* Old BSD name for PF_LOCAL.  */
+-#define	PF_FILE		PF_LOCAL /* Another non-standard name for PF_LOCAL.  */
+-#define	PF_INET		2	/* IP protocol family.  */
+-#define	PF_AX25		3	/* Amateur Radio AX.25.  */
+-#define	PF_IPX		4	/* Novell Internet Protocol.  */
+-#define	PF_APPLETALK	5	/* Appletalk DDP.  */
+-#define	PF_NETROM	6	/* Amateur radio NetROM.  */
+-#define	PF_BRIDGE	7	/* Multiprotocol bridge.  */
+-#define	PF_ATMPVC	8	/* ATM PVCs.  */
+-#define	PF_X25		9	/* Reserved for X.25 project.  */
+-#define	PF_INET6	10	/* IP version 6.  */
+-#define	PF_ROSE		11	/* Amateur Radio X.25 PLP.  */
+-#define	PF_DECnet	12	/* Reserved for DECnet project.  */
+-#define	PF_NETBEUI	13	/* Reserved for 802.2LLC project.  */
+-#define	PF_SECURITY	14	/* Security callback pseudo AF.  */
+-#define	PF_KEY		15	/* PF_KEY key management API.  */
+-#define	PF_NETLINK	16
+-#define	PF_ROUTE	PF_NETLINK /* Alias to emulate 4.4BSD.  */
+-#define	PF_PACKET	17	/* Packet family.  */
+-#define	PF_ASH		18	/* Ash.  */
+-#define	PF_ECONET	19	/* Acorn Econet.  */
+-#define	PF_ATMSVC	20	/* ATM SVCs.  */
+-#define	PF_SNA		22	/* Linux SNA Project */
+-#define	PF_IRDA		23	/* IRDA sockets.  */
+-#define	PF_PPPOX	24	/* PPPoX sockets.  */
+-#define	PF_WANPIPE	25	/* Wanpipe API sockets.  */
+-#define	PF_LLC		26	/* Linux LLC.  */
+-#define	PF_CAN		29	/* Controller Area Network.  */
+-#define	PF_TIPC		30	/* TIPC sockets.  */
+-#define	PF_BLUETOOTH	31	/* Bluetooth sockets.  */
+-#define	PF_IUCV		32	/* IUCV sockets.  */
+-#define	PF_RXRPC	33	/* RxRPC sockets.  */
+-#define	PF_ISDN		34	/* mISDN sockets.  */
+-#define	PF_PHONET	35	/* Phonet sockets.  */
+-#define	PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
+-#define	PF_CAIF		37	/* CAIF sockets.  */
+-#define	PF_ALG		38	/* Algorithm sockets.  */
+-#define	PF_MAX		39	/* For now..  */
+-
+-/* Address families.  */
+-#define	AF_UNSPEC	PF_UNSPEC
+-#define	AF_LOCAL	PF_LOCAL
+-#define	AF_UNIX		PF_UNIX
+-#define	AF_FILE		PF_FILE
+-#define	AF_INET		PF_INET
+-#define	AF_AX25		PF_AX25
+-#define	AF_IPX		PF_IPX
+-#define	AF_APPLETALK	PF_APPLETALK
+-#define	AF_NETROM	PF_NETROM
+-#define	AF_BRIDGE	PF_BRIDGE
+-#define	AF_ATMPVC	PF_ATMPVC
+-#define	AF_X25		PF_X25
+-#define	AF_INET6	PF_INET6
+-#define	AF_ROSE		PF_ROSE
+-#define	AF_DECnet	PF_DECnet
+-#define	AF_NETBEUI	PF_NETBEUI
+-#define	AF_SECURITY	PF_SECURITY
+-#define	AF_KEY		PF_KEY
+-#define	AF_NETLINK	PF_NETLINK
+-#define	AF_ROUTE	PF_ROUTE
+-#define	AF_PACKET	PF_PACKET
+-#define	AF_ASH		PF_ASH
+-#define	AF_ECONET	PF_ECONET
+-#define	AF_ATMSVC	PF_ATMSVC
+-#define	AF_SNA		PF_SNA
+-#define	AF_IRDA		PF_IRDA
+-#define	AF_PPPOX	PF_PPPOX
+-#define	AF_WANPIPE	PF_WANPIPE
+-#define	AF_LLC		PF_LLC
+-#define	AF_CAN		PF_CAN
+-#define	AF_TIPC		PF_TIPC
+-#define	AF_BLUETOOTH	PF_BLUETOOTH
+-#define	AF_IUCV		PF_IUCV
+-#define	AF_RXRPC	PF_RXRPC
+-#define	AF_ISDN		PF_ISDN
+-#define	AF_PHONET	PF_PHONET
+-#define	AF_IEEE802154	PF_IEEE802154
+-#define	AF_CAIF		PF_CAIF
+-#define	AF_ALG		PF_ALG
+-#define	AF_MAX		PF_MAX
+-
+-/* Socket level values.  Others are defined in the appropriate headers.
+-
+-   XXX These definitions also should go into the appropriate headers as
+-   far as they are available.  */
+-#define SOL_RAW		255
+-#define SOL_DECNET      261
+-#define SOL_X25         262
+-#define SOL_PACKET	263
+-#define SOL_ATM		264	/* ATM layer (cell level).  */
+-#define SOL_AAL		265	/* ATM Adaption Layer (packet level).  */
+-#define SOL_IRDA	266
+-
+-/* Maximum queue length specifiable by listen.  */
+-#define SOMAXCONN	128
+-
+-/* Get the definition of the macro to define the common sockaddr members.  */
+-#include <bits/sockaddr.h>
+-
+-/* Structure describing a generic socket address.  */
+-struct sockaddr
+-  {
+-    __SOCKADDR_COMMON (sa_);	/* Common data: address family and length.  */
+-    char sa_data[14];		/* Address data.  */
+-  };
+-
+-
+-/* Structure large enough to hold any socket address (with the historical
+-   exception of AF_UNIX).  We reserve 128 bytes.  */
+-#define __ss_aligntype	unsigned long int
+-#define _SS_SIZE	128
+-#define _SS_PADSIZE	(_SS_SIZE - (2 * sizeof (__ss_aligntype)))
+-
+-struct sockaddr_storage
+-  {
+-    __SOCKADDR_COMMON (ss_);	/* Address family, etc.  */
+-    __ss_aligntype __ss_align;	/* Force desired alignment.  */
+-    char __ss_padding[_SS_PADSIZE];
+-  };
+-
+-
+-/* Bits in the FLAGS argument to `send', `recv', et al.  */
+-enum
+-  {
+-    MSG_OOB		= 0x01,	/* Process out-of-band data.  */
+-#define MSG_OOB		MSG_OOB
+-    MSG_PEEK		= 0x02,	/* Peek at incoming messages.  */
+-#define MSG_PEEK	MSG_PEEK
+-    MSG_DONTROUTE	= 0x04,	/* Don't use local routing.  */
+-#define MSG_DONTROUTE	MSG_DONTROUTE
+-#ifdef __USE_GNU
+-    /* DECnet uses a different name.  */
+-    MSG_TRYHARD		= MSG_DONTROUTE,
+-# define MSG_TRYHARD	MSG_DONTROUTE
+-#endif
+-    MSG_CTRUNC		= 0x08,	/* Control data lost before delivery.  */
+-#define MSG_CTRUNC	MSG_CTRUNC
+-    MSG_PROXY		= 0x10,	/* Supply or ask second address.  */
+-#define MSG_PROXY	MSG_PROXY
+-    MSG_TRUNC		= 0x20,
+-#define	MSG_TRUNC	MSG_TRUNC
+-    MSG_DONTWAIT	= 0x40, /* Nonblocking IO.  */
+-#define	MSG_DONTWAIT	MSG_DONTWAIT
+-    MSG_EOR		= 0x80, /* End of record.  */
+-#define	MSG_EOR		MSG_EOR
+-    MSG_WAITALL		= 0x100, /* Wait for a full request.  */
+-#define	MSG_WAITALL	MSG_WAITALL
+-    MSG_FIN		= 0x200,
+-#define	MSG_FIN		MSG_FIN
+-    MSG_SYN		= 0x400,
+-#define	MSG_SYN		MSG_SYN
+-    MSG_CONFIRM		= 0x800, /* Confirm path validity.  */
+-#define	MSG_CONFIRM	MSG_CONFIRM
+-    MSG_RST		= 0x1000,
+-#define	MSG_RST		MSG_RST
+-    MSG_ERRQUEUE	= 0x2000, /* Fetch message from error queue.  */
+-#define	MSG_ERRQUEUE	MSG_ERRQUEUE
+-    MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
+-#define	MSG_NOSIGNAL	MSG_NOSIGNAL
+-    MSG_MORE		= 0x8000, /* Sender will send more.  */
+-#define	MSG_MORE	MSG_MORE
+-    MSG_WAITFORONE      = 0x10000, /* Wait for at least one packet to return.*/
+-#define MSG_WAITFORONE  MSG_WAITFORONE
+-
+-    MSG_CMSG_CLOEXEC    = 0x40000000    /* Set close_on_exit for file
+-					   descriptor received through
+-					   SCM_RIGHTS.  */
+-#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
+-  };
+-
+-
+-/* Structure describing messages sent by
+-   `sendmsg' and received by `recvmsg'.  */
+-/* Note: do not change these members to match glibc; these match the
+-   SuSv3 spec already (e.g. msg_iovlen/msg_controllen).
+-   http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/socket.h.html */
+-/* Note: linux kernel uses __kernel_size_t (which is 8bytes on 64bit
+-   platforms, and 4bytes on 32bit platforms) for msg_iovlen/msg_controllen */
+-struct msghdr
+-  {
+-    void *msg_name;		/* Address to send to/receive from.  */
+-    socklen_t msg_namelen;	/* Length of address data.  */
+-
+-    struct iovec *msg_iov;	/* Vector of data to send/receive into.  */
+-#if __WORDSIZE == 32
+-    int msg_iovlen;		/* Number of elements in the vector.  */
+-#else
+-    size_t msg_iovlen;		/* Number of elements in the vector.  */
+-#endif
+-
+-    void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
+-#if __WORDSIZE == 32
+-    socklen_t msg_controllen;	/* Ancillary data buffer length.  */
+-#else
+-    size_t msg_controllen;	/* Ancillary data buffer length.  */
+-#endif
+-
+-    int msg_flags;		/* Flags on received message.  */
+-  };
+-
+-/* Structure used for storage of ancillary data object information.  */
+-struct cmsghdr
+-  {
+-    size_t cmsg_len;		/* Length of data in cmsg_data plus length
+-				   of cmsghdr structure.  */
+-    int cmsg_level;		/* Originating protocol.  */
+-    int cmsg_type;		/* Protocol specific type.  */
+-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
+-    __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data.  */
+-#endif
+-  };
+-
+-/* Ancillary data object manipulation macros.  */
+-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
+-# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
+-#else
+-# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
+-#endif
+-#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
+-#define CMSG_FIRSTHDR(mhdr) \
+-  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
+-   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
+-#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
+-			 & (size_t) ~(sizeof (size_t) - 1))
+-#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
+-			 + CMSG_ALIGN (sizeof (struct cmsghdr)))
+-#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+-
+-extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
+-				      struct cmsghdr *__cmsg) __THROW;
+-libc_hidden_proto(__cmsg_nxthdr)
+-#ifdef __USE_EXTERN_INLINES
+-# ifndef _EXTERN_INLINE
+-#  define _EXTERN_INLINE extern __inline
+-# endif
+-_EXTERN_INLINE struct cmsghdr *
+-__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
+-{
+-  if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
+-    /* The kernel header does this so there may be a reason.  */
+-    return 0;
+-
+-  __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+-			       + CMSG_ALIGN (__cmsg->cmsg_len));
+-  if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control
+-					+ __mhdr->msg_controllen)
+-      || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
+-	  > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
+-    /* No more entries.  */
+-    return 0;
+-  return __cmsg;
+-}
+-#endif	/* Use `extern inline'.  */
+-
+-/* Socket level message types.  This must match the definitions in
+-   <linux/socket.h>.  */
+-enum
+-  {
+-    SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
+-#define SCM_RIGHTS SCM_RIGHTS
+-#ifdef __USE_BSD
+-    , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
+-# define SCM_CREDENTIALS SCM_CREDENTIALS
+-#endif
+-  };
+-
+-/* User visible structure for SCM_CREDENTIALS message */
+-
+-struct ucred
+-{
+-  pid_t pid;			/* PID of sending process.  */
+-  uid_t uid;			/* UID of sending process.  */
+-  gid_t gid;			/* GID of sending process.  */
+-};
+-
+-/* Get socket manipulation related informations from kernel headers.  */
+-#ifndef __GLIBC__
+-#define __GLIBC__ 2
+-#include <asm/socket.h>
+-#undef __GLIBC__
+-#else
+-#include <asm/socket.h>
+-#endif
+-
+-
+-/* Structure used to manipulate the SO_LINGER option.  */
+-struct linger
+-  {
+-    int l_onoff;		/* Nonzero to linger on close.  */
+-    int l_linger;		/* Time to linger.  */
+-  };
+-
+-#endif	/* bits/socket.h */
+diff --git a/libc/sysdeps/linux/mips/bits/socket_type.h b/libc/sysdeps/linux/mips/bits/socket_type.h
+new file mode 100644
+index 0000000..20d2732
+--- /dev/null
++++ b/libc/sysdeps/linux/mips/bits/socket_type.h
+@@ -0,0 +1,55 @@
++/* System-specific socket constants and types.  Linux/MIPS version.
++   Copyright (C) 1991, 92, 1994-1999, 2000, 2001, 2004, 2005, 2006
++   Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _SYS_SOCKET_H
++# error "Never include <bits/socket_type.h> directly; use <sys/socket.h> instead."
++#endif
++
++/* Types of sockets.  */
++enum __socket_type
++{
++  SOCK_DGRAM = 1,		/* Connectionless, unreliable datagrams
++				   of fixed maximum length.  */
++#define SOCK_DGRAM SOCK_DGRAM
++  SOCK_STREAM = 2,		/* Sequenced, reliable, connection-based
++				   byte streams.  */
++#define SOCK_STREAM SOCK_STREAM
++  SOCK_RAW = 3,			/* Raw protocol interface.  */
++#define SOCK_RAW SOCK_RAW
++  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
++#define SOCK_RDM SOCK_RDM
++  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
++				   datagrams of fixed maximum length.  */
++#define SOCK_SEQPACKET SOCK_SEQPACKET
++  SOCK_DCCP = 6,
++#define SOCK_DCCP SOCK_DCCP	/* Datagram Congestion Control Protocol.  */
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
++				   at the dev level.  For writing rarp and
++				   other similar things on the user level. */
++#define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair.  */
++
++  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 00000200	/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
++};
+diff --git a/libc/sysdeps/linux/sparc/bits/socket.h b/libc/sysdeps/linux/sparc/bits/socket.h
+deleted file mode 100644
+index 64973e2..0000000
+--- a/libc/sysdeps/linux/sparc/bits/socket.h
++++ /dev/null
+@@ -1,376 +0,0 @@
+-/* System-specific socket constants and types.  Linux version.
+-   Copyright (C) 1991,1992,1994-2001,2004,2006 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
+-
+-#ifndef __BITS_SOCKET_H
+-#define __BITS_SOCKET_H
+-
+-#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H
+-# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
+-#endif
+-
+-#define	__need_size_t
+-#define __need_NULL
+-#include <stddef.h>
+-
+-#include <limits.h>
+-#include <sys/types.h>
+-
+-/* Type for length arguments in socket calls.  */
+-#ifndef __socklen_t_defined
+-typedef __socklen_t socklen_t;
+-# define __socklen_t_defined
+-#endif
+-
+-/* Types of sockets.  */
+-enum __socket_type
+-{
+-  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
+-				   byte streams.  */
+-#define SOCK_STREAM SOCK_STREAM
+-  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
+-				   of fixed maximum length.  */
+-#define SOCK_DGRAM SOCK_DGRAM
+-  SOCK_RAW = 3,			/* Raw protocol interface.  */
+-#define SOCK_RAW SOCK_RAW
+-  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+-#define SOCK_RDM SOCK_RDM
+-  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
+-				   datagrams of fixed maximum length.  */
+-#define SOCK_SEQPACKET SOCK_SEQPACKET
+-  SOCK_PACKET = 10		/* Linux specific way of getting packets
+-				   at the dev level.  For writing rarp and
+-				   other similar things on the user level. */
+-#define SOCK_PACKET SOCK_PACKET
+-};
+-
+-/* Protocol families.  */
+-#define	PF_UNSPEC	0	/* Unspecified.  */
+-#define	PF_LOCAL	1	/* Local to host (pipes and file-domain).  */
+-#define	PF_UNIX		PF_LOCAL /* Old BSD name for PF_LOCAL.  */
+-#define	PF_FILE		PF_LOCAL /* Another non-standard name for PF_LOCAL.  */
+-#define	PF_INET		2	/* IP protocol family.  */
+-#define	PF_AX25		3	/* Amateur Radio AX.25.  */
+-#define	PF_IPX		4	/* Novell Internet Protocol.  */
+-#define	PF_APPLETALK	5	/* Appletalk DDP.  */
+-#define	PF_NETROM	6	/* Amateur radio NetROM.  */
+-#define	PF_BRIDGE	7	/* Multiprotocol bridge.  */
+-#define	PF_ATMPVC	8	/* ATM PVCs.  */
+-#define	PF_X25		9	/* Reserved for X.25 project.  */
+-#define	PF_INET6	10	/* IP version 6.  */
+-#define	PF_ROSE		11	/* Amateur Radio X.25 PLP.  */
+-#define	PF_DECnet	12	/* Reserved for DECnet project.  */
+-#define	PF_NETBEUI	13	/* Reserved for 802.2LLC project.  */
+-#define	PF_SECURITY	14	/* Security callback pseudo AF.  */
+-#define	PF_KEY		15	/* PF_KEY key management API.  */
+-#define	PF_NETLINK	16
+-#define	PF_ROUTE	PF_NETLINK /* Alias to emulate 4.4BSD.  */
+-#define	PF_PACKET	17	/* Packet family.  */
+-#define	PF_ASH		18	/* Ash.  */
+-#define	PF_ECONET	19	/* Acorn Econet.  */
+-#define	PF_ATMSVC	20	/* ATM SVCs.  */
+-#define	PF_SNA		22	/* Linux SNA Project */
+-#define	PF_IRDA		23	/* IRDA sockets.  */
+-#define	PF_PPPOX	24	/* PPPoX sockets.  */
+-#define	PF_WANPIPE	25	/* Wanpipe API sockets.  */
+-#define	PF_LLC		26	/* Linux LLC.  */
+-#define	PF_CAN		29	/* Controller Area Network.  */
+-#define	PF_TIPC		30	/* TIPC sockets.  */
+-#define	PF_BLUETOOTH	31	/* Bluetooth sockets.  */
+-#define	PF_IUCV		32	/* IUCV sockets.  */
+-#define	PF_RXRPC	33	/* RxRPC sockets.  */
+-#define	PF_ISDN		34	/* mISDN sockets.  */
+-#define	PF_PHONET	35	/* Phonet sockets.  */
+-#define	PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
+-#define	PF_CAIF		37	/* CAIF sockets.  */
+-#define	PF_ALG		38	/* Algorithm sockets.  */
+-#define	PF_MAX		39	/* For now..  */
+-
+-/* Address families.  */
+-#define	AF_UNSPEC	PF_UNSPEC
+-#define	AF_LOCAL	PF_LOCAL
+-#define	AF_UNIX		PF_UNIX
+-#define	AF_FILE		PF_FILE
+-#define	AF_INET		PF_INET
+-#define	AF_AX25		PF_AX25
+-#define	AF_IPX		PF_IPX
+-#define	AF_APPLETALK	PF_APPLETALK
+-#define	AF_NETROM	PF_NETROM
+-#define	AF_BRIDGE	PF_BRIDGE
+-#define	AF_ATMPVC	PF_ATMPVC
+-#define	AF_X25		PF_X25
+-#define	AF_INET6	PF_INET6
+-#define	AF_ROSE		PF_ROSE
+-#define	AF_DECnet	PF_DECnet
+-#define	AF_NETBEUI	PF_NETBEUI
+-#define	AF_SECURITY	PF_SECURITY
+-#define	AF_KEY		PF_KEY
+-#define	AF_NETLINK	PF_NETLINK
+-#define	AF_ROUTE	PF_ROUTE
+-#define	AF_PACKET	PF_PACKET
+-#define	AF_ASH		PF_ASH
+-#define	AF_ECONET	PF_ECONET
+-#define	AF_ATMSVC	PF_ATMSVC
+-#define	AF_SNA		PF_SNA
+-#define	AF_IRDA		PF_IRDA
+-#define	AF_PPPOX	PF_PPPOX
+-#define	AF_WANPIPE	PF_WANPIPE
+-#define	AF_LLC		PF_LLC
+-#define	AF_CAN		PF_CAN
+-#define	AF_TIPC		PF_TIPC
+-#define	AF_BLUETOOTH	PF_BLUETOOTH
+-#define	AF_IUCV		PF_IUCV
+-#define	AF_RXRPC	PF_RXRPC
+-#define	AF_ISDN		PF_ISDN
+-#define	AF_PHONET	PF_PHONET
+-#define	AF_IEEE802154	PF_IEEE802154
+-#define	AF_CAIF		PF_CAIF
+-#define	AF_ALG		PF_ALG
+-#define	AF_MAX		PF_MAX
+-
+-/* Socket level values.  Others are defined in the appropriate headers.
+-
+-   XXX These definitions also should go into the appropriate headers as
+-   far as they are available.  */
+-#define SOL_RAW		255
+-#define SOL_DECNET      261
+-#define SOL_X25         262
+-#define SOL_PACKET	263
+-#define SOL_ATM		264	/* ATM layer (cell level).  */
+-#define SOL_AAL		265	/* ATM Adaption Layer (packet level).  */
+-#define SOL_IRDA	266
+-
+-/* Maximum queue length specifiable by listen.  */
+-#define SOMAXCONN	128
+-
+-/* Get the definition of the macro to define the common sockaddr members.  */
+-#include <bits/sockaddr.h>
+-
+-/* Structure describing a generic socket address.  */
+-struct sockaddr
+-  {
+-    __SOCKADDR_COMMON (sa_);	/* Common data: address family and length.  */
+-    char sa_data[14];		/* Address data.  */
+-  };
+-
+-
+-/* Structure large enough to hold any socket address (with the historical
+-   exception of AF_UNIX).  We reserve 128 bytes.  */
+-#if ULONG_MAX > 0xffffffff
+-# define __ss_aligntype	__uint64_t
+-#else
+-# define __ss_aligntype	__uint32_t
+-#endif
+-#define _SS_SIZE	128
+-#define _SS_PADSIZE	(_SS_SIZE - (2 * sizeof (__ss_aligntype)))
+-
+-struct sockaddr_storage
+-  {
+-    __SOCKADDR_COMMON (ss_);	/* Address family, etc.  */
+-    __ss_aligntype __ss_align;	/* Force desired alignment.  */
+-    char __ss_padding[_SS_PADSIZE];
+-  };
+-
+-
+-/* Bits in the FLAGS argument to `send', `recv', et al.  */
+-enum
+-  {
+-    MSG_OOB		= 0x01,	/* Process out-of-band data.  */
+-#define MSG_OOB		MSG_OOB
+-    MSG_PEEK		= 0x02,	/* Peek at incoming messages.  */
+-#define MSG_PEEK	MSG_PEEK
+-    MSG_DONTROUTE	= 0x04,	/* Don't use local routing.  */
+-#define MSG_DONTROUTE	MSG_DONTROUTE
+-#ifdef __USE_GNU
+-    /* DECnet uses a different name.  */
+-    MSG_TRYHARD		= MSG_DONTROUTE,
+-# define MSG_TRYHARD	MSG_DONTROUTE
+-#endif
+-    MSG_CTRUNC		= 0x08,	/* Control data lost before delivery.  */
+-#define MSG_CTRUNC	MSG_CTRUNC
+-    MSG_PROXY		= 0x10,	/* Supply or ask second address.  */
+-#define MSG_PROXY	MSG_PROXY
+-    MSG_TRUNC		= 0x20,
+-#define	MSG_TRUNC	MSG_TRUNC
+-    MSG_DONTWAIT	= 0x40, /* Nonblocking IO.  */
+-#define	MSG_DONTWAIT	MSG_DONTWAIT
+-    MSG_EOR		= 0x80, /* End of record.  */
+-#define	MSG_EOR		MSG_EOR
+-    MSG_WAITALL		= 0x100, /* Wait for a full request.  */
+-#define	MSG_WAITALL	MSG_WAITALL
+-    MSG_FIN		= 0x200,
+-#define	MSG_FIN		MSG_FIN
+-    MSG_SYN		= 0x400,
+-#define	MSG_SYN		MSG_SYN
+-    MSG_CONFIRM		= 0x800, /* Confirm path validity.  */
+-#define	MSG_CONFIRM	MSG_CONFIRM
+-    MSG_RST		= 0x1000,
+-#define	MSG_RST		MSG_RST
+-    MSG_ERRQUEUE	= 0x2000, /* Fetch message from error queue.  */
+-#define	MSG_ERRQUEUE	MSG_ERRQUEUE
+-    MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
+-#define	MSG_NOSIGNAL	MSG_NOSIGNAL
+-    MSG_MORE		= 0x8000  /* Sender will send more.  */
+-#define	MSG_MORE	MSG_MORE
+-  };
+-
+-
+-/* Structure describing messages sent by
+-   `sendmsg' and received by `recvmsg'.  */
+-/* Note: do not change these members to match glibc; these match the
+-   SuSv3 spec already (e.g. msg_iovlen/msg_controllen).
+-   http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/socket.h.html */
+-/* Note: linux kernel uses __kernel_size_t (which is 8bytes on 64bit
+-   platforms, and 4bytes on 32bit platforms) for msg_iovlen/msg_controllen */
+-struct msghdr
+-  {
+-    void *msg_name;		/* Address to send to/receive from.  */
+-    socklen_t msg_namelen;	/* Length of address data.  */
+-
+-    struct iovec *msg_iov;	/* Vector of data to send/receive into.  */
+-#if __WORDSIZE == 32
+-    int msg_iovlen;		/* Number of elements in the vector.  */
+-#else
+-    size_t msg_iovlen;		/* Number of elements in the vector.  */
+-#endif
+-
+-    void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
+-#if __WORDSIZE == 32
+-    socklen_t msg_controllen;	/* Ancillary data buffer length.  */
+-#else
+-    size_t msg_controllen;	/* Ancillary data buffer length.  */
+-#endif
+-
+-    int msg_flags;		/* Flags on received message.  */
+-  };
+-
+-/* Structure used for storage of ancillary data object information.  */
+-struct cmsghdr
+-  {
+-    size_t cmsg_len;		/* Length of data in cmsg_data plus length
+-				   of cmsghdr structure.  */
+-    int cmsg_level;		/* Originating protocol.  */
+-    int cmsg_type;		/* Protocol specific type.  */
+-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
+-    __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data.  */
+-#endif
+-  };
+-
+-/* Ancillary data object manipulation macros.  */
+-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
+-# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
+-#else
+-# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
+-#endif
+-#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
+-#define CMSG_FIRSTHDR(mhdr) \
+-  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
+-   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
+-#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
+-			 & (size_t) ~(sizeof (size_t) - 1))
+-#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
+-			 + CMSG_ALIGN (sizeof (struct cmsghdr)))
+-#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+-
+-extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
+-				      struct cmsghdr *__cmsg) __THROW;
+-libc_hidden_proto(__cmsg_nxthdr)
+-#ifdef __USE_EXTERN_INLINES
+-# ifndef _EXTERN_INLINE
+-#  define _EXTERN_INLINE extern __inline
+-# endif
+-_EXTERN_INLINE struct cmsghdr *
+-__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
+-{
+-  if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
+-    /* The kernel header does this so there may be a reason.  */
+-    return 0;
+-
+-  __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+-			       + CMSG_ALIGN (__cmsg->cmsg_len));
+-  if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control
+-					+ __mhdr->msg_controllen)
+-      || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
+-	  > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
+-    /* No more entries.  */
+-    return 0;
+-  return __cmsg;
+-}
+-#endif	/* Use `extern inline'.  */
+-
+-/* Socket level message types.  This must match the definitions in
+-   <linux/socket.h>.  */
+-enum
+-  {
+-    SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
+-#define SCM_RIGHTS SCM_RIGHTS
+-#ifdef __USE_BSD
+-    , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
+-# define SCM_CREDENTIALS SCM_CREDENTIALS
+-#endif
+-  };
+-
+-/* User visible structure for SCM_CREDENTIALS message */
+-
+-struct ucred
+-{
+-  pid_t pid;			/* PID of sending process.  */
+-  uid_t uid;			/* UID of sending process.  */
+-  gid_t gid;			/* GID of sending process.  */
+-};
+-
+-/* Get socket manipulation related informations from kernel headers.  */
+-#ifndef __GLIBC__
+-#define __GLIBC__ 2
+-#include <asm/socket.h>
+-#undef __GLIBC__
+-#else
+-#include <asm/socket.h>
+-#endif
+-
+-
+-/* Structure used to manipulate the SO_LINGER option.  */
+-struct linger
+-  {
+-    int l_onoff;		/* Nonzero to linger on close.  */
+-    int l_linger;		/* Time to linger.  */
+-  };
+-
+-/* Prefer socketcall over all these for sparc32, 
+-   since it only has socketcall */
+-#ifndef __arch64__
+- #undef __NR_accept
+- #undef __NR_bind
+- #undef __NR_connect
+- #undef __NR_getpeername
+- #undef __NR_getsockname
+- #undef __NR_getsockopt
+- #undef __NR_listen
+- #undef __NR_recv
+- #undef __NR_recvfrom
+- #undef __NR_recvmsg
+- #undef __NR_send
+- #undef __NR_sendmsg
+- #undef __NR_sendto
+- #undef __NR_setsockopt
+- #undef __NR_shutdown
+- #undef __NR_socket
+- #undef __NR_socketpair
+-#endif
+-
+-#endif	/* bits/socket.h */
+diff --git a/libc/sysdeps/linux/sparc/bits/socket_type.h b/libc/sysdeps/linux/sparc/bits/socket_type.h
+new file mode 100644
+index 0000000..494655f
+--- /dev/null
++++ b/libc/sysdeps/linux/sparc/bits/socket_type.h
+@@ -0,0 +1,54 @@
++/* System-specific socket constants and types.  Linux version.
++   Copyright (C) 1991,1992,1994-2001,2004,2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _SYS_SOCKET_H
++# error "Never include <bits/socket_type.h> directly; use <sys/socket.h> instead."
++#endif
++
++/* Types of sockets.  */
++enum __socket_type
++{
++  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
++				   byte streams.  */
++#define SOCK_STREAM SOCK_STREAM
++  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
++				   of fixed maximum length.  */
++#define SOCK_DGRAM SOCK_DGRAM
++  SOCK_RAW = 3,			/* Raw protocol interface.  */
++#define SOCK_RAW SOCK_RAW
++  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
++#define SOCK_RDM SOCK_RDM
++  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
++				   datagrams of fixed maximum length.  */
++#define SOCK_SEQPACKET SOCK_SEQPACKET
++  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
++#define SOCK_DCCP SOCK_DCCP
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
++				   at the dev level.  For writing rarp and
++				   other similar things on the user level. */
++#define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair.  */
++
++  SOCK_CLOEXEC = 0x400000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 0x004000	/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
++};
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0036-mount.h-update.patch b/package/uclibc/0.9.33.2/uclibc-0036-mount.h-update.patch
new file mode 100644
index 0000000000..4c9826cd19
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0036-mount.h-update.patch
@@ -0,0 +1,91 @@
+From 641a5356a021f90ee922229bd8e1aa6eafe152bc Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Fri, 18 Jan 2013 11:12:49 +0100
+Subject: [PATCH] mount.h: update
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/sys/mount.h |   45 +++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 35 insertions(+), 10 deletions(-)
+
+diff --git a/include/sys/mount.h b/include/sys/mount.h
+index 57d440f..9eecc5a 100644
+--- a/include/sys/mount.h
++++ b/include/sys/mount.h
+@@ -1,5 +1,5 @@
+ /* Header file for mounting/unmount Linux filesystems.
+-   Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
++   Copyright (C) 1996-2000, 2004, 2010, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -47,23 +47,46 @@ enum
+ #define MS_REMOUNT	MS_REMOUNT
+   MS_MANDLOCK = 64,		/* Allow mandatory locks on an FS.  */
+ #define MS_MANDLOCK	MS_MANDLOCK
+-  S_WRITE = 128,		/* Write on file/directory/symlink.  */
+-#define S_WRITE		S_WRITE
+-  S_APPEND = 256,		/* Append-only file.  */
+-#define S_APPEND	S_APPEND
+-  S_IMMUTABLE = 512,		/* Immutable file.  */
+-#define S_IMMUTABLE	S_IMMUTABLE
++  MS_DIRSYNC = 128,		/* Directory modifications are synchronous.  */
++#define MS_DIRSYNC	MS_DIRSYNC
+   MS_NOATIME = 1024,		/* Do not update access times.  */
+ #define MS_NOATIME	MS_NOATIME
+   MS_NODIRATIME = 2048,		/* Do not update directory access times.  */
+ #define MS_NODIRATIME	MS_NODIRATIME
+   MS_BIND = 4096,		/* Bind directory at different place.  */
+ #define MS_BIND		MS_BIND
++  MS_MOVE = 8192,
++#define MS_MOVE		MS_MOVE
++  MS_REC = 16384,
++#define MS_REC		MS_REC
++  MS_SILENT = 32768,
++#define MS_SILENT	MS_SILENT
++  MS_POSIXACL = 1 << 16,	/* VFS does not apply the umask.  */
++#define MS_POSIXACL	MS_POSIXACL
++  MS_UNBINDABLE = 1 << 17,	/* Change to unbindable.  */
++#define MS_UNBINDABLE	MS_UNBINDABLE
++  MS_PRIVATE = 1 << 18,		/* Change to private.  */
++#define MS_PRIVATE	MS_PRIVATE
++  MS_SLAVE = 1 << 19,		/* Change to slave.  */
++#define MS_SLAVE	MS_SLAVE
++  MS_SHARED = 1 << 20,		/* Change to shared.  */
++#define MS_SHARED	MS_SHARED
++  MS_RELATIME = 1 << 21,	/* Update atime relative to mtime/ctime.  */
++#define MS_RELATIME	MS_RELATIME
++  MS_KERNMOUNT = 1 << 22,	/* This is a kern_mount call.  */
++#define MS_KERNMOUNT	MS_KERNMOUNT
++  MS_I_VERSION =  1 << 23,	/* Update inode I_version field.  */
++#define MS_I_VERSION	MS_I_VERSION
++  MS_STRICTATIME = 1 << 24,	/* Always perform atime updates.  */
++#define MS_STRICTATIME	MS_STRICTATIME
++  MS_ACTIVE = 1 << 30,
++#define MS_ACTIVE	MS_ACTIVE
++  MS_NOUSER = 1 << 31
++#define MS_NOUSER	MS_NOUSER
+ };
+ 
+ /* Flags that can be altered by MS_REMOUNT  */
+-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
+-		     |MS_NODIRATIME)
++#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
+ 
+ 
+ /* Magic mount flag number. Has to be or-ed to the flag values.  */
+@@ -100,8 +123,10 @@ enum
+ #define MNT_FORCE MNT_FORCE
+   MNT_DETACH = 2,		/* Just detach from the tree.  */
+ #define MNT_DETACH MNT_DETACH
+-  MNT_EXPIRE = 4		/* Mark for expiry.  */
++  MNT_EXPIRE = 4,		/* Mark for expiry.  */
+ #define MNT_EXPIRE MNT_EXPIRE
++  UMOUNT_NOFOLLOW = 8		/* Don't follow symlink on umount.  */
++#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
+ };
+ 
+ 
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0037-buildsys-gen_bits_syscall_h-do-not-leave-undefined-S.patch b/package/uclibc/0.9.33.2/uclibc-0037-buildsys-gen_bits_syscall_h-do-not-leave-undefined-S.patch
new file mode 100644
index 0000000000..c3107253f6
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0037-buildsys-gen_bits_syscall_h-do-not-leave-undefined-S.patch
@@ -0,0 +1,38 @@
+From 29411db7b6cf872e73b5560c46dd941f91e704cd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 26 Jan 2013 14:13:12 -0500
+Subject: [PATCH] buildsys: gen_bits_syscall_h: do not leave undefined SYS_xxx
+ around
+
+If we end up doing '#undef __NR_xxx', we don't want to leave the
+corresponding SYS_xxx symbol defined.  So undef it too.
+
+For example, with the ARM EABI layer, we have a bunch of legacy
+syscalls that we define early on and then later undefine (such
+as __NR_utime).  But we left SYS_utime defined so code that tests
+for that define before using it would be broken (since it'd be
+defined to a non-existent symbol).
+
+URL: https://bugs.gentoo.org/425006
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ extra/scripts/gen_bits_syscall_h.sh |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh
+index f6353ba..fd141f0 100755
+--- a/extra/scripts/gen_bits_syscall_h.sh
++++ b/extra/scripts/gen_bits_syscall_h.sh
+@@ -40,7 +40,8 @@ $CC -E $INCLUDE_OPTS - |
+   sed -ne 's/^UCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\) *\(.*\)/#undef \1\2\
+ #define \1\2 \3\
+ #define SYS_\2 \1\2/gp' \
+-     -e 's/^UNDEFUCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/#undef \1\2/gp'
++     -e 's/^UNDEFUCLIBC\(__ARM_NR_\|__NR_\)\([A-Za-z0-9_]*\).*/#undef \1\2\
++#undef SYS_\2/gp'
+   echo ;
+   echo "#endif" ;
+ )
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0038-libc-sysdeps-sync-bits-in.h-with-glibc.patch b/package/uclibc/0.9.33.2/uclibc-0038-libc-sysdeps-sync-bits-in.h-with-glibc.patch
new file mode 100644
index 0000000000..6f4246840a
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0038-libc-sysdeps-sync-bits-in.h-with-glibc.patch
@@ -0,0 +1,117 @@
+From 4b7f3716b8678c9ff423445f41e6ffb47fd295cd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 26 Jan 2013 17:40:24 -0500
+Subject: [PATCH] libc/sysdeps: sync bits/in.h with glibc
+
+URL: https://bugs.busybox.net/show_bug.cgi?id=5888
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libc/sysdeps/linux/common/bits/in.h |   61 +++++++++++++++++++++++------------
+ 1 file changed, 41 insertions(+), 20 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/in.h b/libc/sysdeps/linux/common/bits/in.h
+index 1f2b817..d9c5e2b 100644
+--- a/libc/sysdeps/linux/common/bits/in.h
++++ b/libc/sysdeps/linux/common/bits/in.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991-1999, 2000, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -43,31 +43,49 @@
+ #define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */
+ #define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */
+ #define IP_MSFILTER 41
+-#define MCAST_JOIN_GROUP 42	/* group_req: join any-source group */
+-#define MCAST_BLOCK_SOURCE 43	/* group_source_req: block from given group */
+-#define MCAST_UNBLOCK_SOURCE 44	/* group_source_req: unblock from given group*/
+-#define MCAST_LEAVE_GROUP 45	/* group_req: leave any-source group */
+-#define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
+-#define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
+-#define MCAST_MSFILTER 48
+-
+-#define MCAST_EXCLUDE   0
+-#define MCAST_INCLUDE   1
+-
+-#define IP_ROUTER_ALERT    5	/* bool */
+-#define IP_PKTINFO         8	/* bool */
+-#define IP_PKTOPTIONS      9
+-#define IP_PMTUDISC        10	/* obsolete name? */
+-#define IP_MTU_DISCOVER    10	/* int; see below */
+-#define IP_RECVERR         11	/* bool */
+-#define IP_RECVTTL         12	/* bool */
+-#define IP_RECVTOS         13	/* bool */
++#if defined __USE_MISC || defined __USE_GNU
++# define MCAST_JOIN_GROUP 42	/* group_req: join any-source group */
++# define MCAST_BLOCK_SOURCE 43	/* group_source_req: block from given group */
++# define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/
++# define MCAST_LEAVE_GROUP 45	/* group_req: leave any-source group */
++# define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
++# define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
++# define MCAST_MSFILTER 48
++# define IP_MULTICAST_ALL 49
++# define IP_UNICAST_IF 50
++
++# define MCAST_EXCLUDE   0
++# define MCAST_INCLUDE   1
++#endif
++
++#define IP_ROUTER_ALERT	5	/* bool */
++#define IP_PKTINFO	8	/* bool */
++#define IP_PKTOPTIONS	9
++#define IP_PMTUDISC	10	/* obsolete name? */
++#define IP_MTU_DISCOVER	10	/* int; see below */
++#define IP_RECVERR	11	/* bool */
++#define IP_RECVTTL	12	/* bool */
++#define IP_RECVTOS	13	/* bool */
++#define IP_MTU		14	/* int */
++#define IP_FREEBIND	15
++#define IP_IPSEC_POLICY 16
++#define IP_XFRM_POLICY	17
++#define IP_PASSSEC	18
++#define IP_TRANSPARENT	19
++#define IP_MULTICAST_ALL 49	/* bool */
++
++/* TProxy original addresses */
++#define IP_ORIGDSTADDR       20
++#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
++
++#define IP_MINTTL       21
+ 
+ 
+ /* IP_MTU_DISCOVER arguments.  */
+ #define IP_PMTUDISC_DONT   0	/* Never send DF frames.  */
+ #define IP_PMTUDISC_WANT   1	/* Use per route hints.  */
+ #define IP_PMTUDISC_DO     2	/* Always DF.  */
++#define IP_PMTUDISC_PROBE  3	/* Ignore dst pmtu.  */
+ 
+ /* To select the IP level.  */
+ #define SOL_IP	0
+@@ -76,6 +94,7 @@
+ #define IP_DEFAULT_MULTICAST_LOOP       1
+ #define IP_MAX_MEMBERSHIPS              20
+ 
++#if defined __USE_MISC || defined __USE_GNU
+ /* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
+    The `ip_dst' field is used for the first-hop gateway when using a
+    source route (this gets put into the header proper).  */
+@@ -100,6 +119,7 @@ struct in_pktinfo
+     struct in_addr ipi_spec_dst;	/* Routing destination address  */
+     struct in_addr ipi_addr;		/* Header destination address  */
+   };
++#endif
+ 
+ #ifdef __UCLIBC_HAS_IPV6__
+ /* Options for use with `getsockopt' and `setsockopt' at the IPv6 level.
+@@ -159,6 +179,7 @@ struct in_pktinfo
+ #define IPV6_PMTUDISC_DONT	0	/* Never send DF frames.  */
+ #define IPV6_PMTUDISC_WANT	1	/* Use per route hints.  */
+ #define IPV6_PMTUDISC_DO	2	/* Always DF.  */
++#define IPV6_PMTUDISC_PROBE	3	/* Ignore dst pmtu.  */
+ 
+ /* Socket level values for IPv6.  */
+ #define SOL_IPV6        41
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0039-libc-atexit-reuse-free-slots-at-the-end-of-exit-func.patch b/package/uclibc/0.9.33.2/uclibc-0039-libc-atexit-reuse-free-slots-at-the-end-of-exit-func.patch
new file mode 100644
index 0000000000..ac9022c235
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0039-libc-atexit-reuse-free-slots-at-the-end-of-exit-func.patch
@@ -0,0 +1,43 @@
+From 893d4fb45bb0811bcc939054e60e37a47a1786c5 Mon Sep 17 00:00:00 2001
+From: Ronald Wahl <ronald.wahl@raritan.com>
+Date: Mon, 4 Feb 2013 14:51:46 +0100
+Subject: [PATCH] libc: atexit: reuse free slots at the end of exit functions
+ table
+
+Continuosly dlopen and dlclose of shared object will cause a memory leak
+in atexit function. This fix reuse free slots at the end of the list.
+
+For further detail see https://bugs.busybox.net/show_bug.cgi?id=2455
+
+Signed-off-by: Ronald Wahl <ronald.wahl@raritan.com>
+Tested-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit 389cd96704f21549cafc0b5bdcd0ef762b98bc08)
+---
+ libc/stdlib/_atexit.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
+index 48b97ff..0af8c57 100644
+--- a/libc/stdlib/_atexit.c
++++ b/libc/stdlib/_atexit.c
+@@ -240,6 +240,16 @@ struct exit_function attribute_hidden *__new_exitfn(void)
+ 
+     __UCLIBC_MUTEX_LOCK(__atexit_lock);
+ 
++	/*
++	 * Reuse free slots at the end of the list.
++	 * This avoids eating memory when dlopen and dlclose modules multiple times.
++	*/
++	while (__exit_count > 0) {
++		if (__exit_function_table[__exit_count-1].type == ef_free) {
++			--__exit_count;
++		} else break;
++	}
++
+ #ifdef __UCLIBC_DYNAMIC_ATEXIT__
+     /* If we are out of function table slots, make some more */
+     if (__exit_slots < __exit_count+1) {
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0040-mman-rename-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch b/package/uclibc/0.9.33.2/uclibc-0040-mman-rename-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch
new file mode 100644
index 0000000000..431969436f
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0040-mman-rename-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch
@@ -0,0 +1,200 @@
+From fb1b8fc191bffd6b3bc6db6bfa824b2d41e18485 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Tue, 5 Feb 2013 19:13:06 +0100
+Subject: [PATCH] mman: rename MAP_UNINITIALIZE to MAP_UNINITIALIZED
+
+The name was changed to include a trailing 'D' when it went into the
+kernel.
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ ldso/ldso/dl-elf.c                           |    2 +-
+ ldso/ldso/ldso.c                             |    2 +-
+ libc/stdlib/malloc-simple/alloc.c            |    4 ++--
+ libc/stdlib/malloc-standard/malloc.h         |    6 +++---
+ libc/stdlib/malloc/malloc.c                  |    2 +-
+ libc/sysdeps/linux/alpha/bits/mman.h         |    2 +-
+ libc/sysdeps/linux/common/bits/mman-common.h |    2 +-
+ libc/sysdeps/linux/hppa/bits/mman.h          |    2 +-
+ libc/sysdeps/linux/mips/bits/mman.h          |    2 +-
+ libc/sysdeps/linux/powerpc/bits/mman.h       |    2 +-
+ libc/sysdeps/linux/sparc/bits/mman.h         |    2 +-
+ libc/sysdeps/linux/xtensa/bits/mman.h        |    2 +-
+ 12 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
+index 9e2a12c..0e6d2cd 100644
+--- a/ldso/ldso/dl-elf.c
++++ b/ldso/ldso/dl-elf.c
+@@ -500,7 +500,7 @@ struct elf_resolve *_dl_load_elf_shared_library(unsigned rflags,
+ 		return NULL;
+ 	}
+ 	header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE,
+-			MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0);
++			MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZED, -1, 0);
+ 	if (_dl_mmap_check_error(header)) {
+ 		_dl_dprintf(2, "%s:%i: can't map '%s'\n", _dl_progname, __LINE__, libname);
+ 		_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
+diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
+index 85d27a3..df46e24 100644
+--- a/ldso/ldso/ldso.c
++++ b/ldso/ldso/ldso.c
+@@ -245,7 +245,7 @@ void *_dl_malloc(size_t size)
+ 
+ 		_dl_debug_early("mmapping more memory\n");
+ 		_dl_mmap_zero = _dl_malloc_addr = _dl_mmap((void *) 0, rounded_size,
+-				PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0);
++				PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZED, -1, 0);
+ 		if (_dl_mmap_check_error(_dl_mmap_zero)) {
+ 			_dl_dprintf(_dl_debug_file, "%s: mmap of a spare page failed!\n", _dl_progname);
+ 			_dl_exit(20);
+diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
+index 914c89d..ec49781 100644
+--- a/libc/stdlib/malloc-simple/alloc.c
++++ b/libc/stdlib/malloc-simple/alloc.c
+@@ -36,7 +36,7 @@ void *malloc(size_t size)
+ #ifdef __ARCH_USE_MMU__
+ # define MMAP_FLAGS MAP_PRIVATE | MAP_ANONYMOUS
+ #else
+-# define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZE
++# define MMAP_FLAGS MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZED
+ #endif
+ 
+ 	result = mmap((void *) 0, size + sizeof(size_t), PROT_READ | PROT_WRITE,
+@@ -63,7 +63,7 @@ void * calloc(size_t nmemb, size_t lsize)
+ 	result = malloc(size);
+ 
+ #ifndef __ARCH_USE_MMU__
+-	/* mmap'd with MAP_UNINITIALIZE, we have to blank memory ourselves */
++	/* mmap'd with MAP_UNINITIALIZED, we have to blank memory ourselves */
+ 	if (result != NULL) {
+ 		memset(result, 0, size);
+ 	}
+diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
+index 73d4b12..e6ae544 100644
+--- a/libc/stdlib/malloc-standard/malloc.h
++++ b/libc/stdlib/malloc-standard/malloc.h
+@@ -349,13 +349,13 @@ __UCLIBC_MUTEX_EXTERN(__malloc_lock);
+ #endif
+ 
+ #ifdef __ARCH_USE_MMU__
+-# define _MAP_UNINITIALIZE 0
++# define _MAP_UNINITIALIZED 0
+ #else
+-# define _MAP_UNINITIALIZE MAP_UNINITIALIZE
++# define _MAP_UNINITIALIZED MAP_UNINITIALIZED
+ #endif
+ 
+ #define MMAP(addr, size, prot) \
+- (mmap((addr), (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS|_MAP_UNINITIALIZE, 0, 0))
++ (mmap((addr), (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS|_MAP_UNINITIALIZED, 0, 0))
+ 
+ 
+ /* -----------------------  Chunk representations ----------------------- */
+diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c
+index d58a7d0..2b47077 100644
+--- a/libc/stdlib/malloc/malloc.c
++++ b/libc/stdlib/malloc/malloc.c
+@@ -124,7 +124,7 @@ __malloc_from_heap (size_t size, struct heap_free_area **heap
+ 		    MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+ #else
+       block = mmap ((void *)0, block_size, PROT_READ | PROT_WRITE,
+-		    MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZE, 0, 0);
++		    MAP_SHARED | MAP_ANONYMOUS | MAP_UNINITIALIZED, 0, 0);
+ #endif
+ 
+ #endif /* MALLOC_USE_SBRK */
+diff --git a/libc/sysdeps/linux/alpha/bits/mman.h b/libc/sysdeps/linux/alpha/bits/mman.h
+index cafad4a..31327ed 100644
+--- a/libc/sysdeps/linux/alpha/bits/mman.h
++++ b/libc/sysdeps/linux/alpha/bits/mman.h
+@@ -71,7 +71,7 @@
+ # define MAP_NORESERVE	  0x10000	/* Don't check for reservations.  */
+ # define MAP_POPULATE	  0x20000	/* Populate (prefault) pagetables.  */
+ # define MAP_NONBLOCK	  0x40000	/* Do not block on IO.  */
+-# define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could
+ 					   be uninitialized. */
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/common/bits/mman-common.h b/libc/sysdeps/linux/common/bits/mman-common.h
+index f00cb1a..c733a87 100644
+--- a/libc/sysdeps/linux/common/bits/mman-common.h
++++ b/libc/sysdeps/linux/common/bits/mman-common.h
+@@ -64,7 +64,7 @@
+ # define MAP_POPULATE	0x08000		/* Populate (prefault) pagetables.  */
+ # define MAP_NONBLOCK	0x10000		/* Do not block on IO.  */
+ # define MAP_STACK	0x20000		/* Allocation is for a stack.  */
+-# define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could
+ 					   be uninitialized. */
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/hppa/bits/mman.h b/libc/sysdeps/linux/hppa/bits/mman.h
+index 7f9bf4e..fc73c91 100644
+--- a/libc/sysdeps/linux/hppa/bits/mman.h
++++ b/libc/sysdeps/linux/hppa/bits/mman.h
+@@ -45,7 +45,7 @@
+ #define MAP_GROWSDOWN	0x8000		/* stack-like segment */
+ #define MAP_POPULATE	0x10000		/* populate (prefault) pagetables */
+ #define MAP_NONBLOCK	0x20000		/* do not block on IO */
+-#define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++#define MAP_UNINITIALIZED 0x4000000     /* For anonymous mmap, memory could
+ 					  be uninitialized. */
+ 
+ #define MS_SYNC		1		/* synchronous memory sync */
+diff --git a/libc/sysdeps/linux/mips/bits/mman.h b/libc/sysdeps/linux/mips/bits/mman.h
+index c480be4..f9a8128 100644
+--- a/libc/sysdeps/linux/mips/bits/mman.h
++++ b/libc/sysdeps/linux/mips/bits/mman.h
+@@ -66,7 +66,7 @@
+ # define MAP_LOCKED	0x8000		/* pages are locked */
+ # define MAP_POPULATE   0x10000         /* populate (prefault) pagetables */
+ # define MAP_NONBLOCK   0x20000         /* do not block on IO */
+-# define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could
+ 					   be uninitialized. */
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/powerpc/bits/mman.h b/libc/sysdeps/linux/powerpc/bits/mman.h
+index 2d234c5..b766cb6 100644
+--- a/libc/sysdeps/linux/powerpc/bits/mman.h
++++ b/libc/sysdeps/linux/powerpc/bits/mman.h
+@@ -63,7 +63,7 @@
+ # define MAP_NORESERVE	0x00040		/* Don't check for reservations.  */
+ # define MAP_POPULATE	0x08000		/* Populate (prefault) pagetables.  */
+ # define MAP_NONBLOCK	0x10000		/* Do not block on IO.  */
+-# define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could
+ 					   be uninitialized. */
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/sparc/bits/mman.h b/libc/sysdeps/linux/sparc/bits/mman.h
+index 74921e4..2463e7d 100644
+--- a/libc/sysdeps/linux/sparc/bits/mman.h
++++ b/libc/sysdeps/linux/sparc/bits/mman.h
+@@ -65,7 +65,7 @@
+ # define _MAP_NEW	0x80000000	/* Binary compatibility with SunOS.  */
+ # define MAP_POPULATE	0x8000		/* Populate (prefault) pagetables.  */
+ # define MAP_NONBLOCK	0x10000		/* Do not block on IO.  */
+-# define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could
+ 					   be uninitialized. */
+ #endif
+ 
+diff --git a/libc/sysdeps/linux/xtensa/bits/mman.h b/libc/sysdeps/linux/xtensa/bits/mman.h
+index fead3ac..dfd9e4c 100644
+--- a/libc/sysdeps/linux/xtensa/bits/mman.h
++++ b/libc/sysdeps/linux/xtensa/bits/mman.h
+@@ -64,7 +64,7 @@
+ # define MAP_NORESERVE	0x0400		/* Don't check for reservations.  */
+ # define MAP_POPULATE	0x10000		/* Populate (prefault) pagetables.  */
+ # define MAP_NONBLOCK	0x20000		/* Do not block on IO.  */
+-# define MAP_UNINITIALIZE 0x4000000     /* For anonymous mmap, memory could
++# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could
+ 					   be uninitialized. */
+ #endif
+ 
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0041-libc-add-posix_fallocate.patch b/package/uclibc/0.9.33.2/uclibc-0041-libc-add-posix_fallocate.patch
new file mode 100644
index 0000000000..64fb43d537
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0041-libc-add-posix_fallocate.patch
@@ -0,0 +1,337 @@
+From 8fc83b7f3fd7425aa4e96c870a7d46df1d81c16c Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Tue, 17 Apr 2012 09:30:15 +0200
+Subject: [PATCH] libc: add posix_fallocate()
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/fcntl.h                                  |    4 +-
+ libc/sysdeps/linux/common/Makefile.in            |    3 +-
+ libc/sysdeps/linux/common/bits/kernel-features.h |    8 ++
+ libc/sysdeps/linux/common/posix_fallocate.c      |   43 ++++++++
+ libc/sysdeps/linux/common/posix_fallocate64.c    |   39 +++++++
+ test/.gitignore                                  |    2 +
+ test/unistd/Makefile.in                          |    5 +-
+ test/unistd/tst-posix_fallocate.c                |  127 ++++++++++++++++++++++
+ test/unistd/tst-posix_fallocate64.c              |    2 +
+ 9 files changed, 228 insertions(+), 5 deletions(-)
+ create mode 100644 libc/sysdeps/linux/common/posix_fallocate.c
+ create mode 100644 libc/sysdeps/linux/common/posix_fallocate64.c
+ create mode 100644 test/unistd/tst-posix_fallocate.c
+ create mode 100644 test/unistd/tst-posix_fallocate64.c
+
+diff --git a/include/fcntl.h b/include/fcntl.h
+index 26ad1fe..c4a47af 100644
+--- a/include/fcntl.h
++++ b/include/fcntl.h
+@@ -210,9 +210,7 @@ extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len,
+ 
+ #endif
+ 
+-#if 0 /* && defined __UCLIBC_HAS_ADVANCED_REALTIME__ */
+-
+-/* FIXME -- uClibc should probably implement these... */
++#if defined __UCLIBC_HAS_ADVANCED_REALTIME__
+ 
+ /* Reserve storage for the data of the file associated with FD.
+ 
+diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
+index e9baa47..e4ac4ff 100644
+--- a/libc/sysdeps/linux/common/Makefile.in
++++ b/libc/sysdeps/linux/common/Makefile.in
+@@ -82,7 +82,8 @@ CSRC-$(UCLIBC_HAS_REALTIME) += clock_getres.c clock_gettime.c clock_settime.c \
+ 	sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \
+ 	sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c
+ # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait
+-CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c
++CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c \
++	posix_fallocate.c posix_fallocate64.c
+ CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c
+ CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c
+ CSRC-$(UCLIBC_HAS_XATTR) += xattr.c
+diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
+index 5665e24..13c7a63 100644
+--- a/libc/sysdeps/linux/common/bits/kernel-features.h
++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
+@@ -496,6 +496,14 @@
+ # define __ASSUME_PRIVATE_FUTEX	1
+ #endif
+ 
++/* Support for fallocate was added in 2.6.23,
++   on s390 only after 2.6.23-rc1, on alpha only after 2.6.33-rc1.  */
++#if __LINUX_KERNEL_VERSION >= 0x020617 \
++    && (!defined __s390__ || __LINUX_KERNEL_VERSION >= 0x020618) \
++    && (!defined __alpha__ || __LINUX_KERNEL_VERSION >= 0x020621)
++# define __ASSUME_FALLOCATE 1
++#endif
++
+ /* getcpu is a syscall for x86-64 since 3.1.  */
+ #if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
+ # define __ASSUME_GETCPU_SYSCALL        1
+diff --git a/libc/sysdeps/linux/common/posix_fallocate.c b/libc/sysdeps/linux/common/posix_fallocate.c
+new file mode 100644
+index 0000000..9aaa6ce
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_fallocate.c
+@@ -0,0 +1,43 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * posix_fallocate() for uClibc
++ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <fcntl.h>
++#include <bits/kernel-features.h>
++#include <stdint.h>
++
++#if defined __NR_fallocate
++int posix_fallocate(int fd, __off_t offset, __off_t len)
++{
++	int ret;
++
++# if __WORDSIZE == 32
++	uint32_t off_low = offset;
++	uint32_t len_low = len;
++	/* may assert that these >>31 are 0 */
++	uint32_t zero = 0;
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
++		__LONG_LONG_PAIR (zero, off_low),
++		__LONG_LONG_PAIR (zero, len_low)));
++# elif __WORDSIZE == 64
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 4, fd, 0, offset, len));
++# else
++# error your machine is neither 32 bit or 64 bit ... it must be magical
++#endif
++    if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
++      return INTERNAL_SYSCALL_ERRNO (ret, err);
++    return 0;
++}
++# if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64
++strong_alias(posix_fallocate,posix_fallocate64)
++# endif
++#endif
+diff --git a/libc/sysdeps/linux/common/posix_fallocate64.c b/libc/sysdeps/linux/common/posix_fallocate64.c
+new file mode 100644
+index 0000000..818d868
+--- /dev/null
++++ b/libc/sysdeps/linux/common/posix_fallocate64.c
+@@ -0,0 +1,39 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * posix_fallocate() for uClibc
++ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <fcntl.h>
++#include <bits/kernel-features.h>
++#include <stdint.h>
++
++#if defined __NR_fallocate
++
++# if __WORDSIZE == 64
++/* Can use normal posix_fallocate() */
++# elif __WORDSIZE == 32
++int posix_fallocate64(int fd, __off64_t offset, __off64_t len)
++{
++	int ret;
++	uint32_t off_low = offset & 0xffffffff;
++	uint32_t off_high = offset >> 32;
++	uint32_t len_low = len & 0xffffffff;
++	uint32_t len_high = len >> 32;
++	INTERNAL_SYSCALL_DECL(err);
++	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
++		__LONG_LONG_PAIR (off_high, off_low),
++		__LONG_LONG_PAIR (len_high, len_low)));
++    if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
++      return INTERNAL_SYSCALL_ERRNO (ret, err);
++    return 0;
++}
++# else
++# error your machine is neither 32 bit or 64 bit ... it must be magical
++# endif
++#endif
+diff --git a/test/.gitignore b/test/.gitignore
+index 7234c48..ef152e9 100644
+--- a/test/.gitignore
++++ b/test/.gitignore
+@@ -305,6 +305,8 @@ unistd/getcwd
+ unistd/getopt
+ unistd/getopt_long
+ unistd/tstgetopt
++unistd/tst-posix_fallocate
++unistd/tst-posix_fallocate64
+ unistd/tst-preadwrite
+ unistd/tst-preadwrite64
+ unistd/vfork
+diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
+index c542f98..24b9a37 100644
+--- a/test/unistd/Makefile.in
++++ b/test/unistd/Makefile.in
+@@ -2,7 +2,10 @@
+ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ 
+ ifeq ($(UCLIBC_HAS_LFS),)
+-TESTS_DISABLED := tst-preadwrite64
++TESTS_DISABLED := tst-preadwrite64 tst-posix_fallocate64
++endif
++ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),)
++TESTS_DISABLED := tst-posix_fallocate
+ endif
+ OPTS_getopt      := -abcXXX -9
+ OPTS_getopt_long := --add XXX --delete YYY --verbose
+diff --git a/test/unistd/tst-posix_fallocate.c b/test/unistd/tst-posix_fallocate.c
+new file mode 100644
+index 0000000..d41c604
+--- /dev/null
++++ b/test/unistd/tst-posix_fallocate.c
+@@ -0,0 +1,127 @@
++#include <fcntl.h>
++#include <sys/stat.h>
++
++#ifndef TST_POSIX_FALLOCATE64
++# define stat64 stat
++# define fstat64 fstat
++# else
++# ifndef O_LARGEFILE
++#  error no O_LARGEFILE but you want to test with LFS enabled
++# endif
++#endif
++
++static void do_prepare (void);
++#define PREPARE(argc, argv) do_prepare ()
++static int do_test (void);
++#define TEST_FUNCTION do_test ()
++#include <test-skeleton.c>
++
++static int fd;
++static void
++do_prepare (void)
++{
++  fd = create_temp_file ("tst-posix_fallocate.", NULL);
++  if (fd == -1)
++    {
++      printf ("cannot create temporary file: %m\n");
++      exit (1);
++    }
++}
++
++
++static int
++do_test (void)
++{
++  struct stat64 st;
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("1st fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 0)
++    {
++      puts ("file not created with size 0");
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 512, 768) != 0)
++    {
++      puts ("1st posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("2nd fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 512 + 768)
++    {
++      printf ("file size after 1st posix_fallocate call is %llu, expected %u\n",
++	      (unsigned long long int) st.st_size, 512u + 768u);
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 0, 1024) != 0)
++    {
++      puts ("2nd posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("3rd fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 512 + 768)
++    {
++      puts ("file size changed in 2nd posix_fallocate");
++      return 1;
++    }
++
++  if (posix_fallocate (fd, 2048, 64) != 0)
++    {
++      puts ("3rd posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("4th fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 2048 + 64)
++    {
++      printf ("file size after 3rd posix_fallocate call is %llu, expected %u\n",
++	      (unsigned long long int) st.st_size, 2048u + 64u);
++      return 1;
++    }
++#ifdef TST_POSIX_FALLOCATE64
++  if (posix_fallocate64 (fd, 4097ULL, 4294967295ULL + 2ULL) != 0)
++    {
++      puts ("4th posix_fallocate call failed");
++      return 1;
++    }
++
++  if (fstat64 (fd, &st) != 0)
++    {
++      puts ("5th fstat failed");
++      return 1;
++    }
++
++  if (st.st_size != 4097ULL + 4294967295ULL + 2ULL)
++    {
++      printf ("file size after 4th posix_fallocate call is %llu, expected %llu\n",
++	      (unsigned long long int) st.st_size, 4097ULL + 4294967295ULL + 2ULL);
++      return 1;
++    }
++#endif
++  close (fd);
++
++  return 0;
++}
+diff --git a/test/unistd/tst-posix_fallocate64.c b/test/unistd/tst-posix_fallocate64.c
+new file mode 100644
+index 0000000..b1ee0ff
+--- /dev/null
++++ b/test/unistd/tst-posix_fallocate64.c
+@@ -0,0 +1,2 @@
++#define TST_POSIX_FALLOCATE64
++#include "tst-posix_fallocate.c"
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0042-nice-fix-overflow-checking-in-int_add_no_wrap.patch b/package/uclibc/0.9.33.2/uclibc-0042-nice-fix-overflow-checking-in-int_add_no_wrap.patch
new file mode 100644
index 0000000000..a6e6349cb8
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0042-nice-fix-overflow-checking-in-int_add_no_wrap.patch
@@ -0,0 +1,44 @@
+From e6735556ed0a5e791ea81a015a90c130a0eea060 Mon Sep 17 00:00:00 2001
+From: Xi Wang <xi@mit.edu>
+Date: Wed, 20 Feb 2013 12:45:45 -0500
+Subject: [PATCH] nice: fix overflow checking in int_add_no_wrap()
+
+In C, signed integer overflow is undefined behavior.  Many compilers
+optimize away checks like `a + b < a'.
+
+Use safe precondition testing instead.
+
+Signed-off-by: Xi Wang <xi@mit.edu>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/sysdeps/linux/common/nice.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c
+index 3694db8..ed39946 100644
+--- a/libc/sysdeps/linux/common/nice.c
++++ b/libc/sysdeps/linux/common/nice.c
+@@ -25,15 +25,15 @@ static __inline__ _syscall1(int, __syscall_nice, int, incr)
+ 
+ static __inline__ int int_add_no_wrap(int a, int b)
+ {
+-	int s = a + b;
+-
+ 	if (b < 0) {
+-		if (s > a) s = INT_MIN;
++		if (a < INT_MIN - b)
++			return INT_MIN;
+ 	} else {
+-		if (s < a) s = INT_MAX;
++		if (a > INT_MAX - b)
++			return INT_MAX;
+ 	}
+ 
+-	return s;
++	return a + b;
+ }
+ 
+ static __inline__ int __syscall_nice(int incr)
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch b/package/uclibc/0.9.33.2/uclibc-0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch
new file mode 100644
index 0000000000..06fe6626c6
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch
@@ -0,0 +1,86 @@
+From 0600966321c011c31edbb60945bbdca3fa34b7cb Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Mon, 25 Feb 2013 09:41:25 +0000
+Subject: [PATCH] buildsys: Add missing $(SYMBOL_PREFIX) to symbol names
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ Makerules                   |    2 +-
+ ldso/ldso/Makefile.in       |    2 +-
+ ldso/ldso/bfin/dl-startup.h |    5 +----
+ ldso/libdl/Makefile.in      |    2 +-
+ libpthread/nptl/Makefile.in |    2 +-
+ 5 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/Makerules b/Makerules
+index 60acaa8..28bbdef 100644
+--- a/Makerules
++++ b/Makerules
+@@ -300,7 +300,7 @@ define create-lds
+ 	-Wl,-z,relro -Wl,--hash-style=gnu -Wl,-z,defs \
+ 	-Wl,--verbose 2>&1 | LC_ALL=C \
+ 	sed -e '/^=========/,/^=========/!d;/^=========/d' \
+-	-e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' > $@.lds
++	-e 's/\. = .* + SIZEOF_HEADERS;/& $(SYMBOL_PREFIX)_begin = . - SIZEOF_HEADERS;/' > $@.lds
+ endef
+ 
+ define link.so
+diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
+index eb1570a..91165c6 100644
+--- a/ldso/ldso/Makefile.in
++++ b/ldso/ldso/Makefile.in
+@@ -36,7 +36,7 @@ LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS)
+ else
+ LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
+ endif
+-LDFLAGS-$(UCLIBC_LDSO_NAME).so += -Wl,-e,_start -Wl,-z,now -Wl,-Bsymbolic \
++LDFLAGS-$(UCLIBC_LDSO_NAME).so += -Wl,-e,$(SYMBOL_PREFIX)_start -Wl,-z,now -Wl,-Bsymbolic \
+ 	-Wl,--export-dynamic $(CFLAG_-Wl--sort-common) -Wl,--discard-locals \
+ 	$(CFLAG_-Wl--discard-all) -Wl,--no-undefined
+ 
+diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h
+index 76ae150..860b7c6 100644
+--- a/ldso/ldso/bfin/dl-startup.h
++++ b/ldso/ldso/bfin/dl-startup.h
+@@ -40,10 +40,7 @@ __asm__(
+ 	"	.text\n"
+ 	"	.global	__start\n"
+ 	"	.type	__start,@function\n"
+-	/* Build system expects a "_start" for the entry point;
+-	   provide it as it's free to do so with aliases.  */
+-	"	.set	_start, __start\n"
+-	"	.global	_start\n"
++	"	.hidden	__start\n"
+ 	"__start:\n"
+ 	"	call	.Lcall\n"
+ 	".Lcall:\n"
+diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
+index be236c8..edf95a6 100644
+--- a/ldso/libdl/Makefile.in
++++ b/ldso/libdl/Makefile.in
+@@ -23,7 +23,7 @@ LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libdl.so := -Wl,--dsbt-index=3
+ LDFLAGS-libdl.so := $(LDFLAGS)
+ 
+ ifeq ($(LDSO_NO_CLEANUP),)
+-LDFLAGS-libdl.so += -Wl,-fini,dl_cleanup
++LDFLAGS-libdl.so += -Wl,-fini,$(SYMBOL_PREFIX)dl_cleanup
+ endif
+ 
+ LIBS-libdl.so := $(LIBS) $(ldso)
+diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
+index 158bcae..0008822 100644
+--- a/libpthread/nptl/Makefile.in
++++ b/libpthread/nptl/Makefile.in
+@@ -145,7 +145,7 @@ LDFLAGS-libpthread.so += $(LDFLAGS)
+ endif
+ 
+ LDFLAGS-libpthread.so += $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so $(top_builddir)lib/libdl-$(VERSION).so \
+-	-Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal
++	-Wl,-z,nodelete,-z,initfirst,-init=$(SYMBOL_PREFIX)__pthread_initialize_minimal_internal
+ 
+ LIBS-libpthread.so := $(LIBS)
+ 
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0044-inet-do-not-filter-responses-in-res_query.patch b/package/uclibc/0.9.33.2/uclibc-0044-inet-do-not-filter-responses-in-res_query.patch
new file mode 100644
index 0000000000..0a8c94bb57
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0044-inet-do-not-filter-responses-in-res_query.patch
@@ -0,0 +1,46 @@
+From 5e40582d549b4a186de2fea9efafadd06904424c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Thu, 18 Jun 2009 06:55:46 +0000
+Subject: [PATCH] inet: do not filter responses in res_query
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes bug #5342
+
+res_query was silently rejecting responses against T_ANY DNS
+questions.
+
+Remove the type-filtering from res_query altogether.
+__dns_lookup is supposed to return the proper stuff that you asked
+for (and only that).
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/inet/resolv.c |    9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
+index e738098..7bd634c 100644
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3740,11 +3740,10 @@ int res_query(const char *dname, int class, int type,
+ 
+ 	free(a.dotted);
+ 
+-	if (a.atype == type) { /* CNAME */
+-		if (i > anslen)
+-			i = anslen;
+-		memcpy(answer, packet, i);
+-	}
++	if (i > anslen)
++		i = anslen;
++	memcpy(answer, packet, i);
++
+ 	free(packet);
+ 	return i;
+ }
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0045-Remove-pragma-weak-for-undeclared-symbol.patch b/package/uclibc/0.9.33.2/uclibc-0045-Remove-pragma-weak-for-undeclared-symbol.patch
new file mode 100644
index 0000000000..19a06473c6
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0045-Remove-pragma-weak-for-undeclared-symbol.patch
@@ -0,0 +1,39 @@
+From 9a7b71facfcaee5f3a45429358c55fcd5377c509 Mon Sep 17 00:00:00 2001
+From: Bernd Schmidt <bernds@codesourcery.com>
+Date: Tue, 24 Jul 2012 15:39:48 +0200
+Subject: [PATCH] Remove pragma weak for undeclared symbol
+
+pthread_initialize is a static function and should not be mentioned in a
+header.  The #pragma weak for it appears to confuse gcc-4.7.
+
+see gcc PR middle-end/36282
+
+Signed-off-by: Bernd Schmidt <bernds@codesourcery.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
+index 78593ac..f41375b 100644
+--- a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
++++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
+@@ -375,7 +375,6 @@ weak_extern (BP_SYM (__pthread_key_create))
+ weak_extern (BP_SYM (__pthread_setspecific))
+ weak_extern (BP_SYM (__pthread_getspecific))
+ weak_extern (BP_SYM (__pthread_once))
+-weak_extern (__pthread_initialize)
+ weak_extern (__pthread_atfork)
+ weak_extern (BP_SYM (_pthread_cleanup_push))
+ weak_extern (BP_SYM (_pthread_cleanup_pop))
+@@ -400,7 +399,6 @@ weak_extern (BP_SYM (_pthread_cleanup_pop_restore))
+ #  pragma weak __pthread_setspecific
+ #  pragma weak __pthread_getspecific
+ #  pragma weak __pthread_once
+-#  pragma weak __pthread_initialize
+ #  pragma weak __pthread_atfork
+ #  pragma weak _pthread_cleanup_push_defer
+ #  pragma weak _pthread_cleanup_pop_restore
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0046-inet-fix-getting-the-nameserver-from-_res-state-afte.patch b/package/uclibc/0.9.33.2/uclibc-0046-inet-fix-getting-the-nameserver-from-_res-state-afte.patch
new file mode 100644
index 0000000000..c294a46fc7
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0046-inet-fix-getting-the-nameserver-from-_res-state-afte.patch
@@ -0,0 +1,34 @@
+From 41063cebafa7b90427837757db00cdbfe2690f82 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Fri, 21 Sep 2012 17:29:12 +0200
+Subject: [PATCH] inet: fix getting the nameserver from _res state after
+ res_init.
+
+Fixes displaying the nameserver in busybox nslookup.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/inet/resolv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
+index 7bd634c..6f58260 100644
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3653,11 +3653,11 @@ res_init(void)
+ 	 */
+ 	if (!_res.id)
+ 		_res.id = res_randomid();
+-	__res_sync = res_sync_func;
+ 
+ 	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
+ 
+ 	__res_vinit(&_res, 1);
++	__res_sync = res_sync_func;
+ 
+ 	return 0;
+ }
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0047-_vfprintf.c-use-fputws_unlocked-S-F-instead-of-fputw.patch b/package/uclibc/0.9.33.2/uclibc-0047-_vfprintf.c-use-fputws_unlocked-S-F-instead-of-fputw.patch
new file mode 100644
index 0000000000..426835021d
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0047-_vfprintf.c-use-fputws_unlocked-S-F-instead-of-fputw.patch
@@ -0,0 +1,30 @@
+From 543460903545b59903bc83221a6cea02afd0e04f Mon Sep 17 00:00:00 2001
+From: Mirko Vogt <dev@nanl.de>
+Date: Fri, 21 Sep 2012 17:29:15 +0200
+Subject: [PATCH] _vfprintf.c: use 'fputws_unlocked(S, F)' instead of
+ 'fputws(S, F)'
+
+This eliminates a source of reproduceable freezes
+
+Signed-off-by: Mirko Vogt <dev@nanl.de>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/stdio/_vfprintf.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
+index 3db8cdf..069db16 100644
+--- a/libc/stdio/_vfprintf.c
++++ b/libc/stdio/_vfprintf.c
+@@ -1229,7 +1229,7 @@ static size_t _fp_out_narrow(FILE *fp, intptr_t type, intptr_t len, intptr_t buf
+ #define STRLEN  wcslen
+ #define _PPFS_init _ppwfs_init
+ /* Pulls in fseek: */
+-#define OUTPUT(F,S)			fputws(S,F)
++#define OUTPUT(F,S)			fputws_unlocked(S,F)
+ /* TODO: #define OUTPUT(F,S)		_wstdio_fwrite((S),wcslen(S),(F)) */
+ #define _outnwcs(stream, wstring, len)	_wstdio_fwrite((const wchar_t *)(wstring), len, stream)
+ #define FP_OUT _fp_out_wide
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0048-Fix-a-problem-with-scanning-wide-chars.patch b/package/uclibc/0.9.33.2/uclibc-0048-Fix-a-problem-with-scanning-wide-chars.patch
new file mode 100644
index 0000000000..4baf8597a1
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0048-Fix-a-problem-with-scanning-wide-chars.patch
@@ -0,0 +1,66 @@
+From 12846e741d925630a4079ac02290b28c6f00b887 Mon Sep 17 00:00:00 2001
+From: Nathan Sidwell <nathan@codesourcery.com>
+Date: Fri, 22 Mar 2013 17:46:52 +0100
+Subject: [PATCH] Fix a problem with scanning wide chars.
+
+We found that the testcase
+
+int
+main (void)
+{
+  wchar_t s[10];
+  memset (s, 0, sizeof (s));
+  int r = sscanf ("s", "%ls", s);
+  printf ("%d\n", r);
+  printf ("%ls\n", s);
+  return 0;
+}
+
+printed
+0
+<blankline>
+
+rather than the expected
+1
+s
+
+The problem was the enum in _scanf.c, which has had a 'CONV_m' value
+inserted. The attached patch fixes the problem in __psfs_parse_spec by
+not presuming a particular displacement between the two sets of
+char-like conversion values. With this patch the above program produces
+the expected output.
+
+Signed-off-by: Nathan Sidwell <nathan@codesourcery.com>
+Signed-off-by: Bernd Schmidt <bernds@codesourcery.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/stdio/_scanf.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
+index 952853c..3848a09 100644
+--- a/libc/stdio/_scanf.c
++++ b/libc/stdio/_scanf.c
+@@ -429,8 +429,8 @@ libc_hidden_def(vswscanf)
+ /*                       npxXoudif eEgG  CS  cs[ */
+ /* NOTE: the 'm' flag must come before any convs that support it */
+ 
+-/* NOTE: Ordering is important!  In particular, CONV_LEFTBRACKET
+- * must immediately precede CONV_c. */
++/* NOTE: Ordering is important!  The CONV_{C,S,LEFTBRACKET} must map
++   simply to their lowercase equivalents.  */
+ 
+ enum {
+ 	CONV_n = 0,
+@@ -921,7 +921,7 @@ int attribute_hidden __psfs_parse_spec(register psfs_t *psfs)
+ 				psfs->dataargtype = PA_FLAG_LONG;
+ 			} else if ((p_m_spec_chars >= CONV_c)
+ 				&& (psfs->dataargtype & PA_FLAG_LONG)) {
+-				p_m_spec_chars -= 3; /* lc -> C, ls -> S, l[ -> ?? */
++				p_m_spec_chars -= CONV_c - CONV_C; /* lc -> C, ls -> S, l[ -> ?? */
+ 			}
+ 
+ 			psfs->conv_num = p_m_spec_chars;
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0049-Fix-some-fragileness-in-dlopen-do_dlopen-wrapper-wor.patch b/package/uclibc/0.9.33.2/uclibc-0049-Fix-some-fragileness-in-dlopen-do_dlopen-wrapper-wor.patch
new file mode 100644
index 0000000000..1c220db437
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0049-Fix-some-fragileness-in-dlopen-do_dlopen-wrapper-wor.patch
@@ -0,0 +1,66 @@
+From 2f0580cece3ab2baaf9214f434c7146e389566a4 Mon Sep 17 00:00:00 2001
+From: Nathan Sidwell <nathan@codesourcery.com>
+Date: Fri, 22 Mar 2013 17:48:51 +0100
+Subject: [PATCH] Fix some fragileness in dlopen/do_dlopen wrapper & worker
+ pair.
+
+do_dlopen contains __builtin_return_address to determine from
+whence it was called, and uses that to determine which dynamic
+object's data it should use to start the search.  (In the bug I was
+tracking, this related to whether the application's RPATH was used or
+not.)  For that to work, it has to have been inlined into the wrapper
+function.
+
+As it happens, it wasn't being inlined.  That's an unfortunate compiler
+behaviour, but it isn't wrong and shouldn't have caused dlopen to fail.
+
+This patch changes things so the wrapper function determines the
+return address, and passes it to the worker.  If the worker's inlined,
+the generated code should be exactly the same as before.
+
+Signed-off-by: Nathan Sidwell <nathan@codesourcery.com>
+Signed-off-by: Bernd Schmidt <bernds@codesourcery.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ ldso/libdl/libdl.c |    8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
+index 71ade1f..018c720 100644
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -296,11 +296,10 @@ static ptrdiff_t _dl_build_local_scope (struct elf_resolve **list,
+ 	return p - list;
+ }
+ 
+-static void *do_dlopen(const char *libname, int flag)
++static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+ {
+ 	struct elf_resolve *tpnt, *tfrom;
+ 	struct dyn_elf *dyn_chain, *rpnt = NULL, *dyn_ptr, *relro_ptr, *handle;
+-	ElfW(Addr) from;
+ 	struct elf_resolve *tpnt1;
+ 	void (*dl_brk) (void);
+ 	int now_flag;
+@@ -320,8 +319,6 @@ static void *do_dlopen(const char *libname, int flag)
+ 		return NULL;
+ 	}
+ 
+-	from = (ElfW(Addr)) __builtin_return_address(0);
+-
+ 	if (!_dl_init) {
+ 		_dl_init = true;
+ 		_dl_malloc_function = malloc;
+@@ -661,7 +658,8 @@ void *dlopen(const char *libname, int flag)
+ 	void *ret;
+ 
+ 	__UCLIBC_MUTEX_CONDITIONAL_LOCK(_dl_mutex, 1);
+-	ret = do_dlopen(libname, flag);
++	ret = do_dlopen(libname, flag,
++			(ElfW(Addr)) __builtin_return_address(0));
+ 	__UCLIBC_MUTEX_CONDITIONAL_UNLOCK(_dl_mutex, 1);
+ 
+ 	return ret;
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0050-libdl-fix-dlopen-implementation-from-statically-link.patch b/package/uclibc/0.9.33.2/uclibc-0050-libdl-fix-dlopen-implementation-from-statically-link.patch
new file mode 100644
index 0000000000..87a852b5e2
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0050-libdl-fix-dlopen-implementation-from-statically-link.patch
@@ -0,0 +1,60 @@
+From 7f82a682a730899d30d8640b6af5178919339837 Mon Sep 17 00:00:00 2001
+From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Date: Thu, 9 May 2013 09:04:20 +0200
+Subject: [PATCH] libdl: fix dlopen implementation from statically linked
+ application
+
+Calling dlopen from statically linked application is actually broken,
+because _dl_find_hash enters into an infinite loop when trying to
+resolve symbols. In this case it doesn't need to extend the global
+scope, it is readyto be used as it is, because _dl_loaded_modules already points
+to the dlopened library.
+
+The patch also fixesi a typo in __LDSO_LD_LIBRARY_PATH__ macro, that was
+preventing to get the actual value of the LD_LIBRARY_PATH.
+
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit 231e4a9b4b972662a6832f714a05525a3754892d)
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ ldso/libdl/libdl.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
+index 018c720..49711a8 100644
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -374,7 +374,7 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+ 	if (getenv("LD_BIND_NOW"))
+ 		now_flag = RTLD_NOW;
+ 
+-#if !defined SHARED && defined __LDSO_LIBRARY_PATH__
++#if !defined SHARED && defined __LDSO_LD_LIBRARY_PATH__
+ 	/* When statically linked, the _dl_library_path is not yet initialized */
+ 	_dl_library_path = getenv("LD_LIBRARY_PATH");
+ #endif
+@@ -541,11 +541,18 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+ 	 * to the GOT tables.  We need to do this in reverse order so that COPY
+ 	 * directives work correctly */
+ 
+-	/* Get the tail of the list */
++#ifdef SHARED
++	/*
++	 * Get the tail of the list.
++	 * In the static case doesn't need to extend the global scope, it is
++	 * ready to be used as it is, because _dl_loaded_modules already points
++	 * to the dlopened library.
++	 */
+ 	for (ls = &_dl_loaded_modules->symbol_scope; ls && ls->next; ls = ls->next);
+ 
+ 	/* Extend the global scope by adding the local scope of the dlopened DSO. */
+ 	ls->next = &dyn_chain->dyn->symbol_scope;
++#endif
+ #ifdef __mips__
+ 	/*
+ 	 * Relocation of the GOT entries for MIPS have to be done
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0051-libubacktrace-fix-backtrace-for-statically-linked-ap.patch b/package/uclibc/0.9.33.2/uclibc-0051-libubacktrace-fix-backtrace-for-statically-linked-ap.patch
new file mode 100644
index 0000000000..b208484854
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0051-libubacktrace-fix-backtrace-for-statically-linked-ap.patch
@@ -0,0 +1,168 @@
+From 6b2250a1a39362abe53e78a45897caecf65ec73f Mon Sep 17 00:00:00 2001
+From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Date: Thu, 9 May 2013 11:42:23 +0200
+Subject: [PATCH] libubacktrace: fix backtrace for statically linked
+ application
+
+libgcc_s.so's unwinder could not access unwind tables of statically
+linked binaries, so we really want to use _Unwind_* stuff from
+libgcc_eh.a.
+It required to build backtrace.c differentiating between shared and
+static case.
+
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit 71c10c484e7dc113396cccb7e503befb759c6346)
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libubacktrace/Makefile.in       |   23 ++++++++++++++---------
+ libubacktrace/arm/Makefile.arch |    2 +-
+ libubacktrace/arm/backtrace.c   |    7 +++++++
+ libubacktrace/backtrace.c       |    7 +++++++
+ 4 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/libubacktrace/Makefile.in b/libubacktrace/Makefile.in
+index 8a4b081..612bf2d 100644
+--- a/libubacktrace/Makefile.in
++++ b/libubacktrace/Makefile.in
+@@ -25,11 +25,13 @@ libubacktrace_ARCH_OUT:=$(libubacktrace_OUT)/$(TARGET_ARCH)
+ -include $(libubacktrace_ARCH_DIR)/Makefile.arch
+ 
+ libubacktrace_SRC-y :=
+-libubacktrace_SRC-$(UCLIBC_HAS_BACKTRACE) := backtrace.c backtracesyms.c backtracesymsfd.c
++libubacktrace_SRC-$(UCLIBC_HAS_BACKTRACE) := backtracesyms.c backtracesymsfd.c
++libubacktrace_SRC_SHARED-$(UCLIBC_HAS_BACKTRACE) := backtrace.c
+ 
+ # remove generic sources, if arch specific version is present
+ ifneq ($(strip $(libubacktrace_ARCH_SRC-y)),)
+ libubacktrace_SRC-y := $(filter-out $(notdir $(libubacktrace_ARCH_SRC-y)),$(libubacktrace_SRC-y))
++libubacktrace_SRC_SHARED-y := $(filter-out $(notdir $(libubacktrace_ARCH_SRC-y)),$(libubacktrace_SRC_SHARED-y))
+ endif
+ 
+ # -fasynchronous-unwind-tables is required for backtrace to work using dwarf2
+@@ -43,12 +45,19 @@ endif
+ libubacktrace_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SRC-y))
+ libubacktrace_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.o,$(libubacktrace_SRCS))
+ 
++libubacktrace_SHARED_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SHARED_SRC-y))
++libubacktrace_SHARED_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.s,$(libubacktrace_SHARED_SRCS))
++
++libubacktrace-shared-y	:= $(libubacktrace_SHARED_OBJS:.os=.oS)
++libubacktrace-static-y	:= $(libubacktrace_SHARED_OBJS)
++
+ ifeq ($(DOPIC),y)
+-libubacktrace-a-y += $(libubacktrace_OBJS:.o=.os)
++libubacktrace-a-y += $(libubacktrace_OBJS:.o=.os) $(libubacktrace-static-y:.o=.os)
+ else
+-libubacktrace-a-y += $(libubacktrace_OBJS)
++libubacktrace-a-y += $(libubacktrace_OBJS) $(libubacktrace-static-y)
+ endif
+-libubacktrace-so-y += $(libubacktrace_OBJS:.o=.os)
++libubacktrace-so-y += $(libubacktrace_OBJS:.o=.os) $(libubacktrace-shared-y)
++
+ 
+ lib-a-$(UCLIBC_HAS_BACKTRACE) += $(top_builddir)lib/libubacktrace.a
+ lib-so-$(UCLIBC_HAS_BACKTRACE) += $(top_builddir)lib/libubacktrace.so
+@@ -56,11 +65,7 @@ lib-so-$(UCLIBC_HAS_BACKTRACE) += $(top_builddir)lib/libubacktrace.so
+ objclean-y += CLEAN_libubacktrace
+ 
+ ifeq ($(DOMULTI),n)
+-ifeq ($(DOPIC),y)
+-$(top_builddir)lib/libubacktrace.so: $(top_builddir)lib/libubacktrace.a $(libdl.depend)
+-else
+ $(top_builddir)lib/libubacktrace.so: $(libubacktrace_OUT)/libubacktrace_so.a $(libdl.depend)
+-endif
+ 	$(call link.so,$(libubacktrace_FULL_NAME),$(ABI_VERSION))
+ else
+ $(top_builddir)lib/libubacktrace.so: $(libubacktrace_OUT)/libubacktrace.oS | $(libdl.depend)
+@@ -71,7 +76,7 @@ $(libubacktrace_OUT)/libubacktrace_so.a: $(libubacktrace-so-y)
+ 	$(Q)$(RM) $@
+ 	$(do_ar)
+ 
+-$(libubacktrace_OUT)/libubacktrace.oS: $(libubacktrace_SRCS) $(libubacktrace_ARCH_SRCS)
++$(libubacktrace_OUT)/libubacktrace.oS: $(libubacktrace_SRCS) $(libubacktrace_ARCH_SRCS) $(libubacktrace_SHARED_SRCS)
+ 	$(Q)$(RM) $@
+ 	$(compile-m)
+ 
+diff --git a/libubacktrace/arm/Makefile.arch b/libubacktrace/arm/Makefile.arch
+index 53b8c0e..b3fb500 100644
+--- a/libubacktrace/arm/Makefile.arch
++++ b/libubacktrace/arm/Makefile.arch
+@@ -14,4 +14,4 @@ libubacktrace-a-y+=$(libubacktrace_ARCH_OBJS:.o=.os)
+ else
+ libubacktrace-a-y+=$(libubacktrace_ARCH_OBJS)
+ endif
+-libubacktrace-so-y+=$(libubacktrace_ARCH_OBJS:.o=.os)
++libubacktrace-so-y+=$(libubacktrace_ARCH_OBJS:.o=.oS)
+diff --git a/libubacktrace/arm/backtrace.c b/libubacktrace/arm/backtrace.c
+index d4eca32..5955189 100644
+--- a/libubacktrace/arm/backtrace.c
++++ b/libubacktrace/arm/backtrace.c
+@@ -25,6 +25,7 @@ struct trace_arg
+   int cnt, size;
+ };
+ 
++#ifdef SHARED
+ static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
+ static _Unwind_VRS_Result (*unwind_vrs_get) (_Unwind_Context *,
+ 					     _Unwind_VRS_RegClass,
+@@ -42,6 +43,10 @@ static void backtrace_init (void)
+ 		abort();
+ 	}
+ }
++#else
++# define unwind_backtrace _Unwind_Backtrace
++# define unwind_vrs_get _Unwind_VRS_Get
++#endif
+ /* This function is identical to "_Unwind_GetGR", except that it uses
+    "unwind_vrs_get" instead of "_Unwind_VRS_Get".  */
+ static inline _Unwind_Word
+@@ -80,8 +85,10 @@ int backtrace (void **array, int size)
+ {
+ 	struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+ 
++#ifdef SHARED
+ 	if (unwind_backtrace == NULL)
+ 		backtrace_init();
++#endif
+ 
+ 	if (size >= 1)
+ 		unwind_backtrace (backtrace_helper, &arg);
+diff --git a/libubacktrace/backtrace.c b/libubacktrace/backtrace.c
+index fdd5981..1e0a0ec 100644
+--- a/libubacktrace/backtrace.c
++++ b/libubacktrace/backtrace.c
+@@ -33,6 +33,7 @@ struct trace_arg
+   int cnt, size;
+ };
+ 
++#ifdef SHARED
+ static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
+ static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
+ 
+@@ -47,6 +48,10 @@ static void backtrace_init (void)
+ 		abort();
+ 	}
+ }
++#else
++# define unwind_backtrace _Unwind_Backtrace
++# define unwind_getip _Unwind_GetIP
++#endif
+ 
+ static _Unwind_Reason_Code
+ backtrace_helper (struct _Unwind_Context *ctx, void *a)
+@@ -71,8 +76,10 @@ int backtrace (void **array, int size)
+ {
+ 	struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
+ 
++#ifdef SHARED
+ 	if (unwind_backtrace == NULL)
+ 		backtrace_init();
++#endif
+ 
+ 	if (size >= 1)
+ 		unwind_backtrace (backtrace_helper, &arg);
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0052-libubacktrace-fix-build-due-to-some-typos.patch b/package/uclibc/0.9.33.2/uclibc-0052-libubacktrace-fix-build-due-to-some-typos.patch
new file mode 100644
index 0000000000..42105cfd06
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0052-libubacktrace-fix-build-due-to-some-typos.patch
@@ -0,0 +1,39 @@
+From bcfb096af20bac667381c1601e54c78bcbb09d42 Mon Sep 17 00:00:00 2001
+From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Date: Mon, 13 May 2013 14:06:11 +0200
+Subject: [PATCH] libubacktrace: fix build due to some typos
+
+Commit 71c10c484e7dc113396cccb7e503befb759c6346 broke libubactrace build
+due to some typos, so that backtrace.o[sS] were not built.
+This definetively fixes this problem.
+
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit e19afed1bd3af6bf8976912517c0677d238309f8)
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libubacktrace/Makefile.in |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libubacktrace/Makefile.in b/libubacktrace/Makefile.in
+index 612bf2d..1cd5f83 100644
+--- a/libubacktrace/Makefile.in
++++ b/libubacktrace/Makefile.in
+@@ -45,10 +45,10 @@ endif
+ libubacktrace_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SRC-y))
+ libubacktrace_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.o,$(libubacktrace_SRCS))
+ 
+-libubacktrace_SHARED_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SHARED_SRC-y))
+-libubacktrace_SHARED_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.s,$(libubacktrace_SHARED_SRCS))
++libubacktrace_SHARED_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SRC_SHARED-y))
++libubacktrace_SHARED_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.o,$(libubacktrace_SHARED_SRCS))
+ 
+-libubacktrace-shared-y	:= $(libubacktrace_SHARED_OBJS:.os=.oS)
++libubacktrace-shared-y	:= $(libubacktrace_SHARED_OBJS:.o=.oS)
+ libubacktrace-static-y	:= $(libubacktrace_SHARED_OBJS)
+ 
+ ifeq ($(DOPIC),y)
+-- 
+1.7.10.4
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0053-libc-elf-explicitly-include-uClibc_page.h-to-make-PA.patch b/package/uclibc/0.9.33.2/uclibc-0053-libc-elf-explicitly-include-uClibc_page.h-to-make-PA.patch
new file mode 100644
index 0000000000..3197a21002
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0053-libc-elf-explicitly-include-uClibc_page.h-to-make-PA.patch
@@ -0,0 +1,30 @@
+From b8fb56dcd9686d1bdaf02c2f4f395bb185c093d7 Mon Sep 17 00:00:00 2001
+From: Carmelo Amoroso <carmelo.amoroso@st.com>
+Date: Mon, 27 May 2013 16:30:36 +0200
+Subject: [PATCH] libc: elf: explicitly include uClibc_page.h to make
+ PAGE_SIZE visible
+
+Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit 215c2868aca096364a4725a42c3ffb46dc4e8b39)
+
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+---
+ libc/misc/elf/dl-support.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libc/misc/elf/dl-support.c b/libc/misc/elf/dl-support.c
+index f194692..908fb06 100644
+--- a/libc/misc/elf/dl-support.c
++++ b/libc/misc/elf/dl-support.c
+@@ -19,6 +19,7 @@
+ #include <ldsodefs.h>
+ #include <string.h>
+ #endif
++#include <bits/uClibc_page.h>
+ 
+ #if defined(USE_TLS) && USE_TLS
+ 
+-- 
+1.7.10.4
+

From 741cbccb746b4bda41c5a51bf2d9d8977c902439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Tue, 3 Sep 2013 10:45:41 +0200
Subject: [PATCH 6024/6849] Fix build reproducibility in Make 3.82
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.

This patch sort results of wildcards to ensure reproducibility.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile                               | 2 +-
 boot/common.mk                         | 2 +-
 docs/manual/manual.mk                  | 2 +-
 fs/common.mk                           | 2 +-
 linux/linux.mk                         | 2 +-
 package/efl/efl.mk                     | 2 +-
 package/freescale-imx/freescale-imx.mk | 2 +-
 package/gcc/gcc.mk                     | 2 +-
 package/gtk2-themes/gtk2-themes.mk     | 2 +-
 package/matchbox/matchbox.mk           | 2 +-
 package/opengl/opengl.mk               | 2 +-
 package/qt5/qt5.mk                     | 2 +-
 package/x11r7/x11r7.mk                 | 2 +-
 support/dependencies/dependencies.mk   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 0d7476a4c6..3ca7313942 100644
--- a/Makefile
+++ b/Makefile
@@ -333,7 +333,7 @@ ifneq ($(PACKAGE_OVERRIDE_FILE),)
 -include $(PACKAGE_OVERRIDE_FILE)
 endif
 
-include package/*/*.mk
+include $(sort $(wildcard package/*/*.mk))
 
 include boot/common.mk
 include linux/linux.mk
diff --git a/boot/common.mk b/boot/common.mk
index b315fe8393..3021e51949 100644
--- a/boot/common.mk
+++ b/boot/common.mk
@@ -1 +1 @@
-include boot/*/*.mk
+include $(sort $(wildcard boot/*/*.mk))
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index 4906bc871f..bcbedad572 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -53,5 +53,5 @@ $(1)-clean:
 .PHONY: $(1) $(1)-clean manual-update-lists
 endef
 
-MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)
+MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*))
 $(eval $(call GENDOC,manual))
diff --git a/fs/common.mk b/fs/common.mk
index 36da2dd645..4dab7ea28b 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -94,4 +94,4 @@ define ROOTFS_TARGET
 $(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
 endef
 
-include fs/*/*.mk
+include $(sort $(wildcard fs/*/*.mk))
diff --git a/linux/linux.mk b/linux/linux.mk
index 025fd51aba..8508a54242 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -281,7 +281,7 @@ define LINUX_INSTALL_TARGET_CMDS
 	$(LINUX_INSTALL_HOST_TOOLS)
 endef
 
-include linux/linux-ext-*.mk
+include $(sort $(wildcard linux/linux-ext-*.mk))
 
 $(eval $(generic-package))
 
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index f284c93be7..1de68cf8fe 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -1,3 +1,3 @@
 EFL_VERSION = 1.7.7
 
-include package/efl/*/*.mk
+include $(sort $(wildcard package/efl/*/*.mk))
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 9f63ce3423..c8f99b6348 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -9,5 +9,5 @@ FREESCALE_IMX_VERSION = 1.1.0
 # No official download site from freescale, just this mirror
 FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
 
-include package/freescale-imx/*/*.mk
+include $(sort $(wildcard package/freescale-imx/*/*.mk))
 
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index ccba5e1586..6654b51674 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -220,4 +220,4 @@ HOST_GCC_COMMON_CONF_OPT += \
 	--with-long-double-128
 endif
 
-include package/gcc/*/*.mk
+include $(sort $(wildcard package/gcc/*/*.mk))
diff --git a/package/gtk2-themes/gtk2-themes.mk b/package/gtk2-themes/gtk2-themes.mk
index 6f31c6da98..fc66698a1d 100644
--- a/package/gtk2-themes/gtk2-themes.mk
+++ b/package/gtk2-themes/gtk2-themes.mk
@@ -1 +1 @@
-include package/gtk2-themes/*/*.mk
+include $(sort $(wildcard package/gtk2-themes/*/*.mk))
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index abda91559c..fff4add34b 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1,4 +1,4 @@
 ifeq ($(BR2_PACKAGE_MATCHBOX),y)
-include package/matchbox/*/*.mk
+include $(sort $(wildcard package/matchbox/*/*.mk))
 TARGETS+=matchbox-lib matchbox-wm
 endif
diff --git a/package/opengl/opengl.mk b/package/opengl/opengl.mk
index 68df3b171b..abf96d5c70 100644
--- a/package/opengl/opengl.mk
+++ b/package/opengl/opengl.mk
@@ -1 +1 @@
-include package/opengl/*/*.mk
+include $(sort $(wildcard package/opengl/*/*.mk))
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 9e71c83ce3..fce0ca3848 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,6 +1,6 @@
 QT5_VERSION = 5.0.2
 QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/
-include package/qt5/*/*.mk
+include $(sort $(wildcard package/qt5/*/*.mk))
 
 define QT5_LA_PRL_FILES_FIXUP
 	for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \
diff --git a/package/x11r7/x11r7.mk b/package/x11r7/x11r7.mk
index ea0363f6a0..85ecbc5968 100644
--- a/package/x11r7/x11r7.mk
+++ b/package/x11r7/x11r7.mk
@@ -1 +1 @@
-include package/x11r7/*/*.mk
+include $(sort $(wildcard package/x11r7/*/*.mk))
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index 4a220e0e02..149b8e5dcc 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -14,7 +14,7 @@ DEPENDENCIES_HOST_PREREQ :=
 define suitable-host-package
 $(shell support/dependencies/check-host-$(1).sh $(2))
 endef
--include support/dependencies/check-host-*.mk
+-include $(sort $(wildcard support/dependencies/check-host-*.mk))
 
 ifeq ($(BR2_STRIP_sstrip),y)
 DEPENDENCIES_HOST_PREREQ+=host-sstrip

From f8d89f051032a8835bdb77edec518e73170006c1 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 2 Aug 2013 11:05:14 +0200
Subject: [PATCH 6025/6849] infra: introduce suitable-extractor helper function

In order to simplify determining the right extractor tool for a given
file type, this patch introduces a make function 'suitable-extractor'.
Its usage is $(call suitable-extractor,filename), and it returns the
path to the suitable extractor.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/lsof/lsof.mk                     | 2 +-
 package/perl/perl.mk                     | 2 +-
 package/pkg-generic.mk                   | 4 +++-
 package/pkg-utils.mk                     | 2 ++
 package/tar/tar.mk                       | 2 +-
 toolchain/toolchain-external/ext-tool.mk | 6 +++---
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index f1c9474c61..693bb9183b 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -41,7 +41,7 @@ endif
 
 # The .tar.bz2 contains another .tar, which contains the source code.
 define LSOF_EXTRACT_CMDS
-        $(INFLATE.bz2) $(DL_DIR)/$(LSOF_SOURCE) | \
+        $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \
                 $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \
         $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -
 endef
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 25314f041e..5ef0b24151 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -30,7 +30,7 @@ endef
 PERL_POST_DOWNLOAD_HOOKS += PERL_CROSS_DOWNLOAD
 
 define PERL_CROSS_EXTRACT
-	$(INFLATE$(suffix $(PERL_CROSS_SOURCE))) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \
+	$(call suitable-extractor,$(PERL_CROSS_SOURCE)) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \
 	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
 endef
 PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 2e2e66f283..65ab8c63da 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -539,7 +539,9 @@ else ifeq ($$($(2)_SITE_METHOD),hg)
 DL_TOOLS_DEPENDENCIES += hg
 endif # SITE_METHOD
 
-DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE))))
+# $(firstword) is used here because the extractor can have arguments, like
+# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
+DL_TOOLS_DEPENDENCIES += $(firstword $(call suitable-extractor,$($(2)_SOURCE)))
 
 endif # $(2)_KCONFIG_VAR
 endef # inner-generic-package
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 15db0969e3..5930f2cfc2 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -62,6 +62,8 @@ INFLATE.tbz2 = $(BZCAT)
 INFLATE.tgz  = $(ZCAT)
 INFLATE.xz   = $(XZCAT)
 INFLATE.tar  = cat
+# suitable-extractor(filename): returns extractor based on suffix
+suitable-extractor = $(INFLATE$(suffix $(1)))
 
 # MESSAGE Macro -- display a message in bold type
 MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 3ffeaf083f..6198ffdfed 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -23,7 +23,7 @@ HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz
 define HOST_TAR_EXTRACT_CMDS
 	mkdir -p $(@D)
 	cd $(@D) && \
-		$(INFLATE.gz) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i
+		$(call suitable-extractor,$(HOST_TAR_SOURCE)) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i
 	mv $(@D)/tar-$(TAR_VERSION)/* $(@D)
 	rmdir $(@D)/tar-$(TAR_VERSION)
 endef
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index e92afbd401..d5023cfc1d 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -340,9 +340,9 @@ $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
 	mkdir -p $(@D)
-	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_1))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) | \
+	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE_1)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
-	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_2))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2) | \
+	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE_2)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2) | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
 	$(Q)touch $@
 else
@@ -352,7 +352,7 @@ $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 	mkdir -p $(@D)
-	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | \
+	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $^ | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
 	$(TOOLCHAIN_EXTERNAL_FIXUP_CMDS)
 	$(Q)touch $@

From d1f325f554cab7912e9221e91aba5b8aa97b1e3c Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Fri, 2 Aug 2013 11:05:15 +0200
Subject: [PATCH 6026/6849] xzcat: treat as host prerequisite and build if
 needed

If xzcat is not present on the host system, buildroot bails out early asking
the developer to install it (xzcat is now a DL_TOOLS_DEPENDENCY)
Conversely, when BR2_TARGET_ROOTFS_CPIO_XZ is enabled, then host-xz is a
build dependency, and no manual action is required from the developer.

Because the second approach is nicer, also build host-xz when xzcat is not
available, using the host-prerequisite and suitable-host-pkg mechanisms,
already used for tar.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk                   |  4 ++++
 support/dependencies/check-host-xzcat.mk |  7 +++++++
 support/dependencies/check-host-xzcat.sh | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 support/dependencies/check-host-xzcat.mk
 create mode 100755 support/dependencies/check-host-xzcat.sh

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 65ab8c63da..00f1cb31d2 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -541,7 +541,11 @@ endif # SITE_METHOD
 
 # $(firstword) is used here because the extractor can have arguments, like
 # ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
+# Do not add xzcat to the list of required dependencies, as it gets built
+# automatically if it isn't found.
+ifneq ($(call suitable-extractor,$($(2)_SOURCE)),$(XZCAT))
 DL_TOOLS_DEPENDENCIES += $(firstword $(call suitable-extractor,$($(2)_SOURCE)))
+endif
 
 endif # $(2)_KCONFIG_VAR
 endef # inner-generic-package
diff --git a/support/dependencies/check-host-xzcat.mk b/support/dependencies/check-host-xzcat.mk
new file mode 100644
index 0000000000..24286ef5c8
--- /dev/null
+++ b/support/dependencies/check-host-xzcat.mk
@@ -0,0 +1,7 @@
+# XZCAT is taken from BR2_XZCAT (defaults to 'xzcat') (see Makefile)
+# If it is not present, build our own host-xzcat
+
+ifeq (,$(call suitable-host-package,xzcat,$(XZCAT)))
+  DEPENDENCIES_HOST_PREREQ += host-xz
+  XZCAT = $(HOST_DIR)/usr/bin/xzcat
+endif
diff --git a/support/dependencies/check-host-xzcat.sh b/support/dependencies/check-host-xzcat.sh
new file mode 100755
index 0000000000..10f1c4562a
--- /dev/null
+++ b/support/dependencies/check-host-xzcat.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+candidate="$1"
+
+xzcat=`which $candidate 2>/dev/null`
+if [ ! -x "$xzcat" ]; then
+	xzcat=`which xzcat 2>/dev/null`
+	if [ ! -x "$xzcat" ]; then
+		# echo nothing: no suitable xzcat found
+		exit 1
+	fi
+fi
+
+echo $xzcat

From 3e2d828c0a5c69a4b2929f330426d93e47ec5d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Mon, 13 May 2013 17:51:52 +0200
Subject: [PATCH 6027/6849] Add support for plain URL in $(PKG)_PATCH variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until now, $(PKG)_PATCH allow only to download patches from same URL than tarball.
This patch allow to detect when plain URL are used in $(PKG)_PATCH and correctly
handle them.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pkg-generic.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 00f1cb31d2..4dd395b6ea 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -40,7 +40,12 @@ ifeq ($(DL_MODE),DOWNLOAD)
 	fi
 endif
 	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))
-	$(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))$(sep))
+	$(foreach p,$($(PKG)_PATCH),\
+		$(if $(findstring ://,$(p)),\
+			$(call DOWNLOAD,$(p)),\
+			$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))\
+		)\
+	$(sep))
 	$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
 ifeq ($(DL_MODE),DOWNLOAD)
 	$(Q)mkdir -p $(@D)
@@ -86,7 +91,7 @@ $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME)
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
 	$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
-	$(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(p)$(sep))
+	$(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))
 	$(Q)( \
 	for D in $(PATCH_BASE_DIRS); do \
 	  if test -d $${D}; then \

From e2fa8eb91c70ec084ba72c5b1f2ca180257b9441 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Wed, 4 Sep 2013 21:02:10 +0200
Subject: [PATCH 6028/6849] perf: Add host-bison, host-flex dependencies

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/perf/perf.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/perf/perf.mk b/package/perf/perf.mk
index 7787c787a1..120353f8e3 100644
--- a/package/perf/perf.mk
+++ b/package/perf/perf.mk
@@ -8,7 +8,7 @@
 PERF_SOURCE =
 PERF_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 
-PERF_DEPENDENCIES = linux
+PERF_DEPENDENCIES = linux host-flex host-bison
 
 PERF_MAKE_FLAGS = \
 	$(LINUX_MAKE_FLAGS) \
@@ -40,14 +40,14 @@ define PERF_BUILD_CMDS
 			exit 1 ; \
 		fi \
 	fi
-	$(MAKE) -C $(LINUX_DIR)/tools/perf \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/perf \
 		$(PERF_MAKE_FLAGS) O=$(@D)
 endef
 
 # After installation, we remove the Perl and Python scripts from the
 # target.
 define PERF_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(LINUX_DIR)/tools/perf \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/perf \
 		$(PERF_MAKE_FLAGS) O=$(@D) install
 	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
 endef

From 5f9b3824da896c223987cbbeba5e23538e42feaa Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Fri, 6 Sep 2013 23:36:18 +0200
Subject: [PATCH 6029/6849] trivial: correct capitalization of Lua in Config.in
 files

The Lua website says:
"Like most names, it should be written in lower case with an initial capital,
that is, "Lua". Please do not write it as "LUA", which is both ugly and
confusing, because then it becomes an acronym with different meanings for
different people."
http://www.lua.org/about.html

So, let's honor this request in buildroot.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in         | 2 +-
 package/dnsmasq/Config.in | 2 +-
 package/haserl/Config.in  | 4 ++--
 package/lua/Config.in     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index a94cb62efd..8ba3666285 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -326,7 +326,7 @@ source "package/jimtcl/Config.in"
 source "package/lua/Config.in"
 source "package/luajit/Config.in"
 if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT
-menu "LUA libraries/modules"
+menu "Lua libraries/modules"
 source "package/cgilua/Config.in"
 source "package/copas/Config.in"
 source "package/coxpcall/Config.in"
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index a6f5d96f88..a078145233 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -33,7 +33,7 @@ config BR2_PACKAGE_DNSMASQ_LUA
 	bool "Lua scripting support"
 	select BR2_PACKAGE_LUA
 	help
-	  Enable lua scripting for dnsmasq
+	  Enable Lua scripting for dnsmasq
 
 config BR2_PACKAGE_DNSMASQ_CONNTRACK
 	bool "conntrack marking support"
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 2d5cacfeb5..3db859a0e2 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -9,12 +9,12 @@ config BR2_PACKAGE_HASERL
 	  http://haserl.sourceforge.net/
 
 config BR2_PACKAGE_HASERL_WITH_LUA
-	bool "lua support"
+	bool "Lua support"
 	depends on BR2_PACKAGE_HASERL
 	depends on BR2_PACKAGE_HASERL_VERSION_0_9_X
 	select BR2_PACKAGE_LUA
 	help
-	  Enable LUA support for haserl
+	  Enable Lua support for haserl
 
 choice
 	prompt "Haserl version"
diff --git a/package/lua/Config.in b/package/lua/Config.in
index 4166730269..8c05d081e4 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -21,13 +21,13 @@ config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_NCURSES
 	help
-	  Enables command-line editing in the lua interpreter.
+	  Enables command-line editing in the Lua interpreter.
 
 config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
 	bool "linenoise support"
 	select BR2_PACKAGE_LINENOISE
 	help
-	  Enables command-line editing in the lua interpreter.
+	  Enables command-line editing in the Lua interpreter.
 
 endchoice
 

From e51b06e95c2355b96893823165985e23f0ecec99 Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Fri, 6 Sep 2013 11:06:00 -0500
Subject: [PATCH 6030/6849] libcap-ng: bump revision to 0.7.3

Also cleaned the package makefile up by removing explicitly naming
the source along with moving the configure of the package down below
the standard package declarations.

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcap-ng/libcap-ng.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index 97eb219eaa..53c7ee7dd8 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-LIBCAP_NG_VERSION = 0.6.6
+LIBCAP_NG_VERSION = 0.7.3
 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng/
-LIBCAP_NG_SOURCE = libcap-ng-$(LIBCAP_NG_VERSION).tar.gz
+LIBCAP_NG_LICENSE = GPLv2+ LGPLv2.1+
+LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
 LIBCAP_NG_INSTALL_STAGING = YES
+
 LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
 LIBCAP_NG_CONF_OPT = --without-python
-LIBCAP_NG_LICENSE = GPLv2+ LGPLv2.1+
-LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
 
 $(eval $(autotools-package))

From bafa8fcc6ce90553843b5c24e68de57c40f94abe Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Fri, 6 Sep 2013 11:35:44 -0500
Subject: [PATCH 6031/6849] host-swig: bump version to 2.0.10

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/swig/swig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 4cc883c22b..94395ee10d 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SWIG_VERSION = 2.0.9
+SWIG_VERSION = 2.0.10
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
 SWIG_DEPENDENCIES = host-bison
 HOST_SWIG_CONF_OPT = --without-pcre --disable-ccache

From adf6511013b8921d6856f5dc0e053cdd27891244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Fri, 30 Aug 2013 11:05:57 +0200
Subject: [PATCH 6032/6849] Remove multimedia subdirectory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unless it was a group of sub-packages, packages was never regrouped by
category. multimedia/ was an exception to this rule.

This patch move packages/multimedia/ sub-directories to packages/. It
keeps two subdirectories for gstream 0.10 and gstreamer 1.X.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             | 27 +++++++++++-
 package/{multimedia => }/alsa-utils/Config.in |  0
 .../{multimedia => }/alsa-utils/alsa-utils.mk |  0
 package/{multimedia => }/aumix/Config.in      |  0
 .../aumix-2.8-fix-incorrect-makefile-am.patch |  0
 package/{multimedia => }/aumix/aumix.mk       |  0
 package/{multimedia => }/bellagio/Config.in   |  0
 .../bellagio/bellagio-0.9.3-drop-werror.patch |  0
 ...bellagio-0.9.3-dynamicloader-linking.patch |  0
 .../bellagio-0.9.3-parallel-build.patch       |  0
 ...3-segfault-on-removeFromWaitResource.patch |  0
 package/{multimedia => }/bellagio/bellagio.mk |  0
 package/{multimedia => }/faad2/Config.in      |  0
 package/{multimedia => }/faad2/faad2.mk       |  0
 package/{multimedia => }/ffmpeg/Config.in     |  0
 .../ffmpeg/ffmpeg-sdlconfig.patch             |  0
 package/{multimedia => }/ffmpeg/ffmpeg.mk     |  0
 package/{multimedia => }/flac/Config.in       |  0
 .../flac/flac-no-altivec.patch                |  0
 package/{multimedia => }/flac/flac.mk         |  0
 package/gstreamer/Config.in                   | 11 +++++
 .../gst-dsp/Config.in                         |  0
 .../gst-dsp/gst-dsp.mk                        |  0
 .../gst-ffmpeg/Config.in                      |  0
 .../gst-ffmpeg/gst-ffmpeg.mk                  |  0
 .../gst-fsl-plugins/Config.in                 |  0
 ...ugins-0001-gplay-add-missing-include.patch |  0
 ...0002-Fix-bashism-in-configure-script.patch |  0
 ...-fsl-plugins-0003-Use-proper-objdump.patch |  0
 .../gst-fsl-plugins/gst-fsl-plugins.mk        |  0
 .../gst-omapfb/Config.in                      |  0
 .../gst-omapfb/gst-omapfb.mk                  |  0
 .../gst-plugin-x170/Config.in                 |  0
 .../gst-plugin-x170-01-correct-CFLAGS.patch   |  0
 .../gst-plugin-x170/gst-plugin-x170.mk        |  0
 .../gst-plugins-bad/Config.in                 |  0
 ...gst-plugins-bad-0002-fix-dfb-example.patch |  0
 ...s-jpegformat-unbreak-non-debug-build.patch |  0
 .../gst-plugins-bad/gst-plugins-bad.mk        |  0
 .../gst-plugins-base/Config.in                |  0
 .../gst-plugins-base-tremor.patch             |  0
 .../gst-plugins-base/gst-plugins-base.mk      |  0
 .../gst-plugins-good/Config.in                |  0
 .../gst-plugins-good-linux36.patch            |  0
 ...ilation-against-newer-kernel-headers.patch |  0
 .../gst-plugins-good/gst-plugins-good.mk      |  0
 .../gst-plugins-ugly/Config.in                |  0
 .../gst-plugins-ugly/gst-plugins-ugly.mk      |  0
 package/gstreamer/gstreamer.mk                |  1 +
 .../gstreamer/Config.in                       |  0
 .../gstreamer/gstreamer.mk                    |  0
 package/gstreamer1/Config.in                  |  7 +++
 .../gst-omx/Config.in                         |  0
 .../gst-omx/gst-omx-config-files.patch        |  0
 .../gst-omx/gst-omx.mk                        |  0
 .../gst1-plugins-bad/Config.in                |  0
 .../gst1-plugins-bad-use-gettext-0.18.patch   |  0
 .../gst1-plugins-bad/gst1-plugins-bad.mk      |  0
 .../gst1-plugins-base/Config.in               |  0
 .../gst1-plugins-base/gst1-plugins-base.mk    |  0
 .../gst1-plugins-good/Config.in               |  0
 .../gst1-plugins-good/gst1-plugins-good.mk    |  0
 .../gst1-plugins-ugly/Config.in               |  0
 .../gst1-plugins-ugly/gst1-plugins-ugly.mk    |  0
 package/gstreamer1/gstreamer1.mk              |  1 +
 .../gstreamer1/Config.in                      |  0
 .../gstreamer1/gstreamer1.mk                  |  0
 package/{multimedia => }/lame/Config.in       |  0
 package/{multimedia => }/lame/lame.mk         |  0
 package/{multimedia => }/libvpx/Config.in     |  0
 package/{multimedia => }/libvpx/libvpx.mk     |  0
 package/{multimedia => }/madplay/Config.in    |  0
 ...dplay-0.15.2b-switch-to-new-alsa-api.patch |  0
 package/{multimedia => }/madplay/madplay.mk   |  0
 package/{multimedia => }/mpd/Config.in        |  0
 package/{multimedia => }/mpd/S95mpd           |  0
 package/{multimedia => }/mpd/mpd.conf         |  0
 package/{multimedia => }/mpd/mpd.mk           |  0
 package/{multimedia => }/mpg123/Config.in     |  0
 package/{multimedia => }/mpg123/mpg123.mk     |  0
 package/{multimedia => }/mplayer/Config.in    |  0
 .../mplayer-1.1-disable-install-strip.patch   |  0
 .../mplayer/mplayer-1.1-fix-cc-parsing.patch  |  0
 package/{multimedia => }/mplayer/mplayer.mk   |  0
 package/multimedia/Config.in                  | 44 -------------------
 package/multimedia/multimedia.mk              |  1 -
 package/{multimedia => }/musepack/Config.in   |  0
 .../musepack/musepack-shared.patch            |  0
 package/{multimedia => }/musepack/musepack.mk |  0
 .../{multimedia => }/on2-8170-libs/Config.in  |  0
 .../on2-8170-libs/on2-8170-libs.mk            |  0
 package/{multimedia => }/pulseaudio/Config.in |  0
 .../{multimedia => }/pulseaudio/S50pulseaudio |  0
 .../{multimedia => }/pulseaudio/pulseaudio.mk |  0
 .../{multimedia => }/tidsp-binaries/Config.in |  0
 .../tidsp-binaries/tidsp-binaries.mk          |  0
 .../{multimedia => }/vorbis-tools/Config.in   |  0
 .../vorbis-tools/vorbis-tools.mk              |  0
 package/{multimedia => }/wavpack/Config.in    |  0
 package/{multimedia => }/wavpack/wavpack.mk   |  0
 100 files changed, 45 insertions(+), 47 deletions(-)
 rename package/{multimedia => }/alsa-utils/Config.in (100%)
 rename package/{multimedia => }/alsa-utils/alsa-utils.mk (100%)
 rename package/{multimedia => }/aumix/Config.in (100%)
 rename package/{multimedia => }/aumix/aumix-2.8-fix-incorrect-makefile-am.patch (100%)
 rename package/{multimedia => }/aumix/aumix.mk (100%)
 rename package/{multimedia => }/bellagio/Config.in (100%)
 rename package/{multimedia => }/bellagio/bellagio-0.9.3-drop-werror.patch (100%)
 rename package/{multimedia => }/bellagio/bellagio-0.9.3-dynamicloader-linking.patch (100%)
 rename package/{multimedia => }/bellagio/bellagio-0.9.3-parallel-build.patch (100%)
 rename package/{multimedia => }/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch (100%)
 rename package/{multimedia => }/bellagio/bellagio.mk (100%)
 rename package/{multimedia => }/faad2/Config.in (100%)
 rename package/{multimedia => }/faad2/faad2.mk (100%)
 rename package/{multimedia => }/ffmpeg/Config.in (100%)
 rename package/{multimedia => }/ffmpeg/ffmpeg-sdlconfig.patch (100%)
 rename package/{multimedia => }/ffmpeg/ffmpeg.mk (100%)
 rename package/{multimedia => }/flac/Config.in (100%)
 rename package/{multimedia => }/flac/flac-no-altivec.patch (100%)
 rename package/{multimedia => }/flac/flac.mk (100%)
 create mode 100644 package/gstreamer/Config.in
 rename package/{multimedia => gstreamer}/gst-dsp/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-dsp/gst-dsp.mk (100%)
 rename package/{multimedia => gstreamer}/gst-ffmpeg/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-ffmpeg/gst-ffmpeg.mk (100%)
 rename package/{multimedia => gstreamer}/gst-fsl-plugins/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch (100%)
 rename package/{multimedia => gstreamer}/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch (100%)
 rename package/{multimedia => gstreamer}/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch (100%)
 rename package/{multimedia => gstreamer}/gst-fsl-plugins/gst-fsl-plugins.mk (100%)
 rename package/{multimedia => gstreamer}/gst-omapfb/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-omapfb/gst-omapfb.mk (100%)
 rename package/{multimedia => gstreamer}/gst-plugin-x170/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch (100%)
 rename package/{multimedia => gstreamer}/gst-plugin-x170/gst-plugin-x170.mk (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-bad/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-bad/gst-plugins-bad.mk (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-base/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-base/gst-plugins-base-tremor.patch (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-base/gst-plugins-base.mk (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-good/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-good/gst-plugins-good-linux36.patch (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-good/gst-plugins-good.mk (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-ugly/Config.in (100%)
 rename package/{multimedia => gstreamer}/gst-plugins-ugly/gst-plugins-ugly.mk (100%)
 create mode 100644 package/gstreamer/gstreamer.mk
 rename package/{multimedia => gstreamer}/gstreamer/Config.in (100%)
 rename package/{multimedia => gstreamer}/gstreamer/gstreamer.mk (100%)
 create mode 100644 package/gstreamer1/Config.in
 rename package/{multimedia => gstreamer1}/gst-omx/Config.in (100%)
 rename package/{multimedia => gstreamer1}/gst-omx/gst-omx-config-files.patch (100%)
 rename package/{multimedia => gstreamer1}/gst-omx/gst-omx.mk (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-bad/Config.in (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-bad/gst1-plugins-bad.mk (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-base/Config.in (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-base/gst1-plugins-base.mk (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-good/Config.in (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-good/gst1-plugins-good.mk (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-ugly/Config.in (100%)
 rename package/{multimedia => gstreamer1}/gst1-plugins-ugly/gst1-plugins-ugly.mk (100%)
 create mode 100644 package/gstreamer1/gstreamer1.mk
 rename package/{multimedia => gstreamer1}/gstreamer1/Config.in (100%)
 rename package/{multimedia => gstreamer1}/gstreamer1/gstreamer1.mk (100%)
 rename package/{multimedia => }/lame/Config.in (100%)
 rename package/{multimedia => }/lame/lame.mk (100%)
 rename package/{multimedia => }/libvpx/Config.in (100%)
 rename package/{multimedia => }/libvpx/libvpx.mk (100%)
 rename package/{multimedia => }/madplay/Config.in (100%)
 rename package/{multimedia => }/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch (100%)
 rename package/{multimedia => }/madplay/madplay.mk (100%)
 rename package/{multimedia => }/mpd/Config.in (100%)
 rename package/{multimedia => }/mpd/S95mpd (100%)
 rename package/{multimedia => }/mpd/mpd.conf (100%)
 rename package/{multimedia => }/mpd/mpd.mk (100%)
 rename package/{multimedia => }/mpg123/Config.in (100%)
 rename package/{multimedia => }/mpg123/mpg123.mk (100%)
 rename package/{multimedia => }/mplayer/Config.in (100%)
 rename package/{multimedia => }/mplayer/mplayer-1.1-disable-install-strip.patch (100%)
 rename package/{multimedia => }/mplayer/mplayer-1.1-fix-cc-parsing.patch (100%)
 rename package/{multimedia => }/mplayer/mplayer.mk (100%)
 delete mode 100644 package/multimedia/Config.in
 delete mode 100644 package/multimedia/multimedia.mk
 rename package/{multimedia => }/musepack/Config.in (100%)
 rename package/{multimedia => }/musepack/musepack-shared.patch (100%)
 rename package/{multimedia => }/musepack/musepack.mk (100%)
 rename package/{multimedia => }/on2-8170-libs/Config.in (100%)
 rename package/{multimedia => }/on2-8170-libs/on2-8170-libs.mk (100%)
 rename package/{multimedia => }/pulseaudio/Config.in (100%)
 rename package/{multimedia => }/pulseaudio/S50pulseaudio (100%)
 rename package/{multimedia => }/pulseaudio/pulseaudio.mk (100%)
 rename package/{multimedia => }/tidsp-binaries/Config.in (100%)
 rename package/{multimedia => }/tidsp-binaries/tidsp-binaries.mk (100%)
 rename package/{multimedia => }/vorbis-tools/Config.in (100%)
 rename package/{multimedia => }/vorbis-tools/vorbis-tools.mk (100%)
 rename package/{multimedia => }/wavpack/Config.in (100%)
 rename package/{multimedia => }/wavpack/wavpack.mk (100%)

diff --git a/package/Config.in b/package/Config.in
index 8ba3666285..889533cfea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2,8 +2,31 @@ menu "Target packages"
 
 source "package/busybox/Config.in"
 
-# Audio and video applications
-source "package/multimedia/Config.in"
+menu "Audio and video applications"
+source "package/alsa-utils/Config.in"
+source "package/aumix/Config.in"
+source "package/bellagio/Config.in"
+source "package/faad2/Config.in"
+source "package/flac/Config.in"
+source "package/ffmpeg/Config.in"
+source "package/gstreamer/Config.in"
+source "package/gstreamer1/Config.in"
+source "package/lame/Config.in"
+source "package/libvpx/Config.in"
+source "package/madplay/Config.in"
+source "package/mpd/Config.in"
+source "package/mpg123/Config.in"
+source "package/mplayer/Config.in"
+source "package/musepack/Config.in"
+source "package/on2-8170-libs/Config.in"
+source "package/opus-tools/Config.in"
+source "package/pulseaudio/Config.in"
+source "package/tidsp-binaries/Config.in"
+source "package/tstools/Config.in"
+source "package/vorbis-tools/Config.in"
+source "package/wavpack/Config.in"
+source "package/yavta/Config.in"
+endmenu
 
 menu "Compressors and decompressors"
 source "package/bzip2/Config.in"
diff --git a/package/multimedia/alsa-utils/Config.in b/package/alsa-utils/Config.in
similarity index 100%
rename from package/multimedia/alsa-utils/Config.in
rename to package/alsa-utils/Config.in
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
similarity index 100%
rename from package/multimedia/alsa-utils/alsa-utils.mk
rename to package/alsa-utils/alsa-utils.mk
diff --git a/package/multimedia/aumix/Config.in b/package/aumix/Config.in
similarity index 100%
rename from package/multimedia/aumix/Config.in
rename to package/aumix/Config.in
diff --git a/package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch b/package/aumix/aumix-2.8-fix-incorrect-makefile-am.patch
similarity index 100%
rename from package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch
rename to package/aumix/aumix-2.8-fix-incorrect-makefile-am.patch
diff --git a/package/multimedia/aumix/aumix.mk b/package/aumix/aumix.mk
similarity index 100%
rename from package/multimedia/aumix/aumix.mk
rename to package/aumix/aumix.mk
diff --git a/package/multimedia/bellagio/Config.in b/package/bellagio/Config.in
similarity index 100%
rename from package/multimedia/bellagio/Config.in
rename to package/bellagio/Config.in
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch b/package/bellagio/bellagio-0.9.3-drop-werror.patch
similarity index 100%
rename from package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
rename to package/bellagio/bellagio-0.9.3-drop-werror.patch
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch b/package/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
similarity index 100%
rename from package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
rename to package/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch b/package/bellagio/bellagio-0.9.3-parallel-build.patch
similarity index 100%
rename from package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
rename to package/bellagio/bellagio-0.9.3-parallel-build.patch
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch b/package/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
similarity index 100%
rename from package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
rename to package/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/bellagio/bellagio.mk
similarity index 100%
rename from package/multimedia/bellagio/bellagio.mk
rename to package/bellagio/bellagio.mk
diff --git a/package/multimedia/faad2/Config.in b/package/faad2/Config.in
similarity index 100%
rename from package/multimedia/faad2/Config.in
rename to package/faad2/Config.in
diff --git a/package/multimedia/faad2/faad2.mk b/package/faad2/faad2.mk
similarity index 100%
rename from package/multimedia/faad2/faad2.mk
rename to package/faad2/faad2.mk
diff --git a/package/multimedia/ffmpeg/Config.in b/package/ffmpeg/Config.in
similarity index 100%
rename from package/multimedia/ffmpeg/Config.in
rename to package/ffmpeg/Config.in
diff --git a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch b/package/ffmpeg/ffmpeg-sdlconfig.patch
similarity index 100%
rename from package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
rename to package/ffmpeg/ffmpeg-sdlconfig.patch
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
similarity index 100%
rename from package/multimedia/ffmpeg/ffmpeg.mk
rename to package/ffmpeg/ffmpeg.mk
diff --git a/package/multimedia/flac/Config.in b/package/flac/Config.in
similarity index 100%
rename from package/multimedia/flac/Config.in
rename to package/flac/Config.in
diff --git a/package/multimedia/flac/flac-no-altivec.patch b/package/flac/flac-no-altivec.patch
similarity index 100%
rename from package/multimedia/flac/flac-no-altivec.patch
rename to package/flac/flac-no-altivec.patch
diff --git a/package/multimedia/flac/flac.mk b/package/flac/flac.mk
similarity index 100%
rename from package/multimedia/flac/flac.mk
rename to package/flac/flac.mk
diff --git a/package/gstreamer/Config.in b/package/gstreamer/Config.in
new file mode 100644
index 0000000000..039d657676
--- /dev/null
+++ b/package/gstreamer/Config.in
@@ -0,0 +1,11 @@
+# Gstreamer 0.10.x & Plugins
+source "package/gstreamer/gstreamer/Config.in"
+source "package/gstreamer/gst-plugins-base/Config.in"
+source "package/gstreamer/gst-plugins-good/Config.in"
+source "package/gstreamer/gst-plugins-bad/Config.in"
+source "package/gstreamer/gst-plugins-ugly/Config.in"
+source "package/gstreamer/gst-ffmpeg/Config.in"
+source "package/gstreamer/gst-dsp/Config.in"
+source "package/gstreamer/gst-fsl-plugins/Config.in"
+source "package/gstreamer/gst-omapfb/Config.in"
+source "package/gstreamer/gst-plugin-x170/Config.in"
diff --git a/package/multimedia/gst-dsp/Config.in b/package/gstreamer/gst-dsp/Config.in
similarity index 100%
rename from package/multimedia/gst-dsp/Config.in
rename to package/gstreamer/gst-dsp/Config.in
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/gstreamer/gst-dsp/gst-dsp.mk
similarity index 100%
rename from package/multimedia/gst-dsp/gst-dsp.mk
rename to package/gstreamer/gst-dsp/gst-dsp.mk
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
similarity index 100%
rename from package/multimedia/gst-ffmpeg/Config.in
rename to package/gstreamer/gst-ffmpeg/Config.in
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
similarity index 100%
rename from package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
rename to package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
diff --git a/package/multimedia/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in
similarity index 100%
rename from package/multimedia/gst-fsl-plugins/Config.in
rename to package/gstreamer/gst-fsl-plugins/Config.in
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
similarity index 100%
rename from package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
rename to package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
similarity index 100%
rename from package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
rename to package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
similarity index 100%
rename from package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
rename to package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
similarity index 100%
rename from package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
rename to package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
diff --git a/package/multimedia/gst-omapfb/Config.in b/package/gstreamer/gst-omapfb/Config.in
similarity index 100%
rename from package/multimedia/gst-omapfb/Config.in
rename to package/gstreamer/gst-omapfb/Config.in
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/gstreamer/gst-omapfb/gst-omapfb.mk
similarity index 100%
rename from package/multimedia/gst-omapfb/gst-omapfb.mk
rename to package/gstreamer/gst-omapfb/gst-omapfb.mk
diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/gstreamer/gst-plugin-x170/Config.in
similarity index 100%
rename from package/multimedia/gst-plugin-x170/Config.in
rename to package/gstreamer/gst-plugin-x170/Config.in
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch b/package/gstreamer/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
similarity index 100%
rename from package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
rename to package/gstreamer/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
similarity index 100%
rename from package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
rename to package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
similarity index 100%
rename from package/multimedia/gst-plugins-bad/Config.in
rename to package/gstreamer/gst-plugins-bad/Config.in
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch b/package/gstreamer/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
similarity index 100%
rename from package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
rename to package/gstreamer/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch b/package/gstreamer/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
similarity index 100%
rename from package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
rename to package/gstreamer/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
similarity index 100%
rename from package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
rename to package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/gstreamer/gst-plugins-base/Config.in
similarity index 100%
rename from package/multimedia/gst-plugins-base/Config.in
rename to package/gstreamer/gst-plugins-base/Config.in
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch b/package/gstreamer/gst-plugins-base/gst-plugins-base-tremor.patch
similarity index 100%
rename from package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
rename to package/gstreamer/gst-plugins-base/gst-plugins-base-tremor.patch
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
similarity index 100%
rename from package/multimedia/gst-plugins-base/gst-plugins-base.mk
rename to package/gstreamer/gst-plugins-base/gst-plugins-base.mk
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
similarity index 100%
rename from package/multimedia/gst-plugins-good/Config.in
rename to package/gstreamer/gst-plugins-good/Config.in
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch b/package/gstreamer/gst-plugins-good/gst-plugins-good-linux36.patch
similarity index 100%
rename from package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
rename to package/gstreamer/gst-plugins-good/gst-plugins-good-linux36.patch
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch b/package/gstreamer/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
similarity index 100%
rename from package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
rename to package/gstreamer/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
similarity index 100%
rename from package/multimedia/gst-plugins-good/gst-plugins-good.mk
rename to package/gstreamer/gst-plugins-good/gst-plugins-good.mk
diff --git a/package/multimedia/gst-plugins-ugly/Config.in b/package/gstreamer/gst-plugins-ugly/Config.in
similarity index 100%
rename from package/multimedia/gst-plugins-ugly/Config.in
rename to package/gstreamer/gst-plugins-ugly/Config.in
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
similarity index 100%
rename from package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
rename to package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
diff --git a/package/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer.mk
new file mode 100644
index 0000000000..bc886c78a2
--- /dev/null
+++ b/package/gstreamer/gstreamer.mk
@@ -0,0 +1 @@
+include package/gstreamer/*/*.mk
diff --git a/package/multimedia/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
similarity index 100%
rename from package/multimedia/gstreamer/Config.in
rename to package/gstreamer/gstreamer/Config.in
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
similarity index 100%
rename from package/multimedia/gstreamer/gstreamer.mk
rename to package/gstreamer/gstreamer/gstreamer.mk
diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
new file mode 100644
index 0000000000..f9d2363963
--- /dev/null
+++ b/package/gstreamer1/Config.in
@@ -0,0 +1,7 @@
+# Gstreamer 1.x & Plugins
+source "package/gstreamer1/gstreamer1/Config.in"
+source "package/gstreamer1/gst1-plugins-base/Config.in"
+source "package/gstreamer1/gst1-plugins-good/Config.in"
+source "package/gstreamer1/gst1-plugins-bad/Config.in"
+source "package/gstreamer1/gst1-plugins-ugly/Config.in"
+source "package/gstreamer1/gst-omx/Config.in"
diff --git a/package/multimedia/gst-omx/Config.in b/package/gstreamer1/gst-omx/Config.in
similarity index 100%
rename from package/multimedia/gst-omx/Config.in
rename to package/gstreamer1/gst-omx/Config.in
diff --git a/package/multimedia/gst-omx/gst-omx-config-files.patch b/package/gstreamer1/gst-omx/gst-omx-config-files.patch
similarity index 100%
rename from package/multimedia/gst-omx/gst-omx-config-files.patch
rename to package/gstreamer1/gst-omx/gst-omx-config-files.patch
diff --git a/package/multimedia/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk
similarity index 100%
rename from package/multimedia/gst-omx/gst-omx.mk
rename to package/gstreamer1/gst-omx/gst-omx.mk
diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
similarity index 100%
rename from package/multimedia/gst1-plugins-bad/Config.in
rename to package/gstreamer1/gst1-plugins-bad/Config.in
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
similarity index 100%
rename from package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
rename to package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
similarity index 100%
rename from package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
rename to package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
similarity index 100%
rename from package/multimedia/gst1-plugins-base/Config.in
rename to package/gstreamer1/gst1-plugins-base/Config.in
diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
similarity index 100%
rename from package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
rename to package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
similarity index 100%
rename from package/multimedia/gst1-plugins-good/Config.in
rename to package/gstreamer1/gst1-plugins-good/Config.in
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
similarity index 100%
rename from package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
rename to package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
diff --git a/package/multimedia/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in
similarity index 100%
rename from package/multimedia/gst1-plugins-ugly/Config.in
rename to package/gstreamer1/gst1-plugins-ugly/Config.in
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
similarity index 100%
rename from package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
rename to package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
diff --git a/package/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1.mk
new file mode 100644
index 0000000000..5b748e33fb
--- /dev/null
+++ b/package/gstreamer1/gstreamer1.mk
@@ -0,0 +1 @@
+include package/gstreamer1/*/*.mk
diff --git a/package/multimedia/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in
similarity index 100%
rename from package/multimedia/gstreamer1/Config.in
rename to package/gstreamer1/gstreamer1/Config.in
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
similarity index 100%
rename from package/multimedia/gstreamer1/gstreamer1.mk
rename to package/gstreamer1/gstreamer1/gstreamer1.mk
diff --git a/package/multimedia/lame/Config.in b/package/lame/Config.in
similarity index 100%
rename from package/multimedia/lame/Config.in
rename to package/lame/Config.in
diff --git a/package/multimedia/lame/lame.mk b/package/lame/lame.mk
similarity index 100%
rename from package/multimedia/lame/lame.mk
rename to package/lame/lame.mk
diff --git a/package/multimedia/libvpx/Config.in b/package/libvpx/Config.in
similarity index 100%
rename from package/multimedia/libvpx/Config.in
rename to package/libvpx/Config.in
diff --git a/package/multimedia/libvpx/libvpx.mk b/package/libvpx/libvpx.mk
similarity index 100%
rename from package/multimedia/libvpx/libvpx.mk
rename to package/libvpx/libvpx.mk
diff --git a/package/multimedia/madplay/Config.in b/package/madplay/Config.in
similarity index 100%
rename from package/multimedia/madplay/Config.in
rename to package/madplay/Config.in
diff --git a/package/multimedia/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch b/package/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch
similarity index 100%
rename from package/multimedia/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch
rename to package/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch
diff --git a/package/multimedia/madplay/madplay.mk b/package/madplay/madplay.mk
similarity index 100%
rename from package/multimedia/madplay/madplay.mk
rename to package/madplay/madplay.mk
diff --git a/package/multimedia/mpd/Config.in b/package/mpd/Config.in
similarity index 100%
rename from package/multimedia/mpd/Config.in
rename to package/mpd/Config.in
diff --git a/package/multimedia/mpd/S95mpd b/package/mpd/S95mpd
similarity index 100%
rename from package/multimedia/mpd/S95mpd
rename to package/mpd/S95mpd
diff --git a/package/multimedia/mpd/mpd.conf b/package/mpd/mpd.conf
similarity index 100%
rename from package/multimedia/mpd/mpd.conf
rename to package/mpd/mpd.conf
diff --git a/package/multimedia/mpd/mpd.mk b/package/mpd/mpd.mk
similarity index 100%
rename from package/multimedia/mpd/mpd.mk
rename to package/mpd/mpd.mk
diff --git a/package/multimedia/mpg123/Config.in b/package/mpg123/Config.in
similarity index 100%
rename from package/multimedia/mpg123/Config.in
rename to package/mpg123/Config.in
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
similarity index 100%
rename from package/multimedia/mpg123/mpg123.mk
rename to package/mpg123/mpg123.mk
diff --git a/package/multimedia/mplayer/Config.in b/package/mplayer/Config.in
similarity index 100%
rename from package/multimedia/mplayer/Config.in
rename to package/mplayer/Config.in
diff --git a/package/multimedia/mplayer/mplayer-1.1-disable-install-strip.patch b/package/mplayer/mplayer-1.1-disable-install-strip.patch
similarity index 100%
rename from package/multimedia/mplayer/mplayer-1.1-disable-install-strip.patch
rename to package/mplayer/mplayer-1.1-disable-install-strip.patch
diff --git a/package/multimedia/mplayer/mplayer-1.1-fix-cc-parsing.patch b/package/mplayer/mplayer-1.1-fix-cc-parsing.patch
similarity index 100%
rename from package/multimedia/mplayer/mplayer-1.1-fix-cc-parsing.patch
rename to package/mplayer/mplayer-1.1-fix-cc-parsing.patch
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
similarity index 100%
rename from package/multimedia/mplayer/mplayer.mk
rename to package/mplayer/mplayer.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
deleted file mode 100644
index 2fcac56599..0000000000
--- a/package/multimedia/Config.in
+++ /dev/null
@@ -1,44 +0,0 @@
-menu "Audio and video applications"
-source "package/multimedia/alsa-utils/Config.in"
-source "package/multimedia/aumix/Config.in"
-source "package/multimedia/bellagio/Config.in"
-source "package/multimedia/faad2/Config.in"
-source "package/multimedia/flac/Config.in"
-source "package/multimedia/ffmpeg/Config.in"
-
-# Gstreamer 0.10.x & Plugins
-source "package/multimedia/gstreamer/Config.in"
-source "package/multimedia/gst-plugins-base/Config.in"
-source "package/multimedia/gst-plugins-good/Config.in"
-source "package/multimedia/gst-plugins-bad/Config.in"
-source "package/multimedia/gst-plugins-ugly/Config.in"
-source "package/multimedia/gst-ffmpeg/Config.in"
-source "package/multimedia/gst-dsp/Config.in"
-source "package/multimedia/gst-fsl-plugins/Config.in"
-source "package/multimedia/gst-omapfb/Config.in"
-source "package/multimedia/gst-plugin-x170/Config.in"
-
-# Gstreamer 1.x & Plugins
-source "package/multimedia/gstreamer1/Config.in"
-source "package/multimedia/gst1-plugins-base/Config.in"
-source "package/multimedia/gst1-plugins-good/Config.in"
-source "package/multimedia/gst1-plugins-bad/Config.in"
-source "package/multimedia/gst1-plugins-ugly/Config.in"
-source "package/multimedia/gst-omx/Config.in"
-
-source "package/multimedia/lame/Config.in"
-source "package/multimedia/libvpx/Config.in"
-source "package/multimedia/madplay/Config.in"
-source "package/multimedia/mpd/Config.in"
-source "package/multimedia/mpg123/Config.in"
-source "package/multimedia/mplayer/Config.in"
-source "package/multimedia/musepack/Config.in"
-source "package/multimedia/on2-8170-libs/Config.in"
-source "package/opus-tools/Config.in"
-source "package/multimedia/pulseaudio/Config.in"
-source "package/multimedia/tidsp-binaries/Config.in"
-source "package/tstools/Config.in"
-source "package/multimedia/vorbis-tools/Config.in"
-source "package/multimedia/wavpack/Config.in"
-source "package/yavta/Config.in"
-endmenu
diff --git a/package/multimedia/multimedia.mk b/package/multimedia/multimedia.mk
deleted file mode 100644
index 843f30e032..0000000000
--- a/package/multimedia/multimedia.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/multimedia/*/*.mk
diff --git a/package/multimedia/musepack/Config.in b/package/musepack/Config.in
similarity index 100%
rename from package/multimedia/musepack/Config.in
rename to package/musepack/Config.in
diff --git a/package/multimedia/musepack/musepack-shared.patch b/package/musepack/musepack-shared.patch
similarity index 100%
rename from package/multimedia/musepack/musepack-shared.patch
rename to package/musepack/musepack-shared.patch
diff --git a/package/multimedia/musepack/musepack.mk b/package/musepack/musepack.mk
similarity index 100%
rename from package/multimedia/musepack/musepack.mk
rename to package/musepack/musepack.mk
diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/on2-8170-libs/Config.in
similarity index 100%
rename from package/multimedia/on2-8170-libs/Config.in
rename to package/on2-8170-libs/Config.in
diff --git a/package/multimedia/on2-8170-libs/on2-8170-libs.mk b/package/on2-8170-libs/on2-8170-libs.mk
similarity index 100%
rename from package/multimedia/on2-8170-libs/on2-8170-libs.mk
rename to package/on2-8170-libs/on2-8170-libs.mk
diff --git a/package/multimedia/pulseaudio/Config.in b/package/pulseaudio/Config.in
similarity index 100%
rename from package/multimedia/pulseaudio/Config.in
rename to package/pulseaudio/Config.in
diff --git a/package/multimedia/pulseaudio/S50pulseaudio b/package/pulseaudio/S50pulseaudio
similarity index 100%
rename from package/multimedia/pulseaudio/S50pulseaudio
rename to package/pulseaudio/S50pulseaudio
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
similarity index 100%
rename from package/multimedia/pulseaudio/pulseaudio.mk
rename to package/pulseaudio/pulseaudio.mk
diff --git a/package/multimedia/tidsp-binaries/Config.in b/package/tidsp-binaries/Config.in
similarity index 100%
rename from package/multimedia/tidsp-binaries/Config.in
rename to package/tidsp-binaries/Config.in
diff --git a/package/multimedia/tidsp-binaries/tidsp-binaries.mk b/package/tidsp-binaries/tidsp-binaries.mk
similarity index 100%
rename from package/multimedia/tidsp-binaries/tidsp-binaries.mk
rename to package/tidsp-binaries/tidsp-binaries.mk
diff --git a/package/multimedia/vorbis-tools/Config.in b/package/vorbis-tools/Config.in
similarity index 100%
rename from package/multimedia/vorbis-tools/Config.in
rename to package/vorbis-tools/Config.in
diff --git a/package/multimedia/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk
similarity index 100%
rename from package/multimedia/vorbis-tools/vorbis-tools.mk
rename to package/vorbis-tools/vorbis-tools.mk
diff --git a/package/multimedia/wavpack/Config.in b/package/wavpack/Config.in
similarity index 100%
rename from package/multimedia/wavpack/Config.in
rename to package/wavpack/Config.in
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/wavpack/wavpack.mk
similarity index 100%
rename from package/multimedia/wavpack/wavpack.mk
rename to package/wavpack/wavpack.mk

From 2ee180e3e2a4ddfabae9d1acdcb6b418d2174ea6 Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Fri, 30 Aug 2013 09:09:44 -0500
Subject: [PATCH 6033/6849] libssh2: add package

[Peter: minor white space tweaks]
Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/libssh2/Config.in  | 10 ++++++++++
 package/libssh2/libssh2.mk | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 package/libssh2/Config.in
 create mode 100644 package/libssh2/libssh2.mk

diff --git a/package/Config.in b/package/Config.in
index 889533cfea..c3b345de22 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -456,6 +456,7 @@ source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
 source "package/libsecret/Config.in"
 source "package/libsha1/Config.in"
+source "package/libssh2/Config.in"
 source "package/nettle/Config.in"
 source "package/openssl/Config.in"
 source "package/polarssl/Config.in"
diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in
new file mode 100644
index 0000000000..017fd4061a
--- /dev/null
+++ b/package/libssh2/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBSSH2
+	bool "libssh2"
+	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
+	help
+	  libssh2 is a client-side C library implementing the SSH2
+	  protocol as defined by Internet Drafts: SECSH-TRANS(22),
+	  SECSH-USERAUTH(25), SECSH-CONNECTION(23), SECSH-ARCH(20),
+	  SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10)
+
+	  http://www.libssh2.org/
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
new file mode 100644
index 0000000000..10eb5edb9e
--- /dev/null
+++ b/package/libssh2/libssh2.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# libssh2
+#
+################################################################################
+
+LIBSSH2_VERSION = 1.4.3
+LIBSSH2_SITE = http://www.libssh2.org/download/
+LIBSSH2_LICENSE = BSD
+LIBSSH2_LICENSE_FILES = COPYING
+LIBSSH2_INSTALL_STAGING = YES
+LIBSSH2_CONF_OPT = --disable-examples-build
+
+# libssh2 must use either libgcrypt or OpenSSL
+# Only select openssl if libgcrypt is not selected
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+LIBSSH2_DEPENDENCIES += libgcrypt
+LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl
+else
+LIBSSH2_DEPENDENCIES += openssl
+LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt
+endif
+
+# Add zlib support if enabled
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBSSH2_DEPENDENCIES += zlib
+LIBSSH2_CONF_OPT += --with-libz
+else
+LIBSSH2_CONF_OPT += --without-libz
+endif
+
+$(eval $(autotools-package))

From d45db95633ed2e73d97a9de911ab5f0c063defaf Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Fri, 30 Aug 2013 09:09:45 -0500
Subject: [PATCH 6034/6849] libcurl: add support for compiling with libssh2

Adding configuration options that if libssh2 is selected, compile libcurl
with --with-ssh config flag.

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcurl/libcurl.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 71f19f19c3..059f08a119 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -47,6 +47,14 @@ LIBCURL_CONF_OPT += --without-ssl --without-gnutls \
 	--without-polarssl --without-nss
 endif
 
+# Configure curl to support libssh2
+ifeq ($(BR2_PACKAGE_LIBSSH2),y)
+LIBCURL_DEPENDENCIES += libssh2
+LIBCURL_CONF_OPT += --with-libssh2
+else
+LIBCURL_CONF_OPT += --without-libssh2
+endif
+
 define LIBCURL_FIX_DOT_PC
 	printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in
 endef

From cc51df61258f55763b81d2fec82d73d15708322f Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Thu, 5 Sep 2013 08:53:27 -0500
Subject: [PATCH 6035/6849] eigen: new package

[Peter: minor white space tweaks]
Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/eigen/Config.in | 13 +++++++++++++
 package/eigen/eigen.mk  | 23 +++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/eigen/Config.in
 create mode 100644 package/eigen/eigen.mk

diff --git a/package/Config.in b/package/Config.in
index c3b345de22..2351839c98 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -640,6 +640,7 @@ source "package/apr-util/Config.in"
 source "package/libcofi/Config.in"
 source "package/classpath/Config.in"
 source "package/cppcms/Config.in"
+source "package/eigen/Config.in"
 source "package/elfutils/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
diff --git a/package/eigen/Config.in b/package/eigen/Config.in
new file mode 100644
index 0000000000..c7fcde243c
--- /dev/null
+++ b/package/eigen/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_EIGEN
+	bool "eigen"
+	help
+	  Eigen is a C++ template library for linear algebra: vectors,
+	  matrices, and related algorithms. It is versatile, fast, elegant
+	  and works on many platforms (OS/Compilers).
+
+	  This package only installs header files to the include path.
+	  If you just want to use Eigen, you can use the header files
+	  right away. There is no binary to link to. Eigen is a pure
+	  template library defined in the headers.
+
+	  http://eigen.tuxfamily.org/
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
new file mode 100644
index 0000000000..5abd464526
--- /dev/null
+++ b/package/eigen/eigen.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# eigen
+#
+################################################################################
+
+# version 3.2
+EIGEN_VERSION = ffa86ffb5570
+EIGEN_SITE    = https://bitbucket.org/eigen/eigen/
+EIGEN_SITE_METHOD = hg
+EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
+EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
+EIGEN_INSTALL_STAGING = YES
+EIGEN_INSTALL_TARGET = NO
+
+# This package only consists of headers that need to be
+# copied over to the sysroot for compile time use
+define EIGEN_INSTALL_STAGING_CMDS
+	$(RM) -r $(STAGING_DIR)/usr/include/Eigen
+	cp -a $(@D)/Eigen $(STAGING_DIR)/usr/include/
+endef
+
+$(eval $(generic-package))

From 159c692cd22cbc8507d1cc4c11ab8700ced1b2a6 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Fri, 6 Sep 2013 00:46:24 +0200
Subject: [PATCH 6036/6849] gsl: bump version to 1.16

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gsl/gsl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index c32a0ebfa2..08266d4be4 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GSL_VERSION = 1.15
+GSL_VERSION = 1.16
 GSL_SOURCE = gsl-$(GSL_VERSION).tar.gz
 GSL_SITE = $(BR2_GNU_MIRROR)/gsl
 GSL_INSTALL_STAGING = YES

From 62146ea3ad78b74d0c17c0fbeaffa2be51070424 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 6 Sep 2013 08:14:15 +0200
Subject: [PATCH 6037/6849] change package tarball compression to xz whenever
 possible

[Peter: leave change xz tarball format to not end up with circular deps]
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-autotools.txt              | 6 +++---
 docs/manual/adding-packages-cmake.txt                  | 6 +++---
 docs/manual/adding-packages-generic.txt                | 4 ++--
 package/autoconf/autoconf.mk                           | 1 +
 package/automake/automake.mk                           | 1 +
 package/bison/bison.mk                                 | 1 +
 package/bluez_utils/bluez_utils.mk                     | 2 +-
 package/ccache/ccache.mk                               | 2 +-
 package/connman/connman.mk                             | 1 +
 package/cpuload/cpuload.mk                             | 1 +
 package/diffutils/diffutils.mk                         | 1 +
 package/dnsmasq/dnsmasq.mk                             | 1 +
 package/dosfstools/dosfstools.mk                       | 1 +
 package/dropwatch/dropwatch.mk                         | 2 +-
 package/ethtool/ethtool.mk                             | 1 +
 package/fb-test-app/fb-test-app.mk                     | 1 +
 package/gawk/gawk.mk                                   | 1 +
 package/gmp/gmp.mk                                     | 2 +-
 package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk   | 2 +-
 package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 2 +-
 package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 2 +-
 package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
 package/gstreamer/gstreamer/gstreamer.mk               | 2 +-
 package/gzip/gzip.mk                                   | 1 +
 package/input-event-daemon/input-event-daemon.mk       | 1 +
 package/iproute2/iproute2.mk                           | 1 +
 package/iw/iw.mk                                       | 2 +-
 package/kbd/kbd.mk                                     | 2 +-
 package/kismet/kismet.mk                               | 1 +
 package/libogg/libogg.mk                               | 1 +
 package/libraw1394/libraw1394.mk                       | 1 +
 package/libtheora/libtheora.mk                         | 2 +-
 package/libtool/libtool.mk                             | 2 +-
 package/libvorbis/libvorbis.mk                         | 2 +-
 package/libwebsockets/libwebsockets.mk                 | 1 +
 package/lighttpd/lighttpd.mk                           | 1 +
 package/lzma/lzma.mk                                   | 2 +-
 package/m4/m4.mk                                       | 2 +-
 package/mdadm/mdadm.mk                                 | 2 +-
 package/mpd/mpd.mk                                     | 1 +
 package/mpfr/mpfr.mk                                   | 2 +-
 package/nasm/nasm.mk                                   | 2 +-
 package/neard/neard.mk                                 | 1 +
 package/ofono/ofono.mk                                 | 1 +
 package/openvpn/openvpn.mk                             | 1 +
 package/patch/patch.mk                                 | 1 +
 package/php/php.mk                                     | 2 +-
 package/pulseaudio/pulseaudio.mk                       | 1 +
 package/python/python.mk                               | 2 +-
 package/python3/python3.mk                             | 2 +-
 package/quagga/quagga.mk                               | 1 +
 package/sg3_utils/sg3_utils.mk                         | 1 +
 package/squid/squid.mk                                 | 1 +
 package/tftpd/tftpd.mk                                 | 2 +-
 package/transmission/transmission.mk                   | 2 +-
 package/udev/udev.mk                                   | 2 +-
 package/usbutils/usbutils.mk                           | 1 +
 package/util-linux/util-linux.mk                       | 2 +-
 package/wget/wget.mk                                   | 1 +
 package/wireless-regdb/wireless-regdb.mk               | 2 +-
 60 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 1e7b058860..9fb69d94d5 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -32,9 +32,9 @@ package, with an example :
 
 On line 7, we declare the version of the package.
 
-On line 8 and 9, we declare the name of the tarball and the location
-of the tarball on the Web. Buildroot will automatically download the
-tarball from this location.
+On line 8 and 9, we declare the name of the tarball (xz-ed tarball recommended)
+and the location of the tarball on the Web. Buildroot will automatically
+download the tarball from this location.
 
 On line 10, we tell Buildroot to install the package to the staging
 directory. The staging directory, located in +output/staging/+
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index b7388c81da..de4bd9881e 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -32,9 +32,9 @@ with an example :
 
 On line 7, we declare the version of the package.
 
-On line 8 and 9, we declare the name of the tarball and the location
-of the tarball on the Web. Buildroot will automatically download the
-tarball from this location.
+On line 8 and 9, we declare the name of the tarball (xz-ed tarball recommended)
+and the location of the tarball on the Web. Buildroot will automatically
+download the tarball from this location.
 
 On line 10, we tell Buildroot to install the package to the staging
 directory. The staging directory, located in +output/staging/+
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 4e50f8f689..67967a2fe7 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -62,8 +62,8 @@ system is based on hand-written Makefiles or shell scripts.
 
 The Makefile begins on line 7 to 11 with metadata information: the
 version of the package (+LIBFOO_VERSION+), the name of the
-tarball containing the package (+LIBFOO_SOURCE+) the
-Internet location at which the tarball can be downloaded from
+tarball containing the package (+LIBFOO_SOURCE+) (xz-ed tarball recommended)
+the Internet location at which the tarball can be downloaded from
 (+LIBFOO_SITE+), the license (+LIBFOO_LICENSE+) and file with the
 license text (+LIBFOO_LICENSE_FILES+). All variables must start with
 the same prefix, +LIBFOO_+ in this case. This prefix is always the
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 2482552561..e70aa391eb 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 AUTOCONF_VERSION = 2.69
+AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
 AUTOCONF_LICENSE = GPLv3+ with exceptions
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 98e03363a3..ab4a1acda7 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 AUTOMAKE_VERSION = 1.11.6
+AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 AUTOMAKE_LICENSE = GPLv2+
 AUTOMAKE_LICENSE_FILES = COPYING
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 1eb4fa5b63..1fbbf91029 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 BISON_VERSION = 2.7.1
+BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 3c25042712..7038638a07 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 BLUEZ_UTILS_VERSION = 4.101
-BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
+BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index bead908c3c..a2f709efd7 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -6,7 +6,7 @@
 
 CCACHE_VERSION = 3.1.8
 CCACHE_SITE    = http://samba.org/ftp/ccache
-CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
+CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.xz
 CCACHE_LICENSE = GPLv3+, others
 CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index d88b3b6314..4a6bb78ad4 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 CONNMAN_VERSION = 1.12
+CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES
diff --git a/package/cpuload/cpuload.mk b/package/cpuload/cpuload.mk
index 65be513fa3..c8d1d0ceea 100644
--- a/package/cpuload/cpuload.mk
+++ b/package/cpuload/cpuload.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 CPULOAD_VERSION = v0.3
+CPULOAD_SOURCE = cpuload-$(CPULOAD_VERSION).tar.xz
 CPULOAD_SITE = http://github.com/kelvincheung/cpuload/tarball/$(CPULOAD_VERSION)
 CPULOAD_LICENSE = GPLv2
 CPULOAD_LICENSE_FILES = COPYING
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index bd46ec2981..69345323b4 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 DIFFUTILS_VERSION = 3.2
+DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 DIFFUTILS_LICENSE = GPLv3+
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 765de7802b..8b9c318486 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 DNSMASQ_VERSION = 2.66
+DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 3f70238206..d6ecb6fa64 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 DOSFSTOOLS_VERSION = 3.0.20
+DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
index 09dff6b911..5d65d86699 100644
--- a/package/dropwatch/dropwatch.mk
+++ b/package/dropwatch/dropwatch.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 DROPWATCH_VERSION = 1.4
-DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.bz2
+DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.xz
 DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot/
 DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf
 DROPWATCH_LICENSE = GPLv2
diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 66f8ffa268..cdc9a6d7d1 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 ETHTOOL_VERSION = 3.10
+ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2
 ETHTOOL_LICENSE_FILES = COPYING
diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk
index a2183e0080..5b95c29fab 100644
--- a/package/fb-test-app/fb-test-app.mk
+++ b/package/fb-test-app/fb-test-app.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 FB_TEST_APP_VERSION = v1.0.0
+FB_TEST_APP_SOURCE = fb-test-app-$(FB_TEST_APP_VERSION).tar.xz
 FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
 FB_TEST_APP_LICENSE = GPLv2
 FB_TEST_APP_LICENSE_FILES = COPYING
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 3f790400a5..af486c4699 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 GAWK_VERSION = 4.1.0
+GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr)
 GAWK_LICENSE = GPLv3+
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 439ad4dfec..86ed33c582 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -6,7 +6,7 @@
 
 GMP_VERSION = 5.1.2
 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
-GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
+GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz
 GMP_INSTALL_STAGING = YES
 GMP_LICENSE = LGPLv3+
 GMP_LICENSE_FILES = COPYING.LIB
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index df90cf9b5b..337f7566ff 100644
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GST_PLUGINS_BAD_VERSION = 0.10.23
-GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
+GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 
 GST_PLUGINS_BAD_CONF_OPT = \
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index c82aad0183..6c7233ba4a 100644
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GST_PLUGINS_BASE_VERSION = 0.10.36
-GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
+GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES
 
diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index eba0571964..c33fd3ad42 100644
--- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GST_PLUGINS_GOOD_VERSION = 0.10.31
-GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
+GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 
 GST_PLUGINS_GOOD_CONF_OPT = \
diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index 009c168d92..f3a9acb603 100644
--- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GST_PLUGINS_UGLY_VERSION = 0.10.19
-GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
+GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 
 GST_PLUGINS_UGLY_CONF_OPT = \
diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
index f0fdea4524..f7919eaa8f 100644
--- a/package/gstreamer/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GSTREAMER_VERSION = 0.10.36
-GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
+GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz
 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER_INSTALL_STAGING = YES
 
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index fd06bbc929..e1a7befdb1 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 GZIP_VERSION = 1.6
+GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 GZIP_LICENSE = GPLv3+
 GZIP_LICENSE_FILES = COPYING
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index 762d3c2b5c..cbcc2df792 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
+INPUT_EVENT_DAEMON_SOURCE = input-event-daemon-$(INPUT_EVENT_DAEMON_VERSION).tar.xz
 INPUT_EVENT_DAEMON_SITE = http://github.com/gandro/input-event-daemon/tarball/$(INPUT_EVENT_DAEMON_VERSION)
 INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license
 INPUT_EVENT_DAEMON_LICENSE_FILES = README
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index a3eff3b97c..fec0b624db 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 IPROUTE2_VERSION = 3.10.0
+IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 IPROUTE2_LICENSE = GPLv2
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 566308cbe5..c82e398d0c 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 IW_VERSION = 3.11
-IW_SOURCE = iw-$(IW_VERSION).tar.bz2
+IW_SOURCE = iw-$(IW_VERSION).tar.xz
 IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index 2969f88eb3..ea14b8c54b 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 KBD_VERSION = 1.15.2
-KBD_SOURCE = kbd-$(KBD_VERSION).tar.gz
+KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz
 KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 KBD_LICENSE = GPLv2+
 KBD_LICENSE_FILES = COPYING
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index ceb9fcd28e..8c0599679e 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 KISMET_VERSION = 2013-03-R1b
+KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz
 KISMET_SITE = http://www.kismetwireless.net/code
 KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl
 KISMET_CONF_OPT += --with-netlink-version=3
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 6e03f3add5..23554d9d68 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 LIBOGG_VERSION = 1.3.0
+LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 LIBOGG_LICENSE = BSD-3c
 LIBOGG_LICENSE_FILES = COPYING
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index 9a95265366..166c78234c 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 LIBRAW1394_VERSION = 2.0.7
+LIBRAW1394_SOURCE = libraw1394-$(LIBRAW1394_VERSION).tar.xz
 LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
 LIBRAW1394_INSTALL_STAGING = YES
 
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 4ba342be10..39602c1d38 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBTHEORA_VERSION = 1.1.1
-LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.bz2
+LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.xz
 LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
 LIBTHEORA_INSTALL_STAGING = YES
 LIBTHEORA_LICENSE = BSD-3c
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index f7e274fd9f..2f6ea7c5cf 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBTOOL_VERSION = 2.4.2
-LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
+LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
 LIBTOOL_INSTALL_STAGING = YES
 LIBTOOL_LICENSE = GPLv2+
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 21564870c2..948a43d97c 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBVORBIS_VERSION = 1.3.3
-LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
+LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz
 LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/
 LIBVORBIS_INSTALL_STAGING = YES
 LIBVORBIS_CONF_OPT = --disable-oggtest
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 6672dbe5b4..ec5244cf39 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 LIBWEBSOCKETS_VERSION = v1.22-chrome26-firefox18
+LIBWEBSOCKETS_SOURCE = libwebsockets-$(LIBWEBSOCKETS_VERSION).tar.xz
 LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot
 LIBWEBSOCKETS_LICENSE = LGPLv2.1
 LIBWEBSOCKETS_LICENSE_FILES = COPYING
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 2b5949e3f8..f65ee6da1f 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 LIGHTTPD_VERSION = 1.4.32
+LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_LICENSE = BSD-3c
 LIGHTTPD_LICENSE_FILES = COPYING
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 648a579ebd..90498334df 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LZMA_VERSION = 4.32.7
-LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.gz
+LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.xz
 LZMA_SITE = http://tukaani.org/lzma/
 LZMA_INSTALL_STAGING = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index 8e41627a32..d06d2c947d 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 M4_VERSION = 1.4.16
-M4_SOURCE = m4-$(M4_VERSION).tar.bz2
+M4_SOURCE = m4-$(M4_VERSION).tar.xz
 M4_SITE = $(BR2_GNU_MIRROR)/m4
 M4_LICENSE = GPLv3+
 M4_LICENSE_FILES = COPYING
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index e21cb71aff..04d7dcbadb 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 MDADM_VERSION = 3.2.6
-MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
+MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz
 MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
 MDADM_LICENSE = GPLv2+
 MDADM_LICENSE_FILES = COPYING
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 95e18f7d53..edcd945ef0 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 MPD_VERSION = 0.17.5
+MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = http://www.musicpd.org/download/mpd/stable
 MPD_DEPENDENCIES = host-pkgconf libglib2
 MPD_LICENSE = GPLv2
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 6460844122..52d88fecb5 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -6,7 +6,7 @@
 
 MPFR_VERSION = 3.1.2
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
-MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.bz2
+MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz
 MPFR_LICENSE = LGPLv3+
 MPFR_LICENSE_FILES = COPYING.LESSER
 MPFR_INSTALL_STAGING = YES
diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index c762dcf03f..d8045daa5e 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 NASM_VERSION = 2.10.01
-NASM_SOURCE  = nasm-$(NASM_VERSION).tar.bz2
+NASM_SOURCE  = nasm-$(NASM_VERSION).tar.xz
 NASM_SITE    = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 56730b28cb..6dbbbe08a1 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 NEARD_VERSION = 0.12
+NEARD_SOURCE = neard-$(NEARD_VERSION).tar.xz
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
 NEARD_LICENSE = GPLv2
 NEARD_LICENSE_FILES = COPYING
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 6031395eee..4b3b7a5a1c 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 OFONO_VERSION = 1.12
+OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_LICENSE = GPLv2
 OFONO_LICENSE_FILES = COPYING
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 92f6f1807c..eabd5aa173 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 OPENVPN_VERSION = 2.3.2
+OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkgconf
 OPENVPN_LICENSE = GPLv2
diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index 1605e31b04..2dd45336f8 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 PATCH_VERSION = 2.7.1
+PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
 PATCH_LICENSE = GPLv3+
 PATCH_LICENSE_FILES = COPYING
diff --git a/package/php/php.mk b/package/php/php.mk
index 5b71535554..92665b46b3 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PHP_VERSION = 5.3.27
-PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
+PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 195eb19e71..66265d0578 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 PULSEAUDIO_VERSION = 4.0
+PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
 PULSEAUDIO_INSTALL_STAGING = YES
 PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
diff --git a/package/python/python.mk b/package/python/python.mk
index ecea638d43..df02b35612 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -6,7 +6,7 @@
 
 PYTHON_VERSION_MAJOR = 2.7
 PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).3
-PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
+PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.xz
 PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
 PYTHON_LICENSE       = Python software foundation license v2, others
 PYTHON_LICENSE_FILES = LICENSE
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 036d1acf02..a8a1942f0d 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -6,7 +6,7 @@
 
 PYTHON3_VERSION_MAJOR = 3.3
 PYTHON3_VERSION       = $(PYTHON3_VERSION_MAJOR).0
-PYTHON3_SOURCE        = Python-$(PYTHON3_VERSION).tar.bz2
+PYTHON3_SOURCE        = Python-$(PYTHON3_VERSION).tar.xz
 PYTHON3_SITE          = http://python.org/ftp/python/$(PYTHON3_VERSION)
 
 # Python needs itself and a "pgen" program to build itself, both being
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 56b3dcb07a..8b5191747e 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 QUAGGA_VERSION = 0.99.22.1
+QUAGGA_SOURCE = quagga-$(QUAGGA_VERSION).tar.xz
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk
 QUAGGA_LICENSE = GPLv2+
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
index 42ed2e0ff2..8bb79b5744 100644
--- a/package/sg3_utils/sg3_utils.mk
+++ b/package/sg3_utils/sg3_utils.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 SG3_UTILS_VERSION = 1.34
+SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
 SG3_UTILS_SITE    = http://sg.danny.cz/sg/p/
 SG3_UTILS_LICENSE = BSD-3c
 # utils progs are GPLv2+ licenced
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index f7d39874ed..a3cc8c1d3c 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 SQUID_VERSION = 3.3.8
+SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 145d9fdb9b..cd72810c63 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 TFTPD_VERSION  = 5.2
-TFTPD_SOURCE   = tftp-hpa-$(TFTPD_VERSION).tar.bz2
+TFTPD_SOURCE   = tftp-hpa-$(TFTPD_VERSION).tar.xz
 TFTPD_SITE     = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
 TFTPD_CONF_OPT = --without-tcpwrappers
 
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 5661c78472..1e7ee48525 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -6,7 +6,7 @@
 
 TRANSMISSION_VERSION = 2.33
 TRANSMISSION_SITE = http://download.transmissionbt.com/files/
-TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.bz2
+TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz
 TRANSMISSION_DEPENDENCIES = \
 	host-pkgconf \
 	host-intltool \
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 69f011fc80..db86850ba2 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 UDEV_VERSION = 182
-UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
+UDEV_SOURCE = udev-$(UDEV_VERSION).tar.xz
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_LICENSE = GPLv2+
 UDEV_LICENSE_FILES = COPYING
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 00904cb150..a821da65f3 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 USBUTILS_VERSION = 007
+USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkgconf libusb
 USBUTILS_INSTALL_STAGING = YES
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 6f79e74587..a3ee4cd67e 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -6,7 +6,7 @@
 
 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
 UTIL_LINUX_VERSION_MAJOR = 2.23
-UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
+UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
 # README.licensing claims that some files are GPLv2-only, but this is not true.
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 0b213eb319..429fbdaef1 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -5,6 +5,7 @@
 ################################################################################
 
 WGET_VERSION = 1.14
+WGET_SOURCE = wget-$(WGET_VERSION).tar.xz
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
 WGET_LICENSE = GPLv3+
 WGET_LICENSE_FILES = COPYING
diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk
index 3e392848dd..2681090928 100644
--- a/package/wireless-regdb/wireless-regdb.mk
+++ b/package/wireless-regdb/wireless-regdb.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 WIRELESS_REGDB_VERSION = 2013.02.13
-WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.bz2
+WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz
 WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
 WIRELESS_REGDB_LICENSE_FILES = LICENSE

From 52fcc6a256bcfd541486257bfd05ff12d47aef75 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 5 Sep 2013 12:37:02 +0100
Subject: [PATCH 6038/6849] webkit: Version bump to 1.11.5

Also apply the following patches:
- upstream fix for 32-bit autotools
- upstream fix for conditional gstreamer build of gtklauncher
- upstream fix for detecting the latest harfbuzz
- Update existing patch for disabling docs
- Update existing patch for execinfo_h
- upstream patch for the MIPS DFG support. This fixes
compilation problems on MIPS.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/Config.in                      |   13 +-
 ...ebkit-build-fix-for-32-bit-autotools.patch |   34 +
 .../webkit-build-fix-for-gtklauncher.patch    |   51 +
 .../webkit/webkit-detect-harfbuzz-icu.patch   |   28 +
 package/webkit/webkit-disable-docrebase.patch |   13 +-
 package/webkit/webkit-execinfo_h.patch        |   20 +-
 package/webkit/webkit-mips-dfg.patch          | 1490 +++++++++++++++++
 package/webkit/webkit.mk                      |   20 +-
 8 files changed, 1639 insertions(+), 30 deletions(-)
 create mode 100644 package/webkit/webkit-build-fix-for-32-bit-autotools.patch
 create mode 100644 package/webkit/webkit-build-fix-for-gtklauncher.patch
 create mode 100644 package/webkit/webkit-detect-harfbuzz-icu.patch
 create mode 100644 package/webkit/webkit-mips-dfg.patch

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 44a208a411..1d4c5a328a 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -6,16 +6,19 @@ config BR2_PACKAGE_WEBKIT
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
 		    BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
+	select BR2_PACKAGE_CAIRO_PNG
+	select BR2_PACKAGE_ENCHANT
+	select BR2_PACKAGE_HARFBUZZ
 	select BR2_PACKAGE_ICU
+	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBGAIL
+	select BR2_PACKAGE_LIBSECRET
+	select BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_ENCHANT
-	select BR2_PACKAGE_LIBSOUP
-	select BR2_PACKAGE_JPEG
-	select BR2_PACKAGE_CAIRO_PNG
-	select BR2_PACKAGE_LIBGAIL
+	select BR2_PACKAGE_WEBP
 	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7
 	help
 	  WebKit is an open source, standards compliant web browser engine.
diff --git a/package/webkit/webkit-build-fix-for-32-bit-autotools.patch b/package/webkit/webkit-build-fix-for-32-bit-autotools.patch
new file mode 100644
index 0000000000..d7765ead0e
--- /dev/null
+++ b/package/webkit/webkit-build-fix-for-32-bit-autotools.patch
@@ -0,0 +1,34 @@
+Add missing symbol for WebCore::TextIterator::getLocationAndLengthFromRange
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From f5bb58f9096061f00c948e668335811d364ba360 Mon Sep 17 00:00:00 2001
+From: "kov@webkit.org" <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Thu, 7 Feb 2013 13:48:46 +0000
+Subject: [PATCH] Unreviewed build fix after r141196 for 32 bits autotools.
+
+* Source/autotools/symbols.filter: restore 32 bits version of the
+WebCore::TextIterator::getLocationAndLengthFromRange(WebCore::Node*,
+WebCore::Range const*, unsigned int&, unsigned int&) symbol.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ ChangeLog                       | 8 ++++++++
+ Source/autotools/symbols.filter | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter
+index 9d730b3..2edefaf 100644
+--- a/Source/autotools/symbols.filter
++++ b/Source/autotools/symbols.filter
+@@ -57,6 +57,7 @@ _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0EEE;
+ _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0EEE;
+ _ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE;
+ _ZN7WebCore12TextIterator26rangeFromLocationAndLengthEPNS_13ContainerNodeEiib;
++_ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERjS6_;
+ _ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERmS6_;
+ _ZN7WebCore12PrintContext20pageNumberForElementEPNS_7ElementERKNS_9FloatSizeE;
+ _ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE;
+-- 
+1.8.3.2
+
diff --git a/package/webkit/webkit-build-fix-for-gtklauncher.patch b/package/webkit/webkit-build-fix-for-gtklauncher.patch
new file mode 100644
index 0000000000..9a840b62fe
--- /dev/null
+++ b/package/webkit/webkit-build-fix-for-gtklauncher.patch
@@ -0,0 +1,51 @@
+Make gstreamer support conditional
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From f1055f61bce46eccf8dc0aa017113a08d3d71944 Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Fri, 15 Mar 2013 07:13:51 +0000
+Subject: [PATCH] Build fix for Tools/GtkLauncher/Programs_GtkLauncher-main.o
+ if gstreamer is not installed https://bugs.webkit.org/show_bug.cgi?id=112394
+
+Patch by Tobias Mueller <tobiasmue@gnome.org> on 2013-03-15
+Reviewed by Philippe Normand.
+
+* GtkLauncher/main.c:
+(main): Guard using the gstreamer function with #ifdef WTF_USE_GSTREAMER
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145881 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Tools/ChangeLog          | 10 ++++++++++
+ Tools/GtkLauncher/main.c |  5 ++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/Tools/GtkLauncher/main.c b/Tools/GtkLauncher/main.c
+index 32baf4a..84c8833 100644
+--- a/Tools/GtkLauncher/main.c
++++ b/Tools/GtkLauncher/main.c
+@@ -28,7 +28,9 @@
+ #include "autotoolsconfig.h"
+ #include "LauncherInspectorWindow.h"
+ #include <errno.h>
++#ifdef WTF_USE_GSTREAMER
+ #include <gst/gst.h>
++#endif
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -489,8 +491,9 @@ int main(int argc, char* argv[])
+     GOptionContext *context = g_option_context_new(0);
+     g_option_context_add_main_entries(context, commandLineOptions, 0);
+     g_option_context_add_group(context, gtk_get_option_group(TRUE));
++#ifdef WTF_USE_GSTREAMER
+     g_option_context_add_group(context, gst_init_get_option_group());
+-
++#endif
+     webkitSettings = webkit_web_settings_new();
+     g_object_set(webkitSettings, "enable-developer-extras", TRUE, NULL);
+     if (!addWebSettingsGroupToContext(context, webkitSettings)) {
+-- 
+1.8.3.2
+
diff --git a/package/webkit/webkit-detect-harfbuzz-icu.patch b/package/webkit/webkit-detect-harfbuzz-icu.patch
new file mode 100644
index 0000000000..dc93c67e33
--- /dev/null
+++ b/package/webkit/webkit-detect-harfbuzz-icu.patch
@@ -0,0 +1,28 @@
+harfbuzz-icu detections based on the following upstream commits
+
+- 5f3ae29ffb29c499c1825578ba7f3ffcbf1aa8b9
+- ad2a23ec44b692bde43a13b658990770caa8dfc5
+- 22b4786377142424bfb6562ff029997acd0846d1
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: webkit-1.11.5/configure.ac
+===================================================================
+--- webkit-1.11.5.orig/configure.ac
++++ webkit-1.11.5/configure.ac
+@@ -938,6 +938,15 @@ PKG_CHECK_MODULES([FREETYPE],
+                   freetype2 >= $FREETYPE2_REQUIRED_VERSION
+                   harfbuzz])
+ fi
++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
++# Since we support earlier HarfBuzz versions we keep this conditional for now.
++m4_define([harfbuzz_required_version], [0.9.7])
++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
++	PKG_CHECK_MODULES([HARFBUZZ_ICU], [harfbuzz-icu >= $harfbuzz_required_version])
++	FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
++	FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
++fi
++
+ AC_SUBST([FREETYPE_CFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
+ 
diff --git a/package/webkit/webkit-disable-docrebase.patch b/package/webkit/webkit-disable-docrebase.patch
index 77b9d1cce5..2692d617a4 100644
--- a/package/webkit/webkit-disable-docrebase.patch
+++ b/package/webkit/webkit-disable-docrebase.patch
@@ -2,12 +2,13 @@ This patch prevents documentation from being rebased or installed. This
 prevents an error when gtk-doc --rebase is called.
 
 Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
-----
-Index: webkit-1.9.6/Tools/GNUmakefile.am
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: webkit-1.11.5/Tools/GNUmakefile.am
 ===================================================================
---- webkit-1.9.6.orig/Tools/GNUmakefile.am	2012-08-06 07:34:49.000000000 -0500
-+++ webkit-1.9.6/Tools/GNUmakefile.am	2013-05-28 21:29:54.135112927 -0500
-@@ -262,6 +262,8 @@
+--- webkit-1.11.5.orig/Tools/GNUmakefile.am
++++ webkit-1.11.5/Tools/GNUmakefile.am
+@@ -308,6 +308,8 @@ EXTRA_DIST += \
  	Tools/Scripts/webkit-build-directory \
  	Tools/Scripts/webkitdirs.pm
  
@@ -16,7 +17,7 @@ Index: webkit-1.9.6/Tools/GNUmakefile.am
  docs: docs-build.stamp
  .PHONY : docs
  DISTCLEANFILES += docs-build.stamp
-@@ -362,7 +364,6 @@
+@@ -412,7 +414,6 @@ if ENABLE_WEBKIT2
  	rm -rf $${installdir}
  endif
  
diff --git a/package/webkit/webkit-execinfo_h.patch b/package/webkit/webkit-execinfo_h.patch
index 404986b207..f5508a1cb1 100644
--- a/package/webkit/webkit-execinfo_h.patch
+++ b/package/webkit/webkit-execinfo_h.patch
@@ -1,13 +1,14 @@
 Fixes uclibc build as uclibc does not include backtrace functionality
 
 Signed-of-by: Spenser Gilliland <spenser@gillilanding.com>
-----
-Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
+Signed-of-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: webkit-1.11.5/Source/WTF/wtf/Assertions.cpp
 ===================================================================
---- webkit-1.9.6.orig/Source/WTF/wtf/Assertions.cpp
-+++ webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
+--- webkit-1.11.5.orig/Source/WTF/wtf/Assertions.cpp
++++ webkit-1.11.5/Source/WTF/wtf/Assertions.cpp
 @@ -61,8 +61,10 @@
- #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+ #if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
  #include <cxxabi.h>
  #include <dlfcn.h>
 +#if !defined(__UCLIBC__)
@@ -17,12 +18,3 @@ Index: webkit-1.9.6/Source/WTF/wtf/Assertions.cpp
  
  #if OS(ANDROID)
  #include "android/log.h"
-@@ -268,7 +270,7 @@ void WTFReportArgumentAssertionFailure(c
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) && !defined(__UCLIBC__)
-     *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/package/webkit/webkit-mips-dfg.patch b/package/webkit/webkit-mips-dfg.patch
new file mode 100644
index 0000000000..39259514b9
--- /dev/null
+++ b/package/webkit/webkit-mips-dfg.patch
@@ -0,0 +1,1490 @@
+Upstream patch for DFG implementation for MIPS
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+From c921d19863ccf66bdd0ffa5d38eaf05efab6b136 Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Mon, 18 Feb 2013 19:25:23 +0000
+Subject: [PATCH] MIPS DFG implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=101328
+
+Patch by Balazs Kilvady <kilvadyb@homejinni.com> on 2013-02-18
+Reviewed by Oliver Hunt.
+
+DFG implementation for MIPS.
+
+Source/JavaScriptCore:
+
+* assembler/MIPSAssembler.h:
+(JSC::MIPSAssembler::MIPSAssembler):
+(JSC::MIPSAssembler::sllv):
+(JSC::MIPSAssembler::movd):
+(MIPSAssembler):
+(JSC::MIPSAssembler::negd):
+(JSC::MIPSAssembler::labelForWatchpoint):
+(JSC::MIPSAssembler::label):
+(JSC::MIPSAssembler::vmov):
+(JSC::MIPSAssembler::linkDirectJump):
+(JSC::MIPSAssembler::maxJumpReplacementSize):
+(JSC::MIPSAssembler::revertJumpToMove):
+(JSC::MIPSAssembler::replaceWithJump):
+* assembler/MacroAssembler.h:
+(MacroAssembler):
+(JSC::MacroAssembler::poke):
+* assembler/MacroAssemblerMIPS.h:
+(JSC::MacroAssemblerMIPS::add32):
+(MacroAssemblerMIPS):
+(JSC::MacroAssemblerMIPS::and32):
+(JSC::MacroAssemblerMIPS::lshift32):
+(JSC::MacroAssemblerMIPS::mul32):
+(JSC::MacroAssemblerMIPS::or32):
+(JSC::MacroAssemblerMIPS::rshift32):
+(JSC::MacroAssemblerMIPS::urshift32):
+(JSC::MacroAssemblerMIPS::sub32):
+(JSC::MacroAssemblerMIPS::xor32):
+(JSC::MacroAssemblerMIPS::store32):
+(JSC::MacroAssemblerMIPS::jump):
+(JSC::MacroAssemblerMIPS::branchAdd32):
+(JSC::MacroAssemblerMIPS::branchMul32):
+(JSC::MacroAssemblerMIPS::branchSub32):
+(JSC::MacroAssemblerMIPS::branchNeg32):
+(JSC::MacroAssemblerMIPS::call):
+(JSC::MacroAssemblerMIPS::loadDouble):
+(JSC::MacroAssemblerMIPS::moveDouble):
+(JSC::MacroAssemblerMIPS::swapDouble):
+(JSC::MacroAssemblerMIPS::subDouble):
+(JSC::MacroAssemblerMIPS::mulDouble):
+(JSC::MacroAssemblerMIPS::divDouble):
+(JSC::MacroAssemblerMIPS::negateDouble):
+(JSC::MacroAssemblerMIPS::branchEqual):
+(JSC::MacroAssemblerMIPS::branchNotEqual):
+(JSC::MacroAssemblerMIPS::branchTruncateDoubleToInt32):
+(JSC::MacroAssemblerMIPS::branchTruncateDoubleToUint32):
+(JSC::MacroAssemblerMIPS::truncateDoubleToInt32):
+(JSC::MacroAssemblerMIPS::truncateDoubleToUint32):
+(JSC::MacroAssemblerMIPS::branchDoubleNonZero):
+(JSC::MacroAssemblerMIPS::branchDoubleZeroOrNaN):
+(JSC::MacroAssemblerMIPS::invert):
+(JSC::MacroAssemblerMIPS::replaceWithJump):
+(JSC::MacroAssemblerMIPS::maxJumpReplacementSize):
+* dfg/DFGAssemblyHelpers.h:
+(AssemblyHelpers):
+(JSC::DFG::AssemblyHelpers::preserveReturnAddressAfterCall):
+(JSC::DFG::AssemblyHelpers::restoreReturnAddressBeforeReturn):
+(JSC::DFG::AssemblyHelpers::debugCall):
+* dfg/DFGCCallHelpers.h:
+(CCallHelpers):
+(JSC::DFG::CCallHelpers::setupArguments):
+(JSC::DFG::CCallHelpers::setupArgumentsWithExecState):
+* dfg/DFGFPRInfo.h:
+(DFG):
+(FPRInfo):
+(JSC::DFG::FPRInfo::toRegister):
+(JSC::DFG::FPRInfo::toIndex):
+(JSC::DFG::FPRInfo::debugName):
+* dfg/DFGGPRInfo.h:
+(DFG):
+(GPRInfo):
+(JSC::DFG::GPRInfo::toRegister):
+(JSC::DFG::GPRInfo::toIndex):
+(JSC::DFG::GPRInfo::debugName):
+* dfg/DFGSpeculativeJIT.h:
+(SpeculativeJIT):
+* jit/JSInterfaceJIT.h:
+(JSInterfaceJIT):
+* runtime/JSGlobalData.h:
+(JSC::ScratchBuffer::allocationSize):
+(ScratchBuffer):
+
+Source/WTF:
+
+* wtf/Platform.h:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@143247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/JavaScriptCore/ChangeLog                    |  90 ++++
+ Source/JavaScriptCore/assembler/MIPSAssembler.h    | 109 ++++-
+ Source/JavaScriptCore/assembler/MacroAssembler.h   |   7 +
+ .../JavaScriptCore/assembler/MacroAssemblerMIPS.h  | 480 +++++++++++++++++++--
+ Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h     |  19 +-
+ Source/JavaScriptCore/dfg/DFGCCallHelpers.h        |  92 ++--
+ Source/JavaScriptCore/dfg/DFGFPRInfo.h             |  68 +++
+ Source/JavaScriptCore/dfg/DFGGPRInfo.h             |  67 +++
+ Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h      |   4 +-
+ Source/JavaScriptCore/jit/JSInterfaceJIT.h         |   4 +
+ Source/JavaScriptCore/runtime/JSGlobalData.h       |   6 +-
+ Source/WTF/ChangeLog                               |  11 +
+ Source/WTF/wtf/Platform.h                          |   4 +
+ 13 files changed, 888 insertions(+), 73 deletions(-)
+
+diff --git a/Source/JavaScriptCore/assembler/MIPSAssembler.h b/Source/JavaScriptCore/assembler/MIPSAssembler.h
+index 026f87e..7f553bb 100644
+--- a/Source/JavaScriptCore/assembler/MIPSAssembler.h
++++ b/Source/JavaScriptCore/assembler/MIPSAssembler.h
+@@ -152,6 +152,8 @@ public:
+     typedef SegmentedVector<AssemblerLabel, 64> Jumps;
+ 
+     MIPSAssembler()
++        : m_indexOfLastWatchpoint(INT_MIN)
++        , m_indexOfTailOfLastWatchpoint(INT_MIN)
+     {
+     }
+ 
+@@ -325,7 +327,7 @@ public:
+         emitInst(0x00000000 | (rd << OP_SH_RD) | (rt << OP_SH_RT) | ((shamt & 0x1f) << OP_SH_SHAMT));
+     }
+ 
+-    void sllv(RegisterID rd, RegisterID rt, int rs)
++    void sllv(RegisterID rd, RegisterID rt, RegisterID rs)
+     {
+         emitInst(0x00000004 | (rd << OP_SH_RD) | (rt << OP_SH_RT) | (rs << OP_SH_RS));
+     }
+@@ -527,6 +529,16 @@ public:
+         emitInst(0x46200004 | (fd << OP_SH_FD) | (fs << OP_SH_FS));
+     }
+ 
++    void movd(FPRegisterID fd, FPRegisterID fs)
++    {
++        emitInst(0x46200006 | (fd << OP_SH_FD) | (fs << OP_SH_FS));
++    }
++
++    void negd(FPRegisterID fd, FPRegisterID fs)
++    {
++        emitInst(0x46200007 | (fd << OP_SH_FD) | (fs << OP_SH_FS));
++    }
++
+     void truncwd(FPRegisterID fd, FPRegisterID fs)
+     {
+         emitInst(0x4620000d | (fd << OP_SH_FD) | (fs << OP_SH_FS));
+@@ -619,9 +631,24 @@ public:
+         return m_buffer.label();
+     }
+ 
++    AssemblerLabel labelForWatchpoint()
++    {
++        AssemblerLabel result = m_buffer.label();
++        if (static_cast<int>(result.m_offset) != m_indexOfLastWatchpoint)
++            result = label();
++        m_indexOfLastWatchpoint = result.m_offset;
++        m_indexOfTailOfLastWatchpoint = result.m_offset + maxJumpReplacementSize();
++        return result;
++    }
++
+     AssemblerLabel label()
+     {
+-        return m_buffer.label();
++        AssemblerLabel result = m_buffer.label();
++        while (UNLIKELY(static_cast<int>(result.m_offset) < m_indexOfTailOfLastWatchpoint)) {
++            nop();
++            result = m_buffer.label();
++        }
++        return result;
+     }
+ 
+     AssemblerLabel align(int alignment)
+@@ -664,14 +691,24 @@ public:
+     // Assembly helpers for moving data between fp and registers.
+     void vmov(RegisterID rd1, RegisterID rd2, FPRegisterID rn)
+     {
++#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64
++        mfc1(rd1, rn);
++        mfhc1(rd2, rn);
++#else
+         mfc1(rd1, rn);
+         mfc1(rd2, FPRegisterID(rn + 1));
++#endif
+     }
+ 
+     void vmov(FPRegisterID rd, RegisterID rn1, RegisterID rn2)
+     {
++#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64
++        mtc1(rn1, rd);
++        mthc1(rn2, rd);
++#else
+         mtc1(rn1, rd);
+         mtc1(rn2, FPRegisterID(rd + 1));
++#endif
+     }
+ 
+     static unsigned getCallReturnOffset(AssemblerLabel call)
+@@ -688,6 +725,35 @@ public:
+     // writable region of memory; to modify the code in an execute-only execuable
+     // pool the 'repatch' and 'relink' methods should be used.
+ 
++    static size_t linkDirectJump(void* code, void* to)
++    {
++        MIPSWord* insn = reinterpret_cast<MIPSWord*>(reinterpret_cast<intptr_t>(code));
++        size_t ops = 0;
++        int32_t slotAddr = reinterpret_cast<int>(insn) + 4;
++        int32_t toAddr = reinterpret_cast<int>(to);
++
++        if ((slotAddr & 0xf0000000) != (toAddr & 0xf0000000)) {
++            // lui
++            *insn = 0x3c000000 | (MIPSRegisters::t9 << OP_SH_RT) | ((toAddr >> 16) & 0xffff);
++            ++insn;
++            // ori
++            *insn = 0x34000000 | (MIPSRegisters::t9 << OP_SH_RT) | (MIPSRegisters::t9 << OP_SH_RS) | (toAddr & 0xffff);
++            ++insn;
++            // jr
++            *insn = 0x00000008 | (MIPSRegisters::t9 << OP_SH_RS);
++            ++insn;
++            ops = 4 * sizeof(MIPSWord);
++        } else {
++            // j
++            *insn = 0x08000000 | ((toAddr & 0x0fffffff) >> 2);
++            ++insn;
++            ops = 2 * sizeof(MIPSWord);
++        }
++        // nop
++        *insn = 0x00000000;
++        return ops;
++    }
++
+     void linkJump(AssemblerLabel from, AssemblerLabel to)
+     {
+         ASSERT(to.isSet());
+@@ -825,29 +891,36 @@ public:
+ #endif
+     }
+ 
+-    static void revertJumpToMove(void* instructionStart, RegisterID rt, int imm)
++    static ptrdiff_t maxJumpReplacementSize()
+     {
+-        MIPSWord* insn = static_cast<MIPSWord*>(instructionStart) + 1;
+-        ASSERT((*insn & 0xfc000000) == 0x34000000);
+-        *insn = (*insn & 0xfc1f0000) | (imm & 0xffff);
+-        cacheFlush(insn, sizeof(MIPSWord));
++        return sizeof(MIPSWord) * 4;
+     }
+ 
+-    static void replaceWithJump(void* instructionStart, void* to)
++    static void revertJumpToMove(void* instructionStart, RegisterID rt, int imm)
+     {
+-        MIPSWord* instruction = reinterpret_cast<MIPSWord*>(instructionStart);
+-        intptr_t jumpTo = reinterpret_cast<intptr_t>(to);
++        MIPSWord* insn = static_cast<MIPSWord*>(instructionStart);
++        size_t codeSize = 2 * sizeof(MIPSWord);
+ 
+         // lui
+-        instruction[0] = 0x3c000000 | (MIPSRegisters::t9 << OP_SH_RT) | ((jumpTo >> 16) & 0xffff);
++        *insn = 0x3c000000 | (rt << OP_SH_RT) | ((imm >> 16) & 0xffff);
++        ++insn;
+         // ori
+-        instruction[1] = 0x34000000 | (MIPSRegisters::t9 << OP_SH_RT) | (MIPSRegisters::t9 << OP_SH_RS) | (jumpTo & 0xffff);
+-        // jr
+-        instruction[2] = 0x00000008 | (MIPSRegisters::t9 << OP_SH_RS);
+-        // nop
+-        instruction[3] = 0x0;
++        *insn = 0x34000000 | (rt << OP_SH_RS) | (rt << OP_SH_RT) | (imm & 0xffff);
++        ++insn;
++        // if jr $t9
++        if (*insn == 0x03200008) {
++            *insn = 0x00000000;
++            codeSize += sizeof(MIPSWord);
++        }
++        cacheFlush(insn, codeSize);
++    }
+ 
+-        cacheFlush(instruction, sizeof(MIPSWord) * 4);
++    static void replaceWithJump(void* instructionStart, void* to)
++    {
++        ASSERT(!(bitwise_cast<uintptr_t>(instructionStart) & 3));
++        ASSERT(!(bitwise_cast<uintptr_t>(to) & 3));
++        size_t ops = linkDirectJump(instructionStart, to);
++        cacheFlush(instructionStart, ops);
+     }
+ 
+     static void replaceWithLoad(void* instructionStart)
+@@ -1023,6 +1096,8 @@ private:
+ 
+     AssemblerBuffer m_buffer;
+     Jumps m_jumps;
++    int m_indexOfLastWatchpoint;
++    int m_indexOfTailOfLastWatchpoint;
+ };
+ 
+ } // namespace JSC
+diff --git a/Source/JavaScriptCore/assembler/MacroAssembler.h b/Source/JavaScriptCore/assembler/MacroAssembler.h
+index 60a93db..1f0c3de 100644
+--- a/Source/JavaScriptCore/assembler/MacroAssembler.h
++++ b/Source/JavaScriptCore/assembler/MacroAssembler.h
+@@ -200,6 +200,13 @@ public:
+     }
+ #endif
+     
++#if CPU(MIPS)
++    void poke(FPRegisterID src, int index = 0)
++    {
++        ASSERT(!(index & 1));
++        storeDouble(src, addressForPoke(index));
++    }
++#endif
+ 
+     // Backwards banches, these are currently all implemented using existing forwards branch mechanisms.
+     void branchPtr(RelationalCondition cond, RegisterID op1, TrustedImmPtr imm, Label target)
+diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h
+index 43ad434..4f14960 100644
+--- a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h
++++ b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h
+@@ -114,6 +114,11 @@ public:
+         m_assembler.addu(dest, dest, src);
+     }
+ 
++    void add32(RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        m_assembler.addu(dest, op1, op2);
++    }
++
+     void add32(TrustedImm32 imm, RegisterID dest)
+     {
+         add32(imm, dest, dest);
+@@ -267,6 +272,11 @@ public:
+         m_assembler.andInsn(dest, dest, src);
+     }
+ 
++    void and32(RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        m_assembler.andInsn(dest, op1, op2);
++    }
++
+     void and32(TrustedImm32 imm, RegisterID dest)
+     {
+         if (!imm.m_value && !m_fixedWidth)
+@@ -283,9 +293,16 @@ public:
+         }
+     }
+ 
+-    void lshift32(TrustedImm32 imm, RegisterID dest)
++    void and32(TrustedImm32 imm, RegisterID src, RegisterID dest)
+     {
+-        m_assembler.sll(dest, dest, imm.m_value);
++        if (!imm.m_value && !m_fixedWidth)
++            move(MIPSRegisters::zero, dest);
++        else if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth)
++            m_assembler.andi(dest, src, imm.m_value);
++        else {
++            move(imm, immTempRegister);
++            m_assembler.andInsn(dest, src, immTempRegister);
++        }
+     }
+ 
+     void lshift32(RegisterID shiftAmount, RegisterID dest)
+@@ -293,11 +310,33 @@ public:
+         m_assembler.sllv(dest, dest, shiftAmount);
+     }
+ 
++    void lshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest)
++    {
++        m_assembler.sllv(dest, src, shiftAmount);
++    }
++
++    void lshift32(TrustedImm32 imm, RegisterID dest)
++    {
++        move(imm, immTempRegister);
++        m_assembler.sllv(dest, dest, immTempRegister);
++    }
++
++    void lshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
++    {
++        move(imm, immTempRegister);
++        m_assembler.sllv(dest, src, immTempRegister);
++    }
++
+     void mul32(RegisterID src, RegisterID dest)
+     {
+         m_assembler.mul(dest, dest, src);
+     }
+ 
++    void mul32(RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        m_assembler.mul(dest, op1, op2);
++    }
++
+     void mul32(TrustedImm32 imm, RegisterID src, RegisterID dest)
+     {
+         if (!imm.m_value && !m_fixedWidth)
+@@ -348,6 +387,24 @@ public:
+         m_assembler.orInsn(dest, dest, dataTempRegister);
+     }
+ 
++    void or32(TrustedImm32 imm, RegisterID src, RegisterID dest)
++    {
++        if (!imm.m_value && !m_fixedWidth)
++            return;
++
++        if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth) {
++            m_assembler.ori(dest, src, imm.m_value);
++            return;
++        }
++
++        /*
++            li      dataTemp, imm
++            or      dest, src, dataTemp
++        */
++        move(imm, dataTempRegister);
++        m_assembler.orInsn(dest, src, dataTempRegister);
++    }
++
+     void or32(RegisterID src, AbsoluteAddress dest)
+     {
+         load32(dest.m_ptr, dataTempRegister);
+@@ -360,6 +417,11 @@ public:
+         m_assembler.srav(dest, dest, shiftAmount);
+     }
+ 
++    void rshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest)
++    {
++        m_assembler.srav(dest, src, shiftAmount);
++    }
++
+     void rshift32(TrustedImm32 imm, RegisterID dest)
+     {
+         m_assembler.sra(dest, dest, imm.m_value);
+@@ -375,16 +437,31 @@ public:
+         m_assembler.srlv(dest, dest, shiftAmount);
+     }
+ 
++    void urshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest)
++    {
++        m_assembler.srlv(dest, src, shiftAmount);
++    }
++
+     void urshift32(TrustedImm32 imm, RegisterID dest)
+     {
+         m_assembler.srl(dest, dest, imm.m_value);
+     }
+ 
++    void urshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
++    {
++        m_assembler.srl(dest, src, imm.m_value);
++    }
++
+     void sub32(RegisterID src, RegisterID dest)
+     {
+         m_assembler.subu(dest, dest, src);
+     }
+ 
++    void sub32(RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        m_assembler.subu(dest, op1, op2);
++    }
++
+     void sub32(TrustedImm32 imm, RegisterID dest)
+     {
+         if (imm.m_value >= -32767 && imm.m_value <= 32768
+@@ -495,6 +572,11 @@ public:
+         m_assembler.xorInsn(dest, dest, src);
+     }
+ 
++    void xor32(RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        m_assembler.xorInsn(dest, op1, op2);
++    }
++
+     void xor32(TrustedImm32 imm, RegisterID dest)
+     {
+         if (imm.m_value == -1) {
+@@ -510,6 +592,21 @@ public:
+         m_assembler.xorInsn(dest, dest, immTempRegister);
+     }
+ 
++    void xor32(TrustedImm32 imm, RegisterID src, RegisterID dest)
++    {
++        if (imm.m_value == -1) {
++            m_assembler.nor(dest, src, MIPSRegisters::zero);
++            return;
++        }
++
++        /*
++            li  immTemp, imm
++            xor dest, dest, immTemp
++        */
++        move(imm, immTempRegister);
++        m_assembler.xorInsn(dest, src, immTempRegister);
++    }
++
+     void sqrtDouble(FPRegisterID src, FPRegisterID dst)
+     {
+         m_assembler.sqrtd(dst, src);
+@@ -989,6 +1086,44 @@ public:
+         }
+     }
+ 
++    void store32(TrustedImm32 imm, BaseIndex address)
++    {
++        if (address.offset >= -32768 && address.offset <= 32767 && !m_fixedWidth) {
++            /*
++                sll     addrTemp, address.index, address.scale
++                addu    addrTemp, addrTemp, address.base
++                sw      src, address.offset(addrTemp)
++            */
++            m_assembler.sll(addrTempRegister, address.index, address.scale);
++            m_assembler.addu(addrTempRegister, addrTempRegister, address.base);
++            if (!imm.m_value)
++                m_assembler.sw(MIPSRegisters::zero, addrTempRegister, address.offset);
++            else {
++                move(imm, immTempRegister);
++                m_assembler.sw(immTempRegister, addrTempRegister, address.offset);
++            }
++        } else {
++            /*
++                sll     addrTemp, address.index, address.scale
++                addu    addrTemp, addrTemp, address.base
++                lui     immTemp, (address.offset + 0x8000) >> 16
++                addu    addrTemp, addrTemp, immTemp
++                sw      src, (address.offset & 0xffff)(at)
++            */
++            m_assembler.sll(addrTempRegister, address.index, address.scale);
++            m_assembler.addu(addrTempRegister, addrTempRegister, address.base);
++            m_assembler.lui(immTempRegister, (address.offset + 0x8000) >> 16);
++            m_assembler.addu(addrTempRegister, addrTempRegister, immTempRegister);
++            if (!imm.m_value && !m_fixedWidth)
++                m_assembler.sw(MIPSRegisters::zero, addrTempRegister, address.offset);
++            else {
++                move(imm, immTempRegister);
++                m_assembler.sw(immTempRegister, addrTempRegister, address.offset);
++            }
++        }
++    }
++
++
+     void store32(RegisterID src, const void* address)
+     {
+         /*
+@@ -1336,6 +1471,15 @@ public:
+         m_fixedWidth = false;
+     }
+ 
++    void jump(AbsoluteAddress address)
++    {
++        m_fixedWidth = true;
++        load32(address.m_ptr, MIPSRegisters::t9);
++        m_assembler.jr(MIPSRegisters::t9);
++        m_assembler.nop();
++        m_fixedWidth = false;
++    }
++
+     void moveDoubleToInts(FPRegisterID src, RegisterID dest1, RegisterID dest2)
+     {
+         m_assembler.vmov(dest1, dest2, src);
+@@ -1404,6 +1548,53 @@ public:
+         return Jump();
+     }
+ 
++    Jump branchAdd32(ResultCondition cond, RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
++        if (cond == Overflow) {
++            /*
++                move    dataTemp, op1
++                xor     cmpTemp, dataTemp, op2
++                bltz    cmpTemp, No_overflow    # diff sign bit -> no overflow
++                addu    dest, dataTemp, op2
++                xor     cmpTemp, dest, dataTemp
++                bgez    cmpTemp, No_overflow    # same sign big -> no overflow
++                nop
++                b       Overflow
++                nop
++                nop
++                nop
++                nop
++                nop
++            No_overflow:
++            */
++            move(op1, dataTempRegister);
++            m_assembler.xorInsn(cmpTempRegister, dataTempRegister, op2);
++            m_assembler.bltz(cmpTempRegister, 10);
++            m_assembler.addu(dest, dataTempRegister, op2);
++            m_assembler.xorInsn(cmpTempRegister, dest, dataTempRegister);
++            m_assembler.bgez(cmpTempRegister, 7);
++            m_assembler.nop();
++            return jump();
++        }
++        if (cond == Signed) {
++            add32(op1, op2, dest);
++            // Check if dest is negative.
++            m_assembler.slt(cmpTempRegister, dest, MIPSRegisters::zero);
++            return branchNotEqual(cmpTempRegister, MIPSRegisters::zero);
++        }
++        if (cond == Zero) {
++            add32(op1, op2, dest);
++            return branchEqual(dest, MIPSRegisters::zero);
++        }
++        if (cond == NonZero) {
++            add32(op1, op2, dest);
++            return branchNotEqual(dest, MIPSRegisters::zero);
++        }
++        ASSERT(0);
++        return Jump();
++    }
++
+     Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, RegisterID dest)
+     {
+         move(imm, immTempRegister);
+@@ -1417,6 +1608,111 @@ public:
+         return branchAdd32(cond, immTempRegister, dest);
+     }
+ 
++    Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, AbsoluteAddress dest)
++    {
++        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
++        if (cond == Overflow) {
++            /*
++                move    dataTemp, dest
++                xori    cmpTemp, dataTemp, imm
++                bltz    cmpTemp, No_overflow    # diff sign bit -> no overflow
++                addiu   dataTemp, dataTemp, imm
++                move    dest, dataTemp
++                xori    cmpTemp, dataTemp, imm
++                bgez    cmpTemp, No_overflow    # same sign big -> no overflow
++                nop
++                b       Overflow
++                nop
++                nop
++                nop
++                nop
++                nop
++            No_overflow:
++            */
++            if (imm.m_value >= -32768 && imm.m_value  <= 32767 && !m_fixedWidth) {
++                load32(dest.m_ptr, dataTempRegister);
++                m_assembler.xori(cmpTempRegister, dataTempRegister, imm.m_value);
++                m_assembler.bltz(cmpTempRegister, 10);
++                m_assembler.addiu(dataTempRegister, dataTempRegister, imm.m_value);
++                store32(dataTempRegister, dest.m_ptr);
++                m_assembler.xori(cmpTempRegister, dataTempRegister, imm.m_value);
++                m_assembler.bgez(cmpTempRegister, 7);
++                m_assembler.nop();
++            } else {
++                load32(dest.m_ptr, dataTempRegister);
++                move(imm, immTempRegister);
++                m_assembler.xorInsn(cmpTempRegister, dataTempRegister, immTempRegister);
++                m_assembler.bltz(cmpTempRegister, 10);
++                m_assembler.addiu(dataTempRegister, dataTempRegister, immTempRegister);
++                store32(dataTempRegister, dest.m_ptr);
++                m_assembler.xori(cmpTempRegister, dataTempRegister, immTempRegister);
++                m_assembler.bgez(cmpTempRegister, 7);
++                m_assembler.nop();
++            }
++            return jump();
++        }
++        move(imm, immTempRegister);
++        load32(dest.m_ptr, dataTempRegister);
++        add32(immTempRegister, dataTempRegister);
++        store32(dataTempRegister, dest.m_ptr);
++        if (cond == Signed) {
++            // Check if dest is negative.
++            m_assembler.slt(cmpTempRegister, dataTempRegister, MIPSRegisters::zero);
++            return branchNotEqual(cmpTempRegister, MIPSRegisters::zero);
++        }
++        if (cond == Zero)
++            return branchEqual(dataTempRegister, MIPSRegisters::zero);
++        if (cond == NonZero)
++            return branchNotEqual(dataTempRegister, MIPSRegisters::zero);
++        ASSERT(0);
++        return Jump();
++    }
++
++    Jump branchMul32(ResultCondition cond, RegisterID src1, RegisterID src2, RegisterID dest)
++    {
++        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
++        if (cond == Overflow) {
++            /*
++                mult    src, dest
++                mfhi    dataTemp
++                mflo    dest
++                sra     addrTemp, dest, 31
++                beq     dataTemp, addrTemp, No_overflow # all sign bits (bit 63 to bit 31) are the same -> no overflow
++                nop
++                b       Overflow
++                nop
++                nop
++                nop
++                nop
++                nop
++            No_overflow:
++            */
++            m_assembler.mult(src1, src2);
++            m_assembler.mfhi(dataTempRegister);
++            m_assembler.mflo(dest);
++            m_assembler.sra(addrTempRegister, dest, 31);
++            m_assembler.beq(dataTempRegister, addrTempRegister, 7);
++            m_assembler.nop();
++            return jump();
++        }
++        if (cond == Signed) {
++            mul32(src1, src2, dest);
++            // Check if dest is negative.
++            m_assembler.slt(cmpTempRegister, dest, MIPSRegisters::zero);
++            return branchNotEqual(cmpTempRegister, MIPSRegisters::zero);
++        }
++        if (cond == Zero) {
++            mul32(src1, src2, dest);
++            return branchEqual(dest, MIPSRegisters::zero);
++        }
++        if (cond == NonZero) {
++            mul32(src1, src2, dest);
++            return branchNotEqual(dest, MIPSRegisters::zero);
++        }
++        ASSERT(0);
++        return Jump();
++    }
++
+     Jump branchMul32(ResultCondition cond, RegisterID src, RegisterID dest)
+     {
+         ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
+@@ -1465,8 +1761,7 @@ public:
+     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+     {
+         move(imm, immTempRegister);
+-        move(src, dest);
+-        return branchMul32(cond, immTempRegister, dest);
++        return branchMul32(cond, immTempRegister, src, dest);
+     }
+ 
+     Jump branchSub32(ResultCondition cond, RegisterID src, RegisterID dest)
+@@ -1525,8 +1820,60 @@ public:
+     Jump branchSub32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
+     {
+         move(imm, immTempRegister);
+-        move(src, dest);
+-        return branchSub32(cond, immTempRegister, dest);
++        return branchSub32(cond, src, immTempRegister, dest);
++    }
++
++    Jump branchSub32(ResultCondition cond, RegisterID op1, RegisterID op2, RegisterID dest)
++    {
++        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
++        if (cond == Overflow) {
++            /*
++                move    dataTemp, op1
++                xor     cmpTemp, dataTemp, op2
++                bgez    cmpTemp, No_overflow    # same sign bit -> no overflow
++                subu    dest, dataTemp, op2
++                xor     cmpTemp, dest, dataTemp
++                bgez    cmpTemp, No_overflow    # same sign bit -> no overflow
++                nop
++                b       Overflow
++                nop
++                nop
++                nop
++                nop
++                nop
++            No_overflow:
++            */
++            move(op1, dataTempRegister);
++            m_assembler.xorInsn(cmpTempRegister, dataTempRegister, op2);
++            m_assembler.bgez(cmpTempRegister, 10);
++            m_assembler.subu(dest, dataTempRegister, op2);
++            m_assembler.xorInsn(cmpTempRegister, dest, dataTempRegister);
++            m_assembler.bgez(cmpTempRegister, 7);
++            m_assembler.nop();
++            return jump();
++        }
++        if (cond == Signed) {
++            sub32(op1, op2, dest);
++            // Check if dest is negative.
++            m_assembler.slt(cmpTempRegister, dest, MIPSRegisters::zero);
++            return branchNotEqual(cmpTempRegister, MIPSRegisters::zero);
++        }
++        if (cond == Zero) {
++            sub32(op1, op2, dest);
++            return branchEqual(dest, MIPSRegisters::zero);
++        }
++        if (cond == NonZero) {
++            sub32(op1, op2, dest);
++            return branchNotEqual(dest, MIPSRegisters::zero);
++        }
++        ASSERT(0);
++        return Jump();
++    }
++
++    Jump branchNeg32(ResultCondition cond, RegisterID srcDest)
++    {
++        m_assembler.li(dataTempRegister, -1);
++        return branchMul32(cond, dataTempRegister, srcDest);
+     }
+ 
+     Jump branchOr32(ResultCondition cond, RegisterID src, RegisterID dest)
+@@ -1578,7 +1925,8 @@ public:
+ 
+     Call call(RegisterID target)
+     {
+-        m_assembler.jalr(target);
++        move(target, MIPSRegisters::t9);
++        m_assembler.jalr(MIPSRegisters::t9);
+         m_assembler.nop();
+         return Call(m_assembler.label(), Call::None);
+     }
+@@ -1822,7 +2170,7 @@ public:
+                 lui     immTemp, (address.offset + 0x8000) >> 16
+                 addu    addrTemp, addrTemp, immTemp
+                 lwc1    dest, (address.offset & 0xffff)(at)
+-                lwc1    dest+4, (address.offset & 0xffff + 4)(at)
++                lwc1    dest+1, (address.offset & 0xffff + 4)(at)
+             */
+             m_assembler.sll(addrTempRegister, address.index, address.scale);
+             m_assembler.addu(addrTempRegister, addrTempRegister, address.base);
+@@ -2009,6 +2357,19 @@ public:
+ #endif
+     }
+ 
++    void moveDouble(FPRegisterID src, FPRegisterID dest)
++    {
++        if (src != dest || m_fixedWidth)
++            m_assembler.movd(dest, src);
++    }
++
++    void swapDouble(FPRegisterID fr1, FPRegisterID fr2)
++    {
++        moveDouble(fr1, fpTempRegister);
++        moveDouble(fr2, fr1);
++        moveDouble(fpTempRegister, fr2);
++    }
++
+     void addDouble(FPRegisterID src, FPRegisterID dest)
+     {
+         m_assembler.addd(dest, dest, src);
+@@ -2036,6 +2397,11 @@ public:
+         m_assembler.subd(dest, dest, src);
+     }
+ 
++    void subDouble(FPRegisterID op1, FPRegisterID op2, FPRegisterID dest)
++    {
++        m_assembler.subd(dest, op1, op2);
++    }
++
+     void subDouble(Address src, FPRegisterID dest)
+     {
+         loadDouble(src, fpTempRegister);
+@@ -2053,11 +2419,32 @@ public:
+         m_assembler.muld(dest, dest, fpTempRegister);
+     }
+ 
++    void mulDouble(FPRegisterID op1, FPRegisterID op2, FPRegisterID dest)
++    {
++        m_assembler.muld(dest, op1, op2);
++    }
++
+     void divDouble(FPRegisterID src, FPRegisterID dest)
+     {
+         m_assembler.divd(dest, dest, src);
+     }
+ 
++    void divDouble(FPRegisterID op1, FPRegisterID op2, FPRegisterID dest)
++    {
++        m_assembler.divd(dest, op1, op2);
++    }
++
++    void divDouble(Address src, FPRegisterID dest)
++    {
++        loadDouble(src, fpTempRegister);
++        m_assembler.divd(dest, dest, fpTempRegister);
++    }
++
++    void negateDouble(FPRegisterID src, FPRegisterID dest)
++    {
++        m_assembler.negd(dest, src);
++    }
++
+     void convertInt32ToDouble(RegisterID src, FPRegisterID dest)
+     {
+         m_assembler.mtc1(src, fpTempRegister);
+@@ -2117,6 +2504,8 @@ public:
+ 
+     Jump branchEqual(RegisterID rs, RegisterID rt)
+     {
++        m_assembler.nop();
++        m_assembler.nop();
+         m_assembler.appendJump();
+         m_assembler.beq(rs, rt, 0);
+         m_assembler.nop();
+@@ -2126,6 +2515,8 @@ public:
+ 
+     Jump branchNotEqual(RegisterID rs, RegisterID rt)
+     {
++        m_assembler.nop();
++        m_assembler.nop();
+         m_assembler.appendJump();
+         m_assembler.bne(rs, rt, 0);
+         m_assembler.nop();
+@@ -2192,11 +2583,33 @@ public:
+     // If the result is not representable as a 32 bit value, branch.
+     // May also branch for some values that are representable in 32 bits
+     // (specifically, in this case, INT_MAX 0x7fffffff).
+-    Jump branchTruncateDoubleToInt32(FPRegisterID src, RegisterID dest)
++    enum BranchTruncateType { BranchIfTruncateFailed, BranchIfTruncateSuccessful };
++    Jump branchTruncateDoubleToInt32(FPRegisterID src, RegisterID dest, BranchTruncateType branchType = BranchIfTruncateFailed)
++    {
++        m_assembler.truncwd(fpTempRegister, src);
++        m_assembler.mfc1(dest, fpTempRegister);
++        return branch32(branchType == BranchIfTruncateFailed ? Equal : NotEqual, dest, TrustedImm32(0x7fffffff));
++    }
++
++    Jump branchTruncateDoubleToUint32(FPRegisterID src, RegisterID dest, BranchTruncateType branchType = BranchIfTruncateFailed)
++    {
++        m_assembler.truncwd(fpTempRegister, src);
++        m_assembler.mfc1(dest, fpTempRegister);
++        return branch32(branchType == BranchIfTruncateFailed ? Equal : NotEqual, dest, TrustedImm32(0));
++    }
++
++    // Result is undefined if the value is outside of the integer range.
++    void truncateDoubleToInt32(FPRegisterID src, RegisterID dest)
++    {
++        m_assembler.truncwd(fpTempRegister, src);
++        m_assembler.mfc1(dest, fpTempRegister);
++    }
++
++    // Result is undefined if src > 2^31
++    void truncateDoubleToUint32(FPRegisterID src, RegisterID dest)
+     {
+         m_assembler.truncwd(fpTempRegister, src);
+         m_assembler.mfc1(dest, fpTempRegister);
+-        return branch32(Equal, dest, TrustedImm32(0x7fffffff));
+     }
+ 
+     // Convert 'src' to an integer, and places the resulting 'dest'.
+@@ -2218,28 +2631,43 @@ public:
+ 
+     Jump branchDoubleNonZero(FPRegisterID reg, FPRegisterID scratch)
+     {
+-#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64
+-        m_assembler.mtc1(MIPSRegisters::zero, scratch);
+-        m_assembler.mthc1(MIPSRegisters::zero, scratch);
+-#else
+-        m_assembler.mtc1(MIPSRegisters::zero, scratch);
+-        m_assembler.mtc1(MIPSRegisters::zero, FPRegisterID(scratch + 1));
+-#endif
++        m_assembler.vmov(scratch, MIPSRegisters::zero, MIPSRegisters::zero);
+         return branchDouble(DoubleNotEqual, reg, scratch);
+     }
+ 
+     Jump branchDoubleZeroOrNaN(FPRegisterID reg, FPRegisterID scratch)
+     {
+-#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64
+-        m_assembler.mtc1(MIPSRegisters::zero, scratch);
+-        m_assembler.mthc1(MIPSRegisters::zero, scratch);
+-#else
+-        m_assembler.mtc1(MIPSRegisters::zero, scratch);
+-        m_assembler.mtc1(MIPSRegisters::zero, FPRegisterID(scratch + 1));
+-#endif
++        m_assembler.vmov(scratch, MIPSRegisters::zero, MIPSRegisters::zero);
+         return branchDouble(DoubleEqualOrUnordered, reg, scratch);
+     }
+ 
++    // Invert a relational condition, e.g. == becomes !=, < becomes >=, etc.
++    static RelationalCondition invert(RelationalCondition cond)
++    {
++        RelationalCondition r;
++        if (cond == Equal)
++            r = NotEqual;
++        else if (cond == NotEqual)
++            r = Equal;
++        else if (cond == Above)
++            r = BelowOrEqual;
++        else if (cond == AboveOrEqual)
++            r = Below;
++        else if (cond == Below)
++            r = AboveOrEqual;
++        else if (cond == BelowOrEqual)
++            r = Above;
++        else if (cond == GreaterThan)
++            r = LessThanOrEqual;
++        else if (cond == GreaterThanOrEqual)
++            r = LessThan;
++        else if (cond == LessThan)
++            r = GreaterThanOrEqual;
++        else if (cond == LessThanOrEqual)
++            r = GreaterThan;
++        return r;
++    }
++
+     void nop()
+     {
+         m_assembler.nop();
+@@ -2252,12 +2680,12 @@ public:
+ 
+     static void replaceWithJump(CodeLocationLabel instructionStart, CodeLocationLabel destination)
+     {
+-        RELEASE_ASSERT_NOT_REACHED();
++        MIPSAssembler::replaceWithJump(instructionStart.dataLocation(), destination.dataLocation());
+     }
+     
+     static ptrdiff_t maxJumpReplacementSize()
+     {
+-        RELEASE_ASSERT_NOT_REACHED();
++        MIPSAssembler::maxJumpReplacementSize();
+         return 0;
+     }
+ 
+diff --git a/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h b/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h
+index fa0f5e0..573d8dc 100644
+--- a/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h
++++ b/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h
+@@ -93,6 +93,23 @@ public:
+     }
+ #endif
+ 
++#if CPU(MIPS)
++    ALWAYS_INLINE void preserveReturnAddressAfterCall(RegisterID reg)
++    {
++        move(returnAddressRegister, reg);
++    }
++
++    ALWAYS_INLINE void restoreReturnAddressBeforeReturn(RegisterID reg)
++    {
++        move(reg, returnAddressRegister);
++    }
++
++    ALWAYS_INLINE void restoreReturnAddressBeforeReturn(Address address)
++    {
++        loadPtr(address, returnAddressRegister);
++    }
++#endif
++
+     void emitGetFromCallFrameHeaderPtr(JSStack::CallFrameHeaderEntry entry, GPRReg to)
+     {
+         loadPtr(Address(GPRInfo::callFrameRegister, entry * sizeof(Register)), to);
+@@ -193,7 +210,7 @@ public:
+         move(TrustedImmPtr(scratchBuffer->activeLengthPtr()), GPRInfo::regT0);
+         storePtr(TrustedImmPtr(scratchSize), GPRInfo::regT0);
+ 
+-#if CPU(X86_64) || CPU(ARM)
++#if CPU(X86_64) || CPU(ARM) || CPU(MIPS)
+         move(TrustedImmPtr(buffer), GPRInfo::argumentGPR2);
+         move(TrustedImmPtr(argument), GPRInfo::argumentGPR1);
+         move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+diff --git a/Source/JavaScriptCore/dfg/DFGCCallHelpers.h b/Source/JavaScriptCore/dfg/DFGCCallHelpers.h
+index 8adde05..3d99f6f 100644
+--- a/Source/JavaScriptCore/dfg/DFGCCallHelpers.h
++++ b/Source/JavaScriptCore/dfg/DFGCCallHelpers.h
+@@ -576,6 +576,39 @@ public:
+         poke(GPRInfo::nonArgGPR0);
+     }
+ #endif // CPU(ARM_HARDFP)
++#elif CPU(MIPS)
++    ALWAYS_INLINE void setupArguments(FPRReg arg1)
++    {
++        moveDouble(arg1, FPRInfo::argumentFPR0);
++    }
++
++    ALWAYS_INLINE void setupArguments(FPRReg arg1, FPRReg arg2)
++    {
++        if (arg2 != FPRInfo::argumentFPR0) {
++            moveDouble(arg1, FPRInfo::argumentFPR0);
++            moveDouble(arg2, FPRInfo::argumentFPR1);
++        } else if (arg1 != FPRInfo::argumentFPR1) {
++            moveDouble(arg2, FPRInfo::argumentFPR1);
++            moveDouble(arg1, FPRInfo::argumentFPR0);
++        } else {
++            // Swap arg1, arg2.
++            swapDouble(FPRInfo::argumentFPR0, FPRInfo::argumentFPR1);
++        }
++    }
++
++    ALWAYS_INLINE void setupArgumentsWithExecState(FPRReg arg1, GPRReg arg2)
++    {
++        assembler().vmov(GPRInfo::argumentGPR2, GPRInfo::argumentGPR3, arg1);
++        move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
++        poke(arg2, 4);
++    }
++
++    ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, FPRReg arg3)
++    {
++        setupStubArguments(arg1, arg2);
++        move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
++        poke(arg3, 4);
++    }
+ #else
+ #error "DFG JIT not supported on this platform."
+ #endif
+@@ -803,119 +836,126 @@ public:
+     // These methods are suitable for any calling convention that provides for
+     // exactly 4 argument registers, e.g. ARMv7.
+ #if NUMBER_OF_ARGUMENT_REGISTERS == 4
++
++#if CPU(MIPS)
++#define POKE_ARGUMENT_OFFSET 4
++#else
++#define POKE_ARGUMENT_OFFSET 0
++#endif
++
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImmPtr arg2, TrustedImm32 arg3, GPRReg arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImmPtr arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, TrustedImm32 arg2, GPRReg arg3, GPRReg arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, TrustedImmPtr arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, TrustedImmPtr arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImmPtr arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4)
+     {
+-        poke(arg4);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, TrustedImm32 arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, TrustedImmPtr arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4, TrustedImm32 arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, TrustedImm32 arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+     ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5)
+     {
+-        poke(arg5, 1);
+-        poke(arg4);
++        poke(arg5, POKE_ARGUMENT_OFFSET + 1);
++        poke(arg4, POKE_ARGUMENT_OFFSET);
+         setupArgumentsWithExecState(arg1, arg2, arg3);
+     }
+ 
+diff --git a/Source/JavaScriptCore/dfg/DFGFPRInfo.h b/Source/JavaScriptCore/dfg/DFGFPRInfo.h
+index 17aaa7d..e18ec06 100644
+--- a/Source/JavaScriptCore/dfg/DFGFPRInfo.h
++++ b/Source/JavaScriptCore/dfg/DFGFPRInfo.h
+@@ -164,6 +164,74 @@ public:
+ 
+ #endif
+ 
++#if CPU(MIPS)
++
++class FPRInfo {
++public:
++    typedef FPRReg RegisterType;
++    static const unsigned numberOfRegisters = 6;
++
++    // Temporary registers.
++    static const FPRReg fpRegT0 = MIPSRegisters::f0;
++    static const FPRReg fpRegT1 = MIPSRegisters::f4;
++    static const FPRReg fpRegT2 = MIPSRegisters::f6;
++    static const FPRReg fpRegT3 = MIPSRegisters::f8;
++    static const FPRReg fpRegT4 = MIPSRegisters::f10;
++    static const FPRReg fpRegT5 = MIPSRegisters::f18;
++
++    static const FPRReg returnValueFPR = MIPSRegisters::f0;
++
++    static const FPRReg argumentFPR0 = MIPSRegisters::f12;
++    static const FPRReg argumentFPR1 = MIPSRegisters::f14;
++
++    static FPRReg toRegister(unsigned index)
++    {
++        static const FPRReg registerForIndex[numberOfRegisters] = {
++            fpRegT0, fpRegT1, fpRegT2, fpRegT3, fpRegT4, fpRegT5 };
++
++        ASSERT(index < numberOfRegisters);
++        return registerForIndex[index];
++    }
++
++    static unsigned toIndex(FPRReg reg)
++    {
++        ASSERT(reg != InvalidFPRReg);
++        ASSERT(reg < 20);
++        static const unsigned indexForRegister[20] = {
++            0, InvalidIndex, InvalidIndex, InvalidIndex,
++            1, InvalidIndex, 2, InvalidIndex,
++            3, InvalidIndex, 4, InvalidIndex,
++            InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex,
++            InvalidIndex, InvalidIndex, 5, InvalidIndex,
++        };
++        unsigned result = indexForRegister[reg];
++        ASSERT(result != InvalidIndex);
++        return result;
++    }
++
++    static const char* debugName(FPRReg reg)
++    {
++        ASSERT(reg != InvalidFPRReg);
++        ASSERT(reg < 32);
++        static const char* nameForRegister[32] = {
++            "f0", "f1", "f2", "f3",
++            "f4", "f5", "f6", "f7",
++            "f8", "f9", "f10", "f11",
++            "f12", "f13", "f14", "f15"
++            "f16", "f17", "f18", "f19"
++            "f20", "f21", "f22", "f23"
++            "f24", "f25", "f26", "f27"
++            "f28", "f29", "f30", "f31"
++        };
++        return nameForRegister[reg];
++    }
++private:
++
++    static const unsigned InvalidIndex = 0xffffffff;
++};
++
++#endif
++
+ typedef RegisterBank<FPRInfo>::iterator fpr_iterator;
+ 
+ } } // namespace JSC::DFG
+diff --git a/Source/JavaScriptCore/dfg/DFGGPRInfo.h b/Source/JavaScriptCore/dfg/DFGGPRInfo.h
+index 3d07556..aa634cd 100644
+--- a/Source/JavaScriptCore/dfg/DFGGPRInfo.h
++++ b/Source/JavaScriptCore/dfg/DFGGPRInfo.h
+@@ -461,6 +461,73 @@ private:
+ 
+ #endif
+ 
++#if CPU(MIPS)
++#define NUMBER_OF_ARGUMENT_REGISTERS 4
++
++class GPRInfo {
++public:
++    typedef GPRReg RegisterType;
++    static const unsigned numberOfRegisters = 6;
++
++    // Temporary registers.
++    static const GPRReg regT0 = MIPSRegisters::v0;
++    static const GPRReg regT1 = MIPSRegisters::v1;
++    static const GPRReg regT2 = MIPSRegisters::t4;
++    static const GPRReg regT3 = MIPSRegisters::t5;
++    static const GPRReg regT4 = MIPSRegisters::t6;
++    static const GPRReg regT5 = MIPSRegisters::t7;
++    // These registers match the baseline JIT.
++    static const GPRReg cachedResultRegister = regT0;
++    static const GPRReg cachedResultRegister2 = regT1;
++    static const GPRReg callFrameRegister = MIPSRegisters::s0;
++    // These constants provide the names for the general purpose argument & return value registers.
++    static const GPRReg argumentGPR0 = MIPSRegisters::a0;
++    static const GPRReg argumentGPR1 = MIPSRegisters::a1;
++    static const GPRReg argumentGPR2 = MIPSRegisters::a2;
++    static const GPRReg argumentGPR3 = MIPSRegisters::a3;
++    static const GPRReg nonArgGPR0 = regT2;
++    static const GPRReg nonArgGPR1 = regT3;
++    static const GPRReg nonArgGPR2 = regT4;
++    static const GPRReg returnValueGPR = regT0;
++    static const GPRReg returnValueGPR2 = regT1;
++    static const GPRReg nonPreservedNonReturnGPR = regT5;
++
++    static GPRReg toRegister(unsigned index)
++    {
++        ASSERT(index < numberOfRegisters);
++        static const GPRReg registerForIndex[numberOfRegisters] = { regT0, regT1, regT2, regT3, regT4, regT5 };
++        return registerForIndex[index];
++    }
++
++    static unsigned toIndex(GPRReg reg)
++    {
++        ASSERT(reg != InvalidGPRReg);
++        ASSERT(reg < 16);
++        static const unsigned indexForRegister[16] = { InvalidIndex, InvalidIndex, 0, 1, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, 2, 3, 4, 5 };
++        unsigned result = indexForRegister[reg];
++        ASSERT(result != InvalidIndex);
++        return result;
++    }
++
++    static const char* debugName(GPRReg reg)
++    {
++        ASSERT(reg != InvalidGPRReg);
++        ASSERT(reg < 16);
++        static const char* nameForRegister[16] = {
++            "zero", "at", "v0", "v1",
++            "a0", "a1", "a2", "a3",
++            "t0", "t1", "t2", "t3",
++            "t4", "t5", "t6", "t7"
++        };
++        return nameForRegister[reg];
++    }
++private:
++
++    static const unsigned InvalidIndex = 0xffffffff;
++};
++
++#endif
++
+ typedef RegisterBank<GPRInfo>::iterator gpr_iterator;
+ 
+ } } // namespace JSC::DFG
+diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
+index ea33f38..247274b 100644
+--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
++++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
+@@ -1241,7 +1241,7 @@ public:
+ 
+ // EncodedJSValue in JSVALUE32_64 is a 64-bit integer. When being compiled in ARM EABI, it must be aligned even-numbered register (r0, r2 or [sp]).
+ // To avoid assemblies from using wrong registers, let's occupy r1 or r3 with a dummy argument when necessary.
+-#if COMPILER_SUPPORTS(EABI) && CPU(ARM)
++#if (COMPILER_SUPPORTS(EABI) && CPU(ARM)) || CPU(MIPS)
+ #define EABI_32BIT_DUMMY_ARG      TrustedImm32(0),
+ #else
+ #define EABI_32BIT_DUMMY_ARG
+@@ -1691,7 +1691,7 @@ public:
+     }
+ #endif
+     
+-#if !defined(NDEBUG) && !CPU(ARM)
++#if !defined(NDEBUG) && !CPU(ARM) && !CPU(MIPS)
+     void prepareForExternalCall()
+     {
+         // We're about to call out to a "native" helper function. The helper
+diff --git a/Source/JavaScriptCore/jit/JSInterfaceJIT.h b/Source/JavaScriptCore/jit/JSInterfaceJIT.h
+index 7fdeaf0..48ad6b2 100644
+--- a/Source/JavaScriptCore/jit/JSInterfaceJIT.h
++++ b/Source/JavaScriptCore/jit/JSInterfaceJIT.h
+@@ -125,6 +125,10 @@ namespace JSC {
+         static const RegisterID cachedResultRegister = MIPSRegisters::v0;
+         static const RegisterID firstArgumentRegister = MIPSRegisters::a0;
+         
++#if ENABLE(VALUE_PROFILER)
++        static const RegisterID bucketCounterRegister = MIPSRegisters::s3;
++#endif
++
+         // regT0 must be v0 for returning a 32-bit value.
+         static const RegisterID regT0 = MIPSRegisters::v0;
+         
+diff --git a/Source/JavaScriptCore/runtime/JSGlobalData.h b/Source/JavaScriptCore/runtime/JSGlobalData.h
+index 5d47ab9..c02f336 100644
+--- a/Source/JavaScriptCore/runtime/JSGlobalData.h
++++ b/Source/JavaScriptCore/runtime/JSGlobalData.h
+@@ -141,14 +141,18 @@ namespace JSC {
+             return result;
+         }
+ 
+-        static size_t allocationSize(size_t bufferSize) { return sizeof(size_t) + bufferSize; }
++        static size_t allocationSize(size_t bufferSize) { return sizeof(ScratchBuffer) + bufferSize; }
+         void setActiveLength(size_t activeLength) { m_activeLength = activeLength; }
+         size_t activeLength() const { return m_activeLength; };
+         size_t* activeLengthPtr() { return &m_activeLength; };
+         void* dataBuffer() { return m_buffer; }
+ 
+         size_t m_activeLength;
++#if CPU(MIPS) && (defined WTF_MIPS_ARCH_REV && WTF_MIPS_ARCH_REV == 2)
++        void* m_buffer[0] __attribute__((aligned(8)));
++#else
+         void* m_buffer[0];
++#endif
+     };
+ #if COMPILER(MSVC)
+ #pragma warning(pop)
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 1698247..2d90359 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -818,6 +818,10 @@
+ #if CPU(ARM_TRADITIONAL)
+ #define ENABLE_DFG_JIT 1
+ #endif
++/* Enable the DFG JIT on MIPS. */
++#if CPU(MIPS)
++#define ENABLE_DFG_JIT 1
++#endif
+ #endif
+ 
+ /* If the jit is not available, enable the LLInt C Loop: */
+-- 
+1.8.3.2
+
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 116a5e79a7..99a90b982a 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -4,22 +4,32 @@
 #
 ################################################################################
 
-WEBKIT_VERSION = 1.9.6
+WEBKIT_VERSION = 1.11.5
 WEBKIT_SITE = http://www.webkitgtk.org/releases
-WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.xz
+WEBKIT_SOURCE = webkitgtk-$(WEBKIT_VERSION).tar.xz
 WEBKIT_INSTALL_STAGING = YES
-WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf icu libcurl \
-	libxml2 libxslt libgtk2 sqlite enchant libsoup jpeg libgail
+WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf enchant harfbuzz \
+	icu jpeg libcurl libgail libsecret libsoup libxml2 libxslt libgtk2 sqlite webp
 
 # webkit-disable-tests.patch changes configure.ac therefore autoreconf required
 WEBKIT_AUTORECONF = YES
 WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
 
+# Does not build and it's disabled by default
+# in newer releases
+define DISABLE_INDEXED_DATABASE
+	$(SED) '/ENABLE_INDEXED_DATABASE/s:1:0:' \
+			$(@D)/Source/WebCore/GNUmakefile.features.am
+endef
+
+WEBKIT_PRE_CONFIGURE_HOOKS += DISABLE_INDEXED_DATABASE
+
 # Give explicit path to icu-config, and silence gazillions of warnings
 # with recent gcc versions.
 WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config \
 	CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align -Wno-sign-compare" \
-	CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align -Wno-sign-compare"
+	CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align -Wno-sign-compare" \
+	AR_FLAGS="cru"
 
 WEBKIT_CONF_OPT += \
 	--with-gtk=2.0 \

From 0175dce8bce9528bf7600e43158cfcf7e9b18331 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 8 Sep 2013 23:58:05 +0200
Subject: [PATCH 6039/6849] opus-tools: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opus-tools/opus-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index 66bd9f08fd..bb11a19239 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPUS_TOOLS_VERSION = 0.1.6
+OPUS_TOOLS_VERSION = 0.1.7
 OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_TOOLS_CONF_OPT = --disable-oggtest --disable-opustest
 OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf

From 33a9d34ff375ec0c0389c9af6bc499a8dd7ccbc9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 9 Sep 2013 11:27:55 +0200
Subject: [PATCH 6040/6849] webkit: fix staging install

Parallel 'make install' seems to deadlock here (make 3.81). Work around it
by disabling parallel make for the install step.

We only disable parallel make for the install step, as the build step works
with parallel make, and webkit is a huge package, so build time goes up
significantly with make -j1.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webkit/webkit.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 99a90b982a..eb1547bba6 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -15,6 +15,9 @@ WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf enchant harfbuzz
 WEBKIT_AUTORECONF = YES
 WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
 
+# parallel make install deadlocks with make 3.81
+WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
+
 # Does not build and it's disabled by default
 # in newer releases
 define DISABLE_INDEXED_DATABASE

From b17472e1fbd51c600304f9e2b060117a89b7646f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 9 Sep 2013 11:38:15 +0200
Subject: [PATCH 6041/6849] package: don't use .xz format for github

Fixes http://autobuild.buildroot.net/results/955/955ed1af28f6ff9912adddc0342d1f3ca65e5b4d/

Commit 62146ea3ad7 (change package tarball compression to xz whenever possible)
changed a number of packages to use .xz format tarballs. Unfortunately this
doesn't work for packages from github, as it delivers gzip compressed tarballs
even when a .xz is requested.

Fix it by reverting this change for the packages using github.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/cpuload/cpuload.mk                       | 2 --
 package/fb-test-app/fb-test-app.mk               | 1 -
 package/input-event-daemon/input-event-daemon.mk | 1 -
 3 files changed, 4 deletions(-)

diff --git a/package/cpuload/cpuload.mk b/package/cpuload/cpuload.mk
index c8d1d0ceea..e0b8ccfb16 100644
--- a/package/cpuload/cpuload.mk
+++ b/package/cpuload/cpuload.mk
@@ -5,10 +5,8 @@
 ################################################################################
 
 CPULOAD_VERSION = v0.3
-CPULOAD_SOURCE = cpuload-$(CPULOAD_VERSION).tar.xz
 CPULOAD_SITE = http://github.com/kelvincheung/cpuload/tarball/$(CPULOAD_VERSION)
 CPULOAD_LICENSE = GPLv2
 CPULOAD_LICENSE_FILES = COPYING
 
-
 $(eval $(autotools-package))
diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk
index 5b95c29fab..a2183e0080 100644
--- a/package/fb-test-app/fb-test-app.mk
+++ b/package/fb-test-app/fb-test-app.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FB_TEST_APP_VERSION = v1.0.0
-FB_TEST_APP_SOURCE = fb-test-app-$(FB_TEST_APP_VERSION).tar.xz
 FB_TEST_APP_SITE = http://github.com/prpplague/fb-test-app/tarball/$(FB_TEST_APP_VERSION)
 FB_TEST_APP_LICENSE = GPLv2
 FB_TEST_APP_LICENSE_FILES = COPYING
diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk
index cbcc2df792..762d3c2b5c 100644
--- a/package/input-event-daemon/input-event-daemon.mk
+++ b/package/input-event-daemon/input-event-daemon.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 INPUT_EVENT_DAEMON_VERSION = v0.1.3
-INPUT_EVENT_DAEMON_SOURCE = input-event-daemon-$(INPUT_EVENT_DAEMON_VERSION).tar.xz
 INPUT_EVENT_DAEMON_SITE = http://github.com/gandro/input-event-daemon/tarball/$(INPUT_EVENT_DAEMON_VERSION)
 INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license
 INPUT_EVENT_DAEMON_LICENSE_FILES = README

From 0064439712ac0c73fb48cb9e4c978d3cee563a0e Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Thu, 5 Sep 2013 15:55:03 -0500
Subject: [PATCH 6042/6849] util-linux: fix build failure with older systems

Adding patch util-linux-002-support-older-machines.patch to fix issues
when building for older systems.

Making all util-linux patches apply cleanly (fuzz fixes)

Fixes http://autobuild.buildroot.org/results/349/349d6ff938b093623618669a1acb390aa2a5fafe
Fixes http://autobuild.buildroot.org/results/57e/57e2c612c46b9e3b5f7bb213fcb3825b23fb7fc7

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../util-linux-001-sscanf-no-ms-as.patch      |  12 +-
 ...til-linux-002-support-older-machines.patch | 208 ++++++++++++++++++
 ...ux-003-program-invocation-short-name.patch |   6 +-
 3 files changed, 216 insertions(+), 10 deletions(-)
 create mode 100644 package/util-linux/util-linux-002-support-older-machines.patch

diff --git a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
index 5d08b9b6a0..72a060e29c 100644
--- a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
+++ b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
@@ -4,20 +4,18 @@ See https://bugs.gentoo.org/show_bug.cgi?id=406303
 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.21.1-no-printf-alloc.patch?revision=1.2
 ported to util-linux-2.23.2
 
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac	2012-12-13 08:16:02.973822890 -0300
-+++ b/configure.ac	2013-03-07 14:50:39.975512873 -0300
-@@ -733,7 +733,6 @@
+--- a/configure.ac	2013-07-30 03:39:26.188738061 -0500
++++ b/configure.ac	2013-09-05 15:31:11.460864363 -0500
+@@ -755,7 +755,6 @@
  UL_BUILD_INIT([libmount])
  UL_REQUIRES_LINUX([libmount])
  UL_REQUIRES_BUILD([libmount], [libblkid])
 -UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
  AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes)
  AM_CONDITIONAL(BUILD_LIBMOUNT_TESTS, test "x$build_libmount" = xyes -a "x$enable_static" = xyes)
-
-diff -Nura a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
+ 
 --- a/libmount/src/tab_parse.c	2013-07-30 03:39:26.218738358 -0500
-+++ b/libmount/src/tab_parse.c	2013-09-04 11:22:26.332917445 -0500
++++ b/libmount/src/tab_parse.c	2013-09-05 15:31:11.460864363 -0500
 @@ -22,6 +22,10 @@
  #include "pathnames.h"
  #include "strutils.h"
diff --git a/package/util-linux/util-linux-002-support-older-machines.patch b/package/util-linux/util-linux-002-support-older-machines.patch
new file mode 100644
index 0000000000..5736a9808d
--- /dev/null
+++ b/package/util-linux/util-linux-002-support-older-machines.patch
@@ -0,0 +1,208 @@
+This patch was adopted from 
+http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
+
+Support older hosts with latest util-linux-native
+
+mkostemp is not defined on older machines.  So we detect this and
+provide a define that uses mkstemp instead.
+
+O_CLOEXEC is not defined on older machines.  It is however defined
+in the 'c.h' header.  Fix up the users to include 'c.h'.
+
+fdisks/fdisksunlabel.c was modified to use qsort_r, however
+this is not defined on older hosts.  Revert:
+  commit c69bbca9c1f6645097bd20fe3a21f5a99a2a0698
+  fdisk: (sun): use ask API, remove global variable
+
+Upstream-Status: Inappropriate [other]
+Patches revert upstream changes in order to support older
+machines.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+--- a/configure.ac	2013-09-05 15:31:11.460864363 -0500
++++ b/configure.ac	2013-09-05 15:31:21.590981268 -0500
+@@ -323,6 +323,7 @@
+ 	llseek \
+ 	lseek64 \
+ 	mempcpy \
++	mkostemp \
+ 	nanosleep \
+ 	personality \
+ 	posix_fadvise \
+--- a/include/c.h	2013-07-30 03:39:26.200738180 -0500
++++ b/include/c.h	2013-09-05 15:31:21.590981268 -0500
+@@ -236,6 +236,13 @@
+ #endif
+ 
+ /*
++ * mkostemp replacement
++ */
++#ifndef HAVE_MKOSTEMP
++#define mkostemp(template, flags) mkstemp(template)
++#endif
++
++/*
+  * MAXHOSTNAMELEN replacement
+  */
+ static inline size_t get_hostname_max(void)
+--- a/lib/randutils.c	2013-06-13 02:46:10.408650519 -0500
++++ b/lib/randutils.c	2013-09-05 15:31:21.650099925 -0500
+@@ -16,6 +16,7 @@
+ #include <sys/syscall.h>
+ 
+ #include "randutils.h"
++#include "c.h"
+ 
+ #ifdef HAVE_TLS
+ #define THREAD_LOCAL static __thread
+--- a/lib/wholedisk.c	2013-06-13 02:46:10.411650545 -0500
++++ b/lib/wholedisk.c	2013-09-05 15:31:21.650099925 -0500
+@@ -10,6 +10,7 @@
+ 
+ #include "blkdev.h"
+ #include "wholedisk.h"
++#include "c.h"
+ 
+ int is_whole_disk_fd(int fd, const char *name)
+ {
+--- a/fdisks/fdisksunlabel.c	2013-07-30 03:39:26.197738150 -0500
++++ b/fdisks/fdisksunlabel.c	2013-09-05 15:31:21.650099925 -0500
+@@ -383,10 +383,10 @@
+ 	}
+ }
+ 
+-static int verify_sun_cmp(int *a, int *b, void *data)
+-{
+-    unsigned int *verify_sun_starts = (unsigned int *) data;
++static unsigned int *verify_sun_starts;
+ 
++static int verify_sun_cmp(int *a, int *b)
++{
+     if (*a == -1)
+ 	    return 1;
+     if (*b == -1)
+@@ -401,7 +401,6 @@
+     uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop;
+     uint32_t i,j,k,starto,endo;
+     int array[SUN_MAXPARTITIONS];
+-    unsigned int *verify_sun_starts;
+ 
+     assert(cxt);
+     assert(cxt->label);
+@@ -442,16 +441,14 @@
+ 	    }
+ 	}
+     }
+-
+     for (i = 0; i < SUN_MAXPARTITIONS; i++) {
+         if (lens[i])
+             array[i] = i;
+         else
+             array[i] = -1;
+     }
+-    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
+-	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
+-	  verify_sun_starts);
++    qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
++	  (int (*)(const void *,const void *)) verify_sun_cmp);
+ 
+     if (array[0] == -1) {
+ 	fdisk_info(cxt, _("No partitions defined"));
+@@ -468,6 +465,7 @@
+     start = (starts[array[i]] + lens[array[i]]);
+     if (start < stop)
+         fdisk_warnx(cxt, _("Unused gap - sectors %d-%d"), start, stop);
++
+     return 0;
+ }
+ 
+@@ -746,18 +744,12 @@
+ 	}
+ }
+ 
+-
+ void fdisk_sun_set_alt_cyl(struct fdisk_context *cxt)
+ {
+ 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
+-	uintmax_t res;
+-	int rc = fdisk_ask_number(cxt, 0,			/* low */
+-			be16_to_cpu(sunlabel->acyl),		/* default */
+-			65535,					/* high */
+-			_("Number of alternate cylinders"),	/* query */
+-			&res);					/* result */
+-	if (!rc)
+-		sunlabel->acyl = cpu_to_be16(res);
++	sunlabel->acyl =
++		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->acyl), 65535, 0,
++				_("Number of alternate cylinders")));
+ }
+ 
+ void fdisk_sun_set_ncyl(struct fdisk_context *cxt, int cyl)
+@@ -769,54 +761,33 @@
+ void fdisk_sun_set_xcyl(struct fdisk_context *cxt)
+ {
+ 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
+-	uintmax_t res;
+-	int rc = fdisk_ask_number(cxt, 0,			/* low */
+-			be16_to_cpu(sunlabel->apc),		/* default */
+-			cxt->geom.sectors,			/* high */
+-			_("Extra sectors per cylinder"),	/* query */
+-			&res);					/* result */
+-	if (!rc)
+-		sunlabel->apc = cpu_to_be16(res);
++	sunlabel->apc =
++		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->apc), cxt->geom.sectors, 0,
++				_("Extra sectors per cylinder")));
+ }
+ 
+ void fdisk_sun_set_ilfact(struct fdisk_context *cxt)
+ {
+ 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
+-	uintmax_t res;
+-	int rc = fdisk_ask_number(cxt, 1,			/* low */
+-			be16_to_cpu(sunlabel->intrlv),		/* default */
+-			32,					/* high */
+-			_("Interleave factor"),	/* query */
+-			&res);					/* result */
+-	if (!rc)
+-		sunlabel->intrlv = cpu_to_be16(res);
++	sunlabel->intrlv =
++		cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->intrlv), 32, 0,
++				_("Interleave factor")));
+ }
+ 
+ void fdisk_sun_set_rspeed(struct fdisk_context *cxt)
+ {
+ 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
+-	uintmax_t res;
+-	int rc = fdisk_ask_number(cxt, 1,			/* low */
+-			be16_to_cpu(sunlabel->rpm),		/* default */
+-			USHRT_MAX,				/* high */
+-			_("Rotation speed (rpm)"),		/* query */
+-			&res);					/* result */
+-	if (!rc)
+-		sunlabel->rpm = cpu_to_be16(res);
+-
++	sunlabel->rpm =
++		 cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->rpm), 100000, 0,
++				_("Rotation speed (rpm)")));
+ }
+ 
+ void fdisk_sun_set_pcylcount(struct fdisk_context *cxt)
+ {
+ 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
+-	uintmax_t res;
+-	int rc = fdisk_ask_number(cxt, 0,			/* low */
+-			be16_to_cpu(sunlabel->pcyl),		/* default */
+-			USHRT_MAX,				/* high */
+-			_("Number of physical cylinders"),	/* query */
+-			&res);					/* result */
+-	if (!rc)
+-		sunlabel->pcyl = cpu_to_be16(res);
++	sunlabel->pcyl =
++		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->pcyl), 65535, 0,
++				_("Number of physical cylinders")));
+ }
+ 
+ static int sun_write_disklabel(struct fdisk_context *cxt)
diff --git a/package/util-linux/util-linux-003-program-invocation-short-name.patch b/package/util-linux/util-linux-003-program-invocation-short-name.patch
index 5d04e35538..95fea3f13d 100644
--- a/package/util-linux/util-linux-003-program-invocation-short-name.patch
+++ b/package/util-linux/util-linux-003-program-invocation-short-name.patch
@@ -1,6 +1,6 @@
---- a/configure.ac	2013-07-30 03:39:26.188738061 -0500
-+++ b/configure.ac	2013-08-27 16:20:09.882953093 -0500
-@@ -386,7 +386,7 @@
+--- a/configure.ac	2013-09-05 15:31:21.590981268 -0500
++++ b/configure.ac	2013-09-05 15:31:29.160981049 -0500
+@@ -387,7 +387,7 @@
  
  AC_MSG_CHECKING([whether program_invocation_short_name is defined])
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

From d763fa91acd1c585cf4f6ed7302768a56ffa085f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 9 Sep 2013 22:38:04 +0200
Subject: [PATCH 6043/6849] pulseaudio: fix init script installation

Adjust the installation step after adf65110 (Remove multimedia subdirectory).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pulseaudio/pulseaudio.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 66265d0578..cdeabc5c17 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -107,7 +107,7 @@ define PULSEAUDIO_USERS
 endef
 
 define PULSEAUDIO_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 755 package/multimedia/pulseaudio/S50pulseaudio \
+	$(INSTALL) -D -m 755 package/pulseaudio/S50pulseaudio \
 		$(TARGET_DIR)/etc/init.d/S50pulseaudio
 endef
 

From 34406e2bee51f51e582fc350781561ae42a3e260 Mon Sep 17 00:00:00 2001
From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Mon, 9 Sep 2013 22:40:32 +0200
Subject: [PATCH 6044/6849] mpd: remove reference to old multimedia
 sub-directory

Signed-off-by: Sagaert Johan <sagaert.johan at skynet.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mpd/mpd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index edcd945ef0..737be41af2 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -129,10 +129,10 @@ endif
 
 define MPD_INSTALL_EXTRA_FILES
 	@if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \
-		$(INSTALL) -D package/multimedia/mpd/mpd.conf \
+		$(INSTALL) -D package/mpd/mpd.conf \
 			$(TARGET_DIR)/etc/mpd.conf; \
 	fi
-	$(INSTALL) -m 0755 -D package/multimedia/mpd/S95mpd \
+	$(INSTALL) -m 0755 -D package/mpd/S95mpd \
 		$(TARGET_DIR)/etc/init.d/S95mpd
 endef
 

From 9f2bf30e1e3fd02230cae39dbfeba423adedbb25 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 3 Sep 2013 17:39:53 +0800
Subject: [PATCH 6045/6849] Config.in: Fixup after BR2_ELF2FLT got renamed to
 BR2_PACKAGE_HOST_ELF2FLT

The BR2_ELF2FLT option has been renamed to BR2_PACKAGE_HOST_ELF2FLT, thus
use the new name to fix dependency.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config.in b/Config.in
index cb246a4ff3..65c29b43fc 100644
--- a/Config.in
+++ b/Config.in
@@ -286,7 +286,7 @@ choice
 
 config BR2_STRIP_strip
 	bool "strip"
-	depends on !BR2_ELF2FLT
+	depends on !BR2_PACKAGE_HOST_ELF2FLT
 	help
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the normal 'strip' command. This allows to
@@ -297,7 +297,7 @@ config BR2_STRIP_strip
 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
-	depends on !BR2_ELF2FLT
+	depends on !BR2_PACKAGE_HOST_ELF2FLT
 	help
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the 'sstrip' command, which strips a little

From fef61fb4681add1f57c3ea6295c7d4f7ec973998 Mon Sep 17 00:00:00 2001
From: Hans Bulfone <hans@nil.at>
Date: Fri, 9 Aug 2013 03:37:24 +0200
Subject: [PATCH 6046/6849] erlang: install to staging

This is required to build custom port drivers/NIFs or code that
uses erl_interface.

Signed-off-by: Hans Bulfone <hans@nil.at>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/erlang.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 9f47b84bec..89104c95fa 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -12,6 +12,7 @@ HOST_ERLANG_DEPENDENCIES =
 
 ERLANG_LICENSE = EPL
 ERLANG_LICENSE_FILES = EPLICENCE
+ERLANG_INSTALL_STAGING = YES
 
 # The configure checks for these functions fail incorrectly
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes

From 685e50f5171eea2ad560523ff31d38ff6e3c0376 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 15:07:45 -0300
Subject: [PATCH 6047/6849] opus-tools: disable flac when it is not selected

opus-tools expects flac since the 0.1.7 bump unless otherwise told so.
Disable it when it's not selected. Fixes:
http://autobuild.buildroot.net/results/c8c/c8c1a682336c150ee401f76b173944611b96bd4e/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/opus-tools/opus-tools.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index bb11a19239..f4dee745fe 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -19,4 +19,10 @@ else
 OPUS_TOOLS_CONF_OPT += --disable-sse
 endif
 
+ifeq ($(BR2_PACKAGE_FLAC),y)
+OPUS_TOOLS_DEPENDENCIES += flac
+else
+OPUS_TOOLS_CONF_OPT += --without-flac
+endif
+
 $(eval $(autotools-package))

From 0b4ef4a4b27a9cff47cefc0a3e011006f643773a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 15:13:36 -0300
Subject: [PATCH 6048/6849] libroxml: needs threads

Fixes:
http://autobuild.buildroot.net/results/169/169b607993cd7ae4a8a79c2a00c00f820ec1c747/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libroxml/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libroxml/Config.in b/package/libroxml/Config.in
index b6b253fcdd..e1a646fa03 100644
--- a/package/libroxml/Config.in
+++ b/package/libroxml/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_LIBROXML
 	bool "roxml"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  libroxml is a light and powerful xml parsing library with
 	  xpath handling. Roxml is a binary using libroxml to explore
 	  xml file from shell scripts.
 
 	  http://www.libroxml.net
+
+comment "libroxml needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From d9b89e8a43b9c92653d62dedc1bea8d37a4112a9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 15:17:41 -0300
Subject: [PATCH 6049/6849] libunwind: needs threads

Fixes:
http://autobuild.buildroot.net/results/39a/39a32d323252e3d986fd9290108db7a496d429d9/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libunwind/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in
index 4f130f041c..110ea90f0c 100644
--- a/package/libunwind/Config.in
+++ b/package/libunwind/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
 		BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64
 	help
 	  C API to determine the call-chain of a program.
 
 	  http://www.nongnu.org/libunwind/index.html
+
+comment "libunwind requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From cc34519201278a4737fb12b551fce98740383ff5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 10 Sep 2013 21:54:59 +0200
Subject: [PATCH 6050/6849] linux: fix depmod location after move to host-kmod

The host-kmod version of depmod gets installed into HOST_DIR/sbin, so
adjust the path we use to refer to it in linux.mk

Reported-by: Ryan Coe <bluemrp9@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 8508a54242..649d06b6d3 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -47,7 +47,7 @@ LINUX_MAKE_FLAGS = \
 	ARCH=$(KERNEL_ARCH) \
 	INSTALL_MOD_PATH=$(TARGET_DIR) \
 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-	DEPMOD=$(HOST_DIR)/usr/sbin/depmod
+	DEPMOD=$(HOST_DIR)/sbin/depmod
 
 # Get the real Linux version, which tells us where kernel modules are
 # going to be installed in the target filesystem.

From 68dd967221a2f2d761957e3aaa3c05daf4a77843 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Tue, 10 Sep 2013 09:18:45 +0200
Subject: [PATCH 6051/6849] barebox: bump to version 2013.09.0

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 04929ea7be..1bbbe06fd4 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.08.0"
+	bool "2013.09.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.08.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.09.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From bb044119882b7aaf81191cf7e1eee5eee4d66e29 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 11 Sep 2013 12:51:38 +0200
Subject: [PATCH 6052/6849] xserver_xorg-server: backport kdrive option parsing
 fix

Reported-by: Woody Wu <narkewoody@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...locate-enough-space-for-null-charact.patch | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch
new file mode 100644
index 0000000000..d19bc46909
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch
@@ -0,0 +1,59 @@
+From 09f1e5b15b769e1122f0a8d7cae0820038992312 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 7 Oct 2012 18:40:35 +0200
+Subject: [PATCH] Revert "kinput: allocate enough space for null character."
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 531785dd746d64ef7f473a83ca73bb20e74b6fca.
+
+The above commit breaks Xephyr option parsing.  Andrzej writes:
+
+  Xephyr -retro -keybd evdev,,device=/dev/input/event2,xkbrules=evdev,xkbmodel=evdev,xkblayout=pl -mouse evdev,,device=/dev/input/event1 :3
+
+  results in:
+
+  <snip>
+  Pointer option key (device=) of value (/dev/input/event1) not assigned!
+  Kbd option key (device=) of value (/dev/input/event2) not assigned!
+  Kbd option key (xkbrules=) of value (evdev) not assigned!
+  Kbd option key (xkbmodel=) of value (evdev) not assigned!
+  Kbd option key (xkblayout=) of value (pl) not assigned!
+  <snip>
+
+  The effect of the patch is that the "key=value" pairs are parsed in such
+  a way that the key is added an "equals" sign to it and we end up with
+  keys like "device=" instead of "device". This in turn has effect on
+  KdParsePointerOptions and KdParseKbdOptions: the key does not match
+  any choice presented in the "switch" statement, and so "Pointer/Kbd
+  option key (...) of value (...) not assigned!" happens, making all
+  "key=value" options inaccessible to the user. Reverting the patch makes
+  them available again.
+
+Reference: http://bugs.debian.org/689246
+Reported-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Cc: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Søren Sandmann <ssp@redhat.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+ hw/kdrive/src/kinput.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
+index d35dcf8..b1068bb 100644
+--- a/hw/kdrive/src/kinput.c
++++ b/hw/kdrive/src/kinput.c
+@@ -1034,7 +1034,7 @@ KdGetOptions(InputOption **options, char *string)
+ 
+     if (strchr(string, '=')) {
+         tam_key = (strchr(string, '=') - string);
+-        key = strndup(string, tam_key + 1);
++        key = strndup(string, tam_key);
+         if (!key)
+             goto out;
+ 
+-- 
+1.7.10.4
+

From 41b351a6f06983a076eb9c99fe125fbc85740753 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 7 Sep 2013 01:25:18 +0200
Subject: [PATCH 6053/6849] syslinux: bump to version 4.07

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/syslinux/syslinux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 1b0ef4ebdd..b6b804e462 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSLINUX_VERSION = 4.06
+SYSLINUX_VERSION = 4.07
 SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.bz2
 SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
 

From 6e9ff55f3f7769e33e7ebf3b67ee9732496da12a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 7 Sep 2013 10:45:20 +0800
Subject: [PATCH 6054/6849] netplug: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/netplug/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netplug/Config.in b/package/netplug/Config.in
index 5c9bca6522..593c08a948 100644
--- a/package/netplug/Config.in
+++ b/package/netplug/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETPLUG
 	bool "netplug"
+	depends on BR2_USE_MMU # fork()
 	help
 	  A Linux daemon that manages network interfaces in
 	  response to network cables being plugged in and out.

From 3a313a4bae1710938a31368ddafd8b6173d357b2 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 7 Sep 2013 11:46:07 +0800
Subject: [PATCH 6055/6849] noip: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/noip/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/noip/Config.in b/package/noip/Config.in
index 02039dd979..aea5deb99b 100644
--- a/package/noip/Config.in
+++ b/package/noip/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NOIP
 	bool "noip"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Dynamic DNS update client for no-ip.com
 

From fd7606117f20d9e51c9da0aecbd937039496acfd Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 7 Sep 2013 14:04:26 +0800
Subject: [PATCH 6056/6849] socketcand: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socketcand/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
index 72315c0d44..b836f55ed5 100644
--- a/package/socketcand/Config.in
+++ b/package/socketcand/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SOCKETCAND
 	bool "socketcand"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Socketcand is a daemon that provides access to CAN interfaces
 	  on a machine via a network interface.

From 5cad4bd403bf672a55585cfb610abe7b19596003 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 7 Sep 2013 14:07:23 +0800
Subject: [PATCH 6057/6849] vsftpd: Fix dependency for needs mmu

Commit 2eb995759 "vsftpd: needs mmu" adds "depends on BR2_TOOLCHAIN_HAS_THREADS".

The build error is:
sysutil.c:(.text+0x37ac): undefined reference to `fork'

Thus it should depend on BR2_USE_MMU rather than BR2_TOOLCHAIN_HAS_THREADS.

Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/vsftpd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vsftpd/Config.in b/package/vsftpd/Config.in
index 3d4cff1c07..54ef7bdc73 100644
--- a/package/vsftpd/Config.in
+++ b/package/vsftpd/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_VSFTPD
 	bool "vsftpd"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # fork()
+	depends on BR2_USE_MMU # fork()
 	help
 	  vsftpd is an ftp daemon written with security in mind.
 	  http://vsftpd.beasts.org/

From 9c13f1aa8a49f0eb8e254dca650378d330bf8d4f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 19:06:39 -0300
Subject: [PATCH 6058/6849] linux-headers: bump 3.{0, 2, 4, 10}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.94 => 3.0.95}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.94/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.95/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.94/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.95/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index f05111bfc9..3dc0b9df0c 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,17 +76,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.94"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.95"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.50"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.60"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.61"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.10"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.11"	if BR2_KERNEL_HEADERS_3_10
 	default "3.11"		if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From c403fedbc72438866e8acacf6c1b1d7204a40e1a Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Wed, 11 Sep 2013 11:12:18 +0200
Subject: [PATCH 6059/6849] pkg-stats: update set of files to skip

In BR sub-directory boot/ linux/ and package/ there are a few .mk files which
aren't <package>.mk files. These files shouldn't be taken into account
in package statistics.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/pkg-stats | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index a65a6aee3f..4effa597af 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -87,18 +87,21 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	$i = "boot/common.mk" -o \
 	$i = "linux/linux-ext-xenomai.mk" -o \
 	$i = "linux/linux-ext-rtai.mk" -o \
-	$i = "linux/linux-ext-ocf-linux.mk" -o \
 	$i = "package/efl/efl.mk" -o \
-	$i = "package/games/games.mk" -o \
+	$i = "package/freescale-imx/freescale-imx.mk" -o \
+	$i = "package/gcc/gcc.mk" -o \
+	$i = "package/gstreamer/gstreamer.mk" -o \
+	$i = "package/gstreamer1/gstreamer1.mk" -o \
 	$i = "package/gtk2-themes/gtk2-themes.mk" -o \
-	$i = "package/multimedia/multimedia.mk" -o \
+	$i = "package/matchbox/matchbox.mk" -o \
+	$i = "package/opengl/opengl.mk" -o \
+	$i = "package/qt5/qt5.mk" -o \
+	$i = "package/x11r7/x11r7.mk" -o \
  	$i = "package/pkg-autotools.mk" -o \
  	$i = "package/pkg-cmake.mk" -o \
+	$i = "package/pkg-download.mk" -o \
  	$i = "package/pkg-generic.mk" -o \
- 	$i = "package/pkg-utils.mk" -o \
- 	$i = "package/pkg-download.mk" -o \
-	$i = "package/matchbox/matchbox.mk" -o \
-	$i = "package/x11r7/x11r7.mk" ; then
+ 	$i = "package/pkg-utils.mk" ; then
 	echo "skipping $i" 1>&2
 	continue
     fi

From be7f613b90b01cdad0e1348ead3d70f72cbcbab2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 11 Sep 2013 13:05:01 +0200
Subject: [PATCH 6060/6849] package: drop unneeded 'call' from
 {generic,autotools}-package invocation

Reported-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dhcpcd/dhcpcd.mk                   | 2 +-
 package/jquery-keyboard/jquery-keyboard.mk | 2 +-
 package/wireshark/wireshark.mk             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 9d4a72beb4..5296db8744 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -39,4 +39,4 @@ endef
 # NOTE: Even though this package has a configure script, it is not generated
 # using the autotools, so we have to use the generic package infrastructure.
 
-$(eval $(call generic-package))
+$(eval $(generic-package))
diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
index 0d9b69b590..c429f16e25 100644
--- a/package/jquery-keyboard/jquery-keyboard.mk
+++ b/package/jquery-keyboard/jquery-keyboard.mk
@@ -22,4 +22,4 @@ define JQUERY_KEYBOARD_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/var/www/layouts
 endef
 
-$(eval $(call generic-package))
+$(eval $(generic-package))
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index a61e01725c..a105e5284b 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -20,4 +20,4 @@ WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
 		     --enable-static=no --with-gnutls=no --with-libsmi=no \
 		     --includedir=$(STAGING_DIR)/usr/include
 
-$(eval $(call autotools-package))
+$(eval $(autotools-package))

From 3f817237fdc66f9484a65df7631b48d4103578e0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 11 Sep 2013 13:21:53 +0200
Subject: [PATCH 6061/6849] linux.mk: target-install: drop extra (invalid)
 DEPMOD parameter

DEPMOD is already specified in LINUX_MAKE_FLAGS, and is no longer located
in HOST_DIR/usr/sbin after the move to host-kmod, so drop it from here.

Reported-by: Ryan Coe <bluemrp9@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/linux.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 649d06b6d3..901ce25c7c 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -273,8 +273,7 @@ define LINUX_INSTALL_TARGET_CMDS
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
-		$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) 		\
-			DEPMOD="$(HOST_DIR)/usr/sbin/depmod" modules_install ;		\
+		$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
 	fi

From bdf472d5bf9b90322c38886814e29bdf8921c5af Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 11 Sep 2013 14:15:15 +0200
Subject: [PATCH 6062/6849] Makefile: also unexport PKG_CONFIG_LIBDIR

Similar to how we do it for _PATH / _SYSROOT_DIR. Buildroot gets fairly
confused if the user has set up a custom PKG_CONFIG_LIBDIR, so ensure
it gets unset.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 3ca7313942..861059284b 100644
--- a/Makefile
+++ b/Makefile
@@ -175,6 +175,7 @@ export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
 # Make sure pkg-config doesn't look outside the buildroot tree
 unexport PKG_CONFIG_PATH
 unexport PKG_CONFIG_SYSROOT_DIR
+unexport PKG_CONFIG_LIBDIR
 
 # Having DESTDIR set in the environment confuses the installation
 # steps of some packages.

From 4d1228894dab3444b161467c669d52deab88257f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 3 Sep 2013 10:36:45 -0300
Subject: [PATCH 6063/6849] libusb: build fix for flat binaries

Fixes:
http://autobuild.buildroot.net/results/4d1/4d1b9c6132e7836bc2ecab4b1483b80d2e042dcd/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libusb/libusb-01-uclinux.patch | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libusb/libusb-01-uclinux.patch

diff --git a/package/libusb/libusb-01-uclinux.patch b/package/libusb/libusb-01-uclinux.patch
new file mode 100644
index 0000000000..cbf48a75b3
--- /dev/null
+++ b/package/libusb/libusb-01-uclinux.patch
@@ -0,0 +1,30 @@
+*-uclinux* is valid in the tuple for linux, it's used for flat binaries
+for example.
+Patch both configure* for consistency and to avoid an unnecessary autoreconf.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libusb-1.0.9.orig/configure libusb-1.0.9/configure
+--- libusb-1.0.9.orig/configure	2013-09-03 10:13:52.212301259 -0300
++++ libusb-1.0.9/configure	2013-09-03 10:19:08.443669386 -0300
+@@ -11093,7 +11093,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5
+ $as_echo_n "checking operating system... " >&6; }
+ case $host in
+-*-linux*)
++*-linux* | *-uclinux*)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
+ $as_echo "Linux" >&6; }
+ 	backend="linux"
+diff -Nura libusb-1.0.9.orig/configure.ac libusb-1.0.9/configure.ac
+--- libusb-1.0.9.orig/configure.ac	2013-09-03 10:13:52.212301259 -0300
++++ libusb-1.0.9/configure.ac	2013-09-03 10:19:00.573411346 -0300
+@@ -46,7 +46,7 @@
+ 
+ AC_MSG_CHECKING([operating system])
+ case $host in
+-*-linux*)
++*-linux* | *-uclinux*)
+ 	AC_MSG_RESULT([Linux])
+ 	backend="linux"
+ 	;;

From 0e4832665a120a796fedbac4e4a676398af0f5ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 21:56:09 -0300
Subject: [PATCH 6064/6849] squid: bump to version 3.3.9

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index a3cc8c1d3c..8324ba8c12 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SQUID_VERSION = 3.3.8
+SQUID_VERSION = 3.3.9
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
 SQUID_LICENSE = GPLv2+

From 65459f4571baefb58e4a90421ddaeb349ecc4509 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 21:56:10 -0300
Subject: [PATCH 6065/6849] dosfstools: bump to version 3.0.22

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dosfstools/dosfstools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index d6ecb6fa64..c94f68065e 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOSFSTOOLS_VERSION = 3.0.20
+DOSFSTOOLS_VERSION = 3.0.22
 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+

From 821575c1fa5398f31f3789a4a1abf63741df4a74 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 21:56:11 -0300
Subject: [PATCH 6066/6849] usb_modeswitch: bump to version 2.0.1

Drop libusb-compat since it's no longer required.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usb_modeswitch/Config.in         | 1 -
 package/usb_modeswitch/usb_modeswitch.mk | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in
index a27b3ee43e..8b3e408787 100644
--- a/package/usb_modeswitch/Config.in
+++ b/package/usb_modeswitch/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_USB_MODESWITCH
 	bool "usb_modeswitch"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
 	  USB mode switcher.
 	  Used to switch mode on multiple-function devices
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index fe54b50826..ef9ff0d649 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-USB_MODESWITCH_VERSION = 1.2.6
+USB_MODESWITCH_VERSION = 2.0.1
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
-USB_MODESWITCH_DEPENDENCIES = libusb-compat
+USB_MODESWITCH_DEPENDENCIES = libusb
 USB_MODESWITCH_LICENSE = GPLv2+
 USB_MODESWITCH_LICENSE_FILES = COPYING
 

From 9cdbe8f30f4cb89c5b3aea44bf3f373231d573e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 21:56:12 -0300
Subject: [PATCH 6067/6849] usb_modeswitch_data: bump to version 20130807

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/usb_modeswitch_data/usb_modeswitch_data.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
index a9ce006ae3..10a39024c4 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-USB_MODESWITCH_DATA_VERSION = 20130610
+USB_MODESWITCH_DATA_VERSION = 20130807
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch

From 7dbc737d604d35c6d8155896320ecf736b6f8870 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 21:56:13 -0300
Subject: [PATCH 6068/6849] ser2net: bump to version 2.9.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ser2net/ser2net.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 23ae48a152..5e77d36b42 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -4,10 +4,8 @@
 #
 ################################################################################
 
-SER2NET_VERSION = 2.9
+SER2NET_VERSION = 2.9.1
 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
-# shipped configure script is broken (libtool version error)
-SER2NET_AUTORECONF = YES
 SER2NET_LICENSE = GPLv2+
 SER2NET_LICENSE_FILES = COPYING
 

From 6ceff155ca4a368cd3a5898ddacfd8d6faecff73 Mon Sep 17 00:00:00 2001
From: Michael Rommel <rommel@layer-7.net>
Date: Sun, 8 Sep 2013 17:22:58 +0200
Subject: [PATCH 6069/6849] knock: new package

A port knocking implementation with daemon and user application.

[Peter: drop trailing newline in Config.in]
Signed-off-by: Michael Rommel <rommel@layer-7.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in       |  1 +
 package/knock/Config.in | 12 ++++++++++++
 package/knock/knock.mk  | 14 ++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/knock/Config.in
 create mode 100644 package/knock/knock.mk

diff --git a/package/Config.in b/package/Config.in
index 2351839c98..02e5afceba 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -789,6 +789,7 @@ source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
+source "package/knock/Config.in"
 source "package/lighttpd/Config.in"
 source "package/linknx/Config.in"
 source "package/links/Config.in"
diff --git a/package/knock/Config.in b/package/knock/Config.in
new file mode 100644
index 0000000000..a50860bcd2
--- /dev/null
+++ b/package/knock/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_KNOCK
+	bool "knock"
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  A port knocking implementation.
+	  Provides a daemon and a user application. Port knocking can be
+	  used to run an arbitrary application, once the daemon detects
+	  a predefined sequence of incoming TCP/UDP packets on a network
+	  interface. This can be used, e.g. to open up ports in a
+	  firewall.
+
+	  http://www.zeroflux.org/projects/knock
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
new file mode 100644
index 0000000000..8469b4fe72
--- /dev/null
+++ b/package/knock/knock.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# knock
+#
+################################################################################
+
+KNOCK_VERSION = 7666f2e86e
+KNOCK_SITE = https://github.com/jvinet/knock/tarball/master
+KNOCK_LICENSE = GPLv2+
+KNOCK_LICENSE_FILES = COPYING
+KNOCK_AUTORECONF = YES
+KNOCK_DEPENDENCIES = libpcap
+
+$(eval $(autotools-package))

From 88768fccfce55c786238028d26aecd5b01a9b2e6 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Sun, 8 Sep 2013 11:33:18 +0200
Subject: [PATCH 6070/6849] ubifs filesystem image: line up and improve
 Config.in options

Triggered by the 'some comment required here', this patch updates the Config.in
comments for the ubifs filesystem image options. This includes:
- 'erase block' --> 'eraseblock' (following mtd online documentation)
- remove 'UBI' prefix to make options uniform. Sometimes the option is not a
  property of UBI but rather of the flash. Also, line up the name of the option
  with the help of mkfs.ubifs.
- add help text on all options, referring to the mkfs.ubifs/ubinize options

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/ubifs/Config.in | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
index 4cf5d131ee..70ea81e5d7 100644
--- a/fs/ubifs/Config.in
+++ b/fs/ubifs/Config.in
@@ -6,27 +6,33 @@ config BR2_TARGET_ROOTFS_UBIFS
 if BR2_TARGET_ROOTFS_UBIFS
 
 config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
-	hex "UBI logical erase block size"
+	hex "logical eraseblock size"
 	default 0x1f800
+	help
+	  Logical eraseblock (LEB) size. The value provided here is
+	  passed to the -e/--leb-size option of mkfs.ubifs.
 
 config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
-	hex "UBI minimum I/O size"
+	hex "minimum I/O unit size"
 	default 0x800
 	help
-	  Some comment required here
+	  Minimum I/O unit size. The value provided here is passed
+	  to the -m/--min-io-size option of mkfs.ubifs/ubinize.
 
 config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
-	int "Maximum LEB count"
+	int "maximum logical eraseblock count"
 	default 2048
 	help
-	  Some comment required here
+	  Maximum logical eraseblock (LEB) count. The value provided
+	  here is passed to the -c/--max-leb-cnt option of mkfs.ubifs.
 
 choice
 	prompt "ubifs runtime compression"
 	default BR2_TARGET_ROOTFS_UBIFS_RT_LZO
 	help
 	  Select which compression format to use at run-time within
-	  the ubifs file system.
+	  the ubifs file system. The choice made here is passed to
+	  the -x/--compr option of mkfs.ubifs
 
 config BR2_TARGET_ROOTFS_UBIFS_RT_NONE
 	bool "no compression"
@@ -97,18 +103,21 @@ config BR2_TARGET_ROOTFS_UBI
 if BR2_TARGET_ROOTFS_UBI
 
 config BR2_TARGET_ROOTFS_UBI_PEBSIZE
-	hex "UBI physical erase block size"
+	hex "physical eraseblock size"
 	default 0x20000
 	help
-	  Tells ubinize the physical eraseblock size of the flash chip
-	  the ubi image is created for.
+	  Tells ubinize the physical eraseblock (PEB) size of the
+	  flash chip the ubi image is created for. The value provided
+	  here is passed to the -p/--peb-size option of ubinize.
 
 config BR2_TARGET_ROOTFS_UBI_SUBSIZE
-	int "UBI sub-page size"
+	int "sub-page size"
 	default 512
 	help
 	  Tells ubinize that the flash supports sub-pages and the sub-page
-	  size. Use 0 if subpages are not supported on flash chip.
+	  size. Use 0 if sub-pages are not supported on flash chip.
+	  The value provided here is passed to the -s/--sub-page-size
+	  option of ubinize.
 
 config BR2_TARGET_ROOTFS_UBI_OPTS
 	string "Additional ubinize options"

From b7fe073678a7b3202436c4e77d5e20cc54f34734 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 12 Sep 2013 09:05:36 +0200
Subject: [PATCH 6071/6849] libsoc: add new package

[Peter: fix help text, doesn't need fork, file header, license tags]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/libsoc/Config.in |  7 +++++++
 package/libsoc/libsoc.mk | 15 +++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/libsoc/Config.in
 create mode 100644 package/libsoc/libsoc.mk

diff --git a/package/Config.in b/package/Config.in
index 02e5afceba..0d457a6208 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -542,6 +542,7 @@ source "package/libnfc/Config.in"
 source "package/libnfc-llcp/Config.in"
 source "package/libqmi/Config.in"
 source "package/libserial/Config.in"
+source "package/libsoc/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
diff --git a/package/libsoc/Config.in b/package/libsoc/Config.in
new file mode 100644
index 0000000000..3e750bd0fd
--- /dev/null
+++ b/package/libsoc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBSOC
+	bool "libsoc"
+	help
+	  libsoc is a C library for interfacing with common SoC
+	  peripherals through generic kernel interfaces
+
+	  https://github.com/jackmitch/libsoc
diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
new file mode 100644
index 0000000000..f3102661d2
--- /dev/null
+++ b/package/libsoc/libsoc.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libsoc
+#
+################################################################################
+
+LIBSOC_VERSION = 356760dcb93b22d6c67c5232cde2ade8c968c932
+LIBSOC_SITE = http://github.com/jackmitch/libsoc/tarball/$(LIBSOC_VERSION)
+LIBSOC_LICENSE = LGPLv2.1
+LIBSOC_LICENSE_FILES = COPYING
+LIBSOC_AUTORECONF = YES
+LIBSOC_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
+

From a3f42921b5325721d6653a7019a6daa04be64e45 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 12 Sep 2013 22:32:23 +0200
Subject: [PATCH 6072/6849] libsoc: strip trailing newline

Missing from previous commit.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libsoc/libsoc.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
index f3102661d2..509d8eb061 100644
--- a/package/libsoc/libsoc.mk
+++ b/package/libsoc/libsoc.mk
@@ -12,4 +12,3 @@ LIBSOC_AUTORECONF = YES
 LIBSOC_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
-

From b5b940eaaa5e70d754b8f1c9690ae242d6853fce Mon Sep 17 00:00:00 2001
From: Dave Skok <blanco.ether@gmail.com>
Date: Wed, 28 Aug 2013 07:50:04 -0400
Subject: [PATCH 6073/6849] ola: new package

[Peter: fixup help text]
Signed-off-by: Dave Skok <blanco.ether@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in     |   1 +
 package/ola/Config.in | 134 ++++++++++++++++++++++++++++++++++++++
 package/ola/ola.mk    | 146 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 281 insertions(+)
 create mode 100644 package/ola/Config.in
 create mode 100644 package/ola/ola.mk

diff --git a/package/Config.in b/package/Config.in
index 0d457a6208..5835bcbd9d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -304,6 +304,7 @@ source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
+source "package/ola/Config.in"
 source "package/ofono/Config.in"
 source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
diff --git a/package/ola/Config.in b/package/ola/Config.in
new file mode 100644
index 0000000000..f5a9a7a109
--- /dev/null
+++ b/package/ola/Config.in
@@ -0,0 +1,134 @@
+comment "ola requires a toolchain with C++, thread, largefile and wchar support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_OLA
+	bool "ola (open lighting architecture)"
+	select BR2_PACKAGE_PROTOBUF
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_UTIL_LINUX
+	depends on BR2_INSTALL_LIBSTDCPP # protobuf
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Open Lighting Architecture provides applications
+	  with a mechanism to send and receive DMX512 & RDM
+	  commands using hardware devices and DMX over IP protocols.
+
+	  http://www.opendmx.net/index.php/OLA
+
+if BR2_PACKAGE_OLA
+
+menu "bindings and interface"
+
+config BR2_PACKAGE_OLA_WEB
+	bool "http interface"
+	select BR2_PACKAGE_LIBMICROHTTPD
+	help
+	  Build OLA with browser interface.
+
+config BR2_PACKAGE_OLA_PYTHON_BINDINGS
+	bool "python bindings"
+	select BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_PROTOBUF
+	depends on BR2_USE_MMU
+	help
+	  Build OLA with support for the Python language.
+
+config BR2_PACKAGE_OLA_SLP
+	bool "slp tools"
+	help
+	  Build OLA with slp tools.
+
+endmenu
+
+menu "tests and examples"
+
+config BR2_PACKAGE_OLA_EXAMPLES
+	bool "examples"
+	select BR2_PACKAGE_NCURSES
+	help
+	  Build OLA examples.
+
+config BR2_PACKAGE_OLA_RDM_TESTS
+	bool "rdm tests"
+	select BR2_PACKAGE_OLA_PYTHON_BINDINGS
+	depends on BR2_USE_MMU
+	help
+	  Build OLA RDM tests.
+
+endmenu
+
+menu "plugin selections"
+
+config BR2_PACKAGE_OLA_PLUGIN_E131
+	bool "acn E131"
+	help
+	  Build ACN E131 plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_ARTNET
+	bool "artnet"
+	help
+	  Build Artnet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_OPENDMX
+	bool "DMX4Linux"
+	help
+	  Build DMX4Linux plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_DUMMY
+	bool "dummy"
+	help
+	  Build Dummy plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_ESPNET
+	bool "espnet"
+	help
+	  Build EspNet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_KINET
+	bool "kinet"
+	help
+	  Build KiNet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_MILINT
+	bool "Milford Instruments"
+	help
+	  Build Milford Instruments 1-463 plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_OSC
+	bool "osc"
+	select BR2_PACKAGE_LIBLO
+	help
+	  Build Open Sound Control plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_PATHPORT
+	bool "pathport"
+	help
+	  Build Pathport plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_SANDNET
+	bool "sandnet"
+	help
+	  Build SandNet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_SHOWNET
+	bool "shownet"
+	help
+	  Build ShowNet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI
+	bool "stageprofi"
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Build StageProfi plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_USBPRO
+	bool "usbpro"
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Build UsbPro plugin for OLA.
+
+endmenu
+
+endif
diff --git a/package/ola/ola.mk b/package/ola/ola.mk
new file mode 100644
index 0000000000..55386b1a21
--- /dev/null
+++ b/package/ola/ola.mk
@@ -0,0 +1,146 @@
+################################################################################
+#
+# ola
+#
+################################################################################
+
+OLA_VERSION = 0.8.31
+OLA_SITE = https://open-lighting.googlecode.com/files
+
+OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)
+OLA_LICENSE_FILES = LICENCE GPL LGPL
+OLA_INSTALL_STAGING = YES
+
+# util-linux provides uuid lib
+OLA_DEPENDENCIES = protobuf util-linux
+
+OLA_CONF_OPT = \
+	--disable-gcov \
+	--disable-tcmalloc \
+	--disable-unittests \
+	--disable-root-check \
+	--disable-java-libs
+
+# sets where to find python libs built for target and required by ola
+OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+
+## OLA Bindings and Interface selections
+
+ifeq ($(BR2_PACKAGE_OLA_WEB),y)
+OLA_CONF_OPT += --enable-http
+OLA_DEPENDENCIES += libmicrohttpd
+else
+OLA_CONF_OPT += --disable-http
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_SLP),y)
+OLA_CONF_OPT += --enable-slp
+else
+OLA_CONF_OPT += --disable-slp
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y)
+OLA_CONF_OPT += --enable-python-libs
+OLA_DEPENDENCIES += python python-protobuf
+else
+OLA_CONF_OPT += --disable-python-libs
+endif
+
+## OLA Examples and Tests
+
+ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y)
+OLA_CONF_OPT += --enable-examples
+OLA_DEPENDENCIES += ncurses
+else
+OLA_CONF_OPT += --disable-examples
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y)
+OLA_CONF_OPT += --enable-rdm-tests
+else
+OLA_CONF_OPT += --disable-rdm-tests
+endif
+
+## OLA Plugin selections
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y)
+OLA_CONF_OPT += --enable-e131
+else
+OLA_CONF_OPT += --disable-e131
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y)
+OLA_CONF_OPT += --enable-artnet
+else
+OLA_CONF_OPT += --disable-artnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y)
+OLA_CONF_OPT += --enable-opendmx
+else
+OLA_CONF_OPT += --disable-opendmx
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y)
+OLA_CONF_OPT += --enable-dummy
+else
+OLA_CONF_OPT += --disable-dummy
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y)
+OLA_CONF_OPT += --enable-espnet
+else
+OLA_CONF_OPT += --disable-espnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y)
+OLA_CONF_OPT += --enable-kinet
+else
+OLA_CONF_OPT += --disable-kinet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y)
+OLA_CONF_OPT += --enable-osc
+OLA_DEPENDENCIES += liblo
+else
+OLA_CONF_OPT += --disable-osc
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y)
+OLA_CONF_OPT += --enable-milinst
+else
+OLA_CONF_OPT += --disable-milinst
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y)
+OLA_CONF_OPT += --enable-pathport
+else
+OLA_CONF_OPT += --disable-pathport
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y)
+OLA_CONF_OPT += --enable-sandnet
+else
+OLA_CONF_OPT += --disable-sandnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y)
+OLA_CONF_OPT += --enable-shownet
+else
+OLA_CONF_OPT += --disable-shownet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y)
+OLA_CONF_OPT += --enable-stageprofi --enable-libusb
+else
+OLA_CONF_OPT += --disable-stageprofi
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y)
+OLA_CONF_OPT += --enable-usbpro --enable-libusb
+else
+OLA_CONF_OPT += --disable-usbpro
+endif
+
+$(eval $(autotools-package))

From 2bf58d7633f42bd1cec79873deabbf979f1c5e8b Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Thu, 12 Sep 2013 15:45:57 -0500
Subject: [PATCH 6074/6849] igmpproxy: new package

[Peter: minor white space fixes]
Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in              |  1 +
 package/igmpproxy/Config.in    | 13 +++++++++++++
 package/igmpproxy/igmpproxy.mk | 12 ++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/igmpproxy/Config.in
 create mode 100644 package/igmpproxy/igmpproxy.mk

diff --git a/package/Config.in b/package/Config.in
index 5835bcbd9d..aae3296dee 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -783,6 +783,7 @@ source "package/ifplugd/Config.in"
 endif
 source "package/iftop/Config.in"
 source "package/igh-ethercat/Config.in"
+source "package/igmpproxy/Config.in"
 source "package/inadyn/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
diff --git a/package/igmpproxy/Config.in b/package/igmpproxy/Config.in
new file mode 100644
index 0000000000..03f8da52df
--- /dev/null
+++ b/package/igmpproxy/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_IGMPPROXY
+	bool "igmpproxy"
+	depends on BR2_USE_WCHAR
+	help
+	  A simple dynamic Multicast Routing Daemon
+	  using only IGMP signalling. It's intended
+	  for simple forwarding of Multicast traffic
+	  between networks.
+
+	  http://sourceforge.net/projects/igmpproxy/
+
+comment "igmpproxy needs a toolchain with wchar support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/igmpproxy/igmpproxy.mk b/package/igmpproxy/igmpproxy.mk
new file mode 100644
index 0000000000..577717cbfd
--- /dev/null
+++ b/package/igmpproxy/igmpproxy.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# igmpproxy
+#
+################################################################################
+
+IGMPPROXY_VERSION = 0.1
+IGMPPROXY_SITE = http://downloads.sourceforge.net/project/igmpproxy/igmpproxy/$(IGMPPROXY_VERSION)
+IGMPPROXY_LICENSE = GPLv2+
+IGMPPROXY_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 15eb1fafa35cd9a9a0bbb70508699bdea1262b01 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 09:12:04 -0300
Subject: [PATCH 6075/6849] downloads: add basic CVS support

The support is for pserver mode anonymous CVS.
source-check is based on login since many servers don't support or have
ls/rls disabled.

Usage is pretty straightforward.
PKG_SITE defines the site hostname and remote directory.
The module is defined by the bare package name.
Version is date based.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in               |  4 ++++
 package/pkg-download.mk | 39 +++++++++++++++++++++++++++++----------
 package/pkg-generic.mk  |  2 ++
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/Config.in b/Config.in
index 65c29b43fc..1b30ce1dba 100644
--- a/Config.in
+++ b/Config.in
@@ -42,6 +42,10 @@ config BR2_GIT
 	string "Git command"
 	default "git"
 
+config BR2_CVS
+	string "CVS command"
+	default "cvs"
+
 config BR2_LOCALFILES
 	string "Local files retrieval command"
 	default "cp"
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 97c9226f1f..8e4a1ec33b 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -10,6 +10,7 @@
 # Download method commands
 WGET := $(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN := $(call qstrip,$(BR2_SVN))
+CVS := $(call qstrip,$(BR2_CVS))
 BZR := $(call qstrip,$(BR2_BZR))
 GIT := $(call qstrip,$(BR2_GIT))
 HG := $(call qstrip,$(BR2_HG)) $(QUIET)
@@ -55,22 +56,21 @@ notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(c
 domainseparator=$(if $(1),$(1),/)
 
 ################################################################################
-# The DOWNLOAD_{GIT,SVN,BZR,HG,LOCALFILES} helpers are in charge of getting a
-# working copy of the source repository for their corresponding SCM,
+# The DOWNLOAD_* helpers are in charge of getting a working copy
+# of the source repository for their corresponding SCM,
 # checking out the requested version / commit / tag, and create an
 # archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with
 # ssh authentication. DOWNLOAD_WGET is the normal wget-based download
 # mechanism.
 #
-# The SOURCE_CHECK_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers are in charge of
-# simply checking that the source is available for download. This can be used
-# to make sure one will be able to get all the sources needed for
-# one's build configuration.
+# The SOURCE_CHECK_* helpers are in charge of simply checking that the source
+# is available for download. This can be used to make sure one will be able
+# to get all the sources needed for one's build configuration.
 #
-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers simply
-# output to the console the names of the files that will be downloaded, or path
-# and revision of the source repositories, producing a list of all the
-# "external dependencies" of a given build configuration.
+# The SHOW_EXTERNAL_DEPS_* helpers simply output to the console the names
+# of the files that will be downloaded, or path and revision of the
+# source repositories, producing a list of all the "external dependencies"
+# of a given build configuration.
 ################################################################################
 
 # Try a shallow clone - but that only works if the version is a ref (tag or
@@ -119,6 +119,24 @@ define SHOW_EXTERNAL_DEPS_BZR
 	echo $($(PKG)_SOURCE)
 endef
 
+define DOWNLOAD_CVS
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+	(pushd $(DL_DIR) > /dev/null && \
+	$(CVS) -z3 -d:pserver:anonymous@$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \
+		co -d $($(PKG)_BASE_NAME) -r :$($(PKG)_DL_VERSION) -P $($(PKG)_RAWNAME) && \
+	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
+	rm -rf $($(PKG)_DL_DIR) && \
+	popd > /dev/null)
+endef
+
+# Not all CVS servers support ls/rls, use login to see if we can connect
+define SOURCE_CHECK_CVS
+	$(CVS) -d:pserver:anonymous:@$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) login
+endef
+
+define SHOW_EXTERNAL_DEPS_CVS
+	echo $($(PKG)_SOURCE)
+endef
 
 define DOWNLOAD_SVN
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
@@ -244,6 +262,7 @@ define DOWNLOAD_INNER
 		case "$$scheme" in \
 			git) $($(DL_MODE)_GIT) && exit ;; \
 			svn) $($(DL_MODE)_SVN) && exit ;; \
+			cvs) $($(DL_MODE)_CVS) && exit ;; \
 			bzr) $($(DL_MODE)_BZR) && exit ;; \
 			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
 			scp) $($(DL_MODE)_SCP) && exit ;; \
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 4dd395b6ea..bfc4dc14f3 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -542,6 +542,8 @@ else ifeq ($$($(2)_SITE_METHOD),scp)
 DL_TOOLS_DEPENDENCIES += scp ssh
 else ifeq ($$($(2)_SITE_METHOD),hg)
 DL_TOOLS_DEPENDENCIES += hg
+else ifeq ($$($(2)_SITE_METHOD),cvs)
+DL_TOOLS_DEPENDENCIES += cvs
 endif # SITE_METHOD
 
 # $(firstword) is used here because the extractor can have arguments, like

From 457620232ee181d122c198900f1f2247f5110a55 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 09:12:05 -0300
Subject: [PATCH 6076/6849] docs/manual: add CVS support documentation

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-generic.txt | 7 +++++++
 docs/manual/prerequisite.txt            | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 67967a2fe7..cb067bd4e1 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -266,6 +266,13 @@ information is (assuming the package name is +libfoo+) :
      Buildroot performs a checkout which is preserved as a tarball in
      the download cache; subsequent builds use the tarball instead of
      performing another checkout.
+  ** +cvs+ for retrieving source code from a CVS repository.
+     Used by default when +LIBFOO_SITE+ begins with +cvs://+.
+     The downloaded source code is cached as with the +svn+ method.
+     Only anonymous pserver mode is supported.
+     +LIBFOO_SITE+ 'must' contain the source URL as well as the remote
+     repository directory. The module is the package name.
+     +LIBFOO_VERSION+ is 'mandatory' and 'must' be a timestamp.
   ** +git+ for retrieving source code from a Git repository.  Used by
      default when +LIBFOO_SITE+ begins with +git://+. The downloaded
      source code is cached as with the +svn+
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 9d36402047..78ce4364e7 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -52,7 +52,7 @@ Optional packages
 +
 In the official tree, most of the package sources are retrieved
 using +wget+; a few are only available through their +git+, +mercurial+,
-or +svn+ repository.
++svn+ or +cvs+ repository.
 +
 All other source fetching methods are implemented and may be used in a
 development context (further details: refer to xref:download-infra[]).

From 4fc45ccca5de28fec0b1f777f3b6c920b02c2dcf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 09:12:06 -0300
Subject: [PATCH 6077/6849] toolchain/gcc: add elf2flt to dependencies

Add host-elf2flt to the gcc common dependencies so we get it built after
binutils but before gcc/uclibc since it's required for all packages and
in some uClibc configuration scenarios.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 6654b51674..157357cd78 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -86,7 +86,8 @@ endef
 HOST_GCC_COMMON_DEPENDENCIES = \
 	host-binutils \
 	host-gmp \
-	host-mpfr
+	host-mpfr \
+	$(if $(BR2_BINFMT_FLAT),host-elf2flt)
 
 HOST_GCC_COMMON_CONF_OPT = \
 	--target=$(GNU_TARGET_NAME) \

From 71701eb6d77f2fe03124f559ed0d1a9e559b3d17 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 11 Sep 2013 09:53:44 -0300
Subject: [PATCH 6078/6849] nommu/flat: build packages with the correct FLAGS

When building for nommu flat targets the CFLAGS/CXXFLAGS/LDFLAGS must be
adjusted accordingly.
For gcc this means passing along -Wl,-elf2flt to signal the linker.
For ld this means -elf2flt.

Also correct the error in STACKSIZE settings from commit 9edf482d which
is setting gcc flags as ld flags and will surely fail (no package uses
it at the moment so it was never seen).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 91ae1b9bc8..dd365be4d6 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -115,7 +115,11 @@ TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_BINFMT_FLAT),y)
-TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE))
+TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
+	-Wl$(comma)-elf2flt)
+TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
+	-Wl$(comma)-elf2flt)
+TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-elf2flt)
 endif
 
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)

From ad434b3fe73af911d4eb38d71c816e3ca2195751 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:10 -0300
Subject: [PATCH 6079/6849] libmnl: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libmnl/libmnl-01-uclinux.patch | 26 ++++++++++++++++++++++++++
 package/libmnl/libmnl.mk               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libmnl/libmnl-01-uclinux.patch

diff --git a/package/libmnl/libmnl-01-uclinux.patch b/package/libmnl/libmnl-01-uclinux.patch
new file mode 100644
index 0000000000..e8f97c6c17
--- /dev/null
+++ b/package/libmnl/libmnl-01-uclinux.patch
@@ -0,0 +1,26 @@
+From ae2acfa7d287e3ffc0bb66091059b86f62775bd5 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 15:24:47 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dcd3cf8..313a015 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ AC_DISABLE_STATIC
+ LT_INIT
+ CHECK_GCC_FVISIBILITY
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index c60c60c1db..b16c5345c0 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -8,6 +8,7 @@ LIBMNL_VERSION = 1.0.3
 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES
+LIBMNL_AUTORECONF = YES
 LIBMNL_LICENSE = LGPLv2.1+
 LIBMNL_LICENSE_FILES = COPYING
 

From 4c04f21b8238ea79db580b042a849132234f0d8a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:11 -0300
Subject: [PATCH 6080/6849] ipset: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset-01-uclinux.patch | 26 ++++++++++++++++++++++++++
 package/ipset/ipset.mk               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/ipset/ipset-01-uclinux.patch

diff --git a/package/ipset/ipset-01-uclinux.patch b/package/ipset/ipset-01-uclinux.patch
new file mode 100644
index 0000000000..db8e3fec98
--- /dev/null
+++ b/package/ipset/ipset-01-uclinux.patch
@@ -0,0 +1,26 @@
+From 8ec2a85a29817f5aa3f6fb680753d331e2af3591 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 15:28:49 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b64576..6d06ef5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,7 @@ LTDL_INIT([nonrecursive])
+ 
+ dnl Shortcut: Linux supported alone
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux systems supported exclusively!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index c411a6e91f..d55d81d6f1 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -9,6 +9,7 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf
 IPSET_CONF_OPT = --with-kmod=no
+IPSET_AUTORECONF = YES
 IPSET_LICENSE = GPLv2
 IPSET_LICENSE_FILES = COPYING
 

From 25bb35ef10385c5c84c66d413cfda25aa9e3eb01 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:12 -0300
Subject: [PATCH 6081/6849] libnetfilter_acct: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnetfilter-acct-01-uclinux.patch        | 26 +++++++++++++++++++
 .../libnetfilter_acct/libnetfilter-acct.mk    |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_acct/libnetfilter-acct-01-uclinux.patch

diff --git a/package/libnetfilter_acct/libnetfilter-acct-01-uclinux.patch b/package/libnetfilter_acct/libnetfilter-acct-01-uclinux.patch
new file mode 100644
index 0000000000..070f02cdce
--- /dev/null
+++ b/package/libnetfilter_acct/libnetfilter-acct-01-uclinux.patch
@@ -0,0 +1,26 @@
+From bfcaf00a8c972e2c10412d917f08626eb05079c7 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 15:32:03 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad1bef8..24a7bb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_DISABLE_STATIC
+ LT_INIT
+ CHECK_GCC_FVISIBILITY
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnetfilter_acct/libnetfilter-acct.mk b/package/libnetfilter_acct/libnetfilter-acct.mk
index c89c5edf33..615d46e7ca 100644
--- a/package/libnetfilter_acct/libnetfilter-acct.mk
+++ b/package/libnetfilter_acct/libnetfilter-acct.mk
@@ -9,6 +9,7 @@ LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz
 LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files
 LIBNETFILTER_ACCT_INSTALL_STAGING = YES
 LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl
+LIBNETFILTER_ACCT_AUTORECONF = YES
 LIBNETFILTER_ACCT_LICENSE = LGPLv2.1+
 LIBNETFILTER_ACCT_LICENSE_FILES = COPYING
 

From 836105d985df8e3699d761b3f763ae3fd68c9205 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:13 -0300
Subject: [PATCH 6082/6849] libnfnetlink: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnfnetlink-01-uclinux.patch             | 26 +++++++++++++++++++
 package/libnfnetlink/libnfnetlink.mk          |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnfnetlink/libnfnetlink-01-uclinux.patch

diff --git a/package/libnfnetlink/libnfnetlink-01-uclinux.patch b/package/libnfnetlink/libnfnetlink-01-uclinux.patch
new file mode 100644
index 0000000000..b15201283a
--- /dev/null
+++ b/package/libnfnetlink/libnfnetlink-01-uclinux.patch
@@ -0,0 +1,26 @@
+From 8e5a9d8f32c9646d01d8c84e979892dfd28a7f7c Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 15:35:22 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0926a1c..b979772 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,7 @@ AC_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ 
+ case "$host" in 
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
index 192fa8fc65..de5a9d8a66 100644
--- a/package/libnfnetlink/libnfnetlink.mk
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -7,6 +7,7 @@
 LIBNFNETLINK_VERSION = 1.0.1
 LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
 LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
+LIBNFNETLINK_AUTORECONF = YES
 LIBNFNETLINK_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 938ea47b28e78b20829955929c2c1ed185c908ad Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:14 -0300
Subject: [PATCH 6083/6849] libnetfilter_conntrack: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnetfilter-conntrack-01-uclinux.patch   | 26 +++++++++++++++++++
 .../libnetfilter-conntrack.mk                 |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_conntrack/libnetfilter-conntrack-01-uclinux.patch

diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack-01-uclinux.patch b/package/libnetfilter_conntrack/libnetfilter-conntrack-01-uclinux.patch
new file mode 100644
index 0000000000..ef79a806e8
--- /dev/null
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack-01-uclinux.patch
@@ -0,0 +1,26 @@
+From bdf4afdcb68f62fcd05536b8cb68478d3ea31c68 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 15:46:19 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12e1d16..1edfd66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ 
+ case "$host" in 
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
index 1db30a1489..fc3462dee4 100644
--- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk
@@ -9,6 +9,7 @@ LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
 LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
+LIBNETFILTER_CONNTRACK_AUTORECONF = YES
 LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+
 LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
 

From cd8d9a3c670955e85e9ed3481cfe24368e594d2e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:15 -0300
Subject: [PATCH 6084/6849] libnetfilter_log: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnetfilter-log-01-uclinux.patch         | 26 +++++++++++++++++++
 package/libnetfilter_log/libnetfilter-log.mk  |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_log/libnetfilter-log-01-uclinux.patch

diff --git a/package/libnetfilter_log/libnetfilter-log-01-uclinux.patch b/package/libnetfilter_log/libnetfilter-log-01-uclinux.patch
new file mode 100644
index 0000000000..75d4a1e9d1
--- /dev/null
+++ b/package/libnetfilter_log/libnetfilter-log-01-uclinux.patch
@@ -0,0 +1,26 @@
+From e36a2377e7ec50f6f675eb41f79edcda6ddebe5c Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 15:48:50 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e6e1317..189a753 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ 
+ case "$host" in 
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnetfilter_log/libnetfilter-log.mk b/package/libnetfilter_log/libnetfilter-log.mk
index 74a32d7aeb..8a2c5130a1 100644
--- a/package/libnetfilter_log/libnetfilter-log.mk
+++ b/package/libnetfilter_log/libnetfilter-log.mk
@@ -9,6 +9,7 @@ LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2
 LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
 LIBNETFILTER_LOG_INSTALL_STAGING = YES
 LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink
+LIBNETFILTER_LOG_AUTORECONF = YES
 LIBNETFILTER_LOG_LICENSE = GPLv2
 LIBNETFILTER_LOG_LICENSE_FILES = COPYING
 

From f560d38dc8b832ea32f777bbab22bc2c7f9c7005 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:16 -0300
Subject: [PATCH 6085/6849] ulogd: needs mmu and shared objects

The plugin infrastructure is based on shared objects so it won't build
for static-only scenarios.
And the daemon uses fork() so MMU is required.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ulogd/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
index 7dc4f11123..a524056aad 100644
--- a/package/ulogd/Config.in
+++ b/package/ulogd/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_ULOGD
 	bool "ulogd"
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBNETFILTER_ACCT
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
@@ -12,5 +14,6 @@ config BR2_PACKAGE_ULOGD
 
 	  http://www.netfilter.org/projects/ulogd/
 
-comment "ulogd requires a toolchain with IPV6 and LARGEFILE support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
+comment "ulogd requires a toolchain with IPV6, LARGEFILE and dynamic library support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU

From 87bd0ef26e37654ecc8b0c93cbd4bb60754d8c00 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:17 -0300
Subject: [PATCH 6086/6849] libnetfilter_cthelper: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnetfilter-cthelper-01-uclinux.patch    | 26 +++++++++++++++++++
 .../libnetfilter-cthelper.mk                  |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_cthelper/libnetfilter-cthelper-01-uclinux.patch

diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper-01-uclinux.patch b/package/libnetfilter_cthelper/libnetfilter-cthelper-01-uclinux.patch
new file mode 100644
index 0000000000..7a6ca70b53
--- /dev/null
+++ b/package/libnetfilter_cthelper/libnetfilter-cthelper-01-uclinux.patch
@@ -0,0 +1,26 @@
+From d028334281b218209412ec6e1dba56ca96320bd9 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:08:29 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d52b1ce..9389b70 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_DISABLE_STATIC
+ LT_INIT
+ CHECK_GCC_FVISIBILITY
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
index 11f7e694de..f3e892bc44 100644
--- a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
+++ b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
@@ -9,6 +9,7 @@ LIBNETFILTER_CTHELPER_SOURCE = libnetfilter_cthelper-$(LIBNETFILTER_CTHELPER_VER
 LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthelper/files
 LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES
 LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl
+LIBNETFILTER_CTHELPER_AUTORECONF = YES
 LIBNETFILTER_CTHELPER_LICENSE = GPLv2
 LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING
 

From d61de618fca4a1586c18583c84f2aa139da8a32b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:18 -0300
Subject: [PATCH 6087/6849] libnetfilter_cttimeout: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnetfilter-cttimeout-01-uclinux.patch   | 26 +++++++++++++++++++
 .../libnetfilter-cttimeout.mk                 |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_cttimeout/libnetfilter-cttimeout-01-uclinux.patch

diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout-01-uclinux.patch b/package/libnetfilter_cttimeout/libnetfilter-cttimeout-01-uclinux.patch
new file mode 100644
index 0000000000..5d462d8fec
--- /dev/null
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout-01-uclinux.patch
@@ -0,0 +1,26 @@
+From d8d2ec14bc192f998afae2b71c69248e73518ddf Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:09:14 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d79e941..aeb6ad0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_DISABLE_STATIC
+ LT_INIT
+ CHECK_GCC_FVISIBILITY
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index d751c3b392..c1f10162f4 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -9,6 +9,7 @@ LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_
 LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
 LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
 LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
+LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES
 LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2
 LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING
 

From bae789fe7b118da33994ceddefbb1d70196de741 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:19 -0300
Subject: [PATCH 6088/6849] libnetfilter_queue: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../libnetfilter-queue-01-uclinux.patch       | 26 +++++++++++++++++++
 .../libnetfilter_queue/libnetfilter-queue.mk  |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/libnetfilter_queue/libnetfilter-queue-01-uclinux.patch

diff --git a/package/libnetfilter_queue/libnetfilter-queue-01-uclinux.patch b/package/libnetfilter_queue/libnetfilter-queue-01-uclinux.patch
new file mode 100644
index 0000000000..21895d9b0e
--- /dev/null
+++ b/package/libnetfilter_queue/libnetfilter-queue-01-uclinux.patch
@@ -0,0 +1,26 @@
+From 311b60655761f6f3c4fe44cf6eff63427283f25e Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:13:58 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 07747a6..289868f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_PROG_INSTALL
+ CHECK_GCC_FVISIBILITY
+ 
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/libnetfilter_queue/libnetfilter-queue.mk b/package/libnetfilter_queue/libnetfilter-queue.mk
index 7cd2bb7973..66b102fb80 100644
--- a/package/libnetfilter_queue/libnetfilter-queue.mk
+++ b/package/libnetfilter_queue/libnetfilter-queue.mk
@@ -9,6 +9,7 @@ LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar
 LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/files
 LIBNETFILTER_QUEUE_INSTALL_STAGING = YES
 LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
+LIBNETFILTER_QUEUE_AUTORECONF = YES
 LIBNETFILTER_QUEUE_LICENSE = GPLv2
 LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING
 

From 177549dcbe9971306f48bf3fe0c26fa665ecc639 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 10 Sep 2013 16:26:20 -0300
Subject: [PATCH 6089/6849] nfacct: add patch for uclinux tuple

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/nfacct/nfacct-01-uclinux.patch | 26 ++++++++++++++++++++++++++
 package/nfacct/nfacct.mk               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 package/nfacct/nfacct-01-uclinux.patch

diff --git a/package/nfacct/nfacct-01-uclinux.patch b/package/nfacct/nfacct-01-uclinux.patch
new file mode 100644
index 0000000000..295a370b46
--- /dev/null
+++ b/package/nfacct/nfacct-01-uclinux.patch
@@ -0,0 +1,26 @@
+From da1a0c186232d1bca9c723bd47d11a6e3807ae29 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:16:48 -0300
+Subject: [PATCH] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9679112..9a34bdc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ 
+ case "$host" in
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.8.1.5
+
diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk
index 48f73e910a..7e42160957 100644
--- a/package/nfacct/nfacct.mk
+++ b/package/nfacct/nfacct.mk
@@ -9,6 +9,7 @@ NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
 NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files
 NFACCT_DEPENDENCIES = host-pkgconf \
 	libnetfilter_acct
+NFACCT_AUTORECONF = YES
 NFACCT_LICENSE = GPLv2
 NFACCT_LICENSE_FILES = COPYING
 

From 338aee6ca6b906b775b91f90e6f83bd96804364a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Sep 2013 12:53:43 -0300
Subject: [PATCH 6090/6849] elf2flt: upgrade to latest version

Upgrade to the latest uclinux CVS snapshot, gives us blackfin support.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/elf2flt/Config.in.host     |    2 +-
 package/elf2flt/elf2flt.mk         |   10 +-
 package/elf2flt/src/LICENSE.TXT    |  340 --
 package/elf2flt/src/Makefile.in    |   81 -
 package/elf2flt/src/README         |   62 -
 package/elf2flt/src/config.guess   | 1418 ---------
 package/elf2flt/src/config.sub     | 1577 ----------
 package/elf2flt/src/configure      | 4719 ----------------------------
 package/elf2flt/src/configure.in   |  134 -
 package/elf2flt/src/cygwin-elf.h   | 2171 -------------
 package/elf2flt/src/e1-elf2flt.ld  |  161 -
 package/elf2flt/src/elf2flt.c      | 2152 -------------
 package/elf2flt/src/elf2flt.ld     |  179 --
 package/elf2flt/src/flat.h         |  111 -
 package/elf2flt/src/flthdr.c       |  382 ---
 package/elf2flt/src/install-sh     |  251 --
 package/elf2flt/src/ld-elf2flt.in  |  219 --
 package/elf2flt/src/maketarball.sh |   12 -
 package/elf2flt/src/stubs.c        |    6 -
 19 files changed, 4 insertions(+), 13983 deletions(-)
 delete mode 100644 package/elf2flt/src/LICENSE.TXT
 delete mode 100644 package/elf2flt/src/Makefile.in
 delete mode 100644 package/elf2flt/src/README
 delete mode 100755 package/elf2flt/src/config.guess
 delete mode 100755 package/elf2flt/src/config.sub
 delete mode 100755 package/elf2flt/src/configure
 delete mode 100644 package/elf2flt/src/configure.in
 delete mode 100644 package/elf2flt/src/cygwin-elf.h
 delete mode 100644 package/elf2flt/src/e1-elf2flt.ld
 delete mode 100644 package/elf2flt/src/elf2flt.c
 delete mode 100644 package/elf2flt/src/elf2flt.ld
 delete mode 100644 package/elf2flt/src/flat.h
 delete mode 100644 package/elf2flt/src/flthdr.c
 delete mode 100755 package/elf2flt/src/install-sh
 delete mode 100644 package/elf2flt/src/ld-elf2flt.in
 delete mode 100755 package/elf2flt/src/maketarball.sh
 delete mode 100644 package/elf2flt/src/stubs.c

diff --git a/package/elf2flt/Config.in.host b/package/elf2flt/Config.in.host
index 31a6c7fc06..dad48d805e 100644
--- a/package/elf2flt/Config.in.host
+++ b/package/elf2flt/Config.in.host
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_HOST_ELF2FLT
 	bool "Enable elf2flt support?"
-	depends on BR2_arm || BR2_sh || BR2_sparc
+	depends on BR2_arm || BR2_bfin || BR2_sh || BR2_sparc
 	help
 	  uCLinux uses a Binary Flat format commonly known as BFLT. It
 	  is a relatively simple and lightweight executable format
diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
index 27dd807a77..ce40f8d395 100644
--- a/package/elf2flt/elf2flt.mk
+++ b/package/elf2flt/elf2flt.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-ELF2FLT_SOURCE =
-HOST_ELF2FLT_SOURCE =
-ELF2FLT_VERSION = cvs
+ELF2FLT_VERSION = 20130904
+ELF2FLT_SITE = cvs://cvs.uclinux.org:/var/cvs
+ELF2FLT_SITE_METHOD = cvs
 ELF2FLT_LICENSE = GPLv2+
 ELF2FLT_LICENSE_FILES = LICENSE.TXT
 
@@ -23,8 +23,4 @@ HOST_ELF2FLT_CONF_OPT = \
 
 HOST_ELF2FLT_CONF_ENV = LIBS=-lz
 
-define HOST_ELF2FLT_EXTRACT_CMDS
-	cp -r package/elf2flt/src/* $(@D)
-endef
-
 $(eval $(host-autotools-package))
diff --git a/package/elf2flt/src/LICENSE.TXT b/package/elf2flt/src/LICENSE.TXT
deleted file mode 100644
index 5b6e7c66c2..0000000000
--- a/package/elf2flt/src/LICENSE.TXT
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/package/elf2flt/src/Makefile.in b/package/elf2flt/src/Makefile.in
deleted file mode 100644
index acead9f6f9..0000000000
--- a/package/elf2flt/src/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
-
-CC = @CC@
-CPU = @target_cpu@
-TARGET = @target_alias@
-CFLAGS = @CFLAGS@
-INCLUDES = @bfd_include_dir@ @binutils_include_dir@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-INSTALL = @INSTALL@
-DEFS = @DEFS@ -DTARGET_$(CPU)
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-
-HOST = @host_alias@
-
-ifneq (,$(findstring mingw32,$(HOST)))
-   LIBS := $(LIBS) -lws2_32
-endif
-
-# force link order under cygwin to avoid getopts / libiberty clash
-ifneq ($(strip $(shell gcc -v 2>&1 | grep "cygwin")),)
-   LIBS := -lcygwin $(LIBS)
-endif
-
-CCFLAGS = $(CFLAGS) $(DEFS) $(INCLUDES)
-
-LDFILE= elf2flt.ld
-ifeq ($(strip $(CPU)),e1)
-SRC_LDFILE= $(CPU)-elf2flt.ld
-else
-SRC_LDFILE= elf2flt.ld
-endif
-
-target_bindir = $(prefix)/$(TARGET)/bin
-target_libdir = $(prefix)/$(TARGET)/lib
-
-
-PROG_ELF2FLT = elf2flt$(EXEEXT)
-PROG_FLTHDR = flthdr$(EXEEXT)
-PROGS = $(PROG_ELF2FLT) $(PROG_FLTHDR)
-
-all: $(PROGS)
-
-$(PROG_ELF2FLT): elf2flt.c stubs.c Makefile
-	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/elf2flt.c $(srcdir)/stubs.c $(LIBS)
-
-$(PROG_FLTHDR): flthdr.c Makefile
-	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/flthdr.c $(LIBS)
-
-clean:
-	-rm -f $(PROGS) *.$(OBJEXT)
-
-distclean: clean
-	-rm -f Makefile config.log config.status config.cache ld-elf2flt
-
-install:
-	$(INSTALL) -d $(bindir)
-	$(INSTALL) -d $(target_bindir)
-	$(INSTALL) -d $(target_libdir)
-	$(INSTALL) -m 755 $(PROG_FLTHDR) $(bindir)/$(TARGET)-$(PROG_FLTHDR)
-	$(INSTALL) -m 755 $(PROG_FLTHDR) $(target_bindir)/$(PROG_FLTHDR)
-	$(INSTALL) -m 755 $(PROG_ELF2FLT) $(bindir)/$(TARGET)-$(PROG_ELF2FLT)
-	$(INSTALL) -m 755 $(PROG_ELF2FLT) $(target_bindir)/$(PROG_ELF2FLT)
-	[ -f $(bindir)/$(TARGET)-ld.real$(EXEEXT) ] || \
-		mv $(bindir)/$(TARGET)-ld$(EXEEXT) $(bindir)/$(TARGET)-ld.real$(EXEEXT)
-	[ -f $(target_bindir)/ld.real$(EXEEXT) ] || \
-		mv $(target_bindir)/ld$(EXEEXT) $(target_bindir)/ld.real$(EXEEXT)
-	$(INSTALL) -m 755 ld-elf2flt $(bindir)/$(TARGET)-ld
-	$(INSTALL) -m 755 ld-elf2flt $(target_bindir)/ld
-	$(INSTALL) -m 644 $(srcdir)/$(SRC_LDFILE) $(target_libdir)/$(LDFILE)
-
-
diff --git a/package/elf2flt/src/README b/package/elf2flt/src/README
deleted file mode 100644
index 6e8a687e10..0000000000
--- a/package/elf2flt/src/README
+++ /dev/null
@@ -1,62 +0,0 @@
-
-README - elf2flt
-----------------
-
-Copyright (C) 2001-2003, SnapGear (www.snapgear.com)
-davidm@snapgear.com
-gerg@snapgear.com
-
-This is Free Software, under the GNU Public Licence v2 or greater.  See
-LICENSE.TXT for more details.
-
-Elf2flt with PIC, ZFLAT and full reloc support. Currently supported
-targets include: m68k/ColdFire, ARM, Sparc, NEC v850, MicroBlaze, 
-h8300 and SuperH.
-
-COMPILING:
-
-You need an appropriate libbfd.a and libiberty.a for your target to 
-build this tool. They are normally part of the binutils package.
-
-To compile elf2flt do:
-
-    ./configure --target=<ARCH> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-    make
-    make install
-
-The <ARCH> argument to configure specifies what the target architecture is.
-This should be the same target as you used to build the binutils and gcc
-cross development tools. The --with-libbfd and --with-libiberty arguments
-specify where the libbfd.a and libiberty.a library files are to use.
-
-
-FILES:
-
-README      - this file
-configure   - autoconf configuration shell script
-configure.in- original autoconf file
-config.*    - autoconf support scripts
-Makefile.in - Makefile template used by configure
-elf2flt.c   - the source
-flthdr.c    - flat header manipulation program
-flat.h      - header from uClinux kernel sources
-elf2flt.ld  - an example linker script that works for C/C++ and uClinux
-ld-elf2flt  - A linker replacement that implements a -elf2flt option for the
-              linker and runs elf2flt automatically for you.  It auto
-              detects PIC/non-PIC code and adjusts its option accordingly.
-              It uses the environment variable FLTFLAGS when running
-              elf2flt.  It runs /.../m68k-elf-ld.real to do the actual
-              linking.
-
-TIPS:
-
-The ld-elf2flt produces 2 files as output.  The binary flat file X, and
-X.gdb which is used for debugging and PIC purposes.
-
-The '-p' option requires an elf executable linked at address 0.  The
-elf2flt.ld provided will generate the correct format binary when linked
-with the real linker with *no* '-r' option for the linker.
-
-The '-r' flag can be added to PIC builds to get contiguous code/data.  This
-is good for loading application symbols into gdb (add-symbol-file XXX.gdb).
-
diff --git a/package/elf2flt/src/config.guess b/package/elf2flt/src/config.guess
deleted file mode 100755
index afcb19c1d7..0000000000
--- a/package/elf2flt/src/config.guess
+++ /dev/null
@@ -1,1418 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-10-16'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/package/elf2flt/src/config.sub b/package/elf2flt/src/config.sub
deleted file mode 100755
index 20724573d0..0000000000
--- a/package/elf2flt/src/config.sub
+++ /dev/null
@@ -1,1577 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-04-22'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| microblaze \
-	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* \
-	| sheb-* | shbe-* | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	m32c-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/package/elf2flt/src/configure b/package/elf2flt/src/configure
deleted file mode 100755
index d672662bc6..0000000000
--- a/package/elf2flt/src/configure
+++ /dev/null
@@ -1,4719 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="elf2flt.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP bfd_include_dir binutils_include_dir binutils_ldscript_dir got_check emit_relocs LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
- --disable-got-check - disable check for GOT (needed on H8)
- --disable-emit-relocs - don't use the --emit-relocs (-q) linker option
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
- --with-libbfd=<file>  path to libbfd.a library to use
- --with-libiberty=<file>  path to libiberty.a library to use
- --with-bfd-include-dir=<dir>  include path for correct bfd.h
- --with-binutils-include-dir=<dir>  include path for binutils headers
- --with-binutils-ldscript-dir=<dir>  path to install elf2flt.ld
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-libbfd or --without-libbfd was given.
-if test "${with_libbfd+set}" = set; then
-  withval="$with_libbfd"
-   ac_libbfd=$withval
-else
-   ac_libbfd=NONE
-
-fi;
-
-
-# Check whether --with-libiberty or --without-libiberty was given.
-if test "${with_libiberty+set}" = set; then
-  withval="$with_libiberty"
-   ac_libiberty=$withval
-else
-   ac_libiberty=NONE
-
-fi;
-
-
-# Check whether --with-bfd-include-dir or --without-bfd-include-dir was given.
-if test "${with_bfd_include_dir+set}" = set; then
-  withval="$with_bfd_include_dir"
-   ac_bfd_include_dir=$withval
-else
-   ac_bfd_include_dir=NONE
-
-fi;
-
-
-# Check whether --with-binutils-include-dir or --without-binutils-include-dir was given.
-if test "${with_binutils_include_dir+set}" = set; then
-  withval="$with_binutils_include_dir"
-   ac_binutils_include_dir=$withval
-else
-   ac_binutils_include_dir=NONE
-
-fi;
-
-
-# Check whether --with-binutils-ldscript-dir or --without-binutils-ldscript-dir was given.
-if test "${with_binutils_ldscript_dir+set}" = set; then
-  withval="$with_binutils_ldscript_dir"
-   ac_binutils_ldscript_dir=$withval
-else
-   ac_binutils_ldscript_dir=NONE
-
-fi;
-
-# Check whether --enable-got-check or --disable-got-check was given.
-if test "${enable_got_check+set}" = set; then
-  enableval="$enable_got_check"
-   got_check=$enableval
-else
-   got_check=yes
-
-fi;
-
-# Check whether --enable-emit_relocs or --disable-emit_relocs was given.
-if test "${enable_emit_relocs+set}" = set; then
-  enableval="$enable_emit_relocs"
-   emit_relocs=$enableval
-else
-   emit_relocs=yes
-
-fi;
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-if test "$ac_libiberty" = "NONE"; then
-
-
-echo "$as_me:$LINENO: checking for objalloc_create in -liberty" >&5
-echo $ECHO_N "checking for objalloc_create in -liberty... $ECHO_C" >&6
-if test "${ac_cv_lib_iberty_objalloc_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liberty  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char objalloc_create ();
-int
-main ()
-{
-objalloc_create ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_iberty_objalloc_create=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_iberty_objalloc_create=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_objalloc_create" >&5
-echo "${ECHO_T}$ac_cv_lib_iberty_objalloc_create" >&6
-if test $ac_cv_lib_iberty_objalloc_create = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBIBERTY 1
-_ACEOF
-
-  LIBS="-liberty $LIBS"
-
-fi
-
-  ac_libiberty=auto
-else
-  LIBS="$ac_libiberty $LIBS"
-fi
-if test "$ac_libbfd" = "NONE"; then
-
-echo "$as_me:$LINENO: checking for bfd_openr in -lbfd" >&5
-echo $ECHO_N "checking for bfd_openr in -lbfd... $ECHO_C" >&6
-if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbfd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char bfd_openr ();
-int
-main ()
-{
-bfd_openr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bfd_bfd_openr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bfd_bfd_openr=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_openr" >&5
-echo "${ECHO_T}$ac_cv_lib_bfd_bfd_openr" >&6
-if test $ac_cv_lib_bfd_bfd_openr = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBFD 1
-_ACEOF
-
-  LIBS="-lbfd $LIBS"
-
-fi
-
-  ac_libbfd=auto
-else
-  LIBS="$ac_libbfd $LIBS"
-fi
-
-bfd_include_dir=
-if test "$ac_bfd_include_dir" != "NONE"; then
-  bfd_include_dir="-I$ac_bfd_include_dir"
-fi
-
-binutils_include_dir=
-if test "$ac_binutils_include_dir" != "NONE"; then
-  binutils_include_dir="-I$ac_binutils_include_dir"
-fi
-
-binutils_ldscript_dir=
-if test "$ac_binutils_ldscript_dir" = "NONE"; then
-  ac_binutils_ldscript_dir="\${TOOLDIR}/../${target_alias}/lib"
-fi
-binutils_ldscript_dir="$ac_binutils_ldscript_dir"
-
-if test "$ac_libbfd" = "NONE" -o "$ac_libiberty" = "NONE" ; then
-	{ { echo "$as_me:$LINENO: error:
-
-You need to specify the location of the libfd.a and libiberty.a
-host libraries from the binutils package.
-
-Run configure again specifying these options:
-
-  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-" >&5
-echo "$as_me: error:
-
-You need to specify the location of the libfd.a and libiberty.a
-host libraries from the binutils package.
-
-Run configure again specifying these options:
-
-  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test "$ac_bfd_include_dir" = "NONE" ; then
-	{ { echo "$as_me:$LINENO: error:
-
-You need to specify the location of the bfd.h header from a
-configured/compiled version of the binutils package for your target.
-Without this your elf2flt may crash as it will try to use the
-systems bfd.h which may be from a different binutils package.
-
-Run configure again specifying these options:
-
-  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-" >&5
-echo "$as_me: error:
-
-You need to specify the location of the bfd.h header from a
-configured/compiled version of the binutils package for your target.
-Without this your elf2flt may crash as it will try to use the
-systems bfd.h which may be from a different binutils package.
-
-Run configure again specifying these options:
-
-  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-for ac_header in fcntl.h unistd.h bfd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-
-
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-char (*f) () = _doprnt;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != _doprnt;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func__doprnt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
-
-fi
-
-fi
-done
-
-
-
-
-for ac_func in dcgettext
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-                    ac_config_files="$ac_config_files Makefile ld-elf2flt"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "ld-elf2flt" ) CONFIG_FILES="$CONFIG_FILES ld-elf2flt" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@bfd_include_dir@,$bfd_include_dir,;t t
-s,@binutils_include_dir@,$binutils_include_dir,;t t
-s,@binutils_ldscript_dir@,$binutils_ldscript_dir,;t t
-s,@got_check@,$got_check,;t t
-s,@emit_relocs@,$emit_relocs,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-
diff --git a/package/elf2flt/src/configure.in b/package/elf2flt/src/configure.in
deleted file mode 100644
index 73443c6a3b..0000000000
--- a/package/elf2flt/src/configure.in
+++ /dev/null
@@ -1,134 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(elf2flt.c)
-
-AC_ARG_WITH(libbfd,
-	[ --with-libbfd=<file>  path to libbfd.a library to use ],
-	[ ac_libbfd=$withval ],
-	[ ac_libbfd=NONE ]
-)
-
-AC_ARG_WITH(libiberty,
-	[ --with-libiberty=<file>  path to libiberty.a library to use ],
-	[ ac_libiberty=$withval ],
-	[ ac_libiberty=NONE ]
-)
-
-AC_ARG_WITH(bfd-include-dir,
-	[ --with-bfd-include-dir=<dir>  include path for correct bfd.h ],
-	[ ac_bfd_include_dir=$withval ],
-	[ ac_bfd_include_dir=NONE ]
-)
-
-AC_ARG_WITH(binutils-include-dir,
-	[ --with-binutils-include-dir=<dir>  include path for binutils headers ],
-	[ ac_binutils_include_dir=$withval ],
-	[ ac_binutils_include_dir=NONE ]
-)
-
-AC_ARG_WITH(binutils-ldscript-dir,
-	[ --with-binutils-ldscript-dir=<dir>  path to install elf2flt.ld ],
-	[ ac_binutils_ldscript_dir=$withval ],
-	[ ac_binutils_ldscript_dir=NONE ]
-)
-
-AC_ARG_ENABLE(got-check,
-	[ --disable-got-check - disable check for GOT (needed on H8) ],
-	[ got_check=$enableval ],
-	[ got_check=yes ]
-)
-
-AC_ARG_ENABLE(emit_relocs,
-	[ --disable-emit-relocs - don't use the --emit-relocs (-q) linker option ],
-	[ emit_relocs=$enableval ],
-	[ emit_relocs=yes ]
-)
-
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-
-dnl Checks for libraries.
-if test "$ac_libiberty" = "NONE"; then
-  AC_CHECK_LIB(iberty, objalloc_create)
-  ac_libiberty=auto
-else
-  LIBS="$ac_libiberty $LIBS"
-fi
-if test "$ac_libbfd" = "NONE"; then
-  AC_CHECK_LIB(bfd, bfd_openr)
-  ac_libbfd=auto
-else
-  LIBS="$ac_libbfd $LIBS"
-fi
-
-bfd_include_dir=
-if test "$ac_bfd_include_dir" != "NONE"; then
-  bfd_include_dir="-I$ac_bfd_include_dir"
-fi
-
-binutils_include_dir=
-if test "$ac_binutils_include_dir" != "NONE"; then
-  binutils_include_dir="-I$ac_binutils_include_dir"
-fi
-
-binutils_ldscript_dir=
-if test "$ac_binutils_ldscript_dir" = "NONE"; then
-  ac_binutils_ldscript_dir="\${TOOLDIR}/../${target_alias}/lib"
-fi
-binutils_ldscript_dir="$ac_binutils_ldscript_dir"
-
-if test "$ac_libbfd" = "NONE" -o "$ac_libiberty" = "NONE" ; then
-	AC_MSG_ERROR([
-
-You need to specify the location of the libfd.a and libiberty.a
-host libraries from the binutils package.
-	
-Run configure again specifying these options:
-	
-  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-])
-fi
-
-if test "$ac_bfd_include_dir" = "NONE" ; then
-	AC_MSG_ERROR([
-
-You need to specify the location of the bfd.h header from a
-configured/compiled version of the binutils package for your target.
-Without this your elf2flt may crash as it will try to use the
-systems bfd.h which may be from a different binutils package.
-
-Run configure again specifying these options:
-
-  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
-])
-fi
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h bfd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-AC_CHECK_FUNCS(dcgettext)
-
-dnl Subsitute values
-AC_SUBST(target)
-AC_SUBST(target_alias)
-AC_SUBST(target_cpu)
-AC_SUBST(target_os)
-AC_SUBST(target_vendor)
-AC_SUBST(bfd_include_dir)
-AC_SUBST(binutils_include_dir)
-AC_SUBST(binutils_ldscript_dir)
-AC_SUBST(got_check)
-AC_SUBST(emit_relocs)
-
-AC_OUTPUT(Makefile ld-elf2flt)
-
diff --git a/package/elf2flt/src/cygwin-elf.h b/package/elf2flt/src/cygwin-elf.h
deleted file mode 100644
index 2523c0e04b..0000000000
--- a/package/elf2flt/src/cygwin-elf.h
+++ /dev/null
@@ -1,2171 +0,0 @@
-/* This file defines standard ELF types, structures, and macros.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ELF_H
-#define	_ELF_H 1
-
-#if	defined(__MINGW32__)
-#include <stdint.h>
-typedef uint16_t u_int16_t;
-typedef uint32_t u_int32_t;
-typedef uint64_t u_int64_t;
-#else
-#include <features.h>
-#endif
-/* Standard ELF types.  */
-
-#include <sys/types.h>
-
-/* Type for a 16-bit quantity.  */
-typedef u_int16_t Elf32_Half;
-typedef u_int16_t Elf64_Half;
-
-/* Types for signed and unsigned 32-bit quantities.  */
-typedef u_int32_t Elf32_Word;
-typedef	int32_t  Elf32_Sword;
-typedef u_int32_t Elf64_Word;
-typedef	int32_t  Elf64_Sword;
-
-/* Types for signed and unsigned 64-bit quantities.  */
-typedef u_int64_t Elf32_Xword;
-typedef	int64_t  Elf32_Sxword;
-typedef u_int64_t Elf64_Xword;
-typedef	int64_t  Elf64_Sxword;
-
-/* Type of addresses.  */
-typedef u_int32_t Elf32_Addr;
-typedef u_int64_t Elf64_Addr;
-
-/* Type of file offsets.  */
-typedef u_int32_t Elf32_Off;
-typedef u_int64_t Elf64_Off;
-
-/* Type for section indices, which are 16-bit quantities.  */
-typedef u_int16_t Elf32_Section;
-typedef u_int16_t Elf64_Section;
-
-/* Type for version symbol information.  */
-typedef Elf32_Half Elf32_Versym;
-typedef Elf64_Half Elf64_Versym;
-
-
-/* The ELF file header.  This appears at the start of every ELF file.  */
-
-#define EI_NIDENT (16)
-
-typedef struct
-{
-  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
-  Elf32_Half	e_type;			/* Object file type */
-  Elf32_Half	e_machine;		/* Architecture */
-  Elf32_Word	e_version;		/* Object file version */
-  Elf32_Addr	e_entry;		/* Entry point virtual address */
-  Elf32_Off	e_phoff;		/* Program header table file offset */
-  Elf32_Off	e_shoff;		/* Section header table file offset */
-  Elf32_Word	e_flags;		/* Processor-specific flags */
-  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
-  Elf32_Half	e_phentsize;		/* Program header table entry size */
-  Elf32_Half	e_phnum;		/* Program header table entry count */
-  Elf32_Half	e_shentsize;		/* Section header table entry size */
-  Elf32_Half	e_shnum;		/* Section header table entry count */
-  Elf32_Half	e_shstrndx;		/* Section header string table index */
-} Elf32_Ehdr;
-
-typedef struct
-{
-  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
-  Elf64_Half	e_type;			/* Object file type */
-  Elf64_Half	e_machine;		/* Architecture */
-  Elf64_Word	e_version;		/* Object file version */
-  Elf64_Addr	e_entry;		/* Entry point virtual address */
-  Elf64_Off	e_phoff;		/* Program header table file offset */
-  Elf64_Off	e_shoff;		/* Section header table file offset */
-  Elf64_Word	e_flags;		/* Processor-specific flags */
-  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
-  Elf64_Half	e_phentsize;		/* Program header table entry size */
-  Elf64_Half	e_phnum;		/* Program header table entry count */
-  Elf64_Half	e_shentsize;		/* Section header table entry size */
-  Elf64_Half	e_shnum;		/* Section header table entry count */
-  Elf64_Half	e_shstrndx;		/* Section header string table index */
-} Elf64_Ehdr;
-
-/* Fields in the e_ident array.  The EI_* macros are indices into the
-   array.  The macros under each EI_* macro are the values the byte
-   may have.  */
-
-#define EI_MAG0		0		/* File identification byte 0 index */
-#define ELFMAG0		0x7f		/* Magic number byte 0 */
-
-#define EI_MAG1		1		/* File identification byte 1 index */
-#define ELFMAG1		'E'		/* Magic number byte 1 */
-
-#define EI_MAG2		2		/* File identification byte 2 index */
-#define ELFMAG2		'L'		/* Magic number byte 2 */
-
-#define EI_MAG3		3		/* File identification byte 3 index */
-#define ELFMAG3		'F'		/* Magic number byte 3 */
-
-/* Conglomeration of the identification bytes, for easy testing as a word.  */
-#define	ELFMAG		"\177ELF"
-#define	SELFMAG		4
-
-#define EI_CLASS	4		/* File class byte index */
-#define ELFCLASSNONE	0		/* Invalid class */
-#define ELFCLASS32	1		/* 32-bit objects */
-#define ELFCLASS64	2		/* 64-bit objects */
-#define ELFCLASSNUM	3
-
-#define EI_DATA		5		/* Data encoding byte index */
-#define ELFDATANONE	0		/* Invalid data encoding */
-#define ELFDATA2LSB	1		/* 2's complement, little endian */
-#define ELFDATA2MSB	2		/* 2's complement, big endian */
-#define ELFDATANUM	3
-
-#define EI_VERSION	6		/* File version byte index */
-					/* Value must be EV_CURRENT */
-
-#define EI_OSABI	7		/* OS ABI identification */
-#define ELFOSABI_SYSV		0	/* UNIX System V ABI */
-#define ELFOSABI_HPUX		1	/* HP-UX */
-#define ELFOSABI_ARM		97	/* ARM */
-#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
-
-#define EI_ABIVERSION	8		/* ABI version */
-
-#define EI_PAD		9		/* Byte index of padding bytes */
-
-/* Legal values for e_type (object file type).  */
-
-#define ET_NONE		0		/* No file type */
-#define ET_REL		1		/* Relocatable file */
-#define ET_EXEC		2		/* Executable file */
-#define ET_DYN		3		/* Shared object file */
-#define ET_CORE		4		/* Core file */
-#define	ET_NUM		5		/* Number of defined types */
-#define ET_LOOS		0xfe00		/* OS-specific range start */
-#define ET_HIOS		0xfeff		/* OS-specific range end */
-#define ET_LOPROC	0xff00		/* Processor-specific range start */
-#define ET_HIPROC	0xffff		/* Processor-specific range end */
-
-/* Legal values for e_machine (architecture).  */
-
-#define EM_NONE		 0		/* No machine */
-#define EM_M32		 1		/* AT&T WE 32100 */
-#define EM_SPARC	 2		/* SUN SPARC */
-#define EM_386		 3		/* Intel 80386 */
-#define EM_68K		 4		/* Motorola m68k family */
-#define EM_88K		 5		/* Motorola m88k family */
-#define EM_860		 7		/* Intel 80860 */
-#define EM_MIPS		 8		/* MIPS R3000 big-endian */
-#define EM_S370		 9		/* IBM System/370 */
-#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
-
-#define EM_PARISC	15		/* HPPA */
-#define EM_VPP500	17		/* Fujitsu VPP500 */
-#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
-#define EM_960		19		/* Intel 80960 */
-#define EM_PPC		20		/* PowerPC */
-#define EM_PPC64	21		/* PowerPC 64-bit */
-#define EM_S390		22		/* IBM S390 */
-
-#define EM_V800		36		/* NEC V800 series */
-#define EM_FR20		37		/* Fujitsu FR20 */
-#define EM_RH32		38		/* TRW RH-32 */
-#define EM_RCE		39		/* Motorola RCE */
-#define EM_ARM		40		/* ARM */
-#define EM_FAKE_ALPHA	41		/* Digital Alpha */
-#define EM_SH		42		/* Hitachi SH */
-#define EM_SPARCV9	43		/* SPARC v9 64-bit */
-#define EM_TRICORE	44		/* Siemens Tricore */
-#define EM_ARC		45		/* Argonaut RISC Core */
-#define EM_H8_300	46		/* Hitachi H8/300 */
-#define EM_H8_300H	47		/* Hitachi H8/300H */
-#define EM_H8S		48		/* Hitachi H8S */
-#define EM_H8_500	49		/* Hitachi H8/500 */
-#define EM_IA_64	50		/* Intel Merced */
-#define EM_MIPS_X	51		/* Stanford MIPS-X */
-#define EM_COLDFIRE	52		/* Motorola Coldfire */
-#define EM_68HC12	53		/* Motorola M68HC12 */
-#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
-#define EM_PCP		55		/* Siemens PCP */
-#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
-#define EM_NDR1		57		/* Denso NDR1 microprocessor */
-#define EM_STARCORE	58		/* Motorola Start*Core processor */
-#define EM_ME16		59		/* Toyota ME16 processor */
-#define EM_ST100	60		/* STMicroelectronic ST100 processor */
-#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
-#define EM_X86_64	62		/* AMD x86-64 architecture */
-#define EM_PDSP		63		/* Sony DSP Processor */
-
-#define EM_FX66		66		/* Siemens FX66 microcontroller */
-#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
-#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
-#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
-#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
-#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
-#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
-#define EM_SVX		73		/* Silicon Graphics SVx */
-#define EM_AT19		74		/* STMicroelectronics ST19 8 bit mc */
-#define EM_VAX		75		/* Digital VAX */
-#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
-#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
-#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
-#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
-#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
-#define EM_HUANY	81		/* Harvard University machine-independent object files */
-#define EM_PRISM	82		/* SiTera Prism */
-#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
-#define EM_FR30		84		/* Fujitsu FR30 */
-#define EM_D10V		85		/* Mitsubishi D10V */
-#define EM_D30V		86		/* Mitsubishi D30V */
-#define EM_V850		87		/* NEC v850 */
-#define EM_M32R		88		/* Mitsubishi M32R */
-#define EM_MN10300	89		/* Matsushita MN10300 */
-#define EM_MN10200	90		/* Matsushita MN10200 */
-#define EM_PJ		91		/* picoJava */
-#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
-#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
-#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
-#define EM_NUM		95
-
-/* If it is necessary to assign new unofficial EM_* values, please
-   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
-   chances of collision with official or non-GNU unofficial values.  */
-
-#define EM_ALPHA	0x9026
-
-/* Legal values for e_version (version).  */
-
-#define EV_NONE		0		/* Invalid ELF version */
-#define EV_CURRENT	1		/* Current version */
-#define EV_NUM		2
-
-/* Section header.  */
-
-typedef struct
-{
-  Elf32_Word	sh_name;		/* Section name (string tbl index) */
-  Elf32_Word	sh_type;		/* Section type */
-  Elf32_Word	sh_flags;		/* Section flags */
-  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
-  Elf32_Off	sh_offset;		/* Section file offset */
-  Elf32_Word	sh_size;		/* Section size in bytes */
-  Elf32_Word	sh_link;		/* Link to another section */
-  Elf32_Word	sh_info;		/* Additional section information */
-  Elf32_Word	sh_addralign;		/* Section alignment */
-  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
-} Elf32_Shdr;
-
-typedef struct
-{
-  Elf64_Word	sh_name;		/* Section name (string tbl index) */
-  Elf64_Word	sh_type;		/* Section type */
-  Elf64_Xword	sh_flags;		/* Section flags */
-  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
-  Elf64_Off	sh_offset;		/* Section file offset */
-  Elf64_Xword	sh_size;		/* Section size in bytes */
-  Elf64_Word	sh_link;		/* Link to another section */
-  Elf64_Word	sh_info;		/* Additional section information */
-  Elf64_Xword	sh_addralign;		/* Section alignment */
-  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
-} Elf64_Shdr;
-
-/* Special section indices.  */
-
-#define SHN_UNDEF	0		/* Undefined section */
-#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
-#define SHN_LOPROC	0xff00		/* Start of processor-specific */
-#define SHN_HIPROC	0xff1f		/* End of processor-specific */
-#define SHN_LOOS	0xff20		/* Start of OS-specific */
-#define SHN_HIOS	0xff3f		/* End of OS-specific */
-#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
-#define SHN_COMMON	0xfff2		/* Associated symbol is common */
-#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
-#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
-
-/* Legal values for sh_type (section type).  */
-
-#define SHT_NULL	  0		/* Section header table entry unused */
-#define SHT_PROGBITS	  1		/* Program data */
-#define SHT_SYMTAB	  2		/* Symbol table */
-#define SHT_STRTAB	  3		/* String table */
-#define SHT_RELA	  4		/* Relocation entries with addends */
-#define SHT_HASH	  5		/* Symbol hash table */
-#define SHT_DYNAMIC	  6		/* Dynamic linking information */
-#define SHT_NOTE	  7		/* Notes */
-#define SHT_NOBITS	  8		/* Program space with no data (bss) */
-#define SHT_REL		  9		/* Relocation entries, no addends */
-#define SHT_SHLIB	  10		/* Reserved */
-#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
-#define SHT_INIT_ARRAY	  14		/* Array of constructors */
-#define SHT_FINI_ARRAY	  15		/* Array of destructors */
-#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
-#define SHT_GROUP	  17		/* Section group */
-#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
-#define	SHT_NUM		  19		/* Number of defined types.  */
-#define SHT_LOOS	  0x60000000	/* Start OS-specific */
-#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
-#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
-#define SHT_SUNW_move	  0x6ffffffa
-#define SHT_SUNW_COMDAT   0x6ffffffb
-#define SHT_SUNW_syminfo  0x6ffffffc
-#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
-#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
-#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
-#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
-#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
-#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
-#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
-#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
-#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
-
-/* Legal values for sh_flags (section flags).  */
-
-#define SHF_WRITE	     (1 << 0)	/* Writable */
-#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
-#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
-#define SHF_MERGE	     (1 << 4)	/* Might be merged */
-#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
-#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
-#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
-#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
-					   required */
-#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
-#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
-
-/* Section group handling.  */
-#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
-
-/* Symbol table entry.  */
-
-typedef struct
-{
-  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
-  Elf32_Addr	st_value;		/* Symbol value */
-  Elf32_Word	st_size;		/* Symbol size */
-  unsigned char	st_info;		/* Symbol type and binding */
-  unsigned char	st_other;		/* Symbol visibility */
-  Elf32_Section	st_shndx;		/* Section index */
-} Elf32_Sym;
-
-typedef struct
-{
-  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
-  unsigned char	st_info;		/* Symbol type and binding */
-  unsigned char st_other;		/* Symbol visibility */
-  Elf64_Section	st_shndx;		/* Section index */
-  Elf64_Addr	st_value;		/* Symbol value */
-  Elf64_Xword	st_size;		/* Symbol size */
-} Elf64_Sym;
-
-/* The syminfo section if available contains additional information about
-   every dynamic symbol.  */
-
-typedef struct
-{
-  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
-  Elf32_Half si_flags;			/* Per symbol flags */
-} Elf32_Syminfo;
-
-typedef struct
-{
-  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
-  Elf64_Half si_flags;			/* Per symbol flags */
-} Elf64_Syminfo;
-
-/* Possible values for si_boundto.  */
-#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
-#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
-#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
-
-/* Possible bitmasks for si_flags.  */
-#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
-#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
-#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
-#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
-					   loaded */
-/* Syminfo version values.  */
-#define SYMINFO_NONE		0
-#define SYMINFO_CURRENT		1
-#define SYMINFO_NUM		2
-
-
-/* Special section index.  */
-
-#define SHN_UNDEF	0		/* No section, undefined symbol.  */
-
-/* How to extract and insert information held in the st_info field.  */
-
-#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
-#define ELF32_ST_TYPE(val)		((val) & 0xf)
-#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-
-/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
-#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
-#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
-#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
-
-/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
-
-#define STB_LOCAL	0		/* Local symbol */
-#define STB_GLOBAL	1		/* Global symbol */
-#define STB_WEAK	2		/* Weak symbol */
-#define	STB_NUM		3		/* Number of defined types.  */
-#define STB_LOOS	10		/* Start of OS-specific */
-#define STB_HIOS	12		/* End of OS-specific */
-#define STB_LOPROC	13		/* Start of processor-specific */
-#define STB_HIPROC	15		/* End of processor-specific */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_NOTYPE	0		/* Symbol type is unspecified */
-#define STT_OBJECT	1		/* Symbol is a data object */
-#define STT_FUNC	2		/* Symbol is a code object */
-#define STT_SECTION	3		/* Symbol associated with a section */
-#define STT_FILE	4		/* Symbol's name is file name */
-#define STT_COMMON	5		/* Symbol is a common data object */
-#define	STT_NUM		6		/* Number of defined types.  */
-#define STT_LOOS	10		/* Start of OS-specific */
-#define STT_HIOS	12		/* End of OS-specific */
-#define STT_LOPROC	13		/* Start of processor-specific */
-#define STT_HIPROC	15		/* End of processor-specific */
-
-
-/* Symbol table indices are found in the hash buckets and chain table
-   of a symbol hash table section.  This special index value indicates
-   the end of a chain, meaning no further symbols are found in that bucket.  */
-
-#define STN_UNDEF	0		/* End of a chain.  */
-
-
-/* How to extract and insert information held in the st_other field.  */
-
-#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
-
-/* For ELF64 the definitions are the same.  */
-#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
-
-/* Symbol visibility specification encoded in the st_other field.  */
-#define STV_DEFAULT	0		/* Default symbol visibility rules */
-#define STV_INTERNAL	1		/* Processor specific hidden class */
-#define STV_HIDDEN	2		/* Sym unavailable in other modules */
-#define STV_PROTECTED	3		/* Not preemptible, not exported */
-
-
-/* Relocation table entry without addend (in section of type SHT_REL).  */
-
-typedef struct
-{
-  Elf32_Addr	r_offset;		/* Address */
-  Elf32_Word	r_info;			/* Relocation type and symbol index */
-} Elf32_Rel;
-
-/* I have seen two different definitions of the Elf64_Rel and
-   Elf64_Rela structures, so we'll leave them out until Novell (or
-   whoever) gets their act together.  */
-/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
-
-typedef struct
-{
-  Elf64_Addr	r_offset;		/* Address */
-  Elf64_Xword	r_info;			/* Relocation type and symbol index */
-} Elf64_Rel;
-
-/* Relocation table entry with addend (in section of type SHT_RELA).  */
-
-typedef struct
-{
-  Elf32_Addr	r_offset;		/* Address */
-  Elf32_Word	r_info;			/* Relocation type and symbol index */
-  Elf32_Sword	r_addend;		/* Addend */
-} Elf32_Rela;
-
-typedef struct
-{
-  Elf64_Addr	r_offset;		/* Address */
-  Elf64_Xword	r_info;			/* Relocation type and symbol index */
-  Elf64_Sxword	r_addend;		/* Addend */
-} Elf64_Rela;
-
-/* How to extract and insert information held in the r_info field.  */
-
-#define ELF32_R_SYM(val)		((val) >> 8)
-#define ELF32_R_TYPE(val)		((val) & 0xff)
-#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
-
-#define ELF64_R_SYM(i)			((i) >> 32)
-#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
-
-/* Program segment header.  */
-
-typedef struct
-{
-  Elf32_Word	p_type;			/* Segment type */
-  Elf32_Off	p_offset;		/* Segment file offset */
-  Elf32_Addr	p_vaddr;		/* Segment virtual address */
-  Elf32_Addr	p_paddr;		/* Segment physical address */
-  Elf32_Word	p_filesz;		/* Segment size in file */
-  Elf32_Word	p_memsz;		/* Segment size in memory */
-  Elf32_Word	p_flags;		/* Segment flags */
-  Elf32_Word	p_align;		/* Segment alignment */
-} Elf32_Phdr;
-
-typedef struct
-{
-  Elf64_Word	p_type;			/* Segment type */
-  Elf64_Word	p_flags;		/* Segment flags */
-  Elf64_Off	p_offset;		/* Segment file offset */
-  Elf64_Addr	p_vaddr;		/* Segment virtual address */
-  Elf64_Addr	p_paddr;		/* Segment physical address */
-  Elf64_Xword	p_filesz;		/* Segment size in file */
-  Elf64_Xword	p_memsz;		/* Segment size in memory */
-  Elf64_Xword	p_align;		/* Segment alignment */
-} Elf64_Phdr;
-
-/* Legal values for p_type (segment type).  */
-
-#define	PT_NULL		0		/* Program header table entry unused */
-#define PT_LOAD		1		/* Loadable program segment */
-#define PT_DYNAMIC	2		/* Dynamic linking information */
-#define PT_INTERP	3		/* Program interpreter */
-#define PT_NOTE		4		/* Auxiliary information */
-#define PT_SHLIB	5		/* Reserved */
-#define PT_PHDR		6		/* Entry for header table itself */
-#define	PT_NUM		7		/* Number of defined types */
-#define PT_LOOS		0x60000000	/* Start of OS-specific */
-#define PT_HIOS		0x6fffffff	/* End of OS-specific */
-#define PT_LOPROC	0x70000000	/* Start of processor-specific */
-#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
-
-/* Legal values for p_flags (segment flags).  */
-
-#define PF_X		(1 << 0)	/* Segment is executable */
-#define PF_W		(1 << 1)	/* Segment is writable */
-#define PF_R		(1 << 2)	/* Segment is readable */
-#define PF_MASKOS	0x0ff00000	/* OS-specific */
-#define PF_MASKPROC	0xf0000000	/* Processor-specific */
-
-/* Legal values for note segment descriptor types for core files. */
-
-#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
-#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
-#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
-#define NT_PRXREG	4		/* Contains copy of prxregset struct */
-#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
-#define NT_AUXV		6		/* Contains copy of auxv array */
-#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
-#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
-#define NT_PSINFO	13		/* Contains copy of psinfo struct */
-#define NT_PRCRED	14		/* Contains copy of prcred struct */
-#define NT_UTSNAME	15		/* Contains copy of utsname struct */
-#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
-#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
-#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct*/
-
-/* Legal values for the note segment descriptor types for object files.  */
-
-#define NT_VERSION	1		/* Contains a version string.  */
-
-
-/* Dynamic section entry.  */
-
-typedef struct
-{
-  Elf32_Sword	d_tag;			/* Dynamic entry type */
-  union
-    {
-      Elf32_Word d_val;			/* Integer value */
-      Elf32_Addr d_ptr;			/* Address value */
-    } d_un;
-} Elf32_Dyn;
-
-typedef struct
-{
-  Elf64_Sxword	d_tag;			/* Dynamic entry type */
-  union
-    {
-      Elf64_Xword d_val;		/* Integer value */
-      Elf64_Addr d_ptr;			/* Address value */
-    } d_un;
-} Elf64_Dyn;
-
-/* Legal values for d_tag (dynamic entry type).  */
-
-#define DT_NULL		0		/* Marks end of dynamic section */
-#define DT_NEEDED	1		/* Name of needed library */
-#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
-#define DT_PLTGOT	3		/* Processor defined value */
-#define DT_HASH		4		/* Address of symbol hash table */
-#define DT_STRTAB	5		/* Address of string table */
-#define DT_SYMTAB	6		/* Address of symbol table */
-#define DT_RELA		7		/* Address of Rela relocs */
-#define DT_RELASZ	8		/* Total size of Rela relocs */
-#define DT_RELAENT	9		/* Size of one Rela reloc */
-#define DT_STRSZ	10		/* Size of string table */
-#define DT_SYMENT	11		/* Size of one symbol table entry */
-#define DT_INIT		12		/* Address of init function */
-#define DT_FINI		13		/* Address of termination function */
-#define DT_SONAME	14		/* Name of shared object */
-#define DT_RPATH	15		/* Library search path (deprecated) */
-#define DT_SYMBOLIC	16		/* Start symbol search here */
-#define DT_REL		17		/* Address of Rel relocs */
-#define DT_RELSZ	18		/* Total size of Rel relocs */
-#define DT_RELENT	19		/* Size of one Rel reloc */
-#define DT_PLTREL	20		/* Type of reloc in PLT */
-#define DT_DEBUG	21		/* For debugging; unspecified */
-#define DT_TEXTREL	22		/* Reloc might modify .text */
-#define DT_JMPREL	23		/* Address of PLT relocs */
-#define	DT_BIND_NOW	24		/* Process relocations of object */
-#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
-#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
-#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
-#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
-#define DT_RUNPATH	29		/* Library search path */
-#define DT_FLAGS	30		/* Flags for the object being loaded */
-#define DT_ENCODING	32		/* Start of encoded range */
-#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
-#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
-#define	DT_NUM		34		/* Number used */
-#define DT_LOOS		0x60000000	/* Start of OS-specific */
-#define DT_HIOS		0x6fffffff	/* End of OS-specific */
-#define DT_LOPROC	0x70000000	/* Start of processor-specific */
-#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
-#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
-
-/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
-   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
-   approach.  */
-#define DT_VALRNGLO	0x6ffffd00
-#define DT_CHECKSUM	0x6ffffdf8
-#define DT_PLTPADSZ	0x6ffffdf9
-#define DT_MOVEENT	0x6ffffdfa
-#define DT_MOVESZ	0x6ffffdfb
-#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
-#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
-					   the following DT_* entry.  */
-#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
-#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
-#define DT_VALRNGHI	0x6ffffdff
-
-/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
-   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
-
-   If any adjustment is made to the ELF object after it has been
-   built these entries will need to be adjusted.  */
-#define DT_ADDRRNGLO	0x6ffffe00
-#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
-#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
-#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
-#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
-#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
-#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
-#define DT_ADDRRNGHI	0x6ffffeff
-
-/* The versioning entry types.  The next are defined as part of the
-   GNU extension.  */
-#define DT_VERSYM	0x6ffffff0
-
-#define DT_RELACOUNT	0x6ffffff9
-#define DT_RELCOUNT	0x6ffffffa
-
-/* These were chosen by Sun.  */
-#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
-#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
-					   table */
-#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
-#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
-					   versions */
-#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
-#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
-#define DT_VERSIONTAGNUM 16
-
-/* Sun added these machine-independent extensions in the "processor-specific"
-   range.  Be compatible.  */
-#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
-#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
-#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-#define DT_EXTRANUM	3
-
-/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
-#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
-#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
-#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
-#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
-
-/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-   entry in the dynamic section.  */
-#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
-#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
-#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
-#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
-#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
-#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
-#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
-#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
-#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
-#define DF_1_TRANS	0x00000200
-#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
-#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
-#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
-#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
-#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
-#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
-#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
-
-/* Flags for the feature selection in DT_FEATURE_1.  */
-#define DTF_1_PARINIT	0x00000001
-#define DTF_1_CONFEXP	0x00000002
-
-/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
-#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
-#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
-					   generally available.  */
-
-/* Version definition sections.  */
-
-typedef struct
-{
-  Elf32_Half	vd_version;		/* Version revision */
-  Elf32_Half	vd_flags;		/* Version information */
-  Elf32_Half	vd_ndx;			/* Version Index */
-  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
-  Elf32_Word	vd_hash;		/* Version name hash value */
-  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
-  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
-					   entry */
-} Elf32_Verdef;
-
-typedef struct
-{
-  Elf64_Half	vd_version;		/* Version revision */
-  Elf64_Half	vd_flags;		/* Version information */
-  Elf64_Half	vd_ndx;			/* Version Index */
-  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
-  Elf64_Word	vd_hash;		/* Version name hash value */
-  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
-  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
-					   entry */
-} Elf64_Verdef;
-
-
-/* Legal values for vd_version (version revision).  */
-#define VER_DEF_NONE	0		/* No version */
-#define VER_DEF_CURRENT	1		/* Current version */
-#define VER_DEF_NUM	2		/* Given version number */
-
-/* Legal values for vd_flags (version information flags).  */
-#define VER_FLG_BASE	0x1		/* Version definition of file itself */
-#define VER_FLG_WEAK	0x2		/* Weak version identifier */
-
-/* Versym symbol index values.  */
-#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
-#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
-#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
-#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
-
-/* Auxialiary version information.  */
-
-typedef struct
-{
-  Elf32_Word	vda_name;		/* Version or dependency names */
-  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
-					   entry */
-} Elf32_Verdaux;
-
-typedef struct
-{
-  Elf64_Word	vda_name;		/* Version or dependency names */
-  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
-					   entry */
-} Elf64_Verdaux;
-
-
-/* Version dependency section.  */
-
-typedef struct
-{
-  Elf32_Half	vn_version;		/* Version of structure */
-  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
-  Elf32_Word	vn_file;		/* Offset of filename for this
-					   dependency */
-  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
-  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
-					   entry */
-} Elf32_Verneed;
-
-typedef struct
-{
-  Elf64_Half	vn_version;		/* Version of structure */
-  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
-  Elf64_Word	vn_file;		/* Offset of filename for this
-					   dependency */
-  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
-  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
-					   entry */
-} Elf64_Verneed;
-
-
-/* Legal values for vn_version (version revision).  */
-#define VER_NEED_NONE	 0		/* No version */
-#define VER_NEED_CURRENT 1		/* Current version */
-#define VER_NEED_NUM	 2		/* Given version number */
-
-/* Auxiliary needed version information.  */
-
-typedef struct
-{
-  Elf32_Word	vna_hash;		/* Hash value of dependency name */
-  Elf32_Half	vna_flags;		/* Dependency specific information */
-  Elf32_Half	vna_other;		/* Unused */
-  Elf32_Word	vna_name;		/* Dependency name string offset */
-  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
-					   entry */
-} Elf32_Vernaux;
-
-typedef struct
-{
-  Elf64_Word	vna_hash;		/* Hash value of dependency name */
-  Elf64_Half	vna_flags;		/* Dependency specific information */
-  Elf64_Half	vna_other;		/* Unused */
-  Elf64_Word	vna_name;		/* Dependency name string offset */
-  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
-					   entry */
-} Elf64_Vernaux;
-
-
-/* Legal values for vna_flags.  */
-#define VER_FLG_WEAK	0x2		/* Weak version identifier */
-
-
-/* Auxiliary vector.  */
-
-/* This vector is normally only used by the program interpreter.  The
-   usual definition in an ABI supplement uses the name auxv_t.  The
-   vector is not usually defined in a standard <elf.h> file, but it
-   can't hurt.  We rename it to avoid conflicts.  The sizes of these
-   types are an arrangement between the exec server and the program
-   interpreter, so we don't fully specify them here.  */
-
-typedef struct
-{
-  int a_type;			/* Entry type */
-  union
-    {
-      long int a_val;		/* Integer value */
-      void *a_ptr;		/* Pointer value */
-      void (*a_fcn) (void);	/* Function pointer value */
-    } a_un;
-} Elf32_auxv_t;
-
-typedef struct
-{
-  long int a_type;		/* Entry type */
-  union
-    {
-      long int a_val;		/* Integer value */
-      void *a_ptr;		/* Pointer value */
-      void (*a_fcn) (void);	/* Function pointer value */
-    } a_un;
-} Elf64_auxv_t;
-
-/* Legal values for a_type (entry type).  */
-
-#define AT_NULL		0		/* End of vector */
-#define AT_IGNORE	1		/* Entry should be ignored */
-#define AT_EXECFD	2		/* File descriptor of program */
-#define AT_PHDR		3		/* Program headers for program */
-#define AT_PHENT	4		/* Size of program header entry */
-#define AT_PHNUM	5		/* Number of program headers */
-#define AT_PAGESZ	6		/* System page size */
-#define AT_BASE		7		/* Base address of interpreter */
-#define AT_FLAGS	8		/* Flags */
-#define AT_ENTRY	9		/* Entry point of program */
-#define AT_NOTELF	10		/* Program is not ELF */
-#define AT_UID		11		/* Real uid */
-#define AT_EUID		12		/* Effective uid */
-#define AT_GID		13		/* Real gid */
-#define AT_EGID		14		/* Effective gid */
-#define AT_CLKTCK	17		/* Frequency of times() */
-
-/* Some more special a_type values describing the hardware.  */
-#define AT_PLATFORM	15		/* String identifying platform.  */
-#define AT_HWCAP	16		/* Machine dependent hints about
-					   processor capabilities.  */
-
-/* This entry gives some information about the FPU initialization
-   performed by the kernel.  */
-#define AT_FPUCW	18		/* Used FPU control word.  */
-
-/* Cache block sizes.  */
-#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
-#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
-#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
-
-/* A special ignored value for PPC, used by the kernel to control the
-   interpretation of the AUXV. Must be > 16.  */
-#define AT_IGNOREPPC	22		/* Entry should be ignored */
-
-
-/* Note section contents.  Each entry in the note section begins with
-   a header of a fixed form.  */
-
-typedef struct
-{
-  Elf32_Word n_namesz;			/* Length of the note's name.  */
-  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
-  Elf32_Word n_type;			/* Type of the note.  */
-} Elf32_Nhdr;
-
-typedef struct
-{
-  Elf64_Word n_namesz;			/* Length of the note's name.  */
-  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
-  Elf64_Word n_type;			/* Type of the note.  */
-} Elf64_Nhdr;
-
-/* Known names of notes.  */
-
-/* Solaris entries in the note section have this name.  */
-#define ELF_NOTE_SOLARIS	"SUNW Solaris"
-
-/* Note entries for GNU systems have this name.  */
-#define ELF_NOTE_GNU		"GNU"
-
-
-/* Defined types of notes for Solaris.  */
-
-/* Value of descriptor (one word) is desired pagesize for the binary.  */
-#define ELF_NOTE_PAGESIZE_HINT	1
-
-
-/* Defined note types for GNU systems.  */
-
-/* ABI information.  The descriptor consists of words:
-   word 0: OS descriptor
-   word 1: major version of the ABI
-   word 2: minor version of the ABI
-   word 3: subminor version of the ABI
-*/
-#define ELF_NOTE_ABI		1
-
-/* Known OSes.  These value can appear in word 0 of an ELF_NOTE_ABI
-   note section entry.  */
-#define ELF_NOTE_OS_LINUX	0
-#define ELF_NOTE_OS_GNU		1
-#define ELF_NOTE_OS_SOLARIS2	2
-
-
-/* Move records.  */
-typedef struct
-{
-  Elf32_Xword m_value;		/* Symbol value.  */
-  Elf32_Word m_info;		/* Size and index.  */
-  Elf32_Word m_poffset;		/* Symbol offset.  */
-  Elf32_Half m_repeat;		/* Repeat count.  */
-  Elf32_Half m_stride;		/* Stride info.  */
-} Elf32_Move;
-
-typedef struct
-{
-  Elf64_Xword m_value;		/* Symbol value.  */
-  Elf64_Xword m_info;		/* Size and index.  */
-  Elf64_Xword m_poffset;	/* Symbol offset.  */
-  Elf64_Half m_repeat;		/* Repeat count.  */
-  Elf64_Half m_stride;		/* Stride info.  */
-} Elf64_Move;
-
-/* Macro to construct move records.  */
-#define ELF32_M_SYM(info)	((info) >> 8)
-#define ELF32_M_SIZE(info)	((unsigned char) (info))
-#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
-
-#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
-#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
-#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
-
-
-/* Motorola 68k specific definitions.  */
-
-/* Values for Elf32_Ehdr.e_flags.  */
-#define EF_CPU32	0x00810000
-
-/* m68k relocs.  */
-
-#define R_68K_NONE	0		/* No reloc */
-#define R_68K_32	1		/* Direct 32 bit  */
-#define R_68K_16	2		/* Direct 16 bit  */
-#define R_68K_8		3		/* Direct 8 bit  */
-#define R_68K_PC32	4		/* PC relative 32 bit */
-#define R_68K_PC16	5		/* PC relative 16 bit */
-#define R_68K_PC8	6		/* PC relative 8 bit */
-#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
-#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
-#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
-#define R_68K_GOT32O	10		/* 32 bit GOT offset */
-#define R_68K_GOT16O	11		/* 16 bit GOT offset */
-#define R_68K_GOT8O	12		/* 8 bit GOT offset */
-#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
-#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
-#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
-#define R_68K_PLT32O	16		/* 32 bit PLT offset */
-#define R_68K_PLT16O	17		/* 16 bit PLT offset */
-#define R_68K_PLT8O	18		/* 8 bit PLT offset */
-#define R_68K_COPY	19		/* Copy symbol at runtime */
-#define R_68K_GLOB_DAT	20		/* Create GOT entry */
-#define R_68K_JMP_SLOT	21		/* Create PLT entry */
-#define R_68K_RELATIVE	22		/* Adjust by program base */
-/* Keep this the last entry.  */
-#define R_68K_NUM	23
-
-/* Intel 80386 specific definitions.  */
-
-/* i386 relocs.  */
-
-#define R_386_NONE	0		/* No reloc */
-#define R_386_32	1		/* Direct 32 bit  */
-#define R_386_PC32	2		/* PC relative 32 bit */
-#define R_386_GOT32	3		/* 32 bit GOT entry */
-#define R_386_PLT32	4		/* 32 bit PLT address */
-#define R_386_COPY	5		/* Copy symbol at runtime */
-#define R_386_GLOB_DAT	6		/* Create GOT entry */
-#define R_386_JMP_SLOT	7		/* Create PLT entry */
-#define R_386_RELATIVE	8		/* Adjust by program base */
-#define R_386_GOTOFF	9		/* 32 bit offset to GOT */
-#define R_386_GOTPC	10		/* 32 bit PC relative offset to GOT */
-/* Keep this the last entry.  */
-#define R_386_NUM	11
-
-/* SUN SPARC specific definitions.  */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_REGISTER	13		/* Global register reserved to app. */
-
-/* Values for Elf64_Ehdr.e_flags.  */
-
-#define EF_SPARCV9_MM		3
-#define EF_SPARCV9_TSO		0
-#define EF_SPARCV9_PSO		1
-#define EF_SPARCV9_RMO		2
-#define EF_SPARC_LEDATA		0x800000 /* little endian data */
-#define EF_SPARC_EXT_MASK	0xFFFF00
-#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
-#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
-#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
-#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
-
-/* SPARC relocs.  */
-
-#define R_SPARC_NONE	0		/* No reloc */
-#define R_SPARC_8	1		/* Direct 8 bit */
-#define R_SPARC_16	2		/* Direct 16 bit */
-#define R_SPARC_32	3		/* Direct 32 bit */
-#define R_SPARC_DISP8	4		/* PC relative 8 bit */
-#define R_SPARC_DISP16	5		/* PC relative 16 bit */
-#define R_SPARC_DISP32	6		/* PC relative 32 bit */
-#define R_SPARC_WDISP30	7		/* PC relative 30 bit shifted */
-#define R_SPARC_WDISP22	8		/* PC relative 22 bit shifted */
-#define R_SPARC_HI22	9		/* High 22 bit */
-#define R_SPARC_22	10		/* Direct 22 bit */
-#define R_SPARC_13	11		/* Direct 13 bit */
-#define R_SPARC_LO10	12		/* Truncated 10 bit */
-#define R_SPARC_GOT10	13		/* Truncated 10 bit GOT entry */
-#define R_SPARC_GOT13	14		/* 13 bit GOT entry */
-#define R_SPARC_GOT22	15		/* 22 bit GOT entry shifted */
-#define R_SPARC_PC10	16		/* PC relative 10 bit truncated */
-#define R_SPARC_PC22	17		/* PC relative 22 bit shifted */
-#define R_SPARC_WPLT30	18		/* 30 bit PC relative PLT address */
-#define R_SPARC_COPY	19		/* Copy symbol at runtime */
-#define R_SPARC_GLOB_DAT 20		/* Create GOT entry */
-#define R_SPARC_JMP_SLOT 21		/* Create PLT entry */
-#define R_SPARC_RELATIVE 22		/* Adjust by program base */
-#define R_SPARC_UA32	23		/* Direct 32 bit unaligned */
-
-/* Additional Sparc64 relocs.  */
-
-#define R_SPARC_PLT32	24		/* Direct 32 bit ref to PLT entry */
-#define R_SPARC_HIPLT22	25		/* High 22 bit PLT entry */
-#define R_SPARC_LOPLT10	26		/* Truncated 10 bit PLT entry */
-#define R_SPARC_PCPLT32	27		/* PC rel 32 bit ref to PLT entry */
-#define R_SPARC_PCPLT22	28		/* PC rel high 22 bit PLT entry */
-#define R_SPARC_PCPLT10	29		/* PC rel trunc 10 bit PLT entry */
-#define R_SPARC_10	30		/* Direct 10 bit */
-#define R_SPARC_11	31		/* Direct 11 bit */
-#define R_SPARC_64	32		/* Direct 64 bit */
-#define R_SPARC_OLO10	33		/* 10bit with secondary 13bit addend */
-#define R_SPARC_HH22	34		/* Top 22 bits of direct 64 bit */
-#define R_SPARC_HM10	35		/* High middle 10 bits of ... */
-#define R_SPARC_LM22	36		/* Low middle 22 bits of ... */
-#define R_SPARC_PC_HH22	37		/* Top 22 bits of pc rel 64 bit */
-#define R_SPARC_PC_HM10	38		/* High middle 10 bit of ... */
-#define R_SPARC_PC_LM22	39		/* Low miggle 22 bits of ... */
-#define R_SPARC_WDISP16	40		/* PC relative 16 bit shifted */
-#define R_SPARC_WDISP19	41		/* PC relative 19 bit shifted */
-#define R_SPARC_7	43		/* Direct 7 bit */
-#define R_SPARC_5	44		/* Direct 5 bit */
-#define R_SPARC_6	45		/* Direct 6 bit */
-#define R_SPARC_DISP64	46		/* PC relative 64 bit */
-#define R_SPARC_PLT64	47		/* Direct 64 bit ref to PLT entry */
-#define R_SPARC_HIX22	48		/* High 22 bit complemented */
-#define R_SPARC_LOX10	49		/* Truncated 11 bit complemented */
-#define R_SPARC_H44	50		/* Direct high 12 of 44 bit */
-#define R_SPARC_M44	51		/* Direct mid 22 of 44 bit */
-#define R_SPARC_L44	52		/* Direct low 10 of 44 bit */
-#define R_SPARC_REGISTER 53		/* Global register usage */
-#define R_SPARC_UA64	54		/* Direct 64 bit unaligned */
-#define R_SPARC_UA16	55		/* Direct 16 bit unaligned */
-/* Keep this the last entry.  */
-#define R_SPARC_NUM	56
-
-/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
-
-#define DT_SPARC_REGISTER 0x70000001
-#define DT_SPARC_NUM	2
-
-/* Bits present in AT_HWCAP, primarily for Sparc32.  */
-
-#define HWCAP_SPARC_FLUSH	1	/* The cpu supports flush insn.  */
-#define HWCAP_SPARC_STBAR	2
-#define HWCAP_SPARC_SWAP	4
-#define HWCAP_SPARC_MULDIV	8
-#define HWCAP_SPARC_V9		16	/* The cpu is v9, so v8plus is ok.  */
-#define HWCAP_SPARC_ULTRA3	32
-
-/* MIPS R3000 specific definitions.  */
-
-/* Legal values for e_flags field of Elf32_Ehdr.  */
-
-#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
-#define EF_MIPS_PIC	    2		/* Contains PIC code */
-#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
-#define EF_MIPS_XGOT	    8
-#define EF_MIPS_64BIT_WHIRL 16
-#define EF_MIPS_ABI2	    32
-#define EF_MIPS_ABI_ON32    64
-#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
-
-/* Legal values for MIPS architecture level.  */
-
-#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
-#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
-#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
-#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
-#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
-#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
-#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
-
-/* The following are non-official names and should not be used.  */
-
-#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
-#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
-#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
-#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
-#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
-#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
-#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
-
-/* Special section indices.  */
-
-#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
-#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
-#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
-#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
-#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
-
-/* Legal values for sh_type field of Elf32_Shdr.  */
-
-#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
-#define SHT_MIPS_MSYM	       0x70000001
-#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
-#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
-#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
-#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
-#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
-#define SHT_MIPS_PACKAGE       0x70000007
-#define SHT_MIPS_PACKSYM       0x70000008
-#define SHT_MIPS_RELD	       0x70000009
-#define SHT_MIPS_IFACE         0x7000000b
-#define SHT_MIPS_CONTENT       0x7000000c
-#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
-#define SHT_MIPS_SHDR	       0x70000010
-#define SHT_MIPS_FDESC	       0x70000011
-#define SHT_MIPS_EXTSYM	       0x70000012
-#define SHT_MIPS_DENSE	       0x70000013
-#define SHT_MIPS_PDESC	       0x70000014
-#define SHT_MIPS_LOCSYM	       0x70000015
-#define SHT_MIPS_AUXSYM	       0x70000016
-#define SHT_MIPS_OPTSYM	       0x70000017
-#define SHT_MIPS_LOCSTR	       0x70000018
-#define SHT_MIPS_LINE	       0x70000019
-#define SHT_MIPS_RFDESC	       0x7000001a
-#define SHT_MIPS_DELTASYM      0x7000001b
-#define SHT_MIPS_DELTAINST     0x7000001c
-#define SHT_MIPS_DELTACLASS    0x7000001d
-#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
-#define SHT_MIPS_DELTADECL     0x7000001f
-#define SHT_MIPS_SYMBOL_LIB    0x70000020
-#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
-#define SHT_MIPS_TRANSLATE     0x70000022
-#define SHT_MIPS_PIXIE	       0x70000023
-#define SHT_MIPS_XLATE	       0x70000024
-#define SHT_MIPS_XLATE_DEBUG   0x70000025
-#define SHT_MIPS_WHIRL	       0x70000026
-#define SHT_MIPS_EH_REGION     0x70000027
-#define SHT_MIPS_XLATE_OLD     0x70000028
-#define SHT_MIPS_PDR_EXCEPTION 0x70000029
-
-/* Legal values for sh_flags field of Elf32_Shdr.  */
-
-#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
-#define SHF_MIPS_MERGE	 0x20000000
-#define SHF_MIPS_ADDR	 0x40000000
-#define SHF_MIPS_STRINGS 0x80000000
-#define SHF_MIPS_NOSTRIP 0x08000000
-#define SHF_MIPS_LOCAL	 0x04000000
-#define SHF_MIPS_NAMES	 0x02000000
-#define SHF_MIPS_NODUPE	 0x01000000
-
-
-/* Symbol tables.  */
-
-/* MIPS specific values for `st_other'.  */
-#define STO_MIPS_DEFAULT		0x0
-#define STO_MIPS_INTERNAL		0x1
-#define STO_MIPS_HIDDEN			0x2
-#define STO_MIPS_PROTECTED		0x3
-#define STO_MIPS_SC_ALIGN_UNUSED	0xff
-
-/* MIPS specific values for `st_info'.  */
-#define STB_MIPS_SPLIT_COMMON		13
-
-/* Entries found in sections of type SHT_MIPS_GPTAB.  */
-
-typedef union
-{
-  struct
-    {
-      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
-      Elf32_Word gt_unused;		/* Not used */
-    } gt_header;			/* First entry in section */
-  struct
-    {
-      Elf32_Word gt_g_value;		/* If this value were used for -G */
-      Elf32_Word gt_bytes;		/* This many bytes would be used */
-    } gt_entry;				/* Subsequent entries in section */
-} Elf32_gptab;
-
-/* Entry found in sections of type SHT_MIPS_REGINFO.  */
-
-typedef struct
-{
-  Elf32_Word	ri_gprmask;		/* General registers used */
-  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
-  Elf32_Sword	ri_gp_value;		/* $gp register value */
-} Elf32_RegInfo;
-
-/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
-
-typedef struct
-{
-  unsigned char kind;		/* Determines interpretation of the
-				   variable part of descriptor.  */
-  unsigned char size;		/* Size of descriptor, including header.  */
-  Elf32_Section section;	/* Section header index of section affected,
-				   0 for global options.  */
-  Elf32_Word info;		/* Kind-specific information.  */
-} Elf_Options;
-
-/* Values for `kind' field in Elf_Options.  */
-
-#define ODK_NULL	0	/* Undefined.  */
-#define ODK_REGINFO	1	/* Register usage information.  */
-#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
-#define ODK_PAD		3	/* Section padding options.  */
-#define ODK_HWPATCH	4	/* Hardware workarounds performed */
-#define ODK_FILL	5	/* record the fill value used by the linker. */
-#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
-#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
-#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
-
-/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
-
-#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
-#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
-#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
-#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
-#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
-#define OEX_PRECISEFP	OEX_FPDBUG
-#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
-
-#define OEX_FPU_INVAL	0x10
-#define OEX_FPU_DIV0	0x08
-#define OEX_FPU_OFLO	0x04
-#define OEX_FPU_UFLO	0x02
-#define OEX_FPU_INEX	0x01
-
-/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
-
-#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
-#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
-#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
-#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
-
-#define OPAD_PREFIX	0x1
-#define OPAD_POSTFIX	0x2
-#define OPAD_SYMBOL	0x4
-
-/* Entry found in `.options' section.  */
-
-typedef struct
-{
-  Elf32_Word hwp_flags1;	/* Extra flags.  */
-  Elf32_Word hwp_flags2;	/* Extra flags.  */
-} Elf_Options_Hw;
-
-/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
-
-#define OHWA0_R4KEOP_CHECKED	0x00000001
-#define OHWA1_R4KEOP_CLEAN	0x00000002
-
-/* MIPS relocs.  */
-
-#define R_MIPS_NONE		0	/* No reloc */
-#define R_MIPS_16		1	/* Direct 16 bit */
-#define R_MIPS_32		2	/* Direct 32 bit */
-#define R_MIPS_REL32		3	/* PC relative 32 bit */
-#define R_MIPS_26		4	/* Direct 26 bit shifted */
-#define R_MIPS_HI16		5	/* High 16 bit */
-#define R_MIPS_LO16		6	/* Low 16 bit */
-#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
-#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
-#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
-#define R_MIPS_PC16		10	/* PC relative 16 bit */
-#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
-#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
-
-#define R_MIPS_SHIFT5		16
-#define R_MIPS_SHIFT6		17
-#define R_MIPS_64		18
-#define R_MIPS_GOT_DISP		19
-#define R_MIPS_GOT_PAGE		20
-#define R_MIPS_GOT_OFST		21
-#define R_MIPS_GOT_HI16		22
-#define R_MIPS_GOT_LO16		23
-#define R_MIPS_SUB		24
-#define R_MIPS_INSERT_A		25
-#define R_MIPS_INSERT_B		26
-#define R_MIPS_DELETE		27
-#define R_MIPS_HIGHER		28
-#define R_MIPS_HIGHEST		29
-#define R_MIPS_CALL_HI16	30
-#define R_MIPS_CALL_LO16	31
-#define R_MIPS_SCN_DISP		32
-#define R_MIPS_REL16		33
-#define R_MIPS_ADD_IMMEDIATE	34
-#define R_MIPS_PJUMP		35
-#define R_MIPS_RELGOT		36
-#define R_MIPS_JALR		37
-/* Keep this the last entry.  */
-#define R_MIPS_NUM		38
-
-/* Legal values for p_type field of Elf32_Phdr.  */
-
-#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
-#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
-#define PT_MIPS_OPTIONS 0x70000002
-
-/* Special program header types.  */
-
-#define PF_MIPS_LOCAL	0x10000000
-
-/* Legal values for d_tag field of Elf32_Dyn.  */
-
-#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
-#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
-#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
-#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
-#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
-#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
-#define DT_MIPS_MSYM	     0x70000007
-#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
-#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
-#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
-#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
-#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
-#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
-#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
-#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
-#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
-#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
-#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
-#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
-						DT_MIPS_DELTA_CLASS.  */
-#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
-#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
-						DT_MIPS_DELTA_INSTANCE.  */
-#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
-#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
-					     DT_MIPS_DELTA_RELOC.  */
-#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
-					   relocations refer to.  */
-#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
-					   DT_MIPS_DELTA_SYM.  */
-#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
-					     class declaration.  */
-#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
-						DT_MIPS_DELTA_CLASSSYM.  */
-#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
-#define DT_MIPS_PIXIE_INIT   0x70000023
-#define DT_MIPS_SYMBOL_LIB   0x70000024
-#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
-#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
-#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
-#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
-						    function stored in GOT.  */
-#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
-					   by rld on dlopen() calls.  */
-#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
-#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
-#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
-#define DT_MIPS_NUM	     0x32
-
-/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
-
-#define RHF_NONE		   0		/* No flags */
-#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
-#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
-#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
-#define RHF_NO_MOVE		   (1 << 3)
-#define RHF_SGI_ONLY		   (1 << 4)
-#define RHF_GUARANTEE_INIT	   (1 << 5)
-#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
-#define RHF_GUARANTEE_START_INIT   (1 << 7)
-#define RHF_PIXIE		   (1 << 8)
-#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
-#define RHF_REQUICKSTART	   (1 << 10)
-#define RHF_REQUICKSTARTED	   (1 << 11)
-#define RHF_CORD		   (1 << 12)
-#define RHF_NO_UNRES_UNDEF	   (1 << 13)
-#define RHF_RLD_ORDER_SAFE	   (1 << 14)
-
-/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
-
-typedef struct
-{
-  Elf32_Word l_name;		/* Name (string table index) */
-  Elf32_Word l_time_stamp;	/* Timestamp */
-  Elf32_Word l_checksum;	/* Checksum */
-  Elf32_Word l_version;		/* Interface version */
-  Elf32_Word l_flags;		/* Flags */
-} Elf32_Lib;
-
-typedef struct
-{
-  Elf64_Word l_name;		/* Name (string table index) */
-  Elf64_Word l_time_stamp;	/* Timestamp */
-  Elf64_Word l_checksum;	/* Checksum */
-  Elf64_Word l_version;		/* Interface version */
-  Elf64_Word l_flags;		/* Flags */
-} Elf64_Lib;
-
-
-/* Legal values for l_flags.  */
-
-#define LL_NONE		  0
-#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
-#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
-#define LL_REQUIRE_MINOR  (1 << 2)
-#define LL_EXPORTS	  (1 << 3)
-#define LL_DELAY_LOAD	  (1 << 4)
-#define LL_DELTA	  (1 << 5)
-
-/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
-
-typedef Elf32_Addr Elf32_Conflict;
-
-
-/* HPPA specific definitions.  */
-
-/* Legal values for e_flags field of Elf32_Ehdr.  */
-
-#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
-#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
-#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
-#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
-#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
-					      prediction.  */
-#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
-#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
-
-/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
-
-#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
-#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
-#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
-
-/* Additional section indeces.  */
-
-#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
-					      symbols in ANSI C.  */
-#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
-
-/* Legal values for sh_type field of Elf32_Shdr.  */
-
-#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
-#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
-#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
-
-/* Legal values for sh_flags field of Elf32_Shdr.  */
-
-#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
-#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
-#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
-
-#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
-#define STT_HP_STUB		(STT_LOOS + 0x2)
-
-/* HPPA relocs.  */
-
-#define R_PARISC_NONE		0	/* No reloc.  */
-#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
-#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
-#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
-#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
-#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
-#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
-#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
-#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
-#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
-#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
-#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
-#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
-#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
-#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
-#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
-#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
-#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
-#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
-#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
-#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
-#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
-#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
-#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
-#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
-#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
-#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
-#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
-#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
-#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
-#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
-#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
-#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
-#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
-#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
-#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
-#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
-#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
-#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
-#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
-#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
-#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
-#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
-#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
-#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
-#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
-#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
-#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
-#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
-#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
-#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
-#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
-#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
-#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
-#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
-#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
-#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
-#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
-#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LORESERVE	128
-#define R_PARISC_COPY		128	/* Copy relocation.  */
-#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
-#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
-#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
-#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
-#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
-#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
-#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
-#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
-#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
-#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
-#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_HIRESERVE	255
-
-/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
-
-#define PT_HP_TLS		(PT_LOOS + 0x0)
-#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
-#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
-#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
-#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
-#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
-#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
-#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
-#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
-#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
-#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
-#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
-#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
-#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
-#define PT_HP_STACK		(PT_LOOS + 0x14)
-
-#define PT_PARISC_ARCHEXT	0x70000000
-#define PT_PARISC_UNWIND	0x70000001
-
-/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
-
-#define PF_PARISC_SBP		0x08000000
-
-#define PF_HP_PAGE_SIZE		0x00100000
-#define PF_HP_FAR_SHARED	0x00200000
-#define PF_HP_NEAR_SHARED	0x00400000
-#define PF_HP_CODE		0x01000000
-#define PF_HP_MODIFY		0x02000000
-#define PF_HP_LAZYSWAP		0x04000000
-#define PF_HP_SBP		0x08000000
-
-
-/* Alpha specific definitions.  */
-
-/* Legal values for e_flags field of Elf64_Ehdr.  */
-
-#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
-#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
-
-/* Legal values for sh_type field of Elf64_Shdr.  */
-
-/* These two are primerily concerned with ECOFF debugging info.  */
-#define SHT_ALPHA_DEBUG		0x70000001
-#define SHT_ALPHA_REGINFO	0x70000002
-
-/* Legal values for sh_flags field of Elf64_Shdr.  */
-
-#define SHF_ALPHA_GPREL		0x10000000
-
-/* Legal values for st_other field of Elf64_Sym.  */
-#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
-#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
-
-/* Alpha relocs.  */
-
-#define R_ALPHA_NONE		0	/* No reloc */
-#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
-#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
-#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
-#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
-#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
-#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
-#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
-#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
-#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
-#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
-#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
-#define R_ALPHA_OP_PUSH		12	/* OP stack push */
-#define R_ALPHA_OP_STORE	13	/* OP stack pop and store */
-#define R_ALPHA_OP_PSUB		14	/* OP stack subtract */
-#define R_ALPHA_OP_PRSHIFT	15	/* OP stack right shift */
-#define R_ALPHA_GPVALUE		16
-#define R_ALPHA_GPRELHIGH	17
-#define R_ALPHA_GPRELLOW	18
-#define R_ALPHA_IMMED_GP_16	19
-#define R_ALPHA_IMMED_GP_HI32	20
-#define R_ALPHA_IMMED_SCN_HI32	21
-#define R_ALPHA_IMMED_BR_HI32	22
-#define R_ALPHA_IMMED_LO32	23
-#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
-#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
-#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
-#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
-/* Keep this the last entry.  */
-#define R_ALPHA_NUM		28
-
-
-/* PowerPC specific declarations */
-
-/* Values for Elf32/64_Ehdr.e_flags.  */
-#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
-
-/* Cygnus local bits below */
-#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
-#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
-						   flag */
-
-/* PowerPC relocations defined by the ABIs */
-#define R_PPC_NONE		0
-#define R_PPC_ADDR32		1	/* 32bit absolute address */
-#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
-#define R_PPC_ADDR16		3	/* 16bit absolute address */
-#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
-#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
-#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
-#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
-#define R_PPC_ADDR14_BRTAKEN	8
-#define R_PPC_ADDR14_BRNTAKEN	9
-#define R_PPC_REL24		10	/* PC relative 26 bit */
-#define R_PPC_REL14		11	/* PC relative 16 bit */
-#define R_PPC_REL14_BRTAKEN	12
-#define R_PPC_REL14_BRNTAKEN	13
-#define R_PPC_GOT16		14
-#define R_PPC_GOT16_LO		15
-#define R_PPC_GOT16_HI		16
-#define R_PPC_GOT16_HA		17
-#define R_PPC_PLTREL24		18
-#define R_PPC_COPY		19
-#define R_PPC_GLOB_DAT		20
-#define R_PPC_JMP_SLOT		21
-#define R_PPC_RELATIVE		22
-#define R_PPC_LOCAL24PC		23
-#define R_PPC_UADDR32		24
-#define R_PPC_UADDR16		25
-#define R_PPC_REL32		26
-#define R_PPC_PLT32		27
-#define R_PPC_PLTREL32		28
-#define R_PPC_PLT16_LO		29
-#define R_PPC_PLT16_HI		30
-#define R_PPC_PLT16_HA		31
-#define R_PPC_SDAREL16		32
-#define R_PPC_SECTOFF		33
-#define R_PPC_SECTOFF_LO	34
-#define R_PPC_SECTOFF_HI	35
-#define R_PPC_SECTOFF_HA	36
-/* Keep this the last entry.  */
-#define R_PPC_NUM		37
-
-/* The remaining relocs are from the Embedded ELF ABI, and are not
-   in the SVR4 ELF ABI.  */
-#define R_PPC_EMB_NADDR32	101
-#define R_PPC_EMB_NADDR16	102
-#define R_PPC_EMB_NADDR16_LO	103
-#define R_PPC_EMB_NADDR16_HI	104
-#define R_PPC_EMB_NADDR16_HA	105
-#define R_PPC_EMB_SDAI16	106
-#define R_PPC_EMB_SDA2I16	107
-#define R_PPC_EMB_SDA2REL	108
-#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
-#define R_PPC_EMB_MRKREF	110
-#define R_PPC_EMB_RELSEC16	111
-#define R_PPC_EMB_RELST_LO	112
-#define R_PPC_EMB_RELST_HI	113
-#define R_PPC_EMB_RELST_HA	114
-#define R_PPC_EMB_BIT_FLD	115
-#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
-
-/* Diab tool relocations.  */
-#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
-#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
-#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
-#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
-#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
-#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
-
-/* This is a phony reloc to handle any old fashioned TOC16 references
-   that may still be in object files.  */
-#define R_PPC_TOC16		255
-
-
-/* ARM specific declarations */
-
-/* Processor specific flags for the ELF header e_flags field.  */
-#define EF_ARM_RELEXEC     0x01
-#define EF_ARM_HASENTRY    0x02
-#define EF_ARM_INTERWORK   0x04
-#define EF_ARM_APCS_26     0x08
-#define EF_ARM_APCS_FLOAT  0x10
-#define EF_ARM_PIC         0x20
-#define EF_ARM_ALIGN8      0x40		/* 8-bit structure alignment is in use */
-#define EF_ARM_NEW_ABI     0x80
-#define EF_ARM_OLD_ABI     0x100
-
-/* Other constants defined in the ARM ELF spec. version B-01.  */
-/* NB. These conflict with values defined above.  */
-#define EF_ARM_SYMSARESORTED	0x04
-#define EF_ARM_DYNSYMSUSESEGIDX 0x08
-#define EF_ARM_MAPSYMSFIRST	0x10
-#define EF_ARM_EABIMASK		0XFF000000
-
-#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
-#define EF_ARM_EABI_UNKNOWN  0x00000000
-#define EF_ARM_EABI_VER1     0x01000000
-#define EF_ARM_EABI_VER2     0x02000000
-
-/* Additional symbol types for Thumb */
-#define STT_ARM_TFUNC      0xd
-
-/* ARM-specific values for sh_flags */
-#define SHF_ARM_ENTRYSECT  0x10000000   /* Section contains an entry point */
-#define SHF_ARM_COMDEF     0x80000000   /* Section may be multiply defined
-					   in the input to a link step */
-
-/* ARM-specific program header flags */
-#define PF_ARM_SB          0x10000000   /* Segment contains the location
-					   addressed by the static base */
-
-/* ARM relocs.  */
-#define R_ARM_NONE		0	/* No reloc */
-#define R_ARM_PC24		1	/* PC relative 26 bit branch */
-#define R_ARM_ABS32		2	/* Direct 32 bit  */
-#define R_ARM_REL32		3	/* PC relative 32 bit */
-#define R_ARM_PC13		4
-#define R_ARM_ABS16		5	/* Direct 16 bit */
-#define R_ARM_ABS12		6	/* Direct 12 bit */
-#define R_ARM_THM_ABS5		7
-#define R_ARM_ABS8		8	/* Direct 8 bit */
-#define R_ARM_SBREL32		9
-#define R_ARM_THM_PC22		10
-#define R_ARM_THM_PC8		11
-#define R_ARM_AMP_VCALL9	12
-#define R_ARM_SWI24		13
-#define R_ARM_THM_SWI8		14
-#define R_ARM_XPC25		15
-#define R_ARM_THM_XPC22		16
-#define R_ARM_COPY		20	/* Copy symbol at runtime */
-#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
-#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
-#define R_ARM_RELATIVE		23	/* Adjust by program base */
-#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
-#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
-#define R_ARM_GOT32		26	/* 32 bit GOT entry */
-#define R_ARM_PLT32		27	/* 32 bit PLT address */
-#define R_ARM_ALU_PCREL_7_0	32
-#define R_ARM_ALU_PCREL_15_8	33
-#define R_ARM_ALU_PCREL_23_15	34
-#define R_ARM_LDR_SBREL_11_0	35
-#define R_ARM_ALU_SBREL_19_12	36
-#define R_ARM_ALU_SBREL_27_20	37
-#define R_ARM_GNU_VTENTRY	100
-#define R_ARM_GNU_VTINHERIT	101
-#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
-#define R_ARM_THM_PC9		103	/* thumb conditional branch */
-#define R_ARM_RXPC25		249
-#define R_ARM_RSBREL32		250
-#define R_ARM_THM_RPC22		251
-#define R_ARM_RREL32		252
-#define R_ARM_RABS22		253
-#define R_ARM_RPC24		254
-#define R_ARM_RBASE		255
-/* Keep this the last entry.  */
-#define R_ARM_NUM		256
-
-/* IA-64 specific declarations.  */
-
-/* Processor specific flags for the Ehdr e_flags field.  */
-#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
-#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
-#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
-
-/* Processor specific values for the Phdr p_type field.  */
-#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
-#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
-
-/* Processor specific flags for the Phdr p_flags field.  */
-#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
-
-/* Processor specific values for the Shdr sh_type field.  */
-#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
-#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
-
-/* Processor specific flags for the Shdr sh_flags field.  */
-#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
-#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
-
-/* Processor specific values for the Dyn d_tag field.  */
-#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
-#define DT_IA_64_NUM		1
-
-/* IA-64 relocations.  */
-#define R_IA64_NONE		0x00	/* none */
-#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
-#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
-#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
-#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
-#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
-#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
-#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
-#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
-#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
-#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
-#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
-#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
-#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
-#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
-#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
-#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
-#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
-#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
-#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
-#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
-#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
-#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
-#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
-#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
-#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
-#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
-#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
-#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
-#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
-#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
-#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
-#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
-#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
-#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
-#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
-#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
-#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
-#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
-#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
-#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
-#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
-#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
-#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
-#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
-#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
-#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
-#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
-#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
-#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
-#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
-#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
-#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
-#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
-#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
-#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
-#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
-#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
-#define R_IA64_COPY		0x84	/* copy relocation */
-#define R_IA64_SUB		0x85	/* Addend and symbol difference */
-#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
-#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
-#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
-#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
-#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
-#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
-#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
-#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
-#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
-#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
-#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
-#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
-#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
-#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
-#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
-#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
-#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
-
-/* SH specific declarations */
-
-/* SH relocs.  */
-#define	R_SH_NONE		0
-#define	R_SH_DIR32		1
-#define	R_SH_REL32		2
-#define	R_SH_DIR8WPN		3
-#define	R_SH_IND12W		4
-#define	R_SH_DIR8WPL		5
-#define	R_SH_DIR8WPZ		6
-#define	R_SH_DIR8BP		7
-#define	R_SH_DIR8W		8
-#define	R_SH_DIR8L		9
-#define	R_SH_SWITCH16		25
-#define	R_SH_SWITCH32		26
-#define	R_SH_USES		27
-#define	R_SH_COUNT		28
-#define	R_SH_ALIGN		29
-#define	R_SH_CODE		30
-#define	R_SH_DATA		31
-#define	R_SH_LABEL		32
-#define	R_SH_SWITCH8		33
-#define	R_SH_GNU_VTINHERIT	34
-#define	R_SH_GNU_VTENTRY	35
-#define	R_SH_GOT32		160
-#define	R_SH_PLT32		161
-#define	R_SH_COPY		162
-#define	R_SH_GLOB_DAT		163
-#define	R_SH_JMP_SLOT		164
-#define	R_SH_RELATIVE		165
-#define	R_SH_GOTOFF		166
-#define	R_SH_GOTPC		167
-/* Keep this the last entry.  */
-#define	R_SH_NUM		256
-
-/* Additional s390 relocs */
-
-#define R_390_NONE      0              /* No reloc.  */
-#define R_390_8         1              /* Direct 8 bit.  */
-#define R_390_12        2              /* Direct 12 bit.  */
-#define R_390_16        3              /* Direct 16 bit.  */
-#define R_390_32        4              /* Direct 32 bit.  */
-#define R_390_PC32      5              /* PC relative 32 bit.  */
-#define R_390_GOT12     6              /* 12 bit GOT offset.  */
-#define R_390_GOT32     7              /* 32 bit GOT offset.  */
-#define R_390_PLT32     8              /* 32 bit PC relative PLT address.  */
-#define R_390_COPY      9              /* Copy symbol at runtime.  */
-#define R_390_GLOB_DAT  10             /* Create GOT entry.  */
-#define R_390_JMP_SLOT  11             /* Create PLT entry.  */
-#define R_390_RELATIVE  12             /* Adjust by program base.  */
-#define R_390_GOTOFF    13             /* 32 bit offset to GOT.  */
-#define R_390_GOTPC     14             /* 32 bit PC relative offset to GOT.  */
-#define R_390_GOT16     15             /* 16 bit GOT offset.  */
-#define R_390_PC16      16             /* PC relative 16 bit.  */
-#define R_390_PC16DBL   17             /* PC relative 16 bit shifted by 1.  */
-#define R_390_PLT16DBL  18             /* 16 bit PC rel. PLT shifted by 1.  */
-#define R_390_PC32DBL   19             /* PC relative 32 bit shifted by 1.  */
-#define R_390_PLT32DBL  20             /* 32 bit PC rel. PLT shifted by 1.  */
-#define R_390_GOTPCDBL  21             /* 32 bit PC rel. GOT shifted by 1.  */
-#define R_390_64        22             /* Direct 64 bit.  */
-#define R_390_PC64      23             /* PC relative 64 bit.  */
-#define R_390_GOT64     24             /* 64 bit GOT offset.  */
-#define R_390_PLT64     25             /* 64 bit PC relative PLT address.  */
-#define R_390_GOTENT    26             /* 32 bit PC rel. to GOT entry >> 1. */
-
-/* Keep this the last entry.  */
-#define R_390_NUM       19
-
-/* CRIS relocations.  */
-#define R_CRIS_NONE		0
-#define R_CRIS_8		1
-#define R_CRIS_16		2
-#define R_CRIS_32		3
-#define R_CRIS_8_PCREL		4
-#define R_CRIS_16_PCREL		5
-#define R_CRIS_32_PCREL		6
-#define R_CRIS_GNU_VTINHERIT	7
-#define R_CRIS_GNU_VTENTRY	8
-#define R_CRIS_COPY		9
-#define R_CRIS_GLOB_DAT		10
-#define R_CRIS_JUMP_SLOT	11
-#define R_CRIS_RELATIVE		12
-#define R_CRIS_16_GOT		13
-#define R_CRIS_32_GOT		14
-#define R_CRIS_16_GOTPLT	15
-#define R_CRIS_32_GOTPLT	16
-#define R_CRIS_32_GOTREL	17
-#define R_CRIS_32_PLT_GOTREL	18
-#define R_CRIS_32_PLT_PCREL	19
-
-#define R_CRIS_NUM		20
-
-#define R_MICROBLAZE_NONE 		0
-#define R_MICROBLAZE_32 		1
-#define R_MICROBLAZE_32_PCREL 		2
-#define R_MICROBLAZE_64_PCREL 		3
-#define R_MICROBLAZE_32_PCREL_LO 	4
-#define R_MICROBLAZE_64 		5
-#define R_MICROBLAZE_32_LO 		6
-#define R_MICROBLAZE_SRO32 		7
-#define R_MICROBLAZE_SRW32 		8
-#define R_MICROBLAZE_64_NONE 		9
-#define R_MICROBLAZE_32_SYM_OP_SYM 	10
-#define R_MICROBLAZE_GNU_VTINHERIT 	11
-#define R_MICROBLAZE_GNU_VTENTRY 	12
-
-#define R_MICROBLAZE_NUM 		13
-
-/* Altera NIOS specific definitions.  */
-
-#define FLAT_NIOS2_R_32			0 /* Normal 32-bit reloc */
-#define FLAT_NIOS2_R_HI_LO		1
-#define FLAT_NIOS2_R_HIADJ_LO	2
-#define FLAT_NIOS2_R_CALL26		4
-
-/* NIOS relocations. */
-#define R_NIOS_NONE				0
-#define R_NIOS_32				1	/* A 32 bit absolute relocation.*/
-#define R_NIOS_LO16_LO5			2	/* A LO-16 5 bit absolute relocation.  */
-#define R_NIOS_LO16_HI11		3	/* A LO-16 top 11 bit absolute relocation.  */
-#define R_NIOS_HI16_LO5			4	/* A HI-16 5 bit absolute relocation.  */
-#define R_NIOS_HI16_HI11		5	/* A HI-16 top 11 bit absolute relocation.  */
-#define R_NIOS_PCREL6			6	/* A 6 bit relative relocation.  */
-#define R_NIOS_PCREL8			7	/* An 8 bit relative relocation.  */
-#define R_NIOS_PCREL11			8	/* An 11 bit relative relocation.  */
-#define R_NIOS_16				9	/* A 16 bit absolute relocation.  */
-#define R_NIOS_H_LO5			10	/* Low 5-bits of absolute relocation in halfwords.  */
-#define R_NIOS_H_HI11			11	/* Top 11 bits of 16-bit absolute relocation in halfwords.  */
-#define R_NIOS_H_XLO5			12	/* Low 5 bits of top 16-bits of 32-bit absolute relocation in halfwords.  */
-#define R_NIOS_H_XHI11			13	/* Top 11 bits of top 16-bits of 32-bit absolute relocation in halfwords.  */
-#define R_NIOS_H_16				14	/* Half-word @h value */
-#define R_NIOS_H_32				15	/* Word @h value */
-#define R_NIOS_GNU_VTINHERIT	200	/* GNU extension to record C++ vtable hierarchy */
-#define R_NIOS_GNU_VTENTRY		201	/* GNU extension to record C++ vtable member usage */
-/* Keep this the last entry.  */
-#define R_NIOS_NUM				202
-
-/* NIOS II relocations */
-#define R_NIOS2_NONE			0
-#define R_NIOS2_S16				1
-#define R_NIOS2_U16				2
-#define R_NIOS2_PCREL16			3
-#define R_NIOS2_CALL26			4
-#define R_NIOS2_IMM5			5
-#define R_NIOS2_CACHE_OPX 		6
-#define R_NIOS2_IMM6			7
-#define R_NIOS2_IMM8			8
-#define R_NIOS2_HI16			9
-#define R_NIOS2_LO16			10
-#define R_NIOS2_HIADJ16 		11
-#define R_NIOS2_BFD_RELOC_32	12
-#define R_NIOS2_BFD_RELOC_16	13
-#define R_NIOS2_BFD_RELOC_8 	14
-#define R_NIOS2_GPREL			15
-#define R_NIOS2_GNU_VTINHERIT 	16
-#define R_NIOS2_GNU_VTENTRY  	17
-#define R_NIOS2_UJMP			18
-#define R_NIOS2_CJMP			19
-#define R_NIOS2_CALLR			20
-#define R_NIOS2_ALIGN			21
-/* Keep this the last entry.  */
-#define R_NIOS2_NUM				22
-
-#endif	/* elf.h */
diff --git a/package/elf2flt/src/e1-elf2flt.ld b/package/elf2flt/src/e1-elf2flt.ld
deleted file mode 100644
index a88fc4ffeb..0000000000
--- a/package/elf2flt/src/e1-elf2flt.ld
+++ /dev/null
@@ -1,161 +0,0 @@
-
-ENTRY (__start)
-
-MEMORY {
-	flatmem : ORIGIN = 0x0, LENGTH = 0xfffffff
-}
-
-SECTIONS {
-	.G6 (DEFINED(G6Base) ? G6Base : 0x0) : {
-	  *(.G6)
-	}
-	.G7 (DEFINED(G7Base) ? G7Base : 0x0) : {
-	  *(.G7)
-	}
-	.G8 (DEFINED(G8Base) ? G8Base : 0x0) : {
-	  *(.G8)
-	}
-	.G9 (DEFINED(G9Base) ? G9Base : 0) : {
-	  *(.G9)
-	}
-	.G10 (DEFINED(G10Base) ? G10Base : 0) : {
-	  *(.G10)
-	}
-	.G11 (DEFINED(G11Base) ? G11Base : 0) : {
-	  *(.G11)
-	}
-	.G12 (DEFINED(G12Base) ? G12Base : 0) : {
-	  *(.G12)
-	}
-	.G13 (DEFINED(G13Base) ? G13Base : 0) : {
-	  *(.G13)
-	} 
-	.text 0x0 : {
-		. = . + 4;
-		. = ALIGN(0x4) ;
-		_stext = . ;
-		*(.text)
-		*(.text.*)
-		*(.gnu.warning)
-		*(.stub)
-		*(.gnu.linkonce.t*)
-		*(.glue_7t)
-		*(.glue_7)
-		*(.jcr)
-		*(.init)
-		*(.fini)
-
-W_RODAT		*(.rodata)
-W_RODAT		*(.rodata1)
-W_RODAT		*(.rodata.*)
-
-		/* This is special code area at the end of the normal
-		   text section.  It contains a small lookup table at
-		   the start followed by the code pointed to by entries
-		   in the lookup table.  */
-		. = ALIGN (4) ;
-		PROVIDE(__ctbp = .);
-		*(.call_table_data)
-		*(.call_table_text)
-
-		. = ALIGN(0x20) ;
-		_etext = . ;
-	} > flatmem
-	.data : {
-		. = ALIGN(0x4) ;
-		_sdata = . ;
-		__data_start = . ;
-		data_start = . ;
-		*(.got.plt)
-		*(.got)
-		FILL(0) ;
-		. = ALIGN(0x20) ; 
-		LONG(-1)
-		. = ALIGN(0x20) ; 
-R_RODAT		*(.rodata)
-R_RODAT		*(.rodata1)
-R_RODAT		*(.rodata.*)
-		*(.gnu.linkonce.r*)
-		*(.data)
-		*(.data1)
-		*(.data.*)
-		*(.gnu.linkonce.d*)
-		*(.data1)
-		*(.eh_frame)
-		*(.gcc_except_table)
-
-		/* Microblaze has .sdata and .sbss (small bss).  They must
-		   be contiguous, so please don't move any of this. JW */
-		_ssrw = . ;			
-		*(.sdata) 
-		*(.sdata.*)
-		*(.sbss)			/* Don't move this! */
-		_essrw = . ;
-
-		_ssrw_size = _essrw - _ssrw;
-		PROVIDE(_SDA_BASE_ = _ssrw + (_ssrw_size / 2));
-
-		*(.gnu.linkonce.s.*)
-		*(__libc_atexit)
-		*(__libc_subinit)
-		*(__libc_subfreeres)
-		*(.note.ABI-tag)
-
-		/* microblaze-specific read-only small data area
-		   and associated locating symbols */
-		_ssro = . ;
-		*(.sdata2)
-		_essro = . ;
-		_ssro_size = _essro - _ssro;
-		PROVIDE(_SDA2_BASE_ = _ssro + (_ssro_size / 2));
-
-		. = ALIGN(4) ;
-		__CTOR_LIST__ = .;
-		LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
-		*(.ctors)
-		LONG(0)
-		__CTOR_END__ = .;
-		__DTOR_LIST__ = .;
-		LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
-		*(.dtors)
-		LONG(0)
-		__DTOR_END__ = .;
-
-		. = ALIGN(0x10) ; 
-		_edata = . ;
-	} > flatmem
-	.bss : {
-		. = ALIGN(0x4) ;
-		_sbss = ALIGN(0x4) ;
-		__bss_start = . ;
-		*(.dynsbss)
-		*(.sbss)
-		*(.sbss.*)
-		*(.scommon)
-		*(.dynbss)
-		*(.bss)
-		*(.bss.*)
-		*(.bss*)
-		*(.gnu.linkonce.b*)
-		*(COMMON)
-		. = ALIGN(0x10) ;
-		_ebss = . ;
-		_end = . ;
-		end = . ;
-	} > flatmem
-
-	.junk 0 : { *(.rel*) *(.rela*) }
-	/* Stabs debugging sections.    */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}
diff --git a/package/elf2flt/src/elf2flt.c b/package/elf2flt/src/elf2flt.c
deleted file mode 100644
index 65a116c6c5..0000000000
--- a/package/elf2flt/src/elf2flt.c
+++ /dev/null
@@ -1,2152 +0,0 @@
-/*
- * elf2flt.c: Convert ELF (or any BFD format) to FLAT binary format
- *
- * (c) 1999-2002, Greg Ungerer <gerg@snapgear.com>
- * Created elf2flt from coff2flt (see copyrights below). Added all the
- * ELF format file handling. Extended relocation support for all of
- * text and data.
- *
- * (c) 2006  Support the -a (use_resolved) option for TARGET_arm.
- *           Shaun Jackman <sjackman@gmail.com>
- * (c) 2004, Nios II support, Wentao Xu <wentao@microtronix.com>
- * (c) 2003, H8 support, ktrace <davidm@snapgear.com>
- * (c) 2003-2004, MicroBlaze support, John Williams <jwilliams@itee.uq.edu.au>
- * (c) 2001-2003, arm/arm-pic/arm-big-endian support <davidm@snapgear.com>
- * (c) 2001, v850 changes, Mile Bader <miles@lsi.nec.co.jp>
- * (c) 2003, SuperH support, Paul Mundt <lethal@linux-sh.org>
- * (c) 2001, zflat support <davidm@snapgear.com>
- * (c) 2001, Changes for GOT entries Paul Dale <pauli@snapgear.com> and
- *           David McCullough <davidm@snapgear.com>
- *
- * Now supports PIC with GOT tables.  This works by taking a '.elf' file
- * and a fully linked elf executable (at address 0) and produces a flat
- * file that can be loaded with some fixups.  It still supports the old
- * style fully relocatable elf format files.
- *
- * Originally obj-res.c
- *
- * (c) 1998, Kenneth Albanowski <kjahds@kjahds.com>
- * (c) 1998, D. Jeff Dionne
- * (c) 1998, The Silver Hammer Group Ltd.
- * (c) 1996, 1997 Dionne & Associates <jeff@ryeham.ee.ryerson.ca>
- *
- * This is Free Software, under the GNU Public Licence v2 or greater.
- *
- * Relocation added March 1997, Kresten Krab Thorup 
- * krab@california.daimi.aau.dk
- */
- 
-#include <stdio.h>    /* Userland pieces of the ANSI C standard I/O package  */
-#include <stdlib.h>   /* Userland prototypes of the ANSI C std lib functions */
-#include <stdarg.h>   /* Allows va_list to exist in the these namespaces     */
-#include <string.h>   /* Userland prototypes of the string handling funcs    */
-#include <strings.h>
-#include <unistd.h>   /* Userland prototypes of the Unix std system calls    */
-#include <fcntl.h>    /* Flag value for file handling functions              */
-#include <time.h>
-#ifndef WIN32
-#include <netinet/in.h> /* Consts and structs defined by the internet system */
-#define	BINARY_FILE_OPTS
-#else
-#include <winsock2.h>
-#define	BINARY_FILE_OPTS "b"
-#endif
-
-/* from $(INSTALLDIR)/include       */
-#include <bfd.h>      /* Main header file for the BFD library                */
-
-#if defined(TARGET_h8300)
-#include <elf/h8.h>      /* TARGET_* ELF support for the BFD library            */
-#elif defined(__CYGWIN__) || defined(__MINGW32__) || defined(TARGET_nios) || defined(TARGET_nios2)
-#include "cygwin-elf.h"	/* Cygwin uses a local copy */
-#elif defined(TARGET_microblaze)
-#include <elf/microblaze.h>	/* TARGET_* ELF support for the BFD library */
-#elif defined(TARGET_bfin)
-#include "elf/bfin.h"
-#else
-#include <elf.h>      /* TARGET_* ELF support for the BFD library            */
-#endif
-
-#if defined(__MINGW32__)
-#include <getopt.h>
-#endif
-
-/* from uClinux-x.x.x/include/linux */
-#include "flat.h"     /* Binary flat header description                      */
-
-#ifdef TARGET_e1
-#include <e1.h>
-#endif
-
-#ifdef TARGET_v850e
-#define TARGET_v850
-#endif
-
-#if defined(TARGET_m68k)
-#define	ARCH	"m68k/coldfire"
-#elif defined(TARGET_arm)
-#define	ARCH	"arm"
-#elif defined(TARGET_sparc)
-#define	ARCH	"sparc"
-#elif defined(TARGET_v850)
-#define	ARCH	"v850"
-#elif defined(TARGET_sh)
-#define	ARCH	"sh"
-#elif defined(TARGET_h8300)
-#define	ARCH	"h8300"
-#elif defined(TARGET_microblaze)
-#define ARCH	"microblaze"
-#elif defined(TARGET_e1)
-#define ARCH    "e1-coff"
-#elif defined(TARGET_bfin)
-#define ARCH	"bfin"
-#define FLAT_RELOC_TYPE_TEXT 0
-#define FLAT_RELOC_TYPE_DATA 1
-#define FLAT_RELOC_TYPE_BSS 2
-#define FLAT_RELOC_TYPE_STACK 3
-#define FLAT_RELOC_PART_LO 0
-#define FLAT_RELOC_PART_HI 1
-#define PCREL24_MAGIC_OFFSET -1
-#elif defined(TARGET_nios)
-#define ARCH	"nios"
-#elif defined(TARGET_nios2)
-#define ARCH	"nios2"
-#else
-#error "Don't know how to support your CPU architecture??"
-#endif
-
-#if defined(TARGET_m68k) || defined(TARGET_h8300) || defined(TARGET_bfin)
-/*
- * Define a maximum number of bytes allowed in the offset table.
- * We'll fail if the table is larger than this.
- *
- * This limit may be different for platforms other than m68k, but
- * 8000 entries is a lot,  trust me :-) (davidm)
- */
-#define GOT_LIMIT 32767
-/*
- * we have to mask out the shared library id here and there,  this gives
- * us the real address bits when needed
- */
-#define	real_address_bits(x)	(pic_with_got ? ((x) & 0xffffff) : (x))
-#else
-#define	real_address_bits(x)	(x)
-#endif
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-
-int verbose = 0;      /* extra output when running */
-int pic_with_got = 0; /* do elf/got processing with PIC code */
-int load_to_ram = 0;  /* instruct loader to allocate everything into RAM */
-int ktrace = 0;       /* instruct loader output kernel trace on load */
-int compress = 0;     /* 1 = compress everything, 2 = compress data only */
-int use_resolved = 0; /* If true, get the value of symbol references from */
-		      /* the program contents, not from the relocation table. */
-		      /* In this case, the input ELF file must be already */
-		      /* fully resolved (using the `-q' flag with recent */
-		      /* versions of GNU ld will give you a fully resolved */
-		      /* output file with relocation entries).  */
-
-const char *progname, *filename;
-int lineno;
-
-int nerrors = 0;
-int nwarnings = 0;
-
-static char where[200];
-
-enum {
-  /* Use exactly one of these: */
-  E_NOFILE = 0,         /* "progname: " */
-  E_FILE = 1,           /* "filename: " */
-  E_FILELINE = 2,       /* "filename:lineno: " */
-  E_FILEWHERE = 3,      /* "filename:%s: " -- set %s with ewhere() */
-          
-  /* Add in any of these with |': */
-  E_WARNING = 0x10,
-  E_PERROR = 0x20
-};
-                  
-void ewhere (const char *format, ...);
-void einfo (int type, const char *format, ...);
-                  
-
-void
-ewhere (const char *format, ...) {
-  va_list args;
-  va_start (args, format);
-  vsprintf (where, format, args);
-  va_end (args);
-}
-
-
-void
-einfo (int type, const char *format, ...) {
-  va_list args;
-
-  switch (type & 0x0f) {
-  case E_NOFILE:
-    fprintf (stderr, "%s: ", progname);
-    break;
-  case E_FILE:
-    fprintf (stderr, "%s: ", filename);
-    break;
-  case E_FILELINE:
-    ewhere ("%d", lineno);
-    /* fall-through */
-  case E_FILEWHERE:
-    fprintf (stderr, "%s:%s: ", filename, where);
-    break;
-  }
-
-  if (type & E_WARNING) {
-    fprintf (stderr, "warning: ");
-    nwarnings++;
-  } else {
-    nerrors++;
-  }
-
-  va_start (args, format);
-  vfprintf (stderr, format, args);
-  va_end (args);
-
-  if (type & E_PERROR)
-    perror ("");
-  else
-    fprintf (stderr, "\n");
-}
-
-
-asymbol**
-get_symbols (bfd *abfd, long *num)
-{
-  long storage_needed;
-  asymbol **symbol_table;
-  long number_of_symbols;
-  
-  storage_needed = bfd_get_symtab_upper_bound (abfd);
-	  
-  if (storage_needed < 0)
-    abort ();
-      
-  if (storage_needed == 0)
-    return NULL;
-
-  symbol_table = (asymbol **) malloc (storage_needed);
-
-  number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
-  
-  if (number_of_symbols < 0) 
-    abort ();
-
-  *num = number_of_symbols;
-  return symbol_table;
-}
-
-
-
-int
-dump_symbols(asymbol **symbol_table, long number_of_symbols)
-{
-  long i;
-  printf("SYMBOL TABLE:\n");
-  for (i=0; i<number_of_symbols; i++) {
-	printf("  NAME=%s  VALUE=0x%x\n", symbol_table[i]->name,
-		symbol_table[i]->value);
-  }
-  printf("\n");
-  return(0);
-}  
-
-
-
-long
-get_symbol_offset(char *name, asection *sec, asymbol **symbol_table, long number_of_symbols)
-{
-  long i;
-  for (i=0; i<number_of_symbols; i++) {
-    if (symbol_table[i]->section == sec) {
-      if (!strcmp(symbol_table[i]->name, name)) {
-        return symbol_table[i]->value;
-      }
-    }
-  }
-  return -1;
-}  
-
-
-
-long
-get_gp_value(asymbol **symbol_table, long number_of_symbols)
-{
-  long i;
-  for (i=0; i<number_of_symbols; i++) {
-      if (!strcmp(symbol_table[i]->name, "_gp"))
-		return symbol_table[i]->value;
-  }
-  return -1;
-}
- 
-
-
-long
-add_com_to_bss(asymbol **symbol_table, long number_of_symbols, long bss_len)
-{
-  long i, comsize;
-  long offset;
-
-  comsize = 0;
-  for (i=0; i<number_of_symbols; i++) {
-    if (strcmp("*COM*", symbol_table[i]->section->name) == 0) {
-      offset = bss_len + comsize;
-      comsize += symbol_table[i]->value;
-      symbol_table[i]->value = offset;
-    }
-  }
-  return comsize;
-}  
-
-#ifdef TARGET_bfin
-/* FUNCTION : weak_und_symbol
-   ABSTRACT : return true if symbol is weak and undefined.
-*/
-static int
-weak_und_symbol(const char *reloc_section_name,
-                struct bfd_symbol *symbol)
-{
-    if (!(strstr (reloc_section_name, "text")
-	  || strstr (reloc_section_name, "data")
-	  || strstr (reloc_section_name, "bss"))) {
-	if (symbol->flags & BSF_WEAK) {
-#ifdef DEBUG_BFIN
-	    fprintf(stderr, "found weak undefined symbol %s\n", symbol->name);
-#endif
-	    return TRUE;
-	}
-    }
-    return FALSE;
-}
-
-static int
-bfin_set_reloc (uint32_t *reloc, 
-		const char *reloc_section_name, 
-		const char *sym_name,
-		struct bfd_symbol *symbol,
-		int sp, int hilo, int32_t offset)
-{
-    unsigned int type;
-    uint32_t val;
-
-    if (strstr (reloc_section_name, "text"))
-	type = FLAT_RELOC_TYPE_TEXT;
-    else if (strstr (reloc_section_name, "data"))
-	type = FLAT_RELOC_TYPE_DATA;
-    else if (strstr (reloc_section_name, "bss"))
-	type = FLAT_RELOC_TYPE_BSS;
-    else if (strstr (reloc_section_name, "stack"))
-	type = FLAT_RELOC_TYPE_STACK;
-    else if (symbol->flags & BSF_WEAK){
-	/* weak symbol support ... if a weak symbol is undefined at the
-	   end of a final link, it should return 0 rather than error
-	   We will assume text section for the moment.
-	*/
-	type = FLAT_RELOC_TYPE_TEXT;
-    } else if (strstr (reloc_section_name, "*ABS*")){
-	/* (A data section initialization of something in the shared libc's text section
-	   does not resolve - i.e. a global pointer to function initialized with
-	   a libc function).
-	   The text section here is appropriate as the section information
-	   of the shared library is lost. The loader will do some calcs.
-	*/
-	type = FLAT_RELOC_TYPE_TEXT;
-    } else {
-	printf ("Unknown Type - relocation for %s in bad section - %s\n", sym_name, reloc_section_name);
-	return 1;
-    }
-
-    val = (offset & ((1 << 26) - 1)) << 6;
-    val |= (sp & (1 << 3) - 1) << 3;
-    val |= (hilo & 1) << 2;
-    val |= (type & (1 << 2) - 1);
-    *reloc = val;
-    return 0;
-}
-#endif
-
-
-uint32_t *
-output_relocs (
-  bfd *abs_bfd,
-  asymbol **symbols,
-  int number_of_symbols,
-  unsigned long *n_relocs,
-  unsigned char *text, int text_len, unsigned long text_vma,
-  unsigned char *data, int data_len, unsigned long data_vma,
-  bfd *rel_bfd)
-{
-  uint32_t		*flat_relocs;
-  asection		*a, *sym_section, *r;
-  arelent		**relpp, **p, *q;
-  const char		*sym_name, *section_name;
-  unsigned char		*sectionp;
-  unsigned long		pflags;
-  char			addstr[16];
-  long			sym_addr, sym_vma, section_vma;
-  int			relsize, relcount;
-  int			flat_reloc_count;
-  int			sym_reloc_size, rc;
-  int			got_size = 0;
-  int			bad_relocs = 0;
-  asymbol		**symb;
-  long			nsymb;
-  
-#if 0
-  printf("%s(%d): output_relocs(abs_bfd=%d,synbols=0x%x,number_of_symbols=%d"
-	"n_relocs=0x%x,text=0x%x,text_len=%d,data=0x%x,data_len=%d)\n",
-	__FILE__, __LINE__, abs_bfd, symbols, number_of_symbols, n_relocs,
-	text, text_len, data, data_len);
-#endif
-
-#if 0
-dump_symbols(symbols, number_of_symbols);
-#endif
-
-  *n_relocs = 0;
-  flat_relocs = NULL;
-  flat_reloc_count = 0;
-  rc = 0;
-  pflags = 0;
-
-  /* Determine how big our offset table is in bytes.
-   * This isn't too difficult as we've terminated the table with -1.
-   * Also note that both the relocatable and absolute versions have this
-   * terminator even though the relocatable one doesn't have the GOT!
-   */
-  if (pic_with_got && !use_resolved) {
-    unsigned long *lp = (unsigned long *)data;
-    /* Should call ntohl(*lp) here but is isn't going to matter */
-    while (*lp != 0xffffffff) lp++;
-    got_size = ((unsigned char *)lp) - data;
-    if (verbose)
-	    printf("GOT table contains %d entries (%d bytes)\n",
-			    got_size/sizeof(unsigned long), got_size);
-#ifdef TARGET_m68k
-    if (got_size > GOT_LIMIT) {
-	    fprintf(stderr, "GOT too large: %d bytes (limit = %d bytes)\n",
-			    got_size, GOT_LIMIT);
-	    exit(1);
-    }
-#endif
-  }
-
-  for (a = abs_bfd->sections; (a != (asection *) NULL); a = a->next) {
-  	section_vma = bfd_section_vma(abs_bfd, a);
-
-	if (verbose)
-		printf("SECTION: %s [0x%x]: flags=0x%x vma=0x%x\n", a->name, a,
-			a->flags, section_vma);
-
-//	if (bfd_is_abs_section(a))
-//		continue;
-	if (bfd_is_und_section(a))
-		continue;
-	if (bfd_is_com_section(a))
-		continue;
-//	if ((a->flags & SEC_RELOC) == 0)
-//		continue;
-
-	/*
-	 *	Only relocate things in the data sections if we are PIC/GOT.
-	 *	otherwise do text as well
-	 */
-	if (!pic_with_got && (a->flags & SEC_CODE))
-		sectionp = text + (a->vma - text_vma);
-	else if (a->flags & SEC_DATA)
-		sectionp = data + (a->vma - data_vma);
-	else
-		continue;
-
-	/* Now search for the equivalent section in the relocation binary
-	 * and use that relocation information to build reloc entries
-	 * for this one.
-	 */
-	for (r=rel_bfd->sections; r != NULL; r=r->next)
-		if (strcmp(a->name, r->name) == 0)
-			break;
-	if (r == NULL)
-	  continue;
-	if (verbose)
-	  printf(" RELOCS: %s [0x%x]: flags=0x%x vma=0x%x\n", r->name, r,
-			r->flags, bfd_section_vma(abs_bfd, r));
-  	if ((r->flags & SEC_RELOC) == 0)
-  	  continue;
-	relsize = bfd_get_reloc_upper_bound(rel_bfd, r);
-	if (relsize <= 0) {
-		if (verbose)
-			printf("%s(%d): no relocation entries section=0x%x\n",
-				__FILE__, __LINE__, r->name);
-		continue;
-	}
-
-	symb = get_symbols(rel_bfd, &nsymb);
-	relpp = (arelent **) xmalloc(relsize);
-	relcount = bfd_canonicalize_reloc(rel_bfd, r, relpp, symb);
-	if (relcount <= 0) {
-		if (verbose)
-			printf("%s(%d): no relocation entries section=%s\n",
-			__FILE__, __LINE__, r->name);
-		continue;
-	} else {
-		for (p = relpp; (relcount && (*p != NULL)); p++, relcount--) {
-			unsigned char *r_mem;
-			int relocation_needed = 0;
-
-#ifdef TARGET_microblaze
-			/* The MICROBLAZE_XX_NONE relocs can be skipped.
-			   They represent PC relative branches that the
-			   linker has already resolved */
-				
-			switch ((*p)->howto->type) 
-			{
-			case R_MICROBLAZE_NONE:
-			case R_MICROBLAZE_64_NONE:
-				continue;
-			}
-#endif /* TARGET_microblaze */
-
-#ifdef TARGET_v850
-			/* Skip this relocation entirely if possible (we
-			   do this early, before doing any other
-			   processing on it).  */
-			switch ((*p)->howto->type) {
-#ifdef R_V850_9_PCREL
-			case R_V850_9_PCREL:
-#endif
-#ifdef R_V850_22_PCREL
-			case R_V850_22_PCREL:
-#endif
-#ifdef R_V850_SDA_16_16_OFFSET
-			case R_V850_SDA_16_16_OFFSET:
-#endif
-#ifdef R_V850_SDA_15_16_OFFSET
-			case R_V850_SDA_15_16_OFFSET:
-#endif
-#ifdef R_V850_ZDA_15_16_OFFSET
-			case R_V850_ZDA_15_16_OFFSET:
-#endif
-#ifdef R_V850_TDA_6_8_OFFSET
-			case R_V850_TDA_6_8_OFFSET:
-#endif
-#ifdef R_V850_TDA_7_8_OFFSET
-			case R_V850_TDA_7_8_OFFSET:
-#endif
-#ifdef R_V850_TDA_7_7_OFFSET
-			case R_V850_TDA_7_7_OFFSET:
-#endif
-#ifdef R_V850_TDA_16_16_OFFSET
-			case R_V850_TDA_16_16_OFFSET:
-#endif
-#ifdef R_V850_TDA_4_5_OFFSET
-			case R_V850_TDA_4_5_OFFSET:
-#endif
-#ifdef R_V850_TDA_4_4_OFFSET
-			case R_V850_TDA_4_4_OFFSET:
-#endif
-#ifdef R_V850_SDA_16_16_SPLIT_OFFSET
-			case R_V850_SDA_16_16_SPLIT_OFFSET:
-#endif
-#ifdef R_V850_CALLT_6_7_OFFSET
-			case R_V850_CALLT_6_7_OFFSET:
-#endif
-#ifdef R_V850_CALLT_16_16_OFFSET
-			case R_V850_CALLT_16_16_OFFSET:
-#endif
-				/* These are relative relocations, which
-				   have already been fixed up by the
-				   linker at this point, so just ignore
-				   them.  */ 
-				continue;
-			}
-#endif /* USE_V850_RELOCS */
-
-			q = *p;
-			if (q->sym_ptr_ptr && *q->sym_ptr_ptr) {
-				sym_name = (*(q->sym_ptr_ptr))->name;
-				sym_section = (*(q->sym_ptr_ptr))->section;
-				section_name=(*(q->sym_ptr_ptr))->section->name;
-			} else {
-				printf("ERROR: undefined relocation entry\n");
-				rc = -1;
-				continue;
-			}
-#ifndef TARGET_bfin
-			/* Adjust the address to account for the GOT table which wasn't
-			 * present in the relative file link.
-			 */
-			if (pic_with_got && !use_resolved)
-			  q->address += got_size;
-#endif
-
-			/* A pointer to what's being relocated, used often
-			   below.  */
-			r_mem = sectionp + q->address;
-
-			/*
-			 *	Fixup offset in the actual section.
-			 */
-			addstr[0] = 0;
-#ifndef TARGET_e1
-  			if ((sym_addr = get_symbol_offset((char *) sym_name,
-			    sym_section, symbols, number_of_symbols)) == -1) {
-				sym_addr = 0;
-			}
-#else
-			sym_addr = (*(q->sym_ptr_ptr))->value;
-#endif			
-			if (use_resolved) {
-				/* Use the address of the symbol already in
-				   the program text.  How this is handled may
-				   still depend on the particular relocation
-				   though.  */
-				switch (q->howto->type) {
-					int r2_type;
-#ifdef TARGET_v850
-				case R_V850_HI16_S:
-					/* We specially handle adjacent
-					   HI16_S/ZDA_15_16_OFFSET and
-					   HI16_S/LO16 pairs that reference the
-					   same address (these are usually
-					   movhi/ld and movhi/movea pairs,
-					   respectively).  */
-					if (relcount == 0)
-						r2_type = R_V850_NONE;
-					else
-						r2_type = p[1]->howto->type;
-					if ((r2_type == R_V850_ZDA_15_16_OFFSET
-					     || r2_type == R_V850_LO16)
-					    && (p[0]->sym_ptr_ptr
-						== p[1]->sym_ptr_ptr)
-					    && (p[0]->addend == p[1]->addend))
-					{
-						relocation_needed = 1;
-
-						switch (r2_type) {
-						case R_V850_ZDA_15_16_OFFSET:
-							pflags = 0x10000000;
-							break;
-						case R_V850_LO16:
-							pflags = 0x20000000;
-							break;
-						}
-
-						/* We don't really need the
-						   actual value -- the bits
-						   produced by the linker are
-						   what we want in the final
-						   flat file -- but get it
-						   anyway if useful for
-						   debugging.  */
-						if (verbose) {
-							unsigned char *r2_mem =
-								sectionp
-								+ p[1]->address;
-							/* little-endian */
-							int hi = r_mem[0]
-								+ (r_mem[1] << 8);
-							int lo = r2_mem[0]
-								+ (r2_mem[1] << 8);
-							/* Sign extend LO.  */
-							lo = (lo ^ 0x8000)
-								- 0x8000;
-
-							/* Maybe ignore the LSB
-							   of LO, which is
-							   actually part of the
-							   instruction.  */
-							if (r2_type != R_V850_LO16)
-								lo &= ~1;
-
-							sym_addr =
-								(hi << 16)
-								+ lo;
-						}
-					} else
-						goto bad_resolved_reloc;
-					break;
-
-				case R_V850_LO16:
-					/* See if this is actually the
-					   2nd half of a pair.  */
-					if (p > relpp
-					    && (p[-1]->howto->type
-						== R_V850_HI16_S)
-					    && (p[-1]->sym_ptr_ptr
-						== p[0]->sym_ptr_ptr)
-					    && (p[-1]->addend == p[0]->addend))
-						break; /* not an error */
-					else
-						goto bad_resolved_reloc;
-
-				case R_V850_HI16:
-					goto bad_resolved_reloc;
-				default:
-					goto good_32bit_resolved_reloc;
-#elif defined(TARGET_arm)
-				case R_ARM_ABS32:
-					relocation_needed = 1;
-					break;
-				case R_ARM_REL32:
-				case R_ARM_THM_PC11:
-				case R_ARM_THM_PC22:
-					relocation_needed = 0;
-					break;
-				default:
-					goto bad_resolved_reloc;
-#elif defined(TARGET_m68k)
-				case R_68K_32:
-					goto good_32bit_resolved_reloc;
-				case R_68K_PC32:
-				case R_68K_PC16:
-					/* The linker has already resolved
-					   PC relocs for us.  In PIC links,
-					   the symbol must be in the data
-					   segment.  */
-				case R_68K_NONE:
-					continue;
-				default:
-					goto bad_resolved_reloc;
-#else
-				default:
-					/* The default is to assume that the
-					   relocation is relative and has
-					   already been fixed up by the
-					   linker (perhaps we ought to make
-					   give an error by default, and
-					   require `safe' relocations to be
-					   enumberated explicitly?).  */
-					goto good_32bit_resolved_reloc;
-#endif
-				good_32bit_resolved_reloc:
-					if (bfd_big_endian (abs_bfd))
-						sym_addr =
-							(r_mem[0] << 24)
-							+ (r_mem[1] << 16)
-							+ (r_mem[2] << 8) 
-							+ r_mem[3];
-					else
-						sym_addr =
-							r_mem[0]
-							+ (r_mem[1] << 8)
-							+ (r_mem[2] << 16)
-							+ (r_mem[3] << 24);
-					relocation_needed = 1;
-					break;
-
-				bad_resolved_reloc:
-					printf("ERROR: reloc type %s unsupported in this context\n",
-					       q->howto->name);
-					bad_relocs++;
-					break;
-				}
-			} else {
-				/* Calculate the sym address ourselves.  */
-				sym_reloc_size = bfd_get_reloc_size(q->howto);
-
-#if !defined(TARGET_h8300) && !defined(TARGET_e1) && !defined(TARGET_bfin) && !defined(TARGET_m68k)
-				if (sym_reloc_size != 4) {
-					printf("ERROR: bad reloc type %d size=%d for symbol=%s\n",
-							(*p)->howto->type, sym_reloc_size, sym_name);
-					bad_relocs++;
-					rc = -1;
-					continue;
-				}
-#endif
-
-				switch ((*p)->howto->type) {
-
-#if defined(TARGET_m68k)
-				case R_68K_32:
-					relocation_needed = 1;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-				case R_68K_PC16:
-				case R_68K_PC32:
-					sym_vma = 0;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= q->address;
-					break;
-#endif
-
-#if defined(TARGET_arm)
-				case R_ARM_ABS32:
-					relocation_needed = 1;
-					if (verbose)
-						fprintf(stderr,
-							"%s vma=0x%x, value=0x%x, address=0x%x "
-							"sym_addr=0x%x rs=0x%x, opcode=0x%x\n",
-							"ABS32",
-							sym_vma, (*(q->sym_ptr_ptr))->value,
-							q->address, sym_addr,
-							(*p)->howto->rightshift,
-							*(unsigned long *)r_mem);
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-				case R_ARM_GOT32:
-				case R_ARM_GOTPC:
-					/* Should be fine as is */
-					break;
-				case R_ARM_PLT32:
-					if (verbose)
-						fprintf(stderr,
-							"%s vma=0x%x, value=0x%x, address=0x%x "
-							"sym_addr=0x%x rs=0x%x, opcode=0x%x\n",
-							"PLT32",
-							sym_vma, (*(q->sym_ptr_ptr))->value,
-							q->address, sym_addr,
-							(*p)->howto->rightshift,
-							*(unsigned long *)r_mem);
-				case R_ARM_PC24:
-					sym_vma = 0;
-					sym_addr = (sym_addr-q->address)>>(*p)->howto->rightshift;
-					break;
-#endif
-
-#ifdef TARGET_v850
-				case R_V850_32:
-					relocation_needed = 1;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-#if defined(R_V850_ZDA_16_16_OFFSET) || defined(R_V850_ZDA_16_16_SPLIT_OFFSET)
-#ifdef R_V850_ZDA_16_16_OFFSET
-				case R_V850_ZDA_16_16_OFFSET:
-#endif
-#ifdef R_V850_ZDA_16_16_SPLIT_OFFSET
-				case R_V850_ZDA_16_16_SPLIT_OFFSET:
-#endif
-					/* Can't support zero-relocations.  */
-					printf ("ERROR: %s+0x%x: zero relocations not supported\n",
-							sym_name, q->addend);
-					continue;
-#endif /* R_V850_ZDA_16_16_OFFSET || R_V850_ZDA_16_16_SPLIT_OFFSET */
-#endif /* TARGET_v850 */
-
-#ifdef TARGET_h8300
-				case R_H8_DIR24R8:
-					if (sym_reloc_size != 4) {
-						printf("R_H8_DIR24R8 size %d\n", sym_reloc_size);
-						bad_relocs++;
-						continue;
-					}
-					relocation_needed = 1;
-					sym_addr = (*(q->sym_ptr_ptr))->value;
-					q->address -= 1;
-					r_mem -= 1; /* tracks q->address */
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					sym_addr |= (*(unsigned char *)r_mem<<24);
-					break;
-				case R_H8_DIR24A8:
-					if (sym_reloc_size != 4) {
-						printf("R_H8_DIR24A8 size %d\n", sym_reloc_size);
-						bad_relocs++;
-						continue;
-					}
-					/* Absolute symbol done not relocation */
-					relocation_needed = !bfd_is_abs_section(sym_section);
-					sym_addr = (*(q->sym_ptr_ptr))->value;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-				case R_H8_DIR32:
-				case R_H8_DIR32A16: /* currently 32,  could be made 16 */
-					if (sym_reloc_size != 4) {
-						printf("R_H8_DIR32 size %d\n", sym_reloc_size);
-						bad_relocs++;
-						continue;
-					}
-					relocation_needed = 1;
-					sym_addr = (*(q->sym_ptr_ptr))->value;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-				case R_H8_PCREL16:
-					sym_vma = 0;
-					sym_addr = (*(q->sym_ptr_ptr))->value;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= (q->address + 2);
-					if (bfd_big_endian(abs_bfd))
-					*(unsigned short *)r_mem =
-						bfd_big_endian(abs_bfd) ? htons(sym_addr) : sym_addr;
-					continue;
-				case R_H8_PCREL8:
-					sym_vma = 0;
-					sym_addr = (*(q->sym_ptr_ptr))->value;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= (q->address + 1);
-					*(unsigned char *)r_mem = sym_addr;
-					continue;
-#endif
-
-#ifdef TARGET_microblaze
-				case R_MICROBLAZE_64:
-		/* The symbol is split over two consecutive instructions.  
-		   Flag this to the flat loader by setting the high bit of 
-		   the relocation symbol. */
-				{
-					unsigned char *p = r_mem;
-					unsigned long offset;
-					pflags=0x80000000;
-
-					/* work out the relocation */
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					/* grab any offset from the text */
-					offset = (p[2]<<24) + (p[3] << 16) + (p[6] << 8) + (p[7]);
-					/* Update the address */
-					sym_addr += offset + sym_vma + q->addend;
-					/* Write relocated pointer back */
-					p[2] = (sym_addr >> 24) & 0xff;
-					p[3] = (sym_addr >> 16) & 0xff;
-					p[6] = (sym_addr >>  8) & 0xff;
-					p[7] =  sym_addr        & 0xff;
-
-					/* create a new reloc entry */
-					flat_relocs = realloc(flat_relocs,
-						(flat_reloc_count + 1) * sizeof(uint32_t));
-					flat_relocs[flat_reloc_count] = pflags | (section_vma + q->address);
-					flat_reloc_count++;
-					relocation_needed = 0;
-					pflags = 0;
-			sprintf(&addstr[0], "+0x%x", sym_addr - (*(q->sym_ptr_ptr))->value -
-					 bfd_section_vma(abs_bfd, sym_section));
-			if (verbose)
-				printf("  RELOC[%d]: offset=0x%x symbol=%s%s "
-					"section=%s size=%d "
-					"fixup=0x%x (reloc=0x%x)\n", flat_reloc_count,
-					q->address, sym_name, addstr,
-					section_name, sym_reloc_size,
-					sym_addr, section_vma + q->address);
-			if (verbose)
-				printf("reloc[%d] = 0x%x\n", flat_reloc_count,
-					 section_vma + q->address);
-
-					continue;
-				}
-				case R_MICROBLAZE_32:
-				{	
-					unsigned char *p = r_mem;
-					unsigned long offset;
-
-					/* grab any offset from the text */
-					offset = (p[0]<<24) + (p[1] << 16) + (p[2] << 8) + (p[3]);
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					/* This is a horrible kludge.  For some
-					   reason, *sometimes* the offset is in
-					   both addend and the code.  Detect
-					   it, and cancel the effect.  Otherwise
-					   the offset gets added twice - ouch.
-					   There should be a better test
-					   for this condition, based on the
-					   BFD data structures */
-					if(offset==q->addend)
-						offset=0;
-
-					sym_addr += offset + sym_vma + q->addend;
-					relocation_needed = 1;
-					break;
-				}
-				case R_MICROBLAZE_64_PCREL:
-					sym_vma = 0;
-					//sym_addr = (*(q->sym_ptr_ptr))->value;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= (q->address + 4);
-					sym_addr = htonl(sym_addr);
-					/* insert 16 MSB */
-					* ((unsigned short *) (r_mem+2)) |= (sym_addr) & 0xFFFF;
-					/* then 16 LSB */
-					* ((unsigned short *) (r_mem+6)) |= (sym_addr >> 16) & 0xFFFF;
-					/* We've done all the work, so continue
-					   to next reloc instead of break */
-					continue;
-
-#endif /* TARGET_microblaze */
-					
-#ifdef TARGET_nios2
-#define  htoniosl(x)	(x)
-#define  niostohl(x)	(x)
-				case R_NIOS2_BFD_RELOC_32:
-					relocation_needed = 1;
-					pflags = (FLAT_NIOS2_R_32 << 28);
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					/* modify target, in target order */
-					*(unsigned long *)r_mem = htoniosl(sym_addr);
-					break;
-				case R_NIOS2_CALL26:
-				{
-					unsigned long exist_val;
-					relocation_needed = 1;
-					pflags = (FLAT_NIOS2_R_CALL26 << 28);
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					
-					/* modify target, in target order */
-					// exist_val = niostohl(*(unsigned long *)r_mem);
-					exist_val = ((sym_addr >> 2) << 6);
-					*(unsigned long *)r_mem = htoniosl(exist_val);
-					break;
-				}
-				case R_NIOS2_HIADJ16:
-				case R_NIOS2_HI16:
-				{
-					unsigned long exist_val;
-					int r2_type;
-					/* handle the adjacent HI/LO pairs */
-					if (relcount == 0)
-						r2_type = R_NIOS2_NONE;
-					else
-						r2_type = p[1]->howto->type;
-					if ((r2_type == R_NIOS2_LO16)
-					    && (p[0]->sym_ptr_ptr == p[1]->sym_ptr_ptr)
-					    && (p[0]->addend == p[1]->addend)) 
-					    {
-							unsigned char * r2_mem = sectionp + p[1]->address;
-							if (p[1]->address - q->address!=4)
-								printf("Err: HI/LO not adjacent %d\n", p[1]->address - q->address);
-							relocation_needed = 1;
-							pflags = (q->howto->type == R_NIOS2_HIADJ16) 
-								? FLAT_NIOS2_R_HIADJ_LO : FLAT_NIOS2_R_HI_LO;
-							pflags <<= 28;
-						
-							sym_vma = bfd_section_vma(abs_bfd, sym_section);
-							sym_addr += sym_vma + q->addend;
-
-							/* modify high 16 bits, in target order */
-							exist_val = niostohl(*(unsigned long *)r_mem);
-							exist_val =  ((exist_val >> 22) << 22) | (exist_val & 0x3f);
-							if (q->howto->type == R_NIOS2_HIADJ16)
-								exist_val |= ((((sym_addr >> 16) + ((sym_addr >> 15) & 1)) & 0xFFFF) << 6);
-							else
-								exist_val |= (((sym_addr >> 16) & 0xFFFF) << 6);
-							*(unsigned long *)r_mem = htoniosl(exist_val);
-
-							/* modify low 16 bits, in target order */
-							exist_val = niostohl(*(unsigned long *)r2_mem);
-							exist_val =  ((exist_val >> 22) << 22) | (exist_val & 0x3f);
-							exist_val |= ((sym_addr & 0xFFFF) << 6);
-							*(unsigned long *)r2_mem = htoniosl(exist_val);
-						
-						} else 
-							goto NIOS2_RELOC_ERR;
-					}
-					break;
-
-				case R_NIOS2_GPREL:
-				{
-					unsigned long exist_val, temp;
-					//long gp = get_symbol_offset("_gp", sym_section, symbols, number_of_symbols);
-					long gp = get_gp_value(symbols, number_of_symbols);
-					if (gp == -1) {
-						printf("Err: unresolved symbol _gp when relocating %s\n", sym_name);
-						goto NIOS2_RELOC_ERR;
-					}
-					/* _gp holds a absolute value, otherwise the ld cannot generate correct code */
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					//printf("sym=%x, %d, _gp=%x, %d\n", sym_addr+sym_vma, sym_addr+sym_vma, gp, gp);
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= gp;
-					//printf("sym - _gp=%x, %d\n", sym_addr, sym_addr);
-					/* modify the target, in target order (little_endian) */
-					exist_val = niostohl(*(unsigned long *)r_mem);
-					temp = ((exist_val >> 6) & 0x3ff0000) | (sym_addr & 0xffff);
-					temp <<= 6;
-					temp |= (exist_val & 0x3f);
-					*(unsigned long *)r_mem = htoniosl(temp);
-					if (verbose)
-						printf("omit: offset=0x%x symbol=%s%s "
-								"section=%s size=%d "
-								"fixup=0x%x (reloc=0x%x) GPREL\n", 
-								q->address, sym_name, addstr,
-								section_name, sym_reloc_size,
-								sym_addr, section_vma + q->address);
-					continue;
-				}
-				case R_NIOS2_PCREL16:
-				{
-					unsigned long exist_val;
-					sym_vma = 0;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= (q->address + 4);
-					/* modify the target, in target order (little_endian) */
-					exist_val = niostohl(*(unsigned long *)r_mem);
-					exist_val =  ((exist_val >> 22) << 22) | (exist_val & 0x3f);
-					exist_val |= ((sym_addr & 0xFFFF) << 6);
-					*(unsigned long *)r_mem = htoniosl(exist_val);
-					if (verbose)
-						printf("omit: offset=0x%x symbol=%s%s "
-								"section=%s size=%d "
-								"fixup=0x%x (reloc=0x%x) PCREL\n", 
-								q->address, sym_name, addstr,
-								section_name, sym_reloc_size,
-								sym_addr, section_vma + q->address);
-					continue;
-				}
-
-				case R_NIOS2_LO16:
-					/* check if this is actually the 2nd half of a pair */
-					if ((p > relpp)
-						&& ((p[-1]->howto->type == R_NIOS2_HIADJ16) 
-							|| (p[-1]->howto->type == R_NIOS2_HI16))
-					    && (p[-1]->sym_ptr_ptr == p[0]->sym_ptr_ptr)
-					    && (p[-1]->addend == p[0]->addend)) {
-						if (verbose)
-							printf("omit: offset=0x%x symbol=%s%s "
-								"section=%s size=%d LO16\n", 
-								q->address, sym_name, addstr,
-								section_name, sym_reloc_size);
-						continue;
-					}
-
-					/* error, fall through */
-
-				case R_NIOS2_S16:
-				case R_NIOS2_U16:
-				case R_NIOS2_CACHE_OPX:
-				case R_NIOS2_IMM5:
-				case R_NIOS2_IMM6:
-				case R_NIOS2_IMM8:
-				case R_NIOS2_BFD_RELOC_16:
-				case R_NIOS2_BFD_RELOC_8:
-				case R_NIOS2_GNU_VTINHERIT:
-				case R_NIOS2_GNU_VTENTRY:
-				case R_NIOS2_UJMP:
-				case R_NIOS2_CJMP:
-				case R_NIOS2_CALLR:
-NIOS2_RELOC_ERR:
-					printf("Err: unexpected reloc type %s(%d)\n", q->howto->name, q->howto->type);
-					bad_relocs++;
-					continue;
-#endif /* TARGET_nios2 */
-
-#ifdef TARGET_sparc
-				case R_SPARC_32:
-				case R_SPARC_UA32:
-					relocation_needed = 1;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-				case R_SPARC_PC22:
-					sym_vma = 0;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= q->address;
-					break;
-				case R_SPARC_WDISP30:
-					sym_addr = (((*(q->sym_ptr_ptr))->value-
-						q->address) >> 2) & 0x3fffffff;
-					sym_addr |= (
-						ntohl(*(unsigned long *)r_mem)
-						& 0xc0000000
-						);
-					break;
-				case R_SPARC_HI22:
-					relocation_needed = 1;
-					pflags = 0x80000000;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					sym_addr |= (
-						htonl(*(unsigned long *)r_mem)
-						& 0xffc00000
-						);
-					break;
-				case R_SPARC_LO10:
-					relocation_needed = 1;
-					pflags = 0x40000000;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					sym_addr &= 0x000003ff;
-					sym_addr |= (
-						htonl(*(unsigned long *)r_mem)
-						& 0xfffffc00
-						);
-					break;
-#endif /* TARGET_sparc */
-
-#ifdef TARGET_bfin
-				case R_pcrel12_jump:
-				case R_pcrel12_jump_s:
-				case R_pcrel24:
-				case R_pcrel24_jump_l:
-				case R_pcrel24_jump_x:
-				case R_pcrel24_call_x:
-				case R_pcrel10:
-				case R_pcrel11:
-				case R_pcrel5m2:
-				  sym_addr += q->addend;// get the symbol addr
-				  sym_vma = bfd_section_vma(abs_bfd, sym_section);
-				  sym_addr -= q->address; // make it PC relative 
-				  // implicitly assumes code section and symbol section are same
-				  break;
-				case R_got:
-				    /* Ignore these.  */
-				    break;
-
-				case R_rimm16:
-				    sym_addr += q->addend;
-				    if(weak_und_symbol(sym_section->name, (*(q->sym_ptr_ptr))))
-					continue;
-				    if(0xFFFF0000 & sym_addr){
-					fprintf (stderr, "Relocation overflow for rN = %s\n",sym_name);
-					bad_relocs++;
-				    }
-				    flat_relocs = (uint32_t *)
-					(realloc (flat_relocs, (flat_reloc_count + 1) * sizeof (uint32_t)));
-				    if (bfin_set_reloc (flat_relocs + flat_reloc_count, 
-							sym_section->name, sym_name,
-							(*(q->sym_ptr_ptr)),
-							0, FLAT_RELOC_PART_LO, 
-							section_vma + q->address))
-					bad_relocs++;
-				    flat_reloc_count++;
-				    break;
-				    
-				case R_luimm16:
-				case R_huimm16:
-				{
-				    unsigned int sp;
-				    unsigned int reloc_count_incr;
-				    unsigned int hi_lo;
-
-				    if (q->howto->type == R_luimm16)
-					hi_lo = FLAT_RELOC_PART_LO;
-				    else
-					hi_lo = FLAT_RELOC_PART_HI;
-				
-				    sym_addr += q->addend;
-
-				    flat_relocs = (uint32_t *)
-					(realloc (flat_relocs, (flat_reloc_count + 2) * sizeof (uint32_t)));
-				    reloc_count_incr = 1;
-				    if (weak_und_symbol (sym_section->name, (*(q->sym_ptr_ptr))))
-					continue;
-				    if (0xFFFF0000 & sym_addr) {
-					/* value is > 16 bits - use an extra field */
-					/* see if we have already output that symbol */
-					/* reloc may be addend from symbol and       */
-					/* we can only store 16 bit offsets	     */
-					sp = 1;
-					if ((*(q->sym_ptr_ptr))->udata.i == 0
-					    || flat_relocs[(*(q->sym_ptr_ptr))->udata.i] != sym_addr
-					    || ((*(q->sym_ptr_ptr))->udata.i & 0xFFFF0000))
-					{
-					    reloc_count_incr = 2;
-					    flat_relocs[flat_reloc_count + 1] = sym_addr;
-					    (*(q->sym_ptr_ptr))->udata.i = flat_reloc_count + 1;
-					    sym_addr = 0; // indication to loader to read next
-					} else{
-					    sym_addr = (*(q->sym_ptr_ptr))->udata.i;
-					}
-				    } else {
-					sp = 0;
-				    }
-
-				    if (bfin_set_reloc (flat_relocs + flat_reloc_count, 
-							sym_section->name, sym_name,
-							(*(q->sym_ptr_ptr)),
-							sp, hi_lo,
-							section_vma + q->address))
-					bad_relocs++;
-				    flat_reloc_count += reloc_count_incr;
-				    break;
-				}
-				case R_byte4_data:
-				    sym_addr += q->addend;
-
-				    if (weak_und_symbol (sym_section->name, *q->sym_ptr_ptr))
-					continue;
-
-				    flat_relocs = (uint32_t *)
-					(realloc (flat_relocs, (flat_reloc_count + 1) * sizeof (uint32_t)));
-				    if (bfin_set_reloc (flat_relocs + flat_reloc_count, 
-							sym_section->name, sym_name,
-							(*(q->sym_ptr_ptr)),
-							2, FLAT_RELOC_PART_LO, 
-							section_vma + q->address))
-					bad_relocs++;
-
-				    flat_reloc_count++;
-				    break;
-
-#endif //TARGET_bfin
-
-#ifdef TARGET_sh
-				case R_SH_DIR32:
-					relocation_needed = 1;
-					sym_vma = bfd_section_vma(abs_bfd, sym_section);
-					sym_addr += sym_vma + q->addend;
-					break;
-				case R_SH_REL32:
-					sym_vma = 0;
-					sym_addr += sym_vma + q->addend;
-					sym_addr -= q->address;
-					break;
-#endif /* TARGET_sh */
-
-#ifdef TARGET_e1
-#define  htoe1l(x)              htonl(x)
-					
-#if 0 
-#define  DEBUG_E1
-#endif
-
-#ifdef   DEBUG_E1
-#define  DBG_E1                 printf
-#else
-#define  DBG_E1(x, ...  )
-#endif
-
-#define _32BITS_RELOC 0x00000000
-#define _30BITS_RELOC 0x80000000
-#define _28BITS_RELOC 0x40000000
-					{
-				char *p;
-				unsigned long   sec_vma, exist_val, S;
-				case R_E1_CONST31:
-						relocation_needed = 1;
-						DBG_E1("Handling Reloc <CONST31>\n");
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n",
-										sec_vma, sym_addr, q->address);
-						sym_addr = sec_vma + sym_addr;
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address + 2);        
-						DBG_E1("Orig:exist_val : [0x%08x]\n", exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n", exist_val);
-						sym_addr += exist_val;
-						pflags = _30BITS_RELOC;
-						break;
-				case R_E1_CONST31_PCREL:
-						relocation_needed = 0;
-						DBG_E1("Handling Reloc <CONST31_PCREL>\n");
-						DBG_E1("DONT RELOCATE AT LOADING\n");
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n",
-										sec_vma, sym_addr, q->address);
-						sym_addr =  sec_vma + sym_addr;
-						DBG_E1("sym_addr =  sec_vma + sym_addr : [0x%x]\n", sym_addr );
-
-						DBG_E1("q->address : 0x%x, section_vma : 0x%x\n", q->address,
-																		section_vma );
-						q->address = q->address + section_vma;
-						DBG_E1("q->address += section_vma : 0x%x\n", q->address );
-
-						if( (sym_addr = (sym_addr - q->address - 6)) < 0 )
-								DBG_E1("NEGATIVE OFFSET in PC Relative instruction\n");
-						DBG_E1( "sym_addr := sym_addr - q->address  - "
-								"sizeof(CONST31_PCREL): [0x%x]\n",
-								sym_addr );
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address + 2);              
-						DBG_E1("Orig:exist_val : [0x%08x]\n", exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n", exist_val);
-						sym_addr |= exist_val;
-						DBG_E1("sym_addr |=  exist_val) : [0x%x]\n", sym_addr );
-						break;
-				case R_E1_DIS29W_PCREL:
-						relocation_needed = 0;
-						DBG_E1("Handling Reloc <DIS29W_PCREL>\n");
-						DBG_E1("DONT RELOCATE AT LOADING\n");
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n",
-										sec_vma, sym_addr, q->address);
-						sym_addr =  sec_vma + sym_addr;
-						DBG_E1("sym_addr =  sec_vma + sym_addr : [0x%x]\n", sym_addr );
-
-						DBG_E1("q->address : 0x%x, section_vma : 0x%x\n", q->address,
-																		section_vma );
-						q->address = q->address + section_vma;
-						DBG_E1("q->address += section_vma : 0x%x\n", q->address );
-
-						if( (sym_addr = (sym_addr - q->address - 6)) < 0 )
-								DBG_E1("NEGATIVE OFFSET in PC Relative instruction\n");
-						DBG_E1( "sym_addr := sym_addr - q->address  - "
-								"sizeof(CONST31_PCREL): [0x%x]\n",
-								sym_addr );
-						DBG_E1("sectionp:[0x%x], q->address:[0x%x]\n", sectionp, q->address );
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address + 2);       
-						DBG_E1("Original:exist_val : [0x%08x]\n",exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n",exist_val);
-						sym_addr += exist_val;
-						break;
-				case R_E1_DIS29W:
-						DBG_E1("Handling Reloc <DIS29W>\n");
-						goto DIS29_RELOCATION;
-				case R_E1_DIS29H:
-						DBG_E1("Handling Reloc <DIS29H>\n");
-						goto DIS29_RELOCATION;
-				case R_E1_DIS29B:
-						DBG_E1("Handling Reloc <DIS29B>\n");
-DIS29_RELOCATION:
-						relocation_needed = 1;
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%08x]\n",
-										sec_vma, sym_addr);
-						sym_addr =  sec_vma + sym_addr;
-						DBG_E1("sym_addr =  sec_vma + sym_addr : [0x%08x]\n", sym_addr);
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address + 2);                
-						DBG_E1("Orig:exist_val : [0x%08x]\n", exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n", exist_val);
-						sym_addr +=  exist_val;
-						DBG_E1("sym_addr +=  exist_val : [0x%08x]\n", sym_addr);
-						pflags = _28BITS_RELOC;
-						break;
-				case R_E1_IMM32_PCREL:
-						relocation_needed = 0;
-						DBG_E1("Handling Reloc <IMM32_PCREL>\n");
-						DBG_E1("DONT RELOCATE AT LOADING\n");
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n",
-										sec_vma, sym_addr);
-						sym_addr =  sec_vma + sym_addr;
-
-						DBG_E1("sym_addr =  sec_vma + sym_addr : [0x%x]\n", sym_addr );
-						DBG_E1("q->address : 0x%x, section_vma : 0x%x\n", q->address,
-																		section_vma );
-						q->address = q->address + section_vma;
-						DBG_E1("q->address += section_vma : 0x%x\n", q->address );
-
-						if( (sym_addr = (sym_addr - q->address - 6 )) < 0 )
-								DBG_E1("NEGATIVE OFFSET in PC Relative instruction\n");
-						DBG_E1( "sym_addr := sym_addr - q->address  - "
-								"sizeof(CONST31_PCREL): [0x%x]\n",
-								sym_addr );
-						DBG_E1("sectionp:[0x%x], q->address:[0x%x]\n", sectionp, q->address );
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address + 2);                 
- 						DBG_E1("Original:exist_val : [0x%08x]\n",exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n",exist_val);
-						sym_addr += exist_val;
-						break;
-				case R_E1_IMM32:
-						relocation_needed = 1;
-						DBG_E1("Handling Reloc <IMM32>\n");
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n",
-										sec_vma, sym_addr);
-						sym_addr =  sec_vma + sym_addr;
-						DBG_E1("sym_addr =  sec_vma + sym_addr : [0x%x]\n", sym_addr );
-						DBG_E1("sectionp:[0x%x], q->address:[0x%x]\n", sectionp, q->address );
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address + 2);                     
-	 					DBG_E1("Original:exist_val : [0x%08x]\n",exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n",exist_val);
-						sym_addr += exist_val;
-						pflags = _32BITS_RELOC;
-						break;
-				case R_E1_WORD:
-						relocation_needed = 1;
-						DBG_E1("Handling Reloc <WORD>\n");
-						sec_vma = bfd_section_vma(abs_bfd, sym_section);
-						DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n",
-										sec_vma, sym_addr);
-						sym_addr =  sec_vma + sym_addr;
-						DBG_E1("sym_addr =  sec_vma + sym_addr : [0x%x]\n", sym_addr );
-						exist_val = *(unsigned long*)((unsigned long)sectionp + q->address );
-						DBG_E1("Orig:exist_val : [0x%08x]\n", exist_val);
-						exist_val = htoe1l(exist_val);
-						DBG_E1("HtoBE:exist_val : [0x%08x]\n", exist_val);
-						sym_addr +=  exist_val;
-						DBG_E1("sym_addr +=  exist_val : [0x%08x]\n", sym_addr);
-						pflags = _32BITS_RELOC;
-						break;
-				}
-#undef _32BITS_RELOC
-#undef _30BITS_RELOC
-#undef _28BITS_RELOC
-#endif
-				default:
-					/* missing support for other types of relocs */
-					printf("ERROR: bad reloc type %d\n", (*p)->howto->type);
-					bad_relocs++;
-					continue;
-				}
-			}
-
-			sprintf(&addstr[0], "+0x%x", sym_addr - (*(q->sym_ptr_ptr))->value -
-					 bfd_section_vma(abs_bfd, sym_section));
-
-
-			/*
-			 * for full elf relocation we have to write back the
-			 * start_code relative value to use.
-			 */
-			if (!pic_with_got) {
-#if defined(TARGET_arm)
-				union {
-					unsigned char c[4];
-					unsigned long l;
-				} tmp;
-				long hl;
-				int i0, i1, i2, i3;
-
-				/*
-				 * horrible nasty hack to support different endianess
-				 */
-				if (!bfd_big_endian(abs_bfd)) {
-					i0 = 0;
-					i1 = 1;
-					i2 = 2;
-					i3 = 3;
-				} else {
-					i0 = 3;
-					i1 = 2;
-					i2 = 1;
-					i3 = 0;
-				}
-
-				tmp.l = *(unsigned long *)r_mem;
-				hl = tmp.c[i0] | (tmp.c[i1] << 8) | (tmp.c[i2] << 16);
-				if (use_resolved ||
-					(((*p)->howto->type != R_ARM_PC24) &&
-					((*p)->howto->type != R_ARM_PLT32)))
-					hl |= (tmp.c[i3] << 24);
-				else if (tmp.c[i2] & 0x80)
-					hl |= 0xff000000; /* sign extend */
-				if (!use_resolved)
-					hl += sym_addr;
-				tmp.c[i0] = hl & 0xff;
-				tmp.c[i1] = (hl >> 8) & 0xff;
-				tmp.c[i2] = (hl >> 16) & 0xff;
-				if (use_resolved ||
-					(((*p)->howto->type != R_ARM_PC24) &&
-					((*p)->howto->type != R_ARM_PLT32)))
-					tmp.c[i3] = (hl >> 24) & 0xff;
-				if ((*p)->howto->type == R_ARM_ABS32)
-					*(unsigned long *)r_mem = htonl(hl);
-				else
-					*(unsigned long *)r_mem = tmp.l;
-
-#elif defined(TARGET_bfin)
-				if ((*p)->howto->type == R_pcrel24
-				    || (*p)->howto->type == R_pcrel24_jump_l
-				    || (*p)->howto->type == R_pcrel24_jump_x
-				    || (*p)->howto->type == R_pcrel24_call_x)
-				{
-				    sym_addr += 2*-1*PCREL24_MAGIC_OFFSET;
-				    *((unsigned short *)(sectionp + q->address) + 1 + PCREL24_MAGIC_OFFSET)
-					= (sym_addr >> 1) & 0xffff;
-				    *((unsigned short *)(sectionp + q->address) + PCREL24_MAGIC_OFFSET)
-					= (0xff00 & *((unsigned short *) (sectionp + q->address) + PCREL24_MAGIC_OFFSET)
-					   | ((sym_addr >> 17) & 0xff));
-				} else if ((*p)->howto->type == R_byte4_data) {
-				    *((uint32_t *)(sectionp + q->address)) = sym_addr;
-				} else if ((*p)->howto->type == R_pcrel12_jump
-					   || (*p)->howto->type == R_pcrel12_jump_s) {
-				    *((unsigned short *)(sectionp + q->address))
-					= (0xf000 & *((unsigned short *)(sectionp + q->address))
-					   | ((sym_addr >> 1) & 0xfff));
-				} else if ((*p)->howto->type == R_pcrel10) {
-				    *((unsigned short *)(sectionp + q->address))
-					= (~0x3ff & *((unsigned short *)(sectionp + q->address))
-					   | ((sym_addr >> 1) & 0x3ff));
-				} else if ((*p)->howto->type == R_rimm16
-					   || (*p)->howto->type == R_huimm16
-					   || (*p)->howto->type == R_luimm16) {
-				    /* for l and h we set the lower 16 bits which is only when it will be used */
-				    *((unsigned short *) (sectionp + q->address)) = (unsigned short) sym_addr;
-				} else if ((*p)->howto->type == R_pcrel5m2) {
-				    *((unsigned short *)(sectionp + q->address))
-					= (0xfff0 & *((unsigned short *)(sectionp + q->address))
-					   | ((sym_addr >> 1) & 0xf));
-				} else if ((*p)->howto->type == R_pcrel11){
-				    *((unsigned short *)(sectionp + q->address))
-					= (0xfc00 & *((unsigned short *)(sectionp + q->address))
-					   | ((sym_addr >> 1) & 0x3ff));
-				} else if (0xE0 <= (*p)->howto->type && 0xF3 >= (*p)->howto->type) {
-				    //arith relocs dont generate a real relocation
-				} else {
-				    printf("Blackfin relocation fail for reloc type: 0x%x\n", (*p)->howto->type);
-				}
-#elif defined(TARGET_e1)
-#define OPCODE_SIZE 2           /* Add 2 bytes, counting the opcode size*/
-				switch ((*p)->howto->type) {
-				case R_E1_CONST31:
-				case R_E1_CONST31_PCREL:
-				case R_E1_DIS29W_PCREL:
-				case R_E1_DIS29W:
-				case R_E1_DIS29H:
-				case R_E1_DIS29B:
-				case R_E1_IMM32_PCREL:
-				case R_E1_IMM32:
-						DBG_E1("In addr + 2:[0x%x] <- write [0x%x]\n",
-								(sectionp + q->address + 2), sym_addr );
-						*((unsigned long *) (sectionp + q->address + OPCODE_SIZE)) =
-						htonl(sym_addr);
-				break;
-				case R_E1_WORD:
-						DBG_E1("In addr : [0x%x] <- write [0x%x]\n",
-								(sectionp + q->address), sym_addr );
-						*((unsigned long *) (sectionp + q->address )) = htonl(sym_addr);
-				break;
-				default:
-						printf("ERROR:Unhandled Relocation. Exiting...\n");
-						exit(0);
-				break;
-				}
-#else /* ! TARGET_arm && ! TARGET_e1 */
-
-				switch (q->howto->type) {
-#ifdef TARGET_v850
-				case R_V850_HI16_S:
-				case R_V850_HI16:
-				case R_V850_LO16:
-					/* Do nothing -- for cases we handle,
-					   the bits produced by the linker are
-					   what we want in the final flat file
-					   (and other cases are errors).  Note
-					   that unlike most relocated values,
-					   it is stored in little-endian order,
-					   but this is necessary to avoid
-					   trashing the low-bit, and the float
-					   loaders knows about it.  */
-					break;
-#endif /* TARGET_V850 */
-
-#ifdef TARGET_nios2
-				case R_NIOS2_BFD_RELOC_32:
-				case R_NIOS2_CALL26:
-				case R_NIOS2_HIADJ16:
-				case R_NIOS2_HI16:
-					/* do nothing */
-					break;
-#endif /* TARGET_nios2 */
-
-#if defined(TARGET_m68k)
-				case R_68K_PC16:
-					if (sym_addr < -0x8000 || sym_addr > 0x7fff) {
-						fprintf (stderr, "Relocation overflow for R_68K_PC16 relocation against %s\n", sym_name);
-						bad_relocs++;
-					} else {
-						r_mem[0] = (sym_addr >>  8) & 0xff;
-						r_mem[1] =  sym_addr        & 0xff;
-					}
-					break;
-#endif
-
-				default:
-					/* The alignment of the build host
-					   might be stricter than that of the
-					   target, so be careful.  We store in
-					   network byte order. */
-					r_mem[0] = (sym_addr >> 24) & 0xff;
-					r_mem[1] = (sym_addr >> 16) & 0xff;
-					r_mem[2] = (sym_addr >>  8) & 0xff;
-					r_mem[3] =  sym_addr        & 0xff;
-				}
-#endif /* !TARGET_arm */
-			}
-
-#ifdef TARGET_bfin
-			else {
-			    if ((*p)->howto->type == R_rimm16
-				|| (*p)->howto->type == R_huimm16
-				|| (*p)->howto->type == R_luimm16)
-			    {
-				/* for l and h we set the lower 16 bits which is only when it will be used */
-				*((unsigned short *) (sectionp + q->address)) = (unsigned short) sym_addr;
-			    } else if ((*p)->howto->type == R_byte4_data) {
-				*((uint32_t *)(sectionp + q->address)) = sym_addr;
-			    }
-			}
-#endif
-			if (verbose)
-				printf("  RELOC[%d]: offset=0x%x symbol=%s%s "
-					"section=%s size=%d "
-					"fixup=0x%x (reloc=0x%x)\n", flat_reloc_count,
-					q->address, sym_name, addstr,
-					section_name, sym_reloc_size,
-					sym_addr, section_vma + q->address);
-
-			/*
-			 *	Create relocation entry (PC relative doesn't need this).
-			 */
-			if (relocation_needed) {
-#ifndef TARGET_bfin
-				flat_relocs = realloc(flat_relocs,
-					(flat_reloc_count + 1) * sizeof(uint32_t));
-#ifndef TARGET_e1
-				flat_relocs[flat_reloc_count] = pflags |
-					(section_vma + q->address);
-
-				if (verbose)
-					printf("reloc[%d] = 0x%x\n", flat_reloc_count,
-							section_vma + q->address);
-#else
-				switch ((*p)->howto->type) {
-				case R_E1_CONST31:
-				case R_E1_CONST31_PCREL:
-				case R_E1_DIS29W_PCREL:
-				case R_E1_DIS29W:
-				case R_E1_DIS29H:
-				case R_E1_DIS29B:
-				case R_E1_IMM32_PCREL:
-				case R_E1_IMM32:
-				flat_relocs[flat_reloc_count] = pflags |
-						(section_vma + q->address + OPCODE_SIZE);
-				if (verbose)
-						printf("RELOCATION TABLE : reloc[%d] = [0x%x]\n", flat_reloc_count,
-										 flat_relocs[flat_reloc_count] );
-				break;
-				case R_E1_WORD:
-				flat_relocs[flat_reloc_count] = pflags |
-						(section_vma + q->address);
-				if (verbose)
-						printf("RELOCATION TABLE : reloc[%d] = [0x%x]\n", flat_reloc_count,
-										 flat_relocs[flat_reloc_count] );
-				break;
-				}
-#endif
-				flat_reloc_count++;
-#endif
-				relocation_needed = 0;
-				pflags = 0;
-			}
-
-#if 0
-printf("%s(%d): symbol name=%s address=0x%x section=%s -> RELOC=0x%x\n",
-	__FILE__, __LINE__, sym_name, q->address, section_name,
-	flat_relocs[flat_reloc_count]);
-#endif
-		}
-	}
-  }
-
-  if (bad_relocs) {
-	  printf("%d bad relocs\n", bad_relocs);
-	  exit(1);
-  }
-
-  if (rc < 0)
-	return(0);
-
-  *n_relocs = flat_reloc_count;
-  return flat_relocs;
-}
-
-
-
-static char * program;
-
-static void usage(void)
-{  
-    fprintf(stderr, "Usage: %s [vrzd] [-p <abs-pic-file>] [-s stack-size] "
-	"[-o <output-file>] <elf-file>\n\n"
-	"       -v              : verbose operation\n"
-	"       -r              : force load to RAM\n"
-	"       -k              : enable kernel trace on load (for debug)\n"
-	"       -z              : compress code/data/relocs\n"
-	"       -d              : compress data/relocs\n"
-	"       -a              : use existing symbol references\n"
-	"                         instead of recalculating from\n"
-	"                         relocation info\n"
-        "       -R reloc-file   : read relocations from a separate file\n"
-	"       -p abs-pic-file : GOT/PIC processing with files\n"
-	"       -s stacksize    : set application stack size\n"
-	"       -o output-file  : output file name\n\n",
-	program);
-	fprintf(stderr, "Compiled for " ARCH " architecture\n\n");
-    exit(2);
-}
-
-
-/* Write NUM zeroes to STREAM.  */
-static void write_zeroes (unsigned long num, FILE *stream)
-{
-  char zeroes[1024];
-  if (num > 0) {
-    /* It'd be nice if we could just use fseek, but that doesn't seem to
-       work for stdio output files.  */
-    memset(zeroes, 0x00, 1024);
-    while (num > sizeof(zeroes)) {
-      fwrite(zeroes, sizeof(zeroes), 1, stream);
-      num -= sizeof(zeroes);
-    }
-    if (num > 0)
-      fwrite(zeroes, num, 1, stream);
-  }
-}
-
-
-int main(int argc, char *argv[])
-{
-  int fd;
-  bfd *rel_bfd, *abs_bfd;
-  asection *s;
-  char *ofile=NULL, *pfile=NULL, *abs_file = NULL, *rel_file = NULL;
-  char *fname = NULL;
-  int opt;
-  int i;
-  int stack;
-  char  cmd[1024];
-  FILE *gf = NULL;
-
-  asymbol **symbol_table;
-  long number_of_symbols;
-
-  unsigned long data_len = 0;
-  unsigned long bss_len = 0;
-  unsigned long text_len = 0;
-  unsigned long reloc_len;
-
-  unsigned long data_vma = ~0;
-  unsigned long bss_vma = ~0;
-  unsigned long text_vma = ~0;
-
-  unsigned long text_offs;
-
-  void *text;
-  void *data;
-  uint32_t *reloc;
-  
-  struct flat_hdr hdr;
-
-  int gf_is_pipe = 0;
-
-  program = argv[0];
-  progname = argv[0];
-
-  if (argc < 2)
-  	usage();
-  
-  if (sizeof(hdr) != 64) {
-    fprintf(stderr,
-	    "Potential flat header incompatibility detected\n"
-	    "header size should be 64 but is %d\n",
-	    sizeof(hdr));
-    exit(64);
-  }
-
-#ifndef TARGET_e1
-  stack = 4096;
-#else /* We need plenty of stack for both of them (Aggregate and Register) */
-  stack = 0x2020;
-#endif
-
-  while ((opt = getopt(argc, argv, "avzdrkp:s:o:R:")) != -1) {
-    switch (opt) {
-    case 'v':
-      verbose++;
-      break;
-    case 'r':
-      load_to_ram++;
-      break;
-    case 'k':
-      ktrace++;
-      break;
-    case 'z':
-      compress = 1;
-      break;
-    case 'd':
-      compress = 2;
-      break;
-    case 'p':
-      pfile = optarg;
-      break;
-    case 'o':
-      ofile = optarg;
-      break;
-    case 'a':
-      use_resolved = 1;
-      break;
-    case 's':
-      stack = atoi(optarg);
-      break;
-    case 'R':
-      rel_file = optarg;
-      break;
-    default:
-      fprintf(stderr, "%s Unknown option\n", argv[0]);
-      usage();
-      break;
-    }
-  }
-  
-  /*
-   * if neither the -r or -p options was given,  default to
-   * a RAM load as that is the only option that makes sense.
-   */
-  if (!load_to_ram && !pfile)
-    load_to_ram = 1;
-
-  filename = fname = argv[argc-1];
-
-  if (pfile) {
-    pic_with_got = 1;
-    abs_file = pfile;
-  } else
-    abs_file = fname;
-
-  if (! rel_file)
-    rel_file = fname;
-
-  if (!(rel_bfd = bfd_openr(rel_file, 0))) {
-    fprintf(stderr, "Can't open %s\n", rel_file);
-    exit(1);
-  }
-
-  if (bfd_check_format (rel_bfd, bfd_object) == 0) {
-    fprintf(stderr, "File is not an object file\n");
-    exit(2);
-  }
-
-  if (abs_file == rel_file)
-    abs_bfd = rel_bfd; /* one file does all */
-  else {
-    if (!(abs_bfd = bfd_openr(abs_file, 0))) {
-      fprintf(stderr, "Can't open %s\n", abs_file);
-      exit(1);
-    }
-
-    if (bfd_check_format (abs_bfd, bfd_object) == 0) {
-      fprintf(stderr, "File is not an object file\n");
-      exit(2);
-    }
-  }
-
-  if (! (bfd_get_file_flags(rel_bfd) & HAS_RELOC)) {
-    fprintf (stderr, "%s: Input file contains no relocation info\n", rel_file);
-    exit (2);
-  }
-
-  if (use_resolved && !(bfd_get_file_flags(abs_bfd) & EXEC_P)) {
-    /* `Absolute' file is not absolute, so neither are address
-       contained therein.  */
-    fprintf (stderr,
-	     "%s: `-a' option specified with non-fully-resolved input file\n",
-	     bfd_get_filename (abs_bfd));
-    exit (2);
-  }
-
-  symbol_table = get_symbols(abs_bfd, &number_of_symbols);
-
-  /* Group output sections into text, data, and bss, and calc their sizes.  */
-  for (s = abs_bfd->sections; s != NULL; s = s->next) {
-    unsigned long *vma, *len;
-    bfd_size_type sec_size;
-    bfd_vma sec_vma;
-
-    if (s->flags & SEC_CODE) {
-      vma = &text_vma;
-      len = &text_len;
-    } else if (s->flags & SEC_DATA) {
-      vma = &data_vma;
-      len = &data_len;
-    } else if (s->flags & SEC_ALLOC) {
-      vma = &bss_vma;
-      len = &bss_len;
-    } else
-      continue;
-
-    sec_size = bfd_section_size(abs_bfd, s);
-    sec_vma  = bfd_section_vma(abs_bfd, s);
-
-    if (sec_vma < *vma) {
-      if (*len > 0)
-	*len += sec_vma - *vma;
-      else
-	*len = sec_size;
-      *vma = sec_vma;
-    } else if (sec_vma + sec_size > *vma + *len)
-      *len = sec_vma + sec_size - *vma;
-  }
-
-  if (text_len == 0) {
-    fprintf (stderr, "%s: no .text section", abs_file);
-    exit (2);
-  }
-
-  text = malloc(text_len);
-
-  if (verbose)
-    printf("TEXT -> vma=0x%x len=0x%x\n", text_vma, text_len);
-
-  /* Read in all text sections.  */
-  for (s = abs_bfd->sections; s != NULL; s = s->next)
-    if (s->flags & SEC_CODE) 
-      if (!bfd_get_section_contents(abs_bfd, s,
-				   text + (s->vma - text_vma), 0,
-				   bfd_section_size(abs_bfd, s)))
-      {
-	fprintf(stderr, "read error section %s\n", s->name);
-	exit(2);
-      }
-
-  if (data_len == 0) {
-    fprintf (stderr, "%s: no .data section", abs_file);
-    exit (2);
-  }
-  data = malloc(data_len);
-
-  if (verbose)
-    printf("DATA -> vma=0x%x len=0x%x\n", data_vma, data_len);
-
-  if ((text_vma + text_len) != data_vma) {
-    if ((text_vma + text_len) > data_vma) {
-      printf("ERROR: text=0x%x overlaps data=0x%x ?\n", text_len, data_vma);
-      exit(1);
-    }
-    if (verbose)
-      printf("WARNING: data=0x%x does not directly follow text=0x%x\n",
-	  		data_vma, text_len);
-    text_len = data_vma - text_vma;
-  }
-
-  /* Read in all data sections.  */
-  for (s = abs_bfd->sections; s != NULL; s = s->next)
-    if (s->flags & SEC_DATA) 
-      if (!bfd_get_section_contents(abs_bfd, s,
-				   data + (s->vma - data_vma), 0,
-				   bfd_section_size(abs_bfd, s)))
-      {
-	fprintf(stderr, "read error section %s\n", s->name);
-	exit(2);
-      }
-
-  /* Put common symbols in bss.  */
-  bss_len += add_com_to_bss(symbol_table, number_of_symbols, bss_len);
-
-  if (verbose)
-    printf("BSS  -> vma=0x%x len=0x%x\n", bss_vma, bss_len);
-
-  if ((data_vma + data_len) != bss_vma) {
-    if ((data_vma + data_len) > bss_vma) {
-      printf("ERROR: text=0x%x + data=0x%x overlaps bss=0x%x ?\n", text_len,
-	  		data_len, bss_vma);
-      exit(1);
-    }
-    if (verbose)
-      printf("WARNING: bss=0x%x does not directly follow text=0x%x + data=0x%x(0x%x)\n",
-      		bss_vma, text_len, data_len, text_len + data_len);
-    data_len = bss_vma - data_vma;
-  }
-
-  reloc = output_relocs(abs_bfd, symbol_table, number_of_symbols, &reloc_len,
-			text, text_len, text_vma, data, data_len, data_vma,
-			rel_bfd);
-
-  if (reloc == NULL)
-    printf("No relocations in code!\n");
-
-  text_offs = real_address_bits(text_vma);
-
-  /* Fill in the binflt_flat header */
-  memcpy(hdr.magic,"bFLT",4);
-  hdr.rev         = htonl(FLAT_VERSION);
-  hdr.entry       = htonl(sizeof(hdr) + bfd_get_start_address(abs_bfd));
-  hdr.data_start  = htonl(sizeof(hdr) + text_offs + text_len);
-  hdr.data_end    = htonl(sizeof(hdr) + text_offs + text_len +data_len);
-  hdr.bss_end     = htonl(sizeof(hdr) + text_offs + text_len +data_len+bss_len);
-  hdr.stack_size  = htonl(stack); /* FIXME */
-  hdr.reloc_start = htonl(sizeof(hdr) + text_offs + text_len +data_len);
-  hdr.reloc_count = htonl(reloc_len);
-  hdr.flags       = htonl(0
-	  | (load_to_ram ? FLAT_FLAG_RAM : 0)
-	  | (ktrace ? FLAT_FLAG_KTRACE : 0)
-	  | (pic_with_got ? FLAT_FLAG_GOTPIC : 0)
-	  | (compress ? (compress == 2 ? FLAT_FLAG_GZDATA : FLAT_FLAG_GZIP) : 0)
-	  );
-  hdr.build_date = htonl((unsigned long)time(NULL));
-  memset(hdr.filler, 0x00, sizeof(hdr.filler));
-
-  for (i=0; i<reloc_len; i++) reloc[i] = htonl(reloc[i]);
-
-  if (verbose) {
-    printf("SIZE: .text=0x%04x, .data=0x%04x, .bss=0x%04x",
-	text_len, data_len, bss_len);
-    if (reloc)
-      printf(", relocs=0x%04x", reloc_len);
-    printf("\n");
-  }
-  
-  if (!ofile) {
-    ofile = malloc(strlen(fname) + 5 + 1); /* 5 to add suffix */
-    strcpy(ofile, fname);
-    strcat(ofile, ".bflt");
-  }
-
-  if ((fd = open (ofile, O_WRONLY|O_BINARY|O_CREAT|O_TRUNC, 0744)) < 0) {
-    fprintf (stderr, "Can't open output file %s\n", ofile);
-    exit(4);
-  }
-
-  write(fd, &hdr, sizeof(hdr));
-  close(fd);
-
-  /*
-   * get the compression command ready
-   */
-  sprintf(cmd, "gzip -f -9 >> %s", ofile);
-
-#define	START_COMPRESSOR do { \
-		if (gf) \
-			if (gf_is_pipe) \
-				pclose(gf); \
-			else \
-				fclose(gf); \
-		if (!(gf = popen(cmd, "w" BINARY_FILE_OPTS))) { \
-			fprintf(stderr, "Can't run cmd %s\n", cmd); \
-			exit(4); \
-		} \
-		gf_is_pipe = 1; \
-	} while (0)
-
-  gf = fopen(ofile, "ab");	/* Add 'b' to support non-posix (ie windows) */
-  if (!gf) {
-  	fprintf(stderr, "Can't open file %s for writing\n", ofile); \
-	exit(4);
-  }
-
-  if (compress == 1)
-  	START_COMPRESSOR;
-
-  /* Fill in any hole at the beginning of the text segment.  */
-  if (verbose)
-	  printf("ZERO before text len=0x%x\n", text_offs);
-  write_zeroes(text_offs, gf);
-
-  /* Write the text segment.  */
-  fwrite(text, text_len, 1, gf);
-
-  if (compress == 2)
-  	START_COMPRESSOR;
-
-  /* Write the data segment.  */
-  fwrite(data, data_len, 1, gf);
-
-  if (reloc)
-    fwrite(reloc, reloc_len * 4, 1, gf);
-
-  if(gf_is_pipe)
-    pclose(gf);
-  else
-  fclose(gf);
-
-  exit(0);
-}
-
-
-/*
- * this __MUST__ be at the VERY end of the file - do NOT move!!
- *
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 8
- * end:
- * vi: tabstop=8 shiftwidth=4 textwidth=79 noexpandtab
- */
diff --git a/package/elf2flt/src/elf2flt.ld b/package/elf2flt/src/elf2flt.ld
deleted file mode 100644
index cd4e652c30..0000000000
--- a/package/elf2flt/src/elf2flt.ld
+++ /dev/null
@@ -1,179 +0,0 @@
-
-ENTRY (_start)
-
-MEMORY {
-	flatmem : ORIGIN = 0x0, LENGTH = 0xfffffff
-}
-
-SECTIONS {
-
-	.text 0x0 : {
-		. = . + 4;
-		. = ALIGN(0x4) ;
-		_stext = . ;
-		*(.text)
-		*(.text.*)
-		*(.gnu.warning)
-		*(.stub)
-		*(.gnu.linkonce.t*)
-		*(.glue_7t)
-		*(.glue_7)
-		*(.jcr)
-		*(.init)
-		*(.fini)
-
-W_RODAT		*(.rodata)
-W_RODAT		*(.rodata1)
-W_RODAT		*(.rodata.*)
-W_RODAT		*(.gnu.linkonce.r*)
-
-		/* This is special code area at the end of the normal
-		   text section.  It contains a small lookup table at
-		   the start followed by the code pointed to by entries
-		   in the lookup table.  */
-		. = ALIGN (4) ;
-		PROVIDE(__ctbp = .);
-		*(.call_table_data)
-		*(.call_table_text)
-
-		. = ALIGN(0x20) ;
-		_etext = . ;
-	} > flatmem
-
-	.data : {
-		. = ALIGN(0x4) ;
-		_sdata = . ;
-		__data_start = . ;
-		data_start = . ;
-		*(.got.plt)
-		*(.got)
-		FILL(0) ;
-		. = ALIGN(0x20) ; 
-		LONG(-1)
-		. = ALIGN(0x20) ; 
-R_RODAT		*(.rodata)
-R_RODAT		*(.rodata1)
-R_RODAT		*(.rodata.*)
-R_RODAT		*(.gnu.linkonce.r*)
-		*(.data)
-		*(.data1)
-		*(.data.*)
-		*(.gnu.linkonce.d*)
-		*(.data1)
-		*(.eh_frame)
-		*(.gcc_except_table)
-
-		/* Microblaze has .sdata and .sbss (small bss).  They must
-		   be contiguous, so please don't move any of this. JW */
-		_ssrw = . ;			
-		*(.sdata) 
-		*(.sdata.*)
-		*(.sbss)			/* Don't move this! */
-		_essrw = . ;
-
-		_ssrw_size = _essrw - _ssrw;
-		PROVIDE(_SDA_BASE_ = _ssrw + (_ssrw_size / 2));
-
-		*(.gnu.linkonce.s.*)
-		*(__libc_atexit)
-		*(__libc_subinit)
-		*(__libc_subfreeres)
-		*(.note.ABI-tag)
-
-		/* microblaze-specific read-only small data area
-		   and associated locating symbols */
-		_ssro = . ;
-		*(.sdata2)
-		_essro = . ;
-		_ssro_size = _essro - _ssro;
-		PROVIDE(_SDA2_BASE_ = _ssro + (_ssro_size / 2));
-
-		. = ALIGN(4) ;
-		__CTOR_LIST__ = .;
-		LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
-SINGLE_LINK:	/* gcc uses crtbegin.o to find the start of
-SINGLE_LINK:	   the constructors, so we make sure it is
-SINGLE_LINK:	   first.  Because this is a wildcard, it
-SINGLE_LINK:	   doesn't matter if the user does not
-SINGLE_LINK:	   actually link against crtbegin.o; the
-SINGLE_LINK:	   linker won't look for a file to match a
-SINGLE_LINK:	   wildcard.  The wildcard also means that it
-SINGLE_LINK:	   doesn't matter which directory crtbegin.o
-SINGLE_LINK:	   is in.  */
-SINGLE_LINK:	KEEP (*crtbegin*.o(.ctors))
-SINGLE_LINK:	/* We don't want to include the .ctor section from
-SINGLE_LINK:	   from the crtend.o file until after the sorted ctors.
-SINGLE_LINK:	   The .ctor section from the crtend file contains the
-SINGLE_LINK:	   end of ctors marker and it must be last */
-SINGLE_LINK:	KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-SINGLE_LINK:	KEEP (*(SORT(.ctors.*)))
-		KEEP (*(.ctors))
-		LONG(0)
-		__CTOR_END__ = .;
-		__DTOR_LIST__ = .;
-		LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
-SINGLE_LINK:	KEEP (*crtbegin*.o(.dtors))
-SINGLE_LINK:	KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-SINGLE_LINK:	KEEP (*(SORT(.dtors.*)))
-		KEEP (*(.dtors))
-		LONG(0)
-		__DTOR_END__ = .;
-
-		PROVIDE (__preinit_array_start = .);
-		KEEP (*(.preinit_array))
-		PROVIDE (__preinit_array_end = .);
-
-		PROVIDE (__init_array_start = .);
-		KEEP (*(SORT(.init_array.*)))
-		KEEP (*(.init_array))
-		PROVIDE (__init_array_end = .);
-
-		PROVIDE (__fini_array_start = .);
-		KEEP (*(.fini_array))
-		KEEP (*(SORT(.fini_array.*)))
-		PROVIDE (__fini_array_end = .);
-
-		. = ALIGN(0x10) ; 
-		_edata = . ;
-	} > flatmem
-
-	.bss : {
-		. = ALIGN(0x4) ;
-		_sbss = ALIGN(0x4) ;
-		__bss_start = . ;
-		*(.dynsbss)
-		*(.sbss)
-		*(.sbss.*)
-		*(.scommon)
-		*(.dynbss)
-		*(.bss)
-		*(.bss.*)
-		*(.bss*)
-		*(.gnu.linkonce.b*)
-		*(COMMON)
-		. = ALIGN(0x10) ;
-		_ebss = . ;
-		_end = . ;
-		end = . ;
-	} > flatmem
-
-	.stack : {
-		. = ALIGN(0x4);
-		__stack_start = .;
-	}
-
-	.junk 0 : { *(.rel*) *(.rela*) }
-	/* Stabs debugging sections.    */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}
diff --git a/package/elf2flt/src/flat.h b/package/elf2flt/src/flat.h
deleted file mode 100644
index 3cc502d7c7..0000000000
--- a/package/elf2flt/src/flat.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2002-2005  David McCullough <davidm@snapgear.com>
- * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
- *                          The Silver Hammer Group, Ltd.
- *
- * This file provides the definitions and structures needed to
- * support uClinux flat-format executables.
- *
- * This is Free Software, under the GNU Public Licence v2 or greater.
- *
- */
-
-#ifndef _LINUX_FLAT_H
-#define _LINUX_FLAT_H
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#include <asm/flat.h>
-#endif
-
-#define	FLAT_VERSION			0x00000004L
-
-#ifdef CONFIG_BINFMT_SHARED_FLAT
-#define	MAX_SHARED_LIBS			(4)
-#else
-#define	MAX_SHARED_LIBS			(1)
-#endif
-
-/*
- * To make everything easier to port and manage cross platform
- * development,  all fields are in network byte order.
- */
-
-struct flat_hdr {
-    char magic[4];
-    uint32_t rev;          /* version (as above) */
-    uint32_t entry;        /* Offset of first executable instruction
-                              with text segment from beginning of file */
-    uint32_t data_start;   /* Offset of data segment from beginning of
-                              file */
-    uint32_t data_end;     /* Offset of end of data segment from beginning
-                              of file */
-    uint32_t bss_end;      /* Offset of end of bss segment from beginning
-                              of file */
-
-    /* (It is assumed that data_end through bss_end forms the bss segment.) */
-
-    uint32_t stack_size;   /* Size of stack, in bytes */
-    uint32_t reloc_start;  /* Offset of relocation records from beginning
-                              of file */
-    uint32_t reloc_count;  /* Number of relocation records */
-    uint32_t flags;       
-    uint32_t build_date;   /* When the program/library was built */
-    uint32_t filler[5];    /* Reservered, set to zero */
-};
-
-#define FLAT_FLAG_RAM    0x0001 /* load program entirely into RAM */
-#define FLAT_FLAG_GOTPIC 0x0002 /* program is PIC with GOT */
-#define FLAT_FLAG_GZIP   0x0004 /* all but the header is compressed */
-#define FLAT_FLAG_GZDATA 0x0008 /* only data/relocs are compressed (for XIP) */
-#define FLAT_FLAG_KTRACE 0x0010 /* output useful kernel trace for debugging */
-
-#ifdef __KERNEL__ /* so systems without linux headers can compile the apps */
-/*
- * While it would be nice to keep this header clean,  users of older
- * tools still need this support in the kernel.  So this section is
- * purely for compatibility with old tool chains.
- *
- * DO NOT make changes or enhancements to the old format please,  just work
- *        with the format above,  except to fix bugs with old format support.
- */
-
-#include <asm/byteorder.h>
-
-#define	OLD_FLAT_VERSION		0x00000002L
-#define OLD_FLAT_RELOC_TYPE_TEXT	0
-#define OLD_FLAT_RELOC_TYPE_DATA	1
-#define OLD_FLAT_RELOC_TYPE_BSS		2
-
-typedef union {
-    uint32_t        value;
-    struct {
-# if defined(mc68000) && !defined(CONFIG_COLDFIRE)
-        int32_t     offset : 30;
-        uint32_t    type   : 2;
-#   	define OLD_FLAT_FLAG_RAM    0x1 /* load program entirely into RAM */
-# elif defined(__BIG_ENDIAN_BITFIELD)
-        uint32_t    type   : 2;
-        int32_t     offset : 30;
-#   	define OLD_FLAT_FLAG_RAM    0x1 /* load program entirely into RAM */
-# elif defined(__LITTLE_ENDIAN_BITFIELD)
-        int32_t     offset : 30;
-        uint32_t    type   : 2;
-#   	define OLD_FLAT_FLAG_RAM    0x1 /* load program entirely into RAM */
-# else
-#   	error "Unknown bitfield order for flat files."
-# endif
-    } reloc;
-} flat_v2_reloc_t;
-
-#endif /* __KERNEL__ */
-
-#endif /* _LINUX_FLAT_H */
-
-/* this __MUST__ be at the VERY end of the file - do NOT move!!
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 8
- * end:
- * vi: tabstop=8 shiftwidth=4 textwidth=79 noexpandtab
- */
diff --git a/package/elf2flt/src/flthdr.c b/package/elf2flt/src/flthdr.c
deleted file mode 100644
index 967d64063a..0000000000
--- a/package/elf2flt/src/flthdr.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/****************************************************************************/
-/*
- *	A simple program to manipulate flat files
- *
- *	Copyright (C) 2001-2003 SnapGear Inc, davidm@snapgear.com
- *	Copyright (C) 2001 Lineo, davidm@lineo.com
- *
- * This is Free Software, under the GNU Public Licence v2 or greater.
- *
- */
-/****************************************************************************/
-
-#include <stdio.h>    /* Userland pieces of the ANSI C standard I/O package  */
-#include <unistd.h>   /* Userland prototypes of the Unix std system calls    */
-#include <time.h>
-#include <stdlib.h>   /* exit() */
-#include <string.h>   /* strcat(), strcpy() */
-
-/* macros for conversion between host and (internet) network byte order */
-#ifndef WIN32
-#include <netinet/in.h> /* Consts and structs defined by the internet system */
-#define	BINARY_FILE_OPTS
-#else
-#include <winsock2.h>
-#define	BINARY_FILE_OPTS "b"
-#endif
-
-/* from uClinux-x.x.x/include/linux */
-#include "flat.h"     /* Binary flat header description                      */
-
-#if defined(__MINGW32__)
-#include <getopt.h>
-
-#define mkstemp(p) mktemp(p)
-
-#endif
-
-/****************************************************************************/
-
-char *program_name;
-
-static char cmd[1024];
-static int print = 0, compress = 0, ramload = 0, stacksize = 0, ktrace = 0;
-static int short_format = 0;
-
-/****************************************************************************/
-
-void
-transferr(FILE *ifp, FILE *ofp, int count)
-{
-	int n, num;
-
-	while (count == -1 || count > 0) {
-		if (count == -1 || count > sizeof(cmd))
-			num = sizeof(cmd);
-		else
-			num = count;
-		n = fread(cmd, 1, num, ifp);
-		if (n == 0)
-			break;
-		if (fwrite(cmd, n, 1, ofp) != 1) {
-			fprintf(stderr, "Write failed :-(\n");
-			exit(1);
-		}
-		if (count != -1)
-			count -= n;
-	}
-	if (count > 0) {
-		fprintf(stderr, "Failed to transferr %d bytes\n", count);
-		exit(1);
-	}
-}
-	
-/****************************************************************************/
-
-void
-process_file(char *ifile, char *ofile)
-{
-	int old_flags, old_stack, new_flags, new_stack;
-	FILE *ifp, *ofp;
-	int ofp_is_pipe = 0;
-	struct flat_hdr old_hdr, new_hdr;
-	char tfile[256];
-	char tfile2[256];
-
-	*tfile = *tfile2 = '\0';
-
-	if ((ifp = fopen(ifile, "r" BINARY_FILE_OPTS)) == NULL) {
-		fprintf(stderr, "Cannot open %s\n", ifile);
-		return;
-	}
-
-	if (fread(&old_hdr, sizeof(old_hdr), 1, ifp) != 1) {
-		fprintf(stderr, "Cannot read header of %s\n", ifile);
-		return;
-	}
-
-	if (strncmp(old_hdr.magic, "bFLT", 4) != 0) {
-		fprintf(stderr, "Cannot read header of %s\n", ifile);
-		return;
-	}
-
-	new_flags = old_flags = ntohl(old_hdr.flags);
-	new_stack = old_stack = ntohl(old_hdr.stack_size);
-	new_hdr = old_hdr;
-
-	if (compress == 1) {
-		new_flags |= FLAT_FLAG_GZIP;
-		new_flags &= ~FLAT_FLAG_GZDATA;
-	} else if (compress == 2) {
-		new_flags |= FLAT_FLAG_GZDATA;
-		new_flags &= ~FLAT_FLAG_GZIP;
-	} else if (compress < 0)
-		new_flags &= ~(FLAT_FLAG_GZIP|FLAT_FLAG_GZDATA);
-	
-	if (ramload > 0)
-		new_flags |= FLAT_FLAG_RAM;
-	else if (ramload < 0)
-		new_flags &= ~FLAT_FLAG_RAM;
-	
-	if (ktrace > 0)
-		new_flags |= FLAT_FLAG_KTRACE;
-	else if (ktrace < 0)
-		new_flags &= ~FLAT_FLAG_KTRACE;
-	
-	if (stacksize)
-		new_stack = stacksize;
-
-	if (print == 1) {
-		time_t t;
-
-		printf("%s\n", ifile);
-		printf("    Magic:        %4.4s\n", old_hdr.magic);
-		printf("    Rev:          %d\n",    ntohl(old_hdr.rev));
-		t = (time_t) htonl(old_hdr.build_date);
-		printf("    Build Date:   %s",      t?ctime(&t):"not specified\n");
-		printf("    Entry:        0x%x\n",  ntohl(old_hdr.entry));
-		printf("    Data Start:   0x%x\n",  ntohl(old_hdr.data_start));
-		printf("    Data End:     0x%x\n",  ntohl(old_hdr.data_end));
-		printf("    BSS End:      0x%x\n",  ntohl(old_hdr.bss_end));
-		printf("    Stack Size:   0x%x\n",  ntohl(old_hdr.stack_size));
-		printf("    Reloc Start:  0x%x\n",  ntohl(old_hdr.reloc_start));
-		printf("    Reloc Count:  0x%x\n",  ntohl(old_hdr.reloc_count));
-		printf("    Flags:        0x%x ( ",  ntohl(old_hdr.flags));
-		if (old_flags) {
-			if (old_flags & FLAT_FLAG_RAM)
-				printf("Load-to-Ram ");
-			if (old_flags & FLAT_FLAG_GOTPIC)
-				printf("Has-PIC-GOT ");
-			if (old_flags & FLAT_FLAG_GZIP)
-				printf("Gzip-Compressed ");
-			if (old_flags & FLAT_FLAG_GZDATA)
-				printf("Gzip-Data-Compressed ");
-			if (old_flags & FLAT_FLAG_KTRACE)
-				printf("Kernel-Traced-Load ");
-			printf(")\n");
-		}
-	} else if (print > 1) {
-		static int first = 1;
-		unsigned int text, data, bss, stk, rel, tot;
-
-		if (first) {
-			printf("Flag Rev   Text   Data    BSS  Stack Relocs    RAM Filename\n");
-			printf("-----------------------------------------------------------\n");
-			first = 0;
-		}
-		*tfile = '\0';
-		strcat(tfile, (old_flags & FLAT_FLAG_KTRACE) ? "k" : "");
-		strcat(tfile, (old_flags & FLAT_FLAG_RAM) ? "r" : "");
-		strcat(tfile, (old_flags & FLAT_FLAG_GOTPIC) ? "p" : "");
-		strcat(tfile, (old_flags & FLAT_FLAG_GZIP) ? "z" :
-					((old_flags & FLAT_FLAG_GZDATA) ? "d" : ""));
-		printf("-%-3.3s ", tfile);
-		printf("%3d ", ntohl(old_hdr.rev));
-		printf("%6d ", text=ntohl(old_hdr.data_start)-sizeof(struct flat_hdr));
-		printf("%6d ", data=ntohl(old_hdr.data_end)-ntohl(old_hdr.data_start));
-		printf("%6d ", bss=ntohl(old_hdr.bss_end)-ntohl(old_hdr.data_end));
-		printf("%6d ", stk=ntohl(old_hdr.stack_size));
-		printf("%6d ", rel=ntohl(old_hdr.reloc_count) * 4);
-		/*
-		 * work out how much RAM is needed per invocation, this
-		 * calculation is dependent on the binfmt_flat implementation
-		 */
-		tot = data; /* always need data */
-
-		if (old_flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP))
-			tot += text + sizeof(struct flat_hdr);
-		
-		if (bss + stk > rel) /* which is bigger ? */
-			tot += bss + stk;
-		else
-			tot += rel;
-
-		printf("%6d ", tot);
-		/*
-		 * the total depends on whether the relocs are smaller/bigger than
-		 * the BSS
-		 */
-		printf("%s\n", ifile);
-	}
-
-	/* if there is nothing else to do, leave */
-	if (new_flags == old_flags && new_stack == old_stack)
-		return;
-	
-	new_hdr.flags = htonl(new_flags);
-	new_hdr.stack_size = htonl(new_stack);
-
-	strcpy(tfile, "/tmp/flatXXXXXX");
-	mkstemp(tfile);
-	if ((ofp = fopen(tfile, "w" BINARY_FILE_OPTS)) == NULL) {
-		fprintf(stderr, "Failed to open %s for writing\n", tfile);
-		unlink(tfile);
-		unlink(tfile2);
-		exit(1);
-	}
-
-	if (fwrite(&new_hdr, sizeof(new_hdr), 1, ofp) != 1) {
-		fprintf(stderr, "Failed to write to  %s\n", tfile);
-		unlink(tfile);
-		unlink(tfile2);
-		exit(1);
-	}
-
-	/*
-	 * get ourselves a fully uncompressed copy of the text/data/relocs
-	 * so that we can manipulate it more easily
-	 */
-	if (old_flags & (FLAT_FLAG_GZIP|FLAT_FLAG_GZDATA)) {
-		FILE *tfp;
-
-		strcpy(tfile2, "/tmp/flat2XXXXXX");
-		mkstemp(tfile2);
-		
-		if (old_flags & FLAT_FLAG_GZDATA) {
-			tfp = fopen(tfile2, "w" BINARY_FILE_OPTS);
-			if (!tfp) {
-				fprintf(stderr, "Failed to open %s for writing\n", tfile2);
-				exit(1);
-			}
-			transferr(ifp, tfp, ntohl(old_hdr.data_start) -
-					sizeof(struct flat_hdr));
-			fclose(tfp);
-		}
-
-		sprintf(cmd, "gunzip >> %s", tfile2);
-		tfp = popen(cmd, "w" BINARY_FILE_OPTS);
-		if(!tfp) {
-			perror("popen");
-			exit(1);
-		}
-		transferr(ifp, tfp, -1);
-		pclose(tfp);
-
-		fclose(ifp);
-		ifp = fopen(tfile2, "r" BINARY_FILE_OPTS);
-		if (!ifp) {
-			fprintf(stderr, "Failed to open %s for reading\n", tfile2);
-			unlink(tfile);
-			unlink(tfile2);
-			exit(1);
-		}
-	}
-
-	if (new_flags & FLAT_FLAG_GZIP) {
-		printf("zflat %s --> %s\n", ifile, ofile);
-		fclose(ofp);
-		sprintf(cmd, "gzip -9 -f >> %s", tfile);
-		ofp = popen(cmd, "w" BINARY_FILE_OPTS);
-		ofp_is_pipe = 1;
-	} else if (new_flags & FLAT_FLAG_GZDATA) {
-		printf("zflat-data %s --> %s\n", ifile, ofile);
-		transferr(ifp, ofp, ntohl(new_hdr.data_start) -
-				sizeof(struct flat_hdr));
-		fclose(ofp);
-		sprintf(cmd, "gzip -9 -f >> %s", tfile);
-		ofp = popen(cmd, "w" BINARY_FILE_OPTS);
-		ofp_is_pipe = 1;
-	}
-
-	if (!ofp) { /* can only happen if using gzip/gunzip */
-		fprintf(stderr, "Can't run cmd %s\n", cmd);
-		unlink(tfile);
-		unlink(tfile2);
-		exit(1);
-	}
-
-	transferr(ifp, ofp, -1);
-	
-	if (ferror(ifp) || ferror(ofp)) {
-		fprintf(stderr, "Error on file pointer%s%s\n",
-				ferror(ifp) ? " input" : "", ferror(ofp) ? " output" : "");
-		unlink(tfile);
-		unlink(tfile2);
-		exit(1);
-	}
-
-	fclose(ifp);
-	if (ofp_is_pipe)
-		pclose(ofp);
-	else
-		fclose(ofp);
-
-	/* cheat a little here to preserve file permissions */
-	sprintf(cmd, "cp %s %s", tfile, ofile);
-	system(cmd);
-	unlink(tfile);
-	unlink(tfile2);
-}
-
-/****************************************************************************/
-
-void
-usage(char *s)
-{
-	if (s)
-		fprintf(stderr, "%s\n", s);
-	fprintf(stderr, "usage: %s [options] flat-file\n", program_name);
-	fprintf(stderr, "       Allows you to change an existing flat file\n\n");
-	fprintf(stderr, "       -p      : print current settings\n");
-	fprintf(stderr, "       -z      : compressed flat file\n");
-	fprintf(stderr, "       -d      : compressed data-only flat file\n");
-	fprintf(stderr, "       -Z      : un-compressed flat file\n");
-	fprintf(stderr, "       -r      : ram load\n");
-	fprintf(stderr, "       -R      : do not RAM load\n");
-	fprintf(stderr, "       -k      : kernel traced load (for debug)\n");
-	fprintf(stderr, "       -K      : normal non-kernel traced load\n");
-	fprintf(stderr, "       -s size : stack size\n");
-	fprintf(stderr, "       -o file : output-file\n"
-	                "                 (default is to modify input file)\n");
-	exit(1);
-}
-
-/****************************************************************************/
-
-int
-main(int argc, char *argv[])
-{
-	int c;
-	char *ofile = NULL, *ifile;
-
-	program_name = argv[0];
-
-	while ((c = getopt(argc, argv, "pdzZrRkKs:o:")) != EOF) {
-		switch (c) {
-		case 'p': print = 1;                break;
-		case 'z': compress = 1;             break;
-		case 'd': compress = 2;             break;
-		case 'Z': compress = -1;            break;
-		case 'r': ramload = 1;              break;
-		case 'R': ramload = -1;             break;
-		case 'k': ktrace = 1;               break;
-		case 'K': ktrace = -1;              break;
-		case 's': stacksize = atoi(optarg); break;
-		case 'o': ofile = optarg;           break;
-		default:
-			usage("invalid option");
-			break;
-		}
-	}
-
-	if (optind >= argc)
-		usage("No input files provided");
-
-	if (ofile && argc - optind > 1)
-		usage("-o can only be used with a single file");
-	
-	if (!print && !compress && !ramload && !stacksize) /* no args == print */
-		print = argc - optind; /* greater than 1 is short format */
-	
-	for (c = optind; c < argc; c++) {
-		ifile = argv[c];
-		if (!ofile)
-			ofile = ifile;
-		process_file(ifile, ofile);
-		ofile = NULL;
-	}
-	
-	exit(0);
-}
-
-/****************************************************************************/
diff --git a/package/elf2flt/src/install-sh b/package/elf2flt/src/install-sh
deleted file mode 100755
index 398a88e142..0000000000
--- a/package/elf2flt/src/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/package/elf2flt/src/ld-elf2flt.in b/package/elf2flt/src/ld-elf2flt.in
deleted file mode 100644
index b876636007..0000000000
--- a/package/elf2flt/src/ld-elf2flt.in
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/bin/sh
-#
-# allow us to do flat processing if the flag -Wl,-elf2flt or -elf2flt to
-# the 'C' compiler or linker respectively
-#
-# uses the env. var FLTFLAGS as extra parameters to pass to elf2flt
-# arguments given like -Wl,-elf2flt="-b 10000 -v" are given before FLTFLAGS
-#
-# Copyright (C) 2002,2003 David McCullough <davidm@snapgear.com>
-# Copyright (C) 2000, Lineo. davidm@lineo.com
-#
-# This is Free Software, under the GNU Public Licence v2 or greater.
-#
-
-LINKER="$0.real"            # the original renamed-linker
-ELF2FLT="`expr $0 : '\(.*\)ld'`elf2flt"
-NM="`expr $0 : '\(.*\)ld'`nm"
-TOOLDIR="`dirname $0`"      # let gcc find the tools for us
-OBJCOPY="`expr $0 : '\(.*\)ld'`objcopy"
-[ -f "$OBJCOPY" ] || OBJCOPY="$TOOLDIR/../../bin/@target_alias@-objcopy"
-OBJDUMP="`expr $OBJCOPY : '\(.*\)objcopy'`objdump"
-LDSCRIPTPATH="@binutils_ldscript_dir@"	# and the scripts
-SHARED_ID=""
-NEWLDSCRIPT=""
-
-# check TOOLDIR from prefix/bin/ or prefix/target-alias/bin/
-[ -d "${LDSCRIPTPATH}" ] || LDSCRIPTPATH="${TOOLDIR}/../lib"
-
-#
-# if we have the elf2flt options, run it
-#
-
-if expr "$*" : ".*-elf2flt.*" > /dev/null
-then
-	ARG1=
-	ARG2=
-	OFILE="a.out"
-	PIC=
-	SDIRS=
-	LDSCRIPT=
-	FINAL="yes"
-	FINAL_ONLY=
-	MOVDAT=
-	VERBOSE=
-
-	while [ $# -ne 0 ]
-	do
-		case "$1" in
-
-		-elf2flt) ;;                           # we already know this
-		-elf2flt*)FLTFLAGS="`expr \"$1\" : '-elf2flt=\(.*\)'` $FLTFLAGS";; 
-
-		-move-rodata)
-		          MOVDAT="y";;                 # Put rodata in ROM if possible
-			 
-		-shared-lib-id)
-		          shift; SHARED_ID="$1";;      # Shared library ID
-
-		-o)       shift; OFILE="$1";;          # the final outfile
-		-o*)      OFILE="`expr \"$1\" : '-o\(.*\)'`";;
-
-		-T)       shift; LDSCRIPT="$1";;       # they have a linker script
-		-c)       shift; LDSCRIPT="$1";;
-
-		-L)       ARG1="$ARG1 $1"              # remember search dirs
-		          shift;
-				  ARG1="$ARG1 $1"
-				  SDIRS="$SDIRS -L$1"
-				  ;;
-		-L*)      ARG1="$ARG1 $1"; SDIRS="$SDIRS $1";;
-
-		-EB)      ARG1="$ARG1 $1"; SDIRS="$SDIRS $1";; # arm big endian
-
-		-relax)   ;;                           # eat this for microblaze
-
-		-r|-Ur)   FINAL=""                     # this is not a final link
-		          ARG1="$ARG1 $1"
-				  ;;
-
-		-v)       ARG1="$ARG1 $1"
-				  VERBOSE="y"
-				  ;;
-
-		-m)       shift; EMUL="-m $1";;        # ld emulations for h8300
-		-m*)      EMUL=$1;;
- 
-		*)        ARG1="$ARG1 $1"
-				  ;;
-		esac
-		shift
-	done
-
-	if [ "$FINAL" = "yes" ]
-	then
-		[ "$VERBOSE" = "y" ] && set -x
-		ARG1="$ARG1 $FINAL_ONLY"
-		NEWLDSCRIPT=`mktemp /tmp/flt-XXXXXX`
-		SEDOP=" -e s/^R_RODAT// -e /^W_RODAT/d"
-		OBJCOPYOP=""
-		if [ "$MOVDAT" ]
-		then
-			$LINKER -r -d -o "$OFILE.elf2flt" $ARG1  || exit $?
-			if [ "`$OBJDUMP -h "$OFILE.elf2flt" | \
-					egrep -A1 '[.]rodata' | grep RELOC`" ]
-			then
-				echo "warning: .rodata section contains relocations"
-			else
-				SEDOP="-e /^R_RODAT/d -e s/^W_RODAT//"
-			fi
-		fi
-		if [ "$SHARED_ID" ]
-		then
-			# Massage the linker script into something useful.  These
-			# regexps are ugly due to some bizzare shell quoting rules.
-			#    SEDOP="$SEDOP -e \"s/ORIGIN = 0x0,/ORIGIN = 0x${SHARED_ID}000000,/\""
-			#    SEDOP="$SEDOP -e \"s/.text 0x0 :/.text 0x${SHARED_ID}000000 :/\""			
-			SEDOP="$SEDOP -e s/\\(ORIGIN.=.0\\)x0,/\\1x${SHARED_ID}000000,/"
-			SEDOP="$SEDOP -e s/\\([.]text.0\\)x0[^0-9]:/\\1x${SHARED_ID}000000:/"
-			
-			if [ "$SHARED_ID" -gt 0 ]
-			then
-				# Non application modules enter via main not _start
-				#    SEDOP="$SEDOP -e 's/ENTRY (_start)/ENTRY (main)/'"
-				SEDOP="$SEDOP -e s/\\(ENTRY.\\)(_start)/\1(lib_main)/"
-				OBJCOPYOP="--localize-hidden --weaken"
-			fi
-
-			# Provide the magic parameter that defines the library data segment pointer offset
-			case "@target_cpu@" in
-			    h8300) GOT_OFFSET="__current_shared_library_er5_offset_";;
-			    *)     GOT_OFFSET="_current_shared_library_a5_offset_";;
-			esac
-			ARG1="$ARG1 -defsym $GOT_OFFSET=`expr ${SHARED_ID} '*' -4 - 4`"
-		fi
-		if [ "@emit_relocs@" = "yes" ]
-		then
-			SEDOP="$SEDOP -e s/^SINGLE_LINK://"
-		else
-			SEDOP="$SEDOP -e /^SINGLE_LINK:/d"
-		fi
-		
-		# provide a default linker script, we usually need one
-		[ -z "$LDSCRIPT" ] && LDSCRIPT="${LDSCRIPTPATH}/elf2flt.ld"
-
-		# if we can find the linker script we preprocess it,  otherwise
-		# we assume the user knows what they are doing
-		if [ -f "$LDSCRIPT" ]; then
-			sed $SEDOP < "$LDSCRIPT" > "$NEWLDSCRIPT"
-			LDSCRIPT="$NEWLDSCRIPT"
-		elif [ -f "${LDSCRIPTPATH}/$LDSCRIPT" ]; then
-			sed $SEDOP < "${LDSCRIPTPATH}/$LDSCRIPT" > "$NEWLDSCRIPT"
-			LDSCRIPT="$NEWLDSCRIPT"
-		elif [ -f "${LDSCRIPTPATH}/ldscripts/$LDSCRIPT" ]; then
-			sed $SEDOP < "${LDSCRIPTPATH}/ldscripts/$LDSCRIPT" > "$NEWLDSCRIPT"
-			LDSCRIPT="$NEWLDSCRIPT"
-		fi
-
-		if [ "@emit_relocs@" = "yes" ]
-		then
-		 $LINKER $EMUL $SDIRS -T $LDSCRIPT -q -o "$OFILE.gdb" $ARG1             ||exit $?
-		 RFILE="$OFILE.gdb"
-		 FLTFLAGS="$FLTFLAGS -a"
-		else
-		 if [ "@got_check@" = "no" ]
-		 then
-		  $LINKER $EMUL $SDIRS -T $LDSCRIPT -Ur -d -o "$OFILE.elf" $ARG1         ||exit $?
-		  $LINKER $EMUL $SDIRS -T $LDSCRIPT -o "$OFILE.gdb" $ARG1                ||exit $?
-		 else
-		  $LINKER $EMUL -r -d -o "$OFILE.elf2flt" $ARG1                          ||exit $?
-		  $LINKER $EMUL $SDIRS -T $LDSCRIPT -Ur -o "$OFILE.elf" "$OFILE.elf2flt" ||exit $?
-		  $LINKER $EMUL $SDIRS -T $LDSCRIPT -o "$OFILE.gdb" "$OFILE.elf2flt"     ||exit $?
-		  rm -f "$OFILE.elf2flt"
-		 fi
-		 RFILE="$OFILE.elf"
-		fi
-		if $NM "$OFILE.gdb" | grep _GLOBAL_OFFSET_TABLE_ > /dev/null 
-		then
-			$ELF2FLT $FLTFLAGS -o "$OFILE" -p "$OFILE.gdb" "$RFILE" || exit $?
-		else
-			$ELF2FLT $FLTFLAGS -o "$OFILE" -r "$RFILE" || exit $?
-		fi
-		if [ "$OBJCOPYOP" ]
-		then
-		 if $OBJCOPY $OBJCOPYOP --help > /dev/null 2>&1
-		 then
-		  $OBJCOPY $OBJCOPYOP "$OFILE.gdb" ||exit $?
-		 else
-		  case " $OBJCOPYOP " in
-		  *" --localize-hidden "*)
-		    SYMS=`mktemp /tmp/flt-XXXXXX`
-		    $OBJDUMP --syms "$OFILE.gdb" > "$SYMS" ||exit $?
-		    sed -n 's/.*\(\.hidden\|\.internal\) \(.*\)/-L \2/p' < "$SYMS" > "$SYMS.hidden" ||exit $?
-		    if [ -s "$SYMS.hidden" ]
-		    then
-		     xargs ${VERBOSE:+-t} $OBJCOPY "$OFILE.gdb" < "$SYMS.hidden" ||exit $?
-		    fi
-		    rm -f "$SYMS" "$SYMS.hidden"
-		    ;;
-		  esac
-		  case " $OBJCOPYOP " in
-		  *" --weaken "*)
-		    $OBJCOPY --weaken "$OFILE.gdb" ||exit $?
-		    ;;
-		  esac
-		 fi
-		fi
-		[ "$RFILE" = "$OFILE.gdb" ] || rm -f "$RFILE"  # not needed for any reason
-		rm -f "$NEWLDSCRIPT"
-		exit 0
-	fi
-
-	exec $LINKER -o "$OFILE" $ARG1
-fi
-
-#
-# otherwise pretend we aren't here
-#
-
-exec $LINKER "$@"
diff --git a/package/elf2flt/src/maketarball.sh b/package/elf2flt/src/maketarball.sh
deleted file mode 100755
index 10148608aa..0000000000
--- a/package/elf2flt/src/maketarball.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-cvs_stamp=$(cut -d/ -f4 CVS/Entries | sort | tail -n 1)
-stamp=$(date +%Y%m%d --date="${cvs_stamp}")
-
-p="elf2flt-${stamp}"
-rm -f elf2flt-*.tar.bz2
-mkdir ../${p}
-cp -r * ../${p}/ || exit 1
-tar jcf ${p}.tar.bz2 --exclude .svn -C .. ${p}
-rm -r ../${p} || exit 1
-du -b ${p}.tar.bz2
diff --git a/package/elf2flt/src/stubs.c b/package/elf2flt/src/stubs.c
deleted file mode 100644
index fb14d6319b..0000000000
--- a/package/elf2flt/src/stubs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef HAVE_DCGETTEXT
-const char *dcgettext (const char *domain, const char *msg, int category)
-{
-  return msg;
-}
-#endif /* !HAVE_DCGETTEXT */

From afa2a7cebe1d7c31adfd69548842978ea00f6c75 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 13 Sep 2013 11:06:43 +0200
Subject: [PATCH 6091/6849] nfs-utils: fix build failure caused by missing
 include

Fixes http://autobuild.buildroot.net/results/a7fabcf61d56bca4bb005a91f8f367ffc8474ea0/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...7-sockaddr-h-needs-stddef-h-for-NULL.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/nfs-utils/nfs-utils-0007-sockaddr-h-needs-stddef-h-for-NULL.patch

diff --git a/package/nfs-utils/nfs-utils-0007-sockaddr-h-needs-stddef-h-for-NULL.patch b/package/nfs-utils/nfs-utils-0007-sockaddr-h-needs-stddef-h-for-NULL.patch
new file mode 100644
index 0000000000..8fcf1dded5
--- /dev/null
+++ b/package/nfs-utils/nfs-utils-0007-sockaddr-h-needs-stddef-h-for-NULL.patch
@@ -0,0 +1,19 @@
+[PATCH] sockaddr.h: needs stddef.h for NULL
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ support/include/sockaddr.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: nfs-utils-1.2.6/support/include/sockaddr.h
+===================================================================
+--- nfs-utils-1.2.6.orig/support/include/sockaddr.h
++++ nfs-utils-1.2.6/support/include/sockaddr.h
+@@ -25,6 +25,7 @@
+ #include <libio.h> 
+ #endif
+ #include <stdbool.h>
++#include <stddef.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ 

From cd2ff4f637774c2bf7b3d3d11b5e138abf85ef15 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 13 Sep 2013 10:30:20 +0200
Subject: [PATCH 6092/6849] package: remove the empty trailing lines

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 fs/initramfs/initramfs.mk                                       | 1 -
 package/alsamixergui/alsamixergui.mk                            | 1 -
 package/ccache/ccache.mk                                        | 1 -
 package/cvs/cvs.mk                                              | 2 --
 package/dfu-util/dfu-util.mk                                    | 1 -
 package/directfb-examples/directfb-examples.mk                  | 1 -
 package/elftosb/elftosb.mk                                      | 1 -
 package/freescale-imx/freescale-imx.mk                          | 1 -
 package/gamin/gamin.mk                                          | 1 -
 package/gnuchess/gnuchess.mk                                    | 1 -
 package/gqview/gqview.mk                                        | 1 -
 package/grantlee/grantlee.mk                                    | 1 -
 package/gtkperf/gtkperf.mk                                      | 1 -
 package/intltool/intltool.mk                                    | 1 -
 package/leafpad/leafpad.mk                                      | 1 -
 package/libaio/libaio.mk                                        | 1 -
 package/libical/libical.mk                                      | 1 -
 package/libiqrf/libiqrf.mk                                      | 1 -
 package/libv4l/libv4l.mk                                        | 1 -
 package/libxml-parser-perl/libxml-parser-perl.mk                | 1 -
 package/libyaml/libyaml.mk                                      | 1 -
 package/mongrel2/mongrel2.mk                                    | 1 -
 package/pcmanfm/pcmanfm.mk                                      | 1 -
 package/pkg-cmake.mk                                            | 1 -
 package/polarssl/polarssl.mk                                    | 1 -
 package/python-dpkt/python-dpkt.mk                              | 1 -
 package/rt-tests/rt-tests.mk                                    | 1 -
 package/rubix/rubix.mk                                          | 1 -
 package/squashfs3/squashfs3.mk                                  | 1 -
 package/startup-notification/startup-notification.mk            | 1 -
 package/tcpreplay/tcpreplay.mk                                  | 1 -
 package/tinymembench/tinymembench.mk                            | 1 -
 package/torsmo/torsmo.mk                                        | 1 -
 package/weston/weston.mk                                        | 1 -
 package/x11r7/libxcb/libxcb.mk                                  | 1 -
 package/x11r7/xcb-proto/xcb-proto.mk                            | 1 -
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk              | 1 -
 package/x11r7/xcb-util/xcb-util.mk                              | 1 -
 .../x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk    | 1 -
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk  | 1 -
 .../xfont_font-adobe-utopia-100dpi.mk                           | 1 -
 .../xfont_font-adobe-utopia-75dpi.mk                            | 1 -
 .../xfont_font-adobe-utopia-type1.mk                            | 1 -
 package/x11r7/xfont_font-alias/xfont_font-alias.mk              | 1 -
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk  | 1 -
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk      | 1 -
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk        | 1 -
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                    | 1 -
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                     | 1 -
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk            | 1 -
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk        | 1 -
 .../xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk  | 1 -
 .../xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk    | 1 -
 .../xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk    | 1 -
 .../xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk    | 1 -
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk  | 1 -
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk  | 1 -
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk        | 1 -
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk      | 1 -
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk      | 1 -
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk        | 1 -
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk    | 1 -
 .../x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk  | 1 -
 .../x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk  | 1 -
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk  | 1 -
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk      | 1 -
 .../xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk    | 1 -
 .../xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk    | 1 -
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk      | 1 -
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk        | 1 -
 .../xfont_font-winitzki-cyrillic.mk                             | 1 -
 .../x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk  | 1 -
 package/x11r7/xkeyboard-config/xkeyboard-config.mk              | 1 -
 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk    | 1 -
 package/xstroke/xstroke.mk                                      | 1 -
 package/xvkbd/xvkbd.mk                                          | 1 -
 support/dependencies/dependencies.mk                            | 1 -
 77 files changed, 78 deletions(-)

diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index fe426cc3d8..7820d65a42 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -20,4 +20,3 @@ rootfs-initramfs-show-depends:
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 TARGETS += rootfs-initramfs
 endif
-
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index c61e902c10..8f05350971 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -16,4 +16,3 @@ ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
 ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib
 
 $(eval $(autotools-package))
-
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index a2f709efd7..c5e93857c5 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -45,4 +45,3 @@ ifeq ($(BR2_CCACHE),y)
 ccache-stats: host-ccache
 	$(Q)$(CCACHE) -s
 endif
-
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 7371644a07..d2a1033ab3 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -50,5 +50,3 @@ define CVS_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(autotools-package))
-
-
diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
index 2f596b13a6..eab8c73ad4 100644
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@@ -11,4 +11,3 @@ DFU_UTIL_SITE = http://dfu-util.gnumonks.org/releases/
 HOST_DFU_UTIL_DEPENDENCIES = host-libusb
 
 $(eval $(host-autotools-package))
-
diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk
index 0a2138ed7f..16d2a8623a 100644
--- a/package/directfb-examples/directfb-examples.mk
+++ b/package/directfb-examples/directfb-examples.mk
@@ -107,4 +107,3 @@ define DIRECTFB_EXAMPLES_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(autotools-package))
-
diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
index 1e17c5b049..b2bd76f477 100644
--- a/package/elftosb/elftosb.mk
+++ b/package/elftosb/elftosb.mk
@@ -23,4 +23,3 @@ define HOST_ELFTOSB_CLEAN_CMDS
 endef
 
 $(eval $(host-generic-package))
-
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index c8f99b6348..d35a62e479 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -10,4 +10,3 @@ FREESCALE_IMX_VERSION = 1.1.0
 FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
 
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
-
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index c7ec531a8f..9f6ec9672b 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -25,4 +25,3 @@ endif
 GAMIN_DEPENDENCIES = libglib2
 
 $(eval $(autotools-package))
-
diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
index 9d7dd79bef..e91046d59d 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/gnuchess/gnuchess.mk
@@ -14,4 +14,3 @@ GNUCHESS_DEPENDENCIES = host-flex flex
 GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline)
 
 $(eval $(autotools-package))
-
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index c5131a4921..bffda59e0b 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -11,4 +11,3 @@ GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
 GQVIEW_CONF_ENV = LIBS="-lm"
 
 $(eval $(autotools-package))
-
diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk
index edaab2bc37..2ad5888e03 100644
--- a/package/grantlee/grantlee.mk
+++ b/package/grantlee/grantlee.mk
@@ -10,4 +10,3 @@ GRANTLEE_INSTALL_STAGING = YES
 GRANTLEE_DEPENDENCIES =  qt
 
 $(eval $(cmake-package))
-
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index 27403abbfc..fa9531dcd9 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -10,4 +10,3 @@ GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPER
 GTKPERF_DEPENDENCIES = libgtk2
 
 $(eval $(autotools-package))
-
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index f3c1e67304..37729607df 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -16,4 +16,3 @@ HOST_INTLTOOL_CONF_OPT = \
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index a34a2d7fa9..8a04ebffd8 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -10,4 +10,3 @@ LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
 LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
 
 $(eval $(autotools-package))
-
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index a046157b02..b66c9f57ef 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -22,4 +22,3 @@ define LIBAIO_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index dd2fff7abf..cdee006ebc 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -9,4 +9,3 @@ LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/
 LIBICAL_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
-
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index df4bb421d8..6c33654e95 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -11,4 +11,3 @@ LIBIQRF_INSTALL_STAGING = YES
 LIBIQRF_DEPENDENCIES = libusb
 
 $(eval $(cmake-package))
-
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 936240406b..f62a4b6e09 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -41,4 +41,3 @@ define LIBV4L_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index a863f485e0..53f3bcf6ea 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -33,4 +33,3 @@ endef
 
 $(eval $(generic-package))
 $(eval $(host-generic-package))
-
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index ef006dd270..17945b2fb2 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -10,4 +10,3 @@ LIBYAML_SITE = http://pyyaml.org/download/libyaml/
 LIBYAML_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
-
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index c06810793b..116754c56b 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -28,4 +28,3 @@ define MONGREL2_UNINSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 90b3959dc8..edc970ea7d 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -12,4 +12,3 @@ PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX
 PCMANFM_AUTORECONF = YES
 
 $(eval $(autotools-package))
-
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 626a0b00c2..0e0872260d 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -202,4 +202,3 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
 	set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\
 	" > $@
-
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index f3bc421ccd..781b6bc48e 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -18,4 +18,3 @@ POLARSSL_LICENSE = GPLv2
 POLARSSL_LICENSE_FILES = LICENSE
 
 $(eval $(cmake-package))
-
diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk
index 7518ee0cc4..314415cc32 100644
--- a/package/python-dpkt/python-dpkt.mk
+++ b/package/python-dpkt/python-dpkt.mk
@@ -19,4 +19,3 @@ define PYTHON_DPKT_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index f574d3a8ed..e6455d556a 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -28,4 +28,3 @@ define RT_TESTS_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
index 1e10c64036..732f807dfd 100644
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -14,4 +14,3 @@ RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB=
 RUBIX_DEPENDENCIES = xlib_libX11
 
 $(eval $(autotools-package))
-
diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk
index 4df1af6085..fbcc8a470d 100644
--- a/package/squashfs3/squashfs3.mk
+++ b/package/squashfs3/squashfs3.mk
@@ -32,4 +32,3 @@ endef
 
 $(eval $(generic-package))
 $(eval $(host-generic-package))
-
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index 1ce607f5d2..7ebebddb6e 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -15,4 +15,3 @@ STARTUP_NOTIFICATION_CONF_OPT = --with-x \
 	--x-libraries="$(STAGING_DIR)/usr/lib"
 
 $(eval $(autotools-package))
-
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index f74b9f459a..f2b199125c 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -16,4 +16,3 @@ TCPREPLAY_LIBS = -lpcap $(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
 TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close='$(TCPREPLAY_LIBS)'
 
 $(eval $(autotools-package))
-
diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk
index 285d1fdbeb..732616fce8 100644
--- a/package/tinymembench/tinymembench.mk
+++ b/package/tinymembench/tinymembench.mk
@@ -19,4 +19,3 @@ define TINYMEMBENCH_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index 505ae096bd..a09013a65c 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -15,4 +15,3 @@ TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries=
 TORSMO_DEPENDENCIES = xlib_libX11 xlib_libXext
 
 $(eval $(autotools-package))
-
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 3e9f3c946f..6f7703ed4a 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -30,4 +30,3 @@ WESTON_CONF_OPT += --disable-fbdev-compositor
 endif
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 0f87ba993a..dfcf6faa93 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -24,4 +24,3 @@ HOST_LIBXCB_CONF_OPT = --disable-build-docs
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 782238f031..98d0f029cb 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -16,4 +16,3 @@ XCB_PROTO_DEPENDENCIES = host-python
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-
diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
index 45a4c68101..8598b20def 100644
--- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
+++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
@@ -14,4 +14,3 @@ XCB_UTIL_KEYSYMS_LICENSE = MIT
 XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index 29fa0132c3..a3531d0200 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -15,4 +15,3 @@ XCB_UTIL_INSTALL_STAGING = YES
 XCB_UTIL_DEPENDENCIES = host-gperf libxcb
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 2bc2c7983e..5f109a192a 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index 15d0b6b154..51813e4f9d 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index ec14c5397e..88b6d73553 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONT
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index ce190dbc65..7ff2ef975f 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTS
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index a356f03f07..647ef576f5 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTS
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index ad048822bd..43ed253e44 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_D
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index 7c296b6282..3b000a35bb 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index 37a9af3118..dc153711eb 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HO
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index e525ce9124..f86c1d1d1d 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index 1b3b66f854..c2be04814c 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR)
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 390f1f2b0a..c22d22fe57 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR)
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index 7213ebceaa..cbf46c6241 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index dc5829b25c..bf8b65ed69 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index c6c08c5837..4126263c1f 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCA
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index d6c2ee37e9..330d551495 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCAL
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 5bcc31a968..7b1a588e01 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -15,4 +15,3 @@ XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCAL
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 93bdafe9e4..aa230867db 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -15,4 +15,3 @@ XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCAL
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index efce6bdd4a..f84124a397 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index fc6ecbf904..576f760a06 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -14,4 +14,3 @@ XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index f2f71f166a..d4c7984e68 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 42df33a189..da0ebb64ce 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -15,4 +15,3 @@ XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HO
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 84dbf7d690..d4b2c6b395 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HO
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index a65990b3ce..d19e5bcab9 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -14,4 +14,3 @@ XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 2ea5dd32ce..e60b230358 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(H
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index ae54a8b9ea..3cc529bc00 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -15,4 +15,3 @@ XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index b05b572ec4..7e42b71e04 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -15,4 +15,3 @@ XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index b71275d313..10046943b9 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -15,4 +15,3 @@ XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 2333f769ac..65aa9958ed 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HO
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 45cc24975b..4544940bc5 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCAL
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index 91cc3a0c52..030d418b64 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -15,4 +15,3 @@ XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCAL
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index db7155d729..ff77d7a090 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HO
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 09e17c3dbe..f335735324 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -15,4 +15,3 @@ XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index c214446dfa..0df49cac17 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -15,4 +15,3 @@ XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSC
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 4a9fea047f..946e409cc2 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -15,4 +15,3 @@ XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index 0451d154d8..49540df8e6 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -14,4 +14,3 @@ XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
 XKEYBOARD_CONFIG_CONF_OPT += --disable-runtime-deps
 
 $(eval $(autotools-package))
-
diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
index 082cc4d95f..5ea02e9605 100644
--- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
+++ b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
@@ -14,4 +14,3 @@ XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index a4b04ac0e7..544049579a 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -12,4 +12,3 @@ XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm xlib_libXrender xlib
 XSTROKE_AUTORECONF = YES
 
 $(eval $(autotools-package))
-
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index a28751bc51..c7d40a1323 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -31,4 +31,3 @@ XVKBD_DEPENDENCIES = \
 	xlib_libXtst
 
 $(eval $(generic-package))
-
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index 149b8e5dcc..97f85e66f8 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -47,4 +47,3 @@ dependencies-dirclean:
 #
 ################################################################################
 .PHONY: dependencies core-dependencies
-

From cccb417e8fb169569561cfa4446e43db714eab36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= <rebillout@syscom.ch>
Date: Fri, 13 Sep 2013 09:33:58 +0200
Subject: [PATCH 6093/6849] tcping: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tcping does a TCP connect to the given ip/port combination. The user can
specify a timeout in seconds. This is useful in shell scripts running in
firewalled environments. Often SYNs are just being dropped by firewalls,
thus connection establishment will be retried several times (for minutes)
until a TCP timeout is reached. With tcping it is possible to check first
if the desired port is reachable and then start connection establishment.

http://www.linuxco.de/tcping/tcping.html

[Peter: wrap help text, pass TARGET_LDFLAGS]
Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in        |  1 +
 package/tcping/Config.in | 14 ++++++++++++++
 package/tcping/tcping.mk | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/tcping/Config.in
 create mode 100644 package/tcping/tcping.mk

diff --git a/package/Config.in b/package/Config.in
index aae3296dee..3ea4b4ecbd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -858,6 +858,7 @@ source "package/squid/Config.in"
 source "package/strongswan/Config.in"
 source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
+source "package/tcping/Config.in"
 source "package/tcpreplay/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tftpd/Config.in"
diff --git a/package/tcping/Config.in b/package/tcping/Config.in
new file mode 100644
index 0000000000..6677b58b7c
--- /dev/null
+++ b/package/tcping/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_TCPING
+	bool "tcping"
+	help
+	  tcping does a TCP connect to the given ip/port
+	  combination. The user can specify a timeout in seconds. This
+	  is useful in shell scripts running in firewalled
+	  environments. Often SYNs are just being dropped by
+	  firewalls, thus connection establishment will be retried
+	  several times (for minutes) until a TCP timeout is
+	  reached. With tcping it is possible to check first if the
+	  desired port is reachable and then start connection
+	  establishment.
+
+	  http://www.linuxco.de/tcping/tcping.html
diff --git a/package/tcping/tcping.mk b/package/tcping/tcping.mk
new file mode 100644
index 0000000000..ff43490c81
--- /dev/null
+++ b/package/tcping/tcping.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# tcping
+#
+################################################################################
+
+TCPING_VERSION = 1.3.5
+TCPING_SITE = http://www.linuxco.de/tcping
+TCPING_LICENSE = GPLv3+
+TCPING_LICENSE_FILES = LICENSE
+
+define TCPING_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
+		-C $(@D) tcping.linux
+endef
+
+define TCPING_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/tcping $(TARGET_DIR)/usr/bin/tcping
+endef
+
+$(eval $(generic-package))

From c908fee17a8d8ac13c231af4d1254dcebfd6fbb4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Sep 2013 11:52:19 -0300
Subject: [PATCH 6094/6849] linux-headers: bump 3.{0, 4, 10, 11}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.95 => 3.0.96}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.95/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.96/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.95/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.96/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 3dc0b9df0c..bc8f821dbb 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,17 +76,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.95"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.96"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.61"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.62"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.11"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11"		if BR2_KERNEL_HEADERS_3_11
+	default "3.10.12"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.1"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From cb8f7225e2da4e445640fea2099ea2ffa54a403f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 15 Sep 2013 11:52:20 -0300
Subject: [PATCH 6095/6849] linux: bump 3.11.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 7864f6518c..a96ee04390 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11"
+	bool "3.11.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11.1" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From f88689801a2c27d58974ceb5927c8319005605d4 Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Fri, 13 Sep 2013 11:28:43 -0500
Subject: [PATCH 6096/6849] omniorb: new package

[Peter: fix C++ dependency and trailing spaces, drop ';' from fixup hook]
Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/omniorb/Config.in                     | 14 ++++++
 ...mniorb-0001-crosscompile-tool-export.patch | 30 ++++++++++++
 package/omniorb/omniorb.mk                    | 46 +++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 package/omniorb/Config.in
 create mode 100644 package/omniorb/omniorb-0001-crosscompile-tool-export.patch
 create mode 100644 package/omniorb/omniorb.mk

diff --git a/package/Config.in b/package/Config.in
index 3ea4b4ecbd..ca92812d83 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -626,6 +626,7 @@ source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
 source "package/libwebsockets/Config.in"
 source "package/nss-mdns/Config.in"
+source "package/omniorb/Config.in"
 source "package/openpgm/Config.in"
 source "package/ortp/Config.in"
 source "package/slirp/Config.in"
diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in
new file mode 100644
index 0000000000..d94603c128
--- /dev/null
+++ b/package/omniorb/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_OMNIORB
+	bool "omniorb"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  omniORB is a robust high performance CORBA ORB for C++ and Python.
+	  omniORB is largely CORBA 2.6 compliant. omniORB is one of only
+	  three ORBs to have been awarded the Open Group's Open Brand for
+	  CORBA. This means that omniORB has been tested and certified
+	  CORBA compliant, to version 2.1 of the CORBA specification.
+
+	  http://omniorb.sourceforge.net/
+
+comment "omniORB requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/omniorb/omniorb-0001-crosscompile-tool-export.patch b/package/omniorb/omniorb-0001-crosscompile-tool-export.patch
new file mode 100644
index 0000000000..260d86f314
--- /dev/null
+++ b/package/omniorb/omniorb-0001-crosscompile-tool-export.patch
@@ -0,0 +1,30 @@
+beforeauto.mk.in: added support for overriding the configure time
+defined CC/CXX/RANLIB/CPP variables so that a couple pkg tools could be
+built which generate code during the cross compile build.
+
+http://www.omniorb-support.com/pipermail/omniorb-list/2013-September/031473.html
+
+Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
+
+--- omniorb-4.1.6.orig/mk/beforeauto.mk.in	2013-09-12 12:49:55.668708148 -0500
++++ omniorb-4.1.6/mk/beforeauto.mk.in	2013-09-12 12:51:22.707928579 -0500
+@@ -672,15 +672,15 @@
+ #
+ 
+ AR              = ar cq
+-CC              = @CC@
+-CXX             = @CXX@
+-RANLIB		= @RANLIB@
++CC		?= @CC@
++CXX		?= @CXX@
++RANLIB		?= @RANLIB@
+ MKDIRHIER	= $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
+ INSTLIBFLAGS	= -m 0644
+ INSTEXEFLAGS	= -m 0755
+ CP		= cp
+ MV		= mv -f
+-CPP		= @CPP@
++CPP		?= @CPP@
+ OMKDEPEND	= $(TOOLBINDIR)/omkdepend
+ RMDIRHIER	= $(RM) -rf
+ 
diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
new file mode 100644
index 0000000000..8a41dc7ef6
--- /dev/null
+++ b/package/omniorb/omniorb.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# omniorb
+#
+################################################################################
+
+OMNIORB_VERSION = 4.1.6
+OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION)
+OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2
+OMNIORB_INSTALL_STAGING = YES
+OMNIORB_LICENSE = GPL2+ LGPLv2.1+
+OMNIORB_LICENSE_FILES = COPYING COPYING.LIB
+# Required for internal code generation scripts
+OMNIORB_DEPENDENCIES = host-python
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+	OMNIORB_DEPENDENCIES += python
+	OMNIORB_CONF_OPT += --enable-python-bindings
+else
+	OMNIORB_CONF_OPT += --disable-python-bindings
+endif
+
+# omniORB is currently not cross-compile friendly and has some assumptions
+# where a couple host tools are built in place and then used during the
+# build.  The tools generate code from the IDL description language, which
+# is then built into the cross compiled OMNIORB application.
+# So this first hook builds the tools required for the host side
+# generation of code. Then the second hook cleans up before the install.
+define OMNIORB_BUILD_TOOLS
+	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+		-C $(@D)/src/tool export
+endef
+OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_BUILD_TOOLS
+
+define OMNIORB_CLEAN_TOOLS
+	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+		-C $(@D)/src/tool clean
+endef
+OMNIORB_POST_BUILD_HOOKS += OMNIORB_CLEAN_TOOLS
+
+define OMNIORB_FIXUP_FILE_PATHS_HOOK
+	$(SED) "s:$(HOST_DIR)/usr:/usr:g" $(STAGING_DIR)/usr/bin/omniidl
+endef
+OMNIORB_POST_INSTALL_STAGING_HOOKS += OMNIORB_FIXUP_FILE_PATHS_HOOK
+
+$(eval $(autotools-package))

From 710e0b4d69c2fd334cfdda0bbd5e35545e4414a6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 13 Sep 2013 13:42:38 -0300
Subject: [PATCH 6097/6849] squid: fix build failure after bump

Add missing patch, fixes:
http://autobuild.buildroot.net/results/f6a/f6a6dd1f3138406d1daa31e5e4ff5d5026b3c069/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/squid/squid-02-atomic-cross.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/squid/squid-02-atomic-cross.patch

diff --git a/package/squid/squid-02-atomic-cross.patch b/package/squid/squid-02-atomic-cross.patch
new file mode 100644
index 0000000000..c1b59dc65e
--- /dev/null
+++ b/package/squid/squid-02-atomic-cross.patch
@@ -0,0 +1,17 @@
+AC_RUN_IFELSE is bad for cross compiling, switch to AC_COMPILE_IFELSE
+since it's enough for this test.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura squid-3.3.9.orig/configure.ac squid-3.3.9/configure.ac
+--- squid-3.3.9.orig/configure.ac	2013-09-13 09:15:32.473365627 -0300
++++ squid-3.3.9/configure.ac	2013-09-13 13:27:06.829711487 -0300
+@@ -392,7 +392,7 @@
+ dnl Check for atomic operations support in the compiler
+ dnl
+ AC_MSG_CHECKING([for GNU atomic operations support])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+     int n = 0;
+ ]],[[
+     __sync_add_and_fetch(&n, 10); // n becomes 10

From 1e9b983fe24fd9345df609e1f84a570208cdb45e Mon Sep 17 00:00:00 2001
From: Michael Rommel <rommel@layer-7.net>
Date: Fri, 13 Sep 2013 22:57:04 +0200
Subject: [PATCH 6098/6849] aiccu: new package

Automatic IPv6 Connectivity Configuration Utility for users of a
IPv6 tunnel broker, developed by sixxs.net

[Peter: drop strip patch, pass TARGET_CONFIGURE_OPTS]
Signed-off-by: Michael Rommel <rommel@layer-7.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/aiccu/Config.in                       |  21 ++++
 .../aiccu-0001-gnutls-and-uclibc-fixes.patch  | 104 ++++++++++++++++++
 package/aiccu/aiccu.mk                        |  34 ++++++
 4 files changed, 160 insertions(+)
 create mode 100644 package/aiccu/Config.in
 create mode 100644 package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch
 create mode 100644 package/aiccu/aiccu.mk

diff --git a/package/Config.in b/package/Config.in
index ca92812d83..973d32c707 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -743,6 +743,7 @@ source "package/sound-theme-freedesktop/Config.in"
 endmenu
 
 menu "Networking applications"
+source "package/aiccu/Config.in"
 source "package/aircrack-ng/Config.in"
 source "package/argus/Config.in"
 source "package/arptables/Config.in"
diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
new file mode 100644
index 0000000000..1c6f5545e3
--- /dev/null
+++ b/package/aiccu/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_AICCU
+	bool "aiccu"
+	depends on BR2_INET_IPV6
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GNUTLS
+	help
+	  SixXS Automatic IPv6 Connectivity Client Utility
+
+	  AICCU (Automatic IPv6 Connectivity Client Utility) makes it
+	  easy for users to get IPv6 connectivity. After having
+	  requested an account, tunnel and optionally a subnet, AICCU
+	  can be used to automatically configure the tunnel. AICCU
+	  supports TIC (Tunnel Information & Control protocol), which it
+	  uses for retrieving the tunnel configuration information,
+	  AYIYA, which allows tunnels to be created even behind
+	  firewalls and NAT's.
+
+	  http://www.sixxs.net/tools/aiccu/
+
+comment "aiccu requires a toolchain with IPv6 and WCHAR support"
+	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR)
diff --git a/package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch b/package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch
new file mode 100644
index 0000000000..d316f8f6ca
--- /dev/null
+++ b/package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch
@@ -0,0 +1,104 @@
+aiccu.h, common.c, common.h: fixes for deprecated GNUTLS functions and types
+resolver.c: fixes for selection of wrong resolver function under uclibc
+
+Signed-off-by: Michael Rommel <rommel@layer-7.net>
+
+diff -purN aiccu_20070115.orig/common/aiccu.h aiccu_20070115/common/aiccu.h
+--- aiccu_20070115.orig/common/aiccu.h	2007-01-15 13:01:43.000000000 +0100
++++ aiccu_20070115/common/aiccu.h	2013-08-31 23:50:53.651936146 +0200
+@@ -111,7 +111,7 @@ struct AICCU_conf
+ #endif
+ 
+ #ifdef AICCU_GNUTLS
+-	gnutls_certificate_credentials	tls_cred;	/* GNUTLS credentials */
++	gnutls_certificate_credentials_t tls_cred;	/* GNUTLS credentials */
+ #endif
+ 
+ 	bool		daemonize;		/* Daemonize? */
+diff -purN aiccu_20070115.orig/common/common.c aiccu_20070115/common/common.c
+--- aiccu_20070115.orig/common/common.c	2006-12-21 15:08:50.000000000 +0100
++++ aiccu_20070115/common/common.c	2013-09-01 01:21:36.031396740 +0200
+@@ -271,9 +271,8 @@ TLSSOCKET sock_alloc(void);
+ TLSSOCKET sock_alloc(void)
+ {
+ #ifdef AICCU_GNUTLS
+-	/* Allow connections to servers that have OpenPGP keys as well */
+-	const int	cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
+ 	int		ret;
++	const char	*err;
+ #endif /* AICCU_GNUTLS*/
+ 
+ 	TLSSOCKET	sock;	
+@@ -297,11 +296,16 @@ TLSSOCKET sock_alloc(void)
+ 	}
+ 
+ 	/* Use default priorities */
+-	gnutls_set_default_priority(sock->session);
+-	/* XXX: Return value is not documented in GNUTLS documentation! */
+-
+-	gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
+-	/* XXX: Return value is not documented in GNUTLS documentation! */
++	ret = gnutls_priority_set_direct(sock->session, "NORMAL", &err); 
++	if (ret < 0)
++	{
++		if (ret == GNUTLS_E_INVALID_REQUEST)
++		{
++			dolog( LOG_ERR, "TLS set priority failed, syntax error at: %s\n", err);
++		}
++		free(sock);
++		return NULL;
++	}
+ 
+ 	/* Configure the x509 credentials for the current session */
+ 	gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred);
+@@ -474,7 +478,7 @@ bool sock_gotls(TLSSOCKET sock)
+ 	}
+ 
+ 	/* Set the transport */
+-	gnutls_transport_set_ptr(sock->session, (gnutls_transport_ptr)sock->socket);
++	gnutls_transport_set_ptr(sock->session, (gnutls_transport_ptr_t) sock->socket);
+ 
+ 	/* Perform the TLS handshake */
+ 	ret = gnutls_handshake(sock->session);
+diff -purN aiccu_20070115.orig/common/common.h aiccu_20070115/common/common.h
+--- aiccu_20070115.orig/common/common.h	2007-01-11 15:50:51.000000000 +0100
++++ aiccu_20070115/common/common.h	2013-08-31 23:26:13.683659455 +0200
+@@ -381,7 +381,7 @@ struct tlssocket
+ 	SOCKET			socket;
+ #ifdef AICCU_GNUTLS
+ 	bool			tls_active;	/* TLS active? */
+-	gnutls_session		session;	/* The GnuTLS sesision */
++	gnutls_session_t	session;	/* The GnuTLS sesision */
+ #endif
+ };
+ 
+diff -purN aiccu_20070115.orig/common/resolver.c aiccu_20070115/common/resolver.c
+--- aiccu_20070115.orig/common/resolver.c	2006-07-23 16:55:14.000000000 +0200
++++ aiccu_20070115/common/resolver.c	2013-08-31 23:44:31.574866862 +0200
+@@ -26,7 +26,7 @@
+ 
+ int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
+ {
+-#ifdef _LINUX
++#if defined(_LINUX) && !defined(__UCLIBC__)
+ 	struct __res_state	res;
+ #endif
+ 	unsigned char		answer[8192];
+@@ -38,7 +38,7 @@ int getrrs(const char *label, int rrtype
+ 	uint16_t		type = 0, class = 0;
+ 	uint32_t		ttl = 0;
+ 
+-#ifdef _LINUX
++#if defined(_LINUX) && !defined(__UCLIBC__)
+ 	memset(&res, 0, sizeof(res));
+ 	res.options = RES_DEBUG;
+ 	res_ninit(&res);
+@@ -47,7 +47,7 @@ int getrrs(const char *label, int rrtype
+ #endif
+ 
+ 	memset(answer, 0, sizeof(answer));
+-#ifdef _LINUX
++#if defined(_LINUX) && !defined(__UCLIBC__)
+ 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
+ #else
+ 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
diff --git a/package/aiccu/aiccu.mk b/package/aiccu/aiccu.mk
new file mode 100644
index 0000000000..2c54644728
--- /dev/null
+++ b/package/aiccu/aiccu.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# aiccu
+#
+################################################################################
+
+AICCU_VERSION = 20070115
+AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
+AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix/
+AICCU_LICENSE = SixXS License, concise redistribution license
+AICCU_LICENSE_FILES = doc/LICENSE
+AICCU_DEPENDENCIES = gnutls
+
+# dummy RPM_OPT_FLAGS to disable stripping
+define AICCU_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" \
+		RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
+endef
+
+define AICCU_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
+		$(TARGET_DIR)/usr/sbin/aiccu
+	[ -f $(TARGET_DIR)/etc/aiccu.conf ] || \
+		$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
+		$(TARGET_DIR)/etc/aiccu.conf
+endef
+
+define AICCU_INSTALL_INIT_SYSV
+	[ -f $(TARGET_DIR)/etc/init.d/S50aiccu ] || \
+		$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
+		$(TARGET_DIR)/etc/init.d/S50aiccu
+endef
+
+$(eval $(generic-package))

From 6f1882deb4ace9c06cd7cc769eee85db12f1ab26 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 15 Sep 2013 21:28:45 +0200
Subject: [PATCH 6099/6849] Makefile: make $(BUILD_DIR)/.root rule idempotent

The $(BUILD_DIR)/.root rule is executed as part of the 'dirs'
target. The 'dirs' target is re-executed at every execution of 'make
external-deps', and make external-deps explicitly tells make to ignore
targets that have already been made (through the -B option). This
means that the $(BUILD_DIR)/.root rule has to be idempotant, which was
not the case this the introduction of the lib32/lib64 symbolic link.

Running 'make external-deps' three times in a row was sufficient to
trigger an error due to symbolic links being incorrectly created. This
patch fixes that.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 861059284b..2163e95a52 100644
--- a/Makefile
+++ b/Makefile
@@ -448,9 +448,9 @@ $(BUILD_DIR)/.root:
 		--exclude .hg --exclude=CVS --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
-	@ln -s lib $(TARGET_DIR)/$(LIB_SYMLINK)
+	@ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)
 	@mkdir -p $(TARGET_DIR)/usr
-	@ln -s lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
+	@ln -snf lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
 	touch $@
 
 $(TARGET_DIR): $(BUILD_DIR)/.root

From d245fbb41dc148a956df59658cc0dc1262612e09 Mon Sep 17 00:00:00 2001
From: Ralph Siemsen <ralphs@netwinder.org>
Date: Sun, 15 Sep 2013 10:13:14 -0400
Subject: [PATCH 6100/6849] apply-patches.sh: detect missing patches

The "patch" command returns an error code only if patches fail
to apply. Therefore the pipleline "cat <patchfile> | patch ..."
does not fail, even if <patchfile> is missing. Fix this by
adding an explicit check for patch file existence.

Based on feedback from buildroot mailing list, also change the
existing check for unsupported patch format into a fatal error.

Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index e9c68695db..656aa716c1 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -73,13 +73,17 @@ function apply_patch {
 	*.patch*)
 	type="patch"; uncomp="cat"; ;;
 	*)
-	echo "Unsupported format file for ${patch}, skip it";
-	return 0;
+	echo "Unsupported format file for ${path}/${patch}";
+	exit 1;
 	;;
     esac
     echo ""
     echo "Applying $patch using ${type}: "
-	echo $patch >> ${builddir}/.applied_patches_list
+    if [ ! -e "${path}/$patch" ] ; then
+	echo "Error: missing patch file ${path}/$patch"
+	exit 1
+    fi
+    echo $patch >> ${builddir}/.applied_patches_list
     ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix ${patch}!"
@@ -96,7 +100,7 @@ function scan_patchdir {
     # to apply patches. Skip line starting with a dash.
     if [ -e "${path}/series" ] ; then
         for i in `grep -Ev "^#" ${path}/series 2> /dev/null` ; do
-            apply_patch "$path" "$i" || exit 1
+            apply_patch "$path" "$i"
         done
     else
         for i in `cd $path; ls -d $patches 2> /dev/null` ; do
@@ -109,7 +113,7 @@ function scan_patchdir {
                 tar -C "$unpackedarchivedir" -xaf "${path}/$i"
                 scan_patchdir "$unpackedarchivedir"
             else
-                apply_patch "$path" "$i" || exit 1
+                apply_patch "$path" "$i"
             fi
         done
     fi

From ed6912e87d78b5f3a152a8df7bef2cc5846ab0d8 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Sun, 15 Sep 2013 09:20:48 +0300
Subject: [PATCH 6101/6849] getty: Create specific getty config + cleanups

This commit introduces a specific BR2_TARGET_GENERIC_GETTY configuration flag.
This eliminates the need for checking if BR2_TARGET_GENERIC_GETTY_PORT is an
empty string or not. It also allows hiding various getty options when getty
isn't enabled.

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 17 ++++++++++++-----
 system/system.mk | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 401285bb52..92dc7ddebf 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -198,15 +198,20 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD
 	  in the build log! Avoid using a valuable password if either the
 	  .config file or the build log may be distributed!
 
+config BR2_TARGET_GENERIC_GETTY
+       bool "Run a getty (login prompt) after boot"
+       default y
+
+if BR2_TARGET_GENERIC_GETTY
+menu "getty options"
 config BR2_TARGET_GENERIC_GETTY_PORT
-	string "Port to run a getty (login prompt) on"
+	string "TTY port"
 	default "ttyS0"
 	help
-	  Specify a port to run a getty (login prompt) on.
-	  Set to the empty string to not run a getty.
+	  Specify a port to run a getty on.
 
 choice
-	prompt "Baudrate to use"
+	prompt "Baudrate"
 	default BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
 	help
 	  Select a baudrate to use.
@@ -235,10 +240,12 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
 	default "115200"	if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
 
 config BR2_TARGET_GENERIC_GETTY_TERM
-	string "Value to assign the TERM environment variable"
+	string "TERM environment variable"
 	default "vt100"
 	help
 	  Specify a TERM type.
+endmenu
+endif
 
 config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
 	bool "remount root filesystem read-write during boot"
diff --git a/system/system.mk b/system/system.mk
index b4ddc3e6e1..0d23d54b49 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -1,14 +1,14 @@
-TARGET_GENERIC_HOSTNAME := $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
-TARGET_GENERIC_ISSUE := $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
-TARGET_GENERIC_ROOT_PASSWD := $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
-TARGET_GENERIC_PASSWD_METHOD := $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
-TARGET_GENERIC_GETTY := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
-TARGET_GENERIC_GETTY_BAUDRATE := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
-TARGET_GENERIC_GETTY_TERM := $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
+TARGET_GENERIC_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
+TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
+TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
+TARGET_GENERIC_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
+TARGET_GENERIC_GETTY_PORT = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
+TARGET_GENERIC_GETTY_BAUDRATE = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
+TARGET_GENERIC_GETTY_TERM = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
 
 target-generic-securetty:
-	grep -q '^$(TARGET_GENERIC_GETTY)$$' $(TARGET_DIR)/etc/securetty || \
-		echo '$(TARGET_GENERIC_GETTY)' >> $(TARGET_DIR)/etc/securetty
+	grep -q '^$(TARGET_GENERIC_GETTY_PORT)$$' $(TARGET_DIR)/etc/securetty || \
+		echo '$(TARGET_GENERIC_GETTY_PORT)' >> $(TARGET_DIR)/etc/securetty
 
 target-generic-hostname:
 	mkdir -p $(TARGET_DIR)/etc
@@ -29,13 +29,13 @@ target-root-passwd:
 	$(SED) "s,^root:[^:]*:,root:$$TARGET_GENERIC_ROOT_PASSWD_HASH:," $(TARGET_DIR)/etc/shadow
 
 target-generic-getty-busybox:
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY_PORT)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY_PORT) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
 
 # In sysvinit inittab, the "id" must not be longer than 4 bytes, so we
 # skip the "tty" part and keep only the remaining.
 target-generic-getty-sysvinit:
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY_PORT) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
 
 # Find commented line, if any, and remove leading '#'s
@@ -46,7 +46,7 @@ target-generic-do-remount-rw:
 target-generic-dont-remount-rw:
 	$(SED) '/^[^#].*# REMOUNT_ROOTFS_RW$$/s~^~#~' $(TARGET_DIR)/etc/inittab
 
-ifneq ($(TARGET_GENERIC_GETTY),)
+ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
 TARGETS += target-generic-securetty
 endif
 
@@ -61,7 +61,7 @@ endif
 ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
 TARGETS += target-root-passwd
 
-ifneq ($(TARGET_GENERIC_GETTY),)
+ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
 TARGETS += target-generic-getty-$(if $(BR2_PACKAGE_SYSVINIT),sysvinit,busybox)
 endif
 

From a68a51257e9ba0f1654d6ca087bb5259841952e7 Mon Sep 17 00:00:00 2001
From: Assaf Inbal <shmuelzon@gmail.com>
Date: Sun, 15 Sep 2013 09:20:49 +0300
Subject: [PATCH 6102/6849] getty: add the ability to pass options to getty

Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 7 +++++++
 system/system.mk | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 92dc7ddebf..73986fbaf3 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -244,6 +244,13 @@ config BR2_TARGET_GENERIC_GETTY_TERM
 	default "vt100"
 	help
 	  Specify a TERM type.
+
+config BR2_TARGET_GENERIC_GETTY_OPTIONS
+	string "other options to pass to getty"
+	default ""
+	help
+	  Any other flags you want to pass to getty,
+	  Refer to getty --help for details.
 endmenu
 endif
 
diff --git a/system/system.mk b/system/system.mk
index 0d23d54b49..01a6c3a627 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -5,6 +5,7 @@ TARGET_GENERIC_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD)
 TARGET_GENERIC_GETTY_PORT = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
 TARGET_GENERIC_GETTY_BAUDRATE = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
 TARGET_GENERIC_GETTY_TERM = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
+TARGET_GENERIC_GETTY_OPTIONS = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_OPTIONS))
 
 target-generic-securetty:
 	grep -q '^$(TARGET_GENERIC_GETTY_PORT)$$' $(TARGET_DIR)/etc/securetty || \
@@ -29,13 +30,13 @@ target-root-passwd:
 	$(SED) "s,^root:[^:]*:,root:$$TARGET_GENERIC_ROOT_PASSWD_HASH:," $(TARGET_DIR)/etc/shadow
 
 target-generic-getty-busybox:
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY_PORT)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY_PORT) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY_PORT)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY_OPTIONS) $(TARGET_GENERIC_GETTY_PORT) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
 
 # In sysvinit inittab, the "id" must not be longer than 4 bytes, so we
 # skip the "tty" part and keep only the remaining.
 target-generic-getty-sysvinit:
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY_PORT) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(TARGET_GENERIC_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY_OPTIONS) $(TARGET_GENERIC_GETTY_PORT) $(TARGET_GENERIC_GETTY_BAUDRATE) $(TARGET_GENERIC_GETTY_TERM) #~' \
 		$(TARGET_DIR)/etc/inittab
 
 # Find commented line, if any, and remove leading '#'s

From 7f1f9185e7bf5badca554c362ab8a37f04caff5f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 15 Sep 2013 22:43:39 +0200
Subject: [PATCH 6103/6849] system: default to devtmpfs for /dev

As discussed on the list, devtmpfs is quite a bit nicer default than
the old static /dev, so change it.

Notice that you NEED to enable CONFIG_DEVTMPFS / CONFIG_DEVTMPFS_MOUNT
in the kernel configuration if you manually build a kernel outside
buildroot, otherwise the rootfs won't work.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 system/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Config.in b/system/Config.in
index 73986fbaf3..9d4e8377af 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -68,7 +68,7 @@ config BR2_TARGET_GENERIC_PASSWD_METHOD
 
 choice
 	prompt "/dev management"
-	default BR2_ROOTFS_DEVICE_CREATION_STATIC
+	default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
 
 config BR2_ROOTFS_DEVICE_CREATION_STATIC
 	bool "Static using device table"

From 87bb43994282b875d334cbaeb10f49fc08c6d0a4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:27 +0200
Subject: [PATCH 6104/6849] package/Makefile.in: fix incorrect comment

The TARGET_{CC,CXX,LD,...} variables no longer contain any --sysroot
option, since we're now using a toolchain wrapper for external
toolchains.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index dd365be4d6..4adc33d0d5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -147,8 +147,7 @@ endif
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(PATH)"
 
-# Define TARGET_xx variables for all common binutils/gcc tools by
-# including the --sysroot option where necessary.
+# Define TARGET_xx variables for all common binutils/gcc
 TARGET_AR       = $(TARGET_CROSS)ar
 TARGET_AS       = $(TARGET_CROSS)as
 TARGET_CC       = $(TARGET_CROSS)gcc

From a8164107ecc07933b244fd436ad1025d8ae1aff1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:28 +0200
Subject: [PATCH 6105/6849] eglibc: libstdc++ is not part of the C library

For some reason, the eglibc.mk file was trying to install libstdc++.so
from eglibc to the target. But the C++ standard library is provided by
GCC, not by the C library.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index 8873a06fee..fe12299afc 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -89,17 +89,10 @@ ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
 EGLIBC_LIBS_LIB += libthread_db.so
 endif
 
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-EGLIBC_LIBS_USR_LIB += libstdc++.so
-endif
-
 define EGLIBC_INSTALL_TARGET_CMDS
 	for libs in $(EGLIBC_LIBS_LIB); do \
 		$(call copy_toolchain_lib_root,$(STAGING_DIR)/,,lib,$$libs,/lib) ; \
 	done
-	for libs in $(EGLIBC_LIBS_USR_LIB); do \
-		$(call copy_toolchain_lib_root,$(STAGING_DIR)/,,lib,$$libs,/usr/lib) ; \
-	done
 endef
 
 $(eval $(autotools-package))

From 2babed4a50fcd050abc4686e05e24d0e374d10a8 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:29 +0200
Subject: [PATCH 6106/6849] toolchain-internal: skip gcc-intermediate when
 possible

When NPTL support was introduced, gcc required a three stages build
process. Since gcc 4.7, this is no longer necessary, and it is
possible to get back to a two stages build process. This patch takes
advantage of this, by doing a two stages build process when possible.

We introduce a few hidden kconfig options:

 * BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD, which is set by the gcc
   Config.in logic to indicate that the compiler might need a three
   stages build. Currently, all versions prior to 4.7.x are selecting
   this kconfig option.

 * BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD, which indicates whether
   the C library might need a three stages build. This is the case for
   eglibc, and uClibc when NPTL is enabled.

 * BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD finally is enabled when both
   of the previous options are enabled. It indicates that a three
   stages build is actually needed.

In addition to those options, the uClibc/gcc build logic is changed to
use only a two stages build process when possible.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/eglibc/eglibc.mk               |  5 +++--
 package/gcc/Config.in.host             | 11 +++++++++++
 package/gcc/gcc-initial/gcc-initial.mk |  8 ++++++++
 package/uclibc/Config.in               |  1 +
 package/uclibc/uclibc.mk               |  5 +++--
 toolchain/Config.in                    |  9 +++++++++
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk
index fe12299afc..0ed908d398 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/eglibc/eglibc.mk
@@ -14,8 +14,9 @@ EGLIBC_LICENSE_FILES = libc/COPYING libc/COPYING.LIB libc/LICENSES
 # cross-compiler and the kernel headers
 EGLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk
 
-# Before eglibc is built, we must have the second stage cross-compiler
-eglibc-build: host-gcc-intermediate
+# Before eglibc is built, we must have the second stage
+# cross-compiler, for some gcc versions
+eglibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
 
 EGLIBC_SUBDIR = build
 
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index a6acaa25c6..7e6df2d9e6 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -3,6 +3,12 @@ comment "GCC Options"
 config BR2_GCC_NEEDS_MPC
 	bool
 
+# Until gcc 4.7, a three stage build process was needed when using
+# NPTL. This hidden option tells whether gcc is a version that
+# requires this three stage build process.
+config BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
+	bool
+
 choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
@@ -16,11 +22,13 @@ choice
 	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 		depends on BR2_avr32
 		bool "gcc 4.2.2-avr32-2.1.5"
+		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_3_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		depends on !BR2_ARM_EABIHF
 		bool "gcc 4.3.x"
+		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_4_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
@@ -29,6 +37,7 @@ choice
 		depends on !BR2_ARM_EABIHF
 		# VFPv4 support appeared in gcc 4.5
 		depends on !BR2_ARM_FPU_VFPV4 && !BR2_ARM_FPU_VFPV4D16
+		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_5_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
@@ -36,11 +45,13 @@ choice
 		# ARM EABIhf support appeared in gcc 4.6
 		depends on !BR2_ARM_EABIHF
 		bool "gcc 4.5.x"
+		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_6_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
+		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_7_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 0eb492fa4d..83767ea509 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -29,6 +29,7 @@ HOST_GCC_INITIAL_CONF_OPT = \
 	--enable-languages=c \
 	--disable-shared \
 	--without-headers \
+	--disable-threads \
 	--with-newlib \
 	--disable-largefile \
 	--disable-nls \
@@ -40,4 +41,11 @@ HOST_GCC_INITIAL_CONF_ENV = \
 HOST_GCC_INITIAL_MAKE_OPT = all-gcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
 
+ifeq ($(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),)
+ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
+HOST_GCC_INITIAL_MAKE_OPT += all-target-libgcc
+HOST_GCC_INITIAL_INSTALL_OPT += install-target-libgcc
+endif
+endif
+
 $(eval $(host-autotools-package))
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 92e04e9d61..037ca01c0d 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -115,6 +115,7 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
+		select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
 		depends on !BR2_arc
 		depends on !BR2_avr32
 		depends on !BR2_bfin
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 39877bbbf9..181a772fb3 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -22,8 +22,9 @@ UCLIBC_INSTALL_STAGING = YES
 # cross-compiler and the kernel headers
 UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers
 
-# Before uClibc is built, we must have the second stage cross-compiler
-uclibc-build: host-gcc-intermediate
+# Before uClibc is built, we must have the second stage
+# cross-compiler, for some gcc versions, and when NPTL is used.
+uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
 
 # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
 # setting.
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 9d1e68f8fc..27f7b50bc1 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,5 +1,13 @@
 menu "Toolchain"
 
+config BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD
+	bool
+	default y if BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD && \
+		BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
+
+config BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
+	bool
+
 # Should be selected for glibc or eglibc
 config BR2_TOOLCHAIN_USES_GLIBC
 	bool
@@ -10,6 +18,7 @@ config BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
 
 config BR2_TOOLCHAIN_USES_UCLIBC
 	bool

From 69a534b2aa255cf1233e44badc79f1b82dd7dc65 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:30 +0200
Subject: [PATCH 6107/6849] gcc: fix Fortran support

This commit fixes the Fortran support in the gcc package by making
sure that the runtime Fortran library is properly installed to the
target.

It also takes this opportunity to slightly reword the Config.in option
help text, to no longer mention gcc < 4.2 since they are no longer
supported in Buildroot, and to have a more meaningful explanation.

Finally, it fixes the gcc-final.mk code to use the correct
BR2_INSTALL_FORTRAN option rather than the non-existing
BR2_GCC_CROSS_FORTRAN option, to decide whether Fortran support should
be enabled or not in the cross-compiler.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host         | 8 ++++----
 package/gcc/gcc-final/gcc-final.mk | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 7e6df2d9e6..b440ee2e09 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -119,13 +119,13 @@ config BR2_INSTALL_OBJC
 	  Build/install Objective-C compiler and runtime?
 
 config BR2_INSTALL_FORTRAN
-	bool "Build/install Fortran compiler and runtime?"
+	bool "Enable Fortran support"
 	depends on !BR2_avr32
 	select BR2_PACKAGE_LIBMPFR
 	help
-	  Build/install Fortran compiler and runtime?
-	  Note that it is highly recommended NOT to use gfortran
-	  from gcc older than 4.2.0
+	  Enable the support for the Fortran language in the
+	  cross-compiler, and install the Fortran runtime to the
+	  target.
 
 config BR2_GCC_ENABLE_TLS
 	bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 328ad7b0a6..92b6f7ff7e 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -34,7 +34,7 @@ HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_FINAL_CONFIGURE_SYMLINK
 # Languages supported by the cross-compiler
 GCC_FINAL_CROSS_LANGUAGES-y = c
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
-GCC_FINAL_CROSS_LANGUAGES-$(BR2_GCC_CROSS_FORTRAN) += fortran
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_FORTRAN) += fortran
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_GCC_CROSS_OBJC)    += objc
 GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
 
@@ -116,6 +116,10 @@ ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
 HOST_GCC_FINAL_USR_LIBS += libgomp
 endif
 
+ifeq ($(BR2_INSTALL_FORTRAN),y)
+HOST_GCC_FINAL_USR_LIBS += libgfortran
+endif
+
 ifneq ($(HOST_GCC_FINAL_USR_LIBS),)
 define HOST_GCC_FINAL_INSTALL_USR_LIBS
 	mkdir -p $(TARGET_DIR)/usr/lib

From cd04552e899a195fb7dc1811d66bc2fc7d4ce930 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:31 +0200
Subject: [PATCH 6108/6849] gcc: fix Objective-C support

This commit fixes the Objective-C support in the gcc package by making
sure that the runtime Objective-C library is properly installed to the
target.

It also takes this opportunity to slightly reword the Config.in option
help text to have a more meaningful explanation.

Finally, it fixes the gcc-final.mk code to use the correct
BR2_INSTALL_OBJC option rather than the non-existing
BR2_GCC_CROSS_OBJC option, to decide whether Objective-C support
should be enabled or not in the cross-compiler.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host         | 6 ++++--
 package/gcc/gcc-final/gcc-final.mk | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index b440ee2e09..a7dbbb629b 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -113,10 +113,12 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	  initial, gcc intermediate and gcc final passes.
 
 config BR2_INSTALL_OBJC
-	bool "Build/install Objective-C compiler and runtime?"
+	bool "Enable Objective-C support"
 	depends on !BR2_avr32
 	help
-	  Build/install Objective-C compiler and runtime?
+	  Enable the support for the Objective-C language in the
+	  cross-compiler, and install the Objective-C runtime to the
+	  target.
 
 config BR2_INSTALL_FORTRAN
 	bool "Enable Fortran support"
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 92b6f7ff7e..2dbdfab8ea 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -35,7 +35,7 @@ HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_FINAL_CONFIGURE_SYMLINK
 GCC_FINAL_CROSS_LANGUAGES-y = c
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_FORTRAN) += fortran
-GCC_FINAL_CROSS_LANGUAGES-$(BR2_GCC_CROSS_OBJC)    += objc
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC)    += objc
 GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
 
 HOST_GCC_FINAL_CONF_OPT = \
@@ -120,6 +120,10 @@ ifeq ($(BR2_INSTALL_FORTRAN),y)
 HOST_GCC_FINAL_USR_LIBS += libgfortran
 endif
 
+ifeq ($(BR2_INSTALL_OBJC),y)
+HOST_GCC_FINAL_USR_LIBS += libobjc
+endif
+
 ifneq ($(HOST_GCC_FINAL_USR_LIBS),)
 define HOST_GCC_FINAL_INSTALL_USR_LIBS
 	mkdir -p $(TARGET_DIR)/usr/lib

From 8e12e0a17a41a9988da2e239374385ad1c887f37 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:32 +0200
Subject: [PATCH 6109/6849] gcc: move C++ support option next to
 Fortran/Objective-C

The option to enable C++ support was still located in
toolchain/toolchain-buildroot/Config.in.2, with misc other toolchain
options. It seems more logical to have this option with the other
options to select the languages supported by the cross-compiler, so we
move it next to the Fortran/Objective-C options in
package/gcc/Config.in.host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host                | 13 +++++++++++++
 toolchain/toolchain-buildroot/Config.in.2 | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index a7dbbb629b..dbf0f204fb 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -112,6 +112,19 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	  include. Those options are applied for all of the gcc
 	  initial, gcc intermediate and gcc final passes.
 
+config BR2_TOOLCHAIN_BUILDROOT_CXX
+	bool "Enable C++ support"
+	select BR2_INSTALL_LIBSTDCPP
+	depends on !(BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && \
+		     BR2_TOOLCHAIN_BUILDROOT_LOCALE)
+	help
+	  Enable this option if you want your toolchain to support the
+	  C++ language and you want C++ libraries to be installed on
+	  your target system.
+
+comment "C++ support broken in uClibc with locale enabled with gcc 4.2"
+	depends on BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && BR2_TOOLCHAIN_BUILDROOT_LOCALE
+
 config BR2_INSTALL_OBJC
 	bool "Enable Objective-C support"
 	depends on !BR2_avr32
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index bf27e6b73d..1371c31ad5 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -4,19 +4,6 @@ if BR2_TOOLCHAIN_BUILDROOT
 
 comment "Toolchain Options"
 
-config BR2_TOOLCHAIN_BUILDROOT_CXX
-	bool "Enable C++ support"
-	select BR2_INSTALL_LIBSTDCPP
-	depends on !(BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && \
-		     BR2_TOOLCHAIN_BUILDROOT_LOCALE)
-	help
-	  Enable this option if you want your toolchain to support the
-	  C++ language and you want C++ libraries to be installed on
-	  your target system.
-
-comment "C++ support broken in uClibc with locale enabled with gcc 4.2"
-	depends on BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && BR2_TOOLCHAIN_BUILDROOT_LOCALE
-
 config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 	bool "Enable stack protection support"
 	help

From 14a2d0b5ab87d16fa405b52612b181bfca03da20 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:33 +0200
Subject: [PATCH 6110/6849] toolchain: add support for glibc

The support for eglibc 2.17 was added to the internal toolchain
backend for 2013.08. This commit now adds glibc 2.18 support to the
internal toolchain backend.

Since the building procedure is very similar to the one of eglibc, we
have renamed the 'eglibc' package to 'glibc', and made it capable of
handling either glibc or eglibc.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host                   |  2 +-
 package/gcc/gcc-final/gcc-final.mk           |  4 +-
 package/{eglibc/eglibc.mk => glibc/glibc.mk} | 62 ++++++++++++--------
 toolchain/toolchain-buildroot/Config.in      | 24 +++++++-
 4 files changed, 64 insertions(+), 28 deletions(-)
 rename package/{eglibc/eglibc.mk => glibc/glibc.mk} (59%)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index dbf0f204fb..111da3bea5 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -145,7 +145,7 @@ config BR2_INSTALL_FORTRAN
 config BR2_GCC_ENABLE_TLS
 	bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	default y
-	depends on BR2_PTHREADS_NATIVE || BR2_TOOLCHAIN_BUILDROOT_EGLIBC
+	depends on BR2_PTHREADS_NATIVE || BR2_TOOLCHAIN_BUILDROOT_EGLIBC || BR2_TOOLCHAIN_BUILDROOT_GLIBC
 	help
 	  Enable the compiler to generate code for accessing
 	  thread local storage variables
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 2dbdfab8ea..f627767234 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -80,11 +80,11 @@ endef
 
 HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_SIMPLE_SYMLINKS
 
-# In gcc 4.7.x, the ARM EABIhf library loader path for eglibc was not
+# In gcc 4.7.x, the ARM EABIhf library loader path for (e)glibc was not
 # correct, so we create a symbolic link to make things work
 # properly. eglibc installs the library loader as ld-linux-armhf.so.3,
 # but gcc creates binaries that reference ld-linux.so.3.
-ifeq ($(BR2_arm)$(BR2_ARM_EABIHF)$(BR2_GCC_VERSION_4_7_X)$(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),yyyy)
+ifeq ($(BR2_arm)$(BR2_ARM_EABIHF)$(BR2_GCC_VERSION_4_7_X)$(BR2_TOOLCHAIN_USES_GLIBC),yyyy)
 define HOST_GCC_FINAL_LD_LINUX_LINK
 	ln -sf ld-linux-armhf.so.3 $(TARGET_DIR)/lib/ld-linux.so.3
 	ln -sf ld-linux-armhf.so.3 $(STAGING_DIR)/lib/ld-linux.so.3
diff --git a/package/eglibc/eglibc.mk b/package/glibc/glibc.mk
similarity index 59%
rename from package/eglibc/eglibc.mk
rename to package/glibc/glibc.mk
index 0ed908d398..4dd2e63204 100644
--- a/package/eglibc/eglibc.mk
+++ b/package/glibc/glibc.mk
@@ -1,32 +1,46 @@
 ################################################################################
 #
-# eglibc
+# glibc/eglibc
 #
 ################################################################################
 
-EGLIBC_VERSION = 2.17-svnr22064
-EGLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
-EGLIBC_SOURCE = eglibc-$(EGLIBC_VERSION).tar.bz2
-EGLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
-EGLIBC_LICENSE_FILES = libc/COPYING libc/COPYING.LIB libc/LICENSES
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
+GLIBC_VERSION = 2.17-svnr22064
+GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
+GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2
+GLIBC_SRC_SUBDIR = libc
+else
+GLIBC_VERSION = 2.18
+GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
+GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
+GLIBC_SRC_SUBDIR = .
+endif
+
+GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
+GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)
 
-# Before eglibc is configured, we must have the first stage
+# Before (e)glibc is configured, we must have the first stage
 # cross-compiler and the kernel headers
-EGLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk
+GLIBC_DEPENDENCIES = host-gcc-initial linux-headers
+
+# eglibc also needs host-gawk
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
+GLIBC_DEPENDENCIES += host-gawk
+endif
 
-# Before eglibc is built, we must have the second stage
+# Before (e)glibc is built, we must have the second stage
 # cross-compiler, for some gcc versions
-eglibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
+glibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
 
-EGLIBC_SUBDIR = build
+GLIBC_SUBDIR = build
 
-EGLIBC_INSTALL_STAGING = YES
+GLIBC_INSTALL_STAGING = YES
 
-EGLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
+GLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
 
 # Thumb build is broken, build in ARM mode
 ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
-EGLIBC_EXTRA_CFLAGS += -marm
+GLIBC_EXTRA_CFLAGS += -marm
 endif
 
 # Even though we use the autotools-package infrastructure, we have to
@@ -38,16 +52,16 @@ endif
 #  2. We have to execute the configure script with bash and not sh.
 #
 # Note that as mentionned in
-# http://patches.openembedded.org/patch/38849/, eglibc must be built
-# with -O2, so we pass our own CFLAGS and CXXFLAGS below.
-define EGLIBC_CONFIGURE_CMDS
+# http://patches.openembedded.org/patch/38849/, eglibc/glibc must be
+# built with -O2, so we pass our own CFLAGS and CXXFLAGS below.
+define GLIBC_CONFIGURE_CMDS
 	mkdir -p $(@D)/build
 	# Do the configuration
 	(cd $(@D)/build; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="-O2 $(EGLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
-		CXXFLAGS="-O2 $(EGLIBC_EXTRA_CFLAGS)" \
-		$(SHELL) $(@D)/libc/configure \
+		CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
+		CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \
+		$(SHELL) $(@D)/$(GLIBC_SRC_SUBDIR)/configure \
 		ac_cv_path_BASH_SHELL=/bin/bash \
 		libc_cv_forced_unwind=yes \
 		--target=$(GNU_TARGET_NAME) \
@@ -81,17 +95,17 @@ endef
 # to install the libraries, and nothing more.
 #
 
-EGLIBC_LIBS_LIB = \
+GLIBC_LIBS_LIB = \
 	ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so	   \
 	libnsl.so libpthread.so libresolv.so librt.so libutil.so   \
 	libnss_files.so libnss_dns.so
 
 ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
-EGLIBC_LIBS_LIB += libthread_db.so
+GLIBC_LIBS_LIB += libthread_db.so
 endif
 
-define EGLIBC_INSTALL_TARGET_CMDS
-	for libs in $(EGLIBC_LIBS_LIB); do \
+define GLIBC_INSTALL_TARGET_CMDS
+	for libs in $(GLIBC_LIBS_LIB); do \
 		$(call copy_toolchain_lib_root,$(STAGING_DIR)/,,lib,$$libs,/lib) ; \
 	done
 endef
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 7a26441a05..060b494736 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -35,12 +35,34 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 
 	  http://eglibc.org
 
+config BR2_TOOLCHAIN_BUILDROOT_GLIBC
+	bool "glibc (experimental)"
+	depends on BR2_arm    || BR2_armeb    || BR2_aarch64 || \
+		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
+		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
+		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
+		   BR2_x86_64
+	select BR2_TOOLCHAIN_USES_GLIBC
+	# our glibc.mk enables RPC support
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	help
+	  This option selects glibc as the C library for the
+	  cross-compilation toolchain.
+
+	  The glibc support in the Buildroot toolchain backend is
+	  very recent, and therefore marked experimental.
+
+	  http://www.gnu.org/software/libc/
+
 endchoice
 
 config BR2_TOOLCHAIN_BUILDROOT_LIBC
 	string
 	default "uclibc" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
-	default "eglibc" if BR2_TOOLCHAIN_BUILDROOT_EGLIBC
+	# Both glibc and eglibc are handled by the package called
+	# 'glibc'
+	default "glibc"  if BR2_TOOLCHAIN_BUILDROOT_EGLIBC
+	default "glibc"  if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 
 source "package/uclibc/Config.in"
 

From df9bbb779f37ef55136aeb838068cb2be9115b14 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:34 +0200
Subject: [PATCH 6111/6849] gcc/gcc-final: use the common
 HOST_GCC_CONFIGURE_SYMLINK macro

Each stage of the gcc build needs to make a small dance before the
configuration step to create a build sub-directory and a symbolic link
to the configure script. The common gcc.mk had a
HOST_GCC_CONFIGURE_SYMLINK already used by the gcc-initial and
gcc-intermediate steps, but the gcc-final step wasn't using it.

This commit fixes this inconsistency, and therefore removes the
HOST_GCC_FINAL_CONFIGURE_SYMLINK macro.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc-final/gcc-final.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index f627767234..69a4ccd6af 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -24,12 +24,7 @@ HOST_GCC_FINAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
 # subdirectory in the gcc sources, and build from there.
 HOST_GCC_FINAL_SUBDIR = build
 
-define HOST_GCC_FINAL_CONFIGURE_SYMLINK
-	mkdir -p $(@D)/build
-	ln -s ../configure $(@D)/build/configure
-endef
-
-HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_FINAL_CONFIGURE_SYMLINK
+HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
 
 # Languages supported by the cross-compiler
 GCC_FINAL_CROSS_LANGUAGES-y = c

From 094fd1d01de46a61bbc59343841f762817b9cc81 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:35 +0200
Subject: [PATCH 6112/6849] gcc: force symlink creation

The HOST_GCC_CONFIGURE_SYMLINK creates a symbolic link
$(@D)/build/configure -> $(@D)/configure for each build step of
gcc. However, it was only using 'ln -s' and not 'ln -sf', which was
causing problems when doing 'make host-gcc-final-reconfigure' for
example, because the configure commands (including this macro) are
being re-executed, but the symbolic link already exists.

Changing this symbolic link creation to 'ln -sf' fixes this problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/gcc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 157357cd78..5636c6f255 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -76,7 +76,7 @@ endef
 
 define HOST_GCC_CONFIGURE_SYMLINK
 	mkdir -p $(@D)/build
-	ln -s ../configure $(@D)/build/configure
+	ln -sf ../configure $(@D)/build/configure
 endef
 
 #

From c5866be0ad90a97bbf04af846d6aec869bc1918a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:36 +0200
Subject: [PATCH 6113/6849] toolchain: refactor Stack Smashing Protection
 support

This commit refactors how Stack Smashing Protection support is handled
in Buildroot:

 *) It turns the BR2_TOOLCHAIN_BUILDROOT_USE_SSP option into an option
    that only enables the SSP support in uClibc, when using the internal
    toolchain backend.

 *) It adds an hidden BR2_TOOLCHAIN_HAS_SSP option that gets enabled
    when the toolchain has SSP support. Here we have the usual dance:
    glibc/eglibc in internal/external backend always select this
    option, in the case of uClibc/internal, it gets selected when
    BR2_TOOLCHAIN_BUILDROOT_USE_SSP is enabled, in the case of
    uClibc/external, there is a new configuration option that the user
    must select (or not) depending on whether the toolchain has SSP
    support.

 *) It adds a new options BR2_ENABLE_SSP in the "Build options" menu,
    to enable the usage of SSP support, by adding
    -fstack-protector-all to the CFLAGS.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Config.in                                 | 17 +++++++++++++++++
 package/Makefile.in                       |  2 +-
 package/psmisc/psmisc.mk                  |  4 ++--
 package/uclibc/Config.in                  | 10 ++++++++++
 toolchain/Config.in                       |  1 +
 toolchain/helpers.mk                      |  3 ++-
 toolchain/toolchain-buildroot/Config.in.2 |  9 ---------
 toolchain/toolchain-common.in             |  3 +++
 toolchain/toolchain-external/Config.in    |  9 +++++++++
 9 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/Config.in b/Config.in
index 1b30ce1dba..af720ec16f 100644
--- a/Config.in
+++ b/Config.in
@@ -402,6 +402,23 @@ config BR2_OPTIMIZE_S
 
 endchoice
 
+config BR2_ENABLE_SSP
+	bool "build code with Stack Smashing Protection"
+	depends on BR2_TOOLCHAIN_HAS_SSP
+	help
+	  Enable stack smashing protection support using GCCs
+	  -fstack-protector-all option.
+
+	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
+          for details.
+
+	  Note that this requires the toolchain to have SSP
+	  support. This is always the case for glibc and eglibc
+	  toolchain, but is optional in uClibc toolchains.
+
+comment "enabling Stack Smashing Protection requires support in the toolchain"
+	depends on !BR2_TOOLCHAIN_HAS_SSP
+
 config BR2_PREFER_STATIC_LIB
 	bool "prefer static libraries"
 	help
diff --git a/package/Makefile.in b/package/Makefile.in
index 4adc33d0d5..170ad789b0 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -133,7 +133,7 @@ TARGET_CFLAGS += -msep-data
 TARGET_CXXFLAGS += -msep-data
 endif
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
+ifeq ($(BR2_ENABLE_SSP),y)
 TARGET_CFLAGS += -fstack-protector-all
 TARGET_CXXFLAGS += -fstack-protector-all
 endif
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 1340ee6a03..c18ba9472d 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -10,8 +10,8 @@ PSMISC_LICENSE = GPLv2
 PSMISC_LICENSE_FILES = COPYING
 PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
-ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
-# Don't force -fstack-protector
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+# Don't force -fstack-protector when SSP is not available in toolchain
 PSMISC_CONF_OPT = --disable-harden-flags
 endif
 
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 037ca01c0d..eeb3b83cb9 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -130,6 +130,16 @@ config BR2_PTHREAD_DEBUG
 	help
 	  Build the thread library with debugging enabled.
 
+config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
+	bool "Enable stack protection support"
+	select BR2_TOOLCHAIN_HAS_SSP
+	help
+	  Enable stack smashing protection support using GCCs
+	  -fstack-protector-all option in uClibc.
+
+	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
+	  for details.
+
 config BR2_UCLIBC_INSTALL_UTILS
 	bool "Compile and install uClibc utilities"
 	depends on !BR2_bfin
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 27f7b50bc1..96713a8b4c 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -18,6 +18,7 @@ config BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	select BR2_TOOLCHAIN_HAS_SSP
 	select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
 
 config BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 44b6018fd9..0e270ee14b 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -258,7 +258,8 @@ check_uclibc = \
 	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\
-	$(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support)
+	$(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support) ;\
+	$(call check_uclibc_feature,__UCLIBC_HAS_SSP__,BR2_TOOLCHAIN_HAS_SSP,$${UCLIBC_CONFIG_FILE},Stack Smashing Protection support)
 
 #
 # Check that the Buildroot configuration of the ABI matches the
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 1371c31ad5..df26079010 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -4,15 +4,6 @@ if BR2_TOOLCHAIN_BUILDROOT
 
 comment "Toolchain Options"
 
-config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
-	bool "Enable stack protection support"
-	help
-	  Enable stack smashing protection support using GCCs
-	  -fstack-protector-all option.
-
-	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
-	  for details.
-
 source "package/elf2flt/Config.in.host"
 
 endif
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index dc3bd2a914..1085fb316c 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -32,6 +32,9 @@ config BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	bool
 
+config BR2_TOOLCHAIN_HAS_SSP
+	bool
+
 config BR2_ENABLE_LOCALE_PURGE
 	bool "Purge unwanted locales"
 	help
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 24f1f27159..8e25aa3a63 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -935,6 +935,15 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
 	  debugging support. If you don't know, leave the default
 	  value, Buildroot will tell you if it's correct or not.
 
+config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP
+	bool "Toolchain has SSP support?"
+	select BR2_TOOLCHAIN_HAS_SSP
+	help
+	  Selection this option if your external toolchain has Stack
+	  Smashing Protection support enabled. If you don't know,
+	  leave the default value, Buildroot will tell you if it's
+	  correct or not.
+
 endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC

From 859b49ed678be0f4b247a04d17ad554f54be0c96 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:37 +0200
Subject: [PATCH 6114/6849] toolchain: move elf2flt option inclusion to
 toolchain-buildroot/Config.in

The only remaining thing in toolchain-buildroot/Config.in.2 is the
inclusion of the elf2flt option. It doesn't really make sense to have
a separate Config.in file for that, so let's move this to
toolchain-buildroot/Config.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/Config.in                       | 1 -
 toolchain/toolchain-buildroot/Config.in   | 1 +
 toolchain/toolchain-buildroot/Config.in.2 | 9 ---------
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 toolchain/toolchain-buildroot/Config.in.2

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 96713a8b4c..17be32a52f 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -63,6 +63,5 @@ source "toolchain/toolchain-buildroot/Config.in"
 source "toolchain/toolchain-external/Config.in"
 source "toolchain/toolchain-crosstool-ng/Config.in"
 source "toolchain/toolchain-common.in"
-source "toolchain/toolchain-buildroot/Config.in.2"
 
 endmenu
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 060b494736..0ebbd6cf59 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -68,4 +68,5 @@ source "package/uclibc/Config.in"
 
 source "package/binutils/Config.in.host"
 source "package/gcc/Config.in.host"
+source "package/elf2flt/Config.in.host"
 endif
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
deleted file mode 100644
index df26079010..0000000000
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ /dev/null
@@ -1,9 +0,0 @@
-# Buildroot backend specific options
-
-if BR2_TOOLCHAIN_BUILDROOT
-
-comment "Toolchain Options"
-
-source "package/elf2flt/Config.in.host"
-
-endif

From 530777aaebdcd63b7acd75ab5df650d9db750f49 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:38 +0200
Subject: [PATCH 6115/6849] gcc: provide option to enable mudflap support

The mudflap library is only useful if one uses the -fmudflap gcc
option to do more checks on pointers/arrays. This commit adds an
option to enable/disable mudflap support at the gcc level. By default,
it is disabled, which saves a little bit of build time compared to the
default of gcc which consists in enabling mudflap support.

Since mudflap is now disabled by default, and ensured to never be enabled
on platforms where it is not available, some gcc.mk code that was used to
disable mudflap in problematic configurations can be removed.

Whether -fmudflap is used when building is left to the user.

[Peter: tweak commit text, fix white space]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host         | 15 +++++++++++++++
 package/gcc/gcc-final/gcc-final.mk |  8 ++++++++
 package/gcc/gcc.mk                 | 24 +++++++-----------------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 111da3bea5..116fd24349 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -155,3 +155,18 @@ config BR2_GCC_ENABLE_OPENMP
 	depends on !BR2_PTHREADS_NONE && !BR2_avr32 && !BR2_arc
 	help
 	  Enable OpenMP support for the compiler
+
+config BR2_GCC_ENABLE_LIBMUDFLAP
+	bool "Enable libmudflap support"
+	# There are architectures, or specific configurations for
+	# which mudflap is not supported.
+	depends on !BR2_avr32 && !BR2_bfin && !BR2_ARM_INSTRUCTIONS_THUMB && !BR2_powerpc_SPE
+	help
+	  libmudflap is a gcc library used for the mudflap pointer
+	  debugging functionality. It is only needed if you intend to
+	  use the -fmudflap gcc flag.
+
+	  See http://gcc.gnu.org/wiki/Mudflap_Pointer_Debugging and
+	  the help of the gcc -fmudflap option for more details.
+
+	  If you're unsure, leave this option disabled.
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 69a4ccd6af..b396382788 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -119,6 +119,14 @@ ifeq ($(BR2_INSTALL_OBJC),y)
 HOST_GCC_FINAL_USR_LIBS += libobjc
 endif
 
+ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+HOST_GCC_FINAL_USR_LIBS += libmudflapth
+else
+HOST_GCC_FINAL_USR_LIBS += libmudflap
+endif
+endif
+
 ifneq ($(HOST_GCC_FINAL_USR_LIBS),)
 define HOST_GCC_FINAL_INSTALL_USR_LIBS
 	mkdir -p $(TARGET_DIR)/usr/lib
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 5636c6f255..0c0cc99a61 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -125,6 +125,12 @@ else
 HOST_GCC_COMMON_CONF_OPT += --disable-tls
 endif
 
+ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y)
+HOST_GCC_COMMON_CONF_OPT += --enable-libmudflap
+else
+HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
+endif
+
 ifeq ($(BR2_PTHREADS_NONE),y)
 HOST_GCC_COMMON_CONF_OPT += \
 	--disable-threads \
@@ -198,25 +204,9 @@ HOST_GCC_COMMON_CONF_OPT += \
 	--with-bugurl="http://bugs.buildroot.net/"
 endif
 
-# AVR32 GCC special configuration
-ifeq ($(BR2_avr32),y)
-HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
-endif
-
-# ARM Thumb and mudflap aren't friends
-ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
-HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
-endif
-
-# Blackfin doesn't do mudflap
-ifeq ($(BR2_bfin),y)
-HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
-endif
-
-# Disable mudflap and enable proper double/long double for SPE ABI
+# Enable proper double/long double for SPE ABI
 ifeq ($(BR2_powerpc_SPE),y)
 HOST_GCC_COMMON_CONF_OPT += \
-	--disable-libmudflap \
 	--enable-e500_double \
 	--with-long-double-128
 endif

From 2281fe95ca4aea1ceea73aba25dc8467c9145bb3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:39 +0200
Subject: [PATCH 6116/6849] toolchain: update Linaro ARM external toolchains

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 49 +++++++++++++-----------
 toolchain/toolchain-external/ext-tool.mk | 12 +++---
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 8e25aa3a63..11658ddbcf 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,8 +3,8 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
-	bool "Linaro 2013.06"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
+	bool "Linaro 2013.08"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -15,16 +15,17 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.06 (based on gcc 4.8), Linaro GDB 2013.06 (based on
-	  GDB 7.6), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
+	  GCC 2013.08 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GDB 7.6), eglibc 2.17, Binutils 2013.06 (based on 2.23). It
+	  generates code that runs on all Cortex-A profile devices,
+	  but tuned for the Cortex-A9. The code generated is Thumb 2,
+	  with the hard floating point calling convention, and uses
+	  the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
-	bool "Linaro 2013.05"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
+	bool "Linaro 2013.07"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -35,16 +36,17 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.05 (based on gcc 4.8), Linaro GDB 2013.05 (based on
-	  GDB 7.6), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
+	  GCC 2013.07 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GDB 7.6), eglibc 2.17, Binutils 2013.06 (based on 2.23). It
+	  generates code that runs on all Cortex-A profile devices,
+	  but tuned for the Cortex-A9. The code generated is Thumb 2,
+	  with the hard floating point calling convention, and uses
+	  the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
-	bool "Linaro 2013.04"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
+	bool "Linaro 2013.06"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -55,11 +57,12 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.04 (based on gcc 4.7), Linaro GDB 2012.12 (based on
-	  GDB 7.5), eglibc 2.15. It generates code that runs on all
-	  Cortex-A profile devices, but tuned for the Cortex-A9. The
-	  code generated is Thumb 2, with the hard floating point
-	  calling convention, and uses the VFPv3-D16 FPU instructions.
+	  GCC 2013.06 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GDB 7.6), eglibc 2.17, Binutils 2013.06 (based on 2.23). It
+	  generates code that runs on all Cortex-A profile devices,
+	  but tuned for the Cortex-A9. The code generated is Thumb 2,
+	  with the hard floating point calling convention, and uses
+	  the VFPv3-D16 FPU instructions.
 
 	  To use this toolchain, you must disable soft float usage.
 
@@ -813,9 +816,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index d5023cfc1d..6a8d8a61d6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -229,15 +229,15 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
 	mv $(@D)/arago-2011.09/armv5te/* $(@D)/
 	rm -rf $(@D)/arago-2011.09/
 endef
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04),y)
-TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.04/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.xz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05),y)
-TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.05/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.05_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06),y)
 TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.06_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07),y)
+TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.07/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.07-1_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08),y)
+TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.08/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 2020c9a957019b5779a4d38ad2c759568454c7ee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 2 Sep 2013 18:06:40 +0200
Subject: [PATCH 6117/6849] toolchain: update Linaro AArch64 external
 toolchains

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/Config.in   | 14 +++++++-------
 toolchain/toolchain-external/ext-tool.mk | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 11658ddbcf..c53577ef60 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -730,8 +730,8 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
-	bool "Linaro AArch64 13.06"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
+	bool "Linaro AArch64 13.08"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -742,8 +742,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
-	bool "Linaro AArch64 13.05"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
+	bool "Linaro AArch64 13.07"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -754,7 +754,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
 	bool "Linaro AArch64 13.04"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -824,9 +824,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6a8d8a61d6..3539cb56c7 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -304,15 +304,15 @@ TOOLCHAIN_EXTERNAL_SOURCE = lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE = microblaze-unknown-linux-gnu.tgz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_04),y)
-TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.04/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux.tar.xz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_05),y)
-TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.05/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.05_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06),y)
 TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.06_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07),y)
+TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.07/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.07-1_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08),y)
+TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.08/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.08_linux.tar.xz
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE = $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From 4bfb52c1144a6d69a0a7c97281df28190c788f02 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Sep 2013 09:00:15 +0200
Subject: [PATCH 6118/6849] docs/patch-policy.txt: fix missing word

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/patch-policy.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index d2250ad0cd..c654d3871d 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -21,7 +21,7 @@ Providing patches
 Downloaded
 ^^^^^^^^^^
 
-If it is necessary to apply a patch that is available for download, then it
+If it is necessary to apply a patch that is available for download, then add it
 to the +<packagename>_PATCH+ variable. It is downloaded from the same site
 as the package itself. It can be a single patch, or a tarball containing a
 patch series.

From f7da9ee5bd126d86b5ae54553e4ab10191288056 Mon Sep 17 00:00:00 2001
From: Ralph Siemsen <ralphs@netwinder.org>
Date: Mon, 16 Sep 2013 09:07:28 -0400
Subject: [PATCH 6119/6849] Trivial documentation fix for Signed-off-by

Make consistent the capitalization and punctuation of Signed-of-by examples.

Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/contribute.txt   | 4 ++--
 docs/manual/patch-policy.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 3736d61248..2b2783d695 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -40,7 +40,7 @@ $ git format-patch -M -n -s -o outgoing origin/master
 ---------------------
 
 This will generate patch files in the +outgoing+ subdirectory,
-automatically adding the +signed-off-by+ line.
+automatically adding the +Signed-off-by+ line.
 
 Once patch files are generated, you can review/edit the commit message
 before submitting them using your favorite text editor.
@@ -106,7 +106,7 @@ Some more paragraph giving some more details.
 
 And yet another paragraph giving more details.
 
-Signed-off-by John Doe <john.doe@noname.org>
+Signed-off-by: John Doe <john.doe@noname.org>
 ---
 Changes v2 -> v3:
   - foo bar  (suggested by Jane)
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index c654d3871d..d9bc8ca852 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -105,7 +105,7 @@ At the end, the patch should look like:
 ---------------
 configure.ac: add C++ support test
 
-signed-off-by John Doe <john.doe@noname.org>
+Signed-off-by: John Doe <john.doe@noname.org>
 
 --- configure.ac.orig
 +++ configure.ac

From d75e65523e9129db6c80e77c8314eb1cf85afb44 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 07:41:07 -0300
Subject: [PATCH 6120/6849] bellagio: needs dynamic library support

Fixes:
http://autobuild.buildroot.net/results/76e/76ebe0b9e963367427e23ba963f1bce6fd2725c4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bellagio/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/bellagio/Config.in b/package/bellagio/Config.in
index 3292ef5fd0..921cc38fcc 100644
--- a/package/bellagio/Config.in
+++ b/package/bellagio/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_BELLAGIO
 	bool "bellagio"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_PACKAGE_HAS_OPENMAX
 	help
 	  Bellagio is an opensource implementation of the
@@ -16,5 +17,5 @@ config BR2_PACKAGE_BELLAGIO
 
 	  http://omxil.sourceforge.net/
 
-comment "bellagio requires a toolchain with C++ and threads support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "bellagio requires a toolchain with C++, threads and dynamic library support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

From 80c9051a4894cee10df1b1f3b59e88c6b7c32692 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Sep 2013 22:32:07 +0200
Subject: [PATCH 6121/6849] docs/news.html: add 2013.08 announcement mail link

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 25a70f0f37..2aabe47d8d 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,7 @@ <h3>News</h3>
     <p>The stable 2013.08 release is out - Thanks to everyone
     contributing and testing the release candidates. See the
     <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08">CHANGES</a>
-    file for more details
+    file for more details, read the <a href="http://lists.busybox.net/pipermail/buildroot/2013-August/077224.html">announcement</a>
     and go to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2013.08.tar.bz2">2013.08 release</a>.</p>
 

From 0b9676b6913fad483601e5bc86ccfb78272d0241 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Sep 2013 22:39:04 +0200
Subject: [PATCH 6122/6849] docs/news.html: Announce next Buildroot developer
 days meeting

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/news.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index 2aabe47d8d..1c08842986 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,22 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>16 September 2013 -- Buildroot Developer Days</b>
+
+    <p>The next <i>Buildroot Developer Days</i> meeting will take
+    place on Saturday October 26th and Sunday October 27th 2013 in
+    Edinburgh, UK - Just after the <a
+    href="https://events.linuxfoundation.org/events/embedded-linux-conference-europe">
+    Embedded Linux Conference Europe</a> (October 23th-24th). This two
+    days meeting is mainly open to Buildroot developers and
+    contributors, or Buildroot users having a prior experience with
+    the tool. It will allow developers to work on Buildroot and
+    discuss current issues, the future directions, and more.</p>
+
+    <p>For more details, see the
+    <a href="http://www.elinux.org/Buildroot:DeveloperDaysELCE2013">wiki
+    page</a> dedicated to the meeting.</p>
+
   <li><b>31 August 2013 -- 2013.08 released</b>
 
     <p>The stable 2013.08 release is out - Thanks to everyone

From 8d22c1bab7a36f636171ba263deb80fed86298b1 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 16 Sep 2013 22:42:47 +0200
Subject: [PATCH 6123/6849] apply-patches.sh: Go back to only warn about
 unsupported file types

Fixes http://autobuild.buildroot.net/results/868/8687be8ec029486d9c5e2224cde542134f72884b/

The recent (d245fbb41dc: apply-patches.sh: detect missing patches)
change to apply-patches.sh causes a number of regressions with packages
using downloadable tarballs of patches (typically from Debian), as
those contain additional files besides just the patches (ChangeLog's,
debian/rules, ..).

This use case is arguably abusing the _PATCH handling, but it used to
work so people might rely on it so go back to only warn about this
instead of erroring out.

At the same time reword the warning message.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 656aa716c1..1ebaea990f 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -73,8 +73,8 @@ function apply_patch {
 	*.patch*)
 	type="patch"; uncomp="cat"; ;;
 	*)
-	echo "Unsupported format file for ${path}/${patch}";
-	exit 1;
+	echo "Unsupported file type for ${path}/${patch}, skipping";
+	return 0
 	;;
     esac
     echo ""

From c6715b69e467182ee5242d7484caace2088340c8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 Sep 2013 13:42:07 +0200
Subject: [PATCH 6124/6849] Makefile: release: create tarball from current
 branch, not master

To support stable bugfix releases.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2163e95a52..6ef0edc2bb 100644
--- a/Makefile
+++ b/Makefile
@@ -838,7 +838,7 @@ release: OUT=buildroot-$(BR2_VERSION)
 # Create release tarballs. We need to fiddle a bit to add the generated
 # documentation to the git output
 release:
-	git archive --format=tar --prefix=$(OUT)/ master > $(OUT).tar
+	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
 	$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz

From c1f03f652f02c4f3374d4c671698748dcaba98ab Mon Sep 17 00:00:00 2001
From: Tristan Lelong <tristan.lelong@blunderer.org>
Date: Mon, 16 Sep 2013 14:47:49 -0700
Subject: [PATCH 6125/6849] libroxml: bump version to 2.2.3

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libroxml/libroxml-werror.patch | 4 ++--
 package/libroxml/libroxml.mk           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/libroxml/libroxml-werror.patch b/package/libroxml/libroxml-werror.patch
index a99962f30f..6435b0195d 100644
--- a/package/libroxml/libroxml-werror.patch
+++ b/package/libroxml/libroxml-werror.patch
@@ -15,8 +15,8 @@ Index: a/Makefile
  
  # options
  override CPPFLAGS += -Iinc/
--override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES)
-+override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES)
+-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror -Iinc/ $(DEFINES)
++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Iinc/ $(DEFINES)
  override LDFLAGS += 
  
  ifeq ("$(OS)", "Darwin")
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 76ffa14b8c..d602513717 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBROXML_VERSION = 2.2.2
-LIBROXML_SITE = http://libroxml.googlecode.com/files
+LIBROXML_VERSION = 2.2.3
+LIBROXML_SITE = http://download.libroxml.net/pool/v2.x/
 LIBROXML_INSTALL_STAGING = YES
 
 define LIBROXML_BUILD_CMDS
@@ -17,7 +17,7 @@ define LIBROXML_INSTALL_STAGING_CMDS
 endef
 
 define LIBROXML_INSTALL_TARGET_CMDS
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(MAKE) DESTDIR=$(TARGET_DIR)/usr/ -C $(@D) install
 endef
 
 define LIBROXML_UNINSTALL_STAGING_CMDS

From 2a3e794ef76fc4edae0ce4551e06ea5ba15fe23d Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 17 Sep 2013 09:10:52 +0200
Subject: [PATCH 6126/6849] can-utils: bump version

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/can-utils/can-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk
index c4a777b2bb..743fe7ce0b 100644
--- a/package/can-utils/can-utils.mk
+++ b/package/can-utils/can-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CAN_UTILS_VERSION = 836d3cc0122ce31a1b732d369cbd27b690c3110f
+CAN_UTILS_VERSION = 16c970d40e6c19dde705bad4751bab1a3a4f3a0d
 CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
 CAN_UTILS_AUTORECONF = YES
 

From 06b38a7ff95f9d4bcdb63e385498693409cb7922 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 Sep 2013 14:24:39 +0200
Subject: [PATCH 6127/6849] docs: website: update for 2013.08.1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/download.html |  6 +++---
 docs/news.html     | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index e2adcfcac6..49c768d636 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,12 +6,12 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2013.08</b>, which can be downloaded
+The latest stable release is <b>2013.08.1</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2013.08.tar.gz">buildroot-2013.08.tar.gz</a>
+<a href="/downloads/buildroot-2013.08.1.tar.gz">buildroot-2013.08.1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.08.tar.bz2">buildroot-2013.08.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.08.1.tar.bz2">buildroot-2013.08.1.tar.bz2</a>.
 
 <p>
 <!--
diff --git a/docs/news.html b/docs/news.html
index 1c08842986..cf814117c8 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,16 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>17 September 2013 -- 2013.08.1 released</b>
+
+    <p>The 2013.08.1 bugfix release is out - Thanks to everyone
+    contributing. This release fixes critical issues discovered since
+    the 2013.08 release. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08.1">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.08.1.tar.bz2">2013.08.1 release</a>.</p>
+
   <li><b>16 September 2013 -- Buildroot Developer Days</b>
 
     <p>The next <i>Buildroot Developer Days</i> meeting will take

From 35f6c37e2d0551d6568bd42fa5e4321680782b92 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 09:12:30 -0300
Subject: [PATCH 6128/6849] time: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/time/Config.in | 1 +
 package/time/time.mk   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/time/Config.in b/package/time/Config.in
index 634d41a498..0ec3be351a 100644
--- a/package/time/Config.in
+++ b/package/time/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TIME
 	bool "time"
+	depends on BR2_USE_MMU # fork()
 	help
 	  The GNU time utility.
 
diff --git a/package/time/time.mk b/package/time/time.mk
index b7ee40c6ad..56f28ff484 100644
--- a/package/time/time.mk
+++ b/package/time/time.mk
@@ -7,11 +7,13 @@
 TIME_VERSION = 1.7
 TIME_SITE = $(BR2_GNU_MIRROR)/time
 TIME_CONF_ENV = ac_cv_func_wait3=yes
+TIME_LICENSE = GPLv2+
+TIME_LICENSE_FILES = COPYING
 
 # time uses an old version of automake that does not support
 # installing in DESTDIR.
 define TIME_INSTALL_TARGET_CMDS
-	install -D -m 755  $(@D)/time $(TARGET_DIR)/usr/bin/time
+	$(INSTALL) -D -m 755  $(@D)/time $(TARGET_DIR)/usr/bin/time
 endef
 
 $(eval $(autotools-package))

From 9fe9d4e232fe0c8668de9bb44b2988b45e5ae0ca Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 10:18:59 -0300
Subject: [PATCH 6129/6849] screen: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/screen/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/screen/Config.in b/package/screen/Config.in
index c23239235a..b5876e87cf 100644
--- a/package/screen/Config.in
+++ b/package/screen/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SCREEN
 	bool "screen"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
 	  Screen is a full-screen window manager that multiplexes a physical

From ab782560690a960200951bb0131536ce853731fd Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 10:30:04 -0300
Subject: [PATCH 6130/6849] dash: bump to version 0.5.7-3

Bump to patchlevel 3 since 2 is gone upstream, fixes when
sources.buildroot.net isn't available:
http://autobuild.buildroot.net/results/5ee/5ee6544a9d08025060cb5806870ae1c3f252cd93/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/dash/dash.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index c6a8b11076..970286dc7b 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -7,7 +7,7 @@
 DASH_VERSION = 0.5.7
 DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
 DASH_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash
-DASH_PATCH = dash_$(DASH_VERSION)-2.diff.gz
+DASH_PATCH = dash_$(DASH_VERSION)-3.diff.gz
 DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c)
 DASH_LICENSE_FILES = COPYING
 

From 855b21a9cc3f43979be81e054ce1eee9f9ea349a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 11:29:57 -0300
Subject: [PATCH 6131/6849] quagga: security bump to version 0.99.22.3

Fixes CVE-2013-2236.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/quagga/quagga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 8b5191747e..995e42d4b9 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QUAGGA_VERSION = 0.99.22.1
+QUAGGA_VERSION = 0.99.22.3
 QUAGGA_SOURCE = quagga-$(QUAGGA_VERSION).tar.xz
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk

From 0fe0fca96997b8a6b8a761f3c12311309f760ccc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 11:29:58 -0300
Subject: [PATCH 6132/6849] ruby: security bump to version 1.9.3-p448

Fixes CVE-2013-4073.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 020cd76258..ba2d49b47f 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUBY_VERSION = 1.9.3-p429
+RUBY_VERSION = 1.9.3-p448
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_DEPENDENCIES = host-pkgconf host-ruby
 HOST_RUBY_DEPENDENCIES = host-pkgconf

From 284c3e2d24e091f45311332e9476f05e2de47f8e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 13:31:36 -0300
Subject: [PATCH 6133/6849] ethtool: bump to version 3.11

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index cdc9a6d7d1..7c22269af6 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ETHTOOL_VERSION = 3.10
+ETHTOOL_VERSION = 3.11
 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2

From 85f1fd14bf50fc0f068e1576e34123d276cb632b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 13:31:37 -0300
Subject: [PATCH 6134/6849] iproute2: bump to version 3.11.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index fec0b624db..a63a096105 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPROUTE2_VERSION = 3.10.0
+IPROUTE2_VERSION = 3.11.0
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc

From ac4ee61d76772a94455b8e5a17d6050b3d42b98c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 13:31:38 -0300
Subject: [PATCH 6135/6849] olsr: bump to version 0.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/olsr/olsr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index 9532612c40..f96e570613 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 OLSR_VERSION_MAJOR = 0.6
-OLSR_VERSION_MINOR = 4
+OLSR_VERSION_MINOR = 6
 OLSR_VERSION = $(OLSR_VERSION_MAJOR).$(OLSR_VERSION_MINOR)
 OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2
 OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)

From 46baba78ffc6db422d9cfb1e24894497467c501a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 14:19:13 -0300
Subject: [PATCH 6136/6849] aiccu: needs threads

Fixes:
http://autobuild.buildroot.net/results/f6e/f6e1da89b3a0418a50cbfa39fc9373dad3fc968c/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aiccu/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index 1c6f5545e3..15959b1a8c 100644
--- a/package/aiccu/Config.in
+++ b/package/aiccu/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_AICCU
 	bool "aiccu"
 	depends on BR2_INET_IPV6
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_GNUTLS
 	help
 	  SixXS Automatic IPv6 Connectivity Client Utility
@@ -17,5 +18,5 @@ config BR2_PACKAGE_AICCU
 
 	  http://www.sixxs.net/tools/aiccu/
 
-comment "aiccu requires a toolchain with IPv6 and WCHAR support"
-	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR)
+comment "aiccu requires a toolchain with IPv6, WCHAR and thread support"
+	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

From 238d13ab47dfaabad7296c13a2903ad422ed2fda Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 14:39:34 -0300
Subject: [PATCH 6137/6849] ltrace: bump to version 0.7.3

Now with proper mips support!

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ltrace/Config.in                      |  4 ++--
 ...ce-events.patch => ltrace-01-events.patch} |  0
 package/ltrace/ltrace-uclibc.patch            | 20 -------------------
 package/ltrace/ltrace.mk                      | 12 ++---------
 4 files changed, 4 insertions(+), 32 deletions(-)
 rename package/ltrace/{ltrace-events.patch => ltrace-01-events.patch} (100%)
 delete mode 100644 package/ltrace/ltrace-uclibc.patch

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 4f1c42f7ac..943af8dad8 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa || BR2_aarch64 || BR2_arc)
+	depends on !(BR2_avr32 || BR2_sh || BR2_sh64 || BR2_xtensa || BR2_aarch64 || BR2_arc)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LTRACE
 	  the dynamic library calls which are called by the executed
 	  process and the signals received by that process.
 
-	  http://packages.debian.org/unstable/utils/ltrace.html
+	  http://ltrace.org
diff --git a/package/ltrace/ltrace-events.patch b/package/ltrace/ltrace-01-events.patch
similarity index 100%
rename from package/ltrace/ltrace-events.patch
rename to package/ltrace/ltrace-01-events.patch
diff --git a/package/ltrace/ltrace-uclibc.patch b/package/ltrace/ltrace-uclibc.patch
deleted file mode 100644
index c1041fbb38..0000000000
--- a/package/ltrace/ltrace-uclibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-[PATCH] configure.ac: Recognize linux-uclibc as well
-
-Ltrace works on uClibc as well as on glibc, so accept it.
-
-[Gustavo: update for ltrace 0.7.1]
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura ltrace-0.7.1.orig/configure.ac ltrace-0.7.1/configure.ac
---- ltrace-0.7.1.orig/configure.ac	2012-12-03 09:02:32.995352741 -0300
-+++ ltrace-0.7.1/configure.ac	2012-12-03 09:02:56.579096389 -0300
-@@ -32,7 +32,7 @@
- AC_CANONICAL_HOST
- 
- case "${host_os}" in
--    linux-gnu*)	HOST_OS="linux-gnu" ;;
-+    linux-gnu* | linux-uclibc*)	HOST_OS="linux-gnu" ;;
-     *)		AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
- esac
- AC_SUBST(HOST_OS)
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 0ea8ff3272..b42c252332 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -4,22 +4,14 @@
 #
 ################################################################################
 
-LTRACE_VERSION = 0.7.2
-LTRACE_SITE = http://alioth.debian.org/frs/download.php/file/3848
+LTRACE_VERSION = 0.7.3
+LTRACE_SITE = http://alioth.debian.org/frs/download.php/file/3947
 LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
 LTRACE_DEPENDENCIES = libelf
-LTRACE_AUTORECONF = YES
 LTRACE_CONF_OPT = --disable-werror
 LTRACE_LICENSE = GPLv2
 LTRACE_LICENSE_FILES = COPYING
 
-# symlink missing from tarball
-define LTRACE_MIPS_SYMLINK
-	cd $(@D)/sysdeps/linux-gnu; ln -sf mipsel mips
-endef
-
-LTRACE_POST_EXTRACT_HOOKS += LTRACE_MIPS_SYMLINK
-
 # ltrace can use libunwind only if libc has backtrace() support
 # We don't normally do so for uClibc and we can't know if it's external
 ifeq ($(BR2_PACKAGE_LIBUNWIND),y)

From eca77d0429f531a6f377da5d25d8ee72cd98a449 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 17 Sep 2013 15:45:53 -0300
Subject: [PATCH 6138/6849] apply-patches.sh: avoid reversed/already applied
 patches

Disable reversed/already applied patches fallout from commit
5871b791995ebe295db7dca608afe3f293ce8953
Reverse patches are bad, they may unfix things with version bumps and
just sneak under the radar with pure batch mode.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 support/scripts/apply-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 1ebaea990f..ff72b45240 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -84,7 +84,7 @@ function apply_patch {
 	exit 1
     fi
     echo $patch >> ${builddir}/.applied_patches_list
-    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t
+    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix ${patch}!"
 	exit 1

From 549c09b6270c1e940d23c3d7feed86a84b9f6048 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Sun, 15 Sep 2013 17:40:37 +0200
Subject: [PATCH 6139/6849] luacrypto: refactor with autotools

some CMake stuff comes from LuaDist, but CMake is not the primary build infrastructure of LuaCrypto.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luacrypto/Config.in                   |  1 -
 .../luacrypto/luacrypto-01-autotools.patch    | 30 +++++++++++++++++++
 package/luacrypto/luacrypto.mk                |  6 ++--
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 package/luacrypto/luacrypto-01-autotools.patch

diff --git a/package/luacrypto/Config.in b/package/luacrypto/Config.in
index f4587c30f7..8d13eec6b5 100644
--- a/package/luacrypto/Config.in
+++ b/package/luacrypto/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUACRYPTO
 	bool "luacrypto"
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_LUASOCKET
 	help
 	  LuaCrypto provides a Lua frontend to the OpenSSL cryptographic
 	  library.
diff --git a/package/luacrypto/luacrypto-01-autotools.patch b/package/luacrypto/luacrypto-01-autotools.patch
new file mode 100644
index 0000000000..e8befb05f8
--- /dev/null
+++ b/package/luacrypto/luacrypto-01-autotools.patch
@@ -0,0 +1,30 @@
+autotools: fix install directories
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS = src \
+ 	  doc
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/lib/pkgconfig
+ pkgconfig_DATA = luacrypto.pc
+ 
+ test: all
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@
+ PKG_CHECK_MODULES([LUA], [lua])
+ 
+ # lua libdir
+-LUALIBDIR="`$PKGCONFIG --variable=libdir lua`"
++LUALIBDIR="`$PKGCONFIG --variable=INSTALL_CMOD lua`"
+ 
+ # dest of headers
+ CRYPTOINC="${includedir}/${PACKAGE_NAME}"
diff --git a/package/luacrypto/luacrypto.mk b/package/luacrypto/luacrypto.mk
index ca57c65857..f6fcc787e1 100644
--- a/package/luacrypto/luacrypto.mk
+++ b/package/luacrypto/luacrypto.mk
@@ -8,7 +8,7 @@ LUACRYPTO_VERSION = 0.3.2
 LUACRYPTO_SITE = http://github.com/mkottman/luacrypto/tarball/$(LUACRYPTO_VERSION)
 LUACRYPTO_LICENSE = MIT
 LUACRYPTO_LICENSE_FILES = COPYING
-LUACRYPTO_DEPENDENCIES = lua openssl
-LUACRYPTO_CONF_OPT = "-DLUA_LIBRARIES=\"$(STAGING_DIR)/usr/lib/liblua.so\""
+LUACRYPTO_DEPENDENCIES = lua openssl host-pkgconf
+LUACRYPTO_AUTORECONF = YES
 
-$(eval $(cmake-package))
+$(eval $(autotools-package))

From 58da9b6f7d3740b971afc017401e1a50f803dcfa Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Tue, 17 Sep 2013 10:04:17 +0100
Subject: [PATCH 6140/6849] toolchain-external: Update Sourcery CodeBench MIPS
 toolchain

Update to the latest update for the 2013.05 toolchain
released on 11 September 2013.

https://sourcery.mentor.com/GNUToolchain/release2554

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-tool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 3539cb56c7..db2a99e01b 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -246,7 +246,7 @@ TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-l
 TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.09-99-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE = mips-2013.05-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SOURCE = mips-2013.05-66-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/nios2-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = sourceryg++-2013.05-43-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 53722e54d08e31f007fa6a1682495eae725eccdf Mon Sep 17 00:00:00 2001
From: Michael Rommel <rommel@layer-7.net>
Date: Sat, 14 Sep 2013 16:44:00 +0200
Subject: [PATCH 6141/6849] python-pyzmq: new package

The python language bindings for ZeroMQ.

[Peter: moved version note to .mk, single toolchain deps line]
Signed-off-by: Michael Rommel <rommel@layer-7.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |  1 +
 package/python-pyzmq/Config.in                | 17 +++++++
 ...ldroot-zmq-version-instead-of-detect.patch | 43 ++++++++++++++++++
 package/python-pyzmq/python-pyzmq.mk          | 44 +++++++++++++++++++
 4 files changed, 105 insertions(+)
 create mode 100644 package/python-pyzmq/Config.in
 create mode 100644 package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch
 create mode 100644 package/python-pyzmq/python-pyzmq.mk

diff --git a/package/Config.in b/package/Config.in
index 973d32c707..56c316e6e2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -395,6 +395,7 @@ source "package/python-protobuf/Config.in"
 source "package/python-pygame/Config.in"
 source "package/python-pyparsing/Config.in"
 source "package/python-pyro/Config.in"
+source "package/python-pyzmq/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
 source "package/python-thrift/Config.in"
diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in
new file mode 100644
index 0000000000..a650865aaa
--- /dev/null
+++ b/package/python-pyzmq/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_PYTHON_PYZMQ
+	bool "python-pyzmq"
+	depends on BR2_LARGEFILE # zeromq
+	depends on BR2_INET_IPV6 # zeromq
+	depends on BR2_USE_WCHAR # zeromq
+	depends on BR2_INSTALL_LIBSTDCPP # zeromq
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_ZEROMQ
+	help
+	  This package contains the python language binding for zeromq.
+
+	  http://zeromq.org/bindings:python
+
+comment "python-pyzmq requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch b/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch
new file mode 100644
index 0000000000..560606989e
--- /dev/null
+++ b/package/python-pyzmq/python-pyzmq-0001-use-buildroot-zmq-version-instead-of-detect.patch
@@ -0,0 +1,43 @@
+detect.py: fix the ZMQ version check to the ZMQ version of the buildroot
+
+The setup.py script tries to compile a test C program and runs it, to
+retrieve a version string for the installed ZMQ library, but if the cross
+compiler links it together, the result cannot be run on the host, due to
+different architectures and libraries.
+
+And if the host compiler would compile/link it, it would not link with the
+library version inside buildroot but with the library from the host, possibly returning a wrong version number.
+
+Instead of trying to run the compiled test program to get the version
+dynamically, return the version of the buildroot environment.
+
+Signed-off-by: Michael Rommel <rommel@layer-7.net>
+
+--- pyzmq-13.0.2/buildutils/detect.py.orig	2013-08-10 00:49:28.242557978 +0200
++++ pyzmq-13.0.2/buildutils/detect.py	2013-08-10 00:44:35.197572704 +0200
+@@ -119,15 +119,17 @@ def detect_zmq(basedir, compiler=None, *
+             
+     efile = test_compilation(cfile, compiler=compiler, **compiler_attrs)
+     
+-    result = Popen(efile, stdout=PIPE, stderr=PIPE)
+-    so, se = result.communicate()
++    # result = Popen(efile, stdout=PIPE, stderr=PIPE)
++    # so, se = result.communicate()
+     # for py3k:
+-    so = so.decode()
+-    se = se.decode()
+-    if result.returncode:
+-        msg = "Error running version detection script:\n%s\n%s" % (so,se)
+-        logging.error(msg)
+-        raise IOError(msg)
++    #so = so.decode()
++    #se = se.decode()
++    #if result.returncode:
++    #    msg = "Error running version detection script:\n%s\n%s" % (so,se)
++    #    logging.error(msg)
++    #    raise IOError(msg)
++
++    so = "vers: ##ZEROMQ_VERSION##"
+ 
+     handlers = {'vers':  lambda val: tuple(int(v) for v in val.split('.'))}
+ 
diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
new file mode 100644
index 0000000000..a281aedd99
--- /dev/null
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# python-pyzmq
+#
+################################################################################
+
+PYTHON_PYZMQ_VERSION = 13.1.0
+PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
+PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/source/p/pyzmq/
+PYTHON_PYZMQ_LICENSE = LGPLv3+ BSD-3c Apache License Version 2.0
+# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
+PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
+PYTHON_PYZMQ_DEPENDENCIES = zeromq python host-python
+
+# Due to issues with cross-compiling, hardcode to the zeromq in BR
+define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
+	$(SED) 's/##ZEROMQ_VERSION##/$(ZEROMQ_VERSION)/' \
+		$(@D)/buildutils/detect.py
+endef
+
+PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
+
+PYTHON_PYZMQ_PARAMS = CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDSHARED="$(TARGET_CC) -shared" \
+		CROSS_COMPILING=yes \
+		_python_sysroot=$(STAGING_DIR) \
+		_python_srcdir=$(PYTHON_DIR) \
+		_python_prefix=/usr \
+		_python_exec_prefix=/usr
+
+define PYTHON_PYZMQ_CONFIGURE_CMDS
+	(cd $(@D); $(PYTHON_PYZMQ_PARAMS) \
+		$(HOST_DIR)/usr/bin/python setup.py configure \
+		--zmq=$(STAGING_DIR)/usr)
+endef
+
+define PYTHON_PYZMQ_INSTALL_TARGET_CMDS
+	(cd $(@D); $(PYTHON_PYZMQ_PARAMS) \
+		$(HOST_DIR)/usr/bin/python setup.py install \
+		--prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From a252d6f4c7b9bc122d6461b3db3f703f5fe1aeea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 18 Sep 2013 10:23:32 +0300
Subject: [PATCH 6142/6849] qt5webkit: select libXrender if xcb is enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Peter: also add libXext]
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5webkit/Config.in    | 2 ++
 package/qt5/qt5webkit/qt5webkit.mk | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
index 48b512504f..9eb5ef8375 100644
--- a/package/qt5/qt5webkit/Config.in
+++ b/package/qt5/qt5webkit/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5WEBKIT
 	select BR2_PACKAGE_QT5BASE_ICU
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
 	# This module does not support static linking
 	depends on !BR2_PREFER_STATIC_LIB
 	help
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index b51f5c5eed..c95f3b460c 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -21,6 +21,10 @@ QT5WEBKIT_LICENSE = Commercial license
 QT5WEBKIT_REDISTRIBUTE = NO
 endif
 
+ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
+QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
+endif
+
 define QT5WEBKIT_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
 endef

From 7816cc9ae624460fa0cccf50c1f0889b9d01151d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 18 Sep 2013 11:01:03 +0300
Subject: [PATCH 6143/6849] qt5webkit: install qml's only if declarative module
 is selected
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5webkit/qt5webkit.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index c95f3b460c..320a2ea3c7 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -25,6 +25,10 @@ ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
 QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
 endif
 
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+QT5WEBKIT_DEPENDENCIES += qt5declarative
+endif
+
 define QT5WEBKIT_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
 endef
@@ -38,10 +42,16 @@ define QT5WEBKIT_INSTALL_STAGING_CMDS
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+define QT5WEBKIT_INSTALL_TARGET_QMLS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/
+endef
+endif
+
 define QT5WEBKIT_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib
 	cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/
+	$(QT5WEBKIT_INSTALL_TARGET_QMLS)
 endef
 
 $(eval $(generic-package))

From d804657a2cf04020d58d9661f00edc2c4b5d19c8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 07:18:10 -0300
Subject: [PATCH 6144/6849] aiccu: needs mmu

Fixes:
http://autobuild.buildroot.net/results/549/549bc89aeaa0ebf9162fc5853cb637f4f70d0b51/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/aiccu/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index 15959b1a8c..9cff8ccb23 100644
--- a/package/aiccu/Config.in
+++ b/package/aiccu/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_AICCU
 	depends on BR2_INET_IPV6
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_GNUTLS
 	help
 	  SixXS Automatic IPv6 Connectivity Client Utility

From b143b6d01e61580d4b862c30d5f4c205e182a23f Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 18 Sep 2013 11:01:34 +0200
Subject: [PATCH 6145/6849] trivial: manual: fix grammar of 'to express'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 6296596d7e..aac1ced452 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -65,7 +65,7 @@ rules:
   dependencies are selected. For example, the _libgtk2_ package uses
   +select BR2_PACKAGE_LIBGLIB2+ to make sure this library is also
   enabled.
-  The +select+ keyword express the dependency with a backward
+  The +select+ keyword expresses the dependency with a backward
   semantic.
 
 * Use a +depends on+ type of dependency when the user really needs to
@@ -77,7 +77,7 @@ rules:
   dependencies on toolchain options, there should be a +comment+ that
   is displayed when the option is not
   enabled, so that the user knows why the package is not available.
-  The +depends on+ keyword express the dependency with a forward
+  The +depends on+ keyword expresses the dependency with a forward
   semantic.
 
 .Note

From 64a50ee427df9754a2b2dbb62cd2b4a4710e912d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 18 Sep 2013 11:01:35 +0200
Subject: [PATCH 6146/6849] trivial: manual: multimedia is no longer a
 subdirectory

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/adding-packages-directory.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index aac1ced452..7bf37c27a6 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -8,7 +8,7 @@ First of all, create a directory under the +package+ directory for
 your software, for example +libfoo+.
 
 Some packages have been grouped by topic in a sub-directory:
-+multimedia+, +x11r7+, +efl+ and +matchbox+. If your package fits in
++x11r7+, +efl+ and +matchbox+. If your package fits in
 one of these categories, then create your package directory in these.
 New subdirectories are discouraged, however.
 

From c97b9cc2529d8c34d3d67829046f9df6da00593c Mon Sep 17 00:00:00 2001
From: Michael Rommel <rommel@layer-7.net>
Date: Wed, 18 Sep 2013 13:19:43 +0200
Subject: [PATCH 6147/6849] knock: needs mmu

Signed-off-by: Michael Rommel <rommel@layer-7.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/knock/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/knock/Config.in b/package/knock/Config.in
index a50860bcd2..8778a7e3fd 100644
--- a/package/knock/Config.in
+++ b/package/knock/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KNOCK
 	bool "knock"
 	select BR2_PACKAGE_LIBPCAP
+	depends on BR2_USE_MMU # fork()
 	help
 	  A port knocking implementation.
 	  Provides a daemon and a user application. Port knocking can be

From 41a9a56fe9cd24a11a58f9c44118dc14201af86c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 08:31:39 -0300
Subject: [PATCH 6148/6849] ola: needs host-bison and host-flex

Fixes:
http://autobuild.buildroot.net/results/385/385f05b5e1b023b6c4ca220aab897e400b5aeccb/
and a future failure (host-bison).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ola/ola.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index 55386b1a21..d7ddab7dae 100644
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -12,7 +12,7 @@ OLA_LICENSE_FILES = LICENCE GPL LGPL
 OLA_INSTALL_STAGING = YES
 
 # util-linux provides uuid lib
-OLA_DEPENDENCIES = protobuf util-linux
+OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex
 
 OLA_CONF_OPT = \
 	--disable-gcov \

From abd5db62fdec410eaf857b6eb107602734c87999 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 08:33:30 -0300
Subject: [PATCH 6149/6849] mplayer: security bump to version 1.1.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/mplayer/mplayer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index a13efed76f..9a511b4656 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MPLAYER_VERSION = 1.1
+MPLAYER_VERSION = 1.1.1
 MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
 MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
 

From 96ac9ef5be29dee88f24cf583ca8c53be481bb8f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 10:38:01 -0300
Subject: [PATCH 6150/6849] gettext: fixup library permissions

libintl.so* is installed without +x permissions thus preventing
stripping. Fix it up in the post install target hooks.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gettext/gettext.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index baf42efabe..7af203551a 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -58,5 +58,12 @@ endef
 endif
 endif # GETTEXT_TOOLS = n
 
+# Library lacks +x so strip skips it
+define GETTEXT_FIX_LIBRARY_MODE
+	-chmod +x $(TARGET_DIR)/usr/lib/libintl.so*
+endef
+
+GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_FIX_LIBRARY_MODE
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 22718b0e2c1d2b471ef60dc7992ad94376bb48b7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 10:38:02 -0300
Subject: [PATCH 6151/6849] libiconv: fixup library permissions

libiconv.so* and libcharset.so* are installed without +x permissions
thus preventing stripping. Fix it up in the post install target hooks.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libiconv/libiconv.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index d6a1d6f498..aa6d6de8b6 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -21,6 +21,14 @@ endef
 LIBICONV_POST_INSTALL_TARGET_HOOKS += LIBICONV_TARGET_REMOVE_PRELOADABLE_LIBS
 LIBICONV_POST_INSTALL_STAGING_HOOKS += LIBICONV_STAGING_REMOVE_PRELOADABLE_LIBS
 
+# Library lacks +x so strip skips it
+define LIBICONV_FIX_LIBRARY_MODE
+	-chmod +x $(TARGET_DIR)/usr/lib/libcharset.so*
+	-chmod +x $(TARGET_DIR)/usr/lib/libiconv.so*
+endef
+
+LIBICONV_POST_INSTALL_TARGET_HOOKS += LIBICONV_FIX_LIBRARY_MODE
+
 $(eval $(autotools-package))
 
 # Configurations where the toolchain supports locales and the libiconv

From 95cc2aab61f9c8ea21d4b1cc45f4aa13310e9637 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 10:38:03 -0300
Subject: [PATCH 6152/6849] pciutils: fixup library permissions

libpci.so* is installed without +x permissions thus preventing
stripping. Fix it up in the post install target hooks.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/pciutils/pciutils.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 350ca0d352..fd6f8aa57d 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -65,4 +65,12 @@ define PCIUTILS_INSTALL_STAGING_CMDS
 		SHARED=$(PCIUTILS_SHARED) install install-lib
 endef
 
+
+# Library lacks +x so strip skips it
+define PCIUTILS_FIX_LIBRARY_MODE
+	-chmod +x $(TARGET_DIR)/usr/lib/libpci.so*
+endef
+
+PCIUTILS_POST_INSTALL_TARGET_HOOKS += PCIUTILS_FIX_LIBRARY_MODE
+
 $(eval $(generic-package))

From 63e492e4e66229b2f34704e904066209d8491cba Mon Sep 17 00:00:00 2001
From: Michael Rommel <rommel@layer-7.net>
Date: Wed, 18 Sep 2013 13:48:16 +0200
Subject: [PATCH 6153/6849] python-crc16: new package

A python library that calculates CRC checksums of the CCITT/XModem
variant.

Signed-off-by: Michael Rommel <rommel@layer-7.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                    |  1 +
 package/python-crc16/Config.in       | 11 +++++++++
 package/python-crc16/python-crc16.mk | 35 ++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 package/python-crc16/Config.in
 create mode 100644 package/python-crc16/python-crc16.mk

diff --git a/package/Config.in b/package/Config.in
index 56c316e6e2..779e9da65f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -385,6 +385,7 @@ source "package/python/Config.in"
 if BR2_PACKAGE_PYTHON
 menu "external python modules"
 source "package/python-bottle/Config.in"
+source "package/python-crc16/Config.in"
 source "package/python-dpkt/Config.in"
 source "package/python-id3/Config.in"
 source "package/python-mad/Config.in"
diff --git a/package/python-crc16/Config.in b/package/python-crc16/Config.in
new file mode 100644
index 0000000000..3fd8da7a85
--- /dev/null
+++ b/package/python-crc16/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_CRC16
+	bool "python-crc16"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  This library calculates only CRC16 (16-bit codes) and the
+	  only supported variant at the moment is CRC-CCITT (XModem).
+	  CRC is a way of detecting accidental changes in data storage
+	  or transmission. There are many variants of CRC and CRC16,
+	  in particular.
+
+	  http://pycrc16.googlecode.com/
diff --git a/package/python-crc16/python-crc16.mk b/package/python-crc16/python-crc16.mk
new file mode 100644
index 0000000000..adfdcc67ec
--- /dev/null
+++ b/package/python-crc16/python-crc16.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# python-crc16
+#
+################################################################################
+
+PYTHON_CRC16_VERSION = 0.1.1
+PYTHON_CRC16_SOURCE = crc16-$(PYTHON_CRC16_VERSION).tar.gz
+PYTHON_CRC16_SITE = http://pycrc16.googlecode.com/files/
+PYTHON_CRC16_LICENSE = LGPLv3+
+PYTHON_CRC16_LICENSE_FILES = COPYING.txt
+PYTHON_CRC16_DEPENDENCIES = python host-python
+
+PYTHON_CRC16_PARAMS = CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDSHARED="$(TARGET_CC) -shared" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+		CROSS_COMPILING=yes \
+		_python_sysroot=$(STAGING_DIR) \
+		_python_srcdir=$(PYTHON_DIR) \
+		_python_prefix=/usr \
+		_python_exec_prefix=/usr
+
+define PYTHON_CRC16_BUILD_CMDS
+	(cd $(@D); $(PYTHON_CRC16_PARAMS) \
+		$(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_CRC16_INSTALL_TARGET_CMDS
+	(cd $(@D); $(PYTHON_CRC16_PARAMS) \
+		$(HOST_DIR)/usr/bin/python setup.py install \
+		--prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From 3577ca6af2597db4defda8db03e2fffb174d3fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 18 Sep 2013 08:17:09 +0300
Subject: [PATCH 6154/6849] qt5base: set eglfs platform hook for imx6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt5/qt5base/qt5base.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 1686dad69a..ddc5574c7e 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -98,6 +98,10 @@ endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
 QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs
 QT5BASE_DEPENDENCIES   += libgles libegl
+ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
+QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
+	$(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
+endif
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
 	$(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp

From 2e7823833e62cdbd98a8bfe9cacbae4e29d4003c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 18 Sep 2013 07:46:04 -0300
Subject: [PATCH 6155/6849] webrtc-audio-processing: needs threads

Fixes:
http://autobuild.buildroot.net/results/543/5435304b12fa1344411821b749cb028485431a82/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/webrtc-audio-processing/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in
index 90341d69fe..9fa141fe13 100644
--- a/package/webrtc-audio-processing/Config.in
+++ b/package/webrtc-audio-processing/Config.in
@@ -2,11 +2,12 @@ config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
 	bool "webrtc-audio-processing"
 	depends on BR2_arm || BR2_i386 || BR2_x86_64
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  AudioProcessing library based on Google's implementation of
 	  WebRTC.
 
 	  http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
 
-comment "webrtc-audio-processing requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "webrtc-audio-processing requires a toolchain with C++ and thread support enabled"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

From 36274046516c7576e5b8229ccc4e290e2113d4f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 18 Sep 2013 14:41:33 +0300
Subject: [PATCH 6156/6849] gpu-viv-bin-mx6q: add pkgconfig files for EGL,
 OpenGLESv2 and OpenVG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freescale-imx/gpu-viv-bin-mx6q/egl.pc          | 10 ++++++++++
 package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc       | 10 ++++++++++
 .../freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk |  9 +++++++++
 package/freescale-imx/gpu-viv-bin-mx6q/vg.pc           | 10 ++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
 create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
 create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/vg.pc

diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
new file mode 100644
index 0000000000..c9842471d8
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: Freescale gpu-viv-bin-mx6q implementation of EGL
+Version: 1.0
+Libs: -L${libdir} -lGAL -lEGL
+Cflags: -I${includedir}/ -DEGL_API_FB=1
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
new file mode 100644
index 0000000000..7cfb5e7d68
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: Freescale gpu-viv-bin-mx6q implementation of OpenGL ESv2
+Version: 2.0
+Libs: -L${libdir} -lGAL -lEGL -lGLESv2
+Cflags: -I${includedir}/ -DEGL_API_FB=1
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index 0338e13c19..1b9684a4ae 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -51,6 +51,15 @@ endef
 
 define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
 	cp -r $(@D)/usr/* $(STAGING_DIR)/usr
+	for lib in egl glesv2 vg; do \
+		$(INSTALL) -m 0644 -D \
+			package/freescale-imx/gpu-viv-bin-mx6q/$${lib}.pc \
+			$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
+		if [ "$(GPU_VIV_BIN_MX6Q_LIB_TARGET)" != "fb" ]; then \
+			$(SED) "s/-DEGL_API_FB=1//" \
+				$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
+		fi; \
+	done
 endef
 
 ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
new file mode 100644
index 0000000000..fb14005571
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: vg
+Description: Freescale gpu-viv-bin-mx6q implementation of OpenVG
+Version: 1.1
+Libs: -L${libdir} -lGAL -lEGL -lOpenVG
+Cflags: -I${includedir}/ -DEGL_API_FB=1

From 44bf55f216c3541126f5d576beaa0dedf90ce071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 18 Sep 2013 15:27:51 +0300
Subject: [PATCH 6157/6849] gpu-viv-bin-mx6q: select libXdamage and libXext
 when xorg enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/freescale-imx/gpu-viv-bin-mx6q/Config.in           | 2 ++
 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 1 +
 2 files changed, 3 insertions(+)

diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index e80eae4348..a3c205761e 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	bool "gpu-viv-bin-mx6q"
 	select BR2_PACKAGE_HAS_OPENGL_EGL
 	select BR2_PACKAGE_HAS_OPENGL_ES
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	depends on BR2_arm # Only relevant for i.MX6
 	 # Library binaries are linked against libc.so.6
 	depends on BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index 1b9684a4ae..c48d1080dc 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -21,6 +21,7 @@ GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
 
 # DirectFB is not supported (wrong version)
 ifeq ($(BR2_PACKAGE_XORG7),y)
+GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext
 GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
 else
 GPU_VIV_BIN_MX6Q_LIB_TARGET = fb

From 41d624f9e3ca5484fe73d759f11088daa2f19ac1 Mon Sep 17 00:00:00 2001
From: Carlos Quijano <carlos@crqgestion.es>
Date: Wed, 18 Sep 2013 09:40:58 +0200
Subject: [PATCH 6158/6849] board: add cubieboard2 support

Signed-off-by: Carlos Quijano <carlos@crqgestion.es>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../cubieboard/linux-cubieboard2.config       | 749 ++++++++++++++++++
 board/cubietech/cubieboard/mkcubiecard.sh     |  15 +-
 board/cubietech/cubieboard/readme.txt         |   7 +-
 configs/cubieboard2_defconfig                 |  40 +
 package/sunxi-boards/sunxi-boards.mk          |   2 +-
 5 files changed, 805 insertions(+), 8 deletions(-)
 create mode 100644 board/cubietech/cubieboard/linux-cubieboard2.config
 create mode 100644 configs/cubieboard2_defconfig

diff --git a/board/cubietech/cubieboard/linux-cubieboard2.config b/board/cubietech/cubieboard/linux-cubieboard2.config
new file mode 100644
index 0000000000..1ae1519f8f
--- /dev/null
+++ b/board/cubietech/cubieboard/linux-cubieboard2.config
@@ -0,0 +1,749 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_RCU_FAST_NO_HZ=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PERF_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_SGI_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_ARCH_SUN7I=y
+CONFIG_SUNXI_SCALING_MIN=408
+# CONFIG_CACHE_L2X0 is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_SMP=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_NR_CPUS=2
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_HIGHMEM=y
+CONFIG_COMPACTION=y
+CONFIG_KSM=y
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mmc0p1 rw init=/init loglevel=8"
+CONFIG_KEXEC=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_DEFAULT_GOV_FANTASY=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y
+CONFIG_CPU_FREQ_DVFS=y
+CONFIG_CPU_IDLE=y
+CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_BINFMT_MISC=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_DEBUG=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_WESTWOOD=y
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_TCP_CONG_HSTCP=y
+CONFIG_TCP_CONG_HYBLA=y
+CONFIG_TCP_CONG_SCALABLE=y
+CONFIG_TCP_CONG_LP=y
+CONFIG_TCP_CONG_VENO=y
+CONFIG_TCP_CONG_YEAH=y
+CONFIG_TCP_CONG_ILLINOIS=y
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA2=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_REJECT_SKERR=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_BATMAN_ADV=m
+CONFIG_OPENVSWITCH=m
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_PKTGEN=m
+CONFIG_IRDA=m
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+CONFIG_IRTTY_SIR=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+CONFIG_RXKAD=m
+CONFIG_CFG80211=y
+CONFIG_CFG80211_DEVELOPER_WARNINGS=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_CFG80211_ALLOW_RECONNECT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_MESH=y
+CONFIG_WIMAX=m
+CONFIG_RFKILL=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_CONNECTOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_SUNXI_DBGREG=m
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SW_SATA_AHCI_PLATFORM=y
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_SUNXI_EMAC=y
+CONFIG_PHYLIB=y
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=m
+CONFIG_PPPOLAC=m
+CONFIG_PPPOPNS=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_USB_IPHETH=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH9K=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8192CU_SW=m
+CONFIG_RTL8188EU=m
+CONFIG_RTXX7X_SW=m
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_KEYRESET=y
+CONFIG_KEYBOARD_HV2605_KEYBOARD=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_GT801=m
+CONFIG_TOUCHSCREEN_GT811=m
+CONFIG_TOUCHSCREEN_GT818=m
+CONFIG_TOUCHSCREEN_FT5X_TS=m
+CONFIG_TOUCHSCREEN_ZT8031=m
+CONFIG_GSENSOR=y
+CONFIG_SENSORS_BMA250=m
+CONFIG_MEMSIC_ECOMPASS=m
+CONFIG_SENSORS_MXC622X=m
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=8
+CONFIG_SERIAL_8250_RUNTIME_UARTS=8
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI=y
+CONFIG_SPI_DEBUG=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_SUNXI=m
+CONFIG_POWER_SUPPLY=y
+CONFIG_AW_AXP=y
+# CONFIG_HWMON is not set
+CONFIG_REGULATOR=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_DEV=y
+CONFIG_MEDIA_TUNER_CUSTOMISE=y
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+# CONFIG_MEDIA_TUNER_MAX2165 is not set
+# CONFIG_MEDIA_TUNER_TDA18218 is not set
+# CONFIG_MEDIA_TUNER_TDA18212 is not set
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_CSI_SUN4I is not set
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_KEENE=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_AUDIO_ENGINE=y
+CONFIG_PA_CONTROL=y
+CONFIG_DRM=m
+CONFIG_DRM_MALI=m
+CONFIG_DRM_UDL=m
+CONFIG_MALI=m
+CONFIG_MALI400_DEBUG=y
+CONFIG_MALI400_GPU_UTILIZATION=y
+CONFIG_FB=y
+CONFIG_FB_SUNXI=y
+CONFIG_FB_SUNXI_LCD=y
+CONFIG_FB_SUNXI_HDMI=y
+CONFIG_HDMI_CEC=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_ALOOP=m
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_SOC=y
+CONFIG_SND_SUNXI_SOC_SPDIF=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=y
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+CONFIG_HID_KYE=y
+CONFIG_HID_LOGITECH_DJ=y
+CONFIG_LOGITECH_FF=y
+# CONFIG_LOGIWHEELS_FF is not set
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_REALTEK=y
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_STORAGE_ENE_UB6250=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CONSOLE=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_GADGET=y
+CONFIG_USB_FILE_STORAGE=m
+CONFIG_USB_FILE_STORAGE_TEST=y
+CONFIG_MMC=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
+CONFIG_MMC_USHC=y
+CONFIG_MMC_SUNXI_POWER_CONTROL=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_SUNXI=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_SUN4I=y
+CONFIG_STAGING=y
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_LOGGER=y
+CONFIG_ANDROID_RAM_CONSOLE=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_REISERFS_FS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_QFMT_V2=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=y
+CONFIG_FSCACHE=y
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=y
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_NTFS_FS=y
+CONFIG_NTFS_RW=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_HFS_FS=y
+CONFIG_HFSPLUS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="y"
+CONFIG_ROOT_NFS=y
+CONFIG_NFS_USE_LEGACY_DNS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_FAULT_INJECTION=y
+CONFIG_CIFS=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_936=y
+CONFIG_NLS_CODEPAGE_950=y
+CONFIG_NLS_CODEPAGE_932=y
+CONFIG_NLS_CODEPAGE_949=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_LIST=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# CONFIG_FTRACE is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_DEBUG_LL=y
+CONFIG_SECURITYFS=y
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ZLIB=y
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_LIBCRC32C=y
diff --git a/board/cubietech/cubieboard/mkcubiecard.sh b/board/cubietech/cubieboard/mkcubiecard.sh
index 4ffb22304b..34afc87088 100755
--- a/board/cubietech/cubieboard/mkcubiecard.sh
+++ b/board/cubietech/cubieboard/mkcubiecard.sh
@@ -14,6 +14,7 @@
 
 IMAGES_DIR=$1
 SPL_IMG=$IMAGES_DIR/sunxi-spl.bin
+SPL_UBOOT=$IMAGES_DIR/u-boot-sunxi-with-spl.bin
 UBOOT_IMG=$IMAGES_DIR/u-boot.bin
 UIMAGE=$IMAGES_DIR/uImage
 BIN_BOARD_FILE=$IMAGES_DIR/script.bin
@@ -32,7 +33,7 @@ if [ $EUID -ne 0 ]; then
 	exit 1
 fi
 
-if [ ! -f $SPL_IMG ] ||
+if [ ! -f $SPL_IMG  -a ! -f $SPL_UBOOT ] ||
    [ ! -f $UBOOT_IMG ] ||
    [ ! -f $UIMAGE ] ||
    [ ! -f $BIN_BOARD_FILE ] ||
@@ -113,7 +114,11 @@ umount $D2
 rm -fr $P1
 rm -fr $P2
 
-# write SPL
-dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8
-# write mele u-boot
-dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32
+if [ -e $SPL_UBOOT ]; then
+	dd if=$SPL_UBOOT of=$DRIVE bs=1024 seek=8
+else
+	# write SPL
+	dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8
+	# write mele u-boot
+	dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32
+fi
diff --git a/board/cubietech/cubieboard/readme.txt b/board/cubietech/cubieboard/readme.txt
index 1c47117675..81cc5e409b 100644
--- a/board/cubietech/cubieboard/readme.txt
+++ b/board/cubietech/cubieboard/readme.txt
@@ -1,4 +1,4 @@
-cubieboard
+cubieboard and cubieboard2
 
 -----
 Intro
@@ -13,8 +13,10 @@ For more information, please see http://linux-sunxi.org/FirstSteps
 How to build it
 ---------------
 
-You need to use the cubieboard_defconfig, to do so:
+You need to use the cubieboard_defconfig or cubieboard2_defconfig, to do so:
  * make cubieboard_defconfig
+or
+ * make cubieboard2_defconfig
 
 And to compile:
  * make
@@ -31,6 +33,7 @@ After building, you should obtain this tree:
     +-- script.bin
     +-- sunxi-spl.bin
     +-- u-boot.bin
+    +-- u-boot-sunxi-with-spl.bin (optional)
     `-- uImage
 
 --------------------------
diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig
new file mode 100644
index 0000000000..9f60b9fba0
--- /dev/null
+++ b/configs/cubieboard2_defconfig
@@ -0,0 +1,40 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2"
+BR2_TARGET_GENERIC_ISSUE="Welcome to use Cubieboard!"
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard/post-build.sh"
+
+# Additional tools
+BR2_PACKAGE_HOST_SUNXI_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_SUNXI_TOOLS=y
+BR2_PACKAGE_SUNXI_BOARDS=y
+BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/cubieboard2.fex"
+
+# Kernel headers
+BR2_KERNEL_HEADERS_3_4=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="5dda5145c877335e17bd9ca48954841acc0f785a"
+BR2_LINUX_KERNEL_VERSION="sunxi-3.4"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/cubietech/cubieboard/linux-cubieboard2.config"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="cubieboard2"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_VERSION="sunxi"
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="b4bca5e0651b460a4511582f07a935cb48f74948"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk
index 6c28e42b0d..ef5b34d116 100644
--- a/package/sunxi-boards/sunxi-boards.mk
+++ b/package/sunxi-boards/sunxi-boards.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_BOARDS_VERSION = 88d663db44f65b73ef65c4148a28c6fa3665d2b6
+SUNXI_BOARDS_VERSION = 25a868189dbaa40872b2ac7d8a941dd73972eb08
 SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/$(SUNXI_BOARDS_VERSION)
 SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools
 SUNXI_BOARDS_INSTALL_IMAGES = YES

From 3fce526c2d8390877daa69c9171bdbd3f682a64b Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 5 Sep 2013 10:24:19 +0800
Subject: [PATCH 6159/6849] uclibc: Add UCLIBC_MMU_CONFIG to
 UCLIBC_SETUP_DOT_CONFIG

commit c798bec25 "uclibc: set MMU usage accordingly" defines UCLIBC_MMU_CONFIG,
but forgot adding it to UCLIBC_SETUP_DOT_CONFIG. Fix it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/uclibc/uclibc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 181a772fb3..3993d9bf61 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -425,6 +425,7 @@ define UCLIBC_SETUP_DOT_CONFIG
 	$(call UCLIBC_OPT_SET,RUNTIME_PREFIX,"/",$(@D))
 	$(call UCLIBC_OPT_SET,DEVEL_PREFIX,"/usr",$(@D))
 	$(call UCLIBC_OPT_SET,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D))
+	$(UCLIBC_MMU_CONFIG)
 	$(UCLIBC_ARM_TYPE_CONFIG)
 	$(UCLIBC_ARM_ABI_CONFIG)
 	$(UCLIBC_ARM_BX_CONFIG)

From 3ea44760f6a5ee8bf7f419ee0cc65b481a8cfe92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Mon, 16 Sep 2013 10:32:14 +0300
Subject: [PATCH 6160/6849] directfb: Add upstream patch to fix qt5base build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes http://autobuild.buildroot.net/results/8c7eaf99e365ecff28c097475b235dbe8d614294/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...fb-remove-redefinition-of-__typeof__.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/directfb/directfb-remove-redefinition-of-__typeof__.patch

diff --git a/package/directfb/directfb-remove-redefinition-of-__typeof__.patch b/package/directfb/directfb-remove-redefinition-of-__typeof__.patch
new file mode 100644
index 0000000000..e3861af97c
--- /dev/null
+++ b/package/directfb/directfb-remove-redefinition-of-__typeof__.patch
@@ -0,0 +1,28 @@
+Remove definition to fix qt5 build.
+
+Fetch from: http://git.directfb.org/?p=core/DirectFB.git;a=patch;h=203f78a4193a8ff110dec3c860e0928af1a0a72f
+
+From 203f78a4193a8ff110dec3c860e0928af1a0a72f Mon Sep 17 00:00:00 2001
+From: Denis Oliver Kropp <dok@directfb.org>
+Date: Wed, 31 Jul 2013 21:56:05 +0200
+Subject: [PATCH] libdirect: Remove redefinition of __typeof__!!!
+
+---
+ lib/direct/os/linux/glibc/types.h |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/direct/os/linux/glibc/types.h b/lib/direct/os/linux/glibc/types.h
+index 08e94b2..80cb350 100644
+--- a/lib/direct/os/linux/glibc/types.h
++++ b/lib/direct/os/linux/glibc/types.h
+@@ -81,7 +81,6 @@ typedef int64_t s64;
+ #define __dfb_no_instrument_function__  __attribute__((no_instrument_function))
+ #define __constructor__                 __attribute__((constructor))
+ #define __destructor__                  __attribute__((destructor))
+-#define __typeof__(x)                   __typeof__(x)
+ 
+ #ifndef __func__
+ #define __func__                        __FUNCTION__
+-- 
+1.7.9.5
+

From e0dabf9ea84bb4b312c521d95d9b259b5e6ac39f Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 19 Sep 2013 09:12:57 +0200
Subject: [PATCH 6161/6849] tslib: bump version to 1.1

[Peter: use 1.1 tag]
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/tslib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index 7f5aa21f08..751d01e7e9 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TSLIB_VERSION = 158ee49b32f83cb7b02d5315f41c2e4cff38942d
+TSLIB_VERSION = 1.1
 TSLIB_SITE = http://github.com/kergoth/tslib/tarball/$(TSLIB_VERSION)
 TSLIB_LICENSE = GPL, LGPL
 TSLIB_LICENSE_FILES = COPYING

From 8ced4129aef2dd7f40c920c6be2607334c1f60d9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 19 Sep 2013 20:39:56 +0200
Subject: [PATCH 6162/6849] tslib: fix help text (white space / order)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tslib/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tslib/Config.in b/package/tslib/Config.in
index 73b35dfaaf..95ee897da3 100644
--- a/package/tslib/Config.in
+++ b/package/tslib/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_TSLIB
 	bool "tslib"
 	help
-	    http://tslib.berlios.de/
+	  Tslib is an abstraction layer for touchscreen panel events.
 
-	    Tslib is an abstraction layer for touchscreen panel events.
+	  http://tslib.berlios.de/

From 21b61dead001125cfd63142dd9aa67016e8c7a45 Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Thu, 19 Sep 2013 10:17:52 -0500
Subject: [PATCH 6163/6849] iputils: new package

[Peter: fix _LICENSE_FILES]
Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in          |  1 +
 package/iputils/Config.in  |  8 ++++++
 package/iputils/iputils.mk | 53 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/iputils/Config.in
 create mode 100644 package/iputils/iputils.mk

diff --git a/package/Config.in b/package/Config.in
index 779e9da65f..ae0214caf9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -794,6 +794,7 @@ source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
 source "package/ipset/Config.in"
 source "package/iptables/Config.in"
+source "package/iputils/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
 source "package/knock/Config.in"
diff --git a/package/iputils/Config.in b/package/iputils/Config.in
new file mode 100644
index 0000000000..0c77b5fd81
--- /dev/null
+++ b/package/iputils/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_IPUTILS
+	bool "iputils"
+	select BR2_OPENSSL if BR2_INET_IPV6
+	help
+	  This package is set of small useful utilities for Linux networking.
+	  It includes complete versions of ping, traceroute, etc.
+
+	  http://sourceforge.net/projects/iputils/
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
new file mode 100644
index 0000000000..33665f60a3
--- /dev/null
+++ b/package/iputils/iputils.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# iputils
+#
+################################################################################
+
+IPUTILS_VERSION = s20121011
+IPUTILS_SITE = http://www.skbuff.net/iputils/
+IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2
+IPUTILS_LICENSE = GPLv2+ BSD-3c
+# Only includes a license file for BSD
+IPUTILS_LICENSE_FILES = ninfod/COPYING
+
+# Build after busybox so target ends up with this package's full
+# versions of the applications instead of busybox applets.
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+IPUTILS_DEPENDENCIES += busybox
+endif
+
+# Disabling CAP_SETPCAP (file capabilities)
+IPUTILS_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
+	CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
+	arping clockdiff ping rarpd rdisc tftpd tracepath
+
+ifeq ($(BR2_INET_IPV6),y)
+# To support md5 for ping6
+IPUTILS_DEPENDENCIES += openssl
+
+IPUTILS_MAKE_OPT += ping6 tracepath6 traceroute6
+
+define IPUTILS_IPV6_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/ping6       $(TARGET_DIR)/bin/ping6
+	$(INSTALL) -D -m 755 $(@D)/tracepath6  $(TARGET_DIR)/bin/tracepath6
+	$(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6
+endef
+endif
+
+define IPUTILS_BUILD_CMDS
+	$(MAKE) -C $(@D) $(IPUTILS_MAKE_OPT)
+endef
+
+define IPUTILS_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/arping      $(TARGET_DIR)/sbin/arping
+	$(INSTALL) -D -m 755 $(@D)/clockdiff   $(TARGET_DIR)/bin/clockdiff
+	$(INSTALL) -D -m 755 $(@D)/ping        $(TARGET_DIR)/bin/ping
+	$(INSTALL) -D -m 755 $(@D)/rarpd       $(TARGET_DIR)/sbin/rarpd
+	$(INSTALL) -D -m 755 $(@D)/rdisc       $(TARGET_DIR)/sbin/rdisc
+	$(INSTALL) -D -m 755 $(@D)/tftpd       $(TARGET_DIR)/usr/sbin/in.tftpd
+	$(INSTALL) -D -m 755 $(@D)/tracepath   $(TARGET_DIR)/bin/tracepath
+	$(IPUTILS_IPV6_INSTALL_TARGET_CMDS)
+endef
+
+$(eval $(generic-package))

From c95dcd464512ede5ffdef5567558611f05e2e52b Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Tue, 17 Sep 2013 23:26:41 -0500
Subject: [PATCH 6164/6849] bc: new package

Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in    |  1 +
 package/bc/Config.in | 14 ++++++++++++++
 package/bc/bc.mk     | 17 +++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 package/bc/Config.in
 create mode 100644 package/bc/bc.mk

diff --git a/package/Config.in b/package/Config.in
index ae0214caf9..e187aa3e4a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -733,6 +733,7 @@ endmenu
 
 menu "Miscellaneous"
 source "package/aespipe/Config.in"
+source "package/bc/Config.in"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
 source "package/googlefontdirectory/Config.in"
diff --git a/package/bc/Config.in b/package/bc/Config.in
new file mode 100644
index 0000000000..a28978d2e5
--- /dev/null
+++ b/package/bc/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_BC
+	bool "bc"
+	help
+	  'bc' is an arbitrary precision numeric processing language
+	  Its syntax is similar to C, but differs in many substantial
+	  areas. It supports interactive execution of statements. 'Bc'
+	  is a utility included in the POSIX P1003.2/D11 draft standard.
+	  This version does not use the historical method of having bc
+	  be a compiler for the dc calculator (the POSIX document doesn't
+	  specify how bc must be implemented). This version has a single
+	  executable that both compiles the language and runs the resulting
+	  'byte code.' The byte code is not the dc language.
+
+	  http://www.gnu.org/software/bc
diff --git a/package/bc/bc.mk b/package/bc/bc.mk
new file mode 100644
index 0000000000..3f1f7e7f17
--- /dev/null
+++ b/package/bc/bc.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# bc
+#
+################################################################################
+
+BC_VERSION = 1.06
+BC_SITE = $(BR2_GNU_MIRROR)/bc/
+BC_LICENSE = GPLv2+ LGPLv2.1+
+BC_LICENSE_FILES = COPYING COPYING.LIB
+
+# Build after busybox so target ends up with bc's "dc" version
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+BC_DEPENDENCIES += busybox
+endif
+
+$(eval $(autotools-package))

From 32b869c32407ede709ab9657b42f32ac3da5b4e3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 13:52:51 -0300
Subject: [PATCH 6165/6849] libcdaudio: disable autoreconf

There's no stated purpose and it breaks with automake 1.12+
If it breaks in some scenario ping me, i've got a patch to fix the
autoreconf issue and re-enable it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libcdaudio/libcdaudio.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index 151bb8cc66..06f8926501 100644
--- a/package/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
@@ -5,10 +5,7 @@
 ################################################################################
 
 LIBCDAUDIO_VERSION = 0.99.12p2
-LIBCDAUDIO_SOURCE = libcdaudio-$(LIBCDAUDIO_VERSION).tar.gz
 LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)/
-LIBCDAUDIO_AUTORECONF = YES
-LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
 LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config
 

From 17e761efc450328fb1a7be52b73613d998cb68f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 13:52:52 -0300
Subject: [PATCH 6166/6849] linux-pam: bump to version 1.1.7

And fix build breakage with newer automake versions (mkdir_p
deprecation).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ure.patch => linux-pam-01-configure.patch} |  0
 ...tch => linux-pam-02-doc-makefile-am.patch} |  0
 ...m-group.patch => linux-pam-03-group.patch} |  0
 package/linux-pam/linux-pam-04-mkdir.patch    | 17 +++++++++
 ...cceed.patch => linux-pam-05-succeed.patch} |  0
 ...pam-time.patch => linux-pam-06-time.patch} |  0
 ...rhosts.patch => linux-pam-07-rhosts.patch} |  0
 ...nix-fix-build-in-enable-selinux-mode.patch | 37 -------------------
 package/linux-pam/linux-pam.mk                |  2 +-
 9 files changed, 18 insertions(+), 38 deletions(-)
 rename package/linux-pam/{linux-pam-configure.patch => linux-pam-01-configure.patch} (100%)
 rename package/linux-pam/{linux-pam-doc-makefile-am.patch => linux-pam-02-doc-makefile-am.patch} (100%)
 rename package/linux-pam/{linux-pam-group.patch => linux-pam-03-group.patch} (100%)
 create mode 100644 package/linux-pam/linux-pam-04-mkdir.patch
 rename package/linux-pam/{linux-pam-succeed.patch => linux-pam-05-succeed.patch} (100%)
 rename package/linux-pam/{linux-pam-time.patch => linux-pam-06-time.patch} (100%)
 rename package/linux-pam/{linux-pam-rhosts.patch => linux-pam-07-rhosts.patch} (100%)
 delete mode 100644 package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch

diff --git a/package/linux-pam/linux-pam-configure.patch b/package/linux-pam/linux-pam-01-configure.patch
similarity index 100%
rename from package/linux-pam/linux-pam-configure.patch
rename to package/linux-pam/linux-pam-01-configure.patch
diff --git a/package/linux-pam/linux-pam-doc-makefile-am.patch b/package/linux-pam/linux-pam-02-doc-makefile-am.patch
similarity index 100%
rename from package/linux-pam/linux-pam-doc-makefile-am.patch
rename to package/linux-pam/linux-pam-02-doc-makefile-am.patch
diff --git a/package/linux-pam/linux-pam-group.patch b/package/linux-pam/linux-pam-03-group.patch
similarity index 100%
rename from package/linux-pam/linux-pam-group.patch
rename to package/linux-pam/linux-pam-03-group.patch
diff --git a/package/linux-pam/linux-pam-04-mkdir.patch b/package/linux-pam/linux-pam-04-mkdir.patch
new file mode 100644
index 0000000000..00056daf3d
--- /dev/null
+++ b/package/linux-pam/linux-pam-04-mkdir.patch
@@ -0,0 +1,17 @@
+$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead.
+Upstream should really gettextize with a newer version before packing up.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura Linux-PAM-1.1.7.orig/po/Makefile.in.in Linux-PAM-1.1.7/po/Makefile.in.in
+--- Linux-PAM-1.1.7.orig/po/Makefile.in.in	2013-09-11 20:45:16.610770002 -0300
++++ Linux-PAM-1.1.7/po/Makefile.in.in	2013-09-11 20:45:28.030145316 -0300
+@@ -31,7 +31,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ mkinstalldirs = $(SHELL) @install_sh@ -d
+-mkdir_p = @mkdir_p@
++mkdir_p = @MKDIR_P@
+ 
+ GMSGFMT_ = @GMSGFMT@
+ GMSGFMT_no = @GMSGFMT@
diff --git a/package/linux-pam/linux-pam-succeed.patch b/package/linux-pam/linux-pam-05-succeed.patch
similarity index 100%
rename from package/linux-pam/linux-pam-succeed.patch
rename to package/linux-pam/linux-pam-05-succeed.patch
diff --git a/package/linux-pam/linux-pam-time.patch b/package/linux-pam/linux-pam-06-time.patch
similarity index 100%
rename from package/linux-pam/linux-pam-time.patch
rename to package/linux-pam/linux-pam-06-time.patch
diff --git a/package/linux-pam/linux-pam-rhosts.patch b/package/linux-pam/linux-pam-07-rhosts.patch
similarity index 100%
rename from package/linux-pam/linux-pam-rhosts.patch
rename to package/linux-pam/linux-pam-07-rhosts.patch
diff --git a/package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch b/package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch
deleted file mode 100644
index 550e02e487..0000000000
--- a/package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Wed, 10 Oct 2012 18:13:07 +0000
-Subject: [PATCH] pam_unix: fix build in --enable-selinux mode
-
-glibc's <sys/wait.h> starting with commit
-http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=glibc-2.15-231-gd94a467
-does not include <sys/resource.h> for POSIX 2008 conformance reasons, so
-when pam is being built with SELinux support enabled, pam_unix_passwd.c
-uses getrlimit(2) and therefore should include <sys/resource.h> without
-relying on other headers.
-
-* modules/pam_unix/pam_unix_passwd.c: Include <sys/resource.h>.
-
-Reported-by: Guido Trentalancia <guido@trentalancia.com>
-Reported-by: "Jory A. Pratt" <anarchy@gentoo.org>
-Reported-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-[This patch is in linux-pam 1.1.6]
----
- modules/pam_unix/pam_unix_passwd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
-index 9e1302d..94bc3ec 100644
---- a/modules/pam_unix/pam_unix_passwd.c
-+++ b/modules/pam_unix/pam_unix_passwd.c
-@@ -58,6 +58,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- 
- #include <security/_pam_macros.h>
- 
--- 
-1.8.2.1
-
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 4472cd4311..6d575936bc 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -4,7 +4,7 @@
 # 
 ################################################################################
 
-LINUX_PAM_VERSION = 1.1.6
+LINUX_PAM_VERSION = 1.1.7
 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
 LINUX_PAM_SITE = http://linux-pam.org/library/
 LINUX_PAM_INSTALL_STAGING = YES

From 562b8df33c17678682c9fd1d71097d7322ed8f00 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 13:52:53 -0300
Subject: [PATCH 6167/6849] mutt: fix automake breakage

Fix breakage due to automake 1.12.6 bump.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...tt-1.5.21-nodoc.patch => mutt-01-nodoc.patch} |  0
 package/mutt/mutt-02-automake.patch              | 16 ++++++++++++++++
 2 files changed, 16 insertions(+)
 rename package/mutt/{mutt-1.5.21-nodoc.patch => mutt-01-nodoc.patch} (100%)
 create mode 100644 package/mutt/mutt-02-automake.patch

diff --git a/package/mutt/mutt-1.5.21-nodoc.patch b/package/mutt/mutt-01-nodoc.patch
similarity index 100%
rename from package/mutt/mutt-1.5.21-nodoc.patch
rename to package/mutt/mutt-01-nodoc.patch
diff --git a/package/mutt/mutt-02-automake.patch b/package/mutt/mutt-02-automake.patch
new file mode 100644
index 0000000000..19950a9f79
--- /dev/null
+++ b/package/mutt/mutt-02-automake.patch
@@ -0,0 +1,16 @@
+Fix for automake 1.12+
+http://dev.mutt.org/trac/ticket/3579
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura mutt-1.5.21.orig/configure.ac mutt-1.5.21/configure.ac
+--- mutt-1.5.21.orig/configure.ac	2013-09-16 11:07:25.699781892 -0300
++++ mutt-1.5.21/configure.ac	2013-09-16 11:07:45.120419960 -0300
+@@ -27,7 +27,6 @@
+ 
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi

From b683168f89f91ab51cfbcc2aad006525f7f203a7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 13:52:54 -0300
Subject: [PATCH 6168/6849] neardal: add fix for automake bump breakage

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neardal/neardal-01-automake.patch | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/neardal/neardal-01-automake.patch

diff --git a/package/neardal/neardal-01-automake.patch b/package/neardal/neardal-01-automake.patch
new file mode 100644
index 0000000000..e5d822e65b
--- /dev/null
+++ b/package/neardal/neardal-01-automake.patch
@@ -0,0 +1,35 @@
+From 08f26bdd093c7f289638ab506b0e842bd93f3d0d Mon Sep 17 00:00:00 2001
+From: Dmytro Bagrii <dimich@softerra.com>
+Date: Thu, 14 Mar 2013 15:44:40 +0100
+Subject: [PATCH 1/2] Fix 'AM_PROG_AR' autogen.sh error There is an error while
+ running autogen.sh in some distributions (e.g. Archlinux, automake 1.13.1).
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a4a7c5..eb03a50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,6 @@
+ AC_INIT([neardal], 0.8.0, Neardal for Neard v0.8)
+ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+ 
+-AC_PROG_LIBTOOL
+ AC_CONFIG_HEADERS([config.h])
+ 
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+@@ -15,6 +14,8 @@ traces=no
+ 
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AM_PROG_AR
++AC_PROG_LIBTOOL
+ 
+ ## Compiler option
+ ## Debug ?
+-- 
+1.8.1.5
+

From 55b081505528e63566ed29d3e61becc40c8a920a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 13:52:55 -0300
Subject: [PATCH 6169/6849] luaposix: bump to version 31

Releases are no longer named 5.1.X, just the X portion remains now.

Fixes autoreconf issues with the automake bump, however since the patch
is no longer required that's not an issue now.

[Peter: now needs IPv6]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luaposix/Config.in                       |  4 ++++
 .../luaposix-remove-lua-header-check.patch       | 16 ----------------
 package/luaposix/luaposix.mk                     |  6 +++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 package/luaposix/luaposix-remove-lua-header-check.patch

diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index 412e07f138..58292829fa 100644
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LUAPOSIX
 	bool "luaposix"
+	depends on BR2_INET_IPV6
 	help
 	  luaposix is a POSIX binding, including curses, for Lua 5.1
 	  and 5.2; Like most libraries it simply binds to C APIs on
@@ -9,3 +10,6 @@ config BR2_PACKAGE_LUAPOSIX
 	  APIs
 
 	  https://github.com/luaposix/luaposix
+
+comment "luaposix requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6
diff --git a/package/luaposix/luaposix-remove-lua-header-check.patch b/package/luaposix/luaposix-remove-lua-header-check.patch
deleted file mode 100644
index 7909b9175b..0000000000
--- a/package/luaposix/luaposix-remove-lua-header-check.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Checking the Lua version inside the headers requires compiling a small
-C program. However, autoconf will raise an error when attempting to do so
-while cross-compiling. Hence, this specific test is removed.
-
-Signed-off-by: Assaf Inbal <shmuelzon@gmail.com>
---- a/configure.ac	2013-06-20 07:23:27.943091833 +0300
-+++ b/configure.ac	2013-06-20 07:23:30.644441710 +0300
-@@ -105,7 +105,7 @@
- 
- dnl Lua 5.1 or 5.2
- AX_PROG_LUA(501, 503)
- AX_LUA_HEADERS
--AX_LUA_HEADERS_VERSION(501, 503)
-+#AX_LUA_HEADERS_VERSION(501, 503)
- AC_SUBST(LUA)
- AC_SUBST(LUA_INCLUDE)
diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
index 1d1ee6a746..ff99127d8c 100644
--- a/package/luaposix/luaposix.mk
+++ b/package/luaposix/luaposix.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 5.1.20
-LUAPOSIX_SITE = https://github.com/downloads/luaposix/luaposix
+LUAPOSIX_VERSION = 31
+LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive
+LUAPOSIX_SOURCE = release-v$(LUAPOSIX_VERSION).tar.gz
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = COPYING
 LUAPOSIX_DEPENDENCIES = lua host-lua
 LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua" --datarootdir="/usr/share/lua"
-LUAPOSIX_AUTORECONF = YES
 
 $(eval $(autotools-package))

From 04685e18cdf58c39d34024bb613a764ae87302ca Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 19 Sep 2013 08:31:38 +0200
Subject: [PATCH 6170/6849] luaposix: fix runtime dependency

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luaposix/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index 58292829fa..beae8e4452 100644
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_LUAPOSIX
 	bool "luaposix"
 	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA
+	# LuaBitOp is already included in LuaJIT
 	help
 	  luaposix is a POSIX binding, including curses, for Lua 5.1
 	  and 5.2; Like most libraries it simply binds to C APIs on

From b722bfc32184a82b6e56e779cff7a4bac7f69874 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Thu, 19 Sep 2013 08:31:39 +0200
Subject: [PATCH 6171/6849] luaposix: add ncurses dependency

luaposix includes a curses binding which is optional and auto-detected by autotools.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luaposix/luaposix.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
index ff99127d8c..cbcdf32590 100644
--- a/package/luaposix/luaposix.mk
+++ b/package/luaposix/luaposix.mk
@@ -12,4 +12,8 @@ LUAPOSIX_LICENSE_FILES = COPYING
 LUAPOSIX_DEPENDENCIES = lua host-lua
 LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua" --datarootdir="/usr/share/lua"
 
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+    LUAPOSIX_DEPENDENCIES += ncurses
+endif
+
 $(eval $(autotools-package))

From 93917b6980f7f2b51302e1a3fa451b07cf7d674e Mon Sep 17 00:00:00 2001
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Date: Thu, 12 Sep 2013 15:12:36 -0400
Subject: [PATCH 6172/6849] qt: install translations

The Qt translation files are currently created and moved under
$(STAGING_DIR)/usr/translations but not installed on the target.

This patch defines the translations directory to
/usr/share/qt/translations and defines a QT_INSTALL_TARGET_TRANSLATIONS
macro to deploy them from the staging directory to the target directory.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/qt.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index daade3c30c..48d39fc501 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -516,6 +516,7 @@ define QT_CONFIGURE_CMDS
 		-prefix /usr \
 		-plugindir /usr/lib/qt/plugins \
 		-importdir /usr/lib/qt/imports \
+		-translationdir /usr/share/qt/translations \
 		-hostprefix $(STAGING_DIR) \
 		-fast \
 		-no-rpath \
@@ -666,6 +667,13 @@ define QT_INSTALL_TARGET_POWERVR
 endef
 endif
 
+define QT_INSTALL_TARGET_TRANSLATIONS
+	if [ -d $(STAGING_DIR)/usr/share/qt/translations/ ] ; then \
+		mkdir -p $(TARGET_DIR)/usr/share/qt/translations ; \
+		cp -dpfr $(STAGING_DIR)/usr/share/qt/translations/* $(TARGET_DIR)/usr/share/qt/translations ; \
+	fi
+endef
+
 define QT_INSTALL_TARGET_CMDS
 	$(QT_INSTALL_TARGET_LIBS)
 	$(QT_INSTALL_TARGET_PLUGINS)
@@ -673,6 +681,7 @@ define QT_INSTALL_TARGET_CMDS
 	$(QT_INSTALL_TARGET_FONTS)
 	$(QT_INSTALL_TARGET_FONTS_TTF)
 	$(QT_INSTALL_TARGET_POWERVR)
+	$(QT_INSTALL_TARGET_TRANSLATIONS)
 endef
 
 define QT_CLEAN_CMDS

From 4e0bc0f3a7b35ba533d5c72387d3b32fab77ac41 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 16 Sep 2013 13:52:50 -0300
Subject: [PATCH 6173/6849] automake: bump to version 1.12.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/automake/automake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index ab4a1acda7..94a84ddf94 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUTOMAKE_VERSION = 1.11.6
+AUTOMAKE_VERSION = 1.12.6
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 AUTOMAKE_LICENSE = GPLv2+

From 5bbc83c6e778827307436e0feb9fd829ae562f1c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 19 Sep 2013 21:49:18 +0200
Subject: [PATCH 6174/6849] gcc: deprecate objective C and fortran support

As discussed on the list. They have been broken for a long time, and are
not commonly used in embedded systems.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gcc/Config.in.host | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 116fd24349..32c668af45 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -128,6 +128,7 @@ comment "C++ support broken in uClibc with locale enabled with gcc 4.2"
 config BR2_INSTALL_OBJC
 	bool "Enable Objective-C support"
 	depends on !BR2_avr32
+	depends on BR2_DEPRECATED
 	help
 	  Enable the support for the Objective-C language in the
 	  cross-compiler, and install the Objective-C runtime to the
@@ -136,6 +137,7 @@ config BR2_INSTALL_OBJC
 config BR2_INSTALL_FORTRAN
 	bool "Enable Fortran support"
 	depends on !BR2_avr32
+	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_LIBMPFR
 	help
 	  Enable the support for the Fortran language in the

From b35acfffbd6667e2ce7cc116183585b543fbf488 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Thu, 5 Sep 2013 23:25:15 -0500
Subject: [PATCH 6175/6849] libdrm: bump and add experimental ARM framebuffer
 support

[Peter: adjust intel/ati drivers to match]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libdrm/Config.in                      | 68 ++++++++++++++++---
 package/libdrm/libdrm.mk                      | 53 ++++++++++++---
 .../x11r7/xdriver_xf86-video-ati/Config.in    |  1 +
 .../x11r7/xdriver_xf86-video-intel/Config.in  |  1 +
 4 files changed, 102 insertions(+), 21 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 8bf676b9de..533e985834 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,22 +1,68 @@
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
+	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_LARGEFILE
-	select BR2_PACKAGE_XPROTO_GLPROTO
-	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
-	select BR2_PACKAGE_XLIB_LIBXXF86VM
-	select BR2_PACKAGE_XLIB_LIBXMU
-	select BR2_PACKAGE_XLIB_LIBPCIACCESS
-	select BR2_PACKAGE_XPROTO_DRI2PROTO
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-	# libatomic_ops is only available on a subset of the supported
-	# architectures, and we make the assumption that the intel
-	# driver can only be used on x86 and x86_64 machines.
-	select BR2_PACKAGE_LIBATOMIC_OPS if (BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL && (BR2_i386 || BR2_x86_64))
 	help
 	  Direct Rendering Manager
 
 	  http://dri.freedesktop.org/libdrm/
 
+if BR2_PACKAGE_LIBDRM
+
+menu "DRM Drivers"
+
+config BR2_PACKAGE_LIBDRM_INTEL
+	bool "intel"
+	select BR2_PACKAGE_LIBATOMIC_OPS
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  installs intel graphics driver
+
+config BR2_PACKAGE_LIBDRM_RADEON
+	bool "radeon"
+	select BR2_PACKAGE_LIBATOMIC_OPS
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  install AMD/ATI graphics driver
+
+config BR2_PACKAGE_LIBDRM_NOUVEAU
+	bool "nouveau"
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  install Nvidia graphics driver
+
+config BR2_PACKAGE_LIBDRM_VMWGFX
+	bool "vmwgfx"
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  installs Vmware graphics driver
+
+config BR2_PACKAGE_LIBDRM_OMAP
+	bool "omap (experimental)"
+	depends on BR2_arm
+	help
+	  install the TI OMAP driver using an experimental API.
+
+config BR2_PACKAGE_LIBDRM_EXYNOS
+	bool "exynos (experimental)"
+	depends on BR2_arm
+	help
+	  installs Samsung Exynos driver using an experimental API.
+
+config BR2_PACKAGE_LIBDRM_FREEDRENO
+	bool "freedreno (experimental)"
+	depends on BR2_arm
+	help
+	  install Qualcomm Snapdragon driver using an experimental API.
+
+endmenu
+
+endif
+
 comment "libdrm requires a toolchain with LARGEFILE support"
 	depends on BR2_PACKAGE_XORG7 && !BR2_LARGEFILE
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index d3d2b2d7ab..697cd2fde7 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBDRM_VERSION = 2.4.38
+LIBDRM_VERSION = 2.4.46
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
 LIBDRM_LICENSE = MIT
@@ -12,26 +12,59 @@ LIBDRM_LICENSE = MIT
 LIBDRM_INSTALL_STAGING = YES
 
 LIBDRM_DEPENDENCIES = \
-	xproto_glproto \
-	xproto_xf86vidmodeproto \
-	xlib_libXxf86vm \
-	xlib_libXmu \
-	xlib_libpciaccess \
-	xproto_dri2proto \
 	xlib_libpthread-stubs \
 	host-pkgconf
 
-ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)
+LIBDRM_CONF_OPT = \
+	--disable-cairo-tests \
+	--disable-manpages
+
+ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)
 LIBDRM_CONF_OPT += --enable-intel
-LIBDRM_DEPENDENCIES += libatomic_ops
+LIBDRM_DEPENDENCIES += libatomic_ops xlib_libpciaccess
 else
 LIBDRM_CONF_OPT += --disable-intel
 endif
 
-ifneq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI),y)
+ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y)
+LIBDRM_CONF_OPT += --enable-radeon
+LIBDRM_DEPENDENCIES += xlib_libpciaccess
+else
 LIBDRM_CONF_OPT += --disable-radeon
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y)
+LIBDRM_CONF_OPT += --enable-nouveau
+LIBDRM_DEPENDENCIES += xlib_libpciaccess
+else
+LIBDRM_CONF_OPT += --disable-nouveau
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y)
+LIBDRM_CONF_OPT += --enable-vmwgfx
+LIBDRM_DEPENDENCIES += xlib_libpciaccess
+else
+LIBDRM_CONF_OPT += --enable-vmwgfx
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDRM_OMAP),y)
+LIBDRM_CONF_OPT += --enable-omap-experimental-api
+else
+LIBDRM_CONF_OPT += --disable-omap-experimental-api
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDRM_EXYNOS),y)
+LIBDRM_CONF_OPT += --enable-exynos-experimental-api
+else
+LIBDRM_CONF_OPT += --disable-exynos-experimental-api
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDRM_FREEDRENO),y)
+LIBDRM_CONF_OPT += --enable-freedreno-experimental-api
+else
+LIBDRM_CONF_OPT += --disable-freedreno-experimental-api
+endif
+
 ifeq ($(BR2_PACKAGE_UDEV),y)
 LIBDRM_CONF_OPT += --enable-udev
 LIBDRM_DEPENDENCIES += udev
diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index 19bed3c1e0..3c0cac36c5 100644
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
 	bool "xf86-video-ati"
 	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBDRM_RADEON
 	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_GLPROTO
diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index c972ce141e..83b714a433 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBDRM_INTEL
 	select BR2_PACKAGE_MESA3D
 	depends on (BR2_i386 || BR2_x86_64)
 	help

From ea27d6e929414e7af438836f3dde49076b1aa316 Mon Sep 17 00:00:00 2001
From: tbultel <tbultel@basystemes.fr>
Date: Fri, 20 Sep 2013 10:35:46 +0200
Subject: [PATCH 6176/6849] Makefile: Fix the generation of locales

The -s option is only mandatory for the charmap,
else the filename is always empty and nothing
is generated.

Signed-off-by: Thierry Bultel <thierry.bultel@wanadoo.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6ef0edc2bb..71d94ad8c9 100644
--- a/Makefile
+++ b/Makefile
@@ -554,7 +554,7 @@ ifneq ($(GENERATE_LOCALE),)
 target-generatelocales: host-localedef
 	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
 	$(Q)for locale in $(GENERATE_LOCALE) ; do \
-		inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \
+		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
 		charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
 		if test -z "$${charmap}" ; then \
 			charmap="UTF-8" ; \

From ff343ff80657090af537e90a31d52e59ea8ac67c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 19 Sep 2013 19:21:43 -0300
Subject: [PATCH 6177/6849] bc: needs host-flex

Fixes:
http://autobuild.buildroot.net/results/49d/49d78f0528c6ecc2adfcfa17f4b09ec225c594be/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bc/bc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/bc/bc.mk b/package/bc/bc.mk
index 3f1f7e7f17..293b80d9fd 100644
--- a/package/bc/bc.mk
+++ b/package/bc/bc.mk
@@ -6,6 +6,7 @@
 
 BC_VERSION = 1.06
 BC_SITE = $(BR2_GNU_MIRROR)/bc/
+BC_DEPENDENCIES = host-flex
 BC_LICENSE = GPLv2+ LGPLv2.1+
 BC_LICENSE_FILES = COPYING COPYING.LIB
 

From 8802aeefb1a8d1b403fc13c150bef039e378e026 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 20 Sep 2013 11:09:50 +0200
Subject: [PATCH 6178/6849] python-pyzmq: use http instead of https to retrieve
 tarball

Older wget versions have issues with the ssl certificate, so use http
instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/python-pyzmq/python-pyzmq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
index a281aedd99..e9702fc403 100644
--- a/package/python-pyzmq/python-pyzmq.mk
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -6,7 +6,7 @@
 
 PYTHON_PYZMQ_VERSION = 13.1.0
 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
-PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/source/p/pyzmq/
+PYTHON_PYZMQ_SITE = http://pypi.python.org/packages/source/p/pyzmq/
 PYTHON_PYZMQ_LICENSE = LGPLv3+ BSD-3c Apache License Version 2.0
 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD

From 8ccbca218ed17945a07e585abcc8e28f7eb5b9dc Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Fri, 20 Sep 2013 14:29:03 +0200
Subject: [PATCH 6179/6849] feh: bump to 2.9.3

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/feh/feh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 360d03af13..b7fd54c60b 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FEH_VERSION = 2.9.1
+FEH_VERSION = 2.9.3
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
 FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt

From c958658288c4f2754981be4524ac9dad4706b3a0 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Fri, 20 Sep 2013 11:04:39 +0200
Subject: [PATCH 6180/6849] luaposix: remove IPv6 constraint

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/luaposix/Config.in                   |  3 --
 package/luaposix/luaposix-without-IPv6.patch | 55 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 package/luaposix/luaposix-without-IPv6.patch

diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index beae8e4452..922fd9e833 100644
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUAPOSIX
 	bool "luaposix"
-	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA
 	# LuaBitOp is already included in LuaJIT
 	help
@@ -13,5 +12,3 @@ config BR2_PACKAGE_LUAPOSIX
 
 	  https://github.com/luaposix/luaposix
 
-comment "luaposix requires a toolchain with IPv6 support"
-	depends on !BR2_INET_IPV6
diff --git a/package/luaposix/luaposix-without-IPv6.patch b/package/luaposix/luaposix-without-IPv6.patch
new file mode 100644
index 0000000000..f187882f6b
--- /dev/null
+++ b/package/luaposix/luaposix-without-IPv6.patch
@@ -0,0 +1,55 @@
+fix without IPv6
+
+see https://github.com/luaposix/luaposix/pull/117
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/ext/posix/posix.c
+===================================================================
+--- a/ext/posix/posix.c
++++ b/ext/posix/posix.c
+@@ -3637,6 +3637,7 @@
+ 					break;
+ 			}
+ 			break;
++#if defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
+ 		case IPPROTO_IPV6:
+ 			switch(optname) {
+ 				case IPV6_JOIN_GROUP:
+@@ -3650,6 +3651,7 @@
+ 					break;
+ 			}
+ 			break;
++#endif
+ 		case IPPROTO_TCP:
+ 			switch(optname) {
+ 				default:
+@@ -4697,13 +4699,27 @@
+ 	MENTRY( AI_V4MAPPED	);
+ 	MENTRY( AI_ALL		);
+ 	MENTRY( AI_ADDRCONFIG	);
++#endif
+ 
++#ifdef IPV6_JOIN_GROUP
+ 	MENTRY( IPV6_JOIN_GROUP		);
++#endif
++#ifdef IPV6_LEAVE_GROUP
+ 	MENTRY( IPV6_LEAVE_GROUP	);
++#endif
++#ifdef IPV6_MULTICAST_HOPS
+ 	MENTRY( IPV6_MULTICAST_HOPS	);
++#endif
++#ifdef IPV6_MULTICAST_IF
+ 	MENTRY( IPV6_MULTICAST_IF	);
++#endif
++#ifdef IPV6_MULTICAST_LOOP
+ 	MENTRY( IPV6_MULTICAST_LOOP	);
++#endif
++#ifdef IPV6_UNICAST_HOPS
+ 	MENTRY( IPV6_UNICAST_HOPS	);
++#endif
++#ifdef IPV6_V6ONLY
+ 	MENTRY( IPV6_V6ONLY		);
+ #endif
+ #undef MENTRY
+

From 50a18b63c977ce5a04d92476ad5a6202009a2cb6 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 19 Sep 2013 12:47:13 +0200
Subject: [PATCH 6181/6849] manual generation: change capitalization of
 messages

When generating the manual, you see following messages:

>>>   Generating HTML manual...
>>>   Generating Split HTML manual...
>>>   Generating PDF manual...
>>>   Generating Text manual...
>>>   Generating EPUB manual...

and with this patch the capitalization is changed so that it becomes:

>>>   Generating HTML manual...
>>>   Generating split HTML manual...
>>>   Generating PDF manual...
>>>   Generating text manual...
>>>   Generating ePUB manual...

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/manual.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index bcbedad572..d092d3fcfd 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -43,10 +43,10 @@ endef
 ################################################################################
 define GENDOC
 $(call GENDOC_INNER,$(1),xhtml,html,html,HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
-$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
+$(call GENDOC_INNER,$(1),chunked,split-html,chunked,split HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
 $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
-$(call GENDOC_INNER,$(1),text,txt,text,Text)
-$(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
+$(call GENDOC_INNER,$(1),text,txt,text,text)
+$(call GENDOC_INNER,$(1),epub,epub,epub,ePUB)
 clean: $(1)-clean
 $(1)-clean:
 	$(Q)$(RM) -rf $(O)/docs/$(1)

From 55ecab1bbc32f9b4a36b588db1fed4ae0403dd74 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 19 Sep 2013 12:47:14 +0200
Subject: [PATCH 6182/6849] manual generation: update help

The 'make help' lines for generating the manual did not consider ePub
correctly.  Instead of providing a limitative list for 'make manual', the
text is changed into 'all formats'.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 71d94ad8c9..667e233242 100644
--- a/Makefile
+++ b/Makefile
@@ -811,7 +811,7 @@ ifeq ($(BR2_TARGET_BAREBOX),y)
 endif
 	@echo
 	@echo 'Documentation:'
-	@echo '  manual                 - build manual in HTML, split HTML, PDF and txt'
+	@echo '  manual                 - build manual in all formats'
 	@echo '  manual-html            - build manual in HTML'
 	@echo '  manual-split-html      - build manual in split HTML'
 	@echo '  manual-pdf             - build manual in PDF'

From 205d72c6861c9fe9fc62f398502e4ba3fd48a8b2 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Fri, 13 Sep 2013 11:46:01 -0400
Subject: [PATCH 6183/6849] erlang: pass erl_xcomp_sysroot to configure

This is required for building the 'crypto', 'odbc', 'ssh'
and 'ssl' Erlang applications. These apps are skipped
regardless of whether they're enabled and their dependencies
can be met if this environment variable isn't set.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/erlang.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 89104c95fa..b2197408b7 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -17,6 +17,10 @@ ERLANG_INSTALL_STAGING = YES
 # The configure checks for these functions fail incorrectly
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
 
+# Set erl_xcomp variables. See xcomp/erl-xcomp.conf.template
+# for documentation.
+ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR)
+
 ERLANG_CONF_OPT = --without-javac
 HOST_ERLANG_CONF_OPT = --without-javac
 

From 98fe337d193d57ad18f330286570748e0fec0461 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Fri, 13 Sep 2013 11:25:17 -0400
Subject: [PATCH 6184/6849] erlang: bump to version R16B01

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/erlang/erlang.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index b2197408b7..4a94af01ab 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_VERSION = R15B03-1
+ERLANG_VERSION = R16B01
 ERLANG_SITE = http://www.erlang.org/download
 ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
 ERLANG_DEPENDENCIES = host-erlang

From c64fc7690641cc1de9cd240c8626369c90712e3c Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 13 Sep 2013 12:41:20 +0200
Subject: [PATCH 6185/6849] libtirpc: requires toolchain with threading support

Fixes:
http://autobuild.buildroot.org/results/8ba720f47f74df94b8c70ac4befd47c47ce65f2f

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/conntrack-tools/Config.in | 7 +++++--
 package/libtirpc/Config.in        | 4 ++++
 package/lmbench/Config.in         | 4 ++++
 package/nfs-utils/Config.in       | 6 ++++--
 package/quota/Config.in           | 7 +++++--
 package/rpcbind/Config.in         | 4 ++++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index 50f2000364..64f18feefc 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	select BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
@@ -16,5 +17,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
 	  http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
-	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
+comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and threading support"
+	depends on !BR2_INET_IPV6 || \
+		!BR2_LARGEFILE || \
+		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
index b9db5aa4c1..eab4f3e39b 100644
--- a/package/libtirpc/Config.in
+++ b/package/libtirpc/Config.in
@@ -7,8 +7,12 @@ config BR2_PACKAGE_LIBTIRPC
 	# used instead of libtirpc.
 	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
 		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Libtirpc is a port of Sun's Transport-Independent RPC
 	  library to Linux.
 
 	  http://sourceforge.net/projects/libtirpc/
+
+comment "libtirpc requires a toolchain with threading support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index d710e1ffff..c7b656c037 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_LMBENCH
 	bool "lmbench"
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  LMbench is a suite of simple, portable,
 	  ANSI/C microbenchmarks for UNIX/POSIX.
 
 	  http://sourceforge.net/projects/lmbench/
+
+comment "lmbench requires a toolchain with threading support"
+	depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index fa35f35e65..8f61f2b51f 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NFS_UTILS
 	bool "nfs-utils"
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_LARGEFILE
 	help
@@ -9,8 +10,9 @@ config BR2_PACKAGE_NFS_UTILS
 
 	  http://sourceforge.net/projects/nfs
 
-comment "nfs-utils requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "nfs-utils requires a toolchain with LARGEFILE and threading support"
+	depends on !BR2_LARGEFILE || \
+		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
 
 menu "NFS utilities selection"
 	depends on BR2_PACKAGE_NFS_UTILS
diff --git a/package/quota/Config.in b/package/quota/Config.in
index 5127a9a9ca..57cf57d97d 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_QUOTA
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
 	depends on !(BR2_microblazeel || BR2_microblazebe) # util-linux
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_BINARIES
 	select BR2_PACKAGE_UTIL_LINUX_MOUNT
@@ -14,5 +15,7 @@ config BR2_PACKAGE_QUOTA
 
 	  http://sourceforge.net/projects/linuxquota/
 
-comment "quota requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+comment "quota requires a toolchain with LARGEFILE, WCHAR and threading support"
+	depends on !BR2_LARGEFILE || \
+		!BR2_USE_WCHAR || \
+		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/rpcbind/Config.in b/package/rpcbind/Config.in
index cbe53af3a2..663313bff2 100644
--- a/package/rpcbind/Config.in
+++ b/package/rpcbind/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_RPCBIND
 	bool "rpcbind"
 	# We really need libtirpc and can't work with the native RPC
 	# implementation of toolchains.
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_LIBTIRPC
 	# uClibc toolchains provided by ADI don't have AI_ADDRCONFIG
 	# support, needed for libtirpc
@@ -10,3 +11,6 @@ config BR2_PACKAGE_RPCBIND
 	help
 	  The rpcbind utility is a server that converts RPC program numbers
 	  into universal addresses.
+
+comment "rpcbind requires a toolchain with threading support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 885d0007b07513338b141f5205d07e0a9f4a3cdb Mon Sep 17 00:00:00 2001
From: Clayton Shotwell <clshotwe@rockwellcollins.com>
Date: Wed, 11 Sep 2013 16:59:21 -0500
Subject: [PATCH 6186/6849] libsepol: new package

[Peter: white space fixes]
Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  4 +++
 package/libsepol/Config.in   |  7 ++++++
 package/libsepol/libsepol.mk | 48 ++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 package/libsepol/Config.in
 create mode 100644 package/libsepol/libsepol.mk

diff --git a/package/Config.in b/package/Config.in
index e187aa3e4a..c3725f2ab5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -694,6 +694,10 @@ source "package/liblog4c-localtime/Config.in"
 source "package/tzdata/Config.in"
 endmenu
 
+menu "Security"
+source "package/libsepol/Config.in"
+endmenu
+
 menu "Text and terminal handling"
 source "package/enchant/Config.in"
 source "package/libfribidi/Config.in"
diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in
new file mode 100644
index 0000000000..f92af52072
--- /dev/null
+++ b/package/libsepol/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBSEPOL
+	bool "libsepol"
+	help
+	  Libsepol is the binary policy manipulation library. It doesn't
+	  depend upon or use any of the other SELinux components.
+
+	  http://selinuxproject.org/page/Main_Page
diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
new file mode 100644
index 0000000000..4140ed3a49
--- /dev/null
+++ b/package/libsepol/libsepol.mk
@@ -0,0 +1,48 @@
+################################################################################
+#
+# libsepol
+#
+################################################################################
+
+LIBSEPOL_VERSION = 2.1.9
+LIBSEPOL_SITE = http://userspace.selinuxproject.org/releases/20130423/
+LIBSEPOL_LICENSE = LGPLv2.1+
+LIBSEPOL_LICENSE_FILES = COPYING
+
+LIBSEPOL_INSTALL_STAGING = YES
+
+define LIBSEPOL_BUILD_CMDS
+	# DESTDIR is needed during the compile to compute library and
+	# header paths.
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR)
+endef
+
+define LIBSEPOL_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR)
+endef
+
+define LIBSEPOL_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR)
+endef
+
+define LIBSEPOL_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+define HOST_LIBSEPOL_BUILD_CMDS
+	$(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR)
+endef
+
+define HOST_LIBSEPOL_INSTALL_CMDS
+	$(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR)
+	mv $(HOST_DIR)/lib/libsepol.so.1 $(HOST_DIR)/usr/lib
+	(cd $(HOST_DIR)/usr/lib; rm -f libsepol.so; ln -s libsepol.so.1 libsepol.so)
+	-rmdir $(HOST_DIR)/lib
+endef
+
+define HOST_LIBSEPOL_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))

From b3c525b886b375256a8e0d60a749ea07f6591974 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 20 Sep 2013 14:12:22 +0100
Subject: [PATCH 6187/6849] zeromq: bump version to 3.2.4

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/zeromq/zeromq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index 4847ed822b..a624b52b52 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZEROMQ_VERSION = 3.2.3
+ZEROMQ_VERSION = 3.2.4
 ZEROMQ_SITE = http://download.zeromq.org/
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux

From 1fe1165e619fdaa2fedc027137974797796f80aa Mon Sep 17 00:00:00 2001
From: Thomas Davis <sunsetbrew@sunsetbrew.com>
Date: Tue, 27 Aug 2013 23:56:11 -0400
Subject: [PATCH 6188/6849] civetweb: new package

Signed-off-by: Thomas Davis <sunsetbrew@sunsetbrew.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in            |  1 +
 package/civetweb/Config.in   | 26 +++++++++++++++++
 package/civetweb/civetweb.mk | 55 ++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 package/civetweb/Config.in
 create mode 100644 package/civetweb/civetweb.mk

diff --git a/package/Config.in b/package/Config.in
index c3725f2ab5..e1dfd5d4fa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -765,6 +765,7 @@ source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/chrony/Config.in"
+source "package/civetweb/Config.in"
 source "package/connman/Config.in"
 source "package/crda/Config.in"
 source "package/ctorrent/Config.in"
diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
new file mode 100644
index 0000000000..f7a31f5c62
--- /dev/null
+++ b/package/civetweb/Config.in
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_CIVETWEB
+	bool "civetweb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Full featured embedded web server with Lua support.
+
+	  https://sourceforge.net/projects/civetweb
+
+if BR2_PACKAGE_CIVETWEB
+
+config BR2_CIVETWEB_WITH_LUA
+	bool "enable Lua support"
+	# required by the bundled Sqlite3 and Lua code
+	depends on BR2_LARGEFILE
+	help
+	  Enable Lua support in Civetweb. Note that this will use a
+	  version of Lua and Sqlite bundled within the Civetweb
+	  sources, and not the packages from Buildroot.
+
+comment "Lua support requires largefile support in toolchain"
+	depends on !BR2_LARGEFILE
+
+endif
+
+comment "civetweb requires a toolchain with PTHREAD support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
new file mode 100644
index 0000000000..e34da064c6
--- /dev/null
+++ b/package/civetweb/civetweb.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# civetweb
+#
+################################################################################
+
+CIVETWEB_VERSION = 1.3
+CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/v$(CIVETWEB_VERSION)
+CIVETWEB_LICENSE = MIT
+CIVETWEB_LICENSE_FILES = LICENSE.md
+
+CIVETWEB_CONF_OPT = TARGET_OS=LINUX
+CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
+CIVETWEB_LDFLAGS = $(TARGET_LDFLAGS)
+CIVETWEB_SYSCONFDIR = /etc
+CIVETWEB_HTMLDIR = /var/www
+
+ifneq ($(BR2_LARGEFILE),y)
+	CIVETWEB_COPT += -DSQLITE_DISABLE_LFS
+endif
+
+ifeq ($(BR2_INET_IPV6),y)
+	CIVETWEB_CONF_OPT += WITH_IPV6=1
+endif
+
+ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
+	CIVETWEB_CONF_OPT += WITH_LUA=1
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	CIVETWEB_COPT += -DNO_SSL_DL -lcrypt -lssl
+	CIVETWEB_DEPENDENCIES += openssl
+else
+	CIVETWEB_COPT += -DNO_SSL
+endif
+
+define CIVETWEB_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" -C $(@D) build \
+		$(CIVETWEB_CONF_OPT) \
+		COPT="$(CIVETWEB_COPT)"
+endef
+
+define CIVETWEB_INSTALL_TARGET_CMDS
+	$(MAKE) CC="$(TARGET_CC)" -C $(@D) install \
+		DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
+		CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
+		HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
+		SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
+		PREFIX="$(TARGET_DIR)/usr" \
+		$(CIVETWEB_CONF_OPT) \
+		COPT='$(CIVETWEB_COPT)'
+endef
+
+$(eval $(generic-package))
+

From da46ffed4050889ac890af781e896f7fbdad6bd2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 21 Sep 2013 10:05:38 +0200
Subject: [PATCH 6189/6849] zeromq: remove unneeded patch after version bump

Commit b3c525b886b375256a8e0d60a749ea07f6591974 has bumped zeromq to
version 2.3.4, which makes the patch
zeromq-0001-test-collect-delay-end-of-line.patch unneeded since it has
been merged upstream.

Fixes:

  http://autobuild.buildroot.org/results/e8c/e8c8ba8c31fd081c34c8772790d4c581eb3ec3ed/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...romq-0001-test-collect-delay-end-of-line.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch

diff --git a/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch b/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch
deleted file mode 100644
index 6a1a6551df..0000000000
--- a/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-test_connect_delay: add missing newline at end of file
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-Backported-from: https://github.com/zeromq/zeromq3-x/commit/143ae519b4a325bb68d29e6f7e00cb98a440dd12
-
-diff --git a/tests/test_connect_delay.cpp b/tests/test_connect_delay.cpp
---- a/tests/test_connect_delay.cpp
-+++ b/tests/test_connect_delay.cpp
-@@ -257,4 +257,4 @@ int main (void)
-     
-     rc = zmq_ctx_destroy(context2);
-     assert (rc == 0);
--}
-\ No newline at end of file
-+}

From 1baca6252391ff793d15122f83006b8ec341bf41 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 21 Sep 2013 12:20:03 +0200
Subject: [PATCH 6190/6849] package/Config.in: sort the real-time menu entries

Reported-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Config.in b/package/Config.in
index e1dfd5d4fa..1dd60d199c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -910,8 +910,8 @@ endif
 endmenu
 
 menu "Real-Time"
-source "package/xenomai/Config.in"
 source "package/rtai/Config.in"
+source "package/xenomai/Config.in"
 endmenu
 
 menu "Shell and utilities"

From b7a0eb4d0f8abf69f1583e2ffa58b22d83002a74 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 22 Sep 2013 11:27:09 +0200
Subject: [PATCH 6191/6849] package/tvheadend: bump for misc fixes

Bump to the latest cset in master for a bunch of fixes
for transconding, muxer and html5 video.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tvheadend/tvheadend.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 2a09263411..5593791364 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION           = 5956233
+TVHEADEND_VERSION           = 2b64995
 TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE

From 3874e5cba9f062a620aa1fff13ad3673754d5c2e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 21 Sep 2013 00:00:31 +0200
Subject: [PATCH 6192/6849] package/rpi-firmware: bump version

Fixes for USB and audio; enable video capture.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 55c1ca4f61..9319429577 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = d4f5315
+RPI_FIRMWARE_VERSION = fadc4cb
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From 60cb290475ce8baa828825ccf235efb93132c8c1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 21 Sep 2013 00:00:30 +0200
Subject: [PATCH 6193/6849] toolchain/wrapper: add option to print one argument
 per line

In case there are many arguments passed to the tools, the command line
can get very long, and difficult to parse visually.

For example, the Linux kernel passes a lot of arguments to gcc (at least
45, which gives 53 with our hard-coded args). Looking at such a command
line is daunting.

So, add the possibility to print each argument on its own line.

Also, enclose all args between single quotes, so the command line
can be safely copy-pasted without special chars (spaces, $) being
inrerpreted by the shell.

Add blurb about toolchain-wrapper to documentation at the same
time.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 docs/manual/customize-toolchain.txt           | 11 ++++++++
 .../ext-toolchain-wrapper.c                   | 25 +++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 811a6dc7f9..82ecc28431 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -17,6 +17,17 @@ generate it.
 It also requires to set the Buildroot settings according to the toolchain ones
 (see xref:external-toolchain-backend[]).
 
+When using an external toolchain, Buildroot generates a wrapper program, that
+passes the appropriate options (according to the configuration) to the
+external toolchain programs. In case you need to debug this wrapper, you can
+set the environment variable BR_DEBUG_WRAPPER to either one of:
+
+* +0+, empty or not set: no debug
+
+* +1+: trace all arguments on a single line
+
+* +2+: trace one argument per line
+
 Using the internal Buildroot toolchain backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 565e36bfd1..dfdfcffbf5 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -74,7 +74,8 @@ int main(int argc, char **argv)
 	char *relbasedir, *absbasedir;
 	char *progpath = argv[0];
 	char *basename;
-	int ret, i, count = 0;
+	char *env_debug;
+	int ret, i, count = 0, debug;
 
 	/* Calculate the relative paths */
 	basename = strrchr(progpath, '/');
@@ -157,13 +158,21 @@ int main(int argc, char **argv)
 	/* finish with NULL termination */
 	*cur = NULL;
 
-	if (getenv("BR_DEBUG_WRAPPER")) {
-		fprintf(stderr, "Executing");
-
-		for (i = 0; args[i]; i++)
-			fprintf(stderr, " %s", args[i]);
-
-		fprintf(stderr, "\n");
+	/* Debug the wrapper to see actual arguments passed to
+	 * the compiler:
+	 * unset, empty, or 0: do not trace
+	 * set to 1          : trace all arguments on a single line
+	 * set to 2          : trace one argument per line
+	 */
+	if ((env_debug = getenv("BR_DEBUG_WRAPPER"))) {
+		debug = atoi(env_debug);
+		if (debug > 0) {
+			fprintf(stderr, "Toolchain wrapper executing:");
+			for (i = 0; args[i]; i++)
+				fprintf(stderr, "%s'%s'",
+					(debug == 2)?"\n    ":" ", args[i]);
+			fprintf(stderr, "\n");
+		}
 	}
 
 	if (execv(path, args))

From bf22677b61c8b1760ba96c4ba9b75b5db853e971 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 23 Sep 2013 09:53:42 +0800
Subject: [PATCH 6194/6849] iputils: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/iputils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/iputils/Config.in b/package/iputils/Config.in
index 0c77b5fd81..d4d282949f 100644
--- a/package/iputils/Config.in
+++ b/package/iputils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_IPUTILS
 	bool "iputils"
 	select BR2_OPENSSL if BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
 	help
 	  This package is set of small useful utilities for Linux networking.
 	  It includes complete versions of ping, traceroute, etc.

From b9558e023055f14860a5e2b5cc5ff36c76c78daa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 23 Sep 2013 09:45:56 +0200
Subject: [PATCH 6195/6849] toolchain-wrapper: minor code style fixup

Missed from 60cb290475c (add option to print one argument per line).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/toolchain-external/ext-toolchain-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index dfdfcffbf5..727e322196 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -170,7 +170,7 @@ int main(int argc, char **argv)
 			fprintf(stderr, "Toolchain wrapper executing:");
 			for (i = 0; args[i]; i++)
 				fprintf(stderr, "%s'%s'",
-					(debug == 2)?"\n    ":" ", args[i]);
+					(debug == 2) ? "\n    " : " ", args[i]);
 			fprintf(stderr, "\n");
 		}
 	}

From dfcb93aa5cfead618335aa2d30adc3f60a2b2d0c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Sep 2013 13:25:30 +0200
Subject: [PATCH 6196/6849] qt: needs threads

Fixes http://autobuild.buildroot.net/results/489/489f3ddcd023e6d1eaf8efa1da99d726f60da921/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qt/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 35e8208b5c..2afbd92d56 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -1,10 +1,11 @@
-comment "qt requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "qt requires a toolchain with C++ and threads support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 menuconfig BR2_PACKAGE_QT
 	bool "Qt"
 	depends on !BR2_avr32 # lacks TLS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.

From f16e9476f42d13021a352ca633c39e25fe3a547a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Sep 2013 13:35:49 +0200
Subject: [PATCH 6197/6849] rrdtool: fix build without threads support

Fixes http://autobuild.buildroot.net/results/f7a/f7ab00ddae121ccfc6d54f7eda8ea8ac6df359c2/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/rrdtool/rrdtool.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 354cff65c4..fe5b872d14 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -15,7 +15,8 @@ RRDTOOL_INSTALL_STAGING = YES
 RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
 			ac_cv_func_mmap_fixed_mapped=yes
 RRDTOOL_CONF_OPT = --disable-perl --disable-python --disable-ruby \
-			--disable-tcl --program-transform-name=''
+			--disable-tcl --program-transform-name='' \
+			$(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
 RRDTOOL_MAKE = $(MAKE1)
 
 define RRDTOOL_REMOVE_EXAMPLES

From eb8208bf1d5420bef2eddaa6dc6a7a3eb8a6cf37 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Sep 2013 14:07:07 +0200
Subject: [PATCH 6198/6849] civetweb: use TARGET_LDFLAGS

We should use our LDFLAGS when building as well. At the same time, drop the
unused CIVETWEB_LDFLAGS.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/civetweb/civetweb.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index e34da064c6..e46856341f 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -11,7 +11,6 @@ CIVETWEB_LICENSE_FILES = LICENSE.md
 
 CIVETWEB_CONF_OPT = TARGET_OS=LINUX
 CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
-CIVETWEB_LDFLAGS = $(TARGET_LDFLAGS)
 CIVETWEB_SYSCONFDIR = /etc
 CIVETWEB_HTMLDIR = /var/www
 
@@ -35,7 +34,7 @@ else
 endif
 
 define CIVETWEB_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" -C $(@D) build \
+	$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \
 		$(CIVETWEB_CONF_OPT) \
 		COPT="$(CIVETWEB_COPT)"
 endef

From 3cf5b3019118cdc980666d7a1ccfd29f658d0261 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 24 Sep 2013 14:16:17 +0200
Subject: [PATCH 6199/6849] civetweb: fix static linking with openssl

Fixes http://autobuild.buildroot.net/results/acf/acfefc4f0f23ef646094ec427c9502eab7b86736/

Corrects a number of issues with the openssl handling:
 - Libraries have to be listed after the object files using them, so pass
   openssl linker statements in LIBS rather than COPT
 - Openssl support library is libcrypto, not libcrypt
 - Openssl need zlib

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/civetweb/civetweb.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index e46856341f..171ad0cf29 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -11,6 +11,7 @@ CIVETWEB_LICENSE_FILES = LICENSE.md
 
 CIVETWEB_CONF_OPT = TARGET_OS=LINUX
 CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
+CIVETWEB_LIBS = -lpthread -lm -ldl
 CIVETWEB_SYSCONFDIR = /etc
 CIVETWEB_HTMLDIR = /var/www
 
@@ -27,7 +28,8 @@ ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-	CIVETWEB_COPT += -DNO_SSL_DL -lcrypt -lssl
+	CIVETWEB_COPT += -DNO_SSL_DL
+	CIVETWEB_LIBS += -lssl -lcrypto -lz
 	CIVETWEB_DEPENDENCIES += openssl
 else
 	CIVETWEB_COPT += -DNO_SSL
@@ -36,7 +38,7 @@ endif
 define CIVETWEB_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \
 		$(CIVETWEB_CONF_OPT) \
-		COPT="$(CIVETWEB_COPT)"
+		COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
 endef
 
 define CIVETWEB_INSTALL_TARGET_CMDS

From e9f6011617528646768e69203e85fe64364b7efd Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 24 Sep 2013 12:36:35 +0100
Subject: [PATCH 6200/6849] neard: bump version to 0.13

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/neard/neard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index 6dbbbe08a1..0f954b82b3 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NEARD_VERSION = 0.12
+NEARD_VERSION = 0.13
 NEARD_SOURCE = neard-$(NEARD_VERSION).tar.xz
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
 NEARD_LICENSE = GPLv2

From b088752be330e3ff4f2a284e6067d439a4d4ae5f Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Tue, 24 Sep 2013 16:42:44 +0200
Subject: [PATCH 6201/6849] libevent: Bump to 2.0.21

This fixes the build on ARC as well, as 2.0.17+ includes a fix
that checks for existence of 'sysctl'.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libevent/libevent.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 94882b5494..a6def1a442 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEVENT_VERSION = 2.0.14
+LIBEVENT_VERSION = 2.0.21
 LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz
 LIBEVENT_SITE = https://github.com/downloads/libevent/libevent
 LIBEVENT_INSTALL_STAGING = YES

From b74f81d56c5f9b46b4ba2db56edabbbbcad13cf8 Mon Sep 17 00:00:00 2001
From: Clayton Shotwell <clshotwe@rockwellcollins.com>
Date: Tue, 24 Sep 2013 15:50:53 -0500
Subject: [PATCH 6202/6849] linux-pam: bump to version 1.1.8

Bump version to fix compile error with 1.1.7.

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/linux-pam/linux-pam.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 6d575936bc..7d2cbd3b54 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -4,7 +4,7 @@
 # 
 ################################################################################
 
-LINUX_PAM_VERSION = 1.1.7
+LINUX_PAM_VERSION = 1.1.8
 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
 LINUX_PAM_SITE = http://linux-pam.org/library/
 LINUX_PAM_INSTALL_STAGING = YES

From 1954c4e0c685d17db2c8d7ecdbd4feccfea5b77a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 25 Sep 2013 09:55:16 +0800
Subject: [PATCH 6203/6849] proftpd: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/proftpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
index 7793713474..18407d173d 100644
--- a/package/proftpd/Config.in
+++ b/package/proftpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PROFTPD
 	bool "proftpd"
+	depends on BR2_USE_MMU # fork()
 	help
 	  ProFTPD, a highly configurable FTP server.
 

From 77a2607fa3fe840427cbb088ddddc8c592a4976d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 25 Sep 2013 13:44:06 +0800
Subject: [PATCH 6204/6849] stress: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/stress/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/stress/Config.in b/package/stress/Config.in
index b092b03a85..37f8946c2a 100644
--- a/package/stress/Config.in
+++ b/package/stress/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_STRESS
 	bool "stress"
+	depends on BR2_USE_MMU # fork()
 	help
 	  A deliberately simple workload generator for POSIX systems.
 	  It imposes a configurable amount of CPU, memory, I/O, and

From 11357a11e56b8618409ca18131b407f1a97c9ead Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 23 Sep 2013 09:02:12 +0100
Subject: [PATCH 6205/6849] xscreensaver: new package

[Peter: fix libintl handling, pass --includedir / --libdir]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/Config.in                             |   1 +
 package/xscreensaver/Config.in                |  22 +++
 ...001-fix-cross-compile-ansi-c-bailout.patch |  29 ++++
 ...saver-0002-fix-minixpm-build-problem.patch | 134 ++++++++++++++++++
 package/xscreensaver/xscreensaver.mk          |  27 ++++
 5 files changed, 213 insertions(+)
 create mode 100644 package/xscreensaver/Config.in
 create mode 100644 package/xscreensaver/xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch
 create mode 100644 package/xscreensaver/xscreensaver-0002-fix-minixpm-build-problem.patch
 create mode 100644 package/xscreensaver/xscreensaver.mk

diff --git a/package/Config.in b/package/Config.in
index 1dd60d199c..c6ea66bdb1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -215,6 +215,7 @@ source "package/sylpheed/Config.in"
 source "package/synergy/Config.in"
 source "package/torsmo/Config.in"
 source "package/x11vnc/Config.in"
+source "package/xscreensaver/Config.in"
 source "package/xstroke/Config.in"
 source "package/xterm/Config.in"
 source "package/xvkbd/Config.in"
diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in
new file mode 100644
index 0000000000..cbe797d01a
--- /dev/null
+++ b/package/xscreensaver/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_XSCREENSAVER
+	bool "xscreensaver"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP # libgtk2->pango
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2->glib2
+	select BR2_PACKAGE_LIBGTK2
+	select BR2_PACKAGE_LIBGLADE
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  XScreenSaver is the standard screen saver collection shipped on most
+	  Linux and Unix systems running the X11 Window System.
+
+	  On X11 systems, XScreenSaver is two things: it is both a large
+	  collection of screen savers; and it is also the framework for
+	  blanking and locking the screen.
+
+	  http://www.jwz.org/xscreensaver/
+
+comment "xscreensaver requires a toolchain with C++ and thread support enabled"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/xscreensaver/xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch b/package/xscreensaver/xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch
new file mode 100644
index 0000000000..4d05f03614
--- /dev/null
+++ b/package/xscreensaver/xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch
@@ -0,0 +1,29 @@
+The configure bails out when cross-compiling, because it is over-cautious
+about ANSI support in the C compiler. Work around this by disabling the
+bail-out code.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/configure b/configure
+--- a/configure	2013-07-16 10:23:32.000000000 +0100
++++ b/configure	2013-09-22 14:50:07.186953454 +0100
+@@ -3537,9 +3537,7 @@ $as_echo "Solaris: adding -D__EXTENSIONS
+   { $as_echo "$as_me:$LINENO: checking whether the compiler works on ANSI C" >&5
+ $as_echo_n "checking whether the compiler works on ANSI C... " >&6; }
+   if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: Couldn't build even a trivial ANSI C program: check CC." >&5
+-$as_echo "$as_me: error: Couldn't build even a trivial ANSI C program: check CC." >&2;}
+-   { (exit 1); exit 1; }; }
++  :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -8616,7 +8614,7 @@ fi
+ $as_echo "$ac_cv_xpointer" >&6; }
+   if test "$ac_cv_xpointer" != yes; then
+    cat >>confdefs.h <<\_ACEOF
+-#define XPointer char*
++/* #define XPointer char* */
+ _ACEOF
+ 
+   fi
diff --git a/package/xscreensaver/xscreensaver-0002-fix-minixpm-build-problem.patch b/package/xscreensaver/xscreensaver-0002-fix-minixpm-build-problem.patch
new file mode 100644
index 0000000000..842fb205bf
--- /dev/null
+++ b/package/xscreensaver/xscreensaver-0002-fix-minixpm-build-problem.patch
@@ -0,0 +1,134 @@
+Fix compile and link errors related to the minixpm code.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/hacks/Makefile.in b/hacks/Makefile.in
+--- a/hacks/Makefile.in	2013-07-16 10:23:32.000000000 +0100
++++ b/hacks/Makefile.in	2013-09-22 18:47:56.389238980 +0100
+@@ -73,17 +73,22 @@ UTIL_SRCS	= $(UTILS_SRC)/alpha.c $(UTILS
+ 		  $(UTILS_SRC)/minixpm.c \
+ 		  $(UTILS_SRC)/yarandom.c $(UTILS_SRC)/erase.c \
+ 		  $(UTILS_SRC)/xshm.c $(UTILS_SRC)/xdbe.c \
+-		  $(UTILS_SRC)/textclient.c
++		  $(UTILS_SRC)/colorbars.c \
++		  $(UTILS_SRC)/fade.c \
++		  $(UTILS_SRC)/textclient.c \
++		  $(UTILS_SRC)/overlay.c
+ UTIL_OBJS	= $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.o \
+ 		  $(UTILS_BIN)/grabclient.o \
+ 		  $(UTILS_BIN)/hsv.o $(UTILS_BIN)/resources.o \
+ 		  $(UTILS_BIN)/spline.o $(UTILS_BIN)/usleep.o \
+ 		  $(UTILS_BIN)/visual.o $(UTILS_BIN)/logo.o \
+-		  $(UTILS_SRC)/minixpm.c \
++		  $(UTILS_BIN)/minixpm.o \
+ 		  $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/erase.o \
+ 		  $(UTILS_BIN)/xshm.o $(UTILS_BIN)/xdbe.o \
+ 		  $(UTILS_BIN)/colorbars.o \
+-		  $(UTILS_SRC)/textclient.o
++		  $(UTILS_BIN)/fade.o \
++		  $(UTILS_BIN)/textclient.o \
++		  $(UTILS_BIN)/overlay.o
+ 
+ SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.c \
+ 		  bubbles-default.c decayscreen.c deco.c drift.c flag.c \
+@@ -559,11 +564,11 @@ xscreensaver-sgigl: xscreensaver-sgigl.c
+ attraction:	attraction.o	$(HACK_OBJS) $(COL) $(SPL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
+ 
+-blitspin:	blitspin.o	$(HACK_OBJS) $(GRAB) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(XPM) $(XPM_LIBS)
++blitspin:	blitspin.o	$(HACK_OBJS) $(GRAB) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS)
+ 
+-bubbles:	bubbles.o	$(HACK_OBJS) bubbles-default.o $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) bubbles-default.o $(XPM) $(XPM_LIBS)
++bubbles:	bubbles.o	$(HACK_OBJS) bubbles-default.o $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) bubbles-default.o $(XPM) $(MINIXPM) $(XPM_LIBS)
+ 
+ decayscreen:	decayscreen.o	$(HACK_OBJS) $(GRAB)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(HACK_LIBS)
+@@ -604,8 +609,8 @@ moire:		moire.o		$(HACK_OBJS) $(COL) $(S
+ moire2:		moire2.o	$(HACK_OBJS) $(COL) $(DBE)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
+ 
+-noseguy:	noseguy.o	$(HACK_OBJS) $(XPM) $(TEXT)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
++noseguy:	noseguy.o	$(HACK_OBJS) $(XPM) $(TEXT) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(TEXT) $(MINIXPM) $(XPM_LIBS) $(TEXT_LIBS)
+ 
+ pedal:		pedal.o		$(HACK_OBJS) $(HSV) $(ERASE)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(ERASE) $(HACK_LIBS)
+@@ -658,14 +663,14 @@ interference:  interference.o	$(HACK_OBJ
+ truchet:	 truchet.o	$(HACK_OBJS) $(COL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+ 
+-bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)
++bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(MINIXPM) $(XPM_LIBS)
+ 
+ apple2:	 	apple2.o apple2-main.o	$(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)
+ 	$(CC_HACK) -o $@ $@.o	apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
+ 
+-xanalogtv: 	xanalogtv.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
++xanalogtv: 	xanalogtv.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS) $(HACK_LIBS)
+ 
+ distort:	distort.o	$(HACK_OBJS) $(GRAB) $(SHM)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS)
+@@ -688,8 +693,8 @@ compass:	compass.o	$(HACK_OBJS) $(DBE)
+ squiral:	squiral.o	$(HACK_OBJS) $(COL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+ 
+-xflame:		xflame.o	$(HACK_OBJS) $(SHM) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(SHM) $(XPM) $(XPM_LIBS)
++xflame:		xflame.o	$(HACK_OBJS) $(SHM) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(SHM) $(XPM) $(MINIXPM) $(XPM_LIBS)
+ 
+ wander:		wander.o	$(HACK_OBJS) $(COL) $(ERASE)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)
+@@ -703,8 +708,8 @@ critical:	critical.o	$(HACK_OBJS) $(COL)
+ phosphor:	phosphor.o	$(HACK_OBJS) $(TEXT) $(COL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(COL) $(HACK_LIBS) $(TEXT_LIBS)
+ 
+-xmatrix:	xmatrix.o	$(HACK_OBJS) $(TEXT) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(XPM) $(XPM_LIBS) $(TEXT_LIBS)
++xmatrix:	xmatrix.o	$(HACK_OBJS) $(TEXT) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(XPM) $(MINIXPM) $(XPM_LIBS) $(TEXT_LIBS)
+ 
+ petri:		petri.o		$(HACK_OBJS) $(COL) $(SPL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
+@@ -787,8 +792,8 @@ cloudlife:	cloudlife.o	$(HACK_OBJS) $(CO
+ fontglide:	fontglide.o	$(HACK_OBJS) $(DBE) $(TEXT)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS) $(TEXT_LIBS)
+ 
+-pong: 	pong.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
++pong: 	pong.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS) $(HACK_LIBS)
+ 
+ wormhole: 	wormhole.o	$(HACK_OBJS)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+@@ -856,8 +861,8 @@ braid:		braid.o		$(XLOCK_OBJS) $(ERASE)
+ drift:		drift.o		$(XLOCK_OBJS) $(ERASE)
+ 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(ERASE) $(HACK_LIBS)
+ 
+-flag:		flag.o		$(XLOCK_OBJS) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(XPM) $(XPM_LIBS)
++flag:		flag.o		$(XLOCK_OBJS) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(XPM) $(MINIXPM) $(XPM_LIBS)
+ 
+ forest:		forest.o	$(XLOCK_OBJS) $(ERASE)
+ 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(ERASE) $(HACK_LIBS)
+@@ -959,8 +964,8 @@ thornbird:	thornbird.o	$(XLOCK_OBJS)
+ 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(HACK_LIBS)
+ 
+ PACOBJS=pacman_ai.o pacman_level.o
+-pacman:		pacman.o 	$(PACOBJS) $(XLOCK_OBJS) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(PACOBJS) $(XLOCK_OBJS) $(XPM) $(XPM_LIBS)
++pacman:		pacman.o 	$(PACOBJS) $(XLOCK_OBJS) $(XPM) $(MINIXPM)
++	$(CC_HACK) -o $@ $@.o	$(PACOBJS) $(XLOCK_OBJS) $(XPM) $(MINIXPM) $(XPM_LIBS)
+ 
+ fiberlamp:	fiberlamp.o	$(XLOCK_OBJS)
+ 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(HACK_LIBS)
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
new file mode 100644
index 0000000000..0e84d27004
--- /dev/null
+++ b/package/xscreensaver/xscreensaver.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# xscreensaver
+#
+################################################################################
+
+XSCREENSAVER_VERSION = 5.22
+XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver
+
+# N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built.
+XSCREENSAVER_LICENSE = MIT-like GPLv2+
+XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
+
+XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
+	$(if $(BR2_PACKAGE_GETTEXT),gettext)
+
+XSCREENSAVER_CONF_ENV = $(if $(BR2_PACKAGE_GETTEXT),LIBS=-lintl)
+
+# otherwise we end up with host include/library dirs passed to the
+# compiler/linker
+XSCREENSAVER_CONF_OPT = \
+	--includedir=$(STAGING_DIR)/usr/include \
+	--libdir=$(STAGING_DIR)/usr/lib
+
+XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install
+
+$(eval $(autotools-package))

From 9731bff1400cf43b7d979c6e44ca65933e0e3bce Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Wed, 25 Sep 2013 12:12:42 +0200
Subject: [PATCH 6206/6849] tcl: cleanup: use TCL_VERSION in TCL_SITE

No functional change.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/tcl/tcl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index f1193d3ca0..3291c1b28d 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -8,7 +8,7 @@ TCL_VERSION_MAJOR = 8.4
 TCL_VERSION_MINOR = 19
 TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
-TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
+TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
 TCL_LICENSE = tcl license
 TCL_LICENSE_FILES = license.terms
 TCL_SUBDIR = unix

From b8326cb643d29f7259905a1c157611e6f53c5cad Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Sep 2013 16:41:25 +0200
Subject: [PATCH 6207/6849] u-boot: add option for Freescale u-boot.imx format

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 boot/uboot/Config.in | 3 +++
 boot/uboot/uboot.mk  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 1b98339582..998cda2ca0 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -87,6 +87,9 @@ config BR2_TARGET_UBOOT_FORMAT_BIN
 config BR2_TARGET_UBOOT_FORMAT_IMG
 	bool "u-boot.img"
 
+config BR2_TARGET_UBOOT_FORMAT_IMX
+	bool "u-boot.imx"
+
 config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
 	bool "u-boot-nand.bin"
 
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 631da6b6fd..dc8e26f399 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -40,6 +40,8 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BIN          = u-boot-nand.bin
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
 UBOOT_BIN          = u-boot.img
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
+UBOOT_BIN          = u-boot.imx
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
 UBOOT_BIN          = u-boot.sb
 UBOOT_MAKE_TARGET  = $(UBOOT_BIN)

From 4cb5ec7c6cf1ac7360f12dd079eec069d2996aec Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 26 Sep 2013 09:54:53 +0800
Subject: [PATCH 6208/6849] socat: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/socat/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/socat/Config.in b/package/socat/Config.in
index c47828251b..ec69c96430 100644
--- a/package/socat/Config.in
+++ b/package/socat/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SOCAT
 	bool "socat"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Multipurpose socket relay program.
 

From 8f8a5d84130fa7afb2f7cda10c7c0edec2cb3ae5 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 26 Sep 2013 10:17:40 +0800
Subject: [PATCH 6209/6849] logsurfer: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/logsurfer/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/logsurfer/Config.in b/package/logsurfer/Config.in
index 27d18815cf..d4218bce7e 100644
--- a/package/logsurfer/Config.in
+++ b/package/logsurfer/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LOGSURFER
 	bool "logsurfer"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Logsurfer is a program for monitoring system logs in real-time,
 	  and reporting on the occurrence of events.

From 471629063069e2f6ef9b9a2abb9bd323cc26c3ad Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Thu, 26 Sep 2013 08:59:34 -0500
Subject: [PATCH 6210/6849] libssh2: fix library search path issues

Fix issues with some toolchains not finding libssl or libgcrypt.

Fixes http://autobuild.buildroot.net/results/eeaaf41c0c5f88357af8445750dce776774c2b5d
Fixes http://autobuild.buildroot.net/results/7a2590a7c3a1f52590f3e886b7cf9d04ad966a10

[Peter: indentation fixup]
Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/libssh2/libssh2.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index 10eb5edb9e..19df9af9d6 100644
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -15,10 +15,14 @@ LIBSSH2_CONF_OPT = --disable-examples-build
 # Only select openssl if libgcrypt is not selected
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 LIBSSH2_DEPENDENCIES += libgcrypt
-LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl
+LIBSSH2_CONF_OPT += --with-libgcrypt \
+	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
+	--without-openssl
 else
 LIBSSH2_DEPENDENCIES += openssl
-LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt
+LIBSSH2_CONF_OPT += --with-openssl \
+	--with-libssl-prefix=$(STAGING_DIR)/usr \
+	--without-libgcrypt
 endif
 
 # Add zlib support if enabled

From aa797d76a508016cca7b2011de2910349c22de82 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 26 Sep 2013 16:20:25 +0200
Subject: [PATCH 6211/6849] atk: bump to version 2.10.0

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/atk/atk.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 433e1e3b78..1a8bbea6c9 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-ATK_VERSION_MAJOR = 2.9
-ATK_VERSION = $(ATK_VERSION_MAJOR).4
+ATK_VERSION_MAJOR = 2.10
+ATK_VERSION = $(ATK_VERSION_MAJOR).0
 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
 ATK_LICENSE = LGPLv2+

From f368f2d19befa2adaa237a4e08d62a2ac3c92be6 Mon Sep 17 00:00:00 2001
From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Wed, 25 Sep 2013 12:07:49 -0700
Subject: [PATCH 6212/6849] nitrogen6x: bump U-Boot to latest production
 version (2013.07)

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index cdd800001a..4c4bd1b640 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_2r1=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/7176d07/u-boot-7176d07.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/4034391/u-boot-4034391.tar.gz"
 
 # kernel
 BR2_LINUX_KERNEL=y

From c149850baa1286ea04b812acc1443895d878b04b Mon Sep 17 00:00:00 2001
From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Wed, 25 Sep 2013 12:07:50 -0700
Subject: [PATCH 6213/6849] nitrogen6x: use 6x_bootscript/6x_upgrade instead of
 older 6q_ versions

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 .../boundarydevices/nitrogen6x/6q_bootscript  | Bin 455 -> 0 bytes
 .../boundarydevices/nitrogen6x/6x_bootscript  | Bin 0 -> 1653 bytes
 .../nitrogen6x/{6q_upgrade => 6x_upgrade}     | Bin 1587 -> 1744 bytes
 .../boundarydevices/nitrogen6x/post-build.sh  |  14 ++++++++------
 4 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 board/boundarydevices/nitrogen6x/6q_bootscript
 create mode 100644 board/boundarydevices/nitrogen6x/6x_bootscript
 rename board/boundarydevices/nitrogen6x/{6q_upgrade => 6x_upgrade} (59%)

diff --git a/board/boundarydevices/nitrogen6x/6q_bootscript b/board/boundarydevices/nitrogen6x/6q_bootscript
deleted file mode 100644
index e10cfeb0b742f401e36f0f242ca72e45fab26944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 455
zcma)&!AiqG5QbB+9`Xj>h7#%}CA*=<(z;+3DS`p<P`xI*n|8@=wrpaol;Y8Y58>5^
z(RVTlQ9(qU%MAa_d_OY>-TgVceOq1)j$bXS^JKO0{J#6r-PyBZtqaJh5v$^}^&@v4
zYa!<a)U%OU<luZ&RA;%CoD{`_T2t&|eCQ(trHZ7~lnfCH!BlI+W4!c~qOnZT3OCw)
zBnoH&v5c~mAeh*d5zorsyh_2iCY4PRqj7~JOQwX2{SjIp`6xUIkSh{$Jv;S>|D)iB
zA}MpvE~nGM&3ra(2|*D2fk<M-74b)*i&1Dhn<U>#9WkiR182iTo^Hn&FdCscz^lLI
n-Cd|?!J*%8PE+6Q32?g9&^tFq8>m4dTR_T9#wCb)sb||C*>#HV

diff --git a/board/boundarydevices/nitrogen6x/6x_bootscript b/board/boundarydevices/nitrogen6x/6x_bootscript
new file mode 100644
index 0000000000000000000000000000000000000000..dc9eea481c03145d16959e5ebcc47120ff3cc2c3
GIT binary patch
literal 1653
zcmdT^!EVz)5RED|Qv3sm+sLwt1dg(H(-1YXMA|~B)LeQf+^V%bPF7j(8hc3{Mfnas
zf+HWq5AYGJ9Xn}4p+dR9Ue@-^zMc0x^IjZ2zy0##+xX`E<@ZLTdD5uXv#<8S;X$+E
zOQ|3WQkJMXw6izc#fJ<PiWwB?G#zJvg8Cfq?kQ7uu?*3ZQDjs}0&^8e0c2npEP_cG
zvk(;wKuu5>tz9T<4LZ|#(u?yT@~uUMvOEoO<`o#W<Mv7Z+9jhmJz}%SySY4byKB72
zk1+<b+&s5GG6$<ro}^G$WYrI^z%h_#XtXexNHE*w0wLl3#pnuRDVUO}hKQKv;0B<J
z0JmUMyd<gg5lBwDdy(RyZ(m=WwLe}CD>}Vi&uHmO6lMxcVnQ1~L0xpMUoGGkVTY82
zSDdyptVNl*v~`Zr(uB(JU&`_>Ma%-q5ki(FoX%@)wiP+<@2!YK+-}|@5C8JND@$GM
zpH=DZsY(#q=hwqw`@`*j&?$XF@@}8(C~`kxx_4H6eXRRh;JUAM$Aoe{#%nWp$`-WY
zz!M{`<DnF2)W-A(wpGr?FA3)6cI{-D<mf3i*UseFj&tG?0<)NME(5QtI~A%NpHngQ
z2&CF23uiP-|67sHsG=r#U|Ne%%@bUjznzo^mlsH0N1IP43#p@zRIXKdsQCz^&5<|`
zd_E;fc}~y0HiB%)B@Lmjp?F}~bb0E4L-dc+3pxd6=krxe#|TG9rRB$)u&$tV%(rPO
TQz+1w7{e4(fgD(I$TWTea_I@(

literal 0
HcmV?d00001

diff --git a/board/boundarydevices/nitrogen6x/6q_upgrade b/board/boundarydevices/nitrogen6x/6x_upgrade
similarity index 59%
rename from board/boundarydevices/nitrogen6x/6q_upgrade
rename to board/boundarydevices/nitrogen6x/6x_upgrade
index 2f20efa2e85c761b09da7ae5a935589280dae5eb..cd26b616b0024424764e95f4d54d917c626d36d4 100644
GIT binary patch
delta 325
zcmdnYbAeYzomDc-q;cPrAZM+=3=C`&7@$D?tVh&D8MQdJ4v;``YDsEdnL=?%N`7gH
zLUC$QW@3&`S$ZN@YH~)tf>LruYI3$hsIF6feu<KTH5XKQep(ukrC?BDVqn0PnWmsp
zomO0%lb@IZWTli;7Npir%#)VP%&kzUslhJEnU`OXn39s2mp-w_TN9|NI8C9TC_gC`
zq$7rl6TvrBFfum)1EAEzvytp75ZfoOV^*B(!FY+$bg~SS2A`>diGs0$k%FOuwL(h%
z<b_NklM9&mCO0#KXx7Oym?D4*KQiUQwZ}92!P)DWcY$?$U{RdR$I7{R4NEH{02Cx=
AlmGw#

delta 191
zcmcb>yO~EuomDby5079~0P75P1_sv83{cQmb}W3Nj2av3YmmUiL@|NPGzFFFwBp*F
z{KOQ6+}z}e3#6HoGV><>@Sa@8=+9^{`3&P{CPRbC2beU3Efp*j%oWTOOchKNj1`O&
z3>6F}e`Hc;QsA1rkwt8>K64bK$>c8PT%fLh%zj|Kijxnpuup!&=mMsXvADBya&jst
XKy{=tNrJ`onb<dbv$iraad80vy|FZi

diff --git a/board/boundarydevices/nitrogen6x/post-build.sh b/board/boundarydevices/nitrogen6x/post-build.sh
index 2f3c464db7..1dc5643a5c 100755
--- a/board/boundarydevices/nitrogen6x/post-build.sh
+++ b/board/boundarydevices/nitrogen6x/post-build.sh
@@ -1,18 +1,20 @@
 #!/bin/sh
 # post-build fixups
-# for furthe details, see
-# http://boundarydevices.com/u-boot-conventions-for-i-mx6-nitrogen6x-and-sabrelite/
+# for further details, see
+#
+#  http://boundarydevices.com/u-boot-on-i-mx6/
+#
 
 TARGET_DIR=$1
 IMAGES_DIR=$1/../images
 BOARD_DIR="$(dirname $0)"
 
 # bd u-boot looks for bootscript here
-cp $BOARD_DIR/6q_bootscript $TARGET_DIR
+cp $BOARD_DIR/6x_bootscript $TARGET_DIR
 
 # u-boot / update script for bd upgradeu command
-if [ -e $IMAGES_DIR/u-boot.bin ];
+if [ -e $IMAGES_DIR/u-boot.imx ];
 then
-    cp $IMAGES_DIR/u-boot.bin $TARGET_DIR
-    cp $BOARD_DIR/6q_upgrade $TARGET_DIR
+    cp $IMAGES_DIR/u-boot.imx $TARGET_DIR
+    cp $BOARD_DIR/6x_upgrade $TARGET_DIR
 fi

From 844c52ecd4df1d49a0b8eda54f3e204ee0e9f158 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Sep 2013 21:13:21 +0200
Subject: [PATCH 6214/6849] nitrogen6x: u-boot: use imx format to match
 bootscript

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 4c4bd1b640..5f39f8dcb6 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -14,6 +14,7 @@ BR2_TARGET_ROOTFS_EXT2_2r1=y
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/4034391/u-boot-4034391.tar.gz"
 

From b720a014bba13818c33810a9673b36d2114055a2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 26 Sep 2013 21:15:59 +0200
Subject: [PATCH 6215/6849] nitrogen6x: post-build.sh: use the exported
 variables for {TARGET,BINARIES}_DIR

No functional change, but lets show the preferred way to do this.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 board/boundarydevices/nitrogen6x/post-build.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/board/boundarydevices/nitrogen6x/post-build.sh b/board/boundarydevices/nitrogen6x/post-build.sh
index 1dc5643a5c..cc6e66acff 100755
--- a/board/boundarydevices/nitrogen6x/post-build.sh
+++ b/board/boundarydevices/nitrogen6x/post-build.sh
@@ -5,16 +5,14 @@
 #  http://boundarydevices.com/u-boot-on-i-mx6/
 #
 
-TARGET_DIR=$1
-IMAGES_DIR=$1/../images
 BOARD_DIR="$(dirname $0)"
 
 # bd u-boot looks for bootscript here
 cp $BOARD_DIR/6x_bootscript $TARGET_DIR
 
 # u-boot / update script for bd upgradeu command
-if [ -e $IMAGES_DIR/u-boot.imx ];
+if [ -e $BINARIES_DIR/u-boot.imx ];
 then
-    cp $IMAGES_DIR/u-boot.imx $TARGET_DIR
+    cp $BINARIES_DIR/u-boot.imx $TARGET_DIR
     cp $BOARD_DIR/6x_upgrade $TARGET_DIR
 fi

From 70752244a2d86f5e7acb4784e49ffbd513c7fcdc Mon Sep 17 00:00:00 2001
From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Wed, 25 Sep 2013 12:07:51 -0700
Subject: [PATCH 6216/6849] nitrogen6x: bump kernel to latest version
 (3.0.35-4.1.0)

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 5f39f8dcb6..cc70a8ad7a 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -21,6 +21,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/2dc5560/linux-imx6-2dc5560.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/5809938/linux-imx6-5809938.tar.gz
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 591bed40ff24d540d87872ea75967a445a6d80b9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 27 Sep 2013 08:18:52 +0200
Subject: [PATCH 6217/6849] nitrogen6x: fixup linux tarball setting

A terminating '"' was missing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/nitrogen6x_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index cc70a8ad7a..0c026db18f 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -21,6 +21,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/5809938/linux-imx6-5809938.tar.gz
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/5809938/linux-imx6-5809938.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From 5ce1fb3d25ab423c44525e1ae84505713830fa05 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 27 Sep 2013 16:19:19 +0800
Subject: [PATCH 6218/6849] xinetd: needs mmu

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/xinetd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/xinetd/Config.in b/package/xinetd/Config.in
index 76fe603547..7f3575cedb 100644
--- a/package/xinetd/Config.in
+++ b/package/xinetd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XINETD
 	bool "xinetd"
+	depends on BR2_USE_MMU # fork()
 	help
 	  xinetd is a secure replacement for inetd. It was originally written by
 	  panos@cs.colorado.edu.

From adb1e798d0790bbf95e8a2a1c03bb983a43417b7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Sep 2013 07:59:03 -0300
Subject: [PATCH 6219/6849] linux-headers: bump 3.{0, 4, 10, 11}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.96 => 3.0.97}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.96/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.97/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.96/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.97/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index bc8f821dbb..1ebfaad70b 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,17 +76,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.96"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.97"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.62"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.63"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.12"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.1"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.13"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.2"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From d4905701c6fdc1827bfb9477ae0eaa0c499bd197 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Sep 2013 07:59:04 -0300
Subject: [PATCH 6220/6849] linux: bump 3.11.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index a96ee04390..201bcef299 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11.1"
+	bool "3.11.2"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11.1" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11.2" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 41d1628e301df564997bcc178e1dd532ad235b53 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 27 Sep 2013 11:23:39 -0300
Subject: [PATCH 6221/6849] samba: bump to version 3.6.19

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index cb80174b09..76a46b80b5 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA_VERSION = 3.6.18
+SAMBA_VERSION = 3.6.19
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 231f95a94b7251d6b17e4c0bb91c1f48e84f4db1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 27 Sep 2013 17:59:48 +0200
Subject: [PATCH 6222/6849] package/gst1-plugins-good: remove duplicate VPX
 entry

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gstreamer1/gst1-plugins-good/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 8031a6354b..ac05d662df 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -327,10 +327,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	help
 	  VP8 plugin
 
-config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
-	bool "vpx (webm)"
-	select BR2_PACKAGE_LIBVPX
-
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK
 	bool "wavpack (*.wv audio)"
 	select BR2_PACKAGE_WAVPACK

From 0c4c5619d0bb32e45a5be4f8d6e6f15cd2df9d2d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 27 Sep 2013 19:26:42 +0200
Subject: [PATCH 6223/6849] package/gst1-plugins-bad: fix decklink comment

It was missing the dependency on the toolchain features.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/gstreamer1/gst1-plugins-bad/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index f30f2b395e..0903aeeb95 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -346,6 +346,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
 	  Blackmagic Decklink plugin
 
 comment "decklink requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"

From df5f1b56e62d1d986b6d8bf5d0d987f813ee8f40 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 27 Sep 2013 17:44:56 +0200
Subject: [PATCH 6224/6849] configs: add Freescale i.MX 6SoloLite EVK support

i.MX6 SoloLite EVK is Freescale's evaluation board based on
the i.MX6 SoloLite applications processor.

This defconfig is based off Freescale "official" git repo on git.freescale.com
and SW release 3.0.35_4.1.0.

[Peter: comment defconfig]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/freescale_imx6sololiteevk_defconfig | 23 +++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 configs/freescale_imx6sololiteevk_defconfig

diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig
new file mode 100644
index 0000000000..997ecbea5a
--- /dev/null
+++ b/configs/freescale_imx6sololiteevk_defconfig
@@ -0,0 +1,23 @@
+# architecture
+BR2_arm=y
+BR2_cortex_a9=y
+
+# system
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"
+BR2_LINUX_KERNEL_DEFCONFIG="imx6s"
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6sl_evk"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"

From 867867bb1914ce4196d1e9f3fc64e806ea516bf1 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Fri, 27 Sep 2013 17:44:57 +0200
Subject: [PATCH 6225/6849] configs: add Freescale SABRE-SD board support

SABRE Board for Smart Devices (SABRE-SD) is Freescale's evaluation board
based on the i.MX 6Quad ARM Cortex-A9 applications processor.

This defconfig is based off Freescale "official" git repo on git.freescale.com
and SW release 3.0.35_4.1.0.

[Peter: add comments to defconfig]
Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 configs/freescale_imx6sabresd_defconfig | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 configs/freescale_imx6sabresd_defconfig

diff --git a/configs/freescale_imx6sabresd_defconfig b/configs/freescale_imx6sabresd_defconfig
new file mode 100644
index 0000000000..b030eeeac0
--- /dev/null
+++ b/configs/freescale_imx6sabresd_defconfig
@@ -0,0 +1,23 @@
+# architecture
+BR2_arm=y
+BR2_cortex_a9=y
+
+# system
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"
+BR2_LINUX_KERNEL_DEFCONFIG="imx6"
+
+# filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6q_sabresd"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"

From 97ee2406e1b1f6fb2d6ac5df996872f58e6a3254 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 30 Sep 2013 19:19:46 +0100
Subject: [PATCH 6226/6849] monit: bump version to 5.6

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/monit/monit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index e2847fc2c1..ec7c95d897 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONIT_VERSION = 5.4
+MONIT_VERSION = 5.6
 MONIT_SITE = http://mmonit.com/monit/dist/
 MONIT_LICENSE = AGPLv3 with OpenSSL exception
 MONIT_LICENSE_FILES = COPYING

From b9e7f642c3ca0def4453e91c0f739573a8694289 Mon Sep 17 00:00:00 2001
From: Michael Rommel <rommel@layer-7.net>
Date: Mon, 30 Sep 2013 19:57:42 +0200
Subject: [PATCH 6227/6849] aiccu: patched Makefile to enable static linking

Fixes autobuild errors:
http://autobuild.buildroot.net/results/308087e1f85e822dec8b73a3ed892c7cd2376cbd/
http://autobuild.buildroot.net/results/9fb298d4e09a6f9b88207909d583dce05392048e/

[Peter: use pkg-config instead of hardcoding libraries for gnutls]
Signed-off-by: Michael Rommel <rommel@layer-7.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...02-makefile-reorder-linked-libraries.patch | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch

diff --git a/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch b/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch
new file mode 100644
index 0000000000..cc189b29c6
--- /dev/null
+++ b/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch
@@ -0,0 +1,24 @@
+Makefile: changed LDFLAGS contents and order on the compile line for --static
+
+Signed-off-by: Michael Rommel <rommel@layer-7.net>
+
+--- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
++++ aiccu_20070115/unix-console/Makefile	2013-09-29 22:54:42.742963861 +0200
+@@ -42,7 +42,7 @@ CFLAGS	+= -D AICCU_CONSOLE
+ # Currently defaultly builds only on Linux, but other platforms might easily also support it
+ ifeq ($(shell uname | grep -c "Linux"),1)
+ CFLAGS	+= -D AICCU_GNUTLS
+-LDFLAGS += -lgnutls
++LDFLAGS += -lgnutls -lhogweed -lnettle -lgmp -lz
+ endif
+ 
+ # Linux
+@@ -144,7 +144,7 @@ endif
+ all: aiccu
+ 
+ aiccu:	$(OBJS) ${SRCS} ${INCS}
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
++	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+ ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
+ ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
+ 	strip $@

From 3c84a8da8c524705dd167a0a5f8fc5f0e4a21422 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 1 Oct 2013 21:18:52 +0200
Subject: [PATCH 6228/6849] aiccu: really fix static linking

It seems like I forgot to amend before pushing :/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...iccu-0002-makefile-reorder-linked-libraries.patch | 11 +----------
 package/aiccu/aiccu.mk                               | 12 ++++++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch b/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch
index cc189b29c6..22f04a91a4 100644
--- a/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch
+++ b/package/aiccu/aiccu-0002-makefile-reorder-linked-libraries.patch
@@ -1,18 +1,9 @@
-Makefile: changed LDFLAGS contents and order on the compile line for --static
+Makefile: change LDFLAGS order on the compile line for --static
 
 Signed-off-by: Michael Rommel <rommel@layer-7.net>
 
 --- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
 +++ aiccu_20070115/unix-console/Makefile	2013-09-29 22:54:42.742963861 +0200
-@@ -42,7 +42,7 @@ CFLAGS	+= -D AICCU_CONSOLE
- # Currently defaultly builds only on Linux, but other platforms might easily also support it
- ifeq ($(shell uname | grep -c "Linux"),1)
- CFLAGS	+= -D AICCU_GNUTLS
--LDFLAGS += -lgnutls
-+LDFLAGS += -lgnutls -lhogweed -lnettle -lgmp -lz
- endif
- 
- # Linux
 @@ -144,7 +144,7 @@ endif
  all: aiccu
  
diff --git a/package/aiccu/aiccu.mk b/package/aiccu/aiccu.mk
index 2c54644728..d698fa7a8a 100644
--- a/package/aiccu/aiccu.mk
+++ b/package/aiccu/aiccu.mk
@@ -11,10 +11,18 @@ AICCU_LICENSE = SixXS License, concise redistribution license
 AICCU_LICENSE_FILES = doc/LICENSE
 AICCU_DEPENDENCIES = gnutls
 
+AICCU_LFDLAGS = $(TARGET_LDFLAGS)
+
+# aiccu forgets to link with gnutls' dependencies breaking the build when
+# linking statically
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+AICCU_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --static --libs gnutls)
+endif
+
 # dummy RPM_OPT_FLAGS to disable stripping
 define AICCU_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" \
-		RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
+	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AICCU_LDFLAGS)" $(MAKE) \
+		CC="$(TARGET_CC)" RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
 endef
 
 define AICCU_INSTALL_TARGET_CMDS

From 12913f000851c7aef4af8e27bf10877736e85f1f Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Tue, 1 Oct 2013 17:07:46 +0200
Subject: [PATCH 6229/6849] psplash: new package

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in          |  1 +
 package/psplash/Config.in  | 31 +++++++++++++++++++++++++++++++
 package/psplash/psplash.mk | 12 ++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 package/psplash/Config.in
 create mode 100644 package/psplash/psplash.mk

diff --git a/package/Config.in b/package/Config.in
index c6ea66bdb1..da10a2363f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -160,6 +160,7 @@ source "package/imagemagick/Config.in"
 source "package/linux-fusion/Config.in"
 source "package/lite/Config.in"
 source "package/ocrad/Config.in"
+source "package/psplash/Config.in"
 source "package/sawman/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
diff --git a/package/psplash/Config.in b/package/psplash/Config.in
new file mode 100644
index 0000000000..73fcfee1af
--- /dev/null
+++ b/package/psplash/Config.in
@@ -0,0 +1,31 @@
+config BR2_PACKAGE_PSPLASH
+	bool "psplash"
+	depends on BR2_USE_WCHAR
+	help
+	  PSplash is a userspace graphical boot splash screen for mainly
+	  embedded Linux devices supporting a 16bpp or 32bpp framebuffer.
+	  It has few dependencies (just libc), supports basic images and
+	  text and handles rotation. Its visual look is configurable by
+	  basic source changes.
+
+	  Also included is a 'client' command utility for sending
+	  information to psplash such as boot progress information.
+
+	  Start the drawing process with 'psplash -n&' as early as possible.
+	  Note: psplash creates a FIFO in /tmp for communication with
+	  psplash-write.
+
+	  Usage:
+	  * Set progress bar to 50 percent:
+	    psplash-write "PROGRESS 50"
+
+	  * Display message "foobar" above progress bar:
+	    psplash-write "MSG foobar"
+
+	  * Terminate psplash:
+	    psplash-write "QUIT"
+
+	  http://git.yoctoproject.org/cgit/cgit.cgi/psplash/
+
+comment "psplash requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk
new file mode 100644
index 0000000000..cb1c54a8c8
--- /dev/null
+++ b/package/psplash/psplash.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# psplash
+#
+################################################################################
+
+PSPLASH_VERSION = 0.1
+PSPLASH_SITE = http://downloads.yoctoproject.org/releases/psplash
+PSPLASH_LICENSE = GPLv2+
+PSPLASH_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))

From 6230c24279ce4eb2fb0b6f14adc2347f8de88b90 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 1 Oct 2013 11:55:11 +0200
Subject: [PATCH 6230/6849] picocom: bump to version 1.7

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/picocom/picocom.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index 4298faa7d4..8f8ad20017 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICOCOM_VERSION = 1.6
+PICOCOM_VERSION = 1.7
 PICOCOM_SITE    = http://picocom.googlecode.com/files/
 
 define PICOCOM_BUILD_CMDS

From 22ea98e727fd6ac2430c4a8f904511322743f43c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 1 Oct 2013 21:22:11 +0200
Subject: [PATCH 6231/6849] picocom: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/picocom/picocom.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index 8f8ad20017..f6c423a207 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -6,6 +6,8 @@
 
 PICOCOM_VERSION = 1.7
 PICOCOM_SITE    = http://picocom.googlecode.com/files/
+PICOCOM_LICENSE = GPLv2+
+PICOCOM_LICENSE_FILES = LICENSE.txt
 
 define PICOCOM_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)

From 7d305cce194438324a63ac15f0e989dbfdfb4dc6 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 1 Oct 2013 11:11:24 +0200
Subject: [PATCH 6232/6849] ngircd: bump to version 20.3

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ngircd/ngircd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 41a5b49b2e..c99e6bb66a 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NGIRCD_VERSION = 17.1
+NGIRCD_VERSION = 20.3
 NGIRCD_SITE = ftp://ftp.berlios.de/pub/ngircd/
 NGIRCD_DEPENDENCIES = zlib
 

From ce5b2aed7e6b24b53766f215fafb01b7390ea79f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 1 Oct 2013 21:25:12 +0200
Subject: [PATCH 6233/6849] ngircd: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ngircd/ngircd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index c99e6bb66a..d60ac06b82 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -7,5 +7,7 @@
 NGIRCD_VERSION = 20.3
 NGIRCD_SITE = ftp://ftp.berlios.de/pub/ngircd/
 NGIRCD_DEPENDENCIES = zlib
+NGIRCD_LICENSE = GPLv2+
+NGIRCD_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 2e162a76ff3fa7ac3536cb0498e3e9b8d2eebee6 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Tue, 1 Oct 2013 10:14:56 +0200
Subject: [PATCH 6234/6849] mtdev: bump version to 1.1.4

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mtdev/mtdev.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtdev/mtdev.mk b/package/mtdev/mtdev.mk
index 5c943527dd..3ae2a104cb 100644
--- a/package/mtdev/mtdev.mk
+++ b/package/mtdev/mtdev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MTDEV_VERSION = 1.1.3
+MTDEV_VERSION = 1.1.4
 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2
 MTDEV_SITE = http://bitmath.org/code/mtdev/
 

From 51243f52e10326e872ecbd57b10fe30317f215f1 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 1 Oct 2013 13:26:02 +0800
Subject: [PATCH 6235/6849] diffutils: bump to version 3.3

Also drop diffutils-gets-no-longer-exists-in-eglibc-2.16.patch because
gets is unconditionally undefined now so we don't need the patch.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...gets-no-longer-exists-in-eglibc-2.16.patch | 26 -------------------
 package/diffutils/diffutils.mk                |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch

diff --git a/package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch b/package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch
deleted file mode 100644
index 478571852e..0000000000
--- a/package/diffutils/diffutils-gets-no-longer-exists-in-eglibc-2.16.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Handle the fact that gets() no longer exists in glibc >= 2.16
-
-The problem has been fixed upstream, but no release containing the fix
-has been made so far.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/lib/stdio.in.h
-===================================================================
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -693,12 +693,14 @@
- _GL_CXXALIAS_SYS (gets, char *, (char *s));
- #  undef gets
- # endif
-+# if defined gets
- _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 69345323b4..191fd2e172 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DIFFUTILS_VERSION = 3.2
+DIFFUTILS_VERSION = 3.3
 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)

From 243fe9a7d9b19ab48df88e1493c2a4dacd1e91f3 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 1 Oct 2013 10:53:13 +0800
Subject: [PATCH 6236/6849] logrotate: needs mmu

Fix below build error:

logrotate.o: In function `switch_user_permanently':
/opt/test/buildroot/buildroot/output/build/logrotate-3.8.4/logrotate.c:129: undefined reference to `fork'
logrotate.o: In function `removeLogFile':
/opt/test/buildroot/buildroot/output/build/logrotate-3.8.4/logrotate.c:431: undefined reference to `fork'
logrotate.o: In function `mailLog':
/opt/test/buildroot/buildroot/output/build/logrotate-3.8.4/logrotate.c:597: undefined reference to `fork'
/opt/test/buildroot/buildroot/output/build/logrotate-3.8.4/logrotate.c:615: undefined reference to `fork'
logrotate.o: In function `compressLogFile':
/opt/test/buildroot/buildroot/output/build/logrotate-3.8.4/logrotate.c:533: undefined reference to `fork'
collect2: ld returned 1 exit status
make[1]: *** [logrotate] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/logrotate/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/logrotate/Config.in b/package/logrotate/Config.in
index 0d0ec610a9..bc7b295d38 100644
--- a/package/logrotate/Config.in
+++ b/package/logrotate/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LOGROTATE
 	bool "logrotate"
 	select BR2_PACKAGE_POPT
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
 	help
 	  A simple program to rotate logs.
 

From 1e4acc6c1492f45da05ce83d1b0b96930be354f6 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 1 Oct 2013 10:32:32 +0800
Subject: [PATCH 6237/6849] logrotate: bump to version 3.8.6

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/logrotate/logrotate.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index f5ef0b916e..4bae4319ed 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LOGROTATE_VERSION = 3.8.4
+LOGROTATE_VERSION = 3.8.6
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
 LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate/
 LOGROTATE_LICENSE = GPLv2+

From 7a8be43c338a547ae0af02c409e492970a65c083 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 30 Sep 2013 10:04:29 +0800
Subject: [PATCH 6238/6849] findutils: needs mmu

Fix below build error:

./libfindtools.a(pred.o): In function `launch':
pred.c:(.text+0x240c): undefined reference to `fork'
collect2: .ld returned 1 exit status/libfindtools.a
(pred.o): In function `launch':
pred.c:(.text+0x240c): undefined reference to `fork'
collect2: ld returned 1 exit status
make[4]: *** [oldfind] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: *** [find] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/findutils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/findutils/Config.in b/package/findutils/Config.in
index bbe2cc14b8..32e87c26dc 100644
--- a/package/findutils/Config.in
+++ b/package/findutils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_FINDUTILS
 	bool "findutils"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
 	help
 	  Basic directory searching utilities.  Provides the
 	  common 'find', 'xargs', 'locate', and 'updatedb' binaries.

From 4cfb3fc26723211c16dd2793295d6674858ca4e3 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 30 Sep 2013 17:18:47 +0800
Subject: [PATCH 6239/6849] pppd: needs mmu and shared objects

The plugin infrastructure is based on shared objects so it won't build
for static-only scenarios.
And the daemon uses fork() so MMU is required.

[Peter: move below suboptions]
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pppd/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/pppd/Config.in b/package/pppd/Config.in
index 879b263cf3..ba35fed20c 100644
--- a/package/pppd/Config.in
+++ b/package/pppd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_PPPD
 	bool "pppd"
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU
 	help
 	  An implementation of the Point-to-point protocol.
 
@@ -19,3 +21,7 @@ config BR2_PACKAGE_PPPD_RADIUS
 	bool "radius"
 	help
 	  Install RADIUS support for pppd
+
+comment "pppd requires a toolchain with dynamic library support"
+	depends on BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU

From a932f959dc5be2036995d02742d45d154ebbecb3 Mon Sep 17 00:00:00 2001
From: "gilles.talis@gmail.com" <gilles.talis@gmail.com>
Date: Sat, 28 Sep 2013 15:10:03 +0200
Subject: [PATCH 6240/6849] webp: bump to version 0.3.1

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/webp/webp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/webp/webp.mk b/package/webp/webp.mk
index 9f2acf9288..15acd8ad51 100644
--- a/package/webp/webp.mk
+++ b/package/webp/webp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBP_VERSION = 0.3.0
+WEBP_VERSION = 0.3.1
 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
 WEBP_SITE = https://webp.googlecode.com/files
 WEBP_LICENSE = BSD-3c

From 300eb6b751bc623a2446ead4c885bcfa84419744 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Mon, 30 Sep 2013 13:09:27 +0200
Subject: [PATCH 6241/6849] make clean: remove redundant removal of STAGING_DIR

Since STAGING_DIR is defined as (package/Makefile.in):

STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot
STAGING_DIR    = $(HOST_DIR)/$(STAGING_SUBDIR)

removing HOST_DIR will automatically remove STAGING_DIR. This patch updates
'make clean' based on this knowledge.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 667e233242..cd3dc0d0c5 100644
--- a/Makefile
+++ b/Makefile
@@ -751,7 +751,7 @@ printvars:
 		$(info $V=$($V) ($(value $V)))))
 
 clean:
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
+	rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
 		$(STAMP_DIR) $(BUILD_DIR) $(BASE_DIR)/staging \
 		$(LEGAL_INFO_DIR)
 

From b2fab93b1636027c73c664cdf395cb8f93dc55dc Mon Sep 17 00:00:00 2001
From: Peter Sanford <psanford@nearbuysystems.com>
Date: Sun, 29 Sep 2013 17:25:20 -0700
Subject: [PATCH 6242/6849] gnupg: option to include RSA support.

gnupg is compiled with --enable-minimal flag. This produces a binary that only
supports ElGamal and DSA public key algorithms.

RSA has been the default for `gpg --gen-key` since 2009, so it makes sense to
be able to build a gnupg binary that supports it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gnupg/Config.in | 5 +++++
 package/gnupg/gnupg.mk  | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in
index 8ddffaa19f..90f07c24c6 100644
--- a/package/gnupg/Config.in
+++ b/package/gnupg/Config.in
@@ -15,6 +15,11 @@ config BR2_PACKAGE_GNUPG
 
 if BR2_PACKAGE_GNUPG
 
+config BR2_PACKAGE_GNUPG_RSA
+	bool "RSA support"
+	help
+	  Support for RSA public key algorithm
+
 config BR2_PACKAGE_GNUPG_GPGV
 	bool "gpgv"
 	help
diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index f0c4b034c6..38604b5907 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -31,6 +31,12 @@ else
 GNUPG_CONF_OPT += --without-readline
 endif
 
+ifeq ($(BR2_PACKAGE_GNUPG_RSA),y)
+GNUPG_CONF_OPT += --enable-rsa
+else
+GNUPG_CONF_OPT += --disable-rsa
+endif
+
 ifneq ($(BR2_PACKAGE_GNUPG_GPGV),y)
 define GNUPG_REMOVE_GPGV
 	rm -f $(TARGET_DIR)/usr/bin/gpgv \

From 498ba363e0fcfa62bc7466feceaa044f90fec8ab Mon Sep 17 00:00:00 2001
From: Thierry Bultel <thierry.bultel@wanadoo.fr>
Date: Tue, 24 Sep 2013 17:45:52 +0200
Subject: [PATCH 6243/6849] package: add lesstif

This is a quite old thing, latest version is from 2009
but it is useful to applications based on xmotif.
It has been tested with buildroot on ARM/iMX6.

[Peter: pass --no-recursion to not error out in test/configure]
Signed-off-by Thierry Bultel <thierry.bultel@wanadoo.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in          |  1 +
 package/lesstif/Config.in  | 10 ++++++++++
 package/lesstif/lesstif.mk | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/lesstif/Config.in
 create mode 100644 package/lesstif/lesstif.mk

diff --git a/package/Config.in b/package/Config.in
index da10a2363f..9aa9d8117a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -500,6 +500,7 @@ source "package/harfbuzz/Config.in"
 source "package/imlib2/Config.in"
 source "package/jpeg/Config.in"
 source "package/lcms2/Config.in"
+source "package/lesstif/Config.in"
 source "package/libart/Config.in"
 source "package/libdmtx/Config.in"
 source "package/libdrm/Config.in"
diff --git a/package/lesstif/Config.in b/package/lesstif/Config.in
new file mode 100644
index 0000000000..3a999ead37
--- /dev/null
+++ b/package/lesstif/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LESSTIF
+	bool "lesstif"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_FREETYPE
+	help
+	  lesstif is the Hungry Programmers' version of OSF/Motif
+
+	  http://lesstif.sourceforge.net/
diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
new file mode 100644
index 0000000000..51151078c5
--- /dev/null
+++ b/package/lesstif/lesstif.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# lesstif
+#
+################################################################################
+LESSTIF_VERSION = 0.95.2
+LESSTIF_SOURCE  = lesstif-$(LESSTIF_VERSION).tar.bz2
+LESSTIF_SITE    = http://downloads.sourceforge.net/project/lesstif/lesstif/$(LESSTIF_VERSION)
+LESSTIF_INSTALL_STAGING = YES
+LESSTIF_DEPENDENCIES = \
+	xlib_libXt \
+	xlib_libXext \
+	freetype
+
+LESSTIF_CONF_OPT = \
+	--with-gnu-ld \
+	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
+	--enable-debug=no \
+	--enable-production=yes	\
+	--enable-build-tests=no \
+	--no-recursion
+
+# Reduces the buggy makefile to the smallest possible (and working) thing
+define LESSTIF_NOMAN2HTML
+	echo "all:" 	> $(@D)/doc/Makefile
+	echo "" 		>> $(@D)/doc/Makefile
+	echo "install:" >> $(@D)/doc/Makefile
+	echo "" 		>> $(@D)/doc/Makefile
+	echo "clean:" 	>> $(@D)/doc/Makefile
+endef
+
+# Prevents to copy ac_find_motif.m4 on target, it would else
+# be created at $(TARGET_DIR)/$(TOPDIR)/output/host/usr/share/aclocal/ac_find_motif.m4
+define LESSTIF_FIXACLOCAL
+	sed -i -e "/install-data-am: install-aclocalDATA/d" $(@D)/scripts/autoconf/Makefile
+endef
+
+LESSTIF_POST_CONFIGURE_HOOKS += LESSTIF_NOMAN2HTML
+LESSTIF_POST_CONFIGURE_HOOKS += LESSTIF_FIXACLOCAL
+
+$(eval $(autotools-package))

From c07f1ce0ec8a75aeed67c0991a10106e79f22323 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 30 Sep 2013 23:20:44 +0200
Subject: [PATCH 6244/6849] trace-cmd: fix largefile build problem

The source files of trace-cmd already define _LARGEFILE64_SOURCE, but
Buildroot passes it again on the build command line through CFLAGS,
which causes a build error. We fix this by filtering out our
definition of _LARGEFILE64_SOURCE from the CFLAGS before passing them
to the trace-cmd Makefile.

Fixes the warning visible at:

 http://autobuild.buildroot.net/results/1c4567a230940a5287d03e2a5c2c7afbdc64cd36/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/trace-cmd/trace-cmd.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index ada0306e3e..7a750f9ab3 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -11,9 +11,13 @@ TRACE_CMD_INSTALL_STAGING = YES
 TRACE_CMD_LICENSE = GPLv2 LGPLv2.1
 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
 
+# trace-cmd already defines _LARGEFILE64_SOURCE when necessary,
+# redefining it on the command line causes build problems.
+TRACE_CMD_CFLAGS=$(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) -D_GNU_SOURCE
+
 define TRACE_CMD_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
+		CFLAGS="$(TRACE_CMD_CFLAGS)" \
 		-C $(@D) all
 endef
 

From 3dfa23fcc2d54e75eb80d14fc2b0045a3a24c355 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 25 Sep 2013 16:00:57 +0100
Subject: [PATCH 6245/6849] glibc: Pass correct -mabi for MIPS

According to glibc-2.18/ports/sysdeps/mips/preconfigure,
if no -mabi was passed to CFLAGS, then it defaults to -mabi=n32.
This breaks o32 and n64 builds for MIPS64. Therefore, it is
necessary to append -mabi to CFLAGS.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glibc/glibc.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 4dd2e63204..68c4636c86 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -43,6 +43,16 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
 GLIBC_EXTRA_CFLAGS += -marm
 endif
 
+# MIPS64 defaults to n32 so pass the correct -mabi if
+# we are using a different ABI. OABI32 is also used
+# in MIPS so we pass -mabi=32 in this case as well
+# even though it's not strictly necessary.
+ifeq ($(BR2_MIPS_NABI64),y)
+GLIBC_EXTRA_CFLAGS += -mabi=64
+else ifeq ($(BR2_MIPS_OABI32),y)
+GLIBC_EXTRA_CFLAGS += -mabi=32
+endif
+
 # Even though we use the autotools-package infrastructure, we have to
 # override the default configure commands for several reasons:
 #

From 3b583a16c71689d252652602f7bef5eaa76a4a2e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 00:02:27 +0200
Subject: [PATCH 6246/6849] tremor: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tremor/tremor.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index 291a413c58..b1515c19d4 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -7,6 +7,8 @@
 TREMOR_SITE = http://svn.xiph.org/trunk/Tremor/
 TREMOR_SITE_METHOD = svn
 TREMOR_VERSION = 18153
+TREMOR_LICENSE = BSD-3c
+TREMOR_LICENSE_FILES = COPYING
 
 TREMOR_AUTORECONF = YES
 TREMOR_INSTALL_STAGING = YES

From 8e7840ca5abdda41a039a709467b5f97b88f8097 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 00:05:18 +0200
Subject: [PATCH 6247/6849] vorbis-tools: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vorbis-tools/vorbis-tools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk
index 56b1f944a9..464081e7ae 100644
--- a/package/vorbis-tools/vorbis-tools.mk
+++ b/package/vorbis-tools/vorbis-tools.mk
@@ -6,6 +6,8 @@
 
 VORBIS_TOOLS_VERSION = 1.4.0
 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis
+VORBIS_TOOLS_LICENSE = GPLv2
+VORBIS_TOOLS_LICENSE_FILES = COPYING
 VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl
 VORBIS_TOOLS_CONF_OPT = --program-transform-name=''
 

From f3af8a5b07fc3ca55cc80fd851d3d287bf5a95f0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 2 Oct 2013 09:47:14 +0800
Subject: [PATCH 6248/6849] setserial: bump to version 2.17-45.3

Bump to patchlevel 3 since 2 is gone upstream.
Also switch to use http://snapshot.debian.org/ instead of BR2_DEBIAN_MIRROR to
avoid disappearing packages.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/setserial/setserial.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index e6846b20ce..f8d0a4b5b3 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 SETSERIAL_VERSION            = 2.17
-SETSERIAL_PATCH              = setserial_2.17-45.2.diff.gz
+SETSERIAL_PATCH              = setserial_2.17-45.3.diff.gz
 SETSERIAL_SOURCE             = setserial_$(SETSERIAL_VERSION).orig.tar.gz
-SETSERIAL_SITE               = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/setserial/
+SETSERIAL_SITE               = http://snapshot.debian.org/archive/debian/20131001T214925Z/pool/main/s/setserial/
 
 define SETSERIAL_APPLY_DEBIAN_PATCHES
 	# Touching gorhack.h is needed for the Debian patch 18 to work

From bacb55a5d65b8fc36612c8fd40f6366e3e0e80b4 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 2 Oct 2013 13:49:36 +0800
Subject: [PATCH 6249/6849] nfs-utils: needs mmu

Fix below build error:

mountd-mountd.o: In function `main':
mountd.c:(.text+0x1264): undefined reference to `fork'
mountd.c:(.text+0x1320): undefined reference to `fork'
mountd-rmtab.o: In function `ha_callout':
rmtab.c:(.text+0xa8): undefined reference to `fork'
collect2: ld returned 1 exit status
make[3]: *** [mountd] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nfs-utils/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 8f61f2b51f..6ba2f704b3 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_NFS_UTILS
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork()
 	help
 	  The NFS Linux kernel server.
 	  Warning: We do not force largefile support on here on purpose.

From ebe764c790fa0d763b0346f021d768060c70d491 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 2 Oct 2013 13:50:54 +0800
Subject: [PATCH 6250/6849] lmbench: needs mmu

Fix below build error:

./tmp./bin/arm/lmbench.a(lib_timing.o): In function `benchmp':
lib_timing.c:(.text+0x34fc): undefined reference to `fork'
collect2: ld returned 1 exit status.
./bin/arm/lmbench.a(lib_tcp.o): In function `tcp_connect/'cc8Ta2C2.o: Inmake[2]:  function `*** [../bin/arm/bw_file_rd] Error 1
initialize':
lib_tcp.c:make[2]: (.text+0x208): warning: gethostbyname*** Waiting for unfinished jobs....
 is obsolescent, use: getnameinfo
bw_pipe.c(): (instead..text
/+tmp0x134/)cc5yg1Q2.o: :undefined In  referencefunction  to`server_main `'fork:
'bw_tcp.c
.:.(./textbin+/0x298arm)/:lmbench.a (undefinedlib_timing.o )reference:  Into  function`fork '`
benchmp/'tmp:/
cc5yg1Q2.olib_timing.c:: (In.text function+0x34fc `)main: 'undefined:
 bw_tcp.creference: (to. text`fork+0x370'
)collect2: : undefined reference to `fork'
../bin/armld returned 1 exit status/lmbench.a(lib_timing.o): In function
`benchmp':
lib_timing.c:(.text+0x34fc): undefined reference to `fork'
collect2: ld returned 1 exit status
make[2]: *** [../bin/arm/bw_pipe] Error 1
make[2]: *** [../bin/arm/bw_tcp] Error 1
../bin/arm/lmbench.a(lib_timing.o): In function `benchmp':
lib_timing.c:(.text+0x34fc): undefined reference to `fork'
collect2: ld returned 1 exit status
make[2]: *** [../bin/arm/bw_mmap_rd] Error 1
../bin/arm/lmbench.a(lib_timing.o): In function `benchmp':
lib_timing.c:(.text+0x34fc): undefined reference to `fork'
collect2: ld returned 1 exit status
make[2]: *** [../bin/arm/bw_mem] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lmbench/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index c7b656c037..d0a23ad210 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LMBENCH
 	bool "lmbench"
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_USE_MMU # fork()
 	help
 	  LMbench is a suite of simple, portable,
 	  ANSI/C microbenchmarks for UNIX/POSIX.

From 63682ae471856c93a60b8173bf929006493d374d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 2 Oct 2013 13:51:55 +0800
Subject: [PATCH 6251/6849] netkitbase: needs mmu

Fix below build error:

/opt/test/buildroot/buildroot/output/host/usr/bin/arm-buildroot-uclinux-uclibcgnueabi-gcc  inetd.o servtab.o builtins.o sig.o daemon.o setproctitle.o mysleep.o  -o inetd
servtab.o: In function `loadconfigfile.clone.0':
servtab.c:(.text+0x98c): warning: gethostbyname is obsolescent, use getnameinfo() instead.
inetd.o: In function `main':
inetd.c:(.text+0x8a4): undefined reference to `fork'
inetd.c:(.text+0x974): undefined reference to `fork'
daemon.o: In function `daemon':
daemon.c:(.text+0xc): undefined reference to `fork'
collect2: ld returned 1 exit status
make[2]: *** [inetd] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netkitbase/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index dd9166ce14..40833ad3a0 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NETKITBASE
 	bool "netkitbase"
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_USE_MMU # fork()
 	depends on BR2_DEPRECATED
 	help
 	  Old-style inetd.

From 62802d24c07b0b5c5c4b9f5775ed49463c2a6891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 2 Oct 2013 09:32:02 +0300
Subject: [PATCH 6252/6849] qt5: give numbers to patch files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...01-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch} | 0
 ...5base-mkspecs-files.patch => qt5base-0002-mkspecs-files.patch} | 0
 ...5base-uclibc-no-lfs.patch => qt5base-0003-uclibc-no-lfs.patch} | 0
 ...atch => qt5jsbackend-0001-dont-import-bz2-python-module.patch} | 0
 ...ackend-fix-uclibc.patch => qt5jsbackend-0002-fix-uclibc.patch} | 0
 ...egl-includepath.patch => qt5webkit-0001-egl-includepath.patch} | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename package/qt5/qt5base/{qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch => qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch} (100%)
 rename package/qt5/qt5base/{qt5base-mkspecs-files.patch => qt5base-0002-mkspecs-files.patch} (100%)
 rename package/qt5/qt5base/{qt5base-uclibc-no-lfs.patch => qt5base-0003-uclibc-no-lfs.patch} (100%)
 rename package/qt5/qt5jsbackend/{qt5jsbackend-dont-import-bz2-python-module.patch => qt5jsbackend-0001-dont-import-bz2-python-module.patch} (100%)
 rename package/qt5/qt5jsbackend/{qt5jsbackend-fix-uclibc.patch => qt5jsbackend-0002-fix-uclibc.patch} (100%)
 rename package/qt5/qt5webkit/{qt5webkit-egl-includepath.patch => qt5webkit-0001-egl-includepath.patch} (100%)

diff --git a/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
similarity index 100%
rename from package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
rename to package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
diff --git a/package/qt5/qt5base/qt5base-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
similarity index 100%
rename from package/qt5/qt5base/qt5base-mkspecs-files.patch
rename to package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
diff --git a/package/qt5/qt5base/qt5base-uclibc-no-lfs.patch b/package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch
similarity index 100%
rename from package/qt5/qt5base/qt5base-uclibc-no-lfs.patch
rename to package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0001-dont-import-bz2-python-module.patch
similarity index 100%
rename from package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch
rename to package/qt5/qt5jsbackend/qt5jsbackend-0001-dont-import-bz2-python-module.patch
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
similarity index 100%
rename from package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
rename to package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
diff --git a/package/qt5/qt5webkit/qt5webkit-egl-includepath.patch b/package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch
similarity index 100%
rename from package/qt5/qt5webkit/qt5webkit-egl-includepath.patch
rename to package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch

From 43a840463bf93700a2066b2cf858769562444d3f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 09:50:12 +0200
Subject: [PATCH 6253/6849] vala: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vala/vala.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index aed02fa4a4..8dc887b317 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -9,6 +9,8 @@ VALA_VERSION_MINOR = 1
 VALA_VERSION = $(VALA_VERSION_MAJOR).$(VALA_VERSION_MINOR)
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
+VALA_LICENSE = LGPLv2.1+
+VALA_LICENSE_FILES = COPYING
 
 VALA_DEPENDENCIES = host-flex host-bison libglib2 \
 		$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)

From b3bd7ad966cdf077d49aca06327b077231f0134d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 09:53:19 +0200
Subject: [PATCH 6254/6849] sdl_sound: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sdl_sound/sdl_sound.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index ae351dc32c..8ae625ee56 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -7,6 +7,8 @@
 SDL_SOUND_VERSION = 1.0.3
 SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz
 SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads/
+SDL_SOUND_LICENSE = LGPLv2.1+
+SDL_SOUND_LICENSE_FILES = COPYING
 SDL_SOUND_INSTALL_STAGING = YES
 SDL_SOUND_DEPENDENCIES = sdl
 

From 5deb7ae303c13c61fd7fd4dce848024a8e9d4d79 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 10:00:14 +0200
Subject: [PATCH 6255/6849] jamvm: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/jamvm/jamvm.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk
index 34f1b9f0a4..53455c48a0 100644
--- a/package/jamvm/jamvm.mk
+++ b/package/jamvm/jamvm.mk
@@ -6,6 +6,8 @@
 
 JAMVM_VERSION = 1.5.4
 JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION)
+JAMVM_LICENSE = GPLv2+
+JAMVM_LICENSE_FILES = COPYING
 JAMVM_DEPENDENCIES = zlib classpath
 # int inlining seems to crash jamvm, don't build shared version of internal lib
 JAMVM_CONF_OPT = \

From b408ca9eda9714c9e927ec80d32eacf3677c7b79 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 13:52:33 +0200
Subject: [PATCH 6256/6849] linux-headers: bump 3.{0,4,10,11}.x stable versions

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.97 => 3.0.98}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.97/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.98/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.97/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.98/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 1ebfaad70b..a0deb34cf2 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,17 +76,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.97"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.98"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.63"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.64"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.13"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.2"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.14"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.3"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From f467debd5cc7346f172db531db97dde1fef38da2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 13:53:27 +0200
Subject: [PATCH 6257/6849] linux: bump 3.11.x stable version

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 201bcef299..9eb2268060 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11.2"
+	bool "3.11.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11.3" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 85571429f732a54788e266e7f06a6f9d62f30d20 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Oct 2013 09:28:44 -0300
Subject: [PATCH 6258/6849] m4: bump to version 1.4.17

Remove MB_CUR_MAX patch since it's unnecessary/insufficent for non-wchar
compilation since c29e01e61e5754c446eb524f65b01195cf25cbcc

no-gets patch unnecessary also since it's been fixed.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/m4/m4-1.4.16-001-MB_CUR_MAX.patch | 13 --------
 package/m4/m4-1.4.16-no-gets.patch        | 38 -----------------------
 package/m4/m4.mk                          |  2 +-
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
 delete mode 100644 package/m4/m4-1.4.16-no-gets.patch

diff --git a/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch b/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
deleted file mode 100644
index fce36731b3..0000000000
--- a/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4-1.4.8.orig/lib/regcomp.c	2006-09-24 06:28:37.000000000 +0200
-+++ m4-1.4.8/lib/regcomp.c	2007-01-06 20:53:10.000000000 +0100
-@@ -871,6 +871,10 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
-   dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
-   dfa->state_hash_mask = table_size - 1;
- 
-+#ifndef MB_CUR_MAX
-+#define MB_CUR_MAX (0)
-+#endif
-+
-   dfa->mb_cur_max = MB_CUR_MAX;
- #ifdef _LIBC
-   if (dfa->mb_cur_max == 6
diff --git a/package/m4/m4-1.4.16-no-gets.patch b/package/m4/m4-1.4.16-no-gets.patch
deleted file mode 100644
index a0573776b6..0000000000
--- a/package/m4/m4-1.4.16-no-gets.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Since the 2.16 release of the glibc, 'gets' is not any more defined in the gnulib.
-No m4 version synchronized with gnulib since [1] has been released yet.
-
-This patch avoids the following error occurs when building m4 <=1.4.16 on host using
-a glibc >=2.16:
-
-make[4]: Entering directory `/opt/buildroot/output/build/host-m4-1.4.16/lib'
-/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT gl_avltree_oset.o -MD -MP -MF .deps/gl_avltree_oset.Tpo -c -o gl_avltree_oset.o gl_avltree_oset.c
-/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT c-ctype.o -MD -MP -MF .deps/c-ctype.Tpo -c -o c-ctype.o c-ctype.c
-/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT c-stack.o -MD -MP -MF .deps/c-stack.Tpo -c -o c-stack.o c-stack.c
-/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT clean-temp.o -MD -MP -MF .deps/clean-temp.Tpo -c -o clean-temp.o clean-temp.c
-mv -f .deps/c-ctype.Tpo .deps/c-ctype.Po
-/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT close-hook.o -MD -MP -MF .deps/close-hook.Tpo -c -o close-hook.o close-hook.c
-In file included from clean-temp.h:22:0,
-                 from clean-temp.c:23:
-./stdio.h:477:20: error 'gets' undeclared here (not in a function)
-make[4]: *** [clean-temp.o] Error 1
-
-References:
-[1] http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=66712c23388e93e5c518ebc8515140fa0c807348
-[2] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?diff_format=h&revision=1.1&view=markup
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
-diff -purN host-m4-1.4.16.orig/lib/stdio.in.h host-m4-1.4.16/lib/stdio.in.h
---- host-m4-1.4.16.orig/lib/stdio.in.h	2012-07-21 19:11:40.196541826 +0200
-+++ host-m4-1.4.16/lib/stdio.in.h	2012-07-21 20:46:05.405850751 +0200
-@@ -162,7 +162,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index d06d2c947d..26007287b4 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-M4_VERSION = 1.4.16
+M4_VERSION = 1.4.17
 M4_SOURCE = m4-$(M4_VERSION).tar.xz
 M4_SITE = $(BR2_GNU_MIRROR)/m4
 M4_LICENSE = GPLv3+

From d268bcc4d6e571a0be0ecd38f41ab674c39ac226 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Oct 2013 09:28:45 -0300
Subject: [PATCH 6259/6849] bison: bump to version 3.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/bison/bison.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 1fbbf91029..47a75601de 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BISON_VERSION = 2.7.1
+BISON_VERSION = 3.0
 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+

From 574ab8ce9a08d751f8f1d615ec550e6f162f0077 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Oct 2013 09:28:46 -0300
Subject: [PATCH 6260/6849] gmp: bump to version 5.1.3

Also switch to http gnu site instead of ftp.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gmp/gmp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 86ed33c582..d970545162 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GMP_VERSION = 5.1.2
-GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION)
+GMP_VERSION = 5.1.3
+GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz
 GMP_INSTALL_STAGING = YES
 GMP_LICENSE = LGPLv3+

From ff7191c12e88b044848f6655f7015335235bdc7a Mon Sep 17 00:00:00 2001
From: Clayton Shotwell <clshotwe@rockwellcollins.com>
Date: Wed, 2 Oct 2013 07:46:04 -0500
Subject: [PATCH 6261/6849] libcgroup: new package

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in              |  1 +
 package/libcgroup/Config.in    | 13 +++++++++++++
 package/libcgroup/libcgroup.mk | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 package/libcgroup/Config.in
 create mode 100644 package/libcgroup/libcgroup.mk

diff --git a/package/Config.in b/package/Config.in
index 9aa9d8117a..0ea814a54c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -662,6 +662,7 @@ source "package/libatomic_ops/Config.in"
 source "package/libbsd/Config.in"
 source "package/libcap/Config.in"
 source "package/libcap-ng/Config.in"
+source "package/libcgroup/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
new file mode 100644
index 0000000000..0f5c09760d
--- /dev/null
+++ b/package/libcgroup/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBCGROUP
+	bool "libcgroup"
+	depends on BR2_INSTALL_LIBSTDCPP
+	# libcgroup uses <fts.h> which is not included by default in uClibc
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	help
+	  libcgroup is a library that abstracts the control
+	  group file system in Linux.
+
+	  http://libcg.sourceforge.net/
+
+comment "libcgroup requires a glibc toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
new file mode 100644
index 0000000000..c2392e0b8c
--- /dev/null
+++ b/package/libcgroup/libcgroup.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# libcgroup
+#
+################################################################################
+
+LIBCGROUP_VERSION = 0.38
+LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
+LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v.038
+LIBCGROUP_LICENSE = LGPLv2.1
+LIBCGROUP_LICENSE_FILES = COPYING
+
+LIBCGROUP_INSTALL_STAGING = YES
+
+# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h
+# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992
+# for more information.
+LIBCGROUP_CONF_ENV = \
+	CXXFLAGS+="-U_FILE_OFFSET_BITS" \
+	CFLAGS+="-U_FILE_OFFSET_BITS"
+
+LIBCGROUP_CONF_OPT = \
+	--disable-tools \
+	--disable-daemon \
+	--disable-initscript-install
+
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+	LIBCGROUP_DEPENDENCIES += linux-pam
+	LIBCGROUP_CONF_OPT += --enable-pam
+else
+	LIBCGROUP_CONF_OPT += --disable-pam
+endif
+
+$(eval $(autotools-package))

From 1535cb520525bb4d2c4d188d4e99809fef17df64 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 2 Oct 2013 17:21:32 -0300
Subject: [PATCH 6262/6849] bison: fix docs build breakage

Building docs running the binary itself to see if docs need to be
changed is somewhat skippy. Disable it. Fixes:
http://autobuild.buildroot.net/results/e8a/e8a960f38e66f31355af733e510002d45052b541/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/bison/bison-01-no-docs-regen.patch | 53 ++++++++++++++++++++++
 package/bison/bison.mk                     |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 package/bison/bison-01-no-docs-regen.patch

diff --git a/package/bison/bison-01-no-docs-regen.patch b/package/bison/bison-01-no-docs-regen.patch
new file mode 100644
index 0000000000..7c375d657c
--- /dev/null
+++ b/package/bison/bison-01-no-docs-regen.patch
@@ -0,0 +1,53 @@
+bison regenerates the docs to see if they changed which requires running
+the recently built bison. This obviously doesn't work for cross compiles
+hence breaks for many target bison builds.
+Just disable it.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura bison-3.0.orig/doc/local.mk bison-3.0/doc/local.mk
+--- bison-3.0.orig/doc/local.mk	2013-10-02 16:52:48.711890121 -0300
++++ bison-3.0/doc/local.mk	2013-10-02 17:14:59.329341143 -0300
+@@ -37,15 +37,6 @@
+ CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
+ CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi
+ $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
+-# Create $@~ which is the previous contents.  Don't use 'mv' here so
+-# that even if we are interrupted, the file is still available for
+-# diff in the next run.  Note that $@ might not exist yet.
+-	$(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
+-	$(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
+-	$(AM_V_at)src/bison$(EXEEXT) --help |				 \
+-	  $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
+-	$(AM_V_at)diff -u $@~ $@.tmp || true
+-	$(AM_V_at)mv $@.tmp $@
+ MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
+ 
+ ## ---------- ##
+@@ -86,9 +77,6 @@
+ EXTRA_DIST += $(top_srcdir)/doc/bison.help
+ MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
+ $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
+-	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
+-	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
+-	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
+ 
+ 
+ ## ----------- ##
+@@ -106,16 +94,6 @@
+ 
+ # Depend on configure to get version number changes.
+ $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
+-	$(AM_V_GEN)$(HELP2MAN)			\
+-	    --include=$(top_srcdir)/doc/bison.x	\
+-	    --output=$@.t src/bison$(EXEEXT)
+-	$(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&	 \
+-	   $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
+-	  touch $@;							 \
+-	else								 \
+-	  mv $@.t $@;							 \
+-	fi
+-	$(AM_V_at)rm -f $@*.t
+ 
+ nodist_man_MANS = doc/yacc.1
+ 
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 47a75601de..1bead3916a 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -11,6 +11,7 @@ BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING
 BISON_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 BISON_DEPENDENCIES = m4
+BISON_AUTORECONF = YES
 
 define BISON_DISABLE_EXAMPLES
 	echo 'all install:' > $(@D)/examples/Makefile

From bb33517511f5c6e173bfdb0d84bcb6e21240b387 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 2 Oct 2013 22:06:40 +0200
Subject: [PATCH 6263/6849] make clean: improve when no .config present

The 'make clean' recipe is using variables that are not defined without
.config file, causing only a partial cleanup when the .config file is
accidentally deleted.

This patch moves those variables that do not depend on values from .config
outside the BR2_HAVE_DOT_CONFIG check, so that 'make clean' is much more
similar with and without .config.

Since HOST_DIR is determined from BR2_HOST_DIR in .config, the host
directory cannot be cleaned correctly without making assumptions, if no
.config is present.  However, to cover most people's use cases, we assume
the default value of $(BASE_DIR)/host in this specific case.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index cd3dc0d0c5..c170ca2593 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,30 @@ EXTRAMAKEARGS = O=$(O)
 NEED_WRAPPER=y
 endif
 
+# bash prints the name of the directory on 'cd <dir>' if CDPATH is
+# set, so unset it here to not cause problems. Notice that the export
+# line doesn't affect the environment of $(shell ..) calls, so
+# explictly throw away any output from 'cd' here.
+export CDPATH:=
+BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
+$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
+
+BUILD_DIR:=$(BASE_DIR)/build
+STAMP_DIR:=$(BASE_DIR)/stamps
+BINARIES_DIR:=$(BASE_DIR)/images
+TARGET_DIR:=$(BASE_DIR)/target
+# initial definition so that 'make clean' works for most users, even without
+# .config. HOST_DIR will be overwritten later when .config is included.
+HOST_DIR:=$(BASE_DIR)/host
+
+LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
+REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
+LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses
+LEGAL_MANIFEST_CSV=$(LEGAL_INFO_DIR)/manifest.csv
+LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt
+LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
+LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
+
 BUILDROOT_CONFIG=$(CONFIG_DIR)/.config
 
 # Pull in the user's configuration file
@@ -184,17 +208,6 @@ unexport DESTDIR
 # Causes breakage with packages that needs host-ruby
 unexport RUBYOPT
 
-# bash prints the name of the directory on 'cd <dir>' if CDPATH is
-# set, so unset it here to not cause problems. Notice that the export
-# line doesn't affect the environment of $(shell ..) calls, so
-# explictly throw away any output from 'cd' here.
-export CDPATH:=
-BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
-$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
-
-BUILD_DIR:=$(BASE_DIR)/build
-
-
 ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 ################################################################################
@@ -262,21 +275,8 @@ HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 # locales to generate
 GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
 
-# stamp (dependency) files go here
-STAMP_DIR:=$(BASE_DIR)/stamps
-
-BINARIES_DIR:=$(BASE_DIR)/images
-TARGET_DIR:=$(BASE_DIR)/target
 TARGET_SKELETON=$(TOPDIR)/system/skeleton
 
-LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
-REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
-LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses
-LEGAL_MANIFEST_CSV=$(LEGAL_INFO_DIR)/manifest.csv
-LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt
-LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
-LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
-
 # Location of a file giving a big fat warning that output/target
 # should not be used as the root filesystem.
 TARGET_DIR_WARNING_FILE=$(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM

From 3d19b7ef598f3534b46cf0746a81bc437579127c Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Tue, 1 Oct 2013 11:59:31 +0200
Subject: [PATCH 6264/6849] zsh: new package

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in     |  1 +
 package/zsh/Config.in | 10 ++++++++++
 package/zsh/zsh.mk    | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/zsh/Config.in
 create mode 100644 package/zsh/zsh.mk

diff --git a/package/Config.in b/package/Config.in
index 0ea814a54c..363113f8a3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -923,6 +923,7 @@ source "package/at/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bash/Config.in"
 source "package/dash/Config.in"
+source "package/zsh/Config.in"
 endif
 source "package/dialog/Config.in"
 source "package/dtach/Config.in"
diff --git a/package/zsh/Config.in b/package/zsh/Config.in
new file mode 100644
index 0000000000..fd63aa9190
--- /dev/null
+++ b/package/zsh/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_ZSH
+	bool "zsh"
+	select BR2_PACKAGE_NCURSES
+	help
+	  zsh is a shell designed for interactive use, although it is also
+	  a powerful scripting language. Many of the useful features of bash,
+	  ksh, and tcsh were incorporated into zsh; many original features
+	  were added.
+
+	  http://zsh.sourceforge.net/
diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk
new file mode 100644
index 0000000000..ca865a42c3
--- /dev/null
+++ b/package/zsh/zsh.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# zsh
+#
+################################################################################
+
+ZSH_VERSION=5.0.2
+ZSH_SITE=http://downloads.sourceforge.net/project/zsh/zsh/$(ZSH_VERSION)
+ZSH_LICENSE = MIT-like
+ZSH_LICENSE_FILES = LICENCE
+
+ZSH_DEPENDENCIES = ncurses
+
+$(eval $(autotools-package))

From 6f21eefbe98c8c1f367aebbe013ebe549a5a9fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Thu, 19 Sep 2013 10:01:43 +0300
Subject: [PATCH 6265/6849] qt5base: fix build when egl headers need a
 definition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The build with gpu-viv-bin-mx6q libraries was broken since it wasn't
using "-DEGL_API_FB=1" flag which is found in egl.pc.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../qt5/qt5base/qt5base-0004-egl-cflags.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/qt5/qt5base/qt5base-0004-egl-cflags.patch

diff --git a/package/qt5/qt5base/qt5base-0004-egl-cflags.patch b/package/qt5/qt5base/qt5base-0004-egl-cflags.patch
new file mode 100644
index 0000000000..bff82a8080
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0004-egl-cflags.patch
@@ -0,0 +1,28 @@
+egl.prf: Append egl CFLAGS to QMAKE_C[XX]FLAGS
+
+Projects including egl in their config (e.g. with CONFIG += egl) cannot get
+egl CFLAGS without this.
+
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+
+--- a/configure
++++ b/configure
+@@ -4934,6 +4934,7 @@
+         QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
+         QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
+         QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
++        QMakeVar set QMAKE_CFLAGS_EGL "$QMAKE_CFLAGS_EGL"
+     fi       # detect EGL support
+     if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
+         CFG_EGL=yes
+--- a/mkspecs/features/egl.prf
++++ b/mkspecs/features/egl.prf
+@@ -14,6 +14,8 @@
+ } else {
+     INCLUDEPATH += $$QMAKE_INCDIR_EGL
+     LIBS_PRIVATE += $$QMAKE_LIBS_EGL
++    QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
++    QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL
+     LIBS += $$QMAKE_LFLAGS_EGL
+     for(p, QMAKE_LIBDIR_EGL) {
+         exists($$p):LIBS_PRIVATE += -L$$p

From 97c687000a3f987440cc73bcfa26ae30bb9af28f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 2 Oct 2013 23:37:58 +0200
Subject: [PATCH 6266/6849] pkg-autotools.mk: default host AUTORECONF{,_OPT} to
 the target values

When we have patches touching configure.ac and hence need to set
<pkg>_AUTORECONF = YES we also have to remember to set
HOST_<pkg>_AUTORECONF = YES if we build both host and target versions,
which is often forgotten (latest case was bison).

Fix it by making the host versions of _AUTORECONF and _AUTORECONF_OPT
default to whatever the target versions are set to, similar to how we
handle a number of the other variables.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pkg-autotools.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index b0edddebc7..9523529824 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -70,12 +70,19 @@ ifndef $(2)_MAKE
  endif
 endif
 
+ifndef $(2)_AUTORECONF
+ ifdef $(3)_AUTORECONF
+  $(2)_AUTORECONF = $($(3)_AUTORECONF)
+ else
+  $(2)_AUTORECONF ?= NO
+ endif
+endif
+
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
-$(2)_AUTORECONF			?= NO
-$(2)_AUTORECONF_OPT		?=
+$(2)_AUTORECONF_OPT		?= $($(3)_AUTORECONF_OPT)
 $(2)_INSTALL_OPT                ?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install

From dd7981bfd22b1c0af8a0fd3c12673294f66eadb5 Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Tue, 1 Oct 2013 15:34:19 -0500
Subject: [PATCH 6267/6849] omniorb: cleanup autobuild failure, CFLAGS issue

Fixed:
http://autobuild.buildroot.net/results/a08baf8821e3ee1fb9c36c8f74c4ced466af167b/
http://autobuild.buildroot.net/results/f0c7379c1f405385d3a64c0349c3d9565065e8a7/
http://autobuild.buildroot.net/results/c3de25ca52fdb8ffda7472cf9f7b64514954cbb1/

Change Log:
The target CFLAGS were getting mixed in during a manual build of some
omniorb pkg tools that could be viewed as host tools.
This manual build was a dirty workaround and created some bad
cornercases. So I converted the package over to actually using the
host pkg build and removed the need for a patch and custom mods in the build.

Also there wasn't a dependency on the target having python, just
host-python for performing the initial build.  So depends were adjusted
accordingly. If python bindings are required, they can be found in a different
package called omniORBpy.  The omniORB package only uses python for
the build process.

Fixed a bug with long double support.  Currently leaving it disabled
as most targets won't use it.  This allows greater toolchain compatibility.

Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/omniorb/omniorb.mk | 53 +++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index 8a41dc7ef6..490ff93c6d 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -10,37 +10,32 @@ OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2
 OMNIORB_INSTALL_STAGING = YES
 OMNIORB_LICENSE = GPL2+ LGPLv2.1+
 OMNIORB_LICENSE_FILES = COPYING COPYING.LIB
-# Required for internal code generation scripts
-OMNIORB_DEPENDENCIES = host-python
+OMNIORB_DEPENDENCIES = host-omniorb
+HOST_OMNIORB_DEPENDENCIES = host-python
+OMNIORB_INSTALL_TARGET = YES
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-	OMNIORB_DEPENDENCIES += python
-	OMNIORB_CONF_OPT += --enable-python-bindings
-else
-	OMNIORB_CONF_OPT += --disable-python-bindings
-endif
+# Defaulting long double support to a safe option for the
+# mix of embedded targets, this could later be automated
+# based on checking the capability of the cross toolchain
+# for "__LONG_DOUBLE_128__".  Currently the host and target
+# need to match because of the code generation done by the
+# host tools during the target compile (ie headers generated
+# on host are used in target build).
+OMNIORB_CONF_OPT += --disable-longdouble
+HOST_OMNIORB_CONF_OPT += --disable-longdouble
 
-# omniORB is currently not cross-compile friendly and has some assumptions
-# where a couple host tools are built in place and then used during the
-# build.  The tools generate code from the IDL description language, which
-# is then built into the cross compiled OMNIORB application.
-# So this first hook builds the tools required for the host side
-# generation of code. Then the second hook cleans up before the install.
-define OMNIORB_BUILD_TOOLS
-	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
-		-C $(@D)/src/tool export
+# omniORB is not completely cross-compile friendly and has some
+# assumptions where a couple host tools must be built and then
+# used by the target build.  The host tools generate code from
+# the IDL description language, which is then built into the
+# cross compiled target OMNIORB application.
+define OMNIORB_ADJUST_TOOLDIR
+	# Point to the host folder to get HOST_OMNIORB tools
+	$(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/usr/bin:g' $(@D)/mk/beforeauto.mk
+	# Disables OMNIORB tool building
+	echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk
 endef
-OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_BUILD_TOOLS
-
-define OMNIORB_CLEAN_TOOLS
-	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
-		-C $(@D)/src/tool clean
-endef
-OMNIORB_POST_BUILD_HOOKS += OMNIORB_CLEAN_TOOLS
-
-define OMNIORB_FIXUP_FILE_PATHS_HOOK
-	$(SED) "s:$(HOST_DIR)/usr:/usr:g" $(STAGING_DIR)/usr/bin/omniidl
-endef
-OMNIORB_POST_INSTALL_STAGING_HOOKS += OMNIORB_FIXUP_FILE_PATHS_HOOK
+OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

From b7c5625e0acfd62f34dd45f91ea0ea3150c2e8e3 Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Tue, 1 Oct 2013 15:01:08 -0500
Subject: [PATCH 6268/6849] python-ipy: new package

Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in                |  1 +
 package/python-ipy/Config.in     |  8 ++++++++
 package/python-ipy/python-ipy.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/python-ipy/Config.in
 create mode 100644 package/python-ipy/python-ipy.mk

diff --git a/package/Config.in b/package/Config.in
index 363113f8a3..b7fdb89964 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -390,6 +390,7 @@ source "package/python-bottle/Config.in"
 source "package/python-crc16/Config.in"
 source "package/python-dpkt/Config.in"
 source "package/python-id3/Config.in"
+source "package/python-ipy/Config.in"
 source "package/python-mad/Config.in"
 source "package/python-meld3/Config.in"
 source "package/python-netifaces/Config.in"
diff --git a/package/python-ipy/Config.in b/package/python-ipy/Config.in
new file mode 100644
index 0000000000..bead932da8
--- /dev/null
+++ b/package/python-ipy/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_IPY
+	bool "python-ipy"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  IPy - class and tools for handling of IPv4 and
+	  IPv6 addresses and networks.
+
+	  https://github.com/haypo/python-ipy/
diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
new file mode 100644
index 0000000000..f3fb7c1cde
--- /dev/null
+++ b/package/python-ipy/python-ipy.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# python-ipy
+#
+################################################################################
+
+PYTHON_IPY_VERSION = 0.75-0-g58006fb
+PYTHON_IPY_SOURCE  = haypo-python-ipy-IPy-$(PYTHON_IPY_VERSION).tar.gz
+PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/IPy-0.75
+PYTHON_IPY_DEPENDENCIES = host-python python
+PYTHON_IPY_LICENSE = BSD-3c
+PYTHON_IPY_LICENSE_FILES = COPYING
+
+define PYTHON_IPY_BUILD_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(HOST_DIR)/usr/bin/python setup.py build_ext \
+		--include-dirs=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \
+	)
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
+define PYTHON_IPY_INSTALL_TARGET_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))

From 05b442a62886f9a6efe5a8a5d025e11d72e8656c Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 3 Oct 2013 09:20:07 +0800
Subject: [PATCH 6269/6849] zsh: needs mmu

Fix below build error if !BR2_USE_MMU:

exec.o: In function `zfork':
exec.c:(.text+0x150c): undefined reference to `fork'
collect2: ld returned 1 exit status
make[2]: *** [zsh] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/zsh/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/zsh/Config.in b/package/zsh/Config.in
index fd63aa9190..6853249b98 100644
--- a/package/zsh/Config.in
+++ b/package/zsh/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ZSH
 	bool "zsh"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
 	  zsh is a shell designed for interactive use, although it is also

From 3b901a16634d5bc66f14df87a04310a382c6e8e0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 3 Oct 2013 10:13:32 +0800
Subject: [PATCH 6270/6849] nano: needs mmu

Fix below build error if !BR2_USE_MMU:

text.o: In function `execute_command':
text.c:(.text+0x7f8): undefined reference to `fork'
text.o: In function `do_int_speller':
text.c:(.text+0x3480): undefined reference to `fork'
text.c:(.text+0x34f4): undefined reference to `fork'
text.c:(.text+0x3568): undefined reference to `fork'
text.o: In function `do_alt_speller':
text.c:(.text+0x3914): undefined reference to `fork'
collect2: ld returned 1 exit status
make[3]: *** [nano] Error 1

[Peter: fork() only in full version, so force tiny for !mmu]
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nano/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nano/Config.in b/package/nano/Config.in
index ef7f69df36..9546fe7813 100644
--- a/package/nano/Config.in
+++ b/package/nano/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_NANO
 	bool "nano"
+	# full version uses fork()
+	select BR2_PACKAGE_NANO_TINY if !BR2_USE_MMU
 	select BR2_PACKAGE_NCURSES
 	help
 	  A nice ncurses-based editor. Started out as a clone of pico.

From e0a487da006c55203c3e700d1c4f73df8e308b26 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 3 Oct 2013 13:32:54 +0800
Subject: [PATCH 6271/6849] radvd: bump to version 1.9.5

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/radvd/radvd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index aed6f0105a..c1c4e41ccd 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RADVD_VERSION = 1.9.3
+RADVD_VERSION = 1.9.5
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = host-bison flex libdaemon host-flex host-pkgconf
 

From 755fe7997664a5d8b9e0188361ab78e780abb023 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 3 Oct 2013 13:49:05 +0800
Subject: [PATCH 6272/6849] rsync: bump to version 3.1.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rsync/rsync.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 94c2e75c6b..30748b5be4 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RSYNC_VERSION = 3.0.9
+RSYNC_VERSION = 3.1.0
 RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
 RSYNC_LICENSE = GPLv3+

From bdabe4cbcc1ed58a5db30e3aa01c0ff697d68b8d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 3 Oct 2013 15:43:09 +0800
Subject: [PATCH 6273/6849] sqlite: bump to version 3.8.0.2

Also drop sqlite-dont-force-posix-fallocate.patch because it is fixed upstream.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../sqlite-dont-force-posix-fallocate.patch   | 23 -------------------
 package/sqlite/sqlite.mk                      |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 package/sqlite/sqlite-dont-force-posix-fallocate.patch

diff --git a/package/sqlite/sqlite-dont-force-posix-fallocate.patch b/package/sqlite/sqlite-dont-force-posix-fallocate.patch
deleted file mode 100644
index 118001bfd0..0000000000
--- a/package/sqlite/sqlite-dont-force-posix-fallocate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This is checked by configure and passed as a define directive when building.
-There's no need to check again and potentially override a failed check
-(uClibc <= 0.9.33.2 for example lacks posix_fallocate).
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura sqlite-autoconf-3071700.orig/sqlite3.c sqlite-autoconf-3071700/sqlite3.c
---- sqlite-autoconf-3071700.orig/sqlite3.c	2013-05-23 03:17:27.170459400 -0300
-+++ sqlite-autoconf-3071700/sqlite3.c	2013-05-23 03:25:01.839227616 -0300
-@@ -22931,13 +22931,6 @@
- */
- #if SQLITE_OS_UNIX              /* This file is used on unix only */
-
--/* Use posix_fallocate() if it is available
--*/
--#if !defined(HAVE_POSIX_FALLOCATE) \
--      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
--# define HAVE_POSIX_FALLOCATE 1
--#endif
--
- /*
- ** There are various methods for file locking used for concurrency
- ** control:
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index d474619def..5fc1e9e923 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SQLITE_VERSION = 3071700
+SQLITE_VERSION = 3080002
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org/2013
 SQLITE_LICENSE = Public domain

From e9eb2a7e20e3c5f0a236d6776f82a5659bac4074 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 3 Oct 2013 18:29:29 +0200
Subject: [PATCH 6274/6849] xz: bump to version 5.0.5

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/xz/xz.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 98fca3a2ff..af90f05919 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XZ_VERSION = 5.0.4
+XZ_VERSION = 5.0.5
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz/
 XZ_INSTALL_STAGING = YES

From d60e9e3f2a335f32728aabdc58a6476541aee7e8 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 3 Oct 2013 18:32:18 +0200
Subject: [PATCH 6275/6849] empty: bump to version 0.6.19b

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/empty/empty.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index 4294777647..3339ff6b9a 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EMPTY_VERSION = 0.6.18b
+EMPTY_VERSION = 0.6.19b
 EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
 EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
 EMPTY_LICENSE = BSD-3c

From 4c478de2e76ffc1d0a6dc413475307fd44a0a595 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 4 Oct 2013 11:51:44 +0800
Subject: [PATCH 6276/6849] berkeleydb: bump to version 6.0.20

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/berkeleydb/berkeleydb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 5d0e7472c0..9b236230f2 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BERKELEYDB_VERSION = 5.3.21
+BERKELEYDB_VERSION = 6.0.20
 BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR = build_unix

From 47c463fe50aa48985bf2b2438637e373ddc4622d Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 3 Oct 2013 21:12:41 +0100
Subject: [PATCH 6277/6849] pppd: add license information

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pppd/pppd.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index b2ced29739..471a71ea80 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -7,6 +7,10 @@
 PPPD_VERSION = 2.4.5
 PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
 PPPD_SITE = ftp://ftp.samba.org/pub/ppp
+PPPD_LICENSE = LGPLv2+ LGPL BSD-4c BSD-3c GPLv2+
+PPPD_LICENSE_FILES = pppd/tdb.c pppd/plugins/pppoatm/COPYING \
+	pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
+
 PPPD_TARGET_BINS = chat pppd pppdump pppstats
 PPPD_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),chat pppd pppdump pppstats)
 PPPD_RADIUS_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),pppd-radattr pppd-radius)

From ebc8193363b5200cf6139515779dff2c552ada70 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 3 Oct 2013 20:35:01 +0200
Subject: [PATCH 6278/6849] Revert "toolchain-internal: skip gcc-intermediate
 when possible"

While the idea of skipping the intermediate gcc step seems to work
fine in most situations, it causes problems with the SSP
support. Until we can figure out a proper solution for this problem,
we need to revert back to the previous solution of a three stages
build.

This reverts commit 2babed4a50fcd050abc4686e05e24d0e374d10a8.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gcc/Config.in.host             | 11 -----------
 package/gcc/gcc-initial/gcc-initial.mk |  8 --------
 package/glibc/glibc.mk                 |  5 ++---
 package/uclibc/Config.in               |  1 -
 package/uclibc/uclibc.mk               |  5 ++---
 toolchain/Config.in                    |  9 ---------
 6 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 32c668af45..1fd3a94f24 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -3,12 +3,6 @@ comment "GCC Options"
 config BR2_GCC_NEEDS_MPC
 	bool
 
-# Until gcc 4.7, a three stage build process was needed when using
-# NPTL. This hidden option tells whether gcc is a version that
-# requires this three stage build process.
-config BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
-	bool
-
 choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
@@ -22,13 +16,11 @@ choice
 	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 		depends on BR2_avr32
 		bool "gcc 4.2.2-avr32-2.1.5"
-		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_3_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		depends on !BR2_ARM_EABIHF
 		bool "gcc 4.3.x"
-		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_4_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
@@ -37,7 +29,6 @@ choice
 		depends on !BR2_ARM_EABIHF
 		# VFPv4 support appeared in gcc 4.5
 		depends on !BR2_ARM_FPU_VFPV4 && !BR2_ARM_FPU_VFPV4D16
-		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_5_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
@@ -45,13 +36,11 @@ choice
 		# ARM EABIhf support appeared in gcc 4.6
 		depends on !BR2_ARM_EABIHF
 		bool "gcc 4.5.x"
-		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_6_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
-		select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
 
 	config BR2_GCC_VERSION_4_7_X
 		depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 83767ea509..0eb492fa4d 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -29,7 +29,6 @@ HOST_GCC_INITIAL_CONF_OPT = \
 	--enable-languages=c \
 	--disable-shared \
 	--without-headers \
-	--disable-threads \
 	--with-newlib \
 	--disable-largefile \
 	--disable-nls \
@@ -41,11 +40,4 @@ HOST_GCC_INITIAL_CONF_ENV = \
 HOST_GCC_INITIAL_MAKE_OPT = all-gcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
 
-ifeq ($(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),)
-ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-HOST_GCC_INITIAL_MAKE_OPT += all-target-libgcc
-HOST_GCC_INITIAL_INSTALL_OPT += install-target-libgcc
-endif
-endif
-
 $(eval $(host-autotools-package))
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 68c4636c86..998bd0f3b8 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -28,9 +28,8 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
 GLIBC_DEPENDENCIES += host-gawk
 endif
 
-# Before (e)glibc is built, we must have the second stage
-# cross-compiler, for some gcc versions
-glibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
+# Before (e)glibc is built, we must have the second stage cross-compiler
+eglibc-build: host-gcc-intermediate
 
 GLIBC_SUBDIR = build
 
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index eeb3b83cb9..acf736ada8 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -115,7 +115,6 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
 		depends on !BR2_arc
 		depends on !BR2_avr32
 		depends on !BR2_bfin
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 3993d9bf61..20d3bb6685 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -22,9 +22,8 @@ UCLIBC_INSTALL_STAGING = YES
 # cross-compiler and the kernel headers
 UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers
 
-# Before uClibc is built, we must have the second stage
-# cross-compiler, for some gcc versions, and when NPTL is used.
-uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
+# Before uClibc is built, we must have the second stage cross-compiler
+uclibc-build: host-gcc-intermediate
 
 # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
 # setting.
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 17be32a52f..6fd446ec45 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,13 +1,5 @@
 menu "Toolchain"
 
-config BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD
-	bool
-	default y if BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD && \
-		BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD
-
-config BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
-	bool
-
 # Should be selected for glibc or eglibc
 config BR2_TOOLCHAIN_USES_GLIBC
 	bool
@@ -19,7 +11,6 @@ config BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	select BR2_TOOLCHAIN_HAS_SSP
-	select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD
 
 config BR2_TOOLCHAIN_USES_UCLIBC
 	bool

From 7abec1b34ef35cdcc8f889b2b11f7b684435212c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 10:11:11 +0200
Subject: [PATCH 6279/6849] mpc: autoreconf no longer needed

Since 0be0899bfda5 (mpc: bump to version 1.0.1 and license change), we
no longer patch configure.ac, so we can skip the autoreconf step.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mpc/mpc.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 84e4ff370c..1023665fd1 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -10,8 +10,6 @@ MPC_LICENSE = LGPLv3+
 MPC_LICENSE_FILES = COPYING.LESSER
 MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
-MPC_AUTORECONF = YES
-HOST_MPC_AUTORECONF = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 0c4ba6ba7a1901f9106d25a01d82f875f78c9e31 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 13:44:52 +0200
Subject: [PATCH 6280/6849] gstreamer1: bump version

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 79b2b560b0..d15095dd3c 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GSTREAMER1_VERSION = 1.0.10
+GSTREAMER1_VERSION = 1.2.0
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES

From ed9434babb4efcca900ab58324110070411568eb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 13:45:17 +0200
Subject: [PATCH 6281/6849] gst1-plugins-base: bump version

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index d3aebdad84..223af2fcb5 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BASE_VERSION = 1.0.10
+GST1_PLUGINS_BASE_VERSION = 1.2.0
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES

From 8299f30aad654527573e360c68b3596cdd2acff5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 13:46:26 +0200
Subject: [PATCH 6282/6849] gst1-plugins-good: bump version

DTMF plugin moved from bad, udp plugin no longer needs IPv6 and taglib
support was missing.

Patch needed for O_CLOEXEC on uClibc / older Glibc versions.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../gstreamer1/gst1-plugins-good/Config.in    | 19 ++++++--
 ...fferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch | 46 +++++++++++++++++++
 .../gst1-plugins-good/gst1-plugins-good.mk    | 15 +++++-
 3 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch

diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index ac05d662df..2da9bff0e6 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -91,6 +91,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE
 	help
 	  Deinterlacer
 
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF
+	bool "dtmf"
+	help
+	  DTMF plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV
 	bool "effectv"
 	help
@@ -211,14 +216,10 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM
 	  Run an FFT on the audio signal, output spectrum data
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP
-	depends on BR2_INET_IPV6
 	bool "udp"
 	help
 	  transfer data via UDP
 
-comment "udp requires a toolchain with IPv6 support"
-	depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX
 	bool "videobox"
 	help
@@ -321,6 +322,16 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
 	help
 	  Speex plugin library
 
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB
+	bool "taglib"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_TAGLIB
+	help
+	  Taglib tagging plugin library
+
+comment "taglib requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	bool "vpx (webm)"
 	select BR2_PACKAGE_LIBVPX
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch
new file mode 100644
index 0000000000..7dd7917b65
--- /dev/null
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch
@@ -0,0 +1,46 @@
+From 4f305f30c9917f7a6ea7332a798401f2a5abe981 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Fri, 4 Oct 2013 13:34:09 +0200
+Subject: [PATCH] gstv4l2bufferpool: O_CLOEXEC needs _GNU_SOURCE
+
+[Submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=709423]
+
+On some systems (E.G. uClibc and older Glibc versions), O_CLOEXEC is only
+defined when _GNU_SOURCE is specified, so do so.
+
+_GNU_SOURCE needs to be defined before any system headers are included,
+so move the fcntl.h section up.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ sys/v4l2/gstv4l2bufferpool.c |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
+index 00c6086..f5396d9 100644
+--- a/sys/v4l2/gstv4l2bufferpool.c
++++ b/sys/v4l2/gstv4l2bufferpool.c
+@@ -26,13 +26,17 @@
+ #  include <config.h>
+ #endif
+ 
+-#include <sys/mman.h>
+-#include <string.h>
+-#include <unistd.h>
+ #if HAVE_DECL_V4L2_MEMORY_DMABUF
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE            /* O_CLOEXEC */
++#endif
+ #include <fcntl.h>
+ #endif
+ 
++#include <sys/mman.h>
++#include <string.h>
++#include <unistd.h>
++
+ #include "gst/video/video.h"
+ #include "gst/video/gstvideometa.h"
+ #include "gst/video/gstvideopool.h"
+-- 
+1.7.10.4
+
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index 29b89830db..de8ad910a3 100644
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_GOOD_VERSION = 1.0.10
+GST1_PLUGINS_GOOD_VERSION = 1.2.0
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
@@ -101,6 +101,12 @@ else
 GST1_PLUGINS_GOOD_CONF_OPT += --disable-deinterlace
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-dtmf
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-dtmf
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y)
 GST1_PLUGINS_GOOD_CONF_OPT += --enable-effectv
 else
@@ -380,6 +386,13 @@ else
 GST1_PLUGINS_GOOD_CONF_OPT += --disable-speex
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB),y)
+GST1_PLUGINS_GOOD_CONF_OPT += --enable-taglib
+GST1_PLUGINS_GOOD_DEPENDENCIES += taglib
+else
+GST1_PLUGINS_GOOD_CONF_OPT += --disable-taglib
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y)
 GST1_PLUGINS_GOOD_CONF_OPT += --enable-vpx
 GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx

From 8c6408614bc1f6172a1b9de03349f31b7a9a9a13 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 14:47:54 +0200
Subject: [PATCH 6283/6849] gst1-plugins-bad: bump version

accurip, audiofxbad, ivtc, midi and yadif are new dependency less plugins,
dtmf, rtpmux/rtpvp8 and scaletempo got moved to -good, hls needs gnutls,
celt is gone and dash + webp are new.

At the same time fix the libmms comment dependency.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-bad/Config.in | 76 +++++++++-------
 .../gst1-plugins-bad/gst1-plugins-bad.mk      | 90 +++++++++++--------
 2 files changed, 97 insertions(+), 69 deletions(-)

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 0903aeeb95..54e632a9c1 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -12,6 +12,11 @@ if BR2_PACKAGE_GST1_PLUGINS_BAD
 
 comment "dependency-less plugins"
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP
+	bool "accurip"
+	help
+	  Accurip plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC
 	bool "adpcmdec"
 	help
@@ -32,6 +37,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX
 	help
 	  ASF Muxer Plugin
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
+	bool "audiofxbad"
+	help
+	  Audio filters plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS
 	bool "audiovisualizers"
 	help
@@ -73,15 +83,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 	help
 	  Collection of elements that may or may not be useful for debugging
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTMF
-	bool "dtmf"
-	help
-	  DTMF plugins
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
 	bool "dvdsuboverlay"
 	help
-	  DTMF plugins
+	  DVB subtitle renderer plugin
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU
 	bool "dvdspu"
@@ -129,9 +134,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE
 	bool "hdvparse"
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
-	bool "hls"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG
 	bool "id3tag"
 	help
@@ -150,6 +152,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE
 	bool "ivfparse"
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC
+	bool "ivtc"
+	help
+	  Inverse Telecine plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR
 	bool "jp2kdecimator"
 
@@ -168,6 +175,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER
 	help
 	  Adds multiple live discontinuous streams
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI
+	bool "midi"
+	help
+	  MIDI plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX
 	bool "mpegdemux"
 	help
@@ -225,21 +237,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE
 	help
 	  Removes silence from an audio stream
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPMUX
-	bool "rtpmux"
-	help
-	  RTP Muxer plugins
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPVP8
-	bool "rtpvp8"
-	help
-	  rtpvp8
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCALETEMPO
-	bool "scaletempo"
-	help
-	  Scale audio tempo in sync with playback rate
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI
 	bool "sdi"
 
@@ -303,6 +300,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M
 	help
 	  Demuxes/decodes YUV4MPEG streams
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF
+	bool "yadif"
+	help
+	  YADIF deinterlacing filter
+
 comment "plugins with external dependencies"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM
@@ -327,18 +329,18 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO
 	bool "cdaudio"
 	select BR2_PACKAGE_LIBCDAUDIO
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CELT
-	bool "celt"
-	select BR2_PACKAGE_CELT051
-	help
-	  CELT plugin library
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL
 	bool "curl"
 	select BR2_PACKAGE_LIBCURL
 	help
 	  libcurl-based elements
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH
+	bool "dash"
+	select BR2_PACKAGE_LIBXML2
+	help
+	  DASH demuxer plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
 	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
@@ -361,6 +363,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	help
 	  Wayland Video Sink
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP
+	bool "webp"
+	select BR2_PACKAGE_WEBP
+	help
+	  Webp image format plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD
 	bool "faad"
 	select BR2_PACKAGE_FAAD2
@@ -381,7 +389,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 	  Microsoft Multi Media Server streaming protocol support
 
 comment "libmms requires a toolchain with WCHAR and threading support"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
 	bool "mpeg2enc"
@@ -457,4 +465,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
 	help
 	  DVB elements
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
+	bool "hls"
+	select BR2_PACKAGE_GNUTLS
+	help
+	  Fragmented streaming plugins
+
 endif
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 385522ec07..fdc17eb21f 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BAD_VERSION = 1.0.10
+GST1_PLUGINS_BAD_VERSION = 1.2.0
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
@@ -90,6 +90,12 @@ GST1_PLUGINS_BAD_DEPENDENCIES += orc
 GST1_PLUGINS_BAD_CONF_OPT += --enable-orc
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-accurip
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-accurip
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
 else
@@ -114,6 +120,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-asfmux
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-audiofxbad
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-audiofxbad
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
@@ -169,12 +181,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-debugutils
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTMF),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dtmf
-else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dtmf
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
 else
@@ -241,12 +247,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-hls
-else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-hls
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-id3tag
 else
@@ -271,6 +271,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-ivtc
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-ivtc
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
 else
@@ -295,6 +301,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-liveadder
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-midi
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-midi
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegdemux
 else
@@ -375,24 +387,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-removesilence
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
-else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-rtpmux
-endif
-
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTPVP8),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-rtpvp8
-else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-rtpvp8
-endif
-
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCALETEMPO),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-scaletempo
-else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-scaletempo
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-sdi
 else
@@ -483,6 +477,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-y4m
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-yadif
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-yadif
+endif
+
 # Plugins with dependencies
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y)
@@ -518,13 +518,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CELT),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-celt
-GST1_PLUGINS_BAD_DEPENDENCIES += celt051
-else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-celt
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-curl
 GST1_PLUGINS_BAD_DEPENDENCIES += libcurl
@@ -532,12 +525,26 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-curl
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-dash
+GST1_PLUGINS_BAD_DEPENDENCIES += libxml2
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-dash
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-decklink
 else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-decklink
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-webp
+GST1_PLUGINS_BAD_DEPENDENCIES += webp
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-webp
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-directfb
 GST1_PLUGINS_BAD_DEPENDENCIES += directfb
@@ -662,6 +669,13 @@ else
 GST1_PLUGINS_BAD_CONF_OPT += --disable-dvb
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y)
+GST1_PLUGINS_BAD_CONF_OPT += --enable-hls
+GST1_PLUGINS_BAD_DEPENDENCIES += gnutls
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-hls
+endif
+
 # Add GPL license if GPL licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
 GST1_PLUGINS_BAD_LICENSE += GPL

From 9c3050d5e6faf64ee15952b8f9d8c0894ac2a482 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 14:54:06 +0200
Subject: [PATCH 6284/6849] gst1-plugins-ugly: bump version

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index e666d61138..9cdcf50fbc 100644
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_UGLY_VERSION = 1.0.10
+GST1_PLUGINS_UGLY_VERSION = 1.2.0
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING

From 1d341b76c167e51fe10f5b64308f52ca48e2b4e7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 14:57:38 +0200
Subject: [PATCH 6285/6849] package: drop unneeded HOST_<pkg>_AUTORECONF = YES

Since 97c687000 (pkg-autotools.mk: default host AUTORECONF{,_OPT} to the
target values) we automatically enable autoreconf for host builds if it
is enabled for the target, so these can go.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gettext/gettext.mk       | 1 -
 package/gutenprint/gutenprint.mk | 1 -
 package/kmod/kmod.mk             | 1 -
 package/libffi/libffi.mk         | 1 -
 package/libftdi/libftdi.mk       | 1 -
 package/libglib2/libglib2.mk     | 1 -
 package/libgtk2/libgtk2.mk       | 1 -
 package/python/python.mk         | 1 -
 package/python3/python3.mk       | 1 -
 9 files changed, 9 deletions(-)

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 7af203551a..4874a82473 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -10,7 +10,6 @@ GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+
 GETTEXT_LICENSE_FILES = COPYING
 GETTEXT_AUTORECONF = YES
-HOST_GETTEXT_AUTORECONF = YES
 
 GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 978675fe4b..33abf48fd3 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -12,7 +12,6 @@ GUTENPRINT_LICENSE_FILES = COPYING
 
 # Needed, as we touch Makefile.am
 GUTENPRINT_AUTORECONF = YES
-HOST_GUTENPRINT_AUTORECONF = YES
 
 GUTENPRINT_DEPENDENCIES = cups host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index a1ad7d6b53..77fbe0be04 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -13,7 +13,6 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf
 
 # Some patches are touching configure.ac
 KMOD_AUTORECONF = YES
-HOST_KMOD_AUTORECONF = YES
 
 # license info for libkmod only, conditionally add more below
 KMOD_LICENSE = LGPLv2.1+
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 8c84924a25..74635473bc 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -22,7 +22,6 @@ endef
 
 LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
 
-HOST_LIBFFI_AUTORECONF = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index 3cf11a2570..b31d14b5cc 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -11,7 +11,6 @@ LIBFTDI_DEPENDENCIES = libusb-compat libusb
 LIBFTDI_INSTALL_STAGING = YES
 LIBFTDI_CONFIG_SCRIPTS = libftdi-config
 LIBFTDI_AUTORECONF = YES
-HOST_LIBFTDI_AUTORECONF = YES
 
 LIBFDTI_CONF_OPT = --without-examples
 
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index b07b2c6877..689e4170f6 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -13,7 +13,6 @@ LIBGLIB2_LICENSE = LGPLv2+
 LIBGLIB2_LICENSE_FILES = COPYING
 
 LIBGLIB2_AUTORECONF = YES
-HOST_LIBGLIB2_AUTORECONF = YES
 LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 94cfd4c94b..50d0510429 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -157,7 +157,6 @@ endif
 # for the target.
 
 HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf
-HOST_LIBGTK2_AUTORECONF = YES
 HOST_LIBGTK2_CONF_OPT = \
 		--disable-static \
 		--disable-glibtest \
diff --git a/package/python/python.mk b/package/python/python.mk
index df02b35612..6a6aaaccba 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -38,7 +38,6 @@ HOST_PYTHON_MAKE_ENV = \
 	PYTHON_MODULES_INCLUDE=$(HOST_DIR)/usr/include \
 	PYTHON_MODULES_LIB="$(HOST_DIR)/lib $(HOST_DIR)/usr/lib"
 
-HOST_PYTHON_AUTORECONF = YES
 
 # Building host python in parallel sometimes triggers a "Bus error"
 # during the execution of "./python setup.py build" in the
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index a8a1942f0d..b5e9689324 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -31,7 +31,6 @@ HOST_PYTHON3_MAKE_ENV = \
 	PYTHON_MODULES_INCLUDE=$(HOST_DIR)/usr/include \
 	PYTHON_MODULES_LIB="$(HOST_DIR)/lib $(HOST_DIR)/usr/lib"
 
-HOST_PYTHON3_AUTORECONF = YES
 
 define HOST_PYTHON3_CONFIGURE_CMDS
 	(cd $(@D) && rm -rf config.cache; \

From 4c921006688a19f94f139ad1ef1e8d5523c48ebd Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 4 Oct 2013 16:09:12 +0800
Subject: [PATCH 6286/6849] dmidecode: bump to version 2.12

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dmidecode/dmidecode.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
index 86a3be5e9d..c53bd33f9a 100644
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DMIDECODE_VERSION = 2.11
+DMIDECODE_VERSION = 2.12
 DMIDECODE_SITE    = http://download.savannah.gnu.org/releases/dmidecode/
 
 define DMIDECODE_BUILD_CMDS

From 169f1194c37a6cd418d119cc59072d5ca3b9bdb0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 4 Oct 2013 16:09:59 +0800
Subject: [PATCH 6287/6849] dmidecode: add license info

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dmidecode/dmidecode.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
index c53bd33f9a..e39d97db59 100644
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -6,6 +6,8 @@
 
 DMIDECODE_VERSION = 2.12
 DMIDECODE_SITE    = http://download.savannah.gnu.org/releases/dmidecode/
+DMIDECODE_LICENSE = GPLv2+
+DMIDECODE_LICENSE_FILES = LICENSE
 
 define DMIDECODE_BUILD_CMDS
 	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)

From e92d9d4f22015324bb73a0988f4c04e13d65e081 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 4 Oct 2013 20:00:39 +0800
Subject: [PATCH 6288/6849] file: bump to version 5.15

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/file/file.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index d423d56d19..18a945904d 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FILE_VERSION = 5.14
+FILE_VERSION = 5.15
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 FILE_INSTALL_STAGING = YES

From 2c859079cd60c3a6b57f87960c5b4823797ce95d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Oct 2013 09:49:38 -0300
Subject: [PATCH 6289/6849] configs/qemu: bump relevant config versions

arm_nuri needs some DT fixups to switch to the 3.11.x series since it's
now default for that kernel defconfig.

[Peter: adjust comment in sparc defconfig to match]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/qemu/arm-nuri/readme.txt                            | 2 +-
 .../{linux-3.10.config => linux-3.11.config}              | 0
 board/qemu/arm-versatile/readme.txt                       | 2 +-
 board/qemu/arm-vexpress/readme.txt                        | 2 +-
 .../{linux-3.10.config => linux-3.11.config}              | 0
 board/qemu/microblazebe-mmu/readme.txt                    | 2 +-
 .../{linux-3.10.config => linux-3.11.config}              | 0
 board/qemu/microblazeel-mmu/readme.txt                    | 2 +-
 .../mips-malta/{linux-3.10.config => linux-3.11.config}   | 0
 board/qemu/mips-malta/readme.txt                          | 2 +-
 .../mips64-malta/{linux-3.10.config => linux-3.11.config} | 0
 board/qemu/mips64-malta/readme.txt                        | 2 +-
 .../mipsel-malta/{linux-3.10.config => linux-3.11.config} | 0
 board/qemu/mipsel-malta/readme.txt                        | 2 +-
 .../{linux-3.10.config => linux-3.11.config}              | 0
 board/qemu/powerpc-g3beige/readme.txt                     | 4 ++--
 board/qemu/powerpc-mpc8544ds/readme.txt                   | 2 +-
 board/qemu/powerpc-virtex-ml507/readme.txt                | 2 +-
 board/qemu/sh4-r2d/readme.txt                             | 2 +-
 board/qemu/sparc-ss10/readme.txt                          | 2 +-
 board/qemu/x86/{linux-3.10.config => linux-3.11.config}   | 0
 board/qemu/x86/readme.txt                                 | 2 +-
 .../qemu/x86_64/{linux-3.10.config => linux-3.11.config}  | 0
 board/qemu/x86_64/readme.txt                              | 2 +-
 configs/qemu_mips64_malta_defconfig                       | 8 ++++----
 configs/qemu_sparc_ss10_defconfig                         | 6 +++---
 26 files changed, 23 insertions(+), 23 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mips-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mips64-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/x86/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/x86_64/{linux-3.10.config => linux-3.11.config} (100%)

diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
index 0c64492dab..0fed2f798f 100644
--- a/board/qemu/arm-nuri/readme.txt
+++ b/board/qemu/arm-nuri/readme.txt
@@ -7,4 +7,4 @@ graphical window is the framebuffer.
 
 Startup time is slow because of the SMP CPU emulation so be patient.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/arm-versatile/linux-3.10.config b/board/qemu/arm-versatile/linux-3.11.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.10.config
rename to board/qemu/arm-versatile/linux-3.11.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index e734d5602b..4902c5497f 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index bde90ef4e8..65d1996212 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/microblazebe-mmu/linux-3.10.config b/board/qemu/microblazebe-mmu/linux-3.11.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.10.config
rename to board/qemu/microblazebe-mmu/linux-3.11.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 7d172d1870..473a93426c 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/microblazeel-mmu/linux-3.10.config b/board/qemu/microblazeel-mmu/linux-3.11.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.10.config
rename to board/qemu/microblazeel-mmu/linux-3.11.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 9728a45ddf..baddc7ad92 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/mips-malta/linux-3.10.config b/board/qemu/mips-malta/linux-3.11.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.10.config
rename to board/qemu/mips-malta/linux-3.11.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index ccdcc841e0..33764ead60 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/mips64-malta/linux-3.10.config b/board/qemu/mips64-malta/linux-3.11.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.10.config
rename to board/qemu/mips64-malta/linux-3.11.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 73617227a3..23b85abf74 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/mipsel-malta/linux-3.10.config b/board/qemu/mipsel-malta/linux-3.11.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.10.config
rename to board/qemu/mipsel-malta/linux-3.11.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 52d424d01b..1e17828138 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/powerpc-g3beige/linux-3.10.config b/board/qemu/powerpc-g3beige/linux-3.11.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.10.config
rename to board/qemu/powerpc-g3beige/linux-3.11.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index b5c73a4d0e..4c0bf8a3a4 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -1,8 +1,8 @@
 Run the emulation with:
 
-  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index dfe1ac2591..8c57eadec9 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index f4bc5d5519..e958d494ba 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 34f4857e11..45fca86d79 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 8f4b5bec76..dab4028122 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/x86/linux-3.10.config b/board/qemu/x86/linux-3.11.config
similarity index 100%
rename from board/qemu/x86/linux-3.10.config
rename to board/qemu/x86/linux-3.11.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 7bc3a1c317..5f3af40421 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/x86_64/linux-3.10.config b/board/qemu/x86_64/linux-3.11.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.10.config
rename to board/qemu/x86_64/linux-3.11.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index b6f4659a6c..d9eaf56229 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 61abdcf47d..035cfa1be7 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,16 +10,16 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.3"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 33f0b213b1..ad1b136e72 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,13 +6,13 @@ BR2_sparc_v8=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.7.10"
+BR2_DEFAULT_KERNEL_VERSION="3.11.3"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.3"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 4b3bc153ad78615d71a307998d432e79d5d32cf4 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Thu, 3 Oct 2013 14:10:42 +0200
Subject: [PATCH 6290/6849] package/Makefile.in: don't force jobs when
 BR2_JLEVEL is empty

When the "BR2_JLEVEL" variable is empty use "make" without
the "-j" option, because to be able to use top-level parallel
make we must not force the number of jobs in sub-make.

Example:
	make BR2_JLEVEL= -j8

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 170ad789b0..d406901ade 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -18,7 +18,7 @@ PARALLEL_JOBS:=$(BR2_JLEVEL)
 endif
 
 MAKE1:=$(HOSTMAKE) -j1
-MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS)
+MAKE:=$(HOSTMAKE) $(if $(PARALLEL_JOBS),-j$(PARALLEL_JOBS))
 
 # Compute GNU_TARGET_NAME
 GNU_TARGET_NAME=$(ARCH)-buildroot-$(TARGET_OS)-$(LIBC)$(ABI)

From 8fdedb84b1860c6286cfbf2d9d83c4465da8c787 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 4 Oct 2013 10:28:18 -0300
Subject: [PATCH 6291/6849] gstreamer: fix bison bump build failure

It's due to deprecations in bison 3.0+, fixes:
http://autobuild.buildroot.net/results/df4/df473cb34c9914b2c3d3d8ae344cbf7c19255468/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../gstreamer/gstreamer-01-bison3.patch       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/gstreamer/gstreamer/gstreamer-01-bison3.patch

diff --git a/package/gstreamer/gstreamer/gstreamer-01-bison3.patch b/package/gstreamer/gstreamer/gstreamer-01-bison3.patch
new file mode 100644
index 0000000000..f9ec52d95a
--- /dev/null
+++ b/package/gstreamer/gstreamer/gstreamer-01-bison3.patch
@@ -0,0 +1,24 @@
+Fix deprecation from bison 3.0+
+From http://comments.gmane.org/gmane.linux.lfs.beyond.devel/24620
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gstreamer-0.10.36.orig/gst/parse/grammar.y gstreamer-0.10.36/gst/parse/grammar.y
+--- gstreamer-0.10.36.orig/gst/parse/grammar.y	2013-10-04 09:52:21.685282055 -0300
++++ gstreamer-0.10.36/gst/parse/grammar.y	2013-10-04 10:21:54.800211238 -0300
+@@ -26,7 +26,6 @@
+  */
+
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+
+ #define YYENABLE_NLS 0
+
+@@ -648,6 +647,7 @@
+ %right '.'
+ %left '!' '='
+
++%lex-param { void *scanner }
+ %parse-param { void *scanner }
+ %parse-param { graph_t *graph }
+ %pure-parser

From 69b37ad7cc3e81e04b28f608d3e015faf4f8c448 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 16:54:40 +0200
Subject: [PATCH 6292/6849] dropbear: bump version

Fixes two security issues:

- The Dropbear server could be made to consume large amounts
of memory because decompressed packet sizes weren't checked.
Depending on the OS and hardware this might be a denial of
service.

- Valid users could be identified due to timing variations.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dropbear/dropbear.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 34dd79b5f3..c4372ca918 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DROPBEAR_VERSION = 2013.58
+DROPBEAR_VERSION = 2013.59
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh

From 81de81bed0333e7b458018375bdea03ca4f4b42a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 21:42:44 +0200
Subject: [PATCH 6293/6849] uClibc: 0.9.33.2: Unbreak on avr32 after recent
 pread patches

avr32 only provides __NR_pread and not __NR_pread64, so the fallback
handling must be used.

Patch sent upstream:
http://lists.uclibc.org/pipermail/uclibc/2013-October/047967.html

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...te.c-unbreak-on-archs-without-__NR_p.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/uclibc/0.9.33.2/uclibc-0054-common-pread_write.c-unbreak-on-archs-without-__NR_p.patch

diff --git a/package/uclibc/0.9.33.2/uclibc-0054-common-pread_write.c-unbreak-on-archs-without-__NR_p.patch b/package/uclibc/0.9.33.2/uclibc-0054-common-pread_write.c-unbreak-on-archs-without-__NR_p.patch
new file mode 100644
index 0000000000..b071493d88
--- /dev/null
+++ b/package/uclibc/0.9.33.2/uclibc-0054-common-pread_write.c-unbreak-on-archs-without-__NR_p.patch
@@ -0,0 +1,36 @@
+From 1f7602f1dde43b12bead54433934ae4ddefa8118 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Fri, 4 Oct 2013 21:09:09 +0200
+Subject: [PATCH-0.9.33] common/pread_write.c: unbreak on archs without __NR_pread64
+
+Some archs (avr32 in particular) still doesn't define __NR_pread64, so
+we should fall back to __NR_pread if it isn't available.
+
+The code nicely checks for it, but then ends up hard coding the syscall
+to use __NR_pread64 afterwards, rendering the check useless. Fix it by
+using the result of the test instead.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+Noticed when adding the pending patches for 0.9.33.3 to Buildroot:
+http://jenkins.free-electrons.com/job/buildroot/config=atstk100x_defconfig/116/console
+
+ libc/sysdeps/linux/common/pread_write.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
+index b13de66..8562ab4 100644
+--- a/libc/sysdeps/linux/common/pread_write.c
++++ b/libc/sysdeps/linux/common/pread_write.c
+@@ -42,7 +42,7 @@ extern __typeof(pwrite64) __libc_pwrite64;
+ 
+ #include <bits/kernel_types.h>
+ 
+-# define __NR___syscall_pread __NR_pread64
++# define __NR___syscall_pread __NR_pread
+ static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
+ 		size_t, count, off_t, offset_hi, off_t, offset_lo)
+ 
+-- 
+1.7.10.4
+

From 3a91e8f8a31a0455471065584663046c0072204e Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 22:05:21 +0200
Subject: [PATCH 6294/6849] atstk100x_defconfig: use kernel 3.9.x like atngw100

And lock kernel headers to match.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/atstk100x_defconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index fe7e498f63..f73497cf81 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -1,6 +1,10 @@
 # Architecture
 BR2_avr32=y
 
+# Lock to same version as kernel
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.9.11"
+
 # U-Boot
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atstk1002"
@@ -10,7 +14,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="atstk1002"
 

From 4ba4d1ad37810b19a7bbf9b1d4fb3e9c94f7f528 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 22:06:52 +0200
Subject: [PATCH 6295/6849] atngw100_defconfig: use BR2_KERNEL_HEADERS_VERSION
 to specify kernel headers

No functional change, but the HEADERS_3_9 option will go away by the
time 3.9 is no longer supported, possibly leading to breakage.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/atngw100_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 492891590b..5490241c60 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -3,7 +3,8 @@ BR2_avr32=y
 
 # Lock down kernel headers version, to match the kernel version used
 # below.
-BR2_KERNEL_HEADERS_3_9=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.9.11"
 
 # Filesystems
 BR2_TARGET_ROOTFS_JFFS2=y

From 5d7fb2e350cc6e3d2a5f72278b2f488ca8599189 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Oct 2013 23:52:11 +0200
Subject: [PATCH 6296/6849] configs/qemu_*: unbreak after version bump

Commit 2c859079cd (configs/qemu: bump relevant config version) renamed
a number of linux configuration files, but forgot to update the defconfigs.

Tests shows that atleast arm versatile doesn't boot with 3.11, so rename
the linux configuration files back rather than adjusting the defconfigs.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/qemu/arm-versatile/{linux-3.11.config => linux-3.10.config} | 0
 .../microblazebe-mmu/{linux-3.11.config => linux-3.10.config}     | 0
 .../microblazeel-mmu/{linux-3.11.config => linux-3.10.config}     | 0
 board/qemu/mips-malta/{linux-3.11.config => linux-3.10.config}    | 0
 board/qemu/mipsel-malta/{linux-3.11.config => linux-3.10.config}  | 0
 .../qemu/powerpc-g3beige/{linux-3.11.config => linux-3.10.config} | 0
 board/qemu/x86/{linux-3.11.config => linux-3.10.config}           | 0
 board/qemu/x86_64/{linux-3.11.config => linux-3.10.config}        | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/mips-malta/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/x86/{linux-3.11.config => linux-3.10.config} (100%)
 rename board/qemu/x86_64/{linux-3.11.config => linux-3.10.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.11.config b/board/qemu/arm-versatile/linux-3.10.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.11.config
rename to board/qemu/arm-versatile/linux-3.10.config
diff --git a/board/qemu/microblazebe-mmu/linux-3.11.config b/board/qemu/microblazebe-mmu/linux-3.10.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.11.config
rename to board/qemu/microblazebe-mmu/linux-3.10.config
diff --git a/board/qemu/microblazeel-mmu/linux-3.11.config b/board/qemu/microblazeel-mmu/linux-3.10.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.11.config
rename to board/qemu/microblazeel-mmu/linux-3.10.config
diff --git a/board/qemu/mips-malta/linux-3.11.config b/board/qemu/mips-malta/linux-3.10.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.11.config
rename to board/qemu/mips-malta/linux-3.10.config
diff --git a/board/qemu/mipsel-malta/linux-3.11.config b/board/qemu/mipsel-malta/linux-3.10.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.11.config
rename to board/qemu/mipsel-malta/linux-3.10.config
diff --git a/board/qemu/powerpc-g3beige/linux-3.11.config b/board/qemu/powerpc-g3beige/linux-3.10.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.11.config
rename to board/qemu/powerpc-g3beige/linux-3.10.config
diff --git a/board/qemu/x86/linux-3.11.config b/board/qemu/x86/linux-3.10.config
similarity index 100%
rename from board/qemu/x86/linux-3.11.config
rename to board/qemu/x86/linux-3.10.config
diff --git a/board/qemu/x86_64/linux-3.11.config b/board/qemu/x86_64/linux-3.10.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.11.config
rename to board/qemu/x86_64/linux-3.10.config

From d06678b78342b55f63a56f5800035fc0ce86bbce Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 5 Oct 2013 00:00:07 +0200
Subject: [PATCH 6297/6849] package/rpi-firmware: bump version

Fix for issues with USB, audio, and GLESv2.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 9319429577..ddb48b3e54 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = fadc4cb
+RPI_FIRMWARE_VERSION = e6b21d6
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From b8b69b2da9fa8140fa6dde766170a0815c87a9dd Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sat, 5 Oct 2013 00:00:08 +0200
Subject: [PATCH 6298/6849] package/rpi-userland: bump version

Misc enhancements and fixes for USB, camera, audio, codecs, dispman,
and openMAX.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index fca0e25a42..c3ea43a9f4 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 8b271ac
+RPI_USERLAND_VERSION = 77d32cd
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 4c05e6357b08725acd83fe66a3df13a13ccb3c73 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 5 Oct 2013 20:59:17 +0200
Subject: [PATCH 6299/6849] gst1-plugins-bad: fix bluez plugin compilation on
 big endian

Fixes http://autobuild.buildroot.org/results/5cd/5cdc28f3040b17f19d94f3b2a2bf669e2e921077/

Patch from upstream git.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ix-compilation-on-big-endian-systems.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch
new file mode 100644
index 0000000000..1bcdeffc73
--- /dev/null
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch
@@ -0,0 +1,39 @@
+From 1ab90f259fee4fa9a7c10dac0a1e85799a15881b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
+Date: Wed, 25 Sep 2013 20:25:03 +0200
+Subject: [PATCH] bluez: Fix compilation on big endian systems
+
+---
+ sys/bluez/gstavdtputil.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sys/bluez/gstavdtputil.c b/sys/bluez/gstavdtputil.c
+index dea803a..ed5c276 100644
+--- a/sys/bluez/gstavdtputil.c
++++ b/sys/bluez/gstavdtputil.c
+@@ -611,11 +611,11 @@ gst_avdtp_util_parse_aac_raw (void *config)
+   GValue value = G_VALUE_INIT;
+   GValue value_str = G_VALUE_INIT;
+   GValue list = G_VALUE_INIT;
++  a2dp_aac_t aac_local = { 0 };
++  a2dp_aac_t *aac = &aac_local;
+ 
+ #if G_BYTE_ORDER == G_LITTLE_ENDIAN
+   uint8_t *raw = (uint8_t *) config;
+-  a2dp_aac_t aac_local = { 0 };
+-  a2dp_aac_t *aac = &aac_local;
+   aac->object_type = raw[0];
+   aac->frequency = (raw[1] << 4) | ((raw[2] & 0xFF) >> 4);
+   aac->channels = (raw[2] >> 2) & 0x3;
+@@ -624,7 +624,7 @@ gst_avdtp_util_parse_aac_raw (void *config)
+   aac->bitrate = (raw[4] << 16) | (raw[3] << 8) | raw[4];
+   aac->bitrate &= ~0x800000;
+ #elif G_BYTE_ORDER == G_BIG_ENDIAN
+-  *aac = (a2dp_aac_t *) config;
++  *aac = *((a2dp_aac_t *) config);
+ #else
+ #error "Unknown byte order"
+ #endif
+-- 
+1.7.10.4
+

From d850348c547aaf7b2fc5548e4b2bff43f78e7b61 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 5 Oct 2013 21:02:48 +0200
Subject: [PATCH 6300/6849] gst1-plugins-bad: ensure bluetooth support is
 picked up if enabled

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index fdc17eb21f..e3f3bf3d3e 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -90,6 +90,13 @@ GST1_PLUGINS_BAD_DEPENDENCIES += orc
 GST1_PLUGINS_BAD_CONF_OPT += --enable-orc
 endif
 
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils
+GST1_PLUGINS_BAD_CONF_OPT += --enable-bluez
+else
+GST1_PLUGINS_BAD_CONF_OPT += --disable-bluez
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y)
 GST1_PLUGINS_BAD_CONF_OPT += --enable-accurip
 else

From 5a9ed103d97cb27ff67eba895ed7d34cd9f716fc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 5 Oct 2013 20:29:56 +0200
Subject: [PATCH 6301/6849] sqlcipher: needs thread support

Fixes:

  http://autobuild.buildroot.org/results/ac4/ac482030479b8172bf45c4f850d9007ec7c95ea5/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sqlcipher/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
index af41eb21c6..e793019353 100644
--- a/package/sqlcipher/Config.in
+++ b/package/sqlcipher/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SQLCIPHER
 	bool "sqlcipher"
 	depends on !BR2_PACKAGE_SQLITE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_OPENSSL
 	help
 	  SQLCipher is an SQLite extension that provides 256 bits AES
@@ -27,3 +28,6 @@ config BR2_PACKAGE_SQLCIPHER_STAT3
 
 comment "sqlcipher conflicts with sqlite"
 	depends on BR2_PACKAGE_SQLITE
+
+comment "sqlcipher needs a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From 3e7b34d4db4e9a2b1004101ac12989d219e1e0e4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 5 Oct 2013 20:34:20 +0200
Subject: [PATCH 6302/6849] mysql_client: needs thread support

Fixes:

   http://autobuild.buildroot.org/results/9b1/9b19b312651d21ea2fd54f364b11b01e4aa25e4b/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/collectd/Config.in     | 1 +
 package/mysql_client/Config.in | 5 +++--
 package/php/Config.ext         | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 495711562e..da65053234 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -235,6 +235,7 @@ config BR2_PACKAGE_COLLECTD_MYSQL
 	bool "mysql"
 	depends on BR2_INSTALL_LIBSTDCPP # mysql
 	depends on BR2_USE_MMU # mysql
+	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  Connects to a MySQL database and issues a "show status" command.
diff --git a/package/mysql_client/Config.in b/package/mysql_client/Config.in
index 970b9b98cc..8c98b7a767 100644
--- a/package/mysql_client/Config.in
+++ b/package/mysql_client/Config.in
@@ -2,10 +2,11 @@ config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL client"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	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
+comment "Mysql client requires a toolchain with C++ and thread support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 006d7dd34a..3ba591d0de 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -106,6 +106,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQL
 	bool "Mysql"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # mysql
+	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  MySQL support
@@ -114,6 +115,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI
 	bool "Mysqli"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # mysql
+	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	select BR2_PACKAGE_PHP_EXT_MYSQL
 	help
@@ -130,6 +132,7 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
 	bool "MySQL"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # mysql
+	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
 	select BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  PDO driver for MySQL

From 2bec016d99d66722b1d9527dc8acf7c6388f298e Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 5 Oct 2013 22:59:03 +0800
Subject: [PATCH 6303/6849] enchant: bump to version 1.6.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/enchant/enchant.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 8a76c6b67a..977c37beb7 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ENCHANT_VERSION = 1.5.0
+ENCHANT_VERSION = 1.6.0
 ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
 ENCHANT_INSTALL_STAGING = YES

From 313e735a68b691827eb17d4486957d52ab8c7630 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 5 Oct 2013 12:30:59 +0800
Subject: [PATCH 6304/6849] proxychains-ng: needs dynamic library support

Fix below build error if BR2_PREFER_STATIC_LIB is set:

src/libproxychains.c:34:19: fatal error: dlfcn.h: No such file or directory
compilation terminated.
make[1]: *** [src/libproxychains.o] Error 1

In additional, the README file also mentions that this program works only on
dynamically linked programs.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/proxychains-ng/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/proxychains-ng/Config.in b/package/proxychains-ng/Config.in
index 99e49bdaaa..97eaa0c0d7 100644
--- a/package/proxychains-ng/Config.in
+++ b/package/proxychains-ng/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_PROXYCHAINS_NG
 	bool "proxychains-ng"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  Force any tcp connections to flow through a proxy (or proxy chain)
 
 	  https://github.com/rofl0r/proxychains
 
-comment "proxychains-ng needs a toolchain with thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "proxychains-ng needs a toolchain with thread and dynamic library support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

From 3fef1e5d5df8f2410a4f6250c4b6854871480233 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 5 Oct 2013 12:31:52 +0800
Subject: [PATCH 6305/6849] proxychains-ng: bump to version 4.6

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/proxychains-ng/proxychains-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk
index cc3e3575e8..7c2ffbfb90 100644
--- a/package/proxychains-ng/proxychains-ng.mk
+++ b/package/proxychains-ng/proxychains-ng.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PROXYCHAINS_NG_VERSION = 4.4
+PROXYCHAINS_NG_VERSION = 4.6
 PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2
 PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng
 

From f1b0e95a245aaa5fe6efe9cd6b9ae6a0fe48c4b1 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 5 Oct 2013 17:07:09 +0800
Subject: [PATCH 6306/6849] ndisc6: needs mmu

Fix below build error if !BR2_USE_MMU:

tcpspray.o: In function `tcpspray':
tcpspray.c:(.text+0x4a8): undefined reference to `fork'
collect2: ld returned 1 exit status
make[3]: *** [tcpspray] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ndisc6/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 6abe4ce2ea..095b2e8174 100644
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -4,6 +4,7 @@ comment "ndisc6 requires a toolchain with IPv6 support"
 config BR2_PACKAGE_NDISC6
 	bool "ndisc6 tools"
 	depends on BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  NDisc6 is a small collection of useful tools for IPv6 networking

From 1952897ba6db279e9ac705d0a5570a517e1a04b5 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 5 Oct 2013 17:35:53 +0800
Subject: [PATCH 6307/6849] neon: bump to version 0.30.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/neon/neon.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 2edc6b280c..177ae6ae06 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NEON_VERSION = 0.29.6
+NEON_VERSION = 0.30.0
 NEON_SITE = http://www.webdav.org/neon/
 NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
 NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README

From 8a67c54c77782936b69fd062d49aa590f4f97bb3 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 5 Oct 2013 15:52:05 +0200
Subject: [PATCH 6308/6849] netatalk: disable dtrace

fix build failure:
http://autobuild.buildroot.net/results/dbade69e610a079c5e12356991e6b908f4f716e9/

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netatalk/netatalk.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 37115ecd63..5dab57d9ae 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -24,7 +24,8 @@ NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--disable-shell-check \
 	--without-kerberos \
 	--without-pam \
-	--with-libevent=no
+	--with-libevent=no \
+	--with-dtrace=no
 
 ifeq ($(BR2_PACKAGE_CUPS),y)
 	NETATALK_DEPENDENCIES += cups

From 1eacefe3fe1e62cca1360034c8972dcd84e4f4e7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 Oct 2013 19:50:01 -0300
Subject: [PATCH 6309/6849] linux-headers: bump 3.{0, 4, 10, 11}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.98 => 3.0.99}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.98/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.99/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.98/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.99/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index a0deb34cf2..114f337d77 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,17 +76,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.98"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.99"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.64"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.65"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.14"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.3"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.15"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.4"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From e8e7b5340c8eec8bd15654effdc61eb7d2b3b11b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 5 Oct 2013 19:50:02 -0300
Subject: [PATCH 6310/6849] linux: bump 3.11.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9eb2268060..6c642ef276 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11.3"
+	bool "3.11.4"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11.3" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11.4" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From cb1ea6c185a544e2039d4e86eb64fcea2630307a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 6 Oct 2013 09:30:24 +0800
Subject: [PATCH 6311/6849] stunnel: fix download url

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/stunnel/stunnel.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index bfe96c3112..8548eab88f 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 STUNNEL_VERSION = 4.55
-STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel
+STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/archive/4.x/
 STUNNEL_DEPENDENCIES = openssl
 STUNNEL_CONF_OPT = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork
 STUNNEL_LICENSE = GPLv2+

From f91b0a0c7d76aed1086086daecfd5ff9e5dd674e Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 6 Oct 2013 09:31:10 +0800
Subject: [PATCH 6312/6849] stunnel: bump to version 4.56

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/stunnel/stunnel.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 8548eab88f..fbe7b94908 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STUNNEL_VERSION = 4.55
+STUNNEL_VERSION = 4.56
 STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/archive/4.x/
 STUNNEL_DEPENDENCIES = openssl
 STUNNEL_CONF_OPT = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork

From 6f6b103f6538de3e13d7c3098a498562e629a31f Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 6 Oct 2013 09:39:47 +0800
Subject: [PATCH 6313/6849] socat: bump to version 2.0.0-b6

2.0.0-b6 fix a security issue:
Under certain circumstances an FD leak occurs and may be misused for denial of
service attacks against socat running in server mode.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/socat/socat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 8ba399b2e4..df60961c82 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SOCAT_VERSION = 2.0.0-b5
+SOCAT_VERSION = 2.0.0-b6
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
 SOCAT_LICENSE = GPLv2

From 561fb5f702cd84c6953803d44d1ce1204e85412f Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sun, 6 Oct 2013 01:39:55 +0200
Subject: [PATCH 6314/6849] dbus: fix static linking issue with pthread

-lpthread is missing when dbus is build with static lib

Fixes build failures:
http://autobuild.buildroot.net/results/80a317e33afd1d5ba2f7dd9ecd89314b09b4b1fe/
http://autobuild.buildroot.net/results/2c3c040624652547bbeec363d7d6b03f2477ff00/

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dbus/dbus.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index d50f6309cb..e2412478b5 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -30,6 +30,10 @@ DBUS_CONF_OPT = --with-dbus-user=dbus \
 		--with-system-socket=/var/run/dbus/system_bus_socket \
 		--with-system-pid-file=/var/run/messagebus.pid
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+DBUS_CONF_OPT += LIBS='-lpthread'
+endif
+
 ifeq ($(BR2_microblaze),y)
 # microblaze toolchain doesn't provide inotify_rm_* but does have sys/inotify.h
 DBUS_CONF_OPT += --disable-inotify

From ca3524ba707126de7284210c00268a8e7ca6379a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 19:52:25 +0200
Subject: [PATCH 6315/6849] ltp-testsuite: bump version and other fixes

This commit bumps ltp-testsuite to the latest version available. In
addition to that, it also:

 * Removes the ltp-testsuite-disable-controllers.patch file, which
   becomes useless thanks to the workaround that consists in removing
   -D_FILE_OFFSET_BITS=64 from the CFLAGS. This is necessary because
   ltp-testsuite uses the non-largefile compatible <fts.h> interface.

 * Marks the package as not-available on AArch64, since it doesn't
   build properly. A bug has been submitted upstream to the Linaro
   people doing the AArch64 support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ltp-testsuite/Config.in               |  7 +++--
 .../ltp-testsuite-disable-controllers.patch   | 29 -------------------
 package/ltp-testsuite/ltp-testsuite.mk        | 10 +++++--
 3 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 package/ltp-testsuite/ltp-testsuite-disable-controllers.patch

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 75b029ffca..3681eaf2e4 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -7,6 +7,9 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	# aarch64 build currently broken, reported at
+	# https://bugs.launchpad.net/linaro-aarch64/+bug/1236027
+	depends on !BR2_aarch64
 	help
 	  The Linux Test Project provides a huge testsuite for Linux.
 
@@ -20,5 +23,5 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	  http://ltp.sourceforge.net/
 
 comment "ltp-testsuite requires a toolchain with IPV6, RPC and thread support"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
-		!BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on (!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
+		!BR2_TOOLCHAIN_HAS_NATIVE_RPC) && !BR2_aarch64
diff --git a/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch b/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch
deleted file mode 100644
index 85ef262d09..0000000000
--- a/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Disable controllers testcases.
-This fix is carried over from 20101031 version.
-
-The cpuset controllers testcases do not build due to bug
-https://sourceforge.net/tracker/?func=detail&aid=3126942&group_id=3382&atid=103382.
-Disabling just the cpuset controllers do not seem to be easily possible, and
-those controller features are rarely used on embedded systems anyway.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Jerin Jacob  <jerinjacobk@gmail.com>
----
- testcases/kernel/Makefile |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
-index 4b4800d..d6ab7b6 100644
---- a/testcases/kernel/Makefile
-+++ b/testcases/kernel/Makefile
-@@ -37,7 +37,6 @@ ifneq ($(UCLINUX),1)
- # KEEP THIS LIST ALPHABETIZED PLEASE!
- SUBDIRS			+= connectors \
- 			   containers \
--			   controllers \
- 			   fs \
- 			   hotplug \
- 			   io \
--- 
-1.7.6.5
-
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 16d1fe8420..594fa18cd0 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LTP_TESTSUITE_VERSION = 20130109
-LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
+LTP_TESTSUITE_VERSION = 20130904
+LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
 LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
 LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+
 LTP_TESTSUITE_LICENSE_FILES = COPYING
@@ -17,4 +17,10 @@ else
 LTP_TESTSUITE_CONF_ENV += ac_cv_lib_cap_cap_compare=no
 endif
 
+# ltp-testsuite uses <fts.h>, which isn't compatible with largefile
+# support.
+LTP_TESTSUITE_CONF_ENV += \
+	CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
+	CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
+
 $(eval $(autotools-package))

From ef5f9b9b9a6353eafae15f7e5e148a1a1cf607a2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sun, 6 Oct 2013 20:32:32 +0200
Subject: [PATCH 6316/6849] ltp-testsuite: needs largefile support

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ltp-testsuite/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 3681eaf2e4..a984d7b4c8 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	# aarch64 build currently broken, reported at
 	# https://bugs.launchpad.net/linaro-aarch64/+bug/1236027
@@ -22,6 +23,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
 
 	  http://ltp.sourceforge.net/
 
-comment "ltp-testsuite requires a toolchain with IPV6, RPC and thread support"
+comment "ltp-testsuite requires a toolchain with IPV6, RPC, LARGEFILE and thread support"
 	depends on (!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
-		!BR2_TOOLCHAIN_HAS_NATIVE_RPC) && !BR2_aarch64
+		!BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_NATIVE_RPC) && !BR2_aarch64

From 4aa9fb945fde3b74ecc1a6887bf597466cd67a0d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 19:49:07 +0200
Subject: [PATCH 6317/6849] docs/manual: add a 'Known issues' chapter

Add a 'Known issues' chapter, which lists the exceptions I have
currently in the autobuilder scripts to avoid known problems from
occuring. I believe it is more useful to document them rather than
keeping them hidden in my autobuilder script.

[Peter: s/either/either use/]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/known-issues.txt | 32 ++++++++++++++++++++++++++++++++
 docs/manual/manual.txt       |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 docs/manual/known-issues.txt

diff --git a/docs/manual/known-issues.txt b/docs/manual/known-issues.txt
new file mode 100644
index 0000000000..4ef8c05cd7
--- /dev/null
+++ b/docs/manual/known-issues.txt
@@ -0,0 +1,32 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+
+Known issues
+============
+
+* The +ltp-testsuite+ package does not build with the default uClibc
+  configuration used by the Buildroot toolchain backend. The LTP
+  testsuite uses several functions that are considered obsolete, such
+  as sigset() and others. uClibc configuration options such as
+  DO_XSI_MATH, UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and
+  UCLIBC_SV4_DEPRECATED are needed if one wants to build the
+  +ltp-testsuite+ package with uClibc. You need to either use a glibc
+  or eglibc based toolchain, or enable the appropriate options in the
+  uClibc configuration.
+
+* The +xfsprogs+ package does not build with the default uClibc
+  configuration used by the Buildroot toolchain backend. You need to
+  either use a glibc or eglibc based toolchain, or enable the
+  appropriate options in the uClibc configuration.
+
+* The +mrouted+ package does not build with the default uClibc
+  configuration used by the Buildroot toolchain backend. You need to
+  either use a glibc or eglibc based toolchain, or enable the
+  appropriate options in the uClibc configuration.
+
+* The +libffi+ package is not supported on the SuperH 2 and ARC
+  architectures.
+
+* The +prboom+ package triggers a compiler failure with the SuperH 4
+  compiler from Soucery CodeBench, version 2012.09.
+
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt
index 968566792e..9ae658eecb 100644
--- a/docs/manual/manual.txt
+++ b/docs/manual/manual.txt
@@ -23,6 +23,8 @@ include::working-with.txt[]
 
 include::faq-troubleshooting.txt[]
 
+include::known-issues.txt[]
+
 include::going-further.txt[]
 
 include::developer-guide.txt[]

From 07a23498d948e18b0e355ce8ee4027b8812a55f0 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sun, 6 Oct 2013 20:13:12 +0200
Subject: [PATCH 6318/6849] glib-networking: bump to version 2.36.2

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glib-networking/glib-networking.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 168e5eab0b..99fc591af6 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GLIB_NETWORKING_MAJOR_VERSION = 2.36
-GLIB_NETWORKING_MINOR_VERSION = 1
+GLIB_NETWORKING_MINOR_VERSION = 2
 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION)
 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION)
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz

From 61bbad50a031f7eaa04347e9a701e6410809bc7e Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sun, 6 Oct 2013 20:36:11 +0200
Subject: [PATCH 6319/6849] lockfile-progs: change the patch name

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...15-sus3v-legacy.patch => lockfile-progs-01-sus3v-legacy.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/lockfile-progs/{lockfile-progs-0.1.15-sus3v-legacy.patch => lockfile-progs-01-sus3v-legacy.patch} (100%)

diff --git a/package/lockfile-progs/lockfile-progs-0.1.15-sus3v-legacy.patch b/package/lockfile-progs/lockfile-progs-01-sus3v-legacy.patch
similarity index 100%
rename from package/lockfile-progs/lockfile-progs-0.1.15-sus3v-legacy.patch
rename to package/lockfile-progs/lockfile-progs-01-sus3v-legacy.patch

From c5d270004031338455890a19e9519a670dae71a2 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sun, 6 Oct 2013 20:36:12 +0200
Subject: [PATCH 6320/6849] lockfile-progs: bump to version 0.1.17

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lockfile-progs/lockfile-progs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 35bb881de3..25f81342d2 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LOCKFILE_PROGS_VERSION = 0.1.15
+LOCKFILE_PROGS_VERSION = 0.1.17
 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
 LOCKFILE_PROGS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
 LOCKFILE_PROGS_DEPENDENCIES = liblockfile

From d57d4a8ede2949f5a02d90528392bf34a2ec8a81 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 18:30:32 +0200
Subject: [PATCH 6321/6849] pv: bump to version 1.4.12

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pv/pv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index c2dca2a63b..a8b2651709 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PV_VERSION = 1.4.6
+PV_VERSION = 1.4.12
 PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://www.ivarch.com/programs/sources
 PV_LICENSE = Artistic-2.0

From 1980bf056e16c604c1f33ce9771d725da096cfe7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 18:30:33 +0200
Subject: [PATCH 6322/6849] pv: fix build issue with some toolchains

While 'pv' uses autoconf, it does not use automake for its
makefiles. It uses $(LD) $(LDFLAGS) to achieve partial linking, but
using 'ld' directly doesn't work well with some toolchain
configuration, as the ld default emulation may not necessarily be the
correct one. By passing custom values for LD and LDFLAGS, we ensure
that 'gcc' is used to do these partial linking steps.

Fixes the following build failures (x86-64 and mips64) :

  http://autobuild.buildroot.org/results/9ac/9aca276a220ad1460e5b32bd042dd4c93649baf3/build-end.log
  http://autobuild.buildroot.org/results/910/91044c01dcc3c4150aa6e74f5964fff27b9dac79/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pv/pv.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index a8b2651709..00502d3b4e 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -9,6 +9,15 @@ PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://www.ivarch.com/programs/sources
 PV_LICENSE = Artistic-2.0
 PV_LICENSE_FILES = doc/COPYING
-PV_MAKE_OPT = LD=$(TARGET_LD) # otherwise 'ld' is used
+
+# While 'pv' uses autoconf, it does not use automake for its
+# makefiles. It uses $(LD) $(LDFLAGS) to achieve partial linking, but
+# using 'ld' directly doesn't work well with some toolchain
+# configuration, as the ld default emulation may not necessarily be
+# the correct one. By passing the below values for LD and LDFLAGS, we
+# ensure that 'gcc' is used to do these partial linking steps.
+PV_MAKE_OPT = \
+	LD=$(TARGET_CC) \
+	LDFLAGS="-Wl,-r -nostdlib"
 
 $(eval $(autotools-package))

From 19b4a6f4e08fdf7b698e4be735328cb69c40020d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 6 Oct 2013 00:17:17 +0200
Subject: [PATCH 6323/6849] pakage/rpi-userland: add and install our
 bcm_host.pc

This allows pkg-config-aware packages to include headers from, and
link against Broadcom VideoCore host API library.

bcm_host.pc copied almost as-is from:
    http://cgit.collabora.com/git/user/pq/android-pc-files.git/tree/pkgconfig?h=raspberrypi
with only a fix to the prefix (we're using /usr).

[Peter: s/TARGET/STAGING/]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/bcm_host.pc     | 11 +++++++++++
 package/rpi-userland/rpi-userland.mk |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 package/rpi-userland/bcm_host.pc

diff --git a/package/rpi-userland/bcm_host.pc b/package/rpi-userland/bcm_host.pc
new file mode 100644
index 0000000000..28bbe960da
--- /dev/null
+++ b/package/rpi-userland/bcm_host.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bcm_host
+Description: Broadcom VideoCore host API library
+Version: 1
+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
+
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index c3ea43a9f4..cc032bfcd9 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -14,7 +14,12 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 define RPI_USERLAND_POST_TARGET_CLEANUP
     rm -Rf $(TARGET_DIR)/usr/src
 endef
-
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
 
+define RPI_USERLAND_POST_STAGING_PC_FILE
+	install -D -m 0644 package/rpi-userland/bcm_host.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/bcm_host.pc
+endef
+RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_POST_STAGING_PC_FILE
+
 $(eval $(cmake-package))

From 0148cdd4dff1d34d4134b109d72fcc0f5e727de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Sun, 6 Oct 2013 10:27:46 +0200
Subject: [PATCH 6324/6849] Fix glibc dependency to gcc-intermediate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit ebc81933, we reverted 2babed4a, but meanwhile eglibc/ was
renamed glibc/ so rules eglibc-build must be renamed glibc-build to
correctly work.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glibc/glibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 998bd0f3b8..48ff0f72c7 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -29,7 +29,7 @@ GLIBC_DEPENDENCIES += host-gawk
 endif
 
 # Before (e)glibc is built, we must have the second stage cross-compiler
-eglibc-build: host-gcc-intermediate
+glibc-build: host-gcc-intermediate
 
 GLIBC_SUBDIR = build
 

From f742fe440797ef345266845a14c6c65a86e3af4c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 16:19:11 +0200
Subject: [PATCH 6325/6849] toolchain-crosstool-ng: remove support

In order to avoid the work of converting the toolchain-crosstool-ng
logic to the package infrastructure, we remove it from Buildroot,
since it has been deprecated since quite some time.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile                                      |   7 -
 package/Makefile.in                           |   2 +-
 package/libglib2/libglib2.mk                  |   2 +-
 toolchain/Config.in                           |  13 -
 toolchain/helpers.mk                          |   4 +-
 toolchain/toolchain-common.in                 |   4 -
 toolchain/toolchain-crosstool-ng.mk           |   5 -
 toolchain/toolchain-crosstool-ng/Config.in    | 133 -----
 .../crosstool-ng.config-eglibc                | 502 ------------------
 .../crosstool-ng.config-glibc                 | 491 -----------------
 .../crosstool-ng.config-uClibc                | 473 -----------------
 .../toolchain-crosstool-ng/crosstool-ng.mk    | 396 --------------
 12 files changed, 3 insertions(+), 2029 deletions(-)
 delete mode 100644 toolchain/toolchain-crosstool-ng.mk
 delete mode 100644 toolchain/toolchain-crosstool-ng/Config.in
 delete mode 100644 toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
 delete mode 100644 toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
 delete mode 100644 toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
 delete mode 100644 toolchain/toolchain-crosstool-ng/crosstool-ng.mk

diff --git a/Makefile b/Makefile
index c170ca2593..2fb116805a 100644
--- a/Makefile
+++ b/Makefile
@@ -240,8 +240,6 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 BASE_TARGETS += toolchain-buildroot
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 BASE_TARGETS += toolchain-external
-else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
-BASE_TARGETS += toolchain-crosstool-ng
 endif
 
 TARGETS:=
@@ -323,8 +321,6 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 include toolchain/toolchain-buildroot.mk
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 include toolchain/toolchain-external.mk
-else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
-include toolchain/toolchain-crosstool-ng.mk
 endif
 
 # Include the package override file if one has been provided in the
@@ -802,9 +798,6 @@ endif
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 	@echo '  uclibc-menuconfig      - Run uClibc menuconfig'
 endif
-ifeq ($(BR2_TOOLCHAIN_CTNG),y)
-	@echo '  ctng-menuconfig        - Run crosstool-NG menuconfig'
-endif
 ifeq ($(BR2_TARGET_BAREBOX),y)
 	@echo '  barebox-menuconfig     - Run barebox menuconfig'
 	@echo '  barebox-savedefconfig  - Run barebox savedefconfig'
diff --git a/package/Makefile.in b/package/Makefile.in
index d406901ade..612f3c744a 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -138,7 +138,7 @@ TARGET_CFLAGS += -fstack-protector-all
 TARGET_CXXFLAGS += -fstack-protector-all
 endif
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
 else
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 689e4170f6..51b2fc109c 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -51,7 +51,7 @@ LIBGLIB2_CONF_ENV = \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r
-ifeq ($(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+ifeq ($(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 else
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6fd446ec45..0f9a7dd9a4 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -36,23 +36,10 @@ config BR2_TOOLCHAIN_EXTERNAL
 	  toolchain. Buildroot can either download automatically a
 	  toolchain, or use an already installed toolchain.
 
-config BR2_TOOLCHAIN_CTNG
-	bool "Crosstool-NG toolchain"
-	depends on BR2_DEPRECATED
-	depends on !BR2_microblaze && !BR2_aarch64 && !BR2_xtensa && \
-		   !BR2_arc && !BR2_nios2
-	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
-	help
-	  Say 'y' if you want to generate the toolchain with crosstool-NG
-	  (http://crosstool-ng.org).
-
-	  This is considered experimental, and you can expect some breakage.
-
 endchoice
 
 source "toolchain/toolchain-buildroot/Config.in"
 source "toolchain/toolchain-external/Config.in"
-source "toolchain/toolchain-crosstool-ng/Config.in"
 source "toolchain/toolchain-common.in"
 
 endmenu
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 0e270ee14b..27b67100fc 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -1,7 +1,5 @@
 # This Makefile fragment declares helper functions, usefull to handle
-# non- buildroot-built toolchains, eg. purely external toolchains or
-# toolchains (internally) built using crosstool-NG.
-
+# non- buildroot-built toolchains, eg. purely external toolchains.
 #
 # Copy a toolchain library and its symbolic links from the sysroot
 # directory to the target directory. Also optionaly strips the
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 1085fb316c..8435a65a49 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -59,10 +59,6 @@ config BR2_ENABLE_LOCALE_WHITELIST
 config BR2_GENERATE_LOCALE
 	string "Generate locale data"
 	default ""
-	# Pre-built uClibc external toolchains and uClibc toolchains
-	# built by the Crosstool-NG backend cannot be supported,
-	# because the list of locales to support must be defined at
-	# build time.
 	depends on \
 		BR2_TOOLCHAIN_BUILDROOT      || \
 		BR2_TOOLCHAIN_USES_GLIBC
diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk
deleted file mode 100644
index 9e666a0429..0000000000
--- a/toolchain/toolchain-crosstool-ng.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Required includes for the external toolchain backend
-
-# Explicit ordering:
-include toolchain/helpers.mk
-include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
deleted file mode 100644
index 7cfd8c27b5..0000000000
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ /dev/null
@@ -1,133 +0,0 @@
-# Selection options for crosstool-NG
-
-if BR2_TOOLCHAIN_CTNG
-
-choice
- 	prompt "Crosstool-NG C library"
-
-config BR2_TOOLCHAIN_CTNG_uClibc
-	bool "uClibc"
-	select BR2_TOOLCHAIN_USES_UCLIBC
-
-# Although eglibc can be configured to opt-out some features,
-# let's not deal with that for the time being, it's complex...
-config BR2_TOOLCHAIN_CTNG_eglibc
-	bool "eglibc"
-	# Our default ct-ng configuration uses eglibc 2.12, which has
-	# native RPC support
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_TOOLCHAIN_USES_GLIBC
-
-config BR2_TOOLCHAIN_CTNG_glibc
-	bool "glibc"
-	# Our default ct-ng configuration uses glibc 2.14.1, which
-	# does not have native RPC support
-	select BR2_TOOLCHAIN_USES_GLIBC
-
-endchoice # C library
-
-config BR2_TOOLCHAIN_CTNG_LIBC
-	string
-	default "uClibc"	if BR2_TOOLCHAIN_CTNG_uClibc
-	default "eglibc"	if BR2_TOOLCHAIN_CTNG_eglibc
-	default "glibc"		if BR2_TOOLCHAIN_CTNG_glibc
-
-config BR2_TOOLCHAIN_CTNG_CONFIG
-	string "crosstool-NG configuration file to use"
-	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc" if BR2_TOOLCHAIN_CTNG_uClibc
-	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc" if BR2_TOOLCHAIN_CTNG_eglibc
-	default "toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc"  if BR2_TOOLCHAIN_CTNG_glibc
-	help
-	  Enter here the path to the crosstool-NG .config file to use.
-	  
-	  Generally, the default crosstool-NG configuration files bundled with
-	  Buildroot work fine in most situations. Use 'make ctng-menuconfig'
-	  from the command line, for expert customization of your toolchain.
-	  
-	  If unsure, keep the default value.
-
-if BR2_TOOLCHAIN_CTNG_uClibc
-
-comment "Toolchain Options"
-
-config BR2_TOOLCHAIN_CTNG_uClibc_LARGEFILE
-	bool "Enable large file (files > 2 GB) support"
-	select BR2_LARGEFILE
-	help
-	  Enable this option if you want your toolchain to support
-	  files bigger than 2 GB.
-
-config BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6
-	bool "Enable IPv6 support"
-	select BR2_INET_IPV6
-	help
-	  Enable this option if you want your toolchain to support
-	  IPv6.
-
-config BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC
-	bool "Enable RPC support"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	help
-	  Enable this option if you want your toolchain to support
-	  RPC (needed for NFS, for example).
-
-config BR2_TOOLCHAIN_CTNG_uClibc_WCHAR
-	bool "Enable WCHAR support"
-	select BR2_USE_WCHAR
-	help
-	  Enable this option if you want your toolchain to support
-	  wide characters (i.e characters longer than 8 bits, needed
-	  for locale support).
-
-config BR2_TOOLCHAIN_CTNG_uClibc_LOCALE
-	bool "Enable toolchain locale/i18n support"
-	select BR2_TOOLCHAIN_CTNG_uClibc_WCHAR
-	select BR2_ENABLE_LOCALE
-	help
-	  Enable this option if you want your toolchain to support
-	  localization and internationalization.
-
-endif # BR2_TOOLCHAIN_CTNG_uClibc
-
-config BR2_TOOLCHAIN_CTNG_CXX
-	bool "Enable C++ support"
-	select BR2_INSTALL_LIBSTDCPP
-	help
-	  Enable this option if you want your toolchain to support the
-	  C++ language and you want C++ libraries to be installed on
-	  your target system.
-
-choice
-	prompt "Thread library implementation"
-	default BR2_TOOLCHAIN_CTNG_THREADS_NPTL
-	help
-	  Enable thread support and select thread implementation. With
-	  glibc, thread support is mandatory but several
-	  implementations are available. With uClibc, thread support
-	  is optional, and when enabled, several implementations are
-	  available. However, not all thread variants work with all
-	  versions of uClibc for all architectures, the "linuxthreads
-	  (stable/old)" may be a working fallback.
-
-	config BR2_TOOLCHAIN_CTNG_THREADS_NONE
-		bool "none"
-		depends on BR2_TOOLCHAIN_CTNG_uClibc
-
-	config BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS
-		bool "linuxthreads"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-
-	config BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD
-		bool "linuxthreads (stable/old)"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-		depends on BR2_TOOLCHAIN_CTNG_uClibc
-
-	config BR2_TOOLCHAIN_CTNG_THREADS_NPTL
-		bool "Native POSIX Threading (NPTL)"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-endchoice
-
-endif # BR2_TOOLCHAIN_CTNG
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
deleted file mode 100644
index 08f036cf76..0000000000
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ /dev/null
@@ -1,502 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# crosstool-NG 1.17.0 Configuration
-# Sat Dec  8 12:57:07 2012
-#
-CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_svn=y
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR=""
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR=""
-CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-# CT_INSTALL_DIR_RO is not set
-# CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
-
-#
-# Downloading
-#
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-CT_CONNECT_TIMEOUT=10
-# CT_ONLY_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
-# CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
-# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
-# CT_PATCH_NONE is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=0
-CT_LOAD=0
-CT_USE_PIPES=y
-CT_EXTRA_FLAGS_FOR_HOST=""
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="${bash}"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-# CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
-CT_LOG_ALL=y
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="ALL"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-
-#
-# Target options
-#
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_WITH_ARCH=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-CT_ARCH_SUPPORTS_WITH_FLOAT=y
-CT_ARCH_SUPPORTS_WITH_FPU=y
-CT_ARCH_SUPPORTS_SOFTFP=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-CT_ARCH_DEFAULT_LE=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_ARCH=""
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-CT_ARCH_BITNESS=32
-# CT_ARCH_FLOAT_HW is not set
-CT_ARCH_FLOAT_SW=y
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_microblaze_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
-CT_ARCH_x86_AVAILABLE=y
-
-#
-# Generic target options
-#
-CT_ARCH_USE_MMU=y
-CT_ARCH_ENDIAN="little"
-
-#
-# Target optimisations
-#
-# CT_ARCH_FLOAT_SOFTFP is not set
-CT_ARCH_FLOAT="soft"
-
-#
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-CT_ARCH_ARM_EABI=y
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_WANTS_STATIC_LINK=y
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Misc options
-#
-# CT_TOOLCHAIN_ENABLE_NLS is not set
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.6.3"
-# CT_KERNEL_bare_metal is not set
-CT_KERNEL_linux=y
-CT_KERNEL_bare_metal_AVAILABLE=y
-CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_6_3=y
-# CT_KERNEL_V_3_6_2 is not set
-# CT_KERNEL_V_3_6_1 is not set
-# CT_KERNEL_V_3_6 is not set
-# CT_KERNEL_V_3_5_7 is not set
-# CT_KERNEL_V_3_4_15 is not set
-# CT_KERNEL_V_3_3_8 is not set
-# CT_KERNEL_V_3_2_32 is not set
-# CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_48 is not set
-# CT_KERNEL_V_2_6_39_4 is not set
-# CT_KERNEL_V_2_6_38_8 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_33_20 is not set
-# CT_KERNEL_V_2_6_32_60 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_62 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-
-#
-# linux other options
-#
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_KERNEL_LINUX_INSTALL_CHECK=y
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-
-#
-# GNU binutils
-#
-# CT_BINUTILS_V_2_21_1a is not set
-CT_BINUTILS_V_2_20_1a=y
-# CT_BINUTILS_V_2_19_1a is not set
-# CT_BINUTILS_V_2_18a is not set
-CT_BINUTILS_VERSION="2.20.1a"
-CT_BINUTILS_2_20_or_later=y
-CT_BINUTILS_2_19_or_later=y
-CT_BINUTILS_2_18_or_later=y
-CT_BINUTILS_HAS_HASH_STYLE=y
-CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
-CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
-CT_BINUTILS_FORCE_LD_BFD=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-
-#
-# C compiler
-#
-CT_CC="gcc"
-CT_CC_VERSION="4.6.3"
-CT_CC_gcc=y
-# CT_CC_V_4_7_2 is not set
-CT_CC_V_4_6_3=y
-# CT_CC_V_4_6_2 is not set
-# CT_CC_V_4_6_1 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_4_5_3 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_4_4_7 is not set
-# CT_CC_V_4_4_6 is not set
-# CT_CC_V_4_4_5 is not set
-# CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_3 is not set
-# CT_CC_V_4_4_2 is not set
-# CT_CC_V_4_4_1 is not set
-# CT_CC_V_4_4_0 is not set
-# CT_CC_V_4_3_6 is not set
-# CT_CC_V_4_3_5 is not set
-# CT_CC_V_4_3_4 is not set
-# CT_CC_V_4_3_3 is not set
-# CT_CC_V_4_3_2 is not set
-# CT_CC_V_4_3_1 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_2 is not set
-CT_CC_GCC_4_2_or_later=y
-CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4_or_later=y
-CT_CC_GCC_4_5_or_later=y
-CT_CC_GCC_4_6=y
-CT_CC_GCC_4_6_or_later=y
-CT_CC_GCC_HAS_GRAPHITE=y
-CT_CC_GCC_HAS_LTO=y
-CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
-CT_CC_GCC_HAS_BUILD_ID=y
-CT_CC_GCC_USE_GMP_MPFR=y
-CT_CC_GCC_USE_PPL_CLOOG=y
-CT_CC_GCC_USE_MPC=y
-CT_CC_GCC_HAS_LIBQUADMATH=y
-# CT_CC_LANG_FORTRAN is not set
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_JAVA=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_JAVA is not set
-
-#
-# gcc other options
-#
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
-CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
-CT_CC_STATIC_LIBSTDCXX=y
-
-#
-# Optimisation features
-#
-CT_CC_GCC_USE_GRAPHITE=y
-CT_CC_GCC_USE_LTO=y
-
-#
-# Settings for libraries running on target
-#
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-# CT_CC_GCC_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-# CT_CC_GCC_LIBQUADMATH is not set
-
-#
-# Misc. obscure options.
-#
-CT_CC_CXA_ATEXIT=y
-# CT_CC_GCC_DISABLE_PCH is not set
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-# CT_CC_GCC_BUILD_ID is not set
-
-#
-# C-library
-#
-CT_LIBC="eglibc"
-CT_LIBC_VERSION="2_12"
-CT_LIBC_eglibc=y
-# CT_LIBC_glibc is not set
-# CT_LIBC_uClibc is not set
-CT_LIBC_eglibc_AVAILABLE=y
-# CT_LIBC_EGLIBC_V_2_16 is not set
-# CT_LIBC_EGLIBC_V_2_15 is not set
-# CT_LIBC_EGLIBC_V_2_14 is not set
-# CT_LIBC_EGLIBC_V_2_13 is not set
-CT_LIBC_EGLIBC_V_2_12=y
-# CT_LIBC_EGLIBC_V_2_11 is not set
-# CT_LIBC_EGLIBC_V_2_10 is not set
-# CT_LIBC_EGLIBC_V_2_9 is not set
-# CT_LIBC_EGLIBC_V_TRUNK is not set
-CT_LIBC_EGLIBC_2_12_or_later=y
-CT_LIBC_EGLIBC_2_11_or_later=y
-CT_LIBC_EGLIBC_2_10_or_later=y
-CT_LIBC_EGLIBC_2_9_or_later=y
-CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL=y
-CT_EGLIBC_REVISION="HEAD"
-# CT_EGLIBC_HTTP is not set
-# CT_EGLIBC_CHECKOUT is not set
-CT_EGLIBC_OPT_SIZE=y
-# CT_EGLIBC_CUSTOM_CONFIG is not set
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-CT_LIBC_XLDD=y
-
-#
-# eglibc other options
-#
-CT_LIBC_GLIBC_MAY_FORCE_PORTS=y
-CT_LIBC_glibc_familly=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
-CT_LIBC_GLIBC_CONFIGPARMS=""
-CT_LIBC_GLIBC_EXTRA_CFLAGS=""
-CT_LIBC_EXTRA_CC_ARGS=""
-# CT_LIBC_DISABLE_VERSIONING is not set
-CT_LIBC_OLDEST_ABI=""
-CT_LIBC_GLIBC_FORCE_UNWIND=y
-CT_LIBC_GLIBC_USE_PORTS=y
-CT_LIBC_ADDONS_LIST=""
-
-#
-# WARNING !!!                                            
-#
-
-#
-#   For glibc >= 2.8, it can happen that the tarballs    
-#
-
-#
-#   for the addons are not available for download.       
-#
-
-#
-#   If that happens, bad luck... Try a previous version  
-#
-
-#
-#   or try again later... :-(                            
-#
-# CT_LIBC_LOCALES is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
-# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.6.3"
-
-#
-# Debug facilities
-#
-# CT_DEBUG_dmalloc is not set
-# CT_DEBUG_duma is not set
-# CT_DEBUG_gdb is not set
-# CT_DEBUG_ltrace is not set
-# CT_DEBUG_strace is not set
-
-#
-# Companion libraries
-#
-CT_COMPLIBS_NEEDED=y
-CT_GMP_NEEDED=y
-CT_MPFR_NEEDED=y
-CT_PPL_NEEDED=y
-CT_CLOOG_NEEDED=y
-CT_MPC_NEEDED=y
-CT_COMPLIBS=y
-CT_GMP=y
-CT_MPFR=y
-CT_PPL=y
-CT_CLOOG=y
-CT_MPC=y
-# CT_GMP_V_5_0_2 is not set
-# CT_GMP_V_5_0_1 is not set
-CT_GMP_V_4_3_2=y
-# CT_GMP_V_4_3_1 is not set
-# CT_GMP_V_4_3_0 is not set
-CT_GMP_VERSION="4.3.2"
-# CT_MPFR_V_3_1_0 is not set
-# CT_MPFR_V_3_0_1 is not set
-# CT_MPFR_V_3_0_0 is not set
-CT_MPFR_V_2_4_2=y
-# CT_MPFR_V_2_4_1 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_VERSION="2.4.2"
-CT_PPL_V_0_11_2=y
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
-# CT_PPL_V_0_10_2 is not set
-CT_PPL_VERSION="0.11.2"
-CT_PPL_0_11=y
-CT_PPL_NEEDS_LIBPWL=y
-CT_CLOOG_V_0_15_11=y
-# CT_CLOOG_V_0_15_10 is not set
-# CT_CLOOG_V_0_15_9 is not set
-# CT_CLOOG_V_0_15_8 is not set
-# CT_CLOOG_V_0_15_7 is not set
-# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.11"
-CT_CLOOG_0_15_1x=y
-CT_CLOOG_NEEDS_AUTORECONF=y
-CT_MPC_V_0_9=y
-# CT_MPC_V_0_8_2 is not set
-# CT_MPC_V_0_8_1 is not set
-# CT_MPC_V_0_7 is not set
-CT_MPC_VERSION="0.9"
-
-#
-# Companion libraries common options
-#
-# CT_COMPLIBS_CHECK is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
deleted file mode 100644
index 5b4bbbaffb..0000000000
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ /dev/null
@@ -1,491 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# crosstool-NG 1.17.0 Configuration
-# Sat Dec  8 12:56:02 2012
-#
-CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_svn=y
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR=""
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR=""
-CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-# CT_INSTALL_DIR_RO is not set
-# CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
-
-#
-# Downloading
-#
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-CT_CONNECT_TIMEOUT=10
-# CT_ONLY_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
-# CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
-# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
-# CT_PATCH_NONE is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=0
-CT_LOAD=0
-CT_USE_PIPES=y
-CT_EXTRA_FLAGS_FOR_HOST=""
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="${bash}"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-# CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
-CT_LOG_ALL=y
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="ALL"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-
-#
-# Target options
-#
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_WITH_ARCH=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-CT_ARCH_SUPPORTS_WITH_FLOAT=y
-CT_ARCH_SUPPORTS_WITH_FPU=y
-CT_ARCH_SUPPORTS_SOFTFP=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-CT_ARCH_DEFAULT_LE=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_ARCH=""
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-CT_ARCH_BITNESS=32
-# CT_ARCH_FLOAT_HW is not set
-CT_ARCH_FLOAT_SW=y
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_microblaze_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
-CT_ARCH_x86_AVAILABLE=y
-
-#
-# Generic target options
-#
-CT_ARCH_USE_MMU=y
-CT_ARCH_ENDIAN="little"
-
-#
-# Target optimisations
-#
-# CT_ARCH_FLOAT_SOFTFP is not set
-CT_ARCH_FLOAT="soft"
-
-#
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-CT_ARCH_ARM_EABI=y
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_WANTS_STATIC_LINK=y
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Misc options
-#
-# CT_TOOLCHAIN_ENABLE_NLS is not set
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.6.3"
-# CT_KERNEL_bare_metal is not set
-CT_KERNEL_linux=y
-CT_KERNEL_bare_metal_AVAILABLE=y
-CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_6_3=y
-# CT_KERNEL_V_3_6_2 is not set
-# CT_KERNEL_V_3_6_1 is not set
-# CT_KERNEL_V_3_6 is not set
-# CT_KERNEL_V_3_5_7 is not set
-# CT_KERNEL_V_3_4_15 is not set
-# CT_KERNEL_V_3_3_8 is not set
-# CT_KERNEL_V_3_2_32 is not set
-# CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_48 is not set
-# CT_KERNEL_V_2_6_39_4 is not set
-# CT_KERNEL_V_2_6_38_8 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_33_20 is not set
-# CT_KERNEL_V_2_6_32_60 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_62 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-
-#
-# linux other options
-#
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_KERNEL_LINUX_INSTALL_CHECK=y
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-
-#
-# GNU binutils
-#
-# CT_BINUTILS_V_2_21_1a is not set
-CT_BINUTILS_V_2_20_1a=y
-# CT_BINUTILS_V_2_19_1a is not set
-# CT_BINUTILS_V_2_18a is not set
-CT_BINUTILS_VERSION="2.20.1a"
-CT_BINUTILS_2_20_or_later=y
-CT_BINUTILS_2_19_or_later=y
-CT_BINUTILS_2_18_or_later=y
-CT_BINUTILS_HAS_HASH_STYLE=y
-CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
-CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
-CT_BINUTILS_FORCE_LD_BFD=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-
-#
-# C compiler
-#
-CT_CC="gcc"
-CT_CC_VERSION="4.6.3"
-CT_CC_gcc=y
-# CT_CC_V_4_7_2 is not set
-CT_CC_V_4_6_3=y
-# CT_CC_V_4_6_2 is not set
-# CT_CC_V_4_6_1 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_4_5_3 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_4_4_7 is not set
-# CT_CC_V_4_4_6 is not set
-# CT_CC_V_4_4_5 is not set
-# CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_3 is not set
-# CT_CC_V_4_4_2 is not set
-# CT_CC_V_4_4_1 is not set
-# CT_CC_V_4_4_0 is not set
-# CT_CC_V_4_3_6 is not set
-# CT_CC_V_4_3_5 is not set
-# CT_CC_V_4_3_4 is not set
-# CT_CC_V_4_3_3 is not set
-# CT_CC_V_4_3_2 is not set
-# CT_CC_V_4_3_1 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_2 is not set
-CT_CC_GCC_4_2_or_later=y
-CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4_or_later=y
-CT_CC_GCC_4_5_or_later=y
-CT_CC_GCC_4_6=y
-CT_CC_GCC_4_6_or_later=y
-CT_CC_GCC_HAS_GRAPHITE=y
-CT_CC_GCC_HAS_LTO=y
-CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
-CT_CC_GCC_HAS_BUILD_ID=y
-CT_CC_GCC_USE_GMP_MPFR=y
-CT_CC_GCC_USE_PPL_CLOOG=y
-CT_CC_GCC_USE_MPC=y
-CT_CC_GCC_HAS_LIBQUADMATH=y
-# CT_CC_LANG_FORTRAN is not set
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_JAVA=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_JAVA is not set
-
-#
-# gcc other options
-#
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
-CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
-CT_CC_STATIC_LIBSTDCXX=y
-
-#
-# Optimisation features
-#
-CT_CC_GCC_USE_GRAPHITE=y
-CT_CC_GCC_USE_LTO=y
-
-#
-# Settings for libraries running on target
-#
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-# CT_CC_GCC_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-# CT_CC_GCC_LIBQUADMATH is not set
-
-#
-# Misc. obscure options.
-#
-CT_CC_CXA_ATEXIT=y
-# CT_CC_GCC_DISABLE_PCH is not set
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-# CT_CC_GCC_BUILD_ID is not set
-
-#
-# C-library
-#
-CT_LIBC="glibc"
-CT_LIBC_VERSION="2.14.1"
-# CT_LIBC_eglibc is not set
-CT_LIBC_glibc=y
-# CT_LIBC_uClibc is not set
-CT_LIBC_eglibc_AVAILABLE=y
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_GLIBC_V_2_14_1
-# CT_LIBC_GLIBC_V_2_14 is not set
-# CT_LIBC_GLIBC_V_2_13 is not set
-# CT_LIBC_GLIBC_V_2_12_2 is not set
-# CT_LIBC_GLIBC_V_2_12_1 is not set
-# CT_LIBC_GLIBC_V_2_11_1 is not set
-# CT_LIBC_GLIBC_V_2_11 is not set
-# CT_LIBC_GLIBC_V_2_10_1 is not set
-# CT_LIBC_GLIBC_V_2_9 is not set
-# CT_LIBC_GLIBC_V_2_8 is not set
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-CT_LIBC_XLDD=y
-CT_LIBC_GLIBC_MAY_FORCE_PORTS=y
-CT_LIBC_glibc_familly=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
-CT_LIBC_GLIBC_CONFIGPARMS=""
-CT_LIBC_GLIBC_EXTRA_CFLAGS=""
-CT_LIBC_EXTRA_CC_ARGS=""
-# CT_LIBC_DISABLE_VERSIONING is not set
-CT_LIBC_OLDEST_ABI=""
-CT_LIBC_GLIBC_FORCE_UNWIND=y
-CT_LIBC_GLIBC_USE_PORTS=y
-CT_LIBC_ADDONS_LIST=""
-# CT_LIBC_LOCALES is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
-# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="3.6.3"
-
-#
-# glibc other options
-#
-
-#
-# WARNING !!!                                            
-#
-
-#
-#   For glibc >= 2.8, it can happen that the tarballs    
-#
-
-#
-#   for the addons are not available for download.       
-#
-
-#
-#   If that happens, bad luck... Try a previous version  
-#
-
-#
-#   or try again later... :-(                            
-#
-
-#
-# Debug facilities
-#
-# CT_DEBUG_dmalloc is not set
-# CT_DEBUG_duma is not set
-# CT_DEBUG_gdb is not set
-# CT_DEBUG_ltrace is not set
-# CT_DEBUG_strace is not set
-
-#
-# Companion libraries
-#
-CT_COMPLIBS_NEEDED=y
-CT_GMP_NEEDED=y
-CT_MPFR_NEEDED=y
-CT_PPL_NEEDED=y
-CT_CLOOG_NEEDED=y
-CT_MPC_NEEDED=y
-CT_COMPLIBS=y
-CT_GMP=y
-CT_MPFR=y
-CT_PPL=y
-CT_CLOOG=y
-CT_MPC=y
-# CT_GMP_V_5_0_2 is not set
-# CT_GMP_V_5_0_1 is not set
-CT_GMP_V_4_3_2=y
-# CT_GMP_V_4_3_1 is not set
-# CT_GMP_V_4_3_0 is not set
-CT_GMP_VERSION="4.3.2"
-# CT_MPFR_V_3_1_0 is not set
-# CT_MPFR_V_3_0_1 is not set
-# CT_MPFR_V_3_0_0 is not set
-CT_MPFR_V_2_4_2=y
-# CT_MPFR_V_2_4_1 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_VERSION="2.4.2"
-CT_PPL_V_0_11_2=y
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
-# CT_PPL_V_0_10_2 is not set
-CT_PPL_VERSION="0.11.2"
-CT_PPL_0_11=y
-CT_PPL_NEEDS_LIBPWL=y
-CT_CLOOG_V_0_15_11=y
-# CT_CLOOG_V_0_15_10 is not set
-# CT_CLOOG_V_0_15_9 is not set
-# CT_CLOOG_V_0_15_8 is not set
-# CT_CLOOG_V_0_15_7 is not set
-# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.11"
-CT_CLOOG_0_15_1x=y
-CT_CLOOG_NEEDS_AUTORECONF=y
-CT_MPC_V_0_9=y
-# CT_MPC_V_0_8_2 is not set
-# CT_MPC_V_0_8_1 is not set
-# CT_MPC_V_0_7 is not set
-CT_MPC_VERSION="0.9"
-
-#
-# Companion libraries common options
-#
-# CT_COMPLIBS_CHECK is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
deleted file mode 100644
index 4f212639a9..0000000000
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ /dev/null
@@ -1,473 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# crosstool-NG 1.17.0 Configuration
-# Sat Dec  8 12:50:22 2012
-#
-CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_svn=y
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR=""
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR=""
-CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-# CT_INSTALL_DIR_RO is not set
-# CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
-
-#
-# Downloading
-#
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-CT_CONNECT_TIMEOUT=10
-# CT_ONLY_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
-# CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
-# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
-# CT_PATCH_NONE is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=0
-CT_LOAD=0
-CT_USE_PIPES=y
-CT_EXTRA_FLAGS_FOR_HOST=""
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="${bash}"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-# CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
-CT_LOG_ALL=y
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="ALL"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-
-#
-# Target options
-#
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_WITH_ARCH=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-CT_ARCH_SUPPORTS_WITH_FLOAT=y
-CT_ARCH_SUPPORTS_WITH_FPU=y
-CT_ARCH_SUPPORTS_SOFTFP=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-CT_ARCH_DEFAULT_LE=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_ARCH=""
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-CT_ARCH_BITNESS=32
-# CT_ARCH_FLOAT_HW is not set
-CT_ARCH_FLOAT_SW=y
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_microblaze_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
-CT_ARCH_x86_AVAILABLE=y
-
-#
-# Generic target options
-#
-CT_ARCH_USE_MMU=y
-CT_ARCH_ENDIAN="little"
-
-#
-# Target optimisations
-#
-# CT_ARCH_FLOAT_SOFTFP is not set
-CT_ARCH_FLOAT="soft"
-
-#
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-CT_ARCH_ARM_EABI=y
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_WANTS_STATIC_LINK=y
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Misc options
-#
-# CT_TOOLCHAIN_ENABLE_NLS is not set
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-CT_KERNEL="linux"
-CT_KERNEL_VERSION="3.6.3"
-# CT_KERNEL_bare_metal is not set
-CT_KERNEL_linux=y
-CT_KERNEL_bare_metal_AVAILABLE=y
-CT_KERNEL_linux_AVAILABLE=y
-CT_KERNEL_V_3_6_3=y
-# CT_KERNEL_V_3_6_2 is not set
-# CT_KERNEL_V_3_6_1 is not set
-# CT_KERNEL_V_3_6 is not set
-# CT_KERNEL_V_3_5_7 is not set
-# CT_KERNEL_V_3_4_15 is not set
-# CT_KERNEL_V_3_3_8 is not set
-# CT_KERNEL_V_3_2_32 is not set
-# CT_KERNEL_V_3_1_10 is not set
-# CT_KERNEL_V_3_0_48 is not set
-# CT_KERNEL_V_2_6_39_4 is not set
-# CT_KERNEL_V_2_6_38_8 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_33_20 is not set
-# CT_KERNEL_V_2_6_32_60 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_62 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
-CT_KERNEL_mingw32_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-
-#
-# linux other options
-#
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_KERNEL_LINUX_INSTALL_CHECK=y
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-
-#
-# GNU binutils
-#
-# CT_BINUTILS_V_2_21_1a is not set
-CT_BINUTILS_V_2_20_1a=y
-# CT_BINUTILS_V_2_19_1a is not set
-# CT_BINUTILS_V_2_18a is not set
-CT_BINUTILS_VERSION="2.20.1a"
-CT_BINUTILS_2_20_or_later=y
-CT_BINUTILS_2_19_or_later=y
-CT_BINUTILS_2_18_or_later=y
-CT_BINUTILS_HAS_HASH_STYLE=y
-CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
-CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-
-#
-# C compiler
-#
-CT_CC="gcc"
-CT_CC_VERSION="4.6.3"
-CT_CC_gcc=y
-# CT_CC_V_4_7_2 is not set
-CT_CC_V_4_6_3=y
-# CT_CC_V_4_6_2 is not set
-# CT_CC_V_4_6_1 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_4_5_3 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_4_4_7 is not set
-# CT_CC_V_4_4_6 is not set
-# CT_CC_V_4_4_5 is not set
-# CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_3 is not set
-# CT_CC_V_4_4_2 is not set
-# CT_CC_V_4_4_1 is not set
-# CT_CC_V_4_4_0 is not set
-# CT_CC_V_4_3_6 is not set
-# CT_CC_V_4_3_5 is not set
-# CT_CC_V_4_3_4 is not set
-# CT_CC_V_4_3_3 is not set
-# CT_CC_V_4_3_2 is not set
-# CT_CC_V_4_3_1 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_2 is not set
-CT_CC_GCC_4_2_or_later=y
-CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4_or_later=y
-CT_CC_GCC_4_5_or_later=y
-CT_CC_GCC_4_6=y
-CT_CC_GCC_4_6_or_later=y
-CT_CC_GCC_HAS_GRAPHITE=y
-CT_CC_GCC_HAS_LTO=y
-CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
-CT_CC_GCC_HAS_BUILD_ID=y
-CT_CC_GCC_USE_GMP_MPFR=y
-CT_CC_GCC_USE_PPL_CLOOG=y
-CT_CC_GCC_USE_MPC=y
-CT_CC_GCC_HAS_LIBQUADMATH=y
-# CT_CC_LANG_FORTRAN is not set
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_JAVA=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_JAVA is not set
-
-#
-# gcc other options
-#
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
-CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
-CT_CC_STATIC_LIBSTDCXX=y
-
-#
-# Optimisation features
-#
-CT_CC_GCC_USE_GRAPHITE=y
-CT_CC_GCC_USE_LTO=y
-
-#
-# Settings for libraries running on target
-#
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-# CT_CC_GCC_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-# CT_CC_GCC_LIBQUADMATH is not set
-
-#
-# Misc. obscure options.
-#
-CT_CC_CXA_ATEXIT=y
-# CT_CC_GCC_DISABLE_PCH is not set
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-# CT_CC_GCC_BUILD_ID is not set
-
-#
-# C-library
-#
-CT_LIBC="uClibc"
-CT_LIBC_VERSION="0.9.33.2"
-# CT_LIBC_eglibc is not set
-# CT_LIBC_glibc is not set
-CT_LIBC_uClibc=y
-CT_LIBC_eglibc_AVAILABLE=y
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
-CT_LIBC_UCLIBC_V_0_9_33_2=y
-# CT_LIBC_UCLIBC_V_0_9_33_1 is not set
-# CT_LIBC_UCLIBC_V_0_9_33 is not set
-# CT_LIBC_UCLIBC_V_0_9_32_1 is not set
-# CT_LIBC_UCLIBC_V_0_9_32 is not set
-# CT_LIBC_UCLIBC_V_0_9_30_3 is not set
-# CT_LIBC_UCLIBC_V_0_9_30_2 is not set
-# CT_LIBC_UCLIBC_V_0_9_30_1 is not set
-# CT_LIBC_UCLIBC_V_0_9_30 is not set
-CT_LIBC_UCLIBC_0_9_32_or_later=y
-CT_LIBC_UCLIBC_0_9_30_or_later=y
-CT_LIBC_UCLIBC_PARALLEL=y
-CT_LIBC_UCLIBC_VERBOSITY_0=y
-# CT_LIBC_UCLIBC_VERBOSITY_1 is not set
-# CT_LIBC_UCLIBC_VERBOSITY_2 is not set
-CT_LIBC_UCLIBC_VERBOSITY=""
-CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
-# CT_LIBC_UCLIBC_DEBUG_LEVEL_1 is not set
-# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
-# CT_LIBC_UCLIBC_DEBUG_LEVEL_3 is not set
-CT_LIBC_UCLIBC_DEBUG_LEVEL=0
-CT_LIBC_UCLIBC_CONFIG_FILE=""
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_LIBC_SUPPORT_THREADS_NONE=y
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-# CT_THREADS_NONE is not set
-CT_LIBC_XLDD=y
-
-#
-# uClibc other options
-#
-CT_LIBC_UCLIBC_LNXTHRD=""
-# CT_LIBC_UCLIBC_LOCALES is not set
-CT_LIBC_UCLIBC_WCHAR=y
-
-#
-# Debug facilities
-#
-# CT_DEBUG_dmalloc is not set
-# CT_DEBUG_duma is not set
-# CT_DEBUG_gdb is not set
-# CT_DEBUG_ltrace is not set
-# CT_DEBUG_strace is not set
-
-#
-# Companion libraries
-#
-CT_COMPLIBS_NEEDED=y
-CT_GMP_NEEDED=y
-CT_MPFR_NEEDED=y
-CT_PPL_NEEDED=y
-CT_CLOOG_NEEDED=y
-CT_MPC_NEEDED=y
-CT_COMPLIBS=y
-CT_GMP=y
-CT_MPFR=y
-CT_PPL=y
-CT_CLOOG=y
-CT_MPC=y
-# CT_GMP_V_5_0_2 is not set
-# CT_GMP_V_5_0_1 is not set
-CT_GMP_V_4_3_2=y
-# CT_GMP_V_4_3_1 is not set
-# CT_GMP_V_4_3_0 is not set
-CT_GMP_VERSION="4.3.2"
-# CT_MPFR_V_3_1_0 is not set
-# CT_MPFR_V_3_0_1 is not set
-# CT_MPFR_V_3_0_0 is not set
-CT_MPFR_V_2_4_2=y
-# CT_MPFR_V_2_4_1 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_VERSION="2.4.2"
-CT_PPL_V_0_11_2=y
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
-# CT_PPL_V_0_10_2 is not set
-CT_PPL_VERSION="0.11.2"
-CT_PPL_0_11=y
-CT_PPL_NEEDS_LIBPWL=y
-CT_CLOOG_V_0_15_11=y
-# CT_CLOOG_V_0_15_10 is not set
-# CT_CLOOG_V_0_15_9 is not set
-# CT_CLOOG_V_0_15_8 is not set
-# CT_CLOOG_V_0_15_7 is not set
-# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.11"
-CT_CLOOG_0_15_1x=y
-CT_CLOOG_NEEDS_AUTORECONF=y
-CT_MPC_V_0_9=y
-# CT_MPC_V_0_8_2 is not set
-# CT_MPC_V_0_8_1 is not set
-# CT_MPC_V_0_7 is not set
-CT_MPC_VERSION="0.9"
-
-#
-# Companion libraries common options
-#
-# CT_COMPLIBS_CHECK is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
deleted file mode 100644
index 19e87610fa..0000000000
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ /dev/null
@@ -1,396 +0,0 @@
-# Makefile fragment for building toolchain with crosstool-NG
-
-# As a reference, you can look at toolchain/toolchain-external/ext-tool.mk
-# for a generic approach to external toolchains.
-# crosstool-NG as a backend is but a kind of external toolchains,
-# except that it is not pre-built.
-
-#-----------------------------------------------------------------------------
-# Internal variables
-
-CTNG_DIR := $(BUILD_DIR)/build-toolchain
-
-CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/package/uclibc/uClibc-0.9.33.config
-CTNG_CONFIG_FILE := $(call qstrip,$(BR2_TOOLCHAIN_CTNG_CONFIG))
-
-# Hack! ct-ng is in fact a Makefile script. As such, it accepts all
-# make options, such as -C, which makes it uneeded to chdir prior
-# to calling ct-ng.
-# $1: the set of arguments to pass to ct-ng
-define ctng
-PATH=$(HOST_PATH) ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
-endef
-
-#-----------------------------------------------------------------------------
-toolchain-crosstool-ng: dependencies $(STAMP_DIR)/ct-ng-toolchain-installed
-
-# The target used by the infra structure to mean "we just want to
-# download the toolchain's sources, not build it" For crosstool-NG, we
-# need it to be configured before we can download; then we have to
-# override a config option to just do the download
-toolchain-crosstool-ng-source: $(CTNG_DIR)/.config
-	$(Q)$(call ctng,build CT_ONLY_DOWNLOAD=y)
-
-#-----------------------------------------------------------------------------
-# Installing the libs to target/ and staging/
-
-#--------------
-# The generic system libraries (in /lib)
-CTNG_LIBS_LIB := ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so    \
-                 libnsl.so libpthread.so libresolv.so librt.so libutil.so
-
-ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
-CTNG_LIBS_LIB += libthread_db.so
-endif
-
-#--------------
-# The libc-specific system libraries (in /lib)
-# Note: it may be needed to tweak the NSS libs in the glibc and eglibc cases...
-CTNG_LIBS_uClibc :=
-CTNG_LIBS_glibc  := libnss_files.so libnss_dns.so
-CTNG_LIBS_eglibc := $(CTNG_LIBS_glibc)
-
-#--------------
-# All that we need in /lib
-CTNG_LIBS_LIB += $(CTNG_LIBS_$(call qstrip,$(BR2_TOOLCHAIN_CTNG_LIBC)))
-
-#--------------
-# All that we need in /usr/lib
-ifneq ($(BR2_INSTALL_LIBSTDCPP),)
-CTNG_LIBS_USR_LIB += libstdc++.so
-endif
-
-#--------------
-# Actual copy
-$(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
-	$(Q)mkdir -p $(TARGET_DIR)/lib
-	$(Q)CTNG_TUPLE="$$( $(call ctng,show-tuple 2>&1) )";                \
-	    CTNG_SYSROOT="$(HOST_DIR)/usr/$${CTNG_TUPLE}/sysroot";          \
-	    $(call MESSAGE,"Copying toolchain libraries to target...");     \
-	    for libs in $(CTNG_LIBS_LIB); do                                \
-	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},,lib,$$libs,/lib); \
-	    done;                                                           \
-	    for libs in $(CTNG_LIBS_USR_LIB); do                            \
-	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},,lib,$$libs,/usr/lib); \
-	    done;
-	$(Q)touch $@
-
-#-----------------------------------------------------------------------------
-# Building the toolchain
-# Note: $(STAMP_DIR)/ct-ng-toolchain-built can have more dependencies,
-#       depending on the selected C library. Those deps are added later
-
-$(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/.config
-	$(Q)$(call MESSAGE,"Building the crosstool-NG toolchain")
-	$(Q)$(call ctng,build.$(PARALLEL_JOBS))
-	$(Q)printf "\n"
-	$(Q)touch $@
-
-#-----------------------------------------------------------------------------
-# Configuring the toolchain
-
-#--------------
-# We push BR options down to CT-NG, munging the default configuration
-# with sed expressions.
-# - first one for non-path options
-# - second for path options (because they have no prompt, they
-#                            always get set to the default value)
-# - third for C library .config (if it has one, eg. uClibc)
-CTNG_FIX_BUILDROOT_CONFIG_SED       :=
-CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED :=
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED  :=
-
-#--------------
-# A few generic functions
-
-# Munge a config file, given a sed expression
-# $1: the .config file to munge
-# $2: the sed expression to apply
-define ctng-fix-dot-config
-	$(Q)sed -r -e '$(2)' $(1) >$(1).sed
-	$(Q)cmp $(1) $(1).sed >/dev/null 2>&1 && rm -f $(1).sed || mv -f $(1).sed $(1)
-endef
-
-# This function checks the .config did actually change
-# If not changed, then current .config will be touched with reference to the
-# stamp file. If the configuration did change, nothing is done.
-# $1: the current .config to check
-# $2: the time-stamped .config file
-define ctng-check-config-changed
-	$(Q)old_md5="$$( grep -v -E '^(#|$$)' $(2) 2>/dev/null  \
-	                 |md5sum                                \
-	                 |cut -d ' ' -f 1                       \
-	               )";                                      \
-	    new_md5="$$( grep -v -E '^(#|$$)' $(1) 2>/dev/null  \
-	                 |md5sum                                \
-	                 |cut -d ' ' -f 1                       \
-	               )";                                      \
-	    if [ $${old_md5} = $${new_md5} -a -f $(2) ]; then   \
-	        touch -r $(2) $(1);                             \
-	    fi
-endef
-
-#--------------
-# Massage BR2_ARCH so that it matches CT-NG's ARCH
-#
-# Note: a lot of the following tricks would become unneeded if one day
-# buildroot and crosstool-NG had matching options, especially for the
-# target description: arch name, bitness, endianness...
-#
-# Note-2: missing conformity check between BR's .config and libc features.
-# Use check_uclibc or check_glibc.
-
-# Defaults:
-CTNG_ARCH   := $(CTNG_BR2_ARCH)
-CTNG_ENDIAN :=
-CTNG_BIT    :=
-# Architecture overides, only overide pertinent vars:
-ifeq      ($(BR2_arm),y)
-CTNG_ARCH   := arm
-CTNG_ENDIAN := LE
-else ifeq ($(BR2_armeb),y)
-CTNG_ARCH   := arm
-CTNG_ENDIAN := BE
-else ifeq ($(BR2_i386),y)
-CTNG_ARCH   := x86
-CTNG_BIT    := 32
-else ifeq ($(BR2_mips),y)
-CTNG_ARCH   := mips
-CTNG_ENDIAN := BE
-else ifeq ($(BR2_mipsel),y)
-CTNG_ARCH   := mips
-CTNG_ENDIAN := LE
-else ifeq ($(BR2_powerpc),y)
-CTNG_ARCH   := powerpc
-CTNG_BIT    := 32
-else ifeq ($(BR2_x86_64),y)
-CTNG_ARCH   := x86
-CTNG_BIT    := 64
-# Add other architecture overides below:
-#  - keep alphabetic order
-#  - duplicate next 4 lines, and uncomment
-#       else ifeq ($(BR2_<arch_name_here>),y)
-#       CTNG_ARCH   :=
-#       CTNG_ENDIAN :=
-#       CTNG_BIT    :=
-#  - remove unneeded vars
-#  - add BR arch-name on ifeq line
-#  - fill-in required CTNG_* vars
-endif
-
-#--------------
-# Massage BR options into CTNG .config file
-# CT_ARCH                   : handled by the backend mechanism
-# CT_ARCH_[BL]E             : endianness
-# CT_ARCH_(32|64)           : bitness
-# CT_PREFIX_DIR             : install into BR's toolchain dir
-# CT_INSTALL_DIR_RO         : do *not* chmod a-w the toolchain dir
-# CT_LOCAL_TARBALLS_DIR     : share downloads with BR
-# CT_SYSROOT_DIR_PREFIX     : no prefix needed, really
-# CT_TARGET_VENDOR          : try to set a unique vendor string, to avoid clashing with BR's vendor string
-# CT_TARGET_ALIAS           : set the target tuple alias to GNU_TARGET_NAME so that packages' ./configure find the compiler
-# CT_DEBUG_gdb              : deselect gdb+gdbserver if buildroot builds its own
-# CT_CC_LANG_CXX            : required if we copy libstdc++.so, and build C++
-# CT_LIBC_UCLIBC_CONFIG_FILE: uClibc config file, if needed
-#
-# Lots of other awfull sed manipulations go here, to override CT-NG's .config
-# with BR2 config options.
-# Known missing: arch options, uClibc/eglibc config...
-#
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_INSTALL_DIR_RO)=y:\# \1 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_ARCH_[BL]E).*:\# \2 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_ENDIAN)) is not set:\1=y:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="buildroot":;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(ARCH)-linux":;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
-ifneq ($(call qstrip,$(BR2_USE_MMU)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_USE_MMU)=y:\# \1 is not set:;
-endif
-ifneq ($(call qstrip,$(BR2_PACKAGE_GDB_SERVER))$(call qstrip,$(BR2_PACKAGE_GDB_HOST)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_DEBUG_gdb)=.*:\# \1 is not set:;
-endif
-ifeq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_CXX)),y)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_CC_LANG_CXX) is not set:\1=y:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_CC_LANG_CXX)=.*:\# \1 is not set:;
-endif
-
-# Shoe-horn CPU variant now
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_ARCH)=.*:\1=$(BR2_GCC_TARGET_ARCH):;
-endif
-ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_TUNE)=.*:\1=$(BR2_GCC_TARGET_TUNE):;
-endif
-
-# And floating point now
-ifeq ($(call qstrip,$(BR2_SOFT_FLOAT)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_FLOAT_HW) is not set:\1=y:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_FLOAT_SW)=y:\# \1 is not set:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_ARCH_FLOAT_HW)=y:\# \1 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_ARCH_FLOAT_SW) is not set:\1=y:;
-endif
-
-# Thread implementation selection
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NONE).*:\# \2 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_LINUXTHREADS).*:\# \2 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NPTL).*:\# \2 is not set:;
-ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS))$(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_LINUXTHREADS).*:\2=y:;
- ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc)),)
-  ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_PTHREADS_OLD)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_NEW).*:\# \2 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_OLD).*:\2=y:;
-  else
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_OLD).*:\# \2 is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_LIBC_UCLIBC_LNXTHRD_NEW).*:\2=y:;
-  endif
- endif
-else ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_NPTL)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NPTL).*:\2=y:;
-else ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_THREADS_NONE)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(|\# )(CT_THREADS_NONE).*:\2=y:;
-endif
-
-#--------------
-# And the specials for paths
-CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_PREFIX_DIR)=.*:\1="$(HOST_DIR)/usr":;
-CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_LOCAL_TARBALLS_DIR)=.*:\1="$(DL_DIR)":;
-CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_NAME)=.*:\1="sysroot":;
-CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
-
-#--------------
-# uClibc specific options
-ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y)
-
-# Handle the locales option
-ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_LOCALE)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_LOCALES) is not set:\1=y\n\# CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA is not set:;
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA)=.*:\# \1 is not set:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES)=.*:\# \1 is not set:;
-endif
-
-# Handle the wide-char option
-ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_WCHAR)),)
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_WCHAR) is not set:\1=y:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
-endif
-
-# Handle the LFS option
-ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_LARGEFILE)),)
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_LFS) is not set:\1=y:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
-endif
-
-# Handle the IPv6 option
-ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6)),)
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_IPV6) is not set:\1=y:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
-endif
-
-# Handle the RPC option
-ifneq ($(call qstrip,$(BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC)),)
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_RPC) is not set:\1=y\nUCLIBC_HAS_FULL_RPC=y\nUCLIBC_HAS_REENTRANT_RPC=y:;
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_FULL_RPC) is not set:\1=y:;
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_REENTRANT_RPC) is not set:\1=y:;
-else
-CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_RPC)=.*:\# \1 is not set:;
-endif
-
-# Instruct CT-NG's .config where to find the uClibc's .config
-CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED += s:^(CT_LIBC_UCLIBC_CONFIG_FILE)=.*:\1="$(CTNG_DIR)/libc.config":;
-
-# And add this to the toolchain build dependency
-$(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/libc.config
-
-# And here is how we get this uClibc's .config
-$(CTNG_DIR)/libc.config: $(CTNG_UCLIBC_CONFIG_FILE) $(BUILDROOT_CONFIG)
-	-$(Q)cp -a $@ $@.timestamp
-	$(Q)cp -f $< $@
-	$(call ctng-fix-dot-config,$@,$(CTNG_FIX_BUILDROOT_CONFIG_LIBC_SED))
-	$(call ctng-check-config-changed,$@,$@.timestamp)
-	$(Q)rm -f $@.timestamp
-
-endif # LIBC is uClibc
-
-#--------------
-# glibc/eglibc specific options
-ifeq ($(BR2_TOOLCHAIN_CTNG_glibc)$(BR2_TOOLCHAIN_CTNG_eglibc),y)
-
-# Force unwind support
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^\# (CT_LIBC_GLIBC_FORCE_UNWIND) is not set:\1=y:;
-
-# Force non-fortified build
-CTNG_FIX_BUILDROOT_CONFIG_SED += s:^(CT_LIBC_ENABLE_FORTIFIED_BUILD)=y:\# \1 is not set:;
-
-endif # LIBC is glibc or eglibc
-
-#--------------
-# Small functions to shoe-horn the above into crosstool-NG's .config
-
-# Function to update the .config
-# We first munge the .config to shoe-horn defaults, then we push that unto
-# crosstool-NG's oldconfig process, to sort out wizy-wazy deps, and then we
-# shoe-horn paths again, as they get ripped-out by oldconfig (is that a bug
-# or a feature of kconfig?)
-# $1: the .config file to munge
-define ctng-oldconfig
-	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_BUILDROOT_CONFIG_SED))
-	$(Q)yes ''                                             |\
-	$(call ctng,CT_IS_A_BACKEND=y                           \
-	            CT_BACKEND_ARCH=$(CTNG_ARCH)                \
-	            CT_BACKEND_KERNEL=linux                     \
-	            CT_BACKEND_LIBC=$(BR2_TOOLCHAIN_CTNG_LIBC)  \
-	            oldconfig                                   )
-	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_BUILDROOT_CONFIG_PATHS_SED))
-endef
-
-# We need the host crosstool-NG before we can even begin working
-# on the toolchain. Using order-only dependency, as we do not want
-# to rebuild the toolchain for every run...
-$(CTNG_DIR)/.config: | host-crosstool-ng
-
-# Default configuration
-# Only copy the original .config file if we don't have one already.
-# Check that given config file matches selected C library.
-# We need to call oldconfig twice in a row to ensure the options
-# are correctly set ( eg. if an option is new, then the initial sed
-# can't do anything about it ) Ideally, this should go in oldconfig
-# itself, but it's much easier to handle here.
-$(CTNG_DIR)/.config:
-	$(Q)if [ ! -f $@ ]; then                                                        \
-	        mkdir -p "$(CTNG_DIR)";                                                 \
-	        libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }'                    \
-	                        "$(CTNG_CONFIG_FILE)"                                   \
-	                )";                                                             \
-	        if [ "$${libc}" != "$(BR2_TOOLCHAIN_CTNG_LIBC)" ]; then                 \
-	            echo "* Inconsistency in crosstool-NG config file '$(CTNG_CONFIG_FILE)'"; \
-	            echo "* - buildroot configured for '$(BR2_TOOLCHAIN_CTNG_LIBC)'";   \
-	            echo "* - given config file for '$${libc}'";                        \
-	            exit 1;                                                             \
-	        fi;                                                                     \
-	        cp -f $(CTNG_CONFIG_FILE) $@;                                                            \
-	    fi
-	$(call ctng-oldconfig,$@)
-	$(call ctng-oldconfig,$@)
-
-# Manual configuration
-ctng-menuconfig: $(CTNG_DIR)/.config
-	$(Q)cp -a $< $<.timestamp
-	$(Q)$(call ctng,CT_IS_A_BACKEND=y                           \
-	                CT_BACKEND_ARCH=$(CTNG_ARCH)                \
-	                CT_BACKEND_KERNEL=linux                     \
-	                CT_BACKEND_LIBC=$(BR2_TOOLCHAIN_CTNG_LIBC)  \
-	                menuconfig                                  )
-	$(call ctng-oldconfig,$<)
-	$(call ctng-check-config-changed,$<,$<.timestamp)
-	$(Q)rm -f $<.timestamp

From d191c916272fcbac2fd12c4a064530743139dfe5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 16:19:12 +0200
Subject: [PATCH 6326/6849] docs: update manual after Crosstool-NG backend
 removal

[Peter: remove a few more ctng references in customize-store.txt]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/configure.txt           | 60 ++---------------------------
 docs/manual/customize-store.txt     | 22 +++++------
 docs/manual/customize-toolchain.txt | 12 ------
 docs/manual/make-tips.txt           |  2 -
 docs/manual/rebuilding-packages.txt |  2 -
 5 files changed, 14 insertions(+), 84 deletions(-)

diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index 56b04696d2..8912a81560 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -47,8 +47,7 @@ target system uses ARM, the regular compilation toolchain on your host
 runs on x86 and generates code for x86, while the cross-compilation
 toolchain runs on x86 and generates code for ARM.
 
-Buildroot provides different solutions to build, or use existing
-cross-compilation toolchains:
+Buildroot provides two solutions for the cross-compilation toolchain:
 
  * The *internal toolchain backend*, called +Buildroot toolchain+ in
    the configuration interface.
@@ -56,10 +55,7 @@ cross-compilation toolchains:
  * The *external toolchain backend*, called +External toolchain+ in
    the configuration interface.
 
- * The *Crosstool-NG toolchain backend*, called +Crosstool-NG
-   toolchain+ in the configuration interface.
-
-The choice between these three solutions is done using the +Toolchain
+The choice between these two solutions is done using the +Toolchain
 Type+ option in the +Toolchain+ menu. Once one solution has been
 chosen, a number of configuration options appear, they are detailed in
 the following sections.
@@ -76,8 +72,8 @@ This backend is the historical backend of Buildroot, and has been
 limited for a long time to the usage of the
 http://www.uclibc.org[uClibc C library]. Support for the _eglibc_ C
 library has been added in 2013 and is at this point considered
-experimental. See the _External toolchain backend_ and _Crosstool-NG
-toolchain backend_ for other solutions to use _glibc_ or _eglibc_.
+experimental. See the _External toolchain backend_ for another
+solution to use _glibc_ or _eglibc_.
 
 Once you have selected this backend, a number of options appear. The
 most important ones allow to:
@@ -242,54 +238,6 @@ Drawbacks of this backend:
   fix from the toolchain vendor, unless you build your external
   toolchain by yourself using Crosstool-NG.
 
-[[crosstool-ng-toolchain-backend]]
-Crosstool-NG toolchain backend
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The _Crosstool-NG toolchain backend_ integrates the
-http://crosstool-ng.org[Crosstool-NG] project with
-Buildroot. Crosstool-NG is a highly-configurable, versatile and
-well-maintained tool to build cross-compilation toolchains.
-
-If you select the +Crosstool-NG toolchain+ option in +Toolchain Type+,
-then you will be offered to:
-
- * Choose which C library you want to use. Crosstool-NG supports the
-   three most important C libraries used in Linux systems: glibc,
-   eglibc and uClibc
-
- * Choose a custom Crosstool-NG configuration file. Buildroot has its
-   own default configuration file (one per C library choice), but you
-   can provide your own. Another option is to run +make
-   ctng-menuconfig+ to get access to the Crosstool-NG configuration
-   interface. However, note that all Buildroot packages have only been
-   tested with the default Crosstool-NG configurations.
-
- * Choose a number of toolchain options (rather limited if glibc or
-   eglibc are used, or numerous if uClibc is used)
-
-When you will start the Buildroot build process, Buildroot will
-download and install the Crosstool-NG tool, build and install its
-required dependencies, and then run Crosstool-NG with the provided
-configuration.
-
-Advantages of this backend:
-
-* Not limited to uClibc: glibc and eglibc are supported.
-
-* Vast possibilities of toolchain configuration.
-
-Drawbacks of this backend:
-
-* Crosstool-NG is not perfectly integrated with Buildroot. For
-  example, Crosstool-NG has its own download infrastructure, not
-  integrated with the one in Buildroot (for example a Buildroot +make
-  source+ will not download all the source code tarballs needed by
-  Crosstool-NG).
-
-* The toolchain is completely rebuilt from scratch if you do a +make
-  clean+.
-
 /dev management
 ~~~~~~~~~~~~~~~
 
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
index 5083339ec0..8fb5b57bb5 100644
--- a/docs/manual/customize-store.txt
+++ b/docs/manual/customize-store.txt
@@ -42,13 +42,14 @@ Alternatively, you can copy the file to any other place and rebuild with
 Other package configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The configuration files for busybox, the linux kernel, barebox, uClibc and
-crosstool-NG should be stored as well if changed. For each of these, a
-buildroot configuration option exists to point to an input configuration
-file, e.g. +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+.  To save their
-configuration, set those configuration options to a path outside
-your output directory, e.g. +board/<manufacturer>/<boardname>/linux.config+.
-Then, copy the configuration files to that path.
+The configuration files for busybox, the linux kernel, barebox and
+uClibc should be stored as well if changed. For each of these, a
+buildroot configuration option exists to point to an input
+configuration file, e.g. +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+.  To
+save their configuration, set those configuration options to a path
+outside your output directory,
+e.g. +board/<manufacturer>/<boardname>/linux.config+.  Then, copy the
+configuration files to that path.
 
 Make sure that you create a configuration file 'before' changing
 the +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ etc. options.  Otherwise,
@@ -70,9 +71,8 @@ configuration files easier.
   path specified by +BR2_UCLIBC_CONFIG+.
 * +make barebox-update-defconfig+ saves the barebox configuration to the
   path specified by +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+.
-* For crosstool-NG and at91bootstrap3, no helper exists so you
-  have to copy the config file manually to +BR2_TOOLCHAIN_CTNG_CONFIG+,
-  resp. +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+.
+* For at91bootstrap3, no helper exists so you have to copy the config
+  file manually to +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+.
 
 
 [[customize-store-board-support]]
@@ -130,14 +130,12 @@ you can skip the steps that are not relevant for your use case.
    (as far as they are relevant):
    * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+
    * +BR2_PACKAGE_BUSYBOX_CONFIG+
-   * +BR2_TOOLCHAIN_CTNG_CONFIG+
    * +BR2_UCLIBC_CONFIG+
    * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+
    * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+
 1. Write the configuration files:
    * +make linux-update-defconfig+
    * +make busybox-update-config+
-   * +cp <output>/build/build-toolchain/.config board/<manufacturer>/<boardname>/ctng.config+
    * +make uclibc-update-config+
    * +cp <output>/build/at91bootstrap3-*/.config board/<manufacturer>/<boardname>/at91bootstrap3.config+
    * +make barebox-update-defconfig+
diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 82ecc28431..841dbfd0c4 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -44,15 +44,3 @@ However, it allows to tune major settings, such as:
 
 These settings are available after selecting the +Buildroot toolchain+ type in
 the menu +Toolchain+.
-
-Using the Crosstool-NG backend
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The http://crosstool-ng.org[crosstool-NG] toolchain backend enables a rather
-limited set of settings under the Buildroot +Toolchain+ menu:
-
-* The http://crosstool-ng.org[crosstool-NG] configuration file
-
-* Gdb and some toolchain options
-
-Then, the toolchain can be fine-tuned by invoking +make ctng-menuconfig+.
diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index c3fd155721..31a88bf0b0 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -36,8 +36,6 @@ some settings in the +.config+ file may hide some targets:
   +linux+ is enabled;
 * +uclibc-menuconfig+ is only available when the
   Buildroot internal toolchain backend is used;
-* +ctng-menuconfig+ is only available when the
-  crosstool-NG backend is used;
 * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the
   +barebox+ bootloader is enabled.
 
diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt
index 044c908962..88d667015d 100644
--- a/docs/manual/rebuilding-packages.txt
+++ b/docs/manual/rebuilding-packages.txt
@@ -17,8 +17,6 @@ In some cases, a full rebuild is mandatory:
 
 ** after changing any toolchain option under the _Toolchain_ menu (if
    the internal Buildroot backend is used);
-** after running +make ctng-menuconfig+ (if the crosstool-NG backend
-   is used);
 ** after running +make uclibc-menuconfig+.
 
 * after removing some libraries from the package selection.

From c58a80b4cd6b620622e567218ded34104c6d46b6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 16:19:13 +0200
Subject: [PATCH 6327/6849] toolchain-external: make ext-tool.mk includable in
 all cases

The ext-tool.mk logic uses the TOOLCHAIN_EXTERNAL_PREFIX variable
unconditionally, even if the external toolchain is not used. Until now
this wasn't a problem since ext-tool.mk was only included when the
external toolchain backend was selected, but the next patches are
going to include this file unconditionally.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/ext-tool.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index db2a99e01b..8cfd1b1537 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -1,4 +1,3 @@
-
 #
 # This file implements the support for external toolchains, i.e
 # toolchains that have not been produced by Buildroot itself and that
@@ -112,8 +111,10 @@ TOOLCHAIN_EXTERNAL_DIR=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 endif
 
 ifeq ($(TOOLCHAIN_EXTERNAL_DIR),)
+ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
 # if no path set, figure it out from path
 TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
+endif
 else
 ifeq ($(BR2_bfin),y)
 TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin

From de06c9cece89e966b3eb2de1dc5e0ee7a0e43786 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sun, 6 Oct 2013 21:03:07 +0200
Subject: [PATCH 6328/6849] git: bump to version 1.8.4.1

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/git/git.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/git/git.mk b/package/git/git.mk
index b8a762337f..58455b15b4 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GIT_VERSION         = 1.8.3
+GIT_VERSION         = 1.8.4.1
 GIT_SITE            = http://git-core.googlecode.com/files/
 GIT_LICENSE         = GPLv2 LGPLv2.1+
 GIT_LICENSE_FILES   = COPYING LGPL-2.1

From 1360b6b4ef1a3bbd3121f4e659343d75b390ae0e Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 25 Sep 2013 10:56:34 +0200
Subject: [PATCH 6329/6849] trivial: manual: fix typo formating --> formatting

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-directory.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 7bf37c27a6..ca72970365 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -203,5 +203,5 @@ different way, using different infrastructures:
    CMake. We cover them through a xref:cmake-package-tutorial[tutorial]
    and xref:cmake-package-reference[reference].
 
-Further formating details: see xref:writing-rules-mk[the writing
+Further formatting details: see xref:writing-rules-mk[the writing
 rules].

From 0e2e7c71d0d3331053f97c140621b2d8374726ac Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Wed, 25 Sep 2013 11:07:47 +0200
Subject: [PATCH 6330/6849] package: remove the default value of the
 $(PKG)_SOURCE variable

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com)
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/aircrack-ng/aircrack-ng.mk                   | 1 -
 package/avahi/avahi.mk                               | 1 -
 package/axel/axel.mk                                 | 1 -
 package/bmon/bmon.mk                                 | 1 -
 package/bridge-utils/bridge-utils.mk                 | 1 -
 package/bsdiff/bsdiff.mk                             | 1 -
 package/cramfs/cramfs.mk                             | 1 -
 package/ctorrent/ctorrent.mk                         | 1 -
 package/dbus-glib/dbus-glib.mk                       | 1 -
 package/dbus-python/dbus-python.mk                   | 1 -
 package/dfu-util/dfu-util.mk                         | 1 -
 package/dhcpdump/dhcpdump.mk                         | 1 -
 package/docker/docker.mk                             | 1 -
 package/dsp-tools/dsp-tools.mk                       | 1 -
 package/elftosb/elftosb.mk                           | 1 -
 package/enchant/enchant.mk                           | 1 -
 package/ezxml/ezxml.mk                               | 1 -
 package/fbdump/fbdump.mk                             | 1 -
 package/fbgrab/fbgrab.mk                             | 1 -
 package/fbset/fbset.mk                               | 1 -
 package/fbv/fbv.mk                                   | 1 -
 package/fconfig/fconfig.mk                           | 1 -
 package/flac/flac.mk                                 | 1 -
 package/fontconfig/fontconfig.mk                     | 1 -
 package/gamin/gamin.mk                               | 1 -
 package/genext2fs/genext2fs.mk                       | 1 -
 package/genromfs/genromfs.mk                         | 1 -
 package/giblib/giblib.mk                             | 1 -
 package/gnuchess/gnuchess.mk                         | 1 -
 package/gqview/gqview.mk                             | 1 -
 package/gsl/gsl.mk                                   | 1 -
 package/gstreamer/gst-omapfb/gst-omapfb.mk           | 1 -
 package/intltool/intltool.mk                         | 1 -
 package/iperf/iperf.mk                               | 1 -
 package/ipkg/ipkg.mk                                 | 1 -
 package/irda-utils/irda-utils.mk                     | 1 -
 package/lcdproc/lcdproc.mk                           | 1 -
 package/leafpad/leafpad.mk                           | 1 -
 package/libarchive/libarchive.mk                     | 1 -
 package/libatomic_ops/libatomic_ops.mk               | 1 -
 package/libbsd/libbsd.mk                             | 1 -
 package/libdmtx/libdmtx.mk                           | 1 -
 package/libdnet/libdnet.mk                           | 1 -
 package/libelf/libelf.mk                             | 1 -
 package/libev/libev.mk                               | 1 -
 package/libftdi/libftdi.mk                           | 1 -
 package/libgeotiff/libgeotiff.mk                     | 1 -
 package/libhid/libhid.mk                             | 1 -
 package/libiconv/libiconv.mk                         | 1 -
 package/libid3tag/libid3tag.mk                       | 1 -
 package/libiscsi/libiscsi.mk                         | 1 -
 package/liblo/liblo.mk                               | 1 -
 package/libmms/libmms.mk                             | 1 -
 package/libmpeg2/libmpeg2.mk                         | 1 -
 package/liboauth/liboauth.mk                         | 1 -
 package/librsvg/librsvg.mk                           | 1 -
 package/librsync/librsync.mk                         | 1 -
 package/libseccomp/libseccomp.mk                     | 1 -
 package/libsexy/libsexy.mk                           | 1 -
 package/linux-fusion/linux-fusion.mk                 | 1 -
 package/logrotate/logrotate.mk                       | 1 -
 package/logsurfer/logsurfer.mk                       | 1 -
 package/lrzsz/lrzsz.mk                               | 1 -
 package/lsuio/lsuio.mk                               | 1 -
 package/lzop/lzop.mk                                 | 1 -
 package/madplay/madplay.mk                           | 1 -
 package/memtester/memtester.mk                       | 1 -
 package/minicom/minicom.mk                           | 1 -
 package/netcat/netcat.mk                             | 1 -
 package/numactl/numactl.mk                           | 1 -
 package/opkg/opkg.mk                                 | 1 -
 package/pcmanfm/pcmanfm.mk                           | 1 -
 package/pkg-config/pkg-config.mk                     | 1 -
 package/protobuf/protobuf.mk                         | 1 -
 package/quota/quota.mk                               | 1 -
 package/rdesktop/rdesktop.mk                         | 1 -
 package/readline/readline.mk                         | 1 -
 package/rsync/rsync.mk                               | 1 -
 package/sane-backends/sane-backends.mk               | 1 -
 package/scons/scons.mk                               | 1 -
 package/startup-notification/startup-notification.mk | 1 -
 package/statserial/statserial.mk                     | 1 -
 package/supervisor/supervisor.mk                     | 1 -
 package/synergy/synergy.mk                           | 1 -
 package/tidsp-binaries/tidsp-binaries.mk             | 1 -
 package/torsmo/torsmo.mk                             | 1 -
 package/udpcast/udpcast.mk                           | 1 -
 package/vtun/vtun.mk                                 | 1 -
 package/x11vnc/x11vnc.mk                             | 1 -
 package/xinetd/xinetd.mk                             | 1 -
 package/xstroke/xstroke.mk                           | 1 -
 package/xvkbd/xvkbd.mk                               | 1 -
 package/yasm/yasm.mk                                 | 1 -
 93 files changed, 93 deletions(-)

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index 00f4bac436..f4a2188c40 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 AIRCRACK_NG_VERSION = 1.1
-AIRCRACK_NG_SOURCE = aircrack-ng-$(AIRCRACK_NG_VERSION).tar.gz
 AIRCRACK_NG_SITE = http://download.aircrack-ng.org
 AIRCRACK_NG_LICENSE = GPLv2+
 AIRCRACK_NG_LICENSE_FILES = LICENSE
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index eb76d795f9..89aa023a78 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -12,7 +12,6 @@
 # later version.
 
 AVAHI_VERSION = 0.6.31
-AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
 AVAHI_SITE = http://www.avahi.org/download/
 AVAHI_LICENSE = LGPLv2.1+
 AVAHI_LICENSE_FILES = LICENSE
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index e8be1a6249..c0e2e653ef 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 AXEL_VERSION = 2.4
-AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
 AXEL_SITE = https://alioth.debian.org/frs/download.php/file/3015
 AXEL_LICENSE = GPLv2+
 AXEL_LICENSE_FILES = COPYING
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index bb6f17e2da..f852f49f17 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 BMON_VERSION = 2.1.0
-BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
 BMON_SITE = http://distfiles.gentoo.org/distfiles
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index 6c1975f8cf..4a2199058c 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 BRIDGE_UTILS_VERSION = 1.5
-BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz
 BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge
 BRIDGE_UTILS_AUTORECONF = YES
 BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 13c7c16022..259dc4f2c0 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 BSDIFF_VERSION = 4.3
-BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz
 BSDIFF_SITE = http://www.daemonology.net/bsdiff
 BSDIFF_DEPENDENCIES = bzip2
 
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index f38ac1aa12..0f29dd04ef 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 CRAMFS_VERSION = 1.1
-CRAMFS_SOURCE = cramfs-$(CRAMFS_VERSION).tar.gz
 CRAMFS_SITE = http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION)
 
 CRAMFS_DEPENDENCIES = zlib
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index d4f6b983f2..de28dd7db4 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 CTORRENT_VERSION = dnh3.3.2
-CTORRENT_SOURCE = ctorrent-$(CTORRENT_VERSION).tar.gz
 CTORRENT_SITE = http://www.rahul.net/dholmes/ctorrent/
 CTORRENT_LICENSE = GPLv2
 CTORRENT_LICENSE_FILES = COPYING
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index d4685f6463..ca1df22f41 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 DBUS_GLIB_VERSION = 0.98
-DBUS_GLIB_SOURCE = dbus-glib-$(DBUS_GLIB_VERSION).tar.gz
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib/
 DBUS_GLIB_INSTALL_STAGING = YES
 
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index 6e260d0727..7c59cebbc9 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 DBUS_PYTHON_VERSION = 0.83.0
-DBUS_PYTHON_SOURCE = dbus-python-$(DBUS_PYTHON_VERSION).tar.gz
 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python/
 DBUS_PYTHON_INSTALL_STAGING = YES
 
diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
index eab8c73ad4..c58c3471cf 100644
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 DFU_UTIL_VERSION = 0.6
-DFU_UTIL_SOURCE = dfu-util-$(DFU_UTIL_VERSION).tar.gz
 DFU_UTIL_SITE = http://dfu-util.gnumonks.org/releases/
 
 HOST_DFU_UTIL_DEPENDENCIES = host-libusb
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
index 0c47d06ac5..1f1737ddc1 100644
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -6,7 +6,6 @@
 
 DHCPDUMP_VERSION = 1.8
 DHCPDUMP_SITE    = http://www.mavetju.org/download/
-DHCPDUMP_SOURCE  = dhcpdump-$(DHCPDUMP_VERSION).tar.gz
 
 DHCPDUMP_DEPENDENCIES = libpcap
 
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 9c8ded4484..82cabec1ba 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 DOCKER_VERSION = 1.5
-DOCKER_SOURCE = docker-$(DOCKER_VERSION).tar.gz
 DOCKER_SITE = http://icculus.org/openbox/2/docker
 
 DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
diff --git a/package/dsp-tools/dsp-tools.mk b/package/dsp-tools/dsp-tools.mk
index e91c7bc48b..344e264a7c 100644
--- a/package/dsp-tools/dsp-tools.mk
+++ b/package/dsp-tools/dsp-tools.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 DSP_TOOLS_VERSION = 2.0
-DSP_TOOLS_SOURCE = dsp-tools-$(DSP_TOOLS_VERSION).tar.gz
 DSP_TOOLS_SITE = http://gst-dsp.googlecode.com/files/
 DSP_TOOLS_DEPENDENCIES = tidsp-binaries
 
diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
index b2bd76f477..c2943e4f44 100644
--- a/package/elftosb/elftosb.mk
+++ b/package/elftosb/elftosb.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 ELFTOSB_VERSION = 10.12.01
-ELFTOSB_SOURCE = elftosb-$(ELFTOSB_VERSION).tar.gz
 ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
 
 define HOST_ELFTOSB_BUILD_CMDS
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 977c37beb7..4a23293873 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 ENCHANT_VERSION = 1.6.0
-ENCHANT_SOURCE = enchant-$(ENCHANT_VERSION).tar.gz
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
 ENCHANT_INSTALL_STAGING = YES
 ENCHANT_DEPENDENCIES = libglib2 host-pkgconf
diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 83a4fa996a..756e13f0d8 100644
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 EZXML_VERSION = 0.8.6
-EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz
 EZXML_SITE = http://downloads.sourceforge.net/project/ezxml/ezXML/ezXML%20$(EZXML_VERSION)
 EZXML_INSTALL_STAGING = YES
 
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index e9828dfa78..568d3148fe 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FBDUMP_VERSION = 0.4.2
-FBDUMP_SOURCE = fbdump-$(FBDUMP_VERSION).tar.gz
 FBDUMP_SITE = http://www.rcdrummond.net/fbdump
 FBDUMP_LICENSE = GPLv2
 FBDUMP_LICENSE_FILES = COPYING
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index b404c69359..1a91f5e54b 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FBGRAB_VERSION = 1.1
-FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz
 FBGRAB_SITE = http://fbgrab.monells.se
 FBGRAB_DEPENDENCIES = libpng
 FBGRAB_LICENSE = GPLv2
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 59284ee6da..f1ce178d31 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FBSET_VERSION = 2.1
-FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
 FBSET_DEPENDENCIES = host-bison host-flex
 FBSET_LICENSE = GPLv2
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 010e79e748..883a9109de 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FBV_VERSION = 1.0b
-FBV_SOURCE = fbv-$(FBV_VERSION).tar.gz
 FBV_SITE = http://s-tech.elsat.net.pl/fbv
 
 FBV_LICENSE = GPLv2
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index 45fd2a0648..80de4dc5cd 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FCONFIG_VERSION = 20080329
-FCONFIG_SOURCE = fconfig-$(FCONFIG_VERSION).tar.gz
 FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig/
 
 define FCONFIG_BUILD_CMDS
diff --git a/package/flac/flac.mk b/package/flac/flac.mk
index cace0d9c74..95cd5a14fa 100644
--- a/package/flac/flac.mk
+++ b/package/flac/flac.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FLAC_VERSION = 1.2.1
-FLAC_SOURCE = flac-$(FLAC_VERSION).tar.gz
 FLAC_SITE = http://downloads.sourceforge.net/project/flac/flac-src/flac-$(FLAC_VERSION)-src
 FLAC_INSTALL_STAGING = YES
 
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 0abf86597e..5ce6be2515 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 FONTCONFIG_VERSION = 2.6.0
-FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SITE = http://fontconfig.org/release
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index 9f6ec9672b..e3d26fa454 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GAMIN_VERSION = 0.1.10
-GAMIN_SOURCE = gamin-$(GAMIN_VERSION).tar.gz
 GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
 GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index b2a301b4bf..528912e9d7 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GENEXT2FS_VERSION = 1.4.1
-GENEXT2FS_SOURCE = genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
 GENEXT2FS_LICENSE = GPLv2
 GENEXT2FS_LICENSE_FILES = COPYING
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 9e7c2ff3c5..c45d1e1376 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GENROMFS_VERSION = 0.5.2
-GENROMFS_SOURCE = genromfs-$(GENROMFS_VERSION).tar.gz
 GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION)
 
 define GENROMFS_BUILD_CMDS
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
index 69100c0dce..b955943e47 100644
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GIBLIB_VERSION = 1.2.4
-GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz
 GIBLIB_SITE = http://linuxbrit.co.uk/downloads/
 GIBLIB_INSTALL_STAGING = YES
 GIBLIB_DEPENDENCIES = imlib2
diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
index e91046d59d..1ab22dbff2 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/gnuchess/gnuchess.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GNUCHESS_VERSION = 5.07
-GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
 GNUCHESS_LICENSE = GPLv2+
 GNUCHESS_LICENSE_FILES = COPYING
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index bffda59e0b..07cb5ad609 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GQVIEW_VERSION = 2.1.5
-GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
 GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
 GQVIEW_CONF_ENV = LIBS="-lm"
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 08266d4be4..1dfc0f9771 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GSL_VERSION = 1.16
-GSL_SOURCE = gsl-$(GSL_VERSION).tar.gz
 GSL_SITE = $(BR2_GNU_MIRROR)/gsl
 GSL_INSTALL_STAGING = YES
 GSL_LICENSE = GPLv3
diff --git a/package/gstreamer/gst-omapfb/gst-omapfb.mk b/package/gstreamer/gst-omapfb/gst-omapfb.mk
index bfcaa5d2ef..78a59f6652 100644
--- a/package/gstreamer/gst-omapfb/gst-omapfb.mk
+++ b/package/gstreamer/gst-omapfb/gst-omapfb.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 GST_OMAPFB_VERSION = 1.0
-GST_OMAPFB_SOURCE = gst-omapfb-$(GST_OMAPFB_VERSION).tar.gz
 GST_OMAPFB_SITE = http://gst-dsp.googlecode.com/files/
 
 define GST_OMAPFB_BUILD_CMDS
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 37729607df..b2418fe476 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 INTLTOOL_VERSION = 0.50.2
-INTLTOOL_SOURCE = intltool-$(INTLTOOL_VERSION).tar.gz
 INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+download/
 INTLTOOL_LICENSE = GPLv2+
 INTLTOOL_LICENSE_FILES = COPYING
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 7fa7d3ebe0..c570d67dca 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 IPERF_VERSION = 2.0.5
-IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
 IPERF_SITE = http://downloads.sourceforge.net/project/iperf
 
 IPERF_CONF_ENV = \
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
index 9572d54a3a..b9cba582ec 100644
--- a/package/ipkg/ipkg.mk
+++ b/package/ipkg/ipkg.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 IPKG_VERSION = 0.99.163
-IPKG_SOURCE = ipkg-$(IPKG_VERSION).tar.gz
 IPKG_SITE = http://www.handhelds.org/download/packages/ipkg
 IPKG_INSTALL_STAGING = YES
 
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index 333aa58a68..ebbe64e8fc 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 IRDA_UTILS_VERSION = 0.9.18
-IRDA_UTILS_SOURCE = irda-utils-$(IRDA_UTILS_VERSION).tar.gz
 IRDA_UTILS_SITE = http://downloads.sourceforge.net/project/irda/irda-utils/$(IRDA_UTILS_VERSION)
 
 IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I.
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 8fab97943c..dfd7f7fc72 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LCDPROC_VERSION = 0.5.6
-LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz
 LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
 LCDPROC_LICENSE = GPLv2+
 LCDPROC_LICENSE_FILES = COPYING
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index 8a04ebffd8..b533ea0288 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LEAFPAD_VERSION = 0.8.18
-LEAFPAD_SOURCE = leafpad-$(LEAFPAD_VERSION).tar.gz
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
 LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
 
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 1b25013efa..44d9cd2c10 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -6,7 +6,6 @@
 
 LIBARCHIVE_VERSION = 3.0.4
 LIBARCHIVE_SITE = http://github.com/downloads/libarchive/libarchive
-LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.gz
 LIBARCHIVE_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index cf2146eaa5..fbe250cfb1 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBATOMIC_OPS_VERSION = 7.2
-LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
 LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
 
 # From doc/LICENSING.txt: "Our intent is to make it easy to use
diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
index dc4d88ffa1..be4175aad5 100644
--- a/package/libbsd/libbsd.mk
+++ b/package/libbsd/libbsd.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBBSD_VERSION         = 0.4.2
-LIBBSD_SOURCE          = libbsd-$(LIBBSD_VERSION).tar.gz
 LIBBSD_SITE            = http://libbsd.freedesktop.org/releases
 LIBBSD_LICENSE         = BSD-3c MIT
 LIBBSD_LICENSE_FILES   = COPYING
diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk
index a1e0c5b4ca..69c7b8812f 100644
--- a/package/libdmtx/libdmtx.mk
+++ b/package/libdmtx/libdmtx.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBDMTX_VERSION = 0.7.4
-LIBDMTX_SOURCE = libdmtx-$(LIBDMTX_VERSION).tar.gz
 LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION)
 LIBDMTX_INSTALL_STAGING = YES
 
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index ea10251044..177ef78d54 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBDNET_VERSION = 1.11
-LIBDNET_SOURCE = libdnet-$(LIBDNET_VERSION).tar.gz
 LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION)
 LIBDNET_LICENSE = BSD-3c
 LIBDNET_LICENSE_FILES = LICENSE
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index b5aff564f0..047d00b7c0 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBELF_VERSION = 0.8.12
-LIBELF_SOURCE = libelf-$(LIBELF_VERSION).tar.gz
 LIBELF_SITE = http://www.mr511.de/software/
 LIBELF_INSTALL_STAGING = YES
 LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index 0056501363..174223187a 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBEV_VERSION = 4.11
-LIBEV_SOURCE = libev-$(LIBEV_VERSION).tar.gz
 LIBEV_SITE = http://dist.schmorp.de/libev/
 LIBEV_INSTALL_STAGING = YES
 
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
index b31d14b5cc..6c405bb5ad 100644
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBFTDI_VERSION = 0.19
-LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz
 LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download/
 LIBFTDI_DEPENDENCIES = libusb-compat libusb
 LIBFTDI_INSTALL_STAGING = YES
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
index bd953ef170..5cfcbeac5b 100644
--- a/package/libgeotiff/libgeotiff.mk
+++ b/package/libgeotiff/libgeotiff.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBGEOTIFF_VERSION = 1.3.0
-LIBGEOTIFF_SOURCE = libgeotiff-$(LIBGEOTIFF_VERSION).tar.gz
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
 LIBGEOTIFF_DEPENDENCIES = tiff
 LIBGEOTIFF_INSTALL_STAGING = YES
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 4cecd34233..97aab5d424 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBHID_VERSION = 0.2.16
-LIBHID_SOURCE = libhid-$(LIBHID_VERSION).tar.gz
 LIBHID_SITE = http://alioth.debian.org/frs/download.php/file/1958
 LIBHID_DEPENDENCIES = libusb-compat libusb
 LIBHID_INSTALL_STAGING = YES
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index aa6d6de8b6..3a513b3dc1 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBICONV_VERSION = 1.14
-LIBICONV_SOURCE = libiconv-$(LIBICONV_VERSION).tar.gz
 LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
 LIBICONV_INSTALL_STAGING = YES
 
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index e67a46ebc8..2cd7820d1f 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBID3TAG_VERSION = 0.15.1b
-LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
 LIBID3TAG_LICENSE = GPLv2+
 LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT
diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
index 11b92ca2d1..5a29923324 100644
--- a/package/libiscsi/libiscsi.mk
+++ b/package/libiscsi/libiscsi.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBISCSI_VERSION         = 1.6.0
-LIBISCSI_SOURCE          = libiscsi-$(LIBISCSI_VERSION).tar.gz
 LIBISCSI_SITE            = https://github.com/downloads/sahlberg/libiscsi
 LIBISCSI_LICENSE         = GPLv2+ LGPLv2.1+
 LIBISCSI_LICENSE_FILES   = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk
index dcf72ff19c..a6b907509c 100644
--- a/package/liblo/liblo.mk
+++ b/package/liblo/liblo.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBLO_VERSION = 0.26
-LIBLO_SOURCE = liblo-$(LIBLO_VERSION).tar.gz
 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION)
 
 LIBLO_LICENSE = LGPLv2.1+
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index 37447be37a..405729f5fc 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBMMS_VERSION = 0.6.2
-LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz
 LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION)
 
 LIBMMS_INSTALL_STAGING = YES
diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
index e8d7192c9e..5364c88505 100644
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBMPEG2_VERSION = 0.5.1
-LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files
 LIBMPEG2_LICENSE = GPLv2+
 LIBMPEG2_LICENSE_FILES = COPYING
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
index 330bec078c..6ade85640b 100644
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBOAUTH_VERSION = 0.9.6
-LIBOAUTH_SOURCE = liboauth-$(LIBOAUTH_VERSION).tar.gz
 LIBOAUTH_SITE = http://liboauth.sourceforge.net/pool
 LIBOAUTH_INSTALL_STAGING = YES
 
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index 8cf2823c04..2decd94ed3 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -7,7 +7,6 @@
 LIBRSVG_VERSION_MAJOR = 2.26
 LIBRSVG_VERSION_MINOR = 3
 LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).$(LIBRSVG_VERSION_MINOR)
-LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.gz
 LIBRSVG_SITE = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/
 LIBRSVG_INSTALL_STAGING = YES
 LIBRSVG_CONF_OPT = --disable-tools
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index dca566732c..d475c7333d 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBRSYNC_VERSION = 0.9.7
-LIBRSYNC_SOURCE = librsync-$(LIBRSYNC_VERSION).tar.gz
 LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
 LIBRSYNC_LICENSE = LGPLv2.1+
 LIBRSYNC_LICENSE_FILES = COPYING
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
index a69af97c6a..da1daddf6c 100644
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBSECCOMP_VERSION         = 1.0.0
-LIBSECCOMP_SOURCE          = libseccomp-$(LIBSECCOMP_VERSION).tar.gz
 LIBSECCOMP_SITE            = http://downloads.sourceforge.net/project/libseccomp
 LIBSECCOMP_LICENSE         = LGPLv2.1
 LIBSECCOMP_LICENSE_FILES   = LICENSE
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
index aec03786a4..4f0f87c739 100644
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LIBSEXY_VERSION = 0.1.11
-LIBSEXY_SOURCE = libsexy-$(LIBSEXY_VERSION).tar.gz
 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy/
 LIBSEXY_DEPENDENCIES = libgtk2 libxml2
 LIBSEXY_INSTALL_STAGING = YES
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 6f3d50adae..433c2d64f6 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LINUX_FUSION_VERSION = 9.0.2
-LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES
 LINUX_FUSION_DEPENDENCIES = linux
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 4bae4319ed..1cefff1559 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LOGROTATE_VERSION = 3.8.6
-LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
 LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate/
 LOGROTATE_LICENSE = GPLv2+
 LOGROTATE_LICENSE_FILES = COPYING
diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk
index c0daa24183..0a597f4aa1 100644
--- a/package/logsurfer/logsurfer.mk
+++ b/package/logsurfer/logsurfer.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LOGSURFER_VERSION = 1.8
-LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz
 LOGSURFER_SITE = http://downloads.sourceforge.net/project/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION)
 
 define LOGSURFER_INSTALL_TARGET_CMDS
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 2ecd28050a..49d515effb 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -6,7 +6,6 @@
 
 LRZSZ_VERSION = 0.12.20
 LRZSZ_SITE = http://www.ohse.de/uwe/releases
-LRZSZ_SOURCE = lrzsz-$(LRZSZ_VERSION).tar.gz
 
 LRZSR_CONF_OPT = --disable-timesync
 
diff --git a/package/lsuio/lsuio.mk b/package/lsuio/lsuio.mk
index ae44a78ec4..4e4f592d09 100644
--- a/package/lsuio/lsuio.mk
+++ b/package/lsuio/lsuio.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LSUIO_VERSION = 0.2.0
-LSUIO_SOURCE = lsuio-$(LSUIO_VERSION).tar.gz
 LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user
 
 $(eval $(autotools-package))
diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 1ac85eb9d4..9709f7bb83 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 LZOP_VERSION = 1.03
-LZOP_SOURCE = lzop-$(LZOP_VERSION).tar.gz
 LZOP_SITE = http://www.lzop.org/download/
 LZOP_LICENSE = GPLv2+
 LZOP_LICENSE_FILES = COPYING
diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk
index 19ab13f69d..35aa65166a 100644
--- a/package/madplay/madplay.mk
+++ b/package/madplay/madplay.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 MADPLAY_VERSION = 0.15.2b
-MADPLAY_SOURCE = madplay-$(MADPLAY_VERSION).tar.gz
 MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
 MADPLAY_LICENSE = GPLv2+
 MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index 3e2092a4d1..db5e6a5cdc 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 MEMTESTER_VERSION = 4.3.0
-MEMTESTER_SOURCE = memtester-$(MEMTESTER_VERSION).tar.gz
 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions/
 MEMTESTER_LICENSE = GPLv2
 MEMTESTER_LICENSE_FILES = COPYING
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index f967d8741a..d46376e2fb 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 MINICOM_VERSION = 2.6.1
-MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
 MINICOM_SITE = http://alioth.debian.org/frs/download.php/file/3700/
 MINICOM_LICENSE = GPLv2+
 MINICOM_LICENSE_FILES = COPYING
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 594ef2f4c0..5b083e64ef 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 NETCAT_VERSION = 0.7.1
-NETCAT_SOURCE = netcat-$(NETCAT_VERSION).tar.gz
 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
 
 $(eval $(autotools-package))
diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
index 5b2b0221ed..ee62f73549 100644
--- a/package/numactl/numactl.mk
+++ b/package/numactl/numactl.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 NUMACTL_VERSION = 2.0.8
-NUMACTL_SOURCE = numactl-$(NUMACTL_VERSION).tar.gz
 NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download/
 NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
 NUMACTL_LICENSE_FILES = README
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index 5846433caa..f183d6e9ae 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 OPKG_VERSION = 635
-OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
 OPKG_SITE = http://opkg.googlecode.com/svn/trunk/
 OPKG_SITE_METHOD = svn
 OPKG_INSTALL_STAGING = YES
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index edc970ea7d..80eedd40ff 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 PCMANFM_VERSION = 0.3.5.9
-PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
 PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
 PCMANFM_CONF_OPT = --disable-hal
 PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX11
diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk
index 1f859b55a3..a80d7cbafa 100644
--- a/package/pkg-config/pkg-config.mk
+++ b/package/pkg-config/pkg-config.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 PKG_CONFIG_VERSION = 0.25
-PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz
 PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/
 PKG_CONFIG_DEPENDENCIES = libglib2
 PKG_CONFIG_CONF_OPT = --with-installed-glib
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index 278ed29ba6..3538aaad85 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 PROTOBUF_VERSION = 2.4.1
-PROTOBUF_SOURCE = protobuf-$(PROTOBUF_VERSION).tar.gz
 PROTOBUF_SITE = http://protobuf.googlecode.com/files/
 PROTOBUF_LICENSE = BSD-3c
 PROTOBUF_LICENSE_FILES = COPYING.txt
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 7bec9a28c9..4febb50901 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 QUOTA_VERSION = 4.00
-QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
 QUOTA_DEPENDENCIES = host-gettext
 QUOTA_AUTORECONF = YES
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index ea2ca0a094..94e02829d4 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 RDESKTOP_VERSION = 1.5.0
-RDESKTOP_SOURCE = rdesktop-$(RDESKTOP_VERSION).tar.gz
 RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION)
 RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
 RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index ff5519924c..c9df708483 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 READLINE_VERSION = 6.2
-READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
 READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES
 READLINE_DEPENDENCIES = ncurses
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 30748b5be4..d8e5f3f394 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 RSYNC_VERSION = 3.1.0
-RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
 RSYNC_LICENSE = GPLv3+
 RSYNC_LICENSE_FILES = COPYING
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 3b7076e2ee..e2adc1af67 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 SANE_BACKENDS_VERSION = 1.0.22
-SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
 SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/3503
 SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index c256d5fc17..aee0af1982 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 SCONS_VERSION = 2.2.0
-SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
 SCONS_LICENSE = MIT
 SCONS_LICENSE_FILES = LICENSE.txt
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index 7ebebddb6e..140b681209 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 STARTUP_NOTIFICATION_VERSION = 0.9
-STARTUP_NOTIFICATION_SOURCE = startup-notification-$(STARTUP_NOTIFICATION_VERSION).tar.gz
 STARTUP_NOTIFICATION_SITE = http://freedesktop.org/software/startup-notification/releases
 STARTUP_NOTIFICATION_INSTALL_STAGING = YES
 STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
index 22dc8c6610..25989bcb80 100644
--- a/package/statserial/statserial.mk
+++ b/package/statserial/statserial.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 STATSERIAL_VERSION = 1.1
-STATSERIAL_SOURCE = statserial-$(STATSERIAL_VERSION).tar.gz
 STATSERIAL_SITE = http://www.ibiblio.org/pub/Linux/system/serial/
 STATSERIAL_DEPENDENCIES = ncurses
 
diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk
index 516065b6e5..40ad8ce3a9 100644
--- a/package/supervisor/supervisor.mk
+++ b/package/supervisor/supervisor.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 SUPERVISOR_VERSION = 3.0a12
-SUPERVISOR_SOURCE = supervisor-$(SUPERVISOR_VERSION).tar.gz
 SUPERVISOR_SITE = http://pypi.python.org/packages/source/s/supervisor/
 SUPERVISOR_LICENSE_FILES = LICENSES.txt
 
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index c6119b504b..89a3d496ac 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 SYNERGY_VERSION = 1.3.1
-SYNERGY_SOURCE = synergy-$(SYNERGY_VERSION).tar.gz
 SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION)
 
 SYNERGY_AUTORECONF = YES
diff --git a/package/tidsp-binaries/tidsp-binaries.mk b/package/tidsp-binaries/tidsp-binaries.mk
index fd799fb68a..8c06ea7735 100644
--- a/package/tidsp-binaries/tidsp-binaries.mk
+++ b/package/tidsp-binaries/tidsp-binaries.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 TIDSP_BINARIES_VERSION = 23.i3.8
-TIDSP_BINARIES_SOURCE = tidsp-binaries-$(TIDSP_BINARIES_VERSION).tar.gz
 TIDSP_BINARIES_SITE = http://gst-dsp.googlecode.com/files/
 
 define TIDSP_BINARIES_INSTALL_TARGET_CMDS
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index a09013a65c..ad846ca257 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 TORSMO_VERSION = 0.18
-TORSMO_SOURCE = torsmo-$(TORSMO_VERSION).tar.gz
 TORSMO_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
 
 # help2man doesn't work when cross compiling
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index e391cf9361..8c22130d23 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 UDPCAST_VERSION = 20120424
-UDPCAST_SOURCE = udpcast-$(UDPCAST_VERSION).tar.gz
 UDPCAST_SITE = http://www.udpcast.linux.lu/download
 UDPCAST_CONF_ENV = $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
 UDPCAST_DEPENDENCIES = host-m4
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index b0c0db307f..7c0e70abdb 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 VTUN_VERSION = 3.0.3
-VTUN_SOURCE = vtun-$(VTUN_VERSION).tar.gz
 VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
 VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
 VTUN_AUTORECONF = YES
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index bf9b96e94c..a2d68f62e0 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 X11VNC_VERSION = 0.9.13
-X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz
 X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
 # sdl support is not used in x11vnc, but host include / library search paths
 # leak in if host has sdl-config
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index 32cdf28a20..34a449f907 100644
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 XINETD_VERSION       = 2.3.15
-XINETD_SOURCE        = xinetd-$(XINETD_VERSION).tar.gz
 XINETD_SITE          = http://www.xinetd.org
 XINETD_LICENSE       = xinetd license
 XINETD_LICENSE_FILES = COPYRIGHT
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
index 544049579a..bc4b2c636d 100644
--- a/package/xstroke/xstroke.mk
+++ b/package/xstroke/xstroke.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 XSTROKE_VERSION = 0.6
-XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
 XSTROKE_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
 
 XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm xlib_libXrender xlib_libXext
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index c7d40a1323..15aa940539 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 XVKBD_VERSION = 3.2
-XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
 
 # Passing USRLIBDIR ensures that the stupid Makefile doesn't add
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index 26324da489..20063ba218 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -5,7 +5,6 @@
 ################################################################################
 
 YASM_VERSION = 1.2.0
-YASM_SOURCE = yasm-$(YASM_VERSION).tar.gz
 YASM_SITE = http://www.tortall.net/projects/yasm/releases/
 
 define YASM_PRE_CONFIGURE_FIXUP

From 2e53cb9e014df87a29aed17d0b2582232df94e4f Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 25 Sep 2013 10:01:43 +0200
Subject: [PATCH 6331/6849] package/Config.in: order alphabetically

Even though new packages are normally added in the right alphabetical order,
there still remain quite a number of incorrect orderings in package/Config.in.
In this patch, alphabetical order is created in each menu.

Note that this sometimes mean that packages that logically belong together, like
cups, gutenprint, hplip, are now split apart.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in | 102 ++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 49 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index b7fdb89964..424e40d595 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -7,8 +7,8 @@ source "package/alsa-utils/Config.in"
 source "package/aumix/Config.in"
 source "package/bellagio/Config.in"
 source "package/faad2/Config.in"
-source "package/flac/Config.in"
 source "package/ffmpeg/Config.in"
+source "package/flac/Config.in"
 source "package/gstreamer/Config.in"
 source "package/gstreamer1/Config.in"
 source "package/lame/Config.in"
@@ -34,8 +34,8 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gzip/Config.in"
 endif
 source "package/infozip/Config.in"
-source "package/lzop/Config.in"
 source "package/lzma/Config.in"
+source "package/lzop/Config.in"
 source "package/xz/Config.in"
 endmenu
 
@@ -43,9 +43,9 @@ menu "Debugging, profiling and benchmark"
 source "package/bonnie/Config.in"
 source "package/cache-calibrator/Config.in"
 source "package/dhrystone/Config.in"
-source "package/dstat/Config.in"
 source "package/dmalloc/Config.in"
 source "package/dropwatch/Config.in"
+source "package/dstat/Config.in"
 source "package/duma/Config.in"
 source "package/gdb/Config.in"
 source "package/iozone/Config.in"
@@ -56,26 +56,26 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lsof/Config.in"
 endif
 source "package/ltp-testsuite/Config.in"
+source "package/ltrace/Config.in"
 source "package/lttng-babeltrace/Config.in"
 source "package/lttng-modules/Config.in"
 source "package/lttng-tools/Config.in"
-source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
 source "package/netperf/Config.in"
 source "package/oprofile/Config.in"
 source "package/pax-utils/Config.in"
 source "package/perf/Config.in"
-source "package/ramspeed/Config.in"
+source "package/pv/Config.in"
 source "package/ramsmp/Config.in"
+source "package/ramspeed/Config.in"
 source "package/rt-tests/Config.in"
 source "package/strace/Config.in"
 source "package/stress/Config.in"
 source "package/sysprof/Config.in"
 source "package/tinymembench/Config.in"
 source "package/trace-cmd/Config.in"
-source "package/whetstone/Config.in"
 source "package/valgrind/Config.in"
-source "package/pv/Config.in"
+source "package/whetstone/Config.in"
 endmenu
 
 menu "Development tools"
@@ -108,9 +108,9 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
 endif
 source "package/intltool/Config.in"
-source "package/make/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
+source "package/make/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/patch/Config.in"
 endif
@@ -130,9 +130,9 @@ source "package/yasm/Config.in"
 endmenu
 
 menu "Games"
+source "package/doom-wad/Config.in"
 source "package/gnuchess/Config.in"
 source "package/prboom/Config.in"
-source "package/doom-wad/Config.in"
 source "package/rubix/Config.in"
 endmenu
 
@@ -163,12 +163,12 @@ source "package/ocrad/Config.in"
 source "package/psplash/Config.in"
 source "package/sawman/Config.in"
 source "package/sdl/Config.in"
+source "package/sdl_gfx/Config.in"
 source "package/sdl_image/Config.in"
 source "package/sdl_mixer/Config.in"
-source "package/sdl_sound/Config.in"
 source "package/sdl_net/Config.in"
+source "package/sdl_sound/Config.in"
 source "package/sdl_ttf/Config.in"
-source "package/sdl_gfx/Config.in"
 
 comment "other GUIs"
 source "package/efl/Config.in"
@@ -193,20 +193,20 @@ source "package/libsexy/Config.in"
 source "package/x11r7/xkeyboard-config/Config.in"
 
 comment "X Window managers"
+source "package/blackbox/Config.in"
 source "package/enlightenment/Config.in"
+source "package/fluxbox/Config.in"
 source "package/matchbox/Config.in"
 source "package/metacity/Config.in"
-source "package/blackbox/Config.in"
-source "package/fluxbox/Config.in"
 
 comment "X applications"
 source "package/alsamixergui/Config.in"
 source "package/docker/Config.in"
 source "package/feh/Config.in"
 source "package/freerdp/Config.in"
-source "package/gqview/Config.in"
 source "package/gmpc/Config.in"
 source "package/gob2/Config.in"
+source "package/gqview/Config.in"
 source "package/gtkperf/Config.in"
 source "package/leafpad/Config.in"
 source "package/midori/Config.in"
@@ -258,7 +258,6 @@ source "package/sunxi-boards/Config.in"
 source "package/ux500-firmware/Config.in"
 source "package/zd1211-firmware/Config.in"
 endmenu
-source "package/freescale-imx/Config.in"
 source "package/a10disp/Config.in"
 source "package/acpid/Config.in"
 source "package/cdrkit/Config.in"
@@ -276,10 +275,11 @@ source "package/dvbsnoop/Config.in"
 source "package/eeprog/Config.in"
 source "package/evtest/Config.in"
 source "package/fan-ctrl/Config.in"
-source "package/flashrom/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
+source "package/flashrom/Config.in"
 source "package/fmtools/Config.in"
+source "package/freescale-imx/Config.in"
 source "package/fxload/Config.in"
 source "package/gadgetfs-test/Config.in"
 source "package/gpsd/Config.in"
@@ -306,8 +306,8 @@ source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
-source "package/ola/Config.in"
 source "package/ofono/Config.in"
+source "package/ola/Config.in"
 source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
@@ -453,10 +453,10 @@ menu "Crypto"
 source "package/beecrypt/Config.in"
 source "package/cryptodev/Config.in"
 source "package/gnutls/Config.in"
+source "package/libassuan/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/libgpgme/Config.in"
-source "package/libassuan/Config.in"
 source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
@@ -494,6 +494,7 @@ source "package/fltk/Config.in"
 source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
 source "package/gd/Config.in"
+source "package/gdk-pixbuf/Config.in"
 source "package/giblib/Config.in"
 source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
@@ -509,7 +510,6 @@ source "package/libexif/Config.in"
 source "package/libgail/Config.in"
 source "package/libgeotiff/Config.in"
 source "package/libglade/Config.in"
-source "package/gdk-pixbuf/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
 source "package/libqrencode/Config.in"
@@ -539,8 +539,6 @@ source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libatasmart/Config.in"
 source "package/libcec/Config.in"
-source "package/libraw1394/Config.in"
-source "package/tslib/Config.in"
 source "package/libfreefare/Config.in"
 source "package/libftdi/Config.in"
 source "package/libhid/Config.in"
@@ -548,6 +546,7 @@ source "package/libiqrf/Config.in"
 source "package/libnfc/Config.in"
 source "package/libnfc-llcp/Config.in"
 source "package/libqmi/Config.in"
+source "package/libraw1394/Config.in"
 source "package/libserial/Config.in"
 source "package/libsoc/Config.in"
 source "package/libusb/Config.in"
@@ -558,6 +557,7 @@ source "package/mtdev/Config.in"
 source "package/ne10/Config.in"
 source "package/neardal/Config.in"
 source "package/pcsc-lite/Config.in"
+source "package/tslib/Config.in"
 source "package/urg/Config.in"
 endmenu
 
@@ -576,8 +576,8 @@ endmenu
 
 menu "Multimedia"
 source "package/libdvbsi/Config.in"
-source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
+source "package/libdvdread/Config.in"
 source "package/libebml/Config.in"
 source "package/libfslcodec/Config.in"
 source "package/libfslparser/Config.in"
@@ -593,12 +593,12 @@ source "package/mediastreamer/Config.in"
 endmenu
 
 menu "Networking"
-source "package/czmq/Config.in"
 source "package/cppzmq/Config.in"
+source "package/czmq/Config.in"
 source "package/filemq/Config.in"
 source "package/glib-networking/Config.in"
-source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
+source "package/libcgi/Config.in"
 source "package/libcurl/Config.in"
 source "package/libdnet/Config.in"
 source "package/libesmtp/Config.in"
@@ -607,12 +607,10 @@ source "package/libfcgi/Config.in"
 source "package/libgsasl/Config.in"
 source "package/libidn/Config.in"
 source "package/libiscsi/Config.in"
-source "package/liboauth/Config.in"
+source "package/libmbus/Config.in"
 source "package/libmicrohttpd/Config.in"
-source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libmodbus/Config.in"
-source "package/libmbus/Config.in"
 source "package/libnetfilter_acct/Config.in"
 source "package/libnetfilter_conntrack/Config.in"
 source "package/libnetfilter_cthelper/Config.in"
@@ -621,9 +619,10 @@ source "package/libnetfilter_log/Config.in"
 source "package/libnetfilter_queue/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
+source "package/liboauth/Config.in"
 source "package/liboping/Config.in"
-source "package/libpcap/Config.in"
 source "package/libosip2/Config.in"
+source "package/libpcap/Config.in"
 source "package/librsync/Config.in"
 source "package/libsoup/Config.in"
 source "package/libtirpc/Config.in"
@@ -631,6 +630,7 @@ source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libvncserver/Config.in"
 source "package/libwebsockets/Config.in"
+source "package/neon/Config.in"
 source "package/nss-mdns/Config.in"
 source "package/omniorb/Config.in"
 source "package/openpgm/Config.in"
@@ -646,39 +646,40 @@ endmenu
 menu "Other"
 source "package/apr/Config.in"
 source "package/apr-util/Config.in"
-source "package/libcofi/Config.in"
+source "package/argp-standalone/Config.in"
+source "package/boost/Config.in"
 source "package/classpath/Config.in"
 source "package/cppcms/Config.in"
 source "package/eigen/Config.in"
 source "package/elfutils/Config.in"
 source "package/fftw/Config.in"
-source "package/libargtable2/Config.in"
-source "package/argp-standalone/Config.in"
-source "package/boost/Config.in"
 source "package/glibmm/Config.in"
 source "package/gmp/Config.in"
 source "package/gsl/Config.in"
 source "package/gtest/Config.in"
+source "package/libargtable2/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libbsd/Config.in"
 source "package/libcap/Config.in"
 source "package/libcap-ng/Config.in"
 source "package/libcgroup/Config.in"
+source "package/libcofi/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
-source "package/libevent/Config.in"
 source "package/libev/Config.in"
+source "package/libevent/Config.in"
 source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
 source "package/libical/Config.in"
+source "package/liblog4c-localtime/Config.in"
 source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
 source "package/libpthsem/Config.in"
+source "package/libseccomp/Config.in"
 source "package/libsigc/Config.in"
 source "package/libsigsegv/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
-source "package/libseccomp/Config.in"
 source "package/libunwind/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
@@ -695,7 +696,6 @@ source "package/protobuf/Config.in"
 source "package/protobuf-c/Config.in"
 source "package/schifra/Config.in"
 source "package/startup-notification/Config.in"
-source "package/liblog4c-localtime/Config.in"
 source "package/tzdata/Config.in"
 endmenu
 
@@ -705,9 +705,9 @@ endmenu
 
 menu "Text and terminal handling"
 source "package/enchant/Config.in"
-source "package/libfribidi/Config.in"
 source "package/icu/Config.in"
 source "package/libedit/Config.in"
+source "package/libfribidi/Config.in"
 source "package/libiconv/Config.in"
 source "package/linenoise/Config.in"
 source "package/ncurses/Config.in"
@@ -762,23 +762,20 @@ source "package/arptables/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
 source "package/bcusdk/Config.in"
-source "package/bluez_utils/Config.in"
-source "package/boa/Config.in"
 source "package/bind/Config.in"
+source "package/bluez_utils/Config.in"
 source "package/bmon/Config.in"
+source "package/boa/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
 source "package/chrony/Config.in"
 source "package/civetweb/Config.in"
 source "package/connman/Config.in"
+source "package/conntrack-tools/Config.in"
 source "package/crda/Config.in"
 source "package/ctorrent/Config.in"
-source "package/conntrack-tools/Config.in"
 source "package/cups/Config.in"
-source "package/foomatic-filters/Config.in"
-source "package/gutenprint/Config.in"
-source "package/hplip/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
@@ -788,10 +785,13 @@ source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
+source "package/foomatic-filters/Config.in"
 source "package/gesftpserver/Config.in"
+source "package/gutenprint/Config.in"
 source "package/heirloom-mailx/Config.in"
 source "package/hiawatha/Config.in"
 source "package/hostapd/Config.in"
+source "package/hplip/Config.in"
 source "package/httping/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
@@ -825,21 +825,21 @@ source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
 source "package/ndisc6/Config.in"
+source "package/netatalk/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/netcat/Config.in"
 source "package/netkitbase/Config.in"
 source "package/netkittelnet/Config.in"
 endif
-source "package/netatalk/Config.in"
 source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/network-manager/Config.in"
 source "package/nfacct/Config.in"
-source "package/nmap/Config.in"
-source "package/noip/Config.in"
 source "package/ngircd/Config.in"
 source "package/ngrep/Config.in"
+source "package/nmap/Config.in"
+source "package/noip/Config.in"
 source "package/ntp/Config.in"
 source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
@@ -868,8 +868,8 @@ source "package/ser2net/Config.in"
 source "package/socat/Config.in"
 source "package/socketcand/Config.in"
 source "package/spawn-fcgi/Config.in"
-source "package/spice-protocol/Config.in"
 source "package/spice/Config.in"
+source "package/spice-protocol/Config.in"
 source "package/squid/Config.in"
 source "package/strongswan/Config.in"
 source "package/stunnel/Config.in"
@@ -950,6 +950,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
 source "package/cpuload/Config.in"
+source "package/dsp-tools/Config.in"
 source "package/htop/Config.in"
 source "package/keyutils/Config.in"
 source "package/kmod/Config.in"
@@ -965,13 +966,16 @@ endif
 source "package/quota/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rsyslog/Config.in"
-source "package/sysklogd/Config.in"
-source "package/sysvinit/Config.in"
 endif
 source "package/supervisor/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/sysklogd/Config.in"
+endif
 source "package/systemd/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/sysvinit/Config.in"
+endif
 source "package/util-linux/Config.in"
-source "package/dsp-tools/Config.in"
 endmenu
 
 menu "Text editors and viewers"

From f262a247fbaf242682013ec6bf2cdf8dedc0e09c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 17:28:04 +0200
Subject: [PATCH 6332/6849] media-ctl: bump version

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/media-ctl/media-ctl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/media-ctl/media-ctl.mk b/package/media-ctl/media-ctl.mk
index 64a63aaabc..ae2482ca54 100644
--- a/package/media-ctl/media-ctl.mk
+++ b/package/media-ctl/media-ctl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEDIA_CTL_VERSION = ac40b79f002a2315f909548614ccd2d408da25b7
+MEDIA_CTL_VERSION = 87f58c2ed885d636229f7209fde883058433a1ce
 MEDIA_CTL_SITE = git://git.ideasonboard.org/media-ctl.git
 MEDIA_CTL_INSTALL_STAGING = YES
 MEDIA_CTL_LICENSE = LGPLv2.1+

From d1a211a45ea07b00c60fafa41848978f7326455f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Oct 2013 17:28:05 +0200
Subject: [PATCH 6333/6849] media-ctl: fix build with old kernel headers

Add a patch to fix the recurrent media-ctl build problems with
toolchains based on relatively old (< 2.6.39) kernel headers.

Finally fixes:

  http://autobuild.buildroot.org/results/54a/54afc80d4b58a4064a49226bcd4a28f32e3cf814/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...or-compatibility-with-old-toolchains.patch | 303 ++++++++++++++++++
 1 file changed, 303 insertions(+)
 create mode 100644 package/media-ctl/media-ctl-0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch

diff --git a/package/media-ctl/media-ctl-0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch b/package/media-ctl/media-ctl-0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch
new file mode 100644
index 0000000000..17b52ced73
--- /dev/null
+++ b/package/media-ctl/media-ctl-0001-add-kernel-headers-for-compatibility-with-old-toolchains.patch
@@ -0,0 +1,303 @@
+From 480b9effa08541b5df369dd6516013282cf28bd8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 6 Oct 2013 17:24:04 +0200
+Subject: [PATCH] Add kernel headers for compatibility with old toolchains
+
+The media controller mechanism is relatively new in the Linux kernel,
+and therefore all toolchains don't yet have the necessary
+headers. This patch makes sure that media-ctl provides such headers,
+as was already the case with v4l2-common.h, v4l2-subdev.h and
+videodev2.h.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac              |   6 +--
+ src/linux/media.h         | 132 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/linux/v4l2-mediabus.h | 119 +++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 252 insertions(+), 5 deletions(-)
+ create mode 100644 src/linux/media.h
+ create mode 100644 src/linux/v4l2-mediabus.h
+
+diff --git a/configure.ac b/configure.ac
+index a749794..56eb71f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,11 +51,7 @@ AC_ARG_WITH(kernel-headers,
+ CPPFLAGS="$CPPFLAGS -I$KERNEL_HEADERS_DIR/include"
+ 
+ # Checks for header files.
+-AC_CHECK_HEADERS([linux/media.h \
+-		  linux/types.h \
+-		  linux/v4l2-mediabus.h \
+-		  linux/v4l2-subdev.h \
+-		  linux/videodev2.h],
++AC_CHECK_HEADERS([linux/types.h],
+ 		  [],
+ 		  [echo "ERROR: Kernel header file not found or not usable!"; exit 1])
+ 
+diff --git a/src/linux/media.h b/src/linux/media.h
+new file mode 100644
+index 0000000..410e7cc
+--- /dev/null
++++ b/src/linux/media.h
+@@ -0,0 +1,132 @@
++/*
++ * Multimedia device API
++ *
++ * Copyright (C) 2010 Nokia Corporation
++ *
++ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
++ *	     Sakari Ailus <sakari.ailus@iki.fi>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#ifndef __LINUX_MEDIA_H
++#define __LINUX_MEDIA_H
++
++#include <linux/ioctl.h>
++#include <linux/types.h>
++#include <linux/version.h>
++
++#define MEDIA_API_VERSION	KERNEL_VERSION(0, 1, 0)
++
++struct media_device_info {
++	char driver[16];
++	char model[32];
++	char serial[40];
++	char bus_info[32];
++	__u32 media_version;
++	__u32 hw_revision;
++	__u32 driver_version;
++	__u32 reserved[31];
++};
++
++#define MEDIA_ENT_ID_FLAG_NEXT		(1 << 31)
++
++#define MEDIA_ENT_TYPE_SHIFT		16
++#define MEDIA_ENT_TYPE_MASK		0x00ff0000
++#define MEDIA_ENT_SUBTYPE_MASK		0x0000ffff
++
++#define MEDIA_ENT_T_DEVNODE		(1 << MEDIA_ENT_TYPE_SHIFT)
++#define MEDIA_ENT_T_DEVNODE_V4L		(MEDIA_ENT_T_DEVNODE + 1)
++#define MEDIA_ENT_T_DEVNODE_FB		(MEDIA_ENT_T_DEVNODE + 2)
++#define MEDIA_ENT_T_DEVNODE_ALSA	(MEDIA_ENT_T_DEVNODE + 3)
++#define MEDIA_ENT_T_DEVNODE_DVB		(MEDIA_ENT_T_DEVNODE + 4)
++
++#define MEDIA_ENT_T_V4L2_SUBDEV		(2 << MEDIA_ENT_TYPE_SHIFT)
++#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR	(MEDIA_ENT_T_V4L2_SUBDEV + 1)
++#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH	(MEDIA_ENT_T_V4L2_SUBDEV + 2)
++#define MEDIA_ENT_T_V4L2_SUBDEV_LENS	(MEDIA_ENT_T_V4L2_SUBDEV + 3)
++
++#define MEDIA_ENT_FL_DEFAULT		(1 << 0)
++
++struct media_entity_desc {
++	__u32 id;
++	char name[32];
++	__u32 type;
++	__u32 revision;
++	__u32 flags;
++	__u32 group_id;
++	__u16 pads;
++	__u16 links;
++
++	__u32 reserved[4];
++
++	union {
++		/* Node specifications */
++		struct {
++			__u32 major;
++			__u32 minor;
++		} v4l;
++		struct {
++			__u32 major;
++			__u32 minor;
++		} fb;
++		struct {
++			__u32 card;
++			__u32 device;
++			__u32 subdevice;
++		} alsa;
++		int dvb;
++
++		/* Sub-device specifications */
++		/* Nothing needed yet */
++		__u8 raw[184];
++	};
++};
++
++#define MEDIA_PAD_FL_SINK		(1 << 0)
++#define MEDIA_PAD_FL_SOURCE		(1 << 1)
++
++struct media_pad_desc {
++	__u32 entity;		/* entity ID */
++	__u16 index;		/* pad index */
++	__u32 flags;		/* pad flags */
++	__u32 reserved[2];
++};
++
++#define MEDIA_LNK_FL_ENABLED		(1 << 0)
++#define MEDIA_LNK_FL_IMMUTABLE		(1 << 1)
++#define MEDIA_LNK_FL_DYNAMIC		(1 << 2)
++
++struct media_link_desc {
++	struct media_pad_desc source;
++	struct media_pad_desc sink;
++	__u32 flags;
++	__u32 reserved[2];
++};
++
++struct media_links_enum {
++	__u32 entity;
++	/* Should have enough room for pads elements */
++	struct media_pad_desc *pads;
++	/* Should have enough room for links elements */
++	struct media_link_desc *links;
++	__u32 reserved[4];
++};
++
++#define MEDIA_IOC_DEVICE_INFO		_IOWR('|', 0x00, struct media_device_info)
++#define MEDIA_IOC_ENUM_ENTITIES		_IOWR('|', 0x01, struct media_entity_desc)
++#define MEDIA_IOC_ENUM_LINKS		_IOWR('|', 0x02, struct media_links_enum)
++#define MEDIA_IOC_SETUP_LINK		_IOWR('|', 0x03, struct media_link_desc)
++
++#endif /* __LINUX_MEDIA_H */
+diff --git a/src/linux/v4l2-mediabus.h b/src/linux/v4l2-mediabus.h
+new file mode 100644
+index 0000000..7d64e0e
+--- /dev/null
++++ b/src/linux/v4l2-mediabus.h
+@@ -0,0 +1,119 @@
++/*
++ * Media Bus API header
++ *
++ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#ifndef __LINUX_V4L2_MEDIABUS_H
++#define __LINUX_V4L2_MEDIABUS_H
++
++#include <linux/types.h>
++#include <linux/videodev2.h>
++
++/*
++ * These pixel codes uniquely identify data formats on the media bus. Mostly
++ * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
++ * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
++ * data format is fixed. Additionally, "2X8" means that one pixel is transferred
++ * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
++ * transferred over the bus: "LE" means that the least significant bits are
++ * transferred first, "BE" means that the most significant bits are transferred
++ * first, and "PADHI" and "PADLO" define which bits - low or high, in the
++ * incomplete high byte, are filled with padding bits.
++ *
++ * The pixel codes are grouped by type, bus_width, bits per component, samples
++ * per pixel and order of subsamples. Numerical values are sorted using generic
++ * numerical sort order (8 thus comes before 10).
++ *
++ * As their value can't change when a new pixel code is inserted in the
++ * enumeration, the pixel codes are explicitly given a numerical value. The next
++ * free values for each category are listed below, update them when inserting
++ * new pixel codes.
++ */
++enum v4l2_mbus_pixelcode {
++	V4L2_MBUS_FMT_FIXED = 0x0001,
++
++	/* RGB - next is 0x1009 */
++	V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE = 0x1001,
++	V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE = 0x1002,
++	V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE = 0x1003,
++	V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE = 0x1004,
++	V4L2_MBUS_FMT_BGR565_2X8_BE = 0x1005,
++	V4L2_MBUS_FMT_BGR565_2X8_LE = 0x1006,
++	V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
++	V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
++
++	/* YUV (including grey) - next is 0x2014 */
++	V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
++	V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
++	V4L2_MBUS_FMT_VYUY8_1_5X8 = 0x2003,
++	V4L2_MBUS_FMT_YUYV8_1_5X8 = 0x2004,
++	V4L2_MBUS_FMT_YVYU8_1_5X8 = 0x2005,
++	V4L2_MBUS_FMT_UYVY8_2X8 = 0x2006,
++	V4L2_MBUS_FMT_VYUY8_2X8 = 0x2007,
++	V4L2_MBUS_FMT_YUYV8_2X8 = 0x2008,
++	V4L2_MBUS_FMT_YVYU8_2X8 = 0x2009,
++	V4L2_MBUS_FMT_Y10_1X10 = 0x200a,
++	V4L2_MBUS_FMT_YUYV10_2X10 = 0x200b,
++	V4L2_MBUS_FMT_YVYU10_2X10 = 0x200c,
++	V4L2_MBUS_FMT_Y12_1X12 = 0x2013,
++	V4L2_MBUS_FMT_UYVY8_1X16 = 0x200f,
++	V4L2_MBUS_FMT_VYUY8_1X16 = 0x2010,
++	V4L2_MBUS_FMT_YUYV8_1X16 = 0x2011,
++	V4L2_MBUS_FMT_YVYU8_1X16 = 0x2012,
++	V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
++	V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
++
++	/* Bayer - next is 0x3015 */
++	V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
++	V4L2_MBUS_FMT_SGBRG8_1X8 = 0x3013,
++	V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
++	V4L2_MBUS_FMT_SRGGB8_1X8 = 0x3014,
++	V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
++	V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 = 0x300c,
++	V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 = 0x3009,
++	V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8 = 0x300d,
++	V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE = 0x3003,
++	V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE = 0x3004,
++	V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE = 0x3005,
++	V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE = 0x3006,
++	V4L2_MBUS_FMT_SBGGR10_1X10 = 0x3007,
++	V4L2_MBUS_FMT_SGBRG10_1X10 = 0x300e,
++	V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a,
++	V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f,
++	V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008,
++	V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010,
++	V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011,
++	V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012,
++
++	/* JPEG compressed formats - next is 0x4002 */
++	V4L2_MBUS_FMT_JPEG_1X8 = 0x4001,
++
++	/* Vendor specific formats - next is 0x5002 */
++
++	/* S5C73M3 sensor specific interleaved UYVY and JPEG */
++	V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 = 0x5001,
++};
++
++/**
++ * struct v4l2_mbus_framefmt - frame format on the media bus
++ * @width:	frame width
++ * @height:	frame height
++ * @code:	data format code (from enum v4l2_mbus_pixelcode)
++ * @field:	used interlacing type (from enum v4l2_field)
++ * @colorspace:	colorspace of the data (from enum v4l2_colorspace)
++ */
++struct v4l2_mbus_framefmt {
++	__u32			width;
++	__u32			height;
++	__u32			code;
++	__u32			field;
++	__u32			colorspace;
++	__u32			reserved[7];
++};
++
++#endif
+-- 
+1.8.1.2
+

From 9777dbedb012f68e54e14f9567d9dc0187d53b17 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sun, 6 Oct 2013 23:45:10 +0200
Subject: [PATCH 6334/6849] binutils: default to 2.22

2.21.1 is getting quite old, the linker issues with 2.22 seems to be
(mostly?) sorted out by now and armhf needs 2.22+, so let's bump the
default version.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/binutils/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index c2d2495362..8f19597060 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -4,7 +4,7 @@ choice
 	prompt "Binutils Version"
 	depends on !BR2_arc
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
-	default BR2_BINUTILS_VERSION_2_21_1
+	default BR2_BINUTILS_VERSION_2_22
 	help
 	  Select the version of binutils you wish to use.
 

From f628f2e80f20a6eb2d8bc3b20b5c3413a687d4b0 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 7 Oct 2013 09:05:04 +0200
Subject: [PATCH 6335/6849] util-inux: MKINSTALLDIRS workaround is needed for
 host install as well

Fixes http://autobuild.buildroot.net/results/3c8/3c8c78a5c0421b9079190ddf97b366fc7f0c0859

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/util-linux/util-linux.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index a3ee4cd67e..4db1e524e5 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -105,3 +105,4 @@ $(eval $(host-autotools-package))
 # one, so it disappears
 UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
 UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs

From 0c09053277534edb503034a9874febaade312fe8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 7 Oct 2013 09:33:46 +0200
Subject: [PATCH 6336/6849] manual/known-issues.txt: fix s/Soucery/Sourcery/
 typo

Reported-by: homas De Schampheleire <patrickdepinguin@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/known-issues.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/known-issues.txt b/docs/manual/known-issues.txt
index 4ef8c05cd7..22710fb136 100644
--- a/docs/manual/known-issues.txt
+++ b/docs/manual/known-issues.txt
@@ -28,5 +28,5 @@ Known issues
   architectures.
 
 * The +prboom+ package triggers a compiler failure with the SuperH 4
-  compiler from Soucery CodeBench, version 2012.09.
+  compiler from Sourcery CodeBench, version 2012.09.
 

From 7d3f2897f82c85d45c2f3d19e60875df35d4acea Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 6 Oct 2013 21:09:26 -0300
Subject: [PATCH 6337/6849] openssh: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/openssh/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/openssh/Config.in b/package/openssh/Config.in
index 0c3d993a68..78cc615c03 100644
--- a/package/openssh/Config.in
+++ b/package/openssh/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENSSH
 	bool "openssh"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	help

From f9d5a367c0517c546a85d79b49baf39f077f1750 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 13:26:28 +0800
Subject: [PATCH 6338/6849] gtest: bump to version 1.7.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gtest/gtest.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 52028f5294..60aeb495e9 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GTEST_VERSION = 1.6.0
+GTEST_VERSION = 1.7.0
 GTEST_SOURCE = gtest-$(GTEST_VERSION).zip
 GTEST_SITE = http://googletest.googlecode.com/files/
 GTEST_INSTALL_STAGING = YES

From b953d79b62ae75950349ea6575fe8ee9b895f0c0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 13:35:18 +0800
Subject: [PATCH 6339/6849] smartmontools: bump to version 6.2

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/smartmontools/smartmontools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index fb9fb3cde0..903ed47da8 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SMARTMONTOOLS_VERSION = 6.1
+SMARTMONTOOLS_VERSION = 6.2
 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
 SMARTMONTOOLS_LICENSE = GPLv2+
 SMARTMONTOOLS_LICENSE_FILES = COPYING

From c907adbfc9c13e0e8cb3bde3e9c4ebfe9441f9a6 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 7 Oct 2013 10:44:42 +0200
Subject: [PATCH 6340/6849] barebox: bump to version 2013.10.0

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 1bbbe06fd4..eb2b0b22d9 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.09.0"
+	bool "2013.10.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.09.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.10.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From ef162c24f03655050ef294d3e89f8f5fd2106d89 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 17:10:20 +0800
Subject: [PATCH 6341/6849] sudo: bump to version 1.8.8

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sudo/sudo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 661d858b11..e0db465ddd 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUDO_VERSION = 1.8.6p7
+SUDO_VERSION = 1.8.8
 SUDO_SITE    = http://www.sudo.ws/sudo/dist
 SUDO_LICENSE = ICS BSD-3c
 SUDO_LICENSE_FILES = doc/LICENSE

From 334e4737dff70459815a9a2d181a44324e8d8119 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 17:46:31 +0800
Subject: [PATCH 6342/6849] mpg123: bump to version 1.16.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mpg123/mpg123.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index e9d074fc75..333224978e 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MPG123_VERSION = 1.15.4
+MPG123_VERSION = 1.16.0
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias

From 27966dc8d8f9f5264b6c8d4809f919cc9336712d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 17:56:14 +0800
Subject: [PATCH 6343/6849] gtest: add license information

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gtest/gtest.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 60aeb495e9..e661d734c1 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -9,6 +9,8 @@ GTEST_SOURCE = gtest-$(GTEST_VERSION).zip
 GTEST_SITE = http://googletest.googlecode.com/files/
 GTEST_INSTALL_STAGING = YES
 GTEST_INSTALL_TARGET = NO
+GTEST_LICENSE = BSD-3c
+GTEST_LICENSE_FILES = LICENSE
 
 define GTEST_EXTRACT_CMDS
 	unzip $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR)

From 280a387737ed72a2dd844253eeb64cc373ca7656 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 13:51:25 +0800
Subject: [PATCH 6344/6849] ortp: bump to version 0.22.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ortp/ortp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index 5ccc5ff0f1..513be9b438 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ORTP_VERSION = 0.20.0
+ORTP_VERSION = 0.22.0
 ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
 ORTP_CONF_OPT = --disable-strict
 ORTP_INSTALL_STAGING = YES

From 5c9bd09556a58241647a6b602f345253567c7f33 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 15:08:41 +0800
Subject: [PATCH 6345/6849] lcms2: bump to version 2.5

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lcms2/lcms2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk
index c997ac3e98..993677b068 100644
--- a/package/lcms2/lcms2.mk
+++ b/package/lcms2/lcms2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LCMS2_VERSION = 2.4
+LCMS2_VERSION = 2.5
 LCMS2_SITE = http://downloads.sourceforge.net/lcms/lcms
 LCMS2_LICENSE = MIT
 LCMS2_LICENSE_FILES = COPYING

From d4a389324cf3b018b9eb29e0b21d2711098edb01 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 7 Oct 2013 18:35:56 +0800
Subject: [PATCH 6346/6849] minicom: bump to version 2.6.2

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/minicom/minicom.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index d46376e2fb..05004b8bb0 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-MINICOM_VERSION = 2.6.1
-MINICOM_SITE = http://alioth.debian.org/frs/download.php/file/3700/
+MINICOM_VERSION = 2.6.2
+MINICOM_SITE = http://alioth.debian.org/frs/download.php/file/3869/
 MINICOM_LICENSE = GPLv2+
 MINICOM_LICENSE_FILES = COPYING
 

From fdd37332bc274a4c461604af1265719b735f0d34 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 09:18:16 -0300
Subject: [PATCH 6347/6849] polarssl: security bump to version 1.2.9

Fixes PolarSSL SA 2013-05.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 4 ++--
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index f376c1e9ff..47511b24d5 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.8]
+[Gustavo: update for polarssl 1.2.9]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.8 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.9 SOVERSION 3)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 781b6bc48e..deb2252a53 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 POLARSSL_SITE = https://polarssl.org/code/releases
-POLARSSL_VERSION = 1.2.8
+POLARSSL_VERSION = 1.2.9
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From 38cde8594dcacb8d1e7460e7eab4e70ef9ecb464 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 7 Oct 2013 13:49:56 +0100
Subject: [PATCH 6348/6849] lighttpd: Version bump to 1.4.33

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lighttpd/lighttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index f65ee6da1f..c820a735e3 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIGHTTPD_VERSION = 1.4.32
+LIGHTTPD_VERSION = 1.4.33
 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_LICENSE = BSD-3c

From 4f92c64fd60d8d58db67eb06c3e39b790b230385 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 16:46:55 -0300
Subject: [PATCH 6349/6849] ffmpeg: security bump to version 0.8.15

Fixes several vulnerabilities.
TODO: update to a more modern branch.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index b102af12c2..6685110a5a 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FFMPEG_VERSION = 0.8.12
+FFMPEG_VERSION = 0.8.15
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES

From 97c386e4586201dbd976925f021ff877620462fc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 16:46:56 -0300
Subject: [PATCH 6350/6849] minidlna: security bump to version 1.0.26

Fixes CVE-2013-2738, CVE-2013-2739 and CVE-2013-2745.
Also needs threads, which fixes:
http://autobuild.buildroot.net/results/d91/d91b64c93097580e1da53b6ccfb4b492f382a5f3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/minidlna/Config.in   | 5 +++--
 package/minidlna/minidlna.mk | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
index c73c00142c..2b684ba290 100644
--- a/package/minidlna/Config.in
+++ b/package/minidlna/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MINIDLNA
 	depends on BR2_LARGEFILE # ffmpeg
 	depends on BR2_INET_IPV6 # ffmpeg
 	depends on BR2_USE_MMU # fork
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FLAC
 	select BR2_PACKAGE_LIBVORBIS # selects libogg
@@ -17,5 +18,5 @@ config BR2_PACKAGE_MINIDLNA
 
 	  http://minidlna.sourceforge.net/
 
-comment "minidlna requires a toolchain with LARGEFILE and IPV6 support"
-	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
+comment "minidlna requires a toolchain with LARGEFILE, IPV6 and thread support"
+	depends on !(BR2_LARGEFILE && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
index 077e2572c0..4df6ff0192 100644
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-MINIDLNA_VERSION = 1.0.25
+MINIDLNA_VERSION = 1.0.26
 MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
-MINIDLNA_SOURCE = minidlna_$(MINIDLNA_VERSION)_src.tar.gz
 MINIDLNA_LICENSE = GPLv2 BSD-3c
 MINIDLNA_LICENSE_FILES = LICENCE LICENCE.miniupnpd
 

From 1fffa00852e74e839d53dbbac7a27a72e87020ff Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 18:02:15 -0300
Subject: [PATCH 6351/6849] lighttpd: fix build failure without ipv6

Reported in https://bugs.gentoo.org/show_bug.cgi?id=486426
and http://redmine.lighttpd.net/issues/2515
Autobuilders didn't hit it yet, but i did.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...h => lighttpd-01-Fix-default-config-file.patch} |  0
 package/lighttpd/lighttpd-02-mod_extforward.patch  | 14 ++++++++++++++
 2 files changed, 14 insertions(+)
 rename package/lighttpd/{lighttpd-Fix-default-config-file.patch => lighttpd-01-Fix-default-config-file.patch} (100%)
 create mode 100644 package/lighttpd/lighttpd-02-mod_extforward.patch

diff --git a/package/lighttpd/lighttpd-Fix-default-config-file.patch b/package/lighttpd/lighttpd-01-Fix-default-config-file.patch
similarity index 100%
rename from package/lighttpd/lighttpd-Fix-default-config-file.patch
rename to package/lighttpd/lighttpd-01-Fix-default-config-file.patch
diff --git a/package/lighttpd/lighttpd-02-mod_extforward.patch b/package/lighttpd/lighttpd-02-mod_extforward.patch
new file mode 100644
index 0000000000..3efd2b1e02
--- /dev/null
+++ b/package/lighttpd/lighttpd-02-mod_extforward.patch
@@ -0,0 +1,14 @@
+From http://redmine.lighttpd.net/issues/2515
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/src/mod_extforward.c	(revision 2909)
++++ b/src/mod_extforward.c	(working copy)
+@@ -439,7 +439,6 @@
+ #ifdef HAVE_IPV6
+ 		ipstr_to_sockaddr(srv, real_remote_addr, &sock);
+ #else
+-		UNUSED(addrs_left);
+ 		sock.ipv4.sin_addr.s_addr = inet_addr(real_remote_addr);
+ 		sock.plain.sa_family = (sock.ipv4.sin_addr.s_addr == 0xFFFFFFFF) ? AF_UNSPEC : AF_INET;
+ #endif

From 5be8de0a5d78df60e3cbd24be31f9f434cab4763 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 17:21:57 -0300
Subject: [PATCH 6352/6849] mediastreamer: bump to version 2.9.0

Fixes the fallout from commit 280a387737ed72a2dd844253eeb64cc373ca7656
which didn't test building things that links against ortp, fixing:
http://autobuild.buildroot.net/results/ac6/ac69ff3332713e3a6681fd1d418f1cb9c1941098

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mediastreamer/mediastreamer.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 5093df7912..52a5b5abd1 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-MEDIASTREAMER_VERSION = 2.8.2
+MEDIASTREAMER_VERSION = 2.9.0
 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
 MEDIASTREAMER_INSTALL_STAGING = YES
 MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext
 # tests fail linking on some architectures, so disable them
-MEDIASTREAMER_CONF_OPT = --disable-tests
+MEDIASTREAMER_CONF_OPT = --disable-tests --disable-glx --disable-strict
 MEDIASTREAMER_LICENSE = GPLv2+
 MEDIASTREAMER_LICENSE_FILES = COPYING
 

From e4c05314a5e2ae5756f91b567c1795d4b73f7243 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 17:21:58 -0300
Subject: [PATCH 6353/6849] linphone: bump to version 3.6.1

Because of the previous mediastreamer bump (because of the untested ortp
bump) we need to bump linphone as well to avoid build failures.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linphone/linphone.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index 2ff678b8ed..6fa148750c 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LINPHONE_VERSION = 3.5.2
-LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
+LINPHONE_VERSION = 3.6.1
+LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.6.x/sources
 LINPHONE_CONF_OPT = \
 	--enable-external-ortp \
 	--enable-external-mediastreamer \

From 7da96859fc82f9b685669390f0717c4479bcb95a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 8 Oct 2013 08:46:45 +0800
Subject: [PATCH 6354/6849] fmtools: add license information

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/fmtools/fmtools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/fmtools/fmtools.mk b/package/fmtools/fmtools.mk
index 407b702d20..5f305b9655 100644
--- a/package/fmtools/fmtools.mk
+++ b/package/fmtools/fmtools.mk
@@ -6,6 +6,8 @@
 
 FMTOOLS_VERSION = 1.0.2
 FMTOOLS_SITE = http://www.stanford.edu/~blp/fmtools/
+FMTOOLS_LICENSE = GPLv2+
+FMTOOLS_LICENSE_FILES = COPYING
 
 define FMTOOLS_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From a2bdef657583567cf6e832cc083a014f138596f0 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 8 Oct 2013 09:08:21 +0800
Subject: [PATCH 6355/6849] icu: needs threads

Fixes:
http://autobuild.buildroot.net/results/ae7/ae721db2dd4e764a2af3825c388a63cad9720ebe/

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/icu/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/icu/Config.in b/package/icu/Config.in
index 21f5c2fa86..3dd16b7935 100644
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -2,10 +2,12 @@ config BR2_PACKAGE_ICU
 	bool "icu"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  International Components for Unicode.
 
 	  http://site.icu-project.org/
 
-comment "icu requires a toolchain with C++ support and WCHAR enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "icu requires a toolchain with C++, WCHAR and threading support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS

From aab5d679e72f11d4b405d63803663896bb69a98c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 Oct 2013 23:18:20 -0300
Subject: [PATCH 6356/6849] minidlna: fix build failure

With the 1.0.26 version bump a new routine was added to find newer
versions of ffmpeg and/or libav on different include paths.
Unfortunately this uses absolute pathnames hence when there's no
matching ffmpeg/libav headers on the host it fails to build. Fixes:
http://autobuild.buildroot.net/results/20a/20a1b3a9f040d2207b6c533a158e9747054ddd2d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/minidlna/minidlna.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
index 4df6ff0192..c99ade28e2 100644
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -35,10 +35,15 @@ endif
 
 MINIDLNA_MAKE_OPTS += LIBS='$(MINIDLNA_COMMON_LIBS)'
 
+# genconfig.sh uses absolute paths to find libav, so help it out
 define MINIDLNA_BUILD_CMDS
 	PREFIX=$(STAGING_DIR)/usr \
 		$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(MINIDLNA_CFLAGS)" -C $(@D) depend
+	$(SED) '/HAVE_LIBAV/d' $(@D)/config.h
+	echo "#define HAVE_LIBAVUTIL_AVUTIL_H 1" >>$(@D)/config.h
+	echo "#define HAVE_LIBAVFORMAT_AVFORMAT_H 1" >>$(@D)/config.h
+	echo "#define HAVE_LIBAVCODEC_AVCODEC_H 1" >>$(@D)/config.h
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(MINIDLNA_CFLAGS)" $(MINIDLNA_MAKE_OPTS) -C $(@D) all
 endef

From 30f8f1d2679f65d1d9fa00d8d671fe4b5e7fcc5f Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 8 Oct 2013 08:35:40 +0200
Subject: [PATCH 6357/6849] harfbuzz: bump to version 0.9.22

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/harfbuzz/harfbuzz.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk
index 00651fd6c7..847075da97 100644
--- a/package/harfbuzz/harfbuzz.mk
+++ b/package/harfbuzz/harfbuzz.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HARFBUZZ_VERSION = 0.9.19
+HARFBUZZ_VERSION = 0.9.22
 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release/
 HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
 HARFBUZZ_LICENSE = MIT, ISC (ucdn library), ICU License (icu support library)

From 09e59d73f588ff26a62787dc91e0a0bc810b39e0 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Tue, 8 Oct 2013 09:11:55 +0200
Subject: [PATCH 6358/6849] libsoc: bump to 0.4

"Non-blocking GPIO Interrupts with callback mechanism" feature
requires pthreads.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libsoc/Config.in | 4 ++++
 package/libsoc/libsoc.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/libsoc/Config.in b/package/libsoc/Config.in
index 3e750bd0fd..0f6336de1c 100644
--- a/package/libsoc/Config.in
+++ b/package/libsoc/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_LIBSOC
 	bool "libsoc"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  libsoc is a C library for interfacing with common SoC
 	  peripherals through generic kernel interfaces
 
 	  https://github.com/jackmitch/libsoc
+
+comment "libsoc requires a toolchain with threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
index 509d8eb061..79c7e90006 100644
--- a/package/libsoc/libsoc.mk
+++ b/package/libsoc/libsoc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSOC_VERSION = 356760dcb93b22d6c67c5232cde2ade8c968c932
+LIBSOC_VERSION = 0.4
 LIBSOC_SITE = http://github.com/jackmitch/libsoc/tarball/$(LIBSOC_VERSION)
 LIBSOC_LICENSE = LGPLv2.1
 LIBSOC_LICENSE_FILES = COPYING

From 5546a527bc734e8655685dc46941ade0fdff634a Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 8 Oct 2013 15:49:25 +0200
Subject: [PATCH 6359/6849] conntrack-tools: correct license GPLv2 -> GPLv2+

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/conntrack-tools/conntrack-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index eb7654e44c..c01501ae79 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -10,7 +10,7 @@ CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
 	libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
 	libnetfilter_queue host-bison host-flex
-CONNTRACK_TOOLS_LICENSE = GPLv2
+CONNTRACK_TOOLS_LICENSE = GPLv2+
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)

From b7f43d42bfa1a2d5866a5a9df5462111b694adb1 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Tue, 8 Oct 2013 10:36:48 +0200
Subject: [PATCH 6360/6849] rpi-userland: needs threads

Fixes http://autobuild.buildroot.net/results/c3b4c09edee2499e811808018be1858bdee70436/

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index da5726f2e4..d4e28a123d 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_RPI_USERLAND
 	depends on BR2_arm
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_HAS_OPENGL_EGL
 	select BR2_PACKAGE_HAS_OPENGL_ES
 	select BR2_PACKAGE_HAS_OPENVG
@@ -16,5 +17,5 @@ config BR2_PACKAGE_RPI_USERLAND
 
 	  https://github.com/raspberrypi/userland/
 
-comment "rpi-userland requires a toolchain with C++ and LARGEFILE support"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
+comment "rpi-userland requires a toolchain with C++, LARGEFILE and threads support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From 972a73e61aa6b73ce8ac8cffcf03a374d4d07b5e Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 8 Oct 2013 10:43:49 +0800
Subject: [PATCH 6361/6849] stress: fix download url

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/stress/stress.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index df9065aaaa..6e82b500f1 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 STRESS_VERSION = 1.0.4
-STRESS_SITE    = http://weather.ou.edu/~apw/projects/stress
+STRESS_SITE = http://people.seas.harvard.edu/~apw/stress
 STRESS_AUTORECONF = YES
 
 # Stress is linked statically if the --enable-static is specified.

From f65e8e31a5cbd27ae3aced271de7cffc4713ac4c Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 8 Oct 2013 15:59:29 +0800
Subject: [PATCH 6362/6849] stress: add license information

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/stress/stress.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index 6e82b500f1..63efb66f5b 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -6,6 +6,8 @@
 
 STRESS_VERSION = 1.0.4
 STRESS_SITE = http://people.seas.harvard.edu/~apw/stress
+STRESS_LICENSE = GPLv2+
+STRESS_LICENSE_FILES = COPYING
 STRESS_AUTORECONF = YES
 
 # Stress is linked statically if the --enable-static is specified.

From fc088e15eaaf2cb2a79febd99d28dafd7ba5faca Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 8 Oct 2013 08:03:16 +0200
Subject: [PATCH 6363/6849] imagemagick: change the patch name

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...use-xml2-config.patch => imagemagick-01-use-xml2-config.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/imagemagick/{imagemagick-use-xml2-config.patch => imagemagick-01-use-xml2-config.patch} (100%)

diff --git a/package/imagemagick/imagemagick-use-xml2-config.patch b/package/imagemagick/imagemagick-01-use-xml2-config.patch
similarity index 100%
rename from package/imagemagick/imagemagick-use-xml2-config.patch
rename to package/imagemagick/imagemagick-01-use-xml2-config.patch

From 044e39dd3eb7b28947afc43d233014187a78b0e3 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 8 Oct 2013 08:03:17 +0200
Subject: [PATCH 6364/6849] imagemagick: bump to version 6.8.7 0

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/imagemagick/imagemagick.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 21495749d0..f5aacb68bd 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-IMAGEMAGICK_MAJOR = 6.8.6
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-2
+IMAGEMAGICK_MAJOR = 6.8.7
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-0
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
 # The official ImageMagick site only keeps the latest versions
 # available, which is annoying. Use an alternate site that keeps all

From 050f6935b25f92bd674e2db1211eb42881a1d1cb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 8 Oct 2013 22:36:48 +0200
Subject: [PATCH 6365/6849] harfbuzz: unbreak legal-info after version bump

The embedded icu support library has been removed upstream:

http://cgit.freedesktop.org/harfbuzz/commit/src?id=ac1b723917d9b8f247a350f8d3e1bc5d1e472073

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/harfbuzz/harfbuzz.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk
index 847075da97..23bc848146 100644
--- a/package/harfbuzz/harfbuzz.mk
+++ b/package/harfbuzz/harfbuzz.mk
@@ -7,8 +7,8 @@
 HARFBUZZ_VERSION = 0.9.22
 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release/
 HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
-HARFBUZZ_LICENSE = MIT, ISC (ucdn library), ICU License (icu support library)
-HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING src/hb-icu-le/COPYING
+HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
+HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING
 HARFBUZZ_INSTALL_STAGING = YES
 
 HARFBUZZ_CONF_OPT = --without-coretext --without-uniscribe --without-graphite2

From fa4e3d5e602beb776037f94a6b9efcf74c3a0632 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 8 Oct 2013 21:02:31 +0200
Subject: [PATCH 6366/6849] netatalk: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netatalk/netatalk.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 5dab57d9ae..2bd63ecb3f 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -11,6 +11,8 @@ NETATALK_AUTORECONF = YES
 NETATALK_CONFIG_SCRIPTS = netatalk-config
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \
 	libevent
+NETATALK_LICENSE = GPLv2+, LGPLv3+, MIT-like
+NETATALK_LICENSE_FILES = COPYING COPYRIGHT
 
 # Don't run ldconfig!
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \

From 83630bc494a3bf221187a0e64428a0d18ec4475a Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 8 Oct 2013 21:02:32 +0200
Subject: [PATCH 6367/6849] perl: fix license info

According to the README, perl can be used either under
Artistic or under GPLv1+ license, so include both.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/perl/perl.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 5ef0b24151..ac85ed9734 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -8,8 +8,8 @@ PERL_VERSION_MAJOR = 18
 PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
-PERL_LICENSE = Artistic
-PERL_LICENSE_FILES = Artistic
+PERL_LICENSE = Artistic or GPLv1+
+PERL_LICENSE_FILES = Artistic Copying README
 PERL_INSTALL_STAGING = YES
 
 PERL_CROSS_VERSION = 0.8

From 3a26628bf3dcd20d9b7d27d53bc5e2752cf515dc Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 8 Oct 2013 21:02:33 +0200
Subject: [PATCH 6368/6849] ruby: fix license info

Based on the contents of LEGAL, without checking the code.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ruby/ruby.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index ba2d49b47f..2188837a36 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -12,8 +12,8 @@ RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
 RUBY_MAKE = $(MAKE1)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
 HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
-RUBY_LICENSE = Ruby
-RUBY_LICENSE_FILES = LEGAL
+RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others
+RUBY_LICENSE_FILES = LEGAL COPYING BSDL
 
 # Force optionals to build before we do
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)

From 637421c51f854414c8ecbaf047d1bddd2ac411cd Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 8 Oct 2013 09:31:48 +0800
Subject: [PATCH 6369/6849] lvm2: bump to version 2.02.103 and add license
 information

[Peter: License is explictly GPLv2 LGPLv2.1 (not +)]
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lvm2/lvm2.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 873216c7c6..79a0d05061 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-LVM2_VERSION = 2.02.79
+LVM2_VERSION = 2.02.103
 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
 LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
 LVM2_INSTALL_STAGING = YES
+LVM2_LICENSE = GPLv2 LGPLv2.1
+LVM2_LICENSE_FILES = COPYING COPYING.LIB
 
 LVM2_BINS = \
 	dmsetup fsadm lvm lvmconf lvmdump vgimportclone \

From d8664dd43853ee744eb5eefdc48f72750000c1aa Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:16:58 +0200
Subject: [PATCH 6370/6849] glibc: both eglibc and glibc need host-gawk

Until now, only the eglibc build was pulling host-gawk as a
dependency, but after more testing, it turns out that the glibc build
also requires host-gawk.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glibc/glibc.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 48ff0f72c7..a9e89f15b8 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -21,12 +21,7 @@ GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICEN
 
 # Before (e)glibc is configured, we must have the first stage
 # cross-compiler and the kernel headers
-GLIBC_DEPENDENCIES = host-gcc-initial linux-headers
-
-# eglibc also needs host-gawk
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
-GLIBC_DEPENDENCIES += host-gawk
-endif
+GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk
 
 # Before (e)glibc is built, we must have the second stage cross-compiler
 glibc-build: host-gcc-intermediate

From 03b05402df6f2a06ffc936c6364da5951f315197 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:16:59 +0200
Subject: [PATCH 6371/6849] glibc: fix glibc build by creating an empty
 gnu/stubs.h

The stubs.h header is not installed by install-headers, but is needed
for the gcc build. An empty stubs.h will work, as explained in
http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick is
used by Crosstool-NG.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glibc/glibc.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index a9e89f15b8..4d89caff02 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -47,6 +47,17 @@ else ifeq ($(BR2_MIPS_OABI32),y)
 GLIBC_EXTRA_CFLAGS += -mabi=32
 endif
 
+# The stubs.h header is not installed by install-headers, but is
+# needed for the gcc build. An empty stubs.h will work, as explained
+# in http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick
+# is used by Crosstool-NG.
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_GLIBC),y)
+define GLIBC_ADD_MISSING_STUB_H
+	mkdir -p $(STAGING_DIR)/usr/include/gnu
+	touch $(STAGING_DIR)/usr/include/gnu/stubs.h
+endef
+endif
+
 # Even though we use the autotools-package infrastructure, we have to
 # override the default configure commands for several reasons:
 #
@@ -89,6 +100,7 @@ define GLIBC_CONFIGURE_CMDS
 	cp $(@D)/build/csu/crt1.o $(STAGING_DIR)/usr/lib/
 	cp $(@D)/build/csu/crti.o $(STAGING_DIR)/usr/lib/
 	cp $(@D)/build/csu/crtn.o $(STAGING_DIR)/usr/lib/
+	$(GLIBC_ADD_MISSING_STUB_H)
 	$(TARGET_CROSS)gcc -nostdlib \
 		-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
 endef

From 2c13d5bc60749717634fac60b8165a3e2567bcdb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:00 +0200
Subject: [PATCH 6372/6849] package: add a <pkg>_EXTRA_DOWNLOADS variable

Converting the external toolchain logic into a package raises a very
special use case that wasn't handled by the package infrastructure:
the Blackfin toolchain is delivered as two tarballs instead of
one. Unfortunately <pkg>_SOURCE only allows to pass one tarball name.

However, we really want both tarballs to be known by the package
infrastructure, so that the normal 'source' and 'external-deps'
mechanism work fine.

In order to achieve this, we add a <pkg>_EXTRA_DOWNLOADS variable,
which allows a package to list other stuff it would like to see
downloaded, but that are otherwise not used by the package
infrastructure itself: it is up to the package to do it by itself.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-generic.txt | 6 ++++++
 package/pkg-generic.mk                  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index cb067bd4e1..59a2684745 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -248,6 +248,12 @@ information is (assuming the package name is +libfoo+) :
     +LIBFOO_SITE=/opt/software/libfoo.tar.gz+ +
     +LIBFOO_SITE=$(TOPDIR)/../src/libfoo/+
 
+* +LIBFOO_EXTRA_DOWNLOADS+ lists a number of additional files that
+  Buildroot should download from +LIBFOO_SITE+ in addition to the main
+  +LIBFOO_SOURCE+ (which usually is a tarball). Buildroot will not do
+  anything with those additional files, except download files: it will
+  be up to the package recipe to use them from +$(DL_DIR)+.
+
 * +LIBFOO_SITE_METHOD+ determines the method used to fetch or copy the
   package source code. In many cases, Buildroot guesses the method
   from the contents of +LIBFOO_SITE+ and setting +LIBFOO_SITE_METHOD+
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index bfc4dc14f3..a46457c59d 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -40,6 +40,7 @@ ifeq ($(DL_MODE),DOWNLOAD)
 	fi
 endif
 	$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))
+	$(foreach p,$($(PKG)_EXTRA_DOWNLOADS),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))$(sep))
 	$(foreach p,$($(PKG)_PATCH),\
 		$(if $(findstring ://,$(p)),\
 			$(call DOWNLOAD,$(p)),\

From 8b0905bf2ffa55976c92cdb2f0cf9bdb6c6a6847 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:01 +0200
Subject: [PATCH 6373/6849] toolchain: introduce a virtual package

This commit introduces a virtual package called 'toolchain', located
in 'toolchain/toolchain', which simply depends on
'toolchain-buildroot' or 'toolchain-external' depending on the
selected toolchain backend.

For now, toolchain-buildroot and toolchain-external are still manual
make targets, but the following patches convert those backends to use
the package infrastructure as well.

In addition to this:

 * The main Makefile is modified to always make BASE_TARGETS point to
   this new toolchain virtual package.

 * The main Makefile is changed to include all the toolchain/*/*.mk
   files: the toolchain virtual package, and the toolchain-buildroot
   and toolchain-external directories.

 * The dependency of the toolchain on prepare dirs and dependencies is
   moved to the toolchain virtual package. It is moved as a
   prerequisite of the "toolchain-source" rule to ensure that all
   directories are prepared before we even start extracting the
   toolchain.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile                         | 19 ++++---------------
 toolchain/toolchain/toolchain.mk | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 toolchain/toolchain/toolchain.mk

diff --git a/Makefile b/Makefile
index 2fb116805a..f266e2dd77 100644
--- a/Makefile
+++ b/Makefile
@@ -236,11 +236,7 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 #
 ################################################################################
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-BASE_TARGETS += toolchain-buildroot
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-BASE_TARGETS += toolchain-external
-endif
+BASE_TARGETS = toolchain
 
 TARGETS:=
 
@@ -317,11 +313,8 @@ include support/dependencies/dependencies.mk
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-include toolchain/toolchain-buildroot.mk
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-include toolchain/toolchain-external.mk
-endif
+include toolchain/helpers.mk
+include toolchain/*/*.mk
 
 # Include the package override file if one has been provided in the
 # configuration.
@@ -388,16 +381,12 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
 	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
-$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
-
 $(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG)
 	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
 
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
-toolchain: prepare dirs dependencies $(BASE_TARGETS)
-
-world: toolchain $(TARGETS_ALL)
+world: $(BASE_TARGETS) $(TARGETS_ALL)
 
 .PHONY: all world toolchain dirs clean distclean source outputmakefile \
 	legal-info legal-info-prepare legal-info-clean printvars \
diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk
new file mode 100644
index 0000000000..44ed62987c
--- /dev/null
+++ b/toolchain/toolchain/toolchain.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# toolchain
+#
+################################################################################
+
+TOOLCHAIN_SOURCE =
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+TOOLCHAIN_DEPENDENCIES += toolchain-buildroot
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+TOOLCHAIN_DEPENDENCIES += toolchain-external
+endif
+
+$(eval $(generic-package))
+
+toolchain-source: prepare dirs dependencies $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
+

From 9934630fae4c4649eeb15a8235a810cb9d18038c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:02 +0200
Subject: [PATCH 6374/6849] toolchain-buildroot: convert to the package
 infrastructure

This commit converts the toolchain-buildroot logic to the package
infrastructure. The package is fairly simple as it only defines
BUILDROOT_LIBC, and depends on host-gcc-final to get the overall
internal toolchain build logic started.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-buildroot.mk                |  9 ---------
 .../toolchain-buildroot/toolchain-buildroot.mk  | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 toolchain/toolchain-buildroot.mk
 create mode 100644 toolchain/toolchain-buildroot/toolchain-buildroot.mk

diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk
deleted file mode 100644
index 3a0580066e..0000000000
--- a/toolchain/toolchain-buildroot.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Triggerring the build of the host-gcc-final will automaticaly do the
-# build of binutils, uClibc, kernel headers and all the intermediate
-# gcc steps.
-
-include toolchain/helpers.mk
-
-BUILDROOT_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))
-
-toolchain-buildroot: host-gcc-final
diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk
new file mode 100644
index 0000000000..ced430e59e
--- /dev/null
+++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# toolchain-buildroot
+#
+################################################################################
+
+TOOLCHAIN_BUILDROOT_SOURCE =
+
+BUILDROOT_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))
+
+# Trigerring the build of the host-gcc-final will automatically do the
+# build of binutils, uClibc, kernel headers and all the intermediate
+# gcc steps.
+
+TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final
+
+$(eval $(generic-package))

From d07d2bfeb208b38c9e87e97f0c1346b909ff6a6c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:03 +0200
Subject: [PATCH 6375/6849] toolchain-external: convert to the package
 infrastructure

This commit converts the 'toolchain-external' logic to the package
infrastructure.

The TOOLCHAIN_EXTERNAL_DIR variable (which points to where the
toolchain is located) is renamed to TOOLCHAIN_EXTERNAL_INSTALL_DIR,
because the former conflicts with the package infrastructure (which
defines the <pkg>_DIR variable for each package as pointing to its
build directory).

The new _EXTRA_DOWNLOADS mechanism is used for Blackfin toolchains.

The extract, configuration and installation steps are converted inside
the <pkg>_EXTRACT_CMDS, <pkg>_CONFIGURE_CMDS and
<pkg>_INSTALL_STAGING_CMDS.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external.mk               |   4 -
 .../{ext-tool.mk => toolchain-external.mk}    | 154 ++++++++----------
 2 files changed, 69 insertions(+), 89 deletions(-)
 delete mode 100644 toolchain/toolchain-external.mk
 rename toolchain/toolchain-external/{ext-tool.mk => toolchain-external.mk} (86%)

diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk
deleted file mode 100644
index 2f43db7c99..0000000000
--- a/toolchain/toolchain-external.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Required includes for the external toolchain backend
-
-include toolchain/helpers.mk
-include toolchain/toolchain-external/ext-tool.mk
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/toolchain-external.mk
similarity index 86%
rename from toolchain/toolchain-external/ext-tool.mk
rename to toolchain/toolchain-external/toolchain-external.mk
index 8cfd1b1537..85fc341a6a 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -1,5 +1,11 @@
+################################################################################
 #
-# This file implements the support for external toolchains, i.e
+# toolchain-external
+#
+################################################################################
+
+#
+# This package implements the support for external toolchains, i.e
 # toolchains that have not been produced by Buildroot itself and that
 # Buildroot can download from the Web or that are already available on
 # the system on which Buildroot runs. So far, we have tested this
@@ -14,7 +20,7 @@
 # The basic principle is the following
 #
 #  1. If the toolchain is not pre-installed, download and extract it
-#  in $(TOOLCHAIN_EXTERNAL_DIR).
+#  in $(TOOLCHAIN_EXTERNAL_INSTALL_DIR).
 #
 #  2. For all external toolchains, perform some checks on the
 #  conformity between the toolchain configuration described in the
@@ -105,21 +111,21 @@ endif # ! no threads
 
 TOOLCHAIN_EXTERNAL_PREFIX=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
-TOOLCHAIN_EXTERNAL_DIR=$(HOST_DIR)/opt/ext-toolchain
+TOOLCHAIN_EXTERNAL_INSTALL_DIR=$(HOST_DIR)/opt/ext-toolchain
 else
-TOOLCHAIN_EXTERNAL_DIR=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
+TOOLCHAIN_EXTERNAL_INSTALL_DIR=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 endif
 
-ifeq ($(TOOLCHAIN_EXTERNAL_DIR),)
+ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
 ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
 # if no path set, figure it out from path
 TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
 endif
 else
 ifeq ($(BR2_bfin),y)
-TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin
+TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin
 else
-TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_DIR)/bin
+TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
 endif
 endif
 
@@ -203,10 +209,6 @@ TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
 endif
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
-TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted
-endif
-
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE = arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
@@ -220,15 +222,15 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109),y)
 TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
 TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2
 define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
-	mv $(@D)/arago-2011.09/armv7a/* $(@D)/
-	rm -rf $(@D)/arago-2011.09/
+	mv $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/arago-2011.09/armv7a/* $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/
+	rm -rf $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/arago-2011.09/
 endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109),y)
 TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports/
 TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2
 define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
-	mv $(@D)/arago-2011.09/armv5te/* $(@D)/
-	rm -rf $(@D)/arago-2011.09/
+	mv $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/arago-2011.09/armv5te/* $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/
+	rm -rf $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/arago-2011.09/
 endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06),y)
 TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
@@ -282,17 +284,13 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
 TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
-TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9858/
-TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/559/9866/
-TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R1-RC2.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/projects/adi-toolchain/files/2012R1-BF60X/2012R1-RC2-BF60X/i386/
+TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2012R1-RC2.i386.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
-TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/588/10139/
-TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SITE_2   = http://blackfin.uclinux.org/gf/download/frsrelease/588/10147/
-TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SOURCE   = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
+TOOLCHAIN_EXTERNAL_SITE   = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
+TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
+TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE = lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
@@ -318,53 +316,38 @@ else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE = $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
 TOOLCHAIN_EXTERNAL_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
-
-# A value must be set (even if unused), otherwise the
-# $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) rule would override the main
-# $(DL_DIR) rule
-ifeq (,$(TOOLCHAIN_EXTERNAL_SOURCE))
-TOOLCHAIN_EXTERNAL_SOURCE = none
-endif
 endif
 
+TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES
+
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
 # Special handling for Blackfin toolchain, because of the split in two
 # tarballs, and the organization of tarball contents. The tarballs
 # contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
 # which themselves contain the toolchain. This is why we strip more
 # components than usual.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
-$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
-
-$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_2:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_2))
-
-$(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2)
-	mkdir -p $(@D)
-	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE_1)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
-	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE_2)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2) | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
-	$(Q)touch $@
-else
-# Download and extraction of a toolchain
-$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
-	$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE)$(TOOLCHAIN_EXTERNAL_SOURCE),$(TOOLCHAIN_EXTERNAL_SOURCE))
-
-$(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
-	mkdir -p $(@D)
-	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $^ | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
+define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS
+	mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)
+	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -
+	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS) | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -
+endef
+else ifneq ($(TOOLCHAIN_EXTERNAL_SOURCE),)
+# Normal handling of toolchain tarball extraction.
+define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS
+	mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)
+	$(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_SOURCE)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE) | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) $(TAR_OPTIONS) -
 	$(TOOLCHAIN_EXTERNAL_FIXUP_CMDS)
-	$(Q)touch $@
+endef
 endif
 
 # Checks for an already installed toolchain: check the toolchain
 # location, check that it supports sysroot, and then verify that it
 # matches the configuration provided in Buildroot: ABI, C++ support,
 # type of C library and all C library features.
-$(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
-	@$(call MESSAGE,"Checking external toolchain settings")
+define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
 	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
@@ -385,7 +368,7 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 	else \
 		$(call check_glibc,$${SYSROOT_DIR}) ; \
 	fi
-	$(Q)touch $@
+endef
 
 # Integration of the toolchain into Buildroot: find the main sysroot
 # and the variant-specific sysroot, then copy the needed libraries to
@@ -435,7 +418,7 @@ $(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)
 #                       considered when searching libraries for copy
 #                       to the target filesystem.
 
-$(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
+define TOOLCHAIN_EXTERNAL_INSTALL_CORE
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
 	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
@@ -478,14 +461,15 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 			echo "Could not find gdbserver in external toolchain" ; \
 			exit 1 ; \
 		fi ; \
-	fi ; \
-	touch $@
+	fi
+endef
 
 # Special installation target used on the Blackfin architecture when
 # FDPIC is not the primary binary format being used, but the user has
 # nonetheless requested the installation of the FDPIC libraries to the
 # target filesystem.
-$(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed: $(STAMP_DIR)/ext-toolchain-checked
+ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y)
+define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FDPIC
 	$(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
 	FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
 	FDPIC_LIBC_A_LOCATION=`readlink -f $$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
@@ -503,8 +487,9 @@ $(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed: $(STAMP_DIR)/ext-toolcha
 	done ; \
 	for libs in $(USR_LIB_EXTERNAL_LIBS); do \
 	        $(call copy_toolchain_lib_root,$${FDPIC_SYSROOT_DIR},$${FDPIC_SUPPORT_LIB_DIR},$${FDPIC_LIB_DIR},$$libs,/usr/lib); \
-	done ; \
-	touch $@
+	done
+endef
+endif
 
 # Special installation target used on the Blackfin architecture when
 # shared FLAT is not the primary format being used, but the user has
@@ -512,36 +497,28 @@ $(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed: $(STAMP_DIR)/ext-toolcha
 # to the target filesystem. The flat libraries are found and linked
 # according to the index in name "libN.so". Index 1 is reserved for
 # the standard C library. Customer libraries can use 4 and above.
-$(STAMP_DIR)/ext-toolchain-bfin-shared-flat-installed: $(STAMP_DIR)/ext-toolchain-checked
+ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y)
+define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FLAT
 	$(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") ; \
 	FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \
 	FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \
 	if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \
 	        $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \
-	fi ; \
-	touch $@
-
-TOOLCHAIN_EXTERNAL_INSTALL = $(STAMP_DIR)/ext-toolchain-installed
-
-ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y)
-TOOLCHAIN_EXTERNAL_INSTALL += $(STAMP_DIR)/ext-toolchain-bfin-fdpic-shared-installed
-endif
-
-ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y)
-TOOLCHAIN_EXTERNAL_INSTALL += $(STAMP_DIR)/ext-toolchain-bfin-shared-flat-installed
+	fi
+endef
 endif
 
 # Build toolchain wrapper for preprocessor, C and C++ compiler and setup
 # symlinks for everything else. Skip gdb symlink when we are building our
 # own gdb to prevent two gdb's in output/host/usr/bin.
-$(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL)
+define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER
 	$(Q)$(call MESSAGE,"Building ext-toolchain wrapper")
 	mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \
 	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
 		base=$${i##*/}; \
 		case "$$base" in \
 		*cc|*cc-*|*++|*++-*|*cpp) \
-			ln -sf $(@F) $$base; \
+			ln -sf ext-toolchain-wrapper $$base; \
 			;; \
 		*gdb|*gdbtui) \
 			if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \
@@ -556,11 +533,18 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL)
 	# We use --hash-style=both to increase the compatibility of
 	# the generated binary with older platforms
 	$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_EXTERNAL_WRAPPER_ARGS) -s -Wl,--hash-style=both \
-		toolchain/toolchain-external/ext-toolchain-wrapper.c -o $@
+		toolchain/toolchain-external/ext-toolchain-wrapper.c \
+		-o $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
+endef
 
-toolchain-external: dependencies $(HOST_DIR)/usr/bin/ext-toolchain-wrapper
+# Even though we're installing things in both the staging, the host
+# and the target directory, we do everything within the
+# install-staging step, arbitrarily.
+define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS
+	$(TOOLCHAIN_EXTERNAL_INSTALL_CORE)
+	$(TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FDPIC)
+	$(TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FLAT)
+	$(TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER)
+endef
 
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
-# download ext toolchain if so configured
-toolchain-external-source: $(addprefix $(DL_DIR)/,$(TOOLCHAIN_EXTERNAL_SOURCE))
-endif
+$(eval $(generic-package))

From 9c5efee81d2d1f6ba2939030c9674ab375c0187d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:04 +0200
Subject: [PATCH 6376/6849] dependencies: remove useless targets

The dependencies-source, dependencies-clean and dependencies-dirclean
targets are not needed, as long as 'dependencies' is not used in the
<pkg>_DEPENDENCIES of a package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/dependencies/dependencies.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index 97f85e66f8..155a90988c 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -33,14 +33,6 @@ dependencies: HOSTCC=$(HOSTCC_NOCCACHE)
 dependencies: HOSTCXX=$(HOSTCXX_NOCCACHE)
 dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
 
-dependencies-source:
-
-dependencies-clean:
-	rm -f $(SSTRIP_TARGET)
-
-dependencies-dirclean:
-	true
-
 ################################################################################
 #
 # Toplevel Makefile options

From 36ef1b4494f669d9c6f8507fb912f83f46a2d63d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:05 +0200
Subject: [PATCH 6377/6849] toolchain-external: conditionalize the installation
 of libraries

The external toolchain code makes the assumption that all C libraries
have a ld*.so, libc.so, libcrypt.so, libdl.so, libgcc_s.so, libm.so,
libnsl.so, libresolv.so, libutil.so, and when thread support is
enabled, libpthread.so, etc.

However, this is not the case with the musl C library, which
integrates all the functionalities in a single libc.so file. In
preparation of the support of the musl library, we make the current
value of LIB_EXTERNAL_LIBS conditional to glibc or uClibc.

The addition of additional libraries through
BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS is kept outside the condition, at
the end.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../toolchain-external/toolchain-external.mk  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 85fc341a6a..aaf49945a9 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -54,8 +54,16 @@
 #  $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest
 #  of Buildroot is handled identical for the 2 toolchain types.
 
-LIB_EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
-LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+LIB_EXTERNAL_LIBS+=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+LIB_EXTERNAL_LIBS+=libpthread.so
+ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
+LIB_EXTERNAL_LIBS+=libthread_db.so
+endif # gdbserver
+endif # ! no threads
+endif
+
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
 LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so
 endif
@@ -64,12 +72,7 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 USR_LIB_EXTERNAL_LIBS+=libstdc++.so
 endif
 
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-LIB_EXTERNAL_LIBS+=libpthread.so
-ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
-LIB_EXTERNAL_LIBS+=libthread_db.so
-endif # gdbserver
-endif # ! no threads
+LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
 
 # Details about sysroot directory selection.
 #

From 186a99b1c6562da724a5500190835c709d152df4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:06 +0200
Subject: [PATCH 6378/6849] toolchain: modify the wildcard logic for shared
 libraries copying

Until now, the copy_toolchain_lib_root function took as argument the
base name of a library (e.g: libm.so), and was assuming that the usual
scheme libm.so.<x> being a symbolic link to the real library was used.

However, with musl based toolchains, the C library is named libc.so
directly, with no symbolic link at all. Therefore, this commit changes
the copy_toolchain_lib_root to move the responsibility of using a
wildcard or not after the library name the caller's responsibility.

So, all the existing LIB_EXTERNAL_LIBS values are modified to have a
.* at the end, so that the behavior is effectively unchanged.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glibc/glibc.mk                             |  8 ++++----
 toolchain/helpers.mk                               |  2 +-
 toolchain/toolchain-external/toolchain-external.mk | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 4d89caff02..0dab4926a3 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -112,12 +112,12 @@ endef
 #
 
 GLIBC_LIBS_LIB = \
-	ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so	   \
-	libnsl.so libpthread.so libresolv.so librt.so libutil.so   \
-	libnss_files.so libnss_dns.so
+	ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.*        \
+	libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.*   \
+	libnss_files.so.* libnss_dns.so.*
 
 ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
-GLIBC_LIBS_LIB += libthread_db.so
+GLIBC_LIBS_LIB += libthread_db.so.*
 endif
 
 define GLIBC_INSTALL_TARGET_CMDS
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 27b67100fc..37f2cf9b44 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -54,7 +54,7 @@ copy_toolchain_lib_root = \
 		$${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR} \
 		$${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \
 		$${SUPPORT_LIB_DIR} ; do \
-		LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}.*" 2>/dev/null` ; \
+		LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}" 2>/dev/null` ; \
 		if test -n "$${LIBSPATH}" ; then \
 			break ; \
 		fi \
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index aaf49945a9..2bfe64a888 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -55,21 +55,21 @@
 #  of Buildroot is handled identical for the 2 toolchain types.
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
-LIB_EXTERNAL_LIBS+=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
+LIB_EXTERNAL_LIBS+=ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-LIB_EXTERNAL_LIBS+=libpthread.so
+LIB_EXTERNAL_LIBS+=libpthread.so.*
 ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
-LIB_EXTERNAL_LIBS+=libthread_db.so
+LIB_EXTERNAL_LIBS+=libthread_db.so.*
 endif # gdbserver
 endif # ! no threads
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
-LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so
+LIB_EXTERNAL_LIBS+=libnss_files.so.* libnss_dns.so.*
 endif
 
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-USR_LIB_EXTERNAL_LIBS+=libstdc++.so
+USR_LIB_EXTERNAL_LIBS+=libstdc++.so.*
 endif
 
 LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))

From 2e0cd951fe864415dbcaa75e236fc4766cf1dd3d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:07 +0200
Subject: [PATCH 6379/6849] toolchain: fix the helpers.mk comment

This commit fixes various typos and mistakes in the comment at the top
of the helpers.mk file:

 * usefull -> useful

 * The optional stripping of libraries no longer exists, so there's no
   reason to mention it.

 * Indicate that the copy_toolchain_lib_root function is also used by
   the glibc package, not only by the external toolchain logic.

 * Separate more clearly the top comment introducing the entire file,
   from the comment introducing the first function.

[Peter: reword top comment, add missing 'by']
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/helpers.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 37f2cf9b44..0144674185 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -1,9 +1,10 @@
-# This Makefile fragment declares helper functions, usefull to handle
-# non- buildroot-built toolchains, eg. purely external toolchains.
-#
-# Copy a toolchain library and its symbolic links from the sysroot
-# directory to the target directory. Also optionaly strips the
-# library.
+# This Makefile fragment declares toolchain related helper functions.
+
+# The copy_toolchain_lib_root function copies a toolchain library and
+# its symbolic links from the sysroot directory to the target
+# directory. Note that this function is used both by the external
+# toolchain logic, and the glibc package, so care must be taken when
+# changing this function.
 #
 # Most toolchains (CodeSourcery ones) have their libraries either in
 # /lib or /usr/lib relative to their ARCH_SYSROOT_DIR, so we search

From 8e05ebca22c63b2bd1c0b09a8ead2a8250c105f5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:08 +0200
Subject: [PATCH 6380/6849] toolchain: do not check largefile, wchar, IPv6 and
 locale for glibc toolchains

The check_glibc function contained checks to verify that the user had
properly enabled the largefile, IPv6, locale and wchar options, to
match how glibc is configured. This was useful when the support for
glibc external toolchains was introduced, but since then, we added the
BR2_TOOLCHAIN_USES_GLIBC symbol that automatically enables largefile,
IPv6, locale and wchar support when a glibc or eglibc external
toolchain is used. Therefore, many of the check_glibc checks are
useless now, so we can remove these.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/helpers.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 0144674185..a4a13c7327 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -205,11 +205,7 @@ check_glibc = \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \
-	$(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
-	$(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
-	$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
 	$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
-	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
 	$(call check_glibc_rpc_feature,$${SYSROOT_DIR})
 
 #

From a1d94aaa3a2191121b28cf19ba8472f2e8f87d01 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:09 +0200
Subject: [PATCH 6381/6849] toolchain-external: add support for musl C library

This commit adds support for external toolchains based on the musl C
library, as available from http://www.musl-libc.org.

Note that the pre-built musl toolchains available from
http://musl.codu.org/ are not working for the moment, since they lack
sysroot support. However, this problem has been reported to the
maintainer, who has already added sysroot support in his scripts at
https://bitbucket.org/GregorR/musl-cross, and therefore the next
version of the pre-built toolchains should work with Buildroot
out-of-the-box. In the mean time, the musl-cross script must be used
to build the toolchain.

[Peter: reword comment]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/Config.in                            |  9 +++++++++
 toolchain/helpers.mk                           | 11 +++++++++++
 toolchain/toolchain-external/Config.in         | 12 ++++++++++++
 .../toolchain-external/toolchain-external.mk   | 18 +++++++++++++++++-
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 0f9a7dd9a4..3980d790a4 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -15,6 +15,15 @@ config BR2_TOOLCHAIN_USES_GLIBC
 config BR2_TOOLCHAIN_USES_UCLIBC
 	bool
 
+config BR2_TOOLCHAIN_USES_MUSL
+	bool
+	select BR2_LARGEFILE
+	select BR2_INET_IPV6
+	select BR2_USE_WCHAR
+	select BR2_ENABLE_LOCALE
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+
 choice
 	prompt "Toolchain type"
 	help
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index a4a13c7327..b6fe04c417 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -208,6 +208,17 @@ check_glibc = \
 	$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
 	$(call check_glibc_rpc_feature,$${SYSROOT_DIR})
 
+#
+# Check that the selected C library really is musl
+#
+# $1: sysroot directory
+check_musl = \
+	SYSROOT_DIR="$(strip $1)"; \
+	if test ! -f $${SYSROOT_DIR}/lib/libc.so -o -e $${SYSROOT_DIR}/lib/libm.so ; then \
+		echo "Incorrect selection of the C library" ; \
+		exit -1; \
+	fi
+
 #
 # Check the conformity of Buildroot configuration with regard to the
 # uClibc configuration of the external toolchain, for a particular
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c53577ef60..89c799e3d5 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -860,6 +860,10 @@ config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	bool
 	select BR2_TOOLCHAIN_USES_UCLIBC
 
+config BR2_TOOLCHAIN_EXTERNAL_MUSL
+	bool
+	select BR2_TOOLCHAIN_USES_MUSL
+
 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 choice
@@ -882,6 +886,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
 	  eglibc configured to exclude key features may cause build failures to
 	  some packages.
 
+config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL
+	bool "musl"
+	select BR2_TOOLCHAIN_EXTERNAL_MUSL
+	help
+	  Select this option if your external toolchain uses the
+	  'musl' C library, available from http://www.musl-libc.org/.
+
 endchoice
 
 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
@@ -952,6 +963,7 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
 	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	help
 	  Select this option if your external toolchain supports
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 2bfe64a888..b2266b6ac0 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -68,6 +68,10 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
 LIB_EXTERNAL_LIBS+=libnss_files.so.* libnss_dns.so.*
 endif
 
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
+LIB_EXTERNAL_LIBS += libc.so libgcc_s.so.*
+endif
+
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 USR_LIB_EXTERNAL_LIBS+=libstdc++.so.*
 endif
@@ -353,7 +357,7 @@ endif
 define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
@@ -368,11 +372,23 @@ define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	fi ; \
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \
 		$(call check_uclibc,$${SYSROOT_DIR}) ; \
+	elif test "$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \
+		$(call check_musl,$${SYSROOT_DIR}) ; \
 	else \
 		$(call check_glibc,$${SYSROOT_DIR}) ; \
 	fi
 endef
 
+# With the musl C library, the libc.so library directly plays the role
+# of the dynamic library loader. We just need to create a symbolic
+# link to libc.so with the appropriate name.
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
+define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
+	ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(ARCH).so.1
+endef
+TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
+endif
+
 # Integration of the toolchain into Buildroot: find the main sysroot
 # and the variant-specific sysroot, then copy the needed libraries to
 # the $(TARGET_DIR) and copy the whole sysroot (libraries and headers)

From 692a585d846c56d4cbf94f4a004a7e7f9f8768c7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:10 +0200
Subject: [PATCH 6382/6849] toolchain-external: improve help text of some
 options

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/Config.in | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 89c799e3d5..67f4fc79ad 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -876,15 +876,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 	# For the time being, we assume that all custom external
 	# toolchains have shadow password support.
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	help
+	  Select this option if your external toolchain uses the
+	  uClibc C library (available from http://www.uclibc.org/).
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
 	bool "glibc/eglibc"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	help
-	  Note: eglibc is a variant of glibc that (among other things) can be
-	  configured to exclude some of its features. Using a toolchain with
-	  eglibc configured to exclude key features may cause build failures to
-	  some packages.
+	  Select this option if your external toolchain uses the GNU C
+	  library (available from https://www.gnu.org/software/libc/)
+	  or its variant the eglibc library (http://www.eglibc.org/).
+
+	  Note: eglibc is a variant of glibc that (among other things)
+	  can be configured to exclude some of its features. Using a
+	  toolchain with eglibc configured to exclude key features may
+	  cause build failures to some packages.
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL
 	bool "musl"

From a4ffd7ca822bd02c1c62eb78c6569d1936d2d11e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:11 +0200
Subject: [PATCH 6383/6849] busybox: add patches to fix build with the musl C
 library

Those patches have been submitted upstream.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...bbb-use-poll.h-instead-of-sys-poll.h.patch | 32 +++++++++++++++++
 ...-include-linux-if_slip.h-instead-of-.patch | 33 +++++++++++++++++
 ...route-use-linux-if_packet.h-instead-.patch | 36 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch
 create mode 100644 package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch
 create mode 100644 package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch

diff --git a/package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch b/package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch
new file mode 100644
index 0000000000..089d85817e
--- /dev/null
+++ b/package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch
@@ -0,0 +1,32 @@
+From 676452a92d1fc4f85e8d89930d7729197c031026 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 5 Oct 2013 15:51:56 +0200
+Subject: [PATCH 1/3] libbb: use <poll.h> instead of <sys/poll.h>
+
+As the pol() manpage recommends, include the <poll.h> header instead
+of <sys/poll.h>. This allows to get rid of gazillions of warnings when
+building Busybox against the musl C library, which prints a warning
+when the internal header <sys/poll.h> is included directly instead of
+the <poll.h> header.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ include/libbb.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/libbb.h b/include/libbb.h
+index e520060..f03f454 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -37,7 +37,7 @@
+ #include <libgen.h> /* dirname,basename */
+ #undef basename
+ #define basename dont_use_basename
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/socket.h>
+-- 
+1.8.1.2
+
diff --git a/package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch b/package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch
new file mode 100644
index 0000000000..ed35719906
--- /dev/null
+++ b/package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch
@@ -0,0 +1,33 @@
+From 5eae213031a3ef88fe8d9d0a387f44264ea635cc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 5 Oct 2013 15:53:16 +0200
+Subject: [PATCH 2/3] network/ifconfig: include <linux/if_slip.h> instead of
+ <net/if_slip.h>
+
+The musl C library doesn't provide the <net/if_slip.h> since userspace
+applications can just as well use the <linux/if_slip.h> kernel header.
+
+This commit fixes the build of the ifconfig applet with the musl C
+library.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ networking/ifconfig.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/networking/ifconfig.c b/networking/ifconfig.c
+index 782374b..c90ed6b 100644
+--- a/networking/ifconfig.c
++++ b/networking/ifconfig.c
+@@ -56,7 +56,7 @@
+ #endif
+ 
+ #if ENABLE_FEATURE_IFCONFIG_SLIP
+-# include <net/if_slip.h>
++# include <linux/if_slip.h>
+ #endif
+ 
+ /* I don't know if this is needed for busybox or not.  Anyone? */
+-- 
+1.8.1.2
+
diff --git a/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch b/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch
new file mode 100644
index 0000000000..7b7465653b
--- /dev/null
+++ b/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch
@@ -0,0 +1,36 @@
+From d4fec31889ad660a58dab633c511221feb66e817 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 5 Oct 2013 15:55:06 +0200
+Subject: [PATCH 3/3] networking/libiproute: use <linux/if_packet.h> instead of
+ <net/if_packet.h>
+
+The musl C library doesn't provide the <net/if_packet.h> since the
+corresponding kernel headers <linux/if_packet.h> already provides the
+necessary definitions. Replacing <net/if_packet.h> by
+<linux/if_packet.h> also removes the need to include
+<netpacket/packet.h>
+
+This commit fixes the build of iplink with the musl C library.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ networking/libiproute/iplink.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
+index bad2017..32ccb1c 100644
+--- a/networking/libiproute/iplink.c
++++ b/networking/libiproute/iplink.c
+@@ -5,8 +5,7 @@
+  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+  */
+ #include <net/if.h>
+-#include <net/if_packet.h>
+-#include <netpacket/packet.h>
++#include <linux/if_packet.h>
+ #include <netinet/if_ether.h>
+ 
+ #include "ip_common.h"  /* #include "libbb.h" is inside */
+-- 
+1.8.1.2
+

From bb58fafbd9fba9fe0da9c476bca734b5fa13f5b1 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:12 +0200
Subject: [PATCH 6384/6849] toolchain-external: update Linaro ARM toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/Config.in        | 20 +++++++++----------
 .../toolchain-external/toolchain-external.mk  |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 67f4fc79ad..ecfe17c308 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,8 +3,8 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
-	bool "Linaro 2013.08"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_09
+	bool "Linaro 2013.09"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -15,7 +15,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.08 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GCC 2013.09 (based on gcc 4.8), Linaro GDB 2013.05 (based on
 	  GDB 7.6), eglibc 2.17, Binutils 2013.06 (based on 2.23). It
 	  generates code that runs on all Cortex-A profile devices,
 	  but tuned for the Cortex-A9. The code generated is Thumb 2,
@@ -24,8 +24,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
-	bool "Linaro 2013.07"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
+	bool "Linaro 2013.08"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -36,7 +36,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.07 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GCC 2013.08 (based on gcc 4.8), Linaro GDB 2013.05 (based on
 	  GDB 7.6), eglibc 2.17, Binutils 2013.06 (based on 2.23). It
 	  generates code that runs on all Cortex-A profile devices,
 	  but tuned for the Cortex-A9. The code generated is Thumb 2,
@@ -45,8 +45,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
 
 	  To use this toolchain, you must disable soft float usage.
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
-	bool "Linaro 2013.06"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
+	bool "Linaro 2013.07"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -57,7 +57,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2013.06 (based on gcc 4.8), Linaro GDB 2013.05 (based on
+	  GCC 2013.07 (based on gcc 4.8), Linaro GDB 2013.05 (based on
 	  GDB 7.6), eglibc 2.17, Binutils 2013.06 (based on 2.23). It
 	  generates code that runs on all Cortex-A profile devices,
 	  but tuned for the Cortex-A9. The code generated is Thumb 2,
@@ -816,9 +816,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string
+	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_09
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
 	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
-	default "arm-linux-gnueabihf"	 if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index b2266b6ac0..e38ee4878a 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -239,15 +239,15 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS
 	mv $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/arago-2011.09/armv5te/* $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/
 	rm -rf $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/arago-2011.09/
 endef
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06),y)
-TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.06_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.07/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.07-1_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.08/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_09),y)
+TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.09/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.09_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From d75e573e93828b9e53d7dac24769835040fd2a2d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:13 +0200
Subject: [PATCH 6385/6849] toolchain-external: update Linaro AArch64 toolchain

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/Config.in             | 14 +++++++-------
 toolchain/toolchain-external/toolchain-external.mk |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ecfe17c308..0d42041e1b 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -730,8 +730,8 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	  Toolchain for the Microblaze architecture, from
 	  http://wiki.xilinx.com/mb-gnu-tools
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
-	bool "Linaro AArch64 13.08"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_09
+	bool "Linaro AArch64 13.09"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -742,8 +742,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
-	bool "Linaro AArch64 13.07"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
+	bool "Linaro AArch64 13.08"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -754,8 +754,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
 	  Toolchain for the AArch64 architecture, from
 	  http://www.linaro.org/engineering/armv8/
 
-config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
-	bool "Linaro AArch64 13.04"
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
+	bool "Linaro AArch64 13.07"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -824,9 +824,9 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
+	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_09
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
 	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
-	default "aarch64-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	default "microblazeel-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	default "microblaze-unknown-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index e38ee4878a..73a761b70e 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -310,15 +310,15 @@ TOOLCHAIN_EXTERNAL_SOURCE = lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sources.buildroot.net/
 TOOLCHAIN_EXTERNAL_SOURCE = microblaze-unknown-linux-gnu.tgz
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_06),y)
-TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/13.06/components/toolchain/binaries/
-TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.06_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.07/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.07-1_linux.tar.xz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.08/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.08_linux.tar.xz
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_09),y)
+TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.09/components/toolchain/binaries/
+TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.8-2013.09_linux.tar.xz
 else
 # Custom toolchain
 TOOLCHAIN_EXTERNAL_SITE = $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))

From ccc82214f654f7b9925ec172b4db2a13195b5837 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:14 +0200
Subject: [PATCH 6386/6849] toolchain-external: improve target library copy
 logic

The copy_toolchain_lib_root function is responsible for copying a
given library (and its symbolic link) to the target filesystem. To do
so, it looks for the library in various locations, and then iterates
over the symbolic link all the way to the library, copying them as
needed to the target filesystem.

However, the latest Linaro toolchains bring an interesting use case:
the lib/ directory in the toolchain is organized as follows:

 - ld-linux.so.3 -> arm-linux-gnueabi/ld-2.17...so
 - ld-linux-armhf.so.3 -> arm-linux-gnueabihf/ld-2.17...so
 - arm-linux-gnueabi/
   - all ARMv4T soft float libraries
 - arm-linux-gnueabihf/
   - all ARMv7 hard float libraries

In order to match what we do with all other toolchains, we want all
those libraries and symbolic links to be copied directly under
$(TARGET_DIR)/lib. This commit does that by adjusting the copy logic.

This is part of the fix for bug #6452 (eglibc from Linaro 2013.07 not
copied to target correctly).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/helpers.mk | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index b6fe04c417..95120cd97b 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -60,21 +60,24 @@ copy_toolchain_lib_root = \
 			break ; \
 		fi \
 	done ; \
+	mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
 	for LIBPATH in $${LIBSPATH} ; do \
-		LIBNAME=`basename $${LIBPATH}`; \
-		LIBDIR=`dirname $${LIBPATH}` ; \
-		while test \! -z "$${LIBNAME}" ; do \
-			LIBPATH=$${LIBDIR}/$${LIBNAME} ; \
+		while true ; do \
+			LIBNAME=`basename $${LIBPATH}`; \
+			LIBDIR=`dirname $${LIBPATH}` ; \
+			LINKTARGET=`readlink $${LIBPATH}` ; \
 			rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
-			mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
 			if test -h $${LIBPATH} ; then \
-				cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/; \
+				ln -sf `basename $${LINKTARGET}` $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME} ; \
 			elif test -f $${LIBPATH}; then \
 				$(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
 			else \
 				exit -1; \
 			fi; \
-			LIBNAME="`readlink $${LIBPATH}`"; \
+			if test -z "$${LINKTARGET}" ; then \
+				break ; \
+			fi ; \
+			LIBPATH="`readlink -f $${LIBPATH}`"; \
 		done; \
 	done; \
  \

From 11ec38b6950cf3337b52fb97f27c2fd7c776c5c2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 8 Oct 2013 20:17:15 +0200
Subject: [PATCH 6387/6849] toolchain-external: fix Linaro ARM toolchain
 support

This commit fixes bug #6452 (eglibc from Linaro 2013.07 not copied to
target correctly) by:

 * Copying only the relevant library loader to the target on ARMhf
   (i.e ld-linux-armhf.so and not ld.so*). This is needed since Linaro
   toolchains provide two library loaders, one ARMv7 hf, and one ARMv4
   soft-float.

 * Making sure a $(TARGET_DIR)/lib/arm-linux-gnueabihf/ symbolic link
   to $(TARGET_DIR)/lib/ exists, since the dynamic loader of Linaro
   toolchains expects libraries to be found in
   $(TARGET_DIR)/lib/arm-linux-gnueabihf/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../toolchain-external/toolchain-external.mk    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 73a761b70e..b5b1ce78a2 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -55,7 +55,12 @@
 #  of Buildroot is handled identical for the 2 toolchain types.
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
-LIB_EXTERNAL_LIBS+=ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
+LIB_EXTERNAL_LIBS+=libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
+ifeq ($(BR2_ARM_EABIHF),y)
+LIB_EXTERNAL_LIBS+=ld-linux-armhf.so.*
+else
+LIB_EXTERNAL_LIBS+=ld*.so.*
+endif
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 LIB_EXTERNAL_LIBS+=libpthread.so.*
 ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
@@ -216,6 +221,13 @@ TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
 endif
 
+# The Linaro ARMhf toolchain expects the libraries in
+# /lib/arm-linux-gnueabihf, but Buildroot copies them to /lib, so we
+# need to create a symbolic link.
+define TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK
+	ln -sf . $(TARGET_DIR)/lib/arm-linux-gnueabihf
+endef
+
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/
 TOOLCHAIN_EXTERNAL_SOURCE = arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
@@ -242,12 +254,15 @@ endef
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.07/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.07-1_linux.tar.xz
+TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.08/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux.tar.xz
+TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_09),y)
 TOOLCHAIN_EXTERNAL_SITE = http://releases.linaro.org/13.09/components/toolchain/binaries/
 TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.8-2013.09_linux.tar.xz
+TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y)
 TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = mips-2012.03-63-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2

From 32df094fdc90f6e5b1e95c8e2dcbd27181cd3788 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 9 Oct 2013 16:34:33 +0200
Subject: [PATCH 6388/6849] toolchain-buildroot: fix s/Trigerring/Triggering/
 typo

Reported-by: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-buildroot/toolchain-buildroot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk
index ced430e59e..f1f07a9c93 100644
--- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk
@@ -8,7 +8,7 @@ TOOLCHAIN_BUILDROOT_SOURCE =
 
 BUILDROOT_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))
 
-# Trigerring the build of the host-gcc-final will automatically do the
+# Triggering the build of the host-gcc-final will automatically do the
 # build of binutils, uClibc, kernel headers and all the intermediate
 # gcc steps.
 

From dd2e62f7dd81845f4e78afb60fff13404dc15150 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 09:22:35 -0300
Subject: [PATCH 6389/6849] linphone: add license

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linphone/linphone.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index 6fa148750c..a4fc95c4c0 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -12,6 +12,8 @@ LINPHONE_CONF_OPT = \
 	--disable-strict
 
 LINPHONE_DEPENDENCIES = host-pkgconf ortp mediastreamer libeXosip2 speex
+LINPHONE_LICENSE = GPLv2+
+LINPHONE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
 LINPHONE_CONF_OPT += --enable-gtk_ui

From 4db12ce1f616c3bf2d2b14172cc58997e5e38465 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 09:22:36 -0300
Subject: [PATCH 6390/6849] linphone: fix build failure

The configure script is out of sync causing deplibs linking issues so
recreate it. Fixes:
http://autobuild.buildroot.net/results/006/00673f04d0ce6cb0c5828e68f236a4eb8d7920db/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linphone/linphone.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index a4fc95c4c0..e7e3de6620 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -10,7 +10,8 @@ LINPHONE_CONF_OPT = \
 	--enable-external-ortp \
 	--enable-external-mediastreamer \
 	--disable-strict
-
+# configure is out of sync causing deplibs linking issues
+LINPHONE_AUTORECONF = YES
 LINPHONE_DEPENDENCIES = host-pkgconf ortp mediastreamer libeXosip2 speex
 LINPHONE_LICENSE = GPLv2+
 LINPHONE_LICENSE_FILES = COPYING

From f990517a02220456910282c37af9f722369cd4d1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 09:22:37 -0300
Subject: [PATCH 6391/6849] mediastreamer: requires toolchain with ipv6 support

Fixes:
http://autobuild.buildroot.net/results/b16/b164b87fefac67074d45a6413386f53a8ee47843/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linphone/Config.in      | 6 ++++--
 package/mediastreamer/Config.in | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index bd5141261b..1bced0ee34 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LINPHONE
 	depends on BR2_INSTALL_LIBSTDCPP # mediastreamer
 	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
 	depends on BR2_USE_MMU # libeXosip2
+	depends on BR2_INET_IPV6 # mediastreamer
 	help
 	  Linphone is an internet phone or Voice Over IP phone (VoIP).
 
@@ -25,5 +26,6 @@ config BR2_PACKAGE_LINPHONE
 
 	  http://www.linphone.org/
 
-comment "linphone requires a toolchain with threads and C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "linphone requires a toolchain with threads, C++ and IPv6 support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_INET_IPV6
diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
index 477d4fab65..9b20307e47 100644
--- a/package/mediastreamer/Config.in
+++ b/package/mediastreamer/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MEDIASTREAMER
 	select BR2_PACKAGE_ORTP
 	depends on BR2_INSTALL_LIBSTDCPP # until fixed
 	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
+	depends on BR2_INET_IPV6
 	help
 	  Mediastreamer is a powerful and lightweighted streaming
 	  engine specialized for voice/video telephony applications.
@@ -13,5 +14,6 @@ config BR2_PACKAGE_MEDIASTREAMER
 
 	  http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
 
-comment "mediastreamer requires a toolchain with threads and C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "mediastreamer requires a toolchain with threads, C++ and IPv6 support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_INET_IPV6

From c9907e48044f7e8b0923c2ade68b88e3e36aa00d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 9 Oct 2013 13:58:29 +0200
Subject: [PATCH 6392/6849] cifs-utils: correct license GPLv3 -> GPLv3+

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/cifs-utils/cifs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index ae80531f55..f715e360a4 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -7,7 +7,7 @@
 CIFS_UTILS_VERSION = 6.1
 CIFS_UTILS_SOURCE  = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE    = http://ftp.samba.org/pub/linux-cifs/cifs-utils
-CIFS_UTILS_LICENSE = GPLv3
+CIFS_UTILS_LICENSE = GPLv3+
 CIFS_UTILS_LICENSE_FILES = COPYING
 
 define CIFS_UTILS_NO_WERROR

From 3cd02296be5c3a1f5247fc634d98a1784313bd9f Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 9 Oct 2013 13:58:30 +0200
Subject: [PATCH 6393/6849] libnetfilter_cthelper: correct license GPLv2 ->
 GPLv2+

The main file of this package is src/libnetfilter_cthelper.c, which states
GPLv2+.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnetfilter_cthelper/libnetfilter-cthelper.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
index f3e892bc44..2cac8a2bc8 100644
--- a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
+++ b/package/libnetfilter_cthelper/libnetfilter-cthelper.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthe
 LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES
 LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl
 LIBNETFILTER_CTHELPER_AUTORECONF = YES
-LIBNETFILTER_CTHELPER_LICENSE = GPLv2
+LIBNETFILTER_CTHELPER_LICENSE = GPLv2+
 LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From c2816432be0f9d83fd59b6c84b38d6e7dfc2ac64 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 9 Oct 2013 13:58:31 +0200
Subject: [PATCH 6394/6849] libnetfilter_cttimeout: correct license GPLv2 ->
 GPLv2+

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
index c1f10162f4..cf55255eb8 100644
--- a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_ctt
 LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
 LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
 LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES
-LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2
+LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2+
 LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 39e3455848cb79872bd5894fe335c9c94f523ef5 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 9 Oct 2013 13:58:32 +0200
Subject: [PATCH 6395/6849] libnetfilter_queue: correct license GPLv2 -> GPLv2+

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnetfilter_queue/libnetfilter-queue.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_queue/libnetfilter-queue.mk b/package/libnetfilter_queue/libnetfilter-queue.mk
index 66b102fb80..59a4458dcd 100644
--- a/package/libnetfilter_queue/libnetfilter-queue.mk
+++ b/package/libnetfilter_queue/libnetfilter-queue.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/f
 LIBNETFILTER_QUEUE_INSTALL_STAGING = YES
 LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
 LIBNETFILTER_QUEUE_AUTORECONF = YES
-LIBNETFILTER_QUEUE_LICENSE = GPLv2
+LIBNETFILTER_QUEUE_LICENSE = GPLv2+
 LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 49abb6ede5a5c3209330f44bec39e99f6e889144 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 9 Oct 2013 13:58:33 +0200
Subject: [PATCH 6396/6849] libnetfilter_log: correct license GPLv2 -> GPLv2+

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnetfilter_log/libnetfilter-log.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnetfilter_log/libnetfilter-log.mk b/package/libnetfilter_log/libnetfilter-log.mk
index 8a2c5130a1..1c642d2b7e 100644
--- a/package/libnetfilter_log/libnetfilter-log.mk
+++ b/package/libnetfilter_log/libnetfilter-log.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
 LIBNETFILTER_LOG_INSTALL_STAGING = YES
 LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink
 LIBNETFILTER_LOG_AUTORECONF = YES
-LIBNETFILTER_LOG_LICENSE = GPLv2
+LIBNETFILTER_LOG_LICENSE = GPLv2+
 LIBNETFILTER_LOG_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From ead38a34f3889312b5eefe30e683d001747916d1 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 9 Oct 2013 10:02:54 +0800
Subject: [PATCH 6397/6849] ccid: bump to version 1.4.12

Bump version and also add license information.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ccid/ccid.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index a246ddd291..c25b4331c4 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-CCID_VERSION = 1.4.8
+CCID_VERSION = 1.4.12
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
-CCID_SITE = http://alioth.debian.org/frs/download.php/file/3768
+CCID_SITE = http://alioth.debian.org/frs/download.php/file/3937
+CCID_LICENSE = LGPLv2.1+
+CCID_LICENSE_FILES = COPYING
 CCID_INSTALL_STAGING = YES
 CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
 

From 0286ed56c1d07cab85188fea68f9022925d7c4b2 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 9 Oct 2013 10:18:27 +0800
Subject: [PATCH 6398/6849] nano: bump to version 2.3.2

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nano/nano.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index b1a8f444e6..aba4b4f152 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NANO_VERSION = 2.3.1
+NANO_VERSION = 2.3.2
 NANO_SITE = http://www.nano-editor.org/dist/v2.3
 NANO_LICENSE = GPLv3+
 NANO_LICENSE_FILES = COPYING

From 85dab66dbeb9eaa535f6d5ecbc70889582a43185 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Wed, 9 Oct 2013 09:02:04 +0200
Subject: [PATCH 6399/6849] poppler: bump to version 0.24.2

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/poppler/poppler.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 81bdbbb639..56a4d3ffb1 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-POPPLER_VERSION = 0.22.3
+POPPLER_VERSION = 0.24.2
+POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
 POPPLER_SITE = http://poppler.freedesktop.org
 POPPLER_DEPENDENCIES = fontconfig
 POPPLER_LICENSE = GPLv2+

From e8d807e3a6a65b1a26fd2110b4de826ec1a3f2a3 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 9 Oct 2013 09:10:51 +0200
Subject: [PATCH 6400/6849] i2c-tools: add license information

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/i2c-tools/i2c-tools.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 1589d04d63..c6a967d987 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -7,6 +7,8 @@
 I2C_TOOLS_VERSION = 3.1.0
 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.bz2
 I2C_TOOLS_SITE = http://dl.lm-sensors.org/i2c-tools/releases
+I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus)
+I2C_TOOLS_LICENSE_FILES = COPYING
 
 define I2C_TOOLS_BUILD_CMDS
  $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

From badc3196a206282966e2104c29c2f4f698375971 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 9 Oct 2013 16:47:05 +0800
Subject: [PATCH 6401/6849] redis: bump to version 2.6.16

The Redis project home page moved to redis.io, thus also update the download
url accordingly.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/redis/redis.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/redis/redis.mk b/package/redis/redis.mk
index 8b4e900f07..6974a3553b 100644
--- a/package/redis/redis.mk
+++ b/package/redis/redis.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-REDIS_VERSION = 2.6.11
-REDIS_SITE = http://redis.googlecode.com/files
+REDIS_VERSION = 2.6.16
+REDIS_SITE = http://download.redis.io/releases
 REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components)
 REDIS_LICENSE_FILES = COPYING
 

From 72c71c86903d411f2bd5a3eef44cd427a6298426 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 16:49:33 -0300
Subject: [PATCH 6402/6849] gnupg: security bump to version 1.4.15

Fixes CVE-2013-4402.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gnupg/gnupg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index 38604b5907..28f1f4374e 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUPG_VERSION = 1.4.14
+GNUPG_VERSION = 1.4.15
 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
 GNUPG_LICENSE = GPLv3+

From 94161e9b8b6053dd672dae15b8a47b5620cdfb10 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 16:49:34 -0300
Subject: [PATCH 6403/6849] libgpg-error: bump to version 1.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libgpg-error/libgpg-error.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 04874a7dc1..9f5f6c21a1 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.10
+LIBGPG_ERROR_VERSION = 1.12
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 LIBGPG_ERROR_LICENSE = LGPLv2.1+
 LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB

From e54d46be2394cdc90b105e24c893f843226ba861 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 16:49:35 -0300
Subject: [PATCH 6404/6849] libassuan: needs mmu

Also opkg needs mmu even without gpg verification so mark as well.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libassuan/Config.in | 1 +
 package/libgpgme/Config.in  | 1 +
 package/opkg/Config.in      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/package/libassuan/Config.in b/package/libassuan/Config.in
index e97ebdcdde..46101451cf 100644
--- a/package/libassuan/Config.in
+++ b/package/libassuan/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBASSUAN
 	bool "libassuan"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
 	  Libassuan is a small library implementing the so-called
diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in
index f97a3fe892..a303bfae8f 100644
--- a/package/libgpgme/Config.in
+++ b/package/libgpgme/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBGPGME
 	bool "libgpgme"
+	depends on BR2_USE_MMU # libassuan
 	#gnupg is not needed to build, but at runtime.
 	select BR2_PACKAGE_GNUPG
 	select BR2_PACKAGE_LIBGPG_ERROR
diff --git a/package/opkg/Config.in b/package/opkg/Config.in
index 5906210e86..afc13f2c18 100644
--- a/package/opkg/Config.in
+++ b/package/opkg/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPKG
 	bool "opkg"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Opkg is a lightweight package management system, based on ipkg. It is
 	  written in C and resembles apt/dpkg in operation. It is intended for

From ee35a27e2207f1f82cf866172718a418088646f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 16:49:36 -0300
Subject: [PATCH 6405/6849] netatalk: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netatalk/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
index 5c676e99ba..9bf0515cbd 100644
--- a/package/netatalk/Config.in
+++ b/package/netatalk/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NETATALK
 	bool "netatalk"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_BERKELEYDB
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBEVENT

From 43fed5e46deb72a06234537a83d7fc5d0d85d61f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 16:49:37 -0300
Subject: [PATCH 6406/6849] vpnc: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vpnc/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in
index 9abc0c5f50..bc27331c6f 100644
--- a/package/vpnc/Config.in
+++ b/package/vpnc/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_VPNC
 	bool "vpnc"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help

From d52a3c0b0cc419ad3a79b8be2f1c91efd45b2ca4 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 8 Oct 2013 12:06:56 +0200
Subject: [PATCH 6407/6849] libnfnetlink: add license information

[Peter: license is GPLv2]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnfnetlink/libnfnetlink.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
index de5a9d8a66..6f69a81a98 100644
--- a/package/libnfnetlink/libnfnetlink.mk
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -9,5 +9,7 @@ LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
 LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
 LIBNFNETLINK_AUTORECONF = YES
 LIBNFNETLINK_INSTALL_STAGING = YES
+LIBNFNETLINK_LICENSE = GPLv2
+LIBNFNETLINK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 5d1c9f8c8068e885a614af3ad9966a7ba07f9d83 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 8 Oct 2013 12:06:57 +0200
Subject: [PATCH 6408/6849] ncftp: add license information

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ncftp/ncftp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index a51605e6dc..56d5d474e6 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -8,6 +8,8 @@ NCFTP_VERSION = 3.2.5
 NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.bz2
 NCFTP_SITE = ftp://ftp.ncftp.com/ncftp
 NCFTP_TARGET_BINS = ncftp
+NCFTP_LICENSE = Clarified Artistic License
+NCFTP_LICENSE_FILES = doc/LICENSE.txt
 
 ifeq ($(BR2_PACKAGE_NCFTP_GET),y)
 	NCFTP_TARGET_BINS += ncftpget

From 846bc0cf3fd1fe921960dc1dd851ea5c79207b8b Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 8 Oct 2013 12:06:58 +0200
Subject: [PATCH 6409/6849] ebtables: correct license GPLv2 -> GPLv2+

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ebtables/ebtables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index ddc1f45aab..116012c72c 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -7,7 +7,7 @@
 EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION))
-EBTABLES_LICENSE = GPLv2
+EBTABLES_LICENSE = GPLv2+
 EBTABLES_LICENSE_FILES = COPYING
 EBTABLES_STATIC = $(if $(BR2_PREFER_STATIC_LIB),static)
 

From 3bccd260fa96d2848a6161166ddc95fe7b5344ed Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:42 -0300
Subject: [PATCH 6410/6849] udpcast: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/udpcast/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index cb817a9140..cae27bd287 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_UDPCAST
 	bool "udpcast"
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  A multicast protocol implementation which happens to
 	  be very handy for imaging drives over the network.

From a5e44382cd59d48d3fe952bc62525b44de6b999e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:43 -0300
Subject: [PATCH 6411/6849] civetweb: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/civetweb/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
index f7a31f5c62..55c138ad29 100644
--- a/package/civetweb/Config.in
+++ b/package/civetweb/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_CIVETWEB
 	bool "civetweb"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Full featured embedded web server with Lua support.
 

From 7d6a640452fc88cefba2453fb2172ce589cf83de Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:44 -0300
Subject: [PATCH 6412/6849] kismet: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/kismet/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index 8de29beea4..a0e7c6792d 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_KISMET
 	bool "kismet"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_NCURSES_TARGET_PANEL
 	select BR2_PACKAGE_LIBPCAP

From 88a3f722b1ae17434c283144ad67caeb6e46af72 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:45 -0300
Subject: [PATCH 6413/6849] lighttpd: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lighttpd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index cb759ff465..b84e6ea6a8 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIGHTTPD
 	bool "lighttpd"
+	depends on BR2_USE_MMU # fork()
 	help
 	  lighttpd a secure, fast, compliant and very flexible web-server
 	  which has been optimized for high-performance environments. It

From 6ea7f661c3e38b71d3e4ed161e9e11e396070e73 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:46 -0300
Subject: [PATCH 6414/6849] mongoose: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mongoose/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/mongoose/Config.in b/package/mongoose/Config.in
index 7199712018..16684766fd 100644
--- a/package/mongoose/Config.in
+++ b/package/mongoose/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MONGOOSE
 	bool "mongoose"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Mongoose is a small and easy to use web server
 

From 5b8a4a48e03e16d515c5f3349b219c29857fd0f3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:47 -0300
Subject: [PATCH 6415/6849] mrouted: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mrouted/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/mrouted/Config.in b/package/mrouted/Config.in
index 1503cc6ab9..bf4614d4af 100644
--- a/package/mrouted/Config.in
+++ b/package/mrouted/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MROUTED
 	bool "mrouted"
+	depends on BR2_USE_MMU # fork()
 	help
 	  An implementation of the DVMRP multicast routing protocol.
 

From 0b4308639807b98791780adb383cf20f6dad1d0b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 17:25:48 -0300
Subject: [PATCH 6416/6849] ngircd: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ngircd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in
index e8fc3d0569..f1d8bea904 100644
--- a/package/ngircd/Config.in
+++ b/package/ngircd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NGIRCD
 	bool "ngircd"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_ZLIB
 	help
 	  Next Generation IRC server deamon.

From 9c1d36cadb3cb1e0f964985c3a8fa6ee6a3b307d Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Fri, 4 Oct 2013 22:18:22 +0200
Subject: [PATCH 6417/6849] openpowerlink: new package

[Peter: fixup patch 2 corruption]
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in                             |   1 +
 package/openpowerlink/Config.in               | 112 ++++++++++++++++++
 .../openpowerlink-0001-fix-demo-mn-qt.patch   |  22 ++++
 ...ix-compilation-issue-for-kernels-3.5.patch |  78 ++++++++++++
 ...Linux-Powerlink-user-lib-add-INSTALL.patch |  28 +++++
 package/openpowerlink/openpowerlink.mk        |  95 +++++++++++++++
 6 files changed, 336 insertions(+)
 create mode 100644 package/openpowerlink/Config.in
 create mode 100644 package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch
 create mode 100644 package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch
 create mode 100644 package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch
 create mode 100644 package/openpowerlink/openpowerlink.mk

diff --git a/package/Config.in b/package/Config.in
index 424e40d595..41d828ac37 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -311,6 +311,7 @@ source "package/ola/Config.in"
 source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
+source "package/openpowerlink/Config.in"
 source "package/owl-linux/Config.in"
 source "package/parted/Config.in"
 source "package/pciutils/Config.in"
diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in
new file mode 100644
index 0000000000..296b0842cc
--- /dev/null
+++ b/package/openpowerlink/Config.in
@@ -0,0 +1,112 @@
+comment "openpowerlink requires a toolchain with C++ and threads support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_OPENPOWERLINK
+	bool "openpowerlink"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  openPOWERLINK is an Open Source Industrial Ethernet
+	  stack implementing the POWERLINK protocol for Managing Node
+	  (MN, POWERLINK Master) and Controlled Node (CN, POWERLINK Slave).
+
+	  It is provided by
+	  SYSTEC electronic (http://www.systec-electronic.com),
+	  B&R (http://www.br-automation.com) and
+	  Kalycito (http://www.kalycito.com).
+
+	  https://sourceforge.net/projects/openpowerlink/
+
+if BR2_PACKAGE_OPENPOWERLINK
+
+choice
+	prompt "stack implementation"
+
+config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP
+	bool "userspace stack"
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  The Linux userspace implementation of the openPOWERLINK stack provides
+	  all functions for a software based POWERLINK solution running as Linux
+	  userspace application. The stack uses the libpcap library for accessing
+	  the network interface and is therefore totally independant of the used
+	  network card and driver.
+
+config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
+	bool "kernel stack"
+	depends on BR2_LINUX_KERNEL
+	help
+	  The openPOWERLINK stack may be implemented as Linux kernel module.
+	  This solution provides the best performance, but is limited to the
+	  available openPOWERLINK network drivers.
+	  You may select BR2_PACKAGE_PCIUTILS for lscpi,
+	  and BR2_PACKAGE_PROCPS for ps command.
+	  These commands are used in EplLoad and EplUndload scripts.
+
+endchoice
+
+if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
+
+choice
+	prompt "select Ethernet Powerlink Driver"
+
+config BR2_PACKAGE_OPENPOWERLINK_82573
+	bool "Intel 82573"
+
+config BR2_PACKAGE_OPENPOWERLINK_8255x
+	bool "Intel 8255x"
+
+config BR2_PACKAGE_OPENPOWERLINK_RTL8139
+	bool "Realtek RTL-8139"
+
+endchoice
+
+endif
+
+choice
+	prompt "Select MN/CN mode"
+
+	config BR2_PACKAGE_OPENPOWERLINK_MN
+	bool "MN"
+	help
+	  Enable Managing Node mode
+
+	config BR2_PACKAGE_OPENPOWERLINK_CN
+	bool "CN"
+	help
+	  Enable Controlled Node mode
+
+endchoice
+
+menu "openpowerlink demos"
+
+config BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_CONSOLE
+	bool "console MN demo"
+	depends on BR2_PACKAGE_OPENPOWERLINK_MN
+
+config BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_QT
+	bool "qt MN demo"
+	depends on BR2_PACKAGE_OPENPOWERLINK_MN
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT_STL
+
+config BR2_PACKAGE_OPENPOWERLINK_DEMO_CN_CONSOLE
+	bool "console CN demo"
+	depends on !BR2_PACKAGE_OPENPOWERLINK_MN
+
+config BR2_PACKAGE_OPENPOWERLINK_DEMO_LINUX_KERNEL
+	bool "kernel demo"
+	depends on BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
+	depends on BR2_PACKAGE_OPENPOWERLINK_MN
+
+endmenu
+
+config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
+	string "debug level for openpowerlink stack"
+	default "0xEC000000L"
+	help
+	  Debug level to be used for openPOWERLINK debugging functions.
+
+endif
diff --git a/package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch b/package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch
new file mode 100644
index 0000000000..c573662a24
--- /dev/null
+++ b/package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch
@@ -0,0 +1,22 @@
+commit 8658075bd7c49a7481e8f6d0d7a13b0651e1dfd7
+Author: Romain Naour <romain.naour@openwide.fr>
+Date:   Wed Sep 18 23:33:04 2013 +0200
+
+    [FIX] demo_mn_qt: add EplDebug.c in demo_sources list
+
+    demo_mn_qt use EplGetEmergErrCodeStr()
+
+    Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+
+diff --git a/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt b/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt
+index 9db2f7f..48ae9eb 100644
+--- a/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt
++++ b/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt
+@@ -78,6 +78,7 @@ SET(DEMO_SOURCES src/EplApi.cpp
+                  src/MainWindow.cpp
+                  src/NodeState.cpp
+                  ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/EplApiProcessImageSetup.c
++                 ${POWERLINK_SOURCE_DIR}/EplStack/EplDebug.c
+     )
+
+ # The TRACE macros need trace.c on the Windows platform
diff --git a/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch b/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch
new file mode 100644
index 0000000000..064a6f0b34
--- /dev/null
+++ b/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch
@@ -0,0 +1,78 @@
+From 9990e19bc554d11c4123986692c5e0572682467a Mon Sep 17 00:00:00 2001
+From: Josef Baumgartner <josef.baumgartner@br-automation.com>
+Date: Wed, 14 Aug 2013 10:22:21 +0200
+Subject: [PATCH 1/1] [FIX] Fix compilation issue for kernels > 3.5
+
+With kernel version 3.5 the interface of kmap_atomic() and
+kunmap_atomic is changed. The fix adapts to the new interface.
+
+Change-Id: I0885b87dc594bf48d1ff4eaeaf188268ceb3b112
+Reviewed-on: http://brateggevoat1/gerrit/1261
+Tested-by: Jenkins <jenkins@brateggevoat1.br-automation.co.at>
+Reviewed-by: Josef Baumgartner <josef.baumgartner@br-automation.com>
+---
+ EplStack/EplApiProcessImage.c | 24 +++++++++++++++++++-----
+ 1 file changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/EplStack/EplApiProcessImage.c b/EplStack/EplApiProcessImage.c
+index a1a049f..02907bc 100644
+--- a/EplStack/EplApiProcessImage.c
++++ b/EplStack/EplApiProcessImage.c
+@@ -573,7 +573,7 @@ tEplApiProcessImageCopyJobInt   IntCopyJob;
+ #elif (TARGET_SYSTEM == _WIN32_)
+     if (EplApiProcessImageInstance_g.m_dwCurrentThreadId == GetCurrentThreadId())
+ #elif (TARGET_SYSTEM == _VXWORKS_)
+-    if (EplApiProcessImageInstance_g.m_currentThreadId == taskIdSelf())    	
++    if (EplApiProcessImageInstance_g.m_currentThreadId == taskIdSelf())
+ #else
+ #error "OS currently not supported by EplApiProcessImage!"
+ #endif
+@@ -1018,13 +1018,20 @@ void*           pVirtUserPart;
+             }
+
+             ulSize = min ((PAGE_SIZE - ulOffset), pPart->m_uiSize - ulLength);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
+             pVirtUserPart = kmap_atomic(ppPage[nIndex], KM_USER0);
++#else
++            pVirtUserPart = kmap_atomic(ppPage[nIndex]);
++#endif
+
+             EPL_MEMCPY(pPIVar,
+                 pVirtUserPart + ulOffset,
+                 ulSize);
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
+             kunmap_atomic(pVirtUserPart, KM_USER0);
++#else
++            kunmap_atomic(pVirtUserPart);
++#endif
+
+             pPIVar += ulSize;
+             ulLength += ulSize;
+@@ -1063,14 +1070,21 @@ void*           pVirtUserPart;
+             }
+
+             ulSize = min ((PAGE_SIZE - ulOffset), pPart->m_uiSize - ulLength);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
+             pVirtUserPart = kmap_atomic(ppPage[nIndex], KM_USER0);
++#else
++            pVirtUserPart = kmap_atomic(ppPage[nIndex]);
++#endif
+
+             EPL_MEMCPY(pVirtUserPart + ulOffset,
+                 pPIVar,
+                 ulSize);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
+             kunmap_atomic(pVirtUserPart, KM_USER0);
+-
++#else
++            kunmap_atomic(pVirtUserPart);
++#endif
+             pPIVar += ulSize;
+             ulLength += ulSize;
+             ulOffset = 0;
+
+--
+1.8.4
+
diff --git a/package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch b/package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch
new file mode 100644
index 0000000000..bed878e338
--- /dev/null
+++ b/package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch
@@ -0,0 +1,28 @@
+From cb6c4ff053e72f7fe5954894aebe2c0d94120b2d Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Thu, 3 Oct 2013 23:22:17 +0200
+Subject: [PATCH 5/5] [FIX] Linux Powerlink user lib: add INSTALL
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt
+index e67d573..40b7756 100644
+--- a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt
++++ b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt
+@@ -329,7 +329,9 @@ ENDIF ()
+ #
+ # Installation
+ #
+-IF (WIN32)
++IF (UNIX)
++    INSTALL(TARGETS powerlink ARCHIVE DESTINATION lib)
++ELSEIF (WIN32)
+     IF (CFG_X86_WINDOWS_DLL)
+         INSTALL(TARGETS openPOWERLINK RUNTIME DESTINATION bin)
+     ENDIF (CFG_X86_WINDOWS_DLL)
+--
+1.8.4
+
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
new file mode 100644
index 0000000000..5babdd65d0
--- /dev/null
+++ b/package/openpowerlink/openpowerlink.mk
@@ -0,0 +1,95 @@
+################################################################################
+#
+# openpowerlink
+#
+################################################################################
+
+OPENPOWERLINK_VERSION = V1.08.3
+OPENPOWERLINK_SOURCE = openPOWERLINK-$(OPENPOWERLINK_VERSION).zip
+OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V1.8.3
+
+OPENPOWERLINK_LICENSE = BSD-2c, GPLv2
+OPENPOWERLINK_LICENSE_FILES = license.txt
+OPENPOWERLINK_INSTALL_STAGING = YES
+
+ifeq ($(BR2_i386),y)
+OPENPOWERLINK_ARCH = x86
+endif
+
+ifeq ($(BR2_x86_64),y)
+OPENPOWERLINK_ARCH = x86_64
+endif
+
+OPENPOWERLINK_CONF_OPT = -DCMAKE_SYSTEM_PROCESSOR=$(OPENPOWERLINK_ARCH)
+
+ifeq ($(BR2_ENABLE_DEBUG),y)
+OPENPOWERLINK_CONF_OPT += -DCMAKE_BUILD_TYPE=Debug
+else
+OPENPOWERLINK_CONF_OPT += -DCMAKE_BUILD_TYPE=Release
+endif
+
+OPENPOWERLINK_CONF_OPT += -DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL))
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_LIBPCAP),y)
+#  use the user space stack (libpcap)
+OPENPOWERLINK_CONF_OPT += -DCFG_KERNEL_STACK=OFF
+OPENPOWERLINK_DEPENDENCIES = libpcap
+define OPENPOWERLINK_REMOVE_LIB
+	rm $(TARGET_DIR)/usr/lib/libpowerlink.a
+endef
+OPENPOWERLINK_POST_INSTALL_TARGET_HOOKS += OPENPOWERLINK_REMOVE_LIB
+else
+# use the kernel stack
+OPENPOWERLINK_CONF_OPT += -DCFG_KERNEL_STACK=ON \
+		-DCFG_KERNEL_DIR=$(LINUX_DIR) \
+		-DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
+OPENPOWERLINK_DEPENDENCIES = linux
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_82573),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=82573
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_RTL8139),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8139
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_8255x),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8255x
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_MN),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_MN=ON
+else
+OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_MN=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_CONSOLE),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_CONSOLE=ON
+else
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_CONSOLE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_QT),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_QT=ON
+OPENPOWERLINK_DEPENDENCIES += qt
+else
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_QT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_CN_CONSOLE),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_CN_CONSOLE=ON
+else
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_CN_CONSOLE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_LINUX_KERNEL),y)
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_LINUX_KERNEL=ON
+else
+OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_LINUX_KERNEL=OFF
+endif
+
+define OPENPOWERLINK_EXTRACT_CMDS
+	$(RM) -rf $(OPENPOWERLINK_DIR)
+	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(OPENPOWERLINK_SOURCE)
+	test -d $(OPENPOWERLINK_DIR) || \
+		mv $(BUILD_DIR)/$(subst .zip,,$(OPENPOWERLINK_SOURCE)) $(OPENPOWERLINK_DIR)
+endef
+
+$(eval $(cmake-package))

From c6ac31a623123ce450afc41d9c0b03f56b8e9176 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 9 Oct 2013 00:09:47 +0200
Subject: [PATCH 6418/6849] package/rpi-userland: rename patches

Rename patches to follow standard naming scheme.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...fig-files.patch => rpi-userland-000-add-pkgconfig-files.patch} | 0
 ...01-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/rpi-userland/{rpi-userland-add-pkgconfig-files.patch => rpi-userland-000-add-pkgconfig-files.patch} (100%)
 rename package/rpi-userland/{rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch => rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch} (100%)

diff --git a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
similarity index 100%
rename from package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
rename to package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
diff --git a/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch b/package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
similarity index 100%
rename from package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
rename to package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch

From 516246ddf2d7c2569ee6c0ffa4cfc80ff4ecc203 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 9 Oct 2013 00:09:48 +0200
Subject: [PATCH 6419/6849] package/weston: fix variable name

The weston package uses the $(WAYLAND_VERSION) variable instead of
$(WESTON_VERSION).

This went unnoticed for now, as we were using the same version for
wayland and weston. But that's not always the case, since we have,
for example: wayland-1.2.1 and weston-1.2.2, and no wayland-1.2.2.

Fix this by using the correct variable.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/weston.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 6f7703ed4a..5d2c829b3a 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -6,7 +6,7 @@
 
 WESTON_VERSION = 1.1.0
 WESTON_SITE = http://wayland.freedesktop.org/releases/
-WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz
+WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 

From 17a32d31cf7fdebe2656793302cbf65c91545200 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 9 Oct 2013 00:09:49 +0200
Subject: [PATCH 6420/6849] package/weston: requires host-pkgconf

weston's configure.ac uses PKG_CHECK_MODULES,
so it needs to depend on host-pkgconf.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/weston.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 5d2c829b3a..38647bd627 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -10,7 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 
-WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng \
+WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
 	jpeg mtdev udev cairo
 WESTON_CONF_OPT = \
 	--disable-egl \

From f8a7c46ea3beca928705f01b31b75017ba8484ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 20 Sep 2013 08:43:15 +0300
Subject: [PATCH 6421/6849] qt5: remove configure options from module packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These packages do not have configure scripts.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/qt5declarative/qt5declarative.mk           | 1 -
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 1 -
 package/qt5/qt5imageformats/qt5imageformats.mk         | 1 -
 package/qt5/qt5jsbackend/qt5jsbackend.mk               | 1 -
 package/qt5/qt5multimedia/qt5multimedia.mk             | 1 -
 package/qt5/qt5quick1/qt5quick1.mk                     | 1 -
 package/qt5/qt5script/qt5script.mk                     | 1 -
 package/qt5/qt5svg/qt5svg.mk                           | 1 -
 package/qt5/qt5webkit/qt5webkit.mk                     | 1 -
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           | 1 -
 10 files changed, 10 deletions(-)

diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 603c0e722c..a72e89344d 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -11,7 +11,6 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns qt5jsbackend
 QT5DECLARATIVE_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5DECLARATIVE_CONFIGURE_OPTS += -opensource -confirm-license
 QT5DECLARATIVE_LICENSE = LGPLv2.1 or GPLv3.0
 QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index fc9a2ecb26..1e492c9da6 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -11,7 +11,6 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
 QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5GRAPHICALEFFECTS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 10d744b1f5..52192c6802 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -11,7 +11,6 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5IMAGEFORMATS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0
 QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk
index d065f0baba..9eccd23e53 100644
--- a/package/qt5/qt5jsbackend/qt5jsbackend.mk
+++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk
@@ -11,7 +11,6 @@ QT5JSBACKEND_DEPENDENCIES = qt5base
 QT5JSBACKEND_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5JSBACKEND_CONFIGURE_OPTS += -opensource -confirm-license
 QT5JSBACKEND_LICENSE = LGPLv2.1 or GPLv3.0
 QT5JSBACKEND_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 8f62274f35..1a3ca6b901 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -11,7 +11,6 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_CONFIGURE_OPTS += -opensource -confirm-license
 QT5MULTIMEDIA_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 9bd36dbb98..78e47db2d7 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -12,7 +12,6 @@ QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsba
 QT5QUICK1_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
 QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0
 QT5QUICK1_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index e4364740c8..e62e0ac46d 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -11,7 +11,6 @@ QT5SCRIPT_DEPENDENCIES = qt5base
 QT5SCRIPT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_CONFIGURE_OPTS += -opensource -confirm-license
 QT5SCRIPT_LICENSE = LGPLv2.1 or GPLv3.0
 QT5SCRIPT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 8a31ac8341..2ff7fc8c7c 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -11,7 +11,6 @@ QT5SVG_DEPENDENCIES = qt5base
 QT5SVG_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SVG_CONFIGURE_OPTS += -opensource -confirm-license
 QT5SVG_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for qt5svg.
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 320a2ea3c7..87b15a99e4 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -11,7 +11,6 @@ QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf
 QT5WEBKIT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_CONFIGURE_OPTS += -opensource -confirm-license
 QT5WEBKIT_LICENSE = LGPLv2.1 or GPLv3.0
 # Here we would like to get license files from qt5base, but qt5base
 # may not be extracted at the time we get the legal-info for
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 322fd70a15..6f4fdc8d66 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -11,7 +11,6 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_CONFIGURE_OPTS += -opensource -confirm-license
 QT5XMLPATTERNS_LICENSE = LGPLv2.1 or GPLv3.0
 QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
 else

From ef6cd52b8a4a372d5fcc6b5a66f3b8d1ea310d56 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:39 -0300
Subject: [PATCH 6422/6849] rtorrent: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rtorrent/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index 7b21b5af10..218cc6ded1 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_RTORRENT
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBSIGC
 	select BR2_PACKAGE_LIBTORRENT

From d3f8d974ffef0ed1f0f8fcaa8be598acc89163fc Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:40 -0300
Subject: [PATCH 6423/6849] vtun: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vtun/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/vtun/Config.in b/package/vtun/Config.in
index fe1f0d0c92..c1f6d384fc 100644
--- a/package/vtun/Config.in
+++ b/package/vtun/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_VTUN
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
+	depends on BR2_USE_MMU # fork()
 	help
 	  Tool for easily creating Virtual Tunnels over TCP/IP networks
 	  with traffic shaping, compression, and encryption.

From 47fed0c95114bcbfb1d9c3dd714c55f0d0880a18 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:41 -0300
Subject: [PATCH 6424/6849] samba: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/samba/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index a3218b53ed..5339d41402 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SAMBA
 	bool "samba"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_POPT
 	help
 	  Provides print services to all manner of SMB/CIFS clients,

From 6d34f6bdbb27f26c87b164310eaea89b8b91c208 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:42 -0300
Subject: [PATCH 6425/6849] oprofile: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/oprofile/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index 0fbc87c4f2..0d437828be 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPROFILE
 	bool "oprofile"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_LIBPFM4 if BR2_powerpc

From 9e8f1ff34402abec22e9ed300c691a79cd211dbe Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:43 -0300
Subject: [PATCH 6426/6849] net-snmp: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netsnmp/Config.in | 1 +
 package/quagga/Config.in  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index d94abb7bda..3d089362f4 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETSNMP
 	bool "netsnmp"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Suite of applications used to implement SNMP v1, SNMP v2c, and
 	  SNMP v3 using both IPv4 and IPv6.
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index c364ae1b4b..90eaef4bfc 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -80,6 +80,7 @@ config BR2_PACKAGE_QUAGGA_WATCHQUAGGA
 
 config BR2_PACKAGE_QUAGGA_SNMP
 	bool "SNMP support"
+	depends on BR2_USE_MMU # net-snmp
 	select BR2_PACKAGE_NETSNMP
 	help
 	  Make quagga information available via SNMP SMUX.

From ffc959385031d8e8003e7fdb6766cddb96d9afbb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:44 -0300
Subject: [PATCH 6427/6849] xl2tp: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/xl2tp/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/xl2tp/Config.in b/package/xl2tp/Config.in
index 8f9d9b110b..7e2d2f6e97 100644
--- a/package/xl2tp/Config.in
+++ b/package/xl2tp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XL2TP
 	bool "xl2tp"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBPCAP
 	help
 	  Layer 2 Tunnelling Protocol (RFC2661).

From a2f298cebbd0ac3e0e31aca56e0426c60597104b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:45 -0300
Subject: [PATCH 6428/6849] transmission: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/transmission/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 92840753a2..30314f74f5 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_TRANSMISSION
 	bool "transmission"
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBCURL

From 92af118d82a6031c7d9750959d6dc07a82a54ac4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 9 Oct 2013 18:30:46 -0300
Subject: [PATCH 6429/6849] vde2: needs mmu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vde2/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/vde2/Config.in b/package/vde2/Config.in
index f069a7936e..2bbd822c22 100644
--- a/package/vde2/Config.in
+++ b/package/vde2/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_VDE2
 	bool "vde2"
+	depends on BR2_USE_MMU # fork()
 	help
 	  VDE is an ethernet compliant virtual network that can be
 	  spawned over a set of physical computers over the Internet.
 	  VDE is part of the virtualsquare project.
-	  
+
 	  http://vde.sourceforge.net/

From 020775b33f87fbda4e805e3f8740d312c9fc9bf5 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 10 Oct 2013 15:23:18 +0800
Subject: [PATCH 6430/6849] protobuf: needs thread support

Fix:
http://autobuild.buildroot.net/results/086/08661b6bd6796c9126bcbad3245323160b182ac8/

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/protobuf-c/Config.in | 5 +++--
 package/protobuf/Config.in   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in
index 9aff6e2895..17cc8f1d32 100644
--- a/package/protobuf-c/Config.in
+++ b/package/protobuf-c/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PROTOBUF_C
 	bool "protobuf-c"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf
 	select BR2_PACKAGE_PROTOBUF
 	help
 	  Code generator and runtime libraries to use Protocol Buffers
@@ -8,5 +9,5 @@ config BR2_PACKAGE_PROTOBUF_C
 
 	  http://code.google.com/p/protobuf-c/
 
-comment "protobuf-c requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "protobuf-c requires a toolchain with C++ and thread support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in
index b044ef03cf..92e85baa01 100644
--- a/package/protobuf/Config.in
+++ b/package/protobuf/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_PROTOBUF
 	bool "protobuf"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Protocol buffers are Google's language-neutral, platform-neutral,
 	  extensible mechanism for serializing structured data.
 
 	  http://code.google.com/p/protobuf/
 
-comment "protobuf requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "protobuf requires a toolchain with C++ and thread support"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From 9cf555971cb1b12c267cf0bef43835f8297df96b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 10 Oct 2013 11:14:17 -0300
Subject: [PATCH 6431/6849] configs/qemu: bump relevant config versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../{linux-3.10.config => linux-3.11.config}              | 0
 .../{linux-3.10.config => linux-3.11.config}              | 0
 .../{linux-3.10.config => linux-3.11.config}              | 0
 .../mips-malta/{linux-3.10.config => linux-3.11.config}   | 0
 .../mipsel-malta/{linux-3.10.config => linux-3.11.config} | 0
 .../{linux-3.10.config => linux-3.11.config}              | 0
 board/qemu/x86/{linux-3.10.config => linux-3.11.config}   | 0
 .../qemu/x86_64/{linux-3.10.config => linux-3.11.config}  | 0
 configs/qemu_arm_nuri_defconfig                           | 4 ++--
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 configs/qemu_arm_vexpress_defconfig                       | 6 +++---
 configs/qemu_microblazebe_mmu_defconfig                   | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                   | 4 ++--
 configs/qemu_mips64_malta_defconfig                       | 4 ++--
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 configs/qemu_ppc_g3beige_defconfig                        | 8 ++++----
 configs/qemu_ppc_mpc8544ds_defconfig                      | 6 +++---
 configs/qemu_ppc_virtex_ml507_defconfig                   | 6 +++---
 configs/qemu_sh4_r2d_defconfig                            | 4 ++--
 configs/qemu_sparc_ss10_defconfig                         | 4 ++--
 configs/qemu_x86_64_defconfig                             | 8 ++++----
 configs/qemu_x86_defconfig                                | 8 ++++----
 23 files changed, 45 insertions(+), 45 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mips-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/x86/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/x86_64/{linux-3.10.config => linux-3.11.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.10.config b/board/qemu/arm-versatile/linux-3.11.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.10.config
rename to board/qemu/arm-versatile/linux-3.11.config
diff --git a/board/qemu/microblazebe-mmu/linux-3.10.config b/board/qemu/microblazebe-mmu/linux-3.11.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.10.config
rename to board/qemu/microblazebe-mmu/linux-3.11.config
diff --git a/board/qemu/microblazeel-mmu/linux-3.10.config b/board/qemu/microblazeel-mmu/linux-3.11.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.10.config
rename to board/qemu/microblazeel-mmu/linux-3.11.config
diff --git a/board/qemu/mips-malta/linux-3.10.config b/board/qemu/mips-malta/linux-3.11.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.10.config
rename to board/qemu/mips-malta/linux-3.11.config
diff --git a/board/qemu/mipsel-malta/linux-3.10.config b/board/qemu/mipsel-malta/linux-3.11.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.10.config
rename to board/qemu/mipsel-malta/linux-3.11.config
diff --git a/board/qemu/powerpc-g3beige/linux-3.10.config b/board/qemu/powerpc-g3beige/linux-3.11.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.10.config
rename to board/qemu/powerpc-g3beige/linux-3.11.config
diff --git a/board/qemu/x86/linux-3.10.config b/board/qemu/x86/linux-3.11.config
similarity index 100%
rename from board/qemu/x86/linux-3.10.config
rename to board/qemu/x86/linux-3.11.config
diff --git a/board/qemu/x86_64/linux-3.10.config b/board/qemu/x86_64/linux-3.11.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.10.config
rename to board/qemu/x86_64/linux-3.11.config
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index c44e8fff69..20b825a76c 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.10.15"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.15"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index ef710617f6..322fc18c12 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.11.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 3f970e961c..8bd12af551 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -13,13 +13,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 15f36a7cff..adc70745ce 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.11.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index d313866094..792050586c 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.11.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 035cfa1be7..0fde6c6409 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.3"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 34e19e4e93..6b952de53e 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,16 +6,16 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 72304f0596..0b9137a625 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,16 +6,16 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index e8f0ecc891..513c49e5e9 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,16 +6,16 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index a4c29b3034..5396cfa7ef 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,14 +6,14 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index e4e3a34a16..62dd741b7d 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -6,9 +6,9 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 8636857911..99743a10c9 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -12,7 +12,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.2 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.2.50"
+BR2_DEFAULT_KERNEL_VERSION="3.2.51"
 
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
@@ -21,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.50"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.51"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index ad1b136e72..37c40c4538 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -8,11 +8,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.3"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index e09b37b207..520fcf104c 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,13 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.11.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index d451d2a94f..7609cde28e 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.4"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.11.config"

From bb32a1cde3ecabb6505fab1c159349147c1df05a Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 10 Oct 2013 17:56:58 +0200
Subject: [PATCH 6432/6849] boost: bump to version 1.54.0

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/boost/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 160a9f1fe8..a745ce1865 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.53.0
+BOOST_VERSION = 1.54.0
 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
 BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)

From cbcbed4a24a8fd9b8a1f9c546cb43e56ae961bc3 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 10 Oct 2013 17:58:27 +0200
Subject: [PATCH 6433/6849] chrony: bump to version 1.29

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/chrony/chrony.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk
index 59fd3cb8a5..f000e4af6a 100644
--- a/package/chrony/chrony.mk
+++ b/package/chrony/chrony.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CHRONY_VERSION = 1.27
+CHRONY_VERSION = 1.29
 CHRONY_SITE = http://download.tuxfamily.org/chrony/
 CHRONY_LICENSE = GPLv2
 CHRONY_LICENSE_FILES = COPYING

From c551ac4cff997c26cc8ee26ab2fe1437cbbfa3d9 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 10 Oct 2013 18:01:17 +0200
Subject: [PATCH 6434/6849] gdk-pixbuf: bump to version 2.28.2

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 8bfb35ddda..d1d590a82e 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GDK_PIXBUF_MAJOR_VERSION = 2.28
-GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).1
+GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).2
 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
 GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_MAJOR_VERSION)
 GDK_PIXBUF_LICENSE = LGPLv2+

From f3677f060164dc2f37bfdf860cc140630dbec109 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Thu, 10 Oct 2013 17:59:43 +0200
Subject: [PATCH 6435/6849] ccid: bump to version 1.4.13

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ccid/ccid.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index c25b4331c4..aabc0c0003 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CCID_VERSION = 1.4.12
+CCID_VERSION = 1.4.13
 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2
-CCID_SITE = http://alioth.debian.org/frs/download.php/file/3937
+CCID_SITE = http://alioth.debian.org/frs/download.php/file/3959
 CCID_LICENSE = LGPLv2.1+
 CCID_LICENSE_FILES = COPYING
 CCID_INSTALL_STAGING = YES

From 883c4dc43aed75d1dc0875b0ee529d9e72c7f01e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:10:33 +0200
Subject: [PATCH 6436/6849] package/rpi-firmware: bump version

Fixes for de-interlacing of /unusual/ MPEG streams.
Yes, some people seem to enjoy generating MPEG streams in
which interlacing is not constant. That's apparently 100%
valid, but yet very unusual, and at the very least, weird.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index ddb48b3e54..ecd9dbf2b0 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = e6b21d6
+RPI_FIRMWARE_VERSION = 58036da
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From 629b378dd163320c91eb7b171ece2dadfe176242 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:18 +0200
Subject: [PATCH 6437/6849] package/wayland: bump version

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/wayland/wayland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index b5fe94d5e8..0810536b7a 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.1.0
+WAYLAND_VERSION = 1.2.1
 WAYLAND_SITE = http://wayland.freedesktop.org/releases/
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT

From 2cd6def998b530e39ac99c640ef46e4a9c6a5d44 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:19 +0200
Subject: [PATCH 6438/6849] package/weston: bump version

Even with EGL disabled, weston-1.2.2 still tries to build the
simple EGL clients, so they need to be explicitly disabled.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/weston.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 38647bd627..4b99dcee60 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WESTON_VERSION = 1.1.0
+WESTON_VERSION = 1.2.2
 WESTON_SITE = http://wayland.freedesktop.org/releases/
 WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
@@ -14,6 +14,7 @@ WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
 	jpeg mtdev udev cairo
 WESTON_CONF_OPT = \
 	--disable-egl \
+	--disable-simple-egl-clients \
 	--disable-xwayland \
 	--disable-x11-compositor \
 	--disable-drm-compositor \

From efee2e4e1758d22e1fedc134016245e792f5c3b1 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:20 +0200
Subject: [PATCH 6439/6849] package/wayland: install wayland-scanner to $(HOST)

wayland-scanner is needed by weston.

[Peter: use $(INSTALL), fixup white space]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/wayland/wayland.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index 0810536b7a..013d401568 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -22,7 +22,9 @@ WAYLAND_CONF_OPT = --disable-scanner
 define WAYLAND_BUILD_SCANNER
 	(cd $(@D)/src/; \
 		$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
-			-o wayland-scanner scanner.c wayland-util.c -lexpat)
+			-o wayland-scanner scanner.c wayland-util.c -lexpat; \
+	 	$(INSTALL) -m 0755 -D wayland-scanner \
+			$(HOST_DIR)/usr/bin/wayland-scanner)
 endef
 
 WAYLAND_POST_CONFIGURE_HOOKS += WAYLAND_BUILD_SCANNER

From af28f7901ea2a80435714e98fb750b4c03570c96 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:21 +0200
Subject: [PATCH 6440/6849] package/weston: fix configure.ac to check for
 wayland-scanner

configure whines while checking for wayland-scanner.

wayland-scanner is used to generate the protocol parser C files from
the protocol definition XML files.

weston has a hard-dependency on wayland-scanner, so it can regenerate
its shell/mouse/keyboard/... "handlers".

Since we're using a tarball, those protocol files are already generated
and up-to-date, but the check is hard-coded and unconditional. If
wayland-scanner is missing, configure fails.

We could well patch away this check, but we'd have to carry and maintain
it probably for ever.

Better to fix it: add a patch from upstream weston to fix configure
whining.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...x-configure.ac-check-wayland-scanner.patch | 26 +++++++++++++++++++
 package/weston/weston.mk                      |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch

diff --git a/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch b/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
new file mode 100644
index 0000000000..ca7368f309
--- /dev/null
+++ b/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
@@ -0,0 +1,26 @@
+commit 9f43cb48aac9d27aa49fe955104f5cfd204703ed
+Author: Quentin Glidic <sardemff7+git@sardemff7.net>
+Date:   Sat Aug 24 20:36:10 2013 +0200
+
+    autotools: Fix AC_PATH_PROG call
+    
+    Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
+    Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/configure.ac b/configure.ac
+index 0129157..43e5e5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -424,8 +424,10 @@ if test "x$have_lcms" = xyes; then
+ fi
+ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
+ 
+-AC_PATH_PROG([wayland_scanner], [wayland-scanner],
+-	     [AC_MSG_ERROR("wayland-scanner is needed to compile weston")])
++AC_PATH_PROG([wayland_scanner], [wayland-scanner])
++if test x$wayland_scanner = x; then
++	AC_MSG_ERROR([wayland-scanner is needed to compile weston])
++fi
+ 
+ AC_CONFIG_FILES([Makefile
+ 		 shared/Makefile
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 4b99dcee60..6b4dece1f4 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -12,6 +12,10 @@ WESTON_LICENSE_FILES = COPYING
 
 WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
 	jpeg mtdev udev cairo
+
+# We touch configure.ac with one of our patches
+WESTON_AUTORECONF = YES
+
 WESTON_CONF_OPT = \
 	--disable-egl \
 	--disable-simple-egl-clients \

From 6614f38411aecdc5d5d0ba5c849b195df874b1d6 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:22 +0200
Subject: [PATCH 6441/6849] package/weston: fix configure.ac for fbdev
 compositor

Apply patch from upstream.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...itor-fbdev-drop-dependency-on-libdrm.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch

diff --git a/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch b/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
new file mode 100644
index 0000000000..dfc20dee82
--- /dev/null
+++ b/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
@@ -0,0 +1,22 @@
+commit 7b8e970ad1f1ef96db23b379a41edeb40ef1e8b6
+Author: Adrian Negreanu <adrian.m.negreanu@intel.com>
+Date:   Thu Sep 26 19:31:32 2013 +0300
+
+    compositor-fbdev: drop dependency on libdrm
+    
+    Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
+    Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/configure.ac b/configure.ac
+index 7c2da44..a43bf5b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,7 +190,7 @@ AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR],
+                [test x$enable_fbdev_compositor = xyes])
+ AS_IF([test x$enable_fbdev_compositor = xyes], [
+   AC_DEFINE([BUILD_FBDEV_COMPOSITOR], [1], [Build the fbdev compositor])
+-  PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0 libdrm >= 2.4.30])
++  PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0])
+ ])
+ 
+ AC_ARG_ENABLE([rdp-compositor], [  --enable-rdp-compositor],,

From 8c19412415f8b7b835a52f5d396661ac17aafc80 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:23 +0200
Subject: [PATCH 6442/6849] package/weston: introduce infrastructure to select
 other compositors

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/Config.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index 56eb135686..0f168acb43 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -14,8 +14,6 @@ config BR2_PACKAGE_WESTON
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
-	# Make sure at least one backend is selected
-	select BR2_PACKAGE_WESTON_FBDEV
 	help
 	  Weston is the reference implementation of a Wayland
 	  compositor, and a useful compositor in its own right.
@@ -26,7 +24,16 @@ config BR2_PACKAGE_WESTON
 
 if BR2_PACKAGE_WESTON
 
+# These two options make sure at least one compositor is selected.
+config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+	bool
+config BR2_PACKAGE_WESTON_NEEDS_ONE_COMPOSITOR
+	def_bool y
+	depends on ! BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+	select BR2_PACKAGE_WESTON_FBDEV
+
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
+	default y
 
 endif

From a863451c395b60912c9007fc36e74b0751bc0b8d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:24 +0200
Subject: [PATCH 6443/6849] package/rpi-userland: add patch to remove faulty
 assert()

While porting wayland/weston to run on the RPi, I always tripped on
this assert.

Thinking there was an issue with weston, I poked the weston guys on
IRC about the issue. 'daniels' on irc.freenode.net/#wayland suggested
removing the assert altogether, as that's what they had pushed
upstream in their wayland pull-request:
    https://github.com/raspberrypi/userland/pull/92

Turns out they forgot to include this in their pull-request, but that
they were using a patched rpi-userland without that assert.

And indeed, without that assert, weston runs on the RPi. :-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...pi-userland-002-remove-faulty-assert.patch | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch

diff --git a/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch b/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch
new file mode 100644
index 0000000000..c23c43ae0e
--- /dev/null
+++ b/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch
@@ -0,0 +1,21 @@
+interface: remove faulty assert() to make weston happy at runtime
+
+This was removed after a discussion on IRC with the weston guys
+('daniels' on irc.freenode.net/#wayland).
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Upstream status: no, will be pushed by weston guys later.
+If not, I'll do it.
+
+diff -durN rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c
+--- rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c	2013-10-04 17:43:44.000000000 +0200
++++ rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c	2013-10-08 22:28:51.611433539 +0200
+@@ -1187,7 +1187,6 @@
+          continue;
+    
+       if(dispmanx_client.update_callback ) {
+-         vcos_assert( dispmanx_client.pending_update_handle == (DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1]);
+          dispmanx_client.update_callback((DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1], dispmanx_client.update_callback_param);
+       }
+    }

From 9f7e8f120dfeddd8b49eb4d232253cc3f9ac8efa Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 10 Oct 2013 23:05:25 +0200
Subject: [PATCH 6444/6849] package/weston: add RPi compositor

Procedure highly inspired by:
    http://wayland.freedesktop.org/raspberrypi.html

The resulting weston works almost flawlessly, but requires a bit
of love:
  - /boot/config.txt must include this line: dispmanx_offline=1
  - at least 128MiB of RAM must be allocated to the GPU
  - after 24-or-so terminal-clients are connected, the screen
    turns black. Exiting a client restores the screen

It seems increasing/decreasing the amount of memory allocated to
the GPU makes the clients limit to wobble above/below 24 clients
at a time. YMMV, as they say...

Without dispmanx_offline=1, the limit is much below 24, at around 13.
But changing the amount of memory allocated to the GPU does not change
this limit in this case. YMMV, again.

Anyway, there are not many different clients available, besides the
terminal client, since all other clients are EGL-based, and there
is (yet) no EGL support (for weston!) on the RPi. So the tests were
made only with the terminal client.

The system is rather smooth, but spwaning too many clients in a
rapid-fire is sure to exhibit some lag. Resizing windows is a bit
jerky, but moving them along is fine.

Note: the config option has a depends on THREADS due to rpi-userland,
even though weston itself already inherits the same dependency from
wayland. But better be clean and safe.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/Config.in |  9 +++++++++
 package/weston/weston.mk | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index 0f168acb43..4532c28a2d 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -36,4 +36,13 @@ config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
 	default y
 
+config BR2_PACKAGE_WESTON_RPI
+	bool "RPi compositor"
+	depends on BR2_arm                      # rpi-userland
+	depends on BR2_INSTALL_LIBSTDCPP        # rpi-userland
+	depends on BR2_LARGEFILE                # rpi-userland
+	depends on BR2_TOOLCHAIN_HAS_THREADS    # rpi-userland
+	select BR2_PACKAGE_RPI_USERLAND
+	select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+
 endif
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 6b4dece1f4..c8b47a7d3f 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -24,8 +24,8 @@ WESTON_CONF_OPT = \
 	--disable-drm-compositor \
 	--disable-wayland-compositor \
 	--disable-headless-compositor \
-	--disable-rpi-compositor \
 	--disable-weston-launch \
+	--disable-colord \
 	--disable-libunwind
 
 ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
@@ -34,4 +34,16 @@ else
 WESTON_CONF_OPT += --disable-fbdev-compositor
 endif
 
+ifeq ($(BR2_PACKAGE_WESTON_RPI),y)
+WESTON_DEPENDENCIES += rpi-userland
+WESTON_CONF_OPT += --enable-rpi-compositor \
+	--disable-resize-optimization \
+	--disable-setuid-install \
+	--disable-xwayland-test \
+	--disable-simple-egl-clients \
+	WESTON_NATIVE_BACKEND=rpi-backend.so
+else
+WESTON_CONF_OPT += --disable-rpi-compositor
+endif # BR2_PACKAGE_WESTON_RPI
+
 $(eval $(autotools-package))

From 127c9bcc136969d6c715441e563e9deb0db6f37f Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Mon, 14 Oct 2013 09:22:38 +0200
Subject: [PATCH 6445/6849] manual: rename section name of package lists

The original titles did no longer correspond with the actual menu names.
Additionally, choose a name that better reflects the fact that this is a
list.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/appendix.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt
index 721c96c359..74ee8fd4b8 100644
--- a/docs/manual/appendix.txt
+++ b/docs/manual/appendix.txt
@@ -11,14 +11,14 @@ include::makeusers-syntax.txt[]
 // Automatically generated lists:
 
 [[package-list]]
-Package Selection for the target
---------------------------------
+List of target packages available in Buildroot
+----------------------------------------------
 
 include::package-list.txt[]
 
 [[host-package-list]]
-Host utilities
---------------
+List of host utilities available in Buildroot
+---------------------------------------------
 
 The following packages are all available in the menu +Host utilities+.
 

From 7b57bef618afb0f830abd4f854fe811b8978d7ff Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 13 Oct 2013 00:46:15 +0200
Subject: [PATCH 6446/6849] package/rpi-userland: install all of our .pc files
 the same way

Install bcm_host the same way we install egl.pc and glesv2.pc, using
the cmake lists.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/bcm_host.pc              | 11 -------
 ...rpi-userland-000-add-pkgconfig-files.patch | 32 +++++++++++++++++--
 package/rpi-userland/rpi-userland.mk          |  6 ----
 3 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 package/rpi-userland/bcm_host.pc

diff --git a/package/rpi-userland/bcm_host.pc b/package/rpi-userland/bcm_host.pc
deleted file mode 100644
index 28bbe960da..0000000000
--- a/package/rpi-userland/bcm_host.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: bcm_host
-Description: Broadcom VideoCore host API library
-Version: 1
-Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
-Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
-
diff --git a/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
index 4ffc2b0bb6..d7984ffe23 100644
--- a/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
+++ b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
@@ -1,9 +1,10 @@
-Add .pc files for the OpenGLESv2 and EGL libraries
+Add .pc files for the OpenGLESv2, EGL and bcm_host libraries
 
 Those pkg-config files make it easier for Qt5 to find those libraries
 and the appropriate link flags.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 
 Index: b/interface/khronos/egl/egl.pc.in
 ===================================================================
@@ -25,7 +26,7 @@ Index: b/interface/khronos/CMakeLists.txt
 ===================================================================
 --- a/interface/khronos/CMakeLists.txt
 +++ b/interface/khronos/CMakeLists.txt
-@@ -73,3 +73,11 @@
+@@ -74,3 +74,11 @@
  
  install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib)
  install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
@@ -52,3 +53,30 @@ Index: b/interface/khronos/glxx/glesv2.pc.in
 +Version: 2.0
 +Libs: -L${libdir} -lGLESv2
 +Cflags: -I${includedir}/
+Index: b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+===================================================================
+--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt
++++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+@@ -20,3 +20,7 @@
+ 
+ install(TARGETS bcm_host DESTINATION lib)
+ 
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bcm_host.pc.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc"
++  DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+Index: b/host_applications/linux/libs/bcm_host/bcm_host.pc.in
+===================================================================
+--- /dev/null
++++ b/host_applications/linux/libs/bcm_host/bcm_host.pc.in
+@@ -0,0 +1,10 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: bcm_host
++Description: Broadcom VideoCore host API library
++Version: 1
++Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
++Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index cc032bfcd9..8b5794f9b1 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -16,10 +16,4 @@ define RPI_USERLAND_POST_TARGET_CLEANUP
 endef
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
 
-define RPI_USERLAND_POST_STAGING_PC_FILE
-	install -D -m 0644 package/rpi-userland/bcm_host.pc \
-		$(STAGING_DIR)/usr/lib/pkgconfig/bcm_host.pc
-endef
-RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_POST_STAGING_PC_FILE
-
 $(eval $(cmake-package))

From f8938bf47d06e445c86d02403122c39926f1d036 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 13 Oct 2013 00:46:16 +0200
Subject: [PATCH 6447/6849] package/rpi-userland: expose appropriate EGL
 version

The egl.pc file installed exposes version 1.0, while it really is a
much higher version.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
index d7984ffe23..848e49d7ce 100644
--- a/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
+++ b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
@@ -18,7 +18,7 @@ Index: b/interface/khronos/egl/egl.pc.in
 +
 +Name: egl
 +Description: RasberryPi implementation of EGL
-+Version: 1.0
++Version: 10
 +Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host
 +Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \
 +        -I${includedir}/interface/vmcs_host/linux/

From 61ac6731528bf2c6f0598da02d9134821bbb3b00 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Sun, 13 Oct 2013 13:45:04 +0200
Subject: [PATCH 6448/6849] ruby: fix 'pcrel too far' build problem on SuperH
 architectures

The 'pcrel too far' problem detected in the autobuild on SuperH
architectures, seems to be caused by the -Os optimization flag. Using
standard optimization fixes the problem.

Fixes http://autobuild.buildroot.net/results/bc36e051e06f596c2fafdd3cc3745bb34b73ace3/

Investigated-by: Lionel Orry <lionel.orry@gmail.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ruby/ruby.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 2188837a36..ea19008f54 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -15,6 +15,15 @@ HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
 RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others
 RUBY_LICENSE_FILES = LEGAL COPYING BSDL
 
+RUBY_CFLAGS = $(TARGET_CFLAGS)
+# With some SuperH toolchains (like Sourcery CodeBench 2012.09), ruby fails to
+# build with 'pcrel too far'. This seems to be caused by the -Os option we pass
+# by default. To fix the problem, use standard -O2 optimization instead.
+ifeq ($(BR2_sh)$(BR2_sh64),y)
+RUBY_CFLAGS += -O2
+endif
+RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)"
+
 # Force optionals to build before we do
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
 	RUBY_DEPENDENCIES += berkeleydb

From 908d0236ae2f8b9e3824f3b0cdf3f6519684d151 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 11 Oct 2013 18:34:00 +0200
Subject: [PATCH 6449/6849] fbgrab: bump to version 1.2

Patch:
- fbgrab-proper-Makefile-for-cross-compiling.patch
has been integrated in the new upstream version.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-proper-Makefile-for-cross-compiling.patch | 39 -------------------
 package/fbgrab/fbgrab.mk                      |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch

diff --git a/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch b/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch
deleted file mode 100644
index a211774db9..0000000000
--- a/package/fbgrab/fbgrab-proper-Makefile-for-cross-compiling.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2283817b9aed0b6228d0255d5aba7968379c9854 Mon Sep 17 00:00:00 2001
-From: Gilles Talis <gilles.talis@gmail.com>
-Date: Wed, 3 Jul 2013 11:40:36 -0700
-Subject: [PATCH] fbgrab: A proper Makefile for cross compiling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Respect to the CC, CFLAGS and LDFLAGS is required for cross compiling in
-Buildroot. And there's no need to run the source through splint.
-
-Reworked original patch from: Daniel Nyström <daniel.nystrom@timeterminal.se>
-
-Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se>
-Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
----
- Makefile |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index aae16e6..2d6b6fc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,8 +3,10 @@
- ### modular. So this is a simple gnu Makefile...
- ###
- 
--fbgrab: fbgrab.c
--	gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+LDFLAGS += -lpng -lz
-+
-+fbgrab: fbgrab.o
-+	$(CC) $(LDFLAGS) fbgrab.o -o $@
- 
- install:
- 	install fbgrab /usr/bin/fbgrab
--- 
-1.7.4.1
-
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index 1a91f5e54b..5e838718ba 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FBGRAB_VERSION = 1.1
+FBGRAB_VERSION = 1.2
 FBGRAB_SITE = http://fbgrab.monells.se
 FBGRAB_DEPENDENCIES = libpng
 FBGRAB_LICENSE = GPLv2

From a97d711d8ab1742cbc734abb39e89319ae24c39b Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 12 Oct 2013 10:15:25 +0800
Subject: [PATCH 6450/6849] pcsc-lite: bump to version 1.8.8

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pcsc-lite/pcsc-lite.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index c126b3f906..4cc628f90f 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PCSC_LITE_VERSION = 1.8.6
+PCSC_LITE_VERSION = 1.8.8
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
-PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/3757
+PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/3862
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
 PCSC_LITE_LICENSE = BSD-3c

From 1247850d44daafa5c7835f26da88e347b330b536 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 13 Oct 2013 10:28:20 +0200
Subject: [PATCH 6451/6849] toolchain-external: add a specific check to avoid
 Angstrom toolchains

The Angstrom toolchains available at
http://www.angstrom-distribution.org/toolchains/ are not usable as
external toolchains in Buildroot, because they are not pure toolchains
with just the C library, but instead complete SDKs with many
cross-compiled libraries (Gtk, Qt, glib, neon, sqlite, X.org, and many
more, approximately 200 MB of libraries).

Buildroot cannot use such toolchains, and while this is documented in
our manual, some users still try to do this. Today, one such user came
on the IRC channel, reporting a build problem, which we started
investigating, only to realize after a long time that he was using an
Angstrom toolchain.

To avoid this problem in the future, we explicitly check if the
toolchain is from Angstrom by looking at the vendor part of the tuple
exposed by the toolchain: as soon as it is
<something>-angstrom-<something-else>, we reject the toolchain with an
explanation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/helpers.mk                           | 18 ++++++++++++++++++
 .../toolchain-external/toolchain-external.mk   |  1 +
 2 files changed, 19 insertions(+)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 95120cd97b..a8944ce0f6 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -324,3 +324,21 @@ check_cross_compiler_exists = \
 		echo "Cannot execute cross-compiler '$${__CROSS_CC}'" ; \
 		exit 1 ; \
 	fi
+
+#
+# Check for toolchains known not to work with Buildroot. For now, we
+# only check for Angstrom toolchains, by looking at the vendor part of
+# the host tuple.
+#
+# $1: cross-gcc path
+#
+check_unusable_toolchain = \
+	__CROSS_CC=$(strip $1) ; \
+	vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \
+	if test "$${vendor}" = "angstrom" ; then \
+		echo "Angstrom toolchains are not pure toolchains: they contain" ; \
+		echo "many other libraries than just the C library, which makes" ; \
+		echo "them unsuitable as external toolchains for build systems" ; \
+		echo "such as Buildroot." ; \
+		exit 1 ; \
+	fi
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index b5b1ce78a2..d41cc7cfcb 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -371,6 +371,7 @@ endif
 # type of C library and all C library features.
 define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
+	$(Q)$(call check_unusable_toolchain,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
 	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/(.*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \

From 548185a7b302aedb386fe67e7f22ca78c813dd6f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 14 Oct 2013 13:31:14 +0200
Subject: [PATCH 6452/6849] libcue: add license info

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libcue/libcue.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk
index cd19f4a391..e2cf6305ba 100644
--- a/package/libcue/libcue.mk
+++ b/package/libcue/libcue.mk
@@ -7,6 +7,8 @@
 LIBCUE_VERSION = 1.4.0
 LIBCUE_SITE = http://downloads.sourceforge.net/project/libcue/libcue/$(LIBCUE_VERSION)
 LIBCUE_SOURCE = libcue-$(LIBCUE_VERSION).tar.bz2
+LIBCUE_LICENSE = GPLv2, BSD-2c (rem.c)
+LIBCUE_LICENSE_FILES = COPYING
 LIBCUE_DEPENDENCIES = flex
 LIBCUE_INSTALL_STAGING = YES
 

From 5e0613aa8eadf16383410eb764f10ca99e549fb8 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 14 Oct 2013 15:14:52 +0800
Subject: [PATCH 6453/6849] poppler: needs thread support

Fix:
http://autobuild.buildroot.net/results/daa/daa18f112ddd08644b4149025899cea2b511a9da/

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/poppler/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index 6a9e1fd86a..876601e3ba 100644
--- a/package/poppler/Config.in
+++ b/package/poppler/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_POPPLER
 	bool "poppler"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
@@ -9,5 +10,5 @@ config BR2_PACKAGE_POPPLER
 
 	   http://poppler.freedesktop.org/
 
-comment "poppler requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "poppler requires a toolchain with C++ and thread support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From 49fd1b3a651b7d47f90dda11251c506dd3c00f9d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Oct 2013 08:39:23 -0300
Subject: [PATCH 6454/6849] linux-headers: bump 3.{0, 4, 10, 11}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename package/linux-headers/{3.0.99 => 3.0.100}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.99/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.100/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.99/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.100/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 114f337d77..17688685ca 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,17 +76,17 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.99"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.100"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.65"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.66"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.15"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.4"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.16"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.5"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 3137186ba983c6dc0888df5fafff559082096cb0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Oct 2013 08:39:24 -0300
Subject: [PATCH 6455/6849] linux: bump 3.11.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 6c642ef276..4fcb128ec9 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11.4"
+	bool "3.11.5"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11.4" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11.5" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 90f08e757fe594be368847ec9e5ca48585c1eb3c Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 11 Oct 2013 18:29:16 +0200
Subject: [PATCH 6456/6849] jansson: bump to version 2.5

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/jansson/jansson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk
index 49e8571686..bb3240f17a 100644
--- a/package/jansson/jansson.mk
+++ b/package/jansson/jansson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JANSSON_VERSION = 2.4
+JANSSON_VERSION = 2.5
 JANSSON_SITE = http://www.digip.org/jansson/releases
 JANSSON_LICENSE = MIT
 JANSSON_LICENSE_FILES = LICENSE

From 020faffd1a4b71b520251924f91119a5cb716c3a Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 11 Oct 2013 18:30:33 +0200
Subject: [PATCH 6457/6849] jpeg-turbo: bump to version 1.3.0

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/jpeg-turbo/jpeg-turbo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk
index c19959c1ce..e6a0b24acc 100644
--- a/package/jpeg-turbo/jpeg-turbo.mk
+++ b/package/jpeg-turbo/jpeg-turbo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JPEG_TURBO_VERSION = 1.2.1
+JPEG_TURBO_VERSION = 1.3.0
 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
 JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
 JPEG_TURBO_INSTALL_STAGING = YES

From 9fd212c19d6e055650ce20748f504093262d0004 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 11 Oct 2013 18:32:38 +0200
Subject: [PATCH 6458/6849] apr: bump to version 1.4.8

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/apr/apr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index 6394882ca9..4da42c5b9f 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APR_VERSION = 1.4.6
+APR_VERSION = 1.4.8
 APR_SITE = http://archive.apache.org/dist/apr
 APR_LICENSE = Apache-2.0
 APR_LICENSE_FILES = LICENSE

From 3b388653d21fd46f5f5511570972e87c149da898 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 11 Oct 2013 18:35:44 +0200
Subject: [PATCH 6459/6849] apr-util: bump to version 1.5.2

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-remove-checkapr.patch => apr-util-01-remove-checkapr.patch} | 0
 package/apr-util/apr-util.mk                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/apr-util/{apr-util-1.4.1-remove-checkapr.patch => apr-util-01-remove-checkapr.patch} (100%)

diff --git a/package/apr-util/apr-util-1.4.1-remove-checkapr.patch b/package/apr-util/apr-util-01-remove-checkapr.patch
similarity index 100%
rename from package/apr-util/apr-util-1.4.1-remove-checkapr.patch
rename to package/apr-util/apr-util-01-remove-checkapr.patch
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index 11551d693e..51852e4a43 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APR_UTIL_VERSION = 1.4.1
+APR_UTIL_VERSION = 1.5.2
 APR_UTIL_SITE = http://archive.apache.org/dist/apr
 APR_UTIL_LICENSE = Apache-2.0
 APR_UTIL_LICENSE_FILES = LICENSE

From 43ccbec68f63f2a169aafd187b5e24d6ac52b093 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Fri, 11 Oct 2013 22:37:43 +0200
Subject: [PATCH 6460/6849] boost: Fix compilation of Boost.Variants move
 assignment

Fix compilation of Boost.Variants move assignment for situations when one of the variant template classes has nothrow copy constructor and throwing move constructor (refs #8772)

Fixes compilation error:

.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp: In member function 'void boost::variant<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>::move_assigner::internal_visit(RhsT&, int) [with RhsT = boost::shared_ptr<void>, T0_ = boost::shared_ptr<void>, T1 = boost::signals2::detail::foreign_void_shared_ptr, T2 = boost::detail::variant::void_, ..., T18 = boost::detail::variant::void_, T19 = boost::detail::variant::void_]':
...
.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp:2058:13: error: no matching function for call to 'boost::variant<boost::shared_ptr<void>, boost::signals2::detail::foreign_void_shared_ptr>::move_assigner::assign_impl(boost::shared_ptr<void>&, nothrow_copy, nothrow_move_constructor, boost::variant<boost::shared_ptr<void>, boost::signals2::detail::foreign_void_shared_ptr>::has_fallback_type_)'

Reported here: https://svn.boost.org/trac/boost/ticket/8772

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Backported-from: https://svn.boost.org/trac/boost/changeset/85080
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...on-of-Boost.Variants-move-assignment.patch | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch

diff --git a/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch b/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch
new file mode 100644
index 0000000000..00dc7c619a
--- /dev/null
+++ b/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch
@@ -0,0 +1,50 @@
+Fix compilation of Boost.Variants move assignment for situations when one of the variant template classes has nothrow copy constructor and throwing move constructor (refs #8772)
+
+Fixes compilation error:
+
+.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp: In member function 'void boost::variant<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>::move_assigner::internal_visit(RhsT&, int) [with RhsT = boost::shared_ptr<void>, T0_ = boost::shared_ptr<void>, T1 = boost::signals2::detail::foreign_void_shared_ptr, T2 = boost::detail::variant::void_, ..., T18 = boost::detail::variant::void_, T19 = boost::detail::variant::void_]':
+...
+.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp:2058:13: error: no matching function for call to 'boost::variant<boost::shared_ptr<void>, boost::signals2::detail::foreign_void_shared_ptr>::move_assigner::assign_impl(boost::shared_ptr<void>&, nothrow_copy, nothrow_move_constructor, boost::variant<boost::shared_ptr<void>, boost::signals2::detail::foreign_void_shared_ptr>::has_fallback_type_)'
+
+Reported here: https://svn.boost.org/trac/boost/ticket/8772
+
+Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
+Backported-from: https://svn.boost.org/trac/boost/changeset/85080
+
+--- a/boost/variant/variant.hpp	(revision 85079)
++++ b/boost/variant/variant.hpp	(revision 85080)
+@@ -1981,5 +1981,5 @@
+     private: // helpers, for internal visitor interface (below)
+ 
+-        template <typename RhsT, typename B1, typename B2>
++        template <typename RhsT, typename B2>
+         void assign_impl(
+               RhsT& rhs_content
+--- a/libs/variant/test/rvalue_test.cpp	(revision 85079)
++++ b/libs/variant/test/rvalue_test.cpp	(revision 85080)
+@@ -197,4 +197,19 @@
+ #endif
+ 
++struct nothrow_copyable_throw_movable {
++    nothrow_copyable_throw_movable(){}
++    nothrow_copyable_throw_movable(const nothrow_copyable_throw_movable&) BOOST_NOEXCEPT {}
++#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
++    nothrow_copyable_throw_movable(nothrow_copyable_throw_movable&&) BOOST_NOEXCEPT_IF(false) {}
++#endif
++};
++
++// This test is created to cover the following situation:
++// https://svn.boost.org/trac/boost/ticket/8772
++void run_tricky_compilation_test()
++{
++    boost::variant<int, nothrow_copyable_throw_movable> v;
++    v = nothrow_copyable_throw_movable();
++}
+ 
+ int test_main(int , char* [])
+@@ -204,4 +219,5 @@
+    run_move_only();
+    run_moves_are_noexcept();
++   run_tricky_compilation_test();
+    return 0;
+ }

From 86e61d20504db0881c495da07a25552d8783bd71 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 12 Oct 2013 12:15:08 +0200
Subject: [PATCH 6461/6849] package: fix 'local' site method for host packages

Using the 'local' site method works just fine for target
packages. However, for host packages, when HOST_<pkg>_SITE is
automatically defined by the package infrastructure to be equal to
<pkg>_SITE, when defining the <pkg>_OVERRIDE_SRCDIR, the $($(2)_SITE)
is empty, due to a missing additional dollar sign.

This patch ensures that the <pkg>_OVERRIDE_SRCDIR gets the correct
value, regardless of whether the HOST_<pkg>_SITE variable has been
defined by the package itself, or inferred by the package
infrastructure using the <pkg>_SITE value.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: http://stackoverflow.com/questions/19311747/buildroot-cant-use-local-site-method-for-custom-host-packages
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index a46457c59d..4bba4b5803 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -281,7 +281,7 @@ endif
 
 ifeq ($$($(2)_SITE_METHOD),local)
 ifeq ($$($(2)_OVERRIDE_SRCDIR),)
-$(2)_OVERRIDE_SRCDIR = $($(2)_SITE)
+$(2)_OVERRIDE_SRCDIR = $$($(2)_SITE)
 endif
 endif
 

From eed2e02fb99f31196df75ec3dadaf80fa68fffe3 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 14 Oct 2013 21:21:30 +0800
Subject: [PATCH 6462/6849] ncftp: specify ln -sf to remove existing
 destination files

This fixes below build error when executing "make ncftp-dirclean; make".

ln -s /usr/bin/ncftpbatch /opt/test/br-x86/buildroot/output/target/usr/bin/ncftpspooler
ln: failed to create symbolic link '/opt/test/br-x86/buildroot/output/target/usr/bin/ncftpspooler': File exists
make: *** [/opt/test/br-x86/buildroot/output/build/ncftp-3.2.5/.stamp_target_installed] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ncftp/ncftp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 56d5d474e6..03874d1598 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -26,7 +26,7 @@ endif
 ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y)
 	NCFTP_TARGET_BINS += ncftpbatch
 	NCFTP_INSTALL_NCFTP_BATCH = \
-		ln -s /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler
+		ln -sf /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler
 endif
 
 ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y)

From 58712bbe4f085e92962db17d2d4ae34057d9384e Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 14 Oct 2013 21:22:19 +0800
Subject: [PATCH 6463/6849] sam-ba: specify ln -sf to remove existing
 destination file

This fixes below build error when executing
"make host-sam-ba-dirclean; make host-sam-ba-rebuild".

ln -s ../../opt/sam-ba/sam-ba /opt/test/br-x86/buildroot/output/host/usr/bin/sam-ba
ln: failed to create symbolic link '/opt/test/br-x86/buildroot/output/host/usr/bin/sam-ba': File exists
make: *** [/opt/test/br-x86/buildroot/output/build/host-sam-ba-2.12/.stamp_host_installed] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sam-ba/sam-ba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
index e425503f8f..8e24fa62f3 100644
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -24,7 +24,7 @@ endef
 define HOST_SAM_BA_INSTALL_CMDS
 	mkdir -p $(HOST_DIR)/opt/sam-ba/
 	cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/
-	ln -s ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba
+	ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba
 endef
 
 $(eval $(host-generic-package))

From b6c0b3b42ab357925d64eb5aa7515f83a7d5ca02 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 14 Oct 2013 21:23:02 +0800
Subject: [PATCH 6464/6849] tcl: specify ln -sf to remove existing destination
 file

This fixes below build error when executing
"make tcl-dirclean; make tcl-rebuild".

ln -s tclsh8.4 /opt/test/br-x86/buildroot/output/target/usr/bin/tclsh
ln: failed to create symbolic link '/opt/test/br-x86/buildroot/output/target/usr/bin/tclsh': File exists
make: *** [/opt/test/br-x86/buildroot/output/build/tcl-8.4.19/.stamp_target_installed] Error 1

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tcl/tcl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 3291c1b28d..58f085a207 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -37,7 +37,7 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_TCLSH
 else
 define TCL_SYMLINK_TCLSH
-	ln -s tclsh$(TCL_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/tclsh
+	ln -sf tclsh$(TCL_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/tclsh
 endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH
 endif

From 05d59aa2689acb86e72052418fe85b186b0a39e7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Oct 2013 10:46:11 -0300
Subject: [PATCH 6465/6849] autossh: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in          |  1 +
 package/autossh/Config.in  |  8 ++++++++
 package/autossh/autossh.mk | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/autossh/Config.in
 create mode 100644 package/autossh/autossh.mk

diff --git a/package/Config.in b/package/Config.in
index 41d828ac37..7af6d420bd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -760,6 +760,7 @@ source "package/aiccu/Config.in"
 source "package/aircrack-ng/Config.in"
 source "package/argus/Config.in"
 source "package/arptables/Config.in"
+source "package/autossh/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
 source "package/bcusdk/Config.in"
diff --git a/package/autossh/Config.in b/package/autossh/Config.in
new file mode 100644
index 0000000000..e3acd8a7f7
--- /dev/null
+++ b/package/autossh/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_AUTOSSH
+	bool "autossh"
+	depends on BR2_USE_MMU # fork()
+	help
+	  autossh is a program to start a copy of ssh and monitor it,
+	  restarting it as necessary should it die or stop passing traffic.
+
+	  http://www.harding.motd.ca/autossh/
diff --git a/package/autossh/autossh.mk b/package/autossh/autossh.mk
new file mode 100644
index 0000000000..75d78928bd
--- /dev/null
+++ b/package/autossh/autossh.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# autossh
+#
+################################################################################
+
+AUTOSSH_VERSION = 1.4c
+AUTOSSH_SITE = http://www.harding.motd.ca/autossh
+AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz
+AUTOSSH_LICENSE = Modified BSD
+AUTOSSH_LICENSE_FILES = autossh.c
+
+define AUTOSSH_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/autossh $(TARGET_DIR)/usr/bin/autossh
+endef
+
+$(eval $(autotools-package))

From 9db8d874d5b44734dca0ee98eacd0aad8a9da00a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Oct 2013 10:47:15 -0300
Subject: [PATCH 6466/6849] snmppp: new package

[Peter: add comment about why AUTORECONF is needed]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in        |  1 +
 package/snmppp/Config.in | 12 ++++++++++++
 package/snmppp/snmppp.mk | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/snmppp/Config.in
 create mode 100644 package/snmppp/snmppp.mk

diff --git a/package/Config.in b/package/Config.in
index 7af6d420bd..0e6f86c0c3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -637,6 +637,7 @@ source "package/omniorb/Config.in"
 source "package/openpgm/Config.in"
 source "package/ortp/Config.in"
 source "package/slirp/Config.in"
+source "package/snmppp/Config.in"
 source "package/usbredir/Config.in"
 source "package/wvstreams/Config.in"
 source "package/zeromq/Config.in"
diff --git a/package/snmppp/Config.in b/package/snmppp/Config.in
new file mode 100644
index 0000000000..9757814b27
--- /dev/null
+++ b/package/snmppp/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_SNMPPP
+	bool "snmp++"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_OPENSSL
+	help
+	  SNMP++v3.x is a C++ API which supports SNMP v1, v2c, and v3.
+
+	  http://www.agentpp.com/snmp_pp3_x/snmp_pp3_x.html
+
+comment "snmp++ requires a toolchain with threads and C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk
new file mode 100644
index 0000000000..8e8fcebc14
--- /dev/null
+++ b/package/snmppp/snmppp.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# snmp++
+#
+################################################################################
+
+SNMPPP_VERSION = 3.3.0
+SNMPPP_SOURCE = snmp++v$(SNMPPP_VERSION).tar.gz
+SNMPPP_SITE = http://www.agentpp.com
+SNMPPP_DEPENDENCIES = openssl host-pkgconf
+SNMPPP_INSTALL_STAGING = YES
+# no configure script in tarball
+SNMPPP_AUTORECONF = YES
+SNMPPP_LICENSE = SNMP++
+SNMPPP_LICENSE_FILES = snmp_pp/snmp_pp.cpp
+
+$(eval $(autotools-package))

From 1c5ff4981c44bd933bf620f2c761133e14abe6dc Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Mon, 14 Oct 2013 20:24:31 +0200
Subject: [PATCH 6467/6849] support/kconfig: Fix typo in README.buildroot.

Fix typo in README.buildroot (s/config/kconfig/).

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/kconfig/README.buildroot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/kconfig/README.buildroot b/support/kconfig/README.buildroot
index d3d8613219..0e16e81076 100644
--- a/support/kconfig/README.buildroot
+++ b/support/kconfig/README.buildroot
@@ -3,12 +3,12 @@ to suit Buildroot.
 
 To update:
 	cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
-	cd support/config.new
+	cd support/kconfig.new
 	cp -a ../kconfig/patches ../kconfig/README.buildroot .
 	quilt push -a
 	# Fix any conflict
 	cd ..
-	rm -rf config
+	rm -rf kconfig
 	mv kconfig.new kconfig
 
 Then verify the toplevel targets work:

From 6d8998033fdbbcb513120f6ca5a1c9d2daf026ff Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 14 Oct 2013 19:13:27 +0200
Subject: [PATCH 6468/6849] weston: improve selection of compositor

The way the compositor was selected in Config.in was counter-intuitive,
because the fbdev backend is selected by default even if a different one
is available.

Instead, select the fbdev backend only if no other one was selected by
the user.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[yann.morin.1998@free.fr: don't reorder entries, keep alphabetical sort]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/Config.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index 4532c28a2d..2cd5ced060 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -14,6 +14,8 @@ config BR2_PACKAGE_WESTON
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
+	# Make sure at least one compositor is selected.
+	select BR2_PACKAGE_WESTON_FBDEV if !BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	help
 	  Weston is the reference implementation of a Wayland
 	  compositor, and a useful compositor in its own right.
@@ -24,17 +26,12 @@ config BR2_PACKAGE_WESTON
 
 if BR2_PACKAGE_WESTON
 
-# These two options make sure at least one compositor is selected.
+# Helper to make sure at least one compositor is selected.
 config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	bool
-config BR2_PACKAGE_WESTON_NEEDS_ONE_COMPOSITOR
-	def_bool y
-	depends on ! BR2_PACKAGE_WESTON_HAS_COMPOSITOR
-	select BR2_PACKAGE_WESTON_FBDEV
 
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
-	default y
 
 config BR2_PACKAGE_WESTON_RPI
 	bool "RPi compositor"

From 1d56d8a7f55442eeacad73c2085c7b3003d97be8 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Mon, 14 Oct 2013 19:13:28 +0200
Subject: [PATCH 6469/6849] weston: add missing toolchain comments

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[yann.morin.1998@free.fr: fix missing double-quote at end of comment]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/weston/Config.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/weston/Config.in b/package/weston/Config.in
index 2cd5ced060..b7f8468fb9 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -1,5 +1,5 @@
-comment "weston requires udev"
-	depends on !BR2_PACKAGE_UDEV
+comment "weston needs udev and a toolchain w/ threads"
+	depends on !BR2_PACKAGE_UDEV || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_WESTON
 	bool "weston"
@@ -33,6 +33,10 @@ config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 config BR2_PACKAGE_WESTON_FBDEV
 	bool "fbdev compositor"
 
+comment "RPi compositor needs a toolchain w/ C++, largefile, threads"
+	depends on BR2_arm
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_WESTON_RPI
 	bool "RPi compositor"
 	depends on BR2_arm                      # rpi-userland

From 82c44b3f0f530a8f5feabbf95009d7372dffebb8 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 14 Oct 2013 22:33:19 +0200
Subject: [PATCH 6470/6849] snmppp: adjust toolchain comment for new-style
 format

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/snmppp/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/snmppp/Config.in b/package/snmppp/Config.in
index 9757814b27..5d6d749b81 100644
--- a/package/snmppp/Config.in
+++ b/package/snmppp/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_SNMPPP
 
 	  http://www.agentpp.com/snmp_pp3_x/snmp_pp3_x.html
 
-comment "snmp++ requires a toolchain with threads and C++ support enabled"
+comment "snmp++ needs a toolchain w/ threads, C++"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From c3a832a7fb26fed8fd7834e96f09e3565b637f69 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Sun, 13 Oct 2013 16:55:31 +0200
Subject: [PATCH 6471/6849] manual: add section about depending on target and
 toolchain options

Currently, the comments in Config.in files when depending on toolchain
options are not at all lined up.  This patch adds a section to the
documentation that explains which format is to be used.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-directory.txt | 90 +++++++++++++++++++++--
 1 file changed, 82 insertions(+), 8 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index ca72970365..3ebe50e285 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -70,13 +70,9 @@ rules:
 
 * Use a +depends on+ type of dependency when the user really needs to
   be aware of the dependency. Typically, Buildroot uses this type of
-  dependency for dependencies on toolchain options (target
-  architecture, MMU support, C library, C++ support, large file
-  support, thread support, RPC support, IPV6 support, WCHAR support),
-  or for dependencies on "big" things, such as the X.org system. For
-  dependencies on toolchain options, there should be a +comment+ that
-  is displayed when the option is not
-  enabled, so that the user knows why the package is not available.
+  dependency for dependencies on target architecture, MMU support and
+  toolchain options (see xref:dependencies-target-toolchain-options[]),
+  or for dependencies on "big" things, such as the X.org system.
   The +depends on+ keyword expresses the dependency with a forward
   semantic.
 
@@ -101,7 +97,7 @@ config BR2_PACKAGE_ACL
 
           http://savannah.nongnu.org/projects/acl
 
-comment "acl requires a toolchain with LARGEFILE support"
+comment "acl needs a toolchain w/ largefile"
         depends on !BR2_LARGEFILE
 --------------------------
 
@@ -167,6 +163,84 @@ package.
 Further formatting details: see xref:writing-rules-config-in[the
 coding style].
 
+[[dependencies-target-toolchain-options]]
+Dependencies on target and toolchain options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Many packages depend on certain options of the toolchain: the choice of
+C library, C++ support, largefile support, thread support, RPC support,
+IPv6 support, wchar support, or dynamic library support. Some packages
+can only be built on certain target architectures, or if an MMU is
+available in the processor.
+These dependencies have to expressed with the appropriate 'depends on'
+statements in the Config.in file. Additionally, for dependencies on
+toolchain options, a +comment+ should be displayed when the option is
+not enabled, so that the user knows why the package is not available.
+Dependencies on target architecture or MMU support should not be
+made visible in a comment: since it is unlikely that the user can
+freely choose another target, it makes little sense to show these
+dependencies explicitly.
+
+The general format of a dependency +comment+ for package foo is:
+--------------------------
+foo needs a toolchain w/ featA, featB, featC
+--------------------------
+
+for example:
+--------------------------
+aircrack-ng needs a toolchain w/ largefile, threads
+--------------------------
+
+Note that this text is kept brief on purpose, so that it will fit on a
+80-character terminal.
+
+The rest of this section enumerates the different target and toolchain
+options, the corresponding config symbols to depend on, and the text to
+use in the comment.
+
+* Target architecture
+** Dependency symbol: +BR2_powerpc+, +BR2_mips+, ... (see +arch/Config.in+)
+** Comment string: no comment to be added
+
+* MMU support
+** Dependency symbol: +BR2_USE_MMU+
+** Comment string: no comment to be added
+
+* C library
+** Dependency symbol: +BR2_TOOLCHAIN_USES_GLIBC+,
++BR2_TOOLCHAIN_USES_UCLIBC+
+** Comment string: for the C library, a slightly different comment text
+   is used: +foo needs an (e)glibc toolchain+, or `foo needs an (e)glibc
+   toolchain w/ C++ support`
+
+* C++ support
+** Dependency symbol: +BR2_INSTALL_LIBSTDCPP+
+** Comment string: `C++`
+
+* largefile support
+** Dependency symbol: +BR2_LARGEFILE+
+** Comment string: +largefile+
+
+* thread support
+** Dependency symbol: +BR2_TOOLCHAIN_HAS_THREADS+
+** Comment string: +threads+
+
+* RPC support
+** Dependency symbol: +BR2_TOOLCHAIN_HAS_NATIVE_RPC+
+** Comment string: +RPC+
+
+* IPv6 support
+** Dependency symbol: +BR2_INET_IPV6+
+** Comment string: +IPv6+ (lowercase v)
+
+* wchar support
+** Dependency symbol: +BR2_USE_WCHAR+
+** Comment string: +wchar+
+
+* dynamic library
+** Dependency symbol: +!BR2_PREFER_STATIC_LIB+
+** Comment string: +dynamic library+
+
+
 The +.mk+ file
 ~~~~~~~~~~~~~~
 [[adding-packages-mk]]

From 66bb10b7b0b66fbce4100a42979056c2182bc1da Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Sun, 13 Oct 2013 16:55:32 +0200
Subject: [PATCH 6472/6849] Config.in files: unify comments of toolchain option
 dependencies

This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.ext.in                            |  2 +-
 package/acl/Config.in                          |  2 +-
 package/aiccu/Config.in                        |  2 +-
 package/aircrack-ng/Config.in                  |  2 +-
 package/alsa-lib/Config.in                     |  2 +-
 package/alsa-utils/Config.in                   |  4 ++--
 package/alsamixergui/Config.in                 |  2 +-
 package/atk/Config.in                          |  2 +-
 package/attr/Config.in                         |  2 +-
 package/audiofile/Config.in                    |  2 +-
 package/avahi/Config.in                        |  2 +-
 package/axel/Config.in                         |  2 +-
 package/bcusdk/Config.in                       |  2 +-
 package/beecrypt/Config.in                     |  4 ++--
 package/bellagio/Config.in                     |  2 +-
 package/bind/Config.in                         |  2 +-
 package/bison/Config.in                        |  2 +-
 package/blackbox/Config.in                     |  2 +-
 package/bluez_utils/Config.in                  |  4 ++--
 package/bmon/Config.in                         |  2 +-
 package/bonnie/Config.in                       |  2 +-
 package/boost/Config.in                        |  4 ++--
 package/bootutils/Config.in                    |  2 +-
 package/bustle/Config.in                       |  2 +-
 package/ccid/Config.in                         |  2 +-
 package/cdrkit/Config.in                       |  2 +-
 package/cegui06/Config.in                      |  2 +-
 package/civetweb/Config.in                     |  4 ++--
 package/classpath/Config.in                    |  2 +-
 package/collectd/Config.in                     |  4 ++--
 package/connman/Config.in                      |  2 +-
 package/conntrack-tools/Config.in              |  2 +-
 package/coreutils/Config.in                    |  2 +-
 package/cppcms/Config.in                       |  2 +-
 package/cppzmq/Config.in                       |  2 +-
 package/crda/Config.in                         |  2 +-
 package/cryptsetup/Config.in                   |  2 +-
 package/ctorrent/Config.in                     |  2 +-
 package/cups/Config.in                         |  2 +-
 package/curlftpfs/Config.in                    |  2 +-
 package/cvs/Config.in                          |  2 +-
 package/czmq/Config.in                         |  2 +-
 package/dbus-glib/Config.in                    |  2 +-
 package/dbus-python/Config.in                  |  2 +-
 package/dbus/Config.in                         |  2 +-
 package/dhcpcd/Config.in                       |  2 +-
 package/diffutils/Config.in                    |  2 +-
 package/directfb/Config.in                     |  2 +-
 package/dmraid/Config.in                       |  2 +-
 package/dnsmasq/Config.in                      |  2 +-
 package/docker/Config.in                       |  2 +-
 package/dosfstools/Config.in                   |  2 +-
 package/dropwatch/Config.in                    |  2 +-
 package/dstat/Config.in                        |  2 +-
 package/duma/Config.in                         |  2 +-
 package/dvb-apps/Config.in                     |  2 +-
 package/dvbsnoop/Config.in                     |  2 +-
 package/e2fsprogs/Config.in                    |  2 +-
 package/ebtables/Config.in                     |  2 +-
 package/efl/Config.in                          |  2 +-
 package/efl/expedite/Config.in                 |  2 +-
 package/efl/libedbus/Config.in                 |  4 ++--
 package/efl/libevas-generic-loaders/Config.in  |  2 +-
 package/elfutils/Config.in                     |  2 +-
 package/enchant/Config.in                      |  2 +-
 package/enlightenment/Config.in                |  2 +-
 package/exfat-utils/Config.in                  |  2 +-
 package/exfat/Config.in                        |  2 +-
 package/f2fs-tools/Config.in                   |  2 +-
 package/fbterm/Config.in                       |  2 +-
 package/fdk-aac/Config.in                      |  2 +-
 package/ffmpeg/Config.in                       |  2 +-
 package/filemq/Config.in                       |  2 +-
 package/findutils/Config.in                    |  2 +-
 package/flashbench/Config.in                   |  2 +-
 package/flex/Config.in                         |  2 +-
 package/fltk/Config.in                         |  2 +-
 package/fluxbox/Config.in                      |  2 +-
 package/foomatic-filters/Config.in             |  2 +-
 package/gadgetfs-test/Config.in                |  2 +-
 package/gamin/Config.in                        |  2 +-
 package/gawk/Config.in                         |  2 +-
 package/gdb/Config.in                          |  4 ++--
 package/gdk-pixbuf/Config.in                   |  2 +-
 package/genext2fs/Config.in                    |  2 +-
 package/gesftpserver/Config.in                 |  2 +-
 package/gettext/Config.in                      |  2 +-
 package/git/Config.in                          |  2 +-
 package/glib-networking/Config.in              |  2 +-
 package/glibmm/Config.in                       |  2 +-
 package/gmpc/Config.in                         |  2 +-
 package/gnuchess/Config.in                     |  2 +-
 package/gnutls/Config.in                       |  2 +-
 package/gob2/Config.in                         |  2 +-
 package/gperf/Config.in                        |  2 +-
 package/gpsd/Config.in                         |  2 +-
 package/gptfdisk/Config.in                     |  2 +-
 package/grep/Config.in                         |  2 +-
 package/gstreamer/gst-ffmpeg/Config.in         |  2 +-
 package/gstreamer/gst-plugins-bad/Config.in    |  8 ++++----
 package/gstreamer/gst-plugins-base/Config.in   |  2 +-
 package/gstreamer/gst-plugins-good/Config.in   |  6 +++---
 package/gstreamer/gstreamer/Config.in          |  2 +-
 package/gstreamer1/gst1-plugins-bad/Config.in  | 10 +++++-----
 package/gstreamer1/gst1-plugins-base/Config.in |  2 +-
 package/gstreamer1/gst1-plugins-good/Config.in |  6 +++---
 package/gstreamer1/gst1-plugins-ugly/Config.in |  2 +-
 package/gstreamer1/gstreamer1/Config.in        |  2 +-
 package/gtest/Config.in                        |  2 +-
 package/gutenprint/Config.in                   |  2 +-
 package/gvfs/Config.in                         |  2 +-
 package/gzip/Config.in                         |  2 +-
 package/harfbuzz/Config.in                     |  2 +-
 package/hdparm/Config.in                       |  2 +-
 package/hiawatha/Config.in                     |  2 +-
 package/hostapd/Config.in                      |  2 +-
 package/hplip/Config.in                        |  2 +-
 package/icu/Config.in                          |  2 +-
 package/iftop/Config.in                        |  2 +-
 package/igmpproxy/Config.in                    |  2 +-
 package/inotify-tools/Config.in                |  2 +-
 package/iperf/Config.in                        |  2 +-
 package/ipset/Config.in                        |  2 +-
 package/iw/Config.in                           |  2 +-
 package/jamvm/Config.in                        |  2 +-
 package/jhead/Config.in                        |  2 +-
 package/json-glib/Config.in                    |  2 +-
 package/kismet/Config.in                       |  2 +-
 package/latencytop/Config.in                   |  2 +-
 package/lcdapi/Config.in                       |  2 +-
 package/libarchive/Config.in                   |  2 +-
 package/libbsd/Config.in                       |  2 +-
 package/libcec/Config.in                       |  2 +-
 package/libcgicc/Config.in                     |  2 +-
 package/libcgroup/Config.in                    |  2 +-
 package/libdrm/Config.in                       |  2 +-
 package/libdvbsi/Config.in                     |  2 +-
 package/libdvdnav/Config.in                    |  2 +-
 package/libdvdread/Config.in                   |  2 +-
 package/libebml/Config.in                      |  2 +-
 package/libedit/Config.in                      |  2 +-
 package/libfreefare/Config.in                  |  2 +-
 package/libftdi/Config.in                      |  2 +-
 package/libfuse/Config.in                      |  2 +-
 package/libgail/Config.in                      |  2 +-
 package/libglade/Config.in                     |  2 +-
 package/libglib2/Config.in                     |  2 +-
 package/libgtk2/Config.in                      |  2 +-
 package/libhid/Config.in                       |  2 +-
 package/libical/Config.in                      |  2 +-
 package/libiqrf/Config.in                      |  2 +-
 package/libjson/Config.in                      |  2 +-
 package/liblo/Config.in                        |  2 +-
 package/libmatroska/Config.in                  |  2 +-
 package/libmicrohttpd/Config.in                |  4 ++--
 package/libmms/Config.in                       |  2 +-
 package/libmnl/Config.in                       |  2 +-
 package/libmpd/Config.in                       |  2 +-
 package/libnetfilter_acct/Config.in            |  2 +-
 package/libnetfilter_conntrack/Config.in       |  2 +-
 package/libnetfilter_cthelper/Config.in        |  2 +-
 package/libnetfilter_cttimeout/Config.in       |  2 +-
 package/libnetfilter_queue/Config.in           |  2 +-
 package/libnfc/Config.in                       |  2 +-
 package/libnl/Config.in                        |  2 +-
 package/libnspr/Config.in                      |  2 +-
 package/libnss/Config.in                       |  2 +-
 package/liboping/Config.in                     |  2 +-
 package/libplayer/Config.in                    |  4 ++--
 package/libqmi/Config.in                       |  2 +-
 package/libraw/Config.in                       |  2 +-
 package/libroxml/Config.in                     |  2 +-
 package/librsvg/Config.in                      |  2 +-
 package/libsecret/Config.in                    |  2 +-
 package/libserial/Config.in                    |  2 +-
 package/libsigc/Config.in                      |  2 +-
 package/libsndfile/Config.in                   |  2 +-
 package/libsoc/Config.in                       |  2 +-
 package/libsoup/Config.in                      |  2 +-
 package/libtirpc/Config.in                     |  2 +-
 package/libtorrent/Config.in                   |  2 +-
 package/libunwind/Config.in                    |  2 +-
 package/libupnp/Config.in                      |  2 +-
 package/liburcu/Config.in                      |  2 +-
 package/libusb/Config.in                       |  2 +-
 package/libv4l/Config.in                       |  8 ++++----
 package/libxmlpp/Config.in                     |  2 +-
 package/linknx/Config.in                       |  2 +-
 package/linphone/Config.in                     |  2 +-
 package/linux-pam/Config.in                    |  2 +-
 package/live555/Config.in                      |  2 +-
 package/lmbench/Config.in                      |  2 +-
 package/log4cxx/Config.in                      |  2 +-
 package/logrotate/Config.in                    |  2 +-
 package/lshw/Config.in                         |  2 +-
 package/ltp-testsuite/Config.in                |  2 +-
 package/lttng-babeltrace/Config.in             |  2 +-
 package/lttng-libust/Config.in                 |  4 ++--
 package/lttng-tools/Config.in                  |  2 +-
 package/lvm2/Config.in                         |  2 +-
 package/lxc/Config.in                          |  2 +-
 package/lzma/Config.in                         |  2 +-
 package/m4/Config.in                           |  2 +-
 package/mediastreamer/Config.in                |  2 +-
 package/memtester/Config.in                    |  2 +-
 package/midori/Config.in                       |  2 +-
 package/minicom/Config.in                      |  2 +-
 package/minidlna/Config.in                     |  2 +-
 package/mongoose/Config.in                     |  2 +-
 package/monit/Config.in                        |  2 +-
 package/mpd/Config.in                          |  6 +++---
 package/mplayer/Config.in                      |  2 +-
 package/msgpack/Config.in                      |  2 +-
 package/mtd/Config.in                          |  4 ++--
 package/mtdev2tuio/Config.in                   |  2 +-
 package/mutt/Config.in                         |  2 +-
 package/mysql_client/Config.in                 |  2 +-
 package/nbd/Config.in                          |  2 +-
 package/ndisc6/Config.in                       |  2 +-
 package/neard/Config.in                        |  2 +-
 package/neardal/Config.in                      |  2 +-
 package/netatalk/Config.in                     |  2 +-
 package/netkitbase/Config.in                   |  2 +-
 package/netkittelnet/Config.in                 |  2 +-
 package/network-manager/Config.in              |  2 +-
 package/nfacct/Config.in                       |  2 +-
 package/nfs-utils/Config.in                    |  2 +-
 package/nmap/Config.in                         |  2 +-
 package/nodejs/Config.in                       |  2 +-
 package/ntfs-3g/Config.in                      |  2 +-
 package/numactl/Config.in                      |  2 +-
 package/ocrad/Config.in                        |  2 +-
 package/ofono/Config.in                        |  2 +-
 package/ola/Config.in                          |  2 +-
 package/olsr/Config.in                         |  2 +-
 package/omniorb/Config.in                      |  2 +-
 package/opencv/Config.in                       |  8 ++++----
 package/openobex/Config.in                     |  6 +++---
 package/openocd/Config.in                      |  2 +-
 package/openpgm/Config.in                      |  2 +-
 package/openpowerlink/Config.in                |  2 +-
 package/openvpn/Config.in                      |  2 +-
 package/oprofile/Config.in                     |  2 +-
 package/orc/Config.in                          |  2 +-
 package/ortp/Config.in                         |  2 +-
 package/p11-kit/Config.in                      |  2 +-
 package/pango/Config.in                        |  2 +-
 package/parted/Config.in                       |  2 +-
 package/patch/Config.in                        |  2 +-
 package/pcmanfm/Config.in                      |  2 +-
 package/pcsc-lite/Config.in                    |  2 +-
 package/perf/Config.in                         |  2 +-
 package/php/Config.ext                         |  6 +++---
 package/pkg-config/Config.in                   |  2 +-
 package/poco/Config.in                         |  2 +-
 package/polkit/Config.in                       |  2 +-
 package/poppler/Config.in                      |  2 +-
 package/portaudio/Config.in                    |  2 +-
 package/portmap/Config.in                      |  2 +-
 package/pppd/Config.in                         |  2 +-
 package/protobuf-c/Config.in                   |  2 +-
 package/protobuf/Config.in                     |  2 +-
 package/proxychains-ng/Config.in               |  2 +-
 package/psplash/Config.in                      |  2 +-
 package/pulseaudio/Config.in                   |  2 +-
 package/python-nfc/Config.in                   |  2 +-
 package/python-pyzmq/Config.in                 |  2 +-
 package/python/Config.in                       |  2 +-
 package/python3/Config.in                      |  2 +-
 package/qt/Config.in                           |  4 ++--
 package/qt5/Config.in                          |  2 +-
 package/quagga/Config.in                       |  2 +-
 package/quota/Config.in                        |  2 +-
 package/radvd/Config.in                        |  2 +-
 package/redis/Config.in                        |  2 +-
 package/rpcbind/Config.in                      |  2 +-
 package/rpi-userland/Config.in                 |  2 +-
 package/rpm/Config.in                          |  4 ++--
 package/rrdtool/Config.in                      |  2 +-
 package/rt-tests/Config.in                     |  2 +-
 package/rtorrent/Config.in                     |  2 +-
 package/ruby/Config.in                         |  2 +-
 package/samba/Config.in                        |  2 +-
 package/schifra/Config.in                      |  2 +-
 package/sconeserver/Config.in                  |  2 +-
 package/sed/Config.in                          |  2 +-
 package/ser2net/Config.in                      |  2 +-
 package/sg3_utils/Config.in                    |  2 +-
 package/shared-mime-info/Config.in             |  2 +-
 package/smartmontools/Config.in                |  2 +-
 package/snappy/Config.in                       |  2 +-
 package/snowball-init/Config.in                |  2 +-
 package/socat/Config.in                        |  2 +-
 package/socketcand/Config.in                   |  2 +-
 package/spice/Config.in                        |  2 +-
 package/sqlcipher/Config.in                    |  2 +-
 package/squashfs/Config.in                     |  2 +-
 package/squashfs3/Config.in                    |  2 +-
 package/squid/Config.in                        |  2 +-
 package/sshfs/Config.in                        |  2 +-
 package/strongswan/Config.in                   |  2 +-
 package/synergy/Config.in                      |  2 +-
 package/sysklogd/Config.in                     |  2 +-
 package/sysprof/Config.in                      |  2 +-
 package/systemd/Config.in                      |  2 +-
 package/taglib/Config.in                       |  2 +-
 package/tar/Config.in                          |  2 +-
 package/ti-utils/Config.in                     |  2 +-
 package/trace-cmd/Config.in                    |  2 +-
 package/transmission/Config.in                 |  6 +++---
 package/tree/Config.in                         |  2 +-
 package/tstools/Config.in                      |  2 +-
 package/tvheadend/Config.in                    |  2 +-
 package/udev/Config.in                         |  2 +-
 package/udisks/Config.in                       |  2 +-
 package/udpcast/Config.in                      |  2 +-
 package/ulogd/Config.in                        |  2 +-
 package/unionfs/Config.in                      |  2 +-
 package/urg/Config.in                          |  2 +-
 package/usb_modeswitch/Config.in               |  2 +-
 package/usb_modeswitch_data/Config.in          |  2 +-
 package/usbredir/Config.in                     |  2 +-
 package/usbutils/Config.in                     |  2 +-
 package/ushare/Config.in                       |  2 +-
 package/ussp-push/Config.in                    |  2 +-
 package/util-linux/Config.in                   |  4 ++--
 package/vala/Config.in                         |  2 +-
 package/wayland/Config.in                      |  2 +-
 package/webkit/Config.in                       |  2 +-
 package/webrtc-audio-processing/Config.in      |  2 +-
 package/wget/Config.in                         |  2 +-
 package/wireshark/Config.in                    |  2 +-
 package/wvdial/Config.in                       |  2 +-
 package/wvstreams/Config.in                    |  2 +-
 package/x11r7/Config.in                        |  2 +-
 package/x11r7/xapp_xinput-calibrator/Config.in |  2 +-
 package/x11r7/xlib_libpciaccess/Config.in      |  2 +-
 package/x11r7/xserver_xorg-server/Config.in    |  2 +-
 package/xenomai/Config.in                      |  2 +-
 package/xerces/Config.in                       |  2 +-
 package/xfsprogs/Config.in                     |  2 +-
 package/xscreensaver/Config.in                 |  2 +-
 package/zeromq/Config.in                       |  2 +-
 package/zmqpp/Config.in                        |  4 ++--
 package/zxing/Config.in                        |  2 +-
 package/zyre/Config.in                         |  2 +-
 system/Config.in                               |  4 ++--
 347 files changed, 389 insertions(+), 389 deletions(-)

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 70f3e32d7f..b93f63e120 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -16,7 +16,7 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
 	  ARM, 2.6.35.9, 2.6.37.6, 2.6.38.8, on NIOS2, 2.6.35, on
 	  PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8.
 
-comment "xenomai requires thread support in toolchain"
+comment "xenomai needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
diff --git a/package/acl/Config.in b/package/acl/Config.in
index f3d10d5a2f..73ceb7245e 100644
--- a/package/acl/Config.in
+++ b/package/acl/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_ACL
 
 	  http://savannah.nongnu.org/projects/acl
 
-comment "acl requires a toolchain with LARGEFILE support"
+comment "acl needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index 9cff8ccb23..e044540e7c 100644
--- a/package/aiccu/Config.in
+++ b/package/aiccu/Config.in
@@ -19,5 +19,5 @@ config BR2_PACKAGE_AICCU
 
 	  http://www.sixxs.net/tools/aiccu/
 
-comment "aiccu requires a toolchain with IPv6, WCHAR and thread support"
+comment "aiccu needs a toolchain w/ IPv6, wchar, threads"
 	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
index ee887aed0f..ede1ca5ae1 100644
--- a/package/aircrack-ng/Config.in
+++ b/package/aircrack-ng/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_AIRCRACK_NG
 
 	  http://www.aircrack-ng.org/
 
-comment "aircrack-ng needs a toolchain with largefile and threads support"
+comment "aircrack-ng needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 2ba688681e..df05240423 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_ALSA_LIB
 
 	  http://www.alsa-project.org/
 
-comment "alsa-lib needs threads support in toolchain"
+comment "alsa-lib needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 if BR2_PACKAGE_ALSA_LIB
diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
index 4bc12049e8..db9f00708f 100644
--- a/package/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_ALSA_UTILS
 
 	  http://www.alsa-project.org/
 
-comment "alsa-utils requires a toolchain with LARGEFILE and threads support"
+comment "alsa-utils needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 if BR2_PACKAGE_ALSA_UTILS
@@ -32,7 +32,7 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
 	depends on BR2_USE_WCHAR
 	default y
 
-comment "alsamixer requires a toolchain with WCHAR support"
+comment "alsamixer needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 config BR2_PACKAGE_ALSA_UTILS_AMIDI
diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
index 39809d9193..acc3cc9fc7 100644
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_ALSAMIXERGUI
 
 	  http://www.iua.upf.es/~mdeboer/projects/alsamixergui/
 
-comment "alsamixergui requires a toolchain with C++ and threads support enabled"
+comment "alsamixergui needs a toolchain w/ C++, threads"
 	depends on (!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS) && BR2_PACKAGE_XORG7
diff --git a/package/atk/Config.in b/package/atk/Config.in
index 7dec8b89fe..e2707e5fea 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_ATK
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
 
-comment "atk requires a toolchain with WCHAR and threading support"
+comment "atk needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/attr/Config.in b/package/attr/Config.in
index 79f2336807..db229de51f 100644
--- a/package/attr/Config.in
+++ b/package/attr/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_ATTR
 
 	  http://savannah.nongnu.org/projects/attr
 
-comment "attr requires a toolchain with LARGEFILE support"
+comment "attr needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/audiofile/Config.in b/package/audiofile/Config.in
index 4f9952c315..4aa8d69c87 100644
--- a/package/audiofile/Config.in
+++ b/package/audiofile/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_AUDIOFILE
 
 	  http://www.68k.org/~michael/audiofile/
 
-comment "audiofile requires a toolchain with C++ support enabled"
+comment "audiofile needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index c6af67e525..4411fe33be 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -36,5 +36,5 @@ config BR2_PACKAGE_AVAHI_DAEMON
 
 endif
 
-comment "avahi requires a toolchain with thread support"
+comment "avahi needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/axel/Config.in b/package/axel/Config.in
index d8232725c2..aa93f2a11f 100644
--- a/package/axel/Config.in
+++ b/package/axel/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_AXEL
 
 	  http://axel.alioth.debian.org/
 
-comment "axel needs a toolchain with thread support"
+comment "axel needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bcusdk/Config.in b/package/bcusdk/Config.in
index c9a1947ebd..a64a2bfc0f 100644
--- a/package/bcusdk/Config.in
+++ b/package/bcusdk/Config.in
@@ -19,5 +19,5 @@ config BR2_PACKAGE_BCUSDK
 
 	  http://www.auto.tuwien.ac.at/~mkoegler/eib/
 
-comment "bcusdk requires a toolchain with C++ support"
+comment "bcusdk needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index 19c7f2fe1d..caa6d1784a 100644
--- a/package/beecrypt/Config.in
+++ b/package/beecrypt/Config.in
@@ -7,8 +7,8 @@ config BR2_PACKAGE_BEECRYPT
 
 	  http://beecrypt.sf.net
 
-comment "beecrypt needs a toolchain with thread support"
+comment "beecrypt needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-comment "beecrypt C++ support requires a toolchain with WCHAR enabled"
+comment "beecrypt C++ support needs a toolchain w/ wchar"
 	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bellagio/Config.in b/package/bellagio/Config.in
index 921cc38fcc..e3da4323c6 100644
--- a/package/bellagio/Config.in
+++ b/package/bellagio/Config.in
@@ -17,5 +17,5 @@ config BR2_PACKAGE_BELLAGIO
 
 	  http://omxil.sourceforge.net/
 
-comment "bellagio requires a toolchain with C++, threads and dynamic library support enabled"
+comment "bellagio needs a toolchain w/ C++, threads, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/bind/Config.in b/package/bind/Config.in
index 2944f1ffea..08af624be3 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -39,5 +39,5 @@ config BR2_PACKAGE_BIND_TOOLS
 
 endif
 
-comment "bind requires a toolchain with LARGEFILE and IPV6 support"
+comment "bind needs a toolchain w/ largefile, IPv6"
 	depends on !(BR2_LARGEFILE || BR2_INET_IPV6)
diff --git a/package/bison/Config.in b/package/bison/Config.in
index 1a485c4061..4a50f41bf8 100644
--- a/package/bison/Config.in
+++ b/package/bison/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_BISON
 
 	  http://www.gnu.org/software/bison/
 
-comment "bison requires a toolchain with WCHAR support"
+comment "bison needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index c183133e99..54f8218e31 100644
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_BLACKBOX
 
 	  http://blackboxwm.sourceforge.net/
 
-comment "blackbox requires a toolchain with C++ support enabled"
+comment "blackbox needs a toolchain w/ C++"
 	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 570ba75255..33fcbd667e 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -26,7 +26,7 @@ config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
 	help
 	  Audio support
 
-comment "bluez-utils audio requires a toolchain with LARGEFILE support"
+comment "bluez-utils audio needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
 
 config BR2_PACKAGE_BLUEZ_UTILS_USB
@@ -38,5 +38,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
 
 endif
 
-comment "bluez-utils require a toolchain with WCHAR and threading support"
+comment "bluez-utils needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bmon/Config.in b/package/bmon/Config.in
index 61d72f0b45..a4abd92e2c 100644
--- a/package/bmon/Config.in
+++ b/package/bmon/Config.in
@@ -5,5 +5,5 @@ config BR2_PACKAGE_BMON
 	help
 	  Linux bandwidth monitor
 
-comment "bmon requires a toolchain with IPv6 support"
+comment "bmon needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/bonnie/Config.in b/package/bonnie/Config.in
index 91b1e96b5a..3575bc107c 100644
--- a/package/bonnie/Config.in
+++ b/package/bonnie/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_BONNIE
 
 	  http://www.coker.com.au/bonnie++/
 
-comment "bonnie++ requires a toolchain with C++ support enabled"
+comment "bonnie++ needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/boost/Config.in b/package/boost/Config.in
index 912717ad3b..17390c0150 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -1,4 +1,4 @@
-comment "boost requires a toolchain with C++, large file and thread support enabled"
+comment "boost needs a toolchain w/ C++, largefile, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_BOOST
@@ -48,7 +48,7 @@ config BR2_PACKAGE_BOOST_LOCALE
 	depends on BR2_USE_WCHAR
 	bool "boost-locale"
 
-comment "boost-locale requires a toolchain with wchar support"
+comment "boost-locale needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 config BR2_PACKAGE_BOOST_MATH
diff --git a/package/bootutils/Config.in b/package/bootutils/Config.in
index 06a8fd8e02..192089e312 100644
--- a/package/bootutils/Config.in
+++ b/package/bootutils/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_BOOTUTILS
 
 	  http://bootutils.pr.linuxrulz.org/
 
-comment "bootutils requires a toolchain with LARGEFILE support"
+comment "bootutils needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
index 704165ddfa..6799f1f06b 100644
--- a/package/bustle/Config.in
+++ b/package/bustle/Config.in
@@ -19,5 +19,5 @@ config BR2_PACKAGE_BUSTLE
 
 	  http://www.willthompson.co.uk/bustle/
 
-comment "bustle requires a toolchain with WCHAR support and threading support"
+comment "bustle needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ccid/Config.in b/package/ccid/Config.in
index c85a71c3e0..9f8efca8ec 100644
--- a/package/ccid/Config.in
+++ b/package/ccid/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_CCID
 
 	  http://pcsclite.alioth.debian.org/ccid.html
 
-comment "ccid needs a toolchain with thread support"
+comment "ccid needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
index dfe3811259..b2cd785ba9 100644
--- a/package/cdrkit/Config.in
+++ b/package/cdrkit/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_CDRKIT
 
 	  http://www.cdrkit.org/
 
-comment "cdrkit requires a toolchain with LARGEFILE support"
+comment "cdrkit needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/cegui06/Config.in b/package/cegui06/Config.in
index 5ce9700da4..410447230a 100644
--- a/package/cegui06/Config.in
+++ b/package/cegui06/Config.in
@@ -1,4 +1,4 @@
-comment "cegui06 needs a toolchain with C++ and threads"
+comment "cegui06 needs a toolchain w/ C++, threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_CEGUI06
diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
index 55c138ad29..86e824207d 100644
--- a/package/civetweb/Config.in
+++ b/package/civetweb/Config.in
@@ -18,10 +18,10 @@ config BR2_CIVETWEB_WITH_LUA
 	  version of Lua and Sqlite bundled within the Civetweb
 	  sources, and not the packages from Buildroot.
 
-comment "Lua support requires largefile support in toolchain"
+comment "Lua support needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
 
 endif
 
-comment "civetweb requires a toolchain with PTHREAD support"
+comment "civetweb needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/classpath/Config.in b/package/classpath/Config.in
index 45d598498a..7aa93a051a 100644
--- a/package/classpath/Config.in
+++ b/package/classpath/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_CLASSPATH
 
 	  http://classpath.org
 
-comment "classpath requires a toolchain with IPV6 support"
+comment "classpath needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index da65053234..2059198d10 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -403,7 +403,7 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL
 	help
 	  Writes values to RRD-files.
 
-comment "rrdtool support requires a toolchain with WCHAR support"
+comment "rrdtool support needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 config BR2_PACKAGE_COLLECTD_RIEMANN
@@ -429,6 +429,6 @@ endmenu
 
 endif
 
-comment "collectd needs a toolchain with IPv6 and thread support"
+comment "collectd needs a toolchain w/ IPv6, threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
 	depends on BR2_USE_MMU
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 0853941d4d..c74618aef6 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -49,6 +49,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain with IPv6, WCHAR, threading and resolver support"
+comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver"
 	depends on BR2_UCLIBC_VERSION_0_9_32 || \
 		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index 64f18feefc..5a9d0ea9e7 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -17,7 +17,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
 	  http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools requires a toolchain with IPV6, LARGEFILE and threading support"
+comment "conntrack-tools needs a toolchain w/ IPv6, largefile, threads"
 	depends on !BR2_INET_IPV6 || \
 		!BR2_LARGEFILE || \
 		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
index c416ab1d45..206b85ab50 100644
--- a/package/coreutils/Config.in
+++ b/package/coreutils/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_COREUTILS
 
 	  http://www.gnu.org/software/coreutils/
 
-comment "coreutils requires a toolchain with WCHAR support"
+comment "coreutils needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index 14fd974103..4074711b08 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -28,5 +28,5 @@ config BR2_PACKAGE_CPPCMS_ICU
 	  Using ICU allows advanced localization features into CppCMS,
 	  in another hand ICU is heavier than iconv.
 
-comment "cppcms requires a glibc toolchain with C++ support"
+comment "cppcms needs a glibc toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in
index 72f0238fe1..9629383f2d 100644
--- a/package/cppzmq/Config.in
+++ b/package/cppzmq/Config.in
@@ -11,6 +11,6 @@ config BR2_PACKAGE_CPPZMQ
 
 	  http://github.com/zeromq/cppzmq
 
-comment "cppzmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+comment "cppzmq needs a toolchain w/ C++, IPv6, largefile, wchar"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/crda/Config.in b/package/crda/Config.in
index 539a5c7aee..e56a45ef66 100644
--- a/package/crda/Config.in
+++ b/package/crda/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_CRDA
 
 	  http://linuxwireless.org/en/developers/Regulatory/CRDA
 
-comment "crda requires a toolchain with thread support"
+comment "crda needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index a8dffc6d46..71faa4888e 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_CRYPTSETUP
 
 	  https://code.google.com/p/cryptsetup/
 
-comment "cryptsetup needs largefile and wchar support in toolchain"
+comment "cryptsetup needs a toolchain w/ largefile, wchar"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
index 5e26c1276d..97552e7841 100644
--- a/package/ctorrent/Config.in
+++ b/package/ctorrent/Config.in
@@ -1,4 +1,4 @@
-comment "ctorrent requires a toolchain with C++ support enabled"
+comment "ctorrent needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_CTORRENT
diff --git a/package/cups/Config.in b/package/cups/Config.in
index dc1c2ed700..3703d4e26c 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_CUPS_PDFTOPS
        help
          Enable pdftops support
 
-comment "pdftops support requires a toolchain with C++ support enabled"
+comment "pdftops support needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 endif
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index ac527da213..4c5ab8a9fe 100644
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -17,5 +17,5 @@ config BR2_PACKAGE_CURLFTPFS
 
 	  http://curlftpfs.sourceforge.net/
 
-comment "curlftpfs requires a toolchain with LARGEFILE, WCHAR, threading and dynamic library support"
+comment "curlftpfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/cvs/Config.in b/package/cvs/Config.in
index 2308144046..65829d0ef9 100644
--- a/package/cvs/Config.in
+++ b/package/cvs/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_CVS_SERVER
 	help
 	  Enable cvs server code
 
-comment "cvs requires a toolchain with WCHAR support"
+comment "cvs needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index 0f16c2e2f4..9ba5e65c3f 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -15,6 +15,6 @@ config BR2_PACKAGE_CZMQ
 
 	  http://czmq.zeromq.org/
 
-comment "czmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
+comment "czmq needs a toolchain w/ C++, IPv6, largefile, wchar"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index b019b34383..ea8c3f24dc 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -9,6 +9,6 @@ config BR2_PACKAGE_DBUS_GLIB
 
 	  http://www.freedesktop.org/software/dbus
 
-comment "dbus-glib requires a toolchain with WCHAR and threading support"
+comment "dbus-glib needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_DBUS && \
 		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 61e81e7fde..113ca68f38 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_DBUS_PYTHON
 
 	  http://dbus.freedesktop.org/doc/dbus-python/
 
-comment "dbus-python requires a toolchain with WCHAR and threading support"
+comment "dbus-python needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && \
 		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 62f3eee72d..3cb47b873f 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -27,5 +27,5 @@ choice
 
 endchoice
 
-comment "dbus requires a toolchain with thread support"
+comment "dbus needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
index a06a9730e5..dbde548db0 100644
--- a/package/dhcpcd/Config.in
+++ b/package/dhcpcd/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_DHCPCD
 
 	  http://roy.marples.name/downloads/dhcpcd
 
-comment "dhcpcd requires a toolchain with IPV6 support"
+comment "dhcpcd needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
index 7b2c9f909b..f483c75417 100644
--- a/package/diffutils/Config.in
+++ b/package/diffutils/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_DIFFUTILS
 
 	  http://www.gnu.org/software/diffutils/diffutils.html
 
-comment "diffutils requires a toolchain with WCHAR support"
+comment "diffutils needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 4712db0be6..38daa3a9ff 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -125,5 +125,5 @@ config BR2_PACKAGE_DIRECTFB_TESTS
 
 endif # BR2_PACKAGE_DIRECTFB
 
-comment "directfb needs a toolchain with C++ and thread support"
+comment "directfb needs a toolchain w/ C++, threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
index 641b17fdd9..b7159d9977 100644
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_DMRAID
 	  dmraid uses the Linux device-mapper to create devices with
 	  respective mappings for the ATARAID sets discovered.
 
-comment "dmraid requires a toolchain with LARGEFILE support"
+comment "dmraid needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index a078145233..6158b107a0 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -42,7 +42,7 @@ config BR2_PACKAGE_DNSMASQ_CONNTRACK
 	help
 	  Enable DNS query connection marking in netfilter.
 
-comment "conntrack marking support requires a toolchain with LARGEFILE support"
+comment "conntrack marking support needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
 
 endif
diff --git a/package/docker/Config.in b/package/docker/Config.in
index 866ffcf829..fa89757d56 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_DOCKER
 
 	  http://icculus.org/openbox/2/docker
 
-comment "docker requires a toolchain with WCHAR and threading support"
+comment "docker needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_XORG7 && \
 		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in
index ec2f89169d..43051ec32d 100644
--- a/package/dosfstools/Config.in
+++ b/package/dosfstools/Config.in
@@ -27,5 +27,5 @@ config BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT
 
 endif
 
-comment "dosfstools requires a toolchain with LARGEFILE and WCHAR support"
+comment "dosfstools needs a toolchain w/ largefile, wchar"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
index ef9a20d046..68dab2046b 100644
--- a/package/dropwatch/Config.in
+++ b/package/dropwatch/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_DROPWATCH
 
 	  https://fedorahosted.org/dropwatch/
 
-comment "dropwatch requires threading support in toolchain"
+comment "dropwatch needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dstat/Config.in b/package/dstat/Config.in
index 5b8df23c42..b5edfaeae1 100644
--- a/package/dstat/Config.in
+++ b/package/dstat/Config.in
@@ -20,5 +20,5 @@ config BR2_PACKAGE_DSTAT
 
 	  http://dag.wieers.com/home-made/dstat/
 
-comment "dstat requires a toolchain with WCHAR support"
+comment "dstat needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/duma/Config.in b/package/duma/Config.in
index d233062b0a..e9cc9b2fd7 100644
--- a/package/duma/Config.in
+++ b/package/duma/Config.in
@@ -16,5 +16,5 @@ config BR2_PACKAGE_DUMA_NO_LEAKDETECTION
 
 endif # BR2_PACKAGE_DUMA
 
-comment "duma requires C++ and thread support in toolchain"
+comment "duma needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index a77064e14f..393ee5bd8e 100644
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_DVB_APPS
 
 if BR2_PACKAGE_DVB_APPS
 
-comment "dvb-apps utils needs a toolchain with LARGEFILE and THREADS support"
+comment "dvb-apps utils needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_DVB_APPS_UTILS
diff --git a/package/dvbsnoop/Config.in b/package/dvbsnoop/Config.in
index f21191ad41..9ead941d2b 100644
--- a/package/dvbsnoop/Config.in
+++ b/package/dvbsnoop/Config.in
@@ -21,5 +21,5 @@ config BR2_PACKAGE_DVBSNOOP
 	  http://dvbsnoop.sourceforge.net
 	  http://en.wikipedia.org/wiki/DBox2
 
-comment "dvbsnoop requires a toolchain with LARGEFILE support"
+comment "dvbsnoop needs a toolchain w/ largefile"
         depends on !BR2_LARGEFILE
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index d4f4405331..16d367106c 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -94,5 +94,5 @@ config BR2_PACKAGE_E2FSPROGS_UUIDGEN
 
 endif
 
-comment "e2fsprogs requires a toolchain with LARGEFILE + WCHAR support"
+comment "e2fsprogs needs a toolchain w/ largefile, wchar"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
index ce672851b3..24f39ac9a7 100644
--- a/package/ebtables/Config.in
+++ b/package/ebtables/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_EBTABLES
 
 	  http://ebtables.sourceforge.net
 
-comment "ebtables requires a toolchain with IPv6 support"
+comment "ebtables needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/efl/Config.in b/package/efl/Config.in
index bb1a986cb5..36afd1aa2e 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -24,5 +24,5 @@ source "package/efl/libedbus/Config.in"
 
 endif # BR2_PACKAGE_EFL
 
-comment "EFL requires WCHAR support in toolchain"
+comment "EFL needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/efl/expedite/Config.in b/package/efl/expedite/Config.in
index 9e131f3777..466fd7d2d6 100644
--- a/package/efl/expedite/Config.in
+++ b/package/efl/expedite/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_EXPEDITE
 	  DirectFB and so on. Its tests are quite extensive, trying to
 	  reproduce real world usage cases.
 
-comment "expedite requires C++ support in toolchain"
+comment "expedite needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 31a3b03740..500e8373a5 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBEDBUS_BLUEZ
 	help
 	  Bluetooth support.
 
-comment "bluez support requires a toolchain with WCHAR and threading support"
+comment "bluez support needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
@@ -39,5 +39,5 @@ config BR2_PACKAGE_LIBEDBUS_NOTIFY
 
 endif
 
-comment "libedbus requires a toolchain with thread support"
+comment "libedbus needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
index 53637944bc..23b9f77e8b 100644
--- a/package/efl/libevas-generic-loaders/Config.in
+++ b/package/efl/libevas-generic-loaders/Config.in
@@ -20,7 +20,7 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 	help
 	  This option enables the Evas generic SVG loader
 
-comment "SVG loader requires a toolchain with WCHAR, threading and C++ support"
+comment "SVG loader needs a toolchain w/ wchar, threads, C++"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
 endif
diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index c6a2b84852..47cd63d797 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -1,4 +1,4 @@
-comment "elfutils requires a toolchain with LARGEFILE and WCHAR support"
+comment "elfutils needs a toolchain w/ largefile, wchar"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_ELFUTILS
diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 783c73ea0d..102fb02b82 100644
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_ENCHANT
 
 	  http://www.abisource.com/projects/enchant/
 
-comment "enchant requires a toolchain with C++, threading and WCHAR support enabled"
+comment "enchant needs a toolchain w/ C++, threads, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index f86f271a8c..54c0ac670e 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -35,6 +35,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
 
 	  http://www.enlightenment.org/
 
-comment "enlightenment requires WCHAR, C++ and thread support in toolchain"
+comment "enlightenment needs a toolchain w/ wchar, C++, threads"
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/exfat-utils/Config.in b/package/exfat-utils/Config.in
index 1fc68be8a6..e5c03389bd 100644
--- a/package/exfat-utils/Config.in
+++ b/package/exfat-utils/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_EXFAT_UTILS
 
 	  http://code.google.com/p/exfat/
 
-comment "exfat-utils requires a toolchain with LARGEFILE and WCHAR support"
+comment "exfat-utils needs a toolchain w/ largefile, wchar"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/exfat/Config.in b/package/exfat/Config.in
index 55be23e257..5995f0c8e0 100644
--- a/package/exfat/Config.in
+++ b/package/exfat/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_EXFAT
 
 	  http://code.google.com/p/exfat/
 
-comment "exfat requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+comment "exfat needs a toolchain w/ largefile, wchar, threads, dynamic library"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
diff --git a/package/f2fs-tools/Config.in b/package/f2fs-tools/Config.in
index 99ee91cd2e..98f66a2e90 100644
--- a/package/f2fs-tools/Config.in
+++ b/package/f2fs-tools/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_F2FS_TOOLS
 
 	  http://sourceforge.net/projects/f2fs-tools/
 
-comment "f2fs-tools requires a toolchain with LARGEFILE and WCHAR support"
+comment "f2fs-tools needs a toolchain w/ largefile, wchar"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/fbterm/Config.in b/package/fbterm/Config.in
index 1e4ab4c0d4..2c9d6d4573 100644
--- a/package/fbterm/Config.in
+++ b/package/fbterm/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_FBTERM
 
 	  http://code.google.com/p/fbterm/
 
-comment "fbterm requires a toolchain with C++, WCHAR and locale support"
+comment "fbterm needs a toolchain w/ C++, wchar, locale"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in
index dfc8cc43cb..54d53a0a3c 100644
--- a/package/fdk-aac/Config.in
+++ b/package/fdk-aac/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_FDK_AAC
 
 	  http://sourceforge.net/projects/opencore-amr/files/fdk-aac/
 
-comment "fdk-aac requires a toolchain with C++ support"
+comment "fdk-aac needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index d11233e947..1c8c34f51a 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -1,4 +1,4 @@
-comment "ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+comment "ffmpeg needs a toolchain w/ largefile, IPv6"
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
 
 menuconfig BR2_PACKAGE_FFMPEG
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index 6f9fdb0c94..9965aa3571 100644
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -17,6 +17,6 @@ config BR2_PACKAGE_FILEMQ
 
 	  http://github.com/zeromq/filemq
 
-comment "filemq requires a toolchain with C++, IPv6, LARGEFILE, WCHAR & thread support"
+comment "filemq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/findutils/Config.in b/package/findutils/Config.in
index 32e87c26dc..b95f1cb197 100644
--- a/package/findutils/Config.in
+++ b/package/findutils/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_FINDUTILS
 
 	  http://www.gnu.org/software/findutils/findutils.html
 
-comment "findutils requires a toolchain with WCHAR support"
+comment "findutils needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/flashbench/Config.in b/package/flashbench/Config.in
index 39cdb1dade..aa98200c1f 100644
--- a/package/flashbench/Config.in
+++ b/package/flashbench/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_FLASHBENCH
 
 	  https://wiki.linaro.org/WorkingGroups/KernelConsolidation/Projects/FlashCardSurvey
 
-comment "flashbench requires a toolchain with LARGEFILE support"
+comment "flashbench needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/flex/Config.in b/package/flex/Config.in
index 4fbc56c0a9..be6140bd1e 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_FLEX_BINARY
 	help
 	  Install the flex binary tool in the target filesystem.
 
-comment "flex binary requires a toolchain with WCHAR support"
+comment "flex binary needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index 20851922ae..1c440f25ed 100644
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_FLTK
 
 	  http://www.fltk.org/
 
-comment "fltk requires a toolchain with C++ support enabled"
+comment "fltk needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7
diff --git a/package/fluxbox/Config.in b/package/fluxbox/Config.in
index 588e83b06a..cb4d76feb3 100644
--- a/package/fluxbox/Config.in
+++ b/package/fluxbox/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_FLUXBOX
 
 	  http://fluxbox.org
 
-comment "fluxbox requires a toolchain with C++ support enabled"
+comment "fluxbox needs a toolchain w/ C++"
 	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP
diff --git a/package/foomatic-filters/Config.in b/package/foomatic-filters/Config.in
index aa056b9274..3d34f1325f 100644
--- a/package/foomatic-filters/Config.in
+++ b/package/foomatic-filters/Config.in
@@ -1,4 +1,4 @@
-comment "foomatic-filters requires a toolchain with support for THREADS"
+comment "foomatic-filters needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_FOOMATIC_FILTERS
diff --git a/package/gadgetfs-test/Config.in b/package/gadgetfs-test/Config.in
index 36713fcd6a..c4b77396e3 100644
--- a/package/gadgetfs-test/Config.in
+++ b/package/gadgetfs-test/Config.in
@@ -17,5 +17,5 @@ config BR2_PACKAGE_GADGETFS_TEST_USE_AIO
 	  Select this to have gadgetfs-test do asynchronous I/O using
 	  the libaio library.
 
-comment "gadgetfs-test requires thread support in toolchain"
+comment "gadgetfs-test needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gamin/Config.in b/package/gamin/Config.in
index 369c10e6f1..f5fb914363 100644
--- a/package/gamin/Config.in
+++ b/package/gamin/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_GAMIN
 
 	  http://www.gnome.org/~veillard/gamin/sources
 
-comment "gamin requires a toolchain with WCHAR and threading support"
+comment "gamin needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gawk/Config.in b/package/gawk/Config.in
index 6889777c0d..a1c632f552 100644
--- a/package/gawk/Config.in
+++ b/package/gawk/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_GAWK
 
 	  http://www.gnu.org/software/gawk/
 
-comment "gawk requires a toolchain with WCHAR support"
+comment "gawk needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 631fdd78ae..de98d3d22e 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -1,4 +1,4 @@
-comment "gdb/gdbserver require a toolchain with thread and thread debug support"
+comment "gdb/gdbserver needs a toolchain w/ threads, threads debug"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 
 config BR2_PACKAGE_GDB
@@ -41,7 +41,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
 	depends on BR2_USE_WCHAR
 	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
 
-comment "full gdb on target needs WCHAR support in toolchain"
+comment "full gdb on target needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 endif
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index aaabae179f..9a14c3ac1a 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_GDK_PIXBUF
 
 	  http://www.gtk.org/
 
-comment "gdk-pixbuf depends on toolchain with WCHAR and threading support"
+comment "gdk-pixbuf needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/genext2fs/Config.in b/package/genext2fs/Config.in
index d869d7ea70..c8b56350c0 100644
--- a/package/genext2fs/Config.in
+++ b/package/genext2fs/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_GENEXT2FS
 
 	  http://genext2fs.sourceforge.net/
 
-comment "genext2fs requires a toolchain with LARGEFILE support"
+comment "genext2fs needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in
index 57bbf293b2..a15d98ad9d 100644
--- a/package/gesftpserver/Config.in
+++ b/package/gesftpserver/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_GESFTPSERVER
 
 	  http://www.greenend.org.uk/rjk/sftpserver/
 
-comment "gesftpserver requires a toolchain with WCHAR and threads support"
+comment "gesftpserver needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index a97b835328..8e4f594cab 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -24,5 +24,5 @@ config BR2_PACKAGE_GETTEXT_TOOLS
 	  the target filesystem. This is typically not useful for
 	  correct operation of programs.
 
-comment "gettext requires a toolchain with WCHAR support"
+comment "gettext needs a toolchain w/ wchar"
 	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
diff --git a/package/git/Config.in b/package/git/Config.in
index 854c0d4ebf..5a3e16aa86 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_GIT
 
 	  http://git-scm.com
 
-comment "git requires a toolchain with LARGEFILE support"
+comment "git needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index 8d106f5632..4c739849df 100644
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_GLIB_NETWORKING
 	help
 	  Network-related GIO modules for glib.
 
-comment "glib-networking requires a toolchain with WCHAR and threading support"
+comment "glib-networking needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in
index fddd5e4258..bdfff16650 100644
--- a/package/glibmm/Config.in
+++ b/package/glibmm/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_GLIBMM
 
 	  http://www.gtkmm.org/
 
-comment "glibmm requires a toolchain with C++, WCHAR, and threading support"
+comment "glibmm needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 96dc58f786..7e059055ee 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -20,6 +20,6 @@ config BR2_PACKAGE_GMPC
 
 	  http://gmpcwiki.sarine.nl/index.php?title=GMPC
 
-comment "gmpc requires a toolchain with WCHAR and threading support"
+comment "gmpc needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gnuchess/Config.in b/package/gnuchess/Config.in
index 105fbbc308..13ae801fb8 100644
--- a/package/gnuchess/Config.in
+++ b/package/gnuchess/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_GNUCHESS
 
 	  http://ftp.gnu.org/pub/gnu/chess
 
-comment "gnuchess requires a toolchain with thread support"
+comment "gnuchess needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index f699af784f..d2648d06b4 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_GNUTLS_TOOLS
 	help
 	  Install GnuTLS command line tools for various cryptographic tasks.
 
-comment "gnutls requires a toolchain with WCHAR support"
+comment "gnutls needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index d795335eb1..ee4d3b54fe 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_GOB2
 
 	  http://www.jirka.org/gob.html
 
-comment "gob2 requires a toolchain with WCHAR support"
+comment "gob2 needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gperf/Config.in b/package/gperf/Config.in
index 67b286b9aa..e6d51fca72 100644
--- a/package/gperf/Config.in
+++ b/package/gperf/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_GPERF
 
 	  http://www.gnu.org/software/gperf/
 
-comment "gperf requires a toolchain with C++ support enabled"
+comment "gperf needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 70c8cbf252..d1a55ebfbc 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -1,4 +1,4 @@
-comment "gpsd needs a toolchain with thread support"
+comment "gpsd needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GPSD
diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 70acde796b..ae90fa91db 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -1,4 +1,4 @@
-comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
+comment "gptfdisk needs a toolchain w/ largefile, wchar, C++"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_GPTFDISK
diff --git a/package/grep/Config.in b/package/grep/Config.in
index 5906e698af..2cd3406165 100644
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_GREP
 
 	  http://www.gnu.org/software/grep/grep.html
 
-comment "grep needs a toolchain with WCHAR support"
+comment "grep needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
index 537101e695..72b98b8a76 100644
--- a/package/gstreamer/gst-ffmpeg/Config.in
+++ b/package/gstreamer/gst-ffmpeg/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_GST_FFMPEG
 
 	  http://gstreamer.freedesktop.org/
 
-comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+comment "gst-ffmpeg needs a toolchain w/ largefile, IPv6"
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index 3c5c16198b..c42172a6fd 100644
--- a/package/gstreamer/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
@@ -61,7 +61,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK
 	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
 
-comment "decklink requires a toolchain with C++ support enabled"
+comment "decklink needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
@@ -281,7 +281,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
 	select BR2_PACKAGE_LIBMMS
 
-comment "libmms requires a toolchain with WCHAR and threading support"
+comment "libmms needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
@@ -303,7 +303,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
 	depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> libglib2
 	select BR2_PACKAGE_LIBRSVG
 
-comment "rsvg plugin requires a toolchain with C++, WCHAR, and threading support"
+comment "rsvg plugin needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
 
@@ -316,7 +316,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE
 	select BR2_PACKAGE_LIBSNDFILE
 	depends on BR2_LARGEFILE
 
-comment "gst-plugins-bad-plugin-sndfile requires a toolchain with LARGEFILE support"
+comment "gst-plugins-bad-plugin-sndfile needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
diff --git a/package/gstreamer/gst-plugins-base/Config.in b/package/gstreamer/gst-plugins-base/Config.in
index 7370bd6b0e..20c2d3609c 100644
--- a/package/gstreamer/gst-plugins-base/Config.in
+++ b/package/gstreamer/gst-plugins-base/Config.in
@@ -90,7 +90,7 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
 	select BR2_PACKAGE_PANGO
 
-comment "pango plugin requires a toolchain with C++, WCHAR and threading support "
+comment "pango plugin needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index c604a41a02..bc2c293f06 100644
--- a/package/gstreamer/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
@@ -143,7 +143,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP
 	depends on BR2_INET_IPV6
 	bool "udp"
 
-comment "udp requires a toolchain with IPv6 support"
+comment "udp needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX
@@ -192,7 +192,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 	depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
 	select BR2_PACKAGE_GDK_PIXBUF
 
-comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+comment "gdkpixbuf needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
@@ -213,7 +213,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
 	select BR2_PACKAGE_LIBSOUP
 
-comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+comment "souphttpsrc needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
index 5188b8fdb7..bd6022e9a2 100644
--- a/package/gstreamer/gstreamer/Config.in
+++ b/package/gstreamer/gstreamer/Config.in
@@ -28,5 +28,5 @@ config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
 	  Enable support for the GStreamer plugin registry. This may increase
 	  the launch-time for a GStreamer application.
 
-comment "gstreamer requires a toolchain with WCHAR and threads support"
+comment "gstreamer needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 54e632a9c1..d6f087d457 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -347,7 +347,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
 	help
 	  Blackmagic Decklink plugin
 
-comment "decklink requires a toolchain with C++ support enabled"
+comment "decklink needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
@@ -388,7 +388,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 	help
 	  Microsoft Multi Media Server streaming protocol support
 
-comment "libmms requires a toolchain with WCHAR and threading support"
+comment "libmms needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
@@ -420,7 +420,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
 	help
 	  GStreamer OpenCV Plugins
 
-comment "opencv plugin requires a toolchain with C++ support"
+comment "opencv plugin needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
@@ -438,7 +438,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
 	help
 	  RSVG plugin library
 
-comment "rsvg plugin requires a toolchain with C++, WCHAR and threading support"
+comment "rsvg plugin needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
 
@@ -457,7 +457,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE
 	select BR2_PACKAGE_LIBSNDFILE
 	depends on BR2_LARGEFILE
 
-comment "gst-plugins-bad-plugin-sndfile requires a toolchain with LARGEFILE support"
+comment "gst-plugins-bad-plugin-sndfile needs a toolchain w/ largefile"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index e02d23ac8b..5b54baba21 100644
--- a/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
@@ -136,7 +136,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO
 	help
 	  Pango-based text rendering and overlay
 
-comment "pango plugin requires a toolchain with C++, WCHAR and threading support"
+comment "pango plugin needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 2da9bff0e6..3342208c49 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -294,7 +294,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 	help
 	  GdkPixbuf-based image decoder, overlay and sink
 
-comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+comment "gdkpixbuf needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
@@ -313,7 +313,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	help
 	  libsoup HTTP client src/sink
 
-comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+comment "souphttpsrc needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
@@ -329,7 +329,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB
 	help
 	  Taglib tagging plugin library
 
-comment "taglib requires a toolchain with C++ support"
+comment "taglib needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in
index 0fb3e9213e..9b5c8e06a3 100644
--- a/package/gstreamer1/gst1-plugins-ugly/Config.in
+++ b/package/gstreamer1/gst1-plugins-ugly/Config.in
@@ -46,7 +46,7 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD
 	help
 	  Access a DVD with dvdread
 
-comment "dvdread requires a toolchain with largefile support"
+comment "dvdread needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
 
 config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in
index 69a87f3394..ad7079cc11 100644
--- a/package/gstreamer1/gstreamer1/Config.in
+++ b/package/gstreamer1/gstreamer1/Config.in
@@ -49,5 +49,5 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
 
 endif
 
-comment "gstreamer1 requires a toolchain with WCHAR and threading support"
+comment "gstreamer1 needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gtest/Config.in b/package/gtest/Config.in
index 5c065d6da3..883cf97ed7 100644
--- a/package/gtest/Config.in
+++ b/package/gtest/Config.in
@@ -21,5 +21,5 @@ config BR2_PACKAGE_GTEST
 
 	  http://code.google.com/p/googletest/
 
-comment "gtest requires a toolchain with c++, WCHAR and THREADS support"
+comment "gtest needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
index eb06efd4c1..a53bbee642 100644
--- a/package/gutenprint/Config.in
+++ b/package/gutenprint/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_GUTENPRINT
 
 	  http://gimp-print.sourceforge.net/
 
-comment "gutenprint requires a toolchain with C++ support enabled"
+comment "gutenprint needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 63c4996c6c..17827bf05a 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -16,5 +16,5 @@ config BR2_PACKAGE_GVFS
 
 	  http://en.wikipedia.org/wiki/GVFS
 
-comment "gvfs requires a toolchain with LARGEFILE, WCHAR and threading support"
+comment "gvfs needs a toolchain w/ largefile, wchar, threads"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gzip/Config.in b/package/gzip/Config.in
index f501d5ccc8..b30c1ca4d8 100644
--- a/package/gzip/Config.in
+++ b/package/gzip/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_GZIP
 
 	  http://www.gnu.org/software/gzip/gzip.html
 
-comment "gzip requires a toolchain with WCHAR support"
+comment "gzip needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/harfbuzz/Config.in b/package/harfbuzz/Config.in
index 88e4740b14..7a864e9b7a 100644
--- a/package/harfbuzz/Config.in
+++ b/package/harfbuzz/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_HARFBUZZ
 	  Harfbuzz can make optional use of cairo, freetype,
 	  glib2 and icu packages if they are selected.
 
-comment "harfbuzz requires a toolchain with C++ support"
+comment "harfbuzz needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/hdparm/Config.in b/package/hdparm/Config.in
index 32bd247056..3254830a3c 100644
--- a/package/hdparm/Config.in
+++ b/package/hdparm/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_HDPARM
 
 	  http://www.ibiblio.org/pub/Linux/system/hardware/
 
-comment "hdparm requires a toolchain with LARGEFILE support"
+comment "hdparm needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in
index fbed1bc620..b5f73e0e26 100644
--- a/package/hiawatha/Config.in
+++ b/package/hiawatha/Config.in
@@ -1,4 +1,4 @@
-comment "hiawatha requires a toolchain with thread support"
+comment "hiawatha needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_HIAWATHA
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index 49e8400fa3..eb530b336f 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -25,5 +25,5 @@ config BR2_PACKAGE_HOSTAPD_WPS
 
 endif
 
-comment "hostapd requires a toolchain with thread support"
+comment "hostapd needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/hplip/Config.in b/package/hplip/Config.in
index c67a8b24c9..4670400ce8 100644
--- a/package/hplip/Config.in
+++ b/package/hplip/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_HPLIP
 
 	  http://hplipopensource.com/
 
-comment "hplip requires a toolchain with C++ and thread support enabled"
+comment "hplip needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/icu/Config.in b/package/icu/Config.in
index 3dd16b7935..585bffb7ad 100644
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -8,6 +8,6 @@ config BR2_PACKAGE_ICU
 
 	  http://site.icu-project.org/
 
-comment "icu requires a toolchain with C++, WCHAR and threading support"
+comment "icu needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/iftop/Config.in b/package/iftop/Config.in
index 5c683160f1..eb40a30016 100644
--- a/package/iftop/Config.in
+++ b/package/iftop/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_IFTOP
 
 	  http://www.ex-parrot.com/pdw/iftop/
 
-comment "iftop requires IPv6 and threads support in toolchain"
+comment "iftop needs a toolchain w/ IPv6, threads"
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/igmpproxy/Config.in b/package/igmpproxy/Config.in
index 03f8da52df..a9e4c1cc6a 100644
--- a/package/igmpproxy/Config.in
+++ b/package/igmpproxy/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_IGMPPROXY
 
 	  http://sourceforge.net/projects/igmpproxy/
 
-comment "igmpproxy needs a toolchain with wchar support"
+comment "igmpproxy needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/inotify-tools/Config.in b/package/inotify-tools/Config.in
index 0a8c7c9f73..443c92290f 100644
--- a/package/inotify-tools/Config.in
+++ b/package/inotify-tools/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_INOTIFY_TOOLS
 
 	  https://github.com/rvoicilas/inotify-tools
 
-comment "inotify-tools requires a toolchain with LARGEFILE support"
+comment "inotify-tools needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c284bfd1be..ad6332f03c 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_IPERF
 
 	  http://dast.nlanr.net/projects/iperf/
 
-comment "iperf requires a toolchain with C++ support enabled"
+comment "iperf needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/ipset/Config.in b/package/ipset/Config.in
index af16fa837c..94832d3d3e 100644
--- a/package/ipset/Config.in
+++ b/package/ipset/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_IPSET
 
 	  http://ipset.netfilter.org/
 
-comment "ipset requires a toolchain with LARGEFILE support"
+comment "ipset needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/iw/Config.in b/package/iw/Config.in
index 69ef675b5b..fd73b20992 100644
--- a/package/iw/Config.in
+++ b/package/iw/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_IW
 
 	  http://wireless.kernel.org/en/users/Documentation/iw
 
-comment "iw requires a toolchain with thread support"
+comment "iw needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 3a2bd20302..7a899d6067 100644
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_JAMVM
 
 	  http://jamvm.sf.net
 
-comment "jamvm requires a toolchain with IPV6 support"
+comment "jamvm needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/jhead/Config.in b/package/jhead/Config.in
index 247ac53bf1..58498cd6e9 100644
--- a/package/jhead/Config.in
+++ b/package/jhead/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_JHEAD
 
 	  http://www.sentex.net/~mwandel/jhead/
 
-comment "jhead requires a toolchain with WCHAR support"
+comment "jhead needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/json-glib/Config.in b/package/json-glib/Config.in
index db2538616a..09ac4e3d52 100644
--- a/package/json-glib/Config.in
+++ b/package/json-glib/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_JSON_GLIB
 
 	  https://live.gnome.org/JsonGlib/
 
-comment "json-glib requires a toolchain with WCHAR and threading support"
+comment "json-glib needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index a0e7c6792d..8625a8e437 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,4 +1,4 @@
-comment "Kismet requires a toolchain with thread and C++ support enabled"
+comment "kismet needs a toolchain w/ threads, C++"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_KISMET
diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in
index 23e4c63bb6..29fbcc8da9 100644
--- a/package/latencytop/Config.in
+++ b/package/latencytop/Config.in
@@ -20,5 +20,5 @@ config BR2_PACKAGE_LATENCYTOP
 
 	  http://www.latencytop.org
 
-comment "latencytop requires a toolchain with WCHAR and threading support"
+comment "latencytop needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lcdapi/Config.in b/package/lcdapi/Config.in
index 5c997d1e48..34ce0fa1a1 100644
--- a/package/lcdapi/Config.in
+++ b/package/lcdapi/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LCDAPI
 
 	  https://github.com/spdawson/lcdapi
 
-comment "lcdapi requires a toolchain with C++ and thread support enabled"
+comment "lcdapi needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in
index a60b50c07a..d4fb73fd54 100644
--- a/package/libarchive/Config.in
+++ b/package/libarchive/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBARCHIVE
 
 	  http://www.libarchive.org/
 
-comment "libarchive requires a toolchain with WCHAR support"
+comment "libarchive needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 config BR2_PACKAGE_LIBARCHIVE_BSDTAR
diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in
index bae5700ae1..8c90aa1342 100644
--- a/package/libbsd/Config.in
+++ b/package/libbsd/Config.in
@@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBBSD
 
 	  http://libbsd.freedesktop.org/
 
-comment "libbsd requires a toolchain with thread support"
+comment "libbsd needs a toolchain w/ threads"
 	depends on ( BR2_i386 || BR2_x86_64 )
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libcec/Config.in b/package/libcec/Config.in
index 256c6d69b9..4cfe1ce474 100644
--- a/package/libcec/Config.in
+++ b/package/libcec/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBCEC
 
 	  http://libcec.pulse-eight.com
 
-comment "libcec requires C++, WCHAR and threading support in toolchain"
+comment "libcec needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR
diff --git a/package/libcgicc/Config.in b/package/libcgicc/Config.in
index 098f9a631f..e1f6904b29 100644
--- a/package/libcgicc/Config.in
+++ b/package/libcgicc/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBCGICC
 
 	  http://www.cgicc.com
 
-comment "libcgicc requires a toolchain with C++ support enabled"
+comment "libcgicc needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
index 0f5c09760d..b7a84e06e0 100644
--- a/package/libcgroup/Config.in
+++ b/package/libcgroup/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LIBCGROUP
 
 	  http://libcg.sourceforge.net/
 
-comment "libcgroup requires a glibc toolchain with C++ support"
+comment "libcgroup needs an (e)glibc toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 533e985834..d7c74eb071 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -64,5 +64,5 @@ endmenu
 
 endif
 
-comment "libdrm requires a toolchain with LARGEFILE support"
+comment "libdrm needs a toolchain w/ largefile"
 	depends on BR2_PACKAGE_XORG7 && !BR2_LARGEFILE
diff --git a/package/libdvbsi/Config.in b/package/libdvbsi/Config.in
index 0d3143fce4..f67342d650 100644
--- a/package/libdvbsi/Config.in
+++ b/package/libdvbsi/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBDVBSI
 
 	  http://www.saftware.de/
 
-comment "libdvbsi++ requires a toolchain with C++, WCHAR and threads support"
+comment "libdvbsi++ needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libdvdnav/Config.in b/package/libdvdnav/Config.in
index 4585be935c..b3f6dd382b 100644
--- a/package/libdvdnav/Config.in
+++ b/package/libdvdnav/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBDVDNAV
 
 	  http://www.mplayerhq.hu
 
-comment "libdvdnav requires a toolchain with LARGEFILE and thread support"
+comment "libdvdnav needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libdvdread/Config.in b/package/libdvdread/Config.in
index b63f082861..94f4e62a70 100644
--- a/package/libdvdread/Config.in
+++ b/package/libdvdread/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBDVDREAD
 
 	  http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
 
-comment "libdvdread requires a toolchain with LARGEFILE support"
+comment "libdvdread needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libebml/Config.in b/package/libebml/Config.in
index ce855b232c..b50a4921a4 100644
--- a/package/libebml/Config.in
+++ b/package/libebml/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBEBML
 
 	  http://matroska.org
 
-comment "libebml requires a toolchain with C++ support"
+comment "libebml needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index 72b0cf107b..5158744a1b 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_LIBEDIT
 	  sources which require pmake:
 	  http://www.thrysoee.dk/editline/
 
-comment "libedit requires a toolchain with WCHAR support"
+comment "libedit needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
index 68770002ee..bc11b8bcbb 100644
--- a/package/libfreefare/Config.in
+++ b/package/libfreefare/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBFREEFARE
 
 	  http://code.google.com/p/nfc-tools/wiki/libfreefare
 
-comment "libfreefare needs a toolchain with thread support"
+comment "libfreefare needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in
index 48e9ceb235..dc815148f0 100644
--- a/package/libftdi/Config.in
+++ b/package/libftdi/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_LIBTFDI_CPP
 
 endif # BR2_PACKAGE_LIBFTDI
 
-comment "libftdi needs a toolchain with thread support"
+comment "libftdi needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libfuse/Config.in b/package/libfuse/Config.in
index e42f9e0eef..345b63d246 100644
--- a/package/libfuse/Config.in
+++ b/package/libfuse/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBFUSE
 
 	  http://fuse.sourceforge.net/
 
-comment "libfuse requires a toolchain with LARGEFILE, threads and dyanmic library support"
+comment "libfuse needs a toolchain w/ largefile, threads, dynamic library"
         depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/libgail/Config.in b/package/libgail/Config.in
index 3e1af628a7..7142d2831e 100644
--- a/package/libgail/Config.in
+++ b/package/libgail/Config.in
@@ -19,6 +19,6 @@ config BR2_PACKAGE_LIBGAIL
 
 	  http://developer.gnome.org/projects/gap
 
-comment "libgail requires a toolchain with WCHAR and threading support"
+comment "libgail needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_LIBGTK2 && \
 		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index d0425170e7..47a44cab6f 100644
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBGLADE
 
 	  http://ftp.gnome.org/pub/GNOME/sources/libglade/
 
-comment "libglade requires a toolchain with WCHAR and threading support"
+comment "libglade needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_LIBGTK2 && \
 		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 806dbbefbe..3590d72ef3 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LIBGLIB2
 
 	  http://www.gtk.org/
 
-comment "libglib2 requires a toolchain with WCHAR support and threading support"
+comment "libglib2 needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index c280c6afa4..47f55b7cb0 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -31,6 +31,6 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 
 endif
 
-comment "libgtk2 requires a toolchain with WCHAR, threading and C++ support"
+comment "libgtk2 needs a toolchain w/ wchar, threads, C++"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libhid/Config.in b/package/libhid/Config.in
index 093b98fcb9..e6f2012860 100644
--- a/package/libhid/Config.in
+++ b/package/libhid/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBHID
 
 	  http://libhid.alioth.debian.org
 
-comment "libhid needs a toolchain with thread support"
+comment "libhid needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libical/Config.in b/package/libical/Config.in
index 5907548bea..9bb63c3d0b 100644
--- a/package/libical/Config.in
+++ b/package/libical/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBICAL
 
 	  http://www.citadel.org/doku.php/documentation:featured_projects:libical
 
-comment "libical requires a toolchain with WCHAR support"
+comment "libical needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/libiqrf/Config.in b/package/libiqrf/Config.in
index 7222536607..03555e063a 100644
--- a/package/libiqrf/Config.in
+++ b/package/libiqrf/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBIQRF
 
 	  https://github.com/nandra/libiqrf
 
-comment "libiqrf needs a toolchain with thread support"
+comment "libiqrf needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libjson/Config.in b/package/libjson/Config.in
index 949c748f35..50a99311d2 100644
--- a/package/libjson/Config.in
+++ b/package/libjson/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBJSON
 
 	  http://sourceforge.net/projects/libjson/
 
-comment "libjson requires a toolchain with C++ support"
+comment "libjson needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/liblo/Config.in b/package/liblo/Config.in
index 4c2d71944f..705ac84514 100644
--- a/package/liblo/Config.in
+++ b/package/liblo/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBLO
 
 	  http://liblo.sourceforge.net/
 
-comment "liblo requires thread support in toolchain"
+comment "liblo needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmatroska/Config.in b/package/libmatroska/Config.in
index b1c53eec09..81270dede4 100644
--- a/package/libmatroska/Config.in
+++ b/package/libmatroska/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBMATROSKA
 
 	  http://matroska.org
 
-comment "libmatroska requires a toolchain with C++ support"
+comment "libmatroska needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in
index 5c20ba602e..15e3762095 100644
--- a/package/libmicrohttpd/Config.in
+++ b/package/libmicrohttpd/Config.in
@@ -16,8 +16,8 @@ config BR2_PACKAGE_LIBMICROHTTPD_SSL
 	help
 	  Enable HTTPS (SSL) support.
 
-comment "libmicrohttpd needs a toolchain with thread support"
+comment "libmicrohttpd needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-comment "libmicrohttpd https support needs a toolchain with wchar support"
+comment "libmicrohttpd https support needs a toolchain w/ wchar"
 	depends on BR2_PACKAGE_LIBMICROHTTPD && !BR2_USE_WCHAR
diff --git a/package/libmms/Config.in b/package/libmms/Config.in
index 3cabbc7714..8137d48313 100644
--- a/package/libmms/Config.in
+++ b/package/libmms/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_LIBMMS
 
 	  http://launchpad.net/libmms
 
-comment "libmms requires a toolchain with WCHAR and threading support"
+comment "libmms needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmnl/Config.in b/package/libmnl/Config.in
index 87475df5af..4ffe537df0 100644
--- a/package/libmnl/Config.in
+++ b/package/libmnl/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBMNL
 
 	  http://netfilter.org/projects/libmnl/
 
-comment "libmnl requires a toolchain with LARGEFILE support"
+comment "libmnl needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libmpd/Config.in b/package/libmpd/Config.in
index 7617e88633..83bb6cd89b 100644
--- a/package/libmpd/Config.in
+++ b/package/libmpd/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LIBMPD
 
 	  http://gmpcwiki.sarine.nl/index.php?title=Libmpd
 
-comment "libmpd requires a toolchain with WCHAR and threading support"
+comment "libmpd needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnetfilter_acct/Config.in b/package/libnetfilter_acct/Config.in
index 76cdf7db4f..a918dac743 100644
--- a/package/libnetfilter_acct/Config.in
+++ b/package/libnetfilter_acct/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBNETFILTER_ACCT
 
 	  http://www.netfilter.org/projects/libnetfilter_acct/
 
-comment "libnetfilter_acct requires a toolchain with LARGEFILE support"
+comment "libnetfilter_acct needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_conntrack/Config.in b/package/libnetfilter_conntrack/Config.in
index 9f7b42a22b..c4a76a2a21 100644
--- a/package/libnetfilter_conntrack/Config.in
+++ b/package/libnetfilter_conntrack/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 
 	  http://www.netfilter.org/projects/libnetfilter_conntrack/
 
-comment "libnetfilter_conntrack requires a toolchain with LARGEFILE support"
+comment "libnetfilter_conntrack needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_cthelper/Config.in b/package/libnetfilter_cthelper/Config.in
index fd4f95cd45..0b808cc4c0 100644
--- a/package/libnetfilter_cthelper/Config.in
+++ b/package/libnetfilter_cthelper/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LIBNETFILTER_CTHELPER
 
 	  http://www.netfilter.org/projects/libnetfilter_cthelper/
 
-comment "libnetfilter_cthelper requires a toolchain with LARGEFILE support"
+comment "libnetfilter_cthelper needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_cttimeout/Config.in b/package/libnetfilter_cttimeout/Config.in
index 8e2f438af6..18e85d3406 100644
--- a/package/libnetfilter_cttimeout/Config.in
+++ b/package/libnetfilter_cttimeout/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
 
 	  http://www.netfilter.org/projects/libnetfilter_cttimeout/
 
-comment "libnetfilter_cttimout requires a toolchain with LARGEFILE support"
+comment "libnetfilter_cttimout needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libnetfilter_queue/Config.in b/package/libnetfilter_queue/Config.in
index d04853d3b7..de8c5d3fe8 100644
--- a/package/libnetfilter_queue/Config.in
+++ b/package/libnetfilter_queue/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LIBNETFILTER_QUEUE
 
 	  http://www.netfilter.org/projects/libnetfilter_queue/
 
-comment "libnetfilter_queue requires a toolchain with LARGEFILE and IPv6 support"
+comment "libnetfilter_queue needs a toolchain w/ largefile, IPv6"
 	depends on !BR2_LARGEFILE && !BR2_INET_IPV6
diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in
index 159578f6a1..db2b521cbb 100644
--- a/package/libnfc/Config.in
+++ b/package/libnfc/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_LIBNFC_EXAMPLES
 	depends on BR2_PACKAGE_LIBNFC
 	select BR2_PACKAGE_READLINE
 
-comment "libnfc needs a toolchain with thread support"
+comment "libnfc needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnl/Config.in b/package/libnl/Config.in
index f4a1dc2504..fec10d31b7 100644
--- a/package/libnl/Config.in
+++ b/package/libnl/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_LIBNL_TOOLS
 	help
 	  Install binary tools.
 
-comment "libnl requires a toolchain with thread support"
+comment "libnl needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index ee7902becc..eb8625f43e 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LIBNSPR
 
 	  http://www.mozilla.org/projects/nspr/
 
-comment "libnspr requires a toolchain with LARGEFILE and threads support"
+comment "libnspr needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index b5f3a01656..b12d4e7b6a 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -15,6 +15,6 @@ config BR2_PACKAGE_LIBNSS
 
 	  http://www.mozilla.org/projects/security/pki/nss/
 
-comment "libnss requires a toolchain with LARGEFILE and thread support"
+comment "libnss needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/liboping/Config.in b/package/liboping/Config.in
index 04e0e0d9eb..ffdebbd988 100644
--- a/package/liboping/Config.in
+++ b/package/liboping/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBOPING
 
 	  http://verplant.org/liboping/
 
-comment "liboping requires a toolchain with IPv6 support enabled"
+comment "liboping needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index c7de7ba383..dad012d9c1 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -24,7 +24,7 @@ config BR2_PACKAGE_LIBPLAYER_GSTREAMER
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_GSTREAMER
 
-comment "gstreamer backend requires a toolchain with WCHAR and threading support"
+comment "gstreamer backend needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_LIBPLAYER_PYTHON
@@ -33,5 +33,5 @@ config BR2_PACKAGE_LIBPLAYER_PYTHON
 	bool "Libplayer python bindings"
 endif
 
-comment "libplayer requires a toolchain with LARGEFILE and threads support"
+comment "libplayer needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in
index 84842505dc..fc6b48d7f6 100644
--- a/package/libqmi/Config.in
+++ b/package/libqmi/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LIBQMI
 
 	  http://www.freedesktop.org/wiki/Software/libqmi/
 
-comment "libqmi requires a toolchain with WCHAR and threading support"
+comment "libqmi needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libraw/Config.in b/package/libraw/Config.in
index 4378ccd3da..de763cd36a 100644
--- a/package/libraw/Config.in
+++ b/package/libraw/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_LIBRAW
 
 	  http://www.libraw.org/
 
-comment "libraw requires a toolchain with C++ support enabled"
+comment "libraw needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libroxml/Config.in b/package/libroxml/Config.in
index e1a646fa03..2fcf2f2a70 100644
--- a/package/libroxml/Config.in
+++ b/package/libroxml/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBROXML
 
 	  http://www.libroxml.net
 
-comment "libroxml needs a toolchain with thread support"
+comment "libroxml needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index ce711f7df5..13f6d06119 100644
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_LIBRSVG
 
 	  http://librsvg.sourceforge.net/
 
-comment "librsvg requires a toolchain with WCHAR, threading and C++ support"
+comment "librsvg needs a toolchain w/ wchar, threads, C++"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libsecret/Config.in b/package/libsecret/Config.in
index a15f995f40..b4557822fc 100644
--- a/package/libsecret/Config.in
+++ b/package/libsecret/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LIBSECRET
 
 	  https://wiki.gnome.org/Libsecret
 
-comment "libsecret requires a toolchain with WCHAR and threading support."
+comment "libsecret needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libserial/Config.in b/package/libserial/Config.in
index f098e28781..22adb7265a 100644
--- a/package/libserial/Config.in
+++ b/package/libserial/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBSERIAL
 
 	  http://libserial.sourceforge.net/
 
-comment "libserial requires a toolchain with C++ support enabled"
+comment "libserial needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in
index 93fa3f414b..ae984c8246 100644
--- a/package/libsigc/Config.in
+++ b/package/libsigc/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LIBSIGC
 
 	  http://libsigc.sourceforge.net/
 
-comment "libsigc++ requires a toolchain with C++ support enabled"
+comment "libsigc++ needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libsndfile/Config.in b/package/libsndfile/Config.in
index cdba70bad8..28e366aa9c 100644
--- a/package/libsndfile/Config.in
+++ b/package/libsndfile/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LIBSNDFILE
 
 	  http://www.mega-nerd.com/libsndfile/
 
-comment "libsndfile requires a toolchain with LARGEFILE support"
+comment "libsndfile needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/libsoc/Config.in b/package/libsoc/Config.in
index 0f6336de1c..2aaeb1fe9a 100644
--- a/package/libsoc/Config.in
+++ b/package/libsoc/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_LIBSOC
 
 	  https://github.com/jackmitch/libsoc
 
-comment "libsoc requires a toolchain with threads support"
+comment "libsoc needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 7116b71de9..1eec1355d2 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -23,5 +23,5 @@ config BR2_PACKAGE_LIBSOUP_SSL
 
 endif
 
-comment "libsoup requires a toolchain with WCHAR and threading support"
+comment "libsoup needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
index eab4f3e39b..dc8f09593c 100644
--- a/package/libtirpc/Config.in
+++ b/package/libtirpc/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_LIBTIRPC
 
 	  http://sourceforge.net/projects/libtirpc/
 
-comment "libtirpc requires a toolchain with threading support"
+comment "libtirpc needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in
index 379f4a5c74..a7e358d1dd 100644
--- a/package/libtorrent/Config.in
+++ b/package/libtorrent/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBTORRENT
 
 	  http://libtorrent.rakshasa.no/
 
-comment "libtorrent requires a toolchain with C++ and threads support enabled"
+comment "libtorrent needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in
index 110ea90f0c..3849c13273 100644
--- a/package/libunwind/Config.in
+++ b/package/libunwind/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LIBUNWIND
 
 	  http://www.nongnu.org/libunwind/index.html
 
-comment "libunwind requires a toolchain with thread support"
+comment "libunwind needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libupnp/Config.in b/package/libupnp/Config.in
index 52fa739203..5c94879c5e 100644
--- a/package/libupnp/Config.in
+++ b/package/libupnp/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBUPNP
 
 	  http://pupnp.sourceforge.net/
 
-comment "libupnp requires a toolchain with LARGEFILE and thread support"
+comment "libupnp needs a toolchain w/ largefile, threads"
 	depends on !(BR2_LARGEFILE && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in
index f21541f652..67347dc395 100644
--- a/package/liburcu/Config.in
+++ b/package/liburcu/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBURCU
 
 	  http://lttng.org/urcu
 
-comment "liburcu needs threads support in toolchain"
+comment "liburcu needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/libusb/Config.in b/package/libusb/Config.in
index 2eed3fa963..2c2b8ce173 100644
--- a/package/libusb/Config.in
+++ b/package/libusb/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_LIBUSB
 
 	  http://libusb.sourceforge.net/
 
-comment "libusb needs a toolchain with thread support"
+comment "libusb needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index de4af302be..c3c4481cad 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -35,7 +35,7 @@ config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
 	help
 	  Tool to test v4l2 API compliance of drivers
 
-comment "v4l2-compliance requires a toolchain with C++ support enabled"
+comment "v4l2-compliance needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_LIBV4L_V4L2_CTL
@@ -45,7 +45,7 @@ config BR2_PACKAGE_LIBV4L_V4L2_CTL
 	help
 	  Tool to configure v4l2 controls from the cmdline
 
-comment "v4l2-ctl requires a toolchain with C++ support enabled"
+comment "v4l2-ctl needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_LIBV4L_V4L2_DBG
@@ -54,10 +54,10 @@ config BR2_PACKAGE_LIBV4L_V4L2_DBG
 	help
 	  Tool to directly get and set registers of v4l2 devices
 
-comment "v4l2-dbg requires a toolchain with C++ support enabled"
+comment "v4l2-dbg needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 endif
 
-comment "libv4l requires a toolchain with LARGEFILE and thread support"
+comment "libv4l needs a toolchain w/ largefile, threads"
         depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libxmlpp/Config.in b/package/libxmlpp/Config.in
index 2448bfd9e9..77723a8b86 100644
--- a/package/libxmlpp/Config.in
+++ b/package/libxmlpp/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBXMLPP
 
 	  http://libxmlplusplus.sourceforge.net/
 
-comment "libxml++ requires a toolchain with C++, WCHAR and threading support"
+comment "libxml++ needs a toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 	!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/linknx/Config.in b/package/linknx/Config.in
index f35351e688..c1a6d3b187 100644
--- a/package/linknx/Config.in
+++ b/package/linknx/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LINKNX
 
 	  http://linknx.sourceforge.net/
 
-comment "linknx requires a toolchain with C++ support"
+comment "linknx needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index 1bced0ee34..36a0405cdc 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -26,6 +26,6 @@ config BR2_PACKAGE_LINPHONE
 
 	  http://www.linphone.org/
 
-comment "linphone requires a toolchain with threads, C++ and IPv6 support enabled"
+comment "linphone needs a toolchain w/ threads, C++, IPv6"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INET_IPV6
diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 7a4ae947fa..aff1b86243 100644
--- a/package/linux-pam/Config.in
+++ b/package/linux-pam/Config.in
@@ -8,6 +8,6 @@ config BR2_PACKAGE_LINUX_PAM
 
 	  http://linux-pam.org
 
-comment "linux-pam requires a toolchain with WCHAR and locale support"
+comment "linux-pam needs a toolchain w/ wchar, locale"
 	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
 
diff --git a/package/live555/Config.in b/package/live555/Config.in
index 610fafc1a8..8193091840 100644
--- a/package/live555/Config.in
+++ b/package/live555/Config.in
@@ -29,5 +29,5 @@ config BR2_PACKAGE_LIVE555_MPEG2_INDEXER
 	  MPEG2 Transport Stream Indexer. Provides indexes allowing 'trick play'
 	  operation in the Live555MediaServer.
 
-comment "Live555 needs C++ compiler"
+comment "live555 needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index d0a23ad210..2c14dc81d9 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_LMBENCH
 
 	  http://sourceforge.net/projects/lmbench/
 
-comment "lmbench requires a toolchain with threading support"
+comment "lmbench needs a toolchain w/ threads"
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in
index e98aedc46e..86d6a1d2ca 100644
--- a/package/log4cxx/Config.in
+++ b/package/log4cxx/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_LOG4CXX
 
 	  http://apache.linux-mirror.org/logging/log4cxx/0.10.0
 
-comment "log4cxx requires C++ support in toolchain"
+comment "log4cxx needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/logrotate/Config.in b/package/logrotate/Config.in
index bc7b295d38..376ce5e4f6 100644
--- a/package/logrotate/Config.in
+++ b/package/logrotate/Config.in
@@ -8,6 +8,6 @@ config BR2_PACKAGE_LOGROTATE
 
 	  https://fedorahosted.org/logrotate/
 
-comment "logrotate requires a toolchain with WCHAR support"
+comment "logrotate needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
diff --git a/package/lshw/Config.in b/package/lshw/Config.in
index afefa6c467..bd4a1bab27 100644
--- a/package/lshw/Config.in
+++ b/package/lshw/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LSHW
 
 	  http://ezix.org/project/wiki/HardwareLiSter
 
-comment "lshw requires a toolchain with C++, LARGEFILE & WCHAR support enabled"
+comment "lshw needs a toolchain w/ C++, largefile, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index a984d7b4c8..5ebcdeefc9 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -23,6 +23,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
 
 	  http://ltp.sourceforge.net/
 
-comment "ltp-testsuite requires a toolchain with IPV6, RPC, LARGEFILE and thread support"
+comment "ltp-testsuite needs a toolchain w/ IPv6, RPC, largefile, threads"
 	depends on (!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
 		!BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_NATIVE_RPC) && !BR2_aarch64
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 4f14477ba8..40079b4a21 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -27,6 +27,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 	  http://lttng.org
 
-comment "lttng-babeltrace needs WCHAR, threading and LARGEFILE support"
+comment "lttng-babeltrace needs a toolchain w/ wchar, threads, largefile"
 	depends on BR2_PACKAGE_LTTNG_TOOLS && \
 		(!BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in
index 45e0edea51..49e09d585c 100644
--- a/package/lttng-libust/Config.in
+++ b/package/lttng-libust/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	# util-linux needs wchar and largefile
 	depends on BR2_USE_WCHAR
 	depends on BR2_LARGEFILE
-	# liburcu only works on some architectures and requires threads support
+	# liburcu only works on some architectures and requires threads support"
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
@@ -17,6 +17,6 @@ config BR2_PACKAGE_LTTNG_LIBUST
 
 	  http://lttng.org
 
-comment "lttng-libust needs WCHAR, LARGEFILE and threads support"
+comment "lttng-libust needs a toolchain w/ wchar, largefile, threads"
 	depends on !(BR2_USE_WCHAR || BR2_LARGEFILE)
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index c196e4b637..85598b84d1 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -27,6 +27,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
 
 	  http://lttng.org
 
-comment "lttng-tools needs LARGEFILE, threads and wchar support"
+comment "lttng-tools needs a toolchain w/ largefile, threads, wchar"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index df9f4554f1..a8da42d07d 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -29,5 +29,5 @@ config BR2_PACKAGE_LVM2_APP_LIBRARY
 	help
 	  Install application library (liblvm2app).
 
-comment "lvm2 requires a toolchain with LARGEFILE support"
+comment "lvm2 needs a toolchain w/ largefile"
         depends on !BR2_LARGEFILE
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index 5e6e20815e..ad463b19a3 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_LXC
 
 	  http://lxc.sourceforge.net/
 
-comment "lxc requires a toolchain with IPv6 and thread support"
+comment "lxc needs a toolchain w/ IPv6, threads"
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lzma/Config.in b/package/lzma/Config.in
index 2b94dde6b3..61fdbfec18 100644
--- a/package/lzma/Config.in
+++ b/package/lzma/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_LZMA
 
 	  http://tukaani.org/lzma/
 
-comment "lzma requires a toolchain with C++ support"
+comment "lzma needs a toolchain w/ C++"
         depends on !BR2_INSTALL_LIBSTDCPP && BR2_DEPRECATED
diff --git a/package/m4/Config.in b/package/m4/Config.in
index dee2d833fa..2adeaf3480 100644
--- a/package/m4/Config.in
+++ b/package/m4/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_M4
 
 	  http://www.gnu.org/software/m4/m4.html
 
-comment "m4 requires a toolchain with WCHAR support"
+comment "m4 needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
index 9b20307e47..ebcb647e7c 100644
--- a/package/mediastreamer/Config.in
+++ b/package/mediastreamer/Config.in
@@ -14,6 +14,6 @@ config BR2_PACKAGE_MEDIASTREAMER
 
 	  http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
 
-comment "mediastreamer requires a toolchain with threads, C++ and IPv6 support"
+comment "mediastreamer needs a toolchain w/ threads, C++, IPv6"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INET_IPV6
diff --git a/package/memtester/Config.in b/package/memtester/Config.in
index 82769f509a..dbd8ce17c8 100644
--- a/package/memtester/Config.in
+++ b/package/memtester/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_MEMTESTER
 
 	  http://pyropus.ca/software/memtester/
 
-comment "memtester requires a toolchain with LARGEFILE support"
+comment "memtester needs a toolchain w/ largefile"
        depends on !BR2_LARGEFILE
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 66279f96e6..d0c8aab2f4 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -15,6 +15,6 @@ config BR2_PACKAGE_MIDORI
 
 	  http://software.twotoasts.de/?page=midori
 
-comment "midori requires C++, WCHAR, threading in toolchain and libgtk2"
+comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads"
         depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2
diff --git a/package/minicom/Config.in b/package/minicom/Config.in
index 8bbb2b3f3a..f40fe79f56 100644
--- a/package/minicom/Config.in
+++ b/package/minicom/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_MINICOM
 
 	  http://alioth.debian.org/projects/minicom
 
-comment "minicom requires a toolchain with WCHAR support"
+comment "minicom needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
index 2b684ba290..3f2bcb591e 100644
--- a/package/minidlna/Config.in
+++ b/package/minidlna/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_MINIDLNA
 
 	  http://minidlna.sourceforge.net/
 
-comment "minidlna requires a toolchain with LARGEFILE, IPV6 and thread support"
+comment "minidlna needs a toolchain w/ largefile, IPv6, threads"
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/mongoose/Config.in b/package/mongoose/Config.in
index 16684766fd..7c99f7e58d 100644
--- a/package/mongoose/Config.in
+++ b/package/mongoose/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_MONGOOSE
 
 	  https://github.com/valenok/mongoose
 
-comment "mongoose needs a toolchain with thread support"
+comment "mongoose needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/monit/Config.in b/package/monit/Config.in
index 3127da9218..014e10b747 100644
--- a/package/monit/Config.in
+++ b/package/monit/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_MONIT
 
 	  http://mmonit.com/monit/
 
-comment "monit requires a toolchain with threads support"
+comment "monit needs a toolchain w/ threads"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 2ca55cc3cf..9314984658 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -82,7 +82,7 @@ config BR2_PACKAGE_MPD_FFMPEG
 	  Enable ffmpeg input support.
 	  Select this if you want to play back files supported by ffmpeg.
 
-comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
+comment "ffmpeg support needs a toolchain w/ largefile, IPv6"
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
 
 config BR2_PACKAGE_MPD_LAME
@@ -112,7 +112,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE
 	  Enable libsndfile input/streaming support.
 	  Select this if you want to play back WAV files.
 
-comment "mpd-libsndfile requires a toolchain with LARGEFILE support"
+comment "mpd-libsndfile needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
 
 config BR2_PACKAGE_MPD_MAD
@@ -182,6 +182,6 @@ config BR2_PACKAGE_MPD_WAVPACK
 
 endif
 
-comment "mpd requires a toolchain with C++, threading and WCHAR support"
+comment "mpd needs a toolchain w/ C++, threads, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index e36fc4681f..7cee87d83c 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -25,5 +25,5 @@ config BR2_PACKAGE_MPLAYER_MENCODER
 
 endif
 
-comment "mplayer requires a toolchain with LARGEFILE support"
+comment "mplayer needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/msgpack/Config.in b/package/msgpack/Config.in
index 7f28eafb23..daa4fddc6f 100644
--- a/package/msgpack/Config.in
+++ b/package/msgpack/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_MSGPACK
 
 	  http://msgpack.org/
 
-comment "msgpack requires a toolchain with C++ support enabled"
+comment "msgpack needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index d3da41344e..839ee9777b 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -63,7 +63,7 @@ config BR2_PACKAGE_MTD_MKFSUBIFS
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 
-comment "mkfs.ubifs requires largefile and wchar support in toolchain"
+comment "mkfs.ubifs needs a toolchain w/ largefile, wchar"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_MTD_MTD_DEBUG
@@ -92,7 +92,7 @@ config BR2_PACKAGE_MTD_RECV_IMAGE
 	depends on BR2_INET_IPV6
 	bool "recv_image"
 
-comment "recv_image requires a toolchain with IPv6 support"
+comment "recv_image needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_MTD_RFDDUMP
diff --git a/package/mtdev2tuio/Config.in b/package/mtdev2tuio/Config.in
index 74453c486c..4195ecfeeb 100644
--- a/package/mtdev2tuio/Config.in
+++ b/package/mtdev2tuio/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_MTDEV2TUIO
 
 	  https://github.com/olivopaolo/mtdev2tuio
 
-comment "mtdev2tuio requires thread support in toolchain"
+comment "mtdev2tuio needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mutt/Config.in b/package/mutt/Config.in
index bb97cb08fa..76223bd3cc 100644
--- a/package/mutt/Config.in
+++ b/package/mutt/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_MUTT
 
 	  http://www.mutt.org/
 
-comment "mutt requires a toolchain with WCHAR support"
+comment "mutt needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/mysql_client/Config.in b/package/mysql_client/Config.in
index 8c98b7a767..2f1a2b92b5 100644
--- a/package/mysql_client/Config.in
+++ b/package/mysql_client/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_MYSQL_CLIENT
 	help
 	  MySQL client
 
-comment "Mysql client requires a toolchain with C++ and thread support"
+comment "MySQL client needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index 0a0c7bda43..569218a504 100644
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -24,5 +24,5 @@ config BR2_NBD_SERVER
 
 endif
 
-comment "nbd requires a toolchain with WCHAR and threading support"
+comment "nbd needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 095b2e8174..2e6d62c9b5 100644
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -1,4 +1,4 @@
-comment "ndisc6 requires a toolchain with IPv6 support"
+comment "ndisc6 needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_NDISC6
diff --git a/package/neard/Config.in b/package/neard/Config.in
index 97966da2a9..dcb5c155f0 100644
--- a/package/neard/Config.in
+++ b/package/neard/Config.in
@@ -23,5 +23,5 @@ config BR2_PACKAGE_NEARD_TOOLS
 
 endif
 
-comment "neard requires a toolchain with WCHAR and threads support"
+comment "neard needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neardal/Config.in b/package/neardal/Config.in
index 3841cac6e4..e1237e692b 100644
--- a/package/neardal/Config.in
+++ b/package/neardal/Config.in
@@ -20,5 +20,5 @@ config BR2_PACKAGE_NEARDAL_NCL
 
 endif
 
-comment "neardal requires a toolchain with WCHAR and threading support"
+comment "neardal needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
index 9bf0515cbd..371832fcae 100644
--- a/package/netatalk/Config.in
+++ b/package/netatalk/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_NETATALK
 
 	  http://netatalk.sourceforge.net/
 
-comment "netatalk requires a toolchain with thread support"
+comment "netatalk needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index 40833ad3a0..793fdaa3d6 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_NETKITBASE
 
 	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 
-comment "netkitbase requires a toolchain with RPC support"
+comment "netkitbase needs a toolchain w/ RPC"
         depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/netkittelnet/Config.in b/package/netkittelnet/Config.in
index 1f11d88c28..b0229b32b2 100644
--- a/package/netkittelnet/Config.in
+++ b/package/netkittelnet/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_NETKITTELNET
 
 	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 
-comment "netkittelnet requires a toolchain with RPC support"
+comment "netkittelnet needs a toolchain w/ RPC"
 	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 50a3e744b6..f39293c4ad 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -27,6 +27,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
 
 	  http://projects.gnome.org/NetworkManager/
 
-comment "NetworkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
+comment "NetworkManager needs a toolchain w/ IPv6, largefile, wchar, threads"
 	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/nfacct/Config.in b/package/nfacct/Config.in
index ac437dac92..4230783a5a 100644
--- a/package/nfacct/Config.in
+++ b/package/nfacct/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_NFACCT
 
 	  http://www.netfilter.org/projects/nfacct/
 
-comment "nfacct requires a toolchain with LARGEFILE support"
+comment "nfacct needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 6ba2f704b3..fcb02472d9 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -11,7 +11,7 @@ config BR2_PACKAGE_NFS_UTILS
 
 	  http://sourceforge.net/projects/nfs
 
-comment "nfs-utils requires a toolchain with LARGEFILE and threading support"
+comment "nfs-utils needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || \
 		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
 
diff --git a/package/nmap/Config.in b/package/nmap/Config.in
index be1be33dbb..9707d36b70 100644
--- a/package/nmap/Config.in
+++ b/package/nmap/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_NMAP
 
 	  http://nmap.org
 
-comment "nmap requires a toolchain with C++, IPV6 and thread support"
+comment "nmap needs a toolchain w/ C++, IPv6, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index fea34802fc..536810580c 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_NODEJS
 
 	  http://nodejs.org/
 
-comment "nodejs requires a toolchain with C++, IPv6, large files, and threading"
+comment "nodejs needs a toolchain w/ C++, IPv6, largefile, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
 
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index 10db8a3b17..5214295473 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -30,5 +30,5 @@ config BR2_PACKAGE_NTFS_3G_NTFSPROGS
 
 endif
 
-comment "ntfs-3g requires a toolchain with LARGEFILE, WCHAR and threads support"
+comment "ntfs-3g needs a toolchain w/ largefile, wchar, threads"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/numactl/Config.in b/package/numactl/Config.in
index 21e76fb99c..b1c40e0017 100644
--- a/package/numactl/Config.in
+++ b/package/numactl/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_NUMACTL
 
 	  http://oss.sgi.com/projects/libnuma/
 
-comment "numactl requires a toolchain with LARGEFILE support"
+comment "numactl needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in
index 0fa5660add..38d37c612a 100644
--- a/package/ocrad/Config.in
+++ b/package/ocrad/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_OCRAD
 
 	  http://www.gnu.org/software/ocrad/
 
-comment "ocrad needs a toolchain with C++ support"
+comment "ocrad needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index 5d82170e06..30962892e0 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_OFONO
 
 	  http://ofono.org/
 
-comment "ofono requires a toolchain with WCHAR and thread support"
+comment "ofono needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ola/Config.in b/package/ola/Config.in
index f5a9a7a109..eb24a3a07c 100644
--- a/package/ola/Config.in
+++ b/package/ola/Config.in
@@ -1,4 +1,4 @@
-comment "ola requires a toolchain with C++, thread, largefile and wchar support"
+comment "ola needs a toolchain w/ C++, threads, largefile, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OLA
diff --git a/package/olsr/Config.in b/package/olsr/Config.in
index a4fbe01040..4c98bd7818 100644
--- a/package/olsr/Config.in
+++ b/package/olsr/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_OLSR
 
 	  http://www.olsr.org/
 
-comment "olsr requires a toolchain with IPv6 and threads support"
+comment "olsr needs a toolchain w/ IPv6, threads"
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in
index d94603c128..63266888e6 100644
--- a/package/omniorb/Config.in
+++ b/package/omniorb/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_OMNIORB
 
 	  http://omniorb.sourceforge.net/
 
-comment "omniORB requires a toolchain with C++ support"
+comment "omniORB needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index e98ba8ab9d..146011ad7c 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -134,7 +134,7 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG
 	help
 	  Use ffmpeg from the target system.
 
-comment "ffmpeg support requires a toolchain with LARGEFILE and IPV6 support"
+comment "ffmpeg support needs a toolchain w/ largefile, IPv6"
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
 
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
@@ -145,7 +145,7 @@ config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
 
-comment "gstreamer support requires a toolchain with WCHAR and threading support"
+comment "gstreamer support needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENCV_WITH_GTK
@@ -192,7 +192,7 @@ config BR2_PACKAGE_OPENCV_WITH_V4L
 	help
 	  Enable Video 4 Linux support.
 
-comment "v4l support requires a toolchain with LARGEFILE and thread support"
+comment "v4l support needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 comment "Install options"
@@ -208,5 +208,5 @@ config BR2_PACKAGE_OPENCV_INSTALL_DATA
 
 endif # BR2_PACKAGE_OPENCV
 
-comment "opencv requires a toolchain with C++ and WCHAR support"
+comment "opencv needs a toolchain w/ C++, wchar"
 	depends on !(BR2_INSTALL_LIBSTDCPP  && BR2_USE_WCHAR)
diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index c8e1f65878..4bd4dbbab9 100644
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -17,7 +17,7 @@ config BR2_PACKAGE_OPENOBEX_BLUEZ
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_BLUEZ_UTILS
 
-comment "bluez support require a toolchain with WCHAR and thread support"
+comment "bluez support needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENOBEX_LIBUSB
@@ -25,7 +25,7 @@ config BR2_PACKAGE_OPENOBEX_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBUSB
 
-comment "libusb support require a toolchain with thread support"
+comment "libusb support needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENOBEX_APPS
@@ -41,5 +41,5 @@ config BR2_PACKAGE_OPENOBEX_DUMP
 
 endif
 
-comment "openobex requires a toolchain with IPV6 support"
+comment "openobex needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/openocd/Config.in b/package/openocd/Config.in
index 4ea66a5b9a..fc139774cc 100644
--- a/package/openocd/Config.in
+++ b/package/openocd/Config.in
@@ -29,5 +29,5 @@ config BR2_PACKAGE_OPENOCD_VSLLINK
 
 endif # BR2_PACKAGE_OPENOCD
 
-comment "openocd needs a toolchain with thread support"
+comment "openocd needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
index 1b385a3e6d..cae74f76b8 100644
--- a/package/openpgm/Config.in
+++ b/package/openpgm/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_OPENPGM
 
 	  http://code.google.com/p/openpgm/
 
-comment "openpgm needs a toolchain with WCHAR, threads and IPv6 support"
+comment "openpgm needs a toolchain w/ wchar, threads, IPv6"
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in
index 296b0842cc..8229032df9 100644
--- a/package/openpowerlink/Config.in
+++ b/package/openpowerlink/Config.in
@@ -1,4 +1,4 @@
-comment "openpowerlink requires a toolchain with C++ and threads support enabled"
+comment "openpowerlink needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENPOWERLINK
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index a96ed4e00b..e6bf880db6 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -1,4 +1,4 @@
-comment "openvpn requires a toolchain with IPV6 support"
+comment "openvpn needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_OPENVPN
diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index 0d437828be..d1adca3a5c 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -22,5 +22,5 @@ config BR2_PACKAGE_OPROFILE
 	  interrupt handlers, kernel modules, the kernel, shared
 	  libraries, and applications.
 
-comment "oprofile requires a toolchain with C++ support enabled"
+comment "oprofile needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/orc/Config.in b/package/orc/Config.in
index 022c455abb..663d4d338f 100644
--- a/package/orc/Config.in
+++ b/package/orc/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_ORC
 
 	  http://code.entropywave.com/projects/orc/
 
-comment "orc requires a toolchain with thread support"
+comment "orc needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ortp/Config.in b/package/ortp/Config.in
index ab9cab467d..2de3c91f92 100644
--- a/package/ortp/Config.in
+++ b/package/ortp/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_ORTP
 
 	  http://www.linphone.org/eng/documentation/dev/ortp.html
 
-comment "ortp requires a toolchain with threads support"
+comment "ortp needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
index 40a07d3673..7f4f8658d3 100644
--- a/package/p11-kit/Config.in
+++ b/package/p11-kit/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_P11_KIT
 
 	  http://p11-glue.freedesktop.org/p11-kit.html
 
-comment "p11-kit requires a toolchain with thread support"
+comment "p11-kit needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 845ea98ead..71d5b74ee8 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -19,6 +19,6 @@ config BR2_PACKAGE_PANGO
 
 	  http://www.pango.org/
 
-comment "pango requires a toolchain with WCHAR, threading and C++ support"
+comment "pango needs a toolchain w/ wchar, threads, C++"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INSTALL_LIBSTDCPP
diff --git a/package/parted/Config.in b/package/parted/Config.in
index 6c6840d79c..38b41e34f9 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_PARTED
 
 	  http://www.gnu.org/software/parted/
 
-comment "parted requires a toolchain with LARGEFILE+WCHAR support"
+comment "parted needs a toolchain w/ largefile, wchar"
         depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/patch/Config.in b/package/patch/Config.in
index dd6d51c17b..887c84d4d9 100644
--- a/package/patch/Config.in
+++ b/package/patch/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_PATCH
 
 	  http://www.gnu.org/software/patch/
 
-comment "patch needs a toolchain with WCHAR support"
+comment "patch needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index 5c80c10c0a..42088d6c89 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -13,6 +13,6 @@ config BR2_PACKAGE_PCMANFM
 
 	  http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 
-comment "pcmanfm requires a toolchain with WCHAR and threading support"
+comment "pcmanfm needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_XORG7 && \
 	(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in
index d6629d0f3e..87139d9a64 100644
--- a/package/pcsc-lite/Config.in
+++ b/package/pcsc-lite/Config.in
@@ -28,5 +28,5 @@ config BR2_PACKAGE_PCSC_LITE_EMBEDDED
 
 endif
 
-comment "pcsc-lite needs a toolchain with thread support"
+comment "pcsc-lite needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/perf/Config.in b/package/perf/Config.in
index 54b24fe252..88dce93267 100644
--- a/package/perf/Config.in
+++ b/package/perf/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_PERF
 
 	  https://perf.wiki.kernel.org/
 
-comment "perf only available if Linux kernel is enabled, and requires largefile support"
+comment "perf only available if Linux kernel is enabled, and needs a toolchain w/ largefile"
 	depends on !BR2_LINUX_KERNEL || !BR2_LARGEFILE
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 3ba591d0de..4e0d0e606f 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -137,7 +137,7 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
 	help
 	  PDO driver for MySQL
 
-comment "MySQL drivers require a toolchain with C++ support"
+comment "MySQL drivers need a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
@@ -157,7 +157,7 @@ config BR2_PACKAGE_PHP_EXT_GETTEXT
 	help
 	  Gettext support
 
-comment "Gettext support requires a toolchain with WCHAR support"
+comment "Gettext support needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 config BR2_PACKAGE_PHP_EXT_ICONV
@@ -174,7 +174,7 @@ config BR2_PACKAGE_PHP_EXT_INTL
 	help
 	  Internationalization support
 
-comment "intl support requires a toolchain with C++ and WCHAR support"
+comment "intl support needs a toolchain w/ C++, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
 comment "Image processing"
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index bf702d0396..6b560e1b8c 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_PKG_CONFIG
 
 	  http://www.freedesktop.org/software/pkgconfig/
 
-comment "pkg-config requires a toolchain with WCHAR and threading support"
+comment "pkg-config needs a toolchain w/ wchar, threads"
 	depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/poco/Config.in b/package/poco/Config.in
index 47ca83dbe9..11f70e522a 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -59,7 +59,7 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
 
 endif # BR2_PACKAGE_POCO
 
-comment "poco requires a toolchain with WCHAR, threads, and C++ support"
+comment "poco needs a toolchain w/ wchar, threads, C++"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS
 	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
diff --git a/package/polkit/Config.in b/package/polkit/Config.in
index df6c7679a7..26d65ab029 100644
--- a/package/polkit/Config.in
+++ b/package/polkit/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_POLKIT
 
 	  http://www.freedesktop.org/wiki/Software/polkit
 
-comment "polkit requires a toolchain with WCHAR and threading support"
+comment "polkit needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index 876601e3ba..919de3eef6 100644
--- a/package/poppler/Config.in
+++ b/package/poppler/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_POPPLER
 
 	   http://poppler.freedesktop.org/
 
-comment "poppler requires a toolchain with C++ and thread support enabled"
+comment "poppler needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/portaudio/Config.in b/package/portaudio/Config.in
index 5a8f248ffc..eaf095cc83 100644
--- a/package/portaudio/Config.in
+++ b/package/portaudio/Config.in
@@ -1,4 +1,4 @@
-comment "portaudio needs a toolchain threads support"
+comment "portaudio needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_PORTAUDIO
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index 8d25e3a2a7..fa7eaf1e0e 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_PORTMAP
 
 	  http://neil.brown.name/portmap/
 
-comment "portmap requires a toolchain with RPC support"
+comment "portmap needs a toolchain w/ RPC"
 	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/pppd/Config.in b/package/pppd/Config.in
index ba35fed20c..dc16b22cb3 100644
--- a/package/pppd/Config.in
+++ b/package/pppd/Config.in
@@ -22,6 +22,6 @@ config BR2_PACKAGE_PPPD_RADIUS
 	help
 	  Install RADIUS support for pppd
 
-comment "pppd requires a toolchain with dynamic library support"
+comment "pppd needs a toolchain w/ dynamic library"
 	depends on BR2_PREFER_STATIC_LIB
 	depends on BR2_USE_MMU
diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in
index 17cc8f1d32..3baa05e895 100644
--- a/package/protobuf-c/Config.in
+++ b/package/protobuf-c/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_PROTOBUF_C
 
 	  http://code.google.com/p/protobuf-c/
 
-comment "protobuf-c requires a toolchain with C++ and thread support"
+comment "protobuf-c needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in
index 92e85baa01..a4f542e0fc 100644
--- a/package/protobuf/Config.in
+++ b/package/protobuf/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_PROTOBUF
 
 	  http://code.google.com/p/protobuf/
 
-comment "protobuf requires a toolchain with C++ and thread support"
+comment "protobuf needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/proxychains-ng/Config.in b/package/proxychains-ng/Config.in
index 97eaa0c0d7..f2a272faf4 100644
--- a/package/proxychains-ng/Config.in
+++ b/package/proxychains-ng/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_PROXYCHAINS_NG
 
 	  https://github.com/rofl0r/proxychains
 
-comment "proxychains-ng needs a toolchain with thread and dynamic library support"
+comment "proxychains-ng needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/psplash/Config.in b/package/psplash/Config.in
index 73fcfee1af..d68aaa210f 100644
--- a/package/psplash/Config.in
+++ b/package/psplash/Config.in
@@ -27,5 +27,5 @@ config BR2_PACKAGE_PSPLASH
 
 	  http://git.yoctoproject.org/cgit/cgit.cgi/psplash/
 
-comment "psplash requires a toolchain with WCHAR support"
+comment "psplash needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/pulseaudio/Config.in b/package/pulseaudio/Config.in
index bd0ec5f201..010eeab0cf 100644
--- a/package/pulseaudio/Config.in
+++ b/package/pulseaudio/Config.in
@@ -26,5 +26,5 @@ config BR2_PACKAGE_PULSEAUDIO_DAEMON
 	  recommended way of using PulseAudio unless you are building a
 	  headless system.
 
-comment "pulseaudio requires a toolchain with WCHAR, LARGEFILE and threads support"
+comment "pulseaudio needs a toolchain w/ wchar, largefile, threads"
 	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in
index dc46d6c6d1..c63e791308 100644
--- a/package/python-nfc/Config.in
+++ b/package/python-nfc/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_PYTHON_NFC
 
 	  https://launchpad.net/nfcpy
 
-comment "python-nfc requires a toolchain with threads support"
+comment "python-nfc needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in
index a650865aaa..6191ac1979 100644
--- a/package/python-pyzmq/Config.in
+++ b/package/python-pyzmq/Config.in
@@ -12,6 +12,6 @@ config BR2_PACKAGE_PYTHON_PYZMQ
 
 	  http://zeromq.org/bindings:python
 
-comment "python-pyzmq requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
+comment "python-pyzmq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/python/Config.in b/package/python/Config.in
index cfe73db100..a55002344a 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_PYTHON
 
 	  http://www.python.org/
 
-comment "python requires a toolchain with WCHAR support"
+comment "python needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 if BR2_PACKAGE_PYTHON
diff --git a/package/python3/Config.in b/package/python3/Config.in
index 4a70b5e5c3..b355276211 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_PYTHON3
 
 	  http://www.python.org/
 
-comment "python3 requires a toolchain with WCHAR support"
+comment "python3 needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
 if BR2_PACKAGE_PYTHON3
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 2afbd92d56..88013089b1 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -1,4 +1,4 @@
-comment "qt requires a toolchain with C++ and threads support enabled"
+comment "qt needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 menuconfig BR2_PACKAGE_QT
@@ -300,7 +300,7 @@ config BR2_PACKAGE_QT_DBUS
 	help
 	  Build the Qt DBus module.
 
-comment "DBus Module requires a toolchain with thread support"
+comment "DBus Module needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_QT_XML
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 2945d96f62..84060d031e 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -1,4 +1,4 @@
-comment "Qt5 needs a toolchain with WCHAR, IPv6, thread and C++ support"
+comment "Qt5 needs a toolchain w/ wchar, IPv6, threads, C++"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
 
 menuconfig BR2_PACKAGE_QT5
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 90eaef4bfc..1459207d2a 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_QUAGGA_ZEBRA
 	help
 	  Build zebra daemon.
 
-comment "Zebra daemon requires a toolchain with IPV6 support"
+comment "zebra daemon needs a toolchain w/ IPv6"
 	depends on BR2_PACKAGE_QUAGGA && !BR2_INET_IPV6
 
 config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
diff --git a/package/quota/Config.in b/package/quota/Config.in
index 57cf57d97d..3bb4556df2 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_QUOTA
 
 	  http://sourceforge.net/projects/linuxquota/
 
-comment "quota requires a toolchain with LARGEFILE, WCHAR and threading support"
+comment "quota needs a toolchain w/ largefile, wchar, threads"
 	depends on !BR2_LARGEFILE || \
 		!BR2_USE_WCHAR || \
 		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index 98dbae2a6d..5bfb535b52 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_RADVD
 
 	  http://www.litech.org/radvd/
 
-comment "radvd requires a toolchain with IPV6 support"
+comment "radvd needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/redis/Config.in b/package/redis/Config.in
index a1d810145b..e28ccecbe2 100644
--- a/package/redis/Config.in
+++ b/package/redis/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_REDIS
 
 	  http://www.redis.io
 
-comment "redis needs a toolchain with LARGEFILE and thread support"
+comment "redis needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rpcbind/Config.in b/package/rpcbind/Config.in
index 663313bff2..1fb5346692 100644
--- a/package/rpcbind/Config.in
+++ b/package/rpcbind/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_RPCBIND
 	  The rpcbind utility is a server that converts RPC program numbers
 	  into universal addresses.
 
-comment "rpcbind requires a toolchain with threading support"
+comment "rpcbind needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index d4e28a123d..81dc49a378 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -17,5 +17,5 @@ config BR2_PACKAGE_RPI_USERLAND
 
 	  https://github.com/raspberrypi/userland/
 
-comment "rpi-userland requires a toolchain with C++, LARGEFILE and threads support"
+comment "rpi-userland needs a toolchain w/ C++, largefile, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 63e5367726..567871bc7c 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,4 +1,4 @@
-comment "rpm requires a toolchain with thread support"
+comment "rpm needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_RPM
@@ -30,7 +30,7 @@ config BR2_PACKAGE_RPM_XZ_PAYLOADS
 	help
 	  Support for xz payloads in RPM.
 
-comment "xz payload support requires a toolchain with c++ support"
+comment "xz payload support needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 endif
diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
index d315b57aa4..33fa677745 100644
--- a/package/rrdtool/Config.in
+++ b/package/rrdtool/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_RRDTOOL
 
 	  http://oss.oetiker.ch/rrdtool/
 
-comment "rrdtool requires a toolchain with WCHAR support"
+comment "rrdtool needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index a040139579..e913dcd17c 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -22,5 +22,5 @@ config BR2_PACKAGE_RT_TESTS
 
 	  http://rt.wiki.kernel.org
 
-comment "rt-tests requires a toolchain with threads support"
+comment "rt-tests needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index 218cc6ded1..3abb6fa5d6 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_RTORRENT
 
 	  http://libtorrent.rakshasa.no/
 
-comment "rtorrent requires a toolchain with C++, threads and WCHAR support"
+comment "rtorrent needs a toolchain w/ C++, threads, wchar"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/ruby/Config.in b/package/ruby/Config.in
index c18d8ade28..9b505019ce 100644
--- a/package/ruby/Config.in
+++ b/package/ruby/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_RUBY
 
 	  http://www.ruby-lang.org/
 
-comment "ruby requires a toolchain with WCHAR support"
+comment "ruby needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/samba/Config.in b/package/samba/Config.in
index 5339d41402..ce6739642d 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -13,7 +13,7 @@ config BR2_PACKAGE_SAMBA
 	  NOTE: A complete Samba install takes over 50MB of space,
 		so choose only the components you need.
 
-comment "samba needs a toolchain with thread support"
+comment "samba needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 if BR2_PACKAGE_SAMBA
diff --git a/package/schifra/Config.in b/package/schifra/Config.in
index 466ac0e9ec..5a656eaf61 100644
--- a/package/schifra/Config.in
+++ b/package/schifra/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_SCHIFRA_EXAMPLES
 	help
 	  Build and install the schifra example applications.
 
-comment "schifra requires a toolchain with C++ support enabled"
+comment "schifra needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index e9b51c0163..58c1e036fd 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -92,5 +92,5 @@ comment "ui module requires X.org"
 
 endif # BR2_PACKAGE_SCONESERVER
 
-comment "sconeserver requires a toolchain with C++ and thread support enabled"
+comment "sconeserver needs a toolchain w/ C++, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/sed/Config.in b/package/sed/Config.in
index 1430915aea..c6c91df48f 100644
--- a/package/sed/Config.in
+++ b/package/sed/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_SED
 
 	  http://sed.sourceforge.net/
 
-comment "sed requires a toolchain with WCHAR support"
+comment "sed needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in
index e3b8870cb6..476a284a73 100644
--- a/package/ser2net/Config.in
+++ b/package/ser2net/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_SER2NET
 
 	  http://ser2net.sourceforge.net
 
-comment "ser2net requires a toolchain with IPV6 support"
+comment "ser2net needs a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
diff --git a/package/sg3_utils/Config.in b/package/sg3_utils/Config.in
index 3262eaef0e..9d2dbeaffe 100644
--- a/package/sg3_utils/Config.in
+++ b/package/sg3_utils/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_SG3_UTILS_PROGS
 	bool "install programs"
 	depends on BR2_PACKAGE_SG3_UTILS
 
-comment "sg3-utils requires a toolchain with LARGEFILE and threads support"
+comment "sg3-utils needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in
index ee635accc8..7be199d9f8 100644
--- a/package/shared-mime-info/Config.in
+++ b/package/shared-mime-info/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_SHARED_MIME_INFO
 
 	  http://freedesktop.org/wiki/Software/shared-mime-info
 
-comment "shared-mime-info requires a toolchain with WCHAR and threading support"
+comment "shared-mime-info needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/smartmontools/Config.in b/package/smartmontools/Config.in
index dd8197fe0d..1c6b1bc312 100644
--- a/package/smartmontools/Config.in
+++ b/package/smartmontools/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_SMARTMONTOOLS
 
 	  http://smartmontools.sourceforge.net/
 
-comment "smartmontools requires a toolchain with C++ support enabled"
+comment "smartmontools needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/snappy/Config.in b/package/snappy/Config.in
index 36093bc6ad..06d537f1c9 100644
--- a/package/snappy/Config.in
+++ b/package/snappy/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_SNAPPY
 
 	  http://code.google.com/p/snappy/
 
-comment "snappy requires a toolchain with C++ support"
+comment "snappy needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
index 71b60e622f..cd1b4132b6 100644
--- a/package/snowball-init/Config.in
+++ b/package/snowball-init/Config.in
@@ -12,6 +12,6 @@ config BR2_PACKAGE_SNOWBALL_INIT
 
 	  http://www.igloocommunity.org
 
-comment "snowball-init requires a toolchain with WCHAR and threading support"
+comment "snowball-init needs a toolchain w/ wchar, threads"
 	depends on !BR2_avr32 && \
 		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/socat/Config.in b/package/socat/Config.in
index ec69c96430..f7717192a3 100644
--- a/package/socat/Config.in
+++ b/package/socat/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_SOCAT
 
 	  http://www.dest-unreach.org/socat/
 
-comment "socat requires a toolchain with thread support"
+comment "socat needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
index b836f55ed5..d4f210ea49 100644
--- a/package/socketcand/Config.in
+++ b/package/socketcand/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_SOCKETCAND
 
 	  https://github.com/dschanoeh/socketcand
 
-comment "socketcand requires a toolchain with threads support"
+comment "socketcand needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/spice/Config.in b/package/spice/Config.in
index cd9183318b..e9fd639830 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -37,7 +37,7 @@ config BR2_PACKAGE_SPICE_CLIENT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 
-comment "client requires a toolchain with threads and C++"
+comment "client needs a toolchain w/ threads, C++"
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 
diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
index e793019353..8c4966f0bc 100644
--- a/package/sqlcipher/Config.in
+++ b/package/sqlcipher/Config.in
@@ -29,5 +29,5 @@ config BR2_PACKAGE_SQLCIPHER_STAT3
 comment "sqlcipher conflicts with sqlite"
 	depends on BR2_PACKAGE_SQLITE
 
-comment "sqlcipher needs a toolchain with thread support"
+comment "sqlcipher needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 93d3594646..2f80eb1cfa 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -37,5 +37,5 @@ config BR2_PACKAGE_SQUASHFS_XZ
 
 endif
 
-comment "squashfs requires a toolchain with LARGEFILE and threads support"
+comment "squashfs needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/squashfs3/Config.in b/package/squashfs3/Config.in
index 32912722ff..8ce1e495a3 100644
--- a/package/squashfs3/Config.in
+++ b/package/squashfs3/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_SQUASHFS3
 
 	  http://squashfs.sourceforge.net/
 
-comment "squashfs3 requires a toolchain with LARGEFILE support"
+comment "squashfs3 needs a toolchain w/ largefile"
 	depends on BR2_DEPRECATED && !BR2_LARGEFILE
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 8a77da8899..8d0df6ef5d 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,4 +1,4 @@
-comment "Squid requires a toolchain with C++ and IPv6 support enabled"
+comment "squid needs a toolchain w/ C++, IPv6"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
 
 config BR2_PACKAGE_SQUID
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 3e7ed15a71..34f6af32cd 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_SSHFS
 
 	  http://fuse.sourceforge.net/sshfs.html
 
-comment "sshfs requires a toolchain with LARGEFILE, WCHAR, threads and dynamic library support"
+comment "sshfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in
index e8cd1c4afe..3ed0b31748 100644
--- a/package/strongswan/Config.in
+++ b/package/strongswan/Config.in
@@ -17,7 +17,7 @@ menuconfig BR2_PACKAGE_STRONGSWAN
 
 if BR2_PACKAGE_STRONGSWAN
 
-comment "kernel-netlink and socket-default options require a toolchain with IPV6 support"
+comment "kernel-netlink and socket-default options need a toolchain w/ IPv6"
 	depends on !BR2_INET_IPV6
 
 choice
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 04351b7e94..753958b2b9 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_SYNERGY
 
 	  http://synergy2.sourceforge.net/
 
-comment "synergy requires a toolchain with C++ and WCHAR support enabled"
+comment "synergy needs a toolchain w/ C++, wchar"
 	depends on BR2_PACKAGE_XORG7 && !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in
index e3cf2ba265..1216bccf8c 100644
--- a/package/sysklogd/Config.in
+++ b/package/sysklogd/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_SYSKLOGD
 
 	  http://www.infodrom.org/products/sysklogd/
 
-comment "syslogd requires a toolchain with LARGEFILE support"
+comment "syslogd needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in
index d78062aebc..70e89033c3 100644
--- a/package/sysprof/Config.in
+++ b/package/sysprof/Config.in
@@ -24,5 +24,5 @@ config BR2_PACKAGE_SYSPROF_GUI
 
 endif
 
-comment "sysprof requires a toolchain with WCHAR and threading support"
+comment "sysprof needs a toolchain w/ wchar, threads"
         depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 86ab2cf1b8..49536be13a 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -18,6 +18,6 @@ config BR2_PACKAGE_SYSTEMD
 
 	  http://freedesktop.org/wiki/Software/systemd
 
-comment "systemd not available (depends on /dev management with udev and ipv6 support, and thread support in toolchain)"
+comment "systemd needs udev /dev management and a toolchain w/ IPv6, threads"
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || !BR2_INET_IPV6 || \\
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/taglib/Config.in b/package/taglib/Config.in
index 2777d0d90e..1edf582788 100644
--- a/package/taglib/Config.in
+++ b/package/taglib/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_TAGLIB_ASF
 	depends on BR2_PACKAGE_TAGLIB
 	bool "taglib wma support"
 
-comment "taglib requires a toolchain with C++ support enabled"
+comment "taglib needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/tar/Config.in b/package/tar/Config.in
index 427cae461d..06a58250e7 100644
--- a/package/tar/Config.in
+++ b/package/tar/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_TAR
 
 	  http://www.gnu.org/software/tar/
 
-comment "tar requires a toolchain with WCHAR support"
+comment "tar needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/ti-utils/Config.in b/package/ti-utils/Config.in
index 94d620458d..e48e10bdd2 100644
--- a/package/ti-utils/Config.in
+++ b/package/ti-utils/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_TI_UTILS
 
 	  http://linuxwireless.org/en/users/Drivers/wl12xx/calibrator
 
-comment "ti-utils requires a toolchain with thread support"
+comment "ti-utils needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in
index 8d793046a0..949abce4a6 100644
--- a/package/trace-cmd/Config.in
+++ b/package/trace-cmd/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_TRACE_CMD
 
 	  http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
 
-comment "trace-cmd needs a toolchain with largefile and threads support"
+comment "trace-cmd needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 30314f74f5..9ed60f0d72 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -18,7 +18,7 @@ config BR2_PACKAGE_TRANSMISSION_UTP
 	help
 	  Install support for uTorrent Transport Protocol
 
-comment "uTP requires a toolchain with C++ support"
+comment "uTP needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_TRANSMISSION_CLI
@@ -42,9 +42,9 @@ config BR2_PACKAGE_TRANSMISSION_GTK
 	help
 	  Install transmission GTK-based GUI interface.
 
-comment "transmission-gtk requires a toolchain with locale support"
+comment "transmission-gtk needs a toolchain w/ locale"
 	depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE
 endif
 
-comment "Transmission requires a toolchain with IPv6 and threads support"
+comment "transmission needs a toolchain w/ IPv6, threads"
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/tree/Config.in b/package/tree/Config.in
index b6e21c87ce..234995f109 100644
--- a/package/tree/Config.in
+++ b/package/tree/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_TREE
 
 	  http://mama.indstate.edu/users/ice/tree/
 
-comment "tree requires a toolchain with WCHAR support"
+comment "tree needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/tstools/Config.in b/package/tstools/Config.in
index 1ca67bfe23..24d4403105 100644
--- a/package/tstools/Config.in
+++ b/package/tstools/Config.in
@@ -16,5 +16,5 @@ config BR2_PACKAGE_TSTOOLS
 
 	  http://tstools.berlios.de/
 
-comment "tstools needs largefile support in toolchain"
+comment "tstools needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 7083b01a7d..52a5f047a6 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -1,4 +1,4 @@
-comment "tvheadend needs a toolchain with LARGEFILE, IPv6 and THREADS support"
+comment "tvheadend needs a toolchain w/ largefile, IPv6, threads"
     depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_TVHEADEND
diff --git a/package/udev/Config.in b/package/udev/Config.in
index d4d97c1781..2bcd685281 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -32,7 +32,7 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	  Enable all extras with external dependencies like
 	  libacl, hwdata and libglib2
 
-comment "enabling all extras requires a toolchain with WCHAR and threading support"
+comment "enabling all extras needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 endif
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index dca23ea4fe..eae76b238e 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -35,6 +35,6 @@ config BR2_PACKAGE_UDISKS_LVM2
 
 endif
 
-comment "udisks requires /dev mgmnt set to udev under System configuration and a toolchain with WCHAR and threading support"
+comment "udisks needs udev /dev management and a toolchain w/ wchar, threads"
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index cae27bd287..506eaba8a4 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_UDPCAST
 
 	  http://www.udpcast.linux.lu/
 
-comment "udpcast requires a toolchain with LARGEFILE and threads support"
+comment "udpcast needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 menu "udpcast tools selection"
diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
index a524056aad..04acf0c501 100644
--- a/package/ulogd/Config.in
+++ b/package/ulogd/Config.in
@@ -14,6 +14,6 @@ config BR2_PACKAGE_ULOGD
 
 	  http://www.netfilter.org/projects/ulogd/
 
-comment "ulogd requires a toolchain with IPV6, LARGEFILE and dynamic library support"
+comment "ulogd needs a toolchain w/ IPv6, largefile, dynamic library"
 	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB
 	depends on BR2_USE_MMU
diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in
index 6ceee89e8e..aa4f66c131 100644
--- a/package/unionfs/Config.in
+++ b/package/unionfs/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_UNIONFS
 
 	  http://podgorny.cz/moin/UnionFsFuse
 
-comment "unionfs requires a toolchain with LARGEFILE, threads and dynamic library support"
+comment "unionfs needs a toolchain w/ largefile, threads, dynamic library"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/urg/Config.in b/package/urg/Config.in
index cbc6e6ac98..ded8204406 100644
--- a/package/urg/Config.in
+++ b/package/urg/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_URG
 
 	  http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
 
-comment "urg requires a toolchain with C++ support"
+comment "urg needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in
index 8b3e408787..5d8a6d2abc 100644
--- a/package/usb_modeswitch/Config.in
+++ b/package/usb_modeswitch/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_USB_MODESWITCH
 
 	  http://www.draisberghof.de/usb_modeswitch/
 
-comment "usb_modeswitch needs a toolchain with thread support"
+comment "usb_modeswitch needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/usb_modeswitch_data/Config.in b/package/usb_modeswitch_data/Config.in
index e0e8f4cfda..ad96726ad6 100644
--- a/package/usb_modeswitch_data/Config.in
+++ b/package/usb_modeswitch_data/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_USB_MODESWITCH_DATA
 
 	  http://www.draisberghof.de/usb_modeswitch/
 
-comment "usb_modeswitch_data needs a toolchain with thread support"
+comment "usb_modeswitch_data needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in
index e2a71840ac..c57014af3f 100644
--- a/package/usbredir/Config.in
+++ b/package/usbredir/Config.in
@@ -1,4 +1,4 @@
-comment "usbredir needs a toolchain with threads"
+comment "usbredir needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_USBREDIR
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index fd9926c4bd..8f0b8f593f 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -17,5 +17,5 @@ config BR2_PACKAGE_USBUTILS_ZLIB
 	  filesystem, but it also makes lsusb slower since it has
 	  to decompress the file every time it's run.
 
-comment "usbutils needs a toolchain with thread support"
+comment "usbutils needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ushare/Config.in b/package/ushare/Config.in
index 5b87087280..981f0812d1 100644
--- a/package/ushare/Config.in
+++ b/package/ushare/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_USHARE
 
 	  http://ushare.geexbox.org/
 
-comment "ushare requires a toolchain with LARGEFILE and thread support"
+comment "ushare needs a toolchain w/ largefile, threads"
 	depends on !(BR2_LARGEFILE && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index 27c5a4370e..0de1a51b5a 100644
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_USSP_PUSH
 
 	  http://www.xmailserver.org/ussp-push.html
 
-comment "ussp-push require a toolchain with WCHAR, IPV6 and thread support"
+comment "ussp-push needs a toolchain w/ wchar, IPv6, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index e63814f716..41e0986eee 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -92,7 +92,7 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	help
 	  Build login utilities (last, login, su, sulogin)
 
-comment "login utilities require a toolchain with locale support"
+comment "login utilities needs a toolchain w/ locale"
 	depends on !BR2_ENABLE_LOCALE
 
 config BR2_PACKAGE_UTIL_LINUX_MESG
@@ -174,5 +174,5 @@ endif
 
 endif
 
-comment "util-linux requires a toolchain with LARGEFILE + WCHAR support"
+comment "util-linux needs a toolchain w/ largefile, wchar"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/vala/Config.in b/package/vala/Config.in
index 35c02574f4..e15b441d13 100644
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_VALA
 
 	  http://live.gnome.org/Vala
 
-comment "vala requires a toolchain with WCHAR and threading support"
+comment "vala needs a toolchain w/ wchar, threads"
 	depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/wayland/Config.in b/package/wayland/Config.in
index 591e0f08f7..260832fe79 100644
--- a/package/wayland/Config.in
+++ b/package/wayland/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_WAYLAND
 
 	  http://wayland.freedesktop.org/
 
-comment "wayland requires a toolchain with thread support"
+comment "wayland needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 1d4c5a328a..762ed9025f 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -28,6 +28,6 @@ config BR2_PACKAGE_WEBKIT
 
 	  http://webkit.org/
 
-comment "webkit requires libgtk2 and a toolchain with C++, WCHAR, threading support"
+comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads"
 	depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in
index 9fa141fe13..d795b071fd 100644
--- a/package/webrtc-audio-processing/Config.in
+++ b/package/webrtc-audio-processing/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
 
 	  http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
 
-comment "webrtc-audio-processing requires a toolchain with C++ and thread support enabled"
+comment "webrtc-audio-processing needs a toolchain w/ C++, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/wget/Config.in b/package/wget/Config.in
index 354b48f6b0..254acfd8d5 100644
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_WGET
 
 	  http://www.gnu.org/software/wget/
 
-comment "wget requires a toolchain with WCHAR support"
+comment "wget needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index 111dd4835c..0a34c3b3a8 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -12,5 +12,5 @@ config BR2_PACKAGE_WIRESHARK
 
 	  http://www.wireshark.org
 
-comment "wireshark requires a toolchain with WCHAR and threading support"
+comment "wireshark needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in
index 42431ca934..012d3686db 100644
--- a/package/wvdial/Config.in
+++ b/package/wvdial/Config.in
@@ -9,5 +9,5 @@ config BR2_PACKAGE_WVDIAL
 
 	  http://wvdial.googlecode.com/
 
-comment "wvdial requires a toolchain with C++ and largefile support enabled"
+comment "wvdial needs a toolchain w/ C++, largefile"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in
index 11b8e44720..c717b60665 100644
--- a/package/wvstreams/Config.in
+++ b/package/wvstreams/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_WVSTREAMS
 
 	  http://wvstreams.googlecode.com/
 
-comment "wvstreams requires a toolchain with C++ and largefile support enabled"
+comment "wvstreams needs a toolchain w/ C++, largefile"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 205079c856..09bc078812 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -261,5 +261,5 @@ if BR2_PACKAGE_XORG7
 	endmenu
 endif
 
-comment "X.org requires a toolchain with WCHAR support"
+comment "X.org needs a toolchain w/ wchar"
         depends on !BR2_USE_WCHAR
diff --git a/package/x11r7/xapp_xinput-calibrator/Config.in b/package/x11r7/xapp_xinput-calibrator/Config.in
index ac98b8d0d3..76fbcd4305 100644
--- a/package/x11r7/xapp_xinput-calibrator/Config.in
+++ b/package/x11r7/xapp_xinput-calibrator/Config.in
@@ -8,5 +8,5 @@ config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR
 
 	  http://www.freedesktop.org/wiki/Software/xinput_calibrator
 
-comment "xinput-calibrator requires a toolchain with C++ support"
+comment "xinput-calibrator needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/x11r7/xlib_libpciaccess/Config.in b/package/x11r7/xlib_libpciaccess/Config.in
index b53aa313e0..5f7d136799 100644
--- a/package/x11r7/xlib_libpciaccess/Config.in
+++ b/package/x11r7/xlib_libpciaccess/Config.in
@@ -4,5 +4,5 @@ config BR2_PACKAGE_XLIB_LIBPCIACCESS
 	help
 	  X.Org libpciaccess
 
-comment "libpciaccess requires a toolchain with LARGEFILE support"
+comment "libpciaccess needs a toolchain w/ largefile"
 	depends on !BR2_LARGEFILE
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index c860a1d9a1..aab9e808d3 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -75,7 +75,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	  input and graphics) are built separately from the X.org
 	  server (see the xdriver* packages).
 
-comment "Modular X.org requires largefile and C++ support"
+comment "Modular X.org needs a toolchain w/ largefile, C++"
 	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index f9de36bf22..5a0464ba5f 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -1,4 +1,4 @@
-comment "xenomai requires thread support in toolchain"
+comment "xenomai needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_XENOMAI
diff --git a/package/xerces/Config.in b/package/xerces/Config.in
index 374729a466..8d55a5cbc2 100644
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_XERCES
 
 	  http://xml.apache.org/xerces-c/
 
-comment "xerces-c++ requires a toolchain with C++ and WCHAR support enabled"
+comment "xerces-c++ needs a toolchain w/ C++, wchar"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
index fda068f7d6..0bd4199b88 100644
--- a/package/xfsprogs/Config.in
+++ b/package/xfsprogs/Config.in
@@ -2,7 +2,7 @@
 comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled"
 	depends on BR2_PACKAGE_XFSPROGS
 
-comment "xfsprogs requires a toolchain with LARGEFILE + WCHAR support"
+comment "xfsprogs needs a toolchain w/ largefile, wchar"
         depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_XFSPROGS
diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in
index cbe797d01a..3e107d7118 100644
--- a/package/xscreensaver/Config.in
+++ b/package/xscreensaver/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_XSCREENSAVER
 
 	  http://www.jwz.org/xscreensaver/
 
-comment "xscreensaver requires a toolchain with C++ and thread support enabled"
+comment "xscreensaver needs a toolchain w/ C++, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index 35704c3981..42e13d2b0a 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -1,4 +1,4 @@
-comment "zeromq requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
+comment "zeromq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
 
diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index 9afcca49fd..bbc4f95009 100644
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_ZMQPP
 
 	  http://github.com/benjamg/zmqpp
 
-comment "zmqpp requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
+comment "zmqpp needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
 
@@ -29,5 +29,5 @@ config BR2_PACKAGE_ZMQPP_CLIENT
 	  Build and install the zmqpp client, a command line tool that can be
 	  used to listen or send to zeromq sockets.
 
-comment "zmqpp client requires a toolchain with thread support"
+comment "zmqpp client needs a toolchain w/ threads"
 	depends on BR2_PACKAGE_ZMQPP && !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/zxing/Config.in b/package/zxing/Config.in
index c1d342c71e..b69dfc9230 100644
--- a/package/zxing/Config.in
+++ b/package/zxing/Config.in
@@ -1,4 +1,4 @@
-comment "zxing requires a toolchain with C++ support"
+comment "zxing needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_ZXING
diff --git a/package/zyre/Config.in b/package/zyre/Config.in
index 0ae0eec148..52f1ca2fc7 100644
--- a/package/zyre/Config.in
+++ b/package/zyre/Config.in
@@ -16,6 +16,6 @@ config BR2_PACKAGE_ZYRE
 
 	  http://zyre.org
 
-comment "zyre requires a toolchain with C++, IPv6, LARGEFILE, WCHAR & thread support"
+comment "zyre needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/system/Config.in b/system/Config.in
index 9d4e8377af..4c80087f7d 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -87,7 +87,7 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on !BR2_PREFER_STATIC_LIB # udev -> kmod
 	select BR2_PACKAGE_UDEV
 
-comment "udev requires a toolchain with LARGEFILE + WCHAR support"
+comment "udev needs a toolchain w/ largefile, wchar"
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
 comment "udev doesn't work with 'prefer static libraries'"
@@ -118,7 +118,7 @@ config BR2_INIT_SYSTEMD
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_SYSTEMD
 
-comment 'systemd requires largefile, wchar, IPv6, threads and udev support'
+comment 'systemd needs udev /dev management and a toolchain w/ largefile, wchar, IPv6, threads'
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && \
 		     BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \
 		     BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV)

From 611dfe6cb55ed72d7df3b7c102f4a723248a4037 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 14 Oct 2013 11:15:11 -0300
Subject: [PATCH 6473/6849] boost: fix build failures after version bump

Fix build failures that happened after the version bump such as:
http://autobuild.buildroot.net/results/570/570b091702763b29843d9207bc14dea67085fea0/
http://autobuild.buildroot.net/results/c26/c26498f1a4e6bcbc3a2dfce6a51fa7d21b72f21f/
and other failures by disabling the new (1.54+) coroutine and log
libraries which weren't handled and hence enabled by default.

These also made the target size bigger and build times longer
unnecessarily.

When/if they are needed for some future user this can be revisited and
their proper conditions for enablement assesed.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/boost/boost.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index a745ce1865..b0b3352726 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -17,7 +17,9 @@ BOOST_DEPENDENCIES =
 BOOST_FLAGS =
 
 # atomic library compile only with upstream version, wait for next release
-BOOST_WITHOUT_FLAGS = python atomic
+# coroutine breaks on some weak toolchains and it's new for 1.54+
+# log breaks with some toolchain combinations and it's new for 1.54+
+BOOST_WITHOUT_FLAGS = atomic coroutine log python
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)

From 54e0493ad7399faae23757270be4db29efa063ac Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 14 Oct 2013 16:05:39 +0200
Subject: [PATCH 6474/6849] netcat: add license information

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netcat/netcat.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 5b083e64ef..5d01ebbad6 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -6,5 +6,7 @@
 
 NETCAT_VERSION = 0.7.1
 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
+NETCAT_LICENSE = GPLv2+
+NETCAT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

From 4b1eba735e03ee6ad2147325f0a73408454d960a Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 14 Oct 2013 16:05:40 +0200
Subject: [PATCH 6475/6849] noip: add license information

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/noip/noip.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/noip/noip.mk b/package/noip/noip.mk
index a3d5e3dc5d..04ff5b29e7 100644
--- a/package/noip/noip.mk
+++ b/package/noip/noip.mk
@@ -7,6 +7,8 @@
 NOIP_VERSION = 2.1.9
 NOIP_SITE = http://www.no-ip.com/client/linux
 NOIP_SOURCE = noip-duc-linux.tar.gz
+NOIP_LICENSE = GPLv2+
+NOIP_LICENSE_FILES = COPYING
 
 define NOIP_BUILD_CMDS
 	sed -i -e "s:\(#define CONFIG_FILENAME\).*:\1 \"/etc/no-ip2.conf\":" \

From 75c01bf213075b8972393bdc5b37c233db817cff Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Wed, 9 Oct 2013 15:46:15 -0500
Subject: [PATCH 6476/6849] manual: update review process and patchwork

Adding more documentaiton based on discussion from the mailing list
in regards the buildroot review process and how patchworks can be
used to pull in patches for testing purposes.

Mailing list discussion:
http://lists.busybox.net/pipermail/buildroot/2013-September/078170.html

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/contribute.txt   | 12 ++++++++++-
 docs/manual/get-involved.txt | 39 +++++++++++++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 2b2783d695..201685cc78 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -132,9 +132,15 @@ $ git format-patch --subject-prefix "PATCH v4" \
 Reviewing/Testing patches
 -------------------------
 
+The review process for new patches is done over the mailing list. Once
+a patch is submitted to the mailing list, other developers will provide
+feedback to the patch via emails sent through the mailing list.
+
 In the review process, do not hesitate to respond to patch submissions
 for remarks, suggestions or anything that will help everyone to
-understand the patches and make them better.
+understand the patches and make them better. Please use internet
+style replies in plain text emails when responding to patch
+submissions.
 
 Some tags are used to help following the state of any patch posted on
 the mailing-list:
@@ -144,6 +150,10 @@ Acked-by:: Indicates that the patch can be committed.
 Tested-by:: Indicates that the patch has been tested. It is useful
   but not necessary to add a comment about what has been tested.
 
+Buildroot's Patchwork website can be used to pull in patches for testing
+purposes. Please see xref:apply-patches-patchwork[] for more
+information on using Buildroot's Patchwork website to apply patches.
+
 Autobuild
 ---------
 
diff --git a/docs/manual/get-involved.txt b/docs/manual/get-involved.txt
index 8515d34dc1..8475038d18 100644
--- a/docs/manual/get-involved.txt
+++ b/docs/manual/get-involved.txt
@@ -55,11 +55,44 @@ using a code sharing website.
 Patchwork
 ---------
 
-The Buildroot patch management interface is at
+Patchwork is a web-based patch tracking system designed to facilitate
+the contribution and management of contributions to an open-source
+project. Patches that have been sent to a mailing list are \'caught' by
+the system, and appear on a web page. Any comments posted that
+reference the patch are appended to the patch page too. For more
+information on Patchwork see
+http://jk.ozlabs.org/projects/patchwork[].
+
+Buildroot's Patchwork website is mainly for use by Buildroot's
+maintainer to ensure patches aren't missed. The website however,
+exposes patches and their corresponding review comments in a clean
+and concise web interface.
+
+The Buildroot patch management interface is available at
 http://patchwork.buildroot.org[].
 
-All patches and comments sent through the mailing list are
-automatically indexed in http://patchwork.buildroot.org[patchwork].
+[[apply-patches-patchwork]]
+Applying Patches from Patchwork
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The main use of Buildroot's Patchwork website for a developer is for
+pulling in patches into their local git repository for testing
+purposes.
+
+When browsing patches in the patchwork management interface, an +mbox+
+link is provided at the top of the page. Copy this link address and
+run the following commands:
+
+---------------------
+$ git checkout -b <test-branch-name>
+$ wget -O - <mbox-url> | git am
+---------------------
+
+Another option for applying patches is to create a bundle. A bundle is
+a set of patches that you can group together using the patchwork
+interface. Once the bundle is created and the bundle is made public,
+you can copy the +mbox+ link for the bundle and apply the bundle
+using the above commands.
 
 [[bugtracker]]
 Bugtracker

From 2e80b7072a5394ca13272a9ed36c4de96472ff91 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 14 Oct 2013 23:26:35 +0200
Subject: [PATCH 6477/6849] package/wayland: bump to 1.3.0

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/wayland/wayland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index 013d401568..b6fa4bef1b 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.2.1
+WAYLAND_VERSION = 1.3.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases/
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT

From dda59a65a010524a92dc4d55985906353acb9625 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 14 Oct 2013 23:26:36 +0200
Subject: [PATCH 6478/6849] package/weston: bump to 1.3.0

Needs three patches from upstream, plus a custom patch to disable tests.
Drop old patches, all applied upstream or no longer needed.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-0000-dont-leak-fd-on-launcher-error.patch | 77 +++++++++++++++++++
 ...nt-code-only-when-the-DRM-compositor.patch | 47 -----------
 ...ton-0001-enable-build-without-libdrm.patch | 45 +++++++++++
 ...02-fbdev-fix-compilation-without-EGL.patch | 29 +++++++
 ...x-configure.ac-check-wayland-scanner.patch | 26 -------
 ...itor-fbdev-drop-dependency-on-libdrm.patch | 22 ------
 .../weston/weston-0003-dont-build-tests.patch | 18 +++++
 package/weston/weston.mk                      |  4 +-
 8 files changed, 171 insertions(+), 97 deletions(-)
 create mode 100644 package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch
 delete mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
 create mode 100644 package/weston/weston-0001-enable-build-without-libdrm.patch
 create mode 100644 package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch
 delete mode 100644 package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
 delete mode 100644 package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
 create mode 100644 package/weston/weston-0003-dont-build-tests.patch

diff --git a/package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch b/package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch
new file mode 100644
index 0000000000..0929d010b1
--- /dev/null
+++ b/package/weston/weston-0000-dont-leak-fd-on-launcher-error.patch
@@ -0,0 +1,77 @@
+commit 4a74d5a4a45423752105f865a8310ce878b1790a
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date:   Wed Oct 9 11:19:11 2013 -0700
+
+    launcher: Don't leak tty file descriptor on error
+
+---
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/src/launcher-util.c b/src/launcher-util.c
+index d90271f..8ab61f1 100644
+--- a/src/launcher-util.c
++++ b/src/launcher-util.c
+@@ -275,7 +275,7 @@ setup_tty(struct weston_launcher *launcher, int tty)
+ 		weston_log("%s not a vt\n", tty_device);
+ 		weston_log("if running weston from ssh, "
+ 			   "use --tty to specify a tty\n");
+-		return -1;
++		goto err_close;
+ 	}
+ 
+ 	ret = ioctl(launcher->tty, KDGETMODE, &kd_mode);
+@@ -286,7 +286,7 @@ setup_tty(struct weston_launcher *launcher, int tty)
+ 	if (kd_mode != KD_TEXT) {
+ 		weston_log("%s is already in graphics mode, "
+ 			   "is another display server running?\n", tty_device);
+-		return -1;
++		goto err_close;
+ 	}
+ 
+ 	ret = ioctl(launcher->tty, VT_ACTIVATE, minor(buf.st_rdev));
+@@ -297,19 +297,19 @@ setup_tty(struct weston_launcher *launcher, int tty)
+ 
+ 	if (ioctl(launcher->tty, KDGKBMODE, &launcher->kb_mode)) {
+ 		weston_log("failed to read keyboard mode: %m\n");
+-		return -1;
++		goto err_close;
+ 	}
+ 
+ 	if (ioctl(launcher->tty, KDSKBMUTE, 1) &&
+ 	    ioctl(launcher->tty, KDSKBMODE, K_OFF)) {
+ 		weston_log("failed to set K_OFF keyboard mode: %m\n");
+-		return -1;
++		goto err_close;
+ 	}
+ 
+ 	ret = ioctl(launcher->tty, KDSETMODE, KD_GRAPHICS);
+ 	if (ret) {
+ 		weston_log("failed to set KD_GRAPHICS mode on tty: %m\n");
+-		return -1;
++		goto err_close;
+ 	}
+ 
+ 	mode.mode = VT_PROCESS;
+@@ -317,16 +317,20 @@ setup_tty(struct weston_launcher *launcher, int tty)
+ 	mode.acqsig = SIGUSR1;
+ 	if (ioctl(launcher->tty, VT_SETMODE, &mode) < 0) {
+ 		weston_log("failed to take control of vt handling\n");
+-		return -1;
++		goto err_close;
+ 	}
+ 
+ 	loop = wl_display_get_event_loop(launcher->compositor->wl_display);
+ 	launcher->vt_source =
+ 		wl_event_loop_add_signal(loop, SIGUSR1, vt_handler, launcher);
+ 	if (!launcher->vt_source)
+-		return -1;
++		goto err_close;
+ 
+ 	return 0;
++
++ err_close:
++	close(launcher->tty);
++	return -1;
+ }
+ 
+ int
diff --git a/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch b/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
deleted file mode 100644
index d390b025fe..0000000000
--- a/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b8a831387a37f09ea5479eeb1d435a26680299c6 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 19 Apr 2013 06:19:05 +0200
-Subject: [PATCH] Pull DRM dependent code only when the DRM compositor is
- enabled
-
-The <xf86drm.h> header and the drm*() functions may not be available
-at all when the DRM compositor is not enabled, so they should not be
-used. Fixes build failures when building the fbdev compositor on
-systems where DRM is not available.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/launcher-util.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/launcher-util.c b/src/launcher-util.c
-index 9196e4f..d2fb160 100644
---- a/src/launcher-util.c
-+++ b/src/launcher-util.c
-@@ -31,7 +31,9 @@
- #include <sys/uio.h>
- #include <fcntl.h>
- 
-+#ifdef BUILD_DRM_COMPOSITOR
- #include <xf86drm.h>
-+#endif
- 
- #include "compositor.h"
- #include "launcher-util.h"
-@@ -103,6 +105,7 @@ weston_launcher_open(struct weston_compositor *compositor,
- 	return data->fd;
- }
- 
-+#ifdef BUILD_DRM_COMPOSITOR
- int
- weston_launcher_drm_set_master(struct weston_compositor *compositor,
- 			       int drm_fd, char master)
-@@ -157,4 +160,4 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor,
- 
- 	return ret;
- }
--
-+#endif
--- 
-1.7.9.5
-
diff --git a/package/weston/weston-0001-enable-build-without-libdrm.patch b/package/weston/weston-0001-enable-build-without-libdrm.patch
new file mode 100644
index 0000000000..9d1162350a
--- /dev/null
+++ b/package/weston/weston-0001-enable-build-without-libdrm.patch
@@ -0,0 +1,45 @@
+commit 0b12db5f519a347ce0e1d5262e0cb2e9e2cc6990
+Author: Tomeu Vizoso <tomeu@tomeuvizoso.net>
+Date:   Wed Oct 9 11:30:57 2013 +0200
+
+    launcher: Wrap drmGetMagic and drmAuthMagic so we can build without libdrm
+
+---
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/src/launcher-util.c b/src/launcher-util.c
+index 6b6a5f3..35a5698 100644
+--- a/src/launcher-util.c
++++ b/src/launcher-util.c
+@@ -80,9 +80,19 @@ drm_set_master(int drm_fd)
+ 		return drmSetMaster(drm_fd);
+ 	return -EBADF;
+ }
++static int
++drm_check_master(int drm_fd)
++{
++	drm_magic_t magic;
++	if (drm_fd != -1)
++		return drmGetMagic(drm_fd, &magic) != 0 ||
++		       drmAuthMagic(drm_fd, magic) != 0;
++	return 0;
++}
+ #else
+ static int drm_drop_master(int drm_fd) {return 0;}
+ static int drm_set_master(int drm_fd) {return 0;}
++static int drm_check_master(int drm_fd) {return 1;}
+ #endif
+ 
+ int
+@@ -110,10 +120,8 @@ weston_launcher_open(struct weston_launcher *launcher,
+ 		}
+ 
+ 		if (major(s.st_rdev) == DRM_MAJOR) {
+-			drm_magic_t magic;
+ 			launcher->drm_fd = fd;
+-			if (drmGetMagic(fd, &magic) != 0 ||
+-			    drmAuthMagic(fd, magic) != 0) {
++			if (!drm_check_master(fd)) {
+ 				weston_log("drm fd not master\n");
+ 				close(fd);
+ 				return -1;
diff --git a/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch b/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch
new file mode 100644
index 0000000000..501822b7bb
--- /dev/null
+++ b/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch
@@ -0,0 +1,29 @@
+commit 9acd374822022793b09427d67ea4033915343dd8
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date:   Fri Oct 11 15:25:42 2013 -0700
+
+    fbdev: Fix compilation without EGL
+    
+    We have to duplicate #defines and typedefs for the EGL types and constants
+    we use in gl-renderer.h so we can compile the fbdev backend without EGL.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=70392
+
+---
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+To be noted: the bug referenced above was opened by me,
+and quickly fixed during an IRC session. Nice! :-)
+
+diff --git a/src/gl-renderer.h b/src/gl-renderer.h
+index 4919a1e..d16ade2 100644
+--- a/src/gl-renderer.h
++++ b/src/gl-renderer.h
+@@ -56,6 +56,7 @@ typedef void *EGLDisplay;
+ typedef void *EGLSurface;
+ typedef intptr_t EGLNativeDisplayType;
+ typedef intptr_t EGLNativeWindowType;
++#define EGL_DEFAULT_DISPLAY NULL
+ 
+ static const EGLint gl_renderer_opaque_attribs[];
+ static const EGLint gl_renderer_alpha_attribs[];
diff --git a/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch b/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
deleted file mode 100644
index ca7368f309..0000000000
--- a/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 9f43cb48aac9d27aa49fe955104f5cfd204703ed
-Author: Quentin Glidic <sardemff7+git@sardemff7.net>
-Date:   Sat Aug 24 20:36:10 2013 +0200
-
-    autotools: Fix AC_PATH_PROG call
-    
-    Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
-    Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff --git a/configure.ac b/configure.ac
-index 0129157..43e5e5c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -424,8 +424,10 @@ if test "x$have_lcms" = xyes; then
- fi
- AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
- 
--AC_PATH_PROG([wayland_scanner], [wayland-scanner],
--	     [AC_MSG_ERROR("wayland-scanner is needed to compile weston")])
-+AC_PATH_PROG([wayland_scanner], [wayland-scanner])
-+if test x$wayland_scanner = x; then
-+	AC_MSG_ERROR([wayland-scanner is needed to compile weston])
-+fi
- 
- AC_CONFIG_FILES([Makefile
- 		 shared/Makefile
diff --git a/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch b/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
deleted file mode 100644
index dfc20dee82..0000000000
--- a/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 7b8e970ad1f1ef96db23b379a41edeb40ef1e8b6
-Author: Adrian Negreanu <adrian.m.negreanu@intel.com>
-Date:   Thu Sep 26 19:31:32 2013 +0300
-
-    compositor-fbdev: drop dependency on libdrm
-    
-    Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
-    Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff --git a/configure.ac b/configure.ac
-index 7c2da44..a43bf5b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -190,7 +190,7 @@ AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR],
-                [test x$enable_fbdev_compositor = xyes])
- AS_IF([test x$enable_fbdev_compositor = xyes], [
-   AC_DEFINE([BUILD_FBDEV_COMPOSITOR], [1], [Build the fbdev compositor])
--  PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0 libdrm >= 2.4.30])
-+  PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0])
- ])
- 
- AC_ARG_ENABLE([rdp-compositor], [  --enable-rdp-compositor],,
diff --git a/package/weston/weston-0003-dont-build-tests.patch b/package/weston/weston-0003-dont-build-tests.patch
new file mode 100644
index 0000000000..a8ace515e0
--- /dev/null
+++ b/package/weston/weston-0003-dont-build-tests.patch
@@ -0,0 +1,18 @@
+Makefile: do not build tests
+
+Tests are broken if no EGL support is available.
+
+Reported-by: Peter Korsgaard <jacmet@uclibc.org>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+diff -durN weston-1.3.0.orig/Makefile.am weston-1.3.0/Makefile.am
+--- weston-1.3.0.orig/Makefile.am	2013-08-20 20:15:19.000000000 +0200
++++ weston-1.3.0/Makefile.am	2013-10-14 23:08:12.016392097 +0200
+@@ -2,7 +2,7 @@
+ wcap_subdir = wcap
+ endif
+ 
+-SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
++SUBDIRS = shared src clients data protocol $(wcap_subdir) man
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
+ 
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index c8b47a7d3f..1682fdf1c4 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WESTON_VERSION = 1.2.2
+WESTON_VERSION = 1.3.0
 WESTON_SITE = http://wayland.freedesktop.org/releases/
 WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
@@ -13,7 +13,7 @@ WESTON_LICENSE_FILES = COPYING
 WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
 	jpeg mtdev udev cairo
 
-# We touch configure.ac with one of our patches
+# We're touching Makefile.am
 WESTON_AUTORECONF = YES
 
 WESTON_CONF_OPT = \

From 03a5ac9b1c1f3220b759935706227598ac167f3a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 15 Oct 2013 09:50:31 -0300
Subject: [PATCH 6479/6849] autossh: add ssh client/server depends

It's not very useful without them.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/autossh/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/autossh/Config.in b/package/autossh/Config.in
index e3acd8a7f7..6d1a0853ed 100644
--- a/package/autossh/Config.in
+++ b/package/autossh/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_AUTOSSH
 	bool "autossh"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_PACKAGE_DROPBEAR || BR2_PACKAGE_OPENSSH
 	help
 	  autossh is a program to start a copy of ssh and monitor it,
 	  restarting it as necessary should it die or stop passing traffic.

From f87f067c027261eb8c0ac8ad120fe845570aaae3 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 14 Oct 2013 16:05:41 +0200
Subject: [PATCH 6480/6849] ngrep: add license information

[Peter: use BSD-4c-like for license]
Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ngrep/ngrep.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index 99b8f469d4..6a9b42f3d1 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -7,6 +7,8 @@
 NGREP_VERSION = 1.45
 NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
 NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION)
+NGREP_LICENSE = BSD-4c-like
+NGREP_LICENSE_FILES = LICENSE.txt
 NGREP_INSTALL_STAGING = YES
 NGREP_CONF_ENV = LDFLAGS="-lpcre"
 NGREP_CONF_OPT =  \

From a69ca0d117662260457455270a9e7338a54980f9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 19 Oct 2013 13:35:07 -0300
Subject: [PATCH 6481/6849] linux-headers: bump 3.{10, 11}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linux-headers/Config.in.host | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 17688685ca..124a68f55e 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -86,7 +86,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.16"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.5"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.17"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.6"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 837c3bb3a31e1b439d8e197716b41464e767309f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 19 Oct 2013 13:35:08 -0300
Subject: [PATCH 6482/6849] linux: bump 3.11.x stable version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 4fcb128ec9..f7c5330841 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11.5"
+	bool "3.11.6"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11.5" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.11.6" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

From 98ab2cb15daedc633f0ddc89dc9a29f14d23c911 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Oct 2013 16:45:15 -0300
Subject: [PATCH 6483/6849] lxc: needs mmu

Fixes:
http://autobuild.buildroot.net/results/602/60289dae59650847e6d32c7ab3be7973a86a25c7/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lxc/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index ad463b19a3..f8c1fb9e31 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LXC
 	select BR2_PACKAGE_LIBCAP
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Linux Containers (LXC), provides the ability to group and isolate
 	  of a set of processes in a jail by virtualizing and accounting the

From 6953eeb332cf998db582d9d4b2e95ddbadc0fecf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Oct 2013 15:36:09 -0300
Subject: [PATCH 6484/6849] gcc 4.8.x: add PR57717 patches

Failure to build libc for PowerPC E500 cores, see:
http://gcc.gnu.org/bugzilla//show_bug.cgi?id=57717

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gcc/4.8.2/840-PR57717.patch        | 23 ++++++++++++++++++++++
 package/gcc/4.8.2/841-PR57717-E500v2.patch | 21 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 package/gcc/4.8.2/840-PR57717.patch
 create mode 100644 package/gcc/4.8.2/841-PR57717-E500v2.patch

diff --git a/package/gcc/4.8.2/840-PR57717.patch b/package/gcc/4.8.2/840-PR57717.patch
new file mode 100644
index 0000000000..f983f70d02
--- /dev/null
+++ b/package/gcc/4.8.2/840-PR57717.patch
@@ -0,0 +1,23 @@
+This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717
+
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gcc-4.8.1/gcc/config/rs6000/rs6000.c
+===================================================================
+--- gcc-4.8.1.orig/gcc/config/rs6000/rs6000.c	2013-05-09 18:54:06.000000000 -0700
++++ gcc-4.8.1/gcc/config/rs6000/rs6000.c	2013-06-27 08:22:40.459021366 -0700
+@@ -5431,11 +5431,12 @@
+ 
+     case TFmode:
+     case TDmode:
+-    case TImode:
+       if (TARGET_E500_DOUBLE)
+ 	return (SPE_CONST_OFFSET_OK (offset)
+ 		&& SPE_CONST_OFFSET_OK (offset + 8));
++        /* Fall through.  */
+ 
++    case TImode:
+       extra = 8;
+       if (!worst_case)
+ 	break;
diff --git a/package/gcc/4.8.2/841-PR57717-E500v2.patch b/package/gcc/4.8.2/841-PR57717-E500v2.patch
new file mode 100644
index 0000000000..96fa1da073
--- /dev/null
+++ b/package/gcc/4.8.2/841-PR57717-E500v2.patch
@@ -0,0 +1,21 @@
+This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717
+
+Upstream-Status: Backport
+Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
+
+fix for PR57717 (PowerPC E500v2)
+http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
+
+--- a/gcc/config/rs6000/rs6000.c	2013-05-09 20:54:06.000000000 -0500
++++ b/gcc/config/rs6000/rs6000.c	2013-08-28 01:25:24.865218744 -0500
+@@ -6337,9 +6337,7 @@
+       && GET_CODE (XEXP (x, 1)) == CONST_INT
+       && reg_offset_p
+       && !SPE_VECTOR_MODE (mode)
+-      && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
+-				  || mode == DDmode || mode == TDmode
+-				  || mode == DImode))
++      && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD)
+       && VECTOR_MEM_NONE_P (mode))
+     {
+       HOST_WIDE_INT val = INTVAL (XEXP (x, 1));

From 813ce18de92e2dd79d20b4d315124846017ab171 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Oct 2013 10:45:34 -0300
Subject: [PATCH 6485/6849] configs/p1010rdb: bump to the latest and greatest
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../p1010rdb/{linux-3.10.config => linux-3.11.config} |  0
 configs/freescale_p1010rdb_defconfig                  | 11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename board/freescale/p1010rdb/{linux-3.10.config => linux-3.11.config} (100%)

diff --git a/board/freescale/p1010rdb/linux-3.10.config b/board/freescale/p1010rdb/linux-3.11.config
similarity index 100%
rename from board/freescale/p1010rdb/linux-3.10.config
rename to board/freescale/p1010rdb/linux-3.11.config
diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig
index 21554d57ff..76a0be2161 100644
--- a/configs/freescale_p1010rdb_defconfig
+++ b/configs/freescale_p1010rdb_defconfig
@@ -9,15 +9,16 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
 BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x20
 BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock headers version to match and avoid breakage
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.11.5"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.11.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb"
@@ -30,4 +31,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"

From 25f74ee8808e89b137aac58d009e9ba8961e3f7c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 18 Oct 2013 10:45:35 -0300
Subject: [PATCH 6486/6849] configs/mpc8315erdb: bump to the latest and
 greatest versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../{linux-3.10.config => linux-3.11.config}          |  0
 configs/freescale_mpc8315erdb_defconfig               | 11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename board/freescale/mpc8315erdb/{linux-3.10.config => linux-3.11.config} (100%)

diff --git a/board/freescale/mpc8315erdb/linux-3.10.config b/board/freescale/mpc8315erdb/linux-3.11.config
similarity index 100%
rename from board/freescale/mpc8315erdb/linux-3.10.config
rename to board/freescale/mpc8315erdb/linux-3.11.config
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
index 12bb70e09c..dc4c810210 100644
--- a/configs/freescale_mpc8315erdb_defconfig
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -10,15 +10,16 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x200
 BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x4000
 BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 
-# Lock to 3.8 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_8=y
+# Lock headers version to match and avoid breakage
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.11.5"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.11.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
@@ -31,4 +32,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"

From 2a995cc71f66fafab817ca088f18736cab6e4c48 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Oct 2013 10:37:56 -0300
Subject: [PATCH 6487/6849] gcc: bump 4.8.x series to version 4.8.2

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gcc/{4.8.1 => 4.8.2}/100-uclibc-conf.patch              | 0
 package/gcc/{4.8.1 => 4.8.2}/301-missing-execinfo_h.patch       | 0
 package/gcc/{4.8.1 => 4.8.2}/302-c99-snprintf.patch             | 0
 package/gcc/{4.8.1 => 4.8.2}/305-libmudflap-susv3-legacy.patch  | 0
 package/gcc/{4.8.1 => 4.8.2}/810-arm-softfloat-libgcc.patch     | 0
 package/gcc/{4.8.1 => 4.8.2}/830-arm_unbreak_armv4t.patch       | 0
 .../powerpc-link-with-math-lib.patch.conditional                | 0
 package/gcc/Config.in.host                                      | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename package/gcc/{4.8.1 => 4.8.2}/100-uclibc-conf.patch (100%)
 rename package/gcc/{4.8.1 => 4.8.2}/301-missing-execinfo_h.patch (100%)
 rename package/gcc/{4.8.1 => 4.8.2}/302-c99-snprintf.patch (100%)
 rename package/gcc/{4.8.1 => 4.8.2}/305-libmudflap-susv3-legacy.patch (100%)
 rename package/gcc/{4.8.1 => 4.8.2}/810-arm-softfloat-libgcc.patch (100%)
 rename package/gcc/{4.8.1 => 4.8.2}/830-arm_unbreak_armv4t.patch (100%)
 rename package/gcc/{4.8.1 => 4.8.2}/powerpc-link-with-math-lib.patch.conditional (100%)

diff --git a/package/gcc/4.8.1/100-uclibc-conf.patch b/package/gcc/4.8.2/100-uclibc-conf.patch
similarity index 100%
rename from package/gcc/4.8.1/100-uclibc-conf.patch
rename to package/gcc/4.8.2/100-uclibc-conf.patch
diff --git a/package/gcc/4.8.1/301-missing-execinfo_h.patch b/package/gcc/4.8.2/301-missing-execinfo_h.patch
similarity index 100%
rename from package/gcc/4.8.1/301-missing-execinfo_h.patch
rename to package/gcc/4.8.2/301-missing-execinfo_h.patch
diff --git a/package/gcc/4.8.1/302-c99-snprintf.patch b/package/gcc/4.8.2/302-c99-snprintf.patch
similarity index 100%
rename from package/gcc/4.8.1/302-c99-snprintf.patch
rename to package/gcc/4.8.2/302-c99-snprintf.patch
diff --git a/package/gcc/4.8.1/305-libmudflap-susv3-legacy.patch b/package/gcc/4.8.2/305-libmudflap-susv3-legacy.patch
similarity index 100%
rename from package/gcc/4.8.1/305-libmudflap-susv3-legacy.patch
rename to package/gcc/4.8.2/305-libmudflap-susv3-legacy.patch
diff --git a/package/gcc/4.8.1/810-arm-softfloat-libgcc.patch b/package/gcc/4.8.2/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from package/gcc/4.8.1/810-arm-softfloat-libgcc.patch
rename to package/gcc/4.8.2/810-arm-softfloat-libgcc.patch
diff --git a/package/gcc/4.8.1/830-arm_unbreak_armv4t.patch b/package/gcc/4.8.2/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from package/gcc/4.8.1/830-arm_unbreak_armv4t.patch
rename to package/gcc/4.8.2/830-arm_unbreak_armv4t.patch
diff --git a/package/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.8.2/powerpc-link-with-math-lib.patch.conditional
similarity index 100%
rename from package/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional
rename to package/gcc/4.8.2/powerpc-link-with-math-lib.patch.conditional
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 1fd3a94f24..bd2ad8c8f6 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -89,7 +89,7 @@ config BR2_GCC_VERSION
 	default "4.5.4"     if BR2_GCC_VERSION_4_5_X
 	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
-	default "4.8.1"     if BR2_GCC_VERSION_4_8_X
+	default "4.8.2"     if BR2_GCC_VERSION_4_8_X
 	default "4.8-arc"   if BR2_GCC_VERSION_4_8_ARC
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 

From 00cb32b56a8194cc16a33f0183f7ee4ca6c81db7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Oct 2013 20:05:53 -0300
Subject: [PATCH 6488/6849] mpd: bump to version 0.17.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mpd/mpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 737be41af2..d8f344faba 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MPD_VERSION = 0.17.5
+MPD_VERSION = 0.17.6
 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = http://www.musicpd.org/download/mpd/stable
 MPD_DEPENDENCIES = host-pkgconf libglib2

From 99002dc7b166183396594dbdf1638ea7bba2d633 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Oct 2013 17:10:52 -0300
Subject: [PATCH 6489/6849] u-boot: bump to version 2013.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/uboot/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 998cda2ca0..7a20d06d0a 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -18,7 +18,7 @@ choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2013.07"
+	bool "2013.10"
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION
        bool "Custom version"
@@ -46,7 +46,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2013.07"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2013.10"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
 	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT

From 456b257e814d93080e171fd87d6a7189f6ee686f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 17 Oct 2013 17:10:53 -0300
Subject: [PATCH 6490/6849] uboot-tools: bump to version 2013.10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/uboot-tools/uboot-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index f8935afcb4..e19372a3d5 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UBOOT_TOOLS_VERSION = 2013.07
+UBOOT_TOOLS_VERSION = 2013.10
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+

From bc3cb0651cce4a911aed54de6e394d3e241ad0b8 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Thu, 17 Oct 2013 09:33:25 +0100
Subject: [PATCH 6491/6849] dropwatch: Remove -Werror from CFLAGS

-Werror shouldn't be used in released code since it can
cause random build failures on moderate warnings. It also
depends on the used toolchain since different toolchains may
or may not print the same warnings.

Fixes the following build problem on MIPS64/n64:

main.c: In function handle_dm_alert_msg:
main.c:336:5: error: format %llx expects argument of
type long long unsigned int, but argument 4 has
type __u64 [-Werror=format=]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../dropwatch/dropwatch-03-remove-werror.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/dropwatch/dropwatch-03-remove-werror.patch

diff --git a/package/dropwatch/dropwatch-03-remove-werror.patch b/package/dropwatch/dropwatch-03-remove-werror.patch
new file mode 100644
index 0000000000..97b26b74c4
--- /dev/null
+++ b/package/dropwatch/dropwatch-03-remove-werror.patch
@@ -0,0 +1,18 @@
+-Werror shouldn't be used in released code since it can
+cause random build failures on moderate warnings. It also
+depends on the used toolchain since different toolchains may
+or may not print the same warnings.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+Index: dropwatch-1.4/src/Makefile
+===================================================================
+--- dropwatch-1.4.orig/src/Makefile
++++ dropwatch-1.4/src/Makefile
+@@ -1,5 +1,5 @@
+ all: dropwatch
+-CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
++CFLAGS+=-c -g -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
+ LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
+ OBJFILES := main.o lookup.o\
+ 	 lookup_bfd.o lookup_kas.o

From a95b9d77d1dc3ce79be680b3aec70627fda2c92b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 16 Oct 2013 19:31:51 -0300
Subject: [PATCH 6492/6849] dropbear: bump to version 2013.60

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dropbear/dropbear.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index c4372ca918..7fa92735b1 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DROPBEAR_VERSION = 2013.59
+DROPBEAR_VERSION = 2013.60
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh

From 916b1b6acd2b480fc64d1219dead2e9b64a72b1c Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Wed, 16 Oct 2013 20:11:37 -0400
Subject: [PATCH 6493/6849] libsoup: add license info

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libsoup/libsoup.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index d57960c274..d847f24bc6 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -9,6 +9,8 @@ LIBSOUP_MINOR_VERSION = 1
 LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION)
 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
+LIBSOUP_LICENSE = LGPLv2+
+LIBSOUP_LICENSE_FILES = COPYING
 LIBSOUP_INSTALL_STAGING = YES
 
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)

From 418b062f6995576f20abafab769a5a703fc0ac54 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 14 Oct 2013 14:25:04 +0200
Subject: [PATCH 6494/6849] systemd: add license information

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/systemd/systemd.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 1bb429cf05..4e4955e2bb 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -7,6 +7,8 @@
 SYSTEMD_VERSION = 44
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
 SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
+SYSTEMD_LICENSE = GPLv2+
+SYSTEMD_LICENSE_FILES = LICENSE
 SYSTEMD_INSTALL_STAGING = YES
 SYSTEMD_DEPENDENCIES = \
 	host-intltool \

From 991cf48a182105c98a8ec2d1a3c6359a2827da4e Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 14 Oct 2013 14:25:05 +0200
Subject: [PATCH 6495/6849] sysvinit: add license information

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sysvinit/sysvinit.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index bf05d73b01..131c63fa3a 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -8,6 +8,8 @@ SYSVINIT_VERSION = 2.88
 SYSVINIT_SOURCE  = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
 SYSVINIT_PATCH   = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
 SYSVINIT_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
+SYSVINIT_LICENSE = GPLv2+
+SYSVINIT_LICENSE_FILES = COPYING
 
 # Override Busybox implementations if Busybox is enabled.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

From 9f355f89c92492c4275373a9bb9ab1e6d0a1dd9c Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 14 Oct 2013 16:05:38 +0200
Subject: [PATCH 6496/6849] mutt: add license information

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mutt/mutt.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 59f65f61a1..0c17589bae 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -6,6 +6,8 @@
 
 MUTT_VERSION = 1.5.21
 MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt-dev
+MUTT_LICENSE = GPLv2+
+MUTT_LICENSE_FILES = GPL
 MUTT_DEPENDENCIES = ncurses
 MUTT_CONF_OPT = --disable-iconv --disable-smtp
 MUTT_AUTORECONF = YES

From 710825f0de3b33ef11917490e9f4736e4a8ff926 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Wed, 16 Oct 2013 10:39:52 +0200
Subject: [PATCH 6497/6849] scons: bump version

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/scons/scons.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index aee0af1982..a7747d5bf9 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SCONS_VERSION = 2.2.0
+SCONS_VERSION = 2.3.0
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
 SCONS_LICENSE = MIT
 SCONS_LICENSE_FILES = LICENSE.txt

From 550fe0dcf63898a64494f4d1b2f137fe4432460c Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Tue, 15 Oct 2013 08:59:34 +0200
Subject: [PATCH 6498/6849] nuttcp: add license information

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nuttcp/nuttcp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/nuttcp/nuttcp.mk b/package/nuttcp/nuttcp.mk
index 406219dd3c..8a99ce39f5 100644
--- a/package/nuttcp/nuttcp.mk
+++ b/package/nuttcp/nuttcp.mk
@@ -7,6 +7,8 @@
 NUTTCP_VERSION = 6.1.2
 NUTTCP_SITE = http://www.lcp.nrl.navy.mil/nuttcp/
 NUTTCP_SOURCE = nuttcp-$(NUTTCP_VERSION).tar.bz2
+NUTTCP_LICENSE = GPLv2
+NUTTCP_LICENSE_FILES = LICENSE
 
 define NUTTCP_BUILD_CMDS
 	$(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \

From 5549f8e93489e6fc8348c3b2caac5dc3cbe2ff0f Mon Sep 17 00:00:00 2001
From: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Date: Tue, 15 Oct 2013 08:16:33 -0500
Subject: [PATCH 6499/6849] wget: Fix error in texi2pod on Perl 5.18

This gets around the following build errors that occurs on a system with
perl 5.18:

[...]
wget.pod around line 2151: Expected text after =item, not a number
wget.pod around line 2156: Expected text after =item, not a number
wget.pod around line 2162: Expected text after =item, not a number
[...]

This is already committed upstream and this patch will be unnecessary in
wget 1.15 when it is released:

commit 7f43748544f26008d0dd337704f02a6ed3200aaf
Author: Dave Reisner <dreisner@archlinux.org>
Date:   Mon Jun 17 23:31:46 2013 +0530

    Fix error in texi2pod intriduced with Perl 5.18

Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...n-texi2pod-intriduced-with-Perl-5.18.patch | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/wget/0001-Fix-error-in-texi2pod-intriduced-with-Perl-5.18.patch

diff --git a/package/wget/0001-Fix-error-in-texi2pod-intriduced-with-Perl-5.18.patch b/package/wget/0001-Fix-error-in-texi2pod-intriduced-with-Perl-5.18.patch
new file mode 100644
index 0000000000..cf423a377c
--- /dev/null
+++ b/package/wget/0001-Fix-error-in-texi2pod-intriduced-with-Perl-5.18.patch
@@ -0,0 +1,26 @@
+From 7f43748544f26008d0dd337704f02a6ed3200aaf Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 17 Jun 2013 23:31:46 +0530
+Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18
+
+---
+ doc/ChangeLog   | 5 +++++
+ doc/texi2pod.pl | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
+index 86c4b18..9db6de1 100755
+--- a/doc/texi2pod.pl
++++ b/doc/texi2pod.pl
+@@ -291,7 +291,7 @@ while(<$inf>) {
+ 	if (defined $1) {
+             my $thing = $1;
+             if ($ic =~ /\@asis/) {
+-                $_ = "\n=item $thing\n";
++                $_ = "\n=item C<$thing>\n";
+             } else {
+                 # Entity escapes prevent munging by the <> processing below.
+                 $_ = "\n=item $ic\&LT;$thing\&GT;\n";
+-- 
+1.8.4.rc3
+

From 3f4b08697b84f7d7eb1682a576bbcbe57af70945 Mon Sep 17 00:00:00 2001
From: Luca Ceresoli <luca@lucaceresoli.net>
Date: Wed, 16 Oct 2013 17:49:58 +0200
Subject: [PATCH 6500/6849] boost: fix build on 64-bit target after bump to
 1.54.0

Fixes compilation error with aarch64 target:

./boost/atomic/atomic.hpp: At global scope:
./boost/atomic/atomic.hpp:202:16: error: 'uintptr_t' was not declared in this scope
 typedef atomic<uintptr_t> atomic_uintptr_t;
                ^
./boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid
 typedef atomic<uintptr_t> atomic_uintptr_t;
                         ^
./boost/atomic/atomic.hpp:202:43: error: invalid type in declaration before ';' token
 typedef atomic<uintptr_t> atomic_uintptr_t;
                                           ^

Fixes http://autobuild.buildroot.net/results/0b69d7b33dc16ea27e395a949cefbd0a35c92f61/

Reported here: https://svn.boost.org/trac/boost/ticket/8973
Fix reported here: https://svn.boost.org/trac/boost/ticket/8731

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Backported-from: https://svn.boost.org/trac/boost/changeset/84950
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...0003-fix-64bit-build-with-recent-gcc.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch

diff --git a/package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch b/package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch
new file mode 100644
index 0000000000..5fdfb01ac7
--- /dev/null
+++ b/package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch
@@ -0,0 +1,33 @@
+Patch for recent versions of glibc which always assume int64_t support.
+
+Fixes compilation error with aarch64 target:
+
+./boost/atomic/atomic.hpp: At global scope:
+./boost/atomic/atomic.hpp:202:16: error: 'uintptr_t' was not declared in this scope
+ typedef atomic<uintptr_t> atomic_uintptr_t;
+                ^
+./boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid
+ typedef atomic<uintptr_t> atomic_uintptr_t;
+                         ^
+./boost/atomic/atomic.hpp:202:43: error: invalid type in declaration before ';' token
+ typedef atomic<uintptr_t> atomic_uintptr_t;
+                                           ^
+
+Reported here: https://svn.boost.org/trac/boost/ticket/8973
+Fix reported here: https://svn.boost.org/trac/boost/ticket/8731
+
+Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
+Backported-from: https://svn.boost.org/trac/boost/changeset/84950
+
+--- a/boost/cstdint.hpp	(revision 84805)
++++ b/boost/cstdint.hpp	(revision 84950)
+@@ -42,5 +42,8 @@
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H)					\
++  && (!defined(__GLIBC__)					\
++      || defined(__GLIBC_HAVE_LONG_LONG)			\
++      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+ 
+ // The following #include is an implementation artifact; not part of interface.

From bfc505c079efbee6bea5a97fa79faa9fc716c6c9 Mon Sep 17 00:00:00 2001
From: Arnaud Aujon <arnaud.aujon@gmail.com>
Date: Tue, 15 Oct 2013 17:37:20 +0200
Subject: [PATCH 6501/6849] libnet-* rename .mk files according to package name

Signed-off-by: Arnaud Aujon <arnaud.aujon@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...r-acct-01-uclinux.patch => libnetfilter_acct-01-uclinux.patch} | 0
 .../{libnetfilter-acct.mk => libnetfilter_acct.mk}                | 0
 ...k-01-uclinux.patch => libnetfilter_conntrack-01-uclinux.patch} | 0
 .../{libnetfilter-conntrack.mk => libnetfilter_conntrack.mk}      | 0
 ...er-01-uclinux.patch => libnetfilter_cthelper-01-uclinux.patch} | 0
 .../{libnetfilter-cthelper.mk => libnetfilter_cthelper.mk}        | 0
 ...t-01-uclinux.patch => libnetfilter_cttimeout-01-uclinux.patch} | 0
 .../{libnetfilter-cttimeout.mk => libnetfilter_cttimeout.mk}      | 0
 ...ter-log-01-uclinux.patch => libnetfilter_log-01-uclinux.patch} | 0
 .../libnetfilter_log/{libnetfilter-log.mk => libnetfilter_log.mk} | 0
 ...queue-01-uclinux.patch => libnetfilter_queue-01-uclinux.patch} | 0
 .../{libnetfilter-queue.mk => libnetfilter_queue.mk}              | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename package/libnetfilter_acct/{libnetfilter-acct-01-uclinux.patch => libnetfilter_acct-01-uclinux.patch} (100%)
 rename package/libnetfilter_acct/{libnetfilter-acct.mk => libnetfilter_acct.mk} (100%)
 rename package/libnetfilter_conntrack/{libnetfilter-conntrack-01-uclinux.patch => libnetfilter_conntrack-01-uclinux.patch} (100%)
 rename package/libnetfilter_conntrack/{libnetfilter-conntrack.mk => libnetfilter_conntrack.mk} (100%)
 rename package/libnetfilter_cthelper/{libnetfilter-cthelper-01-uclinux.patch => libnetfilter_cthelper-01-uclinux.patch} (100%)
 rename package/libnetfilter_cthelper/{libnetfilter-cthelper.mk => libnetfilter_cthelper.mk} (100%)
 rename package/libnetfilter_cttimeout/{libnetfilter-cttimeout-01-uclinux.patch => libnetfilter_cttimeout-01-uclinux.patch} (100%)
 rename package/libnetfilter_cttimeout/{libnetfilter-cttimeout.mk => libnetfilter_cttimeout.mk} (100%)
 rename package/libnetfilter_log/{libnetfilter-log-01-uclinux.patch => libnetfilter_log-01-uclinux.patch} (100%)
 rename package/libnetfilter_log/{libnetfilter-log.mk => libnetfilter_log.mk} (100%)
 rename package/libnetfilter_queue/{libnetfilter-queue-01-uclinux.patch => libnetfilter_queue-01-uclinux.patch} (100%)
 rename package/libnetfilter_queue/{libnetfilter-queue.mk => libnetfilter_queue.mk} (100%)

diff --git a/package/libnetfilter_acct/libnetfilter-acct-01-uclinux.patch b/package/libnetfilter_acct/libnetfilter_acct-01-uclinux.patch
similarity index 100%
rename from package/libnetfilter_acct/libnetfilter-acct-01-uclinux.patch
rename to package/libnetfilter_acct/libnetfilter_acct-01-uclinux.patch
diff --git a/package/libnetfilter_acct/libnetfilter-acct.mk b/package/libnetfilter_acct/libnetfilter_acct.mk
similarity index 100%
rename from package/libnetfilter_acct/libnetfilter-acct.mk
rename to package/libnetfilter_acct/libnetfilter_acct.mk
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack-01-uclinux.patch b/package/libnetfilter_conntrack/libnetfilter_conntrack-01-uclinux.patch
similarity index 100%
rename from package/libnetfilter_conntrack/libnetfilter-conntrack-01-uclinux.patch
rename to package/libnetfilter_conntrack/libnetfilter_conntrack-01-uclinux.patch
diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
similarity index 100%
rename from package/libnetfilter_conntrack/libnetfilter-conntrack.mk
rename to package/libnetfilter_conntrack/libnetfilter_conntrack.mk
diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper-01-uclinux.patch b/package/libnetfilter_cthelper/libnetfilter_cthelper-01-uclinux.patch
similarity index 100%
rename from package/libnetfilter_cthelper/libnetfilter-cthelper-01-uclinux.patch
rename to package/libnetfilter_cthelper/libnetfilter_cthelper-01-uclinux.patch
diff --git a/package/libnetfilter_cthelper/libnetfilter-cthelper.mk b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
similarity index 100%
rename from package/libnetfilter_cthelper/libnetfilter-cthelper.mk
rename to package/libnetfilter_cthelper/libnetfilter_cthelper.mk
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout-01-uclinux.patch b/package/libnetfilter_cttimeout/libnetfilter_cttimeout-01-uclinux.patch
similarity index 100%
rename from package/libnetfilter_cttimeout/libnetfilter-cttimeout-01-uclinux.patch
rename to package/libnetfilter_cttimeout/libnetfilter_cttimeout-01-uclinux.patch
diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
similarity index 100%
rename from package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
rename to package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
diff --git a/package/libnetfilter_log/libnetfilter-log-01-uclinux.patch b/package/libnetfilter_log/libnetfilter_log-01-uclinux.patch
similarity index 100%
rename from package/libnetfilter_log/libnetfilter-log-01-uclinux.patch
rename to package/libnetfilter_log/libnetfilter_log-01-uclinux.patch
diff --git a/package/libnetfilter_log/libnetfilter-log.mk b/package/libnetfilter_log/libnetfilter_log.mk
similarity index 100%
rename from package/libnetfilter_log/libnetfilter-log.mk
rename to package/libnetfilter_log/libnetfilter_log.mk
diff --git a/package/libnetfilter_queue/libnetfilter-queue-01-uclinux.patch b/package/libnetfilter_queue/libnetfilter_queue-01-uclinux.patch
similarity index 100%
rename from package/libnetfilter_queue/libnetfilter-queue-01-uclinux.patch
rename to package/libnetfilter_queue/libnetfilter_queue-01-uclinux.patch
diff --git a/package/libnetfilter_queue/libnetfilter-queue.mk b/package/libnetfilter_queue/libnetfilter_queue.mk
similarity index 100%
rename from package/libnetfilter_queue/libnetfilter-queue.mk
rename to package/libnetfilter_queue/libnetfilter_queue.mk

From f826e851c870039189d1a4d2b8074a0aa9de01e6 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Fri, 18 Oct 2013 08:44:43 +0200
Subject: [PATCH 6502/6849] tslib: needs dynamic library for dlopen

Fixes
http://autobuild.buildroot.net/results/1242cbea015e5a24a6621d1bd5569d2a1a819bb4/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/directfb/Config.in                       | 4 ++++
 package/tslib/Config.in                          | 4 ++++
 package/x11r7/xdriver_xf86-input-tslib/Config.in | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 38daa3a9ff..fa108b7e12 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -93,9 +93,13 @@ config BR2_PACKAGE_DIRECTFB_SERIALMOUSE
 
 config BR2_PACKAGE_DIRECTFB_TSLIB
 	bool "enable touchscreen support"
+	depends on !BR2_PREFER_STATIC_LIB # tslib
 	default y
 	select BR2_PACKAGE_TSLIB
 
+comment "touchscreen support needs a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB
+
 config BR2_PACKAGE_DIRECTFB_GIF
 	bool "enable GIF support"
 	default y
diff --git a/package/tslib/Config.in b/package/tslib/Config.in
index 95ee897da3..ef03f905d7 100644
--- a/package/tslib/Config.in
+++ b/package/tslib/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_TSLIB
 	bool "tslib"
+	depends on !BR2_PREFER_STATIC_LIB # dlopen
 	help
 	  Tslib is an abstraction layer for touchscreen panel events.
 
 	  http://tslib.berlios.de/
+
+comment "tslib needs a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB
diff --git a/package/x11r7/xdriver_xf86-input-tslib/Config.in b/package/x11r7/xdriver_xf86-input-tslib/Config.in
index f0ea13216b..7cf5926adb 100644
--- a/package/x11r7/xdriver_xf86-input-tslib/Config.in
+++ b/package/x11r7/xdriver_xf86-input-tslib/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	bool "xf86-input-tslib"
+	depends on !BR2_PREFER_STATIC_LIB # tslib
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
@@ -8,3 +9,6 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	  Touch screen library input driver
 
 	  http://www.ptxdist.org/software/xf86-input-tslib/index_en.html
+
+comment "xf86-input-tslib needs a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB

From a6e5afc3cc782feda7e7153c8d01c9a7451ba33a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 21 Oct 2013 14:25:29 +0100
Subject: [PATCH 6503/6849] webkit: fix target install

Commit 33a9d34ff375ec0c0389c9af6bc499a8dd7ccbc9 fixed the staging
install for webkit, which was hanging due to deadlock during parallel
make install.

This problem also afflicts the target install, which is fixed by this patch.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/webkit/webkit.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index eb1547bba6..21b535ffe1 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -17,6 +17,7 @@ WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
 
 # parallel make install deadlocks with make 3.81
 WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
+WEBKIT_INSTALL_TARGET_OPT = -j1 DESTDIR=$(TARGET_DIR) install
 
 # Does not build and it's disabled by default
 # in newer releases

From f0757b41ab3925a8460456b34584b91432d695eb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Oct 2013 11:23:17 -0300
Subject: [PATCH 6504/6849] openssh: bump to version 6.3p1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...tch => openssh-01-drop-SUSv3-legacy.patch} | 450 +++++++++---------
 ...sh-02-fix-pam-uclibc-pthreads-clash.patch} |   0
 package/openssh/openssh.mk                    |   2 +-
 3 files changed, 229 insertions(+), 223 deletions(-)
 rename package/openssh/{openssh-drop-SUSv3-legacy.patch => openssh-01-drop-SUSv3-legacy.patch} (56%)
 rename package/openssh/{openssh-fix-pam-uclibc-pthreads-clash.patch => openssh-02-fix-pam-uclibc-pthreads-clash.patch} (100%)

diff --git a/package/openssh/openssh-drop-SUSv3-legacy.patch b/package/openssh/openssh-01-drop-SUSv3-legacy.patch
similarity index 56%
rename from package/openssh/openssh-drop-SUSv3-legacy.patch
rename to package/openssh/openssh-01-drop-SUSv3-legacy.patch
index 3e798134e9..39a63e4c56 100644
--- a/package/openssh/openssh-drop-SUSv3-legacy.patch
+++ b/package/openssh/openssh-01-drop-SUSv3-legacy.patch
@@ -1,45 +1,32 @@
-From a66a3edccc336fe5942a50fd4347b452d3bdea1f Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 4 Sep 2012 09:42:03 -0300
-Subject: [PATCH] Drop SUSv3 legacy functions
+Switch usage of SUSv3-deprecated bzero(a,b) to memset(a, 0, b).
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- auth2-jpake.c             |   24 ++++++++++++------------
- authfd.c                  |    2 +-
- authfile.c                |    6 +++---
- bufaux.c                  |    2 +-
- bufec.c                   |    4 ++--
- canohost.c                |    2 +-
- channels.c                |    6 +++---
- clientloop.c              |    4 ++--
- hostfile.c                |    2 +-
- jpake.c                   |    6 +++---
- monitor.c                 |   20 ++++++++++----------
- openbsd-compat/port-tun.c |    4 ++--
- sandbox-systrace.c        |    2 +-
- schnorr.c                 |    6 +++---
- session.c                 |    2 +-
- sftp-client.c             |    2 +-
- ssh-keygen.c              |    2 +-
- ssh.c                     |    8 ++++----
- sshconnect2.c             |   22 +++++++++++-----------
- 19 files changed, 63 insertions(+), 63 deletions(-)
 
-diff --git a/auth2-jpake.c b/auth2-jpake.c
-index a460e82..caa8c6f 100644
---- a/auth2-jpake.c
-+++ b/auth2-jpake.c
-@@ -178,7 +178,7 @@ derive_rawsalt(const char *username, u_char *rawsalt, u_int len)
+diff -Nura openssh-6.3p1.orig/auth2-chall.c openssh-6.3p1/auth2-chall.c
+--- openssh-6.3p1.orig/auth2-chall.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/auth2-chall.c	2013-10-22 09:47:38.665516102 -0300
+@@ -148,7 +148,7 @@
+ 	if (kbdintctxt->device)
+ 		kbdint_reset_device(kbdintctxt);
+ 	free(kbdintctxt->devices);
+-	bzero(kbdintctxt, sizeof(*kbdintctxt));
++	memset(kbdintctxt, 0, sizeof(*kbdintctxt));
+ 	free(kbdintctxt);
+ }
+ /* get next device */
+diff -Nura openssh-6.3p1.orig/auth2-jpake.c openssh-6.3p1/auth2-jpake.c
+--- openssh-6.3p1.orig/auth2-jpake.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/auth2-jpake.c	2013-10-22 09:43:32.504472356 -0300
+@@ -178,7 +178,7 @@
  		fatal("%s: not enough bytes for rawsalt (want %u have %u)",
  		    __func__, len, digest_len);
  	memcpy(rawsalt, digest, len);
 -	bzero(digest, digest_len);
 +	memset(digest, 0, digest_len);
- 	xfree(digest);
+ 	free(digest);
  }
  
-@@ -203,10 +203,10 @@ makesalt(u_int want, const char *user)
+@@ -203,10 +203,10 @@
  		fatal("%s: want %u", __func__, want);
  
  	derive_rawsalt(user, rawsalt, sizeof(rawsalt));
@@ -52,16 +39,16 @@ index a460e82..caa8c6f 100644
  
  	return ret;
  }
-@@ -360,7 +360,7 @@ auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s,
+@@ -360,7 +360,7 @@
  	debug3("%s: scheme = %s", __func__, *hash_scheme);
  	JPAKE_DEBUG_BN((*s, "%s: s = ", __func__));
  #endif
 -	bzero(secret, secret_len);
 +	memset(secret, 0, secret_len);
- 	xfree(secret);
+ 	free(secret);
  }
  
-@@ -401,12 +401,12 @@ auth2_jpake_start(Authctxt *authctxt)
+@@ -401,12 +401,12 @@
  	packet_send();
  	packet_write_wait();
  
@@ -69,16 +56,16 @@ index a460e82..caa8c6f 100644
 -	bzero(salt, strlen(salt));
 +	memset(hash_scheme, 0, strlen(hash_scheme));
 +	memset(salt, 0, strlen(salt));
- 	xfree(hash_scheme);
- 	xfree(salt);
+ 	free(hash_scheme);
+ 	free(salt);
 -	bzero(x3_proof, x3_proof_len);
 -	bzero(x4_proof, x4_proof_len);
 +	memset(x3_proof, 0, x3_proof_len);
 +	memset(x4_proof, 0, x4_proof_len);
- 	xfree(x3_proof);
- 	xfree(x4_proof);
+ 	free(x3_proof);
+ 	free(x4_proof);
  
-@@ -453,8 +453,8 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
+@@ -453,8 +453,8 @@
  	    &pctx->b,
  	    &x4_s_proof, &x4_s_proof_len));
  
@@ -86,32 +73,31 @@ index a460e82..caa8c6f 100644
 -	bzero(x2_proof, x2_proof_len);
 +	memset(x1_proof, 0, x1_proof_len);
 +	memset(x2_proof, 0, x2_proof_len);
- 	xfree(x1_proof);
- 	xfree(x2_proof);
+ 	free(x1_proof);
+ 	free(x2_proof);
  
-@@ -468,7 +468,7 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
+@@ -468,7 +468,7 @@
  	packet_send();
  	packet_write_wait();
  
 -	bzero(x4_s_proof, x4_s_proof_len);
 +	memset(x4_s_proof, 0, x4_s_proof_len);
- 	xfree(x4_s_proof);
+ 	free(x4_s_proof);
  
  	/* Expect step 2 packet from peer */
-@@ -509,7 +509,7 @@ input_userauth_jpake_client_step2(int type, u_int32_t seq, void *ctxt)
+@@ -509,7 +509,7 @@
  	    &pctx->k,
  	    &pctx->h_k_sid_sessid, &pctx->h_k_sid_sessid_len));
  
 -	bzero(x2_s_proof, x2_s_proof_len);
 +	memset(x2_s_proof, 0, x2_s_proof_len);
- 	xfree(x2_s_proof);
+ 	free(x2_s_proof);
  
  	if (!use_privsep)
-diff --git a/authfd.c b/authfd.c
-index f037e83..0e51468 100644
---- a/authfd.c
-+++ b/authfd.c
-@@ -102,7 +102,7 @@ ssh_get_authentication_socket(void)
+diff -Nura openssh-6.3p1.orig/authfd.c openssh-6.3p1/authfd.c
+--- openssh-6.3p1.orig/authfd.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/authfd.c	2013-10-22 09:47:48.208827946 -0300
+@@ -102,7 +102,7 @@
  	if (!authsocket)
  		return -1;
  
@@ -120,11 +106,10 @@ index f037e83..0e51468 100644
  	sunaddr.sun_family = AF_UNIX;
  	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
  
-diff --git a/authfile.c b/authfile.c
-index 7dd4496..068f75e 100644
---- a/authfile.c
-+++ b/authfile.c
-@@ -349,17 +349,17 @@ key_load_file(int fd, const char *filename, Buffer *blob)
+diff -Nura openssh-6.3p1.orig/authfile.c openssh-6.3p1/authfile.c
+--- openssh-6.3p1.orig/authfile.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/authfile.c	2013-10-22 09:47:08.538531649 -0300
+@@ -349,17 +349,17 @@
  			    __func__, filename == NULL ? "" : filename,
  			    filename == NULL ? "" : " ", strerror(errno));
  			buffer_clear(blob);
@@ -145,46 +130,43 @@ index 7dd4496..068f75e 100644
  	if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 &&
  	    st.st_size != buffer_len(blob)) {
  		debug("%s: key file %.200s%schanged size while reading",
-diff --git a/bufaux.c b/bufaux.c
-index 00208ca..d82351d 100644
---- a/bufaux.c
-+++ b/bufaux.c
-@@ -215,7 +215,7 @@ buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr)
+diff -Nura openssh-6.3p1.orig/bufaux.c openssh-6.3p1/bufaux.c
+--- openssh-6.3p1.orig/bufaux.c	2013-07-18 03:12:44.000000000 -0300
++++ openssh-6.3p1/bufaux.c	2013-10-22 09:47:56.220089728 -0300
+@@ -215,7 +215,7 @@
  		if (cp == ret + length - 1)
  			error("buffer_get_cstring_ret: string contains \\0");
  		else {
 -			bzero(ret, length);
 +			memset(ret, 0, length);
- 			xfree(ret);
+ 			free(ret);
  			return NULL;
  		}
-diff --git a/bufec.c b/bufec.c
-index 3dcb494..36c14e9 100644
---- a/bufec.c
-+++ b/bufec.c
-@@ -77,7 +77,7 @@ buffer_put_ecpoint_ret(Buffer *buffer, const EC_GROUP *curve,
+diff -Nura openssh-6.3p1.orig/bufec.c openssh-6.3p1/bufec.c
+--- openssh-6.3p1.orig/bufec.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/bufec.c	2013-10-22 09:48:07.798468072 -0300
+@@ -77,7 +77,7 @@
  	ret = 0;
   out:
  	if (buf != NULL) {
 -		bzero(buf, len);
 +		memset(buf, 0, len);
- 		xfree(buf);
+ 		free(buf);
  	}
  	BN_CTX_free(bnctx);
-@@ -130,7 +130,7 @@ buffer_get_ecpoint_ret(Buffer *buffer, const EC_GROUP *curve,
+@@ -130,7 +130,7 @@
  	ret = 0;
   out:
  	BN_CTX_free(bnctx);
 -	bzero(buf, len);
 +	memset(buf, 0, len);
- 	xfree(buf);
+ 	free(buf);
  	return ret;
  }
-diff --git a/canohost.c b/canohost.c
-index dabd8a3..a302727 100644
---- a/canohost.c
-+++ b/canohost.c
-@@ -199,7 +199,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
+diff -Nura openssh-6.3p1.orig/canohost.c openssh-6.3p1/canohost.c
+--- openssh-6.3p1.orig/canohost.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/canohost.c	2013-10-22 09:48:16.484751912 -0300
+@@ -199,7 +199,7 @@
  	memcpy(&inaddr, ((char *)&a6->sin6_addr) + 12, sizeof(inaddr));
  	port = a6->sin6_port;
  
@@ -193,30 +175,29 @@ index dabd8a3..a302727 100644
  
  	a4->sin_family = AF_INET;
  	*len = sizeof(*a4);
-diff --git a/channels.c b/channels.c
-index 7791feb..2e6dddf 100644
---- a/channels.c
-+++ b/channels.c
-@@ -425,7 +425,7 @@ channel_free(Channel *c)
+diff -Nura openssh-6.3p1.orig/channels.c openssh-6.3p1/channels.c
+--- openssh-6.3p1.orig/channels.c	2013-09-13 03:19:31.000000000 -0300
++++ openssh-6.3p1/channels.c	2013-10-22 09:50:37.059773902 -0300
+@@ -423,7 +423,7 @@
  		if (cc->abandon_cb != NULL)
  			cc->abandon_cb(c, cc->ctx);
  		TAILQ_REMOVE(&c->status_confirms, cc, entry);
 -		bzero(cc, sizeof(*cc));
 +		memset(cc, 0, sizeof(*cc));
- 		xfree(cc);
+ 		free(cc);
  	}
  	if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
-@@ -2667,7 +2667,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
+@@ -2668,7 +2668,7 @@
  		return;
  	cc->cb(type, c, cc->ctx);
  	TAILQ_REMOVE(&c->status_confirms, cc, entry);
 -	bzero(cc, sizeof(*cc));
 +	memset(cc, 0, sizeof(*cc));
- 	xfree(cc);
+ 	free(cc);
  }
  
-@@ -3296,7 +3296,7 @@ channel_connect_ctx_free(struct channel_connect *cctx)
- 	xfree(cctx->host);
+@@ -3289,7 +3289,7 @@
+ 	free(cctx->host);
  	if (cctx->aitop)
  		freeaddrinfo(cctx->aitop);
 -	bzero(cctx, sizeof(*cctx));
@@ -224,20 +205,19 @@ index 7791feb..2e6dddf 100644
  	cctx->host = NULL;
  	cctx->ai = cctx->aitop = NULL;
  }
-diff --git a/clientloop.c b/clientloop.c
-index 1c1a770..fd226e6 100644
---- a/clientloop.c
-+++ b/clientloop.c
-@@ -551,7 +551,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
+diff -Nura openssh-6.3p1.orig/clientloop.c openssh-6.3p1/clientloop.c
+--- openssh-6.3p1.orig/clientloop.c	2013-06-10 00:07:12.000000000 -0300
++++ openssh-6.3p1/clientloop.c	2013-10-22 09:50:20.361228247 -0300
+@@ -549,7 +549,7 @@
  		gc->cb(type, seq, gc->ctx);
  	if (--gc->ref_count <= 0) {
  		TAILQ_REMOVE(&global_confirms, gc, entry);
 -		bzero(gc, sizeof(*gc));
 +		memset(gc, 0, sizeof(*gc));
- 		xfree(gc);
+ 		free(gc);
  	}
  
-@@ -867,7 +867,7 @@ process_cmdline(void)
+@@ -876,7 +876,7 @@
  	int cancel_port, ok;
  	Forward fwd;
  
@@ -246,55 +226,104 @@ index 1c1a770..fd226e6 100644
  	fwd.listen_host = fwd.connect_host = NULL;
  
  	leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
-diff --git a/hostfile.c b/hostfile.c
-index b6f924b..e25820d 100644
---- a/hostfile.c
-+++ b/hostfile.c
-@@ -330,7 +330,7 @@ free_hostkeys(struct hostkeys *hostkeys)
- 		xfree(hostkeys->entries[i].host);
- 		xfree(hostkeys->entries[i].file);
+diff -Nura openssh-6.3p1.orig/hostfile.c openssh-6.3p1/hostfile.c
+--- openssh-6.3p1.orig/hostfile.c	2013-07-18 03:12:45.000000000 -0300
++++ openssh-6.3p1/hostfile.c	2013-10-22 09:50:06.438773307 -0300
+@@ -333,10 +333,10 @@
+ 		free(hostkeys->entries[i].host);
+ 		free(hostkeys->entries[i].file);
  		key_free(hostkeys->entries[i].key);
 -		bzero(hostkeys->entries + i, sizeof(*hostkeys->entries));
 +		memset(hostkeys->entries + i, 0, sizeof(*hostkeys->entries));
  	}
- 	if (hostkeys->entries != NULL)
- 		xfree(hostkeys->entries);
-diff --git a/jpake.c b/jpake.c
-index b010daf..147ffe7 100644
---- a/jpake.c
-+++ b/jpake.c
-@@ -105,7 +105,7 @@ jpake_free(struct jpake_ctx *pctx)
+ 	free(hostkeys->entries);
+-	bzero(hostkeys, sizeof(*hostkeys));
++	memset(hostkeys, 0, sizeof(*hostkeys));
+ 	free(hostkeys);
+ }
+ 
+diff -Nura openssh-6.3p1.orig/jpake.c openssh-6.3p1/jpake.c
+--- openssh-6.3p1.orig/jpake.c	2013-06-01 18:31:18.000000000 -0300
++++ openssh-6.3p1/jpake.c	2013-10-22 09:49:54.371378983 -0300
+@@ -105,7 +105,7 @@
  #define JPAKE_BUF_CLEAR_FREE(v, l)		\
  	do {					\
  		if ((v) != NULL) {		\
 -			bzero((v), (l));	\
 +			memset((v), 0, (l));	\
- 			xfree(v);		\
+ 			free(v);		\
  			(v) = NULL;		\
  			(l) = 0;		\
-@@ -133,7 +133,7 @@ jpake_free(struct jpake_ctx *pctx)
+@@ -133,7 +133,7 @@
  #undef JPAKE_BN_CLEAR_FREE
  #undef JPAKE_BUF_CLEAR_FREE
  
 -	bzero(pctx, sizeof(*pctx));
-+	memset(pctx, 0, sizeof(pctx));
- 	xfree(pctx);
++	memset(pctx, 0, sizeof(*pctx));
+ 	free(pctx);
  }
  
-@@ -444,7 +444,7 @@ jpake_check_confirm(const BIGNUM *k,
+@@ -444,7 +444,7 @@
  	else if (timingsafe_bcmp(peer_confirm_hash, expected_confirm_hash,
  	    expected_confirm_hash_len) == 0)
  		success = 1;
 -	bzero(expected_confirm_hash, expected_confirm_hash_len);
 +	memset(expected_confirm_hash, 0, expected_confirm_hash_len);
- 	xfree(expected_confirm_hash);
+ 	free(expected_confirm_hash);
  	debug3("%s: success = %d", __func__, success);
  	return success;
-diff --git a/monitor.c b/monitor.c
-index e9802a3..97a50f6 100644
---- a/monitor.c
-+++ b/monitor.c
-@@ -547,7 +547,7 @@ monitor_read(struct monitor *pmonitor, struct mon_table *ent,
+diff -Nura openssh-6.3p1.orig/krl.c openssh-6.3p1/krl.c
+--- openssh-6.3p1.orig/krl.c	2013-07-24 22:52:49.000000000 -0300
++++ openssh-6.3p1/krl.c	2013-10-22 09:49:27.731508478 -0300
+@@ -238,7 +238,7 @@
+ 	struct revoked_serial rs, *ers, *crs, *irs;
+ 
+ 	KRL_DBG(("%s: insert %llu:%llu", __func__, lo, hi));
+-	bzero(&rs, sizeof(rs));
++	memset(&rs, 0, sizeof(rs));
+ 	rs.lo = lo;
+ 	rs.hi = hi;
+ 	ers = RB_NFIND(revoked_serial_tree, rt, &rs);
+@@ -1115,7 +1115,7 @@
+ 	struct revoked_certs *rc;
+ 
+ 	/* Check explicitly revoked hashes first */
+-	bzero(&rb, sizeof(rb));
++	memset(&rb, 0, sizeof(rb));
+ 	if ((rb.blob = key_fingerprint_raw(key, SSH_FP_SHA1, &rb.len)) == NULL)
+ 		return -1;
+ 	erb = RB_FIND(revoked_blob_tree, &krl->revoked_sha1s, &rb);
+@@ -1126,7 +1126,7 @@
+ 	}
+ 
+ 	/* Next, explicit keys */
+-	bzero(&rb, sizeof(rb));
++	memset(&rb, 0, sizeof(rb));
+ 	if (plain_key_blob(key, &rb.blob, &rb.len) != 0)
+ 		return -1;
+ 	erb = RB_FIND(revoked_blob_tree, &krl->revoked_keys, &rb);
+@@ -1147,7 +1147,7 @@
+ 		return 0; /* No entry for this CA */
+ 
+ 	/* Check revocation by cert key ID */
+-	bzero(&rki, sizeof(rki));
++	memset(&rki, 0, sizeof(rki));
+ 	rki.key_id = key->cert->key_id;
+ 	erki = RB_FIND(revoked_key_id_tree, &rc->revoked_key_ids, &rki);
+ 	if (erki != NULL) {
+@@ -1162,7 +1162,7 @@
+ 	if (key_cert_is_legacy(key) || key->cert->serial == 0)
+ 		return 0;
+ 
+-	bzero(&rs, sizeof(rs));
++	memset(&rs, 0, sizeof(rs));
+ 	rs.lo = rs.hi = key->cert->serial;
+ 	ers = RB_FIND(revoked_serial_tree, &rc->revoked_serials, &rs);
+ 	if (ers != NULL) {
+diff -Nura openssh-6.3p1.orig/monitor.c openssh-6.3p1/monitor.c
+--- openssh-6.3p1.orig/monitor.c	2013-07-20 00:21:53.000000000 -0300
++++ openssh-6.3p1/monitor.c	2013-10-22 09:46:48.592879890 -0300
+@@ -566,7 +566,7 @@
  	struct pollfd pfd[2];
  
  	for (;;) {
@@ -303,7 +332,7 @@ index e9802a3..97a50f6 100644
  		pfd[0].fd = pmonitor->m_sendfd;
  		pfd[0].events = POLLIN;
  		pfd[1].fd = pmonitor->m_log_recvfd;
-@@ -2137,8 +2137,8 @@ mm_answer_jpake_step1(int sock, Buffer *m)
+@@ -2193,8 +2193,8 @@
  	debug3("%s: sending step1", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m);
  
@@ -311,10 +340,10 @@ index e9802a3..97a50f6 100644
 -	bzero(x4_proof, x4_proof_len);
 +	memset(x3_proof, 0, x3_proof_len);
 +	memset(x4_proof, 0, x4_proof_len);
- 	xfree(x3_proof);
- 	xfree(x4_proof);
+ 	free(x3_proof);
+ 	free(x4_proof);
  
-@@ -2167,8 +2167,8 @@ mm_answer_jpake_get_pwdata(int sock, Buffer *m)
+@@ -2223,8 +2223,8 @@
  	debug3("%s: sending pwdata", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m);
  
@@ -322,10 +351,10 @@ index e9802a3..97a50f6 100644
 -	bzero(salt, strlen(salt));
 +	memset(hash_scheme, 0, strlen(hash_scheme));
 +	memset(salt, 0, strlen(salt));
- 	xfree(hash_scheme);
- 	xfree(salt);
+ 	free(hash_scheme);
+ 	free(salt);
  
-@@ -2207,8 +2207,8 @@ mm_answer_jpake_step2(int sock, Buffer *m)
+@@ -2263,8 +2263,8 @@
  
  	JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__));
  
@@ -333,19 +362,19 @@ index e9802a3..97a50f6 100644
 -	bzero(x2_proof, x2_proof_len);
 +	memset(x1_proof, 0, x1_proof_len);
 +	memset(x2_proof, 0, x2_proof_len);
- 	xfree(x1_proof);
- 	xfree(x2_proof);
+ 	free(x1_proof);
+ 	free(x2_proof);
  
-@@ -2220,7 +2220,7 @@ mm_answer_jpake_step2(int sock, Buffer *m)
+@@ -2276,7 +2276,7 @@
  	debug3("%s: sending step2", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m);
  
 -	bzero(x4_s_proof, x4_s_proof_len);
 +	memset(x4_s_proof, 0, x4_s_proof_len);
- 	xfree(x4_s_proof);
+ 	free(x4_s_proof);
  
  	monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);
-@@ -2254,7 +2254,7 @@ mm_answer_jpake_key_confirm(int sock, Buffer *m)
+@@ -2310,7 +2310,7 @@
  
  	JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__));
  
@@ -354,42 +383,19 @@ index e9802a3..97a50f6 100644
  	buffer_clear(m);
  
  	/* pctx->k is sensitive, not sent */
-@@ -2288,7 +2288,7 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
+@@ -2344,7 +2344,7 @@
  
  	JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__));
  
 -	bzero(peer_confirm_hash, peer_confirm_hash_len);
 +	memset(peer_confirm_hash, 0, peer_confirm_hash_len);
- 	xfree(peer_confirm_hash);
+ 	free(peer_confirm_hash);
  
  	buffer_clear(m);
-diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
-index 0d756f7..98332ae 100644
---- a/openbsd-compat/port-tun.c
-+++ b/openbsd-compat/port-tun.c
-@@ -67,7 +67,7 @@ sys_tun_open(int tun, int mode)
- 		return (-1);
- 	}
- 
--	bzero(&ifr, sizeof(ifr));	
-+	memset(&ifr, 0, sizeof(ifr));	
- 
- 	if (mode == SSH_TUNMODE_ETHERNET) {
- 		ifr.ifr_flags = IFF_TAP;
-@@ -215,7 +215,7 @@ sys_tun_infilter(struct Channel *c, char *buf, int len)
- 	if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
- 		return (-1);
- 	ptr = (char *)&rbuf[0];
--	bcopy(buf, ptr + sizeof(u_int32_t), len);
-+	memmove(ptr + sizeof(u_int32_t), buf, len);
- 	len += sizeof(u_int32_t);
- 	af = (u_int32_t *)ptr;
- 
-diff --git a/sandbox-systrace.c b/sandbox-systrace.c
-index 2d16a62..fcd657a 100644
---- a/sandbox-systrace.c
-+++ b/sandbox-systrace.c
-@@ -140,7 +140,7 @@ ssh_sandbox_parent(struct ssh_sandbox *box, pid_t child_pid,
+diff -Nura openssh-6.3p1.orig/sandbox-systrace.c openssh-6.3p1/sandbox-systrace.c
+--- openssh-6.3p1.orig/sandbox-systrace.c	2013-06-01 18:46:17.000000000 -0300
++++ openssh-6.3p1/sandbox-systrace.c	2013-10-22 09:49:02.048669246 -0300
+@@ -141,7 +141,7 @@
  		    box->systrace_fd, child_pid, strerror(errno));
  
  	/* Allocate and assign policy */
@@ -398,20 +404,19 @@ index 2d16a62..fcd657a 100644
  	policy.strp_op = SYSTR_POLICY_NEW;
  	policy.strp_maxents = SYS_MAXSYSCALL;
  	if (ioctl(box->systrace_fd, STRIOCPOLICY, &policy) == -1)
-diff --git a/schnorr.c b/schnorr.c
-index 4d54d68..e626400 100644
---- a/schnorr.c
-+++ b/schnorr.c
-@@ -101,7 +101,7 @@ schnorr_hash(const BIGNUM *p, const BIGNUM *q, const BIGNUM *g,
+diff -Nura openssh-6.3p1.orig/schnorr.c openssh-6.3p1/schnorr.c
+--- openssh-6.3p1.orig/schnorr.c	2013-06-01 18:31:19.000000000 -0300
++++ openssh-6.3p1/schnorr.c	2013-10-22 09:47:27.631155534 -0300
+@@ -101,7 +101,7 @@
  	SCHNORR_DEBUG_BN((h, "%s: h = ", __func__));
   out:
  	buffer_free(&b);
 -	bzero(digest, digest_len);
 +	memset(digest, 0, digest_len);
- 	xfree(digest);
+ 	free(digest);
  	digest_len = 0;
  	if (success == 0)
-@@ -477,7 +477,7 @@ hash_buffer(const u_char *buf, u_int len, const EVP_MD *md,
+@@ -477,7 +477,7 @@
  	success = 0;
   out:
  	EVP_MD_CTX_cleanup(&evp_md_ctx);
@@ -420,20 +425,19 @@ index 4d54d68..e626400 100644
  	digest_len = 0;
  	return success;
  }
-@@ -570,7 +570,7 @@ modp_group_free(struct modp_group *grp)
+@@ -572,7 +572,7 @@
  		BN_clear_free(grp->p);
  	if (grp->q != NULL)
  		BN_clear_free(grp->q);
 -	bzero(grp, sizeof(*grp));
 +	memset(grp, 0, sizeof(*grp));
- 	xfree(grp);
+ 	free(grp);
  }
  
-diff --git a/session.c b/session.c
-index 65bf287..440c68e 100644
---- a/session.c
-+++ b/session.c
-@@ -1840,7 +1840,7 @@ session_unused(int id)
+diff -Nura openssh-6.3p1.orig/session.c openssh-6.3p1/session.c
+--- openssh-6.3p1.orig/session.c	2013-07-20 00:21:53.000000000 -0300
++++ openssh-6.3p1/session.c	2013-10-22 09:49:35.085748791 -0300
+@@ -1861,7 +1861,7 @@
  		fatal("%s: insane session id %d (max %d nalloc %d)",
  		    __func__, id, options.max_sessions, sessions_nalloc);
  	}
@@ -442,11 +446,10 @@ index 65bf287..440c68e 100644
  	sessions[id].self = id;
  	sessions[id].used = 0;
  	sessions[id].chanid = -1;
-diff --git a/sftp-client.c b/sftp-client.c
-index 85f2bd4..09ec360 100644
---- a/sftp-client.c
-+++ b/sftp-client.c
-@@ -308,7 +308,7 @@ get_decode_statvfs(struct sftp_conn *conn, struct sftp_statvfs *st,
+diff -Nura openssh-6.3p1.orig/sftp-client.c openssh-6.3p1/sftp-client.c
+--- openssh-6.3p1.orig/sftp-client.c	2013-07-25 19:40:00.000000000 -0300
++++ openssh-6.3p1/sftp-client.c	2013-10-22 09:48:47.139753618 -0300
+@@ -308,7 +308,7 @@
  		    SSH2_FXP_EXTENDED_REPLY, type);
  	}
  
@@ -455,24 +458,10 @@ index 85f2bd4..09ec360 100644
  	st->f_bsize = buffer_get_int64(&msg);
  	st->f_frsize = buffer_get_int64(&msg);
  	st->f_blocks = buffer_get_int64(&msg);
-diff --git a/ssh-keygen.c b/ssh-keygen.c
-index a223ddc..dd7f430 100644
---- a/ssh-keygen.c
-+++ b/ssh-keygen.c
-@@ -1660,7 +1660,7 @@ parse_absolute_time(const char *s)
- 		fatal("Invalid certificate time format %s", s);
- 	}
- 
--	bzero(&tm, sizeof(tm));
-+	memset(&tm, 0, sizeof(tm));
- 	if (strptime(buf, fmt, &tm) == NULL)
- 		fatal("Invalid certificate time %s", s);
- 	if ((tt = mktime(&tm)) < 0)
-diff --git a/ssh.c b/ssh.c
-index 3f61eb0..4a3d2fc 100644
---- a/ssh.c
-+++ b/ssh.c
-@@ -1509,8 +1509,8 @@ load_public_identity_files(void)
+diff -Nura openssh-6.3p1.orig/ssh.c openssh-6.3p1/ssh.c
+--- openssh-6.3p1.orig/ssh.c	2013-07-24 22:55:53.000000000 -0300
++++ openssh-6.3p1/ssh.c	2013-10-22 09:45:52.967062218 -0300
+@@ -1539,8 +1539,8 @@
  #endif /* PKCS11 */
  
  	n_ids = 0;
@@ -483,23 +472,22 @@ index 3f61eb0..4a3d2fc 100644
  
  #ifdef ENABLE_PKCS11
  	if (options.pkcs11_provider != NULL &&
-@@ -1584,9 +1584,9 @@ load_public_identity_files(void)
+@@ -1615,9 +1615,9 @@
  	memcpy(options.identity_files, identity_files, sizeof(identity_files));
  	memcpy(options.identity_keys, identity_keys, sizeof(identity_keys));
  
 -	bzero(pwname, strlen(pwname));
 +	memset(pwname, 0, strlen(pwname));
- 	xfree(pwname);
+ 	free(pwname);
 -	bzero(pwdir, strlen(pwdir));
 +	memset(pwdir, 0, strlen(pwdir));
- 	xfree(pwdir);
+ 	free(pwdir);
  }
  
-diff --git a/sshconnect2.c b/sshconnect2.c
-index 7c369d7..bc362e6 100644
---- a/sshconnect2.c
-+++ b/sshconnect2.c
-@@ -1010,14 +1010,14 @@ jpake_password_to_secret(Authctxt *authctxt, const char *crypt_scheme,
+diff -Nura openssh-6.3p1.orig/sshconnect2.c openssh-6.3p1/sshconnect2.c
+--- openssh-6.3p1.orig/sshconnect2.c	2013-06-05 19:22:05.000000000 -0300
++++ openssh-6.3p1/sshconnect2.c	2013-10-22 09:44:58.967297681 -0300
+@@ -1008,14 +1008,14 @@
  	    &secret, &secret_len) != 0)
  		fatal("%s: hash_buffer", __func__);
  
@@ -507,17 +495,17 @@ index 7c369d7..bc362e6 100644
 -	bzero(crypted, strlen(crypted));
 +	memset(password, 0, strlen(password));
 +	memset(crypted, 0, strlen(crypted));
- 	xfree(password);
- 	xfree(crypted);
+ 	free(password);
+ 	free(crypted);
  
  	if ((ret = BN_bin2bn(secret, secret_len, NULL)) == NULL)
  		fatal("%s: BN_bin2bn (secret)", __func__);
 -	bzero(secret, secret_len);
 +	memset(secret, 0, secret_len);
- 	xfree(secret);
+ 	free(secret);
  
  	return ret;
-@@ -1054,8 +1054,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+@@ -1052,8 +1052,8 @@
  
  	/* Obtain password and derive secret */
  	pctx->s = jpake_password_to_secret(authctxt, crypt_scheme, salt);
@@ -525,10 +513,10 @@ index 7c369d7..bc362e6 100644
 -	bzero(salt, strlen(salt));
 +	memset(crypt_scheme, 0, strlen(crypt_scheme));
 +	memset(salt, 0, strlen(salt));
- 	xfree(crypt_scheme);
- 	xfree(salt);
+ 	free(crypt_scheme);
+ 	free(salt);
  	JPAKE_DEBUG_BN((pctx->s, "%s: s = ", __func__));
-@@ -1070,8 +1070,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+@@ -1068,8 +1068,8 @@
  	    &pctx->a,
  	    &x2_s_proof, &x2_s_proof_len);
  
@@ -536,28 +524,37 @@ index 7c369d7..bc362e6 100644
 -	bzero(x4_proof, x4_proof_len);
 +	memset(x3_proof, 0, x3_proof_len);
 +	memset(x4_proof, 0, x4_proof_len);
- 	xfree(x3_proof);
- 	xfree(x4_proof);
+ 	free(x3_proof);
+ 	free(x4_proof);
  
-@@ -1083,7 +1083,7 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+@@ -1081,7 +1081,7 @@
  	packet_put_string(x2_s_proof, x2_s_proof_len);
  	packet_send();
  
 -	bzero(x2_s_proof, x2_s_proof_len);
 +	memset(x2_s_proof, 0, x2_s_proof_len);
- 	xfree(x2_s_proof);
+ 	free(x2_s_proof);
  
  	/* Expect step 2 packet from peer */
-@@ -1123,7 +1123,7 @@ input_userauth_jpake_server_step2(int type, u_int32_t seq, void *ctxt)
+@@ -1121,7 +1121,7 @@
  	    &pctx->k,
  	    &pctx->h_k_cid_sessid, &pctx->h_k_cid_sessid_len);
  
 -	bzero(x4_s_proof, x4_s_proof_len);
 +	memset(x4_s_proof, 0, x4_s_proof_len);
- 	xfree(x4_s_proof);
+ 	free(x4_s_proof);
  
  	JPAKE_DEBUG_CTX((pctx, "confirm sending in %s", __func__));
-@@ -1787,8 +1787,8 @@ userauth_jpake(Authctxt *authctxt)
+@@ -1406,7 +1406,7 @@
+ 		/* If IdentitiesOnly set and key not found then don't use it */
+ 		if (!found && options.identities_only) {
+ 			TAILQ_REMOVE(&files, id, next);
+-			bzero(id, sizeof(*id));
++			memset(id, 0, sizeof(*id));
+ 			free(id);
+ 		}
+ 	}
+@@ -1814,8 +1814,8 @@
  	packet_put_string(x2_proof, x2_proof_len);
  	packet_send();
  
@@ -565,9 +562,18 @@ index 7c369d7..bc362e6 100644
 -	bzero(x2_proof, x2_proof_len);
 +	memset(x1_proof, 0, x1_proof_len);
 +	memset(x2_proof, 0, x2_proof_len);
- 	xfree(x1_proof);
- 	xfree(x2_proof);
+ 	free(x1_proof);
+ 	free(x2_proof);
  
--- 
-1.7.8.6
-
+diff -Nura openssh-6.3p1.orig/ssh-keygen.c openssh-6.3p1/ssh-keygen.c
+--- openssh-6.3p1.orig/ssh-keygen.c	2013-07-20 00:22:32.000000000 -0300
++++ openssh-6.3p1/ssh-keygen.c	2013-10-22 09:45:10.003658313 -0300
+@@ -1693,7 +1693,7 @@
+ 		fatal("Invalid certificate time format %s", s);
+ 	}
+ 
+-	bzero(&tm, sizeof(tm));
++	memset(&tm, 0, sizeof(tm));
+ 	if (strptime(buf, fmt, &tm) == NULL)
+ 		fatal("Invalid certificate time %s", s);
+ 	if ((tt = mktime(&tm)) < 0)
diff --git a/package/openssh/openssh-fix-pam-uclibc-pthreads-clash.patch b/package/openssh/openssh-02-fix-pam-uclibc-pthreads-clash.patch
similarity index 100%
rename from package/openssh/openssh-fix-pam-uclibc-pthreads-clash.patch
rename to package/openssh/openssh-02-fix-pam-uclibc-pthreads-clash.patch
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 4a5b125de7..f0652e5805 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENSSH_VERSION = 6.2p2
+OPENSSH_VERSION = 6.3p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \

From 46b3f2d83e2af4461dd5b66fca7838310d5d3b01 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Oct 2013 12:18:42 -0300
Subject: [PATCH 6505/6849] libmicrohttpd: bump to version 0.9.31

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libmicrohttpd/libmicrohttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index 48dace761b..e3ad026e71 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBMICROHTTPD_VERSION = 0.9.30
+LIBMICROHTTPD_VERSION = 0.9.31
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES

From deec0dbc844ff827aacd009d1c96ceaa5b7914c6 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Oct 2013 14:51:57 -0300
Subject: [PATCH 6506/6849] linux-headers: bump 3.{0, 4}.x stable versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...headers_install-fix-__packed-in-exported-kernel-head.patch | 0
 package/linux-headers/Config.in.host                          | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename package/linux-headers/{3.0.100 => 3.0.101}/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch (100%)

diff --git a/package/linux-headers/3.0.100/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.101/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
similarity index 100%
rename from package/linux-headers/3.0.100/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
rename to package/linux-headers/3.0.101/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 124a68f55e..a32f6659b7 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -76,11 +76,11 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.100"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.66"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.67"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7

From 40316ab81f2df42737eb9f7369445ffa68a6e404 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Mon, 21 Oct 2013 08:25:55 +0200
Subject: [PATCH 6507/6849] imagemagick: bump to version 6.8.7-1

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/imagemagick/imagemagick.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index f5aacb68bd..4b58148924 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 IMAGEMAGICK_MAJOR = 6.8.7
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-0
-IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-1
+IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 # The official ImageMagick site only keeps the latest versions
 # available, which is annoying. Use an alternate site that keeps all
 # older versions.

From f0801fa2f3e1cbd617bacef3b442da6914caae0a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 21 Oct 2013 15:29:55 -0300
Subject: [PATCH 6508/6849] nano: fix ncursesw build failure

After the latest version bump ncursesw5-config is automatically detected
if it's present in the build machine (almost always because we need full
ncurses support with headers for Kconfig's menuconfig).
Since we don't have ncursesw support in buildroot just say no. Fixes:
http://autobuild.buildroot.net/results/89d/89d7ec7306411b15f9ffbc2051d0d316237b4c07/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nano/nano.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index aba4b4f152..3707e7753d 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -10,6 +10,7 @@ NANO_LICENSE = GPLv3+
 NANO_LICENSE_FILES = COPYING
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
 NANO_CONF_OPT = --without-slang
+NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false
 NANO_DEPENDENCIES = ncurses
 
 ifeq ($(BR2_PACKAGE_NANO_TINY),y)

From 945468045fe1a0b67fd67f3674f29cacfdce0c24 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 11 Oct 2013 11:54:22 +0800
Subject: [PATCH 6509/6849] ola: bump to version 0.8.32

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ola/ola.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index d7ddab7dae..835ca4e504 100644
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OLA_VERSION = 0.8.31
+OLA_VERSION = 0.8.32
 OLA_SITE = https://open-lighting.googlecode.com/files
 
 OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)

From 797952e1ae130b674cb501a00036c24a2ce79537 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Fri, 11 Oct 2013 07:48:08 +0200
Subject: [PATCH 6510/6849] fdk-aac: bump to version 0.1.2

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/fdk-aac/fdk-aac.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk
index 325267a8d3..dde3e7ebf1 100644
--- a/package/fdk-aac/fdk-aac.mk
+++ b/package/fdk-aac/fdk-aac.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FDK_AAC_VERSION = 0.1.1
+FDK_AAC_VERSION = 0.1.2
 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac
 FDK_AAC_LICENSE = fdk-aac license
 FDK_AAC_LICENSE_FILES = NOTICE

From 21a4a9003e3acc161f0ae95c23ad44bad0250881 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Thu, 24 Oct 2013 00:44:13 +0200
Subject: [PATCH 6511/6849] php: fix runtime error on big endian

Fixes #6566

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/php/php.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/php/php.mk b/package/php/php.mk
index 92665b46b3..e310bd6052 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -19,6 +19,11 @@ PHP_CONF_OPT =  --mandir=/usr/share/man \
 		--with-config-file-path=/etc \
 		--localstatedir=/var \
 		--disable-rpath
+ifeq ($(BR2_ENDIAN),"BIG")
+PHP_CONF_ENV = ac_cv_c_bigendian_php=yes
+else
+PHP_CONF_ENV = ac_cv_c_bigendian_php=no
+endif
 PHP_CONFIG_SCRIPTS = php-config
 
 PHP_CFLAGS = $(TARGET_CFLAGS)

From ba0d86215ec8f3b6dbddd751d595bf64d5bc8a11 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 24 Oct 2013 01:28:01 +0200
Subject: [PATCH 6512/6849] perf: disable documentation

perf uses asciidoc to generate documentation, but /usr/bin/asciidoc will
try to use buildroot's host-python which doesn't have the required
unicodedata. Recent kernels always try to build the man pages when
installing. To avoid that, define ASCIIDOC as an empty string so the
Makefile can't find the executable and skips the documentation
generation.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/perf/perf.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/perf/perf.mk b/package/perf/perf.mk
index 120353f8e3..d7898d0bc3 100644
--- a/package/perf/perf.mk
+++ b/package/perf/perf.mk
@@ -19,7 +19,8 @@ PERF_MAKE_FLAGS = \
 	NO_LIBPYTHON=1 \
 	DESTDIR=$(TARGET_DIR) \
 	prefix=/usr \
-	WERROR=0
+	WERROR=0 \
+	ASCIIDOC=
 
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
 	PERF_DEPENDENCIES += elfutils

From dc7a9bb9f7e0ac096d79c47e9240c2eb7b08dce9 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 24 Oct 2013 01:43:22 +0200
Subject: [PATCH 6513/6849] stress: disable documentation

It fails to build with my makeinfo version. Note that the autobuilders don't
see this, probably because they don't have makeinfo installed.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/stress/stress.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index 63efb66f5b..b0580310fb 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -17,7 +17,10 @@ STRESS_AUTORECONF = YES
 #
 # If the BR2_PREFER_STATIC_LIB is not defined, we have to specify
 # --disable-static explicitly to get stress linked dynamically.
+#
+# Also, disable documentation by undefining makeinfo
 STRESS_CONF_OPT = \
-	$(if $(BR2_PREFER_STATIC_LIB),,--disable-static)
+	$(if $(BR2_PREFER_STATIC_LIB),,--disable-static) \
+	MAKEINFO=:
 
 $(eval $(autotools-package))

From cfea3556422e92969bedbde95d32af4c3dc25c83 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Wed, 23 Oct 2013 21:05:49 -0400
Subject: [PATCH 6514/6849] ifplugd: ensure directories exist before installing
 to them

Add the -D to install commands to ensure that all the necessary
installation directories exist.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ifplugd/ifplugd.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index ee5bd25ebe..837e0160ed 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -21,14 +21,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 
 define IFPLUGD_INSTALL_FIXUP
-	$(INSTALL) -d $(TARGET_DIR)/etc/ifplugd
 	@if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \
-		$(INSTALL) $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/; \
+		$(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 		$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 	fi
-	$(INSTALL) -m 0755 $(@D)/conf/ifplugd.action \
-		$(TARGET_DIR)/etc/ifplugd/
-	$(INSTALL) -m 0755 $(@D)/conf/ifplugd.init \
+	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
+		$(TARGET_DIR)/etc/ifplugd/ifplugd.action
+	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.init \
 		$(TARGET_DIR)/etc/init.d/S45ifplugd
 	# don't use bash for init script
 	$(SED) 's^/bin/bash^/bin/sh^g' $(TARGET_DIR)/etc/init.d/S45ifplugd

From feb0877015cc0c644129e69276b3000c83742750 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 23 Oct 2013 23:11:49 +0100
Subject: [PATCH 6515/6849] Makefile: export BUILD_DIR

$(BUILD_DIR) is a nice place to put files generated during the build.
With the advent of user-supplied step-hooks, they may want to store
some information on the build.

Export BUILD_DIR to that effect; update manual accordingly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile                         | 1 +
 docs/manual/customize-rootfs.txt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f266e2dd77..9528703b56 100644
--- a/Makefile
+++ b/Makefile
@@ -291,6 +291,7 @@ export STAGING_DIR
 export HOST_DIR
 export BINARIES_DIR
 export BASE_DIR
+export BUILD_DIR
 
 ################################################################################
 #
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 49a6b4b442..158389c8a7 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -41,6 +41,7 @@ there are a few ways to customize the resulting target filesystem.
     - +BUILDROOT_CONFIG+: the path to the Buildroot .config file
     - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see
       xref:generic-package-reference[]
+    - +BUILD_DIR+: the directory where packages are extracted and built
     - +BINARIES_DIR+: the place where all binary files (aka images) are
       stored
     - +BASE_DIR+: the base output directory
@@ -79,7 +80,7 @@ in one of these _post-image scripts_ will require special handling
 Just like for the _post-build scripts_ mentioned above, you also have
 access to the following environment variables from your _post-image
 scripts_: +BUILDROOT_CONFIG+, +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+,
-+BINARIES_DIR+ and +BASE_DIR+.
++BUILD_DIR+, +BINARIES_DIR+ and +BASE_DIR+.
 
 Additionally, each of the +BR2_ROOTFS_POST_BUILD_SCRIPT+ and
 +BR2_ROOTFS_POST_IMAGE_SCRIPT+ scripts will be passed the arguments

From 4513d785156f87707687081aeb8582c56b684cc5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 Oct 2013 15:11:25 -0300
Subject: [PATCH 6516/6849] Makefile: revert BUILD_DIR export

Revert commit feb0877015cc0c644129e69276b3000c83742750
U-Boot uses $(BUILD_DIR) and causes issues, other packages might as
well. Fixes:
http://autobuild.buildroot.net/results/1f6/1f65289d5c284caa82a4e9137613f792797ee08a/
http://autobuild.buildroot.net/results/6a5/6a5f77483e908dc96d08824cf9113402431bace7/

It should probably be named somewhat more uniquely.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile                         | 1 -
 docs/manual/customize-rootfs.txt | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9528703b56..f266e2dd77 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,6 @@ export STAGING_DIR
 export HOST_DIR
 export BINARIES_DIR
 export BASE_DIR
-export BUILD_DIR
 
 ################################################################################
 #
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 158389c8a7..49a6b4b442 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -41,7 +41,6 @@ there are a few ways to customize the resulting target filesystem.
     - +BUILDROOT_CONFIG+: the path to the Buildroot .config file
     - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see
       xref:generic-package-reference[]
-    - +BUILD_DIR+: the directory where packages are extracted and built
     - +BINARIES_DIR+: the place where all binary files (aka images) are
       stored
     - +BASE_DIR+: the base output directory
@@ -80,7 +79,7 @@ in one of these _post-image scripts_ will require special handling
 Just like for the _post-build scripts_ mentioned above, you also have
 access to the following environment variables from your _post-image
 scripts_: +BUILDROOT_CONFIG+, +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+,
-+BUILD_DIR+, +BINARIES_DIR+ and +BASE_DIR+.
++BINARIES_DIR+ and +BASE_DIR+.
 
 Additionally, each of the +BR2_ROOTFS_POST_BUILD_SCRIPT+ and
 +BR2_ROOTFS_POST_IMAGE_SCRIPT+ scripts will be passed the arguments

From 9f6b39bc420215ee2520991a3081f799bbd157ec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 Oct 2013 14:10:58 -0300
Subject: [PATCH 6517/6849] dosfstools: bump to version 3.0.23

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dosfstools/dosfstools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index c94f68065e..6b27e80a08 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOSFSTOOLS_VERSION = 3.0.22
+DOSFSTOOLS_VERSION = 3.0.23
 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+

From d19e39ca25f0e77ea7f7b8ce734818d5d6cef24e Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 Oct 2013 13:13:57 -0300
Subject: [PATCH 6518/6849] ebtables: install ethertypes

It's handy and closes bug #6608.
Thanks to Cassiano Martin <cassiano@idbinfo.com.br> for pointing it out.

[Peter: use INSTALL]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ebtables/ebtables.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 116012c72c..edb5d42b75 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -31,6 +31,7 @@ define EBTABLES_INSTALL_TARGET_CMDS
 	done
 	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
 		$(TARGET_DIR)/sbin/ebtables
+	$(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes
 endef
 endif
 

From c96a0cc9077001b4bdea20c3fcf2e03b69aeb30a Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 Oct 2013 14:14:36 -0300
Subject: [PATCH 6519/6849] libedit: needs mmu

Fixes:
http://autobuild.buildroot.net/results/211/2116ffb8e74073fd415bfdea748731b5b8a876d7/
(Not just the examples, also vi.c)

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libedit/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index 5158744a1b..683eb6b883 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBEDIT
 	bool "libedit"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
 	  The editline library (from BSD) provides generic line editing

From 6f3575c3ac4b28c64aa44058866a648bf555f036 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 Oct 2013 20:01:23 -0300
Subject: [PATCH 6520/6849] package/uclibc: fixup e500mc support

The e500mc core has a classic FPU, SPE is a bad word.
See: http://en.wikipedia.org/wiki/PowerPC_e500#e500mc

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/uclibc/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index acf736ada8..2de0270a52 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -244,8 +244,8 @@ config BR2_UCLIBC_SPARC_TYPE
 config BR2_UCLIBC_POWERPC_TYPE
 	string
 	depends on BR2_UCLIBC_TARGET_ARCH = "powerpc"
-	default CLASSIC if !BR2_powerpc_8540 && !BR2_powerpc_8548 && !BR2_powerpc_e500mc
-	default E500    if BR2_powerpc_8540 || BR2_powerpc_8548 || BR2_powerpc_e500mc
+	default CLASSIC if !BR2_powerpc_8540 && !BR2_powerpc_8548
+	default E500    if BR2_powerpc_8540 || BR2_powerpc_8548
 
 config BR2_UCLIBC_X86_TYPE
 	string

From 45ff7712f390843b63e4899a476adfed759fa4a8 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Fri, 25 Oct 2013 00:04:47 +0200
Subject: [PATCH 6521/6849] libcgroup: depends on host-bison

Fixes http://autobuild.buildroot.net/results/73d/73dddcc1aa68999ea496de148497f80bdb02c874

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libcgroup/libcgroup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index c2392e0b8c..339deb3e8f 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -9,7 +9,7 @@ LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
 LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v.038
 LIBCGROUP_LICENSE = LGPLv2.1
 LIBCGROUP_LICENSE_FILES = COPYING
-
+LIBCGROUP_DEPENDENCIES = host-bison
 LIBCGROUP_INSTALL_STAGING = YES
 
 # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h

From fba37e839106999a4052cfdb269f9d448fe962fd Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Fri, 25 Oct 2013 00:50:55 +0200
Subject: [PATCH 6522/6849] xdriver_xf86-video-geode: only build on i386

This package builds with -m32. In buildroot, we don't have multilib
support so only the 64-bit libraries are available, which can't be
linked against these 32-bit object files.

I've tested this with the Sourcery and buildroot toolchains - neither
works.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/x11r7/xdriver_xf86-video-geode/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xdriver_xf86-video-geode/Config.in b/package/x11r7/xdriver_xf86-video-geode/Config.in
index 2b868d0d45..0b45fb165d 100644
--- a/package/x11r7/xdriver_xf86-video-geode/Config.in
+++ b/package/x11r7/xdriver_xf86-video-geode/Config.in
@@ -5,6 +5,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
-	depends on (BR2_i386 || BR2_x86_64)
+	depends on BR2_i386
 	help
 	  video driver for geode device

From 71af8d275c87812e295f1772dc8183a5ae96f989 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 24 Oct 2013 10:48:35 -0300
Subject: [PATCH 6523/6849] gnutls: security bump to version 3.2.5

Fix for GNUTLS-SA-2013-3.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gnutls/gnutls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 5a05f65185..1e3e267223 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUTLS_VERSION = 3.2.4
+GNUTLS_VERSION = 3.2.5
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+

From d4f839248d2d57406db85803ab041d03cbaaffda Mon Sep 17 00:00:00 2001
From: Arnaud Aujon <arnaud.aujon@gmail.com>
Date: Thu, 24 Oct 2013 11:00:05 +0200
Subject: [PATCH 6524/6849] libfreefare: new repository

[Peter: also adjust upstream URL]
Signed-off-by: Arnaud Aujon <arnaud.aujon@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libfreefare/Config.in      | 2 +-
 package/libfreefare/libfreefare.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
index bc11b8bcbb..2bb0c93ddf 100644
--- a/package/libfreefare/Config.in
+++ b/package/libfreefare/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBFREEFARE
 	help
 	  Library for high level manipulation of MIFARE cards.
 
-	  http://code.google.com/p/nfc-tools/wiki/libfreefare
+	  http://nfc-tools.org/index.php?title=Libfreefare
 
 comment "libfreefare needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 859b5e37d5..8dcd6b81c9 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBFREEFARE_VERSION = 0.3.4
-LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
+LIBFREEFARE_SITE = http://libfreefare.googlecode.com/files
 LIBFREEFARE_DEPENDENCIES = libnfc openssl
 
 $(eval $(autotools-package))

From a88b4804ffebe5fbbd185a99e6b95ca96720295d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 11:35:36 -0300
Subject: [PATCH 6525/6849] dnsmasq: bump to version 2.67

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...asq-01-fix-wrong-size-in-memset-call.patch |  27 ----
 ...er-zero-in-encapsulated-dhcp-options.patch | 143 ------------------
 package/dnsmasq/dnsmasq.mk                    |   2 +-
 3 files changed, 1 insertion(+), 171 deletions(-)
 delete mode 100644 package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch
 delete mode 100644 package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch

diff --git a/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch b/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch
deleted file mode 100644
index 536552a600..0000000000
--- a/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4582c0efe7d7af93517b1f3bcc7af67685ab3e5c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d@falconindy.com>
-Date: Thu, 18 Apr 2013 09:47:49 +0100
-Subject: [PATCH] Fix wrong size in memset() call.
-
-Thanks to Dave Reisner.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- src/ipset.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ipset.c b/src/ipset.c
-index a34ed96..f175fa4 100644
---- a/src/ipset.c
-+++ b/src/ipset.c
-@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
-       return -1;
-     }
-   
--  memset(buffer, 0, sizeof(buffer));
-+  memset(buffer, 0, BUFF_SZ);
- 
-   nlh = (struct nlmsghdr *)buffer;
-   nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
---
-1.8.1.5
diff --git a/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch b/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch
deleted file mode 100644
index 79f57bf8ff..0000000000
--- a/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From bd08ae67f9a0cae2ce15be885254cad9449d4551 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Fri, 19 Apr 2013 10:22:06 +0100
-Subject: [PATCH] Allow option number zero in encapsulated DHCP options.
-
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- src/dhcp-common.c |  6 +++---
- src/dnsmasq.h     |  4 ++--
- src/option.c      | 33 ++++++++++++++++++++-------------
- 3 files changed, 25 insertions(+), 18 deletions(-)
-
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index f4fd088..8de4268 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -512,7 +512,7 @@ void display_opts6(void)
- }
- #endif
- 
--u16 lookup_dhcp_opt(int prot, char *name)
-+int lookup_dhcp_opt(int prot, char *name)
- {
-   const struct opttab_t *t;
-   int i;
-@@ -528,10 +528,10 @@ u16 lookup_dhcp_opt(int prot, char *name)
-     if (strcasecmp(t[i].name, name) == 0)
-       return t[i].val;
-   
--  return 0;
-+  return -1;
- }
- 
--u16 lookup_dhcp_len(int prot, u16 val)
-+int lookup_dhcp_len(int prot, int val)
- {
-   const struct opttab_t *t;
-   int i;
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 69ae7a7..41e2798 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1216,8 +1216,8 @@ void log_tags(struct dhcp_netid *netid, u32 xid);
- int match_bytes(struct dhcp_opt *o, unsigned char *p, int len);
- void dhcp_update_configs(struct dhcp_config *configs);
- void display_opts(void);
--u16 lookup_dhcp_opt(int prot, char *name);
--u16 lookup_dhcp_len(int prot, u16 val);
-+int lookup_dhcp_opt(int prot, char *name);
-+int lookup_dhcp_len(int prot, int val);
- char *option_string(int prot, unsigned int opt, unsigned char *val, 
- 		    int opt_len, char *buf, int buf_len);
- #ifdef HAVE_LINUX_NETWORK
-diff --git a/src/option.c b/src/option.c
-index b2596ec..2a61017 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -750,6 +750,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
-   struct dhcp_netid *np = NULL;
-   u16 opt_len = 0;
-   int is6 = 0;
-+  int option_ok = 0;
- 
-   new->len = 0;
-   new->flags = flags;
-@@ -769,16 +770,19 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- 	{
- 	  new->opt = atoi(arg);
- 	  opt_len = 0;
-+	  option_ok = 1;
- 	  break;
- 	}
-       
-       if (strstr(arg, "option:") == arg)
- 	{
--	  new->opt = lookup_dhcp_opt(AF_INET, arg+7);
--	  opt_len = lookup_dhcp_len(AF_INET, new->opt);
--	  /* option:<optname> must follow tag and vendor string. */
--	  if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
--	    new->opt = 0;
-+	  if ((new->opt = lookup_dhcp_opt(AF_INET, arg+7)) != -1)
-+	    {
-+	      opt_len = lookup_dhcp_len(AF_INET, new->opt);
-+	      /* option:<optname> must follow tag and vendor string. */
-+	      if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
-+		option_ok = 1;
-+	    }
- 	  break;
- 	}
- #ifdef HAVE_DHCP6
-@@ -792,13 +796,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- 	    {
- 	      new->opt = atoi(arg+8);
- 	      opt_len = 0;
-+	      option_ok = 1;
- 	    }
- 	  else
- 	    {
--	      new->opt = lookup_dhcp_opt(AF_INET6, arg+8);
--	      opt_len = lookup_dhcp_len(AF_INET6, new->opt);
--	      if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
--		new->opt = 0;
-+	      if ((new->opt = lookup_dhcp_opt(AF_INET6, arg+8)) != -1)
-+		{
-+		  opt_len = lookup_dhcp_len(AF_INET6, new->opt);
-+		  if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
-+		    option_ok = 1;
-+		}
- 	    }
- 	  /* option6:<opt>|<optname> must follow tag and vendor string. */
- 	  is6 = 1;
-@@ -821,7 +828,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- 	  new->flags |= DHOPT_RFC3925;
- 	  if (flags == DHOPT_MATCH)
- 	    {
--	      new->opt = 1; /* avoid error below */
-+	      option_ok = 1;
- 	      break;
- 	    }
- 	}
-@@ -848,16 +855,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
-       
-       if (opt_len == 0 &&
- 	  !(new->flags & DHOPT_RFC3925))
--	opt_len = lookup_dhcp_len(AF_INET6 ,new->opt);
-+	opt_len = lookup_dhcp_len(AF_INET6, new->opt);
-     }
-   else
- #endif
-     if (opt_len == 0 &&
- 	!(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925)))
--      opt_len = lookup_dhcp_len(AF_INET ,new->opt);
-+      opt_len = lookup_dhcp_len(AF_INET, new->opt);
-   
-   /* option may be missing with rfc3925 match */
--  if (new->opt == 0)
-+  if (!option_ok)
-     ret_err(_("bad dhcp-option"));
-   
-   if (comma)
---
-1.8.1.5
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 8b9c318486..3474a41ad5 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DNSMASQ_VERSION = 2.66
+DNSMASQ_VERSION = 2.67
 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"

From f8cefffd4ea2810474d91283d7430b21cf7273e3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 08:34:38 -0300
Subject: [PATCH 6526/6849] freetype: bump to version 2.5.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/freetype/freetype.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 177adf50ac..1ca779e2cd 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-FREETYPE_VERSION = 2.4.12
+FREETYPE_VERSION_MAJOR = 2.5.0
+FREETYPE_VERSION_MINOR = 1
+FREETYPE_VERSION = $(FREETYPE_VERSION_MAJOR).$(FREETYPE_VERSION_MINOR)
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
+FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION_MAJOR)
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
@@ -18,6 +20,14 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+FREETYPE_DEPENDENCIES += libpng
+FREETYPE_CONF_OPT += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
+	LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`"
+else
+FREETYPE_CONF_OPT += --without-png
+endif
+
 # Extra fixing since includedir and libdir are expanded from configure values
 define FREETYPE_FIX_CONFIG_FILE
 	$(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \

From 2e5f5b39962e755db89c75ad9b9ebae6f35f4367 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 08:34:39 -0300
Subject: [PATCH 6527/6849] libpng: bump to version 1.6.6

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libpng/libpng.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index f5bf956ee8..5ce828e7d2 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-LIBPNG_VERSION = 1.4.12
-LIBPNG_SERIES = 14
-LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_VERSION = 1.6.6
+LIBPNG_SERIES = 16
+LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
 LIBPNG_LICENSE = libpng license
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkgconf zlib
 LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config
+LIBPNG_CONF_OPT = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-neon=yes,--enable-arm-neon=no)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From a784f7566e3dc67f963aa8bc4da296474d0e7fa8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 08:34:40 -0300
Subject: [PATCH 6528/6849] fbv: patch up support for libpng 1.5+

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/fbv/fbv-1.0b-libpng15.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/fbv/fbv-1.0b-libpng15.patch

diff --git a/package/fbv/fbv-1.0b-libpng15.patch b/package/fbv/fbv-1.0b-libpng15.patch
new file mode 100644
index 0000000000..7872a73cf6
--- /dev/null
+++ b/package/fbv/fbv-1.0b-libpng15.patch
@@ -0,0 +1,24 @@
+Support for libpng 1.5+ shamelessly taken from Gentoo.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/png.c
++++ b/png.c
+@@ -69,7 +69,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);
+@@ -161,7 +161,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);

From 70da2ae5ff0c816c7a0c500293b50d3d0dd9b641 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 08:34:41 -0300
Subject: [PATCH 6529/6849] matchbox-lib: patch up support for libpng 1.5+

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../matchbox-lib-1.9-libpng15.patch           | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch

diff --git a/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch b/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch
new file mode 100644
index 0000000000..3d68573b5f
--- /dev/null
+++ b/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch
@@ -0,0 +1,26 @@
+Support for libpng 1.5+ shamelessly taken from Gentoo.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/libmb/mbpixbuf.c
++++ b/libmb/mbpixbuf.c
+@@ -247,7 +247,7 @@
+     return NULL;
+   }
+ 
+-  if ( setjmp( png_ptr->jmpbuf ) ) {
++  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+     fclose(fd);
+     return NULL;
+@@ -269,8 +269,8 @@
+       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
+     png_set_gray_to_rgb(png_ptr);
+  
+-  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
+-       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
++  if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA 
++       || color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+        )
+     *has_alpha = 1;
+   else

From eb742c19566e77086967d20b0df789b3ccafe3e6 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 24 Oct 2013 00:24:18 +0200
Subject: [PATCH 6530/6849] docker: change into generic-package

docker is using autotools-package while it is in fact just a plain make
package.

Remove docker-1.5-skip-configure.patch which was just a hack to avoid
calling the non-existent configure script.

Remove docker-1.5-pkgconfig.patch which is not needed when PATH is set
appropriately.

Add a XLIBPATH option to the command line to avoid linking with
/usr/X11R6/lib.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/docker/docker-1.5-pkgconfig.patch     | 23 -------------------
 .../docker/docker-1.5-skip-configure.patch    |  4 ----
 package/docker/docker.mk                      | 20 ++++++++--------
 3 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 package/docker/docker-1.5-pkgconfig.patch
 delete mode 100644 package/docker/docker-1.5-skip-configure.patch

diff --git a/package/docker/docker-1.5-pkgconfig.patch b/package/docker/docker-1.5-pkgconfig.patch
deleted file mode 100644
index 1b56b1bd46..0000000000
--- a/package/docker/docker-1.5-pkgconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile	2002-11-20 05:20:49.000000000 -0500
-+++ b/Makefile	2008-04-28 12:36:23.000000000 -0400
-@@ -20,7 +20,6 @@ CFLAGS=-pedantic -Wall -W -O
- 
- PACKAGE=docker
- VERSION=1.5
--
- target=docker
- sources=docker.c kde.c icons.c xproperty.c net.c
- headers=docker.h kde.h icons.h xproperty.h net.h version.h
-@@ -31,10 +30,10 @@ all: $(target) $(sources) $(headers)
- 
- $(target): $(sources:.c=.o)
- 	$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
--		`pkg-config --libs glib-2.0` $^ -o $@
-+		`$(PKG_CONFIG) --libs glib-2.0` $^ -o $@
- 
- %.o: %.c
--	$(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
-+	$(CC) -c $(CFLAGS) `$(PKG_CONFIG) --cflags glib-2.0` $<
- 
- version.h: version.h.in Makefile
- 	sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
diff --git a/package/docker/docker-1.5-skip-configure.patch b/package/docker/docker-1.5-skip-configure.patch
deleted file mode 100644
index 441f9b05ef..0000000000
--- a/package/docker/docker-1.5-skip-configure.patch
+++ /dev/null
@@ -1,4 +0,0 @@
---- a/.stamp_configured	2008-03-19 03:34:24.425005162 -0400
-+++ b/.stamp_configured	2008-03-19 14:25:33.000000000 -0400
-@@ -0,0 +1 @@
-+ 
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 82cabec1ba..255860b75c 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -6,16 +6,16 @@
 
 DOCKER_VERSION = 1.5
 DOCKER_SITE = http://icculus.org/openbox/2/docker
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
 
-DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
-					CFLAGS="-I$(STAGING_DIR)/usr/include \
-						-I$(STAGING_DIR)/usr/include/glib-2.0 \
-						-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
-					PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-					LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
-
-DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
+define DOCKER_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		XLIBPATH=$(STAGING_DIR)/usr/lib
+endef
 
-DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
+define DOCKER_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		XLIBPATH=$(STAGING_DIR)/usr/lib PREFIX=$(TARGET_DIR)/usr install
+endef
 
-$(eval $(autotools-package))
+$(eval $(generic-package))

From b73c7219bf35272bdcb83010a5196b57ffaa4731 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 24 Oct 2013 00:24:19 +0200
Subject: [PATCH 6531/6849] docker: add license info

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/docker/docker.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 255860b75c..9a9d26bb85 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -8,6 +8,10 @@ DOCKER_VERSION = 1.5
 DOCKER_SITE = http://icculus.org/openbox/2/docker
 DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
 
+DOCKER_LICENSE = GPLv2+
+# The 'or later' is specified at the end of the README, so include that one too.
+DOCKER_LICENSE_FILES = COPYING README
+
 define DOCKER_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		XLIBPATH=$(STAGING_DIR)/usr/lib

From 3dab7ba7a0a3eb0a007cac7cd55ef869478dd301 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 26 Oct 2013 12:50:37 +0200
Subject: [PATCH 6532/6849] website: get rid of 'Related Sites' list

As discussed on the dev day. These sites are not really directly related
to Buildroot.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/header.html | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/docs/header.html b/docs/header.html
index 12716d0b4a..9c615f41c9 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -57,26 +57,6 @@
     <br><a href="http://autobuild.buildroot.org">Autobuilder</a>
     <br><a href="http://patchwork.buildroot.org">Patchwork</a>
 
-    <p><b>Related Sites</b>
-    <br><a href="http://busybox.net/">BusyBox</a>
-    <br><a href="http://uclibc.org/">uClibc.org</a>
-    <br><a href="http://cxx.uclibc.org/">uClibc++</a>
-    <br><a href="http://www.scratchbox.org/">Scratchbox</a>
-    <br><a href="http://openembedded.org/">OpenEmbedded</a>
-    <br><a href="http://www.ucdot.org/">uCdot</a>
-    <br><a href="http://linuxgizmos.com/">LinuxGizmos</a>
-    <br><a href="http://slashdot.org/">Slashdot</a>
-    <br><a href="http://freecode.com/">Freecode</a>
-    <br><a href="http://linuxtoday.com/">Linux Today</a>
-    <br><a href="http://lwn.net/">Linux Weekly News</a>
-    <br><a href="http://www.tldp.org/HOWTO">Linux HOWTOs</a>
-
-<!--
-    <a href="http://validator.w3.org/check/referer"><img
-     src="/images/valid-html401.png" height="31" width="88"
-          align="left" border="0" alt="Valid HTML"></a>
--->
-
 </td>
 
 

From 129abd31b7ef3e3c3c4f43324e23367f942940c9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 26 Oct 2013 13:55:48 +0200
Subject: [PATCH 6533/6849] freetype: fix host build

Fixes http://autobuild.buildroot.net/results/b49/b49c1c502215c7972d61c900e876909c9e79c312/

PNG support has to be explictly disabled now.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/freetype/freetype.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 1ca779e2cd..93fb3db824 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -19,6 +19,7 @@ FREETYPE_DEPENDENCIES = host-pkgconf \
 FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
+HOST_FREETYPE_CONF_OPT = --without-png
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 FREETYPE_DEPENDENCIES += libpng

From 5d85af61b7a66751ec6240bb14f7517a6633f5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 20 Sep 2013 08:43:10 +0300
Subject: [PATCH 6534/6849] qt5: bump to 5.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following patches are removed since they are upstreamed:
  - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
  - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch

Remove "-nomake demos" from configure options since "demos" directory is
merged into examples.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/qt5.mk                            |  4 +--
 package/qt5/qt5base/Config.in                 |  2 ++
 ...dd-egl-to-CONFIG-to-get-correct-incl.patch | 32 ------------------
 ...egl-cflags-when-opengles2-is-enabled.patch | 32 ++++++++++++++++++
 .../qt5base/qt5base-0002-mkspecs-files.patch  |  5 +--
 package/qt5/qt5base/qt5base.mk                | 10 ++++--
 package/qt5/qt5declarative/qt5declarative.mk  |  1 +
 .../qt5jsbackend-0002-fix-uclibc.patch        | 33 -------------------
 package/qt5/qt5quick1/qt5quick1.mk            |  3 +-
 9 files changed, 48 insertions(+), 74 deletions(-)
 delete mode 100644 package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
 create mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
 delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index fce0ca3848..671a217cba 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,5 +1,5 @@
-QT5_VERSION = 5.0.2
-QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/
+QT5_VERSION = 5.1.1
+QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/
 include $(sort $(wildcard package/qt5/*/*.mk))
 
 define QT5_LA_PRL_FILES_FIXUP
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 9c7fd15da0..e433373489 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -104,6 +104,7 @@ if BR2_PACKAGE_QT5BASE_GUI
 
 config BR2_PACKAGE_QT5BASE_WIDGETS
 	bool "widgets module"
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
 	help
 	  This option enables the Qt5Widgets library.
 
@@ -122,6 +123,7 @@ config BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XCB_UTIL_IMAGE
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
 	select BR2_PACKAGE_XCB_UTIL_WM
+	select BR2_PACKAGE_LIBXKBCOMMON
 
 comment "X.org XCB backend available if X.org is enabled"
 	depends on !BR2_PACKAGE_XORG7
diff --git a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
deleted file mode 100644
index a85a5aafa4..0000000000
--- a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 13 Jan 2013 14:36:48 +0100
-Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include
- paths
-
-The eglconvenience code includes <EGL/egl.h>. Therefore, it should get
-the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL,
-otherwise the build might if the EGL library has its headers in
-special locations. In order to achieve this, we simply add the "egl"
-feature to the list of features imported by eglconvenience.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- .../eglconvenience/eglconvenience.pri              |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
-index 188eb1c..8996cea 100644
---- a/src/platformsupport/eglconvenience/eglconvenience.pri
-+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
-@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
-     SOURCES += \
-         $$PWD/qeglconvenience.cpp \
-         $$PWD/qeglplatformcontext.cpp
-+    CONFIG += egl
- 
-     contains(QT_CONFIG,xlib) {
-         HEADERS += \
--- 
-1.7.9.5
-
diff --git a/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
new file mode 100644
index 0000000000..87acd9bef9
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
@@ -0,0 +1,32 @@
+From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
+Date: Sun, 15 Sep 2013 11:15:33 +0300
+Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch is sent to upstream and applied:
+https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8
+
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+---
+ src/plugins/platforms/xcb/xcb-plugin.pro |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
+index 8299528..bc21afe 100644
+--- a/src/plugins/platforms/xcb/xcb-plugin.pro
++++ b/src/plugins/platforms/xcb/xcb-plugin.pro
+@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) {
+ contains(QT_CONFIG, opengl) {
+     contains(QT_CONFIG, opengles2) {
+         DEFINES += XCB_USE_EGL
+-        LIBS += -lEGL
++        CONFIG += egl
+         HEADERS += qxcbeglsurface.h
+ 
+         # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
+-- 
+1.7.10.4
+
diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
index bfa9c15836..e406cfc278 100644
--- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
+++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
@@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 ===================================================================
 --- /dev/null
 +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,44 @@
 +MAKEFILE_GENERATOR      = UNIX
-+CONFIG                  += incremental gdb_dwarf_index
++CONFIG                 += incremental gdb_dwarf_index
 +QMAKE_INCREMENTAL_STYLE = sublib
 +
 +include(../../common/linux.conf)
@@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 +# modifications to linux.conf
 +QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs
 +QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy
++QMAKE_NM                = $${BUILDROOT_CROSS_COMPILE}nm -P
 +QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip
 +
 +#modifications to gcc-base.conf
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index ddc5574c7e..0106c2cbcc 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
-QT5BASE_CONFIGURE_OPTS += -xcb
+QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
 QT5BASE_DEPENDENCIES   += \
 	libxcb \
 	xcb-util-wm \
 	xcb-util-image \
 	xcb-util-keysyms \
-	xlib_libX11
+	xlib_libX11 \
+	libxkbcommon
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+QT5BASE_DEPENDENCIES   += xlib_libXext
+endif
 else
 QT5BASE_CONFIGURE_OPTS += -no-xcb
 endif
@@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS
 		-sysroot $(STAGING_DIR) \
 		-plugindir /usr/lib/qt/plugins \
 		-no-rpath \
-		-nomake examples -nomake demos -nomake tests \
+		-nomake examples -nomake tests \
 		-device buildroot \
 		-no-c++11 \
 		$(QT5BASE_CONFIGURE_OPTS) \
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index a72e89344d..11b9287040 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -38,6 +38,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
 define QT5DECLARATIVE_INSTALL_TARGET_LIBS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
 endef
 endif
diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
deleted file mode 100644
index 50a6dbcacf..0000000000
--- a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix build on uClibc
-
-Patch taken from https://code.google.com/p/v8/source/detail?r=12094.
-
-Review URL: https://chromiumcodereview.appspot.com/10784012
-Patch from Remi Duraffort <remi.duraffort@st.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc
-===================================================================
---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc	2012-12-18 20:04:01.000000000 +0100
-+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc	2013-03-03 20:31:46.000000000 +0100
-@@ -1030,7 +1030,8 @@
-   sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]);
- #elif V8_HOST_ARCH_ARM
- // An undefined macro evaluates to 0, so this applies to Android's Bionic also.
--#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \
-+     !defined(__UCLIBC__))
-   sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]);
-   sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]);
-   sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]);
-@@ -1038,7 +1039,8 @@
-   sample->pc = reinterpret_cast<Address>(mcontext.arm_pc);
-   sample->sp = reinterpret_cast<Address>(mcontext.arm_sp);
-   sample->fp = reinterpret_cast<Address>(mcontext.arm_fp);
--#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#endif  // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) &&
-+        // !defined(__UCLIBC__))
- #elif V8_HOST_ARCH_MIPS
-   sample->pc = reinterpret_cast<Address>(mcontext.pc);
-   sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]);
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
index 78e47db2d7..f9bb3e8e3a 100644
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -34,8 +34,7 @@ endef
 
 define QT5QUICK1_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib
-	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
-	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling $(TARGET_DIR)/usr/lib/qt/plugins/
 	cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr
 endef
 

From b12ec639ebd3c209d5b5a2d25b50dc2e9fd84656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 20 Sep 2013 08:43:11 +0300
Subject: [PATCH 6535/6849] qt5quickcontrols: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/Config.in                         |  1 +
 package/qt5/qt5quickcontrols/Config.in        | 20 ++++++++++
 .../qt5/qt5quickcontrols/qt5quickcontrols.mk  | 37 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 package/qt5/qt5quickcontrols/Config.in
 create mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 84060d031e..2b54bb60f2 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -22,6 +22,7 @@ source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5jsbackend/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quick1/Config.in"
+source "package/qt5/qt5quickcontrols/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
new file mode 100644
index 0000000000..3d8063036d
--- /dev/null
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_QT5QUICKCONTROLS
+	bool "qt5quickcontrols"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_QT5DECLARATIVE
+	# qt5declarative -> qt5jsbackend
+	depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+	depends on BR2_PACKAGE_HAS_OPENGL_EGL
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5quickcontrols module.
+
+	  http://qt-project.org
+
+comment "qt5quickcontrols requires an OpenGL-capable backend"
+	depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+		BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
new file mode 100644
index 0000000000..f9008b427c
--- /dev/null
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# qt5quickcontrols
+#
+################################################################################
+
+QT5QUICKCONTROLS_VERSION = $(QT5_VERSION)
+QT5QUICKCONTROLS_SITE = $(QT5_SITE)
+QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz
+QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
+QT5QUICKCONTROLS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5QUICKCONTROLS_LICENSE = LGPLv2.1 or GPLv3.0
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+else
+QT5QUICKCONTROLS_LICENSE = Commercial license
+QT5QUICKCONTROLS_REDISTRIBUTE = NO
+endif
+
+define QT5QUICKCONTROLS_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5QUICKCONTROLS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
+endef
+
+$(eval $(generic-package))

From 501f76953880ef2898468249bf035de8cdd8d6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 20 Sep 2013 08:43:12 +0300
Subject: [PATCH 6536/6849] qt5sensors: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/Config.in                |  1 +
 package/qt5/qt5sensors/Config.in     | 10 +++++
 package/qt5/qt5sensors/qt5sensors.mk | 56 ++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 package/qt5/qt5sensors/Config.in
 create mode 100644 package/qt5/qt5sensors/qt5sensors.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 2b54bb60f2..6f7073c2e3 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -24,6 +24,7 @@ source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quick1/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
 source "package/qt5/qt5script/Config.in"
+source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in
new file mode 100644
index 0000000000..3e1c4b7c5a
--- /dev/null
+++ b/package/qt5/qt5sensors/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5SENSORS
+	bool "qt5sensors"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5sensors module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
new file mode 100644
index 0000000000..21ec36c21f
--- /dev/null
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt5sensors
+#
+################################################################################
+
+QT5SENSORS_VERSION = $(QT5_VERSION)
+QT5SENSORS_SITE = $(QT5_SITE)
+QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz
+QT5SENSORS_DEPENDENCIES = qt5base
+QT5SENSORS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5SENSORS_LICENSE = LGPLv2.1 or GPLv3.0
+QT5SENSORS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+else
+QT5SENSORS_LICENSE = Commercial license
+QT5SENSORS_REDISTRIBUTE = NO
+endif
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+QT5SENSORS_DEPENDENCIES += qt5declarative
+endif
+
+define QT5SENSORS_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5SENSORS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5SENSORS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5SENSORS_INSTALL_TARGET_LIBS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Sensors.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sensor* $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+define QT5SENSORS_INSTALL_TARGET_QMLS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtSensors $(TARGET_DIR)/usr/qml
+endef
+endif
+
+define QT5SENSORS_INSTALL_TARGET_CMDS
+	$(QT5SENSORS_INSTALL_TARGET_LIBS)
+	$(QT5SENSORS_INSTALL_TARGET_QMLS)
+endef
+
+$(eval $(generic-package))

From cdeb17590848d6869451bb9784fb6887130e795e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 20 Sep 2013 08:43:13 +0300
Subject: [PATCH 6537/6849] qt5serialport: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/Config.in                      |  1 +
 package/qt5/qt5serialport/Config.in        | 10 ++++++
 package/qt5/qt5serialport/qt5serialport.mk | 40 ++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 package/qt5/qt5serialport/Config.in
 create mode 100644 package/qt5/qt5serialport/qt5serialport.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 6f7073c2e3..6c953f1c51 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -25,6 +25,7 @@ source "package/qt5/qt5quick1/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5sensors/Config.in"
+source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in
new file mode 100644
index 0000000000..772de88805
--- /dev/null
+++ b/package/qt5/qt5serialport/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5SERIALPORT
+	bool "qt5serialport"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5serialport module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
new file mode 100644
index 0000000000..0328ef8d64
--- /dev/null
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt5serialport
+#
+################################################################################
+
+QT5SERIALPORT_VERSION = $(QT5_VERSION)
+QT5SERIALPORT_SITE = $(QT5_SITE)
+QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.xz
+QT5SERIALPORT_DEPENDENCIES = qt5base
+QT5SERIALPORT_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5SERIALPORT_LICENSE = LGPLv2.1 or GPLv3.0
+QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+else
+QT5SERIALPORT_LICENSE = Commercial license
+QT5SERIALPORT_REDISTRIBUTE = NO
+endif
+
+define QT5SERIALPORT_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5SERIALPORT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5SERIALPORT_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5SERIALPORT_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
+$(eval $(generic-package))

From b601a07165fddeaf496f2b89266fce3a7c66cd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Fri, 20 Sep 2013 08:43:14 +0300
Subject: [PATCH 6538/6849] qt5x11extras: new package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/Config.in                    |  1 +
 package/qt5/qt5x11extras/Config.in       | 11 +++++++
 package/qt5/qt5x11extras/qt5x11extras.mk | 40 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/qt5/qt5x11extras/Config.in
 create mode 100644 package/qt5/qt5x11extras/qt5x11extras.mk

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 6c953f1c51..30f4ac8385 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -28,5 +28,6 @@ source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 endif
diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in
new file mode 100644
index 0000000000..79ff9b95e1
--- /dev/null
+++ b/package/qt5/qt5x11extras/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_QT5X11EXTRAS
+	bool "qt5x11extras"
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	depends on BR2_PACKAGE_QT5BASE_XCB
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5x11extras module.
+
+	  http://qt-project.org
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
new file mode 100644
index 0000000000..237fe3221c
--- /dev/null
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# qt5x11extras
+#
+################################################################################
+
+QT5X11EXTRAS_VERSION = $(QT5_VERSION)
+QT5X11EXTRAS_SITE = $(QT5_SITE)
+QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz
+QT5X11EXTRAS_DEPENDENCIES = qt5base
+QT5X11EXTRAS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5X11EXTRAS_LICENSE = LGPLv2.1 or GPLv3.0
+QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+else
+QT5X11EXTRAS_LICENSE = Commercial license
+QT5X11EXTRAS_REDISTRIBUTE = NO
+endif
+
+define QT5X11EXTRAS_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5X11EXTRAS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5X11EXTRAS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PREFER_STATIC_LIB),)
+define QT5X11EXTRAS_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5X11Extras.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
+$(eval $(generic-package))

From 0764b1cf4573f7fdae9faa280898a7a9950da100 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 26 Oct 2013 17:58:40 +0200
Subject: [PATCH 6539/6849] qt5base: fix QtGUI build without PNG support

Patch from upstream bug report:
https://bugreports.qt-project.org/browse/QTBUG-33496

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...5base-0005-fix-gui-build-without-png.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/qt5/qt5base/qt5base-0005-fix-gui-build-without-png.patch

diff --git a/package/qt5/qt5base/qt5base-0005-fix-gui-build-without-png.patch b/package/qt5/qt5base/qt5base-0005-fix-gui-build-without-png.patch
new file mode 100644
index 0000000000..ea0a7e3d2d
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0005-fix-gui-build-without-png.patch
@@ -0,0 +1,22 @@
+[PATCH] fix QtGUI build without PNG support
+
+Upstream bug: https://bugreports.qt-project.org/browse/QTBUG-33496
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ src/gui/kernel/qplatformtheme.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qt5base-5.1.1/src/gui/kernel/qplatformtheme.cpp
+===================================================================
+--- qt5base-5.1.1.orig/src/gui/kernel/qplatformtheme.cpp
++++ qt5base-5.1.1/src/gui/kernel/qplatformtheme.cpp
+@@ -48,7 +48,7 @@
+ #include <QtCore/qfileinfo.h>
+ #include <qpalette.h>
+ #include <qtextformat.h>
+-#include <qiconloader_p.h>
++#include <private/qiconloader_p.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 

From f8c56f5f6298a31a5440f9ad50d36e4d09b5e0c9 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:50 +0200
Subject: [PATCH 6540/6849] Config.in.legacy: update description for developers

The existing comments in Config.in.legacy are not entirely in-line with
current practice. The comments implies that BR2_LEGACY should not be set when
the conversion from old-to-new symbol can be done automatically using the
appropriate 'select' statements. However, none of the existing legacy options
does it this way. Moreover, I think it's intentional that the user is notified
of the change, so that the removal of the legacy options in later buildroot
versions no longer poses a problem.
Additionally, the comments now describe how to handle string options.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy | 50 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 4f30b2b1cb..18224a0abd 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -1,13 +1,9 @@
 #
 # Config.in.legacy - support for backward compatibility
 #
-# When an existing Config.in symbol is removed, it should be added again in this
-# file, and take appropriate action to approximate backward compatibility. If
-# there is an equivalent (set of) new symbols, these can just be select'ed by
-# the old symbol. This makes sure that running 'make oldconfig' will make things
-# "just work" when upgrading to a new buildroot version. If the change is too
-# fundamental and cannot be fixed by a simple select, then the old symbol should
-# select BR2_LEGACY.  If that symbol is set, the build will issue an error.
+# When an existing Config.in symbol is removed, it should be added again in
+# this file, and take appropriate action to approximate backward compatibility.
+# This will make the transition for the user more convenient.
 #
 # When adding legacy symbols to this file, add them to the front. The oldest
 # symbols will be removed again after about two years.
@@ -15,6 +11,46 @@
 # The symbol should be copied as-is from the place where it was previously
 # defined, but the help text should be removed or replaced with something that
 # explains how to fix it.
+#
+# For bool options, the old symbol should select BR2_LEGACY, so that the user
+# is informed at build-time about selected legacy options.
+# If there is an equivalent (set of) new symbols, these should be select'ed by
+# the old symbol for backwards compatibility.
+#
+# For string options, it is not possible to directly select another symbol. In
+# this case, a hidden wrap bool option has to be added, that defaults to y if
+# the old string is not set at its default value. The wrap symbol should select
+# BR2_LEGACY.
+# If the original symbol has been renamed, the new symbol should use the value
+# of the old symbol as default. This requires a change outside of
+# Config.in.legacy, and this should be clearly marked as such below, so that
+# removal of legacy options also include the removal of these external
+# references.
+#
+# [Example: renaming a string option from FOO to BAR]
+# original symbol:
+#     config BR2_FOO_STRING
+#             string "Some foo string"
+#
+# becomes:
+#     config BR2_BAR_STRING
+#             string "Some bar string"
+#             default BR2_FOO_STRING if BR2_FOO_STRING != ""  # legacy
+#
+# and in Config.in.legacy:
+#     config BR2_FOO_STRING
+#             string "The foo string has been renamed"
+#             help
+#               <suitable help text>
+#
+#     config BR2_FOO_STRING_WRAP
+#             bool
+#             default y if BR2_FOO_STRING != ""
+#             select BR2_LEGACY
+#
+#     # Note: BR2_FOO_STRING is still referenced from package/foo/Config.in
+#
+# [End of example]
 
 config BR2_LEGACY
 	bool

From cce5baa8ee8eb9bbe27448aa75b67719431bf9e9 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:51 +0200
Subject: [PATCH 6541/6849] Config.in.legacy: update description for users

This patch clarifies the message shown to users in the legacy menu.
It explicitly mentions the need to save the configuration before disabling the
legacy options.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 18224a0abd..237b8d0edc 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -69,11 +69,27 @@ menu "Legacy config options"
 
 if BR2_LEGACY
 comment "Your old configuration uses legacy options that no  "
-comment "longer exist in buildroot.                          "
-comment "Please look at the options which have been selected "
-comment "and read their help text.                           "
-comment "As long as these options stay selected, the build   "
+comment "longer exist in buildroot, as indicated in the menu "
+comment "below. As long as these options stay selected, or in"
+comment "case of string options are non-empty, the build     "
 comment "will fail.                                          "
+comment "*                                                   "
+comment "Where possible, an automatic conversion from old to "
+comment "new symbols has been performed. Before making any   "
+comment "change in this legacy menu, make sure to exit the   "
+comment "configuration editor a first time and save the      "
+comment "configuration. Otherwise, the automatic conversion  "
+comment "of symbols will be lost.                            "
+comment "*                                                   "
+comment "After this initial save, reopen the configuration   "
+comment "editor, inspect the options selected below, read    "
+comment "their help texts, and verify/update the new         "
+comment "configuration in the corresponding configuration    "
+comment "menus. When everything is ok, you can disable the   "
+comment "legacy options in the menu below. Once you have     "
+comment "disabled all legacy options, this text will         "
+comment "disappear and you will be able to start the build.  "
+comment "*                                                   "
 comment "Note: at some point in the future, the oldest legacy"
 comment "options will be removed, and configuration files    "
 comment "that still have those options set, will fail to     "

From a25e4a4c4c01bf55177d2716b6adeb4ce4ac376e Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:52 +0200
Subject: [PATCH 6542/6849] Config.in.legacy: add separator to description for
 users

When legacy symbols are selected, the menuconfig shows the explanation for
users, immediately followed by the line "Legacy options removed in 2013.08".
In order to visually keep these apart, we introduce a separator.

Note that a line with all spaces is not correctly shown by menuconfig (the
width will not be kept at 80 characters, so the output is '***   ***').
A dashed line seemed a logical alternative, and with another dashed line on
top, the description becomes a block.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index 237b8d0edc..6cdd4e37af 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -68,6 +68,7 @@ comment "Legacy detected: check the content of the menu below"
 menu "Legacy config options"
 
 if BR2_LEGACY
+comment "----------------------------------------------------"
 comment "Your old configuration uses legacy options that no  "
 comment "longer exist in buildroot, as indicated in the menu "
 comment "below. As long as these options stay selected, or in"
@@ -94,6 +95,7 @@ comment "Note: at some point in the future, the oldest legacy"
 comment "options will be removed, and configuration files    "
 comment "that still have those options set, will fail to     "
 comment "build, or run, in unpredictable ways.               "
+comment "----------------------------------------------------"
 endif
 
 ###############################################################################

From fbc2494a41bbdcc12b7242d06852892d2824db4d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:53 +0200
Subject: [PATCH 6543/6849] Remove redundant dollar signs in Config.in files

Some Config.in(.host) files have constructs like:

config FOO_VERSION
	string
	default "1.0" if FOO_1_0
	default "2.0" if FOO_2_0
	default $FOO_CUSTOM_VERSION if FOO_CUSTOM

The dollar sign here is not needed and confusing, so can be removed.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/barebox/Config.in                 | 4 ++--
 boot/uboot/Config.in                   | 4 ++--
 fs/jffs2/Config.in                     | 4 ++--
 linux/Config.in                        | 2 +-
 package/gcc/Config.in.host             | 2 +-
 package/linux-headers/Config.in.host   | 2 +-
 package/uclibc/Config.in               | 2 +-
 toolchain/toolchain-external/Config.in | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index eb2b0b22d9..a409acaca4 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -41,9 +41,9 @@ endif
 config BR2_TARGET_BAREBOX_VERSION
 	string
 	default "2013.10.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
-	default $BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
+	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
-	default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
+	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
 
 config BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR
 	string "custom patch dir"
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 7a20d06d0a..88c076dd70 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -47,9 +47,9 @@ endif
 config BR2_TARGET_UBOOT_VERSION
 	string
 	default "2013.10"	if BR2_TARGET_UBOOT_LATEST_VERSION
-	default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
+	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
-	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
+	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	string "custom patch dir"
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index f15e73033d..e2a3ee9021 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -58,7 +58,7 @@ config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
 	default 0x800 if BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K
 	default 0x1000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_128
 	default 0x1000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_64
-	default $(BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE) if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
+	default BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 
 config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
 	hex
@@ -68,7 +68,7 @@ config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
 	default 0x20000 if BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K
 	default 0x20000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_128
 	default 0x10000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_64
-	default $(BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE) if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
+	default BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 
 config BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
 	bool "Do not use Cleanmarker"
diff --git a/linux/Config.in b/linux/Config.in
index f7c5330841..52291d8d71 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -79,7 +79,7 @@ config BR2_LINUX_KERNEL_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
-	default $BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
+	default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
 
 #
 # Patch selection
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index bd2ad8c8f6..41c1213680 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -91,7 +91,7 @@ config BR2_GCC_VERSION
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
 	default "4.8.2"     if BR2_GCC_VERSION_4_8_X
 	default "4.8-arc"   if BR2_GCC_VERSION_4_8_ARC
-	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
+	default BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "Additional gcc options"
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index a32f6659b7..88aa7e5737 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -89,4 +89,4 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.10.17"	if BR2_KERNEL_HEADERS_3_10
 	default "3.11.6"	if BR2_KERNEL_HEADERS_3_11
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
-	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
+	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 2de0270a52..0e7ae545cd 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
 	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
 	default 0.9.33-arc	if BR2_UCLIBC_VERSION_0_9_33_ARC
-	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
+	default BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 0d42041e1b..48b5865103 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -849,7 +849,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FDPIC
-	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
+	default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX \
 					 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 config BR2_TOOLCHAIN_EXTERNAL_GLIBC

From 63ecded2e383b2bb7569e70f311580095b166e29 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:54 +0200
Subject: [PATCH 6544/6849] linux: add support for custom Mercurial repository

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy | 30 ++++++++++++++++++++++++++++++
 linux/Config.in  | 32 +++++++++++++++++++++++---------
 linux/linux.mk   |  5 ++++-
 3 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 6cdd4e37af..82b9579fd9 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -109,6 +109,36 @@ config BR2_PACKAGE_MODULE_INIT_TOOLS
 	  The 'module-init-tools' package has been removed, since it
 	  has been depracated upstream and replaced by 'kmod'.
 
+config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
+	string "linux: the git repository URL option has been renamed"
+	help
+	  The option BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL has
+	  been renamed to
+	  BR2_LINUX_KERNEL_CUSTOM_REPO_URL.
+
+config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL_WRAP
+	bool
+	default y if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != ""
+	select BR2_LEGACY
+
+# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL is still referenced from
+# linux/Config.in
+
+config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
+	string "linux: the git repository version option has been renamed"
+	help
+	  The option BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION has
+	  been renamed to
+	  BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION.
+
+config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION_WRAP
+	bool
+	default y if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != ""
+	select BR2_LEGACY
+
+# Note: BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION is still referenced from
+# linux/Config.in
+
 ###############################################################################
 comment "Legacy options removed in 2013.08"
 
diff --git a/linux/Config.in b/linux/Config.in
index 52291d8d71..a12102adf0 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -52,6 +52,12 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT
 	  This option allows Buildroot to get the Linux kernel source
 	  code from a Git repository.
 
+config BR2_LINUX_KERNEL_CUSTOM_HG
+	bool "Custom Mercurial repository"
+	help
+	  This option allows Buildroot to get the Linux kernel source
+	  code from a Mercurial repository.
+
 endchoice
 
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
@@ -62,24 +68,32 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
 	depends on BR2_LINUX_KERNEL_CUSTOM_TARBALL
 
-config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
-	string "URL of custom Git repository"
-	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG
 
-config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
-	string "Custom Git version"
-	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+config BR2_LINUX_KERNEL_CUSTOM_REPO_URL
+	string "URL of custom repository"
+	default BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL \
+		if BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL != ""  # legacy
+
+config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
+	string "Custom repository version"
+	default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION \
+		if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != ""  # legacy
 	help
-	  Git revision to use in the format used by git rev-parse,
+	  Revision to use in the typical format used by Git/Mercurial
 	  E.G. a sha id, a tag, branch, ..
 
+endif
+
 config BR2_LINUX_KERNEL_VERSION
 	string
 	default "3.11.6" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
-	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
+	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
+		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
-	default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
+	default BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION \
+		if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG
 
 #
 # Patch selection
diff --git a/linux/linux.mk b/linux/linux.mk
index 901ce25c7c..29a3fd3ac0 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -14,8 +14,11 @@ LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
 LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL)))
 LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
-LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
+LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_SITE_METHOD = git
+else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y)
+LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
+LINUX_SITE_METHOD = hg
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order

From f2c2193b0571c2f15a430edf5c179b20914d0a95 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:55 +0200
Subject: [PATCH 6545/6849] u-boot: add support for custom Mercurial repository

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy     | 28 ++++++++++++++++++++++++++++
 boot/uboot/Config.in | 23 ++++++++++++++++-------
 boot/uboot/uboot.mk  |  5 ++++-
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 82b9579fd9..588cd8bf72 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -109,6 +109,34 @@ config BR2_PACKAGE_MODULE_INIT_TOOLS
 	  The 'module-init-tools' package has been removed, since it
 	  has been depracated upstream and replaced by 'kmod'.
 
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
+	string "u-boot: the git repository URL option has been renamed"
+	help
+	  The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has
+	  been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_URL.
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP
+	bool
+	default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""
+	select BR2_LEGACY
+
+# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL is still referenced from
+# boot/uboot/Config.in
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
+	string "u-boot: the git repository version option has been renamed"
+	help
+	  The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has
+	  been renamed to BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION.
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP
+	bool
+	default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""
+	select BR2_LEGACY
+
+# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION is still referenced from
+# boot/uboot/Config.in
+
 config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
 	string "linux: the git repository URL option has been renamed"
 	help
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 88c076dd70..8e71886e22 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -31,6 +31,9 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 config BR2_TARGET_UBOOT_CUSTOM_GIT
 	bool "Custom Git repository"
 
+config BR2_TARGET_UBOOT_CUSTOM_HG
+	bool "Custom Mercurial repository"
+
 endchoice
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
@@ -47,9 +50,11 @@ endif
 config BR2_TARGET_UBOOT_VERSION
 	string
 	default "2013.10"	if BR2_TARGET_UBOOT_LATEST_VERSION
-	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
+	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
+		if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
-	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
+	default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \
+		if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	string "custom patch dir"
@@ -60,13 +65,17 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 
 	  Most users may leave this empty
 
-if BR2_TARGET_UBOOT_CUSTOM_GIT
+if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
 
-config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
-	string "URL of custom Git repository"
+config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
+	string "URL of custom repository"
+	default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
+		if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""  # legacy
 
-config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
-	string "Custom Git version"
+config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
+	string "Custom repository version"
+	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
+		if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""  # legacy
 
 endif
 
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index dc8e26f399..06b75eddeb 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -18,8 +18,11 @@ UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
 UBOOT_SITE    = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
 UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
-UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL))
+UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
 UBOOT_SITE_METHOD = git
+else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
+UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE_METHOD = hg
 else
 # Handle stable official U-Boot versions
 UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot

From 4bff614528a189db82e6388604328c3dfdf4a62c Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:56 +0200
Subject: [PATCH 6546/6849] linux/uboot: line-up repository-related
 configuration options

Although the configuration options for custom repository locations and
versions are very similar between the linux and uboot packages, there are
some minor differences. This patch lines up both packages.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/uboot/Config.in | 32 ++++++++++++++++----------------
 linux/Config.in      |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8e71886e22..af9ccab9ab 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -40,10 +40,24 @@ config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
 	string "U-Boot version"
 	depends on BR2_TARGET_UBOOT_CUSTOM_VERSION
 
-if BR2_TARGET_UBOOT_CUSTOM_TARBALL
-
 config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
 	string "URL of custom U-Boot tarball"
+	depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL
+
+if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
+
+config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
+	string "URL of custom repository"
+	default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
+		if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""  # legacy
+
+config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
+	string "Custom repository version"
+	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
+		if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""  # legacy
+	help
+	  Revision to use in the typical format used by Git/Mercurial
+	  E.G. a sha id, a tag, branch, ..
 
 endif
 
@@ -65,20 +79,6 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 
 	  Most users may leave this empty
 
-if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
-
-config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
-	string "URL of custom repository"
-	default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
-		if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""  # legacy
-
-config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
-	string "Custom repository version"
-	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
-		if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""  # legacy
-
-endif
-
 choice
 	prompt "U-Boot binary format"
 	default BR2_TARGET_UBOOT_FORMAT_BIN
diff --git a/linux/Config.in b/linux/Config.in
index a12102adf0..32426a328c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -47,7 +47,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL
 	  specific kernel source tarball
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT
-	bool "Custom Git tree"
+	bool "Custom Git repository"
 	help
 	  This option allows Buildroot to get the Linux kernel source
 	  code from a Git repository.

From d0a4de053eae448757a00398d853377562228850 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:57 +0200
Subject: [PATCH 6547/6849] defconfigs: update after rename of custom git
 repo/version options

[Peter: also update cubieboard2, freescale_imx6* and wandboard]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/arm_foundationv8_defconfig          | 4 ++--
 configs/beaglebone_defconfig                | 4 ++--
 configs/calao_snowball_defconfig            | 4 ++--
 configs/cubieboard2_defconfig               | 8 ++++----
 configs/cubieboard_defconfig                | 8 ++++----
 configs/ea3250_defconfig                    | 8 ++++----
 configs/fdi3250_defconfig                   | 8 ++++----
 configs/freescale_imx6sabresd_defconfig     | 8 ++++----
 configs/freescale_imx6sololiteevk_defconfig | 8 ++++----
 configs/gnublin_defconfig                   | 8 ++++----
 configs/mx53loco_defconfig                  | 8 ++++----
 configs/phy3250_defconfig                   | 8 ++++----
 configs/rpi_defconfig                       | 4 ++--
 configs/wandboard_defconfig                 | 8 ++++----
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig
index 7a50b1ad5f..c8de16da86 100644
--- a/configs/arm_foundationv8_defconfig
+++ b/configs/arm_foundationv8_defconfig
@@ -8,8 +8,8 @@ BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="vexpress-foundation-v8"
 BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.linaro.org/kernel/linaro-aarch64.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="7181edd0539e195f78adedbb6c3878f9f1e0c4bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.linaro.org/kernel/linaro-aarch64.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7181edd0539e195f78adedbb6c3878f9f1e0c4bb"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index d6b5c31802..97b4b0bf18 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -30,8 +30,8 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="935f6c2f82056d538b528272e2bdbb5c08d69a58"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="935f6c2f82056d538b528272e2bdbb5c08d69a58"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.8.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/calao_snowball_defconfig b/configs/calao_snowball_defconfig
index 90421a4b67..4c30a6b98a 100644
--- a/configs/calao_snowball_defconfig
+++ b/configs/calao_snowball_defconfig
@@ -16,8 +16,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="snowball"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/igloocommunity/igloo-kernel"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/igloocommunity/igloo-kernel"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="stable-linux-ux500-3.4"
 BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"
 BR2_LINUX_KERNEL_DEFCONFIG="u8500"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig
index 9f60b9fba0..f85760d511 100644
--- a/configs/cubieboard2_defconfig
+++ b/configs/cubieboard2_defconfig
@@ -22,8 +22,8 @@ BR2_KERNEL_HEADERS_3_4=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="5dda5145c877335e17bd9ca48954841acc0f785a"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5dda5145c877335e17bd9ca48954841acc0f785a"
 BR2_LINUX_KERNEL_VERSION="sunxi-3.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/cubietech/cubieboard/linux-cubieboard2.config"
@@ -33,8 +33,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cubieboard2"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="sunxi"
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="b4bca5e0651b460a4511582f07a935cb48f74948"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b4bca5e0651b460a4511582f07a935cb48f74948"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
diff --git a/configs/cubieboard_defconfig b/configs/cubieboard_defconfig
index 933c1a2eb9..1da019f218 100644
--- a/configs/cubieboard_defconfig
+++ b/configs/cubieboard_defconfig
@@ -22,8 +22,8 @@ BR2_KERNEL_HEADERS_3_4=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="274a66a7bfcbaabb88d63e4eba161965383cc416"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="274a66a7bfcbaabb88d63e4eba161965383cc416"
 BR2_LINUX_KERNEL_VERSION="sunxi-3.4"
 BR2_LINUX_KERNEL_DEFCONFIG="sun4i"
 
@@ -32,8 +32,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cubieboard"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="sunxi"
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
diff --git a/configs/ea3250_defconfig b/configs/ea3250_defconfig
index 2574dde7f8..b7ce18ba7c 100644
--- a/configs/ea3250_defconfig
+++ b/configs/ea3250_defconfig
@@ -27,8 +27,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="ea3250"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="master"
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="master"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_LPC32XXCDL=y
 BR2_TARGET_LPC32XXCDL_BOARDNAME="ea3250"
@@ -39,8 +39,8 @@ BR2_TARGET_LPC32XXCDL_BOARDNAME="ea3250"
 #
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="master"
 BR2_LINUX_KERNEL_VERSION="master"
 BR2_LINUX_KERNEL_PATCH=""
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
diff --git a/configs/fdi3250_defconfig b/configs/fdi3250_defconfig
index b1c6684694..b7f6ad7c1c 100644
--- a/configs/fdi3250_defconfig
+++ b/configs/fdi3250_defconfig
@@ -27,8 +27,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="fdi3250"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="master"
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="master"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_LPC32XXCDL=y
 BR2_TARGET_LPC32XXCDL_BOARDNAME="fdi3250"
@@ -39,8 +39,8 @@ BR2_TARGET_LPC32XXCDL_BOARDNAME="fdi3250"
 #
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="master"
 BR2_LINUX_KERNEL_VERSION="master"
 BR2_LINUX_KERNEL_PATCH=""
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
diff --git a/configs/freescale_imx6sabresd_defconfig b/configs/freescale_imx6sabresd_defconfig
index b030eeeac0..368e00b3ae 100644
--- a/configs/freescale_imx6sabresd_defconfig
+++ b/configs/freescale_imx6sabresd_defconfig
@@ -8,8 +8,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.0.35_4.1.0"
 BR2_LINUX_KERNEL_DEFCONFIG="imx6"
 
 # filesystem
@@ -19,5 +19,5 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6q_sabresd"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.0.35_4.1.0"
diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig
index 997ecbea5a..997d44fece 100644
--- a/configs/freescale_imx6sololiteevk_defconfig
+++ b/configs/freescale_imx6sololiteevk_defconfig
@@ -8,8 +8,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.0.35_4.1.0"
 BR2_LINUX_KERNEL_DEFCONFIG="imx6s"
 
 # filesystem
@@ -19,5 +19,5 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6sl_evk"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_3.0.35_4.1.0"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.0.35_4.1.0"
diff --git a/configs/gnublin_defconfig b/configs/gnublin_defconfig
index efafe06edb..acb455130b 100644
--- a/configs/gnublin_defconfig
+++ b/configs/gnublin_defconfig
@@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=475000
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="GNUBLIN"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://gitorious.org/u-boot-gnublin-support/u-boot-gnublin-support.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="2009.11_gnublin_support_v2"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://gitorious.org/u-boot-gnublin-support/u-boot-gnublin-support.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2009.11_gnublin_support_v2"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://gitorious.org/linux-3-7-gnublin/linux-3-7-gnublin.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="v3.7-gnublin-2"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://gitorious.org/linux-3-7-gnublin/linux-3-7-gnublin.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v3.7-gnublin-2"
 BR2_LINUX_KERNEL_DEFCONFIG="gnublin"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 08de3daa6c..8b12238cd5 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -8,8 +8,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx53_loco"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_2.6.35_11.09.01"
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
@@ -17,6 +17,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_2.6.35_11.09.01"
 BR2_LINUX_KERNEL_DEFCONFIG="imx5"
diff --git a/configs/phy3250_defconfig b/configs/phy3250_defconfig
index e95546fea3..fe49653c56 100644
--- a/configs/phy3250_defconfig
+++ b/configs/phy3250_defconfig
@@ -27,8 +27,8 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="phy3250"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_VERSION="master"
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="master"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.lpclinux.com/uboot-2009.03-lpc32xx"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="master"
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_LPC32XXCDL=y
 BR2_TARGET_LPC32XXCDL_BOARDNAME="phy3250"
@@ -39,8 +39,8 @@ BR2_TARGET_LPC32XXCDL_BOARDNAME="phy3250"
 #
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.lpclinux.com/linux-2.6.34-lpc32xx"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="master"
 BR2_LINUX_KERNEL_VERSION="master"
 BR2_LINUX_KERNEL_PATCH=""
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 2b196736ef..da877fbe1f 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -16,8 +16,8 @@ BR2_DEFAULT_KERNEL_VERSION="3.6.11"
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="1587f77"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1587f77"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi_quick"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index ca4ce8711a..996a70a664 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -7,8 +7,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="wandboard_dl"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.denx.de/u-boot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="326ea986ac150acdc7656d57fca647db80b50158"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.denx.de/u-boot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="326ea986ac150acdc7656d57fca647db80b50158"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.imx"
 BR2_TARGET_UBOOT_ENVIMAGE=y
@@ -16,7 +16,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/wandboard/uboot-env.txt"
 BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://repo.or.cz/wandboard.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="86429847b5152f040f190015faedcac49b243328"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://repo.or.cz/wandboard.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="86429847b5152f040f190015faedcac49b243328"
 BR2_LINUX_KERNEL_DEFCONFIG="wandboard"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y

From d6bb2b50f9cd458c9baa3ef5bd439d5dbc16363d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Date: Mon, 2 Sep 2013 22:07:58 +0200
Subject: [PATCH 6548/6849] linux: mention 3.x.y kernels in 'custom version'
 help

(also fix grammatical error versions -> version)

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 32426a328c..e44d78827d 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -37,8 +37,8 @@ config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 config BR2_LINUX_KERNEL_CUSTOM_VERSION
 	bool "Custom version"
 	help
-	  This option allows to use a specific 2.6.x or 2.6.x.y
-	  official versions, as available on kernel.org
+	  This option allows to use a specific official version from
+	  kernel.org, like 2.6.x, 2.6.x.y, 3.x.y, ...
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL
 	bool "Custom tarball"

From 33be28d1700a5301e49d916fa1ec7143a1f49df3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 26 Oct 2013 12:00:03 -0300
Subject: [PATCH 6549/6849] bind: bump to version 9.6-ESV-R10

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/bind/bind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 306284b0ad..2e01e8ba49 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BIND_VERSION = 9.6-ESV-R9-P1
+BIND_VERSION = 9.6-ESV-R10
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
 BIND_INSTALL_STAGING = YES

From 9332e26125685c8ba3682516727af96e43e33617 Mon Sep 17 00:00:00 2001
From: Peter Sanford <psanford@nearbuysystems.com>
Date: Sat, 26 Oct 2013 09:42:18 -0700
Subject: [PATCH 6550/6849] skeleton: Update /etc/protocols from Debian Jessie

This update adds IP protocols created in the last 20 years.

Signed-off-by: Peter Sanford <psanford@nearbuysystems.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 system/skeleton/etc/protocols | 54 +++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/system/skeleton/etc/protocols b/system/skeleton/etc/protocols
index 1ac8a40967..cfdd5adb65 100644
--- a/system/skeleton/etc/protocols
+++ b/system/skeleton/etc/protocols
@@ -1,13 +1,10 @@
-# /etc/protocols:
-# $Id: protocols,v 1.1 2004/10/09 02:49:18 andersen Exp $
-#
 # Internet (IP) protocols
 #
-#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
-#
-# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
+# Updated from http://www.iana.org/assignments/protocol-numbers and other
+# sources.
 
 ip	0	IP		# internet protocol, pseudo protocol number
+hopopt	0	HOPOPT		# IPv6 Hop-by-Hop Option [RFC1883]
 icmp	1	ICMP		# internet control message protocol
 igmp	2	IGMP		# Internet Group Management
 ggp	3	GGP		# gateway-gateway protocol
@@ -15,17 +12,50 @@ ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
 st	5	ST		# ST datagram mode
 tcp	6	TCP		# transmission control protocol
 egp	8	EGP		# exterior gateway protocol
+igp	9	IGP		# any private interior gateway (Cisco)
 pup	12	PUP		# PARC universal packet protocol
 udp	17	UDP		# user datagram protocol
 hmp	20	HMP		# host monitoring protocol
 xns-idp	22	XNS-IDP		# Xerox NS IDP
 rdp	27	RDP		# "reliable datagram" protocol
-iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4
-xtp	36	XTP		# Xpress Tranfer Protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4 [RFC905]
+dccp	33	DCCP		# Datagram Congestion Control Prot. [RFC4340]
+xtp	36	XTP		# Xpress Transfer Protocol
 ddp	37	DDP		# Datagram Delivery Protocol
-idpr-cmtp	39	IDPR-CMTP	# IDPR Control Message Transport
-rspf	73	RSPF		#Radio Shortest Path First.
+idpr-cmtp 38	IDPR-CMTP	# IDPR Control Message Transport
+ipv6	41	IPv6		# Internet Protocol, version 6
+ipv6-route 43	IPv6-Route	# Routing Header for IPv6
+ipv6-frag 44	IPv6-Frag	# Fragment Header for IPv6
+idrp	45	IDRP		# Inter-Domain Routing Protocol
+rsvp	46	RSVP		# Reservation Protocol
+gre	47	GRE		# General Routing Encapsulation
+esp	50	IPSEC-ESP	# Encap Security Payload [RFC2406]
+ah	51	IPSEC-AH	# Authentication Header [RFC2402]
+skip	57	SKIP		# SKIP
+ipv6-icmp 58	IPv6-ICMP	# ICMP for IPv6
+ipv6-nonxt 59	IPv6-NoNxt	# No Next Header for IPv6
+ipv6-opts 60	IPv6-Opts	# Destination Options for IPv6
+rspf	73	RSPF CPHB	# Radio Shortest Path First (officially CPHB)
 vmtp	81	VMTP		# Versatile Message Transport
+eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
 ospf	89	OSPFIGP		# Open Shortest Path First IGP
-ipip	94	IPIP		# Yet Another IP encapsulation
-encap	98	ENCAP		# Yet Another IP encapsulation
+ax.25	93	AX.25		# AX.25 frames
+ipip	94	IPIP		# IP-within-IP Encapsulation Protocol
+etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation [RFC3378]
+encap	98	ENCAP		# Yet Another IP encapsulation [RFC1241]
+#	99			# any private encryption scheme
+pim	103	PIM		# Protocol Independent Multicast
+ipcomp	108	IPCOMP		# IP Payload Compression Protocol
+vrrp	112	VRRP		# Virtual Router Redundancy Protocol [RFC5798]
+l2tp	115	L2TP		# Layer Two Tunneling Protocol [RFC2661]
+isis	124	ISIS		# IS-IS over IPv4
+sctp	132	SCTP		# Stream Control Transmission Protocol
+fc	133	FC		# Fibre Channel
+mobility-header 135 Mobility-Header # Mobility Support for IPv6 [RFC3775]
+udplite	136	UDPLite		# UDP-Lite [RFC3828]
+mpls-in-ip 137	MPLS-in-IP	# MPLS-in-IP [RFC4023]
+manet	138			# MANET Protocols [RFC5498]
+hip	139	HIP		# Host Identity Protocol
+shim6	140	Shim6		# Shim6 Protocol [RFC5533]
+wesp	141	WESP		# Wrapped Encapsulating Security Payload
+rohc	142	ROHC		# Robust Header Compression

From 96f702993cfa4b7e15549faddbc41917663dbe37 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sun, 27 Oct 2013 00:44:54 +0200
Subject: [PATCH 6551/6849] freetype: explicitly en/disable dependencies

For the target, add --with/out to configure options as needed.

For the host, disable everything.

This was triggered by a failing build of the host package because it tried to
link the shared library with libbz.a, which isn't compiled with -fPIC.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/freetype/freetype.mk | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 93fb3db824..cc5fbf858c 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -13,13 +13,25 @@ FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
 FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
-FREETYPE_DEPENDENCIES = host-pkgconf \
-	$(if $(BR2_PACKAGE_ZLIB),zlib) \
-	$(if $(BR2_PACKAGE_BZIP2),bzip2)
+FREETYPE_DEPENDENCIES = host-pkgconf
 FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
-HOST_FREETYPE_CONF_OPT = --without-png
+HOST_FREETYPE_CONF_OPT = --without-zlib --without-bzip2 --without-png
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+FREETYPE_DEPENDENCIES += zlib
+FREETYPE_CONF_OPT += --with-zlib
+else
+FREETYPE_CONF_OPT += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+FREETYPE_DEPENDENCIES += bzip2
+FREETYPE_CONF_OPT += --with-bzip2
+else
+FREETYPE_CONF_OPT += --without-bzip2
+endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 FREETYPE_DEPENDENCIES += libpng

From d1bca7c49c5f80673a2ff88bdad798812b09e9f2 Mon Sep 17 00:00:00 2001
From: Tzu-Jung Lee <roylee17@gmail.com>
Date: Thu, 10 Oct 2013 10:50:57 -0700
Subject: [PATCH 6552/6849] ccache: expose control interface via 'make
 ccache-options'

usage:
	# set cache limit size
	make CCACHE_OPTIONS="--max-size=5G" ccache-options

	# zero statistics counters
	make CCACHE_OPTIONS="--zero-stats" ccache-options

[Peter: drop the redundant ifeq]
Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/ccache-support.txt | 11 +++++++++++
 package/ccache/ccache.mk       |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/docs/manual/ccache-support.txt b/docs/manual/ccache-support.txt
index 4969180a29..fe06a01faf 100644
--- a/docs/manual/ccache-support.txt
+++ b/docs/manual/ccache-support.txt
@@ -23,3 +23,14 @@ remove this directory.
 
 You can get statistics on the cache (its size, number of hits,
 misses, etc.) by running +make ccache-stats+.
+
+The make target +ccache-options+ and the +CCACHE_OPTIONS+ variable
+provide more generic access to the ccache. For example
+
+-----------------
+# set cache limit size
+make CCACHE_OPTIONS="--max-size=5G" ccache-options
+
+# zero statistics counters
+make CCACHE_OPTIONS="--zero-stats" ccache-options
+-----------------
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index c5e93857c5..82a53f34c9 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -44,4 +44,13 @@ $(eval $(host-autotools-package))
 ifeq ($(BR2_CCACHE),y)
 ccache-stats: host-ccache
 	$(Q)$(CCACHE) -s
+
+ccache-options: host-ccache
+ifeq ($(CCACHE_OPTIONS),)
+	$(Q)echo "Usage: make ccache-options CCACHE_OPTIONS=\"opts\""
+	$(Q)echo "where 'opts' corresponds to one or more valid ccache options" \
+	"(see ccache help text below)"
+	$(Q)echo
+endif
+	$(Q)$(CCACHE) $(CCACHE_OPTIONS)
 endif

From e12fab456540b5f378bd4a7ecbf0825df147c43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz@sysmic.org>
Date: Mon, 7 Oct 2013 21:36:01 +0200
Subject: [PATCH 6553/6849] Revert "berkeleydb: bump to version 6.0.20"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BerkeleyDB has changed its license since version 6. New license (AGPL) may
be incompatible with some packages. So we prefer to stick to version 5

This reverts commit 4c478de2e76ffc1d0a6dc413475307fd44a0a595.

[Peter: adjust comment as suggested by Yann]
Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/berkeleydb/berkeleydb.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 9b236230f2..0e3e830685 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -4,7 +4,12 @@
 #
 ################################################################################
 
-BERKELEYDB_VERSION = 6.0.20
+# Since BerkeleyDB version 6 and above are licensed under the Affero
+# GPL (AGPL), we want to keep this 'bdb' package at version 5.x to
+# avoid licensing issues.
+# BerkeleyDB version 6 or above should be provided by a dedicated
+# package instead.
+BERKELEYDB_VERSION = 5.3.21
 BERKELEYDB_SITE = http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR = build_unix

From 5bc39dcf41cca2faabba72f41540a653afc9c836 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 24 Oct 2013 11:46:11 +0200
Subject: [PATCH 6554/6849] webkit: number the patches

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ols.patch => webkit-0001-build-fix-for-32-bit-autotools.patch} | 0
 ...launcher.patch => webkit-0002-build-fix-for-gtklauncher.patch} | 0
 ...t-harfbuzz-icu.patch => webkit-0003-detect-harfbuzz-icu.patch} | 0
 ...isable-docrebase.patch => webkit-0004-disable-docrebase.patch} | 0
 ...webkit-disable-tests.patch => webkit-0005-disable-tests.patch} | 0
 .../{webkit-execinfo_h.patch => webkit-0006-execinfo_h.patch}     | 0
 .../webkit/{webkit-mips-dfg.patch => webkit-0007-mips-dfg.patch}  | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename package/webkit/{webkit-build-fix-for-32-bit-autotools.patch => webkit-0001-build-fix-for-32-bit-autotools.patch} (100%)
 rename package/webkit/{webkit-build-fix-for-gtklauncher.patch => webkit-0002-build-fix-for-gtklauncher.patch} (100%)
 rename package/webkit/{webkit-detect-harfbuzz-icu.patch => webkit-0003-detect-harfbuzz-icu.patch} (100%)
 rename package/webkit/{webkit-disable-docrebase.patch => webkit-0004-disable-docrebase.patch} (100%)
 rename package/webkit/{webkit-disable-tests.patch => webkit-0005-disable-tests.patch} (100%)
 rename package/webkit/{webkit-execinfo_h.patch => webkit-0006-execinfo_h.patch} (100%)
 rename package/webkit/{webkit-mips-dfg.patch => webkit-0007-mips-dfg.patch} (100%)

diff --git a/package/webkit/webkit-build-fix-for-32-bit-autotools.patch b/package/webkit/webkit-0001-build-fix-for-32-bit-autotools.patch
similarity index 100%
rename from package/webkit/webkit-build-fix-for-32-bit-autotools.patch
rename to package/webkit/webkit-0001-build-fix-for-32-bit-autotools.patch
diff --git a/package/webkit/webkit-build-fix-for-gtklauncher.patch b/package/webkit/webkit-0002-build-fix-for-gtklauncher.patch
similarity index 100%
rename from package/webkit/webkit-build-fix-for-gtklauncher.patch
rename to package/webkit/webkit-0002-build-fix-for-gtklauncher.patch
diff --git a/package/webkit/webkit-detect-harfbuzz-icu.patch b/package/webkit/webkit-0003-detect-harfbuzz-icu.patch
similarity index 100%
rename from package/webkit/webkit-detect-harfbuzz-icu.patch
rename to package/webkit/webkit-0003-detect-harfbuzz-icu.patch
diff --git a/package/webkit/webkit-disable-docrebase.patch b/package/webkit/webkit-0004-disable-docrebase.patch
similarity index 100%
rename from package/webkit/webkit-disable-docrebase.patch
rename to package/webkit/webkit-0004-disable-docrebase.patch
diff --git a/package/webkit/webkit-disable-tests.patch b/package/webkit/webkit-0005-disable-tests.patch
similarity index 100%
rename from package/webkit/webkit-disable-tests.patch
rename to package/webkit/webkit-0005-disable-tests.patch
diff --git a/package/webkit/webkit-execinfo_h.patch b/package/webkit/webkit-0006-execinfo_h.patch
similarity index 100%
rename from package/webkit/webkit-execinfo_h.patch
rename to package/webkit/webkit-0006-execinfo_h.patch
diff --git a/package/webkit/webkit-mips-dfg.patch b/package/webkit/webkit-0007-mips-dfg.patch
similarity index 100%
rename from package/webkit/webkit-mips-dfg.patch
rename to package/webkit/webkit-0007-mips-dfg.patch

From 73a6b6801afd2ec9c24126236a3001e86db67245 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 24 Oct 2013 11:46:12 +0200
Subject: [PATCH 6555/6849] webkit: fix build with bison 3.0

Apply a patch from upstream.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../webkit-0008-support-bison-3.0.patch       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/webkit/webkit-0008-support-bison-3.0.patch

diff --git a/package/webkit/webkit-0008-support-bison-3.0.patch b/package/webkit/webkit-0008-support-bison-3.0.patch
new file mode 100644
index 0000000000..c081b207ee
--- /dev/null
+++ b/package/webkit/webkit-0008-support-bison-3.0.patch
@@ -0,0 +1,22 @@
+ANGLE doesn't build with bison 3.0
+
+Author: allan.jensen@digia.com
+​https://bugs.webkit.org/show_bug.cgi?id=119798
+Reviewed by Antti Koivisto.
+Make glslang.y compatible with bison 3.0, by using %lex-param
+to set YYLEX_PARAM and getting rid of useless YYID macro.
+
+From upstream: http://trac.webkit.org/changeset/154109
+[Arnout: adapted to our older webkit version]
+Signed-off-by: Arnout Vandecaeppelle (Essensium/Mind) <arnout@mind.be>
+---
+Index: trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+===================================================================
+--- trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y	(revision 154108)
++++ trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y	(revision 154109)
+@@ -48,4 +48,5 @@
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {

From a06f31fb6488e8b02b409d25ee6550e39c42c487 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Mon, 21 Oct 2013 08:05:11 +0200
Subject: [PATCH 6556/6849] perl-cross: bump to version 0.8.3

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/perl/perl-fix-Module-Build.patch | 2 +-
 package/perl/perl.mk                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/perl/perl-fix-Module-Build.patch b/package/perl/perl-fix-Module-Build.patch
index 26b15e4011..9101c11495 100644
--- a/package/perl/perl-fix-Module-Build.patch
+++ b/package/perl/perl-fix-Module-Build.patch
@@ -5,7 +5,7 @@ Index: b/cpan/Module-Build/lib/Module/Build/Base.pm
 ===================================================================
 --- a/cpan/Module-Build/lib/Module/Build/Base.pm
 +++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -456,7 +456,7 @@
+@@ -460,7 +460,7 @@
    my $proto = shift;
    my $c     = ref($proto) ? $proto->{config} : 'Module::Build::Config';
  
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index ac85ed9734..8fb4fdcee9 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -12,8 +12,8 @@ PERL_LICENSE = Artistic or GPLv1+
 PERL_LICENSE_FILES = Artistic Copying README
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 0.8
-PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
+PERL_CROSS_VERSION = 0.8.3
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).1
 PERL_CROSS_SITE    = http://download.berlios.de/perlcross
 PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod

From 3c933c5e3095f8b33b16762a69d66e41e6913803 Mon Sep 17 00:00:00 2001
From: Sergey Alyoshin <alyoshin.s@gmail.com>
Date: Wed, 23 Oct 2013 12:56:59 +0400
Subject: [PATCH 6557/6849] kobs-ng: rename patch to comply to convention

Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...g-fix-mtd-defines.patch => kobs-ng-0001-fix-mtd-defines.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/kobs-ng/{kobs-ng-fix-mtd-defines.patch => kobs-ng-0001-fix-mtd-defines.patch} (100%)

diff --git a/package/kobs-ng/kobs-ng-fix-mtd-defines.patch b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch
similarity index 100%
rename from package/kobs-ng/kobs-ng-fix-mtd-defines.patch
rename to package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch

From fb995444b9b2ce3a38fbb1723151e9a923835da9 Mon Sep 17 00:00:00 2001
From: Sergey Alyoshin <alyoshin.s@gmail.com>
Date: Wed, 23 Oct 2013 16:55:00 +0400
Subject: [PATCH 6558/6849] kobs-ng: test kernel version for redefines

kobs-ng failed to build with 2.6.36, because enum tested with #ifndef

mtd.c: In function 'mtd_open':
mtd.c:696:42: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this
function)
mtd.c:696:42: note: each undeclared identifier is reported only once for each
function it appears in
mtd.c: In function 'mtd_set_ecc_mode':
mtd.c:896:43: error: 'MTD_FILE_MODE_NORMAL' undeclared (first use in this
function)
mtd.c:914:43: error: 'MTD_FILE_MODE_RAW' undeclared (first use in this
function)

Do kernel version test before enum redefines.

Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch
index 39d7474a1e..3ffba7166d 100644
--- a/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch
+++ b/package/kobs-ng/kobs-ng-0001-fix-mtd-defines.patch
@@ -3,6 +3,7 @@ MEMSETOOBSEL. Allow code to work with both older and newer kernel
 versions.
 
 Signed-off-by: Paul B. Henson <henson@acm.org>
+Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com>
 
 diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c
 --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c	2012-12-17 22:37:40.000000000 -0800
@@ -56,16 +57,15 @@ diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c
 diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h
 --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h	2012-12-17 22:37:40.000000000 -0800
 +++ kobs-ng-3.0.35-4.0.0/src/mtd.h	2013-07-28 19:33:57.000000000 -0700
-@@ -31,6 +31,14 @@
+@@ -31,6 +31,13 @@
  #include "BootControlBlocks.h"
  #include "rom_nand_hamming_code_ecc.h"
  
 +// Newer kernel headers renamed define
-+#ifndef MTD_MODE_NORMAL
-+#define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
-+#endif
-+#ifndef MTD_MODE_RAW
-+#define MTD_MODE_RAW MTD_FILE_MODE_RAW
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
++# define MTD_MODE_RAW MTD_FILE_MODE_RAW
 +#endif
 +
  //------------------------------------------------------------------------------

From f5f72988532373139bcd441a85ecd72a0a0cd904 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Fri, 25 Oct 2013 17:05:51 +0200
Subject: [PATCH 6559/6849] packages/Config.in: Alphabetical entries sorting

This patch moves :
  "Filesystem and flash utilities" menu
  "X applications" category
  "JSON/XML" menu
so they are in alphabetical order with the rest of the file.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in | 114 +++++++++++++++++++++++-----------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 0e6f86c0c3..e40fa31192 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -129,6 +129,32 @@ source "package/vala/Config.in"
 source "package/yasm/Config.in"
 endmenu
 
+menu "Filesystem and flash utilities"
+source "package/cifs-utils/Config.in"
+source "package/cramfs/Config.in"
+source "package/curlftpfs/Config.in"
+source "package/dosfstools/Config.in"
+source "package/e2fsprogs/Config.in"
+source "package/ecryptfs-utils/Config.in"
+source "package/exfat/Config.in"
+source "package/exfat-utils/Config.in"
+source "package/f2fs-tools/Config.in"
+source "package/flashbench/Config.in"
+source "package/genext2fs/Config.in"
+source "package/genromfs/Config.in"
+source "package/kobs-ng/Config.in"
+source "package/makedevs/Config.in"
+source "package/mtd/Config.in"
+source "package/nfs-utils/Config.in"
+source "package/ntfs-3g/Config.in"
+source "package/squashfs/Config.in"
+source "package/squashfs3/Config.in"
+source "package/sshfs/Config.in"
+source "package/sunxi-tools/Config.in"
+source "package/unionfs/Config.in"
+source "package/xfsprogs/Config.in"
+endmenu
+
 menu "Games"
 source "package/doom-wad/Config.in"
 source "package/gnuchess/Config.in"
@@ -187,18 +213,6 @@ source "package/qt5/Config.in"
 source "package/x11r7/Config.in"
 source "package/weston/Config.in"
 
-comment "X libraries and helper libraries"
-source "package/liberation/Config.in"
-source "package/libsexy/Config.in"
-source "package/x11r7/xkeyboard-config/Config.in"
-
-comment "X Window managers"
-source "package/blackbox/Config.in"
-source "package/enlightenment/Config.in"
-source "package/fluxbox/Config.in"
-source "package/matchbox/Config.in"
-source "package/metacity/Config.in"
-
 comment "X applications"
 source "package/alsamixergui/Config.in"
 source "package/docker/Config.in"
@@ -220,32 +234,18 @@ source "package/xscreensaver/Config.in"
 source "package/xstroke/Config.in"
 source "package/xterm/Config.in"
 source "package/xvkbd/Config.in"
-endmenu
 
-menu "Filesystem and flash utilities"
-source "package/cifs-utils/Config.in"
-source "package/cramfs/Config.in"
-source "package/curlftpfs/Config.in"
-source "package/dosfstools/Config.in"
-source "package/e2fsprogs/Config.in"
-source "package/ecryptfs-utils/Config.in"
-source "package/exfat/Config.in"
-source "package/exfat-utils/Config.in"
-source "package/f2fs-tools/Config.in"
-source "package/flashbench/Config.in"
-source "package/genext2fs/Config.in"
-source "package/genromfs/Config.in"
-source "package/kobs-ng/Config.in"
-source "package/makedevs/Config.in"
-source "package/mtd/Config.in"
-source "package/nfs-utils/Config.in"
-source "package/ntfs-3g/Config.in"
-source "package/squashfs/Config.in"
-source "package/squashfs3/Config.in"
-source "package/sshfs/Config.in"
-source "package/sunxi-tools/Config.in"
-source "package/unionfs/Config.in"
-source "package/xfsprogs/Config.in"
+comment "X libraries and helper libraries"
+source "package/liberation/Config.in"
+source "package/libsexy/Config.in"
+source "package/x11r7/xkeyboard-config/Config.in"
+
+comment "X Window managers"
+source "package/blackbox/Config.in"
+source "package/enlightenment/Config.in"
+source "package/fluxbox/Config.in"
+source "package/matchbox/Config.in"
+source "package/metacity/Config.in"
 endmenu
 
 menu "Hardware handling"
@@ -575,6 +575,26 @@ source "package/jsmin/Config.in"
 source "package/json-javascript/Config.in"
 endmenu
 
+menu "JSON/XML"
+source "package/cjson/Config.in"
+source "package/expat/Config.in"
+source "package/ezxml/Config.in"
+source "package/jansson/Config.in"
+source "package/json-c/Config.in"
+source "package/json-glib/Config.in"
+source "package/libjson/Config.in"
+source "package/libroxml/Config.in"
+source "package/libxml-parser-perl/Config.in"
+source "package/libxml2/Config.in"
+source "package/libxmlpp/Config.in"
+source "package/libxslt/Config.in"
+source "package/libyaml/Config.in"
+source "package/mxml/Config.in"
+source "package/rapidjson/Config.in"
+source "package/xerces/Config.in"
+source "package/yajl/Config.in"
+endmenu
+
 menu "Multimedia"
 source "package/libdvbsi/Config.in"
 source "package/libdvdnav/Config.in"
@@ -720,26 +740,6 @@ source "package/readline/Config.in"
 source "package/slang/Config.in"
 endmenu
 
-menu "JSON/XML"
-source "package/cjson/Config.in"
-source "package/expat/Config.in"
-source "package/ezxml/Config.in"
-source "package/jansson/Config.in"
-source "package/json-c/Config.in"
-source "package/json-glib/Config.in"
-source "package/libjson/Config.in"
-source "package/libroxml/Config.in"
-source "package/libxml-parser-perl/Config.in"
-source "package/libxml2/Config.in"
-source "package/libxmlpp/Config.in"
-source "package/libxslt/Config.in"
-source "package/libyaml/Config.in"
-source "package/mxml/Config.in"
-source "package/rapidjson/Config.in"
-source "package/xerces/Config.in"
-source "package/yajl/Config.in"
-endmenu
-
 endmenu
 
 menu "Miscellaneous"

From 3b68e8735ecb4099bbb6fc90da0fdf8f4d6217d0 Mon Sep 17 00:00:00 2001
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Fri, 25 Oct 2013 17:05:52 +0200
Subject: [PATCH 6560/6849] packages/Config.in: Change entries titles

This patch mostly fix the casing on different entries titles.
It also changes the name of "Misc devices firmwares" to a simpler
"Firmware".

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index e40fa31192..32be4d981f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -169,7 +169,7 @@ source "package/gnuplot/Config.in"
 source "package/jhead/Config.in"
 source "package/rrdtool/Config.in"
 
-comment "graphic libraries"
+comment "Graphic libraries"
 source "package/cegui06/Config.in"
 source "package/directfb/Config.in"
 source "package/directfb-examples/Config.in"
@@ -196,7 +196,7 @@ source "package/sdl_net/Config.in"
 source "package/sdl_sound/Config.in"
 source "package/sdl_ttf/Config.in"
 
-comment "other GUIs"
+comment "Other GUIs"
 source "package/efl/Config.in"
 source "package/qt/Config.in"
 
@@ -240,7 +240,7 @@ source "package/liberation/Config.in"
 source "package/libsexy/Config.in"
 source "package/x11r7/xkeyboard-config/Config.in"
 
-comment "X Window managers"
+comment "X window managers"
 source "package/blackbox/Config.in"
 source "package/enlightenment/Config.in"
 source "package/fluxbox/Config.in"
@@ -249,7 +249,7 @@ source "package/metacity/Config.in"
 endmenu
 
 menu "Hardware handling"
-menu "Misc devices firmwares"
+menu "Firmware"
 source "package/am33x-cm3/Config.in"
 source "package/b43-firmware/Config.in"
 source "package/linux-firmware/Config.in"

From 5a4a11a5d1388cf358df8191acea990718fc8704 Mon Sep 17 00:00:00 2001
From: Francois Perrad <fperrad@gmail.com>
Date: Sat, 14 Sep 2013 16:36:59 +0200
Subject: [PATCH 6561/6849] perl: fix on uClibc without IPv6 support

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/perl/perl-uClibc-IPv6.patch | 61 +++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 package/perl/perl-uClibc-IPv6.patch

diff --git a/package/perl/perl-uClibc-IPv6.patch b/package/perl/perl-uClibc-IPv6.patch
new file mode 100644
index 0000000000..8ace75e069
--- /dev/null
+++ b/package/perl/perl-uClibc-IPv6.patch
@@ -0,0 +1,61 @@
+fix on uClibc without IPv6 support
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/cpan/Socket/Socket.xs
+===================================================================
+--- a/cpan/Socket/Socket.xs
++++ b/cpan/Socket/Socket.xs
+@@ -896,7 +896,7 @@
+ 	CODE:
+ #ifdef HAS_INETNTOP
+ 	STRLEN addrlen;
+-#ifdef AF_INET6
++#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
+ 	struct in6_addr addr;
+ 	char str[INET6_ADDRSTRLEN];
+ #else
+@@ -916,7 +916,7 @@
+ 		croak("Bad address length for Socket::inet_ntop on AF_INET;"
+ 		      " got %"UVuf", should be 4", (UV)addrlen);
+ 	    break;
+-#ifdef AF_INET6
++#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
+ 	  case AF_INET6:
+ 	    if(addrlen != 16)
+ 		croak("Bad address length for Socket::inet_ntop on AF_INET6;"
+@@ -925,7 +925,7 @@
+ #endif
+ 	  default:
+ 		croak("Bad address family for %s, got %d, should be"
+-#ifdef AF_INET6
++#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
+ 		      " either AF_INET or AF_INET6",
+ #else
+ 		      " AF_INET",
+@@ -955,7 +955,7 @@
+ #ifdef HAS_INETPTON
+ 	int ok;
+ 	int addrlen = 0;
+-#ifdef AF_INET6
++#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
+ 	struct in6_addr ip_address;
+ #else
+ 	struct in_addr ip_address;
+@@ -965,14 +965,14 @@
+ 	  case AF_INET:
+ 	    addrlen = 4;
+ 	    break;
+-#ifdef AF_INET6
++#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
+ 	  case AF_INET6:
+ 	    addrlen = 16;
+ 	    break;
+ #endif
+ 	  default:
+ 		croak("Bad address family for %s, got %d, should be"
+-#ifdef AF_INET6
++#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
+ 		      " either AF_INET or AF_INET6",
+ #else
+ 		      " AF_INET",

From 632fbed88dc91d882519a98d7cba91047cefc9c8 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Wed, 25 Sep 2013 21:09:55 -0400
Subject: [PATCH 6562/6849] jq: new package

jq is like sed for JSON data - you can use it to slice and filter
and map and transform structured data with the same ease that sed,
awk, grep and friends let you play with text.

[Peter: fix license, add flex/bison deps, force c99]
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in    |  1 +
 package/jq/Config.in |  8 ++++++++
 package/jq/jq.mk     | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/jq/Config.in
 create mode 100644 package/jq/jq.mk

diff --git a/package/Config.in b/package/Config.in
index 32be4d981f..4c4da5119d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -108,6 +108,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
 endif
 source "package/intltool/Config.in"
+source "package/jq/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
 source "package/make/Config.in"
diff --git a/package/jq/Config.in b/package/jq/Config.in
new file mode 100644
index 0000000000..9329b2fb35
--- /dev/null
+++ b/package/jq/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_JQ
+	bool "jq"
+	help
+	  jq is like sed for JSON data - you can use it to slice and filter
+	  and map and transform structured data with the same ease that sed,
+	  awk, grep and friends let you play with text.
+
+	  http://stedolan.github.io/jq/
diff --git a/package/jq/jq.mk b/package/jq/jq.mk
new file mode 100644
index 0000000000..8d4f24f0d6
--- /dev/null
+++ b/package/jq/jq.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# jq
+#
+################################################################################
+
+JQ_VERSION = jq-1.3
+JQ_SITE = http://github.com/stedolan/jq/tarball/$(JQ_VERSION)
+JQ_AUTORECONF = YES
+JQ_DEPENDENCIES = host-flex host-bison
+JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
+JQ_LICENSE_FILES = COPYING
+
+# uses c99 specific features
+JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
+
+$(eval $(autotools-package))

From fb74bc78fbd2ab89baa05960fd13267392d0e399 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@gmail.com>
Date: Sat, 5 Oct 2013 20:58:42 +0200
Subject: [PATCH 6563/6849] package/opkg: bumping version to 0.2.0

opkg has released a new version v0.2.0. The opkg community is also on
the way to switching completely from subversion to git.
The current git repository is placed on Bitbucket and will probably move
once again if there will be find a new home for the project.
https://bitbucket.org/opkg/opkg

The new version 0.2.0 is almost a bugfixing release with a lot of small
changes.
This patch is adding the license info too.

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
---
 package/opkg/opkg.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index f183d6e9ae..c57bd7f464 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -4,14 +4,16 @@
 #
 ################################################################################
 
-OPKG_VERSION = 635
-OPKG_SITE = http://opkg.googlecode.com/svn/trunk/
-OPKG_SITE_METHOD = svn
+OPKG_VERSION = v0.2.0
+OPKG_SOURCE = $(OPKG_VERSION).tar.bz2
+OPKG_SITE = https://bitbucket.org/opkg/opkg/get
+# Uses PKG_CHECK_MODULES() in configure.ac
+OPKG_DEPENDENCIES = host-pkgconf
+OPKG_LICENSE = GPLv2+
+OPKG_LICENSE_FILES = COPYING
 OPKG_INSTALL_STAGING = YES
 OPKG_CONF_OPT = --disable-curl
 OPKG_AUTORECONF = YES
-# Uses PKG_CHECK_MODULES() in configure.ac
-OPKG_DEPENDENCIES = host-pkgconf
 
 # Ensure directory for lockfile exists
 define OPKG_CREATE_LOCKDIR

From ff0367008c683362f422751644237218b1c45def Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sun, 20 Oct 2013 23:36:14 +0200
Subject: [PATCH 6564/6849] trace-cmd: use pkg-config instead of python-config

trace-cmd use python-config to find out which headers
and libraries should be used to link against the Python libraries.
By default, python-config returns paths that are inappropriate for
cross-compilation.

This patch replaces python-config with pkg-config as a workaround.

Add PYTHON_VERS to build trace-cmd with python2 or python3

Fixes:
http://autobuild.buildroot.net/results/980/980875810528ac1dee34b8c268d9b3c40b2e35ec/

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-pkg-config-instead-of-python-config.patch | 43 +++++++++++++++++++
 package/trace-cmd/trace-cmd.mk                | 13 ++++++
 2 files changed, 56 insertions(+)
 create mode 100644 package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch

diff --git a/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch b/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
new file mode 100644
index 0000000000..6fed42c41b
--- /dev/null
+++ b/package/trace-cmd/trace-cmd-0001-Makefile-use-pkg-config-instead-of-python-config.patch
@@ -0,0 +1,43 @@
+
+trace-cmd use python-config to find out which headers
+and libraries should be used to link against the Python libraries.
+By default, python-config returns paths that are inappropriate for
+cross-compilation.
+
+Add PYTHON_VERS to build trace-cmd with python2 or python3
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ Makefile | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 83329ca..23b70d8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,8 +80,10 @@ ifndef NO_PYTHON
+ PYTHON		:= ctracecmd.so
+ PYTHON_GUI	:= ctracecmd.so ctracecmdgui.so
+
++PYTHON_VERS ?= python
++
+ # Can build python?
+-ifeq ($(shell sh -c "python-config --includes > /dev/null 2>&1 && echo y"), y)
++ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y)
+ 	PYTHON_PLUGINS := plugin_python.so
+ 	BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS)
+ 	PYTHON_SO_INSTALL := ctracecmd.install
+@@ -546,8 +548,8 @@ clean:
+
+ ##### PYTHON STUFF #####
+
+-PYTHON_INCLUDES = `python-config --includes`
+-PYTHON_LDFLAGS = `python-config --ldflags` \
++PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)`
++PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \
+ 		$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')")
+ PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
+
+--
+1.8.4
+
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index 7a750f9ab3..69e0e697ac 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -11,6 +11,18 @@ TRACE_CMD_INSTALL_STAGING = YES
 TRACE_CMD_LICENSE = GPLv2 LGPLv2.1
 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
 
+TRACE_CMD_DEPENDENCIES = host-pkgconf
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+TRACE_CMD_DEPENDENCIES += python host-swig
+TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python
+else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+TRACE_CMD_DEPENDENCIES += python3 host-swig
+TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python3
+else
+TRACE_CMD_MAKE_OPTS += NO_PYTHON=1
+endif
+
 # trace-cmd already defines _LARGEFILE64_SOURCE when necessary,
 # redefining it on the command line causes build problems.
 TRACE_CMD_CFLAGS=$(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) -D_GNU_SOURCE
@@ -18,6 +30,7 @@ TRACE_CMD_CFLAGS=$(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) -D_GNU_SOU
 define TRACE_CMD_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TRACE_CMD_CFLAGS)" \
+		$(TRACE_CMD_MAKE_OPTS) \
 		-C $(@D) all
 endef
 

From 200bf74e8e4686c3f132a6600ae6803eda8b588a Mon Sep 17 00:00:00 2001
From: Jouko Nikula <jouko.nikula@espotel.com>
Date: Sun, 27 Oct 2013 14:51:19 +0100
Subject: [PATCH 6565/6849] Update config.guess and config.sub scripts to
 latest versions.

Current version of config.guess may fail to detect host libc version,
which results in problems with configure when building gcc. Current patches
are removed. Patch to add support for ps2 is removed as it was discussed on
buildroot mailing list that it is no longer needed.

[Arnout: drop the 'improve uClibc' patch, update commit message, update to
more recent version, update README.]
Signed-off-by: Jouko Nikula <jouko.nikula@espotel.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/gnuconfig/README.buildroot            |   7 +-
 support/gnuconfig/config.guess                | 117 +++++------
 support/gnuconfig/config.sub                  |  94 ++++-----
 .../0001-config-add-support-for-uClibc.patch  | 184 ------------------
 .../0002-config-add-support-for-ps2.patch     |  60 ------
 5 files changed, 104 insertions(+), 358 deletions(-)
 delete mode 100644 support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch
 delete mode 100644 support/gnuconfig/patches/0002-config-add-support-for-ps2.patch

diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot
index 5f96b3c230..0898cb541c 100644
--- a/support/gnuconfig/README.buildroot
+++ b/support/gnuconfig/README.buildroot
@@ -20,9 +20,8 @@ GNU config is now managed in git, so to update:
 # for p in $(ls patches/*.patch); do patch -p1 < $p; done
 # rm -rf config
 
-A few local customizations are used to support uClibc so you may
-have to make sure they're still needed.  The patches are broken
-out in the patches/ dir to keep things simple.
+Currently no patches are needed, but they may be needed again in the
+future.
 
 The current Buildroot version is based on the Git commit
-9582436dfae5755279f96898ce30bde28e4e69ea of the config.git repository.
+5e4de70bb0064d974a848fbe3a445d5dafaf7b48 of the config.git repository.
diff --git a/support/gnuconfig/config.guess b/support/gnuconfig/config.guess
index 95091799ad..b79252d6b1 100755
--- a/support/gnuconfig/config.guess
+++ b/support/gnuconfig/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-09-25'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-09-25'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,22 +132,26 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
 	eval $set_cc_for_build
-	cat << EOF > $dummy.c
+	cat <<-EOF > $dummy.c
 	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
+	#if defined(__UCLIBC__)
 	LIBC=uclibc
-	# endif
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
 	#else
 	LIBC=gnu
 	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
 
 # Note: order is significant - the case branches are not exclusive.
 
@@ -876,11 +874,11 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -906,6 +904,9 @@ EOF
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -916,9 +917,9 @@ EOF
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
@@ -938,14 +939,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -975,14 +969,17 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
@@ -998,8 +995,14 @@ EOF
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1011,7 +1014,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
@@ -1253,19 +1256,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
diff --git a/support/gnuconfig/config.sub b/support/gnuconfig/config.sub
index b2958ad319..61cb4bc22d 100755
--- a/support/gnuconfig/config.sub
+++ b/support/gnuconfig/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-10-10'
+timestamp='2013-10-01'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-10-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -264,14 +257,15 @@ case $basic_machine in
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx | dvp \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -293,16 +287,17 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -330,7 +325,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -378,7 +373,7 @@ case $basic_machine in
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -387,6 +382,7 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -410,12 +406,13 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -799,7 +796,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -813,24 +810,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsEE* | ee | ps2)
-		basic_machine=mips64r5900el-scei
-		case $os in
-		    -linux*)
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
-	iop)
-		basic_machine=mipsel-scei
-		os=-irx
-		;;
-	dvp)
-		basic_machine=dvp-scei
-		os=-elf
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -853,7 +832,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1044,7 +1023,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1371,7 +1354,7 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1393,7 +1376,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -irx*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1517,9 +1500,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1568,6 +1548,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1611,6 +1594,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch b/support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch
deleted file mode 100644
index 3627e8e050..0000000000
--- a/support/gnuconfig/patches/0001-config-add-support-for-uClibc.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From eee83aa62993b15b7f460cca9583cd69a15b5357 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 15 Nov 2012 17:01:13 +0100
-Subject: [PATCH 1/2] config: add support for uClibc
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- config.guess |   70 ++++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 43 insertions(+), 27 deletions(-)
-
-diff --git a/config.guess b/config.guess
-index 872b96a..9509179 100755
---- a/config.guess
-+++ b/config.guess
-@@ -138,6 +138,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
-+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-+	eval $set_cc_for_build
-+	cat << EOF > $dummy.c
-+	#include <features.h>
-+	#ifdef __UCLIBC__
-+	# ifdef __UCLIBC_CONFIG_VERSION__
-+	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-+	# else
-+	LIBC=uclibc
-+	# endif
-+	#else
-+	LIBC=gnu
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-+fi
-+
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -869,11 +886,11 @@ EOF
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-     aarch64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     aarch64_be:Linux:*:*)
- 	UNAME_MACHINE=aarch64_be
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -886,15 +903,15 @@ EOF
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
- 	esac
- 	objdump --private-headers /bin/sh | grep -q ld.so.1
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     arm*:Linux:*:*)
- 	eval $set_cc_for_build
- 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- 	    | grep -q __ARM_EABI__
- 	then
--	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	else
- 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- 		| grep -q __ARM_PCS_VFP
-@@ -906,22 +923,21 @@ EOF
- 	fi
- 	exit ;;
-     avr32*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     cris:Linux:*:*)
--	echo ${UNAME_MACHINE}-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- 	exit ;;
-     crisv32:Linux:*:*)
--	echo ${UNAME_MACHINE}-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- 	exit ;;
-     frv:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     hexagon:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     i*86:Linux:*:*)
--	LIBC=gnu
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#ifdef __dietlibc__
-@@ -932,13 +948,13 @@ EOF
- 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 	exit ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -957,10 +973,10 @@ EOF
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- 	;;
-     or32:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
-@@ -971,40 +987,40 @@ EOF
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
-+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-+	  *)    echo hppa-unknown-linux-${LIBC} ;;
- 	esac
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
- 	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-     sh64*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     tile*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     vax:Linux:*:*)
--	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     xtensa*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
--- 
-1.7.9.5
-
diff --git a/support/gnuconfig/patches/0002-config-add-support-for-ps2.patch b/support/gnuconfig/patches/0002-config-add-support-for-ps2.patch
deleted file mode 100644
index 781b9588d6..0000000000
--- a/support/gnuconfig/patches/0002-config-add-support-for-ps2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 144194fe916a14b630324c19f7b098109122bca2 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 15 Nov 2012 17:01:25 +0100
-Subject: [PATCH 2/2] config: add support for ps2
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- config.sub |   22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/config.sub b/config.sub
-index 89b1286..8509813 100755
---- a/config.sub
-+++ b/config.sub
-@@ -265,7 +265,7 @@ case $basic_machine in
- 	| be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
--	| d10v | d30v | dlx | dsp16xx \
-+	| d10v | d30v | dlx | dsp16xx | dvp \
- 	| epiphany \
- 	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-@@ -813,6 +813,24 @@ case $basic_machine in
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
-+	mipsEE* | ee | ps2)
-+		basic_machine=mips64r5900el-scei
-+		case $os in
-+		    -linux*)
-+			;;
-+		    *)
-+			os=-elf
-+			;;
-+		esac
-+		;;
-+	iop)
-+		basic_machine=mipsel-scei
-+		os=-irx
-+		;;
-+	dvp)
-+		basic_machine=dvp-scei
-+		os=-elf
-+		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
-@@ -1375,7 +1393,7 @@ case $os in
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -irx*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- 
-1.7.9.5
-

From 01fb86332e9030167011fc27753d148cc712452f Mon Sep 17 00:00:00 2001
From: Abdul Hussain <hussain.abdul@outlook.com>
Date: Fri, 25 Oct 2013 22:33:19 +0530
Subject: [PATCH 6566/6849] device_table_dev.txt: Increase /dev/ttymxc count

Since debug uart on imx6 sabreauto board is ttymxc3.

Signed-off-by: Abdul Hussain <hussain.abdul@outlook.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 system/device_table_dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/device_table_dev.txt b/system/device_table_dev.txt
index a93a2c8083..95079393e6 100644
--- a/system/device_table_dev.txt
+++ b/system/device_table_dev.txt
@@ -35,7 +35,7 @@
 /dev/ttySC	c	666	0	0	204	8	0	1	8
 /dev/ttyPSC	c	666	0	0	204	148	0	1	4
 /dev/ttyUL	c	666	0	0	204	187	0	1	4
-/dev/ttymxc	c	666	0	0	207	16	0	1	3
+/dev/ttymxc	c	666	0	0	207	16	0	1	4
 
 # Input stuff
 /dev/input		d	755	0	0	-	-	-	-	-

From 09d1176e1e8c9f72c431ca64f2561b405f89ece0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 27 Oct 2013 20:18:19 -0300
Subject: [PATCH 6567/6849] nano: needs wchar

Fixes:
http://autobuild.buildroot.net/results/317/3177b7d6168eec0620e4a1ade9166c9c84929e6e/

[Peter: add comment when not available]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nano/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/nano/Config.in b/package/nano/Config.in
index 9546fe7813..395af9d86e 100644
--- a/package/nano/Config.in
+++ b/package/nano/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NANO
 	bool "nano"
+	depends on BR2_USE_WCHAR
 	# full version uses fork()
 	select BR2_PACKAGE_NANO_TINY if !BR2_USE_MMU
 	select BR2_PACKAGE_NCURSES
@@ -15,3 +16,6 @@ config BR2_PACKAGE_NANO_TINY
 	depends on BR2_PACKAGE_NANO
 	help
 	  Disable all features for the sake of size.
+
+comment "nano needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR

From 5986cb4163590082081aeb2fb186baab94cd4802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
Date: Sun, 27 Oct 2013 21:29:27 -0300
Subject: [PATCH 6568/6849] qt5base: add tslib plugin

Add support for Tslib plugin.

[Peter: propagate !static dependency / add comment]
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/qt5base/Config.in  | 10 ++++++++++
 package/qt5/qt5base/qt5base.mk |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index e433373489..83f17e35ea 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -185,4 +185,14 @@ config BR2_PACKAGE_QT5BASE_ICU
 	  This option enables ICU support in Qt5. This is for example
 	  needed for Qt5Webkit.
 
+config BR2_PACKAGE_QT5BASE_TSLIB
+	bool "Enable Tslib support"
+	depends on !BR2_PREFER_STATIC_LIB # dlopen
+	select BR2_PACKAGE_TSLIB
+	help
+	  This options enables the Tslib plugin
+
+comment "tslib support needs a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB
+
 endif
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 0106c2cbcc..ce78d31256 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -128,6 +128,9 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),-tslib,-no-tslib)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
+
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
 

From 405af8c93f29a1f73135c5bf114be6a0b26b498c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 27 Oct 2013 19:54:17 -0300
Subject: [PATCH 6569/6849] libpng: disable tools

They can fail on some odd toolchain configurations because of
buildsystem shortcomings and aren't expected to be used in normal
scenarios.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libpng/libpng-01-disable-tools.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libpng/libpng-01-disable-tools.patch

diff --git a/package/libpng/libpng-01-disable-tools.patch b/package/libpng/libpng-01-disable-tools.patch
new file mode 100644
index 0000000000..cd7040ccd3
--- /dev/null
+++ b/package/libpng/libpng-01-disable-tools.patch
@@ -0,0 +1,30 @@
+Disable the new pngfix and png-fix-itxt tools: they take up space, fail to
+build on some oddball toolchain configurations and aren't expected/needed
+in a non-interactive embedded system.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libpng-1.6.6.orig/Makefile.am libpng-1.6.6/Makefile.am
+--- libpng-1.6.6.orig/Makefile.am	2013-10-27 19:13:39.183376955 -0300
++++ libpng-1.6.6/Makefile.am	2013-10-27 19:13:50.388744191 -0300
+@@ -10,7 +10,7 @@
+ check_PROGRAMS= pngtest pngunknown pngstest pngvalid
+ 
+ # Utilities - installed
+-bin_PROGRAMS= pngfix png-fix-itxt
++bin_PROGRAMS=
+ 
+ pngtest_SOURCES = pngtest.c
+ pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+diff -Nura libpng-1.6.6.orig/Makefile.in libpng-1.6.6/Makefile.in
+--- libpng-1.6.6.orig/Makefile.in	2013-10-27 19:13:39.180376856 -0300
++++ libpng-1.6.6/Makefile.in	2013-10-27 19:14:55.332872643 -0300
+@@ -59,7 +59,7 @@
+ host_triplet = @host@
+ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \
+ 	pngstest$(EXEEXT) pngvalid$(EXEEXT)
+-bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT)
++bin_PROGRAMS =
+ @PNG_ARM_NEON_TRUE@am__append_1 = arm/arm_init.c\
+ @PNG_ARM_NEON_TRUE@	arm/filter_neon.S
+ 

From 56497f708ebb60abbd5b4d641fe1edf0d4f97701 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 27 Oct 2013 19:54:18 -0300
Subject: [PATCH 6570/6849] fltk: bump to version 1.3.2

Fixes:
http://autobuild.buildroot.net/results/519/5195f7a8a38a5ba3ce5a0bf2a7649d390e461ee9/

The failure is related to bundled libpng conflicting with system libpng.
Which was a problem even before the libpng bump because the bundled
version for the previous fltk version has several security
vulnerabilities.
So disable bundled libraries and use global ones.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/fltk/Config.in                        |   3 +
 package/fltk/fltk-01-disable-tests.patch      |  16 +++
 .../fltk/fltk-1.1.7-bail-out-on-error.patch   |  54 -------
 package/fltk/fltk-1.1.7-disable-test.patch    |  17 ---
 package/fltk/fltk-1.1.7-makefiles.patch       | 132 ------------------
 package/fltk/fltk-1.1.7-scandir-fix.patch     |  20 ---
 package/fltk/fltk.mk                          |  31 +++-
 7 files changed, 45 insertions(+), 228 deletions(-)
 create mode 100644 package/fltk/fltk-01-disable-tests.patch
 delete mode 100644 package/fltk/fltk-1.1.7-bail-out-on-error.patch
 delete mode 100644 package/fltk/fltk-1.1.7-disable-test.patch
 delete mode 100644 package/fltk/fltk-1.1.7-makefiles.patch
 delete mode 100644 package/fltk/fltk-1.1.7-scandir-fix.patch

diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index 1c440f25ed..587fcc1e44 100644
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_FLTK
 	bool "fltk"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXEXT
diff --git a/package/fltk/fltk-01-disable-tests.patch b/package/fltk/fltk-01-disable-tests.patch
new file mode 100644
index 0000000000..957145312c
--- /dev/null
+++ b/package/fltk/fltk-01-disable-tests.patch
@@ -0,0 +1,16 @@
+Disable tests, slower to build and would need host-fltk.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura fltk-1.3.2.orig/Makefile fltk-1.3.2/Makefile
+--- fltk-1.3.2.orig/Makefile	2013-10-27 18:19:39.693208127 -0300
++++ fltk-1.3.2/Makefile	2013-10-27 18:20:08.032136885 -0300
+@@ -18,7 +18,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
diff --git a/package/fltk/fltk-1.1.7-bail-out-on-error.patch b/package/fltk/fltk-1.1.7-bail-out-on-error.patch
deleted file mode 100644
index 644a0560b4..0000000000
--- a/package/fltk/fltk-1.1.7-bail-out-on-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-When a submake fails, the build of FLTK was stopping, but the main
-make was returning 0. Therefore, Buildroot was going on with the build
-of the other components, even though the build of FLTK failed.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: fltk-1.1.7/Makefile
-===================================================================
---- fltk-1.1.7.orig/Makefile	2010-05-21 15:52:20.000000000 +0200
-+++ fltk-1.1.7/Makefile	2010-05-21 15:52:43.000000000 +0200
-@@ -32,7 +32,7 @@
- all: makeinclude
- 	for dir in $(DIRS); do\
- 		echo "=== making $$dir ===";\
--		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
-+		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
- 	done
- 
- install: makeinclude
-@@ -42,7 +42,7 @@
- 	-chmod 755 $(DESTDIR)$(bindir)/fltk-config
- 	for dir in FL $(DIRS); do\
- 		echo "=== installing $$dir ===";\
--		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
-+		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
- 	done
- 
- install-desktop: makeinclude
-@@ -54,7 +54,7 @@
- 	$(RM) $(DESTDIR)$(bindir)/fltk-config
- 	for dir in FL $(DIRS); do\
- 		echo "=== uninstalling $$dir ===";\
--		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
-+		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
- 	done
- 
- uninstall-desktop: makeinclude
-@@ -65,14 +65,14 @@
- depend: makeinclude
- 	for dir in $(DIRS); do\
- 		echo "=== making dependencies in $$dir ===";\
--		(cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\
-+		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
- 	done
- 
- clean:
- 	-$(RM) core *.o
- 	for dir in $(DIRS); do\
- 		echo "=== cleaning $$dir ===";\
--		(cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\
-+		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
- 	done
- 
- distclean: clean
diff --git a/package/fltk/fltk-1.1.7-disable-test.patch b/package/fltk/fltk-1.1.7-disable-test.patch
deleted file mode 100644
index c83e1dae07..0000000000
--- a/package/fltk/fltk-1.1.7-disable-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Disable tests in FLTK because they use the fluid tool on the host.
-
-Patch borrowed from OpenEmbedded.
-
-Index: fltk-1.1.9/Makefile
-===================================================================
---- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200
-+++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200
-@@ -27,7 +27,7 @@
- 
- include makeinclude
- 
--DIRS	=	$(IMAGEDIRS) src fluid test documentation
-+DIRS	=	$(IMAGEDIRS) src fluid documentation
- 
- all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
diff --git a/package/fltk/fltk-1.1.7-makefiles.patch b/package/fltk/fltk-1.1.7-makefiles.patch
deleted file mode 100644
index 0a6a8d433e..0000000000
--- a/package/fltk/fltk-1.1.7-makefiles.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/jpeg/Makefile	2005-02-27 19:11:07.000000000 -0500
-+++ b/jpeg/Makefile	2008-03-19 13:17:46.000000000 -0400
-@@ -65,14 +65,14 @@ clean:
- #
- 
- install:
--	echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..."
--	-$(MKDIR) $(libdir)
--	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
--	$(CP) $(LIBJPEG) $(libdir)
--	$(RANLIB) $(libdir)/libfltk_jpeg$(LIBEXT)
--	echo "Installing jpeg headers in $(includedir)/FL/images..."
--	-$(MKDIR) $(includedir)/FL/images
--	$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(includedir)/FL/images
-+	echo "Installing libfltk_jpeg$(LIBEXT) in $(DESTDIR)$(libdir)..."
-+	-$(MKDIR) $(DESTDIR)$(libdir)
-+	$(RM) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)
-+	$(CP) $(LIBJPEG) $(DESTDIR)$(libdir)
-+	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)
-+	echo "Installing jpeg headers in $(DESTDIR)$(includedir)/FL/images..."
-+	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images
-+	$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(DESTDIR)$(includedir)/FL/images
- 
- 
- #
-@@ -81,12 +81,12 @@ install:
- 
- uninstall:
- 	echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..."
--	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
-+	$(RM) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)
- 	echo "Uninstalling jpeg headers in $(includedir)/FL/images..."
--	$(RM) $(includedir)/FL/images/jconfig.h
--	$(RM) $(includedir)/FL/images/jerror.h
--	$(RM) $(includedir)/FL/images/jmorecfg.h
--	$(RM) $(includedir)/FL/images/jpeglib.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/jconfig.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/jerror.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/jmorecfg.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/jpeglib.h
- 
- 
- #
-
---- a/png/Makefile	2005-02-24 16:55:12.000000000 -0500
-+++ b/png/Makefile	2008-03-19 13:18:38.000000000 -0400
-@@ -57,14 +57,14 @@ clean:
- #
- 
- install: $(LIBPNG)
--	echo "Installing libfltk_png$(LIBEXT) in $(libdir)..."
--	-$(MKDIR) $(libdir)
--	$(RM) $(libdir)/libfltk_png$(LIBEXT)
--	$(CP) $(LIBPNG) $(libdir)
--	$(RANLIB) $(libdir)/libfltk_png$(LIBEXT)
--	echo "Installing png headers in $(includedir)/FL/images..."
--	-$(MKDIR) $(includedir)/FL/images
--	$(CP) png.h pngconf.h $(includedir)/FL/images
-+	echo "Installing libfltk_png$(LIBEXT) in $(DESTDIR)$(libdir)..."
-+	-$(MKDIR) $(DESTDIR)$(libdir)
-+	$(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)
-+	$(CP) $(LIBPNG) $(DESTDIR)$(libdir)
-+	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)
-+	echo "Installing png headers in $(DESTDIR)$(includedir)/FL/images..."
-+	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images
-+	$(CP) png.h pngconf.h $(DESTDIR)$(includedir)/FL/images
- 
- 
- #
-@@ -72,11 +72,11 @@ install: $(LIBPNG)
- #
- 
- uninstall:
--	echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..."
--	$(RM) $(libdir)/libfltk_png$(LIBEXT)
--	echo "Uninstalling png headers in $(includedir)/FL/images..."
--	$(RM) $(includedir)/FL/images/png.h
--	$(RM) $(includedir)/FL/images/pngconf.h
-+	echo "Uninstalling libfltk_png$(LIBEXT) in $(DESTDIR)$(libdir)..."
-+	$(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)
-+	echo "Uninstalling png headers in $(DESTDIR)$(includedir)/FL/images..."
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/png.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/pngconf.h
- 
- 
- #
-
---- a/zlib/Makefile	2005-02-24 16:55:12.000000000 -0500
-+++ b/zlib/Makefile	2008-03-19 13:20:34.000000000 -0400
-@@ -57,14 +57,14 @@ clean:
- #
- 
- install: $(LIBZ)
--	echo "Installing libfltk_z$(LIBEXT) in $(libdir)..."
--	-$(MKDIR) $(libdir)
--	$(RM) $(libdir)/libfltk_z$(LIBEXT)
--	$(CP) $(LIBZ) $(libdir)
--	$(RANLIB) $(libdir)/libfltk_z$(LIBEXT)
--	echo "Installing zlib headers in $(includedir)/FL/images..."
--	-$(MKDIR) $(includedir)/FL/images
--	$(CP) zconf.h zlib.h zutil.h $(includedir)/FL/images
-+	echo "Installing libfltk_z$(LIBEXT) in $(DESTDIR)$(libdir)..."
-+	-$(MKDIR) $(DESTDIR)$(libdir)
-+	$(RM) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)
-+	$(CP) $(LIBZ) $(DESTDIR)$(libdir)
-+	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)
-+	echo "Installing zlib headers in $(DESTDIR)$(includedir)/FL/images..."
-+	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images
-+	$(CP) zconf.h zlib.h zutil.h $(DESTDIR)$(includedir)/FL/images
- 
- 
- #
-@@ -72,12 +72,12 @@ install: $(LIBZ)
- #
- 
- uninstall:
--	echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..."
--	$(RM) $(libdir)/libfltk_z$(LIBEXT)
--	echo "Uninstalling zlib headers in $(includedir)/FL/images..."
--	$(RM) $(includedir)/FL/images/zconf.h
--	$(RM) $(includedir)/FL/images/zlib.h
--	$(RM) $(includedir)/FL/images/zutil.h
-+	echo "Uninstalling libfltk_z$(LIBEXT) in $(DESTDIR)$(libdir)..."
-+	$(RM) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)
-+	echo "Uninstalling zlib headers in $(DESTDIR)$(includedir)/FL/images..."
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/zconf.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/zlib.h
-+	$(RM) $(DESTDIR)$(includedir)/FL/images/zutil.h
- 
- 
- #
-
diff --git a/package/fltk/fltk-1.1.7-scandir-fix.patch b/package/fltk/fltk-1.1.7-scandir-fix.patch
deleted file mode 100644
index ba2b560933..0000000000
--- a/package/fltk/fltk-1.1.7-scandir-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use the correct scandir() call.
-
-See http://www.fltk.org/str.php?L2205. This patch is a simplified
-version of http://www.fltk.org/strfiles/2205/scandir_posix.patch.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: fltk-1.1.7/src/filename_list.cxx
-===================================================================
---- fltk-1.1.7.orig/src/filename_list.cxx	2010-05-21 15:58:09.000000000 +0200
-+++ fltk-1.1.7/src/filename_list.cxx	2010-05-21 16:00:21.000000000 +0200
-@@ -54,7 +54,7 @@
-                      Fl_File_Sort_F *sort) {
- #ifndef HAVE_SCANDIR
-   int n = scandir(d, list, 0, sort);
--#elif defined(__hpux) || defined(__CYGWIN__)
-+#elif defined(__hpux) || defined(__CYGWIN__) || defined(__USE_POSIX)
-   // HP-UX, Cygwin define the comparison function like this:
-   int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
- #elif defined(__osf__)
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 08781fbd36..cbcec7b585 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -4,14 +4,35 @@
 #
 ################################################################################
 
-FLTK_VERSION = 1.1.7
-FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.bz2
-FLTK_SITE = http://ftp.easysw.com/pub/fltk/1.1.7/
+FLTK_VERSION = 1.3.2
+FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
+FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
 FLTK_INSTALL_STAGING = YES
 FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
-FLTK_CONF_OPT = --enable-threads --with-x
-FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
+FLTK_CONF_OPT = --enable-threads --with-x --disable-gl \
+	--disable-localjpeg --disable-localpng --disable-localzlib
+FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt
 FLTK_CONFIG_SCRIPTS = fltk-config
+FLTK_LICENSE = LGPLv2 with exceptions
+FLTK_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+FLTK_CONF_OPT += --enable-cairo
+FLTK_DEPENDENCIES += cairo
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
+FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+FLTK_DEPENDENCIES += xlib_libXft
+else
+FLTK_CONF_OPT += --disable-xft
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+FLTK_DEPENDENCIES += xlib_libXinerama
+else
+FLTK_CONF_OPT += --disable-xinerama
+endif
 
 $(eval $(autotools-package))

From ca5639f8d00aae6427054dee1f0433583ad3041d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 27 Oct 2013 19:54:19 -0300
Subject: [PATCH 6571/6849] alsamixergui: needs mmu

Because of the new fl_open_uri() function since the fltk bump using
fork().

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/alsamixergui/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
index acc3cc9fc7..b1b9eb9c66 100644
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ALSAMIXERGUI
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fltk fork()
 	select BR2_PACKAGE_FLTK
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_PCM

From f60dafe06833a17540608d1c8172d6535c513f1e Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 28 Oct 2013 14:21:09 +0000
Subject: [PATCH 6572/6849] arch/mips: Set BR2_GCC_TARGET_ARCH for MIPS

Set --with-arch instead of --with-tune for MIPS so that the
generated code will be optimal for the given MIPS ISA.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/Config.in.mips | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 6242bcc747..86fbe6458c 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -72,7 +72,7 @@ config BR2_ENDIAN
 	default "LITTLE"	if BR2_mipsel || BR2_mips64el
 	default "BIG" 	    	if BR2_mips || BR2_mips64
 
-config BR2_GCC_TARGET_TUNE
+config BR2_GCC_TARGET_ARCH
 	default "mips1"		if BR2_mips_1
 	default "mips2"		if BR2_mips_2
 	default "mips3"		if BR2_mips_3

From 260d708c8916f9b681f2e97453470c43c05a67b6 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil.eichinger@gmail.com>
Date: Mon, 28 Oct 2013 10:47:27 +0100
Subject: [PATCH 6573/6849] valgrind: add support for glibc 2.17 and 2.18

Fixes: http://autobuild.buildroot.net/results/f086e65aca220bc9a5869f8fc8c1dca4d87ada7d/

Signed-off-by: Phil Eichinger <phil@zankapfel.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...-add-support-for-glibc-2.17-and-2.18.patch | 50 +++++++++++++++++++
 package/valgrind/valgrind.mk                  |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch

diff --git a/package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch b/package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch
new file mode 100644
index 0000000000..c07dda2468
--- /dev/null
+++ b/package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch
@@ -0,0 +1,50 @@
+From bca21896dbdba12963aa7991d7f1b732b6a709a8 Mon Sep 17 00:00:00 2001
+From: Phil Eichinger <phil@zankapfel.net>
+Date: Wed, 23 Oct 2013 18:28:15 +0200
+Subject: [PATCH 1/1] Add support for glibc 2.17 and 2.18.
+
+
+Signed-off-by: Phil Eichinger <phil@zankapfel.net>
+---
+Status: fixed in upstream r13228 & r13504, not yet released.
+
+ configure.in |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 1da3a2c..ccc60a0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -906,6 +906,20 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.17)
++	AC_MSG_RESULT(2.17 family)
++	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++     2.18)
++	AC_MSG_RESULT(2.18 family)
++	AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +933,7 @@ case "${GLIBC_VERSION}" in
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
+-- 
+1.7.10.4
+
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index f40784e1f2..953f929490 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -9,7 +9,7 @@ VALGRIND_SITE    = http://valgrind.org/downloads/
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPLv2 GFDLv1.2
 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
-
+VALGRIND_AUTORECONF = YES
 VALGRIND_CONF_OPT = --disable-tls
 
 # On ARM, Valgrind only supports ARMv7, and uses the arch part of the

From f3a2b806dee5e642077ca3fafd67e3b17e09b669 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Mon, 14 Oct 2013 10:52:25 +0100
Subject: [PATCH 6574/6849] ext-toolchain: MIPS: Select correct endianness for
 the target

Previously, an external-toolchain on a mipsel/mips64el target
didn't select the appriopriate endianness but
it asked the user to set the correct CFLAGS on his/her own.
We fix this by appending "-EL" to the toolchain wrapper options
if the user has selected a mipsel/mips64el target.

[Thomas: remove unneeded test on BR2_ENDIAN, since mipsel and mips64el
are always little-endian, and add the corresponding big endian case.]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/Config.in        | 24 +++++--------------
 .../ext-toolchain-wrapper.c                   |  6 +++++
 .../toolchain-external/toolchain-external.mk  |  9 ++++++-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 48b5865103..646f918be2 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -213,12 +213,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	    - MIPS32 O32 little endian glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian glibc
 	      Select a MIPS64 generic core
 	      Select the n64 ABI
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS32 big endian soft float glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
@@ -229,12 +227,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	    - MIPS32 little endian soft float glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian soft float glibc
 	      Select a MIPS64 generic core
 	      Select the n64 ABI
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS32 big endian microMIPS glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
@@ -242,7 +238,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	    - MIPS32 little endian microMIPS glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
 	    - MIPS32 big endian soft float microMIPS glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
@@ -250,7 +246,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	    - MIPS32 little endian soft float microMIPS glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
 	    - MIPS32 big endian uclibc
 	      Not usable in Buildroot yet.
 	    - MIPS32 little endian uclibc
@@ -284,12 +280,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	    - MIPS32 O32 little endian glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian glibc
 	      Select a MIPS generic core
 	      Select the n64 ABI
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS32 big endian soft float glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
@@ -300,12 +294,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	    - MIPS32 little endian soft float glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian soft float glibc
 	      Select a MIPS generic core
 	      Select the n64 ABI
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS32 big endian microMIPS glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
@@ -313,7 +305,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	    - MIPS32 little endian microMIPS glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
 	    - MIPS32 big endian soft float microMIPS glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
@@ -321,7 +313,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	    - MIPS32 little endian soft float microMIPS glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
 	    - MIPS32 big endian uclibc
 	      Not usable in Buildroot yet.
 	    - MIPS32 little endian uclibc
@@ -355,12 +347,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 O32 little endian glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian glibc
 	      Select a MIPS generic core
 	      Select the n64 ABI
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS32 big endian soft float glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
@@ -371,12 +361,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 little endian soft float glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS64 little endian soft float glibc
 	      Select a MIPS generic core
 	      Select the n64 ABI
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL
 	    - MIPS32 big endian microMIPS glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
@@ -384,7 +372,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 little endian microMIPS glibc
 	      Select a MIPS generic core
 	      Disable BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
 	    - MIPS32 big endian soft float microMIPS glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
@@ -392,7 +380,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	    - MIPS32 little endian soft float microMIPS glibc
 	      Select a MIPS generic core
 	      Select BR2_SOFT_FLOAT
-	      Set BR2_TARGET_OPTIMIZATION to -EL -mips16
+	      Set BR2_TARGET_OPTIMIZATION to -mips16
 	    - MIPS32 big endian uclibc
 	      Not usable in Buildroot yet.
 	    - MIPS32 little endian uclibc
diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c
index 727e322196..d54f1f5db6 100644
--- a/toolchain/toolchain-external/ext-toolchain-wrapper.c
+++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c
@@ -63,6 +63,12 @@ static char *predef_args[] = {
 #ifdef BR_BINFMT_FLAT
 	"-Wl,-elf2flt",
 #endif
+#ifdef BR_MIPS_TARGET_LITTLE_ENDIAN
+	"-EL",
+#endif
+#ifdef BR_MIPS_TARGET_BIG_ENDIAN
+	"-EB",
+#endif
 #ifdef BR_ADDITIONAL_CFLAGS
 	BR_ADDITIONAL_CFLAGS
 #endif
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index d41cc7cfcb..d658d4f745 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -207,7 +207,14 @@ ifeq ($(BR2_BINFMT_FLAT),y)
 TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt
 TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT
 endif
-
+ifeq ($(BR2_mipsel)$(BR2_mips64el),y)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_MIPS_TARGET_LITTLE_ENDIAN
+TOOLCHAIN_EXTERNAL_CFLAGS += -EL
+endif
+ifeq ($(BR2_mips)$(BR2_mips64),y)
+TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_MIPS_TARGET_BIG_ENDIAN
+TOOLCHAIN_EXTERNAL_CFLAGS += -EB
+endif
 ifneq ($(BR2_TARGET_OPTIMIZATION),)
 TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
 # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each

From 1690fca4648347979d00512891982e4eed74b843 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Tue, 29 Oct 2013 22:53:32 +0100
Subject: [PATCH 6575/6849] support/kconfig: fix compile warning because of
 missing include.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With commit b58bf60b519353e983e372f5627d639e7cc72a7a the libgen.h
include was removed from confdata.c, but it is needed for the dirname
function declaration.

Fixes the following compile warning:
./confdata.c: In function ‘conf_split_config’:
./confdata.c:849:6: warning: assignment makes pointer from integer
without a cast

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 support/kconfig/confdata.c                    |  1 +
 .../14-support-out-of-tree-config.patch       | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/support/kconfig/confdata.c b/support/kconfig/confdata.c
index 43f08fa1f9..db1fac5132 100644
--- a/support/kconfig/confdata.c
+++ b/support/kconfig/confdata.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <libgen.h>
 
 #include "lkc.h"
 
diff --git a/support/kconfig/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
index 9e3f93d4f2..e764fb26b7 100644
--- a/support/kconfig/patches/14-support-out-of-tree-config.patch
+++ b/support/kconfig/patches/14-support-out-of-tree-config.patch
@@ -20,7 +20,15 @@ Index: b/confdata.c
 ===================================================================
 --- a/confdata.c
 +++ b/confdata.c
-@@ -70,9 +70,7 @@
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <libgen.h>
+ 
+ #include "lkc.h"
+ 
+@@ -70,9 +71,7 @@
  
  const char *conf_get_autoconfig_name(void)
  {
@@ -31,7 +39,7 @@ Index: b/confdata.c
  }
  
  static char *conf_expand_value(const char *in)
-@@ -737,6 +735,9 @@
+@@ -737,6 +736,9 @@
  	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
  	char *env;
  
@@ -41,7 +49,7 @@ Index: b/confdata.c
  	dirname[0] = 0;
  	if (name && name[0]) {
  		struct stat st;
-@@ -831,6 +832,7 @@
+@@ -831,6 +833,7 @@
  {
  	const char *name;
  	char path[PATH_MAX+1];
@@ -49,7 +57,7 @@ Index: b/confdata.c
  	char *s, *d, c;
  	struct symbol *sym;
  	struct stat sb;
-@@ -839,8 +841,20 @@
+@@ -839,8 +842,20 @@
  	name = conf_get_autoconfig_name();
  	conf_read_simple(name, S_DEF_AUTO);
  
@@ -72,7 +80,7 @@ Index: b/confdata.c
  
  	res = 0;
  	for_all_symbols(i, sym) {
-@@ -933,9 +947,11 @@
+@@ -933,9 +948,11 @@
  		close(fd);
  	}
  out:
@@ -87,7 +95,7 @@ Index: b/confdata.c
  	return res;
  }
  
-@@ -945,25 +961,38 @@
+@@ -945,25 +962,38 @@
  	const char *name;
  	FILE *out, *tristate, *out_h;
  	int i;
@@ -130,7 +138,7 @@ Index: b/confdata.c
  	if (!out_h) {
  		fclose(out);
  		fclose(tristate);
-@@ -995,19 +1024,22 @@
+@@ -995,19 +1025,22 @@
  	name = getenv("KCONFIG_AUTOHEADER");
  	if (!name)
  		name = "include/generated/autoconf.h";

From b3e3d5fc28b26291d48adad96e92e27c86183673 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 29 Oct 2013 21:54:00 +0100
Subject: [PATCH 6576/6849] toolchain-external: add missing symlink for Linaro
 toolchains

In 11ec38b6950 ("toolchain-external: fix Linaro ARM toolchain
support"), we fixed the support for Linaro EABIhf toolchains by adding
a /lib/arm-linux-gnueabihf -> /lib symbolic link. This is needed
because the dynamic loader looks for libraries in
/lib/arm-linux-gnueabihf rather than the usual /lib, but Buildroot
installs all libraries in /lib.

However, we forgot that the dynamic loader also loads libraries from
/usr/lib/arm-linux-gnueabihf rather than /usr/lib, so this patch fixes
that by adding the necessary symbolic link.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 toolchain/toolchain-external/toolchain-external.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index d658d4f745..668e9c33b8 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -229,10 +229,11 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
 endif
 
 # The Linaro ARMhf toolchain expects the libraries in
-# /lib/arm-linux-gnueabihf, but Buildroot copies them to /lib, so we
-# need to create a symbolic link.
+# {/usr,}/lib/arm-linux-gnueabihf, but Buildroot copies them to
+# {/usr,}/lib, so we need to create a symbolic link.
 define TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK
 	ln -sf . $(TARGET_DIR)/lib/arm-linux-gnueabihf
+	ln -sf . $(TARGET_DIR)/usr/lib/arm-linux-gnueabihf
 endef
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)

From 1e0b97d166ad7414081231148e82c53cd2950cc5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 29 Oct 2013 21:54:01 +0100
Subject: [PATCH 6577/6849] toolchain-external: fix visibility and length of
 Linaro toolchain comment

Maxime Ripard reported that the Linaro toolchains were not visible
when selecting a Cortex-A, but forgetting to set the EABI to
EABIhf. While this is expected, Buildroot should normally should a
comment in this case. However, the comment is only visible when the
selected ARM architecture is not ARMv7 *and* the EABI is not
EABIhf. Instead, make the comment visible when either the selected
architecture is not ARMv7 *or* when the selected EABI is not EABIhf.

While we're at it, reword the comment text so that it actually fits
within the limits of the menuconfig screen.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 toolchain/toolchain-external/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 646f918be2..7f9b40adce 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -66,10 +66,9 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
 
 	  To use this toolchain, you must disable soft float usage.
 
-comment "Linaro toolchains available for Cortex-A{5,7,8,9,15} and the EABIhf ABI"
+comment "Linaro toolchains available for Cortex-A + EABIhf"
 	depends on BR2_arm
-	depends on BR2_GCC_TARGET_ARCH != "armv7-a"
-	depends on !BR2_ARM_EABIHF
+	depends on BR2_GCC_TARGET_ARCH != "armv7-a" || !BR2_ARM_EABIHF
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	bool "Sourcery CodeBench ARM 2013.05"

From 934f8222f76407115a61014cde315514d56730ca Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 29 Oct 2013 21:54:02 +0100
Subject: [PATCH 6578/6849] glibc, toolchain-external: copy libthread_db when
 gdb is enabled

As Samuel Martin noticed, libthread_db is not only needed when
cross-gdb+gdbserver is used, but also when the native gdb is used on
the target. As a consequence, this patch modifies the glibc package
and the external toolchain logic to ensure that libthread_db is copied
to the target either when the native gdb or gdbserver is enabled, by
relying on the BR2_PACKAGE_GDB option, which is enabled when native
gdb and/or gdbserver are enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/glibc/glibc.mk                             | 2 +-
 toolchain/toolchain-external/toolchain-external.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 0dab4926a3..2e7fe82a82 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -116,7 +116,7 @@ GLIBC_LIBS_LIB = \
 	libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.*   \
 	libnss_files.so.* libnss_dns.so.*
 
-ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+ifeq ($(BR2_PACKAGE_GDB),y)
 GLIBC_LIBS_LIB += libthread_db.so.*
 endif
 
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 668e9c33b8..2722600511 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -63,7 +63,7 @@ LIB_EXTERNAL_LIBS+=ld*.so.*
 endif
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 LIB_EXTERNAL_LIBS+=libpthread.so.*
-ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
+ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
 LIB_EXTERNAL_LIBS+=libthread_db.so.*
 endif # gdbserver
 endif # ! no threads

From 9b0e9c83022deac95c85d8f7526b16e420f0b6c8 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Wed, 30 Oct 2013 22:39:52 +0100
Subject: [PATCH 6579/6849] trace-cmd: fix ptrace detection

Ptrace support detection is ignored when CFLAGS is set by
buildroot. Use override in Makefile to add -DWARN_NO_PTRACE and
-DNO_PTRACE in CFLAGS if ptrace is not available.

Fixes:
  http://autobuild.buildroot.net/results/60e/60ed317d52d93ba2c087aa6ff4f422d760806d89//

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../trace-cmd-0002-Fix-ptrace-detection.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch

diff --git a/package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch b/package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch
new file mode 100644
index 0000000000..b17d7df0d2
--- /dev/null
+++ b/package/trace-cmd/trace-cmd-0002-Fix-ptrace-detection.patch
@@ -0,0 +1,36 @@
+From 0070081ffe65a4fbe442044ddfcc818593c98e33 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Wed, 30 Oct 2013 22:35:34 +0100
+Subject: [PATCH] Fix ptrace detection
+
+Ptrace support detection is ignored when CFLAGS is set in command
+arguments. Use override in Makefile to add -DWARN_NO_PTRACE and
+-DNO_PTRACE in CFLAGS if ptrace is not available.
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 83329ca..01b4f45 100644
+--- a/Makefile
++++ b/Makefile
+@@ -223,12 +223,12 @@ LDFLAGS ?=
+ ifndef NO_PTRACE
+ ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
+ 	NO_PTRACE = 1
+-	CFLAGS += -DWARN_NO_PTRACE
++	override CFLAGS += -DWARN_NO_PTRACE
+ endif
+ endif
+ 
+ ifdef NO_PTRACE
+-CFLAGS += -DNO_PTRACE
++override CFLAGS += -DNO_PTRACE
+ endif
+ 
+ # Append required CFLAGS
+-- 
+1.8.1.2
+

From 339a4880821d8a574deb5f3c490411d9dd4a29e7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Oct 2013 16:03:31 -0300
Subject: [PATCH 6580/6849] cjson: link with libm, unavailable for static

Link with libm as stated in the README, fixes:
http://autobuild.buildroot.net/results/57f/57fc124e14263ee2447e20a5b910ed3ae0a5b7db/

Also disable the package for static builds since it doesn't work that
way.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cjson/Config.in | 2 ++
 package/cjson/cjson.mk  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/cjson/Config.in b/package/cjson/Config.in
index ff9007477a..fed61d76c7 100644
--- a/package/cjson/Config.in
+++ b/package/cjson/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_CJSON
 	bool "cJSON"
+	# For static build with cJSON.c directly see README
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C
 	  compliant JSON parser, under MIT license.
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 7e1d72df8c..2093b02d7a 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -12,7 +12,8 @@ CJSON_LICENSE         = MIT
 CJSON_LICENSE_FILES   = LICENSE
 
 define CJSON_BUILD_CMDS
-	cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC cJSON.c -o libcJSON.so
+	cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC -lm \
+		cJSON.c -o libcJSON.so
 endef
 
 define CJSON_INSTALL_STAGING_CMDS

From fd427bbabb4fff62d076db9e57bbd743fa54bf60 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Oct 2013 15:12:02 -0300
Subject: [PATCH 6581/6849] libcgroup: also needs host-flex

Fixes:
http://autobuild.buildroot.net/results/b43/b43ef442facd5aa136a77db99e57e02cc7e39a94/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libcgroup/libcgroup.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index 339deb3e8f..6d7ae54665 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -9,7 +9,7 @@ LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
 LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v.038
 LIBCGROUP_LICENSE = LGPLv2.1
 LIBCGROUP_LICENSE_FILES = COPYING
-LIBCGROUP_DEPENDENCIES = host-bison
+LIBCGROUP_DEPENDENCIES = host-bison host-flex
 LIBCGROUP_INSTALL_STAGING = YES
 
 # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h

From 9e7d7b3cd422affad5976a4013bcb8626a079491 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 30 Oct 2013 22:49:43 +0100
Subject: [PATCH 6582/6849] pkgconf: fix upstream URL

The upstream URL has changed to
http://rabbit.dereferenced.org/~nenolod/distfiles/, updated the
Buildroot pkgconf package accordingly.

Fixes #6638.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: <masrur.macece@gmail.com>
Cc: <masrur.macece@gmail.com>
---
 package/pkgconf/pkgconf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
index b489699071..3ff093f76e 100644
--- a/package/pkgconf/pkgconf.mk
+++ b/package/pkgconf/pkgconf.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PKGCONF_VERSION = 0.8.9
-PKGCONF_SITE = http://tortois.es/~nenolod/distfiles
+PKGCONF_SITE = http://rabbit.dereferenced.org/~nenolod/distfiles/
 PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
 PKGCONF_LICENSE = pkgconf license
 PKGCONF_LICENSE_FILES = COPYING

From 957a986214169a76c51e9f63a232b67f286889d8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 10:10:22 -0300
Subject: [PATCH 6583/6849] arch/Config.in: introduce BR2_KERNEL_64_USERLAND_32
 symbol

On some architectures one can be running a 64-bit kernel with a 32-bit
userland. Such is the case for sparc64 (unsupported) for example and
mips64 with n32 ABI.

Some tools that interface directly with the kernel need to be built
specially for this, so introduce this symbol to tweak their build in
one central kludge to be future-proof.

Example: bug #6602.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/Config.in      | 3 +++
 arch/Config.in.mips | 1 +
 2 files changed, 4 insertions(+)

diff --git a/arch/Config.in b/arch/Config.in
index 3fd8c1c790..bc81dac7a9 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -3,6 +3,9 @@ menu "Target options"
 config BR2_ARCH_IS_64
 	bool
 
+config BR2_KERNEL_64_USERLAND_32
+	bool
+
 config BR2_SOFT_FLOAT
 	bool
 
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 86fbe6458c..d70fd6366f 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -47,6 +47,7 @@ config BR2_MIPS_OABI32
 config BR2_MIPS_NABI32
 	bool "n32"
 	depends on BR2_ARCH_IS_64
+	select BR2_KERNEL_64_USERLAND_32
 config BR2_MIPS_NABI64
 	bool "n64"
 	depends on BR2_ARCH_IS_64

From e06fac395b2adc5b3062e92fd29b1902dacc200c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 25 Oct 2013 10:10:23 -0300
Subject: [PATCH 6584/6849] ebtables: build fix for 64-bit kernel with 32-bit
 userland

Fixes bug #6602.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/ebtables/ebtables.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index edb5d42b75..612cf83023 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -10,10 +10,11 @@ EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtab
 EBTABLES_LICENSE = GPLv2+
 EBTABLES_LICENSE_FILES = COPYING
 EBTABLES_STATIC = $(if $(BR2_PREFER_STATIC_LIB),static)
+EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),CFLAGS+="-DKERNEL_64_USERSPACE_32")
 
 define EBTABLES_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \
-		-C $(@D)
+		$(EBTABLES_K64U32) -C $(@D)
 endef
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

From 9c7bc3f3c0a02b55b88aa4277c29e86d40698370 Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Fri, 1 Nov 2013 13:59:01 +0200
Subject: [PATCH 6585/6849] util-linux: Add --without-ncurses to
 host-util-linux

Ncurses not necessary when building host-util-linux, so passing
--without-ncurses avoids from misdetecting an installed host ncurses
on the build machine.

[Thomas: improve commit message]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/util-linux/util-linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 4db1e524e5..a694f3d487 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -84,7 +84,7 @@ HOST_UTIL_LINUX_CONF_OPT += \
 	--disable-login --disable-mount --disable-partx \
 	--disable-pivot_root --disable-rename --disable-schedutils \
 	--disable-su --disable-switch_root --disable-unshare \
-	--disable-uuidd --disable-wall
+	--disable-uuidd --disable-wall --without-ncurses
 
 # Avoid building the tools if they are disabled since we can't install on
 # a per-directory basis.

From 90af4f16c5ce6c8c9584981bfbcbfcd3cef2cded Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 1 Nov 2013 10:54:27 -0300
Subject: [PATCH 6586/6849] strongswan: add security patches

Security patches to fix CVE-2013-5018, CVE-2013-6075 and CVE-2013-6076.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../strongswan-0003-CVE-2013-5018-fix.patch   | 29 +++++++++++++++++++
 .../strongswan-0004-CVE-2013-6075-fix.patch   | 27 +++++++++++++++++
 .../strongswan-0005-CVE-2013-6076-fix.patch   | 27 +++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 package/strongswan/strongswan-0003-CVE-2013-5018-fix.patch
 create mode 100644 package/strongswan/strongswan-0004-CVE-2013-6075-fix.patch
 create mode 100644 package/strongswan/strongswan-0005-CVE-2013-6076-fix.patch

diff --git a/package/strongswan/strongswan-0003-CVE-2013-5018-fix.patch b/package/strongswan/strongswan-0003-CVE-2013-5018-fix.patch
new file mode 100644
index 0000000000..e30ac31dfe
--- /dev/null
+++ b/package/strongswan/strongswan-0003-CVE-2013-5018-fix.patch
@@ -0,0 +1,29 @@
+From 057265e0183ddf52d56f21adaf0db0f3dc6585a4 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Mon, 29 Jul 2013 23:45:38 +0200
+Subject: [PATCH] asn1: Fix handling of invalid ASN.1 length in is_asn1()
+
+Fixes CVE-2013-5018.
+---
+ src/libstrongswan/asn1/asn1.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c
+index 68f37f4..d860ad9 100644
+--- a/src/libstrongswan/asn1/asn1.c
++++ b/src/libstrongswan/asn1/asn1.c
+@@ -642,6 +642,11 @@ bool is_asn1(chunk_t blob)
+ 
+ 	len = asn1_length(&blob);
+ 
++	if (len == ASN1_INVALID_LENGTH)
++	{
++		return FALSE;
++	}
++
+ 	/* exact match */
+ 	if (len == blob.len)
+ 	{
+-- 
+1.7.10.4
+
diff --git a/package/strongswan/strongswan-0004-CVE-2013-6075-fix.patch b/package/strongswan/strongswan-0004-CVE-2013-6075-fix.patch
new file mode 100644
index 0000000000..d50616a60c
--- /dev/null
+++ b/package/strongswan/strongswan-0004-CVE-2013-6075-fix.patch
@@ -0,0 +1,27 @@
+From aa277adfc204b6bda2c3792710138f9a8723a8f1 Mon Sep 17 00:00:00 2001
+From: Martin Willi <martin@revosec.ch>
+Date: Mon, 7 Oct 2013 14:21:57 +0200
+Subject: [PATCH] identification: Properly check length before comparing for
+ binary DN equality
+
+Fixes CVE-2013-6075.
+---
+ src/libstrongswan/utils/identification.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
+index 5df3e5f..9c43ad5 100644
+--- a/src/libstrongswan/utils/identification.c
++++ b/src/libstrongswan/utils/identification.c
+@@ -602,7 +602,7 @@ static bool compare_dn(chunk_t t_dn, chunk_t o_dn, int *wc)
+ 		}
+ 	}
+ 	/* try a binary compare */
+-	if (memeq(t_dn.ptr, o_dn.ptr, t_dn.len))
++	if (chunk_equals(t_dn, o_dn))
+ 	{
+ 		return TRUE;
+ 	}
+-- 
+1.8.1.2
+
diff --git a/package/strongswan/strongswan-0005-CVE-2013-6076-fix.patch b/package/strongswan/strongswan-0005-CVE-2013-6076-fix.patch
new file mode 100644
index 0000000000..51f0ae37d2
--- /dev/null
+++ b/package/strongswan/strongswan-0005-CVE-2013-6076-fix.patch
@@ -0,0 +1,27 @@
+From d8867a8452eece3fffab29605f48e6bed47c42d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Volker=20R=C3=BCmelin?= <vr_strongswan@t-online.de>
+Date: Fri, 11 Oct 2013 09:38:24 +0200
+Subject: [PATCH] ikev1: Properly initialize list of fragments in case fragment
+ ID is 0
+
+Fixes CVE-2013-6076.
+---
+ src/libcharon/sa/ikev1/task_manager_v1.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
+index 6d4ef14..597416e 100644
+--- a/src/libcharon/sa/ikev1/task_manager_v1.c
++++ b/src/libcharon/sa/ikev1/task_manager_v1.c
+@@ -1273,7 +1273,7 @@ static status_t handle_fragment(private_task_manager_t *this, message_t *msg)
+ 		return FAILED;
+ 	}
+ 
+-	if (this->frag.id != payload->get_id(payload))
++	if (!this->frag.list || this->frag.id != payload->get_id(payload))
+ 	{
+ 		clear_fragments(this, payload->get_id(payload));
+ 		this->frag.list = linked_list_create();
+-- 
+1.8.1.2
+

From d6a44b2f0a2f9cedf08a44703054d3993ae1843d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 31 Oct 2013 13:02:39 +0100
Subject: [PATCH 6587/6849] Config.in files: add/update comments on (e)glibc
 dependencies

This patch adds missing comments about (e)glibc dependencies and updates the
text of existing comments.

Additionally, it splits dependency expressions for the touched packages from
  depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC
to
  depends on BR2_BASE_DEP
  depends on !BR2_TOOLCHAIN_USES_GLIBC
so that (positive) base dependencies are separate from the (negative)
toolchain dependencies. This strategy makes it easier to write such comments
(because one can simply copy the base dependency from the actual package
config option), but also avoids complex and long boolean expressions.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cppcms/Config.in                         | 2 +-
 package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 2 +-
 package/gstreamer/gst-plugin-x170/Config.in      | 5 +++--
 package/libv4l/Config.in                         | 4 ++--
 package/nss-mdns/Config.in                       | 4 ++++
 package/on2-8170-libs/Config.in                  | 5 +++--
 package/sunxi-cedarx/Config.in                   | 8 +++++---
 package/sunxi-mali/Config.in                     | 5 +++--
 package/ti-gfx/Config.in                         | 5 +++--
 9 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index 4074711b08..11daf7cdfe 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -28,5 +28,5 @@ config BR2_PACKAGE_CPPCMS_ICU
 	  Using ICU allows advanced localization features into CppCMS,
 	  in another hand ICU is heavier than iconv.
 
-comment "cppcms needs a glibc toolchain w/ C++"
+comment "cppcms needs an (e)glibc toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index a3c205761e..1a6e245920 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -1,4 +1,4 @@
-comment "gpu-viv-bin-mx6q requires a glibc toolchain"
+comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
diff --git a/package/gstreamer/gst-plugin-x170/Config.in b/package/gstreamer/gst-plugin-x170/Config.in
index 142367b128..d7fe96a49a 100644
--- a/package/gstreamer/gst-plugin-x170/Config.in
+++ b/package/gstreamer/gst-plugin-x170/Config.in
@@ -11,5 +11,6 @@ config BR2_PACKAGE_GST_PLUGIN_X170
 
 	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 
-comment "gst-plugin-x170 requires a toolchain which uses eglibc/glibc"
-	depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t && !BR2_TOOLCHAIN_USES_GLIBC
+comment "gst-plugin-x170 needs an (e)glibc toolchain"
+	depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index c3c4481cad..9dc8cddab4 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBV4L_DECODE_TM6000
 	help
 	  Tool to decode tm6000 proprietary format streams
 
-comment "decode_tm6000 requires a GLIBC based toolchain"
+comment "decode_tm6000 needs an (e)glibc toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
@@ -26,7 +26,7 @@ config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
 	help
 	  Tool to alter keymaps of Remote Controller devices
 
-comment "ir-keytable requires a GLIBC based toolchain"
+comment "ir-keytable needs an (e)glibc toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
diff --git a/package/nss-mdns/Config.in b/package/nss-mdns/Config.in
index b537fa576f..0192cc2862 100644
--- a/package/nss-mdns/Config.in
+++ b/package/nss-mdns/Config.in
@@ -13,3 +13,7 @@ config BR2_PACKAGE_NSS_MDNS
 	  mDNS domain .local.
 
 	  http://0pointer.de/lennart/projects/nss-mdns/
+
+comment "nss-mdns needs an (e)glibc toolchain"
+	depends on BR2_USE_MMU && BR2_PACKAGE_AVAHI_DAEMON
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/on2-8170-libs/Config.in b/package/on2-8170-libs/Config.in
index 8c2d963810..b573cfe3de 100644
--- a/package/on2-8170-libs/Config.in
+++ b/package/on2-8170-libs/Config.in
@@ -10,5 +10,6 @@ config BR2_PACKAGE_ON2_8170_LIBS
 
 	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 
-comment "on2-8170 libs requires a linux kernel to be built"
-	depends on !BR2_LINUX_KERNEL
+comment "on2-8170-libs needs an (e)glibc toolchain and a linux kernel to be built"
+	depends on BR2_arm926t
+	depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/sunxi-cedarx/Config.in b/package/sunxi-cedarx/Config.in
index b280db0658..fc6e5298c3 100644
--- a/package/sunxi-cedarx/Config.in
+++ b/package/sunxi-cedarx/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SUNXI_CEDARX
 	bool "sunxi-cedarx"
-	depends on BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
+	depends on BR2_arm
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Sunxi CedarX decoder libraries. CedarX is Allwinner's
 	  multimedia co-processing technology for hardware accelerated
@@ -10,5 +11,6 @@ config BR2_PACKAGE_SUNXI_CEDARX
 	  http://github.com/linux-sunxi/cedarx-libs
 	  http://linux-sunxi.org/CedarX
 
-comment "sunxi-cedarx requires an eglibc/glibc based toolchain"
-	depends on !BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
+comment "sunxi-cedarx needs an (e)glibc toolchain"
+	depends on BR2_arm
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in
index c479cf4be8..2ca049db6c 100644
--- a/package/sunxi-mali/Config.in
+++ b/package/sunxi-mali/Config.in
@@ -57,5 +57,6 @@ endchoice
 
 endif
 
-comment "sunxi-mali requires an eglibc/glibc based toolchain"
-	depends on BR2_arm && !BR2_TOOLCHAIN_USES_GLIBC
+comment "sunxi-mali needs an (e)glibc toolchain"
+	depends on BR2_arm
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
index f336c52aad..9387b576fe 100644
--- a/package/ti-gfx/Config.in
+++ b/package/ti-gfx/Config.in
@@ -60,5 +60,6 @@ endchoice
 
 endif
 
-comment "ti-gfx requires an eglibc/glibc based toolchain and the linux kernel"
-	depends on !(BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC) && BR2_arm
+comment "ti-gfx needs an (e)glibc toolchain and the linux kernel"
+	depends on BR2_arm
+	depends on !(BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC)

From 77de13ba5525f4efbfed6e3f30ab5e4b18ca3980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= <rebillout@syscom.ch>
Date: Thu, 31 Oct 2013 11:39:48 +0100
Subject: [PATCH 6588/6849] uemacs: fix package source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is no bz2 archive for uemacs on kernel.org, only a gz archive.

Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uemacs/uemacs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 94520621db..0cd38e051b 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 UEMACS_VERSION = 4.0.15-lt
-UEMACS_SOURCE = em-$(UEMACS_VERSION).tar.bz2
+UEMACS_SOURCE = em-$(UEMACS_VERSION).tar.gz
 UEMACS_SITE = $(BR2_KERNEL_MIRROR)/software/editors/uemacs/
 UEMACS_DEPENDENCIES = ncurses
 

From 344fc7aa0d9879a051753b972a587aed59a180c2 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 30 Oct 2013 23:41:45 +0100
Subject: [PATCH 6589/6849] xenomai: use install-user to remove patch

As noted by "George" in bug #6416, the xenomai-do-not-install-devices
patch is not needed, since Xenomai provides a "install-user" target to
only install the libraries/headers and not the device files. This
patch changes xenomai.mk to use 'install-user' and removes the useless
patch.

Fixes bug #6416.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/xenomai/xenomai-do-not-install-devices.patch | 11 -----------
 package/xenomai/xenomai.mk                           |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 package/xenomai/xenomai-do-not-install-devices.patch

diff --git a/package/xenomai/xenomai-do-not-install-devices.patch b/package/xenomai/xenomai-do-not-install-devices.patch
deleted file mode 100644
index 348abee4b1..0000000000
--- a/package/xenomai/xenomai-do-not-install-devices.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2011-06-24 16:11:23.591449817 +0200
-+++ b/Makefile.in	2011-06-24 16:20:29.638129633 +0200
-@@ -719,7 +719,7 @@
- 	  $$sudo mknod -m 666 $(DESTDIR)/dev/rtheap c 10 254 ; \
- 	fi
- 
--install-exec-local: devices
-+install-exec-local:
- 
- install-user:
- 	$(MAKE) SUDO=false install
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index f10dec0c93..786bdfd211 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -16,6 +16,8 @@ XENOMAI_LICENSE = headers: GPLv2+ with exception, libraries: LGPLv2.1+, kernel:
 XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
 
 XENOMAI_INSTALL_STAGING = YES
+XENOMAI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-user
+XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
 
 XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
 

From 21ef3200ef9bda514f5bebe706e9768d213836ff Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Wed, 30 Oct 2013 17:55:32 -0500
Subject: [PATCH 6590/6849] sysvinit: install new cmds and fix inittab

Adding support for sysvinit to install reboot, poweroff, and pidof
commands available in /sbin.

Fixes bug #6620

Removed uninstall commands since they aren't used.

There is an error with sysvinit that will prevent the system from booting
if "dshm::sysinit:/bin/mkdir -p /dev/shm" is not present in the inittab.

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sysvinit/inittab     |  1 +
 package/sysvinit/sysvinit.mk | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab
index afa0dc35c9..c85e75a045 100644
--- a/package/sysvinit/inittab
+++ b/package/sysvinit/inittab
@@ -7,6 +7,7 @@ id:1:initdefault:
 proc::sysinit:/bin/mount -t proc proc /proc
 rwmo::sysinit:/bin/mount -o remount,rw / # REMOUNT_ROOTFS_RW
 dpts::sysinit:/bin/mkdir -p /dev/pts
+dshm::sysinit:/bin/mkdir -p /dev/shm
 moun::sysinit:/bin/mount -a
 host::sysinit:/bin/hostname -F /etc/hostname
 init::sysinit:/etc/init.d/rcS
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 131c63fa3a..07bfc6fddf 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -31,18 +31,15 @@ define SYSVINIT_BUILD_CMDS
 endef
 
 define SYSVINIT_INSTALL_TARGET_CMDS
-	for x in halt init shutdown; do \
+	for x in halt init shutdown killall5; do \
 		install -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \
 	done
 	# Override Busybox's inittab with an inittab compatible with
 	# sysvinit
 	install -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab
-endef
-
-define SYSVINIT_UNINSTALL_TARGET_CMDS
-	for x in halt init shutdown; do \
-		rm -f $(TARGET_DIR)/sbin/$$x || exit 1; \
-	done
+	ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot
+	ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff
+	ln -sf killall5 $(TARGET_DIR)/sbin/pidof
 endef
 
 define SYSVINIT_CLEAN_CMDS

From a2ffd684924880f3a59d2ed875afb8cc8d2ed823 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Mon, 21 Oct 2013 13:53:02 +0800
Subject: [PATCH 6591/6849] cppzmq/czmq: Update comment for needs threads
 support

Comment 7e37d235f "zeromq: needs threads" adds BR2_TOOLCHAIN_HAS_THREADS
dependency but forgot to add corresponding comment for cppzmq and czmq. Fix it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cppzmq/Config.in | 2 +-
 package/czmq/Config.in   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in
index 9629383f2d..e17963ecf2 100644
--- a/package/cppzmq/Config.in
+++ b/package/cppzmq/Config.in
@@ -11,6 +11,6 @@ config BR2_PACKAGE_CPPZMQ
 
 	  http://github.com/zeromq/cppzmq
 
-comment "cppzmq needs a toolchain w/ C++, IPv6, largefile, wchar"
+comment "cppzmq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index 9ba5e65c3f..d442293681 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -15,6 +15,6 @@ config BR2_PACKAGE_CZMQ
 
 	  http://czmq.zeromq.org/
 
-comment "czmq needs a toolchain w/ C++, IPv6, largefile, wchar"
+comment "czmq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

From 6fb84874b2545d25fdb85b4b2a0a5c8fac1c6305 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Fri, 18 Oct 2013 22:31:25 +0200
Subject: [PATCH 6592/6849] manual generation: check dependencies first

To generate the manual, you need a few tools. If these are not present,
pretty cryptic error messages are given.
This patch adds a simple check for these dependencies, before attempting to
build the manual.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/make-tips.txt                   |  3 +-
 docs/manual/manual.mk                       | 32 +++++++++++++++++-
 docs/manual/prerequisite.txt                |  5 ++-
 support/dependencies/check-host-asciidoc.sh | 36 +++++++++++++++++++++
 4 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100755 support/dependencies/check-host-asciidoc.sh

diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt
index 31a88bf0b0..0159ffe7ce 100644
--- a/docs/manual/make-tips.txt
+++ b/docs/manual/make-tips.txt
@@ -64,9 +64,8 @@ To generate the manual:
 The manual outputs will be generated in 'output/docs/manual'.
 
 .Notes
-- +asciidoc+ is required to build the documentation (see:
+- A few tools are required to build the documentation (see:
   xref:requirement-optional[]).
-- There is a known issue that you can't build it under Debian Squeeze.
 
 .Reseting Buildroot for a new target:
 
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index d092d3fcfd..fcfe47be70 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -1,8 +1,34 @@
-manual-update-lists:
+manual-update-lists: manual-check-dependencies-lists
 	$(Q)$(call MESSAGE,"Updating the manual lists...")
 	$(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(O)/docs/manual/.build \
 		$(TOPDIR)/support/scripts/gen-manual-lists.py
 
+# we can't use suitable-host-package here because that's not available in
+# the context of 'make release'
+manual-check-dependencies:
+	$(Q)if [ -z "$(shell support/dependencies/check-host-asciidoc.sh)" ]; then \
+		echo "You need a sufficiently recent asciidoc on your host" \
+			"to generate the manual"; \
+		exit 1; \
+	fi
+	$(Q)if [ -z "`which w3m 2>/dev/null`" ]; then \
+		echo "You need w3m on your host to generate the manual"; \
+		exit 1; \
+	fi
+
+manual-check-dependencies-pdf:
+	$(Q)if [ -z "`which dblatex 2>/dev/null`" ]; then \
+		echo "You need dblatex on your host to generate the pdf manual"; \
+		exit 1; \
+	fi
+
+manual-check-dependencies-lists:
+	$(Q)if ! python -c "import argparse" >/dev/null 2>&1 ; then \
+		echo "You need python with argparse on your host to generate" \
+			"the list of packages in the manual"; \
+		exit 1; \
+	fi
+
 ################################################################################
 # GENDOC -- generates the make targets needed to build a specific type of
 #           asciidoc documentation.
@@ -22,8 +48,12 @@ $(1): $(1)-$(3)
 .PHONY: $(1)-$(3)
 $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
 
+manual-check-dependencies-$(3):
+
 $$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt \
 			   $$($(call UPPERCASE,$(1))_SOURCES) \
+			   manual-check-dependencies \
+			   manual-check-dependencies-$(3) \
 			   manual-update-lists
 	$(Q)$(call MESSAGE,"Generating $(5) $(1)...")
 	$(Q)mkdir -p $$(@D)/.build
diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 78ce4364e7..729d64c04e 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -76,4 +76,7 @@ development context (further details: refer to xref:download-infra[]).
 ** The +jar+ tool
 
 * Documentation generation tools:
-** +asciidoc+
+** +asciidoc+, version 8.6.3 or higher
+** +w3m+
+** +python+ with the +argparse+ module (automatically present in 2.7+ and 3.2+)
+** +dblatex+ (required for the pdf manual only)
diff --git a/support/dependencies/check-host-asciidoc.sh b/support/dependencies/check-host-asciidoc.sh
new file mode 100755
index 0000000000..fc5fcba443
--- /dev/null
+++ b/support/dependencies/check-host-asciidoc.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+candidate="$1" #ignored
+
+asciidoc=`which asciidoc`
+if [ ! -x "$asciidoc" ]; then
+	# echo nothing: no suitable asciidoc found
+	exit 1
+fi
+
+# Output of 'asciidoc --version' examples:
+# asciidoc 8.6.7
+version=`$asciidoc --version | cut -d\  -f2`
+major=`echo "$version" | cut -d. -f1`
+minor=`echo "$version" | cut -d. -f2`
+bugfix=`echo "$version" | cut -d. -f3`
+
+# To generate the manual, we need asciidoc >= 8.6.3
+major_min=8
+minor_min=6
+bugfix_min=3
+if [ $major -gt $major_min ]; then
+	echo $asciidoc
+else
+	if [ $major -eq $major_min -a $minor -ge $minor_min ]; then
+		echo $asciidoc
+	else
+		if [ $major -eq $major_min -a $minor -eq $minor_min \
+			-a $bugfix -ge $bugfix_min ]; then
+			echo $asciidoc
+		else
+			# echo nothing: no suitable asciidoc found
+			exit 1
+		fi
+	fi
+fi

From 462e9915fd8115419654e43473591a0af625229c Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Fri, 18 Oct 2013 22:31:26 +0200
Subject: [PATCH 6593/6849] manual generation: rename manual-txt into
 manual-text

The output extension and the generation messages refer to 'text', but the make
target was confusingly 'txt'. This patch changes the make target for
consistency.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 Makefile              | 4 ++--
 docs/manual/manual.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f266e2dd77..1496bd74fc 100644
--- a/Makefile
+++ b/Makefile
@@ -797,7 +797,7 @@ endif
 	@echo '  manual-html            - build manual in HTML'
 	@echo '  manual-split-html      - build manual in split HTML'
 	@echo '  manual-pdf             - build manual in PDF'
-	@echo '  manual-txt             - build manual in txt'
+	@echo '  manual-text            - build manual in text'
 	@echo '  manual-epub            - build manual in ePub'
 	@echo
 	@echo 'Miscellaneous:'
@@ -821,7 +821,7 @@ release: OUT=buildroot-$(BR2_VERSION)
 # documentation to the git output
 release:
 	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
-	$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
+	$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
 	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index fcfe47be70..aeafd10d7a 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -75,7 +75,7 @@ define GENDOC
 $(call GENDOC_INNER,$(1),xhtml,html,html,HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
 $(call GENDOC_INNER,$(1),chunked,split-html,chunked,split HTML,--xsltproc-opts "--stringparam toc.section.depth 4")
 $(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
-$(call GENDOC_INNER,$(1),text,txt,text,text)
+$(call GENDOC_INNER,$(1),text,text,text,text)
 $(call GENDOC_INNER,$(1),epub,epub,epub,ePUB)
 clean: $(1)-clean
 $(1)-clean:

From 67feb0e7593af124088f8b4886da4e50cbfa8168 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 18 Oct 2013 22:31:27 +0200
Subject: [PATCH 6594/6849] support: trivial fixes (typos and minor rewording)
 in gen-manual-lists.py

[Thomas: added Thomas DS Acked-by, given at
http://patchwork.ozlabs.org/patch/284719/, and made the additional
typo fixes suggested by Thomas DS.]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 support/scripts/gen-manual-lists.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py
index 35688430e6..4546e07656 100755
--- a/support/scripts/gen-manual-lists.py
+++ b/support/scripts/gen-manual-lists.py
@@ -88,7 +88,7 @@ def get_symbol_subset(root, filter_func):
 
 
 def get_symbol_parents(item, root=None, enable_choice=False):
-    """ Return the list of the item's parents. The lasst item of the list is
+    """ Return the list of the item's parents. The last item of the list is
     the closest parent, the first the furthest.
 
     :param item:          Item from which the the parent list is generated
@@ -107,7 +107,7 @@ def get_symbol_parents(item, root=None, enable_choice=False):
         parent = parent.get_parent()
     if isinstance(root, kconfiglib.Menu) or \
             (enable_choice and isinstance(root, kconfiglib.Choice)):
-        parents.append("") # Dummy empty parrent to get a leading arrow ->
+        parents.append("") # Dummy empty parent to get a leading arrow ->
     parents.reverse()
     return parents
 
@@ -126,15 +126,14 @@ def format_asciidoc_table(root, get_label_func, filter_func=lambda x: True,
     :param sub_menu:       Output the column with the sub-menu path
 
     """
-    def _format_entry(label, parents, sub_menu):
+    def _format_entry(item, parents, sub_menu):
         """ Format an asciidoc table entry.
 
         """
         if sub_menu:
-            return "| {0:<40} <| {1}\n".format(label, " -> ".join(parents))
+            return "| {0:<40} <| {1}\n".format(item, " -> ".join(parents))
         else:
-            return "| {0:<40}\n".format(label)
-
+            return "| {0:<40}\n".format(item)
     lines = []
     for item in get_symbol_subset(root, filter_func):
         if not item.is_symbol() or not item.prompts:
@@ -264,9 +263,9 @@ def _is_package(self, symbol):
         # Implementation details:
         #
         # * The package list is generated from the *.mk file existence, the
-        #   first time this function is called. Despite the memory consumtion,
+        #   first time this function is called. Despite the memory consumption,
         #   this list is stored because the execution time of this script is
-        #   noticebly shorter than re-scannig the package sub-tree for each
+        #   noticeably shorter than rescanning the package sub-tree for each
         #   symbol.
         if not hasattr(self, "_package_list"):
             pkg_list = []

From 1e4d9eb2d337341690fced3316ff8c81bd8df564 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 18 Oct 2013 22:31:29 +0200
Subject: [PATCH 6595/6849] manual: developer-guide.txt: cleanup non-existing
 source

[Thomas: Added ThomasDS Acked-by, which was given on an earlier
version of the same patch.]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 docs/manual/developer-guide.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt
index 43272f5676..8125ad5ca3 100644
--- a/docs/manual/developer-guide.txt
+++ b/docs/manual/developer-guide.txt
@@ -11,5 +11,3 @@ include::adding-packages.txt[]
 include::patch-policy.txt[]
 
 include::download-infra.txt[]
-
-include::board-support.txt[]

From ee1565bf36f42781dfc7d42df8bd1445b4202a2f Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 18 Oct 2013 22:31:34 +0200
Subject: [PATCH 6596/6849] manual: customize-toolchain.txt: update internal
 backend section

Mention all supported C libraries by the internal Buildroot toolchain
backend.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/customize-toolchain.txt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt
index 841dbfd0c4..31c9140433 100644
--- a/docs/manual/customize-toolchain.txt
+++ b/docs/manual/customize-toolchain.txt
@@ -31,14 +31,19 @@ set the environment variable BR_DEBUG_WRAPPER to either one of:
 Using the internal Buildroot toolchain backend
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The internal Buildroot toolchain backend *only* allows to generate
-*http://www.uclibc.org/[uClibc]-based toolchains*.
+The internal Buildroot toolchain backend allows to generate toolchains
+based on http://www.uclibc.org/[uClibc],
+https://www.gnu.org/software/libc/[glibc] and
+http://www.eglibc.org/[eglibc].
+Generation of (e)glibc-based toolchains is still experimental in
+Buildroot.
 
-However, it allows to tune major settings, such as:
+It allows to tune major settings, such as:
 
 * Linux headers version;
 
-* http://www.uclibc.org/[uClibc] configuration (see xref:uclibc-custom[uClibc]);
+* C library configuration (only available for
+  http://www.uclibc.org/[uClibc], see xref:uclibc-custom[uClibc]);
 
 * Binutils, GCC, Gdb and toolchain options.
 

From 6eac08192d8dceaba992d11d8874ea3af93011b5 Mon Sep 17 00:00:00 2001
From: Denis Mingulov <denis@mingulov.com>
Date: Wed, 16 Oct 2013 16:13:37 +0300
Subject: [PATCH 6597/6849] rsync: use system zlib and popt, also do not lose
 debug options

rsync by default compiles statically its own zlib and popt
libraries, it is better to use system wide libraries instead -
both for disk and memory consumption. Change rsync package
accordingly.

Also previously a debug configure option has been lost, as
overwritten by '--with-included-popt' option - fixed.

For example, on ARMv5 rsync binary size is reduced by about 25%.

Signed-off-by: Denis Mingulov <denis@mingulov.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/rsync/Config.in | 2 ++
 package/rsync/rsync.mk  | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/rsync/Config.in b/package/rsync/Config.in
index be95a7cacd..b952974efb 100644
--- a/package/rsync/Config.in
+++ b/package/rsync/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_RSYNC
 	bool "rsync"
 	# fork()
 	depends on BR2_USE_MMU
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_POPT
 	help
 	  File transfer program to keep remote files in sync.
 
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index d8e5f3f394..35f128c97e 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -8,7 +8,10 @@ RSYNC_VERSION = 3.1.0
 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
 RSYNC_LICENSE = GPLv3+
 RSYNC_LICENSE_FILES = COPYING
-RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
-RSYNC_CONF_OPT = --with-included-popt
+RSYNC_DEPENDENCIES = zlib popt
+RSYNC_CONF_OPT = \
+	$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
+	--with-included-zlib=no \
+	--with-included-popt=no
 
 $(eval $(autotools-package))

From 4feba5d62b8bd60732f28bfb43297c395eedd3c2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 22 Oct 2013 13:46:40 -0300
Subject: [PATCH 6598/6849] uboot-tools: fix license issues

Fix license directory and filename change, fixes:
http://autobuild.buildroot.net/results/8c9/8c94c81fe74399c854de335329cf4942f8356fbe/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uboot-tools/uboot-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index e19372a3d5..73e1d327d4 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -8,7 +8,7 @@ UBOOT_TOOLS_VERSION = 2013.10
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+
-UBOOT_TOOLS_LICENSE_FILES = COPYING
+UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
 
 define UBOOT_TOOLS_BUILD_CMDS
 	$(MAKE) -C $(@D) 			\

From 1ae1f276066baf24ab85a4b05571c776b52cf16a Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Sat, 2 Nov 2013 15:57:27 +0100
Subject: [PATCH 6599/6849] manual: github commits should be specified in full

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 docs/manual/adding-packages-tips.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 8b27c619a2..00244fe7b2 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -44,14 +44,13 @@ However, it is possible to download tarballs directly from the repository
 on github.
 
 ------------------------
-FOO_VERSION = v1.0 # tag or (abbreviated) commit ID
+FOO_VERSION = v1.0 # tag or full commit ID
 FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
 ------------------------
 
 .Notes
 - The FOO_VERSION can either be a tag or a commit ID.
 - The tarball name generated by github matches the default one from
-  Buildroot (e.g.: +foo-1234567.tar.gz+),
+  Buildroot (e.g.: +foo-f6fb6654af62045239caed5950bc6c7971965e60.tar.gz+),
   so it is not necessary to specify it in the +.mk+ file.
-- When using a commit ID as version, usually the first 7 characters of
-  the SHA1 are enough.
+- When using a commit ID as version, you should use the full 40 hex characters.

From e6ea6b78658b4c8bdf51c5bc45547065ae27f17b Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Sat, 2 Nov 2013 15:57:28 +0100
Subject: [PATCH 6600/6849] git packages: use full revision hash

There is no benefit in using the shortened git revision hash. On the
contrary: the shorter the hash, the higher the risk of having collisions
with another commit.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/a10disp/a10disp.mk                       | 2 +-
 package/cppzmq/cppzmq.mk                         | 2 +-
 package/czmq/czmq.mk                             | 2 +-
 package/filemq/filemq.mk                         | 2 +-
 package/jsmin/jsmin.mk                           | 2 +-
 package/knock/knock.mk                           | 2 +-
 package/libnfc/libnfc.mk                         | 2 +-
 package/linenoise/linenoise.mk                   | 2 +-
 package/lua-ev/lua-ev.mk                         | 2 +-
 package/lua-msgpack-native/lua-msgpack-native.mk | 2 +-
 package/luaexpatutils/luaexpatutils.mk           | 2 +-
 package/mtdev2tuio/mtdev2tuio.mk                 | 2 +-
 package/ne10/ne10.mk                             | 2 +-
 package/omap-u-boot-utils/omap-u-boot-utils.mk   | 2 +-
 package/on2-8170-modules/on2-8170-modules.mk     | 2 +-
 package/qextserialport/qextserialport.mk         | 2 +-
 package/qtuio/qtuio.mk                           | 2 +-
 package/rpi-firmware/rpi-firmware.mk             | 2 +-
 package/rpi-userland/rpi-userland.mk             | 2 +-
 package/socketcand/socketcand.mk                 | 2 +-
 package/sunxi-cedarx/sunxi-cedarx.mk             | 2 +-
 package/sunxi-mali-prop/sunxi-mali-prop.mk       | 2 +-
 package/sunxi-mali/sunxi-mali.mk                 | 2 +-
 package/ti-utils/ti-utils.mk                     | 2 +-
 package/tvheadend/tvheadend.mk                   | 2 +-
 package/zmqpp/zmqpp.mk                           | 2 +-
 package/zyre/zyre.mk                             | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/package/a10disp/a10disp.mk b/package/a10disp/a10disp.mk
index fee4ac7a92..486db44a90 100644
--- a/package/a10disp/a10disp.mk
+++ b/package/a10disp/a10disp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-A10DISP_VERSION = a899cc6dcf
+A10DISP_VERSION = a899cc6dcf909360aac00482ede5369f3656f226
 A10DISP_SITE = http://github.com/hglm/a10disp/tarball/$(A10DISP_VERSION)
 A10DISP_LICENSE = MIT
 
diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk
index 267a5d8af9..19c5944bb2 100644
--- a/package/cppzmq/cppzmq.mk
+++ b/package/cppzmq/cppzmq.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CPPZMQ_VERSION = b232978
+CPPZMQ_VERSION = b23297800389149ac37f19b7215fa4734d344998
 CPPZMQ_SITE = git://github.com/zeromq/cppzmq.git
 CPPZMQ_INSTALL_STAGING = YES
 CPPZMQ_DEPENDENCIES = zeromq
diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
index c0f97ba909..da68790e83 100644
--- a/package/czmq/czmq.mk
+++ b/package/czmq/czmq.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CZMQ_VERSION = cb9839cf90
+CZMQ_VERSION = cb9839cf90e4ac69acb7c6ff2b4e2d42d704cf6e
 CZMQ_SITE = git://github.com/zeromq/czmq.git
 
 # Autoreconf required as we use the git tree
diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk
index ace0ca4bd8..6f55573fc8 100644
--- a/package/filemq/filemq.mk
+++ b/package/filemq/filemq.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FILEMQ_VERSION = 8fac5140dd
+FILEMQ_VERSION = 8fac5140ddbca3c4742016795fbbf1d6579902f3
 FILEMQ_SITE = git://github.com/zeromq/filemq.git
 
 FILEMQ_AUTORECONF = YES
diff --git a/package/jsmin/jsmin.mk b/package/jsmin/jsmin.mk
index d51191111a..2d18187e96 100644
--- a/package/jsmin/jsmin.mk
+++ b/package/jsmin/jsmin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JSMIN_VERSION = a9b4755
+JSMIN_VERSION = a9b47554d5684a55301a2eb7ca8480b7ee7630d4
 JSMIN_SITE = http://github.com/douglascrockford/JSMin/tarball/$(JSMIN_VERSION)
 
 define JSMIN_BUILD_CMDS
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
index 8469b4fe72..5fcf414538 100644
--- a/package/knock/knock.mk
+++ b/package/knock/knock.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KNOCK_VERSION = 7666f2e86e
+KNOCK_VERSION = 7666f2e86e18d482eaad5fe1fea46d87d80b0555
 KNOCK_SITE = https://github.com/jvinet/knock/tarball/master
 KNOCK_LICENSE = GPLv2+
 KNOCK_LICENSE_FILES = COPYING
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index 25306680df..50bfcd5fe4 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNFC_VERSION = fda8d60ce062
+LIBNFC_VERSION = fda8d60ce062409bb32c76a229f02f7502948ce8
 LIBNFC_SITE = http://libnfc.googlecode.com/git/
 LIBNFC_SITE_METHOD = git
 LIBNFC_LICENSE = LGPLv3+
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 14e0f09322..a8ea1f63fe 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINENOISE_VERSION = 27a3b4d5
+LINENOISE_VERSION = 27a3b4d5205a5fb3e2101128edd6653bd0c92189
 LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/$(LINENOISE_VERSION)
 LINENOISE_LICENSE = BSD-2c
 LINENOISE_INSTALL_STAGING = YES
diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk
index 2b03936c2d..0beece46b0 100644
--- a/package/lua-ev/lua-ev.mk
+++ b/package/lua-ev/lua-ev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_EV_VERSION = 458165b
+LUA_EV_VERSION = 458165bdfe0c6eadc788813925f11a0e6a823845
 LUA_EV_SITE = http://github.com/brimworks/lua-ev/tarball/$(LUA_EV_VERSION)
 LUA_EV_DEPENDENCIES = lua libev
 LUA_EV_LICENSE = MIT
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 6ec923ce2c..9065916375 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_MSGPACK_NATIVE_VERSION = 41cce91
+LUA_MSGPACK_NATIVE_VERSION = 41cce91ab6b54e4426c6d626a0ac41a02ec2096d
 LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/$(LUA_MSGPACK_NATIVE_VERSION)
 LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
 LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0
diff --git a/package/luaexpatutils/luaexpatutils.mk b/package/luaexpatutils/luaexpatutils.mk
index 7ce7fc5d70..391031b9c1 100644
--- a/package/luaexpatutils/luaexpatutils.mk
+++ b/package/luaexpatutils/luaexpatutils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUAEXPATUTILS_VERSION = 88c228365b
+LUAEXPATUTILS_VERSION = 88c228365b084224c911d34aff06002634b38b50
 LUAEXPATUTILS_SITE = http://github.com/stevedonovan/LuaExpatUtils/tarball/$(LUAEXPATUTILS_VERSION)
 LUAEXPATUTILS_LICENSE = Public Domain
 LUAEXPATUTILS_DEPENDENCIES = luaexpat
diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
index c78e373a94..ff56ee7ac5 100644
--- a/package/mtdev2tuio/mtdev2tuio.mk
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MTDEV2TUIO_VERSION = e1e7378
+MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1
 MTDEV2TUIO_SITE = http://github.com/olivopaolo/mtdev2tuio/tarball/$(MTDEV2TUIO_VERSION)
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
 MTDEV2TUIO_LICENSE = GPLv3+
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index 9c78c451ed..bb5259f849 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -6,7 +6,7 @@
 
 # We use a Git commit ID because the last tagged version is more than
 # one year old.
-NE10_VERSION = 88c18f0
+NE10_VERSION = 88c18f02199947b2c8b57796f5a3ca53160aff96
 NE10_SITE = http://github.com/projectNe10/Ne10/tarball/$(NE10_VERSION)
 NE10_LICENSE = BSD-3c or Apache 2.0
 NE10_LICENSE_FILES = doc/LICENSE
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index 7039d07abe..8e037186ab 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OMAP_U_BOOT_UTILS_VERSION = 8aff852
+OMAP_U_BOOT_UTILS_VERSION = 8aff852322c6f52bd09568bef7725ab509d81725
 OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/$(OMAP_U_BOOT_UTILS_VERSION)
 OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
 OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
diff --git a/package/on2-8170-modules/on2-8170-modules.mk b/package/on2-8170-modules/on2-8170-modules.mk
index 800abc7742..d33288569d 100644
--- a/package/on2-8170-modules/on2-8170-modules.mk
+++ b/package/on2-8170-modules/on2-8170-modules.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ON2_8170_MODULES_VERSION = 73b0806
+ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
 ON2_8170_MODULES_SITE    = http://github.com/alexandrebelloni/on2-8170-modules/tarball/$(ON2_8170_MODULES_VERSION)
 
 ON2_8170_MODULES_DEPENDENCIES = linux
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index 373cd690c3..45dc9b844b 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QEXTSERIALPORT_VERSION     = 6c47244de4ce6db
+QEXTSERIALPORT_VERSION     = 6c47244de4ce6db43c2f05caee957666c951dae1
 QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git/
 QEXTSERIALPORT_SITE_METHOD = git
 
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
index b2c93068e0..1133591226 100644
--- a/package/qtuio/qtuio.mk
+++ b/package/qtuio/qtuio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QTUIO_VERSION = abe4973ff6
+QTUIO_VERSION = abe4973ff60654aad9df7037c4ca15c45f811d24
 QTUIO_SITE = git://github.com/x29a/qTUIO.git
 QTUIO_INSTALL_STAGING = YES
 QTUIO_DEPENDENCIES = qt
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index ecd9dbf2b0..a7574f29d6 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 58036da
+RPI_FIRMWARE_VERSION = 58036da500d936a98156d703fa220dc7db175762
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 8b5794f9b1..9f20766aa8 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 77d32cd
+RPI_USERLAND_VERSION = 77d32cd6b7d1c586877b0e05f941e647e35084bc
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index 8e4269807a..1a19c92ef9 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SOCKETCAND_VERSION = dc3437ab
+SOCKETCAND_VERSION = dc3437abf17359fa8cb16567415b47e7ef8568d0
 SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/$(SOCKETCAND_VERSION)
 SOCKETCAND_AUTORECONF = YES
 
diff --git a/package/sunxi-cedarx/sunxi-cedarx.mk b/package/sunxi-cedarx/sunxi-cedarx.mk
index 07c85d457a..5e1c820ab3 100644
--- a/package/sunxi-cedarx/sunxi-cedarx.mk
+++ b/package/sunxi-cedarx/sunxi-cedarx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_CEDARX_VERSION = 74923e55fc
+SUNXI_CEDARX_VERSION = 74923e55fc3ef512d4cd2462da58ae5331611f37
 SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CEDARX_VERSION)
 
 SUNXI_CEDARX_INSTALL_STAGING = YES
diff --git a/package/sunxi-mali-prop/sunxi-mali-prop.mk b/package/sunxi-mali-prop/sunxi-mali-prop.mk
index 21960e6b66..f04b0b072e 100644
--- a/package/sunxi-mali-prop/sunxi-mali-prop.mk
+++ b/package/sunxi-mali-prop/sunxi-mali-prop.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_MALI_PROP_VERSION = e4ced47
+SUNXI_MALI_PROP_VERSION = e4ced471d576708ac9aa093e41a0f91cf429862b
 SUNXI_MALI_PROP_SITE = http://github.com/linux-sunxi/sunxi-mali-proprietary/tarball/$(SUNXI_MALI_PROP_VERSION)
 
 $(eval $(generic-package))
diff --git a/package/sunxi-mali/sunxi-mali.mk b/package/sunxi-mali/sunxi-mali.mk
index 826583d88b..dec211fc49 100644
--- a/package/sunxi-mali/sunxi-mali.mk
+++ b/package/sunxi-mali/sunxi-mali.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_MALI_VERSION = c2491fe952
+SUNXI_MALI_VERSION = c2491fe952354ba44538064e534ed7c731cedb1e
 SUNXI_MALI_SITE = http://github.com/linux-sunxi/sunxi-mali/tarball/$(SUNXI_MALI_VERSION)
 
 SUNXI_MALI_INSTALL_STAGING = YES
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index a76fde1b57..8c720b2d79 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TI_UTILS_VERSION = 06dbdb2
+TI_UTILS_VERSION = 06dbdb2727354b5f3ad7c723897f40051fddee49
 TI_UTILS_SITE = http://github.com/gxk/ti-utils/tarball/$(TI_UTILS_VERSION)
 TI_UTILS_DEPENDENCIES = libnl
 
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 5593791364..7578dab166 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION           = 2b64995
+TVHEADEND_VERSION           = 2b649954346aa2e9c81834d500a25c528f31f829
 TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE
diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
index ee0b9cb07c..83e088f27c 100644
--- a/package/zmqpp/zmqpp.mk
+++ b/package/zmqpp/zmqpp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZMQPP_VERSION = 31220ca
+ZMQPP_VERSION = 31220ca4a0fb43a0848d78f5e4f23fce39945777
 ZMQPP_SITE = git://github.com/benjamg/zmqpp.git
 ZMQPP_INSTALL_STAGING = YES
 ZMQPP_DEPENDENCIES = zeromq
diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk
index a9d2eaed5d..3e28212872 100644
--- a/package/zyre/zyre.mk
+++ b/package/zyre/zyre.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZYRE_VERSION = 44a57a449a
+ZYRE_VERSION = 44a57a449a34bb6310b5ce4b17f1ce42f9b17beb
 ZYRE_SITE = git://github.com/zeromq/zyre.git
 ZYRE_LICENSE = LGPLv3+
 ZYRE_LICENSE_FILES = COPYING COPYING.LESSER

From df70822c62f4bf0ff59d4f07315ca70028a67aee Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sat, 2 Nov 2013 17:13:34 +0100
Subject: [PATCH 6601/6849] package: cleanup github <pkg>{_VERSION, _SOURCE,
 _SITE} variable

According to the documentation, chapter
6.2.8.2 How to add a package from github
"
[...]
FOO_VERSION = tag or full commit ID
FOO_SITE = http://github.com/<user>/<package>/tarball/$(FOO_VERSION)
[...]
- The tarball name generated by github matches the default one from
  Buildroot (...),
  so it is not necessary to specify it in the +.mk+ file.
"
This commit makes the appropriate changes.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/civetweb/civetweb.mk                     | 4 ++--
 package/jquery-keyboard/jquery-keyboard.mk       | 4 ++--
 package/liblog4c-localtime/liblog4c-localtime.mk | 4 ++--
 package/mongrel2/mongrel2.mk                     | 5 ++---
 package/python-ipy/python-ipy.mk                 | 5 ++---
 package/sqlcipher/sqlcipher.mk                   | 4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index 171ad0cf29..dd74d97d42 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CIVETWEB_VERSION = 1.3
-CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/v$(CIVETWEB_VERSION)
+CIVETWEB_VERSION = v1.3
+CIVETWEB_SITE = http://github.com/sunsetbrew/civetweb/tarball/$(CIVETWEB_VERSION)
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
diff --git a/package/jquery-keyboard/jquery-keyboard.mk b/package/jquery-keyboard/jquery-keyboard.mk
index c429f16e25..41edebf097 100644
--- a/package/jquery-keyboard/jquery-keyboard.mk
+++ b/package/jquery-keyboard/jquery-keyboard.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-JQUERY_KEYBOARD_VERSION = 1.17.7
+JQUERY_KEYBOARD_VERSION = v1.17.7
 JQUERY_KEYBOARD_SITE = \
-	http://github.com/Mottie/Keyboard/tarball/v$(JQUERY_KEYBOARD_VERSION)
+	http://github.com/Mottie/Keyboard/tarball/$(JQUERY_KEYBOARD_VERSION)
 JQUERY_KEYBOARD_LICENSE = MIT WTFPL
 JQUERY_KEYBOARD_LICENSE_FILES = README.markdown
 
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index f68fb53687..474bd95581 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBLOG4C_LOCALTIME_VERSION = 1.0
-LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
+LIBLOG4C_LOCALTIME_VERSION = v1.0
+LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/$(LIBLOG4C_LOCALTIME_VERSION)
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index 116754c56b..89621deef6 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-MONGREL2_VERSION = 1.8.0
-MONGREL2_SOURCE = mongrel2_$(MONGREL2_VERSION).tar.gz
-MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/v$(MONGREL2_VERSION)
+MONGREL2_VERSION = v1.8.0
+MONGREL2_SITE = https://github.com/zedshaw/mongrel2/tarball/$(MONGREL2_VERSION)
 MONGREL2_LICENSE = BSD-3c
 MONGREL2_LICENSE_FILES = LICENSE
 MONGREL2_DEPENDENCIES = sqlite zeromq
diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
index f3fb7c1cde..baac094620 100644
--- a/package/python-ipy/python-ipy.mk
+++ b/package/python-ipy/python-ipy.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-PYTHON_IPY_VERSION = 0.75-0-g58006fb
-PYTHON_IPY_SOURCE  = haypo-python-ipy-IPy-$(PYTHON_IPY_VERSION).tar.gz
-PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/IPy-0.75
+PYTHON_IPY_VERSION = IPy-0.75
+PYTHON_IPY_SITE    = https://github.com/haypo/python-ipy/tarball/$(PYTHON_IPY_VERSION)
 PYTHON_IPY_DEPENDENCIES = host-python python
 PYTHON_IPY_LICENSE = BSD-3c
 PYTHON_IPY_LICENSE_FILES = COPYING
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 0b2581b407..3ade403f64 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SQLCIPHER_VERSION = 1.1.9
-SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
+SQLCIPHER_VERSION = v1.1.9
+SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/$(SQLCIPHER_VERSION)
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES
 

From c9d2b23ce419a8d568a2a794149a9795186d586d Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 2 Nov 2013 16:46:57 +0100
Subject: [PATCH 6602/6849] ngrep: rename existing patch

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../{ngrep-1.45-make-objs.patch => ngrep-0001-make-objs.patch}    | 0
 ...{ngrep-1.45-pcre-header.patch => ngrep-0002-pcre-header.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/ngrep/{ngrep-1.45-make-objs.patch => ngrep-0001-make-objs.patch} (100%)
 rename package/ngrep/{ngrep-1.45-pcre-header.patch => ngrep-0002-pcre-header.patch} (100%)

diff --git a/package/ngrep/ngrep-1.45-make-objs.patch b/package/ngrep/ngrep-0001-make-objs.patch
similarity index 100%
rename from package/ngrep/ngrep-1.45-make-objs.patch
rename to package/ngrep/ngrep-0001-make-objs.patch
diff --git a/package/ngrep/ngrep-1.45-pcre-header.patch b/package/ngrep/ngrep-0002-pcre-header.patch
similarity index 100%
rename from package/ngrep/ngrep-1.45-pcre-header.patch
rename to package/ngrep/ngrep-0002-pcre-header.patch

From 6d3b4faca914cde10e4238b3cca45f680eaa41b9 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 2 Nov 2013 16:51:12 +0100
Subject: [PATCH 6603/6849] ngrep: fix static linking issue with libpcre

Adding -lpcre in LDFLAGS place the library before object files:
gcc ... -lpcre -L.../sysroot/usr/lib -s -o ngrep ngrep.o -lpcap

Makefile.in is patched to use @LIBS@ for adding -lpcre in the right place.

Fixes:
http://autobuild.buildroot.net/results/684/684a3bed28d13ef5e5156257aade3b9aff32f180

[Peter: fixup patch description]
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../ngrep/ngrep-0003-fix-static-link.patch    | 25 +++++++++++++++++++
 package/ngrep/ngrep.mk                        |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 package/ngrep/ngrep-0003-fix-static-link.patch

diff --git a/package/ngrep/ngrep-0003-fix-static-link.patch b/package/ngrep/ngrep-0003-fix-static-link.patch
new file mode 100644
index 0000000000..98c262696d
--- /dev/null
+++ b/package/ngrep/ngrep-0003-fix-static-link.patch
@@ -0,0 +1,25 @@
+ngrep: fix static link with pcre
+
+Libraries must be placed after object files.
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2ae4506..761d7d9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@ CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@
+ INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@
+ 
+ LDFLAGS=@LDFLAGS@ @PCAP_LINK@
+-LIBS=-lpcap @EXTRA_LIBS@ 
++LIBS=@LIBS@ @EXTRA_LIBS@
+ 
+ STRIPFLAG=@STRIPFLAG@
+ 
+-- 
+1.8.1.4
+
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index 6a9b42f3d1..0bb5d7ecdb 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -10,7 +10,7 @@ NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSIO
 NGREP_LICENSE = BSD-4c-like
 NGREP_LICENSE_FILES = LICENSE.txt
 NGREP_INSTALL_STAGING = YES
-NGREP_CONF_ENV = LDFLAGS="-lpcre"
+NGREP_CONF_ENV = LIBS="-lpcre"
 NGREP_CONF_OPT =  \
 	--with-pcap-includes=$(STAGING_DIR)/usr/include \
 	--enable-pcre \

From cd00a9d9eb72d921e43e231622bcc2accc34e1d8 Mon Sep 17 00:00:00 2001
From: Clayton Shotwell <clshotwe@rockwellcollins.com>
Date: Fri, 1 Nov 2013 07:48:25 -0700
Subject: [PATCH 6604/6849] cryptsetup: Add libintl for UCLIBC toolchain

Fixes autobuild error
http://autobuild.buildroot.net/results/cc1a65b9554bc2ece1b3ea8b51cd805b9bda7e86/

Adding libintl to the libraries list for cryptsetup when using a
uclibc toolchain and locale support is enabled.

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cryptsetup/Config.in     | 1 +
 package/cryptsetup/cryptsetup.mk | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 71faa4888e..3b9ba5404f 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CRYPTSETUP
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE 
 	depends on BR2_LARGEFILE # lvm2, util-linux
 	depends on BR2_USE_MMU # lvm2
 	depends on BR2_USE_WCHAR # util-linux
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 48d37f64bb..a65f841953 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -8,8 +8,13 @@ CRYPTSETUP_VERSION = 1.6.2
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.bz2
 CRYPTSETUP_SITE = http://cryptsetup.googlecode.com/files
 CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
-CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs libgcrypt host-pkgconf
+CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs libgcrypt host-pkgconf \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
 CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+endif
+
 $(eval $(autotools-package))

From 2bea7b8c381fa7c62f40f63f9e9f80e530fa9f3a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 1 Nov 2013 18:47:26 +0100
Subject: [PATCH 6605/6849] libcap: rename existing patch

libcap currently has one patch, but it is named using the old naming
strategy, which includes the package version, but not a patch
number. This commit switches this to use the new patch naming
strategy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
---
 ...ibcap-2.22-build-system.patch => libcap-01-build-system.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/libcap/{libcap-2.22-build-system.patch => libcap-01-build-system.patch} (100%)

diff --git a/package/libcap/libcap-2.22-build-system.patch b/package/libcap/libcap-01-build-system.patch
similarity index 100%
rename from package/libcap/libcap-2.22-build-system.patch
rename to package/libcap/libcap-01-build-system.patch

From c016a48b99759164375bcbb99f555c293b042245 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 1 Nov 2013 18:47:27 +0100
Subject: [PATCH 6606/6849] libcap: fix static link

With BR2_PREFER_STATIC_LIB, libcap fails to build:

  http://autobuild.buildroot.net/results/619bceb3491ecd2ed4e1ae552fdb237a0ed2fa47/build-end.log

This is due to the fact that it still tries to build a shared
library. This commit fixes that by adding a patch that makes libcap
provide install-shared/install-static targets. We also now only build
the $(@D)/libcap subdirectory, so removing the build of the progs
subdirectory is no longer needed.

[Peter: fixup description]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ibcap-02-split-static-shared-install.patch | 30 +++++++++++++++++++
 package/libcap/libcap.mk                      | 27 +++++++++--------
 2 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 package/libcap/libcap-02-split-static-shared-install.patch

diff --git a/package/libcap/libcap-02-split-static-shared-install.patch b/package/libcap/libcap-02-split-static-shared-install.patch
new file mode 100644
index 0000000000..21e7f2afc8
--- /dev/null
+++ b/package/libcap/libcap-02-split-static-shared-install.patch
@@ -0,0 +1,30 @@
+libcap: split install into install-shared/install-static
+
+In order to support static only builds, split the install target into
+install-shared and install-static targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/libcap/Makefile
+===================================================================
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -60,11 +60,17 @@
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+ 	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+-install: all
++install: install-shared install-static
++
++install-common:
+ 	mkdir -p -m 0755 $(INCDIR)/sys
+ 	install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ 	mkdir -p -m 0755 $(LIBDIR)
++
++install-static: install-common
+ 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
++
++install-shared: install-common
+ 	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 16afaef24a..17e2eb5191 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -25,29 +25,30 @@ endif
 # we don't have host-attr
 HOST_LIBCAP_DEPENDENCIES =
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+LIBCAP_MAKE_TARGET = libcap.a
+LIBCAP_MAKE_INSTALL_TARGET = install-static
+else
+LIBCAP_MAKE_TARGET = all
+LIBCAP_MAKE_INSTALL_TARGET = install
+endif
+
 define LIBCAP_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \
 		LIBATTR=$(LIBCAP_HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" \
-		BUILD_CFLAGS="$(HOST_CFLAGS)"
+		BUILD_CFLAGS="$(HOST_CFLAGS)" $(LIBCAP_MAKE_TARGET)
 endef
 
 define LIBCAP_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
-		DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
+		DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
 endef
 
 define LIBCAP_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
-		DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
+		DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
 endef
 
-# progs use fork()
-define LIBCAP_DISABLE_PROGS
-	$(SED) '/-C progs/d' $(@D)/Makefile
-endef
-
-LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS
-
 define HOST_LIBCAP_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
 endef

From 250af24dbd8c6902c0b92c95daa5b8cced947806 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Nov 2013 11:26:25 +0100
Subject: [PATCH 6607/6849] libnl: simplify makefile by using --{enable,
 disable}-cli

The libnl configure script has a --{enable,disable}-cli options that
allows to enable or disable the compilation of the libnl tools. Use
this option instead of compiling everything and then removing the
installed programs.

Note that we also get rid of the uninstall command, which is planned
to be globally removed in Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
---
 package/libnl/libnl.mk | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 5c884d79a9..3b56bc87ba 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -10,22 +10,11 @@ LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING
 LIBNL_INSTALL_STAGING = YES
 LIBNL_DEPENDENCIES = host-bison host-flex
-LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \
-	cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \
-	qdisc-list
 
-define LIBNL_UNINSTALL_TARGET_CMDS
-	rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.*
-	rm -rf $(TARGET_DIR)/usr/lib/libnl
-endef
-
-define LIBNL_REMOVE_TOOLS
-	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES))
-	rm -rf $(TARGET_DIR)/usr/sbin/genl-ctrl-list
-endef
-
-ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
-LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS
+ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
+LIBNL_CONF_OPT += --enable-cli
+else
+LIBNL_CONF_OPT += --disable-cli
 endif
 
 $(eval $(autotools-package))

From 337a59d9e47772c89ecd1e4523e300e5e3c642ce Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Nov 2013 11:26:26 +0100
Subject: [PATCH 6608/6849] libnl: do not allow to build tools on static lib
 configs

Building the libnl tools requires the <dlfcn.h> header, which is not
compatible with static only builds. Therefore, this commit makes the
libnl tools option depend on !BR2_PREFER_STATIC_LIB.

Fixes:

   http://autobuild.buildroot.org/results/573/57340b9bd2db3a523836e02e01cba6f7c17c8ca7/build-end.log

[Peter: fix tools comment dependency]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
---
 package/libnl/Config.in | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/libnl/Config.in b/package/libnl/Config.in
index fec10d31b7..11732789fd 100644
--- a/package/libnl/Config.in
+++ b/package/libnl/Config.in
@@ -6,11 +6,19 @@ config BR2_PACKAGE_LIBNL
 
 	  http://people.suug.ch/~tgr/libnl/
 
+comment "libnl needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_LIBNL
+
 config BR2_PACKAGE_LIBNL_TOOLS
 	bool "install tools"
-	depends on BR2_PACKAGE_LIBNL
+	# uses <dlfcn.h>
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  Install binary tools.
 
-comment "libnl needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "libnl tools need a toolchain w/ dynamic library"
+	depends on BR2_PREFER_STATIC_LIB
+
+endif

From 55227475957af0a6a9d1377bc9e2e6103febedba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Nov 2013 14:47:01 +0100
Subject: [PATCH 6609/6849] dhcpcd: needs MMU

dhcpcd fails to build on non-MMU platforms, even with the
--disable-fork option:

  bind.o: In function `_daemonise':
  bind.c:(.text+0x62): undefined reference to `_fork'
  collect2: ld returned 1 exit status

Therefore, we make dhcpcd depend on MMU support, and remove the
non-MMU condition in the .mk file. More recent versions of dhcpcd do
support non-MMU properly, but this commit intends to be only a fix.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
---
 package/dhcpcd/Config.in | 1 +
 package/dhcpcd/dhcpcd.mk | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
index dbde548db0..ddbc6f4781 100644
--- a/package/dhcpcd/Config.in
+++ b/package/dhcpcd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DHCPCD
 	depends on BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
 	bool "dhcpcd"
 	help
 	  An RFC2131 compliant DHCP client
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 5296db8744..13810f3a46 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -9,10 +9,6 @@ DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2
 DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd/
 DHCPCD_LICENSE = BSD-2c
 
-ifeq ($(BR2_USE_MMU),)
-	DHCPCD_CONFIG_OPT += --disable-fork
-endif
-
 define DHCPCD_CONFIGURE_CMDS
 	(cd $(@D); \
 	./configure \

From 5702d2f3b7f12882d4e33d26606732290e442324 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Nov 2013 17:04:57 +0100
Subject: [PATCH 6610/6849] libvpx: needs thread support

Fixes:

  http://autobuild.buildroot.org/results/8de/8def7e54e4fecb7df350443824c00b53d1c61c01/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
---
 package/gstreamer1/gst1-plugins-good/Config.in | 4 ++++
 package/libvpx/Config.in                       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 3342208c49..a9308c7d9d 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -335,9 +335,13 @@ comment "taglib needs a toolchain w/ C++"
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	bool "vpx (webm)"
 	select BR2_PACKAGE_LIBVPX
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
 	help
 	  VP8 plugin
 
+comment "libvpx needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK
 	bool "wavpack (*.wv audio)"
 	select BR2_PACKAGE_WAVPACK
diff --git a/package/libvpx/Config.in b/package/libvpx/Config.in
index 1332c564a8..0ed3e1ad9c 100644
--- a/package/libvpx/Config.in
+++ b/package/libvpx/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_LIBVPX
 	bool "libvpx"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A high-quality, open video format that's freely available to
 	  everyone.
 
 	  http://webmproject.org
+
+comment "libvpx needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From c4ea640455a67ff4e355c286462ae15e7eb13f74 Mon Sep 17 00:00:00 2001
From: Kelvin Cheung <keguang.zhang@gmail.com>
Date: Mon, 4 Nov 2013 10:19:21 +0800
Subject: [PATCH 6611/6849] netperf: enable demo mode

Enable demo mode for netperf to activates a global "-D" <interval> option.
This option will display interim results at least every time interval.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/netperf/netperf.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
index 2bd11f386c..455f27ed2c 100644
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -7,6 +7,7 @@
 NETPERF_VERSION = 2.6.0
 NETPERF_SITE = ftp://ftp.netperf.org/netperf
 NETPERF_CONF_ENV = ac_cv_func_setpgrp_void=set
+NETPERF_CONF_OPT = --enable-demo=yes
 NETPERF_LICENSE = netperf license
 NETPERF_LICENSE_FILES = COPYING
 

From bd56cd6b4cc75511ffacfe020a8de3c1aad44fc9 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Mon, 4 Nov 2013 17:49:44 +0800
Subject: [PATCH 6612/6849] sqlite: Disable dynamic extention if static library
 is seleted

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sqlite/sqlite.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 5fc1e9e923..c20e7828e6 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -42,6 +42,10 @@ SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 SQLITE_CONF_OPT = \
 	--localstatedir=/var
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+SQLITE_CONF_OPT += --enable-dynamic-extensions=no
+endif
+
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 SQLITE_CONF_OPT += --enable-threadsafe
 else

From f870e9104d3570fbc2d7656f274cf225db56ccbb Mon Sep 17 00:00:00 2001
From: Matt Weber <mlweber1@rockwellcollins.com>
Date: Mon, 21 Oct 2013 08:39:17 -0500
Subject: [PATCH 6613/6849] omniorb: fix autobuilder failure

http://autobuild.buildroot.net/results/e3244abc550a95eb69e63b8db203f39b27f3288e/

Turns out omniorb isn't building because of an old cross compile patch.
The last patchset was missing the delete.

Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...mniorb-0001-crosscompile-tool-export.patch | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 package/omniorb/omniorb-0001-crosscompile-tool-export.patch

diff --git a/package/omniorb/omniorb-0001-crosscompile-tool-export.patch b/package/omniorb/omniorb-0001-crosscompile-tool-export.patch
deleted file mode 100644
index 260d86f314..0000000000
--- a/package/omniorb/omniorb-0001-crosscompile-tool-export.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-beforeauto.mk.in: added support for overriding the configure time
-defined CC/CXX/RANLIB/CPP variables so that a couple pkg tools could be
-built which generate code during the cross compile build.
-
-http://www.omniorb-support.com/pipermail/omniorb-list/2013-September/031473.html
-
-Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
-
---- omniorb-4.1.6.orig/mk/beforeauto.mk.in	2013-09-12 12:49:55.668708148 -0500
-+++ omniorb-4.1.6/mk/beforeauto.mk.in	2013-09-12 12:51:22.707928579 -0500
-@@ -672,15 +672,15 @@
- #
- 
- AR              = ar cq
--CC              = @CC@
--CXX             = @CXX@
--RANLIB		= @RANLIB@
-+CC		?= @CC@
-+CXX		?= @CXX@
-+RANLIB		?= @RANLIB@
- MKDIRHIER	= $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
- INSTLIBFLAGS	= -m 0644
- INSTEXEFLAGS	= -m 0755
- CP		= cp
- MV		= mv -f
--CPP		= @CPP@
-+CPP		?= @CPP@
- OMKDEPEND	= $(TOOLBINDIR)/omkdepend
- RMDIRHIER	= $(RM) -rf
- 

From 01f99d284fd51bd149e7a92d0e9e7fc368cd0e99 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 2 Nov 2013 17:17:04 +0100
Subject: [PATCH 6614/6849] qt: don't allow building WebKit on some
 architectures

WebKit has some architecture specific support, and therefore is not
necessarily available for all architectures. Make sure the Qt WebKit
option cannot be selected on those architectures that are not
supported.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt/Config.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 88013089b1..ea9e787de4 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -344,17 +344,26 @@ config BR2_PACKAGE_QT_NETWORK
 	  Install the Network module.
 	  if unsure, say y
 
+config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
+	bool
+	# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+	default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
+		BR2_mipsel || BR2_powerpc || BR2_sh4 || BR2_sh4eb || \
+		BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
+
 config BR2_PACKAGE_QT_WEBKIT
 	bool "WebKit Module"
 	depends on BR2_PACKAGE_QT_SHARED
 	depends on BR2_PACKAGE_QT_GUI_MODULE
 	depends on BR2_PACKAGE_QT_NETWORK
+	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 	help
 	  Build the WebKit module.
 	  If unsure, say n.
 
 comment "WebKit needs shared library/gui/network support"
 	depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
+	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 
 config BR2_PACKAGE_QT_JAVASCRIPTCORE
 	bool "JavaScriptCore JIT compiler"

From a3c27d24ac2dfd5f0e21e751b358456964cdef49 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Nov 2013 18:32:44 -0300
Subject: [PATCH 6615/6849] linux-headers: bump 3. {2, 4, 10, 11}.x versions
 and add 3.12.x

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linux-headers/Config.in.host | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 88aa7e5737..2bd8b02ddc 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -5,7 +5,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_3_11
+	default BR2_KERNEL_HEADERS_3_12
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -60,6 +60,9 @@ choice
 	config BR2_KERNEL_HEADERS_3_11
 		bool "Linux 3.11.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_3_12
+		bool "Linux 3.12.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Manually specified Linux version"
 
@@ -78,15 +81,16 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.51"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.52"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.67"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.68"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.17"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.6"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.18"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.7"	if BR2_KERNEL_HEADERS_3_11
+	default "3.12"		if BR2_KERNEL_HEADERS_3_12
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 602bbb73430d95e53b6f64ab95a61f0a032e6d81 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 4 Nov 2013 18:32:45 -0300
Subject: [PATCH 6616/6849] linux: bump version to 3.12

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index e44d78827d..84de134f06 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.11.6"
+	bool "3.12"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -87,7 +87,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.11.6" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.12" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION

From c6e69598a3e801267d23f3e29a030b1ea13878c5 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 5 Nov 2013 07:43:29 +0000
Subject: [PATCH 6617/6849] libsigsegv: fix avr32 build

The libsigsegv configure step fails to correctly figure out the direction of
stack growth for avr32. This leads to a zero STACK_DIRECTION definition, and
build failures such as the following.

  http://autobuild.buildroot.net/results/a3fe938f9376533b4777d79deb7a2ee83ed5ce33

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../libsigsegv-0001-fix-avr32-build.patch     | 20 +++++++++++++++++++
 package/libsigsegv/libsigsegv.mk              |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 package/libsigsegv/libsigsegv-0001-fix-avr32-build.patch

diff --git a/package/libsigsegv/libsigsegv-0001-fix-avr32-build.patch b/package/libsigsegv/libsigsegv-0001-fix-avr32-build.patch
new file mode 100644
index 0000000000..f5857649a9
--- /dev/null
+++ b/package/libsigsegv/libsigsegv-0001-fix-avr32-build.patch
@@ -0,0 +1,20 @@
+The libsigsegv configure step fails to correctly figure out the direction of
+stack growth for avr32. This leads to a zero STACK_DIRECTION definition, and
+build failures such as the following.
+
+  http://autobuild.buildroot.net/results/a3fe938f9376533b4777d79deb7a2ee83ed5ce33
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/m4/stack-direction.m4 b/m4/stack-direction.m4
+--- a/m4/stack-direction.m4	2009-11-21 12:22:45.000000000 +0000
++++ b/m4/stack-direction.m4	2013-11-04 09:29:27.558036038 +0000
+@@ -16,7 +16,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
+       alpha* | \
+       arc | \
+       arm* | strongarm* | xscale* | \
+-      avr | \
++      avr | avr32 | \
+       c1 | c2 | c32 | c34 | c38 | \
+       clipper | \
+       cris | \
diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk
index 2cc2544c01..a5bb31c9cf 100644
--- a/package/libsigsegv/libsigsegv.mk
+++ b/package/libsigsegv/libsigsegv.mk
@@ -11,4 +11,6 @@ LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes
 LIBSIGSEGV_LICENSE = GPLv2+
 LIBSIGSEGV_LICENSE_FILES = COPYING
 
+LIBSIGSEGV_AUTORECONF = YES
+
 $(eval $(autotools-package))

From da1ca5c0a24e12bff1157fbd9275b5150f2ab620 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Tue, 5 Nov 2013 07:55:14 +0000
Subject: [PATCH 6618/6849] dropwatch: fix avr32 build failure

On avr32, dropwatch needs libiberty to avoid build failures such as

  http://autobuild.buildroot.net/results/cd5/cd5e22fb5c9b0fc5d396bc85a5e253a1a65054da/

Also test built on ARM.

[Peter: pass TARGET_LDFLAGS as well, append -lintl in gettext case]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dropwatch/dropwatch.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
index 5d65d86699..6bbcb234c8 100644
--- a/package/dropwatch/dropwatch.mk
+++ b/package/dropwatch/dropwatch.mk
@@ -13,13 +13,18 @@ DROPWATCH_LICENSE_FILES = COPYING
 
 # libbfd may be linked to libintl
 # Ugly... but LDFLAGS are hardcoded anyway
+#
+# Also: always need to add -liberty to hardcoded LDFLAGS for avr32
+DROPWATCH_LDFLAGS = \
+	$(TARGET_LDFLAGS) -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3
+
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -lreadline -lnl-3 -lnl-genl-3"
+DROPWATCH_LDFLAGS += -lintl
 endif
 
 define DROPWATCH_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(DROPWATCH_LDFLAGS) build
+		LDFLAGS="$(DROPWATCH_LDFLAGS)" build
 endef
 
 define DROPWATCH_CLEAN_CMDS

From 7c611d5b527505c896fdf181218b1c728f2ceaf9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 5 Nov 2013 16:48:09 +0100
Subject: [PATCH 6619/6849] collectd: add option for sensors plugin

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/collectd/Config.in   | 6 ++++++
 package/collectd/collectd.mk | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 2059198d10..8123162248 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -277,6 +277,12 @@ config BR2_PACKAGE_COLLECTD_PROTOCOLS
 	help
 	  Collects information about the network protocols.
 
+config BR2_PACKAGE_COLLECTD_SENSORS
+	bool "sensors"
+	select BR2_PACKAGE_LM_SENSORS
+	help
+	  Collects data from lm-sensors.
+
 config BR2_PACKAGE_COLLECTD_SERIAL
 	bool "serial"
 	help
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 55a388ca53..e7dc093555 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -18,7 +18,7 @@ COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \
 		memcachec modbus multimeter netapp netlink nginx \
 		notify_desktop notify_email numa nut onewire oracle perl pf \
 		pinba postgresql powerdns python redis routeros rrdcached \
-		sensors sigrok tape target_v5upgrade teamspeak2 ted \
+		sigrok tape target_v5upgrade teamspeak2 ted \
 		tokyotyrant uuid varnish vserver write_mongodb write_redis \
 		xmms zfs_arc
 
@@ -74,6 +74,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
+	$(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \
 	$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
 	$(if $(BR2_PACKAGE_COLLECTD_STATSD),--enable-statsd,--disable-statsd) \
 	$(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \
@@ -108,6 +109,7 @@ COLLECTD_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
 	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
+	$(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \
 	$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)
 

From 1c7b9de8e08c7c851381037fed9e80d3f31c4881 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Nov 2013 09:03:27 -0300
Subject: [PATCH 6620/6849] configs/qemu: bump relevant config versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/qemu/arm-nuri/readme.txt                            | 2 +-
 .../{linux-3.11.config => linux-3.12.config}              | 0
 board/qemu/arm-versatile/readme.txt                       | 2 +-
 board/qemu/arm-vexpress/readme.txt                        | 2 +-
 .../{linux-3.11.config => linux-3.12.config}              | 0
 board/qemu/microblazebe-mmu/readme.txt                    | 2 +-
 .../{linux-3.11.config => linux-3.12.config}              | 0
 board/qemu/microblazeel-mmu/readme.txt                    | 2 +-
 .../mips-malta/{linux-3.11.config => linux-3.12.config}   | 0
 board/qemu/mips-malta/readme.txt                          | 2 +-
 .../mips64-malta/{linux-3.11.config => linux-3.12.config} | 0
 board/qemu/mips64-malta/readme.txt                        | 2 +-
 .../mipsel-malta/{linux-3.11.config => linux-3.12.config} | 0
 board/qemu/mipsel-malta/readme.txt                        | 2 +-
 .../{linux-3.11.config => linux-3.12.config}              | 0
 board/qemu/powerpc-g3beige/readme.txt                     | 2 +-
 board/qemu/powerpc-mpc8544ds/readme.txt                   | 2 +-
 board/qemu/powerpc-virtex-ml507/readme.txt                | 2 +-
 board/qemu/sh4-r2d/readme.txt                             | 2 +-
 board/qemu/sparc-ss10/readme.txt                          | 2 +-
 board/qemu/x86/{linux-3.11.config => linux-3.12.config}   | 0
 board/qemu/x86/readme.txt                                 | 2 +-
 .../qemu/x86_64/{linux-3.11.config => linux-3.12.config}  | 0
 board/qemu/x86_64/readme.txt                              | 2 +-
 configs/qemu_arm_nuri_defconfig                           | 4 ++--
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 configs/qemu_arm_vexpress_defconfig                       | 6 +++---
 configs/qemu_microblazebe_mmu_defconfig                   | 4 ++--
 configs/qemu_microblazeel_mmu_defconfig                   | 4 ++--
 configs/qemu_mips64_malta_defconfig                       | 8 ++++----
 configs/qemu_mips_malta_defconfig                         | 8 ++++----
 configs/qemu_mipsel_malta_defconfig                       | 8 ++++----
 configs/qemu_ppc_g3beige_defconfig                        | 8 ++++----
 configs/qemu_ppc_mpc8544ds_defconfig                      | 6 +++---
 configs/qemu_ppc_virtex_ml507_defconfig                   | 6 +++---
 configs/qemu_sh4_r2d_defconfig                            | 4 ++--
 configs/qemu_sparc_ss10_defconfig                         | 6 +++---
 configs/qemu_x86_64_defconfig                             | 8 ++++----
 configs/qemu_x86_defconfig                                | 8 ++++----
 39 files changed, 63 insertions(+), 63 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/mips-malta/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/mips64-malta/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/x86/{linux-3.11.config => linux-3.12.config} (100%)
 rename board/qemu/x86_64/{linux-3.11.config => linux-3.12.config} (100%)

diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
index 0fed2f798f..6fdba81dc2 100644
--- a/board/qemu/arm-nuri/readme.txt
+++ b/board/qemu/arm-nuri/readme.txt
@@ -7,4 +7,4 @@ graphical window is the framebuffer.
 
 Startup time is slow because of the SMP CPU emulation so be patient.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/arm-versatile/linux-3.11.config b/board/qemu/arm-versatile/linux-3.12.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.11.config
rename to board/qemu/arm-versatile/linux-3.12.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index 4902c5497f..7d0745f38b 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index 65d1996212..9a4694d68a 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/board/qemu/arm-vexpress/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/microblazebe-mmu/linux-3.11.config b/board/qemu/microblazebe-mmu/linux-3.12.config
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.11.config
rename to board/qemu/microblazebe-mmu/linux-3.12.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 473a93426c..8ade434017 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/microblazeel-mmu/linux-3.11.config b/board/qemu/microblazeel-mmu/linux-3.12.config
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.11.config
rename to board/qemu/microblazeel-mmu/linux-3.12.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index baddc7ad92..9ac55dbca6 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/mips-malta/linux-3.11.config b/board/qemu/mips-malta/linux-3.12.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.11.config
rename to board/qemu/mips-malta/linux-3.12.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index 33764ead60..b3679270c0 100644
--- a/board/qemu/mips-malta/readme.txt
+++ b/board/qemu/mips-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/mips64-malta/linux-3.11.config b/board/qemu/mips64-malta/linux-3.12.config
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.11.config
rename to board/qemu/mips64-malta/linux-3.12.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 23b85abf74..4fa8a19b16 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/mipsel-malta/linux-3.11.config b/board/qemu/mipsel-malta/linux-3.12.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.11.config
rename to board/qemu/mipsel-malta/linux-3.12.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 1e17828138..b77cc84e20 100644
--- a/board/qemu/mipsel-malta/readme.txt
+++ b/board/qemu/mipsel-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/powerpc-g3beige/linux-3.11.config b/board/qemu/powerpc-g3beige/linux-3.12.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.11.config
rename to board/qemu/powerpc-g3beige/linux-3.12.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index 4c0bf8a3a4..07cb6604a8 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/board/qemu/powerpc-g3beige/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index 8c57eadec9..cd56ddde3c 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/board/qemu/powerpc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index e958d494ba..a9a63788aa 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/board/qemu/powerpc-virtex-ml507/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 45fca86d79..2a963ebf03 100644
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index dab4028122..725ab30f27 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/board/qemu/sparc-ss10/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu.
 The graphical window is the framebuffer.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/x86/linux-3.11.config b/board/qemu/x86/linux-3.12.config
similarity index 100%
rename from board/qemu/x86/linux-3.11.config
rename to board/qemu/x86/linux-3.12.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 5f3af40421..c07000c039 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/board/qemu/x86_64/linux-3.11.config b/board/qemu/x86_64/linux-3.12.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.11.config
rename to board/qemu/x86_64/linux-3.12.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index d9eaf56229..3c344f95a8 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.6.0
+Tested with QEMU 1.6.1
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 20b825a76c..965f55de27 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.15"
+BR2_DEFAULT_KERNEL_VERSION="3.10.18"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.15"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.18"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 322fc18c12..88df6c821d 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.12.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 8bd12af551..324a8110fa 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -13,13 +13,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index adc70745ce..0a621b1be0 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.12.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts"
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 792050586c..51d58c6cf7 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.12.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts"
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 0fde6c6409..c0904b5ce9 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,16 +10,16 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 6b952de53e..6e2c60133b 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -6,16 +6,16 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 0b9137a625..ff640a10c9 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -6,16 +6,16 @@ BR2_mips_32r2=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 513c49e5e9..bd0bc0307b 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -6,16 +6,16 @@ BR2_powerpc_750=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 5396cfa7ef..687b53707b 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -6,14 +6,14 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index 62dd741b7d..a0dc674d7a 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -6,9 +6,9 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 99743a10c9..f7671d1679 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -12,7 +12,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.2 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.2.51"
+BR2_DEFAULT_KERNEL_VERSION="3.2.52"
 
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
@@ -21,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.51"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.52"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 37c40c4538..67bffbdef6 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -6,13 +6,13 @@ BR2_sparc_v8=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 520fcf104c..816cef1a9d 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -9,13 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.12.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 7609cde28e..ccccfa2981 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.11 headers to avoid breaking with newer kernels
+# Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.4"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.12.config"

From 27451eed521b433e123893bd9b72965820cd56d2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Nov 2013 09:03:28 -0300
Subject: [PATCH 6621/6849] configs/imx233_olinuxino: bump to the latest
 versions

Also tweak the kernel and buildroot config for basic WiFi support.
And fetch the ASoC patches for builtin audio.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...mmc-mxs-mmc-add-cd-inverted-property.patch |  47 --------
 ...c-mxs-mmc-add-non-removable-property.patch |  53 ---------
 ...3-mmc-mxs-mmc-add-broken-cd-property.patch |  50 --------
 ...3-olinuxino-mark-sdcard-cd-as-broken.patch |  28 -----
 .../{linux-3.9.config => linux-3.12.config}   | 111 ++++++++----------
 .../mxs-bootlets-01-olinuxino.patch           |   6 +-
 board/olimex/imx233_olinuxino/readme.txt      |   6 +-
 configs/olimex_imx233_olinuxino_defconfig     |  23 +++-
 8 files changed, 75 insertions(+), 249 deletions(-)
 delete mode 100644 board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
 delete mode 100644 board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
 delete mode 100644 board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
 delete mode 100644 board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
 rename board/olimex/imx233_olinuxino/{linux-3.9.config => linux-3.12.config} (70%)

diff --git a/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch b/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
deleted file mode 100644
index 6e58c8cd70..0000000000
--- a/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4c0c9be05004d1eb674b7586216b3d93cc04531c Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 10 Apr 2013 11:13:43 +0200
-Subject: [PATCH 1/3] mmc: mxs-mmc: add cd-inverted property
-
-The card-detect GPIO is inverted on some boards. Handle such case.
-
-Acked-by: Shawn Guo <shawn.guo@linaro.org>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Chris Ball <cjb@laptop.org>
----
- drivers/mmc/host/mxs-mmc.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index 4efe302..0cdf1f6 100644
---- a/drivers/mmc/host/mxs-mmc.c
-+++ b/drivers/mmc/host/mxs-mmc.c
-@@ -72,6 +72,7 @@ struct mxs_mmc_host {
- 	int				sdio_irq_en;
- 	int				wp_gpio;
- 	bool				wp_inverted;
-+	bool				cd_inverted;
- };
-
- static int mxs_mmc_get_ro(struct mmc_host *mmc)
-@@ -96,7 +97,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
- 	struct mxs_ssp *ssp = &host->ssp;
-
- 	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
--		 BM_SSP_STATUS_CARD_DETECT);
-+		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;
- }
-
- static void mxs_mmc_reset(struct mxs_mmc_host *host)
-@@ -691,6 +692,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
- 	if (flags & OF_GPIO_ACTIVE_LOW)
- 		host->wp_inverted = 1;
-
-+	host->cd_inverted = of_property_read_bool(np, "cd-inverted");
-+
- 	mmc->f_min = 400000;
- 	mmc->f_max = 288000000;
- 	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
---
-1.8.1.5
-
diff --git a/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch b/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
deleted file mode 100644
index f7446cada7..0000000000
--- a/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5086e5f41fd107539911edf62f2d202753ed1980 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 10 Apr 2013 11:13:44 +0200
-Subject: [PATCH 2/3] mmc: mxs-mmc: add non-removable property
-
-Some boards have non removable cards like eMMC. Handle such case.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Acked-by: Shawn Guo <shawn.guo@linaro.org>
-Signed-off-by: Chris Ball <cjb@laptop.org>
----
- drivers/mmc/host/mxs-mmc.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index 0cdf1f6..c231881 100644
---- a/drivers/mmc/host/mxs-mmc.c
-+++ b/drivers/mmc/host/mxs-mmc.c
-@@ -73,6 +73,7 @@ struct mxs_mmc_host {
- 	int				wp_gpio;
- 	bool				wp_inverted;
- 	bool				cd_inverted;
-+	bool				non_removable;
- };
-
- static int mxs_mmc_get_ro(struct mmc_host *mmc)
-@@ -96,8 +97,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
- 	struct mxs_mmc_host *host = mmc_priv(mmc);
- 	struct mxs_ssp *ssp = &host->ssp;
-
--	return !(readl(ssp->base + HW_SSP_STATUS(ssp)) &
--		 BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted;
-+	return host->non_removable ||
-+		!(readl(ssp->base + HW_SSP_STATUS(ssp)) &
-+		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
- }
-
- static void mxs_mmc_reset(struct mxs_mmc_host *host)
-@@ -687,8 +689,10 @@ static int mxs_mmc_probe(struct platform_device *pdev)
- 		mmc->caps |= MMC_CAP_4_BIT_DATA;
- 	else if (bus_width == 8)
- 		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
-+	host->non_removable = of_property_read_bool(np, "non-removable");
-+	if (host->non_removable)
-+		mmc->caps |= MMC_CAP_NONREMOVABLE;
- 	host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags);
--
- 	if (flags & OF_GPIO_ACTIVE_LOW)
- 		host->wp_inverted = 1;
-
---
-1.8.1.5
-
diff --git a/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch b/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
deleted file mode 100644
index b5ceb0343f..0000000000
--- a/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1d53196a0d604fcf636203fac21e944b6a9cf275 Mon Sep 17 00:00:00 2001
-From: Hector Palacios <hector.palacios@digi.com>
-Date: Wed, 10 Apr 2013 11:13:45 +0200
-Subject: [PATCH 3/3] mmc: mxs-mmc: add broken-cd property
-
-According to bindings documentation for mmc, the property 'broken-cd'
-can be used to indicate card-detection is not available and polling
-must be used instead. This patch retrieves this property
-and sets a custom flag. On the get_cd() hook, it returns 1 if
-the flag is set, to always assume the card is present.
-
-Signed-off-by: Hector Palacios <hector.palacios@digi.com>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Chris Ball <cjb@laptop.org>
----
- drivers/mmc/host/mxs-mmc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index c231881..146a53b 100644
---- a/drivers/mmc/host/mxs-mmc.c
-+++ b/drivers/mmc/host/mxs-mmc.c
-@@ -73,6 +73,7 @@ struct mxs_mmc_host {
- 	int				wp_gpio;
- 	bool				wp_inverted;
- 	bool				cd_inverted;
-+	bool				broken_cd;
- 	bool				non_removable;
- };
-
-@@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
- 	struct mxs_mmc_host *host = mmc_priv(mmc);
- 	struct mxs_ssp *ssp = &host->ssp;
-
--	return host->non_removable ||
-+	return host->non_removable || host->broken_cd ||
- 		!(readl(ssp->base + HW_SSP_STATUS(ssp)) &
- 		  BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
- }
-@@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
- 		mmc->caps |= MMC_CAP_4_BIT_DATA;
- 	else if (bus_width == 8)
- 		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
-+	host->broken_cd = of_property_read_bool(np, "broken-cd");
- 	host->non_removable = of_property_read_bool(np, "non-removable");
- 	if (host->non_removable)
- 		mmc->caps |= MMC_CAP_NONREMOVABLE;
---
-1.8.1.5
-
diff --git a/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch b/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
deleted file mode 100644
index 7ce42b902e..0000000000
--- a/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1897fda94190498573f9d1b72bc6b7b58c720957 Mon Sep 17 00:00:00 2001
-From: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
-Date: Sat, 6 Apr 2013 10:42:10 -0300
-Subject: [PATCH 1/1] ARM: dts: imx23-olinuxino: mark sdcard cd as broken
-
-The imx23-olinuxino sdcard doesn't have card detect.
-
-Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
-Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
----
- arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
-index e7484e4..d107c4a 100644
---- a/arch/arm/boot/dts/imx23-olinuxino.dts
-+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
-@@ -29,6 +29,7 @@
- 				pinctrl-names = "default";
- 				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
- 				bus-width = <4>;
-+				broken-cd;
- 				status = "okay";
- 			};
-
---
-1.8.1.5
-
diff --git a/board/olimex/imx233_olinuxino/linux-3.9.config b/board/olimex/imx233_olinuxino/linux-3.12.config
similarity index 70%
rename from board/olimex/imx233_olinuxino/linux-3.9.config
rename to board/olimex/imx233_olinuxino/linux-3.12.config
index eceee98386..f7b6aa61d7 100644
--- a/board/olimex/imx233_olinuxino/linux-3.9.config
+++ b/board/olimex/imx233_olinuxino/linux-3.12.config
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -12,6 +11,7 @@ CONFIG_IKCONFIG_PROC=y
 # CONFIG_IPC_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
+CONFIG_RELAY=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MODULES=y
@@ -22,15 +22,14 @@ CONFIG_MODVERSIONS=y
 CONFIG_BLK_DEV_INTEGRITY=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MXS=y
-CONFIG_MACH_MXS_DT=y
-CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMB is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
-CONFIG_ATAGS=y
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_AUTO_ZRELADDR=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -44,17 +43,14 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_FLEXCAN=m
-# CONFIG_WIRELESS is not set
+CONFIG_CFG80211=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_M25P80=y
@@ -65,23 +61,30 @@ CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_UBI=y
 # CONFIG_BLK_DEV is not set
 CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_93CX6=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
-CONFIG_ENC28J60=y
+# CONFIG_ETHERNET is not set
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC95XX=y
-CONFIG_SMSC_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_MICREL_PHY=y
-# CONFIG_WLAN is not set
+CONFIG_RTL8187=m
+CONFIG_ATH_CARDS=m
+CONFIG_ATH9K_HTC=m
+CONFIG_RT2X00=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_ZD1211RW=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2007=m
 # CONFIG_SERIO is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
@@ -98,9 +101,11 @@ CONFIG_I2C_MXS=y
 CONFIG_SPI=y
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_MXS=y
-CONFIG_DEBUG_GPIO=y
+CONFIG_PTP_1588_CLOCK=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y
@@ -110,79 +115,63 @@ CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
+CONFIG_SND_HRTIMER=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
 CONFIG_SND_SOC=y
-CONFIG_SND_MXS_SOC=y
-CONFIG_SND_SOC_MXS_SGTL5000=y
+CONFIG_SND_MXS_SOC_BUILTIN=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_STORAGE=y
+CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_MXS=y
-CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_STMP=y
 CONFIG_DMADEVICES=y
 CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
 CONFIG_MXS_LRADC=y
-CONFIG_IIO_SYSFS_TRIGGER=y
-CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_IIO=y
+CONFIG_IIO_SYSFS_TRIGGER=y
 CONFIG_PWM=y
 CONFIG_PWM_MXS=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_CACHEFILES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
+# CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_PRINTK_TIME=y
 CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_TIMER_STATS=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_INFO=y
-CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DEBUG_FS=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_DEBUG_USER=y
+CONFIG_KEYS=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_ITU_T=m
+CONFIG_CRYPTO_DEV_DCP=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=m
+CONFIG_FONTS=y
diff --git a/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
index 91b57c3d74..54c3ca019e 100644
--- a/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
+++ b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch
@@ -65,9 +65,9 @@ diff -Nura imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt
 --- imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt	1969-12-31 21:00:00.000000000 -0300
 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt	2013-05-17 15:07:49.663496106 -0300
 @@ -0,0 +1,3 @@
-+noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
-+noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
-+noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
++console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
++console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
++console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait
 diff -Nura imx-bootlets-src-10.12.01/linux_prep/core/setup.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c
 --- imx-bootlets-src-10.12.01/linux_prep/core/setup.c	2010-11-04 04:35:38.000000000 -0300
 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c	2013-05-17 15:08:39.246114205 -0300
diff --git a/board/olimex/imx233_olinuxino/readme.txt b/board/olimex/imx233_olinuxino/readme.txt
index fa3f9e15cd..1c36a61e74 100644
--- a/board/olimex/imx233_olinuxino/readme.txt
+++ b/board/olimex/imx233_olinuxino/readme.txt
@@ -1,5 +1,7 @@
-This configuration is intended as a base image, it doesn't have support
-for things like WiFi, either in the kernel or packages.
+This configuration is intended as a base image.
+It includes kernel and firmware support for the common USB WiFi hardware.
+Packages for WiFi support are up to the user, you'll probably want
+one or more of: hostapd, iw, wireless_tools and/or wpa_supplicant.
 
 It also pulls up the console on the serial port, not on TV output.
 
diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig
index 206e468609..e43ee0818e 100644
--- a/configs/olimex_imx233_olinuxino_defconfig
+++ b/configs/olimex_imx233_olinuxino_defconfig
@@ -13,8 +13,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.9 headers to avoid breaking with newer kernels
-BR2_KERNEL_HEADERS_3_9=y
+# Lock headers version to match and avoid breakage
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Bootloader
 BR2_TARGET_MXS_BOOTLETS=y
@@ -25,9 +26,21 @@ BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME="imx23_olinuxino_dev"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/imx233_olinuxino/linux-3.9.config"
-BR2_LINUX_KERNEL_PATCH="board/olimex/imx233_olinuxino"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/imx233_olinuxino/linux-3.12.config"
+BR2_LINUX_KERNEL_PATCH="http://github.com/koliqi/imx23-olinuxino/raw/3.12-rc2/kernel/101-soc-audio-dts.patch http://github.com/koliqi/imx23-olinuxino/raw/3.12-rc2/kernel/ASoC_driver_for_i.MX233.patch"
 BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino"
+
+# For automatic firmware loading
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+
+# Firmware for WiFi
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_ZD1211_FIRMWARE=y

From ad142f3a2f6b381fdd602d0031477cd3715990a2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Nov 2013 09:03:29 -0300
Subject: [PATCH 6622/6849] configs/mpc8315erdb: bump to the latest and
 greatest versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../mpc8315erdb/{linux-3.11.config => linux-3.12.config}    | 0
 board/freescale/mpc8315erdb/readme.txt                      | 2 +-
 configs/freescale_mpc8315erdb_defconfig                     | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename board/freescale/mpc8315erdb/{linux-3.11.config => linux-3.12.config} (100%)

diff --git a/board/freescale/mpc8315erdb/linux-3.11.config b/board/freescale/mpc8315erdb/linux-3.12.config
similarity index 100%
rename from board/freescale/mpc8315erdb/linux-3.11.config
rename to board/freescale/mpc8315erdb/linux-3.12.config
diff --git a/board/freescale/mpc8315erdb/readme.txt b/board/freescale/mpc8315erdb/readme.txt
index f7f9c94cfb..ed707954fd 100644
--- a/board/freescale/mpc8315erdb/readme.txt
+++ b/board/freescale/mpc8315erdb/readme.txt
@@ -6,7 +6,7 @@ It won't work for NOR and will brick that bootloader!
 Also don't go playing around with different U-boot versions or flash targets
 unless you've got the necessary hardware and/or know-how to unbrick your kit.
 
-2013.04 is known good for NAND.
+2013.10 is known good for NAND.
 ******************** WARNING ********************
 
 You'll need to program the files created by buildroot into the flash.
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
index dc4c810210..11e64db182 100644
--- a/configs/freescale_mpc8315erdb_defconfig
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -12,14 +12,14 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 
 # Lock headers version to match and avoid breakage
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.5"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.12.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"

From 2fb436660c07c1d6eb0d189b1778c2e573be1b63 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 5 Nov 2013 09:03:30 -0300
Subject: [PATCH 6623/6849] configs/p1010rdb: bump to the latest and greatest
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../p1010rdb/{linux-3.11.config => linux-3.12.config}       | 0
 board/freescale/p1010rdb/readme.txt                         | 2 +-
 configs/freescale_p1010rdb_defconfig                        | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename board/freescale/p1010rdb/{linux-3.11.config => linux-3.12.config} (100%)

diff --git a/board/freescale/p1010rdb/linux-3.11.config b/board/freescale/p1010rdb/linux-3.12.config
similarity index 100%
rename from board/freescale/p1010rdb/linux-3.11.config
rename to board/freescale/p1010rdb/linux-3.12.config
diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt
index 5b56873f83..42706fde75 100644
--- a/board/freescale/p1010rdb/readme.txt
+++ b/board/freescale/p1010rdb/readme.txt
@@ -6,7 +6,7 @@ It won't work for NAND or SPI and will brick those bootloaders!
 Also don't go playing around with different U-boot versions or flash targets
 unless you've got the necessary hardware and/or know-how to unbrick your kit.
 
-2013.04 is known good for NOR.
+2013.10 is known good for NOR.
 ******************** WARNING ********************
 
 You'll need to program the files created by buildroot into the flash.
diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig
index 76a0be2161..0a727c4deb 100644
--- a/configs/freescale_p1010rdb_defconfig
+++ b/configs/freescale_p1010rdb_defconfig
@@ -11,14 +11,14 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000
 
 # Lock headers version to match and avoid breakage
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.5"
+BR2_DEFAULT_KERNEL_VERSION="3.12"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.12.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb"

From c16b7bf306dd2954896a88c18004a18d713a4659 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 5 Nov 2013 19:28:03 +0100
Subject: [PATCH 6624/6849] package/rpi-firmware: bump

Further fixes for de-interlacing.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index a7574f29d6..e6763af463 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 58036da500d936a98156d703fa220dc7db175762
+RPI_FIRMWARE_VERSION = 5343d029a5f2f09bd9801914eac0d4bf95cadc1f
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From b6cc2f457dd433014630083fc6c1fcec48a22a34 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 5 Nov 2013 19:28:04 +0100
Subject: [PATCH 6625/6849] package/rpi-userland: bump

Fixes for camera features (exposure, capture loop, shutter speed),
h264 encoding headers, EXIF thumbnails.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 9f20766aa8..9320ecf9d8 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 77d32cd6b7d1c586877b0e05f941e647e35084bc
+RPI_USERLAND_VERSION = 0d25e71ea558f32cd72b8d46cd51767c92a81d01
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 5238d0b48369bac85329aa9422fe737da32e0144 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 5 Nov 2013 19:28:05 +0100
Subject: [PATCH 6626/6849] package/tzdata: bump

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tzdata/tzdata.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
index 26f623d626..9109e2a8f6 100644
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TZDATA_VERSION = 2013c
+TZDATA_VERSION = 2013h
 TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
 TZDATA_SITE = ftp://ftp.iana.org/tz/releases
 TZDATA_DEPENDENCIES = host-zic

From 615881ff5e1a15e99396dd2615bb4ce8c415e0dc Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 5 Nov 2013 19:28:06 +0100
Subject: [PATCH 6627/6849] package/zic: bump

This bump to allign with the tzdata bump in previous commit.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/zic/zic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/zic/zic.mk b/package/zic/zic.mk
index 3d56df1c7c..780643b9e7 100644
--- a/package/zic/zic.mk
+++ b/package/zic/zic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZIC_VERSION = 2013c
+ZIC_VERSION = 2013h
 ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz
 ZIC_SITE = ftp://ftp.iana.org/tz/releases
 ZIC_LICENSE = Public domain

From f408f398f2a5258f481c7d21483d235f3068498b Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Tue, 5 Nov 2013 15:12:31 -0500
Subject: [PATCH 6628/6849] dependencies.sh: update i386 package names

This is the list needed to run the Linaro pre-built toolchain
on a 64-bit Ubuntu 13.10 system.

Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/dependencies/dependencies.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index bce5cc6663..b563f6096a 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -178,7 +178,8 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then
 	/bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture,"
 	/bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility"
 	/bin/echo -e "library."
-	/bin/echo -e "If you're running a Debian/Ubuntu distribution, install the libc:i386 package."
+	/bin/echo -e "If you're running a Debian/Ubuntu distribution, install the libc6:i386,"
+	/bin/echo -e "libstdc++6:i386, and zlib1g:i386 packages."
 	/bin/echo -e "For other distributions, refer to the documentation on how to install the 32 bits"
 	/bin/echo -e "compatibility libraries."
 	exit 1

From f72755c7e11e35188152c6ddb3e1ebd7d74eab4b Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Tue, 5 Nov 2013 23:59:17 +0100
Subject: [PATCH 6629/6849] sqlcipher: fix download url

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sqlcipher/sqlcipher.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
index 3ade403f64..e93d24d127 100644
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SQLCIPHER_VERSION = v1.1.9
-SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/$(SQLCIPHER_VERSION)
+SQLCIPHER_SITE = http://github.com/sqlcipher/sqlcipher/archive/$(SQLCIPHER_VERSION)
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES
 

From 58417d942c2a99ec5cb8ca93302444594850f81b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 6 Nov 2013 11:53:43 +0100
Subject: [PATCH 6630/6849] nettle: disable openssl support for (unused)
 examples

Works around a linker issue when statically linking:

http://autobuild.buildroot.net/results/e3f43fed8f57c52e07e20055f11680f8200fb65e/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nettle/nettle.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index e86d3e83b2..c23b4fa37a 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -10,6 +10,9 @@ NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES
 NETTLE_LICENSE = LGPLv2.1+
 NETTLE_LICENSE_FILES = COPYING.LIB
+# don't include openssl support for (unused) examples as it has problems
+# with static linking
+NETTLE_CONF_OPT = --disable-openssl
 
 # ARM assembly requires v6+ ISA
 ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_arm10t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)

From 20540184937888f4c3ddb01c33cfa72b29d621b0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Nov 2013 07:11:37 -0300
Subject: [PATCH 6631/6849] wireshark: security bump to version 1.8.11

Fixes CVE-2013-6336, CVE-2013-6337, CVE-2013-6338, CVE-2013-6339,
CVE-2013-6340, CVE-2013-4927, CVE-2013-4929, CVE-2013-4930,
CVE-2013-4931, CVE-2013-4932, CVE-2013-4933, CVE-2013-4934,
CVE-2013-4935, CVE-2013-5718, CVE-2013-5719, CVE-2013-5720,
CVE-2013-5721 and CVE-2013-5722.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/wireshark/wireshark.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index a105e5284b..9f968fda08 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRESHARK_VERSION = 1.8.8
+WIRESHARK_VERSION = 1.8.11
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license

From 62ebea18be98f1c5ed1de6ea9a801132320e54ae Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Nov 2013 07:21:34 -0300
Subject: [PATCH 6632/6849] curl: fix homepage

cURL's homepage is curl.haxx.se and not curl.haxx.nu

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libcurl/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in
index 1d6d08e680..8e2953e45b 100644
--- a/package/libcurl/Config.in
+++ b/package/libcurl/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBCURL
 	  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
 	  and Dict servers, using any of the supported protocols.
 
-	  http://curl.haxx.nu/
+	  http://curl.haxx.se/
 
 config BR2_PACKAGE_CURL
 	bool "curl binary"

From fc6b5e4411992f05ab45dac90be01ade8279e000 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 6 Nov 2013 11:00:56 +0100
Subject: [PATCH 6633/6849] busybox: minor fixes to S01logging bootscript

* The PID file is not created unless the '-m' option is passed to
  start-stop-daemon.

* Remove the mark '-m 0' option as it's not supported by busybox's
  syslogd.

* Syslogd and Klogd forks to background by default giving as a result
  that the pid stored in the PID file is not correct. Let the
  background job be done by 'start-stop-daemon' by passing '-n'
  (foreground) to the daemons and '-b' to start-stop-daemon. This
  way the pid stored in the PID files is correct.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/busybox/S01logging | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/busybox/S01logging b/package/busybox/S01logging
index 37a2c117b1..b7af2a7d5d 100644
--- a/package/busybox/S01logging
+++ b/package/busybox/S01logging
@@ -6,8 +6,8 @@
 case "$1" in
   start)
 	echo -n "Starting logging: "
-	start-stop-daemon -S -q -p /var/run/syslogd.pid --exec /sbin/syslogd -- -m 0
-	start-stop-daemon -S -q -p /var/run/klogd.pid --exec /sbin/klogd
+	start-stop-daemon -b -S -q -m -p /var/run/syslogd.pid --exec /sbin/syslogd -- -n
+	start-stop-daemon -b -S -q -m -p /var/run/klogd.pid --exec /sbin/klogd -- -n
 	echo "OK"
 	;;
   stop)

From 6f05d5ac8f34b30f87408132775dac74648d5b33 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Nov 2013 09:06:34 -0300
Subject: [PATCH 6634/6849] polarssl: bump to version 1.2.10

Fixes a memory leak in RSA blinding.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/polarssl/polarssl-shared-and-static-library.patch | 4 ++--
 package/polarssl/polarssl.mk                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 47511b24d5..7e41745d36 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,7 +9,7 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.9]
+[Gustavo: update for polarssl 1.2.10]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.9 SOVERSION 3)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.10 SOVERSION 3)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index deb2252a53..20486e3ae1 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 POLARSSL_SITE = https://polarssl.org/code/releases
-POLARSSL_VERSION = 1.2.9
+POLARSSL_VERSION = 1.2.10
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \

From ac147527e2681737ed096466b4f773d9a39bef2d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 6 Nov 2013 09:15:23 -0300
Subject: [PATCH 6635/6849] aircrack-ng: add security patch for CVE-2010-1159

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../aircrack-ng-01-CVE-2010-1159.patch        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/aircrack-ng/aircrack-ng-01-CVE-2010-1159.patch

diff --git a/package/aircrack-ng/aircrack-ng-01-CVE-2010-1159.patch b/package/aircrack-ng/aircrack-ng-01-CVE-2010-1159.patch
new file mode 100644
index 0000000000..634a01e391
--- /dev/null
+++ b/package/aircrack-ng/aircrack-ng-01-CVE-2010-1159.patch
@@ -0,0 +1,24 @@
+Fix for buffer overflow CVE-2010-1159.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/src/airodump-ng.c
++++ b/src/airodump-ng.c
+@@ -2126,7 +2126,7 @@
+                     st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
+                             +   h80211[z + 3] + 4;
+ 
+-                    if ((int)pkh.len - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0)
++                    if (caplen - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 || caplen - z < 81 + 16 || st_cur->wpa.eapol_size > 256)
+ 					{
+ 						// Ignore the packet trying to crash us.
+                     	goto write_packet;
+@@ -2158,7 +2158,7 @@
+                     st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
+                             +   h80211[z + 3] + 4;
+ 
+-                    if ((int)pkh.len - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0)
++		    if (caplen - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 || caplen - z < 81 + 16 || st_cur->wpa.eapol_size > 256)
+ 					{
+ 						// Ignore the packet trying to crash us.
+                     	goto write_packet;

From d7ec9463e2b3e440ae13bdc86dddde459f320587 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 6 Nov 2013 19:45:10 +0000
Subject: [PATCH 6636/6849] avr32: pass target arch to gcc

As suggested by Alexander Lukichev and Thomas Petazzoni on the mailing list,
only one of the two avr32 microarchitectures is relevant for Buildroot:
avr32 Linux implies the avr32b microarchitecure, as used in the ap7000.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 arch/Config.in.avr32 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/Config.in.avr32 b/arch/Config.in.avr32
index 199c150781..842958957f 100644
--- a/arch/Config.in.avr32
+++ b/arch/Config.in.avr32
@@ -3,3 +3,6 @@ config BR2_ARCH
 
 config BR2_ENDIAN
 	default "BIG"
+
+config BR2_GCC_TARGET_ARCH
+	default "ap"

From de0b7e9ff30b6202f0e4f093aad9fe18837b3d0a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 6 Nov 2013 14:38:23 +0000
Subject: [PATCH 6637/6849] connman: disable on avr32

The inotify_init1 syscall is not available on avr32. Fixes build failures
such as the following.

  http://autobuild.buildroot.net/results/0d8/0d8e7bd8bd3f227fabfb0d5feb59a5d316026d3f

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/connman/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index c74618aef6..c8b640f51a 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_GNUTLS
+	depends on !BR2_avr32 # no inotify_init1
 	depends on !BR2_UCLIBC_VERSION_0_9_32
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
@@ -50,5 +51,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 endif # BR2_PACKAGE_CONNMAN
 
 comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver"
+	depends on !BR2_avr32
 	depends on BR2_UCLIBC_VERSION_0_9_32 || \
 		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS

From fdecbd5f82361652fdca30ed20b5bd7e012c1a39 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Wed, 6 Nov 2013 13:56:20 +0000
Subject: [PATCH 6638/6849] libevas: disable on avr32

Neither epoll_create1 nor inotify_init1 is available on avr32. Fixes build
failures such as the following.

  http://autobuild.buildroot.net/results/4d435a5fc608936362d605aca696c01023be9723

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/efl/expedite/Config.in      | 2 ++
 package/efl/libecore/Config.in      | 1 +
 package/efl/libedje/Config.in       | 1 +
 package/efl/libelementary/Config.in | 1 +
 package/efl/libethumb/Config.in     | 1 +
 package/efl/libevas/Config.in       | 1 +
 package/enlightenment/Config.in     | 2 ++
 7 files changed, 9 insertions(+)

diff --git a/package/efl/expedite/Config.in b/package/efl/expedite/Config.in
index 466fd7d2d6..918c34ee49 100644
--- a/package/efl/expedite/Config.in
+++ b/package/efl/expedite/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EXPEDITE
 	select BR2_PACKAGE_LIBEVAS
 	select BR2_PACKAGE_LIBEET
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_avr32 # libevas
 	help
 	  Expedite is the official Evas benchmark tool. It can test different
 	  engines, such as X11, XRender, OpenGL (also ES variant), SDL,
@@ -12,3 +13,4 @@ config BR2_PACKAGE_EXPEDITE
 
 comment "expedite needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_avr32
diff --git a/package/efl/libecore/Config.in b/package/efl/libecore/Config.in
index 6c887f573e..41a16f9c83 100644
--- a/package/efl/libecore/Config.in
+++ b/package/efl/libecore/Config.in
@@ -38,5 +38,6 @@ config BR2_PACKAGE_LIBECORE_X_XCB
 config BR2_PACKAGE_LIBECORE_EVAS
 	bool "libecore Evas support"
 	select BR2_PACKAGE_LIBEVAS
+	depends on !BR2_avr32 # libevas
 
 endif # BR2_PACKAGE_LIBECORE
diff --git a/package/efl/libedje/Config.in b/package/efl/libedje/Config.in
index f0985dd3f1..4c3027417d 100644
--- a/package/efl/libedje/Config.in
+++ b/package/efl/libedje/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBEDJE
 	select BR2_PACKAGE_LIBEMBRYO
 	select BR2_PACKAGE_LIBEVAS
 	select BR2_PACKAGE_LUA
+	depends on !BR2_avr32 # libevas
 	help
 	  A graphical layout and animation library for animated
 	  resizable, compressed and scalable themes.
diff --git a/package/efl/libelementary/Config.in b/package/efl/libelementary/Config.in
index 59af80ec93..d4584e84f6 100644
--- a/package/efl/libelementary/Config.in
+++ b/package/efl/libelementary/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBELEMENTARY
 	select BR2_PACKAGE_LIBEVAS
 	select BR2_PACKAGE_LIBECORE
 	select BR2_PACKAGE_LIBEDJE
+	depends on !BR2_avr32 # libevas
 	help
 	  Elementary is a widget toolkit and EFL wrapper and convenience
 	  library to make it easy to build applications and tools with UIs
diff --git a/package/efl/libethumb/Config.in b/package/efl/libethumb/Config.in
index fb0032a2e1..3a2f3dc2b6 100644
--- a/package/efl/libethumb/Config.in
+++ b/package/efl/libethumb/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBETHUMB
 	select BR2_PACKAGE_LIBECORE
 	select BR2_PACKAGE_LIBECORE_EVAS
 	select BR2_PACKAGE_LIBEDJE
+	depends on !BR2_avr32 # libevas
 	help
 	  Ethumb is a library for generating thumbnail images of documents.
 
diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index f73376be1b..8c4193fdaf 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBEVAS
 	bool "libevas"
+	depends on !BR2_avr32 # no epoll_create1 or inotify_init1
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LIBEINA
 	# required to build so far
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 54c0ac670e..5df817b63e 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -26,6 +26,7 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	# libedbus -> dbus
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_avr32 # libevas
 	help
 	  Enlightenment, also known simply as E, is a stacking window
 	  manager for the X Window System which can be used alone or
@@ -38,3 +39,4 @@ config BR2_PACKAGE_ENLIGHTENMENT
 comment "enlightenment needs a toolchain w/ wchar, C++, threads"
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_avr32

From 856294dedfd88ac2497eca41da6fcd606a57f427 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 6 Nov 2013 00:28:16 +0100
Subject: [PATCH 6639/6849] package/nut: new package

'nut' are the Network UPS Tools.

[Note: original patch from Dallas, but completely revamped
 by Yann, so nothing remains from the original patch, but two
 variable names.]

Signed-off-by: Dallas Clement <dallas.a.clement@gmail.com>
[yann.morin.1998@free.fr: refresh patch, use latest version,
    add license, fix commit message, add dependencies, fix
    runtime path, fix libs-config, move to 'system utils']
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in                     |  1 +
 package/nut/Config.in                 | 20 +++++++
 package/nut/nut-0001-foo-config.patch | 72 ++++++++++++++++++++++++
 package/nut/nut.mk                    | 79 +++++++++++++++++++++++++++
 4 files changed, 172 insertions(+)
 create mode 100644 package/nut/Config.in
 create mode 100644 package/nut/nut-0001-foo-config.patch
 create mode 100644 package/nut/nut.mk

diff --git a/package/Config.in b/package/Config.in
index 4c4da5119d..c0a3f20270 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -962,6 +962,7 @@ source "package/lxc/Config.in"
 source "package/monit/Config.in"
 source "package/ncdu/Config.in"
 source "package/numactl/Config.in"
+source "package/nut/Config.in"
 source "package/polkit/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
diff --git a/package/nut/Config.in b/package/nut/Config.in
new file mode 100644
index 0000000000..5b47e8bc3f
--- /dev/null
+++ b/package/nut/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_NUT
+	bool "nut"
+	help
+	  Network UPS tools
+
+	  The primary goal of the Network UPS Tools (NUT) project is to provide
+	  support for Power Devices, such as Uninterruptible Power Supplies,
+	  Power Distribution Units and Solar Controllers.
+
+	  http://www.networkupstools.org/
+
+if BR2_PACKAGE_NUT
+
+config BR2_PACKAGE_NUT_DRIVERS
+	string "drivers"
+	help
+	  Select the individual drivers to enable, in a comma-separated list.
+	  Leave empty for all.
+
+endif # BR2_PACKAGE_NUT
diff --git a/package/nut/nut-0001-foo-config.patch b/package/nut/nut-0001-foo-config.patch
new file mode 100644
index 0000000000..7202f139cc
--- /dev/null
+++ b/package/nut/nut-0001-foo-config.patch
@@ -0,0 +1,72 @@
+configure: fix calls to {gdlib,net-snmp}-config
+
+nut directly calls to {gdlib,net-snmp}-config. In Buildroot,
+those are not in the PATH, and nut would catch those of the
+system (if they are installed), or miss them entirely.
+
+Fix that by using environment variables that will tell where
+to look for them.
+
+Note: libusb also uses libusb-config, but only as a fallback
+if pkg-config fails. Since we ensure that pkg-config exists,
+and libusb is properly installed before we build nut, there
+is no need to fix the libusb-config calls, since they won't
+be called at all.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN nut-2.6.5.orig/m4/nut_check_libgd.m4 nut-2.6.5/m4/nut_check_libgd.m4
+--- nut-2.6.5.orig/m4/nut_check_libgd.m4	2012-07-31 19:38:56.000000000 +0200
++++ nut-2.6.5/m4/nut_check_libgd.m4	2013-11-01 16:24:02.626549810 +0100
+@@ -20,7 +20,7 @@
+ 	LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+ 
+ 	AC_MSG_CHECKING(for gd version via gdlib-config)
+-	GD_VERSION=`gdlib-config --version 2>/dev/null`
++	GD_VERSION=`${GDLIB_CONFIG} --version 2>/dev/null`
+ 	if test "$?" != "0" -o -z "${GD_VERSION}"; then
+ 		GD_VERSION="none"
+ 	fi
+@@ -34,9 +34,9 @@
+ 		AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]])
+ 		;;
+ 	*)
+-		CFLAGS="`gdlib-config --includes 2>/dev/null`"
+-		LDFLAGS="`gdlib-config --ldflags 2>/dev/null`"
+-		LIBS="`gdlib-config --libs 2>/dev/null`"
++		CFLAGS="`${GDLIB_CONFIG} --includes 2>/dev/null`"
++		LDFLAGS="`${GDLIB_CONFIG} --ldflags 2>/dev/null`"
++		LIBS="`${GDLIB_CONFIG} --libs 2>/dev/null`"
+ 		;;
+ 	esac
+ 
+diff -durN nut-2.6.5.orig/m4/nut_check_libnetsnmp.m4 nut-2.6.5/m4/nut_check_libnetsnmp.m4
+--- nut-2.6.5.orig/m4/nut_check_libnetsnmp.m4	2012-07-31 19:38:56.000000000 +0200
++++ nut-2.6.5/m4/nut_check_libnetsnmp.m4	2013-11-01 16:30:07.398282923 +0100
+@@ -15,7 +15,7 @@
+ 
+ 	dnl See which version of the Net-SNMP library (if any) is installed
+ 	AC_MSG_CHECKING(for Net-SNMP version via net-snmp-config)
+-	SNMP_VERSION=`net-snmp-config --version 2>/dev/null`
++	SNMP_VERSION=`${NET_SNMP_CONFIG} --version 2>/dev/null`
+ 	if test "$?" != "0" -o -z "${SNMP_VERSION}"; then
+ 		SNMP_VERSION="none"
+ 	fi
+@@ -33,7 +33,7 @@
+ 			CFLAGS="${withval}"
+ 			;;
+ 		esac
+-	], [CFLAGS="`net-snmp-config --base-cflags 2>/dev/null`"])
++	], [CFLAGS="`${NET_SNMP_CONFIG} --base-cflags 2>/dev/null`"])
+ 	AC_MSG_RESULT([${CFLAGS}])
+ 
+ 	AC_MSG_CHECKING(for Net-SNMP libs)
+@@ -48,7 +48,7 @@
+ 			LIBS="${withval}"
+ 			;;
+ 		esac
+-	], [LIBS="`net-snmp-config --libs 2>/dev/null`"])
++	], [LIBS="`${NET_SNMP_CONFIG} --libs 2>/dev/null`"])
+ 	AC_MSG_RESULT([${LIBS}])
+ 
+ 	dnl Check if the Net-SNMP library is usable
diff --git a/package/nut/nut.mk b/package/nut/nut.mk
new file mode 100644
index 0000000000..8cb8a019ea
--- /dev/null
+++ b/package/nut/nut.mk
@@ -0,0 +1,79 @@
+################################################################################
+#
+# nut
+#
+################################################################################
+
+NUT_VERSION = 2.6.5
+NUT_SITE = http://www.networkupstools.org/source/2.6/
+NUT_LICENSE = GPLv2+, GPLv3+ (python scripts), GPL/Artistic (perl client)
+NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3
+NUT_DEPENDENCIES = host-pkgconf
+
+# Our patch changes m4 macros, so we need to autoreconf
+NUT_AUTORECONF = YES
+
+# Put the PID files in a read-write place (/var/run is a tmpfs)
+# since the default location (/var/state/ups) maybe readonly.
+NUT_CONF_OPT = \
+	--with-altpidpath=/var/run/upsd
+
+NUT_CONF_ENV = \
+	GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \
+	NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
+
+# For uClibc-based toolchains, nut forgets to link with -lm
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+NUT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lm"
+endif
+
+ifeq ($(call qstrip,$(BR2_PACKAGE_NUT_DRIVERS)),)
+NUT_CONF_OPT += --with-drivers=all
+else
+NUT_CONF_OPT += --with-drivers=$(BR2_PACKAGE_NUT_DRIVERS)
+endif
+
+ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS),yy)
+NUT_DEPENDENCIES += avahi dbus
+NUT_CONF_OPT += --with-avahi
+else
+NUT_CONF_OPT += --without-avahi
+endif
+
+# gd with support for png is required for the CGI
+ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
+NUT_DEPENDENCIES += gd libpng
+NUT_CONF_OPT += --with-cgi
+else
+NUT_CONF_OPT += --without-cgi
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+NUT_DEPENDENCIES += libusb-compat
+NUT_CONF_OPT += --with-usb
+else
+NUT_CONF_OPT += --without-usb
+endif
+
+ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),y)
+NUT_DEPENDENCIES += neon
+NUT_CONF_OPT += --with-neon
+else
+NUT_CONF_OPT += --without-neon
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+NUT_DEPENDENCIES += netsnmp
+NUT_CONF_OPT += --with-snmp
+else
+NUT_CONF_OPT += --without-snmp
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NUT_DEPENDENCIES += openssl
+NUT_CONF_OPT += --with-ssl
+else
+NUT_CONF_OPT += --without-ssl
+endif
+
+$(eval $(autotools-package))

From 7f02c73f8d98823a6ccd7abaca8f2af6e6bf8315 Mon Sep 17 00:00:00 2001
From: mathieu benoit <mathieu.benoit@savoirfairelinux.com>
Date: Wed, 6 Nov 2013 00:28:18 +0100
Subject: [PATCH 6640/6849] rpi: improve documentation

Signed-off-by: Mathieu Benoit <mathieu.benoit@savoirfairelinux.com>
[yann.morin.1998@free.fr: further improvements for readability and
    completeness]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/raspberrypi/readme.txt | 167 ++++++++++++++++++-----------------
 1 file changed, 84 insertions(+), 83 deletions(-)

diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt
index 32877951da..47b48186df 100644
--- a/board/raspberrypi/readme.txt
+++ b/board/raspberrypi/readme.txt
@@ -4,124 +4,125 @@ Intro
 =====
 
 To be able to use your RaspberryPi board with the images generated by
-Buildroot, you have a prior choice to make, will you use:
-    - Volatile rootfs in RAM (The rootfs is an initramfs) or
-    - Persistent rootfs on the SDCard
+Buildroot, you have to choose whether you will use:
+
+    * Volatile rootfs in RAM (the rootfs is an initramfs) or
+    * Persistent rootfs on the SDCard
 
 Also, a good source of information is http://elinux.org/R-Pi_Hub
 
-Volatile rootfs
+How to build it
 ===============
 
-How to build it
----------------
+Configure Buildroot
+-------------------
+
+The rpi_defconfig configuration is a minimal configuration with all that
+is required to bring the Raspberry Pi. You should base your work on this
+defconfig:
+
+  $ make rpi_defconfig
+
+If you want to use a persistent rootfs, skip to "Build the rootfs", below.
+
+For a volatile rootfs, you have to slightly adjust the configuration:
+
+  $ make menuconfig
+    * Select "Filesystem images"
+    * Select "initial RAM filesystem linked into linux kernel"
+
+You may also deselect "tar the root filesystem".
+
+Build the rootfs
+----------------
 
-You need to use the rpi_defconfig, to do so:
- * make rpi_defconfig
+Note: you will need to have access to the network, since Buildroot will
+download the packages' sources.
 
-Then, you need to select the kind of images you want:
- * make menuconfig
- * Select "Filesystem images"
- * Select "initial RAM filesystem linked into linux kernel"
+You may now build your rootfs with:
 
-What is generated
------------------
+  $ make
+
+(This may take a while; consider getting yourself a coffee ;-) )
+
+Result of the build
+-------------------
 
 After building, you should obtain this tree:
 
     output/images/
     +-- rootfs.tar
     +-- rpi-firmware
-    |   +-- bootcode.bin
-    |   +-- config.txt
-    |   +-- fixup_cd.dat
-    |   +-- fixup.dat
-    |   +-- start_cd.elf
-    |   `-- start.elf
+    |   +-- bootcode.bin
+    |   +-- config.txt
+    |   +-- fixup_cd.dat
+    |   +-- fixup.dat
+    |   +-- start_cd.elf
+    |   `-- start.elf
     `-- zImage
 
-Note : rootfs.tar will only be there if you kept "tar the root filesystem"
-option selected in "Filesystem images".
-
-Where should the binaries be copied on the SDCard
--------------------------------------------------
+Note for Volatile: rootfs.tar will only be there if you kept
+"tar the root filesystem" option selected in "Filesystem images".
 
-Your SDCard must have its first partition using fat32 and marked bootable.
+Prepare you SDCard
+==================
 
-At the root of the partition, the RaspberryPi must find the following files:
+For more information, visit
+http://elinux.org/RPi_Advanced_Setup#Advanced_SD_card_setup
 
- * bootcode.bin
- * config.txt
- * fixup_cd.dat
- * fixup.dat
- * start_cd.elf
- * start.elf
- * zImage
+In summary, your SDCard must have first partition in fat32 and marked bootable.
 
-So you should copy the entire content of output/images/rpi-firmware along with
-zImage.
+Create the required partitions:
+  - for a persistent rootfs, 10MiB is enough memory for the boot fat32
+    partition, and a second partition is required for the root filesystem
+  - for a volatile rootfs, 50MiB is required for the boot fat32 partition
 
 Note: You can create any number of partitions you desire, the only requirement
-is that the first partition must be using fat32 and bootable.
+is that the first partition must be using fat32 and be bootable.
 
-Persistent rootfs
-=================
-
-How to build it
----------------
+Mount the partitions (adjust 'sdX' to match your SDcard device):
 
-You only need to use the rpi_defconfig, to do so:
- * make rpi_defconfig
+  $ sudo mount /dev/sdX1 /mnt/mountpointboot
+  $ sudo mount /dev/sdX2 /mnt/mountpointroot    (only for persistent rootfs)
 
-What is generated
------------------
+Install the binaries to the SDCard
+----------------------------------
 
-After building, you should obtain this tree:
+At the root of the boot partition, the RaspberryPi must find the following
+files:
 
-    output/images/
-    +-- rootfs.tar
-    +-- rpi-firmware
-    |   +-- bootcode.bin
-    |   +-- config.txt
-    |   +-- fixup_cd.dat
-    |   +-- fixup.dat
-    |   +-- start_cd.elf
-    |   `-- start.elf
-    `-- zImage
+    * bootcode.bin
+    * config.txt
+    * fixup.dat
+    * start.elf
+    * zImage
 
-Where should the binaries be copied on the SDCard
--------------------------------------------------
+For example:
 
-Your SDCard must have its first partition using fat32 and marked bootable.
-It should also have another partition which will contain your rootfs, it should
-be partitioned as ext4.
+ $ cp output/images/rpi-firmware/* /mnt/mountpointboot
+ $ cp output/images/zImage /mnt/mountpointboot/zImage.img
 
-Boot partition
-~~~~~~~~~~~~~~
+Note: The default name is kernel.img.
+Actually, the name is zImage and it's define in the file config.txt like:
+kernel=zImage
 
-The first partition will contain everything used to boot the RaspberryPi.
-You must copy theses files at the root of partition:
+If you use a volatile rootfs, Skip to "Finish", below. For a persistent
+rootfs, there are further steps to do.
 
- * bootcode.bin
- * config.txt
- * fixup_cd.dat
- * fixup.dat
- * start_cd.elf
- * start.elf
- * zImage
+Extract (as root!) the contents of the rootfs.tar archive into the second
+partition you created above:
 
-So you should copy the entire content of output/images/rpi-firmware along with
-zImage.
+  $ sudo tar xf rootfs.tar -C /mnt/mountpointroot
 
-Rootfs partition
-~~~~~~~~~~~~~~~~
+Finish
+======
 
-The second partition will contain your rootfs.
-Simply extract (as root!) the contents of the rootfs.tar archive
-into this partition.
+Unmount all the partitions:
 
-For example: (Assuming mountpoint is a directory and exist)
+  $ sudo umount /mnt/mountpointboot
+  $ sudo umount /mnt/mountpointroot     (only for persistent rootfs)
 
- $ sudo mount /dev/sdXY /mnt/mountpoint
- $ sudo tar xf rootfs.tar -C /mnt/mountpoint
+And eject your SDcard from your computer SDcard reader.
 
+Insert the SDcard into your Raspberry Pi, and power it up. Your new system
+should come up, now.

From 971faf828d8d243141b7a689a787f335864e37c0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Wed, 6 Nov 2013 00:28:20 +0100
Subject: [PATCH 6641/6849] Makefile: fix out-of-tree builds with multiple
 targets with 'all'

For out-of-tree builds, this use-case fails to build:
    $ make clean all

This is because 'all' is filtered-out in the Makefile wrapper, since
the wrapper itself has a 'all' target.

The 'all' target is just the usual naming for the default target in a
Makefile. In fact, the first target is the default one, so we can name
it whatever we want.

Rename the Makefile wrapper 'all' target to avoid name-clashing.

Fixes #6644.

Reported-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Ryan Barnett <rjbarnet@rockwellcollins.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/scripts/mkmakefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/support/scripts/mkmakefile b/support/scripts/mkmakefile
index cef2ec7070..27b15073f3 100755
--- a/support/scripts/mkmakefile
+++ b/support/scripts/mkmakefile
@@ -32,16 +32,16 @@ MAKEFLAGS += --no-print-directory
 
 .PHONY: all \$(MAKECMDGOALS)
 
-all	:= \$(filter-out all Makefile,\$(MAKECMDGOALS))
+all	:= \$(filter-out Makefile,\$(MAKECMDGOALS))
 
-all:
+_all:
 	\$(MAKE) \$(MAKEARGS) \$(all)
 
 Makefile:;
 
-\$(all): all
+\$(all): _all
 	@:
 
-%/: all
+%/: _all
 	@:
 EOF

From 00a9540367577d5fb653ecc01229f9016e08419e Mon Sep 17 00:00:00 2001
From: Alexander Lukichev <alexander.lukichev@gmail.com>
Date: Thu, 7 Nov 2013 08:32:01 +0200
Subject: [PATCH 6642/6849] openpgm: disable on AVR32

openpgm doesn't build correctly on AVR32 using
gcc-4.2.2-avr32-2.1.5 toolchain: it is configured to call
intrinsic atomic functions not provided by the toolchain,
so they are propagated as unresolved external symbols in the
built openpgm libraries. This breaks programs that try to link
openpgm, because they do not know where to get those either. For
instance, it breaks building zeromq tests when PGM support is
selected.

This commit disables openpgm on AVR32 due to apparent absence of
interest in this package on that architecture and it breaking too
many test builds.

Fixes http://autobuild.buildroot.net/results/5a3261109ea63ba17375003eabd8b5d88757865f/
(at least)

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/openpgm/Config.in | 2 ++
 package/zeromq/Config.in  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
index cae74f76b8..e34740c32a 100644
--- a/package/openpgm/Config.in
+++ b/package/openpgm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENPGM
 	bool "openpgm"
+	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 # lacks required builtins
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INET_IPV6
 	depends on BR2_USE_WCHAR
@@ -14,3 +15,4 @@ config BR2_PACKAGE_OPENPGM
 
 comment "openpgm needs a toolchain w/ wchar, threads, IPv6"
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
+	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index 42e13d2b0a..dad1dd4641 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -30,6 +30,7 @@ config BR2_PACKAGE_ZEROMQ
 config BR2_PACKAGE_ZEROMQ_PGM
 	bool "PGM/EPGM support"
 	depends on BR2_PACKAGE_ZEROMQ
+	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 # openpgm
 	select BR2_PACKAGE_OPENPGM
 	help
 	  Add support for Pragmatic General Multicast protocol (RFC 3208)

From 1fc19cdfc0c03cc7e96d1faac5b9f23204ff91f3 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 7 Nov 2013 09:24:49 +0000
Subject: [PATCH 6643/6849] uclibc: reinstate support for version 0.9.31

This patch reinstates support for uClibc version 0.9.31, which was removed
from Buildroot in commit 8abb5b33c1aae035cf48b1c81104b433ff884c64

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libglib2/libglib2.mk                  |   2 +-
 ...libc-0001-add-bsd-endian-conversions.patch |  64 +++++
 .../uClibc-0002-add-inotify-init1.patch       |  64 +++++
 .../uClibc-0003-add-sock-cloexec.patch        |  43 +++
 .../uClibc-0004-export-strverscmp.patch       |  30 ++
 ...05-fix-daylight-saving-time-handling.patch |  36 +++
 .../uClibc-0006-fix-error-locale-utf-8.patch  |  17 ++
 .../uClibc-0007-linuxthreads-errno-fix.patch  |  98 +++++++
 ...bc-0008-more-workarounds-GCC-PR32219.patch |  40 +++
 .../uclibc/0.9.31.1/uClibc-0009-unshare.patch |  74 +++++
 .../uClibc-0010-workaround-GCC-PR32219.patch  |  57 ++++
 .../uClibc-0011-startfiles-Make-targets.patch |  60 ++++
 package/uclibc/Config.in                      |   8 +-
 package/uclibc/uClibc-0.9.31.config           | 259 ++++++++++++++++++
 14 files changed, 850 insertions(+), 2 deletions(-)
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0009-unshare.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch
 create mode 100644 package/uclibc/uClibc-0.9.31.config

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 51b2fc109c..f770d3a9c5 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -51,7 +51,7 @@ LIBGLIB2_CONF_ENV = \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r
-ifeq ($(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 else
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
diff --git a/package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch b/package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch
new file mode 100644
index 0000000000..652d7c9f10
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch
@@ -0,0 +1,64 @@
+From c6d6237819037168a6923ac080e348e54615422c Mon Sep 17 00:00:00 2001
+From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Date: Tue, 1 Jun 2010 23:22:57 +0400
+Subject: [PATCH] endian.h: add BSD convertions between big/little-endian byte order
+
+This patch adds support for convertion of values between host and
+big-/little-endian byte order.
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/endian.h |   38 ++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 38 insertions(+), 0 deletions(-)
+
+diff --git a/include/endian.h b/include/endian.h
+index 2f7bce1..0ba7384 100644
+--- a/include/endian.h
++++ b/include/endian.h
+@@ -55,4 +55,42 @@
+ # define __LONG_LONG_PAIR(HI, LO) HI, LO
+ #endif
+ 
++
++#ifdef __USE_BSD
++/* Conversion interfaces.  */
++# include <byteswap.h>
++
++# if __BYTE_ORDER == __LITTLE_ENDIAN
++#  define htobe16(x) __bswap_16 (x)
++#  define htole16(x) (x)
++#  define be16toh(x) __bswap_16 (x)
++#  define le16toh(x) (x)
++
++#  define htobe32(x) __bswap_32 (x)
++#  define htole32(x) (x)
++#  define be32toh(x) __bswap_32 (x)
++#  define le32toh(x) (x)
++
++#  define htobe64(x) __bswap_64 (x)
++#  define htole64(x) (x)
++#  define be64toh(x) __bswap_64 (x)
++#  define le64toh(x) (x)
++# else
++#  define htobe16(x) (x)
++#  define htole16(x) __bswap_16 (x)
++#  define be16toh(x) (x)
++#  define le16toh(x) __bswap_16 (x)
++
++#  define htobe32(x) (x)
++#  define htole32(x) __bswap_32 (x)
++#  define be32toh(x) (x)
++#  define le32toh(x) __bswap_32 (x)
++
++#  define htobe64(x) (x)
++#  define htole64(x) __bswap_64 (x)
++#  define be64toh(x) (x)
++#  define le64toh(x) __bswap_64 (x)
++# endif
++#endif
++
+ #endif	/* endian.h */
+-- 
+1.7.3.4
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch b/package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch
new file mode 100644
index 0000000000..cbec426238
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch
@@ -0,0 +1,64 @@
+From a2e5630af426f85fdd8721b2820786d9bd2aa695 Mon Sep 17 00:00:00 2001
+From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Date: Tue, 1 Jun 2010 20:02:54 +0400
+Subject: [PATCH] inotify: add inotify_init1 system call support
+
+This patch introduces support for inotify_init1 system call, found
+since Linux 2.6.27.
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/inotify.c     |    4 ++++
+ libc/sysdeps/linux/common/sys/inotify.h |   13 +++++++++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c
+index e5a6120..e35f043 100644
+--- a/libc/sysdeps/linux/common/inotify.c
++++ b/libc/sysdeps/linux/common/inotify.c
+@@ -15,6 +15,10 @@
+ _syscall0(int, inotify_init)
+ #endif
+ 
++#ifdef __NR_inotify_init1
++_syscall1(int, inotify_init1, int, flags)
++#endif
++
+ #ifdef __NR_inotify_add_watch
+ _syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask)
+ #endif
+diff --git a/libc/sysdeps/linux/common/sys/inotify.h b/libc/sysdeps/linux/common/sys/inotify.h
+index 0131db9..dc4e19d 100644
+--- a/libc/sysdeps/linux/common/sys/inotify.h
++++ b/libc/sysdeps/linux/common/sys/inotify.h
+@@ -22,6 +22,16 @@
+ #include <stdint.h>
+ 
+ 
++/* Flags for the parameter of inotify_init1.  */
++enum
++  {
++    IN_CLOEXEC = 02000000,
++#define IN_CLOEXEC IN_CLOEXEC
++    IN_NONBLOCK = 04000
++#define IN_NONBLOCK IN_NONBLOCK
++  };
++
++
+ /* Structure describing an inotify event.  */
+ struct inotify_event
+ {
+@@ -79,6 +89,9 @@ __BEGIN_DECLS
+ /* Create and initialize inotify instance.  */
+ extern int inotify_init (void) __THROW;
+ 
++/* Create and initialize inotify instance.  */
++extern int inotify_init1 (int __flags) __THROW;
++
+ /* Add watch of object NAME to inotify instance FD.  Notify about
+    events specified by MASK.  */
+ extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
+-- 
+1.7.3.4
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch b/package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch
new file mode 100644
index 0000000000..a7089a98ac
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch
@@ -0,0 +1,43 @@
+From 83333e9c873e4eca6b2c945f7770b1f5373b0427 Mon Sep 17 00:00:00 2001
+From: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Date: Tue, 1 Jun 2010 20:02:39 +0400
+Subject: [PATCH] bits/socket.h: add SOCK_CLOEXEC and SOCK_NONBLOCK support
+
+This patch adds support for SOCK_CLOEXEC and SOCK_NONBLOCK socket
+descriptor flags, which are introduced since Linux 2.6.27
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/socket.h |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
+index ac5a433..11f6e97 100644
+--- a/libc/sysdeps/linux/common/bits/socket.h
++++ b/libc/sysdeps/linux/common/bits/socket.h
+@@ -53,10 +53,20 @@ enum __socket_type
+   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
+ 				   datagrams of fixed maximum length.  */
+ #define SOCK_SEQPACKET SOCK_SEQPACKET
+-  SOCK_PACKET = 10		/* Linux specific way of getting packets
++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
+ 				   at the dev level.  For writing rarp and
+ 				   other similar things on the user level. */
+ #define SOCK_PACKET SOCK_PACKET
++
++  /* Flags to be ORed into the type parameter of socket and socketpair and
++     used for the flags parameter of paccept.  */
++
++  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
++				   new descriptor(s).  */
++#define SOCK_CLOEXEC SOCK_CLOEXEC
++  SOCK_NONBLOCK = 04000		/* Atomically mark descriptor(s) as
++				   non-blocking.  */
++#define SOCK_NONBLOCK SOCK_NONBLOCK
+ };
+ 
+ /* Protocol families.  */
+-- 
+1.7.3.4
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch b/package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch
new file mode 100644
index 0000000000..19bc021b88
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch
@@ -0,0 +1,30 @@
+From 139b8f0c673fed465d27f99c98568e5d5e1b9b72 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 4 Jun 2010 13:36:30 +0200
+Subject: [PATCH] strverscmp: I forgot to export it
+
+Result was:
+
+strverscmp.o:
+000000ec T __GI_strverscmp
+
+i.e. no plain "strverscmp"!
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/string/strverscmp.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libc/string/strverscmp.c b/libc/string/strverscmp.c
+index 74ae4c6..b19e8f0 100644
+--- a/libc/string/strverscmp.c
++++ b/libc/string/strverscmp.c
+@@ -115,3 +115,4 @@ int strverscmp (const char *s1, const char *s2)
+       return state;
+   }
+ }
++libc_hidden_def(strverscmp)
+-- 
+1.7.3.4
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch b/package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch
new file mode 100644
index 0000000000..5a96113877
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch
@@ -0,0 +1,36 @@
+From 47f3da1cf49377c25772bb54d07db55225bbb142 Mon Sep 17 00:00:00 2001
+From: Guillaume Bourcier <guillaumebourcier@free.fr>
+Date: Tue, 11 Oct 2011 13:45:33 +0200
+Subject: [PATCH] libc: fix daylight saving time handling
+
+The algorithm computing daylight saving time incorrectly adds a day for
+each month after January for leap years. The clock shift from/to DST can
+be delayed if the last Sunday of a transition month is exactly seven
+days before the first of the following month.
+
+This change adds a day for the February month only.
+
+Signed-off-by: Guillaume Bourcier <guillaumebourcier@free.fr>
+Signed-off-by: Richard Braun <rbraun@sceen.net>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ libc/misc/time/time.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
+index 19d68e1..8e2ebf1 100644
+--- a/libc/misc/time/time.c
++++ b/libc/misc/time/time.c
+@@ -689,7 +689,7 @@ static int tm_isdst(register const struct tm *__restrict ptm,
+ 					++day;
+ 				}
+ 				monlen = 31 + day_cor[r->month -1] - day_cor[r->month];
+-				if (isleap && (r->month > 1)) {
++				if (isleap && (r->month == 2)) {
+ 					++monlen;
+ 				}
+ 				/* Wweekday (0 is Sunday) of 1st of the month
+-- 
+1.7.3.4
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch b/package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch
new file mode 100644
index 0000000000..1305add50a
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch
@@ -0,0 +1,17 @@
+---
+ extra/locale/gen_wc8bit.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: uClibc-0.9.31/extra/locale/gen_wc8bit.c
+===================================================================
+--- uClibc-0.9.31.orig/extra/locale/gen_wc8bit.c
++++ uClibc-0.9.31/extra/locale/gen_wc8bit.c
+@@ -120,7 +120,7 @@
+ 		}
+ 
+  locale_failure:
+-		printf("could not find a UTF8 locale ... please enable en_US.UTF-8\n");
++		fprintf(stderr, "could not find a UTF8 locale ... please enable en_US.UTF-8\n");
+ 		return EXIT_FAILURE;
+  locale_success:
+ 		pclose(fp);
diff --git a/package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch b/package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch
new file mode 100644
index 0000000000..c49821bde7
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch
@@ -0,0 +1,98 @@
+From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 5 Jul 2010 14:08:17 +0200
+Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
+
+Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
+
+__errno_location / __h_errno_location access has to go through the PLT
+like malloc/free, so the linuxthread variants gets used instead when
+compiling with -pthread.
+
+Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/netdb.h                               |    1 -
+ libc/misc/internals/__errno_location.c        |    3 ---
+ libc/misc/internals/__h_errno_location.c      |    1 -
+ libc/misc/internals/__uClibc_main.c           |    2 --
+ libc/sysdeps/linux/common/bits/errno.h        |    1 -
+ libc/sysdeps/linux/common/bits/uClibc_errno.h |    3 ---
+ 6 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/include/netdb.h b/include/netdb.h
+index 9d3807d..ac411ab 100644
+--- a/include/netdb.h
++++ b/include/netdb.h
+@@ -59,7 +59,6 @@ __BEGIN_DECLS
+ 
+ /* Function to get address of global `h_errno' variable.  */
+ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__h_errno_location)
+ 
+ /* Macros for accessing h_errno from inside libc.  */
+ #ifdef _LIBC
+diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
+index 487a9c2..0620860 100644
+--- a/libc/misc/internals/__errno_location.c
++++ b/libc/misc/internals/__errno_location.c
+@@ -11,6 +11,3 @@ int * weak_const_function __errno_location (void)
+ {
+     return &errno;
+ }
+-#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
+-libc_hidden_weak(__errno_location)
+-#endif
+diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
+index 213d398..235df4e 100644
+--- a/libc/misc/internals/__h_errno_location.c
++++ b/libc/misc/internals/__h_errno_location.c
+@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
+ {
+     return &h_errno;
+ }
+-libc_hidden_weak(__h_errno_location)
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index 6e520fa..f4a9ebb 100644
+--- a/libc/misc/internals/__uClibc_main.c
++++ b/libc/misc/internals/__uClibc_main.c
+@@ -64,9 +64,7 @@ void internal_function _dl_aux_init (ElfW(auxv_t) *av);
+  * Prototypes.
+  */
+ extern int *weak_const_function __errno_location(void);
+-libc_hidden_proto(__errno_location)
+ extern int *weak_const_function __h_errno_location(void);
+-libc_hidden_proto(__h_errno_location)
+ 
+ extern void weak_function _stdio_init(void) attribute_hidden;
+ #ifdef __UCLIBC_HAS_LOCALE__
+diff --git a/libc/sysdeps/linux/common/bits/errno.h b/libc/sysdeps/linux/common/bits/errno.h
+index 0bf6354..de9688a 100644
+--- a/libc/sysdeps/linux/common/bits/errno.h
++++ b/libc/sysdeps/linux/common/bits/errno.h
+@@ -43,7 +43,6 @@
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+-libc_hidden_proto(__errno_location)
+ 
+ #  ifdef __UCLIBC_HAS_THREADS__
+ /* When using threads, errno is a per-thread value.  */
+diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h
+index 9c15618..79eb7e6 100644
+--- a/libc/sysdeps/linux/common/bits/uClibc_errno.h
++++ b/libc/sysdeps/linux/common/bits/uClibc_errno.h
+@@ -33,9 +33,6 @@ extern int *__errno_location (void) __THROW __attribute__ ((__const__))
+ ;
+ # if defined __UCLIBC_HAS_THREADS__
+ #  include <tls.h>
+-#  if defined USE___THREAD && USE___THREAD
+-libc_hidden_proto(__errno_location)
+-#  endif
+ # endif
+ 
+ #endif /* !__ASSEMBLER__ */
+-- 
+1.7.1
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch b/package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch
new file mode 100644
index 0000000000..9e6953224c
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch
@@ -0,0 +1,40 @@
+From aa67771881d65373da448ad5f7a8393f3a1d9469 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Wed, 30 Jun 2010 14:46:37 +0300
+Subject: [PATCH] more workarounds for GCC PR32219
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 2e53dd645d5348f207cec7f8595969dc566c5a55 workarounds GCC
+bug when accessing _locale_init and _stdio_init. We need the same
+fix for __errno_location and __h_errno_location otherwise we crash
+calling null with static and non-threaded builds.
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/misc/internals/__uClibc_main.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index 3f09ad2..58f6643 100644
+--- a/libc/misc/internals/__uClibc_main.c
++++ b/libc/misc/internals/__uClibc_main.c
+@@ -447,11 +447,11 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
+      * have resulted in errno being set nonzero, so set it to 0 before
+      * we call main.
+      */
+-    if (likely(__errno_location!=NULL))
++    if (likely(not_null_ptr(__errno_location)))
+ 	*(__errno_location()) = 0;
+ 
+     /* Set h_errno to 0 as well */
+-    if (likely(__h_errno_location!=NULL))
++    if (likely(not_null_ptr(__h_errno_location)))
+ 	*(__h_errno_location()) = 0;
+ 
+ #if defined HAVE_CLEANUP_JMP_BUF && defined __UCLIBC_HAS_THREADS_NATIVE__
+-- 
+1.7.1
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0009-unshare.patch b/package/uclibc/0.9.31.1/uClibc-0009-unshare.patch
new file mode 100644
index 0000000000..ad440d9dc2
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0009-unshare.patch
@@ -0,0 +1,74 @@
+Backport of unshare() syscall.
+From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+---
+diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h
+--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h	2011-06-08 15:58:40.000000000 -0300
++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h	2011-12-05 08:10:02.491978849 -0300
+@@ -58,7 +58,13 @@
+ 				      force CLONE_PTRACE on this clone.  */
+ # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
+ 					  the child.  */
+-# define CLONE_STOPPED	0x02000000 /* Start in stopped state.  */
++# define CLONE_STOPPED 0x02000000 /* Start in stopped state.  */
++# define CLONE_NEWUTS  0x04000000      /* New utsname group.  */
++# define CLONE_NEWIPC  0x08000000      /* New ipcs.  */
++# define CLONE_NEWUSER 0x10000000      /* New user namespace.  */
++# define CLONE_NEWPID  0x20000000      /* New pid namespace.  */
++# define CLONE_NEWNET  0x40000000      /* New network namespace.  */
++# define CLONE_IO      0x80000000      /* Clone I/O context.  */
+ #endif
+ 
+ /* The official definition.  */
+@@ -74,11 +80,9 @@
+ extern int clone (int (*__fn) (void *__arg), void *__child_stack,
+ 		  int __flags, void *__arg, ...) __THROW;
+ 
+-#if 0
+ /* Unshare the specified resources.  */
+ extern int unshare (int __flags) __THROW;
+ #endif
+-#endif
+ 
+ __END_DECLS
+ 
+diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in
+--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in	2011-06-08 15:58:40.000000000 -0300
++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in	2011-12-05 08:23:28.353757602 -0300
+@@ -31,7 +31,8 @@
+ 	remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
+ 	sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
+ 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
+-	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC))
++	sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \
++	vhangup.c,$(CSRC))
+ endif
+ 
+ ifneq ($(UCLIBC_BSD_SPECIFIC),y)
+diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c
+--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c	1969-12-31 21:00:00.000000000 -0300
++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c	2011-12-05 08:22:45.954453512 -0300
+@@ -0,0 +1,21 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * unshare() for uClibc
++ *
++ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <sched.h>
++
++#if defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__
++_syscall1(int, unshare, int, flags)
++#else
++int unshare(int flags) 
++{   
++    __set_errno(ENOSYS);
++    return -1;
++}
++#endif
diff --git a/package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch b/package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch
new file mode 100644
index 0000000000..242a5264b8
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch
@@ -0,0 +1,57 @@
+From 2e53dd645d5348f207cec7f8595969dc566c5a55 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 17 May 2010 15:56:19 +0200
+Subject: [PATCH] workaround GCC PR32219
+
+we ended up calling 0
+Fixes bug #1033
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/misc/internals/__uClibc_main.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
+index f9e1244..4ee4443 100644
+--- a/libc/misc/internals/__uClibc_main.c
++++ b/libc/misc/internals/__uClibc_main.c
+@@ -105,6 +105,17 @@ _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer,
+ 
+ #endif /* !SHARED */
+ 
++/* Defeat compiler optimization which assumes function addresses are never NULL */
++static __always_inline int not_null_ptr(const void *p)
++{
++	const void *q;
++	__asm__ (""
++		: "=r" (q) /* output */
++		: "0" (p) /* input */
++	);
++	return q != 0;
++}
++
+ /*
+  * Prototypes.
+  */
+@@ -254,7 +265,7 @@ void __uClibc_init(void)
+ 
+ #ifdef __UCLIBC_HAS_LOCALE__
+     /* Initialize the global locale structure. */
+-    if (likely(_locale_init!=NULL))
++    if (likely(not_null_ptr(_locale_init)))
+ 	_locale_init();
+ #endif
+ 
+@@ -264,7 +275,7 @@ void __uClibc_init(void)
+      * Thus we get a nice size savings because the stdio functions
+      * won't be pulled into the final static binary unless used.
+      */
+-    if (likely(_stdio_init != NULL))
++    if (likely(not_null_ptr(_stdio_init)))
+ 	_stdio_init();
+ 
+ }
+-- 
+1.7.1
+
diff --git a/package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch b/package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch
new file mode 100644
index 0000000000..9a7f3045c5
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch
@@ -0,0 +1,60 @@
+Add startfiles and install_startfiles targets to the top-level Makefile, as
+in uClibc 0.9.32 and later.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/Makefile.help b/Makefile.help
+--- a/Makefile.help	2011-06-08 19:58:40.000000000 +0100
++++ b/Makefile.help	2013-08-10 21:17:46.572104259 +0100
+@@ -14,6 +14,7 @@ help:
+ 	@echo 'Build:'
+ 	@echo '  all			- libraries and generated headers'
+ 	@echo '  pregen		- generate headers'
++	@echo '  startfiles		- build startfiles (crt)'
+ 	@echo '  utils			- build target utilities'
+ 	@echo '			  (ldd, ldconfig, locale, iconv)'
+ 	@echo '  hostutils		- build host utilities (see utils)'
+@@ -32,6 +33,7 @@ help:
+ 	@echo '  install		- install both the runtime and the headers'
+ 	@echo '  install_runtime	- install the libraries'
+ 	@echo '  install_dev		- install all headers and static libs'
++	@echo '  install_startfiles	- install startfiles (crt)'
+ 	@echo '  install_headers	- install headers excluding generated ones'
+ 	@echo '  install_utils		- install target utilities'
+ 	@echo '  install_hostutils	- install host utilities'
+diff -Nurp a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2011-06-08 19:58:40.000000000 +0100
++++ b/Makefile.in	2013-08-10 21:10:55.248649101 +0100
+@@ -193,6 +193,8 @@ install: install_runtime install_dev
+ 
+ RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)$(MULTILIB_DIR) $(RUNTIME_PREFIX)$(MULTILIB_DIR))
+ 
++startfiles: $(crt-y)
++
+ $(top_builddir)extra/scripts/unifdef: |$(top_builddir)extra/scripts
+ $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c
+ 	$(hcompile.u)
+@@ -301,6 +303,10 @@ else
+ 	cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -f wchar-stub.h
+ endif
+ 
++# Installs startfiles
++install_startfiles: startfiles | $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)
++	-$(INSTALL) -m 644 $(startfiles) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/
++
+ # Installs development library links.
+ install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)
+ 	-$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/
+diff -Nurp a/Makerules b/Makerules
+--- a/Makerules	2011-06-08 19:58:40.000000000 +0100
++++ b/Makerules	2013-08-10 21:24:21.287583111 +0100
+@@ -406,7 +406,8 @@ endif
+ CRTS_COMPAT :=
+ #endif
+ 
+-$(crt-y): $(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC)
++startfiles = $(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC)
++$(crt-y): $(startfiles)
+ $(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC): | headers
+ 
+ $(top_builddir)lib/$(NONSHARED_LIBNAME): $(libc-nonshared-y)
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 0e7ae545cd..2dbac12c85 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -8,13 +8,17 @@ choice
 	help
 	  Select the version of uClibc you wish to use.
 
+	config BR2_UCLIBC_VERSION_0_9_31
+		bool "uClibc 0.9.31.x"
+		depends on BR2_avr32
+
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
 		depends on !(BR2_arc || BR2_avr32 || BR2_sh || BR2_xtensa)
 
 	config BR2_UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.x"
-		depends on !(BR2_arc || BR2_xtensa)
+		depends on !(BR2_arc || BR2_avr32 || BR2_xtensa)
 
 	config BR2_UCLIBC_VERSION_0_9_33_ARC
 		bool "uClibc 0.9.33.x-arc"
@@ -34,6 +38,7 @@ config BR2_USE_UCLIBC_SNAPSHOT
 
 config BR2_UCLIBC_VERSION_STRING
 	string
+	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
 	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
 	default 0.9.33-arc	if BR2_UCLIBC_VERSION_0_9_33_ARC
@@ -41,6 +46,7 @@ config BR2_UCLIBC_VERSION_STRING
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
+	default "package/uclibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31
 	default "package/uclibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32
 	default "package/uclibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
 	default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_0_9_33_ARC
diff --git a/package/uclibc/uClibc-0.9.31.config b/package/uclibc/uClibc-0.9.31.config
new file mode 100644
index 0000000000..e990178df5
--- /dev/null
+++ b/package/uclibc/uClibc-0.9.31.config
@@ -0,0 +1,259 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.31
+# Sun Apr  4 10:43:39 2010
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="none"
+FORCE_OPTIONS_FOR_ARCH=y
+# ARCH_LITTLE_ENDIAN is not set
+# ARCH_BIG_ENDIAN is not set
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+# ARCH_WANTS_BIG_ENDIAN is not set
+TARGET_SUBARCH=""
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# DO_XSI_MATH is not set
+# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS="/usr/src/linux/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+# LDSO_CACHE_SUPPORT is not set
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+LINUXTHREADS_OLD=y
+# LINUXTHREADS_NEW is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+UCLIBC_SV4_DEPRECATED=y
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+# UCLIBC_HAS_IPV6 is not set
+# UCLIBC_HAS_RPC is not set
+# UCLIBC_HAS_FULL_RPC is not set
+# UCLIBC_HAS_REENTRANT_RPC is not set
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+# UCLIBC_HAS_STRING_GENERIC_OPT is not set
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+# UCLIBC_HAS_WCHAR is not set
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+# UCLIBC_HAS_STDIO_GETC_MACRO is not set
+# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+# UCLIBC_HAS_GNU_GETSUBOPT is not set
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+# UCLIBC_HAS_WORDEXP is not set
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+PROPOLICE_BLOCK_ABRT=y
+# PROPOLICE_BLOCK_SEGV is not set
+# UCLIBC_BUILD_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
+
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_CORTEX_M3 is not set
+# CONFIG_ARM_CORTEX_M1 is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set

From c74f17754a989b642ecc4b4a20af6e528bd5c8cd Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 11:29:09 +0100
Subject: [PATCH 6644/6849] trivial: pcmanfm: fix typo in config help

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pcmanfm/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index 42088d6c89..635aa61bc1 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -8,8 +8,8 @@ config BR2_PACKAGE_PCMANFM
 	select BR2_PACKAGE_XLIB_LIBX11
 	depends on BR2_PACKAGE_LIBGTK2
 	help
-	  An extremly fast and lightweight file manager which features
-	  tabbed browsing and user-friendly interface.
+	  An extremely fast and lightweight file manager which features
+	  tabbed browsing and a user-friendly interface.
 
 	  http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 

From af616db359fd0811736821f23971094c6600f5bf Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 9 Nov 2013 17:57:37 -0300
Subject: [PATCH 6645/6849] mplayer: disable for anything lower than ARMv5

Disable mplayer for anything lower than a v5 ARM core.
The support is broken and it's kind of pointless anyway. Fixes:
http://autobuild.buildroot.net/results/8f946e28b11b2ab1ba0d9688286c665488de0486/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mplayer/Config.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 7cee87d83c..b930cb5862 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -3,6 +3,9 @@ config BR2_PACKAGE_MPLAYER
 	# Those architectures are not supported by MPlayer
 	depends on !(BR2_sh2 || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
 			|| BR2_microblaze || BR2_aarch64)
+	# Broken support for <ARMv5
+	depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \
+		|| BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm)
 	depends on BR2_LARGEFILE
 	help
 	  MPlayer is a movie player which runs on many systems and supports

From f8c07f2e72ba4faea6e66b40f9b4881aecb2e509 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 8 Nov 2013 09:26:52 -0300
Subject: [PATCH 6646/6849] dhcpcd: bump to version 6.1.0

Now has proper support for nommu and non-IPv6.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dhcpcd/Config.in |  8 +++-----
 package/dhcpcd/dhcpcd.mk | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
index ddbc6f4781..ac20615d5f 100644
--- a/package/dhcpcd/Config.in
+++ b/package/dhcpcd/Config.in
@@ -1,11 +1,9 @@
 config BR2_PACKAGE_DHCPCD
-	depends on BR2_INET_IPV6
-	depends on BR2_USE_MMU # fork()
 	bool "dhcpcd"
+	# No support for AI_ADDRCONFIG
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	help
 	  An RFC2131 compliant DHCP client
 
 	  http://roy.marples.name/downloads/dhcpcd
-
-comment "dhcpcd needs a toolchain w/ IPv6"
-	depends on !BR2_INET_IPV6
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 13810f3a46..80377062a8 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -4,22 +4,29 @@
 #
 ################################################################################
 
-DHCPCD_VERSION = 5.6.7
+DHCPCD_VERSION = 6.1.0
 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2
-DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd/
+DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
 DHCPCD_LICENSE = BSD-2c
 
+ifeq ($(BR2_INET_IPV6),)
+	DHCPCD_CONFIG_OPT += --disable-ipv6
+endif
+
+ifeq ($(BR2_USE_MMU),)
+	DHCPCD_CONFIG_OPT += --disable-fork
+endif
+
 define DHCPCD_CONFIGURE_CMDS
 	(cd $(@D); \
-	./configure \
+	$(TARGET_CONFIGURE_OPTS) ./configure \
 		--target=$(BR2_GCC_TARGET_ARCH) \
 		--os=linux \
 		$(DHCPCD_CONFIG_OPT) )
 endef
 
 define DHCPCD_BUILD_CMDS
-	$(MAKE) \
-		$(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) \
 		-C $(@D) all
 endef
 

From 9589efff1bebe2d068bf4d6caf1c5e7cd0171abb Mon Sep 17 00:00:00 2001
From: Alexander Lukichev <alexander.lukichev@gmail.com>
Date: Fri, 8 Nov 2013 15:09:19 +0200
Subject: [PATCH 6647/6849] openpgm: disable for AVR32, not its Buildroot-built
 toolchain

OpenPGM builds incorrectly on AVR32 with gcc-4.2.2-avr32-2.1.5.
Since it is presumed to be the only GCC version used by Buildroot
for AVR32, this patch disables openpgm for all cases when AVR32
is selected as the target architecture, including when a toolchain
is downloaded or preinstalled (this is what Buildroot autobuilders
do).

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/openpgm/Config.in | 4 ++--
 package/zeromq/Config.in  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
index e34740c32a..8d6763924d 100644
--- a/package/openpgm/Config.in
+++ b/package/openpgm/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OPENPGM
 	bool "openpgm"
-	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 # lacks required builtins
+	depends on !BR2_avr32 # toolchain lacks required intrinsics
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INET_IPV6
 	depends on BR2_USE_WCHAR
@@ -15,4 +15,4 @@ config BR2_PACKAGE_OPENPGM
 
 comment "openpgm needs a toolchain w/ wchar, threads, IPv6"
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
-	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+	depends on !BR2_avr32
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index dad1dd4641..a74ce88f34 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -30,7 +30,7 @@ config BR2_PACKAGE_ZEROMQ
 config BR2_PACKAGE_ZEROMQ_PGM
 	bool "PGM/EPGM support"
 	depends on BR2_PACKAGE_ZEROMQ
-	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 # openpgm
+	depends on !BR2_avr32 # openpgm
 	select BR2_PACKAGE_OPENPGM
 	help
 	  Add support for Pragmatic General Multicast protocol (RFC 3208)

From 058f37fb6af5af5e6991f670106007167c2435e3 Mon Sep 17 00:00:00 2001
From: Arnaud Aujon <arnaud.aujon@gmail.com>
Date: Fri, 8 Nov 2013 13:11:56 +0100
Subject: [PATCH 6648/6849] gutenprint: fix download url

Signed-off-by: Arnaud Aujon <arnaud.aujon@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gutenprint/gutenprint.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 33abf48fd3..0924cb631a 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GUTENPRINT_VERSION = 5.2.9
-GUTENPRINT_SITE = http://downloads.sourceforge.net/gimp-print/gutenprint-5.2/$(GUTENPRINT_VERSION)
+GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-5.2/$(GUTENPRINT_VERSION)
 GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
 GUTENPRINT_LICENSE = GPLv2+
 GUTENPRINT_LICENSE_FILES = COPYING

From cad987f4cbb37727aa0dbf62f2ed5fee5a057468 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 8 Nov 2013 09:42:03 +0000
Subject: [PATCH 6649/6849] avr32: fix uclibc build using recent kernel headers

Using kernel headers newer than 3.6.x, uclibc 0.9.31.1 fails to build:

  In file included from output/host/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/rtnetlink.h:6,
                 from libc/inet/netlinkaccess.h:34,
                 from libc/inet/if_index.c:36:
  output/host/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/if_link.h:314: error: expected specifier-qualifier-list before '__be16'
  make[1]: *** [libc/inet/if_index.os] Error 1
  make[1]: Leaving directory `output/build/uclibc-0.9.31.1'
  make: *** [output/build/uclibc-0.9.31.1/.stamp_built] Error 2

This patch adjusts the system type definitions in the netlinkaccess.h
header, updating the types to match those used in uClibc 0.9.33.2.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...012-netlinkaccess-header-types.patch.avr32 | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32

diff --git a/package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32 b/package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32
new file mode 100644
index 0000000000..bc981a4171
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32
@@ -0,0 +1,35 @@
+Using kernel headers newer than 3.6.x, uclibc 0.9.31.1 fails to build:
+
+  In file included from output/host/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/rtnetlink.h:6,
+                 from libc/inet/netlinkaccess.h:34,
+                 from libc/inet/if_index.c:36:
+  output/host/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/if_link.h:314: error: expected specifier-qualifier-list before '__be16'
+  make[1]: *** [libc/inet/if_index.os] Error 1
+  make[1]: Leaving directory `output/build/uclibc-0.9.31.1'
+  make: *** [output/build/uclibc-0.9.31.1/.stamp_built] Error 2
+
+This patch adjusts the system type definitions in the netlinkaccess.h
+header, updating the types to match those used in uClibc 0.9.33.2.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/libc/inet/netlinkaccess.h b/libc/inet/netlinkaccess.h
+--- a/libc/inet/netlinkaccess.h	2011-06-08 19:58:40.000000000 +0100
++++ b/libc/inet/netlinkaccess.h	2012-12-20 12:16:34.251965672 +0000
+@@ -22,15 +22,8 @@
+ #include <features.h>
+ #include <stdint.h>
+ #include <unistd.h>
+-#include <sys/types.h>
+-
+ #if defined __ASSUME_NETLINK_SUPPORT || defined __UCLIBC_USE_NETLINK__
+-#define _LINUX_TYPES_H
+-typedef uint8_t __u8;
+-typedef uint16_t __u16;
+-typedef uint32_t __u32;
+-typedef uint64_t __u64;
+-typedef int32_t __s32;
++#include <asm/types.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/netlink.h>
+ 

From 38dbd33b91adb4543e922e644b09430fa3836068 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Thu, 7 Nov 2013 14:22:12 -0800
Subject: [PATCH 6650/6849] uclibc-snapshot: enable option UCLIBC_HAS_OBSTACK

Prior to uClibc commit f143f920694c, uClibc used to always include the
gnu obstack extension, which is used and required by many tools, such as
binutils.

Because of the change mentioned above, obstack is now optional, and got
disabled per default, so enable it in the uClibc snapshot configuration file.

Signed-off-by: Chris Zankel <chris@zankel.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/uclibc/uClibc-snapshot.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/uclibc/uClibc-snapshot.config b/package/uclibc/uClibc-snapshot.config
index cb6258d83d..145f70926f 100644
--- a/package/uclibc/uClibc-snapshot.config
+++ b/package/uclibc/uClibc-snapshot.config
@@ -113,6 +113,7 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 # COMPAT_ATEXIT is not set
 UCLIBC_SUSV3_LEGACY=y

From 1f9c04f618dc8c3e4b429655dff9d7ac01d5e02a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Nov 2013 20:07:21 +0100
Subject: [PATCH 6651/6849] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option

The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to force the
activation or disabling of the JIT compiler in the Qt Javascript
interpreter. However, the JIT compiler is not available for all
architectures, so forcing its activation does not always
work. Moreover, Qt knows by itself for which architectures JIT support
is possible, and will automatically enable it if possible.

Therefore, this option was in fact useless, and causing build problems
when enabled on architectures for which the JIT support was not
available. This commit removes this option and there is no
replacement: Qt will enable JIT at compile time when possible.

Fixes:

  http://autobuild.buildroot.org/results/aae/aaeb82753b7654eeca679ded5d0211ceebda3ea2/build-end.log
  http://autobuild.buildroot.org/results/367/3670e4f03ff0ce114c90bd7139243d82c427b52a/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy     | 18 ++++++++++++++++++
 package/qt/Config.in |  6 ------
 package/qt/qt.mk     |  6 ------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 588cd8bf72..d02f0a6386 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,24 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2013.11"
 
+config BR2_PACKAGE_QT_JAVASCRIPTCORE
+	bool "qt javascriptcore option removed"
+	select BR2_LEGACY
+	help
+	  The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to
+	  force the activation or disabling of the JIT compiler in the
+	  Qt Javascript interpreter. However, the JIT compiler is not
+	  available for all architectures, so forcing its activation
+	  does not always work. Moreover, Qt knows by itself for which
+	  architectures JIT support is possible, and will
+	  automatically enable it if possible.
+
+	  Therefore, this option was in fact useless, and causing
+	  build problems when enabled on architectures for which the
+	  JIT support was not available. It has been removed, and
+	  there is no replacement: Qt will enable JIT at compile time
+	  when possible.
+
 config BR2_PACKAGE_MODULE_INIT_TOOLS
 	bool "module-init-tools replaced by kmod"
 	select BR2_PACKAGE_KMOD
diff --git a/package/qt/Config.in b/package/qt/Config.in
index ea9e787de4..b1a2207f23 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -365,12 +365,6 @@ comment "WebKit needs shared library/gui/network support"
 	depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
 	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 
-config BR2_PACKAGE_QT_JAVASCRIPTCORE
-	bool "JavaScriptCore JIT compiler"
-	help
-	  Build the JavaScriptCore JIT compiler
-	  If unsure, say y
-
 config BR2_PACKAGE_QT_STL
 	bool "STL support"
 	help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 48d39fc501..82ce51dbd0 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -415,12 +415,6 @@ else
 QT_CONFIGURE_OPTS += -no-scripttools
 endif
 
-ifeq ($(BR2_PACKAGE_QT_JAVASCRIPTCORE),y)
-QT_CONFIGURE_OPTS += -javascript-jit
-else
-QT_CONFIGURE_OPTS += -no-javascript-jit
-endif
-
 ifeq ($(BR2_PACKAGE_QT_STL),y)
 QT_CONFIGURE_OPTS += -stl
 else

From 0f401f914669b2d697f6efcfc0d2888a4c118f4d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Nov 2013 20:09:48 +0100
Subject: [PATCH 6652/6849] Config.in.legacy: select BR2_LEGACY for
 module-init-tools legacy option

Commit 94c72087f3 ("module-init-tools: remove package") removed the
module-init-tools package and therefore added the corresponding config
option in Config.in.legacy. However, the commit forgot to add the
"select BR2_LEGACY" that ensures the build cannot proceed until the
user has acknowledged the change (i.e kmod replacing
module-init-tools).

This commit adds this missing "select BR2_LEGACY".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Config.in.legacy b/Config.in.legacy
index d02f0a6386..587afe1582 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -123,6 +123,7 @@ config BR2_PACKAGE_MODULE_INIT_TOOLS
 	bool "module-init-tools replaced by kmod"
 	select BR2_PACKAGE_KMOD
 	select BR2_PACKAGE_KMOD_TOOLS
+	select BR2_LEGACY
 	help
 	  The 'module-init-tools' package has been removed, since it
 	  has been depracated upstream and replaced by 'kmod'.

From 69635dbe2ff6d300a31f99b34dc9e6ff9221f583 Mon Sep 17 00:00:00 2001
From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 7 Nov 2013 22:10:39 -0500
Subject: [PATCH 6653/6849] libqrencode: select libpng only when tools are
 selected

As stated on the libqrencode web site, PNG (or SDL) is only
needed for the test and utility programs; the library itself
has no dependencies.

While we are here, remove spaces in the ifeq clause, to match
the examples in the buildroot manual.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libqrencode/Config.in      | 2 +-
 package/libqrencode/libqrencode.mk | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/libqrencode/Config.in b/package/libqrencode/Config.in
index e8fc1d420d..b86662621e 100644
--- a/package/libqrencode/Config.in
+++ b/package/libqrencode/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBQRENCODE
 	bool "libqrencode"
-	select BR2_PACKAGE_LIBPNG
 	help
 	  libqrencode is a C library for encoding data in a QR Code
 	  symbol, a kind of 2D symbology that can be scanned by handy
@@ -14,6 +13,7 @@ if BR2_PACKAGE_LIBQRENCODE
 
 config BR2_PACKAGE_LIBQRENCODE_TOOLS
 	bool "libqrencode tools"
+	select BR2_PACKAGE_LIBPNG
 	help
 	  Build command-line tools
 
diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk
index e1f236240b..d445763604 100644
--- a/package/libqrencode/libqrencode.mk
+++ b/package/libqrencode/libqrencode.mk
@@ -7,15 +7,15 @@
 LIBQRENCODE_VERSION = 3.4.2
 LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz
 LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode
-LIBQRENCODE_DEPENDENCIES = libpng
 LIBQRENCODE_INSTALL_STAGING = YES
 LIBQRENCODE_LICENSE = LGPLv2.1+
 LIBQRENCODE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBQRENCODE_TOOLS),y)
-        LIBQRENCODE_CONF_OPT += --with-tools=yes
+LIBQRENCODE_CONF_OPT += --with-tools=yes
+LIBQRENCODE_DEPENDENCIES += libpng
 else
-        LIBQRENCODE_CONF_OPT += --with-tools=no
+LIBQRENCODE_CONF_OPT += --with-tools=no
 endif
 
 $(eval $(autotools-package))

From 5a0e1258f369d9fcf75e977c3a76727a9a3096a3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sun, 10 Nov 2013 22:17:29 +0100
Subject: [PATCH 6654/6849] openssh: bump version

From the announcement:

This release fixes a security bug:

 * sshd(8): fix a memory corruption problem triggered during rekeying
   when an AES-GCM cipher is selected. Full details of the vulnerability
   are available at: http://www.openssh.com/txt/gcmrekey.adv

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index f0652e5805..8ab2b476ed 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENSSH_VERSION = 6.3p1
+OPENSSH_VERSION = 6.4p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \

From 094d8ec896ef0c447a4bfb884753bf8984d67dbc Mon Sep 17 00:00:00 2001
From: mathieu benoit <mathieu.benoit@savoirfairelinux.com>
Date: Sun, 10 Nov 2013 13:16:22 +0100
Subject: [PATCH 6655/6849] configs: rename rpi_defconfig for consistency

We name all of our boards and defconfig files based on the boards
fullname, not a nickname or a shortname.

'rpi' is short for Raspberry Pi, so name all our Raspberry Pi ressource
with 'raspberrypi' instead of 'rpi'.

This should also help Buildroot-newcomers to recognise Raspberry Pi
related files (defconfig and board doc).

Signed-off-by: Mathieu Benoit <mathieu.benoit@savoirfairelinux.com>
[yann.morin.1998@free.fr: reverse the rename]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Ryan Barnett <rjbarnet@rockwellcollins.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/raspberrypi/readme.txt                     | 8 ++++----
 configs/{rpi_defconfig => raspberrypi_defconfig} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename configs/{rpi_defconfig => raspberrypi_defconfig} (100%)

diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt
index 47b48186df..2052e2b9e3 100644
--- a/board/raspberrypi/readme.txt
+++ b/board/raspberrypi/readme.txt
@@ -17,11 +17,11 @@ How to build it
 Configure Buildroot
 -------------------
 
-The rpi_defconfig configuration is a minimal configuration with all that
-is required to bring the Raspberry Pi. You should base your work on this
-defconfig:
+The raspberrypi_defconfig configuration is a minimal configuration with
+all that is required to bring the Raspberry Pi. You should base your
+work on this defconfig:
 
-  $ make rpi_defconfig
+  $ make raspberrypi_defconfig
 
 If you want to use a persistent rootfs, skip to "Build the rootfs", below.
 
diff --git a/configs/rpi_defconfig b/configs/raspberrypi_defconfig
similarity index 100%
rename from configs/rpi_defconfig
rename to configs/raspberrypi_defconfig

From f7313cadf2ca9e0195a873f62f6b6c38a58a3630 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 10 Nov 2013 11:03:09 -0300
Subject: [PATCH 6656/6849] freetype: add libpng to freetype-config and
 freetype2.pc

Add libpng libraries to freetype-config and freetype2.pc when they're
needed to avoid build breakage for other packages.

Patch in a different form is already upstream.

Fixing configure & friends is not so good since autoreconf busts things
up because of the odd way things are done (upstream fixed too it seems).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/freetype/freetype.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index cc5fbf858c..1e378d3194 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -37,6 +37,7 @@ ifeq ($(BR2_PACKAGE_LIBPNG),y)
 FREETYPE_DEPENDENCIES += libpng
 FREETYPE_CONF_OPT += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
 	LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`"
+FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
 else
 FREETYPE_CONF_OPT += --without-png
 endif
@@ -49,5 +50,14 @@ define FREETYPE_FIX_CONFIG_FILE
 endef
 FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE
 
+# libpng isn't included in freetype-config & freetype2.pc :-/
+define FREETYPE_FIX_CONFIG_FILE_LIBS
+	$(SED) "s,^Libs.private:,& $(FREETYPE_LIBPNG_LIBS)," \
+		$(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc
+	$(SED) "s,-lfreetype,& $(FREETYPE_LIBPNG_LIBS)," \
+		$(STAGING_DIR)/usr/bin/freetype-config
+endef
+FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From ab0ff59ee5b2a0b5a910e72f4f558f001380b248 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 10 Nov 2013 16:01:42 +0100
Subject: [PATCH 6657/6849] uclibc: fix MIPS variables

The BR2_UCLIBC_MIPS_ISA hidden Config.in variable defines which uClibc
config option should be enabled for a given MIPS architecture
variant. Therefore, using lower case names doesn't work: they should
be upper case, to match uClibc config option names. This commit makes
sure the mips32, mips32r2 and mips64 builds select the appropriate
uClibc configuration.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Markos Chandras <Markos.Chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/uclibc/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 2dbac12c85..82dd3aa72f 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -230,9 +230,9 @@ config BR2_UCLIBC_MIPS_ISA
 	default 2 if BR2_mips_2
 	default 3 if BR2_mips_3
 	default 4 if BR2_mips_4
-	default mips32 if BR2_mips_32
-	default mips32r2 if BR2_mips_32r2
-	default mips64 if BR2_mips_64
+	default MIPS32 if BR2_mips_32
+	default MIPS32R2 if BR2_mips_32r2
+	default MIPS64 if BR2_mips_64
 
 config BR2_UCLIBC_SH_TYPE
 	string

From eb17c71dd37aae6908c97e79d2d8c3878d83c9f3 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sun, 10 Nov 2013 23:33:54 +0100
Subject: [PATCH 6658/6849] libmicrohttpd: disable epoll support on avr32

As it isn't available.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libmicrohttpd/libmicrohttpd.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index e3ad026e71..8d5395ddab 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -20,4 +20,9 @@ LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
 LIBMICROHTTPD_CONF_OPT += --disable-https
 endif
 
+ifeq ($(BR2_avr32),y)
+# no epoll_create1
+LIBMICROHTTPD_CONF_OPT += --disable-epoll
+endif
+
 $(eval $(autotools-package))

From fa510dee2842201a08f01d56b6b4144bbaf1d08a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 10 Nov 2013 20:58:33 +0000
Subject: [PATCH 6659/6849] zmqpp: fix build failure

The zmqpp client needs a little help to link against libpthread. Fix build
failures such as the following.

  http://autobuild.buildroot.net/results/d0a/d0a740d4d5414844ca7f2de266fc92223d3d20c8

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/zmqpp/zmqpp.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
index 83e088f27c..4c8417fced 100644
--- a/package/zmqpp/zmqpp.mk
+++ b/package/zmqpp/zmqpp.mk
@@ -12,6 +12,7 @@ ZMQPP_LICENSE = MIT
 ZMQPP_LICENSE_FILES = LICENSE
 
 ZMQPP_MAKE_OPT = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
+ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
 
 ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y)
 ZMQPP_DEPENDENCIES += boost
@@ -19,6 +20,7 @@ endif
 
 define ZMQPP_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		LDFLAGS="$(ZMQPP_LDFLAGS)" \
 		$(ZMQPP_MAKE_OPT) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
 endef
 

From 6fb546ca41955335a6fa8ed403e616ae2ff31a29 Mon Sep 17 00:00:00 2001
From: Thierry Bultel <thierry.bultel@wanadoo.fr>
Date: Sun, 10 Nov 2013 18:32:52 +0100
Subject: [PATCH 6660/6849] Generation of locales: made call to tr more robust
 and added LOWERCASE macro

When calling 'tr' without quoting braces, bash can make really weird things
if there are existing 'single-letter-named' directories
eg:
thierry@thierry-desktop:~$ echo AAA | tr [A-Z] [a-z]
aaa
thierry@thierry-desktop:~$ mkdir m
thierry@thierry-desktop:~$ echo AAA | tr [A-Z] [a-z]
AAA

The (quick) analysis is that the callee (tr) argvs then
contain 'm' thus the translation does not work

Using quotes works around it:
thierry@thierry-desktop:~$ echo AAA | tr '[A-Z]' '[a-z]'
aaa

Signed-off-by: Thierry Bultel <thierry.bultel@wanadoo.fr>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile             | 2 +-
 package/pkg-utils.mk | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1496bd74fc..a006615f76 100644
--- a/Makefile
+++ b/Makefile
@@ -548,7 +548,7 @@ target-generatelocales: host-localedef
 		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
 		$(HOST_DIR)/usr/bin/localedef \
 			--prefix=$(TARGET_DIR) \
-			--`echo $(BR2_ENDIAN) | tr [A-Z] [a-z]`-endian \
+			--$(call LOWERCASE,$(BR2_ENDIAN))-endian \
 			-i $${inputfile} -f $${charmap} \
 			$${locale} ; \
 	done
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 5930f2cfc2..0ef433dc93 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -23,6 +23,14 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
 	$(__tmp)))) \
 	$(__tmp))
 
+# LOWERCASE macro -- transforms its arguments to lowercase
+# The above non-tr implementation is not needed, because LOWERCASE is not
+# called very often
+
+define LOWERCASE
+$(shell echo $1 | tr '[:upper:]' '[:lower:]')
+endef
+
 #
 # Manipulation of .config files based on the Kconfig
 # infrastructure. Used by the Busybox package, the Linux kernel

From 79afe8e70ff806eaaebc263bcd00ebcc88960493 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Sat, 9 Nov 2013 01:21:20 +0100
Subject: [PATCH 6661/6849] xlib_libpthread-stubs: needs -pthread when linking
 statically

Fixes e.g. http://autobuild.buildroot.net/results/1eaa694263b74313b0c90c510abcb11d490a3773/

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
index 5ea02e9605..6343691564 100644
--- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
+++ b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
@@ -12,5 +12,9 @@ XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
 
 XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+XLIB_LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread"
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

From 6c10f4c1e44f2c439130412cbca29d94e6e3a426 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Sat, 9 Nov 2013 01:21:21 +0100
Subject: [PATCH 6662/6849] xorg: needs thread support

libpthread-stubs, libX11, and a few more xorg packages use threads. Since
almost all xorg packages depend on libX11 directory or indirectly, and
since the remaining ones are pretty useless on their own, just require
threads for xorg as a whole.

The thread dependency is kept in libpthread-stubs, because that package
will move out of the x11r7 directory later (pending patch by Spenser
Gilliland), so the dependency on threads will be required then.

Fixes:
  http://autobuild.buildroot.org/results/609/6099baac4bb469ae18aab6512233db25183eaabd/

[Arnout: disable all of xorg, correct comment]
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/x11r7/Config.in                       | 5 +++--
 package/x11r7/xlib_libpthread-stubs/Config.in | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 09bc078812..94cf7c68ff 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -1,6 +1,7 @@
 menuconfig BR2_PACKAGE_XORG7
 	bool "X.org X Window System"
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Support for X11R7 libraries, servers, drivers, and/or
 	  applications in the target.
@@ -261,5 +262,5 @@ if BR2_PACKAGE_XORG7
 	endmenu
 endif
 
-comment "X.org needs a toolchain w/ wchar"
-        depends on !BR2_USE_WCHAR
+comment "X.org needs a toolchain w/ wchar, threads"
+        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/x11r7/xlib_libpthread-stubs/Config.in b/package/x11r7/xlib_libpthread-stubs/Config.in
index fb53585550..6ce1b94fcd 100644
--- a/package/x11r7/xlib_libpthread-stubs/Config.in
+++ b/package/x11r7/xlib_libpthread-stubs/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
 	bool "libpthread-stubs"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  This library provides weak aliases for pthread functions not
 	  provided in libc or otherwise available by default.
 
 	  http://xcb.freedesktop.org/
+
+comment "libpthread-stubs needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

From d90d48ecae7107b9bdab2c78282c63e2d39acc6b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 9 Nov 2013 16:59:48 +0100
Subject: [PATCH 6663/6849] qt5base: fix rpi/egl support
 (vc_dispmanx_element_change_attributes proto mismatch)

Patch from upstream already included in the next 5.2 release

Fixes:
	http://autobuild.buildroot.net/results/347/347577bf1dee0fec3302a45f278eb253118a5b6f/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...c_dispmanx_element_change_attributes.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch

diff --git a/package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch b/package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch
new file mode 100644
index 0000000000..417970d55f
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch
@@ -0,0 +1,44 @@
+From 90005fae17acc994948aa5a79fc262fd07b69865 Mon Sep 17 00:00:00 2001
+From: Dario Freddi <dario.freddi@ispirata.com>
+Date: Fri, 13 Sep 2013 12:10:03 +0200
+Subject: [PATCH] qeglfshooksrpi: update vc_dispmanx_element_change_attributes
+
+Remove the extern prototype as it's now defined in latest
+firmware headers correctly. Moreover, the signature of the function
+changed. This patch fixes both issues.
+
+Change-Id: I0114b436dbaf5a171e6429a1e3760e292c7152cf
+Reviewed-by: Andy Nichols <andy.nichols@digia.com>
+---
+ .../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp   |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+index 9b48113..add96bf 100644
+--- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
++++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+@@ -88,12 +88,6 @@ static EGLNativeWindowType createDispmanxLayer(const QPoint &pos, const QSize &s
+     return eglWindow;
+ }
+ 
+-// this function is not part of debian squeeze headers
+-extern "C" int VCHPOST_ vc_dispmanx_element_change_attributes(DISPMANX_UPDATE_HANDLE_T update,
+-    DISPMANX_ELEMENT_HANDLE_T element, uint32_t change_flags, int32_t layer,
+-    uint8_t opacity, const VC_RECT_T *dest_rect, const VC_RECT_T *src_rect,
+-    DISPMANX_RESOURCE_HANDLE_T mask, VC_IMAGE_TRANSFORM_T transform);
+-
+ // these constants are not in any headers (yet)
+ #define ELEMENT_CHANGE_LAYER          (1<<0)
+ #define ELEMENT_CHANGE_OPACITY        (1<<1)
+@@ -128,7 +122,7 @@ static void moveDispmanxLayer(EGLNativeWindowType window, const QPoint &pos)
+                                           &dst_rect,
+                                           NULL,
+                                           0,
+-                                          (VC_IMAGE_TRANSFORM_T)0);
++                                          (DISPMANX_TRANSFORM_T)0);
+ 
+     vc_dispmanx_update_submit_sync(dispman_update);
+ }
+-- 
+1.7.1
+

From ee8c811fe1856d653e8c6ad2828e5ad124beca8a Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sat, 9 Nov 2013 16:59:49 +0100
Subject: [PATCH 6664/6849] qt5webkit: fix build with bison-3.0

- Add host-bison dependency
- Fetch patch from upstream fixing build with bison-3.0
  (already included in the next 5.2 release)

Fixes:
	http://autobuild.buildroot.net/results/283/2831c0d859b035f7d2786f51885833a711b46b80/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...2-ANGLE-doesn-t-build-with-bison-3.0.patch | 38 +++++++++++++++++++
 package/qt5/qt5webkit/qt5webkit.mk            |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch

diff --git a/package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch b/package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch
new file mode 100644
index 0000000000..e69e137c54
--- /dev/null
+++ b/package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@digia.com>
+Date: Fri, 16 Aug 2013 18:27:07 +0200
+Subject: [PATCH] ANGLE doesn't build with bison 3.0
+
+https://bugs.webkit.org/show_bug.cgi?id=119798
+
+Reviewed by Antti Koivisto.
+
+Make glslang.y compatible with bison 3.0
+by using %lex-param to set YYLEX_PARAM.
+
+* src/compiler/glslang.y:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+Task-number: QTBUG-32913
+Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
+Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index 3cad335..b41e95a 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {
+-- 
+1.8.4.2
+
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 87b15a99e4..300b9d9904 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -7,7 +7,7 @@
 QT5WEBKIT_VERSION = $(QT5_VERSION)
 QT5WEBKIT_SITE = $(QT5_SITE)
 QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
-QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf
+QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison
 QT5WEBKIT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)

From 3c33c11386240444c6fde0984f43c64f98ce516d Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 09:24:36 +0100
Subject: [PATCH 6665/6849] manual: clarify that Config.in comments should have
 correct dependencies

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-directory.txt | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 3ebe50e285..700ec4fdbd 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -171,8 +171,9 @@ C library, C++ support, largefile support, thread support, RPC support,
 IPv6 support, wchar support, or dynamic library support. Some packages
 can only be built on certain target architectures, or if an MMU is
 available in the processor.
-These dependencies have to expressed with the appropriate 'depends on'
-statements in the Config.in file. Additionally, for dependencies on
+
+These dependencies have to be expressed with the appropriate 'depends
+on' statements in the Config.in file. Additionally, for dependencies on
 toolchain options, a +comment+ should be displayed when the option is
 not enabled, so that the user knows why the package is not available.
 Dependencies on target architecture or MMU support should not be
@@ -180,6 +181,18 @@ made visible in a comment: since it is unlikely that the user can
 freely choose another target, it makes little sense to show these
 dependencies explicitly.
 
+The +comment+ should only be visible if the +config+ option itself would
+be visible when the toolchain option dependencies are met. This means
+that all other dependencies of the package (including dependencies on
+target architecture and MMU support) have to be repeated on the
++comment+ definition. To keep it clear, the +depends on+ statement for
+these non-toolchain option should be kept separate from the +depends on+
+statement for the toolchain options.
+If there is a dependency on a config option in that same file (typically
+the main package) it is preferable to have a global +if ... endif+
+construct rather than repeating the +depends on+ statement on the
+comment and other config options.
+
 The general format of a dependency +comment+ for package foo is:
 --------------------------
 foo needs a toolchain w/ featA, featB, featC

From be084204eb418243d287f16b80290e564411c507 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 09:24:37 +0100
Subject: [PATCH 6666/6849] Config.in files: add missing dependencies to
 toolchain option comments

When a package A depends on config option B and toolchain option C, then
the comment that is given when C is not fulfilled should also depend on B.
For example:

config BR2_PACKAGE_A
	depends on BR2_B
	depends on BR2_LARGEFILE
	depends on BR2_WCHAR

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

This comment should actually be:

comment "A needs a toolchain w/ largefile, wchar"
	depends on BR2_B
	depends on !BR2_LARGEFILE || !BR2_WCHAR

or if possible (typically when B is a package config option declared in that
same Config.in file):

if BR2_B

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

[other config options depending on B]

endif

Otherwise, the comment would be visible even though the other dependencies
are not met.

This patch adds such missing dependencies, and changes existing such
dependencies from
  depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC
to
  depends on BR2_BASE_DEP
  depends on !BR2_TOOLCHAIN_USES_GLIBC
so that (positive) base dependencies are separate from the (negative)
toolchain dependencies. This strategy makes it easier to write such comments
(because one can simply copy the base dependency from the actual package
config option), but also avoids complex and long boolean expressions.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (untested)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/iso9660/Config.in                             | 3 ++-
 linux/Config.ext.in                              | 2 ++
 package/a10disp/Config.in                        | 3 ++-
 package/aiccu/Config.in                          | 1 +
 package/aircrack-ng/Config.in                    | 1 +
 package/alsamixergui/Config.in                   | 3 ++-
 package/avahi/Config.in                          | 1 +
 package/bcusdk/Config.in                         | 1 +
 package/bind/Config.in                           | 1 +
 package/blackbox/Config.in                       | 3 ++-
 package/bluez_utils/Config.in                    | 1 +
 package/bmon/Config.in                           | 1 +
 package/bonnie/Config.in                         | 1 +
 package/bustle/Config.in                         | 1 +
 package/ccid/Config.in                           | 1 +
 package/cdrkit/Config.in                         | 1 +
 package/civetweb/Config.in                       | 1 +
 package/classpath/Config.in                      | 1 +
 package/connman/Config.in                        | 2 +-
 package/conntrack-tools/Config.in                | 1 +
 package/coreutils/Config.in                      | 1 +
 package/cryptsetup/Config.in                     | 1 +
 package/curlftpfs/Config.in                      | 1 +
 package/cvs/Config.in                            | 1 +
 package/czmq/Config.in                           | 2 ++
 package/dbus-glib/Config.in                      | 4 ++--
 package/dbus-python/Config.in                    | 4 ++--
 package/dbus/Config.in                           | 1 +
 package/dmraid/Config.in                         | 1 +
 package/docker/Config.in                         | 4 ++--
 package/dropwatch/Config.in                      | 1 +
 package/dstat/Config.in                          | 1 +
 package/ebtables/Config.in                       | 1 +
 package/efl/libedbus/Config.in                   | 2 ++
 package/enlightenment/Config.in                  | 2 +-
 package/exfat/Config.in                          | 1 +
 package/fdk-aac/Config.in                        | 3 +++
 package/filemq/Config.in                         | 2 ++
 package/findutils/Config.in                      | 1 +
 package/flex/Config.in                           | 6 +++++-
 package/fltk/Config.in                           | 3 ++-
 package/foomatic-filters/Config.in               | 1 +
 package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 1 +
 package/gawk/Config.in                           | 1 +
 package/gdb/Config.in                            | 2 ++
 package/gesftpserver/Config.in                   | 1 +
 package/gettext/Config.in                        | 3 ++-
 package/git/Config.in                            | 1 +
 package/gmpc/Config.in                           | 4 ++--
 package/gob2/Config.in                           | 1 +
 package/gpsd/Config.in                           | 1 +
 package/gstreamer/gst-ffmpeg/Config.in           | 1 +
 package/gtest/Config.in                          | 1 +
 package/gutenprint/Config.in                     | 1 +
 package/gvfs/Config.in                           | 1 +
 package/hiawatha/Config.in                       | 1 +
 package/hplip/Config.in                          | 1 +
 package/inotify-tools/Config.in                  | 1 +
 package/iperf/Config.in                          | 1 +
 package/jamvm/Config.in                          | 2 ++
 package/kismet/Config.in                         | 1 +
 package/libdrm/Config.in                         | 3 ++-
 package/libedit/Config.in                        | 1 +
 package/libfslvpuwrap/Config.in                  | 3 ++-
 package/libfuse/Config.in                        | 3 ++-
 package/libgail/Config.in                        | 4 ++--
 package/libglade/Config.in                       | 4 ++--
 package/libgtk2/Config.in                        | 1 +
 package/libnspr/Config.in                        | 1 +
 package/libnss/Config.in                         | 1 +
 package/libtirpc/Config.in                       | 2 ++
 package/libunwind/Config.in                      | 2 ++
 package/liburcu/Config.in                        | 1 +
 package/linknx/Config.in                         | 1 +
 package/linphone/Config.in                       | 1 +
 package/lmbench/Config.in                        | 1 +
 package/logrotate/Config.in                      | 1 +
 package/ltp-testsuite/Config.in                  | 5 +++--
 package/lttng-babeltrace/Config.in               | 4 ++--
 package/lttng-libust/Config.in                   | 4 ++--
 package/lttng-tools/Config.in                    | 1 +
 package/lvm2/Config.in                           | 3 ++-
 package/lxc/Config.in                            | 1 +
 package/lzma/Config.in                           | 3 ++-
 package/m4/Config.in                             | 1 +
 package/midori/Config.in                         | 4 +++-
 package/minicom/Config.in                        | 1 +
 package/minidlna/Config.in                       | 1 +
 package/mongoose/Config.in                       | 1 +
 package/mplayer/Config.in                        | 2 ++
 package/mutt/Config.in                           | 1 +
 package/mysql_client/Config.in                   | 1 +
 package/ndisc6/Config.in                         | 1 +
 package/neard/Config.in                          | 1 +
 package/neardal/Config.in                        | 1 +
 package/netatalk/Config.in                       | 1 +
 package/netkitbase/Config.in                     | 3 ++-
 package/netkittelnet/Config.in                   | 1 +
 package/network-manager/Config.in                | 1 +
 package/nfs-utils/Config.in                      | 1 +
 package/nmap/Config.in                           | 1 +
 package/nodejs/Config.in                         | 3 +++
 package/ntfs-3g/Config.in                        | 1 +
 package/numactl/Config.in                        | 2 ++
 package/ofono/Config.in                          | 1 +
 package/olsr/Config.in                           | 1 +
 package/on2-8170-modules/Config.in               | 1 +
 package/openobex/Config.in                       | 1 +
 package/openpowerlink/Config.in                  | 1 +
 package/openvpn/Config.in                        | 1 +
 package/oprofile/Config.in                       | 1 +
 package/p11-kit/Config.in                        | 1 +
 package/parted/Config.in                         | 3 ++-
 package/pcmanfm/Config.in                        | 4 ++--
 package/pcsc-lite/Config.in                      | 1 +
 package/php/Config.ext                           | 1 +
 package/pkg-config/Config.in                     | 3 ++-
 package/python-nfc/Config.in                     | 1 +
 package/python-pyzmq/Config.in                   | 1 +
 package/python/Config.in                         | 1 +
 package/python3/Config.in                        | 1 +
 package/qt/Config.in                             | 2 ++
 package/qt5/Config.in                            | 1 +
 package/quagga/Config.in                         | 2 +-
 package/quota/Config.in                          | 1 +
 package/radvd/Config.in                          | 1 +
 package/redis/Config.in                          | 1 +
 package/rpcbind/Config.in                        | 2 ++
 package/rpi-userland/Config.in                   | 1 +
 package/rt-tests/Config.in                       | 1 +
 package/rtorrent/Config.in                       | 1 +
 package/samba/Config.in                          | 2 ++
 package/ser2net/Config.in                        | 1 +
 package/smartmontools/Config.in                  | 1 +
 package/snowball-init/Config.in                  | 4 ++--
 package/socat/Config.in                          | 1 +
 package/socketcand/Config.in                     | 1 +
 package/sqlcipher/Config.in                      | 7 +++++--
 package/squashfs3/Config.in                      | 3 ++-
 package/squid/Config.in                          | 1 +
 package/sshfs/Config.in                          | 1 +
 package/synergy/Config.in                        | 3 ++-
 package/sysprof/Config.in                        | 3 ++-
 package/systemd/Config.in                        | 1 +
 package/transmission/Config.in                   | 1 +
 package/tvheadend/Config.in                      | 3 ++-
 package/udisks/Config.in                         | 1 +
 package/udpcast/Config.in                        | 1 +
 package/unionfs/Config.in                        | 1 +
 package/ussp-push/Config.in                      | 1 +
 package/vala/Config.in                           | 3 ++-
 package/webkit/Config.in                         | 2 ++
 package/webrtc-audio-processing/Config.in        | 1 +
 package/wget/Config.in                           | 1 +
 package/wireshark/Config.in                      | 1 +
 package/wvdial/Config.in                         | 1 +
 package/wvstreams/Config.in                      | 1 +
 package/xenomai/Config.in                        | 2 ++
 package/xscreensaver/Config.in                   | 1 +
 package/zmqpp/Config.in                          | 8 ++++++--
 package/zyre/Config.in                           | 2 ++
 system/Config.in                                 | 1 +
 162 files changed, 228 insertions(+), 50 deletions(-)

diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 98ff78b0ba..90c3998dcf 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -13,4 +13,5 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	default "fs/iso9660/menu.lst"
 
 comment "iso image requires a Linux kernel to be built"
-	depends on (BR2_i386 || BR2_x86_64) && !BR2_LINUX_KERNEL
+	depends on BR2_i386 || BR2_x86_64
+	depends on !BR2_LINUX_KERNEL
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index b93f63e120..2b0092a05a 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -17,6 +17,8 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
 	  PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8.
 
 comment "xenomai needs a toolchain w/ threads"
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
+		   BR2_bfin || BR2_powerpc || BR2_sh4
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
diff --git a/package/a10disp/Config.in b/package/a10disp/Config.in
index b4edf31508..fd350b20a1 100644
--- a/package/a10disp/Config.in
+++ b/package/a10disp/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_A10DISP
 	  http://github.com/hglm/a10disp
 
 comment "a10disp requires the linux kernel"
-	depends on BR2_arm && !BR2_LINUX_KERNEL
+	depends on BR2_arm
+	depends on !BR2_LINUX_KERNEL
diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index e044540e7c..f56ad75a47 100644
--- a/package/aiccu/Config.in
+++ b/package/aiccu/Config.in
@@ -20,4 +20,5 @@ config BR2_PACKAGE_AICCU
 	  http://www.sixxs.net/tools/aiccu/
 
 comment "aiccu needs a toolchain w/ IPv6, wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
index ede1ca5ae1..0c0345632a 100644
--- a/package/aircrack-ng/Config.in
+++ b/package/aircrack-ng/Config.in
@@ -11,5 +11,6 @@ config BR2_PACKAGE_AIRCRACK_NG
 	  http://www.aircrack-ng.org/
 
 comment "aircrack-ng needs a toolchain w/ largefile, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
index b1b9eb9c66..5b61f3861d 100644
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_ALSAMIXERGUI
 	  http://www.iua.upf.es/~mdeboer/projects/alsamixergui/
 
 comment "alsamixergui needs a toolchain w/ C++, threads"
-	depends on (!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS) && BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 4411fe33be..fd4d229edb 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -37,4 +37,5 @@ config BR2_PACKAGE_AVAHI_DAEMON
 endif
 
 comment "avahi needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bcusdk/Config.in b/package/bcusdk/Config.in
index a64a2bfc0f..658c5921ea 100644
--- a/package/bcusdk/Config.in
+++ b/package/bcusdk/Config.in
@@ -20,4 +20,5 @@ config BR2_PACKAGE_BCUSDK
 	  http://www.auto.tuwien.ac.at/~mkoegler/eib/
 
 comment "bcusdk needs a toolchain w/ C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bind/Config.in b/package/bind/Config.in
index 08af624be3..047f682b2e 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -40,4 +40,5 @@ config BR2_PACKAGE_BIND_TOOLS
 endif
 
 comment "bind needs a toolchain w/ largefile, IPv6"
+	depends on BR2_USE_MMU
 	depends on !(BR2_LARGEFILE || BR2_INET_IPV6)
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index 54f8218e31..e9086550d9 100644
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_BLACKBOX
 	  http://blackboxwm.sourceforge.net/
 
 comment "blackbox needs a toolchain w/ C++"
-	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 33fcbd667e..b6f65b4258 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -39,4 +39,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
 endif
 
 comment "bluez-utils needs a toolchain w/ wchar, threads"
+	depends on !BR2_avr32 && BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bmon/Config.in b/package/bmon/Config.in
index a4abd92e2c..9f0dfa79f3 100644
--- a/package/bmon/Config.in
+++ b/package/bmon/Config.in
@@ -6,4 +6,5 @@ config BR2_PACKAGE_BMON
 	  Linux bandwidth monitor
 
 comment "bmon needs a toolchain w/ IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6
diff --git a/package/bonnie/Config.in b/package/bonnie/Config.in
index 3575bc107c..6dbd06df58 100644
--- a/package/bonnie/Config.in
+++ b/package/bonnie/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_BONNIE
 	  http://www.coker.com.au/bonnie++/
 
 comment "bonnie++ needs a toolchain w/ C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
index 6799f1f06b..7be3222efa 100644
--- a/package/bustle/Config.in
+++ b/package/bustle/Config.in
@@ -20,4 +20,5 @@ config BR2_PACKAGE_BUSTLE
 	  http://www.willthompson.co.uk/bustle/
 
 comment "bustle needs a toolchain w/ wchar, threads"
+	depends on BR2_PACKAGE_DBUS
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ccid/Config.in b/package/ccid/Config.in
index 9f8efca8ec..e960986aea 100644
--- a/package/ccid/Config.in
+++ b/package/ccid/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_CCID
 	  http://pcsclite.alioth.debian.org/ccid.html
 
 comment "ccid needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
index b2cd785ba9..9ba5dbf22f 100644
--- a/package/cdrkit/Config.in
+++ b/package/cdrkit/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_CDRKIT
 	  http://www.cdrkit.org/
 
 comment "cdrkit needs a toolchain w/ largefile"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE
diff --git a/package/civetweb/Config.in b/package/civetweb/Config.in
index 86e824207d..33f4ef1091 100644
--- a/package/civetweb/Config.in
+++ b/package/civetweb/Config.in
@@ -24,4 +24,5 @@ comment "Lua support needs a toolchain w/ largefile"
 endif
 
 comment "civetweb needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/classpath/Config.in b/package/classpath/Config.in
index 7aa93a051a..0153bca070 100644
--- a/package/classpath/Config.in
+++ b/package/classpath/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_CLASSPATH
 	  http://classpath.org
 
 comment "classpath needs a toolchain w/ IPv6"
+	depends on BR2_PACKAGE_JAMVM
 	depends on !BR2_INET_IPV6
diff --git a/package/connman/Config.in b/package/connman/Config.in
index c8b640f51a..5345c80161 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -51,6 +51,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 endif # BR2_PACKAGE_CONNMAN
 
 comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver"
-	depends on !BR2_avr32
+	depends on BR2_USE_MMU && !BR2_avr32
 	depends on BR2_UCLIBC_VERSION_0_9_32 || \
 		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index 5a9d0ea9e7..ec19d8e2de 100644
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -18,6 +18,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 	  http://www.netfilter.org/projects/conntrack-tools/
 
 comment "conntrack-tools needs a toolchain w/ IPv6, largefile, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6 || \
 		!BR2_LARGEFILE || \
 		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
index 206b85ab50..152ad14c22 100644
--- a/package/coreutils/Config.in
+++ b/package/coreutils/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_COREUTILS
 	  http://www.gnu.org/software/coreutils/
 
 comment "coreutils needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 3b9ba5404f..7b0e7ca599 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_CRYPTSETUP
 	  https://code.google.com/p/cryptsetup/
 
 comment "cryptsetup needs a toolchain w/ largefile, wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index 4c5ab8a9fe..90763d76fd 100644
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -18,4 +18,5 @@ config BR2_PACKAGE_CURLFTPFS
 	  http://curlftpfs.sourceforge.net/
 
 comment "curlftpfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/cvs/Config.in b/package/cvs/Config.in
index 65829d0ef9..6a8b037a29 100644
--- a/package/cvs/Config.in
+++ b/package/cvs/Config.in
@@ -16,4 +16,5 @@ config BR2_PACKAGE_CVS_SERVER
 	  Enable cvs server code
 
 comment "cvs needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index d442293681..29333680fd 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -16,5 +16,7 @@ config BR2_PACKAGE_CZMQ
 	  http://czmq.zeromq.org/
 
 comment "czmq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index ea8c3f24dc..4d13f774de 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -10,5 +10,5 @@ config BR2_PACKAGE_DBUS_GLIB
 	  http://www.freedesktop.org/software/dbus
 
 comment "dbus-glib needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_DBUS && \
-		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_DBUS
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 113ca68f38..f7b6d943cf 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_DBUS_PYTHON
 	  http://dbus.freedesktop.org/doc/dbus-python/
 
 comment "dbus-python needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && \
-		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 3cb47b873f..9c9e3f8b27 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -28,4 +28,5 @@ choice
 endchoice
 
 comment "dbus needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
index b7159d9977..028b46c3a2 100644
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_DMRAID
 	  respective mappings for the ATARAID sets discovered.
 
 comment "dmraid needs a toolchain w/ largefile"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE
diff --git a/package/docker/Config.in b/package/docker/Config.in
index fa89757d56..b9feec028a 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -11,5 +11,5 @@ config BR2_PACKAGE_DOCKER
 	  http://icculus.org/openbox/2/docker
 
 comment "docker needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_XORG7 && \
-		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
index 68dab2046b..ac0cc3e0bf 100644
--- a/package/dropwatch/Config.in
+++ b/package/dropwatch/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_DROPWATCH
 	  https://fedorahosted.org/dropwatch/
 
 comment "dropwatch needs a toolchain w/ threads"
+	depends on !BR2_aarch64
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dstat/Config.in b/package/dstat/Config.in
index b5edfaeae1..62a392a5c3 100644
--- a/package/dstat/Config.in
+++ b/package/dstat/Config.in
@@ -21,4 +21,5 @@ config BR2_PACKAGE_DSTAT
 	  http://dag.wieers.com/home-made/dstat/
 
 comment "dstat needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
index 24f39ac9a7..3a678ad097 100644
--- a/package/ebtables/Config.in
+++ b/package/ebtables/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_EBTABLES
 	  http://ebtables.sourceforge.net
 
 comment "ebtables needs a toolchain w/ IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 500e8373a5..783a54e7f3 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -24,6 +24,7 @@ config BR2_PACKAGE_LIBEDBUS_BLUEZ
 	  Bluetooth support.
 
 comment "bluez support needs a toolchain w/ wchar, threads"
+	depends on !BR2_avr32
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
@@ -40,4 +41,5 @@ config BR2_PACKAGE_LIBEDBUS_NOTIFY
 endif
 
 comment "libedbus needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 5df817b63e..66c7055ff9 100644
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -37,6 +37,6 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	  http://www.enlightenment.org/
 
 comment "enlightenment needs a toolchain w/ wchar, C++, threads"
-	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_avr32
diff --git a/package/exfat/Config.in b/package/exfat/Config.in
index 5995f0c8e0..92e6c38170 100644
--- a/package/exfat/Config.in
+++ b/package/exfat/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_EXFAT
 	  http://code.google.com/p/exfat/
 
 comment "exfat needs a toolchain w/ largefile, wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in
index 54d53a0a3c..1ec59e1a88 100644
--- a/package/fdk-aac/Config.in
+++ b/package/fdk-aac/Config.in
@@ -15,3 +15,6 @@ config BR2_PACKAGE_FDK_AAC
 
 comment "fdk-aac needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
+		   BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+		   BR2_powerpc || BR2_sh || BR2_sh64
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index 9965aa3571..b7b085d54e 100644
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -18,5 +18,7 @@ config BR2_PACKAGE_FILEMQ
 	  http://github.com/zeromq/filemq
 
 comment "filemq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/findutils/Config.in b/package/findutils/Config.in
index b95f1cb197..b719d4ff3e 100644
--- a/package/findutils/Config.in
+++ b/package/findutils/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_FINDUTILS
 	  http://www.gnu.org/software/findutils/findutils.html
 
 comment "findutils needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/flex/Config.in b/package/flex/Config.in
index be6140bd1e..52f7fe77f0 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -7,11 +7,12 @@ config BR2_PACKAGE_FLEX
 
 	  http://flex.sourceforge.net/
 
+if BR2_PACKAGE_FLEX
+
 config BR2_PACKAGE_FLEX_BINARY
 	bool "Install tool in the target"
 	# needs fork()
 	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_FLEX
 	# runtime dependency
 	select BR2_PACKAGE_M4
 	depends on BR2_USE_WCHAR # m4
@@ -19,4 +20,7 @@ config BR2_PACKAGE_FLEX_BINARY
 	  Install the flex binary tool in the target filesystem.
 
 comment "flex binary needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
+
+endif
diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index 587fcc1e44..8e9977a154 100644
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_FLTK
 	  http://www.fltk.org/
 
 comment "fltk needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU && BR2_PACKAGE_XORG7
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/foomatic-filters/Config.in b/package/foomatic-filters/Config.in
index 3d34f1325f..377566e929 100644
--- a/package/foomatic-filters/Config.in
+++ b/package/foomatic-filters/Config.in
@@ -1,4 +1,5 @@
 comment "foomatic-filters needs a toolchain w/ threads"
+	depends on BR2_PACKAGE_CUPS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_FOOMATIC_FILTERS
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 1a6e245920..244bebbb47 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -1,4 +1,5 @@
 comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain"
+	depends on BR2_arm
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
diff --git a/package/gawk/Config.in b/package/gawk/Config.in
index a1c632f552..31b97fadab 100644
--- a/package/gawk/Config.in
+++ b/package/gawk/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_GAWK
 	  http://www.gnu.org/software/gawk/
 
 comment "gawk needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index de98d3d22e..5776a97fc3 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -1,4 +1,5 @@
 comment "gdb/gdbserver needs a toolchain w/ threads, threads debug"
+	depends on !BR2_aarch64
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 
 config BR2_PACKAGE_GDB
@@ -42,6 +43,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
 	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
 
 comment "full gdb on target needs a toolchain w/ wchar"
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32 && !BR2_microblaze && !BR2_bfin
 	depends on !BR2_USE_WCHAR
 
 endif
diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in
index a15d98ad9d..81cbce9f33 100644
--- a/package/gesftpserver/Config.in
+++ b/package/gesftpserver/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_GESFTPSERVER
 	  http://www.greenend.org.uk/rjk/sftpserver/
 
 comment "gesftpserver needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 8e4f594cab..305c5a527a 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -25,4 +25,5 @@ config BR2_PACKAGE_GETTEXT_TOOLS
 	  correct operation of programs.
 
 comment "gettext needs a toolchain w/ wchar"
-	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
+	depends on BR2_NEEDS_GETTEXT
+	depends on !BR2_USE_WCHAR
diff --git a/package/git/Config.in b/package/git/Config.in
index 5a3e16aa86..66c66c788b 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_GIT
 	  http://git-scm.com
 
 comment "git needs a toolchain w/ largefile"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 7e059055ee..0d5f0dc816 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -21,5 +21,5 @@ config BR2_PACKAGE_GMPC
 	  http://gmpcwiki.sarine.nl/index.php?title=GMPC
 
 comment "gmpc needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index ee4d3b54fe..8e930fa549 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_GOB2
 	  http://www.jirka.org/gob.html
 
 comment "gob2 needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index d1a55ebfbc..5b007d7df3 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -1,4 +1,5 @@
 comment "gpsd needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GPSD
diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
index 72b98b8a76..1d6a707707 100644
--- a/package/gstreamer/gst-ffmpeg/Config.in
+++ b/package/gstreamer/gst-ffmpeg/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_GST_FFMPEG
 	  http://gstreamer.freedesktop.org/
 
 comment "gst-ffmpeg needs a toolchain w/ largefile, IPv6"
+	depends on BR2_PACKAGE_GSTREAMER
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/gtest/Config.in b/package/gtest/Config.in
index 883cf97ed7..c07f13bf6f 100644
--- a/package/gtest/Config.in
+++ b/package/gtest/Config.in
@@ -22,4 +22,5 @@ config BR2_PACKAGE_GTEST
 	  http://code.google.com/p/googletest/
 
 comment "gtest needs a toolchain w/ C++, wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
index a53bbee642..f93717c7f2 100644
--- a/package/gutenprint/Config.in
+++ b/package/gutenprint/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_GUTENPRINT
 	  http://gimp-print.sourceforge.net/
 
 comment "gutenprint needs a toolchain w/ C++"
+	depends on BR2_PACKAGE_CUPS
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 17827bf05a..71e8497199 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -17,4 +17,5 @@ config BR2_PACKAGE_GVFS
 	  http://en.wikipedia.org/wiki/GVFS
 
 comment "gvfs needs a toolchain w/ largefile, wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in
index b5f73e0e26..53336972ad 100644
--- a/package/hiawatha/Config.in
+++ b/package/hiawatha/Config.in
@@ -1,4 +1,5 @@
 comment "hiawatha needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_HIAWATHA
diff --git a/package/hplip/Config.in b/package/hplip/Config.in
index 4670400ce8..756567150d 100644
--- a/package/hplip/Config.in
+++ b/package/hplip/Config.in
@@ -16,4 +16,5 @@ config BR2_PACKAGE_HPLIP
 	  http://hplipopensource.com/
 
 comment "hplip needs a toolchain w/ C++, threads"
+	depends on BR2_PACKAGE_CUPS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/inotify-tools/Config.in b/package/inotify-tools/Config.in
index 443c92290f..4d64b73b62 100644
--- a/package/inotify-tools/Config.in
+++ b/package/inotify-tools/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_INOTIFY_TOOLS
 	  https://github.com/rvoicilas/inotify-tools
 
 comment "inotify-tools needs a toolchain w/ largefile"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index ad6332f03c..86dd3e97c9 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_IPERF
 	  http://dast.nlanr.net/projects/iperf/
 
 comment "iperf needs a toolchain w/ C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 7a899d6067..dbd0fbbd3e 100644
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@@ -12,4 +12,6 @@ config BR2_PACKAGE_JAMVM
 	  http://jamvm.sf.net
 
 comment "jamvm needs a toolchain w/ IPv6"
+	depends on BR2_arm || BR2_armeb || BR2_i386 \
+		|| BR2_mipsel || BR2_powerpc || BR2_x86_64
 	depends on !BR2_INET_IPV6
diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index 8625a8e437..fc9103dea7 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,4 +1,5 @@
 comment "kismet needs a toolchain w/ threads, C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_KISMET
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index d7c74eb071..205f47ceea 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -65,4 +65,5 @@ endmenu
 endif
 
 comment "libdrm needs a toolchain w/ largefile"
-	depends on BR2_PACKAGE_XORG7 && !BR2_LARGEFILE
+	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_LARGEFILE
diff --git a/package/libedit/Config.in b/package/libedit/Config.in
index 683eb6b883..a70f9ebb9a 100644
--- a/package/libedit/Config.in
+++ b/package/libedit/Config.in
@@ -16,4 +16,5 @@ config BR2_PACKAGE_LIBEDIT
 	  http://www.thrysoee.dk/editline/
 
 comment "libedit needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/libfslvpuwrap/Config.in b/package/libfslvpuwrap/Config.in
index 57b8a0206b..a60f8ef684 100644
--- a/package/libfslvpuwrap/Config.in
+++ b/package/libfslvpuwrap/Config.in
@@ -1,5 +1,6 @@
 comment "libfslvpuwrap needs an imx-specific kernel to be built"
-	depends on BR2_arm && !BR2_LINUX_KERNEL
+	depends on BR2_arm
+	depends on !BR2_LINUX_KERNEL
 
 config BR2_PACKAGE_LIBFSLVPUWRAP
 	bool "libfslvpuwrap"
diff --git a/package/libfuse/Config.in b/package/libfuse/Config.in
index 345b63d246..5561d9d4f6 100644
--- a/package/libfuse/Config.in
+++ b/package/libfuse/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_LIBFUSE
 	  http://fuse.sourceforge.net/
 
 comment "libfuse needs a toolchain w/ largefile, threads, dynamic library"
-        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/libgail/Config.in b/package/libgail/Config.in
index 7142d2831e..4335bef347 100644
--- a/package/libgail/Config.in
+++ b/package/libgail/Config.in
@@ -20,5 +20,5 @@ config BR2_PACKAGE_LIBGAIL
 	  http://developer.gnome.org/projects/gap
 
 comment "libgail needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_LIBGTK2 && \
-		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_LIBGTK2
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index 47a44cab6f..774c7659ec 100644
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_LIBGLADE
 	  http://ftp.gnome.org/pub/GNOME/sources/libglade/
 
 comment "libglade needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_LIBGTK2 && \
-		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_LIBGTK2
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 47f55b7cb0..1dc8f2e3b3 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -32,5 +32,6 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 endif
 
 comment "libgtk2 needs a toolchain w/ wchar, threads, C++"
+	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index eb8625f43e..4ef3a518ee 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_LIBNSPR
 	  http://www.mozilla.org/projects/nspr/
 
 comment "libnspr needs a toolchain w/ largefile, threads"
+	depends on !BR2_arc
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index b12d4e7b6a..88b1fde290 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -16,5 +16,6 @@ config BR2_PACKAGE_LIBNSS
 	  http://www.mozilla.org/projects/security/pki/nss/
 
 comment "libnss needs a toolchain w/ largefile, threads"
+	depends on !BR2_arc
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
index dc8f09593c..a6759e70d3 100644
--- a/package/libtirpc/Config.in
+++ b/package/libtirpc/Config.in
@@ -15,4 +15,6 @@ config BR2_PACKAGE_LIBTIRPC
 	  http://sourceforge.net/projects/libtirpc/
 
 comment "libtirpc needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in
index 3849c13273..9b5582692f 100644
--- a/package/libunwind/Config.in
+++ b/package/libunwind/Config.in
@@ -9,4 +9,6 @@ config BR2_PACKAGE_LIBUNWIND
 	  http://www.nongnu.org/libunwind/index.html
 
 comment "libunwind needs a toolchain w/ threads"
+	depends on BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
+		BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in
index 67347dc395..de53495be6 100644
--- a/package/liburcu/Config.in
+++ b/package/liburcu/Config.in
@@ -11,5 +11,6 @@ config BR2_PACKAGE_LIBURCU
 	  http://lttng.org/urcu
 
 comment "liburcu needs a toolchain w/ threads"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
diff --git a/package/linknx/Config.in b/package/linknx/Config.in
index c1a6d3b187..6a26c207d5 100644
--- a/package/linknx/Config.in
+++ b/package/linknx/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_LINKNX
 	  http://linknx.sourceforge.net/
 
 comment "linknx needs a toolchain w/ C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index 36a0405cdc..72eca7dce5 100644
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -27,5 +27,6 @@ config BR2_PACKAGE_LINPHONE
 	  http://www.linphone.org/
 
 comment "linphone needs a toolchain w/ threads, C++, IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INET_IPV6
diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index 2c14dc81d9..c4ea5223af 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_LMBENCH
 	  http://sourceforge.net/projects/lmbench/
 
 comment "lmbench needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/logrotate/Config.in b/package/logrotate/Config.in
index 376ce5e4f6..07a2da519f 100644
--- a/package/logrotate/Config.in
+++ b/package/logrotate/Config.in
@@ -9,5 +9,6 @@ config BR2_PACKAGE_LOGROTATE
 	  https://fedorahosted.org/logrotate/
 
 comment "logrotate needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
 
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 5ebcdeefc9..0883c8fdc3 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -24,5 +24,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	  http://ltp.sourceforge.net/
 
 comment "ltp-testsuite needs a toolchain w/ IPv6, RPC, largefile, threads"
-	depends on (!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
-		!BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_NATIVE_RPC) && !BR2_aarch64
+	depends on !BR2_aarch64
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
+		!BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 40079b4a21..f1e341dd02 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -28,5 +28,5 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	  http://lttng.org
 
 comment "lttng-babeltrace needs a toolchain w/ wchar, threads, largefile"
-	depends on BR2_PACKAGE_LTTNG_TOOLS && \
-		(!BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_LTTNG_TOOLS
+	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in
index 49e09d585c..5e1a6d4c8e 100644
--- a/package/lttng-libust/Config.in
+++ b/package/lttng-libust/Config.in
@@ -18,5 +18,5 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	  http://lttng.org
 
 comment "lttng-libust needs a toolchain w/ wchar, largefile, threads"
-	depends on !(BR2_USE_WCHAR || BR2_LARGEFILE)
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index 85598b84d1..1e9e0c3439 100644
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -28,5 +28,6 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  http://lttng.org
 
 comment "lttng-tools needs a toolchain w/ largefile, threads, wchar"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index a8da42d07d..b3988eaed1 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -30,4 +30,5 @@ config BR2_PACKAGE_LVM2_APP_LIBRARY
 	  Install application library (liblvm2app).
 
 comment "lvm2 needs a toolchain w/ largefile"
-        depends on !BR2_LARGEFILE
+	depends on BR2_USE_MMU
+	depends on !BR2_LARGEFILE
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index f8c1fb9e31..3afb5b6b30 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_LXC
 	  http://lxc.sourceforge.net/
 
 comment "lxc needs a toolchain w/ IPv6, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lzma/Config.in b/package/lzma/Config.in
index 61fdbfec18..5a55103c58 100644
--- a/package/lzma/Config.in
+++ b/package/lzma/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_LZMA
 	  http://tukaani.org/lzma/
 
 comment "lzma needs a toolchain w/ C++"
-        depends on !BR2_INSTALL_LIBSTDCPP && BR2_DEPRECATED
+	depends on BR2_DEPRECATED
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/m4/Config.in b/package/m4/Config.in
index 2adeaf3480..4d651a2802 100644
--- a/package/m4/Config.in
+++ b/package/m4/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_M4
 	  http://www.gnu.org/software/m4/m4.html
 
 comment "m4 needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/midori/Config.in b/package/midori/Config.in
index d0c8aab2f4..a684376c69 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -16,5 +16,7 @@ config BR2_PACKAGE_MIDORI
 	  http://software.twotoasts.de/?page=midori
 
 comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads"
-        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
+		    BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2
diff --git a/package/minicom/Config.in b/package/minicom/Config.in
index f40fe79f56..07dbeba5ff 100644
--- a/package/minicom/Config.in
+++ b/package/minicom/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_MINICOM
 	  http://alioth.debian.org/projects/minicom
 
 comment "minicom needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
index 3f2bcb591e..1fcecde0f7 100644
--- a/package/minidlna/Config.in
+++ b/package/minidlna/Config.in
@@ -19,4 +19,5 @@ config BR2_PACKAGE_MINIDLNA
 	  http://minidlna.sourceforge.net/
 
 comment "minidlna needs a toolchain w/ largefile, IPv6, threads"
+	depends on BR2_USE_MMU
 	depends on !(BR2_LARGEFILE && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/mongoose/Config.in b/package/mongoose/Config.in
index 7c99f7e58d..35723dea23 100644
--- a/package/mongoose/Config.in
+++ b/package/mongoose/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_MONGOOSE
 	  https://github.com/valenok/mongoose
 
 comment "mongoose needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index b930cb5862..3a1b428ce6 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -29,4 +29,6 @@ config BR2_PACKAGE_MPLAYER_MENCODER
 endif
 
 comment "mplayer needs a toolchain w/ largefile"
+	depends on !(BR2_sh2 || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
+			|| BR2_microblaze || BR2_aarch64)
 	depends on !BR2_LARGEFILE
diff --git a/package/mutt/Config.in b/package/mutt/Config.in
index 76223bd3cc..430eeb8f1e 100644
--- a/package/mutt/Config.in
+++ b/package/mutt/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_MUTT
 	  http://www.mutt.org/
 
 comment "mutt needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/mysql_client/Config.in b/package/mysql_client/Config.in
index 2f1a2b92b5..543bed1e6d 100644
--- a/package/mysql_client/Config.in
+++ b/package/mysql_client/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_MYSQL_CLIENT
 	  MySQL client
 
 comment "MySQL client needs a toolchain w/ C++, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 2e6d62c9b5..0fad92a9d7 100644
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -1,4 +1,5 @@
 comment "ndisc6 needs a toolchain w/ IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_NDISC6
diff --git a/package/neard/Config.in b/package/neard/Config.in
index dcb5c155f0..81bb61ea25 100644
--- a/package/neard/Config.in
+++ b/package/neard/Config.in
@@ -24,4 +24,5 @@ config BR2_PACKAGE_NEARD_TOOLS
 endif
 
 comment "neard needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neardal/Config.in b/package/neardal/Config.in
index e1237e692b..0e871716f7 100644
--- a/package/neardal/Config.in
+++ b/package/neardal/Config.in
@@ -21,4 +21,5 @@ config BR2_PACKAGE_NEARDAL_NCL
 endif
 
 comment "neardal needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
index 371832fcae..cdb2039a40 100644
--- a/package/netatalk/Config.in
+++ b/package/netatalk/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_NETATALK
 	  http://netatalk.sourceforge.net/
 
 comment "netatalk needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index 793fdaa3d6..49d3b2e199 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_NETKITBASE
 	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 
 comment "netkitbase needs a toolchain w/ RPC"
-        depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_USE_MMU && BR2_DEPRECATED
+	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/netkittelnet/Config.in b/package/netkittelnet/Config.in
index b0229b32b2..da1b245799 100644
--- a/package/netkittelnet/Config.in
+++ b/package/netkittelnet/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_NETKITTELNET
 	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 
 comment "netkittelnet needs a toolchain w/ RPC"
+	depends on BR2_DEPRECATED
 	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index f39293c4ad..1e2a876f3a 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -28,5 +28,6 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	  http://projects.gnome.org/NetworkManager/
 
 comment "NetworkManager needs a toolchain w/ IPv6, largefile, wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index fcb02472d9..3602a74f50 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_NFS_UTILS
 	  http://sourceforge.net/projects/nfs
 
 comment "nfs-utils needs a toolchain w/ largefile, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || \
 		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
 
diff --git a/package/nmap/Config.in b/package/nmap/Config.in
index 9707d36b70..2364dacb5e 100644
--- a/package/nmap/Config.in
+++ b/package/nmap/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_NMAP
 	  http://nmap.org
 
 comment "nmap needs a toolchain w/ C++, IPv6, threads"
+	depends on BR2_USE_MMU
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 536810580c..0258460f49 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -15,6 +15,9 @@ config BR2_PACKAGE_NODEJS
 	  http://nodejs.org/
 
 comment "nodejs needs a toolchain w/ C++, IPv6, largefile, threads"
+	depends on BR2_USE_MMU
+	depends on BR2_arm || BR2_i386 || BR2_x86_64
+	depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
 
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index 5214295473..0510c124c2 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -31,4 +31,5 @@ config BR2_PACKAGE_NTFS_3G_NTFSPROGS
 endif
 
 comment "ntfs-3g needs a toolchain w/ largefile, wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/numactl/Config.in b/package/numactl/Config.in
index b1c40e0017..0976de2a7e 100644
--- a/package/numactl/Config.in
+++ b/package/numactl/Config.in
@@ -13,4 +13,6 @@ config BR2_PACKAGE_NUMACTL
 	  http://oss.sgi.com/projects/libnuma/
 
 comment "numactl needs a toolchain w/ largefile"
+	depends on BR2_i386 || BR2_mips || BR2_mipsel || \
+		   BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
 	depends on !BR2_LARGEFILE
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index 30962892e0..c431e08e0e 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_OFONO
 	  http://ofono.org/
 
 comment "ofono needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/olsr/Config.in b/package/olsr/Config.in
index 4c98bd7818..0090643e26 100644
--- a/package/olsr/Config.in
+++ b/package/olsr/Config.in
@@ -14,4 +14,5 @@ config BR2_PACKAGE_OLSR
 	  http://www.olsr.org/
 
 comment "olsr needs a toolchain w/ IPv6, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/on2-8170-modules/Config.in b/package/on2-8170-modules/Config.in
index 18c066e996..58ee88f270 100644
--- a/package/on2-8170-modules/Config.in
+++ b/package/on2-8170-modules/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_ON2_8170_MODULES
 	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 
 comment "on2-8170 modules requires a linux kernel to be built"
+	depends on BR2_arm926t
 	depends on !BR2_LINUX_KERNEL
diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index 4bd4dbbab9..9b9d2f9a29 100644
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -18,6 +18,7 @@ config BR2_PACKAGE_OPENOBEX_BLUEZ
 	select BR2_PACKAGE_BLUEZ_UTILS
 
 comment "bluez support needs a toolchain w/ wchar, threads"
+	depends on !BR2_avr32 && BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENOBEX_LIBUSB
diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in
index 8229032df9..cdb09a2e9c 100644
--- a/package/openpowerlink/Config.in
+++ b/package/openpowerlink/Config.in
@@ -1,4 +1,5 @@
 comment "openpowerlink needs a toolchain w/ C++, threads"
+	depends on BR2_i386 || BR2_x86_64
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_OPENPOWERLINK
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index e6bf880db6..4a5e0ead1f 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -1,4 +1,5 @@
 comment "openvpn needs a toolchain w/ IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_OPENVPN
diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index d1adca3a5c..2847a914e1 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -23,4 +23,5 @@ config BR2_PACKAGE_OPROFILE
 	  libraries, and applications.
 
 comment "oprofile needs a toolchain w/ C++"
+	depends on BR2_USE_MMU && !BR2_aarch64
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
index 7f4f8658d3..8d0cf38344 100644
--- a/package/p11-kit/Config.in
+++ b/package/p11-kit/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_P11_KIT
 	  http://p11-glue.freedesktop.org/p11-kit.html
 
 comment "p11-kit needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/parted/Config.in b/package/parted/Config.in
index 38b41e34f9..8af269326b 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_PARTED
 	  http://www.gnu.org/software/parted/
 
 comment "parted needs a toolchain w/ largefile, wchar"
-        depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	depends on BR2_USE_MMU
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index 635aa61bc1..f6a398436f 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -14,5 +14,5 @@ config BR2_PACKAGE_PCMANFM
 	  http://internap.dl.sourceforge.net/sourceforge/pcmanfm
 
 comment "pcmanfm needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_XORG7 && \
-	(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in
index 87139d9a64..4cd89e93bc 100644
--- a/package/pcsc-lite/Config.in
+++ b/package/pcsc-lite/Config.in
@@ -29,4 +29,5 @@ config BR2_PACKAGE_PCSC_LITE_EMBEDDED
 endif
 
 comment "pcsc-lite needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 4e0d0e606f..c0c85f1fe2 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -138,6 +138,7 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
 	  PDO driver for MySQL
 
 comment "MySQL drivers need a toolchain w/ C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index 6b560e1b8c..4a03e75a0a 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_PKG_CONFIG
 	  http://www.freedesktop.org/software/pkgconfig/
 
 comment "pkg-config needs a toolchain w/ wchar, threads"
-	depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_DEPRECATED
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in
index c63e791308..9a8102c23c 100644
--- a/package/python-nfc/Config.in
+++ b/package/python-nfc/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_PYTHON_NFC
 	  https://launchpad.net/nfcpy
 
 comment "python-nfc needs a toolchain w/ threads"
+	depends on BR2_PACKAGE_PYTHON
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in
index 6191ac1979..b83c09cf6c 100644
--- a/package/python-pyzmq/Config.in
+++ b/package/python-pyzmq/Config.in
@@ -13,5 +13,6 @@ config BR2_PACKAGE_PYTHON_PYZMQ
 	  http://zeromq.org/bindings:python
 
 comment "python-pyzmq needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+	depends on BR2_PACKAGE_PYTHON
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/python/Config.in b/package/python/Config.in
index a55002344a..b1c0935415 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_PYTHON
 	  http://www.python.org/
 
 comment "python needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
 
 if BR2_PACKAGE_PYTHON
diff --git a/package/python3/Config.in b/package/python3/Config.in
index b355276211..6580cfdc7f 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_PYTHON3
 	  http://www.python.org/
 
 comment "python3 needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
 
 if BR2_PACKAGE_PYTHON3
diff --git a/package/qt/Config.in b/package/qt/Config.in
index b1a2207f23..2651d55901 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -1,4 +1,5 @@
 comment "qt needs a toolchain w/ C++, threads"
+	depends on !BR2_avr32
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 menuconfig BR2_PACKAGE_QT
@@ -301,6 +302,7 @@ config BR2_PACKAGE_QT_DBUS
 	  Build the Qt DBus module.
 
 comment "DBus Module needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_QT_XML
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 30f4ac8385..42724dc15d 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -1,4 +1,5 @@
 comment "Qt5 needs a toolchain w/ wchar, IPv6, threads, C++"
+	depends on !BR2_PACKAGE_QT
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
 
 menuconfig BR2_PACKAGE_QT5
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 1459207d2a..e79ab02b24 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_QUAGGA_ZEBRA
 	  Build zebra daemon.
 
 comment "zebra daemon needs a toolchain w/ IPv6"
-	depends on BR2_PACKAGE_QUAGGA && !BR2_INET_IPV6
+	depends on !BR2_INET_IPV6
 
 config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
 	bool "Use TCP sockets between zebra and protocol daemons"
diff --git a/package/quota/Config.in b/package/quota/Config.in
index 3bb4556df2..69f03afd62 100644
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -16,6 +16,7 @@ config BR2_PACKAGE_QUOTA
 	  http://sourceforge.net/projects/linuxquota/
 
 comment "quota needs a toolchain w/ largefile, wchar, threads"
+	depends on BR2_USE_MMU && !(BR2_microblazeel || BR2_microblazebe)
 	depends on !BR2_LARGEFILE || \
 		!BR2_USE_WCHAR || \
 		!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index 5bfb535b52..6edfd7c015 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_RADVD
 	  http://www.litech.org/radvd/
 
 comment "radvd needs a toolchain w/ IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6
diff --git a/package/redis/Config.in b/package/redis/Config.in
index e28ccecbe2..b370e7dbbc 100644
--- a/package/redis/Config.in
+++ b/package/redis/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_REDIS
 	  http://www.redis.io
 
 comment "redis needs a toolchain w/ largefile, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rpcbind/Config.in b/package/rpcbind/Config.in
index 1fb5346692..578c6d66dc 100644
--- a/package/rpcbind/Config.in
+++ b/package/rpcbind/Config.in
@@ -13,4 +13,6 @@ config BR2_PACKAGE_RPCBIND
 	  into universal addresses.
 
 comment "rpcbind needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 81dc49a378..8910211836 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -18,4 +18,5 @@ config BR2_PACKAGE_RPI_USERLAND
 	  https://github.com/raspberrypi/userland/
 
 comment "rpi-userland needs a toolchain w/ C++, largefile, threads"
+	depends on BR2_arm
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index e913dcd17c..36c111bd20 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -23,4 +23,5 @@ config BR2_PACKAGE_RT_TESTS
 	  http://rt.wiki.kernel.org
 
 comment "rt-tests needs a toolchain w/ threads"
+	depends on !BR2_avr32
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index 3abb6fa5d6..0f39a92f34 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_RTORRENT
 	  http://libtorrent.rakshasa.no/
 
 comment "rtorrent needs a toolchain w/ C++, threads, wchar"
+	depends on BR2_USE_MMU
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/samba/Config.in b/package/samba/Config.in
index ce6739642d..1469075361 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -14,6 +14,7 @@ config BR2_PACKAGE_SAMBA
 		so choose only the components you need.
 
 comment "samba needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 if BR2_PACKAGE_SAMBA
@@ -251,6 +252,7 @@ config BR2_PACKAGE_SAMBA_AVAHI
 	  Include support for avahi
 
 comment "support avahi - disabled (requires avahi-daemon)"
+	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_AVAHI_DAEMON
 
 config BR2_PACKAGE_SAMBA_GAMIN
diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in
index 476a284a73..552ab0f094 100644
--- a/package/ser2net/Config.in
+++ b/package/ser2net/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_SER2NET
 	  http://ser2net.sourceforge.net
 
 comment "ser2net needs a toolchain w/ IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6
diff --git a/package/smartmontools/Config.in b/package/smartmontools/Config.in
index 1c6b1bc312..92e0037a5a 100644
--- a/package/smartmontools/Config.in
+++ b/package/smartmontools/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_SMARTMONTOOLS
 	  http://smartmontools.sourceforge.net/
 
 comment "smartmontools needs a toolchain w/ C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
index cd1b4132b6..e6e3272c88 100644
--- a/package/snowball-init/Config.in
+++ b/package/snowball-init/Config.in
@@ -13,5 +13,5 @@ config BR2_PACKAGE_SNOWBALL_INIT
 	  http://www.igloocommunity.org
 
 comment "snowball-init needs a toolchain w/ wchar, threads"
-	depends on !BR2_avr32 && \
-		(!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on !BR2_avr32 && BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/socat/Config.in b/package/socat/Config.in
index f7717192a3..09eb2b616d 100644
--- a/package/socat/Config.in
+++ b/package/socat/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_SOCAT
 	  http://www.dest-unreach.org/socat/
 
 comment "socat needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
index d4f210ea49..7d663251cd 100644
--- a/package/socketcand/Config.in
+++ b/package/socketcand/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_SOCKETCAND
 	  https://github.com/dschanoeh/socketcand
 
 comment "socketcand needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
index 8c4966f0bc..484340fe1c 100644
--- a/package/sqlcipher/Config.in
+++ b/package/sqlcipher/Config.in
@@ -10,9 +10,10 @@ config BR2_PACKAGE_SQLCIPHER
 
 	  http://sqlcipher.net
 
+if BR2_PACKAGE_SQLCIPHER
+
 config BR2_PACKAGE_SQLCIPHER_READLINE
 	bool "Command-line editing"
-	depends on BR2_PACKAGE_SQLCIPHER
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
@@ -20,14 +21,16 @@ config BR2_PACKAGE_SQLCIPHER_READLINE
 
 config BR2_PACKAGE_SQLCIPHER_STAT3
 	bool "Additional query optimizations (stat3)"
-	depends on BR2_PACKAGE_SQLCIPHER
 	help
 	  Adds additional logic to the ANALYZE command and to the query
 	  planner that can help SQLite to choose a better query plan under
 	  certain situations.
 
+endif
+
 comment "sqlcipher conflicts with sqlite"
 	depends on BR2_PACKAGE_SQLITE
 
 comment "sqlcipher needs a toolchain w/ threads"
+	depends on !BR2_PACKAGE_SQLITE
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/squashfs3/Config.in b/package/squashfs3/Config.in
index 8ce1e495a3..365eb6a5a0 100644
--- a/package/squashfs3/Config.in
+++ b/package/squashfs3/Config.in
@@ -8,4 +8,5 @@ config BR2_PACKAGE_SQUASHFS3
 	  http://squashfs.sourceforge.net/
 
 comment "squashfs3 needs a toolchain w/ largefile"
-	depends on BR2_DEPRECATED && !BR2_LARGEFILE
+	depends on BR2_DEPRECATED
+	depends on !BR2_LARGEFILE
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 8d0df6ef5d..33776ca5de 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,4 +1,5 @@
 comment "squid needs a toolchain w/ C++, IPv6"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
 
 config BR2_PACKAGE_SQUID
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 34f6af32cd..2ce627f56b 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -16,4 +16,5 @@ config BR2_PACKAGE_SSHFS
 	  http://fuse.sourceforge.net/sshfs.html
 
 comment "sshfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 753958b2b9..20a3a9a592 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_SYNERGY
 	  http://synergy2.sourceforge.net/
 
 comment "synergy needs a toolchain w/ C++, wchar"
-	depends on BR2_PACKAGE_XORG7 && !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
+	depends on BR2_PACKAGE_XORG7
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in
index 70e89033c3..0bb0791571 100644
--- a/package/sysprof/Config.in
+++ b/package/sysprof/Config.in
@@ -25,4 +25,5 @@ config BR2_PACKAGE_SYSPROF_GUI
 endif
 
 comment "sysprof needs a toolchain w/ wchar, threads"
-        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 49536be13a..f6a15e3004 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -19,5 +19,6 @@ config BR2_PACKAGE_SYSTEMD
 	  http://freedesktop.org/wiki/Software/systemd
 
 comment "systemd needs udev /dev management and a toolchain w/ IPv6, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || !BR2_INET_IPV6 || \\
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 9ed60f0d72..8d413c6529 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -47,4 +47,5 @@ comment "transmission-gtk needs a toolchain w/ locale"
 endif
 
 comment "transmission needs a toolchain w/ IPv6, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 52a5f047a6..04bcde122d 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -1,5 +1,6 @@
 comment "tvheadend needs a toolchain w/ largefile, IPv6, threads"
-    depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_avr32
+	depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index eae76b238e..09070b4caa 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -36,5 +36,6 @@ config BR2_PACKAGE_UDISKS_LVM2
 endif
 
 comment "udisks needs udev /dev management and a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index 506eaba8a4..0543b4bb42 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_UDPCAST
 	  http://www.udpcast.linux.lu/
 
 comment "udpcast needs a toolchain w/ largefile, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 menu "udpcast tools selection"
diff --git a/package/unionfs/Config.in b/package/unionfs/Config.in
index aa4f66c131..de3d341cf3 100644
--- a/package/unionfs/Config.in
+++ b/package/unionfs/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_UNIONFS
 	  http://podgorny.cz/moin/UnionFsFuse
 
 comment "unionfs needs a toolchain w/ largefile, threads, dynamic library"
+	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index 0de1a51b5a..4a79779dd0 100644
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -15,4 +15,5 @@ config BR2_PACKAGE_USSP_PUSH
 	  http://www.xmailserver.org/ussp-push.html
 
 comment "ussp-push needs a toolchain w/ wchar, IPv6, threads"
+	depends on !BR2_avr32 && BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
diff --git a/package/vala/Config.in b/package/vala/Config.in
index e15b441d13..d947c4aa33 100644
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_VALA
 	  http://live.gnome.org/Vala
 
 comment "vala needs a toolchain w/ wchar, threads"
-	depends on BR2_DEPRECATED && (!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS)
+	depends on BR2_DEPRECATED
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 762ed9025f..0207a6d78c 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -29,5 +29,7 @@ config BR2_PACKAGE_WEBKIT
 	  http://webkit.org/
 
 comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads"
+	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
+		    BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
 	depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in
index d795b071fd..f228bc7c18 100644
--- a/package/webrtc-audio-processing/Config.in
+++ b/package/webrtc-audio-processing/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
 	  http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/
 
 comment "webrtc-audio-processing needs a toolchain w/ C++, threads"
+	depends on BR2_arm || BR2_i386 || BR2_x86_64
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/wget/Config.in b/package/wget/Config.in
index 254acfd8d5..26a2019d47 100644
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -9,4 +9,5 @@ config BR2_PACKAGE_WGET
 	  http://www.gnu.org/software/wget/
 
 comment "wget needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index 0a34c3b3a8..6b756a62c9 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -13,4 +13,5 @@ config BR2_PACKAGE_WIRESHARK
 	  http://www.wireshark.org
 
 comment "wireshark needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in
index 012d3686db..ef4cd759ac 100644
--- a/package/wvdial/Config.in
+++ b/package/wvdial/Config.in
@@ -10,4 +10,5 @@ config BR2_PACKAGE_WVDIAL
 	  http://wvdial.googlecode.com/
 
 comment "wvdial needs a toolchain w/ C++, largefile"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in
index c717b60665..c29937e953 100644
--- a/package/wvstreams/Config.in
+++ b/package/wvstreams/Config.in
@@ -11,4 +11,5 @@ config BR2_PACKAGE_WVSTREAMS
 	  http://wvstreams.googlecode.com/
 
 comment "wvstreams needs a toolchain w/ C++, largefile"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 5a0464ba5f..0d5f494e10 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -1,5 +1,7 @@
 comment "xenomai needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_i386 || BR2_x86_64 || BR2_arm || \
+		   BR2_bfin || BR2_powerpc || BR2_sh4
 
 config BR2_PACKAGE_XENOMAI
 	bool "Xenomai Userspace"
diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in
index 3e107d7118..21a19d001e 100644
--- a/package/xscreensaver/Config.in
+++ b/package/xscreensaver/Config.in
@@ -19,4 +19,5 @@ config BR2_PACKAGE_XSCREENSAVER
 	  http://www.jwz.org/xscreensaver/
 
 comment "xscreensaver needs a toolchain w/ C++, threads"
+	depends on BR2_PACKAGE_XORG7
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index bbc4f95009..68dbf4e756 100644
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -16,12 +16,14 @@ config BR2_PACKAGE_ZMQPP
 	  http://github.com/benjamg/zmqpp
 
 comment "zmqpp needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+	depends on !BR2_avr32
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
 
+if BR2_PACKAGE_ZMQPP
+
 config BR2_PACKAGE_ZMQPP_CLIENT
 	bool "zmqpp client"
-	depends on BR2_PACKAGE_ZMQPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
@@ -30,4 +32,6 @@ config BR2_PACKAGE_ZMQPP_CLIENT
 	  used to listen or send to zeromq sockets.
 
 comment "zmqpp client needs a toolchain w/ threads"
-	depends on BR2_PACKAGE_ZMQPP && !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+endif
diff --git a/package/zyre/Config.in b/package/zyre/Config.in
index 52f1ca2fc7..5833ccc18c 100644
--- a/package/zyre/Config.in
+++ b/package/zyre/Config.in
@@ -17,5 +17,7 @@ config BR2_PACKAGE_ZYRE
 	  http://zyre.org
 
 comment "zyre needs a toolchain w/ C++, IPv6, largefile, wchar, threads"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+		!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/system/Config.in b/system/Config.in
index 4c80087f7d..6418d5272d 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -119,6 +119,7 @@ config BR2_INIT_SYSTEMD
 	select BR2_PACKAGE_SYSTEMD
 
 comment 'systemd needs udev /dev management and a toolchain w/ largefile, wchar, IPv6, threads'
+	depends on BR2_USE_MMU
 	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && \
 		     BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \
 		     BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV)

From 2873eae4df6b5d486f85afc97aedf3cadd1cc024 Mon Sep 17 00:00:00 2001
From: Laurent GONZALEZ <br2@gezedo.com>
Date: Wed, 6 Nov 2013 20:19:10 +0100
Subject: [PATCH 6667/6849] Avoid toolchain download when it is preinstalled

For configurations using a toolchain that is preinstalled on
the host, <pkg>_SITE and <pkg>_SOURCE variables must be kept
empty to avoid downloading any toolchain package.
The actual implementation has been proposed by Thomas Petazzoni.

Signed-off-by: GONZALEZ Laurent <br2@gezedo.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/toolchain-external.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 2722600511..e2e99538ab 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -348,6 +348,14 @@ TOOLCHAIN_EXTERNAL_SITE = $(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
 TOOLCHAIN_EXTERNAL_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))
 endif
 
+# In fact, we don't need to download the toolchain, since it is already
+# available on the system, so force the site and source to be empty so
+# that nothing will be downloaded/extracted.
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED),y)
+TOOLCHAIN_EXTERNAL_SITE =
+TOOLCHAIN_EXTERNAL_SOURCE =
+endif
+
 TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)

From e8ab39a7b5205e6a1a076fdda257a5baa32be765 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 11:41:21 +0100
Subject: [PATCH 6668/6849] infra: Add POST_RSYNC_HOOKS support

One of the use cases is for the 'local packages' to restore
the SCM info.  Some packages use this information to generate
version info during build time.  In this case, the local package
can have this hook to restore it by symbolic link for example.

[Thomas: update commit title]
Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-generic.txt | 1 +
 package/pkg-generic.mk                  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 59a2684745..d6c1e0b034 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -467,6 +467,7 @@ The following hook points are available:
 
 * +LIBFOO_POST_DOWNLOAD_HOOKS+
 * +LIBFOO_POST_EXTRACT_HOOKS+
+* +LIBFOO_POST_RSYNC_HOOKS+
 * +LIBFOO_PRE_PATCH_HOOKS+
 * +LIBFOO_POST_PATCH_HOOKS+
 * +LIBFOO_PRE_CONFIGURE_HOOKS+
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 4bba4b5803..f1835a1aa9 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -69,6 +69,7 @@ $(BUILD_DIR)/%/.stamp_rsynced:
 	@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
 	@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
 	rsync -au --cvs-exclude --include core $(SRCDIR)/ $(@D)
+	$(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 
 # Handle the SOURCE_CHECK and SHOW_EXTERNAL_DEPS cases for rsynced
@@ -339,6 +340,7 @@ $(2)_EXTRACT_CMDS ?= \
 # post-steps hooks
 $(2)_POST_DOWNLOAD_HOOKS        ?=
 $(2)_POST_EXTRACT_HOOKS         ?=
+$(2)_POST_RSYNC_HOOKS           ?=
 $(2)_PRE_PATCH_HOOKS            ?=
 $(2)_POST_PATCH_HOOKS           ?=
 $(2)_PRE_CONFIGURE_HOOKS        ?=

From 7ad286563e1883f2e17c0d67e055525e840c5420 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 11:41:22 +0100
Subject: [PATCH 6669/6849] infra: centralize rsync exclude list for VCS files

Buildroot has three places where rsync is used:
1. to copy the target skeleton
2. to copy the rootfs overlay(s)
3. to copy overridden package sources

In all of these cases, we want to exclude version control files by default.
Place 1 and 2 used an identical set of explicit --exclude options, while
place 3 used the option --cvs-exclude. This last option, however, not only
excludes version control files, but also binary files (.o, .so) and any file
or directory named 'core' (a problem for the linux kernel that has several
directories with this name). Moreover, the exact list of excluded files when
using --cvs-exclude depends on the version of rsync.

This patch creates one global variable RSYNC_VCS_EXCLUSIONS that can be used
by the various rsync commands. It excludes the version control files of
svn, git, hg, cvs and bzr.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Makefile               | 14 ++++++++------
 package/pkg-generic.mk |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a006615f76..2f7db599bf 100644
--- a/Makefile
+++ b/Makefile
@@ -426,11 +426,14 @@ ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
 TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
 endif
 
+RSYNC_VCS_EXCLUSIONS = \
+	--exclude .svn --exclude .git --exclude .hg --exclude .bzr \
+	--exclude CVS
+
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
-	rsync -a \
-		--exclude .empty --exclude .svn --exclude .git \
-		--exclude .hg --exclude=CVS --exclude '*~' \
+	rsync -a $(RSYNC_VCS_EXCLUSIONS) \
+		--exclude .empty --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	@ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)
@@ -504,9 +507,8 @@ endif
 
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
-		rsync -a \
-			--exclude .empty --exclude .svn --exclude .git \
-			--exclude .hg --exclude=CVS --exclude '*~' \
+		rsync -a $(RSYNC_VCS_EXCLUSIONS) \
+			--exclude .empty --exclude '*~' \
 			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index f1835a1aa9..80b38a5808 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -68,7 +68,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_rsynced:
 	@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
 	@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
-	rsync -au --cvs-exclude --include core $(SRCDIR)/ $(@D)
+	rsync -au $(RSYNC_VCS_EXCLUSIONS) $(SRCDIR)/ $(@D)
 	$(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep))
 	$(Q)touch $@
 

From 7ae2b8ef88fd526c3908ca4e764b79e0657b2632 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 11:41:23 +0100
Subject: [PATCH 6670/6849] manual: split info on hooks to a separate
 section/file

Split out the information on hooks to a separate section (and source file).
Not only because the hooks are useful for all infrastructures (and thus
don't really fit specifically in the generic infrastructure section), but
also for clarity when the info on hooks will be expanded in later patches.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-autotools.txt |  3 +-
 docs/manual/adding-packages-cmake.txt     |  3 +-
 docs/manual/adding-packages-generic.txt   | 40 +---------------------
 docs/manual/adding-packages-hooks.txt     | 41 +++++++++++++++++++++++
 docs/manual/adding-packages.txt           |  2 ++
 5 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 docs/manual/adding-packages-hooks.txt

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 9fb69d94d5..19ec2c15fb 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -162,8 +162,7 @@ well for most autotools-based packages. However, when required, it is
 still possible to customize what is done in any particular step:
 
 * By adding a post-operation hook (after extract, patch, configure,
-  build or install). See the reference documentation of the generic
-  infrastructure for details.
+  build or install). See xref:hooks[] for details.
 
 * By overriding one of the steps. For example, even if the autotools
   infrastructure is used, if the package +.mk+ file defines its
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index de4bd9881e..4373423d33 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -135,8 +135,7 @@ for most CMake-based packages. However, when required, it is still
 possible to customize what is done in any particular step:
 
 * By adding a post-operation hook (after extract, patch, configure,
-  build or install). See the reference documentation of the generic
-  infrastructure for details.
+  build or install). See xref:hooks[] for details.
 
 * By overriding one of the steps. For example, even if the CMake
   infrastructure is used, if the package +.mk+ file defines its own
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index d6c1e0b034..fb7a9e5a14 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -451,42 +451,4 @@ In the action definitions, you can use the following variables:
 * Of course the +$(HOST_DIR)+, +$(STAGING_DIR)+ and +$(TARGET_DIR)+
   variables to install the packages properly.
 
-The last feature of the generic infrastructure is the ability to add
-hooks. These define further actions to perform after existing steps.
-Most hooks aren't really useful for generic packages, since the +.mk+
-file already has full control over the actions performed in each step
-of the package construction. The hooks are more useful for packages
-using the autotools infrastructure described below.  However, since
-they are provided by the generic infrastructure, they are documented
-here. The exception is +LIBFOO_POST_PATCH_HOOKS+.  Patching the
-package and producing legal info are not user definable, so
-+LIBFOO_POST_PATCH_HOOKS+ and +LIBFOO_POST_LEGAL_INFO_HOOKS+ are
-useful for generic packages.
-
-The following hook points are available:
-
-* +LIBFOO_POST_DOWNLOAD_HOOKS+
-* +LIBFOO_POST_EXTRACT_HOOKS+
-* +LIBFOO_POST_RSYNC_HOOKS+
-* +LIBFOO_PRE_PATCH_HOOKS+
-* +LIBFOO_POST_PATCH_HOOKS+
-* +LIBFOO_PRE_CONFIGURE_HOOKS+
-* +LIBFOO_POST_CONFIGURE_HOOKS+
-* +LIBFOO_POST_BUILD_HOOKS+
-* +LIBFOO_POST_INSTALL_HOOKS+ (for host packages only)
-* +LIBFOO_POST_INSTALL_STAGING_HOOKS+ (for target packages only)
-* +LIBFOO_POST_INSTALL_TARGET_HOOKS+ (for target packages only)
-* +LIBFOO_POST_LEGAL_INFO_HOOKS+
-
-These variables are 'lists' of variable names containing actions to be
-performed at this hook point. This allows several hooks to be
-registered at a given hook point. Here is an example:
-
-----------------------
-define LIBFOO_POST_PATCH_FIXUP
-	action1
-	action2
-endef
-
-LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
-----------------------
+Finally, you can also use hooks. See xref:hooks[] for more information.
diff --git a/docs/manual/adding-packages-hooks.txt b/docs/manual/adding-packages-hooks.txt
new file mode 100644
index 0000000000..8ab3f5698d
--- /dev/null
+++ b/docs/manual/adding-packages-hooks.txt
@@ -0,0 +1,41 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+
+[[hooks]]
+Hooks available in the various build steps
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The generic infrastructure (and as a result also the derived autotools
+and cmake infrastructures) allow packages to specify hooks.
+These define further actions to perform after existing steps.
+Most hooks aren't really useful for generic packages, since the +.mk+
+file already has full control over the actions performed in each step
+of the package construction.
+
+The following hook points are available:
+
+* +LIBFOO_POST_DOWNLOAD_HOOKS+
+* +LIBFOO_POST_EXTRACT_HOOKS+
+* +LIBFOO_POST_RSYNC_HOOKS+
+* +LIBFOO_PRE_PATCH_HOOKS+
+* +LIBFOO_POST_PATCH_HOOKS+
+* +LIBFOO_PRE_CONFIGURE_HOOKS+
+* +LIBFOO_POST_CONFIGURE_HOOKS+
+* +LIBFOO_POST_BUILD_HOOKS+
+* +LIBFOO_POST_INSTALL_HOOKS+ (for host packages only)
+* +LIBFOO_POST_INSTALL_STAGING_HOOKS+ (for target packages only)
+* +LIBFOO_POST_INSTALL_TARGET_HOOKS+ (for target packages only)
+* +LIBFOO_POST_LEGAL_INFO_HOOKS+
+
+These variables are 'lists' of variable names containing actions to be
+performed at this hook point. This allows several hooks to be
+registered at a given hook point. Here is an example:
+
+----------------------
+define LIBFOO_POST_PATCH_FIXUP
+	action1
+	action2
+endef
+
+LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
+----------------------
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index 0123b32f8b..ae76e74e21 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -18,6 +18,8 @@ include::adding-packages-autotools.txt[]
 
 include::adding-packages-cmake.txt[]
 
+include::adding-packages-hooks.txt[]
+
 include::adding-packages-gettext.txt[]
 
 include::adding-packages-tips.txt[]

From fcdbeba035796c019348a7ac4ffdd32825ad4669 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 11:41:24 +0100
Subject: [PATCH 6671/6849] manual: add some info on the POST_RSYNC hook

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/adding-packages-hooks.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/manual/adding-packages-hooks.txt b/docs/manual/adding-packages-hooks.txt
index 8ab3f5698d..d96c991cb0 100644
--- a/docs/manual/adding-packages-hooks.txt
+++ b/docs/manual/adding-packages-hooks.txt
@@ -39,3 +39,23 @@ endef
 
 LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
 ----------------------
+
+Using the +POST_RSYNC+ hook
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The +POST_RSYNC+ hook is run only for packages that use a local source,
+either through the +local+ site method or the +OVERRIDE_SRCDIR+
+mechanism. In this case, package sources are copied using +rsync+ from
+the local location into the buildroot build directory. The +rsync+
+command does not copy all files from the source directory, though.
+Files belonging to a version control system, like the directories
++.git+, +.hg+, etc. are not copied. For most packages this is
+sufficient, but a given package can perform additional actions using
+the +POST_RSYNC+ hook.
+
+In principle, the hook can contain any command you want. One specific
+use case, though, is the intentional copying of the version control
+directory using +rsync+. The +rsync+ command you use in the hook can, among
+others, use the following variables:
+
+* +$(SRCDIR)+: the path to the overridden source directory
+* +$(@D)+: the path to the build directory

From 9e7e9b215017ee91c9369f01476bb4b4fc5f2484 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 17:26:52 +0100
Subject: [PATCH 6672/6849] infra: remove incorrect default for FOO_DIR_PREFIX

Variable FOO_DIR_PREFIX is populated from pkgparentdir by the various
package infrastructures. However, if that would be empty (which in fact is
the case for the linux package), FOO_DIR_PREFIX would be set to
'$(TOP_SRCDIR)/package'.
Not only does this make no sense (LINUX_DIR_PREFIX becomes /package/linux,
and for all other packages pkgparentdir is not-empty anyway), but it is also
using a non-existing variable TOP_SRCDIR.
This patch therefore removes the incorrect default.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 80b38a5808..3b6bc76512 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -314,7 +314,7 @@ $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO
 $(2)_INSTALL_TARGET		?= YES
-$(2)_DIR_PREFIX			= $(if $(4),$(4),$(TOP_SRCDIR)/package)
+$(2)_DIR_PREFIX			= $(4)
 
 # define sub-target stamps
 $(2)_TARGET_INSTALL_TARGET =	$$($(2)_DIR)/.stamp_target_installed

From b40341e14a770f4e0785a08338aa7cf1ade77e26 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 7 Nov 2013 17:26:53 +0100
Subject: [PATCH 6673/6849] infra: clean up 'Patching' message

The 'Patching' message in the generic infrastructure prints not only the
package name, but also a reference to the assumed package directory, based
on FOO_DIR_PREFIX/FOO_RAWNAME. This doesn't really add value, as the name
of the package is already apparent from the message and its location should
be obvious. Hence, this patch simply reduces the print to "Patching".

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pkg-generic.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 3b6bc76512..75fda02c3e 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -91,7 +91,7 @@ endif
 $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
 $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME)
 $(BUILD_DIR)/%/.stamp_patched:
-	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
+	@$(call MESSAGE,"Patching")
 	$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
 	$(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))
 	$(Q)( \

From 620d85b3107df4e09bf7bbb4018a5ec00b98bcff Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Nov 2013 00:08:01 +0100
Subject: [PATCH 6674/6849] toolchain-external: fix the SYSROOT_DIR mangling
 logic

In a1d94aaa3a21911 ('toolchain-external: add support for musl C
library'), we made the following change to the SYSROOT_DIR mangling
logic:

-       SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
+       SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/(.*/)?libc\.a::'` ; \

This was needed to accomodate for musl based toolchains that don't
have libc.a in usr/lib/..., but directory in lib/... Basically, the
change makes the usr/ at the beginning optional.

However, with the very permissive (.*) matching in the middle of the
path, the change above had an unexpected consequence: any path contain
'/lib' would be truncated before this lib. As an example, Peter
reported that his builds, running from /var/lib/buildbot/ were no
longer working because the SYSROOT_DIR was decided to be /var instead
of something like
/var/lib/buildbot/buildroot/output/host/opt/ext-toolchain/arm-linux-gnueabihf/libc/.

So, this commit changes (again!) this regexp by changing (.*) to
([^/]*), the idea being that it will match only *one* path
component. Note that this intermediate (.*) directory was added in
e6e60becb008 ('external-toolchain: add support for Linaro 2012.01') to
accomodate for Linaro toolchains that have a subdirectory in their
sysroot named after the target tuple:

$ ./output/host/opt/ext-toolchain/bin/arm-linux-gnueabihf-gcc -print-file-name=libc.a
/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../arm-linux-gnueabihf/libc/usr/lib/arm-linux-gnueabihf/libc.a

In addition to this, this commit also makes sure that the change
making usr/ optional is properly reported on all the instances of this
regular expression.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/toolchain-external.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index e2e99538ab..2351c9bc95 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -389,7 +389,7 @@ define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)$(call check_unusable_toolchain,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/(.*/)?libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
@@ -471,14 +471,14 @@ endif
 
 define TOOLCHAIN_EXTERNAL_INSTALL_CORE
 	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
+	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
-	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(32|64)?)/(.*/)?libc.a:\1:'` ; \
+	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
+	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:'` ; \
 	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
 		LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
@@ -524,8 +524,8 @@ define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FDPIC
 	$(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
 	FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
 	FDPIC_LIBC_A_LOCATION=`readlink -f $$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(32|64)?/(.*/)?libc\.a::'` ; \
-	FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(32|64)?)/(.*/)?libc.a:\1:'` ; \
+	FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
+	FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:'` ; \
 	FDPIC_SUPPORT_LIB_DIR="" ; \
 	if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
 	        FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \

From b07c2affc9d15ca9083615930dbbea0ec80166ed Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Nov 2013 00:08:02 +0100
Subject: [PATCH 6675/6849] toolchain-external: update comments

[Peter: drop extra # as pointed out by Baruch Siach]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../toolchain-external/toolchain-external.mk  | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 2351c9bc95..1732070a10 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -13,14 +13,21 @@
 #
 #  * Toolchains generated by Crosstool-NG
 #  * Toolchains generated by Buildroot
-#  * ARM, MIPS and PowerPC toolchains made available by
-#    Codesourcery. For the MIPS toolchain, the -muclibc variant isn't
-#    supported yet, only the default glibc-based variant is.
+#  * Toolchains provided by Linaro for the ARM and AArch64
+#    architectures
+#  * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM,
+#    MIPS, PowerPC, x86, x86_64 and NIOS 2 architectures. For the MIPS
+#    toolchain, the -muclibc variant isn't supported yet, only the
+#    default glibc-based variant is.
+#  * Analog Devices toolchains for the Blackfin architecture
+#  * Xilinx toolchains for the Microblaze architecture
 #
 # The basic principle is the following
 #
 #  1. If the toolchain is not pre-installed, download and extract it
-#  in $(TOOLCHAIN_EXTERNAL_INSTALL_DIR).
+#  in $(TOOLCHAIN_EXTERNAL_INSTALL_DIR). Otherwise,
+#  $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) points to were the toolchain has
+#  already been installed by the user.
 #
 #  2. For all external toolchains, perform some checks on the
 #  conformity between the toolchain configuration described in the
@@ -85,22 +92,21 @@ LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
 
 # Details about sysroot directory selection.
 #
-# To find the sysroot directory:
+# To find the sysroot directory, we use the trick of looking for the
+# 'libc.a' file with the -print-file-name gcc option, and then
+# mangling the path to find the base directory of the sysroot.
 #
-#  * We first try the -print-sysroot option, available in gcc 4.4.x
-#    and in some Codesourcery toolchains.
+# Note that we do not use the -print-sysroot option, because it is
+# only available since gcc 4.4.x, and we still support 4.2.x (for
+# AVR32) and 4.3.x.
 #
-#  * If this option is not available, we fallback to the value of
-#    --with-sysroot as visible in CROSS-gcc -v.
-#
-# When doing those tests, we don't pass any option to gcc that could
-# select a multilib variant (such as -march) as we want the "main"
-# sysroot, which contains all variants of the C library in the case of
-# multilib toolchains. We use the TARGET_CC_NO_SYSROOT variable, which
-# is the path of the cross-compiler, without the
-# --sysroot=$(STAGING_DIR), since what we want to find is the location
-# of the original toolchain sysroot. This "main" sysroot directory is
-# stored in SYSROOT_DIR.
+# When doing this, we don't pass any option to gcc that could select a
+# multilib variant (such as -march) as we want the "main" sysroot,
+# which contains all variants of the C library in the case of multilib
+# toolchains. We use the TARGET_CC_NO_SYSROOT variable, which is the
+# path of the cross-compiler, without the --sysroot=$(STAGING_DIR),
+# since what we want to find is the location of the original toolchain
+# sysroot. This "main" sysroot directory is stored in SYSROOT_DIR.
 #
 # Then, multilib toolchains are a little bit more complicated, since
 # they in fact have multiple sysroots, one for each variant supported

From 646bd86908f7f995cdc2b95e0be381d97600f905 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 7 Nov 2013 00:08:03 +0100
Subject: [PATCH 6676/6849] toolchain-external: factorize regular expressions

Based on a suggestion from Peter, this commit factorizes the logic and
regular expressions that are used to find the sysroot and libdir for a
given compiler. It reduces a bit the duplication of code, and
centralizes the most bizarre part of this logic in one place.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../toolchain-external/toolchain-external.mk  | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 1732070a10..bd4f37575d 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -387,6 +387,22 @@ define TOOLCHAIN_EXTERNAL_EXTRACT_CMDS
 endef
 endif
 
+# Returns the location of the libc.a file for the given compiler + flags
+define toolchain_find_libc_a
+$$(readlink -f $$(LANG=C $(1) -print-file-name=libc.a))
+endef
+
+# Returns the sysroot location for the given compiler + flags
+define toolchain_find_sysroot
+$$(echo -n $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::')
+endef
+
+# Returns the lib subdirectory for the given compiler + flags (i.e
+# typically lib32 or lib64 for some toolchains)
+define toolchain_find_libdir
+$$(echo -n $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:')
+endef
+
 # Checks for an already installed toolchain: check the toolchain
 # location, check that it supports sysroot, and then verify that it
 # matches the configuration provided in Buildroot: ABI, C++ support,
@@ -394,8 +410,7 @@ endif
 define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)$(call check_unusable_toolchain,$(TOOLCHAIN_EXTERNAL_CC))
-	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
+	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
@@ -476,15 +491,13 @@ endif
 #                       to the target filesystem.
 
 define TOOLCHAIN_EXTERNAL_INSTALL_CORE
-	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
-	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
+	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
-	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
-	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:'` ; \
+	ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+	ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
 	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
 		LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
@@ -529,9 +542,8 @@ ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y)
 define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FDPIC
 	$(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
 	FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
-	FDPIC_LIBC_A_LOCATION=`readlink -f $$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
-	FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::'` ; \
-	FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:'` ; \
+	FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+	FDPIC_LIB_DIR="$(call toolchain_find_libdir,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
 	FDPIC_SUPPORT_LIB_DIR="" ; \
 	if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
 	        FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \

From 75b6303a9a5bf1b7e62b69bb8ddc7e138ef9775f Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:29 +0100
Subject: [PATCH 6677/6849] rootfs-ext2: make the symlink as a _POST_TARGET

This will allow us to remove the unused ROOTFS_$(FSTYPE)_POST_GEN_HOOKS.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/common.mk    | 2 +-
 fs/ext2/ext2.mk | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index 4dab7ea28b..01d2c00bbe 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -17,7 +17,7 @@
 #  generating the filesystem image
 #
 #  ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
-#  generating the filesystem image
+#  generating and compressing the filesystem image
 #
 #  ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
 #  run after running the main filesystem target. This is useful for
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index cad5b42d6e..b4280aa5a6 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -27,11 +27,11 @@ define ROOTFS_EXT2_CMD
 	PATH=$(TARGET_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
-define ROOTFS_EXT2_HOOK_SYMLINK
+rootfs-ext2-symlink:
 	ln -sf rootfs.ext2 $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)
-endef
+
 ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2)
-ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_HOOK_SYMLINK
+ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink
 endif
 
 $(eval $(call ROOTFS_TARGET,ext2))

From 053d678a6c8667b2dd8f4e1940a34cba31f338d3 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:30 +0100
Subject: [PATCH 6678/6849] rootfs-common: remove the now unused
 ROOTFS_<PKG>_POST_GEN_HOOKS

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/common.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index 01d2c00bbe..f22fb61e0a 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -16,9 +16,6 @@
 #  ROOTFS_$(FSTYPE)_PRE_GEN_HOOKS, a list of hooks to call before
 #  generating the filesystem image
 #
-#  ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
-#  generating and compressing the filesystem image
-#
 #  ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
 #  run after running the main filesystem target. This is useful for
 #  initramfs, to rebuild the kernel once the initramfs is generated.
@@ -63,7 +60,6 @@ endif
 	$$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
 	cp support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
 	-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
-	$$(foreach hook,$$(ROOTFS_$(2)_POST_GEN_HOOKS),$$(call $$(hook))$$(sep))
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
 	gzip -9 -c $$@ > $$@.gz
 endif

From fb7ad1c44ea62e7b7ac0111dc728078eba6b6fc4 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:31 +0100
Subject: [PATCH 6679/6849] rootfs-cpio: whitespace cleanup in Config.in

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/cpio/Config.in | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in
index 87dde6414d..fd85d29deb 100644
--- a/fs/cpio/Config.in
+++ b/fs/cpio/Config.in
@@ -6,34 +6,34 @@ config BR2_TARGET_ROOTFS_CPIO
 	  by the bootloader.
 
 choice
-        prompt "Compression method"
-        default BR2_TARGET_ROOTFS_CPIO_NONE
-        depends on BR2_TARGET_ROOTFS_CPIO
-        help
-          Select compressor for cpio filesystem of the root filesystem.
-          If you use the cpio archive as an initial RAM filesystem, make
-          sure the kernel contains the decompression algorithm selected
-          here.
+	prompt "Compression method"
+	default BR2_TARGET_ROOTFS_CPIO_NONE
+	depends on BR2_TARGET_ROOTFS_CPIO
+	help
+	  Select compressor for cpio filesystem of the root filesystem.
+	  If you use the cpio archive as an initial RAM filesystem, make
+	  sure the kernel contains the decompression algorithm selected
+	  here.
 
 config BR2_TARGET_ROOTFS_CPIO_NONE
-        bool "no compression"
-        help
-          Do not compress the cpio filesystem.
+	bool "no compression"
+	help
+	  Do not compress the cpio filesystem.
 
 config BR2_TARGET_ROOTFS_CPIO_GZIP
-        bool "gzip"
-        help
-          Do compress the cpio filesystem with gzip.
+	bool "gzip"
+	help
+	  Do compress the cpio filesystem with gzip.
 
 config BR2_TARGET_ROOTFS_CPIO_BZIP2
-        bool "bzip2"
-        help
-          Do compress the cpio filesystem with bzip2.
+	bool "bzip2"
+	help
+	  Do compress the cpio filesystem with bzip2.
 
 config BR2_TARGET_ROOTFS_CPIO_LZMA
-        bool "lzma"
-        help
-          Do compress the cpio filesystem with lzma.
+	bool "lzma"
+	help
+	  Do compress the cpio filesystem with lzma.
 
 config BR2_TARGET_ROOTFS_CPIO_LZO
 	bool "lzo"

From bd8ef7a01c0db004334cd48ce798e6aab5bd34df Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:32 +0100
Subject: [PATCH 6680/6849] rootfs-common: refactor the common compression
 commands

This makes the compression extension available in a variable, so it
can be used by the fs-specific commands. In this patch, it is used
by iso9660. Following patches show more use cases.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/common.mk          | 42 +++++++++++++++++++++++++++---------------
 fs/iso9660/iso9660.mk |  6 +-----
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index f22fb61e0a..aa9d961964 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -37,7 +37,31 @@ USERS_TABLE = $(BUILD_DIR)/_users_table.txt
 define ROOTFS_TARGET_INTERNAL
 
 # extra deps
-ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma) $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZO),host-lzop) $$(if $$(BR2_TARGET_ROOTFS_$(2)_XZ),host-xz)
+ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs
+
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
+ROOTFS_$(2)_COMPRESS_EXT = .gz
+ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
+ROOTFS_$(2)_COMPRESS_EXT = .bz2
+ROOTFS_$(2)_COMPRESS_CMD = bzip2 -9 -c
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
+ROOTFS_$(2)_DEPENDENCIES += host-lzma
+ROOTFS_$(2)_COMPRESS_EXT = .lzma
+ROOTFS_$(2)_COMPRESS_CMD = $$(LZMA) -9 -c
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZO),y)
+ROOTFS_$(2)_DEPENDENCIES += host-lzop
+ROOTFS_$(2)_COMPRESS_EXT = .lzo
+ROOTFS_$(2)_COMPRESS_CMD = $$(LZOP) -9 -c
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y)
+ROOTFS_$(2)_DEPENDENCIES += host-xz
+ROOTFS_$(2)_COMPRESS_EXT = .xz
+ROOTFS_$(2)_COMPRESS_CMD = $$(XZ) -9 -C crc32 -c
+endif
 
 $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
 	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
@@ -60,20 +84,8 @@ endif
 	$$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
 	cp support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
 	-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
-ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
-	gzip -9 -c $$@ > $$@.gz
-endif
-ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
-	bzip2 -9 -c $$@ > $$@.bz2
-endif
-ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
-	$$(LZMA) -9 -c $$@ > $$@.lzma
-endif
-ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZO),y)
-	$$(LZOP) -9 -c $$@ > $$@.lzo
-endif
-ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y)
-	$(XZ) -9 -C crc32 -c $$@ > $$@.xz
+ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
+	$$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)
 endif
 
 rootfs-$(1)-show-depends:
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 317314a2c1..979a0b2fe7 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -10,10 +10,6 @@
 ISO9660_TARGET_DIR = $(BUILD_DIR)/iso9660
 ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
 
-ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_GZIP)  = .gz
-ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_BZIP2) = .bz2
-ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_LZMA)  = .lzma
-
 $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
 	mkdir -p $(ISO9660_TARGET_DIR)
@@ -21,7 +17,7 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
 	cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
 	cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
 	cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
-	cp $(BINARIES_DIR)/rootfs.cpio$(ISO9660_CPIO_EXT-y) $(ISO9660_TARGET_DIR)/initrd
+	cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)

From 4df9ecb30ae64aab0e65f0dbbb2b60749c536db3 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:33 +0100
Subject: [PATCH 6681/6849] rootfs-ext2: symlink with the compressed rootfs

Previously, a symlink was created to the uncompressed filesystem,
which made it a bit useless in case compression was chosen.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/ext2/ext2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index b4280aa5a6..0af955fb6a 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -28,7 +28,7 @@ define ROOTFS_EXT2_CMD
 endef
 
 rootfs-ext2-symlink:
-	ln -sf rootfs.ext2 $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)
+	ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT)
 
 ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2)
 ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink

From 3970ebf837aa7ac52528d3afc8c1701015a024b0 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:34 +0100
Subject: [PATCH 6682/6849] rootfs-cpio: add U-Boot image support

Adds U-Boot image support for cpio root filesystems. This allows you to
use the bootm command in U-Boot to load the rootfs. It makes it possible to
verify the CRC of the initramfs before booting the kernel.

[Spenser: wrote first version of the patch.]
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/cpio/Config.in | 13 ++++++++++++-
 fs/cpio/cpio.mk   | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in
index fd85d29deb..206baca677 100644
--- a/fs/cpio/Config.in
+++ b/fs/cpio/Config.in
@@ -5,10 +5,11 @@ config BR2_TARGET_ROOTFS_CPIO
 	  used for an initial RAM filesystem that is passed to the kernel
 	  by the bootloader.
 
+if BR2_TARGET_ROOTFS_CPIO
+
 choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_CPIO_NONE
-	depends on BR2_TARGET_ROOTFS_CPIO
 	help
 	  Select compressor for cpio filesystem of the root filesystem.
 	  If you use the cpio archive as an initial RAM filesystem, make
@@ -47,3 +48,13 @@ config BR2_TARGET_ROOTFS_CPIO_XZ
 
 endchoice
 
+config BR2_TARGET_ROOTFS_CPIO_UIMAGE
+	bool "Create U-Boot image of the root filesystem"
+	select BR2_PACKAGE_HOST_UBOOT_TOOLS
+	help
+	  Add a U-Boot header to the cpio root filesystem. This allows
+	  the initramfs to be loaded with the bootm command in U-Boot.
+
+	  The U-Boot image will be called rootfs.cpio.uboot
+
+endif # BR2_TARGET_ROOTFS_CPIO
diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index 0df23785bf..e39e215553 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -31,4 +31,25 @@ define ROOTFS_CPIO_CMD
 	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
 endef
 
+# mkimage supports arm avr32 blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
+# KERNEL_ARCH can be arm64 arc arm avr32 blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
+# For arm64, arc, xtensa we'll just keep KERNEL_ARCH
+# For mips64, we'll just keep mips
+# For i386 and x86_64, we need to convert
+ifeq ($(KERNEL_ARCH),x86_64)
+UIMAGE_ARCH = x86
+else ifeq ($(KERNEL_ARCH),i386)
+UIMAGE_ARCH = x86
+else
+UIMAGE_ARCH = $(KERNEL_ARCH)
+endif
+
+$(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools
+	$(HOST_DIR)/usr/bin/mkimage -A $(UIMAGE_ARCH) -T ramdisk \
+		-C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@
+
+ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
+ROOTFS_CPIO_POST_TARGETS += $(BINARIES_DIR)/rootfs.cpio.uboot
+endif
+
 $(eval $(call ROOTFS_TARGET,cpio))

From 13ae0075a94895c1b021d20905867ee5f354bd49 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 7 Nov 2013 00:12:35 +0100
Subject: [PATCH 6683/6849] uboot-tools: factor out common mkimage
 infrastructure

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 fs/cpio/cpio.mk                    | 15 +--------------
 linux/linux.mk                     |  4 ++--
 package/uboot-tools/uboot-tools.mk | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index e39e215553..771306ced9 100644
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -31,21 +31,8 @@ define ROOTFS_CPIO_CMD
 	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
 endef
 
-# mkimage supports arm avr32 blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
-# KERNEL_ARCH can be arm64 arc arm avr32 blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
-# For arm64, arc, xtensa we'll just keep KERNEL_ARCH
-# For mips64, we'll just keep mips
-# For i386 and x86_64, we need to convert
-ifeq ($(KERNEL_ARCH),x86_64)
-UIMAGE_ARCH = x86
-else ifeq ($(KERNEL_ARCH),i386)
-UIMAGE_ARCH = x86
-else
-UIMAGE_ARCH = $(KERNEL_ARCH)
-endif
-
 $(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools
-	$(HOST_DIR)/usr/bin/mkimage -A $(UIMAGE_ARCH) -T ramdisk \
+	$(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
 		-C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@
 
 ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
diff --git a/linux/linux.mk b/linux/linux.mk
index 29a3fd3ac0..33931e53fc 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -228,9 +228,9 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
 # of the image. To do so, we first need to retrieve both load
 # address and entry point for the kernel from the already
 # generate uboot image before using mkimage -l.
-LINUX_APPEND_DTB += $(sep) MKIMAGE_ARGS=`$(HOST_DIR)/usr/bin/mkimage -l $(LINUX_IMAGE_PATH) |\
+LINUX_APPEND_DTB += $(sep) MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\
         sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
-        $(HOST_DIR)/usr/bin/mkimage -A $(KERNEL_ARCH) -O linux \
+        $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \
         -T kernel -C none $${MKIMAGE_ARGS} \
         -d $(KERNEL_ARCH_PATH)/boot/zImage $(LINUX_IMAGE_PATH);
 endif
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 73e1d327d4..5c77887c8f 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -64,3 +64,20 @@ endef
 
 $(eval $(generic-package))
 $(eval $(host-generic-package))
+
+# Convenience variables for other mk files that make use of mkimage
+
+MKIMAGE = $(HOST_DIR)/usr/bin/mkimage
+
+# mkimage supports arm avr32 blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
+# KERNEL_ARCH can be arm64 arc arm avr32 blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
+# For arm64, arc, xtensa we'll just keep KERNEL_ARCH
+# For mips64, we'll just keep mips
+# For i386 and x86_64, we need to convert
+ifeq ($(KERNEL_ARCH),x86_64)
+MKIMAGE_ARCH = x86
+else ifeq ($(KERNEL_ARCH),i386)
+MKIMAGE_ARCH = x86
+else
+MKIMAGE_ARCH = $(KERNEL_ARCH)
+endif

From a0353409933429058e04adf8f5d3f34d33c5697c Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 3 Nov 2013 09:56:25 +0000
Subject: [PATCH 6684/6849] util-linux: disable fallocate for avr32

The fallocate syscall is not implemented in the avr32 toolchain.

Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/bc4/bc41a3fea20181526eb247ac910244aa2aa4c4c0/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/util-linux/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 41e0986eee..d56e631036 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -72,6 +72,7 @@ config BR2_PACKAGE_UTIL_LINUX_EJECT
 
 config BR2_PACKAGE_UTIL_LINUX_FALLOCATE
 	bool "fallocate"
+	depends on !BR2_avr32 # fallocate not implemented
 	help
 	  Preallocate space to a file
 

From 42cd7395b01644de43a49078b4d4be49907767a5 Mon Sep 17 00:00:00 2001
From: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Date: Tue, 29 Oct 2013 10:21:10 +0100
Subject: [PATCH 6685/6849] imagemagick: bump to version 6.8.7-3

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/imagemagick/imagemagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 4b58148924..a31e79964e 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 IMAGEMAGICK_MAJOR = 6.8.7
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-1
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-3
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 # The official ImageMagick site only keeps the latest versions
 # available, which is annoying. Use an alternate site that keeps all

From 26baab06ad46ec51aa6e965fc6a0af5d2ddaabe1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Oct 2013 15:09:09 -0300
Subject: [PATCH 6686/6849] ipset: bump to version 6.20.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ipset/ipset-01-uclinux.patch | 26 --------------------------
 package/ipset/ipset.mk               |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 package/ipset/ipset-01-uclinux.patch

diff --git a/package/ipset/ipset-01-uclinux.patch b/package/ipset/ipset-01-uclinux.patch
deleted file mode 100644
index db8e3fec98..0000000000
--- a/package/ipset/ipset-01-uclinux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8ec2a85a29817f5aa3f6fb680753d331e2af3591 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 10 Sep 2013 15:28:49 -0300
-Subject: [PATCH] configure: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6b64576..6d06ef5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,7 @@ LTDL_INIT([nonrecursive])
- 
- dnl Shortcut: Linux supported alone
- case "$host" in
--*-*-linux*) ;;
-+*-*-linux* | *-*-uclinux*) ;;
- *) AC_MSG_ERROR([Linux systems supported exclusively!]);;
- esac
- 
--- 
-1.8.1.5
-
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index d55d81d6f1..b075a53e4f 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPSET_VERSION = 6.19
+IPSET_VERSION = 6.20.1
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf

From b835171cf9db23095c669b872dbaa15fc1e99898 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 30 Oct 2013 15:09:10 -0300
Subject: [PATCH 6687/6849] iptables: add support for connlabel match and
 nfnl_osf

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/iptables/iptables.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 13ad0ca855..65470691a0 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -16,6 +16,16 @@ IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr
 # Because of iptables-01-fix-static-link.patch
 IPTABLES_AUTORECONF = YES
 
+# For connlabel match
+ifeq ($(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),y)
+IPTABLES_DEPENDENCIES += libnetfilter_conntrack
+endif
+
+# For nfnl_osf
+ifeq ($(BR2_PACKAGE_LIBNFNETLINK),y)
+IPTABLES_DEPENDENCIES += libnfnetlink
+endif
+
 define IPTABLES_TARGET_SYMLINK_CREATE
 	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables
 	ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-save

From 2b0d870ce57dc92373788fb8cf7dd1add621c6eb Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Thu, 31 Oct 2013 08:30:49 +0200
Subject: [PATCH 6688/6849] hplip: bump to version 3.13.10

Sections of the hplip-fix-make.patch patch file were removed, because they
no longer appear in the Makefile.am file.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/hplip/hplip-fix-make.patch | 39 ------------------------------
 package/hplip/hplip.mk             |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
index b26277dd2f..da05d03fd3 100644
--- a/package/hplip/hplip-fix-make.patch
+++ b/package/hplip/hplip-fix-make.patch
@@ -30,45 +30,6 @@ index 16ea902..b22f46a 100644
  endif
  
  # ui (qt3)
-@@ -564,26 +564,26 @@ endif
- 
- install-dist_hplip_LogDATA:
- if FULL_BUILD
--	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 775 $(DESTDIR)$(hplip_Logdir)
-+#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#	chmod 775 $(DESTDIR)$(hplip_Logdir)
- endif	#FULL_BUILD
- if HPLIP_BUILD
--	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 775 $(DESTDIR)$(hplip_Logdir)
-+#	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#	chmod 775 $(DESTDIR)$(hplip_Logdir)
- endif	#FULL_BUILD
- 
- install-dist_hplip_tmpDATA:
- if FULL_BUILD
--	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
--	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
-+#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-+#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- if HPLIP_BUILD
--	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
--	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
--	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
-+#	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-+#	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-+#	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
- endif	#FULL_BUILD
- 
- install-dist_cronDATA:$(dist_cron_DATA)
 -- 
 1.7.10.4
 
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index b3b798d88c..704bc4b187 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HPLIP_VERSION = 3.13.3
+HPLIP_VERSION = 3.13.10
 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
 HPLIP_AUTORECONF = YES
 HPLIP_DEPENDENCIES = cups libusb jpeg

From 8639afc6f097337241d1ebb88bd7ae0b97606372 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 31 Oct 2013 14:29:05 +0100
Subject: [PATCH 6689/6849] libmodbus: bump version and change download
 location

The license of libmodbus is LGPL v2.1 or later and the
licence of programs in tests directory is GPL v3. So
specify only LGPL v2.1.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libmodbus/libmodbus.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index 8f93c2bcd3..8aa3cd74fe 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -4,8 +4,10 @@
 #
 ################################################################################
 
-LIBMODBUS_VERSION = 3.0.3
-LIBMODBUS_SITE = http://github.com/downloads/stephane/libmodbus
+LIBMODBUS_VERSION = 3.0.5
+LIBMODBUS_SITE = http://libmodbus.org/site_media/build/
+LIBMODBUS_LICENSE = LGPLv2.1+
+LIBMODBUS_LICENSE_FILES = COPYING.LESSER
 LIBMODBUS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))

From 3d6aec1fa6e7abf5a6037905bcae99e8b2b61ee6 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Thu, 31 Oct 2013 18:20:26 +0100
Subject: [PATCH 6690/6849] openpowerlink: bump to version 1.8.4

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...inux-Powerlink-user-lib-add-INSTALL.patch} |  0
 .../openpowerlink-0001-fix-demo-mn-qt.patch   | 22 ------
 ...ix-compilation-issue-for-kernels-3.5.patch | 78 -------------------
 package/openpowerlink/openpowerlink.mk        |  4 +-
 4 files changed, 2 insertions(+), 102 deletions(-)
 rename package/openpowerlink/{openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch => openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch} (100%)
 delete mode 100644 package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch
 delete mode 100644 package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch

diff --git a/package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch b/package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch
similarity index 100%
rename from package/openpowerlink/openpowerlink-0003-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch
rename to package/openpowerlink/openpowerlink-0001-Fix-Linux-Powerlink-user-lib-add-INSTALL.patch
diff --git a/package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch b/package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch
deleted file mode 100644
index c573662a24..0000000000
--- a/package/openpowerlink/openpowerlink-0001-fix-demo-mn-qt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 8658075bd7c49a7481e8f6d0d7a13b0651e1dfd7
-Author: Romain Naour <romain.naour@openwide.fr>
-Date:   Wed Sep 18 23:33:04 2013 +0200
-
-    [FIX] demo_mn_qt: add EplDebug.c in demo_sources list
-
-    demo_mn_qt use EplGetEmergErrCodeStr()
-
-    Signed-off-by: Romain Naour <romain.naour@openwide.fr>
-
-diff --git a/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt b/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt
-index 9db2f7f..48ae9eb 100644
---- a/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt
-+++ b/Examples/X86/Generic/demo_mn_qt/CMakeLists.txt
-@@ -78,6 +78,7 @@ SET(DEMO_SOURCES src/EplApi.cpp
-                  src/MainWindow.cpp
-                  src/NodeState.cpp
-                  ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/EplApiProcessImageSetup.c
-+                 ${POWERLINK_SOURCE_DIR}/EplStack/EplDebug.c
-     )
-
- # The TRACE macros need trace.c on the Windows platform
diff --git a/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch b/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch
deleted file mode 100644
index 064a6f0b34..0000000000
--- a/package/openpowerlink/openpowerlink-0002-Fix-compilation-issue-for-kernels-3.5.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 9990e19bc554d11c4123986692c5e0572682467a Mon Sep 17 00:00:00 2001
-From: Josef Baumgartner <josef.baumgartner@br-automation.com>
-Date: Wed, 14 Aug 2013 10:22:21 +0200
-Subject: [PATCH 1/1] [FIX] Fix compilation issue for kernels > 3.5
-
-With kernel version 3.5 the interface of kmap_atomic() and
-kunmap_atomic is changed. The fix adapts to the new interface.
-
-Change-Id: I0885b87dc594bf48d1ff4eaeaf188268ceb3b112
-Reviewed-on: http://brateggevoat1/gerrit/1261
-Tested-by: Jenkins <jenkins@brateggevoat1.br-automation.co.at>
-Reviewed-by: Josef Baumgartner <josef.baumgartner@br-automation.com>
----
- EplStack/EplApiProcessImage.c | 24 +++++++++++++++++++-----
- 1 file changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/EplStack/EplApiProcessImage.c b/EplStack/EplApiProcessImage.c
-index a1a049f..02907bc 100644
---- a/EplStack/EplApiProcessImage.c
-+++ b/EplStack/EplApiProcessImage.c
-@@ -573,7 +573,7 @@ tEplApiProcessImageCopyJobInt   IntCopyJob;
- #elif (TARGET_SYSTEM == _WIN32_)
-     if (EplApiProcessImageInstance_g.m_dwCurrentThreadId == GetCurrentThreadId())
- #elif (TARGET_SYSTEM == _VXWORKS_)
--    if (EplApiProcessImageInstance_g.m_currentThreadId == taskIdSelf())    	
-+    if (EplApiProcessImageInstance_g.m_currentThreadId == taskIdSelf())
- #else
- #error "OS currently not supported by EplApiProcessImage!"
- #endif
-@@ -1018,13 +1018,20 @@ void*           pVirtUserPart;
-             }
-
-             ulSize = min ((PAGE_SIZE - ulOffset), pPart->m_uiSize - ulLength);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
-             pVirtUserPart = kmap_atomic(ppPage[nIndex], KM_USER0);
-+#else
-+            pVirtUserPart = kmap_atomic(ppPage[nIndex]);
-+#endif
-
-             EPL_MEMCPY(pPIVar,
-                 pVirtUserPart + ulOffset,
-                 ulSize);
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
-             kunmap_atomic(pVirtUserPart, KM_USER0);
-+#else
-+            kunmap_atomic(pVirtUserPart);
-+#endif
-
-             pPIVar += ulSize;
-             ulLength += ulSize;
-@@ -1063,14 +1070,21 @@ void*           pVirtUserPart;
-             }
-
-             ulSize = min ((PAGE_SIZE - ulOffset), pPart->m_uiSize - ulLength);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
-             pVirtUserPart = kmap_atomic(ppPage[nIndex], KM_USER0);
-+#else
-+            pVirtUserPart = kmap_atomic(ppPage[nIndex]);
-+#endif
-
-             EPL_MEMCPY(pVirtUserPart + ulOffset,
-                 pPIVar,
-                 ulSize);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
-             kunmap_atomic(pVirtUserPart, KM_USER0);
--
-+#else
-+            kunmap_atomic(pVirtUserPart);
-+#endif
-             pPIVar += ulSize;
-             ulLength += ulSize;
-             ulOffset = 0;
-
---
-1.8.4
-
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
index 5babdd65d0..3a60478a0d 100644
--- a/package/openpowerlink/openpowerlink.mk
+++ b/package/openpowerlink/openpowerlink.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-OPENPOWERLINK_VERSION = V1.08.3
+OPENPOWERLINK_VERSION = V1.08.4
 OPENPOWERLINK_SOURCE = openPOWERLINK-$(OPENPOWERLINK_VERSION).zip
-OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V1.8.3
+OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V1.8.4
 
 OPENPOWERLINK_LICENSE = BSD-2c, GPLv2
 OPENPOWERLINK_LICENSE_FILES = license.txt

From f71e73f876e009035f3f8344957bf45b8eb08a0b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 2 Nov 2013 08:49:54 -0300
Subject: [PATCH 6691/6849] p910nd: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in        |  1 +
 package/p910nd/Config.in |  9 +++++++++
 package/p910nd/p910nd.mk | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 package/p910nd/Config.in
 create mode 100644 package/p910nd/p910nd.mk

diff --git a/package/Config.in b/package/Config.in
index c0a3f20270..d0db7d6d46 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -852,6 +852,7 @@ source "package/openobex/Config.in"
 source "package/openssh/Config.in"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
+source "package/p910nd/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
 source "package/pptp-linux/Config.in"
diff --git a/package/p910nd/Config.in b/package/p910nd/Config.in
new file mode 100644
index 0000000000..33f6cf8a5d
--- /dev/null
+++ b/package/p910nd/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_P910ND
+	bool "p910nd"
+	depends on BR2_USE_MMU # fork()
+	help
+	  p910nd is a small printer daemon intended for diskless
+	  workstations. Using ports 9100-9102, it accepts
+	  print jobs and passes them directly to a USB printer.
+
+	  http://p910nd.sourceforge.net/
diff --git a/package/p910nd/p910nd.mk b/package/p910nd/p910nd.mk
new file mode 100644
index 0000000000..48bb7e173b
--- /dev/null
+++ b/package/p910nd/p910nd.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# p910nd
+#
+################################################################################
+
+P910ND_VERSION = 0.95
+P910ND_SITE = http://downloads.sourceforge.net/project/p910nd/p910nd/$(P910ND_VERSION)
+P910ND_SOURCE = p910nd-$(P910ND_VERSION).tar.bz2
+P910ND_LICENSE = GPLv2
+P910ND_LICENSE_FILES = COPYING
+
+define P910ND_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define P910ND_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/p910nd $(TARGET_DIR)/usr/sbin/p910nd
+endef
+
+$(eval $(generic-package))

From 0c6fff0e468e700e81f366bced8374741622eee0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 11 Nov 2013 01:09:14 +0100
Subject: [PATCH 6692/6849] package/rpi-firmware: bump version

Bump bootloader and GPU firmware for misc fixes:
  - cec fixes
  - DTS buffering
  - others (pause_burst_frames enabled by default. WTF is that?)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index e6763af463..94badf97da 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 5343d029a5f2f09bd9801914eac0d4bf95cadc1f
+RPI_FIRMWARE_VERSION = 18a163f9341755b00841312af2878afeb64c131c
 RPI_FIRMWARE_SITE = http://github.com/raspberrypi/firmware/tarball/$(RPI_FIRMWARE_VERSION)
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

From 381e215d49c94abc298997d01ca7360e2c2f7f7a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 11 Nov 2013 01:09:15 +0100
Subject: [PATCH 6693/6849] package/rpi-userland: bump version

Bump for a few more options (eg. setting the palette in 4- or 8bpp,
and rendering camera preview with GL).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 9320ecf9d8..174115334e 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 0d25e71ea558f32cd72b8d46cd51767c92a81d01
+RPI_USERLAND_VERSION = 0d486513f56453f8203c270fcad0b04f8e4f1fee
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 0b90a82cda00d4f5c449e5bb89621d48b1691e37 Mon Sep 17 00:00:00 2001
From: "eric.le.bihan.dev@free.fr" <eric.le.bihan.dev@free.fr>
Date: Wed, 6 Nov 2013 16:34:34 +0100
Subject: [PATCH 6694/6849] system: move init system option above /dev
 management.

The option to choose init system was below the one for /dev management.
As Systemd forces the use of udev, it is logical to swap them.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 system/Config.in | 58 ++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 6418d5272d..266e709b4b 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -66,35 +66,6 @@ config BR2_TARGET_GENERIC_PASSWD_METHOD
 	default "sha-256"   if BR2_TARGET_GENERIC_PASSWD_SHA256
 	default "sha-512"   if BR2_TARGET_GENERIC_PASSWD_SHA512
 
-choice
-	prompt "/dev management"
-	default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
-
-config BR2_ROOTFS_DEVICE_CREATION_STATIC
-	bool "Static using device table"
-
-config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
-	bool "Dynamic using devtmpfs only"
-
-config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
-	bool "Dynamic using mdev"
-	select BR2_PACKAGE_BUSYBOX
-
-config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
-	bool "Dynamic using udev"
-	depends on BR2_LARGEFILE # udev
-	depends on BR2_USE_WCHAR # udev
-	depends on !BR2_PREFER_STATIC_LIB # udev -> kmod
-	select BR2_PACKAGE_UDEV
-
-comment "udev needs a toolchain w/ largefile, wchar"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
-
-comment "udev doesn't work with 'prefer static libraries'"
-	depends on BR2_PREFER_STATIC_LIB
-
-endchoice
-
 choice
 	prompt "Init system"
 	default BR2_INIT_BUSYBOX
@@ -129,6 +100,35 @@ config BR2_INIT_NONE
 
 endchoice
 
+choice
+	prompt "/dev management"
+	default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
+
+config BR2_ROOTFS_DEVICE_CREATION_STATIC
+	bool "Static using device table"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS
+	bool "Dynamic using devtmpfs only"
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
+	bool "Dynamic using mdev"
+	select BR2_PACKAGE_BUSYBOX
+
+config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	bool "Dynamic using udev"
+	depends on BR2_LARGEFILE # udev
+	depends on BR2_USE_WCHAR # udev
+	depends on !BR2_PREFER_STATIC_LIB # udev -> kmod
+	select BR2_PACKAGE_UDEV
+
+comment "udev needs a toolchain w/ largefile, wchar"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+
+comment "udev doesn't work with 'prefer static libraries'"
+	depends on BR2_PREFER_STATIC_LIB
+
+endchoice
+
 config BR2_ROOTFS_DEVICE_TABLE
 	string "Path to the permission tables"
 	default "system/device_table.txt"

From 270db93d7bf5dc8c2f742b4238253aea8591ec49 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 10 Oct 2013 09:05:04 +0800
Subject: [PATCH 6695/6849] xmlstarlet: add license information

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/xmlstarlet/xmlstarlet.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index f0a26c2117..4a30febbd9 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -6,6 +6,8 @@
 
 XMLSTARLET_VERSION = 1.3.0
 XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
+XMLSTARLET_LICENSE = MIT
+XMLSTARLET_LICENSE_FILES = COPYING
 
 XMLSTARLET_DEPENDENCIES += libxml2 libxslt \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)

From ec2c83234c2044dd03f47b6029d104c9c5ae7cde Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 10 Oct 2013 09:07:32 +0800
Subject: [PATCH 6696/6849] xmlstarlet: bump to version 1.5.0

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/xmlstarlet/xmlstarlet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
index 4a30febbd9..16f736ee88 100644
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XMLSTARLET_VERSION = 1.3.0
+XMLSTARLET_VERSION = 1.5.0
 XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION)
 XMLSTARLET_LICENSE = MIT
 XMLSTARLET_LICENSE_FILES = COPYING

From 0c14b6c9a66900e427e82326108ac63fe46dd483 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 15 Oct 2013 13:33:24 -0300
Subject: [PATCH 6697/6849] cppdb: new package

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in       |  1 +
 package/cppdb/Config.in | 15 +++++++++++++++
 package/cppdb/cppdb.mk  | 20 ++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/cppdb/Config.in
 create mode 100644 package/cppdb/cppdb.mk

diff --git a/package/Config.in b/package/Config.in
index d0db7d6d46..311cc6cc15 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -472,6 +472,7 @@ endmenu
 
 menu "Database"
 source "package/berkeleydb/Config.in"
+source "package/cppdb/Config.in"
 source "package/gdbm/Config.in"
 source "package/mysql_client/Config.in"
 source "package/redis/Config.in"
diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in
new file mode 100644
index 0000000000..f0c48e3726
--- /dev/null
+++ b/package/cppdb/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_CPPDB
+	bool "cppdb"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# Can be built without them but it's useless
+	depends on BR2_PACKAGE_MYSQL_CLIENT || BR2_PACKAGE_SQLITE
+	help
+	  CppDB is an SQL connectivity library that is designed to provide
+	  platform and Database independent connectivity API similarly
+	  to what JDBC, ODBC and other connectivity libraries do.
+
+	  http://cppcms.com/sql/cppdb/
+
+comment "cppdb needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk
new file mode 100644
index 0000000000..7cb858f9a3
--- /dev/null
+++ b/package/cppdb/cppdb.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# cppdb
+#
+################################################################################
+
+CPPDB_VERSION = 0.3.1
+CPPDB_SOURCE = cppdb-$(CPPDB_VERSION).tar.bz2
+CPPDB_SITE = http://downloads.sourceforge.net/project/cppcms/cppdb/$(CPPDB_VERSION)
+CPPDB_INSTALL_STAGING = YES
+CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
+CPPDB_LICENSE = Boost-v1.0 or MIT
+CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
+CPPDB_DEPENDENCIES += mysql_client
+CPPDB_CONF_OPT += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql
+endif
+
+$(eval $(cmake-package))

From 1eee94dd910abd76009fbfffdc29abd88e1ca81f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 09:41:41 +0100
Subject: [PATCH 6698/6849] cppdb: fix comment dependency

As noticed by Thomas De Schampheleir.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/cppdb/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in
index f0c48e3726..f79b70bc67 100644
--- a/package/cppdb/Config.in
+++ b/package/cppdb/Config.in
@@ -12,4 +12,5 @@ config BR2_PACKAGE_CPPDB
 	  http://cppcms.com/sql/cppdb/
 
 comment "cppdb needs a toolchain w/ C++, threads"
+	depends on BR2_PACKAGE_MYSQL_CLIENT || BR2_PACKAGE_SQLITE
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From c344ec0205178b98c9502f1eb62cf0b151aff3aa Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 10:36:23 +0100
Subject: [PATCH 6699/6849] imagemagick: bump version

The -3 version is no longer available at the upstream URL.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/imagemagick/imagemagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index a31e79964e..c8f3a566a9 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 IMAGEMAGICK_MAJOR = 6.8.7
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-3
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-5
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 # The official ImageMagick site only keeps the latest versions
 # available, which is annoying. Use an alternate site that keeps all

From d71d7d162bb835f42403c930f19007fba90e2a91 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 11 Nov 2013 09:49:08 +0000
Subject: [PATCH 6700/6849] iozone: disable for uClibc 0.9.31

uClibc 0.9.31.x does not include the pthread_setaffinity_np GNU extension.

Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/e21526c0c18733310d3fb322d79d5fff3a71af51/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/iozone/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/iozone/Config.in b/package/iozone/Config.in
index 26d4daafe0..33e12ca77c 100644
--- a/package/iozone/Config.in
+++ b/package/iozone/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_IOZONE
 	bool "iozone"
 	depends on BR2_USE_MMU # fork()
+	depends on !BR2_UCLIBC_VERSION_0_9_31 # no pthread_setaffinity_np
 	help
 	  IOzone is a filesystem benchmark tool.
 	  The benchmark generates and measures a variety of file operations

From c8461f380b81a761b7e7d51e069f715fa7f97e3b Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 11:27:23 +0100
Subject: [PATCH 6701/6849] gstreamer1: bump version

Bugfix release.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index d15095dd3c..82b15bc13b 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GSTREAMER1_VERSION = 1.2.0
+GSTREAMER1_VERSION = 1.2.1
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES

From df3c6ee6245de10b6f60add7c8581bc46244e287 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 11:28:04 +0100
Subject: [PATCH 6702/6849] gst1-plugins-base: bump version

Bugfix release.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 223af2fcb5..3c1d826d2d 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BASE_VERSION = 1.2.0
+GST1_PLUGINS_BASE_VERSION = 1.2.1
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES

From 14ee08f3e3c98a074ccd8cbc971d633c61110ab7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 11:29:49 +0100
Subject: [PATCH 6703/6849] gst1-plugins-good: bump version

Bugfix release. Patch is now upstream.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...fferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch | 46 -------------------
 .../gst1-plugins-good/gst1-plugins-good.mk    |  2 +-
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch

diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch
deleted file mode 100644
index 7dd7917b65..0000000000
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good-gstv4lbufferpool-O_CLOEXEC-needs-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4f305f30c9917f7a6ea7332a798401f2a5abe981 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Fri, 4 Oct 2013 13:34:09 +0200
-Subject: [PATCH] gstv4l2bufferpool: O_CLOEXEC needs _GNU_SOURCE
-
-[Submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=709423]
-
-On some systems (E.G. uClibc and older Glibc versions), O_CLOEXEC is only
-defined when _GNU_SOURCE is specified, so do so.
-
-_GNU_SOURCE needs to be defined before any system headers are included,
-so move the fcntl.h section up.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- sys/v4l2/gstv4l2bufferpool.c |   10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index 00c6086..f5396d9 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -26,13 +26,17 @@
- #  include <config.h>
- #endif
- 
--#include <sys/mman.h>
--#include <string.h>
--#include <unistd.h>
- #if HAVE_DECL_V4L2_MEMORY_DMABUF
-+#ifndef _GNU_SOURCE
-+# define _GNU_SOURCE            /* O_CLOEXEC */
-+#endif
- #include <fcntl.h>
- #endif
- 
-+#include <sys/mman.h>
-+#include <string.h>
-+#include <unistd.h>
-+
- #include "gst/video/video.h"
- #include "gst/video/gstvideometa.h"
- #include "gst/video/gstvideopool.h"
--- 
-1.7.10.4
-
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index de8ad910a3..982b2b3258 100644
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_GOOD_VERSION = 1.2.0
+GST1_PLUGINS_GOOD_VERSION = 1.2.1
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING

From 8746b3d072091199a73dc0fb3775e8606dcc4cae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 11:30:33 +0100
Subject: [PATCH 6704/6849] gst1-plugins-bad: bump version

Bugfix release. Patch is now upstream.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ix-compilation-on-big-endian-systems.patch | 39 -------------------
 .../gst1-plugins-bad/gst1-plugins-bad.mk      |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch
deleted file mode 100644
index 1bcdeffc73..0000000000
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-bluez-Fix-compilation-on-big-endian-systems.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1ab90f259fee4fa9a7c10dac0a1e85799a15881b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
-Date: Wed, 25 Sep 2013 20:25:03 +0200
-Subject: [PATCH] bluez: Fix compilation on big endian systems
-
----
- sys/bluez/gstavdtputil.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sys/bluez/gstavdtputil.c b/sys/bluez/gstavdtputil.c
-index dea803a..ed5c276 100644
---- a/sys/bluez/gstavdtputil.c
-+++ b/sys/bluez/gstavdtputil.c
-@@ -611,11 +611,11 @@ gst_avdtp_util_parse_aac_raw (void *config)
-   GValue value = G_VALUE_INIT;
-   GValue value_str = G_VALUE_INIT;
-   GValue list = G_VALUE_INIT;
-+  a2dp_aac_t aac_local = { 0 };
-+  a2dp_aac_t *aac = &aac_local;
- 
- #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-   uint8_t *raw = (uint8_t *) config;
--  a2dp_aac_t aac_local = { 0 };
--  a2dp_aac_t *aac = &aac_local;
-   aac->object_type = raw[0];
-   aac->frequency = (raw[1] << 4) | ((raw[2] & 0xFF) >> 4);
-   aac->channels = (raw[2] >> 2) & 0x3;
-@@ -624,7 +624,7 @@ gst_avdtp_util_parse_aac_raw (void *config)
-   aac->bitrate = (raw[4] << 16) | (raw[3] << 8) | raw[4];
-   aac->bitrate &= ~0x800000;
- #elif G_BYTE_ORDER == G_BIG_ENDIAN
--  *aac = (a2dp_aac_t *) config;
-+  *aac = *((a2dp_aac_t *) config);
- #else
- #error "Unknown byte order"
- #endif
--- 
-1.7.10.4
-
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index e3f3bf3d3e..f6fdc81bff 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BAD_VERSION = 1.2.0
+GST1_PLUGINS_BAD_VERSION = 1.2.1
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB

From d54bba02a19c674c3c7ee3f8bb4b8dce2ce6ae65 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 11:31:40 +0100
Subject: [PATCH 6705/6849] gst-plugins-ugly: bump version

Bugfix release.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 9cdcf50fbc..63f2b8d64d 100644
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_PLUGINS_UGLY_VERSION = 1.2.0
+GST1_PLUGINS_UGLY_VERSION = 1.2.1
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING

From 5f6dd5eb73f6e60916fea8b4a78787f270d95e65 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 11 Nov 2013 13:37:09 +0000
Subject: [PATCH 6706/6849] log4cxx: needs threads

Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/7b73901d9e8b5098cd96b54d292bb3ffffb3fe37/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/log4cxx/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in
index 86d6a1d2ca..8791b8c433 100644
--- a/package/log4cxx/Config.in
+++ b/package/log4cxx/Config.in
@@ -5,11 +5,13 @@ config BR2_PACKAGE_LOG4CXX
 	# apr really needs shared library support
 	depends on !BR2_PREFER_STATIC_LIB
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Apache log4cxx is a logging framework for C++ patterned
 	  after Apache log4j.
 
 	  http://apache.linux-mirror.org/logging/log4cxx/0.10.0
 
-comment "log4cxx needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "log4cxx needs a toolchain w/ C++, threads, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_PREFER_STATIC_LIB

From 6820059edcfe6991830aa7d82db59689d0504019 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Nov 2013 14:55:28 +0100
Subject: [PATCH 6707/6849] pciutils: bump version

I have just released version 3.2.1 of the pciutils. It's purely
a maintenance release with a couple of minor bug fixes and minor
improvements. Thus quoth the changelog:

2013-11-10  Martin Mares <mj@ucw.cz>

	* Released as 3.2.1.

	* CardBus bridge capabilities are displayed.

	* PCIe L1 PM substates are decoded.

	* Various bugs were fixed in decoding of PCIe capabilities.

	* The sysfs back-end does not spit out unnecessary warnings when
	  empty slots report only a partial device address. This actually
	  happens on IBM pSeries.

	* Updated pci.ids to the today's snapshot of the database.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pciutils/pciutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index fd6f8aa57d..16ba61b07b 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCIUTILS_VERSION = 3.2.0
+PCIUTILS_VERSION = 3.2.1
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 PCIUTILS_INSTALL_STAGING = YES
 PCIUTILS_LICENSE = GPLv2+

From b3766198db3a0f52db8e8ea53edb9321a33efe34 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Mon, 11 Nov 2013 14:58:12 +0100
Subject: [PATCH 6708/6849] docs/manual: Add version number to perl in
 prerequisites

Building host-bison needs perl 5.8.7+, as it uses the "-f" option
for site customization scripts. This feature was added in 5.8.7.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/manual/prerequisite.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt
index 729d64c04e..adc23eec51 100644
--- a/docs/manual/prerequisite.txt
+++ b/docs/manual/prerequisite.txt
@@ -33,7 +33,7 @@ Mandatory packages
 ** +patch+
 ** +gzip+
 ** +bzip2+
-** +perl+
+** +perl+ (version 5.8.7 or any later)
 ** +tar+
 ** +cpio+
 ** +python+ (version 2.6 or 2.7)

From 6d93f061eccad3b81a27e8cf02cb8b29e9dba44e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Nov 2013 14:58:46 +0100
Subject: [PATCH 6709/6849] ethtool: bump version to 3.12.1

3.12 release notes:

	* Fix: Remove alternate method to check for VLAN tag offload on Linux
	  < 2.6.37 (-k/-K options)
	* Fix: Hide state of VLAN tag offload and LRO if the kernel is too old
	  for us to reliably detect them (-k option)
	* Feature: Add register dump support for Solarflare SFC9100 family
	  (-d option)

3.12.1 release notes:

This includes a couple of changes that should have gone into 3.12.

	* Fix: Memory corruption when applying external calibration to
	  SFF-8472 module diagnostics (-m option)
	* Feature: Add Intel 82599 and x540 DCB registers to dump
	  (-d option)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ethtool/ethtool.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index 7c22269af6..32b39e8895 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ETHTOOL_VERSION = 3.11
+ETHTOOL_VERSION = 3.12.1
 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPLv2

From 6a3bff298e0026fbbbea46aea1a859a30691a560 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 11 Nov 2013 15:43:47 +0000
Subject: [PATCH 6710/6849] libqmi: fix autobuild failures

The libqmi build specifies -Werror in the CFLAGS by default. This causes
build failures such as the following.

  http://autobuild.buildroot.net/results/070/070449299aa9025c4bc6769524a6e22d66c92a65/

The -Werror flag can be disabled using a configuration switch.

[Peter: use =no instead and add a comment explaining why]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libqmi/libqmi.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
index 911b1a7957..4f3f9a9deb 100644
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -13,4 +13,7 @@ LIBQMI_INSTALL_STAGING = YES
 
 LIBQMI_DEPENDENCIES = libglib2
 
+# we don't want -Werror
+LIBQMI_CONF_OPT = --enable-more-warnings=no
+
 $(eval $(autotools-package))

From c2255e00f3ead5d9a55d81f503be269b555fbed5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 21:14:01 +0100
Subject: [PATCH 6711/6849] liblog4c-localtime: fix linking error without
 pthread

Fixes http://autobuild.buildroot.net/results/34f/34f238cdb1b1b4be1a11143b5e4a17c78c2fc289/

The rollingfile functionality only gets built if pthread support is
available, but a call to these functions from log4c_fini() was outside
the #if WITH_ROLLINGFILE conditional, causing linker errors when the
library is used.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../liblog4c-localtime-nothread.patch         | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/liblog4c-localtime/liblog4c-localtime-nothread.patch

diff --git a/package/liblog4c-localtime/liblog4c-localtime-nothread.patch b/package/liblog4c-localtime/liblog4c-localtime-nothread.patch
new file mode 100644
index 0000000000..df16e62461
--- /dev/null
+++ b/package/liblog4c-localtime/liblog4c-localtime-nothread.patch
@@ -0,0 +1,29 @@
+[PATCH] fix linking error without pthread
+
+The rollingfile functionality only gets built if pthread support is
+available, but a call to these functions from log4c_fini() was outside
+the #if WITH_ROLLINGFILE conditional, causing linker errors when the
+library is used.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ src/log4c/init.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: liblog4c-localtime-v1.0/src/log4c/init.c
+===================================================================
+--- liblog4c-localtime-v1.0.orig/src/log4c/init.c
++++ liblog4c-localtime-v1.0/src/log4c/init.c
+@@ -267,10 +267,12 @@
+ 	log4c_layout_factory = NULL;
+     }
+   
++#ifdef WITH_ROLLINGFILE
+     if (log4c_rollingpolicy_factory) {
+ 	sd_factory_delete(log4c_rollingpolicy_factory);
+ 	log4c_rollingpolicy_factory = NULL;
+     }
++#endif
+     
+ #ifdef __SD_DEBUG__
+     if( getenv("SD_DEBUG")){

From bed4e27868aaefb3b82dca9ba076415bec368557 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Mon, 11 Nov 2013 17:23:23 +0100
Subject: [PATCH 6712/6849] Config.in files: whitespace cleanup

This patch fixes the following whitespace problems in Config.in files:
- trailing whitespace
- spaces instead of tabs for indentation
- help text not indented with tab + 2 spaces

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in                                     |  2 +-
 boot/at91dataflashboot/Config.in              |  4 +-
 boot/mxs-bootlets/Config.in                   | 20 ++--
 boot/uboot/Config.in                          |  2 +-
 fs/squashfs/Config.in                         | 14 +--
 linux/Config.ext.in                           | 16 +--
 linux/Config.in                               | 20 ++--
 package/at/Config.in                          |  6 +-
 package/busybox/Config.in                     |  2 +-
 package/cegui06/Config.in                     |  2 +-
 package/celt051/Config.in                     |  6 +-
 package/cppcms/Config.in                      |  6 +-
 package/cramfs/Config.in                      | 10 +-
 package/cryptsetup/Config.in                  |  2 +-
 package/cups/Config.in                        |  8 +-
 package/dfu-util/Config.in.host               |  4 +-
 package/divine/Config.in                      | 14 +--
 package/dvb-apps/Config.in                    |  2 +-
 package/dvbsnoop/Config.in                    |  2 +-
 package/e2fsprogs/Config.in.host              |  2 +-
 package/efl/libevas/Config.in                 |  4 +-
 package/ffmpeg/Config.in                      | 98 +++++++++----------
 package/flac/Config.in                        |  2 +-
 .../freescale-imx/gpu-viv-bin-mx6q/Config.in  |  2 +-
 package/gd/Config.in                          | 38 +++----
 package/genimage/Config.in.host               |  4 +-
 package/genpart/Config.in.host                |  2 +-
 package/genromfs/Config.in                    |  8 +-
 package/httping/Config.in                     | 18 ++--
 package/input-tools/Config.in                 | 24 ++---
 package/intltool/Config.in                    | 14 +--
 package/keyutils/Config.in                    |  2 +-
 package/libcap/Config.in                      | 10 +-
 package/libdvdnav/Config.in                   |  2 +-
 package/libeXosip2/Config.in                  |  2 +-
 package/libgeotiff/Config.in                  | 12 +--
 package/libiscsi/Config.in                    |  4 +-
 package/libmms/Config.in                      | 10 +-
 package/libseccomp/Config.in                  |  4 +-
 package/libv4l/Config.in                      |  2 +-
 package/libxml-parser-perl/Config.in          | 16 +--
 package/linux-firmware/Config.in              | 18 ++--
 package/lite/Config.in                        |  2 +-
 package/lttng-babeltrace/Config.in            |  2 +-
 package/makedevs/Config.in                    |  8 +-
 package/memtester/Config.in                   |  2 +-
 package/monit/Config.in                       |  2 +-
 package/mtools/Config.in.host                 |  2 +-
 package/php/Config.in                         | 20 ++--
 package/python-pyparsing/Config.in            |  2 +-
 package/sawman/Config.in                      | 12 +--
 package/slirp/Config.in                       |  6 +-
 package/snowball-hdmiservice/Config.in        |  6 +-
 package/speex/Config.in                       |  6 +-
 package/spice-protocol/Config.in              |  4 +-
 package/spice/Config.in                       |  4 +-
 package/squashfs/Config.in                    | 34 +++----
 package/sysstat/Config.in                     | 62 ++++++------
 package/taglib/Config.in                      |  6 +-
 package/ti-gfx/Config.in                      |  2 +-
 package/tremor/Config.in                      |  6 +-
 package/usbredir/Config.in                    |  6 +-
 package/util-linux/Config.in                  |  2 +-
 package/x11r7/Config.in                       |  2 +-
 .../x11r7/xdriver_xf86-input-evdev/Config.in  |  2 +-
 package/x11r7/xserver_xorg-server/Config.in   | 18 ++--
 package/xenomai/Config.in                     | 66 ++++++-------
 package/xfsprogs/Config.in                    |  2 +-
 system/Config.in                              | 22 ++---
 toolchain/toolchain-external/Config.in        | 66 ++++++-------
 70 files changed, 407 insertions(+), 407 deletions(-)

diff --git a/Config.in b/Config.in
index af720ec16f..d87e0f0c54 100644
--- a/Config.in
+++ b/Config.in
@@ -410,7 +410,7 @@ config BR2_ENABLE_SSP
 	  -fstack-protector-all option.
 
 	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
-          for details.
+	  for details.
 
 	  Note that this requires the toolchain to have SSP
 	  support. This is always the case for glibc and eglibc
diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index 7537548f6c..80b57a4ad0 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
 config BR2_TARGET_AT91DATAFLASHBOOT
-       depends on BR2_arm926t
-       bool "AT91 DataFlashBoot"
+	depends on BR2_arm926t
+	bool "AT91 DataFlashBoot"
diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in
index 2222ff6076..4bb07a06f5 100644
--- a/boot/mxs-bootlets/Config.in
+++ b/boot/mxs-bootlets/Config.in
@@ -43,16 +43,16 @@ choice
 	  Select which bootstream to generate
 
 config BR2_TARGET_MXS_BOOTLETS_BAREBOX
-       depends on BR2_TARGET_BAREBOX
-       bool "Barebox Bootloader"
+	depends on BR2_TARGET_BAREBOX
+	bool "Barebox Bootloader"
 
 config BR2_TARGET_MXS_BOOTLETS_LINUX
-       depends on BR2_LINUX_KERNEL
-       bool "Linux Kernel"
+	depends on BR2_LINUX_KERNEL
+	bool "Linux Kernel"
 
 config BR2_TARGET_MXS_BOOTLETS_UBOOT
-       depends on BR2_TARGET_UBOOT
-       bool "U-boot bootloader"
+	depends on BR2_TARGET_UBOOT
+	bool "U-boot bootloader"
 
 endchoice
 
@@ -82,9 +82,9 @@ config BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
 endchoice
 
 config BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME
-       string "Custom board name"
-       depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
-       help
-         Name of the board to build the bootlets for
+	string "Custom board name"
+	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD
+	help
+	  Name of the board to build the bootlets for
 
 endif
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index af9ccab9ab..77553c13bd 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -21,7 +21,7 @@ config BR2_TARGET_UBOOT_LATEST_VERSION
 	bool "2013.10"
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION
-       bool "Custom version"
+	bool "Custom version"
 	help
 	  This option allows to use a specific official versions
 
diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index f13410a1ce..fb696bdf84 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -12,11 +12,11 @@ choice
 	  root filesystem.
 
 config BR2_TARGET_ROOTFS_SQUASHFS4
-       bool "4.x"
+	bool "4.x"
 
 config BR2_TARGET_ROOTFS_SQUASHFS3
-       depends on BR2_DEPRECATED
-       bool "3.x"
+	depends on BR2_DEPRECATED
+	bool "3.x"
 
 endchoice
 
@@ -29,16 +29,16 @@ choice
 	  generating the filesystem.
 
 config BR2_TARGET_ROOTFS_SQUASHFS4_GZIP
-       bool "gzip"
+	bool "gzip"
 
 config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA
-       bool "lzma"
+	bool "lzma"
 
 config BR2_TARGET_ROOTFS_SQUASHFS4_LZO
-       bool "lzo"
+	bool "lzo"
 
 config BR2_TARGET_ROOTFS_SQUASHFS4_XZ
-       bool "xz"
+	bool "xz"
 
 endchoice
 endif
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 2b0092a05a..40c468424a 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -31,15 +31,15 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 
 # RTAI
 config BR2_LINUX_KERNEL_EXT_RTAI
-       bool "RTAI Real-time patch"
-       select BR2_PACKAGE_RTAI
-       help
-         RTAI Kernel part.
+	bool "RTAI Real-time patch"
+	select BR2_PACKAGE_RTAI
+	help
+	  RTAI Kernel part.
 
 config BR2_LINUX_KERNEL_EXT_RTAI_PATCH
-       depends on BR2_LINUX_KERNEL_EXT_RTAI
-       string "Path for RTAI patch file"
-       help
-         Optionally, explicitly specify the RTAI patch to use.
+	depends on BR2_LINUX_KERNEL_EXT_RTAI
+	string "Path for RTAI patch file"
+	help
+	  Optionally, explicitly specify the RTAI patch to use.
 
 endmenu
diff --git a/linux/Config.in b/linux/Config.in
index 84de134f06..9b2025cc56 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -127,9 +127,9 @@ config BR2_LINUX_KERNEL_DEFCONFIG
 	string "Defconfig name"
 	depends on BR2_LINUX_KERNEL_USE_DEFCONFIG
 	help
-	 Name of the kernel defconfig file to use, without the
-	 trailing _defconfig.  The defconfig is located in
-	 arch/<arch>/configs in the kernel tree.
+	  Name of the kernel defconfig file to use, without the
+	  trailing _defconfig.  The defconfig is located in
+	  arch/<arch>/configs in the kernel tree.
 
 config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	string "Configuration file path"
@@ -142,7 +142,7 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 #
 
 config BR2_LINUX_KERNEL_UBOOT_IMAGE
-       bool
+	bool
 
 choice
 	prompt "Kernel binary format"
@@ -274,9 +274,9 @@ choice
 config BR2_LINUX_KERNEL_USE_INTREE_DTS
 	bool "Use a device tree present in the kernel."
 	help
-	   Use a device tree source distributed with
-	   the kernel sources. The dts files are located
-           in the arch/<arch>/boot/dts folder.
+	  Use a device tree source distributed with
+	  the kernel sources. The dts files are located
+	  in the arch/<arch>/boot/dts folder.
 
 config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
 	bool "Use a custom device tree file"
@@ -290,9 +290,9 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME
 	string "Device Tree Source file names"
 	depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
 	help
-	 Name of the device tree source file, without
-	 the trailing .dts. You can provide a list of
-	 dts files to build, separated by spaces.
+	  Name of the device tree source file, without
+	  the trailing .dts. You can provide a list of
+	  dts files to build, separated by spaces.
 
 config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
 	string "Device Tree Source file path"
diff --git a/package/at/Config.in b/package/at/Config.in
index d4ddcb2c62..17fabf7f6b 100644
--- a/package/at/Config.in
+++ b/package/at/Config.in
@@ -2,9 +2,9 @@ config BR2_PACKAGE_AT
 	bool "at"
 	depends on BR2_USE_MMU
 	help
-	 At and batch read shell commands from standard input and
-	 store them as jobs to be scheduled for execution in the
-	 future.
+	  At and batch read shell commands from standard input and
+	  store them as jobs to be scheduled for execution in the
+	  future.
 
 	  at    - run the job at a specified time
 	  batch - run the job when system load levels permit
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index ba521e1e0e..2d55aa60f9 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -81,5 +81,5 @@ if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else
 # add dummy config so the stuff with busybox alternatives are shown
 # when busybox is disabled
 config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-       default y
+	default y
 endif
diff --git a/package/cegui06/Config.in b/package/cegui06/Config.in
index 410447230a..92bbb70b81 100644
--- a/package/cegui06/Config.in
+++ b/package/cegui06/Config.in
@@ -15,5 +15,5 @@ config BR2_PACKAGE_CEGUI06
 	  orientated, written in C++, and targeted at games developers who
 	  should be spending their time creating great games, not building
 	  GUI sub-systems!
-	  
+
 	  http://www.cegui.org.uk/
diff --git a/package/celt051/Config.in b/package/celt051/Config.in
index 50ed069276..035e262d74 100644
--- a/package/celt051/Config.in
+++ b/package/celt051/Config.in
@@ -3,13 +3,13 @@ config BR2_PACKAGE_CELT051
 	select BR2_PACKAGE_LIBOGG
 	help
 	  The CELT ultra-low delay audio codec
-	  
+
 	  The CELT codec is a compression algorithm for audio. Like MP3,
 	  Vorbis, and AAC it is suitable for transmitting music with high
 	  quality. Unlike these formats CELT imposes very little delay on
 	  the signal, even less than is typical for speech centric formats
 	  like Speex, GSM, or G.729.
-	  
+
 	  Note: this is version 0.5.1.3 of celt.
-	  
+
 	  http://www.celt-codec.org/
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index 11daf7cdfe..e13e076cd3 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -12,11 +12,11 @@ config BR2_PACKAGE_CPPCMS
 	  differs from most of other web development frameworks like:
 	  Python Django or Java Servlets on  the following aspects:
 
-           - It is designed and tuned to handle extremely high loads.
+	   - It is designed and tuned to handle extremely high loads.
 	   - It uses modern C++ as primary development language in
 	     order to achieve the above goal.
-           - It is aimed on development of both Web Sites and Web
-             Services.
+	   - It is aimed on development of both Web Sites and Web
+	     Services.
 
 	  http://cppcms.com
 
diff --git a/package/cramfs/Config.in b/package/cramfs/Config.in
index a5c73a8524..daf6e6d100 100644
--- a/package/cramfs/Config.in
+++ b/package/cramfs/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CRAMFS
-       bool "cramfs"
-       help
-         cramfs is a compressed read-only filesystem. This package
-         contains the tools to generate and check a cramfs filesystem.
+	bool "cramfs"
+	help
+	  cramfs is a compressed read-only filesystem. This package
+	  contains the tools to generate and check a cramfs filesystem.
 
-	 http://sourceforge.net/projects/cramfs/
+	  http://sourceforge.net/projects/cramfs/
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 7b0e7ca599..28073f41bc 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_CRYPTSETUP
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_E2FSPROGS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE 
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on BR2_LARGEFILE # lvm2, util-linux
 	depends on BR2_USE_MMU # lvm2
 	depends on BR2_USE_WCHAR # util-linux
diff --git a/package/cups/Config.in b/package/cups/Config.in
index 3703d4e26c..ea1f003e49 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -10,10 +10,10 @@ config BR2_PACKAGE_CUPS
 if BR2_PACKAGE_CUPS
 
 config BR2_PACKAGE_CUPS_PDFTOPS
-       bool "pdftops support"
-       depends on BR2_INSTALL_LIBSTDCPP
-       help
-         Enable pdftops support
+	bool "pdftops support"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Enable pdftops support
 
 comment "pdftops support needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/dfu-util/Config.in.host b/package/dfu-util/Config.in.host
index cfeebdc21d..b2a8f8251f 100644
--- a/package/dfu-util/Config.in.host
+++ b/package/dfu-util/Config.in.host
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_HOST_DFU_UTIL
 	bool "host dfu-util"
 	help
-	  Dfu-util is the host side implementation of the DFU 1.0 
+	  Dfu-util is the host side implementation of the DFU 1.0
 	  specification of the USB forum. DFU is intended to download
-	  and upload firmware to devices connected over USB. 
+	  and upload firmware to devices connected over USB.
 
 	  http://dfu-util.gnumonks.org/
diff --git a/package/divine/Config.in b/package/divine/Config.in
index 8202292142..7909004761 100644
--- a/package/divine/Config.in
+++ b/package/divine/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_DIVINE
-       bool "directfb virtual input extension"
-       depends on BR2_PACKAGE_DIRECTFB
-       help
-         DiVine provides a DirectFB input driver that reads input
-         events from a pipe and dispatches them via a virtual input
-         device. It also installs the tool 'spooky' that allows to
-         send input events to DirectFB applications.
+	bool "directfb virtual input extension"
+	depends on BR2_PACKAGE_DIRECTFB
+	help
+	  DiVine provides a DirectFB input driver that reads input
+	  events from a pipe and dispatches them via a virtual input
+	  device. It also installs the tool 'spooky' that allows to
+	  send input events to DirectFB applications.
diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index 393ee5bd8e..ba3ce45ec0 100644
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_DVB_APPS
 	bool "dvb-apps (transponders data)"
 	help
 	  Install the DVB-C, DVB-S, DVB-T and ATSC transponders data.
-	  
+
 	  http://linuxtv.org/projects.php
 	  http://linuxtv.org/hg/dvb-apps
 
diff --git a/package/dvbsnoop/Config.in b/package/dvbsnoop/Config.in
index 9ead941d2b..09a3c4d8f6 100644
--- a/package/dvbsnoop/Config.in
+++ b/package/dvbsnoop/Config.in
@@ -22,4 +22,4 @@ config BR2_PACKAGE_DVBSNOOP
 	  http://en.wikipedia.org/wiki/DBox2
 
 comment "dvbsnoop needs a toolchain w/ largefile"
-        depends on !BR2_LARGEFILE
+	depends on !BR2_LARGEFILE
diff --git a/package/e2fsprogs/Config.in.host b/package/e2fsprogs/Config.in.host
index 0c001c22a0..bc0c71c487 100644
--- a/package/e2fsprogs/Config.in.host
+++ b/package/e2fsprogs/Config.in.host
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HOST_E2FSPROGS
 	bool "host e2fsprogs"
 	help
 	  The EXT2/3/4 file system utilities.
-	  
+
 	  http://e2fsprogs.sf.net
diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 8c4193fdaf..b14a3193b5 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -142,10 +142,10 @@ config BR2_PACKAGE_LIBEVAS_GL
 	select BR2_PACKAGE_LIBEET
 
 config BR2_PACKAGE_LIBEVAS_GLES_SGX
-       bool "OpenGL-ES SGX"
+	bool "OpenGL-ES SGX"
 
 config BR2_PACKAGE_LIBEVAS_GLES_S3C6410
-       bool "OpenGL-ES S3C6410"
+	bool "OpenGL-ES S3C6410"
 endchoice
 
 
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index 1c8c34f51a..20d5231fb4 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -6,48 +6,48 @@ menuconfig BR2_PACKAGE_FFMPEG
 	depends on BR2_LARGEFILE
 	depends on BR2_INET_IPV6
 	help
-         FFmpeg is a complete, cross-platform solution to record, convert
-         and stream audio and video.
+	  FFmpeg is a complete, cross-platform solution to record, convert
+	  and stream audio and video.
 
-	 http://www.ffmpeg.org
+	  http://www.ffmpeg.org
 
 if BR2_PACKAGE_FFMPEG
 
 config BR2_PACKAGE_FFMPEG_GPL
 	bool "Enable GPL code"
 	help
-         allow use of GPL code, the resulting libs and binaries will
-         be under GPL
+	  allow use of GPL code, the resulting libs and binaries will
+	  be under GPL
 
 config BR2_PACKAGE_FFMPEG_NONFREE
 	bool "Enable nonfree code"
 	help
-         allow use of nonfree code, the resulting libs and binaries
-         will be unredistributable
+	  allow use of nonfree code, the resulting libs and binaries
+	  will be unredistributable
 
 config BR2_PACKAGE_FFMPEG_FFMPEG
 	bool "Build ffmpeg (the command line application)"
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	default y
 	help
-         FFmpeg is a very fast video and audio converter.
-         It can also grab from a live audio/video source.
+	  FFmpeg is a very fast video and audio converter.
+	  It can also grab from a live audio/video source.
 
-         It is not needed if you want to link the FFmpeg libraries
-         to your application.
+	  It is not needed if you want to link the FFmpeg libraries
+	  to your application.
 
 config BR2_PACKAGE_FFMPEG_FFPLAY
 	bool "Build ffplay"
 	select BR2_PACKAGE_SDL
 	help
-         FFplay is a very simple and portable media player using the
-         FFmpeg libraries and the SDL library.
-         It is mostly used as a testbed for the various FFmpeg APIs.
+	  FFplay is a very simple and portable media player using the
+	  FFmpeg libraries and the SDL library.
+	  It is mostly used as a testbed for the various FFmpeg APIs.
 
 config BR2_PACKAGE_FFMPEG_FFSERVER
 	bool "Build ffserver"
 	help
-         FFserver is a streaming server for both audio and video.
+	  FFserver is a streaming server for both audio and video.
 
 config BR2_PACKAGE_FFMPEG_POSTPROC
 	bool "Build libpostproc"
@@ -64,81 +64,81 @@ config BR2_PACKAGE_FFMPEG_ENCODERS
 	string "Enabled encoders"
 	default "all"
 	help
-	 Space-separated list of encoders to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of encoders to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-encoders in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-encoders in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_DECODERS
 	string "Enabled decoders"
 	default "all"
 	help
-	 Space-separated list of decoders to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of decoders to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-decoders in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-decoders in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_MUXERS
 	string "Enabled muxers"
 	default "all"
 	help
-	 Space-separated list of muxers to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of muxers to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-muxers in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-muxers in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_DEMUXERS
 	string "Enabled demuxers"
 	default "all"
 	help
-	 Space-separated list of demuxers to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of demuxers to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-demuxers in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-demuxers in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_PARSERS
 	string "Enabled parsers"
 	default "all"
 	help
-	 Space-separated list of parsers to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of parsers to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-parsers in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-parsers in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_BSFS
 	string "Enabled bitstreams"
 	default "all"
 	help
-	 Space-separated list of bitstream filters to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of bitstream filters to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-bsfs in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-bsfs in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_PROTOCOLS
 	string "Enabled protocols"
 	default "all"
 	help
-	 Space-separated list of protocols to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of protocols to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-protocols in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-protocols in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_FILTERS
 	string "Enabled filters"
 	default "all"
 	help
-	 Space-separated list of filters to build in FFmpeg,
-	 or "all" to build all of them.
+	  Space-separated list of filters to build in FFmpeg,
+	  or "all" to build all of them.
 
-	 Run ./configure --list-filters in the ffmpeg sources
-	 directory to know the available options.
+	  Run ./configure --list-filters in the ffmpeg sources
+	  directory to know the available options.
 
 config BR2_PACKAGE_FFMPEG_INDEVS
 	bool "Enable input devices"
@@ -152,7 +152,7 @@ config BR2_PACKAGE_FFMPEG_EXTRACONF
 	string "Additional parameters for ./configure"
 	default ""
 	help
-	 Extra parameters that will be appended to FFmpeg's
-	 ./configure commandline.
+	  Extra parameters that will be appended to FFmpeg's
+	  ./configure commandline.
 
 endif
diff --git a/package/flac/Config.in b/package/flac/Config.in
index 357e24f728..06f170be09 100644
--- a/package/flac/Config.in
+++ b/package/flac/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_FLAC
 	bool "flac"
 	help
-          FLAC is an Open Source lossless audio codec.
+	  FLAC is an Open Source lossless audio codec.
 
 	  http://flac.sourceforge.net/
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 244bebbb47..64e42bad0e 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	depends on BR2_arm # Only relevant for i.MX6
-	 # Library binaries are linked against libc.so.6
+	# Library binaries are linked against libc.so.6
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Userspace libraries for Vivante GPU on i.MX6 platforms
diff --git a/package/gd/Config.in b/package/gd/Config.in
index efac21d7ef..ba6f3267ba 100644
--- a/package/gd/Config.in
+++ b/package/gd/Config.in
@@ -15,47 +15,47 @@ if BR2_PACKAGE_GD
 menu "gd tools"
 
 config BR2_PACKAGE_GD_ANNOTATE
-       bool "annotate"
+	bool "annotate"
 
 config BR2_PACKAGE_GD_BDFTOGD
-       bool "bdftogd"
-       depends on BR2_PACKAGE_PERL
+	bool "bdftogd"
+	depends on BR2_PACKAGE_PERL
 
 config BR2_PACKAGE_GD_GD2COPYPAL
-       bool "gd2copypal"
+	bool "gd2copypal"
 
 config BR2_PACKAGE_GD_GD2TOGIF
-       bool "gd2togif"
+	bool "gd2togif"
 
 config BR2_PACKAGE_GD_GD2TOPNG
-       bool "gd2topng"
-       select BR2_PACKAGE_LIBPNG
+	bool "gd2topng"
+	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_GD_GDCMPGIF
-       bool "gdcmpgif"
+	bool "gdcmpgif"
 
 config BR2_PACKAGE_GD_GDPARTTOPNG
-       bool "gdparttopng"
-       select BR2_PACKAGE_LIBPNG
+	bool "gdparttopng"
+	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_GD_GDTOPNG
-       bool "gdtopng"
-       select BR2_PACKAGE_LIBPNG
+	bool "gdtopng"
+	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_GD_GIFTOGD2
-       bool "giftogd2"
+	bool "giftogd2"
 
 config BR2_PACKAGE_GD_PNGTOGD
-       bool "pngtogd"
-       select BR2_PACKAGE_LIBPNG
+	bool "pngtogd"
+	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_GD_PNGTOGD2
-       bool "pngtogd2"
-       select BR2_PACKAGE_LIBPNG
+	bool "pngtogd2"
+	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_GD_WEBPNG
-       bool "webpng"
-       select BR2_PACKAGE_LIBPNG
+	bool "webpng"
+	select BR2_PACKAGE_LIBPNG
 
 endmenu
 
diff --git a/package/genimage/Config.in.host b/package/genimage/Config.in.host
index 697dcdadf3..acf777c8bf 100644
--- a/package/genimage/Config.in.host
+++ b/package/genimage/Config.in.host
@@ -4,10 +4,10 @@ config BR2_PACKAGE_HOST_GENIMAGE
 	  genimage is a tool to generate multiple filesystem and flash
 	  images from a given root filesystem tree. genimage is
 	  intended to be run in a fakeroot environment.
-	  
+
 	  Configuration is done is a config file parsed by
 	  libconfuse. Options like the path to tools can be given in
 	  environment variables, the config file or commandline
 	  switches.
-	  
+
 	  http://www.pengutronix.de/software/genimage/
diff --git a/package/genpart/Config.in.host b/package/genpart/Config.in.host
index f986504815..6cc2a59a70 100644
--- a/package/genpart/Config.in.host
+++ b/package/genpart/Config.in.host
@@ -4,5 +4,5 @@ config BR2_PACKAGE_HOST_GENPART
 	  Generate a 16 byte partition table entry defined by command line
 	  arguments and dump it to stdout. No CHS magic is done, only lba
 	  entries are filled out.
-	  
+
 	  http://www.pengutronix.de/software/genpart/index_en.html
diff --git a/package/genromfs/Config.in b/package/genromfs/Config.in
index 2caf2a405d..e4eba9f16a 100644
--- a/package/genromfs/Config.in
+++ b/package/genromfs/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GENROMFS
-       bool "genromfs"
-       help
-         Tool to generate a ROMFS filesystem.
+	bool "genromfs"
+	help
+	  Tool to generate a ROMFS filesystem.
 
-	 http://romfs.sourceforge.net/
\ No newline at end of file
+	  http://romfs.sourceforge.net/
diff --git a/package/httping/Config.in b/package/httping/Config.in
index dca68f3b53..92c7a2039a 100644
--- a/package/httping/Config.in
+++ b/package/httping/Config.in
@@ -1,17 +1,17 @@
 config BR2_PACKAGE_HTTPING
-       bool "httping"
-       help
-         Httping is like 'ping' but for http-requests.
-         Give it an url, and it'll show you how long it takes to connect,
-         send a request and retrieve the reply (only the headers).
-         Be aware that the transmission across the network also takes time!
-         So it measures the latency of the webserver + network.
+	bool "httping"
+	help
+	  Httping is like 'ping' but for http-requests.
+	  Give it an url, and it'll show you how long it takes to connect,
+	  send a request and retrieve the reply (only the headers).
+	  Be aware that the transmission across the network also takes time!
+	  So it measures the latency of the webserver + network.
 
-         http://www.vanheusden.com/httping/
+	  http://www.vanheusden.com/httping/
 
 if BR2_PACKAGE_HTTPING
 
 config BR2_PACKAGE_HTTPING_TFO
-       bool "TCP Fast Open (TFO) support"
+	bool "TCP Fast Open (TFO) support"
 
 endif
diff --git a/package/input-tools/Config.in b/package/input-tools/Config.in
index 08b3cbea70..a2dfe286b1 100644
--- a/package/input-tools/Config.in
+++ b/package/input-tools/Config.in
@@ -5,22 +5,22 @@ config BR2_PACKAGE_INPUT_TOOLS
 	  http://linuxconsole.sourceforge.net/
 
 config BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH
-        bool "inputattach"
-        depends on BR2_PACKAGE_INPUT_TOOLS
-        default y
-        help
+	bool "inputattach"
+	depends on BR2_PACKAGE_INPUT_TOOLS
+	default y
+	help
 	  Inputattach is used for attaching a serial line to the input layer.
 
 config BR2_PACKAGE_INPUT_TOOLS_JSCAL
-        bool "jscal"
-        depends on BR2_PACKAGE_INPUT_TOOLS
-        default y
-        help
+	bool "jscal"
+	depends on BR2_PACKAGE_INPUT_TOOLS
+	default y
+	help
 	  Joystick calibration program.
 
 config BR2_PACKAGE_INPUT_TOOLS_JSTEST
-        bool "jstest"
-        depends on BR2_PACKAGE_INPUT_TOOLS
-        default y
-        help
+	bool "jstest"
+	depends on BR2_PACKAGE_INPUT_TOOLS
+	default y
+	help
 	  Joystick test program.
diff --git a/package/intltool/Config.in b/package/intltool/Config.in
index 990a22712a..4643a899d7 100644
--- a/package/intltool/Config.in
+++ b/package/intltool/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_INTLTOOL
-       bool "intltool"
-       # Hide from configuration as we only support the host package
-       # for the moment
-       depends on BR2_HOST_ONLY
-       help
-         Utility scripts for internationalizing XML
+	bool "intltool"
+	# Hide from configuration as we only support the host package
+	# for the moment
+	depends on BR2_HOST_ONLY
+	help
+	  Utility scripts for internationalizing XML
 
-	 http://www.freedesktop.org/wiki/Software/intltool
\ No newline at end of file
+	  http://www.freedesktop.org/wiki/Software/intltool
diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in
index 6978687f13..bae8568bf6 100644
--- a/package/keyutils/Config.in
+++ b/package/keyutils/Config.in
@@ -5,5 +5,5 @@ config BR2_PACKAGE_KEYUTILS
 	help
 	  These tools are used to control the key management system
 	  built into the Linux kernel.
-	  
+
 	  http://people.redhat.com/~dhowells/keyutils/
diff --git a/package/libcap/Config.in b/package/libcap/Config.in
index f1fc8fa163..59300afd27 100644
--- a/package/libcap/Config.in
+++ b/package/libcap/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LIBCAP
 	bool "libcap"
 	help
-	 This library implements the user-space interfaces to the
-	 POSIX 1003.1e capabilities available in Linux kernels. These
-	 capabilities are a partitioning of the all powerful root
-	 privilege into a set of distinct privileges.
+	  This library implements the user-space interfaces to the
+	  POSIX 1003.1e capabilities available in Linux kernels. These
+	  capabilities are a partitioning of the all powerful root
+	  privilege into a set of distinct privileges.
 
-	 http://sites.google.com/site/fullycapable/
+	  http://sites.google.com/site/fullycapable/
 
diff --git a/package/libdvdnav/Config.in b/package/libdvdnav/Config.in
index b3f6dd382b..63783827e6 100644
--- a/package/libdvdnav/Config.in
+++ b/package/libdvdnav/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBDVDNAV
 	bool "libdvdnav"
 	depends on BR2_LARGEFILE # libdvdread
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-        select BR2_PACKAGE_LIBDVDREAD
+	select BR2_PACKAGE_LIBDVDREAD
 	help
 	  libdvdnav is a library that allows easy use of sophisticated
 	  DVD navigation features such as DVD menus, multiangle
diff --git a/package/libeXosip2/Config.in b/package/libeXosip2/Config.in
index 3fe9c96974..4cb8218f20 100644
--- a/package/libeXosip2/Config.in
+++ b/package/libeXosip2/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBEXOSIP2
 	  This protocol is mainly to be used by VoIP telephony
 	  applications (endpoints or conference server) but might be
 	  also usefull for any application that wish to establish
-	  sessions like multiplayer games. 
+	  sessions like multiplayer games.
 	  eXosip is based in libosip.
 
 	  http://savannah.nongnu.org/projects/exosip/
diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in
index 7489a4704a..530cd450b4 100644
--- a/package/libgeotiff/Config.in
+++ b/package/libgeotiff/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBGEOTIFF
-       bool "libgeotiff"
-       select BR2_PACKAGE_TIFF
-       help
-         Libgeotiff is an open source library normally hosted on top of
-         libtiff for reading, and writing GeoTIFF information tags.
+	bool "libgeotiff"
+	select BR2_PACKAGE_TIFF
+	help
+	  Libgeotiff is an open source library normally hosted on top of
+	  libtiff for reading, and writing GeoTIFF information tags.
 
-         http://geotiff.osgeo.org
+	  http://geotiff.osgeo.org
diff --git a/package/libiscsi/Config.in b/package/libiscsi/Config.in
index f3fc29ee4f..3ec184a511 100644
--- a/package/libiscsi/Config.in
+++ b/package/libiscsi/Config.in
@@ -4,9 +4,9 @@ config BR2_PACKAGE_LIBISCSI
 	help
 	  Libiscsi is a client-side library to implement the iSCSI protocol
 	  that can be used to access resource of an iSCSI Target.
-	  
+
 	  The library is fully async with regards to iscsi commands and scsi
 	  tasks, but a sync layer is also provided for ease of use for simpler
 	  applications.
-	  
+
 	  https://github.com/sahlberg/libiscsi  (no proper homepage)
diff --git a/package/libmms/Config.in b/package/libmms/Config.in
index 8137d48313..50e98d886a 100644
--- a/package/libmms/Config.in
+++ b/package/libmms/Config.in
@@ -4,11 +4,11 @@ config BR2_PACKAGE_LIBMMS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
-          LibMMS is a common library for parsing mms:// and mmsh://
-          type network streams. These are commonly used to stream
-          Windows Media Video content over the web. LibMMS itself is
-          only for receiving MMS stream, it doesn't handle sending at
-          all.
+	  LibMMS is a common library for parsing mms:// and mmsh://
+	  type network streams. These are commonly used to stream
+	  Windows Media Video content over the web. LibMMS itself is
+	  only for receiving MMS stream, it doesn't handle sending at
+	  all.
 
 	  http://launchpad.net/libmms
 
diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
index 9ee1697c4f..e851011a53 100644
--- a/package/libseccomp/Config.in
+++ b/package/libseccomp/Config.in
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LIBSECCOMP
 	depends on BR2_i386 || BR2_x86_64
 	help
 	  High level interface to the Linux Kernel's seccomp filter
-	  
+
 	  The libseccomp library provides an easy to use, platform independent,
 	  interface to the Linux Kernel's syscall filtering mechanism: seccomp.
 	  The libseccomp API is designed to abstract away the underlying BPF
 	  based syscall filter language and present a more conventional
 	  function-call based filtering interface that should be familiar to,
 	  and easily adopted by application developers.
-	  
+
 	  http://sourceforge.net/projects/libseccomp/
diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index 9dc8cddab4..9d0492187b 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -60,4 +60,4 @@ comment "v4l2-dbg needs a toolchain w/ C++"
 endif
 
 comment "libv4l needs a toolchain w/ largefile, threads"
-        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libxml-parser-perl/Config.in b/package/libxml-parser-perl/Config.in
index e90e50ed8b..2a81086180 100644
--- a/package/libxml-parser-perl/Config.in
+++ b/package/libxml-parser-perl/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_LIBXML_PARSER_PERL
-       bool "libxml-parser-perl"
-       select BR2_PACKAGE_EXPAT
-       # Hide from configuration as we only support the host package
-       # for the moment
-       depends on BR2_HOST_ONLY
-       help
-         The Perl XML::Parser module.
+	bool "libxml-parser-perl"
+	select BR2_PACKAGE_EXPAT
+	# Hide from configuration as we only support the host package
+	# for the moment
+	depends on BR2_HOST_ONLY
+	help
+	  The Perl XML::Parser module.
 
-	 http://www.cpan.org/modules/by-module/XML/
+	  http://www.cpan.org/modules/by-module/XML/
 
diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 01fe90fa62..da37b1263c 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -32,19 +32,19 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
 	  the iwlwifi kernel driver.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8
-       bool "Libertas SD 8686 v8"
-       help
-         Firmware files (version 8) for the Marvell SD8686 module
+	bool "Libertas SD 8686 v8"
+	help
+	  Firmware files (version 8) for the Marvell SD8686 module
 
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9
-       bool "Libertas SD 8686 v9"
-       help
-         Firmware files (version 9) for the Marvell SD8686 module
+	bool "Libertas SD 8686 v9"
+	help
+	  Firmware files (version 9) for the Marvell SD8686 module
 
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688
-       bool "Libertas SD 8688"
-       help
-         Firmware files for the Marvell SD8688 module
+	bool "Libertas SD 8688"
+	help
+	  Firmware files for the Marvell SD8688 module
 
 config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787
 	bool "Marvell Wifi-Ex SD 8787"
diff --git a/package/lite/Config.in b/package/lite/Config.in
index 8840fe47bf..398b9e1152 100644
--- a/package/lite/Config.in
+++ b/package/lite/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LITE
 	bool "LiTE (toolbox engine)"
 	depends on BR2_PACKAGE_DIRECTFB
 	help
-	   LiTE stands for LiTE is a Toolbox Engine. 
+	   LiTE stands for LiTE is a Toolbox Engine.
 	   Its role is to facilitate the functions of DirectFB so that a
 	   toolbox could be written on top of DirectFB with less effort.
 	   As such LiTE has abstractions for the underlying graphics and
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index f1e341dd02..3429e11cda 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_LIBGLIB2
-	# libglib2 needs thread support and gettext which needs wchar support, and 
+	# libglib2 needs thread support and gettext which needs wchar support, and
 	# we also depends on util-linux which needs wchar
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/makedevs/Config.in b/package/makedevs/Config.in
index 4f8c38d0ae..923150dd6d 100644
--- a/package/makedevs/Config.in
+++ b/package/makedevs/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MAKEDEVS
-       bool "makedevs"
-       help
-         The makedevs utility allows to create a set of device files
-         according to a configuration file.
\ No newline at end of file
+	bool "makedevs"
+	help
+	  The makedevs utility allows to create a set of device files
+	  according to a configuration file.
diff --git a/package/memtester/Config.in b/package/memtester/Config.in
index dbd8ce17c8..b04dcd174b 100644
--- a/package/memtester/Config.in
+++ b/package/memtester/Config.in
@@ -7,4 +7,4 @@ config BR2_PACKAGE_MEMTESTER
 	  http://pyropus.ca/software/memtester/
 
 comment "memtester needs a toolchain w/ largefile"
-       depends on !BR2_LARGEFILE
+	depends on !BR2_LARGEFILE
diff --git a/package/monit/Config.in b/package/monit/Config.in
index 014e10b747..b5d4b52fb4 100644
--- a/package/monit/Config.in
+++ b/package/monit/Config.in
@@ -11,4 +11,4 @@ config BR2_PACKAGE_MONIT
 	  http://mmonit.com/monit/
 
 comment "monit needs a toolchain w/ threads"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mtools/Config.in.host b/package/mtools/Config.in.host
index d534b5ee7c..96f11d18ae 100644
--- a/package/mtools/Config.in.host
+++ b/package/mtools/Config.in.host
@@ -5,5 +5,5 @@ config BR2_PACKAGE_HOST_MTOOLS
 	  Unix without mounting them. It supports Win'95 style long file
 	  names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high
 	  density 3 1/2 disk).
-	  
+
 	  http://www.tux.org/pub/tux/mtools/
diff --git a/package/php/Config.in b/package/php/Config.in
index 6d15da56e3..46444a5600 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -12,16 +12,16 @@ if BR2_PACKAGE_PHP
 source "package/php/Config.ext"
 
 config BR2_PACKAGE_PHP_CLI
-       bool
+	bool
 
 config BR2_PACKAGE_PHP_CGI
-       bool
+	bool
 
 choice
-        prompt "Interface"
-        default BR2_PACKAGE_PHP_SAPI_CGI
-        help
-          Select the PHP interface(s).
+	prompt "Interface"
+	default BR2_PACKAGE_PHP_SAPI_CGI
+	help
+	  Select the PHP interface(s).
 
 config BR2_PACKAGE_PHP_SAPI_CGI
 	bool "CGI"
@@ -32,13 +32,13 @@ config BR2_PACKAGE_PHP_SAPI_CGI
 	  Common Gateway Interface
 
 config BR2_PACKAGE_PHP_SAPI_CLI
-        bool "CLI"
+	bool "CLI"
 	select BR2_PACKAGE_PHP_CLI
-        help
-          Command Line Interface
+	help
+	  Command Line Interface
 
 config BR2_PACKAGE_PHP_SAPI_CLI_CGI
-        bool "CGI and CLI"
+	bool "CGI and CLI"
 	# CGI uses fork()
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PHP_CLI
diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in
index 126dd0e78c..378119ab05 100644
--- a/package/python-pyparsing/Config.in
+++ b/package/python-pyparsing/Config.in
@@ -7,5 +7,5 @@ config BR2_PACKAGE_PYTHON_PYPARSING
 	  or the use of regular expressions. The pyparsing module provides
 	  a library of classes that client code uses to construct the grammar
 	  directly in Python code.
-	  
+
 	  http://pyparsing.wikispaces.com/
diff --git a/package/sawman/Config.in b/package/sawman/Config.in
index 8dd3ace2bf..2c53dc4550 100644
--- a/package/sawman/Config.in
+++ b/package/sawman/Config.in
@@ -2,11 +2,11 @@ config BR2_PACKAGE_SAWMAN
 	bool "SawMan (Window Manager)"
 	depends on BR2_PACKAGE_DIRECTFB
 	help
-	  SaWMan is a new window manager module for use with DirectFB. 
-          Its main difference to the default module is that it allows 
-          one process to be an application and window manager, 
-          implementing all kinds of diversity, while SaWMan is only the 
-          working horse.
+	  SaWMan is a new window manager module for use with DirectFB.
+	  Its main difference to the default module is that it allows
+	  one process to be an application and window manager,
+	  implementing all kinds of diversity, while SaWMan is only the
+	  working horse.
 
-	   See http://www.directfb.org/downloads/Extras/README.SaWMan
+	  See http://www.directfb.org/downloads/Extras/README.SaWMan
 
diff --git a/package/slirp/Config.in b/package/slirp/Config.in
index dedded37f2..ecd492dd11 100644
--- a/package/slirp/Config.in
+++ b/package/slirp/Config.in
@@ -6,12 +6,12 @@ config BR2_PACKAGE_SLIRP
 	  The Spice project deals with both the virtualized devices
 	  and the front-end. Interaction between front-end and
 	  back-end is done using VD-Interfaces.
-	  
+
 	  This package implements the slirp-part for Spice.
 	  Slirp emulates a PPP or SLIP connection over a normal terminal.
-	  
+
 	  http://www.spice-space.org/
-	  
+
 	  NOTE:
 	  This package has some history of a unique kind:
 	    - originally developped as 'slirp' by Danny Gasparovski, and
diff --git a/package/snowball-hdmiservice/Config.in b/package/snowball-hdmiservice/Config.in
index 0ea7c8120e..a22797f124 100644
--- a/package/snowball-hdmiservice/Config.in
+++ b/package/snowball-hdmiservice/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_SNOWBALL_HDMISERVICE
 	bool "snowball-hdmiservice"
-	depends on BR2_TOOLCHAIN_HAS_THREADS	
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  HDMI userspace control daemon
 
-	  This package contains the HDMI userspace control daemon for the 
+	  This package contains the HDMI userspace control daemon for the
 	  snowball board
-	  
+
 	  http://www.igloocommunity.org
diff --git a/package/speex/Config.in b/package/speex/Config.in
index 7e87566974..a4f0a9e127 100644
--- a/package/speex/Config.in
+++ b/package/speex/Config.in
@@ -9,9 +9,9 @@ config BR2_PACKAGE_SPEEX
 	  http://www.speex.org/
 
 config BR2_PACKAGE_SPEEX_ARM4
-       bool
-       default y
-       depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_strongarm || BR2_fa526)
+	bool
+	default y
+	depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_strongarm || BR2_fa526)
 
 config BR2_PACKAGE_SPEEX_ARM5E
 	default y
diff --git a/package/spice-protocol/Config.in b/package/spice-protocol/Config.in
index b35436177c..63b08aa090 100644
--- a/package/spice-protocol/Config.in
+++ b/package/spice-protocol/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_SPICE_PROTOCOL
 	  The Spice project deals with both the virtualized devices
 	  and the front-end. Interaction between front-end and
 	  back-end is done using VD-Interfaces.
-	  
+
 	  This package implements the protocol-part of Spice.
-	  
+
 	  http://www.spice-space.org/
diff --git a/package/spice/Config.in b/package/spice/Config.in
index e9fd639830..efcc5d7b80 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -19,9 +19,9 @@ config BR2_PACKAGE_SPICE
 	  The Spice project deals with both the virtualized devices
 	  and the front-end. Interaction between front-end and
 	  back-end is done using VD-Interfaces.
-	  
+
 	  This package implements the server-part of Spice.
-	  
+
 	  http://www.spice-space.org/
 
 if BR2_PACKAGE_SPICE
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 2f80eb1cfa..b0918567c0 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -11,29 +11,29 @@ config BR2_PACKAGE_SQUASHFS
 if BR2_PACKAGE_SQUASHFS
 
 config BR2_PACKAGE_SQUASHFS_GZIP
-       bool "gzip support"
-       default y
-       select BR2_PACKAGE_ZLIB
-       help
-         Support GZIP compression algorithm
+	bool "gzip support"
+	default y
+	select BR2_PACKAGE_ZLIB
+	help
+	  Support GZIP compression algorithm
 
 config BR2_PACKAGE_SQUASHFS_LZMA
-       bool "lzma support"
-       select BR2_PACKAGE_XZ
-       help
-         Support LZMA compression algorithm
+	bool "lzma support"
+	select BR2_PACKAGE_XZ
+	help
+	  Support LZMA compression algorithm
 
 config BR2_PACKAGE_SQUASHFS_LZO
-       bool "lzo support"
-       select BR2_PACKAGE_LZO
-       help
-         Support LZO compression algorithm
+	bool "lzo support"
+	select BR2_PACKAGE_LZO
+	help
+	  Support LZO compression algorithm
 
 config BR2_PACKAGE_SQUASHFS_XZ
-       bool "xz support"
-       select BR2_PACKAGE_XZ
-       help
-         Support XZ compression algorithm
+	bool "xz support"
+	select BR2_PACKAGE_XZ
+	help
+	  Support XZ compression algorithm
 
 endif
 
diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in
index ceba5030b4..c262799104 100644
--- a/package/sysstat/Config.in
+++ b/package/sysstat/Config.in
@@ -4,38 +4,38 @@ config BR2_PACKAGE_SYSSTAT
 	# Uses fork()
 	depends on BR2_USE_MMU
 	help
-          The sysstat utilities are a collection of performance
-          monitoring tools for Linux. These include sar, sadf, mpstat,
-          iostat, pidstat and sa tools.
+	  The sysstat utilities are a collection of performance
+	  monitoring tools for Linux. These include sar, sadf, mpstat,
+	  iostat, pidstat and sa tools.
 
-          Some Features :
+	  Some Features :
 
-           * Input / Output and transfer rate statistics (global, per
-             device, per partition, per network filesystem and per
-             Linux task / PID)
-           * CPU statistics (global, per CPU and per Linux task /
-             PID), including support for virtualization architectures
-           * Memory and swap space utilization statistics
-           * Virtual memory, paging and fault statistics
-           * Per-task (per-PID) memory and page fault statistics
-           * Global CPU and page fault statistics for tasks and all
-             their children
-           * Process creation activity
-           * Interrupt statistics (global, per CPU and per interrupt,
-             including potential APIC interrupt sources)
-           * Extensive network statistics: network interface activity
-             (number of packets and kB received and transmitted per
-             second, etc.) including failures from network devices;
-             network traffic statistics for IP, TCP, ICMP and UDP
-             protocols based on SNMPv2 standards; support for
-             IPv6-related protocols.
-           * NFS server and client activity
-           * Socket statistics
-           * Run queue and system load statistics
-           * Kernel internal tables utilization statistics
-           * System and per Linux task switching activity
-           * Swapping statistics
-           * TTY device activity
-           * Power management statistics
+	   * Input / Output and transfer rate statistics (global, per
+	     device, per partition, per network filesystem and per
+	     Linux task / PID)
+	   * CPU statistics (global, per CPU and per Linux task /
+	     PID), including support for virtualization architectures
+	   * Memory and swap space utilization statistics
+	   * Virtual memory, paging and fault statistics
+	   * Per-task (per-PID) memory and page fault statistics
+	   * Global CPU and page fault statistics for tasks and all
+	     their children
+	   * Process creation activity
+	   * Interrupt statistics (global, per CPU and per interrupt,
+	     including potential APIC interrupt sources)
+	   * Extensive network statistics: network interface activity
+	     (number of packets and kB received and transmitted per
+	     second, etc.) including failures from network devices;
+	     network traffic statistics for IP, TCP, ICMP and UDP
+	     protocols based on SNMPv2 standards; support for
+	     IPv6-related protocols.
+	   * NFS server and client activity
+	   * Socket statistics
+	   * Run queue and system load statistics
+	   * Kernel internal tables utilization statistics
+	   * System and per Linux task switching activity
+	   * Swapping statistics
+	   * TTY device activity
+	   * Power management statistics
 
 	  http://pagesperso-orange.fr/sebastien.godard/
diff --git a/package/taglib/Config.in b/package/taglib/Config.in
index 1edf582788..b96a9bfef6 100644
--- a/package/taglib/Config.in
+++ b/package/taglib/Config.in
@@ -4,9 +4,9 @@ config BR2_PACKAGE_TAGLIB
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  TagLib is a library for reading and editing the meta-data of
-          several popular audio formats. Currently it supports both ID3v1
-          and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and
-          Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files.
+	  several popular audio formats. Currently it supports both ID3v1
+	  and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and
+	  Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files.
 
 	  http://taglib.github.com
 
diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
index 9387b576fe..c34947139c 100644
--- a/package/ti-gfx/Config.in
+++ b/package/ti-gfx/Config.in
@@ -39,7 +39,7 @@ choice
 config BR2_PACKAGE_TI_GFX_ES3
 	bool "es3.x (OMAP35xx, AM35xx Rev 3.1+)"
 	help
-	 OMAP35xx, AM35xx Rev 3.1+
+	  OMAP35xx, AM35xx Rev 3.1+
 
 config BR2_PACKAGE_TI_GFX_ES5
 	bool "es5.x (AM37xx, DM37xx)"
diff --git a/package/tremor/Config.in b/package/tremor/Config.in
index 2e58e09857..61259261e6 100644
--- a/package/tremor/Config.in
+++ b/package/tremor/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_TREMOR
 	bool "tremor (fixed point vorbis decoder)"
 	help
 	  Tremor is a fixed point implementation of an Ogg Vorbis
-          decoder. It provides a decoding API similar to libvorbis,
-          but gives much better performance on systems without a
-          floating-point unit.
+	  decoder. It provides a decoding API similar to libvorbis,
+	  but gives much better performance on systems without a
+	  floating-point unit.
diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in
index c57014af3f..2157f9ce67 100644
--- a/package/usbredir/Config.in
+++ b/package/usbredir/Config.in
@@ -10,10 +10,10 @@ config BR2_PACKAGE_USBREDIR
 	  traffic over a network connection. It is also the name of the
 	  software package offering a parsing library, a usbredirhost library
 	  and several utilities implementing this protocol.
-	  
+
 	  Note: only the library is installed, not the utilities. Say 'y'
 	  below if you want the server too.
-	  
+
 	  http://www.spice-space.org/page/UsbRedir
 
 if BR2_PACKAGE_USBREDIR
@@ -23,7 +23,7 @@ config BR2_PACKAGE_USBREDIR_SERVER
 	help
 	  If you want to serve usbredir requests on your target, say 'y'
 	  here to have the usbredir server on the target.
-	  
+
 	  Note: the server is not required to use the library.
 
 endif
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index d56e631036..8c8fd7ab5c 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -154,7 +154,7 @@ config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP
 config BR2_PACKAGE_UTIL_LINUX_UUIDD
 	bool "uuidd"
 	help
-	 UUID generation daemon
+	  UUID generation daemon
 
 config BR2_PACKAGE_UTIL_LINUX_WALL
 	bool "wall"
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 94cf7c68ff..a534df9190 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -263,4 +263,4 @@ if BR2_PACKAGE_XORG7
 endif
 
 comment "X.org needs a toolchain w/ wchar, threads"
-        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
index cc159c9efe..88d3e6e82d 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/Config.in
+++ b/package/x11r7/xdriver_xf86-input-evdev/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
 	  Generic Linux input driver
 
 comment "xf86-input-evdev requires udev to be enabled"
-        depends on !BR2_PACKAGE_UDEV
+	depends on !BR2_PACKAGE_UDEV
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index aab9e808d3..5f0c2d811e 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -90,14 +90,14 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
 endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
-    bool "Null root cursor"
-    help
-        Don't display root cursor.
+	bool "Null root cursor"
+	help
+	  Don't display root cursor.
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
-    bool "Enable AIGLX Extension"
-    help
-        Enable/Use AIGLX extension.
+	bool "Enable AIGLX Extension"
+	help
+	  Enable/Use AIGLX extension.
 
 if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
 
@@ -131,8 +131,8 @@ endif
 comment "Optional Servers"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB
-    bool "Xvfb server"
-    help
-        Virtual frame buffer X server.
+	bool "Xvfb server"
+	help
+	  Virtual frame buffer X server.
 
 endif
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 0d5f494e10..02b6d0f223 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -46,56 +46,56 @@ config BR2_PACKAGE_XENOMAI_VERSION
 	  Kernel -> Linux Kernel Extensions menu.
 
 config BR2_PACKAGE_XENOMAI_TESTSUITE
-       bool "Install testsuite"
-       help
-         This option allows to install the Xenomai test programs.
+	bool "Install testsuite"
+	help
+	  This option allows to install the Xenomai test programs.
 
 config BR2_PACKAGE_XENOMAI_RTCAN
-       bool "RTCan utilities"
-       help
-         This option allows to install the Xenomai RT-CAN utilities.
+	bool "RTCan utilities"
+	help
+	  This option allows to install the Xenomai RT-CAN utilities.
 
 config BR2_PACKAGE_XENOMAI_ANALOGY
-       bool "Analogy libs and utils"
-       help
-         This option allows to install the Xenomai Analogy utilities
-         and libraries
+	bool "Analogy libs and utils"
+	help
+	  This option allows to install the Xenomai Analogy utilities
+	  and libraries
 
 config BR2_PACKAGE_XENOMAI_NATIVE_SKIN
-       bool "Native skin library"
-       default y
-       help
-	 This option allows to install the Native Xenomai skin
+	bool "Native skin library"
+	default y
+	help
+	  This option allows to install the Native Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_POSIX_SKIN
-       bool "POSIX skin library"
-       default y
-       help
-	 This option allows to install the POSIX Xenomai skin
+	bool "POSIX skin library"
+	default y
+	help
+	  This option allows to install the POSIX Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
-       bool "VX-Works skin library"
-       help
-	 This option allows to install the VX-Works Xenomai skin
+	bool "VX-Works skin library"
+	help
+	  This option allows to install the VX-Works Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_PSOS_SKIN
-       bool "PSOS skin library"
-       help
-	 This option allows to install the PSOS Xenomai skin
+	bool "PSOS skin library"
+	help
+	  This option allows to install the PSOS Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_RTAI_SKIN
-       bool "RTAI skin library"
-       help
-	 This option allows to install the RTAI Xenomai skin
+	bool "RTAI skin library"
+	help
+	  This option allows to install the RTAI Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_UITRON_SKIN
-       bool "uiTron skin library"
-       help
-	 This option allows to install the uiTron Xenomai skin
+	bool "uiTron skin library"
+	help
+	  This option allows to install the uiTron Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_VRTX_SKIN
-       bool "VRTX skin library"
-       help
-	 This option allows to install the VRTX Xenomai skin
+	bool "VRTX skin library"
+	help
+	  This option allows to install the VRTX Xenomai skin
 
 endif
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
index 0bd4199b88..2df72ad106 100644
--- a/package/xfsprogs/Config.in
+++ b/package/xfsprogs/Config.in
@@ -3,7 +3,7 @@ comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCL
 	depends on BR2_PACKAGE_XFSPROGS
 
 comment "xfsprogs needs a toolchain w/ largefile, wchar"
-        depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_XFSPROGS
 	bool "xfsprogs"
diff --git a/system/Config.in b/system/Config.in
index 266e709b4b..c8f2758638 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -1,16 +1,16 @@
 menu "System configuration"
 
 config BR2_TARGET_GENERIC_HOSTNAME
-       string "System hostname"
-       default "buildroot"
-       help
-         Select system hostname to be stored in /etc/hostname.
+	string "System hostname"
+	default "buildroot"
+	help
+	  Select system hostname to be stored in /etc/hostname.
 
 config BR2_TARGET_GENERIC_ISSUE
-       string "System banner"
-       default "Welcome to Buildroot"
-       help
-         Select system banner (/etc/issue) to be displayed at login.
+	string "System banner"
+	default "Welcome to Buildroot"
+	help
+	  Select system banner (/etc/issue) to be displayed at login.
 
 choice
 	bool "Passwords encoding"
@@ -200,8 +200,8 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD
 	  .config file or the build log may be distributed!
 
 config BR2_TARGET_GENERIC_GETTY
-       bool "Run a getty (login prompt) after boot"
-       default y
+	bool "Run a getty (login prompt) after boot"
+	default y
 
 if BR2_TARGET_GENERIC_GETTY
 menu "getty options"
@@ -218,7 +218,7 @@ choice
 	  Select a baudrate to use.
 
 config BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP
-       bool "keep kernel default"
+	bool "keep kernel default"
 config BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600
 	bool "9600"
 config BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 7f9b40adce..a7fcca741e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -478,14 +478,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 	  from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51,
 	  glibc 2.16, uClibc 0.9.30, gdb 7.4.50 and kernel headers
 	  3.5.4. It has support for the following variants:
-            - SH4A, glibc, little endian
-              Default.
-            - SH4A, glibc, big endian
-              Add -mb to BR2_TARGET_OPTIMIZATION
-            - SH4A, uClibc, little endian
-              Not usable in Buildroot yet.
-            - SH4A, uClibc, big endian
-              Not usable in Buildroot yet.
+	    - SH4A, glibc, little endian
+	      Default.
+	    - SH4A, glibc, big endian
+	      Add -mb to BR2_TARGET_OPTIMIZATION
+	    - SH4A, uClibc, little endian
+	      Not usable in Buildroot yet.
+	    - SH4A, uClibc, big endian
+	      Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	bool "Sourcery CodeBench SH 2012.03"
@@ -499,14 +499,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	  from Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53,
 	  glibc 2.15, uClibc 0.9.30, gdb 7.2.50 and kernel headers
 	  3.2.10. It has support for the following variants:
-            - SH4A, glibc, little endian
-              Default.
-            - SH4A, glibc, big endian
-              Add -mb to BR2_TARGET_OPTIMIZATION
-            - SH4A, uClibc, little endian
-              Not usable in Buildroot yet.
-            - SH4A, uClibc, big endian
-              Not usable in Buildroot yet.
+	    - SH4A, glibc, little endian
+	      Default.
+	    - SH4A, glibc, big endian
+	      Add -mb to BR2_TARGET_OPTIMIZATION
+	    - SH4A, uClibc, little endian
+	      Not usable in Buildroot yet.
+	    - SH4A, uClibc, big endian
+	      Not usable in Buildroot yet.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
@@ -993,28 +993,28 @@ config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
 # always installed. When a different binary format is used, we offer the option
 # of installing the FDPIC shared libraries.
 config BR2_BFIN_INSTALL_FDPIC_SHARED
-       bool "Install FDPIC shared libraries"
-       depends on BR2_bfin && !BR2_BINFMT_FDPIC
-       help
-         The Linux kernel supports running both FDPIC and FLAT applications
-         concurrently if the binary format specific libraries are installed
-         properly. This option allows developer to install FDPIC libraries
-         into a buildroot rootfs image built with binary format that is not
-         FDPIC.
+	bool "Install FDPIC shared libraries"
+	depends on BR2_bfin && !BR2_BINFMT_FDPIC
+	help
+	  The Linux kernel supports running both FDPIC and FLAT applications
+	  concurrently if the binary format specific libraries are installed
+	  properly. This option allows developer to install FDPIC libraries
+	  into a buildroot rootfs image built with binary format that is not
+	  FDPIC.
 
 # When the FLAT shared binary format is used, we force the installation
 # of the corresponding libraries. When a different binary format is
 # used, we offer the option of installing the FLAT shared libraries.
 config BR2_BFIN_INSTALL_FLAT_SHARED
-       bool "Install FLAT shared libraries" if !BR2_BINFMT_FLAT_SHARED
-       depends on BR2_bfin
-       default y if BR2_BINFMT_FLAT_SHARED
-       help
-         The Linux kernel supports running both FDPIC and FLAT applications
-         concurrently if the binary format specific libraries are installed
-         properly. This option allows developer to install FLAT libraries
-         into a buildroot rootfs image built with binary format that is not
-         shared FLAT.
+	bool "Install FLAT shared libraries" if !BR2_BINFMT_FLAT_SHARED
+	depends on BR2_bfin
+	default y if BR2_BINFMT_FLAT_SHARED
+	help
+	  The Linux kernel supports running both FDPIC and FLAT applications
+	  concurrently if the binary format specific libraries are installed
+	  properly. This option allows developer to install FLAT libraries
+	  into a buildroot rootfs image built with binary format that is not
+	  shared FLAT.
 
 endif # BR2_TOOLCHAIN_EXTERNAL
 

From 9b6c5e9c989f4a099efe8d438a47dd465bdcffc8 Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Mon, 11 Nov 2013 17:10:53 +0100
Subject: [PATCH 6713/6849] icu: Doesn't work on ARC yet

icu depends on __sync_sub_and_fetch and other atomic primitives that
don't exist in the ARC toolchain yet.

[Peter: adjust beecrypt/php comment dependency, don't mention atomic builtins]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/beecrypt/Config.in    | 4 +++-
 package/cppcms/Config.in      | 1 +
 package/icu/Config.in         | 2 ++
 package/php/Config.ext        | 2 ++
 package/qt5/qt5base/Config.in | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in
index caa6d1784a..033742c8f8 100644
--- a/package/beecrypt/Config.in
+++ b/package/beecrypt/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BEECRYPT
 	bool "beecrypt"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
+	select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+	       !BR2_arc
 	help
 	  Beecrypt is a general-purpose cryptography library.
 
@@ -11,4 +12,5 @@ comment "beecrypt needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 comment "beecrypt C++ support needs a toolchain w/ wchar"
+	depends on !BR2_arc
 	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index e13e076cd3..c5d64cedd0 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -23,6 +23,7 @@ config BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
 	bool "enable icu support"
 	depends on BR2_PACKAGE_CPPCMS
+	depends on !BR2_arc # icu -> atomic builtins
 	select BR2_PACKAGE_ICU
 	help
 	  Using ICU allows advanced localization features into CppCMS,
diff --git a/package/icu/Config.in b/package/icu/Config.in
index 585bffb7ad..b736b438d8 100644
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_ICU
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_arc # atomic builtins
 	help
 	  International Components for Unicode.
 
 	  http://site.icu-project.org/
 
 comment "icu needs a toolchain w/ C++, wchar, threads"
+	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/php/Config.ext b/package/php/Config.ext
index c0c85f1fe2..23d23064bc 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -172,10 +172,12 @@ config BR2_PACKAGE_PHP_EXT_INTL
 	select BR2_PACKAGE_ICU
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on !BR2_arc # icu -> atomic builtins
 	help
 	  Internationalization support
 
 comment "intl support needs a toolchain w/ C++, wchar"
+	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
 comment "Image processing"
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 83f17e35ea..e932e240a4 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -181,6 +181,7 @@ config BR2_PACKAGE_QT5BASE_DBUS
 config BR2_PACKAGE_QT5BASE_ICU
 	bool "Enable ICU support"
 	select BR2_PACKAGE_ICU
+	depends on !BR2_arc # icu -> atomic builtins
 	help
 	  This option enables ICU support in Qt5. This is for example
 	  needed for Qt5Webkit.

From 924b8739da72706afd543026b34030d3111322a9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Nov 2013 18:57:30 +0100
Subject: [PATCH 6714/6849] toolchain-buildroot: glibc and eglibc support is no
 longer experimental

The glibc and eglibc support has been introduced since a little bit of
time now, I believe we can remove the "experimental" statement next to
it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-buildroot/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 0ebbd6cf59..5111c746f9 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -16,7 +16,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	  http://uclibc.org
 
 config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
-	bool "eglibc (experimental)"
+	bool "eglibc"
 	depends on BR2_arm    || BR2_armeb    || BR2_aarch64 || \
 		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
 		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
@@ -36,7 +36,7 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 	  http://eglibc.org
 
 config BR2_TOOLCHAIN_BUILDROOT_GLIBC
-	bool "glibc (experimental)"
+	bool "glibc"
 	depends on BR2_arm    || BR2_armeb    || BR2_aarch64 || \
 		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
 		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \

From 819da04481d17ac00e1ca4843c05dffc3599a72e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Nov 2013 18:57:31 +0100
Subject: [PATCH 6715/6849] toolchain-buildroot: make sure glibc isn't chosen
 when BR2_PREFER_STATIC_LIB=y

(e)glibc doesn't support a fully statically linked userspace. Even a
basic program such as Busybox fails to do authentication due to glibc
loading some libraries dynamically. Therefore, we disable the
possibility of building a glibc toolchain when
BR2_PREFER_STATIC_LIB=y.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-buildroot/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 5111c746f9..8b37127d49 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -23,6 +23,7 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
 		   BR2_x86_64
 	depends on BR2_USE_MMU
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_USES_GLIBC
 	# our eglibc.mk enables RPC support
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -43,6 +44,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
 		   BR2_x86_64
 	select BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_PREFER_STATIC_LIB
 	# our glibc.mk enables RPC support
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
@@ -54,6 +56,9 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 
 	  http://www.gnu.org/software/libc/
 
+comment "(e)glibc only available with shared lib support"
+	depends on BR2_PREFER_STATIC_LIB
+
 endchoice
 
 config BR2_TOOLCHAIN_BUILDROOT_LIBC

From ed3f3e433f146a093750905a3c578ae2ec83c1c3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 11 Nov 2013 18:57:32 +0100
Subject: [PATCH 6716/6849] toolchain-external: make sure (e)glibc isn't chosen
 when BR2_PREFER_STATIC_LIB=y

(e)glibc doesn't support a fully statically linked userspace. Even a
basic program such as Busybox fails to do authentication due to glibc
loading some libraries dynamically. Therefore, we disable the
possibility of using a (e)glibc toolchain when
BR2_PREFER_STATIC_LIB=y.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-external/Config.in | 37 ++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index a7fcca741e..22e3fb2562 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -3,12 +3,16 @@ if BR2_TOOLCHAIN_EXTERNAL
 choice
 	prompt "Toolchain"
 
+comment "(e)glibc toolchains only available with shared lib support"
+	depends on BR2_PREFER_STATIC_LIB
+
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_09
 	bool "Linaro 2013.09"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABIHF
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -30,6 +34,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABIHF
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -51,6 +56,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABIHF
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -69,12 +75,14 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07
 comment "Linaro toolchains available for Cortex-A + EABIhf"
 	depends on BR2_arm
 	depends on BR2_GCC_TARGET_ARCH != "armv7-a" || !BR2_ARM_EABIHF
+	depends on !BR2_PREFER_STATIC_LIB
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 	bool "Sourcery CodeBench ARM 2013.05"
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABI
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -100,6 +108,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABI
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -125,6 +134,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 	depends on BR2_arm
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABI
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -148,6 +158,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
 comment "Sourcery CodeBench toolchains available for the EABI ABI"
 	depends on BR2_arm
 	depends on !BR2_ARM_EABI
+	depends on !BR2_PREFER_STATIC_LIB
 
 config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	bool "Arago ARMv7 2011.09"
@@ -156,6 +167,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
 	depends on BR2_GCC_TARGET_ARCH = "armv7-a"
 	depends on BR2_ARM_EABI
 	depends on BR2_ARM_CPU_HAS_VFPV3 || BR2_ARM_CPU_MAYBE_HAS_VFPV3
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -178,6 +190,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
 		BR2_GCC_TARGET_ARCH != "armv4" && \
 		BR2_GCC_TARGET_ARCH != "armv5t"
 	depends on BR2_ARM_EABI
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -193,6 +206,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_MIPS_NABI32
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -260,6 +274,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
 	depends on BR2_mips || BR2_mipsel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_MIPS_NABI32
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -327,6 +342,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 	depends on BR2_mips || BR2_mipsel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_MIPS_NABI32
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -391,11 +407,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
 
 comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64"
 	depends on BR2_MIPS_NABI32
+	depends on !BR2_PREFER_STATIC_LIB
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
 	bool "Sourcery CodeBench Nios-II 2013.05"
 	depends on BR2_nios2
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -409,6 +427,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
 	bool "Sourcery CodeBench PowerPC 2011.03"
 	depends on BR2_powerpc
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -439,6 +458,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	bool "Sourcery CodeBench PowerPC 2010.09"
 	depends on BR2_powerpc
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -469,6 +489,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
 	bool "Sourcery CodeBench SH 2012.09"
 	depends on BR2_sh4a || BR2_sh4aeb
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -491,6 +512,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
 	bool "Sourcery CodeBench SH 2012.03"
 	depends on BR2_sh4a || BR2_sh4aeb
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -512,6 +534,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh4a || BR2_sh4aeb
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -572,6 +595,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
 	bool "Sourcery CodeBench x86/x86_64 2012.09"
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -596,6 +620,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
 	bool "Sourcery CodeBench x86/x86_64 2012.03"
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -619,6 +644,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
 	bool "Sourcery CodeBench x86/x86_64 2011.09"
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
@@ -677,6 +703,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
 	bool "Xilinx Little Endian Microblaze GNU Tools 14.3"
 	depends on BR2_microblazeel
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -689,6 +716,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
 	bool "Xilinx Little Endian Microblaze GNU Tools v2"
 	depends on BR2_microblazeel
 	depends on BR2_HOSTARCH = "x86_64"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
@@ -699,6 +727,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -711,6 +740,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
 	bool "Xilinx Big Endian Microblaze GNU Tools"
 	depends on BR2_microblazebe
 	depends on BR2_HOSTARCH = "x86_64"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
@@ -721,6 +751,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_09
 	bool "Linaro AArch64 13.09"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -733,6 +764,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_08
 	bool "Linaro AArch64 13.08"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -745,6 +777,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_07
 	bool "Linaro AArch64 13.07"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -869,6 +902,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
 	bool "glibc/eglibc"
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	help
 	  Select this option if your external toolchain uses the GNU C
@@ -880,6 +914,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
 	  toolchain with eglibc configured to exclude key features may
 	  cause build failures to some packages.
 
+comment "(e)glibc only available with shared lib support"
+	depends on BR2_PREFER_STATIC_LIB
+
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL
 	bool "musl"
 	select BR2_TOOLCHAIN_EXTERNAL_MUSL

From 86a48c33b0f5cf7376c1fa1758ad1de5ec75380f Mon Sep 17 00:00:00 2001
From: Mischa Jonker <mischa.jonker@synopsys.com>
Date: Mon, 11 Nov 2013 15:36:36 +0100
Subject: [PATCH 6717/6849] gcc: don't patch gcc if there are no patches to
 apply

While the generic package handler checks for a directory with patches
before starting apply-patches.sh, this is not the case for gcc: the
script is called, even if there is no directory with patches. This results
into a build failure, as apply-patches exits with error code 1 if the
directory doesn't exist.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gcc/gcc.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 0c0cc99a61..41600ef6ec 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -49,7 +49,9 @@ endif
 endif
 
 define HOST_GCC_APPLY_PATCHES
-	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch
+	if test -d package/gcc/$(GCC_VERSION); then \
+	  support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch ; \
+	fi;
 	$(HOST_GCC_APPLY_POWERPC_PATCH)
 endef
 

From 439f48736b35e59262d97078ad904dbe3ef51f46 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 22:46:13 +0100
Subject: [PATCH 6718/6849] docs/about.html: we support internal (e)glibc
 toolchains as well now

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/about.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/about.html b/docs/about.html
index bf78db3383..ae409fc36c 100644
--- a/docs/about.html
+++ b/docs/about.html
@@ -45,8 +45,8 @@ <h3>Buildroot: making Embedded Linux easy</h3>
   filesystem image: JFFS2, UBIFS, tarballs, romfs, cramfs, squashfs
   and more.</li>
 
-  <li>Can generate an uClibc cross-compilation toolchain, or re-use
-  your existing glibc, eglibc or uClibc cross-compilation
+  <li>Can generate an (e)glibc or uClibc cross-compilation toolchain,
+  or re-use your existing glibc, eglibc or uClibc cross-compilation
   toolchain</li>
 
   <li>Has a <b>simple structure</b> that makes it easy to understand

From eb04ed8e87d025e2a6496fc1e99a0bc869470a72 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Nov 2013 22:56:28 +0100
Subject: [PATCH 6719/6849] docs/news.html: announce dev meeting report

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/news.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index cf814117c8..2560227be7 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,17 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>11 November 2013 -- Report from Buildroot Developers Meeting</b>
+
+    <p>A report from the recent
+    <a href="http://elinux.org/Buildroot:DeveloperDaysELCE2013">
+    Buildroot Developers Meeting</a> is now
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-November/082401.html">available</a>.</p>
+
+    <p>Once again, thanks to all the participants and to
+    <a href="http://www.imgtec.com/">Imagination Technologies</a>
+    for sponsoring the event.</p>
+
   <li><b>17 September 2013 -- 2013.08.1 released</b>
 
     <p>The 2013.08.1 bugfix release is out - Thanks to everyone

From b9a16cb4fc796cde72c16c757fcd80c6f0716268 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 12 Nov 2013 01:04:15 +0100
Subject: [PATCH 6720/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/CHANGES b/CHANGES
index f1b01a3e88..12c6b2bc14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,108 @@
+2013.11, Not yet released:
+
+	Architectures: Nios-II support, MIPS arch handling fixes
+
+	Defconfigs: cubieboard2, freescale i.MX 6sololite evk,
+	sabre-sd, wandboard added, rpi renamed to raspberrypi_defconfig
+
+	Toolchain: glibc support, upstream uClibc fixes, uClibc 0.9.31
+	for avr32, crosstool-ng backend removed, external musl
+	toolchain support, gcc 4.8.2, updated Linaro external
+	toolchains. Fortran and objective-C support deprecated,
+	mudflap support
+
+	Bootloaders: U-Boot: u-boot.imx support, version bumps
+
+	Linux: use kmod instead of module-init-tools
+
+	System: default to devtmpfs for /dev
+
+	Infrastructure: Make 3.82 fixes, locales generation fixes, CVS
+	download support, post-rsync hooks
+
+	Fs: u-boot image support for cpio
+
+	Updated/fixed packages: aircrack-ng, alsamixergui, apr,
+	apr-util, atk, automake, bellagio, berkeleydb, bind, binutils,
+	bison, boost, busybox, can-utils, ccache, ccid, cgilua,
+	chrony, cifs-utils, cjson, collectd, connman, conntrack-tools,
+	copas, cppcms, cppzmq, czmq, dash, dbus, dhcpcd, diffutils,
+	directfb, dmidecode, dnsmaqs, docker, dosfstools, dropbear,
+	dropwatch, ebtables, eglibc, elf2flt, empty, enchant, erlang,
+	ethtool, fbgrab, fbv, fdk-aac, feh, ffmpeg, file, findutils,
+	fltk, fmtools, freetype, gdk-pixbuf, gettext, git,
+	glib-networking, gmp, gnupg, gnutls, gpu-viv-bin-mx6q, gsl,
+	gstreamer, gstreamer1, gst1-plugins-{bad,base,good,ugly},
+	gtest, gutenprint, hplip, i2c-tools, icu, ifplugd,
+	imagemagick, iozone, iproute2, ipset, iptables, iw, jamvm,
+	jansson, jpeg-turbo, kismet, kmod, lcms2, libassuan, libcap,
+	libcap-ng, libcdaudio, libcec, libcue, libcurl, libdrm,
+	libedit, libevas, libevent, libfreefare, libfuse,
+	libgpg-error, libiconv, liblog4c-localtime, libmicrohttpd,
+	libmnl, libmodbus,
+	libnetfilter_{acct,conntrack,cthelper,cttimeout,log,queue},
+	libnfnetlink, libnl, libpng, libqmi, libqrencode, libroxml,
+	libsecret, libsigsegv, libsoup, libtirpc, libunwind, libusb,
+	libvpx, lighttpd, linphone, linux-pam, lmbench,
+	lockfile-progs, log4cxx, logrotate, logsurfer, ltp-testsuite,
+	ltrace, luacrypto, luaposix, lvm2, m4, matchbox-lib,
+	media-ctl, mediastreamer, minicom, minidlna, mongoose, monit,
+	mpc, mpd, mpg123, mplayer, mrouted, mtdev, mutt, mysql_client,
+	nano, ncftp, ndisc6, neard, neardal, neon, net-snmp, netatalk,
+	netcat, netkitbase, netperf, netplug, nettle, nfacct,
+	nfs-utils, ngircd, ngrep, noip, nuttcp, olsr, openssh, opkg,
+	oprofile, opus-tools, orc, ortp, pciutils, pcre, pcsc-lite,
+	perf, perl, perl-cross, php, picocom, pkgconf, polarssl,
+	poppler, pppd, proftpd, protobuf, proxychains-ng, pulseaudio,
+	pv, qemu, qt, qt5base, qt5webkit, quagga, radvd, redis,
+	rpi-{firmware,userland}, rrdtool, rsync, rtorrent, ruby,
+	samba, scons, screen, sdl_sound, ser2net, setserial,
+	smartmontools, socat, socketcand, sqlcipher, sqlite, squid,
+	stress, strongswan, stunnel, sudo, syslinux, systemd,
+	sysvinit, tcl, ti-gfx, time, transmission, tremor, tslib,
+	tvheadend, tzdata, uboot-tools, uclibc, udpcast, uemacs,
+	ulogd, usb_modeswitch{,_data}, util-linux, vala, valgrind,
+	vde2, vorbus-tools, vpnc, vsftpd, vtun, wayland, webkit, webp,
+	webrtc-audio-processing, weston, wget, wireshark, wsapi,
+	xavante, xdriver_xf86-video-geode, xenomai, xinetd,
+	xlib_libpthread-stubs, xl2tp, xmlstarlet, xserver_xorg-server,
+	xz, zeromq, zic, zmqpp
+
+	New packages: aiccu, autossh, bc, civetweb, cppdb, cryptsetup,
+	duma, eigen, harfbuzz, igmpproxy, iputils, jq, knock, kobs-ng,
+	lesstif, libcgroup, libsepol, libsoc, libssh2, luasec, luasql,
+	lxc, nut, ola, omniorb, openpowerlink, orbit, p910nd, psplash,
+	python-crc16, python-ipy, python-pyzmq, qt5sensors,
+	qt5serialport, qt5x11extras, snmppp, subversion, tcping,
+	trace-cmd, xscreensaver, zsh
+
+	Removed packages: module-init-tools
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#1138: Buildroot fails to build packages if BR2_GCC_SHARED_LIBGCC=y
+	#5408: qt build failure with Sourcery CodeBench ARM 2010.09
+	#5630: makefile error with toolchain helpers.mk
+	#5672: htop: remove X11 stuff
+	#5678: linux.mk: linux-menuconfig fails
+	#5696: python3 installation is too large, patches from python2 needed
+	#5978: Erlang does not build for arm in 2013.02-rc3
+	#6392: Extended ARM uImage kernel options
+	#6404: Buildroot's coreutils 'uname -p' reports 'Unknown' on recent..
+	#6428: util-linux libmount segfaults with patch from buildroot
+	#6452: eglibc from Linaro 2013.07 not copied to target correctly
+	#6566: PHP segfault when crosscompiled to mips64 - patch included
+	#6572: [PowerPC] Buildroot uses wrong external toolchain libraries..
+	#6578: udisks package broken
+	#6602: ebtables 64 bit kernel + 32 bit userland alignment error..
+	#6608: ebtables missing ethertypes - fix included
+	#6620: Sysvinit package missing killall5 and symlinks - patch included
+	#6632: CMake use host pkg-config
+	#6638: pkgconf doesn't download
+	#6644: "all" target doesn't work in out-of-tree builds
+	#6650: Segmentation fault when trying to build latest buildroot
+	#6668: iptables limit module alignment problem on mips64
+
 2013.08, Released August 31th, 2013:
 
 	Minor fixes.

From 71879a4e01b510bcaf27b0fcf78966c58819be18 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 11 Nov 2013 19:37:51 -0300
Subject: [PATCH 6721/6849] samba: security bump to version 3.6.20

Fixes CVE-2013-4475 and CVE-2013-4476.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/samba/samba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 76a46b80b5..834bac3b94 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA_VERSION = 3.6.19
+SAMBA_VERSION = 3.6.20
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES

From 68a48f02850bb9edf252feab4db90aff84a58849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Tue, 12 Nov 2013 09:02:02 +0200
Subject: [PATCH 6722/6849] qt5base: detect posix_fallocate() at configure time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes http://autobuild.buildroot.net/results/555278227680e90737e6dbe0a6dcc035507150aa/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ct-posix_fallocate-at-configure-time.patch | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch

diff --git a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
new file mode 100644
index 0000000000..7c456964f2
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
@@ -0,0 +1,154 @@
+From 6fe9c6b8a2815dc5d412c1714be0adaa9681a129 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
+Date: Mon, 11 Nov 2013 17:04:46 +0200
+Subject: [PATCH] Detect posix_fallocate at configure time
+
+Testing feature macros is not enough for uclibc. Fixes build of the built-in
+sqlite3 with uclibc <= 0.9.33.2. Later versions will have posix_fallocate().
+
+Change-Id: I918a52777ac63624635802221effc6b86fa2269c
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+Reported-Upstream: https://codereview.qt-project.org/70935
+---
+ .../unix/posix_fallocate/posix_fallocate.cpp       | 53 ++++++++++++++++++++++
+ .../unix/posix_fallocate/posix_fallocate.pro       |  2 +
+ configure                                          | 14 ++++++
+ src/3rdparty/sqlite/sqlite3.c                      |  7 ---
+ 4 files changed, 69 insertions(+), 7 deletions(-)
+ create mode 100644 config.tests/unix/posix_fallocate/posix_fallocate.cpp
+ create mode 100644 config.tests/unix/posix_fallocate/posix_fallocate.pro
+
+diff --git a/config.tests/unix/posix_fallocate/posix_fallocate.cpp b/config.tests/unix/posix_fallocate/posix_fallocate.cpp
+new file mode 100644
+index 0000000..5acd45a
+--- /dev/null
++++ b/config.tests/unix/posix_fallocate/posix_fallocate.cpp
+@@ -0,0 +1,53 @@
++/****************************************************************************
++**
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the config.tests of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include <fcntl.h>
++
++int main(int, char **)
++{
++#if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
++    return ::posix_fallocate(0, 0, 0);
++#else
++#  error posix_fallocate not available
++    // MIPSpro doesn't understand #error, so force a compiler error
++    force_compiler_error = true;
++#endif
++}
+diff --git a/config.tests/unix/posix_fallocate/posix_fallocate.pro b/config.tests/unix/posix_fallocate/posix_fallocate.pro
+new file mode 100644
+index 0000000..f01b15f
+--- /dev/null
++++ b/config.tests/unix/posix_fallocate/posix_fallocate.pro
+@@ -0,0 +1,2 @@
++SOURCES = posix_fallocate.cpp
++CONFIG -= qt dylib
+diff --git a/configure b/configure
+index 81e2a93..b67ed89 100755
+--- a/configure
++++ b/configure
+@@ -968,6 +968,7 @@ CFG_MIPS_DSP=auto
+ CFG_MIPS_DSPR2=auto
+ CFG_CLOCK_GETTIME=auto
+ CFG_CLOCK_MONOTONIC=auto
++CFG_POSIX_FALLOCATE=auto
+ CFG_MREMAP=auto
+ CFG_GETADDRINFO=auto
+ CFG_IPV6IFNAME=auto
+@@ -5653,6 +5654,15 @@ elif [ "$CFG_CLOCK_GETTIME" = "no" ]; then
+     CFG_CLOCK_MONOTONIC=no
+ fi
+ 
++# detect posix_fallocate
++if [ "$CFG_POSIX_FALLOCATE" = "auto" ]; then
++    if compileTest unix/posix_fallocate "posix_fallocate"; then
++        CFG_POSIX_FALLOCATE=yes
++    else
++        CFG_POSIX_FALLOCATE=no
++    fi
++fi
++
+ # detect mremap
+ if [ "$CFG_MREMAP" = "auto" ]; then
+     if compileTest unix/mremap "mremap"; then
+@@ -5970,6 +5980,9 @@ fi
+ if [ "$CFG_CLOCK_MONOTONIC" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG clock-monotonic"
+ fi
++if [ "$CFG_POSIX_FALLOCATE" = "yes" ]; then
++    QT_CONFIG="$QT_CONFIG posix_fallocate"
++fi
+ if [ "$CFG_MREMAP" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG mremap"
+ fi
+@@ -6449,6 +6462,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+ [ "$CFG_GLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
+ [ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
+ [ "$CFG_CLOCK_MONOTONIC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CLOCK_MONOTONIC"
++[ "$CFG_POSIX_FALLOCATE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_POSIX_FALLOCATE"
+ [ "$CFG_MREMAP" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
+ [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO"
+ [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME"
+diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c
+index 03fa649..1ae9be2 100644
+--- a/src/3rdparty/sqlite/sqlite3.c
++++ b/src/3rdparty/sqlite/sqlite3.c
+@@ -22935,13 +22935,6 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
+ */
+ #if SQLITE_OS_UNIX              /* This file is used on unix only */
+ 
+-/* Use posix_fallocate() if it is available
+-*/
+-#if !defined(HAVE_POSIX_FALLOCATE) \
+-      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
+-# define HAVE_POSIX_FALLOCATE 1
+-#endif
+-
+ /*
+ ** There are various methods for file locking used for concurrency
+ ** control:
+-- 
+1.8.4.rc3
+

From 3a740799a967592a262b7c9658e9a07f37bf8662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Tue, 12 Nov 2013 14:17:06 +0200
Subject: [PATCH 6723/6849] qt5base: add missing hunk in posix_fallocate patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...tect-posix_fallocate-at-configure-time.patch | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
index 7c456964f2..b0011f6c35 100644
--- a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
+++ b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
@@ -1,4 +1,4 @@
-From 6fe9c6b8a2815dc5d412c1714be0adaa9681a129 Mon Sep 17 00:00:00 2001
+From 46e632e2555b6b8abe6b8d8ad7d255e27c128e25 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
 Date: Mon, 11 Nov 2013 17:04:46 +0200
 Subject: [PATCH] Detect posix_fallocate at configure time
@@ -13,8 +13,9 @@ Reported-Upstream: https://codereview.qt-project.org/70935
  .../unix/posix_fallocate/posix_fallocate.cpp       | 53 ++++++++++++++++++++++
  .../unix/posix_fallocate/posix_fallocate.pro       |  2 +
  configure                                          | 14 ++++++
+ src/3rdparty/sqlite.pri                            |  1 +
  src/3rdparty/sqlite/sqlite3.c                      |  7 ---
- 4 files changed, 69 insertions(+), 7 deletions(-)
+ 5 files changed, 70 insertions(+), 7 deletions(-)
  create mode 100644 config.tests/unix/posix_fallocate/posix_fallocate.cpp
  create mode 100644 config.tests/unix/posix_fallocate/posix_fallocate.pro
 
@@ -131,6 +132,18 @@ index 81e2a93..b67ed89 100755
  [ "$CFG_MREMAP" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MREMAP"
  [ "$CFG_GETADDRINFO" = "no" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GETADDRINFO"
  [ "$CFG_IPV6IFNAME" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6IFNAME"
+diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri
+index 58d4ddd..072502c 100644
+--- a/src/3rdparty/sqlite.pri
++++ b/src/3rdparty/sqlite.pri
+@@ -1,6 +1,7 @@
+ CONFIG(release, debug|release):DEFINES *= NDEBUG
+ DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE
+ !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
++contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1
+ winrt: DEFINES += SQLITE_OS_WINRT
+ INCLUDEPATH +=  $$PWD/sqlite
+ SOURCES +=      $$PWD/sqlite/sqlite3.c
 diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c
 index 03fa649..1ae9be2 100644
 --- a/src/3rdparty/sqlite/sqlite3.c

From 7a7ec2dd3758a9832471db2ccf0f8bf7b08ad6dc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 12 Nov 2013 23:12:33 +0100
Subject: [PATCH 6724/6849] tstools: perform shared library linking step using
 gcc rather than ld

Fixes http://autobuild.buildroot.net/results/c45/c45bbdaff6cff56b5646add38032f29bb5520f16

Using ld directly breaks with certain toolchain configurations.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tstools/tstools.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/tstools/tstools.mk b/package/tstools/tstools.mk
index 377cc34f91..c9ac9f9c3b 100644
--- a/package/tstools/tstools.mk
+++ b/package/tstools/tstools.mk
@@ -10,7 +10,8 @@ TSTOOLS_SOURCE  = tstools-$(TSTOOLS_VERSION).tgz
 TSTOOLS_LICENSE = MPL v1.1
 
 define TSTOOLS_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) LD="$(TARGET_CC)" $(TARGET_MAKE_ENV) \
+		$(MAKE) -C $(@D)
 endef
 
 define TSTOOLS_INSTALL_TARGET_CMDS

From 003d38da3a716b0a19e980fb69a6cd55b353f4f3 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 12 Nov 2013 09:47:56 +0100
Subject: [PATCH 6725/6849] legal info: fix saving of host package licenses

Due to some tricky make behavior, the license texts of host packages that
did not provide an explicit HOST_FOO_LICENSE_FILES definition was not saved.
The problem is that it is not straightforward to use a variable
defined/updated inside an evaluated block as input to a foreach statement.
If you try to use $(FOO) then only the original value of FOO is used for
foreach, any update inside the block is ignored. However, if you use
$$(FOO), the entire contents of FOO (typically a list of items) is passed
as one item to foreach, thus causing just one iteration instead of several.

>From Arnout Vandecapelle's explanation:
Any variable referenced with a single $ inside the inner-generic-package
macro is expanded before the resulting contents are eval'ed. Therefore, it
is not possible to refer to variables defined by the inner-generic-package
macro from within a single-$ function call.

To fix the problem, one should defer the evaluation of the entire block
using double dollar signs.

Additionally, a few empty lines have been added to the legal-info-foo block
for clarity.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pkg-generic.mk | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 75fda02c3e..5111f31d92 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -502,26 +502,35 @@ $(2)_MANIFEST_TARBALL ?= not saved
 $(1)-legal-info:
 # Packages without a source are assumed to be part of Buildroot, skip them.
 ifneq ($(call qstrip,$$($(2)_SOURCE)),)
+
 ifeq ($$($(2)_SITE_METHOD),local)
 # Packages without a tarball: don't save and warn
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
+
 else ifneq ($$($(2)_OVERRIDE_SRCDIR),)
 	@$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
+
 else
 # Other packages
+
 # Save license files if defined
 ifeq ($(call qstrip,$$($(2)_LICENSE_FILES)),)
 	@$(call legal-license-nofiles,$$($(2)_RAWNAME))
 	@$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined))
 else
-	@$(foreach F,$($(2)_LICENSE_FILES),$(call legal-license-file,$$($(2)_RAWNAME),$(F),$$($(2)_DIR)/$(F))$$(sep))
-endif
+# Double dollar signs are really needed here, to catch host packages
+# without explicit HOST_FOO_LICENSE_FILES assignment, also in case they
+# have multiple license files.
+	@$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$(F),$$($(2)_DIR)/$$(F))$$(sep))
+endif # license files
+
 ifeq ($$($(2)_REDISTRIBUTE),YES)
 # Copy the source tarball (just hardlink if possible)
 	@cp -l $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR) 2>/dev/null || \
 	   cp $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR)
-endif
-endif
+endif # redistribute
+
+endif # other packages
 	@$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL))
 endif # ifneq ($(call qstrip,$$($(2)_SOURCE)),)
 	$(foreach hook,$($(2)_POST_LEGAL_INFO_HOOKS),$(call $(hook))$(sep))

From abce7ca6f2672ed5988596310e1165f04d2e5ad6 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 12 Nov 2013 23:49:47 +0100
Subject: [PATCH 6726/6849] Update for 2013.11-rc1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES            | 16 ++++++++--------
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     | 13 +++++++++++++
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 12c6b2bc14..b1edb5c92c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.11, Not yet released:
+2013.11-rc1, Released November 12th, 2013
 
 	Architectures: Nios-II support, MIPS arch handling fixes
 
@@ -60,13 +60,13 @@
 	smartmontools, socat, socketcand, sqlcipher, sqlite, squid,
 	stress, strongswan, stunnel, sudo, syslinux, systemd,
 	sysvinit, tcl, ti-gfx, time, transmission, tremor, tslib,
-	tvheadend, tzdata, uboot-tools, uclibc, udpcast, uemacs,
-	ulogd, usb_modeswitch{,_data}, util-linux, vala, valgrind,
-	vde2, vorbus-tools, vpnc, vsftpd, vtun, wayland, webkit, webp,
-	webrtc-audio-processing, weston, wget, wireshark, wsapi,
-	xavante, xdriver_xf86-video-geode, xenomai, xinetd,
-	xlib_libpthread-stubs, xl2tp, xmlstarlet, xserver_xorg-server,
-	xz, zeromq, zic, zmqpp
+	tstools, tvheadend, tzdata, uboot-tools, uclibc, udpcast,
+	uemacs, ulogd, usb_modeswitch{,_data}, util-linux, vala,
+	valgrind, vde2, vorbus-tools, vpnc, vsftpd, vtun, wayland,
+	webkit, webp, webrtc-audio-processing, weston, wget,
+	wireshark, wsapi, xavante, xdriver_xf86-video-geode, xenomai,
+	xinetd, xlib_libpthread-stubs, xl2tp, xmlstarlet,
+	xserver_xorg-server, xz, zeromq, zic, zmqpp
 
 	New packages: aiccu, autossh, bc, civetweb, cppdb, cryptsetup,
 	duma, eigen, harfbuzz, igmpproxy, iputils, jq, knock, kobs-ng,
diff --git a/Makefile b/Makefile
index 2f7db599bf..c7a0a6dbf0 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.11-git
+export BR2_VERSION:=2013.11-rc1
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 49c768d636..dfba889298 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -14,15 +14,15 @@ <h3>Download</h3>
 <a href="/downloads/buildroot-2013.08.1.tar.bz2">buildroot-2013.08.1.tar.bz2</a>.
 
 <p>
-<!--
-The latest release candidate is <b>2013.08-rc3</b>, which can be
+
+The latest release candidate is <b>2013.11-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.08-rc3.tar.gz">buildroot-2013.08-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2013.11-rc1tar.gz">buildroot-2013.11-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.08-rc3.tar.bz2">buildroot-2013.08-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc1.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index 2560227be7..91ed85da8e 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>12 November 2013 -- 2013.11-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11_rc1">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.11-rc1.tar.bz2">2013.11-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>11 November 2013 -- Report from Buildroot Developers Meeting</b>
 
     <p>A report from the recent

From 980220c645895e2f36d9da1f0f85a43ff706efad Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 13 Nov 2013 00:35:31 +0100
Subject: [PATCH 6727/6849] news.html: add 2013.11-rc1 annoucement link

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/news.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/news.html b/docs/news.html
index 91ed85da8e..eff98c2721 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,7 +10,8 @@ <h3>News</h3>
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11_rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-November/082514.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2013.11-rc1.tar.bz2">2013.11-rc1

From be930801a261930246fb7febea1b83eee9a661e1 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Wed, 13 Nov 2013 00:32:03 +0100
Subject: [PATCH 6728/6849] qt5base: fix posix_fallocate patch

Fixes:
	http://autobuild.buildroot.net/results/a07/a07c1825a5295a8343cd89f0901d9a74a764d804/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...qt5base-0007-detect-posix_fallocate-at-configure-time.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
index b0011f6c35..51cea04763 100644
--- a/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
+++ b/package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
@@ -136,12 +136,11 @@ diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri
 index 58d4ddd..072502c 100644
 --- a/src/3rdparty/sqlite.pri
 +++ b/src/3rdparty/sqlite.pri
-@@ -1,6 +1,7 @@
+@@ -1,5 +1,6 @@
  CONFIG(release, debug|release):DEFINES *= NDEBUG
  DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE
  !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
 +contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1
- winrt: DEFINES += SQLITE_OS_WINRT
  INCLUDEPATH +=  $$PWD/sqlite
  SOURCES +=      $$PWD/sqlite/sqlite3.c
 diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c

From b6ee44b6d497f412b5b6c6223462a8a687c82af7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 13 Nov 2013 09:07:41 +0100
Subject: [PATCH 6729/6849] libvncserver: fix build without pthread

Fixes http://autobuild.buildroot.net/results/761/7618028d0781269d2f6f0a14d814da456f207475/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libvncserver/libvncserver.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index fe48838fda..a96b8c5541 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -15,6 +15,10 @@ LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
 # only used for examples
 LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false
 
+ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+LIBVNCSERVER_CONF_OPT += --without-pthread
+endif
+
 ifneq ($(BR2_INET_IPV6),y)
 LIBVNCSERVER_CONF_OPT += --without-ipv6
 endif

From 68a1bd1e4f6d0a56030f5b52183b4620c0467ee9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 13 Nov 2013 14:46:16 +0100
Subject: [PATCH 6730/6849] libplayer: propagate mplayer arm variant
 dependencies

Fixes http://autobuild.buildroot.net/results/a91/a91647e9aca73611f3866a672c61d4d820ea1ce6/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libplayer/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index dad012d9c1..113f650b1e 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -16,6 +16,10 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER
 	depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64
 	# mplayer
 	depends on BR2_LARGEFILE
+	# mplayer
+	# Broken support for <ARMv5
+	depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \
+		|| BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm)
 	select BR2_PACKAGE_MPLAYER
 
 config BR2_PACKAGE_LIBPLAYER_GSTREAMER

From d3db5d863d47529da7ae21f68e4dd1cfb2d7e519 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 13 Nov 2013 19:12:39 +0100
Subject: [PATCH 6731/6849] docs: announce the upcoming Buildroot Developer Day

[Peter: drop 'the' before FOSDEM]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/news.html | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index eff98c2721..12082eb9ea 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,31 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>13 November 2013 -- Announcement of the next Buildroot Developer Days</b>
+
+    <p>The next <i>Buildroot Developer Days</i> meeting will take
+    place on Monday 3rd and Tuesday 4th February 2014 in Brussels,
+    Belgium - Just after
+    <a href="http://www.fosdem.org">FOSDEM</a> (February
+    1st/2nd). This two days meeting is mainly open to Buildroot
+    developers and contributors, or Buildroot users having a prior
+    experience with the tool. It will allow developers to work on
+    Buildroot and discuss current issues, the future directions, and
+    more.</p>
+
+    <p>In addition to the Buildroot event, we encourage embedded Linux
+    developers to propose talks for the Embedded and Mobile Developer
+    Room at FOSDEM. See
+    the <a href="https://lists.fosdem.org/pipermail/fosdem/2013-October/001870.html">CFP</a>.</p>
+
+    <p>We would like to thank our
+    sponsor <a href="http://www.google.com">Google</a> for sponsoring
+    the event by providing all the needed logistics.</p>
+
+    <p>For more details, see the
+    <a href="http://www.elinux.org/Buildroot:DeveloperDaysFOSDEM2014">wiki
+    page</a> dedicated to the meeting.</p>
+
   <li><b>12 November 2013 -- 2013.11-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

From 4de330fa2d6d1428a164a11dbe62e08200312022 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 13 Nov 2013 19:12:40 +0100
Subject: [PATCH 6732/6849] docs: add a page to thank our sponsors

Offer a little bit more visibility to the companies who sponsored us,
either by sponsoring the developer days, or development
boards. Hopefully this will encourage other companies to do the same :)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/header.html   |  1 +
 docs/sponsors.html | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 docs/sponsors.html

diff --git a/docs/header.html b/docs/header.html
index 9c615f41c9..b987d85e95 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -56,6 +56,7 @@
     <br><a href="/lists.html">Mailing Lists</a>
     <br><a href="http://autobuild.buildroot.org">Autobuilder</a>
     <br><a href="http://patchwork.buildroot.org">Patchwork</a>
+    <br><a href="/sponsors.html">Sponsors</a>
 
 </td>
 
diff --git a/docs/sponsors.html b/docs/sponsors.html
new file mode 100644
index 0000000000..a048b1db01
--- /dev/null
+++ b/docs/sponsors.html
@@ -0,0 +1,41 @@
+<!--#include file="header.html" -->
+
+<h3>Sponsors</h3>
+
+<p>Throughout its history, the Buildroot project has been sponsored by
+various companies, that we would like to thank below:</p>
+
+<ul>
+
+  <li><a href="http://www.google.com">Google</a>, for providing all
+  the logistics for the FOSDEM 2013 and FOSDEM 2014 Developer Days in
+  Brussels, Belgium.</li>
+
+  <li><a href="http://www.imgtec.com/">Imagination Technologies</a>,
+  for sponsoring the meeting room and dinner of the ELCE 2013
+  Developer Days in Edinburgh, UK.</li>
+
+  <li><a href="http://circuitco.com/">CircuitCo</a>, for sponsoring
+  several development boards for the Google Summer of Code 2013
+  project on Buildroot.</li>
+
+  <li><a href="http://boundarydevices.com/">BoundaryDevices</a>, for
+  sponsoring an i.MX6 development board for the Google Summer of Code
+  2013 project on Buildroot.</li>
+
+  <li><a href="http://www.fluendo.com/">Fluendo</a>, for sponsoring
+  the meeting room for the ELCE 2012 Developer Days in Barcelona
+  Spain.</li>
+
+  <li><a href="http://www.synopsys.com">Synopsys</a>, for sponsoring
+  the dinner for the ELCE 2012 Developer Days in Barcelona,
+  Spain.</li>
+
+  <li><a href="http://www.calao-systems.com/">Calao Systems</a>
+  and <a href="http://free-electrons.com/">Free Electrons</a> for
+  providing a meeting room and offering lunch for the ELCE 2009
+  Developer Days in Grenoble, France.</li>
+
+</ul>
+
+<!--#include file="footer.html" -->

From c09f5aaa0f342d0fbfc12a6d8f4b704fab55f400 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 13 Nov 2013 21:41:04 +0100
Subject: [PATCH 6733/6849] docs/download.html: Fix tarball typos

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/download.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index dfba889298..64d774d457 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -18,9 +18,9 @@ <h3>Download</h3>
 The latest release candidate is <b>2013.11-rc1</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.11-rc1tar.gz">buildroot-2013.11-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2013.11-rc1.tar.gz">buildroot-2013.11-rc1.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.11-rc1.tar.bz2">buildroot-2013.11-rc1.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from

From da558954b62ffcead52a102c1de26a6ca14a88aa Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Nov 2013 07:14:23 -0300
Subject: [PATCH 6734/6849] linux-headers: bump 3. {4, 10, 11}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linux-headers/Config.in.host | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 2bd8b02ddc..997dce4d19 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -83,14 +83,14 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.52"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.68"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.69"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.18"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.7"	if BR2_KERNEL_HEADERS_3_11
+	default "3.10.19"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.8"	if BR2_KERNEL_HEADERS_3_11
 	default "3.12"		if BR2_KERNEL_HEADERS_3_12
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From 58b82e5c40eb5db3a3ac03f6d4b83fd600d24be2 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Nov 2013 07:14:24 -0300
Subject: [PATCH 6735/6849] qemu/arm-versatile: roll back to 3.11.x kernel
 series

As pointed by Thomas P. kernel 3.12 oopses when loading/using the
emulated network.
Seems 3.12 broke versatile for qemu like in the past, only in a more
subtle way this time that escaped my automated qemu builds/tests.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../{linux-3.12.config => linux-3.11.config}              | 0
 configs/qemu_arm_versatile_defconfig                      | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.12.config => linux-3.11.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.12.config b/board/qemu/arm-versatile/linux-3.11.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.12.config
rename to board/qemu/arm-versatile/linux-3.11.config
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 88df6c821d..1c66696547 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.12 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.11.8"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.12.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.11.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 2b9bdcafa3d69bcc3d63d5d1d3d2ab692413b39d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Nov 2013 07:14:25 -0300
Subject: [PATCH 6736/6849] qemu/arm-nuri: bump to latest 3.10.x kernel version

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/qemu_arm_nuri_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 965f55de27..af3e79a069 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.18"
+BR2_DEFAULT_KERNEL_VERSION="3.10.19"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.19"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y

From 893108810b952777feca054a90c7ecfe7cad06e1 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Nov 2013 13:54:42 -0300
Subject: [PATCH 6737/6849] nano: fix build breakage with libmagic

As reported by Cassiano Martin in bug #6692 if host == target the nano
package can pick up the host libmagic and break.
So add a check to see if the file package is enabled and use it,
otherwise just disable libmagic support.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nano/nano.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 3707e7753d..4609f723cc 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -13,6 +13,12 @@ NANO_CONF_OPT = --without-slang
 NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false
 NANO_DEPENDENCIES = ncurses
 
+ifeq ($(BR2_PACKAGE_FILE),y)
+	NANO_DEPENDENCIES += file
+else
+	NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no
+endif
+
 ifeq ($(BR2_PACKAGE_NANO_TINY),y)
 	NANO_CONF_OPT += --enable-tiny
 endif

From 7bf866e7b2571183be20a230d28921b549919463 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Thu, 14 Nov 2013 21:50:46 +0100
Subject: [PATCH 6738/6849] sheevaplug_defconfig: bump kernel version, lock
 u-boot version

Stick to 3.11.x for now, as sheevaplug has moved to DT only in 3.12+.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/sheevaplug_defconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 70572d7999..4161766f25 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -13,17 +13,19 @@ BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
 
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.5.4"
+BR2_DEFAULT_KERNEL_VERSION="3.11.8"
 
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="sheevaplug"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
 BR2_TARGET_UBOOT_FORMAT_KWB=y
 # BR2_TARGET_UBOOT_NETWORK is not set
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8"
 BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
 BR2_LINUX_KERNEL_UIMAGE=y

From 0294aced5ebe9b1af7aca73ef8a9e3c5242d788a Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 15 Nov 2013 09:38:05 +0000
Subject: [PATCH 6739/6849] uclibc: patch 0.9.31 for avr32, to add
 __kernel_long_t and __kernel_ulong_t data types

As reported by Thomas Petazzoni, the uclibc 0.9.31 build fails for avr32:

In file included from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/kernel.h:4,
                 from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/netlink.h:4,
                 from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/rtnetlink.h:5,
                 from libc/inet/netlinkaccess.h:27,
                 from libc/inet/if_index.c:36:
/opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/sysinfo.h:8: error: expected specifier-qualifier-list before '__kernel_long_t'
make[1]: *** [libc/inet/if_index.os] Error 1
make[1]: Leaving directory `/opt/toolchain-build/build/uclibc-0.9.31.1'

The problem is reported at:

  https://lkml.org/lkml/2013/5/18/1

The offending kernel commit is:

  http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=ccdfcc398594

The fix is to patch uclibc 0.9.31 to add the missing kernel data types. The patch
will only be generated for avr32, since uclibc 0.9.31 is not available in Buildroot
for any other architecture.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...add-__kernel_long-and-__kernel_ulong.patch | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch

diff --git a/package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
new file mode 100644
index 0000000000..55cb0c57b4
--- /dev/null
+++ b/package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
@@ -0,0 +1,21 @@
+libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
+exported header files were updated to use these new types. Add the
+definitions for __kernel_long_t and __kernel_ulong_t to the relevant
+kernel_types.h headers.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h	2011-06-08 19:58:40.000000000 +0100
++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h	2013-11-15 08:01:09.209037851 +0000
+@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef unsigned short		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long		__kernel_loff_t;

From 93adbf9c00671cb5983cfa7b11b04d2d72ab344b Mon Sep 17 00:00:00 2001
From: Arnaud Aujon <arnaud.aujon@gmail.com>
Date: Sat, 16 Nov 2013 23:07:54 +0100
Subject: [PATCH 6740/6849] Fix typo in url

Fix a typo in squashfs site url

Signed-off-by: Arnaud Aujon <arnaud.aujon@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/squashfs/squashfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 04a26c6de6..bff308c2fd 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -6,7 +6,7 @@
 
 SQUASHFS_VERSION = 4.2
 SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
-SQUASHFS_SITE = http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
+SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
 
 # no libattr in BR
 SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0

From 1b5bd7a29694881cf85c653e2307d7b8464a15c9 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sat, 16 Nov 2013 09:58:13 +0000
Subject: [PATCH 6741/6849] wayland: disable on avr32

The epoll_create1, timerfd_create and timerfd_settime syscalls are not available
on avr32. Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/43b/43b3df5978782034279604abde8fe5d46c441344/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gstreamer1/gst1-plugins-bad/Config.in | 1 +
 package/wayland/Config.in                     | 2 ++
 package/weston/Config.in                      | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index d6f087d457..d028245124 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -358,6 +358,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	bool "wayland"
+	depends on !BR2_avr32 # wayland
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	select BR2_PACKAGE_WAYLAND
 	help
diff --git a/package/wayland/Config.in b/package/wayland/Config.in
index 260832fe79..c92f9ea1fc 100644
--- a/package/wayland/Config.in
+++ b/package/wayland/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WAYLAND
 	bool "wayland"
+	depends on !BR2_avr32 # no epoll_create1, timerfd_create or timerfd_settime
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBFFI
 	select BR2_PACKAGE_EXPAT
@@ -11,4 +12,5 @@ config BR2_PACKAGE_WAYLAND
 	  http://wayland.freedesktop.org/
 
 comment "wayland needs a toolchain w/ threads"
+	depends on !BR2_avr32
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/weston/Config.in b/package/weston/Config.in
index b7f8468fb9..247efc8883 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -1,4 +1,5 @@
 comment "weston needs udev and a toolchain w/ threads"
+	depends on !BR2_avr32
 	depends on !BR2_PACKAGE_UDEV || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_WESTON
@@ -11,6 +12,7 @@ config BR2_PACKAGE_WESTON
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_MTDEV
 	depends on BR2_PACKAGE_UDEV
+	depends on !BR2_avr32 # wayland
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG

From 21161a0889ae5b6c416773597bb24475340619bd Mon Sep 17 00:00:00 2001
From: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Date: Fri, 15 Nov 2013 14:28:56 -0600
Subject: [PATCH 6742/6849] pv: support ccache builds

When using ccache TARGET_CC is something like
    ccache gcc

This causes problems in the pv build which attempts to
override LD because the command ends up being
    make [...] LD=/tools/ccache /tools/gcc LDFLAGS="[...]

As a result, during the build phase it attempts to build
/tools/gcc which succeeds by doing nothing:
    make[1]: Nothing to be done for `/tools/gcc'.

and during the install phase you get the real build which
errors out on the LD error this snippet was attempting to
fix:
    ld -r -o src/library.o src/library/getopt.o \
        src/library/gettext.o
    ld: src/library/gettext.o: Relocations in generic ELF \
        (EM: 40)
    src/library/gettext.o: error adding symbols: File in \
        wrong format

Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pv/pv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 00502d3b4e..5f1a54bdad 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -17,7 +17,7 @@ PV_LICENSE_FILES = doc/COPYING
 # the correct one. By passing the below values for LD and LDFLAGS, we
 # ensure that 'gcc' is used to do these partial linking steps.
 PV_MAKE_OPT = \
-	LD=$(TARGET_CC) \
+	LD="$(TARGET_CC)" \
 	LDFLAGS="-Wl,-r -nostdlib"
 
 $(eval $(autotools-package))

From 157101726c3d490d20cae4f3ad61197330b06df1 Mon Sep 17 00:00:00 2001
From: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Date: Thu, 14 Nov 2013 16:57:58 -0600
Subject: [PATCH 6743/6849] wvstreams: remove tcl dependency support

As far as I can tell enabling tcl support has no affect on the actual
library.  Furthermore, wvstreams has been checking for/linking against
tcl 8.3 which has never been supported in buildroot as far as I can tell
(8.4 added in 2005).  That being said there is clearly no reason to keep
this around.

Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/wvstreams/wvstreams.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
index b4f7d89297..41155a740f 100644
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -22,7 +22,8 @@ WVSTREAMS_CONF_OPT += \
 	--with-openssl \
 	--with-zlib \
 	--without-pam \
-	--disable-warnings
+	--disable-warnings \
+	--without-tcl
 
 # needed for openssl detection when statically linking (as ssl needs lz)
 WVSTREAMS_CONF_ENV += LIBS=-lz
@@ -38,13 +39,6 @@ else
 	WVSTREAMS_CONF_OPT += --without-dbus
 endif
 
-ifeq ($(BR2_PACKAGE_TCL),y)
-	WVSTREAMS_DEPENDENCIES += tcl
-	WVSTREAMS_CONF_OPT += --with-tcl
-else
-	WVSTREAMS_CONF_OPT += --without-tcl
-endif
-
 ifeq ($(BR2_PACKAGE_QT),y)
 	WVSTREAMS_DEPENDENCIES += qt
 	WVSTREAMS_CONF_OPT += --with-qt

From 64dbd7d0364fc53c13ff87196cfef41a5f672484 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sun, 17 Nov 2013 23:20:27 +0100
Subject: [PATCH 6744/6849] gst1-plugins-bad: workaround directfb example build
 issue

Fixes http://autobuild.buildroot.net/results/ea8/ea84eb03ea4a5974cd25b2d1e15ab76bfd3e81dd/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../gst1-plugins-bad-fix-dfb-example.patch    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch
new file mode 100644
index 0000000000..b1f06ff38a
--- /dev/null
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-fix-dfb-example.patch
@@ -0,0 +1,33 @@
+[PATCH] work around dfb-example build issue
+
+directfb.h defines a number of macros which conflicts with gst/gst.h:
+
+In file included from ../sysroot/usr/include/gstreamer-1.0/gst/gst.h:50:0,
+                 from dfb-example.c:4:
+../sysroot/usr/include/gstreamer-1.0/gst/gstinfo.h:295:69: error: expected ‘)’ before ‘__attribute__’
+../sysroot/usr/include/gstreamer-1.0/gst/gstinfo.h:295:69: error: expected ‘,’ or ‘;’ before ‘)’ token
+
+As mentioned in the upstream bug report:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=685609
+
+A workaround is to simply swap the include order around.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ ext/directfb/dfb-example.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gst1-plugins-bad-1.2.1/ext/directfb/dfb-example.c
+===================================================================
+--- gst1-plugins-bad-1.2.1.orig/ext/directfb/dfb-example.c
++++ gst1-plugins-bad-1.2.1/ext/directfb/dfb-example.c
+@@ -1,7 +1,7 @@
+ 
+-#include <directfb.h>
+ #include <stdio.h>
+ #include <gst/gst.h>
++#include <directfb.h>
+ 
+ static IDirectFB *dfb = NULL;
+ static IDirectFBSurface *primary = NULL;

From f0c5c85215564e28138d928620310b57d610e6ce Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Mon, 18 Nov 2013 08:30:18 +0000
Subject: [PATCH 6745/6849] e2fsprogs: disable e4defrag on avr32

The fallocate syscall is not available on avr32. This is needed by the e4defrag
utility, so we disable this on avr32.

Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/dcb/dcb4e5c6981a9299a2eb18e325d4de621846afdb/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/e2fsprogs/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 16d367106c..1d1e174f45 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -49,6 +49,7 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
 
 config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
 	bool "e4defrag"
+	depends on !BR2_avr32 # fallocate not implemented
 
 config BR2_PACKAGE_E2FSPROGS_FILEFRAG
 	bool "filefrag"

From db4f6e237f1d560c94a23d40c99c5f084102e31b Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Mon, 18 Nov 2013 10:22:59 +0100
Subject: [PATCH 6746/6849] barebox: bump to version 2013.10.1

This is a bug fix release.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/barebox/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index a409acaca4..84db6ae73e 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2013.10.0"
+	bool "2013.10.1"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2013.10.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2013.10.1"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

From 25507b2a5afaa60daf58e1a76ff9be2a6da0f7f9 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Sun, 17 Nov 2013 11:47:42 +0000
Subject: [PATCH 6747/6849] uclibc: rename patches for version 0.9.31

Rename patches for uClibc version 0.9.31, for consistency with the general
patch naming scheme in Buildroot. Also remove a .avr32 extension from a patch;
this is not necessary, since uclibc 0.9.31 is unavailable on architectures
other than avr32.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...ersions.patch => uclibc-0001-add-bsd-endian-conversions.patch} | 0
 ...dd-inotify-init1.patch => uclibc-0002-add-inotify-init1.patch} | 0
 ...-add-sock-cloexec.patch => uclibc-0003-add-sock-cloexec.patch} | 0
 ...xport-strverscmp.patch => uclibc-0004-export-strverscmp.patch} | 0
 ....patch => uclibc-0005-fix-daylight-saving-time-handling.patch} | 0
 ...ocale-utf-8.patch => uclibc-0006-fix-error-locale-utf-8.patch} | 0
 ...s-errno-fix.patch => uclibc-0007-linuxthreads-errno-fix.patch} | 0
 ...32219.patch => uclibc-0008-more-workarounds-GCC-PR32219.patch} | 0
 .../{uClibc-0009-unshare.patch => uclibc-0009-unshare.patch}      | 0
 ...GCC-PR32219.patch => uclibc-0010-workaround-GCC-PR32219.patch} | 0
 ...ke-targets.patch => uclibc-0011-startfiles-Make-targets.patch} | 0
 ...s.patch.avr32 => uclibc-0012-netlinkaccess-header-types.patch} | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename package/uclibc/0.9.31.1/{uClibc-0001-add-bsd-endian-conversions.patch => uclibc-0001-add-bsd-endian-conversions.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0002-add-inotify-init1.patch => uclibc-0002-add-inotify-init1.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0003-add-sock-cloexec.patch => uclibc-0003-add-sock-cloexec.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0004-export-strverscmp.patch => uclibc-0004-export-strverscmp.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0005-fix-daylight-saving-time-handling.patch => uclibc-0005-fix-daylight-saving-time-handling.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0006-fix-error-locale-utf-8.patch => uclibc-0006-fix-error-locale-utf-8.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0007-linuxthreads-errno-fix.patch => uclibc-0007-linuxthreads-errno-fix.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0008-more-workarounds-GCC-PR32219.patch => uclibc-0008-more-workarounds-GCC-PR32219.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0009-unshare.patch => uclibc-0009-unshare.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0010-workaround-GCC-PR32219.patch => uclibc-0010-workaround-GCC-PR32219.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0011-startfiles-Make-targets.patch => uclibc-0011-startfiles-Make-targets.patch} (100%)
 rename package/uclibc/0.9.31.1/{uClibc-0012-netlinkaccess-header-types.patch.avr32 => uclibc-0012-netlinkaccess-header-types.patch} (100%)

diff --git a/package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch b/package/uclibc/0.9.31.1/uclibc-0001-add-bsd-endian-conversions.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0001-add-bsd-endian-conversions.patch
rename to package/uclibc/0.9.31.1/uclibc-0001-add-bsd-endian-conversions.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch b/package/uclibc/0.9.31.1/uclibc-0002-add-inotify-init1.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0002-add-inotify-init1.patch
rename to package/uclibc/0.9.31.1/uclibc-0002-add-inotify-init1.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch b/package/uclibc/0.9.31.1/uclibc-0003-add-sock-cloexec.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0003-add-sock-cloexec.patch
rename to package/uclibc/0.9.31.1/uclibc-0003-add-sock-cloexec.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch b/package/uclibc/0.9.31.1/uclibc-0004-export-strverscmp.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0004-export-strverscmp.patch
rename to package/uclibc/0.9.31.1/uclibc-0004-export-strverscmp.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch b/package/uclibc/0.9.31.1/uclibc-0005-fix-daylight-saving-time-handling.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0005-fix-daylight-saving-time-handling.patch
rename to package/uclibc/0.9.31.1/uclibc-0005-fix-daylight-saving-time-handling.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch b/package/uclibc/0.9.31.1/uclibc-0006-fix-error-locale-utf-8.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0006-fix-error-locale-utf-8.patch
rename to package/uclibc/0.9.31.1/uclibc-0006-fix-error-locale-utf-8.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch b/package/uclibc/0.9.31.1/uclibc-0007-linuxthreads-errno-fix.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0007-linuxthreads-errno-fix.patch
rename to package/uclibc/0.9.31.1/uclibc-0007-linuxthreads-errno-fix.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch b/package/uclibc/0.9.31.1/uclibc-0008-more-workarounds-GCC-PR32219.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0008-more-workarounds-GCC-PR32219.patch
rename to package/uclibc/0.9.31.1/uclibc-0008-more-workarounds-GCC-PR32219.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0009-unshare.patch b/package/uclibc/0.9.31.1/uclibc-0009-unshare.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0009-unshare.patch
rename to package/uclibc/0.9.31.1/uclibc-0009-unshare.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch b/package/uclibc/0.9.31.1/uclibc-0010-workaround-GCC-PR32219.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0010-workaround-GCC-PR32219.patch
rename to package/uclibc/0.9.31.1/uclibc-0010-workaround-GCC-PR32219.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch b/package/uclibc/0.9.31.1/uclibc-0011-startfiles-Make-targets.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0011-startfiles-Make-targets.patch
rename to package/uclibc/0.9.31.1/uclibc-0011-startfiles-Make-targets.patch
diff --git a/package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32 b/package/uclibc/0.9.31.1/uclibc-0012-netlinkaccess-header-types.patch
similarity index 100%
rename from package/uclibc/0.9.31.1/uClibc-0012-netlinkaccess-header-types.patch.avr32
rename to package/uclibc/0.9.31.1/uclibc-0012-netlinkaccess-header-types.patch

From dcefce4cf81f8a4ca8a5baadc51554e5fb3346a8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 14 Nov 2013 09:12:00 -0300
Subject: [PATCH 6748/6849] dhcp: adjust initscripts and misc details

Revamp initscripts see bug #3601
* Trim whitespace
* Check for installed binary (dhcp-relay)
* Check for installed config (dhcp-server)
* Check for proper variable setup from the script (both)
* Add "FAIL" message when startup fails (blind OK isn't accurate)
* Add start/stop messages to dhcp-relay

Switch bool to "dhcp (ISC)" to keep in line with package sorting.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dhcp/Config.in      |  2 +-
 package/dhcp/S80dhcp-relay  | 27 ++++++++++++---------------
 package/dhcp/S80dhcp-server | 21 +++++++--------------
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index e341485b16..7944edefc9 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_DHCP
-	bool "isc dhcp"
+	bool "dhcp (ISC)"
 	# fork()
 	depends on BR2_USE_MMU
 	help
diff --git a/package/dhcp/S80dhcp-relay b/package/dhcp/S80dhcp-relay
index c870ea7f5d..2a632ef950 100755
--- a/package/dhcp/S80dhcp-relay
+++ b/package/dhcp/S80dhcp-relay
@@ -3,7 +3,6 @@
 # $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $
 #
 
-
 # What servers should the DHCP relay forward requests to?
 # e.g: SERVERS="192.168.0.1"
 SERVERS=""
@@ -14,31 +13,29 @@ INTERFACES=""
 # Additional options that are passed to the DHCP relay daemon?
 OPTIONS=""
 
-
-
-
-# It is not safe to start if we don't have a default configuration...
-echo "/etc/init.d/dhcp-relay not yet configured! - Aborting..."
-exit 1;
-
-
+# Sanity checks
+test -f /usr/sbin/dhcrelay || exit 0
+test -n "$INTERFACES" || exit 0
+test -n "$SERVERS" || exit 0
 
 # Build command line for interfaces (will be passed to dhrelay below.)
 IFCMD=""
-if test "$INTERFACES" != ""; then
-	for I in $INTERFACES; do
-		IFCMD=${IFCMD}"-i "${I}" "
-	done
-fi
+for I in $INTERFACES; do
+	IFCMD=${IFCMD}"-i "${I}" "
+done
 
 DHCRELAYPID=/var/run/dhcrelay.pid
 
 case "$1" in
 	start)
+		echo -n "Starting DHCP relay: "
 		start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS
+		[ $? == 0 ] && echo "OK" || echo "FAIL"
 		;;
 	stop)
+		echo -n "Stopping DHCP relay: "
 		start-stop-daemon -K -x /usr/sbin/dhcrelay
+		[ $? == 0 ] && echo "OK" || echo "FAIL"
 		;;
 	restart | force-reload)
 		$0 stop
@@ -47,7 +44,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}"
-		exit 1 
+		exit 1
 esac
 
 exit 0
diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server
index 7c7f893a14..98bd3cc67e 100755
--- a/package/dhcp/S80dhcp-server
+++ b/package/dhcp/S80dhcp-server
@@ -3,34 +3,27 @@
 # $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
 #
 
-
-
 # On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
 #       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
 INTERFACES=""
 
-
-# It is not safe to start if we don't have a default configuration...
-echo "/etc/init.d/dhcp-server not yet configured! - Aborting..."
-exit 1;
-
-
-
+# Sanity checks
 test -f /usr/sbin/dhcpd || exit 0
-
+test -f /etc/dhcpd.conf || exit 0
+test -n "$INTERFACES" || exit 0
 
 case "$1" in
 	start)
 		echo -n "Starting DHCP server: "
 		test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
-		test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases	
+		test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
 		start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES
-		echo "."
+		[ $? == 0 ] && echo "OK" || echo "FAIL"
 		;;
 	stop)
 		echo -n "Stopping DHCP server: dhcpd3"
 		start-stop-daemon -K -x /usr/sbin/dhcpd
-		echo "."
+		[ $? == 0 ] && echo "OK" || echo "FAIL"
 		;;
 	restart | force-reload)
 		$0 stop
@@ -42,7 +35,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
-		exit 1 
+		exit 1
 esac
 
 exit 0

From 6b8aa1120594713c10301b6316fb40070d2fe59d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 18 Nov 2013 09:16:25 -0300
Subject: [PATCH 6749/6849] libcurl: add security patch for CVE-2013-4545

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../libcurl/libcurl-0001-CVE-2013-4545.patch  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/libcurl/libcurl-0001-CVE-2013-4545.patch

diff --git a/package/libcurl/libcurl-0001-CVE-2013-4545.patch b/package/libcurl/libcurl-0001-CVE-2013-4545.patch
new file mode 100644
index 0000000000..39545fec59
--- /dev/null
+++ b/package/libcurl/libcurl-0001-CVE-2013-4545.patch
@@ -0,0 +1,32 @@
+From 3c3622b66221d89509cffaa693fc7dcd5c5b96cf Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Wed, 2 Oct 2013 15:31:10 +0200
+Subject: [PATCH] OpenSSL: acknowledge CURLOPT_SSL_VERIFYHOST without
+ VERIFYPEER
+
+Setting only CURLOPT_SSL_VERIFYHOST without CURLOPT_SSL_VERIFYPEER set
+should still verify that the host name fields in the server certificate
+is fine or return failure.
+
+Bug: http://curl.haxx.se/mail/lib-2013-10/0002.html
+Reported-by: Ishan SinghLevett
+---
+ lib/ssluse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ssluse.c b/lib/ssluse.c
+index 4f3c1e1..9974ac8 100644
+--- a/lib/ssluse.c
++++ b/lib/ssluse.c
+@@ -2351,7 +2351,7 @@ ossl_connect_step3(struct connectdata *conn,
+    * operations.
+    */
+ 
+-  if(!data->set.ssl.verifypeer)
++  if(!data->set.ssl.verifypeer && !data->set.ssl.verifyhost)
+     (void)servercert(conn, connssl, FALSE);
+   else
+     retcode = servercert(conn, connssl, TRUE);
+-- 
+1.8.3.2
+

From f078a8bc9502b9a6bb1ed81ad15f4b6b0ba156db Mon Sep 17 00:00:00 2001
From: Arnaud Aujon <arnaud.aujon@gmail.com>
Date: Sun, 17 Nov 2013 16:34:00 +0100
Subject: [PATCH 6750/6849] ttcp: fix url, rename patch

 - fix download url : isn't available on previous ftp, use an other one
   instead
 - add version according to source code version
 - rename and clean patch according to patch policy

[Peter: adjust upstream URL in Config.in]
Signed-off-by: Arnaud Aujon <arnaud.aujon@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ttcp/Config.in                                   | 2 +-
 ...py.patch => ttcp-0001-replace-deprecated-bcopy.patch} | 9 ++++++---
 package/ttcp/ttcp.mk                                     | 5 ++---
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename package/ttcp/{ttcp-bcopy.patch => ttcp-0001-replace-deprecated-bcopy.patch} (64%)

diff --git a/package/ttcp/Config.in b/package/ttcp/Config.in
index 0262fc9e33..cf68eff33c 100644
--- a/package/ttcp/Config.in
+++ b/package/ttcp/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_TTCP
 	help
 	  Benchmarking tool for determining TCP and UDP performance.
 
-	  ftp://ftp.sunet.se/pub/network/monitoring/ttcp/
+	  ftp://ftp.sgi.com/sgi/src/ttcp/README
diff --git a/package/ttcp/ttcp-bcopy.patch b/package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch
similarity index 64%
rename from package/ttcp/ttcp-bcopy.patch
rename to package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch
index c98c88f360..fb8ef7ff45 100644
--- a/package/ttcp/ttcp-bcopy.patch
+++ b/package/ttcp/ttcp-0001-replace-deprecated-bcopy.patch
@@ -1,6 +1,9 @@
-diff -urN ttcp-0rig/ttcp.c ttcp/ttcp.c
---- ttcp-0rig/ttcp.c	1993-05-17 00:00:00.000000000 +0200
-+++ ttcp/ttcp.c	2009-01-14 23:46:19.000000000 +0100
+Replace deprecated bcopy call by using memmove instead.
+
+Index: b/ttcp.c
+===================================================================
+--- a/ttcp.c
++++ b/ttcp.c
 @@ -241,7 +241,7 @@
  			if ((addr=gethostbyname(host)) == NULL)
  				err("bad hostname");
diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index b65949de56..7667b20617 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-#
-TTCP_VERSION =
-TTCP_SITE    = http://ftp.sunet.se/pub/network/monitoring/ttcp
+TTCP_VERSION = 1.12
+TTCP_SITE    = ftp://ftp.sgi.com/sgi/src/ttcp/
 TTCP_SOURCE  = ttcp.c
 TTCP_LICENSE = public domain
 

From b87c05dc95d7167d867f2aad132a1e908090b1ae Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 18 Nov 2013 22:22:17 +0100
Subject: [PATCH 6751/6849] Update for 2013.11-rc2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES            | 22 ++++++++++++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 13 +++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index b1edb5c92c..93673c34b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,25 @@
+2013.11-rc2, Released November 18th, 2013
+
+	Fixes all over the tree.
+
+	Defconfigs: qemu_arm_versatile, qemu_arm_nuri, sheevaplug:
+	Adjust kernel versions.
+
+	Toolchain: avr32: fix for modern kernel headers
+
+	Bootloader: Barebox updated to 2013.10.1
+
+	Updated/fixed packages: dhcp, e2fsprogs, gst1-plugins-bad,
+	libcurl, libvncserver, nano, pc, qt5base, squashfs, ttcp,
+	wayland, wvstreams
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#3601: DHCPD S80dhcp-server startup script issues
+	#6320: Fix kernel compile issue if BR2_LINUX_KERNEL_CUSTOM_GIT_VERS..
+	#6416: Xenomai package, patch alternative
+	#6590: directfb-examples build failed whit linaro toolchain
+
 2013.11-rc1, Released November 12th, 2013
 
 	Architectures: Nios-II support, MIPS arch handling fixes
diff --git a/Makefile b/Makefile
index c7a0a6dbf0..685e0ee697 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.11-rc1
+export BR2_VERSION:=2013.11-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 64d774d457..55e3538b0f 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -15,12 +15,12 @@ <h3>Download</h3>
 
 <p>
 
-The latest release candidate is <b>2013.11-rc1</b>, which can be
+The latest release candidate is <b>2013.11-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.11-rc1.tar.gz">buildroot-2013.11-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2013.11-rc2.tar.gz">buildroot-2013.11-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.11-rc1.tar.bz2">buildroot-2013.11-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.11-rc2.tar.bz2">buildroot-2013.11-rc2.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 12082eb9ea..432c6348d9 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,19 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>18 November 2013 -- 2013.11-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11-rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.11-rc2.tar.bz2">2013.11-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>13 November 2013 -- Announcement of the next Buildroot Developer Days</b>
 
     <p>The next <i>Buildroot Developer Days</i> meeting will take

From b478d30a6d4eed00439cba627d7f45fe3e4025d4 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Tue, 19 Nov 2013 09:00:07 +0100
Subject: [PATCH 6752/6849] glibc/eglibc: remove reference to experimental from
 help text

Since 924b8739da we no longer declare glibc and eglibc support as
experimental, so it shouldn't be mentioned in the help text anymore.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 toolchain/toolchain-buildroot/Config.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 8b37127d49..81593f145b 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -31,9 +31,6 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
 	  This option selects eglibc as the C library for the
 	  cross-compilation toolchain.
 
-	  The eglibc support in the Buildroot toolchain backend is
-	  very recent, and therefore marked experimental.
-
 	  http://eglibc.org
 
 config BR2_TOOLCHAIN_BUILDROOT_GLIBC
@@ -51,9 +48,6 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 	  This option selects glibc as the C library for the
 	  cross-compilation toolchain.
 
-	  The glibc support in the Buildroot toolchain backend is
-	  very recent, and therefore marked experimental.
-
 	  http://www.gnu.org/software/libc/
 
 comment "(e)glibc only available with shared lib support"

From d0e1fae103d324ae262d9cea50946bf5cff19409 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 19 Nov 2013 12:15:49 +0100
Subject: [PATCH 6753/6849] vim: fix gettext check

Fixes http://autobuild.buildroot.net/results/21b5a910e6a27fa1cb12d0002ffed7e6ed9d6c83/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vim/vim-0001-fix-nls-check.patch | 120 +++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 package/vim/vim-0001-fix-nls-check.patch

diff --git a/package/vim/vim-0001-fix-nls-check.patch b/package/vim/vim-0001-fix-nls-check.patch
new file mode 100644
index 0000000000..ce5854932f
--- /dev/null
+++ b/package/vim/vim-0001-fix-nls-check.patch
@@ -0,0 +1,120 @@
+configure: use minimal LIBS during gettext check
+
+In some configurations, vim fails to link correctly with messages such as:
+edit.c:(.text+0x1614): undefined reference to `libintl_gettext'
+
+In particular, this has been seen by the buildroot autobuilds (see [1]) but
+has also been reported at [2] and [3].
+
+In the bad case, the configure script says:
+checking for NLS... gettext() works
+In the good case, it says:
+checking for NLS... gettext() works with -lintl
+
+In the bad case, the system has libelf, vim detects that and takes it along
+in $LIBS. Libelf needs libintl on this system, and so linking the test
+program with -lelf will automatically take -lintl too. This causes configure
+to think gettext() does not need libintl, while in reality it does.
+
+In the good case, libelf is not present and thus not used. The first
+configure test for gettext fails, and then configure retries with -lintl
+(which succeeds).
+
+Until now, there isn't really a problem. In both cases, you could link
+correctly. In the 'bad' case, libintl is implicitly taken through libelf, in
+the second case it is explicitly taken.
+
+The real problem occurs because configure also tests whether the linker
+supports --as-needed and uses it when possible, instead of the link.sh
+script. However, --as-needed seems to cause libintl NOT to be taken in the
+bad case, causing the undefined references to libintl_gettext.
+
+This patch changes the configure script so that the gettext check does not
+use additional libraries such as libelf. The test program is linked either
+with nothing, or with libintl alone. This will cause libintl to
+be added explicitly to LIBS, when needed.
+
+[1] http://autobuild.buildroot.net/results/21b5a910e6a27fa1cb12d0002ffed7e6ed9d6c83/
+[2] http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-November/243930.html
+[3] http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-May/234184.html
+
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+Upstream-status: accepted (http://article.gmane.org/gmane.editors.vim.devel/43528)
+
+---
+ src/auto/configure |  11 ++++++-----
+ src/configure.in   |  13 +++++++++----
+ 2 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/auto/configure b/src/auto/configure
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -12271,6 +12271,8 @@ fi
+   if test -f po/Makefile; then
+     have_gettext="no"
+     if test -n "$MSGFMT"; then
++      olibs=$LIBS
++      LIBS=""
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <libintl.h>
+@@ -12284,10 +12286,9 @@ gettext("Test");
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5
+-$as_echo "gettext() works" >&6; }; have_gettext="yes"
+-else
+-  olibs=$LIBS
+-	  LIBS="$LIBS -lintl"
++$as_echo "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs;
++else
++	  LIBS="-lintl"
+ 	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <libintl.h>
+@@ -12301,7 +12302,7 @@ gettext("Test");
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5
+-$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"
++$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"; LIBS="$olibs -lintl";
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5
+ $as_echo "gettext() doesn't work" >&6; };
+diff --git a/src/configure.in b/src/configure.in
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -3484,6 +3484,9 @@ if test "$MANDEF" = "man -s"; then
+ fi
+ 
+ dnl Check if gettext() is working and if it needs -lintl
++dnl We take care to base this on an empty LIBS: on some systems libelf would be
++dnl in LIBS and implicitly take along libintl. The final LIBS would then not
++dnl contain libintl, and the link step would fail due to -Wl,--as-needed.
+ AC_MSG_CHECKING(--disable-nls argument)
+ AC_ARG_ENABLE(nls,
+ 	[  --disable-nls           Don't support NLS (gettext()).], ,
+@@ -3502,16 +3505,18 @@ if test "$enable_nls" = "yes"; then
+   if test -f po/Makefile; then
+     have_gettext="no"
+     if test -n "$MSGFMT"; then
++      olibs=$LIBS
++      LIBS=""
+       AC_TRY_LINK(
+ 	[#include <libintl.h>],
+ 	[gettext("Test");],
+-	AC_MSG_RESULT([gettext() works]); have_gettext="yes",
+-	  olibs=$LIBS
+-	  LIBS="$LIBS -lintl"
++	AC_MSG_RESULT([gettext() works]); have_gettext="yes"; LIBS=$olibs,
++	  LIBS="-lintl"
+ 	  AC_TRY_LINK(
+ 	      [#include <libintl.h>],
+ 	      [gettext("Test");],
+-	      AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes",
++	      AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes";
++	      LIBS="$olibs -lintl",
+ 	      AC_MSG_RESULT([gettext() doesn't work]);
+ 	      LIBS=$olibs))
+     else

From 5a3c69afbd7fb3358a538508ad2e27f58f0769ba Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Tue, 19 Nov 2013 12:15:50 +0100
Subject: [PATCH 6754/6849] vim: add dependency to gettext if locale support is
 requested

Until now, if locale support was requested, vim would be built with NLS or
not depending on the build order. This patch now makes the dependency
explicit.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/vim/Config.in | 1 +
 package/vim/vim.mk    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/vim/Config.in b/package/vim/Config.in
index 891715eb57..0b2f4b5b85 100644
--- a/package/vim/Config.in
+++ b/package/vim/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_VIM
 	bool "vim"
 	depends on BR2_USE_MMU # uses fork()
 	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  VIM Text editor
 
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index ca8131c622..bd909cd702 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -8,7 +8,7 @@ VIM_SITE = https://vim.googlecode.com/hg
 VIM_SITE_METHOD = hg
 # 7.3 release patchlevel 762
 VIM_VERSION = 699f8d8f096d
-VIM_DEPENDENCIES = ncurses
+VIM_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 VIM_SUBDIR = src
 VIM_CONF_ENV = vim_cv_toupper_broken=no \
 		vim_cv_terminfo=yes \

From 5e827993e737a3330e18fe97d99ccfbd46be2239 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 19 Nov 2013 23:49:09 +0100
Subject: [PATCH 6755/6849] udisks: only build documentation if requested

Fixes http://autobuild.buildroot.org/results/b23/b234e63f92e6e5162dd5340624e32caa31b82a1a/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/udisks/udisks.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index 28855dd003..08e942ae19 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -20,7 +20,8 @@ UDISKS_DEPENDENCIES = 	\
 	lvm2		\
 	libatasmart
 
-UDISKS_CONF_OPT = --disable-remote-access
+UDISKS_CONF_OPT = --disable-remote-access \
+	$(if $(BR2_HAVE_DOCUMENTATION),,--disable-man-pages)
 
 ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
 UDISKS_CONF_OPT += --enable-lvm2

From 8b24c37e3a332509d91ac2a4edc983a5e0b57ab0 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Wed, 20 Nov 2013 00:50:48 +0100
Subject: [PATCH 6756/6849] pv: needs gettext if locale is enabled

Fixes http://autobuild.buildroot.net/results/c4f/c4f5ed916d85740ec00f5f34ded5de0195e5cd45/

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pv/Config.in | 1 +
 package/pv/pv.mk     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/pv/Config.in b/package/pv/Config.in
index 671f78e8c9..d7322963c0 100644
--- a/package/pv/Config.in
+++ b/package/pv/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PV
 	bool "pv"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Pipe Viewer - is a terminal-based tool for
 	  monitoring the progress of data through a
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 5f1a54bdad..ab5190a43a 100644
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -9,6 +9,7 @@ PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://www.ivarch.com/programs/sources
 PV_LICENSE = Artistic-2.0
 PV_LICENSE_FILES = doc/COPYING
+PV_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # While 'pv' uses autoconf, it does not use automake for its
 # makefiles. It uses $(LD) $(LDFLAGS) to achieve partial linking, but

From b1ac80dad83a15171b990e43ef4fc10a51a8772f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 20 Nov 2013 10:43:18 +0100
Subject: [PATCH 6757/6849] lxc: needs largefile support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

lxc_checkpoint.c: In function ‘main’:
lxc_checkpoint.c:128: error: ‘O_LARGEFILE’ undeclared (first use in this function)

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lxc/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index 3afb5b6b30..d082f7fb99 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LXC
 	select BR2_PACKAGE_LIBCAP
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # fork()
 	help
 	  Linux Containers (LXC), provides the ability to group and isolate
@@ -11,6 +12,6 @@ config BR2_PACKAGE_LXC
 
 	  http://lxc.sourceforge.net/
 
-comment "lxc needs a toolchain w/ IPv6, threads"
+comment "lxc needs a toolchain w/ IPv6, threads, largefile"
 	depends on BR2_USE_MMU
-	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE

From c4b78bda4b48db846b708657c8ee8310a4960a2c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 20 Nov 2013 11:19:07 +0100
Subject: [PATCH 6758/6849] lxc: needs timerfd, disable on avr32

Fixes http://autobuild.buildroot.net/results/79a/79ad9d7f5a9fb48e7d3210f0aee14638fde8f3e7/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lxc/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index d082f7fb99..39cd577e67 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LXC
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # fork()
+	depends on !BR2_avr32 # no timerfd
 	help
 	  Linux Containers (LXC), provides the ability to group and isolate
 	  of a set of processes in a jail by virtualizing and accounting the
@@ -14,4 +15,5 @@ config BR2_PACKAGE_LXC
 
 comment "lxc needs a toolchain w/ IPv6, threads, largefile"
 	depends on BR2_USE_MMU
+	depends on !BR2_avr32 # no timerfd
 	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE

From 831dad2d61bcf4daf25778bc41aef40d55e8ead6 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Wed, 20 Nov 2013 11:39:58 +0000
Subject: [PATCH 6759/6849] Mark MIPS I, II, III and IV as deprecated

Deprecate old MIPS ISAs since they are rarely used anymore and they cause
multiple build problems for new packages

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 arch/Config.in.mips | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index d70fd6366f..412120076b 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -1,8 +1,7 @@
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
-	default BR2_mips_3 if BR2_mips
-	default BR2_mips_1 if BR2_mipsel
+	default BR2_mips_32 if BR2_mips || BR2_mipsel
 	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
 	help
 	  Specific CPU variant to use
@@ -12,14 +11,16 @@ choice
 
 config BR2_mips_1
 	bool "mips I (generic)"
-	depends on !BR2_ARCH_IS_64
+	depends on !BR2_ARCH_IS_64 && BR2_DEPRECATED
 config BR2_mips_2
 	bool "mips II"
-	depends on !BR2_ARCH_IS_64
+	depends on !BR2_ARCH_IS_64 && BR2_DEPRECATED
 config BR2_mips_3
 	bool "mips III"
+	depends on BR2_DEPRECATED
 config BR2_mips_4
 	bool "mips IV"
+	depends on BR2_DEPRECATED
 config BR2_mips_32
 	bool "mips 32"
 	depends on !BR2_ARCH_IS_64

From 291d5f031d8b78d1d220e2459c5a2d8265678646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Wed, 20 Nov 2013 13:20:17 +0200
Subject: [PATCH 6760/6849] qt5base: add Fedora patch to fix powerpc build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes http://autobuild.buildroot.net/results/e57/e57dea01c3c1a4e3269580972890192c37d41697/

Patch submitted upstream:
https://codereview.qt-project.org/#change,71763

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../qt5base/qt5base-0008-qatomic-ppc.patch    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch

diff --git a/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch b/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch
new file mode 100644
index 0000000000..906b56a0d4
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch
@@ -0,0 +1,29 @@
+Set loadAcquire() as const
+
+Fixes powerpc build.
+
+Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+
+Index: qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
+===================================================================
+--- qtbase-opensource-src-5.1.1.orig/src/corelib/thread/qoldbasicatomic.h
++++ qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
+@@ -63,7 +63,7 @@ public:
+     // Atomic API, implemented in qatomic_XXX.h
+ 
+     int load() const { return _q_value; }
+-    int loadAcquire() { return _q_value; }
++    int loadAcquire() const { return _q_value; }
+     void store(int newValue) { _q_value = newValue; }
+     void storeRelease(int newValue) { _q_value = newValue; }
+ 
+@@ -107,7 +107,7 @@ public:
+     // Atomic API, implemented in qatomic_XXX.h
+ 
+     T *load() const { return _q_value; }
+-    T *loadAcquire() { return _q_value; }
++    T *loadAcquire() const { return _q_value; }
+     void store(T *newValue) { _q_value = newValue; }
+     void storeRelease(T *newValue) { _q_value = newValue; }
+ 

From ca5a1e1a47998d514d99a3c08678dd55784d069c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 20 Nov 2013 17:12:51 +0100
Subject: [PATCH 6761/6849] ruby: needs thread support

Fixes:

   http://autobuild.buildroot.org/results/7c6/7c6cc07e360aa998957a48e834b8cc086282d716/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ruby/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/ruby/Config.in b/package/ruby/Config.in
index 9b505019ce..0de756ba9c 100644
--- a/package/ruby/Config.in
+++ b/package/ruby/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_RUBY
 	bool "ruby"
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Object Oriented Scripting Language.
 
 	  http://www.ruby-lang.org/
 
-comment "ruby needs a toolchain w/ wchar"
-	depends on !BR2_USE_WCHAR
+comment "ruby needs a toolchain w/ wchar, threads"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

From 99bccdce43f905181f4d151cbb8214a748914262 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Thu, 21 Nov 2013 12:02:42 +0100
Subject: [PATCH 6762/6849] libsigsegv: fix aarch64 build

Fixes http://autobuild.buildroot.net/results/9821f4d44e65db1ec503acc89685ccfa7664fc32/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../libsigsegv-0002-fix-aarch64-build.patch   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch

diff --git a/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch b/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch
new file mode 100644
index 0000000000..a916e9d343
--- /dev/null
+++ b/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch
@@ -0,0 +1,31 @@
+From 2a2dac797cc41fb3f106c4186fc68d3e15b4ea47 Mon Sep 17 00:00:00 2001
+From: Will Newton <will.newton@linaro.org>
+Date: Tue, 28 May 2013 18:31:46 +0100
+Subject: [PATCH] m4/stack-direction.m4: AArch64 stack grows down.
+
+Submitted-Upstream: https://lists.gnu.org/archive/html/bug-libsigsegv/2013-05/msg00001.html
+
+ChangeLog:
+
+2013-05-28  Will Newton  <will.newton@linaro.org>
+
+	* m4/stack-direction.m4: AArch64 stack grows down.
+---
+ m4/stack-direction.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
+index 00e0445..890b77e 100644
+--- a/m4/stack-direction.m4
++++ b/m4/stack-direction.m4
+@@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
+     case "$host_cpu" in
+       dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h.
+       a29k | \
++      aarch64* | \
+       alpha* | \
+       arc | \
+       arm* | strongarm* | xscale* | \
+-- 
+1.8.1.4
+

From 92ba26b5eefd7da21a2a3e93589dda08d99a4c74 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Thu, 21 Nov 2013 13:39:25 +0100
Subject: [PATCH 6763/6849] squid: fix compilation due to missing include of
 time.h

Fixes http://autobuild.buildroot.net/results/b33/b33e1f41e50b6e7ac3e30806b9a617d451bc27b4/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../squid-03-missing-include-time_h.patch     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/squid/squid-03-missing-include-time_h.patch

diff --git a/package/squid/squid-03-missing-include-time_h.patch b/package/squid/squid-03-missing-include-time_h.patch
new file mode 100644
index 0000000000..18b3ab3b55
--- /dev/null
+++ b/package/squid/squid-03-missing-include-time_h.patch
@@ -0,0 +1,28 @@
+ipc/Kid.cc: add missing include of time.h
+
+Function time() comes from <time.h>, so add the necessary include.
+This fixes compilation on some configurations, for example
+http://autobuild.buildroot.net/results/b33/b33e1f41e50b6e7ac3e30806b9a617d451bc27b4/
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+Upstream-status: submitted (http://bugs.squid-cache.org/show_bug.cgi?id=3967)
+
+---
+ src/ipc/Kid.cc |  4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+
+diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc
+--- a/src/ipc/Kid.cc
++++ b/src/ipc/Kid.cc
+@@ -11,6 +11,10 @@
+ #include <sys/wait.h>
+ #endif
+ 
++#if HAVE_TIME_H
++#include <time.h>
++#endif
++
+ int TheProcessKind = pkOther;
+ 
+ Kid::Kid():

From af0813b09a9452784ae001ca54f415791b81d2c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20R=C3=A9billout?= <rebillout@syscom.ch>
Date: Thu, 21 Nov 2013 14:47:37 +0100
Subject: [PATCH 6764/6849] schifra: fix post install hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/schifra/schifra.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
index 730bd06ea3..4611e6732d 100644
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -27,7 +27,7 @@ define SCHIFRA_INSTALL_EXAMPLES
 	done
 endef
 
-SCHIFRA_POST_TARGET_INSTALL_HOOKS += SCHIFRA_INSTALL_EXAMPLES
+SCHIFRA_POST_INSTALL_TARGET_HOOKS += SCHIFRA_INSTALL_EXAMPLES
 endif
 
 define SCHIFRA_INSTALL_TARGET_CMDS

From d2b29f4fa94590e37f6c2047ad15306c9533d09b Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Fri, 22 Nov 2013 00:01:54 +0100
Subject: [PATCH 6765/6849] schifra: fix install examples

Fixes:

http://autobuild.buildroot.net/results/1ec/1ec3664f28492bf3da53dcbe8ceeb165bce8df6d/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/schifra/schifra.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
index 4611e6732d..673c1a672d 100644
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -23,7 +23,7 @@ endef
 define SCHIFRA_INSTALL_EXAMPLES
 	cd $(@D) && for i in `find -type f -name 'schifra_*' -executable` ; \
 	do \
-		$(INSTALL) -m 0755 -D $$i (TARGET_DIR)/usr/bin/$$i; \
+		$(INSTALL) -m 0755 -D $$i $(TARGET_DIR)/usr/bin/$$i; \
 	done
 endef
 

From 13b32ef3346b815f3860d130e35563e7aa4a2af3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Nov 2013 17:17:08 -0300
Subject: [PATCH 6766/6849] linux-headers: bump 3. {4, 10, 11, 12}.x stable
 versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/linux-headers/Config.in.host | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 997dce4d19..7ed476bf13 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -83,14 +83,14 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
 	default "3.2.52"	if BR2_KERNEL_HEADERS_3_2
 	default "3.3.8"		if BR2_KERNEL_HEADERS_3_3
-	default "3.4.69"	if BR2_KERNEL_HEADERS_3_4
+	default "3.4.70"	if BR2_KERNEL_HEADERS_3_4
 	default "3.5.7"		if BR2_KERNEL_HEADERS_3_5
 	default "3.6.11"	if BR2_KERNEL_HEADERS_3_6
 	default "3.7.10"	if BR2_KERNEL_HEADERS_3_7
 	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
-	default "3.10.19"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.8"	if BR2_KERNEL_HEADERS_3_11
-	default "3.12"		if BR2_KERNEL_HEADERS_3_12
+	default "3.10.20"	if BR2_KERNEL_HEADERS_3_10
+	default "3.11.9"	if BR2_KERNEL_HEADERS_3_11
+	default "3.12.1"	if BR2_KERNEL_HEADERS_3_12
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

From eaa8691798d0f9ddb14ed5877c08a8960760888b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Nov 2013 17:17:09 -0300
Subject: [PATCH 6767/6849] linux: bump to version 3.12.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 9b2025cc56..3061809606 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.12"
+	bool "3.12.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -87,7 +87,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.12" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.12.1" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION

From c3ab5bfafe02397c6415623f2c42412b540fb371 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Nov 2013 17:17:10 -0300
Subject: [PATCH 6768/6849] configs/qemu: bump relevant config versions

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/qemu_arm_nuri_defconfig         | 4 ++--
 configs/qemu_arm_versatile_defconfig    | 4 ++--
 configs/qemu_arm_vexpress_defconfig     | 4 ++--
 configs/qemu_microblazebe_mmu_defconfig | 2 +-
 configs/qemu_microblazeel_mmu_defconfig | 2 +-
 configs/qemu_mips64_malta_defconfig     | 4 ++--
 configs/qemu_mips_malta_defconfig       | 4 ++--
 configs/qemu_mipsel_malta_defconfig     | 4 ++--
 configs/qemu_ppc_g3beige_defconfig      | 4 ++--
 configs/qemu_ppc_mpc8544ds_defconfig    | 4 ++--
 configs/qemu_ppc_virtex_ml507_defconfig | 4 ++--
 configs/qemu_sparc_ss10_defconfig       | 4 ++--
 configs/qemu_x86_64_defconfig           | 4 ++--
 configs/qemu_x86_defconfig              | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index af3e79a069..f6fc12e47a 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.10 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.19"
+BR2_DEFAULT_KERNEL_VERSION="3.10.20"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.20"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index 1c66696547..c65b9c1242 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.11.8"
+BR2_DEFAULT_KERNEL_VERSION="3.11.9"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.9"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.11.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 324a8110fa..6b393ef009 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index 0a621b1be0..ea75624bc2 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.12.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index 51d58c6cf7..82c56c03dc 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.12.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index c0904b5ce9..e1295dd451 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index 6e2c60133b..8a6ed26918 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index ff640a10c9..9a4164db77 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index bd0bc0307b..f284b9be6f 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.12.config"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index 687b53707b..bf94c9fd26 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index a0dc674d7a..2d57338ce9 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -8,7 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Use soft float
 BR2_SOFT_FLOAT=y
@@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 67bffbdef6..0f11fa3cc1 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -8,11 +8,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 816cef1a9d..0e33da31fe 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -11,11 +11,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.12.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index ccccfa2981..05404ba4ad 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -12,11 +12,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12"
+BR2_DEFAULT_KERNEL_VERSION="3.12.1"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.12.config"

From c2f11a9286e69d946c147e4a2cc5a96642ac8f8c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 21 Nov 2013 08:17:53 -0300
Subject: [PATCH 6769/6849] mdadm: needs mmu

Fixes:
http://autobuild.buildroot.net/results/52c/52cc56df2aa278d92141918de74833d7e4fd3d47/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mdadm/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/mdadm/Config.in b/package/mdadm/Config.in
index c5133488f5..e0d606b5ec 100644
--- a/package/mdadm/Config.in
+++ b/package/mdadm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MDADM
 	bool "mdadm"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Utility for managing Linux Software RAID arrays.
 

From b14cab5864dd943d2be6232432ee2172b044cd67 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 21 Nov 2013 23:18:24 +0100
Subject: [PATCH 6770/6849] ola: add upstream patch to fix build on AArch64

Fixes:

   http://autobuild.buildroot.org/results/596/5967dfd4bd7c2b68e2911a98b9b84c8fe7adf0aa/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ola/ola-0001-fix-build-warning.patch | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/ola/ola-0001-fix-build-warning.patch

diff --git a/package/ola/ola-0001-fix-build-warning.patch b/package/ola/ola-0001-fix-build-warning.patch
new file mode 100644
index 0000000000..1fdb58fb28
--- /dev/null
+++ b/package/ola/ola-0001-fix-build-warning.patch
@@ -0,0 +1,27 @@
+Fix build on 64 bits architectures
+
+This upstream patch fixes a warning that, due to -Werror, is causing
+build failures on 64 bits architectures.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+commit ea375582b0bfee93d66608ffc807078ffc48e961
+Author: Simon Newton <nomis52@gmail.com>
+Date:   Wed Oct 30 09:23:49 2013 -0700
+
+    * Avoid a compiler warning
+
+diff --git a/plugins/e131/e131/PreamblePacker.cpp b/plugins/e131/e131/PreamblePacker.cpp
+index ef29e18..8dfcc72 100644
+--- a/plugins/e131/e131/PreamblePacker.cpp
++++ b/plugins/e131/e131/PreamblePacker.cpp
+@@ -77,7 +77,8 @@ const uint8_t *PreamblePacker::Pack(const PDUBlock<PDU> &pdu_block,
+   if (!m_send_buffer)
+     Init();
+ 
+-  unsigned int size = MAX_DATAGRAM_SIZE - sizeof(ACN_HEADER);
++  unsigned int size = MAX_DATAGRAM_SIZE -
++      static_cast<unsigned int>(sizeof(ACN_HEADER));
+   if (!pdu_block.Pack(m_send_buffer + sizeof(ACN_HEADER), &size)) {
+     OLA_WARN << "Failed to pack E1.31 PDU";
+     return NULL;

From 768f261be03c29829b653467bc3c1587b0e751dc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 21 Nov 2013 23:18:25 +0100
Subject: [PATCH 6771/6849] ola: disable -Werror

By default, the ola build uses -Werror, so let's pass
--disable-fatal-warnings to remove this and avoid build failures
caused by warnings.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ola/ola.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index 835ca4e504..bc7de24422 100644
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -19,7 +19,8 @@ OLA_CONF_OPT = \
 	--disable-tcmalloc \
 	--disable-unittests \
 	--disable-root-check \
-	--disable-java-libs
+	--disable-java-libs \
+	--disable-fatal-warnings
 
 # sets where to find python libs built for target and required by ola
 OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages

From 2b468f1bd94d824ee32d4351d548955ae1e05435 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Wed, 20 Nov 2013 18:29:45 +0100
Subject: [PATCH 6772/6849] libglib2: needs MMU support

Fixes http://autobuild.buildroot.net/results/2e0/2e032c6e44e10f2912935715741c3680a19b9b51/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/atk/Config.in                   |  2 ++
 package/bluez_utils/Config.in           |  2 +-
 package/bustle/Config.in                |  2 ++
 package/connman/Config.in               |  2 +-
 package/curlftpfs/Config.in             |  2 +-
 package/dbus-glib/Config.in             |  2 ++
 package/docker/Config.in                |  2 ++
 package/enchant/Config.in               |  2 ++
 package/gamin/Config.in                 |  2 ++
 package/gdk-pixbuf/Config.in            |  2 ++
 package/glib-networking/Config.in       |  2 ++
 package/glibmm/Config.in                |  2 ++
 package/gmpc/Config.in                  |  2 ++
 package/gob2/Config.in                  |  3 +--
 package/gstreamer/gstreamer/Config.in   |  2 ++
 package/gstreamer1/gstreamer1/Config.in |  2 ++
 package/gvfs/Config.in                  |  2 +-
 package/json-glib/Config.in             |  2 ++
 package/latencytop/Config.in            |  2 ++
 package/libglade/Config.in              |  2 ++
 package/libglib2/Config.in              |  2 ++
 package/libgtk2/Config.in               |  2 ++
 package/libmms/Config.in                |  2 ++
 package/libmpd/Config.in                |  2 ++
 package/libqmi/Config.in                |  2 ++
 package/librsvg/Config.in               |  2 ++
 package/libsecret/Config.in             |  2 ++
 package/libsoup/Config.in               |  2 ++
 package/lttng-babeltrace/Config.in      | 11 +++++------
 package/mpd/Config.in                   |  2 ++
 package/nbd/Config.in                   |  2 ++
 package/neard/Config.in                 |  2 +-
 package/ofono/Config.in                 |  2 +-
 package/pango/Config.in                 |  2 ++
 package/pkg-config/Config.in            |  2 ++
 package/polkit/Config.in                |  2 ++
 package/shared-mime-info/Config.in      |  2 ++
 package/sshfs/Config.in                 |  2 +-
 package/sysprof/Config.in               |  2 ++
 package/udev/Config.in                  |  2 ++
 package/vala/Config.in                  |  2 ++
 package/wireshark/Config.in             |  2 +-
 42 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/package/atk/Config.in b/package/atk/Config.in
index e2707e5fea..1120a94dd0 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -3,8 +3,10 @@ config BR2_PACKAGE_ATK
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
 
 comment "atk needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index b6f65b4258..e08e9be2db 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_BLUEZ_UTILS
 	depends on !BR2_avr32
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
-	depends on BR2_USE_MMU # dbus
+	depends on BR2_USE_MMU # dbus, libglib2
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	help
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
index 7be3222efa..f213da503e 100644
--- a/package/bustle/Config.in
+++ b/package/bustle/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_BUSTLE
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	depends on BR2_PACKAGE_DBUS # runtime
 	help
 	  Bustle is a better dbus-monitor! It records and draws
@@ -20,5 +21,6 @@ config BR2_PACKAGE_BUSTLE
 	  http://www.willthompson.co.uk/bustle/
 
 comment "bustle needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_DBUS
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 5345c80161..021e2112ae 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_CONNMAN
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
-	depends on BR2_USE_MMU # dbus
+	depends on BR2_USE_MMU # dbus, libglib2
 	help
 	  The Connection Manager (ConnMan) project provides a daemon for
 	  managing internet connections within embedded devices running
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index 90763d76fd..ec40f3da0c 100644
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_CURLFTPFS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
-	depends on BR2_USE_MMU # libfuse
+	depends on BR2_USE_MMU # libfuse, glib2
 	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
 	  CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index 4d13f774de..7fe0ac6606 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DBUS_GLIB
 	depends on BR2_PACKAGE_DBUS
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GLib bindings for D-Bus.
@@ -10,5 +11,6 @@ config BR2_PACKAGE_DBUS_GLIB
 	  http://www.freedesktop.org/software/dbus
 
 comment "dbus-glib needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_DBUS
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/docker/Config.in b/package/docker/Config.in
index b9feec028a..12f8432bc1 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_XLIB_LIBX11
 	help
@@ -11,5 +12,6 @@ config BR2_PACKAGE_DOCKER
 	  http://icculus.org/openbox/2/docker
 
 comment "docker needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 102fb02b82..86b2fade8f 100644
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_ENCHANT
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enchant is a spell-checking library that provides a consistent
@@ -11,5 +12,6 @@ config BR2_PACKAGE_ENCHANT
 	  http://www.abisource.com/projects/enchant/
 
 comment "enchant needs a toolchain w/ C++, threads, wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gamin/Config.in b/package/gamin/Config.in
index f5fb914363..c191be06f6 100644
--- a/package/gamin/Config.in
+++ b/package/gamin/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GAMIN
 	bool "gamin"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  the File Alteration Monitor
@@ -9,4 +10,5 @@ config BR2_PACKAGE_GAMIN
 	  http://www.gnome.org/~veillard/gamin/sources
 
 comment "gamin needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 9a14c3ac1a..44942ac4f6 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GDK_PIXBUF
 	bool "gdk-pixbuf"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
@@ -11,4 +12,5 @@ config BR2_PACKAGE_GDK_PIXBUF
 	  http://www.gtk.org/
 
 comment "gdk-pixbuf needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index 4c739849df..01d8552f80 100644
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -2,10 +2,12 @@ config BR2_PACKAGE_GLIB_NETWORKING
 	bool "glib-networking"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  Network-related GIO modules for glib.
 
 comment "glib-networking needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in
index bdfff16650..6ac4be5432 100644
--- a/package/glibmm/Config.in
+++ b/package/glibmm/Config.in
@@ -5,11 +5,13 @@ config BR2_PACKAGE_GLIBMM
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	help
 	  The GLibmm package is a set of C++ bindings for GLib.
 
 	  http://www.gtkmm.org/
 
 comment "glibmm needs a toolchain w/ C++, wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 0d5f0dc816..43bc642d74 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_GMPC
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -21,5 +22,6 @@ config BR2_PACKAGE_GMPC
 	  http://gmpcwiki.sarine.nl/index.php?title=GMPC
 
 comment "gmpc needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index 8e930fa549..092d51bcbf 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_GOB2
 	bool "gob2"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	# m4 uses fork(), so does bison then
-	depends on BR2_USE_MMU
+	depends on BR2_USE_MMU # bison, glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_FLEX
 	select BR2_PACKAGE_BISON
diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
index bd6022e9a2..9a83a9688e 100644
--- a/package/gstreamer/gstreamer/Config.in
+++ b/package/gstreamer/gstreamer/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GSTREAMER
 	bool "gstreamer"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GStreamer is an open source multimedia framework.
@@ -29,4 +30,5 @@ config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
 	  the launch-time for a GStreamer application.
 
 comment "gstreamer needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in
index ad7079cc11..8c8f165357 100644
--- a/package/gstreamer1/gstreamer1/Config.in
+++ b/package/gstreamer1/gstreamer1/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GSTREAMER1
 	bool "gstreamer1"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GStreamer is an open source multimedia framework. This 1.x version of
@@ -50,4 +51,5 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
 endif
 
 comment "gstreamer1 needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 71e8497199..f3a04f5f3d 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_GVFS
 	bool "gvfs"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_USE_MMU # dbus
+	depends on BR2_USE_MMU # dbus, glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_DBUS
diff --git a/package/json-glib/Config.in b/package/json-glib/Config.in
index 09ac4e3d52..ea15295b38 100644
--- a/package/json-glib/Config.in
+++ b/package/json-glib/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_JSON_GLIB
 	bool "json-glib"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
@@ -12,4 +13,5 @@ config BR2_PACKAGE_JSON_GLIB
 	  https://live.gnome.org/JsonGlib/
 
 comment "json-glib needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/latencytop/Config.in b/package/latencytop/Config.in
index 29fbcc8da9..b54ef052b4 100644
--- a/package/latencytop/Config.in
+++ b/package/latencytop/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LATENCYTOP
 	bool "latencytop"
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBGLIB2
 	help
@@ -21,4 +22,5 @@ config BR2_PACKAGE_LATENCYTOP
 	  http://www.latencytop.org
 
 comment "latencytop needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index 774c7659ec..e269a07548 100644
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLADE
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_ATK
 	select BR2_PACKAGE_LIBXML2
@@ -14,5 +15,6 @@ config BR2_PACKAGE_LIBGLADE
 	  http://ftp.gnome.org/pub/GNOME/sources/libglade/
 
 comment "libglade needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_LIBGTK2
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 3590d72ef3..db6a950661 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -6,10 +6,12 @@ config BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_USE_WCHAR # gettext
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Low-level core library that forms the basis of GTK+ and GNOME.
 
 	  http://www.gtk.org/
 
 comment "libglib2 needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 1dc8f2e3b3..5239c25ddf 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -15,6 +15,7 @@ config BR2_PACKAGE_LIBGTK2
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	help
 	  The GTK+ version 2 graphical user interface library
@@ -32,6 +33,7 @@ config BR2_PACKAGE_LIBGTK2_DEMO
 endif
 
 comment "libgtk2 needs a toolchain w/ wchar, threads, C++"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmms/Config.in b/package/libmms/Config.in
index 50e98d886a..11df6e5142 100644
--- a/package/libmms/Config.in
+++ b/package/libmms/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBMMS
 	bool "libmms"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  LibMMS is a common library for parsing mms:// and mmsh://
@@ -13,4 +14,5 @@ config BR2_PACKAGE_LIBMMS
 	  http://launchpad.net/libmms
 
 comment "libmms needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libmpd/Config.in b/package/libmpd/Config.in
index 83bb6cd89b..1e3b860063 100644
--- a/package/libmpd/Config.in
+++ b/package/libmpd/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBMPD
 	bool "libmpd"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
@@ -12,4 +13,5 @@ config BR2_PACKAGE_LIBMPD
 	  http://gmpcwiki.sarine.nl/index.php?title=Libmpd
 
 comment "libmpd needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in
index fc6b48d7f6..a0e896cce8 100644
--- a/package/libqmi/Config.in
+++ b/package/libqmi/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBQMI
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	help
 	  libqmi is a glib-based library for talking to WWAN modems and devices
 	  which speak the Qualcomm MSM Interface (QMI) protocol.
@@ -10,4 +11,5 @@ config BR2_PACKAGE_LIBQMI
 	  http://www.freedesktop.org/wiki/Software/libqmi/
 
 comment "libqmi needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index 13f6d06119..5dd4c58124 100644
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # pango
 	help
 	  The rsvg library is an efficient renderer for Scalable
@@ -16,4 +17,5 @@ config BR2_PACKAGE_LIBRSVG
 	  http://librsvg.sourceforge.net/
 
 comment "librsvg needs a toolchain w/ wchar, threads, C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libsecret/Config.in b/package/libsecret/Config.in
index b4557822fc..70f1fe7eb9 100644
--- a/package/libsecret/Config.in
+++ b/package/libsecret/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBSECRET
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # gettext dep in libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	help
 	  libsecret is a library for storing and retrieving passwords and other
 	  secrets. It communicates with the "Secret Service" using DBus.
@@ -12,4 +13,5 @@ config BR2_PACKAGE_LIBSECRET
 	  https://wiki.gnome.org/Libsecret
 
 comment "libsecret needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 1eec1355d2..874f50cc1a 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
 	depends on BR2_USE_WCHAR # glib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_SQLITE
@@ -24,4 +25,5 @@ config BR2_PACKAGE_LIBSOUP_SSL
 endif
 
 comment "libsoup needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in
index 3429e11cda..cb857c80be 100644
--- a/package/lttng-babeltrace/Config.in
+++ b/package/lttng-babeltrace/Config.in
@@ -4,12 +4,10 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_LIBGLIB2
-	# libglib2 needs thread support and gettext which needs wchar support, and
-	# we also depends on util-linux which needs wchar
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	# util-linux depends on largefile support
-	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR # libglib2, util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_LARGEFILE # util-linux
 	help
 	  Babeltrace is part of the LTTng 2.x project.
 
@@ -29,4 +27,5 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 comment "lttng-babeltrace needs a toolchain w/ wchar, threads, largefile"
 	depends on BR2_PACKAGE_LTTNG_TOOLS
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 9314984658..62bdfa7c52 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
@@ -183,5 +184,6 @@ config BR2_PACKAGE_MPD_WAVPACK
 endif
 
 comment "mpd needs a toolchain w/ C++, threads, wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index 569218a504..a5ded2984b 100644
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_NBD
 	bool "nbd"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  NBD is a set of utilities to configure network block devices,
@@ -25,4 +26,5 @@ config BR2_NBD_SERVER
 endif
 
 comment "nbd needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/neard/Config.in b/package/neard/Config.in
index 81bb61ea25..ed20e0604b 100644
--- a/package/neard/Config.in
+++ b/package/neard/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_NEARD
 	bool "neard"
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl, dbus, libglib2
-	depends on BR2_USE_MMU # dbus
+	depends on BR2_USE_MMU # dbus, libglib2
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBNL
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index c431e08e0e..b26b5e76a0 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_OFONO
 	bool "ofono"
 	depends on BR2_USE_WCHAR # gettext, libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
-	depends on BR2_USE_MMU # dbus
+	depends on BR2_USE_MMU # dbus, libglib2
 	select BR2_PACKAGE_LIBCAP_NG
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 71d5b74ee8..774682d0fb 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PANGO
 	bool "pango"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	depends on BR2_INSTALL_LIBSTDCPP # freetype support
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT
@@ -20,5 +21,6 @@ config BR2_PACKAGE_PANGO
 	  http://www.pango.org/
 
 comment "pango needs a toolchain w/ wchar, threads, C++"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INSTALL_LIBSTDCPP
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index 4a03e75a0a..52c0c32ba5 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PKG_CONFIG
 	bool "pkg-config"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	depends on BR2_DEPRECATED
 	select BR2_PACKAGE_LIBGLIB2
 	help
@@ -14,4 +15,5 @@ config BR2_PACKAGE_PKG_CONFIG
 
 comment "pkg-config needs a toolchain w/ wchar, threads"
 	depends on BR2_DEPRECATED
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/polkit/Config.in b/package/polkit/Config.in
index 26d65ab029..d685e5cc39 100644
--- a/package/polkit/Config.in
+++ b/package/polkit/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_POLKIT
 	bool "polkit"
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT
 	help
@@ -12,4 +13,5 @@ config BR2_PACKAGE_POLKIT
 	  http://www.freedesktop.org/wiki/Software/polkit
 
 comment "polkit needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in
index 7be199d9f8..91a5a15a05 100644
--- a/package/shared-mime-info/Config.in
+++ b/package/shared-mime-info/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_SHARED_MIME_INFO
 	bool "shared-mime-info"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBXML2
 	help
@@ -12,4 +13,5 @@ config BR2_PACKAGE_SHARED_MIME_INFO
 	  http://freedesktop.org/wiki/Software/shared-mime-info
 
 comment "shared-mime-info needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 2ce627f56b..aa7628dca2 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_SSHFS
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
-	depends on BR2_USE_MMU # libfuse
+	depends on BR2_USE_MMU # libfuse, glib2
 	depends on !BR2_PREFER_STATIC_LIB # libfuse
 	help
 	  FUSE filesystem client based on the SSH File Transfer Protocol.
diff --git a/package/sysprof/Config.in b/package/sysprof/Config.in
index 0bb0791571..e1b0488e84 100644
--- a/package/sysprof/Config.in
+++ b/package/sysprof/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSPROF
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	# In its util.h file, sysprof contains architecture-specific
 	# code
 	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
@@ -25,5 +26,6 @@ config BR2_PACKAGE_SYSPROF_GUI
 endif
 
 comment "sysprof needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/udev/Config.in b/package/udev/Config.in
index 2bcd685281..c8aedd02ed 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -28,11 +28,13 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	help
 	  Enable all extras with external dependencies like
 	  libacl, hwdata and libglib2
 
 comment "enabling all extras needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 endif
diff --git a/package/vala/Config.in b/package/vala/Config.in
index d947c4aa33..b9477bf9f1 100644
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_VALA
 	depends on BR2_DEPRECATED
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -14,4 +15,5 @@ config BR2_PACKAGE_VALA
 
 comment "vala needs a toolchain w/ wchar, threads"
 	depends on BR2_DEPRECATED
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index 6b756a62c9..f559c220cd 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_WIRESHARK
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGLIB2
-	depends on BR2_USE_MMU # fork()
+	depends on BR2_USE_MMU # fork(), glib2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	help

From 2b2c6579575bc87bf3e6f0d9a5ba1f50561fa101 Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Thu, 21 Nov 2013 17:19:40 +0000
Subject: [PATCH 6773/6849] libroxml: fix avr32 build failure

The -Wno-unused-result option is not understood by the version of gcc used by the
avr32 toolchain. Remove the option from the compilation flags.

Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/e22/e22d94fca3eabb4e54d82af04319f17ad8e10c20/

The single existing patch for libroxml has been renamed to include a numerical
component for application order sorting. The existing patch has also been updated
to apply without fuzz.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...error.patch => libroxml-0001-werror.patch} |  2 +-
 .../libroxml-0002-wno-unused-result.patch     | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 rename package/libroxml/{libroxml-werror.patch => libroxml-0001-werror.patch} (97%)
 create mode 100644 package/libroxml/libroxml-0002-wno-unused-result.patch

diff --git a/package/libroxml/libroxml-werror.patch b/package/libroxml/libroxml-0001-werror.patch
similarity index 97%
rename from package/libroxml/libroxml-werror.patch
rename to package/libroxml/libroxml-0001-werror.patch
index 6435b0195d..91f322ce0d 100644
--- a/package/libroxml/libroxml-werror.patch
+++ b/package/libroxml/libroxml-0001-werror.patch
@@ -11,7 +11,7 @@ Index: a/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -41,7 +41,7 @@
+@@ -46,7 +46,7 @@
  
  # options
  override CPPFLAGS += -Iinc/
diff --git a/package/libroxml/libroxml-0002-wno-unused-result.patch b/package/libroxml/libroxml-0002-wno-unused-result.patch
new file mode 100644
index 0000000000..406bf3c247
--- /dev/null
+++ b/package/libroxml/libroxml-0002-wno-unused-result.patch
@@ -0,0 +1,21 @@
+The -Wno-unused-result option is not understood by the version of gcc used by the
+avr32 toolchain. Remove the option from the compilation flags.
+
+Fixes build failures such as the following.
+
+  http://autobuild.buildroot.net/results/e22/e22d94fca3eabb4e54d82af04319f17ad8e10c20/
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/Makefile b/Makefile
+--- a/Makefile	2013-11-21 17:13:17.679388374 +0000
++++ b/Makefile	2013-11-21 17:13:35.219299157 +0000
+@@ -46,7 +46,7 @@ DEFINES = -DIGNORE_EMPTY_TEXT_NODES
+ 
+ # options
+ override CPPFLAGS += -Iinc/
+-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Iinc/ $(DEFINES)
++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Iinc/ $(DEFINES)
+ override LDFLAGS += 
+ 
+ ifeq ("$(OS)", "Darwin")

From a80e3e06ed3d827cf29891a946059f3e595a6331 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Fri, 22 Nov 2013 10:26:47 +0100
Subject: [PATCH 6774/6849] libcap-ng: disable on avr32 which lacks TLS

libcap-ng needs TLS support, which is not available on avr32.
Also, disable reverse dependencies.

Fixes:
  http://autobuild.buildroot.net/results/73c/73c7c211a51c312bbe4eb6a540f3ad9c92c79ebe/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libcap-ng/Config.in | 1 +
 package/ofono/Config.in     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/package/libcap-ng/Config.in b/package/libcap-ng/Config.in
index d1663cdefc..da5b447726 100644
--- a/package/libcap-ng/Config.in
+++ b/package/libcap-ng/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBCAP_NG
 	bool "libcap-ng"
+	depends on !BR2_avr32 # lacks TLS
 	help
 	  The libcap-ng library is intended to make programming with
 	  posix capabilities much easier than the traditional libcap
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index b26b5e76a0..00df25186e 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_OFONO
 	depends on BR2_USE_WCHAR # gettext, libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus, libglib2
+	depends on !BR2_avr32 # libcap-ng
 	select BR2_PACKAGE_LIBCAP_NG
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
@@ -15,5 +16,6 @@ config BR2_PACKAGE_OFONO
 	  http://ofono.org/
 
 comment "ofono needs a toolchain w/ wchar, threads"
+	depends on !BR2_avr32
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

From 9883cbd3678be65bdca10a124ba6cb7fd1f008d3 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Fri, 22 Nov 2013 10:57:16 +0000
Subject: [PATCH 6775/6849] tinymembench: package not supported on MIPS64

Fixes:

   http://autobuild.buildroot.net/results/bab/bab68bcf8714f215ac0b0c2546fa06608377fbb0/

This package is only supported on MIPS32 platforms. The mips-32.S file
included in the source code of this package only makes sense to be compiled
for MIPS32, and also contains hardcoded MIPS32 instructions which are
illegal on MIPS64.  Trying to compile this package on a MIPS64 platform will
end with a linkage failure due to undefined references.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tinymembench/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in
index 0d45532e26..0555b19b55 100644
--- a/package/tinymembench/Config.in
+++ b/package/tinymembench/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TINYMEMBENCH
 	bool "tinymembench"
+	depends on !BR2_mips64 && !BR2_mips64el
 	help
 	  Tinymembench is a simple memory benchmark program, which
 	  tries to measure the peak bandwidth of sequential memory

From b55e473e62cf6336de4a1ce368409df8e20e74f5 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 21 Nov 2013 18:21:47 +0100
Subject: [PATCH 6776/6849] omniorb: needs thread support

Fixes:

   http://autobuild.buildroot.org/results/dfc/dfc083bff04eba68456edd359424293842b6f42d/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/omniorb/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in
index 63266888e6..192ad54fc2 100644
--- a/package/omniorb/Config.in
+++ b/package/omniorb/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_OMNIORB
 	bool "omniorb"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  omniORB is a robust high performance CORBA ORB for C++ and Python.
 	  omniORB is largely CORBA 2.6 compliant. omniORB is one of only
@@ -10,5 +11,5 @@ config BR2_PACKAGE_OMNIORB
 
 	  http://omniorb.sourceforge.net/
 
-comment "omniORB needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "omniORB needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

From 43becdba4c021b419914a859bcff463350aac426 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 22 Nov 2013 22:38:58 +0100
Subject: [PATCH 6777/6849] openssl: only build threads configuration if
 toolchain has pthread support

Gets rid of a large number of warnings (and suboptimal code?):

..sysroot/usr/include/features.h:209:5: warning: #warning requested
reentrant code, but thread support was disabled [-Wcpp]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/openssl/openssl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 4b8b0a4a1b..5416141168 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -73,7 +73,7 @@ define OPENSSL_CONFIGURE_CMDS
 			--prefix=/usr \
 			--openssldir=/etc/ssl \
 			--libdir=/lib \
-			threads \
+			$(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
 			$(if $(BR2_PREFER_STATIC_LIB),no-shared,shared) \
 			no-idea \
 			no-rc5 \

From f8e4365e997abe583a496f852a804436d116da0d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 22 Nov 2013 22:41:01 +0100
Subject: [PATCH 6778/6849] libvncserver: openssl support needs pthreads

Fixes http://autobuild.buildroot.net/results/c30/c3082693fe0da0c54d4bbf950dd6d74e1395c1d9/

Also pass --without-ssl if that isn't the case, as the configure script
otherwise ends up detecting openssl if built before libvncserver.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libvncserver/libvncserver.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index a96b8c5541..f5a0aefca3 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -23,10 +23,11 @@ ifneq ($(BR2_INET_IPV6),y)
 LIBVNCSERVER_CONF_OPT += --without-ipv6
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+# openssl supports needs pthread
+ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
 LIBVNCSERVER_DEPENDENCIES += openssl
 else
-LIBVNCSERVER_CONF_OPT += --without-crypto
+LIBVNCSERVER_CONF_OPT += --without-crypto --without-ssl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)

From 32d6473ab5fe23aac676b529fb5babab750565c0 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Fri, 22 Nov 2013 22:17:31 +0100
Subject: [PATCH 6779/6849] beecrypt: include sequence numbers in patch names

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[ThomasDS: minor change in commit message]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...-only.patch => beecrypt-0001-cppglue.cxx-cplusplus-only.patch} | 0
 ...-compile.patch => beecrypt-0002-icu-check-cross-compile.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/beecrypt/{beecrypt-cppglue.cxx-cplusplus-only.patch => beecrypt-0001-cppglue.cxx-cplusplus-only.patch} (100%)
 rename package/beecrypt/{beecrypt-icu-check-cross-compile.patch => beecrypt-0002-icu-check-cross-compile.patch} (100%)

diff --git a/package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch b/package/beecrypt/beecrypt-0001-cppglue.cxx-cplusplus-only.patch
similarity index 100%
rename from package/beecrypt/beecrypt-cppglue.cxx-cplusplus-only.patch
rename to package/beecrypt/beecrypt-0001-cppglue.cxx-cplusplus-only.patch
diff --git a/package/beecrypt/beecrypt-icu-check-cross-compile.patch b/package/beecrypt/beecrypt-0002-icu-check-cross-compile.patch
similarity index 100%
rename from package/beecrypt/beecrypt-icu-check-cross-compile.patch
rename to package/beecrypt/beecrypt-0002-icu-check-cross-compile.patch

From cc2c75b0ec8b1b24ddbeecc1b00a6aa5d498878a Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Date: Fri, 22 Nov 2013 22:17:32 +0100
Subject: [PATCH 6780/6849] beecrypt: unconditionally disable openpm

beecrypt does not properly handle its dependency on openpm, so that
applications using libbeecrypt are not aware that they also need openmp
(libgomp). This causes error messages during linking, such as (rpm):

..-gcc [..] -lbeecrypt  -lbz2 -lz -lpopt -lpthread
libbecrypt.so: undefined reference to `GOMP_sections_end_nowait'
libbecrypt.so: undefined reference to `GOMP_parallel_end'
libbecrypt.so: undefined reference to `GOMP_sections_next'
libbecrypt.so: undefined reference to `GOMP_parallel_sections_start'

Because the openpm dependency of beecrypt is only used by rsa.c, to
parallelize the calculation of RSA cyphers, we can simply disable openmp in
beecrypt instead of trying to fix the way -lgomp is passed.

Fixes http://autobuild.buildroot.net/results/bcf/bcff4b81bfbb1191f97317b0945c74d948c9774b/

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/beecrypt/beecrypt.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index 5805bda5ae..223b44fb33 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -19,7 +19,8 @@ BEECRYPT_CONF_ENV = \
 
 BEECRYPT_CONF_OPT = \
 		--without-java \
-		--without-python
+		--without-python \
+		--disable-openmp
 
 ifeq ($(BR2_PACKAGE_ICU),y)
 # C++ support needs icu

From f133e9b05fa2c511d476397cdcfd00c9ebe1ad60 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sun, 24 Nov 2013 09:34:02 +0100
Subject: [PATCH 6781/6849] swig: unbreak host-swig build when host has octave
 installed

But not the octave development package:

checking for octave... octave
checking for mkoctfile... configure: error: mkoctfile is not installed

We don't need octace support, so fix it by explictly disabling it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/swig/swig.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 94395ee10d..79839ea7ff 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -7,7 +7,10 @@
 SWIG_VERSION = 2.0.10
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
 SWIG_DEPENDENCIES = host-bison
-HOST_SWIG_CONF_OPT = --without-pcre --disable-ccache
+HOST_SWIG_CONF_OPT = \
+	--without-pcre \
+	--disable-ccache \
+	--without-octave
 SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c
 SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
 

From 46250ee126476821ef934a737f487ee49b33fd5a Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sat, 23 Nov 2013 19:46:25 +0100
Subject: [PATCH 6782/6849] nut: add libltdl dependency

libltdl is needed for nut-scanner

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/nut/nut.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/nut/nut.mk b/package/nut/nut.mk
index 8cb8a019ea..25b88c4123 100644
--- a/package/nut/nut.mk
+++ b/package/nut/nut.mk
@@ -48,6 +48,14 @@ else
 NUT_CONF_OPT += --without-cgi
 endif
 
+# libltdl (libtool) is needed for nut-scanner
+ifeq ($(BR2_PACKAGE_LIBTOOL),y)
+NUT_DEPENDENCIES += libtool
+NUT_CONF_OPT += --with-libltdl
+else
+NUT_CONF_OPT += --without-libltdl
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
 NUT_DEPENDENCIES += libusb-compat
 NUT_CONF_OPT += --with-usb

From efc35794c8706e376c5dbf49e0a33217a2f515ff Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Mon, 25 Nov 2013 14:29:45 +0800
Subject: [PATCH 6783/6849] e2fsprogs: Disable elf shared library when
 BR2_PREFER_STATIC_LIB is selected.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/e2fsprogs/e2fsprogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 0670c747cd..cdca9062ab 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -11,7 +11,7 @@ E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h l
 
 E2FSPROGS_CONF_OPT = \
 	--disable-tls \
-	--enable-elf-shlibs \
+	$(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \

From 12da132c2bc6e980abe22ea4d4edfd1792dd5845 Mon Sep 17 00:00:00 2001
From: Davide Viti <zinosat@tiscali.it>
Date: Mon, 25 Nov 2013 10:03:23 +0100
Subject: [PATCH 6784/6849] mongoose: S85mongoose: fix default options

mongoose fails to start because the options used are not supported by
mongoose. Fix it by using the correct option names instead.

[Peter: reworded commit text and use the correct long options instead]
Signed-off-by: Davide Viti <d.viti@infosolution.it>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mongoose/S85mongoose | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mongoose/S85mongoose b/package/mongoose/S85mongoose
index e9e8524ca8..ff7da05b08 100755
--- a/package/mongoose/S85mongoose
+++ b/package/mongoose/S85mongoose
@@ -10,7 +10,7 @@ NAME=mongoose
 DESC="Mongoose HTTP server"
 
 DAEMON=`which mongoose`
-OPTIONS="-max_threads 3 -root /var/www  -ports 80"
+OPTIONS="-num_threads 3 -document_root /var/www -listening_ports 80"
 
 [ -e /etc/default/mongoose ] && . /etc/default/mongoose
 

From d34c3ea105e81cdb389347f23dd2cde7ed11ba55 Mon Sep 17 00:00:00 2001
From: Sven Neumann <neumann@teufel.de>
Date: Fri, 22 Nov 2013 22:58:15 +0100
Subject: [PATCH 6785/6849] pcre: add options to enable UTF and UCP support

Allow to compile PCRE with UTF-8/16/32 support and with
support for Unicode properties.

[Peter: whitespace fix]
Signed-off-by: Sven Neumann <neumann@teufel.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/pcre/Config.in | 12 ++++++++++++
 package/pcre/pcre.mk   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/package/pcre/Config.in b/package/pcre/Config.in
index dc92274102..9d3a143365 100644
--- a/package/pcre/Config.in
+++ b/package/pcre/Config.in
@@ -19,4 +19,16 @@ config BR2_PACKAGE_PCRE_32
 	help
 	  This option builds the 32-bits pcre library, i.e 'libpcre32'
 
+config BR2_PACKAGE_PCRE_UTF
+	bool "UTF-8/16/32 support in pcre"
+	help
+	  This option builds the pcre library with UTF-8/16/32 support
+
+config BR2_PACKAGE_PCRE_UCP
+	bool "Unicode properties support in pcre"
+	select BR2_PACKAGE_PCRE_UTF
+	help
+	  This option builds the pcre library with Unicode properties
+	  support (implies UTF-8/16/32 support)'
+
 endif
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index bf86a3daac..26373545e6 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -19,5 +19,7 @@ endif
 PCRE_CONF_OPT += --enable-pcre8
 PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16)
 PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32)
+PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_UTF),--enable-utf,--disable-utf)
+PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_UCP),--enable-unicode-properties,--disable-unicode-properties)
 
 $(eval $(autotools-package))

From e9060f3c18ee8e25e6ad73aa6ff007a58f231f52 Mon Sep 17 00:00:00 2001
From: Sven Neumann <neumann@teufel.de>
Date: Fri, 22 Nov 2013 22:58:27 +0100
Subject: [PATCH 6786/6849] libglib2: the system PCRE needs to have UTF and UCP
 enabled

If glib2 is compiled with the system PCRE instead of the included
copy, then that system PCRE needs to have support for UTF-8 and
Unicode properties enabled. Otherwise you will get such warnings
at run-time:

GLib-CRITICAL **: PCRE library is compiled without UTF8 support
GLib-CRITICAL **: PCRE library is compiled without UTF8 properties support

Signed-off-by: Sven Neumann <neumann@teufel.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libglib2/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index db6a950661..7cbfea5dce 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PCRE_UCP if BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_USE_WCHAR # gettext
 	depends on BR2_TOOLCHAIN_HAS_THREADS

From ee40f4f7a0100dab087fabd514733c4cb8efc28a Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Mon, 25 Nov 2013 09:47:46 +0000
Subject: [PATCH 6787/6849] tinymembench: not supported on MIPS n32/64 ABIs

This is a fix for 9883cbd3678be65bdca10a124ba6cb7fd1f008d3. After deeper
testing we have found that package is supported on MIPS64, but only for
o32 ABI.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tinymembench/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in
index 0555b19b55..7e8aaf5469 100644
--- a/package/tinymembench/Config.in
+++ b/package/tinymembench/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_TINYMEMBENCH
 	bool "tinymembench"
-	depends on !BR2_mips64 && !BR2_mips64el
+	depends on !BR2_MIPS_NABI32 && !BR_MIPS_NABI64
 	help
 	  Tinymembench is a simple memory benchmark program, which
 	  tries to measure the peak bandwidth of sequential memory

From 720008338acd7012b0a8c69525f2479f0794dffe Mon Sep 17 00:00:00 2001
From: Ryan Barnett <rjbarnet@rockwellcollins.com>
Date: Tue, 26 Nov 2013 03:09:41 -0600
Subject: [PATCH 6788/6849] protobuf-c: disable parallel build

Fixes http://autobuild.buildroot.net/results/f47c4f0883019ba3a8e61a9ae51b7bd7f347b38c/

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/protobuf-c/protobuf-c.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk
index 31fb5932ba..271f6d812b 100644
--- a/package/protobuf-c/protobuf-c.mk
+++ b/package/protobuf-c/protobuf-c.mk
@@ -8,6 +8,7 @@ PROTOBUF_C_VERSION = 0.15
 PROTOBUF_C_SITE = http://protobuf-c.googlecode.com/files
 PROTOBUF_C_DEPENDENCIES = protobuf host-protobuf-c
 HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf
+PROTOBUF_C_MAKE = $(MAKE1)
 PROTOBUF_C_CONF_OPT = --disable-protoc
 PROTOBUF_C_INSTALL_STAGING = YES
 PROTOBUF_C_LICENSE = BSD-3c

From f2c32b81dd4dcd9ece6caeccef9c10dd9a03049c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
Date: Tue, 26 Nov 2013 11:13:55 +0200
Subject: [PATCH 6789/6849] sunxi-mali, ti-gfx: add missing dollar sign in
 egl.pc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/sunxi-mali/egl.pc | 2 +-
 package/ti-gfx/egl.pc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/sunxi-mali/egl.pc b/package/sunxi-mali/egl.pc
index 56e3990c65..b062ad1d35 100644
--- a/package/sunxi-mali/egl.pc
+++ b/package/sunxi-mali/egl.pc
@@ -8,5 +8,5 @@ Description: ARM Mali implementation of EGL
 Version: 1.4
 Requires:
 Libs: -L${libdir} -lEGL -lGLESv2 -lUMP
-Cflags: -I{includedir}/EGL/ -I${includedir}
+Cflags: -I${includedir}/EGL/ -I${includedir}
 
diff --git a/package/ti-gfx/egl.pc b/package/ti-gfx/egl.pc
index 5ae5a9de39..223fb04b98 100644
--- a/package/ti-gfx/egl.pc
+++ b/package/ti-gfx/egl.pc
@@ -8,4 +8,4 @@ Description: TI Graphics SDK implementation of EGL
 Version: 1.9.2188537
 Requires:
 Libs: -L${libdir} -lEGL -lGLESv2 -lIMGegl
-Cflags: -I{includedir}/EGL/ -I${includedir}
+Cflags: -I${includedir}/EGL/ -I${includedir}

From 54b369c51fef40d1515c8f8815f3de464cf52800 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 25 Nov 2013 18:47:28 +0200
Subject: [PATCH 6790/6849] poco: fix sh4a fenv build failure

Disable FP environment on sh4a. Fixes
http://autobuild.buildroot.net/results/8dc9bca5969d455cc30206fc1ae6e1d3ba6eb6ca/.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/poco/poco.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index a18f209c1f..3516c04455 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -34,6 +34,11 @@ ifeq ($(LIBC),uclibc)
 POCO_CONF_OPT += --no-fpenvironment --no-wstring
 endif
 
+# sh4a is missing FE_DOWNWARD and FE_UPWARD in its fenv.h
+ifeq ($(BR2_sh4a),y)
+POCO_CONF_OPT += --no-fpenvironment
+endif
+
 define POCO_CONFIGURE_CMDS
 	(cd $(@D); ./configure \
 		--config=Linux-CrossEnv	\

From be1cf3bad4317508f8268556943b4449863697fc Mon Sep 17 00:00:00 2001
From: Davide Viti <zinosat@tiscali.it>
Date: Mon, 25 Nov 2013 14:55:25 +0100
Subject: [PATCH 6791/6849] mongoose: wait some time between stop and start of
 the service

Startup script fails to restart the service: 1s delay is enough to fix
this.

Also apply a minor fix of the script name in the usage string

Signed-off-by: Davide Viti <d.viti@infosolution.it>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mongoose/S85mongoose | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mongoose/S85mongoose b/package/mongoose/S85mongoose
index ff7da05b08..dc042d0e2e 100755
--- a/package/mongoose/S85mongoose
+++ b/package/mongoose/S85mongoose
@@ -28,12 +28,12 @@ case "$1" in
   restart|force-reload)
 	echo -n "Restarting $DESC: "
 	start-stop-daemon -K -x "$DAEMON"
+	sleep 1
 	start-stop-daemon -S -x "$DAEMON" -b -- $OPTIONS
 	echo "$NAME."
 	;;
   *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
 	exit 1
 	;;
 esac

From d893bde74e75db4ddc78a719f72d0446a8cc9cd4 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Tue, 26 Nov 2013 14:01:07 +0200
Subject: [PATCH 6792/6849] uclibc-snapshot: enable option UCLIBC_SUSV2_LEGACY

With uClibc commit e8065705, valloc is now optional in SUSv2 and removed
from SUSv3 and later. However, cdrkit currently requires valloc, so
enable it in the uClibc snapshot configuration file.

Fixes
http://autobuild.buildroot.net/results/5a5/5a51f3f06e04eed39d59477ea1178aef7d397754/

Signed-off-by: Chris Zankel <chris@zankel.net>
[baruch: fix summary line, add autobuild reference]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/uclibc/uClibc-snapshot.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/uclibc/uClibc-snapshot.config b/package/uclibc/uClibc-snapshot.config
index 145f70926f..9ca3f9ea98 100644
--- a/package/uclibc/uClibc-snapshot.config
+++ b/package/uclibc/uClibc-snapshot.config
@@ -116,6 +116,7 @@ MALLOC_GLIBC_COMPAT=y
 UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 # COMPAT_ATEXIT is not set
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y

From f2a2c4cce60b6fda5541ac5cb945abe9958c93eb Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Nov 2013 09:51:04 -0300
Subject: [PATCH 6793/6849] php: fix iconv related build failure

Fix a rare edge build failure when iconv is enabled, easily reproduced
in a debian chroot with an aarch64 external toolchain with iconv +
xmlrpc support enabled with a php cgi + cli target.
Should solve bug #6500.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/php/php-01-no-iconv-search.patch | 32 ++++++++++++++++++++++++
 package/php/php-no-iconv-search.patch    | 21 ----------------
 2 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 package/php/php-01-no-iconv-search.patch
 delete mode 100644 package/php/php-no-iconv-search.patch

diff --git a/package/php/php-01-no-iconv-search.patch b/package/php/php-01-no-iconv-search.patch
new file mode 100644
index 0000000000..d2a7ae3a13
--- /dev/null
+++ b/package/php/php-01-no-iconv-search.patch
@@ -0,0 +1,32 @@
+Just assume ICONV_DIR is fine since we pass the correct parameters
+to configure.
+Otherwise configure will try to guess on absolute directories and
+sometimes messes up on some weird edge conditions.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura php-5.3.27.orig/configure php-5.3.27/configure
+--- php-5.3.27.orig/configure	2013-11-26 09:33:30.874253800 -0300
++++ php-5.3.27/configure	2013-11-26 09:41:41.495363637 -0300
+@@ -48212,20 +48212,7 @@
+ 
+ 
+   if test "$iconv_avail" != "no"; then
+-    if test -z "$ICONV_DIR"; then
+-      for i in /usr/local /usr; do
+-        if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+-          PHP_ICONV_PREFIX="$i"
+-          break
+-        fi
+-      done
+-      if test -z "$PHP_ICONV_PREFIX"; then
+-        PHP_ICONV_PREFIX="/usr"
+-      fi
+-    else
+-      PHP_ICONV_PREFIX="$ICONV_DIR"
+-    fi
+-
++    PHP_ICONV_PREFIX="$ICONV_DIR"
+     CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+     LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+ 
diff --git a/package/php/php-no-iconv-search.patch b/package/php/php-no-iconv-search.patch
deleted file mode 100644
index d1e924b1ab..0000000000
--- a/package/php/php-no-iconv-search.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Don't push LDFLAGS/CFLAGS for iconv.
-Just assume they're covered somewhere else.
-Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc
-internal iconv support, which breaks things.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure
---- php-5.3.13/configure	2012-05-08 06:41:23.000000000 -0300
-+++ php-5.3.13-iconv/configure	2012-05-18 22:18:21.313975849 -0300
-@@ -47885,8 +47885,8 @@
-       PHP_ICONV_PREFIX="$ICONV_DIR"
-     fi
- 
--    CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
--    LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
-+    #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
-+    #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
- 
-     if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
-       PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"

From d08ba19c8102be8650906e4d874459ad2622f38c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 19 Nov 2013 10:02:03 -0300
Subject: [PATCH 6794/6849] dbus: only install initscript for sysV targets

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dbus/dbus.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index e2412478b5..560f63e8dd 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -75,11 +75,15 @@ define DBUS_INSTALL_TARGET_FIXUP
 	mkdir -p $(TARGET_DIR)/var/lib
 	rm -rf $(TARGET_DIR)/var/lib/dbus
 	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
-	$(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus
 endef
 
 DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
 
+define DBUS_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/dbus/S30dbus \
+		$(TARGET_DIR)/etc/init.d/S30dbus
+endef
+
 HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
 HOST_DBUS_CONF_OPT = \
 		--with-dbus-user=dbus \

From 1bf9afeb1b8fb45199636f4fd21fa0db376547c2 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 26 Nov 2013 16:49:11 +0100
Subject: [PATCH 6795/6849] Update for 2013.11-rc3

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES            | 12 ++++++++++++
 Makefile           |  2 +-
 docs/download.html |  6 +++---
 docs/news.html     | 12 ++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 93673c34b5..e5d0f37a13 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2013.11-rc3, Released November 26th, 2013
+
+	Fixes all over the tree.
+
+	Architecture: Mark MIPS I, II, III and IV as deprecated.
+
+	Updated/fixed packages: beecrypt, dbus, e2fsprogs, libcap-ng,
+	libglib2, libroxml, libsigsegv, libvncserver, lxc, mdadm,
+	mongoose, nut, ola, omniorb, openssl, pcre, php, poco,
+	protobuf-c, pv, qt5base, ruby, schifra, squid, sunxi-mail,
+	swig, ti-gfx, tinymembench, uclibc, udisks, vim
+
 2013.11-rc2, Released November 18th, 2013
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 685e0ee697..b5368a3592 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.11-rc2
+export BR2_VERSION:=2013.11-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 55e3538b0f..1cfd54dfd4 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -15,12 +15,12 @@ <h3>Download</h3>
 
 <p>
 
-The latest release candidate is <b>2013.11-rc2</b>, which can be
+The latest release candidate is <b>2013.11-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.11-rc2.tar.gz">buildroot-2013.11-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2013.11-rc3.tar.gz">buildroot-2013.11-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.11-rc2.tar.bz2">buildroot-2013.11-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from
diff --git a/docs/news.html b/docs/news.html
index 432c6348d9..db2c61eafa 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,18 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>18 November 2013 -- 2013.11-rc3 released</b>
+
+    <p>Another week, another release candidate with more fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11-rc3">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.11-rc3.tar.bz2">2013.11-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>18 November 2013 -- 2013.11-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

From 50b9552a44de76815c64d95af78974bad4b780b3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Nov 2013 19:07:49 -0300
Subject: [PATCH 6796/6849] quagga: security bump to version 0.99.22.4

Fixes CVE-2013-6051.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/quagga/quagga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 995e42d4b9..19a64884a9 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QUAGGA_VERSION = 0.99.22.3
+QUAGGA_VERSION = 0.99.22.4
 QUAGGA_SOURCE = quagga-$(QUAGGA_VERSION).tar.xz
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk

From 51b3db5eaa1aba458daa7de19b7bd2c42a9bafb4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Nov 2013 19:48:05 -0300
Subject: [PATCH 6797/6849] libnss: security bump to version 3.14.5

Fixes CVE-2013-5605.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnss/libnss.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 9989b6d5bc..002e083e54 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNSS_VERSION = 3.14.3
+LIBNSS_VERSION = 3.14.5
 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
 LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION))
 LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src

From 3783b84eef8a258583939d0ab3ce3fb5c5a68bb8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Nov 2013 20:17:54 -0300
Subject: [PATCH 6798/6849] ruby: security bump to 1.9.3-p484

Fixes CVE-2013-4164.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ruby/ruby.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index ea19008f54..a9c4e7db42 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUBY_VERSION = 1.9.3-p448
+RUBY_VERSION = 1.9.3-p484
 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
 RUBY_DEPENDENCIES = host-pkgconf host-ruby
 HOST_RUBY_DEPENDENCIES = host-pkgconf

From 2d9ee197c24b3d28cb24a443ed7f645a01b2777f Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Wed, 27 Nov 2013 10:18:05 +0000
Subject: [PATCH 6799/6849] tinymembench: Fix typo error on dependence

It should be BR2_MIPS_NABI64 instead of BR_MIPS_NABI64

Fixes:

   http://autobuild.buildroot.net/results/c5d/c5da2d99c09b1a2f7da23f1636f1ccc8978cc4a3/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/tinymembench/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in
index 7e8aaf5469..8f6e1a2b35 100644
--- a/package/tinymembench/Config.in
+++ b/package/tinymembench/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_TINYMEMBENCH
 	bool "tinymembench"
-	depends on !BR2_MIPS_NABI32 && !BR_MIPS_NABI64
+	depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64
 	help
 	  Tinymembench is a simple memory benchmark program, which
 	  tries to measure the peak bandwidth of sequential memory

From 7ea26acd3d22a1614c2d3233746d792ccaee96f0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Nov 2013 09:06:19 -0300
Subject: [PATCH 6800/6849] dropwatch: adjust LDFLAGS

Add more library links into LDFLAGS.
-lncurses because readline uses it (missing _tputs and others).
-lpthread for missing _pthread_rwlock_unlock and others.
-lm for missing _rint.
Fixes:
http://autobuild.buildroot.net/results/6b1/6b1f4f2167d8aca0d73dc0e66fd2e1704c821c61/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dropwatch/dropwatch.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
index 6bbcb234c8..082b33144f 100644
--- a/package/dropwatch/dropwatch.mk
+++ b/package/dropwatch/dropwatch.mk
@@ -16,7 +16,8 @@ DROPWATCH_LICENSE_FILES = COPYING
 #
 # Also: always need to add -liberty to hardcoded LDFLAGS for avr32
 DROPWATCH_LDFLAGS = \
-	$(TARGET_LDFLAGS) -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3
+	$(TARGET_LDFLAGS) -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3 \
+		-lpthread -lncurses -lm
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 DROPWATCH_LDFLAGS += -lintl

From a6fa695639b06b475565980e0c99f9f261786e81 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 27 Nov 2013 22:29:05 +0100
Subject: [PATCH 6801/6849] binutils: fix static linking

pkg-autotools.mk already handles static/shared linking, so no need to
explictly force it. Worse even, the build fails with BR2_PREFER_STATIC_LINK
as we end up calling libtool with --static when it tries to link the .so,
breaking the build:

../ld: attempted static link of dynamic object
`../opcodes/.libs/libopcodes.so'
collect2: error: ld returned 1 exit status

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/binutils/binutils.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index f1723b2148..b3ccee2bcb 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -39,7 +39,6 @@ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
 BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 		--host=$(GNU_TARGET_NAME) \
 		--target=$(GNU_TARGET_NAME) \
-		--enable-shared \
 		$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 # Install binutils after busybox to prefer full-blown utilities

From b7eb4b3619d35abc7f14345046d58d6f48302c09 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Nov 2013 09:53:04 -0300
Subject: [PATCH 6802/6849] apr: fix threading lib detection

apr's configure doesn't try to guess which library is needed for
threading when cross-compiling hence this is never reflected in
apr-1-config, leading to a build failure such as:
http://autobuild.buildroot.net/results/035/035a00de0a56be00559767ba822a396ddc18a9fb/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/apr/apr.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index 4da42c5b9f..1a4c0e261b 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -19,6 +19,11 @@ APR_CONF_ENV = \
 	apr_cv_mutex_recursive=yes
 APR_CONFIG_SCRIPTS = apr-1-config
 
+# Doesn't even try to guess when cross compiling
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+APR_CONF_ENV += apr_cv_pthreads_lib="-lpthread"
+endif
+
 define APR_CLEANUP_UNNEEDED_FILES
 	$(RM) -rf $(TARGET_DIR)/usr/build-1/
 endef

From 1f2d6618548ee2cf3d2c6314b3a9d7c648c97b48 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Nov 2013 10:00:41 -0300
Subject: [PATCH 6803/6849] apr: needs mmu

Uses fork() in apr_proc_fork() which is used by almost all the packages
that use apr (log4cxx, subversion).
apr-util doesn't use fork or apr_proc_fork but it's of no use alone.

[Peter: also hide log4cxx comment if !BR2_USE_MMU]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/apr-util/Config.in   | 1 +
 package/apr/Config.in        | 1 +
 package/log4cxx/Config.in    | 2 ++
 package/subversion/Config.in | 1 +
 4 files changed, 5 insertions(+)

diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
index 895dbb86d5..3d4ec2303d 100644
--- a/package/apr-util/Config.in
+++ b/package/apr-util/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_APR_UTIL
 	select BR2_PACKAGE_ZLIB
 	# apr really needs shared library support
 	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU # apr
 	help
 	  The utility library for the apache runtime project
 
diff --git a/package/apr/Config.in b/package/apr/Config.in
index ed319ed058..e06d2546a8 100644
--- a/package/apr/Config.in
+++ b/package/apr/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_APR
 	bool "apr"
 	# apr really needs shared library support
 	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU # fork() in apr_proc_fork()
 	help
 	  The mission of the Apache Portable Runtime (APR) project is to create
 	  and maintain software libraries that provide a predictable and
diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in
index 8791b8c433..bc142265a0 100644
--- a/package/log4cxx/Config.in
+++ b/package/log4cxx/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LOG4CXX
 	depends on !BR2_PREFER_STATIC_LIB
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # apr
 	help
 	  Apache log4cxx is a logging framework for C++ patterned
 	  after Apache log4j.
@@ -15,3 +16,4 @@ config BR2_PACKAGE_LOG4CXX
 comment "log4cxx needs a toolchain w/ C++, threads, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU
diff --git a/package/subversion/Config.in b/package/subversion/Config.in
index c1358fee78..cc2549f662 100644
--- a/package/subversion/Config.in
+++ b/package/subversion/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_SUBVERSION
 	select BR2_PACKAGE_APR_UTIL
 	# apr really needs shared library support
 	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_USE_MMU # apr
 	select BR2_PACKAGE_NEON
 	select BR2_PACKAGE_NEON_XML
 	help

From 769bb15ea3e1dc8ddba0b030cef1c521ee26dfec Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 26 Nov 2013 21:51:40 -0300
Subject: [PATCH 6804/6849] eglibc: add security patch for CVE-2013-4788

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4788
http://hmarco.org/bugs/CVE-2013-4788.html

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../eglibc-0001-ptr_mangle.patch              | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch

diff --git a/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch b/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch
new file mode 100644
index 0000000000..c9bf107482
--- /dev/null
+++ b/package/glibc/2.17-svnr22064/eglibc-0001-ptr_mangle.patch
@@ -0,0 +1,35 @@
+Fix for CVE-2013-4788 from http://hmarco.org/bugs/CVE-2013-4788.html
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -rupN glibc-2.17/csu/libc-start.c glibc-2.17-mangle-fix/csu/libc-start.c
+--- glibc-2.17/libc/csu/libc-start.c	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17-mangle-fix/libc/csu/libc-start.c	2013-07-10 00:13:48.000000000 +0200
+@@ -38,6 +38,12 @@ extern void __pthread_initialize_minimal
+    in thread local area.  */
+ uintptr_t __stack_chk_guard attribute_relro;
+ # endif
++
++# ifndef  THREAD_SET_POINTER_GUARD
++uintptr_t __pointer_chk_guard_local
++     attribute_relro attribute_hidden __attribute__ ((nocommon));
++# endif
++
+ #endif
+ 
+ #ifdef HAVE_PTR_NTHREADS
+@@ -184,6 +190,14 @@ LIBC_START_MAIN (int (*main) (int, char
+ # else
+   __stack_chk_guard = stack_chk_guard;
+ # endif
++    uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
++                          stack_chk_guard);
++# ifdef THREAD_SET_POINTER_GUARD
++      THREAD_SET_POINTER_GUARD (pointer_chk_guard);
++# else
++      __pointer_chk_guard_local = pointer_chk_guard;
++# endif
++
+ #endif
+ 
+   /* Register the destructor of the dynamic linker if there is any.  */

From b0a72f02adbf50f306d57045300d245fe5a1a800 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 28 Nov 2013 10:18:07 +0100
Subject: [PATCH 6805/6849] gpsd: do not allow profiling support on AArch64

The profiling support is not available on AArch64, causing build
failures such as:

  http://autobuild.buildroot.net/results/724f8646e1c2c28cf187f2313244d1e3e61b4c25/

According to Will Newton, function profiling will only be added in the
next version of the AArch64 Linaro toolchain. This indicates it is a
rather new feature in AArch64, so for the moment, just disallow
profiling on AArch64. We can revise this later, when this feature has
been made available in Linaro toolchains, and official gcc releases
(for internal toolchain support).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gpsd/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 5b007d7df3..2fd97d00d4 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -34,6 +34,7 @@ config BR2_PACKAGE_GPSD_OLDSTYLE
 config BR2_PACKAGE_GPSD_PROFILING
 	bool "profiling support"
 	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_aarch64
 
 comment "profiling support not available with uClibc-based toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC

From 300c6e7c0a0b8846221e7fc67c8325776aa2f281 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Nov 2013 10:24:17 -0300
Subject: [PATCH 6806/6849] iptables: patch another static linking issue

Fixes:
http://autobuild.buildroot.net/results/e4a/e4a0f93e2abdad0222063b3f71970ee1c5940f3a/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...tables-save.c-remove-dlfcn.h-include.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch

diff --git a/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch b/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch
new file mode 100644
index 0000000000..1cdc6c0af2
--- /dev/null
+++ b/package/iptables/iptables-02-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch
@@ -0,0 +1,47 @@
+From 2efdcf332a40431c6584970bb0c68712d14d409b Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 27 Nov 2013 10:18:11 -0300
+Subject: [PATCH] iptables/ip(6)tables-save.c: remove dlfcn.h include
+
+It's not required and breaks on static-only uClibc builds which don't
+have the header file.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ iptables/ip6tables-save.c | 4 ----
+ iptables/iptables-save.c  | 4 ----
+ 2 files changed, 8 deletions(-)
+
+diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
+index d819b30..a86a64a 100644
+--- a/iptables/ip6tables-save.c
++++ b/iptables/ip6tables-save.c
+@@ -18,10 +18,6 @@
+ #include "ip6tables.h"
+ #include "ip6tables-multi.h"
+ 
+-#ifndef NO_SHARED_LIBS
+-#include <dlfcn.h>
+-#endif
+-
+ static int show_counters = 0;
+ 
+ static const struct option options[] = {
+diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c
+index e599fce..2999c7f 100644
+--- a/iptables/iptables-save.c
++++ b/iptables/iptables-save.c
+@@ -17,10 +17,6 @@
+ #include "iptables.h"
+ #include "iptables-multi.h"
+ 
+-#ifndef NO_SHARED_LIBS
+-#include <dlfcn.h>
+-#endif
+-
+ static int show_counters = 0;
+ 
+ static const struct option options[] = {
+-- 
+1.8.3.2
+

From 62d15df19a0d181a266a88b46525d0d4959c8739 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Nov 2013 10:56:06 -0300
Subject: [PATCH 6807/6849] util-linux: tweak sscanf-no-ms-as patch

The patch has a minor mistake so fix it.
Credit go to Daniel Mentz <daniel@exxm.de> for the detailed bug report.
Closes bug #6428

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/util-linux/util-linux-001-sscanf-no-ms-as.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
index 72a060e29c..c95b7553e0 100644
--- a/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
+++ b/package/util-linux/util-linux-001-sscanf-no-ms-as.patch
@@ -124,7 +124,7 @@ ported to util-linux-2.23.2
  			"%jd"		/* (4) used */
  			"%d",		/* priority */
  
-+#ifndef HAVE_SCANF_MS_MODIFIER
++#ifdef HAVE_SCANF_MS_MODIFIER
  			&src,
  			&fs->swaptype,
 +#else

From ff0f55e381972d57c9fbd818d5b906b2dcb5a368 Mon Sep 17 00:00:00 2001
From: Arnout Vandecappelle <arnout@mind.be>
Date: Thu, 28 Nov 2013 09:29:28 +0100
Subject: [PATCH 6808/6849] lvm2: replace !BR2_PACKAGE_LVM2_DMSETUP_ONLY by
 BR2_PACKAGE_LVM2_STANDARD_INSTALL

BR2_PACKAGE_LVM2_DMSETUP_ONLY is a "negative" option that disables
build and install of part of the suite. This option cannot be unselected
by other config options, which gives a problem for BR2_PACKAGE_UDISKS_LVM2:
it needs BR2_PACKAGE_LVM2_APP_LIBRARY, which requires the full suite.

Therefore, replace the negative BR2_PACKAGE_LVM2_DMSETUP_ONLY by a positive
BR2_PACKAGE_LVM2_STANDARD_INSTALL. To make sure that existing defconfigs
keep working, the new option defaults to y unless the legacy
BR2_PACKAGE_LVM2_DMSETUP_ONLY was selected.

Fixes http://autobuild.buildroot.net/results/ea4627cae45e972ebba5b33a2b2871ce7f46fedc/

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy       | 12 ++++++++++++
 package/lvm2/Config.in | 16 ++++++++++------
 package/lvm2/lvm2.mk   |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 587afe1582..09935f183a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,18 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2013.11"
 
+config BR2_PACKAGE_LVM2_DMSETUP_ONLY
+	bool "lvm2's 'dmsetup only' option removed"
+	select BR2_LEGACY
+	help
+	  The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which
+	  led to problems with other packages that need the full lvm2
+	  suite. Therefore, the option has been replaced with the positive
+	  BR2_PACKAGE_LVM2_STANDARD_INSTALL option.
+
+# Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in
+# in order to automatically propagate old configs
+
 config BR2_PACKAGE_QT_JAVASCRIPTCORE
 	bool "qt javascriptcore option removed"
 	select BR2_LEGACY
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index b3988eaed1..5d6209fc12 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -16,19 +16,23 @@ config BR2_PACKAGE_LVM2
 	  user-space. This makes it useful for not only LVM, but EVMS,
 	  software raid, and other drivers that create "virtual" block devices.
 
-config BR2_PACKAGE_LVM2_DMSETUP_ONLY
-	bool "install dmsetup only"
-	depends on BR2_PACKAGE_LVM2
+if BR2_PACKAGE_LVM2
+
+config BR2_PACKAGE_LVM2_STANDARD_INSTALL
+	bool "standard install instead of only dmsetup"
+	default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11
 	help
-	  Install dmsetup only and skip the LVM2 suite.
+	  Install the standard suite of lvm2 programs. When this option is not
+	  set, only dmsetup is installed.
 
 config BR2_PACKAGE_LVM2_APP_LIBRARY
 	bool "install application library"
-	depends on BR2_PACKAGE_LVM2
-	depends on !BR2_PACKAGE_LVM2_DMSETUP_ONLY
+	select BR2_PACKAGE_LVM2_STANDARD_INSTALL
 	help
 	  Install application library (liblvm2app).
 
+endif
+
 comment "lvm2 needs a toolchain w/ largefile"
 	depends on BR2_USE_MMU
 	depends on !BR2_LARGEFILE
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 79a0d05061..4099c2101f 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -38,7 +38,7 @@ else
 LVM2_CONF_OPT += --disable-readline
 endif
 
-ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y)
+ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
 LVM2_MAKE_OPT = device-mapper
 LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
 LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper

From 689f975e7b196bf7ad2a3cd970444414f2f689d0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Nov 2013 14:39:00 -0300
Subject: [PATCH 6809/6849] wpa_supplicant: define BINDIR for systemd/dbus
 service files

BINDIR is used to point systemd/dbus service files to the correct binary
path where wpa_supplicant resides.
So define it to avoid the default /usr/local path that doesn't work.
Solves bug #6704

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/wpa_supplicant/wpa_supplicant.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 450e10f540..4ae41c10f7 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -137,7 +137,7 @@ endef
 
 define WPA_SUPPLICANT_BUILD_CMDS
 	$(TARGET_MAKE_ENV) CFLAGS="$(WPA_SUPPLICANT_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" BINDIR=/usr/sbin \
 		$(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(WPA_SUPPLICANT_SUBDIR)
 endef
 

From 9402eef6e24b51da750f0852e16cd92ffc65f2a7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 28 Nov 2013 22:13:31 +0100
Subject: [PATCH 6810/6849] mplayer: not available on nios2

Fixes:

  http://autobuild.buildroot.org/results/0ae/0ae3a53a1a6e870ee1bf2a902a400893339777df/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mplayer/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 3a1b428ce6..c8f1480883 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_MPLAYER
 	bool "mplayer"
 	# Those architectures are not supported by MPlayer
 	depends on !(BR2_sh2 || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
-			|| BR2_microblaze || BR2_aarch64)
+			|| BR2_microblaze || BR2_aarch64 || BR2_nios2)
 	# Broken support for <ARMv5
 	depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \
 		|| BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm)

From df8d0b90eb78fcafe2f30ffd8483309a5a38c0be Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 28 Nov 2013 16:02:15 -0300
Subject: [PATCH 6811/6849] gdb: disable texinfo/documentation

Fixes bug #6554

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gdb/gdb.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 9cf90e32bb..700cf724d8 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -57,6 +57,7 @@ HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
 endif
 
 GDB_CONF_ENV = \
+	ac_cv_prog_MAKEINFO=missing \
 	ac_cv_type_uintptr_t=yes \
 	gt_cv_func_gettext_libintl=yes \
 	ac_cv_func_dcgettext=yes \

From 1d57723541b339ad54c15fc1ec7e555e49ce3cbf Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Thu, 28 Nov 2013 15:57:14 +0000
Subject: [PATCH 6812/6849] qt: Disable QtScript on non-supported platforms

There is no support for certain platforms in QtScript right now, so
buildroot upstream suggested to disable the possibility of enabling
QtScript on those platforms as a quick fix for the 2013.11 release:

   http://lists.busybox.net/pipermail/buildroot/2013-November/083157.html

QtScript doesn't build because it uses JavaScriptCore, so we re-use the
existing BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT option which already lists
which platforms are supported by JavaScriptCore in Qt4.

In addition, a proposed fix to add support for MIPS64 has already been
sent to Qt:

   https://bugreports.qt-project.org/browse/QTBUG-35030

Fixes:

   http://autobuild.buildroot.net/results/fd7/fd7e7e53290f235b540ed5f3c784e2584fdb41e0/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 2651d55901..dd2b6d9ec9 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -385,6 +385,7 @@ config BR2_PACKAGE_QT_OPENSSL
 
 config BR2_PACKAGE_QT_SCRIPT
 	bool "Script Module"
+	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 	default y
 	help
 	  Build the Qt Script module.

From a88dceb951de977ad2d896d697f87d98e9705280 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Thu, 28 Nov 2013 15:57:15 +0000
Subject: [PATCH 6813/6849] grantlee: Disable on non-supported platforms

This package selects BR2_PACKAGE_QT_SCRIPT which is not supported on
certain platforms. To prevent this behaviour we use the same solution as
we applied for BR2_PACKAGE_QT_SCRIPT

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/grantlee/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in
index 84afad207a..09ec70c018 100644
--- a/package/grantlee/Config.in
+++ b/package/grantlee/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GRANTLEE
 	bool "grantlee"
+	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 	select BR2_PACKAGE_QT_STL
 	select BR2_PACKAGE_QT_SCRIPT
 	select BR2_PACKAGE_QT_GUI_MODULE

From 354cab0ee8c7c7813d7c7d69d5a699f234443c0b Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Wed, 27 Nov 2013 17:48:39 +0200
Subject: [PATCH 6814/6849] libnspr: Add dependency on !BR2_xtensa and
 !BR2_bfin

Xtensa is not yet supported in libnspr. Also add dependencies to libnss,
which requires libnspr, and ecryptfs-utils, which requires libnss.

Fixes (xtensa)
http://autobuild.buildroot.net/results/14b/14ba6426edbffa100de924aa69157b3f59368ff2/

Fixes (blackfin)
http://autobuild.buildroot.net/results/dd3/dd353703ed94cec48cd126d80cd2f1b039811be4/

[baruch: fix summary, add autobuild reference, add comment dependency,
 add blackfin]

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ecryptfs-utils/Config.in | 2 +-
 package/libnspr/Config.in        | 8 ++++++--
 package/libnss/Config.in         | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in
index 480aeddc9b..4b34e0f7f6 100644
--- a/package/ecryptfs-utils/Config.in
+++ b/package/ecryptfs-utils/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on !BR2_avr32 && !BR2_microblaze # keyutils
 	depends on BR2_LARGEFILE # libnss
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
-	depends on !BR2_arc # libnss -> libnspr
+	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	help
 	  eCryptfs is a POSIX-compliant enterprise cryptographic
 	  filesystem for Linux. It is stacked on top of any other
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index 4ef3a518ee..1d732873d7 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -1,8 +1,12 @@
+config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
+	def_bool y
+	depends on !BR2_arc && !BR2_xtensa && !BR2_bfin
+
 config BR2_PACKAGE_LIBNSPR
 	bool "libnspr"
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_arc
+	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	help
 	  NSPR is the Netscape Portable Runtime library which provides
 	  a platform-neutral API for system level and libc like
@@ -12,5 +16,5 @@ config BR2_PACKAGE_LIBNSPR
 	  http://www.mozilla.org/projects/nspr/
 
 comment "libnspr needs a toolchain w/ largefile, threads"
-	depends on !BR2_arc
+	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index 88b1fde290..77128f6f6b 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBNSS
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
-	depends on !BR2_arc # libnspr
+	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
 	help
 	  Network Security Services (NSS) is a set of libraries designed
 	  to support development of security-enabled client and server
@@ -16,6 +16,6 @@ config BR2_PACKAGE_LIBNSS
 	  http://www.mozilla.org/projects/security/pki/nss/
 
 comment "libnss needs a toolchain w/ largefile, threads"
-	depends on !BR2_arc
+	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 

From 5be04371a33fa464ff31c55c91c7cf133c65a507 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 27 Nov 2013 17:48:40 +0200
Subject: [PATCH 6815/6849] ecryptfs-utils: add a dependencies comment

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/ecryptfs-utils/Config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in
index 4b34e0f7f6..62cf6c856a 100644
--- a/package/ecryptfs-utils/Config.in
+++ b/package/ecryptfs-utils/Config.in
@@ -21,3 +21,9 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	  for another method.
 
 	  http://ecryptfs.org
+
+comment "ecryptfs-utils needs a toolchain w/ largefile, threads"
+	depends on !BR2_avr32 && !BR2_microblaze
+	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
+	depends on BR2_USE_MMU
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS

From 765ccaf08c5b042bd33d800772564cc10808f3af Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 29 Nov 2013 08:18:34 +0000
Subject: [PATCH 6816/6849] lua-ev: disable on avr32 and blackfin

lua-ev is a reverse dependency of libev, but the architecture filtering is
not propagated. Fixes autobuild failure such as the following.

  http://autobuild.buildroot.net/results/387/38704a4362ab6c3458c45603975b274937059fa9/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lua-ev/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in
index 1e89c270a0..4f704ad54e 100644
--- a/package/lua-ev/Config.in
+++ b/package/lua-ev/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LUA_EV
 	bool "lua-ev"
 	select BR2_PACKAGE_LIBEV
+	depends on !(BR2_avr32 || BR2_bfin) # libev
 	help
 	  Get access to the libev library from Lua.
 

From fe8d728db5fd386696d43f43a52effad25c09387 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 29 Nov 2013 11:25:25 +0100
Subject: [PATCH 6817/6849] qt: fix build with opengl es

Fixes http://autobuild.buildroot.net/results/efe/efe26c54361094fb1e201da6915900cd9b24d596/

qt doesn't use pkg-config to figure out the needed compiler/linker flags
for egl, so pass them explicitly instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt/qt.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 82ce51dbd0..7f799fdb99 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -35,6 +35,7 @@ endif
 
 QT_CFLAGS = $(TARGET_CFLAGS)
 QT_CXXFLAGS = $(TARGET_CXXFLAGS)
+QT_LDFLAGS = $(TARGET_LDFLAGS)
 
 ifeq ($(BR2_LARGEFILE),y)
 QT_CONFIGURE_OPTS += -largefile
@@ -320,6 +321,9 @@ endif
 ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
 QT_CONFIGURE_OPTS += -opengl es2 -egl
 QT_DEPENDENCIES   += libgles libegl
+QT_CFLAGS   += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
+QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
+QT_LDFLAGS  += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
 else
 QT_CONFIGURE_OPTS += -no-opengl
 endif
@@ -490,7 +494,7 @@ define QT_CONFIGURE_CMDS
 	$(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D))
 	$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
 	$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(TARGET_LDFLAGS),$(@D))
+	$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D))
 	$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D))
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.

From 1842ad7f93897fa7dd0b0a3e6ae0759b120472bf Mon Sep 17 00:00:00 2001
From: Simon Dawson <spdawson@gmail.com>
Date: Fri, 29 Nov 2013 09:23:49 +0000
Subject: [PATCH 6818/6849] libpfm4: disable on avr32

The perf_event_open syscall is not available on avr32. Fixes build failures
such as the following.

  http://autobuild.buildroot.net/results/38f/38fa81315be448c409b9af29f92621fcf5676f71/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libpfm4/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libpfm4/Config.in b/package/libpfm4/Config.in
index 6b491a4054..3908e7890b 100644
--- a/package/libpfm4/Config.in
+++ b/package/libpfm4/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPFM4
 	bool "libpfm4"
+	depends on !BR2_avr32 # no perf_event_open
 	help
 	  A helper library to help encode Performance Events to use with
 	  Operating system kernels performance monitoring interfaces.

From cf4ec89bfb0f9ae1ecf37fd070c1e167558ba0d0 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Fri, 29 Nov 2013 10:37:49 +0000
Subject: [PATCH 6819/6849] tvheadend: remove -Werror from CFLAGS

Remove -Werror from CFLAGS to avoid build failures caused by warnings.

Fixes the following autobuild failure on MIPS64 n32/64:

   http://autobuild.buildroot.net/results/6be/6be075726ac6db0a48dd6b535841ada932c9ffbb/

Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../tvheadend/tvheadend-003-remove-werror.patch   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/tvheadend/tvheadend-003-remove-werror.patch

diff --git a/package/tvheadend/tvheadend-003-remove-werror.patch b/package/tvheadend/tvheadend-003-remove-werror.patch
new file mode 100644
index 0000000000..1b0e68797a
--- /dev/null
+++ b/package/tvheadend/tvheadend-003-remove-werror.patch
@@ -0,0 +1,15 @@
+tvheadend: remove -Werror from CFLAGS
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+--- tvheadend-2b649954346aa2e9c81834d500a25c528f31f829/Makefile.orig	2013-11-28 15:52:52.284041848 +0000
++++ tvheadend-2b649954346aa2e9c81834d500a25c528f31f829/Makefile	2013-11-28 15:53:03.715220194 +0000
+@@ -27,7 +27,7 @@ PROG    := $(BUILDDIR)/tvheadend
+ # Common compiler flags
+ #
+ 
+-CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
++CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
+ CFLAGS  += -Wmissing-prototypes -fms-extensions
+ CFLAGS  += -g -funsigned-char -O2 
+ CFLAGS  += -D_FILE_OFFSET_BITS=64

From f62a1d887aee642593b3f9507d6f3ebcd82219d0 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 29 Nov 2013 11:25:43 -0300
Subject: [PATCH 6820/6849] hostapd: fix static build failure

libnl-3 uses threads and this isn't accounted for in hostapd (or
libnl-3*.pc files for that matter - hostapd doesn't use pkg-config
anyway).
Since linking order matters for static scenarios also throw in -lnl-3
into LIBS first since it gets appended to in hostapd makefiles to add
libnl-3.

Fixes:
http://autobuild.buildroot.net/results/d4a/d4a9f44effeb08eda6c4b32764274ae81d185d5e/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/hostapd/hostapd.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 4d31df54cf..0fbd8bc998 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -10,13 +10,14 @@ HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
-HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
 HOSTAPD_LICENSE = GPLv2/BSD-3c
 HOSTAPD_LICENSE_FILES = README
 
-# libnl needs -lm (for rint) if linking statically
+# libnl-3 needs -lm (for rint) and -lpthread if linking statically
+# And library order matters hence stick -lnl-3 first since it's appended
+# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-HOSTAPD_LDFLAGS += -lm
+HOSTAPD_LIBS += -lnl-3 -lm -lpthread
 endif
 
 define HOSTAPD_LIBNL_CONFIG
@@ -93,7 +94,7 @@ endef
 
 define HOSTAPD_BUILD_CMDS
 	$(TARGET_MAKE_ENV) CFLAGS="$(HOSTAPD_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(HOSTAPD_LIBS)" \
 		$(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(HOSTAPD_SUBDIR)
 endef
 

From 931b73e5eae4a3ba6b2e37db526fd7243a139e64 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Fri, 29 Nov 2013 15:23:20 +0000
Subject: [PATCH 6821/6849] qt5: Disable on MIPS64 BigEndian n64 platforms

qt5base fails to compile on MIPS64 BigEndian n64 platforms because there
are multiple calls to some functions that are disabled. Since every Qt5
package depends on qt5base we can disable Qt5 entirely. This is a quick
fix for the next release. In the meantime, a proposed patch to fix this
problem has already been sent to Qt:

https://bugreports.qt-project.org/browse/QTBUG-35228

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Acked-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 42724dc15d..b92d3292b6 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -9,6 +9,7 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_PACKAGE_QT
+	depends on !BR2_mips64 || !BR2_MIPS_NABI64
 	help
 	  This option enables the Qt5 framework. Sub-options allow to
 	  select which modules should be built.

From 4268d3967e2d691c151d6b5629e4051deb077b9a Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Mon, 18 Nov 2013 12:25:32 +0000
Subject: [PATCH 6822/6849] libtool: Apply upstream patch to set correct
 linkage on MIPS64

This libtool change ensures that ld uses the right machine emulation file,
which will allow to fix several MIPS64 n64 link failures, such as the one
currently visible on the libiscsi package.  Packages affected by this
problem will have to use <pkg>_AUTORECONF = YES to benefit from this libtool
fix, until they are fixed upstream.

Acked-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .../libtool-0001-mips64-n64-linking.patch     | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/libtool/libtool-0001-mips64-n64-linking.patch

diff --git a/package/libtool/libtool-0001-mips64-n64-linking.patch b/package/libtool/libtool-0001-mips64-n64-linking.patch
new file mode 100644
index 0000000000..ef9084ddb6
--- /dev/null
+++ b/package/libtool/libtool-0001-mips64-n64-linking.patch
@@ -0,0 +1,47 @@
+sets correct linker ABI flags on MIPS64
+http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=5f7f7d9615bf650cf99d581a33b3e18357f79951
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -ru libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4
+--- libtool-2.4.2.orig/libltdl/m4/libtool.m4	2013-11-11 11:44:30.419396295 +0000
++++ libtool-2.4.2/libltdl/m4/libtool.m4	2013-11-11 11:44:07.055032308 +0000
+@@ -1312,6 +1312,38 @@
+   rm -rf conftest*
+   ;;
+ 
++mips64*-*linux*)
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
++  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    emul=elf
++    case `/usr/bin/file conftest.$ac_objext` in
++      *32-bit*)
++      emul="${emul}32"
++      ;;
++      *64-bit*)
++      emul="${emul}64"
++      ;;
++    esac
++    case `/usr/bin/file conftest.$ac_objext` in
++      *MSB*)
++      emul="${emul}btsmip"
++      ;;
++      *LSB*)
++      emul="${emul}ltsmip"
++      ;;
++    esac
++    case `/usr/bin/file conftest.$ac_objext` in
++      *N32*)
++      emul="${emul}n32"
++      ;;
++    esac
++    LD="${LD-ld} -m $emul"
++    fi
++  rm -rf conftest*
++  ;;
++
+ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.

From 155d27303e63f8b906191bcce74ea4c6f63332da Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Mon, 18 Nov 2013 14:23:42 +0000
Subject: [PATCH 6823/6849] libiscsi: Call autoreconf to use buildroot's
 libtool

Use updated libtool from buildroot to fix MIPS64/n64 build problems
http://autobuild.humanoidz.org/results/a9a/a9aa506a591581e413dc38c53d0e56bec5970634/build-end.log

[Peter: add comment explaining why]
Acked-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libiscsi/libiscsi.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
index 5a29923324..eddde33ec9 100644
--- a/package/libiscsi/libiscsi.mk
+++ b/package/libiscsi/libiscsi.mk
@@ -10,5 +10,7 @@ LIBISCSI_LICENSE         = GPLv2+ LGPLv2.1+
 LIBISCSI_LICENSE_FILES   = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
 LIBISCSI_INSTALL_STAGING = YES
 LIBISCSI_DEPENDENCIES    = popt
+# fixes MIPS64 link failure
+LIBISCSI_AUTORECONF      = YES
 
 $(eval $(autotools-package))

From fe796fee83b735a101ef2c3801b3c765b1c3f633 Mon Sep 17 00:00:00 2001
From: Ivan Sergeev <vsergeev@kumunetworks.com>
Date: Mon, 18 Nov 2013 18:10:46 -0800
Subject: [PATCH 6824/6849] dbus-python: select pyexpat dependency

dbus-python requires xml.parsers.expat, which is provided by the pyexpat
module. This patch enables the pyexpat module as a dependency when dbus-python
is selected.

[Peter: fixup whitespace]
Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/dbus-python/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index f7b6d943cf..a38d27794a 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_DBUS_PYTHON
 	depends on BR2_PACKAGE_DBUS
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_DBUS_GLIB
+	# pyexpat: runtime dependency only
+	select BR2_PACKAGE_PYTHON_PYEXPAT
 	help
 	  Python bindings for D-Bus
 

From 1351d0c284e1b85db92caa8af51bb56a6e432b1d Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 30 Nov 2013 09:37:14 +0100
Subject: [PATCH 6825/6849] CHANGES: update with recent changes

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGES b/CHANGES
index e5d0f37a13..86043379e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+2013.11, Not yet released:
+
+	Minor fixes.
+
+	Updated/fixed packages: apr, binutils, dbus-python, dropwatch,
+	ecryptfs-utils, eglibc, gdb, gpsd, grantlee, hostapd,
+	iptables, qlibiscsi, libnspr, libnss, libpfm4, libtool,
+	lua-ev, lvm2, mplayer, qt, qt5, quagga, ruby, tinymembench,
+	tvheadend, util-linux, wpa_supplicant
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#1279: Buildroot compiled Busybox and Coreutils LFS issues
+	#2995: -fstack-protector-all causes ssh to SIGSEGV
+	#5570: Cannot compile software on the target machine
+	#6428: util-linux libmount segfaults with patch from buildroot
+	#6500: php fails to build for armel
+	#6554: gdb needs to dependents on host texinfo
+	#6692: GNU nano fails to compile for x86_64
+	#6704: wpa_supplicant: fix wrong path to executable file in D-Bus
+
 2013.11-rc3, Released November 26th, 2013
 
 	Fixes all over the tree.

From 61998c8b6f9dfec6636c18e6763d6963641ee2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
Date: Wed, 13 Nov 2013 19:58:16 -0300
Subject: [PATCH 6826/6849] libnspr: Add patch to support nios2 arch

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libnspr/libnspr-nios2.patch | 71 +++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 package/libnspr/libnspr-nios2.patch

diff --git a/package/libnspr/libnspr-nios2.patch b/package/libnspr/libnspr-nios2.patch
new file mode 100644
index 0000000000..cffb2ef499
--- /dev/null
+++ b/package/libnspr/libnspr-nios2.patch
@@ -0,0 +1,71 @@
+Add Nios-II support
+
+Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
+
+diff -Naur libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.cfg libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.cfg	2013-11-10 21:15:04.556139100 -0300
++++ libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.cfg	2013-11-10 21:15:29.332138283 -0300
+@@ -914,6 +914,51 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(nios2)
++
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   4
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
+ #else
+ 
+ #error "Unknown CPU architecture"
+diff -Naur libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.h libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.h
+--- libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.h	2013-11-10 21:15:04.556139100 -0300
++++ libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.h	2013-11-10 21:15:33.245138154 -0300
+@@ -55,6 +55,8 @@
+ #define _PR_SI_ARCHITECTURE "avr32"
+ #elif defined(__m32r__)
+ #define _PR_SI_ARCHITECTURE "m32r"
++#elif defined(nios2)
++#define _PR_SI_ARCHITECTURE "nios2"
+ #else
+ #error "Unknown CPU architecture"
+ #endif

From e6b7bcd4c509d601d2bba29068b81db966a5e617 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 30 Nov 2013 09:50:24 +0100
Subject: [PATCH 6827/6849] docs/news.html: announce slides from 'Buildroot:
 What is new' presentation at ELCE

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 docs/news.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/news.html b/docs/news.html
index db2c61eafa..a8ab9db5ed 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,13 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>30 November 2013 -- Slides from Embedded Linux Conference Europe</b>
+
+    <p>The slides from the Buildroot presentation at the recent
+    <a href="http://events.linuxfoundation.org/events/embedded-linux-conference-europe">Embedded Linux Conference Europe 2013</a>
+    are now
+    <a href="http://elinux.org/images/2/23/Buildroot-whats-new-elce2013.pdf">available</a>.</p>
+
   <li><b>18 November 2013 -- 2013.11-rc3 released</b>
 
     <p>Another week, another release candidate with more fixes. See the <a

From 9b3904543ca04c5d5fe5f6974539eed376de2290 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 30 Nov 2013 14:16:03 +0100
Subject: [PATCH 6828/6849] Update for 2013.11

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 CHANGES            |  2 +-
 Makefile           |  2 +-
 docs/download.html | 10 +++++-----
 docs/news.html     |  9 +++++++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 86043379e5..d75d8b172c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2013.11, Not yet released:
+2013.11, Released November 30th, 2013:
 
 	Minor fixes.
 
diff --git a/Makefile b/Makefile
index b5368a3592..0480a42144 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2013.11-rc3
+export BR2_VERSION:=2013.11
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
diff --git a/docs/download.html b/docs/download.html
index 1cfd54dfd4..b9a9fcf1e7 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,15 +6,15 @@ <h3>Download</h3>
 
 <p>
 
-The latest stable release is <b>2013.08.1</b>, which can be downloaded
+The latest stable release is <b>2013.11</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2013.08.1.tar.gz">buildroot-2013.08.1.tar.gz</a>
+<a href="/downloads/buildroot-2013.11.tar.gz">buildroot-2013.11.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.08.1.tar.bz2">buildroot-2013.08.1.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.11.tar.bz2">buildroot-2013.11.tar.bz2</a>.
 
 <p>
-
+<!--
 The latest release candidate is <b>2013.11-rc3</b>, which can be
 downloaded here:<p>
 
@@ -22,7 +22,7 @@ <h3>Download</h3>
 or
 <a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/news.html b/docs/news.html
index a8ab9db5ed..efa8fd1528 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,15 @@ <h3>News</h3>
 <p>
 
 <ul>
+  <li><b>30 November 2013 -- 2013.11 released</b>
+
+    <p>The stable 2013.11 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11">CHANGES</a>
+    file for more details
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.11.tar.bz2">2013.11 release</a>.</p>
+
   <li><b>30 November 2013 -- Slides from Embedded Linux Conference Europe</b>
 
     <p>The slides from the Buildroot presentation at the recent

From 59b5501fdcc198dffd1fbbc695e8dff5434e00e1 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Tue, 3 Dec 2013 00:53:49 +0100
Subject: [PATCH 6829/6849] subversion is a build dependency

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f6592c10a7..8b776bde90 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ In a fresh minimal Debian Unstable install,
 ```shell
 % sudo apt-get install git build-essential zip gawk libtool gettext  \
       automake autoconf  nasm unzip gettext flex bison libsdl-image1.2 \
-      liblzo2-2 lzma python openjdk-7-jre-headless \
+      subversion liblzo2-2 lzma python openjdk-7-jre-headless \
       texinfo libxml-parser-perl wget pkg-config swig cpio zlib1g-dev \
       libncurses5-dev autopoint
 ```

From dd94bb7be6aca33073609cf3b856ef54fcf42e0b Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Tue, 3 Dec 2013 05:02:30 +0100
Subject: [PATCH 6830/6849] Fixes after the merge with buildroot 2011.11:

* The defconfig files now use the BR2_LINUX_KERNEL_CUSTOM_GIT* functionality and specify busybox 1.18 (1.17 doesn't get enabled by default since it now requires BR2_DEPRECATED).  Also reordered some keys in order to match the match the order of the generated .config file.
* Restore include files which got merged out
* Restore fake 'cp' target since it differs from the new 'file' target ('cp' creates a tarball, 'file' copies a pre-existing one)
* Remove duplicate patches for e2fsprogs and usbmount
* Change lirc and recovery_aml to use 'linux' instead of 'linux26'
* Restore host rules which got merged out
* Restore libjpeg-turbo in place of libjpeg
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig | 42 ++++++++++---------
 configs/amlogic_xios-xbmc_defconfig           | 16 +++----
 configs/amlogic_xios_m3-xbmc_defconfig        | 20 +++++----
 fs/recovery_aml/recovery_aml.mk               |  2 +-
 package/Config.in                             |  8 ++++
 package/Makefile.package.in                   |  6 +++
 package/connman/connman.mk                    |  2 +-
 ...sprogs-add-missing-dep-of-tst_uuid-o.patch | 17 --------
 package/iproute2/iproute2.mk                  |  2 +-
 package/jpeg/jpeg.mk                          | 11 +++--
 package/sdl/sdl.mk                            |  1 +
 package/sdl_image/sdl_image.mk                |  1 +
 package/thirdparty/boblight/boblight.mk       |  2 +-
 package/thirdparty/lirc/lirc.mk               |  8 ++--
 package/tiff/tiff.mk                          |  1 +
 package/udev/Config.in                        |  6 +++
 .../usbmount-fstype-detection-fix.patch       | 25 -----------
 17 files changed, 80 insertions(+), 90 deletions(-)
 delete mode 100644 package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
 delete mode 100644 package/usbmount/usbmount-fstype-detection-fix.patch

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index 529f4aa433..36eed973bc 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -14,27 +14,16 @@ BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
-BR2_BUSYBOX_VERSION_1_17_X=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
+BR2_BUSYBOX_VERSION_1_18_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
 BR2_PACKAGE_XIOS=y
-BR2_PACKAGE_DBUS_PYTHON=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_UTILS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_FLASH_OTP_DUMP=y
-BR2_PACKAGE_MTD_FLASH_OTP_INFO=y
-BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_NTFSPROGS=y
-# BR2_PACKAGE_UDEV_MTD_PROBE is not set
-BR2_PACKAGE_LIBDAEMON=y
 BR2_PACKAGE_QT=y
 BR2_PACKAGE_QT_DEMOS=y
 BR2_PACKAGE_QT_LICENSE_APPROVED=y
@@ -49,7 +38,21 @@ BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT=y
 BR2_PACKAGE_QT_DBUS=y
 BR2_PACKAGE_QT_SVG=y
 BR2_PACKAGE_QT_WEBKIT=y
+BR2_PACKAGE_DBUS_PYTHON=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
+BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
+BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_UTILS=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_MTD_FLASH_OTP_DUMP=y
+BR2_PACKAGE_MTD_FLASH_OTP_INFO=y
+BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_NTFS_3G_NTFSPROGS=y
+# BR2_PACKAGE_UDEV_MTD_PROBE is not set
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
+BR2_PACKAGE_LIBDAEMON=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
@@ -61,13 +64,12 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_NANO=y
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
 BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME="stvm3"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
+BR2_LINUX_KERNEL_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
 BR2_LINUX_KERNEL_DEFCONFIG="meson_xios"
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index 515480faba..377a812f2e 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -14,7 +14,10 @@ BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
-BR2_BUSYBOX_VERSION_1_17_X=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
+BR2_BUSYBOX_VERSION_1_18_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
@@ -32,7 +35,6 @@ BR2_PACKAGE_NTFS_3G=y
 BR2_PACKAGE_NTFSPROGS=n
 # BR2_PACKAGE_UDEV_MTD_PROBE is not set
 BR2_PACKAGE_USBMOUNT=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
@@ -44,14 +46,14 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_NANO=y
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
 BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME="stvm3"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
+BR2_LINUX_KERNEL_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
 BR2_LINUX_KERNEL_DEFCONFIG="meson_xios"
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index bd2371ac9b..46079b0aaf 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -5,8 +5,8 @@ BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
 BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_HOST=y
 BR2_PACKAGE_GDB_SERVER=y
+BR2_PACKAGE_GDB_HOST=y
 BR2_GDB_VERSION_7_1=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
@@ -14,7 +14,10 @@ BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
 # BR2_SOFT_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_TARGET_GENERIC_GETTY=y
-BR2_BUSYBOX_VERSION_1_17_X=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
+BR2_BUSYBOX_VERSION_1_18_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
@@ -32,27 +35,26 @@ BR2_PACKAGE_NTFS_3G=y
 BR2_PACKAGE_NTFSPROGS=n
 # BR2_PACKAGE_UDEV_MTD_PROBE is not set
 BR2_PACKAGE_USBMOUNT=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_PROFTPD=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_PROFTPD=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_NANO=y
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
 BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME="xiosm3"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6854f5fafcf287f2c76c35fc641d44106d3888a3"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel-m3.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="6854f5fafcf287f2c76c35fc641d44106d3888a3"
+BR2_LINUX_KERNEL_VERSION="6854f5fafcf287f2c76c35fc641d44106d3888a3"
 BR2_LINUX_KERNEL_DEFCONFIG="meson_xios_m3"
diff --git a/fs/recovery_aml/recovery_aml.mk b/fs/recovery_aml/recovery_aml.mk
index d2d8feadeb..adaf5afdb2 100755
--- a/fs/recovery_aml/recovery_aml.mk
+++ b/fs/recovery_aml/recovery_aml.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ROOTFS_RECOVERY_AML_DEPENDENCIES = linux26 rootfs-tar_aml host-python
+ROOTFS_RECOVERY_AML_DEPENDENCIES = linux rootfs-tar_aml host-python
 
 RECOVERY_AML_ARGS = -b $(BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME)
 ifeq ($(BR2_TARGET_ROOTFS_RECOVERY_AML_WIPE_USERDATA),y)
diff --git a/package/Config.in b/package/Config.in
index 4b5e5d81a6..e236d281d8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -3,6 +3,12 @@ menu "Package Selection for the target"
 source "package/busybox/Config.in"
 source "package/customize/Config.in"
 
+# AMLogic libs and programs
+source "package/amlogic/Config.in"
+
+#Non-buildroot libs and programs
+source "package/thirdparty/Config.in"
+
 # Audio and video applications
 source "package/multimedia/Config.in"
 
@@ -402,6 +408,7 @@ source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/bwm-ng/Config.in"
 source "package/can-utils/Config.in"
+source "package/connman/Config.in"
 source "package/ctorrent/Config.in"
 source "package/cifs-utils/Config.in"
 source "package/cups/Config.in"
@@ -546,6 +553,7 @@ source "package/less/Config.in"
 endif
 source "package/nano/Config.in"
 source "package/uemacs/Config.in"
+source "package/thirdparty/joe/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/vim/Config.in"
 endif
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index bd9ceb50be..99b89a06ad 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -93,6 +93,7 @@ SVN:=$(call qstrip,$(BR2_SVN))
 BZR:=$(call qstrip,$(BR2_BZR))
 GIT:=$(call qstrip,$(BR2_GIT))
 LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
+CP:=$(call qstrip,$(BR2_CP)) $(QUIET)
 
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
 # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
@@ -176,6 +177,10 @@ define SHOW_EXTERNAL_DEPS_SVN
   echo $($(PKG)_SOURCE)
 endef
 
+define DOWNLOAD_CP
+	(test -e $(DL_DIR)/$($(PKG)_SOURCE) && test -z `find $($(PKG)_SITE) -newer $(DL_DIR)/$($(PKG)_SOURCE)`) || \
+	tar -C $($(PKG)_SITE) . -czf $(DL_DIR)/$($(PKG)_SOURCE)
+endef
 
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
@@ -226,6 +231,7 @@ define DOWNLOAD
 			svn) $($(DL_MODE)_SVN) && exit ;; \
 			bzr) $($(DL_MODE)_BZR) && exit ;; \
 			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
+			cp) $($(DL_MODE)_CP) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 		esac ; \
 	fi ; \
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index f5fdce5a6f..5d31ae0b27 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -36,5 +36,5 @@ endef
 CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM
 endif
 
-$(eval $(call AUTOTARGETS,package,connman))
+$(eval $(call AUTOTARGETS))
 
diff --git a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
deleted file mode 100644
index 1871a569f3..0000000000
--- a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Add missing dependency of tst_uuid.o on uuid.h
-
-The missing dependency used to break parallel builds.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
-diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
---- e2fsprogs.orig//lib/uuid/Makefile.in	2010-06-14 05:07:36.000000000 +0200
-+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in	2011-07-18 13:44:58.000000000 +0200
-@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
- $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
- 	cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
- 
--tst_uuid.o: $(srcdir)/tst_uuid.c
-+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
- 	$(E) "	CC $@"
- 	$(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index dd2506cbda..07812e8c3e 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 IPROUTE2_VERSION = 2.6.39
-IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
+IPROUTE2_SITE = http://sources.buildroot.net
 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
 
 # If both iproute2 and busybox are selected, make certain we win
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index f3718bef6b..24e5935f70 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -3,12 +3,13 @@
 # jpeg (libraries needed by some apps)
 #
 #############################################################
-JPEG_VERSION = 8b
-JPEG_SITE = http://www.ijg.org/files/
-JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_VERSION = 1.2.1
+JPEG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libjpeg-turbo
+JPEG_SOURCE = libjpeg-turbo-$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES
 JPEG_INSTALL_TARGET = YES
-JPEG_CONF_OPT = --program-prefix=
+JPEG_CONF_OPT = --program-prefix= --with-jpeg8
+JPEG_CFLAGS += -O3
 
 define JPEG_REMOVE_USELESS_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
@@ -17,3 +18,5 @@ endef
 JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
+
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index b5d9152882..14dbe1cda7 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -68,3 +68,4 @@ define SDL_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index ad595ae40c..5e0a28ca24 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -45,3 +45,4 @@ SDL_IMAGE_DEPENDENCIES:=sdl \
 HOST_SDL_IMAGE_DEPENDENCIES:=host-jpeg host-libpng host-tiff host-sdl
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/thirdparty/boblight/boblight.mk b/package/thirdparty/boblight/boblight.mk
index 94cf3cf77d..b41dd55a2a 100644
--- a/package/thirdparty/boblight/boblight.mk
+++ b/package/thirdparty/boblight/boblight.mk
@@ -12,7 +12,7 @@ BOBLIGHT_INSTALL_TARGET = YES
 BOBLIGHT_AUTORECONF = YES
 BOBLIGHT_CONF_OPT += --without-portaudio --without-opengl --without-x11
 
-BOBLIGHT_DEPENDENCIES += linux26
+BOBLIGHT_DEPENDENCIES += linux
 
 ifeq ($(findstring yy,$(BR2_PACKAGE_BOBLIGHT_LIBUSB)$(BR2_PACKAGE_LIBUSB)),yy)
   BOBLIGHT_DEPENDENCIES += libusb
diff --git a/package/thirdparty/lirc/lirc.mk b/package/thirdparty/lirc/lirc.mk
index feb249dbfa..c371603894 100644
--- a/package/thirdparty/lirc/lirc.mk
+++ b/package/thirdparty/lirc/lirc.mk
@@ -3,12 +3,12 @@ LIRC_SOURCE = lirc-$(LIRC_VERSION).tar.gz
 LIRC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lirc/LIRC/$(LIRC_VERSION)
 LIRC_INSTALL_STAGING = YES
 LIRC_INSTALL_TARGET = YES
-LIRC_DEPENDENCIES = linux26
+LIRC_DEPENDENCIES = linux
 LIRC_MAKE=$(MAKE1)
 
-LIRC_CONF_OPT += --with-kerneldir=$(LINUX26_DIR)
+LIRC_CONF_OPT += --with-kerneldir=$(LINUX_DIR)
 LIRC_CONF_OPT += --with-driver=all
-LIRC_CONF_OPT += --with-moduledir="/lib/modules/$(LINUX26_VERSION_PROBED)/misc"
+LIRC_CONF_OPT += --with-moduledir="/lib/modules/$(LINUX_VERSION_PROBED)/misc"
 
 # hack to avoid mknod (requires root). This will be populated automatically.
 LIRC_CONF_OPT += ac_cv_path_mknod=$(shell which echo)
@@ -26,7 +26,7 @@ endif
 
 #work-around for hard-coded depmod
 define LIRC_DEPMOD
-$(HOST_DIR)/usr/sbin/depmod -b $(TARGET_DIR) -a $(LINUX26_VERSION_PROBED)
+$(HOST_DIR)/usr/sbin/depmod -b $(TARGET_DIR) -a $(LINUX_VERSION_PROBED)
 endef
 
 define LIRC_REMOVE_BROKEN_DRIVERS
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 4ee7689505..d6798d136f 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -20,3 +20,4 @@ define TIFF_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/udev/Config.in b/package/udev/Config.in
index 391c71810b..5ec8825037 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -8,6 +8,12 @@ config BR2_PACKAGE_UDEV
 
 if BR2_PACKAGE_UDEV
 
+config BR2_PACKAGE_UDEV_MTD_PROBE
+	bool "Install mtd_probe callout"
+	default y
+	help
+	  mtd_probe - udev callout to probe mtd devices
+
 config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "enable all extras"
 	depends on BR2_LARGEFILE # acl
diff --git a/package/usbmount/usbmount-fstype-detection-fix.patch b/package/usbmount/usbmount-fstype-detection-fix.patch
deleted file mode 100644
index a3686f1c47..0000000000
--- a/package/usbmount/usbmount-fstype-detection-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-newer blkid version shows two parameter with TYPE within:
-
-/dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos"
-PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1"
-
-change regular expression to take " TYPE" only
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
----
- usbmount |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/usbmount
-===================================================================
---- a/usbmount
-+++ b/usbmount
-@@ -88,7 +88,7 @@
-     #   FIXME: improvement: implement mounting by label (notice that labels
-     #   can contain spaces, which makes things a little bit less comfortable).
-     DEVINFO=$(/sbin/blkid -p $DEVNAME)
--    FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-+    FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-     UUID=$(echo "$DEVINFO"   | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-     USAGE=$(echo "$DEVINFO"  | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-

From abe57d3663d85440cfef500855be1e3defc2fa82 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sun, 23 Feb 2014 06:51:03 +0100
Subject: [PATCH 6831/6849] [aml] Fix building of SDL host version

* Add patch from https://bugzilla.libsdl.org/show_bug.cgi?id=1769 to allow the host version of SDL to compile with recent xorg headers.  This patch was committed upstream to the 1.2 branch on 2013-06-06 but the most recent 1.2 release appears to be 1.2.15 (2012-01-20).
* Run autogen.sh in order to get updated configure script
---
 .../sdl/sdl-1.2-fix-compilation-libX11.patch  | 44 +++++++++++++++++++
 package/sdl/sdl.mk                            |  7 +++
 2 files changed, 51 insertions(+)
 create mode 100644 package/sdl/sdl-1.2-fix-compilation-libX11.patch

diff --git a/package/sdl/sdl-1.2-fix-compilation-libX11.patch b/package/sdl/sdl-1.2-fix-compilation-libX11.patch
new file mode 100644
index 0000000000..e1a6ff1631
--- /dev/null
+++ b/package/sdl/sdl-1.2-fix-compilation-libX11.patch
@@ -0,0 +1,44 @@
+--- a/configure.in	Wed Apr 17 00:56:53 2013 -0700
++++ a/configure.in	Sun Jun 02 20:48:53 2013 +0600
+@@ -1169,6 +1169,17 @@ 
+             if test x$definitely_enable_video_x11_xrandr = xyes; then
+                 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
+             fi
++            AC_MSG_CHECKING(for const parameter to _XData32)
++            have_const_param_xdata32=no
++            AC_TRY_COMPILE([
++              #include <X11/Xlibint.h>
++              extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++            ],[
++            ],[
++            have_const_param_xdata32=yes
++            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
++            ])
++            AC_MSG_RESULT($have_const_param_xdata32)
+         fi
+     fi
+ }
+--- a/include/SDL_config.h.in	Wed Apr 17 00:56:53 2013 -0700
++++ a/include/SDL_config.h.in	Sun Jun 02 20:48:53 2013 +0600
+@@ -283,6 +283,7 @@ 
+ #undef SDL_VIDEO_DRIVER_WINDIB
+ #undef SDL_VIDEO_DRIVER_WSCONS
+ #undef SDL_VIDEO_DRIVER_X11
++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+ #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+--- a/src/video/x11/SDL_x11sym.h	Wed Apr 17 00:56:53 2013 -0700
++++ a/src/video/x11/SDL_x11sym.h	Sun Jun 02 20:48:53 2013 +0600
+@@ -165,7 +165,11 @@ 
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
++#else
+ SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++#endif
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index fddb6e7b15..014f5851dc 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -46,6 +46,13 @@ SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-nasm \
 		--disable-video-ps3
 
+define HOST_SDL_AUTOGEN
+	cd $(@D) && ./autogen.sh
+endef
+
+HOST_SDL_PRE_CONFIGURE_HOOKS += HOST_SDL_AUTOGEN
+
+
 # Fixup prefix= and exec_prefix= in sdl-config, and remove the
 # -Wl,-rpath option.
 define SDL_FIXUP_SDL_CONFIG

From dd4f13d09ea332ea967b87e9ca2ddfbdf577d9c0 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sun, 23 Feb 2014 06:55:45 +0100
Subject: [PATCH 6832/6849] [aml] Fix xbmc linking with libsmbclient.so

Remove the third party 'samba30' package and switch xbmc to use the mainline 'samba' package instead.  The samba30 package was not copying the libsmbclient.so.0 symlink into the target and so xbmc could not start.
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig |  27 ++++
 configs/amlogic_xios-xbmc_defconfig           |  27 ++++
 configs/amlogic_xios_m3-xbmc_defconfig        |  27 ++++
 package/thirdparty/Config.in                  |   1 -
 package/thirdparty/samba30/Config.in          |  25 ----
 .../samba30-3.0.37-CVE-2010-2063.patch        |  38 ------
 .../samba30/samba30-3.0.37-configure.in.patch |  64 ----------
 ...mba30-3.0.37-silence-receive-warning.patch |  11 --
 .../samba30-3.0.37-vfs_default.c.patch        |  16 ---
 .../samba30/samba30-3.0.37-wle-fix.patch      | 101 ---------------
 package/thirdparty/samba30/samba30.mk         | 120 ------------------
 package/thirdparty/xbmc/Config.in             |   4 +-
 package/thirdparty/xbmc/xbmc.mk               |   2 +-
 13 files changed, 84 insertions(+), 379 deletions(-)
 delete mode 100644 package/thirdparty/samba30/Config.in
 delete mode 100644 package/thirdparty/samba30/samba30-3.0.37-CVE-2010-2063.patch
 delete mode 100644 package/thirdparty/samba30/samba30-3.0.37-configure.in.patch
 delete mode 100644 package/thirdparty/samba30/samba30-3.0.37-silence-receive-warning.patch
 delete mode 100644 package/thirdparty/samba30/samba30-3.0.37-vfs_default.c.patch
 delete mode 100644 package/thirdparty/samba30/samba30-3.0.37-wle-fix.patch
 delete mode 100644 package/thirdparty/samba30/samba30.mk

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index 529f4aa433..6f6bac23f1 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -54,6 +54,33 @@ BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_SAMBA_CIFS=n
+BR2_PACKAGE_SAMBA_EVENTLOGADM=n
+BR2_PACKAGE_SAMBA_NET=n
+BR2_PACKAGE_SAMBA_NMBD=n
+BR2_PACKAGE_SAMBA_NMBLOOKUP=n
+BR2_PACKAGE_SAMBA_NTLM_AUTH=n
+BR2_PACKAGE_SAMBA_PDBEDIT=n
+BR2_PACKAGE_SAMBA_PROFILES=n
+BR2_PACKAGE_SAMBA_RPCCLIENT=n
+BR2_PACKAGE_SAMBA_SMBCACLS=n
+BR2_PACKAGE_SAMBA_SMBCLIENT=n
+BR2_PACKAGE_SAMBA_SMBCONTROL=n
+BR2_PACKAGE_SAMBA_SMBCQUOTAS=n
+BR2_PACKAGE_SAMBA_SMBD=n
+BR2_PACKAGE_SAMBA_SMBGET=n
+BR2_PACKAGE_SAMBA_SMBLDBTOOLS=n
+BR2_PACKAGE_SAMBA_SMBPASSWD=n
+BR2_PACKAGE_SAMBA_SMBSHARESEC=n
+BR2_PACKAGE_SAMBA_SMBSPOOL=n
+BR2_PACKAGE_SAMBA_SMBSTATUS=n
+BR2_PACKAGE_SAMBA_SMBTREE=n
+BR2_PACKAGE_SAMBA_SWAT=n
+BR2_PACKAGE_SAMBA_SMBTAR=n
+BR2_PACKAGE_SAMBA_TDB=n
+BR2_PACKAGE_SAMBA_TESTPARM=n
+BR2_PACKAGE_SAMBA_WINBINDD=n
+BR2_PACKAGE_SAMBA_WBINFO=n
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index 515480faba..11c84562fa 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -38,6 +38,33 @@ BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_SAMBA_CIFS=n
+BR2_PACKAGE_SAMBA_EVENTLOGADM=n
+BR2_PACKAGE_SAMBA_NET=n
+BR2_PACKAGE_SAMBA_NMBD=n
+BR2_PACKAGE_SAMBA_NMBLOOKUP=n
+BR2_PACKAGE_SAMBA_NTLM_AUTH=n
+BR2_PACKAGE_SAMBA_PDBEDIT=n
+BR2_PACKAGE_SAMBA_PROFILES=n
+BR2_PACKAGE_SAMBA_RPCCLIENT=n
+BR2_PACKAGE_SAMBA_SMBCACLS=n
+BR2_PACKAGE_SAMBA_SMBCLIENT=n
+BR2_PACKAGE_SAMBA_SMBCONTROL=n
+BR2_PACKAGE_SAMBA_SMBCQUOTAS=n
+BR2_PACKAGE_SAMBA_SMBD=n
+BR2_PACKAGE_SAMBA_SMBGET=n
+BR2_PACKAGE_SAMBA_SMBLDBTOOLS=n
+BR2_PACKAGE_SAMBA_SMBPASSWD=n
+BR2_PACKAGE_SAMBA_SMBSHARESEC=n
+BR2_PACKAGE_SAMBA_SMBSPOOL=n
+BR2_PACKAGE_SAMBA_SMBSTATUS=n
+BR2_PACKAGE_SAMBA_SMBTREE=n
+BR2_PACKAGE_SAMBA_SWAT=n
+BR2_PACKAGE_SAMBA_SMBTAR=n
+BR2_PACKAGE_SAMBA_TDB=n
+BR2_PACKAGE_SAMBA_TESTPARM=n
+BR2_PACKAGE_SAMBA_WINBINDD=n
+BR2_PACKAGE_SAMBA_WBINFO=n
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index bd2371ac9b..28e34dd529 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -39,6 +39,33 @@ BR2_PACKAGE_PROFTPD=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_SAMBA_CIFS=n
+BR2_PACKAGE_SAMBA_EVENTLOGADM=n
+BR2_PACKAGE_SAMBA_NET=n
+BR2_PACKAGE_SAMBA_NMBD=n
+BR2_PACKAGE_SAMBA_NMBLOOKUP=n
+BR2_PACKAGE_SAMBA_NTLM_AUTH=n
+BR2_PACKAGE_SAMBA_PDBEDIT=n
+BR2_PACKAGE_SAMBA_PROFILES=n
+BR2_PACKAGE_SAMBA_RPCCLIENT=n
+BR2_PACKAGE_SAMBA_SMBCACLS=n
+BR2_PACKAGE_SAMBA_SMBCLIENT=n
+BR2_PACKAGE_SAMBA_SMBCONTROL=n
+BR2_PACKAGE_SAMBA_SMBCQUOTAS=n
+BR2_PACKAGE_SAMBA_SMBD=n
+BR2_PACKAGE_SAMBA_SMBGET=n
+BR2_PACKAGE_SAMBA_SMBLDBTOOLS=n
+BR2_PACKAGE_SAMBA_SMBPASSWD=n
+BR2_PACKAGE_SAMBA_SMBSHARESEC=n
+BR2_PACKAGE_SAMBA_SMBSPOOL=n
+BR2_PACKAGE_SAMBA_SMBSTATUS=n
+BR2_PACKAGE_SAMBA_SMBTREE=n
+BR2_PACKAGE_SAMBA_SWAT=n
+BR2_PACKAGE_SAMBA_SMBTAR=n
+BR2_PACKAGE_SAMBA_TDB=n
+BR2_PACKAGE_SAMBA_TESTPARM=n
+BR2_PACKAGE_SAMBA_WINBINDD=n
+BR2_PACKAGE_SAMBA_WBINFO=n
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
diff --git a/package/thirdparty/Config.in b/package/thirdparty/Config.in
index b6eaf3bbe1..a1cef701dc 100644
--- a/package/thirdparty/Config.in
+++ b/package/thirdparty/Config.in
@@ -18,7 +18,6 @@ source "package/thirdparty/afpfs-ng/Config.in"
 source "package/thirdparty/librtmp/Config.in"
 source "package/thirdparty/libssh2/Config.in"
 source "package/thirdparty/recovery_reboot/Config.in"
-source "package/thirdparty/samba30/Config.in"
 source "package/thirdparty/taglib18/Config.in"
 source "package/thirdparty/tinyxml/Config.in"
 source "package/thirdparty/tvheadend/Config.in"
diff --git a/package/thirdparty/samba30/Config.in b/package/thirdparty/samba30/Config.in
deleted file mode 100644
index 5fb6e4d58d..0000000000
--- a/package/thirdparty/samba30/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-config BR2_PACKAGE_SAMBA30
-	bool "samba 3.0"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	help
-	  Provides print services to all manner of SMB/CIFS clients,
-	  including the numerous versions of Microsoft Windows
-	  operating systems.
-
-	  http://www.samba.org/
-
-	  NOTE: A complete Samba install takes over 50MB of space,
-		so choose only the components you need.
-
-config BR2_PACKAGE_SAMBA30_AVAHI
-	bool "support avahi"
-	default y
-	depends on BR2_PACKAGE_SAMBA30
-	depends on BR2_PACKAGE_AVAHI_DAEMON
-	depends on BR2_PACKAGE_DBUS
-	help
-	  Include support for avahi
-
-comment "support avahi - disabled (requires avahi-daemon/dbus)"
-	depends on !BR2_PACKAGE_AVAHI_DAEMON || !BR2_PACKAGE_DBUS
-
diff --git a/package/thirdparty/samba30/samba30-3.0.37-CVE-2010-2063.patch b/package/thirdparty/samba30/samba30-3.0.37-CVE-2010-2063.patch
deleted file mode 100644
index b4657de2c0..0000000000
--- a/package/thirdparty/samba30/samba30-3.0.37-CVE-2010-2063.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/source/smbd/process.c b/source/smbd/process.c
-index e861e16..6499bc7 100644
---- a/source/smbd/process.c
-+++ b/source/smbd/process.c
-@@ -1159,6 +1159,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
- {
- 	static char *orig_inbuf;
- 	static char *orig_outbuf;
-+	static int orig_size;
- 	int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
- 	unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
- 	char *inbuf2, *outbuf2;
-@@ -1178,6 +1179,13 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
- 		/* this is the first part of the chain */
- 		orig_inbuf = inbuf;
- 		orig_outbuf = outbuf;
-+		orig_size = size;
-+	}
-+
-+	/* Validate smb_off2 */
-+	if ((smb_off2 < smb_wct - 4) || orig_size < (smb_off2 + 4 - smb_wct)) {
-+		exit_server_cleanly("Bad chained packet");
-+		return -1;
- 	}
- 
- 	/*
-@@ -1192,6 +1200,11 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
- 	SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
- 	SCVAL(outbuf,smb_vwv0,smb_com2);
- 
-+	if (outsize <= smb_wct) {
-+		exit_server_cleanly("Bad chained packet");
-+		return -1;
-+	}
-+
- 	/* remember how much the caller added to the chain, only counting stuff
- 		after the parameter words */
- 	chain_size += outsize - smb_wct;
diff --git a/package/thirdparty/samba30/samba30-3.0.37-configure.in.patch b/package/thirdparty/samba30/samba30-3.0.37-configure.in.patch
deleted file mode 100644
index 3af1e125fc..0000000000
--- a/package/thirdparty/samba30/samba30-3.0.37-configure.in.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- samba-3.0.25borig/source/configure.in	2007-05-23 08:29:20.000000000 -0700
-+++ samba3025bfinal/source/configure.in	2007-07-24 12:15:13.000000000 -0700
-@@ -1374,31 +1374,40 @@
- #
- case "$host_os" in
-     *linux*)
--       # glibc <= 2.3.2 has a broken getgrouplist
--       AC_TRY_RUN([
-+
-+AC_CACHE_CHECK([for a broken Linux getgrouplist API],
-+             linux_getgrouplist_ok,
-+             [
-+                 AC_TRY_RUN([
- #include <unistd.h>
- #include <sys/utsname.h>
--main() {
--       /* glibc up to 2.3 has a broken getgrouplist */
-+
-+                     int main() {
-+                            /* glibc up to 2.3 has a broken
-+getgrouplist */
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
--       int libc_major = __GLIBC__;
--       int libc_minor = __GLIBC_MINOR__;
-+                            int libc_major = __GLIBC__;
-+                            int libc_minor = __GLIBC_MINOR__;
-+
-+                            if (libc_major < 2)
-+                                   return 1;
-+                            if ((libc_major == 2) && (libc_minor <= 3))
-+                                   return 1;
-+#endif
-+                            return 0;
-+                     }
-+
-+                 ],
-+                 [linux_getgrouplist_ok=yes],
-+                 [linux_getgrouplist_ok=no],
-+                 [linux_getgrouplist_ok=cross])
-+        ])
-+
-+        if test x"$linux_getgrouplist_ok" = x"yes"; then
-+           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
-+        fi
-+
- 
--       if (libc_major < 2)
--              exit(1);
--       if ((libc_major == 2) && (libc_minor <= 3))
--              exit(1);
--#endif
--       exit(0);
--}
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
--       if test x"$linux_getgrouplist_ok" = x"yes"; then
--          AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
--       fi
--       ;;
--    *)
--       AC_CHECK_FUNCS(getgrouplist)
--       ;;
- esac
- 
- #
diff --git a/package/thirdparty/samba30/samba30-3.0.37-silence-receive-warning.patch b/package/thirdparty/samba30/samba30-3.0.37-silence-receive-warning.patch
deleted file mode 100644
index 92b84336c8..0000000000
--- a/package/thirdparty/samba30/samba30-3.0.37-silence-receive-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samba-3.0.37-clean/source/libsmb/clientgen.c	2009-09-30 05:21:56.000000000 -0700
-+++ samba-3.0.37/source/libsmb/clientgen.c	2010-11-18 21:56:06.874516928 -0800
-@@ -108,7 +108,7 @@
- 
- 	/* If the server is not responding, note that now */
- 	if (!ret) {
--                DEBUG(0, ("Receiving SMB: Server stopped responding\n"));
-+    DEBUG(1, ("Receiving SMB: Server stopped responding\n"));
- 		cli->smb_rw_error = smb_read_error;
- 		close(cli->fd);
- 		cli->fd = -1;
diff --git a/package/thirdparty/samba30/samba30-3.0.37-vfs_default.c.patch b/package/thirdparty/samba30/samba30-3.0.37-vfs_default.c.patch
deleted file mode 100644
index 7a640ecb85..0000000000
--- a/package/thirdparty/samba30/samba30-3.0.37-vfs_default.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- samba-3.0.25borig/source/modules/vfs_default.c	2007-04-09 10:30:58.000000000 -0700
-+++ samba3025bfinal/source/modules/vfs_default.c	2007-07-24 12:18:07.000000000 -0700
-@@ -813,10 +813,11 @@
- 
- 	START_PROFILE(syscall_linux_setlease);
- 
--#ifdef LINUX
-+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
- 	/* first set the signal handler */
--	if(linux_set_lease_sighandler(fd) == -1)
-+	if(linux_set_lease_sighandler(fd) == -1) {
- 		return -1;
-+	}
- 
- 	result = linux_setlease(fd, leasetype);
- #else
diff --git a/package/thirdparty/samba30/samba30-3.0.37-wle-fix.patch b/package/thirdparty/samba30/samba30-3.0.37-wle-fix.patch
deleted file mode 100644
index 8a41f455a3..0000000000
--- a/package/thirdparty/samba30/samba30-3.0.37-wle-fix.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -r -u samba-3.0.37-clean/source/libsmb/asn1.c samba-3.0.37/source/libsmb/asn1.c
---- samba-3.0.37-clean/source/libsmb/asn1.c	2009-09-30 05:21:56.000000000 -0700
-+++ samba-3.0.37/source/libsmb/asn1.c	2010-11-18 12:40:06.981517350 -0800
-@@ -261,6 +261,36 @@
- 	return asn1_read(data, v, 1);
- }
- 
-+/* peek to see if a tag is present */
-+/* this was not ported from samba and may not be identical to libsmb mainline */
-+BOOL asn1_peek_tag(ASN1_DATA *data, uint8 tag)
-+{
-+  uint8 curtag;
-+
-+  if (data->has_error)
-+    return False;
-+
-+  // overflow checking
-+  if (data->ofs + 1 < data->ofs || data->ofs + 1 < 1) {
-+    return False;
-+  }
-+
-+  // boundary checking
-+  if (data->ofs + 1 > data->length) {
-+    return False;
-+  }
-+
-+  memcpy( (void*)&curtag, data->data + data->ofs, 1);
-+
-+  // don't move cursor
-+  // don't set error
-+
-+  if( tag != curtag )
-+    return False;
-+
-+  return True;
-+}
-+
- /* start reading a nested asn1 structure */
- BOOL asn1_start_tag(ASN1_DATA *data, uint8 tag)
- {
-diff -r -u samba-3.0.37-clean/source/libsmb/clispnego.c samba-3.0.37/source/libsmb/clispnego.c
---- samba-3.0.37-clean/source/libsmb/clispnego.c	2009-09-30 05:21:56.000000000 -0700
-+++ samba-3.0.37/source/libsmb/clispnego.c	2010-11-18 12:52:54.833518134 -0800
-@@ -135,9 +135,16 @@
- 
- 	asn1_start_tag(&data,ASN1_APPLICATION(0));
- 	asn1_check_OID(&data,OID_SPNEGO);
-+
-+	/* negTokenInit  [0]  NegTokenInit */
- 	asn1_start_tag(&data,ASN1_CONTEXT(0));
- 	asn1_start_tag(&data,ASN1_SEQUENCE(0));
- 
-+	/* mechTypes [0] MechTypeList  OPTIONAL */
-+
-+	/* Not really optional, we depend on this to decide
-+	 * what mechanisms we have to work with. */
-+
- 	asn1_start_tag(&data,ASN1_CONTEXT(0));
- 	asn1_start_tag(&data,ASN1_SEQUENCE(0));
- 	for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
-@@ -150,7 +157,39 @@
- 	asn1_end_tag(&data);
- 
- 	*principal = NULL;
--	if (asn1_tag_remaining(&data) > 0) {
-+
-+  /*
-+	   Win7 + Live Sign-in Assistant attaches a mechToken
-+	   ASN1_CONTEXT(2) to the negTokenInit packet
-+	   which breaks our negotiation if we just assume
-+	   the next tag is ASN1_CONTEXT(3).
-+	 */
-+
-+	 if (asn1_peek_tag(&data, ASN1_CONTEXT(1))) {
-+	         uint8 flags;
-+
-+    /* reqFlags [1] ContextFlags  OPTIONAL */
-+    asn1_start_tag(&data, ASN1_CONTEXT(1));
-+    asn1_start_tag(&data, ASN1_BITFIELD);
-+    while (asn1_tag_remaining(&data) > 0) {
-+      asn1_read_uint8(&data, &flags);
-+    }
-+    asn1_end_tag(&data);
-+    asn1_end_tag(&data);
-+  }
-+
-+  if (asn1_peek_tag(&data, ASN1_CONTEXT(2))) {
-+    /* mechToken [2] OCTET STRING  OPTIONAL */
-+    DATA_BLOB token;
-+    asn1_start_tag(&data, ASN1_CONTEXT(2));
-+    asn1_read_OctetString(&data, &token);
-+    asn1_end_tag(&data);
-+    /* Throw away the token - not used. */
-+    data_blob_free(&token);
-+  }
-+
-+  if (asn1_peek_tag(&data, ASN1_CONTEXT(3))) {
-+	     /* mechListMIC [3] OCTET STRING  OPTIONAL */
- 		asn1_start_tag(&data, ASN1_CONTEXT(3));
- 		asn1_start_tag(&data, ASN1_SEQUENCE(0));
- 		asn1_start_tag(&data, ASN1_CONTEXT(0));
diff --git a/package/thirdparty/samba30/samba30.mk b/package/thirdparty/samba30/samba30.mk
deleted file mode 100644
index 2298196f7e..0000000000
--- a/package/thirdparty/samba30/samba30.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#############################################################
-#
-# samba
-#
-#############################################################
-SAMBA30_VERSION:=3.0.37
-SAMBA30_SOURCE:=samba-$(SAMBA30_VERSION).tar.gz
-SAMBA30_SITE:=http://samba.org/samba/ftp/stable
-
-SAMBA30_SUBDIR = source
-SAMBA30_AUTORECONF = NO
-
-SAMBA30_INSTALL_STAGING = YES
-SAMBA30_INSTALL_TARGET = YES
-
-
-SAMBA30_DEPENDENCIES = \
-	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
-	$(if $(BR2_PACKAGE_SAMBA30_AVAHI),avahi) \
-
-
-SAMBA30_CONF_ENV = \
-	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-	libreplace_cv_READDIR_GETDIRENTRIES=no \
-	libreplace_cv_READDIR_GETDENTS=no \
-	linux_getgrouplist_ok=no \
-	samba_cv_REPLACE_READDIR=no \
-	samba_cv_HAVE_WRFILE_KEYTAB=yes \
-	samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
-	samba_cv_USE_SETREUID=yes \
-	samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
-	samba_cv_HAVE_IFACE_IFCONF=yes \
-	samba_cv_HAVE_MMAP=yes \
-	samba_cv_HAVE_FCNTL_LOCK=yes \
-	samba_cv_HAVE_SECURE_MKSTEMP=yes \
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
-	samba_cv_fpie=no \
-        samba_cv_have_longlong=yes \
-        samba_cv_HAVE_OFF64_T=yes \
-	libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \
-	$(if $(BR2_PACKAGE_SAMBA30_AVAHI),AVAHI_LIBS=-pthread)
-
-
-SAMBA30_CONF_OPT = \
-	--localstatedir=/var \
-	--with-piddir=/var/run \
-	--with-lockdir=/var/lock \
-	--with-logfilebase=/var/log \
-	--with-configdir=/etc/samba \
-	--with-privatedir=/etc/samba \
-	\
-	--disable-cups \
-	--enable-static \
-	--enable-shared \
-	--disable-shared-libs \
-	--disable-pie \
-	--disable-iprint \
-	--disable-relro \
-	--disable-dnssd \
-	\
-	$(if $(BR2_PACKAGE_SAMBA30_AVAHI),--enable-avahi,--disable-avahi) \
-	\
-        --disable-fam \
-        --disable-swat \
-	--without-cluster-support \
-	--without-cifsupcall \
-	--without-ads \
-	--without-ldap \
-	--with-included-popt \
-	--with-included-iniparser \
-	--without-sys-quotas \
-	--without-krb5 \
-	--without-automount \
-	--without-sendfile-support \
-	--with-libiconv=$(STAGING_DIR) \
-        --without-cifsmount \
-        --without-winbind \
-
-
-SAMBA30_INSTALL_TARGET_OPT = \
-	DESTDIR=$(TARGET_DIR) -C $(SAMBA30_DIR)/$(SAMBA30_SUBDIR) \
-	installclientlib
-
-SAMBA30_INSTALL_STAGING_OPT = \
-        DESTDIR=$(STAGING_DIR) -C $(SAMBA30_DIR)/$(SAMBA30_SUBDIR) \
-        installclientlib
-
-SAMBA30_UNINSTALL_TARGET_OPT = \
-	DESTDIR=$(TARGET_DIR) -C $(SAMBA30_DIR)/$(SAMBA30_SUBDIR) \
-	uninstallclientlib
-
-SAMBA30_UNINSTALL_STAGING_OPT = \
-        DESTDIR=$(STAGING_DIR) -C $(SAMBA30_DIR)/$(SAMBA30_SUBDIR) \
-        uninstallclientlib
-
-# non-binaries to remove
-SAMBA30_TXTTARGETS_ = \
-	usr/include/libsmbclient.h \
-	usr/include/netapi.h \
-	usr/include/smb_share_modes.h \
-	usr/include/talloc.h \
-	usr/include/tdb.h \
-	usr/include/wbclient.h
-
-define SAMBA30_REMOVE_UNNEEDED_HEADERS
-       rm -f $(addprefix $(TARGET_DIR)/, $(SAMBA30_TXTTARGETS_))
-endef
-
-SAMBA30_POST_INSTALL_TARGET_HOOKS += SAMBA30_REMOVE_UNNEEDED_HEADERS
-
-define SAMBA30_AUTOGEN
-	@$(call MESSAGE,"Reconfiguring")
-        ( cd $(@D)/source && ./autogen.sh )
-endef
-
-SAMBA30_PRE_CONFIGURE_HOOKS = SAMBA30_AUTOGEN
-
-$(eval $(call AUTOTARGETS,package/thirdparty,samba30))
-
-SAMBA30_CONFIGURE_CMDS += && ( cd $(@D)/source && make proto )
diff --git a/package/thirdparty/xbmc/Config.in b/package/thirdparty/xbmc/Config.in
index e09a1f03c6..f6d08dc267 100644
--- a/package/thirdparty/xbmc/Config.in
+++ b/package/thirdparty/xbmc/Config.in
@@ -56,8 +56,8 @@ config BR2_PACKAGE_XBMC
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_YAJL
-	select BR2_PACKAGE_SAMBA30
-	select BR2_PACKAGE_SAMBA30_LIBSMBCLIENT
+	select BR2_PACKAGE_SAMBA
+	select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
 	select BR2_PACKAGE_LIBNFS
 	select BR2_PACKAGE_LIBRTMP
 	select BR2_PACKAGE_AFPFS_NG
diff --git a/package/thirdparty/xbmc/xbmc.mk b/package/thirdparty/xbmc/xbmc.mk
index eeba56c4f2..55c7134544 100644
--- a/package/thirdparty/xbmc/xbmc.mk
+++ b/package/thirdparty/xbmc/xbmc.mk
@@ -22,7 +22,7 @@ XBMC_DEPENDENCIES += libogg flac libmad libmpeg2 libogg \
   freetype jasper jpeg libmodplug libpng libungif tiff libcurl \
   libmicrohttpd libssh2 boost fribidi ncurses pcre libnfs afpfs-ng \
   libplist libshairport libbluray libcec \
-  readline expat libxml2 yajl samba30 libass opengl libusb-compat \
+  readline expat libxml2 yajl samba libass opengl libusb-compat \
   avahi udev tinyxml taglib18 libssh
 
 ifeq ($(BR2_PACKAGE_LIBAMPLAYERM1),y)

From 51eb0ad497e3009789be017a75eb5370c7d78c24 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sun, 23 Feb 2014 06:57:36 +0100
Subject: [PATCH 6833/6849] [aml] Fix playback with amlplayer

libamcodec.so should be a relative link, not absolute
---
 package/amlogic/libamplayerm3/libamplayerm3.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/amlogic/libamplayerm3/libamplayerm3.mk b/package/amlogic/libamplayerm3/libamplayerm3.mk
index fcbbcdca6d..512959504e 100644
--- a/package/amlogic/libamplayerm3/libamplayerm3.mk
+++ b/package/amlogic/libamplayerm3/libamplayerm3.mk
@@ -37,7 +37,7 @@ define LIBAMPLAYERM3_INSTALL_STAGING_CMDS
 	install -m 644 $(@D)/usr/include/amlplayer/ppmgr/*.h $(STAGING_DIR)/usr/include/amlplayer/ppmgr
 	mkdir -p $(STAGING_DIR)/usr/lib
 	install -m 755 $(@D)/usr/lib/*.so* $(STAGING_DIR)/usr/lib
-	ln -s $(STAGING_DIR)/usr/lib/libamcodec.so.0.0 $(STAGING_DIR)/usr/lib/libamcodec.so
+	ln -s -r $(STAGING_DIR)/usr/lib/libamcodec.so.0.0 $(STAGING_DIR)/usr/lib/libamcodec.so
 	#find $(@D)/usr -type f -exec install -m 644 {} $(STAGING_DIR)/usr \;
 
 	#temporary, until we sync with mainline xbmc
@@ -52,7 +52,7 @@ define LIBAMPLAYERM3_INSTALL_TARGET_CMDS
 	install -m 644 $(@D)/lib/firmware/*.bin $(TARGET_DIR)/lib/firmware
 	mkdir -p $(TARGET_DIR)/usr/lib
 	install -m 755 $(@D)/usr/lib/*.so* $(TARGET_DIR)/usr/lib
-	ln -s $(TARGET_DIR)/usr/lib/libamcodec.so.0.0 $(TARGET_DIR)/usr/lib/libamcodec.so
+	ln -s -r $(TARGET_DIR)/usr/lib/libamcodec.so.0.0 $(TARGET_DIR)/usr/lib/libamcodec.so
 #	find $(@D)/lib -type f -exec install -m 644 {} $(TARGET_DIR)/lib \;
 #	find $(@D)/usr/lib -type f -exec install -m 644 {} $(TARGET_DIR)/usr/lib \;
 endef

From 0de8801de0519b6bcbe7f844d9c3564b59e27065 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sun, 23 Feb 2014 07:27:54 +0100
Subject: [PATCH 6834/6849] [aml] Fix compilation when using autopoint

The host version of autopoint was being used because AUTOPOINT is
not defined, leading to build failures such as this (with util-linux
2.20.1):

autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using
autopoint: *** Stop.
---
 package/autoconf/autoconf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 0ff0644f94..45bb635309 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -23,4 +23,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
 AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"

From e51587f654f42bc50758644fb1f1cd73b2d4a546 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sun, 23 Feb 2014 18:10:41 +0100
Subject: [PATCH 6835/6849] [aml] Use target version of libusb-config in lirc

Fix compilation of the lirc package in cases where
the build host has a different version of libusb-config
---
 package/thirdparty/lirc/lirc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/thirdparty/lirc/lirc.mk b/package/thirdparty/lirc/lirc.mk
index feb249dbfa..ae13824d67 100644
--- a/package/thirdparty/lirc/lirc.mk
+++ b/package/thirdparty/lirc/lirc.mk
@@ -18,7 +18,7 @@ LIRC_CONF_OPT += --without-x
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 LIRC_MAKE_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH)
-LIRC_CONF_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH)
+LIRC_CONF_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH) LIBUSB_CONFIG=$(STAGING_DIR)/usr/bin/libusb-config
 else
 LIRC_MAKE_ENV += PATH=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
 LIRC_CONF_ENV += PATH=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)

From 2f22fc658450f37714ec87e60b0c06e2f605b23a Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sun, 23 Feb 2014 18:49:04 +0100
Subject: [PATCH 6836/6849] [aml] Rename xios to xios-skin

Fix xios-skin package: it seems that newer versions of buildroot require
that the package name matches the directory name
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig  |  2 +-
 configs/amlogic_xios-xbmc_defconfig            |  2 +-
 configs/amlogic_xios_m3-xbmc_defconfig         |  2 +-
 package/thirdparty/xios-skin/Config.in         |  2 +-
 .../xios-skin/{xios.mk => xios-skin.mk}        | 18 +++++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename package/thirdparty/xios-skin/{xios.mk => xios-skin.mk} (62%)

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index c3f1f0e3a1..c6fe1e9da5 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -23,7 +23,7 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
-BR2_PACKAGE_XIOS=y
+BR2_PACKAGE_XIOS_SKIN=y
 BR2_PACKAGE_QT=y
 BR2_PACKAGE_QT_DEMOS=y
 BR2_PACKAGE_QT_LICENSE_APPROVED=y
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index d975d54825..fb2eb6f120 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -23,7 +23,7 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
-BR2_PACKAGE_XIOS=y
+BR2_PACKAGE_XIOS_SKIN=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
 BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index e8f357e6c6..902923a1b9 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -23,7 +23,7 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
-BR2_PACKAGE_XIOS=y
+BR2_PACKAGE_XIOS_SKIN=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
 BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
diff --git a/package/thirdparty/xios-skin/Config.in b/package/thirdparty/xios-skin/Config.in
index 9e02c6ae53..1598a95c3b 100644
--- a/package/thirdparty/xios-skin/Config.in
+++ b/package/thirdparty/xios-skin/Config.in
@@ -1,3 +1,3 @@
-config BR2_PACKAGE_XIOS
+config BR2_PACKAGE_XIOS_SKIN
 depends on BR2_PACKAGE_XBMC
         bool "XIOS Skin"
diff --git a/package/thirdparty/xios-skin/xios.mk b/package/thirdparty/xios-skin/xios-skin.mk
similarity index 62%
rename from package/thirdparty/xios-skin/xios.mk
rename to package/thirdparty/xios-skin/xios-skin.mk
index 676a8fffbb..bae6bd8c56 100644
--- a/package/thirdparty/xios-skin/xios.mk
+++ b/package/thirdparty/xios-skin/xios-skin.mk
@@ -1,21 +1,21 @@
-XIOS_VERSION = 78e564bc2d8411a328459b9957741cd3e3493074
-XIOS_SITE_METHOD = git
-XIOS_SITE = git://github.com/Pivosgroup/skin.pivos.git
-XIOS_INSTALL_STAGING = YES
-XIOS_INSTALL_TARGET = YES
-XIOS_DEPENDENCIES = xbmc
+XIOS_SKIN_VERSION = 78e564bc2d8411a328459b9957741cd3e3493074
+XIOS_SKIN_SITE_METHOD = git
+XIOS_SKIN_SITE = git://github.com/Pivosgroup/skin.pivos.git
+XIOS_SKIN_INSTALL_STAGING = YES
+XIOS_SKIN_INSTALL_TARGET = YES
+XIOS_SKIN_DEPENDENCIES = xbmc
 TEXTURE_PACKER=$(XBMC_DIR)/tools/TexturePacker/TexturePacker
 
-define XIOS_BUILD_CMDS
+define XIOS_SKIN_BUILD_CMDS
 	$(TEXTURE_PACKER) -use_none -i $(@D)/media -o $(@D)/media/Textures.xbt
 endef
 
-define XIOS_INSTALL_STAGING_CMDS
+define XIOS_SKIN_INSTALL_STAGING_CMDS
         mkdir -p $(STAGING_DIR)/usr/share/xbmc/addons/skin.xios
         cp -rf $(@D)/* $(STAGING_DIR)/usr/share/xbmc/addons/skin.xios/
 endef
 
-define XIOS_INSTALL_TARGET_CMDS
+define XIOS_SKIN_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/share/xbmc/addons/skin.xios/media
 	cd $(@D); cp -rf `ls -I media -1` $(TARGET_DIR)/usr/share/xbmc/addons/skin.xios
 	cp -f $(@D)/media/Textures.xbt $(TARGET_DIR)/usr/share/xbmc/addons/skin.xios/media

From ffa6fe1fdfa150dedc8609900c74527aa065ed57 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Mon, 24 Feb 2014 17:48:30 +0100
Subject: [PATCH 6837/6849] [aml] Remove conflicting thirdparty packages

Buildroot 2011.11 provides packages for bluez_utils and yajl so the
thirdparty versions need to be removed
---
 package/thirdparty/Config.in                  |  2 -
 package/thirdparty/bluez_utils/Config.in      | 34 -------------
 package/thirdparty/bluez_utils/bluez_utils.mk | 48 -------------------
 package/thirdparty/yajl/Config.in             |  8 ----
 package/thirdparty/yajl/yajl.mk               | 11 -----
 5 files changed, 103 deletions(-)
 delete mode 100644 package/thirdparty/bluez_utils/Config.in
 delete mode 100644 package/thirdparty/bluez_utils/bluez_utils.mk
 delete mode 100644 package/thirdparty/yajl/Config.in
 delete mode 100644 package/thirdparty/yajl/yajl.mk

diff --git a/package/thirdparty/Config.in b/package/thirdparty/Config.in
index a1cef701dc..7d6205ab0b 100644
--- a/package/thirdparty/Config.in
+++ b/package/thirdparty/Config.in
@@ -1,5 +1,4 @@
 menu "XBMC and its Dependencies"
-source "package/thirdparty/bluez_utils/Config.in"
 source "package/thirdparty/boost/Config.in"
 source "package/thirdparty/fribidi/Config.in"
 source "package/thirdparty/jasper/Config.in"
@@ -22,7 +21,6 @@ source "package/thirdparty/taglib18/Config.in"
 source "package/thirdparty/tinyxml/Config.in"
 source "package/thirdparty/tvheadend/Config.in"
 source "package/thirdparty/v4lutils/Config.in"
-source "package/thirdparty/yajl/Config.in"
 source "package/thirdparty/xbmc/Config.in"
 source "package/thirdparty/xbmcpvr/Config.in"
 source "package/thirdparty/xios-skin/Config.in"
diff --git a/package/thirdparty/bluez_utils/Config.in b/package/thirdparty/bluez_utils/Config.in
deleted file mode 100644
index 3517407d8f..0000000000
--- a/package/thirdparty/bluez_utils/Config.in
+++ /dev/null
@@ -1,34 +0,0 @@
-config BR2_PACKAGE_BLUEZ_UTILS
-	bool "bluez-utils"
-	depends on BR2_USE_WCHAR # libglib2
-	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_LIBGLIB2
-	help
-	  bluez utils
-
-	  http://www.kernel.org/pub/linux/bluetooth
-
-if BR2_PACKAGE_BLUEZ_UTILS
-
-config BR2_PACKAGE_BLUEZ_UTILS_COMPAT
-	bool "BlueZ 3.x compatibility binaries"
-	help
-	  BlueZ 3.x compatibility binaries like pand, hidd, sdp
-
-config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
-	bool "audio support"
-	select BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_LIBSNDFILE
-	help
-	  Audio support
-
-config BR2_PACKAGE_BLUEZ_UTILS_USB
-	bool "USB support"
-	select BR2_PACKAGE_LIBUSB
-	help
-	  USB support
-
-endif
-
-comment "bluez-utils require a toolchain with WCHAR support"
-	depends on !(BR2_USE_WCHAR)
diff --git a/package/thirdparty/bluez_utils/bluez_utils.mk b/package/thirdparty/bluez_utils/bluez_utils.mk
deleted file mode 100644
index 6682f6d345..0000000000
--- a/package/thirdparty/bluez_utils/bluez_utils.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#############################################################
-#
-# bluez_utils
-#
-#############################################################
-
-BLUEZ_UTILS_VERSION = 4.99
-BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
-BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
-BLUEZ_UTILS_INSTALL_STAGING = YES
-BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
-BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
-BLUEZ_UTILS_AUTORECONF = YES
-
-# BlueZ 3.x compatibility
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPT +=	\
-	--enable-hidd	\
-	--enable-pand	\
-	--enable-sdp	\
-	--enable-dund
-endif
-
-# audio support
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
-BLUEZ_UTILS_DEPENDENCIES +=	\
-	alsa-lib		\
-	libsndfile
-BLUEZ_UTILS_CONF_OPT +=	\
-	--enable-alsa	\
-	--enable-audio
-else
-BLUEZ_UTILS_CONF_OPT +=	\
-	--disable-alsa	\
-	--disable-audio
-endif
-
-# USB support
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
-BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPT +=	\
-	--enable-usb
-else
-BLUEZ_UTILS_CONF_OPT +=	\
-	--disable-usb
-endif
-
-$(eval $(call AUTOTARGETS,package/thirdparty,bluez_utils))
diff --git a/package/thirdparty/yajl/Config.in b/package/thirdparty/yajl/Config.in
deleted file mode 100644
index e1b46f410a..0000000000
--- a/package/thirdparty/yajl/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_YAJL
-  bool "yajl"
-  help
-    Yet Another JSON Library. YAJL is a small event-driven
-    (SAX-style) JSON parser written in ANSI C, and a small
-    validating JSON generator.
-
-    http://lloyd.github.com/yajl/
diff --git a/package/thirdparty/yajl/yajl.mk b/package/thirdparty/yajl/yajl.mk
deleted file mode 100644
index 9523252481..0000000000
--- a/package/thirdparty/yajl/yajl.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-#
-## yajl
-#
-#################################################################################
-
-YAJL_VERSION = 2.0.2
-YAJL_SITE = git://github.com/lloyd/yajl.git
-YAJL_INSTALL_STAGING = YES
-
-$(eval $(call CMAKETARGETS,package/thirdparty,yajl))

From b4cc0b9e25eadcf1c13673d3af972730215a19e5 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Mon, 24 Feb 2014 21:26:33 +0100
Subject: [PATCH 6838/6849] [aml] Fixes after the merge with buildroot 2012.05:

* Buildroot 2012.05 provides a package for boost so remove the thirdparty version
* BR2_KERNEL_MIRROR is supposed to point to kernel.org, not github
* Add m4-1.4.16-no-gets.patch
* Regenerate udev patches against udev-182
* toolchainfile.cmake is now generated in $(HOST_DIR)/usr/share/buildroot/
* Remove sdl-fix__XGetRequest_undefined.patch because it is now included upstream
* Host version of sdl needs a host version of alsa-lib
* Build static host version of libpython
---
 package/alsa-lib/alsa-lib.mk                  |  1 +
 package/m4/m4-1.4.16-no-gets.patch            | 38 ++++++++++++
 package/python/python.mk                      | 14 +----
 .../sdl/sdl-fix__XGetRequest_undefined.patch  | 60 -------------------
 package/thirdparty/libssh/libssh.mk           |  3 +-
 package/udev/udev-accept4.patch               | 54 ++++++++---------
 package/udev/udev-trigger_happy.patch         | 10 ++--
 7 files changed, 74 insertions(+), 106 deletions(-)
 create mode 100644 package/m4/m4-1.4.16-no-gets.patch
 delete mode 100644 package/sdl/sdl-fix__XGetRequest_undefined.patch

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 2d27c960ca..15f01790ef 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -84,3 +84,4 @@ define ALSA_LIB_UNINSTALL_STAGING_CMDS
 endef
 
 $(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/m4/m4-1.4.16-no-gets.patch b/package/m4/m4-1.4.16-no-gets.patch
new file mode 100644
index 0000000000..a0573776b6
--- /dev/null
+++ b/package/m4/m4-1.4.16-no-gets.patch
@@ -0,0 +1,38 @@
+Since the 2.16 release of the glibc, 'gets' is not any more defined in the gnulib.
+No m4 version synchronized with gnulib since [1] has been released yet.
+
+This patch avoids the following error occurs when building m4 <=1.4.16 on host using
+a glibc >=2.16:
+
+make[4]: Entering directory `/opt/buildroot/output/build/host-m4-1.4.16/lib'
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT gl_avltree_oset.o -MD -MP -MF .deps/gl_avltree_oset.Tpo -c -o gl_avltree_oset.o gl_avltree_oset.c
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT c-ctype.o -MD -MP -MF .deps/c-ctype.Tpo -c -o c-ctype.o c-ctype.c
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT c-stack.o -MD -MP -MF .deps/c-stack.Tpo -c -o c-stack.o c-stack.c
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT clean-temp.o -MD -MP -MF .deps/clean-temp.Tpo -c -o clean-temp.o clean-temp.c
+mv -f .deps/c-ctype.Tpo .deps/c-ctype.Po
+/opt/buildroot/output/host/usr/bin/ccache /usr/bin/gcc -std=gnu99  -I.     -O2 -I/opt/buildroot/output/host/include -I/opt/buildroot/output/host/usr/include -MT close-hook.o -MD -MP -MF .deps/close-hook.Tpo -c -o close-hook.o close-hook.c
+In file included from clean-temp.h:22:0,
+                 from clean-temp.c:23:
+./stdio.h:477:20: error 'gets' undeclared here (not in a function)
+make[4]: *** [clean-temp.o] Error 1
+
+References:
+[1] http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=66712c23388e93e5c518ebc8515140fa0c807348
+[2] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?diff_format=h&revision=1.1&view=markup
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+diff -purN host-m4-1.4.16.orig/lib/stdio.in.h host-m4-1.4.16/lib/stdio.in.h
+--- host-m4-1.4.16.orig/lib/stdio.in.h	2012-07-21 19:11:40.196541826 +0200
++++ host-m4-1.4.16/lib/stdio.in.h	2012-07-21 20:46:05.405850751 +0200
+@@ -162,7 +162,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/package/python/python.mk b/package/python/python.mk
index bf8fe298c6..08551543b5 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -15,6 +15,7 @@ PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
 # third-party Python modules.
 
 HOST_PYTHON_CONF_OPT += 	\
+	--enable-static		\
 	--without-cxx-main 	\
 	--disable-sqlite3	\
 	--disable-tk		\
@@ -36,19 +37,6 @@ HOST_PYTHON_MAKE_ENV = \
 
 HOST_PYTHON_AUTORECONF = YES
 
-define HOST_PYTHON_CONFIGURE_CMDS
-	(cd $(@D) && rm -rf config.cache; \
-	        $(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-                $(HOST_PYTHON_CONF_ENV) \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
-		$(HOST_PYTHON_CONF_OPT) \
-	)
-endef
-
 PYTHON_DEPENDENCIES  = host-python libffi
 
 HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
diff --git a/package/sdl/sdl-fix__XGetRequest_undefined.patch b/package/sdl/sdl-fix__XGetRequest_undefined.patch
deleted file mode 100644
index 7dd5d7cacc..0000000000
--- a/package/sdl/sdl-fix__XGetRequest_undefined.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-@@ -, +, @@ 
- added.
- src/video/x11/SDL_x11dyn.c |   24 ++++++++++++++++++++++++
- src/video/x11/SDL_x11sym.h |    6 ++++++
- 2 files changed, 30 insertions(+), 0 deletions(-)
---- a/src/video/x11/SDL_x11dyn.c	
-+++ a/src/video/x11/SDL_x11dyn.c	
-@@ -109,6 +109,21 @@ char *(*pXGetICValues)(XIC, ...) = NULL;
- #undef SDL_X11_SYM
- 
- 
-+static void *SDL_XGetRequest_workaround(Display* dpy, CARD8 type, size_t len)
-+{
-+	xReq *req;
-+	WORD64ALIGN
-+	if (dpy->bufptr + len > dpy->bufmax)
-+		_XFlush(dpy);
-+	dpy->last_req = dpy->bufptr;
-+	req = (xReq*)dpy->bufptr;
-+	req->reqType = type;
-+	req->length = len / 4;
-+	dpy->bufptr += len;
-+	dpy->request++;
-+	return req;
-+}
-+
- static int x11_load_refcount = 0;
- 
- void SDL_X11_UnloadSymbols(void)
-@@ -168,6 +183,15 @@ int SDL_X11_LoadSymbols(void)
- 		X11_GetSym("XGetICValues",&SDL_X11_HAVE_UTF8,(void **)&pXGetICValues);
- 		#endif
- 
-+		/*
-+		 * In case we're built with newer Xlib headers, we need to make sure
-+		 *  that _XGetRequest() is available, even on older systems.
-+		 *  Otherwise, various Xlib macros we use will call a NULL pointer.
-+		 */
-+		if (!SDL_X11_HAVE_XGETREQUEST) {
-+			p_XGetRequest = SDL_XGetRequest_workaround;
-+		}
-+
- 		if (SDL_X11_HAVE_BASEXLIB) {  /* all required symbols loaded. */
- 			SDL_ClearError();
- 		} else {
---- a/src/video/x11/SDL_x11sym.h	
-+++ a/src/video/x11/SDL_x11sym.h	
-@@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,
- #endif
- 
- /*
-+ * libX11 1.4.99.1 added _XGetRequest, and macros use it behind the scenes.
-+ */
-+SDL_X11_MODULE(XGETREQUEST)
-+SDL_X11_SYM(void *,_XGetRequest,(Display* a,CARD8 b,size_t c),(a,b,c),return)
-+
-+/*
-  * These only show up on some variants of Unix.
-  */
- #if defined(__osf__)
diff --git a/package/thirdparty/libssh/libssh.mk b/package/thirdparty/libssh/libssh.mk
index 0199ccba9d..f63472358c 100644
--- a/package/thirdparty/libssh/libssh.mk
+++ b/package/thirdparty/libssh/libssh.mk
@@ -13,10 +13,11 @@ LIBSSH_CONFIGURE_CMDS = \
         (mkdir -p $(LIBSSH_TEMP_BUILDDIR) && rm -rf $(LIBSSH_TEMP_BUILDDIR)/* && \
          cd $(LIBSSH_TEMP_BUILDDIR) && \
         $(LIBSSH_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $(LIBSSH_SRCDIR) \
-                -DCMAKE_TOOLCHAIN_FILE="$(BASE_DIR)/toolchainfile.cmake" \
+                -DCMAKE_TOOLCHAIN_FILE="$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
                 -DCMAKE_INSTALL_PREFIX="/usr" \
                 $(LIBSSH_CONF_OPT) \
         )
+LIBSSH_DEPENDENCIES += zlib
 
 LIBSSH_BUILD_CMDS = \
         $(HOST_MAKE_ENV) $(LIBSSH_MAKE_ENV) $(LIBSSH_MAKE) $(LIBSSH_MAKE_OPT) -C $(LIBSSH_TEMP_BUILDDIR)
diff --git a/package/udev/udev-accept4.patch b/package/udev/udev-accept4.patch
index 0cd5c5f8eb..0f12369ffa 100644
--- a/package/udev/udev-accept4.patch
+++ b/package/udev/udev-accept4.patch
@@ -1,6 +1,6 @@
-diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
---- a/udev/udev-ctrl.c	2011-10-09 17:10:32.000000000 -0600
-+++ b/udev/udev-ctrl.c	2011-10-25 15:11:09.000000000 -0600
+diff -ruN udev.orig/src/udev-ctrl.c udev.new/src/udev-ctrl.c
+--- udev.orig/src/udev-ctrl.c	2012-01-29 01:15:46.000000000 +0100
++++ udev.new/src/udev-ctrl.c	2013-12-03 15:45:44.000000000 +0100
 @@ -15,6 +15,7 @@
  #include <stddef.h>
  #include <string.h>
@@ -10,32 +10,32 @@ diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
  #include <sys/poll.h>
  #include <sys/socket.h>
 @@ -182,6 +183,7 @@
- 	struct ucred ucred;
- 	socklen_t slen;
- 	const int on = 1;
-+	int flgs;
+         struct ucred ucred;
+         socklen_t slen;
+         const int on = 1;
++        int flgs;
  
- 	conn = calloc(1, sizeof(struct udev_ctrl_connection));
- 	if (conn == NULL)
+         conn = calloc(1, sizeof(struct udev_ctrl_connection));
+         if (conn == NULL)
 @@ -189,13 +191,19 @@
- 	conn->refcount = 1;
- 	conn->uctrl = uctrl;
+         conn->refcount = 1;
+         conn->uctrl = uctrl;
  
--	conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
-+//	conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
-+	conn->sock = accept(uctrl->sock, NULL, NULL);
- 	if (conn->sock < 0) {
- 		if (errno != EINTR)
- 			err(uctrl->udev, "unable to receive ctrl connection: %m\n");
- 		goto err;
- 	}
+-        conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
++//        conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
++        conn->sock = accept(uctrl->sock, NULL, NULL);
+         if (conn->sock < 0) {
+                 if (errno != EINTR)
+                         err(uctrl->udev, "unable to receive ctrl connection: %m\n");
+                 goto err;
+         }
  
-+// Since we don't have accept4
-+	flgs = fcntl(conn->sock, F_GETFL, NULL);
-+	if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
-+	fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
++        // Since we don't have accept4
++        flgs = fcntl(conn->sock, F_GETFL, NULL);
++        if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
++        fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
 +
- 	/* check peer credential of connection */
- 	slen = sizeof(ucred);
- 	if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
-
+         /* check peer credential of connection */
+         slen = sizeof(ucred);
+         if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
+Binary files udev.orig/src/.udev-ctrl.c.swp and udev.new/src/.udev-ctrl.c.swp differ
diff --git a/package/udev/udev-trigger_happy.patch b/package/udev/udev-trigger_happy.patch
index a8452ac79a..15b18b33d7 100644
--- a/package/udev/udev-trigger_happy.patch
+++ b/package/udev/udev-trigger_happy.patch
@@ -1,9 +1,9 @@
-diff -ruN udev-173/extras/input_id/input_id.c udev-173-good//extras/input_id/input_id.c
---- udev-173/extras/input_id/input_id.c	2011-07-18 14:00:25.747859817 -0400
-+++ udev-173-good//extras/input_id/input_id.c	2012-04-05 23:11:19.677562254 -0400
+diff -ruN udev.orig/src/udev-builtin-input_id.c udev.new/src/udev-builtin-input_id.c
+--- udev.orig/src/udev-builtin-input_id.c	2012-01-29 01:15:46.000000000 +0100
++++ udev.new/src/udev-builtin-input_id.c	2013-12-03 15:48:39.000000000 +0100
 @@ -30,6 +30,10 @@
- #include "libudev.h"
- #include "libudev-private.h"
+ 
+ #include "udev.h"
  
 +#ifndef BTN_TRIGGER_HAPPY
 +#define BTN_TRIGGER_HAPPY 0x2c0

From 1c61e7dec55504d2242b60659a8545590942f49c Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Tue, 25 Feb 2014 20:43:47 +0100
Subject: [PATCH 6839/6849] [aml] Fix lirc package for cross-compilation

If the toolchain is changed then binutils may have a different prefix
---
 package/thirdparty/lirc/lirc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/thirdparty/lirc/lirc.mk b/package/thirdparty/lirc/lirc.mk
index 814ccc7aa1..832cb1f6e7 100644
--- a/package/thirdparty/lirc/lirc.mk
+++ b/package/thirdparty/lirc/lirc.mk
@@ -17,8 +17,8 @@ LIRC_CONF_OPT += ac_cv_path_mknod=$(shell which echo)
 LIRC_CONF_OPT += --without-x
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-LIRC_MAKE_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH)
-LIRC_CONF_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH) LIBUSB_CONFIG=$(STAGING_DIR)/usr/bin/libusb-config
+LIRC_MAKE_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH) CROSS_COMPILE=$(TOOLCHAIN_EXTERNAL_PREFIX)-
+LIRC_CONF_ENV += PATH=$(TOOLCHAIN_EXTERNAL_DIR)/bin:$(TARGET_PATH) CROSS_COMPILE=$(TOOLCHAIN_EXTERNAL_PREFIX)- LIBUSB_CONFIG=$(STAGING_DIR)/usr/bin/libusb-config
 else
 LIRC_MAKE_ENV += PATH=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
 LIRC_CONF_ENV += PATH=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)

From bb7fd30286f40aca653b62df22e82b6ef515c8a3 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Tue, 25 Feb 2014 20:44:33 +0100
Subject: [PATCH 6840/6849] [aml] Bump package versions

The previous versions of GDB and Busybox no longer exist on buildroot
2012.05
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig | 4 ++--
 configs/amlogic_xios-xbmc_defconfig           | 4 ++--
 configs/amlogic_xios_m3-xbmc_defconfig        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index f7e5912b5e..d6b986f986 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -5,7 +5,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
-BR2_GDB_VERSION_7_1=y
+BR2_GDB_VERSION_7_4=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
 BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
@@ -16,7 +16,7 @@ BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
-BR2_BUSYBOX_VERSION_1_18_X=y
+BR2_BUSYBOX_VERSION_1_20_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index c507e06f37..086f3b2df1 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -5,7 +5,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
-BR2_GDB_VERSION_7_1=y
+BR2_GDB_VERSION_7_4=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
 BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
@@ -16,7 +16,7 @@ BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
-BR2_BUSYBOX_VERSION_1_18_X=y
+BR2_BUSYBOX_VERSION_1_20_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index e93382ce7d..2eac4901ae 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -6,7 +6,7 @@ BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_7_1=y
+BR2_GDB_VERSION_7_4=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
 BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
@@ -16,7 +16,7 @@ BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
-BR2_BUSYBOX_VERSION_1_18_X=y
+BR2_BUSYBOX_VERSION_1_20_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_UBOOTAML=y

From 55718de081a90e5065d3782bb2beaac5e21f8e47 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Wed, 26 Feb 2014 03:49:50 +0100
Subject: [PATCH 6841/6849] [aml] Fixes after the merge with buildroot 2012.11:

* Switch to custom toolchain since BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1 has been removed but the kernel does not appear to work with anything else
* Use generic-package instead of GENTARGETS in thirdparty packages
* Use autotools-package instead of AUTOTARGETS in thirdparty packages
* Use cmake-package instead of CMAKETARGETS in thirdparty packages
* Don't use explicitly named sourceforge mirrors because BR2_SOURCEFORGE_MIRROR was eliminated in 2012.08
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig          | 8 +++++++-
 configs/amlogic_xios-xbmc_defconfig                    | 8 +++++++-
 configs/amlogic_xios_m3-xbmc_defconfig                 | 8 +++++++-
 linux/linux.mk                                         | 2 +-
 package/alsa-lib/alsa-lib.mk                           | 2 +-
 package/amlogic/amremote_config/amremote_config.mk     | 2 +-
 package/amlogic/cmem/cmem.mk                           | 2 +-
 package/amlogic/libamplayerm1/libamplayerm1.mk         | 2 +-
 package/amlogic/libamplayerm3/libamplayerm3.mk         | 2 +-
 package/amlogic/opengl/opengl.mk                       | 2 +-
 package/amlogic/ubootaml/ubootaml.mk                   | 2 +-
 package/amlogic/ubootamltoolchain/ubootamltoolchain.mk | 2 +-
 package/jpeg/jpeg.mk                                   | 2 +-
 package/sdl/sdl.mk                                     | 2 +-
 package/sdl_image/sdl_image.mk                         | 3 ++-
 package/thirdparty/afpfs-ng/afpfs-ng.mk                | 2 +-
 package/thirdparty/boblight/boblight.mk                | 2 +-
 package/thirdparty/fribidi/fribidi.mk                  | 2 +-
 package/thirdparty/jasper/jasper.mk                    | 2 +-
 package/thirdparty/joe/joe.mk                          | 4 ++--
 package/thirdparty/libass/libass.mk                    | 2 +-
 package/thirdparty/libbluray/libbluray.mk              | 2 +-
 package/thirdparty/libcdio/libcdio.mk                  | 2 +-
 package/thirdparty/libcec/libcec.mk                    | 2 +-
 package/thirdparty/libenca/libenca.mk                  | 2 +-
 package/thirdparty/libmodplug/libmodplug.mk            | 2 +-
 package/thirdparty/libnfs/libnfs.mk                    | 2 +-
 package/thirdparty/libplist/libplist.mk                | 2 +-
 package/thirdparty/librtmp/librtmp.mk                  | 2 +-
 package/thirdparty/libshairport/libshairport.mk        | 2 +-
 package/thirdparty/libssh/libssh.mk                    | 2 +-
 package/thirdparty/libssh2/libssh2.mk                  | 2 +-
 package/thirdparty/lirc/lirc.mk                        | 5 ++---
 package/thirdparty/recovery_reboot/recovery_reboot.mk  | 2 +-
 package/thirdparty/taglib18/taglib18.mk                | 2 +-
 package/thirdparty/tinyxml/tinyxml.mk                  | 3 ++-
 package/thirdparty/tvheadend/tvheadend.mk              | 2 +-
 package/thirdparty/v4lutils/v4lutils.mk                | 2 +-
 package/thirdparty/xbmc/xbmc.mk                        | 2 +-
 package/thirdparty/xbmcpvr/xbmcpvr.mk                  | 3 +--
 package/thirdparty/xios-skin/xios-skin.mk              | 2 +-
 package/tiff/tiff.mk                                   | 2 +-
 42 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index d6b986f986..9e7dfa9249 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -2,7 +2,13 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://sourcery.mentor.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_GDB_VERSION_7_4=y
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index 086f3b2df1..bbda4d1d8f 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -2,7 +2,13 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://sourcery.mentor.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_GDB_VERSION_7_4=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index 2eac4901ae..85ceb09611 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -2,7 +2,13 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://sourcery.mentor.com/sgpp/lite/arm/portal/package6488/public/arm-none-linux-gnueabi/arm-2010q1-202-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
diff --git a/linux/linux.mk b/linux/linux.mk
index b7c82a2ff5..fea8b2625f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -239,7 +239,7 @@ endef
 
 
 define LINUX_INSTALL_IMAGES_CMDS
-	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
+	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(LINUX_IMAGE_NAME)-$(LINUX_VERSION_PROBED)
 endef
 
 define LINUX_INSTALL_TARGET_CMDS
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 68f713bb92..f541ef0b2b 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -86,4 +86,4 @@ define ALSA_LIB_UNINSTALL_STAGING_CMDS
 endef
 
 $(eval $(autotools-package))
-$(eval $(autotools-package-host))
\ No newline at end of file
+$(eval $(host-autotools-package))
diff --git a/package/amlogic/amremote_config/amremote_config.mk b/package/amlogic/amremote_config/amremote_config.mk
index 6012cdfc96..63ccb8c5fd 100644
--- a/package/amlogic/amremote_config/amremote_config.mk
+++ b/package/amlogic/amremote_config/amremote_config.mk
@@ -18,4 +18,4 @@ define AMREMOTE_CONFIG_INSTALL_TARGET_CMDS
         install -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/amremote_config
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,amremote_config))
+$(eval $(generic-package))
diff --git a/package/amlogic/cmem/cmem.mk b/package/amlogic/cmem/cmem.mk
index 37833407b6..7b1ab72161 100644
--- a/package/amlogic/cmem/cmem.mk
+++ b/package/amlogic/cmem/cmem.mk
@@ -17,4 +17,4 @@ define CMEM_INSTALL_STAGING_CMDS
         install -m 755 $(@D)/libcmem.a $(TARGET_DIR)/usr/lib
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,cmem))
+$(eval $(generic-package))
diff --git a/package/amlogic/libamplayerm1/libamplayerm1.mk b/package/amlogic/libamplayerm1/libamplayerm1.mk
index f455c25437..2d6e345f0b 100644
--- a/package/amlogic/libamplayerm1/libamplayerm1.mk
+++ b/package/amlogic/libamplayerm1/libamplayerm1.mk
@@ -51,4 +51,4 @@ define LIBAMPLAYERM1_INSTALL_TARGET_CMDS
 	ln -s $(TARGET_DIR)/usr/lib/libamcodec.so.0.0 $(TARGET_DIR)/usr/lib/libamcodec.so
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,libamplayerm1))
+$(eval $(generic-package))
diff --git a/package/amlogic/libamplayerm3/libamplayerm3.mk b/package/amlogic/libamplayerm3/libamplayerm3.mk
index 512959504e..dddd6cebe1 100644
--- a/package/amlogic/libamplayerm3/libamplayerm3.mk
+++ b/package/amlogic/libamplayerm3/libamplayerm3.mk
@@ -57,4 +57,4 @@ define LIBAMPLAYERM3_INSTALL_TARGET_CMDS
 #	find $(@D)/usr/lib -type f -exec install -m 644 {} $(TARGET_DIR)/usr/lib \;
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,libamplayerm3))
+$(eval $(generic-package))
diff --git a/package/amlogic/opengl/opengl.mk b/package/amlogic/opengl/opengl.mk
index c3b48e084c..1446b0a7c1 100644
--- a/package/amlogic/opengl/opengl.mk
+++ b/package/amlogic/opengl/opengl.mk
@@ -24,4 +24,4 @@ define OPENGL_INSTALL_TARGET_CMDS
 	cd $(TARGET_DIR)/usr/lib; mv libGLESv2.so.2.0 libGLESv2.so
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,opengl))
+$(eval $(generic-package))
diff --git a/package/amlogic/ubootaml/ubootaml.mk b/package/amlogic/ubootaml/ubootaml.mk
index 114800c946..af494ab77a 100644
--- a/package/amlogic/ubootaml/ubootaml.mk
+++ b/package/amlogic/ubootaml/ubootaml.mk
@@ -18,4 +18,4 @@ define UBOOTAML_INSTALL_STAGING_CMDS
 	install $(@D)/build/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,ubootaml))
+$(eval $(generic-package))
diff --git a/package/amlogic/ubootamltoolchain/ubootamltoolchain.mk b/package/amlogic/ubootamltoolchain/ubootamltoolchain.mk
index 335ef2e644..06337c7a68 100644
--- a/package/amlogic/ubootamltoolchain/ubootamltoolchain.mk
+++ b/package/amlogic/ubootamltoolchain/ubootamltoolchain.mk
@@ -10,4 +10,4 @@ define UBOOTAMLTOOLCHAIN_BUILD_CMDS
 	cp -rf $(@D)/share $(TOOLCHAIN_EXTERNAL_DIR)
 endef
 
-$(eval $(call GENTARGETS,package/amlogic,ubootamltoolchain)) 
+$(eval $(generic-package))
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 5d4298da07..e141f9b270 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 JPEG_VERSION = 1.2.1
-JPEG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libjpeg-turbo
+JPEG_SITE = http://downloads.sourceforge.net/sourceforge/libjpeg-turbo
 JPEG_SOURCE = libjpeg-turbo-$(JPEG_VERSION).tar.gz
 JPEG_INSTALL_STAGING = YES
 JPEG_INSTALL_TARGET = YES
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 74e8cca700..0ff445a795 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -82,4 +82,4 @@ define SDL_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(autotools-package))
-$(eval $(autotools-package-host))
+$(eval $(host-autotools-package))
\ No newline at end of file
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index c940246d50..b0a8ee671e 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -7,6 +7,7 @@ SDL_IMAGE_VERSION:=1.2.6
 SDL_IMAGE_SOURCE:=SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 SDL_IMAGE_SITE:=http://www.libsdl.org/projects/SDL_image/release
 SDL_IMAGE_INSTALL_STAGING:=YES
+SDL_IMAGE_INSTALL_TARGET:=YES
 
 SDL_IMAGE_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
@@ -44,4 +45,4 @@ SDL_IMAGE_DEPENDENCIES:=sdl \
 HOST_SDL_IMAGE_DEPENDENCIES:=host-jpeg host-libpng host-tiff host-sdl
 
 $(eval $(autotools-package))
-$(eval $(autotools-package-host))
+$(eval $(host-autotools-package))
diff --git a/package/thirdparty/afpfs-ng/afpfs-ng.mk b/package/thirdparty/afpfs-ng/afpfs-ng.mk
index 41dbd38afa..7731b76e5e 100644
--- a/package/thirdparty/afpfs-ng/afpfs-ng.mk
+++ b/package/thirdparty/afpfs-ng/afpfs-ng.mk
@@ -16,4 +16,4 @@ AFPFS_NG_CONF_ENV = \
 AFPFS_NG_CONF_OPT = \
 	--disable-fuse 
 
-$(eval $(call AUTOTARGETS,package/thirdparty,afpfs-ng))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/boblight/boblight.mk b/package/thirdparty/boblight/boblight.mk
index b41dd55a2a..575bb2069c 100644
--- a/package/thirdparty/boblight/boblight.mk
+++ b/package/thirdparty/boblight/boblight.mk
@@ -20,4 +20,4 @@ else
   BOBLIGHT_CONF_OPT += --without-libusb
 endif
 
-$(eval $(call AUTOTARGETS,package/thirdparty,boblight))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/fribidi/fribidi.mk b/package/thirdparty/fribidi/fribidi.mk
index 58b66c8c15..395ea2c660 100644
--- a/package/thirdparty/fribidi/fribidi.mk
+++ b/package/thirdparty/fribidi/fribidi.mk
@@ -11,4 +11,4 @@ FRIBIDI_INSTALL_TARGET = YES
 
 FRIBIDI_CONF_OPT = --disable-docs --with-glib=no
 
-$(eval $(call AUTOTARGETS,package/thirdparty,fribidi))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/jasper/jasper.mk b/package/thirdparty/jasper/jasper.mk
index 6aa455fb28..f09d53e9d6 100644
--- a/package/thirdparty/jasper/jasper.mk
+++ b/package/thirdparty/jasper/jasper.mk
@@ -9,4 +9,4 @@ JASPER_SOURCE = jasper-$(JASPER_VERSION).tar.bz2
 JASPER_INSTALL_STAGING = YES
 JASPER_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/thirdparty,jasper))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/joe/joe.mk b/package/thirdparty/joe/joe.mk
index 36639db4ea..7764492171 100644
--- a/package/thirdparty/joe/joe.mk
+++ b/package/thirdparty/joe/joe.mk
@@ -6,7 +6,7 @@
 
 JOE_VERSION = 3.7
 JOE_SOURCE = joe-$(JOE_VERSION).tar.gz
-JOE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/joe-editor
+JOE_SITE = http://downloads.sourceforge.net/sourceforge/joe-editor
 JOE_INSTALL_STAGING = NO
 JOE_INSTALL_TARGET = YES
 JOE_DEPENDENCIES = ncurses
@@ -19,4 +19,4 @@ endef
 
 JOE_POST_INSTALL_TARGET_HOOKS += JOE_INSTALL_ETC
 
-$(eval $(call AUTOTARGETS,package/thirdparty,joe))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libass/libass.mk b/package/thirdparty/libass/libass.mk
index 46acd52663..b818d2d4be 100644
--- a/package/thirdparty/libass/libass.mk
+++ b/package/thirdparty/libass/libass.mk
@@ -10,4 +10,4 @@ LIBASS_INSTALL_STAGING = YES
 LIBASS_INSTALL_TARGET = YES
 LIBASS_DEPENDENCIES += libenca
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libass))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libbluray/libbluray.mk b/package/thirdparty/libbluray/libbluray.mk
index e5a97dcc29..e5abfb5527 100644
--- a/package/thirdparty/libbluray/libbluray.mk
+++ b/package/thirdparty/libbluray/libbluray.mk
@@ -10,4 +10,4 @@ LIBBLURAY_INSTALL_STAGING = YES
 LIBBLURAY_INSTALL_TARGET = YES
 LIBBLURAY_AUTORECONF = YES
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libbluray))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libcdio/libcdio.mk b/package/thirdparty/libcdio/libcdio.mk
index dd96b92ad2..68603cdac5 100644
--- a/package/thirdparty/libcdio/libcdio.mk
+++ b/package/thirdparty/libcdio/libcdio.mk
@@ -9,4 +9,4 @@ LIBCDIO_SOURCE = libcdio-$(LIBCDIO_VERSION).tar.gz
 LIBCDIO_INSTALL_STAGING = YES
 LIBCDIO_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libcdio))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libcec/libcec.mk b/package/thirdparty/libcec/libcec.mk
index 2e8cf201e9..9797848632 100644
--- a/package/thirdparty/libcec/libcec.mk
+++ b/package/thirdparty/libcec/libcec.mk
@@ -11,4 +11,4 @@ LIBCEC_AUTORECONF = YES
 LIBCEC_DEPENDENCIES += udev
 LIBCEC_MAKE=$(MAKE1)
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libcec))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libenca/libenca.mk b/package/thirdparty/libenca/libenca.mk
index bf62556666..cf8834d90b 100644
--- a/package/thirdparty/libenca/libenca.mk
+++ b/package/thirdparty/libenca/libenca.mk
@@ -20,4 +20,4 @@ cd $(LIBENCA_DIR)/tools && $(HOSTCC) -o make_hash make_hash.c
 endef
 
 LIBENCA_POST_CONFIGURE_HOOKS += LIBENCA_MAKE_FIX
-$(eval $(call AUTOTARGETS,package/thirdparty,libenca))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libmodplug/libmodplug.mk b/package/thirdparty/libmodplug/libmodplug.mk
index 569c840b7a..26b1348363 100644
--- a/package/thirdparty/libmodplug/libmodplug.mk
+++ b/package/thirdparty/libmodplug/libmodplug.mk
@@ -9,4 +9,4 @@ LIBMODPLUG_SOURCE = libmodplug-$(LIBMODPLUG_VERSION).tar.gz
 LIBMODPLUG_INSTALL_STAGING = YES
 LIBMODPLUG_INSTALL_TARGET = YES
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libmodplug))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libnfs/libnfs.mk b/package/thirdparty/libnfs/libnfs.mk
index e0cd22b5a1..908fdba1cd 100644
--- a/package/thirdparty/libnfs/libnfs.mk
+++ b/package/thirdparty/libnfs/libnfs.mk
@@ -10,4 +10,4 @@ LIBNFS_INSTALL_TARGET = YES
 LIBNFS_AUTORECONF = YES
 LIBNFS_MAKE=$(MAKE1)
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libnfs))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libplist/libplist.mk b/package/thirdparty/libplist/libplist.mk
index e13042c14b..d17bdb2d97 100644
--- a/package/thirdparty/libplist/libplist.mk
+++ b/package/thirdparty/libplist/libplist.mk
@@ -11,4 +11,4 @@ LIBPLIST_INSTALL_STAGING = YES
 LIBPLIST_INSTALL_TARGET = YES
 LIBPLIST_MAKE=$(MAKE1)
 
-$(eval $(call CMAKETARGETS,package/thirdparty,libplist))
+$(eval $(cmake-package))
diff --git a/package/thirdparty/librtmp/librtmp.mk b/package/thirdparty/librtmp/librtmp.mk
index 00c85ccb14..e14ee8ff63 100644
--- a/package/thirdparty/librtmp/librtmp.mk
+++ b/package/thirdparty/librtmp/librtmp.mk
@@ -24,4 +24,4 @@ define LIBRTMP_INSTALL_TARGET_CMDS
 	install -m 644 $(@D)/librtmp/librtmp.so.0 $(TARGET_DIR)/usr/lib
 endef
 
-$(eval $(call GENTARGETS,package/thirdparty,librtmp))
+$(eval $(generic-package))
diff --git a/package/thirdparty/libshairport/libshairport.mk b/package/thirdparty/libshairport/libshairport.mk
index a3a274c45d..203f480619 100644
--- a/package/thirdparty/libshairport/libshairport.mk
+++ b/package/thirdparty/libshairport/libshairport.mk
@@ -11,4 +11,4 @@ LIBSHAIRPORT_INSTALL_TARGET = YES
 LIBSHAIRPORT_AUTORECONF = YES
 LIBSHAIRPORT_DEPENDENCIES += openssl
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libshairport))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/libssh/libssh.mk b/package/thirdparty/libssh/libssh.mk
index f63472358c..1f92cf11e6 100644
--- a/package/thirdparty/libssh/libssh.mk
+++ b/package/thirdparty/libssh/libssh.mk
@@ -29,4 +29,4 @@ LIBSSH_INSTALL_TARGET_CMDS = \
         $(TARGET_MAKE_ENV) $(LIBSSH_MAKE_ENV) $(LIBSSH_MAKE) $(LIBSSH_MAKE_OPT) $(LIBSSH_INSTALL_TARGET_OPT) -C $(LIBSSH_TEMP_BUILDDIR) && \
         rm -rf $(LIBSSH_TEMP_BUILDDIR)
 
-$(eval $(call CMAKETARGETS,package/thirdparty,libssh))
+$(eval $(cmake-package))
diff --git a/package/thirdparty/libssh2/libssh2.mk b/package/thirdparty/libssh2/libssh2.mk
index 8a7acc0f23..93a14539bb 100644
--- a/package/thirdparty/libssh2/libssh2.mk
+++ b/package/thirdparty/libssh2/libssh2.mk
@@ -23,4 +23,4 @@ ifeq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_OPENSSL),n)
 LIBSSH2_CONF_OPT = --without-openssl --without-libgcrypt
 endif
 
-$(eval $(call AUTOTARGETS,package/thirdparty,libssh2))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/lirc/lirc.mk b/package/thirdparty/lirc/lirc.mk
index 832cb1f6e7..9652d74b24 100644
--- a/package/thirdparty/lirc/lirc.mk
+++ b/package/thirdparty/lirc/lirc.mk
@@ -1,6 +1,6 @@
 LIRC_VERSION = 0.8.7
 LIRC_SOURCE = lirc-$(LIRC_VERSION).tar.gz
-LIRC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lirc/LIRC/$(LIRC_VERSION)
+LIRC_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_VERSION)
 LIRC_INSTALL_STAGING = YES
 LIRC_INSTALL_TARGET = YES
 LIRC_DEPENDENCIES = linux
@@ -41,5 +41,4 @@ LIRC_POST_CONFIGURE_HOOKS += LIRC_REMOVE_BROKEN_DRIVERS
 LIRC_POST_INSTALL_TARGET_HOOKS += LIRC_DEPMOD
 LIRC_POST_INSTALL_TARGET_HOOKS += LIRC_INSTALL_ETC
 
-$(eval $(call AUTOTARGETS,package/thirdparty,lirc))
-
+$(eval $(autotools-package))
diff --git a/package/thirdparty/recovery_reboot/recovery_reboot.mk b/package/thirdparty/recovery_reboot/recovery_reboot.mk
index db9cdf87f5..9d55738c01 100644
--- a/package/thirdparty/recovery_reboot/recovery_reboot.mk
+++ b/package/thirdparty/recovery_reboot/recovery_reboot.mk
@@ -18,4 +18,4 @@ define RECOVERY_REBOOT_INSTALL_TARGET_CMDS
         install $(@D)/recoveryflash $(TARGET_DIR)/usr/sbin
 endef
 
-$(eval $(call GENTARGETS,package/thirdparty,recovery_reboot))
+$(eval $(generic-package))
diff --git a/package/thirdparty/taglib18/taglib18.mk b/package/thirdparty/taglib18/taglib18.mk
index 2660eb4e66..e1786aa3e6 100644
--- a/package/thirdparty/taglib18/taglib18.mk
+++ b/package/thirdparty/taglib18/taglib18.mk
@@ -17,4 +17,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
 TAGLIB18_POST_INSTALL_TARGET_HOOKS += TAGLIB18_REMOVE_DEVFILE
 endif
 
-$(eval $(call CMAKETARGETS,package/thirdparty,taglib18))
+$(eval $(cmake-package))
diff --git a/package/thirdparty/tinyxml/tinyxml.mk b/package/thirdparty/tinyxml/tinyxml.mk
index b294f08eb3..391b175855 100644
--- a/package/thirdparty/tinyxml/tinyxml.mk
+++ b/package/thirdparty/tinyxml/tinyxml.mk
@@ -9,4 +9,5 @@ TINYXML_SITE = http://mirrors.xbmc.org/build-deps/sources
 TINYXML_AUTORECONF = YES
 TINYXML_INSTALL_STAGING = YES
 TINYXML_INSTALL_TARGET = YES
-$(eval $(call AUTOTARGETS,package/thirdparty,tinyxml))
+
+$(eval $(autotools-package))
diff --git a/package/thirdparty/tvheadend/tvheadend.mk b/package/thirdparty/tvheadend/tvheadend.mk
index 8ea63a0cc3..888d2f123e 100644
--- a/package/thirdparty/tvheadend/tvheadend.mk
+++ b/package/thirdparty/tvheadend/tvheadend.mk
@@ -6,4 +6,4 @@ TVHEADEND_INSTALL_TARGET = YES
 TVHEADEND_DEPENDENCIES = v4lutils openssl \
                          $(if $(BR2_PACKAGE_TVHEADEND_AVAHI),avahi)
 
-$(eval $(call AUTOTARGETS,package/thirdparty,tvheadend))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/v4lutils/v4lutils.mk b/package/thirdparty/v4lutils/v4lutils.mk
index d1b546cfed..e7e5ecff94 100644
--- a/package/thirdparty/v4lutils/v4lutils.mk
+++ b/package/thirdparty/v4lutils/v4lutils.mk
@@ -19,4 +19,4 @@ define V4LUTILS_INSTALL_TARGET_CMDS
         make DESTDIR="$(TARGET_DIR)" PREFIX="/usr" -C $(@D) install
 endef
 
-$(eval $(call GENTARGETS,package/thirdparty,v4lutils))
+$(eval $(generic-package))
diff --git a/package/thirdparty/xbmc/xbmc.mk b/package/thirdparty/xbmc/xbmc.mk
index 55c7134544..4b6fe10bb0 100644
--- a/package/thirdparty/xbmc/xbmc.mk
+++ b/package/thirdparty/xbmc/xbmc.mk
@@ -85,4 +85,4 @@ ifneq ($(BR2_ENABLE_DEBUG),y)
 XBMC_POST_INSTALL_TARGET_HOOKS += XBMC_STRIP_BINARIES
 endif
 
-$(eval $(call AUTOTARGETS,package/thirdparty,xbmc))
+$(eval $(autotools-package))
diff --git a/package/thirdparty/xbmcpvr/xbmcpvr.mk b/package/thirdparty/xbmcpvr/xbmcpvr.mk
index 100be5636a..0b5c6605f9 100644
--- a/package/thirdparty/xbmcpvr/xbmcpvr.mk
+++ b/package/thirdparty/xbmcpvr/xbmcpvr.mk
@@ -7,5 +7,4 @@ XBMCPVR_INSTALL_TARGET = YES
 XBMCPVR_CONF_ENV += MYSQL_CONFIG=$(TARGET_DIR)/usr/bin/mysql_config
 XBMCPVR_CONF_OPT += --enable-addons-with-dependencies
 
-$(eval $(call AUTOTARGETS,package/thirdparty,xbmcpvr))
-
+$(eval $(autotools-package))
diff --git a/package/thirdparty/xios-skin/xios-skin.mk b/package/thirdparty/xios-skin/xios-skin.mk
index bae6bd8c56..248577b0a6 100644
--- a/package/thirdparty/xios-skin/xios-skin.mk
+++ b/package/thirdparty/xios-skin/xios-skin.mk
@@ -21,4 +21,4 @@ define XIOS_SKIN_INSTALL_TARGET_CMDS
 	cp -f $(@D)/media/Textures.xbt $(TARGET_DIR)/usr/share/xbmc/addons/skin.xios/media
 endef
 
-$(eval $(call GENTARGETS,package/thirdparty,xios))
+$(eval $(generic-package))
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 02e73b15a0..2f5d874e94 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -84,4 +84,4 @@ define TIFF_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(autotools-package))
-$(eval $(autotools-package-host))
\ No newline at end of file
+$(eval $(host-autotools-package))

From 81f69d7c8f59922146a0951a114b3ce1c73723eb Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Wed, 26 Feb 2014 17:54:36 +0100
Subject: [PATCH 6842/6849] [aml] Fixes after the merge with buildroot 2013.11:

* Remove dbus-1-glib-fix-marshalling-regression.patch since it is now included upstream
* Remove m4-1.4.15-fgets.patch since it is now included upstream
* Remove usbmount-use-udev-environment-instead-of-blkid.patch because it would make the usbmount-0001-if-devinfo-is-empty-ensure-variable-is-empty.patch and usbmount-0003-usbmount-use-fs-label-as-mount-point.patch patches redundant
* Fix qt-4.7.4-simplegl.patch after update to QT 4.8.5
* Remove third party packages (libcec, libssh2, tvheadend) to prevent them from clashing with the mainline versions
* depmod moved from /usr/sbin to /sbin
* Use jpeg-turbo package
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig | 39 +++++-----
 configs/amlogic_xios-xbmc_defconfig           | 31 ++++----
 configs/amlogic_xios_m3-xbmc_defconfig        | 33 +++++----
 ...us-1-glib-fix-marshalling-regression.patch | 27 -------
 package/m4/m4-1.4.15-fgets.patch              | 12 ----
 package/qt/qt-4.7.4-simplegl.patch            |  3 +-
 package/thirdparty/Config.in                  |  3 -
 package/thirdparty/libcec/Config.in           |  6 --
 package/thirdparty/libcec/libcec.mk           | 14 ----
 package/thirdparty/libssh2/Config.in          |  6 --
 package/thirdparty/libssh2/libssh2.mk         | 26 -------
 package/thirdparty/lirc/lirc.mk               |  2 +-
 package/thirdparty/tvheadend/Config.in        | 12 ----
 package/thirdparty/tvheadend/tvheadend.mk     |  9 ---
 package/tiff/tiff.mk                          |  2 +-
 ...se-udev-environment-instead-of-blkid.patch | 71 -------------------
 16 files changed, 54 insertions(+), 242 deletions(-)
 delete mode 100644 package/dbus-glib/dbus-1-glib-fix-marshalling-regression.patch
 delete mode 100644 package/m4/m4-1.4.15-fgets.patch
 delete mode 100644 package/thirdparty/libcec/Config.in
 delete mode 100644 package/thirdparty/libcec/libcec.mk
 delete mode 100644 package/thirdparty/libssh2/Config.in
 delete mode 100644 package/thirdparty/libssh2/libssh2.mk
 delete mode 100644 package/thirdparty/tvheadend/Config.in
 delete mode 100644 package/thirdparty/tvheadend/tvheadend.mk
 delete mode 100644 package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index 9e7dfa9249..441b11448d 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+# BR2_SOFT_FLOAT is not set
 BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
@@ -9,19 +10,21 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_SERVER=y
 BR2_GDB_VERSION_7_4=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
 BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
-# BR2_SOFT_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
+BR2_LINUX_KERNEL_DEFCONFIG="meson_xios"
 BR2_BUSYBOX_VERSION_1_20_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -29,6 +32,18 @@ BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
 BR2_PACKAGE_XIOS_SKIN=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_SERVER=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_MTD_FLASH_OTP_DUMP=y
+BR2_PACKAGE_MTD_FLASH_OTP_INFO=y
+BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_NTFS_3G_NTFSPROGS=y
 BR2_PACKAGE_QT=y
 BR2_PACKAGE_QT_DEMOS=y
 BR2_PACKAGE_QT_LICENSE_APPROVED=y
@@ -44,19 +59,9 @@ BR2_PACKAGE_QT_DBUS=y
 BR2_PACKAGE_QT_SVG=y
 BR2_PACKAGE_QT_WEBKIT=y
 BR2_PACKAGE_DBUS_PYTHON=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_UTILS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_FLASH_OTP_DUMP=y
-BR2_PACKAGE_MTD_FLASH_OTP_INFO=y
-BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_NTFS_3G_NTFSPROGS=y
 # BR2_PACKAGE_UDEV_MTD_PROBE is not set
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
+BR2_PACKAGE_JPEG_TURBO=y
 BR2_PACKAGE_LIBDAEMON=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
@@ -99,9 +104,3 @@ BR2_PACKAGE_NANO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
 BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME="stvm3"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
-BR2_LINUX_KERNEL_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
-BR2_LINUX_KERNEL_DEFCONFIG="meson_xios"
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index bbda4d1d8f..1be3b22f0a 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+# BR2_SOFT_FLOAT is not set
 BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
@@ -9,19 +10,21 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_GDB_VERSION_7_4=y
+BR2_GDB_VERSION_7_5=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
 BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
-# BR2_SOFT_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
+BR2_LINUX_KERNEL_DEFCONFIG="meson_xios"
 BR2_BUSYBOX_VERSION_1_20_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -29,18 +32,20 @@ BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
 BR2_PACKAGE_XIOS_SKIN=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_UTILS=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_NTFSPROGS=n
+BR2_PACKAGE_NTFS_3G_NTFSPROGS=n
 # BR2_PACKAGE_UDEV_MTD_PROBE is not set
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
+BR2_PACKAGE_JPEG_TURBO=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
@@ -78,14 +83,8 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
+BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
 BR2_PACKAGE_NANO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
 BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME="stvm3"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
-BR2_LINUX_KERNEL_VERSION="e4430d8a0b5d7d18b112b920d2fe1a4e36397f87"
-BR2_LINUX_KERNEL_DEFCONFIG="meson_xios"
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index 85ceb09611..4bde754025 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
+# BR2_SOFT_FLOAT is not set
 BR2_OPTIMIZE_3=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
@@ -9,19 +10,21 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_GDB_SERVER=y
-BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_7_4=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_GDB_VERSION_7_5=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
 BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
-# BR2_SOFT_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/amlogic/xios/skeleton"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel-m3.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="6854f5fafcf287f2c76c35fc641d44106d3888a3"
+BR2_LINUX_KERNEL_DEFCONFIG="meson_xios_m3"
 BR2_BUSYBOX_VERSION_1_20_X=y
 BR2_PACKAGE_BUSYBOX_CONFIG="board/amlogic/xios/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -29,18 +32,20 @@ BR2_PACKAGE_UBOOTAML=y
 BR2_PACKAGE_LIRC=y
 BR2_PACKAGE_XBMC=y
 BR2_PACKAGE_XIOS_SKIN=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_UTILS=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_NTFSPROGS=n
+BR2_PACKAGE_NTFS_3G_NTFSPROGS=n
 # BR2_PACKAGE_UDEV_MTD_PROBE is not set
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
+BR2_PACKAGE_JPEG_TURBO=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
@@ -79,14 +84,8 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_UTIL_LINUX_MOUNT=y
+BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
 BR2_PACKAGE_NANO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
 BR2_TARGET_ROOTFS_RECOVERY_AML_BOARDNAME="xiosm3"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/Pivosgroup/buildroot-linux-kernel-m3.git"
-BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="6854f5fafcf287f2c76c35fc641d44106d3888a3"
-BR2_LINUX_KERNEL_VERSION="6854f5fafcf287f2c76c35fc641d44106d3888a3"
-BR2_LINUX_KERNEL_DEFCONFIG="meson_xios_m3"
diff --git a/package/dbus-glib/dbus-1-glib-fix-marshalling-regression.patch b/package/dbus-glib/dbus-1-glib-fix-marshalling-regression.patch
deleted file mode 100644
index c07f5ac51b..0000000000
--- a/package/dbus-glib/dbus-1-glib-fix-marshalling-regression.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
-index 3b0bd17..7ee0b4f 100644
---- a/dbus/dbus-gobject.c
-+++ b/dbus/dbus-gobject.c
-@@ -3049,16 +3049,16 @@ out:
- const char *
- _dbus_gobject_get_path (GObject *obj)
- {
--  GSList *registrations;
-+  ObjectExport *oe;
-   ObjectRegistration *o;
- 
--  registrations = g_object_get_data (obj, "dbus_glib_object_registrations");
-+  oe = g_object_get_data (obj, "dbus_glib_object_registrations");
- 
--  if (registrations == NULL)
-+  if (oe == NULL || oe->registrations == NULL)
-     return NULL;
- 
-   /* First one to have been registered wins */
--  o = registrations->data;
-+  o = oe->registrations->data;
- 
-   return o->object_path;
- }
---
-cgit v0.8.3-6-g21f6
diff --git a/package/m4/m4-1.4.15-fgets.patch b/package/m4/m4-1.4.15-fgets.patch
deleted file mode 100644
index 918d3047ad..0000000000
--- a/package/m4/m4-1.4.15-fgets.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
\ No newline at end of file
diff --git a/package/qt/qt-4.7.4-simplegl.patch b/package/qt/qt-4.7.4-simplegl.patch
index 3236971512..ddbff94566 100755
--- a/package/qt/qt-4.7.4-simplegl.patch
+++ b/package/qt/qt-4.7.4-simplegl.patch
@@ -1,9 +1,10 @@
 --- qt-4.7.4-org/src/plugins/gfxdrivers/gfxdrivers.pro	2011-09-12 02:49:28.000000000 -0400
 +++ qt-4.7.4-mod/src/plugins/gfxdrivers/gfxdrivers.pro	2012-02-07 17:37:13.963125281 -0500
-@@ -7,3 +7,5 @@ contains(gfx-plugins, vnc)	    :SUBDIRS
+@@ -7,4 +7,6 @@ contains(gfx-plugins, vnc)	    :SUBDIRS
  contains(gfx-plugins, transformed)  :SUBDIRS += transformed
  contains(gfx-plugins, svgalib)      :SUBDIRS += svgalib
  contains(gfx-plugins, powervr)      :SUBDIRS += powervr
+ contains(gfx-plugins, eglnullws)    :SUBDIRS += eglnullws
 +contains(gfx-plugins, simplegl)     :SUBDIRS += simplegl
 +
 --- qt-4.7.4-org/src/plugins/gfxdrivers/simplegl/LICENSE.LGPL	1969-12-31 19:00:00.000000000 -0500
diff --git a/package/thirdparty/Config.in b/package/thirdparty/Config.in
index 107ed5f6c0..5e9b09b4e3 100644
--- a/package/thirdparty/Config.in
+++ b/package/thirdparty/Config.in
@@ -3,7 +3,6 @@ source "package/thirdparty/fribidi/Config.in"
 source "package/thirdparty/jasper/Config.in"
 source "package/thirdparty/libass/Config.in"
 source "package/thirdparty/libcdio/Config.in"
-source "package/thirdparty/libcec/Config.in"
 source "package/thirdparty/libenca/Config.in"
 source "package/thirdparty/libmodplug/Config.in"
 source "package/thirdparty/libnfs/Config.in"
@@ -14,11 +13,9 @@ source "package/thirdparty/libssh/Config.in"
 source "package/thirdparty/lirc/Config.in"
 source "package/thirdparty/afpfs-ng/Config.in"
 source "package/thirdparty/librtmp/Config.in"
-source "package/thirdparty/libssh2/Config.in"
 source "package/thirdparty/recovery_reboot/Config.in"
 source "package/thirdparty/taglib18/Config.in"
 source "package/thirdparty/tinyxml/Config.in"
-source "package/thirdparty/tvheadend/Config.in"
 source "package/thirdparty/v4lutils/Config.in"
 source "package/thirdparty/xbmc/Config.in"
 source "package/thirdparty/xbmcpvr/Config.in"
diff --git a/package/thirdparty/libcec/Config.in b/package/thirdparty/libcec/Config.in
deleted file mode 100644
index 9ffacfe05a..0000000000
--- a/package/thirdparty/libcec/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_LIBCEC
-        bool "libcec"
-        help
-          LIBCEC is a client library for hdmi cec device control.
-
-          https://github.com/Pulse-Eight/libcec.git
diff --git a/package/thirdparty/libcec/libcec.mk b/package/thirdparty/libcec/libcec.mk
deleted file mode 100644
index 9797848632..0000000000
--- a/package/thirdparty/libcec/libcec.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################################################
-#
-# libcec
-#
-#############################################################
-LIBCEC_VERSION = 97ffee06080535a5507d8fbb3c8941bccc51ae13
-LIBCEC_SITE = git://github.com/Pulse-Eight/libcec.git
-LIBCEC_INSTALL_STAGING = YES
-LIBCEC_INSTALL_TARGET = YES
-LIBCEC_AUTORECONF = YES
-LIBCEC_DEPENDENCIES += udev
-LIBCEC_MAKE=$(MAKE1)
-
-$(eval $(autotools-package))
diff --git a/package/thirdparty/libssh2/Config.in b/package/thirdparty/libssh2/Config.in
deleted file mode 100644
index 03bb022ca4..0000000000
--- a/package/thirdparty/libssh2/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_LIBSSH2
-	bool "libssh2"
-	help
-	  A client-side C library implementing the SSH2 protocol.
-
-	  http://www.libssh2.org/
diff --git a/package/thirdparty/libssh2/libssh2.mk b/package/thirdparty/libssh2/libssh2.mk
deleted file mode 100644
index 93a14539bb..0000000000
--- a/package/thirdparty/libssh2/libssh2.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#############################################################
-#
-# libssh2
-#
-#############################################################
-LIBSSH2_VERSION = 1.2.8
-LIBSSH2_SITE = http://www.libssh2.org/download
-LIBSSH2_SOURCE = libssh2-$(LIBSSH2_VERSION).tar.gz
-LIBSSH2_INSTALL_STAGING = YES
-LIBSSH2_INSTALL_TARGET = YES
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBSSH2_CONF_OPT += --with-openssl --with-libssl-prefix=$(STAGING_DIR)/usr
-LIBSSH2_DEPENDENCIES += openssl
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-LIBSSH2_CONF_OPT = --with-libgcrypt --with-libgcrypt-prefix=$(STAGING_DIR)/usr
-LIBSSH2_DEPENDENCIES += libgcrypt
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_OPENSSL),n)
-LIBSSH2_CONF_OPT = --without-openssl --without-libgcrypt
-endif
-
-$(eval $(autotools-package))
diff --git a/package/thirdparty/lirc/lirc.mk b/package/thirdparty/lirc/lirc.mk
index 9652d74b24..e8b0b947b4 100644
--- a/package/thirdparty/lirc/lirc.mk
+++ b/package/thirdparty/lirc/lirc.mk
@@ -26,7 +26,7 @@ endif
 
 #work-around for hard-coded depmod
 define LIRC_DEPMOD
-$(HOST_DIR)/usr/sbin/depmod -b $(TARGET_DIR) -a $(LINUX_VERSION_PROBED)
+$(HOST_DIR)/sbin/depmod -b $(TARGET_DIR) -a $(LINUX_VERSION_PROBED)
 endef
 
 define LIRC_REMOVE_BROKEN_DRIVERS
diff --git a/package/thirdparty/tvheadend/Config.in b/package/thirdparty/tvheadend/Config.in
deleted file mode 100644
index 22da1017be..0000000000
--- a/package/thirdparty/tvheadend/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_TVHEADEND
-	bool "tvheadend"
-	help
-	  Web-based PVR.
-
-config BR2_PACKAGE_TVHEADEND_AVAHI
-        bool "support avahi"
-        default y
-        depends on BR2_PACKAGE_TVHEADEND
-        depends on BR2_PACKAGE_AVAHI_DAEMON
-        help
-          Include support for avahi
diff --git a/package/thirdparty/tvheadend/tvheadend.mk b/package/thirdparty/tvheadend/tvheadend.mk
deleted file mode 100644
index 888d2f123e..0000000000
--- a/package/thirdparty/tvheadend/tvheadend.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-TVHEADEND_VERSION = v3.4
-TVHEADEND_SITE_METHOD = git
-TVHEADEND_SITE = git://github.com/tvheadend/tvheadend.git
-TVHEADEND_INSTALL_STAGING = YES
-TVHEADEND_INSTALL_TARGET = YES
-TVHEADEND_DEPENDENCIES = v4lutils openssl \
-                         $(if $(BR2_PACKAGE_TVHEADEND_AVAHI),avahi)
-
-$(eval $(autotools-package))
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index f171517c3c..723079f831 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -15,6 +15,7 @@ TIFF_CONF_OPT = \
 	--without-x \
 
 TIFF_DEPENDENCIES = host-pkgconf
+HOST_TIFF_DEPENDENCIES = host-zlib host-jpeg-turbo
 
 TIFF_TOOLS_LIST =
 ifeq ($(BR2_PACKAGE_TIFF_TIFF2PDF),y)
@@ -75,7 +76,6 @@ endif
 ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
 	TIFF_CONF_OPT += --disable-jbig
 endif
-HOST_TIFF_DEPENDENCIES = host-zlib host-jpeg
 
 define TIFF_INSTALL_TARGET_CMDS
 	-cp -a $(@D)/libtiff/.libs/libtiff.so* $(TARGET_DIR)/usr/lib/
diff --git a/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch b/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch
deleted file mode 100644
index 27928b5d54..0000000000
--- a/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-udev can provide all the values that usbmount determined using the
-blkid binary. This patch drops use of blkid in favor of using the
-environment variables set by udev. Thus it removes the dependency
-on blkid from usbmount.
-
-Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---- usbmount-0.0.22/usbmount.orig	2013-06-18 14:44:40.143096147 +0200
-+++ usbmount-0.0.22/usbmount	2013-06-19 16:13:09.882434896 +0200
-@@ -59,11 +59,6 @@
-     exit 0
- fi
- 
--if [ ! -x /sbin/blkid ]; then
--    log err "cannot execute /sbin/blkid"
--    exit 1
--fi
--
- # Per Policy 9.3.2, directories under /var/run have to be created
- # after every reboot.
- if [ ! -e /var/run/usbmount ]; then
-@@ -83,15 +78,7 @@
-     trap '( lockfile-remove /var/run/usbmount/.mount )' 0
-     log debug "acquired lock /var/run/usbmount/.mount.lock"
- 
--    # Grab device information from device and "divide it"
--    #   FIXME: improvement: implement mounting by label (notice that labels
--    #   can contain spaces, which makes things a little bit less comfortable).
--    DEVINFO=$(/sbin/blkid -p $DEVNAME)
--    FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
--    UUID=$(echo "$DEVINFO"   | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
--    USAGE=$(echo "$DEVINFO"  | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
--
--    if ! echo $USAGE | egrep -q "(filesystem|disklabel)"; then
-+    if ! echo $ID_FS_USAGE | egrep -q "(filesystem|disklabel)"; then
- 	log info "$DEVNAME does not contain a filesystem or disklabel"
- 	exit 1
-     fi
-@@ -101,14 +88,14 @@
- 	log info "executing command: mount $DEVNAME"
- 	mount $DEVNAME || log err "mount by DEVNAME with $DEVNAME wasn't successful; return code $?"
- 
--    elif grep -q "^[[:blank:]]*UUID=$UUID" /etc/fstab; then
--        log info "executing command: mount -U $UUID"
--	mount -U $UUID || log err "mount by UUID with $UUID wasn't successful; return code $?"
-+    elif grep -q "^[[:blank:]]*UUID=$ID_FS_UUID" /etc/fstab; then
-+        log info "executing command: mount -U $ID_FS_UUID"
-+	mount -U $ID_FS_UUID || log err "mount by UUID with $ID_FS_UUID wasn't successful; return code $?"
- 
-     else
--	log debug "$DEVNAME contains filesystem type $FSTYPE"
-+	log debug "$DEVNAME contains filesystem type $ID_FS_TYPE"
- 
--	fstype=$FSTYPE
-+	fstype=$ID_FS_TYPE
- 	# Test if the filesystem type is in the list of filesystem
- 	# types to mount.
- 	if in_list "$fstype" "$FILESYSTEMS"; then
-@@ -176,11 +163,13 @@
- 
- 		# Run hook scripts; ignore errors.
- 		export UM_DEVICE="$DEVNAME"
-+		export UM_UUID="$ID_FS_UUID"
- 		export UM_MOUNTPOINT="$mountpoint"
- 		export UM_FILESYSTEM="$fstype"
- 		export UM_MOUNTOPTIONS="$options"
- 		export UM_VENDOR="$vendor"
- 		export UM_MODEL="$model"
-+		export UM_LABEL="$ID_FS_LABEL"
- 		log info "executing command: run-parts /etc/usbmount/mount.d"
- 		run-parts /etc/usbmount/mount.d || :
- 	    else

From fa27f264c730fac379b1b27ff739abfec35de8fe Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Fri, 28 Feb 2014 17:02:34 +0100
Subject: [PATCH 6843/6849] [aml] Fix amcodec symlink for M1

Adapt changeset 51eb0ad497e3009789be017a75eb5370c7d78c24f for the M1
---
 package/amlogic/libamplayerm1/libamplayerm1.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/amlogic/libamplayerm1/libamplayerm1.mk b/package/amlogic/libamplayerm1/libamplayerm1.mk
index 2d6e345f0b..404f378e5e 100644
--- a/package/amlogic/libamplayerm1/libamplayerm1.mk
+++ b/package/amlogic/libamplayerm1/libamplayerm1.mk
@@ -35,7 +35,7 @@ define LIBAMPLAYERM1_INSTALL_STAGING_CMDS
 	install -m 644 $(@D)/usr/include/amlplayer/ppmgr/*.h $(STAGING_DIR)/usr/include/amlplayer/ppmgr
 	mkdir -p $(STAGING_DIR)/usr/lib
 	install -m 755 $(@D)/usr/lib/*.so* $(STAGING_DIR)/usr/lib
-	ln -s $(STAGING_DIR)/usr/lib/libamcodec.so.0.0 $(STAGING_DIR)/usr/lib/libamcodec.so
+	ln -s -r $(STAGING_DIR)/usr/lib/libamcodec.so.0.0 $(STAGING_DIR)/usr/lib/libamcodec.so
 
 	#temporary, until we sync with mainline xbmc
 	cp -rf $(@D)/usr/include/amlplayer/* $(STAGING_DIR)/usr/include
@@ -48,7 +48,7 @@ define LIBAMPLAYERM1_INSTALL_TARGET_CMDS
 	install -m 644 $(@D)/lib/firmware/*.bin $(TARGET_DIR)/lib/firmware
 	mkdir -p $(TARGET_DIR)/usr/lib
 	install -m 755 $(@D)/usr/lib/*.so* $(TARGET_DIR)/usr/lib
-	ln -s $(TARGET_DIR)/usr/lib/libamcodec.so.0.0 $(TARGET_DIR)/usr/lib/libamcodec.so
+	ln -s -r $(TARGET_DIR)/usr/lib/libamcodec.so.0.0 $(TARGET_DIR)/usr/lib/libamcodec.so
 endef
 
 $(eval $(generic-package))

From f1991615781aacc663e1e8e1e793f990ea959e44 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Fri, 28 Feb 2014 19:08:49 +0100
Subject: [PATCH 6844/6849] [aml] Restore BR2_PACKAGE_UTIL_LINUX_MOUNT

Changeset 81f69d7c8f59922146a0951a114b3ce1c73723eb incorrectly removed BR2_PACKAGE_UTIL_LINUX_MOUNT.  We also need to define BR2_PACKAGE_UTIL_LINUX_BINARIES for it to be selectable.
---
 configs/amlogic_xios-xbmc_defconfig    | 3 ++-
 configs/amlogic_xios_m3-xbmc_defconfig | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index 1be3b22f0a..11a3a77246 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -83,7 +83,8 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_NANO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index 4bde754025..c9b6a98f9a 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -84,7 +84,8 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 BR2_PACKAGE_NANO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_RECOVERY_AML=y

From b4239dc45a033c2c66f54e14780c960cc00df110 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Fri, 28 Feb 2014 19:17:39 +0100
Subject: [PATCH 6845/6849] [aml] Restore BR2_EXT_TOOL_DIRS_EXTRA functionality

Changeset 81565752f52bf5f7a9db85e639a33ee126a74082 incorrectly removed the BR2_EXT_TOOL_DIRS_EXTRA functionality, which meant that /usr/lib/gconv and /usr/share/zoneinfo were not being copied to the target.
---
 toolchain/toolchain-common.in                      | 9 +++++++++
 toolchain/toolchain-external/toolchain-external.mk | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 8435a65a49..c5735ba5cc 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -68,6 +68,15 @@ config BR2_GENERATE_LOCALE
 	  specified, UTF-8 is assumed. Examples of locales: en_US,
 	  fr_FR.UTF-8.
 
+config BR2_EXT_TOOL_DIRS_EXTRA
+	string "Additional dirs to copy from toolchain"
+	default ""
+	help:
+	  This is a space-separated list of files or folders to copy
+	  from the sysroot to the target. Make the paths relative to the
+	  sysroot. Example:
+	    /usr/lib/gconv /usr/lib/other
+
 # glibc and eglibc directly include gettext, so a separatly compiled
 # gettext isn't needed and shouldn't be built to avoid conflicts. Some
 # packages always need gettext, other packages only need gettext when
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index bd4f37575d..c8375c267c 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -515,6 +515,15 @@ define TOOLCHAIN_EXTERNAL_INSTALL_CORE
 			$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/usr/lib); \
 		done ; \
 	fi ; \
+	for d in $(call qstrip,$(BR2_EXT_TOOL_DIRS_EXTRA)); do \
+		if [ -d "$${ARCH_SYSROOT_DIR}$${d}" ]; then \
+			mkdir -p "$(TARGET_DIR)$${d}"; \
+			echo "Copying extra directory '$${d}' to target from toolchain"; \
+			cp -a "$${ARCH_SYSROOT_DIR}$${d}/" "$(TARGET_DIR)$${d}/../"; \
+		else \
+			echo "No such directory '$${d}' while trying to copy from toolchain"; \
+		fi; \
+	done; \
 	$(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \
 	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \

From 1df7dda350fc59efe29146f1407b4ffa7393cca6 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Fri, 28 Feb 2014 19:29:31 +0100
Subject: [PATCH 6846/6849] [aml] Define BR2_PACKAGE_TZDATA

Newer versions of buildroot provide the tzdata package to copy the time zone data, so we don't need to use BR2_EXT_TOOL_DIRS_EXTRA to copy /usr/share/zoneinfo
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig | 4 +++-
 configs/amlogic_xios-xbmc_defconfig           | 4 +++-
 configs/amlogic_xios_m3-xbmc_defconfig        | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index 441b11448d..c552226544 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -13,7 +13,7 @@ BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_GDB_VERSION_7_4=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
+BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
@@ -63,6 +63,8 @@ BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_JPEG_TURBO=y
 BR2_PACKAGE_LIBDAEMON=y
+BR2_PACKAGE_TZDATA=y
+BR2_PACKAGE_TZDATA_ZONELIST="default"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index 11a3a77246..7a6745e94a 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -13,7 +13,7 @@ BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_GDB_VERSION_7_5=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
+BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
@@ -46,6 +46,8 @@ BR2_PACKAGE_NTFS_3G_NTFSPROGS=n
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_TZDATA=y
+BR2_PACKAGE_TZDATA_ZONELIST="default"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index c9b6a98f9a..0d0cdff35a 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GDB=y
 BR2_GDB_VERSION_7_5=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
+BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
@@ -46,6 +46,8 @@ BR2_PACKAGE_NTFS_3G_NTFSPROGS=n
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_TZDATA=y
+BR2_PACKAGE_TZDATA_ZONELIST="default"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y

From 7ebcb77a96602a4000ac4f5620c500a37faf4878 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sat, 1 Mar 2014 00:52:49 +0100
Subject: [PATCH 6847/6849] Revert "[aml] Define BR2_PACKAGE_TZDATA"

The tzdata package does not copy the zone.tab file that xbmc uses.
This reverts commit 1df7dda350fc59efe29146f1407b4ffa7393cca6.
---
 configs/amlogic_xios-xbmc-qt-webkit_defconfig | 4 +---
 configs/amlogic_xios-xbmc_defconfig           | 4 +---
 configs/amlogic_xios_m3-xbmc_defconfig        | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/configs/amlogic_xios-xbmc-qt-webkit_defconfig b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
index c552226544..441b11448d 100644
--- a/configs/amlogic_xios-xbmc-qt-webkit_defconfig
+++ b/configs/amlogic_xios-xbmc-qt-webkit_defconfig
@@ -13,7 +13,7 @@ BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_GDB_VERSION_7_4=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv"
+BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
@@ -63,8 +63,6 @@ BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_JPEG_TURBO=y
 BR2_PACKAGE_LIBDAEMON=y
-BR2_PACKAGE_TZDATA=y
-BR2_PACKAGE_TZDATA_ZONELIST="default"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
diff --git a/configs/amlogic_xios-xbmc_defconfig b/configs/amlogic_xios-xbmc_defconfig
index 7a6745e94a..11a3a77246 100644
--- a/configs/amlogic_xios-xbmc_defconfig
+++ b/configs/amlogic_xios-xbmc_defconfig
@@ -13,7 +13,7 @@ BR2_TOOLCHAIN_EXTERNAL_CXX=y
 BR2_GDB_VERSION_7_5=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv"
+BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_BOARD_TYPE_AMLOGIC_M1=y
 BR2_TARGET_GENERIC_GETTY=y
@@ -46,8 +46,6 @@ BR2_PACKAGE_NTFS_3G_NTFSPROGS=n
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_JPEG_TURBO=y
-BR2_PACKAGE_TZDATA=y
-BR2_PACKAGE_TZDATA_ZONELIST="default"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y
diff --git a/configs/amlogic_xios_m3-xbmc_defconfig b/configs/amlogic_xios_m3-xbmc_defconfig
index 0d0cdff35a..c9b6a98f9a 100644
--- a/configs/amlogic_xios_m3-xbmc_defconfig
+++ b/configs/amlogic_xios_m3-xbmc_defconfig
@@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GDB=y
 BR2_GDB_VERSION_7_5=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv"
+BR2_EXT_TOOL_DIRS_EXTRA="/usr/lib/gconv /usr/share/zoneinfo"
 BR2_TARGET_OPTIMIZATION="-pipe -mfloat-abi=softfp -mfpu=neon"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
@@ -46,8 +46,6 @@ BR2_PACKAGE_NTFS_3G_NTFSPROGS=n
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_MYSQL_CLIENT_LIB_ONLY=y
 BR2_PACKAGE_JPEG_TURBO=y
-BR2_PACKAGE_TZDATA=y
-BR2_PACKAGE_TZDATA_ZONELIST="default"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_NTP=y

From 9b6fa2580e6b3688fca7b9da24d1f283a502bcd9 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sat, 1 Mar 2014 00:54:06 +0100
Subject: [PATCH 6848/6849] [aml] Add /run directory

udev 174 and later creates the control socket in /run/udev/control so we need to add /run to our skeleton filesystem
---
 board/amlogic/xios/skeleton/run | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 board/amlogic/xios/skeleton/run

diff --git a/board/amlogic/xios/skeleton/run b/board/amlogic/xios/skeleton/run
new file mode 120000
index 0000000000..1c2f433de1
--- /dev/null
+++ b/board/amlogic/xios/skeleton/run
@@ -0,0 +1 @@
+tmp
\ No newline at end of file

From 304ea993ad69f5aa77004c5af4026a1b84c92838 Mon Sep 17 00:00:00 2001
From: Daniel Burr <dburr@topcon.com>
Date: Sat, 1 Mar 2014 00:56:35 +0100
Subject: [PATCH 6849/6849] [aml] Fix USB mounting

* Restore usbmount-use-udev-environment-instead-of-blkid.patch (incorrectly removed in 81f69d7c8f59922146a0951a114b3ce1c73723eb)
* Remove usbmount-0001-if-devinfo-is-empty-ensure-variable-is-empty.patch because usbmount-use-udev-environment-instead-of-blkid.patch makes it redundant
* Update usbmount-0003-usbmount-use-fs-label-as-mount-point.patch to use udev environment instead of blkid
* Put scripts in /etc/usbmount/[u]mount.d instead of /etc/usbmount/usbmount.d
---
 ...fo-is-empty-ensure-variable-is-empty.patch | 29 --------
 ...usbmount-use-fs-label-as-mount-point.patch | 12 +---
 ...se-udev-environment-instead-of-blkid.patch | 71 +++++++++++++++++++
 package/usbmount/usbmount.mk                  |  4 +-
 4 files changed, 75 insertions(+), 41 deletions(-)
 delete mode 100644 package/usbmount/usbmount-0001-if-devinfo-is-empty-ensure-variable-is-empty.patch
 create mode 100644 package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch

diff --git a/package/usbmount/usbmount-0001-if-devinfo-is-empty-ensure-variable-is-empty.patch b/package/usbmount/usbmount-0001-if-devinfo-is-empty-ensure-variable-is-empty.patch
deleted file mode 100644
index b1dd1150bd..0000000000
--- a/package/usbmount/usbmount-0001-if-devinfo-is-empty-ensure-variable-is-empty.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 00bc8e3031dd5c4d9f33c2a92b8eac8b235940d7 Mon Sep 17 00:00:00 2001
-From: Trent Nelson <trent.nelson@pivosgroup.com>
-Date: Fri, 18 Oct 2013 23:43:54 -0400
-Subject: [PATCH 1/4] if devinfo is empty, ensure variable is empty
-
----
- usbmount | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/usbmount b/usbmount
-index 75f249a..f887f68 100755
---- a/usbmount
-+++ b/usbmount
-@@ -88,9 +88,9 @@ if [ "$1" = add ]; then
-     #   FIXME: improvement: implement mounting by label (notice that labels
-     #   can contain spaces, which makes things a little bit less comfortable).
-     DEVINFO=$(/sbin/blkid -p $DEVNAME)
--    FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
--    UUID=$(echo "$DEVINFO"   | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
--    USAGE=$(echo "$DEVINFO"  | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-+    FSTYPE=$(echo "$DEVINFO" | sed -ne 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
-+    UUID=$(echo "$DEVINFO"   | sed -ne 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
-+    USAGE=$(echo "$DEVINFO"  | sed -ne 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
- 
-     if ! echo $USAGE | egrep -q "(filesystem|disklabel)"; then
- 	log info "$DEVNAME does not contain a filesystem or disklabel"
--- 
-1.8.1.2
-
diff --git a/package/usbmount/usbmount-0003-usbmount-use-fs-label-as-mount-point.patch b/package/usbmount/usbmount-0003-usbmount-use-fs-label-as-mount-point.patch
index 1e5d8ed925..254f6b40c3 100644
--- a/package/usbmount/usbmount-0003-usbmount-use-fs-label-as-mount-point.patch
+++ b/package/usbmount/usbmount-0003-usbmount-use-fs-label-as-mount-point.patch
@@ -20,14 +20,6 @@ index d51c68a..4521aa5 100755
  
  if [ -r /etc/usbmount/usbmount.conf ]; then
      . /etc/usbmount/usbmount.conf
-@@ -91,6 +92,7 @@ if [ "$1" = add ]; then
-     FSTYPE=$(echo "$DEVINFO" | sed -ne 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
-     UUID=$(echo "$DEVINFO"   | sed -ne 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
-     USAGE=$(echo "$DEVINFO"  | sed -ne 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
-+    LABEL=$(echo "$DEVINFO"  | sed -ne 's/.*[[:blank:]]LABEL="\([^"]*\)".*/\1/pg; s/[[:blank:]]*//g;')
- 
-     if ! echo $USAGE | egrep -q "(filesystem|disklabel)"; then
- 	log info "$DEVNAME does not contain a filesystem or disklabel"
 @@ -113,14 +115,20 @@ if [ "$1" = add ]; then
  	# Test if the filesystem type is in the list of filesystem
  	# types to mount.
@@ -40,8 +32,8 @@ index d51c68a..4521aa5 100755
 -		    break
 -		fi
 -	    done
-+            if [ -n "${LABEL}" ]; then
-+              mountpoint="${MOUNT_BASE}/${LABEL}"
++            if [ -n "${ID_FS_LABEL}" ]; then
++              mountpoint="${MOUNT_BASE}/${ID_FS_LABEL}"
 +            elif [ -n "$DEVNAME" ]; then
 +              mountpoint="${MOUNT_BASE}/`basename ${DEVNAME}`"
 +            else
diff --git a/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch b/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch
new file mode 100644
index 0000000000..27928b5d54
--- /dev/null
+++ b/package/usbmount/usbmount-use-udev-environment-instead-of-blkid.patch
@@ -0,0 +1,71 @@
+udev can provide all the values that usbmount determined using the
+blkid binary. This patch drops use of blkid in favor of using the
+environment variables set by udev. Thus it removes the dependency
+on blkid from usbmount.
+
+Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
+--- usbmount-0.0.22/usbmount.orig	2013-06-18 14:44:40.143096147 +0200
++++ usbmount-0.0.22/usbmount	2013-06-19 16:13:09.882434896 +0200
+@@ -59,11 +59,6 @@
+     exit 0
+ fi
+ 
+-if [ ! -x /sbin/blkid ]; then
+-    log err "cannot execute /sbin/blkid"
+-    exit 1
+-fi
+-
+ # Per Policy 9.3.2, directories under /var/run have to be created
+ # after every reboot.
+ if [ ! -e /var/run/usbmount ]; then
+@@ -83,15 +78,7 @@
+     trap '( lockfile-remove /var/run/usbmount/.mount )' 0
+     log debug "acquired lock /var/run/usbmount/.mount.lock"
+ 
+-    # Grab device information from device and "divide it"
+-    #   FIXME: improvement: implement mounting by label (notice that labels
+-    #   can contain spaces, which makes things a little bit less comfortable).
+-    DEVINFO=$(/sbin/blkid -p $DEVNAME)
+-    FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+-    UUID=$(echo "$DEVINFO"   | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+-    USAGE=$(echo "$DEVINFO"  | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
+-
+-    if ! echo $USAGE | egrep -q "(filesystem|disklabel)"; then
++    if ! echo $ID_FS_USAGE | egrep -q "(filesystem|disklabel)"; then
+ 	log info "$DEVNAME does not contain a filesystem or disklabel"
+ 	exit 1
+     fi
+@@ -101,14 +88,14 @@
+ 	log info "executing command: mount $DEVNAME"
+ 	mount $DEVNAME || log err "mount by DEVNAME with $DEVNAME wasn't successful; return code $?"
+ 
+-    elif grep -q "^[[:blank:]]*UUID=$UUID" /etc/fstab; then
+-        log info "executing command: mount -U $UUID"
+-	mount -U $UUID || log err "mount by UUID with $UUID wasn't successful; return code $?"
++    elif grep -q "^[[:blank:]]*UUID=$ID_FS_UUID" /etc/fstab; then
++        log info "executing command: mount -U $ID_FS_UUID"
++	mount -U $ID_FS_UUID || log err "mount by UUID with $ID_FS_UUID wasn't successful; return code $?"
+ 
+     else
+-	log debug "$DEVNAME contains filesystem type $FSTYPE"
++	log debug "$DEVNAME contains filesystem type $ID_FS_TYPE"
+ 
+-	fstype=$FSTYPE
++	fstype=$ID_FS_TYPE
+ 	# Test if the filesystem type is in the list of filesystem
+ 	# types to mount.
+ 	if in_list "$fstype" "$FILESYSTEMS"; then
+@@ -176,11 +163,13 @@
+ 
+ 		# Run hook scripts; ignore errors.
+ 		export UM_DEVICE="$DEVNAME"
++		export UM_UUID="$ID_FS_UUID"
+ 		export UM_MOUNTPOINT="$mountpoint"
+ 		export UM_FILESYSTEM="$fstype"
+ 		export UM_MOUNTOPTIONS="$options"
+ 		export UM_VENDOR="$vendor"
+ 		export UM_MODEL="$model"
++		export UM_LABEL="$ID_FS_LABEL"
+ 		log info "executing command: run-parts /etc/usbmount/mount.d"
+ 		run-parts /etc/usbmount/mount.d || :
+ 	    else
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index de87009966..5f4e01f09a 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -13,9 +13,9 @@ define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
 
 	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink 	\
-		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_create_model_symlink
+		$(TARGET_DIR)/etc/usbmount/mount.d/00_create_model_symlink
 	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink 	\
-		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
+		$(TARGET_DIR)/etc/usbmount/umount.d/00_remove_model_symlink
 
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
 	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \